diff --git a/.env b/.env
new file mode 100644
index 00000000000..6d99d85b3a7
--- /dev/null
+++ b/.env
@@ -0,0 +1,5 @@
+APP_IMAGE=gdcc/dataverse:unstable
+POSTGRES_VERSION=17
+DATAVERSE_DB_USER=dataverse
+SOLR_VERSION=9.8.0
+SKIP_DEPLOY=0
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..9860024f70a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+# https://www.git-scm.com/docs/gitattributes
+
+# This set mandatory LF line endings for .sh files preventing from windows users to having to change the value of their git config --global core.autocrlf to 'false' or 'input'
+*.sh text eol=lf
\ No newline at end of file
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000..5c9ad7581f8
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,8 @@
+
+# Any container related stuff should be assigned to / reviewed by Oliver and/or Phil
+modules/container-configbaker/** @poikilotherm @pdurbin
+modules/container-base/** @poikilotherm @pdurbin
+src/main/docker/** @poikilotherm @pdurbin
+docker-compose-dev.yml @poikilotherm @pdurbin
+.github/workflows/scripts/containers** @poikilotherm @pdurbin
+.github/workflows/container_* @poikilotherm @pdurbin
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000000..3dba7d52109
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,58 @@
+---
+name: Bug report
+about: Did you encounter something unexpected or incorrect in the Dataverse software?
+  We'd like to hear about it!
+title: ''
+labels: 'Type: Bug'
+assignees: ''
+
+---
+
+<!--
+Thank you for contributing to the Dataverse Project through the creation of a bug report!
+
+WARNING: If this is a security issue it should be reported privately to security@dataverse.org
+
+More information on bug issues and contributions can be found in the "Contributing to Dataverse" page:
+https://guides.dataverse.org/en/latest/contributor/index.html
+
+Please fill out as much of the template as you can.
+Start below this comment section.
+-->
+**What steps does it take to reproduce the issue?**
+
+* When does this issue occur?
+
+
+* Which page(s) does it occurs on?
+
+
+* What happens?
+
+
+* To whom does it occur (all users, curators, superusers)?
+
+
+* What did you expect to happen?
+
+
+
+**Which version of Dataverse are you using?**
+
+
+
+**Any related open or closed issues to this bug report?**
+
+
+**Screenshots:**
+
+No matter the issue, screenshots are always welcome.
+
+To add a screenshot, please use one of the following formats and/or methods described here:
+
+* https://help.github.com/en/articles/file-attachments-on-issues-and-pull-requests
+*
+
+
+**Are you thinking about creating a pull request for this issue?**
+Help is always welcome, is this bug something you or your organization plan to fix?
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000000..7365cb4317c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,39 @@
+---
+name: Feature request
+about: Suggest an idea or new feature for the Dataverse software!
+title: 'Feature Request:'
+labels: 'Type: Feature'
+assignees: ''
+
+---
+
+<!--
+Thank you for contributing to the Dataverse Project through the creation of a feature request!
+
+More information on ideas/feature requests and contributions can be found in the "Contributing to Dataverse" page:
+https://guides.dataverse.org/en/latest/contributor/index.html
+
+Please fill out as much of the template as you can.
+Start below this comment section.
+-->
+
+**Overview of the Feature Request**
+
+
+**What kind of user is the feature intended for?**
+(Example users roles: API User, Curator, Depositor, Guest, Superuser, Sysadmin)
+
+
+**What inspired the request?**
+
+
+**What existing behavior do you want changed?**
+
+
+**Any brand new behavior do you want to add to Dataverse?**
+
+
+**Any open or closed issues related to this feature request?**
+
+**Are you thinking about creating a pull request for this feature?**  
+Help is always welcome, is this feature something you or your organization plan to implement?
diff --git a/.github/ISSUE_TEMPLATE/idea_proposal.md b/.github/ISSUE_TEMPLATE/idea_proposal.md
new file mode 100644
index 00000000000..8cb6c7bfafe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/idea_proposal.md
@@ -0,0 +1,40 @@
+---
+name: Idea proposal
+about: Propose a new idea for discussion to improve the Dataverse software!
+title: 'Suggestion:'
+labels: 'Type: Suggestion'
+assignees: ''
+
+---
+
+<!--
+Thank you for contributing to the Dataverse Project through the creation of a feature request!
+
+More information on ideas/feature requests and contributions can be found in the "Contributing to Dataverse" page:
+https://guides.dataverse.org/en/latest/contributor/index.html
+
+Please fill out as much of the template as you can.
+Start below this comment section.
+-->
+
+**Overview of the Suggestion**
+
+
+**What kind of user is the suggestion intended for?**
+(Example users roles: API User, Curator, Depositor, Guest, Superuser, Sysadmin)
+
+
+**What inspired this idea?**
+
+
+**What existing behavior do you want changed?**
+
+
+**Any brand new behavior do you want to add to Dataverse?**
+
+
+**Any open or closed issues related to this suggestion?**
+
+
+**Are you thinking about creating a pull request for this issue?**
+Help is always welcome, is this idea something you or your organization plan to implement?
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..f2a779bbf21
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+**What this PR does / why we need it**:
+
+**Which issue(s) this PR closes**:
+
+- Closes #
+
+**Special notes for your reviewer**:
+
+**Suggestions on how to test this**:
+
+**Does this PR introduce a user interface change? If mockups are available, please link/include them here**:
+
+**Is there a release notes update needed for this change?**:
+
+**Additional documentation**:
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 00000000000..c36e26c8330
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,7 @@
+# Security
+
+To report a security vulnerability please email security@dataverse.org as explained at https://guides.dataverse.org/en/latest/installation/config.html#reporting-security-issues
+
+Advice on securing your installation can be found at https://guides.dataverse.org/en/latest/installation/config.html#securing-your-installation
+
+Security practices and procedures used by the Dataverse team are described at https://guides.dataverse.org/en/latest/developers/security.html
diff --git a/.github/actions/setup-maven/action.yml b/.github/actions/setup-maven/action.yml
new file mode 100644
index 00000000000..4cf09f34231
--- /dev/null
+++ b/.github/actions/setup-maven/action.yml
@@ -0,0 +1,37 @@
+---
+name: "Setup Maven and Caches"
+description: "Determine Java version and setup Maven, including necessary caches."
+inputs:
+  git-reference:
+    description: 'The git reference (branch/tag) to check out'
+    required: false
+    default: '${{ github.ref }}'
+  pom-paths:
+    description: "List of paths to Maven POM(s) for cache dependency setup"
+    required: false
+    default: 'pom.xml'
+runs:
+  using: composite
+  steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.git-reference }}
+    - name: Determine Java version by reading the Maven property
+      shell: bash
+      run: |
+        echo "JAVA_VERSION=$(grep '<target.java.version>' ${GITHUB_WORKSPACE}/modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" | tee -a ${GITHUB_ENV}
+    - name: Set up JDK ${{ env.JAVA_VERSION }}
+      id: setup-java
+      uses: actions/setup-java@v4
+      with:
+        java-version: ${{ env.JAVA_VERSION }}
+        distribution: 'temurin'
+        cache: 'maven'
+        cache-dependency-path: ${{ inputs.pom-paths }}
+    - name: Download common cache on branch cache miss
+      if: ${{ steps.setup-java.outputs.cache-hit != 'true' }}
+      uses: actions/cache/restore@v4
+      with:
+        key: dataverse-maven-cache
+        path: ~/.m2/repository
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000..6325029dac1
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# Set update schedule for GitHub Actions
+# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions daily
+      interval: "daily"
diff --git a/.github/workflows/check_property_files.yml b/.github/workflows/check_property_files.yml
new file mode 100644
index 00000000000..505310aab35
--- /dev/null
+++ b/.github/workflows/check_property_files.yml
@@ -0,0 +1,32 @@
+name: "Properties Check"
+on:
+    pull_request:
+        paths:
+            - "src/**/*.properties"
+            - "scripts/api/data/metadatablocks/*"
+jobs:
+    duplicate_keys:
+        name: Duplicate Keys
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - name: Run duplicates detection script
+              shell: bash
+              run: tests/check_duplicate_properties.sh
+
+    metadata_blocks_properties:
+        name: Metadata Blocks Properties
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - name: Setup GraalVM + Native Image
+              uses: graalvm/setup-graalvm@v1
+              with:
+                github-token: ${{ secrets.GITHUB_TOKEN }}
+                java-version: '21'
+                distribution: 'graalvm-community'
+            - name: Setup JBang
+              uses: jbangdev/setup-jbang@main
+            - name: Run metadata block properties verification script
+              shell: bash
+              run: tests/verify_mdb_properties.sh
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 00000000000..9f4e94b9f5b
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,104 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "develop", "master" ]
+  pull_request:
+    branches: [ "develop", "master" ]
+  schedule:
+    - cron: '30 6 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: actions
+          build-mode: none
+        - language: java-kotlin
+          build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
+        - language: javascript-typescript
+          build-mode: none
+        - language: python
+          build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Add any setup steps before running the `github/codeql-action/init` action.
+    # This includes steps like installing compilers or runtimes (`actions/setup-node`
+    # or others). This is typically only required for manual builds.
+    # - name: Setup runtime (example)
+    #   uses: actions/setup-example@v1
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹī¸ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/container_app_pr.yml b/.github/workflows/container_app_pr.yml
new file mode 100644
index 00000000000..a4c52805156
--- /dev/null
+++ b/.github/workflows/container_app_pr.yml
@@ -0,0 +1,95 @@
+---
+name: Preview Application Container Image
+
+# TODO: merge this workflow into the existing container_app_push.yaml flow - there's not much difference!
+
+on:
+    # We only run the push commands if we are asked to by an issue comment with the correct command.
+    # This workflow is always taken from the default branch and runs in repo context with access to secrets.
+    repository_dispatch:
+        types: [ push-image-command ]
+
+env:
+    PLATFORMS: "linux/amd64,linux/arm64"
+
+jobs:
+    deploy:
+        name: "Package & Push"
+        runs-on: ubuntu-latest
+        # Only run in upstream repo - avoid unnecessary runs in forks
+        if: ${{ github.repository_owner == 'IQSS' }}
+        steps:
+            # Checkout the pull request code as when merged
+            - uses: actions/checkout@v4
+              with:
+                  ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
+            - uses: actions/setup-java@v4
+              with:
+                  java-version: "17"
+                  distribution: 'adopt'
+            - uses: actions/cache@v4
+              with:
+                  path: ~/.m2
+                  key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+                  restore-keys: ${{ runner.os }}-m2
+
+            # Note: Accessing, pushing tags etc. to GHCR will only succeed in upstream because secrets.
+            - name: Login to Github Container Registry
+              uses: docker/login-action@v3
+              with:
+                  registry: ghcr.io
+                  username: ${{ secrets.GHCR_USERNAME }}
+                  password: ${{ secrets.GHCR_TOKEN }}
+
+            - name: Set up QEMU for multi-arch builds
+              uses: docker/setup-qemu-action@v3
+
+            # Get the image tag from either the command or default to branch name (Not used for now)
+            #-   name: Get the target tag name
+            #    id: vars
+            #    run: |
+            #        tag=${{ github.event.client_payload.slash_command.args.named.tag }}
+            #        if [[ -z "$tag" ]]; then tag=$(echo "${{ github.event.client_payload.pull_request.head.ref }}" | tr '\\/_:&+,;#*' '-'); fi
+            #        echo "IMAGE_TAG=$tag" >> $GITHUB_ENV
+
+            # Set image tag to branch name of the PR
+            - name: Set image tag to branch name
+              run: |
+                  echo "IMAGE_TAG=$(echo "${{ github.event.client_payload.pull_request.head.ref }}" | tr '\\/_:&+,;#*' '-')" >> $GITHUB_ENV
+
+            # Necessary to split as otherwise the submodules are not available (deploy skips install)
+            - name: Build app and configbaker container image with local architecture and submodules (profile will skip tests)
+              run: >
+                  mvn -B -f modules/dataverse-parent
+                  -P ct -pl edu.harvard.iq:dataverse -am
+                  install
+            - name: Deploy multi-arch application and configbaker container image
+              run: >
+                  mvn -Pct deploy 
+                  -Dapp.image.tag=${{ env.IMAGE_TAG }}
+                  -Ddocker.registry=ghcr.io -Ddocker.platforms=${{ env.PLATFORMS }}
+
+            - uses: marocchino/sticky-pull-request-comment@v2
+              with:
+                  header: registry-push
+                  hide_and_recreate: true
+                  hide_classify: "OUTDATED"
+                  number: ${{ github.event.client_payload.pull_request.number }}
+                  message: |
+                      :package: Pushed preview images as
+                      ```
+                      ghcr.io/gdcc/dataverse:${{ env.IMAGE_TAG }}
+                      ```
+                      ```
+                      ghcr.io/gdcc/configbaker:${{ env.IMAGE_TAG }}
+                      ```
+                      :ship: [See on GHCR](https://github.com/orgs/gdcc/packages/container). Use by referencing with full name as printed above, mind the registry name.
+
+            # Leave a note when things have gone sideways
+            - uses: peter-evans/create-or-update-comment@v4
+              if: ${{ failure() }}
+              with:
+                  issue-number: ${{ github.event.client_payload.pull_request.number }}
+                  body: >
+                      :package: Could not push preview images :disappointed:.
+                      See [log](https://github.com/IQSS/dataverse/actions/runs/${{ github.run_id }}) for details.
diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml
new file mode 100644
index 00000000000..0472ab97dee
--- /dev/null
+++ b/.github/workflows/container_app_push.yml
@@ -0,0 +1,158 @@
+---
+name: Application Container Image
+
+on:
+    # We are deliberately *not* running on push events here to avoid double runs.
+    # Instead, push events will trigger from the base image and maven unit tests via workflow_call.
+    workflow_call:
+        inputs:
+            base-image-ref:
+                type: string
+                description: "Reference of the base image to build on in full qualified form [<registry>/]<namespace>/<repo>:<tag>"
+                required: false
+                default: "gdcc/base:unstable"
+    pull_request:
+        branches:
+            - develop
+            - master
+        paths:
+            - 'src/main/docker/**'
+            - 'modules/container-configbaker/**'
+            - '.github/workflows/container_app_push.yml'
+
+env:
+    IMAGE_TAG: unstable
+    REGISTRY: "" # Empty means default to Docker Hub
+    PLATFORMS: "linux/amd64,linux/arm64"
+
+jobs:
+    build:
+        name: "Build & Test"
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            packages: write
+            pull-requests: write
+        # Only run in upstream repo - avoid unnecessary runs in forks
+        if: ${{ github.repository_owner == 'IQSS' }}
+
+        steps:
+            - name: Checkout and Setup Maven
+              uses: IQSS/dataverse/.github/actions/setup-maven@develop
+              with:
+                pom-paths: |
+                  pom.xml
+                  modules/container-configbaker/pom.xml
+                  modules/dataverse-parent/pom.xml
+
+            # TODO: Add a filter step here, that avoids building the image if this is a PR and there are other files touched than declared above.
+            #       Use https://github.com/dorny/paths-filter to solve this. This will ensure we do not run this twice if this workflow
+            #       will be triggered by the other workflows already (base image or java changes)
+            #       To become a part of #10618.
+
+            - name: Build app and configbaker container image with local architecture and submodules (profile will skip tests)
+              run: >
+                  mvn -B -f modules/dataverse-parent
+                  -P ct -pl edu.harvard.iq:dataverse -am
+                  $( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" )
+                  install
+
+            # TODO: add smoke / integration testing here (add "-Pct -DskipIntegrationTests=false")
+
+    # Note: Accessing, pushing tags etc. to DockerHub or GHCR will only succeed in upstream because secrets.
+    # We check for them here and subsequent jobs can rely on this to decide if they shall run.
+    check-secrets:
+        needs: build
+        name: Check for Secrets Availability
+        runs-on: ubuntu-latest
+        outputs:
+            available: ${{ steps.secret-check.outputs.available }}
+        steps:
+            - id: secret-check
+              # perform secret check & put boolean result as an output
+              shell: bash
+              run: |
+                  if [ "${{ secrets.DOCKERHUB_TOKEN }}" != '' ]; then
+                      echo "available=true" >> $GITHUB_OUTPUT;
+                  else
+                      echo "available=false" >> $GITHUB_OUTPUT;
+                  fi
+
+    deploy:
+        needs: check-secrets
+        name: "Package & Publish"
+        runs-on: ubuntu-latest
+        # Only run this job if we have access to secrets. This is true for events like push/schedule which run in the
+        # context of the main repo, but for PRs only true if coming from the main repo! Forks have no secret access.
+        #
+        # Note: The team's decision was to not auto-deploy an image on any git push where no PR exists (yet).
+        #       Accordingly, only run for push events on the 'develop' branch.
+        if: needs.check-secrets.outputs.available == 'true' &&
+            ( github.event_name != 'push' || ( github.event_name == 'push' && github.ref_name == 'develop' ))
+        steps:
+            - name: Checkout and Setup Maven
+              uses: IQSS/dataverse/.github/actions/setup-maven@develop
+              with:
+                pom-paths: |
+                  pom.xml
+                  modules/container-configbaker/pom.xml
+                  modules/dataverse-parent/pom.xml
+
+            # Depending on context, we push to different targets. Login accordingly.
+            - if: github.event_name != 'pull_request'
+              name: Log in to Docker Hub registry
+              uses: docker/login-action@v3
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+            - if: ${{ github.event_name == 'pull_request' }}
+              name: Login to Github Container Registry
+              uses: docker/login-action@v3
+              with:
+                  registry: ghcr.io
+                  username: ${{ secrets.GHCR_USERNAME }}
+                  password: ${{ secrets.GHCR_TOKEN }}
+
+            - name: Set up QEMU for multi-arch builds
+              uses: docker/setup-qemu-action@v3
+
+            - name: Add rolling image tag when pushing to develop
+              if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
+              run: |
+                  echo "ADDITIONAL_TAGS=-Ddocker.tags.upcoming=$( mvn initialize help:evaluate -Pct -Dexpression=app.image.tag -Dapp.image.tag='${app.image.version}-${base.image.flavor}' -q -DforceStdout )" | tee -a "$GITHUB_ENV"
+            - name: Re-set image tag and container registry when on PR
+              if: ${{ github.event_name == 'pull_request' }}
+              run: |
+                  echo "IMAGE_TAG=$(echo "$GITHUB_HEAD_REF" | tr '\\/_:&+,;#*' '-')" | tee -a "$GITHUB_ENV"
+                  echo "REGISTRY='-Ddocker.registry=ghcr.io'" | tee -a "$GITHUB_ENV"
+
+            # Necessary to split as otherwise the submodules are not available (deploy skips install)
+            - name: Build app and configbaker container image with local architecture and submodules (profile will skip tests)
+              run: >
+                  mvn -B -f modules/dataverse-parent
+                  -P ct -pl edu.harvard.iq:dataverse -am
+                  $( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" )
+                  install
+            - name: Deploy multi-arch application and configbaker container image
+              run: >
+                  mvn 
+                  -Dapp.image.tag=${{ env.IMAGE_TAG }} ${{ env.ADDITIONAL_TAGS }}
+                  $( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" )
+                  ${{ env.REGISTRY }} -Ddocker.platforms=${{ env.PLATFORMS }}
+                  -P ct deploy
+
+            - uses: marocchino/sticky-pull-request-comment@v2
+              if: ${{ github.event_name == 'pull_request' }}
+              with:
+                  header: registry-push
+                  hide_and_recreate: true
+                  hide_classify: "OUTDATED"
+                  message: |
+                      :package: Pushed preview images as
+                      ```
+                      ghcr.io/gdcc/dataverse:${{ env.IMAGE_TAG }}
+                      ```
+                      ```
+                      ghcr.io/gdcc/configbaker:${{ env.IMAGE_TAG }}
+                      ```
+                      :ship: [See on GHCR](https://github.com/orgs/gdcc/packages/container). Use by referencing with full name as printed above, mind the registry name.
diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml
new file mode 100644
index 00000000000..3b375e13864
--- /dev/null
+++ b/.github/workflows/container_base_push.yml
@@ -0,0 +1,111 @@
+---
+name: Base Container Image
+
+on:
+    push:
+        branches:
+            - 'develop'
+        # "Path filters are not evaluated for pushes of tags" https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore
+        paths:
+            - 'modules/container-base/**'
+            - '!modules/container-base/src/backports/**'
+            - '!modules/container-base/README.md'
+            - 'modules/dataverse-parent/pom.xml'
+            - '.github/workflows/container_base_push.yml'
+
+    # These TODOs are left for #10618
+    # TODO: we are missing a workflow_call option here, so we can trigger this flow from pr comments and maven tests (keep the secrets availability in mind!)
+    # TODO: we are missing a pull_request option here (filter for stuff that would trigger the maven runs!) so we can trigger preview builds for them when coming from the main repo (keep the secrets availability in mind!)
+
+env:
+    PLATFORMS: linux/amd64,linux/arm64
+    DEVELOPMENT_BRANCH: develop
+
+jobs:
+    build:
+        name: Base Image
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            packages: read
+        # Only run in upstream repo - avoid unnecessary runs in forks
+        if: ${{ github.repository_owner == 'IQSS' }}
+        outputs:
+          base-image-ref: ${{ steps.determine-name.outputs.full-ref }}
+
+        steps:
+            - name: Checkout and Setup Maven
+              uses: IQSS/dataverse/.github/actions/setup-maven@develop
+              with:
+                pom-paths: modules/container-base/pom.xml
+
+            # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
+            #       on events in context of upstream because secrets. PRs run in context of forks by default!
+            - name: Log in to the Container registry
+              uses: docker/login-action@v3
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+            # In case this is a push to develop, we care about buildtime.
+            # Configure a remote ARM64 build host in addition to the local AMD64 in two steps.
+            - name: Setup SSH agent
+              uses: webfactory/ssh-agent@v0.9.1
+              with:
+                  ssh-private-key: ${{ secrets.BUILDER_ARM64_SSH_PRIVATE_KEY }}
+            - name: Provide the known hosts key and the builder config
+              run: |
+                  echo "${{ secrets.BUILDER_ARM64_SSH_HOST_KEY }}" > ~/.ssh/known_hosts
+                  mkdir -p modules/container-base/target/buildx-state/buildx/instances
+                  cat > modules/container-base/target/buildx-state/buildx/instances/maven << EOF
+                  { "Name": "maven",
+                    "Driver": "docker-container",
+                    "Dynamic": false,
+                    "Nodes": [{"Name": "maven0",
+                               "Endpoint": "unix:///var/run/docker.sock",
+                               "Platforms": [{"os": "linux", "architecture": "amd64"}],
+                               "DriverOpts": null,
+                               "Flags": ["--allow-insecure-entitlement=network.host"],
+                               "Files": null},
+                              {"Name": "maven1",
+                               "Endpoint": "ssh://${{ secrets.BUILDER_ARM64_SSH_CONNECTION }}",
+                               "Platforms": [{"os": "linux", "architecture": "arm64"}],
+                               "DriverOpts": null,
+                               "Flags": ["--allow-insecure-entitlement=network.host"],
+                               "Files": null}]}
+                  EOF
+
+            # Determine the base image name we are going to use from here on
+            - name: Determine base image name
+              id: determine-name
+              run: |
+                BASE_IMAGE=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )
+                BASE_IMAGE_UPCOMING=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout )
+                
+                echo "BASE_IMAGE=${BASE_IMAGE}" | tee -a "${GITHUB_ENV}"
+                echo "BASE_IMAGE_UPCOMING=${BASE_IMAGE_UPCOMING}" | tee -a "${GITHUB_ENV}"
+                echo "full-ref=${BASE_IMAGE_UPCOMING}" | tee -a "$GITHUB_OUTPUT"
+
+            - name: Configure update of "latest" tag for development branch
+              id: develop-tag
+              run: |
+                echo "tag-options=-Ddocker.tags.develop=unstable -Ddocker.tags.upcoming=${BASE_IMAGE_UPCOMING#*:}" | tee -a "${GITHUB_OUTPUT}"
+
+            - name: Deploy multi-arch base container image to Docker Hub
+              id: build
+              run: |
+                mvn -f modules/container-base -Pct deploy -Ddocker.noCache -Ddocker.platforms=${{ env.PLATFORMS }} \
+                  -Ddocker.imagePropertyConfiguration=override ${{ steps.develop-tag.outputs.tag-options }}
+
+    push-app-img:
+        name: "Rebase & Publish App Image"
+        permissions:
+            contents: read
+            packages: write
+            pull-requests: write
+        secrets: inherit
+        needs:
+            - build
+        uses: ./.github/workflows/container_app_push.yml
+        with:
+          base-image-ref: ${{ needs.build.outputs.base-image-ref }}
diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml
new file mode 100644
index 00000000000..ec149c7b377
--- /dev/null
+++ b/.github/workflows/container_maintenance.yml
@@ -0,0 +1,277 @@
+---
+name: Container Images Scheduled Maintenance
+
+on:
+  # TODO: think about adding a (filtered) push event trigger here in case we change the patches
+  # ---
+  # Allow manual workflow triggers in case we need to repair images on Docker Hub (build and replace)
+  workflow_dispatch:
+    inputs:
+      force_build:
+        type: boolean
+        required: false
+        default: false
+        description: "Build and deploy even if no newer Java images or package updates are found."
+      dry_run:
+        type: boolean
+        required: false
+        default: false
+        description: "Run in dry-run mode (no builds, verify logic)"
+      damp_run:
+        type: boolean
+        required: false
+        default: false
+        description: "Run in damp-run mode (build but don't push)"
+  schedule:
+    - cron: '23 3 * * 0' # Run for 'develop' every Sunday at 03:23 UTC
+  release:
+    types: [published]
+
+env:
+  PLATFORMS: linux/amd64,linux/arm64
+  NUM_PAST_RELEASES: 3
+
+jobs:
+  discover:
+    name: Discover supported releases
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+    outputs:
+      branches: ${{ steps.discover.outputs.branches }}
+      develop-branch: ${{ steps.discover.outputs.develop-branch }}
+    steps:
+      - name: Discover maintained releases
+        id: discover
+        run: |
+          DEVELOPMENT_BRANCH=$( curl -f -sS https://api.github.com/repos/${{ github.repository }} | jq -r '.default_branch' )
+          echo "develop-branch=$DEVELOPMENT_BRANCH" | tee -a "${GITHUB_OUTPUT}"
+          
+          SUPPORTED_BRANCHES=$( curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | jq -r " .[0:${{ env.NUM_PAST_RELEASES }}] | .[].tag_name, \"${DEVELOPMENT_BRANCH}\" " | tr "\n" " " )
+          echo "branches=$SUPPORTED_BRANCHES" | tee -a "${GITHUB_OUTPUT}"
+
+  base-image:
+    name: Base Image Matrix Build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+    # Only run in upstream repo - avoid unnecessary runs in forks
+    if: ${{ github.repository_owner == 'IQSS' }}
+    needs:
+      - discover
+    outputs:
+      # This is a JSON map with keys of branch names (supported releases & develop) and values containing an array of known image tags for the branch
+      # Example: {"v6.6": ["latest", "6.6-noble", "6.6-noble-r1"], "v6.5": ["6.5-noble", "6.5-noble-r5"], "v6.4": ["6.4-noble", "6.4-noble-r12"], "develop": ["unstable", "6.7-noble", "6.7-noble-p6.2025.3-j17"]}
+      supported_tag_matrix: ${{ steps.execute.outputs.supported_tag_matrix }}
+
+      # This is a JSON list containing a flattened map of branch names and the latest non-rolling tag
+      # Example: [ "v6.6=gdcc/base:6.6-noble-r1", "v6.5=gdcc/base:6.5-noble-r5", "v6.4=gdcc/base:6.4-noble-r12", "develop=gdcc/base:6.7-noble-p6.2025.3-j17" ]
+      rebuilt_images: ${{ steps.execute.outputs.rebuilt_images }}
+
+    steps:
+      - name: Checkout and Setup Maven
+        uses: IQSS/dataverse/.github/actions/setup-maven@develop
+        with:
+          pom-paths: modules/container-base/pom.xml
+
+      # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
+      #       on events in context of upstream because secrets. PRs run in context of forks by default!
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up QEMU for multi-arch builds
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: ${{ env.PLATFORMS }}
+
+      # Execute matrix build for the discovered branches
+      - name: Execute build matrix script
+        id: execute
+        run: >
+          FORCE_BUILD=$( [[ "${{ inputs.force_build }}" = "true" ]] && echo 1 || echo 0 )
+          DRY_RUN=$( [[ "${{ inputs.dry_run }}" = "true" ]] && echo 1 || echo 0 )
+          DAMP_RUN=$( [[ "${{ inputs.damp_run }}" = "true" ]] && echo 1 || echo 0 )
+          DEVELOPMENT_BRANCH=${{ needs.discover.outputs.develop-branch }}
+          .github/workflows/scripts/containers/maintain-base.sh ${{ needs.discover.outputs.branches }}
+
+  application-image:
+    name: "Application Image Matrix Build"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+    needs:
+      - discover
+      - base-image
+    # Only run in upstream repo - avoid unnecessary runs in forks.
+    # TODO: If we add a push trigger later, we might want to prepend "always() &&" to ignore the status of the base job. Needs further investigation.
+    if: ${{ github.repository_owner == 'IQSS' }}
+    outputs:
+      supported_tag_matrix: ${{ steps.execute.outputs.supported_tag_matrix }}
+      rebuilt_images: ${{ steps.execute.outputs.rebuilt_images }}
+    steps:
+      - name: Checkout and Setup Maven
+        uses: IQSS/dataverse/.github/actions/setup-maven@develop
+        with:
+          pom-paths: ./pom.xml
+
+      # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
+      #       on events in context of upstream because secrets. PRs run in context of forks by default!
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up QEMU for multi-arch builds
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: ${{ env.PLATFORMS }}
+
+      # Execute matrix build for the discovered branches
+      - name: Execute build matrix script
+        id: execute
+        run: >
+          FORCE_BUILD=$( [[ "${{ inputs.force_build }}" = "true" ]] && echo 1 || echo 0 )
+          DRY_RUN=$( [[ "${{ inputs.dry_run }}" = "true" ]] && echo 1 || echo 0 )
+          DAMP_RUN=$( [[ "${{ inputs.damp_run }}" = "true" ]] && echo 1 || echo 0 )
+          DEVELOPMENT_BRANCH=${{ needs.discover.outputs.develop-branch }}
+          .github/workflows/scripts/containers/maintain-application.sh ${{ needs.discover.outputs.branches }}
+
+  configbaker-image:
+    name: "ConfigBaker Image Matrix Build"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+    needs:
+      - discover
+    # Only run in upstream repo - avoid unnecessary runs in forks.
+    # TODO: If we add a push trigger later, we might want to prepend "always() &&" to ignore the status of the base job. Needs further investigation.
+    if: ${{ github.repository_owner == 'IQSS' }}
+    outputs:
+      supported_tag_matrix: ${{ steps.execute.outputs.supported_tag_matrix }}
+      rebuilt_images: ${{ steps.execute.outputs.rebuilt_images }}
+    steps:
+      - name: Checkout and Setup Maven
+        uses: IQSS/dataverse/.github/actions/setup-maven@develop
+        with:
+          pom-paths: ./pom.xml
+
+      # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
+      #       on events in context of upstream because secrets. PRs run in context of forks by default!
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up QEMU for multi-arch builds
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: ${{ env.PLATFORMS }}
+      - name: Setup Trivy binary for vulnerability scanning
+        uses: aquasecurity/setup-trivy@v0.2.4
+        with:
+          version: v0.63.0
+
+      # Execute matrix build for the discovered branches
+      - name: Execute build matrix script
+        id: execute
+        run: >
+          FORCE_BUILD=$( [[ "${{ inputs.force_build }}" = "true" ]] && echo 1 || echo 0 )
+          DRY_RUN=$( [[ "${{ inputs.dry_run }}" = "true" ]] && echo 1 || echo 0 )
+          DAMP_RUN=$( [[ "${{ inputs.damp_run }}" = "true" ]] && echo 1 || echo 0 )
+          DEVELOPMENT_BRANCH=${{ needs.discover.outputs.develop-branch }}
+          .github/workflows/scripts/containers/maintain-configbaker.sh ${{ needs.discover.outputs.branches }}
+
+  hub-description:
+    name: Push description to DockerHub
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+    needs:
+      - base-image
+      - application-image
+      - configbaker-image
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      ### BASE IMAGE
+      - name: Render README for base image
+        if: toJSON(needs.base-image.outputs.rebuilt_images) != '[]'
+        run: |
+          TAGS_JSON='${{ needs.base-image.outputs.supported_tag_matrix }}'
+          echo "$TAGS_JSON" | jq -r 'keys | sort | reverse | .[]' |
+          while IFS= read -r branch; do
+            echo \
+              "- \`$( echo "$TAGS_JSON" | jq --arg v "$branch" -r '.[$v] | join("`, `")' )\`" \
+              "([Dockerfile](https://github.com/IQSS/dataverse/blob/${branch}/modules/container-base/src/main/docker/Dockerfile)," \
+              "[Patches](https://github.com/IQSS/dataverse/blob/develop/modules/container-base/src/backports/${branch}))" \
+            | tee -a "${GITHUB_WORKSPACE}/tags-base.md" 
+          done
+          sed -i -e "/<\!-- TAG BLOCK HERE -->/r ${GITHUB_WORKSPACE}/tags-base.md" "./modules/container-base/README.md"
+          cat "./modules/container-base/README.md"
+      - name: Push description to DockerHub for base image
+        if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.base-image.outputs.rebuilt_images) != '[]' }}
+        uses: peter-evans/dockerhub-description@v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          repository: gdcc/base
+          short-description: "Dataverse Base Container image providing Payara application server and optimized configuration"
+          readme-filepath: ./modules/container-base/README.md
+
+      ### APPLICATION IMAGE
+      - name: Render README for application image
+        if: toJSON(needs.application-image.outputs.rebuilt_images) != '[]'
+        run: |
+          TAGS_JSON='${{ needs.application-image.outputs.supported_tag_matrix }}'
+          echo "$TAGS_JSON" | jq -r 'keys | sort | reverse | .[]' |
+          while IFS= read -r branch; do
+            echo \
+              "- \`$( echo "$TAGS_JSON" | jq --arg v "$branch" -r '.[$v] | join("`, `")' )\`" \
+              "([Dockerfile](https://github.com/IQSS/dataverse/blob/${branch}/src/main/docker/Dockerfile)," \
+              "[Patches](https://github.com/IQSS/dataverse/blob/develop/src/backports/${branch}))" \
+            | tee -a "${GITHUB_WORKSPACE}/tags-app.md" 
+          done
+          sed -i -e "/<\!-- TAG BLOCK HERE -->/r ${GITHUB_WORKSPACE}/tags-app.md" "./src/main/docker/README.md"
+          cat "./src/main/docker/README.md"
+      - name: Push description to DockerHub for application image
+        if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.application-image.outputs.rebuilt_images) != '[]' }}
+        uses: peter-evans/dockerhub-description@v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          repository: gdcc/dataverse
+          short-description: "Dataverse Application Container Image providing the executable"
+          readme-filepath: ./src/main/docker/README.md
+
+      ### CONFIGBAKER IMAGE
+      - name: Render README for config baker image
+        if: toJSON(needs.configbaker-image.outputs.rebuilt_images) != '[]'
+        run: |
+          TAGS_JSON='${{ needs.configbaker-image.outputs.supported_tag_matrix }}'
+          echo "$TAGS_JSON" | jq -r 'keys | sort | reverse | .[]' |
+          while IFS= read -r branch; do
+            echo \
+              "- \`$( echo "$TAGS_JSON" | jq --arg v "$branch" -r '.[$v] | join("`, `")' )\`" \
+              "([Dockerfile](https://github.com/IQSS/dataverse/blob/${branch}/modules/container-configbaker/Dockerfile)," \
+              "[Patches](https://github.com/IQSS/dataverse/blob/develop/modules/container-configbaker/backports/${branch}))" \
+            | tee -a "${GITHUB_WORKSPACE}/tags-config.md"
+          done
+          sed -i -e "/<\!-- TAG BLOCK HERE -->/r ${GITHUB_WORKSPACE}/tags-config.md" "./modules/container-configbaker/README.md"
+          cat "./modules/container-configbaker/README.md"
+      - name: Push description to DockerHub for config baker image
+        if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.configbaker-image.outputs.rebuilt_images) != '[]' }}
+        uses: peter-evans/dockerhub-description@v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          repository: gdcc/base
+          short-description: "Dataverse Config Baker Container Image providing setup tooling and more"
+          readme-filepath: ./modules/container-configbaker/README.md
diff --git a/.github/workflows/copy_labels.yml b/.github/workflows/copy_labels.yml
new file mode 100644
index 00000000000..83824b0125a
--- /dev/null
+++ b/.github/workflows/copy_labels.yml
@@ -0,0 +1,19 @@
+name: Copy labels from issue to pull request
+
+on:
+  pull_request:
+    types: [opened]
+
+jobs:
+  copy-labels:
+    # Avoid being triggered by forks
+    if: "! github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]'"
+    permissions:
+      pull-requests: write
+    runs-on: ubuntu-latest
+    name: Copy labels from linked issues
+    steps:
+      - name: copy-labels
+        uses: michalvankodev/copy-issue-labels@v1.3.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/cypress_ui.yml.future b/.github/workflows/cypress_ui.yml.future
new file mode 100644
index 00000000000..0823233fdeb
--- /dev/null
+++ b/.github/workflows/cypress_ui.yml.future
@@ -0,0 +1,42 @@
+###############################################################################
+#
+#   THIS IS AN OLD TRAVIS-CI.ORG JOB FILE
+#   To be used with Github Actions, it would be necessary to refactor it.
+#   In addition, it needs to be rewritten to use our modern containers.
+#   Keeping it as the future example it has been before.
+#   See also #5846
+#
+###############################################################################
+
+services:
+  - docker
+
+jobs:
+  include:
+    # Execute Cypress for UI testing
+    # see https://docs.cypress.io/guides/guides/continuous-integration.html
+    - stage: test
+      language: node_js
+      node_js:
+        - "10"
+      addons:
+        apt:
+          packages:
+            # Ubuntu 16+ does not install this dependency by default, so we need to install it ourselves
+            - libgconf-2-4
+      cache:
+        # Caches $HOME/.npm when npm ci is default script command
+        # Caches node_modules in all other cases
+        npm: true
+        directories:
+          # we also need to cache folder with Cypress binary
+          - ~/.cache
+      before_install:
+        - cd tests
+      install:
+        - npm ci
+      before_script:
+        - ./run_docker_dataverse.sh
+      script:
+        # --key needs to be injected using CYPRESS_RECORD_KEY to keep it secret
+        - $(npm bin)/cypress run --record
diff --git a/.github/workflows/deploy_beta_testing.yml b/.github/workflows/deploy_beta_testing.yml
new file mode 100644
index 00000000000..7a236a316fb
--- /dev/null
+++ b/.github/workflows/deploy_beta_testing.yml
@@ -0,0 +1,90 @@
+name: 'Deploy to Beta Testing'
+
+on:
+  push:
+    branches:
+      - develop
+
+concurrency:
+  group: deploy-beta-testing
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Enable API Session Auth feature flag
+        working-directory: src/main/resources/META-INF
+        run: echo -e "dataverse.feature.api-session-auth=true" >> microprofile-config.properties
+
+      - name: Set build number
+        run: scripts/installer/custom-build-number
+
+      - name: Build application war
+        run: mvn package
+
+      - name: Get war file name
+        working-directory: target
+        run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV
+
+      - name: Upload war artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: built-app
+          path: ./target/${{ env.war_file }}
+
+  deploy-to-payara:
+    needs: build
+    if: ${{ github.repository_owner == 'IQSS' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download war artifact
+        uses: actions/download-artifact@v5
+        with:
+          name: built-app
+          path: ./
+
+      - name: Get war file name
+        run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV
+
+      - name: Copy war file to remote instance
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.BETA_PAYARA_INSTANCE_HOST }}
+          username: ${{ secrets.BETA_PAYARA_INSTANCE_USERNAME }}
+          key: ${{ secrets.BETA_PAYARA_INSTANCE_SSH_PRIVATE_KEY }}
+          source: './${{ env.war_file }}'
+          target: '/home/${{ secrets.BETA_PAYARA_INSTANCE_USERNAME }}'
+          overwrite: true
+
+      - name: Execute payara war deployment remotely
+        uses: appleboy/ssh-action@v1.2.2
+        env:
+          INPUT_WAR_FILE: ${{ env.war_file }}
+        with:
+          host: ${{ secrets.BETA_PAYARA_INSTANCE_HOST }}
+          username: ${{ secrets.BETA_PAYARA_INSTANCE_USERNAME }}
+          key: ${{ secrets.BETA_PAYARA_INSTANCE_SSH_PRIVATE_KEY }}
+          envs: INPUT_WAR_FILE
+          script: |
+            APPLICATION_NAME=dataverse-backend
+            ASADMIN='/usr/local/payara6/bin/asadmin --user admin'
+            $ASADMIN undeploy $APPLICATION_NAME
+            #$ASADMIN stop-domain
+            #rm -rf /usr/local/payara6/glassfish/domains/domain1/generated
+            #rm -rf /usr/local/payara6/glassfish/domains/domain1/osgi-cache
+            #$ASADMIN start-domain
+            $ASADMIN deploy --name $APPLICATION_NAME $INPUT_WAR_FILE
+            #$ASADMIN stop-domain
+            #$ASADMIN start-domain
diff --git a/.github/workflows/guides_build_sphinx.yml b/.github/workflows/guides_build_sphinx.yml
new file mode 100644
index 00000000000..a3b5882626c
--- /dev/null
+++ b/.github/workflows/guides_build_sphinx.yml
@@ -0,0 +1,28 @@
+name: "Guides Build Status"
+on: 
+  pull_request:
+    paths:
+      - "doc/sphinx-guides/**/*.rst"
+      - "doc/sphinx-guides/**/requirements.txt"
+      - "doc/sphinx-guides/**/conf.py"
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - id: lookup
+      run: |
+        echo "sphinx_version=$(grep Sphinx== ./doc/sphinx-guides/requirements.txt | tr -s "=" | cut -f 2 -d=)" | tee -a "${GITHUB_OUTPUT}"
+    - run: |
+        sudo apt-get update -q
+        sudo apt-get install -qqy --no-install-recommends graphviz
+    - uses: sphinx-notes/pages@v3
+      with:
+        documentation_path: ./doc/sphinx-guides/source
+        requirements_path: ./doc/sphinx-guides/requirements.txt
+        sphinx_version: ${{ steps.lookup.outputs.sphinx_version }}
+        sphinx_build_options: "-W"
+        cache: false
+        publish: false
+
diff --git a/.github/workflows/maven_cache_management.yml b/.github/workflows/maven_cache_management.yml
new file mode 100644
index 00000000000..fedf63b7c54
--- /dev/null
+++ b/.github/workflows/maven_cache_management.yml
@@ -0,0 +1,101 @@
+name: Maven Cache Management
+
+on:
+    # Every push to develop should trigger cache rejuvenation (dependencies might have changed)
+    push:
+        branches:
+            - develop
+    # According to https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+    # all caches are deleted after 7 days of no access. Make sure we rejuvenate every 7 days to keep it available.
+    schedule:
+        - cron: '23 2 * * 0' # Run for 'develop' every Sunday at 02:23 UTC (3:23 CET, 21:23 ET)
+    # Enable manual cache management
+    workflow_dispatch:
+    # Delete branch caches once a PR is merged
+    pull_request:
+        types:
+            - closed
+
+env:
+    COMMON_CACHE_KEY: "dataverse-maven-cache"
+    COMMON_CACHE_PATH: "~/.m2/repository"
+
+jobs:
+    seed:
+        name: Drop and Re-Seed Local Repository
+        runs-on: ubuntu-latest
+        if: ${{ github.event_name != 'pull_request' }}
+        permissions:
+            # Write permission needed to delete caches
+            # See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
+            actions: write
+            contents: read
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+            - name: Determine Java version from Parent POM
+              run: echo "JAVA_VERSION=$(grep '<target.java.version>' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV}
+            - name: Set up JDK ${{ env.JAVA_VERSION }}
+              uses: actions/setup-java@v4
+              with:
+                  java-version: ${{ env.JAVA_VERSION }}
+                  distribution: temurin
+            - name: Seed common cache
+              run: |
+                  mvn -B -f modules/dataverse-parent dependency:go-offline dependency:resolve-plugins
+            # This non-obvious order is due to the fact that the download via Maven above will take a very long time (7-8 min).
+            # Jobs should not be left without a cache. Deleting and saving in one go leaves only a small chance for a cache miss.
+            - name: Drop common cache
+              run: |
+                  gh extension install actions/gh-actions-cache                  
+                  echo "🛒 Fetching list of cache keys"
+                  cacheKeys=$(gh actions-cache list -R ${{ github.repository }} -B develop | cut -f 1 )
+                  
+                  ## Setting this to not fail the workflow while deleting cache keys. 
+                  set +e
+                  echo "🗑ī¸ Deleting caches..."
+                  for cacheKey in $cacheKeys
+                  do
+                      gh actions-cache delete $cacheKey -R ${{ github.repository }} -B develop --confirm
+                  done
+                  echo "✅ Done"
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            - name: Save the common cache
+              uses: actions/cache@v4
+              with:
+                  path: ${{ env.COMMON_CACHE_PATH }}
+                  key: ${{ env.COMMON_CACHE_KEY }}
+                  enableCrossOsArchive: true
+
+    # Let's delete feature branch caches once their PR is merged - we only have 10 GB of space before eviction kicks in
+    deplete:
+        name: Deplete feature branch caches
+        runs-on: ubuntu-latest
+        if: ${{ github.event_name == 'pull_request' }}
+        permissions:
+            # `actions:write` permission is required to delete caches
+            # See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
+            actions: write
+            contents: read
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+            - name: Cleanup caches
+              run: |
+                  gh extension install actions/gh-actions-cache
+
+                  BRANCH=refs/pull/${{ github.event.pull_request.number }}/merge
+                  echo "🛒 Fetching list of cache keys"
+                  cacheKeysForPR=$(gh actions-cache list -R ${{ github.repository }} -B $BRANCH | cut -f 1 )
+                
+                  ## Setting this to not fail the workflow while deleting cache keys. 
+                  set +e
+                  echo "🗑ī¸ Deleting caches..."
+                  for cacheKey in $cacheKeysForPR
+                  do
+                      gh actions-cache delete $cacheKey -R ${{ github.repository }} -B $BRANCH --confirm
+                  done
+                  echo "✅ Done"
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/maven_unit_test.yml b/.github/workflows/maven_unit_test.yml
new file mode 100644
index 00000000000..f0cf461d8e6
--- /dev/null
+++ b/.github/workflows/maven_unit_test.yml
@@ -0,0 +1,180 @@
+name: Maven Tests
+
+on:
+    push:
+        # Only run for development and feature branches. Don't waste CPU cycles testing
+        # master when the PR to update it from develop already ran these tests.
+        branches:
+            - '*'
+            - '!master'
+        paths:
+            - "**.java"
+            - "**.sql"
+            - "pom.xml"
+            - "modules/**/pom.xml"
+            - "!modules/container-base/**"
+            - "!modules/dataverse-spi/**"
+    pull_request:
+        paths:
+            - "**.java"
+            - "**.sql"
+            - "pom.xml"
+            - "modules/**/pom.xml"
+            - "!modules/container-base/**"
+            - "!modules/dataverse-spi/**"
+
+jobs:
+    unittest:
+        name: (${{ matrix.status}} / JDK ${{ matrix.jdk }}) Unit Tests
+        strategy:
+            fail-fast: false
+            matrix:
+                jdk: [ '17' ]
+                experimental: [false]
+                status:  ["Stable"]
+        continue-on-error: ${{ matrix.experimental }}
+        runs-on: ubuntu-latest
+        steps:
+          # TODO: As part of #10618 change to setup-maven custom action
+          # Basic setup chores
+          - uses: actions/checkout@v4
+          - name: Set up JDK ${{ matrix.jdk }}
+            uses: actions/setup-java@v4
+            with:
+                java-version: ${{ matrix.jdk }}
+                distribution: temurin
+                cache: maven
+
+          # The reason why we use "install" here is that we want the submodules to be available in the next step.
+          # Also, we can cache them this way for jobs triggered by this one. We need to skip ITs here, as we run
+          # them in the next job - but install usually runs through verify phase.
+          - name: Build with Maven and run unit tests
+            run: > 
+                mvn -B -f modules/dataverse-parent
+                -Dtarget.java.version=${{ matrix.jdk }}
+                -DcompilerArgument=-Xlint:unchecked -P all-unit-tests
+                -DskipIntegrationTests
+                -pl edu.harvard.iq:dataverse -am
+                install
+
+          # We don't want to cache the WAR file, so delete it
+          - run: rm -rf ~/.m2/repository/edu/harvard/iq/dataverse
+
+          # Upload the built war file. For download, it will be wrapped in a ZIP by GitHub.
+          # See also https://github.com/actions/upload-artifact#zipped-artifact-downloads
+          - uses: actions/upload-artifact@v4
+            with:
+                name: dataverse-java${{ matrix.jdk }}.war
+                path: target/dataverse*.war
+                retention-days: 7
+
+          # Store the build for the next step (integration test) to avoid recompilation and to transfer coverage reports
+          - run: |
+                tar -cvf java-builddir.tar target
+                tar -cvf java-m2-selection.tar ~/.m2/repository/io/gdcc/dataverse-*
+          - uses: actions/upload-artifact@v4
+            with:
+                name: java-artifacts
+                path: |
+                    java-builddir.tar
+                    java-m2-selection.tar
+                retention-days: 3
+
+    integration-test:
+        runs-on: ubuntu-latest
+        needs: unittest
+        name: (${{ matrix.status}} / JDK ${{ matrix.jdk }}) Integration Tests
+        strategy:
+            fail-fast: false
+            matrix:
+                jdk: [ '17' ]
+                experimental: [ false ]
+                status: [ "Stable" ]
+                #
+                # JDK 17 builds disabled due to non-essential fails marking CI jobs as completely failed within
+                # Github Projects, PR lists etc. This was consensus on Slack #dv-tech. See issue #8094
+                # (This is a limitation of how Github is currently handling these things.)
+                #
+                #include:
+                #    - jdk: '17'
+                #      experimental: true
+                #      status: "Experimental"
+        continue-on-error: ${{ matrix.experimental }}
+        steps:
+            # TODO: As part of #10618 change to setup-maven custom action
+            # Basic setup chores
+            - uses: actions/checkout@v4
+            - name: Set up JDK ${{ matrix.jdk }}
+              uses: actions/setup-java@v4
+              with:
+                  java-version: ${{ matrix.jdk }}
+                  distribution: temurin
+                  cache: maven
+
+            # Get the build output from the unit test job
+            - uses: actions/download-artifact@v5
+              with:
+                  name: java-artifacts
+            - run: |
+                tar -xvf java-builddir.tar
+                tar -xvf java-m2-selection.tar -C /
+
+            # Run integration tests (but not unit tests again)
+            - run: mvn -DskipUnitTests -Dtarget.java.version=${{ matrix.jdk }} verify
+
+            # Wrap up and send to coverage job
+            - run: tar -cvf java-reportdir.tar target/site
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: java-reportdir
+                  path: java-reportdir.tar
+                  retention-days: 3
+
+    coverage-report:
+        runs-on: ubuntu-latest
+        needs: integration-test
+        name: Coverage Report Submission
+        steps:
+            # TODO: As part of #10618 change to setup-maven custom action
+            # Basic setup chores
+          - uses: actions/checkout@v4
+          - uses: actions/setup-java@v4
+            with:
+                java-version: '17'
+                distribution: temurin
+                cache: maven
+
+          # Get the build output from the integration test job
+          - uses: actions/download-artifact@v5
+            with:
+                name: java-reportdir
+          - run: tar -xvf java-reportdir.tar
+
+          # Deposit Code Coverage
+          - name: Deposit Code Coverage
+            env:
+                CI_NAME: github
+                COVERALLS_SECRET: ${{ secrets.GITHUB_TOKEN }}
+            # The coverage commit is sometimes flaky. Don't bail out just because this optional step failed.
+            continue-on-error: true
+            run: >
+                mvn -B
+                -DrepoToken=${COVERALLS_SECRET} -DpullRequest=${{ github.event.number }}
+                jacoco:report coveralls:report
+
+          # NOTE: this may be extended with adding a report to the build output, leave a comment, send to Sonarcloud, ...
+
+    # TODO: Add a filter step here, that avoids calling the app image release workflow if there are changes to the base image.
+    #       Use https://github.com/dorny/paths-filter to solve this. Will require and additional job or adding to integration-test job.
+    #       This way we ensure that we're not running the app image flow with a non-matching base image.
+    #       To become a part of #10618.
+
+    push-app-img:
+        name: Publish App Image
+        permissions:
+            contents: read
+            packages: write
+            pull-requests: write
+        needs: integration-test
+        uses: ./.github/workflows/container_app_push.yml
+        secrets: inherit
diff --git a/.github/workflows/pr_comment_commands.yml b/.github/workflows/pr_comment_commands.yml
new file mode 100644
index 00000000000..06b11b1ac5b
--- /dev/null
+++ b/.github/workflows/pr_comment_commands.yml
@@ -0,0 +1,20 @@
+name: PR Comment Commands
+on:
+    issue_comment:
+        types: [created]
+jobs:
+    dispatch:
+        # Avoid being triggered by forks in upstream
+        if: ${{ github.repository_owner == 'IQSS' }}
+        runs-on: ubuntu-latest
+        steps:
+            - name: Dispatch
+              uses: peter-evans/slash-command-dispatch@v4
+              with:
+                  # This token belongs to @dataversebot and has sufficient scope.
+                  token: ${{ secrets.GHCR_TOKEN }}
+                  commands: |
+                      push-image
+                  repository: IQSS/dataverse
+                  # Commenter must have at least write permission to repo to trigger dispatch
+                  permission: write
diff --git a/.github/workflows/reviewdog_checkstyle.yml b/.github/workflows/reviewdog_checkstyle.yml
new file mode 100644
index 00000000000..804b04f696a
--- /dev/null
+++ b/.github/workflows/reviewdog_checkstyle.yml
@@ -0,0 +1,21 @@
+name: Maven CheckStyle Task
+on:
+   pull_request:
+       paths:
+           - "**.java"
+
+jobs:
+    checkstyle_job:
+        runs-on: ubuntu-latest
+        name: Checkstyle job
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Run check style
+              uses: nikitasavinov/checkstyle-action@master
+              with:
+                  fail_on_error: true
+                  reporter: github-pr-review
+                  checkstyle_config: checkstyle.xml
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/scripts/containers/maintain-application.sh b/.github/workflows/scripts/containers/maintain-application.sh
new file mode 100755
index 00000000000..b68c2a53d96
--- /dev/null
+++ b/.github/workflows/scripts/containers/maintain-application.sh
@@ -0,0 +1,202 @@
+#!/bin/bash
+
+# A matrix-like job to maintain a number of releases as well as the latest snap of Dataverse.
+
+# PREREQUISITES:
+# - You have Java, Maven, QEMU and Docker all setup and ready to go
+# - You obviously checked out the develop branch, otherwise you'd not be executing this script
+# - You added all the branch names you want to run maintenance for as arguments
+# Optional, but recommended:
+# - You added a DEVELOPMENT_BRANCH env var to your runner/job env with the name of the development branch
+# - You added a FORCE_BUILD=0|1 env var to indicate if the base image build should be forced
+# - You added a PLATFORMS env var with all the target platforms you want to build for
+# Optional:
+# - Use DRY_RUN=1 env var to skip actually building, but see how the tag lookups play out
+# - Use DAMP_RUN=1 env var to skip pushing images, but build them
+
+# NOTE:
+# This script is a culmination of Github Action steps into a single script.
+# The reason to put all of this in here is due to the complexity of the Github Action and the limitation of the
+# matrix support in Github actions, where outputs cannot be aggregated or otherwise used further.
+
+set -euo pipefail
+
+# Get all the inputs
+# If not within a runner, just print to stdout (duplicating the output in case of tee usage, but that's ok for testing)
+GITHUB_OUTPUT=${GITHUB_OUTPUT:-"/proc/self/fd/1"}
+GITHUB_ENV=${GITHUB_ENV:-"/proc/self/fd/1"}
+GITHUB_WORKSPACE=${GITHUB_WORKSPACE:-"$(pwd)"}
+GITHUB_SERVER_URL=${GITHUB_SERVER_URL:-"https://github.com"}
+GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-"IQSS/dataverse"}
+
+MAINTENANCE_WORKSPACE="${GITHUB_WORKSPACE}/maintenance-job"
+
+DEVELOPMENT_BRANCH="${DEVELOPMENT_BRANCH:-"develop"}"
+FORCE_BUILD="${FORCE_BUILD:-"0"}"
+DRY_RUN="${DRY_RUN:-"0"}"
+DAMP_RUN="${DAMP_RUN:-"0"}"
+PLATFORMS="${PLATFORMS:-"linux/amd64,linux/arm64"}"
+
+# Setup and validation
+if [[ -z "$*" ]]; then
+  >&2 echo "You must give a list of branch names as arguments"
+  exit 1;
+fi
+
+if (( DRY_RUN + DAMP_RUN > 1 )); then
+  >&2 echo "You must either use DRY_RUN=1 or DAMP_RUN=1, but not both"
+  exit 1;
+fi
+
+source "$( dirname "$0" )/utils.sh"
+
+# Delete old stuff if present
+rm -rf "$MAINTENANCE_WORKSPACE"
+mkdir -p "$MAINTENANCE_WORKSPACE"
+
+# Store the image tags we maintain in this array (same order as branches array!)
+# This list will be used to build the support matrix within the Docker Hub image description
+SUPPORTED_ROLLING_TAGS=()
+# Store the tags of application images we are actually rebuilding
+# Takes the from "branch-name=app-image-ref"
+REBUILT_APP_IMAGES=()
+
+for BRANCH in "$@"; do
+  echo "::group::Running maintenance for $BRANCH"
+
+  # 0. Determine if this is a development branch and the most current release
+  IS_DEV=0
+  if [[ "$BRANCH" = "$DEVELOPMENT_BRANCH" ]]; then
+    IS_DEV=1
+  fi
+  IS_CURRENT_RELEASE=0
+  if [[ "$BRANCH" = $( curl -f -sS "https://api.github.com/repos/$GITHUB_REPOSITORY/releases" | jq -r '.[0].tag_name' ) ]]; then
+    IS_CURRENT_RELEASE=1
+  fi
+
+  # 1. Let's get the maintained sources
+  git clone -c advice.detachedHead=false --depth 1 --branch "$BRANCH" "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" "$MAINTENANCE_WORKSPACE/$BRANCH"
+  # Switch context
+  cd "$MAINTENANCE_WORKSPACE/$BRANCH"
+
+  # 2. Now let's apply the patches (we have them checked out in $GITHUB_WORKSPACE, not necessarily in this local checkout)
+  echo "Checking for patches..."
+  if [[ -d ${GITHUB_WORKSPACE}/src/backports/$BRANCH ]]; then
+    echo "Applying patches now."
+    find "${GITHUB_WORKSPACE}/src/backports/$BRANCH" -type f -name '*.patch' -print0 | xargs -0 -n1 patch -p1 -l -s -i
+  fi
+
+  # 3a. Determine the base image ref (<namespace>/<repo>:<tag>)
+  BASE_IMAGE_REF=""
+  # For the dev branch we want to full flexi stack tag, to detect stack upgrades requiring new build
+  if (( IS_DEV )); then
+    BASE_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f . -Dexpression=base.image -q -DforceStdout )
+  else
+    # Frist, get the rolling tag of the base image
+    ROLLING_BASE_REF=$( mvn initialize help:evaluate -Pct -f . -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout )
+    # Now, we want to build any release branch application images on top of a _fixed_ tag, so let's fetch the newest fixed tag
+    CURRENT_REV=$( current_revision "$ROLLING_BASE_REF" )
+    BASE_IMAGE_REF="$ROLLING_BASE_REF-r$CURRENT_REV"
+  fi
+  echo "Determined BASE_IMAGE_REF=$BASE_IMAGE_REF from Maven"
+
+  # 3b. Determine the app image ref (<namespace>/<repo>:<tag>)
+  APP_IMAGE_REF=""
+  if (( IS_DEV )); then
+    # Results in the rolling tag for the dev branch
+    APP_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f . -Dexpression=app.image -q -DforceStdout )
+  else
+    # Results in the rolling tag for the release branch (the fixed tag will be determined from this rolling tag)
+    # shellcheck disable=SC2016
+    APP_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f . -Dexpression=app.image -Dapp.image.tag='${app.image.version}-${base.image.flavor}' -q -DforceStdout )
+  fi
+  echo "Determined APP_IMAGE_REF=$APP_IMAGE_REF from Maven"
+
+  # 4. Check for Base image updates
+  NEWER_BASE_IMAGE=0
+  if check_newer_parent "$BASE_IMAGE_REF" "$APP_IMAGE_REF"; then
+    NEWER_BASE_IMAGE=1
+  fi
+
+  # 5. Get current immutable revision tag if not on the dev branch
+  REV=$( current_revision "$APP_IMAGE_REF" )
+  CURRENT_REV_TAG="${APP_IMAGE_REF#*:}-r$REV"
+  NEXT_REV_TAG="${APP_IMAGE_REF#*:}-r$(( REV + 1 ))"
+
+  # 6. Let's put together what tags we want added to this build run
+  TAG_OPTIONS=""
+  if ! (( IS_DEV )); then
+    TAG_OPTIONS="-Dapp.image=$APP_IMAGE_REF -Ddocker.tags.revision=$NEXT_REV_TAG"
+    # In case of the current release, add the "latest" tag as well.
+    if (( IS_CURRENT_RELEASE )); then
+      TAG_OPTIONS="$TAG_OPTIONS -Ddocker.tags.latest=latest"
+    fi
+  else
+    # shellcheck disable=SC2016
+    UPCOMING_TAG=$( mvn initialize help:evaluate -Pct -f . -Dexpression=app.image.tag -Dapp.image.tag='${app.image.version}-${base.image.flavor}' -q -DforceStdout )
+    TAG_OPTIONS="-Ddocker.tags.upcoming=$UPCOMING_TAG"
+
+    # For the dev branch we only have rolling tags and can add them now already
+    SUPPORTED_ROLLING_TAGS+=("[\"unstable\", \"$UPCOMING_TAG\"]")
+  fi
+  echo "Determined these additional Maven tag options: $TAG_OPTIONS"
+
+  # 8. Let's build the base image if necessary
+  NEWER_IMAGE=0
+  if (( NEWER_BASE_IMAGE + FORCE_BUILD > 0 )); then
+    if ! (( DRY_RUN )); then
+      # Build the application image, but skip the configbaker image (that's a different job)!
+      # shellcheck disable=SC2046
+      mvn -Pct -f . deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \
+        -Dconf.skipBuild -Dbase.image="${BASE_IMAGE_REF}" \
+        -Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS \
+        $( if (( DAMP_RUN )); then echo "-Ddocker.skip.push -Ddocker.skip.tag"; fi )
+    else
+      echo "Skipping Maven build as requested by DRY_RUN=1"
+    fi
+    NEWER_IMAGE=1
+    # Save the information about the immutable or rolling tag we just built
+    if ! (( IS_DEV )); then
+      REBUILT_APP_IMAGES+=("$BRANCH=${APP_IMAGE_REF%:*}:$NEXT_REV_TAG")
+    else
+      REBUILT_APP_IMAGES+=("$BRANCH=$APP_IMAGE_REF")
+    fi
+  else
+    echo "No rebuild necessary, we're done here."
+  fi
+
+  # 9. Add list of rolling and immutable tags for release builds
+  if ! (( IS_DEV )); then
+    RELEASE_TAGS_LIST="["
+    if (( IS_CURRENT_RELEASE )); then
+      RELEASE_TAGS_LIST+="\"latest\", "
+    fi
+    RELEASE_TAGS_LIST+="\"${APP_IMAGE_REF#*:}\", "
+    if (( NEWER_IMAGE )); then
+      RELEASE_TAGS_LIST+="\"$NEXT_REV_TAG\"]"
+    else
+      RELEASE_TAGS_LIST+="\"$CURRENT_REV_TAG\"]"
+    fi
+    SUPPORTED_ROLLING_TAGS+=("${RELEASE_TAGS_LIST}")
+  fi
+
+  echo "::endgroup::"
+done
+
+# Built the output which images have actually been rebuilt as JSON
+REBUILT_IMAGES="["
+for IMAGE in "${REBUILT_APP_IMAGES[@]}"; do
+  REBUILT_IMAGES+=" \"$IMAGE\" "
+done
+REBUILT_IMAGES+="]"
+echo "rebuilt_images=${REBUILT_IMAGES//  /, }" | tee -a "${GITHUB_OUTPUT}"
+
+# Built the supported rolling tags matrix as JSON
+SUPPORTED_TAGS="{"
+for (( i=0; i < ${#SUPPORTED_ROLLING_TAGS[@]} ; i++ )); do
+  j=$((i+1))
+  SUPPORTED_TAGS+="\"${!j}\": ${SUPPORTED_ROLLING_TAGS[$i]}"
+  (( i < ${#SUPPORTED_ROLLING_TAGS[@]}-1 )) && SUPPORTED_TAGS+=", "
+done
+SUPPORTED_TAGS+="}"
+echo "supported_tag_matrix=$SUPPORTED_TAGS" | tee -a "$GITHUB_OUTPUT"
diff --git a/.github/workflows/scripts/containers/maintain-base.sh b/.github/workflows/scripts/containers/maintain-base.sh
new file mode 100755
index 00000000000..5b9ae738b98
--- /dev/null
+++ b/.github/workflows/scripts/containers/maintain-base.sh
@@ -0,0 +1,196 @@
+#!/bin/bash
+
+# A matrix-like job to maintain a number of releases as well as the latest snap of Dataverse.
+
+# PREREQUISITES:
+# - You have Java, Maven, QEMU and Docker all setup and ready to go
+# - You obviously checked out the develop branch, otherwise you'd not be executing this script
+# - You added all the branch names you want to run maintenance for as arguments
+# Optional, but recommended:
+# - You added a DEVELOPMENT_BRANCH env var to your runner/job env with the name of the development branch
+# - You added a FORCE_BUILD=0|1 env var to indicate if the base image build should be forced
+# - You added a PLATFORMS env var with all the target platforms you want to build for
+# Optional:
+# - Use DRY_RUN=1 env var to skip actually building, but see how the tag lookups play out
+# - Use DAMP_RUN=1 env var to skip pushing images, but build them
+
+# NOTE:
+# This script is a culmination of Github Action steps into a single script.
+# The reason to put all of this in here is due to the complexity of the Github Action and the limitation of the
+# matrix support in Github actions, where outputs cannot be aggregated or otherwise used further.
+
+set -euo pipefail
+
+# Get all the inputs
+# If not within a runner, just print to stdout (duplicating the output in case of tee usage, but that's ok for testing)
+GITHUB_OUTPUT=${GITHUB_OUTPUT:-"/proc/self/fd/1"}
+GITHUB_ENV=${GITHUB_ENV:-"/proc/self/fd/1"}
+GITHUB_WORKSPACE=${GITHUB_WORKSPACE:-"$(pwd)"}
+GITHUB_SERVER_URL=${GITHUB_SERVER_URL:-"https://github.com"}
+GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-"IQSS/dataverse"}
+
+MAINTENANCE_WORKSPACE="${GITHUB_WORKSPACE}/maintenance-job"
+
+DEVELOPMENT_BRANCH="${DEVELOPMENT_BRANCH:-"develop"}"
+FORCE_BUILD="${FORCE_BUILD:-"0"}"
+DRY_RUN="${DRY_RUN:-"0"}"
+DAMP_RUN="${DAMP_RUN:-"0"}"
+PLATFORMS="${PLATFORMS:-"linux/amd64,linux/arm64"}"
+
+# Setup and validation
+if [[ -z "$*" ]]; then
+  >&2 echo "You must give a list of branch names as arguments"
+  exit 1;
+fi
+
+if (( DRY_RUN + DAMP_RUN > 1 )); then
+  >&2 echo "You must either use DRY_RUN=1 or DAMP_RUN=1, but not both"
+  exit 1;
+fi
+
+source "$( dirname "$0" )/utils.sh"
+
+# Delete old stuff if present
+rm -rf "$MAINTENANCE_WORKSPACE"
+mkdir -p "$MAINTENANCE_WORKSPACE"
+
+# Store the image tags we maintain in this array (same order as branches array!)
+# This list will be used to build the support matrix within the Docker Hub image description
+SUPPORTED_ROLLING_TAGS=()
+# Store the tags of base images we are actually rebuilding to base new app images upon
+# Takes the from "branch-name=base-image-ref"
+REBUILT_BASE_IMAGES=()
+
+for BRANCH in "$@"; do
+  echo "::group::Running maintenance for $BRANCH"
+
+  # 0. Determine if this is a development branch and the most current release
+  IS_DEV=0
+  if [[ "$BRANCH" = "$DEVELOPMENT_BRANCH" ]]; then
+    IS_DEV=1
+  fi
+  IS_CURRENT_RELEASE=0
+  if [[ "$BRANCH" = $( curl -f -sS "https://api.github.com/repos/$GITHUB_REPOSITORY/releases" | jq -r '.[0].tag_name' ) ]]; then
+    IS_CURRENT_RELEASE=1
+  fi
+
+  # 1. Let's get the maintained sources
+  git clone -c advice.detachedHead=false --depth 1 --branch "$BRANCH" "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" "$MAINTENANCE_WORKSPACE/$BRANCH"
+  # Switch context
+  cd "$MAINTENANCE_WORKSPACE/$BRANCH"
+
+  # 2. Now let's apply the patches (we have them checked out in $GITHUB_WORKSPACE, not necessarily in this local checkout)
+  echo "Checking for patches..."
+  if [[ -d ${GITHUB_WORKSPACE}/modules/container-base/src/backports/$BRANCH ]]; then
+    echo "Applying patches now."
+    find "${GITHUB_WORKSPACE}/modules/container-base/src/backports/$BRANCH" -type f -name '*.patch' -print0 | xargs -0 -n1 patch -p1 -l -s -i
+  fi
+
+  # 3. Determine the base image ref (<namespace>/<repo>:<tag>)
+  BASE_IMAGE_REF=""
+  # For the dev branch we want to full flexi stack tag, to detect stack upgrades requiring new build
+  if (( IS_DEV )); then
+    BASE_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )
+  else
+    BASE_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout )
+  fi
+  echo "Determined BASE_IMAGE_REF=$BASE_IMAGE_REF from Maven"
+
+  # 4. Check for Temurin image updates
+  JAVA_IMAGE_REF=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=java.image -q -DforceStdout )
+  echo "Determined JAVA_IMAGE_REF=$JAVA_IMAGE_REF from Maven"
+  NEWER_JAVA_IMAGE=0
+  if check_newer_parent "$JAVA_IMAGE_REF" "$BASE_IMAGE_REF"; then
+    NEWER_JAVA_IMAGE=1
+  fi
+
+  # 5. Check for package updates in base image
+  PKGS="$( grep "ARG PKGS" modules/container-base/src/main/docker/Dockerfile | cut -f2 -d= | tr -d '"' )"
+  echo "Determined installed packages=\"$PKGS\" from Maven"
+  NEWER_PKGS=0
+  # Don't bother with package checks if the java image is newer already
+  if ! (( NEWER_JAVA_IMAGE )); then
+    if check_newer_pkgs "$BASE_IMAGE_REF" "$PKGS"; then
+      NEWER_PKGS=1
+    fi
+  fi
+
+  # 6. Get current immutable revision tag if not on the dev branch
+  REV=$( current_revision "$BASE_IMAGE_REF" )
+  CURRENT_REV_TAG="${BASE_IMAGE_REF#*:}-r$REV"
+  NEXT_REV_TAG="${BASE_IMAGE_REF#*:}-r$(( REV + 1 ))"
+
+  # 7. Let's put together what tags we want added to this build run
+  TAG_OPTIONS=""
+  if ! (( IS_DEV )); then
+    TAG_OPTIONS="-Dbase.image=$BASE_IMAGE_REF -Ddocker.tags.revision=$NEXT_REV_TAG"
+    # In case of the current release, add the "latest" tag as well.
+    if (( IS_CURRENT_RELEASE )); then
+      TAG_OPTIONS="$TAG_OPTIONS -Ddocker.tags.latest=latest"
+    fi
+  else
+    UPCOMING_TAG=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image.tag -Dbase.image.tag.suffix="" -q -DforceStdout )
+    TAG_OPTIONS="-Ddocker.tags.develop=unstable -Ddocker.tags.upcoming=$UPCOMING_TAG"
+
+    # For the dev branch we only have rolling tags and can add them now already
+    SUPPORTED_ROLLING_TAGS+=("[\"unstable\", \"$UPCOMING_TAG\", \"${BASE_IMAGE_REF#*:}\"]")
+  fi
+  echo "Determined these additional Maven tag options: $TAG_OPTIONS"
+
+  # 8. Let's build the base image if necessary
+  NEWER_IMAGE=0
+  if (( NEWER_JAVA_IMAGE + NEWER_PKGS + FORCE_BUILD > 0 )); then
+    if ! (( DRY_RUN )); then
+      # shellcheck disable=SC2046
+      mvn -Pct -f modules/container-base deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \
+        -Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS \
+        $( if (( DAMP_RUN )); then echo "-Ddocker.skip.push -Ddocker.skip.tag"; fi )
+    else
+      echo "Skipping Maven build as requested by DRY_RUN=1"
+    fi
+    NEWER_IMAGE=1
+    # Save the information about the immutable or rolling tag we just built
+    if ! (( IS_DEV )); then
+      REBUILT_BASE_IMAGES+=("$BRANCH=${BASE_IMAGE_REF%:*}:$NEXT_REV_TAG")
+    else
+      REBUILT_BASE_IMAGES+=("$BRANCH=$BASE_IMAGE_REF")
+    fi
+  else
+    echo "No rebuild necessary, we're done here."
+  fi
+
+  # 9. Add list of rolling and immutable tags for release builds
+  if ! (( IS_DEV )); then
+    RELEASE_TAGS_LIST="["
+    if (( IS_CURRENT_RELEASE )); then
+      RELEASE_TAGS_LIST+="\"latest\", "
+    fi
+    RELEASE_TAGS_LIST+="\"${BASE_IMAGE_REF#*:}\", "
+    if (( NEWER_IMAGE )); then
+      RELEASE_TAGS_LIST+="\"$NEXT_REV_TAG\"]"
+    else
+      RELEASE_TAGS_LIST+="\"$CURRENT_REV_TAG\"]"
+    fi
+    SUPPORTED_ROLLING_TAGS+=("${RELEASE_TAGS_LIST}")
+  fi
+
+  echo "::endgroup::"
+done
+
+# Built the output which base images have actually been rebuilt as JSON
+REBUILT_IMAGES="["
+for IMAGE in "${REBUILT_BASE_IMAGES[@]}"; do
+  REBUILT_IMAGES+=" \"$IMAGE\" "
+done
+REBUILT_IMAGES+="]"
+echo "rebuilt_images=${REBUILT_IMAGES//  /, }" | tee -a "${GITHUB_OUTPUT}"
+
+# Built the supported rolling tags matrix as JSON
+SUPPORTED_TAGS="{"
+for (( i=0; i < ${#SUPPORTED_ROLLING_TAGS[@]} ; i++ )); do
+  j=$((i+1))
+  SUPPORTED_TAGS+="\"${!j}\": ${SUPPORTED_ROLLING_TAGS[$i]}"
+  (( i < ${#SUPPORTED_ROLLING_TAGS[@]}-1 )) && SUPPORTED_TAGS+=", "
+done
+SUPPORTED_TAGS+="}"
+echo "supported_tag_matrix=$SUPPORTED_TAGS" | tee -a "$GITHUB_OUTPUT"
diff --git a/.github/workflows/scripts/containers/maintain-configbaker.sh b/.github/workflows/scripts/containers/maintain-configbaker.sh
new file mode 100755
index 00000000000..0b5b60b459c
--- /dev/null
+++ b/.github/workflows/scripts/containers/maintain-configbaker.sh
@@ -0,0 +1,199 @@
+#!/bin/bash
+
+# A matrix-like job to maintain a number of releases as well as the latest snap of Dataverse.
+
+# PREREQUISITES:
+# - You have Java, Maven, QEMU and Docker all setup and ready to go
+# - You obviously checked out the develop branch, otherwise you'd not be executing this script
+# - You added all the branch names you want to run maintenance for as arguments
+# Optional, but recommended:
+# - You added a DEVELOPMENT_BRANCH env var to your runner/job env with the name of the development branch
+# - You added a FORCE_BUILD=0|1 env var to indicate if the base image build should be forced
+# - You added a PLATFORMS env var with all the target platforms you want to build for
+# Optional:
+# - Use DRY_RUN=1 env var to skip actually building, but see how the tag lookups play out
+# - Use DAMP_RUN=1 env var to skip pushing images, but build them
+
+# NOTE:
+# This script is a culmination of Github Action steps into a single script.
+# The reason to put all of this in here is due to the complexity of the Github Action and the limitation of the
+# matrix support in Github actions, where outputs cannot be aggregated or otherwise used further.
+
+set -euo pipefail
+
+# Get all the inputs
+# If not within a runner, just print to stdout (duplicating the output in case of tee usage, but that's ok for testing)
+GITHUB_OUTPUT=${GITHUB_OUTPUT:-"/proc/self/fd/1"}
+GITHUB_ENV=${GITHUB_ENV:-"/proc/self/fd/1"}
+GITHUB_WORKSPACE=${GITHUB_WORKSPACE:-"$(pwd)"}
+GITHUB_SERVER_URL=${GITHUB_SERVER_URL:-"https://github.com"}
+GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-"IQSS/dataverse"}
+
+MAINTENANCE_WORKSPACE="${GITHUB_WORKSPACE}/maintenance-job"
+
+DEVELOPMENT_BRANCH="${DEVELOPMENT_BRANCH:-"develop"}"
+FORCE_BUILD="${FORCE_BUILD:-"0"}"
+DRY_RUN="${DRY_RUN:-"0"}"
+DAMP_RUN="${DAMP_RUN:-"0"}"
+PLATFORMS="${PLATFORMS:-"linux/amd64,linux/arm64"}"
+
+# Setup and validation
+if [[ -z "$*" ]]; then
+  >&2 echo "You must give a list of branch names as arguments"
+  exit 1;
+fi
+
+if (( DRY_RUN + DAMP_RUN > 1 )); then
+  >&2 echo "You must either use DRY_RUN=1 or DAMP_RUN=1, but not both"
+  exit 1;
+fi
+
+source "$( dirname "$0" )/utils.sh"
+
+# Delete old stuff if present
+rm -rf "$MAINTENANCE_WORKSPACE"
+mkdir -p "$MAINTENANCE_WORKSPACE"
+
+# Store the image tags we maintain in this array (same order as branches array!)
+# This list will be used to build the support matrix within the Docker Hub image description
+SUPPORTED_ROLLING_TAGS=()
+# Store the tags of config baker images we are actually rebuilding
+# Takes the from "branch-name=config-image-ref"
+REBUILT_CONFIG_IMAGES=()
+
+for BRANCH in "$@"; do
+  echo "::group::Running maintenance for $BRANCH"
+
+  # 0. Determine if this is a development branch and the most current release
+  IS_DEV=0
+  if [[ "$BRANCH" = "$DEVELOPMENT_BRANCH" ]]; then
+    IS_DEV=1
+  fi
+  IS_CURRENT_RELEASE=0
+  if [[ "$BRANCH" = $( curl -f -sS "https://api.github.com/repos/$GITHUB_REPOSITORY/releases" | jq -r '.[0].tag_name' ) ]]; then
+    IS_CURRENT_RELEASE=1
+  fi
+
+  # 1. Let's get the maintained sources
+  git clone -c advice.detachedHead=false --depth=1 --branch "$BRANCH" "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" "$MAINTENANCE_WORKSPACE/$BRANCH"
+  # Switch context
+  cd "$MAINTENANCE_WORKSPACE/$BRANCH"
+
+  # 2. Now let's apply the patches (we have them checked out in $GITHUB_WORKSPACE, not necessarily in this local checkout)
+  echo "Checking for patches..."
+  if [[ -d ${GITHUB_WORKSPACE}/modules/container-configbaker/backports/$BRANCH ]]; then
+    echo "Applying patches now."
+    find "${GITHUB_WORKSPACE}/modules/container-configbaker/backports/$BRANCH" -type f -name '*.patch' -print0 | xargs -0 -n1 patch -p1 -l -s -i
+  fi
+
+  # 3a. Determine the base image ref (<namespace>/<repo>:<tag>)
+  BASE_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f . -Dexpression=conf.image.base -q -DforceStdout )
+  echo "Determined BASE_IMAGE_REF=$BASE_IMAGE_REF from Maven"
+
+  # 3b. Determine the configbaker image ref (<namespace>/<repo>:<tag>)
+  CONFIG_IMAGE_REF=""
+  if (( IS_DEV )); then
+    # Results in the rolling tag for the dev branch
+    CONFIG_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f . -Dexpression=conf.image -q -DforceStdout )
+  else
+    # Results in the rolling tag for the release branch (the fixed tag will be determined from this rolling tag)
+    # shellcheck disable=SC2016
+    CONFIG_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f . -Dexpression=conf.image -Dconf.image.tag='${app.image.version}-${conf.image.flavor}' -q -DforceStdout )
+  fi
+  echo "Determined CONFIG_IMAGE_REF=$CONFIG_IMAGE_REF from Maven"
+
+  # 4a. Check for Base image updates
+  NEWER_BASE_IMAGE=0
+  if check_newer_parent "$BASE_IMAGE_REF" "$CONFIG_IMAGE_REF"; then
+    NEWER_BASE_IMAGE=1
+  fi
+
+  # 4b. Check for vulnerabilities in packages fixable by updating
+  FIXES_AVAILABLE=0
+  if ! (( NEWER_BASE_IMAGE )) && check_trivy_fixes_for_os "$CONFIG_IMAGE_REF"; then
+    FIXES_AVAILABLE=1
+  fi
+
+  # 5. Get current immutable revision tag if not on the dev branch
+  REV=$( current_revision "$CONFIG_IMAGE_REF" )
+  CURRENT_REV_TAG="${CONFIG_IMAGE_REF#*:}-r$REV"
+  NEXT_REV_TAG="${CONFIG_IMAGE_REF#*:}-r$(( REV + 1 ))"
+
+  # 6. Let's put together what tags we want added to this build run
+  TAG_OPTIONS=""
+  if ! (( IS_DEV )); then
+    TAG_OPTIONS="-Dconf.image=$CONFIG_IMAGE_REF -Ddocker.tags.revision=$NEXT_REV_TAG"
+    # In case of the current release, add the "latest" tag as well.
+    if (( IS_CURRENT_RELEASE )); then
+      TAG_OPTIONS="$TAG_OPTIONS -Ddocker.tags.latest=latest"
+    fi
+  else
+    # shellcheck disable=SC2016
+    UPCOMING_TAG=$( mvn initialize help:evaluate -Pct -f . -Dexpression=conf.image.tag -Dconf.image.tag='${app.image.version}-${conf.image.flavor}' -q -DforceStdout )
+    TAG_OPTIONS="-Ddocker.tags.upcoming=$UPCOMING_TAG"
+
+    # For the dev branch we only have rolling tags and can add them now already
+    SUPPORTED_ROLLING_TAGS+=("[\"unstable\", \"$UPCOMING_TAG\"]")
+  fi
+  echo "Determined these additional Maven tag options: $TAG_OPTIONS"
+
+  # 8. Let's build the base image if necessary
+  NEWER_IMAGE=0
+  if (( NEWER_BASE_IMAGE + FIXES_AVAILABLE + FORCE_BUILD > 0 )); then
+    if ! (( DRY_RUN )); then
+      # Build the application image, but skip the configbaker image (that's a different job)!
+      # shellcheck disable=SC2046
+      mvn -Pct -f . deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \
+        -Dapp.skipBuild -Dconf.image.base="${BASE_IMAGE_REF}" \
+        -Dmaven.main.skip -Dmaven.test.skip -Dmaven.war.skip \
+        -Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS \
+        $( if (( DAMP_RUN )); then echo "-Ddocker.skip.push -Ddocker.skip.tag"; fi )
+    else
+      echo "Skipping Maven build as requested by DRY_RUN=1"
+    fi
+    NEWER_IMAGE=1
+    # Save the information about the immutable or rolling tag we just built
+    if ! (( IS_DEV )); then
+      REBUILT_CONFIG_IMAGES+=("$BRANCH=${CONFIG_IMAGE_REF%:*}:$NEXT_REV_TAG")
+    else
+      REBUILT_CONFIG_IMAGES+=("$BRANCH=$CONFIG_IMAGE_REF")
+    fi
+  else
+    echo "No rebuild necessary, we're done here."
+  fi
+
+  # 9. Add list of rolling and immutable tags for release builds
+  if ! (( IS_DEV )); then
+    RELEASE_TAGS_LIST="["
+    if (( IS_CURRENT_RELEASE )); then
+      RELEASE_TAGS_LIST+="\"latest\", "
+    fi
+    RELEASE_TAGS_LIST+="\"${CONFIG_IMAGE_REF#*:}\", "
+    if (( NEWER_IMAGE )); then
+      RELEASE_TAGS_LIST+="\"$NEXT_REV_TAG\"]"
+    else
+      RELEASE_TAGS_LIST+="\"$CURRENT_REV_TAG\"]"
+    fi
+    SUPPORTED_ROLLING_TAGS+=("${RELEASE_TAGS_LIST}")
+  fi
+
+  echo "::endgroup::"
+done
+
+# Built the output which images have actually been rebuilt as JSON
+REBUILT_IMAGES="["
+for IMAGE in "${REBUILT_CONFIG_IMAGES[@]}"; do
+  REBUILT_IMAGES+=" \"$IMAGE\" "
+done
+REBUILT_IMAGES+="]"
+echo "rebuilt_images=${REBUILT_IMAGES//  /, }" | tee -a "${GITHUB_OUTPUT}"
+
+# Built the supported rolling tags matrix as JSON
+SUPPORTED_TAGS="{"
+for (( i=0; i < ${#SUPPORTED_ROLLING_TAGS[@]} ; i++ )); do
+  j=$((i+1))
+  SUPPORTED_TAGS+="\"${!j}\": ${SUPPORTED_ROLLING_TAGS[$i]}"
+  (( i < ${#SUPPORTED_ROLLING_TAGS[@]}-1 )) && SUPPORTED_TAGS+=", "
+done
+SUPPORTED_TAGS+="}"
+echo "supported_tag_matrix=$SUPPORTED_TAGS" | tee -a "$GITHUB_OUTPUT"
diff --git a/.github/workflows/scripts/containers/utils.sh b/.github/workflows/scripts/containers/utils.sh
new file mode 100644
index 00000000000..a61df5467fe
--- /dev/null
+++ b/.github/workflows/scripts/containers/utils.sh
@@ -0,0 +1,134 @@
+#!/bin/bash
+
+set -euo pipefail
+
+function is_bin_in_path {
+  builtin type -P "$1" &> /dev/null
+}
+
+function check_newer_parent() {
+  PARENT_IMAGE="$1"
+  # Get namespace, default to "library" if not found
+  PARENT_IMAGE_NS="${PARENT_IMAGE%/*}"
+  if [[ "$PARENT_IMAGE_NS" = "${PARENT_IMAGE}" ]]; then
+    PARENT_IMAGE_NS="library"
+  fi
+  PARENT_IMAGE_REPO_CUT_NS="${PARENT_IMAGE#*/}"
+  PARENT_IMAGE_REPO="${PARENT_IMAGE_REPO_CUT_NS%:*}"
+  PARENT_IMAGE_TAG="${PARENT_IMAGE#*:}"
+
+  PARENT_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${PARENT_IMAGE_NS}/repositories/${PARENT_IMAGE_REPO}/tags/${PARENT_IMAGE_TAG}" | jq -r .last_updated )"
+  if [[ "$PARENT_IMAGE_LAST_UPDATE" = "null" ]]; then
+    echo "::error title='Invalid PARENT Image'::Could not find ${PARENT_IMAGE} in the registry"
+    exit 1
+  fi
+
+  DERIVED_IMAGE="$2"
+  # Get namespace, default to "library" if not found
+  DERIVED_IMAGE_NS="${DERIVED_IMAGE%/*}"
+  if [[ "${DERIVED_IMAGE_NS}" = "${DERIVED_IMAGE}" ]]; then
+    DERIVED_IMAGE_NS="library"
+  fi
+  DERIVED_IMAGE_REPO="$( echo "${DERIVED_IMAGE%:*}" | cut -f2 -d/ )"
+  DERIVED_IMAGE_TAG="${DERIVED_IMAGE#*:}"
+
+  DERIVED_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${DERIVED_IMAGE_NS}/repositories/${DERIVED_IMAGE_REPO}/tags/${DERIVED_IMAGE_TAG}" | jq -r .last_updated )"
+  if [[ "$DERIVED_IMAGE_LAST_UPDATE" = "null" || "$DERIVED_IMAGE_LAST_UPDATE" < "$PARENT_IMAGE_LAST_UPDATE" ]]; then
+    echo "Parent image $PARENT_IMAGE has a newer release ($PARENT_IMAGE_LAST_UPDATE), which is more recent than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)"
+    return 0
+  else
+    echo "Parent image $PARENT_IMAGE ($PARENT_IMAGE_LAST_UPDATE) is older than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)"
+    return 1
+  fi
+}
+
+function check_newer_pkgs() {
+  IMAGE="$1"
+  PKGS="$2"
+
+  docker run --rm -u 0 "${IMAGE}" sh -c "apt update >/dev/null 2>&1 && apt install -s ${PKGS}" | tee /proc/self/fd/2 | grep -q "0 upgraded"
+  STATUS=$?
+
+  if [[ $STATUS -eq 0 ]]; then
+    echo "Base image $IMAGE has no updates for our custom installed packages"
+    return 1
+  else
+    echo "Base image $IMAGE needs updates for our custom installed packages"
+    return 0
+  fi
+
+  # TODO: In a future version of this script, we might want to include checking for other security updates,
+  #       not just updates to the packages we installed.
+  # grep security /etc/apt/sources.list > /tmp/security.list
+  # apt-get update -oDir::Etc::Sourcelist=/tmp/security.list
+  # apt-get dist-upgrade -y -oDir::Etc::Sourcelist=/tmp/security.list -oDir::Etc::SourceParts=/bin/false -s
+
+}
+
+function check_trivy_fixes_for_os() {
+  IMAGE_REF="$1"
+  if [[ -z "$IMAGE_REF" ]]; then
+    echo "You must give an image reference as argument to check_trivy_fixes_for_os"
+    exit 1
+  fi
+  is_bin_in_path trivy || { echo "Trivy Scanner not installed" 1>&2; exit 1; }
+  JSON_REPORT=$(mktemp)
+
+  trivy image --ignore-unfixed --scanners vuln --disable-telemetry --pkg-types os -f json "$IMAGE_REF" -o "$JSON_REPORT"
+
+  HAS_FIXES=$( jq -r '.Results[] | select(has("Vulnerabilities") and .Vulnerabilities != null and (.Vulnerabilities | length > 100)) | .Vulnerabilities | length > 0' "$JSON_REPORT")
+  if [[ "true" = "$HAS_FIXES" ]]; then
+    echo "Trivy Scan showed fixes to known vulnerabilities by updating packages exist for image $IMAGE_REF"
+    return 0
+  else
+    echo "Trivy Scan showed no fixes to known vulnerabilities by updating packages exist for image $IMAGE_REF"
+    return 1
+  fi
+}
+
+function current_revision() {
+  IMAGE="$1"
+  IMAGE_NS_REPO="${IMAGE%:*}"
+  IMAGE_TAG="${IMAGE#*:}"
+
+  if [[ "$IMAGE_TAG" = "$IMAGE_NS_REPO" ]]; then
+    >&2 echo "You must provide an image reference in the format [<namespace>/]<repo>:<tag>"
+    exit 1
+  fi
+
+  case "$IMAGE_NS_REPO" in
+      */*) :;; # namespace/repository syntax, leave as is
+      *) IMAGE_NS_REPO="library/$IMAGE_NS_REPO";; # bare repository name (docker official image); must convert to namespace/repository syntax
+  esac
+
+  # Without such a token we may run into rate limits
+  # OB 2024-09-16: for some reason using this token stopped working. Let's go without and see if we really fall into rate limits.
+  # token=$( curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$IMAGE_NS_REPO:pull" )
+
+  ALL_TAGS="$(
+    i=0
+    while [ $? == 0 ]; do
+        i=$((i+1))
+        # OB 2024-09-16: for some reason using this token stopped working. Let's go without and see if we really fall into rate limits.
+        # RESULT=$( curl -s -H "Authorization: Bearer $token" "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" )
+        RESULT=$( curl -s "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" )
+        if [[ $( echo "$RESULT" | jq '.message' ) != "null" ]]; then
+          # If we run into an error on the first attempt, that means we have a problem.
+          if [[ "$i" == "1" ]]; then
+            >&2 echo "Error when retrieving tag data: $( echo "$RESULT" | jq '.message' )"
+            exit 2
+          # Otherwise it will just mean we reached the last page already
+          else
+            break
+          fi
+        else
+          echo "$RESULT" | jq -r '."results"[]["name"]'
+          # DEBUG:
+          #echo "$RESULT" | >&2 jq -r '."results"[]["name"]'
+        fi
+    done
+  )"
+
+  # Note: if a former tag could not be found, it just might not exist already. Start new series with rev 0
+  echo "$ALL_TAGS" | grep "${IMAGE_TAG}-r" | sed -e "s#${IMAGE_TAG}-r##" | sort -h | tail -n1 || echo "-1"
+}
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
new file mode 100644
index 00000000000..fb9cf5a0a1f
--- /dev/null
+++ b/.github/workflows/shellcheck.yml
@@ -0,0 +1,45 @@
+name: "Shellcheck"
+on:
+    push:
+        branches:
+            - develop
+        paths:
+            - conf/solr/**/.sh
+            - modules/container-base/**/*.sh
+            - modules/container-configbaker/**/*.sh
+    pull_request:
+        branches:
+            - develop
+        paths:
+            - conf/solr/**/*.sh
+            - modules/container-base/**/*.sh
+            - modules/container-configbaker/**/*.sh
+jobs:
+    shellcheck:
+        name: Shellcheck
+        runs-on: ubuntu-latest
+        permissions:
+            pull-requests: write
+        steps:
+            - uses: actions/checkout@v4
+            - name: shellcheck
+              uses: reviewdog/action-shellcheck@v1
+              with:
+                  github_token: ${{ secrets.github_token }}
+                  reporter: github-pr-review # Change reporter.
+                  fail_on_error: true
+                  # Container base image uses dumb-init shebang, so nail to using bash
+                  shellcheck_flags: "--shell=bash --external-sources"
+                  # Exclude old scripts
+                  exclude: |
+                      */.git/*
+                      doc/*
+                      downloads/*
+                      scripts/database/*
+                      scripts/globalid/*
+                      scripts/icons/*
+                      scripts/installer/*
+                      scripts/issues/*
+                      scripts/r/*
+                      scripts/tests/*
+                      tests/*
diff --git a/.github/workflows/shellspec.yml b/.github/workflows/shellspec.yml
new file mode 100644
index 00000000000..cc09992edac
--- /dev/null
+++ b/.github/workflows/shellspec.yml
@@ -0,0 +1,54 @@
+name: "Shellspec"
+on:
+    push:
+        paths:
+            - tests/shell/**
+            - conf/solr/**
+            # add more when more specs are written relying on data
+    pull_request:
+        paths:
+            - tests/shell/**
+            - conf/solr/**
+            # add more when more specs are written relying on data
+env:
+    SHELLSPEC_VERSION: 0.28.1
+jobs:
+    shellspec-ubuntu:
+        name: "Ubuntu"
+        runs-on: ubuntu-latest
+        steps:
+            - name: Install shellspec
+              run: curl -fsSL https://git.io/shellspec | sh -s ${{ env.SHELLSPEC_VERSION }} --yes
+            - uses: actions/checkout@v4
+            - name: Run Shellspec
+              run: |
+                  cd tests/shell
+                  shellspec
+    shellspec-rocky9:
+        name: "RockyLinux 9"
+        runs-on: ubuntu-latest
+        container:
+            image: rockylinux/rockylinux:9
+        steps:
+            - uses: actions/checkout@v4
+            - name: Install shellspec
+              run: |
+                  curl -fsSL https://github.com/shellspec/shellspec/releases/download/${{ env.SHELLSPEC_VERSION }}/shellspec-dist.tar.gz | tar -xz -C /usr/share
+                  ln -s /usr/share/shellspec/shellspec /usr/bin/shellspec
+            - name: Install dependencies
+              run: dnf install -y ed bc diffutils
+            - name: Run shellspec
+              run: |
+                  cd tests/shell
+                  shellspec
+    shellspec-macos:
+        name: "MacOS"
+        runs-on: macos-latest
+        steps:
+            - name: Install shellspec
+              run: curl -fsSL https://git.io/shellspec | sh -s 0.28.1 --yes
+            - uses: actions/checkout@v4
+            - name: Run Shellspec
+              run: |
+                  cd tests/shell
+                  /Users/runner/.local/bin/shellspec
diff --git a/.github/workflows/spi_release.yml b/.github/workflows/spi_release.yml
new file mode 100644
index 00000000000..6398edca412
--- /dev/null
+++ b/.github/workflows/spi_release.yml
@@ -0,0 +1,94 @@
+name: Dataverse SPI
+
+on:
+    push:
+        branches:
+            - "develop"
+        paths:
+            - "modules/dataverse-spi/**"
+    pull_request:
+        branches:
+            - "develop"
+        paths:
+            - "modules/dataverse-spi/**"
+
+jobs:
+    # Note: Pushing packages to Maven Central requires access to secrets, which pull requests from remote forks
+    #       don't have. Skip in these cases.
+    check-secrets:
+        name: Check for Secrets Availability
+        runs-on: ubuntu-latest
+        outputs:
+            available: ${{ steps.secret-check.outputs.available }}
+        steps:
+            -   id: secret-check
+                # perform secret check & put boolean result as an output
+                shell: bash
+                run: |
+                    if [ "${{ secrets.DATAVERSEBOT_SONATYPE_USERNAME }}" != '' ]; then
+                        echo "available=true" >> $GITHUB_OUTPUT;
+                    else
+                        echo "available=false" >> $GITHUB_OUTPUT;
+                    fi
+
+    snapshot:
+        name: Release Snapshot
+        needs: check-secrets
+        runs-on: ubuntu-latest
+        if: github.event_name == 'pull_request' && needs.check-secrets.outputs.available == 'true'
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-java@v4
+              with:
+                  java-version: '17'
+                  distribution: 'adopt'
+                  server-id: ossrh
+                  server-username: MAVEN_USERNAME
+                  server-password: MAVEN_PASSWORD
+            - uses: actions/cache@v4
+              with:
+                  path: ~/.m2
+                  key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+                  restore-keys: ${{ runner.os }}-m2
+
+            - name: Deploy Snapshot
+              run: mvn -f modules/dataverse-spi -Dproject.version.suffix="-PR${{ github.event.number }}-SNAPSHOT" deploy
+              env:
+                  MAVEN_USERNAME: ${{ secrets.DATAVERSEBOT_SONATYPE_USERNAME }}
+                  MAVEN_PASSWORD: ${{ secrets.DATAVERSEBOT_SONATYPE_TOKEN }}
+
+    release:
+        name: Release
+        needs: check-secrets
+        runs-on: ubuntu-latest
+        if: github.event_name == 'push' && needs.check-secrets.outputs.available == 'true'
+        steps:
+            -   uses: actions/checkout@v4
+            -   uses: actions/setup-java@v4
+                with:
+                    java-version: '17'
+                    distribution: 'adopt'
+            -   uses: actions/cache@v4
+                with:
+                    path: ~/.m2
+                    key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+                    restore-keys: ${{ runner.os }}-m2
+
+            # Running setup-java again overwrites the settings.xml - IT'S MANDATORY TO DO THIS SECOND SETUP!!!
+            -   name: Set up Maven Central Repository
+                uses: actions/setup-java@v4
+                with:
+                    java-version: '17'
+                    distribution: 'adopt'
+                    server-id: ossrh
+                    server-username: MAVEN_USERNAME
+                    server-password: MAVEN_PASSWORD
+                    gpg-private-key: ${{ secrets.DATAVERSEBOT_GPG_KEY }}
+                    gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+            -   name: Sign + Publish Release
+                run: mvn -f modules/dataverse-spi -P release deploy
+                env:
+                    MAVEN_USERNAME: ${{ secrets.DATAVERSEBOT_SONATYPE_USERNAME }}
+                    MAVEN_PASSWORD: ${{ secrets.DATAVERSEBOT_SONATYPE_TOKEN }}
+                    MAVEN_GPG_PASSPHRASE: ${{ secrets.DATAVERSEBOT_GPG_PASSWORD }}
diff --git a/.gitignore b/.gitignore
index 2904bc578f2..bb9686ae629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ GRTAGS
 .Trashes
 ehthumbs.db
 Thumbs.db
-.vagrant
 *.pyc
 *.swp
 scripts/api/py_api_wrapper/demo-data/*
@@ -34,17 +33,12 @@ oauth-credentials.md
 
 /src/main/webapp/oauth2/newAccount.html
 scripts/api/setup-all.sh*
+scripts/api/setup-all.*.log
+src/main/resources/edu/harvard/iq/dataverse/openapi/
 
 # ctags generated tag file
 tags
 
-# dependencies I'm not sure we're allowed to redistribute / have in version control
-conf/docker-aio/dv/deps/
-
-# no need to check aoi installer zip into vc
-conf/docker-aio/dv/install/dvinstall.zip
-# or copy of test data
-conf/docker-aio/testdata/
 scripts/installer/default.config
 *.pem
 
@@ -60,3 +54,13 @@ scripts/installer/default.config
 tests/node_modules
 tests/package-lock.json
 venv
+
+# from thumbnail tests in SearchIT
+scripts/search/data/binary/trees.png.thumb140
+src/main/webapp/resources/images/cc0.png.thumb140
+src/main/webapp/resources/images/dataverseproject.png.thumb140
+
+# Docker development volumes
+/conf/keycloak/docker-dev-volumes
+/docker-dev-volumes
+/.vs
diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 00000000000..cadaedc1448
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,21 @@
+version: 2
+
+# HTML is always built, these are additional formats only
+formats:
+    - pdf
+
+build:
+    os: ubuntu-22.04
+    tools:
+        python: "3.10"
+    apt_packages:
+        - graphviz
+
+python:
+    install:
+        - requirements: doc/sphinx-guides/requirements.txt
+
+
+sphinx:
+    configuration: doc/sphinx-guides/source/conf.py
+    fail_on_warning: true
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b79030a217f..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: java
-jdk:
-  - openjdk8
-script: mvn -DcompilerArgument=-Xlint:unchecked test -P all-unit-tests
-after_success: mvn jacoco:report coveralls:report 
diff --git a/.travis.yml.future b/.travis.yml.future
deleted file mode 100644
index 8bd747625e4..00000000000
--- a/.travis.yml.future
+++ /dev/null
@@ -1,42 +0,0 @@
-services:
-  - docker
-
-jobs:
-  include:
-    # Execute java unit- and integration tests
-    - stage: test
-      language: java
-      jdk:
-        - oraclejdk8
-      script: mvn -DcompilerArgument=-Xlint:unchecked test -P all-unit-tests
-      after_success: mvn jacoco:report coveralls:report
-
-    # Execute Cypress for UI testing
-    # see https://docs.cypress.io/guides/guides/continuous-integration.html
-    - stage: test
-      language: node_js
-      node_js:
-        - "10"
-      addons:
-        apt:
-          packages:
-            # Ubuntu 16+ does not install this dependency by default, so we need to install it ourselves
-            - libgconf-2-4
-      cache:
-        # Caches $HOME/.npm when npm ci is default script command
-        # Caches node_modules in all other cases
-        npm: true
-        directories:
-          # we also need to cache folder with Cypress binary
-          - ~/.cache
-          # we want to cache the Glassfish and Solr dependencies as well
-          - conf/docker-aio/dv/deps
-      before_install:
-        - cd tests
-      install:
-        - npm ci
-      before_script:
-        - ./run_docker_dataverse.sh
-      script:
-        # --key needs to be injected using CYPRESS_RECORD_KEY to keep it secret
-        - $(npm bin)/cypress run --record
diff --git a/CITATION.cff b/CITATION.cff
new file mode 100644
index 00000000000..d425fe8bb34
--- /dev/null
+++ b/CITATION.cff
@@ -0,0 +1,20 @@
+cff-version: 1.2.0
+title: Dataverse
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - given-names: Gary
+    family-names: King
+    orcid: 'https://orcid.org/0000-0002-5327-7631'
+    affiliation: Harvard University
+identifiers:
+  - type: doi
+    value: 10.1177/0049124107306660
+repository-code: 'https://github.com/IQSS/dataverse'
+url: 'https://dataverse.org'
+abstract: >-
+  Dataverse is an open source software platform designed for
+  sharing, finding, citing, and preserving research data.
+license: Apache-2.0
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000000..4204a1fc85e
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at support at dataverse dot org. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2227286d4d1..4fa6e955b70 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,71 +1,7 @@
 # Contributing to Dataverse
 
-Thank you for your interest in contributing to Dataverse!  We are open to contributions from everyone. You don't need permission to participate. Just jump in. If you have questions, please reach out using one or more of the channels described below.
+Thank you for your interest in contributing to Dataverse! We are open to contributions from everyone.
 
-We aren't just looking for developers. There are many ways to contribute to Dataverse.  We welcome contributions of ideas, bug reports, usability research/feedback, documentation, code, and more!
+Please see our [Contributor Guide][] for how you can help!
 
-## Ideas/Feature Requests
-
-Your idea or feature request might already be captured in the Dataverse [issue tracker] on GitHub but if not, the best way to bring it to the community's attention is by posting on the [dataverse-community Google Group][] or bringing it up on a [Community Call][]. You're also welcome make some noise in the [#dataverse IRC channel][] (which is [logged][]) or cram your idea into 280 characters and mention [@dataverseorg][] on Twitter. To discuss your idea privately, please email it to support@dataverse.org
-
-There's a chance your idea is already on our roadmap, which is available at https://www.iq.harvard.edu/roadmap-dataverse-project
-
-[#dataverse IRC channel]: http://chat.dataverse.org
-[logged]: http://irclog.iq.harvard.edu/dataverse/today
-[issue tracker]: https://github.com/IQSS/dataverse/issues
-[@dataverseorg]: https://twitter.com/dataverseorg
-
-## Usability testing
-
-Please email us at support@dataverse.org if you are interested in participating in usability testing.
-
-## Bug Reports/Issues
-
-An issue is a bug (a feature is no longer behaving the way it should) or a feature (something new to Dataverse that helps users complete tasks). You can browse the Dataverse [issue tracker] on GitHub by open or closed issues or by milestones.
-
-Before submitting an issue, please search the existing issues by using the search bar at the top of the page. If there is an existing open issue that matches the issue you want to report, please add a comment to it.
-
-If there is no pre-existing issue or it has been closed, please click on the "New Issue" button, log in, and write in what the issue is (unless it is a security issue which should be reported privately to security@dataverse.org).
-
-If you do not receive a reply to your new issue or comment in a timely manner, please email support@dataverse.org with a link to the issue.
-
-We are aware of the new issue templates described at https://help.github.com/articles/about-issue-and-pull-request-templates but haven't converted over yet.
-
-### Writing an Issue
-
-For the subject of an issue, please start it by writing the feature or functionality it relates to, i.e. "Create Account:..." or "Dataset Page:...". In the body of the issue, please outline the issue you are reporting with as much detail as possible. In order for the Dataverse development team to best respond to the issue, we need as much information about the issue as you can provide. Include steps to reproduce bugs. Indicate which version you're using, which is shown at the bottom of the page. We love screenshots!
-
-### Issue Attachments
-
-You can attach certain files (images, screenshots, logs, etc.) by dragging and dropping, selecting them, or pasting from the clipboard. Files must be one of GitHub's [supported attachment formats] such as png, gif, jpg, txt, pdf, zip, etc. (Pro tip: A file ending in .log can be renamed to .txt so you can upload it.) If there's no easy way to attach your file, please include a URL that points to the file in question.
-
-[supported attachment formats]: https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/
-
-## Documentation
-
-The source for the documentation at http://guides.dataverse.org/en/latest/ is in the GitHub repo under the "[doc][]" folder. If you find a typo or inaccuracy or something to clarify, please send us a pull request! For more on the tools used to write docs, please see the [documentation][] section of the Developer Guide.
-
-[doc]: https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source
-[documentation]: http://guides.dataverse.org/en/latest/developers/documentation.html
-
-## Code/Pull Requests
-
-We love code contributions. Developers are not limited to the main Dataverse code in this git repo. You can help with API client libraries in your favorite language that are mentioned in the [API Guide][] or create a new library. You can help work on configuration management code that's mentioned in the [Installation Guide][]. The Installation Guide also covers a relatively new concept called "external tools" that allows developers to create their own tools that are available from within an installation of Dataverse.
-
-[API Guide]: http://guides.dataverse.org/en/latest/api
-[Installation Guide]: http://guides.dataverse.org/en/latest/installation
-
-If you are interested in working on the main Dataverse code, great! Before you start coding, please reach out to us either on the [dataverse-community Google Group][], the [dataverse-dev Google Group][], [IRC][] (#dataverse on freenode), or via support@dataverse.org to make sure the effort is well coordinated and we avoid merge conflicts. We maintain a list of [community contributors][] and [dev efforts][] the community is working on so please let us know if you'd like to be added or removed from either list.
-
-Please read http://guides.dataverse.org/en/latest/developers/version-control.html to understand how we use the "git flow" model of development and how we will encourage you to create a GitHub issue (if it doesn't exist already) to associate with your pull request. That page also includes tips on making a pull request.
-
-After making your pull request, your goal should be to help it advance through our kanban board at https://github.com/orgs/IQSS/projects/2 . If no one has moved your pull request to the code review column in a timely manner, please reach out. Note that once a pull request is created for an issue, we'll remove the issue from the board so that we only track one card (the pull request).
-
-Thanks for your contribution!
-
-[dataverse-community Google Group]: https://groups.google.com/group/dataverse-community
-[Community Call]: https://dataverse.org/community-calls
-[dataverse-dev Google Group]: https://groups.google.com/group/dataverse-dev
-[IRC]: http://chat.dataverse.org
-[community contributors]: https://docs.google.com/spreadsheets/d/1o9DD-MQ0WkrYaEFTD5rF_NtyL8aUISgURsAXSL7Budk/edit?usp=sharing
-[dev efforts]: https://github.com/orgs/IQSS/projects/2#column-5298405
+[Contributor Guide]: https://guides.dataverse.org/en/latest/contributor/index.html
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 5f492ea0594..00000000000
--- a/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-# See `conf/docker` for Docker images
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 33bff3a9b50..00000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1 +0,0 @@
-Thank you for contributing an issue to the Dataverse Project! If this is a bug report, please let us know when the issue occurs, which page it occurs on, to whom it occurs, and which version of Dataverse you're using. If this is a feature request, please let us know what you'd like to see and give us some context - what kind of user is the feature intended for, the relevant use cases, and what inspired the request? No matter the issue, screenshots are always welcome.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index c3675b96bc5..00000000000
--- a/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## New Contributors
-
-Welcome! New contributors should at least glance at [CONTRIBUTING.md](/CONTRIBUTING.md), especially the section on pull requests where we encourage you to reach out to other developers before you start coding. Also, please note that we measure code coverage and prefer you write unit tests. Pull requests can still be reviewed without tests or completion of the checklist outlined below. Note that we use the "closes" syntax below to trigger Github's automation to close the corresponding issue once the pull request is merged.
-
-Thanks for your contribution to Dataverse!
-
-## Related Issues
-
-- closes #ISSUE_NUMBER: ISSUE_TITLE
-
-## Pull Request Checklist
-
-- [ ] Unit [tests][] completed
-- [ ] Integration [tests][]: None
-- [ ] Deployment requirements, [SQL updates][], [Solr updates][], etc.: None
-- [ ] [Documentation][docs] completed
-- [ ] Merged latest from "develop" [branch][] and resolved conflicts
-
-[tests]: http://guides.dataverse.org/en/latest/developers/testing.html
-[SQL updates]: http://guides.dataverse.org/en/latest/developers/sql-upgrade-scripts.html
-[Solr updates]: https://github.com/IQSS/dataverse/blob/develop/conf/solr/7.3.0/schema.xml
-[docs]: http://guides.dataverse.org/en/latest/developers/documentation.html
-[branch]: http://guides.dataverse.org/en/latest/developers/branching-strategy.html
diff --git a/README.md b/README.md
index 2bdc0e8edde..2303c001d2c 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,108 @@
-Dataverse&#174; 
+Dataverse&#174;  
 ===============
 
-Dataverse is an [open source][] software platform for sharing, finding, citing, and preserving research data (developed by the [Data Science and Products team](http://www.iq.harvard.edu/people/people/data-science-products) at the [Institute for Quantitative Social Science](http://iq.harvard.edu/) and the [Dataverse community][]).
+![Dataverse-logo](https://github.com/IQSS/dataverse-frontend/assets/7512607/6c4d79e4-7be5-4102-88bd-dfa167dc79d3)
 
-[dataverse.org][] is our home on the web and shows a map of Dataverse installations around the world, a list of [features][], [integrations][] that have been made possible through [REST APIs][], our development [roadmap][], and more.
+## Table of Contents
 
-We maintain a demo site at [demo.dataverse.org][] which you are welcome to use for testing and evaluating Dataverse.
+1. [❓ What is Dataverse?](#what-is-dataverse)
+2. [✔ Try Dataverse](#try-dataverse)
+3. [🌐 Features, Integrations, Roadmaps, and More](#website)
+4. [đŸ“Ĩ Installation](#installation)
+5. [🏘 Community and Support](#community-and-support)
+6. [🧑‍đŸ’ģī¸ Contributing](#contributing)
+7. [⚖ī¸ Legal Information](#legal-informations)
 
-To install Dataverse, please see our [Installation Guide][] which will prompt you to download our [latest release][].
+<a name="what-is-dataverse"></a>
 
-To discuss Dataverse with the community, please join our [mailing list][], participate in a [community call][], chat with us at [chat.dataverse.org][], or attend our annual [Dataverse Community Meeting][].
+## ❓  What is Dataverse?
 
-We love contributors! Please see our [Contributing Guide][] for ways you can help.
+Welcome to DataverseÂŽ, the [open source][] software platform designed for sharing, finding, citing, and preserving research data. Developed by the Dataverse team at the [Institute for Quantitative Social Science](https://iq.harvard.edu/) and the [Dataverse community][], our platform makes it easy for research organizations to host, manage, and share their data with the world.
+
+<a name="try-dataverse"></a>
+
+## ✔  Try Dataverse
+
+We invite you to explore our demo site at [demo.dataverse.org][]. This site is ideal for testing and evaluating Dataverse in a risk-free environment.
+
+<a name="website"></a>
+
+## 🌐 Features, Integrations, Roadmaps, and More
+
+Visit [dataverse.org][], our home on the web, for a comprehensive overview of Dataverse. Here, you will find:
+
+- An interactive map showcasing Dataverse installations worldwide.
+- A detailed list of [features][].
+- Information on [integrations][] that have been made possible through our [REST APIs][].
+- Our [project board][] and development [roadmap][].
+- News, events, and more.
+
+<a name="installation"></a>
+
+## đŸ“Ĩ Installation
+
+Ready to get started? Follow our [Installation Guide][] to download and install the latest release of Dataverse.
+
+If you are using Docker, please refer to our [Container Guide][] for detailed instructions.
+
+<a name="community-and-support"></a>
+
+## 🏘 Community and Support
+
+Engage with the vibrant Dataverse community through various channels:
+
+- **[Mailing List][]**: Join the conversation on our [mailing list][].
+- **[Community Calls][]**: Participate in our regular [community calls][] to discuss new features, ask questions, and share your experiences.
+- **[Chat][]**: Connect with us and other users in real-time at [dataverse.zulipchat.com][].
+- **[Dataverse Community Meeting][]**: Attend our annual [Dataverse Community Meeting][] to network, learn, and collaborate with peers and experts.
+- **[DataverseTV][]**: Watch the video content from the Dataverse community on [DataverseTV][] and on [Harvard's IQSS YouTube channel][].
+
+<a name="contributing"></a>
+## 🧑‍đŸ’ģī¸ Contribute to Dataverse
+
+We love contributors! Whether you are a developer, researcher, or enthusiast, there are many ways you can help.
+
+Visit our [Contributing Guide][] to learn how you can get involved.
+
+Join us in building and enhancing Dataverse to make research data more accessible and impactful. Your support and participation are crucial to our success!
+
+<a name="legal-informations"></a>
+## ⚖ī¸ Legal Information
 
 Dataverse is a trademark of President and Fellows of Harvard College and is registered in the United States.
 
-[![Dataverse Project logo](src/main/webapp/resources/images/dataverseproject_logo.jpg?raw=true "Dataverse Project")](http://dataverse.org)
+---
+For more detailed information, visit our website at [dataverse.org][].
+
+Feel free to [reach out] with any questions or feedback. Happy researching!
+
+[![Dataverse Project logo](src/main/webapp/resources/images/dataverseproject_logo.jpg "Dataverse Project")](http://dataverse.org)
 
 [![API Test Status](https://jenkins.dataverse.org/buildStatus/icon?job=IQSS-dataverse-develop&subject=API%20Test%20Status)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/)
-[![Unit Test Status](https://img.shields.io/travis/IQSS/dataverse?label=Unit%20Test%20Status)](https://travis-ci.org/IQSS/dataverse)
+[![API Test Coverage](https://img.shields.io/jenkins/coverage/jacoco?jobUrl=https%3A%2F%2Fjenkins.dataverse.org%2Fjob%2FIQSS-dataverse-develop&label=API%20Test%20Coverage)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/ws/target/coverage-it/index.html)
+[![Unit Test Status](https://github.com/IQSS/dataverse/actions/workflows/maven_unit_test.yml/badge.svg?branch=develop)](https://github.com/IQSS/dataverse/actions/workflows/maven_unit_test.yml)
 [![Unit Test Coverage](https://img.shields.io/coveralls/github/IQSS/dataverse?label=Unit%20Test%20Coverage)](https://coveralls.io/github/IQSS/dataverse?branch=develop)
+[![Guides Build Status](https://github.com/IQSS/dataverse/actions/workflows/guides_build_sphinx.yml/badge.svg)](https://github.com/IQSS/dataverse/actions/workflows/guides_build_sphinx.yml)
 
 [dataverse.org]: https://dataverse.org
 [demo.dataverse.org]: https://demo.dataverse.org
 [Dataverse community]: https://dataverse.org/developers
-[Installation Guide]: http://guides.dataverse.org/en/latest/installation/index.html
+[Installation Guide]: https://guides.dataverse.org/en/latest/installation/index.html
 [latest release]: https://github.com/IQSS/dataverse/releases
+[Container Guide]: https://guides.dataverse.org/en/latest/container/index.html
 [features]: https://dataverse.org/software-features
+[project board]: https://github.com/orgs/IQSS/projects/34
 [roadmap]: https://www.iq.harvard.edu/roadmap-dataverse-project
 [integrations]: https://dataverse.org/integrations
-[REST APIs]: http://guides.dataverse.org/en/latest/api/index.html
+[REST APIs]: https://guides.dataverse.org/en/latest/api/index.html
 [Contributing Guide]: CONTRIBUTING.md
 [mailing list]: https://groups.google.com/group/dataverse-community
 [community call]: https://dataverse.org/community-calls
-[chat.dataverse.org]: http://chat.dataverse.org
+[Chat]: https://dataverse.zulipchat.com
+[dataverse.zulipchat.com]: https://dataverse.zulipchat.com
 [Dataverse Community Meeting]: https://dataverse.org/events
 [open source]: LICENSE.md
+[community calls]: https://dataverse.org/community-calls
+[DataverseTV]: https://dataverse.org/dataversetv
+[Harvard's IQSS YouTube channel]: https://www.youtube.com/@iqssatharvarduniversity8672
+[reach out]: https://dataverse.org/contact
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index b3c6e7b39a9..00000000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  config.vm.define "standalone", primary: true do |standalone|
-    config.vm.hostname = "standalone"
-    # Uncomment this temporarily to get `vagrant destroy` to work
-    #standalone.vm.box = "puppetlabs/centos-7.2-64-puppet"
-
-    operating_system = "centos"
-    if ENV['OPERATING_SYSTEM'].nil?
-      config.vm.box = "puppetlabs/centos-7.2-64-puppet"
-      config.vm.box_version = '1.0.1'
-    elsif ENV['OPERATING_SYSTEM'] == 'debian'
-      puts "WARNING: Debian specified. Here be dragons! https://github.com/IQSS/dataverse/issues/1059"
-      config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box"
-      config.vm.box = "puppet-vagrant-boxes.puppetlabs.com-debian-73-x64-virtualbox-puppet.box"
-    else
-      operating_system = ENV['OPERATING_SYSTEM']
-      puts "Not sure what do to with operating system: #{operating_system}"
-      exit 1
-    end
-
-    mailserver = "localhost"
-    if ENV['MAIL_SERVER'].nil?
-      puts "MAIL_SERVER environment variable not specified. Using #{mailserver} by default.\nTo specify it in bash: export MAIL_SERVER=localhost"
-    else
-      mailserver = ENV['MAIL_SERVER']
-      puts "MAIL_SERVER environment variable found, using #{mailserver}"
-    end
-
-    config.vm.provider "virtualbox" do |v|
-      v.memory = 2048
-      v.cpus = 1
-    end
-    config.vm.provision "shell", path: "scripts/vagrant/setup.sh"
-    config.vm.provision "shell", path: "scripts/vagrant/setup-solr.sh"
-    config.vm.provision "shell", path: "scripts/vagrant/install-dataverse.sh", args: mailserver
-    # FIXME: get tests working and re-enable them!
-    #config.vm.provision "shell", path: "scripts/vagrant/test.sh"
-
-    config.vm.network "private_network", type: "dhcp"
-    config.vm.network "forwarded_port", guest: 80, host: 8888
-    config.vm.network "forwarded_port", guest: 443, host: 9999
-    config.vm.network "forwarded_port", guest: 8983, host: 8993
-    config.vm.network "forwarded_port", guest: 8080, host: 8088
-    config.vm.network "forwarded_port", guest: 8181, host: 8188
-
-    # FIXME: use /dataverse/downloads instead
-    config.vm.synced_folder "downloads", "/downloads"
-    # FIXME: use /dataverse/conf instead
-    config.vm.synced_folder "conf", "/conf"
-    # FIXME: use /dataverse/scripts instead
-    config.vm.synced_folder "scripts", "/scripts"
-    config.vm.synced_folder ".", "/dataverse"
-  end
-
-  config.vm.define "solr", autostart: false do |solr|
-    config.vm.hostname = "solr"
-    solr.vm.box = "puppet-vagrant-boxes.puppetlabs.com-centos-65-x64-virtualbox-puppet.box"
-    config.vm.synced_folder ".", "/dataverse"
-    config.vm.network "private_network", type: "dhcp"
-    config.vm.network "forwarded_port", guest: 8983, host: 9001
-  end
-
-  config.vm.define "test", autostart: false do |test|
-    config.vm.hostname = "test"
-    test.vm.box = "puppet-vagrant-boxes.puppetlabs.com-centos-65-x64-virtualbox-puppet.box"
-    config.vm.synced_folder ".", "/dataverse"
-    config.vm.network "private_network", type: "dhcp"
-  end
-
-end
diff --git a/checkstyle.xml b/checkstyle.xml
index 5a864136fea..c00fa3a8c0c 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -97,7 +97,9 @@
             <property name="excludes" value="lombok,java.util,org.springframework.web.bind.annotation"/>
         </module>
         -->
-        <!-- <module name="IllegalImport"/> --> <!-- defaults to sun.* packages -->
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="org.apache.commons.lang, org.apache.log4j"/>
+        </module>
         <!-- <module name="RedundantImport"/> -->
         <!-- <module name="UnusedImports">
             <property name="processJavadoc" value="false"/>
diff --git a/conf/docker-aio/0prep_deps.sh b/conf/docker-aio/0prep_deps.sh
deleted file mode 100755
index 2170631e645..00000000000
--- a/conf/docker-aio/0prep_deps.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-if [ ! -d dv/deps ]; then
-	mkdir -p dv/deps
-fi
-wdir=`pwd`
-if [ ! -e dv/deps/glassfish4dv.tgz ]; then
-	echo "glassfish dependency prep"
-	mkdir -p /tmp/dv-prep/gf
-	cd /tmp/dv-prep/gf
-	wget http://download.java.net/glassfish/4.1/release/glassfish-4.1.zip
-	wget http://search.maven.org/remotecontent?filepath=org/jboss/weld/weld-osgi-bundle/2.2.10.Final/weld-osgi-bundle-2.2.10.Final-glassfish4.jar -O weld-osgi-bundle-2.2.10.Final-glassfish4.jar
-	unzip glassfish-4.1.zip
-	rm glassfish4/glassfish/modules/weld-osgi-bundle.jar
-	mv weld-osgi-bundle-2.2.10.Final-glassfish4.jar glassfish4/glassfish/modules
-	tar zcf $wdir/dv/deps/glassfish4dv.tgz glassfish4
-	cd $wdir
-	# assuming that folks usually have /tmp auto-clean as needed
-fi
-
-if [ ! -e dv/deps/solr-7.3.1dv.tgz ]; then
-	echo "solr dependency prep"
-	# schema changes *should* be the only ones...
-	cd dv/deps/
-	#wget https://archive.apache.org/dist/lucene/solr/7.3.0/solr-7.3.0.tgz -O solr-7.3.0dv.tgz
-	wget https://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz -O solr-7.3.1dv.tgz
-	cd ../../
-fi
-
diff --git a/conf/docker-aio/1prep.sh b/conf/docker-aio/1prep.sh
deleted file mode 100755
index 1dc95f8d45c..00000000000
--- a/conf/docker-aio/1prep.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# move things necessary for integration tests into build context.
-# this was based off the phoenix deployment; and is likely uglier and bulkier than necessary in a perfect world
-
-mkdir -p testdata/doc/sphinx-guides/source/_static/util/
-cp ../solr/7.3.1/schema*.xml testdata/
-cp ../solr/7.3.1/solrconfig.xml testdata/
-cp ../solr/7.3.1/updateSchemaMDB.sh testdata/
-cp ../jhove/jhove.conf testdata/
-cp ../jhove/jhoveConfig.xsd testdata/
-cd ../../
-cp -r scripts conf/docker-aio/testdata/
-cp doc/sphinx-guides/source/_static/util/createsequence.sql conf/docker-aio/testdata/doc/sphinx-guides/source/_static/util/
-
-# not using dvinstall.zip for setupIT.bash; but still used in install.bash for normal ops
-mvn clean
-./scripts/installer/custom-build-number
-mvn package
-cd scripts/installer
-make clean
-make
-mkdir -p ../../conf/docker-aio/dv/install
-cp dvinstall.zip ../../conf/docker-aio/dv/install/
-
-# ITs sometimes need files server-side
-# yes, these copies could be avoided by moving the build root here. but the build 
-#  context is already big enough that it seems worth avoiding.
-cd ../../
-cp src/test/java/edu/harvard/iq/dataverse/makedatacount/sushi_sample_logs.json conf/docker-aio/testdata/
diff --git a/conf/docker-aio/c7.dockerfile b/conf/docker-aio/c7.dockerfile
deleted file mode 100644
index 7436b73664c..00000000000
--- a/conf/docker-aio/c7.dockerfile
+++ /dev/null
@@ -1,82 +0,0 @@
-FROM centos:7
-# OS dependencies
-RUN yum install -y https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
-#RUN yum install -y java-1.8.0-openjdk-headless postgresql-server sudo epel-release unzip perl curl httpd
-RUN yum install -y java-1.8.0-openjdk-devel postgresql96-server sudo epel-release unzip perl curl httpd
-RUN yum install -y jq lsof awscli
-
-# copy and unpack dependencies (solr, glassfish)
-COPY dv /tmp/dv
-COPY testdata/schema*.xml /tmp/dv/
-COPY testdata/solrconfig.xml /tmp/dv
-
-# ITs need files
-COPY testdata/sushi_sample_logs.json /tmp/
-
-# IPv6 and localhost appears to be related to some of the intermittant connection issues
-COPY disableipv6.conf /etc/sysctl.d/
-RUN rm /etc/httpd/conf/*
-COPY httpd.conf /etc/httpd/conf 
-RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.3.1dv.tgz 
-RUN cd /opt ; tar zxf /tmp/dv/deps/glassfish4dv.tgz
-
-# this copy of domain.xml is the result of running `asadmin set server.monitoring-service.module-monitoring-levels.jvm=LOW` on a default glassfish installation (aka - enable the glassfish REST monitir endpoint for the jvm`
-COPY domain-restmonitor.xml /opt/glassfish4/glassfish/domains/domain1/config/domain.xml
-
-#RUN sudo -u postgres /usr/bin/initdb -D /var/lib/pgsql/data
-RUN sudo -u postgres /usr/pgsql-9.6/bin/initdb -D /var/lib/pgsql/data
-
-# copy configuration related files
-RUN cp /tmp/dv/pg_hba.conf /var/lib/pgsql/data/
-RUN cp -r /opt/solr-7.3.1/server/solr/configsets/_default /opt/solr-7.3.1/server/solr/collection1
-RUN cp /tmp/dv/schema*.xml /opt/solr-7.3.1/server/solr/collection1/conf/
-RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.3.1/server/solr/collection1/conf/solrconfig.xml
-
-# skipping glassfish user and solr user (run both as root)
-
-#solr port
-EXPOSE 8983
-
-# postgres port
-EXPOSE 5432
-
-# glassfish port
-EXPOSE 8080
-
-# apache port, http
-EXPOSE 80
-
-# debugger ports (jmx,jdb)
-EXPOSE 8686
-EXPOSE 9009
-
-RUN mkdir /opt/dv
-
-# yeah - still not happy if glassfish isn't in /usr/local :<
-RUN ln -s /opt/glassfish4 /usr/local/glassfish4
-COPY dv/install/ /opt/dv/
-COPY install.bash /opt/dv/
-COPY entrypoint.bash /opt/dv/
-COPY testdata /opt/dv/testdata
-COPY testdata/updateSchemaMDB.sh /opt/dv/testdata/
-COPY testscripts/* /opt/dv/testdata/
-COPY setupIT.bash /opt/dv
-WORKDIR /opt/dv
-
-# need to take DOI provider info from build args as of ec377d2a4e27424db8815c55ce544deee48fc5e0
-# Default to EZID; use built-args to switch to DataCite (or potentially handles)
-#ARG DoiProvider=EZID
-ARG DoiProvider=FAKE
-ARG doi_baseurl=https://ezid.cdlib.org
-ARG doi_username=apitest
-ARG doi_password=apitest
-ENV DoiProvider=${DoiProvider}
-ENV doi_baseurl=${doi_baseurl}
-ENV doi_username=${doi_username}
-ENV doi_password=${doi_password}
-COPY configure_doi.bash /opt/dv
-
-# healthcheck for glassfish only (assumes modified domain.xml); 
-#  does not check dataverse application status.
-HEALTHCHECK CMD curl --fail http://localhost:4848/monitoring/domain/server.json || exit 1
-CMD ["/opt/dv/entrypoint.bash"]
diff --git a/conf/docker-aio/configure_doi.bash b/conf/docker-aio/configure_doi.bash
deleted file mode 100755
index 3aa29605037..00000000000
--- a/conf/docker-aio/configure_doi.bash
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-cd /usr/local/glassfish4
-
-# if appropriate; reconfigure PID provider on the basis of environmental variables.
-if [ ! -z "${DoiProvider}" ]; then
-        curl -X PUT -d ${DoiProvider} http://localhost:8080/api/admin/settings/:DoiProvider
-fi
-if [ ! -z "${doi_username}" ]; then
-        bin/asadmin create-jvm-options "-Ddoi.username=${doi_password}"
-fi
-if [ ! -z "${doi_password}" ]; then
-        bin/asadmin create-jvm-options "-Ddoi.password=${doi_password}"
-fi
-if [ ! -z "${doi_baseurl}" ]; then
-        bin/asadmin delete-jvm-options "-Ddoi.baseurlstring=https\://mds.test.datacite.org"
-        doi_baseurl_esc=`echo ${doi_baseurl} | sed -e 's/:/\\:/'`
-        bin/asadmin create-jvm-options "\"-Ddoi.baseurlstring=${doi_baseurl_esc}\""
-fi
-if [ ! -z "${doi_mdcbaseurl}" ]; then
-        bin/asadmin delete-jvm-options "-Ddoi.mdcbaseurlstring=https\://api.test.datacite.org"
-        doi_mdcbaseurl_esc=`echo ${doi_mdcbaseurl} | sed -e 's/:/\\:/'`
-        bin/asadmin create-jvm-options "\"-Ddoi.mdcbaseurlstring=${doi_mdcbaseurl_esc}\""
-fi
diff --git a/conf/docker-aio/disableipv6.conf b/conf/docker-aio/disableipv6.conf
deleted file mode 100644
index 8d425183e3f..00000000000
--- a/conf/docker-aio/disableipv6.conf
+++ /dev/null
@@ -1 +0,0 @@
-net.ipv6.conf.all.disable_ipv6 = 1
diff --git a/conf/docker-aio/domain-restmonitor.xml b/conf/docker-aio/domain-restmonitor.xml
deleted file mode 100644
index a18a88ab011..00000000000
--- a/conf/docker-aio/domain-restmonitor.xml
+++ /dev/null
@@ -1,486 +0,0 @@
-<!--
-
-    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-    Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
-
-    The contents of this file are subject to the terms of either the GNU
-    General Public License Version 2 only ("GPL") or the Common Development
-    and Distribution License("CDDL") (collectively, the "License").  You
-    may not use this file except in compliance with the License.  You can
-    obtain a copy of the License at
-    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-    or packager/legal/LICENSE.txt.  See the License for the specific
-    language governing permissions and limitations under the License.
-
-    When distributing the software, include this License Header Notice in each
-    file and include the License file at packager/legal/LICENSE.txt.
-
-    GPL Classpath Exception:
-    Oracle designates this particular file as subject to the "Classpath"
-    exception as provided by Oracle in the GPL Version 2 section of the License
-    file that accompanied this code.
-
-    Modifications:
-    If applicable, add the following below the License Header, with the fields
-    enclosed by brackets [] replaced by your own identifying information:
-    "Portions Copyright [year] [name of copyright owner]"
-
-    Contributor(s):
-    If you wish your version of this file to be governed by only the CDDL or
-    only the GPL Version 2, indicate your decision by adding "[Contributor]
-    elects to include this software in this distribution under the [CDDL or GPL
-    Version 2] license."  If you don't indicate a single choice of license, a
-    recipient has the option to distribute your version of this file under
-    either the CDDL, the GPL Version 2 or to extend the choice of license to
-    its licensees as provided above.  However, if you add GPL Version 2 code
-    and therefore, elected the GPL Version 2 license, then the option applies
-    only if the new code is made subject to such option by the copyright
-    holder.
-
--->
-
-<domain log-root="${com.sun.aas.instanceRoot}/logs" application-root="${com.sun.aas.instanceRoot}/applications" version="10.0">
-<security-configurations>
-    <authentication-service default="true" name="adminAuth" use-password-credential="true">
-      <security-provider name="spcrealm" type="LoginModule" provider-name="adminSpc">
-        <login-module-config name="adminSpecialLM" control-flag="sufficient" module-class="com.sun.enterprise.admin.util.AdminLoginModule">
-          <property name="config" value="server-config"></property>
-          <property name="auth-realm" value="admin-realm"></property>
-        </login-module-config>
-      </security-provider>
-      <security-provider name="filerealm" type="LoginModule" provider-name="adminFile">
-        <login-module-config name="adminFileLM" control-flag="sufficient" module-class="com.sun.enterprise.security.auth.login.FileLoginModule">
-          <property name="config" value="server-config"></property>
-          <property name="auth-realm" value="admin-realm"></property>
-        </login-module-config>
-      </security-provider>
-    </authentication-service>
-    <authorization-service default="true" name="authorizationService">
-      <security-provider name="simpleAuthorization" type="Simple" provider-name="simpleAuthorizationProvider">
-        <authorization-provider-config support-policy-deploy="false" name="simpleAuthorizationProviderConfig"></authorization-provider-config>
-      </security-provider>
-    </authorization-service>
-  </security-configurations>
-  <system-applications />
-  <resources>
-    <jdbc-resource pool-name="__TimerPool" jndi-name="jdbc/__TimerPool" object-type="system-admin" />
-    <jdbc-resource pool-name="DerbyPool" jndi-name="jdbc/__default" object-type="system-all" />
-    <jdbc-connection-pool name="__TimerPool" datasource-classname="org.apache.derby.jdbc.EmbeddedXADataSource" res-type="javax.sql.XADataSource">
-      <property value="${com.sun.aas.instanceRoot}/lib/databases/ejbtimer" name="databaseName" />
-      <property value=";create=true" name="connectionAttributes" />
-    </jdbc-connection-pool>
-    <jdbc-connection-pool is-isolation-level-guaranteed="false" name="DerbyPool" datasource-classname="org.apache.derby.jdbc.ClientDataSource" res-type="javax.sql.DataSource">
-      <property value="1527" name="PortNumber" />
-      <property value="APP" name="Password" />
-      <property value="APP" name="User" />
-      <property value="localhost" name="serverName" />
-      <property value="sun-appserv-samples" name="DatabaseName" />
-      <property value=";create=true" name="connectionAttributes" />
-    </jdbc-connection-pool>
-  </resources>
-  <servers>
-    <server name="server" config-ref="server-config">
-      <resource-ref ref="jdbc/__TimerPool" />
-      <resource-ref ref="jdbc/__default" />
-    </server>
-  </servers>
-  <nodes>
-    <node name="localhost-domain1" type="CONFIG" node-host="localhost" install-dir="${com.sun.aas.productRoot}"/>
-  </nodes>
- <configs>
-   <config name="server-config">
-      <system-property name="JMS_PROVIDER_PORT" value="7676" description="Port Number that JMS Service will listen for remote clients connection." />
-      
-      <http-service>
-        <access-log/>
-        <virtual-server id="server" network-listeners="http-listener-1,http-listener-2"/>
-        <virtual-server id="__asadmin" network-listeners="admin-listener"/>
-      </http-service>
-      <iiop-service>
-        <orb use-thread-pool-ids="thread-pool-1" />
-        <iiop-listener address="0.0.0.0" port="3700" id="orb-listener-1" lazy-init="true"/>
-        <iiop-listener security-enabled="true" address="0.0.0.0" port="3820" id="SSL">
-          <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" cert-nickname="s1as" />
-        </iiop-listener>
-        <iiop-listener security-enabled="true" address="0.0.0.0" port="3920" id="SSL_MUTUALAUTH">
-          <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" cert-nickname="s1as" client-auth-enabled="true" />
-        </iiop-listener>
-      </iiop-service>
-      <admin-service auth-realm-name="admin-realm" type="das-and-server" system-jmx-connector-name="system">
-        <jmx-connector auth-realm-name="admin-realm" security-enabled="false" address="0.0.0.0" port="8686" name="system" />
-        <property value="/admin" name="adminConsoleContextRoot" />
-        <property value="${com.sun.aas.installRoot}/lib/install/applications/admingui.war" name="adminConsoleDownloadLocation" />
-        <property value="${com.sun.aas.installRoot}/.." name="ipsRoot" />
-      </admin-service>
-      <connector-service shutdown-timeout-in-seconds="30">
-      </connector-service>
-       <transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" />
-       <diagnostic-service />
-      <security-service>
-        <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="admin-realm">
-          <property value="${com.sun.aas.instanceRoot}/config/admin-keyfile" name="file" />
-          <property value="fileRealm" name="jaas-context" />
-        </auth-realm>
-        <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="file">
-          <property value="${com.sun.aas.instanceRoot}/config/keyfile" name="file" />
-          <property value="fileRealm" name="jaas-context" />
-        </auth-realm>
-        <auth-realm classname="com.sun.enterprise.security.auth.realm.certificate.CertificateRealm" name="certificate" />
-        <jacc-provider policy-configuration-factory-provider="com.sun.enterprise.security.provider.PolicyConfigurationFactoryImpl" policy-provider="com.sun.enterprise.security.provider.PolicyWrapper" name="default">
-          <property value="${com.sun.aas.instanceRoot}/generated/policy" name="repository" />
-        </jacc-provider>
-        <jacc-provider policy-configuration-factory-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyConfigurationFactory" policy-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyProvider" name="simple" />
-        <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
-          <property value="false" name="auditOn" />
-        </audit-module>
-        <message-security-config auth-layer="SOAP">
-          <provider-config provider-id="XWS_ClientProvider" class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-type="client">
-            <request-policy auth-source="content" />
-            <response-policy auth-source="content" />
-            <property value="s1as" name="encryption.key.alias" />
-            <property value="s1as" name="signature.key.alias" />
-            <property value="false" name="dynamic.username.password" />
-            <property value="false" name="debug" />
-          </provider-config>
-          <provider-config provider-id="ClientProvider" class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-type="client">
-            <request-policy auth-source="content" />
-            <response-policy auth-source="content" />
-            <property value="s1as" name="encryption.key.alias" />
-            <property value="s1as" name="signature.key.alias" />
-            <property value="false" name="dynamic.username.password" />
-            <property value="false" name="debug" />
-            <property value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml" name="security.config" />
-          </provider-config>
-          <provider-config provider-id="XWS_ServerProvider" class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule" provider-type="server">
-            <request-policy auth-source="content" />
-            <response-policy auth-source="content" />
-            <property value="s1as" name="encryption.key.alias" />
-            <property value="s1as" name="signature.key.alias" />
-            <property value="false" name="debug" />
-          </provider-config>
-          <provider-config provider-id="ServerProvider" class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule" provider-type="server">
-            <request-policy auth-source="content" />
-            <response-policy auth-source="content" />
-            <property value="s1as" name="encryption.key.alias" />
-            <property value="s1as" name="signature.key.alias" />
-            <property value="false" name="debug" />
-            <property value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml" name="security.config" />
-          </provider-config>
-        </message-security-config>
-        <message-security-config auth-layer="HttpServlet">
-            <provider-config provider-type="server" provider-id="GFConsoleAuthModule" class-name="org.glassfish.admingui.common.security.AdminConsoleAuthModule">
-                <request-policy auth-source="sender"></request-policy>
-                <response-policy></response-policy>
-                <property name="loginPage" value="/login.jsf"></property>
-                <property name="loginErrorPage" value="/loginError.jsf"></property>
-            </provider-config>
-        </message-security-config>
-	<property value="SHA-256" name="default-digest-algorithm" />
-      </security-service>
-      <java-config classpath-suffix="" system-classpath="" debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9009">
-        <jvm-options>-XX:MaxPermSize=192m</jvm-options>
-        <jvm-options>-client</jvm-options>
-        <jvm-options>-Djava.awt.headless=true</jvm-options>
-        <jvm-options>-Djdk.corba.allowOutputStreamSubclass=true</jvm-options>
-        <jvm-options>-Djavax.xml.accessExternalSchema=all</jvm-options>
-        <jvm-options>-Djavax.management.builder.initial=com.sun.enterprise.v3.admin.AppServerMBeanServerBuilder</jvm-options>
-        <jvm-options>-XX:+UnlockDiagnosticVMOptions</jvm-options>
-        <jvm-options>-Djava.endorsed.dirs=${com.sun.aas.installRoot}/modules/endorsed${path.separator}${com.sun.aas.installRoot}/lib/endorsed</jvm-options>
-        <jvm-options>-Djava.security.policy=${com.sun.aas.instanceRoot}/config/server.policy</jvm-options>
-        <jvm-options>-Djava.security.auth.login.config=${com.sun.aas.instanceRoot}/config/login.conf</jvm-options>
-        <jvm-options>-Dcom.sun.enterprise.security.httpsOutboundKeyAlias=s1as</jvm-options>
-        <jvm-options>-Xmx512m</jvm-options>
-        <jvm-options>-Djavax.net.ssl.keyStore=${com.sun.aas.instanceRoot}/config/keystore.jks</jvm-options>
-        <jvm-options>-Djavax.net.ssl.trustStore=${com.sun.aas.instanceRoot}/config/cacerts.jks</jvm-options>
-        <jvm-options>-Djava.ext.dirs=${com.sun.aas.javaRoot}/lib/ext${path.separator}${com.sun.aas.javaRoot}/jre/lib/ext${path.separator}${com.sun.aas.instanceRoot}/lib/ext</jvm-options>
-        <jvm-options>-Djdbc.drivers=org.apache.derby.jdbc.ClientDriver</jvm-options>
-		<jvm-options>-DANTLR_USE_DIRECT_CLASS_LOADING=true</jvm-options>
-        <jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
-        <!-- Configure post startup bundle list here. This is a comma separated list of bundle sybolic names. -->
-        <jvm-options>-Dorg.glassfish.additionalOSGiBundlesToStart=org.apache.felix.shell,org.apache.felix.gogo.runtime,org.apache.felix.gogo.shell,org.apache.felix.gogo.command,org.apache.felix.shell.remote,org.apache.felix.fileinstall</jvm-options>
-        <!-- Configuration of various third-party OSGi bundles like
-             Felix Remote Shell, FileInstall, etc. -->
-        <!-- Port on which remote shell listens for connections.-->
-        <jvm-options>-Dosgi.shell.telnet.port=6666</jvm-options>
-        <!-- How many concurrent users can connect to this remote shell -->
-        <jvm-options>-Dosgi.shell.telnet.maxconn=1</jvm-options>
-        <!-- From which hosts users can connect -->
-        <jvm-options>-Dosgi.shell.telnet.ip=127.0.0.1</jvm-options>
-        <!-- Gogo shell configuration -->
-        <jvm-options>-Dgosh.args=--nointeractive</jvm-options>
-        <!-- Directory being watched by fileinstall. -->
-        <jvm-options>-Dfelix.fileinstall.dir=${com.sun.aas.installRoot}/modules/autostart/</jvm-options>
-        <!-- Time period fileinstaller thread in ms. -->
-        <jvm-options>-Dfelix.fileinstall.poll=5000</jvm-options>
-        <!-- log level: 1 for error, 2 for warning, 3 for info and 4 for debug. -->
-        <jvm-options>-Dfelix.fileinstall.log.level=2</jvm-options>
-        <!-- should new bundles be started or installed only? 
-             true => start, false => only install 
-        -->
-        <jvm-options>-Dfelix.fileinstall.bundles.new.start=true</jvm-options>
-        <!-- should watched bundles be started transiently or persistently -->
-        <jvm-options>-Dfelix.fileinstall.bundles.startTransient=true</jvm-options>
-        <!-- Should changes to configuration be saved in corresponding cfg file? false: no, true: yes
-             If we don't set false, everytime server starts from clean osgi cache, the file gets rewritten.
-        -->
-        <jvm-options>-Dfelix.fileinstall.disableConfigSave=false</jvm-options>
-        <!-- End of OSGi bundle configurations -->
-        <jvm-options>-XX:NewRatio=2</jvm-options>
-        <!-- Woodstox property needed to pass StAX TCK -->
-        <jvm-options>-Dcom.ctc.wstx.returnNullForDefaultNamespace=true</jvm-options>
-      </java-config>
-      <network-config>
-        <protocols>
-          <protocol name="http-listener-1">
-            <http default-virtual-server="server" max-connections="250">
-              <file-cache enabled="false"></file-cache>
-            </http>
-          </protocol>
-          <protocol security-enabled="true" name="http-listener-2">
-            <http default-virtual-server="server" max-connections="250">
-              <file-cache enabled="false"></file-cache>
-            </http>
-            <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" ssl3-enabled="false" cert-nickname="s1as"></ssl>
-          </protocol>
-          <protocol name="admin-listener">
-            <http default-virtual-server="__asadmin" max-connections="250" encoded-slash-enabled="true" >
-              <file-cache enabled="false"></file-cache>
-            </http>
-          </protocol>
-        </protocols>
-        <network-listeners>
-          <network-listener port="8080" protocol="http-listener-1" transport="tcp" name="http-listener-1" thread-pool="http-thread-pool"></network-listener>
-          <network-listener port="8181" protocol="http-listener-2" transport="tcp" name="http-listener-2" thread-pool="http-thread-pool"></network-listener>
-          <network-listener port="4848" protocol="admin-listener" transport="tcp" name="admin-listener" thread-pool="admin-thread-pool"></network-listener>
-        </network-listeners>
-        <transports>
-          <transport name="tcp"></transport>
-        </transports>
-      </network-config>
-      <thread-pools>
-          <thread-pool name="admin-thread-pool" max-thread-pool-size="50" max-queue-size="256"></thread-pool>
-          <thread-pool name="http-thread-pool" max-queue-size="4096"></thread-pool>
-          <thread-pool name="thread-pool-1" max-thread-pool-size="200"/>
-  </thread-pools>
-  <!-- try to enable REST monitoring by editing config -->
-      <monitoring-service>
-        <module-monitoring-levels jvm="LOW"></module-monitoring-levels>
-      </monitoring-service>
-    </config>
-     <config name="default-config" dynamic-reconfiguration-enabled="true" >
-         <http-service>
-             <access-log/>
-             <virtual-server id="server" network-listeners="http-listener-1, http-listener-2" >
-                 <property name="default-web-xml" value="${com.sun.aas.instanceRoot}/config/default-web.xml"/>
-             </virtual-server>
-             <virtual-server id="__asadmin" network-listeners="admin-listener" />
-         </http-service>
-         <iiop-service>
-             <orb use-thread-pool-ids="thread-pool-1" />
-             <iiop-listener port="${IIOP_LISTENER_PORT}" id="orb-listener-1" address="0.0.0.0" />
-             <iiop-listener port="${IIOP_SSL_LISTENER_PORT}" id="SSL" address="0.0.0.0" security-enabled="true">
-                 <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" cert-nickname="s1as" />
-             </iiop-listener>
-             <iiop-listener port="${IIOP_SSL_MUTUALAUTH_PORT}" id="SSL_MUTUALAUTH" address="0.0.0.0" security-enabled="true">
-                 <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" cert-nickname="s1as" client-auth-enabled="true" />
-             </iiop-listener>
-         </iiop-service>
-         <admin-service system-jmx-connector-name="system" type="server">
-             <!-- JSR 160  "system-jmx-connector" -->
-             <jmx-connector address="0.0.0.0" auth-realm-name="admin-realm" name="system" port="${JMX_SYSTEM_CONNECTOR_PORT}" protocol="rmi_jrmp" security-enabled="false"/>
-             <!-- JSR 160  "system-jmx-connector" -->
-             <property value="${com.sun.aas.installRoot}/lib/install/applications/admingui.war" name="adminConsoleDownloadLocation" />
-         </admin-service>
-         <web-container>
-             <session-config>
-                 <session-manager>
-                     <manager-properties/>
-                     <store-properties />
-                 </session-manager>
-                 <session-properties />
-             </session-config>
-         </web-container>
-         <ejb-container session-store="${com.sun.aas.instanceRoot}/session-store">
-             <ejb-timer-service />
-         </ejb-container>
-         <mdb-container />
-         <jms-service type="EMBEDDED" default-jms-host="default_JMS_host" addresslist-behavior="priority">
-             <jms-host name="default_JMS_host" host="localhost" port="${JMS_PROVIDER_PORT}" admin-user-name="admin" admin-password="admin" lazy-init="true"/>
-         </jms-service>
-         <log-service log-rotation-limit-in-bytes="2000000" file="${com.sun.aas.instanceRoot}/logs/server.log">
-             <module-log-levels />
-         </log-service>
-         <security-service>
-             <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="admin-realm">
-                 <property name="file" value="${com.sun.aas.instanceRoot}/config/admin-keyfile" />
-                 <property name="jaas-context" value="fileRealm" />
-             </auth-realm>
-             <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="file">
-                 <property name="file" value="${com.sun.aas.instanceRoot}/config/keyfile" />
-                 <property name="jaas-context" value="fileRealm" />
-             </auth-realm>
-             <auth-realm classname="com.sun.enterprise.security.auth.realm.certificate.CertificateRealm" name="certificate" />
-             <jacc-provider policy-provider="com.sun.enterprise.security.provider.PolicyWrapper" name="default" policy-configuration-factory-provider="com.sun.enterprise.security.provider.PolicyConfigurationFactoryImpl">
-                 <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
-             </jacc-provider>
-             <jacc-provider policy-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyConfigurationFactory" />
-             <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
-                 <property value="false" name="auditOn" />
-             </audit-module>
-             <message-security-config auth-layer="SOAP">
-                 <provider-config provider-type="client" provider-id="XWS_ClientProvider" class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule">
-                     <request-policy auth-source="content" />
-                     <response-policy auth-source="content" />
-                     <property name="encryption.key.alias" value="s1as" />
-                     <property name="signature.key.alias" value="s1as" />
-                     <property name="dynamic.username.password" value="false" />
-                     <property name="debug" value="false" />
-                 </provider-config>
-                 <provider-config provider-type="client" provider-id="ClientProvider" class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule">
-                     <request-policy auth-source="content" />
-                     <response-policy auth-source="content" />
-                     <property name="encryption.key.alias" value="s1as" />
-                     <property name="signature.key.alias" value="s1as" />
-                     <property name="dynamic.username.password" value="false" />
-                     <property name="debug" value="false" />
-                     <property name="security.config" value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml" />
-                 </provider-config>
-                 <provider-config provider-type="server" provider-id="XWS_ServerProvider" class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule">
-                     <request-policy auth-source="content" />
-                     <response-policy auth-source="content" />
-                     <property name="encryption.key.alias" value="s1as" />
-                     <property name="signature.key.alias" value="s1as" />
-                     <property name="debug" value="false" />
-                 </provider-config>
-                 <provider-config provider-type="server" provider-id="ServerProvider" class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule">
-                     <request-policy auth-source="content" />
-                     <response-policy auth-source="content" />
-                     <property name="encryption.key.alias" value="s1as" />
-                     <property name="signature.key.alias" value="s1as" />
-                     <property name="debug" value="false" />
-                     <property name="security.config" value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml" />
-                 </provider-config>
-             </message-security-config>
-         </security-service>
-         <transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" automatic-recovery="true" />
-         <diagnostic-service />
-         <java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
-             <jvm-options>-XX:MaxPermSize=192m</jvm-options>
-             <jvm-options>-server</jvm-options>
-             <jvm-options>-Djava.awt.headless=true</jvm-options>
-             <jvm-options>-Djdk.corba.allowOutputStreamSubclass=true</jvm-options>
-             <jvm-options>-XX:+UnlockDiagnosticVMOptions</jvm-options>
-             <jvm-options>-Djava.endorsed.dirs=${com.sun.aas.installRoot}/modules/endorsed${path.separator}${com.sun.aas.installRoot}/lib/endorsed</jvm-options>
-             <jvm-options>-Djava.security.policy=${com.sun.aas.instanceRoot}/config/server.policy</jvm-options>
-             <jvm-options>-Djava.security.auth.login.config=${com.sun.aas.instanceRoot}/config/login.conf</jvm-options>
-             <jvm-options>-Dcom.sun.enterprise.security.httpsOutboundKeyAlias=s1as</jvm-options>
-             <jvm-options>-Djavax.net.ssl.keyStore=${com.sun.aas.instanceRoot}/config/keystore.jks</jvm-options>
-             <jvm-options>-Djavax.net.ssl.trustStore=${com.sun.aas.instanceRoot}/config/cacerts.jks</jvm-options>
-             <jvm-options>-Djava.ext.dirs=${com.sun.aas.javaRoot}/lib/ext${path.separator}${com.sun.aas.javaRoot}/jre/lib/ext${path.separator}${com.sun.aas.instanceRoot}/lib/ext</jvm-options>
-             <jvm-options>-Djdbc.drivers=org.apache.derby.jdbc.ClientDriver</jvm-options>
-             <jvm-options>-DANTLR_USE_DIRECT_CLASS_LOADING=true</jvm-options>
-             <jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
-             <jvm-options>-XX:NewRatio=2</jvm-options>
-             <jvm-options>-Xmx512m</jvm-options>
-             <!-- Configure post startup bundle list here. This is a comma separated list of bundle sybolic names.
-                  The remote shell bundle has been disabled for cluster and remote instances. -->
-             <jvm-options>-Dorg.glassfish.additionalOSGiBundlesToStart=org.apache.felix.shell,org.apache.felix.gogo.runtime,org.apache.felix.gogo.shell,org.apache.felix.gogo.command,org.apache.felix.fileinstall</jvm-options>
-             <!-- Port on which remote shell listens for connections.-->
-             <jvm-options>-Dosgi.shell.telnet.port=${OSGI_SHELL_TELNET_PORT}</jvm-options>
-             <!-- How many concurrent users can connect to this remote shell -->
-             <jvm-options>-Dosgi.shell.telnet.maxconn=1</jvm-options>
-             <!-- From which hosts users can connect -->
-             <jvm-options>-Dosgi.shell.telnet.ip=127.0.0.1</jvm-options>
-             <!-- Gogo shell configuration -->
-             <jvm-options>-Dgosh.args=--noshutdown -c noop=true</jvm-options>
-             <!-- Directory being watched by fileinstall. -->
-             <jvm-options>-Dfelix.fileinstall.dir=${com.sun.aas.installRoot}/modules/autostart/</jvm-options>
-             <!-- Time period fileinstaller thread in ms. -->
-             <jvm-options>-Dfelix.fileinstall.poll=5000</jvm-options>
-             <!-- log level: 1 for error, 2 for warning, 3 for info and 4 for debug. -->
-             <jvm-options>-Dfelix.fileinstall.log.level=3</jvm-options>
-             <!-- should new bundles be started or installed only?
-                 true => start, false => only install
-             -->
-             <jvm-options>-Dfelix.fileinstall.bundles.new.start=true</jvm-options>
-             <!-- should watched bundles be started transiently or persistently -->
-             <jvm-options>-Dfelix.fileinstall.bundles.startTransient=true</jvm-options>
-             <!-- Should changes to configuration be saved in corresponding cfg file? false: no, true: yes
-                  If we don't set false, everytime server starts from clean osgi cache, the file gets rewritten.
-             -->
-             <jvm-options>-Dfelix.fileinstall.disableConfigSave=false</jvm-options>
-             <!-- End of OSGi bundle configurations -->
-        </java-config>
-         <availability-service>
-             <web-container-availability/>
-             <ejb-container-availability sfsb-store-pool-name="jdbc/hastore"/>
-             <jms-availability/>
-         </availability-service>
-         <network-config>
-             <protocols>
-                 <protocol name="http-listener-1">
-                     <http default-virtual-server="server">
-                         <file-cache />
-                     </http>
-                 </protocol>
-                 <protocol security-enabled="true" name="http-listener-2">
-                     <http default-virtual-server="server">
-                         <file-cache />
-                     </http>
-                     <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" ssl3-enabled="false" cert-nickname="s1as" />
-                 </protocol>
-                 <protocol name="admin-listener">
-                     <http default-virtual-server="__asadmin" max-connections="250">
-                         <file-cache enabled="false" />
-                     </http>
-                 </protocol>
-                 <protocol security-enabled="true" name="sec-admin-listener">
-                   <http default-virtual-server="__asadmin" encoded-slash-enabled="true">
-                     <file-cache></file-cache>
-                   </http>
-                   <ssl client-auth="want" ssl3-enabled="false" classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" cert-nickname="glassfish-instance" renegotiate-on-client-auth-want="false"></ssl>
-                 </protocol>
-                 <protocol name="admin-http-redirect">
-                   <http-redirect secure="true"></http-redirect>
-                 </protocol>
-                 <protocol name="pu-protocol">
-                   <port-unification>
-                     <protocol-finder protocol="sec-admin-listener" name="http-finder" classname="org.glassfish.grizzly.config.portunif.HttpProtocolFinder"></protocol-finder>
-                     <protocol-finder protocol="admin-http-redirect" name="admin-http-redirect" classname="org.glassfish.grizzly.config.portunif.HttpProtocolFinder"></protocol-finder>
-                   </port-unification>
-                 </protocol>
-
-             </protocols>
-             <network-listeners>
-                 <network-listener address="0.0.0.0" port="${HTTP_LISTENER_PORT}" protocol="http-listener-1" transport="tcp" name="http-listener-1" thread-pool="http-thread-pool" />
-                 <network-listener address="0.0.0.0" port="${HTTP_SSL_LISTENER_PORT}" protocol="http-listener-2" transport="tcp" name="http-listener-2" thread-pool="http-thread-pool" />
-                 <network-listener port="${ASADMIN_LISTENER_PORT}" protocol="pu-protocol" transport="tcp" name="admin-listener" thread-pool="http-thread-pool" />
-             </network-listeners>
-             <transports>
-                 <transport name="tcp" />
-             </transports>
-         </network-config>
-         <thread-pools>
-             <thread-pool name="http-thread-pool" />
-             <thread-pool max-thread-pool-size="200" idle-thread-timeout-in-seconds="120" name="thread-pool-1" />
-         </thread-pools>
-         <group-management-service/>
-         <system-property name="JMS_PROVIDER_PORT" value="27676" description="Port Number that JMS Service will listen for remote clients connection." />
-         <system-property name="ASADMIN_LISTENER_PORT" value="24848"/>
-         <system-property name="HTTP_LISTENER_PORT" value="28080"/>
-         <system-property name="HTTP_SSL_LISTENER_PORT" value="28181"/>
-         <system-property name="IIOP_LISTENER_PORT" value="23700"/>
-         <system-property name="IIOP_SSL_LISTENER_PORT" value="23820"/>
-         <system-property name="IIOP_SSL_MUTUALAUTH_PORT" value="23920"/>
-         <system-property name="JMX_SYSTEM_CONNECTOR_PORT" value="28686"/>
-         <system-property name="OSGI_SHELL_TELNET_PORT" value="26666"/>
-         <system-property name="JAVA_DEBUGGER_PORT" value="29009"/>
-     </config>
-  </configs>
-  <property name="administrative.domain.name" value="domain1"/>
-  <secure-admin special-admin-indicator="718fe3ff-df18-49f8-84a0-3aeedb3250db">
-      <secure-admin-principal dn="CN=localhost,OU=GlassFish,O=Oracle Corporation,L=Santa Clara,ST=California,C=US"></secure-admin-principal>
-      <secure-admin-principal dn="CN=localhost-instance,OU=GlassFish,O=Oracle Corporation,L=Santa Clara,ST=California,C=US"></secure-admin-principal>
-  </secure-admin>
-</domain>
diff --git a/conf/docker-aio/dv/install/default.config b/conf/docker-aio/dv/install/default.config
deleted file mode 100644
index 7c99866be17..00000000000
--- a/conf/docker-aio/dv/install/default.config
+++ /dev/null
@@ -1,16 +0,0 @@
-HOST_DNS_ADDRESS	localhost
-GLASSFISH_DIRECTORY	/opt/glassfish4
-ADMIN_EMAIL	 
-MAIL_SERVER	mail.hmdc.harvard.edu
-POSTGRES_ADMIN_PASSWORD	secret
-POSTGRES_SERVER	db
-POSTGRES_PORT	5432
-POSTGRES_DATABASE	dvndb
-POSTGRES_USER	dvnapp
-POSTGRES_PASSWORD	secret
-SOLR_LOCATION	idx
-TWORAVENS_LOCATION	NOT INSTALLED
-RSERVE_HOST	localhost
-RSERVE_PORT	6311
-RSERVE_USER	rserve
-RSERVE_PASSWORD	rserve
diff --git a/conf/docker-aio/dv/pg_hba.conf b/conf/docker-aio/dv/pg_hba.conf
deleted file mode 100644
index 77feba5247d..00000000000
--- a/conf/docker-aio/dv/pg_hba.conf
+++ /dev/null
@@ -1,91 +0,0 @@
-# PostgreSQL Client Authentication Configuration File
-# ===================================================
-#
-# Refer to the "Client Authentication" section in the PostgreSQL
-# documentation for a complete description of this file.  A short
-# synopsis follows.
-#
-# This file controls: which hosts are allowed to connect, how clients
-# are authenticated, which PostgreSQL user names they can use, which
-# databases they can access.  Records take one of these forms:
-#
-# local      DATABASE  USER  METHOD  [OPTIONS]
-# host       DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
-# hostssl    DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
-# hostnossl  DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
-#
-# (The uppercase items must be replaced by actual values.)
-#
-# The first field is the connection type: "local" is a Unix-domain
-# socket, "host" is either a plain or SSL-encrypted TCP/IP socket,
-# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a
-# plain TCP/IP socket.
-#
-# DATABASE can be "all", "sameuser", "samerole", "replication", a
-# database name, or a comma-separated list thereof. The "all"
-# keyword does not match "replication". Access to replication
-# must be enabled in a separate record (see example below).
-#
-# USER can be "all", a user name, a group name prefixed with "+", or a
-# comma-separated list thereof.  In both the DATABASE and USER fields
-# you can also write a file name prefixed with "@" to include names
-# from a separate file.
-#
-# ADDRESS specifies the set of hosts the record matches.  It can be a
-# host name, or it is made up of an IP address and a CIDR mask that is
-# an integer (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that
-# specifies the number of significant bits in the mask.  A host name
-# that starts with a dot (.) matches a suffix of the actual host name.
-# Alternatively, you can write an IP address and netmask in separate
-# columns to specify the set of hosts.  Instead of a CIDR-address, you
-# can write "samehost" to match any of the server's own IP addresses,
-# or "samenet" to match any address in any subnet that the server is
-# directly connected to.
-#
-# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi",
-# "krb5", "ident", "peer", "pam", "ldap", "radius" or "cert".  Note that
-# "password" sends passwords in clear text; "md5" is preferred since
-# it sends encrypted passwords.
-#
-# OPTIONS are a set of options for the authentication in the format
-# NAME=VALUE.  The available options depend on the different
-# authentication methods -- refer to the "Client Authentication"
-# section in the documentation for a list of which options are
-# available for which authentication methods.
-#
-# Database and user names containing spaces, commas, quotes and other
-# special characters must be quoted.  Quoting one of the keywords
-# "all", "sameuser", "samerole" or "replication" makes the name lose
-# its special character, and just match a database or username with
-# that name.
-#
-# This file is read on server startup and when the postmaster receives
-# a SIGHUP signal.  If you edit the file on a running system, you have
-# to SIGHUP the postmaster for the changes to take effect.  You can
-# use "pg_ctl reload" to do that.
-
-# Put your actual configuration here
-# ----------------------------------
-#
-# If you want to allow non-local connections, you need to add more
-# "host" records.  In that case you will also need to make PostgreSQL
-# listen on a non-local interface via the listen_addresses
-# configuration parameter, or via the -i or -h command line switches.
-
-
-
-# TYPE  DATABASE        USER            ADDRESS                 METHOD
-
-# "local" is for Unix domain socket connections only
-#local   all             all                                     peer
-local   all             all                                     trust
-# IPv4 local connections:
-#host    all             all             127.0.0.1/32            trust
-host    all             all             0.0.0.0/0            trust
-# IPv6 local connections:
-host    all             all             ::1/128                 trust
-# Allow replication connections from localhost, by a user with the
-# replication privilege.
-#local   replication     postgres                                peer
-#host    replication     postgres        127.0.0.1/32            ident
-#host    replication     postgres        ::1/128                 ident
diff --git a/conf/docker-aio/entrypoint.bash b/conf/docker-aio/entrypoint.bash
deleted file mode 100755
index da01ee56153..00000000000
--- a/conf/docker-aio/entrypoint.bash
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-export LANG=en_US.UTF-8
-#sudo -u postgres /usr/bin/postgres -D /var/lib/pgsql/data &
-sudo -u postgres /usr/pgsql-9.6/bin/postgres -D /var/lib/pgsql/data &
-cd /opt/solr-7.3.1/
-# TODO: Run Solr as non-root and remove "-force".
-bin/solr start -force
-bin/solr create_core -c collection1 -d server/solr/collection1/conf -force
-
-# start apache, in both foreground and background...
-apachectl -DFOREGROUND &
-
-# TODO: Run Glassfish as non-root.
-cd /opt/glassfish4
-bin/asadmin start-domain --debug
-sleep infinity
-
diff --git a/conf/docker-aio/httpd.conf b/conf/docker-aio/httpd.conf
deleted file mode 100644
index bf3e244a34e..00000000000
--- a/conf/docker-aio/httpd.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-
-Include conf.d/*.conf
-Include conf.modules.d/*.conf
-ServerName localhost
-Listen 80 443
-PidFile run/httpd.pid
-DocumentRoot "/var/www/html"
-TypesConfig /etc/mime.types
-User apache
-Group apache
-
-<VirtualHost *:80>
-  ServerName localhost
-  LogLevel debug
- ErrorLog logs/error_log
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
- CustomLog logs/access_log combined
- 
-  # proxy config (aka - what to send to glassfish or not)
-  ProxyPassMatch ^/RApacheInfo$ !
-  ProxyPassMatch ^/custom !
-  ProxyPassMatch ^/dataexplore !
-  ProxyPassMatch ^/Shibboleth.sso !
-  ProxyPassMatch ^/shibboleth-ds !
-  # pass everything else to Glassfish
-  ProxyPass / ajp://localhost:8009/
-# glassfish can be slow sometimes
-  ProxyTimeout 300 
-
-</VirtualHost>
diff --git a/conf/docker-aio/install.bash b/conf/docker-aio/install.bash
deleted file mode 100755
index 2b3275ad830..00000000000
--- a/conf/docker-aio/install.bash
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-sudo -u postgres createuser --superuser dvnapp
-#./entrypoint.bash &
-unzip dvinstall.zip
-cd dvinstall/
-echo "beginning installer"
-./install -admin_email=dvAdmin@mailinator.com -y -f > install.out 2> install.err
-
-echo "installer complete"
-cat install.err
diff --git a/conf/docker-aio/prep_it.bash b/conf/docker-aio/prep_it.bash
deleted file mode 100755
index e0078b679b2..00000000000
--- a/conf/docker-aio/prep_it.bash
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-# run through all the steps to setup docker-aio to run integration tests
-
-# hard-codes several assumptions: image is named dv0, container is named dv, port is 8084
-
-# glassfish healthy/ready retries
-n_wait=5
-
-cd conf/docker-aio
-./0prep_deps.sh
-./1prep.sh
-docker build -t dv0 -f c7.dockerfile .
-# cleanup from previous runs if necessary
-docker rm -f dv
-# start container
-docker run -d -p 8084:80 -p 8083:8080 -p 9010:9009 --name dv dv0
-# wait for glassfish to be healthy
-i_wait=0
-d_wait=10
-while [ $i_wait -lt $n_wait ]
-do
-	h=`docker inspect -f "{{.State.Health.Status}}" dv`
-	if [ "healthy" == "${h}" ]; then
-		break
-	else
-		sleep $d_wait
-	fi
-	i_wait=$(( $i_wait + 1 ))
-	
-done
-# try setupIT.bash
-docker exec dv /opt/dv/setupIT.bash
-err=$?
-if [ $err -ne 0 ]; then
-	echo "error - setupIT failure"
-	exit 1
-fi
-# configure DOI provider based on docker build arguments / environmental variables
-docker exec dv /opt/dv/configure_doi.bash
-err=$?
-if [ $err -ne 0 ]; then
-	echo "error - DOI configuration failure"
-	exit 1
-fi
-# handle config for the private url test (and things like publishing...)
-./seturl.bash
-
-
-cd ../..
-#echo "docker-aio ready to run integration tests ($i_retry)"
-echo "docker-aio ready to run integration tests"
-curl http://localhost:8084/api/info/version
-echo $?
-
diff --git a/conf/docker-aio/readme.md b/conf/docker-aio/readme.md
deleted file mode 100644
index 80faa116966..00000000000
--- a/conf/docker-aio/readme.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Docker All-In-One
-
-First pass docker all-in-one image, intended for running integration tests against.
-Also usable for normal development and system evaluation; not intended for production.
-
-### Requirements:
- - java8 compiler, maven, make, wget, docker
-
-### Quickstart:
- - in the root of the repository, run `./conf/docker-aio/prep_it.bash`
- - if using DataCite test credentials, update the build args appropriately.
- - if all goes well, you should see the results of the `api/info/version` endpoint, including the deployed build (eg `{"status":"OK","data":{"version":"4.8.6","build":"develop-c3e9f40"}}`). If not, you may need to read the non-quickstart instructions.
- - run integration tests: `./conf/docker-aio/run-test-suite.sh`
-
-----
-
-## More in-depth documentation:
-
-
-### Initial setup (aka - do once):
-- `cd conf/docker-aio` and run `./0prep_deps.sh` to created Glassfish and Solr tarballs in `conf/docker-aio/dv/deps`.
-
-### Per-build:
-
-> Note: If you encounter any issues, see the Troubleshooting section at the end of this document.
-
-#### Setup
-
-- `cd conf/docker-aio`, and run `./1prep.sh` to copy files for integration test data into docker build context; `1prep.sh` will also build the war file and installation zip file
-- build the docker image: `docker build -t dv0 -f c7.dockerfile .`
-
-- Run image: `docker run -d -p 8083:8080 -p 8084:80 --name dv dv0` (aka - forward port 8083 locally to 8080 in the container for glassfish, and 8084 to 80 for apache); if you'd like to connect a java debugger to glassfish, use `docker run -d -p 8083:8080 -p 8084:80 -p 9010:9009 --name dv dv0`
-
-- Installation (integration test): `docker exec dv /opt/dv/setupIT.bash` 
-  (Note that it's possible to customize the installation by editing `conf/docker-aio/default.config` and running `docker exec dv /opt/dv/install.bash` but for the purposes of integration testing, the `setupIT.bash` script above works fine.)
-
-- update `dataverse.siteUrl` (appears only necessary for `DatasetsIT.testPrivateUrl`): `docker exec dv /usr/local/glassfish4/bin/asadmin create-jvm-options "-Ddataverse.siteUrl=http\://localhost\:8084"` (or use the provided `seturl.bash`)
-
-#### Run integration tests: 
-
-First, cd back to the root of the repo where the `pom.xml` file is (`cd ../..` assuming you're still in the `conf/docker-aio` directory). Then run the test suite with script below:
-
-`conf/docker-aio/run-test-suite.sh`
-
-There isn't any strict requirement on the local port (8083, 8084 in this doc), the name of the image (dv0) or container (dv), these can be changed as desired as long as they are consistent.
-
-### Troubleshooting Notes:
-
-* If Dataverse' build fails due to an error about `Module` being ambiguous, you might be using a Java 9 compiler.
-
-* If you see an error like this: 
- ```
- docker: Error response from daemon: Conflict. The container name "/dv" is already in use by container "5f72a45b68c86c7b0f4305b83ce7d663020329ea4e30fa2a3ce9ddb05223533d"
- You have to remove (or rename) that container to be able to reuse that name.
- ``` 
-    run something like `docker ps -a | grep dv` to see the container left over from the last run and something like `docker rm 5f72a45b68c8` to remove it. Then try the `docker run` command above again.
-
-* `empty reply from server` or `Failed to connect to ::1: Cannot assign requested address` tend to indicate either that you haven't given glassfish enough time to start, or your docker setup is in an inconsistent state and should probably be restarted.
-
-* For manually fiddling around with the created dataverse, use user `dataverseAdmin` with password `admin1`.
diff --git a/conf/docker-aio/run-test-suite.sh b/conf/docker-aio/run-test-suite.sh
deleted file mode 100755
index 811bc579c6d..00000000000
--- a/conf/docker-aio/run-test-suite.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# This is the canonical list of which "IT" tests are expected to pass.
-
-dvurl=$1
-if [ -z "$dvurl" ]; then
-	dvurl="http://localhost:8084"
-fi
-
-# Please note the "dataverse.test.baseurl" is set to run for "all-in-one" Docker environment.
-# TODO: Rather than hard-coding the list of "IT" classes here, add a profile to pom.xml.
-mvn test -Dtest=DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,MoveIT,MakeDataCountApiIT,FileTypeDetectionIT,EditDDIIT,ExternalToolsIT,AccessIT -Ddataverse.test.baseurl=$dvurl
diff --git a/conf/docker-aio/setupIT.bash b/conf/docker-aio/setupIT.bash
deleted file mode 100755
index 528b8f3c5f8..00000000000
--- a/conf/docker-aio/setupIT.bash
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# do integration-test install and test data setup
-
-cd /opt/dv
-unzip dvinstall.zip
-cd /opt/dv/testdata
-./scripts/deploy/phoenix.dataverse.org/prep
-./db.sh
-./install # modified from phoenix
-/usr/local/glassfish4/glassfish/bin/asadmin deploy /opt/dv/dvinstall/dataverse.war
-./post # modified from phoenix
-
diff --git a/conf/docker-aio/seturl.bash b/conf/docker-aio/seturl.bash
deleted file mode 100755
index a62fb6b3ea7..00000000000
--- a/conf/docker-aio/seturl.bash
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-docker exec dv /usr/local/glassfish4/bin/asadmin create-jvm-options "\"-Ddataverse.siteUrl=http\://localhost\:8084\""
diff --git a/conf/docker-aio/testdata/httpd.conf b/conf/docker-aio/testdata/httpd.conf
deleted file mode 100644
index bf3e244a34e..00000000000
--- a/conf/docker-aio/testdata/httpd.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-
-Include conf.d/*.conf
-Include conf.modules.d/*.conf
-ServerName localhost
-Listen 80 443
-PidFile run/httpd.pid
-DocumentRoot "/var/www/html"
-TypesConfig /etc/mime.types
-User apache
-Group apache
-
-<VirtualHost *:80>
-  ServerName localhost
-  LogLevel debug
- ErrorLog logs/error_log
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
- CustomLog logs/access_log combined
- 
-  # proxy config (aka - what to send to glassfish or not)
-  ProxyPassMatch ^/RApacheInfo$ !
-  ProxyPassMatch ^/custom !
-  ProxyPassMatch ^/dataexplore !
-  ProxyPassMatch ^/Shibboleth.sso !
-  ProxyPassMatch ^/shibboleth-ds !
-  # pass everything else to Glassfish
-  ProxyPass / ajp://localhost:8009/
-# glassfish can be slow sometimes
-  ProxyTimeout 300 
-
-</VirtualHost>
diff --git a/conf/docker-aio/testscripts/db.sh b/conf/docker-aio/testscripts/db.sh
deleted file mode 100755
index aeb09f0a7de..00000000000
--- a/conf/docker-aio/testscripts/db.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-psql -U postgres -c "CREATE ROLE dvnapp UNENCRYPTED PASSWORD 'secret' SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN" template1
-psql -U dvnapp -c 'CREATE DATABASE "dvndb" WITH OWNER = "dvnapp"' template1
diff --git a/conf/docker-aio/testscripts/install b/conf/docker-aio/testscripts/install
deleted file mode 100755
index a994fe2920d..00000000000
--- a/conf/docker-aio/testscripts/install
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-export HOST_ADDRESS=localhost
-export GLASSFISH_ROOT=/usr/local/glassfish4
-export FILES_DIR=/usr/local/glassfish4/glassfish/domains/domain1/files
-export DB_NAME=dvndb
-export DB_PORT=5432
-export DB_HOST=localhost
-export DB_USER=dvnapp
-export DB_PASS=secret
-export RSERVE_HOST=localhost
-export RSERVE_PORT=6311
-export RSERVE_USER=rserve
-export RSERVE_PASS=rserve
-export SMTP_SERVER=localhost
-export MEM_HEAP_SIZE=2048
-export GLASSFISH_DOMAIN=domain1
-cd scripts/installer
-cp pgdriver/postgresql-42.2.2.jar $GLASSFISH_ROOT/glassfish/lib
-#cp ../../conf/jhove/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
-cp /opt/dv/testdata/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
-cp /opt/dv/testdata/jhoveConfig.xsd $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhoveConfig.xsd
-./glassfish-setup.sh
diff --git a/conf/docker-aio/testscripts/post b/conf/docker-aio/testscripts/post
deleted file mode 100755
index f38a704e454..00000000000
--- a/conf/docker-aio/testscripts/post
+++ /dev/null
@@ -1,14 +0,0 @@
-#/bin/sh
-cd scripts/api
-./setup-all.sh --insecure -p=admin1 | tee /tmp/setup-all.sh.out
-cd ../..
-psql -U dvnapp dvndb -f scripts/database/reference_data.sql
-psql -U dvnapp dvndb -f doc/sphinx-guides/source/_static/util/createsequence.sql
-scripts/search/tests/publish-dataverse-root
-#git checkout scripts/api/data/dv-root.json
-scripts/search/tests/grant-authusers-add-on-root
-scripts/search/populate-users
-scripts/search/create-users
-scripts/search/tests/create-all-and-test
-scripts/search/tests/publish-spruce1-and-test
-#java -jar downloads/schemaSpy_5.0.0.jar -t pgsql -host localhost -db dvndb -u postgres -p secret -s public -dp scripts/installer/pgdriver/postgresql-9.1-902.jdbc4.jar -o /var/www/html/schemaspy/latest
diff --git a/conf/docker-dcm/.gitignore b/conf/docker-dcm/.gitignore
deleted file mode 100644
index ac39981ce6a..00000000000
--- a/conf/docker-dcm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.rpm
-upload*.bash
diff --git a/conf/docker-dcm/0prep.sh b/conf/docker-dcm/0prep.sh
deleted file mode 100755
index 300aa39d567..00000000000
--- a/conf/docker-dcm/0prep.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-DCM_VERSION=0.5
-RSAL_VERSION=0.1
-
-if [ ! -e dcm-${DCM_VERSION}-0.noarch.rpm ]; then
-	wget https://github.com/sbgrid/data-capture-module/releases/download/${DCM_VERSION}/dcm-${DCM_VERSION}-0.noarch.rpm
-fi
-
-if [ ! -e rsal-${RSAL_VERSION}-0.noarch.rpm ] ;then
-	wget https://github.com/sbgrid/rsal/releases/download/${RSAL_VERSION}/rsal-${RSAL_VERSION}-0.noarch.rpm
-fi
diff --git a/conf/docker-dcm/c6client.dockerfile b/conf/docker-dcm/c6client.dockerfile
deleted file mode 100644
index e4d1ae7da82..00000000000
--- a/conf/docker-dcm/c6client.dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# build from repo root
-FROM centos:6
-RUN yum install -y epel-release
-RUN yum install -y rsync openssh-clients jq curl wget lynx
-RUN useradd depositor
-USER depositor
-WORKDIR /home/depositor
diff --git a/conf/docker-dcm/cfg/dcm/bashrc b/conf/docker-dcm/cfg/dcm/bashrc
deleted file mode 100644
index 07137ab8471..00000000000
--- a/conf/docker-dcm/cfg/dcm/bashrc
+++ /dev/null
@@ -1,18 +0,0 @@
-# .bashrc
-
-# User specific aliases and functions
-
-alias rm='rm -i'
-alias cp='cp -i'
-alias mv='mv -i'
-
-# Source global definitions
-if [ -f /etc/bashrc ]; then
-	. /etc/bashrc
-fi
-
-# these are dummy values, obviously
-export UPLOADHOST=dcmsrv
-export DVAPIKEY=burrito
-export DVHOSTINT=dvsrv
-export DVHOST=dvsrv
diff --git a/conf/docker-dcm/cfg/dcm/entrypoint-dcm.sh b/conf/docker-dcm/cfg/dcm/entrypoint-dcm.sh
deleted file mode 100755
index 0db674bfac4..00000000000
--- a/conf/docker-dcm/cfg/dcm/entrypoint-dcm.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-/etc/init.d/sshd start
-/etc/init.d/redis start
-/etc/init.d/rq start
-lighttpd -D -f /etc/lighttpd/lighttpd.conf
diff --git a/conf/docker-dcm/cfg/dcm/healthcheck-dcm.sh b/conf/docker-dcm/cfg/dcm/healthcheck-dcm.sh
deleted file mode 100755
index 3964a79391e..00000000000
--- a/conf/docker-dcm/cfg/dcm/healthcheck-dcm.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-r_rq=`/etc/init.d/rq status`
-if [ "rq_worker running" != "$r_rq" ]; then
-	echo "rq failed"
-	exit 1
-fi
-r_www=`/etc/init.d/lighttpd status`
-e_www=$?
-if [ 0 -ne $e_www ]; then
-	echo "lighttpd failed"
-	exit 2
-fi
-
diff --git a/conf/docker-dcm/cfg/dcm/rq-init-d b/conf/docker-dcm/cfg/dcm/rq-init-d
deleted file mode 100755
index 093cd894376..00000000000
--- a/conf/docker-dcm/cfg/dcm/rq-init-d
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 2345 90 60
-# description: rq worker script (single worker process)
-
-# example rq configuration file (to be placed in /etc/init.d)
-
-# works on cent6
-
-DAEMON=rq_worker
-DAEMON_PATH=/opt/dcm/gen/
-export UPLOADHOST=dcmsrv
-VIRTUALENV=
-LOGFILE=/var/log/${DAEMON}.log
-PIDFILE=/var/run/${DAEMON}.pid
-
-case "$1" in
-start)
-	printf "%-50s" "starting $DAEMON..."
-	cd $DAEMON_PATH
-	if [ ! -z "$VIRTUALENV" ]; then
-		source $VIRTUALENV/bin/activate
-	fi
-	rq worker normal --pid $PIDFILE > ${LOGFILE} 2>&1 &
-;;
-status)
-	if [ -f $PIDFILE ]; then
-		PID=`cat $PIDFILE`
-		if [ -z "`ps axf | grep ${PID} | grep -v grep`" ]; then
-			printf "%s\n" "$DAEMON not running, but PID file ($PIDFILE) exists"
-		else
-			echo "$DAEMON running"
-		fi
-	else
-		printf "%s\n" "$DAEMON not running"
-	fi
-;;
-stop)
-	printf "%-50s" "stopping $DAEMON"
-	if [ -f $PIDFILE ]; then
-		PID=`cat $PIDFILE`
-		kill -HUP $PID
-		rm -f $PIDFILE
-	else
-		printf "%s\n" "no PID file ($PIDFILE) - maybe not running"
-	fi
-;;
-restart)
-	$0 stop
-	$0 start
-;;
-
-*)
-	echo "Usage: $0 {status|start|stop|restart}"
-	exit 1
-esac
-
diff --git a/conf/docker-dcm/cfg/dcm/test_install.sh b/conf/docker-dcm/cfg/dcm/test_install.sh
deleted file mode 100755
index 3026ceb9fa5..00000000000
--- a/conf/docker-dcm/cfg/dcm/test_install.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-cp /etc/dcm/rq-init-d /etc/init.d/rq
-cp /etc/dcm/lighttpd-conf-dcm /etc/lighttpd/lighttpd.conf
-cp /etc/dcm/lighttpd-modules-dcm /etc/lighttpd/modules.conf
-cp /etc/dcm/dcm-rssh.conf /etc/rssh.conf
-
diff --git a/conf/docker-dcm/cfg/rsal/entrypoint-rsal.sh b/conf/docker-dcm/cfg/rsal/entrypoint-rsal.sh
deleted file mode 100755
index 92466c3bd4b..00000000000
--- a/conf/docker-dcm/cfg/rsal/entrypoint-rsal.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-#/usr/bin/rsync --no-detach --daemon --config /etc/rsyncd.conf
-/usr/bin/rsync --daemon --config /etc/rsyncd.conf
-lighttpd -D -f /etc/lighttpd/lighttpd.conf
diff --git a/conf/docker-dcm/cfg/rsal/lighttpd-modules.conf b/conf/docker-dcm/cfg/rsal/lighttpd-modules.conf
deleted file mode 100644
index cdb1438af82..00000000000
--- a/conf/docker-dcm/cfg/rsal/lighttpd-modules.conf
+++ /dev/null
@@ -1,174 +0,0 @@
-#######################################################################
-##
-## ansible managed
-#
-##  Modules to load
-## -----------------
-##
-## at least mod_access and mod_accesslog should be loaded
-## all other module should only be loaded if really neccesary
-##
-## - saves some time
-## - saves memory
-##
-## the default module set contains:
-##
-## "mod_indexfile", "mod_dirlisting", "mod_staticfile"
-##
-## you dont have to include those modules in your list
-##
-## Modules, which are pulled in via conf.d/*.conf
-##
-## NOTE: the order of modules is important.
-##
-## - mod_accesslog     -> conf.d/access_log.conf
-## - mod_compress      -> conf.d/compress.conf
-## - mod_status        -> conf.d/status.conf
-## - mod_webdav        -> conf.d/webdav.conf
-## - mod_cml           -> conf.d/cml.conf
-## - mod_evhost        -> conf.d/evhost.conf
-## - mod_simple_vhost  -> conf.d/simple_vhost.conf
-## - mod_mysql_vhost   -> conf.d/mysql_vhost.conf
-## - mod_trigger_b4_dl -> conf.d/trigger_b4_dl.conf
-## - mod_userdir       -> conf.d/userdir.conf
-## - mod_rrdtool       -> conf.d/rrdtool.conf
-## - mod_ssi           -> conf.d/ssi.conf
-## - mod_cgi           -> conf.d/cgi.conf
-## - mod_scgi          -> conf.d/scgi.conf
-## - mod_fastcgi       -> conf.d/fastcgi.conf
-## - mod_proxy         -> conf.d/proxy.conf
-## - mod_secdownload   -> conf.d/secdownload.conf
-## - mod_expire        -> conf.d/expire.conf
-##
-
-server.modules = (
-  "mod_access",
-#  "mod_alias",
-#  "mod_auth",
-#  "mod_evasive",
-#  "mod_redirect",
-#  "mod_rewrite",
-#  "mod_setenv",
-#  "mod_usertrack",
-)
-
-##
-#######################################################################
-
-#######################################################################
-##
-##  Config for various Modules
-##
-
-##
-## mod_ssi
-##
-#include "conf.d/ssi.conf"
-
-##
-## mod_status
-##
-#include "conf.d/status.conf"
-
-##
-## mod_webdav
-##
-#include "conf.d/webdav.conf"
-
-##
-## mod_compress
-##
-#include "conf.d/compress.conf"
-
-##
-## mod_userdir
-##
-#include "conf.d/userdir.conf"
-
-##
-## mod_magnet
-##
-#include "conf.d/magnet.conf"
-
-##
-## mod_cml
-##
-#include "conf.d/cml.conf"
-
-##
-## mod_rrdtool
-##
-#include "conf.d/rrdtool.conf"
-
-##
-## mod_proxy
-##
-#include "conf.d/proxy.conf"
-
-##
-## mod_expire
-##
-#include "conf.d/expire.conf"
-
-##
-## mod_secdownload
-##
-#include "conf.d/secdownload.conf"
-
-##
-#######################################################################
-
-#######################################################################
-##
-## CGI modules
-##
-
-##
-## SCGI (mod_scgi)
-##
-#include "conf.d/scgi.conf"
-
-##
-## FastCGI (mod_fastcgi)
-##
-#include "conf.d/fastcgi.conf"
-
-##
-## plain old CGI (mod_cgi)
-##
-include "conf.d/cgi.conf"
-
-##
-#######################################################################
-
-#######################################################################
-##
-## VHost Modules
-##
-##  Only load ONE of them!
-## ========================
-##
-
-##
-## You can use conditionals for vhosts aswell.
-## 
-## see http://www.lighttpd.net/documentation/configuration.html
-##
-
-##
-## mod_evhost
-##
-#include "conf.d/evhost.conf"
-
-##
-## mod_simple_vhost
-##
-#include "conf.d/simple_vhost.conf"
-
-##
-## mod_mysql_vhost
-##
-#include "conf.d/mysql_vhost.conf"
-
-##
-#######################################################################
diff --git a/conf/docker-dcm/cfg/rsal/lighttpd.conf b/conf/docker-dcm/cfg/rsal/lighttpd.conf
deleted file mode 100644
index 5874d60eb48..00000000000
--- a/conf/docker-dcm/cfg/rsal/lighttpd.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-## lighttpd configuration customized for RSAL; centos7
-
-# refuse connections not from frontend or localhost
-# DO NOT HAVE THIS OPEN TO THE WORLD!!!
-#$HTTP["remoteip"] !~ "192.168.2.2|127.0.0.1" {
-#url.access-deny = ("")
-#}
-server.breakagelog = "/var/log/lighttpd/breakage.log"
-
-#######################################################################
-##
-## Some Variable definition which will make chrooting easier.
-##
-## if you add a variable here. Add the corresponding variable in the
-## chroot example aswell.
-##
-var.log_root    = "/var/log/lighttpd"
-var.server_root = "/opt/rsal/api"
-var.state_dir   = "/var/run"
-var.home_dir    = "/var/lib/lighttpd"
-var.conf_dir    = "/etc/lighttpd"
-
-var.cache_dir   = "/var/cache/lighttpd"
-var.socket_dir  = home_dir + "/sockets"
-include "modules.conf"
-server.port = 80
-server.use-ipv6 = "disable"
-server.username  = "lighttpd"
-server.groupname = "lighttpd"
-server.document-root = server_root 
-server.pid-file = state_dir + "/lighttpd.pid"
-server.errorlog             = log_root + "/error.log"
-include "conf.d/access_log.conf"
-include "conf.d/debug.conf"
-server.event-handler = "linux-sysepoll"
-server.network-backend = "linux-sendfile"
-server.stat-cache-engine = "simple"
-server.max-connections = 1024
-static-file.exclude-extensions = ( ".php", ".pl", ".fcgi", ".scgi" )
-include "conf.d/mime.conf"
-include "conf.d/dirlisting.conf"
-server.follow-symlink = "enable"
-server.upload-dirs = ( "/var/tmp" )
diff --git a/conf/docker-dcm/cfg/rsal/rsyncd.conf b/conf/docker-dcm/cfg/rsal/rsyncd.conf
deleted file mode 100644
index 5a15ab28a12..00000000000
--- a/conf/docker-dcm/cfg/rsal/rsyncd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-lock file=/var/run/rsync.lock
-log file=/var/log/rsyncd.log
-pid file=/var/log/rsyncd.pid
-
-[10.5072]
- path=/public/
- read only=yes
-
diff --git a/conf/docker-dcm/configure_dcm.sh b/conf/docker-dcm/configure_dcm.sh
deleted file mode 100755
index 5b65b0a0314..00000000000
--- a/conf/docker-dcm/configure_dcm.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-echo "dcm configs on dv side to be done"
-
-# in homage to dataverse traditions, reset to insecure "burrito" admin API key
-sudo -u postgres psql -c "update apitoken set tokenstring='burrito' where id=1;" dvndb
-sudo -u postgres psql -c "update authenticateduser set superuser='t' where id=1;" dvndb
-
-# dataverse configs for DCM
-curl -X PUT -d "SHA-1" "http://localhost:8080/api/admin/settings/:FileFixityChecksumAlgorithm"
-curl -X PUT "http://localhost:8080/api/admin/settings/:UploadMethods" -d "dcm/rsync+ssh"
-curl -X PUT "http://localhost:8080/api/admin/settings/:DataCaptureModuleUrl" -d "http://dcmsrv"
-
-# configure for RSAL downloads; but no workflows or RSAL yet
-curl -X PUT "http://localhost:8080/api/admin/settings/:DownloadMethods" -d "rsal/rsync"
-
-# publish root dataverse
-curl -X POST -H "X-Dataverse-key: burrito" "http://localhost:8080/api/dataverses/root/actions/:publish"
-
-# symlink `hold` volume 
-mkdir -p /usr/local/glassfish4/glassfish/domains/domain1/files/
-ln -s /hold /usr/local/glassfish4/glassfish/domains/domain1/files/10.5072
-
-# need to set siteUrl
-cd /usr/local/glassfish4
-bin/asadmin create-jvm-options "\"-Ddataverse.siteUrl=http\://localhost\:8084\""
diff --git a/conf/docker-dcm/configure_rsal.sh b/conf/docker-dcm/configure_rsal.sh
deleted file mode 100755
index 5db43a34381..00000000000
--- a/conf/docker-dcm/configure_rsal.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-fn=rsal-workflow2.json
-# needs an actual IP (vs a hostname) for whitelist
-rsalip=`dig +short rsalsrv`
-
-# create workflow
-curl -s -X POST -H "Content-type: application/json" -d @${fn} "http://localhost:8080/api/admin/workflows" 
-
-# put rsal on the whitelist
-curl -X PUT -d "127.0.0.1;${rsalip}" "http://localhost:8080/api/admin/workflows/ip-whitelist"
-
-# set workflow as default
-curl -X PUT -d "1" "http://localhost:8080/api/admin/workflows/default/PrePublishDataset"
-
-# local access path
-curl -X PUT -d "/hpc/storage" "http://localhost:8080/api/admin/settings/:LocalDataAccessPath"
-
-# storage sites
-curl -X POST -H "Content-type: application/json" --upload-file site-primary.json "http://localhost:8080/api/admin/storageSites"
-curl -X POST -H "Content-type: application/json" --upload-file site-remote.json "http://localhost:8080/api/admin/storageSites"
diff --git a/conf/docker-dcm/create.bash b/conf/docker-dcm/create.bash
deleted file mode 100755
index 58ae6e61dc7..00000000000
--- a/conf/docker-dcm/create.bash
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-
-# user creates dataset
-k_d=burrito
-dv_d=root
-h=http://dvsrv
-
-fn=dataset.json
-#dset_id=`curl -s -H "X-Dataverse-key: $k_d" -X POST --upload-file $fn $h/api/dataverses/$dv_d/datasets | jq .data.id`
-r=`curl -s -H "X-Dataverse-key: $k_d" -X POST --upload-file $fn $h/api/dataverses/$dv_d/datasets`
-echo $r
-dset_id=`echo $r | jq .data.id`
-echo "dataset created with id: $dset_id"
-
-if [ "null" == "${dset_id}" ]; then
-	echo "error - no dataset id from create command"
-	exit 1
-fi
-echo "dataset created; internal/db id: ${dset_id}"
-
-
diff --git a/conf/docker-dcm/dataset.json b/conf/docker-dcm/dataset.json
deleted file mode 100644
index fb1b734ed40..00000000000
--- a/conf/docker-dcm/dataset.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "datasetVersion": {
-      "metadataBlocks": {
-        "citation": {
-          "displayName": "Citation Metadata",
-          "fields": [
-            {
-              "typeName": "title",
-              "multiple": false,
-              "typeClass": "primitive",
-              "value": "DCM test dataset"
-            },
-            {
-              "typeName": "productionDate",
-              "multiple": false,
-              "typeClass": "primitive",
-              "value": "2017-04-01"
-            },
-            {
-              "typeName": "dsDescription",
-              "multiple": true,
-              "typeClass": "compound",
-              "value": [
-                {
-                  "dsDescriptionValue": {
-                    "typeName": "dsDescriptionValue",
-                    "multiple": false,
-                    "typeClass": "primitive",
-                    "value": "this would normally be a dataset large enough to require a DCM"
-                  }
-                }
-              ]
-            },
-            {
-              "typeName": "depositor",
-              "multiple": false,
-              "typeClass": "primitive",
-              "value": "Doc, Bob"
-            },
-            {
-              "typeName": "producer",
-              "multiple": true,
-              "typeClass": "compound",
-              "value": [
-                {
-                  "producerName": {
-                    "typeName": "producerName",
-                    "multiple": false,
-                    "typeClass": "primitive",
-                    "value": "Prof, Arthor"
-                  },
-                  "producerAffiliation": {
-                    "typeName": "producerAffiliation",
-                    "multiple": false,
-                    "typeClass": "primitive",
-                    "value": "LibraScholar"
-                  }
-                }
-              ]
-            },
-            {
-              "typeName": "author",
-              "multiple": true,
-              "typeClass": "compound",
-              "value": [
-                {
-                  "authorName": {
-                    "typeName": "authorName",
-                    "multiple": false,
-                    "typeClass": "primitive",
-                    "value": "Student, Carol"
-                  }
-                ,
-		  "authorAffiliation": {
-		   "typeName": "authorAffiliation",
-		   "multiple": false,
-		   "typeClass": "primitive",
-		   "value": "LibraScholar"
-		  }
-		},
-                {
-                  "authorName": {
-                    "typeName": "authorName",
-                    "multiple": false,
-                    "typeClass": "primitive",
-                    "value": "Doc, Bob"
-                  }
-                ,
-		  "authorAffiliation": {
-		   "typeName": "authorAffiliation",
-		   "multiple": false,
-		   "typeClass": "primitive",
-		   "value": "LibraScholar"
-		  }
-		}
-		
-              ]
-            },
-            {
-              "typeName": "datasetContact",
-              "multiple": true,
-              "typeClass": "compound",
-              "value": [
-                {
-                  "datasetContactEmail": {
-                    "typeName": "datasetContactEmail",
-                    "multiple": false,
-                    "typeClass": "primitive",
-                    "value": "dsContact@mailinator.com"
-                  }
-                }
-              ]
-            },
-            {
-              "typeName": "subject",
-              "multiple": true,
-              "typeClass": "controlledVocabulary",
-              "value": [
-                "Medicine, Health and Life Sciences"
-              ]
-            }
-          ]
-        }
-      }
-  }
-}
diff --git a/conf/docker-dcm/dcmsrv.dockerfile b/conf/docker-dcm/dcmsrv.dockerfile
deleted file mode 100644
index 9989fa3a89d..00000000000
--- a/conf/docker-dcm/dcmsrv.dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# build from repo root
-FROM centos:6
-RUN yum install -y epel-release
-ARG RPMFILE=dcm-0.5-0.noarch.rpm
-COPY ${RPMFILE} /tmp/
-COPY cfg/dcm/bashrc /root/.bashrc
-COPY cfg/dcm/test_install.sh /root/
-RUN yum localinstall -y /tmp/${RPMFILE}
-RUN pip install -r /opt/dcm/requirements.txt
-RUN pip install awscli==1.15.75
-run export PATH=~/.local/bin:$PATH
-RUN /root/test_install.sh
-COPY cfg/dcm/rq-init-d /etc/init.d/rq
-RUN useradd glassfish
-COPY cfg/dcm/entrypoint-dcm.sh /
-COPY cfg/dcm/healthcheck-dcm.sh /
-EXPOSE 80
-EXPOSE 22
-VOLUME /hold
-HEALTHCHECK CMD /healthcheck-dcm.sh
-CMD ["/entrypoint-dcm.sh"]
diff --git a/conf/docker-dcm/docker-compose.yml b/conf/docker-dcm/docker-compose.yml
deleted file mode 100644
index 49d4467d349..00000000000
--- a/conf/docker-dcm/docker-compose.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-# initial docker-compose file for combined Dataverse and DCM with shared filesystem
-
-version: '3'
-
-services:
-  dcmsrv:
-    build:
-      context: .
-      dockerfile: dcmsrv.dockerfile
-    container_name: dcmsrv
-    volumes:
-      - hold:/hold
-  rsalsrv:
-    build:
-      context: .
-      dockerfile: rsalsrv.dockerfile
-    container_name: rsalsrv
-#    image: rsalrepo_rsal
-    volumes:
-      - hold:/hold
-      - ./:/mnt
-    environment:
-      DV_HOST: http://dvsrv:8080
-      DV_APIKEY: burrito
-    ports:
-      - "8889:80"
-      - "873:873"
-  dvsrv:
-    build:
-      context: .
-      dockerfile: dv0dcm.dockerfile
-    container_name: dvsrv
-    volumes:
-      - hold:/hold
-      - ./:/mnt
-    ports:
-      - "8083:8080"
-      - "8084:80"
-  client:
-    build:
-      context: .
-      dockerfile: c6client.dockerfile
-    command: sleep infinity
-    container_name: dcm_client
-    volumes:
-      - ./:/mnt
-
-volumes:
-  hold:
-
diff --git a/conf/docker-dcm/dv0dcm.dockerfile b/conf/docker-dcm/dv0dcm.dockerfile
deleted file mode 100644
index 021534c8978..00000000000
--- a/conf/docker-dcm/dv0dcm.dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# dv0 assumed to be image name for docker-aio
-FROM dv0
-RUN yum install -y bind-utils
-COPY configure_dcm.sh /opt/dv/
-COPY configure_rsal.sh /opt/dv/
-COPY rsal-workflow2.json site-primary.json site-remote.json /opt/dv/
-VOLUME /hold
diff --git a/conf/docker-dcm/get_transfer.bash b/conf/docker-dcm/get_transfer.bash
deleted file mode 100755
index 42080f536e1..00000000000
--- a/conf/docker-dcm/get_transfer.bash
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# user gets transfer script
-
-dset_id=$1
-if [ -z "$dset_id" ]; then
-	echo "no dataset id specified, bailing out"
-	exit 1
-fi
-
-k_d=burrito
-dv_d=root
-
-h=http://dvsrv
-
-#get upload script from DCM
-wget --header "X-Dataverse-key: ${k_d}" ${h}/api/datasets/${dset_id}/dataCaptureModule/rsync -O upload-${dset_id}.bash
-
-
diff --git a/conf/docker-dcm/publish_major.bash b/conf/docker-dcm/publish_major.bash
deleted file mode 100755
index 6a3fd1288ca..00000000000
--- a/conf/docker-dcm/publish_major.bash
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-# publish dataset based on database id
-
-dset_id=$1
-if [ -z "$dset_id" ]; then
-	echo "no dataset id specified, bailing out"
-	exit 1
-fi
-
-k_d=burrito
-
-h=http://dvsrv
-
-curl -X POST -H "X-Dataverse-key: ${k_d}" "${h}/api/datasets/${dset_id}/actions/:publish?type=major"
-
-
diff --git a/conf/docker-dcm/readme.md b/conf/docker-dcm/readme.md
deleted file mode 100644
index 3e6a15e61d6..00000000000
--- a/conf/docker-dcm/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-This docker-compose setup is intended for use in development, small scale evaluation, and potentially serve as an example of a working (although not production security level) configuration.
-
-Setup:
-
-- build docker-aio image with name dv0 as described in `../docker-aio` (don't start up the docker image or run setupIT.bash)
-- work in the `conf/docker-dcm` directory for below commands
-- download/prepare dependencies: `./0prep.sh`
-- build dcm/dv0dcm images with docker-compose: `docker-compose -f docker-compose.yml build`
-- start containers: `docker-compose -f docker-compose.yml up -d`
-- wait for container to show "healthy" (aka - `docker ps`), then run dataverse app installation: `docker exec dvsrv /opt/dv/install.bash`
-- for development, you probably want to use the `FAKE` DOI provider: `docker exec -it dvsrv /opt/dv/configure_doi.bash`
-- configure dataverse application to use DCM: `docker exec -it dvsrv /opt/dv/configure_dcm.sh`
-- configure dataverse application to use RSAL (if desired): `docker exec -it dvsrv /opt/dv/configure_rsal.sh`
-
-Operation:
-The dataverse installation is accessible at `http://localhost:8084`.
-The `dcm_client` container is intended to be used for executing transfer scripts, and `conf/docker-dcm` is available at `/mnt` inside the container; this container can be accessed with `docker exec -it dcm_client bash`.
-The DCM cron job is NOT configured here; for development purposes the DCM checks can be run manually with `docker exec -it dcmsrv /opt/dcm/scn/post_upload.bash`.
-The RSAL cron job is similarly NOT configured; for development purposes `docker exec -it rsalsrv /opt/rsal/scn/pub.py` can be run manually.
-
-
-Cleanup:
-- shutdown/cleanup `docker-compose -f docker-compose.yml down -v`
-
-For reference, this configuration was working with docker 17.09 / docker-compose 1.16.
-
diff --git a/conf/docker-dcm/rsal-workflow2.json b/conf/docker-dcm/rsal-workflow2.json
deleted file mode 100644
index 322d3ecbcf7..00000000000
--- a/conf/docker-dcm/rsal-workflow2.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "name": "RSAL file move for publication",
-    "steps": [
-        {
-            "provider":":internal",
-            "stepType":"log",
-            "parameters": {
-                "message": "Pre-http request"
-            }
-        },
-        {
-            "provider":":internal",
-            "stepType":"http/sr",
-            "parameters": {
-                "url":"http://rsalsrv/rr.py",
-                "method":"POST",
-                "contentType":"text/plain",
-                "body":"${invocationId}\ndataset.id=${dataset.id}\ndataset.identifier=${dataset.identifier}\ndataset.globalId=${dataset.globalId}",
-                "expectedResponse":"OK.*",
-                "rollbackMethod":"DELETE"
-            }
-        },
-        {
-            "provider":":internal",
-            "stepType":"log",
-            "parameters": {
-                "message": "Post-http request"
-            }
-        }
-    ]
-}
diff --git a/conf/docker-dcm/rsalsrv.dockerfile b/conf/docker-dcm/rsalsrv.dockerfile
deleted file mode 100644
index 844432afe6b..00000000000
--- a/conf/docker-dcm/rsalsrv.dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM centos:7
-ARG RPMFILE=rsal-0.1-0.noarch.rpm
-RUN yum update; yum install -y epel-release 
-COPY ${RPMFILE} /tmp/
-RUN yum localinstall -y /tmp/${RPMFILE}
-COPY cfg/rsal/rsyncd.conf /etc/rsyncd.conf
-COPY cfg/rsal/entrypoint-rsal.sh /entrypoint.sh
-COPY cfg/rsal/lighttpd-modules.conf /etc/lighttpd/modules.conf
-COPY cfg/rsal/lighttpd.conf /etc/lighttpd/lighttpd.conf
-RUN mkdir -p /public/FK2 
-RUN pip2 install -r /opt/rsal/scn/requirements.txt
-#COPY doc/testdata/ /hold/
-ARG DV_HOST=http://dv_srv:8080
-ARG DV_API_KEY=burrito
-ENV DV_HOST ${DV_HOST}
-ENV DV_API_KEY ${DV_API_KEY}
-EXPOSE 873
-EXPOSE 80
-HEALTHCHECK CMD curl --fail http://localhost/hw.py || exit 1
-CMD ["/entrypoint.sh"]
diff --git a/conf/docker-dcm/site-primary.json b/conf/docker-dcm/site-primary.json
deleted file mode 100644
index 35b217edffd..00000000000
--- a/conf/docker-dcm/site-primary.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"hostname": "rsalsrv",
-	"name": "LibraScholar University",
-	"primaryStorage": true,
-	"transferProtocols": "rsync,posix"
-}
diff --git a/conf/docker-dcm/site-remote.json b/conf/docker-dcm/site-remote.json
deleted file mode 100644
index d47c3ef4dda..00000000000
--- a/conf/docker-dcm/site-remote.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"hostname": "remote.libra.research",
-	"name": "LibraResearch Institute",
-	"primaryStorage": false,
-	"transferProtocols": "rsync"
-}
diff --git a/conf/docker/build.sh b/conf/docker/build.sh
deleted file mode 100755
index 27145d199e1..00000000000
--- a/conf/docker/build.sh
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/bash
-# Creates images and pushes them to Docker Hub.
-# The "latest" tag under "iqss" should be relatively stable. Don't push breaking changes there.
-# None of the tags are suitable for production use. See https://github.com/IQSS/dataverse/issues/4040
-# To iterate on images, push to custom tags or tags based on branch names or a non-iqss Docker Hub org/username. Consider trying "internal" to push to the internal Minishift registry.
-
-# Docker Hub organization or username
-HUBORG=iqss
-# The most stable tag we have.
-STABLE=latest
-#FIXME: Use a real flag/argument parser. download-files.sh uses "getopts" for example.
-if [ -z "$1" ]; then
-  echo "No argument supplied. For experiments, specify \"branch\" or \"custom my-custom-tag\" or \"huborg <USERNAME/ORG>\" or \"internal\". Specify \"stable\" to push to the \"$STABLE\" tag under \"$HUBORG\" if your change won't break anything."
-  exit 1
-fi
-
-if [ "$1" == 'branch' ]; then
-  echo "We'll push a tag to the branch you're on."
-  GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-  TAG=$GIT_BRANCH
-elif [ "$1" == 'stable' ]; then
-  echo "We'll push a tag to the most stable tag (which isn't saying much!)."
-  TAG=$STABLE
-elif [ "$1" == 'custom' ]; then
-  if [ -z "$2" ]; then
-    echo "You must provide a custom tag as the second argument. Something other than \"$STABLE\"."
-    exit 1
-  else
-    echo "We'll push a custom tag."
-    TAG=$2
-  fi
-elif [ "$1" == 'huborg' ]; then
-  if [ -z "$2" ]; then
-    echo "You must provide your Docker Hub organization or username as the second argument. \"$USER\" or whatever."
-    exit 1
-  else
-    HUBORG=$2
-    TAG=$STABLE
-    echo "We'll push to the Docker Hub organization or username you specified: $HUBORG."
-  fi
-elif [ "$1" == 'internal' ]; then
-  echo "Building for internal Minishift registry."
-  TAG=$STABLE
-else
-  echo "Unexpected argument: $1. Exiting. Run with no arguments for help."
-  TAG=$STABLE
-  exit 1
-fi
-echo Images are being built for registry org/username \"$HUBORG\" with the tag \"$TAG\".
-#
-# Build dataverse-solr
-#
-cp ../solr/7.3.0/schema.xml solr/
-# move solr*.tgz to the solr image
-cp ../../downloads/solr-7.3.0.tgz solr/
-docker build -t $HUBORG/dataverse-solr:$TAG  solr/
-if [ "$1" == 'internal' ]; then
-  echo "Skipping docker push because we're using the internal Minishift registry."
-else
-  # FIXME: Check the output of "docker build" and only push on success.
-  docker push $HUBORG/dataverse-solr:$TAG
-fi
-#
-# Build dataverse-glassfish
-#
-# TODO: Think about if we really need dataverse.war because it's in dvinstall.zip.
-cd ../..
-mvn clean
-scripts/installer/custom-build-number
-mvn package
-cd conf/docker
-cp ../../target/dataverse*.war dataverse-glassfish/dataverse.war
-if [[ "$?" -ne 0 ]]; then
-  echo "Unable to copy war file into place. Did 'mvn package' work?"
-  exit 1
-fi
-cd ../../scripts/installer
-make clean
-make
-cd ../../conf/docker
-cp ../../scripts/installer/dvinstall.zip dataverse-glassfish
-if [[ "$?" -ne 0 ]]; then
-  echo "Unable to copy dvinstall.zip file into place. Did 'make' work?"
-  exit 1
-fi
-cp ../../downloads/glassfish-4.1.zip dataverse-glassfish
-if [[ "$?" -ne 0 ]]; then
-  echo "Unable to copy Glassfish zip file into place. You must run the download script in that directory once. "
-  exit 1
-fi
-# We'll assume at this point that the download script has been run.
-cp ../../downloads/weld-osgi-bundle-2.2.10.Final-glassfish4.jar dataverse-glassfish
-docker build -t $HUBORG/dataverse-glassfish:$TAG dataverse-glassfish
-if [ "$1" == 'internal' ]; then
-  echo "Skipping docker push because we're using the internal Minishift registry."
-else
-  # FIXME: Check the output of "docker build" and only push on success.
-  docker push $HUBORG/dataverse-glassfish:$TAG
-fi
-#
-# Build init-container
-#
-cp ../../scripts/installer/install dataverse-glassfish/init-container
-docker build -t $HUBORG/init-container:$TAG dataverse-glassfish/init-container
-if [ "$1" == 'internal' ]; then
-  echo "Skipping docker push because we're using the internal Minishift registry."
-else
-  # FIXME: Check the output of "docker build" and only push on success.
-  docker push $HUBORG/init-container:$TAG
-fi
diff --git a/conf/docker/dataverse-glassfish/.gitignore b/conf/docker/dataverse-glassfish/.gitignore
deleted file mode 100644
index 2084aa8849e..00000000000
--- a/conf/docker/dataverse-glassfish/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-glassfish-4.1.zip
-weld-osgi-bundle-2.2.10.Final-glassfish4.jar
-dvinstall.zip
-dataverse.war
-init-container/postgres-setup
diff --git a/conf/docker/dataverse-glassfish/Dockerfile b/conf/docker/dataverse-glassfish/Dockerfile
deleted file mode 100644
index 367a9ca127c..00000000000
--- a/conf/docker/dataverse-glassfish/Dockerfile
+++ /dev/null
@@ -1,101 +0,0 @@
-FROM centos:7
-MAINTAINER Dataverse (support@dataverse.org)
-
-COPY glassfish-4.1.zip /tmp
-COPY weld-osgi-bundle-2.2.10.Final-glassfish4.jar /tmp
-COPY default.config /tmp
-# Install dependencies
-#RUN yum install -y unzip
-RUN yum install -y \
-    cronie \
-    git \
-    java-1.8.0-openjdk-devel \
-    nc \
-    perl \
-    postgresql \
-    sha1sum \
-    unzip \
-    wget
-
-ENV GLASSFISH_DOWNLOAD_SHA1 d1a103d06682eb08722fbc9a93089211befaa080
-ENV GLASSFISH_DIRECTORY "/usr/local/glassfish4"
-ENV HOST_DNS_ADDRESS "localhost"
-ENV POSTGRES_DB "dvndb"
-ENV POSTGRES_USER "dvnapp"
-ENV RSERVE_USER "rserve"
-ENV RSERVE_PASSWORD "rserve"
-
-#RUN exitEarlyBeforeJq
-RUN yum -y install epel-release \
-    jq 
-
-COPY dvinstall.zip /tmp
-
-#RUN ls /tmp
-#
-RUN find /tmp
-#
-#RUN exitEarly
-
-# Install Glassfish 4.1
-RUN cd /tmp \
-    && unzip glassfish-4.1.zip \
-    && mv glassfish4 /usr/local \
-    && cd /usr/local/glassfish4/glassfish/modules \
-    && rm weld-osgi-bundle.jar \
-    && cp /tmp/weld-osgi-bundle-2.2.10.Final-glassfish4.jar . \
-    && cd /tmp && unzip /tmp/dvinstall.zip \
-    && chmod 777 -R /tmp/dvinstall/ \
-    #FIXME: Patch Grizzly too!
-    && echo "Done installing and patching Glassfish"
-
-RUN chmod g=u /etc/passwd
-
-RUN mkdir -p /home/glassfish
-RUN chgrp -R 0 /home/glassfish && \
-    chmod -R g=u /home/glassfish
-
-RUN mkdir -p /usr/local/glassfish4
-RUN chgrp -R 0 /usr/local/glassfish4 && \
-    chmod -R g=u /usr/local/glassfish4
-
-#JHOVE
-RUN cp /tmp/dvinstall/jhove* /usr/local/glassfish4/glassfish/domains/domain1/config
-
-
-#SETUP JVM OPTIONS 
-ARG DOCKER_BUILD="true" 
-RUN echo $DOCKER_BUILD
-RUN /tmp/dvinstall/glassfish-setup.sh
-###glassfish-setup will handle everything in Dockerbuild
-
-##install jdbc driver 
-RUN cp /tmp/dvinstall/pgdriver/postgresql-42.2.2.jar /usr/local/glassfish4/glassfish/domains/domain1/lib
-
-# Customized persistence xml to avoid database recreation
-#RUN mkdir -p /tmp/WEB-INF/classes/META-INF/ 
-#COPY WEB-INF/classes/META-INF/persistence.xml /tmp/WEB-INF/classes/META-INF/
-
-# Install iRods iCommands
-#RUN  cd /tmp \
-#   && yum -y install epel-release \
-#   && yum -y install ftp://ftp.renci.org/pub/irods/releases/4.1.6/centos7/irods-icommands-4.1.6-centos7-x86_64.rpm 
-
-#COPY config-glassfish /root/dvinstall
-#COPY restart-glassfish /root/dvinstall
-#COPY config-dataverse /root/dvinstall
-
-#RUN cd /root/dvinstall && ./config-dataverse
-COPY ./entrypoint.sh /
-#COPY ./ddl /root/dvinstall
-#COPY ./init-postgres /root/dvinstall
-#COPY ./init-glassfish /root/dvinstall
-#COPY ./init-dataverse /root/dvinstall
-#COPY ./setup-all.sh /root/dvinstall
-#COPY ./setup-irods.sh /root/dvinstall
-COPY ./Dockerfile /
-
-EXPOSE      8080 
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["dataverse"]
diff --git a/conf/docker/dataverse-glassfish/default.config b/conf/docker/dataverse-glassfish/default.config
deleted file mode 100644
index 7af10336f30..00000000000
--- a/conf/docker/dataverse-glassfish/default.config
+++ /dev/null
@@ -1,16 +0,0 @@
-HOST_DNS_ADDRESS	localhost
-GLASSFISH_DIRECTORY	/usr/local/glassfish4
-ADMIN_EMAIL	 
-MAIL_SERVER	mail.hmdc.harvard.edu
-POSTGRES_ADMIN_PASSWORD	secret
-POSTGRES_SERVER	dataverse-postgresql-0.dataverse-postgresql-service
-POSTGRES_PORT	5432
-POSTGRES_DATABASE	dvndb
-POSTGRES_USER	dvnapp
-POSTGRES_PASSWORD	secret
-SOLR_LOCATION	dataverse-solr-service:8983
-TWORAVENS_LOCATION	NOT INSTALLED
-RSERVE_HOST	localhost
-RSERVE_PORT	6311
-RSERVE_USER	rserve
-RSERVE_PASSWORD	rserve
diff --git a/conf/docker/dataverse-glassfish/entrypoint.sh b/conf/docker/dataverse-glassfish/entrypoint.sh
deleted file mode 100755
index 55bbbdedbb7..00000000000
--- a/conf/docker/dataverse-glassfish/entrypoint.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/bash -x
-
-# Entrypoint script for Dataverse web application. This script waits
-# for dependent services (Rserve, Postgres, Solr) to start before
-# initializing Glassfish.
-
-echo "whoami before..."
-whoami
-if ! whoami &> /dev/null; then
-  if [ -w /etc/passwd ]; then
-    # Make `whoami` return the glassfish user.  # See https://docs.openshift.org/3.6/creating_images/guidelines.html#openshift-origin-specific-guidelines
-    # Fancy bash magic from https://github.com/RHsyseng/container-rhel-examples/blob/1208dcd7d4f431fc6598184dba6341b9465f4197/starter-arbitrary-uid/bin/uid_entrypoint#L4
-    echo "${USER_NAME:-glassfish}:x:$(id -u):0:${USER_NAME:-glassfish} user:/home/glassfish:/bin/bash" >> /etc/passwd
-  fi
-fi
-echo "whoami after"
-whoami
-
-set -e
-
-if [ "$1" = 'dataverse' ]; then
-
-    export GLASSFISH_DIRECTORY=/usr/local/glassfish4
-    export HOST_DNS_ADDRESS=localhost
-
-    TIMEOUT=30
-
-    if [ -n "$RSERVE_SERVICE_HOST" ]; then
-        RSERVE_HOST=$RSERVE_SERVICE_HOST
-    elif [ -n "$RSERVE_PORT_6311_TCP_ADDR" ]; then
-        RSERVE_HOST=$RSERVE_PORT_6311_TCP_ADDR
-    elif [ -z "$RSERVE_HOST" ]; then
-        RSERVE_HOST="localhost"
-    fi
-    export RSERVE_HOST
-    
-    if [ -n "$RSERVE_SERVICE_PORT" ]; then
-        RSERVE_PORT=$RSERVE_SERVICE_PORT
-    elif [ -n "$RSERVE_PORT_6311_TCP_PORT" ]; then
-        RSERVE_PORT=$RSERVE_PORT_6311_TCP_PORT
-    elif [ -z "$RSERVE_PORT" ]; then
-        RSERVE_PORT="6311"
-    fi
-    export RSERVE_PORT
-
-    echo "Using Rserve at $RSERVE_HOST:$RSERVE_PORT"
-    
-    if ncat $RSERVE_HOST $RSERVE_PORT -w $TIMEOUT --send-only < /dev/null > /dev/null 2>&1 ; then 
-        echo Rserve running; 
-    else
-        echo Optional service Rserve not running. 
-    fi
-    
-    
-    # postgres
-    if [ -n "$POSTGRES_SERVICE_HOST" ]; then
-        POSTGRES_HOST=$POSTGRES_SERVICE_HOST
-    elif [ -n "$POSTGRES_PORT_5432_TCP_ADDR" ]; then
-        POSTGRES_HOST=$POSTGRES_PORT_5432_TCP_ADDR
-    elif [ -z "$POSTGRES_HOST" ]; then
-        POSTGRES_HOST="localhost"
-    fi
-    export POSTGRES_HOST
-    
-    if [ -n "$POSTGRES_SERVICE_PORT" ]; then
-        POSTGRES_PORT=$POSTGRES_SERVICE_PORT
-    elif [ -n "$POSTGRES_PORT_5432_TCP_PORT" ]; then
-        POSTGRES_PORT=$POSTGRES_PORT_5432_TCP_PORT
-    else
-        POSTGRES_PORT=5432
-    fi 
-    export POSTGRES_PORT
-
-    echo "Using Postgres at $POSTGRES_HOST:$POSTGRES_PORT"
-    
-    if ncat $POSTGRES_HOST $POSTGRES_PORT -w $TIMEOUT --send-only < /dev/null > /dev/null 2>&1 ; then 
-        echo Postgres running; 
-    else
-        echo Required service Postgres not running. Have you started the required services?
-        exit 1 
-    fi
-    
-    # solr
-    if [ -n "$SOLR_SERVICE_HOST" ]; then
-        SOLR_HOST=$SOLR_SERVICE_HOST
-    elif [ -n "$SOLR_PORT_8983_TCP_ADDR" ]; then
-        SOLR_HOST=$SOLR_PORT_8983_TCP_ADDR
-    elif [ -z "$SOLR_HOST" ]; then
-        SOLR_HOST="localhost"
-    fi
-    export SOLR_HOST
-    
-    if [ -n "$SOLR_SERVICE_PORT" ]; then
-        SOLR_PORT=$SOLR_SERVICE_PORT
-    elif [ -n "$SOLR_PORT_8983_TCP_PORT" ]; then
-        SOLR_PORT=$SOLR_PORT_8983_TCP_PORT
-    else
-        SOLR_PORT=8983
-    fi 
-    export SOLR_PORT
-    
-    echo "Using Solr at $SOLR_HOST:$SOLR_PORT"
-
-    if ncat $SOLR_HOST $SOLR_PORT -w $TIMEOUT --send-only < /dev/null > /dev/null 2>&1 ; then 
-        echo Solr running; 
-    else
-        echo Required service Solr not running. Have you started the required services?
-        exit 1 
-    fi
-    
-    GLASSFISH_INSTALL_DIR="/usr/local/glassfish4"
-    cd /tmp/dvinstall
-    echo Copying the non-interactive file into place
-    cp /tmp/default.config .
-    echo Looking at first few lines of default.config
-    head default.config
-    # non-interactive install
-    echo Running non-interactive install
-    #./install -y -f > install.out 2> install.err
-    ./install -y -f 
-
-#    if [ -n "$DVICAT_PORT_1247_TCP_PORT" ]; then
-#        ./setup-irods.sh
-#    fi
-
-    # We do change the Solr server in Minishift/OpenShift, which is
-    # the primary target for all of the work under conf/docker.
-    # echo -e "\n\nRestarting Dataverse in case Solr host was changed..."
-    # /usr/local/glassfish4/glassfish/bin/asadmin stop-domain
-    # sleep 3
-    # /usr/local/glassfish4/glassfish/bin/asadmin start-domain
-
-    echo -e "\n\nDataverse started"
-
-    sleep infinity
-else
-    exec "$@"
-fi
-
diff --git a/conf/docker/dataverse-glassfish/init-container/Dockerfile b/conf/docker/dataverse-glassfish/init-container/Dockerfile
deleted file mode 100644
index 829ab03bcb2..00000000000
--- a/conf/docker/dataverse-glassfish/init-container/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM centos:7
-MAINTAINER Dataverse (support@dataverse.org)
-
-### init-container is an Init Container for glassfish service in OpenShift or other Kubernetes environment
-# This initContainer will take care of setting up glassfish
-
-# Install dependencies
-RUN yum install -y \
-    nc \
-    perl \
-    postgresql \
-    sha1sum 
-
-COPY install /
-
-ENTRYPOINT ["/install", "--pg_only", "--yes"]
diff --git a/conf/docker/dataverse-glassfish/init-container/default.config b/conf/docker/dataverse-glassfish/init-container/default.config
deleted file mode 100644
index 7af10336f30..00000000000
--- a/conf/docker/dataverse-glassfish/init-container/default.config
+++ /dev/null
@@ -1,16 +0,0 @@
-HOST_DNS_ADDRESS	localhost
-GLASSFISH_DIRECTORY	/usr/local/glassfish4
-ADMIN_EMAIL	 
-MAIL_SERVER	mail.hmdc.harvard.edu
-POSTGRES_ADMIN_PASSWORD	secret
-POSTGRES_SERVER	dataverse-postgresql-0.dataverse-postgresql-service
-POSTGRES_PORT	5432
-POSTGRES_DATABASE	dvndb
-POSTGRES_USER	dvnapp
-POSTGRES_PASSWORD	secret
-SOLR_LOCATION	dataverse-solr-service:8983
-TWORAVENS_LOCATION	NOT INSTALLED
-RSERVE_HOST	localhost
-RSERVE_PORT	6311
-RSERVE_USER	rserve
-RSERVE_PASSWORD	rserve
diff --git a/conf/docker/postgresql/Dockerfile b/conf/docker/postgresql/Dockerfile
deleted file mode 100644
index 81ecf0fdeb8..00000000000
--- a/conf/docker/postgresql/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# PostgreSQL for Dataverse (but consider switching to the image from CentOS)
-#
-# See also conf/docker/dataverse-glassfish/Dockerfile
diff --git a/conf/docker/solr/.gitignore b/conf/docker/solr/.gitignore
deleted file mode 100644
index a6237a89914..00000000000
--- a/conf/docker/solr/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-solr-7.3.0.tgz
-schema.xml
diff --git a/conf/docker/solr/Dockerfile b/conf/docker/solr/Dockerfile
deleted file mode 100644
index 993c2909f4d..00000000000
--- a/conf/docker/solr/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM centos:7
-MAINTAINER Dataverse (support@dataverse.org)
-
-RUN yum install -y unzip java-1.8.0-openjdk-devel lsof
-
-# Install Solr 7.3.0
-# The context of the build is the "conf" directory.
-COPY solr-7.3.0.tgz /tmp
-RUN cd /tmp \
-    && tar xvfz solr-7.3.0.tgz \
-    && rm solr-7.3.0.tgz \
-    && mkdir /usr/local/solr \
-    && mv solr-7.3.0 /usr/local/solr/
-
-COPY schema.xml /tmp
-COPY solrconfig_master.xml /tmp
-COPY solrconfig_slave.xml /tmp
-
-RUN chmod g=u /etc/passwd
-
-RUN chgrp -R 0 /usr/local/solr && \
-    chmod -R g=u /usr/local/solr
-
-EXPOSE 8983
-
-COPY Dockerfile /
-COPY entrypoint.sh /
-
-ENTRYPOINT ["/entrypoint.sh"]
-USER 1001
-CMD ["solr"]
diff --git a/conf/docker/solr/backup_cron.sh b/conf/docker/solr/backup_cron.sh
deleted file mode 100644
index 95f31b4b53a..00000000000
--- a/conf/docker/solr/backup_cron.sh
+++ /dev/null
@@ -1 +0,0 @@
-0 */6 * * * curl 'http://localhost:8983/solr/collection1/replication?command=backup&location=/home/share'
diff --git a/conf/docker/solr/entrypoint.sh b/conf/docker/solr/entrypoint.sh
deleted file mode 100755
index 5d003f9c56b..00000000000
--- a/conf/docker/solr/entrypoint.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-if ! whoami &> /dev/null; then
-  if [ -w /etc/passwd ]; then
-    echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
-  fi
-fi
-
-SOLR_DIR=/usr/local/solr/solr-7.3.0
-
-if [ "$1" = 'solr' ]; then
-
-    cp -r $SOLR_DIR/server/solr/configsets/_default $SOLR_DIR/server/solr/collection1
-    cp /tmp/schema.xml $SOLR_DIR/server/solr/collection1/conf
-
-    if [ $HOSTNAME = "dataverse-solr-0" ]; then
-        echo "I am the master"
-        mv /tmp/solrconfig_master.xml $SOLR_DIR/server/solr/collection1/conf/solrconfig.xml
-        cp /tmp/solrconfig_slave.xml $SOLR_DIR/server/solr/collection1/conf
-
-    else   
-        echo "I am the slave"
-        cp /tmp/solrconfig_slave.xml $SOLR_DIR/server/solr/collection1/conf 
-        mv $SOLR_DIR/server/solr/collection1/conf/solrconfig_slave.xml $SOLR_DIR/server/solr/collection1/conf/solrconfig.xml
-    fi
-    cd $SOLR_DIR
-    bin/solr start
-    bin/solr create_core -c collection1 -d server/solr/collection1/conf
-    if [ $HOSTNAME = "dataverse-solr-0" ]; then
-        curl 'http://localhost:8983/solr/collection1/replication?command=restore&location=/home/share'
-    fi
-
-    sleep infinity
-elif [ "$1" = 'usage' ]; then
-    echo  'docker run -d iqss/dataverse-solr solr'
-else
-    exec "$@"
-fi
diff --git a/conf/docker/solr/solrconfig_master.xml b/conf/docker/solr/solrconfig_master.xml
deleted file mode 100644
index d409f70b5d5..00000000000
--- a/conf/docker/solr/solrconfig_master.xml
+++ /dev/null
@@ -1,1431 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-     For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml.
--->
-<config>
-  <!-- In all configuration below, a prefix of "solr." for class names
-       is an alias that causes solr to search appropriate packages,
-       including org.apache.solr.(search|update|request|core|analysis)
-
-       You may also specify a fully qualified Java classname if you
-       have your own custom plugins.
-    -->
-
-  <!-- Controls what version of Lucene various components of Solr
-       adhere to.  Generally, you want to use the latest version to
-       get all bug fixes and improvements. It is highly recommended
-       that you fully re-index after changing this setting as it can
-       affect both how text is indexed and queried.
-  -->
-  <luceneMatchVersion>7.3.0</luceneMatchVersion>
-
-  <!-- <lib/> directives can be used to instruct Solr to load any Jars
-       identified and use them to resolve any "plugins" specified in
-       your solrconfig.xml or schema.xml (ie: Analyzers, Request
-       Handlers, etc...).
-
-       All directories and paths are resolved relative to the
-       instanceDir.
-
-       Please note that <lib/> directives are processed in the order
-       that they appear in your solrconfig.xml file, and are "stacked"
-       on top of each other when building a ClassLoader - so if you have
-       plugin jars with dependencies on other jars, the "lower level"
-       dependency jars should be loaded first.
-
-       If a "./lib" directory exists in your instanceDir, all files
-       found in it are included as if you had used the following
-       syntax...
-
-              <lib dir="./lib" />
-    -->
-
-  <!-- A 'dir' option by itself adds any files found in the directory
-       to the classpath, this is useful for including all jars in a
-       directory.
-
-       When a 'regex' is specified in addition to a 'dir', only the
-       files in that directory which completely match the regex
-       (anchored on both ends) will be included.
-
-       If a 'dir' option (with or without a regex) is used and nothing
-       is found that matches, a warning will be logged.
-
-       The examples below can be used to load some solr-contribs along
-       with their external dependencies.
-    -->
-  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
-  <!-- an exact 'path' can be used instead of a 'dir' to specify a
-       specific jar file.  This will cause a serious error to be logged
-       if it can't be loaded.
-    -->
-  <!--
-     <lib path="../a-jar-that-does-not-exist.jar" />
-  -->
-
-  <!-- Data Directory
-
-       Used to specify an alternate directory to hold all index data
-       other than the default ./data under the Solr home.  If
-       replication is in use, this should match the replication
-       configuration.
-    -->
-  <dataDir>${solr.data.dir:}</dataDir>
-
-
-  <!-- The DirectoryFactory to use for indexes.
-
-       solr.StandardDirectoryFactory is filesystem
-       based and tries to pick the best implementation for the current
-       JVM and platform.  solr.NRTCachingDirectoryFactory, the default,
-       wraps solr.StandardDirectoryFactory and caches small files in memory
-       for better NRT performance.
-
-       One can force a particular implementation via solr.MMapDirectoryFactory,
-       solr.NIOFSDirectoryFactory, or solr.SimpleFSDirectoryFactory.
-
-       solr.RAMDirectoryFactory is memory based and not persistent.
-    -->
-  <directoryFactory name="DirectoryFactory"
-                    class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
-
-  <!-- The CodecFactory for defining the format of the inverted index.
-       The default implementation is SchemaCodecFactory, which is the official Lucene
-       index format, but hooks into the schema to provide per-field customization of
-       the postings lists and per-document values in the fieldType element
-       (postingsFormat/docValuesFormat). Note that most of the alternative implementations
-       are experimental, so if you choose to customize the index format, it's a good
-       idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
-       before upgrading to a newer version to avoid unnecessary reindexing.
-       A "compressionMode" string element can be added to <codecFactory> to choose
-       between the existing compression modes in the default codec: "BEST_SPEED" (default)
-       or "BEST_COMPRESSION".
-  -->
-  <codecFactory class="solr.SchemaCodecFactory"/>
-
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       Index Config - These settings control low-level behavior of indexing
-       Most example settings here show the default value, but are commented
-       out, to more easily see where customizations have been made.
-
-       Note: This replaces <indexDefaults> and <mainIndex> from older versions
-       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <indexConfig>
-    <!-- maxFieldLength was removed in 4.0. To get similar behavior, include a
-         LimitTokenCountFilterFactory in your fieldType definition. E.g.
-     <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="10000"/>
-    -->
-    <!-- Maximum time to wait for a write lock (ms) for an IndexWriter. Default: 1000 -->
-    <!-- <writeLockTimeout>1000</writeLockTimeout>  -->
-
-    <!-- Expert: Enabling compound file will use less files for the index,
-         using fewer file descriptors on the expense of performance decrease.
-         Default in Lucene is "true". Default in Solr is "false" (since 3.6) -->
-    <!-- <useCompoundFile>false</useCompoundFile> -->
-
-    <!-- ramBufferSizeMB sets the amount of RAM that may be used by Lucene
-         indexing for buffering added documents and deletions before they are
-         flushed to the Directory.
-         maxBufferedDocs sets a limit on the number of documents buffered
-         before flushing.
-         If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.  -->
-    <!-- <ramBufferSizeMB>100</ramBufferSizeMB> -->
-    <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
-
-    <!-- Expert: Merge Policy
-         The Merge Policy in Lucene controls how merging of segments is done.
-         The default since Solr/Lucene 3.3 is TieredMergePolicy.
-         The default since Lucene 2.3 was the LogByteSizeMergePolicy,
-         Even older versions of Lucene used LogDocMergePolicy.
-      -->
-    <!--
-        <mergePolicyFactory class="org.apache.solr.index.TieredMergePolicyFactory">
-          <int name="maxMergeAtOnce">10</int>
-          <int name="segmentsPerTier">10</int>
-          <double name="noCFSRatio">0.1</double>
-        </mergePolicyFactory>
-      -->
-
-    <!-- Expert: Merge Scheduler
-         The Merge Scheduler in Lucene controls how merges are
-         performed.  The ConcurrentMergeScheduler (Lucene 2.3 default)
-         can perform merges in the background using separate threads.
-         The SerialMergeScheduler (Lucene 2.2 default) does not.
-     -->
-    <!--
-       <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
-       -->
-
-    <!-- LockFactory
-
-         This option specifies which Lucene LockFactory implementation
-         to use.
-
-         single = SingleInstanceLockFactory - suggested for a
-                  read-only index or when there is no possibility of
-                  another process trying to modify the index.
-         native = NativeFSLockFactory - uses OS native file locking.
-                  Do not use when multiple solr webapps in the same
-                  JVM are attempting to share a single index.
-         simple = SimpleFSLockFactory  - uses a plain file for locking
-
-         Defaults: 'native' is default for Solr3.6 and later, otherwise
-                   'simple' is the default
-
-         More details on the nuances of each LockFactory...
-         http://wiki.apache.org/lucene-java/AvailableLockFactories
-    -->
-    <lockType>${solr.lock.type:native}</lockType>
-
-    <!-- Commit Deletion Policy
-         Custom deletion policies can be specified here. The class must
-         implement org.apache.lucene.index.IndexDeletionPolicy.
-
-         The default Solr IndexDeletionPolicy implementation supports
-         deleting index commit points on number of commits, age of
-         commit point and optimized status.
-
-         The latest commit point should always be preserved regardless
-         of the criteria.
-    -->
-    <!--
-    <deletionPolicy class="solr.SolrDeletionPolicy">
-    -->
-    <!-- The number of commit points to be kept -->
-    <!-- <str name="maxCommitsToKeep">1</str> -->
-    <!-- The number of optimized commit points to be kept -->
-    <!-- <str name="maxOptimizedCommitsToKeep">0</str> -->
-    <!--
-        Delete all commit points once they have reached the given age.
-        Supports DateMathParser syntax e.g.
-      -->
-    <!--
-       <str name="maxCommitAge">30MINUTES</str>
-       <str name="maxCommitAge">1DAY</str>
-    -->
-    <!--
-    </deletionPolicy>
-    -->
-
-    <!-- Lucene Infostream
-
-         To aid in advanced debugging, Lucene provides an "InfoStream"
-         of detailed information when indexing.
-
-         Setting The value to true will instruct the underlying Lucene
-         IndexWriter to write its debugging info the specified file
-      -->
-    <!-- <infoStream file="INFOSTREAM.txt">false</infoStream> -->
-  </indexConfig>
-
-
-  <!-- JMX
-
-       This example enables JMX if and only if an existing MBeanServer
-       is found, use this if you want to configure JMX through JVM
-       parameters. Remove this to disable exposing Solr configuration
-       and statistics to JMX.
-
-       For more details see http://wiki.apache.org/solr/SolrJmx
-    -->
-  <jmx />
-  <!-- If you want to connect to a particular server, specify the
-       agentId
-    -->
-  <!-- <jmx agentId="myAgent" /> -->
-  <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
-  <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
-    -->
-
-  <!-- The default high-performance update handler -->
-  <updateHandler class="solr.DirectUpdateHandler2">
-
-    <!-- Enables a transaction log, used for real-time get, durability, and
-         and solr cloud replica recovery.  The log can grow as big as
-         uncommitted changes to the index, so use of a hard autoCommit
-         is recommended (see below).
-         "dir" - the target directory for transaction logs, defaults to the
-                solr data directory.
-         "numVersionBuckets" - sets the number of buckets used to keep
-                track of max version values when checking for re-ordered
-                updates; increase this value to reduce the cost of
-                synchronizing access to version buckets during high-volume
-                indexing, this requires 8 bytes (long) * numVersionBuckets
-                of heap space per Solr core.
-    -->
-    <updateLog>
-      <str name="dir">${solr.ulog.dir:}</str>
-      <int name="numVersionBuckets">${solr.ulog.numVersionBuckets:65536}</int>
-    </updateLog>
-
-    <!-- AutoCommit
-
-         Perform a hard commit automatically under certain conditions.
-         Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents.
-
-         http://wiki.apache.org/solr/UpdateXmlMessages
-
-         maxDocs - Maximum number of documents to add since the last
-                   commit before automatically triggering a new commit.
-
-         maxTime - Maximum amount of time in ms that is allowed to pass
-                   since a document was added before automatically
-                   triggering a new commit.
-         openSearcher - if false, the commit causes recent index changes
-           to be flushed to stable storage, but does not cause a new
-           searcher to be opened to make those changes visible.
-
-         If the updateLog is enabled, then it's highly recommended to
-         have some sort of hard autoCommit to limit the log size.
-      -->
-    <autoCommit>
-      <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
-      <openSearcher>false</openSearcher>
-    </autoCommit>
-
-    <!-- softAutoCommit is like autoCommit except it causes a
-         'soft' commit which only ensures that changes are visible
-         but does not ensure that data is synced to disk.  This is
-         faster and more near-realtime friendly than a hard commit.
-      -->
-
-    <autoSoftCommit>
-      <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
-    </autoSoftCommit>
-
-    <!-- Update Related Event Listeners
-
-         Various IndexWriter related events can trigger Listeners to
-         take actions.
-
-         postCommit - fired after every commit or optimize command
-         postOptimize - fired after every optimize command
-      -->
-
-  </updateHandler>
-
-  <!-- IndexReaderFactory
-
-       Use the following format to specify a custom IndexReaderFactory,
-       which allows for alternate IndexReader implementations.
-
-       ** Experimental Feature **
-
-       Please note - Using a custom IndexReaderFactory may prevent
-       certain other features from working. The API to
-       IndexReaderFactory may change without warning or may even be
-       removed from future releases if the problems cannot be
-       resolved.
-
-
-       ** Features that may not work with custom IndexReaderFactory **
-
-       The ReplicationHandler assumes a disk-resident index. Using a
-       custom IndexReader implementation may cause incompatibility
-       with ReplicationHandler and may cause replication to not work
-       correctly. See SOLR-1366 for details.
-
-    -->
-  <!--
-  <indexReaderFactory name="IndexReaderFactory" class="package.class">
-    <str name="someArg">Some Value</str>
-  </indexReaderFactory >
-  -->
-
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       Query section - these settings control query time things like caches
-       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <query>
-
-    <!-- Maximum number of clauses in each BooleanQuery,  an exception
-         is thrown if exceeded.  It is safe to increase or remove this setting,
-         since it is purely an arbitrary limit to try and catch user errors where
-         large boolean queries may not be the best implementation choice.
-      -->
-    <maxBooleanClauses>1024</maxBooleanClauses>
-
-    <!-- Solr Internal Query Caches
-
-         There are two implementations of cache available for Solr,
-         LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.
-
-         FastLRUCache has faster gets and slower puts in single
-         threaded operation and thus is generally faster than LRUCache
-         when the hit ratio of the cache is high (> 75%), and may be
-         faster under other scenarios on multi-cpu systems.
-    -->
-
-    <!-- Filter Cache
-
-         Cache used by SolrIndexSearcher for filters (DocSets),
-         unordered sets of *all* documents that match a query.  When a
-         new searcher is opened, its caches may be prepopulated or
-         "autowarmed" using data from caches in the old searcher.
-         autowarmCount is the number of items to prepopulate.  For
-         LRUCache, the autowarmed items will be the most recently
-         accessed items.
-
-         Parameters:
-           class - the SolrCache implementation LRUCache or
-               (LRUCache or FastLRUCache)
-           size - the maximum number of entries in the cache
-           initialSize - the initial capacity (number of entries) of
-               the cache.  (see java.util.HashMap)
-           autowarmCount - the number of entries to prepopulate from
-               and old cache.
-           maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
-                      to occupy. Note that when this option is specified, the size
-                      and initialSize parameters are ignored.
-      -->
-    <filterCache class="solr.FastLRUCache"
-                 size="512"
-                 initialSize="512"
-                 autowarmCount="0"/>
-
-    <!-- Query Result Cache
-
-         Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.
-         Additional supported parameter by LRUCache:
-            maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
-                       to occupy
-      -->
-    <queryResultCache class="solr.LRUCache"
-                      size="512"
-                      initialSize="512"
-                      autowarmCount="0"/>
-
-    <!-- Document Cache
-
-         Caches Lucene Document objects (the stored fields for each
-         document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.
-      -->
-    <documentCache class="solr.LRUCache"
-                   size="512"
-                   initialSize="512"
-                   autowarmCount="0"/>
-
-    <!-- custom cache currently used by block join -->
-    <cache name="perSegFilter"
-           class="solr.search.LRUCache"
-           size="10"
-           initialSize="0"
-           autowarmCount="10"
-           regenerator="solr.NoOpRegenerator" />
-
-    <!-- Field Value Cache
-
-         Cache used to hold field values that are quickly accessible
-         by document id.  The fieldValueCache is created by default
-         even if not configured here.
-      -->
-    <!--
-       <fieldValueCache class="solr.FastLRUCache"
-                        size="512"
-                        autowarmCount="128"
-                        showItems="32" />
-      -->
-
-    <!-- Custom Cache
-
-         Example of a generic cache.  These caches may be accessed by
-         name through SolrIndexSearcher.getCache(),cacheLookup(), and
-         cacheInsert().  The purpose is to enable easy caching of
-         user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator
-         if autowarming is desired.
-      -->
-    <!--
-       <cache name="myUserCache"
-              class="solr.LRUCache"
-              size="4096"
-              initialSize="1024"
-              autowarmCount="1024"
-              regenerator="com.mycompany.MyRegenerator"
-              />
-      -->
-
-
-    <!-- Lazy Field Loading
-
-         If true, stored fields that are not requested will be loaded
-         lazily.  This can result in a significant speed improvement
-         if the usual case is to not load all stored fields,
-         especially if the skipped fields are large compressed text
-         fields.
-    -->
-    <enableLazyFieldLoading>true</enableLazyFieldLoading>
-
-    <!-- Use Filter For Sorted Query
-
-         A possible optimization that attempts to use a filter to
-         satisfy a search.  If the requested sort does not include
-         score, then the filterCache will be checked for a filter
-         matching the query. If found, the filter will be used as the
-         source of document ids, and then the sort will be applied to
-         that.
-
-         For most situations, this will not be useful unless you
-         frequently get the same search repeatedly with different sort
-         options, and none of them ever use "score"
-      -->
-    <!--
-       <useFilterForSortedQuery>true</useFilterForSortedQuery>
-      -->
-
-    <!-- Result Window Size
-
-         An optimization for use with the queryResultCache.  When a search
-         is requested, a superset of the requested number of document ids
-         are collected.  For example, if a search for a particular query
-         requests matching documents 10 through 19, and queryWindowSize is 50,
-         then documents 0 through 49 will be collected and cached.  Any further
-         requests in that range can be satisfied via the cache.
-      -->
-    <queryResultWindowSize>20</queryResultWindowSize>
-
-    <!-- Maximum number of documents to cache for any entry in the
-         queryResultCache.
-      -->
-    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
-
-    <!-- Query Related Event Listeners
-
-         Various IndexSearcher related events can trigger Listeners to
-         take actions.
-
-         newSearcher - fired whenever a new searcher is being prepared
-         and there is a current searcher handling requests (aka
-         registered).  It can be used to prime certain caches to
-         prevent long request times for certain requests.
-
-         firstSearcher - fired whenever a new searcher is being
-         prepared but there is no current registered searcher to handle
-         requests or to gain autowarming data from.
-
-
-      -->
-    <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence.
-      -->
-    <listener event="newSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <!--
-           <lst><str name="q">solr</str><str name="sort">price asc</str></lst>
-           <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst>
-          -->
-      </arr>
-    </listener>
-    <listener event="firstSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <!--
-        <lst>
-          <str name="q">static firstSearcher warming in solrconfig.xml</str>
-        </lst>
-        -->
-      </arr>
-    </listener>
-
-    <!-- Use Cold Searcher
-
-         If a search request comes in and there is no current
-         registered searcher, then immediately register the still
-         warming searcher and use it.  If "false" then all requests
-         will block until the first searcher is done warming.
-      -->
-    <useColdSearcher>false</useColdSearcher>
-
-  </query>
-
-
-  <!-- Request Dispatcher
-
-       This section contains instructions for how the SolrDispatchFilter
-       should behave when processing requests for this SolrCore.
-
-    -->
-  <requestDispatcher>
-    <!-- Request Parsing
-
-         These settings indicate how Solr Requests may be parsed, and
-         what restrictions may be placed on the ContentStreams from
-         those requests
-
-         enableRemoteStreaming - enables use of the stream.file
-         and stream.url parameters for specifying remote streams.
-
-         multipartUploadLimitInKB - specifies the max size (in KiB) of
-         Multipart File Uploads that Solr will allow in a Request.
-
-         formdataUploadLimitInKB - specifies the max size (in KiB) of
-         form data (application/x-www-form-urlencoded) sent via
-         POST. You can use POST to pass request parameters not
-         fitting into the URL.
-
-         addHttpRequestToContext - if set to true, it will instruct
-         the requestParsers to include the original HttpServletRequest
-         object in the context map of the SolrQueryRequest under the
-         key "httpRequest". It will not be used by any of the existing
-         Solr components, but may be useful when developing custom
-         plugins.
-
-         *** WARNING ***
-         Before enabling remote streaming, you should make sure your
-         system has authentication enabled.
-
-    <requestParsers enableRemoteStreaming="false"
-                    multipartUploadLimitInKB="-1"
-                    formdataUploadLimitInKB="-1"
-                    addHttpRequestToContext="false"/>
-      -->
-
-    <!-- HTTP Caching
-
-         Set HTTP caching related parameters (for proxy caches and clients).
-
-         The options below instruct Solr not to output any HTTP Caching
-         related headers
-      -->
-    <httpCaching never304="true" />
-    <!-- If you include a <cacheControl> directive, it will be used to
-         generate a Cache-Control header (as well as an Expires header
-         if the value contains "max-age=")
-
-         By default, no Cache-Control header is generated.
-
-         You can use the <cacheControl> option even if you have set
-         never304="true"
-      -->
-    <!--
-       <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl>
-       </httpCaching>
-      -->
-    <!-- To enable Solr to respond with automatically generated HTTP
-         Caching headers, and to response to Cache Validation requests
-         correctly, set the value of never304="false"
-
-         This will cause Solr to generate Last-Modified and ETag
-         headers based on the properties of the Index.
-
-         The following options can also be specified to affect the
-         values of these headers...
-
-         lastModFrom - the default value is "openTime" which means the
-         Last-Modified value (and validation against If-Modified-Since
-         requests) will all be relative to when the current Searcher
-         was opened.  You can change it to lastModFrom="dirLastMod" if
-         you want the value to exactly correspond to when the physical
-         index was last modified.
-
-         etagSeed="..." is an option you can change to force the ETag
-         header (and validation against If-None-Match requests) to be
-         different even if the index has not changed (ie: when making
-         significant changes to your config file)
-
-         (lastModifiedFrom and etagSeed are both ignored if you use
-         the never304="true" option)
-      -->
-    <!--
-       <httpCaching lastModifiedFrom="openTime"
-                    etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl>
-       </httpCaching>
-      -->
-  </requestDispatcher>
-
-  <!-- Request Handlers
-
-       http://wiki.apache.org/solr/SolrRequestHandler
-
-       Incoming queries will be dispatched to a specific handler by name
-       based on the path specified in the request.
-
-       If a Request Handler is declared with startup="lazy", then it will
-       not be initialized until the first request that uses it.
-
-    -->
-  <!-- SearchHandler
-
-       http://wiki.apache.org/solr/SearchHandler
-
-       For processing Search Queries, the primary Request Handler
-       provided with Solr is "SearchHandler" It delegates to a sequent
-       of SearchComponents (see below) and supports distributed
-       queries across multiple shards
-    -->
-   <requestHandler name="/select" class="solr.SearchHandler">
-    <!-- default values for query parameters can be specified, these
-         will be overridden by parameters in the request
-      -->
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <int name="rows">10</int>
-      <str name="defType">edismax</str>
-      <float name="tie">0.075</float>
-        <str name="qf">
-            dvName^400
-            authorName^180
-            dvSubject^190
-            dvDescription^180
-            dvAffiliation^170
-            title^130
-            subject^120
-            keyword^110
-            topicClassValue^100
-            dsDescriptionValue^90
-            authorAffiliation^80
-            publicationCitation^60
-            producerName^50
-            fileName^30
-            fileDescription^30
-            variableLabel^20
-            variableName^10
-            _text_^1.0
-        </str>
-        <str name="pf">
-            dvName^200
-            authorName^100
-            dvSubject^100
-            dvDescription^100
-            dvAffiliation^100
-            title^75
-            subject^75
-            keyword^75
-            topicClassValue^75
-            dsDescriptionValue^75
-            authorAffiliation^75
-            publicationCitation^75
-            producerName^75
-        </str>
-        <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
-        <str name="bq">
-            isHarvested:false^25000
-        </str>
-
-      <!-- Default search field
-         <str name="df">text</str> 
-        -->
-      <!-- Change from JSON to XML format (the default prior to Solr 7.0)
-         <str name="wt">xml</str> 
-        -->
-    </lst>
-    <!-- In addition to defaults, "appends" params can be specified
-         to identify values which should be appended to the list of
-         multi-val params from the query (or the existing "defaults").
-      -->
-    <!-- In this example, the param "fq=instock:true" would be appended to
-         any query time fq params the user may specify, as a mechanism for
-         partitioning the index, independent of any user selected filtering
-         that may also be desired (perhaps as a result of faceted searching).
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "appends" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="appends">
-         <str name="fq">inStock:true</str>
-       </lst>
-      -->
-    <!-- "invariants" are a way of letting the Solr maintainer lock down
-         the options available to Solr clients.  Any params values
-         specified here are used regardless of what values may be specified
-         in either the query, the "defaults", or the "appends" params.
-
-         In this example, the facet.field and facet.query params would
-         be fixed, limiting the facets clients can use.  Faceting is
-         not turned on by default - but if the client does specify
-         facet=true in the request, these are the only facets they
-         will be able to see counts for; regardless of what other
-         facet.field or facet.query params they may specify.
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "invariants" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="invariants">
-         <str name="facet.field">cat</str>
-         <str name="facet.field">manu_exact</str>
-         <str name="facet.query">price:[* TO 500]</str>
-         <str name="facet.query">price:[500 TO *]</str>
-       </lst>
-      -->
-    <!-- If the default list of SearchComponents is not desired, that
-         list can either be overridden completely, or components can be
-         prepended or appended to the default list.  (see below)
-      -->
-    <!--
-       <arr name="components">
-         <str>nameOfCustomComponent1</str>
-         <str>nameOfCustomComponent2</str>
-       </arr>
-      -->
-  </requestHandler>
-
-  <!-- A request handler that returns indented JSON by default -->
-  <requestHandler name="/query" class="solr.SearchHandler">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <str name="wt">json</str>
-      <str name="indent">true</str>
-    </lst>
-  </requestHandler>
-
-
-  <!-- A Robust Example
-
-       This example SearchHandler declaration shows off usage of the
-       SearchHandler with many defaults declared
-
-       Note that multiple instances of the same Request Handler
-       (SearchHandler) can be registered multiple times with different
-       names (and different init parameters)
-    -->
-  <requestHandler name="/browse" class="solr.SearchHandler" useParams="query,facets,velocity,browse">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-  </requestHandler>
-
-  <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
-    <lst name="defaults">
-      <str name="df">_text_</str>
-    </lst>
-  </initParams>
-
-  <!-- Solr Cell Update Request Handler
-
-       http://wiki.apache.org/solr/ExtractingRequestHandler
-
-    -->
-  <requestHandler name="/update/extract"
-                  startup="lazy"
-                  class="solr.extraction.ExtractingRequestHandler" >
-    <lst name="defaults">
-      <str name="lowernames">true</str>
-      <str name="fmap.meta">ignored_</str>
-      <str name="fmap.content">_text_</str>
-    </lst>
-  </requestHandler>
-
-  <!-- Search Components
-
-       Search components are registered to SolrCore and used by
-       instances of SearchHandler (which can access them by name)
-
-       By default, the following components are available:
-
-       <searchComponent name="query"     class="solr.QueryComponent" />
-       <searchComponent name="facet"     class="solr.FacetComponent" />
-       <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
-       <searchComponent name="highlight" class="solr.HighlightComponent" />
-       <searchComponent name="stats"     class="solr.StatsComponent" />
-       <searchComponent name="debug"     class="solr.DebugComponent" />
-
-       Default configuration in a requestHandler would look like:
-
-       <arr name="components">
-         <str>query</str>
-         <str>facet</str>
-         <str>mlt</str>
-         <str>highlight</str>
-         <str>stats</str>
-         <str>debug</str>
-       </arr>
-
-       If you register a searchComponent to one of the standard names,
-       that will be used instead of the default.
-
-       To insert components before or after the 'standard' components, use:
-
-       <arr name="first-components">
-         <str>myFirstComponentName</str>
-       </arr>
-
-       <arr name="last-components">
-         <str>myLastComponentName</str>
-       </arr>
-
-       NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components"
-
-     -->
-
-  <!-- Spell Check
-
-       The spell check component can return a list of alternative spelling
-       suggestions.
-
-       http://wiki.apache.org/solr/SpellCheckComponent
-    -->
-  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
-    <str name="queryAnalyzerFieldType">text_general</str>
-
-    <!-- Multiple "Spell Checkers" can be declared and used by this
-         component
-      -->
-
-    <!-- a spellchecker built from a field of the main index -->
-    <lst name="spellchecker">
-      <str name="name">default</str>
-      <str name="field">_text_</str>
-      <str name="classname">solr.DirectSolrSpellChecker</str>
-      <!-- the spellcheck distance measure used, the default is the internal levenshtein -->
-      <str name="distanceMeasure">internal</str>
-      <!-- minimum accuracy needed to be considered a valid spellcheck suggestion -->
-      <float name="accuracy">0.5</float>
-      <!-- the maximum #edits we consider when enumerating terms: can be 1 or 2 -->
-      <int name="maxEdits">2</int>
-      <!-- the minimum shared prefix when enumerating terms -->
-      <int name="minPrefix">1</int>
-      <!-- maximum number of inspections per result. -->
-      <int name="maxInspections">5</int>
-      <!-- minimum length of a query term to be considered for correction -->
-      <int name="minQueryLength">4</int>
-      <!-- maximum threshold of documents a query term can appear to be considered for correction -->
-      <float name="maxQueryFrequency">0.01</float>
-      <!-- uncomment this to require suggestions to occur in 1% of the documents
-        <float name="thresholdTokenFrequency">.01</float>
-      -->
-    </lst>
-
-    <!-- a spellchecker that can break or combine words.  See "/spell" handler below for usage -->
-    <!--
-    <lst name="spellchecker">
-      <str name="name">wordbreak</str>
-      <str name="classname">solr.WordBreakSolrSpellChecker</str>
-      <str name="field">name</str>
-      <str name="combineWords">true</str>
-      <str name="breakWords">true</str>
-      <int name="maxChanges">10</int>
-    </lst>
-    -->
-  </searchComponent>
-
-  <!-- A request handler for demonstrating the spellcheck component.
-
-       NOTE: This is purely as an example.  The whole purpose of the
-       SpellCheckComponent is to hook it into the request handler that
-       handles your normal user queries so that a separate request is
-       not needed to get suggestions.
-
-       IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
-       NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-
-       See http://wiki.apache.org/solr/SpellCheckComponent for details
-       on the request parameters.
-    -->
-  <requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <!-- Solr will use suggestions from both the 'default' spellchecker
-           and from the 'wordbreak' spellchecker and combine them.
-           collations (re-written queries) can include a combination of
-           corrections from both spellcheckers -->
-      <str name="spellcheck.dictionary">default</str>
-      <str name="spellcheck">on</str>
-      <str name="spellcheck.extendedResults">true</str>
-      <str name="spellcheck.count">10</str>
-      <str name="spellcheck.alternativeTermCount">5</str>
-      <str name="spellcheck.maxResultsForSuggest">5</str>
-      <str name="spellcheck.collate">true</str>
-      <str name="spellcheck.collateExtendedResults">true</str>
-      <str name="spellcheck.maxCollationTries">10</str>
-      <str name="spellcheck.maxCollations">5</str>
-    </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Term Vector Component
-
-       http://wiki.apache.org/solr/TermVectorComponent
-    -->
-  <searchComponent name="tvComponent" class="solr.TermVectorComponent"/>
-
-  <!-- A request handler for demonstrating the term vector component
-
-       This is purely as an example.
-
-       In reality you will likely want to add the component to your
-       already specified request handlers.
-    -->
-  <requestHandler name="/tvrh" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <bool name="tv">true</bool>
-    </lst>
-    <arr name="last-components">
-      <str>tvComponent</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Clustering Component. (Omitted here. See the default Solr example for a typical configuration.) -->
-
-  <!-- Terms Component
-
-       http://wiki.apache.org/solr/TermsComponent
-
-       A component to return terms and document frequency of those
-       terms
-    -->
-  <searchComponent name="terms" class="solr.TermsComponent"/>
-
-  <!-- A request handler for demonstrating the terms component -->
-  <requestHandler name="/terms" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <bool name="terms">true</bool>
-      <bool name="distrib">false</bool>
-    </lst>
-    <arr name="components">
-      <str>terms</str>
-    </arr>
-  </requestHandler>
-
-    
-
-  <!-- Query Elevation Component
-
-       http://wiki.apache.org/solr/QueryElevationComponent
-
-       a search component that enables you to configure the top
-       results for a given query regardless of the normal lucene
-       scoring.
-    -->
-  <searchComponent name="elevator" class="solr.QueryElevationComponent" >
-    <!-- pick a fieldType to analyze queries -->
-    <str name="queryFieldType">string</str>
-  </searchComponent>
-
-  <!-- A request handler for demonstrating the elevator component -->
-  <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-    <arr name="last-components">
-      <str>elevator</str>
-    </arr>
-  </requestHandler>
-
-<!-- requestHandler for replication -->
-  <requestHandler name="/replication" class="solr.ReplicationHandler" >
-    <lst name="master">
-      <!--Replicate on 'startup' and 'commit'. 'optimize' is also a valid value for replicateAfter. -->
-          <str name="replicateAfter">startup</str>
-          <str name="replicateAfter">commit</str>
-            <!--Create a backup after 'optimize'. Other values can be 'commit', 'startup'. It is possible to have multiple entries of this config string.  Note that this is just for backup, replication does not require this. -->
-            <!-- <str name="backupAfter">optimize</str> -->
-
-            <!--If configuration files need to be replicated give the names here, separated by comma -->
-          <str name="confFiles">schema.xml,stopwords.txt,elevate.xml</str>
-          <str name="confFiles">solrconfig_slave.xml:solrconfig.xml,x.xml,y.xml</str>
-
-    </lst>
-        <!-- keep only 1 backup.  Using this parameter precludes using the "numberToKeep" request parameter. (Solr3.6 / Solr4.0)-->
-        <!-- (For this to work in conjunction with "backupAfter" with Solr 3.6.0, see bug fix https://issues.apache.org/jira/browse/SOLR-3361 )-->
-      <str name="maxNumberOfBackups">1</str> 
-  </requestHandler>
-
-
-  <!-- Highlighting Component
-
-       http://wiki.apache.org/solr/HighlightingParameters
-    -->
-  <searchComponent class="solr.HighlightComponent" name="highlight">
-    <highlighting>
-      <!-- Configure the standard fragmenter -->
-      <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap"
-                  default="true"
-                  class="solr.highlight.GapFragmenter">
-        <lst name="defaults">
-          <int name="hl.fragsize">100</int>
-        </lst>
-      </fragmenter>
-
-      <!-- A regular-expression-based fragmenter
-           (for sentence extraction)
-        -->
-      <fragmenter name="regex"
-                  class="solr.highlight.RegexFragmenter">
-        <lst name="defaults">
-          <!-- slightly smaller fragsizes work better because of slop -->
-          <int name="hl.fragsize">70</int>
-          <!-- allow 50% slop on fragment sizes -->
-          <float name="hl.regex.slop">0.5</float>
-          <!-- a basic sentence pattern -->
-          <str name="hl.regex.pattern">[-\w ,/\n\&quot;&apos;]{20,200}</str>
-        </lst>
-      </fragmenter>
-
-      <!-- Configure the standard formatter -->
-      <formatter name="html"
-                 default="true"
-                 class="solr.highlight.HtmlFormatter">
-        <lst name="defaults">
-          <str name="hl.simple.pre"><![CDATA[<em>]]></str>
-          <str name="hl.simple.post"><![CDATA[</em>]]></str>
-        </lst>
-      </formatter>
-
-      <!-- Configure the standard encoder -->
-      <encoder name="html"
-               class="solr.highlight.HtmlEncoder" />
-
-      <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple"
-                       class="solr.highlight.SimpleFragListBuilder"/>
-
-      <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single"
-                       class="solr.highlight.SingleFragListBuilder"/>
-
-      <!-- Configure the weighted fragListBuilder -->
-      <fragListBuilder name="weighted"
-                       default="true"
-                       class="solr.highlight.WeightedFragListBuilder"/>
-
-      <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default"
-                        default="true"
-                        class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!--
-        <lst name="defaults">
-          <str name="hl.multiValuedSeparatorChar">/</str>
-        </lst>
-        -->
-      </fragmentsBuilder>
-
-      <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored"
-                        class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <lst name="defaults">
-          <str name="hl.tag.pre"><![CDATA[
-               <b style="background:yellow">,<b style="background:lawgreen">,
-               <b style="background:aquamarine">,<b style="background:magenta">,
-               <b style="background:palegreen">,<b style="background:coral">,
-               <b style="background:wheat">,<b style="background:khaki">,
-               <b style="background:lime">,<b style="background:deepskyblue">]]></str>
-          <str name="hl.tag.post"><![CDATA[</b>]]></str>
-        </lst>
-      </fragmentsBuilder>
-
-      <boundaryScanner name="default"
-                       default="true"
-                       class="solr.highlight.SimpleBoundaryScanner">
-        <lst name="defaults">
-          <str name="hl.bs.maxScan">10</str>
-          <str name="hl.bs.chars">.,!? &#9;&#10;&#13;</str>
-        </lst>
-      </boundaryScanner>
-
-      <boundaryScanner name="breakIterator"
-                       class="solr.highlight.BreakIteratorBoundaryScanner">
-        <lst name="defaults">
-          <!-- type should be one of CHARACTER, WORD(default), LINE and SENTENCE -->
-          <str name="hl.bs.type">WORD</str>
-          <!-- language and country are used when constructing Locale object.  -->
-          <!-- And the Locale object will be used when getting instance of BreakIterator -->
-          <str name="hl.bs.language">en</str>
-          <str name="hl.bs.country">US</str>
-        </lst>
-      </boundaryScanner>
-    </highlighting>
-  </searchComponent>
-
-  <!-- Update Processors
-
-       Chains of Update Processor Factories for dealing with Update
-       Requests can be declared, and then used by name in Update
-       Request Processors
-
-       http://wiki.apache.org/solr/UpdateRequestProcessor
-
-    -->
-
-  <!-- Add unknown fields to the schema
-
-       Field type guessing update processors that will
-       attempt to parse string-typed field values as Booleans, Longs,
-       Doubles, or Dates, and then add schema fields with the guessed
-       field types. Text content will be indexed as "text_general" as
-       well as a copy to a plain string version in *_str.
-
-       These require that the schema is both managed and mutable, by
-       declaring schemaFactory as ManagedIndexSchemaFactory, with
-       mutable specified as true.
-
-       See http://wiki.apache.org/solr/GuessingFieldTypes
-    -->
-<schemaFactory class="ClassicIndexSchemaFactory"/>
-
-  <updateProcessor class="solr.UUIDUpdateProcessorFactory" name="uuid"/>
-  <updateProcessor class="solr.RemoveBlankFieldUpdateProcessorFactory" name="remove-blank"/>
-  <updateProcessor class="solr.FieldNameMutatingUpdateProcessorFactory" name="field-name-mutating">
-    <str name="pattern">[^\w-\.]</str>
-    <str name="replacement">_</str>
-  </updateProcessor>
-  <updateProcessor class="solr.ParseBooleanFieldUpdateProcessorFactory" name="parse-boolean"/>
-  <updateProcessor class="solr.ParseLongFieldUpdateProcessorFactory" name="parse-long"/>
-  <updateProcessor class="solr.ParseDoubleFieldUpdateProcessorFactory" name="parse-double"/>
-  <updateProcessor class="solr.ParseDateFieldUpdateProcessorFactory" name="parse-date">
-    <arr name="format">
-      <str>yyyy-MM-dd'T'HH:mm:ss.SSSZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss,SSSZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss.SSS</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss,SSS</str>
-      <str>yyyy-MM-dd'T'HH:mm:ssZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss</str>
-      <str>yyyy-MM-dd'T'HH:mmZ</str>
-      <str>yyyy-MM-dd'T'HH:mm</str>
-      <str>yyyy-MM-dd HH:mm:ss.SSSZ</str>
-      <str>yyyy-MM-dd HH:mm:ss,SSSZ</str>
-      <str>yyyy-MM-dd HH:mm:ss.SSS</str>
-      <str>yyyy-MM-dd HH:mm:ss,SSS</str>
-      <str>yyyy-MM-dd HH:mm:ssZ</str>
-      <str>yyyy-MM-dd HH:mm:ss</str>
-      <str>yyyy-MM-dd HH:mmZ</str>
-      <str>yyyy-MM-dd HH:mm</str>
-      <str>yyyy-MM-dd</str>
-    </arr>
-  </updateProcessor>
-
-  <!--Dataverse removed-->
-<!--  <updateProcessor class="solr.AddSchemaFieldsUpdateProcessorFactory" name="add-schema-fields">
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.String</str>
-      <str name="fieldType">text_general</str>
-      <lst name="copyField">
-        <str name="dest">*_str</str>
-        <int name="maxChars">256</int>
-      </lst>
-
-      <bool name="default">true</bool>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Boolean</str>
-      <str name="fieldType">booleans</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.util.Date</str>
-      <str name="fieldType">pdates</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Long</str>
-      <str name="valueClass">java.lang.Integer</str>
-      <str name="fieldType">plongs</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Number</str>
-      <str name="fieldType">pdoubles</str>
-    </lst>
-    </updateProcessor> -->
-
-  <!-- The update.autoCreateFields property can be turned to false to disable schemaless mode -->
-  <updateRequestProcessorChain name="add-unknown-fields-to-the-schema" default="${update.autoCreateFields:false}"
-           processor="uuid,remove-blank,field-name-mutating,parse-boolean,parse-long,parse-double,parse-date">
-    <processor class="solr.LogUpdateProcessorFactory"/>
-    <processor class="solr.DistributedUpdateProcessorFactory"/>
-    <processor class="solr.RunUpdateProcessorFactory"/>
-  </updateRequestProcessorChain>
-
-  <!-- Deduplication
-
-       An example dedup update processor that creates the "id" field
-       on the fly based on the hash code of some other fields.  This
-       example has overwriteDupes set to false since we are using the
-       id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.
-
-    -->
-  <!--
-     <updateRequestProcessorChain name="dedupe">
-       <processor class="solr.processor.SignatureUpdateProcessorFactory">
-         <bool name="enabled">true</bool>
-         <str name="signatureField">id</str>
-         <bool name="overwriteDupes">false</bool>
-         <str name="fields">name,features,cat</str>
-         <str name="signatureClass">solr.processor.Lookup3Signature</str>
-       </processor>
-       <processor class="solr.LogUpdateProcessorFactory" />
-       <processor class="solr.RunUpdateProcessorFactory" />
-     </updateRequestProcessorChain>
-    -->
-
-  <!-- Language identification
-
-       This example update chain identifies the language of the incoming
-       documents using the langid contrib. The detected language is
-       written to field language_s. No field name mapping is done.
-       The fields used for detection are text, title, subject and description,
-       making this example suitable for detecting languages form full-text
-       rich documents injected via ExtractingRequestHandler.
-       See more about langId at http://wiki.apache.org/solr/LanguageDetection
-    -->
-  <!--
-   <updateRequestProcessorChain name="langid">
-     <processor class="org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory">
-       <str name="langid.fl">text,title,subject,description</str>
-       <str name="langid.langField">language_s</str>
-       <str name="langid.fallback">en</str>
-     </processor>
-     <processor class="solr.LogUpdateProcessorFactory" />
-     <processor class="solr.RunUpdateProcessorFactory" />
-   </updateRequestProcessorChain>
-  -->
-
-  <!-- Script update processor
-
-    This example hooks in an update processor implemented using JavaScript.
-
-    See more about the script update processor at http://wiki.apache.org/solr/ScriptUpdateProcessor
-  -->
-  <!--
-    <updateRequestProcessorChain name="script">
-      <processor class="solr.StatelessScriptUpdateProcessorFactory">
-        <str name="script">update-script.js</str>
-        <lst name="params">
-          <str name="config_param">example config parameter</str>
-        </lst>
-      </processor>
-      <processor class="solr.RunUpdateProcessorFactory" />
-    </updateRequestProcessorChain>
-  -->
-
-  <!-- Response Writers
-
-       http://wiki.apache.org/solr/QueryResponseWriter
-
-       Request responses will be written using the writer specified by
-       the 'wt' request parameter matching the name of a registered
-       writer.
-
-       The "default" writer is the default and will be used if 'wt' is
-       not specified in the request.
-    -->
-  <!-- The following response writers are implicitly configured unless
-       overridden...
-    -->
-  <!--
-     <queryResponseWriter name="xml"
-                          default="true"
-                          class="solr.XMLResponseWriter" />
-     <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
-     <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
-     <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
-     <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
-     <queryResponseWriter name="phps" class="solr.PHPSerializedResponseWriter"/>
-     <queryResponseWriter name="csv" class="solr.CSVResponseWriter"/>
-     <queryResponseWriter name="schema.xml" class="solr.SchemaXmlResponseWriter"/>
-    -->
-
-  <queryResponseWriter name="json" class="solr.JSONResponseWriter">
-    <!-- For the purposes of the tutorial, JSON responses are written as
-     plain text so that they are easy to read in *any* browser.
-     If you expect a MIME type of "application/json" just remove this override.
-    -->
-    <str name="content-type">text/plain; charset=UTF-8</str>
-  </queryResponseWriter>
-
-  <!--
-     Custom response writers can be declared as needed...
-    -->
-  <queryResponseWriter name="velocity" class="solr.VelocityResponseWriter" startup="lazy">
-    <str name="template.base.dir">${velocity.template.base.dir:}</str>
-    <str name="solr.resource.loader.enabled">${velocity.solr.resource.loader.enabled:true}</str>
-    <str name="params.resource.loader.enabled">${velocity.params.resource.loader.enabled:false}</str>
-  </queryResponseWriter>
-
-  <!-- XSLT response writer transforms the XML output by any xslt file found
-       in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.
-    -->
-  <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
-    <int name="xsltCacheLifetimeSeconds">5</int>
-  </queryResponseWriter>
-
-  <!-- Query Parsers
-
-       https://lucene.apache.org/solr/guide/query-syntax-and-parsing.html
-
-       Multiple QParserPlugins can be registered by name, and then
-       used in either the "defType" param for the QueryComponent (used
-       by SearchHandler) or in LocalParams
-    -->
-  <!-- example of registering a query parser -->
-  <!--
-     <queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-    -->
-
-  <!-- Function Parsers
-
-       http://wiki.apache.org/solr/FunctionQuery
-
-       Multiple ValueSourceParsers can be registered by name, and then
-       used as function names when using the "func" QParser.
-    -->
-  <!-- example of registering a custom function parser  -->
-  <!--
-     <valueSourceParser name="myfunc"
-                        class="com.mycompany.MyValueSourceParser" />
-    -->
-
-
-  <!-- Document Transformers
-       http://wiki.apache.org/solr/DocTransformers
-    -->
-  <!--
-     Could be something like:
-     <transformer name="db" class="com.mycompany.LoadFromDatabaseTransformer" >
-       <int name="connection">jdbc://....</int>
-     </transformer>
-
-     To add a constant value to all docs, use:
-     <transformer name="mytrans2" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
-       <int name="value">5</int>
-     </transformer>
-
-     If you want the user to still be able to change it with _value:something_ use this:
-     <transformer name="mytrans3" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
-       <double name="defaultValue">5</double>
-     </transformer>
-
-      If you are using the QueryElevationComponent, you may wish to mark documents that get boosted.  The
-      EditorialMarkerFactory will do exactly that:
-     <transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-    -->
-</config>
diff --git a/conf/docker/solr/solrconfig_slave.xml b/conf/docker/solr/solrconfig_slave.xml
deleted file mode 100644
index c31710ebace..00000000000
--- a/conf/docker/solr/solrconfig_slave.xml
+++ /dev/null
@@ -1,1442 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-     For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml.
--->
-<config>
-  <!-- In all configuration below, a prefix of "solr." for class names
-       is an alias that causes solr to search appropriate packages,
-       including org.apache.solr.(search|update|request|core|analysis)
-
-       You may also specify a fully qualified Java classname if you
-       have your own custom plugins.
-    -->
-
-  <!-- Controls what version of Lucene various components of Solr
-       adhere to.  Generally, you want to use the latest version to
-       get all bug fixes and improvements. It is highly recommended
-       that you fully re-index after changing this setting as it can
-       affect both how text is indexed and queried.
-  -->
-  <luceneMatchVersion>7.3.0</luceneMatchVersion>
-
-  <!-- <lib/> directives can be used to instruct Solr to load any Jars
-       identified and use them to resolve any "plugins" specified in
-       your solrconfig.xml or schema.xml (ie: Analyzers, Request
-       Handlers, etc...).
-
-       All directories and paths are resolved relative to the
-       instanceDir.
-
-       Please note that <lib/> directives are processed in the order
-       that they appear in your solrconfig.xml file, and are "stacked"
-       on top of each other when building a ClassLoader - so if you have
-       plugin jars with dependencies on other jars, the "lower level"
-       dependency jars should be loaded first.
-
-       If a "./lib" directory exists in your instanceDir, all files
-       found in it are included as if you had used the following
-       syntax...
-
-              <lib dir="./lib" />
-    -->
-
-  <!-- A 'dir' option by itself adds any files found in the directory
-       to the classpath, this is useful for including all jars in a
-       directory.
-
-       When a 'regex' is specified in addition to a 'dir', only the
-       files in that directory which completely match the regex
-       (anchored on both ends) will be included.
-
-       If a 'dir' option (with or without a regex) is used and nothing
-       is found that matches, a warning will be logged.
-
-       The examples below can be used to load some solr-contribs along
-       with their external dependencies.
-    -->
-  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
-  <!-- an exact 'path' can be used instead of a 'dir' to specify a
-       specific jar file.  This will cause a serious error to be logged
-       if it can't be loaded.
-    -->
-  <!--
-     <lib path="../a-jar-that-does-not-exist.jar" />
-  -->
-
-  <!-- Data Directory
-
-       Used to specify an alternate directory to hold all index data
-       other than the default ./data under the Solr home.  If
-       replication is in use, this should match the replication
-       configuration.
-    -->
-  <dataDir>${solr.data.dir:}</dataDir>
-
-
-  <!-- The DirectoryFactory to use for indexes.
-
-       solr.StandardDirectoryFactory is filesystem
-       based and tries to pick the best implementation for the current
-       JVM and platform.  solr.NRTCachingDirectoryFactory, the default,
-       wraps solr.StandardDirectoryFactory and caches small files in memory
-       for better NRT performance.
-
-       One can force a particular implementation via solr.MMapDirectoryFactory,
-       solr.NIOFSDirectoryFactory, or solr.SimpleFSDirectoryFactory.
-
-       solr.RAMDirectoryFactory is memory based and not persistent.
-    -->
-  <directoryFactory name="DirectoryFactory"
-                    class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
-
-  <!-- The CodecFactory for defining the format of the inverted index.
-       The default implementation is SchemaCodecFactory, which is the official Lucene
-       index format, but hooks into the schema to provide per-field customization of
-       the postings lists and per-document values in the fieldType element
-       (postingsFormat/docValuesFormat). Note that most of the alternative implementations
-       are experimental, so if you choose to customize the index format, it's a good
-       idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
-       before upgrading to a newer version to avoid unnecessary reindexing.
-       A "compressionMode" string element can be added to <codecFactory> to choose
-       between the existing compression modes in the default codec: "BEST_SPEED" (default)
-       or "BEST_COMPRESSION".
-  -->
-  <codecFactory class="solr.SchemaCodecFactory"/>
-
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       Index Config - These settings control low-level behavior of indexing
-       Most example settings here show the default value, but are commented
-       out, to more easily see where customizations have been made.
-
-       Note: This replaces <indexDefaults> and <mainIndex> from older versions
-       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <indexConfig>
-    <!-- maxFieldLength was removed in 4.0. To get similar behavior, include a
-         LimitTokenCountFilterFactory in your fieldType definition. E.g.
-     <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="10000"/>
-    -->
-    <!-- Maximum time to wait for a write lock (ms) for an IndexWriter. Default: 1000 -->
-    <!-- <writeLockTimeout>1000</writeLockTimeout>  -->
-
-    <!-- Expert: Enabling compound file will use less files for the index,
-         using fewer file descriptors on the expense of performance decrease.
-         Default in Lucene is "true". Default in Solr is "false" (since 3.6) -->
-    <!-- <useCompoundFile>false</useCompoundFile> -->
-
-    <!-- ramBufferSizeMB sets the amount of RAM that may be used by Lucene
-         indexing for buffering added documents and deletions before they are
-         flushed to the Directory.
-         maxBufferedDocs sets a limit on the number of documents buffered
-         before flushing.
-         If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.  -->
-    <!-- <ramBufferSizeMB>100</ramBufferSizeMB> -->
-    <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
-
-    <!-- Expert: Merge Policy
-         The Merge Policy in Lucene controls how merging of segments is done.
-         The default since Solr/Lucene 3.3 is TieredMergePolicy.
-         The default since Lucene 2.3 was the LogByteSizeMergePolicy,
-         Even older versions of Lucene used LogDocMergePolicy.
-      -->
-    <!--
-        <mergePolicyFactory class="org.apache.solr.index.TieredMergePolicyFactory">
-          <int name="maxMergeAtOnce">10</int>
-          <int name="segmentsPerTier">10</int>
-          <double name="noCFSRatio">0.1</double>
-        </mergePolicyFactory>
-      -->
-
-    <!-- Expert: Merge Scheduler
-         The Merge Scheduler in Lucene controls how merges are
-         performed.  The ConcurrentMergeScheduler (Lucene 2.3 default)
-         can perform merges in the background using separate threads.
-         The SerialMergeScheduler (Lucene 2.2 default) does not.
-     -->
-    <!--
-       <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
-       -->
-
-    <!-- LockFactory
-
-         This option specifies which Lucene LockFactory implementation
-         to use.
-
-         single = SingleInstanceLockFactory - suggested for a
-                  read-only index or when there is no possibility of
-                  another process trying to modify the index.
-         native = NativeFSLockFactory - uses OS native file locking.
-                  Do not use when multiple solr webapps in the same
-                  JVM are attempting to share a single index.
-         simple = SimpleFSLockFactory  - uses a plain file for locking
-
-         Defaults: 'native' is default for Solr3.6 and later, otherwise
-                   'simple' is the default
-
-         More details on the nuances of each LockFactory...
-         http://wiki.apache.org/lucene-java/AvailableLockFactories
-    -->
-    <lockType>${solr.lock.type:native}</lockType>
-
-    <!-- Commit Deletion Policy
-         Custom deletion policies can be specified here. The class must
-         implement org.apache.lucene.index.IndexDeletionPolicy.
-
-         The default Solr IndexDeletionPolicy implementation supports
-         deleting index commit points on number of commits, age of
-         commit point and optimized status.
-
-         The latest commit point should always be preserved regardless
-         of the criteria.
-    -->
-    <!--
-    <deletionPolicy class="solr.SolrDeletionPolicy">
-    -->
-    <!-- The number of commit points to be kept -->
-    <!-- <str name="maxCommitsToKeep">1</str> -->
-    <!-- The number of optimized commit points to be kept -->
-    <!-- <str name="maxOptimizedCommitsToKeep">0</str> -->
-    <!--
-        Delete all commit points once they have reached the given age.
-        Supports DateMathParser syntax e.g.
-      -->
-    <!--
-       <str name="maxCommitAge">30MINUTES</str>
-       <str name="maxCommitAge">1DAY</str>
-    -->
-    <!--
-    </deletionPolicy>
-    -->
-
-    <!-- Lucene Infostream
-
-         To aid in advanced debugging, Lucene provides an "InfoStream"
-         of detailed information when indexing.
-
-         Setting The value to true will instruct the underlying Lucene
-         IndexWriter to write its debugging info the specified file
-      -->
-    <!-- <infoStream file="INFOSTREAM.txt">false</infoStream> -->
-  </indexConfig>
-
-
-  <!-- JMX
-
-       This example enables JMX if and only if an existing MBeanServer
-       is found, use this if you want to configure JMX through JVM
-       parameters. Remove this to disable exposing Solr configuration
-       and statistics to JMX.
-
-       For more details see http://wiki.apache.org/solr/SolrJmx
-    -->
-  <jmx />
-  <!-- If you want to connect to a particular server, specify the
-       agentId
-    -->
-  <!-- <jmx agentId="myAgent" /> -->
-  <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
-  <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
-    -->
-
-  <!-- The default high-performance update handler -->
-  <updateHandler class="solr.DirectUpdateHandler2">
-
-    <!-- Enables a transaction log, used for real-time get, durability, and
-         and solr cloud replica recovery.  The log can grow as big as
-         uncommitted changes to the index, so use of a hard autoCommit
-         is recommended (see below).
-         "dir" - the target directory for transaction logs, defaults to the
-                solr data directory.
-         "numVersionBuckets" - sets the number of buckets used to keep
-                track of max version values when checking for re-ordered
-                updates; increase this value to reduce the cost of
-                synchronizing access to version buckets during high-volume
-                indexing, this requires 8 bytes (long) * numVersionBuckets
-                of heap space per Solr core.
-    -->
-    <updateLog>
-      <str name="dir">${solr.ulog.dir:}</str>
-      <int name="numVersionBuckets">${solr.ulog.numVersionBuckets:65536}</int>
-    </updateLog>
-
-    <!-- AutoCommit
-
-         Perform a hard commit automatically under certain conditions.
-         Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents.
-
-         http://wiki.apache.org/solr/UpdateXmlMessages
-
-         maxDocs - Maximum number of documents to add since the last
-                   commit before automatically triggering a new commit.
-
-         maxTime - Maximum amount of time in ms that is allowed to pass
-                   since a document was added before automatically
-                   triggering a new commit.
-         openSearcher - if false, the commit causes recent index changes
-           to be flushed to stable storage, but does not cause a new
-           searcher to be opened to make those changes visible.
-
-         If the updateLog is enabled, then it's highly recommended to
-         have some sort of hard autoCommit to limit the log size.
-      -->
-    <autoCommit>
-      <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
-      <openSearcher>false</openSearcher>
-    </autoCommit>
-
-    <!-- softAutoCommit is like autoCommit except it causes a
-         'soft' commit which only ensures that changes are visible
-         but does not ensure that data is synced to disk.  This is
-         faster and more near-realtime friendly than a hard commit.
-      -->
-
-    <autoSoftCommit>
-      <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
-    </autoSoftCommit>
-
-    <!-- Update Related Event Listeners
-
-         Various IndexWriter related events can trigger Listeners to
-         take actions.
-
-         postCommit - fired after every commit or optimize command
-         postOptimize - fired after every optimize command
-      -->
-
-  </updateHandler>
-
-  <!-- IndexReaderFactory
-
-       Use the following format to specify a custom IndexReaderFactory,
-       which allows for alternate IndexReader implementations.
-
-       ** Experimental Feature **
-
-       Please note - Using a custom IndexReaderFactory may prevent
-       certain other features from working. The API to
-       IndexReaderFactory may change without warning or may even be
-       removed from future releases if the problems cannot be
-       resolved.
-
-
-       ** Features that may not work with custom IndexReaderFactory **
-
-       The ReplicationHandler assumes a disk-resident index. Using a
-       custom IndexReader implementation may cause incompatibility
-       with ReplicationHandler and may cause replication to not work
-       correctly. See SOLR-1366 for details.
-
-    -->
-  <!--
-  <indexReaderFactory name="IndexReaderFactory" class="package.class">
-    <str name="someArg">Some Value</str>
-  </indexReaderFactory >
-  -->
-
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       Query section - these settings control query time things like caches
-       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <query>
-
-    <!-- Maximum number of clauses in each BooleanQuery,  an exception
-         is thrown if exceeded.  It is safe to increase or remove this setting,
-         since it is purely an arbitrary limit to try and catch user errors where
-         large boolean queries may not be the best implementation choice.
-      -->
-    <maxBooleanClauses>1024</maxBooleanClauses>
-
-    <!-- Solr Internal Query Caches
-
-         There are two implementations of cache available for Solr,
-         LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.
-
-         FastLRUCache has faster gets and slower puts in single
-         threaded operation and thus is generally faster than LRUCache
-         when the hit ratio of the cache is high (> 75%), and may be
-         faster under other scenarios on multi-cpu systems.
-    -->
-
-    <!-- Filter Cache
-
-         Cache used by SolrIndexSearcher for filters (DocSets),
-         unordered sets of *all* documents that match a query.  When a
-         new searcher is opened, its caches may be prepopulated or
-         "autowarmed" using data from caches in the old searcher.
-         autowarmCount is the number of items to prepopulate.  For
-         LRUCache, the autowarmed items will be the most recently
-         accessed items.
-
-         Parameters:
-           class - the SolrCache implementation LRUCache or
-               (LRUCache or FastLRUCache)
-           size - the maximum number of entries in the cache
-           initialSize - the initial capacity (number of entries) of
-               the cache.  (see java.util.HashMap)
-           autowarmCount - the number of entries to prepopulate from
-               and old cache.
-           maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
-                      to occupy. Note that when this option is specified, the size
-                      and initialSize parameters are ignored.
-      -->
-    <filterCache class="solr.FastLRUCache"
-                 size="512"
-                 initialSize="512"
-                 autowarmCount="0"/>
-
-    <!-- Query Result Cache
-
-         Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.
-         Additional supported parameter by LRUCache:
-            maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
-                       to occupy
-      -->
-    <queryResultCache class="solr.LRUCache"
-                      size="512"
-                      initialSize="512"
-                      autowarmCount="0"/>
-
-    <!-- Document Cache
-
-         Caches Lucene Document objects (the stored fields for each
-         document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.
-      -->
-    <documentCache class="solr.LRUCache"
-                   size="512"
-                   initialSize="512"
-                   autowarmCount="0"/>
-
-    <!-- custom cache currently used by block join -->
-    <cache name="perSegFilter"
-           class="solr.search.LRUCache"
-           size="10"
-           initialSize="0"
-           autowarmCount="10"
-           regenerator="solr.NoOpRegenerator" />
-
-    <!-- Field Value Cache
-
-         Cache used to hold field values that are quickly accessible
-         by document id.  The fieldValueCache is created by default
-         even if not configured here.
-      -->
-    <!--
-       <fieldValueCache class="solr.FastLRUCache"
-                        size="512"
-                        autowarmCount="128"
-                        showItems="32" />
-      -->
-
-    <!-- Custom Cache
-
-         Example of a generic cache.  These caches may be accessed by
-         name through SolrIndexSearcher.getCache(),cacheLookup(), and
-         cacheInsert().  The purpose is to enable easy caching of
-         user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator
-         if autowarming is desired.
-      -->
-    <!--
-       <cache name="myUserCache"
-              class="solr.LRUCache"
-              size="4096"
-              initialSize="1024"
-              autowarmCount="1024"
-              regenerator="com.mycompany.MyRegenerator"
-              />
-      -->
-
-
-    <!-- Lazy Field Loading
-
-         If true, stored fields that are not requested will be loaded
-         lazily.  This can result in a significant speed improvement
-         if the usual case is to not load all stored fields,
-         especially if the skipped fields are large compressed text
-         fields.
-    -->
-    <enableLazyFieldLoading>true</enableLazyFieldLoading>
-
-    <!-- Use Filter For Sorted Query
-
-         A possible optimization that attempts to use a filter to
-         satisfy a search.  If the requested sort does not include
-         score, then the filterCache will be checked for a filter
-         matching the query. If found, the filter will be used as the
-         source of document ids, and then the sort will be applied to
-         that.
-
-         For most situations, this will not be useful unless you
-         frequently get the same search repeatedly with different sort
-         options, and none of them ever use "score"
-      -->
-    <!--
-       <useFilterForSortedQuery>true</useFilterForSortedQuery>
-      -->
-
-    <!-- Result Window Size
-
-         An optimization for use with the queryResultCache.  When a search
-         is requested, a superset of the requested number of document ids
-         are collected.  For example, if a search for a particular query
-         requests matching documents 10 through 19, and queryWindowSize is 50,
-         then documents 0 through 49 will be collected and cached.  Any further
-         requests in that range can be satisfied via the cache.
-      -->
-    <queryResultWindowSize>20</queryResultWindowSize>
-
-    <!-- Maximum number of documents to cache for any entry in the
-         queryResultCache.
-      -->
-    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
-
-    <!-- Query Related Event Listeners
-
-         Various IndexSearcher related events can trigger Listeners to
-         take actions.
-
-         newSearcher - fired whenever a new searcher is being prepared
-         and there is a current searcher handling requests (aka
-         registered).  It can be used to prime certain caches to
-         prevent long request times for certain requests.
-
-         firstSearcher - fired whenever a new searcher is being
-         prepared but there is no current registered searcher to handle
-         requests or to gain autowarming data from.
-
-
-      -->
-    <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence.
-      -->
-    <listener event="newSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <!--
-           <lst><str name="q">solr</str><str name="sort">price asc</str></lst>
-           <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst>
-          -->
-      </arr>
-    </listener>
-    <listener event="firstSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <!--
-        <lst>
-          <str name="q">static firstSearcher warming in solrconfig.xml</str>
-        </lst>
-        -->
-      </arr>
-    </listener>
-
-    <!-- Use Cold Searcher
-
-         If a search request comes in and there is no current
-         registered searcher, then immediately register the still
-         warming searcher and use it.  If "false" then all requests
-         will block until the first searcher is done warming.
-      -->
-    <useColdSearcher>false</useColdSearcher>
-
-  </query>
-
-
-  <!-- Request Dispatcher
-
-       This section contains instructions for how the SolrDispatchFilter
-       should behave when processing requests for this SolrCore.
-
-    -->
-  <requestDispatcher>
-    <!-- Request Parsing
-
-         These settings indicate how Solr Requests may be parsed, and
-         what restrictions may be placed on the ContentStreams from
-         those requests
-
-         enableRemoteStreaming - enables use of the stream.file
-         and stream.url parameters for specifying remote streams.
-
-         multipartUploadLimitInKB - specifies the max size (in KiB) of
-         Multipart File Uploads that Solr will allow in a Request.
-
-         formdataUploadLimitInKB - specifies the max size (in KiB) of
-         form data (application/x-www-form-urlencoded) sent via
-         POST. You can use POST to pass request parameters not
-         fitting into the URL.
-
-         addHttpRequestToContext - if set to true, it will instruct
-         the requestParsers to include the original HttpServletRequest
-         object in the context map of the SolrQueryRequest under the
-         key "httpRequest". It will not be used by any of the existing
-         Solr components, but may be useful when developing custom
-         plugins.
-
-         *** WARNING ***
-         Before enabling remote streaming, you should make sure your
-         system has authentication enabled.
-
-    <requestParsers enableRemoteStreaming="false"
-                    multipartUploadLimitInKB="-1"
-                    formdataUploadLimitInKB="-1"
-                    addHttpRequestToContext="false"/>
-      -->
-
-    <!-- HTTP Caching
-
-         Set HTTP caching related parameters (for proxy caches and clients).
-
-         The options below instruct Solr not to output any HTTP Caching
-         related headers
-      -->
-    <httpCaching never304="true" />
-    <!-- If you include a <cacheControl> directive, it will be used to
-         generate a Cache-Control header (as well as an Expires header
-         if the value contains "max-age=")
-
-         By default, no Cache-Control header is generated.
-
-         You can use the <cacheControl> option even if you have set
-         never304="true"
-      -->
-    <!--
-       <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl>
-       </httpCaching>
-      -->
-    <!-- To enable Solr to respond with automatically generated HTTP
-         Caching headers, and to response to Cache Validation requests
-         correctly, set the value of never304="false"
-
-         This will cause Solr to generate Last-Modified and ETag
-         headers based on the properties of the Index.
-
-         The following options can also be specified to affect the
-         values of these headers...
-
-         lastModFrom - the default value is "openTime" which means the
-         Last-Modified value (and validation against If-Modified-Since
-         requests) will all be relative to when the current Searcher
-         was opened.  You can change it to lastModFrom="dirLastMod" if
-         you want the value to exactly correspond to when the physical
-         index was last modified.
-
-         etagSeed="..." is an option you can change to force the ETag
-         header (and validation against If-None-Match requests) to be
-         different even if the index has not changed (ie: when making
-         significant changes to your config file)
-
-         (lastModifiedFrom and etagSeed are both ignored if you use
-         the never304="true" option)
-      -->
-    <!--
-       <httpCaching lastModifiedFrom="openTime"
-                    etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl>
-       </httpCaching>
-      -->
-  </requestDispatcher>
-
-  <!-- Request Handlers
-
-       http://wiki.apache.org/solr/SolrRequestHandler
-
-       Incoming queries will be dispatched to a specific handler by name
-       based on the path specified in the request.
-
-       If a Request Handler is declared with startup="lazy", then it will
-       not be initialized until the first request that uses it.
-
-    -->
-  <!-- SearchHandler
-
-       http://wiki.apache.org/solr/SearchHandler
-
-       For processing Search Queries, the primary Request Handler
-       provided with Solr is "SearchHandler" It delegates to a sequent
-       of SearchComponents (see below) and supports distributed
-       queries across multiple shards
-    -->
-   <requestHandler name="/select" class="solr.SearchHandler">
-    <!-- default values for query parameters can be specified, these
-         will be overridden by parameters in the request
-      -->
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <int name="rows">10</int>
-      <str name="defType">edismax</str>
-      <float name="tie">0.075</float>
-        <str name="qf">
-            dvName^400
-            authorName^180
-            dvSubject^190
-            dvDescription^180
-            dvAffiliation^170
-            title^130
-            subject^120
-            keyword^110
-            topicClassValue^100
-            dsDescriptionValue^90
-            authorAffiliation^80
-            publicationCitation^60
-            producerName^50
-            fileName^30
-            fileDescription^30
-            variableLabel^20
-            variableName^10
-            _text_^1.0
-        </str>
-        <str name="pf">
-            dvName^200
-            authorName^100
-            dvSubject^100
-            dvDescription^100
-            dvAffiliation^100
-            title^75
-            subject^75
-            keyword^75
-            topicClassValue^75
-            dsDescriptionValue^75
-            authorAffiliation^75
-            publicationCitation^75
-            producerName^75
-        </str>
-        <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
-        <str name="bq">
-            isHarvested:false^25000
-        </str>
-
-      <!-- Default search field
-         <str name="df">text</str> 
-        -->
-      <!-- Change from JSON to XML format (the default prior to Solr 7.0)
-         <str name="wt">xml</str> 
-        -->
-    </lst>
-    <!-- In addition to defaults, "appends" params can be specified
-         to identify values which should be appended to the list of
-         multi-val params from the query (or the existing "defaults").
-      -->
-    <!-- In this example, the param "fq=instock:true" would be appended to
-         any query time fq params the user may specify, as a mechanism for
-         partitioning the index, independent of any user selected filtering
-         that may also be desired (perhaps as a result of faceted searching).
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "appends" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="appends">
-         <str name="fq">inStock:true</str>
-       </lst>
-      -->
-    <!-- "invariants" are a way of letting the Solr maintainer lock down
-         the options available to Solr clients.  Any params values
-         specified here are used regardless of what values may be specified
-         in either the query, the "defaults", or the "appends" params.
-
-         In this example, the facet.field and facet.query params would
-         be fixed, limiting the facets clients can use.  Faceting is
-         not turned on by default - but if the client does specify
-         facet=true in the request, these are the only facets they
-         will be able to see counts for; regardless of what other
-         facet.field or facet.query params they may specify.
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "invariants" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="invariants">
-         <str name="facet.field">cat</str>
-         <str name="facet.field">manu_exact</str>
-         <str name="facet.query">price:[* TO 500]</str>
-         <str name="facet.query">price:[500 TO *]</str>
-       </lst>
-      -->
-    <!-- If the default list of SearchComponents is not desired, that
-         list can either be overridden completely, or components can be
-         prepended or appended to the default list.  (see below)
-      -->
-    <!--
-       <arr name="components">
-         <str>nameOfCustomComponent1</str>
-         <str>nameOfCustomComponent2</str>
-       </arr>
-      -->
-  </requestHandler>
-
-  <!-- A request handler that returns indented JSON by default -->
-  <requestHandler name="/query" class="solr.SearchHandler">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <str name="wt">json</str>
-      <str name="indent">true</str>
-    </lst>
-  </requestHandler>
-
-
-  <!-- A Robust Example
-
-       This example SearchHandler declaration shows off usage of the
-       SearchHandler with many defaults declared
-
-       Note that multiple instances of the same Request Handler
-       (SearchHandler) can be registered multiple times with different
-       names (and different init parameters)
-    -->
-  <requestHandler name="/browse" class="solr.SearchHandler" useParams="query,facets,velocity,browse">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-  </requestHandler>
-
-  <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
-    <lst name="defaults">
-      <str name="df">_text_</str>
-    </lst>
-  </initParams>
-
-  <!-- Solr Cell Update Request Handler
-
-       http://wiki.apache.org/solr/ExtractingRequestHandler
-
-    -->
-  <requestHandler name="/update/extract"
-                  startup="lazy"
-                  class="solr.extraction.ExtractingRequestHandler" >
-    <lst name="defaults">
-      <str name="lowernames">true</str>
-      <str name="fmap.meta">ignored_</str>
-      <str name="fmap.content">_text_</str>
-    </lst>
-  </requestHandler>
-
-  <!-- Search Components
-
-       Search components are registered to SolrCore and used by
-       instances of SearchHandler (which can access them by name)
-
-       By default, the following components are available:
-
-       <searchComponent name="query"     class="solr.QueryComponent" />
-       <searchComponent name="facet"     class="solr.FacetComponent" />
-       <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
-       <searchComponent name="highlight" class="solr.HighlightComponent" />
-       <searchComponent name="stats"     class="solr.StatsComponent" />
-       <searchComponent name="debug"     class="solr.DebugComponent" />
-
-       Default configuration in a requestHandler would look like:
-
-       <arr name="components">
-         <str>query</str>
-         <str>facet</str>
-         <str>mlt</str>
-         <str>highlight</str>
-         <str>stats</str>
-         <str>debug</str>
-       </arr>
-
-       If you register a searchComponent to one of the standard names,
-       that will be used instead of the default.
-
-       To insert components before or after the 'standard' components, use:
-
-       <arr name="first-components">
-         <str>myFirstComponentName</str>
-       </arr>
-
-       <arr name="last-components">
-         <str>myLastComponentName</str>
-       </arr>
-
-       NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components"
-
-     -->
-
-  <!-- Spell Check
-
-       The spell check component can return a list of alternative spelling
-       suggestions.
-
-       http://wiki.apache.org/solr/SpellCheckComponent
-    -->
-  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
-    <str name="queryAnalyzerFieldType">text_general</str>
-
-    <!-- Multiple "Spell Checkers" can be declared and used by this
-         component
-      -->
-
-    <!-- a spellchecker built from a field of the main index -->
-    <lst name="spellchecker">
-      <str name="name">default</str>
-      <str name="field">_text_</str>
-      <str name="classname">solr.DirectSolrSpellChecker</str>
-      <!-- the spellcheck distance measure used, the default is the internal levenshtein -->
-      <str name="distanceMeasure">internal</str>
-      <!-- minimum accuracy needed to be considered a valid spellcheck suggestion -->
-      <float name="accuracy">0.5</float>
-      <!-- the maximum #edits we consider when enumerating terms: can be 1 or 2 -->
-      <int name="maxEdits">2</int>
-      <!-- the minimum shared prefix when enumerating terms -->
-      <int name="minPrefix">1</int>
-      <!-- maximum number of inspections per result. -->
-      <int name="maxInspections">5</int>
-      <!-- minimum length of a query term to be considered for correction -->
-      <int name="minQueryLength">4</int>
-      <!-- maximum threshold of documents a query term can appear to be considered for correction -->
-      <float name="maxQueryFrequency">0.01</float>
-      <!-- uncomment this to require suggestions to occur in 1% of the documents
-        <float name="thresholdTokenFrequency">.01</float>
-      -->
-    </lst>
-
-    <!-- a spellchecker that can break or combine words.  See "/spell" handler below for usage -->
-    <!--
-    <lst name="spellchecker">
-      <str name="name">wordbreak</str>
-      <str name="classname">solr.WordBreakSolrSpellChecker</str>
-      <str name="field">name</str>
-      <str name="combineWords">true</str>
-      <str name="breakWords">true</str>
-      <int name="maxChanges">10</int>
-    </lst>
-    -->
-  </searchComponent>
-
-  <!-- A request handler for demonstrating the spellcheck component.
-
-       NOTE: This is purely as an example.  The whole purpose of the
-       SpellCheckComponent is to hook it into the request handler that
-       handles your normal user queries so that a separate request is
-       not needed to get suggestions.
-
-       IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
-       NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-
-       See http://wiki.apache.org/solr/SpellCheckComponent for details
-       on the request parameters.
-    -->
-  <requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <!-- Solr will use suggestions from both the 'default' spellchecker
-           and from the 'wordbreak' spellchecker and combine them.
-           collations (re-written queries) can include a combination of
-           corrections from both spellcheckers -->
-      <str name="spellcheck.dictionary">default</str>
-      <str name="spellcheck">on</str>
-      <str name="spellcheck.extendedResults">true</str>
-      <str name="spellcheck.count">10</str>
-      <str name="spellcheck.alternativeTermCount">5</str>
-      <str name="spellcheck.maxResultsForSuggest">5</str>
-      <str name="spellcheck.collate">true</str>
-      <str name="spellcheck.collateExtendedResults">true</str>
-      <str name="spellcheck.maxCollationTries">10</str>
-      <str name="spellcheck.maxCollations">5</str>
-    </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Term Vector Component
-
-       http://wiki.apache.org/solr/TermVectorComponent
-    -->
-  <searchComponent name="tvComponent" class="solr.TermVectorComponent"/>
-
-  <!-- A request handler for demonstrating the term vector component
-
-       This is purely as an example.
-
-       In reality you will likely want to add the component to your
-       already specified request handlers.
-    -->
-  <requestHandler name="/tvrh" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <bool name="tv">true</bool>
-    </lst>
-    <arr name="last-components">
-      <str>tvComponent</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Clustering Component. (Omitted here. See the default Solr example for a typical configuration.) -->
-
-  <!-- Terms Component
-
-       http://wiki.apache.org/solr/TermsComponent
-
-       A component to return terms and document frequency of those
-       terms
-    -->
-  <searchComponent name="terms" class="solr.TermsComponent"/>
-
-  <!-- A request handler for demonstrating the terms component -->
-  <requestHandler name="/terms" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <bool name="terms">true</bool>
-      <bool name="distrib">false</bool>
-    </lst>
-    <arr name="components">
-      <str>terms</str>
-    </arr>
-  </requestHandler>
-
-    
-
-  <!-- Query Elevation Component
-
-       http://wiki.apache.org/solr/QueryElevationComponent
-
-       a search component that enables you to configure the top
-       results for a given query regardless of the normal lucene
-       scoring.
-    -->
-  <searchComponent name="elevator" class="solr.QueryElevationComponent" >
-    <!-- pick a fieldType to analyze queries -->
-    <str name="queryFieldType">string</str>
-  </searchComponent>
-
-  <!-- A request handler for demonstrating the elevator component -->
-  <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-    <arr name="last-components">
-      <str>elevator</str>
-    </arr>
-  </requestHandler>
-
-<!-- requestHandler for replication -->
-<requestHandler name="/replication" class="solr.ReplicationHandler" >
-    <lst name="slave">
-
-        <!--fully qualified url to the master core. It is possible to pass on this as a request param for the fetchindex command-->
-        <str name="masterUrl">http://dataverse-solr-0.dataverse-solr-service:8983/solr/collection1</str>
-
-        <!--Interval in which the slave should poll master .Format is HH:mm:ss . If this is absent slave does not poll automatically.
-         But a fetchindex can be triggered from the admin or the http API -->
-        <str name="pollInterval">00:00:20</str>
-        <!-- THE FOLLOWING PARAMETERS ARE USUALLY NOT REQUIRED-->
-        <!--to use compression while transferring the index files. The possible values are internal|external
-         if the value is 'external' make sure that your master Solr has the settings to honour the accept-encoding header.
-         see here for details http://wiki.apache.org/solr/SolrHttpCompression
-         If it is 'internal' everything will be taken care of automatically.
-         USE THIS ONLY IF YOUR BANDWIDTH IS LOW . THIS CAN ACTUALLY SLOWDOWN REPLICATION IN A LAN-->
-        <str name="compression">internal</str>
-        <!--The following values are used when the slave connects to the master to download the index files.
-         Default values implicitly set as 5000ms and 10000ms respectively. The user DOES NOT need to specify
-         these unless the bandwidth is extremely low or if there is an extremely high latency-->
-        <str name="httpConnTimeout">5000</str>
-        <str name="httpReadTimeout">10000</str>
-
-        <!-- If HTTP Basic authentication is enabled on the master, then the slave can be configured with the following -->
-        <str name="httpBasicAuthUser">username</str>
-        <str name="httpBasicAuthPassword">password</str>
-
-     </lst>
-</requestHandler>
-
-
-  <!-- Highlighting Component
-
-       http://wiki.apache.org/solr/HighlightingParameters
-    -->
-  <searchComponent class="solr.HighlightComponent" name="highlight">
-    <highlighting>
-      <!-- Configure the standard fragmenter -->
-      <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap"
-                  default="true"
-                  class="solr.highlight.GapFragmenter">
-        <lst name="defaults">
-          <int name="hl.fragsize">100</int>
-        </lst>
-      </fragmenter>
-
-      <!-- A regular-expression-based fragmenter
-           (for sentence extraction)
-        -->
-      <fragmenter name="regex"
-                  class="solr.highlight.RegexFragmenter">
-        <lst name="defaults">
-          <!-- slightly smaller fragsizes work better because of slop -->
-          <int name="hl.fragsize">70</int>
-          <!-- allow 50% slop on fragment sizes -->
-          <float name="hl.regex.slop">0.5</float>
-          <!-- a basic sentence pattern -->
-          <str name="hl.regex.pattern">[-\w ,/\n\&quot;&apos;]{20,200}</str>
-        </lst>
-      </fragmenter>
-
-      <!-- Configure the standard formatter -->
-      <formatter name="html"
-                 default="true"
-                 class="solr.highlight.HtmlFormatter">
-        <lst name="defaults">
-          <str name="hl.simple.pre"><![CDATA[<em>]]></str>
-          <str name="hl.simple.post"><![CDATA[</em>]]></str>
-        </lst>
-      </formatter>
-
-      <!-- Configure the standard encoder -->
-      <encoder name="html"
-               class="solr.highlight.HtmlEncoder" />
-
-      <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple"
-                       class="solr.highlight.SimpleFragListBuilder"/>
-
-      <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single"
-                       class="solr.highlight.SingleFragListBuilder"/>
-
-      <!-- Configure the weighted fragListBuilder -->
-      <fragListBuilder name="weighted"
-                       default="true"
-                       class="solr.highlight.WeightedFragListBuilder"/>
-
-      <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default"
-                        default="true"
-                        class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!--
-        <lst name="defaults">
-          <str name="hl.multiValuedSeparatorChar">/</str>
-        </lst>
-        -->
-      </fragmentsBuilder>
-
-      <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored"
-                        class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <lst name="defaults">
-          <str name="hl.tag.pre"><![CDATA[
-               <b style="background:yellow">,<b style="background:lawgreen">,
-               <b style="background:aquamarine">,<b style="background:magenta">,
-               <b style="background:palegreen">,<b style="background:coral">,
-               <b style="background:wheat">,<b style="background:khaki">,
-               <b style="background:lime">,<b style="background:deepskyblue">]]></str>
-          <str name="hl.tag.post"><![CDATA[</b>]]></str>
-        </lst>
-      </fragmentsBuilder>
-
-      <boundaryScanner name="default"
-                       default="true"
-                       class="solr.highlight.SimpleBoundaryScanner">
-        <lst name="defaults">
-          <str name="hl.bs.maxScan">10</str>
-          <str name="hl.bs.chars">.,!? &#9;&#10;&#13;</str>
-        </lst>
-      </boundaryScanner>
-
-      <boundaryScanner name="breakIterator"
-                       class="solr.highlight.BreakIteratorBoundaryScanner">
-        <lst name="defaults">
-          <!-- type should be one of CHARACTER, WORD(default), LINE and SENTENCE -->
-          <str name="hl.bs.type">WORD</str>
-          <!-- language and country are used when constructing Locale object.  -->
-          <!-- And the Locale object will be used when getting instance of BreakIterator -->
-          <str name="hl.bs.language">en</str>
-          <str name="hl.bs.country">US</str>
-        </lst>
-      </boundaryScanner>
-    </highlighting>
-  </searchComponent>
-
-  <!-- Update Processors
-
-       Chains of Update Processor Factories for dealing with Update
-       Requests can be declared, and then used by name in Update
-       Request Processors
-
-       http://wiki.apache.org/solr/UpdateRequestProcessor
-
-    -->
-
-  <!-- Add unknown fields to the schema
-
-       Field type guessing update processors that will
-       attempt to parse string-typed field values as Booleans, Longs,
-       Doubles, or Dates, and then add schema fields with the guessed
-       field types. Text content will be indexed as "text_general" as
-       well as a copy to a plain string version in *_str.
-
-       These require that the schema is both managed and mutable, by
-       declaring schemaFactory as ManagedIndexSchemaFactory, with
-       mutable specified as true.
-
-       See http://wiki.apache.org/solr/GuessingFieldTypes
-    -->
-<schemaFactory class="ClassicIndexSchemaFactory"/>
-
-  <updateProcessor class="solr.UUIDUpdateProcessorFactory" name="uuid"/>
-  <updateProcessor class="solr.RemoveBlankFieldUpdateProcessorFactory" name="remove-blank"/>
-  <updateProcessor class="solr.FieldNameMutatingUpdateProcessorFactory" name="field-name-mutating">
-    <str name="pattern">[^\w-\.]</str>
-    <str name="replacement">_</str>
-  </updateProcessor>
-  <updateProcessor class="solr.ParseBooleanFieldUpdateProcessorFactory" name="parse-boolean"/>
-  <updateProcessor class="solr.ParseLongFieldUpdateProcessorFactory" name="parse-long"/>
-  <updateProcessor class="solr.ParseDoubleFieldUpdateProcessorFactory" name="parse-double"/>
-  <updateProcessor class="solr.ParseDateFieldUpdateProcessorFactory" name="parse-date">
-    <arr name="format">
-      <str>yyyy-MM-dd'T'HH:mm:ss.SSSZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss,SSSZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss.SSS</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss,SSS</str>
-      <str>yyyy-MM-dd'T'HH:mm:ssZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss</str>
-      <str>yyyy-MM-dd'T'HH:mmZ</str>
-      <str>yyyy-MM-dd'T'HH:mm</str>
-      <str>yyyy-MM-dd HH:mm:ss.SSSZ</str>
-      <str>yyyy-MM-dd HH:mm:ss,SSSZ</str>
-      <str>yyyy-MM-dd HH:mm:ss.SSS</str>
-      <str>yyyy-MM-dd HH:mm:ss,SSS</str>
-      <str>yyyy-MM-dd HH:mm:ssZ</str>
-      <str>yyyy-MM-dd HH:mm:ss</str>
-      <str>yyyy-MM-dd HH:mmZ</str>
-      <str>yyyy-MM-dd HH:mm</str>
-      <str>yyyy-MM-dd</str>
-    </arr>
-  </updateProcessor>
-
-  <!--Dataverse removed-->
-<!--  <updateProcessor class="solr.AddSchemaFieldsUpdateProcessorFactory" name="add-schema-fields">
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.String</str>
-      <str name="fieldType">text_general</str>
-      <lst name="copyField">
-        <str name="dest">*_str</str>
-        <int name="maxChars">256</int>
-      </lst>
-
-      <bool name="default">true</bool>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Boolean</str>
-      <str name="fieldType">booleans</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.util.Date</str>
-      <str name="fieldType">pdates</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Long</str>
-      <str name="valueClass">java.lang.Integer</str>
-      <str name="fieldType">plongs</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Number</str>
-      <str name="fieldType">pdoubles</str>
-    </lst>
-    </updateProcessor> -->
-
-  <!-- The update.autoCreateFields property can be turned to false to disable schemaless mode -->
-  <updateRequestProcessorChain name="add-unknown-fields-to-the-schema" default="${update.autoCreateFields:false}"
-           processor="uuid,remove-blank,field-name-mutating,parse-boolean,parse-long,parse-double,parse-date">
-    <processor class="solr.LogUpdateProcessorFactory"/>
-    <processor class="solr.DistributedUpdateProcessorFactory"/>
-    <processor class="solr.RunUpdateProcessorFactory"/>
-  </updateRequestProcessorChain>
-
-  <!-- Deduplication
-
-       An example dedup update processor that creates the "id" field
-       on the fly based on the hash code of some other fields.  This
-       example has overwriteDupes set to false since we are using the
-       id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.
-
-    -->
-  <!--
-     <updateRequestProcessorChain name="dedupe">
-       <processor class="solr.processor.SignatureUpdateProcessorFactory">
-         <bool name="enabled">true</bool>
-         <str name="signatureField">id</str>
-         <bool name="overwriteDupes">false</bool>
-         <str name="fields">name,features,cat</str>
-         <str name="signatureClass">solr.processor.Lookup3Signature</str>
-       </processor>
-       <processor class="solr.LogUpdateProcessorFactory" />
-       <processor class="solr.RunUpdateProcessorFactory" />
-     </updateRequestProcessorChain>
-    -->
-
-  <!-- Language identification
-
-       This example update chain identifies the language of the incoming
-       documents using the langid contrib. The detected language is
-       written to field language_s. No field name mapping is done.
-       The fields used for detection are text, title, subject and description,
-       making this example suitable for detecting languages form full-text
-       rich documents injected via ExtractingRequestHandler.
-       See more about langId at http://wiki.apache.org/solr/LanguageDetection
-    -->
-  <!--
-   <updateRequestProcessorChain name="langid">
-     <processor class="org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory">
-       <str name="langid.fl">text,title,subject,description</str>
-       <str name="langid.langField">language_s</str>
-       <str name="langid.fallback">en</str>
-     </processor>
-     <processor class="solr.LogUpdateProcessorFactory" />
-     <processor class="solr.RunUpdateProcessorFactory" />
-   </updateRequestProcessorChain>
-  -->
-
-  <!-- Script update processor
-
-    This example hooks in an update processor implemented using JavaScript.
-
-    See more about the script update processor at http://wiki.apache.org/solr/ScriptUpdateProcessor
-  -->
-  <!--
-    <updateRequestProcessorChain name="script">
-      <processor class="solr.StatelessScriptUpdateProcessorFactory">
-        <str name="script">update-script.js</str>
-        <lst name="params">
-          <str name="config_param">example config parameter</str>
-        </lst>
-      </processor>
-      <processor class="solr.RunUpdateProcessorFactory" />
-    </updateRequestProcessorChain>
-  -->
-
-  <!-- Response Writers
-
-       http://wiki.apache.org/solr/QueryResponseWriter
-
-       Request responses will be written using the writer specified by
-       the 'wt' request parameter matching the name of a registered
-       writer.
-
-       The "default" writer is the default and will be used if 'wt' is
-       not specified in the request.
-    -->
-  <!-- The following response writers are implicitly configured unless
-       overridden...
-    -->
-  <!--
-     <queryResponseWriter name="xml"
-                          default="true"
-                          class="solr.XMLResponseWriter" />
-     <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
-     <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
-     <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
-     <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
-     <queryResponseWriter name="phps" class="solr.PHPSerializedResponseWriter"/>
-     <queryResponseWriter name="csv" class="solr.CSVResponseWriter"/>
-     <queryResponseWriter name="schema.xml" class="solr.SchemaXmlResponseWriter"/>
-    -->
-
-  <queryResponseWriter name="json" class="solr.JSONResponseWriter">
-    <!-- For the purposes of the tutorial, JSON responses are written as
-     plain text so that they are easy to read in *any* browser.
-     If you expect a MIME type of "application/json" just remove this override.
-    -->
-    <str name="content-type">text/plain; charset=UTF-8</str>
-  </queryResponseWriter>
-
-  <!--
-     Custom response writers can be declared as needed...
-    -->
-  <queryResponseWriter name="velocity" class="solr.VelocityResponseWriter" startup="lazy">
-    <str name="template.base.dir">${velocity.template.base.dir:}</str>
-    <str name="solr.resource.loader.enabled">${velocity.solr.resource.loader.enabled:true}</str>
-    <str name="params.resource.loader.enabled">${velocity.params.resource.loader.enabled:false}</str>
-  </queryResponseWriter>
-
-  <!-- XSLT response writer transforms the XML output by any xslt file found
-       in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.
-    -->
-  <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
-    <int name="xsltCacheLifetimeSeconds">5</int>
-  </queryResponseWriter>
-
-  <!-- Query Parsers
-
-       https://lucene.apache.org/solr/guide/query-syntax-and-parsing.html
-
-       Multiple QParserPlugins can be registered by name, and then
-       used in either the "defType" param for the QueryComponent (used
-       by SearchHandler) or in LocalParams
-    -->
-  <!-- example of registering a query parser -->
-  <!--
-     <queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-    -->
-
-  <!-- Function Parsers
-
-       http://wiki.apache.org/solr/FunctionQuery
-
-       Multiple ValueSourceParsers can be registered by name, and then
-       used as function names when using the "func" QParser.
-    -->
-  <!-- example of registering a custom function parser  -->
-  <!--
-     <valueSourceParser name="myfunc"
-                        class="com.mycompany.MyValueSourceParser" />
-    -->
-
-
-  <!-- Document Transformers
-       http://wiki.apache.org/solr/DocTransformers
-    -->
-  <!--
-     Could be something like:
-     <transformer name="db" class="com.mycompany.LoadFromDatabaseTransformer" >
-       <int name="connection">jdbc://....</int>
-     </transformer>
-
-     To add a constant value to all docs, use:
-     <transformer name="mytrans2" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
-       <int name="value">5</int>
-     </transformer>
-
-     If you want the user to still be able to change it with _value:something_ use this:
-     <transformer name="mytrans3" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
-       <double name="defaultValue">5</double>
-     </transformer>
-
-      If you are using the QueryElevationComponent, you may wish to mark documents that get boosted.  The
-      EditorialMarkerFactory will do exactly that:
-     <transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-    -->
-</config>
diff --git a/conf/httpd/conf.d/dataverse.conf b/conf/httpd/conf.d/dataverse.conf
index d24d7c7893f..fe843ec60e4 100644
--- a/conf/httpd/conf.d/dataverse.conf
+++ b/conf/httpd/conf.d/dataverse.conf
@@ -1,8 +1,3 @@
-# don't pass paths used by rApache and TwoRavens to Glassfish
-ProxyPassMatch ^/RApacheInfo$ !
-ProxyPassMatch ^/dataexplore !
-ProxyPassMatch ^/custom !
-ProxyPassMatch ^/rookzelig !
 # don't pass paths used by Shibboleth to Glassfish
 ProxyPassMatch ^/Shibboleth.sso !
 ProxyPassMatch ^/shibboleth-ds !
diff --git a/conf/jhove/jhove.conf b/conf/jhove/jhove.conf
index 17a7c5e0530..971c60acfaa 100644
--- a/conf/jhove/jhove.conf
+++ b/conf/jhove/jhove.conf
@@ -3,7 +3,7 @@
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xmlns="http://hul.harvard.edu/ois/xml/ns/jhove/jhoveConfig"
  xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/jhove/jhoveConfig
-                     file:///usr/local/glassfish4/glassfish/domains/domain1/config/jhoveConfig.xsd">
+                     file:///usr/local/payara6/glassfish/domains/domain1/config/jhoveConfig.xsd">
  <jhoveHome>/usr/local/src/jhove</jhoveHome>
  <defaultEncoding>utf-8</defaultEncoding>
  <tempDirectory>/tmp</tempDirectory>
diff --git a/conf/keycloak/.env b/conf/keycloak/.env
new file mode 100644
index 00000000000..6d99d85b3a7
--- /dev/null
+++ b/conf/keycloak/.env
@@ -0,0 +1,5 @@
+APP_IMAGE=gdcc/dataverse:unstable
+POSTGRES_VERSION=17
+DATAVERSE_DB_USER=dataverse
+SOLR_VERSION=9.8.0
+SKIP_DEPLOY=0
\ No newline at end of file
diff --git a/conf/keycloak/Dockerfile b/conf/keycloak/Dockerfile
new file mode 100644
index 00000000000..d2c85ee3335
--- /dev/null
+++ b/conf/keycloak/Dockerfile
@@ -0,0 +1,39 @@
+# ------------------------------------------
+# Stage 1: Build SPI with Maven
+# ------------------------------------------
+FROM maven:3.9.5-eclipse-temurin-17 AS builder
+
+WORKDIR /app
+
+# Copy SPI source code
+COPY ./builtin-users-spi /app
+
+# Build the SPI JAR
+RUN mvn clean package
+
+# ------------------------------------------
+# Stage 2: Build Keycloak Image
+# ------------------------------------------
+FROM quay.io/keycloak/keycloak:26.3.2
+
+# Add the Oracle JDBC jars
+ARG ORACLE_JDBC_VERSION=23.8.0.25.04
+ADD --chown=keycloak:keycloak https://repo1.maven.org/maven2/com/oracle/database/jdbc/ojdbc11/${ORACLE_JDBC_VERSION}/ojdbc11-${ORACLE_JDBC_VERSION}.jar /opt/keycloak/providers/ojdbc11.jar
+ADD --chown=keycloak:keycloak https://repo1.maven.org/maven2/com/oracle/database/nls/orai18n/${ORACLE_JDBC_VERSION}/orai18n-${ORACLE_JDBC_VERSION}.jar /opt/keycloak/providers/orai18n.jar
+
+# Health build parameter
+ENV KC_HEALTH_ENABLED=true
+
+# Copy SPI JAR from builder stage
+COPY --from=builder /app/target/keycloak-dv-builtin-users-authenticator-1.0-SNAPSHOT.jar /opt/keycloak/providers/
+
+# Copy additional configurations
+COPY ./builtin-users-spi/conf/quarkus.properties /opt/keycloak/conf/
+COPY ./test-realm-include-spi.json /opt/keycloak/data/import/
+
+# Set the Keycloak command
+ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]
+CMD ["start-dev", "--import-realm", "--http-port=8090"]
+
+# Expose port 8090
+EXPOSE 8090
diff --git a/conf/keycloak/builtin-users-spi/conf/quarkus.properties b/conf/keycloak/builtin-users-spi/conf/quarkus.properties
new file mode 100644
index 00000000000..64ce6d898c5
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/conf/quarkus.properties
@@ -0,0 +1,15 @@
+quarkus.datasource.user-store.db-kind=postgresql
+quarkus.datasource.user-store.jdbc.url=jdbc:postgresql://${DATAVERSE_DB_HOST}:${DATAVERSE_DB_PORT}/dataverse
+quarkus.datasource.user-store.username=${DATAVERSE_DB_USER}
+quarkus.datasource.user-store.password=${DATAVERSE_DB_PASSWORD}
+
+quarkus.datasource.user-store.jdbc.driver=org.postgresql.Driver
+quarkus.datasource.user-store.jdbc.transactions=disabled
+quarkus.transaction-manager.unsafe-multiple-last-resources=allow
+
+quarkus.datasource.user-store.jdbc.recovery.username=${DATAVERSE_DB_USER}
+quarkus.datasource.user-store.jdbc.recovery.password=${DATAVERSE_DB_PASSWORD}
+
+quarkus.datasource.user-store.jdbc.xa-properties.serverName=${DATAVERSE_DB_HOST}
+quarkus.datasource.user-store.jdbc.xa-properties.portNumber=${DATAVERSE_DB_PORT}
+quarkus.datasource.user-store.jdbc.xa-properties.databaseName=dataverse
diff --git a/conf/keycloak/builtin-users-spi/pom.xml b/conf/keycloak/builtin-users-spi/pom.xml
new file mode 100644
index 00000000000..36cf6548d01
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/pom.xml
@@ -0,0 +1,110 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>edu.harvard.iq.keycloak</groupId>
+    <artifactId>keycloak-dv-builtin-users-authenticator</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <!-- Keycloak Server SPI -->
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-server-spi</artifactId>
+            <version>${keycloak.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Keycloak Server SPI Private -->
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-server-spi-private</artifactId>
+            <version>${keycloak.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Keycloak Services -->
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-services</artifactId>
+            <version>${keycloak.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Keycloak Model JPA -->
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-jpa</artifactId>
+            <version>${keycloak.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Jakarta Persistence API -->
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${jakarta.persistence.version}</version>
+        </dependency>
+
+        <!-- jBCrypt -->
+        <dependency>
+            <groupId>org.mindrot</groupId>
+            <artifactId>jbcrypt</artifactId>
+            <version>${mindrot.jbcrypt.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- TEST DEPENDENCIES -->
+
+        <!-- JUnit -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Mockito -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <keycloak.version>26.3.2</keycloak.version>
+        <java.version>17</java.version>
+        <jakarta.persistence.version>3.2.0</jakarta.persistence.version>
+        <mindrot.jbcrypt.version>0.4</mindrot.jbcrypt.version>
+        <mockito.version>5.15.2</mockito.version>
+        <junit.jupiter.version>5.11.4</junit.jupiter.version>
+    </properties>
+</project>
diff --git a/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/adapters/DataverseUserAdapter.java b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/adapters/DataverseUserAdapter.java
new file mode 100644
index 00000000000..a47eeee1749
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/adapters/DataverseUserAdapter.java
@@ -0,0 +1,71 @@
+package edu.harvard.iq.keycloak.auth.spi.adapters;
+
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseUser;
+import edu.harvard.iq.keycloak.auth.spi.providers.DataverseUserStorageProviderFactory;
+import org.keycloak.component.ComponentModel;
+import org.keycloak.models.GroupModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
+import org.keycloak.storage.StorageId;
+import org.keycloak.storage.adapter.AbstractUserAdapterFederatedStorage;
+
+import java.util.stream.Stream;
+
+public class DataverseUserAdapter extends AbstractUserAdapterFederatedStorage {
+
+    protected DataverseUser dataverseUser;
+    protected String keycloakId;
+
+    private static final String ATTRIBUTE_NAME_IDP = "idp";
+
+    public DataverseUserAdapter(KeycloakSession session, RealmModel realm, ComponentModel model, DataverseUser dataverseUser) {
+        super(session, realm, model);
+        this.dataverseUser = dataverseUser;
+        keycloakId = StorageId.keycloakId(model, dataverseUser.getBuiltinUser().getId().toString());
+        this.setSingleAttribute(ATTRIBUTE_NAME_IDP, DataverseUserStorageProviderFactory.PROVIDER_ID);
+    }
+
+    @Override
+    public void setUsername(String s) {
+    }
+
+    @Override
+    public String getUsername() {
+        return dataverseUser.getBuiltinUser().getUsername();
+    }
+
+    @Override
+    public String getEmail() {
+        return dataverseUser.getAuthenticatedUser().getEmail();
+    }
+
+    @Override
+    public String getFirstName() {
+        return dataverseUser.getAuthenticatedUser().getFirstName();
+    }
+
+    @Override
+    public String getLastName() {
+        return dataverseUser.getAuthenticatedUser().getLastName();
+    }
+
+    @Override
+    public Stream<GroupModel> getGroupsStream(String search, Integer first, Integer max) {
+        return super.getGroupsStream(search, first, max);
+    }
+
+    @Override
+    public long getGroupsCount() {
+        return super.getGroupsCount();
+    }
+
+    @Override
+    public long getGroupsCountByNameContaining(String search) {
+        return super.getGroupsCountByNameContaining(search);
+    }
+
+    @Override
+    public String getId() {
+        return keycloakId;
+    }
+}
diff --git a/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/models/DataverseAuthenticatedUser.java b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/models/DataverseAuthenticatedUser.java
new file mode 100644
index 00000000000..d2d1e292ade
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/models/DataverseAuthenticatedUser.java
@@ -0,0 +1,48 @@
+package edu.harvard.iq.keycloak.auth.spi.models;
+
+import jakarta.persistence.*;
+
+@NamedQueries({
+        @NamedQuery(name = "DataverseAuthenticatedUser.findByEmail",
+                query = "select au from DataverseAuthenticatedUser au WHERE LOWER(au.email)=LOWER(:email)"),
+        @NamedQuery(name = "DataverseAuthenticatedUser.findByIdentifier",
+                query = "select au from DataverseAuthenticatedUser au WHERE LOWER(au.userIdentifier)=LOWER(:identifier)"),
+})
+@Entity
+@Table(name = "authenticateduser")
+public class DataverseAuthenticatedUser {
+    @Id
+    private Integer id;
+    private String email;
+    private String lastName;
+    private String firstName;
+    private String userIdentifier;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public void setUserIdentifier(String userIdentifier) {
+        this.userIdentifier = userIdentifier;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getUserIdentifier() {
+        return userIdentifier;
+    }
+}
diff --git a/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/models/DataverseBuiltinUser.java b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/models/DataverseBuiltinUser.java
new file mode 100644
index 00000000000..b4dd59339d2
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/models/DataverseBuiltinUser.java
@@ -0,0 +1,48 @@
+package edu.harvard.iq.keycloak.auth.spi.models;
+
+import jakarta.persistence.*;
+
+@NamedQueries({
+        @NamedQuery(name = "DataverseBuiltinUser.findByUsername",
+                query = "SELECT u FROM DataverseBuiltinUser u WHERE LOWER(u.username)=LOWER(:username)")
+})
+@Entity
+@Table(name = "builtinuser")
+public class DataverseBuiltinUser {
+    @Id
+    private Integer id;
+
+    private String username;
+
+    private String encryptedPassword;
+
+    private Integer passwordEncryptionVersion;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public Integer getPasswordEncryptionVersion() {
+        return passwordEncryptionVersion;
+    }
+
+    public void setEncryptedPassword(String encryptedPassword) {
+        this.encryptedPassword = encryptedPassword;
+    }
+
+    public String getEncryptedPassword() {
+        return encryptedPassword;
+    }
+}
diff --git a/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/models/DataverseUser.java b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/models/DataverseUser.java
new file mode 100644
index 00000000000..d697fe52fc8
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/models/DataverseUser.java
@@ -0,0 +1,20 @@
+package edu.harvard.iq.keycloak.auth.spi.models;
+
+public class DataverseUser {
+
+    private final DataverseAuthenticatedUser authenticatedUser;
+    private final DataverseBuiltinUser builtinUser;
+
+    public DataverseUser(DataverseAuthenticatedUser authenticatedUser, DataverseBuiltinUser builtinUser) {
+        this.authenticatedUser = authenticatedUser;
+        this.builtinUser = builtinUser;
+    }
+
+    public DataverseAuthenticatedUser getAuthenticatedUser() {
+        return authenticatedUser;
+    }
+
+    public DataverseBuiltinUser getBuiltinUser() {
+        return builtinUser;
+    }
+}
diff --git a/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/providers/DataverseUserStorageProvider.java b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/providers/DataverseUserStorageProvider.java
new file mode 100644
index 00000000000..f9de30cf845
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/providers/DataverseUserStorageProvider.java
@@ -0,0 +1,86 @@
+package edu.harvard.iq.keycloak.auth.spi.providers;
+
+import edu.harvard.iq.keycloak.auth.spi.adapters.DataverseUserAdapter;
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseUser;
+import edu.harvard.iq.keycloak.auth.spi.services.DataverseAuthenticationService;
+import edu.harvard.iq.keycloak.auth.spi.services.DataverseUserService;
+import org.jboss.logging.Logger;
+import org.keycloak.component.ComponentModel;
+import org.keycloak.credential.CredentialInput;
+import org.keycloak.credential.CredentialInputValidator;
+import org.keycloak.models.*;
+import org.keycloak.models.credential.PasswordCredentialModel;
+import org.keycloak.storage.UserStorageProvider;
+import org.keycloak.storage.user.UserLookupProvider;
+
+/**
+ * DataverseUserStorageProvider integrates Keycloak with Dataverse user storage.
+ * It enables authentication and retrieval of users from a Dataverse-based user store.
+ */
+public class DataverseUserStorageProvider implements
+        UserStorageProvider,
+        UserLookupProvider,
+        CredentialInputValidator {
+
+    private static final Logger logger = Logger.getLogger(DataverseUserStorageProvider.class);
+
+    private final ComponentModel model;
+    private final KeycloakSession session;
+    private final DataverseUserService dataverseUserService;
+
+    public DataverseUserStorageProvider(KeycloakSession session, ComponentModel model) {
+        this.session = session;
+        this.model = model;
+
+        String datasource = model.getConfig().getFirst("datasource");
+        logger.debugf("Using datasource: %s", datasource);
+        this.dataverseUserService = new DataverseUserService(session, datasource);
+    }
+
+    @Override
+    public UserModel getUserById(RealmModel realm, String id) {
+        DataverseUser dataverseUser = dataverseUserService.getUserById(id);
+        return (dataverseUser != null) ? new DataverseUserAdapter(session, realm, model, dataverseUser) : null;
+    }
+
+    @Override
+    public UserModel getUserByUsername(RealmModel realm, String username) {
+        DataverseUser dataverseUser = dataverseUserService.getUserByUsername(username);
+        return (dataverseUser != null) ? new DataverseUserAdapter(session, realm, model, dataverseUser) : null;
+    }
+
+    @Override
+    public UserModel getUserByEmail(RealmModel realm, String email) {
+        DataverseUser dataverseUser = dataverseUserService.getUserByEmail(email);
+        return (dataverseUser != null) ? new DataverseUserAdapter(session, realm, model, dataverseUser) : null;
+    }
+
+    @Override
+    public boolean supportsCredentialType(String credentialType) {
+        return PasswordCredentialModel.TYPE.equals(credentialType);
+    }
+
+    @Override
+    public boolean isConfiguredFor(RealmModel realm, UserModel user, String credentialType) {
+        logger.debugf("Checking credential configuration for user: %s, credentialType: %s", user.getUsername(), credentialType);
+        return false;
+    }
+
+    @Override
+    public boolean isValid(RealmModel realm, UserModel user, CredentialInput input) {
+        logger.debugf("Validating credentials for user: %s", user.getUsername());
+
+        if (!supportsCredentialType(input.getType()) || !(input instanceof UserCredentialModel userCredential)) {
+            return false;
+        }
+
+        DataverseAuthenticationService dataverseAuthenticationService = new DataverseAuthenticationService(dataverseUserService);
+        return dataverseAuthenticationService.canLogInAsBuiltinUser(user.getUsername(), userCredential.getValue());
+    }
+
+    @Override
+    public void close() {
+        logger.debug("Closing DataverseUserStorageProvider");
+        this.dataverseUserService.close();
+    }
+}
diff --git a/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/providers/DataverseUserStorageProviderFactory.java b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/providers/DataverseUserStorageProviderFactory.java
new file mode 100644
index 00000000000..ceaeec46055
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/providers/DataverseUserStorageProviderFactory.java
@@ -0,0 +1,52 @@
+package edu.harvard.iq.keycloak.auth.spi.providers;
+
+import org.jboss.logging.Logger;
+import org.keycloak.component.ComponentModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.provider.ProviderConfigProperty;
+import org.keycloak.storage.UserStorageProviderFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DataverseUserStorageProviderFactory implements UserStorageProviderFactory<DataverseUserStorageProvider> {
+
+    public static final String PROVIDER_ID = "dv-builtin-users-authenticator";
+
+    private static final Logger logger = Logger.getLogger(DataverseUserStorageProviderFactory.class);
+
+    @Override
+    public DataverseUserStorageProvider create(KeycloakSession session, ComponentModel model) {
+        return new DataverseUserStorageProvider(session, model);
+    }
+
+    @Override
+    public String getId() {
+        return PROVIDER_ID;
+    }
+
+    @Override
+    public String getHelpText() {
+        return "A Keycloak Storage Provider to authenticate Dataverse Builtin Users";
+    }
+
+    @Override
+    public void close() {
+        logger.debug("<<<<<< Closing factory");
+    }
+
+    @Override
+    public List<ProviderConfigProperty> getConfigProperties() {
+        List<ProviderConfigProperty> configProperties = new ArrayList<>();
+
+        ProviderConfigProperty mySetting = new ProviderConfigProperty();
+        mySetting.setName("datasource");
+        mySetting.setLabel("Datasource");
+        mySetting.setHelpText("This specifies the target datasource used by the SPI.");
+        mySetting.setType(ProviderConfigProperty.STRING_TYPE);
+
+        configProperties.add(mySetting);
+
+        return configProperties;
+    }
+}
diff --git a/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseAuthenticationService.java b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseAuthenticationService.java
new file mode 100644
index 00000000000..995662e1cb6
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseAuthenticationService.java
@@ -0,0 +1,48 @@
+package edu.harvard.iq.keycloak.auth.spi.services;
+
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseBuiltinUser;
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseUser;
+
+public class DataverseAuthenticationService {
+
+    private final DataverseUserService dataverseUserService;
+
+    private PasswordEncryption.Algorithm passwordEncryptionAlgorithm;
+
+    public DataverseAuthenticationService(DataverseUserService dataverseUserService) {
+        this(dataverseUserService, null);
+    }
+
+    // Just for testing purposes, do not use
+    public DataverseAuthenticationService(DataverseUserService dataverseUserService, PasswordEncryption.Algorithm passwordEncryptionAlgorithm) {
+        this.dataverseUserService = dataverseUserService;
+        this.passwordEncryptionAlgorithm = passwordEncryptionAlgorithm;
+    }
+
+    /**
+     * Validates if a Dataverse built-in user can log in with the given credentials.
+     *
+     * @param usernameOrEmail The username or email of the Dataverse built-in user.
+     * @param password        The password to be validated.
+     * @return {@code true} if the user can log in, {@code false} otherwise.
+     */
+    public boolean canLogInAsBuiltinUser(String usernameOrEmail, String password) {
+        DataverseUser dataverseUser = this.dataverseUserService.getUserByUsername(usernameOrEmail);
+
+        if (dataverseUser == null) {
+            dataverseUser = this.dataverseUserService.getUserByEmail(usernameOrEmail);
+        }
+
+        if (dataverseUser == null) {
+            return false;
+        }
+
+        DataverseBuiltinUser builtinUser = dataverseUser.getBuiltinUser();
+
+        if (passwordEncryptionAlgorithm == null) {
+            passwordEncryptionAlgorithm = PasswordEncryption.getVersion(builtinUser.getPasswordEncryptionVersion());
+        }
+
+        return passwordEncryptionAlgorithm.check(password, builtinUser.getEncryptedPassword());
+    }
+}
diff --git a/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseUserService.java b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseUserService.java
new file mode 100644
index 00000000000..5256d5df683
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseUserService.java
@@ -0,0 +1,110 @@
+package edu.harvard.iq.keycloak.auth.spi.services;
+
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseAuthenticatedUser;
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseBuiltinUser;
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseUser;
+import jakarta.persistence.EntityManager;
+import org.jboss.logging.Logger;
+import org.keycloak.connections.jpa.JpaConnectionProvider;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.storage.StorageId;
+
+import java.util.List;
+
+public class DataverseUserService {
+
+    private static final Logger logger = Logger.getLogger(DataverseUserService.class);
+
+    private final EntityManager em;
+
+    public DataverseUserService(KeycloakSession session, String datasource) {
+        this.em = session.getProvider(JpaConnectionProvider.class, datasource).getEntityManager();
+    }
+
+    public DataverseUser getUserById(String id) {
+        logger.debugf("Fetching user by ID: %s", id);
+        String persistenceId = StorageId.externalId(id);
+
+        DataverseBuiltinUser builtinUser = em.find(DataverseBuiltinUser.class, persistenceId);
+        if (builtinUser == null) {
+            logger.debugf("Builtin user not found for external ID: %s", persistenceId);
+            return null;
+        }
+
+        String username = builtinUser.getUsername();
+        DataverseAuthenticatedUser authenticatedUser = getAuthenticatedUserByUsername(username);
+        if (authenticatedUser == null) {
+            logger.debugf("Authenticated user not found by username: %s", username);
+            return null;
+        }
+
+        return new DataverseUser(authenticatedUser, builtinUser);
+    }
+
+    public DataverseUser getUserByUsername(String username) {
+        logger.debugf("Fetching user by username: %s", username);
+        List<DataverseBuiltinUser> users = em.createNamedQuery("DataverseBuiltinUser.findByUsername", DataverseBuiltinUser.class)
+                .setParameter("username", username)
+                .getResultList();
+
+        if (users.isEmpty()) {
+            logger.debugf("Builtin user not found by username: %s", username);
+            return null;
+        }
+
+        DataverseAuthenticatedUser authenticatedUser = getAuthenticatedUserByUsername(username);
+        if (authenticatedUser == null) {
+            logger.debugf("Authenticated user not found by username: %s", username);
+            return null;
+        }
+
+        return new DataverseUser(authenticatedUser, users.get(0));
+    }
+
+    public DataverseUser getUserByEmail(String email) {
+        logger.debugf("Fetching user by email: %s", email);
+        List<DataverseAuthenticatedUser> authUsers = em.createNamedQuery("DataverseAuthenticatedUser.findByEmail", DataverseAuthenticatedUser.class)
+                .setParameter("email", email)
+                .getResultList();
+
+        if (authUsers.isEmpty()) {
+            logger.debugf("Authenticated user not found by email: %s", email);
+            return null;
+        }
+
+        String username = authUsers.get(0).getUserIdentifier();
+        List<DataverseBuiltinUser> builtinUsers = em.createNamedQuery("DataverseBuiltinUser.findByUsername", DataverseBuiltinUser.class)
+                .setParameter("username", username)
+                .getResultList();
+
+        if (builtinUsers.isEmpty()) {
+            logger.debugf("Builtin user not found by username: %s", username);
+            return null;
+        }
+
+        return new DataverseUser(authUsers.get(0), builtinUsers.get(0));
+    }
+
+    public void close() {
+        if (em != null) {
+            em.close();
+        }
+    }
+
+    /**
+     * Retrieves an authenticated user from Dataverse by username.
+     *
+     * @param username The username to look up.
+     * @return The authenticated user or null if not found.
+     */
+    private DataverseAuthenticatedUser getAuthenticatedUserByUsername(String username) {
+        try {
+            return em.createNamedQuery("DataverseAuthenticatedUser.findByIdentifier", DataverseAuthenticatedUser.class)
+                    .setParameter("identifier", username)
+                    .getSingleResult();
+        } catch (Exception e) {
+            logger.debugf("Could not find authenticated user by username: %s", username);
+            return null;
+        }
+    }
+}
diff --git a/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/services/PasswordEncryption.java b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/services/PasswordEncryption.java
new file mode 100644
index 00000000000..f8ecd4232b3
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/services/PasswordEncryption.java
@@ -0,0 +1,86 @@
+package edu.harvard.iq.keycloak.auth.spi.services;
+
+import org.mindrot.jbcrypt.BCrypt;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+
+/**
+ * Password encryption, supporting multiple encryption algorithms to
+ * allow migrations between them.
+ * <p>
+ * When adding a new password hashing algorithm, implement the {@link Algorithm}
+ * interface, and add an instance of the implementation as the last element
+ * of the {@link #algorithms} array. The rest should pretty much happen automatically
+ * (e.g system will detect outdated passwords for users and initiate the password reset breakout).
+ *
+ * NOTE: This class is a copy of the one in
+ * {@code edu.harvard.iq.dataverse.authorization.providers.builtin}
+ * within the Dataverse application and must stay in sync with it.
+ *
+ * @author Ellen Kraffmiller
+ * @author Michael Bar-Sinai
+ */
+public final class PasswordEncryption implements java.io.Serializable {
+
+    public interface Algorithm {
+        boolean check(String plainText, String hashed);
+    }
+
+    /**
+     * The SHA algorithm, now considered not secure enough.
+     */
+    private static final Algorithm SHA = new Algorithm() {
+
+        private String encrypt(String plainText) {
+            try {
+                MessageDigest md = MessageDigest.getInstance("SHA");
+                md.update(plainText.getBytes(StandardCharsets.UTF_8));
+                byte[] raw = md.digest();
+                return Base64.getEncoder().encodeToString(raw);
+
+            } catch (NoSuchAlgorithmException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public boolean check(String plainText, String hashed) {
+            return hashed.equals(encrypt(plainText));
+        }
+    };
+
+    /**
+     * BCrypt, using a complexity factor of 10 (considered safe by 2015 standards).
+     */
+    private static final Algorithm BCRYPT_10 = new Algorithm() {
+
+        @Override
+        public boolean check(String plainText, String hashed) {
+            try {
+                return BCrypt.checkpw(plainText, hashed);
+            } catch (IllegalArgumentException iae) {
+                // the password was probably not hashed using bcrypt.
+                return false;
+            }
+        }
+    };
+
+    private static final Algorithm[] algorithms;
+
+    static {
+        algorithms = new Algorithm[]{SHA, BCRYPT_10};
+    }
+
+    /**
+     * Prevent people instantiating this class.
+     */
+    private PasswordEncryption() {
+    }
+
+    public static Algorithm getVersion(int i) {
+        return algorithms[i];
+    }
+}
diff --git a/conf/keycloak/builtin-users-spi/src/main/resources/META-INF/beans.xml b/conf/keycloak/builtin-users-spi/src/main/resources/META-INF/beans.xml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/conf/keycloak/builtin-users-spi/src/main/resources/META-INF/persistence.xml b/conf/keycloak/builtin-users-spi/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 00000000000..f5134f48986
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
+             version="3.0">
+    <persistence-unit name="user-store" transaction-type="JTA">
+        <class>edu.harvard.iq.keycloak.auth.spi.models.DataverseBuiltinUser</class>
+        <class>edu.harvard.iq.keycloak.auth.spi.models.DataverseAuthenticatedUser</class>
+        <properties>
+            <!-- Set the Hibernate dialect for PostgreSQL -->
+            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
+
+            <!-- JDBC connection settings -->
+            <property name="hibernate.connection.datasource" value="user-store"/>
+
+            <!-- Transaction management settings -->
+            <property name="jakarta.persistence.transactionType" value="JTA"/>
+
+            <!-- Automatically update database schema -->
+            <property name="hibernate.hbm2ddl.auto" value="none"/>
+
+            <!-- Disable SQL logging -->
+            <property name="hibernate.show_sql" value="false"/>
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="user-store-qa" transaction-type="JTA">
+        <class>edu.harvard.iq.keycloak.auth.spi.models.DataverseBuiltinUser</class>
+        <class>edu.harvard.iq.keycloak.auth.spi.models.DataverseAuthenticatedUser</class>
+        <properties>
+            <!-- Set the Hibernate dialect for PostgreSQL -->
+            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
+
+            <!-- JDBC connection settings -->
+            <property name="hibernate.connection.datasource" value="user-store-qa"/>
+
+            <!-- Transaction management settings -->
+            <property name="jakarta.persistence.transactionType" value="JTA"/>
+
+            <!-- Automatically update database schema -->
+            <property name="hibernate.hbm2ddl.auto" value="none"/>
+
+            <!-- Disable SQL logging -->
+            <property name="hibernate.show_sql" value="false"/>
+        </properties>
+    </persistence-unit>
+</persistence>
diff --git a/conf/keycloak/builtin-users-spi/src/main/resources/META-INF/services/org.keycloak.storage.UserStorageProviderFactory b/conf/keycloak/builtin-users-spi/src/main/resources/META-INF/services/org.keycloak.storage.UserStorageProviderFactory
new file mode 100644
index 00000000000..4ec99f734db
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/main/resources/META-INF/services/org.keycloak.storage.UserStorageProviderFactory
@@ -0,0 +1 @@
+edu.harvard.iq.keycloak.auth.spi.providers.DataverseUserStorageProviderFactory
\ No newline at end of file
diff --git a/conf/keycloak/builtin-users-spi/src/test/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseAuthenticationServiceTest.java b/conf/keycloak/builtin-users-spi/src/test/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseAuthenticationServiceTest.java
new file mode 100644
index 00000000000..35f37973b71
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/test/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseAuthenticationServiceTest.java
@@ -0,0 +1,64 @@
+package edu.harvard.iq.keycloak.auth.spi.services;
+
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseBuiltinUser;
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseUser;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+class DataverseAuthenticationServiceTest {
+
+    private DataverseUserService dataverseUserServiceMock;
+    private PasswordEncryption.Algorithm passwordEncryptionAlgorithmMock;
+    private DataverseAuthenticationService sut;
+
+    @BeforeEach
+    void setUp() {
+        dataverseUserServiceMock = mock(DataverseUserService.class);
+        passwordEncryptionAlgorithmMock = mock(PasswordEncryption.Algorithm.class);
+        sut = new DataverseAuthenticationService(dataverseUserServiceMock, passwordEncryptionAlgorithmMock);
+    }
+
+    @Test
+    void canLogInAsBuiltinUser_userFoundByUsername_validCredentials() {
+        setupUserMock("username", true, true);
+        assertTrue(sut.canLogInAsBuiltinUser("username", "password"));
+    }
+
+    @Test
+    void canLogInAsBuiltinUser_userFoundByUsername_invalidCredentials() {
+        setupUserMock("username", true, false);
+        assertFalse(sut.canLogInAsBuiltinUser("username", "password"));
+    }
+
+    @Test
+    void canLogInAsBuiltinUser_userFoundByEmail_validCredentials() {
+        setupUserMock("user@dataverse.org", false, true);
+        assertTrue(sut.canLogInAsBuiltinUser("user@dataverse.org", "password"));
+    }
+
+    @Test
+    void canLogInAsBuiltinUser_userFoundByEmail_invalidCredentials() {
+        setupUserMock("user@dataverse.org", false, false);
+        assertFalse(sut.canLogInAsBuiltinUser("user@dataverse.org", "password"));
+    }
+
+    private void setupUserMock(String identifier, boolean foundByUsername, boolean validPassword) {
+        String encryptedPassword = "encryptedPassword";
+        DataverseUser dataverseUserMock = mock(DataverseUser.class);
+        DataverseBuiltinUser dataverseBuiltinUser = new DataverseBuiltinUser();
+        dataverseBuiltinUser.setEncryptedPassword(encryptedPassword);
+
+        when(dataverseUserMock.getBuiltinUser()).thenReturn(dataverseBuiltinUser);
+        when(passwordEncryptionAlgorithmMock.check(anyString(), eq(encryptedPassword))).thenReturn(validPassword);
+
+        if (foundByUsername) {
+            when(dataverseUserServiceMock.getUserByUsername(identifier)).thenReturn(dataverseUserMock);
+        } else {
+            when(dataverseUserServiceMock.getUserByUsername(identifier)).thenReturn(null);
+            when(dataverseUserServiceMock.getUserByEmail(identifier)).thenReturn(dataverseUserMock);
+        }
+    }
+}
diff --git a/conf/keycloak/builtin-users-spi/src/test/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseUserServiceTest.java b/conf/keycloak/builtin-users-spi/src/test/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseUserServiceTest.java
new file mode 100644
index 00000000000..5f4de20f074
--- /dev/null
+++ b/conf/keycloak/builtin-users-spi/src/test/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseUserServiceTest.java
@@ -0,0 +1,150 @@
+package edu.harvard.iq.keycloak.auth.spi.services;
+
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseAuthenticatedUser;
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseBuiltinUser;
+import edu.harvard.iq.keycloak.auth.spi.models.DataverseUser;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.keycloak.connections.jpa.JpaConnectionProvider;
+import org.keycloak.models.KeycloakSession;
+
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class DataverseUserServiceTest {
+
+    private static final String TEST_USER_STORE = "user-store";
+
+    private EntityManager entityManagerMock;
+    private DataverseUserService sut;
+
+    @BeforeEach
+    void setUp() {
+        entityManagerMock = mock(EntityManager.class);
+        KeycloakSession sessionMock = mock(KeycloakSession.class);
+
+        JpaConnectionProvider jpaConnectionProviderMock = mock(JpaConnectionProvider.class);
+        when(sessionMock.getProvider(JpaConnectionProvider.class, TEST_USER_STORE)).thenReturn(jpaConnectionProviderMock);
+        when(jpaConnectionProviderMock.getEntityManager()).thenReturn(entityManagerMock);
+
+        sut = new DataverseUserService(sessionMock, TEST_USER_STORE);
+    }
+
+    @Test
+    void getUserById_userExists() {
+        String testUserId = "123";
+        String testUsername = "testuser";
+
+        DataverseBuiltinUser builtinUser = new DataverseBuiltinUser();
+        builtinUser.setId(1);
+        builtinUser.setUsername(testUsername);
+
+        when(entityManagerMock.find(DataverseBuiltinUser.class, "123")).thenReturn(builtinUser);
+        TypedQuery<DataverseAuthenticatedUser> authUserQuery = mock(TypedQuery.class);
+        when(entityManagerMock.createNamedQuery("DataverseAuthenticatedUser.findByIdentifier", DataverseAuthenticatedUser.class))
+                .thenReturn(authUserQuery);
+        when(authUserQuery.setParameter("identifier", testUsername)).thenReturn(authUserQuery);
+
+        DataverseAuthenticatedUser authUser = new DataverseAuthenticatedUser();
+        authUser.setUserIdentifier(testUsername);
+        when(authUserQuery.getSingleResult()).thenReturn(authUser);
+
+        DataverseUser user = sut.getUserById(testUserId);
+        assertNotNull(user);
+        assertEquals(testUsername, user.getBuiltinUser().getUsername());
+    }
+
+    @Test
+    void getUserById_userNotFound() {
+        when(entityManagerMock.find(DataverseBuiltinUser.class, "123")).thenReturn(null);
+        assertNull(sut.getUserById("123"));
+    }
+
+    @Test
+    void getUserByUsername_userExists() {
+        String testUsername = "testuser";
+
+        DataverseBuiltinUser builtinUser = new DataverseBuiltinUser();
+        builtinUser.setUsername(testUsername);
+        builtinUser.setId(1);
+
+        DataverseAuthenticatedUser authUser = new DataverseAuthenticatedUser();
+        authUser.setUserIdentifier(testUsername);
+
+        TypedQuery<DataverseBuiltinUser> builtinUserQuery = mock(TypedQuery.class);
+        TypedQuery<DataverseAuthenticatedUser> authUserQuery = mock(TypedQuery.class);
+
+        when(entityManagerMock.createNamedQuery("DataverseBuiltinUser.findByUsername", DataverseBuiltinUser.class))
+                .thenReturn(builtinUserQuery);
+        when(builtinUserQuery.setParameter("username", testUsername)).thenReturn(builtinUserQuery);
+        when(builtinUserQuery.getResultList()).thenReturn(Collections.singletonList(builtinUser));
+
+        when(entityManagerMock.createNamedQuery("DataverseAuthenticatedUser.findByIdentifier", DataverseAuthenticatedUser.class))
+                .thenReturn(authUserQuery);
+        when(authUserQuery.setParameter("identifier", testUsername)).thenReturn(authUserQuery);
+        when(authUserQuery.getSingleResult()).thenReturn(authUser);
+
+        DataverseUser user = sut.getUserByUsername(testUsername);
+        assertNotNull(user);
+        assertEquals(testUsername, user.getBuiltinUser().getUsername());
+    }
+
+    @Test
+    void getUserByUsername_userNotFound() {
+        TypedQuery<DataverseBuiltinUser> query = mock(TypedQuery.class);
+        when(entityManagerMock.createNamedQuery("DataverseBuiltinUser.findByUsername", DataverseBuiltinUser.class))
+                .thenReturn(query);
+        when(query.setParameter("username", "unknown")).thenReturn(query);
+        when(query.getResultList()).thenReturn(Collections.emptyList());
+
+        assertNull(sut.getUserByUsername("unknown"));
+    }
+
+    @Test
+    void getUserByEmail_userExists() {
+        String testEmail = "test@dataverse.org";
+        String testUsername = "testuser";
+
+        DataverseAuthenticatedUser authUser = new DataverseAuthenticatedUser();
+        authUser.setEmail(testEmail);
+        authUser.setId(1);
+        authUser.setUserIdentifier(testUsername);
+
+        DataverseBuiltinUser builtinUser = new DataverseBuiltinUser();
+        builtinUser.setUsername(testUsername);
+        builtinUser.setId(1);
+
+        TypedQuery<DataverseAuthenticatedUser> authUserQuery = mock(TypedQuery.class);
+        TypedQuery<DataverseBuiltinUser> builtinUserQuery = mock(TypedQuery.class);
+
+        when(entityManagerMock.createNamedQuery("DataverseAuthenticatedUser.findByEmail", DataverseAuthenticatedUser.class))
+                .thenReturn(authUserQuery);
+        when(authUserQuery.setParameter("email", testEmail)).thenReturn(authUserQuery);
+        when(authUserQuery.getResultList()).thenReturn(Collections.singletonList(authUser));
+
+        when(entityManagerMock.createNamedQuery("DataverseBuiltinUser.findByUsername", DataverseBuiltinUser.class))
+                .thenReturn(builtinUserQuery);
+        when(builtinUserQuery.setParameter("username", testUsername)).thenReturn(builtinUserQuery);
+        when(builtinUserQuery.getResultList()).thenReturn(Collections.singletonList(builtinUser));
+
+        DataverseUser user = sut.getUserByEmail(testEmail);
+        assertNotNull(user);
+        assertEquals(testUsername, user.getBuiltinUser().getUsername());
+    }
+
+    @Test
+    void getUserByEmail_userNotFound() {
+        TypedQuery<DataverseAuthenticatedUser> query = mock(TypedQuery.class);
+        when(entityManagerMock.createNamedQuery("DataverseAuthenticatedUser.findByEmail", DataverseAuthenticatedUser.class))
+                .thenReturn(query);
+        when(query.setParameter("email", "unknown@dataverse.org")).thenReturn(query);
+        when(query.getResultList()).thenReturn(Collections.emptyList());
+
+        assertNull(sut.getUserByEmail("unknown@dataverse.org"));
+    }
+}
diff --git a/conf/keycloak/docker-compose-dev.yml b/conf/keycloak/docker-compose-dev.yml
new file mode 100644
index 00000000000..7356161ec47
--- /dev/null
+++ b/conf/keycloak/docker-compose-dev.yml
@@ -0,0 +1,318 @@
+# This file is designed for testing Keycloak authentication using the
+# Dataverse Builtin Users SPI.
+#
+# Keycloak is deployed using a custom-built image, defined by a Dockerfile
+# located in this directory. This allows for a controlled
+# and flexible development setup. Note that this image is currently
+# intended for development and testing purposes only and should be used
+# accordingly in non-production environments.
+
+version: "2.4"
+
+services:
+
+  dev_dataverse:
+    container_name: "dev_dataverse"
+    hostname: dataverse
+    image: ${APP_IMAGE}
+    restart: on-failure
+    user: payara
+    environment:
+      DATAVERSE_DB_HOST: postgres
+      DATAVERSE_DB_PASSWORD: secret
+      DATAVERSE_DB_USER: ${DATAVERSE_DB_USER}
+      ENABLE_JDWP: "1"
+      ENABLE_RELOAD: "1"
+      SKIP_DEPLOY: "${SKIP_DEPLOY}"
+      DATAVERSE_JSF_REFRESH_PERIOD: "1"
+      DATAVERSE_FEATURE_API_BEARER_AUTH: "1"
+      DATAVERSE_FEATURE_INDEX_HARVESTED_METADATA_SOURCE: "1"
+      DATAVERSE_FEATURE_API_BEARER_AUTH_PROVIDE_MISSING_CLAIMS: "1"
+      DATAVERSE_FEATURE_API_BEARER_AUTH_USE_BUILTIN_USER_ON_ID_MATCH: "1"
+      DATAVERSE_MAIL_SYSTEM_EMAIL: "dataverse@localhost"
+      DATAVERSE_MAIL_MTA_HOST: "smtp"
+      DATAVERSE_AUTH_OIDC_ENABLED: "1"
+      DATAVERSE_AUTH_OIDC_CLIENT_ID: test
+      DATAVERSE_AUTH_OIDC_CLIENT_SECRET: 94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8
+      DATAVERSE_AUTH_OIDC_AUTH_SERVER_URL: http://keycloak.mydomain.com:8090/realms/test
+      DATAVERSE_SPI_EXPORTERS_DIRECTORY: "/dv/exporters"
+      # These two oai settings are here to get HarvestingServerIT to pass
+      dataverse_oai_server_maxidentifiers: "2"
+      dataverse_oai_server_maxrecords: "2"
+      JVM_ARGS: -Ddataverse.files.storage-driver-id=file1
+        -Ddataverse.files.file1.type=file
+        -Ddataverse.files.file1.label=Filesystem
+        -Ddataverse.files.file1.directory=${STORAGE_DIR}/store
+        -Ddataverse.files.localstack1.type=s3
+        -Ddataverse.files.localstack1.label=LocalStack
+        -Ddataverse.files.localstack1.custom-endpoint-url=http://localstack:4566
+        -Ddataverse.files.localstack1.custom-endpoint-region=us-east-2
+        -Ddataverse.files.localstack1.bucket-name=mybucket
+        -Ddataverse.files.localstack1.path-style-access=true
+        -Ddataverse.files.localstack1.upload-redirect=true
+        -Ddataverse.files.localstack1.download-redirect=true
+        -Ddataverse.files.localstack1.access-key=default
+        -Ddataverse.files.localstack1.secret-key=default
+        -Ddataverse.files.minio1.type=s3
+        -Ddataverse.files.minio1.label=MinIO
+        -Ddataverse.files.minio1.custom-endpoint-url=http://minio:9000
+        -Ddataverse.files.minio1.custom-endpoint-region=us-east-1
+        -Ddataverse.files.minio1.bucket-name=mybucket
+        -Ddataverse.files.minio1.path-style-access=true
+        -Ddataverse.files.minio1.upload-redirect=false
+        -Ddataverse.files.minio1.download-redirect=false
+        -Ddataverse.files.minio1.access-key=4cc355_k3y
+        -Ddataverse.files.minio1.secret-key=s3cr3t_4cc355_k3y
+        -Ddataverse.pid.providers=fake
+        -Ddataverse.pid.default-provider=fake
+        -Ddataverse.pid.fake.type=FAKE
+        -Ddataverse.pid.fake.label=FakeDOIProvider
+        -Ddataverse.pid.fake.authority=10.5072
+        -Ddataverse.pid.fake.shoulder=FK2/
+        #-Ddataverse.lang.directory=/dv/lang
+    ports:
+      - "8080:8080" # HTTP (Dataverse Application)
+      - "4949:4848" # HTTPS (Payara Admin Console)
+      - "9009:9009" # JDWP
+      - "8686:8686" # JMX
+    networks:
+      - dataverse
+    depends_on:
+      - dev_postgres
+      - dev_solr
+      - dev_dv_initializer
+    volumes:
+      - ./docker-dev-volumes/app/data:/dv
+      - ./docker-dev-volumes/app/secrets:/secrets
+      - ../../target/dataverse:/opt/payara/deployments/dataverse:ro
+    tmpfs:
+      - /dumps:mode=770,size=2052M,uid=1000,gid=1000
+      - /tmp:mode=770,size=2052M,uid=1000,gid=1000
+    mem_limit: 2147483648 # 2 GiB
+    mem_reservation: 1024m
+    privileged: false
+
+  dev_bootstrap:
+    container_name: "dev_bootstrap"
+    image: gdcc/configbaker:unstable
+    restart: "no"
+    command:
+      - bootstrap.sh
+      - dev
+    networks:
+      - dataverse
+    volumes:
+      - ./docker-dev-volumes/solr/data:/var/solr
+
+  dev_dv_initializer:
+    container_name: "dev_dv_initializer"
+    image: gdcc/configbaker:unstable
+    restart: "no"
+    command:
+      - sh
+      - -c
+      - "fix-fs-perms.sh dv"
+    volumes:
+      - ./docker-dev-volumes/app/data:/dv
+
+  dev_postgres:
+    container_name: "dev_postgres"
+    hostname: postgres
+    image: postgres:${POSTGRES_VERSION}
+    restart: on-failure
+    environment:
+      - POSTGRES_USER=${DATAVERSE_DB_USER}
+      - POSTGRES_PASSWORD=secret
+    ports:
+      - "5432:5432"
+    networks:
+      - dataverse
+    volumes:
+      - ./docker-dev-volumes/postgresql/data:/var/lib/postgresql/data
+
+  dev_solr_initializer:
+    container_name: "dev_solr_initializer"
+    image: gdcc/configbaker:unstable
+    restart: "no"
+    command:
+      - sh
+      - -c
+      - "fix-fs-perms.sh solr && cp -a /template/* /solr-template"
+    volumes:
+      - ./docker-dev-volumes/solr/data:/var/solr
+      - ./docker-dev-volumes/solr/conf:/solr-template
+
+  dev_solr:
+    container_name: "dev_solr"
+    hostname: "solr"
+    image: solr:${SOLR_VERSION}
+    depends_on:
+      - dev_solr_initializer
+    restart: on-failure
+    ports:
+      - "8983:8983"
+    networks:
+      - dataverse
+    command:
+      - "solr-precreate"
+      - "collection1"
+      - "/template"
+    volumes:
+      - ./docker-dev-volumes/solr/data:/var/solr
+      - ./docker-dev-volumes/solr/conf:/template
+
+  dev_smtp:
+    container_name: "dev_smtp"
+    hostname: "smtp"
+    image: maildev/maildev:2.0.5
+    restart: on-failure
+    ports:
+      - "25:25" # smtp server
+      - "1080:1080" # web ui
+    environment:
+      - MAILDEV_SMTP_PORT=25
+      - MAILDEV_MAIL_DIRECTORY=/mail
+    networks:
+      - dataverse
+    #volumes:
+    #  - ./docker-dev-volumes/smtp/data:/mail
+    tmpfs:
+      - /mail:mode=770,size=128M,uid=1000,gid=1000
+
+  dev_keycloak:
+    container_name: "dev_keycloak"
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: gdcc/keycloak
+    hostname: keycloak
+    environment:
+      - KEYCLOAK_ADMIN=kcadmin
+      - KEYCLOAK_ADMIN_PASSWORD=kcpassword
+      - KEYCLOAK_LOGLEVEL=DEBUG
+      - KC_HOSTNAME_STRICT=false
+      - KC_DB=postgres
+      - KC_DB_URL=jdbc:postgresql://postgres:5432/dataverse
+      - KC_DB_USERNAME=${DATAVERSE_DB_USER}
+      - KC_DB_PASSWORD=secret
+      - DATAVERSE_DB_HOST=postgres
+      - DATAVERSE_DB_PORT=5432
+      - DATAVERSE_DB_USER=${DATAVERSE_DB_USER}
+      - DATAVERSE_DB_PASSWORD=secret
+      - DATAVERSE_BASE_URL=http://dataverse:8080
+    networks:
+      dataverse:
+        aliases:
+          - keycloak.mydomain.com #create a DNS alias within the network (add the same alias to your /etc/hosts to get a working OIDC flow)
+    command: start-dev --verbose --import-realm --http-port=8090  # change port to 8090, so within the network and external the same port is used
+    expose:
+      - "9000"
+    ports:
+      - "8090:8090"
+
+  dev_keycloak_initializer:
+    image: alpine:latest
+    container_name: "dev_keycloak_initializer"
+    depends_on:
+      - dev_keycloak
+    environment:
+      - KEYCLOAK_ADMIN=kcadmin
+      - KEYCLOAK_ADMIN_PASSWORD=kcpassword
+    volumes:
+      - ./setup-spi.sh:/usr/local/bin/setup-spi.sh
+    command: [ "/bin/sh", "-c", "apk add --no-cache curl jq && /usr/local/bin/setup-spi.sh" ]
+    networks:
+      - dataverse
+
+  # This proxy configuration is only intended to be used for development purposes!
+  # DO NOT USE IN PRODUCTION! HIGH SECURITY RISK!
+  dev_proxy:
+    image: caddy:2-alpine
+    # The command below is enough to enable using the admin gui, but it will not rewrite location headers to HTTP.
+    # To achieve rewriting from https:// to http://, we need a simple configuration file
+    #command: ["caddy", "reverse-proxy", "-f", ":4848", "-t", "https://dataverse:4848", "--insecure"]
+    command: ["caddy", "run", "-c", "/Caddyfile"]
+    ports:
+      - "4848:4848" # Will expose Payara Admin Console (HTTPS) as HTTP
+    restart: always
+    volumes:
+      - ../proxy/Caddyfile:/Caddyfile:ro
+    depends_on:
+      - dev_dataverse
+    networks:
+      - dataverse
+
+  dev_localstack:
+    container_name: "dev_localstack"
+    hostname: "localstack"
+    image: localstack/localstack:2.3.2
+    restart: on-failure
+    ports:
+      - "127.0.0.1:4566:4566"
+    environment:
+      - DEBUG=${DEBUG-}
+      - DOCKER_HOST=unix:///var/run/docker.sock
+      - HOSTNAME_EXTERNAL=localstack
+    networks:
+      - dataverse
+    volumes:
+      - ../localstack:/etc/localstack/init/ready.d
+    tmpfs:
+      - /localstack:mode=770,size=128M,uid=1000,gid=1000
+
+  dev_minio:
+    container_name: "dev_minio"
+    hostname: "minio"
+    image: minio/minio
+    restart: on-failure
+    ports:
+      - "9000:9000"
+      - "9001:9001"
+    networks:
+      - dataverse
+    volumes:
+      - ./docker-dev-volumes/minio_storage:/data
+    environment:
+      MINIO_ROOT_USER: 4cc355_k3y
+      MINIO_ROOT_PASSWORD: s3cr3t_4cc355_k3y
+    command: server /data
+
+  previewers-provider:
+    container_name: previewers-provider
+    hostname: previewers-provider
+    image: trivadis/dataverse-previewers-provider:latest
+    ports:
+      - "9080:9080"
+    networks:
+      - dataverse
+    environment:
+      # have nginx match the port we run previewers on
+      - NGINX_HTTP_PORT=9080
+      - PREVIEWERS_PROVIDER_URL=http://localhost:9080
+      - VERSIONS="v1.4,betatest"
+    # https://docs.docker.com/reference/compose-file/services/#platform
+    # https://github.com/fabric8io/docker-maven-plugin/issues/1750
+    platform: linux/amd64
+
+  register-previewers:
+    container_name: register-previewers
+    hostname: register-previewers
+    image: trivadis/dataverse-deploy-previewers:latest
+    networks:
+      - dataverse
+    environment:
+      - DATAVERSE_URL=http://dataverse:8080
+      - TIMEOUT=10m
+      - PREVIEWERS_PROVIDER_URL=http://localhost:9080
+      # Uncomment to specify which previewers you want. Otherwise you get all of them.
+      #- INCLUDE_PREVIEWERS=text,html,pdf,csv,comma-separated-values,tsv,tab-separated-values,jpeg,png,gif,markdown,x-markdown
+      - EXCLUDE_PREVIEWERS=
+      - REMOVE_EXISTING=true
+    command:
+      - deploy
+    restart: "no"
+    platform: linux/amd64
+
+networks:
+  dataverse:
+    driver: bridge
diff --git a/conf/keycloak/docker-compose.yml b/conf/keycloak/docker-compose.yml
new file mode 100644
index 00000000000..4b5cf80daca
--- /dev/null
+++ b/conf/keycloak/docker-compose.yml
@@ -0,0 +1,17 @@
+version: "3.9"
+
+services:
+
+  keycloak:
+    image: 'quay.io/keycloak/keycloak:26.3.2'
+    command:
+      - "start-dev"
+      - "--import-realm"
+    environment:
+      - KEYCLOAK_ADMIN=kcadmin
+      - KEYCLOAK_ADMIN_PASSWORD=kcpassword
+      - KEYCLOAK_LOGLEVEL=DEBUG
+    ports:
+      - "8090:8080"
+    volumes:
+      - './test-realm.json:/opt/keycloak/data/import/test-realm.json'
diff --git a/conf/keycloak/oidc-keycloak-auth-provider.json b/conf/keycloak/oidc-keycloak-auth-provider.json
new file mode 100644
index 00000000000..7e01bd4c325
--- /dev/null
+++ b/conf/keycloak/oidc-keycloak-auth-provider.json
@@ -0,0 +1,8 @@
+{
+  "id": "oidc-keycloak",
+  "factoryAlias": "oidc",
+  "title": "OIDC-Keycloak",
+  "subtitle": "OIDC-Keycloak",
+  "factoryData": "type: oidc | issuer: http://keycloak.mydomain.com:8090/realms/test | clientId: test | clientSecret: 94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8",
+  "enabled": true
+}
diff --git a/conf/keycloak/rm-keycloak.sh b/conf/keycloak/rm-keycloak.sh
new file mode 100755
index 00000000000..ea29fbb37c0
--- /dev/null
+++ b/conf/keycloak/rm-keycloak.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+if [ "$(docker ps -aq -f name=^/keycloak$)" ]; then
+  if [ "$(docker ps -aq -f status=running -f name=^/keycloak$)" ]; then
+    docker kill keycloak
+  fi
+  docker rm keycloak
+  echo "INFO - Keycloak container removed"
+else
+  echo "INFO - No Keycloak container available to remove"
+fi
diff --git a/conf/keycloak/run-keycloak.sh b/conf/keycloak/run-keycloak.sh
new file mode 100755
index 00000000000..9ea34a99416
--- /dev/null
+++ b/conf/keycloak/run-keycloak.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+DOCKER_IMAGE="quay.io/keycloak/keycloak:26.3.2"
+KEYCLOAK_USER="kcadmin"
+KEYCLOAK_PASSWORD="kcpassword"
+KEYCLOAK_PORT=8090
+
+if [ ! "$(docker ps -q -f name=^/keycloak$)" ]; then
+  if [ "$(docker ps -aq -f status=exited -f name=^/keycloak$)" ]; then
+    echo "INFO - An exited Keycloak container already exists, restarting..."
+    docker start keycloak
+    echo "INFO - Keycloak container restarted"
+  else
+    docker run -d --name keycloak -p $KEYCLOAK_PORT:8080 -e KEYCLOAK_USER=$KEYCLOAK_USER -e KEYCLOAK_PASSWORD=$KEYCLOAK_PASSWORD -e KEYCLOAK_IMPORT=/tmp/test-realm.json -v "$(pwd)"/test-realm.json:/tmp/test-realm.json $DOCKER_IMAGE
+    echo "INFO - Keycloak container created and running"
+  fi
+else
+  echo "INFO - Keycloak container is already running"
+fi
diff --git a/conf/keycloak/setup-spi.sh b/conf/keycloak/setup-spi.sh
new file mode 100755
index 00000000000..12fac19fc01
--- /dev/null
+++ b/conf/keycloak/setup-spi.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+echo "Waiting for Keycloak to be fully up..."
+
+# Loop until the health check returns 200
+while true; do
+  RESPONSE=$(curl -s -w "\n%{http_code}" "http://keycloak:9000/health")
+  HTTP_BODY=$(echo "$RESPONSE" | head -n -1)   # Extract response body
+  HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)    # Extract HTTP status code
+
+  if [ "$HTTP_CODE" -eq 200 ]; then
+    echo "Keycloak is up! (HTTP $HTTP_CODE)"
+    break
+  else
+    echo "Health check failed (HTTP $HTTP_CODE). Response: $HTTP_BODY"
+    sleep 5
+  fi
+done
+
+echo "Keycloak is up and running! Executing SPI setup script..."
+
+# Obtain admin token
+ADMIN_TOKEN=$(curl -s -X POST "http://keycloak:8090/realms/master/protocol/openid-connect/token" \
+  -H "Content-Type: application/x-www-form-urlencoded" \
+  -d "username=$KEYCLOAK_ADMIN" \
+  -d "password=$KEYCLOAK_ADMIN_PASSWORD" \
+  -d "grant_type=password" \
+  -d "client_id=admin-cli" | jq -r .access_token)
+
+# Create user storage provider using the components endpoint
+curl -X POST "http://keycloak:8090/admin/realms/test/components" \
+  -H "Authorization: Bearer $ADMIN_TOKEN" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "name": "Dataverse built-in users authentication",
+    "providerId": "dv-builtin-users-authenticator",
+    "providerType": "org.keycloak.storage.UserStorageProvider",
+    "parentId": null,
+    "config": {
+      "datasource": ["user-store"]
+    }
+  }'
+
+echo "Keycloak SPI configured in realm."
diff --git a/conf/keycloak/test-realm-include-spi.json b/conf/keycloak/test-realm-include-spi.json
new file mode 100644
index 00000000000..3ab6ac2477e
--- /dev/null
+++ b/conf/keycloak/test-realm-include-spi.json
@@ -0,0 +1,2383 @@
+{
+  "id": "80a7e04b-a2b5-4891-a2d1-5ad4e915f983",
+  "realm": "test",
+  "displayName": "",
+  "displayNameHtml": "",
+  "notBefore": 0,
+  "defaultSignatureAlgorithm": "RS256",
+  "revokeRefreshToken": false,
+  "refreshTokenMaxReuse": 0,
+  "accessTokenLifespan": 300,
+  "accessTokenLifespanForImplicitFlow": 900,
+  "ssoSessionIdleTimeout": 1800,
+  "ssoSessionMaxLifespan": 36000,
+  "ssoSessionIdleTimeoutRememberMe": 0,
+  "ssoSessionMaxLifespanRememberMe": 0,
+  "offlineSessionIdleTimeout": 2592000,
+  "offlineSessionMaxLifespanEnabled": false,
+  "offlineSessionMaxLifespan": 5184000,
+  "clientSessionIdleTimeout": 0,
+  "clientSessionMaxLifespan": 0,
+  "clientOfflineSessionIdleTimeout": 0,
+  "clientOfflineSessionMaxLifespan": 0,
+  "accessCodeLifespan": 60,
+  "accessCodeLifespanUserAction": 300,
+  "accessCodeLifespanLogin": 1800,
+  "actionTokenGeneratedByAdminLifespan": 43200,
+  "actionTokenGeneratedByUserLifespan": 300,
+  "oauth2DeviceCodeLifespan": 600,
+  "oauth2DevicePollingInterval": 5,
+  "enabled": true,
+  "sslRequired": "none",
+  "registrationAllowed": false,
+  "registrationEmailAsUsername": false,
+  "rememberMe": false,
+  "verifyEmail": false,
+  "loginWithEmailAllowed": true,
+  "duplicateEmailsAllowed": false,
+  "resetPasswordAllowed": false,
+  "editUsernameAllowed": false,
+  "bruteForceProtected": false,
+  "permanentLockout": false,
+  "maxTemporaryLockouts": 0,
+  "bruteForceStrategy": "MULTIPLE",
+  "maxFailureWaitSeconds": 900,
+  "minimumQuickLoginWaitSeconds": 60,
+  "waitIncrementSeconds": 60,
+  "quickLoginCheckMilliSeconds": 1000,
+  "maxDeltaTimeSeconds": 43200,
+  "failureFactor": 30,
+  "roles": {
+    "realm": [
+      {
+        "id": "075daee1-5ab2-44b5-adbf-fa49a3da8305",
+        "name": "uma_authorization",
+        "description": "${role_uma_authorization}",
+        "composite": false,
+        "clientRole": false,
+        "containerId": "80a7e04b-a2b5-4891-a2d1-5ad4e915f983",
+        "attributes": {}
+      },
+      {
+        "id": "b4ff9091-ddf9-4536-b175-8cfa3e331d71",
+        "name": "default-roles-test",
+        "description": "${role_default-roles}",
+        "composite": true,
+        "composites": {
+          "realm": [
+            "offline_access",
+            "uma_authorization"
+          ],
+          "client": {
+            "account": [
+              "view-profile",
+              "manage-account"
+            ]
+          }
+        },
+        "clientRole": false,
+        "containerId": "80a7e04b-a2b5-4891-a2d1-5ad4e915f983",
+        "attributes": {}
+      },
+      {
+        "id": "e6d31555-6be6-4dee-bc6a-40a53108e4c2",
+        "name": "offline_access",
+        "description": "${role_offline-access}",
+        "composite": false,
+        "clientRole": false,
+        "containerId": "80a7e04b-a2b5-4891-a2d1-5ad4e915f983",
+        "attributes": {}
+      }
+    ],
+    "client": {
+      "realm-management": [
+        {
+          "id": "1955bd12-5f86-4a74-b130-d68a8ef6f0ee",
+          "name": "impersonation",
+          "description": "${role_impersonation}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "1109c350-9ab1-426c-9876-ef67d4310f35",
+          "name": "view-authorization",
+          "description": "${role_view-authorization}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "980c3fd3-1ae3-4b8f-9a00-d764c939035f",
+          "name": "query-users",
+          "description": "${role_query-users}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "5363e601-0f9d-4633-a8c8-28cb0f859b7b",
+          "name": "query-groups",
+          "description": "${role_query-groups}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "59aa7992-ad78-48db-868a-25d6e1d7db50",
+          "name": "realm-admin",
+          "description": "${role_realm-admin}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "impersonation",
+                "view-authorization",
+                "query-users",
+                "query-groups",
+                "manage-clients",
+                "manage-realm",
+                "view-identity-providers",
+                "query-realms",
+                "manage-authorization",
+                "manage-identity-providers",
+                "manage-users",
+                "view-users",
+                "view-realm",
+                "create-client",
+                "view-clients",
+                "manage-events",
+                "query-clients",
+                "view-events"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "112f53c2-897d-4c01-81db-b8dc10c5b995",
+          "name": "manage-clients",
+          "description": "${role_manage-clients}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "c7f57bbd-ef32-4a64-9888-7b8abd90777a",
+          "name": "manage-realm",
+          "description": "${role_manage-realm}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "8885dac8-0af3-45af-94ce-eff5e801bb80",
+          "name": "view-identity-providers",
+          "description": "${role_view-identity-providers}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "2673346c-b0ef-4e01-8a90-be03866093af",
+          "name": "manage-authorization",
+          "description": "${role_manage-authorization}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "b7182885-9e57-445f-8dae-17c16eb31b5d",
+          "name": "manage-identity-providers",
+          "description": "${role_manage-identity-providers}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "ba7bfe0c-cb07-4a47-b92c-b8132b57e181",
+          "name": "manage-users",
+          "description": "${role_manage-users}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "13a8f0fc-647d-4bfe-b525-73956898e550",
+          "name": "query-realms",
+          "description": "${role_query-realms}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "ef4c57dc-78c2-4f9a-8d2b-0e97d46fc842",
+          "name": "view-realm",
+          "description": "${role_view-realm}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "2875da34-006c-4b7f-bfc8-9ae8e46af3a2",
+          "name": "view-users",
+          "description": "${role_view-users}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "query-users",
+                "query-groups"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "c8c8f7dc-876b-4263-806f-3329f7cd5fd3",
+          "name": "create-client",
+          "description": "${role_create-client}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "21b84f90-5a9a-4845-a7ba-bbd98ac0fcc4",
+          "name": "view-clients",
+          "description": "${role_view-clients}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "query-clients"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "6fd64c94-d663-4501-ad77-0dcf8887d434",
+          "name": "manage-events",
+          "description": "${role_manage-events}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "b321927a-023c-4d2a-99ad-24baf7ff6d83",
+          "name": "query-clients",
+          "description": "${role_query-clients}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "2fc21160-78de-457b-8594-e5c76cde1d5e",
+          "name": "view-events",
+          "description": "${role_view-events}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        }
+      ],
+      "test": [],
+      "security-admin-console": [],
+      "admin-cli": [],
+      "account-console": [],
+      "broker": [
+        {
+          "id": "07ee59b5-dca6-48fb-83d4-2994ef02850e",
+          "name": "read-token",
+          "description": "${role_read-token}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b57d62bb-77ff-42bd-b8ff-381c7288f327",
+          "attributes": {}
+        }
+      ],
+      "account": [
+        {
+          "id": "17d2f811-7bdf-4c73-83b4-1037001797b8",
+          "name": "view-applications",
+          "description": "${role_view-applications}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "f4999a71-d4c3-4d7c-afb0-ba522e457bd3",
+          "name": "view-groups",
+          "description": "${role_view-groups}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "d1ff44f9-419e-42fd-98e8-1add1169a972",
+          "name": "delete-account",
+          "description": "${role_delete-account}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "14c23a18-ae2d-43c9-b0c0-aaf6e0c7f5b0",
+          "name": "manage-account-links",
+          "description": "${role_manage-account-links}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "6fbe58af-d2fe-4d66-95fe-a2e8a818cb55",
+          "name": "view-profile",
+          "description": "${role_view-profile}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "bdfd02bc-6f6a-47d2-82bc-0ca52d78ff48",
+          "name": "manage-consent",
+          "description": "${role_manage-consent}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "account": [
+                "view-consent"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "782f3b0c-a17b-4a87-988b-1a711401f3b0",
+          "name": "manage-account",
+          "description": "${role_manage-account}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "account": [
+                "manage-account-links"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "8a3bfe15-66d9-4f3d-83ac-801d682d42b0",
+          "name": "view-consent",
+          "description": "${role_view-consent}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        }
+      ]
+    }
+  },
+  "groups": [
+    {
+      "id": "d46f94c2-3b47-4288-b937-9cf918e54f0a",
+      "name": "admins",
+      "path": "/admins",
+      "subGroups": [],
+      "attributes": {},
+      "realmRoles": [],
+      "clientRoles": {}
+    },
+    {
+      "id": "e992ce15-baac-48a0-8834-06f6fcf6c05b",
+      "name": "curators",
+      "path": "/curators",
+      "subGroups": [],
+      "attributes": {},
+      "realmRoles": [],
+      "clientRoles": {}
+    },
+    {
+      "id": "531cf81d-a700-4336-808f-37a49709b48c",
+      "name": "members",
+      "path": "/members",
+      "subGroups": [],
+      "attributes": {},
+      "realmRoles": [],
+      "clientRoles": {}
+    }
+  ],
+  "defaultRole": {
+    "id": "b4ff9091-ddf9-4536-b175-8cfa3e331d71",
+    "name": "default-roles-test",
+    "description": "${role_default-roles}",
+    "composite": true,
+    "clientRole": false,
+    "containerId": "80a7e04b-a2b5-4891-a2d1-5ad4e915f983"
+  },
+  "requiredCredentials": [
+    "password"
+  ],
+  "otpPolicyType": "totp",
+  "otpPolicyAlgorithm": "HmacSHA1",
+  "otpPolicyInitialCounter": 0,
+  "otpPolicyDigits": 6,
+  "otpPolicyLookAheadWindow": 1,
+  "otpPolicyPeriod": 30,
+  "otpPolicyCodeReusable": false,
+  "otpSupportedApplications": [
+    "totpAppFreeOTPName",
+    "totpAppGoogleName",
+    "totpAppMicrosoftAuthenticatorName"
+  ],
+  "localizationTexts": {},
+  "webAuthnPolicyRpEntityName": "keycloak",
+  "webAuthnPolicySignatureAlgorithms": [
+    "ES256"
+  ],
+  "webAuthnPolicyRpId": "",
+  "webAuthnPolicyAttestationConveyancePreference": "not specified",
+  "webAuthnPolicyAuthenticatorAttachment": "not specified",
+  "webAuthnPolicyRequireResidentKey": "not specified",
+  "webAuthnPolicyUserVerificationRequirement": "not specified",
+  "webAuthnPolicyCreateTimeout": 0,
+  "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
+  "webAuthnPolicyAcceptableAaguids": [],
+  "webAuthnPolicyExtraOrigins": [],
+  "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
+  "webAuthnPolicyPasswordlessSignatureAlgorithms": [
+    "ES256"
+  ],
+  "webAuthnPolicyPasswordlessRpId": "",
+  "webAuthnPolicyPasswordlessAttestationConveyancePreference": "not specified",
+  "webAuthnPolicyPasswordlessAuthenticatorAttachment": "not specified",
+  "webAuthnPolicyPasswordlessRequireResidentKey": "not specified",
+  "webAuthnPolicyPasswordlessUserVerificationRequirement": "not specified",
+  "webAuthnPolicyPasswordlessCreateTimeout": 0,
+  "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
+  "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+  "webAuthnPolicyPasswordlessExtraOrigins": [],
+  "scopeMappings": [
+    {
+      "clientScope": "offline_access",
+      "roles": [
+        "offline_access"
+      ]
+    }
+  ],
+  "clientScopeMappings": {
+    "account": [
+      {
+        "client": "account-console",
+        "roles": [
+          "manage-account",
+          "view-groups"
+        ]
+      }
+    ]
+  },
+  "clients": [
+    {
+      "id": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+      "clientId": "account",
+      "name": "${client_account}",
+      "rootUrl": "${authBaseUrl}",
+      "baseUrl": "/realms/test/account/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [
+        "/realms/test/account/*"
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "realm_client": "false",
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "roles",
+        "profile",
+        "basic",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "5d99f721-027c-478d-867d-61114e0a8192",
+      "clientId": "account-console",
+      "name": "${client_account-console}",
+      "rootUrl": "${authBaseUrl}",
+      "baseUrl": "/realms/test/account/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [
+        "/realms/test/account/*"
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "realm_client": "false",
+        "post.logout.redirect.uris": "+",
+        "pkce.code.challenge.method": "S256"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "e181a0ce-9a04-4468-a38a-aaef9f78f989",
+          "name": "audience resolve",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-audience-resolve-mapper",
+          "consentRequired": false,
+          "config": {}
+        }
+      ],
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "roles",
+        "profile",
+        "basic",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "5eccc178-121e-4d0f-bcb2-04ae3c2e52ed",
+      "clientId": "admin-cli",
+      "name": "${client_admin-cli}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": false,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "realm_client": "false",
+        "client.use.lightweight.access.token.enabled": "true",
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "roles",
+        "profile",
+        "basic",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "b57d62bb-77ff-42bd-b8ff-381c7288f327",
+      "clientId": "broker",
+      "name": "${client_broker}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": true,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "realm_client": "true",
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "roles",
+        "profile",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "dada0ae8-ee9f-415a-9685-42da7c563660",
+      "clientId": "realm-management",
+      "name": "${client_realm-management}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": true,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "realm_client": "true",
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "roles",
+        "profile",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "bf7cf550-3875-4f97-9878-b2419a854058",
+      "clientId": "security-admin-console",
+      "name": "${client_security-admin-console}",
+      "rootUrl": "${authAdminUrl}",
+      "baseUrl": "/admin/test/console/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [
+        "/admin/test/console/*"
+      ],
+      "webOrigins": [
+        "+"
+      ],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "realm_client": "false",
+        "client.use.lightweight.access.token.enabled": "true",
+        "post.logout.redirect.uris": "+",
+        "pkce.code.challenge.method": "S256"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "ff845e16-e200-4894-ab51-37d8b9f2a445",
+          "name": "locale",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "locale",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "locale",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        }
+      ],
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "roles",
+        "profile",
+        "basic",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "9c27faa8-4b8d-4ad9-9cd1-880032ef06aa",
+      "clientId": "test",
+      "name": "A Test Client",
+      "description": "Use for hacking and testing away a confidential client",
+      "rootUrl": "",
+      "adminUrl": "",
+      "baseUrl": "",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "secret": "94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8",
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [
+        "*"
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": true,
+      "protocol": "openid-connect",
+      "attributes": {
+        "realm_client": "false",
+        "oidc.ciba.grant.enabled": "false",
+        "client.secret.creation.time": "1684735831",
+        "backchannel.logout.session.required": "true",
+        "post.logout.redirect.uris": "+",
+        "display.on.consent.screen": "false",
+        "oauth2.device.authorization.grant.enabled": "false",
+        "backchannel.logout.revoke.offline.tokens": "false"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "protocolMappers": [
+        {
+          "id": "480de80c-656e-401c-b146-f777db45340b",
+          "name": "idp",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "introspection.token.claim": "true",
+            "userinfo.token.claim": "true",
+            "user.attribute": "idp",
+            "id.token.claim": "true",
+            "lightweight.claim": "false",
+            "access.token.claim": "true",
+            "claim.name": "idp",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "roles",
+        "profile",
+        "basic",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    }
+  ],
+  "clientScopes": [
+    {
+      "id": "72f29e57-92fa-437b-828c-2b9d6fe56192",
+      "name": "address",
+      "description": "OpenID Connect built-in scope: address",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "consent.screen.text": "${addressScopeConsentText}",
+        "display.on.consent.screen": "true"
+      },
+      "protocolMappers": [
+        {
+          "id": "59581aea-70d6-4ee8-bec2-1fea5fc497ae",
+          "name": "address",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-address-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute.formatted": "formatted",
+            "user.attribute.country": "country",
+            "user.attribute.postal_code": "postal_code",
+            "userinfo.token.claim": "true",
+            "user.attribute.street": "street",
+            "id.token.claim": "true",
+            "user.attribute.region": "region",
+            "access.token.claim": "true",
+            "user.attribute.locality": "locality"
+          }
+        }
+      ]
+    },
+    {
+      "id": "0f4cc9ba-5a00-429f-b90c-611734b324bc",
+      "name": "service_account",
+      "description": "Specific scope for a client enabled for service accounts",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "display.on.consent.screen": "false"
+      },
+      "protocolMappers": [
+        {
+          "id": "35d9b373-4794-4306-b264-336dfc37e726",
+          "name": "Client ID",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usersessionmodel-note-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.session.note": "client_id",
+            "id.token.claim": "true",
+            "introspection.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "client_id",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "4be0bf73-e37f-447d-9c65-caec81826c9b",
+          "name": "Client Host",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usersessionmodel-note-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.session.note": "clientHost",
+            "id.token.claim": "true",
+            "introspection.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "clientHost",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "179dc118-75cf-408d-9369-49bbde8557d3",
+          "name": "Client IP Address",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usersessionmodel-note-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.session.note": "clientAddress",
+            "id.token.claim": "true",
+            "introspection.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "clientAddress",
+            "jsonType.label": "String"
+          }
+        }
+      ]
+    },
+    {
+      "id": "33f9a8b9-c57b-4d08-ad64-f78649d6ea55",
+      "name": "basic",
+      "description": "OpenID Connect scope for add all basic claims to the token",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "display.on.consent.screen": "false"
+      },
+      "protocolMappers": [
+        {
+          "id": "f033292b-ae53-4ebd-a6b7-e51ee324a2a1",
+          "name": "auth_time",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usersessionmodel-note-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.session.note": "AUTH_TIME",
+            "id.token.claim": "true",
+            "introspection.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "auth_time",
+            "jsonType.label": "long"
+          }
+        },
+        {
+          "id": "12d4bacb-cac0-4cae-b033-22de18adcdd2",
+          "name": "sub",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-sub-mapper",
+          "consentRequired": false,
+          "config": {
+            "introspection.token.claim": "true",
+            "access.token.claim": "true"
+          }
+        }
+      ]
+    },
+    {
+      "id": "f515ec81-3c1b-4d4d-b7a2-e7e8d47b6447",
+      "name": "roles",
+      "description": "OpenID Connect scope for add user roles to the access token",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "consent.screen.text": "${rolesScopeConsentText}",
+        "display.on.consent.screen": "true"
+      },
+      "protocolMappers": [
+        {
+          "id": "26d299a8-69e2-4864-9595-17a5b417fc61",
+          "name": "realm roles",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-realm-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "foo",
+            "access.token.claim": "true",
+            "claim.name": "realm_access.roles",
+            "jsonType.label": "String",
+            "multivalued": "true"
+          }
+        },
+        {
+          "id": "d2998083-a8db-4f4e-9aaa-9cad68d65b97",
+          "name": "audience resolve",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-audience-resolve-mapper",
+          "consentRequired": false,
+          "config": {}
+        },
+        {
+          "id": "7a4cb2e5-07a0-4c16-a024-71df7ddd6868",
+          "name": "client roles",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-client-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "foo",
+            "access.token.claim": "true",
+            "claim.name": "resource_access.${client_id}.roles",
+            "jsonType.label": "String",
+            "multivalued": "true"
+          }
+        }
+      ]
+    },
+    {
+      "id": "8f1eafef-92d6-434e-b9ec-6edec1fddd0a",
+      "name": "offline_access",
+      "description": "OpenID Connect built-in scope: offline_access",
+      "protocol": "openid-connect",
+      "attributes": {
+        "consent.screen.text": "${offlineAccessScopeConsentText}",
+        "display.on.consent.screen": "true"
+      }
+    },
+    {
+      "id": "c03095aa-b656-447a-9767-0763c2ccb070",
+      "name": "acr",
+      "description": "OpenID Connect scope for add acr (authentication context class reference) to the token",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "display.on.consent.screen": "false"
+      },
+      "protocolMappers": [
+        {
+          "id": "948b230c-56d0-4000-937c-841cd395d3f9",
+          "name": "acr loa level",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-acr-mapper",
+          "consentRequired": false,
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        }
+      ]
+    },
+    {
+      "id": "cdf35f63-8ec7-41a0-ae12-f05d415818cc",
+      "name": "phone",
+      "description": "OpenID Connect built-in scope: phone",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "consent.screen.text": "${phoneScopeConsentText}",
+        "display.on.consent.screen": "true"
+      },
+      "protocolMappers": [
+        {
+          "id": "ba4348ff-90b1-4e09-89a8-e5c08b04d3d1",
+          "name": "phone number",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "phoneNumber",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "phone_number",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "e6cceae5-8392-4348-b302-f610ece6056e",
+          "name": "phone number verified",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "phoneNumberVerified",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "phone_number_verified",
+            "jsonType.label": "boolean",
+            "userinfo.token.claim": "true"
+          }
+        }
+      ]
+    },
+    {
+      "id": "4318001c-2970-41d3-91b9-e31c08569872",
+      "name": "email",
+      "description": "OpenID Connect built-in scope: email",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "consent.screen.text": "${emailScopeConsentText}",
+        "display.on.consent.screen": "true"
+      },
+      "protocolMappers": [
+        {
+          "id": "406d02a6-866a-4962-8838-e8c58ada1505",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "33baabc1-9bf2-42e4-8b8e-a53c13f0b744",
+          "name": "email verified",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "emailVerified",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email_verified",
+            "jsonType.label": "boolean",
+            "userinfo.token.claim": "true"
+          }
+        }
+      ]
+    },
+    {
+      "id": "5277a84f-d727-4c64-8432-d513127beee1",
+      "name": "profile",
+      "description": "OpenID Connect built-in scope: profile",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "consent.screen.text": "${profileScopeConsentText}",
+        "display.on.consent.screen": "true"
+      },
+      "protocolMappers": [
+        {
+          "id": "0a609875-2678-4056-93ef-dd5c03e6059d",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "7c510d18-07ee-4b78-8acd-24b777d11b3c",
+          "name": "website",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "website",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "website",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "0bb6d0ea-195f-49e8-918c-c419a26a661c",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "5f1e644c-1acf-440c-b1a6-b5f65bcebfd9",
+          "name": "profile",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "profile",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "profile",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "c710bdb2-6cfd-4f60-9c4e-730188fc62f7",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "012d5038-0e13-42ba-9df7-2487c8e2eead",
+          "name": "nickname",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "nickname",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "nickname",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "21590b19-517d-4b6d-92f6-d4f71238677e",
+          "name": "updated at",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "updatedAt",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "updated_at",
+            "jsonType.label": "long",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "e4cddca7-1360-42f3-9854-da6cbe00c71e",
+          "name": "birthdate",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "birthdate",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "birthdate",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "afee328f-c64c-43e6-80d0-be2721c2ed0e",
+          "name": "locale",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "locale",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "locale",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "780a1e2c-5b63-46f4-a5bf-dc3fd8ce0cbb",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": false,
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "aeebffff-f776-427e-83ed-064707ffce57",
+          "name": "zoneinfo",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "zoneinfo",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "zoneinfo",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "b3e840a2-1794-4da1-bf69-31905cbff0d6",
+          "name": "middle name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "middleName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "middle_name",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "0607e0e4-4f7f-4214-996d-3599772ce1c7",
+          "name": "picture",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "picture",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "picture",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "426a609b-4e28-4132-af0d-13297b8cb63a",
+          "name": "gender",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "gender",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "gender",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        }
+      ]
+    },
+    {
+      "id": "a1ebde82-ce21-438f-a3ad-261d3eeb1c01",
+      "name": "role_list",
+      "description": "SAML role list",
+      "protocol": "saml",
+      "attributes": {
+        "consent.screen.text": "${samlRoleListScopeConsentText}",
+        "display.on.consent.screen": "true"
+      },
+      "protocolMappers": [
+        {
+          "id": "64653ac7-7ffc-4f7c-a589-03e3b68bbd25",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        }
+      ]
+    },
+    {
+      "id": "aeb5b852-dfec-4e67-9d9e-104abe9b3bf2",
+      "name": "web-origins",
+      "description": "OpenID Connect scope for add allowed web origins to the access token",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "consent.screen.text": "",
+        "display.on.consent.screen": "false"
+      },
+      "protocolMappers": [
+        {
+          "id": "e2fa8437-a0f1-46fc-af9c-c40fc09cd6a1",
+          "name": "allowed web origins",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-allowed-origins-mapper",
+          "consentRequired": false,
+          "config": {}
+        }
+      ]
+    },
+    {
+      "id": "4fecd0d7-d4ad-457e-90f2-c7202bf01ff5",
+      "name": "microprofile-jwt",
+      "description": "Microprofile - JWT built-in scope",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "false"
+      },
+      "protocolMappers": [
+        {
+          "id": "a9536634-a9f6-4ed5-a8e7-8379d3b002ca",
+          "name": "upn",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "upn",
+            "jsonType.label": "String",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "2ce1a702-9458-4926-9b8a-f82c07215755",
+          "name": "groups",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-realm-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "multivalued": "true",
+            "userinfo.token.claim": "true",
+            "user.attribute": "foo",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "groups",
+            "jsonType.label": "String"
+          }
+        }
+      ]
+    }
+  ],
+  "defaultDefaultClientScopes": [
+    "role_list",
+    "profile",
+    "email",
+    "roles",
+    "web-origins",
+    "acr",
+    "basic"
+  ],
+  "defaultOptionalClientScopes": [
+    "offline_access",
+    "address",
+    "phone",
+    "microprofile-jwt"
+  ],
+  "browserSecurityHeaders": {
+    "contentSecurityPolicyReportOnly": "",
+    "xContentTypeOptions": "nosniff",
+    "referrerPolicy": "no-referrer",
+    "xRobotsTag": "none",
+    "xFrameOptions": "SAMEORIGIN",
+    "contentSecurityPolicy": "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
+    "xXSSProtection": "1; mode=block",
+    "strictTransportSecurity": "max-age=31536000; includeSubDomains"
+  },
+  "smtpServer": {},
+  "eventsEnabled": false,
+  "eventsListeners": [
+    "jboss-logging"
+  ],
+  "enabledEventTypes": [],
+  "adminEventsEnabled": false,
+  "adminEventsDetailsEnabled": false,
+  "identityProviders": [],
+  "identityProviderMappers": [],
+  "components": {
+    "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy": [
+      {
+        "id": "8115796f-8f1f-4d6a-88f8-ca2938451260",
+        "name": "Allowed Client Scopes",
+        "providerId": "allowed-client-templates",
+        "subType": "authenticated",
+        "subComponents": {},
+        "config": {
+          "allow-default-scopes": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "044bd055-714d-478e-aa93-303d2161c427",
+        "name": "Allowed Protocol Mapper Types",
+        "providerId": "allowed-protocol-mappers",
+        "subType": "authenticated",
+        "subComponents": {},
+        "config": {
+          "allowed-protocol-mapper-types": [
+            "saml-user-property-mapper",
+            "oidc-full-name-mapper",
+            "oidc-address-mapper",
+            "saml-user-attribute-mapper",
+            "saml-role-list-mapper",
+            "oidc-sha256-pairwise-sub-mapper",
+            "oidc-usermodel-property-mapper",
+            "oidc-usermodel-attribute-mapper"
+          ]
+        }
+      },
+      {
+        "id": "be465734-3b0f-4370-a144-73db756e23f8",
+        "name": "Allowed Protocol Mapper Types",
+        "providerId": "allowed-protocol-mappers",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "allowed-protocol-mapper-types": [
+            "saml-user-attribute-mapper",
+            "oidc-address-mapper",
+            "oidc-full-name-mapper",
+            "oidc-usermodel-property-mapper",
+            "oidc-sha256-pairwise-sub-mapper",
+            "saml-role-list-mapper",
+            "saml-user-property-mapper",
+            "oidc-usermodel-attribute-mapper"
+          ]
+        }
+      },
+      {
+        "id": "42a2f64d-ac9e-4221-9cf6-40ff8c868629",
+        "name": "Trusted Hosts",
+        "providerId": "trusted-hosts",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "host-sending-registration-request-must-match": [
+            "true"
+          ],
+          "client-uris-must-match": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "7ca08915-6c33-454c-88f2-20e1d6553b26",
+        "name": "Max Clients Limit",
+        "providerId": "max-clients",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "max-clients": [
+            "200"
+          ]
+        }
+      },
+      {
+        "id": "f01f2b6f-3f01-4d01-b2f4-70577c6f599c",
+        "name": "Allowed Client Scopes",
+        "providerId": "allowed-client-templates",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "allow-default-scopes": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "516d7f21-f21a-4690-831e-36ad313093b2",
+        "name": "Consent Required",
+        "providerId": "consent-required",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      },
+      {
+        "id": "c79df6a0-d4d8-4866-b9e6-8ddb5d1bd38e",
+        "name": "Full Scope Disabled",
+        "providerId": "scope",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      }
+    ],
+    "org.keycloak.storage.UserStorageProvider": [
+      {
+        "id": "6b14f48d-4b83-4d6e-bd8d-dc7541124927",
+        "name": "Dataverse built-in users authentication",
+        "providerId": "dv-builtin-users-authenticator",
+        "subComponents": {},
+        "config": {
+          "datasource": [
+            "user-store"
+          ]
+        }
+      }
+    ],
+    "org.keycloak.userprofile.UserProfileProvider": [
+      {
+        "id": "cf47a21f-c8fb-42f2-9bff-feca967db183",
+        "providerId": "declarative-user-profile",
+        "subComponents": {},
+        "config": {
+          "kc.user.profile.config": [
+            "{\"attributes\":[{\"name\":\"username\",\"displayName\":\"${username}\",\"validations\":{\"length\":{\"min\":3,\"max\":255},\"username-prohibited-characters\":{},\"up-username-not-idn-homograph\":{}},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"email\",\"displayName\":\"${email}\",\"validations\":{\"email\":{},\"length\":{\"max\":255}},\"required\":{\"roles\":[\"user\"]},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"firstName\",\"displayName\":\"${firstName}\",\"validations\":{\"length\":{\"max\":255},\"person-name-prohibited-characters\":{}},\"required\":{\"roles\":[\"user\"]},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"lastName\",\"displayName\":\"${lastName}\",\"validations\":{\"length\":{\"max\":255},\"person-name-prohibited-characters\":{}},\"required\":{\"roles\":[\"user\"]},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false}],\"groups\":[{\"name\":\"user-metadata\",\"displayHeader\":\"User metadata\",\"displayDescription\":\"Attributes, which refer to user metadata\"}],\"unmanagedAttributePolicy\":\"ENABLED\"}"
+          ]
+        }
+      }
+    ],
+    "org.keycloak.keys.KeyProvider": [
+      {
+        "id": "6b4a2281-a9e8-43ab-aee7-190ae91b2842",
+        "name": "aes-generated",
+        "providerId": "aes-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ]
+        }
+      },
+      {
+        "id": "68e2d2b0-4976-480f-ab76-f84a17686b05",
+        "name": "rsa-enc-generated",
+        "providerId": "rsa-enc-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ],
+          "algorithm": [
+            "RSA-OAEP"
+          ]
+        }
+      },
+      {
+        "id": "728769a3-99a4-4cca-959d-28181dfee7e8",
+        "name": "rsa-generated",
+        "providerId": "rsa-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ]
+        }
+      },
+      {
+        "id": "33274da1-1e5b-4190-bda4-5912dfde073b",
+        "name": "hmac-generated-hs512",
+        "providerId": "hmac-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ],
+          "algorithm": [
+            "HS512"
+          ]
+        }
+      },
+      {
+        "id": "f30af2d2-d042-43b8-bc6d-22f6bab6934c",
+        "name": "hmac-generated",
+        "providerId": "hmac-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ],
+          "algorithm": [
+            "HS256"
+          ]
+        }
+      }
+    ]
+  },
+  "internationalizationEnabled": false,
+  "authenticationFlows": [
+    {
+      "id": "94c65ba1-ba50-4be2-94c4-de656145eb67",
+      "alias": "Account verification options",
+      "description": "Method with which to verity the existing account",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-email-verification",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "Verify Existing Account by Re-authentication",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "9ea0b8f6-882c-45ad-9110-78adf5a5d233",
+      "alias": "Browser - Conditional OTP",
+      "description": "Flow to determine if the OTP is required for the authentication",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "99c5ba83-b585-4601-b740-1a26670bf4e9",
+      "alias": "Direct Grant - Conditional OTP",
+      "description": "Flow to determine if the OTP is required for the authentication",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "direct-grant-validate-otp",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "65b73dec-7dd1-4de8-b542-a023b7104afc",
+      "alias": "First broker login - Conditional OTP",
+      "description": "Flow to determine if the OTP is required for the authentication",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "9a26b76f-da95-43f1-8da3-16c4a0654f07",
+      "alias": "Handle Existing Account",
+      "description": "Handle what to do if there is existing account with same email/username like authenticated identity provider",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-confirm-link",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "Account verification options",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "0a77285e-d7d5-4b6c-aa9a-3eadb5e7e3d3",
+      "alias": "Reset - Conditional OTP",
+      "description": "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "reset-otp",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "cb6c0b3b-2f5f-4493-9d14-6130f8b58dd7",
+      "alias": "User creation or linking",
+      "description": "Flow for the existing/non-existing user alternatives",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticatorConfig": "create unique user config",
+          "authenticator": "idp-create-user-if-unique",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "Handle Existing Account",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "0fd3db1b-e93d-4768-82ca-a1498ddc11d0",
+      "alias": "Verify Existing Account by Re-authentication",
+      "description": "Reauthentication of existing account",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-username-password-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "First broker login - Conditional OTP",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "86610e70-f9f5-4c11-8a9e-9de1770565fb",
+      "alias": "browser",
+      "description": "browser based authentication",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-cookie",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "auth-spnego",
+          "authenticatorFlow": false,
+          "requirement": "DISABLED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "identity-provider-redirector",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 25,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "autheticatorFlow": true,
+          "flowAlias": "forms",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "f6aa23dd-8532-4d92-9780-3ea226481e3b",
+      "alias": "clients",
+      "description": "Base authentication for clients",
+      "providerId": "client-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "client-secret",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "client-jwt",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "client-secret-jwt",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "client-x509",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 40,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "4d2caf65-1703-4ddb-8890-70232e91bcd8",
+      "alias": "direct grant",
+      "description": "OpenID Connect Resource Owner Grant",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "direct-grant-validate-username",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "direct-grant-validate-password",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 30,
+          "autheticatorFlow": true,
+          "flowAlias": "Direct Grant - Conditional OTP",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "eaa20c41-5334-4fb4-8c45-fb9cc71f7f74",
+      "alias": "docker auth",
+      "description": "Used by Docker clients to authenticate against the IDP",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "docker-http-basic-authenticator",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "b9febfb1-f0aa-4590-b782-272a4aa11575",
+      "alias": "first broker login",
+      "description": "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticatorConfig": "review profile config",
+          "authenticator": "idp-review-profile",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "User creation or linking",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "03bb6ff4-eccb-4f2f-8953-3769f78c3bf3",
+      "alias": "forms",
+      "description": "Username, password, otp and other auth forms.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-username-password-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "Browser - Conditional OTP",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "1022f3c2-0469-41c9-861e-918908f103df",
+      "alias": "registration",
+      "description": "registration flow",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "registration-page-form",
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": true,
+          "flowAlias": "registration form",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "00d36c3b-e1dc-41f8-bfd0-5f8c80ea07e8",
+      "alias": "registration form",
+      "description": "registration form",
+      "providerId": "form-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "registration-user-creation",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "registration-password-action",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 50,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "registration-recaptcha-action",
+          "authenticatorFlow": false,
+          "requirement": "DISABLED",
+          "priority": 60,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "4374c16e-8c65-4168-94c2-df1ab3f3e6ad",
+      "alias": "reset credentials",
+      "description": "Reset credentials for a user if they forgot their password or something",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "reset-credentials-choose-user",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "reset-credential-email",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "reset-password",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 30,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 40,
+          "autheticatorFlow": true,
+          "flowAlias": "Reset - Conditional OTP",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "04d6ed6a-76c9-41fb-9074-bff8a80c2286",
+      "alias": "saml ecp",
+      "description": "SAML ECP Profile Authentication Flow",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "http-basic-authenticator",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    }
+  ],
+  "authenticatorConfig": [
+    {
+      "id": "e7bad67d-1236-430a-a327-9194f9d1e2b0",
+      "alias": "create unique user config",
+      "config": {
+        "require.password.update.after.registration": "false"
+      }
+    },
+    {
+      "id": "287b5989-a927-4cf5-8067-74594ce19bc1",
+      "alias": "review profile config",
+      "config": {
+        "update.profile.on.first.login": "missing"
+      }
+    }
+  ],
+  "requiredActions": [
+    {
+      "alias": "CONFIGURE_TOTP",
+      "name": "Configure OTP",
+      "providerId": "CONFIGURE_TOTP",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 10,
+      "config": {}
+    },
+    {
+      "alias": "TERMS_AND_CONDITIONS",
+      "name": "Terms and Conditions",
+      "providerId": "TERMS_AND_CONDITIONS",
+      "enabled": false,
+      "defaultAction": false,
+      "priority": 20,
+      "config": {}
+    },
+    {
+      "alias": "UPDATE_PASSWORD",
+      "name": "Update Password",
+      "providerId": "UPDATE_PASSWORD",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 30,
+      "config": {}
+    },
+    {
+      "alias": "UPDATE_PROFILE",
+      "name": "Update Profile",
+      "providerId": "UPDATE_PROFILE",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 40,
+      "config": {}
+    },
+    {
+      "alias": "VERIFY_EMAIL",
+      "name": "Verify Email",
+      "providerId": "VERIFY_EMAIL",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 50,
+      "config": {}
+    },
+    {
+      "alias": "delete_account",
+      "name": "Delete Account",
+      "providerId": "delete_account",
+      "enabled": false,
+      "defaultAction": false,
+      "priority": 60,
+      "config": {}
+    },
+    {
+      "alias": "webauthn-register",
+      "name": "Webauthn Register",
+      "providerId": "webauthn-register",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 70,
+      "config": {}
+    },
+    {
+      "alias": "webauthn-register-passwordless",
+      "name": "Webauthn Register Passwordless",
+      "providerId": "webauthn-register-passwordless",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 80,
+      "config": {}
+    },
+    {
+      "alias": "delete_credential",
+      "name": "Delete Credential",
+      "providerId": "delete_credential",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 100,
+      "config": {}
+    },
+    {
+      "alias": "idp_link",
+      "name": "Linking Identity Provider",
+      "providerId": "idp_link",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 110,
+      "config": {}
+    },
+    {
+      "alias": "update_user_locale",
+      "name": "Update User Locale",
+      "providerId": "update_user_locale",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 1000,
+      "config": {}
+    }
+  ],
+  "browserFlow": "browser",
+  "registrationFlow": "registration",
+  "directGrantFlow": "direct grant",
+  "resetCredentialsFlow": "reset credentials",
+  "clientAuthenticationFlow": "clients",
+  "dockerAuthenticationFlow": "docker auth",
+  "firstBrokerLoginFlow": "first broker login",
+  "attributes": {
+    "cibaBackchannelTokenDeliveryMode": "poll",
+    "cibaAuthRequestedUserHint": "login_hint",
+    "clientOfflineSessionMaxLifespan": "0",
+    "oauth2DevicePollingInterval": "5",
+    "clientSessionIdleTimeout": "0",
+    "clientOfflineSessionIdleTimeout": "0",
+    "cibaInterval": "5",
+    "realmReusableOtpCode": "false",
+    "cibaExpiresIn": "120",
+    "oauth2DeviceCodeLifespan": "600",
+    "parRequestUriLifespan": "60",
+    "clientSessionMaxLifespan": "0",
+    "frontendUrl": ""
+  },
+  "keycloakVersion": "26.3.2",
+  "userManagedAccessAllowed": false,
+  "organizationsEnabled": false,
+  "verifiableCredentialsEnabled": false,
+  "adminPermissionsEnabled": false,
+  "clientProfiles": {
+    "profiles": []
+  },
+  "clientPolicies": {
+    "policies": []
+  }
+}
diff --git a/conf/keycloak/test-realm.json b/conf/keycloak/test-realm.json
new file mode 100644
index 00000000000..42432a17a30
--- /dev/null
+++ b/conf/keycloak/test-realm.json
@@ -0,0 +1,2063 @@
+{
+  "id" : "80a7e04b-a2b5-4891-a2d1-5ad4e915f983",
+  "realm" : "test",
+  "displayName" : "",
+  "displayNameHtml" : "",
+  "notBefore" : 0,
+  "defaultSignatureAlgorithm" : "RS256",
+  "revokeRefreshToken" : false,
+  "refreshTokenMaxReuse" : 0,
+  "accessTokenLifespan" : 300,
+  "accessTokenLifespanForImplicitFlow" : 900,
+  "ssoSessionIdleTimeout" : 1800,
+  "ssoSessionMaxLifespan" : 36000,
+  "ssoSessionIdleTimeoutRememberMe" : 0,
+  "ssoSessionMaxLifespanRememberMe" : 0,
+  "offlineSessionIdleTimeout" : 2592000,
+  "offlineSessionMaxLifespanEnabled" : false,
+  "offlineSessionMaxLifespan" : 5184000,
+  "clientSessionIdleTimeout" : 0,
+  "clientSessionMaxLifespan" : 0,
+  "clientOfflineSessionIdleTimeout" : 0,
+  "clientOfflineSessionMaxLifespan" : 0,
+  "accessCodeLifespan" : 60,
+  "accessCodeLifespanUserAction" : 300,
+  "accessCodeLifespanLogin" : 1800,
+  "actionTokenGeneratedByAdminLifespan" : 43200,
+  "actionTokenGeneratedByUserLifespan" : 300,
+  "oauth2DeviceCodeLifespan" : 600,
+  "oauth2DevicePollingInterval" : 5,
+  "enabled" : true,
+  "sslRequired" : "none",
+  "registrationAllowed" : false,
+  "registrationEmailAsUsername" : false,
+  "rememberMe" : false,
+  "verifyEmail" : false,
+  "loginWithEmailAllowed" : true,
+  "duplicateEmailsAllowed" : false,
+  "resetPasswordAllowed" : false,
+  "editUsernameAllowed" : false,
+  "bruteForceProtected" : false,
+  "permanentLockout" : false,
+  "maxFailureWaitSeconds" : 900,
+  "minimumQuickLoginWaitSeconds" : 60,
+  "waitIncrementSeconds" : 60,
+  "quickLoginCheckMilliSeconds" : 1000,
+  "maxDeltaTimeSeconds" : 43200,
+  "failureFactor" : 30,
+  "roles": {
+    "realm": [
+      {
+        "id": "075daee1-5ab2-44b5-adbf-fa49a3da8305",
+        "name": "uma_authorization",
+        "description": "${role_uma_authorization}",
+        "composite": false,
+        "clientRole": false,
+        "containerId": "80a7e04b-a2b5-4891-a2d1-5ad4e915f983",
+        "attributes": {}
+      },
+      {
+        "id": "b4ff9091-ddf9-4536-b175-8cfa3e331d71",
+        "name": "default-roles-test",
+        "description": "${role_default-roles}",
+        "composite": true,
+        "composites": {
+          "realm": [
+            "offline_access",
+            "uma_authorization"
+          ],
+          "client": {
+            "account": [
+              "view-profile",
+              "manage-account"
+            ]
+          }
+        },
+        "clientRole": false,
+        "containerId": "80a7e04b-a2b5-4891-a2d1-5ad4e915f983",
+        "attributes": {}
+      },
+      {
+        "id": "131ff85b-0c25-491b-8e13-dde779ec0854",
+        "name": "admin",
+        "description": "",
+        "composite": true,
+        "composites": {
+          "client": {
+            "realm-management": [
+              "impersonation",
+              "view-authorization",
+              "query-users",
+              "manage-realm",
+              "view-identity-providers",
+              "manage-authorization",
+              "view-clients",
+              "manage-events",
+              "query-clients",
+              "view-events",
+              "query-groups",
+              "realm-admin",
+              "manage-clients",
+              "query-realms",
+              "manage-identity-providers",
+              "manage-users",
+              "view-users",
+              "view-realm",
+              "create-client"
+            ],
+            "broker": [
+              "read-token"
+            ],
+            "account": [
+              "delete-account",
+              "manage-consent",
+              "view-consent",
+              "view-applications",
+              "view-groups",
+              "manage-account-links",
+              "view-profile",
+              "manage-account"
+            ]
+          }
+        },
+        "clientRole": false,
+        "containerId": "80a7e04b-a2b5-4891-a2d1-5ad4e915f983",
+        "attributes": {}
+      },
+      {
+        "id": "e6d31555-6be6-4dee-bc6a-40a53108e4c2",
+        "name": "offline_access",
+        "description": "${role_offline-access}",
+        "composite": false,
+        "clientRole": false,
+        "containerId": "80a7e04b-a2b5-4891-a2d1-5ad4e915f983",
+        "attributes": {}
+      }
+    ],
+    "client": {
+      "realm-management": [
+        {
+          "id": "1955bd12-5f86-4a74-b130-d68a8ef6f0ee",
+          "name": "impersonation",
+          "description": "${role_impersonation}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "1109c350-9ab1-426c-9876-ef67d4310f35",
+          "name": "view-authorization",
+          "description": "${role_view-authorization}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "980c3fd3-1ae3-4b8f-9a00-d764c939035f",
+          "name": "query-users",
+          "description": "${role_query-users}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "5363e601-0f9d-4633-a8c8-28cb0f859b7b",
+          "name": "query-groups",
+          "description": "${role_query-groups}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "59aa7992-ad78-48db-868a-25d6e1d7db50",
+          "name": "realm-admin",
+          "description": "${role_realm-admin}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "impersonation",
+                "view-authorization",
+                "query-users",
+                "query-groups",
+                "manage-clients",
+                "manage-realm",
+                "view-identity-providers",
+                "query-realms",
+                "manage-authorization",
+                "manage-identity-providers",
+                "manage-users",
+                "view-users",
+                "view-realm",
+                "create-client",
+                "view-clients",
+                "manage-events",
+                "query-clients",
+                "view-events"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "112f53c2-897d-4c01-81db-b8dc10c5b995",
+          "name": "manage-clients",
+          "description": "${role_manage-clients}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "c7f57bbd-ef32-4a64-9888-7b8abd90777a",
+          "name": "manage-realm",
+          "description": "${role_manage-realm}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "8885dac8-0af3-45af-94ce-eff5e801bb80",
+          "name": "view-identity-providers",
+          "description": "${role_view-identity-providers}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "2673346c-b0ef-4e01-8a90-be03866093af",
+          "name": "manage-authorization",
+          "description": "${role_manage-authorization}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "b7182885-9e57-445f-8dae-17c16eb31b5d",
+          "name": "manage-identity-providers",
+          "description": "${role_manage-identity-providers}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "ba7bfe0c-cb07-4a47-b92c-b8132b57e181",
+          "name": "manage-users",
+          "description": "${role_manage-users}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "13a8f0fc-647d-4bfe-b525-73956898e550",
+          "name": "query-realms",
+          "description": "${role_query-realms}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "ef4c57dc-78c2-4f9a-8d2b-0e97d46fc842",
+          "name": "view-realm",
+          "description": "${role_view-realm}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "2875da34-006c-4b7f-bfc8-9ae8e46af3a2",
+          "name": "view-users",
+          "description": "${role_view-users}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "query-users",
+                "query-groups"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "c8c8f7dc-876b-4263-806f-3329f7cd5fd3",
+          "name": "create-client",
+          "description": "${role_create-client}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "21b84f90-5a9a-4845-a7ba-bbd98ac0fcc4",
+          "name": "view-clients",
+          "description": "${role_view-clients}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "query-clients"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "6fd64c94-d663-4501-ad77-0dcf8887d434",
+          "name": "manage-events",
+          "description": "${role_manage-events}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "b321927a-023c-4d2a-99ad-24baf7ff6d83",
+          "name": "query-clients",
+          "description": "${role_query-clients}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        },
+        {
+          "id": "2fc21160-78de-457b-8594-e5c76cde1d5e",
+          "name": "view-events",
+          "description": "${role_view-events}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "dada0ae8-ee9f-415a-9685-42da7c563660",
+          "attributes": {}
+        }
+      ],
+      "test": [],
+      "security-admin-console": [],
+      "admin-cli": [],
+      "account-console": [],
+      "broker": [
+        {
+          "id": "07ee59b5-dca6-48fb-83d4-2994ef02850e",
+          "name": "read-token",
+          "description": "${role_read-token}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b57d62bb-77ff-42bd-b8ff-381c7288f327",
+          "attributes": {}
+        }
+      ],
+      "account": [
+        {
+          "id": "17d2f811-7bdf-4c73-83b4-1037001797b8",
+          "name": "view-applications",
+          "description": "${role_view-applications}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "f5918d56-bd4d-4035-8fa7-8622075ed690",
+          "name": "view-groups",
+          "description": "${role_view-groups}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "d1ff44f9-419e-42fd-98e8-1add1169a972",
+          "name": "delete-account",
+          "description": "${role_delete-account}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "14c23a18-ae2d-43c9-b0c0-aaf6e0c7f5b0",
+          "name": "manage-account-links",
+          "description": "${role_manage-account-links}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "6fbe58af-d2fe-4d66-95fe-a2e8a818cb55",
+          "name": "view-profile",
+          "description": "${role_view-profile}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "bdfd02bc-6f6a-47d2-82bc-0ca52d78ff48",
+          "name": "manage-consent",
+          "description": "${role_manage-consent}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "account": [
+                "view-consent"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "782f3b0c-a17b-4a87-988b-1a711401f3b0",
+          "name": "manage-account",
+          "description": "${role_manage-account}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "account": [
+                "manage-account-links"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        },
+        {
+          "id": "8a3bfe15-66d9-4f3d-83ac-801d682d42b0",
+          "name": "view-consent",
+          "description": "${role_view-consent}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+          "attributes": {}
+        }
+      ]
+    }
+  },
+  "groups" : [ {
+    "id" : "d46f94c2-3b47-4288-b937-9cf918e54f0a",
+    "name" : "admins",
+    "path" : "/admins",
+    "attributes" : { },
+    "realmRoles" : [ ],
+    "clientRoles" : { },
+    "subGroups" : [ ]
+  }, {
+    "id" : "e992ce15-baac-48a0-8834-06f6fcf6c05b",
+    "name" : "curators",
+    "path" : "/curators",
+    "attributes" : { },
+    "realmRoles" : [ ],
+    "clientRoles" : { },
+    "subGroups" : [ ]
+  }, {
+    "id" : "531cf81d-a700-4336-808f-37a49709b48c",
+    "name" : "members",
+    "path" : "/members",
+    "attributes" : { },
+    "realmRoles" : [ ],
+    "clientRoles" : { },
+    "subGroups" : [ ]
+  } ],
+  "defaultRole" : {
+    "id" : "b4ff9091-ddf9-4536-b175-8cfa3e331d71",
+    "name" : "default-roles-test",
+    "description" : "${role_default-roles}",
+    "composite" : true,
+    "clientRole" : false,
+    "containerId" : "80a7e04b-a2b5-4891-a2d1-5ad4e915f983"
+  },
+  "requiredCredentials" : [ "password" ],
+  "otpPolicyType" : "totp",
+  "otpPolicyAlgorithm" : "HmacSHA1",
+  "otpPolicyInitialCounter" : 0,
+  "otpPolicyDigits" : 6,
+  "otpPolicyLookAheadWindow" : 1,
+  "otpPolicyPeriod" : 30,
+  "otpSupportedApplications" : [ "FreeOTP", "Google Authenticator" ],
+  "webAuthnPolicyRpEntityName" : "keycloak",
+  "webAuthnPolicySignatureAlgorithms" : [ "ES256" ],
+  "webAuthnPolicyRpId" : "",
+  "webAuthnPolicyAttestationConveyancePreference" : "not specified",
+  "webAuthnPolicyAuthenticatorAttachment" : "not specified",
+  "webAuthnPolicyRequireResidentKey" : "not specified",
+  "webAuthnPolicyUserVerificationRequirement" : "not specified",
+  "webAuthnPolicyCreateTimeout" : 0,
+  "webAuthnPolicyAvoidSameAuthenticatorRegister" : false,
+  "webAuthnPolicyAcceptableAaguids" : [ ],
+  "webAuthnPolicyPasswordlessRpEntityName" : "keycloak",
+  "webAuthnPolicyPasswordlessSignatureAlgorithms" : [ "ES256" ],
+  "webAuthnPolicyPasswordlessRpId" : "",
+  "webAuthnPolicyPasswordlessAttestationConveyancePreference" : "not specified",
+  "webAuthnPolicyPasswordlessAuthenticatorAttachment" : "not specified",
+  "webAuthnPolicyPasswordlessRequireResidentKey" : "not specified",
+  "webAuthnPolicyPasswordlessUserVerificationRequirement" : "not specified",
+  "webAuthnPolicyPasswordlessCreateTimeout" : 0,
+  "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister" : false,
+  "webAuthnPolicyPasswordlessAcceptableAaguids" : [ ],
+  "users" : [ {
+    "id" : "52cddd46-251c-4534-acc8-0580eeafb577",
+    "createdTimestamp" : 1684736014759,
+    "username" : "admin",
+    "enabled" : true,
+    "totp" : false,
+    "emailVerified" : true,
+    "firstName" : "Dataverse",
+    "lastName" : "Admin",
+    "email" : "dataverse-admin@mailinator.com",
+    "credentials" : [ {
+      "id" : "28f1ece7-26fb-40f1-9174-5ffce7b85c0a",
+      "type" : "password",
+      "userLabel" : "Set to \"admin\"",
+      "createdDate" : 1684736057302,
+      "secretData" : "{\"value\":\"ONI7fl6BmooVTUgwN1W3m7hsRjMAYEr2l+Fp5+7IOYw1iIntwvZ3U3W0ZBcCFJ7uhcKqF101+rueM3dZfoshPQ==\",\"salt\":\"Hj7co7zYVei7xwx8EaYP3A==\",\"additionalParameters\":{}}",
+      "credentialData" : "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\",\"additionalParameters\":{}}"
+    } ],
+    "disableableCredentialTypes" : [ ],
+    "requiredActions" : [ ],
+    "realmRoles" : [ "default-roles-test", "admin" ],
+    "notBefore" : 0,
+    "groups" : [ "/admins" ]
+  }, {
+    "id" : "a3d8e76d-7e7b-42dc-bbd7-4258818a8a1b",
+    "createdTimestamp" : 1684755806552,
+    "username" : "affiliate",
+    "enabled" : true,
+    "totp" : false,
+    "emailVerified" : true,
+    "firstName" : "Dataverse",
+    "lastName" : "Affiliate",
+    "email" : "dataverse-affiliate@mailinator.com",
+    "credentials" : [ {
+      "id" : "31c8eb1e-b2a8-4f86-833b-7c0536cd61a1",
+      "type" : "password",
+      "userLabel" : "My password",
+      "createdDate" : 1684755821743,
+      "secretData" : "{\"value\":\"T+RQ4nvmjknj7ds8NU7782j6PJ++uCu98zNoDQjIe9IKXah+13q4EcXO9IHmi2BJ7lgT0OIzwIoac4JEQLxhjQ==\",\"salt\":\"fnRmE9WmjAp4tlvGh/bxxQ==\",\"additionalParameters\":{}}",
+      "credentialData" : "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\",\"additionalParameters\":{}}"
+    } ],
+    "disableableCredentialTypes" : [ ],
+    "requiredActions" : [ ],
+    "realmRoles" : [ "default-roles-test" ],
+    "notBefore" : 0,
+    "groups" : [ ]
+  }, {
+    "id" : "e5531496-cfb8-498c-a902-50c98d649e79",
+    "createdTimestamp" : 1684755721064,
+    "username" : "curator",
+    "enabled" : true,
+    "totp" : false,
+    "emailVerified" : true,
+    "firstName" : "Dataverse",
+    "lastName" : "Curator",
+    "email" : "dataverse-curator@mailinator.com",
+    "credentials" : [ {
+      "id" : "664546b4-b936-45cf-a4cf-5e98b743fc7f",
+      "type" : "password",
+      "userLabel" : "My password",
+      "createdDate" : 1684755740776,
+      "secretData" : "{\"value\":\"AvVqybCNtCBVAdLEeJKresy9tc3c4BBUQvu5uHVQw4IjVagN6FpKGlDEKOrxhzdSM8skEvthOEqJkloPo1w+NQ==\",\"salt\":\"2em2DDRRlNEYsNR3xDqehw==\",\"additionalParameters\":{}}",
+      "credentialData" : "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\",\"additionalParameters\":{}}"
+    } ],
+    "disableableCredentialTypes" : [ ],
+    "requiredActions" : [ ],
+    "realmRoles" : [ "default-roles-test" ],
+    "notBefore" : 0,
+    "groups" : [ "/curators" ]
+  }, {
+    "id" : "c0082e7e-a3e9-45e6-95e9-811a34adce9d",
+    "createdTimestamp" : 1684755585802,
+    "username" : "user",
+    "enabled" : true,
+    "totp" : false,
+    "emailVerified" : true,
+    "firstName" : "Dataverse",
+    "lastName" : "User",
+    "email" : "dataverse-user@mailinator.com",
+    "credentials" : [ {
+      "id" : "00d6d67f-2e30-4da6-a567-bec38a1886a0",
+      "type" : "password",
+      "userLabel" : "My password",
+      "createdDate" : 1684755599597,
+      "secretData" : "{\"value\":\"z991rnjznAgosi5nX962HjM8/gN5GLJTdrlvi6G9cj8470X2/oZUb4Lka6s8xImgtEloCgWiKqH0EH9G4Y3a5A==\",\"salt\":\"/Uz7w+2IqDo+fQUGqxjVHw==\",\"additionalParameters\":{}}",
+      "credentialData" : "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\",\"additionalParameters\":{}}"
+    } ],
+    "disableableCredentialTypes" : [ ],
+    "requiredActions" : [ ],
+    "realmRoles" : [ "default-roles-test" ],
+    "notBefore" : 0,
+    "groups" : [ "/members" ]
+  } ],
+  "scopeMappings" : [ {
+    "clientScope" : "offline_access",
+    "roles" : [ "offline_access" ]
+  } ],
+  "clientScopeMappings" : {
+    "account" : [ {
+      "client" : "account-console",
+      "roles" : [ "manage-account" ]
+    } ]
+  },
+  "clients" : [ {
+    "id" : "77f8127a-261e-4cd8-a77d-b74a389f7fd4",
+    "clientId" : "account",
+    "name" : "${client_account}",
+    "rootUrl" : "${authBaseUrl}",
+    "baseUrl" : "/realms/test/account/",
+    "surrogateAuthRequired" : false,
+    "enabled" : true,
+    "alwaysDisplayInConsole" : false,
+    "clientAuthenticatorType" : "client-secret",
+    "redirectUris" : [ "/realms/test/account/*" ],
+    "webOrigins" : [ ],
+    "notBefore" : 0,
+    "bearerOnly" : false,
+    "consentRequired" : false,
+    "standardFlowEnabled" : true,
+    "implicitFlowEnabled" : false,
+    "directAccessGrantsEnabled" : false,
+    "serviceAccountsEnabled" : false,
+    "publicClient" : true,
+    "frontchannelLogout" : false,
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "post.logout.redirect.uris" : "+"
+    },
+    "authenticationFlowBindingOverrides" : { },
+    "fullScopeAllowed" : false,
+    "nodeReRegistrationTimeout" : 0,
+    "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+    "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+  }, {
+    "id" : "5d99f721-027c-478d-867d-61114e0a8192",
+    "clientId" : "account-console",
+    "name" : "${client_account-console}",
+    "rootUrl" : "${authBaseUrl}",
+    "baseUrl" : "/realms/test/account/",
+    "surrogateAuthRequired" : false,
+    "enabled" : true,
+    "alwaysDisplayInConsole" : false,
+    "clientAuthenticatorType" : "client-secret",
+    "redirectUris" : [ "/realms/test/account/*" ],
+    "webOrigins" : [ ],
+    "notBefore" : 0,
+    "bearerOnly" : false,
+    "consentRequired" : false,
+    "standardFlowEnabled" : true,
+    "implicitFlowEnabled" : false,
+    "directAccessGrantsEnabled" : false,
+    "serviceAccountsEnabled" : false,
+    "publicClient" : true,
+    "frontchannelLogout" : false,
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "post.logout.redirect.uris" : "+",
+      "pkce.code.challenge.method" : "S256"
+    },
+    "authenticationFlowBindingOverrides" : { },
+    "fullScopeAllowed" : false,
+    "nodeReRegistrationTimeout" : 0,
+    "protocolMappers" : [ {
+      "id" : "e181a0ce-9a04-4468-a38a-aaef9f78f989",
+      "name" : "audience resolve",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-audience-resolve-mapper",
+      "consentRequired" : false,
+      "config" : { }
+    } ],
+    "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+    "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+  }, {
+    "id" : "5eccc178-121e-4d0f-bcb2-04ae3c2e52ed",
+    "clientId" : "admin-cli",
+    "name" : "${client_admin-cli}",
+    "surrogateAuthRequired" : false,
+    "enabled" : true,
+    "alwaysDisplayInConsole" : false,
+    "clientAuthenticatorType" : "client-secret",
+    "redirectUris" : [ ],
+    "webOrigins" : [ ],
+    "notBefore" : 0,
+    "bearerOnly" : false,
+    "consentRequired" : false,
+    "standardFlowEnabled" : false,
+    "implicitFlowEnabled" : false,
+    "directAccessGrantsEnabled" : true,
+    "serviceAccountsEnabled" : false,
+    "publicClient" : true,
+    "frontchannelLogout" : false,
+    "protocol" : "openid-connect",
+    "attributes" : { },
+    "authenticationFlowBindingOverrides" : { },
+    "fullScopeAllowed" : false,
+    "nodeReRegistrationTimeout" : 0,
+    "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+    "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+  }, {
+    "id" : "b57d62bb-77ff-42bd-b8ff-381c7288f327",
+    "clientId" : "broker",
+    "name" : "${client_broker}",
+    "surrogateAuthRequired" : false,
+    "enabled" : true,
+    "alwaysDisplayInConsole" : false,
+    "clientAuthenticatorType" : "client-secret",
+    "redirectUris" : [ ],
+    "webOrigins" : [ ],
+    "notBefore" : 0,
+    "bearerOnly" : true,
+    "consentRequired" : false,
+    "standardFlowEnabled" : true,
+    "implicitFlowEnabled" : false,
+    "directAccessGrantsEnabled" : false,
+    "serviceAccountsEnabled" : false,
+    "publicClient" : false,
+    "frontchannelLogout" : false,
+    "protocol" : "openid-connect",
+    "attributes" : { },
+    "authenticationFlowBindingOverrides" : { },
+    "fullScopeAllowed" : false,
+    "nodeReRegistrationTimeout" : 0,
+    "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+    "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+  }, {
+    "id" : "dada0ae8-ee9f-415a-9685-42da7c563660",
+    "clientId" : "realm-management",
+    "name" : "${client_realm-management}",
+    "surrogateAuthRequired" : false,
+    "enabled" : true,
+    "alwaysDisplayInConsole" : false,
+    "clientAuthenticatorType" : "client-secret",
+    "redirectUris" : [ ],
+    "webOrigins" : [ ],
+    "notBefore" : 0,
+    "bearerOnly" : true,
+    "consentRequired" : false,
+    "standardFlowEnabled" : true,
+    "implicitFlowEnabled" : false,
+    "directAccessGrantsEnabled" : false,
+    "serviceAccountsEnabled" : false,
+    "publicClient" : false,
+    "frontchannelLogout" : false,
+    "protocol" : "openid-connect",
+    "attributes" : { },
+    "authenticationFlowBindingOverrides" : { },
+    "fullScopeAllowed" : false,
+    "nodeReRegistrationTimeout" : 0,
+    "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+    "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+  }, {
+    "id" : "bf7cf550-3875-4f97-9878-b2419a854058",
+    "clientId" : "security-admin-console",
+    "name" : "${client_security-admin-console}",
+    "rootUrl" : "${authAdminUrl}",
+    "baseUrl" : "/admin/test/console/",
+    "surrogateAuthRequired" : false,
+    "enabled" : true,
+    "alwaysDisplayInConsole" : false,
+    "clientAuthenticatorType" : "client-secret",
+    "redirectUris" : [ "/admin/test/console/*" ],
+    "webOrigins" : [ "+" ],
+    "notBefore" : 0,
+    "bearerOnly" : false,
+    "consentRequired" : false,
+    "standardFlowEnabled" : true,
+    "implicitFlowEnabled" : false,
+    "directAccessGrantsEnabled" : false,
+    "serviceAccountsEnabled" : false,
+    "publicClient" : true,
+    "frontchannelLogout" : false,
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "post.logout.redirect.uris" : "+",
+      "pkce.code.challenge.method" : "S256"
+    },
+    "authenticationFlowBindingOverrides" : { },
+    "fullScopeAllowed" : false,
+    "nodeReRegistrationTimeout" : 0,
+    "protocolMappers" : [ {
+      "id" : "ff845e16-e200-4894-ab51-37d8b9f2a445",
+      "name" : "locale",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "locale",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "locale",
+        "jsonType.label" : "String"
+      }
+    } ],
+    "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+    "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+  }, {
+    "id" : "9c27faa8-4b8d-4ad9-9cd1-880032ef06aa",
+    "clientId" : "test",
+    "name" : "A Test Client",
+    "description" : "Use for hacking and testing away a confidential client",
+    "rootUrl" : "",
+    "adminUrl" : "",
+    "baseUrl" : "",
+    "surrogateAuthRequired" : false,
+    "enabled" : true,
+    "alwaysDisplayInConsole" : false,
+    "clientAuthenticatorType" : "client-secret",
+    "secret" : "94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8",
+    "redirectUris" : [ "*" ],
+    "webOrigins" : [ ],
+    "notBefore" : 0,
+    "bearerOnly" : false,
+    "consentRequired" : false,
+    "standardFlowEnabled" : true,
+    "implicitFlowEnabled" : false,
+    "directAccessGrantsEnabled" : true,
+    "serviceAccountsEnabled" : false,
+    "publicClient" : false,
+    "frontchannelLogout" : true,
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "oidc.ciba.grant.enabled" : "false",
+      "client.secret.creation.time" : "1684735831",
+      "backchannel.logout.session.required" : "true",
+      "display.on.consent.screen" : "false",
+      "oauth2.device.authorization.grant.enabled" : "false",
+      "backchannel.logout.revoke.offline.tokens" : "false"
+    },
+    "authenticationFlowBindingOverrides" : { },
+    "fullScopeAllowed" : true,
+    "nodeReRegistrationTimeout" : -1,
+    "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+    "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+  } ],
+  "clientScopes" : [ {
+    "id" : "72f29e57-92fa-437b-828c-2b9d6fe56192",
+    "name" : "address",
+    "description" : "OpenID Connect built-in scope: address",
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "include.in.token.scope" : "true",
+      "display.on.consent.screen" : "true",
+      "consent.screen.text" : "${addressScopeConsentText}"
+    },
+    "protocolMappers" : [ {
+      "id" : "59581aea-70d6-4ee8-bec2-1fea5fc497ae",
+      "name" : "address",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-address-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "user.attribute.formatted" : "formatted",
+        "user.attribute.country" : "country",
+        "user.attribute.postal_code" : "postal_code",
+        "userinfo.token.claim" : "true",
+        "user.attribute.street" : "street",
+        "id.token.claim" : "true",
+        "user.attribute.region" : "region",
+        "access.token.claim" : "true",
+        "user.attribute.locality" : "locality"
+      }
+    } ]
+  }, {
+    "id" : "f515ec81-3c1b-4d4d-b7a2-e7e8d47b6447",
+    "name" : "roles",
+    "description" : "OpenID Connect scope for add user roles to the access token",
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "include.in.token.scope" : "false",
+      "display.on.consent.screen" : "true",
+      "consent.screen.text" : "${rolesScopeConsentText}"
+    },
+    "protocolMappers" : [ {
+      "id" : "26d299a8-69e2-4864-9595-17a5b417fc61",
+      "name" : "realm roles",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-realm-role-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "user.attribute" : "foo",
+        "access.token.claim" : "true",
+        "claim.name" : "realm_access.roles",
+        "jsonType.label" : "String",
+        "multivalued" : "true"
+      }
+    }, {
+      "id" : "d2998083-a8db-4f4e-9aaa-9cad68d65b97",
+      "name" : "audience resolve",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-audience-resolve-mapper",
+      "consentRequired" : false,
+      "config" : { }
+    }, {
+      "id" : "7a4cb2e5-07a0-4c16-a024-71df7ddd6868",
+      "name" : "client roles",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-client-role-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "user.attribute" : "foo",
+        "access.token.claim" : "true",
+        "claim.name" : "resource_access.${client_id}.roles",
+        "jsonType.label" : "String",
+        "multivalued" : "true"
+      }
+    } ]
+  }, {
+    "id" : "8f1eafef-92d6-434e-b9ec-6edec1fddd0a",
+    "name" : "offline_access",
+    "description" : "OpenID Connect built-in scope: offline_access",
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "consent.screen.text" : "${offlineAccessScopeConsentText}",
+      "display.on.consent.screen" : "true"
+    }
+  }, {
+    "id" : "c03095aa-b656-447a-9767-0763c2ccb070",
+    "name" : "acr",
+    "description" : "OpenID Connect scope for add acr (authentication context class reference) to the token",
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "include.in.token.scope" : "false",
+      "display.on.consent.screen" : "false"
+    },
+    "protocolMappers" : [ {
+      "id" : "948b230c-56d0-4000-937c-841cd395d3f9",
+      "name" : "acr loa level",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-acr-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "id.token.claim" : "true",
+        "access.token.claim" : "true"
+      }
+    } ]
+  }, {
+    "id" : "cdf35f63-8ec7-41a0-ae12-f05d415818cc",
+    "name" : "phone",
+    "description" : "OpenID Connect built-in scope: phone",
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "include.in.token.scope" : "true",
+      "display.on.consent.screen" : "true",
+      "consent.screen.text" : "${phoneScopeConsentText}"
+    },
+    "protocolMappers" : [ {
+      "id" : "ba4348ff-90b1-4e09-89a8-e5c08b04d3d1",
+      "name" : "phone number",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "phoneNumber",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "phone_number",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "e6cceae5-8392-4348-b302-f610ece6056e",
+      "name" : "phone number verified",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "phoneNumberVerified",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "phone_number_verified",
+        "jsonType.label" : "boolean"
+      }
+    } ]
+  }, {
+    "id" : "4318001c-2970-41d3-91b9-e31c08569872",
+    "name" : "email",
+    "description" : "OpenID Connect built-in scope: email",
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "include.in.token.scope" : "true",
+      "display.on.consent.screen" : "true",
+      "consent.screen.text" : "${emailScopeConsentText}"
+    },
+    "protocolMappers" : [ {
+      "id" : "406d02a6-866a-4962-8838-e8c58ada1505",
+      "name" : "email",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-property-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "email",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "email",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "33baabc1-9bf2-42e4-8b8e-a53c13f0b744",
+      "name" : "email verified",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-property-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "emailVerified",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "email_verified",
+        "jsonType.label" : "boolean"
+      }
+    } ]
+  }, {
+    "id" : "5277a84f-d727-4c64-8432-d513127beee1",
+    "name" : "profile",
+    "description" : "OpenID Connect built-in scope: profile",
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "include.in.token.scope" : "true",
+      "display.on.consent.screen" : "true",
+      "consent.screen.text" : "${profileScopeConsentText}"
+    },
+    "protocolMappers" : [ {
+      "id" : "0a609875-2678-4056-93ef-dd5c03e6059d",
+      "name" : "given name",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-property-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "firstName",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "given_name",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "7c510d18-07ee-4b78-8acd-24b777d11b3c",
+      "name" : "website",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "website",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "website",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "0bb6d0ea-195f-49e8-918c-c419a26a661c",
+      "name" : "username",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-property-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "username",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "preferred_username",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "5f1e644c-1acf-440c-b1a6-b5f65bcebfd9",
+      "name" : "profile",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "profile",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "profile",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "c710bdb2-6cfd-4f60-9c4e-730188fc62f7",
+      "name" : "family name",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-property-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "lastName",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "family_name",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "012d5038-0e13-42ba-9df7-2487c8e2eead",
+      "name" : "nickname",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "nickname",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "nickname",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "21590b19-517d-4b6d-92f6-d4f71238677e",
+      "name" : "updated at",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "updatedAt",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "updated_at",
+        "jsonType.label" : "long"
+      }
+    }, {
+      "id" : "e4cddca7-1360-42f3-9854-da6cbe00c71e",
+      "name" : "birthdate",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "birthdate",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "birthdate",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "afee328f-c64c-43e6-80d0-be2721c2ed0e",
+      "name" : "locale",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "locale",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "locale",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "780a1e2c-5b63-46f4-a5bf-dc3fd8ce0cbb",
+      "name" : "full name",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-full-name-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "userinfo.token.claim" : "true"
+      }
+    }, {
+      "id" : "aeebffff-f776-427e-83ed-064707ffce57",
+      "name" : "zoneinfo",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "zoneinfo",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "zoneinfo",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "b3e840a2-1794-4da1-bf69-31905cbff0d6",
+      "name" : "middle name",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "middleName",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "middle_name",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "0607e0e4-4f7f-4214-996d-3599772ce1c7",
+      "name" : "picture",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "picture",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "picture",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "426a609b-4e28-4132-af0d-13297b8cb63a",
+      "name" : "gender",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-attribute-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "gender",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "gender",
+        "jsonType.label" : "String"
+      }
+    } ]
+  }, {
+    "id" : "a1ebde82-ce21-438f-a3ad-261d3eeb1c01",
+    "name" : "role_list",
+    "description" : "SAML role list",
+    "protocol" : "saml",
+    "attributes" : {
+      "consent.screen.text" : "${samlRoleListScopeConsentText}",
+      "display.on.consent.screen" : "true"
+    },
+    "protocolMappers" : [ {
+      "id" : "64653ac7-7ffc-4f7c-a589-03e3b68bbd25",
+      "name" : "role list",
+      "protocol" : "saml",
+      "protocolMapper" : "saml-role-list-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "single" : "false",
+        "attribute.nameformat" : "Basic",
+        "attribute.name" : "Role"
+      }
+    } ]
+  }, {
+    "id" : "aeb5b852-dfec-4e67-9d9e-104abe9b3bf2",
+    "name" : "web-origins",
+    "description" : "OpenID Connect scope for add allowed web origins to the access token",
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "include.in.token.scope" : "false",
+      "display.on.consent.screen" : "false",
+      "consent.screen.text" : ""
+    },
+    "protocolMappers" : [ {
+      "id" : "e2fa8437-a0f1-46fc-af9c-c40fc09cd6a1",
+      "name" : "allowed web origins",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-allowed-origins-mapper",
+      "consentRequired" : false,
+      "config" : { }
+    } ]
+  }, {
+    "id" : "4fecd0d7-d4ad-457e-90f2-c7202bf01ff5",
+    "name" : "microprofile-jwt",
+    "description" : "Microprofile - JWT built-in scope",
+    "protocol" : "openid-connect",
+    "attributes" : {
+      "include.in.token.scope" : "true",
+      "display.on.consent.screen" : "false"
+    },
+    "protocolMappers" : [ {
+      "id" : "a9536634-a9f6-4ed5-a8e7-8379d3b002ca",
+      "name" : "upn",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-property-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "userinfo.token.claim" : "true",
+        "user.attribute" : "username",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "upn",
+        "jsonType.label" : "String"
+      }
+    }, {
+      "id" : "2ce1a702-9458-4926-9b8a-f82c07215755",
+      "name" : "groups",
+      "protocol" : "openid-connect",
+      "protocolMapper" : "oidc-usermodel-realm-role-mapper",
+      "consentRequired" : false,
+      "config" : {
+        "multivalued" : "true",
+        "user.attribute" : "foo",
+        "id.token.claim" : "true",
+        "access.token.claim" : "true",
+        "claim.name" : "groups",
+        "jsonType.label" : "String"
+      }
+    } ]
+  } ],
+  "defaultDefaultClientScopes" : [ "role_list", "profile", "email", "roles", "web-origins", "acr" ],
+  "defaultOptionalClientScopes" : [ "offline_access", "address", "phone", "microprofile-jwt" ],
+  "browserSecurityHeaders" : {
+    "contentSecurityPolicyReportOnly" : "",
+    "xContentTypeOptions" : "nosniff",
+    "xRobotsTag" : "none",
+    "xFrameOptions" : "SAMEORIGIN",
+    "contentSecurityPolicy" : "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
+    "xXSSProtection" : "1; mode=block",
+    "strictTransportSecurity" : "max-age=31536000; includeSubDomains"
+  },
+  "smtpServer" : { },
+  "eventsEnabled" : false,
+  "eventsListeners" : [ "jboss-logging" ],
+  "enabledEventTypes" : [ ],
+  "adminEventsEnabled" : false,
+  "adminEventsDetailsEnabled" : false,
+  "identityProviders" : [ ],
+  "identityProviderMappers" : [ ],
+  "components" : {
+    "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy" : [ {
+      "id" : "8115796f-8f1f-4d6a-88f8-ca2938451260",
+      "name" : "Allowed Client Scopes",
+      "providerId" : "allowed-client-templates",
+      "subType" : "authenticated",
+      "subComponents" : { },
+      "config" : {
+        "allow-default-scopes" : [ "true" ]
+      }
+    }, {
+      "id" : "044bd055-714d-478e-aa93-303d2161c427",
+      "name" : "Allowed Protocol Mapper Types",
+      "providerId" : "allowed-protocol-mappers",
+      "subType" : "authenticated",
+      "subComponents" : { },
+      "config" : {
+        "allowed-protocol-mapper-types" : [ "saml-user-property-mapper", "oidc-address-mapper", "oidc-sha256-pairwise-sub-mapper", "saml-role-list-mapper", "saml-user-attribute-mapper", "oidc-usermodel-property-mapper", "oidc-usermodel-attribute-mapper", "oidc-full-name-mapper" ]
+      }
+    }, {
+      "id" : "be465734-3b0f-4370-a144-73db756e23f8",
+      "name" : "Allowed Protocol Mapper Types",
+      "providerId" : "allowed-protocol-mappers",
+      "subType" : "anonymous",
+      "subComponents" : { },
+      "config" : {
+        "allowed-protocol-mapper-types" : [ "oidc-usermodel-attribute-mapper", "saml-user-property-mapper", "oidc-address-mapper", "oidc-sha256-pairwise-sub-mapper", "saml-user-attribute-mapper", "oidc-full-name-mapper", "oidc-usermodel-property-mapper", "saml-role-list-mapper" ]
+      }
+    }, {
+      "id" : "42a2f64d-ac9e-4221-9cf6-40ff8c868629",
+      "name" : "Trusted Hosts",
+      "providerId" : "trusted-hosts",
+      "subType" : "anonymous",
+      "subComponents" : { },
+      "config" : {
+        "host-sending-registration-request-must-match" : [ "true" ],
+        "client-uris-must-match" : [ "true" ]
+      }
+    }, {
+      "id" : "7ca08915-6c33-454c-88f2-20e1d6553b26",
+      "name" : "Max Clients Limit",
+      "providerId" : "max-clients",
+      "subType" : "anonymous",
+      "subComponents" : { },
+      "config" : {
+        "max-clients" : [ "200" ]
+      }
+    }, {
+      "id" : "f01f2b6f-3f01-4d01-b2f4-70577c6f599c",
+      "name" : "Allowed Client Scopes",
+      "providerId" : "allowed-client-templates",
+      "subType" : "anonymous",
+      "subComponents" : { },
+      "config" : {
+        "allow-default-scopes" : [ "true" ]
+      }
+    }, {
+      "id" : "516d7f21-f21a-4690-831e-36ad313093b2",
+      "name" : "Consent Required",
+      "providerId" : "consent-required",
+      "subType" : "anonymous",
+      "subComponents" : { },
+      "config" : { }
+    }, {
+      "id" : "c79df6a0-d4d8-4866-b9e6-8ddb5d1bd38e",
+      "name" : "Full Scope Disabled",
+      "providerId" : "scope",
+      "subType" : "anonymous",
+      "subComponents" : { },
+      "config" : { }
+    } ],
+    "org.keycloak.userprofile.UserProfileProvider" : [ {
+      "id" : "cf47a21f-c8fb-42f2-9bff-feca967db183",
+      "providerId" : "declarative-user-profile",
+      "subComponents" : { },
+      "config" : { }
+    } ],
+    "org.keycloak.keys.KeyProvider" : [ {
+      "id" : "6b4a2281-a9e8-43ab-aee7-190ae91b2842",
+      "name" : "aes-generated",
+      "providerId" : "aes-generated",
+      "subComponents" : { },
+      "config" : {
+        "kid" : [ "47b9c2c2-32dc-4317-bd8b-1c4e5bb740ca" ],
+        "secret" : [ "9VWsVSqbj5zWa8Mq-rRzOw" ],
+        "priority" : [ "100" ]
+      }
+    }, {
+      "id" : "68e2d2b0-4976-480f-ab76-f84a17686b05",
+      "name" : "rsa-enc-generated",
+      "providerId" : "rsa-enc-generated",
+      "subComponents" : { },
+      "config" : {
+        "privateKey" : [ "MIIEpQIBAAKCAQEAwuIcVVJDncorsQcFef4M/J9dsaNNmwEv/+4pCSZuco7IlA9uCfvwjYgfwQlWoCHCc7JFEtUOXhpLNR0SJ9w2eCC9A/0horjLmiVGU5sGACGrAxSgipt399k83mtkPBTikT1BXumPrX51ovdEPVPQSO0hIBwFn4ZDwA9P/00jNzzswyLC2UDdQrwIjm2xWjq1X82d8mL3+Yp8lF9qD1w305+XPiqCC+TUunKsuCQq5sddet+UoCDsFQyxsJi6cWJrryDvQmiDgM2wm68jn6hyzDE76J1az0wKEGqoMEwIy0juqZCyAqgsm3xA+zHpTcI3EyTwDGpMvWNJp8AWqXPNaQIDAQABAoIBAAethL1+n/6WpUBEaoHcVrq5/2+vo0+dfTyVZNKRFqtG0WOWPzOflFd1HZV7YVPuJI+uPi8ANmsnbh9YcaYg9JiTZ0hMZ++giBf0ID2hZxv995NyXnf7fkoFKghevYG+9mVPtHRmxKlKiPFWfHQjP1ACNKAD2UZdcdbzxicaIkPV/hP996mZA3xaaudggAJq7u/W67H2Q6ofGqW4TI5241d8T+6yobbvXRe4n8FKz4eK2aZv+N+zwh5JDMsJ8050+lCDsyoyakEPf+4veuPkewx4FemAiotDNcmoUQSDL26wLw8kk1uZ9JY0M88OL5pMyBuxTqy0F6BWBltq80mlefECgYEA4vZ8Agu2plXOzWASn0dyhCel3QoeUqNY8D8A+0vK9qWxUE9jMG13jAZmsL2I38SuwRN1DhJezbrn4QTuxTukxgSjLDv/pBp9UnXnCz/fg4yPTYsZ0zHqTMbwvdtfIzBHTCYyIJ+unxVYoenC0XZKSQXA3NN2zNqYpLhjStWdEZECgYEA29DznJxpDZsRUieRxFgZ+eRCjbQ9Q2A46preqMo1KOZ6bt9avxG3uM7pUC+UOeIizeRzxPSJ2SyptYPzdaNwKN3Lq+RhjHe1zYLngXb0CIQaRwNHqePxXF1sg0dTbmcxf+Co7yPG+Nd5nrQq9SQHC3tLTyL6x3VU/yAfMQqUklkCgYEAyVl8iGAV6RkE/4R04OOEv6Ng7WkVn6CUvYZXe5kw9YHnfWUAjS0AOrRPFAsBy+r0UgvN8+7uNjvTjPhQT5/rPVVN4WdVEyQA/E/m6j7/LvhbBaMbBRcqUnTHjNd6XoBtMCxOmkyvoShR2krE8AiuPHwjLoVXxsNDWhbO18wMrVECgYEAlmkICOXNzI2K8Jg62gse2yshjy0BrpSs3XtTWFPkxDPRGwSiZ5OMD10lsMSdvG3MOu5TeTWLDZvOFHJRqPFI0e3Sa7A+P4u6TwF/v8rRePJLuMO5ybo7cWRL2Bh6MlVSPZpQfjIQ+D0Y70uBCXS5jVW0VlYtG0Zh/qDQNxJyTyECgYEAuRINlZ0ag+1QTITapSatbFWd/KquGLpMjZyF4k5gVHs+4zHnnTi1YIDUInp1FJBqKD27z2byy7KFgbMBZQmsDs8i4fgzQrJHe3D4WFFHCjiClbeReejbas9bOnqhSQCiIy1Ck8vMAriAtctSA/g/qq6dQApSgcWaKvTVL2Ywa7E=" ],
+        "keyUse" : [ "ENC" ],
+        "certificate" : [ "MIIClzCCAX8CBgGIQhOIijANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR0ZXN0MB4XDTIzMDUyMjA2MDczNloXDTMzMDUyMjA2MDkxNlowDzENMAsGA1UEAwwEdGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLiHFVSQ53KK7EHBXn+DPyfXbGjTZsBL//uKQkmbnKOyJQPbgn78I2IH8EJVqAhwnOyRRLVDl4aSzUdEifcNnggvQP9IaK4y5olRlObBgAhqwMUoIqbd/fZPN5rZDwU4pE9QV7pj61+daL3RD1T0EjtISAcBZ+GQ8APT/9NIzc87MMiwtlA3UK8CI5tsVo6tV/NnfJi9/mKfJRfag9cN9Oflz4qggvk1LpyrLgkKubHXXrflKAg7BUMsbCYunFia68g70Jog4DNsJuvI5+ocswxO+idWs9MChBqqDBMCMtI7qmQsgKoLJt8QPsx6U3CNxMk8AxqTL1jSafAFqlzzWkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAIEIfjqOr2m+8s2RR8VW/nBgOgu9HtPRda4qNhGbgBkZ8NDy7TwHqlHo1ujKW5RO438pRyLJmOibWN4a/rkUsSjin6vgy4l8KpQy+7a4cQCQHyl34TmPjbtiw1jKgiOjzRQY54NVwIJNMIMc1ZyQo4u0U30/FxgUv6akXfS5O1ePD+5xKOOC/Af9AletjhQMPwVxXDwFqfQf/p+SM4Pyn4L633MESfDrH8v9FjJd0lV5ZlEI4hpPtnbi9U+CInqCy3VDNlZjsXswaDRujjg3LERfOMvCgj+Dck3FzWG7EiCwXWNEPvdMzv4w7M6KXuiPPQkST8DUWjgkjUCeLBzT3yw==" ],
+        "priority" : [ "100" ],
+        "algorithm" : [ "RSA-OAEP" ]
+      }
+    }, {
+      "id" : "728769a3-99a4-4cca-959d-28181dfee7e8",
+      "name" : "rsa-generated",
+      "providerId" : "rsa-generated",
+      "subComponents" : { },
+      "config" : {
+        "privateKey" : [ "MIIEowIBAAKCAQEAxIszQCv8bX3sKXJVtuLJV6cH/uhkzxcTEIcDe7y2Y2SFM0x2nF6wRLk8QkvIrRmelilegUIJttqZxLXMpxwUJGizehHQMrOCzNoGBZdVanoK7nNa5+FOYtlvL4GxNfwzS36sp3PnKQiGv5Q7RGuPthjLFfqTmYx/7GTDJC4vLEW5S01Vy/Xc9FE4FsT0hnm91lRWjppc9893M5QUy/TPu8udIuNV87Ko5yiIxQqcPiAQXJaN4CyGaDcYhhzzHdxVptIk2FvtxhpmNxrbtmBCx/o9/rBDQNTis8Ex6ItWC2PvC17UPvyOcZ4Fv/qO0L6JZ0mrpH95CeDU1kEP+KKZrwIDAQABAoIBAGGl6SYiVG1PyTQEXqqY/UCjt3jBnEg5ZhrpgWUKKrGyAO2uOSXSc5AJWfN0NHUwC9b+IbplhW8IJ6qQSmfiLu2x6S2mSQLPphZB4gkIGYNntCOpQ0p+aZP6BGAddt5j+VYyTvR5RKlh15S6QEHrkMB/i/LVBl0c7XeUzlEc8wnyj8DGvlmpcQzIcbWfqEZ/FciDdKGNN0M4V/r1uQiOUVZ69SWDBBwu41YwF7PYUsX83q8zn0nBeMqz0ggSf33lW4w31fox9c7EjIF01gPArE5uT+d+AwjVKHpd08LWGR9W9NSXVOPUKkzOM+PyvKGvzjMnlrm/feqowKQbL2q/GP0CgYEA/EsrvUojkFIWxHc19KJdJvqlYgLeWq6P/J7UmHgpl+S3nG6b9HH4/aM/ICDa5hxd5bmP5p2V3EuZWnyb6/QB5eipC7Ss3oM7XeS/PwvTp6NTC1fypx2zHKse3iuLeCGneRxiw15mB02ArJ/qJw/VSQK2J7RiR4+b6HYpdzQnIysCgYEAx25dTQqskQqsx/orJzuUqfNv/C0W4vqfz1eL3akFrdK+YqghXKFsDmh61JpTrTKnRLAdQeyOrhKwbNsdxSEEaeeLayKLVlimoFXGd/LZb5LQiwFcrvTzhnB+FLmFgqTnuLkpfY1woHEwSW9TpJewjbT9S6g0L2uh223nVXuLMY0CgYEA3pMOlmMGtvbEoTSuRBDNb2rmZm4zbfrcijgxRAWWZCtiFL68FU5LJLBVK2nw09sot1cabZCOuhdzxhFymRneZs73+5y8eV17DV2VnvA3HIiI5dQD/YzFDECm7ceqtiOylLUHKGZqSn0ETMaTkzxzpIKg4qxPm+RE3jMIZ+J5uJsCgYBk2iUIrtsxxgo2Xwavomu9vkPlbQ/j3QYwHn+2qqEalDZ/QbMNWvyAFMn49cpXDgSUsdM54V0OHpllkzFs3ROUUumoViHMmqw47OefBQp8Z+xaP2gVef4lAIJiDKe9t5MPUWPwADTyjgrzN/8+fw9juiFVv0wUpwOFKgEQs5diiQKBgC6RpZESc5Nl4nHrDvIl5n/zYED6BaXoLl15NhcoBudt5SIRO/RpvBW69A7aE/UK6p7WXjq4mP1ssIWz4KgATCoXUgYvn0a7Ql79r/CMce6/FvcuweED6u6bD0kdXuYhe8fR9IPmLfnnb4Cx3JOJeRZbiBSP5HOZJ7nsKibxcgPm" ],
+        "keyUse" : [ "SIG" ],
+        "certificate" : [ "MIIClzCCAX8CBgGIQhOHjjANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR0ZXN0MB4XDTIzMDUyMjA2MDczNloXDTMzMDUyMjA2MDkxNlowDzENMAsGA1UEAwwEdGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSLM0Ar/G197ClyVbbiyVenB/7oZM8XExCHA3u8tmNkhTNMdpxesES5PEJLyK0ZnpYpXoFCCbbamcS1zKccFCRos3oR0DKzgszaBgWXVWp6Cu5zWufhTmLZby+BsTX8M0t+rKdz5ykIhr+UO0Rrj7YYyxX6k5mMf+xkwyQuLyxFuUtNVcv13PRROBbE9IZ5vdZUVo6aXPfPdzOUFMv0z7vLnSLjVfOyqOcoiMUKnD4gEFyWjeAshmg3GIYc8x3cVabSJNhb7cYaZjca27ZgQsf6Pf6wQ0DU4rPBMeiLVgtj7wte1D78jnGeBb/6jtC+iWdJq6R/eQng1NZBD/iima8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAe0Bo1UpGfpOlJiVhp0XWExm8bdxFgXOU2M5XeZBsWAqBehvJkzn+tbAtlVNiIiN58XFFpH+xLZ2nJIZR5FHeCD3bYAgK72j5k45HJI95vPyslelfT/m3Np78+1iUa1U1WxN40JaowP1EeTkk5O8Pk4zTQ1Ne1usmKd+SJxI1KWN0kKuVFMmdNRb5kQKWeQvOSlWl7rd4bvHGvVnxgcPC1bshEJKRt+VpaUjpm6CKd8C3Kt7IWfIX4HTVhKZkmLn7qv6aSfwWelwZfLdaXcLXixqzqNuUk/VWbF9JT4iiag9F3mt7xryIkoRp1AEjCA82HqK72F4JCFyOhCiGrMfKJw==" ],
+        "priority" : [ "100" ]
+      }
+    }, {
+      "id" : "f30af2d2-d042-43b8-bc6d-22f6bab6934c",
+      "name" : "hmac-generated",
+      "providerId" : "hmac-generated",
+      "subComponents" : { },
+      "config" : {
+        "kid" : [ "6f0d9688-e974-42b4-9d84-8d098c51007c" ],
+        "secret" : [ "8nruwD66Revr9k21e-BHtcyvNzAMFOsstxSAB0Gdy2qe2qGRm2kYOwsPzrH9ZQSdj2041SraKo6a3SHvCyTBAQ" ],
+        "priority" : [ "100" ],
+        "algorithm" : [ "HS256" ]
+      }
+    } ]
+  },
+  "internationalizationEnabled" : false,
+  "supportedLocales" : [ ],
+  "authenticationFlows" : [ {
+    "id" : "94c65ba1-ba50-4be2-94c4-de656145eb67",
+    "alias" : "Account verification options",
+    "description" : "Method with which to verity the existing account",
+    "providerId" : "basic-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "idp-email-verification",
+      "authenticatorFlow" : false,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticatorFlow" : true,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 20,
+      "autheticatorFlow" : true,
+      "flowAlias" : "Verify Existing Account by Re-authentication",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "3b706ddf-c4b6-498a-803c-772878bc9bc3",
+    "alias" : "Authentication Options",
+    "description" : "Authentication options.",
+    "providerId" : "basic-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "basic-auth",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "basic-auth-otp",
+      "authenticatorFlow" : false,
+      "requirement" : "DISABLED",
+      "priority" : 20,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "auth-spnego",
+      "authenticatorFlow" : false,
+      "requirement" : "DISABLED",
+      "priority" : 30,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "9ea0b8f6-882c-45ad-9110-78adf5a5d233",
+    "alias" : "Browser - Conditional OTP",
+    "description" : "Flow to determine if the OTP is required for the authentication",
+    "providerId" : "basic-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "conditional-user-configured",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "auth-otp-form",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 20,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "99c5ba83-b585-4601-b740-1a26670bf4e9",
+    "alias" : "Direct Grant - Conditional OTP",
+    "description" : "Flow to determine if the OTP is required for the authentication",
+    "providerId" : "basic-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "conditional-user-configured",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "direct-grant-validate-otp",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 20,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "65b73dec-7dd1-4de8-b542-a023b7104afc",
+    "alias" : "First broker login - Conditional OTP",
+    "description" : "Flow to determine if the OTP is required for the authentication",
+    "providerId" : "basic-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "conditional-user-configured",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "auth-otp-form",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 20,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "9a26b76f-da95-43f1-8da3-16c4a0654f07",
+    "alias" : "Handle Existing Account",
+    "description" : "Handle what to do if there is existing account with same email/username like authenticated identity provider",
+    "providerId" : "basic-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "idp-confirm-link",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticatorFlow" : true,
+      "requirement" : "REQUIRED",
+      "priority" : 20,
+      "autheticatorFlow" : true,
+      "flowAlias" : "Account verification options",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "0a77285e-d7d5-4b6c-aa9a-3eadb5e7e3d3",
+    "alias" : "Reset - Conditional OTP",
+    "description" : "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
+    "providerId" : "basic-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "conditional-user-configured",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "reset-otp",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 20,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "cb6c0b3b-2f5f-4493-9d14-6130f8b58dd7",
+    "alias" : "User creation or linking",
+    "description" : "Flow for the existing/non-existing user alternatives",
+    "providerId" : "basic-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticatorConfig" : "create unique user config",
+      "authenticator" : "idp-create-user-if-unique",
+      "authenticatorFlow" : false,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticatorFlow" : true,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 20,
+      "autheticatorFlow" : true,
+      "flowAlias" : "Handle Existing Account",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "0fd3db1b-e93d-4768-82ca-a1498ddc11d0",
+    "alias" : "Verify Existing Account by Re-authentication",
+    "description" : "Reauthentication of existing account",
+    "providerId" : "basic-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "idp-username-password-form",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticatorFlow" : true,
+      "requirement" : "CONDITIONAL",
+      "priority" : 20,
+      "autheticatorFlow" : true,
+      "flowAlias" : "First broker login - Conditional OTP",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "86610e70-f9f5-4c11-8a9e-9de1770565fb",
+    "alias" : "browser",
+    "description" : "browser based authentication",
+    "providerId" : "basic-flow",
+    "topLevel" : true,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "auth-cookie",
+      "authenticatorFlow" : false,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "auth-spnego",
+      "authenticatorFlow" : false,
+      "requirement" : "DISABLED",
+      "priority" : 20,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "identity-provider-redirector",
+      "authenticatorFlow" : false,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 25,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticatorFlow" : true,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 30,
+      "autheticatorFlow" : true,
+      "flowAlias" : "forms",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "f6aa23dd-8532-4d92-9780-3ea226481e3b",
+    "alias" : "clients",
+    "description" : "Base authentication for clients",
+    "providerId" : "client-flow",
+    "topLevel" : true,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "client-secret",
+      "authenticatorFlow" : false,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "client-jwt",
+      "authenticatorFlow" : false,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 20,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "client-secret-jwt",
+      "authenticatorFlow" : false,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 30,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "client-x509",
+      "authenticatorFlow" : false,
+      "requirement" : "ALTERNATIVE",
+      "priority" : 40,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "4d2caf65-1703-4ddb-8890-70232e91bcd8",
+    "alias" : "direct grant",
+    "description" : "OpenID Connect Resource Owner Grant",
+    "providerId" : "basic-flow",
+    "topLevel" : true,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "direct-grant-validate-username",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "direct-grant-validate-password",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 20,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticatorFlow" : true,
+      "requirement" : "CONDITIONAL",
+      "priority" : 30,
+      "autheticatorFlow" : true,
+      "flowAlias" : "Direct Grant - Conditional OTP",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "eaa20c41-5334-4fb4-8c45-fb9cc71f7f74",
+    "alias" : "docker auth",
+    "description" : "Used by Docker clients to authenticate against the IDP",
+    "providerId" : "basic-flow",
+    "topLevel" : true,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "docker-http-basic-authenticator",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "b9febfb1-f0aa-4590-b782-272a4aa11575",
+    "alias" : "first broker login",
+    "description" : "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
+    "providerId" : "basic-flow",
+    "topLevel" : true,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticatorConfig" : "review profile config",
+      "authenticator" : "idp-review-profile",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticatorFlow" : true,
+      "requirement" : "REQUIRED",
+      "priority" : 20,
+      "autheticatorFlow" : true,
+      "flowAlias" : "User creation or linking",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "03bb6ff4-eccb-4f2f-8953-3769f78c3bf3",
+    "alias" : "forms",
+    "description" : "Username, password, otp and other auth forms.",
+    "providerId" : "basic-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "auth-username-password-form",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticatorFlow" : true,
+      "requirement" : "CONDITIONAL",
+      "priority" : 20,
+      "autheticatorFlow" : true,
+      "flowAlias" : "Browser - Conditional OTP",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "38385189-246b-4ea0-ac05-d49dfe1709da",
+    "alias" : "http challenge",
+    "description" : "An authentication flow based on challenge-response HTTP Authentication Schemes",
+    "providerId" : "basic-flow",
+    "topLevel" : true,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "no-cookie-redirect",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticatorFlow" : true,
+      "requirement" : "REQUIRED",
+      "priority" : 20,
+      "autheticatorFlow" : true,
+      "flowAlias" : "Authentication Options",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "1022f3c2-0469-41c9-861e-918908f103df",
+    "alias" : "registration",
+    "description" : "registration flow",
+    "providerId" : "basic-flow",
+    "topLevel" : true,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "registration-page-form",
+      "authenticatorFlow" : true,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : true,
+      "flowAlias" : "registration form",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "00d36c3b-e1dc-41f8-bfd0-5f8c80ea07e8",
+    "alias" : "registration form",
+    "description" : "registration form",
+    "providerId" : "form-flow",
+    "topLevel" : false,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "registration-user-creation",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 20,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "registration-profile-action",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 40,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "registration-password-action",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 50,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "registration-recaptcha-action",
+      "authenticatorFlow" : false,
+      "requirement" : "DISABLED",
+      "priority" : 60,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "4374c16e-8c65-4168-94c2-df1ab3f3e6ad",
+    "alias" : "reset credentials",
+    "description" : "Reset credentials for a user if they forgot their password or something",
+    "providerId" : "basic-flow",
+    "topLevel" : true,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "reset-credentials-choose-user",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "reset-credential-email",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 20,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticator" : "reset-password",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 30,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    }, {
+      "authenticatorFlow" : true,
+      "requirement" : "CONDITIONAL",
+      "priority" : 40,
+      "autheticatorFlow" : true,
+      "flowAlias" : "Reset - Conditional OTP",
+      "userSetupAllowed" : false
+    } ]
+  }, {
+    "id" : "04d6ed6a-76c9-41fb-9074-bff8a80c2286",
+    "alias" : "saml ecp",
+    "description" : "SAML ECP Profile Authentication Flow",
+    "providerId" : "basic-flow",
+    "topLevel" : true,
+    "builtIn" : true,
+    "authenticationExecutions" : [ {
+      "authenticator" : "http-basic-authenticator",
+      "authenticatorFlow" : false,
+      "requirement" : "REQUIRED",
+      "priority" : 10,
+      "autheticatorFlow" : false,
+      "userSetupAllowed" : false
+    } ]
+  } ],
+  "authenticatorConfig" : [ {
+    "id" : "e7bad67d-1236-430a-a327-9194f9d1e2b0",
+    "alias" : "create unique user config",
+    "config" : {
+      "require.password.update.after.registration" : "false"
+    }
+  }, {
+    "id" : "287b5989-a927-4cf5-8067-74594ce19bc1",
+    "alias" : "review profile config",
+    "config" : {
+      "update.profile.on.first.login" : "missing"
+    }
+  } ],
+  "requiredActions" : [ {
+    "alias" : "CONFIGURE_TOTP",
+    "name" : "Configure OTP",
+    "providerId" : "CONFIGURE_TOTP",
+    "enabled" : true,
+    "defaultAction" : false,
+    "priority" : 10,
+    "config" : { }
+  }, {
+    "alias" : "terms_and_conditions",
+    "name" : "Terms and Conditions",
+    "providerId" : "terms_and_conditions",
+    "enabled" : false,
+    "defaultAction" : false,
+    "priority" : 20,
+    "config" : { }
+  }, {
+    "alias" : "UPDATE_PASSWORD",
+    "name" : "Update Password",
+    "providerId" : "UPDATE_PASSWORD",
+    "enabled" : true,
+    "defaultAction" : false,
+    "priority" : 30,
+    "config" : { }
+  }, {
+    "alias" : "UPDATE_PROFILE",
+    "name" : "Update Profile",
+    "providerId" : "UPDATE_PROFILE",
+    "enabled" : true,
+    "defaultAction" : false,
+    "priority" : 40,
+    "config" : { }
+  }, {
+    "alias" : "VERIFY_EMAIL",
+    "name" : "Verify Email",
+    "providerId" : "VERIFY_EMAIL",
+    "enabled" : true,
+    "defaultAction" : false,
+    "priority" : 50,
+    "config" : { }
+  }, {
+    "alias" : "delete_account",
+    "name" : "Delete Account",
+    "providerId" : "delete_account",
+    "enabled" : false,
+    "defaultAction" : false,
+    "priority" : 60,
+    "config" : { }
+  }, {
+    "alias" : "webauthn-register",
+    "name" : "Webauthn Register",
+    "providerId" : "webauthn-register",
+    "enabled" : true,
+    "defaultAction" : false,
+    "priority" : 70,
+    "config" : { }
+  }, {
+    "alias" : "webauthn-register-passwordless",
+    "name" : "Webauthn Register Passwordless",
+    "providerId" : "webauthn-register-passwordless",
+    "enabled" : true,
+    "defaultAction" : false,
+    "priority" : 80,
+    "config" : { }
+  }, {
+    "alias" : "update_user_locale",
+    "name" : "Update User Locale",
+    "providerId" : "update_user_locale",
+    "enabled" : true,
+    "defaultAction" : false,
+    "priority" : 1000,
+    "config" : { }
+  } ],
+  "browserFlow" : "browser",
+  "registrationFlow" : "registration",
+  "directGrantFlow" : "direct grant",
+  "resetCredentialsFlow" : "reset credentials",
+  "clientAuthenticationFlow" : "clients",
+  "dockerAuthenticationFlow" : "docker auth",
+  "attributes" : {
+    "cibaBackchannelTokenDeliveryMode" : "poll",
+    "cibaAuthRequestedUserHint" : "login_hint",
+    "oauth2DevicePollingInterval" : "5",
+    "clientOfflineSessionMaxLifespan" : "0",
+    "clientSessionIdleTimeout" : "0",
+    "clientOfflineSessionIdleTimeout" : "0",
+    "cibaInterval" : "5",
+    "cibaExpiresIn" : "120",
+    "oauth2DeviceCodeLifespan" : "600",
+    "parRequestUriLifespan" : "60",
+    "clientSessionMaxLifespan" : "0",
+    "frontendUrl" : ""
+  },
+  "keycloakVersion" : "19.0.3",
+  "userManagedAccessAllowed" : false,
+  "clientProfiles" : {
+    "profiles" : [ ]
+  },
+  "clientPolicies" : {
+    "policies" : [ ]
+  }
+}
diff --git a/conf/localstack/buckets.sh b/conf/localstack/buckets.sh
new file mode 100755
index 00000000000..fe940d9890d
--- /dev/null
+++ b/conf/localstack/buckets.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# https://stackoverflow.com/questions/53619901/auto-create-s3-buckets-on-localstack
+awslocal s3 mb s3://mybucket
diff --git a/conf/openshift/openshift.json b/conf/openshift/openshift.json
deleted file mode 100644
index 583079a5260..00000000000
--- a/conf/openshift/openshift.json
+++ /dev/null
@@ -1,646 +0,0 @@
-{
-  "kind": "Template",
-  "apiVersion": "v1",
-  "metadata": {
-    "name": "dataverse",
-    "labels": {
-      "name": "dataverse"
-    },
-    "annotations": {
-      "openshift.io/description": "Dataverse is open source research data repository software: https://dataverse.org",
-      "openshift.io/display-name": "Dataverse"
-    }
-  },
-  "objects": [
-    {
-      "kind": "Secret",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "dataverse-admin-secret"
-      },
-      "stringData" : {
-        "admin-password" : "${ADMIN_PASSWORD}"
-      }
-    },
-    {
-      "kind": "Secret",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "dataverse-postgresql-secret"
-      },
-      "stringData" : {
-        "postgresql-user" : "${POSTGRESQL_USER}",
-        "postgresql-password" : "${POSTGRESQL_PASSWORD}"
-      }
-    },
-    {
-      "kind": "Secret",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "dataverse-postgresql-master-secret"
-      },
-      "stringData" : {
-        "postgresql-master-user" : "${POSTGRESQL_MASTER_USER}",
-        "postgresql-master-password" : "${POSTGRESQL_MASTER_PASSWORD}"
-      }
-    },
-    {
-      "kind": "Secret",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "dataverse-postgresql-admin-secret"
-      },
-      "stringData" : {
-        "postgresql-admin-password" : "${POSTGRESQL_ADMIN_PASSWORD}"
-      }
-    },
-    {
-      "kind": "Service",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "dataverse-glassfish-service"
-      },
-      "spec": {
-        "selector": {
-          "name": "iqss-dataverse-glassfish"
-        },
-        "ports": [
-          {
-            "name": "web",
-            "protocol": "TCP",
-            "port": 8080,
-            "targetPort": 8080
-          }
-        ]
-      }
-    },
-    {
-      "kind": "Service",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "dataverse-postgresql-service"
-      },
-      "spec": {
-        "selector": {
-          "name": "iqss-dataverse-postgresql"
-        },
-        "clusterIP": "None",
-        "ports": [
-          {
-            "name": "database",
-            "protocol": "TCP",
-            "port": 5432,
-            "targetPort": 5432
-          }
-        ]
-      }
-    },
-    {
-      "kind": "Service",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "dataverse-solr-service"
-      },
-      "spec": {
-        "selector": {
-          "name": "iqss-dataverse-solr"
-        },
-        "clusterIP": "None",
-        "ports": [
-          {
-            "name": "search",
-            "protocol": "TCP",
-            "port": 8983,
-            "targetPort": 8983
-          }
-        ]
-      }
-    },
-    {
-      "apiVersion": "v1",
-      "kind": "Route",
-      "metadata": {
-        "annotations": {
-          "openshift.io/host.generated": "true"
-        },
-        "name": "dataverse"
-      },
-      "spec": {
-        "port": {
-          "targetPort": "web"
-        },
-        "to": {
-          "kind": "Service",
-          "name": "dataverse-glassfish-service",
-          "weight": 100
-        }
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "dataverse-plus-glassfish"
-      },
-      "spec": {
-        "dockerImageRepository": "iqss/dataverse-glassfish"
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "centos-postgresql-94-centos7"
-      },
-      "spec": {
-        "dockerImageRepository": "centos/postgresql-94-centos7"
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "iqss-dataverse-solr"
-      },
-      "spec": {
-        "dockerImageRepository": "iqss/dataverse-solr"
-      }
-    },
-    {
-      "kind": "StatefulSet",
-      "apiVersion": "apps/v1beta1",
-      "metadata": {
-        "name": "dataverse-glassfish",
-        "annotations": {
-          "template.alpha.openshift.io/wait-for-ready": "true",
-          "alpha.image.policy.openshift.io/resolve-names": "*"
-        }
-      },
-      "spec": {
-        "serviceName": "dataverse-glassfish",
-        "replicas": 1,
-        "template": {
-          "metadata": {
-            "labels": {
-              "name": "iqss-dataverse-glassfish"
-            }
-          },
-          "spec": {
-            "initContainers": [
-              {
-                "name": "start-glassfish",
-                "image": "iqss/init-container:latest",
-                "imagePullPolicy": "IfNotPresent",
-                "env": [
-                  {
-                    "name": "CONTAINER_NAME",
-                    "valueFrom": {
-                      "fieldRef": {
-                        "fieldPath": "metadata.name"
-                      }
-                    }
-                  },
-                  {
-                    "name": "MY_POD_NAME",
-                    "value": "start-glassfish"
-                  },
-                  {
-                    "name": "POSTGRES_ADMIN_PASSWORD",
-                    "valueFrom": {
-                        "secretKeyRef": {
-                    	    "name" : "dataverse-postgresql-admin-secret",
-                    	    "key" : "postgresql-admin-password"
-                    	}
-                    } 
-                  },
-                  {
-                    "name": "POSTGRES_SERVER",
-                    "value": "dataverse-postgresql-0"
-                  },
-                  
-                  {
-                    "name": "POSTGRES_SERVICE_HOST",
-                    "value": "dataverse-postgresql-service"
-                  },
-                  {
-                    "name": "POSTGRES_USER",
-                    "valueFrom": {
-                    	"secretKeyRef": {
-                    		"name" : "dataverse-postgresql-secret",
-                    		"key" : "postgresql-user"
-                    	}
-                    }
-                  },
-                  {
-                    "name": "POSTGRES_PASSWORD",
-                    "valueFrom": {
-                    	"secretKeyRef": {
-                    		"name" : "dataverse-postgresql-secret",
-                    		"key" : "postgresql-password"
-                    	}
-                    }
-                  },
-                  {
-                    "name": "POSTGRES_DATABASE",
-                    "value": "dvndb"
-                  }
-                ]
-              }
-            ],
-            "containers": [
-              {
-                "name": "dataverse-plus-glassfish",
-                "image": "iqss/dataverse-glassfish",
-                "ports": [
-                  {
-                    "containerPort": 8080,
-                    "protocol": "TCP"
-                  }
-                ],
-                "resources": {
-                  "limits": {
-                    "memory": "2048Mi"
-                  }
-                },
-                "env": [
-                  {
-                    "name": "MY_POD_NAME",
-                    "valueFrom": {
-                      "fieldRef": {
-                        "fieldPath": "metadata.name"
-                      }
-                    }
-                  },
-                  {
-                    "name": "POSTGRES_SERVER",
-                    "value": "dataverse-postgresql-0"
-                  },
-                  {
-                    "name": "POSTGRESQL_ADMIN_PASSWORD",
-                    "valueFrom": {
-                        "secretKeyRef": {
-                    	    "name" : "dataverse-postgresql-admin-secret",
-                    	    "key" : "postgresql-admin-password"
-                    	}
-                    } 
-                  },
-                  {
-                    "name": "POSTGRES_SERVICE_HOST",
-                    "value": "dataverse-postgresql-service"
-                  },
-                  {
-                    "name": "SOLR_SERVICE_HOST",
-                    "value": "dataverse-solr-service"
-                  },
-                  {
-                    "name": "ADMIN_PASSWORD",
-                    "valueFrom": {
-                    	"secretKeyRef": {
-                    		"name" : "dataverse-admin-secret",
-                    		"key" : "admin-password"
-                    	}
-                    }
-                  },
-                  {
-                    "name": "SMTP_HOST",
-                    "value": "localhost"
-                  },
-                  {
-                    "name": "POSTGRES_USER",
-                    "valueFrom": {
-                    	"secretKeyRef": {
-                    		"name" : "dataverse-postgresql-secret",
-                    		"key" : "postgresql-user"
-                    	}
-                    }
-                  },
-                  {
-                    "name": "POSTGRES_PASSWORD",
-                    "valueFrom": {
-                    	"secretKeyRef": {
-                    		"name" : "dataverse-postgresql-secret",
-                    		"key" : "postgresql-password"
-                    	}
-                    }
-                  },
-                  {
-                    "name": "POSTGRES_DATABASE",
-                    "value": "dvndb"
-                  }
-                ],
-                "imagePullPolicy": "IfNotPresent",
-                "securityContext": {
-                  "capabilities": {},
-                  "privileged": false
-                }
-              }
-            ]
-          }
-        },
-        "strategy": {
-          "type": "Rolling",
-          "rollingParams": {
-            "updatePeriodSeconds": 1,
-            "intervalSeconds": 1,
-            "timeoutSeconds": 300
-          },
-          "resources": {
-            "limits": {
-              "memory": "512Mi"
-            }
-          }
-        },
-        "triggers": [
-          {
-            "type": "ImageChange",
-            "imageChangeParams": {
-              "automatic": true,
-              "containerNames": [
-                "dataverse-plus-glassfish"
-              ],
-              "from": {
-                "kind": "ImageStreamTag",
-                "name": "dataverse-plus-glassfish:latest"
-              }
-            }
-          },
-          {
-            "type": "ConfigChange"
-          }
-        ],
-        "selector": {
-          "name": "iqss-dataverse-glassfish",
-          "matchLabels": {
-            "name": "iqss-dataverse-glassfish"
-          }
-        }
-      }
-    },
-    {
-      "kind": "StatefulSet",
-      "apiVersion": "apps/v1beta1",
-      "metadata": {
-        "name": "dataverse-postgresql",
-        "annotations": {
-          "template.alpha.openshift.io/wait-for-ready": "true"
-        }
-      },
-      "spec": {
-        "serviceName": "dataverse-postgresql-service",
-        "replicas": 1,
-        "template": {
-          "metadata": {
-            "labels": {
-              "name": "iqss-dataverse-postgresql"
-            }
-          },
-          "spec": {
-            "containers": [
-              {
-                "name": "centos-postgresql-94-centos7",
-                "image": "centos/postgresql-94-centos7",
-                "command": [
-                  "sh",
-                  "-c",
-                  "echo 'Setting up Postgres Master/Slave replication...'; [[ `hostname` =~ -([0-9]+)$ ]] || exit 1; ordinal=${BASH_REMATCH[1]}; if [[ $ordinal -eq 0 ]]; then run-postgresql-master; else run-postgresql-slave; fi;"
-                ],
-                "ports": [
-                  {
-                    "containerPort": 5432,
-                    "protocol": "TCP"
-                  }
-                ],
-                "env": [
-                  {
-                    "name": "POSTGRESQL_USER",
-                    "valueFrom": {
-                    	"secretKeyRef": {
-                    		"name" : "dataverse-postgresql-secret",
-                    		"key" : "postgresql-user"
-                    	}
-                    }
-                  },
-                  {
-                    "name": "POSTGRESQL_MASTER_USER",
-                    "valueFrom": {
-                    	"secretKeyRef": {
-                    		"name" : "dataverse-postgresql-master-secret",
-                    		"key" : "postgresql-master-user"
-                    	}
-                    }
-                  },
-                  {
-                    "name": "POSTGRESQL_PASSWORD",
-                    "valueFrom": {
-                    	"secretKeyRef": {
-                    		"name" : "dataverse-postgresql-secret",
-                    		"key" : "postgresql-password"
-                    	}
-                    }
-                  },
-                  {
-                    "name": "POSTGRESQL_MASTER_PASSWORD",
-                    "valueFrom": {
-                    	"secretKeyRef": {
-                    		"name" : "dataverse-postgresql-master-secret",
-                    		"key" : "postgresql-master-password"
-                    	}
-                    }
-                  },
-                  {
-                    "name": "POSTGRESQL_MASTER_SERVICE_NAME",
-                    "value": "dataverse-postgresql-service"
-                  },
-                  {
-                    "name": "POSTGRESQL_MASTER_IP",
-                    "value": "dataverse-postgresql-0.dataverse-postgresql-service"
-                  },
-                  {
-                    "name": "postgresql_master_addr",
-                    "value": "dataverse-postgresql-0.dataverse-postgresql-service"
-                  },
-                  {
-                    "name": "master_fqdn",
-                    "value": "dataverse-postgresql-0.dataverse-postgresql-service"
-                  },
-                  {
-                    "name": "POSTGRESQL_DATABASE",
-                    "value": "dvndb"
-                  },
-                  {
-                    "name": "POSTGRESQL_ADMIN_PASSWORD",
-                    "valueFrom": {
-                    	"secretKeyRef": {
-                    		"name" : "dataverse-postgresql-admin-secret",
-                    		"key" : "postgresql-admin-password"
-                    	}
-                    }
-                  }
-                ],
-                "resources": {
-                  "limits": {
-                    "memory": "256Mi"
-                  }
-                },
-                "imagePullPolicy": "IfNotPresent",
-                "securityContext": {
-                  "capabilities": {},
-                  "privileged": false
-                }
-              }
-            ]
-          }
-        },
-        "strategy": {
-          "type": "Rolling",
-          "rollingParams": {
-            "updatePeriodSeconds": 1,
-            "intervalSeconds": 1,
-            "timeoutSeconds": 300
-          },
-          "resources": {}
-        },
-        "triggers": [
-          {
-            "type": "ImageChange",
-            "imageChangeParams": {
-              "automatic": true,
-              "containerNames": [
-                "centos-postgresql-94-centos7"
-              ],
-              "from": {
-                "kind": "ImageStreamTag",
-                "name": "centos/postgresql-94-centos7:latest"
-              }
-            }
-          },
-          {
-            "type": "ConfigChange"
-          }
-        ],
-        "selector": {
-          "name": "iqss-dataverse-postgresql",
-          "matchLabels": {
-            "name": "iqss-dataverse-postgresql"
-          }
-        }
-      }
-    },
-    {
-      "kind": "StatefulSet",
-      "apiVersion": "apps/v1beta1",
-      "metadata": {
-        "name": "dataverse-solr",
-        "annotations": {
-          "template.alpha.openshift.io/wait-for-ready": "true"
-        }
-      },
-      "spec": {
-        "serviceName" : "dataverse-solr-service",
-        "template": {
-          "metadata": {
-            "labels": {
-              "name": "iqss-dataverse-solr"
-            }
-          },
-          "spec": {
-            "containers": [
-              {
-                "name": "iqss-dataverse-solr",
-                "image": "iqss/dataverse-solr",
-                "ports": [
-                  {
-                    "containerPort": 8983,
-                    "protocol": "TCP"
-                  }
-                ],
-                "resources": {
-                  "limits": {
-                    "memory": "1024Mi"
-                  }
-                },
-                "imagePullPolicy": "IfNotPresent",
-                "securityContext": {
-                  "capabilities": {},
-                  "privileged": false
-                }
-              }
-            ]
-          }
-        },
-        "strategy": {
-          "type": "Rolling",
-          "rollingParams": {
-            "updatePeriodSeconds": 1,
-            "intervalSeconds": 1,
-            "timeoutSeconds": 300
-          },
-          "resources": {}
-        },
-        "triggers": [
-          {
-            "type": "ImageChange",
-            "imageChangeParams": {
-              "automatic": true,
-              "containerNames": [
-                "iqss-dataverse-solr"
-              ],
-              "from": {
-                "kind": "ImageStreamTag",
-                "name": "iqss-dataverse-solr:latest"
-              }
-            }
-          },
-          {
-            "type": "ConfigChange"
-          }
-        ],
-        "replicas": 1,
-        "selector": {
-          "name": "iqss-dataverse-solr",
-          "matchLabels" : {
-            "name" : "iqss-dataverse-solr"
-          }
-        }
-      }
-    }
-  ],
-  "parameters": [
-    {
-  	"name": "ADMIN_PASSWORD",
-  	"description": "admin password",
-        "generate": "expression",
-        "from": "[a-zA-Z0-9]{8}"
-    },
-    {
-        "name": "POSTGRESQL_USER",
-        "description": "postgresql user",
-        "generate": "expression",
-        "from": "user[A-Z0-9]{3}"
-    },
-    {
-        "name": "POSTGRESQL_PASSWORD",
-        "description": "postgresql password",
-        "generate": "expression",
-        "from": "[a-zA-Z0-9]{8}"
-    },
-    {
-      "name": "POSTGRESQL_MASTER_USER",
-      "description": "postgresql master user",
-      "generate": "expression",
-      "from": "user[A-Z0-9]{3}"
-    },
-    {
-        "name": "POSTGRESQL_MASTER_PASSWORD",
-        "description": "postgresql master password",
-        "generate": "expression",
-        "from": "[a-zA-Z0-9]{8}"
-    },
-    {
-        "name": "POSTGRESQL_ADMIN_PASSWORD",
-        "description": "postgresql admin password",
-        "generate": "expression",
-        "from": "[a-zA-Z0-9]{8}"
-    }
-  ]
-}
diff --git a/conf/proxy/Caddyfile b/conf/proxy/Caddyfile
new file mode 100644
index 00000000000..70e6904d26e
--- /dev/null
+++ b/conf/proxy/Caddyfile
@@ -0,0 +1,12 @@
+# This configuration is intended to be used with Caddy, a very small high perf proxy.
+# It will serve the application containers Payara Admin GUI via HTTP instead of HTTPS,
+# avoiding the trouble of self signed certificates for local development.
+
+:4848 {
+	reverse_proxy https://dataverse:4848 {
+		transport http {
+			tls_insecure_skip_verify
+		}
+		header_down Location "^https://" "http://"
+	}
+}
diff --git a/conf/solr/7.3.1/readme.md b/conf/solr/7.3.1/readme.md
deleted file mode 100644
index 4457cf9a7df..00000000000
--- a/conf/solr/7.3.1/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Please see the dev guide for what to do with Solr config files.
\ No newline at end of file
diff --git a/conf/solr/7.3.1/schema.xml b/conf/solr/7.3.1/schema.xml
deleted file mode 100644
index fd307a32f07..00000000000
--- a/conf/solr/7.3.1/schema.xml
+++ /dev/null
@@ -1,1186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-
- This example schema is the recommended starting point for users.
- It should be kept correct and concise, usable out-of-the-box.
-
-
- For more information, on how to customize this file, please see
- http://lucene.apache.org/solr/guide/documents-fields-and-schema-design.html
-
- PERFORMANCE NOTE: this schema includes many optional features and should not
- be used for benchmarking.  To improve performance one could
-  - set stored="false" for all fields possible (esp large fields) when you
-    only need to search on the field but don't need to return the original
-    value.
-  - set indexed="false" if you don't need to search on the field, but only
-    return the field as a result of searching on other indexed fields.
-  - remove all unneeded copyField statements
-  - for best index size and searching performance, set "index" to false
-    for all general text fields, use copyField to copy them to the
-    catchall "text" field, and use that for searching.
--->
-
-<schema name="default-config" version="1.6">
-    <!-- attribute "name" is the name of this schema and is only used for display purposes.
-       version="x.y" is Solr's version number for the schema syntax and 
-       semantics.  It should not normally be changed by applications.
-
-       1.0: multiValued attribute did not exist, all fields are multiValued 
-            by nature
-       1.1: multiValued attribute introduced, false by default 
-       1.2: omitTermFreqAndPositions attribute introduced, true by default 
-            except for text fields.
-       1.3: removed optional field compress feature
-       1.4: autoGeneratePhraseQueries attribute introduced to drive QueryParser
-            behavior when a single string produces multiple tokens.  Defaults 
-            to off for version >= 1.4
-       1.5: omitNorms defaults to true for primitive field types 
-            (int, float, boolean, string...)
-       1.6: useDocValuesAsStored defaults to true.
-    -->
-
-    <!-- Valid attributes for fields:
-     name: mandatory - the name for the field
-     type: mandatory - the name of a field type from the 
-       fieldTypes section
-     indexed: true if this field should be indexed (searchable or sortable)
-     stored: true if this field should be retrievable
-     docValues: true if this field should have doc values. Doc Values is
-       recommended (required, if you are using *Point fields) for faceting,
-       grouping, sorting and function queries. Doc Values will make the index
-       faster to load, more NRT-friendly and more memory-efficient. 
-       They are currently only supported by StrField, UUIDField, all 
-       *PointFields, and depending on the field type, they might require
-       the field to be single-valued, be required or have a default value
-       (check the documentation of the field type you're interested in for
-       more information)
-     multiValued: true if this field may contain multiple values per document
-     omitNorms: (expert) set to true to omit the norms associated with
-       this field (this disables length normalization and index-time
-       boosting for the field, and saves some memory).  Only full-text
-       fields or fields that need an index-time boost need norms.
-       Norms are omitted for primitive (non-analyzed) types by default.
-     termVectors: [false] set to true to store the term vector for a
-       given field.
-       When using MoreLikeThis, fields used for similarity should be
-       stored for best performance.
-     termPositions: Store position information with the term vector.  
-       This will increase storage costs.
-     termOffsets: Store offset information with the term vector. This 
-       will increase storage costs.
-     required: The field is required.  It will throw an error if the
-       value does not exist
-     default: a value that should be used if no value is specified
-       when adding a document.
-    -->
-
-    <!-- field names should consist of alphanumeric or underscore characters only and
-      not start with a digit.  This is not currently strictly enforced,
-      but other field names will not have first class support from all components
-      and back compatibility is not guaranteed.  Names with both leading and
-      trailing underscores (e.g. _version_) are reserved.
-    -->
-
-    <!-- In this _default configset, only four fields are pre-declared:
-         id, _version_, and _text_ and _root_. All other fields will be type guessed and added via the
-         "add-unknown-fields-to-the-schema" update request processor chain declared in solrconfig.xml.
-         
-         Note that many dynamic fields are also defined - you can use them to specify a 
-         field's type via field naming conventions - see below.
-  
-         WARNING: The _text_ catch-all field will significantly increase your index size.
-         If you don't need it, consider removing it and the corresponding copyField directive."
-    -->
-
-    <field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" />
-    <!-- docValues are enabled by default for long type so we don't need to index the version field  -->
-    <field name="_version_" type="plong" indexed="false" stored="false"/>
-    <field name="_root_" type="string" indexed="true" stored="false" docValues="false" />
-
-    
-     
-    
-    
-<!-- Start: Dataverse-specific -->    
-    
-    <!-- catchall field, containing all other searchable text fields (implemented
-        via copyField further on in this schema  -->
-    <!-- Dataverse solr 7.3.0: for some reason the old text wasn't working so switched to _text_ for copyfields -->
-        <!--<field name="text" type="text_general" indexed="true" stored="false" multiValued="true"/>-->
-        <field name="_text_" type="text_general" indexed="true" stored="false" multiValued="true"/>
-    <!-- catchall text field that indexes tokens both normally and in reverse for efficient
-        leading wildcard queries. -->
-    <field name="text_rev" type="text_general_rev" indexed="true" stored="false" multiValued="true"/>    
-    <field name="name" type="text_en" indexed="true" stored="true"/> 
-
-
-
-
-
-
-
-
-    <field name="definitionPointDocId" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="definitionPointDvObjectId" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="discoverableBy" type="string" stored="true" indexed="true" multiValued="true"/>
-
-    <field name="dvObjectType" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="metadataSource" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="isHarvested" type="boolean" stored="true" indexed="true" multiValued="false"/>
-    <field name="fileDeleted" type="boolean" stored="true" indexed="true" multiValued="false"/>
-
-    <field name="dvName" type="text_en" stored="true" indexed="true" multiValued="false"/>
-    <field name="dvAlias" type="text_en" stored="true" indexed="true" multiValued="false"/>
-    <field name="dvAffiliation" type="text_en" stored="true" indexed="true" multiValued="false"/>
-    <field name="dvDescription" type="text_en" stored="true" indexed="true" multiValued="false"/>
-
-    <field name="dvCategory" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="categoryOfDataverse" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="identifierOfDataverse" type="string" stored="true" indexed="true" multiValued="false"/>
-    
-    <field name="publicationDate" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="dsPublicationDate" type="string" stored="true" indexed="true" multiValued="false"/>
-
-    <field name="dvSubject" type="string" stored="true" indexed="true" multiValued="true"/>
-
-    <field name="publicationStatus" type="string" stored="true" indexed="true" multiValued="true"/>
-
-    <field name="subtreePaths" type="string" stored="true" indexed="true" multiValued="true"/>
-
-    <field name="fileName" type="text_en" stored="true" indexed="true" multiValued="true"/>
-    <field name="fileType" type="text_en" stored="true" indexed="true" multiValued="true"/>
-    <field name="fileNameWithoutExtension" type="text_en" stored="true" indexed="true" multiValued="true"/>
-    <field name="variableName" type="text_en" stored="true" indexed="true" multiValued="true"/>
-    <field name="variableLabel" type="text_en" stored="true" indexed="true" multiValued="true"/>
-
-    <field name="fileDescription" type="text_en" stored="true" indexed="true" multiValued="false"/>
-
-    <field name="fileTypeGroupFacet" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="fileTypeDisplay" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="fileTag" type="string" stored="true" indexed="true" multiValued="true"/>
-    <field name="fileTags" type="text_en" stored="true" indexed="true" multiValued="true"/>
-    <field name="tabularDataTag" type="string" stored="true" indexed="true" multiValued="true"/>
-    <field name="fileAccess" type="string" stored="true" indexed="true" multiValued="true"/>
-
-    <!-- Added for Dataverse 4.0 alpha 1: static "parent" fields not copied to "catchall" field https://redmine.hmdc.harvard.edu/issues/3603  -->
-    <!-- We index parentid and parentname as a debugging aid in case we want to match on it with an explict query like curl 'http://localhost:8983/solr/collection1/select?rows=100&wt=json&indent=true&q=parentId%3A42' or curl 'http://localhost:8983/solr/collection1/select?rows=100&wt=json&indent=true&q=parentName%3Abirds' -->
-    <!-- TODO: store parentid as a long instead of a string  -->
-    <field name="parentId" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="parentIdentifier" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="parentName" type="string" stored="true" indexed="false" multiValued="false"/>
-    <field name="parentCitation" type="string" stored="true" indexed="false" multiValued="false"/>
-    <field name="citation" type="string" stored="true" indexed="false" multiValued="false"/>
-    <field name="citationHtml" type="string" stored="true" indexed="false" multiValued="false"/>
-    <field name="identifier" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="persistentUrl" type="string" stored="true" indexed="false" multiValued="false"/>
-    <field name="unf" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="fileSizeInBytes" type="long" stored="true" indexed="true" multiValued="false"/>
-    <field name="fileMd5" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="fileChecksumType" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="fileChecksumValue" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="fileContentType" type="string" stored="true" indexed="true" multiValued="false"/>
-    <field name="deaccessionReason" type="string" stored="true" indexed="false" multiValued="false"/>
-
-    <!-- Added for Dataverse 4.0 alpha 1. This is a required field so we don't have to go to the database to get the database id of the entity. On cards we use the id in links -->
-    <field name="entityId" type="long" stored="true" indexed="true" multiValued="false"/>
-
-    <field name="datasetVersionId" type="long" stored="true" indexed="true" multiValued="false"/>
-
-    <!-- Added for Dataverse 4.0 alpha 1 to sort by name  -->
-    <!-- https://redmine.hmdc.harvard.edu/issues/3482 -->
-    <!-- 'Sorting can be done on the "score" of the document, or on any multiValued="false" indexed="true" field provided that field is either non-tokenized (ie: has no Analyzer) or uses an Analyzer that only produces a single Term (ie: uses the KeywordTokenizer)' http://wiki.apache.org/solr/CommonQueryParameters#sort -->
-    <!-- http://stackoverflow.com/questions/13360706/solr-4-0-alphabetical-sorting-trouble/13361226#13361226 -->
-    <field name="nameSort" type="alphaOnlySort" indexed="true" stored="true"/>
-
-    <field name="dateSort" type="date" indexed="true" stored="true"/>
-
-    <!-- Added for Dataverse 4.0: release date https://redmine.hmdc.harvard.edu/issues/3592 -->
-    <field name="releasedate" type="int" indexed="true" stored="true"/>
-
-    <!-- Added for Dataverse 4.0: do we want a description field that applies to dataverses, datasets, and files? https://redmine.hmdc.harvard.edu/issues/3745 -->
-    <field name="description" type="text_en" multiValued="false" stored="true" indexed="true"/>
-
-    <field name="dsPersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    
-    <!-- Dynamic Dataverse fields from http://localhost:8080/api/admin/index/solr/schema -->
-    <xi:include href="schema_dv_mdb_fields.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-    <copyField source="description" dest="_text_" maxChars="3000"/>
-
-    <!-- Added for Dataverse 4.0 Beta: make variable names and labels searchable in basic search https://redmine.hmdc.harvard.edu/issues/3945 -->
-    <copyField source="variableName" dest="_text_" maxChars="3000"/>
-    <copyField source="variableLabel" dest="_text_" maxChars="3000"/>
-    <!-- Make dataverse subject and affiliation searchable from basic search: https://github.com/IQSS/dataverse/issues/1431 -->
-    <copyField source="dvSubject" dest="_text_" maxChars="3000"/>
-    <copyField source="dvAlias" dest="_text_" maxChars="3000"/>
-    <copyField source="dvAffiliation" dest="_text_" maxChars="3000"/>
-    <copyField source="dsPersistentId" dest="_text_" maxChars="3000"/>
-    <!-- copyField commands copy one field to another at the time a document
-        is added to the index.  It's used either to index the same field differently,
-        or to add multiple fields to the same field for easier/faster searching.  -->
-
-    <!-- <copyField source="cat" dest="_text_"/> -->
-    <!-- Dataverse 4.0: we want the "name" field in the "catchall"  -->
-    <copyField source="name" dest="_text_"/>
-    <!-- Dataverse 4.0: we want the "filetype_en" and "filename_without_extension_en" field in the "catchall" per https://redmine.hmdc.harvard.edu/issues/3848  -->
-    <copyField source="fileType" dest="_text_"/>
-    <copyField source="fileNameWithoutExtension" dest="_text_"/>
-    <!-- <copyField source="manu" dest="_text_"/> -->
-    <!-- <copyField source="features" dest="_text_"/> -->
-    <!-- <copyField source="includes" dest="_text_"/> -->
-    <!-- <copyField source="manu" dest="manu_exact"/> -->
-
-    <!-- Copy the price into a currency enabled field (default USD) -->
-    <!-- <copyField source="price" dest="price_c"/> -->
-
-    <!-- Text fields from SolrCell to search by default in our catch-all field -->
-    <!-- <copyField source="title" dest="_text_"/> -->
-    <!-- <copyField source="author" dest="_text_"/> -->
-    <!-- <copyField source="description" dest="_text_"/> -->
-    <!-- <copyField source="keywords" dest="_text_"/> -->
-    <!-- <copyField source="content" dest="_text_"/> -->
-    <!-- <copyField source="content_type" dest="_text_"/> -->
-    <!-- <copyField source="resourcename" dest="_text_"/> -->
-    <!-- <copyField source="url" dest="_text_"/> -->
-
-    <!-- Create a string version of author for faceting -->
-    <!-- <copyField source="author" dest="author_s"/> -->
-
-    <!-- Above, multiple source fields are copied to the [text] field. 
-        Another way to map multiple source fields to the same 
-        destination field is to use the dynamic field syntax. 
-        copyField also supports a maxChars to copy setting.  -->
-
-    <!-- <copyField source="*_t" dest="_text_" maxChars="3000"/> -->
-
-    <!-- Added for Dataverse 4.0 alpha 1 for dynamic datasetfields (but later removed once we have copyField for each field  -->
-    <!-- https://redmine.hmdc.harvard.edu/issues/3586 -->
-    <!-- <copyField source="*_s" dest="_text_" maxChars="3000"/> -->
-    <!-- <copyField source="*_ss" dest="_text_" maxChars="3000"/> -->
-    <!-- <copyField source="*_i" dest="_text_" maxChars="3000"/> -->
-
-    <!-- Dataverse copyField from http://localhost:8080/api/admin/index/solr/schema -->
-    <xi:include href="schema_dv_mdb_copies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    
-<!-- End: Dataverse Specific -->
-    
-    <!-- This can be enabled, in case the client does not know what fields may be searched. It isn't enabled by default
-         because it's very expensive to index everything twice. -->
-    <!--<copyField source="*" dest="_text_"/>-->
-
-    <!-- Dynamic field definitions allow using convention over configuration
-       for fields via the specification of patterns to match field names.
-       EXAMPLE:  name="*_i" will match any field ending in _i (like myid_i, z_i)
-       RESTRICTION: the glob-like pattern in the name attribute must have a "*" only at the start or the end.  -->
-   
-    <dynamicField name="*_i"  type="pint"    indexed="true"  stored="true"/>
-    <dynamicField name="*_is" type="pints"    indexed="true"  stored="true"/>
-    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" />
-    <dynamicField name="*_ss" type="strings"  indexed="true"  stored="true"/>
-    <dynamicField name="*_l"  type="plong"   indexed="true"  stored="true"/>
-    <dynamicField name="*_ls" type="plongs"   indexed="true"  stored="true"/>
-    <dynamicField name="*_txt" type="text_general" indexed="true" stored="true"/>
-    <dynamicField name="*_b"  type="boolean" indexed="true" stored="true"/>
-    <dynamicField name="*_bs" type="booleans" indexed="true" stored="true"/>
-    <dynamicField name="*_f"  type="pfloat"  indexed="true"  stored="true"/>
-    <dynamicField name="*_fs" type="pfloats"  indexed="true"  stored="true"/>
-    <dynamicField name="*_d"  type="pdouble" indexed="true"  stored="true"/>
-    <dynamicField name="*_ds" type="pdoubles" indexed="true"  stored="true"/>
-
-    <!-- Type used for data-driven schema, to add a string copy for each text field -->
-    <dynamicField name="*_str" type="strings" stored="false" docValues="true" indexed="false" />
-
-    <dynamicField name="*_dt"  type="pdate"    indexed="true"  stored="true"/>
-    <dynamicField name="*_dts" type="pdate"    indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="*_p"  type="location" indexed="true" stored="true"/>
-    <dynamicField name="*_srpt"  type="location_rpt" indexed="true" stored="true"/>
-    
-    <!-- payloaded dynamic fields -->
-    <dynamicField name="*_dpf" type="delimited_payloads_float" indexed="true"  stored="true"/>
-    <dynamicField name="*_dpi" type="delimited_payloads_int" indexed="true"  stored="true"/>
-    <dynamicField name="*_dps" type="delimited_payloads_string" indexed="true"  stored="true"/>
-
-    <dynamicField name="attr_*" type="text_general" indexed="true" stored="true" multiValued="true"/>
-
-    <!-- Field to use to determine and enforce document uniqueness.
-      Unless this field is marked with required="false", it will be a required field
-    -->
-    <uniqueKey>id</uniqueKey>
-
-    <!-- copyField commands copy one field to another at the time a document
-       is added to the index.  It's used either to index the same field differently,
-       or to add multiple fields to the same field for easier/faster searching.
-
-    <copyField source="sourceFieldName" dest="destinationFieldName"/>
-    -->
-
-    <!-- field type definitions. The "name" attribute is
-       just a label to be used by field definitions.  The "class"
-       attribute and any other attributes determine the real
-       behavior of the fieldType.
-         Class names starting with "solr" refer to java classes in a
-       standard package such as org.apache.solr.analysis
-    -->
-
-    <!-- sortMissingLast and sortMissingFirst attributes are optional attributes are
-         currently supported on types that are sorted internally as strings
-         and on numeric types.
-       This includes "string", "boolean", "pint", "pfloat", "plong", "pdate", "pdouble".
-       - If sortMissingLast="true", then a sort on this field will cause documents
-         without the field to come after documents with the field,
-         regardless of the requested sort order (asc or desc).
-       - If sortMissingFirst="true", then a sort on this field will cause documents
-         without the field to come before documents with the field,
-         regardless of the requested sort order.
-       - If sortMissingLast="false" and sortMissingFirst="false" (the default),
-         then default lucene sorting will be used which places docs without the
-         field first in an ascending sort and last in a descending sort.
-    -->
-
-<fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
-<fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
-<fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
-<fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
-
-<fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
-<fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
-<fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
-<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
-
-<!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
-        is a more restricted form of the canonical representation of dateTime
-        http://www.w3.org/TR/xmlschema-2/#dateTime    
-        The trailing "Z" designates UTC time and is mandatory.
-        Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
-        All other components are mandatory.
-
-        Expressions can also be used to denote calculations that should be
-        performed relative to "NOW" to determine the value, ie...
-
-            NOW/HOUR
-                ... Round to the start of the current hour
-            NOW-1DAY
-                ... Exactly 1 day prior to now
-            NOW/DAY+6MONTHS+3DAYS
-                ... 6 months and 3 days in the future from the start of
-                    the current day
-                    
-        Consult the DateField javadocs for more information.
-
-        Note: For faster range queries, consider the tdate type
-    -->
-    <fieldType name="date" class="solr.TrieDateField" precisionStep="0" positionIncrementGap="0"/>
-
-    <!-- A Trie based date field for faster date range queries and date faceting. -->
-    <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
-
-    <!-- This is an example of using the KeywordTokenizer along
-        With various TokenFilterFactories to produce a sortable field
-        that does not include some properties of the source text
-    -->
-    <fieldType name="alphaOnlySort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
-        <analyzer>
-        <!-- KeywordTokenizer does no actual tokenizing, so the entire
-                input string is preserved as a single token
-            -->
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <!-- The LowerCase TokenFilter does what you expect, which can be
-                when you want your sorting to be case insensitive
-            -->
-        <filter class="solr.LowerCaseFilterFactory" />
-        <!-- The TrimFilter removes any leading or trailing whitespace -->
-        <filter class="solr.TrimFilterFactory" />
-        <!-- The PatternReplaceFilter gives you the flexibility to use
-                Java Regular expression to replace any sequence of characters
-                matching a pattern with an arbitrary replacement string, 
-                which may include back references to portions of the original
-                string matched by the pattern.
-
-                See the Java Regular Expression documentation for more
-                information on pattern and replacement string syntax.
-
-                http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-            -->
-        <!-- commented out for Dataverse 4.0 alpha 1 because Kangaroos was being sorted before 2Legit2Quit -->
-        <!-- https://redmine.hmdc.harvard.edu/issues/3482#note-11 -->
-        <!-- <filter class="solr.PatternReplaceFilterFactory" pattern="([^a-z])" replacement="" replace="all" /> -->
-        </analyzer>
-    </fieldType>   
-    
-    <!-- The StrField type is not analyzed, but indexed/stored verbatim. -->
-    <fieldType name="string" class="solr.StrField" sortMissingLast="true" docValues="true" />
-    <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" docValues="true" />
-
-    <!-- boolean type: "true" or "false" -->
-    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
-    <fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
-
-    <!--
-      Numeric field types that index values using KD-trees.
-      Point fields don't support FieldCache, so they must have docValues="true" if needed for sorting, faceting, functions, etc.
-    -->
-    <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
-    <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
-    <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
-    <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
-    
-    <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
-    <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
-    <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
-    <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
-
-    <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
-         is a more restricted form of the canonical representation of dateTime
-         http://www.w3.org/TR/xmlschema-2/#dateTime    
-         The trailing "Z" designates UTC time and is mandatory.
-         Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
-         All other components are mandatory.
-
-         Expressions can also be used to denote calculations that should be
-         performed relative to "NOW" to determine the value, ie...
-
-               NOW/HOUR
-                  ... Round to the start of the current hour
-               NOW-1DAY
-                  ... Exactly 1 day prior to now
-               NOW/DAY+6MONTHS+3DAYS
-                  ... 6 months and 3 days in the future from the start of
-                      the current day
-                      
-      -->
-    <!-- KD-tree versions of date fields -->
-    <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
-    <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
-    
-    <!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
-    <fieldType name="binary" class="solr.BinaryField"/>
-
-    <!-- solr.TextField allows the specification of custom text analyzers
-         specified as a tokenizer and a list of token filters. Different
-         analyzers may be specified for indexing and querying.
-
-         The optional positionIncrementGap puts space between multiple fields of
-         this type on the same document, with the purpose of preventing false phrase
-         matching across fields.
-
-         For more info on customizing your analyzer chain, please see
-         http://lucene.apache.org/solr/guide/understanding-analyzers-tokenizers-and-filters.html#understanding-analyzers-tokenizers-and-filters
-     -->
-
-    <!-- One can also specify an existing Analyzer class that has a
-         default constructor via the class attribute on the analyzer element.
-         Example:
-    <fieldType name="text_greek" class="solr.TextField">
-      <analyzer class="org.apache.lucene.analysis.el.GreekAnalyzer"/>
-    </fieldType>
-    -->
-
-    <!-- A text field that only splits on whitespace for exact matching of words -->
-    <dynamicField name="*_ws" type="text_ws"  indexed="true"  stored="true"/>
-    <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- A general text field that has reasonable, generic
-         cross-language defaults: it tokenizes with StandardTokenizer,
-	       removes stop words from case-insensitive "stopwords.txt"
-	       (empty by default), and down cases.  At query time only, it
-	       also applies synonyms.
-	  -->
-    <fieldType name="text_general" class="solr.TextField" positionIncrementGap="100" multiValued="true">
-      <analyzer type="index">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
-        <!-- in this example, we will only use synonyms at query time
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-        <filter class="solr.FlattenGraphFilterFactory"/>
-        -->
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- A text field with defaults appropriate for English: it tokenizes with StandardTokenizer,
-         removes English stop words (lang/stopwords_en.txt), down cases, protects words from protwords.txt, and
-         finally applies Porter's stemming.  The query time analyzer also applies synonyms from synonyms.txt. -->
-    <dynamicField name="*_txt_en" type="text_en"  indexed="true"  stored="true"/>
-    <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
-        <analyzer type="index">
-            <tokenizer class="solr.StandardTokenizerFactory"/>
-                        <!-- in this example, we will only use synonyms at query time
-                        <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-                        <filter class="solr.FlattenGraphFilterFactory"/>
-                        -->
-                        <!-- Case insensitive stop word removal.
-                        -->
-            <filter class="solr.StopFilterFactory"
-                    ignoreCase="true"
-                    words="lang/stopwords_en.txt"
-                />
-            
-            <filter class="solr.LowerCaseFilterFactory"/>
-            <filter class="solr.EnglishPossessiveFilterFactory"/>
-            <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-            
-            <!-- Solved highlighting breaking after upgrade #4836. Applied to query analyzer below too: 
-                https://stackoverflow.com/questions/26287321/solr-stemming-breaks-highlighting 
-                Solution was to ensure original word is kept by stemmer -MAD 4.9.2 -->
-            <filter class="solr.KeywordRepeatFilterFactory" />
-            <filter class="solr.PorterStemFilterFactory"/>
-            <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-        </analyzer>
-        <analyzer type="query">
-            <tokenizer class="solr.StandardTokenizerFactory"/>
-            
-            <!-- MAD 4.9.2: Solr recommends doing synonym expansion at index not query, why do we do it here tho? 
-                    https://stackoverflow.com/questions/10185079/ 
-                    To me it looks like we we copied something that works-->
-            <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-            <filter class="solr.StopFilterFactory"
-                    ignoreCase="true"
-                    words="lang/stopwords_en.txt"
-                />
-            
-            <filter class="solr.LowerCaseFilterFactory"/>
-            <filter class="solr.EnglishPossessiveFilterFactory"/>
-            <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-
-            <filter class="solr.KeywordRepeatFilterFactory" />
-            <filter class="solr.PorterStemFilterFactory"/>
-            <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-        </analyzer>
-    </fieldType>
-
-    <!-- A text field with defaults appropriate for English, plus
-         aggressive word-splitting and autophrase features enabled.
-         This field is just like text_en, except it adds
-         WordDelimiterGraphFilter to enable splitting and matching of
-         words on case-change, alpha numeric boundaries, and
-         non-alphanumeric chars.  This means certain compound word
-         cases will work, for example query "wi fi" will match
-         document "WiFi" or "wi-fi".
-    -->
-    <dynamicField name="*_txt_en_split" type="text_en_splitting"  indexed="true"  stored="true"/>
-    <fieldType name="text_en_splitting" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
-      <analyzer type="index">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <!-- in this example, we will only use synonyms at query time
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-        -->
-        <!-- Case insensitive stop word removal.
-        -->
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="lang/stopwords_en.txt"
-        />
-        <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-        <filter class="solr.PorterStemFilterFactory"/>
-        <filter class="solr.FlattenGraphFilterFactory" />
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="lang/stopwords_en.txt"
-        />
-        <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-        <filter class="solr.PorterStemFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- Less flexible matching, but less false matches.  Probably not ideal for product names,
-         but may be good for SKUs.  Can insert dashes in the wrong place and still match. -->
-    <dynamicField name="*_txt_en_split_tight" type="text_en_splitting_tight"  indexed="true"  stored="true"/>
-    <fieldType name="text_en_splitting_tight" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
-      <analyzer type="index">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_en.txt"/>
-        <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-        <filter class="solr.EnglishMinimalStemFilterFactory"/>
-        <!-- this filter can remove any duplicate tokens that appear at the same position - sometimes
-             possible with WordDelimiterGraphFilter in conjuncton with stemming. -->
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-        <filter class="solr.FlattenGraphFilterFactory" />
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_en.txt"/>
-        <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-        <filter class="solr.EnglishMinimalStemFilterFactory"/>
-        <!-- this filter can remove any duplicate tokens that appear at the same position - sometimes
-             possible with WordDelimiterGraphFilter in conjuncton with stemming. -->
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- Just like text_general except it reverses the characters of
-	       each token, to enable more efficient leading wildcard queries.
-    -->
-    <dynamicField name="*_txt_rev" type="text_general_rev"  indexed="true"  stored="true"/>
-    <fieldType name="text_general_rev" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.ReversedWildcardFilterFactory" withOriginal="true"
-                maxPosAsterisk="3" maxPosQuestion="2" maxFractionAsterisk="0.33"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <dynamicField name="*_phon_en" type="phonetic_en"  indexed="true"  stored="true"/>
-    <fieldType name="phonetic_en" stored="false" indexed="true" class="solr.TextField" >
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- lowercases the entire field value, keeping it as a single token.  -->
-    <dynamicField name="*_s_lower" type="lowercase"  indexed="true"  stored="true"/>
-    <fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory" />
-      </analyzer>
-    </fieldType>
-
-    <!-- 
-      Example of using PathHierarchyTokenizerFactory at index time, so
-      queries for paths match documents at that path, or in descendent paths
-    -->
-    <dynamicField name="*_descendent_path" type="descendent_path"  indexed="true"  stored="true"/>
-    <fieldType name="descendent_path" class="solr.TextField">
-      <analyzer type="index">
-        <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.KeywordTokenizerFactory" />
-      </analyzer>
-    </fieldType>
-
-    <!--
-      Example of using PathHierarchyTokenizerFactory at query time, so
-      queries for paths match documents at that path, or in ancestor paths
-    -->
-    <dynamicField name="*_ancestor_path" type="ancestor_path"  indexed="true"  stored="true"/>
-    <fieldType name="ancestor_path" class="solr.TextField">
-      <analyzer type="index">
-        <tokenizer class="solr.KeywordTokenizerFactory" />
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
-      </analyzer>
-    </fieldType>
-
-    <!-- This point type indexes the coordinates as separate fields (subFields)
-      If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if 
-      subFieldSuffix is defined, that is used to create the subFields.
-      Example: if subFieldType="double", then the coordinates would be
-        indexed in fields myloc_0___double,myloc_1___double.
-      Example: if subFieldSuffix="_d" then the coordinates would be indexed
-        in fields myloc_0_d,myloc_1_d
-      The subFields are an implementation detail of the fieldType, and end
-      users normally should not need to know about them.
-     -->
-    <dynamicField name="*_point" type="point"  indexed="true"  stored="true"/>
-    <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
-
-    <!-- A specialized field for geospatial search filters and distance sorting. -->
-    <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
-
-    <!-- A geospatial field type that supports multiValued and polygon shapes.
-      For more information about this and other spatial fields see:
-      http://lucene.apache.org/solr/guide/spatial-search.html
-    -->
-    <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
-               geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers" />
-
-    <!-- Payloaded field types -->
-    <fieldType name="delimited_payloads_float" stored="false" indexed="true" class="solr.TextField">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
-      </analyzer>
-    </fieldType>
-    <fieldType name="delimited_payloads_int" stored="false" indexed="true" class="solr.TextField">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="integer"/>
-      </analyzer>
-    </fieldType>
-    <fieldType name="delimited_payloads_string" stored="false" indexed="true" class="solr.TextField">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="identity"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- some examples for different languages (generally ordered by ISO code) -->
-
-    <!-- Arabic -->
-    <dynamicField name="*_txt_ar" type="text_ar"  indexed="true"  stored="true"/>
-    <fieldType name="text_ar" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <!-- for any non-arabic -->
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ar.txt" />
-        <!-- normalizes īģ¯ to īģą, etc -->
-        <filter class="solr.ArabicNormalizationFilterFactory"/>
-        <filter class="solr.ArabicStemFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- Bulgarian -->
-    <dynamicField name="*_txt_bg" type="text_bg"  indexed="true"  stored="true"/>
-    <fieldType name="text_bg" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/> 
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_bg.txt" /> 
-        <filter class="solr.BulgarianStemFilterFactory"/>       
-      </analyzer>
-    </fieldType>
-    
-    <!-- Catalan -->
-    <dynamicField name="*_txt_ca" type="text_ca"  indexed="true"  stored="true"/>
-    <fieldType name="text_ca" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <!-- removes l', etc -->
-        <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_ca.txt"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ca.txt" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Catalan"/>       
-      </analyzer>
-    </fieldType>
-    
-    <!-- CJK bigram (see text_ja for a Japanese configuration using morphological analysis) -->
-    <dynamicField name="*_txt_cjk" type="text_cjk"  indexed="true"  stored="true"/>
-    <fieldType name="text_cjk" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <!-- normalize width before bigram, as e.g. half-width dakuten combine  -->
-        <filter class="solr.CJKWidthFilterFactory"/>
-        <!-- for any non-CJK -->
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.CJKBigramFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- Czech -->
-    <dynamicField name="*_txt_cz" type="text_cz"  indexed="true"  stored="true"/>
-    <fieldType name="text_cz" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_cz.txt" />
-        <filter class="solr.CzechStemFilterFactory"/>       
-      </analyzer>
-    </fieldType>
-    
-    <!-- Danish -->
-    <dynamicField name="*_txt_da" type="text_da"  indexed="true"  stored="true"/>
-    <fieldType name="text_da" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_da.txt" format="snowball" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Danish"/>       
-      </analyzer>
-    </fieldType>
-    
-    <!-- German -->
-    <dynamicField name="*_txt_de" type="text_de"  indexed="true"  stored="true"/>
-    <fieldType name="text_de" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_de.txt" format="snowball" />
-        <filter class="solr.GermanNormalizationFilterFactory"/>
-        <filter class="solr.GermanLightStemFilterFactory"/>
-        <!-- less aggressive: <filter class="solr.GermanMinimalStemFilterFactory"/> -->
-        <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="German2"/> -->
-      </analyzer>
-    </fieldType>
-    
-    <!-- Greek -->
-    <dynamicField name="*_txt_el" type="text_el"  indexed="true"  stored="true"/>
-    <fieldType name="text_el" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <!-- greek specific lowercase for sigma -->
-        <filter class="solr.GreekLowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="false" words="lang/stopwords_el.txt" />
-        <filter class="solr.GreekStemFilterFactory"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- Spanish -->
-    <dynamicField name="*_txt_es" type="text_es"  indexed="true"  stored="true"/>
-    <fieldType name="text_es" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_es.txt" format="snowball" />
-        <filter class="solr.SpanishLightStemFilterFactory"/>
-        <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="Spanish"/> -->
-      </analyzer>
-    </fieldType>
-    
-    <!-- Basque -->
-    <dynamicField name="*_txt_eu" type="text_eu"  indexed="true"  stored="true"/>
-    <fieldType name="text_eu" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_eu.txt" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Basque"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- Persian -->
-    <dynamicField name="*_txt_fa" type="text_fa"  indexed="true"  stored="true"/>
-    <fieldType name="text_fa" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <!-- for ZWNJ -->
-        <charFilter class="solr.PersianCharFilterFactory"/>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.ArabicNormalizationFilterFactory"/>
-        <filter class="solr.PersianNormalizationFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_fa.txt" />
-      </analyzer>
-    </fieldType>
-    
-    <!-- Finnish -->
-    <dynamicField name="*_txt_fi" type="text_fi"  indexed="true"  stored="true"/>
-    <fieldType name="text_fi" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_fi.txt" format="snowball" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Finnish"/>
-        <!-- less aggressive: <filter class="solr.FinnishLightStemFilterFactory"/> -->
-      </analyzer>
-    </fieldType>
-    
-    <!-- French -->
-    <dynamicField name="*_txt_fr" type="text_fr"  indexed="true"  stored="true"/>
-    <fieldType name="text_fr" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <!-- removes l', etc -->
-        <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_fr.txt"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_fr.txt" format="snowball" />
-        <filter class="solr.FrenchLightStemFilterFactory"/>
-        <!-- less aggressive: <filter class="solr.FrenchMinimalStemFilterFactory"/> -->
-        <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="French"/> -->
-      </analyzer>
-    </fieldType>
-    
-    <!-- Irish -->
-    <dynamicField name="*_txt_ga" type="text_ga"  indexed="true"  stored="true"/>
-    <fieldType name="text_ga" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <!-- removes d', etc -->
-        <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_ga.txt"/>
-        <!-- removes n-, etc. position increments is intentionally false! -->
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/hyphenations_ga.txt"/>
-        <filter class="solr.IrishLowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ga.txt"/>
-        <filter class="solr.SnowballPorterFilterFactory" language="Irish"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- Galician -->
-    <dynamicField name="*_txt_gl" type="text_gl"  indexed="true"  stored="true"/>
-    <fieldType name="text_gl" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_gl.txt" />
-        <filter class="solr.GalicianStemFilterFactory"/>
-        <!-- less aggressive: <filter class="solr.GalicianMinimalStemFilterFactory"/> -->
-      </analyzer>
-    </fieldType>
-    
-    <!-- Hindi -->
-    <dynamicField name="*_txt_hi" type="text_hi"  indexed="true"  stored="true"/>
-    <fieldType name="text_hi" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <!-- normalizes unicode representation -->
-        <filter class="solr.IndicNormalizationFilterFactory"/>
-        <!-- normalizes variation in spelling -->
-        <filter class="solr.HindiNormalizationFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_hi.txt" />
-        <filter class="solr.HindiStemFilterFactory"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- Hungarian -->
-    <dynamicField name="*_txt_hu" type="text_hu"  indexed="true"  stored="true"/>
-    <fieldType name="text_hu" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_hu.txt" format="snowball" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Hungarian"/>
-        <!-- less aggressive: <filter class="solr.HungarianLightStemFilterFactory"/> -->   
-      </analyzer>
-    </fieldType>
-    
-    <!-- Armenian -->
-    <dynamicField name="*_txt_hy" type="text_hy"  indexed="true"  stored="true"/>
-    <fieldType name="text_hy" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_hy.txt" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Armenian"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- Indonesian -->
-    <dynamicField name="*_txt_id" type="text_id"  indexed="true"  stored="true"/>
-    <fieldType name="text_id" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_id.txt" />
-        <!-- for a less aggressive approach (only inflectional suffixes), set stemDerivational to false -->
-        <filter class="solr.IndonesianStemFilterFactory" stemDerivational="true"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- Italian -->
-  <dynamicField name="*_txt_it" type="text_it"  indexed="true"  stored="true"/>
-  <fieldType name="text_it" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <!-- removes l', etc -->
-        <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_it.txt"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_it.txt" format="snowball" />
-        <filter class="solr.ItalianLightStemFilterFactory"/>
-        <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="Italian"/> -->
-      </analyzer>
-    </fieldType>
-    
-    <!-- Japanese using morphological analysis (see text_cjk for a configuration using bigramming)
-
-         NOTE: If you want to optimize search for precision, use default operator AND in your request
-         handler config (q.op) Use OR if you would like to optimize for recall (default).
-    -->
-    <dynamicField name="*_txt_ja" type="text_ja"  indexed="true"  stored="true"/>
-    <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
-      <analyzer>
-        <!-- Kuromoji Japanese morphological analyzer/tokenizer (JapaneseTokenizer)
-
-           Kuromoji has a search mode (default) that does segmentation useful for search.  A heuristic
-           is used to segment compounds into its parts and the compound itself is kept as synonym.
-
-           Valid values for attribute mode are:
-              normal: regular segmentation
-              search: segmentation useful for search with synonyms compounds (default)
-            extended: same as search mode, but unigrams unknown words (experimental)
-
-           For some applications it might be good to use search mode for indexing and normal mode for
-           queries to reduce recall and prevent parts of compounds from being matched and highlighted.
-           Use <analyzer type="index"> and <analyzer type="query"> for this and mode normal in query.
-
-           Kuromoji also has a convenient user dictionary feature that allows overriding the statistical
-           model with your own entries for segmentation, part-of-speech tags and readings without a need
-           to specify weights.  Notice that user dictionaries have not been subject to extensive testing.
-
-           User dictionary attributes are:
-                     userDictionary: user dictionary filename
-             userDictionaryEncoding: user dictionary encoding (default is UTF-8)
-
-           See lang/userdict_ja.txt for a sample user dictionary file.
-
-           Punctuation characters are discarded by default.  Use discardPunctuation="false" to keep them.
-        -->
-        <tokenizer class="solr.JapaneseTokenizerFactory" mode="search"/>
-        <!--<tokenizer class="solr.JapaneseTokenizerFactory" mode="search" userDictionary="lang/userdict_ja.txt"/>-->
-        <!-- Reduces inflected verbs and adjectives to their base/dictionary forms (čžžæ›¸åŊĸ) -->
-        <filter class="solr.JapaneseBaseFormFilterFactory"/>
-        <!-- Removes tokens with certain part-of-speech tags -->
-        <filter class="solr.JapanesePartOfSpeechStopFilterFactory" tags="lang/stoptags_ja.txt" />
-        <!-- Normalizes full-width romaji to half-width and half-width kana to full-width (Unicode NFKC subset) -->
-        <filter class="solr.CJKWidthFilterFactory"/>
-        <!-- Removes common tokens typically not useful for search, but have a negative effect on ranking -->
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ja.txt" />
-        <!-- Normalizes common katakana spelling variations by removing any last long sound character (U+30FC) -->
-        <filter class="solr.JapaneseKatakanaStemFilterFactory" minimumLength="4"/>
-        <!-- Lower-cases romaji characters -->
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- Latvian -->
-    <dynamicField name="*_txt_lv" type="text_lv"  indexed="true"  stored="true"/>
-    <fieldType name="text_lv" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_lv.txt" />
-        <filter class="solr.LatvianStemFilterFactory"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- Dutch -->
-    <dynamicField name="*_txt_nl" type="text_nl"  indexed="true"  stored="true"/>
-    <fieldType name="text_nl" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_nl.txt" format="snowball" />
-        <filter class="solr.StemmerOverrideFilterFactory" dictionary="lang/stemdict_nl.txt" ignoreCase="false"/>
-        <filter class="solr.SnowballPorterFilterFactory" language="Dutch"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- Norwegian -->
-    <dynamicField name="*_txt_no" type="text_no"  indexed="true"  stored="true"/>
-    <fieldType name="text_no" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_no.txt" format="snowball" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Norwegian"/>
-        <!-- less aggressive: <filter class="solr.NorwegianLightStemFilterFactory"/> -->
-        <!-- singular/plural: <filter class="solr.NorwegianMinimalStemFilterFactory"/> -->
-      </analyzer>
-    </fieldType>
-    
-    <!-- Portuguese -->
-  <dynamicField name="*_txt_pt" type="text_pt"  indexed="true"  stored="true"/>
-  <fieldType name="text_pt" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_pt.txt" format="snowball" />
-        <filter class="solr.PortugueseLightStemFilterFactory"/>
-        <!-- less aggressive: <filter class="solr.PortugueseMinimalStemFilterFactory"/> -->
-        <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="Portuguese"/> -->
-        <!-- most aggressive: <filter class="solr.PortugueseStemFilterFactory"/> -->
-      </analyzer>
-    </fieldType>
-    
-    <!-- Romanian -->
-    <dynamicField name="*_txt_ro" type="text_ro"  indexed="true"  stored="true"/>
-    <fieldType name="text_ro" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ro.txt" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Romanian"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- Russian -->
-    <dynamicField name="*_txt_ru" type="text_ru"  indexed="true"  stored="true"/>
-    <fieldType name="text_ru" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ru.txt" format="snowball" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Russian"/>
-        <!-- less aggressive: <filter class="solr.RussianLightStemFilterFactory"/> -->
-      </analyzer>
-    </fieldType>
-    
-    <!-- Swedish -->
-    <dynamicField name="*_txt_sv" type="text_sv"  indexed="true"  stored="true"/>
-    <fieldType name="text_sv" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_sv.txt" format="snowball" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Swedish"/>
-        <!-- less aggressive: <filter class="solr.SwedishLightStemFilterFactory"/> -->
-      </analyzer>
-    </fieldType>
-    
-    <!-- Thai -->
-    <dynamicField name="*_txt_th" type="text_th"  indexed="true"  stored="true"/>
-    <fieldType name="text_th" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.ThaiTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_th.txt" />
-      </analyzer>
-    </fieldType>
-    
-    <!-- Turkish -->
-    <dynamicField name="*_txt_tr" type="text_tr"  indexed="true"  stored="true"/>
-    <fieldType name="text_tr" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.TurkishLowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="false" words="lang/stopwords_tr.txt" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Turkish"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- Similarity is the scoring routine for each document vs. a query.
-       A custom Similarity or SimilarityFactory may be specified here, but 
-       the default is fine for most applications.  
-       For more info: http://lucene.apache.org/solr/guide/other-schema-elements.html#OtherSchemaElements-Similarity
-    -->
-    <!--
-     <similarity class="com.example.solr.CustomSimilarityFactory">
-       <str name="paramkey">param value</str>
-     </similarity>
-    -->
-
-</schema>
diff --git a/conf/solr/7.3.1/schema_dv_mdb_copies.xml b/conf/solr/7.3.1/schema_dv_mdb_copies.xml
deleted file mode 100644
index 0208fdf3910..00000000000
--- a/conf/solr/7.3.1/schema_dv_mdb_copies.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<schema>
-    <copyField source="accessToSources" dest="_text_" maxChars="3000"/>
-    <copyField source="actionsToMinimizeLoss" dest="_text_" maxChars="3000"/>
-    <copyField source="alternativeTitle" dest="_text_" maxChars="3000"/>
-    <copyField source="alternativeURL" dest="_text_" maxChars="3000"/>
-    <copyField source="astroFacility" dest="_text_" maxChars="3000"/>
-    <copyField source="astroInstrument" dest="_text_" maxChars="3000"/>
-    <copyField source="astroObject" dest="_text_" maxChars="3000"/>
-    <copyField source="astroType" dest="_text_" maxChars="3000"/>
-    <copyField source="author" dest="_text_" maxChars="3000"/>
-    <copyField source="authorAffiliation" dest="_text_" maxChars="3000"/>
-    <copyField source="authorIdentifier" dest="_text_" maxChars="3000"/>
-    <copyField source="authorIdentifierScheme" dest="_text_" maxChars="3000"/>
-    <copyField source="authorName" dest="_text_" maxChars="3000"/>
-    <copyField source="characteristicOfSources" dest="_text_" maxChars="3000"/>
-    <copyField source="city" dest="_text_" maxChars="3000"/>
-    <copyField source="cleaningOperations" dest="_text_" maxChars="3000"/>
-    <copyField source="collectionMode" dest="_text_" maxChars="3000"/>
-    <copyField source="collectorTraining" dest="_text_" maxChars="3000"/>
-    <copyField source="contributor" dest="_text_" maxChars="3000"/>
-    <copyField source="contributorName" dest="_text_" maxChars="3000"/>
-    <copyField source="contributorType" dest="_text_" maxChars="3000"/>
-    <copyField source="controlOperations" dest="_text_" maxChars="3000"/>
-    <copyField source="country" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Depth" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.ObjectCount" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.ObjectDensity" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Polarization" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Redshift.MaximumValue" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Redshift.MinimumValue" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.RedshiftValue" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.SkyFraction" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spatial" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spectral.Bandpass" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spectral.CentralWavelength" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spectral.MaximumWavelength" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spectral.MinimumWavelength" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spectral.Wavelength" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Temporal" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Temporal.StartTime" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Temporal.StopTime" dest="_text_" maxChars="3000"/>
-    <copyField source="dataCollectionSituation" dest="_text_" maxChars="3000"/>
-    <copyField source="dataCollector" dest="_text_" maxChars="3000"/>
-    <copyField source="dataSources" dest="_text_" maxChars="3000"/>
-    <copyField source="datasetContact" dest="_text_" maxChars="3000"/>
-    <copyField source="datasetContactAffiliation" dest="_text_" maxChars="3000"/>
-    <copyField source="datasetContactEmail" dest="_text_" maxChars="3000"/>
-    <copyField source="datasetContactName" dest="_text_" maxChars="3000"/>
-    <copyField source="datasetLevelErrorNotes" dest="_text_" maxChars="3000"/>
-    <copyField source="dateOfCollection" dest="_text_" maxChars="3000"/>
-    <copyField source="dateOfCollectionEnd" dest="_text_" maxChars="3000"/>
-    <copyField source="dateOfCollectionStart" dest="_text_" maxChars="3000"/>
-    <copyField source="dateOfDeposit" dest="_text_" maxChars="3000"/>
-    <copyField source="depositor" dest="_text_" maxChars="3000"/>
-    <copyField source="deviationsFromSampleDesign" dest="_text_" maxChars="3000"/>
-    <copyField source="distributionDate" dest="_text_" maxChars="3000"/>
-    <copyField source="distributor" dest="_text_" maxChars="3000"/>
-    <copyField source="distributorAbbreviation" dest="_text_" maxChars="3000"/>
-    <copyField source="distributorAffiliation" dest="_text_" maxChars="3000"/>
-    <copyField source="distributorLogoURL" dest="_text_" maxChars="3000"/>
-    <copyField source="distributorName" dest="_text_" maxChars="3000"/>
-    <copyField source="distributorURL" dest="_text_" maxChars="3000"/>
-    <copyField source="dsDescription" dest="_text_" maxChars="3000"/>
-    <copyField source="dsDescriptionDate" dest="_text_" maxChars="3000"/>
-    <copyField source="dsDescriptionValue" dest="_text_" maxChars="3000"/>
-    <copyField source="eastLongitude" dest="_text_" maxChars="3000"/>
-    <copyField source="frequencyOfDataCollection" dest="_text_" maxChars="3000"/>
-    <copyField source="geographicBoundingBox" dest="_text_" maxChars="3000"/>
-    <copyField source="geographicCoverage" dest="_text_" maxChars="3000"/>
-    <copyField source="geographicUnit" dest="_text_" maxChars="3000"/>
-    <copyField source="grantNumber" dest="_text_" maxChars="3000"/>
-    <copyField source="grantNumberAgency" dest="_text_" maxChars="3000"/>
-    <copyField source="grantNumberValue" dest="_text_" maxChars="3000"/>
-    <copyField source="journalArticleType" dest="_text_" maxChars="3000"/>
-    <copyField source="journalIssue" dest="_text_" maxChars="3000"/>
-    <copyField source="journalPubDate" dest="_text_" maxChars="3000"/>
-    <copyField source="journalVolume" dest="_text_" maxChars="3000"/>
-    <copyField source="journalVolumeIssue" dest="_text_" maxChars="3000"/>
-    <copyField source="keyword" dest="_text_" maxChars="3000"/>
-    <copyField source="keywordValue" dest="_text_" maxChars="3000"/>
-    <copyField source="keywordVocabulary" dest="_text_" maxChars="3000"/>
-    <copyField source="keywordVocabularyURI" dest="_text_" maxChars="3000"/>
-    <copyField source="kindOfData" dest="_text_" maxChars="3000"/>
-    <copyField source="language" dest="_text_" maxChars="3000"/>
-    <copyField source="northLongitude" dest="_text_" maxChars="3000"/>
-    <copyField source="notesText" dest="_text_" maxChars="3000"/>
-    <copyField source="originOfSources" dest="_text_" maxChars="3000"/>
-    <copyField source="otherDataAppraisal" dest="_text_" maxChars="3000"/>
-    <copyField source="otherGeographicCoverage" dest="_text_" maxChars="3000"/>
-    <copyField source="otherId" dest="_text_" maxChars="3000"/>
-    <copyField source="otherIdAgency" dest="_text_" maxChars="3000"/>
-    <copyField source="otherIdValue" dest="_text_" maxChars="3000"/>
-    <copyField source="otherReferences" dest="_text_" maxChars="3000"/>
-    <copyField source="producer" dest="_text_" maxChars="3000"/>
-    <copyField source="producerAbbreviation" dest="_text_" maxChars="3000"/>
-    <copyField source="producerAffiliation" dest="_text_" maxChars="3000"/>
-    <copyField source="producerLogoURL" dest="_text_" maxChars="3000"/>
-    <copyField source="producerName" dest="_text_" maxChars="3000"/>
-    <copyField source="producerURL" dest="_text_" maxChars="3000"/>
-    <copyField source="productionDate" dest="_text_" maxChars="3000"/>
-    <copyField source="productionPlace" dest="_text_" maxChars="3000"/>
-    <copyField source="publication" dest="_text_" maxChars="3000"/>
-    <copyField source="publicationCitation" dest="_text_" maxChars="3000"/>
-    <copyField source="publicationIDNumber" dest="_text_" maxChars="3000"/>
-    <copyField source="publicationIDType" dest="_text_" maxChars="3000"/>
-    <copyField source="publicationURL" dest="_text_" maxChars="3000"/>
-    <copyField source="redshiftType" dest="_text_" maxChars="3000"/>
-    <copyField source="relatedDatasets" dest="_text_" maxChars="3000"/>
-    <copyField source="relatedMaterial" dest="_text_" maxChars="3000"/>
-    <copyField source="researchInstrument" dest="_text_" maxChars="3000"/>
-    <copyField source="resolution.Redshift" dest="_text_" maxChars="3000"/>
-    <copyField source="resolution.Spatial" dest="_text_" maxChars="3000"/>
-    <copyField source="resolution.Spectral" dest="_text_" maxChars="3000"/>
-    <copyField source="resolution.Temporal" dest="_text_" maxChars="3000"/>
-    <copyField source="responseRate" dest="_text_" maxChars="3000"/>
-    <copyField source="samplingErrorEstimates" dest="_text_" maxChars="3000"/>
-    <copyField source="samplingProcedure" dest="_text_" maxChars="3000"/>
-    <copyField source="series" dest="_text_" maxChars="3000"/>
-    <copyField source="seriesInformation" dest="_text_" maxChars="3000"/>
-    <copyField source="seriesName" dest="_text_" maxChars="3000"/>
-    <copyField source="socialScienceNotes" dest="_text_" maxChars="3000"/>
-    <copyField source="socialScienceNotesSubject" dest="_text_" maxChars="3000"/>
-    <copyField source="socialScienceNotesText" dest="_text_" maxChars="3000"/>
-    <copyField source="socialScienceNotesType" dest="_text_" maxChars="3000"/>
-    <copyField source="software" dest="_text_" maxChars="3000"/>
-    <copyField source="softwareName" dest="_text_" maxChars="3000"/>
-    <copyField source="softwareVersion" dest="_text_" maxChars="3000"/>
-    <copyField source="southLongitude" dest="_text_" maxChars="3000"/>
-    <copyField source="state" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayCellType" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayMeasurementType" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayOrganism" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayOtherMeasurmentType" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayOtherOrganism" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayPlatform" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayTechnologyType" dest="_text_" maxChars="3000"/>
-    <copyField source="studyDesignType" dest="_text_" maxChars="3000"/>
-    <copyField source="studyFactorType" dest="_text_" maxChars="3000"/>
-    <copyField source="subject" dest="_text_" maxChars="3000"/>
-    <copyField source="subtitle" dest="_text_" maxChars="3000"/>
-    <copyField source="targetSampleActualSize" dest="_text_" maxChars="3000"/>
-    <copyField source="targetSampleSize" dest="_text_" maxChars="3000"/>
-    <copyField source="targetSampleSizeFormula" dest="_text_" maxChars="3000"/>
-    <copyField source="timeMethod" dest="_text_" maxChars="3000"/>
-    <copyField source="timePeriodCovered" dest="_text_" maxChars="3000"/>
-    <copyField source="timePeriodCoveredEnd" dest="_text_" maxChars="3000"/>
-    <copyField source="timePeriodCoveredStart" dest="_text_" maxChars="3000"/>
-    <copyField source="title" dest="_text_" maxChars="3000"/>
-    <copyField source="topicClassValue" dest="_text_" maxChars="3000"/>
-    <copyField source="topicClassVocab" dest="_text_" maxChars="3000"/>
-    <copyField source="topicClassVocabURI" dest="_text_" maxChars="3000"/>
-    <copyField source="topicClassification" dest="_text_" maxChars="3000"/>
-    <copyField source="unitOfAnalysis" dest="_text_" maxChars="3000"/>
-    <copyField source="universe" dest="_text_" maxChars="3000"/>
-    <copyField source="weighting" dest="_text_" maxChars="3000"/>
-    <copyField source="westLongitude" dest="_text_" maxChars="3000"/>
-</schema>
\ No newline at end of file
diff --git a/conf/solr/7.3.1/schema_dv_mdb_fields.xml b/conf/solr/7.3.1/schema_dv_mdb_fields.xml
deleted file mode 100644
index 6caa7c6de69..00000000000
--- a/conf/solr/7.3.1/schema_dv_mdb_fields.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<fields>
-    <field name="accessToSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="actionsToMinimizeLoss" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="alternativeTitle" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="alternativeURL" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="astroFacility" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="astroInstrument" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="astroObject" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="astroType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="author" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="authorAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="authorIdentifier" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="authorIdentifierScheme" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="authorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="characteristicOfSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="city" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="cleaningOperations" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="collectionMode" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="collectorTraining" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="contributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="contributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="contributorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="controlOperations" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="country" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Depth" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="coverage.ObjectCount" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="coverage.ObjectDensity" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="coverage.Polarization" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="coverage.Redshift.MaximumValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Redshift.MinimumValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.RedshiftValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.SkyFraction" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="coverage.Spatial" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Spectral.Bandpass" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Spectral.CentralWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Spectral.MaximumWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Spectral.MinimumWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Spectral.Wavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Temporal" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Temporal.StartTime" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Temporal.StopTime" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dataCollectionSituation" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="dataCollector" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="dataSources" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="datasetContact" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="datasetContactAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="datasetContactEmail" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="datasetContactName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="datasetLevelErrorNotes" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="dateOfCollection" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dateOfCollectionEnd" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dateOfCollectionStart" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dateOfDeposit" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="depositor" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="deviationsFromSampleDesign" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="distributionDate" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="distributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="distributorAbbreviation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="distributorAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="distributorLogoURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="distributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="distributorURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dsDescription" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dsDescriptionDate" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dsDescriptionValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="eastLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="frequencyOfDataCollection" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="geographicBoundingBox" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="geographicCoverage" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="geographicUnit" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="grantNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="grantNumberAgency" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="grantNumberValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="journalArticleType" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="journalIssue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="journalPubDate" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="journalVolume" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="journalVolumeIssue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="keyword" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="keywordValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="keywordVocabulary" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="keywordVocabularyURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="kindOfData" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="language" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="northLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="notesText" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="originOfSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="otherDataAppraisal" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="otherGeographicCoverage" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="otherId" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="otherIdAgency" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="otherIdValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="otherReferences" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producer" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producerAbbreviation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producerAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producerLogoURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producerName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producerURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="productionDate" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="productionPlace" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="publication" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="publicationCitation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="publicationIDNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="publicationIDType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="publicationURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="redshiftType" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="relatedDatasets" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="relatedMaterial" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="researchInstrument" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="resolution.Redshift" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="resolution.Spatial" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="resolution.Spectral" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="resolution.Temporal" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="responseRate" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="samplingErrorEstimates" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="samplingProcedure" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="series" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="seriesInformation" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="seriesName" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="socialScienceNotes" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="socialScienceNotesSubject" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="socialScienceNotesText" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="socialScienceNotesType" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="software" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="softwareName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="softwareVersion" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="southLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="state" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayCellType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayMeasurementType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayOrganism" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayOtherMeasurmentType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayOtherOrganism" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayPlatform" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayTechnologyType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyDesignType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyFactorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="subject" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="subtitle" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="targetSampleActualSize" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="targetSampleSize" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="targetSampleSizeFormula" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="timeMethod" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="timePeriodCovered" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="timePeriodCoveredEnd" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="timePeriodCoveredStart" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="title" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="topicClassValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="topicClassVocab" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="topicClassVocabURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="topicClassification" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="unitOfAnalysis" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="universe" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="weighting" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="westLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
-</fields>
\ No newline at end of file
diff --git a/conf/solr/7.3.1/solrconfig.xml b/conf/solr/7.3.1/solrconfig.xml
deleted file mode 100644
index 51100af7d6e..00000000000
--- a/conf/solr/7.3.1/solrconfig.xml
+++ /dev/null
@@ -1,1410 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-     For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml.
--->
-<config>
-  <!-- In all configuration below, a prefix of "solr." for class names
-       is an alias that causes solr to search appropriate packages,
-       including org.apache.solr.(search|update|request|core|analysis)
-
-       You may also specify a fully qualified Java classname if you
-       have your own custom plugins.
-    -->
-
-  <!-- Controls what version of Lucene various components of Solr
-       adhere to.  Generally, you want to use the latest version to
-       get all bug fixes and improvements. It is highly recommended
-       that you fully re-index after changing this setting as it can
-       affect both how text is indexed and queried.
-  -->
-  <luceneMatchVersion>7.3.0</luceneMatchVersion>
-
-  <!-- <lib/> directives can be used to instruct Solr to load any Jars
-       identified and use them to resolve any "plugins" specified in
-       your solrconfig.xml or schema.xml (ie: Analyzers, Request
-       Handlers, etc...).
-
-       All directories and paths are resolved relative to the
-       instanceDir.
-
-       Please note that <lib/> directives are processed in the order
-       that they appear in your solrconfig.xml file, and are "stacked"
-       on top of each other when building a ClassLoader - so if you have
-       plugin jars with dependencies on other jars, the "lower level"
-       dependency jars should be loaded first.
-
-       If a "./lib" directory exists in your instanceDir, all files
-       found in it are included as if you had used the following
-       syntax...
-
-              <lib dir="./lib" />
-    -->
-
-  <!-- A 'dir' option by itself adds any files found in the directory
-       to the classpath, this is useful for including all jars in a
-       directory.
-
-       When a 'regex' is specified in addition to a 'dir', only the
-       files in that directory which completely match the regex
-       (anchored on both ends) will be included.
-
-       If a 'dir' option (with or without a regex) is used and nothing
-       is found that matches, a warning will be logged.
-
-       The examples below can be used to load some solr-contribs along
-       with their external dependencies.
-    -->
-  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
-  <!-- an exact 'path' can be used instead of a 'dir' to specify a
-       specific jar file.  This will cause a serious error to be logged
-       if it can't be loaded.
-    -->
-  <!--
-     <lib path="../a-jar-that-does-not-exist.jar" />
-  -->
-
-  <!-- Data Directory
-
-       Used to specify an alternate directory to hold all index data
-       other than the default ./data under the Solr home.  If
-       replication is in use, this should match the replication
-       configuration.
-    -->
-  <dataDir>${solr.data.dir:}</dataDir>
-
-
-  <!-- The DirectoryFactory to use for indexes.
-
-       solr.StandardDirectoryFactory is filesystem
-       based and tries to pick the best implementation for the current
-       JVM and platform.  solr.NRTCachingDirectoryFactory, the default,
-       wraps solr.StandardDirectoryFactory and caches small files in memory
-       for better NRT performance.
-
-       One can force a particular implementation via solr.MMapDirectoryFactory,
-       solr.NIOFSDirectoryFactory, or solr.SimpleFSDirectoryFactory.
-
-       solr.RAMDirectoryFactory is memory based and not persistent.
-    -->
-  <directoryFactory name="DirectoryFactory"
-                    class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
-
-  <!-- The CodecFactory for defining the format of the inverted index.
-       The default implementation is SchemaCodecFactory, which is the official Lucene
-       index format, but hooks into the schema to provide per-field customization of
-       the postings lists and per-document values in the fieldType element
-       (postingsFormat/docValuesFormat). Note that most of the alternative implementations
-       are experimental, so if you choose to customize the index format, it's a good
-       idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
-       before upgrading to a newer version to avoid unnecessary reindexing.
-       A "compressionMode" string element can be added to <codecFactory> to choose
-       between the existing compression modes in the default codec: "BEST_SPEED" (default)
-       or "BEST_COMPRESSION".
-  -->
-  <codecFactory class="solr.SchemaCodecFactory"/>
-
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       Index Config - These settings control low-level behavior of indexing
-       Most example settings here show the default value, but are commented
-       out, to more easily see where customizations have been made.
-
-       Note: This replaces <indexDefaults> and <mainIndex> from older versions
-       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <indexConfig>
-    <!-- maxFieldLength was removed in 4.0. To get similar behavior, include a
-         LimitTokenCountFilterFactory in your fieldType definition. E.g.
-     <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="10000"/>
-    -->
-    <!-- Maximum time to wait for a write lock (ms) for an IndexWriter. Default: 1000 -->
-    <!-- <writeLockTimeout>1000</writeLockTimeout>  -->
-
-    <!-- Expert: Enabling compound file will use less files for the index,
-         using fewer file descriptors on the expense of performance decrease.
-         Default in Lucene is "true". Default in Solr is "false" (since 3.6) -->
-    <!-- <useCompoundFile>false</useCompoundFile> -->
-
-    <!-- ramBufferSizeMB sets the amount of RAM that may be used by Lucene
-         indexing for buffering added documents and deletions before they are
-         flushed to the Directory.
-         maxBufferedDocs sets a limit on the number of documents buffered
-         before flushing.
-         If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.  -->
-    <!-- <ramBufferSizeMB>100</ramBufferSizeMB> -->
-    <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
-
-    <!-- Expert: Merge Policy
-         The Merge Policy in Lucene controls how merging of segments is done.
-         The default since Solr/Lucene 3.3 is TieredMergePolicy.
-         The default since Lucene 2.3 was the LogByteSizeMergePolicy,
-         Even older versions of Lucene used LogDocMergePolicy.
-      -->
-    <!--
-        <mergePolicyFactory class="org.apache.solr.index.TieredMergePolicyFactory">
-          <int name="maxMergeAtOnce">10</int>
-          <int name="segmentsPerTier">10</int>
-          <double name="noCFSRatio">0.1</double>
-        </mergePolicyFactory>
-      -->
-
-    <!-- Expert: Merge Scheduler
-         The Merge Scheduler in Lucene controls how merges are
-         performed.  The ConcurrentMergeScheduler (Lucene 2.3 default)
-         can perform merges in the background using separate threads.
-         The SerialMergeScheduler (Lucene 2.2 default) does not.
-     -->
-    <!--
-       <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
-       -->
-
-    <!-- LockFactory
-
-         This option specifies which Lucene LockFactory implementation
-         to use.
-
-         single = SingleInstanceLockFactory - suggested for a
-                  read-only index or when there is no possibility of
-                  another process trying to modify the index.
-         native = NativeFSLockFactory - uses OS native file locking.
-                  Do not use when multiple solr webapps in the same
-                  JVM are attempting to share a single index.
-         simple = SimpleFSLockFactory  - uses a plain file for locking
-
-         Defaults: 'native' is default for Solr3.6 and later, otherwise
-                   'simple' is the default
-
-         More details on the nuances of each LockFactory...
-         http://wiki.apache.org/lucene-java/AvailableLockFactories
-    -->
-    <lockType>${solr.lock.type:native}</lockType>
-
-    <!-- Commit Deletion Policy
-         Custom deletion policies can be specified here. The class must
-         implement org.apache.lucene.index.IndexDeletionPolicy.
-
-         The default Solr IndexDeletionPolicy implementation supports
-         deleting index commit points on number of commits, age of
-         commit point and optimized status.
-
-         The latest commit point should always be preserved regardless
-         of the criteria.
-    -->
-    <!--
-    <deletionPolicy class="solr.SolrDeletionPolicy">
-    -->
-    <!-- The number of commit points to be kept -->
-    <!-- <str name="maxCommitsToKeep">1</str> -->
-    <!-- The number of optimized commit points to be kept -->
-    <!-- <str name="maxOptimizedCommitsToKeep">0</str> -->
-    <!--
-        Delete all commit points once they have reached the given age.
-        Supports DateMathParser syntax e.g.
-      -->
-    <!--
-       <str name="maxCommitAge">30MINUTES</str>
-       <str name="maxCommitAge">1DAY</str>
-    -->
-    <!--
-    </deletionPolicy>
-    -->
-
-    <!-- Lucene Infostream
-
-         To aid in advanced debugging, Lucene provides an "InfoStream"
-         of detailed information when indexing.
-
-         Setting The value to true will instruct the underlying Lucene
-         IndexWriter to write its debugging info the specified file
-      -->
-    <!-- <infoStream file="INFOSTREAM.txt">false</infoStream> -->
-  </indexConfig>
-
-
-  <!-- JMX
-
-       This example enables JMX if and only if an existing MBeanServer
-       is found, use this if you want to configure JMX through JVM
-       parameters. Remove this to disable exposing Solr configuration
-       and statistics to JMX.
-
-       For more details see http://wiki.apache.org/solr/SolrJmx
-    -->
-  <jmx />
-  <!-- If you want to connect to a particular server, specify the
-       agentId
-    -->
-  <!-- <jmx agentId="myAgent" /> -->
-  <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
-  <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
-    -->
-
-  <!-- The default high-performance update handler -->
-  <updateHandler class="solr.DirectUpdateHandler2">
-
-    <!-- Enables a transaction log, used for real-time get, durability, and
-         and solr cloud replica recovery.  The log can grow as big as
-         uncommitted changes to the index, so use of a hard autoCommit
-         is recommended (see below).
-         "dir" - the target directory for transaction logs, defaults to the
-                solr data directory.
-         "numVersionBuckets" - sets the number of buckets used to keep
-                track of max version values when checking for re-ordered
-                updates; increase this value to reduce the cost of
-                synchronizing access to version buckets during high-volume
-                indexing, this requires 8 bytes (long) * numVersionBuckets
-                of heap space per Solr core.
-    -->
-    <updateLog>
-      <str name="dir">${solr.ulog.dir:}</str>
-      <int name="numVersionBuckets">${solr.ulog.numVersionBuckets:65536}</int>
-    </updateLog>
-
-    <!-- AutoCommit
-
-         Perform a hard commit automatically under certain conditions.
-         Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents.
-
-         http://wiki.apache.org/solr/UpdateXmlMessages
-
-         maxDocs - Maximum number of documents to add since the last
-                   commit before automatically triggering a new commit.
-
-         maxTime - Maximum amount of time in ms that is allowed to pass
-                   since a document was added before automatically
-                   triggering a new commit.
-         openSearcher - if false, the commit causes recent index changes
-           to be flushed to stable storage, but does not cause a new
-           searcher to be opened to make those changes visible.
-
-         If the updateLog is enabled, then it's highly recommended to
-         have some sort of hard autoCommit to limit the log size.
-      -->
-    <autoCommit>
-      <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
-      <openSearcher>false</openSearcher>
-    </autoCommit>
-
-    <!-- softAutoCommit is like autoCommit except it causes a
-         'soft' commit which only ensures that changes are visible
-         but does not ensure that data is synced to disk.  This is
-         faster and more near-realtime friendly than a hard commit.
-      -->
-
-    <autoSoftCommit>
-      <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
-    </autoSoftCommit>
-
-    <!-- Update Related Event Listeners
-
-         Various IndexWriter related events can trigger Listeners to
-         take actions.
-
-         postCommit - fired after every commit or optimize command
-         postOptimize - fired after every optimize command
-      -->
-
-  </updateHandler>
-
-  <!-- IndexReaderFactory
-
-       Use the following format to specify a custom IndexReaderFactory,
-       which allows for alternate IndexReader implementations.
-
-       ** Experimental Feature **
-
-       Please note - Using a custom IndexReaderFactory may prevent
-       certain other features from working. The API to
-       IndexReaderFactory may change without warning or may even be
-       removed from future releases if the problems cannot be
-       resolved.
-
-
-       ** Features that may not work with custom IndexReaderFactory **
-
-       The ReplicationHandler assumes a disk-resident index. Using a
-       custom IndexReader implementation may cause incompatibility
-       with ReplicationHandler and may cause replication to not work
-       correctly. See SOLR-1366 for details.
-
-    -->
-  <!--
-  <indexReaderFactory name="IndexReaderFactory" class="package.class">
-    <str name="someArg">Some Value</str>
-  </indexReaderFactory >
-  -->
-
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       Query section - these settings control query time things like caches
-       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <query>
-
-    <!-- Maximum number of clauses in each BooleanQuery,  an exception
-         is thrown if exceeded.  It is safe to increase or remove this setting,
-         since it is purely an arbitrary limit to try and catch user errors where
-         large boolean queries may not be the best implementation choice.
-      -->
-    <maxBooleanClauses>1024</maxBooleanClauses>
-
-    <!-- Solr Internal Query Caches
-
-         There are two implementations of cache available for Solr,
-         LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.
-
-         FastLRUCache has faster gets and slower puts in single
-         threaded operation and thus is generally faster than LRUCache
-         when the hit ratio of the cache is high (> 75%), and may be
-         faster under other scenarios on multi-cpu systems.
-    -->
-
-    <!-- Filter Cache
-
-         Cache used by SolrIndexSearcher for filters (DocSets),
-         unordered sets of *all* documents that match a query.  When a
-         new searcher is opened, its caches may be prepopulated or
-         "autowarmed" using data from caches in the old searcher.
-         autowarmCount is the number of items to prepopulate.  For
-         LRUCache, the autowarmed items will be the most recently
-         accessed items.
-
-         Parameters:
-           class - the SolrCache implementation LRUCache or
-               (LRUCache or FastLRUCache)
-           size - the maximum number of entries in the cache
-           initialSize - the initial capacity (number of entries) of
-               the cache.  (see java.util.HashMap)
-           autowarmCount - the number of entries to prepopulate from
-               and old cache.
-           maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
-                      to occupy. Note that when this option is specified, the size
-                      and initialSize parameters are ignored.
-      -->
-    <filterCache class="solr.FastLRUCache"
-                 size="512"
-                 initialSize="512"
-                 autowarmCount="0"/>
-
-    <!-- Query Result Cache
-
-         Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.
-         Additional supported parameter by LRUCache:
-            maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
-                       to occupy
-      -->
-    <queryResultCache class="solr.LRUCache"
-                      size="512"
-                      initialSize="512"
-                      autowarmCount="0"/>
-
-    <!-- Document Cache
-
-         Caches Lucene Document objects (the stored fields for each
-         document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.
-      -->
-    <documentCache class="solr.LRUCache"
-                   size="512"
-                   initialSize="512"
-                   autowarmCount="0"/>
-
-    <!-- custom cache currently used by block join -->
-    <cache name="perSegFilter"
-           class="solr.search.LRUCache"
-           size="10"
-           initialSize="0"
-           autowarmCount="10"
-           regenerator="solr.NoOpRegenerator" />
-
-    <!-- Field Value Cache
-
-         Cache used to hold field values that are quickly accessible
-         by document id.  The fieldValueCache is created by default
-         even if not configured here.
-      -->
-    <!--
-       <fieldValueCache class="solr.FastLRUCache"
-                        size="512"
-                        autowarmCount="128"
-                        showItems="32" />
-      -->
-
-    <!-- Custom Cache
-
-         Example of a generic cache.  These caches may be accessed by
-         name through SolrIndexSearcher.getCache(),cacheLookup(), and
-         cacheInsert().  The purpose is to enable easy caching of
-         user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator
-         if autowarming is desired.
-      -->
-    <!--
-       <cache name="myUserCache"
-              class="solr.LRUCache"
-              size="4096"
-              initialSize="1024"
-              autowarmCount="1024"
-              regenerator="com.mycompany.MyRegenerator"
-              />
-      -->
-
-
-    <!-- Lazy Field Loading
-
-         If true, stored fields that are not requested will be loaded
-         lazily.  This can result in a significant speed improvement
-         if the usual case is to not load all stored fields,
-         especially if the skipped fields are large compressed text
-         fields.
-    -->
-    <enableLazyFieldLoading>true</enableLazyFieldLoading>
-
-    <!-- Use Filter For Sorted Query
-
-         A possible optimization that attempts to use a filter to
-         satisfy a search.  If the requested sort does not include
-         score, then the filterCache will be checked for a filter
-         matching the query. If found, the filter will be used as the
-         source of document ids, and then the sort will be applied to
-         that.
-
-         For most situations, this will not be useful unless you
-         frequently get the same search repeatedly with different sort
-         options, and none of them ever use "score"
-      -->
-    <!--
-       <useFilterForSortedQuery>true</useFilterForSortedQuery>
-      -->
-
-    <!-- Result Window Size
-
-         An optimization for use with the queryResultCache.  When a search
-         is requested, a superset of the requested number of document ids
-         are collected.  For example, if a search for a particular query
-         requests matching documents 10 through 19, and queryWindowSize is 50,
-         then documents 0 through 49 will be collected and cached.  Any further
-         requests in that range can be satisfied via the cache.
-      -->
-    <queryResultWindowSize>20</queryResultWindowSize>
-
-    <!-- Maximum number of documents to cache for any entry in the
-         queryResultCache.
-      -->
-    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
-
-    <!-- Query Related Event Listeners
-
-         Various IndexSearcher related events can trigger Listeners to
-         take actions.
-
-         newSearcher - fired whenever a new searcher is being prepared
-         and there is a current searcher handling requests (aka
-         registered).  It can be used to prime certain caches to
-         prevent long request times for certain requests.
-
-         firstSearcher - fired whenever a new searcher is being
-         prepared but there is no current registered searcher to handle
-         requests or to gain autowarming data from.
-
-
-      -->
-    <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence.
-      -->
-    <listener event="newSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <!--
-           <lst><str name="q">solr</str><str name="sort">price asc</str></lst>
-           <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst>
-          -->
-      </arr>
-    </listener>
-    <listener event="firstSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <!--
-        <lst>
-          <str name="q">static firstSearcher warming in solrconfig.xml</str>
-        </lst>
-        -->
-      </arr>
-    </listener>
-
-    <!-- Use Cold Searcher
-
-         If a search request comes in and there is no current
-         registered searcher, then immediately register the still
-         warming searcher and use it.  If "false" then all requests
-         will block until the first searcher is done warming.
-      -->
-    <useColdSearcher>false</useColdSearcher>
-
-  </query>
-
-
-  <!-- Request Dispatcher
-
-       This section contains instructions for how the SolrDispatchFilter
-       should behave when processing requests for this SolrCore.
-
-    -->
-  <requestDispatcher>
-    <!-- Request Parsing
-
-         These settings indicate how Solr Requests may be parsed, and
-         what restrictions may be placed on the ContentStreams from
-         those requests
-
-         enableRemoteStreaming - enables use of the stream.file
-         and stream.url parameters for specifying remote streams.
-
-         multipartUploadLimitInKB - specifies the max size (in KiB) of
-         Multipart File Uploads that Solr will allow in a Request.
-
-         formdataUploadLimitInKB - specifies the max size (in KiB) of
-         form data (application/x-www-form-urlencoded) sent via
-         POST. You can use POST to pass request parameters not
-         fitting into the URL.
-
-         addHttpRequestToContext - if set to true, it will instruct
-         the requestParsers to include the original HttpServletRequest
-         object in the context map of the SolrQueryRequest under the
-         key "httpRequest". It will not be used by any of the existing
-         Solr components, but may be useful when developing custom
-         plugins.
-
-         *** WARNING ***
-         Before enabling remote streaming, you should make sure your
-         system has authentication enabled.
-
-    <requestParsers enableRemoteStreaming="false"
-                    multipartUploadLimitInKB="-1"
-                    formdataUploadLimitInKB="-1"
-                    addHttpRequestToContext="false"/>
-      -->
-
-    <!-- HTTP Caching
-
-         Set HTTP caching related parameters (for proxy caches and clients).
-
-         The options below instruct Solr not to output any HTTP Caching
-         related headers
-      -->
-    <httpCaching never304="true" />
-    <!-- If you include a <cacheControl> directive, it will be used to
-         generate a Cache-Control header (as well as an Expires header
-         if the value contains "max-age=")
-
-         By default, no Cache-Control header is generated.
-
-         You can use the <cacheControl> option even if you have set
-         never304="true"
-      -->
-    <!--
-       <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl>
-       </httpCaching>
-      -->
-    <!-- To enable Solr to respond with automatically generated HTTP
-         Caching headers, and to response to Cache Validation requests
-         correctly, set the value of never304="false"
-
-         This will cause Solr to generate Last-Modified and ETag
-         headers based on the properties of the Index.
-
-         The following options can also be specified to affect the
-         values of these headers...
-
-         lastModFrom - the default value is "openTime" which means the
-         Last-Modified value (and validation against If-Modified-Since
-         requests) will all be relative to when the current Searcher
-         was opened.  You can change it to lastModFrom="dirLastMod" if
-         you want the value to exactly correspond to when the physical
-         index was last modified.
-
-         etagSeed="..." is an option you can change to force the ETag
-         header (and validation against If-None-Match requests) to be
-         different even if the index has not changed (ie: when making
-         significant changes to your config file)
-
-         (lastModifiedFrom and etagSeed are both ignored if you use
-         the never304="true" option)
-      -->
-    <!--
-       <httpCaching lastModifiedFrom="openTime"
-                    etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl>
-       </httpCaching>
-      -->
-  </requestDispatcher>
-
-  <!-- Request Handlers
-
-       http://wiki.apache.org/solr/SolrRequestHandler
-
-       Incoming queries will be dispatched to a specific handler by name
-       based on the path specified in the request.
-
-       If a Request Handler is declared with startup="lazy", then it will
-       not be initialized until the first request that uses it.
-
-    -->
-  <!-- SearchHandler
-
-       http://wiki.apache.org/solr/SearchHandler
-
-       For processing Search Queries, the primary Request Handler
-       provided with Solr is "SearchHandler" It delegates to a sequent
-       of SearchComponents (see below) and supports distributed
-       queries across multiple shards
-    -->
-  <requestHandler name="/select" class="solr.SearchHandler">
-    <!-- default values for query parameters can be specified, these
-         will be overridden by parameters in the request
-      -->
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <int name="rows">10</int>
-      <str name="defType">edismax</str>
-      <float name="tie">0.075</float>
-        <str name="qf">
-            dvName^400
-            authorName^180
-            dvSubject^190
-            dvDescription^180
-            dvAffiliation^170
-            title^130
-            subject^120
-            keyword^110
-            topicClassValue^100
-            dsDescriptionValue^90
-            authorAffiliation^80
-            publicationCitation^60
-            producerName^50
-            fileName^30
-            fileDescription^30
-            variableLabel^20
-            variableName^10
-            _text_^1.0
-        </str>
-        <str name="pf">
-            dvName^200
-            authorName^100
-            dvSubject^100
-            dvDescription^100
-            dvAffiliation^100
-            title^75
-            subject^75
-            keyword^75
-            topicClassValue^75
-            dsDescriptionValue^75
-            authorAffiliation^75
-            publicationCitation^75
-            producerName^75
-        </str>
-        <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3--> 
-        <str name="bq">
-            isHarvested:false^25000
-        </str>
-
-      <!-- Default search field
-         <str name="df">text</str> 
-        -->
-      <!-- Change from JSON to XML format (the default prior to Solr 7.0)
-         <str name="wt">xml</str> 
-        -->
-    </lst>
-    <!-- In addition to defaults, "appends" params can be specified
-         to identify values which should be appended to the list of
-         multi-val params from the query (or the existing "defaults").
-      -->
-    <!-- In this example, the param "fq=instock:true" would be appended to
-         any query time fq params the user may specify, as a mechanism for
-         partitioning the index, independent of any user selected filtering
-         that may also be desired (perhaps as a result of faceted searching).
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "appends" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="appends">
-         <str name="fq">inStock:true</str>
-       </lst>
-      -->
-    <!-- "invariants" are a way of letting the Solr maintainer lock down
-         the options available to Solr clients.  Any params values
-         specified here are used regardless of what values may be specified
-         in either the query, the "defaults", or the "appends" params.
-
-         In this example, the facet.field and facet.query params would
-         be fixed, limiting the facets clients can use.  Faceting is
-         not turned on by default - but if the client does specify
-         facet=true in the request, these are the only facets they
-         will be able to see counts for; regardless of what other
-         facet.field or facet.query params they may specify.
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "invariants" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="invariants">
-         <str name="facet.field">cat</str>
-         <str name="facet.field">manu_exact</str>
-         <str name="facet.query">price:[* TO 500]</str>
-         <str name="facet.query">price:[500 TO *]</str>
-       </lst>
-      -->
-    <!-- If the default list of SearchComponents is not desired, that
-         list can either be overridden completely, or components can be
-         prepended or appended to the default list.  (see below)
-      -->
-    <!--
-       <arr name="components">
-         <str>nameOfCustomComponent1</str>
-         <str>nameOfCustomComponent2</str>
-       </arr>
-      -->
-  </requestHandler>
-
-  <!-- A request handler that returns indented JSON by default -->
-  <requestHandler name="/query" class="solr.SearchHandler">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <str name="wt">json</str>
-      <str name="indent">true</str>
-    </lst>
-  </requestHandler>
-
-
-  <!-- A Robust Example
-
-       This example SearchHandler declaration shows off usage of the
-       SearchHandler with many defaults declared
-
-       Note that multiple instances of the same Request Handler
-       (SearchHandler) can be registered multiple times with different
-       names (and different init parameters)
-    -->
-  <requestHandler name="/browse" class="solr.SearchHandler" useParams="query,facets,velocity,browse">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-  </requestHandler>
-
-  <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
-    <lst name="defaults">
-      <str name="df">_text_</str>
-    </lst>
-  </initParams>
-
-  <!-- Solr Cell Update Request Handler
-
-       http://wiki.apache.org/solr/ExtractingRequestHandler
-
-    -->
-  <requestHandler name="/update/extract"
-                  startup="lazy"
-                  class="solr.extraction.ExtractingRequestHandler" >
-    <lst name="defaults">
-      <str name="lowernames">true</str>
-      <str name="fmap.meta">ignored_</str>
-      <str name="fmap.content">_text_</str>
-    </lst>
-  </requestHandler>
-
-  <!-- Search Components
-
-       Search components are registered to SolrCore and used by
-       instances of SearchHandler (which can access them by name)
-
-       By default, the following components are available:
-
-       <searchComponent name="query"     class="solr.QueryComponent" />
-       <searchComponent name="facet"     class="solr.FacetComponent" />
-       <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
-       <searchComponent name="highlight" class="solr.HighlightComponent" />
-       <searchComponent name="stats"     class="solr.StatsComponent" />
-       <searchComponent name="debug"     class="solr.DebugComponent" />
-
-       Default configuration in a requestHandler would look like:
-
-       <arr name="components">
-         <str>query</str>
-         <str>facet</str>
-         <str>mlt</str>
-         <str>highlight</str>
-         <str>stats</str>
-         <str>debug</str>
-       </arr>
-
-       If you register a searchComponent to one of the standard names,
-       that will be used instead of the default.
-
-       To insert components before or after the 'standard' components, use:
-
-       <arr name="first-components">
-         <str>myFirstComponentName</str>
-       </arr>
-
-       <arr name="last-components">
-         <str>myLastComponentName</str>
-       </arr>
-
-       NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components"
-
-     -->
-
-  <!-- Spell Check
-
-       The spell check component can return a list of alternative spelling
-       suggestions.
-
-       http://wiki.apache.org/solr/SpellCheckComponent
-    -->
-  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
-    <str name="queryAnalyzerFieldType">text_general</str>
-
-    <!-- Multiple "Spell Checkers" can be declared and used by this
-         component
-      -->
-
-    <!-- a spellchecker built from a field of the main index -->
-    <lst name="spellchecker">
-      <str name="name">default</str>
-      <str name="field">_text_</str>
-      <str name="classname">solr.DirectSolrSpellChecker</str>
-      <!-- the spellcheck distance measure used, the default is the internal levenshtein -->
-      <str name="distanceMeasure">internal</str>
-      <!-- minimum accuracy needed to be considered a valid spellcheck suggestion -->
-      <float name="accuracy">0.5</float>
-      <!-- the maximum #edits we consider when enumerating terms: can be 1 or 2 -->
-      <int name="maxEdits">2</int>
-      <!-- the minimum shared prefix when enumerating terms -->
-      <int name="minPrefix">1</int>
-      <!-- maximum number of inspections per result. -->
-      <int name="maxInspections">5</int>
-      <!-- minimum length of a query term to be considered for correction -->
-      <int name="minQueryLength">4</int>
-      <!-- maximum threshold of documents a query term can appear to be considered for correction -->
-      <float name="maxQueryFrequency">0.01</float>
-      <!-- uncomment this to require suggestions to occur in 1% of the documents
-        <float name="thresholdTokenFrequency">.01</float>
-      -->
-    </lst>
-
-    <!-- a spellchecker that can break or combine words.  See "/spell" handler below for usage -->
-    <!--
-    <lst name="spellchecker">
-      <str name="name">wordbreak</str>
-      <str name="classname">solr.WordBreakSolrSpellChecker</str>
-      <str name="field">name</str>
-      <str name="combineWords">true</str>
-      <str name="breakWords">true</str>
-      <int name="maxChanges">10</int>
-    </lst>
-    -->
-  </searchComponent>
-
-  <!-- A request handler for demonstrating the spellcheck component.
-
-       NOTE: This is purely as an example.  The whole purpose of the
-       SpellCheckComponent is to hook it into the request handler that
-       handles your normal user queries so that a separate request is
-       not needed to get suggestions.
-
-       IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
-       NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-
-       See http://wiki.apache.org/solr/SpellCheckComponent for details
-       on the request parameters.
-    -->
-  <requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <!-- Solr will use suggestions from both the 'default' spellchecker
-           and from the 'wordbreak' spellchecker and combine them.
-           collations (re-written queries) can include a combination of
-           corrections from both spellcheckers -->
-      <str name="spellcheck.dictionary">default</str>
-      <str name="spellcheck">on</str>
-      <str name="spellcheck.extendedResults">true</str>
-      <str name="spellcheck.count">10</str>
-      <str name="spellcheck.alternativeTermCount">5</str>
-      <str name="spellcheck.maxResultsForSuggest">5</str>
-      <str name="spellcheck.collate">true</str>
-      <str name="spellcheck.collateExtendedResults">true</str>
-      <str name="spellcheck.maxCollationTries">10</str>
-      <str name="spellcheck.maxCollations">5</str>
-    </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Term Vector Component
-
-       http://wiki.apache.org/solr/TermVectorComponent
-    -->
-  <searchComponent name="tvComponent" class="solr.TermVectorComponent"/>
-
-  <!-- A request handler for demonstrating the term vector component
-
-       This is purely as an example.
-
-       In reality you will likely want to add the component to your
-       already specified request handlers.
-    -->
-  <requestHandler name="/tvrh" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <bool name="tv">true</bool>
-    </lst>
-    <arr name="last-components">
-      <str>tvComponent</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Clustering Component. (Omitted here. See the default Solr example for a typical configuration.) -->
-
-  <!-- Terms Component
-
-       http://wiki.apache.org/solr/TermsComponent
-
-       A component to return terms and document frequency of those
-       terms
-    -->
-  <searchComponent name="terms" class="solr.TermsComponent"/>
-
-  <!-- A request handler for demonstrating the terms component -->
-  <requestHandler name="/terms" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <bool name="terms">true</bool>
-      <bool name="distrib">false</bool>
-    </lst>
-    <arr name="components">
-      <str>terms</str>
-    </arr>
-  </requestHandler>
-
-
-  <!-- Query Elevation Component
-
-       http://wiki.apache.org/solr/QueryElevationComponent
-
-       a search component that enables you to configure the top
-       results for a given query regardless of the normal lucene
-       scoring.
-    -->
-  <searchComponent name="elevator" class="solr.QueryElevationComponent" >
-    <!-- pick a fieldType to analyze queries -->
-    <str name="queryFieldType">string</str>
-  </searchComponent>
-
-  <!-- A request handler for demonstrating the elevator component -->
-  <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-    <arr name="last-components">
-      <str>elevator</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Highlighting Component
-
-       http://wiki.apache.org/solr/HighlightingParameters
-    -->
-  <searchComponent class="solr.HighlightComponent" name="highlight">
-    <highlighting>
-      <!-- Configure the standard fragmenter -->
-      <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap"
-                  default="true"
-                  class="solr.highlight.GapFragmenter">
-        <lst name="defaults">
-          <int name="hl.fragsize">100</int>
-        </lst>
-      </fragmenter>
-
-      <!-- A regular-expression-based fragmenter
-           (for sentence extraction)
-        -->
-      <fragmenter name="regex"
-                  class="solr.highlight.RegexFragmenter">
-        <lst name="defaults">
-          <!-- slightly smaller fragsizes work better because of slop -->
-          <int name="hl.fragsize">70</int>
-          <!-- allow 50% slop on fragment sizes -->
-          <float name="hl.regex.slop">0.5</float>
-          <!-- a basic sentence pattern -->
-          <str name="hl.regex.pattern">[-\w ,/\n\&quot;&apos;]{20,200}</str>
-        </lst>
-      </fragmenter>
-
-      <!-- Configure the standard formatter -->
-      <formatter name="html"
-                 default="true"
-                 class="solr.highlight.HtmlFormatter">
-        <lst name="defaults">
-          <str name="hl.simple.pre"><![CDATA[<em>]]></str>
-          <str name="hl.simple.post"><![CDATA[</em>]]></str>
-        </lst>
-      </formatter>
-
-      <!-- Configure the standard encoder -->
-      <encoder name="html"
-               class="solr.highlight.HtmlEncoder" />
-
-      <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple"
-                       class="solr.highlight.SimpleFragListBuilder"/>
-
-      <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single"
-                       class="solr.highlight.SingleFragListBuilder"/>
-
-      <!-- Configure the weighted fragListBuilder -->
-      <fragListBuilder name="weighted"
-                       default="true"
-                       class="solr.highlight.WeightedFragListBuilder"/>
-
-      <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default"
-                        default="true"
-                        class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!--
-        <lst name="defaults">
-          <str name="hl.multiValuedSeparatorChar">/</str>
-        </lst>
-        -->
-      </fragmentsBuilder>
-
-      <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored"
-                        class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <lst name="defaults">
-          <str name="hl.tag.pre"><![CDATA[
-               <b style="background:yellow">,<b style="background:lawgreen">,
-               <b style="background:aquamarine">,<b style="background:magenta">,
-               <b style="background:palegreen">,<b style="background:coral">,
-               <b style="background:wheat">,<b style="background:khaki">,
-               <b style="background:lime">,<b style="background:deepskyblue">]]></str>
-          <str name="hl.tag.post"><![CDATA[</b>]]></str>
-        </lst>
-      </fragmentsBuilder>
-
-      <boundaryScanner name="default"
-                       default="true"
-                       class="solr.highlight.SimpleBoundaryScanner">
-        <lst name="defaults">
-          <str name="hl.bs.maxScan">10</str>
-          <str name="hl.bs.chars">.,!? &#9;&#10;&#13;</str>
-        </lst>
-      </boundaryScanner>
-
-      <boundaryScanner name="breakIterator"
-                       class="solr.highlight.BreakIteratorBoundaryScanner">
-        <lst name="defaults">
-          <!-- type should be one of CHARACTER, WORD(default), LINE and SENTENCE -->
-          <str name="hl.bs.type">WORD</str>
-          <!-- language and country are used when constructing Locale object.  -->
-          <!-- And the Locale object will be used when getting instance of BreakIterator -->
-          <str name="hl.bs.language">en</str>
-          <str name="hl.bs.country">US</str>
-        </lst>
-      </boundaryScanner>
-    </highlighting>
-  </searchComponent>
-
-  <!-- Update Processors
-
-       Chains of Update Processor Factories for dealing with Update
-       Requests can be declared, and then used by name in Update
-       Request Processors
-
-       http://wiki.apache.org/solr/UpdateRequestProcessor
-
-    -->
-
-  <!-- Add unknown fields to the schema
-
-       Field type guessing update processors that will
-       attempt to parse string-typed field values as Booleans, Longs,
-       Doubles, or Dates, and then add schema fields with the guessed
-       field types. Text content will be indexed as "text_general" as
-       well as a copy to a plain string version in *_str.
-
-       These require that the schema is both managed and mutable, by
-       declaring schemaFactory as ManagedIndexSchemaFactory, with
-       mutable specified as true.
-
-       See http://wiki.apache.org/solr/GuessingFieldTypes
-    -->
-<schemaFactory class="ClassicIndexSchemaFactory"/>
-
-  <updateProcessor class="solr.UUIDUpdateProcessorFactory" name="uuid"/>
-  <updateProcessor class="solr.RemoveBlankFieldUpdateProcessorFactory" name="remove-blank"/>
-  <updateProcessor class="solr.FieldNameMutatingUpdateProcessorFactory" name="field-name-mutating">
-    <str name="pattern">[^\w-\.]</str>
-    <str name="replacement">_</str>
-  </updateProcessor>
-  <updateProcessor class="solr.ParseBooleanFieldUpdateProcessorFactory" name="parse-boolean"/>
-  <updateProcessor class="solr.ParseLongFieldUpdateProcessorFactory" name="parse-long"/>
-  <updateProcessor class="solr.ParseDoubleFieldUpdateProcessorFactory" name="parse-double"/>
-  <updateProcessor class="solr.ParseDateFieldUpdateProcessorFactory" name="parse-date">
-    <arr name="format">
-      <str>yyyy-MM-dd'T'HH:mm:ss.SSSZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss,SSSZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss.SSS</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss,SSS</str>
-      <str>yyyy-MM-dd'T'HH:mm:ssZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss</str>
-      <str>yyyy-MM-dd'T'HH:mmZ</str>
-      <str>yyyy-MM-dd'T'HH:mm</str>
-      <str>yyyy-MM-dd HH:mm:ss.SSSZ</str>
-      <str>yyyy-MM-dd HH:mm:ss,SSSZ</str>
-      <str>yyyy-MM-dd HH:mm:ss.SSS</str>
-      <str>yyyy-MM-dd HH:mm:ss,SSS</str>
-      <str>yyyy-MM-dd HH:mm:ssZ</str>
-      <str>yyyy-MM-dd HH:mm:ss</str>
-      <str>yyyy-MM-dd HH:mmZ</str>
-      <str>yyyy-MM-dd HH:mm</str>
-      <str>yyyy-MM-dd</str>
-    </arr>
-  </updateProcessor>
-
-  <!--Dataverse removed-->
-<!--  <updateProcessor class="solr.AddSchemaFieldsUpdateProcessorFactory" name="add-schema-fields">
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.String</str>
-      <str name="fieldType">text_general</str>
-      <lst name="copyField">
-        <str name="dest">*_str</str>
-        <int name="maxChars">256</int>
-      </lst>
-
-      <bool name="default">true</bool>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Boolean</str>
-      <str name="fieldType">booleans</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.util.Date</str>
-      <str name="fieldType">pdates</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Long</str>
-      <str name="valueClass">java.lang.Integer</str>
-      <str name="fieldType">plongs</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Number</str>
-      <str name="fieldType">pdoubles</str>
-    </lst>
-    </updateProcessor> -->
-
-  <!-- The update.autoCreateFields property can be turned to false to disable schemaless mode -->
-  <updateRequestProcessorChain name="add-unknown-fields-to-the-schema" default="${update.autoCreateFields:false}"
-           processor="uuid,remove-blank,field-name-mutating,parse-boolean,parse-long,parse-double,parse-date">
-    <processor class="solr.LogUpdateProcessorFactory"/>
-    <processor class="solr.DistributedUpdateProcessorFactory"/>
-    <processor class="solr.RunUpdateProcessorFactory"/>
-  </updateRequestProcessorChain>
-
-  <!-- Deduplication
-
-       An example dedup update processor that creates the "id" field
-       on the fly based on the hash code of some other fields.  This
-       example has overwriteDupes set to false since we are using the
-       id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.
-
-    -->
-  <!--
-     <updateRequestProcessorChain name="dedupe">
-       <processor class="solr.processor.SignatureUpdateProcessorFactory">
-         <bool name="enabled">true</bool>
-         <str name="signatureField">id</str>
-         <bool name="overwriteDupes">false</bool>
-         <str name="fields">name,features,cat</str>
-         <str name="signatureClass">solr.processor.Lookup3Signature</str>
-       </processor>
-       <processor class="solr.LogUpdateProcessorFactory" />
-       <processor class="solr.RunUpdateProcessorFactory" />
-     </updateRequestProcessorChain>
-    -->
-
-  <!-- Language identification
-
-       This example update chain identifies the language of the incoming
-       documents using the langid contrib. The detected language is
-       written to field language_s. No field name mapping is done.
-       The fields used for detection are text, title, subject and description,
-       making this example suitable for detecting languages form full-text
-       rich documents injected via ExtractingRequestHandler.
-       See more about langId at http://wiki.apache.org/solr/LanguageDetection
-    -->
-  <!--
-   <updateRequestProcessorChain name="langid">
-     <processor class="org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory">
-       <str name="langid.fl">text,title,subject,description</str>
-       <str name="langid.langField">language_s</str>
-       <str name="langid.fallback">en</str>
-     </processor>
-     <processor class="solr.LogUpdateProcessorFactory" />
-     <processor class="solr.RunUpdateProcessorFactory" />
-   </updateRequestProcessorChain>
-  -->
-
-  <!-- Script update processor
-
-    This example hooks in an update processor implemented using JavaScript.
-
-    See more about the script update processor at http://wiki.apache.org/solr/ScriptUpdateProcessor
-  -->
-  <!--
-    <updateRequestProcessorChain name="script">
-      <processor class="solr.StatelessScriptUpdateProcessorFactory">
-        <str name="script">update-script.js</str>
-        <lst name="params">
-          <str name="config_param">example config parameter</str>
-        </lst>
-      </processor>
-      <processor class="solr.RunUpdateProcessorFactory" />
-    </updateRequestProcessorChain>
-  -->
-
-  <!-- Response Writers
-
-       http://wiki.apache.org/solr/QueryResponseWriter
-
-       Request responses will be written using the writer specified by
-       the 'wt' request parameter matching the name of a registered
-       writer.
-
-       The "default" writer is the default and will be used if 'wt' is
-       not specified in the request.
-    -->
-  <!-- The following response writers are implicitly configured unless
-       overridden...
-    -->
-  <!--
-     <queryResponseWriter name="xml"
-                          default="true"
-                          class="solr.XMLResponseWriter" />
-     <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
-     <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
-     <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
-     <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
-     <queryResponseWriter name="phps" class="solr.PHPSerializedResponseWriter"/>
-     <queryResponseWriter name="csv" class="solr.CSVResponseWriter"/>
-     <queryResponseWriter name="schema.xml" class="solr.SchemaXmlResponseWriter"/>
-    -->
-
-  <queryResponseWriter name="json" class="solr.JSONResponseWriter">
-    <!-- For the purposes of the tutorial, JSON responses are written as
-     plain text so that they are easy to read in *any* browser.
-     If you expect a MIME type of "application/json" just remove this override.
-    -->
-    <str name="content-type">text/plain; charset=UTF-8</str>
-  </queryResponseWriter>
-
-  <!--
-     Custom response writers can be declared as needed...
-    -->
-  <queryResponseWriter name="velocity" class="solr.VelocityResponseWriter" startup="lazy">
-    <str name="template.base.dir">${velocity.template.base.dir:}</str>
-    <str name="solr.resource.loader.enabled">${velocity.solr.resource.loader.enabled:true}</str>
-    <str name="params.resource.loader.enabled">${velocity.params.resource.loader.enabled:false}</str>
-  </queryResponseWriter>
-
-  <!-- XSLT response writer transforms the XML output by any xslt file found
-       in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.
-    -->
-  <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
-    <int name="xsltCacheLifetimeSeconds">5</int>
-  </queryResponseWriter>
-
-  <!-- Query Parsers
-
-       https://lucene.apache.org/solr/guide/query-syntax-and-parsing.html
-
-       Multiple QParserPlugins can be registered by name, and then
-       used in either the "defType" param for the QueryComponent (used
-       by SearchHandler) or in LocalParams
-    -->
-  <!-- example of registering a query parser -->
-  <!--
-     <queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-    -->
-
-  <!-- Function Parsers
-
-       http://wiki.apache.org/solr/FunctionQuery
-
-       Multiple ValueSourceParsers can be registered by name, and then
-       used as function names when using the "func" QParser.
-    -->
-  <!-- example of registering a custom function parser  -->
-  <!--
-     <valueSourceParser name="myfunc"
-                        class="com.mycompany.MyValueSourceParser" />
-    -->
-
-
-  <!-- Document Transformers
-       http://wiki.apache.org/solr/DocTransformers
-    -->
-  <!--
-     Could be something like:
-     <transformer name="db" class="com.mycompany.LoadFromDatabaseTransformer" >
-       <int name="connection">jdbc://....</int>
-     </transformer>
-
-     To add a constant value to all docs, use:
-     <transformer name="mytrans2" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
-       <int name="value">5</int>
-     </transformer>
-
-     If you want the user to still be able to change it with _value:something_ use this:
-     <transformer name="mytrans3" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
-       <double name="defaultValue">5</double>
-     </transformer>
-
-      If you are using the QueryElevationComponent, you may wish to mark documents that get boosted.  The
-      EditorialMarkerFactory will do exactly that:
-     <transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-    -->
-</config>
diff --git a/conf/solr/7.3.1/updateSchemaMDB.sh b/conf/solr/7.3.1/updateSchemaMDB.sh
deleted file mode 100755
index e4446083442..00000000000
--- a/conf/solr/7.3.1/updateSchemaMDB.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-set -euo pipefail
-
-# This script updates the <field> and <copyField> schema configuration necessary to properly
-# index custom metadata fields in Solr.
-# 1. Retrieve from Dataverse API endpoint
-# 2. Parse and write Solr schema files (which might replace the included files)
-# 3. Reload Solr
-#
-# List of variables:
-# ${DATAVERSE_URL}: URL to Dataverse. Defaults to http://localhost:8080
-# ${SOLR_URL}: URL to Solr. Defaults to http://localhost:8983
-# ${UNBLOCK_KEY}: File path to secret or unblock key as string. Only necessary on k8s or when you secured your installation.
-# ${TARGET}: Directory where to write the XML files. Defaults to /tmp
-#
-# Programs used (need to be available on your PATH):
-# coreutils: mktemp, csplit
-# curl
-
-usage() {
-  echo "usage: updateSchemaMDB.sh [options]"
-  echo "options:"
-  echo "    -d <url>      Dataverse URL, defaults to http://localhost:8080"
-  echo "    -h            Show this help text"
-  echo "    -s <url>      Solr URL, defaults to http://localhost:8983"
-  echo "    -t <path>     Directory where to write the XML files. Defaults to /tmp"
-  echo "    -u <key/file> Dataverse unblock key either as key string or path to keyfile"
-}
-
-### Init (with sane defaults)
-DATAVERSE_URL=${DATAVERSE_URL:-"http://localhost:8080"}
-SOLR_URL=${SOLR_URL:-"http://localhost:8983"}
-TARGET=${TARGET:-"/tmp"}
-UNBLOCK_KEY=${UNBLOCK_KEY:-""}
-
-# if cmdline args are given, override any env var setting (or defaults)
-while getopts ":d:hs:t:u:" opt
-do
-   case $opt in
-       d) DATAVERSE_URL=${OPTARG};;
-       h) usage; exit 0;;
-       s) SOLR_URL=${OPTARG};;
-       t) TARGET=${OPTARG};;
-       u) UNBLOCK_KEY=${OPTARG};;
-       :) echo "Missing option argument for -${OPTARG}. Use -h for help." >&2; exit 1;;
-      \?) echo "Unknown option -${OPTARG}." >&2; usage; exit 1;;
-   esac
-done
-
-# Special handling of unblock key depending on referencing a secret file or key in var
-if [ ! -z "${UNBLOCK_KEY}" ]; then
-  if [ -f "${UNBLOCK_KEY}" ]; then
-    UNBLOCK_KEY="?unblock-key=$(cat ${UNBLOCK_KEY})"
-  else
-    UNBLOCK_KEY="?unblock-key=${UNBLOCK_KEY}"
-  fi
-fi
-
-### Retrieval
-echo "Retrieve schema data from ${DATAVERSE_URL}/api/admin/index/solr/schema"
-TMPFILE=`mktemp`
-curl -f -sS "${DATAVERSE_URL}/api/admin/index/solr/schema${UNBLOCK_KEY}" > $TMPFILE
-
-### Processing
-echo "Writing ${TARGET}/schema_dv_mdb_fields.xml"
-echo "<fields>" > ${TARGET}/schema_dv_mdb_fields.xml
-cat ${TMPFILE} | grep ".*<field" >> ${TARGET}/schema_dv_mdb_fields.xml
-echo "</fields>" >> ${TARGET}/schema_dv_mdb_fields.xml
-
-echo "Writing ${TARGET}/schema_dv_mdb_copies.xml"
-echo "<schema>" > ${TARGET}/schema_dv_mdb_copies.xml
-cat ${TMPFILE} | grep ".*<copyField" >> ${TARGET}/schema_dv_mdb_copies.xml
-echo "</schema>" >> ${TARGET}/schema_dv_mdb_copies.xml
-
-rm ${TMPFILE}*
-
-### Reloading
-echo "Triggering Solr RELOAD at ${SOLR_URL}/solr/admin/cores?action=RELOAD&core=collection1"
-curl -f -sS "${SOLR_URL}/solr/admin/cores?action=RELOAD&core=collection1"
\ No newline at end of file
diff --git a/conf/solr/schema.xml b/conf/solr/schema.xml
new file mode 100644
index 00000000000..34f888acec4
--- /dev/null
+++ b/conf/solr/schema.xml
@@ -0,0 +1,1607 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+
+ This example schema is the recommended starting point for users.
+ It should be kept correct and concise, usable out-of-the-box.
+
+
+ For more information, on how to customize this file, please see
+ https://solr.apache.org/guide/solr/latest/indexing-guide/schema-elements.html
+
+ PERFORMANCE NOTE: this schema includes many optional features and should not
+ be used for benchmarking.  To improve performance one could
+  - set stored="false" for all fields possible (esp large fields) when you
+    only need to search on the field but don't need to return the original
+    value.
+  - set indexed="false" if you don't need to search on the field, but only
+    return the field as a result of searching on other indexed fields.
+  - remove all unneeded copyField statements
+  - for best index size and searching performance, set "index" to false
+    for all general text fields, use copyField to copy them to the
+    catchall "text" field, and use that for searching.
+-->
+
+<schema name="default-config" version="1.7">
+    <!-- attribute "name" is the name of this schema and is only used for display purposes.
+       version="x.y" is Solr's version number for the schema syntax and
+       semantics.  It should not normally be changed by applications.
+
+       1.0: multiValued attribute did not exist, all fields are multiValued
+            by nature
+       1.1: multiValued attribute introduced, false by default
+       1.2: omitTermFreqAndPositions attribute introduced, true by default
+            except for text fields.
+       1.3: removed optional field compress feature
+       1.4: autoGeneratePhraseQueries attribute introduced to drive QueryParser
+            behavior when a single string produces multiple tokens.  Defaults
+            to off for version >= 1.4
+       1.5: omitNorms defaults to true for primitive field types
+            (int, float, boolean, string...)
+       1.6: useDocValuesAsStored defaults to true.
+       1.7: docValues defaults to true, uninvertible defaults to false.
+    -->
+
+    <!-- Valid attributes for fields:
+     name: mandatory - the name for the field
+     type: mandatory - the name of a field type from the
+       fieldTypes section
+     indexed: true if this field should be indexed (searchable or sortable)
+     stored: true if this field should be retrievable
+     docValues: true if this field should have doc values. Doc Values is
+       recommended (required, if you are using *Point fields) for faceting,
+       grouping, sorting and function queries. Doc Values will make the index
+       faster to load, more NRT-friendly and more memory-efficient.
+       They are currently only supported by StrField, UUIDField, all
+       *PointFields, and depending on the field type, they might require
+       the field to be single-valued, be required or have a default value
+       (check the documentation of the field type you're interested in for
+       more information)
+     multiValued: true if this field may contain multiple values per document
+     omitNorms: (expert) set to true to omit the norms associated with
+       this field (this disables length normalization and index-time
+       boosting for the field, and saves some memory).  Only full-text
+       fields or fields that need an index-time boost need norms.
+       Norms are omitted for primitive (non-analyzed) types by default.
+     termVectors: [false] set to true to store the term vector for a
+       given field.
+       When using MoreLikeThis, fields used for similarity should be
+       stored for best performance.
+     termPositions: Store position information with the term vector.
+       This will increase storage costs.
+     termOffsets: Store offset information with the term vector. This
+       will increase storage costs.
+     required: The field is required.  It will throw an error if the
+       value does not exist
+     default: a value that should be used if no value is specified
+       when adding a document.
+    -->
+
+    <!-- field names should consist of alphanumeric or underscore characters only and
+      not start with a digit.  This is not currently strictly enforced,
+      but other field names will not have first class support from all components
+      and back compatibility is not guaranteed.  Names with both leading and
+      trailing underscores (e.g. _version_) are reserved.
+    -->
+
+    <!-- In this _default configset, only four fields are pre-declared:
+         id, _version_, and _text_ and _root_. All other fields will be type guessed and added via the
+         "add-unknown-fields-to-the-schema" update request processor chain declared in solrconfig.xml.
+
+         Note that many dynamic fields are also defined - you can use them to specify a
+         field's type via field naming conventions - see below.
+
+         WARNING: The _text_ catch-all field will significantly increase your index size.
+         If you don't need it, consider removing it and the corresponding copyField directive."
+    -->
+
+    <field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" />
+    <!-- docValues are enabled by default for long type so we don't need to index the version field  -->
+    <field name="_version_" type="plong" indexed="false" stored="false"/>
+    <field name="_root_" type="string" indexed="true" stored="false" docValues="false" />
+
+
+
+
+
+<!-- Start: Dataverse-specific -->
+
+    <!-- catchall field, containing all other searchable text fields (implemented
+        via copyField further on in this schema  -->
+    <!-- Dataverse solr 7.3.0: for some reason the old text wasn't working so switched to _text_ for copyfields -->
+        <!--<field name="text" type="text_general" indexed="true" stored="false" multiValued="true"/>-->
+        <field name="_text_" type="text_general" indexed="true" stored="false" multiValued="true"/>
+    <!-- catchall text field that indexes tokens both normally and in reverse for efficient
+        leading wildcard queries. -->
+    <field name="text_rev" type="text_general_rev" indexed="true" stored="false" multiValued="true"/>    
+    <field name="name" type="text_en" indexed="true" stored="true"/>
+    
+    <field name="definitionPointDocId" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="definitionPointDvObjectId" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="discoverableBy" type="string" stored="true" indexed="true" multiValued="true"/>
+
+    <field name="dvObjectType" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="metadataSource" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="isHarvested" type="boolean" stored="true" indexed="true" multiValued="false"/>
+    <field name="fileDeleted" type="boolean" stored="true" indexed="true" multiValued="false"/>
+
+    <field name="dvName" type="text_en" stored="true" indexed="true" multiValued="false"/>
+    <field name="dvAlias" type="text_en" stored="true" indexed="true" multiValued="false"/>
+    <field name="dvParentAlias" type="text_en" stored="true" indexed="true" multiValued="false"/>
+    <field name="dvAffiliation" type="text_en" stored="true" indexed="true" multiValued="false"/>
+    <field name="dvDescription" type="text_en" stored="true" indexed="true" multiValued="false"/>
+
+    <field name="dvCategory" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="categoryOfDataverse" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="identifierOfDataverse" type="string" stored="true" indexed="true" multiValued="false"/>
+    
+    <field name="publicationDate" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="dsPublicationDate" type="string" stored="true" indexed="true" multiValued="false"/>
+
+    <field name="dvSubject" type="string" stored="true" indexed="true" multiValued="true"/>
+
+    <field name="publicationStatus" type="string" stored="true" indexed="true" multiValued="true"/>
+    <field name="curationStatus" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="curationStatusCreateTime" type="pdate" indexed="true" stored="true"/>
+    <field name="embargoEndDate" type="plong" stored="true" indexed="true" multiValued="false"/>
+    <field name="retentionEndDate" type="plong" stored="true" indexed="true" multiValued="false"/>
+
+    <field name="subtreePaths" type="string" stored="true" indexed="true" multiValued="true"/>
+
+    <field name="fileName" type="text_en" stored="true" indexed="true" multiValued="true"/>
+    <field name="fileType" type="text_en" stored="true" indexed="true" multiValued="true"/>
+    <field name="fileNameWithoutExtension" type="text_en" stored="true" indexed="true" multiValued="true"/>
+    <field name="variableName" type="text_en" stored="true" indexed="true" multiValued="true"/>
+    <field name="variableLabel" type="text_en" stored="true" indexed="true" multiValued="true"/>
+    <field name="variableCount" type="plong" stored="true" indexed="false" multiValued="false"/>
+    <field name="observations" type="plong" stored="true" indexed="false" multiValued="false"/>
+
+    <field name="literalQuestion" type="text_en" stored="true" indexed="true" multiValued="true"/>
+    <field name="interviewInstructions" type="text_en" stored="true" indexed="true" multiValued="true"/>
+    <field name="postQuestion" type="text_en" stored="true" indexed="true" multiValued="true"/>
+    <field name="variableUniverse" type="text_en" stored="true" indexed="true" multiValued="true"/>
+    <field name="variableNotes" type="text_en" stored="true" indexed="true" multiValued="true"/>
+
+    <field name="fileDescription" type="text_en" stored="true" indexed="true" multiValued="false"/>
+
+    <field name="fileTypeGroupFacet" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="fileTypeDisplay" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="fileTag" type="string" stored="true" indexed="true" multiValued="true"/>
+    <field name="fileTags" type="text_en" stored="true" indexed="true" multiValued="true"/>
+    <field name="tabularDataTag" type="string" stored="true" indexed="true" multiValued="true"/>
+    <field name="fileAccess" type="string" stored="true" indexed="true" multiValued="true"/>
+
+    <!-- Added for Dataverse 4.0 alpha 1: static "parent" fields not copied to "catchall" field https://redmine.hmdc.harvard.edu/issues/3603  -->
+    <!-- We index parentid and parentname as a debugging aid in case we want to match on it with an explict query like curl 'http://localhost:8983/solr/collection1/select?rows=100&wt=json&indent=true&q=parentId%3A42' or curl 'http://localhost:8983/solr/collection1/select?rows=100&wt=json&indent=true&q=parentName%3Abirds' -->
+    <!-- TODO: store parentid as a long instead of a string  -->
+    <field name="parentId" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="parentIdentifier" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="parentName" type="string" stored="true" indexed="false" multiValued="false"/>
+    <field name="parentCitation" type="string" stored="true" indexed="false" multiValued="false"/>
+    <field name="citation" type="string" stored="true" indexed="false" multiValued="false"/>
+    <field name="citationHtml" type="string" stored="true" indexed="false" multiValued="false"/>
+    <field name="identifier" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="persistentUrl" type="string" stored="true" indexed="false" multiValued="false"/>
+    <field name="unf" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="fileSizeInBytes" type="plong" stored="true" indexed="true" multiValued="false"/>
+    <field name="fileMd5" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="fileChecksumType" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="fileChecksumValue" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="fileContentType" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="deaccessionReason" type="string" stored="true" indexed="false" multiValued="false"/>
+    <field name="fileRestricted" type="boolean" stored="true" indexed="false" multiValued="false"/>
+    <field name="canDownloadFile" type="boolean" stored="true" indexed="false" multiValued="false"/>
+    <field name="versionNote" type="string" stored="true" indexed="false" multiValued="false"/>
+    
+    <!-- Added for Dataverse 4.0 alpha 1. This is a required field so we don't have to go to the database to get the database id of the entity. On cards we use the id in links -->
+    <field name="entityId" type="plong" stored="true" indexed="true" multiValued="false"/>
+
+    <field name="datasetVersionId" type="plong" stored="true" indexed="true" multiValued="false"/>
+    <field name="datasetType" type="string" stored="true" indexed="true" multiValued="false"/>
+
+    <!-- Added for Dataverse 4.0 alpha 1 to sort by name  -->
+    <!-- https://redmine.hmdc.harvard.edu/issues/3482 -->
+    <!-- 'Sorting can be done on the "score" of the document, or on any multiValued="false" indexed="true" field provided that field is either non-tokenized (ie: has no Analyzer) or uses an Analyzer that only produces a single Term (ie: uses the KeywordTokenizer)' http://wiki.apache.org/solr/CommonQueryParameters#sort -->
+    <!-- http://stackoverflow.com/questions/13360706/solr-4-0-alphabetical-sorting-trouble/13361226#13361226 -->
+    <field name="nameSort" type="string" indexed="true" stored="true"/>
+
+    <field name="dateSort" type="pdate" indexed="true" stored="true"/>
+
+    <!-- Added for Dataverse 4.0: release date https://redmine.hmdc.harvard.edu/issues/3592 -->
+    <field name="releasedate" type="pint" indexed="true" stored="true"/>
+
+    <!-- Added for Dataverse 4.0: do we want a description field that applies to dataverses, datasets, and files? https://redmine.hmdc.harvard.edu/issues/3745 -->
+    <field name="description" type="text_en" multiValued="false" stored="true" indexed="true"/>
+
+    <field name="dsPersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- Dataverse geospatial search -->
+    <!-- https://solr.apache.org/guide/8_11/spatial-search.html#rpt -->
+    <field name="geolocation" type="location_rpt" multiValued="true" stored="true" indexed="true"/>
+    <!-- https://solr.apache.org/guide/8_11/spatial-search.html#bboxfield -->
+    <field name="boundingBox" type="bbox" multiValued="true" stored="true" indexed="true"/>
+
+    <!-- incomplete datasets issue 8822 -->
+    <field name="datasetValid" type="boolean" stored="true" indexed="true" multiValued="false"/>
+
+    <field name="license" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="fileCount" type="plong" stored="true" indexed="true" multiValued="false"/>
+    <field name="datasetCount" type="plong" stored="true" indexed="true" multiValued="false"/>
+    
+    <!--
+        METADATA SCHEMA FIELDS
+        Now following: any fields generated from the metadata schemas loaded into Dataverse.
+        
+        Note: You can retrieve a list of the following fields from a specific API endpoint of your Dataverse
+              installation, available at "http://<your Dataverse host>/api/admin/index/solr/schema".
+              See also https://guides.dataverse.org/en/latest/admin/metadatacustomization.html#updating-the-solr-schema
+              
+        Note: Please see https://guides.dataverse.org/en/latest/admin/metadatacustomization.html for advice on
+              how to create your own metadata schemas.
+        
+        WARNING: Do not remove the following include guards if you intend to use the neat helper scripts we provide.
+    -->
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <field name="3d3DTechnique" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="3dAltText" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="3dEquipment" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="3dExportedFileFormat" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="3dExportedFilePolygonCount" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="3dHandling" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="3dHeight" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="3dLength" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="3dLightingSetup" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="3dMasterFilePolygonCount" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="3dMaterialComposition" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="3dObjectDimensions" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="3dUnit" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="3dWeight" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="3dWidth" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="accessToSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="actionsToMinimizeLoss" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="alternativeTitle" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="alternativeURL" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="astroFacility" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="astroInstrument" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="astroObject" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="astroType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="author" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="authorAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="authorIdentifier" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="authorIdentifierScheme" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="authorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="characteristicOfSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="city" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="cleaningOperations" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="collectionMode" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="collectorTraining" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="contributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="contributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="contributorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="controlOperations" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="country" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Depth" type="pdouble" multiValued="false" stored="true" indexed="true"/>
+    <field name="coverage.ObjectCount" type="plong" multiValued="false" stored="true" indexed="true"/>
+    <field name="coverage.ObjectDensity" type="pdouble" multiValued="false" stored="true" indexed="true"/>
+    <field name="coverage.Polarization" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="coverage.Redshift.MaximumValue" type="pdouble" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Redshift.MinimumValue" type="pdouble" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.RedshiftValue" type="pdouble" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.SkyFraction" type="pdouble" multiValued="false" stored="true" indexed="true"/>
+    <field name="coverage.Spatial" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Spectral.Bandpass" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Spectral.CentralWavelength" type="pdouble" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Spectral.MaximumWavelength" type="pdouble" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Spectral.MinimumWavelength" type="pdouble" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Spectral.Wavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Temporal" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Temporal.StartTime" type="date_range" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Temporal.StopTime" type="date_range" multiValued="true" stored="true" indexed="true"/>
+    <field name="dataCollectionSituation" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="dataCollector" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="datasetContact" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="datasetContactAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="datasetContactEmail" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="datasetContactName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="datasetLevelErrorNotes" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="dataSources" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dateOfCollection" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dateOfCollectionEnd" type="date_range" multiValued="true" stored="true" indexed="true"/>
+    <field name="dateOfCollectionStart" type="date_range" multiValued="true" stored="true" indexed="true"/>
+    <field name="dateOfDeposit" type="date_range" multiValued="false" stored="true" indexed="true"/>
+    <field name="depositor" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="deviationsFromSampleDesign" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="distributionDate" type="date_range" multiValued="false" stored="true" indexed="true"/>
+    <field name="distributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="distributorAbbreviation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="distributorAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="distributorLogoURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="distributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="distributorURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dsDescription" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dsDescriptionDate" type="date_range" multiValued="true" stored="true" indexed="true"/>
+    <field name="dsDescriptionValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="eastLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="frequencyOfDataCollection" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="geographicBoundingBox" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="geographicCoverage" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="geographicUnit" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="grantNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="grantNumberAgency" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="grantNumberValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="journalArticleType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="journalIssue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="journalPubDate" type="date_range" multiValued="true" stored="true" indexed="true"/>
+    <field name="journalVolume" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="journalVolumeIssue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="keyword" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="keywordTermURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="keywordValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="keywordVocabulary" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="keywordVocabularyURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="kindOfData" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="language" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="northLatitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="notesText" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="originOfSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="otherDataAppraisal" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="otherGeographicCoverage" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="otherId" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="otherIdAgency" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="otherIdValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="otherReferences" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producer" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producerAbbreviation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producerAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producerLogoURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producerName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producerURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="productionDate" type="date_range" multiValued="false" stored="true" indexed="true"/>
+    <field name="productionPlace" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="publication" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="publicationCitation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="publicationIDNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="publicationIDType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="publicationRelationType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="publicationURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="redshiftType" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="relatedDatasets" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="relatedMaterial" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="researchInstrument" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="resolution.Redshift" type="pdouble" multiValued="false" stored="true" indexed="true"/>
+    <field name="resolution.Spatial" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="resolution.Spectral" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="resolution.Temporal" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="responseRate" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="samplingErrorEstimates" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="samplingProcedure" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="series" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="seriesInformation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="seriesName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="socialScienceNotes" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="socialScienceNotesSubject" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="socialScienceNotesText" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="socialScienceNotesType" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="software" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="softwareName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="softwareVersion" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="southLatitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="state" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayCellType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayMeasurementType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayOrganism" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayOtherMeasurmentType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayOtherOrganism" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayOtherPlatform" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayOtherTechnologyType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayPlatform" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayTechnologyType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyDesignType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyFactorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyOtherDesignType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyOtherFactorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="subject" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="subtitle" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="targetSampleActualSize" type="plong" multiValued="false" stored="true" indexed="true"/>
+    <field name="targetSampleSize" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="targetSampleSizeFormula" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="timeMethod" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="timePeriodCovered" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="timePeriodCoveredEnd" type="date_range" multiValued="true" stored="true" indexed="true"/>
+    <field name="timePeriodCoveredStart" type="date_range" multiValued="true" stored="true" indexed="true"/>
+    <field name="title" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="topicClassification" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="topicClassValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="topicClassVocab" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="topicClassVocabURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="unitOfAnalysis" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="universe" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="weighting" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="westLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::END -->
+    
+
+    <copyField source="description" dest="_text_" maxChars="3000"/>
+
+    <!-- Added for Dataverse 4.0 Beta: make variable names and labels searchable in basic search https://redmine.hmdc.harvard.edu/issues/3945 -->
+    <copyField source="variableName" dest="_text_" maxChars="3000"/>
+    <copyField source="variableLabel" dest="_text_" maxChars="3000"/>
+    <!-- Added variable level metadata that can be updated from DCT -->
+    <copyField source="literalQuestion" dest="_text_" maxChars="3000"/>
+    <copyField source="interviewInstructions" dest="_text_" maxChars="3000"/>
+    <copyField source="postQuestion" dest="_text_" maxChars="3000"/>
+    <copyField source="variableUniverse" dest="_text_" maxChars="3000"/>
+    <copyField source="variableNotes" dest="_text_" maxChars="3000"/>
+    <!-- Make dataverse subject and affiliation searchable from basic search: https://github.com/IQSS/dataverse/issues/1431 -->
+    <copyField source="dvSubject" dest="_text_" maxChars="3000"/>
+    <copyField source="dvAlias" dest="_text_" maxChars="3000"/>
+    <copyField source="dvAffiliation" dest="_text_" maxChars="3000"/>
+    <copyField source="dsPersistentId" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetType" dest="_text_" maxChars="3000"/>
+    <!-- copyField commands copy one field to another at the time a document
+        is added to the index.  It's used either to index the same field differently,
+        or to add multiple fields to the same field for easier/faster searching.  -->
+
+    <!-- <copyField source="cat" dest="_text_"/> -->
+    <!-- Dataverse 4.0: we want the "name" field in the "catchall"  -->
+    <copyField source="name" dest="_text_"/>
+    <!-- Dataverse 4.0: we want the "filetype_en" and "filename_without_extension_en" field in the "catchall" per https://redmine.hmdc.harvard.edu/issues/3848  -->
+    <copyField source="fileType" dest="_text_"/>
+    <copyField source="fileNameWithoutExtension" dest="_text_"/>
+    <!-- <copyField source="manu" dest="_text_"/> -->
+    <!-- <copyField source="features" dest="_text_"/> -->
+    <!-- <copyField source="includes" dest="_text_"/> -->
+    <!-- <copyField source="manu" dest="manu_exact"/> -->
+
+    <!-- Copy the price into a currency enabled field (default USD) -->
+    <!-- <copyField source="price" dest="price_c"/> -->
+
+    <!-- Text fields from SolrCell to search by default in our catch-all field -->
+    <!-- <copyField source="title" dest="_text_"/> -->
+    <!-- <copyField source="author" dest="_text_"/> -->
+    <!-- <copyField source="description" dest="_text_"/> -->
+    <!-- <copyField source="keywords" dest="_text_"/> -->
+    <!-- <copyField source="content" dest="_text_"/> -->
+    <!-- <copyField source="content_type" dest="_text_"/> -->
+    <!-- <copyField source="resourcename" dest="_text_"/> -->
+    <!-- <copyField source="url" dest="_text_"/> -->
+
+    <!-- Create a string version of author for faceting -->
+    <!-- <copyField source="author" dest="author_s"/> -->
+
+    <!-- Above, multiple source fields are copied to the [text] field. 
+        Another way to map multiple source fields to the same 
+        destination field is to use the dynamic field syntax. 
+        copyField also supports a maxChars to copy setting.  -->
+
+    <!-- <copyField source="*_t" dest="_text_" maxChars="3000"/> -->
+
+    <!-- Added for Dataverse 4.0 alpha 1 for dynamic datasetfields (but later removed once we have copyField for each field  -->
+    <!-- https://redmine.hmdc.harvard.edu/issues/3586 -->
+    <!-- <copyField source="*_s" dest="_text_" maxChars="3000"/> -->
+    <!-- <copyField source="*_ss" dest="_text_" maxChars="3000"/> -->
+    <!-- <copyField source="*_i" dest="_text_" maxChars="3000"/> -->
+    
+    <copyField source="datasetValid" dest="_text_" maxChars="3000"/>
+    
+    <!--
+        METADATA SCHEMA FIELDS
+        Now following: copyFields to copy the contents of the metadata fields above to a
+        catch-all textfield necessary for searching in Dataverse.
+        
+        Note: You can retrieve a list of the following fields from a specific API endpoint of your Dataverse
+              installation, available at "http://<your Dataverse host>/api/admin/index/solr/schema".
+              See also https://guides.dataverse.org/en/latest/admin/metadatacustomization.html#updating-the-solr-schema
+              
+        Note: Please see https://guides.dataverse.org/en/latest/admin/metadatacustomization.html for advice on
+              how to create your own metadata schemas.
+        
+        WARNING: Do not remove the following include guards if you intend to use the neat helper scripts we provide.
+    -->
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <copyField source="3d3DTechnique" dest="_text_" maxChars="3000"/>
+    <copyField source="3dAltText" dest="_text_" maxChars="3000"/>
+    <copyField source="3dEquipment" dest="_text_" maxChars="3000"/>
+    <copyField source="3dExportedFileFormat" dest="_text_" maxChars="3000"/>
+    <copyField source="3dExportedFilePolygonCount" dest="_text_" maxChars="3000"/>
+    <copyField source="3dHandling" dest="_text_" maxChars="3000"/>
+    <copyField source="3dHeight" dest="_text_" maxChars="3000"/>
+    <copyField source="3dLength" dest="_text_" maxChars="3000"/>
+    <copyField source="3dLightingSetup" dest="_text_" maxChars="3000"/>
+    <copyField source="3dMasterFilePolygonCount" dest="_text_" maxChars="3000"/>
+    <copyField source="3dMaterialComposition" dest="_text_" maxChars="3000"/>
+    <copyField source="3dObjectDimensions" dest="_text_" maxChars="3000"/>
+    <copyField source="3dUnit" dest="_text_" maxChars="3000"/>
+    <copyField source="3dWeight" dest="_text_" maxChars="3000"/>
+    <copyField source="3dWidth" dest="_text_" maxChars="3000"/>
+    <copyField source="accessToSources" dest="_text_" maxChars="3000"/>
+    <copyField source="actionsToMinimizeLoss" dest="_text_" maxChars="3000"/>
+    <copyField source="alternativeTitle" dest="_text_" maxChars="3000"/>
+    <copyField source="alternativeURL" dest="_text_" maxChars="3000"/>
+    <copyField source="astroFacility" dest="_text_" maxChars="3000"/>
+    <copyField source="astroInstrument" dest="_text_" maxChars="3000"/>
+    <copyField source="astroObject" dest="_text_" maxChars="3000"/>
+    <copyField source="astroType" dest="_text_" maxChars="3000"/>
+    <copyField source="author" dest="_text_" maxChars="3000"/>
+    <copyField source="authorAffiliation" dest="_text_" maxChars="3000"/>
+    <copyField source="authorIdentifier" dest="_text_" maxChars="3000"/>
+    <copyField source="authorIdentifierScheme" dest="_text_" maxChars="3000"/>
+    <copyField source="authorName" dest="_text_" maxChars="3000"/>
+    <copyField source="characteristicOfSources" dest="_text_" maxChars="3000"/>
+    <copyField source="city" dest="_text_" maxChars="3000"/>
+    <copyField source="cleaningOperations" dest="_text_" maxChars="3000"/>
+    <copyField source="collectionMode" dest="_text_" maxChars="3000"/>
+    <copyField source="collectorTraining" dest="_text_" maxChars="3000"/>
+    <copyField source="contributor" dest="_text_" maxChars="3000"/>
+    <copyField source="contributorName" dest="_text_" maxChars="3000"/>
+    <copyField source="contributorType" dest="_text_" maxChars="3000"/>
+    <copyField source="controlOperations" dest="_text_" maxChars="3000"/>
+    <copyField source="country" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Depth" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.ObjectCount" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.ObjectDensity" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Polarization" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Redshift.MaximumValue" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Redshift.MinimumValue" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.RedshiftValue" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.SkyFraction" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spatial" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spectral.Bandpass" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spectral.CentralWavelength" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spectral.MaximumWavelength" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spectral.MinimumWavelength" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spectral.Wavelength" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Temporal" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Temporal.StartTime" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Temporal.StopTime" dest="_text_" maxChars="3000"/>
+    <copyField source="dataCollectionSituation" dest="_text_" maxChars="3000"/>
+    <copyField source="dataCollector" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetContact" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetContactAffiliation" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetContactEmail" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetContactName" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetLevelErrorNotes" dest="_text_" maxChars="3000"/>
+    <copyField source="dataSources" dest="_text_" maxChars="3000"/>
+    <copyField source="dateOfCollection" dest="_text_" maxChars="3000"/>
+    <copyField source="dateOfCollectionEnd" dest="_text_" maxChars="3000"/>
+    <copyField source="dateOfCollectionStart" dest="_text_" maxChars="3000"/>
+    <copyField source="dateOfDeposit" dest="_text_" maxChars="3000"/>
+    <copyField source="depositor" dest="_text_" maxChars="3000"/>
+    <copyField source="deviationsFromSampleDesign" dest="_text_" maxChars="3000"/>
+    <copyField source="distributionDate" dest="_text_" maxChars="3000"/>
+    <copyField source="distributor" dest="_text_" maxChars="3000"/>
+    <copyField source="distributorAbbreviation" dest="_text_" maxChars="3000"/>
+    <copyField source="distributorAffiliation" dest="_text_" maxChars="3000"/>
+    <copyField source="distributorLogoURL" dest="_text_" maxChars="3000"/>
+    <copyField source="distributorName" dest="_text_" maxChars="3000"/>
+    <copyField source="distributorURL" dest="_text_" maxChars="3000"/>
+    <copyField source="dsDescription" dest="_text_" maxChars="3000"/>
+    <copyField source="dsDescriptionDate" dest="_text_" maxChars="3000"/>
+    <copyField source="dsDescriptionValue" dest="_text_" maxChars="3000"/>
+    <copyField source="eastLongitude" dest="_text_" maxChars="3000"/>
+    <copyField source="frequencyOfDataCollection" dest="_text_" maxChars="3000"/>
+    <copyField source="geographicBoundingBox" dest="_text_" maxChars="3000"/>
+    <copyField source="geographicCoverage" dest="_text_" maxChars="3000"/>
+    <copyField source="geographicUnit" dest="_text_" maxChars="3000"/>
+    <copyField source="grantNumber" dest="_text_" maxChars="3000"/>
+    <copyField source="grantNumberAgency" dest="_text_" maxChars="3000"/>
+    <copyField source="grantNumberValue" dest="_text_" maxChars="3000"/>
+    <copyField source="journalArticleType" dest="_text_" maxChars="3000"/>
+    <copyField source="journalIssue" dest="_text_" maxChars="3000"/>
+    <copyField source="journalPubDate" dest="_text_" maxChars="3000"/>
+    <copyField source="journalVolume" dest="_text_" maxChars="3000"/>
+    <copyField source="journalVolumeIssue" dest="_text_" maxChars="3000"/>
+    <copyField source="keyword" dest="_text_" maxChars="3000"/>
+    <copyField source="keywordTermURI" dest="_text_" maxChars="3000"/>
+    <copyField source="keywordValue" dest="_text_" maxChars="3000"/>
+    <copyField source="keywordVocabulary" dest="_text_" maxChars="3000"/>
+    <copyField source="keywordVocabularyURI" dest="_text_" maxChars="3000"/>
+    <copyField source="kindOfData" dest="_text_" maxChars="3000"/>
+    <copyField source="language" dest="_text_" maxChars="3000"/>
+    <copyField source="northLatitude" dest="_text_" maxChars="3000"/>
+    <copyField source="notesText" dest="_text_" maxChars="3000"/>
+    <copyField source="originOfSources" dest="_text_" maxChars="3000"/>
+    <copyField source="otherDataAppraisal" dest="_text_" maxChars="3000"/>
+    <copyField source="otherGeographicCoverage" dest="_text_" maxChars="3000"/>
+    <copyField source="otherId" dest="_text_" maxChars="3000"/>
+    <copyField source="otherIdAgency" dest="_text_" maxChars="3000"/>
+    <copyField source="otherIdValue" dest="_text_" maxChars="3000"/>
+    <copyField source="otherReferences" dest="_text_" maxChars="3000"/>
+    <copyField source="producer" dest="_text_" maxChars="3000"/>
+    <copyField source="producerAbbreviation" dest="_text_" maxChars="3000"/>
+    <copyField source="producerAffiliation" dest="_text_" maxChars="3000"/>
+    <copyField source="producerLogoURL" dest="_text_" maxChars="3000"/>
+    <copyField source="producerName" dest="_text_" maxChars="3000"/>
+    <copyField source="producerURL" dest="_text_" maxChars="3000"/>
+    <copyField source="productionDate" dest="_text_" maxChars="3000"/>
+    <copyField source="productionPlace" dest="_text_" maxChars="3000"/>
+    <copyField source="publication" dest="_text_" maxChars="3000"/>
+    <copyField source="publicationCitation" dest="_text_" maxChars="3000"/>
+    <copyField source="publicationIDNumber" dest="_text_" maxChars="3000"/>
+    <copyField source="publicationIDType" dest="_text_" maxChars="3000"/>
+    <copyField source="publicationRelationType" dest="_text_" maxChars="3000"/>
+    <copyField source="publicationURL" dest="_text_" maxChars="3000"/>
+    <copyField source="redshiftType" dest="_text_" maxChars="3000"/>
+    <copyField source="relatedDatasets" dest="_text_" maxChars="3000"/>
+    <copyField source="relatedMaterial" dest="_text_" maxChars="3000"/>
+    <copyField source="researchInstrument" dest="_text_" maxChars="3000"/>
+    <copyField source="resolution.Redshift" dest="_text_" maxChars="3000"/>
+    <copyField source="resolution.Spatial" dest="_text_" maxChars="3000"/>
+    <copyField source="resolution.Spectral" dest="_text_" maxChars="3000"/>
+    <copyField source="resolution.Temporal" dest="_text_" maxChars="3000"/>
+    <copyField source="responseRate" dest="_text_" maxChars="3000"/>
+    <copyField source="samplingErrorEstimates" dest="_text_" maxChars="3000"/>
+    <copyField source="samplingProcedure" dest="_text_" maxChars="3000"/>
+    <copyField source="series" dest="_text_" maxChars="3000"/>
+    <copyField source="seriesInformation" dest="_text_" maxChars="3000"/>
+    <copyField source="seriesName" dest="_text_" maxChars="3000"/>
+    <copyField source="socialScienceNotes" dest="_text_" maxChars="3000"/>
+    <copyField source="socialScienceNotesSubject" dest="_text_" maxChars="3000"/>
+    <copyField source="socialScienceNotesText" dest="_text_" maxChars="3000"/>
+    <copyField source="socialScienceNotesType" dest="_text_" maxChars="3000"/>
+    <copyField source="software" dest="_text_" maxChars="3000"/>
+    <copyField source="softwareName" dest="_text_" maxChars="3000"/>
+    <copyField source="softwareVersion" dest="_text_" maxChars="3000"/>
+    <copyField source="southLatitude" dest="_text_" maxChars="3000"/>
+    <copyField source="state" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayCellType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayMeasurementType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayOrganism" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayOtherMeasurmentType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayOtherOrganism" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayOtherPlatform" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayOtherTechnologyType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayPlatform" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayTechnologyType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyDesignType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyFactorType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyOtherDesignType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyOtherFactorType" dest="_text_" maxChars="3000"/>
+    <copyField source="subject" dest="_text_" maxChars="3000"/>
+    <copyField source="subtitle" dest="_text_" maxChars="3000"/>
+    <copyField source="targetSampleActualSize" dest="_text_" maxChars="3000"/>
+    <copyField source="targetSampleSize" dest="_text_" maxChars="3000"/>
+    <copyField source="targetSampleSizeFormula" dest="_text_" maxChars="3000"/>
+    <copyField source="timeMethod" dest="_text_" maxChars="3000"/>
+    <copyField source="timePeriodCovered" dest="_text_" maxChars="3000"/>
+    <copyField source="timePeriodCoveredEnd" dest="_text_" maxChars="3000"/>
+    <copyField source="timePeriodCoveredStart" dest="_text_" maxChars="3000"/>
+    <copyField source="title" dest="_text_" maxChars="3000"/>
+    <copyField source="topicClassification" dest="_text_" maxChars="3000"/>
+    <copyField source="topicClassValue" dest="_text_" maxChars="3000"/>
+    <copyField source="topicClassVocab" dest="_text_" maxChars="3000"/>
+    <copyField source="topicClassVocabURI" dest="_text_" maxChars="3000"/>
+    <copyField source="unitOfAnalysis" dest="_text_" maxChars="3000"/>
+    <copyField source="universe" dest="_text_" maxChars="3000"/>
+    <copyField source="weighting" dest="_text_" maxChars="3000"/>
+    <copyField source="westLongitude" dest="_text_" maxChars="3000"/>
+    <!-- SCHEMA-COPY-FIELDS::END -->
+    
+    <!-- This can be enabled, in case the client does not know what fields may be searched. It isn't enabled by default
+         because it's very expensive to index everything twice. -->
+    <!--<copyField source="*" dest="_text_"/>-->
+
+    <!-- Dynamic field definitions allow using convention over configuration
+       for fields via the specification of patterns to match field names.
+       EXAMPLE:  name="*_i" will match any field ending in _i (like myid_i, z_i)
+       RESTRICTION: the glob-like pattern in the name attribute must have a "*"
+       only at the start or the end.  -->
+   
+    <dynamicField name="*_i"  type="pint"    indexed="true"  stored="true"/>
+    <dynamicField name="*_is" type="pints"    indexed="true"  stored="true"/>
+    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" />
+    <dynamicField name="*_ss" type="strings"  indexed="true"  stored="true"/>
+    <dynamicField name="*_l"  type="plong"   indexed="true"  stored="true"/>
+    <dynamicField name="*_ls" type="plongs"   indexed="true"  stored="true"/>
+    <dynamicField name="*_b"  type="boolean" indexed="true" stored="true"/>
+    <dynamicField name="*_bs" type="booleans" indexed="true" stored="true"/>
+    <dynamicField name="*_f"  type="pfloat"  indexed="true"  stored="true"/>
+    <dynamicField name="*_fs" type="pfloats"  indexed="true"  stored="true"/>
+    <dynamicField name="*_d"  type="pdouble" indexed="true"  stored="true"/>
+    <dynamicField name="*_ds" type="pdoubles" indexed="true"  stored="true"/>
+    <dynamicField name="*_dt"  type="pdate"    indexed="true"  stored="true"/>
+    <dynamicField name="*_dts" type="pdates"   indexed="true"  stored="true"/>
+    <dynamicField name="*_t"   type="text_general" indexed="true" stored="true" multiValued="false"/>
+    <dynamicField name="*_txt" type="text_general" indexed="true" stored="true"/>
+    
+    <dynamicField name="random_*" type="random"/>
+    <dynamicField name="ignored_*" type="ignored"/>
+
+    <!-- Type used for data-driven schema, to add a string copy for each text field -->
+    <dynamicField name="*_str" type="strings" stored="false" docValues="true" indexed="false" useDocValuesAsStored="false" />
+    
+    <dynamicField name="*_p"  type="location" indexed="true" stored="true"/>
+    <dynamicField name="*_srpt"  type="location_rpt" indexed="true" stored="true"/>
+    
+    <!-- payloaded dynamic fields -->
+    <dynamicField name="*_dpf" type="delimited_payloads_float" indexed="true"  stored="true"/>
+    <dynamicField name="*_dpi" type="delimited_payloads_int" indexed="true"  stored="true"/>
+    <dynamicField name="*_dps" type="delimited_payloads_string" indexed="true"  stored="true"/>
+
+    <dynamicField name="attr_*" type="text_general" indexed="true" stored="true" multiValued="true"/>
+
+    <!-- Field to use to determine and enforce document uniqueness.
+      Unless this field is marked with required="false", it will be a required field
+    -->
+    <uniqueKey>id</uniqueKey>
+
+    <!-- copyField commands copy one field to another at the time a document
+       is added to the index.  It's used either to index the same field differently,
+       or to add multiple fields to the same field for easier/faster searching.
+
+    <copyField source="sourceFieldName" dest="destinationFieldName"/>
+    -->
+
+    <!-- field type definitions. The "name" attribute is
+       just a label to be used by field definitions.  The "class"
+       attribute and any other attributes determine the real
+       behavior of the fieldType.
+         Class names starting with "solr" refer to java classes in a
+       standard package such as org.apache.solr.analysis
+    -->
+
+    <!-- sortMissingLast and sortMissingFirst attributes are optional attributes are
+         currently supported on types that are sorted internally as strings
+         and on numeric types.
+       This includes "string", "boolean", "pint", "pfloat", "plong", "pdate", "pdouble".
+       - If sortMissingLast="true", then a sort on this field will cause documents
+         without the field to come after documents with the field,
+         regardless of the requested sort order (asc or desc).
+       - If sortMissingFirst="true", then a sort on this field will cause documents
+         without the field to come before documents with the field,
+         regardless of the requested sort order.
+       - If sortMissingLast="false" and sortMissingFirst="false" (the default),
+         then default lucene sorting will be used which places docs without the
+         field first in an ascending sort and last in a descending sort.
+    -->
+
+    <!-- This is an example of using the KeywordTokenizer along
+        With various TokenFilterFactories to produce a sortable field
+        that does not include some properties of the source text
+    -->
+    <fieldType name="alphaOnlySort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
+        <analyzer>
+        <!-- KeywordTokenizer does no actual tokenizing, so the entire
+                input string is preserved as a single token
+            -->
+        <tokenizer class="solr.KeywordTokenizerFactory"/>
+        <!-- The LowerCase TokenFilter does what you expect, which can be
+                when you want your sorting to be case insensitive
+            -->
+        <filter class="solr.LowerCaseFilterFactory" />
+        <!-- The TrimFilter removes any leading or trailing whitespace -->
+        <filter class="solr.TrimFilterFactory" />
+        <!-- The PatternReplaceFilter gives you the flexibility to use
+                Java Regular expression to replace any sequence of characters
+                matching a pattern with an arbitrary replacement string,
+                which may include back references to portions of the original
+                string matched by the pattern.
+
+                See the Java Regular Expression documentation for more
+                information on pattern and replacement string syntax.
+
+                http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
+            -->
+        <!-- commented out for Dataverse 4.0 alpha 1 because Kangaroos was being sorted before 2Legit2Quit -->
+        <!-- https://redmine.hmdc.harvard.edu/issues/3482#note-11 -->
+        <!-- <filter class="solr.PatternReplaceFilterFactory" pattern="([^a-z])" replacement="" replace="all" /> -->
+        </analyzer>
+    </fieldType>
+
+    <!-- The StrField type is not analyzed, but indexed/stored verbatim. -->
+    <fieldType name="string" class="solr.StrField" sortMissingLast="true" docValues="true" />
+    <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" docValues="true" />
+
+    <!-- boolean type: "true" or "false" -->
+    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+    <fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
+
+    <!--
+      Numeric field types that index values using KD-trees.
+      Point fields don't support FieldCache, so they must have docValues="true" if needed for sorting, faceting, functions, etc.
+    -->
+    <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
+    <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
+    <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+    <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+    
+    <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
+    <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
+    <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
+    <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+    <fieldType name="random" class="solr.RandomSortField" indexed="true"/>
+    
+    <!-- since fields of this type are by default not stored or indexed,
+       any data added to them will be ignored outright.  -->
+    <fieldType name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+
+    <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
+         is a more restricted form of the canonical representation of dateTime
+         http://www.w3.org/TR/xmlschema-2/#dateTime    
+         The trailing "Z" designates UTC time and is mandatory.
+         Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
+         All other components are mandatory.
+
+         Expressions can also be used to denote calculations that should be
+         performed relative to "NOW" to determine the value, ie...
+
+               NOW/HOUR
+                  ... Round to the start of the current hour
+               NOW-1DAY
+                  ... Exactly 1 day prior to now
+               NOW/DAY+6MONTHS+3DAYS
+                  ... 6 months and 3 days in the future from the start of
+                      the current day
+                      
+      -->
+    <!-- KD-tree versions of date fields -->
+    <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+    <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+
+    <fieldType name="date_range" class="solr.DateRangeField"/>
+
+    <!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
+    <fieldType name="binary" class="solr.BinaryField"/>
+    
+    <!--
+    RankFields can be used to store scoring factors to improve document ranking. They should be used
+    in combination with RankQParserPlugin.
+    (experimental)
+    -->
+    <fieldType name="rank" class="solr.RankField"/>
+    
+    <!-- solr.TextField allows the specification of custom text analyzers
+         specified as a tokenizer and a list of token filters. Different
+         analyzers may be specified for indexing and querying.
+
+         The optional positionIncrementGap puts space between multiple fields of
+         this type on the same document, with the purpose of preventing false phrase
+         matching across fields.
+
+         For more info on customizing your analyzer chain, please see
+         https://solr.apache.org/guide/solr/latest/indexing-guide/document-analysis.html#using-analyzers-tokenizers-and-filters
+     -->
+
+    <!-- One can also specify an existing Analyzer class that has a
+         default constructor via the class attribute on the analyzer element.
+         Example:
+    <fieldType name="text_greek" class="solr.TextField">
+      <analyzer class="org.apache.lucene.analysis.el.GreekAnalyzer"/>
+    </fieldType>
+    -->
+
+    <!-- A text field that only splits on whitespace for exact matching of words -->
+    <dynamicField name="*_ws" type="text_ws"  indexed="true"  stored="true"/>
+    <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
+      <analyzer>
+        <tokenizer name="whitespace"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- A general text field that has reasonable, generic
+         cross-language defaults: it tokenizes with StandardTokenizer,
+	       removes stop words from case-insensitive "stopwords.txt"
+	       (empty by default), and down cases.  At query time only, it
+	       also applies synonyms.
+	  -->
+    <fieldType name="text_general" class="solr.TextField" positionIncrementGap="100" multiValued="true">
+      <analyzer type="index">
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
+        <!-- in this example, we will only use synonyms at query time
+        <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+        <filter class="solr.FlattenGraphFilterFactory"/>
+        -->
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
+        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- SortableTextField generaly functions exactly like TextField,
+        except that it supports, and by default uses, docValues for sorting (or faceting)
+        on the first 1024 characters of the original field values (which is configurable).
+
+        This makes it a bit more useful then TextField in many situations, but the trade-off
+        is that it takes up more space on disk; which is why it's not used in place of TextField
+        for every fieldType in this _default schema.
+    -->
+    <dynamicField name="*_t_sort" type="text_gen_sort" indexed="true" stored="true" multiValued="false"/>
+    <dynamicField name="*_txt_sort" type="text_gen_sort" indexed="true" stored="true"/>
+    <fieldType name="text_gen_sort" class="solr.SortableTextField" positionIncrementGap="100" multiValued="true">
+      <analyzer type="index">
+        <tokenizer name="standard"/>
+        <filter name="stop" ignoreCase="true" words="stopwords.txt" />
+        <filter name="lowercase"/>
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer name="standard"/>
+        <filter name="stop" ignoreCase="true" words="stopwords.txt" />
+        <filter name="synonymGraph" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter name="lowercase"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- A text field with defaults appropriate for English: it tokenizes with StandardTokenizer,
+         removes English stop words (lang/stopwords_en.txt), down cases, protects words from protwords.txt, and
+         finally applies Porter's stemming.  The query time analyzer also applies synonyms from synonyms.txt. -->
+    <dynamicField name="*_txt_en" type="text_en"  indexed="true"  stored="true"/>
+    <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
+        <analyzer type="index">
+            <tokenizer class="solr.StandardTokenizerFactory"/>
+                        <!-- in this example, we will only use synonyms at query time
+                        <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+                        <filter class="solr.FlattenGraphFilterFactory"/>
+                        -->
+                        <!-- Case insensitive stop word removal.
+                        -->
+            <filter class="solr.StopFilterFactory"
+                    ignoreCase="true"
+                    words="lang/stopwords_en.txt"
+                />
+            
+            <filter class="solr.LowerCaseFilterFactory"/>
+            <filter class="solr.EnglishPossessiveFilterFactory"/>
+            <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+            
+            <!-- Solved highlighting breaking after upgrade #4836. Applied to query analyzer below too: 
+                https://stackoverflow.com/questions/26287321/solr-stemming-breaks-highlighting 
+                Solution was to ensure original word is kept by stemmer -MAD 4.9.2 -->
+            <filter class="solr.KeywordRepeatFilterFactory" />
+            <filter class="solr.PorterStemFilterFactory"/>
+            <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+            <filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true" />
+        </analyzer>
+        <analyzer type="query">
+            <tokenizer class="solr.StandardTokenizerFactory"/>
+            
+            <!-- MAD 4.9.2: Solr recommends doing synonym expansion at index not query, why do we do it here tho? 
+                    https://stackoverflow.com/questions/10185079/ 
+                    To me it looks like we we copied something that works-->
+            <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+            <filter class="solr.StopFilterFactory"
+                    ignoreCase="true"
+                    words="lang/stopwords_en.txt"
+                />
+            
+            <filter class="solr.LowerCaseFilterFactory"/>
+            <filter class="solr.EnglishPossessiveFilterFactory"/>
+            <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+
+            <filter class="solr.KeywordRepeatFilterFactory" />
+            <filter class="solr.PorterStemFilterFactory"/>
+            <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+        </analyzer>
+    </fieldType>
+
+    <!-- A text field with defaults appropriate for English, plus
+         aggressive word-splitting and autophrase features enabled.
+         This field is just like text_en, except it adds
+         WordDelimiterGraphFilter to enable splitting and matching of
+         words on case-change, alpha numeric boundaries, and
+         non-alphanumeric chars.  This means certain compound word
+         cases will work, for example query "wi fi" will match
+         document "WiFi" or "wi-fi".
+    -->
+    <dynamicField name="*_txt_en_split" type="text_en_splitting"  indexed="true"  stored="true"/>
+    <fieldType name="text_en_splitting" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
+      <analyzer type="index">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <!-- in this example, we will only use synonyms at query time
+        <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+        -->
+        <!-- Case insensitive stop word removal.
+        -->
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="lang/stopwords_en.txt"
+        />
+        <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+        <filter class="solr.PorterStemFilterFactory"/>
+        <filter class="solr.FlattenGraphFilterFactory" />
+        <filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true" />
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="lang/stopwords_en.txt"
+        />
+        <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+        <filter class="solr.PorterStemFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- Less flexible matching, but less false matches.  Probably not ideal for product names,
+         but may be good for SKUs.  Can insert dashes in the wrong place and still match. -->
+    <dynamicField name="*_txt_en_split_tight" type="text_en_splitting_tight"  indexed="true"  stored="true"/>
+    <fieldType name="text_en_splitting_tight" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
+      <analyzer type="index">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_en.txt"/>
+        <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+        <filter class="solr.EnglishMinimalStemFilterFactory"/>
+        <!-- this filter can remove any duplicate tokens that appear at the same position - sometimes
+             possible with WordDelimiterGraphFilter in conjuncton with stemming. -->
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+        <filter class="solr.FlattenGraphFilterFactory" />
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_en.txt"/>
+        <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+        <filter class="solr.EnglishMinimalStemFilterFactory"/>
+        <!-- this filter can remove any duplicate tokens that appear at the same position - sometimes
+             possible with WordDelimiterGraphFilter in conjuncton with stemming. -->
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- Just like text_general except it reverses the characters of
+	       each token, to enable more efficient leading wildcard queries.
+    -->
+    <dynamicField name="*_txt_rev" type="text_general_rev"  indexed="true"  stored="true"/>
+    <fieldType name="text_general_rev" class="solr.TextField" positionIncrementGap="100">
+      <analyzer type="index">
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.ReversedWildcardFilterFactory" withOriginal="true"
+                maxPosAsterisk="3" maxPosQuestion="2" maxFractionAsterisk="0.33"/>
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <dynamicField name="*_phon_en" type="phonetic_en"  indexed="true"  stored="true"/>
+    <fieldType name="phonetic_en" stored="false" indexed="true" class="solr.TextField" >
+      <analyzer>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- lowercases the entire field value, keeping it as a single token.  -->
+    <dynamicField name="*_s_lower" type="lowercase"  indexed="true"  stored="true"/>
+    <fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
+      <analyzer>
+        <tokenizer class="solr.KeywordTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory" />
+      </analyzer>
+    </fieldType>
+
+    <!-- 
+      Example of using PathHierarchyTokenizerFactory at index time, so
+      queries for paths match documents at that path, or in descendent paths
+    -->
+    <dynamicField name="*_descendent_path" type="descendent_path"  indexed="true"  stored="true"/>
+    <fieldType name="descendent_path" class="solr.TextField">
+      <analyzer type="index">
+        <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.KeywordTokenizerFactory" />
+      </analyzer>
+    </fieldType>
+
+    <!--
+      Example of using PathHierarchyTokenizerFactory at query time, so
+      queries for paths match documents at that path, or in ancestor paths
+    -->
+    <dynamicField name="*_ancestor_path" type="ancestor_path"  indexed="true"  stored="true"/>
+    <fieldType name="ancestor_path" class="solr.TextField">
+      <analyzer type="index">
+        <tokenizer class="solr.KeywordTokenizerFactory" />
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
+      </analyzer>
+    </fieldType>
+
+    <!-- This point type indexes the coordinates as separate fields (subFields)
+      If subFieldType is defined, it references a type, and a dynamic field
+      definition is created matching *___<typename>.  Alternately, if 
+      subFieldSuffix is defined, that is used to create the subFields.
+      Example: if subFieldType="double", then the coordinates would be
+        indexed in fields myloc_0___double,myloc_1___double.
+      Example: if subFieldSuffix="_d" then the coordinates would be indexed
+        in fields myloc_0_d,myloc_1_d
+      The subFields are an implementation detail of the fieldType, and end
+      users normally should not need to know about them.
+     -->
+    <dynamicField name="*_point" type="point"  indexed="true"  stored="true"/>
+    <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
+
+    <!-- A specialized field for geospatial search filters and distance sorting. -->
+    <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
+
+    <!-- A geospatial field type that supports multiValued and polygon shapes.
+      For more information about this and other spatial fields see:
+      http://lucene.apache.org/solr/guide/spatial-search.html
+    -->
+    <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
+               geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers" />
+    <!-- Dataverse - per GeoBlacklight, adding field type for bboxField that enables, among other things, overlap ratio calculations -->
+    <fieldType name="bbox" class="solr.BBoxField"
+           geo="true" distanceUnits="kilometers" numberType="pdouble" />
+
+    <!-- Payloaded field types -->
+    <fieldType name="delimited_payloads_float" stored="false" indexed="true" class="solr.TextField">
+      <analyzer>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
+      </analyzer>
+    </fieldType>
+    <fieldType name="delimited_payloads_int" stored="false" indexed="true" class="solr.TextField">
+      <analyzer>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="integer"/>
+      </analyzer>
+    </fieldType>
+    <fieldType name="delimited_payloads_string" stored="false" indexed="true" class="solr.TextField">
+      <analyzer>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="identity"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- some examples for different languages (generally ordered by ISO code) -->
+
+    <!-- Arabic -->
+    <dynamicField name="*_txt_ar" type="text_ar"  indexed="true"  stored="true"/>
+    <fieldType name="text_ar" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <!-- for any non-arabic -->
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ar.txt" />
+        <!-- normalizes īģ¯ to īģą, etc -->
+        <filter class="solr.ArabicNormalizationFilterFactory"/>
+        <filter class="solr.ArabicStemFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- Bulgarian -->
+    <dynamicField name="*_txt_bg" type="text_bg"  indexed="true"  stored="true"/>
+    <fieldType name="text_bg" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/> 
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_bg.txt" /> 
+        <filter class="solr.BulgarianStemFilterFactory"/>       
+      </analyzer>
+    </fieldType>
+    
+    <!-- Catalan -->
+    <dynamicField name="*_txt_ca" type="text_ca"  indexed="true"  stored="true"/>
+    <fieldType name="text_ca" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <!-- removes l', etc -->
+        <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_ca.txt"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ca.txt" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Catalan"/>       
+      </analyzer>
+    </fieldType>
+    
+    <!-- CJK bigram (see text_ja for a Japanese configuration using morphological analysis) -->
+    <dynamicField name="*_txt_cjk" type="text_cjk"  indexed="true"  stored="true"/>
+    <fieldType name="text_cjk" class="solr.TextField" positionIncrementGap="100">
+      <analyzer>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <!-- normalize width before bigram, as e.g. half-width dakuten combine  -->
+        <filter class="solr.CJKWidthFilterFactory"/>
+        <!-- for any non-CJK -->
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.CJKBigramFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- Czech -->
+    <dynamicField name="*_txt_cz" type="text_cz"  indexed="true"  stored="true"/>
+    <fieldType name="text_cz" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_cz.txt" />
+        <filter class="solr.CzechStemFilterFactory"/>       
+      </analyzer>
+    </fieldType>
+    
+    <!-- Danish -->
+    <dynamicField name="*_txt_da" type="text_da"  indexed="true"  stored="true"/>
+    <fieldType name="text_da" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_da.txt" format="snowball" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Danish"/>       
+      </analyzer>
+    </fieldType>
+    
+    <!-- German -->
+    <dynamicField name="*_txt_de" type="text_de"  indexed="true"  stored="true"/>
+    <fieldType name="text_de" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_de.txt" format="snowball" />
+        <filter class="solr.GermanNormalizationFilterFactory"/>
+        <filter class="solr.GermanLightStemFilterFactory"/>
+        <!-- less aggressive: <filter class="solr.GermanMinimalStemFilterFactory"/> -->
+        <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="German2"/> -->
+      </analyzer>
+    </fieldType>
+    
+    <!-- Greek -->
+    <dynamicField name="*_txt_el" type="text_el"  indexed="true"  stored="true"/>
+    <fieldType name="text_el" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <!-- greek specific lowercase for sigma -->
+        <filter class="solr.GreekLowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="false" words="lang/stopwords_el.txt" />
+        <filter class="solr.GreekStemFilterFactory"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- Spanish -->
+    <dynamicField name="*_txt_es" type="text_es"  indexed="true"  stored="true"/>
+    <fieldType name="text_es" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_es.txt" format="snowball" />
+        <filter class="solr.SpanishLightStemFilterFactory"/>
+        <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="Spanish"/> -->
+      </analyzer>
+    </fieldType>
+    
+    <!-- Basque -->
+    <dynamicField name="*_txt_eu" type="text_eu"  indexed="true"  stored="true"/>
+    <fieldType name="text_eu" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_eu.txt" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Basque"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- Persian -->
+    <dynamicField name="*_txt_fa" type="text_fa"  indexed="true"  stored="true"/>
+    <fieldType name="text_fa" class="solr.TextField" positionIncrementGap="100">
+      <analyzer>
+        <!-- for ZWNJ -->
+        <charFilter class="solr.PersianCharFilterFactory"/>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.ArabicNormalizationFilterFactory"/>
+        <filter class="solr.PersianNormalizationFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_fa.txt" />
+      </analyzer>
+    </fieldType>
+    
+    <!-- Finnish -->
+    <dynamicField name="*_txt_fi" type="text_fi"  indexed="true"  stored="true"/>
+    <fieldType name="text_fi" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_fi.txt" format="snowball" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Finnish"/>
+        <!-- less aggressive: <filter class="solr.FinnishLightStemFilterFactory"/> -->
+      </analyzer>
+    </fieldType>
+    
+    <!-- French -->
+    <dynamicField name="*_txt_fr" type="text_fr"  indexed="true"  stored="true"/>
+    <fieldType name="text_fr" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <!-- removes l', etc -->
+        <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_fr.txt"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_fr.txt" format="snowball" />
+        <filter class="solr.FrenchLightStemFilterFactory"/>
+        <!-- less aggressive: <filter class="solr.FrenchMinimalStemFilterFactory"/> -->
+        <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="French"/> -->
+      </analyzer>
+    </fieldType>
+    
+    <!-- Irish -->
+    <dynamicField name="*_txt_ga" type="text_ga"  indexed="true"  stored="true"/>
+    <fieldType name="text_ga" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <!-- removes d', etc -->
+        <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_ga.txt"/>
+        <!-- removes n-, etc. position increments is intentionally false! -->
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/hyphenations_ga.txt"/>
+        <filter class="solr.IrishLowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ga.txt"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="Irish"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- Galician -->
+    <dynamicField name="*_txt_gl" type="text_gl"  indexed="true"  stored="true"/>
+    <fieldType name="text_gl" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_gl.txt" />
+        <filter class="solr.GalicianStemFilterFactory"/>
+        <!-- less aggressive: <filter class="solr.GalicianMinimalStemFilterFactory"/> -->
+      </analyzer>
+    </fieldType>
+    
+    <!-- Hindi -->
+    <dynamicField name="*_txt_hi" type="text_hi"  indexed="true"  stored="true"/>
+    <fieldType name="text_hi" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <!-- normalizes unicode representation -->
+        <filter class="solr.IndicNormalizationFilterFactory"/>
+        <!-- normalizes variation in spelling -->
+        <filter class="solr.HindiNormalizationFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_hi.txt" />
+        <filter class="solr.HindiStemFilterFactory"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- Hungarian -->
+    <dynamicField name="*_txt_hu" type="text_hu"  indexed="true"  stored="true"/>
+    <fieldType name="text_hu" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_hu.txt" format="snowball" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Hungarian"/>
+        <!-- less aggressive: <filter class="solr.HungarianLightStemFilterFactory"/> -->   
+      </analyzer>
+    </fieldType>
+    
+    <!-- Armenian -->
+    <dynamicField name="*_txt_hy" type="text_hy"  indexed="true"  stored="true"/>
+    <fieldType name="text_hy" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_hy.txt" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Armenian"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- Indonesian -->
+    <dynamicField name="*_txt_id" type="text_id"  indexed="true"  stored="true"/>
+    <fieldType name="text_id" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_id.txt" />
+        <!-- for a less aggressive approach (only inflectional suffixes), set stemDerivational to false -->
+        <filter class="solr.IndonesianStemFilterFactory" stemDerivational="true"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- Italian -->
+  <dynamicField name="*_txt_it" type="text_it"  indexed="true"  stored="true"/>
+  <fieldType name="text_it" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <!-- removes l', etc -->
+        <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_it.txt"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_it.txt" format="snowball" />
+        <filter class="solr.ItalianLightStemFilterFactory"/>
+        <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="Italian"/> -->
+      </analyzer>
+    </fieldType>
+    
+    <!-- Japanese using morphological analysis (see text_cjk for a configuration using bigramming)
+
+         NOTE: If you want to optimize search for precision, use default operator AND in your request
+         handler config (q.op) Use OR if you would like to optimize for recall (default).
+    -->
+    <dynamicField name="*_txt_ja" type="text_ja"  indexed="true"  stored="true"/>
+    <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
+      <analyzer>
+        <!-- Kuromoji Japanese morphological analyzer/tokenizer (JapaneseTokenizer)
+
+           Kuromoji has a search mode (default) that does segmentation useful for search.  A heuristic
+           is used to segment compounds into its parts and the compound itself is kept as synonym.
+
+           Valid values for attribute mode are:
+              normal: regular segmentation
+              search: segmentation useful for search with synonyms compounds (default)
+            extended: same as search mode, but unigrams unknown words (experimental)
+
+           For some applications it might be good to use search mode for indexing and normal mode for
+           queries to reduce recall and prevent parts of compounds from being matched and highlighted.
+           Use <analyzer type="index"> and <analyzer type="query"> for this and mode normal in query.
+
+           Kuromoji also has a convenient user dictionary feature that allows overriding the statistical
+           model with your own entries for segmentation, part-of-speech tags and readings without a need
+           to specify weights.  Notice that user dictionaries have not been subject to extensive testing.
+
+           User dictionary attributes are:
+                     userDictionary: user dictionary filename
+             userDictionaryEncoding: user dictionary encoding (default is UTF-8)
+
+           See lang/userdict_ja.txt for a sample user dictionary file.
+
+           Punctuation characters are discarded by default.  Use discardPunctuation="false" to keep them.
+        -->
+        <tokenizer class="solr.JapaneseTokenizerFactory" mode="search"/>
+        <!--<tokenizer class="solr.JapaneseTokenizerFactory" mode="search" userDictionary="lang/userdict_ja.txt"/>-->
+        <!-- Reduces inflected verbs and adjectives to their base/dictionary forms (čžžæ›¸åŊĸ) -->
+        <filter class="solr.JapaneseBaseFormFilterFactory"/>
+        <!-- Removes tokens with certain part-of-speech tags -->
+        <filter class="solr.JapanesePartOfSpeechStopFilterFactory" tags="lang/stoptags_ja.txt" />
+        <!-- Normalizes full-width romaji to half-width and half-width kana to full-width (Unicode NFKC subset) -->
+        <filter class="solr.CJKWidthFilterFactory"/>
+        <!-- Removes common tokens typically not useful for search, but have a negative effect on ranking -->
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ja.txt" />
+        <!-- Normalizes common katakana spelling variations by removing any last long sound character (U+30FC) -->
+        <filter class="solr.JapaneseKatakanaStemFilterFactory" minimumLength="4"/>
+        <!-- Lower-cases romaji characters -->
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- Latvian -->
+    <dynamicField name="*_txt_lv" type="text_lv"  indexed="true"  stored="true"/>
+    <fieldType name="text_lv" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_lv.txt" />
+        <filter class="solr.LatvianStemFilterFactory"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- Dutch -->
+    <dynamicField name="*_txt_nl" type="text_nl"  indexed="true"  stored="true"/>
+    <fieldType name="text_nl" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_nl.txt" format="snowball" />
+        <filter class="solr.StemmerOverrideFilterFactory" dictionary="lang/stemdict_nl.txt" ignoreCase="false"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="Dutch"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- Norwegian -->
+    <dynamicField name="*_txt_no" type="text_no"  indexed="true"  stored="true"/>
+    <fieldType name="text_no" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_no.txt" format="snowball" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Norwegian"/>
+        <!-- less aggressive: <filter class="solr.NorwegianLightStemFilterFactory"/> -->
+        <!-- singular/plural: <filter class="solr.NorwegianMinimalStemFilterFactory"/> -->
+      </analyzer>
+    </fieldType>
+    
+    <!-- Portuguese -->
+  <dynamicField name="*_txt_pt" type="text_pt"  indexed="true"  stored="true"/>
+  <fieldType name="text_pt" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_pt.txt" format="snowball" />
+        <filter class="solr.PortugueseLightStemFilterFactory"/>
+        <!-- less aggressive: <filter class="solr.PortugueseMinimalStemFilterFactory"/> -->
+        <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="Portuguese"/> -->
+        <!-- most aggressive: <filter class="solr.PortugueseStemFilterFactory"/> -->
+      </analyzer>
+    </fieldType>
+    
+    <!-- Romanian -->
+    <dynamicField name="*_txt_ro" type="text_ro"  indexed="true"  stored="true"/>
+    <fieldType name="text_ro" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ro.txt" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Romanian"/>
+      </analyzer>
+    </fieldType>
+    
+    <!-- Russian -->
+    <dynamicField name="*_txt_ru" type="text_ru"  indexed="true"  stored="true"/>
+    <fieldType name="text_ru" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ru.txt" format="snowball" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Russian"/>
+        <!-- less aggressive: <filter class="solr.RussianLightStemFilterFactory"/> -->
+      </analyzer>
+    </fieldType>
+    
+    <!-- Swedish -->
+    <dynamicField name="*_txt_sv" type="text_sv"  indexed="true"  stored="true"/>
+    <fieldType name="text_sv" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_sv.txt" format="snowball" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Swedish"/>
+        <!-- less aggressive: <filter class="solr.SwedishLightStemFilterFactory"/> -->
+      </analyzer>
+    </fieldType>
+    
+    <!-- Thai -->
+    <dynamicField name="*_txt_th" type="text_th"  indexed="true"  stored="true"/>
+    <fieldType name="text_th" class="solr.TextField" positionIncrementGap="100">
+      <analyzer>
+        <tokenizer class="solr.ThaiTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_th.txt" />
+      </analyzer>
+    </fieldType>
+    
+    <!-- Turkish -->
+    <dynamicField name="*_txt_tr" type="text_tr"  indexed="true"  stored="true"/>
+    <fieldType name="text_tr" class="solr.TextField" positionIncrementGap="100">
+      <analyzer> 
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.TurkishLowerCaseFilterFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="false" words="lang/stopwords_tr.txt" />
+        <filter class="solr.SnowballPorterFilterFactory" language="Turkish"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- Similarity is the scoring routine for each document vs. a query.
+       A custom Similarity or SimilarityFactory may be specified here, but 
+       the default is fine for most applications.  
+       For more info: http://lucene.apache.org/solr/guide/other-schema-elements.html#OtherSchemaElements-Similarity
+    -->
+    <!--
+     <similarity class="com.example.solr.CustomSimilarityFactory">
+       <str name="paramkey">param value</str>
+     </similarity>
+    -->
+
+</schema>
diff --git a/conf/solr/solrconfig.xml b/conf/solr/solrconfig.xml
new file mode 100644
index 00000000000..003b71c85c1
--- /dev/null
+++ b/conf/solr/solrconfig.xml
@@ -0,0 +1,1129 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+     For more details about configurations options that may appear in
+     this file, see https://solr.apache.org/guide/solr/latest/configuration-guide/configuring-solrconfig-xml.html.
+-->
+<config>
+  <!-- In all configuration below, a prefix of "solr." for class names
+       is an alias that causes solr to search appropriate packages,
+       including org.apache.solr.(search|update|request|core|analysis)
+
+       You may also specify a fully qualified Java classname if you
+       have your own custom plugins.
+    -->
+
+  <!-- Controls what version of Lucene various components of Solr
+       adhere to.  Generally, you want to use the latest version to
+       get all bug fixes and improvements. It is highly recommended
+       that you fully re-index after changing this setting as it can
+       affect both how text is indexed and queried.
+  -->
+  <luceneMatchVersion>9.11</luceneMatchVersion>
+
+  <!-- Data Directory
+
+       Used to specify an alternate directory to hold all index data
+       other than the default ./data under the Solr home.  If
+       replication is in use, this should match the replication
+       configuration.
+    -->
+  <dataDir>${solr.data.dir:}</dataDir>
+
+
+  <!-- The DirectoryFactory to use for indexes.
+
+       solr.StandardDirectoryFactory is filesystem
+       based and tries to pick the best implementation for the current
+       JVM and platform.  solr.NRTCachingDirectoryFactory, the default,
+       wraps solr.StandardDirectoryFactory and caches small files in memory
+       for better NRT performance.
+
+       One can force a particular implementation via solr.MMapDirectoryFactory
+       or solr.NIOFSDirectoryFactory.
+
+       solr.RAMDirectoryFactory is memory based and not persistent.
+    -->
+  <directoryFactory name="DirectoryFactory"
+                    class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+
+  <!-- The CodecFactory for defining the format of the inverted index.
+       The default implementation is SchemaCodecFactory, which is the official Lucene
+       index format, but hooks into the schema to provide per-field customization of
+       the postings lists and per-document values in the fieldType element
+       (postingsFormat/docValuesFormat). Note that most of the alternative implementations
+       are experimental, so if you choose to customize the index format, it's a good
+       idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
+       before upgrading to a newer version to avoid unnecessary reindexing.
+       A "compressionMode" string element can be added to <codecFactory> to choose
+       between the existing compression modes in the default codec: "BEST_SPEED" (default)
+       or "BEST_COMPRESSION".
+  -->
+  <codecFactory class="solr.SchemaCodecFactory"/>
+
+  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       Index Config - These settings control low-level behavior of indexing
+       Most example settings here show the default value, but are commented
+       out, to more easily see where customizations have been made.
+
+       Note: This replaces <indexDefaults> and <mainIndex> from older versions
+       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+  <indexConfig>
+    <!-- maxFieldLength was removed in 4.0. To get similar behavior, include a
+         LimitTokenCountFilterFactory in your fieldType definition. E.g.
+     <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="10000"/>
+    -->
+    <!-- Maximum time to wait for a write lock (ms) for an IndexWriter. Default: 1000 -->
+    <!-- <writeLockTimeout>1000</writeLockTimeout>  -->
+
+    <!-- Expert: Enabling compound file will use less files for the index,
+         using fewer file descriptors on the expense of performance decrease.
+         Default in Lucene is "true". Default in Solr is "false" (since 3.6) -->
+    <!-- <useCompoundFile>false</useCompoundFile> -->
+
+    <!-- ramBufferSizeMB sets the amount of RAM that may be used by Lucene
+         indexing for buffering added documents and deletions before they are
+         flushed to the Directory.
+         maxBufferedDocs sets a limit on the number of documents buffered
+         before flushing.
+         If both ramBufferSizeMB and maxBufferedDocs is set, then
+         Lucene will flush based on whichever limit is hit first.  -->
+    <!-- <ramBufferSizeMB>100</ramBufferSizeMB> -->
+    <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
+
+    <!-- Expert: ramPerThreadHardLimitMB sets the maximum amount of RAM that can be consumed
+         per thread before they are flushed. When limit is exceeded, this triggers a forced
+         flush even if ramBufferSizeMB has not been exceeded.
+         This is a safety limit to prevent Lucene's DocumentsWriterPerThread from address space
+         exhaustion due to its internal 32 bit signed integer based memory addressing.
+         The specified value should be greater than 0 and less than 2048MB. When not specified,
+         Solr uses Lucene's default value 1945. -->
+    <!-- <ramPerThreadHardLimitMB>1945</ramPerThreadHardLimitMB> -->
+
+    <!-- Expert: Merge Policy
+         The Merge Policy in Lucene controls how merging of segments is done.
+         The default since Solr/Lucene 3.3 is TieredMergePolicy.
+         The default since Lucene 2.3 was the LogByteSizeMergePolicy,
+         Even older versions of Lucene used LogDocMergePolicy.
+      -->
+    <!--
+        <mergePolicyFactory class="org.apache.solr.index.TieredMergePolicyFactory">
+          <int name="maxMergeAtOnce">10</int>
+          <int name="segmentsPerTier">10</int>
+          <double name="noCFSRatio">0.1</double>
+        </mergePolicyFactory>
+      -->
+
+    <!-- Expert: Merge Scheduler
+         The Merge Scheduler in Lucene controls how merges are
+         performed.  The ConcurrentMergeScheduler (Lucene 2.3 default)
+         can perform merges in the background using separate threads.
+         The SerialMergeScheduler (Lucene 2.2 default) does not.
+     -->
+    <!--
+       <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
+       -->
+
+    <!-- LockFactory
+
+         This option specifies which Lucene LockFactory implementation
+         to use.
+
+         single = SingleInstanceLockFactory - suggested for a
+                  read-only index or when there is no possibility of
+                  another process trying to modify the index.
+         native = NativeFSLockFactory - uses OS native file locking.
+                  Do not use when multiple solr webapps in the same
+                  JVM are attempting to share a single index.
+         simple = SimpleFSLockFactory  - uses a plain file for locking
+
+         Defaults: 'native' is default for Solr3.6 and later, otherwise
+                   'simple' is the default
+
+         More details on the nuances of each LockFactory...
+         https://cwiki.apache.org/confluence/display/lucene/AvailableLockFactories
+    -->
+    <lockType>${solr.lock.type:native}</lockType>
+
+    <!-- Commit Deletion Policy
+         Custom deletion policies can be specified here. The class must
+         implement org.apache.lucene.index.IndexDeletionPolicy.
+
+         The default Solr IndexDeletionPolicy implementation supports
+         deleting index commit points on number of commits, age of
+         commit point and optimized status.
+
+         The latest commit point should always be preserved regardless
+         of the criteria.
+    -->
+    <!--
+    <deletionPolicy class="solr.SolrDeletionPolicy">
+    -->
+    <!-- The number of commit points to be kept -->
+    <!-- <str name="maxCommitsToKeep">1</str> -->
+    <!-- The number of optimized commit points to be kept -->
+    <!-- <str name="maxOptimizedCommitsToKeep">0</str> -->
+    <!--
+        Delete all commit points once they have reached the given age.
+        Supports DateMathParser syntax e.g.
+      -->
+    <!--
+       <str name="maxCommitAge">30MINUTES</str>
+       <str name="maxCommitAge">1DAY</str>
+    -->
+    <!--
+    </deletionPolicy>
+    -->
+
+    <!-- Lucene Infostream
+
+         To aid in advanced debugging, Lucene provides an "InfoStream"
+         of detailed information when indexing.
+
+         Setting The value to true will instruct the underlying Lucene
+         IndexWriter to write its debugging info the specified file
+      -->
+    <!-- <infoStream file="INFOSTREAM.txt">false</infoStream> -->
+  </indexConfig>
+
+  <!-- The default high-performance update handler -->
+  <updateHandler class="solr.DirectUpdateHandler2">
+
+    <!-- Enables a transaction log, used for real-time get, durability, and
+         and solr cloud replica recovery.  The log can grow as big as
+         uncommitted changes to the index, so use of a hard autoCommit
+         is recommended (see below).
+         "dir" - the target directory for transaction logs, defaults to the
+                solr data directory.
+    -->
+    <updateLog>
+      <str name="dir">${solr.ulog.dir:}</str>
+    </updateLog>
+
+    <!-- AutoCommit
+
+         Perform a hard commit automatically under certain conditions.
+         Instead of enabling autoCommit, consider using "commitWithin"
+         when adding documents.
+
+         https://solr.apache.org/guide/solr/latest/indexing-guide/indexing-with-update-handlers.html
+
+         maxDocs - Maximum number of documents to add since the last
+                   commit before automatically triggering a new commit.
+
+         maxTime - Maximum amount of time in ms that is allowed to pass
+                   since a document was added before automatically
+                   triggering a new commit.
+         openSearcher - if false, the commit causes recent index changes
+           to be flushed to stable storage, but does not cause a new
+           searcher to be opened to make those changes visible.
+
+         If the updateLog is enabled, then it's highly recommended to
+         have some sort of hard autoCommit to limit the log size.
+      -->
+    <autoCommit>
+      <maxTime>${solr.autoCommit.maxTime:300000}</maxTime>
+      <openSearcher>false</openSearcher>
+    </autoCommit>
+
+    <!-- softAutoCommit is like autoCommit except it causes a
+         'soft' commit which only ensures that changes are visible
+         but does not ensure that data is synced to disk.  This is
+         faster and more near-realtime friendly than a hard commit.
+      -->
+
+    <autoSoftCommit>
+      <maxTime>${solr.autoSoftCommit.maxTime:1000}</maxTime>
+    </autoSoftCommit>
+
+    <!-- Update Related Event Listeners
+
+         Various IndexWriter related events can trigger Listeners to
+         take actions.
+
+         postCommit - fired after every commit or optimize command
+         postOptimize - fired after every optimize command
+      -->
+
+  </updateHandler>
+
+  <!-- IndexReaderFactory
+
+       Use the following format to specify a custom IndexReaderFactory,
+       which allows for alternate IndexReader implementations.
+
+       ** Experimental Feature **
+
+       Please note - Using a custom IndexReaderFactory may prevent
+       certain other features from working. The API to
+       IndexReaderFactory may change without warning or may even be
+       removed from future releases if the problems cannot be
+       resolved.
+
+
+       ** Features that may not work with custom IndexReaderFactory **
+
+       The ReplicationHandler assumes a disk-resident index. Using a
+       custom IndexReader implementation may cause incompatibility
+       with ReplicationHandler and may cause replication to not work
+       correctly. See SOLR-1366 for details.
+
+    -->
+  <!--
+  <indexReaderFactory name="IndexReaderFactory" class="package.class">
+    <str name="someArg">Some Value</str>
+  </indexReaderFactory >
+  -->
+
+  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       Query section - these settings control query time things like caches
+       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+  <query>
+
+    <!-- Maximum number of clauses allowed when parsing a boolean query string.
+
+         This limit only impacts boolean queries specified by a user as part of a query string,
+         and provides per-collection controls on how complex user specified boolean queries can
+         be.  Query strings that specify more clauses than this will result in an error.
+
+         If this per-collection limit is greater than the global `maxBooleanClauses` limit
+         specified in `solr.xml`, it will have no effect, as that setting also limits the size
+         of user specified boolean queries.
+      -->
+    <maxBooleanClauses>${solr.max.booleanClauses:1024}</maxBooleanClauses>
+
+    <!-- Minimum acceptable prefix-size for prefix-based queries.
+
+         Prefix-based queries consume memory in proportion to the number of terms in the index
+         that start with that prefix.  Short prefixes tend to match many many more indexed-terms
+         and consume more memory as a result, sometimes causing stability issues on the node.
+
+         This setting allows administrators to require that prefixes meet or exceed a specified
+         minimum length requirement.  Prefix queries that don't meet this requirement return an
+         error to users.  The limit may be overridden on a per-query basis by specifying a
+         'minPrefixQueryTermLength' local-param value.
+
+         The flag value of '-1' can be used to disable enforcement of this limit.
+    -->
+    <minPrefixQueryTermLength>${solr.query.minPrefixLength:-1}</minPrefixQueryTermLength>
+
+    <!-- Solr Internal Query Caches
+         Starting with Solr 9.0 the default cache implementation used is CaffeineCache.
+    -->
+
+    <!-- Filter Cache
+
+         Cache used by SolrIndexSearcher for filters (DocSets),
+         unordered sets of *all* documents that match a query.  When a
+         new searcher is opened, its caches may be prepopulated or
+         "autowarmed" using data from caches in the old searcher.
+         autowarmCount is the number of items to prepopulate. For
+         CaffeineCache, the autowarmed items will be the most recently
+         accessed items.
+
+         Parameters:
+           class - the SolrCache implementation (CaffeineCache by default)
+           size - the maximum number of entries in the cache
+           initialSize - the initial capacity (number of entries) of
+               the cache.  (see java.util.HashMap)
+           autowarmCount - the number of entries to prepopulate from
+               an old cache.
+           maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
+                      to occupy. Note that when this option is specified, the size
+                      and initialSize parameters are ignored.
+      -->
+    <filterCache size="512"
+                 initialSize="512"
+                 autowarmCount="0"/>
+
+    <!-- Query Result Cache
+
+         Caches results of searches - ordered lists of document ids
+         (DocList) based on a query, a sort, and the range of documents requested.
+         Additional supported parameter by CaffeineCache:
+            maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
+                       to occupy
+      -->
+    <queryResultCache size="512"
+                      initialSize="512"
+                      autowarmCount="0"/>
+
+    <!-- Document Cache
+
+         Caches Lucene Document objects (the stored fields for each
+         document).  Since Lucene internal document ids are transient,
+         this cache will not be autowarmed.
+      -->
+    <documentCache size="512"
+                   initialSize="512"
+                   autowarmCount="0"/>
+
+    <!-- custom cache currently used by block join -->
+    <cache name="perSegFilter"
+           class="solr.CaffeineCache"
+           size="10"
+           initialSize="0"
+           autowarmCount="10"
+           regenerator="solr.NoOpRegenerator" />
+
+    <!-- Field Value Cache
+
+         Cache used to hold field values that are quickly accessible
+         by document id.  The fieldValueCache is created by default
+         even if not configured here.
+      -->
+    <!--
+       <fieldValueCache size="512"
+                        autowarmCount="128"
+                        />
+      -->
+
+    <!-- Custom Cache
+
+         Example of a generic cache.  These caches may be accessed by
+         name through SolrIndexSearcher.getCache(),cacheLookup(), and
+         cacheInsert().  The purpose is to enable easy caching of
+         user/application level data.  The regenerator argument should
+         be specified as an implementation of solr.CacheRegenerator
+         if autowarming is desired.
+      -->
+    <!--
+       <cache name="myUserCache"
+              class="solr.CaffeineCache"
+              size="4096"
+              initialSize="1024"
+              autowarmCount="1024"
+              regenerator="com.mycompany.MyRegenerator"
+              />
+      -->
+
+
+    <!-- Lazy Field Loading
+
+         If true, stored fields that are not requested will be loaded
+         lazily.  This can result in a significant speed improvement
+         if the usual case is to not load all stored fields,
+         especially if the skipped fields are large compressed text
+         fields.
+    -->
+    <enableLazyFieldLoading>true</enableLazyFieldLoading>
+
+    <!-- Use Filter For Sorted Query
+
+         A possible optimization that attempts to use a filter to
+         satisfy a search.  If the requested sort does not include
+         score, then the filterCache will be checked for a filter
+         matching the query. If found, the filter will be used as the
+         source of document ids, and then the sort will be applied to
+         that.
+
+         For most situations, this will not be useful unless you
+         frequently get the same search repeatedly with different sort
+         options, and none of them ever use "score"
+      -->
+    <!--
+       <useFilterForSortedQuery>true</useFilterForSortedQuery>
+      -->
+
+    <!-- Result Window Size
+
+         An optimization for use with the queryResultCache.  When a search
+         is requested, a superset of the requested number of document ids
+         are collected.  For example, if a search for a particular query
+         requests matching documents 10 through 19, and queryWindowSize is 50,
+         then documents 0 through 49 will be collected and cached.  Any further
+         requests in that range can be satisfied via the cache.
+      -->
+    <queryResultWindowSize>20</queryResultWindowSize>
+
+    <!-- Maximum number of documents to cache for any entry in the
+         queryResultCache.
+      -->
+    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
+
+    <!-- Query Related Event Listeners
+
+         Various IndexSearcher related events can trigger Listeners to
+         take actions.
+
+         newSearcher - fired whenever a new searcher is being prepared
+         and there is a current searcher handling requests (aka
+         registered).  It can be used to prime certain caches to
+         prevent long request times for certain requests.
+
+         firstSearcher - fired whenever a new searcher is being
+         prepared but there is no current registered searcher to handle
+         requests or to gain autowarming data from.
+
+
+      -->
+    <!-- QuerySenderListener takes an array of NamedList and executes a
+         local query request for each NamedList in sequence.
+      -->
+    <listener event="newSearcher" class="solr.QuerySenderListener">
+      <arr name="queries">
+        <!--
+           <lst><str name="q">solr</str><str name="sort">price asc</str></lst>
+           <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst>
+          -->
+      </arr>
+    </listener>
+    <listener event="firstSearcher" class="solr.QuerySenderListener">
+      <arr name="queries">
+        <!--
+        <lst>
+          <str name="q">static firstSearcher warming in solrconfig.xml</str>
+        </lst>
+        -->
+      </arr>
+    </listener>
+
+    <!-- Use Cold Searcher
+
+         If a search request comes in and there is no current
+         registered searcher, then immediately register the still
+         warming searcher and use it.  If "false" then all requests
+         will block until the first searcher is done warming.
+      -->
+    <useColdSearcher>false</useColdSearcher>
+
+  </query>
+
+  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+     Circuit Breaker Section - This section consists of configurations for
+     circuit breakers
+     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+  <!-- Circuit breakers are designed to allow stability and predictable query
+     execution. They prevent operations that can take down the node and cause
+     noisy neighbour issues.
+
+     The CircuitBreakerManager is the default manager for all circuit breakers.
+     The enabled flag here controls the activation/deactivation of all circuit
+     breakers specified within.
+  -->
+  <circuitBreaker class="solr.CircuitBreakerManager" enabled="true">
+    <!-- Memory Circuit Breaker
+
+     Specific configuration for max JVM heap usage circuit breaker. This configuration defines
+     whether the circuit breaker is enabled and the threshold percentage of maximum heap allocated
+     beyond which queries will be rejected until the current JVM usage goes below the threshold.
+     The valid value for this range is 50-95.
+
+     Consider a scenario where the max heap allocated is 4 GB and memThreshold is defined as 75.
+     Threshold JVM usage will be 4 * 0.75 = 3 GB. Its generally a good idea to keep this value
+     between 75 - 80% of maximum heap allocated.
+
+     If, at any point, the current JVM heap usage goes above 3 GB, queries will be rejected until
+     the heap usage goes below 3 GB again. If you see queries getting rejected with 503 error code,
+     check for "Circuit Breakers tripped" in logs and the corresponding error message should tell
+     you what transpired (if the failure was caused by tripped circuit breakers).
+    -->
+    
+    <!--
+    <str name="memEnabled">true</str>
+    <str name="memThreshold">75</str>
+    -->
+
+    <!-- CPU Circuit Breaker Configuration
+
+     Specific configuration for CPU utilization based circuit breaker. This configuration defines
+     whether the circuit breaker is enabled and the average load over the last minute at which the
+     circuit breaker should start rejecting queries.
+    -->
+    
+    <!--
+    <str name="cpuEnabled">true</str>
+    <str name="cpuThreshold">75</str>
+    -->
+
+  </circuitBreaker>
+
+  <!-- Request Dispatcher
+
+       This section contains instructions for how the SolrDispatchFilter
+       should behave when processing requests for this SolrCore.
+
+    -->
+  <requestDispatcher>
+    <!-- Request Parsing
+
+         These settings indicate how Solr Requests may be parsed, and
+         what restrictions may be placed on the ContentStreams from
+         those requests
+
+         multipartUploadLimitInKB - specifies the max size (in KiB) of
+         Multipart File Uploads that Solr will allow in a Request.
+
+         formdataUploadLimitInKB - specifies the max size (in KiB) of
+         form data (application/x-www-form-urlencoded) sent via
+         POST. You can use POST to pass request parameters not
+         fitting into the URL.
+
+         addHttpRequestToContext - if set to true, it will instruct
+         the requestParsers to include the original HttpServletRequest
+         object in the context map of the SolrQueryRequest under the
+         key "httpRequest". It will not be used by any of the existing
+         Solr components, but may be useful when developing custom
+         plugins.
+
+    <requestParsers multipartUploadLimitInKB="-1"
+                    formdataUploadLimitInKB="-1"
+                    addHttpRequestToContext="false"/>
+      -->
+
+    <!-- HTTP Caching
+
+         Set HTTP caching related parameters (for proxy caches and clients).
+
+         The options below instruct Solr not to output any HTTP Caching
+         related headers
+      -->
+    <httpCaching never304="true" />
+    <!-- If you include a <cacheControl> directive, it will be used to
+         generate a Cache-Control header (as well as an Expires header
+         if the value contains "max-age=")
+
+         By default, no Cache-Control header is generated.
+
+         You can use the <cacheControl> option even if you have set
+         never304="true"
+      -->
+    <!--
+       <httpCaching never304="true" >
+         <cacheControl>max-age=30, public</cacheControl>
+       </httpCaching>
+      -->
+    <!-- To enable Solr to respond with automatically generated HTTP
+         Caching headers, and to response to Cache Validation requests
+         correctly, set the value of never304="false"
+
+         This will cause Solr to generate Last-Modified and ETag
+         headers based on the properties of the Index.
+
+         The following options can also be specified to affect the
+         values of these headers...
+
+         lastModFrom - the default value is "openTime" which means the
+         Last-Modified value (and validation against If-Modified-Since
+         requests) will all be relative to when the current Searcher
+         was opened.  You can change it to lastModFrom="dirLastMod" if
+         you want the value to exactly correspond to when the physical
+         index was last modified.
+
+         etagSeed="..." is an option you can change to force the ETag
+         header (and validation against If-None-Match requests) to be
+         different even if the index has not changed (ie: when making
+         significant changes to your config file)
+
+         (lastModifiedFrom and etagSeed are both ignored if you use
+         the never304="true" option)
+      -->
+    <!--
+       <httpCaching lastModifiedFrom="openTime"
+                    etagSeed="Solr">
+         <cacheControl>max-age=30, public</cacheControl>
+       </httpCaching>
+      -->
+  </requestDispatcher>
+
+  <!-- Request Handlers
+
+       https://solr.apache.org/guide/solr/latest/configuration-guide/requesthandlers-searchcomponents.html
+
+       Incoming queries will be dispatched to a specific handler by name based on the path specified in the request.
+
+       All handlers (Search Handlers, Update Request Handlers, and other specialized types) can have default parameters (defaults, appends and invariants).
+
+       Search Handlers can also (append, prepend or even replace) default or defined Search Components.
+
+       Update Request Handlers can leverage Update Request Processors to pre-process documents after they are loaded
+       and before they are indexed/stored.
+
+       Not all Request Handlers are defined in the solrconfig.xml, many are implicit.
+    -->
+
+  <!-- Primary search handler, expected by most clients, examples and UI frameworks -->
+  <requestHandler name="/select" class="solr.SearchHandler">
+    <lst name="defaults">
+      <str name="echoParams">explicit</str>
+      <int name="rows">10</int>
+      <!--
+        This boosting configuration has been
+        - first introduced in 2015, see https://github.com/IQSS/dataverse/issues/1928#issuecomment-91651853,
+        - been re-introduced in 2018 for Solr 7.2.1 update, see https://github.com/IQSS/dataverse/issues/4158,
+        - and finally evolved to the current state later in 2018 https://github.com/IQSS/dataverse/issues/4938
+          (merged with https://github.com/IQSS/dataverse/commit/3843e5366845d55c327cdb252dd9b4e4125b9b88)
+                
+        Since then, this has not been touched again (2021-12-21).
+      -->
+      <str name="defType">edismax</str>
+      <float name="tie">0.075</float>
+      <str name="qf">
+          dvName^400
+          authorName^180
+          dvSubject^190
+          dvDescription^180
+          dvAffiliation^170
+          title^130
+          subject^120
+          keyword^110
+          topicClassValue^100
+          dsDescriptionValue^90
+          authorAffiliation^80
+          publicationCitation^60
+          producerName^50
+          fileName^30
+          fileDescription^30
+          variableLabel^20
+          variableName^10
+          _text_^1.0
+      </str>
+      <str name="pf">
+          dvName^200
+          authorName^100
+          dvSubject^100
+          dvDescription^100
+          dvAffiliation^100
+          title^75
+          subject^75
+          keyword^75
+          topicClassValue^75
+          dsDescriptionValue^75
+          authorAffiliation^75
+          publicationCitation^75
+          producerName^75
+      </str>
+      <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
+      <str name="bq">
+          isHarvested:false^25000
+      </str>
+    </lst>
+  </requestHandler>
+
+  <!-- A request handler that returns indented JSON by default -->
+  <requestHandler name="/query" class="solr.SearchHandler">
+    <lst name="defaults">
+      <str name="echoParams">explicit</str>
+      <str name="wt">json</str>
+      <str name="indent">true</str>
+    </lst>
+  </requestHandler>
+
+  <!-- Shared parameters for multiple Request Handlers -->
+  <initParams path="/update/**,/query,/select,/spell">
+    <lst name="defaults">
+      <str name="df">_text_</str>
+    </lst>
+  </initParams>
+
+  <!-- Spell Check
+
+       The spell check component can return a list of alternative spelling
+       suggestions.
+
+       https://solr.apache.org/guide/solr/latest/query-guide/spell-checking.html
+    -->
+  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
+
+    <str name="queryAnalyzerFieldType">text_general</str>
+
+    <!-- Multiple "Spell Checkers" can be declared and used by this
+         component
+      -->
+
+    <!-- a spellchecker built from a field of the main index -->
+    <lst name="spellchecker">
+      <str name="name">default</str>
+      <str name="field">_text_</str>
+      <str name="classname">solr.DirectSolrSpellChecker</str>
+      <!-- the spellcheck distance measure used, the default is the internal levenshtein -->
+      <str name="distanceMeasure">internal</str>
+      <!-- minimum accuracy needed to be considered a valid spellcheck suggestion -->
+      <float name="accuracy">0.5</float>
+      <!-- the maximum #edits we consider when enumerating terms: can be 1 or 2 -->
+      <int name="maxEdits">2</int>
+      <!-- the minimum shared prefix when enumerating terms -->
+      <int name="minPrefix">1</int>
+      <!-- maximum number of inspections per result. -->
+      <int name="maxInspections">5</int>
+      <!-- minimum length of a query term to be considered for correction -->
+      <int name="minQueryLength">4</int>
+      <!-- maximum threshold of documents a query term can appear to be considered for correction -->
+      <float name="maxQueryFrequency">0.01</float>
+      <!-- uncomment this to require suggestions to occur in 1% of the documents
+        <float name="thresholdTokenFrequency">.01</float>
+      -->
+    </lst>
+
+    <!-- a spellchecker that can break or combine words.  See "/spell" handler below for usage -->
+    <!--
+    <lst name="spellchecker">
+      <str name="name">wordbreak</str>
+      <str name="classname">solr.WordBreakSolrSpellChecker</str>
+      <str name="field">name</str>
+      <str name="combineWords">true</str>
+      <str name="breakWords">true</str>
+      <int name="maxChanges">10</int>
+    </lst>
+    -->
+  </searchComponent>
+
+  <!-- A request handler for demonstrating the spellcheck component.
+
+       NOTE: This is purely as an example.  The whole purpose of the
+       SpellCheckComponent is to hook it into the request handler that
+       handles your normal user queries so that a separate request is
+       not needed to get suggestions.
+
+       IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
+       NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
+
+       See https://solr.apache.org/guide/solr/latest/query-guide/spell-checking.html for details
+       on the request parameters.
+    -->
+  <!--
+  <requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
+    <lst name="defaults">
+    -->
+      <!-- Solr will use suggestions from both the 'default' spellchecker
+           and from the 'wordbreak' spellchecker and combine them.
+           collations (re-written queries) can include a combination of
+           corrections from both spellcheckers -->
+  <!--
+      <str name="spellcheck.dictionary">default</str>
+      <str name="spellcheck">on</str>
+      <str name="spellcheck.extendedResults">true</str>
+      <str name="spellcheck.count">10</str>
+      <str name="spellcheck.alternativeTermCount">5</str>
+      <str name="spellcheck.maxResultsForSuggest">5</str>
+      <str name="spellcheck.collate">true</str>
+      <str name="spellcheck.collateExtendedResults">true</str>
+      <str name="spellcheck.maxCollationTries">10</str>
+      <str name="spellcheck.maxCollations">5</str>
+    </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+  </requestHandler>
+  -->
+
+  <!-- Highlighting Component
+
+       https://solr.apache.org/guide/solr/latest/query-guide/highlighting.html
+    -->
+  <searchComponent class="solr.HighlightComponent" name="highlight">
+    <!-- note: the hl.method=unified highlighter is not configured here; it's completely configured
+    via parameters.  The below configuration supports hl.method=original and fastVector. -->
+    <highlighting>
+      <!-- Configure the standard fragmenter -->
+      <!-- This could most likely be commented out in the "default" case -->
+      <fragmenter name="gap"
+                  default="true"
+                  class="solr.highlight.GapFragmenter">
+        <lst name="defaults">
+          <int name="hl.fragsize">100</int>
+        </lst>
+      </fragmenter>
+
+      <!-- A regular-expression-based fragmenter
+           (for sentence extraction)
+        -->
+      <fragmenter name="regex"
+                  class="solr.highlight.RegexFragmenter">
+        <lst name="defaults">
+          <!-- slightly smaller fragsizes work better because of slop -->
+          <int name="hl.fragsize">70</int>
+          <!-- allow 50% slop on fragment sizes -->
+          <float name="hl.regex.slop">0.5</float>
+          <!-- a basic sentence pattern -->
+          <str name="hl.regex.pattern">[-\w ,/\n\&quot;&apos;]{20,200}</str>
+        </lst>
+      </fragmenter>
+
+      <!-- Configure the standard formatter -->
+      <formatter name="html"
+                 default="true"
+                 class="solr.highlight.HtmlFormatter">
+        <lst name="defaults">
+          <str name="hl.simple.pre"><![CDATA[<em>]]></str>
+          <str name="hl.simple.post"><![CDATA[</em>]]></str>
+        </lst>
+      </formatter>
+
+      <!-- Configure the standard encoder -->
+      <encoder name="html"
+               class="solr.highlight.HtmlEncoder" />
+
+      <!-- Configure the standard fragListBuilder -->
+      <fragListBuilder name="simple"
+                       class="solr.highlight.SimpleFragListBuilder"/>
+
+      <!-- Configure the single fragListBuilder -->
+      <fragListBuilder name="single"
+                       class="solr.highlight.SingleFragListBuilder"/>
+
+      <!-- Configure the weighted fragListBuilder -->
+      <fragListBuilder name="weighted"
+                       default="true"
+                       class="solr.highlight.WeightedFragListBuilder"/>
+
+      <!-- default tag FragmentsBuilder -->
+      <fragmentsBuilder name="default"
+                        default="true"
+                        class="solr.highlight.ScoreOrderFragmentsBuilder">
+        <!--
+        <lst name="defaults">
+          <str name="hl.multiValuedSeparatorChar">/</str>
+        </lst>
+        -->
+      </fragmentsBuilder>
+
+      <!-- multi-colored tag FragmentsBuilder -->
+      <fragmentsBuilder name="colored"
+                        class="solr.highlight.ScoreOrderFragmentsBuilder">
+        <lst name="defaults">
+          <str name="hl.tag.pre"><![CDATA[
+               <b style="background:yellow">,<b style="background:lawgreen">,
+               <b style="background:aquamarine">,<b style="background:magenta">,
+               <b style="background:palegreen">,<b style="background:coral">,
+               <b style="background:wheat">,<b style="background:khaki">,
+               <b style="background:lime">,<b style="background:deepskyblue">]]></str>
+          <str name="hl.tag.post"><![CDATA[</b>]]></str>
+        </lst>
+      </fragmentsBuilder>
+
+      <boundaryScanner name="default"
+                       default="true"
+                       class="solr.highlight.SimpleBoundaryScanner">
+        <lst name="defaults">
+          <str name="hl.bs.maxScan">10</str>
+          <str name="hl.bs.chars">.,!? &#9;&#10;&#13;</str>
+        </lst>
+      </boundaryScanner>
+
+      <boundaryScanner name="breakIterator"
+                       class="solr.highlight.BreakIteratorBoundaryScanner">
+        <lst name="defaults">
+          <!-- type should be one of CHARACTER, WORD(default), LINE and SENTENCE -->
+          <str name="hl.bs.type">WORD</str>
+          <!-- language and country are used when constructing Locale object.  -->
+          <!-- And the Locale object will be used when getting instance of BreakIterator -->
+          <str name="hl.bs.language">en</str>
+          <str name="hl.bs.country">US</str>
+        </lst>
+      </boundaryScanner>
+    </highlighting>
+  </searchComponent>
+
+  <!-- Update Request Processors
+       https://solr.apache.org/guide/solr/latest/configuration-guide/update-request-processors.html
+
+       Chains or individual Update Request Processor Factories can be declared and referenced
+       to preprocess documents sent to Update Request Handlers.
+    -->
+
+  <!-- Add unknown fields to the schema
+
+       Field type guessing update request processors that will
+       attempt to parse string-typed field values as Booleans, Longs,
+       Doubles, or Dates, and then add schema fields with the guessed
+       field types Text content will be indexed as "text_general" as
+       well as a copy to a plain string version in *_str.
+       See the updateRequestProcessorChain defined later for the order they are executed in.
+
+       These require that the schema is both managed and mutable, by
+       declaring schemaFactory as ManagedIndexSchemaFactory, with
+       mutable specified as true.
+
+       See https://solr.apache.org/guide/solr/latest/indexing-guide/schemaless-mode.html for further explanation.
+
+    -->
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+  <updateProcessor class="solr.UUIDUpdateProcessorFactory" name="uuid"/>
+  <updateProcessor class="solr.RemoveBlankFieldUpdateProcessorFactory" name="remove-blank"/>
+  <updateProcessor class="solr.FieldNameMutatingUpdateProcessorFactory" name="field-name-mutating">
+    <str name="pattern">[^\w-\.]</str>
+    <str name="replacement">_</str>
+  </updateProcessor>
+  <updateProcessor class="solr.NumFieldLimitingUpdateRequestProcessorFactory" name="max-fields">
+    <int name="maxFields">1000</int>
+    <bool name="warnOnly">true</bool>
+  </updateProcessor>
+  <updateProcessor class="solr.ParseBooleanFieldUpdateProcessorFactory" name="parse-boolean"/>
+  <updateProcessor class="solr.ParseLongFieldUpdateProcessorFactory" name="parse-long"/>
+  <updateProcessor class="solr.ParseDoubleFieldUpdateProcessorFactory" name="parse-double"/>
+  <updateProcessor class="solr.ParseDateFieldUpdateProcessorFactory" name="parse-date">
+    <arr name="format">
+      <str>yyyy-MM-dd['T'[HH:mm[:ss[.SSS]][z</str>
+      <str>yyyy-MM-dd['T'[HH:mm[:ss[,SSS]][z</str>
+      <str>yyyy-MM-dd HH:mm[:ss[.SSS]][z</str>
+      <str>yyyy-MM-dd HH:mm[:ss[,SSS]][z</str>
+      <str>[EEE, ]dd MMM yyyy HH:mm[:ss] z</str>
+      <str>EEEE, dd-MMM-yy HH:mm:ss z</str>
+      <str>EEE MMM ppd HH:mm:ss [z ]yyyy</str>
+    </arr>
+  </updateProcessor>
+  <updateProcessor class="solr.AddSchemaFieldsUpdateProcessorFactory" name="add-schema-fields">
+    <lst name="typeMapping">
+      <str name="valueClass">java.lang.String</str>
+      <str name="fieldType">text_general</str>
+      <lst name="copyField">
+        <str name="dest">*_str</str>
+        <int name="maxChars">256</int>
+      </lst>
+      <!-- Use as default mapping instead of defaultFieldType -->
+      <bool name="default">true</bool>
+    </lst>
+    <lst name="typeMapping">
+      <str name="valueClass">java.lang.Boolean</str>
+      <str name="fieldType">booleans</str>
+    </lst>
+    <lst name="typeMapping">
+      <str name="valueClass">java.util.Date</str>
+      <str name="fieldType">pdates</str>
+    </lst>
+    <lst name="typeMapping">
+      <str name="valueClass">java.lang.Long</str>
+      <str name="valueClass">java.lang.Integer</str>
+      <str name="fieldType">plongs</str>
+    </lst>
+    <lst name="typeMapping">
+      <str name="valueClass">java.lang.Number</str>
+      <str name="fieldType">pdoubles</str>
+    </lst>
+  </updateProcessor>
+
+  <!-- The update.autoCreateFields property can be turned to false to disable schemaless mode -->
+  <updateRequestProcessorChain name="add-unknown-fields-to-the-schema" default="${update.autoCreateFields:false}"
+           processor="uuid,remove-blank,field-name-mutating,max-fields,parse-boolean,parse-long,parse-double,parse-date,add-schema-fields">
+    <processor class="solr.LogUpdateProcessorFactory"/>
+    <processor class="solr.DistributedUpdateProcessorFactory"/>
+    <processor class="solr.RunUpdateProcessorFactory"/>
+  </updateRequestProcessorChain>
+
+  <!-- Deduplication
+
+       An example dedup update request processor chain that creates the "id" field
+       on the fly based on the hash code of some other fields.  This
+       example has overwriteDupes set to false since we are using the
+       id field as the signatureField and Solr will maintain
+       uniqueness based on that anyway.
+
+    -->
+  <!--
+     <updateRequestProcessorChain name="dedupe">
+       <processor class="solr.processor.SignatureUpdateProcessorFactory">
+         <bool name="enabled">true</bool>
+         <str name="signatureField">id</str>
+         <str name="fields">name,features,cat</str>
+         <str name="signatureClass">solr.processor.Lookup3Signature</str>
+       </processor>
+       <processor class="solr.LogUpdateProcessorFactory" />
+       <processor class="solr.RunUpdateProcessorFactory" />
+     </updateRequestProcessorChain>
+    -->
+
+  <!-- Response Writers
+
+       https://solr.apache.org/guide/solr/latest/query-guide/response-writers.html
+
+       Request responses will be written using the writer specified by
+       the 'wt' request parameter matching the name of a registered
+       writer.
+
+       The "default" writer is the default and will be used if 'wt' is
+       not specified in the request.
+    -->
+  <!-- The following response writers are implicitly configured unless
+       overridden...
+    -->
+  <!--
+     <queryResponseWriter name="xml"
+                          default="true"
+                          class="solr.XMLResponseWriter" />
+     <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+     <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+     <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
+     <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
+     <queryResponseWriter name="phps" class="solr.PHPSerializedResponseWriter"/>
+     <queryResponseWriter name="csv" class="solr.CSVResponseWriter"/>
+     <queryResponseWriter name="schema.xml" class="solr.SchemaXmlResponseWriter"/>
+    -->
+
+  <!-- Overriding the content-type of the response writer.
+       For example, Default content-type of JSON is application/json. This can be overridden to
+       text/plain so that response is easy to read in *any* browser.
+   -->
+  <!--
+     <queryResponseWriter name="json" class="solr.JSONResponseWriter">
+        <str name="content-type">text/plain; charset=UTF-8</str>
+      </queryResponseWriter>
+   -->
+
+  <!-- Query Parsers
+
+       https://solr.apache.org/guide/solr/latest/query-guide/query-syntax-and-parsers.html
+
+       Multiple QParserPlugins can be registered by name, and then
+       used in either the "defType" param for the QueryComponent (used
+       by SearchHandler) or in LocalParams
+    -->
+  <!-- example of registering a query parser -->
+  <!--
+     <queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
+    -->
+
+  <!-- Function Parsers
+
+       https://solr.apache.org/guide/solr/latest/query-guide/function-queries.html
+
+       Multiple ValueSourceParsers can be registered by name, and then
+       used as function names when using the "func" QParser.
+    -->
+  <!-- example of registering a custom function parser  -->
+  <!--
+     <valueSourceParser name="myfunc"
+                        class="com.mycompany.MyValueSourceParser" />
+    -->
+
+
+  <!-- Document Transformers
+       https://solr.apache.org/guide/solr/latest/query-guide/document-transformers.html
+    -->
+  <!--
+     Could be something like:
+     <transformer name="db" class="com.mycompany.LoadFromDatabaseTransformer" >
+       <int name="connection">jdbc://....</int>
+     </transformer>
+
+     To add a constant value to all docs, use:
+     <transformer name="mytrans2" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
+       <int name="value">5</int>
+     </transformer>
+
+     If you want the user to still be able to change it with _value:something_ use this:
+     <transformer name="mytrans3" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
+       <double name="defaultValue">5</double>
+     </transformer>
+
+      If you are using the QueryElevationComponent, you may wish to mark documents that get boosted.  The
+      EditorialMarkerFactory will do exactly that:
+     <transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
+    -->
+</config>
diff --git a/conf/solr/update-fields.sh b/conf/solr/update-fields.sh
new file mode 100755
index 00000000000..5dbe062026e
--- /dev/null
+++ b/conf/solr/update-fields.sh
@@ -0,0 +1,220 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# [INFO]: Update a prepared Solr schema.xml for Dataverse with a given list of metadata fields
+
+#### #### #### #### #### #### #### #### #### #### #### #### #### #### #### #### #### ####
+# This script will
+# 1. take a file (or read it from STDIN) with all <field> and <copyField> definitions
+# 2. and replace the sections between the include guards with those in a given
+#    schema.xml file
+# The script validates the presence, uniqueness and order of the include guards.
+#### #### #### #### #### #### #### #### #### #### #### #### #### #### #### #### #### ####
+
+
+### Variables
+# Internal use only (fork to change)
+VERSION="0.1"
+INPUT=""
+FIELDS=""
+COPY_FIELDS=""
+TRIGGER_CHAIN=0
+ED_DELETE_FIELDS="'a+,'b-d"
+ED_DELETE_COPYFIELDS="'a+,'b-d"
+
+SOLR_SCHEMA_FIELD_BEGIN_MARK="SCHEMA-FIELDS::BEGIN"
+SOLR_SCHEMA_FIELD_END_MARK="SCHEMA-FIELDS::END"
+SOLR_SCHEMA_COPYFIELD_BEGIN_MARK="SCHEMA-COPY-FIELDS::BEGIN"
+SOLR_SCHEMA_COPYFIELD_END_MARK="SCHEMA-COPY-FIELDS::END"
+MARKS_ORDERED="${SOLR_SCHEMA_FIELD_BEGIN_MARK} ${SOLR_SCHEMA_FIELD_END_MARK} ${SOLR_SCHEMA_COPYFIELD_BEGIN_MARK} ${SOLR_SCHEMA_COPYFIELD_END_MARK}"
+
+### Common functions
+function error {
+    echo "ERROR:" "$@" >&2
+    exit 2
+}
+
+function exists {
+  type "$1" >/dev/null 2>&1 && return 0
+  ( IFS=:; for p in $PATH; do [ -x "${p%/}/$1" ] && return 0; done; return 1 )
+}
+
+function usage {
+    cat << EOF
+$(basename "$0") ${VERSION}
+Usage: $(basename "$0") [-hp] [ schema file ] [ source file ]
+
+-h  Print usage (this text)
+-p  Chained printing: write all metadata schema related <field>
+    and <copyField> present in Solr XML to stdout
+
+Provide target Solr Schema XML via argument or \$SCHEMA env var.
+
+Provide source file via argument, \$SOURCE env var or piped input
+(wget/curl, chained). Source file = "-" means read STDIN.
+EOF
+    exit 0
+}
+
+### Options
+while getopts ":hp" opt; do
+  case $opt in
+    h) usage ;;
+    p) TRIGGER_CHAIN=1 ;;
+   \?) echo "Invalid option: -$OPTARG" >&2; exit 1 ;;
+    :) echo "Option -$OPTARG requires an argument." >&2; exit 1 ;;
+  esac
+done
+
+# Check for ed and bc being present
+exists ed || error "Please ensure ed, bc, sed + awk are installed (ed is missing)"
+exists bc || error "Please ensure ed, bc, sed + awk are installed (bc is missing)"
+exists awk || error "Please ensure ed, bc, sed + awk are installed (awk is missing)"
+exists sed || error "Please ensure ed, bc, sed + awk are installed (sed is missing)"
+
+# remove all the parsed options
+shift $((OPTIND-1))
+
+# User overrideable locations
+SCHEMA=${SCHEMA:-${1:-schema.xml}}
+SOURCE=${SOURCE:-${2:-"-"}}
+
+
+### VERIFY SCHEMA FILE EXISTS AND CONTAINS INCLUDE GUARDS ###
+# Check for schema file & writeable
+if [ ! -w "${SCHEMA}" ]; then
+  error "Cannot find or write to a XML schema at ${SCHEMA}"
+else
+  # Check schema file for include guards
+  CHECKS=$(
+    for MARK in ${MARKS_ORDERED}
+    do
+      grep -c "${MARK}" "${SCHEMA}" || error "Missing ${MARK} from ${SCHEMA}"
+    done
+  )
+
+  # Check guards are unique (count occurrences and sum calc via bc)
+  # Note: fancy workaround to re-add closing \n on Linux & MacOS or no calculation
+  [ "$( (echo -n "${CHECKS}" | tr '\n' '+' ; echo ) | bc)" -eq 4 ] || \
+    error "Some include guards are not unique in ${SCHEMA}"
+
+  # Check guards are in order (line number comparison via bc tricks)
+  CHECKS=$(
+    for MARK in ${MARKS_ORDERED}
+    do
+        grep -n "${MARK}" "${SCHEMA}" | cut -f 1 -d ":"
+    done
+  )
+  # Actual comparison of line numbers
+  echo "${CHECKS}" | tr '\n' '<' | awk -F'<' '{ if ($1 < $2 && $2 < $3 && $3 < $4) {exit 0} else {exit 1} }' || \
+    error "Include guards are not in correct order in ${SCHEMA}"
+
+  # Check guards are exclusively in their lines
+  # (no field or copyField on same line)
+  for MARK in ${MARKS_ORDERED}
+  do
+    grep "${MARK}" "${SCHEMA}" | grep -q -v -e '\(<field \|<copyField \)' \
+      || error "Mark ${MARK} is not on an exclusive line"
+  done
+
+  # Check if there are no lines between the field marks (then skip delete in ed)
+  # Note: fancy workaround to re-add closing \n on Linux & MacOS or no calculation
+  DISTANCE_FIELDS_MARKS=$( \
+    (grep -n -e "\(${SOLR_SCHEMA_FIELD_BEGIN_MARK}\|${SOLR_SCHEMA_FIELD_END_MARK}\)" "${SCHEMA}" \
+      | cut -f 1 -d ":" | tr '\n' '<' | sed -e 's#<$#-1#' ; echo) \
+      | bc
+  )
+  if [ "${DISTANCE_FIELDS_MARKS}" -eq 0 ]; then
+    ED_DELETE_FIELDS="#"
+  fi
+  # Check if there are no lines between the copyfield marks (then skip delete in ed)
+  DISTANCE_COPYFIELDS_MARKS=$( \
+    (grep -n -e "\(${SOLR_SCHEMA_COPYFIELD_BEGIN_MARK}\|${SOLR_SCHEMA_COPYFIELD_END_MARK}\)" "${SCHEMA}" \
+      | cut -f 1 -d ":" | tr '\n' '<' | sed -e 's#<$#-1#' ; echo ) \
+      | bc
+  )
+  if [ "${DISTANCE_COPYFIELDS_MARKS}" -eq 0 ]; then
+    ED_DELETE_COPYFIELDS="#"
+  fi
+fi
+
+
+### READ DATA ###
+# Switch to standard input if no file present or "-"
+if [ -z "${SOURCE}" ] || [ "${SOURCE}" = "-" ]; then
+  # But ONLY if stdin for this script has not been attached to a terminal, but a pipe
+  if [ ! -t 0 ]; then
+    SOURCE="/dev/stdin"
+  else
+    error "No data - either provide source file or piped input"
+  fi
+else
+  # Check the given file for readability and non-zero length
+  if [ ! -r "${SOURCE}" ] || [ ! -s "${SOURCE}" ]; then
+    error "Cannot read from or empty file ${SOURCE}"
+  fi
+fi
+# Read relevant parts only, filter nonsense and avoid huge memory usage
+INPUT=$(grep -e "<\(field\|copyField\) .*/>" "${SOURCE}" | sed -e 's#^\s\+##' -e 's#\s\+$##' || true)
+
+
+### DATA HANDLING ###
+# Split input into different types
+if [ -z "${INPUT}" ]; then
+  error "No <field> or <copyField> in input"
+else
+  # Check for <field> definitions (if nomatch, avoid failing pipe)
+  FIELDS=$(mktemp)
+  echo "${INPUT}" | grep -e "<field .*/>" | sed -e 's#^#    #' > "${FIELDS}" || true
+  # If file actually contains output, write to schema
+  if [ -s "${FIELDS}" ]; then
+    # Use an ed script to replace all <field>
+    cat << EOF | grep -v -e "^#" | ed -s "${SCHEMA}"
+H
+# Mark field begin as 'a'
+/${SOLR_SCHEMA_FIELD_BEGIN_MARK}/ka
+# Mark field end as 'b'
+/${SOLR_SCHEMA_FIELD_END_MARK}/kb
+# Delete all between lines a and b
+${ED_DELETE_FIELDS}
+# Read fields file and paste after line a
+'ar ${FIELDS}
+# Write fields to schema
+w
+q
+EOF
+  fi
+  rm "${FIELDS}"
+
+  # Check for <copyField> definitions (if nomatch, avoid failing pipe)
+  COPY_FIELDS=$(mktemp)
+  echo "${INPUT}" | grep -e "<copyField .*/>" | sed -e 's#^#    #' > "${COPY_FIELDS}" || true
+  # If file actually contains output, write to schema
+  if [ -s "${COPY_FIELDS}" ]; then
+      # Use an ed script to replace all <copyField>, filter comments (BSD ed does not support comments)
+      cat << EOF | grep -v -e "^#" | ed -s "${SCHEMA}"
+H
+# Mark copyField begin as 'a'
+/${SOLR_SCHEMA_COPYFIELD_BEGIN_MARK}/ka
+# Mark copyField end as 'b'
+/${SOLR_SCHEMA_COPYFIELD_END_MARK}/kb
+# Delete all between lines a and b
+${ED_DELETE_COPYFIELDS}
+# Read fields file and paste after line a
+'ar ${COPY_FIELDS}
+# Write copyFields to schema
+w
+q
+EOF
+    fi
+    rm "${COPY_FIELDS}"
+fi
+
+
+### CHAINING OUTPUT
+# Scripts following this one might want to use the field definitions now present
+if [ "${TRIGGER_CHAIN}" -eq 1 ]; then
+  grep -A1000 "${SOLR_SCHEMA_FIELD_BEGIN_MARK}" "${SCHEMA}" | grep -B1000 "${SOLR_SCHEMA_FIELD_END_MARK}"
+  grep -A1000 "${SOLR_SCHEMA_COPYFIELD_BEGIN_MARK}" "${SCHEMA}" | grep -B1000 "${SOLR_SCHEMA_COPYFIELD_END_MARK}"
+fi
diff --git a/conf/vagrant/etc/shibboleth/attribute-map.xml b/conf/vagrant/etc/shibboleth/attribute-map.xml
deleted file mode 100644
index f6386b620f5..00000000000
--- a/conf/vagrant/etc/shibboleth/attribute-map.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<Attributes xmlns="urn:mace:shibboleth:2.0:attribute-map" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <!--
-    The mappings are a mix of SAML 1.1 and SAML 2.0 attribute names agreed to within the Shibboleth
-    community. The non-OID URNs are SAML 1.1 names and most of the OIDs are SAML 2.0 names, with a
-    few exceptions for newer attributes where the name is the same for both versions. You will
-    usually want to uncomment or map the names for both SAML versions as a unit.
-    -->
-    
-    <!-- First some useful eduPerson attributes that many sites might use. -->
-    
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName" id="eppn">
-        <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
-    </Attribute>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" id="eppn">
-        <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
-    </Attribute>
-    
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" id="affiliation">
-        <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
-    </Attribute>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" id="affiliation">
-        <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
-    </Attribute>
-    
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation" id="unscoped-affiliation">
-        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
-    </Attribute>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" id="unscoped-affiliation">
-        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
-    </Attribute>
-    
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonEntitlement" id="entitlement"/>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" id="entitlement"/>
-
-    <!-- A persistent id attribute that supports personalized anonymous access. -->
-    
-    <!-- First, the deprecated/incorrect version, decoded as a scoped string: -->
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="targeted-id">
-        <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
-        <!-- <AttributeDecoder xsi:type="NameIDFromScopedAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/> -->
-    </Attribute>
-    
-    <!-- Second, an alternate decoder that will decode the incorrect form into the newer form. -->
-    <!--
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="persistent-id">
-        <AttributeDecoder xsi:type="NameIDFromScopedAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
-    </Attribute>
-    -->
-    
-    <!-- Third, the new version (note the OID-style name): -->
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" id="persistent-id">
-        <AttributeDecoder xsi:type="NameIDAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
-    </Attribute>
-
-    <!-- Fourth, the SAML 2.0 NameID Format: -->
-    <Attribute name="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" id="persistent-id">
-        <AttributeDecoder xsi:type="NameIDAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
-    </Attribute>
-    
-    <!-- Some more eduPerson attributes, uncomment these to use them... -->
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" id="primary-affiliation">
-        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
-    </Attribute>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonNickname" id="nickname"/>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" id="primary-orgunit-dn"/>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" id="orgunit-dn"/>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonOrgDN" id="org-dn"/>
-
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" id="primary-affiliation">
-        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
-    </Attribute>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" id="nickname"/>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" id="primary-orgunit-dn"/>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" id="orgunit-dn"/>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" id="org-dn"/>
-
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" id="assurance"/>
-    
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" id="member"/>
-    
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" id="eduCourseOffering"/>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" id="eduCourseMember"/>
-
-    <!-- Examples of LDAP-based attributes, uncomment to use these... -->
-    <Attribute name="urn:mace:dir:attribute-def:cn" id="cn"/>
-    <Attribute name="urn:mace:dir:attribute-def:sn" id="sn"/>
-    <Attribute name="urn:mace:dir:attribute-def:givenName" id="givenName"/>
-    <Attribute name="urn:mace:dir:attribute-def:displayName" id="displayName"/>
-    <Attribute name="urn:mace:dir:attribute-def:mail" id="mail"/>
-    <Attribute name="urn:mace:dir:attribute-def:telephoneNumber" id="telephoneNumber"/>
-    <Attribute name="urn:mace:dir:attribute-def:title" id="title"/>
-    <Attribute name="urn:mace:dir:attribute-def:initials" id="initials"/>
-    <Attribute name="urn:mace:dir:attribute-def:description" id="description"/>
-    <Attribute name="urn:mace:dir:attribute-def:carLicense" id="carLicense"/>
-    <Attribute name="urn:mace:dir:attribute-def:departmentNumber" id="departmentNumber"/>
-    <Attribute name="urn:mace:dir:attribute-def:employeeNumber" id="employeeNumber"/>
-    <Attribute name="urn:mace:dir:attribute-def:employeeType" id="employeeType"/>
-    <Attribute name="urn:mace:dir:attribute-def:preferredLanguage" id="preferredLanguage"/>
-    <Attribute name="urn:mace:dir:attribute-def:manager" id="manager"/>
-    <Attribute name="urn:mace:dir:attribute-def:seeAlso" id="seeAlso"/>
-    <Attribute name="urn:mace:dir:attribute-def:facsimileTelephoneNumber" id="facsimileTelephoneNumber"/>
-    <Attribute name="urn:mace:dir:attribute-def:street" id="street"/>
-    <Attribute name="urn:mace:dir:attribute-def:postOfficeBox" id="postOfficeBox"/>
-    <Attribute name="urn:mace:dir:attribute-def:postalCode" id="postalCode"/>
-    <Attribute name="urn:mace:dir:attribute-def:st" id="st"/>
-    <Attribute name="urn:mace:dir:attribute-def:l" id="l"/>
-    <Attribute name="urn:mace:dir:attribute-def:o" id="o"/>
-    <Attribute name="urn:mace:dir:attribute-def:ou" id="ou"/>
-    <Attribute name="urn:mace:dir:attribute-def:businessCategory" id="businessCategory"/>
-    <Attribute name="urn:mace:dir:attribute-def:physicalDeliveryOfficeName" id="physicalDeliveryOfficeName"/>
-
-    <Attribute name="urn:oid:0.9.2342.19200300.100.1.1" id="uid"/>
-    <Attribute name="urn:oid:2.5.4.3" id="cn"/>
-    <Attribute name="urn:oid:2.5.4.4" id="sn"/>
-    <Attribute name="urn:oid:2.5.4.42" id="givenName"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.241" id="displayName"/>
-    <Attribute name="urn:oid:0.9.2342.19200300.100.1.3" id="mail"/>
-    <Attribute name="urn:oid:2.5.4.20" id="telephoneNumber"/>
-    <Attribute name="urn:oid:2.5.4.12" id="title"/>
-    <Attribute name="urn:oid:2.5.4.43" id="initials"/>
-    <Attribute name="urn:oid:2.5.4.13" id="description"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.1" id="carLicense"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.2" id="departmentNumber"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.3" id="employeeNumber"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.4" id="employeeType"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.39" id="preferredLanguage"/>
-    <Attribute name="urn:oid:0.9.2342.19200300.100.1.10" id="manager"/>
-    <Attribute name="urn:oid:2.5.4.34" id="seeAlso"/>
-    <Attribute name="urn:oid:2.5.4.23" id="facsimileTelephoneNumber"/>
-    <Attribute name="urn:oid:2.5.4.9" id="street"/>
-    <Attribute name="urn:oid:2.5.4.18" id="postOfficeBox"/>
-    <Attribute name="urn:oid:2.5.4.17" id="postalCode"/>
-    <Attribute name="urn:oid:2.5.4.8" id="st"/>
-    <Attribute name="urn:oid:2.5.4.7" id="l"/>
-    <Attribute name="urn:oid:2.5.4.10" id="o"/>
-    <Attribute name="urn:oid:2.5.4.11" id="ou"/>
-    <Attribute name="urn:oid:2.5.4.15" id="businessCategory"/>
-    <Attribute name="urn:oid:2.5.4.19" id="physicalDeliveryOfficeName"/>
-
-</Attributes>
diff --git a/conf/vagrant/etc/shibboleth/dataverse-idp-metadata.xml b/conf/vagrant/etc/shibboleth/dataverse-idp-metadata.xml
deleted file mode 100644
index 67225b5e670..00000000000
--- a/conf/vagrant/etc/shibboleth/dataverse-idp-metadata.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<EntitiesDescriptor Name="urn:mace:shibboleth:testshib:two"
-    xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:mdalg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-    xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <!-- This file contains the metadata for the testing IdP and SP
-     that are operated by TestShib as a service for testing new
-     Shibboleth and SAML providers. -->
-
-    <EntityDescriptor entityID="https://idp.testshib.org/idp/shibboleth">
-        
-        <Extensions>
-            <mdalg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" />
-            <mdalg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384" />
-            <mdalg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <mdalg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-            <mdalg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" />
-            <mdalg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" />
-            <mdalg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
-            <mdalg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-        </Extensions>
-
-        <IDPSSODescriptor
-            protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-            <Extensions>
-                <shibmd:Scope regexp="false">testshib.org</shibmd:Scope>
-                <mdui:UIInfo>
-                    <mdui:DisplayName xml:lang="en">TestShib Test IdP</mdui:DisplayName>
-                    <mdui:Description xml:lang="en">TestShib IdP. Use this as a source of attributes
-                        for your test SP.</mdui:Description>
-                    <mdui:Logo height="88" width="75"
-                        >https://www.testshib.org/images/testshib-transp.png</mdui:Logo>
-                </mdui:UIInfo>
-
-            </Extensions>
-            <KeyDescriptor>
-                <ds:KeyInfo>
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-                            MIIEDjCCAvagAwIBAgIBADANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJVUzEV
-                            MBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYDVQQHEwpQaXR0c2J1cmdoMREwDwYD
-                            VQQKEwhUZXN0U2hpYjEZMBcGA1UEAxMQaWRwLnRlc3RzaGliLm9yZzAeFw0wNjA4
-                            MzAyMTEyMjVaFw0xNjA4MjcyMTEyMjVaMGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQI
-                            EwxQZW5uc3lsdmFuaWExEzARBgNVBAcTClBpdHRzYnVyZ2gxETAPBgNVBAoTCFRl
-                            c3RTaGliMRkwFwYDVQQDExBpZHAudGVzdHNoaWIub3JnMIIBIjANBgkqhkiG9w0B
-                            AQEFAAOCAQ8AMIIBCgKCAQEArYkCGuTmJp9eAOSGHwRJo1SNatB5ZOKqDM9ysg7C
-                            yVTDClcpu93gSP10nH4gkCZOlnESNgttg0r+MqL8tfJC6ybddEFB3YBo8PZajKSe
-                            3OQ01Ow3yT4I+Wdg1tsTpSge9gEz7SrC07EkYmHuPtd71CHiUaCWDv+xVfUQX0aT
-                            NPFmDixzUjoYzbGDrtAyCqA8f9CN2txIfJnpHE6q6CmKcoLADS4UrNPlhHSzd614
-                            kR/JYiks0K4kbRqCQF0Dv0P5Di+rEfefC6glV8ysC8dB5/9nb0yh/ojRuJGmgMWH
-                            gWk6h0ihjihqiu4jACovUZ7vVOCgSE5Ipn7OIwqd93zp2wIDAQABo4HEMIHBMB0G
-                            A1UdDgQWBBSsBQ869nh83KqZr5jArr4/7b+QazCBkQYDVR0jBIGJMIGGgBSsBQ86
-                            9nh83KqZr5jArr4/7b+Qa6FrpGkwZzELMAkGA1UEBhMCVVMxFTATBgNVBAgTDFBl
-                            bm5zeWx2YW5pYTETMBEGA1UEBxMKUGl0dHNidXJnaDERMA8GA1UEChMIVGVzdFNo
-                            aWIxGTAXBgNVBAMTEGlkcC50ZXN0c2hpYi5vcmeCAQAwDAYDVR0TBAUwAwEB/zAN
-                            BgkqhkiG9w0BAQUFAAOCAQEAjR29PhrCbk8qLN5MFfSVk98t3CT9jHZoYxd8QMRL
-                            I4j7iYQxXiGJTT1FXs1nd4Rha9un+LqTfeMMYqISdDDI6tv8iNpkOAvZZUosVkUo
-                            93pv1T0RPz35hcHHYq2yee59HJOco2bFlcsH8JBXRSRrJ3Q7Eut+z9uo80JdGNJ4
-                            /SJy5UorZ8KazGj16lfJhOBXldgrhppQBb0Nq6HKHguqmwRfJ+WkxemZXzhediAj
-                            Geka8nz8JjwxpUjAiSWYKLtJhGEaTqCYxCCX2Dw+dOTqUzHOZ7WKv4JXPK5G/Uhr
-                            8K/qhmFT2nIQi538n6rVYLeWj8Bbnl+ev0peYzxFyF5sQA==
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-                </ds:KeyInfo>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-            </KeyDescriptor>
-
-            <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                Location="https://idp.testshib.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
-                index="1"/>
-            <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                Location="https://idp.testshib.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
-                index="2"/>
-
-            <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-            <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-            
-            <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
-                Location="https://idp.testshib.org/idp/profile/Shibboleth/SSO"/>
-            <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                Location="https://idp.testshib.org/idp/profile/SAML2/POST/SSO"/>
-            <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-                Location="https://idp.testshib.org/idp/profile/SAML2/Redirect/SSO"/>
-            <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" 
-                Location="https://idp.testshib.org/idp/profile/SAML2/SOAP/ECP"/>
-
-        </IDPSSODescriptor>
-
-
-        <AttributeAuthorityDescriptor
-            protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-            <KeyDescriptor>
-                <ds:KeyInfo>
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-                            MIIEDjCCAvagAwIBAgIBADANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJVUzEV
-                            MBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYDVQQHEwpQaXR0c2J1cmdoMREwDwYD
-                            VQQKEwhUZXN0U2hpYjEZMBcGA1UEAxMQaWRwLnRlc3RzaGliLm9yZzAeFw0wNjA4
-                            MzAyMTEyMjVaFw0xNjA4MjcyMTEyMjVaMGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQI
-                            EwxQZW5uc3lsdmFuaWExEzARBgNVBAcTClBpdHRzYnVyZ2gxETAPBgNVBAoTCFRl
-                            c3RTaGliMRkwFwYDVQQDExBpZHAudGVzdHNoaWIub3JnMIIBIjANBgkqhkiG9w0B
-                            AQEFAAOCAQ8AMIIBCgKCAQEArYkCGuTmJp9eAOSGHwRJo1SNatB5ZOKqDM9ysg7C
-                            yVTDClcpu93gSP10nH4gkCZOlnESNgttg0r+MqL8tfJC6ybddEFB3YBo8PZajKSe
-                            3OQ01Ow3yT4I+Wdg1tsTpSge9gEz7SrC07EkYmHuPtd71CHiUaCWDv+xVfUQX0aT
-                            NPFmDixzUjoYzbGDrtAyCqA8f9CN2txIfJnpHE6q6CmKcoLADS4UrNPlhHSzd614
-                            kR/JYiks0K4kbRqCQF0Dv0P5Di+rEfefC6glV8ysC8dB5/9nb0yh/ojRuJGmgMWH
-                            gWk6h0ihjihqiu4jACovUZ7vVOCgSE5Ipn7OIwqd93zp2wIDAQABo4HEMIHBMB0G
-                            A1UdDgQWBBSsBQ869nh83KqZr5jArr4/7b+QazCBkQYDVR0jBIGJMIGGgBSsBQ86
-                            9nh83KqZr5jArr4/7b+Qa6FrpGkwZzELMAkGA1UEBhMCVVMxFTATBgNVBAgTDFBl
-                            bm5zeWx2YW5pYTETMBEGA1UEBxMKUGl0dHNidXJnaDERMA8GA1UEChMIVGVzdFNo
-                            aWIxGTAXBgNVBAMTEGlkcC50ZXN0c2hpYi5vcmeCAQAwDAYDVR0TBAUwAwEB/zAN
-                            BgkqhkiG9w0BAQUFAAOCAQEAjR29PhrCbk8qLN5MFfSVk98t3CT9jHZoYxd8QMRL
-                            I4j7iYQxXiGJTT1FXs1nd4Rha9un+LqTfeMMYqISdDDI6tv8iNpkOAvZZUosVkUo
-                            93pv1T0RPz35hcHHYq2yee59HJOco2bFlcsH8JBXRSRrJ3Q7Eut+z9uo80JdGNJ4
-                            /SJy5UorZ8KazGj16lfJhOBXldgrhppQBb0Nq6HKHguqmwRfJ+WkxemZXzhediAj
-                            Geka8nz8JjwxpUjAiSWYKLtJhGEaTqCYxCCX2Dw+dOTqUzHOZ7WKv4JXPK5G/Uhr
-                            8K/qhmFT2nIQi538n6rVYLeWj8Bbnl+ev0peYzxFyF5sQA==
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-                </ds:KeyInfo>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-            </KeyDescriptor>
-
-
-            <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                Location="https://idp.testshib.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-            <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                Location="https://idp.testshib.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-
-            <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-            <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
-        </AttributeAuthorityDescriptor>
-
-        <Organization>
-            <OrganizationName xml:lang="en">TestShib Two Identity Provider</OrganizationName>
-            <OrganizationDisplayName xml:lang="en">TestShib Two</OrganizationDisplayName>
-            <OrganizationURL xml:lang="en">http://www.testshib.org/testshib-two/</OrganizationURL>
-        </Organization>
-        <ContactPerson contactType="technical">
-            <GivenName>Nate</GivenName>
-            <SurName>Klingenstein</SurName>
-            <EmailAddress>ndk@internet2.edu</EmailAddress>
-        </ContactPerson>
-    </EntityDescriptor>
-
-    <EntityDescriptor entityID="https://sp.testshib.org/shibboleth-sp">
-
-        <Extensions>
-            <mdalg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" />
-            <mdalg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384" />
-            <mdalg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <mdalg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-            <mdalg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" />
-            <mdalg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" />
-            <mdalg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
-            <mdalg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-        </Extensions>
-        
-        <!-- An SP supporting SAML 1 and 2 contains this element with protocol support as shown. -->
-        <SPSSODescriptor
-            protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext">
-
-            <Extensions>
-                <!-- Extension to permit the SP to receive IdP discovery responses. -->
-                <idpdisc:DiscoveryResponse
-                    xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                    index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                    Location="https://sp.testshib.org/Shibboleth.sso/DS"/>
-                
-                <mdui:UIInfo>
-                    <mdui:DisplayName xml:lang="en">TestShib Test SP</mdui:DisplayName>
-                    <mdui:Description xml:lang="en">TestShib SP. Log into this to test your machine.
-                        Once logged in check that all attributes that you expected have been
-                        released.</mdui:Description>
-                    <mdui:Logo height="88" width="75">https://www.testshib.org/images/testshib-transp.png</mdui:Logo>
-                </mdui:UIInfo>
-            </Extensions>
-
-            <KeyDescriptor>
-                <ds:KeyInfo>
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-                            MIIEPjCCAyagAwIBAgIBADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJVUzEV
-                            MBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYDVQQHEwpQaXR0c2J1cmdoMSIwIAYD
-                            VQQKExlUZXN0U2hpYiBTZXJ2aWNlIFByb3ZpZGVyMRgwFgYDVQQDEw9zcC50ZXN0
-                            c2hpYi5vcmcwHhcNMDYwODMwMjEyNDM5WhcNMTYwODI3MjEyNDM5WjB3MQswCQYD
-                            VQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYDVQQHEwpQaXR0c2J1
-                            cmdoMSIwIAYDVQQKExlUZXN0U2hpYiBTZXJ2aWNlIFByb3ZpZGVyMRgwFgYDVQQD
-                            Ew9zcC50ZXN0c2hpYi5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-                            AQDJyR6ZP6MXkQ9z6RRziT0AuCabDd3x1m7nLO9ZRPbr0v1LsU+nnC363jO8nGEq
-                            sqkgiZ/bSsO5lvjEt4ehff57ERio2Qk9cYw8XCgmYccVXKH9M+QVO1MQwErNobWb
-                            AjiVkuhWcwLWQwTDBowfKXI87SA7KR7sFUymNx5z1aoRvk3GM++tiPY6u4shy8c7
-                            vpWbVfisfTfvef/y+galxjPUQYHmegu7vCbjYP3On0V7/Ivzr+r2aPhp8egxt00Q
-                            XpilNai12LBYV3Nv/lMsUzBeB7+CdXRVjZOHGuQ8mGqEbsj8MBXvcxIKbcpeK5Zi
-                            JCVXPfarzuriM1G5y5QkKW+LAgMBAAGjgdQwgdEwHQYDVR0OBBYEFKB6wPDxwYrY
-                            StNjU5P4b4AjBVQVMIGhBgNVHSMEgZkwgZaAFKB6wPDxwYrYStNjU5P4b4AjBVQV
-                            oXukeTB3MQswCQYDVQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYD
-                            VQQHEwpQaXR0c2J1cmdoMSIwIAYDVQQKExlUZXN0U2hpYiBTZXJ2aWNlIFByb3Zp
-                            ZGVyMRgwFgYDVQQDEw9zcC50ZXN0c2hpYi5vcmeCAQAwDAYDVR0TBAUwAwEB/zAN
-                            BgkqhkiG9w0BAQUFAAOCAQEAc06Kgt7ZP6g2TIZgMbFxg6vKwvDL0+2dzF11Onpl
-                            5sbtkPaNIcj24lQ4vajCrrGKdzHXo9m54BzrdRJ7xDYtw0dbu37l1IZVmiZr12eE
-                            Iay/5YMU+aWP1z70h867ZQ7/7Y4HW345rdiS6EW663oH732wSYNt9kr7/0Uer3KD
-                            9CuPuOidBacospDaFyfsaJruE99Kd6Eu/w5KLAGG+m0iqENCziDGzVA47TngKz2v
-                            PVA+aokoOyoz3b53qeti77ijatSEoKjxheBWpO+eoJeGq/e49Um3M2ogIX/JAlMa
-                            Inh+vYSYngQB2sx9LGkR9KHaMKNIGCDehk93Xla4pWJx1w== 
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-                </ds:KeyInfo>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc" />
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-            </KeyDescriptor>
-
-            <!-- This tells IdPs that Single Logout is supported and where/how to request it. -->
-
-            <SingleLogoutService Location="https://sp.testshib.org/Shibboleth.sso/SLO/SOAP"
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"/>
-            <SingleLogoutService Location="https://sp.testshib.org/Shibboleth.sso/SLO/Redirect"
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
-            <SingleLogoutService Location="https://sp.testshib.org/Shibboleth.sso/SLO/POST"
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
-            <SingleLogoutService Location="https://sp.testshib.org/Shibboleth.sso/SLO/Artifact"
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"/>
-
-
-            <!-- This tells IdPs that you only need transient identifiers. -->
-            <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-            <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
-            <!--
-		This tells IdPs where and how to send authentication assertions. Mostly
-		the SP will tell the IdP what location to use in its request, but this
-		is how the IdP validates the location and also figures out which
-		SAML version/binding to use.
-		-->
-
-            <AssertionConsumerService index="1" isDefault="true"
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                Location="https://sp.testshib.org/Shibboleth.sso/SAML2/POST"/>
-            <AssertionConsumerService index="2"
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
-                Location="https://sp.testshib.org/Shibboleth.sso/SAML2/POST-SimpleSign"/>
-            <AssertionConsumerService index="3"
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                Location="https://sp.testshib.org/Shibboleth.sso/SAML2/Artifact"/>
-            <AssertionConsumerService index="4"
-                Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
-                Location="https://sp.testshib.org/Shibboleth.sso/SAML/POST"/>
-            <AssertionConsumerService index="5"
-                Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
-                Location="https://sp.testshib.org/Shibboleth.sso/SAML/Artifact"/>
-            <AssertionConsumerService index="6"
-                Binding="http://schemas.xmlsoap.org/ws/2003/07/secext"
-                Location="https://sp.testshib.org/Shibboleth.sso/ADFS"/>
-
-            <!-- A couple additional assertion consumers for the registration webapp. -->
-
-            <AssertionConsumerService index="7"
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                Location="https://www.testshib.org/Shibboleth.sso/SAML2/POST"/>
-            <AssertionConsumerService index="8"
-                Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
-                Location="https://www.testshib.org/Shibboleth.sso/SAML/POST"/>
-
-        </SPSSODescriptor>
-
-        <!-- This is just information about the entity in human terms. -->
-        <Organization>
-            <OrganizationName xml:lang="en">TestShib Two Service Provider</OrganizationName>
-            <OrganizationDisplayName xml:lang="en">TestShib Two</OrganizationDisplayName>
-            <OrganizationURL xml:lang="en">http://www.testshib.org/testshib-two/</OrganizationURL>
-        </Organization>
-        <ContactPerson contactType="technical">
-            <GivenName>Nate</GivenName>
-            <SurName>Klingenstein</SurName>
-            <EmailAddress>ndk@internet2.edu</EmailAddress>
-        </ContactPerson>
-
-    </EntityDescriptor>
-
-
-</EntitiesDescriptor>
-
diff --git a/conf/vagrant/etc/shibboleth/shibboleth2.xml b/conf/vagrant/etc/shibboleth/shibboleth2.xml
deleted file mode 100644
index 946e73bdf6a..00000000000
--- a/conf/vagrant/etc/shibboleth/shibboleth2.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-This is an example shibboleth2.xml generated for you by TestShib.  It's reduced and recommended
-specifically for testing.  You don't need to change anything, but you may want to explore the file
-to learn about how your SP works.  Uncomment attributes in your attribute-map.xml file to test them.
-
-If you want to test advanced functionality, start from the distribution shibboleth2.xml and add the
-MetadataProvider, the right entityID, and a properly configured SSO element.  More information:
-
-https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPConfiguration
--->
-
-<SPConfig xmlns="urn:mace:shibboleth:2.0:native:sp:config" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    clockSkew="1800">
-
-    <!-- The entityID is the name TestShib made for your SP. -->
-    <ApplicationDefaults entityID="https://pdurbin.pagekite.me/shibboleth"
-        REMOTE_USER="eppn" attributePrefix="AJP_">
-
-        <!-- You should use secure cookies if at all possible.  See cookieProps in this Wiki article. -->
-        <!-- https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPSessions -->
-        <Sessions lifetime="28800" timeout="3600" checkAddress="false" relayState="ss:mem" handlerSSL="false">
-
-            <!-- Triggers a login request directly to the TestShib IdP. -->
-            <!-- https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPServiceSSO -->
-            <!-- A single explicit entityId could be used for Dataverse installation that only cares about one IdP. -->
-            <!-- <SSO entityID="https://idp.testshib.org/idp/shibboleth">SAML2 SAML1</SSO> -->
-
-            <!-- not used but maybe helpful for troubleshooting -->
-            <!--<SSO discoveryProtocol="SAMLDS" discoveryURL="https://pdurbin.pagekite.me/shibboleth-ds/index.html">SAML2 SAML1</SSO>-->
-            <!-- picker is displayed as an iframe in this page -->
-            <SSO discoveryProtocol="SAMLDS" discoveryURL="http://pdurbin.pagekite.me/loginpage.xhtml">SAML2 SAML1</SSO>
-<!--
--->
-            <!-- SAML and local-only logout. -->
-            <!-- https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPServiceLogout -->
-            <Logout>SAML2 Local</Logout>
-
-            <!--
-                Handlers allow you to interact with the SP and gather more information.  Try them out!
-                Attribute values received by the SP through SAML will be visible at:
-                http://pdurbin.pagekite.me/Shibboleth.sso/Session
-            -->
-
-            <!-- Extension service that generates "approximate" metadata based on SP configuration. -->
-            <Handler type="MetadataGenerator" Location="/Metadata" signing="false"/>
-
-            <!-- Status reporting service. -->
-            <Handler type="Status" Location="/Status" acl="127.0.0.1"/>
-
-            <!-- Session diagnostic service. -->
-            <Handler type="Session" Location="/Session" showAttributeValues="true"/>
-
-            <!-- JSON feed of discovery information. -->
-            <Handler type="DiscoveryFeed" Location="/DiscoFeed"/>
-
-        </Sessions>
-
-        <!-- Error pages to display to yourself if something goes horribly wrong. -->
-        <Errors supportContact="root@localhost" logoLocation="/shibboleth-sp/logo.jpg" 
-                styleSheet="/shibboleth-sp/main.css"/>
-
-        <!-- Loads and trusts a metadata file that describes only the Testshib IdP and how to communicate with it. -->
-        <!-- For Dataverse we hard code a local file instead of using a URI -->
-        <!-- <MetadataProvider type="XML" uri="http://www.testshib.org/metadata/testshib-providers.xml" backingFilePath="testshib-two-idp-metadata.xml" reloadInterval="180000" /> -->
-
-        <!-- IdPs we want allow go in /etc/shibboleth/dataverse-idp-metadata.xml -->
-        <MetadataProvider type="XML" file="dataverse-idp-metadata.xml" backingFilePath="local-idp-metadata.xml" legacyOrgNames="true" reloadInterval="7200"/>
-
-        <!-- Attribute and trust options you shouldn't need to change. -->
-        <AttributeExtractor type="XML" validate="true" path="attribute-map.xml"/>
-        <AttributeResolver type="Query" subjectMatch="true"/>
-        <AttributeFilter type="XML" validate="true" path="attribute-policy.xml"/>
-
-        <!-- Your SP generated these credentials.  They're used to talk to IdP's. -->
-        <CredentialResolver type="File" key="sp-key.pem" certificate="sp-cert.pem"/>
-
-    </ApplicationDefaults>
-    
-    <!-- Security policies you shouldn't change unless you know what you're doing. -->
-    <SecurityPolicyProvider type="XML" validate="true" path="security-policy.xml"/>
-
-    <!-- Low-level configuration about protocols and bindings available for use. -->
-    <ProtocolProvider type="XML" validate="true" reloadChanges="false" path="protocols.xml"/>
-
-</SPConfig>
diff --git a/conf/vagrant/etc/yum.repos.d/epel-apache-maven.repo b/conf/vagrant/etc/yum.repos.d/epel-apache-maven.repo
deleted file mode 100644
index 1e0f8200040..00000000000
--- a/conf/vagrant/etc/yum.repos.d/epel-apache-maven.repo
+++ /dev/null
@@ -1,15 +0,0 @@
-# Place this file in your /etc/yum.repos.d/ directory
-
-[epel-apache-maven]
-name=maven from apache foundation.
-baseurl=http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-$releasever/$basearch/
-enabled=1
-skip_if_unavailable=1
-gpgcheck=0
-
-[epel-apache-maven-source]
-name=maven from apache foundation. - Source
-baseurl=http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-$releasever/SRPMS
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
diff --git a/conf/vagrant/etc/yum.repos.d/shibboleth.repo b/conf/vagrant/etc/yum.repos.d/shibboleth.repo
deleted file mode 100644
index ebbe3747a10..00000000000
--- a/conf/vagrant/etc/yum.repos.d/shibboleth.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[security_shibboleth]
-name=Shibboleth (CentOS_CentOS-6)
-type=rpm-md
-baseurl=http://download.opensuse.org/repositories/security:/shibboleth/CentOS_CentOS-6/
-gpgcheck=1
-gpgkey=http://download.opensuse.org/repositories/security:/shibboleth/CentOS_CentOS-6/repodata/repomd.xml.key
-enabled=1
diff --git a/conf/vagrant/var/lib/pgsql/data/pg_hba.conf b/conf/vagrant/var/lib/pgsql/data/pg_hba.conf
deleted file mode 100644
index e3244686066..00000000000
--- a/conf/vagrant/var/lib/pgsql/data/pg_hba.conf
+++ /dev/null
@@ -1,74 +0,0 @@
-# PostgreSQL Client Authentication Configuration File
-# ===================================================
-#
-# Refer to the "Client Authentication" section in the
-# PostgreSQL documentation for a complete description
-# of this file.  A short synopsis follows.
-#
-# This file controls: which hosts are allowed to connect, how clients
-# are authenticated, which PostgreSQL user names they can use, which
-# databases they can access.  Records take one of these forms:
-#
-# local      DATABASE  USER  METHOD  [OPTIONS]
-# host       DATABASE  USER  CIDR-ADDRESS  METHOD  [OPTIONS]
-# hostssl    DATABASE  USER  CIDR-ADDRESS  METHOD  [OPTIONS]
-# hostnossl  DATABASE  USER  CIDR-ADDRESS  METHOD  [OPTIONS]
-#
-# (The uppercase items must be replaced by actual values.)
-#
-# The first field is the connection type: "local" is a Unix-domain socket,
-# "host" is either a plain or SSL-encrypted TCP/IP socket, "hostssl" is an
-# SSL-encrypted TCP/IP socket, and "hostnossl" is a plain TCP/IP socket.
-#
-# DATABASE can be "all", "sameuser", "samerole", a database name, or
-# a comma-separated list thereof.
-#
-# USER can be "all", a user name, a group name prefixed with "+", or
-# a comma-separated list thereof.  In both the DATABASE and USER fields
-# you can also write a file name prefixed with "@" to include names from
-# a separate file.
-#
-# CIDR-ADDRESS specifies the set of hosts the record matches.
-# It is made up of an IP address and a CIDR mask that is an integer
-# (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that specifies
-# the number of significant bits in the mask.  Alternatively, you can write
-# an IP address and netmask in separate columns to specify the set of hosts.
-#
-# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi", "krb5",
-# "ident", "pam", "ldap" or "cert".  Note that "password" sends passwords
-# in clear text; "md5" is preferred since it sends encrypted passwords.
-#
-# OPTIONS are a set of options for the authentication in the format
-# NAME=VALUE. The available options depend on the different authentication
-# methods - refer to the "Client Authentication" section in the documentation
-# for a list of which options are available for which authentication methods.
-#
-# Database and user names containing spaces, commas, quotes and other special
-# characters must be quoted. Quoting one of the keywords "all", "sameuser" or
-# "samerole" makes the name lose its special character, and just match a
-# database or username with that name.
-#
-# This file is read on server startup and when the postmaster receives
-# a SIGHUP signal.  If you edit the file on a running system, you have
-# to SIGHUP the postmaster for the changes to take effect.  You can use
-# "pg_ctl reload" to do that.
-
-# Put your actual configuration here
-# ----------------------------------
-#
-# If you want to allow non-local connections, you need to add more
-# "host" records. In that case you will also need to make PostgreSQL listen
-# on a non-local interface via the listen_addresses configuration parameter,
-# or via the -i or -h command line switches.
-#
-
-
-
-# TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD
-
-# "local" is for Unix domain socket connections only
-local   all         all                               trust
-# IPv4 local connections:
-host    all         all         127.0.0.1/32          trust
-# IPv6 local connections:
-host    all         all         ::1/128               trust
diff --git a/conf/vagrant/var/www/dataverse/error-documents/503.html b/conf/vagrant/var/www/dataverse/error-documents/503.html
deleted file mode 100644
index 95a7dea4107..00000000000
--- a/conf/vagrant/var/www/dataverse/error-documents/503.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Custom "site is unavailable" 503 page.</p>
diff --git a/doc/Architecture/components.uml b/doc/Architecture/components.uml
index 5dd65fc714a..ad8119755c0 100644
--- a/doc/Architecture/components.uml
+++ b/doc/Architecture/components.uml
@@ -40,14 +40,11 @@ node "DatabaseServer2" {
 }
 
 node "RserveServer1" {
-  component "rApache" {
-  }
   database "Rserve" {
   }
 } 
 
 Clients --> LoadBalancer
-Clients --> rApache
 
 LoadBalancer --> Apache1
 LoadBalancer --> Apache2
diff --git a/doc/Architecture/update-user-account-info.png b/doc/Architecture/update-user-account-info.png
index a372104438c..aa7d5f881f1 100644
Binary files a/doc/Architecture/update-user-account-info.png and b/doc/Architecture/update-user-account-info.png differ
diff --git a/doc/JAVADOC_GUIDE.md b/doc/JAVADOC_GUIDE.md
index 8001abda248..997c40e1624 100644
--- a/doc/JAVADOC_GUIDE.md
+++ b/doc/JAVADOC_GUIDE.md
@@ -88,7 +88,7 @@ Here's a better approach:
     /** The dataverse we move the dataset <em>from</em> */
     private Dataverse sourceDataverse;
 
-    /** The dataverse we movet the dataset <em>to</em> */
+    /** The dataverse we move the dataset <em>to</em> */
     private Dataverse destinationDataverse;
 
 
diff --git a/doc/mergeParty/readme.md b/doc/mergeParty/readme.md
index f97b17f7430..6f3af8511dc 100644
--- a/doc/mergeParty/readme.md
+++ b/doc/mergeParty/readme.md
@@ -1,5 +1,5 @@
-# Merge Party Readme
-Welcome to the merge party! This document is intended to give a short overview of why we need this party, when was changed and how to change it. There's much work to do, so we'll keep it short. Hopefully.
+# Merge Party
+Welcome to the merge party! This document is intended to give a short overview of why we need this party, when was it changed and how to change it. There's much work to do, so we'll keep it short, hopefully.
 
 ## What Just Happened
 In order to allow users to log into Dataverse using credentials from other systems (e.g. institutional Shibboleth server), we had to refactor out the internal user management sub-system (formerly known as "DataverseUser") and introduce a new user system. The existing system was taken out of Dataverse but kept in the .war file, as we also need to support standalone instances.
@@ -16,7 +16,7 @@ From a merge standpoint, this means that code that previously referenced `Datave
 
 Most of these changes have been done by Michael/Phil - otherwise, the `auth` branch would not compile.
 
-Since the guest user does not live in the database, it does not have an id. Moreover, JPA classes cannot link directly to it\*. But have no fear - all users (and, really, all `RoleAssignee`s, which are users or groups) have an identifier. When you need to reference a user (and later, a group) just use the identifier (it's of type `String`). When needing to convert an identifier to a user, call `RoleAssigneeServiceBean.getRoleAssignee( identifier )` in the general case, or `AuthenticationServiceBean.getAuthenticatedUser(identifier)` if you're certain the identifier is of an authenticated user.
+The guest user does not live in the database so it does not have an id. Moreover, JPA classes cannot link directly to it\*. But have no fear - all users (and, really, all `RoleAssignee`s, which are users or groups) have an identifier. When you need to reference a user (and later, a group) just use the identifier (it's of type `String`). When needing to convert an identifier to a user, call `RoleAssigneeServiceBean.getRoleAssignee( identifier )` in the general case, or `AuthenticationServiceBean.getAuthenticatedUser(identifier)` if you're certain the identifier is of an authenticated user.
 
 
 \* We have debated this for a while, since we could have created a dummy record, like we've done so far. We went with this solution, as it is cleaner, can't be messed up by SQL scripts, and will make even more sense once groups arrive.
@@ -73,10 +73,10 @@ Note that before we were asking `isGuest` and now we ask `isAuthenticated`, so t
 ## Other Added Things
 
 ### Settings bean
-Settings (in `edu.harvard.iq.dataverse.settings`) are where the application stores its more complex, admin-editable configuration. Technically, its a persistent `Map<String,String>`, that can be accessed via API (`edu.harvard.iq.dataverse.api.Admin`, on path `{server}/api/s/settings`). Currenly used for the signup mechanism.
+Settings (in `edu.harvard.iq.dataverse.settings`) are where the application stores its more complex, admin-editable configuration. Technically, its a persistent `Map<String,String>`, that can be accessed via API (`edu.harvard.iq.dataverse.api.Admin`, on path `{server}/api/s/settings`). Currently used for the signup mechanism.
 
 ### Admin API
-Accessible under url `{server}/api/s/`, API calls to this bean should be editing confugurations, allowing full indexing and more. The idea behing putting all of them under the `/s/` path is that we can later block these calls using a filter. This way, we could, say, allow access from localhost only. Or, we could block this completely based on some environemnt variable.
+Accessible under url `{server}/api/s/`, API calls to this bean should be editing configurations, allowing full indexing and more. The idea behind putting all of them under the `/s/` path is that we can later block these calls using a filter. This way, we could, say, allow access from localhost only. Or, we could block this completely based on some environment variable.
 
 ### `setup-all.sh` script
 A new script that sets up the users and the dataverses, sets the system up for built-in signup, and then indexes the dataverses using solr. Requires the [jq utility](http://stedolan.github.io/jq/). On Macs with [homebrew](http://brew.sh) installed, getting this utility is a `brew install jq` command away.
@@ -84,4 +84,4 @@ A new script that sets up the users and the dataverses, sets the system up for b
 
 ## Undoing the undoing the merge
 When merging back to master, we need to undo commit 8ae3e6a482b87b52a1745bb06f340875803d2c5b (a.k.a 8ae3e6a), which is the commit that undid the erroneous merge.
-More at http://www.christianengvall.se/undo-pushed-merge-git/
\ No newline at end of file
+More at http://www.christianengvall.se/undo-pushed-merge-git/
diff --git a/doc/release-notes/10190-dataset-count.md b/doc/release-notes/10190-dataset-count.md
new file mode 100644
index 00000000000..a3d3a052f87
--- /dev/null
+++ b/doc/release-notes/10190-dataset-count.md
@@ -0,0 +1,2 @@
+The search index now includes datasetCount for each collection, counting published, linked, and harvested datasets.
+Collections can be filtered using datasetCount (e.g., `datasetCount:[1000 TO *]`), and the value is returned in Dataverse search results via the Search API.
\ No newline at end of file
diff --git a/doc/release-notes/11243-editmetadata-api-extension.md b/doc/release-notes/11243-editmetadata-api-extension.md
new file mode 100644
index 00000000000..3666d8bc30a
--- /dev/null
+++ b/doc/release-notes/11243-editmetadata-api-extension.md
@@ -0,0 +1,7 @@
+### Edit Dataset Metadata API extension
+
+- This endpoint now allows removing fields (by sending empty values), as long as they are not required by the dataset.
+- New ``sourceLastUpdateTime`` optional query parameter, which prevents inconsistencies by managing updates that
+  may occur from other users while a dataset is being edited.
+
+NOTE: This release note was updated to conform to the refactoring of the validation as part of issue #11392
diff --git a/doc/release-notes/11392-edit-file-metadata-empty-values.md b/doc/release-notes/11392-edit-file-metadata-empty-values.md
new file mode 100644
index 00000000000..5839fa100af
--- /dev/null
+++ b/doc/release-notes/11392-edit-file-metadata-empty-values.md
@@ -0,0 +1,7 @@
+### Edit File Metadata empty values should clear data
+
+Previously the API POST /files/{id}/metadata would ignore fields with empty values. Now the API updates the fields with the empty values essentially clearing the data. Missing fields will still be ignored.
+
+An optional query parameter (sourceLastUpdateTime) was added to ensure the metadata update doesn't overwrite stale data.
+
+See also [the guides](https://dataverse-guide--11359.org.readthedocs.build/en/11359/api/native-api.html#updating-file-metadata), #11392, and #11359.
diff --git a/doc/release-notes/11448-api-endpoint-for-analytics-html.md b/doc/release-notes/11448-api-endpoint-for-analytics-html.md
new file mode 100644
index 00000000000..ac62a1b5257
--- /dev/null
+++ b/doc/release-notes/11448-api-endpoint-for-analytics-html.md
@@ -0,0 +1,5 @@
+### Feature Request: API endpoint for analytics.html
+
+New API to get the analytics.html from settings for SPA (Also can be used to get homePage, header, footer, style, and logo)
+
+See also [the guides](https://dataverse-guide--11359.org.readthedocs.build/en/11359/installation/config.html#web-analytics-code), #11448.
diff --git a/doc/release-notes/11485-mpconfig-personororg.md b/doc/release-notes/11485-mpconfig-personororg.md
new file mode 100644
index 00000000000..c30ef3829c1
--- /dev/null
+++ b/doc/release-notes/11485-mpconfig-personororg.md
@@ -0,0 +1,7 @@
+The settings `dataverse.personOrOrg.assumeCommaInPersonName` and `dataverse.personOrOrg.orgPhraseArray` now support configuration via MicroProfile Config.
+
+They have been renamed to `dataverse.person-or-org.assume-comma-in-person-name` and `dataverse.person-or-org.org-phrase-array` for consistency with naming conventions.
+
+In addition to the existing `asadmin` JVM option method, any [supported MicroProfile Config API source](https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Overview.html) can now be used to set their values.
+
+For backwards compatibility, `dataverse.personOrOrg.assumeCommaInPersonName` is still supported. However, `dataverse.personOrOrg.orgPhraseArray` is not, due to a change in the expected value format. `dataverse.person-or-org.org-phrase-array` now expects a comma-separated list of phrases as a value instead of a JsonArray of strings. Please update both the name and value format if using the old setting.
\ No newline at end of file
diff --git a/doc/release-notes/11492-list-dataset-links.md b/doc/release-notes/11492-list-dataset-links.md
new file mode 100644
index 00000000000..0a5a6f7a198
--- /dev/null
+++ b/doc/release-notes/11492-list-dataset-links.md
@@ -0,0 +1 @@
+The [API for listing the collections a dataset has been linked to](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#list-collections-that-are-linked-from-a-dataset) (`api/datasets/$linked-dataset-id/links`) is no longer restricted to superusers. For unpublished datasets, users need the "View Unpublished Dataset" permission to access the API. Unpublished collections in the list require the "View Unpublished Dataverse" permission; otherwise, they are hidden.
\ No newline at end of file
diff --git a/doc/release-notes/11534-link-permissions.md b/doc/release-notes/11534-link-permissions.md
new file mode 100644
index 00000000000..29251c1b7d9
--- /dev/null
+++ b/doc/release-notes/11534-link-permissions.md
@@ -0,0 +1,3 @@
+Linking or unlinking a dataset or dataverse now requires the new "Link Dataset/Dataverse" permission.
+Previously, this action was covered by the "Publish Dataset/Dataverse" permission.
+Linking and publishing permissions can now be granted separately, allowing for more fine-grained access control.
\ No newline at end of file
diff --git a/doc/release-notes/11558-show-collections.md b/doc/release-notes/11558-show-collections.md
new file mode 100644
index 00000000000..b204da62387
--- /dev/null
+++ b/doc/release-notes/11558-show-collections.md
@@ -0,0 +1,12 @@
+The Search API now supports a `show_collections` parameter for dataset results.
+When the parameter is set, each result includes a `collections` array showing the dataset’s parent and linked collections. Each entry includes `id`, `name`, and `alias`, for example:
+
+```json
+"collections": [
+  {
+    "id": 11,
+    "name": "My cool collection",
+    "alias": "dvcb50a190"
+  }
+]
+```
\ No newline at end of file
diff --git a/doc/release-notes/11562-templates-api.md b/doc/release-notes/11562-templates-api.md
new file mode 100644
index 00000000000..30e35687a33
--- /dev/null
+++ b/doc/release-notes/11562-templates-api.md
@@ -0,0 +1,4 @@
+New endpoints have been implemented in the Dataverses API for the management of dataverse templates:
+
+- POST `/dataverses/{id}/templates`: Creates a template for a given Dataverse collection ``id``.
+- GET `/dataverses/{id}/templates`: Lists the templates for a given Dataverse collection ``id``.
diff --git a/doc/release-notes/11592-HandleParsing_fix.md b/doc/release-notes/11592-HandleParsing_fix.md
new file mode 100644
index 00000000000..087655d77c4
--- /dev/null
+++ b/doc/release-notes/11592-HandleParsing_fix.md
@@ -0,0 +1 @@
+A bug introduced in v6.5 broken Handle parsing when using a lower-case shoulder. This is now fixed.
\ No newline at end of file
diff --git a/doc/release-notes/11605-existing-shib-external-users-auth.md b/doc/release-notes/11605-existing-shib-external-users-auth.md
new file mode 100644
index 00000000000..a836c7737bb
--- /dev/null
+++ b/doc/release-notes/11605-existing-shib-external-users-auth.md
@@ -0,0 +1 @@
+Implemented a new feature flag ``dataverse.feature.api-bearer-auth-use-shib-user-on-id-match``, which supports the use of the new Dataverse client in instances that have historically allowed login via Shibboleth. Specifically, with this flag enabled, when an OIDC bridge is configured to allow OIDC login with validation by the bridged Shibboleth providers, users with existing Shibboleth-based accounts in Dataverse can log in to those accounts, thereby maintaining access to their existing content and retaining their roles. (For security reasons, Dataverse's current support for direct login via Shibboleth cannot be used in browser-based clients.)
\ No newline at end of file
diff --git a/doc/release-notes/11614-include-isAdvancedSeachField-property.md b/doc/release-notes/11614-include-isAdvancedSeachField-property.md
new file mode 100644
index 00000000000..a544570c52e
--- /dev/null
+++ b/doc/release-notes/11614-include-isAdvancedSeachField-property.md
@@ -0,0 +1,3 @@
+The API endpoints `api/{dataverse-alias}/metadatablocks` and `/api/metadatablocks/{block_id}` have been extended to include the following field:
+
+- `isAdvancedSearchFieldType`: Whether the field can be used in advanced search or not.
\ No newline at end of file
diff --git a/doc/release-notes/11629-CSLFix.md b/doc/release-notes/11629-CSLFix.md
new file mode 100644
index 00000000000..374a0dc78be
--- /dev/null
+++ b/doc/release-notes/11629-CSLFix.md
@@ -0,0 +1 @@
+The styled citations available through the "View Styled Citations" menu were including extra characters, e.g. 'doi:' in the URL form of the PIDs in the citation. This is now fixed.
\ No newline at end of file
diff --git a/doc/release-notes/11632-commons-lang3-update.md b/doc/release-notes/11632-commons-lang3-update.md
new file mode 100644
index 00000000000..c03929dfe02
--- /dev/null
+++ b/doc/release-notes/11632-commons-lang3-update.md
@@ -0,0 +1,20 @@
+Due to changes in how the commons-lang3 library handles a non-ascii chararacter, two keys in the citation.properties and citation.tsv files have changed to include i instead of ɨ. Translations will need to address this.
+
+controlledvocabulary.language.magɨ_(madang_province) => controlledvocabulary.language.magi_(madang_province)
+controlledvocabulary.language.magɨyi =>  controlledvocabulary.language.magiyi
+
+## Upgrade Instructions
+
+x\. Update metadata blocks
+
+These changes reflect incremental improvements made to the handling of core metadata fields.
+
+Reload the citation.tsv file to handle the commons-lang3 change mentioned above.
+
+Expect the loading of the citation block to take several seconds because of its size (especially due to the number of languages).
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.8/scripts/api/data/metadatablocks/citation.tsv
+
+curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file citation.tsv
+```
diff --git a/doc/release-notes/11633-list-dataverse-links-api-change.md b/doc/release-notes/11633-list-dataverse-links-api-change.md
new file mode 100644
index 00000000000..9026349045b
--- /dev/null
+++ b/doc/release-notes/11633-list-dataverse-links-api-change.md
@@ -0,0 +1 @@
+The [API for listing the collections a dataverse has been linked to](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#list-dataverse-collection-links) (`api/dataverses/$dataverse-alias/links`) has been refactored to return a new Json format. This is a breaking API.
diff --git a/doc/release-notes/11634-get-dataset-file-available-categories-api.md b/doc/release-notes/11634-get-dataset-file-available-categories-api.md
new file mode 100644
index 00000000000..38fe61b8eed
--- /dev/null
+++ b/doc/release-notes/11634-get-dataset-file-available-categories-api.md
@@ -0,0 +1,4 @@
+### Get Dataset File Available Categories API
+
+- This  new endpoint allows the user to get all of the available file categories for a dataset, both built-in and custom.
+
diff --git a/doc/release-notes/11645-existing-oauth-external-users-api-auth.md b/doc/release-notes/11645-existing-oauth-external-users-api-auth.md
new file mode 100644
index 00000000000..4afc5a38fb2
--- /dev/null
+++ b/doc/release-notes/11645-existing-oauth-external-users-api-auth.md
@@ -0,0 +1,6 @@
+Implemented a new feature flag ``dataverse.feature.api-bearer-auth-use-oauth-user-on-id-match``, which supports the use of the new Dataverse client in instances that have historically allowed login via GitHub, ORCID, or Google. Specifically, with this flag enabled, when an OIDC bridge is configured to allow OIDC login with validation by the bridged OAuth providers, users with existing GitHub, ORCID, or Google accounts in Dataverse can log in to those accounts, thereby maintaining access to their existing content and retaining their roles.
+
+## New Settings
+
+- dataverse.feature.api-bearer-auth-use-oauth-user-on-id-match
+
diff --git a/doc/release-notes/11648-notifications-api-extension.md b/doc/release-notes/11648-notifications-api-extension.md
new file mode 100644
index 00000000000..ee5aa22863d
--- /dev/null
+++ b/doc/release-notes/11648-notifications-api-extension.md
@@ -0,0 +1,7 @@
+# getAllNotificationsForUser API extension
+
+- Extended endpoint getAllNotificationsForUser(``/notifications/all``), which now supports an optional query parameter ``inAppNotificationFormat`` which, if sent as ``true``, retrieves the fields needed to build the in-app notifications for the Notifications section of the Dataverse UI, omitting fields related to email notifications. See also #11648 and #11696.
+
+# Notifications triggered by API endpoints
+
+The addDataset and addDataverse API endpoints now trigger user notifications upon successful execution. See also #1342 and #11696.
diff --git a/doc/release-notes/11650-unread.md b/doc/release-notes/11650-unread.md
new file mode 100644
index 00000000000..07ab852e24d
--- /dev/null
+++ b/doc/release-notes/11650-unread.md
@@ -0,0 +1,11 @@
+## API Updates 
+
+### Support read/unread status for notifications
+
+The API for managing notifications has been extended. 
+
+- displayAsRead boolean added to "get all"
+- new GET unreadCount API endpoint
+- new PUT markAsRead API endpoint
+
+See also [the guides](https://dataverse-guide--11664.org.readthedocs.build/en/11664/api/native-api.html#notifications), #11650, and #11664.
diff --git a/doc/release-notes/11685-CurationStatus_fix.md b/doc/release-notes/11685-CurationStatus_fix.md
new file mode 100644
index 00000000000..18bb6c8ad1d
--- /dev/null
+++ b/doc/release-notes/11685-CurationStatus_fix.md
@@ -0,0 +1,6 @@
+The updates to support keeping the history of curation status labels added in #11268
+will incorrectly show curation statuses added prior to v6.7 as the current one, regardless of 
+whether newer statuses exist. This PR corrects the problem.
+
+(As a work-around for 6.7 admins can add createtime dates (must be prior to when 6.7 was installed) to the curationstatus table
+ for entries that have null createtimes. The code fix in this version properly handles null dates as indicating older/pre v6.7 curationstatuses.)
\ No newline at end of file
diff --git a/doc/release-notes/11689-builtin-users-api-bearer-auth-enhance.md b/doc/release-notes/11689-builtin-users-api-bearer-auth-enhance.md
new file mode 100644
index 00000000000..671a5225781
--- /dev/null
+++ b/doc/release-notes/11689-builtin-users-api-bearer-auth-enhance.md
@@ -0,0 +1,9 @@
+## Security improvements for `api-bearer-auth-use-builtin-user-on-id-match`
+
+We’ve strengthened the security of the `api-bearer-auth-use-builtin-user-on-id-match` feature flag. It will now only work when the provided bearer token includes an `idp` claim that matches the Keycloak Service Provider identifier.
+
+By enforcing this check, the risk of impersonation from other identity providers is significantly reduced, since they would need to be explicitly configured with this specific, non-standard identifier.
+
+See:
+- [#11622 (comment)](https://github.com/IQSS/dataverse/pull/11622#discussion_r2216017175)
+- [#11689](https://github.com/IQSS/dataverse/issues/11689)  
diff --git a/doc/release-notes/11722-configbaker-bc-missing.md b/doc/release-notes/11722-configbaker-bc-missing.md
new file mode 100644
index 00000000000..3a2074bbf44
--- /dev/null
+++ b/doc/release-notes/11722-configbaker-bc-missing.md
@@ -0,0 +1 @@
+When following the container demo tutorial, it was not possible to update Solr fields after adding additional metadata blocks. This has been fixed. See #11722 and #11723
diff --git a/doc/release-notes/11724-extend-list-dataverse-collection-links.md b/doc/release-notes/11724-extend-list-dataverse-collection-links.md
new file mode 100644
index 00000000000..9026349045b
--- /dev/null
+++ b/doc/release-notes/11724-extend-list-dataverse-collection-links.md
@@ -0,0 +1 @@
+The [API for listing the collections a dataverse has been linked to](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#list-dataverse-collection-links) (`api/dataverses/$dataverse-alias/links`) has been refactored to return a new Json format. This is a breaking API.
diff --git a/doc/release-notes/11776- index fix.md b/doc/release-notes/11776- index fix.md
new file mode 100644
index 00000000000..959b1ca3e95
--- /dev/null
+++ b/doc/release-notes/11776- index fix.md	
@@ -0,0 +1 @@
+A bug, introduced in v6.7, that caused files in draft versions that were added after the initial dataset version was published, has been fixed.
\ No newline at end of file
diff --git a/doc/release-notes/4.16-release-notes.md b/doc/release-notes/4.16-release-notes.md
index 66241a42777..8feb263d2ab 100644
--- a/doc/release-notes/4.16-release-notes.md
+++ b/doc/release-notes/4.16-release-notes.md
@@ -91,6 +91,7 @@ If this is a new installation, please see our <a href=http://guides.dataverse.or
 - &lt;glassfish install path&gt;/glassfish4/bin/asadmin deploy &lt;path&gt;dataverse-4.16.war
 
 4. Restart glassfish  
+
 5. Update Citation Metadata Block    
 
    `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`  
diff --git a/doc/release-notes/4.18-release-notes.md b/doc/release-notes/4.18-release-notes.md
new file mode 100644
index 00000000000..97ab25aa0fc
--- /dev/null
+++ b/doc/release-notes/4.18-release-notes.md
@@ -0,0 +1,122 @@
+# Dataverse 4.18
+
+**Note: There is an issue in 4.18 with the display of validation messages on the dataset page (#6380) and we recommend using 4.18.1 for any production environments.**
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### File Page Previews and Previewers
+
+File-level External Tools can now be configured to display in a "Preview Mode" designed for embedding within the file landing page.
+
+While not technically part of this release, previewers have been made available for several common file types. The previewers support for spreadsheet, image, text, document, audio, video, html files and more. These previewers can be found in the <a href="https://github.com/QualitativeDataRepository/dataverse-previewers">Qualitative Data Repository Github Repository</a>. The spreadsheet viewer was contributed by the [Dataverse SSHOC][] project.
+
+[Dataverse SSHOC]: https://www.sshopencloud.eu/news/developing-sshoc-dataverse
+
+### Microsoft Login
+
+Users can now create Dataverse accounts and login using self-provisioned Microsoft accounts such as live.com and outlook.com. Users can also use Microsoft accounts managed by their institutions. This new feature not only makes it easier to log in to Dataverse but will also streamline the interaction between any external tools that utilize Azure services that require login.
+
+### Add Data and Host Dataverse
+
+More workflows to add data have been added across the UI, including a new button on the My Data tab of the Account page, as well as a link in the Dataverse navbar, which will display on every page. This will provider users much easier access to start depositing data. By default, the Host Dataverse will be the installation root dataverse for these new Add Data workflows, but there is now a dropdown component allowing creators to select a dataverse you have proper permissions to create a new dataverse or dataset in.
+
+### Primefaces 7
+
+Primefaces, the open source UI framework upon which the Dataverse front end is built, has been updated to the most recent version. This provides security updates and bug fixes and will also allow Dataverse developers to take advantage of new features and enhancements.
+
+### Integration Test Pipeline and Test Health Reporting
+
+As part of the Dataverse Community's ongoing efforts to provide more robust automated testing infrastructure, and in support of the project's desire to have the develop branch constantly in a "release ready" state, API-based integration tests are now run every time a branch is merged to develop. The status of the last test run is available as a badge at the bottom of the README.md file that serves as the homepage of Dataverse Github Repository.
+
+### Make Data Count Metrics Updates
+
+A new configuration option has been added that allows Make Data Count metrics to be collected, but not reflected in the front end. This option was designed to allow installations to collect and verify metrics for a period before turning on the display to users.
+
+### Search API Enhancements
+
+The Dataverse Search API will now display unpublished content when an API token is passed (and appropriate permissions exist).
+
+### Additional Dataset Author Identifiers
+
+The following dataset author identifiers are now supported:
+
+- DAI: https://en.wikipedia.org/wiki/Digital_Author_Identifier
+- ResearcherID: http://researcherid.com
+- ScopusID: https://www.scopus.com
+
+## Major Use Cases
+
+Newly-supported use cases in this release include:
+
+- Users can view previews of several common file types, eliminating the need to download or explore a file just to get a quick look.
+- Users can log in using self-provisioned Microsoft accounts and also can log in using Microsoft accounts managed by an organization.
+- Dataverse administrators can now revoke and regenerate API tokens with an API call.
+- Users will receive notifications when their ingests complete, and will be informed if the ingest was a success or failure.
+- Dataverse developers will receive feedback about the health of the develop branch after their pull request was merged.
+- Dataverse tool developers will be able to query the Dataverse API for unpublished data as well as published data.
+- Dataverse administrators will be able to collect Make Data Count metrics without turning on the display for users.
+- Users with a DAI, ResearcherID, or ScopusID and use these author identifiers in their datasets.
+
+## Notes for Dataverse Installation Administrators
+
+### API Token Management
+
+- You can now delete a user's API token, recreate a user's API token, and find a token's expiration date. See the <a href="http://guides.dataverse.org/en/4.18/api/native-api.html">Native API guide</a> for more information.
+
+### New JVM Options
+
+[:mdcbaseurlstring](http://guides.dataverse.org/en/4.18/installation/config.html#mdcbaseurlstring) allows dataverse administrators to use a test base URL for Make Data Count.
+
+### New Database Settings
+
+[:DisplayMDCMetrics](http://guides.dataverse.org/en/4.18/installation/config.html#DisplayMDCMetrics) can be set to false to disable display of MDC metrics.
+
+## Notes for Tool Developers and Integrators
+
+### Preview Mode
+
+Tool Developers can now add the `hasPreviewMode` parameter to their file level external tools. This setting provides an embedded, simplified view of the tool on the file pages for any installation that installs the tool. See <a href="http://guides.dataverse.org/en/4.18/api/external-tools.html">Building External Tools</a> for more information.
+
+### API Token Management
+
+If your tool writes content back to Dataverse, you can now take advantage of administrative endpoints that delete and re-create API tokens. You can also use an endpoint that provides the expiration date of a specific API token. See the <a href="http://guides.dataverse.org/en/4.18/api/native-api.html">Native API guide</a> for more information.
+
+### View Unpublished Data Using Search API
+
+If you pass a token, the search API output will include unpublished content.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the <a href="https://github.com/IQSS/dataverse/milestone/85?closed=1">4.18 milestone</a> in Github.
+
+For help with upgrading, installing, or general questions please post to the <a href="https://groups.google.com/forum/#!forum/dataverse-community">Dataverse Google Group</a> or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our <a href="http://guides.dataverse.org/en/4.18/installation/">Installation Guide</a>.
+
+## Upgrade
+
+1. Undeploy the previous version.
+
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin list-applications
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin undeploy dataverse
+
+2. Stop glassfish and remove the generated directory, start.
+
+- service glassfish stop
+- remove the generated directory: rm -rf &lt;glassfish install path&gt;glassfish4/glassfish/domains/domain1/generated
+- service glassfish start
+
+3. Deploy this version.
+
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin deploy &lt;path&gt;dataverse-4.18.war
+
+4. Restart glassfish.
+
+5. Update Citation Metadata Block
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v4.18/citation.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`
diff --git a/doc/release-notes/4.18.1-release-notes.md b/doc/release-notes/4.18.1-release-notes.md
new file mode 100644
index 00000000000..99db66464a8
--- /dev/null
+++ b/doc/release-notes/4.18.1-release-notes.md
@@ -0,0 +1,45 @@
+# Dataverse 4.18.1
+
+This release provides a fix for a regression introduced in 4.18 and implements a few other small changes.  
+
+## Release Highlights
+
+### Proper Validation Messages
+
+When creating or editing dataset metadata, users were not receiving field-level indications about what entries failed validation and were only receiving a message at the top of the page. This fix restores field-level indications.
+
+## Major Use Cases
+
+Use cases in this release include:
+
+- Users will receive the proper messaging when dataset metadata entries are not valid.
+- Users can now view the expiration date of an API token and revoke a token on the API Token tab of the account page.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the <a href="https://github.com/IQSS/dataverse/milestone/86?closed=1">4.18.1 milestone</a> in Github.
+
+For help with upgrading, installing, or general questions please post to the <a href="https://groups.google.com/forum/#!forum/dataverse-community">Dataverse Google Group</a> or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our <a href="http://guides.dataverse.org/en/4.18.1/installation/">Installation Guide</a>.
+
+## Upgrade
+
+1. Undeploy the previous version.
+
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin list-applications
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin undeploy dataverse
+
+2. Stop glassfish and remove the generated directory, start.
+
+- service glassfish stop
+- remove the generated directory: rm -rf &lt;glassfish install path&gt;glassfish4/glassfish/domains/domain1/generated
+- service glassfish start
+
+3. Deploy this version.
+
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin deploy &lt;path&gt;dataverse-4.18.1.war
+
+4. Restart glassfish.
diff --git a/doc/release-notes/4.19-release-notes.md b/doc/release-notes/4.19-release-notes.md
new file mode 100644
index 00000000000..70c8711582c
--- /dev/null
+++ b/doc/release-notes/4.19-release-notes.md
@@ -0,0 +1,125 @@
+# Dataverse 4.19
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Open ID Connect Support
+
+Dataverse now provides basic support for any OpenID Connect (OIDC) compliant authentication provider.
+
+Prior to supporting this standard, new authentication methods needed to be added by pull request. OIDC support provides a standardized way for authentication, sharing user information, and more. You are able to use any compliant provider just by loading a configuration file, without touching the codebase. While the usual prominent providers like Google and others feature OIDC support there are plenty of other options to easily attach your installation to a custom authentication provider, using enterprise grade software. 
+
+See the [OpenID Connect Login Options documentation](http://guides.dataverse.org/en/4.19/installation/oidc.html) in the Installation Guide for more details.
+
+This is to be extended with support for attribute mapping, group syncing and more in future versions of the code.  
+
+### Python Installer
+
+We are introducing a new installer script, written in Python. It is intended to eventually replace the old installer (written in Perl). For now it is being offered as an (experimental) alternative.
+
+See [README_python.txt](https://github.com/IQSS/dataverse/blob/v4.19/scripts/installer/README_python.txt) in scripts/installer and/or in the installer bundle for more information.
+
+## Major Use Cases
+
+Newly-supported use cases in this release include:
+
+- Dataverse installation administrators will be able to experiment with a Python Installer (Issue #3937, PR #6484)
+- Dataverse installation administrators will be able to set up an OIDC-compliant login options by editing a configuration file and with no need for a code change (Issue #6432, PR #6433)
+- Following setup by a Dataverse administration, users will be able to log in using OIDC-compliant methods (Issue #6432, PR #6433)
+- Users of the Search API will see additional fields in the JSON output (Issues #6300, #6396, PR #6441)
+- Users loading the support form will now be presented with the math challenge as expected and will be able to successfully send an email to support (Issue #6307, PR #6462)
+- Users of https://mybinder.org can now spin up Jupyter Notebooks and other computational environments from Dataverse DOIs (Issue #4714, PR #6453)
+
+## Notes for Dataverse Installation Administrators
+
+### Security vulnerability in Solr
+
+A serious security issue has recently been identified in multiple versions of Solr search engine, including v.7.3 that Dataverse is currently using. Follow the instructions below to verify that your installation is safe from a potential attack. You can also consult the following link for a detailed description of the issue:
+
+<A HREF="https://github.com/veracode-research/solr-injection#7-cve-2019-xxxx-rce-via-velocity-template-by-_s00py">RCE in Solr via Velocity Template</A>.
+
+The vulnerability allows an intruder to execute arbitrary code on the system running Solr. Fortunately, it can only be exploited if Solr API access point is open to direct access from public networks (aka, "the outside world"), which is NOT needed in a Dataverse installation.
+
+We have always recommended having Solr (port 8983) firewalled off from public access in our installation guides. But we recommend that you double-check your firewall settings and verify that the port is not accessible from outside networks. The simplest quick test is to try the following URL in your browser:
+
+      `http://<your Solr server address>:8983`
+
+and confirm that you get "access denied" or that it times out, etc. 
+
+In most cases, when Solr runs on the same server as the Dataverse web application, you will only want the port accessible from localhost. We also recommend that you add the following arguments to the Solr startup command: `-j jetty.host=127.0.0.1`. This will make Solr accept connections from localhost only; adding redundancy, in case of the firewall failure.
+
+In a case where Solr needs to run on a different host, make sure that the firewall limits access to the port only to the Dataverse web host(s), by specific ip address(es).
+ 
+We would also like to reiterate that it is simply never a good idea to run Solr as root! Running the process as a non-privileged user would substantially minimize any potential damage even in the event that the instance is compromised.
+
+### Citation and Geospatial Metadata Block Updates
+
+We updated two metadata blocks in this release. Updating these metadata blocks is mentioned in the step-by-step upgrade instructions below. 
+
+### Run ReExportall
+
+We made changes to the JSON Export in this release (#6246). If you'd like these changes to reflected in your JSON exports, you should run ReExportall as part of the upgrade process. We've included this in the step-by-step instructions below.
+
+### BinderHub
+
+https://mybinder.org now supports spinning up Jupyter Notebooks and other computational environments from Dataverse DOIs.
+
+### Widgets update for OpenScholar
+
+We updated the code for widgets so that they will keep working in OpenScholar sites after the upcoming upgrade OpenScholar upgrade to Drupal 8. If users of your dataverse have embedded widgets on an Openscholar site that upgrades to Drupal 8, you will need to run this Dataverse version (or later) for the widgets to keep working.
+
+### Payara tech preview
+
+Dataverse 4 has always run on Glassfish 4.1 but changes in this release (PR #6523) should open the door to upgrading to Payara 5 eventually. Production installations of Dataverse should remain on Glassfish 4.1 but feedback from any experiments running Dataverse on Payara 5 is welcome via the [usual channels](https://dataverse.org/contact).
+
+## Notes for Tool Developers and Integrators
+
+### Search API
+
+The boolean parameter `query_entities` has been removed from the Search API. The former "true" behavior of "whether entities are queried via direct database calls (for developer use)" is now always true.
+
+Additional fields are now available via the Search API, mostly related to information about specific dataset versions.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the <a href="https://github.com/IQSS/dataverse/milestone/87?closed=1">4.19 milestone</a> in Github.
+
+For help with upgrading, installing, or general questions please post to the <a href="https://groups.google.com/forum/#!forum/dataverse-community">Dataverse Google Group</a> or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our <a href="http://guides.dataverse.org/en/4.19/installation/">Installation Guide</a>.
+
+## Upgrade
+
+1. Undeploy the previous version.
+
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin list-applications
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin undeploy dataverse
+
+2. Stop glassfish and remove the generated directory, start.
+
+- service glassfish stop
+- remove the generated directory: rm -rf &lt;glassfish install path&gt;glassfish4/glassfish/domains/domain1/generated
+- service glassfish start
+
+3. Deploy this version.
+
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin deploy &lt;path&gt;dataverse-4.19.war
+
+4. Restart glassfish.
+
+5. Update Citation Metadata Block
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v4.19/citation.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`
+
+6. Update Geospatial Metadata Block
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v4.19/geospatial.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @geospatial.tsv -H "Content-type: text/tab-separated-values"`
+
+7. (Optional) Run ReExportall to update JSON Exports  
+
+   <http://guides.dataverse.org/en/4.19/admin/metadataexport.html?highlight=export#batch-exports-through-the-api>
diff --git a/doc/release-notes/4.20-release-notes.md b/doc/release-notes/4.20-release-notes.md
new file mode 100644
index 00000000000..e29953db101
--- /dev/null
+++ b/doc/release-notes/4.20-release-notes.md
@@ -0,0 +1,224 @@
+# Dataverse 4.20
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Multiple Store Support
+
+Dataverse can now be configured to store files in more than one place at the same time (multiple file, s3, and/or swift stores). 
+
+General information about this capability can be found below and in the <a href="http://guides.dataverse.org/en/4.20/installation/config.html">Configuration Guide</a> - File Storage section.
+
+### S3 Direct Upload support
+
+S3 stores can now optionally be configured to support direct upload of files, as one option for supporting upload of larger files. In the current implementation, each file is uploaded in a single HTTP call. For AWS, this limits file size to 5 GB. With Minio the theoretical limit should be 5 TB and 50+ GB file uploads have been tested successfully. (In practice other factors such as network timeouts may prevent a successful upload a multi-TB file and minio instances may be configured with a < 5 TB single HTTP call limit.) No other S3 service providers have been tested yet. Their limits should be the lower of the maximum object size allowed and any single HTTP call upload limit. 
+
+General information about this capability can be found in the <a href="http://guides.dataverse.org/en/4.20/developers/big-data-support.html">Big Data Support Guide</a> with specific information about how to enable it in the <a href="http://guides.dataverse.org/en/4.20/installation/config.html">Configuration Guide</a> - File Storage section.
+
+To support large data uploads, installations can now configure direct upload to S3, bypassing the application server. This will allow for larger uploads over a more resilient transfer method. 
+
+General information about this capability can be found below and in the <a href="http://guides.dataverse.org/en/4.20/installation/config.html">Configuration Guide</a>.
+
+### Integration Test Coverage Reporting
+
+The percentage of code covered by the API-based integration tests is now shown on a badge at the bottom of the README.md file that serves as the homepage of Dataverse Github Repository.
+
+### New APIs
+
+New APIs for Role Management and Dataset Size have been added. Previously, managing roles at the dataset and file level was only possible through the UI. API users can now also retrieve the size of a dataset through an API call, with specific parameters depending on the type of information needed. 
+
+More information can be found in the <a href="http://guides.dataverse.org/en/4.20/api">API Guide</a>.
+
+## Major Use Cases
+
+Newly-supported use cases in this release include:
+
+- Users will now be able to see the number of linked datasets and dataverses accurately reflected in the facet counts on the Dataverse search page. (Issue #6564, PR #6262)
+- Users will be able to upload large files directly to S3. (Issue #6489, PR #6490)
+- Users will be able to see the PIDs of datasets and files in the Guestbook export. (Issue #6534, PR #6628)
+- Administrators will be able to configure multiple stores per Dataverse installation, which allow dataverse-level setting of storage location, upload size limits, and supported data transfer methods (Issue #6485, PR #6488)
+- Administrators and integrators will be able to manage roles using a new API. (Issue #6290, PR #6622)
+- Administrators and integrators will be able to determine a dataset's size. (Issue #6524, PR #6609) 
+- Integrators will now be able to retrieve the number of files in a dataset as part of a single API call instead of needing to count the number of files in the response. (Issue #6601, PR #6623)
+
+## Notes for Dataverse Installation Administrators
+
+### Potential Data Integrity Issue
+
+We recently discovered a *potential* data integrity issue in Dataverse databases.  One manifests itself as duplicate DataFile objects created for the same uploaded file (https://github.com/IQSS/dataverse/issues/6522); the other as duplicate DataTable (tabular metadata) objects linked to the same DataFile (https://github.com/IQSS/dataverse/issues/6510). This issue impacted approximately .03% of datasets in Harvard's Dataverse.  
+
+To see if any datasets in your installation have been impacted by this data integrity issue, we've provided a diagnostic script here:
+
+https://github.com/IQSS/dataverse/raw/develop/scripts/issues/6510/check_datafiles_6522_6510.sh
+
+The script relies on the PostgreSQL utility psql to access the database. You will need to edit the credentials at the top of the script to match your database configuration.
+
+If neither of the two issues is present in your database, you will see a message "... no duplicate DataFile objects in your database" and "no tabular files affected by this issue in your database".
+
+If either, or both kinds of duplicates are detected, the script will provide further instructions. We will need you to send us the produced output. We will then assist you in resolving the issues in your database.
+
+### Multiple Store Support Changes
+
+**Existing installations will need to make configuration changes to adopt this version, regardless of whether additional stores are to be added or not.**
+
+Multistore support requires that each store be assigned a label, id, and type - see the <a href="http://guides.dataverse.org/en/4.20/installation/config.html">Configuration Guide</a> for a more complete explanation. For an existing store, the recommended upgrade path is to assign the store id based on it's type, i.e. a 'file' store would get id 'file', an 's3' store would have the id 's3'. 
+
+With this choice, no manual changes to datafile 'storageidentifier' entries are needed in the database. If you do not name your existing store using this convention, you will need to edit the database to maintain access to existing files.
+
+The following set of commands to change the Glassfish JVM options will adapt an existing file or s3 store for this upgrade:
+For a file store:
+
+    ./asadmin create-jvm-options "\-Ddataverse.files.file.type=file"
+    ./asadmin create-jvm-options "\-Ddataverse.files.file.label=file"
+    ./asadmin create-jvm-options "\-Ddataverse.files.file.directory=<your directory>"
+    
+For a s3 store:
+
+    ./asadmin create-jvm-options "\-Ddataverse.files.s3.type=s3"
+    ./asadmin create-jvm-options "\-Ddataverse.files.s3.label=s3"
+    ./asadmin delete-jvm-options "-Ddataverse.files.s3-bucket-name=<your_bucket_name>"
+    ./asadmin create-jvm-options "-Ddataverse.files.s3.bucket-name=<your_bucket_name>"
+    
+Any additional S3 options you have set will need to be replaced as well, following the pattern in the last two lines above - delete the option including a '-' after 's3' and creating the same option with the '-' replaced by a '.', using the same value you currently have configured.  
+
+Once these options are set, restarting the Glassfish service is all that is needed to complete the change.  
+
+Note that the "\-Ddataverse.files.directory", if defined, continues to control where temporary files are stored (in the /temp subdir of that directory), independent of the location of any 'file' store defined above.
+
+Also note that the :MaxFileUploadSizeInBytes property has a new option to provide independent limits for each store instead of a single value for the whole installation. The default is to apply any existing limit defined by this property to all stores.
+
+### Direct S3 Upload Changes
+
+Direct upload to S3 is enabled per store by one new jvm option:
+
+    ./asadmin create-jvm-options "\-Ddataverse.files.<id>.upload-redirect=true"
+    
+The existing :MaxFileUploadSizeInBytes property and ```dataverse.files.<id>.url-expiration-minutes``` jvm option for the same store also apply to direct upload.
+
+Direct upload via the Dataverse web interface is transparent to the user and handled automatically by the browser. Some minor differences in file upload exist: directly uploaded files are not unzipped and Dataverse does not scan their content to help in assigning a MIME type. Ingest of tabular files and metadata extraction from FITS files will occur, but can be turned off for files above a specified size limit through the new dataverse.files.<id>.ingestsizelimit jvm option.
+
+API calls to support direct upload also exist, and, if direct upload is enabled for a store in Dataverse, the latest DVUploader (v1.0.8) provides a'-directupload' flag that enables its use.
+
+### Solr Update
+
+With this release we upgrade to the latest available stable release in the Solr 7.x branch. We recommend a fresh installation of Solr 7.7.2 (the index will be empty)
+followed by an "index all".
+
+Before you start the "index all", Dataverse will appear to be empty because
+the search results come from Solr. As indexing progresses, results will appear
+until indexing is complete.
+
+### Dataverse Linking Fix
+
+The fix implemented for #6262 will display the datasets contained in linked dataverses in the linking dataverse. The full reindex described above will correct these counts. Going forward, this will happen automatically whenever a dataverse is linked. 
+
+### Google Analytics Download Tracking Bug
+
+The button tracking capability discussed in the installation guide (http://guides.dataverse.org/en/4.20/installation/config.html#id88) relies on an analytics-code.html file that must be configured using the :WebAnalyticsCode setting. The example file provided in the installation guide is no longer compatible with recent Dataverse releases (>v4.16). Installations using this feature should update their analytics-code.html file by following the installation instructions using the updated example file. Alternately, sites can modify their existing files to include the one-line change made in the example file at line 120.
+
+### Run ReExportall
+
+We made changes to the JSON Export in this release (Issue 6650, PR #6669). If you'd like these changes to reflected in your JSON exports, you should run ReExportall as part of the upgrade process. We've included this in the step-by-step instructions below.
+
+### New JVM Options and Database Settings
+
+## New JVM Options for file storage drivers
+
+- The JVM option dataverse.files.file.directory=<your directory> controls where temporary files are stored (in the /temp subdir of the defined directory), independent of the location of any 'file' store defined above.
+- The JVM option dataverse.files.<id>.upload-redirect enables direct upload of files added to a dataset to the S3 bucket. (S3 stores only!)
+- The JVM option dataverse.files.<id>.MaxFileUploadSizeInBytes controls the maximum size of file uploads allowed for the given file store. 
+- The JVM option dataverse.files.<id>.ingestsizelimit controls the maximum size of files for which ingest will be attempted, for the given file store. 
+
+## New Database Settings for Shibboleth
+
+- The database setting :ShibAffiliationAttribute can now be set to prevent affiliations for Shibboleth users from being reset upon each log in.
+
+## Notes for Tool Developers and Integrators
+
+### Integration Test Coverage Reporting
+
+API-based integration tests are run every time a branch is merged to develop and the percentage of code covered by these integration tests is now shown on a badge at the bottom of the README.md file that serves as the homepage of Dataverse Github Repository.
+
+### Guestbook Column Changes
+
+Users of downloaded guestbooks should note that two new columns have been added:
+
+- Dataset PID
+- File PID
+
+If you are expecting column in the CSV file to be in a particular order, you will need to make adjustments. 
+
+Old columns: Guestbook, Dataset, Date, Type, File Name, File Id, User Name, Email, Institution, Position, Custom Questions
+
+New columns: Guestbook, Dataset, Dataset PID, Date, Type, File Name, File Id, File PID, User Name, Email, Institution, Position, Custom Questions
+
+### API Changes
+
+As reported in #6570, the affiliation for dataset contacts has been wrapped in parentheses in the JSON output from the Search API. These parentheses have now been removed. This is a backward incompatible change but it's expected that this will not cause issues for integrators.
+
+### Role Name Change
+
+The role alias provided in API responses has changed, so if anything was hard-coded to "editor" instead of "contributor" it will need to be updated. 
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the <a href="https://github.com/IQSS/dataverse/milestone/88?closed=1">4.20 milestone</a> in Github.
+
+For help with upgrading, installing, or general questions please post to the <a href="https://groups.google.com/forum/#!forum/dataverse-community">Dataverse Google Group</a> or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our <a href="http://guides.dataverse.org/en/4.20/installation/">Installation Guide</a>.
+
+## Upgrade
+
+1. Undeploy the previous version.
+
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin list-applications
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin undeploy dataverse
+
+2. Stop glassfish and remove the generated directory, start.
+
+- service glassfish stop
+- remove the generated directory: rm -rf &lt;glassfish install path&gt;glassfish4/glassfish/domains/domain1/generated
+- service glassfish start
+
+3. Install and configure Solr v7.7.2
+
+See http://guides.dataverse.org/en/4.20/installation/prerequisites.html#installing-solr
+
+4. Deploy this version.
+
+- &lt;glassfish install path&gt;/glassfish4/bin/asadmin deploy &lt;path&gt;dataverse-4.20.war
+
+5. The following set of commands to change the Glassfish JVM options will adapt an existing file or s3 store for this upgrade:
+For a file store:
+
+    ./asadmin create-jvm-options "\-Ddataverse.files.file.type=file"
+    ./asadmin create-jvm-options "\-Ddataverse.files.file.label=file"
+    ./asadmin create-jvm-options "\-Ddataverse.files.file.directory=<your directory>"
+    
+For a s3 store:
+
+    ./asadmin create-jvm-options "\-Ddataverse.files.s3.type=s3"
+    ./asadmin create-jvm-options "\-Ddataverse.files.s3.label=s3"
+    ./asadmin delete-jvm-options "-Ddataverse.files.s3-bucket-name=<your_bucket_name>"
+    ./asadmin create-jvm-options "-Ddataverse.files.s3.bucket-name=<your_bucket_name>"
+    
+Any additional S3 options you have set will need to be replaced as well, following the pattern in the last two lines above - delete the option including a '-' after 's3' and creating the same option with the '-' replaced by a '.', using the same value you currently have configured.
+
+6. Restart glassfish.
+
+7. Update Citation Metadata Block
+
+- `wget https://github.com/IQSS/dataverse/releases/download/4.20/citation.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`
+
+8. Kick off full reindex
+
+http://guides.dataverse.org/en/4.20/admin/solr-search-index.html
+
+9. (Recommended) Run ReExportall to update JSON Exports  
+
+   <http://guides.dataverse.org/en/4.20/admin/metadataexport.html?highlight=export#batch-exports-through-the-api>
diff --git a/doc/release-notes/5.0-release-notes.md b/doc/release-notes/5.0-release-notes.md
new file mode 100644
index 00000000000..f87d428f30a
--- /dev/null
+++ b/doc/release-notes/5.0-release-notes.md
@@ -0,0 +1,353 @@
+# Dataverse 5.0
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+Please note that this is a major release and these are long release notes. We offer no apologies. :)
+
+## Release Highlights
+
+### Continued Dataset and File Redesign: Dataset and File Button Redesign, Responsive Layout
+
+The buttons available on the Dataset and File pages have been redesigned. This change is to provide more scalability for future expanded options for data access and exploration, and to provide a consistent experience between the two pages. The dataset and file pages have also been redesigned to be more responsive and function better across multiple devices.
+
+This is an important step in the incremental process of the Dataset and File Redesign project, following the release of on-page previews, filtering and sorting options, tree view, and other enhancements. Additional features in support of these redesign efforts will follow in later 5.x releases.
+
+### Payara 5
+
+A major upgrade of the application server provides security updates, access to new features like MicroProfile Config API, and will enable upgrades to other core technologies.
+
+Note that moving from Glassfish to Payara will be required as part of the move to Dataverse 5.
+
+### Download Dataset
+
+Users can now more easily download all files in Dataset through both the UI and API. If this causes server instability, it's suggested that Dataverse Installation Administrators take advantage of the new Standalone Zipper Service described below.
+
+#### Download All Option on the Dataset Page
+
+In previous versions of Dataverse, downloading all files from a dataset meant several clicks to select files and initiate the download. The Dataset Page now includes a Download All option for both the original and archival formats of the files in a dataset under the "Access Dataset" button.
+
+#### Download All Files in a Dataset by API
+
+In previous versions of Dataverse, downloading all files from a dataset via API was a two step process:
+
+- Find all the database ids of the files.
+- Download all the files, using those ids (comma-separated).
+
+Now you can download all files from a dataset (assuming you have access to them) via API by passing the dataset persistent ID (PID such as DOI or Handle) or the dataset's database id. Versions are also supported, and you can pass :draft, :latest, :latest-published, or numbers (1.1, 2.0) similar to the "download metadata" API.
+
+### A Multi-File, Zipped Download Optimization
+
+In this release we are offering an experimental optimization for the multi-file, download-as-zip functionality. If this option is enabled, instead of enforcing size limits, we attempt to serve all the files that the user requested (that they are authorized to download), but the request is redirected to a standalone zipper service running as a cgi executable. Thus moving these potentially long-running jobs completely outside the Application Server (Payara); and preventing service threads from becoming locked serving them. Since zipping is also a CPU-intensive task, it is possible to have this service running on a different host system, thus freeing the cycles on the main Application Server. The system running the service needs to have access to the database as well as to the storage filesystem, and/or S3 bucket.
+
+Please consult the scripts/zipdownload/README.md in the Dataverse 5 source tree.
+
+The components of the standalone "zipper tool" can also be downloaded
+here:
+
+https://github.com/IQSS/dataverse/releases/download/v5.0/zipper.zip
+
+### Updated File Handling
+
+Files without extensions can now be uploaded through the UI. This release also changes the way Dataverse handles duplicate (filename or checksum) files in a dataset. Specifically:
+
+- Files with the same checksum can be included in a dataset, even if the files are in the same directory.
+- Files with the same filename can be included in a dataset as long as the files are in different directories.
+- If a user uploads a file to a directory where a file already exists with that directory/filename combination, Dataverse will adjust the file path and names by adding "-1" or "-2" as applicable. This change will be visible in the list of files being uploaded.
+- If the directory or name of an existing or newly uploaded file is edited in such a way that would create a directory/filename combination that already exists, Dataverse will display an error.
+- If a user attempts to replace a file with another file that has the same checksum, an error message will be displayed and the file will not be able to be replaced.
+- If a user attempts to replace a file with a file that has the same checksum as a different file in the dataset, a warning will be displayed.
+- Files without extensions can now be uploaded through the UI.
+
+### Pre-Publish DOI Reservation with DataCite
+
+Dataverse installations using DataCite will be able to reserve the persistent identifiers for datasets with DataCite ahead of publishing time. This allows the DOI to be reserved earlier in the data sharing process and makes the step of publishing datasets simpler and less error-prone.
+
+### Primefaces 8
+
+Primefaces, the open source UI framework upon which the Dataverse front end is built, has been updated to the most recent version. This provides security updates and bug fixes and will also allow Dataverse developers to take advantage of new features and enhancements.
+
+## Major Use Cases
+
+Newly-supported use cases in this release include:
+
+- Users will be presented with a new workflow around dataset and file access and exploration. (Issue #6684, PR #6909)
+- Users will experience a UI appropriate across a variety of device sizes. (Issue #6684, PR #6909)
+- Users will be able to download an entire dataset without needing to select all the files in that dataset. (Issue #6564, PR #6262)
+- Users will be able to download all files in a dataset with a single API call. (Issue #4529, PR #7086)
+- Users will have DOIs reserved for their datasets upon dataset create instead of at publish time. (Issue #5093, PR #6901)
+- Users will be able to upload files without extensions. (Issue #6634, PR #6804)
+- Users will be able to upload files with the same name in a dataset, as long as a those files are in different file paths. (Issue #4813, PR #6924)
+- Users will be able to upload files with the same checksum in a dataset. (Issue #4813, PR #6924)
+- Users will be less likely to encounter locks during the publishing process due to PID providers being unavailable. (Issue #6918, PR #7118)
+- Users will now have their files validated during publish, and in the unlikely event that anything has happened to the files between deposit and publish, they will be able to take corrective action. (Issue #6558, PR #6790)
+- Administrators will likely see more success with Harvesting, as many minor harvesting issues have been resolved. (Issues #7127, #7128, #4597, #7056, #7052, #7023, #7009, and #7003)
+- Administrators can now enable an external zip service that frees up application server resources and allows the zip download limit to be increased. (Issue #6505, PR #6986)
+- Administrators can now create groups based on users' email domains. (Issue #6936, PR #6974)
+- Administrators can now set date facets to be organized chronologically. (Issue #4977, PR #6958)
+- Administrators can now link harvested datasets using an API. (Issue #5886, PR #6935)
+- Administrators can now destroy datasets with mapped shapefiles. (Issue #4093, PR #6860)
+
+## Notes for Dataverse Installation Administrators
+
+### Glassfish to Payara
+
+This upgrade requires a few extra steps. See the detailed upgrade instructions below.
+
+### Dataverse Installations Using DataCite: Upgrade Action Required
+
+If you are using DataCite as your DOI provider you must add a new JVM option called "doi.dataciterestapiurlstring" with a value of "https://api.datacite.org" for production environments and "https://api.test.datacite.org" for test environments. More information about this JVM option can be found in the [Installation Guide](http://guides.dataverse.org/en/5.0/installation/).
+
+"doi.mdcbaseurlstring" should be deleted if it was previously set.
+
+### Dataverse Installations Using DataCite: Upgrade Action Recommended
+
+For installations that are using DataCite, Dataverse v5.0 introduces a change in the process of registering the Persistent Identifier (DOI) for a dataset. Instead of registering it when the dataset is published for the first time, Dataverse will try to "reserve" the DOI when it's created (by registering it as a "draft", using DataCite terminology). When the user publishes the dataset, the DOI will be publicized as well (by switching the registration status to "findable"). This approach makes the process of publishing datasets simpler and less error-prone.
+
+New APIs have been provided for finding any unreserved DataCite-issued DOIs in your Dataverse, and for reserving them (see below). While not required - the user can still attempt to publish a dataset with an unreserved DOI - having all the identifiers reserved ahead of time is recommended. If you are upgrading an installation that uses DataCite, we specifically recommend that you reserve the DOIs for all your pre-existing unpublished drafts as soon as Dataverse v5.0 is deployed, since none of them were registered at create time. This can be done using the following API calls:  
+
+- `/api/pids/unreserved`  will report the ids of the datasets
+- `/api/pids/:persistentId/reserve` reserves the assigned DOI with DataCite (will need to be run on every id reported by the the first API).
+
+See the [Native API Guide](http://guides.dataverse.org/en/5.0/api/native-api.html) for more information.
+
+Scripted, the whole process would look as follows (adjust as needed):
+
+```
+   API_TOKEN='xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+
+   curl -s -H "X-Dataverse-key:$API_TOKEN" http://localhost:8080/api/pids/unreserved |
+   # the API outputs JSON; note the use of jq to parse it:
+   jq '.data.count[].pid' | tr -d '"' | 
+   while read doi
+   do
+      curl -s -H "X-Dataverse-key:$API_TOKEN" -X POST http://localhost:8080/api/pids/:persistentId/reserve?persistentId=$doi
+   done
+```
+
+Going forward, once all the DOIs have been reserved for the legacy drafts, you may still get an occasional dataset with an unreserved identifier. DataCite service instability would be a potential cause. There is no reason to expect that to happen often, but it is not impossible. You may consider running the script above (perhaps with some extra diagnostics added) regularly, from a cron job or otherwise, to address this preemptively.
+
+### Terms of Use Display Updates
+
+In this release we’ve fixed an issue that would cause the Application Terms of Use to not display when the user's language is set to a language that does not match one of the languages for which terms were created and registered for that Dataverse installation. Instead of the expected Terms of Use, users signing up could receive the “There are no Terms of Use for this Dataverse installation” message. This could potentially result in some users signing up for an account without having the proper Terms of Use displayed. This will only affect installations that use the :ApplicationTermsOfUse setting.
+
+Please note that there is not currently a native workflow in Dataverse to display updated Terms of Use to a user or to force re-agreement. This would only potentially affect users that have signed up since the upgrade to 4.17 (or a following release if 4.17 was skipped).
+
+### Datafiles Validation when Publishing Datasets
+
+When a user requests to publish a dataset, Dataverse will now attempt to validate the physical files in the dataset, by recalculating the checksums and verifying them against the values in the database. The goal is to prevent any corrupted files in published datasets. Most of all the instances of actual damage to physical files that we've seen in the past happened while the datafiles were still in the Draft state. (Physical files become essentially read-only once published). So this is the logical place to catch any such issues.
+
+If any files in the dataset fail the validation, the dataset does not get published, and the user is notified that they need to contact their Dataverse support in order to address the issue before another attempt to publish can be made. See the "Troubleshooting" section of the Guide on how to fix such problems.
+
+This validation will be performed asynchronously, the same way as the registration of the file-level persistent ids. Similarly to the file PID registration, this validation process can be disabled on your system, with the setting `:FileValidationOnPublishEnabled`. (A Dataverse admin may choose to disable it if, for example, they are already running an external auditing system to monitor the integrity of the files in their Dataverse, and would prefer the publishing process to take less time). See the Configuration section of the [Installation Guide](http://guides.dataverse.org/en/5.0/installation/config.rst).
+
+Please note that we are not aware of any bugs in the current versions of Dataverse that would result in damage to users' files. But you may have some legacy files in your archive that were affected by some issue in the past, or perhaps affected by something outside Dataverse, so we are adding this feature out of abundance of caution. An example of a problem we've experienced in the early versions of Dataverse was a possible scenario where a user actually attempted to delete a Draft file from an unpublished version, where the database transaction would fail for whatever reason, but only after the physical file had already been deleted from the filesystem. Thus resulting in a datafile entry remaining in the dataset, but with the corresponding physical file missing. The fix for this case, since the user wanted to delete the file in the first place, is simply to confirm it and purge the datafile entity from the database.
+
+### The Setting :PIDAsynchRegFileCount is Deprecated as of 5.0
+
+It used to specify the number of datafiles in the dataset to warrant adding a lock during publishing. As of v5.0 all datasets get locked for the duration of the publishing process. The setting will be ignored if present.
+
+### Location Changes for Related Projects
+
+The dataverse-ansible and dataverse-previewers repositories have been moved to the GDCC Organization on GitHub. If you have been referencing the dataverse-ansible repository from IQSS and the dataverse-previewers from QDR, please instead use them from their new locations:
+
+<https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible>
+<https://github.com/GlobalDataverseCommunityConsortium/dataverse-previewers>
+
+### Harvesting Improvements
+
+Many updates have been made to address common Harvesting failures. You may see Harvests complete more often and have a higher success rate on a dataset-by-dataset basis.
+
+### New JVM Options and Database Settings
+
+Several new JVM options and DB Settings have been added in this release. More documentation about each of these settings can be found in the Configuration section of the [Installation Guide](http://guides.dataverse.org/en/5.0/installation/config.rst).
+
+#### New JVM Options
+
+- doi.dataciterestapiurlstring: Set with a value of "https://api.datacite.org" for production environments and "https://api.test.datacite.org" for test environments. Must be set if you are using DataCite as your DOI provider.
+- dataverse.useripaddresssourceheader: If set, specifies an HTTP Header such as X-Forwarded-For to use to retrieve the user's IP address. This setting is useful in cases such as running Dataverse behind load balancers where the default option of getting the Remote Address from the servlet isn't correct (e.g. it would be the load balancer IP address). Note that unless your installation always sets the header you configure here, this could be used as a way to spoof the user's address. See the Configuration section of the [Installation Guide](http://guides.dataverse.org/en/5.0/installation/config.rst) for more information about proper use and security concerns.
+- http.request-timeout-seconds: To facilitate large file upload and download, the Dataverse installer bumps the Payara **server-config.network-config.protocols.protocol.http-listener-1.http.request-timeout-seconds** setting from its default 900 seconds (15 minutes) to 1800 (30 minutes).
+
+#### New Database Settings
+
+- :CustomZipDownloadServiceUrl: If defined, this is the URL of the zipping service outside the main application server where zip downloads should be directed (instead of /api/access/datafiles/).
+- :ShibAttributeCharacterSetConversionEnabled: By default, all attributes received from Shibboleth are converted from ISO-8859-1 to UTF-8. You can disable this behavior by setting to false.
+- :ChronologicalDateFacets: Facets with Date/Year are sorted chronologically by default, with the most recent value first. To have them sorted by number of hits, e.g. with the year with the most results first, set this to false.
+- :NavbarGuidesUrl: Set to a fully-qualified URL which will be used for the "User Guide" link in the navbar.
+- :FileValidationOnPublishEnabled: Toggles validation of the physical files in the dataset when it's published, by recalculating the checksums and comparing against the values stored in the DataFile table. By default this setting is absent and Dataverse assumes it to be true. If enabled, the validation will be performed asynchronously, similarly to how we handle assigning persistent identifiers to datafiles, with the dataset locked for the duration of the publishing process.
+
+### Custom Analytics Code Changes
+
+You should update your custom analytics code to implement necessary changes for tracking updated dataset and file buttons. There was also a fix to the analytics code that will now properly track downloads for tabular files.
+
+For more information, see the documentation and sample analytics code snippet provided in [Installation Guide > Configuration > Web Analytics Code](http://guides.dataverse.org/en/5.0/installation/config.html#web-analytics-code) to reflect the changes implemented in this version (#6938/#6684).
+
+### Tracking Users' IP Addresses Behind an Address-Masking Proxy
+
+It is now possible to collect real user IP addresses in MDC logs and/or set up an IP group on a system running behind a proxy/load balancer that hides the addresses of incoming requests. See "Recording User IP Addresses" in the Configuration section of the [Installation Guide](http://guides.dataverse.org/en/5.0/installation/config.rst).
+
+### Reload Astrophysics Metadata Block (if used)
+
+Tooltips have been updated for the Astrophysics Metadata Block. If you'd like these updated Tooltips to be displayed to users of your installation, you should update the Astrophysics Metadata Block:
+
+`curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @astrophysics.tsv -H "Content-type: text/tab-separated-values"`
+
+We've included this in the step-by-step instructions below.
+
+### Run ReExportall
+
+We made changes to the JSON Export in this release. If you'd like these changes to reflected in your JSON exports, you should run ReExportall as part of the upgrade process following the steps in [Admin Guide](http://guides.dataverse.org/en/5.0/admin/metadataexport.html?highlight=export#batch-exports-through-the-api)
+
+We've included this in the step-by-step instructions below.
+
+## Notes for Tool Developers and Integrators
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.0 Milestone](https://github.com/IQSS/dataverse/milestone/89?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](http://guides.dataverse.org/en/5.0/installation/)
+
+## Upgrade Instructions
+
+### Prerequisite: Retroactively store original file size
+
+Starting with release 4.10 the size of the saved original file (for an ingested tabular datafile) is stored in the database. We provided the following API that retrieve and permanently store the sizes for any already existing saved originals:
+
+`/api/admin/datafiles/integrity/fixmissingoriginalsizes`
+
+(See the documentation note in the Native API guide, under "[Datafile Integrity](https://guides.dataverse.org/en/5.0/api/native-api.html#datafile-integrity)").
+
+To check your installation, issue this command:
+
+   `curl http://localhost:8080/api/admin/datafiles/integrity/fixmissingoriginalsizes`
+
+### Upgrade from Glassfish 4.1 to Payara 5
+
+The instructions below describe the upgrade procedure based on moving an existing glassfish4 domain directory under Payara. We recommend this method instead of setting up a brand-new Payara domain using the installer because it appears to be the easiest way to recreate your current configuration and preserve all your data.
+
+1. Download Payara, v5.2020.2 as of this writing:
+
+   `curl -L -O https://github.com/payara/Payara/releases/download/payara-server-5.2020.2/payara-5.2020.2.zip`
+   `sha256sum payara-5.2020.2.zip`
+      1f5f7ea30901b1b4c7bcdfa5591881a700c9b7e2022ae3894192ba97eb83cc3e
+
+2. Unzip it somewhere (/usr/local is a safe bet)
+
+   `sudo unzip payara-5.2020.2.zip -d /usr/local/`
+
+3. Copy the Postgres driver to /usr/local/payara5/glassfish/lib
+
+   `sudo cp /usr/local/glassfish4/glassfish/lib/postgresql-42.2.9.jar /usr/local/payara5/glassfish/lib/`
+
+4. Move payara5/glassfish/domains/domain1 out of the way
+
+   `sudo mv /usr/local/payara5/glassfish/domains/domain1 /usr/local/payara5/glassfish/domains/domain1.orig`
+
+5. Undeploy the Dataverse web application (if deployed; version 4.20 is assumed in the example below)
+
+   `sudo /usr/local/glassfish4/bin/asadmin list-applications`
+   `sudo /usr/local/glassfish4/bin/asadmin undeploy dataverse-4.20`
+
+6. Stop Glassfish; copy domain1 to Payara
+
+   `sudo /usr/local/glassfish4/bin/asadmin stop-domain`
+   `sudo cp -ar /usr/local/glassfish4/glassfish/domains/domain1 /usr/local/payara5/glassfish/domains/`
+
+7. Remove the cache directories
+
+   `sudo rm -rf /usr/local/payara5/glassfish/domains/domain1/generated/`  
+   `sudo rm -rf /usr/local/payara5/glassfish/domains/domain1/osgi-cache/`
+
+8. Make the following changes in **domain.xml**:
+
+   Replace the `-XX:PermSize` and `-XX:MaxPermSize` JVM options with `-XX:MetaspaceSize` and `-XX:MaxMetaspaceSize`
+
+   ```
+   <jvm-options>-XX:MetaspaceSize=256m</jvm-options>
+   <jvm-options>-XX:MaxMetaspaceSize=512m</jvm-options>
+   ```
+
+   Add the below JVM options beneath the -Ddataverse settings:  
+
+   ```
+   <jvm-options>-Dfish.payara.classloading.delegate=false</jvm-options>
+   <jvm-options>-XX:+UseG1GC</jvm-options>
+   <jvm-options>-XX:+UseStringDeduplication</jvm-options>
+   <jvm-options>-XX:+DisableExplicitGC</jvm-options>
+   ```
+
+   Replace the following element:
+
+   ```
+   <jdbc-connection-pool datasource-classname="org.apache.derby.jdbc.EmbeddedXADataSource" name="__TimerPool" res-type="javax.sql.XADataSource">
+      <property name="databaseName" value="${com.sun.aas.instanceRoot}/lib/databases/ejbtimer"></property>
+      <property name="connectionAttributes" value=";create=true"></property>
+   </jdbc-connection-pool>
+   ```
+
+   with
+
+  ```
+  <jdbc-connection-pool datasource-classname="org.h2.jdbcx.JdbcDataSource" name="__TimerPool" res-type="javax.sql.XADataSource">
+    <property name="URL" value="jdbc:h2:${com.sun.aas.instanceRoot}/lib/databases/ejbtimer;AUTO_SERVER=TRUE"></property>
+  </jdbc-connection-pool>
+  ```
+
+9. Change any full pathnames matching `/usr/local/glassfish4/...` to `/usr/local/payara5/...` or whatever it is in your case. Specifically check the `-Ddataverse.files.directory` and `-Ddataverse.files.file.directory` JVM options.
+
+10.   In domain1/config/jhove.conf, change the hard-coded /usr/local/glassfish4 path, as above.
+
+   (Optional): If you renamed your service account from glassfish to payara or appserver, update the ownership permissions. The Installation Guide recommends a service account of `dataverse`:
+
+   `sudo chown -R dataverse /usr/local/payara5/glassfish/domains/domain1`
+   `sudo chown -R dataverse /usr/local/payara5/glassfish/lib`
+
+11.  You will also need to check that the service account has write permission on the files directory, if they are located outside the old Glassfish domain. And/or make sure the service account has the correct AWS credentials, if you are using S3 for storage.
+
+12.  Finally, start Payara:
+
+   `sudo -u dataverse /usr/local/payara5/bin/asadmin start-domain`
+
+13. Deploy the Dataverse 5 warfile:
+
+   `sudo -u dataverse /usr/local/payara5/bin/asadmin deploy /path/to/dataverse-5.0.war`
+
+14. Then restart Payara:
+
+   `sudo -u dataverse /usr/local/payara5/bin/asadmin stop-domain`
+   `sudo -u dataverse /usr/local/payara5/bin/asadmin start-domain`
+
+### Additional Upgrade Steps
+
+1. Update Astrophysics Metadata Block (if used)
+
+   `wget https://github.com/IQSS/dataverse/releases/download/v5.0/astrophysics.tsv`
+   `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @astrophysics.tsv -H "Content-type: text/tab-separated-values"` 
+
+2. (Recommended) Run ReExportall to update JSON Exports  
+
+   <http://guides.dataverse.org/en/5.0/admin/metadataexport.html?highlight=export#batch-exports-through-the-api>
+
+3. (Required for installations using DataCite) Add the JVM option doi.dataciterestapiurlstring
+
+   For production environments:
+
+   `/usr/local/payara5/bin/asadmin create-jvm-options "\-Ddoi.dataciterestapiurlstring=https\://api.datacite.org"`
+   
+   For test environments: 
+
+   `/usr/local/payara5/bin/asadmin create-jvm-options "\-Ddoi.dataciterestapiurlstring=https\://api.test.datacite.org"`
+
+   The JVM option `doi.mdcbaseurlstring` should be deleted if it was previously set, for example:
+
+   `/usr/local/payara5/bin/asadmin delete-jvm-options "\-Ddoi.mdcbaseurlstring=https\://api.test.datacite.org"`
+     
+4. (Recommended for installations using DataCite) Pre-register DOIs
+
+   Execute the script described in the section "Dataverse Installations Using DataCite: Upgrade Action Recommended" earlier in the Release Note. 
+
+   Please consult the earlier sections of the Release Note for any additional configuration options that may apply to your installation. 
diff --git a/doc/release-notes/5.1-release-notes.md b/doc/release-notes/5.1-release-notes.md
new file mode 100644
index 00000000000..3d106b2df7b
--- /dev/null
+++ b/doc/release-notes/5.1-release-notes.md
@@ -0,0 +1,99 @@
+# Dataverse 5.1
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Large File Upload for Installations Using AWS S3
+
+The added support for multipart upload through the API and UI (Issue #6763) will allow files larger than 5 GB to be uploaded to Dataverse when an installation is running on AWS S3. Previously, only non-AWS S3 storage configurations would allow uploads larger than 5 GB.  
+
+### Dataset-Specific Stores
+
+In previous releases, configuration options were added that allow each dataverse to have a specific store enabled. This release adds even more granularity, with the ability to set a dataset-level store.
+
+## Major Use Cases
+
+Newly-supported use cases in this release include:
+
+- Users can now upload files larger than 5 GB on installations running AWS S3 (Issue #6763, PR #6995)
+- Administrators will now be able to specify a store at the dataset level in addition to the Dataverse level (Issue #6872, PR #7272)
+- Users will have their dataset's directory structure retained when uploading a dataset with shapefiles (Issue #6873, PR #7279)
+- Users will now be able to download zip files through the experimental Zipper service when the set of downloaded files have duplicate names (Issue [#80](https://github.com/IQSS/dataverse.harvard.edu/issues/80), PR #7276)
+- Users will now be able to download zip files with the proper file structure through the experiment Zipper service (Issue #7255, PR #7258)
+- Administrators will be able to use new APIs to keep the Solr index and the DB in sync, allowing easier resolution of an issue that would occasionally cause stale search results to not load. (Issue #4225, PR #7211)
+
+## Notes for Dataverse Installation Administrators
+
+### New API for setting a Dataset-level Store
+
+- This release adds a new API for setting a dataset-specific store. Learn more in the Managing Dataverse and Datasets section of the [Admin Guide](http://guides.dataverse.org/en/5.1/admin/solr-search-index.html).
+
+### Multipart Upload Storage Monitoring, Recommended Use for Multipart Upload
+
+Charges may be incurred for storage reserved for multipart uploads that are not completed or cancelled. Administrators may want to do periodic manual or automated checks for open multipart uploads. Learn more in the Big Data Support section of the [Developers Guide](http://guides.dataverse.org/en/5.1/developer/big-data-support.html).
+
+While multipart uploads can support much larger files, and can have advantages in terms of robust transfer and speed, they are more complex than single part direct uploads. Administrators should consider taking advantage of the options to limit use of multipart uploads to specific users by using multiple stores and configuring access to stores with high file size limits to specific Dataverses (added in 4.20) or Datasets (added in this release).
+
+### New APIs for keeping Solr records in sync
+
+This release adds new APIs to keep the Solr index and the DB in sync, allowing easier resolution of an issue that would occasionally cause search results to not load. Learn more in the Solr section of the [Admin Guide](http://guides.dataverse.org/en/5.1/admin/solr-search-index.html).
+
+### Documentation for Purging the Ingest Queue
+
+At times, it may be necessary to cancel long-running Ingest jobs in the interest of system stability. The Troubleshooting section of the [Admin Guide](http://guides.dataverse.org/en/5.1/admin/) now has specific steps.
+
+### Biomedical Metadata Block Updated
+
+The Life Science Metadata block (biomedical.tsv) was updated.  "Other Design Type", "Other Factor Type", "Other Technology Type", "Other Technology Platform" boxes were added. See the "Additional Upgrade Steps" below if you use this in your installation.
+
+## Notes for Tool Developers and Integrators
+
+### Spaces in File Names
+
+Dataverse Installations using S3 storage will no longer replace spaces in file names of downloaded files with the + character. If your tool or integration has any special handling around this, you may need to make further adjustments to maintain backwards compatibility while also supporting Dataverse installations on 5.1+.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.1 Milestone](https://github.com/IQSS/dataverse/milestone/90?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](http://guides.dataverse.org/en/5.1/installation/)
+
+## Upgrade Instructions
+
+0. These instructions assume that you've already successfully upgraded from Dataverse 4.x to  Dataverse 5 following the instructions in the [Dataverse 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0).
+
+1. Undeploy the previous version.
+
+<payara install path>/payara/bin/asadmin list-applications
+<payara install path>/payara/bin/asadmin undeploy dataverse
+
+2. Stop payara and remove the generated directory, start.
+
+- service payara stop
+- remove the generated directory: rm -rf <payara install path>payara/payara/domains/domain1/generated
+- service payara start
+
+3. Deploy this version.
+<payara install path>/payara/bin/asadmin deploy <path>dataverse-5.1.war
+
+4. Restart payara
+
+### Additional Upgrade Steps
+
+1. Update Biomedical Metadata Block (if used), Reload Solr, ReExportAll
+
+   `wget https://github.com/IQSS/dataverse/releases/download/v5.1/biomedical.tsv`
+   `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @biomedical.tsv -H "Content-type: text/tab-separated-values"`
+
+- copy schema_dv_mdb_fields.xml and schema_dv_mdb_copies.xml to solr server, for example into /usr/local/solr/solr-7.7.2/server/solr/collection1/conf/ directory
+- Restart Solr, or tell Solr to reload its configuration:
+
+   `curl "http://localhost:8983/solr/admin/cores?action=RELOAD&core=collection1"`
+
+- Run ReExportall to update JSON Exports  
+<http://guides.dataverse.org/en/5.1/admin/metadataexport.html?highlight=export#batch-exports-through-the-api>
diff --git a/doc/release-notes/5.1.1-release-notes.md b/doc/release-notes/5.1.1-release-notes.md
new file mode 100644
index 00000000000..739bd3da800
--- /dev/null
+++ b/doc/release-notes/5.1.1-release-notes.md
@@ -0,0 +1,63 @@
+# Dataverse 5.1.1
+
+This minor release adds important scaling improvements for installations running on AWS S3. It is recommended that 5.1.1 be used in production instead of 5.1.
+
+## Release Highlights
+
+### Connection Pool Size Configuration Option, Connection Optimizations
+
+Dataverse 5.1 improved the efficiency of making S3 connections through use of an http connection pool. This release adds optimizations around closing streams and channels that may hold S3 http connections open and exhaust the connection pool. In parallel, this release increases the default pool size from 50 to 256 and adds the ability to increase the size of the connection pool, so a larger pool can be configured if needed.
+
+## Major Use Cases
+
+Newly-supported use cases in this release include:
+
+- Administrators of installations using S3 will be able to define the connection pool size, allowing better resource scaling for larger installations (Issue #7309, PR #7313)
+
+## Notes for Dataverse Installation Administrators
+
+### 5.1.1 vs. 5.1 for Production Use
+
+As mentioned above, we encourage 5.1.1 instead of 5.1 for production use.
+
+### New JVM Option for Connection Pool Size
+
+Larger installations may want to increase the number of open S3 connections allowed (default is 256). For example, to set the value to 4096:
+
+`./asadmin create-jvm-options "-Ddataverse.files.<id>.connection-pool-size=4096"`
+(where `<id>` is the identifier of your S3 file store (likely `"s3"`). The JVM Options section of the [Configuration Guide](http://guides.dataverse.org/en/5.1.1/installation/config/) has more information.
+
+### New S3 Bucket CORS setting for Direct Upload/Download
+
+When using S3 storage with direct upload and/or download enabled, one must now expose the ETag header as documented in the [updated cors.json example](https://guides.dataverse.org/en/5.1.1/developers/big-data-support.html?highlight=etag#s3-direct-upload-and-download).
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.1.1 Milestone](https://github.com/IQSS/dataverse/milestone/91?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](http://guides.dataverse.org/en/5.1.1/installation/)
+
+## Upgrade Instructions
+
+0. These instructions assume that you've already successfully upgraded to Dataverse 5.1 following the instructions in the [Dataverse 5.1 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.1).
+
+1. Undeploy the previous version.
+
+`<payara install path>/bin/asadmin list-applications`
+`<payara install path>/bin/asadmin undeploy dataverse<-version>`
+
+2. Stop payara and remove the generated directory, start.
+
+- `service payara stop`
+- remove the generated directory:
+`rm -rf <payara install path>/glassfish/domains/domain1/generated`
+- `service payara start`
+
+3. Deploy this version.
+`<payara install path>/bin/asadmin deploy dataverse-5.1.1.war`
+
+4. Restart payara
diff --git a/doc/release-notes/5.10-release-notes.md b/doc/release-notes/5.10-release-notes.md
new file mode 100644
index 00000000000..c13ae8a6b78
--- /dev/null
+++ b/doc/release-notes/5.10-release-notes.md
@@ -0,0 +1,344 @@
+# Dataverse Software 5.10
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Multiple License Support
+
+Users can now select from a set of configured licenses in addition to or instead of the previous Creative Commons CC0 choice or provide custom terms of use (if configured) for their datasets. Administrators can configure their Dataverse instance via API to allow any desired license as a choice and can enable or disable the option to allow custom terms. Administrators can also mark licenses as "inactive" to disallow future use while keeping that license for existing datasets. For upgrades, only the CC0 license will be preinstalled. New installations will have both CC0 and CC BY preinstalled. The [Configuring Licenses](https://guides.dataverse.org/en/5.10/installation/config.html#configuring-licenses) section of the Installation Guide shows how to add or remove licenses.
+
+**Note: Datasets in existing installations will automatically be updated to conform to new requirements that custom terms cannot be used with a standard license and that custom terms cannot be empty. Administrators may wish to manually update datasets with these conditions if they do not like the automated migration choices. See the "Notes for Dataverse Installation Administrators" section below for details.**
+
+This release also makes the license selection and/or custom terms more prominent when publishing and viewing a dataset and when downloading files.
+
+### Ingest and File Upload Messaging Improvements
+
+Messaging around ingest failure has been softened to prevent support tickets. In addition, messaging during file upload has been improved, especially with regard to showing size limits and providing links to the guides about tabular ingest. For screenshots and additional details see PR #8271.
+
+### Downloading of Guestbook Responses with Fewer Clicks
+
+A download button has been added to the page that lists guestbooks. This saves a click but you can still download responses from the "View Responses" page, as before.
+
+Also, links to the guides about guestbooks have been added in additional places.
+
+### Dynamically Request Arbitrary Metadata Fields from Search API 
+
+The Search API now allows arbitrary metadata fields to be requested when displaying results from datasets. You can request all fields from metadata blocks or pick and choose certain fields.
+
+The new parameter is called `metadata_fields` and the Search API documentation contains details and examples: <https://guides.dataverse.org/en/5.10/api/search.html>
+
+### Solr 8 Upgrade
+
+The Dataverse Software now runs on Solr 8.11.1, the latest available stable release in the Solr 8.x series.
+
+### PostgreSQL Upgrade
+
+A PostgreSQL upgrade is not required for this release but is planned for the next release. See below for details.
+
+## Major Use Cases and Infrastructure Enhancements
+
+Changes and fixes in this release include:
+
+- When creating or updating datasets, users can select from a set of licenses configured by the administrator (CC, CC BY, custom licenses, etc.) or provide custom terms (if the installation is configured to allow them). (Issue #7440, PR #7920)
+- Users can get better feedback on tabular ingest errors and more information about size limits when uploading files. (Issue #8205, PR #8271)
+- Users can more easily download guestbook responses and learn how guestbooks work. (Issue #8244, PR #8402)
+- Search API users can specify additional metadata fields to be returned in the search results. (Issue #7863, PR #7942)
+- The "Preview" tab on the file page can now show restricted files. (Issue #8258, PR #8265)
+- Users wanting to upload files from GitHub to Dataverse can learn about a new GitHub Action called "Dataverse Uploader". (PR #8416)
+- Users requesting access to files now get feedback that it was successful. (Issue #7469, PR #8341)
+- Users may notice various accessibility improvements. (Issue #8321, PR #8322)
+- Users of the Social Science metadata block can now add multiples of the "Collection Mode" field. (Issue #8452, PR #8473)
+- Guestbooks now support multi-line text area fields. (Issue #8288, PR #8291)
+- Guestbooks can better handle commas in responses. (Issue #8193, PR #8343)
+- Dataset editors can now deselect a guestbook. (Issue #2257, PR #8403)
+- Administrators with a large `actionlogrecord` table can read docs on archiving and then trimming it. (Issue #5916, PR #8292)
+- Administrators can list locks across all datasets. (PR #8445)
+- Administrators can run a version of Solr that doesn't include a version of log4j2 with serious known vulnerabilities. We trust that you have patched the version of Solr you are running now following the instructions that were sent out. An upgrade to the latest version is recommended for extra peace of mind. (PR #8415)
+- Administrators can run a version of Dataverse that doesn't include a version of log4j with known vulnerabilities. (PR #8377)
+
+## Notes for Dataverse Installation Administrators
+
+### Updating for Multiple License Support
+
+#### Adding and Removing Licenses and How Existing Datasets Will Be Automatically Updated
+
+As part of installing or upgrading an existing installation, administrators may wish to add additional license choices and/or configure Dataverse to allow custom terms. Adding additional licenses is managed via API, as explained in the [Configuring Licenses](https://guides.dataverse.org/en/5.10/installation/config.html#configuring-licenses) section of the Installation Guide. Licenses are described via a JSON structure providing a name, URL, short description, and optional icon URL. Additionally licenses may be marked as active (selectable for new or updated datasets) or inactive (only allowed on existing datasets) and one license can be marked as the default. Custom Terms are allowed by default (backward compatible with the current option to select "No" to using CC0) and can be disabled by setting `:AllowCustomTermsOfUse` to false.
+
+Further, administrators should review the following automated migration of existing licenses and terms into the new license framework and, if desired, should manually find and update any datasets for which the automated update is problematic.
+To understand the migration process, it is useful to understand how the multiple license feature works in this release:
+
+"Custom Terms", aka a custom license, are defined through entries in the following fields of the dataset "Terms" tab:
+
+- Terms of Use
+- Confidentiality Declaration 
+- Special Permissions 
+- Restrictions 
+- Citation Requirements 
+- Depositor Requirements 
+- Conditions 
+- Disclaimer
+
+"Custom Terms" require, at a minimum, a non-blank entry in the "Terms of Use" field. Entries in other fields are optional.
+
+Since these fields are intended for terms/conditions that would potentially conflict with or modify the terms in a standard license, they are no longer shown when a standard license is selected.
+
+In earlier Dataverse releases, it was possible to select the CC0 license and have entries in the fields above. It was also possible to say "No" to using CC0 and leave all of these terms fields blank. 
+
+The automated process will update existing datasets as follows.
+
+- "CC0 Waiver" and no entries in the fields above -> CC0 License (no change)
+- No CC0 Waiver and an entry in the "Terms of Use" field and possibly others fields listed above -> "Custom Terms" with the same entries in these fields (no change)
+- CC0 Waiver and an entry in some of the fields listed -> 'Custom Terms' with the following text preprended in the "Terms of Use" field: "This dataset is made available under a Creative Commons CC0 license with the following additional/modified terms and conditions:"
+- No CC0 Waiver and an entry in a field(s) other than the "Terms of Use" field -> "Custom Terms" with the following "Terms of Use" added: "This dataset is made available with limited information on how it can be used. You may wish to communicate with the Contact(s) specified before use."
+- No CC0 Waiver and no entry in any of the listed fields -> "Custom Terms" with the following "Terms of Use" added: "This dataset is made available without information on how it can be used. You should communicate with the Contact(s) specified before use."
+
+Administrators who have datasets where CC0 has been selected along with additional terms, or datasets where the Terms of Use field is empty, may wish to modify those datasets prior to upgrading to avoid the automated changes above. This is discussed next.
+
+#### Handling Datasets that No Longer Comply With Licensing Rules
+
+In most Dataverse installations, one would expect the vast majority of datasets to either use the CC0 Waiver or have non-empty Terms of Use. As noted above, these will be migrated without any issue. Administrators may however wish to find and manually update datasets that specified a CC0 license but also had terms (no longer allowed) or had no license and no terms of use (also no longer allowed) rather than accept the default migrations for these datasets listed above.
+
+##### Finding and Modifying Datasets with a CC0 License and Non-Empty Terms
+
+To find datasets with a CC0 license and non-empty terms:
+
+```
+select CONCAT('doi:', dvo.authority, '/', dvo.identifier), v.alias as dataverse_alias, case when versionstate='RELEASED' then concat(dv.versionnumber, '.', dv.minorversionnumber) else versionstate END  as version, dv.id as datasetversion_id, t.id as termsofuseandaccess_id, t.termsofuse, t.confidentialitydeclaration, t.specialpermissions, t.restrictions, t.citationrequirements, t.depositorrequirements, t.conditions, t.disclaimer from dvobject dvo, termsofuseandaccess t, datasetversion dv, dataverse v where dv.dataset_id=dvo.id and dv.termsofuseandaccess_id=t.id and dvo.owner_id=v.id and t.license='CC0' and not (t.termsofuse is null and t.confidentialitydeclaration is null and t.specialpermissions is null and t.restrictions is null and citationrequirements is null and t.depositorrequirements is null and t.conditions is null and t.disclaimer is null);
+```
+
+The `datasetdoi` column will let you find and view the affected dataset in the Dataverse web interface. The `version` column will indicate which version(s) are relevant. The `dataverse_alias` will tell you which Dataverse collection the dataset is in (and may be useful if you want to adjust all datasets in a given collection). The `termsofuseandaccess_id` column indicates which specific entry in that table is associated with the dataset/version. The remaining columns show the values of any terms fields.
+
+There are two options to migrate such datasets:
+
+Option 1: Set all terms fields to null:
+
+```
+update termsofuseandaccess set termsofuse=null, confidentialitydeclaration=null, t.specialpermissions=null, t.restrictions=null, citationrequirements=null, depositorrequirements=null, conditions=null, disclaimer=null where id=<id>;
+```
+
+or to change several at once:
+
+```
+update termsofuseandaccess set termsofuse=null, confidentialitydeclaration=null, t.specialpermissions=null, t.restrictions=null, citationrequirements=null, depositorrequirements=null, conditions=null, disclaimer=null where id in (<comma separated list of termsanduseofaccess_ids>);
+```
+
+Option 2: Change the Dataset version(s) to not use the CCO waiver and modify the Terms of Use (and/or other fields) as you wish to indicate that the CC0 waiver was previously selected:
+
+```
+    update termsofuseandaccess set license='NONE', termsofuse=concat('New text. ', termsofuse) where id=<id>;
+```
+    
+or 
+
+``` 
+    update termsofuseandaccess set license='NONE', termsofuse=concat('New text. ', termsofuse) where id in (<comma separated list of termsanduseofaccess_ids>);
+```
+
+##### Finding and Modifying Datasets without a CC0 License and with Empty Terms
+
+To find datasets with a without a CC0 license and with empty terms:
+
+```
+select CONCAT('doi:', dvo.authority, '/', dvo.identifier), v.alias as dataverse_alias, case when versionstate='RELEASED' then concat(dv.versionnumber, '.', dv.minorversionnumber) else versionstate END  as version, dv.id as datasetversion_id, t.id as termsofuseandaccess_id, t.termsofuse, t.confidentialitydeclaration, t.specialpermissions, t.restrictions, t.citationrequirements, t.depositorrequirements, t.conditions, t.disclaimer from dvobject dvo, termsofuseandaccess t, datasetversion dv, dataverse v where dv.dataset_id=dvo.id and dv.termsofuseandaccess_id=t.id and dvo.owner_id=v.id and (t.license='NONE' or t.license is null) and t.termsofuse is null;
+```
+
+As before, there are a couple options.
+
+Option 1: These datasets could be updated to use CC0:
+
+```
+update termsofuseandaccess set license='CC0', confidentialitydeclaration=null, t.specialpermissions=null, t.restrictions=null, citationrequirements=null, depositorrequirements=null, conditions=null, disclaimer=null where id=<id>;
+```
+
+Option 2: Terms of Use could be added:
+
+```
+update termsofuseandaccess set termsofuse='New text. ' where id=<id>;
+```
+
+In both cases, the same where id in (`<comma separated list of termsanduseofaccess_ids>`); ending could be used to change multiple datasets/versions at once.
+
+#### Standardizing Custom Licenses
+
+If many datasets use the same set of Custom Terms, it may make sense to create and register a standard license including those terms. Doing this would include:
+
+- Creating and posting an external document that includes the custom terms, i.e. an HTML document with sections corresponding to the terms fields that are used.
+- Defining a name, short description, URL (where it is posted), and optionally an icon URL for this license
+- Using the Dataverse API to register the new license as one of the options available in your installation
+- Using the API to make sure the license is active and deciding whether the license should also be the default
+- Once the license is registered with Dataverse, making an SQL update to change datasets/versions using that license to reference it instead of having their own copy of those custom terms.
+
+The benefits of this approach are:
+
+- usability: the license can be selected for new datasets without allowing custom terms and without users having to cut/paste terms or collection administrators having to configure templates with those terms
+- efficiency: custom terms are stored per dataset whereas licenses are registered once and all uses of it refer to the same object and external URL
+- security: with the license terms maintained external to Dataverse, users cannot edit specific terms and curators do not need to check for edits
+
+Once a standardized version of your Custom Terms are registered as a license, an SQL update like the following can be used to have datasets use it:
+
+```
+UPDATE termsofuseandaccess
+SET license_id = (SELECT license.id FROM license WHERE license.name = '<Your License Name>'), termsofuse=null, confidentialitydeclaration=null, t.specialpermissions=null, t.restrictions=null, citationrequirements=null, depositorrequirements=null, conditions=null, disclaimer=null 
+WHERE termsofuseandaccess.termsofuse LIKE '%<Unique phrase in your Terms of Use>%';
+```
+
+Note that this information is also available in the [Configuring Licenses](https://guides.dataverse.org/en/5.10/installation/config.html#configuring-licenses) section of the Installation Guide. Look for "Standardizing Custom Licenses".
+
+### PostgreSQL Version 10+ Required
+
+If you are still using PostgreSQL 9.x, now is the time to upgrade. PostgreSQL 9.x is now EOL (no longer supported, as of January 2022), and in the next version of the Dataverse Software we plan to upgrade the Flyway library (used for database migrations) to a version that will no longer work with versions prior to PostgreSQL 10. See PR #8296 for more on this upcoming Flyway upgrade.
+
+The Dataverse Software has been tested with PostgreSQL versions up to 13. The current stable version 13.5 is recommended. If that's not an option for reasons specific to your installation (for example, if PostgreSQL 13.5 is not available for the OS distribution you are using), any 10+ version should work.
+
+See the upgrade section below for more information. 
+
+### Providing S3 Storage Credentials via MicroProfile Config
+
+With this release, you may use two new JVM options (`dataverse.files.<id>.access-key` and `dataverse.files.<id>.secret-key`) to pass an access key identifier and a secret access key for S3-based storage definitions without creating the files used by the AWS CLI tools (`~/.aws/config` & `~/.aws/credentials`).
+
+This has been added to ease setups using containers (Docker, Podman, Kubernetes, OpenShift) or testing and development installations. Find additional [documentation and a word of warning in the Installation Guide](https://guides.dataverse.org/en/5.10/installation/config.html#s3-mpconfig).
+
+## New JVM Options and DB Settings
+
+The following JVM settings have been added:
+
+- `dataverse.files.<id>.access-key` - S3 access key ID.
+- `dataverse.files.<id>.secret-key` - S3 secret access key.
+
+See the [JVM Options](https://guides.dataverse.org/en/5.10/installation/config.html#jvm-options) section of the Installation Guide for more information.
+
+The following DB settings have been added:
+
+- `:AllowCustomTermsOfUse` (default: true) - allow users to provide Custom Terms instead of choosing one of the configured standard licenses.
+
+See the [Database Settings](https://guides.dataverse.org/en/5.10/installation/config.html#database-settings) section of the Guides for more information.
+
+## Notes for Developers and Integrators
+
+In the "Backward Incompatibilities" section below, note changes in the API regarding licenses and the native JSON format.
+
+## Backward Incompatibilities
+
+With the change to support multiple licenses, which can include cases where CC0 is not an option, and the decision to prohibit two previously possible cases (no license and no entry in the "Terms of Use" field, a standard license and entries in "Terms of Use", "Special Permissions", and related fields), this release contains changes to the display, API payloads, and export metadata that are not backward compatible. These include:
+
+- "CC0 Waiver" has been replaced by "CC0 1.0" (the short name specified by Creative Commons) in the web interface, API payloads, and export formats that include a license name. (Note that installation admins can alter the license name in the database to maintain the original "CC0 Waiver" text, if desired.)
+- Schema.org metadata in page headers and the Schema.org JSON-LD metadata export now reference the license via URL (which should avoid the current warning from Google about an invalid license object in the page metadata).
+- Metadata exports and import methods (including SWORD) use either the license name (e.g. in the JSON export) or URL (e.g. in the OAI_ORE export) rather than a hardcoded value of "CC0" or "CC0 Waiver" currently (if the CC0 license is available, its default name would be "CC0 1.0").
+- API calls (e.g. for import, migrate) that specify both a license and custom terms will be considered an error, as would having no license and an empty/blank value for "Terms of Use".
+- Rollback. In general, one should not deploy an earlier release over a database that has been modified by deployment of a later release. (Make a db backup before upgrading and use that copy if you go back to a prior version.) Due to the nature of the db changes in this release, attempts to deploy an earlier version of Dataverse will fail unless the database is also restored to its pre-release state.
+
+Also, note that since CC0 Waiver is no longer a hardcoded option, text strings that reference it have been edited or removed from `Bundle.properties`. This means that the ability to provide translations of the CC0 license name/description has been removed. The initial release of multiple license functionality doesn't include an alternative mechanism to provide translations of license names/descriptions, so this is a regression in capability (see #8346). The instructions and help information about license and terms remains internationalizable, it is only the name/description of the licenses themselves that cannot yet be translated.
+
+An update in the metadata block Social Science changes the field CollectionMode to allow multiple values. This changes the way the field is encoded in the native JSON format. From
+
+```
+"typeName": "collectionMode",
+"multiple": false,
+"typeClass": "primitive",
+"value": "some text"
+```
+
+to 
+
+```
+"typeName": "collectionMode",
+"multiple": true,
+"typeClass": "primitive",
+"value": ["some text", "more text"]
+```
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.10 Milestone](https://github.com/IQSS/dataverse/milestone/101?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.10/installation/). Please also contact us to get added to the [Dataverse Project Map](https://guides.dataverse.org/en/5.10/installation/config.html#putting-your-dataverse-installation-on-the-map-at-dataverse-org) if you have not done so already.
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.10.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.  
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+  
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.10.war`
+
+5\. Restart payara
+
+- `service payara stop`
+- `service payara start`
+
+6\. Update the Social Science metadata block
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v5.10/social_science.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @social_science.tsv -H "Content-type: text/tab-separated-values"`
+- Note that this update also requires an updated Solr schema. We strongly recommend that you upgrade Solr as part of this release, by installing the latest stable release from scratch (see below). In the process you will configure it with the latest version of the schema as distributed with this Dataverse release, so no further steps will be needed. If you have already upgraded, or have some **very** good reason to stay on the old version a little longer, please refer to <https://guides.dataverse.org/en/5.10/admin/metadatacustomization.html#updating-the-solr-schema> for information on updating your Solr schema in place.
+
+7\. Run ReExportall to update Exports
+
+Following the directions in the [Admin Guide](http://guides.dataverse.org/en/5.10/admin/metadataexport.html#batch-exports-through-the-api)
+
+8\. Upgrade Solr
+
+See "Additional Release Steps" below for how to upgrade Solr.
+
+## Additional Release Steps
+
+### Solr Upgrade
+
+With this release we upgrade to the latest available stable release in the Solr 8.x branch. We recommend a fresh installation of Solr (the index will be empty) followed by an "index all".
+
+Before you start the "index all", the Dataverse installation will appear to be empty because the search results come from Solr. As indexing progresses, partial results will appear until indexing is complete.
+
+See <http://guides.dataverse.org/en/5.10/installation/prerequisites.html#installing-solr> for more information.
+
+Please note that after you have followed the instruction above you will have Solr installed with the default schema that lists all the fields in the standard Dataverse metadata blocks. If your installation uses any custom metadata blocks, please refer to <https://guides.dataverse.org/en/5.10/admin/metadatacustomization.html#updating-the-solr-schema> for information on updating your Solr schema to include these extra fields. 
+
+### PostgreSQL Upgrade
+
+The tested and recommended way of upgrading an existing database is as follows:
+
+- Export your current database with ``pg_dumpall``.
+- Install the new version of PostgreSQL (make sure it's running on the same port, so that no changes are needed in the Payara configuration).
+- Re-import the database with ``psql``, as the user ``postgres``.
+
+It is strongly recommended to use the versions of the ``pg_dumpall`` and ``psql`` from the old and new versions of PostgreSQL, respectively. For example, the commands below were used to migrate a database running under PostgreSQL 9.6 to 13.5. Adjust the versions and the path names to match your environment. 
+
+Back up/export:
+
+``/usr/pgsql-9.6/bin/pg_dumpall -U postgres > /tmp/backup.sql``
+
+Restore/import:
+
+``/usr/pgsql-13/bin/psql -U postgres -f /tmp/backup.sql``
+
+When upgrading the production database here at Harvard IQSS we were able to go from version 9.6 all the way to 13.3 without any issues.
+
+You may want to try these backup and restore steps on a test server to get an accurate estimate of how much downtime to expect with the final production upgrade. That of course will depend on the size of your database. 
+
+Consult the PostgreSQL upgrade documentation for more information, for example <https://www.postgresql.org/docs/13/upgrading.html#UPGRADING-VIA-PGDUMPALL>.
diff --git a/doc/release-notes/5.10.1-release-notes.md b/doc/release-notes/5.10.1-release-notes.md
new file mode 100644
index 00000000000..a7f2250dac9
--- /dev/null
+++ b/doc/release-notes/5.10.1-release-notes.md
@@ -0,0 +1,96 @@
+# Dataverse Software 5.10.1
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Bug Fix for Request Access
+
+Dataverse Software 5.10 contains a bug where the "Request Access" button doesn't work from the file listing on the dataset page if the dataset contains custom terms. This has been fixed in PR #8555.
+
+### Bug Fix for Searching and Selecting Controlled Vocabulary Values
+
+Dataverse Software 5.10 contains a bug where the search option is no longer present when selecting from more than ten controlled vocabulary values. This has been fixed in PR #8521.
+
+## Major Use Cases and Infrastructure Enhancements
+
+Changes and fixes in this release include:
+
+- Users can use the "Request Access" button when the dataset has custom terms. (Issue #8553, PR #8555)
+- Users can search when selecting from more than ten controlled vocabulary values. (Issue #8519, PR #8521)
+- The default file categories ("Documentation", "Data", and "Code") can be redefined through the `:FileCategories` database setting. (Issue #8461, PR #8478)
+- Documentation on troubleshooting Excel ingest errors was improved. (PR #8541)
+- Internationalized controlled vocabulary values can now be searched. (Issue #8286, PR #8435)
+- Curation labels can be internationalized. (Issue #8381, PR #8466)
+- "NONE" is no longer accepted as a license using the SWORD API (since 5.10). See "Backward Incompatibilities" below for details. (Issue #8551, PR #8558).
+
+## Notes for Dataverse Installation Administrators
+
+### PostgreSQL Version 10+ Required Soon
+
+Because 5.10.1 is a bug fix release, an upgrade to PostgreSQL is not required. However, this upgrade is still coming in the next non-bug fix release. For details, please see the release notes for 5.10: https://github.com/IQSS/dataverse/releases/tag/v5.10
+
+### Payara Upgrade
+
+You may notice that the Payara version used in the install scripts has been updated from 5.2021.5 to 5.2021.6. This was to address a bug where it was not possible to easily update the logging level. For existing installations, this release does not require upgrading Payara and a Payara upgrade is not part of the Upgrade Instructions below. For more information, see PR #8508.
+
+## New JVM Options and DB Settings
+
+The following DB settings have been added:
+
+- `:FileCategories` - The default list of the pre-defined file categories ("Documentation", "Data" and "Code") can now be redefined with a comma-separated list (e.g. `'Docs,Data,Code,Workflow'`).
+
+See the [Database Settings](https://guides.dataverse.org/en/5.10.1/installation/config.html#database-settings) section of the Guides for more information.
+
+## Notes for Developers and Integrators
+
+In the "Backward Incompatibilities" section below, note changes in the API regarding licenses and the SWORD API.
+
+## Backward Incompatibilities
+
+As of Dataverse 5.10, "NONE" is no longer supported as a valid license when creating a dataset using the SWORD API. The API Guide has been updated to reflect this. Additionally, if you specify an invalid license, a list of available licenses will be returned in the response.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.10.1 Milestone](https://github.com/IQSS/dataverse/milestone/102?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.10.1/installation/). Please also contact us to get added to the [Dataverse Project Map](https://guides.dataverse.org/en/5.10.1/installation/config.html#putting-your-dataverse-installation-on-the-map-at-dataverse-org) if you have not done so already.
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.10.1.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.  
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+  
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.10.1.war`
+
+5\. Restart payara
+
+- `service payara stop`
+- `service payara start`
diff --git a/doc/release-notes/5.11-release-notes.md b/doc/release-notes/5.11-release-notes.md
new file mode 100644
index 00000000000..a51bcec2dac
--- /dev/null
+++ b/doc/release-notes/5.11-release-notes.md
@@ -0,0 +1,208 @@
+# Dataverse Software 5.11
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Terms of Access or Request Access Required for Restricted Files
+
+Beginning in this release, datasets with restricted files must have either Terms of Access or Request Access enabled. This change is to ensure that for each file in a Dataverse installation there is a clear path to get to the data, either through requesting access to the data or to provide context about why requesting access is not enabled.
+
+Published datasets are not affected by this change. Datasets that are in draft and that have neither Terms of Access nor Request Access enabled must be updated to select one or the other (or both).  Otherwise, datasets cannot be futher edited or published. Dataset authors will be able to tell if their dataset is affected by the presence of the following message at the top of their dataset (when they are logged in):
+
+"Datasets with restricted files are required to have Request Access enabled or Terms of Access to help people access the data. Please edit the dataset to confirm Request Access or provide Terms of Access to be in compliance with the policy."
+
+At this point, authors should click "Edit Dataset" then "Terms" and then check the box for "Request Access" or fill in "Terms of Access for Restricted Files" (or both). Afterwards, authors will be able to further edit metadata and publish.
+
+In the "Notes for Dataverse Installation Administrators" section, we have provided a query to help proactively identify datasets that need to be updated.
+
+See also Issue #8191 and PR #8308.
+
+### Muting Notifications
+
+Users can control which notifications they receive if the system is [configured to allow this](https://guides.dataverse.org/en/5.11/admin/user-administration.html#letting-users-manage-receiving-notifications). See also Issue #7492 and PR #8530.
+
+## Major Use Cases and Infrastructure Enhancements
+
+Changes and fixes in this release include:
+
+- Terms of Access or Request Access required for restricted files. (Issue #8191, PR #8308)
+- Users can control which notifications they receive if the system is [configured to allow this](https://guides.dataverse.org/en/5.11/admin/user-administration.html#letting-users-manage-receiving-notifications). (Issue #7492, PR #8530)
+- A 500 error was occuring when creating a dataset if a template did not have an associated "termsofuseandaccess". See "Legacy Templates Issue" below for details. (Issue #8599, PR #8789)
+- Tabular ingest can be skipped via API. (Issue #8525, PR #8532)
+- The "Verify Email" button has been changed to "Send Verification Email" and rather than sometimes showing a popup now always sends a fresh verification email (and invalidates previous verification emails). (Issue #8227, PR #8579)
+- For Shibboleth users, the `emailconfirmed` timestamp is now set on login and the UI should show "Verified". (Issue #5663, PR #8579)
+- Information about the license selection (or custom terms) is now available in the confirmation popup when contributors click "Submit for Review". Previously, this was only available in the confirmation popup for the "Publish" button, which contributors do not see. (Issue #8561, PR #8691)
+- For installations configured to support multiple languages, controlled vocabulary fields that do not allow multiple entries (e.g. journalArticleType) are now indexed properly. (Issue #8595, PR #8601, PR #8624)
+- Two-letter ISO-639-1 codes for languages are now supported, in metadata imports and harvesting. (Issue #8139, PR #8689)
+- The API endpoint for listing notifications has been enhanced to show the subject, text, and timestamp of notifications. (Issue #8487, PR #8530)
+- The API Guide has been updated to explain that the `Content-type` header is now (as of Dataverse 5.6) necessary to create datasets via native API. (Issue #8663, PR #8676)
+- Admin API endpoints have been added to find and delete dataset templates. (Issue 8600, PR #8706)
+- The BagIt file handler detects and transforms zip files with a BagIt package format into Dataverse data files, validating checksums along the way. See the [BagIt File Handler](https://guides.dataverse.org/en/5.11/installation//config.html#bagit-file-handler) section of the Installation Guide for details. (Issue #8608, PR #8677)
+- For BagIt Export, the number of threads used when zipping data files into an archival bag is now configurable using the `:BagGeneratorThreads` database setting. (Issue #8602, PR #8606)
+- PostgreSQL 14 can now be used (though we've tested mostly with 13). PostgreSQL 10+ is required. (Issue #8295, PR #8296)
+- As always, widgets can be embedded in the `<iframe>` HTML tag, but the HTTP header "Content-Security-Policy" is now being sent on non-widget pages to prevent them from being embedded. (PR #8662)
+- URIs in the the experimental Semantic API have changed (details below). (Issue #8533, PR #8592)
+- Installations running Make Data Count can upgrade to Counter Processor-0.1.04. (Issue #8380, PR #8391)
+- PrimeFaces, the UI framework we use, has been upgraded from 10 to 11. (Issue #8456, PR #8652)
+
+## Notes for Dataverse Installation Administrators
+
+### Identifying Datasets Requiring Terms of Access or Request Access Changes
+
+In support of the change to require either Terms of Access or Request Access for all restricted files (see above for details), we have provided a query to identify datasets in your installation where at least one restricted file has neither Terms of Access nor Request Access enabled:
+
+https://github.com/IQSS/dataverse/blob/v5.11/scripts/issues/8191/datasets_without_toa_or_request_access
+
+This will allow you to reach out to those dataset owners as appropriate.
+
+### Legacy Templates Issue
+
+When custom license functionality was added, dataverses that had older legacy templates as their default template would not allow the creation of a new dataset (500 error).
+
+This occurred because those legacy templates did not have an associated termsofuseandaccess linked to them.
+
+In this release, we run a script that creates a default empty termsofuseandaccess for each of these templates and links them.
+
+Note the termsofuseandaccess that are created this way default to using the license with id=1 (cc0) and the fileaccessrequest to false.
+
+See also Issue #8599 and PR #8789.
+
+### PostgreSQL Version 10+ Required
+
+This release upgrades the bundled PostgreSQL JDBC driver to support major version 14.
+
+Note that the newer PostgreSQL driver required a Flyway version bump, which entails positive and negative consequences:
+
+- The newer version of Flyway supports PostgreSQL 14 and includes a number of security fixes.
+- As of version 8.0 the Flyway Community Edition dropped support for PostgreSQL 9.6 and older.
+
+This means that as foreshadowed in the 5.10 and 5.10.1 release notes, version 10 or higher of PostgreSQL is now required. For suggested upgrade steps, please see "PostgreSQL Update" in the release notes for 5.10: https://github.com/IQSS/dataverse/releases/tag/v5.10
+
+### Counter Processor 0.1.04 Support
+
+This release includes support for counter-processor-0.1.04 for processing Make Data Count metrics. If you are running Make Data Counts support, you should reinstall/reconfigure counter-processor as described in the latest Guides. (For existing installations, note that counter-processor-0.1.04 requires a newer version of Python so you will need to follow the full counter-processor install. Also note that if you configure the new version the same way, it will reprocess the days in the current month when it is first run. This is normal and will not affect the metrics in Dataverse.)
+
+## New JVM Options and DB Settings
+
+The following DB settings have been added:
+
+- `:ShowMuteOptions`
+- `:AlwaysMuted`
+- `:NeverMuted`
+- `:CreateDataFilesMaxErrorsToDisplay`
+- `:BagItHandlerEnabled`
+- `:BagValidatorJobPoolSize`
+- `:BagValidatorMaxErrors`
+- `:BagValidatorJobWaitInterval`
+- `:BagGeneratorThreads`
+
+See the [Database Settings](https://guides.dataverse.org/en/5.11/installation/config.html#database-settings) section of the Guides for more information.
+
+## Notes for Developers and Integrators
+
+See the "Backward Incompatibilities" section below.
+
+## Backward Incompatibilities
+
+### Semantic API Changes
+
+This release includes an update to the experimental semantic API and the underlying assignment of URIs to metadata block terms that are not explicitly mapped to terms in community vocabularies. The change affects the output of the OAI_ORE metadata export, the OAI_ORE file in archival bags, and the input/output allowed for those terms in the semantic API.
+
+For those updating integrating code or existing files intended for input into this release of Dataverse, URIs of the form...
+
+`https://dataverse.org/schema/<block name>/<parentField name>#<childField title>`
+
+and
+
+`https://dataverse.org/schema/<block name>/<Field title>`
+
+...are both replaced with URIs of the form...
+
+`https://dataverse.org/schema/<block name>/<Field name>`.
+
+### Create Dataset API Requires Content-type Header (Since 5.6)
+
+Due to a code change introduced in Dataverse 5.6, calls to the native API without the `Content-type` header will fail to create a dataset. The API Guide has been updated to indicate the necessity of this header: https://guides.dataverse.org/en/5.11/api/native-api.html#create-a-dataset-in-a-dataverse-collection
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.11 Milestone](https://github.com/IQSS/dataverse/milestone/103?closed=1) in GitHub.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.11/installation/). Please also contact us to get added to the [Dataverse Project Map](https://guides.dataverse.org/en/5.11/installation/config.html#putting-your-dataverse-installation-on-the-map-at-dataverse-org) if you have not done so already.
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.11.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.11.war`
+
+5\. Restart Payara
+
+- `service payara stop`
+- `service payara start`
+
+6\. Reload citation metadata block
+
+   `wget https://github.com/IQSS/dataverse/releases/download/v5.11/citation.tsv`
+   `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`
+
+7\. Update Solr `schema.xml`
+
+Note that if you have custom metadata blocks you can skip this step and proceed to the next one.
+
+Edit `schema.xml` and for `journalArticleType` change `multiValued` from "false" to "true" and then restart Solr. Alternatively, download and use the version from https://github.com/IQSS/dataverse/releases/download/v5.11/schema.xml . By default the file can be found at `/usr/local/solr/solr-8.11.1/server/solr/collection1/conf/schema.xml`.
+
+7b\. For installations with custom metadata blocks
+
+Use the script provided in the release to add the custom fields to the base `schema.xml` installed in the previous step.
+
+```
+   wget https://github.com/IQSS/dataverse/releases/download/v5.11/update-fields.sh
+   chmod +x update-fields.sh
+   curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-8.11.1/server/solr/collection1/conf/schema.xml
+```
+
+(Note that the curl command above calls the admin API on `localhost` to obtain the list of the custom fields. In the unlikely case that you are running the main Dataverse Application and Solr on different servers, generate the `schema.xml` on the application node, then copy it onto the Solr server.)
+
+8\. Re-export metadata files (only OAI_ORE is affected)
+
+People archiving Bags should re-archive. Follow the directions in the [Admin Guide](http://guides.dataverse.org/en/5.11/admin/metadataexport.html#batch-exports-through-the-api)
+
+9\. (Optional) Delete duplicate templates in database
+
+Prior to this release making a copy of a dataset template was creating two copies, only one of which is visible in the dataverse collection and usable. The other was not being assigned a collection was invisible to the user (#8600).
+
+If you would like to remove these orphan templates you may run the following script:
+
+https://github.com/IQSS/dataverse/blob/v5.11/scripts/issues/8600/delete_orphan_templates_8600.sh
+
+Also, admin APIs for finding and deleting templates have been added: https://guides.dataverse.org/en/5.11/api/native-api.html#list-dataset-templates
diff --git a/doc/release-notes/5.11.1-release-notes.md b/doc/release-notes/5.11.1-release-notes.md
new file mode 100644
index 00000000000..9baa61cbc6e
--- /dev/null
+++ b/doc/release-notes/5.11.1-release-notes.md
@@ -0,0 +1,72 @@
+# Dataverse Software 5.11.1
+
+This is a bug fix release of the Dataverse Software. The .war file for v5.11 will no longer be made available and installations should upgrade directly from v5.10.1 to v5.11.1. To do so you will need **to follow the instructions for installing release 5.11 using the v5.11.1 war file**. (Note specifically the upgrade steps 6-9 from the 5.11 release note; most importantly, the ones related to the citation block and the Solr schema). **If you had previously installed v5.11** (no longer available), follow the simplified instructions below.
+
+## Release Highlights
+
+Dataverse Software 5.11 contains two critical issues that are fixed in this release.
+
+First, if you delete a file from a published version of a dataset that has restricted files, the file will be deleted from the file system (or S3) and lose its "owner id" in the database. For details, see Issue #8867.
+
+Second, if you are a superuser, it's possible to click "Delete Draft" and delete a published dataset if it has restricted files. For details, see #8845 and #8742.
+
+## Notes for Dataverse Installation Administrators
+
+### Identifying Datasets with Deleted Files
+
+If you have been running 5.11, check if any files show "null" for the owner id. The "owner" of a file is the parent dataset:
+
+```
+select * from dvobject where dtype = 'DataFile' and owner_id is null;
+```
+
+For any of these files, change the owner id to the database id of the parent dataset. In addition, the file on disk (or in S3) is likely gone. Look at the "storageidentifier" field from the query above to determine the location of the file then restore the file from backup.
+
+### Identifying Datasets Superusers May Have Accidentally Destroyed 
+
+Check the "actionlogrecord" table for DestroyDatasetCommand. While these "destroy" entries are normal when a superuser uses the API to destroy datasets, an entry is also created if a superuser has accidentally deleted a published dataset in the web interface with the "Delete Draft" button.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.11.1 Milestone](https://github.com/IQSS/dataverse/milestone/105?closed=1) in GitHub.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.11.1/installation/). Please also contact us to get added to the [Dataverse Project Map](https://guides.dataverse.org/en/5.11.1/installation/config.html#putting-your-dataverse-installation-on-the-map-at-dataverse-org) if you have not done so already.
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.11.1. **To upgrade from 5.10.1, follow the instructions for installing release 5.11 using the v5.11.1 war file**. If you had previously installed v5.11 (no longer available), follow the simplified instructions below.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.11.1.war`
+
+5\. Restart Payara
+
+- `service payara stop`
+- `service payara start`
diff --git a/doc/release-notes/5.12-release-notes.md b/doc/release-notes/5.12-release-notes.md
new file mode 100644
index 00000000000..7085f859046
--- /dev/null
+++ b/doc/release-notes/5.12-release-notes.md
@@ -0,0 +1,255 @@
+# Dataverse Software 5.12
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Support for Globus
+
+[Globus][] can be used to transfer large files. Part of "Harvard Data Commons Additions" below.
+
+[Globus]: https://www.globus.org
+
+### Support for Remote File Storage
+
+Dataset files can be stored at remote URLs. Part of "Harvard Data Commons Additions" below.
+
+### New Computational Workflow Metadata Block
+
+The new Computational Workflow metadata block will allow depositors to effectively tag datasets as computational workflows.
+
+To add the new metadata block, follow the instructions in the Admin Guide: <https://guides.dataverse.org/en/5.12/admin/metadatacustomization.html>
+
+The location of the new metadata block tsv file is `scripts/api/data/metadatablocks/computational_workflow.tsv`. Part of "Harvard Data Commons Additions" below.
+
+### Support for Linked Data Notifications (LDN)
+
+[Linked Data Notifications][] (LDN) is a standard from the W3C. Part of "Harvard Data Commons Additions" below.
+
+[Linked Data Notifications]: https://www.w3.org/TR/ldn/
+
+
+### Harvard Data Commons Additions
+
+As reported at the 2022 Dataverse Community Meeting, the [Harvard Data Commons](https://sites.harvard.edu/harvard-data-commons/) project has supported a wide range of additions to the Dataverse software that improve support for Big Data, Workflows, Archiving, and interaction with other repositories. In many cases, these additions build upon features developed within the Dataverse community by Borealis, DANS, QDR, TDL, and others. Highlights from this work include:
+
+- Initial support for Globus file transfer to upload to and download from a Dataverse managed S3 store. The current implementation disables file restriction and embargo on Globus-enabled stores.
+- Initial support for Remote File Storage. This capability, enabled via a new RemoteOverlay store type, allows a file stored in a remote system to be added to a dataset (currently only via API) with download requests redirected to the remote system. Use cases include referencing public files hosted on external web servers as well as support for controlled access managed by Dataverse (e.g. via restricted and embargoed status) and/or by the remote store.
+- Initial support for computational workflows, including a new metadata block and detected filetypes.
+- Support for archiving to any S3 store using Dataverse's RDA-conformant BagIT file format (a BagPack).
+- Improved error handling and performance in archival bag creation and new options such as only supporting archiving of one dataset version.
+- Additions/corrections to the OAI-ORE metadata format (which is included in archival bags) such as referencing the name/mimetype/size/checksum/download URL of the original file for ingested files, the inclusion of metadata about the parent collection(s) of an archived dataset version, and use of the URL form of PIDs.
+- Display of archival status within the dataset page versions table, richer status options including success, pending, and failure states, with a complete API for managing archival status.
+- Support for batch archiving via API as an alternative to the current options of configuring archiving upon publication or archiving each dataset version manually.
+- Initial support for sending and receiving Linked Data Notification messages indicating relationships between a dataset and external resources (e.g. papers or other dataset) that can be used to trigger additional actions, such as the creation of a back-link to provide, for example, bi-directional linking between a published paper and a Dataverse dataset.
+- A new capability to provide custom per field instructions in dataset templates
+- The following file extensions are now detected:
+  - wdl=text/x-workflow-description-language
+  - cwl=text/x-computational-workflow-language
+  - nf=text/x-nextflow
+  - Rmd=text/x-r-notebook
+  - rb=text/x-ruby-script
+  - dag=text/x-dagman
+
+### Improvements to Fields that Appear in the Citation Metadata Block
+
+Grammar, style and consistency improvements have been made to the titles, tooltip description text, and watermarks of metadata fields that appear in the Citation metadata block.
+
+This includes fields that dataset depositors can edit in the Citation Metadata accordion (i.e. fields controlled by the citation.tsv and citation.properties files) and fields whose values are system-generated, such as the Dataset Persistent ID, Previous Dataset Persistent ID, and Publication Date fields whose titles and tooltips are configured in the bundles.properties file.
+
+The changes should provide clearer information to curators, depositors, and people looking for data about what the fields are for.
+
+A new page in the Style Guides called "Text" has also been added. The new page includes a section called "Metadata Text Guidelines" with a link to a Google Doc where the guidelines are being maintained for now since we expect them to be revised frequently.
+
+### New Static Search Facet: Metadata Types
+
+A new static search facet has been added to the search side panel. This new facet is called "Metadata Types" and is driven from metadata blocks. When a metadata field value is inserted into a dataset, an entry for the metadata block it belongs to is added to this new facet.
+
+This new facet needs to be configured for it to appear on the search side panel. The configuration assigns to a dataverse what metadata blocks to show. The configuration is inherited by child dataverses.
+
+To configure the new facet, use the Metadata Block Facet API: <https://guides.dataverse.org/en/5.12/api/native-api.html#set-metadata-block-facet-for-a-dataverse-collection>
+
+### Broader MicroProfile Config Support for Developers
+
+As of this release, many [JVM options](https://guides.dataverse.org/en/5.12/installation/config.html#jvm-options)
+can be set using any [MicroProfile Config Source](https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Overview.html#config-sources).
+
+Currently this change is only relevant to developers but as settings are migrated to the new "lookup" pattern documented in the [Consuming Configuration](https://guides.dataverse.org/en/5.12/developers/configuration.html) section of the Developer Guide, anyone installing the Dataverse software will have much greater flexibility when configuring those settings, especially within containers. These changes will be announced in future releases.
+
+Please note that an upgrade to Payara 5.2021.8 or higher is required to make use of this. Payara 5.2021.5 threw exceptions, as explained in PR #8823.
+
+### HTTP Range Requests: New HTTP Status Codes and Headers for Datafile Access API
+
+The Basic File Access resource for datafiles (/api/access/datafile/$id) was slightly modified in order to comply better with the HTTP specification for range requests.
+
+If the request contains a "Range" header:
+* The returned HTTP status is now 206 (Partial Content) instead of 200
+* A "Content-Range" header is returned containing information about the returned bytes
+* An "Accept-Ranges" header with value "bytes" is returned
+
+CORS rules/headers were modified accordingly:
+* The "Range" header is added to "Access-Control-Allow-Headers"
+* The "Content-Range" and "Accept-Ranges" header are added to "Access-Control-Expose-Headers"
+
+### File Type Detection When File Has No Extension
+
+File types are now detected based on the filename when the file has no extension.
+
+The following filenames are now detected:
+
+- Makefile=text/x-makefile
+- Snakemake=text/x-snakemake
+- Dockerfile=application/x-docker-file
+- Vagrantfile=application/x-vagrant-file
+
+These are defined in `MimeTypeDetectionByFileName.properties`.
+
+### Upgrade to Payara 5.2022.3 Highly Recommended
+
+With lots of bug and security fixes included, we encourage everyone to upgrade to Payara 5.2022.3 as soon as possible. See below for details.
+
+## Major Use Cases and Infrastructure Enhancements
+
+Changes and fixes in this release include:
+
+- Administrators can configure an S3 store used in Dataverse to support users uploading/downloading files via Globus File Transfer. (PR #8891)
+- Administrators can configure a RemoteOverlay store to allow files that remain hosted by a remote system to be added to a dataset. (PR #7325)
+- Administrators can configure the Dataverse software to send archival Bag copies of published dataset versions to any S3-compatible service. (PR #8751)
+- Users can see information about a dataset's parent collection(s) in the OAI-ORE metadata export. (PR #8770)
+- Users and administrators can now use the OAI-ORE metadata export to retrieve and assess the fixity of the original file (for ingested tabular files) via the included checksum. (PR #8901)
+- Archiving via RDA-conformant Bags is more robust and is more configurable. (PR #8773, #8747, #8699, #8609, #8606, #8610)
+- Users and administrators can see the archival status of the versions of the datasets they manage in the dataset page version table. (PR #8748, #8696)
+- Administrators can configure messaging between their Dataverse installation and other repositories that may hold related resources or services interested in activity within that installation. (PR #8775)
+- Collection managers can create templates that include custom instructions on how to fill out specific metadata fields.
+- Dataset update API users are given more information when the dataset they are updating is out of compliance with Terms of Access requirements (Issue #8859) 
+- Adds a new setting (:ControlledVocabularyCustomJavaScript) that allows a JavaScript file to be loaded into the dataset page for the purpose of showing controlled vocabulary as a list (Issue #8722)
+- Fixes an issue with the Redetect File Type API (Issue #7527)
+- Terms of Use is now imported when using DDI format through harvesting or the native API. (Issue #8715, PR #8743)
+- Optimizes some code to improve application memory usage (Issue #8871)
+- Fixes sample data to reflect custom licenses.
+- Fixes the Archival Status Input API (available to superusers) (Issue #8924)
+- Small bugs have been fixed in the dataset export in the JSON and DDI formats; eliminating the export of "undefined" as a metadata language in the former, and a duplicate keyword tag in the latter. (Issue #8868)
+
+## New DB Settings
+
+The following DB settings have been added:
+- `:ShibAffiliationOrder`  - Select the first or last entry in an Affiliation array
+- `:ShibAffiliationSeparator` (default: ";") - Set the separator for the Affiliation array
+- `:LDNMessageHosts`
+- `:GlobusBasicToken`
+- `:GlobusEndpoint`
+- `:GlobusStores`
+- `:GlobusAppUrl`
+- `:GlobusPollingInterval`
+- `:GlobusSingleFileTransfer`
+- `:S3ArchiverConfig`
+- `:S3ArchiverProfile`
+- `:DRSArchiverConfig`
+- `:ControlledVocabularyCustomJavaScript` 
+
+See the [Database Settings](https://guides.dataverse.org/en/5.12/installation/config.html#database-settings) section of the Guides for more information.
+
+## Notes for Dataverse Installation Administrators
+
+### Enabling Experimental Capabilities
+
+Several of the capabilities introduced in v5.12 are "experimental" in the sense that further changes and enhancements to these capabilities should be expected and that these changes may involve additional work, for those who use the initial implementations, when upgrading to newer versions of the Dataverse software. Administrators wishing to use them are encouraged to stay in touch, e.g. via the Dataverse Community Slack space, to understand the limits of current capabilities and to plan for future upgrades.
+
+## Notes for Developers and Integrators
+
+See the "Backward Incompatibilities" section below.
+
+## Backward Incompatibilities
+
+### OAI-ORE and Archiving Changes
+
+The Admin API call to manually submit a dataset version for archiving has changed to require POST instead of GET and to have a name making it clearer that archiving is being done for a given dataset version: /api/admin/submitDatasetVersionToArchive.
+
+Earlier versions of the archival bags included the ingested (tab-separated-value) version of tabular files while providing the checksum of the original file (Issue #8449). This release fixes that by including the original file and its metadata in the archival bag. This means that archival bags created prior to this version do not include a way to validate ingested files. Further, it is likely that capabilities in development (i.e. as part of the [Dataverse Uploader](https://github/org/GlobalDataverseCommunityConsortium/dataverse-uploader) to allow re-creation of a dataset version from an archival bag will only be fully compatible with archival bags generated by a Dataverse instance at a release > v5.12. (Specifically, at a minimum, since only the ingested file is included in earlier archival bags, an upload via DVUploader would not result in the same original file/ingested version as in the original dataset.) Administrators should be aware that re-creating archival bags, i.e. via the new batch archiving API, may be advisable now and will be recommended at some point in the future (i.e. there will be a point where we will start versioning archival bags and will start maintaining backward compatibility for older versions as part of transitioning this from being an experimental capability).
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.12/installation/). Please also contact us to get added to the [Dataverse Project Map](https://guides.dataverse.org/en/5.10/installation/config.html#putting-your-dataverse-installation-on-the-map-at-dataverse-org) if you have not done so already.
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.10.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.  
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+### Instructions for Upgrading to Payara 5.2022.3
+
+**Note:** with the approaching EOL for the Payara 5 Community release train it's likely we will switch to a
+yet-to-be-released Payara 6 in the not-so-far-away future.
+
+We recommend you ensure you followed all update instructions from the past releases regarding Payara.
+(latest Payara update was for [v5.6](https://github.com/IQSS/dataverse/releases/tag/v5.6))
+
+Upgrading requires a maintenance window and downtime. Please plan ahead, create backups of your database, etc.
+
+The steps below are a simple matter of reusing your existing domain directory with the new distribution.
+But we also recommend that you review the Payara upgrade instructions as it could be helpful during any troubleshooting:
+[Payara Release Notes](https://docs.payara.fish/community/docs/Release%20Notes/Release%20Notes%205.2022.3.html)
+
+Please note that the deletion of the `lib/databases` directory below is only required once, for this upgrade (see Issue #8230 for details).
+
+```shell
+export PAYARA=/usr/local/payara5
+```
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version
+
+```shell
+    $PAYARA/bin/asadmin list-applications
+    $PAYARA/bin/asadmin undeploy dataverse<-version>
+```
+
+2\. Stop Payara
+
+```shell
+    service payara stop
+    rm -rf $PAYARA/glassfish/domains/domain1/generated
+    rm -rf $PAYARA/glassfish/domains/domain1/osgi-cache
+    rm -rf $PAYARA/glassfish/domains/domain1/lib/databases
+```
+
+3\. Move the current Payara directory out of the way
+
+```shell
+    mv $PAYARA $PAYARA.MOVED
+```
+
+4\. Download the new Payara version (5.2022.3), and unzip it in its place
+
+5\. Replace the brand new payara/glassfish/domains/domain1 with your old, preserved domain1
+
+6\. Start Payara
+
+```shell
+    service payara start
+```
+
+7\. Deploy this version.
+
+```shell
+    $PAYARA/bin/asadmin deploy dataverse-5.12.war
+```
+
+8\. Restart payara
+
+```shell
+    service payara stop
+    service payara start
+```
+### Additional Upgrade Steps
+
+Update the Citation metadata block:
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v5.12/citation.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`
+
+- Run ReExportAll to update metadata files (OAI_ORE, JSON and DDI formats are affected by the changes and bug fixes in this release; PRs #8770 and #8868). Optionally, for those using the Dataverse software's BagIt-based archiving, re-archive dataset versions archived using prior versions of the Dataverse software. This will be recommended/required in a future release.
diff --git a/doc/release-notes/5.12.1-release-notes.md b/doc/release-notes/5.12.1-release-notes.md
new file mode 100644
index 00000000000..aa8896660f3
--- /dev/null
+++ b/doc/release-notes/5.12.1-release-notes.md
@@ -0,0 +1,115 @@
+# Dataverse Software 5.12.1
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Bug Fix for "Internal Server Error" When Creating a New Remote Account
+
+Unfortunately, as of 5.11 new remote users have seen "Internal Server Error" when creating an account (or checking notifications just after creating an account). Remote users are those who log in with institutional (Shibboleth), OAuth (ORCID, GitHub, or Google) or OIDC providers.
+
+This is a transient error that can be worked around by reloading the browser (or logging out and back in again) but it's obviously a very poor user experience and a bad first impression. This bug is the primary reason we are putting out this patch release. Other features and bug fixes are coming along for the ride.
+
+### Ability to Disable OAuth Sign Up While Allowing Existing Accounts to Log In
+
+A new option called `:AllowRemoteAuthSignUp` has been added providing a mechanism for disabling new account signups for specific OAuth2 authentication providers (Orcid, GitHub, Google etc.) while still allowing logins for already-existing accounts using this authentication method.
+
+See the [Installation Guide](https://guides.dataverse.org/en/5.12.1/installation/config.html#allowremoteauthsignup) for more information on the setting. 
+
+### Production Date Now Used for Harvested Datasets in Addition to Distribution Date (`oai_dc` format)
+
+Fix the year displayed in citation for harvested dataset, especially for `oai_dc` format.
+
+For normal datasets, the date used is the "citation date" which is by default the publication date (the first release date) unless you [change it](https://guides.dataverse.org/en/5.12.1/api/native-api.html#set-citation-date-field-type-for-a-dataset).
+
+However, for a harvested dataset, the distribution date was used instead and this date is not always present in the harvested metadata.
+
+Now, the production date is used for harvested dataset in addition to distribution date when harvesting with the `oai_dc` format.
+
+### Publication Date Now Used for Harvested Dataset if Production Date is Not Set (`oai_dc` format)
+
+For exports and harvesting in `oai_dc` format, if "Production Date" is not set, "Publication Date" is now used instead. This change is reflected in the [Dataverse 4+ Metadata Crosswalk][] linked from the [Appendix][] of the User Guide.
+
+[Dataverse 4+ Metadata Crosswalk]: https://docs.google.com/spreadsheets/d/10Luzti7svVTVKTA-px27oq3RxCUM-QbiTkm8iMd5C54/edit#gid=1901625433&range=K7
+[Appendix]: https://guides.dataverse.org/en/5.12.1/user/appendix.html
+
+## Major Use Cases and Infrastructure Enhancements
+
+Changes and fixes in this release include:
+
+- Users creating an account by logging in with Shibboleth, OAuth, or OIDC should not see errors. (Issue 9029, PR #9030)
+- When harvesting datasets, I want the Production Date if I can't get the Distribution Date (PR #8732)
+- When harvesting datasets, I want the Publication Date if I can't get the Production Date (PR #8733)
+- As a sysadmin I'd like to disable (temporarily or permanently) sign ups from OAuth providers while allowing existing users to continue to log in from that provider (PR #9112)
+- As a C/C++ developer I want to use Dataverse APIs (PR #9070)
+
+## New DB Settings
+
+The following DB settings have been added:
+
+- `:AllowRemoteAuthSignUp`
+
+See the [Database Settings](https://guides.dataverse.org/en/5.12.1/installation/config.html#database-settings) section of the Guides for more information.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.12.1 Milestone](https://github.com/IQSS/dataverse/milestone/106?closed=1) in GitHub.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.12.1/installation/). Please also contact us to get added to the [Dataverse Project Map](https://guides.dataverse.org/en/5.10/installation/config.html#putting-your-dataverse-installation-on-the-map-at-dataverse-org) if you have not done so already.
+
+## Upgrade Instructions
+
+Upgrading requires a maintenance window and downtime. Please plan ahead, create backups of your database, etc.
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.12.1.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
+
+```shell
+export PAYARA=/usr/local/payara5
+```
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version
+
+```shell
+    $PAYARA/bin/asadmin list-applications
+    $PAYARA/bin/asadmin undeploy dataverse<-version>
+```
+
+2\. Stop Payara
+
+```shell
+    service payara stop
+    rm -rf $PAYARA/glassfish/domains/domain1/generated
+```
+
+6\. Start Payara
+
+```shell
+    service payara start
+```
+
+7\. Deploy this version.
+
+```shell
+    $PAYARA/bin/asadmin deploy dataverse-5.12.1.war
+```
+
+8\. Restart payara
+
+```shell
+    service payara stop
+    service payara start
+```
+
+## Upcoming Versions of Payara
+
+With the recent release of Payara 6 ([Payara 6.2022.1](https://github.com/payara/Payara/releases/tag/payara-server-6.2022.1) being the first version), the days of free-to-use Payara 5.x Platform Community versions [are numbered](https://blog.payara.fish/whats-new-in-the-november-2022-payara-platform-release). Specifically, Payara's blog post says, "Payara Platform Community 5.2022.4 has been released today as the penultimate Payara 5 Community release."
+
+Given the end of free-to-use Payara 5 versions, we plan to get the Dataverse software working on Payara 6 (#8305), which will require substantial efforts from the IQSS team and community members, as this also means shifting our app to be a [Jakarta EE 10](https://jakarta.ee/release/10/) application (upgrading from EE 8). We are currently working out the details and will share news as soon as we can. Rest assured we will do our best to provide you with a smooth transition. You can follow along in Issue #8305 and related pull requests and you are, of course, very welcome to participate by testing and otherwise contributing, as always.
diff --git a/doc/release-notes/5.13-release-notes.md b/doc/release-notes/5.13-release-notes.md
new file mode 100644
index 00000000000..5e1741aec7e
--- /dev/null
+++ b/doc/release-notes/5.13-release-notes.md
@@ -0,0 +1,262 @@
+# Dataverse Software 5.13
+
+This release brings new features, enhancements, and bug fixes to the Dataverse software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Schema.org Improvements (Some Backward Incompatibility)
+
+The Schema.org metadata used as an export format and also embedded in dataset pages has been updated to improve compliance with Schema.org's schema and Google's recommendations for Google Dataset Search.
+
+Please be advised that these improvements have the chance to break integrations that rely on the old, less compliant structure. For details see the "backward incompatibility" section below. (Issue #7349)
+
+### Folder Uploads via Web UI (dvwebloader, S3 only)
+
+For installations using S3 for storage and with direct upload enabled, a new tool called [DVWebloader](https://github.com/gdcc/dvwebloader) can be enabled that allows web users to upload a folder with a hierarchy of files and subfolders while retaining the relative paths of files (similarly to how the DVUploader tool does it on the command line, but with the convenience of using the browser UI). See [Folder Upload](https://guides.dataverse.org/en/5.13/user/dataset-management.html#folder-upload) in the User Guide for details. (PR #9096)
+
+### Long Descriptions of Collections (Dataverses) are Now Truncated
+
+Like datasets, long descriptions of collections (dataverses) are now truncated by default but can be expanded with a "read full description" button. (PR #9222)
+
+### License Sorting
+
+Licenses as shown in the dropdown in UI can be now sorted by the superusers. See [Sorting Licenses](https://guides.dataverse.org/en/5.13/installation/config.html#sorting-licenses) section of the Installation Guide for details. (PR #8697)
+
+### Metadata Field Production Location Now Repeatable, Facetable, and Enabled for Advanced Search
+
+Depositors can now click the plus sign to enter multiple instances of the metadata field "Production Location" in the citation metadata block. Additionally this field now appears on the Advanced Search page and can be added to the list of search facets. (PR #9254)
+
+### Support for NetCDF and HDF5 Files
+
+ NetCDF and HDF5 files are now detected based on their content rather than just their file extension. Both "classic" NetCDF 3 files and more modern NetCDF 4 files are detected based on content. Detection for older HDF4 files is only done through the file extension ".hdf", as before.
+
+For NetCDF and HDF5 files, an attempt will be made to extract metadata in NcML (XML) format and save it as an auxiliary file. There is a new NcML previewer available in the [dataverse-previewers](https://github.com/gdcc/dataverse-previewers) repo.
+
+An [extractNcml](https://guides.dataverse.org/en/5.13/api/native-api.html#extract-ncml) API endpoint has been added, especially for installations with existing NetCDF and HDF5 files. After upgrading, they can iterate through these files and try to extract an NcML file.
+
+See the [NetCDF and HDF5](https://guides.dataverse.org/en/5.13/user/dataset-management.html#netcdf-and-hdf5) section of the User Guide for details. (PR #9239)
+
+### Support for .eln Files (Electronic Laboratory Notebooks)
+
+The [.eln file format](https://github.com/TheELNConsortium/TheELNFileFormat) is used by Electronic Laboratory Notebooks as an exchange format for experimental protocols, results, sample descriptions, etc...
+
+### Improved Security for External Tools
+
+External tools can now be configured to use signed URLs to access the Dataverse API as an alternative to API tokens. This eliminates the need for tools to have access to the user's API token in order to access draft or restricted datasets and datafiles. Signed URLs can be transferred via POST or via a callback when triggering a tool via GET. See [Authorization Options](https://guides.dataverse.org/en/5.13/api/external-tools.html#authorization-options) in the External Tools documentation for details. (PR #9001)
+
+### Geospatial Search (API Only)
+
+Geospatial search is supported via the Search API using two new [parameters](https://guides.dataverse.org/en/5.13/api/search.html#parameters): `geo_point` and `geo_radius`.
+
+The fields that are geospatially indexed are "West Longitude", "East Longitude", "North Latitude", and "South Latitude" from the "Geographic Bounding Box" field in the geospatial metadata block. (PR #8239)
+
+### Reproducibility and Code Execution with Binder
+
+Binder has been added to the list of external tools that can be added to a Dataverse installation. From the dataset page, you can launch Binder, which spins up a computational environment in which you can explore the code and data in the dataset, or write new code, such as a Jupyter notebook. (PR #9341)
+
+### CodeMeta (Software) Metadata Support (Experimental)
+
+Experimental support for research software metadata deposits has been added.
+
+By adding a metadata block for [CodeMeta](https://codemeta.github.io), we take another step toward adding first class support of diverse FAIR objects, such as research software and computational workflows.
+
+There is more work underway to make Dataverse installations around the world "research software ready." 
+
+**Note:** Like the metadata block for computational workflows before, CodeMeta is listed under [Experimental Metadata](https://guides.dataverse.org/en/5.13/user/appendix.html#experimental-metadata) in the guides. Experimental means it's brand new, opt-in, and might need future tweaking based on experience of usage in the field. We hope for feedback from installations on the new metadata block to optimize and lift it from the experimental stage. (PR #7877)
+
+### Mechanism Added for Stopping a Harvest in Progress
+
+It is now possible for a sysadmin to stop a long-running harvesting job. See [Harvesting Clients](https://guides.dataverse.org/en/5.13/admin/harvestclients.html#how-to-stop-a-harvesting-run-in-progress) in the Admin Guide for more information. (PR #9187)
+
+### API Endpoint Listing Metadata Block Details has been Extended
+
+The API endpoint `/api/metadatablocks/{block_id}` has been extended to include the following fields:
+
+- `controlledVocabularyValues` - All possible values for fields with a controlled vocabulary. For example, the values "Agricultural Sciences", "Arts and Humanities", etc. for the "Subject" field.
+- `isControlledVocabulary`:  Whether or not this field has a controlled vocabulary.
+- `multiple`: Whether or not the field supports multiple values.
+
+See [Metadata Blocks](https://guides.dataverse.org/en/5.13/api/native-api.html#metadata-blocks-api) in the API Guide for details. (PR #9213)
+
+### Advanced Database Settings
+
+You can now enable advanced database connection pool configurations useful for debugging and monitoring as well as other settings. Of particular interest may be `sslmode=require`, though installations already setting this parameter in the Postgres connection string will need to move it to `dataverse.db.parameters`. See the new [Database Persistence](https://guides.dataverse.org/en/5.13/installation/config.html#database-persistence) section of the Installation Guide for details. (PR #8915)
+
+### Support for Cleaning up Leftover Files in Dataset Storage
+
+Experimental feature: the leftover files stored in the Dataset storage location that are not in the file list of that Dataset, but are named following the Dataverse technical convention for dataset files, can be removed with the new [Cleanup Storage of a Dataset](https://guides.dataverse.org/en/5.13/api/native-api.html#cleanup-storage-of-a-dataset) API endpoint.
+
+### OAI Server Bug Fixed
+
+A bug introduced in 5.12 was preventing the Dataverse OAI server from serving incremental harvesting requests from clients. It was fixed in this release (PR #9316). 
+
+## Major Use Cases and Infrastructure Enhancements
+
+Changes and fixes in this release not already mentioned above include:
+
+- Administrators can configure an alternative storage location where files uploaded via the UI are temporarily stored during the transfer from client to server. (PR #8983, See also [Configuration Guide](http://guides.dataverse.org/en/5.13/installation/config.html#temporary-upload-file-storage))
+- To improve performance, Dataverse estimates download counts. This release includes an update that makes the estimate more accurate. (PR #8972)
+- Direct upload and out-of-band uploads can now be used to replace multiple files with one API call (complementing the prior ability to add multiple new files). (PR #9018)
+- A persistent identifier, [CSRT](https://www.cstr.cn/search/specification/), is added to the Related Publication field's ID Type child field. For datasets published with CSRT IDs, Dataverse will also include them in the datasets' Schema.org metadata exports. (Issue #8838)
+- Datasets that are part of linked dataverse collections will now be displayed in their linking dataverse collections.
+
+## New JVM Options and MicroProfile Config Options
+
+The following JVM option is now available:
+
+- `dataverse.personOrOrg.assumeCommaInPersonName` - the default is false
+
+The following MicroProfile Config options are now available (these can be treated as JVM options):
+
+- `dataverse.files.uploads` - alternative storage location of generated temporary files for UI file uploads
+- `dataverse.api.signing-secret` - used by signed URLs
+- `dataverse.solr.host`
+- `dataverse.solr.port`
+- `dataverse.solr.protocol`
+- `dataverse.solr.core`
+- `dataverse.solr.path`
+- `dataverse.rserve.host`
+
+The following existing JVM options are now available via MicroProfile Config:
+
+- `dataverse.siteUrl`
+- `dataverse.fqdn`
+- `dataverse.files.directory`
+- `dataverse.rserve.host`
+- `dataverse.rserve.port`
+- `dataverse.rserve.user`
+- `dataverse.rserve.password`
+- `dataverse.rserve.tempdir`
+
+## Notes for Developers and Integrators
+
+See the "Backward Incompatibilities" section below.
+
+## Backward Incompatibilities
+
+### Schema.org
+
+The following changes have been made to Schema.org exports (necessary for the improvements mentioned above):
+
+- Descriptions are now joined and truncated to less than 5K characters.
+- The "citation"/"text" key has been replaced by a "citation"/"name" key.
+- File entries now have the mimetype reported as 'encodingFormat' rather than 'fileFormat' to better conform with the Schema.org specification for DataDownload entries. Download URLs are now sent for all files unless the dataverse.files.hide-schema-dot-org-download-urls setting is set to true.
+- Author/creators now have an @type of Person or Organization and any affiliation (affiliation for Person, parentOrganization for Organization) is now an object of @type Organization
+
+### License Files
+
+License files are now required to contain the new "sortOrder" column. When attempting to create a new license without this field, an error would be returned. See [Configuring Licenses](https://guides.dataverse.org/en/5.13/installation/config.html#configuring-licenses) section of the Installation Guide for reference.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.13 milestone](https://github.com/IQSS/dataverse/milestone/107?closed=1) on GitHub.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.13/installation/). Please don't be shy about [asking for help](https://guides.dataverse.org/en/5.13/installation/intro.html#getting-help) if you need it!
+
+After your installation has gone into production, you are welcome to add it to our [map of installations](https://dataverse.org/installations) by opening an issue in the [dataverse-installations](https://github.com/IQSS/dataverse-installations) repo.
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from version 4.x to 5.0 of the Dataverse software following the instructions in the [release notes for version 5.0](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.13.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.13.war`
+
+5\. Restart Payara
+
+- `service payara stop`
+- `service payara start`
+
+6\. Reload citation metadata block
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v5.13/citation.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`
+
+If you are running an English-only installation, you are finished with the citation block. Otherwise, download the updated citation.properties file and place in the [`dataverse.lang.directory`](https://guides.dataverse.org/en/5.13/installation/config.html#configuring-the-lang-directory).
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v5.13/citation.properties`
+- `cp citation.properties /home/dataverse/langBundles`
+
+7\. Replace Solr schema.xml to allow multiple production locations and support for geospatial indexing to be used. See specific instructions below for those installations without custom metadata blocks (1a) and those with  custom metadata blocks  (1b).
+
+Note: with this release support for indexing of the experimental workflow metadata block has been removed from the standard schema.xml. 
+If you are using the workflow metadata block be sure to follow the instructions in step 7b) below to maintain support for indexing workflow metadata.
+
+7a\. For installations without custom or experimental metadata blocks:
+
+- Stop Solr instance (usually service solr stop, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/5.13/installation/prerequisites.html#solr-init-script)
+
+- Replace schema.xml
+
+  - `cp /tmp/dvinstall/schema.xml /usr/local/solr/solr-8.11.1/server/solr/collection1/conf`
+
+- Start solr instance (usually service solr start, depending on Solr/OS)
+
+7b\. For installations with custom or experimental metadata blocks:
+
+- Stop solr instance (usually service solr stop, depending on solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/5.13/installation/prerequisites.html#solr-init-script)
+
+- Edit the following line to your schema.xml (to indicate that productionPlace is now multiValued='true"):
+
+    `<field name="productionPlace" type="string" stored="true" indexed="true" multiValued="true"/>`
+
+- Add the following lines to your schema.xml to add support for geospatial indexing:
+
+    `<!-- Dataverse geospatial search -->`
+    `<!-- https://solr.apache.org/guide/8_11/spatial-search.html#rpt -->`
+    `<field name="geolocation" type="location_rpt" multiValued="true" stored="true" indexed="true"/>`
+    `<!-- https://solr.apache.org/guide/8_11/spatial-search.html#bboxfield -->`
+    `<field name="boundingBox" type="bbox" multiValued="true" stored="true" indexed="true"/>`
+    `<!-- Dataverse - per GeoBlacklight, adding field type for bboxField that enables, among other things, overlap ratio calculations -->`
+    `<fieldType name="bbox" class="solr.BBoxField"
+           geo="true" distanceUnits="kilometers" numberType="pdouble" />`
+
+- Restart Solr instance (usually service solr start, depending on solr/OS)
+
+### Optional Upgrade Step: Reindex Linked Dataverse Collections
+
+Datasets that are part of linked dataverse collections will now be displayed in 
+their linking dataverse collections. In order to fix the display of collections 
+that have already been linked you must re-index the linked collections. This 
+query will provide a list of commands to re-index the effected collections:
+
+```
+select 'curl http://localhost:8080/api/admin/index/dataverses/' 
+|| tmp.dvid  from (select distinct  dataverse_id as dvid  
+from dataverselinkingdataverse)  as tmp
+```
+
+The result of the query will be a list of re-index commands such as:
+
+`curl http://localhost:8080/api/admin/index/dataverses/633`
+
+where '633' is the id of the linked collection.
+
+### Optional Upgrade Step: Run File Detection on .eln Files
+
+Now that .eln files are recognized, you can run the [Redetect File Type](https://guides.dataverse.org/en/5.13/api/native-api.html#redetect-file-type) API on them to switch them from "unknown" to "ELN Archive". Afterward, you can reindex these files to make them appear in search facets.
diff --git a/doc/release-notes/5.14-release-notes.md b/doc/release-notes/5.14-release-notes.md
new file mode 100644
index 00000000000..ef2a3b59659
--- /dev/null
+++ b/doc/release-notes/5.14-release-notes.md
@@ -0,0 +1,404 @@
+# Dataverse Software 5.14
+
+(If this note appears truncated on the GitHub Releases page, you can view it in full in the source tree: https://github.com/IQSS/dataverse/blob/master/doc/release-notes/5.14-release-notes.md)
+
+This release brings new features, enhancements, and bug fixes to the Dataverse software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+Please note that, as an experiment, the sections of this release note are organized in a different order. The Upgrade and Installation sections are at the top, with the detailed sections highlighting new features and fixes further down. 
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.14/installation/). Please don't be shy about [asking for help](https://guides.dataverse.org/en/5.14/installation/intro.html#getting-help) if you need it!
+
+After your installation has gone into production, you are welcome to add it to our [map of installations](https://dataverse.org/installations) by opening an issue in the [dataverse-installations](https://github.com/IQSS/dataverse-installations) repo.
+
+## Upgrade Instructions
+
+0\. These instructions assume that you are upgrading from 5.13. If you are running an earlier version, the only safe way to upgrade is to progress through the upgrades to all the releases in between before attempting the upgrade to 5.14. 
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin undeploy dataverse-5.13`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.14.war`
+
+5\. Restart Payara
+
+- `service payara stop`
+- `service payara start`
+
+6\. Update the Citation metadata block: (the update makes the field Series repeatable)
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v5.14/citation.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`
+
+If you are running an English-only installation, you are finished with the citation block. Otherwise, download the updated citation.properties file and place it in the [`dataverse.lang.directory`](https://guides.dataverse.org/en/5.14/installation/config.html#configuring-the-lang-directory); `/home/dataverse/langBundles` used in the example below.
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v5.14/citation.properties`
+- `cp citation.properties /home/dataverse/langBundles`
+
+7\. Upate Solr schema.xml to allow multiple series to be used. See specific instructions below for those installations without custom metadata blocks (7a) and those with  custom metadata blocks  (7b).
+
+7a\. For installations without custom or experimental metadata blocks:
+
+- Stop Solr instance (usually `service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/5.14/installation/prerequisites.html#solr-init-script))
+
+- Replace schema.xml
+
+  - `cp /tmp/dvinstall/schema.xml /usr/local/solr/solr-8.11.1/server/solr/collection1/conf`
+
+- Start Solr instance (usually `service solr start`, depending on Solr/OS)
+
+7b\. For installations with custom or experimental metadata blocks:
+
+- Stop Solr instance (usually `service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/5.14/installation/prerequisites.html#solr-init-script))
+
+- There are 2 ways to regenerate the schema: Either by collecting the output of the Dataverse schema API and feeding it to the `update-fields.sh` script that we supply, as in the example below (modify the command lines as needed):
+```
+	wget https://raw.githubusercontent.com/IQSS/dataverse/master/conf/solr/8.11.1/update-fields.sh
+	chmod +x update-fields.sh
+	curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-8.8.1/server/solr/collection1/conf/schema.xml
+```
+OR, alternatively, you can edit the following lines in your schema.xml by hand as follows (to indicate that series and its components are now `multiValued="true"`):
+```
+     <field name="series" type="string" stored="true" indexed="true" multiValued="true"/>
+     <field name="seriesInformation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+     <field name="seriesName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+```
+     
+- Restart Solr instance (usually `service solr restart` depending on solr/OS)
+
+8\. Run ReExportAll to update dataset metadata exports. Follow the directions in the [Admin Guide](http://guides.dataverse.org/en/5.14/admin/metadataexport.html#batch-exports-through-the-api).
+
+9\. If your installation did not have :FilePIDsEnabled set, you will need to set it to true to keep file PIDs enabled:
+
+      curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:FilePIDsEnabled
+
+10\. If your installation uses Handles as persistent identifiers (instead of DOIs): remember to upgrade your Handles service installation to a currently supported version.
+
+Generally, Handles is known to be working reliably even when running older versions that haven't been officially supported in years. We still recommend to check on your service and make sure to upgrade to a supported version (the latest version is 9.3.1, https://www.handle.net/hnr-source/handle-9.3.1-distribution.tar.gz, as of writing this). An older version may be running for you seemingly just fine, but do keep in mind that it may just stop working unexpectedly at any moment, because of some incompatibility introduced in a Java rpm upgrade, or anything similarly unpredictable.
+
+Handles is also very good about backward incompatibility. Meaning, in most cases you can simply stop the old version, unpack the new version from the distribution and start it on the existing config and database files, and it'll just keep working. However, it is a good idea to keep up with the recommended format upgrades, for the sake of efficiency and to avoid any unexpected surprises, should they finally decide to drop the old database format, for example. The two specific things we recommend: 1) Make sure your service is using a json version of the `siteinfo` bundle (i.e., if you are still using `siteinfo.bin`, convert it to `siteinfo.json` and remove the binary file from the service directory) and 2) Make sure you are using the newer bdbje database format for your handles catalog (i.e., if you still have the files `handles.jdb` and `nas.jdb` in your server directory, convert them to the new format). Follow the simple conversion instructions in the file README.txt in the Handles software distribution. Make sure to stop the service before converting the files and make sure to have a full backup of the existing server directory, just in case. Do not hesitate to contact the Handles support with any questions you may have, as they are very responsive and helpful.
+
+## New JVM Options and MicroProfile Config Options
+
+The following PID provider options are now available. See the section "Changes to PID Provider JVM Settings" below for more information. 
+
+- `dataverse.pid.datacite.mds-api-url`
+- `dataverse.pid.datacite.rest-api-url`
+- `dataverse.pid.datacite.username`
+- `dataverse.pid.datacite.password`
+- `dataverse.pid.handlenet.key.path`
+- `dataverse.pid.handlenet.key.passphrase`
+- `dataverse.pid.handlenet.index`
+- `dataverse.pid.permalink.base-url`
+- `dataverse.pid.ezid.api-url`
+- `dataverse.pid.ezid.username`
+- `dataverse.pid.ezid.password`
+
+The following MicroProfile Config options have been added as part of [Signposting](https://signposting.org/) support. See the section "Signposting for Dataverse" below for details. 
+
+- `dataverse.signposting.level1-author-limit`
+- `dataverse.signposting.level1-item-limit`
+
+The following JVM options are described in the "Creating datasets with incomplete metadata through API" section below. 
+
+- `dataverse.api.allow-incomplete-metadata`
+- `dataverse.ui.show-validity-filter`
+- `dataverse.ui.allow-review-for-incomplete`
+
+The following JVM/MicroProfile setting is for External Exporters. See "Mechanism Added for Adding External Exporters" below.
+
+- `dataverse.spi.export.directory`
+
+The following JVM/MicroProfile settings are for handling of support emails. See "Contact Email Improvements" below.
+
+- `dataverse.mail.support-email`
+- `dataverse.mail.cc-support-on-contact-emails` 
+
+The following JVM/MicroProfile setting is for extracting a geospatial bounding box even if S3 direct upload is enabled.
+
+- `dataverse.netcdf.geo-extract-s3-direct-upload`
+
+## Backward Incompatibilities
+
+The following list of potential backward incompatibilities references the sections of the "Detailed Release Highlights..." portion of the document further below where the corresponding changes are explained in detail.
+
+### Using the new External Exporters framework
+
+Care should be taken when replacing Dataverse's internal metadata export formats as third party code, including other third party Exporters, may depend on the contents of those export formats. When replacing an existing format, one must also remember to delete the cached metadata export files or run the reExport command for the metadata exports of existing datasets to be updated.
+
+See "Mechanism Added for Adding External Exporters". 
+
+### Publishing via API 
+
+When publishing a dataset via API, it now mirrors the UI behavior by requiring that the dataset has either a standard license configured, or has valid Custom Terms of Use (if allowed by the instance). Attempting to publish a dataset without such **will fail with an error message**. 
+
+See "Handling of license information fixed in the API" for guidance on how to ensure that datasets created or updated via native API have a license configured.
+
+
+
+## Detailed Release Highlights, New Features and Use Case Scenarios
+
+### For Dataverse developers, support for running Dataverse in Docker (experimental)
+
+Developers can experiment with running Dataverse in Docker: (PR #9439)
+
+This is an image developers build locally (or can pull from Docker Hub). It is not meant for production use!
+
+To provide a complete container-based local development environment, developers can deploy a Dataverse container from 
+the new image in addition to other containers for necessary dependencies: 
+https://guides.dataverse.org/en/5.14/container/dev-usage.html
+
+Please note that with this emerging solution we will sunset older tooling like `docker-aio` and `docker-dcm`.
+We envision more testing possibilities in the future, to be discussed as part of the
+[Dataverse Containerization Working Group](https://ct.gdcc.io). There is no sunsetting roadmap yet, but you have been warned.
+If there is some specific feature of these tools you would like to be kept, please [reach out](https://ct.gdcc.io).
+
+### Indexing performance improved
+
+Noticeable improvements in performance, especially for large datasets containing thousands of files.
+Uploading files one by one to the dataset is much faster now, allowing uploading thousands of files in an acceptable timeframe. Not only uploading a file, but all edit operations on datasets containing many files, got faster.
+Performance tweaks include indexing of the datasets in the background and optimizations in the amount of the indexing operations needed. Furthermore, updates to the dateset no longer wait for ingesting to finish. Ingesting was already running in the background, but it took a lock, preventing updating the dataset and degrading performance for datasets containing many files. (PR #9558)
+
+### For installations using MDC (Make Data Count), it is now possible to display both the MDC metrics and the legacy access counts, generated before MDC was enabled.
+
+This is enabled via the new setting `:MDCStartDate` that specifies the cutoff date. If a dataset has any legacy access counts collected prior to that date, those numbers will be displayed in addition to any MDC numbers recorded since then. (PR #6543)
+
+### Changes to PID Provider JVM Settings
+
+In preparation for a future feature to use multiple PID providers at the same time, all JVM settings for PID providers
+have been enabled to be configured using MicroProfile Config. In the same go, they were renamed to match the name
+of the provider to be configured.
+
+Please watch your log files for deprecation warnings. Your old settings will be picked up, but you should migrate
+to the new names to avoid unnecessary log clutter and get prepared for more future changes. An example message
+looks like this:
+
+```
+[#|2023-03-31T16:55:27.992+0000|WARNING|Payara 5.2022.5|edu.harvard.iq.dataverse.settings.source.AliasConfigSource|_ThreadID=30;_ThreadName=RunLevelControllerThread-1680281704925;_TimeMillis=1680281727992;_LevelValue=900;|
+   Detected deprecated config option doi.username in use. Please update your config to use dataverse.pid.datacite.username.|#]
+```
+
+Here is a list of the new settings:
+
+- dataverse.pid.datacite.mds-api-url
+- dataverse.pid.datacite.rest-api-url
+- dataverse.pid.datacite.username
+- dataverse.pid.datacite.password
+- dataverse.pid.handlenet.key.path
+- dataverse.pid.handlenet.key.passphrase
+- dataverse.pid.handlenet.index
+- dataverse.pid.permalink.base-url
+- dataverse.pid.ezid.api-url
+- dataverse.pid.ezid.username
+- dataverse.pid.ezid.password
+
+See also https://guides.dataverse.org/en/5.14/installation/config.html#persistent-identifiers-and-publishing-datasets (multiple PRs: #8823 #8828)
+
+### Signposting for Dataverse
+
+This release adds [Signposting](https://signposting.org) support to Dataverse to improve machine discoverability of datasets and files. (PR #8424)
+
+The following MicroProfile Config options are now available (these can be treated as JVM options):
+
+- dataverse.signposting.level1-author-limit
+- dataverse.signposting.level1-item-limit
+
+Signposting is described in more detail in a new page in the Admin Guide on discoverability: https://guides.dataverse.org/en/5.14/admin/discoverability.html
+
+### Permalinks support
+
+Dataverse now optionally supports PermaLinks, a type of persistent identifier that does not involve a global registry service. PermaLinks are appropriate for Intranet deployment and catalog use cases. (PR #8674)
+
+
+### Creating datasets with incomplete metadata through API
+
+It is now possible to create a dataset with some nominally mandatory metadata fields left unpopulated. For details on the use case that lead to this feature see issue #8822 and PR #8940.
+
+The create dataset API call (POST to /api/dataverses/#dataverseId/datasets) is extended with the "doNotValidate" parameter. However, in order to be able to create a dataset with incomplete metadata, the Solr configuration must be updated first with the new "schema.xml" file (do not forget to run the metadata fields update script when you use custom metadata). Reindexing is optional, but recommended. Also, even when this feature is not used, it is recommended to update the Solr configuration and reindex the metadata. Finally, this new feature can be activated with the "dataverse.api.allow-incomplete-metadata" JVM option.
+
+You can also enable a valid/incomplete metadata filter in the "My Data" page using the "dataverse.ui.show-validity-filter" JVM option. By default, this filter is not shown. When you wish to use this filter, you must reindex the datasets first, otherwise datasets with valid metadata will not be shown in the results.
+
+It is not possible to publish datasets with incomplete or incomplete metadata. By default, you also cannot send such datasets for review. If you wish to enable sending for review of datasets with incomplete metadata, turn on the "dataverse.ui.allow-review-for-incomplete" JVM option.
+
+In order to customize the wording and add translations to the UI sections extended by this feature, you can edit the "Bundle.properties" file and the localized versions of that file. The property keys used by this feature are:
+- incomplete
+- valid
+- dataset.message.incomplete.warning
+- mydataFragment.validity
+- dataverses.api.create.dataset.error.mustIncludeAuthorName
+
+### Registering PIDs (DOIs or Handles) for files in select collections
+
+It is now possible to configure registering PIDs for files in individual collections.
+
+For example, registration of PIDs for files can be enabled in a specific collection when it is disabled instance-wide. Or it can be disabled in specific collections where it is enabled by default. See the [:FilePIDsEnabled](https://guides.dataverse.org/en/5.14/installation/config.html#filepidsenabled) section of the Configuration guide for details. (PR #9614)
+
+### Mechanism Added for Adding External Exporters
+
+It is now possible for third parties to develop and share code to provide new metadata export formats for Dataverse. Export formats can be made available via the Dataverse UI and API or configured for use in Harvesting. Dataverse now provides developers with a separate dataverse-spi JAR file that contains the Java interfaces and classes required to create a new metadata Exporter. Once a new Exporter has been created and packaged as a JAR file, administrators can use it by specifying a local directory for third party Exporters, dropping then Exporter JAR there, and restarting Payara. This mechanism also allows new Exporters to replace any of Dataverse's existing metadata export formats. (PR #9175). See also https://guides.dataverse.org/en/5.14/developers/metadataexport.html
+
+#### Backward Incompatibilities
+
+Care should be taken when replacing Dataverse's internal metadata export formats as third party code, including other third party Exporters may depend on the contents of those export formats. When replacing an existing format, one must also remember to delete the cached metadata export files or run the reExport command for the metadata exports of existing datasets to be updated.
+
+#### New JVM/MicroProfile Settings
+
+dataverse.spi.export.directory - specifies a directory, readable by the Dataverse server. Any Exporter JAR files placed in this directory will be read by Dataverse and used to add/replace the specified metadata format.
+
+### Contact Email Improvements
+
+Email sent from the contact forms to the contact(s) for a collection, dataset, or datafile can now optionally be cc'd to a support email address. The support email address can be changed from the default :SystemEmail address to a separate :SupportEmail address. When multiple contacts are listed, the system will now send one email to all contacts (with the optional cc if configured) instead of separate emails to each contact. Contact names with a comma that refer to Organizations will no longer have the name parts reversed in the email greeting. A new protected/admin feedback API has been added. (PR #9186) See https://guides.dataverse.org/en/5.14/api/native-api.html#send-feedback-to-contact-s
+
+#### New JVM/MicroProfile Settings
+
+dataverse.mail.support-email - allows a separate email, distinct from the :SystemEmail to be used as the to address in emails from the contact form/ feedback api.
+dataverse.mail.cc-support-on-contact-emails - include the support email address as a CC: entry when contact/feedback emails are sent to the contacts for a collection, dataset, or datafile.
+
+### Support for Grouping Dataset Files by Folder and Category Tag
+
+Dataverse now supports grouping dataset files by folder and/or optionally by Tag/Category. The default for whether to order by folder can be changed via :OrderByFolder. Ordering by category must be enabled by an administrator via the :CategoryOrder parameter which is used to specify which tags appear first (e.g. to put Documentation files before Data or Code files, etc.) These Group-By options work with the existing sort options, i.e. sorting alphabetically means that files within each folder or tag group will be sorted alphabetically. :AllowUsersToManageOrdering can be set to true to allow users to turn folder ordering and category ordering (if enabled) on or off in the current dataset view. (PR #9204)
+
+#### New Settings
+
+:CategoryOrder - a comma separated list of Category/Tag names defining the order in which files with those tags should be displayed. The setting can include custom tag names along with the pre-defined defaults ( Documentation, Data, and Code, which can be overridden by the ::FileCategories setting.)
+:OrderByFolder - defaults to true - whether to group files in the same folder together
+:AllowUserManagementOfOrder - default false - allow users to toggle ordering on/off in the dataset display
+
+### Metadata field Series now repeatable
+
+This enhancement allows depositors to define multiple instances of the metadata field Series in the Citation Metadata block.
+
+Data contained in a dataset may belong to multiple series. Making the field repeatable makes it possible to reflect this fact in the dataset metadata. (PR #9256)
+
+### Guides in PDF Format
+
+An experimental version of the guides in PDF format is available at <http://preview.guides.gdcc.io/_/downloads/en/develop/pdf/> (PR #9474)
+
+Advice for anyone who wants to help improve the PDF is available at https://guides.dataverse.org/en/5.14/developers/documentation.html#pdf-version-of-the-guides
+
+### Datasets API extended
+
+The following APIs have been added: (PR #9592)
+
+- `/api/datasets/summaryFieldNames`
+- `/api/datasets/privateUrlDatasetVersion/{privateUrlToken}`
+- `/api/datasets/privateUrlDatasetVersion/{privateUrlToken}/citation`
+- `/api/datasets/{datasetId}/versions/{version}/citation`
+
+### Extra fields included in the JSON metadata
+
+The following fields are now available in the native JSON output:
+
+- `alternativePersistentId`
+- `publicationDate`
+- `citationDate`
+
+(PR #9657)
+
+
+### Files downloaded from Binder are now in their original format.
+
+For example, data.dta (a Stata file) will be downloaded instead of data.tab (the archival version Dataverse creates as part of a successful ingest). (PR #9483)
+
+This should make it easier to write code to reproduce results as the dataset authors and subsequent researchers are likely operating on the original file format rather that the format that Dataverse creates.
+
+For details, see #9374, <https://github.com/jupyterhub/repo2docker/issues/1242>, and <https://github.com/jupyterhub/repo2docker/pull/1253>.
+
+### Handling of license information fixed in the API
+
+(PR #9568)
+
+When publishing a dataset via API, it now requires the dataset to either have a standard license configured, or have valid Custom Terms of Use (if allowed by the instance). Attempting to publish a dataset without such **will fail with an error message**. This introduces a backward incompatibility, and if you have scripts that automatically create, update and publish datasets, this last step may start failing. Because, unfortunately, there were some problems with the datasets APIs that made it difficult to manage licenses, so an API user was likely to end up with a dataset missing either of the above. In this release we have addressed it by making the following fixes:
+
+We fixed the incompatibility between the format in which license information was *exported* in json, and the format the create and update APIs were expecting it for *import* (https://github.com/IQSS/dataverse/issues/9155). This means that the following json format can now be imported:
+```
+"license": {
+   "name": "CC0 1.0",
+   "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+}
+```
+However, for the sake of backward compatibility the old format
+```
+"license" : "CC0 1.0"
+```
+will be accepted as well.
+
+We have added the default license (CC0) to the model json file that we provide and recommend to use as the model in the Native API Guide (https://github.com/IQSS/dataverse/issues/9364). 
+
+And we have corrected the misleading language in the same guide where we used to recommend to users that they select, edit and re-import only the `.metadataBlocks` fragment of the json metadata representing the latest version. There are in fact other useful pieces of information that need to be preserved in the update (such as the `"license"` section above). So the recommended way of creating base json for updates via the API is to select *everything but* the `"files"` section, with (for example) the following `jq` command:
+
+```
+jq '.data | del(.files)'
+```
+
+Please see the [Update Metadata For a Dataset](https://guides.dataverse.org/en/5.14/api/native-api.html#update-metadata-for-a-dataset) section of our Native Api guide for more information. 
+
+
+### New External Tool Type and Implementation 
+
+With this release a new experimental external tool type has been added to the Dataverse Software. The tool type is "query" and its first implementation is an experimental tool named [Ask the Data](https://github.com/IQSS/askdataverse) which allows users to ask natural language queries of tabular files in Dataverse. More information is available in the External Tools section of the guides. (PR #9737) See https://guides.dataverse.org/en/5.14/admin/external-tools.html#file-level-query-tools
+
+### Default Value for File PIDs registration has changed
+
+The default for whether PIDs are registered for files or not is now false.
+
+Installations where file PIDs were enabled by default will have to add the :FilePIDsEnabled = true setting to maintain the existing functionality.
+
+See Step 9 of the upgrade instructions:
+
+  If your installation did not have :FilePIDsEnabled set, you will need to set it to true to keep file PIDs enabled:
+
+  curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:FilePIDsEnabled
+
+
+It is now possible to allow File PIDs to be enabled/disabled per collection. See the [:AllowEnablingFilePIDsPerCollection](https://guides.dataverse.org/en/latest/installation/config.html#allowenablingfilepidspercollection) section of the Configuration guide for details.
+
+For example, registration of PIDs for files can now be enabled in a specific collection when it is disabled instance-wide. Or it can be disabled in specific collections where it is enabled by default. 
+
+
+### Changes and fixes in this release not already mentioned above include:
+
+- An endpoint for deleting a file has been added to the native API: https://guides.dataverse.org/en/5.14/api/native-api.html#deleting-files (PR #9383)
+- A date column has been added to the restricted file access request overview, indicating when the earliest request by that user was made. An issue was fixed where where the request list was not updated when a request was approved or rejected. (PR #9257)
+- Changes made in v5.13 and v5.14 in multiple PRs to improve the embedded Schema.org metadata in dataset pages will only be propagated to the Schema.Org JSON-LD metadata export if a reExportAll() is done. (PR #9102)
+- It is now possible to write external vocabulary scripts that target a single child field in a metadata block. Example scripts are now available at https://github.com/gdcc/dataverse-external-vocab-support that can be configured to support lookup from the Research Orgnaization Registry (ROR) for the Author Affiliation Field and for the CrossRef Funding Registry (Fundreg) in the Funding Information/Agency field, both in the standard Citation metadata block. Application if these scripts to other fields, and the development of other scripts targetting child fields are now possible (PR #9402)
+- Dataverse now supports requiring a secret key to add or edit metadata in specified "system" metadata blocks. Changing the metadata in such system metadata blocks is not allowed without the key and is currently only allowed via API. (PR #9388)
+- An attempt will be made to extract a geospatial bounding box (west, south, east, north) from NetCDF and HDF5 files and then insert these values into the geospatial metadata block, if enabled. (#9541) See https://guides.dataverse.org/en/5.14/user/dataset-management.html#geospatial-bounding-box
+- A file previewer called H5Web is now available for exploring and visualizing NetCDF and HDF5 files. (PR #9600) See https://guides.dataverse.org/en/5.14/user/dataset-management.html#h5web-previewer
+- Two file previewers for GeoTIFF and Shapefiles are now available for visualizing geotiff image files and zipped Shapefiles on a map. See https://github.com/gdcc/dataverse-previewers
+- New alternative to setup the Dataverse dependencies for the development environment through Docker Compose. (PR #9417)
+- New alternative, explained in the documentation, to build the Sphinx guides through a Docker container. (PR #9417)
+- A container has been added called "configbaker" that configures Dataverse while running in containers. This allows developers to spin up Dataverse with a single command. (PR #9574)
+- Direct upload via the Dataverse UI will now support any algorithm configured via the `:FileFixityChecksumAlgorithm` setting. External apps using the direct upload API can now query Dataverse to discover which algorithm should be used. Sites that have been using an algorithm other than MD5 and direct upload and/or dvwebloader may want to use the `/api/admin/updateHashValues` call (see https://guides.dataverse.org/en/5.14/installation/config.html?highlight=updatehashvalues#filefixitychecksumalgorithm) to replace any MD5 hashes on existing files. (PR #9482)
+- The OAI_ORE metadata export (and hence the archival Bag for a dataset) now includes information about file embargoes. (PR #9698)
+- DatasetFieldType attribute "displayFormat", is now returned by the API. (PR #9668)
+- An API named "MyData" has been available for years but is newly documented. It is used to get a list of the objects (datasets, collections or datafiles) that an authenticated user can modify. (PR #9596)
+- A Go client library for Dataverse APIs is now available. See https://guides.dataverse.org/en/5.14/api/client-libraries.html
+- A feature flag called "api-session-auth" has been added temporarily to aid in the development of the new frontend (#9063) but will be removed once bearer tokens (#9229) have been implemented. There is a security risk (CSRF) in enabling this flag! Do not use it in production! For more information, see https://guides.dataverse.org/en/5.14/installation/config.html#feature-flags
+- A feature flag called "api-bearer-auth" has been added. This allows OIDC useraccounts to send authenticated API requests using Bearer Tokens. Note: This feature is limited to OIDC! For more information, see https://guides.dataverse.org/en/5.14/installation/config.html#feature-flags (PR #9591)
+
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.14 milestone](https://github.com/IQSS/dataverse/milestone/108?closed=1) on GitHub.
diff --git a/doc/release-notes/5.2-release-notes.md b/doc/release-notes/5.2-release-notes.md
new file mode 100644
index 00000000000..5ed7afac902
--- /dev/null
+++ b/doc/release-notes/5.2-release-notes.md
@@ -0,0 +1,105 @@
+# Dataverse 5.2
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### File Preview When Guestbooks or Terms Exist
+
+Previously, file preview was only available when files were publicly downloadable. Now if a guestbook or terms (or both) are configured for the dataset, they will be shown in the Preview tab and once they are agreed to, the file preview will appear (#6919).
+
+### Preview Only External Tools
+
+A new external tool type called "preview" has been added that prevents the tool from being displayed under "Explore Options" under the "Access File" button on the file landing page (#6919).
+
+### Dataset Page Edit Options Consolidation
+
+As part of the continued effort to redesign the Dataset and File pages, some of the edit options for a file on the dataset page are being moved to a "kebab" to allow for better consistency and future scalability.
+
+### Google Cloud Archiver
+
+Dataverse Bags can now be sent to a bucket in Google Cloud, including those in the "Coldline" storage class, which provides less expensive but slower access.
+
+## Major Use Cases
+
+Newly-supported use cases in this release include:
+
+- Users can now preview files that have a guestbook or terms. (Issue #6919, PR #7369)
+- External tool developers can indicate that their tool is "preview only". (Issue #6919, PR #7369)
+- Dataverse Administrators can set up a regular export to Google Cloud so that the installation's data is preserved (Issue #7140, PR #7292)
+- Dataverse Administrators can use a regex when defining a group (Issue #7344, PR #7351)
+- External Tool Developers can use a new API endpoint to retrieve a user's information (Issue #7307, PR #7345)
+
+## Notes for Dataverse Installation Administrators
+
+### Converting Explore External Tools to Preview Only
+
+When the war file is deployed, a SQL migration script will convert [dataverse-previewers][] to have both "explore" and "preview" types so that they will continue to be displayed in the Preview tab.
+
+If you would prefer that these tools be preview only, you can delete the tools, adjust the JSON manifests (changing "explore" to "preview"), and re-add them.
+
+[dataverse-previewers]: https://github.com/GlobalDataverseCommunityConsortium/dataverse-previewers
+
+### New Database Settings and JVM Options
+
+Installations integrating with Google Cloud Archiver will need to use two new database settings:
+
+- :GoogleCloudProject - the name of the project managing the bucket
+- :GoogleCloudBucket - the name of the bucket to use
+
+For more information, see the Google Cloud Configuration section of the [Installation Guide](https://guides.dataverse.org/en/5.2/installation/)
+
+### Automation of Make Data Count Scripts
+
+Scripts have been added in order to automate Make Data Count processing. For more information, see the Make Data Count section of the [Admin Guide](https://guides.dataverse.org/en/5.2/admin/).
+
+## Notes for Tool Developers and Integrators
+
+### Preview Only External Tools, "hasPreviewMode"
+
+A new external tool type called "preview" has been added that prevents the tool from being displayed under "Explore Options" under the "Access File" button on the file landing page (#6919). This "preview" type replaces "hasPreviewMode", which has been removed.
+
+### Multiple Types for External Tools
+
+External tools now support multiple types. In practice, the types "explore" and "preview" are the only combination that makes a difference in the UI as opposed to only having only one or the other type (see "preview only" above). Multiple types are specified in the JSON manifest with an array in "types". The older, single "type" is still supported but should be considered deprecated.
+
+### User Information Endpoint
+
+New API endpoint to retrieve user info so that tools can email users if needed.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.2 Milestone](https://github.com/IQSS/dataverse/milestone/92?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.2/installation/).
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse 4.x to  Dataverse 5 following the instructions in the [Dataverse 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0).
+
+1\. Undeploy the previous version.
+
+- `<payara install path>/bin/asadmin list-applications`
+- `<payara install path>/bin/asadmin undeploy dataverse<-version>`
+
+(where `<payara install path>` is where Payara 5 is installed, for example: `/usr/local/payara5`)
+
+2\. Stop payara and remove the generated directory, start.
+
+- `service payara stop`
+- remove the generated directory: 
+`rm -rf <payara install path>/payara/domains/domain1/generated`
+- `service payara start`
+
+3\. Deploy this version.
+
+- `<payara install path>/bin/asadmin deploy dataverse-5.2.war`
+
+4\. Restart payara
+
+- `service payara stop`
+- `service payara start`
diff --git a/doc/release-notes/5.3-release-notes.md b/doc/release-notes/5.3-release-notes.md
new file mode 100644
index 00000000000..e62da980a3e
--- /dev/null
+++ b/doc/release-notes/5.3-release-notes.md
@@ -0,0 +1,164 @@
+# Dataverse 5.3
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Auxiliary Files (Experimental)
+
+Auxiliary files can now be added to datafiles and accessed using new experimental API endpoints. These endpoints allow additional, non-Dataverse generated metadata to be added alongside datafiles in dataverse.
+
+The support for auxiliary files in Dataverse is being driven by integration with the [Open Differential Privacy (DP) Project](https://opendp.io) and is designed to support the deposit and retrieval of differentially private metadata, but the endpoints are not specific to differential privacy use cases.
+
+### Additional Banner Functionality
+
+Banners in Dataverse can now be set to allow dismissal by a logged in user. Previously, banners would persist until they were removed by an administrator. This allows administrators to more easily communicate one-time messages to users.
+
+### File Tags Searchable from Advanced Search and Dataset Search
+
+File tags ("Documentation", "Data", "Code", etc.) now appear on the Advanced Search page.
+
+Performing a search for files on the dataset page now includes file tags. Previously, only file name and file description were searched.
+
+### Easier Configuration of Database Connections
+
+Previously, the configuration of the database connections has been quite static and not very easy to update. This has been an issue especially for cloud and container usage. Using new technologies provided by the move to Payara, you can now more easily configure the connection to your PostgreSQL DB.
+
+Using MicroProfile Config API (Issue #7000, Issue #7418), you can much more easily specify configuration
+details. For an overview of supported options, please see the
+[Installation Guide](https://guides.dataverse.org/en/5.3/installation/config.html#jvm-options).
+
+Note that some settings have been moved from domain.xml to code, such as min and max pool size.
+
+## Major Use Cases
+
+Newly-supported use cases in this release include:
+
+- Users can use an API to add auxiliary files to files in order to provide metadata representations for specific tools or integrations (Issue #7275, PR #7350)
+- Administrators can use a new API to manage banner messages and take advantage of new banner display options (Issue #7263, PR #7434)
+- Users replacing files will now have their files renamed when a file name conflict exists, making the behavior consistent with upload and edit (Issue #7335, PR #7336)
+- Users will now be able to search on file tags on the advanced search and dataset pages (Issue #7194, PR #7385)
+
+## Notes for Dataverse Installation Administrators
+
+### Payara 5.2020.6 (or Higher) Required
+
+Some changes in this release require an upgrade to Payara 5.2020.6 or higher.
+
+Instructions on how to update can be found in the
+[Payara documentation](https://docs.payara.fish/community/docs/5.2020.6/documentation/user-guides/upgrade-payara.html)
+
+### New Banner API, Obsolete DB Settings
+
+The functionality previously provided by the DB settings :StatusMessageHeader and ::StatusMessageText is no longer supported and is now provided through the Manage Banner Messages API. Learn more in the [API Guide](https://guides.dataverse.org/en/5.3/api/).
+
+### New Database Settings and JVM Options
+
+Several new JVM options have been added in this release:
+
+- dataverse.db.name
+- dataverse.db.user
+- dataverse.db.password
+- dataverse.db.host
+- dataverse.db.port
+
+For an overview of these new options, please see the
+[Installation Guide](https://guides.dataverse.org/en/5.3/installation/config.html#jvm-options)
+
+See above note about obsolete DB options.
+
+### Introducing MicroProfile Config API
+
+With this Dataverse release, Dataverse Administrators can start to make use of the MicroProfile Config API.
+
+This will benefit both developers and sysadmins, but the codebase will have to be refactored to make use of it. As this will take time, we will always provide a backward compatible way of using it.
+
+For more details about these new options, please see the Consuming Configuration section of the [Developer Guide](https://guides.dataverse.org/en/5.3/developers/).
+
+### Java Message System Configuration
+
+The Ingest process uses the Java Message System to create ingest tasks in a queue. That queue had been configured from command line or domain.xml before. This has now changed to being done
+in code.
+
+In the unlikely case you might want to change any of these settings, feel free to change and recompile or raise an issue on Github. See `IngestQueueProducer` for more details.
+
+If you want to clean up your existing installation, you can delete the old, unused queue like this:
+
+- `<payara install path>/bin/asadmin delete-connector-connection-pool --cascade=true jms IngestQueueConnectionFactoryPool`
+
+## Notes for Tool Developers and Integrators
+
+### Experimental Auxiliary File Support
+
+Experimental endpoints have been added to allow auxiliary files to be added to datafiles. These auxiliary files can be deposited and accessed via API. Later releases will include options for accessing these files through the UI. For more information, see the Auxiliary File Support section of the [Developer Guide](https://guides.dataverse.org/en/5.3/developers/).
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.3 Milestone](https://github.com/IQSS/dataverse/milestone/93?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.3/installation/).
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse 4.x to Dataverse 5 following the instructions in the [Dataverse 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0).
+
+1\. Upgrade to Payara 5.2020.6 or higher.
+
+Instructions on how to update can be found in the
+[Payara documentation](https://docs.payara.fish/community/docs/5.2020.6/documentation/user-guides/upgrade-payara.html).
+
+It would likely be safer to upgrade Payara first, while still running Dataverse 5.2, and then proceed with the steps below. Upgrading from an earlier version of Payara should be a straightforward process: Undeploy Dataverse; stop Payara; move the current Payara directory out of the way; unzip the new Payara version in its place; replace **the brand new `payara/glassfish/domains/domain1` with your old, preserved `domain1`**; start Payara, deploy Dataverse 5.2. We still recommend that you read the detailed upgrade instructions above; and, if you run into any issues with this upgrade, it will help to be able to separate them from any problems with the upgrade of Dataverse proper. 
+If you are still using pre-5.0 version of Dataverse, and Glassfish version 4, please follow the upgrade instructions in the Dataverse 5.0 release notes; but use the latest version of Payara 5 (5.2020.7, as of this writing).
+
+2\. Undeploy the previous version.
+
+- `<payara install path>/bin/asadmin list-applications`
+- `<payara install path>/bin/asadmin undeploy dataverse<-version>`
+
+(where `<payara install path>` is where Payara 5 is installed, for example: `/usr/local/payara5`)
+
+3\. Update your database connection.
+
+Please configure your connection details, replacing all the `${DB_...}`.
+
+- `<payara install path>/bin/asadmin create-system-properties "dataverse.db.user=${DB_USER}"`
+- `<payara install path>/bin/asadmin create-system-properties "dataverse.db.host=${DB_HOST}"`
+- `<payara install path>/bin/asadmin create-system-properties "dataverse.db.port=${DB_PORT}"`
+- `<payara install path>/bin/asadmin create-system-properties "dataverse.db.name=${DB_NAME}"`
+- `echo "AS_ADMIN_ALIASPASSWORD=${DB_PASS}" > /tmp/password.txt`
+
+- `<payara install path>/bin/asadmin create-password-alias --passwordfile /tmp/password.txt dataverse.db.password`
+- `rm /tmp/password.txt`
+
+4\. In domain.xml, verify that the __TimerPool jdbc-connection-pool is using the H2 database, as follows (if you have the old Derby version from Glassfish 4, replace it):
+
+  `<jdbc-connection-pool datasource-classname="org.h2.jdbcx.JdbcDataSource" name="__TimerPool" res-type="javax.sql.XADataSource"> <property name="URL" value="jdbc:h2:${com.sun.aas.instanceRoot}/lib/databases/ejbtimer;AUTO_SERVER=TRUE"></property> </jdbc-connection-pool>`
+
+5\. Reset the EJB timer database back to default:
+
+- `<payara install path>/bin/asadmin set configs.config.server-config.ejb-container.ejb-timer-service.timer-datasource=jdbc/__TimerPool`
+
+6\. Delete the old password alias and DB pool:
+
+- `<payara install path>/bin/asadmin delete-jdbc-connection-pool --cascade=true dvnDbPool`
+- `<payara install path>/bin/asadmin delete-password-alias db_password_alias`
+
+7\. Stop payara, remove the generated and ejbtimer database directories, then restart.
+
+- `service payara stop`
+- `rm -rf <payara install path>/glassfish/domains/domain1/generated`
+- `rm -rf <payara install path>/glassfish/domains/domain1/lib/databases/ejbtimer`
+- `service payara start`
+
+8\. Deploy this version.
+
+- `<payara install path>/bin/asadmin deploy dataverse-5.3.war`
+
+9\. Restart payara
+
+- `service payara stop`
+- `service payara start`
diff --git a/doc/release-notes/5.4-release-notes.md b/doc/release-notes/5.4-release-notes.md
new file mode 100644
index 00000000000..bf4b2b43d85
--- /dev/null
+++ b/doc/release-notes/5.4-release-notes.md
@@ -0,0 +1,344 @@
+# Dataverse Software 5.4
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Deactivate Users API, Get User Traces API, Revoke Roles API
+
+A new API has been added to deactivate users to prevent them from logging in, receiving communications, or otherwise being active in the system. Deactivating a user is an alternative to deleting a user, especially when the latter is not possible due to the amount of interaction the user has had with the Dataverse installation. In order to learn more about a user before deleting, deactivating, or merging, a new "get user traces" API is available that will show objects created, roles, group memberships, and more. Finally, the "remove all roles" button available in the superuser dashboard is now also available via API.
+
+### New File Access API
+
+A new API offers *crawlable* access view of the folders and files within a dataset:
+
+`/api/datasets/<dataset id>/dirindex/`
+
+will output a simple html listing, based on the standard Apache directory index, with Access API download links for individual files, and recursive calls to the API above for sub-folders. Please see the [Native API Guide](https://guides.dataverse.org/en/5.4/api/native-api.html) for more information.
+
+Using this API, ``wget --recursive`` (or similar crawling client) can be used to download all the files in a dataset, preserving the file names and folder structure; without having to use the download-as-zip API. In addition to being faster (zipping is a relatively resource-intensive operation on the server side), this process can be restarted if interrupted (with ``wget --continue`` or equivalent) - unlike zipped multi-file downloads that always have to start from the beginning.
+
+On a system that uses S3 with download redirects, the individual file downloads will be handled by S3 directly (with the exception of tabular files), without having to be proxied through the Dataverse application.
+
+### Restricted Files and DDI "dataDscr" Information (Summary Statistics, Variable Names, Variable Labels)
+
+In previous releases, DDI "dataDscr" information (summary statistics, variable names, and variable labels, sometimes known as "variable metadata") for tabular files that were ingested successfully were available even if files were restricted. This has been changed in the following ways:
+
+- At the dataset level, DDI exports no longer show "dataDscr" information for restricted files. There is only one version of this export and it is the version that's suitable for public consumption with the "dataDscr" information hidden for restricted files.
+- Similarly, at the dataset level, the DDI HTML Codebook no longer shows "dataDscr" information for restricted files.
+- At the file level, "dataDscr" information is no longer publicly available for restricted files. In practice, it was only possible to get this publicly via API (the download/access button was hidden).
+- At the file level, "dataDscr" (variable metadata) information can still be downloaded for restricted files if you have access to download the file.
+
+### Search with Accented Characters
+
+Many languages include characters that have close analogs in ascii, e.g. (ÃĄ, à, Ãĸ, ç, Ê, è, ÃĒ, ÃĢ, í, Ãŗ, Ãļ, Ãē, Ú, Ãģ, Ãŧâ€Ļ). This release changes the default Solr configuration to allow search to match words based on these associations, e.g. a search for Mercè would match the word Merce in a Dataset, and vice versa. This should generally be helpful, but can result in false positives, e.g. "canon" will be found searching for "caÃąon".
+
+### Java 11, PostgreSQL 13, and Solr 8 Support/Upgrades
+
+Several of the core components of the Dataverse Software have been upgraded. Specifically:
+
+- The Dataverse Software now runs on and requires Java 11. This will provide performance and security enhancements, allows developers to take advantage of new and updated Java features, and moves the project to a platform with better longer term support. This upgrade requires a few extra steps in the release process, outlined below.
+- The Dataverse Software has now been tested with PostgreSQL versions up to 13. Versions 9.6+ will still work, but this update is necessary to support the software beyond PostgreSQL EOL later in 2021.
+- The Dataverse Software now runs on Solr 8.8.1, the latest available stable release in the Solr 8.x series.
+
+### Saved Search Performance Improvements
+
+A refactoring has greatly improved Saved Search performance in the application. If your installation has multiple, potentially long-running Saved Searches in place, this greatly improves the probability that those search jobs will complete without timing out.
+
+### Worldmap/Geoconnect Integration Now Obsolete
+
+As of this release, the Geoconnect/Worldmap integration is no longer available. The Harvard University Worldmap is going through a migration process, and instead of updating this code to work with the new infrastructure, the decision was made to pursue future Geospatial exploration/analysis through other tools, following the External Tools Framework in the Dataverse Software.
+
+### Guides Updates
+
+The Dataverse Software Guides have been updated to follow recent changes to how different terms are used across the Dataverse Project. For more information, see Mercè's note to the community:
+
+<https://groups.google.com/g/dataverse-community/c/pD-aFrpXMPo>
+
+### Conditionally Required Metadata Fields
+
+Prior to this release, when defining metadata for compound fields (via their dataset field types), fields could be either be optional or required, i.e. if required you must always have (at least one) value for that field. For example, Author Name being required means you must have at least one Author with an nonempty Author name.
+
+In order to support more robust metadata (and specifically to resolve #7551), we need to allow a third case: Conditionally Required, that is, the field is required if and only if any of its "sibling" fields are entered. For example, Producer Name is now conditionally required in the citation metadata block. A user does not have to enter a Producer, but if they do, they have to enter a Producer Name.
+
+## Major Use Cases
+
+Newly-supported major use cases in this release include:
+
+- Dataverse Installation Administrators can now deactivate users using a new API. (Issue #2419, PR #7629)
+- Superusers can remove all of a user's assigned roles using a new API. (Issue #2419, PR #7629)
+- Superusers can use an API to gather more information about actions a user has taken in the system in order to make an informed decisions about whether or not to deactivate or delete a user. (Issue #2419, PR #7629)
+- Superusers will now be able to harvest from installations using ISO-639-3 language codes. (Issue #7638, PR #7690)
+- Users interacting with the workflow system will receive status messages (Issue #7564, PR #7635)
+- Users interacting with prepublication workflows will see speed improvements (Issue #7681, PR #7682)
+- API Users will receive Dataverse collection API responses in a deterministic order. (Issue #7634, PR #7708)
+- API Users will be able to access a list of crawlable URLs for file download, allowing for faster and easily resumable transfers. (Issue #7084, PR #7579)
+- Users will no longer be able to access summary stats for restricted files. (Issue #7619, PR #7642)
+- Users will now see truncated versions of long strings (primarily checksums) throughout the application (Issue #6685, PR #7312)
+- Users will now be able to easily copy checksums, API tokens, and private URLs with a single click (Issue #6039, Issue #6685, PR #7539, PR #7312)
+- Users uploading data through the Direct Upload API will now be able to use additional checksums (Issue #7600, PR #7602)
+- Users searching for content will now be able to search using non-ascii characters. (Issue #820, PR #7378)
+- Users can now replace files in draft datasets, a functionality previously only available on published datasets. (Issue #7149, PR #7337)
+- Dataverse Installation Administrators can now set subfields of compound fields as **conditionally required**, that is, the field is required if and only if any of its "sibling" fields are entered. For example, Producer Name is now conditionally required in the citation metadata block. A user does not have to enter a Producer, but if they do, they have to enter a Producer Name. (Issue #7606, PR #7608)
+
+## Notes for Dataverse Installation Administrators
+
+### Java 11 Upgrade
+
+There are some things to note and keep in mind regarding the move to Java 11:
+
+- You should install the JDK/JRE following your usual methods, depending on your operating system. An example of this on a RHEL/CentOS 7 or RHEL/CentOS 8 system is:
+
+    `$ sudo yum remove java-1.8.0-openjdk java-1.8.0-openjdk-devel java-1.8.0-openjdk-headless`  
+
+    `$ sudo yum install java-11-openjdk-devel`  
+  
+    The `remove` command may provide an error message if -headless isn't installed.
+    
+ - Select the latest version of Java 
+    
+    `$ sudo alternatives --config java`
+    
+
+- We targeted and tested Java 11, but 11+ will likely work. Java 11 was targeted because of its long term support.
+- If you're moving from a Dataverse installation that was previously running Glassfish 4.x (typically this would be Dataverse Software 4.x), you will need to adjust some JVM options in domain.xml as part of the upgrade process. We've provided these optional steps below. These steps are not required if your first installed Dataverse Software version was running Payara 5.x (typically Dataverse Software 5.x).
+
+### PostgreSQL Versions Up To 13 Supported
+
+Up until this release our installation guide "strongly recommended" to install PostgreSQL v. 9.6. While that version is known to be very stable, it is nearing its end-of-life (in Nov. 2021). Dataverse Software has now been tested with versions up to 13. If you decide to upgrade PostgreSQL, the tested and recommended way of doing that is as follows:
+
+- Export your current database with ``pg_dumpall``;
+- Install the new version of PostgreSQL; (make sure it's running on the same port, etc. so that no changes are needed in the Payara configuration)
+- Re-import the database with ``psql``, as the postgres user.
+
+Consult the PostgreSQL upgrade documentation for more information, for example <https://www.postgresql.org/docs/13/upgrading.html#UPGRADING-VIA-PGDUMPALL>.
+
+### Solr Upgrade
+
+With this release we upgrade to the latest available stable release in the Solr 8.x branch. We recommend a fresh installation of Solr 8.8.1 (the index will be empty) followed by an "index all".
+
+Before you start the "index all", the Dataverse installation will appear to be empty because the search results come from Solr. As indexing progresses, partial results will appear until indexing is complete.
+
+See <http://guides.dataverse.org/en/5.4/installation/prerequisites.html#installing-solr> for more information.
+
+### Managing Conditionally Required Metadata Fields
+
+Prior to this release, when defining metadata for compound fields (via their dataset field types), fields could be either be optional or required, i.e. if required you must always have (at least one) value for that field. For example, Author Name being required means you must have at least one Author with an nonempty Author name.
+
+In order to support more robust metadata (and specifically to resolve #7551), we need to allow a third case: Conditionally Required, that is, the field is required if and only if any of its "sibling" fields are entered. For example, Producer Name is now conditionally required in the citation metadata block. A user does not have to enter a Producer, but if they do, they have to enter a Producer Name.
+
+This change required some modifications to how "required" is defined in the metadata .tsv files (for compound fields).
+
+Prior to this release, the value of required for the parent compound field did not matter and so was set to false.
+
+Going forward:
+
+- For optional, the parent compound field would be required = false and all children would be required = false.
+- For required, the parent compound field would be required = true and at least one child would be required = true.
+- For conditionally required, the parent compound field would be required = false and at least one child would be required = true.
+
+This release updates the citation .tsv file that is distributed with the software for the required parent compound fields (e.g. author), as well as sets Producer Name to be conditionally required. No other distributed .tsv files were updated, as they did not have any required compound values.
+
+**If you have created any custom metadata .tsv files**, you will need to make the same (type of) changes there.
+
+### Citation Metadata Block Update
+
+Due to the changes for Conditionally Required Metadata Fields, and a minor update in the citation metadata block to support extra ISO-639-3 language codes, a block upgrade is required. Instructions are provided below.
+
+### Retroactively Store Original File Size
+
+Beginning in Dataverse Software 4.10, the size of the saved original file (for an ingested tabular datafile) was stored in the database. For files added before this change, we provide an API that retrieves and permanently stores the sizes for any already existing saved originals. See [Datafile Integrity API](https://guides.dataverse.org/en/5.4/api/native-api.html#datafile-integrity) for more information.
+
+This was documented as a step in previous release notes, but we are noting it in these release notes to give it more visibility.
+
+### DB Cleanup for Saved Searches
+
+A previous version of the Dataverse Software changed the indexing logic so that when a user links a Dataverse collection, its children are also indexed as linked. This means that the children do not need to be separately linked, and in this version we removed the logic that creates a saved search to create those links when a Dataverse collection is linked.
+
+We recommend cleaning up the db to a) remove these saved searches and b) remove the links for the objects. We can do this via a few queries, which are available in the folder here:
+
+<https://github.com/IQSS/dataverse/raw/develop/scripts/issues/7398/>
+
+There are four sets of queries available, and they should be run in this order:
+
+- ss_for_deletion.txt to identify the Saved Searches to be deleted
+- delete_ss.txt to delete the Saved Searches identified in the previous query
+- dld_for_deletion.txt to identify the linked datasets and Dataverse collections to be deleted
+- delete_dld.txt to delete the linked datasets and Dataverse collections identified in the previous queries
+
+Note: removing these saved searches and links should not affect what users will see as linked due to the aforementioned indexing change. Similarly, not removing these saved searches and links should not affect anything, but is a cleanup of unnecessary rows in the database.
+
+### DB Cleanup for Superusers Releasing without Version Updates
+
+In datasets where a superuser has run the Curate command and the update included a change to the fileaccessrequest flag, those changes would not be reflected appropriately in the published version. This should be a rare occurrence.
+
+Instead of an automated solution, we recommend inspecting the affected datasets and correcting the fileaccessrequest flag as appropriate. You can identify the affected datasets this via a query, which is available in the folder here:
+
+<https://github.com/IQSS/dataverse/raw/develop/scripts/issues/7687/>
+
+## New JVM Options and Database Settings
+
+For installations that were previously running on Dataverse Software 4.x, a number of new JVM options need to be added as part of the upgrade. The JVM Options are enumerated in the detailed upgrade instructions below.
+
+Two new Database settings were added:
+
+- :InstallationName
+- :ExportInstallationAsDistributorOnlyWhenNotSet
+
+For an overview of these new options, please see the
+[Installation Guide](https://guides.dataverse.org/en/5.4/installation/config.html#database-settings)
+
+## Notes for Tool Developers and Integrators
+
+### UTF-8 Characters and Spaces in File Names
+
+UTF-8 characters in filenames are now preserved when downloaded.
+
+Dataverse installations will no longer replace spaces in file names of downloaded files with the + character. If your tool or integration has any special handling around this, you may need to make further adjustments to maintain backwards compatibility while also supporting Dataverse installations on 5.4+.
+
+Note that this follows a change from 5.1 that only corrected this for installations running with S3 storage. This makes the behavior consistent across installations running all types of file storage.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.4 Milestone](https://github.com/IQSS/dataverse/milestone/94?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.4/installation/).
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.4.
+
+1\. Upgrade to Java 11.
+
+2\. Upgrade to Solr 8.8.1.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.  
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+3\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+4\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+5\. **(only required for installations previously running Dataverse Software 4.x!)** In other words, if you have a domain.xml that **originated under Glassfish 4**, the below JVM Options need to be added. If your Dataverse installation was first installed on the 5.x series, these JVM options should already be present.
+
+In domain.xml:
+
+Remove the following JVM options from the `<config name="server-config"><java-config>` section:
+
+`<jvm-options>-Djava.endorsed.dirs=/usr/local/payara5/glassfish/modules/endorsed:/usr/local/payara5/glassfish/lib/endorsed</jvm-options>`  
+
+`<jvm-options>-Djava.ext.dirs=${com.sun.aas.javaRoot}/lib/ext${path.separator}${com.sun.aas.javaRoot}/jre/lib/ext${path.separator}${com.sun.aas.instanceRoot}/lib/ext</jvm-options>`  
+
+Add the following JVM options to the `<config name="server-config"><java-config>` section:  
+
+`<jvm-options>[9|]--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.base/java.lang=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.base/java.net=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.base/java.nio=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.base/java.util=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.management/sun.management=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.naming/javax.naming.spi=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[9|]--add-opens=java.logging/java.util.logging=ALL-UNNAMED</jvm-options>`  
+
+`<jvm-options>[1.8.0u251|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>`
+
+6\. Start Payara
+
+- `service payara start`
+  
+7\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.4.war`
+
+8\. Restart payara
+
+- `service payara stop`
+- `service payara start`
+
+9\. Reload Citation Metadata Block:
+
+   `wget https://github.com/IQSS/dataverse/releases/download/v5.4/citation.tsv`
+   `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`
+
+## Additional Release Steps
+
+1\. Confirm that the schema.xml was updated with the new v5.4 version when you updated Solr. 
+
+2\. Run the script updateSchemaMDB.sh to generate updated solr schema files and preserve any other custom fields in your Solr configuration.
+
+For example: (modify the path names as needed)
+
+cd /usr/local/solr-8.8.1/server/solr/collection1/conf
+wget https://github.com/IQSS/dataverse/releases/download/v5.4/updateSchemaMDB.sh
+chmod +x updateSchemaMDB.sh
+./updateSchemaMDB.sh -t .
+
+See <https://guides.dataverse.org/en/5.4/admin/metadatacustomization.html#updating-the-solr-schema> for more information.
+
+3\.  Do a clean reindex by first clearing then indexing. Re-indexing is required to get full-functionality from this change. Please refer to the guides on how to clear and index if needed.
+
+4\. Upgrade Postgres.
+
+- Export your current database with ``pg_dumpall``;
+- Install the new version of PostgreSQL; (make sure it's running on the same port, etc. so that no changes are needed in the Payara configuration)
+- Re-import the database with ``psql``, as the postgres user.
+
+Consult the PostgreSQL upgrade documentation for more information, for example <https://www.postgresql.org/docs/13/upgrading.html#UPGRADING-VIA-PGDUMPALL>.
+
+5\. Retroactively store original file size
+
+Use the [Datafile Integrity API](https://guides.dataverse.org/en/5.4/api/native-api.html#datafile-integrity) to ensure that the sizes of all original files are stored in the database.
+
+6\. DB Cleanup for Superusers Releasing without Version Updates
+
+In datasets where a superuser has run the Curate command and the update included a change to the fileaccessrequest flag, those changes would not be reflected appropriately in the published version. This should be a rare occurrence.
+
+Instead of an automated solution, we recommend inspecting the affected datasets and correcting the fileaccessrequest flag as appropriate. You can identify the affected datasets this via a query, which is available in the folder here:
+
+<https://github.com/IQSS/dataverse/raw/develop/scripts/issues/7687/>
+
+7\. (Optional, but recommended) DB Cleanup for Saved Searches and Linked Objects
+
+Perform the DB Cleanup for Saved Searches and Linked Objects, summarized in the "Notes for Dataverse Installation Administrators" section above.
+
+8\. Take a backup of the Worldmap links, if any.
+
+9\. (Only required if custom metadata blocks are used in your Dataverse installation) Update any custom metadata blocks:
+
+In the .tsv for any custom metadata blocks, for any subfield that has a required value of TRUE, find the corresponding parent field and change its required value to TRUE.
+
+Note: As there is an accompanying Flyway script that updates the values directly in the database, you do not need to reload these metadata .tsv files via API, unless you make additional changes, e.g set some compound fields to be conditionally required.
diff --git a/doc/release-notes/5.4.1-release-notes.md b/doc/release-notes/5.4.1-release-notes.md
new file mode 100644
index 00000000000..13433ac12d2
--- /dev/null
+++ b/doc/release-notes/5.4.1-release-notes.md
@@ -0,0 +1,46 @@
+# Dataverse Software 5.4.1
+
+This release provides a fix for a regression introduced in 5.4 and implements a few other small changes. Please use 5.4.1 for production deployments instead of 5.4.
+
+## Release Highlights
+
+### API Backwards Compatibility Maintained
+
+The syntax in the example in the [Basic File Access](https://guides.dataverse.org/en/5.4.1/api/dataaccess.html#basic-file-access) section of the Dataverse Software Guides will continue to work.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.4.1 Milestone](https://github.com/IQSS/dataverse/milestone/95?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.4.1/installation/).
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.4.1.
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+  
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.4.1.war`
+
+5\. Restart payara
+
+- `service payara stop`
+- `service payara start`
diff --git a/doc/release-notes/5.5-release-notes.md b/doc/release-notes/5.5-release-notes.md
new file mode 100644
index 00000000000..93383749578
--- /dev/null
+++ b/doc/release-notes/5.5-release-notes.md
@@ -0,0 +1,154 @@
+# Dataverse Software 5.5
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Auxiliary Files Accessible Through the UI
+
+Auxiliary Files can now be downloaded from the web interface. Auxiliary files uploaded as type=DP appear under "Differentially Private Statistics" under file level download. The rest appear under "Other Auxiliary Files".
+
+Please note that the auxiliary files feature is experimental and is designed to support integration with tools from the [OpenDP Project](https://opendp.org). If the API endpoints are not needed they can be blocked.
+
+### Improved Workflow for Downloading Large Zip Files
+
+Users trying to download a zip file larger than the Dataverse installation's :ZipDownloadLimit will now receive messaging that the zip file is too large, and the user will be presented with alternate access options. Previously, the zip file would download and files above the :ZipDownloadLimit would be excluded and noted in a MANIFEST.TXT file.
+
+### Guidelines on Depositing Code
+
+The Software Metadata Working Group has created guidelines on depositing research code in a Dataverse installation. Learn more in the [Dataset Management section](https://guides.dataverse.org/en/latest/user/dataset-management.html#research-code) of the Dataverse Guides.
+
+### New Metrics API
+
+Users can retrieve new types of metrics and per-collection metrics. The new capabilities are [described](https://guides.dataverse.org/en/5.5/api/metrics.html) in the guides. A new version of the [Dataverse Metrics web app](https://github.com/IQSS/dataverse-metrics) adds interactive graphs to display these metrics.
+
+There is a backward incompatible change to the Metrics API whereby you must now send the header `Accept: application/json` if you want to continue receiving JSON output. As of this release, absence of this header results in CSV rather than JSON for time series metrics. For details, see [Return Formats](https://guides.dataverse.org/en/5.5/api/metrics.html#return-formats) in the Metrics API section.
+
+Because of this change from JSON to CSV, adjustments have been made to the software that makes use of the Metrics API:
+
+- Anyone running the existing Dataverse Metrics app will need to upgrade to 0.2.8 (or higher) or apply [a small patch](https://github.com/IQSS/dataverse-metrics/pull/60) to continue retrieving metrics from Dataverse instances upgrading to this release.
+- Anyone who is using the Harvard Dataverse Repository custom homepage as a model might want to look at [changes](https://github.com/IQSS/dataverse.harvard.edu/pull/116) to get elements such as "browse by subject" working again.
+
+## Major Use Cases
+
+Newly-supported major use cases in this release include:
+
+- Users can now select and download auxiliary files through the UI. (Issue #7400, PR #7729)
+- Users attempting to download zip files above the installation's size limit will receive better messaging and be directed to other download options. (Issue #7714, PR #7806)
+- Superusers can now sort users on the Dashboard. (Issue #7814, PR #7815)
+- Users can now access expanded and new metrics through a new API (Issue #7177, PR #7178)
+- Dataverse collection administrators can now add a search facet on their collection pages for the Geospatial metadatablock's "Other" field, so that others can narrow searches in their collections using the values entered in that "Other" field (Issue #7399, PR #7813)
+- Depositors can now receive guidance about depositing code into a Dataverse installation (PR #7717)
+
+## Notes for Dataverse Installation Administrators
+
+### Simple Search Fix for Solr Configuration
+
+The introduction in v4.17 of a schema_dv_mdb_copies.xml file as part of the Solr configuration accidentally removed the contents of most metadata fields from index used for simple searches in Dataverse (i.e. when one types a word without indicating which field to search in the normal search box). This was somewhat ameliorated/hidden by the fact that many common fields such as description were still included by other means.
+
+This release removes the schema_dv_mdb_copies.xml file and includes the updates needed in the schema.xml file. Installations with no custom metadata blocks can simply replace their current schema.xml file for Solr, restart Solr, and run a ['Reindex in Place' as described in the guides](https://guides.dataverse.org/en/latest/admin/solr-search-index.html#reindex-in-place).
+
+Installations using custom metadata blocks should manually copy the contents of their schema_dv_mdb_copies.xml file (excluding the enclosing `<schema>` element and only including the `<copyField>` elements) into their schema.xml file, replacing the section between
+
+`<!-- Dataverse copyField from http://localhost:8080/api/admin/index/solr/schema -->`
+
+and
+
+`<!-- End: Dataverse-specific -->`.
+
+In existing schema.xml files, this section currently includes only one line:
+
+`<xi:include href="schema_dv_mdb_copies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />`.
+
+In this release, that line has already been replaced with the default set of `<copyFields>`.
+It doesn't matter whether schema_dv_mdb_copies.xml was originally created manually or via the recommended updateSchemaMDB.sh script and this fix will work with all prior versions of Dataverse from v4.17 on. If you make further changes to metadata blocks in your installation, you can repeat this process (i.e. run updateSchemaMDB.sh, copy the entries in schema_dv_mdb_copies.xml into the same section of schema.xml, restart solr, and reindex.)
+
+Once schema.xml is updated, Solr should be restarted and a ['Reindex in Place'](https://guides.dataverse.org/en/latest/admin/solr-search-index.html#reindex-in-place) will be required. (Future Dataverse Software versions will avoid this manual copy step.)
+
+### Geospatial Metadata Block Updated
+
+The Geospatial metadata block (geospatial.tsv) was updated. Dataverse collection administrators can now add a search facet on their collection pages for the metadata block's "Other" field, so that people searching in their collections can narrow searches using the values entered in that field.
+
+### Extended support for S3 Download Redirects ("Direct Downloads")
+
+If your installation uses S3 for storage and you have "direct downloads" enabled, please note that it will now cover the following download types that were not handled by redirects in the earlier versions: saved originals of tabular data files, cached RData frames, resized thumbnails for image files and other auxiliary files. In other words, all the forms of the file download API that take extra arguments, such as "format" or "imageThumb" - for example:
+
+`/api/access/datafile/12345?format=original`
+
+`/api/access/datafile/:persistentId?persistentId=doi:1234/ABCDE/FGHIJ&imageThumb=true`
+
+etc., that were previously excluded.
+
+Since browsers follow redirects automatically, this change should not in any way affect the web GUI users. However, some API users may experience problems, if they use it in a way that does not expect to receive a redirect response. For example, if a user has a script where they expect to download a saved original of an ingested tabular file with the following command:
+
+`curl https://yourhost.edu/api/access/datafile/12345?format=original > orig.dta`
+
+it will fail to save the file when it receives a 303 (redirect) response instead of 200. So they will need to add "-L" to the command line above, to instruct curl to follow redirects:
+
+`curl -L https://yourhost.edu/api/access/datafile/12345?format=original > orig.dta`
+
+Most of your API users have likely figured it out already, since you enabled S3 redirects for "straightforward" downloads in your installation. But we feel it was worth a heads up, just in case.
+
+### Authenticated User Deactivated Field Updated
+
+The "deactivated" field on the Authenticated User table has been updated to be a non-nullable field. When the field was added in version 5.3 it was set to 'false' in an update script. If for whatever reason that update failed in the 5.3 deploy you will need to re-run it before deploying 5.5. The update query you may need to run is: UPDATE authenticateduser SET deactivated = false WHERE deactivated IS NULL;
+
+### Metrics API Change
+
+See "New Metrics API" above for a backward incompatible change.
+
+## Notes for Tool Developers and Integrators
+
+### S3 Download Redirects
+
+See above note about download redirects. If your application integrates with the the Dataverse software using the APIs, you may need to change how redirects are handled in your tool or integration.
+
+### Metrics API Change
+
+See "New Metrics API" above for a backward incompatible change.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.5 Milestone](https://github.com/IQSS/dataverse/milestone/96?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.5/installation/).
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.5.
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+  
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.5.war`
+
+5\. Restart payara
+
+- `service payara stop`
+- `service payara start`
+
+## Additional Release Steps
+
+1\. Follow the steps to update your Solr configuration, found in the "Notes for Dataverse Installation Administrators" section above. Note that there are different instructions for Dataverse installations running with custom metadata blocks and those without.  
+
+2\. Update Geospatial Metadata Block (if used)
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v5.5/geospatial.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @geospatial.tsv -H "Content-type: text/tab-separated-values"`
diff --git a/doc/release-notes/5.6-release-notes.md b/doc/release-notes/5.6-release-notes.md
new file mode 100644
index 00000000000..813f93db278
--- /dev/null
+++ b/doc/release-notes/5.6-release-notes.md
@@ -0,0 +1,138 @@
+# Dataverse Software 5.6
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Anonymized Access in Support of Double Blind Review
+
+Dataverse installations can select whether or not to allow users to create anonymized private URLs and can control which specific identifying fields are anonymized. If this is enabled, users can create private URLs that do not expose identifying information about dataset depositors, allowing for double blind reviews of datasets in the Dataverse installation.
+
+### Guestbook Responses API
+
+A new API to retrieve Guestbook responses has been added. This makes it easier to retrieve the records for large guestbooks and also makes it easier to integrate with external systems.
+
+### Dataset Semantic API (Experimental)
+
+Dataset metadata can be retrieved, set, and updated using a new, flatter JSON-LD format - following the format of an OAI-ORE export (RDA-conformant Bags), allowing for easier transfer of metadata to/from other systems (i.e. without needing to know Dataverse's metadata block and field storage architecture). This new API also allows for the update of terms metadata (#5899).
+
+This development was supported by the [Research Data Alliance](https://rd-alliance.org), DANS, and Sciences PO and follows the recommendations from the [Research Data Repository Interoperability Working Group](http://dx.doi.org/10.15497/RDA00025).
+
+### Dataset Migration API (Experimental)
+
+Datasets can now be imported following the format of an OAI-ORE export (RDA-conformant Bags), allowing for easier migration from one Dataverse installation to another, and migration from other systems. This experimental, superuser only, endpoint also allows keeping the existing persistent identifier (where the authority and shoulder match those for which the software is configured) and publication dates.
+
+This development was supported by DANS and the [Research Data Alliance](https://rd-alliance.org) and follows the recommendations from the [Research Data Repository Interoperability Working Group](http://dx.doi.org/10.15497/RDA00025).
+
+### Direct Upload API Now Available for Adding Multiple Files Metadata to the Dataset
+
+Users can now add metadata of multiple files to the dataset once the files exists in the s3 bucket using the direct upload API. This makes direct uploads more efficient and reduces server load by only updating the dataset once instead of once per file. For more information, see the [Direct DataFile Upload/Replace API section](https://guides.dataverse.org/en/5.6/developers/s3-direct-upload-api.html) of the Dataverse Software Guides.
+
+## Major Use Cases
+
+Newly-supported major use cases in this release include:
+
+- Users can create Private URLs that anonymize dataset metadata, allowing for double blind peer review. (Issue #1724, PR #7908)
+- Users can download Guestbook records using a new API. (Issue #7767, PR #7931)
+- Users can update terms metadata using the new semantic API. (Issue #5899, PR #7414)
+- Users can retrieve, set, and update metadata using a new, flatter JSON-LD format. (Issue #6497, PR #7414)
+- Administrators can use the Traces API to retrieve information about specific types of user activity  (Issue #7952, PR #7953)
+
+## Notes for Dataverse Installation Administrators
+
+### New Database Constraint
+
+A new DB Constraint has been added in this release. Full instructions on how to identify whether or not your database needs any cleanup before the upgrade can be found in the [Dataverse software GitHub repository](https://github.com/IQSS/dataverse/blob/develop/scripts/issues/7451/PRE-RELEASE-INFO.txt). This information was also emailed out to Dataverse installation contacts.
+
+### Payara 5.2021.5 (or Higher) Required
+
+Some changes in this release require an upgrade to Payara 5.2021.5 or higher. (See the upgrade section).
+
+Instructions on how to update can be found in the [Payara documentation](https://docs.payara.fish/community/docs/5.2021.4/documentation/user-guides/upgrade-payara.html) We've included the necessary steps below, but we recommend that you review the Payara upgrade instructions as it could be helpful during any troubleshooting.
+
+Installations upgrading from a previous Payara version shouldn't encounter a logging configuration bug in Payara-5.2021.5, but if your server.log fills with repeated notes about logging configuration and WELD complaints about loading beans, see the paragraph on `logging.properties` in the [installation guide](https://guides.dataverse.org/en/5.6/installation/installation-main.html#running-the-dataverse-software-installer)
+
+### Enhancement to DDI Metadata Exports
+
+To increase support for internationalization and to improve compliance with CESSDA requirements, DDI exports now have a holdings element with a URI attribute whose value is the URL form of the dataset PID.
+
+## New JVM Options and DB Settings
+
+:AnonymizedFieldTypeNames can be used to enable creation of anonymized Private URLs and to specify which fields will be anonymized.
+
+## Notes for Tool Developers and Integrators
+
+### Semantic API
+
+The new Semantic API is especially helpful in data migrations and getting metadata into a Dataverse installation. Learn more in the [Developers Guide](https://guides.dataverse.org/en/5.6/developers/).
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.6 Milestone](https://github.com/IQSS/dataverse/milestone/97?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.6/installation/).
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.6.
+
+The steps below include a required upgrade to Payara 5.2021.5 or higher. (It is a simple matter of reusing your existing domain directory with the new distribution). But we also recommend that you review the Payara upgrade instructions as it could be helpful during any troubleshooting: [Payara documentation](https://docs.payara.fish/community/docs/5.2021.5/documentation/user-guides/upgrade-payara.html)
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.  
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version 
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Move the current Payara directory out of the way
+
+- `mv $PAYARA $PAYARA.MOVED`
+
+4\. Download the new Payara version (5.2021.5+), and unzip it in its place
+
+5\. Replace the brand new payara/glassfish/domains/domain1 with your old, preserved `domain1`
+
+6\. In domain.xml, add/confirm the existence of the following JVM option to/in the `<config name="server-config"><java-config>` section:
+
+`<jvm-options>[1.8.0u251|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>`
+
+7\. Start Payara
+
+- `service payara start`
+  
+8\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.6.war`
+
+9\. Restart payara
+
+- `service payara stop`
+- `service payara start`
+
+10\. Run ReExportall to update JSON Exports <http://guides.dataverse.org/en/5.6/admin/metadataexport.html?highlight=export#batch-exports-through-the-api>
+
+## Additional Release Steps
+
+**If your installation relies on the database-side stored procedure for generating sequential numeric identifiers:**
+
+Note that you can skip this step if your installation uses the default-style, randomly-generated six alphanumeric character-long identifiers for your datasets! This is the case with most Dataverse installations.
+
+The underlying database framework has been modified in this release, to make it easier for installations  to create custom procedures for generating identifier strings that suit their needs. Your current configuration will be automatically updated by the database upgrade (Flyway) script incorporated in the release. No manual configuration changes should be necessary. However, after the upgrade, we recommend that you confirm that your installation can still create new datasets, and that they are still assigned sequential numeric identifiers. In the unlikely chance that this is no longer working, please re-create the stored procedure following the steps described in the documentation for the `:IdentifierGenerationStyle` setting in the *Configuration* section of the Installation Guide for this release (v5.6).
+
+(Running the script supplied there will NOT overwrite the position on the sequence you are currently using!)
diff --git a/doc/release-notes/5.7-release-notes.md b/doc/release-notes/5.7-release-notes.md
new file mode 100644
index 00000000000..041265410f4
--- /dev/null
+++ b/doc/release-notes/5.7-release-notes.md
@@ -0,0 +1,155 @@
+# Dataverse Software 5.7
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Experimental Support for External Vocabulary Services
+
+Dataverse can now be configured to associate specific metadata fields with third-party vocabulary services to provide an easy way for users to select values from those vocabularies. The mapping involves use of external Javascripts. Two such scripts have been developed so far: one for vocabularies served via the [SKOSMOS protocol](https://skosmos.org) and one allowing people to be identified via their [ORCID](https://orcid.org). The guides contain info about the new [:CVocConf setting](https://guides.dataverse.org/en/5.7/installation/config.html#cvocconf) used for configuration and additional information about this functionality. Scripts, examples, and additional documentation are available at the [GDCC GitHub Repository](https://github.com/gdcc/dataverse-external-vocab-support).
+
+Please watch the [online presentation](https://youtu.be/mWMPxCwB2ys?t=1794), [read the document with requirements](https://docs.google.com/document/d/1txdcFuxskRx_tLsDQ7KKLFTMR_r9IBhorDu3V_r445w/edit?ts=5fdbca9a) and join the [Dataverse Working Group on Ontologies and Controlled Vocabularies](https://dataverse.org/community-calls) if you have some questions and want to contribute.
+
+This functionality was initially developed by [Data Archiving and Networked Services](http://dans.knaw.nl/en/) (DANS-KNAW), the Netherlands, and funded by [SSHOC](https://sshopencloud.eu), "Social Sciences and Humanities Open Cloud". SSHOC has received funding from the European Union’s Horizon 2020 project call H2020-INFRAEOSC-04-2018, grant agreement #823782. It was further improved by the Global Dataverse Community Consortium (GDCC) and extended with the support of semantic search.
+
+### Curation Status Labels
+
+A new :AllowedCurationLabels setting allows a sysadmins to define one or more sets of labels that can be applied to a draft Dataset version via the user interface or API to indicate the status of the dataset with respect to a defined curation process.
+
+Labels are completely customizable (alphanumeric or spaces, up to 32 characters, e.g. "Author contacted", "Privacy Review", "Awaiting paper publication"). Superusers can select a specific set of labels, or disable this functionality per collection. Anyone who can publish a draft dataset (e.g. curators) can set/change/remove labels (from the set specified for the collection containing the dataset) via the user interface or via an API. The API also would allow external tools to search for, read and set labels on Datasets, providing an integration mechanism. Labels are visible on the Dataset page and in Dataverse collection listings/search results. Internally, the labels have no effect, and at publication, any existing label will be removed. A reporting API call allows admins to get a list of datasets and their curation statuses.
+
+The Solr schema must be updated as part of installing the release of Dataverse containing this feature for it to work.
+
+## Major Use Cases
+
+Newly-supported major use cases in this release include:
+
+- Administrators will be able to set up integrations with external vocabulary services, allowing for autocomplete-assisted metadata entry, metadata standardization, and better integration with other systems (Issue #7711, PR #7946)
+- Users viewing datasets in the root Dataverse collection will now see breadcrumbs that have have a link back to the root Dataverse collection (Issue #7527, PR #8078)
+- Users will be able to more easily differentiate between datasets and files through new iconography (Issue #7991, PR #8021)
+- Users retrieving large guestbooks over the API will experience fewer failures (Issue #8073, PR #8084)
+- Dataverse collection administrators can specify which language will be used when entering metadata for new Datasets in a collection, based on a list of languages specified by the Dataverse installation administrator (Issue #7388, PR #7958)
+  - Users will see the language used for metadata entry indicated at the document or element level in metadata exports (Issue #7388, PR #7958)
+  - Administrators will now be able to specify the language(s) of controlled vocabulary entries, in addition to the installation's default language (Issue #6751, PR #7959)
+- Administrators and curators can now receive notifications when a dataset is created (Issue #8069, PR #8070)
+- Administrators with large files in their installation can disable the automatic checksum verification process at publish time (Issue #8043, PR #8074)
+
+## Notes for Dataverse Installation Administrators
+
+### Dataset Creation Notifications for Administrators
+
+A new :SendNotificationOnDatasetCreation setting has been added. When true, administrators and curators (those who can publish the dataset) will get a notification when a new dataset is created. This makes it easier to track activity in a Dataverse and, for example, allow admins to follow up when users do not publish a new dataset within some period of time.
+
+### Skip Checksum Validation at Publish Based on Size
+
+When a user requests to publish a dataset, the time taken to complete the publishing process varies based on the dataset/datafile size.
+
+With the additional settings of :DatasetChecksumValidationSizeLimit and :DataFileChecksumValidationSizeLimit, the checksum validation can be skipped while publishing.
+
+If the Dataverse administrator chooses to set these values, it's strongly recommended to have an external auditing system run periodically in order to monitor the integrity of the files in the Dataverse installation.
+
+### Guestbook Response API Update
+
+With this release the Retrieve Guestbook Responses for a Dataverse Collection API will no longer produce a file by default. You may specify an output file by adding a -o $YOURFILENAME to the curl command.
+
+### Dynamic JavaServer Faces Configuration Options
+
+This release includes a new way to easily change JSF settings via MicroProfile Config, especially useful during development.
+See the [development guide on "Debugging"](https://guides.dataverse.org/en/5.7/developers/debugging.html) for more information.
+
+### Enhancements to DDI Metadata Exports
+
+Several changes have been made to the DDI exports to improve support for internationalization and to improve compliance with CESSDA requirements. These changes include:
+
+- Addition of xml:lang attributes specifying the dataset metadata language at the document level and for individual elements such as title and description
+- Specification of controlled vocabulary terms in duplicate elements in multiple languages (in the installation default langauge and, if different, the dataset metadata language)
+
+While these changes are intended to improve harvesting and integration with external systems, they could break existing connections that make assumptions about the elements and attributes that have been changed.
+
+## New JVM Options and DB Settings
+
+- :SendNotificationOnDatasetCreation - A boolean setting that, if true will send an email and notification to additional users when a Dataset is created. Messages go to those, other than the dataset creator, who have the ability/permission necessary to publish the dataset.
+- :DatasetChecksumValidationSizeLimit - disables the checksum validation while publishing for any dataset size greater than the limit.
+- :DataFileChecksumValidationSizeLimit - Disables the checksum validation while publishing for any datafiles greater than the limit.
+- :CVocConf - A JSON-structured setting that configures Dataverse to associate specific metadatablock fields with external vocabulary services and specific vocabularies/sub-vocabularies managed by that service.
+- :MetadataLanguages - Sets which languages can be used when entering dataset metadata.
+- :AllowedCurationLabels - A JSON Object containing lists of allowed labels (up to 32 characters, spaces allowed) that can be set, via API or UI by users with the permission to publish a dataset. The set of labels allowed  for datasets can be selected by a superuser - via the Dataverse collection page (Edit/General Info) or set via API call.
+
+## Notes for Tool Developers and Integrators
+
+### Bags Now Support File Paths
+
+The original Bag generation code stored all dataset files directly under the /data directory. With the addition in Dataverse of a directory path for files and then a change to allow files with different paths to have the same name, archival Bags will now use the directory path from Dataverse to avoid name collisions within the /data directory. Prior to this update, Bags from Datasets with multiple files with the same name would have been created with only one of the files with that name (with warnings in the log, but still generating the Bag).
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.7 Milestone](https://github.com/IQSS/dataverse/milestone/98?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.7/installation/).
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.7.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.  
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+  
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.7.war`
+
+5\. Restart payara
+
+- `service payara stop`
+- `service payara start`
+
+## Additional Release Steps
+
+1\. Replace Solr schema.xml to allow Curation Labels to be used. See specific instructions below for those installations with custom metadata blocks (1a) and those without (1b).
+
+1a\.
+
+For installations with Custom Metadata Blocks:
+
+-stop solr instance (usually service solr stop, depending on solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/5.7/installation/prerequisites.html#solr-init-script)
+
+- add the following line to your schema.xml:
+
+    `<field name="externalStatus" type="string" stored="true" indexed="true" multiValued="false"/>`
+
+- restart solr instance (usually service solr start, depending on solr/OS)
+
+1b\. 
+
+For installations without Custom Metadata Blocks:
+
+-stop solr instance (usually service solr stop, depending on solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/5.7/installation/prerequisites.html#solr-init-script)
+
+-replace schema.xml
+
+cp /tmp/dvinstall/schema.xml /usr/local/solr/solr-8.8.1/server/solr/collection1/conf
+
+-start solr instance (usually service solr start, depending on solr/OS)
\ No newline at end of file
diff --git a/doc/release-notes/5.8-release-notes.md b/doc/release-notes/5.8-release-notes.md
new file mode 100644
index 00000000000..b452739e161
--- /dev/null
+++ b/doc/release-notes/5.8-release-notes.md
@@ -0,0 +1,112 @@
+# Dataverse Software 5.8
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Support for Data Embargoes
+
+The Dataverse Software now supports file-level embargoes. The ability to set embargoes, up to a maximum duration (in months), can be configured by a Dataverse installation administrator. For more information, see the [Embargoes section](https://guides.dataverse.org/en/5.8/user/dataset-management.html#embargoes) of the Dataverse Software Guides.
+
+- Users can configure a specific embargo, defined by an end date and a short reason, on a set of selected files or an individual file, by selecting the 'Embargo' menu item and entering information in a popup dialog. Embargoes can only be set, changed, or removed before a file has been published. After publication, only Dataverse installation administrators can make changes, using an API.
+
+- While embargoed, files cannot be previewed or downloaded (as if restricted, with no option to allow access requests). After the embargo expires, files become accessible. If the files were also restricted, they remain inaccessible and functionality is the same as for any restricted file.
+
+- By default, the citation date reported for the dataset and the datafiles in version 1.0 reflects the longest embargo period on any file in version 1.0, which is consistent with recommended practice from DataCite. Administrators can still specify an alternate date field to be used in the citation date via the [Set Citation Date Field Type for a Dataset API Call](https://guides.dataverse.org/en/5.8/api/native-api.html#set-citation-date-field-type-for-a-dataset).
+
+The work to add this functionality was initiated by Data Archiving and Networked Services (DANS-KNAW), the Netherlands. It was further developed by the Global Dataverse Community Consortium (GDCC) in cooperation with and with funding from DANS.
+
+## Major Use Cases and Infrastructure Enhancements
+
+Newly-supported major use cases in this release include:
+
+- Users can set file-level embargoes. (Issue #7743, #4052, #343, PR #8020)
+- Improved accessibility of form labels on the advanced search page (Issue #8169, PR #8170)
+
+## Notes for Dataverse Installation Administrators
+
+### Mitigate Solr Schema Management Problems
+
+With [Release 5.5](https://github.com/IQSS/dataverse/releases/tag/v5.5), the `<copyField>` definitions had been reincluded into `schema.xml` to fix searching for datasets.
+
+This release includes a final update to `schema.xml` and a new script `update-fields.sh` to manage your custom metadata fields, and to provide opportunities for other future improvements. The broken script `updateSchemaMDB.sh` has been removed.
+
+You will need to replace your schema.xml with the one provided in order to make sure that the new script can function. If you do not use any custom metadata blocks in your installation, this is the only change to be made. If you do use custom metadata blocks you will need to take a few extra steps, enumerated in the step-by-step instructions below.
+
+## New JVM Options and DB Settings
+
+- :MaxEmbargoDurationInMonths controls whether embargoes are allowed in a Dataverse instance and can limit the maximum duration users are allowed to specify. A value of 0 months or non-existent setting indicates embargoes are not supported. A value of -1 allows embargoes of any length.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.8 Milestone](https://github.com/IQSS/dataverse/milestone/99?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.8/installation/). Please also contact us to get added to the [Dataverse Project Map](https://guides.dataverse.org/en/5.8/installation/config.html#putting-your-dataverse-installation-on-the-map-at-dataverse-org) if you have not done so already.
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.8.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.  
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+  
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.8.war`
+
+5\. Restart payara
+
+- `service payara stop`
+- `service payara start`
+
+6\. Update Solr schema.xml.
+
+`/usr/local/solr/solr-8.8.1/server/solr/collection1/conf` is used in the examples below as the location of your Solr schema. Please adapt it to the correct location, if different in your installation. Use `find / -name schema.xml` if in doubt.
+
+6a\. Replace `schema.xml` with the base version included in this release.
+
+```
+   wget https://github.com/IQSS/dataverse/releases/download/v5.8/schema.xml
+   cp schema.xml /usr/local/solr/solr-8.8.1/server/solr/collection1/conf
+```
+
+For installations that are not using any Custom Metadata Blocks, **you can skip the next step**.
+
+6b\. For installations with Custom Metadata Blocks
+
+Use the script provided in the release to add the custom fields to the base `schema.xml` installed in the previous step.
+
+```
+   wget https://github.com/IQSS/dataverse/releases/download/v5.8/update-fields.sh
+   chmod +x update-fields.sh
+   curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-8.8.1/server/solr/collection1/conf/schema.xml
+```
+
+(Note that the curl command above calls the admin api on `localhost` to obtain the list of the custom fields. In the unlikely case that you are running the main Dataverse Application and Solr on different servers, generate the `schema.xml` on the application node, then copy it onto the Solr server)
+
+7\. Restart Solr
+
+Usually `service solr stop; service solr start`, but may be different on your system. See the [Installation Guide](https://guides.dataverse.org/en/5.8/installation/prerequisites.html#solr-init-script) for more details.
diff --git a/doc/release-notes/5.9-release-notes.md b/doc/release-notes/5.9-release-notes.md
new file mode 100644
index 00000000000..06005396908
--- /dev/null
+++ b/doc/release-notes/5.9-release-notes.md
@@ -0,0 +1,171 @@
+# Dataverse Software 5.9
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Dataverse Collection Page Optimizations
+
+The Dataverse Collection page, which also serves as the search page and the homepage in most Dataverse installations, has been optimized, with a specific focus on reducing the number of queries for each page load.  These optimizations will be more noticable on Dataverse installations with higher traffic.
+
+### Support for HTTP "Range" Header for Partial File Downloads
+
+Dataverse now supports the HTTP "Range" header, which allows users to download parts of a file. Here are some examples:
+
+- `bytes=0-9` gets the first 10 bytes.
+- `bytes=10-19` gets 10 bytes from the middle.
+- `bytes=-10` gets the last 10 bytes.
+- `bytes=9-` gets all bytes except the first 10.
+
+Only a single range is supported. For more information, see the [Data Access API](https://guides.dataverse.org/en/5.9/api/dataaccess.html) section of the API Guide.
+
+### Support for Optional External Metadata Validation Scripts
+
+The Dataverse software now allows an installation administrator to provide custom scripts for additional metadata validation when datasets are being published and/or when Dataverse collections are being published or modified. The Harvard Dataverse Repository has been using this mechanism to combat content that violates our Terms of Use, specifically spam content. All the validation or verification logic is defined in these external scripts, thus making it possible for an installation to add checks custom-tailored to their needs.  
+
+Please note that only the metadata are subject to these validation checks. This does not check the content of any uploaded files.
+
+For more information, see the [Database Settings](https://guides.dataverse.org/en/5.9/installation/config.html) section of the Guide. The new settings are listed below, in the "New JVM Options and DB Settings" section of these release notes.
+
+### Displaying Author's Identifier as Link
+
+In the dataset page's metadata tab the author's identifier is now displayed as a clickable link, which points to the profile page in the external service (ORCID, VIAF etc.) in cases where the identifier scheme provides a resolvable landing page. If the identifier does not match the expected scheme, a link is not shown.
+
+### Auxiliary File API Enhancements
+
+This release includes updates to the Auxiliary File API. These updates include:
+
+- Auxiliary files can now also be associated with non-tabular files
+- Auxiliary files can now be deleted
+- Duplicate Auxiliary files can no longer be created
+- A new API has been added to list Auxiliary files by their origin
+- Some auxiliary were being saved with the wrong content type (MIME type) but now the user can supply the content type on upload, overriding the type that would otherwise be assigned
+- Improved error reporting
+- A bugfix involving checksums for Auxiliary files
+
+Please note that the Auxiliary files feature is experimental and is designed to support integration with tools from the [OpenDP Project](https://opendp.org). If the API endpoints are not needed they can be blocked.
+
+## Major Use Cases and Infrastructure Enhancements
+
+Newly-supported major use cases in this release include:
+
+- The Dataverse collection page has been optimized, resulting in quicker load times on one of the most common pages in the application (Issue #7804, PR #8143)
+- Users will now be able to specify a certain byte range in their downloads via API, allowing for downloads of file parts. (Issue #6397, PR #8087)
+- A Dataverse installation administrator can now set up metadata validation for datasets and Dataverse collections, allowing for publish-time and create-time checks for all content. (Issue #8155, PR #8245)
+- Users will be provided with clickable links to authors' ORCIDs and other IDs in the dataset metadata (Issue #7978, PR #7979)
+- Users will now be able to associate Auxiliary files with non-tabular files (Issue #8235, PR #8237)
+- Users will no longer be able to create duplicate Auxiliary files (Issue #8235, PR #8237)
+- Users will be able to delete Auxiliary files (Issue #8235, PR #8237)
+- Users can retrieve a list of Auxiliary files based on their origin (Issue #8235, PR #8237)
+- Users will be able to supply the content type of Auxiliary files on upload (Issue #8241, PR #8282)
+- The indexing process has been updated so that datasets with fewer files and indexed first, resulting in fewer failures and making it easier to identify problematically-large datasets. (Issue #8097, PR #8152)
+- Users will no longer be able to create metadata records with problematic special characters, which would later require Dataverse installation administrator intervention and a database change (Issue #8018, PR #8242)
+- The Dataverse software will now appropriately recognize files with the .geojson extension as GeoJSON files rather than "unknown" (Issue #8261, PR #8262)
+- A Dataverse installation administrator can now retrieve more information about role deletion from the ActionLogRecord (Issue #2912, PR #8211)
+- Users will be able to use a new role to allow a user to respond to file download requests without also giving them the power to manage the dataset  (Issue #8109, PR #8174)
+- Users will no longer be forced to update their passwords when moving from Dataverse 3.x to Dataverse 4.x (PR #7916)
+- Improved accessibility of buttons on the Dataset and File pages (Issue #8247, PR #8257)
+
+## Notes for Dataverse Installation Administrators
+
+### Indexing Performance on Datasets with Large Numbers of Files
+
+We discovered that whenever a full reindexing needs to be performed, datasets with large numbers of files take an exceptionally long time to index. For example, in the Harvard Dataverse Repository, it takes several hours for a dataset that has 25,000 files. In situations where the Solr index needs to be erased and rebuilt from scratch (such as a Solr version upgrade, or a corrupt index, etc.) this can significantly delay the repopulation of the search catalog.
+
+We are still investigating the reasons behind this performance issue. For now, even though some improvements have been made, a dataset with thousands of files is still going to take a long time to index. In this release, we've made a simple change to the reindexing process, to index any such datasets at the very end of the batch, after all the datasets with fewer files have been reindexed. This does not improve the overall reindexing time, but will repopulate the bulk of the search index much faster for the users of the installation.
+
+### Custom Analytics Code Changes
+
+You should update your custom analytics code to capture a bug fix related to tracking within the dataset files table. This release restores that tracking.
+
+For more information, see the documentation and sample analytics code snippet provided in [Installation Guide](http://guides.dataverse.org/en/5.9/installation/config.html#web-analytics-code). This update can be used on any version 5.4+.
+
+### New ManageFilePermissions Permission
+
+Dataverse can now support a use case in which a Admin or Curator would like to delegate the ability to grant access to restricted files to other users. This can be implemented by creating a custom role (e.g. DownloadApprover) that has the new ManageFilePermissions permission. This release introduces the new permission, and a Flyway script adjusts the existing Admin and Curator roles so they continue to have the ability to grant file download requrests.
+
+### Thumbnail Defaults
+
+New *default* values have been added for the JVM settings `dataverse.dataAccess.thumbnail.image.limit` and `dataverse.dataAccess.thumbnail.pdf.limit`, of 3MB and 1MB respectively. This means that, *unless specified otherwise* by the JVM settings already in your domain configuration, the application will skip attempting to generate thumbnails for image files and PDFs that are above these size limits.
+In previous versions, if these limits were not explicitly set, the application would try to create thumbnails for files of unlimited size. Which would occasionally cause problems with very large images.
+
+## New JVM Options and DB Settings
+
+The following DB settings allow configuration of the external metadata validator:
+
+- :DataverseMetadataValidatorScript
+- :DataverseMetadataPublishValidationFailureMsg
+- :DataverseMetadataUpdateValidationFailureMsg
+- :DatasetMetadataValidatorScript
+- :DatasetMetadataValidationFailureMsg
+- :ExternalValidationAdminOverride
+
+See the [Database Settings](https://guides.dataverse.org/en/5.9/installation/config.html) section of the Guides for more information.
+
+## Notes for Developers and Integrators
+
+Two sections of the Developer Guide have been updated:
+
+- Instructions on how to sync a PR in progress with develop have been added in the version control section
+- Guidance on avoiding ineffeciencies in JSF render logic has been added to the "Tips" section
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [5.9 Milestone](https://github.com/IQSS/dataverse/milestone/100?closed=1) in Github.
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please see our [Installation Guide](https://guides.dataverse.org/en/5.9/installation/). Please also contact us to get added to the [Dataverse Project Map](https://guides.dataverse.org/en/5.9/installation/config.html#putting-your-dataverse-installation-on-the-map-at-dataverse-org) if you have not done so already.
+
+## Upgrade Instructions
+
+0\. These instructions assume that you've already successfully upgraded from Dataverse Software 4.x to Dataverse Software 5 following the instructions in the [Dataverse Software 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0). After upgrading from the 4.x series to 5.0, you should progress through the other 5.x releases before attempting the upgrade to 5.9.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.  
+
+In the following commands we assume that Payara 5 is installed in `/usr/local/payara5`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara5`
+
+(or `setenv PAYARA /usr/local/payara5` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin list-applications`
+- `$PAYARA/bin/asadmin undeploy dataverse<-version>`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+  
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-5.9.war`
+
+5\. Restart payara
+
+- `service payara stop`
+- `service payara start`
+
+6\. Run ReExportall to update JSON Exports
+
+Following the directions in the [Admin Guide](http://guides.dataverse.org/en/5.9/admin/metadataexport.html?highlight=export#batch-exports-through-the-api)
+
+## Additional Release Steps
+
+(for installations collecting web analytics)
+
+1\. Update custom analytics code per the [Installation Guide](http://guides.dataverse.org/en/5.9/installation/config.html#web-analytics-code).
+
+(for installations with GeoJSON files)
+
+1\. Redetect GeoJSON files to update the type from "Unknown" to GeoJSON, following the directions in the [API Guide](https://guides.dataverse.org/en/5.9/api/native-api.html#redetect-file-type)
+
+2\. Kick off full reindex following the directions in the [Admin Guide](http://guides.dataverse.org/en/5.9/admin/solr-search-index.html)
diff --git a/doc/release-notes/6.0-release-notes.md b/doc/release-notes/6.0-release-notes.md
new file mode 100644
index 00000000000..858cd604bda
--- /dev/null
+++ b/doc/release-notes/6.0-release-notes.md
@@ -0,0 +1,316 @@
+# Dataverse 6.0
+
+This is a platform upgrade release. Payara, Solr, and Java have been upgraded. No features have been added to the Dataverse software itself. Only a handful of bugs were fixed.
+
+Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project!
+
+## Release Highlights (Major Upgrades, Breaking Changes)
+
+This release contains major upgrades to core components. Detailed upgrade instructions can be found below.
+
+### Runtime
+
+- The required Java version has been increased from version 11 to 17.
+    - See PR #9764 for details.
+- Payara application server has been upgraded to version 6.2023.8.
+    - This is a required update.
+    - Please note that Payara Community 5 has reached [end of life](https://www.payara.fish/products/payara-platform-product-lifecycle/)
+    - See PR #9685 and PR #9795 for details.
+- Solr has been upgraded to version 9.3.0.
+    - See PR #9787 for details.
+- PostgreSQL 13 remains the tested and supported version.
+    - That said, the installer and Flyway have been upgraded to support PostgreSQL 14 and 15. See the [PostgreSQL](https://guides.dataverse.org/en/6.0/installation/prerequisites.html#postgresql) section of the Installation Guide and PR #9877 for details.
+
+### Development
+
+- Removal of Vagrant and Docker All In One (docker-aio), deprecated in Dataverse v5.14. See PR #9838 and PR #9685 for details.
+- All tests have been migrated to use JUnit 5 exclusively from now on. See PR #9796 for details.
+
+## Installation
+
+If this is a new installation, please follow our [Installation Guide](https://guides.dataverse.org/en/latest/installation/). Please don't be shy about [asking for help](https://guides.dataverse.org/en/latest/installation/intro.html#getting-help) if you need it!
+
+Once you are in production, we would be delighted to update our [map of Dataverse installations](https://dataverse.org/installations) around the world to include yours! Please [create an issue](https://github.com/IQSS/dataverse-installations/issues) or email us at support@dataverse.org to join the club!
+
+You are also very welcome to join the [Global Dataverse Community Consortium](https://dataversecommunity.global) (GDCC).
+
+## Upgrade Instructions
+
+Upgrading requires a maintenance window and downtime. Please plan ahead, create backups of your database, etc.
+
+These instructions assume that you've already upgraded through all the 5.x releases and are now running Dataverse 5.14.
+
+### Upgrade from Java 11 to Java 17
+
+Java 17 is now required for Dataverse. Solr can run under Java 11 or Java 17 but the latter is recommended. In preparation for the Java upgrade, stop both Dataverse/Payara and Solr.
+
+1. Undeploy Dataverse, if deployed, using the unprivileged service account.
+
+   `sudo -u dataverse /usr/local/payara5/bin/asadmin list-applications`
+
+   `sudo -u dataverse /usr/local/payara5/bin/asadmin undeploy dataverse-5.14`
+
+1. Stop Payara 5.
+
+   `sudo -u dataverse /usr/local/payara5/bin/asadmin stop-domain`
+
+1. Stop Solr 8.
+
+   `sudo systemctl stop solr.service`
+
+1. Install Java 17.
+
+   Assuming you are using RHEL or a derivative such as Rocky Linux:
+
+   `sudo yum install java-17-openjdk`
+
+1. Set Java 17 as the default.
+
+   Assuming you are using RHEL or a derivative such as Rocky Linux:
+
+   `sudo alternatives --config java`
+
+1. Test that Java 17 is the default.
+
+   `java -version`
+
+### Upgrade from Payara 5 to Payara 6
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
+
+1. Download Payara 6.2023.8.
+
+   `curl -L -O https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2023.8/payara-6.2023.8.zip`
+
+1. Unzip it to /usr/local (or your preferred location).
+
+   `sudo unzip payara-6.2023.8.zip -d /usr/local/`
+
+1. Change ownership of the unzipped Payara to your "service" user ("dataverse" by default).
+
+   `sudo chown -R dataverse /usr/local/payara6`
+
+1. Undeploy Dataverse, if deployed, using the unprivileged service account.
+
+   `sudo -u dataverse /usr/local/payara5/bin/asadmin list-applications`
+
+   `sudo -u dataverse /usr/local/payara5/bin/asadmin undeploy dataverse-5.14`
+
+1. Stop Payara 5, if running.
+
+   `sudo -u dataverse /usr/local/payara5/bin/asadmin stop-domain`
+
+1. Copy Dataverse-related lines from Payara 5 to Payara 6 domain.xml.
+
+   `sudo -u dataverse cp /usr/local/payara6/glassfish/domains/domain1/config/domain.xml /usr/local/payara6/glassfish/domains/domain1/config/domain.xml.orig`
+
+   `sudo egrep 'dataverse|doi' /usr/local/payara5/glassfish/domains/domain1/config/domain.xml > lines.txt`
+
+   `sudo vi /usr/local/payara6/glassfish/domains/domain1/config/domain.xml`
+
+   The lines will appear in two sections, examples shown below (but your content will vary).
+
+   Section 1: system properties (under `<server name="server" config-ref="server-config">`)
+
+   ```
+   <system-property name="dataverse.db.user" value="dvnuser"></system-property>
+   <system-property name="dataverse.db.host" value="localhost"></system-property>
+   <system-property name="dataverse.db.port" value="5432"></system-property>
+   <system-property name="dataverse.db.name" value="dvndb"></system-property>
+   <system-property name="dataverse.db.password" value="dvnsecret"></system-property>
+   ```
+
+   Note: if you used the Dataverse installer, you won't have a `dataverse.db.password` property. See "Create password aliases" below.
+
+   Section 2: JVM options (under `<java-config classpath-suffix="" debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9009" system-classpath="">`, the one under `<config name="server-config">`, not under `<config name="default-config">`)
+
+   ```
+   <jvm-options>-Ddataverse.files.directory=/usr/local/dvn/data</jvm-options>
+   <jvm-options>-Ddataverse.files.file.type=file</jvm-options>
+   <jvm-options>-Ddataverse.files.file.label=file</jvm-options>
+   <jvm-options>-Ddataverse.files.file.directory=/usr/local/dvn/data</jvm-options>
+   <jvm-options>-Ddataverse.rserve.host=localhost</jvm-options>
+   <jvm-options>-Ddataverse.rserve.port=6311</jvm-options>
+   <jvm-options>-Ddataverse.rserve.user=rserve</jvm-options>
+   <jvm-options>-Ddataverse.rserve.password=rserve</jvm-options>
+   <jvm-options>-Ddataverse.auth.password-reset-timeout-in-minutes=60</jvm-options>
+   <jvm-options>-Ddataverse.timerServer=true</jvm-options>
+   <jvm-options>-Ddataverse.fqdn=dev1.dataverse.org</jvm-options>
+   <jvm-options>-Ddataverse.siteUrl=https://dev1.dataverse.org</jvm-options>
+   <jvm-options>-Ddataverse.files.storage-driver-id=file</jvm-options>
+   <jvm-options>-Ddoi.username=testaccount</jvm-options>
+   <jvm-options>-Ddoi.password=notmypassword</jvm-options>
+   <jvm-options>-Ddoi.baseurlstring=https://mds.test.datacite.org/</jvm-options>
+   <jvm-options>-Ddoi.dataciterestapiurlstring=https://api.test.datacite.org</jvm-options>
+   ```
+
+1. Check the `Xmx` setting in `domain.xml`.
+
+   Under `/usr/local/payara6/glassfish/domains/domain1/config/domain.xml`, check the `Xmx` setting under `<config name="server-config">`, where you put the JVM options, not the one under `<config name="default-config">`. Note that there are two such settings, and you want to adjust the one in the stanza with Dataverse options. This sets the JVM heap size; a good rule of thumb is half of your system's total RAM. You may specify the value in MB (`8192m`) or GB (`8g`).
+
+1. Copy `jhove.conf` and `jhoveConfig.xsd` from Payara 5, edit and change `payara5` to `payara6`.
+
+   `sudo cp /usr/local/payara5/glassfish/domains/domain1/config/jhove* /usr/local/payara6/glassfish/domains/domain1/config/`
+
+   `sudo chown dataverse /usr/local/payara6/glassfish/domains/domain1/config/jhove*`
+
+   `sudo -u dataverse vi /usr/local/payara6/glassfish/domains/domain1/config/jhove.conf`
+
+1. Copy logos from Payara 5 to Payara 6.
+
+   These logos are for collections (dataverses).
+
+   `sudo -u dataverse cp -r /usr/local/payara5/glassfish/domains/domain1/docroot/logos /usr/local/payara6/glassfish/domains/domain1/docroot`
+
+1. If you are using Make Data Count (MDC), edit :MDCLogPath.
+
+   Your `:MDCLogPath` database setting might be pointing to a Payara 5 directory such as `/usr/local/payara5/glassfish/domains/domain1/logs`. If so, edit this to be Payara 6. You'll probably want to copy your logs over as well.
+
+1. If you've enabled access logging or any other site-specific configuration, be sure to preserve them. For instance, the default domain.xml includes
+
+   ```
+        <http-service>
+        <access-log></access-log>
+   ```
+
+   but you may wish to include
+
+   ```
+        <http-service access-logging-enabled="true">
+        <access-log format="%client.name% %datetime% %request% %status% %response.length% %header.user-agent% %header.referer% %cookie.JSESSIONID% %header.x-forwarded-for%"></access-log>
+   ```
+
+   Be sure to keep a previous copy of your domain.xml for reference.
+
+1. Update systemd unit file (or other init system) from `/usr/local/payara5` to `/usr/local/payara6`, if applicable.
+
+1. Start Payara.
+
+   `sudo -u dataverse /usr/local/payara6/bin/asadmin start-domain`
+
+1. Create a Java mail resource, replacing "localhost" for mailhost with your mail relay server, and replacing "localhost" for fromaddress with the FQDN of your Dataverse server.
+
+   `sudo -u dataverse /usr/local/payara6/bin/asadmin create-javamail-resource --mailhost "localhost" --mailuser "dataversenotify" --fromaddress "do-not-reply@localhost" mail/notifyMailSession`
+
+1. Create password aliases for your database, rserve and datacite jvm-options, if you're using them.
+
+   `echo "AS_ADMIN_ALIASPASSWORD=yourDBpassword" > /tmp/dataverse.db.password.txt`
+
+   `sudo -u dataverse /usr/local/payara6/bin/asadmin create-password-alias --passwordfile /tmp/dataverse.db.password.txt`
+
+   When you are prompted "Enter the value for the aliasname operand", enter `dataverse.db.password`
+
+   You should see "Command create-password-alias executed successfully."
+
+   You'll want to perform similar commands for `rserve_password_alias` and `doi_password_alias` if you're using Rserve and/or DataCite.
+
+1. Enable workaround for FISH-7722.
+
+   The following workaround is for https://github.com/payara/Payara/issues/6337
+
+   `sudo -u dataverse /usr/local/payara6/bin/asadmin create-jvm-options --add-opens=java.base/java.io=ALL-UNNAMED`
+
+1. Create the network listener on port 8009.
+
+   `sudo -u dataverse /usr/local/payara6/bin/asadmin create-network-listener --protocol http-listener-1 --listenerport 8009 --jkenabled true jk-connector`
+
+1. Deploy the Dataverse 6.0 war file.
+
+   `sudo -u dataverse /usr/local/payara6/bin/asadmin deploy /path/to/dataverse-6.0.war`
+
+1. Check that you get a version number from Dataverse.
+
+   This is just a sanity check that Dataverse has been deployed properly.
+
+   `curl http://localhost:8080/api/info/version`
+
+1. Perform one final Payara restart to ensure that timers are initialized properly.
+
+   `sudo -u dataverse /usr/local/payara6/bin/asadmin stop-domain`
+
+   `sudo -u dataverse /usr/local/payara6/bin/asadmin start-domain`
+
+### Upgrade from Solr 8 to 9
+
+Solr has been upgraded to Solr 9. You must install Solr fresh and reindex. You cannot use your old `schema.xml` because the format has changed.
+
+The instructions below are copied from https://guides.dataverse.org/en/6.0/installation/prerequisites.html#installing-solr and tweaked a bit for an upgrade scenario.
+
+We assume that you already have a user called "solr" (from the instructions above), added during your initial installation of Solr. We also assume that you have already stopped Solr 8 as explained in the instructions above about upgrading Java.
+
+1. Become the "solr" user and then download and configure Solr.
+
+   `su - solr`
+
+   `cd /usr/local/solr`
+
+   `wget https://archive.apache.org/dist/solr/solr/9.3.0/solr-9.3.0.tgz`
+
+   `tar xvzf solr-9.3.0.tgz`
+
+   `cd solr-9.3.0`
+
+   `cp -r server/solr/configsets/_default server/solr/collection1`
+
+1. Unzip "dvinstall.zip" from this release. Unzip it into /tmp. Then copy the following files into place.
+
+   `cp /tmp/dvinstall/schema*.xml /usr/local/solr/solr-9.3.0/server/solr/collection1/conf`
+
+   `cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-9.3.0/server/solr/collection1/conf`
+
+1. A Dataverse installation requires a change to the jetty.xml file that ships with Solr.
+
+   Edit `/usr/local/solr/solr-9.3.0/server/etc/jetty.xml`, increasing `requestHeaderSize` from `8192` to `102400`
+
+1. Tell Solr to create the core "collection1" on startup.
+
+   `echo "name=collection1" > /usr/local/solr/solr-9.3.0/server/solr/collection1/core.properties`
+
+1. Update your init script.
+
+   Your init script may be located at `/etc/systemd/system/solr.service`, for example. Update the path to Solr to be `/usr/local/solr/solr-9.3.0`.
+
+1. Start Solr using your init script and check collection1.
+
+   The collection1 check below should print out fields Dataverse uses like "dsDescription".
+
+   `systemctl start solr.service`
+
+   `curl http://localhost:8983/solr/collection1/schema/fields`
+
+1. Reindex Solr.
+
+   For details, see https://guides.dataverse.org/en/6.0/admin/solr-search-index.html but here is the reindex command:
+
+   `curl http://localhost:8080/api/admin/index`
+
+1. If you have custom metadata blocks installed, you must update your Solr `schema.xml` to include your custom fields.
+
+   For details, please see https://guides.dataverse.org/en/6.0/admin/metadatacustomization.html#updating-the-solr-schema
+
+   At a high level you will be copying custom fields from the output of http://localhost:8080/api/admin/index/solr/schema or using a script to automate this.
+
+## Potential Archiver Incompatibilities with Payara 6
+
+The [Google Cloud and DuraCloud archivers](https://guides.dataverse.org/en/5.14/installation/config.html#bagit-export) may not work in Dataverse 6.0.
+
+This is due to the archivers' dependence on libraries that include classes in `javax.* packages` that are no longer available. If these classes are actually used when the archivers run, the archivers would fail. As these two archivers require additional setup, they have not been tested in 6.0. Community members using these archivers or considering their use are encouraged to test them with 6.0 and report any errors and/or provide fixes for them that can be included in future releases.
+
+## Bug Fix for Dataset Templates with Custom Terms of Use
+
+A bug was fixed for the following scenario:
+
+- Create a template with custom terms.
+- Set that template as the default.
+- Try to create a dataset.
+- A 500 error appears before the form to create dataset is even shown.
+
+For more details, see issue #9825 and PR #9892
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [6.0 Milestone](https://github.com/IQSS/dataverse/milestone/109?closed=1) in GitHub.
+
+## Getting Help
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
diff --git a/doc/release-notes/6.1-release-notes.md b/doc/release-notes/6.1-release-notes.md
new file mode 100644
index 00000000000..dbeda726aad
--- /dev/null
+++ b/doc/release-notes/6.1-release-notes.md
@@ -0,0 +1,323 @@
+# Dataverse 6.1
+
+Please note: To read these instructions in full, please go to https://github.com/IQSS/dataverse/releases/tag/v6.1 rather than the list of releases, which will cut them off.
+
+This release brings new features, enhancements, and bug fixes to the Dataverse software.
+Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release highlights
+
+### Guestbook at request
+
+Dataverse can now be configured (via the `dataverse.files.guestbook-at-request` option) to display any configured guestbook to users when they request restricted files (new functionality) or when they download files (previous behavior).
+
+The global default defined by this setting can be overridden at the collection level on the collection page and at the individual dataset level by a superuser using the API. The default, showing guestbooks when files are downloaded, remains as it was in prior Dataverse versions.
+
+For details, see [dataverse.files.guestbook-at-request](https://guides.dataverse.org/en/6.1/installation/config.html#dataverse-files-guestbook-at-request) and PR #9599.
+
+### Collection-level storage quotas
+
+This release adds support for defining storage size quotas for collections. Please see the API guide for details. This is an experimental feature that has not yet been used in production on any real life Dataverse instance, but we are planning to try it out at Harvard/IQSS.
+
+Please note that this release includes a database update (via a Flyway script) that will calculate the storage sizes of all the existing datasets and collections on the first deployment. On a large production database with tens of thousands of datasets this may add a couple of extra minutes to the first, initial deployment of Dataverse 6.1.
+
+For details, see [Storage Quotas for Collections](https://guides.dataverse.org/en/6.1/admin/collectionquotas.html) in the Admin Guide.
+
+### Globus support (experimental), continued
+
+Globus support in Dataverse has been expanded to include support for using file-based Globus endpoints, including the case where files are stored on tape and are not immediately accessible and for the case of referencing files stored on remote Globus endpoints. Support for using the Globus S3 Connector with an S3 store has been retained but requires changes to the Dataverse configuration. Please note:
+
+- Globus functionality remains experimental/advanced in that it requires significant setup, differs in multiple ways from other file storage mechanisms, and may continue to evolve with the potential for backward incompatibilities.
+- The functionality is configured per store and replaces the previous single-S3-Connector-per-Dataverse-instance model.
+- Adding files to a dataset, and accessing files is supported via the Dataverse user interface through a separate [dataverse-globus app](https://github.com/scholarsportal/dataverse-globus).
+- The functionality is also accessible via APIs (combining calls to the Dataverse and Globus APIs)
+
+Backward incompatibilities:
+- The configuration for use of a Globus S3 Connector has changed and is aligned with the standard store configuration mechanism
+- The new functionality is incompatible with older versions of the globus-dataverse app and the Globus-related functionality in the UI will only function correctly if a Dataverse 6.1 compatible version of the dataverse-globus app is configured.
+
+New JVM options:
+- A new "globus" store type and associated store-related options have been added. These are described in the [File Storage](https://guides.dataverse.org/en/6.1/installation/config.html#file-storage) section of the Installation Guide.
+- dataverse.files.globus-cache-maxage - specifies the number of minutes Dataverse will wait between an initial request for a file transfer occurs and when that transfer must begin.
+
+Obsolete Settings: the :GlobusBasicToken, :GlobusEndpoint, and :GlobusStores settings are no longer used
+
+Further details can be found in the [Big Data Support](https://guides.dataverse.org/en/6.1/developers/big-data-support.html#big-data-support) section of the Developer Guide.
+
+### Alternative Title now allows multiple values
+
+Alternative Title now allows multiples. Note that JSON used to create a dataset with an Alternate Title must be changed. See "Backward incompatibilities" below and PR #9440 for details.
+
+### External tools: configure tools now available at the dataset level
+
+Read/write "configure" tools (a type of external tool) are now available at the dataset level. They appear under the "Edit Dataset" menu. See [External Tools](https://guides.dataverse.org/en/6.1/admin/external-tools.html#dataset-level-configure-tools) in the Admin Guide and PR #9925.
+
+### S3 out-of-band upload
+
+In some situations, direct upload might not work from the UI, e.g., when s3 storage is not accessible from the internet. This pull request adds an option to [allow direct uploads via API only](https://github.com/IQSS/dataverse/pull/9003). This way, a third party application can use direct upload from within the internal network, while there is no direct download available to the users via UI.
+By default, Dataverse supports uploading files via the [add a file to a dataset](https://guides.dataverse.org/en/6.1/api/native-api.html#add-a-file-to-a-dataset) API. With S3 stores, a direct upload process can be enabled to allow sending the file directly to the S3 store (without any intermediate copies on the Dataverse server).
+With the upload-out-of-band option enabled, it is also possible for file upload to be managed manually or via third-party tools, with the [Adding the Uploaded file to the Dataset](https://guides.dataverse.org/en/6.1/developers/s3-direct-upload-api.html#adding-the-uploaded-file-to-the-dataset) API call (described in the [Direct DataFile Upload/Replace API](https://guides.dataverse.org/en/6.1/developers/s3-direct-upload-api.html) page) used to add metadata and inform Dataverse that a new file has been added to the relevant store.
+
+### JSON Schema for datasets
+
+Functionality has been added to help validate dataset JSON prior to dataset creation. There are two new API endpoints in this release. The first takes in a collection alias and returns a custom dataset schema based on the required fields of the collection. The second takes in a collection alias and a dataset JSON file and does an automated validation of the JSON file against the custom schema for the collection. In this release functionality is limited to JSON format validation and validating required elements. Future releases will address field types, controlled vocabulary, etc. See [Retrieve a Dataset JSON Schema for a Collection](https://guides.dataverse.org/en/6.1/api/native-api.html#retrieve-a-dataset-json-schema-for-a-collection) in the API Guide and PR #10109.
+
+### OpenID Connect (OIDC) improvements
+
+#### Using MicroProfile Config for provisioning
+
+With this release it is possible to provision a single OIDC-based authentication provider by using MicroProfile Config instead of or in addition to the classic Admin API provisioning.
+
+If you are using an external OIDC provider component as an identity management system and/or broker to other authentication providers such as Google, eduGain SAML and so on, this might make your life easier during instance setups and reconfiguration. You no longer need to generate the necessary JSON file.
+
+#### Adding PKCE Support
+
+Some OIDC providers require using PKCE as additional security layer. As of this version, you can enable support for this on any OIDC provider you configure. (Note that OAuth2 providers have not been upgraded.)
+
+For both features, see the [OIDC](https://guides.dataverse.org/en/6.0/installation/oidc.html) section of the Installation Guide and PR #9273.
+
+### Solr improvements
+
+As of this release, application-side support has been added for the "circuit breaker" mechanism in Solr that makes it drop requests more gracefully when the search engine is experiencing load issues.
+
+Please see the [Installing Solr](https://guides.dataverse.org/en/6.1/installation/prerequisites.html#installing-solr) section of the Installation Guide.
+
+### New release of Dataverse Previewers (including a Markdown previewer)
+
+Version 1.4 of the standard Dataverse Previewers from https://github/com/gdcc/dataverse-previewers is available. The new version supports the use of signedUrls rather than API keys when previewing restricted files (including files in draft dataset versions). Upgrading is highly recommended. Please note:
+
+- SignedUrls can now be used with PrivateUrl access tokens, which allows PrivateUrl users to view previewers that are configured to use SignedUrls. See #10093.
+- Launching a dataset-level configuration tool will automatically generate an API token when needed. This is consistent with how other types of tools work. See #10045.
+- There is now a [Markdown (.md)](https://guides.dataverse.org/en/6.1/user/dataset-management.html#file-previews) previewer.
+
+### New or improved APIs
+
+The development of a [new UI for Dataverse](https://github.com/IQSS/dataverse-frontend) is driving the addition or improvement of many APIs.
+
+#### New API endpoints
+
+- deaccessionDataset (/api/datasets/{id}/versions/{versionId}/deaccession): version deaccessioning through API (Given a dataset and a version).
+- /api/files/{id}/downloadCount
+- /api/files/{id}/dataTables 
+- /api/files/{id}/metadata/tabularTags New endpoint to set tabular file tags.
+- canManageFilePermissions (/access/datafile/{id}/userPermissions) Added for getting user permissions on a file.
+- getVersionFileCounts (/api/datasets/{id}/versions/{versionId}/files/counts): Given a dataset and its version, retrieves file counts based on different criteria (Total count, per content type, per access status and per category name).
+- setFileCategories (/api/files/{id}/metadata/categories): Updates the categories (by name) for an existing file. If the specified categories do not exist, they will be created.
+- userFileAccessRequested (/api/access/datafile/{id}/userFileAccessRequested): Returns true or false depending on whether or not the calling user has requested access to a particular file.
+- hasBeenDeleted (/api/files/{id}/hasBeenDeleted): Know if a particular file that existed in a previous version of the dataset no longer exists in the latest version.
+- getZipDownloadLimit (/api/info/zipDownloadLimit): Get the configured zip file download limit. The response contains the long value of the limit in bytes.
+- getMaxEmbargoDurationInMonths (/api/info/settings/:MaxEmbargoDurationInMonths): Get the maximum embargo duration in months, if available, configured through the database setting :MaxEmbargoDurationInMonths.
+- getDatasetJsonSchema (/api/dataverses/{id}/datasetSchema): Get a dataset schema with the fields required by a given dataverse collection.
+- validateDatasetJsonSchema (/api/dataverses/{id}/validateDatasetJson): Validate that a dataset JSON file is in proper format and contains the required elements and fields for a given dataverse collection.
+- downloadTmpFile (/api/admin/downloadTmpFile): For testing purposes, allows files to be downloaded from /tmp.
+
+#### Pagination of files in dataset versions
+
+- optional pagination has been added to `/api/datasets/{id}/versions` that may be useful in datasets with a large number of versions
+- a new flag `includeFiles` is added to both `/api/datasets/{id}/versions` and `/api/datasets/{id}/versions/{vid}` (true by default), providing an option to drop the file information from the output
+- when files are requested to be included, some database lookup optimizations have been added to improve the performance on datasets with large numbers of files.
+
+This is reflected in the [Dataset Versions API](https://guides.dataverse.org/en/6.1/api/native-api.html#dataset-versions-api) section of the Guide.
+
+
+#### DataFile API payload has been extended to include the following fields
+
+- tabularData: Boolean field to know if the DataFile is of tabular type
+- fileAccessRequest: Boolean field to know if the file access requests are enabled on the Dataset (DataFile owner)
+- friendlyType: String
+
+#### The getVersionFiles endpoint (/api/datasets/{id}/versions/{versionId}/files) has been extended to support pagination, ordering, and optional filtering
+
+- Access status: through the `accessStatus` query parameter, which supports the following values:
+    - Public
+    - Restricted
+    - EmbargoedThenRestricted
+    - EmbargoedThenPublic
+- Category name: through the `categoryName` query parameter. To return files to which the particular category has been added.
+- Content type: through the `contentType` query parameter. To return files matching the requested content type. For example: "image/png".
+
+#### Additional improvements to existing API endpoints
+
+- getVersionFiles (/api/datasets/{id}/versions/{versionId}/files): Extended to support optional filtering by search text through the `searchText` query parameter. The search will be applied to the labels and descriptions of the dataset files. Added `tabularTagName` to return files to which the particular tabular tag has been added. Added optional boolean query parameter "includeDeaccessioned", which, if enabled, causes the endpoint to consider deaccessioned versions when searching for versions to obtain files.
+- getVersionFileCounts (/api/datasets/{id}/versions/{versionId}/files/counts): Added optional boolean query parameter "includeDeaccessioned", which, if enabled, causes the endpoint to consider deaccessioned versions when searching for versions to obtain file counts. Added support for filtering by optional criteria query parameter:
+    - contentType
+    - accessStatus
+    - categoryName
+    - tabularTagName
+    - searchText
+- getDownloadSize ("api/datasets/{identifier}/versions/{versionId}/downloadsize"): Added optional boolean query parameter "includeDeaccessioned", which, if enabled, causes the endpoint to consider deaccessioned versions when searching for versions to obtain files. Added a new optional query parameter "mode" 
+This parameter applies a filter criteria to the operation and supports the following values:
+    - All (Default): Includes both archival and original sizes for tabular files
+    - Archival: Includes only the archival size for tabular files
+    - Original: Includes only the original size for tabular files.
+- /api/datasets/{id}/versions/{versionId} New query parameter `includeDeaccessioned` added to consider deaccessioned versions when searching for versions.
+- /api/datasets/{id}/userPermissions Get user permissions on a dataset, in particular, the user permissions that this API call checks, returned as booleans, are the following:
+    - Can view the unpublished dataset
+    - Can edit the dataset
+    - Can publish the dataset
+    - Can manage the dataset permissions
+    - Can delete the dataset draft
+- getDatasetVersionCitation (/api/datasets/{id}/versions/{versionId}/citation) endpoint now accepts a new boolean optional query parameter "includeDeaccessioned", which, if enabled, causes the endpoint to consider deaccessioned versions when searching for versions to obtain the citation.
+
+### Improvements for developers
+
+- Developers can enjoy a dramatically faster feedback loop when iterating on code if they are using Netbeans or IntelliJ IDEA Ultimate (with the Payara Platform Tools plugin). For details, see https://guides.dataverse.org/en/6.1/container/dev-usage.html#intellij-idea-ultimate-and-payara-platform-tools and [the thread](https://groups.google.com/g/dataverse-community/c/zNBDzSMF2Q0/m/Z-xS6fA2BgAJ) on the mailing list.
+- Developers can now test S3 locally by using the Dockerized development environment, which now includes both LocalStack and MinIO. API (end to end) tests are in S3AccessIT.
+- In addition, a new integration test class (not an API test, the new Testcontainers-based test launched with `mvn verify`) has been added at S3AccessIOLocalstackIT. It uses Testcontainers to spin up Localstack for S3 testing and does not require Dataverse to be running.
+- With this release, we add a new type of testing to Dataverse: integration tests which are not end-to-end tests (like our API tests). Starting with OIDC authentication support, we test regularly on CI for working condition of both OIDC login options in UI and API.
+- The testing and development Keycloak realm has been updated with more users and compatibility with Keycloak 21.
+- The support for setting JVM options during testing has been improved for developers. You now may add the `@JvmSetting` annotation to classes (also inner classes) and reference factory methods for values. This improvement is also paving the way to enable manipulating JVM options during end-to-end tests on remote ends.
+- As part of these testing improvements, the code coverage report file for unit tests has moved from `target/jacoco.exec` to `target/coverage-reports/jacoco-unit.exec`.
+
+## Major use cases and infrastructure enhancements
+
+Changes and fixes in this release not already mentioned above include:
+
+- Validation has been added for the Geographic Bounding Box values in the Geospatial metadata block. This will prevent improperly defined bounding boxes from being created via the edit page or metadata imports. This also fixes the issue where existing datasets with invalid geoboxes were quietly failing to get reindexed. See PR #10142.
+- Dataverse's OAI_ORE Metadata Export format and archival BagIT exports
+(which include the OAI-ORE metadata export file) have been updated to include
+information about the dataset version state, e.g. RELEASED or DEACCESSIONED
+and to indicate which version of Dataverse was used to create the archival Bag.
+As part of the latter, the current OAI_ORE Metadata format has been given a 1.0.0
+version designation and it is expected that any future changes to the OAI_ORE export
+format will result in a version change and that tools such as DVUploader that can
+recreate datasets from archival Bags will start indicating which version(s) of the
+OAI_ORE format they can read.
+Dataverse installations that have been using archival Bags may wish to update any
+existing archival Bags they have, e.g. by deleting existing Bags and using the Dataverse
+[archival Bag export API](https://guides.dataverse.org/en/6.1/installation/config.html#bagit-export-api-calls)
+to generate updated versions.
+- For BagIT export, it is now possible to configure the following information in bag-info.txt. (Previously, customization was possible by editing `Bundle.properties` but this is no longer supported.) For details, see https://guides.dataverse.org/en/6.1/installation/config.html#bag-info-txt
+  - Source-Organization from `dataverse.bagit.sourceorg.name`.
+  - Organization-Address from `dataverse.bagit.sourceorg.address`.
+  - Organization-Email from `dataverse.bagit.sourceorg.address`.
+- This release fixes several issues (#9952, #9953, #9957) where the Signposting output did not match the Signposting specification. These changes introduce backward-incompatibility, but since Signposting support was added recently (in Dataverse 5.14 in PR #8981), we feel it's best to do this clean up and not support the old implementation that was not fully compliant with the spec.
+  - To fix #9952, we surround the license info with `<` and `>`.
+  - To fix #9953, we no longer wrap the response in a `{"status":"OK","data":{` JSON object. This has also been noted in the guides at https://dataverse-guide--9955.org.readthedocs.build/en/9955/api/native-api.html#retrieve-signposting-information
+  - To fix #9957, we corrected the mime/content type, changing it from `json+ld` to `ld+json`. For backward compatibility, we are still supporting the old one, for now.
+- It's now possible to configure the docroot, which holds collection logos and more. See [dataverse.files.docroot](https://guides.dataverse.org/en/6.1/installation/config.html#dataverse-files-docroot) in the Installation Guide and PR #9819. 
+- We have started maintaining an API changelog of breaking changes: https://guides.dataverse.org/en/6.1/api/changelog.html
+See also #10060.
+
+## New configuration options
+
+- dataverse.auth.oidc.auth-server-url
+- dataverse.auth.oidc.client-id
+- dataverse.auth.oidc.client-secret
+- dataverse.auth.oidc.enabled
+- dataverse.auth.oidc.pkce.enabled
+- dataverse.auth.oidc.pkce.max-cache-age
+- dataverse.auth.oidc.pkce.max-cache-size
+- dataverse.auth.oidc.pkce.method
+- dataverse.auth.oidc.subtitle
+- dataverse.auth.oidc.title
+- dataverse.bagit.sourceorg.address
+- dataverse.bagit.sourceorg.address
+- dataverse.bagit.sourceorg.name
+- dataverse.files.docroot
+- dataverse.files.globus-cache-maxage
+- dataverse.files.guestbook-at-request
+- dataverse.files.{driverId}.upload-out-of-band
+
+## Backward incompatibilities
+
+- Since Alternative Title is now repeatable, the JSON you send to create or edit a dataset must be an array rather than a simple string. For example, instead of "value": "Alternative Title", you must send "value": ["Alternative Title1", "Alternative Title2"]
+- Several issues (#9952, #9953, #9957) where the Signposting output did not match the Signposting specification introduce backward-incompatibility. See above for details.
+- For BagIT export, if you were configuring values in bag-info.txt using `Bundle.properties`, you must switch to the new `dataverse.bagit` JVM options mentioned above. For details, see https://guides.dataverse.org/en/6.1/installation/config.html#bag-info-txt
+- See "Globus support" above for backward incompatibilies specific to Globus.
+
+## Complete list of changes
+
+For the complete list of code changes in this release, see the [6.1 Milestone](https://github.com/IQSS/dataverse/milestone/110?closed=1) in GitHub.
+
+## Getting help
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please follow our [Installation Guide](https://guides.dataverse.org/en/latest/installation/). Please don't be shy about [asking for help](https://guides.dataverse.org/en/latest/installation/intro.html#getting-help) if you need it!
+
+Once you are in production, we would be delighted to update our [map of Dataverse installations](https://dataverse.org/installations) around the world to include yours! Please [create an issue](https://github.com/IQSS/dataverse-installations/issues) or email us at support@dataverse.org to join the club!
+
+You are also very welcome to join the [Global Dataverse Community Consortium](https://www.gdcc.io/) (GDCC).
+
+## Upgrade instructions
+Upgrading requires a maintenance window and downtime. Please plan ahead, create backups of your database, etc.
+
+These instructions assume that you've already upgraded through all the 5.x releases and are now running Dataverse 6.0.
+
+0\. These instructions assume that you are upgrading from 6.0. If you are running an earlier version, the only safe way to upgrade is to progress through the upgrades to all the releases in between before attempting the upgrade to 6.1. 
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
+
+In the following commands we assume that Payara 6 is installed in `/usr/local/payara6`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara6`
+
+(or `setenv PAYARA /usr/local/payara6` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin undeploy dataverse-6.0`
+
+2\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+3\. Start Payara
+
+- `service payara start`
+
+4\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-6.1.war`
+
+As noted above, deployment of the war file might take several minutes due a database migration script required for the new storage quotas feature.
+
+5\. Restart Payara
+
+- `service payara stop`
+- `service payara start`
+
+6\. Update Geospatial Metadata Block (to improve validation of bounding box values)
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v6.1/geospatial.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file @geospatial.tsv`
+
+6a\. Update Citation Metadata Block (to make Alternative Title repeatable)
+
+- `wget https://github.com/IQSS/dataverse/releases/download/v6.1/citation.tsv`
+- `curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file scripts/api/data/metadatablocks/citation.tsv`
+
+7\. Upate Solr schema.xml to allow multiple Alternative Titles to be used. See specific instructions below for those installations without custom metadata blocks (7a) and those with  custom metadata blocks  (7b).
+
+7a\. For installations without custom or experimental metadata blocks:
+
+- Stop Solr instance (usually `service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/5.14/installation/prerequisites.html#solr-init-script))
+
+- Replace schema.xml
+
+  - `cp /tmp/dvinstall/schema.xml /usr/local/solr/solr-9.3.0/server/solr/collection1/conf`
+
+- Start Solr instance (usually `service solr start`, depending on Solr/OS)
+
+7b\. For installations with custom or experimental metadata blocks:
+
+- Stop Solr instance (usually `service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/5.14/installation/prerequisites.html#solr-init-script))
+
+- There are 2 ways to regenerate the schema: Either by collecting the output of the Dataverse schema API and feeding it to the `update-fields.sh` script that we supply, as in the example below (modify the command lines as needed):
+```
+	wget https://raw.githubusercontent.com/IQSS/dataverse/master/conf/solr/9.3.0/update-fields.sh
+	chmod +x update-fields.sh
+	curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-9.3.0/server/solr/collection1/conf/schema.xml
+```
+OR, alternatively, you can edit the following line in your schema.xml by hand as follows (to indicate that alternative title is now `multiValued="true"`):
+```
+     <field name="alternativeTitle" type="text_en" multiValued="true" stored="true" indexed="true"/>
+```
+     
+- Restart Solr instance (usually `service solr restart` depending on solr/OS)
+
+8\. Run ReExportAll to update dataset metadata exports. Follow the directions in the [Admin Guide](http://guides.dataverse.org/en/5.14/admin/metadataexport.html#batch-exports-through-the-api).
diff --git a/doc/release-notes/6.2-release-notes.md b/doc/release-notes/6.2-release-notes.md
new file mode 100644
index 00000000000..0f076d32cf8
--- /dev/null
+++ b/doc/release-notes/6.2-release-notes.md
@@ -0,0 +1,469 @@
+# Dataverse 6.2
+
+Please note: To read these instructions in full, please go to https://github.com/IQSS/dataverse/releases/tag/v6.2 rather than the list of releases, which will cut them off.
+
+This release brings new features, enhancements, and bug fixes to the Dataverse software.
+Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+# Table of Contents
+- [💡Release Highlights](#release-highlights)
+- [đŸĒ˛ Bug fixes](#-bug-fixes)
+- [💾 Persistence](#-persistence)
+- [🌐 API](#-api)
+- [⚠ī¸ Backward Incompatibilities](#%EF%B8%8F-backward-incompatibilities)
+- [📖 Guides](#-guides)
+- [⚙ī¸ New Settings](#%EF%B8%8F-new-settings)
+- [📋 Complete List of Changes](#-complete-list-of-changes)
+- [🛟 Getting Help](#-getting-help)
+- [đŸ’ģ Upgrade instructions](#-upgrade-instructions)
+
+## 💡Release Highlights
+
+### Search and Facet by License
+License have been added to the search facets in the search side panel to filter datasets by license (e.g. CC0).
+
+Datasets with Custom Terms are aggregated under the "Custom Terms" value of this facet. See the [Licensing](https://guides.dataverse.org/en/6.2/installation/advanced.html#licensing) section of the guide for more details on configured Licenses and Custom Terms.
+
+For more information, see [#9060](https://github.com/IQSS/dataverse/issues/9060).
+
+
+Licenses can also be used to filter the Search API results using the `fq` parameter, for example : `/api/search?q=*&fq=license%3A%22CC0+1.0%22` for CC0 1.0, see the [Search API guide](https://guides.dataverse.org/en/6.1/api/search.html) for more examples. 
+
+For more information, see [#10204](https://github.com/IQSS/dataverse/pull/10204).
+
+### When Returning Datasets to Authors, Reviewers Can Add a Note to the Author
+
+The Popup for returning to author now allows to type in a message to explain the reasons of return and potential edits needed, that will be sent by email to the author.
+
+Please note that this note is mandatory, but that you can still type a creative and meaningful comment such as "The author would like to modify his dataset", "Files are missing", "Nothing to report" or "A curation report with comments and suggestions/instructions will follow in another email" that suits your situation.
+
+For more information, see #10137.
+
+<a id="multiple-pid-sup"></a>
+### Support for Using Multiple PID Providers
+
+This release adds support for using multiple PID (DOI, Handle, PermaLink) providers, multiple PID provider accounts
+(managing a given protocol, authority, separator, shoulder combination), assigning PID provider accounts to specific collections,
+and supporting transferred PIDs (where a PID is managed by an account when its authority, separator, and/or shoulder don't match
+the combination where the account can mint new PIDs). It also adds the ability for additional provider services beyond the existing
+DataCite, EZId, Handle, and PermaLink providers to be dynamically added as separate jar files.
+
+These changes require per-provider settings rather than the global PID settings previously supported. While backward compatibility 
+for installations using a single PID Provider account is provided, updating to use the new microprofile settings is highly recommended
+and will be required in a future version.
+
+For more information check the PID settings on [this link](https://guides.dataverse.org/en/6.2/installation/config.html#global-settings).
+
+[New microprofile settings](#microprofile-settings)
+
+
+### Rate Limiting
+
+The option to rate limit has been added to prevent users from over taxing the system either deliberately or by runaway automated processes.
+Rate limiting can be configured on a tier level with tier 0 being reserved for guest users and tiers 1-any for authenticated users.
+Superuser accounts are exempt from rate limiting.
+
+Rate limits can be imposed on command APIs by configuring the tier, the command, and the hourly limit in the database.
+Two database settings configure the rate limiting **:RateLimitingDefaultCapacityTiers** and **RateLimitingCapacityByTierAndAction**, If either of these settings exist in the database rate limiting will be enabled and If neither setting exists rate limiting is disabled. 
+
+For more details check the detailed guide on [this link](https://guides.dataverse.org/en/6.2/installation/config.html#rate-limiting).
+
+### Simplified SMTP Configuration
+
+With this release, we deprecate the usage of `asadmin create-javamail-resource` to configure Dataverse to send mail using your SMTP server and provide a simplified, standard alternative using JVM options or MicroProfile Config.
+
+At this point, no action is required if you want to keep your current configuration.
+Warnings will show in your server logs to inform and remind you about the deprecation.
+A future major release of Dataverse may remove this way of configuration.
+
+Please do take the opportunity to update your SMTP configuration. Details can be found in section of the Installation Guide starting with the [SMTP/Email Configuration](https://guides.dataverse.org/en/6.2/installation/config.html#smtp-email-configuration) section of the Installation Guide.
+
+Once reconfiguration is complete, you should remove legacy, unused config. First, run `asadmin delete-javamail-resource mail/notifyMailSession` as described in the [6.1 guides](https://guides.dataverse.org/en/6.2/installation/installation-main.html#mail-host-configuration-authentication). Then run `curl -X DELETE http://localhost:8080/api/admin/settings/:SystemEmail` as this database setting has been replace with `dataverse.mail.system-email` as described below.
+
+Please note: as there have been problems with email delivered to SPAM folders when the "From" within mail envelope and the mail session configuration didn't match (#4210), as of this version the sole source for the "From" address is the setting `dataverse.mail.system-email` once you migrate to the new way of configuration. 
+
+[New SMTP settings](#smtp-settings):
+
+### Binder Redirect
+
+If your installation is configured to use Binder, you should remove the old "girder_ythub" tool and replace it with the tool described at https://github.com/IQSS/dataverse-binder-redirect
+
+For more information, see [#10360](https://github.com/IQSS/dataverse/issues/10360).
+
+### Optional Croissant đŸĨ Exporter Support
+
+When a Dataverse installation is configured to use a metadata exporter for the [Croissant](https://github.com/mlcommons/croissant) format, the content of the JSON-LD in the **&lt;head>** of dataset landing pages will be replaced with that format. However, both JSON-LD and Croissant will still be available for download from the dataset page and API.
+
+For more information, see #10382.
+
+### Harvesting Handle Missing Controlled Values
+
+Allows datasets to be harvested with Controlled Vocabulary Values that existed in the originating Dataverse installation but are not in the harvesting Dataverse installation. For more information, view the changes to the endpoint [here](#harvesting-client-endpoint-extended).
+
+### Add .QPJ and .QMD Extensions to Shapefile Handling
+
+Support for **.qpj** and **.qmd** files in shapefile uploads has been introduced, ensuring that these files are properly recognized and handled as part of geospatial datasets in Dataverse.
+
+For more information, see #10305.
+
+### Ingested Tabular Data Files Can Be Stored Without the Variable Name Header
+
+Tabular Data Ingest can now save the generated archival files with the list of variable names added as the first tab-delimited line.
+
+Access API will be able to take advantage of Direct Download for .tab files saved with these headers on S3 - since they no longer have to be generated and added to the streamed content on the fly.
+
+This behavior is controlled by the new setting **:StoreIngestedTabularFilesWithVarHeaders**. It is false by default, preserving the legacy behavior. When enabled, Dataverse will be able to handle both the newly ingested files, and any already-existing legacy files stored without these headers transparently to the user. E.g. the access API will continue delivering tab-delimited files **with** this header line, whether it needs to add it dynamically for the legacy files, or reading complete files directly from storage for the ones stored with it.
+
+We are planning to add an API for converting existing legacy tabular files in a future release.
+
+For more information, see #10282.
+
+### Uningest/Reingest Options Available in the File Page Edit Menu
+
+New Uningest/Reingest options are available in the File Page Edit menu. Ingest errors can be cleared by users who can published the associated dataset and by superusers, allowing for a successful ingest to be undone or retried (e.g. after a Dataverse version update or if ingest size limits are changed).
+
+The /api/files/<id>/uningest api also now allows users who can publish the dataset to undo an ingest failure.
+
+For more information, see #10319.
+
+### Sphinx Guides Now Support Markdown Format and Tabs
+
+Our guides now support the Markdown format with the extension **.md**. Additionally, an option to create tabs in the guides using [Sphinx Tabs](https://sphinx-tabs.readthedocs.io) has been added. (You can see the tabs in action in the "dev usage" page of the Container Guide.) To continue building the guides, you will need to install this new dependency by re-running:  
+```
+pip install -r requirements.txt
+```
+
+For more information, see #10111.
+
+### Number of Concurrent Indexing Operations Now Configurable
+
+A new MicroProfile setting called `dataverse.solr.concurrency.max-async-indexes` has been added that controls the maximum number of simultaneously running asynchronous dataset index operations (defaults to 4).
+
+For more information, see #10388.
+
+[âŦ†ī¸](#table-of-contents)
+
+## đŸĒ˛ Bug fixes
+
+### Publication Status Facet Restored
+
+In version 6.1, the publication status facet location was unintentionally moved to the bottom. In this version, we have restored the original order.
+
+### Assign a Role With Higher Permissions Than Its Own Role Has Been Fixed
+
+The permissions required to assign a role have been fixed. It is no longer possible to assign a role that includes permissions that the assigning user doesn't have.
+
+### Geospatial Metadata Block Fields for North and South Renamed
+
+The Geospatial metadata block fields for north and south were labeled incorrectly as longitudes, as reported in #5645. After updating to this version of Dataverse, users will need to update any API client code used "northLongitude" and "southLongitude" to "northLatitude" and "southLatitude", respectively, as [mentioned](https://groups.google.com/g/dataverse-community/c/5qpOIZUSL6A/m/nlYGEXkYAAAJ) on the mailing list.
+Also, we have updated the tooltips in the Geospatial metadata block, where the use of commas instead of dots in coordinate values was incorrectly suggested. 
+
+### OAI-PMH Error Handling Has Been Improved
+
+OAI-PMH error handling has been improved to display a machine-readable error in XML rather than a 500 error with no further information.
+
+- /oai?foo=bar will show "No argument 'verb' found"
+- /oai?verb=foo&verb=bar will show "Verb must be singular, given: '[foo, bar]'"
+
+### Granting File Access Without Access Request
+
+A bug introduced with the guestbook-at-request, requests are not deleted when granted, they are now given the state granted.
+
+### Harvesting redirects fixed
+
+Redirects from search cards back to the original source for datasets harvested from "Generic OAI Archives", i.e. non-Dataverse OAI servers, have been fixed.
+
+[âŦ†ī¸](#table-of-contents)
+
+## 💾 Persistence
+
+### Missing Database Constraints
+
+This release adds two missing database constraints that will assure that the externalvocabularyvalue table only has one entry for each uri and that the oaiset table only has one set for each spec. (In the very unlikely case that your existing database has duplicate entries now, install would fail. This can be checked by running the following commands:
+
+```
+SELECT uri, count(*) FROM externalvocabularyvalue group by uri;
+```
+And:
+```
+SELECT spec, count(*) FROM oaiset group by spec;
+```
+Then removing any duplicate rows (where count>1).
+
+
+### Universe Field in Variablemetadata Table Changed
+
+Universe field in variablemetadata table was changed from **varchar(255)** to **text**. The change was made to support longer strings in "universe" metadata field, similar to the rest of text fields in variablemetadata table.
+
+### PostgreSQL Versions
+
+This release adds install script support for the new permissions model in PostgreSQL versions 15+, and bumps Flyway to support PostgreSQL 16.
+
+PostgreSQL 13 remains the version used with automated testing.
+
+[âŦ†ī¸](#table-of-contents)
+
+## 🌐 API 
+
+### Listing Collection/Dataverse API
+
+Listing collection/dataverse role assignments via API still requires ManageDataversePermissions, but listing dataset role assignments via API now requires only ManageDatasetPermissions.
+
+### New API Endpoint for Clearing an Individual Dataset From Solr
+
+A new Index API endpoint has been added allowing an admin to clear an individual dataset from Solr.
+
+For more information visit the documentation on [this link](https://guides.dataverse.org/en/6.2/admin/solr-search-index.html#clearing-a-dataset-from-solr)
+
+### New Accounts Metrics API
+
+Users can retrieve new types of metrics related to user accounts. The new capabilities are [described](https://guides.dataverse.org/en/6.2/api/metrics.html) in the guides.
+
+### New canDownloadAtLeastOneFile Endpoint
+
+The `/api/datasets/{id}/versions/{versionId}/canDownloadAtLeastOneFile` endpoint has been created.
+
+This API endpoint indicates if the calling user can download at least one file from a dataset version. Note that Shibboleth group permissions are not considered.
+
+### Harvesting Client Endpoint Extended
+
+The API endpoint `api/harvest/clients/{harvestingClientNickname}` has been extended to include the following fields:
+
+- **allowHarvestingMissingCVV**: enable/disable allowing datasets to be harvested with controlled vocabulary values that exist in the originating Dataverse server but are not present in the harvesting Dataverse server. The default is false.
+
+*Note: This setting is only available to the API and not currently accessible/settable via the UI.*
+
+### Version Files Endpoint Extended
+
+The response for getVersionFiles `/api/datasets/{id}/versions/{versionId}/files` endpoint has been modified to include a total count of records available **totalCount:x**.
+This will aid in pagination by allowing the caller to know how many pages can be iterated through. The existing API (getVersionFileCounts) to return the count will still be available.
+
+### Metadata Blocks Endpoint Extended
+
+The API endpoint `/api/metadatablocks/{block_id}` has been extended to include the following fields:
+
+- **isRequired**: Whether or not this field is required
+- **displayOrder**: The display order of the field in create/edit forms
+- **typeClass**: The type class of this field ("controlledVocabulary", "compound", or "primitive")
+
+### Get File Citation as JSON
+
+It is now possible to retrieve via API the file citation as it appears on the file landing page. It is formatted in HTML and encoded in JSON.
+
+This API is not for downloading various citation formats such as EndNote XML, RIS, or BibTeX. 
+
+For more information check the documentation on [this link](https://guides.dataverse.org/en/6.2/api/native-api.html#get-file-citation-as-json)
+
+### Files Endpoint Extended
+
+The API endpoint `api/files/{id}` has been extended to support the following optional query parameters:
+
+- **includeDeaccessioned**: Indicates whether or not to consider deaccessioned dataset versions in the latest file search. (Default: `false`).
+- **returnDatasetVersion**: Indicates whether or not to include the dataset version of the file in the response. (Default: `false`).
+
+A new endpoint `api/files/{id}/versions/{datasetVersionId}` has been created. This endpoint returns the file metadata present in the requested dataset version. To specify the dataset version, you can use `:latest-published`, `:latest`, `:draft` or `1.0` or any other available version identifier.
+
+The endpoint supports the *includeDeaccessioned* and *returnDatasetVersion* optional query parameters, as does the `api/files/{id}` endpoint.
+
+`api/files/{id}/draft` endpoint is no longer available in favor of the new endpoint `api/files/{id}/versions/{datasetVersionId}`, which can use the version identifier ``:draft`` (`api/files/{id}/versions/:draft`) to obtain the same result.
+
+### Datasets, Dataverse Collections, and Datafiles Endpoints Extended
+
+The API endpoints for getting datasets, Dataverse collections, and datafiles have been extended to support the following optional 'returnOwners' query parameter.
+
+Including the parameter and setting it to true will add a hierarchy showing which dataset and dataverse collection(s) the object is part of to the json object returned.
+
+For more information visit the full native API guide on [this link](https://guides.dataverse.org/en/6.2/api/native-api.html)
+
+### Endpoint Fixed: Datasets Metadata
+
+The API endpoint `api/datasets/{id}/metadata` has been changed to default to the latest version of the dataset to which the user has access.
+
+### Experimental Make Data Count processingState API
+
+An experimental Make Data Count processingState API has been added. For now it has been documented in the (developer guide)[https://guides.dataverse.org/en/6.2/developers/make-data-count.html#processing-archived-logs].
+
+[âŦ†ī¸](#table-of-contents)
+
+## ⚠ī¸ Backward Incompatibilities
+
+To view a list of changes that can be impactful to your implementation please visit our detailed [list of changes to the API](https://guides.dataverse.org/en/6.2/develop/api/changelog.html).
+
+[âŦ†ī¸](#table-of-contents)
+
+## 📖 Guides
+
+### Container Guide, Documentation for Faster Redeploy
+
+In the Container Guide, documentation for developers on how to quickly redeploy code has been added for Netbeans and improved for IntelliJ.
+
+Also in the context of containers, a new option to skip deployment has been added and the war file is now consistently named "dataverse.war" rather than having a version in the filename, such as "dataverse-6.1.war". This predictability makes tooling easier.
+
+### Evaluation Version Tutorial on the Containers Guide
+
+The Container Guide now containers a tutorial for running Dataverse in containers for demo or evaluation purposes: https://guides.dataverse.org/en/6.2/container/running/demo.html
+
+### New QA Guide
+
+A new QA Guide is intended mostly for the core development team but may be of interest to contributors on: https://guides.dataverse.org/en/6.2/develop/qa
+
+[âŦ†ī¸](#table-of-contents)
+
+## ⚙ī¸ New Settings 
+
+### MicroProfile Settings
+
+*The * indicates a provider id indicating which provider the setting is for*
+
+- dataverse.pid.providers
+- dataverse.pid.default-provider
+- dataverse.pid.*.type
+- dataverse.pid.*.label
+- dataverse.pid.*.authority
+- dataverse.pid.*.shoulder
+- dataverse.pid.*.identifier-generation-style
+- dataverse.pid.*.datafile-pid-format
+- dataverse.pid.*.managed-list
+- dataverse.pid.*.excluded-list
+- dataverse.pid.*.datacite.mds-api-url
+- dataverse.pid.*.datacite.rest-api-url
+- dataverse.pid.*.datacite.username
+- dataverse.pid.*.datacite.password
+- dataverse.pid.*.ezid.api-url
+- dataverse.pid.*.ezid.username
+- dataverse.pid.*.ezid.password
+- dataverse.pid.*.permalink.base-url
+- dataverse.pid.*.permalink.separator
+- dataverse.pid.*.handlenet.index
+- dataverse.pid.*.handlenet.independent-service
+- dataverse.pid.*.handlenet.auth-handle
+- dataverse.pid.*.handlenet.key.path
+- dataverse.pid.*.handlenet.key.passphrase
+- dataverse.spi.pidproviders.directory
+- dataverse.solr.concurrency.max-async-indexes
+
+### SMTP Settings: 
+
+- dataverse.mail.system-email
+- dataverse.mail.mta.host
+- dataverse.mail.mta.port
+- dataverse.mail.mta.ssl.enable
+- dataverse.mail.mta.auth
+- dataverse.mail.mta.user
+- dataverse.mail.mta.password
+- dataverse.mail.mta.allow-utf8-addresses
+- Plus many more for advanced usage and special provider requirements. See [configuration guide for a full list](https://guides.dataverse.org/en/6.2/installation/config.html#dataverse-mail-mta).
+
+### Database Settings:
+
+- :RateLimitingDefaultCapacityTiers
+- :RateLimitingCapacityByTierAndAction
+- :StoreIngestedTabularFilesWithVarHeaders
+
+## 📋 Complete List of Changes
+
+For the complete list of code changes in this release, see the [6.2 Milestone](https://github.com/IQSS/dataverse/issues?q=milestone%3A6.2+is%3Aclosed) in GitHub.
+
+[âŦ†ī¸](#table-of-contents)
+
+## 🛟 Getting Help
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/forum/#!forum/dataverse-community) or email support@dataverse.org.
+
+[âŦ†ī¸](#table-of-contents)
+
+## đŸ’ģ Upgrade Instructions
+Upgrading requires a maintenance window and downtime. Please plan ahead, create backups of your database, etc.
+
+These instructions assume that you've already upgraded through all the 5.x releases and are now running Dataverse 6.1.
+
+0\. These instructions assume that you are upgrading from the immediate previous version. If you are running an earlier version, the only safe way to upgrade is to progress through the upgrades to all the releases in between before attempting the upgrade to this version.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
+
+In the following commands we assume that Payara 6 is installed in `/usr/local/payara6`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara6`
+
+(or `setenv PAYARA /usr/local/payara6` if you are using a `csh`-like shell)
+
+1\. Usually, when a Solr schema update is released, we recommend deploying the new version of Dataverse, then updating the `schema.xml` on the solr side. With 6.2, we recommend to install the base schema first. Without it Dataverse 6.2 is not going to be able to show any results after the initial deployment. If your instance is using any custom metadata blocks, you will need to further modify the schema, see the last step of this instruction (step 8).
+
+- Stop Solr instance (usually `service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/6.2/installation/prerequisites.html#solr-init-script))
+
+- Replace schema.xml
+
+  - `wget https://raw.githubusercontent.com/IQSS/dataverse/master/conf/solr/9.3.0/schema.xml`
+  - `cp schema.xml /usr/local/solr/solr-9.3.0/server/solr/collection1/conf`
+
+- Start Solr instance (usually `service solr start`, depending on Solr/OS)
+
+2\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin undeploy dataverse-6.1`
+
+3\. Stop Payara and remove the generated directory
+
+- `service payara stop`
+- `rm -rf $PAYARA/glassfish/domains/domain1/generated`
+
+4\. Start Payara
+
+- `service payara start`
+
+5\. Deploy this version.
+
+- `$PAYARA/bin/asadmin deploy dataverse-6.2.war`
+
+As noted above, deployment of the war file might take several minutes due a database migration script required for the new storage quotas feature.
+
+6\. For installations with internationalization:
+
+- Please remember to update translations via [Dataverse language packs](https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs).
+
+7\. Restart Payara
+
+- `service payara stop`
+- `service payara start`
+
+8\. Update the following Metadata Blocks to reflect the incremental improvements made to the handling of core metadata fields: 
+
+ ```
+ wget https://github.com/IQSS/dataverse/releases/download/v6.2/geospatial.tsv
+
+ curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file scripts/api/data/metadatablocks/geospatial.tsv
+
+wget https://github.com/IQSS/dataverse/releases/download/v6.2/citation.tsv
+
+curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file scripts/api/data/metadatablocks/citation.tsv
+
+wget https://github.com/IQSS/dataverse/releases/download/v6.2/astrophysics.tsv
+
+curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file scripts/api/data/metadatablocks/astrophysics.tsv
+
+wget https://github.com/IQSS/dataverse/releases/download/v6.2/biomedical.tsv
+
+curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file scripts/api/data/metadatablocks/biomedical.tsv
+```
+
+9\. For installations with custom or experimental metadata blocks:
+
+- Stop Solr instance (usually `service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/6.2/installation/prerequisites.html#solr-init-script))
+
+- Run the `update-fields.sh` script that we supply, as in the example below (modify the command lines as needed to reflect the correct path of your solr installation):
+```
+	wget https://raw.githubusercontent.com/IQSS/dataverse/master/conf/solr/9.3.0/update-fields.sh
+	chmod +x update-fields.sh
+	curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-9.3.0/server/solr/collection1/conf/schema.xml
+```
+     
+- Restart Solr instance (usually `service solr restart` depending on solr/OS)
+
+10\. Reindex Solr:
+
+   For details, see https://guides.dataverse.org/en/6.2/admin/solr-search-index.html but here is the reindex command:
+
+```
+   curl http://localhost:8080/api/admin/index
+```
+[âŦ†ī¸](#table-of-contents)
diff --git a/doc/release-notes/6.3-release-notes.md b/doc/release-notes/6.3-release-notes.md
new file mode 100644
index 00000000000..6cad513690d
--- /dev/null
+++ b/doc/release-notes/6.3-release-notes.md
@@ -0,0 +1,470 @@
+# Dataverse 6.3
+
+Please note: To read these instructions in full, please go to https://github.com/IQSS/dataverse/releases/tag/v6.3 rather than the list of releases, which will cut them off.
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+# Table of Contents
+- [Release Highlights](#release-highlights)
+- [Features](#features)
+- [Bug Fixes](#bug-fixes)
+- [API](#api)
+- [Settings](#settings)
+- [Complete List of Changes](#complete-list-of-changes)
+- [Getting Help](#getting-help)
+- [Upgrade instructions](#upgrade-instructions)
+
+## Release Highlights
+
+### Solr Search and Indexing Improvements
+
+Multiple improvements have been made to the way Solr indexing and searching is done. Response times should be significantly improved.
+
+- Two experimental features flag called "add-publicobject-solr-field" and "avoid-expensive-solr-join" have been added to change how Solr documents are indexed for public objects and how Solr queries are constructed to accommodate access to restricted content (drafts, etc.). It is hoped that it will help with performance, especially on large instances and under load.
+
+- Before the search feature flag ("avoid-expensive...") can be turned on, the indexing flag must be enabled, and a full reindex performed. Otherwise publicly available objects are NOT going to be shown in search results.
+
+- A feature flag called "reduce-solr-deletes" has been added to improve how datafiles are indexed. When the flag is enabled, Dataverse will avoid pre-emptively deleting existing Solr documents for the files prior to sending updated information. This
+should improve performance and will allow additional optimizations going forward.
+
+- The /api/admin/index/status and /api/admin/index/clear-orphans calls
+(see https://guides.dataverse.org/en/latest/admin/solr-search-index.html#index-and-database-consistency)
+will now find and remove (respectively) additional permissions related Solr documents that were not being detected before.
+Reducing the overall number of documents will improve Solr performance and large sites may wish to periodically call the "clear-orphans" API.
+
+- Dataverse now relies on the autoCommit and autoSoftCommit settings in the Solr configuration instead of explicitly committing documents to the Solr index. This improves indexing speed.
+
+See also #10554, #10654, and #10579.
+
+### File Retention Period
+
+Dataverse now supports file-level retention periods. The ability to set retention periods, with a minimum duration (in months), can be configured by a Dataverse installation administrator. For more information, see the [Retention Periods section](https://guides.dataverse.org/en/6.3/user/dataset-management.html#retention-periods) of the User Guide.
+
+- Users can configure a specific retention period, defined by an end date and a short reason, on a set of selected files or an individual file, by selecting the "Retention Period" menu item and entering information in a popup dialog. Retention periods can only be set, changed, or removed before a file has been published. After publication, only Dataverse installation administrators can make changes, using an API.
+
+- After the retention period expires, files can not be previewed or downloaded (as if restricted, with no option to allow access requests). The file (landing) page and all the metadata remains available.
+
+## Features
+
+### Large Datasets Improvements
+
+For scenarios involving API calls related to large datasets (numerous files, for example: ~10k) the following have been been optimized:
+
+- The Search API endpoint.
+- The permission checking logic present in PermissionServiceBean.
+
+See also [#10415](https://github.com/IQSS/dataverse/pull/10415).
+
+### Improved Controlled Vocabulary for Citation Block
+
+The Controlled Vocabuary Values list for the "Language" metadata field in the citation block has been improved, with some missing two- and three-letter ISO 639 codes added, as well as more alternative names for some of the languages, making all these extra language identifiers importable. See also [#8243](https://github.com/IQSS/dataverse/pull/8243).
+
+### Updates on Support for External Vocabulary Services
+
+Multiple extensions of the external vocabulary mechanism have been added. These extensions allow interaction with services based on the Ontoportal software and are expected to be generally useful for other service types.
+
+These changes include:
+
+- *Improved Indexing with Compound Fields:* When using an external vocabulary service with compound fields, you can now specify which field(s) will include additional indexed information, such as translations of an entry into other languages. This is done by adding the `indexIn` in `retrieval-filtering`. See also [#10505](https://github.com/IQSS/dataverse/pull/10505) and [GDCC/dataverse-external-vocab-support documentation](https://github.com/gdcc/dataverse-external-vocab-support/tree/main/docs).
+
+- *Broader Support for Indexing Service Responses:* Indexing of the results from `retrieval-filtering` responses can now handle additional formats including JSON arrays of strings and values from arbitrary keys within a JSON Object. See [#10505](https://github.com/IQSS/dataverse/pull/10505).
+
+- *HTTP Headers:* You are now able to add HTTP request headers required by the service you are implementing. See [#10331](https://github.com/IQSS/dataverse/pull/10331).
+
+- *Flexible params in retrievalUri:* You can now use `managed-fields` field names as well as the `term-uri-field` field name as parameters in the `retrieval-uri` when configuring an external vocabulary service. `{0}` as an alternative to using the `term-uri-field` name is still supported for backward compatibility. Also you can specify if the value must be url encoded with `encodeUrl:`. See [#10404](https://github.com/IQSS/dataverse/pull/10404).
+
+  For example : `"retrieval-uri": "https://data.agroportal.lirmm.fr/ontologies/{keywordVocabulary}/classes/{encodeUrl:keywordermURL}"`
+
+- *Hidden HTML Fields* External controlled vocabulary scripts, configured via [:CVocConf](https://guides.dataverse.org/en/6.3/installation/config.html#cvocconf), can now access the values of managed fields as well as the term-uri-field for use in constructing the metadata view for a dataset. These values are now added as hidden elements in the HTML and can be found with the HTML attribute `data-cvoc-metadata-name`. See also [#10503](https://github.com/IQSS/dataverse/pull/10503).
+
+### A Contributor Guide is now available
+
+A new [Contributor Guide](https://guides.dataverse.org/en/6.3/contributor/index.html) has been added by the UX Working Group (#10531 and #10532).
+
+### URL Validation Is More Permissive
+
+URL validation now allows two slashes in the path component of the URL.
+Among other things, this allows metadata fields of `url` type to be filled with more complex url such as https://archive.softwareheritage.org/browse/directory/561bfe6698ca9e58b552b4eb4e56132cac41c6f9/?origin_url=https://github.com/gem-pasteur/macsyfinder&revision=868637fce184865d8e0436338af66a2648e8f6e1&snapshot=1bde3cb370766b10132c4e004c7cb377979928d1
+
+See also #9750 and [#9739](https://github.com/IQSS/dataverse/pull/9739)
+
+### Improved Detection of RO-Crate Files
+
+Detection of mime-types based on a filename with extension and detection of the RO-Crate metadata files.
+
+From now on, filenames with extensions can be added into `MimeTypeDetectionByFileName.properties` file. Filenames added there will take precedence over simply recognizing files by extensions. For example, two new filenames are added into that file:
+```
+ro-crate-metadata.json=application/ld+json; profile="http://www.w3.org/ns/json-ld#flattened http://www.w3.org/ns/json-ld#compacted https://w3id.org/ro/crate"
+ro-crate-metadata.jsonld=application/ld+json; profile="http://www.w3.org/ns/json-ld#flattened http://www.w3.org/ns/json-ld#compacted https://w3id.org/ro/crate"
+```
+
+Therefore, files named `ro-crate-metadata.json` will be then detected as RO-Crated metadata files from now on, instead as generic `JSON` files.
+For more information on the RO-Crate specifications, see https://www.researchobject.org/ro-crate
+
+See also [#10015](https://github.com/IQSS/dataverse/pull/10015).
+
+### New S3 Tagging Configuration Option
+
+If your S3 store does not support tagging and gives an error if you configure direct upload, you can disable the tagging by using the `dataverse.files.<id>.disable-tagging` JVM option. For more details, see the section on [S3 tags](https://guides.dataverse.org/en/6.3/developers/big-data-support.html#s3-tags) in the guides, #10022 and #10029.
+
+### Feature Flag To Remove the Required "Reason" Field in the "Return to Author" Dialog
+
+A reason field, that is required to not be empty, was added to the "Return to Author" dialog in v6.2. Installations that handle author communications through email or another system may prefer to not be required to use this new field. v6.3 includes a new
+disable-return-to-author-reason feature flag that can be enabled to drop the reason field from the dialog and make sending a reason optional in the api/datasets/{id}/returnToAuthor call. See also #10655.
+
+### Improved Use of Dataverse Thumbnail
+
+Dataverse will use the dataset thumbnail, if one is defined, rather than the generic Dataverse logo in the Open Graph metadata header. This means the image will be seen when, for example, the dataset is referenced on Facebook. See also [#5621](https://github.com/IQSS/dataverse/pull/5621).
+
+### Improved Email Notifications When Guestbook is Used for File Access Requests
+
+Multiple improvements to guestbook response emails making it easier to organize and process them. The subject line of the notification email now includes the name and user identifier of the requestor. Additionally, the body of the email now includes the user id of the requestor. Finally the guestbook responses have been sorted and spaced to improve readability. See also [#10581](https://github.com/IQSS/dataverse/issues/10581).
+
+### New keywordTermURI Metadata Field in the Citation Metadata Block
+
+A new metadata field - `keywordTermURI`, has been added in the citation metadata block (as a fourth child field under the `keyword` parent field). This has been done to improve usability and to facilitate the integration of controlled vocabulary services, adding the possibility of saving the "term" and/or its associated URI. For more information, see #10288 and PR #10371.
+
+### Updated Computational Workflow Metadata Block
+
+The computational workflow metadata block has been updated to present a clickable link for the External Code Repository URL field. See also [#10339](https://github.com/IQSS/dataverse/pull/10339).
+
+### Metadata Source Facet Added
+
+An option has been added to index the name of the harvesting client as the "Metadata Source" of harvested datasets and files; if enabled, the Metadata Source facet will show  separate entries for the content harvested from different sources, instead of the current, default behavior where there is one "Harvested" facet for all such content.
+
+Tho enable this feature, set the optional feature flage (jvm option) `dataverse.feature.index-harvested-metadata-source=true` before reindexing.
+
+See also [#10611](https://github.com/IQSS/dataverse/pull/10611) and #10651.
+
+### Additional Facet Settings
+
+Extra settings have been added giving an instance admin more choices in selectively limiting the availability of search facets on the collection and dataset pages.
+
+See [Disable Solr Facets](https://guides.dataverse.org/en/6.3/installation/config.html#DisableSolrFacets) under the configuration section of the Installation Guide for more info as well as [#10570](https://github.com/IQSS/dataverse/pull/10570).
+
+### Sitemap Now Supports More Than 50k Items
+
+Dataverse can now handle more than 50,000 items when generating sitemap files, splitting the content across multiple files to comply with the Sitemap protocol. For details, see the [sitemap section](https://guides.dataverse.org/en/6.3/installation/config.html#creating-a-sitemap-and-submitting-it-to-search-engines) of the Installation Guide. See also [#8936](https://github.com/IQSS/dataverse/pull/8936) and [#10321](https://github.com/IQSS/dataverse/pull/10321).
+
+### MIT and Apache 2.0 Licenses Added
+
+New files have been added to import the MIT and Apache 2.0 Licenses to Dataverse:
+
+- licenseMIT.json
+- licenseApache-2.0.json
+
+Guidance has been added to the [guides](https://guides.dataverse.org/en/6.2/installation/config.html#adding-custom-licenses) to explain the procedure for adding new licenses to Dataverse.
+
+See also [#10425](https://github.com/IQSS/dataverse/pull/10425).
+
+### 3D Viewer by Open Forest Data
+
+3DViewer by openforestdata.pl has been added to the [list of external tools](https://guides.dataverse.org/en/6.3/admin/external-tools.html#inventory-of-external-tools). See also [#10561](https://github.com/IQSS/dataverse/pull/10561).
+
+### Datalad Integration With Dataverse
+
+DataLad has been integrated with Dataverse. For more information, see the [integrations](https://guides.dataverse.org/en/6.3/admin/integrations.html#datalad) section of the guides. See also [#10468](https://github.com/IQSS/dataverse/pull/10468).
+
+### Rsync Support Has Been Deprecated
+
+Support for rsync has been deprecated. Information has been removed from the guides for rsync and related software such as Data Capture Module (DCM) and Repository Storage Abstraction Layer (RSAL). You can still find this information in [older versions](https://guides.dataverse.org/en/6.2/developers/big-data-support.html#data-capture-module-dcm) of the guides. See [Settings](#database-settings), below, for deprecated settings. See also [#8985](https://github.com/IQSS/dataverse/pull/8985).
+
+[↑ Table of Contents](#table-of-contents)
+
+## Bug Fixes
+
+### OpenAPI Re-Enabled
+
+In Dataverse 6.0 when Payara was updated it caused the url `/openapi` to stop working:
+
+- https://github.com/IQSS/dataverse/issues/9981
+- https://github.com/payara/Payara/issues/6369
+
+In addition to fixing the `/openapi` URL, we are also making some changes on how we provide the OpenAPI document:
+
+When it worked in Dataverse 5.x, the `/openapi` output was generated automatically by Payara, but in this release we have switched to OpenAPI output produced by the [SmallRye OpenAPI plugin](https://github.com/smallrye/smallrye-open-api/tree/main/tools/maven-plugin). This gives us finer control over the output.
+
+For more information, see the section on  [OpenAPI](https://guides.dataverse.org/en/6.3/getting-started.html#openapi) in the API Guide and #10328.
+
+### Re-Addition of "Cell Counting" to Life Sciences Block
+
+In the Life Sciences metadata block under the "Measurement Type" field the value `cell counting` was accidentally removed in v5.1. It has been restored. See also #8655 and #9735.
+
+### Math Challenge Fixed on 403 Error Page
+
+On the "forbidden" (403) error page, the math challenge now correctly displays so that the contact form can be submitted. See also [#10466](https://github.com/IQSS/dataverse/pull/10466).
+
+### Ingest Option Bug Fixed
+
+A bug that prevented the "Ingest" option in the file page "Edit File" menu from working has been fixed. See also [#10568](https://github.com/IQSS/dataverse/pull/10568).
+
+### Incomplete Metadata Bug Fix
+
+A bug was fixed where the `incomplete metadata` label was being shown for published dataset with incomplete metadata in certain scenarios. This label will now be shown for draft versions of such datasets and published datasets that the user can edit. This label can also be made invisible for published datasets (regardless of edit rights) with the new option ``dataverse.ui.show-validity-label-when-published`` set to `false`. See also [#10116](https://github.com/IQSS/dataverse/pull/10116).
+
+### Identical Role Error Message
+
+An error is now correctly reported when an attempt is made to assign an identical role to the same collection, dataset, or file. See also [#9729](https://github.com/IQSS/dataverse/pull/9729) and #10465.
+
+[↑ Table of Contents](#table-of-contents)
+
+## API
+
+### Superuser Endpoint
+
+The existing API endpoint for toggling the superuser status of a user has been deprecated in favor of a new API endpoint that allows you to explicitly and idempotently set the status as true or false. For details, see the [API Guide](https://guides.dataverse.org/en/6.3/api/native-api.html#set-superuser-status), [#9887](https://github.com/IQSS/dataverse/pull/9887) and [#10440](https://github.com/IQSS/dataverse/pull/10440).
+
+### New Featured Collections Endpoints
+
+New API endpoints have been added to allow you to add or remove featured collections from a collection.
+
+See also the sections on [listing, setting, and removing](https://guides.dataverse.org/en/6.3/api/native-api.html#list-featured-collections-for-a-dataverse-collection) featured collections in the API Guide, [#10242](https://github.com/IQSS/dataverse/pull/10242) and #10459.
+
+### Dataset Version Endpoint Extended
+
+The API endpoint for getting the Dataset version has been extended to include latestVersionPublishingStatus. See also [#10330](https://github.com/IQSS/dataverse/pull/10330).
+
+### New Optional Query Parameters for Metadatablocks Endpoints
+
+New optional query parameters have been added to `api/metadatablocks` and `api/dataverses/{id}/metadatablocks` endpoints:
+
+- `returnDatasetFieldTypes`: Whether or not to return the dataset field types present in each metadata block. If not set, the default value is false.
+- Setting the query parameter `onlyDisplayedOnCreate=true` also returns metadata blocks with dataset field type input levels configured as required on the General Information page of the collection, in addition to the metadata blocks and their fields with the property ``displayOnCreate=true``.
+
+See also [#10389](https://github.com/IQSS/dataverse/pull/10389)
+
+### Dataverse Payload Includes Release Status
+
+The Dataverse object returned by /api/dataverses has been extended to include "isReleased": {boolean}. See also [#10491](https://github.com/IQSS/dataverse/pull/10491).
+
+### New Field Type Input Level Endpoint
+
+A new endpoint ``api/dataverses/{id}/inputLevels`` has been created for updating the dataset field type input levels of a collection via API. See also [#10477](https://github.com/IQSS/dataverse/pull/10477).
+
+### Banner Message Endpoint Extended
+
+The endpoint `api/admin/bannerMessage` has been extended so the ID is returned when created. See also [#10565](https://github.com/IQSS/dataverse/pull/10565).
+
+[↑ Table of Contents](#table-of-contents)
+
+## Settings
+
+### Database Settings:
+
+***New:***
+
+- :DisableSolrFacets
+
+***Deprecated (used with rsync):***
+
+- :DataCaptureModuleUrl
+- :DownloadMethods
+- :LocalDataAccessPath
+- :RepositoryStorageAbstractionLayerUrl
+
+### New Configuration Options
+
+- `dataverse.files.<id>.disable-tagging`
+- `dataverse.feature.add-publicobject-solr-field`
+- `dataverse.feature.avoid-expensive-solr-join`
+- `dataverse.feature.reduce-solr-deletes`
+- `dataverse.feature.disable-return-to-author-reason`
+- `dataverse.feature.index-harvested-metadata-source`
+- `dataverse.ui.show-validity-label-when-published`
+
+[↑ Table of Contents](#table-of-contents)
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [6.3 Milestone](https://github.com/IQSS/dataverse/issues?q=milestone%3A6.3+is%3Aclosed) in GitHub.
+
+[↑ Table of Contents](#table-of-contents)
+
+## Getting Help
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/g/dataverse-community) or email support@dataverse.org.
+
+[↑ Table of Contents](#table-of-contents)
+
+## Upgrade Instructions
+
+Upgrading requires a maintenance window and downtime. Please plan accordingly, create backups of your database, etc.
+
+These instructions assume that you've already upgraded through all the 5.x releases and are now running Dataverse 6.2.
+
+0\. These instructions assume that you are upgrading from the immediate previous version. If you are running an earlier version, the only supported way to upgrade is to progress through the upgrades to all the releases in between before attempting the upgrade to this version.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
+
+In the following commands, we assume that Payara 6 is installed in `/usr/local/payara6`. If not, adjust as needed.
+
+`export PAYARA=/usr/local/payara6`
+
+(or `setenv PAYARA /usr/local/payara6` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version.
+
+- `$PAYARA/bin/asadmin undeploy dataverse-6.2`
+
+2\. Stop Payara and remove the following directories:
+
+```shell
+service payara stop
+rm -rf $PAYARA/glassfish/domains/domain1/generated
+rm -rf $PAYARA/glassfish/domains/domain1/osgi-cache
+rm -rf $PAYARA/glassfish/domains/domain1/lib/databases
+```
+
+3\. Upgrade Payara to v6.2024.6
+
+With this version of Dataverse, we encourage you to upgrade to version 6.2024.6.
+This will address security issues accumulated since the release of 6.2023.8.
+
+Note that if you are using GDCC containers, this upgrade is included when pulling new release images.
+No manual intervention is necessary.
+
+The steps below are a simple matter of reusing your existing domain directory with the new distribution.
+But we recommend that you review the Payara upgrade instructions as it could be helpful during any troubleshooting:
+[Payara Release Notes](https://docs.payara.fish/community/docs/Release%20Notes/Release%20Notes%206.2024.6.html).
+We also recommend you ensure you followed all update instructions from the past releases regarding Payara.
+(The latest Payara update was for [v6.0](https://github.com/IQSS/dataverse/releases/tag/v6.0).)
+
+Move the current Payara directory out of the way:
+
+```shell
+mv $PAYARA $PAYARA.6.2023.8
+```
+
+Download the new Payara version 6.2024.6 (from https://www.payara.fish/downloads/payara-platform-community-edition/), and unzip it in its place:
+
+```shell
+cd /usr/local
+unzip payara-6.2024.6.zip
+```
+
+Replace the brand new `payara/glassfish/domains/domain1` with your old, preserved domain1:
+
+```shell
+mv payara6/glassfish/domains/domain1 payara6/glassfish/domains/domain1_DIST
+mv payara6-2023.8/glassfish/domains/domain1 payara6/glassfish/domains/
+```
+
+Make sure that you have the following `--add-opens` options in your `payara6/glassfish/domains/domain1/config/domain.xml`. If not present, add them:
+
+```
+<jvm-options>--add-opens=java.management/javax.management=ALL-UNNAMED</jvm-options>
+<jvm-options>--add-opens=java.management/javax.management.openmbean=ALL-UNNAMED</jvm-options>
+<jvm-options>[17|]--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
+<jvm-options>[21|]--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED</jvm-options>
+```
+
+(Note that you likely already have the `java.base/java.io` option there, but without the `[17|]` prefix. Make sure to replace it with the version above)
+
+Start Payara:
+
+```shell
+sudo service payara start
+```
+
+4\. Deploy this version.
+
+```shell
+$PAYARA/bin/asadmin deploy dataverse-6.3.war
+```
+
+5\. For installations with internationalization:
+
+- Please remember to update translations via [Dataverse language packs](https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs).
+
+6\. Restart Payara
+
+```shell
+service payara stop
+service payara start
+```
+
+7\. Update the following metadata blocks to reflect the incremental improvements made to the handling of core metadata fields:
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.3/scripts/api/data/metadatablocks/citation.tsv
+
+curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file citation.tsv
+
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.3/scripts/api/data/metadatablocks/biomedical.tsv
+
+curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file biomedical.tsv
+
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.3/scripts/api/data/metadatablocks/computational_workflow.tsv
+
+curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file computational_workflow.tsv
+
+```
+
+8\. Upgrade Solr
+
+Solr 9.4.1 is now the version recommended in our Installation Guide and used with automated testing. There is a known security issue in the previously recommended version 9.3.0: https://nvd.nist.gov/vuln/detail/CVE-2023-36478. While the risk of an exploit should not be significant unless the Solr instance is accessible from outside networks (which we have always recommended against), we recommend to upgrade.
+
+Install Solr 9.4.1 following the [instructions](https://guides.dataverse.org/en/6.3/installation/prerequisites.html#solr) from the Installation Guide.
+
+The instructions in the guide suggest to use the config files from the installer zip bundle. Upgrading an existing instance, it may be easier to download them from the source tree:
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.3/conf/solr/solrconfig.xml
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.3/conf/solr/schema.xml
+cp solrconfig.xml schema.xml /usr/local/solr/solr-9.4.1/server/solr/collection1/conf
+```
+
+8a\. For installations with custom or experimental metadata blocks:
+
+- Stop Solr instance (usually `service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/6.3/installation/prerequisites.html#solr-init-script)).
+
+- Run the `update-fields.sh` script that we supply, as in the example below (modify the command lines as needed to reflect the correct path of your Solr installation):
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.3/conf/solr/update-fields.sh
+chmod +x update-fields.sh
+curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-9.4.1/server/solr/collection1/conf/schema.xml
+```
+
+- Start Solr instance (usually `service solr start` depending on Solr/OS).
+
+9\. Enable the Metadata Source facet for harvested content (Optional):
+
+If you choose to enable this new feature, set the optional feature flag (jvm option) `dataverse.feature.index-harvested-metadata-source=true` before reindexing.
+
+10\. Reindex Solr, if you upgraded Solr (recommended), or chose to enable any options that require a reindex:
+
+```shell
+curl http://localhost:8080/api/admin/index
+```
+
+Note: if you choose to perform a migration of your `keywordValue` metadata fields (section below), that will require a reindex as well, so do that first.
+
+## Notes for Dataverse Installation Administrators
+
+### Data migration to the new `keywordTermURI` field
+
+You can migrate your `keywordValue` data containing URIs to the new `keywordTermURI` field.
+In case of data migration, view the affected data with the following database query:
+
+```sql
+SELECT value FROM datasetfieldvalue dfv
+INNER JOIN datasetfield df ON df.id = dfv.datasetfield_id
+WHERE df.datasetfieldtype_id = (SELECT id FROM datasetfieldtype WHERE name = 'keywordValue')
+AND value ILIKE 'http%';
+```
+
+If you wish to migrate your data, a database update is then necessary:
+
+```sql
+UPDATE datasetfield df
+SET datasetfieldtype_id  = (SELECT id FROM datasetfieldtype WHERE name = 'keywordTermURI')
+FROM datasetfieldvalue dfv
+WHERE dfv.datasetfield_id  = df.id
+AND df.datasetfieldtype_id = (SELECT id FROM datasetfieldtype WHERE name = 'keywordValue')
+AND dfv.value ILIKE 'http%';
+```
+
+A [reindex in place](https://guides.dataverse.org/en/latest/admin/solr-search-index.html#reindex-in-place) will be required. ReExportAll will need to be run to update the metadata exports of the dataset. Follow the directions in the [Admin Guide](http://guides.dataverse.org/en/latest/admin/metadataexport.html#batch-exports-through-the-api).
+
+[↑ Table of Contents](#table-of-contents)
diff --git a/doc/release-notes/6.4-release-notes.md b/doc/release-notes/6.4-release-notes.md
new file mode 100644
index 00000000000..979fd16bf9e
--- /dev/null
+++ b/doc/release-notes/6.4-release-notes.md
@@ -0,0 +1,526 @@
+# Dataverse 6.4
+
+Please note: To read these instructions in full, please go to https://github.com/IQSS/dataverse/releases/tag/v6.4 rather than the list of releases, which will cut them off.
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+New features in Dataverse 6.4:
+
+- Enhanced DataCite Metadata, including "Relation Type"
+- All ISO 639-3 languages are now supported
+- There is now a button for "Unlink Dataset"
+- Users will have DOIs/PIDs reserved for their files as part of file upload instead of at publication time
+- Datasets can now have types such as "software" or "workflow"
+- Croissant support
+- RO-Crate support
+- and more! Please see below.
+
+New client library:
+
+- Rust
+
+This release also fixes two important bugs described below and in [a post](https://groups.google.com/g/dataverse-community/c/evn5C-pyrS8/m/JrH9vp47DwAJ) on the mailing list:
+
+- "Update Current Version" can cause metadata loss
+- Publishing breaks designated dataset thumbnail, messes up collection page
+
+Additional details on the above as well as many more features and bug fixes included in the release are described below. Read on!
+
+## Features Added
+
+### Enhanced DataCite Metadata, Including "Relation Type"
+
+Within the "Related Publication" field, a new subfield has been added called "Relation Type" that allows for the most common [values](https://datacite-metadata-schema.readthedocs.io/en/4.5/appendices/appendix-1/relationType/) recommended by DataCite: isCitedBy, Cites, IsSupplementTo, IsSupplementedBy, IsReferencedBy, and References. For existing datasets where no "Relation Type" has been specified, "IsSupplementTo" is assumed.
+
+Dataverse now supports the [DataCite v4.5 schema](http://schema.datacite.org/meta/kernel-4/). Additional metadata is now being sent to DataCite including metadata about related publications and files in the dataset. Improved metadata is being sent including how PIDs (ORCID, ROR, DOIs, etc.), license/terms, geospatial, and other metadata are represented. The enhanced metadata will automatically be sent to DataCite when datasets are created and published. Additionally, after publication, you can inspect what was sent by looking at the DataCite XML export.
+
+The additions are in rough alignment with the OpenAIRE XML export, but there are some minor differences in addition to the Relation Type addition, including an update to the DataCite 4.5 schema. For details see #10632, #10615 and the [design document](https://docs.google.com/document/d/1JzDo9UOIy9dVvaHvtIbOI8tFU6bWdfDfuQvWWpC0tkA/edit?usp=sharing) referenced there.
+
+Multiple backward incompatible changes and bug fixes have been made to API calls (three of four of which were not documented) related to updating PID target URLs and metadata at the provider service:
+- [Update Target URL for a Published Dataset at the PID provider](https://guides.dataverse.org/en/6.4/admin/dataverses-datasets.html#update-target-url-for-a-published-dataset-at-the-pid-provider)
+- [Update Target URL for all Published Datasets at the PID provider](https://guides.dataverse.org/en/6.4/admin/dataverses-datasets.html#update-target-url-for-all-published-datasets-at-the-pid-provider)
+- [Update Metadata for a Published Dataset at the PID provider](https://guides.dataverse.org/en/6.4/admin/dataverses-datasets.html#update-metadata-for-a-published-dataset-at-the-pid-provider)
+- [Update Metadata for all Published Datasets at the PID provider](https://guides.dataverse.org/en/6.4/admin/dataverses-datasets.html#update-metadata-for-all-published-datasets-at-the-pid-provider)
+
+### Full List of ISO 639-3 Languages Now Supported
+
+The controlled vocabulary values list for the metadata field "Language" in the citation block has now been extended to include roughly 7920 ISO 639-3 values.
+
+Some of the language entries in the pre-6.4 list correspond to "macro languages" in ISO-639-3 and admins/users may wish to update to use the corresponding individual language entries from ISO-639-3. As these cases are expected to be rare (they do not involve major world languages), finding them is not covered in the release notes. Anyone who desires help in this area is encouraged to reach out to the Dataverse community via any of the standard communication channels.
+
+ISO 639-3 codes were downloaded from [sil.org](https://iso639-3.sil.org/code_tables/download_tables#Complete%20Code%20Tables:~:text=iso%2D639%2D3_Code_Tables_20240415.zip) and the file used for merging with the existing citation.tsv was "iso-639-3.tab". See also #8578 and #10762.
+
+### Unlink Dataset Button
+
+A new "Unlink Dataset" button has been added to the dataset page to allow a user to unlink a dataset from a collection. To unlink a dataset the user must have permission to link the dataset. Additionally, the [existing API](https://guides.dataverse.org/en/6.4/admin/dataverses-datasets.html#unlink-a-dataset) for unlinking datasets has been updated to no longer require superuser access as the "Publish Dataset" permission is now enough. See also #10583 and #10689.
+
+### Pre-Publish File DOI Reservation
+
+Dataverse installations using DataCite as a persistent identifier (PID) provider (or other providers that support reserving PIDs) will be able to reserve PIDs for files when they are uploaded (rather than at publication time). Note that reserving file DOIs can slow uploads with large numbers of files so administrators may need to adjust timeouts (specifically any Apache "``ProxyPass / ajp://localhost:8009/ timeout=``" setting in the recommended Dataverse configuration).
+
+### Initial Support for Dataset Types
+
+Out of the box, all datasets now have the type "dataset" but superusers can add additional types. At this time the type of a dataset can only be set at creation time via API. The types "dataset", "software", and "workflow" (just those three, for now) will be sent to DataCite (as `resourceTypeGeneral`) when the dataset is published.
+
+For details see [the guides](https://guides.dataverse.org/en/6.4/user/dataset-management.html#dataset-types), #10517 and #10694. Please note that this feature is highly experimental and is expected to [evolve](https://github.com/IQSS/dataverse-pm/issues/307).
+
+### Croissant Support (Metadata Export)
+
+A new metadata export format called [Croissant](https://github.com/mlcommons/croissant) is now available as an external metadata exporter. It is oriented toward making datasets consumable by machine learning.
+
+For more about the Croissant exporter, including installation instructions, see <https://github.com/gdcc/exporter-croissant>. See also #10341, #10533, and [discussion](https://groups.google.com/g/dataverse-community/c/JI8HPgGarr8/m/DqEIkiwlAgAJ) on the mailing list.
+
+Please note: the Croissant exporter works best with Dataverse 6.2 and higher (where it updates the content of `<head>` as [described](https://guides.dataverse.org/en/6.4/admin/discoverability.html#schema-org-head) in the guides) but can be used with 6.0 and higher (to get the export functionality).
+
+### RO-Crate Support (Metadata Export)
+
+Dataverse now supports [RO-Crate](https://www.researchobject.org/ro-crate/) as a metadata export format. This functionality is not available out of the box, but you can enable one or more RO-Crate exporters from the [list of external exporters](https://guides.dataverse.org/en/6.4/installation/advanced.html#inventory-of-external-exporters). See also #10744 and #10796.
+
+### Rust API Client Library
+
+An Dataverse API client library for the Rust programming language is now available at https://github.com/gdcc/rust-dataverse and has been added to the [list of client libraries](https://guides.dataverse.org/en/6.4/api/client-libraries.html) in the API Guide. See also #10758.
+
+### Collection Thumbnail Logo for Featured Collections
+
+Collections can now have a thumbnail logo that is displayed when the collection is configured as a featured collection. If present, this thumbnail logo is shown. Otherwise, the collection logo is shown. Configuration is done under the "Theme" for a collection as explained in [the guides](https://guides.dataverse.org/en/6.4/user/dataverse-management.html#theme). See also #10291 and #10433.
+
+### Saved Searches Can Be Deleted
+
+Saved searches can now be deleted via API. See the [Saved Search](https://guides.dataverse.org/en/6.4/api/native-api.html#saved-search) section of the API Guide, #9317 and #10198.
+
+### Notification Email Improvement
+
+When notification emails are sent the part of the closing that says "contact us for support at" will now show the support email address (`dataverse.mail.support-email`), when configured, instead of the default system email address. Using the system email address here was particularly problematic when it was a "noreply" address. See also #10287 and #10504.
+
+### Ability to Disable Automatic Thumbnail Selection
+
+It is now possible to turn off the feature that automatically selects one of the image datafiles to serve as the thumbnail of the parent dataset. An admin can turn it off by enabling the [feature flag](https://guides.dataverse.org/en/6.4/installation/config.html#feature-flags) `dataverse.feature.disable-dataset-thumbnail-autoselect`. When the feature is disabled, a user can still manually pick a thumbnail image, or upload a dedicated thumbnail image. See also #10820.
+
+### More Flexible PermaLinks
+
+The configuration setting `dataverse.pid.*.permalink.base-url`, which is used for PermaLinks, has been updated to support greater flexibility. Previously, the string `/citation?persistentId=` was automatically appended to the configured base URL. With this update, the base URL will now be used exactly as configured, without any automatic additions. See also #10775.
+
+### Globus Async Framework
+
+A new alternative implementation of Globus polling during upload data transfers has been added in this release. This experimental framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. See `globus-use-experimental-async-framework` under [Feature Flags](https://guides.dataverse.org/en/6.4/installation/config.html#feature-flags) and [dataverse.files.globus-monitoring-server](https://guides.dataverse.org/en/6.4/installation/config.html#dataverse-files-globus-monitoring-server) in the Installation Guide. See also #10623 and #10781.
+
+### CVoc (Controlled Vocabulary): Allow ORCID and ROR to Be Used Together in Author Field
+
+Changes in Dataverse and updates to the ORCID and ROR external vocabulary scripts support deploying these for the citation block author field (and others). See also #10711, #10712, and <https://github.com/gdcc/dataverse-external-vocab-support/pull/22>.
+
+### Development on Windows
+
+New instructions have been added for developers on Windows trying to run a Dataverse development environment using Windows Subsystem for Linux (WSL). See [the guides](https://guides.dataverse.org/en/6.4/developers/windows.html), #10606, and #10608.
+
+### Experimental Crossref PID (DOI) Provider
+
+Crossref can now be used as a PID (DOI) provider, but this feature is experimental. Please provide feedback through the usual channels. See also the [guides](https://guides.dataverse.org/en/6.4/installation/config.html#crossref-specific-settings), #8581, and #10806.
+
+### Improved JSON Schema Validation for Datasets
+
+JSON Schema validation has been enhanced with checks for required and allowed child objects as well as type checking for field types including `primitive`, `compound` and `controlledVocabulary`. More user-friendly error messages help pinpoint the issues in the dataset JSON. See [Retrieve a Dataset JSON Schema for a Collection](https://guides.dataverse.org/en/6.4/api/native-api.html#retrieve-a-dataset-json-schema-for-a-collection) in the API Guide, #10169, and #10543.
+
+### Counter Processor 1.05 Support (Make Data Count)
+
+Counter Processor 1.05 is now supported for use with Make Data Count. If you are running Counter Processor, you should reinstall/reconfigure it as described in the latest guides. Note that Counter Processor 1.05 requires Python 3, so you will need to follow the full Counter Processor install. Also note that if you configure the new version the same way, it will reprocess the days in the current month when it is first run. This is normal and will not affect the metrics in Dataverse. See also #10479.
+
+### Version Tags for Container Base Images
+
+With this release we introduce a detailed maintenance workflow for our container images. As output of the [Containerization Working Group](https://ct.gdcc.io), the community takes another step towards production ready containers available directly from the core project.
+
+The maintenance workflow regularly updates the [Container Base Image](https://guides.dataverse.org/en/6.4/container/base-image.html), which contains the operating system, Java, Payara, and tools and libraries required by the Dataverse application. Shipping these rolling releases as well as immutable revisions is the foundation for secure and reliable [Dataverse Application Container](https://guides.dataverse.org/en/6.4/container/app-image.html) images. See also #10478 and #10827.
+
+## Bugs Fixed
+
+### Update Current Version
+
+A significant bug in the superuser-only [Update Current Version](https://guides.dataverse.org/en/6.4/admin/dataverses-datasets.html#make-metadata-updates-without-changing-dataset-version) publication option was fixed. If the "Update Current Version" option was used when changes were made to the dataset terms (rather than to dataset metadata) or if the PID provider service was down or returned an error, the update would fail and render the dataset unusable and require restoration from a backup. The fix in this release allows the update to succeed in both of these cases and redesigns the functionality such that any unknown issues should not make the dataset unusable (i.e. the error would be reported and the dataset would remain in its current state with the last-published version as it was and changes still in the draft version.)
+
+If you do not plan to upgrade to Dataverse 6.4 right away, you are encouraged to alert your superusers to this issue (see [this post](https://groups.google.com/g/dataverse-community/c/evn5C-pyrS8/m/JrH9vp47DwAJ)). Here are some workarounds for pre-6.4 versions:
+
+* Change the "dataset.updateRelease" entry in the Bundle.properties file (or local language version) to "Do Not Use" or similar (this doesn't disable the button but alerts superusers to the issue), or
+* Edit the dataset.xhtml file to remove the lines below, delete the contents of the generated and osgi-cache directories in the Dataverse Payara domain, and restart the Payara server. This will remove the "Update Current Version" from the UI.
+
+```
+<c:if test="#{dataverseSession.user.isSuperuser()}">
+  <f:selectItem rendered="#" itemLabel="#{bundle['dataset.updateRelease']}" itemValue="3" />
+</c:if>
+```
+
+Again, the workarounds above are only for pre-6.4 versions. The bug has been fixed in Dataverse 6.4. See also #10797.
+
+### Broken Thumbnails
+
+Dataverse 6.3 introduced a bug where publishing would break the dataset thumbnail, which in turn broke the rendering of the parent collection (dataverse) page.
+
+This bug has been fixed but any existing broken thumbnails must be fixed manually. See "clearThumbnailFailureFlag" in the upgrade instructions below.
+
+Additionally, it is now possible to turn off the feature that automatically selects of one of the image datafiles to serve as the thumbnail of the parent dataset. An admin can turn it off by raising the feature flag `<jvm-options>-Ddataverse.feature.disable-dataset-thumbnail-autoselect=true</jvm-options>`. When the feature is disabled, a user can still manually pick a thumbnail image, or upload a dedicated thumbnail image.
+
+See also #10819, #10820, and [the post](https://groups.google.com/g/dataverse-community/c/evn5C-pyrS8/m/JrH9vp47DwAJ) on the mailing list.
+
+### No License, No Terms of Use
+
+When datasets have neither a license nor custom terms of use, the dataset page will now indicate this. Also, these datasets will no longer be indexed as having custom terms. See also #8796, #10513, and #10614.
+
+### CC0 License Bug Fix
+
+At a high level, some datasets have been mislabeled as "Custom License" when they should have been "CC0 1.0". This has been corrected.
+
+In Dataverse 5.10, datasets with only "CC0 Waiver" in the "termsofuse" field were converted to "Custom License" (instead of the CC0 1.0 license) through a SQL migration script (see #10634). On deployment of Dataverse 6.4, a new SQL migration script will be run automatically to correct this, changing these datasets to CC0. You can review the script in #10634, which only affect the following datasets:
+
+- The existing "Terms of Use" must be equal to "This dataset is made available under a Creative Commons CC0 license with the following additional/modified terms and conditions: CC0 Waiver" (this was set in #10634).
+- The following terms fields must be empty: Confidentiality Declaration, Special Permissions, Restrictions, Citation Requirements, Depositor Requirements, Conditions, and Disclaimer.
+- The license ID must not be assigned.
+
+The script will set the license ID to that of the CC0 1.0 license and remove the contents of "termsofuse" field. See also #9081 and #10634.
+
+### Remap oai_dc Export and Harvesting Format Fields: dc:type and dc:date
+
+The `oai_dc` export and harvesting format has had the following fields remapped:
+
+- dc:type was mapped to the field "Kind of Data". Now it is hard-coded to the word "Dataset".
+- dc:date was mapped to the field "Production Date" when available and otherwise to "Publication Date". Now it is mapped the field "Publication Date" or the field used for the citation date, if set (see [Set Citation Date Field Type for a Dataset](https://guides.dataverse.org/en/6.4/api/native-api.html#set-citation-date-field-type-for-a-dataset)).
+
+In order for these changes to be reflected in existing datasets, a [reexport all](https://guides.dataverse.org/en/6.4/admin/metadataexport.html#batch-exports-through-the-api) should be run (mentioned below). See #8129 and #10737.
+
+### Zip File No Longer Misdetected as Shapefile (Hidden Directories)
+
+When detecting files types, Dataverse would previously detect a zip file as a shapefile if it contained [markers of a shapefile](https://guides.dataverse.org/en/6.4/developers/geospatial.html) in hidden directories. These hidden directories are now ignored when deciding if a zip file is a shapefile or not. See also #8945 and #10627.
+
+### External Controlled Vocabulary
+
+This release fixes a bug (introduced in v6.3) in the external controlled vocabulary mechanism that could cause indexing to fail (with a NullPointerException) when a script is configured for one child field and no other child fields were managed. See also #10869 and #10870.
+
+### Valid JSON in Error Response
+
+When any `ApiBlockingFilter` policy applies to a request, the JSON in the body of the error response is now valid JSON. See also #10085.
+
+### Docker Container Base Image Security and Compatibility
+
+- Switch "wait-for" to "wait4x", aligned with the Configbaker Image
+- Update "jattach" to v2.2
+- Install AMD64 / ARM64 versions of tools as necessary
+- Run base image as unprivileged user by default instead of `root` - this was an oversight from OpenShift changes
+- Linux User, Payara Admin and Domain Master passwords:
+  - Print hints about default, public knowledge passwords in place for
+  - Enable replacing these passwords at container boot time
+- Enable building with updates Temurin JRE image based on Ubuntu 24.04 LTS
+- Fix entrypoint script troubles with pre- and postboot script files
+- Unify location of files at CONFIG_DIR=/opt/payara/config, avoid writing to other places
+
+See also #10508, #10672 and #10722.
+
+### Cleanup of Temp Directories
+
+In this release we addressed an issue where copies of files uploaded via the UI were left in one specific temp directory (`.../domain1/uploads` by default). We would like to remind all the installation admins that it is strongly recommended to have some automated (and aggressive) cleanup mechanisms in place for all the temp directories used by Dataverse. For example, at Harvard/IQSS we have the following configuration for the PrimeFaces uploads directory above: (note that, even with this fix in place, PrimeFaces will be leaving a large number of small log files in that location)
+
+Instead of the default location (`.../domain1/uploads`) we use a directory on a dedicated partition, outside of the filesystem where Dataverse is installed, via the following JVM option:
+
+```
+<jvm-options>-Ddataverse.files.uploads=/uploads/web</jvm-options>
+```
+
+and we have a dedicated cronjob that runs every 30 minutes and deletes everything older than 2 hours in that directory:
+
+```
+15,45 * * * * /bin/find /uploads/web/ -mmin +119 -type f -name "upload*" -exec rm -f {} \; > /dev/null 2>&1
+```
+
+### Trailing Commas in Author Name Now Permitted
+
+When an author name ended in a comma (e.g. `Smith,` or `Smith, `), the dataset page was broken after publishing (a "500" error page was presented to the user). The underlying issue causing the JSON-LD Schema.org output on the page to break was fixed. See #10343 and #10776.
+
+## API Updates
+
+### Search API: affiliation, parentDataverseName, image_url, etc.
+
+The Search API (`/api/search`) response now includes additional fields, depending on the type.
+
+For collections (dataverses):
+
+- "affiliation"
+- "parentDataverseName"
+- "parentDataverseIdentifier"
+- "image_url" (optional)
+
+```javascript
+"items": [
+    {
+        "name": "Darwin's Finches",
+        ...
+        "affiliation": "Dataverse.org",
+        "parentDataverseName": "Root",
+        "parentDataverseIdentifier": "root",
+        "image_url":"/api/access/dvCardImage/{identifier}"
+(etc, etc)
+```
+
+For datasets:
+
+- "image_url" (optional)
+
+```javascript
+"items": [
+    {
+        ...
+        "image_url": "http://localhost:8080/api/datasets/2/logo"
+        ...
+(etc, etc)
+```
+
+For files:
+
+- "releaseOrCreateDate"
+- "image_url" (optional)
+
+```javascript
+"items": [
+    {
+        "name": "test.png",
+        ...
+        "releaseOrCreateDate": "2016-05-10T12:53:39Z",
+        "image_url":"/api/access/datafile/42?imageThumb=true"
+(etc, etc)
+```
+
+These examples are also shown in the [Search API](https://guides.dataverse.org/en/6.4/api/search.html) section of the API Guide.
+
+The image_url field was already part of the SolrSearchResult JSON (and incorrectly appeared in Search API documentation), but it wasn't returned by the API because it was appended only after the Solr query was executed in the SearchIncludeFragment of JSF (the old/current UI framework). Now, the field is set in SearchServiceBean, ensuring it is always returned by the API when an image is available.
+
+The Solr schema.xml file has been updated to include a new field called "dvParentAlias" for supporting the new response field "parentDataverseIdentifier". See upgrade instructions below.
+
+See also #10810 and #10811.
+
+### Search API: publicationStatuses
+
+The Search API (`/api/search`) response will now include publicationStatuses in the JSON response as long as the list is not empty.
+
+Example:
+
+```javascript
+"items": [
+    {
+        "name": "Darwin's Finches",
+        ...
+        "publicationStatuses": [
+            "Unpublished",
+            "Draft"
+        ],
+(etc, etc)
+```
+
+See also #10733 and #10738.
+
+### Search Facet Information Exposed
+
+A new endpoint `/api/datasetfields/facetables` lists all facetable dataset fields defined in the installation, as described in [the guides](https://guides.dataverse.org/en/6.4/api/native-api.html#list-all-facetable-dataset-fields).
+
+A new optional query parameter "returnDetails" added to `/api/dataverses/{identifier}/facets/` endpoint to include detailed information of each DataverseFacet, as described in [the guides](https://guides.dataverse.org/en/6.4/api/native-api.html#list-facets-configured-for-a-dataverse-collection). See also #10726 and #10727.
+
+### User Permissions on Collections
+
+A new endpoint at `/api/dataverses/{identifier}/userPermissions` for obtaining the user permissions on a collection (dataverse) has been added. See also [the guides](https://guides.dataverse.org/en/6.4/api/native-api.html#get-user-permissions-on-a-dataverse), #10749 and #10751.
+
+### addDataverse Extended
+
+The addDataverse (`/api/dataverses/{identifier}`) API endpoint has been extended to allow adding metadata blocks, input levels and facet IDs at creation time, as the Dataverse page in create mode does in JSF. See also [the guides](https://guides.dataverse.org/en/6.4/api/native-api.html#create-a-dataverse-collection), #10633 and #10644.
+
+### Metadata Blocks and Display on Create
+
+The `/api/dataverses/{identifier}/metadatablocks` endpoint has been fixed to not return fields marked as displayOnCreate=true if there is an input level with include=false, when query parameters returnDatasetFieldTypes=true and onlyDisplayedOnCreate=true are set. See also #10741 and #10767.
+
+The fields "depositor" and "dateOfDeposit" in the citation.tsv metadata block file have been updated to have the property "displayOnCreate" set to TRUE. In practice, only the API is affected because the UI has special logic that already shows these fields when datasets are created. See also and #10850 and #10884.
+
+### Feature Flags Can Be Listed
+
+It is now possible to list all feature flags and see if they are enabled or not. See also [the guides](https://guides.dataverse.org/en/6.4/api/native-api.html#list-all-feature-flags) and #10732.
+
+## Settings Added
+
+The following settings have been added:
+
+- dataverse.feature.disable-dataset-thumbnail-autoselect
+- dataverse.feature.globus-use-experimental-async-framework
+- dataverse.files.globus-monitoring-server
+- dataverse.pid.*.crossref.url
+- dataverse.pid.*.crossref.rest-api-url
+- dataverse.pid.*.crossref.username
+- dataverse.pid.*.crossref.password
+- dataverse.pid.*.crossref.depositor
+- dataverse.pid.*.crossref.depositor-email
+
+## Backward Incompatible Changes
+
+- The oai_dc export format has changed. See the "Remap oai_dc" section above.
+- Several APIs related to DataCite have changed. See "More and Better Data Sent to DataCite" above.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [6.4 milestone](https://github.com/IQSS/dataverse/issues?q=milestone%3A6.4+is%3Aclosed) in GitHub.
+
+## Getting Help
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/g/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please follow our [Installation Guide](https://guides.dataverse.org/en/latest/installation/). Please don't be shy about [asking for help](https://guides.dataverse.org/en/latest/installation/intro.html#getting-help) if you need it!
+
+Once you are in production, we would be delighted to update our [map of Dataverse installations](https://dataverse.org/installations) around the world to include yours! Please [create an issue](https://github.com/IQSS/dataverse-installations/issues) or email us at support@dataverse.org to join the club!
+
+You are also very welcome to join the [Global Dataverse Community Consortium](https://www.gdcc.io/) (GDCC).
+
+## Upgrade Instructions
+
+Upgrading requires a maintenance window and downtime. Please plan accordingly, create backups of your database, etc.
+
+These instructions assume that you've already upgraded through all the 5.x releases and are now running Dataverse 6.3.
+
+0\. These instructions assume that you are upgrading from the immediate previous version. If you are running an earlier version, the only supported way to upgrade is to progress through the upgrades to all the releases in between before attempting the upgrade to this version.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
+
+In the following commands, we assume that Payara 6 is installed in `/usr/local/payara6`. If not, adjust as needed.
+
+```shell
+export PAYARA=/usr/local/payara6`
+```
+
+(or `setenv PAYARA /usr/local/payara6` if you are using a `csh`-like shell)
+
+1\. Undeploy the previous version
+
+```shell
+$PAYARA/bin/asadmin undeploy dataverse-6.3
+```
+
+2\. Stop and start Payara
+
+```shell
+service payara stop
+sudo service payara start
+```
+
+3\. Deploy this version
+
+```shell
+$PAYARA/bin/asadmin deploy dataverse-6.4.war
+```
+
+Note: if you have any trouble deploying, stop Payara, remove the following directories, start Payara, and try to deploy again.
+
+```shell
+service payara stop
+rm -rf $PAYARA/glassfish/domains/domain1/generated
+rm -rf $PAYARA/glassfish/domains/domain1/osgi-cache
+rm -rf $PAYARA/glassfish/domains/domain1/lib/databases
+```
+
+4\. For installations with internationalization:
+
+Please remember to update translations via [Dataverse language packs](https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs).
+
+5\. Restart Payara
+
+```shell
+service payara stop
+service payara start
+```
+
+6\. Update metadata blocks
+
+These changes reflect incremental improvements made to the handling of core metadata fields.
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.4/scripts/api/data/metadatablocks/citation.tsv
+
+curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file citation.tsv
+```
+
+7\. Update Solr schema.xml file. Start with the standard v6.4 schema.xml, then, if your installation uses any custom or experimental metadata blocks, update it to include the extra fields (step 7a).
+
+Stop Solr (usually `service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/6.4/installation/prerequisites.html#solr-init-script)).
+
+```shell
+service solr stop
+```
+
+Replace schema.xml
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.4/conf/solr/schema.xml
+cp schema.xml /usr/local/solr/solr-9.4.1/server/solr/collection1/conf
+```
+
+Start Solr (but if you use any custom metadata blocks, perform the next step, 7a first).
+
+```shell
+service solr start
+```
+
+7a\. For installations with custom or experimental metadata blocks:
+
+Before starting Solr, update the schema to include all the extra metadata fields that your installation uses. We do this by collecting the output of the Dataverse schema API and feeding it to the `update-fields.sh` script that we supply, as in the example below (modify the command lines as needed to reflect the names of the directories, if different):
+
+```shell
+	wget https://raw.githubusercontent.com/IQSS/dataverse/v6.4/conf/solr/update-fields.sh
+	chmod +x update-fields.sh
+	curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-9.4.1/server/solr/collection1/conf/schema.xml
+```
+
+Now start Solr.
+
+8\. Reindex Solr
+
+Below is the simplest way to reindex Solr:
+
+```shell
+curl http://localhost:8080/api/admin/index
+```
+
+The API above rebuilds the existing index "in place". If you want to be absolutely sure that your index is up-to-date and consistent, you may consider wiping it clean and reindexing everything from scratch (see [the guides](https://guides.dataverse.org/en/latest/admin/solr-search-index.html)). Just note that, depending on the size of your database, a full reindex may take a while and the users will be seeing incomplete search results during that window.
+
+9\. Run reExportAll to update dataset metadata exports
+
+This step is necessary because of changes described above for the `Datacite` and `oai_dc` export formats.
+
+Below is the simple way to reexport all dataset metadata. For more advanced usage, please see [the guides](http://guides.dataverse.org/en/6.4/admin/metadataexport.html#batch-exports-through-the-api).
+
+```shell
+curl http://localhost:8080/api/admin/metadata/reExportAll
+```
+
+10\. Pushing updated metadata to DataCite
+
+(If you don't use DataCite, you can skip this.)
+
+Above you updated the citation metadata block and Solr with the new "relationType" field. With these two changes, the "Relation Type" fields will be available and creation/publication of datasets will result in the expanded XML being sent to DataCite. You've also already run "reExportAll" to update the `Datacite` metadata export format.
+
+Entries at DataCite for published datasets can be updated by a superuser using an API call (newly [documented](https://guides.dataverse.org/en/6.4/admin/dataverses-datasets.html#update-metadata-for-all-published-datasets-at-the-pid-provider)):
+
+`curl  -X POST -H 'X-Dataverse-key:<key>' http://localhost:8080/api/datasets/modifyRegistrationPIDMetadataAll`
+
+This will loop through all published datasets (and released files with PIDs). As long as the loop completes, the call will return a 200/OK response. Any PIDs for which the update fails can be found using the following command:
+
+`grep 'Failure for id' server.log`
+
+Failures may occur if PIDs were never registered, or if they were never made findable. Any such cases can be fixed manually in DataCite Fabrica or using the [Reserve a PID](https://guides.dataverse.org/en/6.4/api/native-api.html#reserve-a-pid) API call and the newly documented `/api/datasets/<id>/modifyRegistration` call respectively. See https://guides.dataverse.org/en/6.4/admin/dataverses-datasets.html#send-dataset-metadata-to-pid-provider. Please reach out with any questions.
+
+PIDs can also be updated by a superuser on a per-dataset basis using
+
+`curl -X POST -H 'X-Dataverse-key:<key>' http://localhost:8080/api/datasets/<id>/modifyRegistrationMetadata`
+
+### Additional Upgrade Steps
+
+11\. If there are broken thumbnails
+
+To restore any broken thumbnails caused by the bug described above, you can call the `http://localhost:8080/api/admin/clearThumbnailFailureFlag` API, which will attempt to clear the flag on all files (regardless of whether caused by this bug or some other problem with the file) or the `http://localhost:8080/api/admin/clearThumbnailFailureFlag/$FILE_ID` to clear the flag for individual files. Calling the former, batch API is recommended.
+
+12\. PermaLinks with custom base-url
+
+If you currently use PermaLinks with a custom `base-url`: You must manually append `/citation?persistentId=` to the base URL to maintain functionality.
+
+If you use a PermaLinks without a configured `base-url`, no changes are required.
diff --git a/doc/release-notes/6.5-release-notes.md b/doc/release-notes/6.5-release-notes.md
new file mode 100644
index 00000000000..2e27f4419bd
--- /dev/null
+++ b/doc/release-notes/6.5-release-notes.md
@@ -0,0 +1,391 @@
+# Dataverse 6.5
+
+Please note: To read these instructions in full, please go to https://github.com/IQSS/dataverse/releases/tag/v6.5 rather than the [list of releases](https://github.com/IQSS/dataverse/releases), which will cut them off.
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project!
+
+## Release Highlights
+
+Highlights for Dataverse 6.5 include:
+
+- new API endpoints, including editing of collections, Search API file counts, listing of exporters, comparing dataset versions, and auditing data files
+- UX improvements, especially Preview URLs
+- increased harvesting flexibility
+- performance gains
+- a [security vulnerability](https://github.com/IQSS/dataverse-security/issues/98) addressed
+- many bug fixes
+- and more! Please see below.
+
+## Features Added
+
+### Private URL Renamed to Preview URL and Improved
+
+The name of the URL that may be used by dataset administrators to share a draft version of a dataset has been changed from Private URL to Preview URL.
+
+Also, additional information about the creation of Preview URLs has been added to the popup accessed via edit menu of the Dataset Page.
+
+Users of the Anonymous Preview URL will no longer be able to see the name of the Dataverse that the dataset is in but will be able to see the name of the repository. 
+
+Any Private URLs created in previous versions of Dataverse will continue to work.
+
+The old "privateUrl" API endpoints for the creation and deletion of Preview (formerly Private) URLs have been deprecated. They will continue to work but please switch to the "previewUrl" equivalents that have been [documented](https://guides.dataverse.org/en/6.5/api/native-api.html#create-a-preview-url-for-a-dataset) in the API Guide.
+
+See also #8184, #8185, #10950, #10961, and #11085.
+
+### Showing Differences Between Dataset Versions is More Scalable
+
+Showing differences between dataset versions, which is done during dataset edit operations and to populate the dataset page versions table, has been made significantly more scalable. See #10814 and #10818.
+
+### Version Differences Details Sorting Added
+
+In order to facilitate the comparison between the draft version and the published version of a dataset, a sort on subfields has been added. See #10969.
+
+### Reindexing After a Role Assignment is Less Memory Intensive
+
+Adding or removing a user from a role on a collection, particularly the root collection, could lead to a significant increase in memory use, resulting in Dataverse itself failing with an out-of-memory condition. Such changes now consume much less memory. A Solr reindexing step is included in the upgrade instructions below. See also #10697 and #10698.
+
+### Longer Custom Questions in Guestbooks
+
+Custom questions in Guestbooks can now be more than 255 characters and the bug causing a silent failure when questions were longer than this limit has been fixed. See also #9492, #10117, #10118.
+
+### PostgreSQL and Flyway Updates
+
+This release bumps the version of PostgreSQL and Flyway used in containers as well as the PostgreSQL JDBC driver used all installations, including classic (non-Docker) installations. PostgreSQL and its driver have been bumped to version 17. Flyway has been bumped to version 10.
+
+PostgreSQL 13 remains the version used with automated testing, leading us to continue to [recommend](https://guides.dataverse.org/en/6.5/installation/prerequisites.html#postgresql) that version for classic installations.
+
+As of Flyway 10, supporting older versions of PostgreSQL no longer requires a paid subscription. While we don't encourage the use of older PostgreSQL versions, this flexibility may benefit some of our long-standing installations in their upgrade paths.
+
+As part of this update, the containerized development environment now uses Postgres 17 instead of 16. Developers must delete their data (`rm -rf docker-dev-volumes`) and start with an empty database (rerun the [quickstart](https://guides.dataverse.org/en/6.5/developers/dev-environment.html#quickstart) in the dev guide), as [explained](https://groups.google.com/g/dataverse-dev/c/ffoNj5UXyzU/m/nE5oGY_sAQAJ) on the dev mailing list.
+
+The Docker compose file used for [evaluations or demos](https://guides.dataverse.org/en/6.4/container/running/demo.html) has been upgraded from Postgres 13 to 17.
+
+See also #10889 and #10912.
+
+### Harvesting "oai_dc" Metadata Prefix When Extended With Specific Namespaces
+
+Some data repositories extend the "oai_dc" metadata prefix with specific namespaces. In this case, harvesting of these datasets into Dataverse was not possible because an XML parsing error was raised.
+
+Harvesting of these datasets has been fixed by excluding tags with namespaces that are not "dc:". That is, only harvesting metadata with the "dc" namespace. See #10837.
+
+### Harvested Dataset PID from Record Header
+
+When harvesting, Dataverse can now use the identifier from the OAI-PMH record header as the persistent id for the harvested dataset.
+
+This will allow harvesting from sources that do not include a persistent id in their oai_dc metadata records, but use valid DOIs or handles as the OAI-PMH record header identifiers.
+
+It is also possible to optionally configure a harvesting client to use this OAI-PMH identifier as the **preferred** choice for the persistent id. See the [Harvesting Clients API](https://guides.dataverse.org/en/6.5/api/native-api.html#create-a-harvesting-client) section of the Guides, #11049 and #10982 for more information.
+
+### Harvested Datasets Can Have Multiple "otherId" Values
+
+When harvesting using the DDI format, datasets can now have multiple "otherId" values. See #10772.
+
+### Multiple Languages in Docker
+
+Documentation has been added to explain how to set up multiple languages (e.g. English and French) in the tutorial for setting up Dataverse in Docker.
+
+See [the tutorial](https://guides.dataverse.org/en/6.5/container/running/demo.html#multiple-languages), #10939, and #10940.
+
+### GlobusBatchLookupSize
+
+An optimization has been added for the Globus upload workflow, with a corresponding new database setting: `:GlobusBatchLookupSize`
+
+See the [Database Settings](https://guides.dataverse.org/en/6.5/installation/config.html#GlobusBatchLookupSize) section of the guides, #10977, and #11040 for more information.
+
+## Bugs Fixed
+
+### Relation Type (Related Publication) and DataCite
+
+The subfield "Relation Type" was added to the field "Related Publication" in Dataverse 6.4 (#10632) but couldn't be used without workarounds described in an [announcement](https://groups.google.com/g/dataverse-community/c/zlRGJtu3x4g/m/GtVZ26uaBQAJ) about the problem. The bug has been fixed and workarounds are no longer required. See #10926 and the announcement above.
+
+### Sort Order for Files
+
+"Newest" and "Oldest" were reversed when sorting files on the dataset landing page. This has been fixed. See #10742 and #11000.
+
+### Guestbook Email Validation
+
+In the Guestbook UI form, the email address is now checked for validity. See #10661 and #11022.
+
+### Updating Files Now Possible When Latest and Only Dataset Version is Deaccessioned
+
+When a dataset was deaccessioned, and was the only previous version, it would cause an error when trying to update the files. This has been fixed. See #9351 and #10901.
+
+### My Data Filter by Username Feature Restored
+
+The superuser-only feature of filtering by a username on the My Data page was not working. Entering a username in the "Results for Username" field now returns data for the desired user. See also #7239 and #10980.
+
+### Better Handling of Parallel Edit/Publish Errors
+
+Improvements have been made in handling the errors when a dataset has been edited in one browser window and an attempt is made to edit or publish it in another. (This practice is discouraged, by the way.) See #10793 and #10794.
+
+### Facets Filter Labels Now Translated Above Search Results
+
+On the main page, it's possible to filter results using search facets. If internationalization (i18n) has been enabled in the Dataverse installation, allowing pages to be displayed in several languages, the facets were correctly translated in the filter column at the left. However, they were not being translated above the search results, remaining in the default language, English. This has been fixed. See #9408 and #10158.
+
+### Unpublished File Bug Fix Related to Deaccessioning
+
+A bug fix was made related to retrieval of the major version of a Dataset when all major versions were deaccessioned. This fixes the incorrect showing of the files as "Unpublished" in the search list even when they are published. In the upgrade instructions below, there is a step to reindex Solr. See also #10947 and #10974.
+
+### Minor DataCiteXML Fix (Useless Null)
+
+A minor bug fix was made to avoid sending a useless ", null" in the DataCiteXML sent to DataCite and in the DataCite export when a dataset has a metadata entry for "Software Name" and no entry for "Software Version". The bug fix will update datasets upon publication. Anyone with existing published datasets with this problem can be fixed by [pushing updated metadata to DataCite for affected datasets](https://guides.dataverse.org/en/6.5/admin/dataverses-datasets.html#update-metadata-for-a-published-dataset-at-the-pid-provider) and [re-exporting the dataset metadata](https://guides.dataverse.org/en/6.5/admin/metadataexport.html#batch-exports-through-the-api). See "Pushing updated metadata to DataCite" in the upgrade instructions below. See also #10919.
+
+### PIDs and Make Data Count Citation Retrieval
+
+Make Data Count (MDC) citation retrieval with the PID settings has been fixed. PID parsing in Dataverse is now case insensitive, improving interaction with services that may change the case of PIDs. Warnings related to managed/excluded PID lists for PID providers have been reduced. See #10708.
+
+### Quirk in Overview Display When Using External Controlled Variables
+
+This bugfix corrects an issue when there are duplicated entries on the metadata page. It is fixed by correcting an IF-clause in metadataFragment.xhtml. See #11005 and #11034.
+
+### Globus "missing properties" Logging Fixed
+
+In previous releases, logging would show Globus-related strings were missing from properties files. This has been fixed. See #11030.
+
+## API Updates
+
+### Editing Collections
+
+A new endpoint (`PUT /api/dataverses/<identifier>`) for updating an existing collection (dataverse) has been added. It uses the same JSON structure as the one used for collection creation. See also [the docs](https://guides.dataverse.org/en/6.5/api/native-api.html#update-a-dataverse-collection), #10904, and #10925.
+
+### fileCount Added to Search API
+
+A new search field called `fileCount` can be searched to discover the number of files per dataset. The upgrade instructions below explain how to update your Solr `schema.xml` file to add the new field and reindex Solr. See also #8941 and #10598.
+
+### List Dataset Metadata Exporters
+
+A list of available dataset metadata exporters can now be retrieved programmatically via API. See [the docs](https://guides.dataverse.org/en/6.5/api/native-api.html#get-export-formats) and #10739.
+
+### Comparing Dataset Versions
+
+An API has been added to compare dataset versions. See [the docs](https://guides.dataverse.org/en/6.5/api/native-api.html#compare-versions-of-a-dataset), #10888, and #10945.
+
+### Audit Data Files
+
+A superuser-only API endpoint has been added to audit datasets with data files where the physical files are missing or the file metadata is missing. See [the docs](https://guides.dataverse.org/en/6.5/api/native-api.html#datafile-audit), #11016, and [#220](https://github.com/IQSS/dataverse.harvard.edu/issues/220).
+
+### Update Collection API Inheritance
+
+The update collection (dataverse) API endpoint has been updated to support an "inherit from parent" configuration for metadata blocks, facets, and input levels.
+
+Previously, not setting these fields meant using a copy of the settings from the parent collection, which could get out of sync. See also [the docs](https://guides.dataverse.org/en/6.5/api/native-api.html#update-a-dataverse-collection), #11018, and #11026.
+
+### isMetadataBlockRoot and isFacetRoot
+
+The JSON payload of the "get collection" endpoint has been extended to include properties isMetadataBlockRoot and isFacetRoot. See also [the docs](https://guides.dataverse.org/en/6.5/api/native-api.html#view-a-dataverse-collection), #11012, and #11013.
+
+### Whitespace Trimming When Loading Metadata Block TSV Files
+
+When loading custom metadata blocks using the `api/admin/datasetfield/load` API endpoint, whitespace can be introduced into field names. Whitespace is now trimmed from the beginning and end of all values read into the API before persisting them. See #10688 and #10696.
+
+### Image URLs from the Search API
+
+As of 6.4 (#10855) `image_url` is being returned from the Search API. The logic has been updated to only show the image if each of the following are true:
+
+1. The data file is not harvested
+2. A thumbnail is available for the data file
+3. If the data file is restricted, then the caller must have DownloadFile permission for the data file
+4. The data file is NOT actively embargoed
+5. The data file's retention period has NOT expired
+
+See also #10875 and #10886.
+
+### Metrics API Bug Fixes
+
+Two bugs in the Metrics API have been fixed:
+
+- The /datasets and /datasets/byMonth endpoints could report incorrect values if or when they have been called using the "dataLocation" parameter (which allows getting metrics for local, remote (harvested), or all datasets) as the metrics cache was not storing different values for these cases.
+
+- Metrics endpoints whose calculation relied on finding the latest published dataset version were incorrect if/when the minor version number was > 9.
+
+The upgrade instructions below include a step for clearing the metrics cache.
+
+See also #10379 and #10865.
+
+### API Tokens
+
+An optional query parameter called "returnExpiration" has been added to the `/api/users/token/recreate` endpoint, which, if set to true, returns the expiration time in the response. See [the docs](https://guides.dataverse.org/en/6.5/api/native-api.html#recreate-a-token), #10857 and #10858.
+
+The `/api/users/token` endpoint has been extended to support any auth mechanism for retrieving the token information. Previously this endpoint only accepted an API token to retrieve its information. Now it accepts any authentication mechanism and returns the associated API token information. See #10914 and #10924.
+
+## Settings Added
+
+- `:GlobusBatchLookupSize`
+
+## Backward Incompatible Changes
+
+Generally speaking, see the [API Changelog](https://guides.dataverse.org/en/latest/api/changelog.html) for a list of backward-incompatible API changes.
+
+### List Collections Linked to a Dataset
+
+The API endpoint that returns a list of collections that a dataset has been linked to has been improved to provide a more structured JSON response. See [the docs](https://guides.dataverse.org/en/6.5/admin/dataverses-datasets.html#list-collections-that-are-linked-from-a-dataset), #9650, and #9665.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [6.5 milestone](https://github.com/IQSS/dataverse/issues?q=milestone%3A6.5+is%3Aclosed) in GitHub.
+
+## Getting Help
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/g/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please follow our [Installation Guide](https://guides.dataverse.org/en/latest/installation/). Please don't be shy about [asking for help](https://guides.dataverse.org/en/latest/installation/intro.html#getting-help) if you need it!
+
+Once you are in production, we would be delighted to update our [map of Dataverse installations](https://dataverse.org/installations) around the world to include yours! Please [create an issue](https://github.com/IQSS/dataverse-installations/issues) or email us at support@dataverse.org to join the club!
+
+You are also very welcome to join the [Global Dataverse Community Consortium](https://www.gdcc.io/) (GDCC).
+
+
+## Upgrade Instructions
+
+Upgrading requires a maintenance window and downtime. Please plan accordingly, create backups of your database, etc.
+
+These instructions assume that you've already upgraded through all the 5.x releases and are now running Dataverse 6.4.
+
+0\. These instructions assume that you are upgrading from the immediate previous version. If you are running an earlier version, the only supported way to upgrade is to progress through the upgrades to all the releases in between before attempting the upgrade to this version.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. By default, Payara runs as the `dataverse` user. In the commands below, we use sudo to run the commands as a non-root user.
+
+Also, we assume that Payara 6 is installed in `/usr/local/payara6`. If not, adjust as needed.
+
+```shell
+export PAYARA=/usr/local/payara6
+```
+
+(or `setenv PAYARA /usr/local/payara6` if you are using a `csh`-like shell)
+
+1\. List deployed applications
+
+```shell
+$PAYARA/bin/asadmin list-applications
+```
+
+2\. Undeploy the previous version (should match "list-applications" above)
+
+```shell
+$PAYARA/bin/asadmin undeploy dataverse-6.4
+```
+
+3\. Stop and start Payara
+
+```shell
+sudo service payara stop
+sudo service payara start
+```
+
+4\. Download and deploy this version
+
+```shell
+wget https://github.com/IQSS/dataverse/releases/download/v6.5/dataverse-6.5.war
+$PAYARA/bin/asadmin deploy dataverse-6.5.war
+```
+
+Note: if you have any trouble deploying, stop Payara, remove the following directories, start Payara, and try to deploy again.
+
+```shell
+sudo service payara stop
+sudo rm -rf $PAYARA/glassfish/domains/domain1/generated
+sudo rm -rf $PAYARA/glassfish/domains/domain1/osgi-cache
+sudo rm -rf $PAYARA/glassfish/domains/domain1/lib/databases
+```
+
+5\. For installations with internationalization:
+
+Please remember to update translations via [Dataverse language packs](https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs).
+
+6\. Restart Payara
+
+```shell
+sudo service payara stop
+sudo service payara start
+```
+7\. Update Solr schema.xml file. Start with the standard v6.5 schema.xml, then, if your installation uses any custom or experimental metadata blocks, update it to include the extra fields (step 7a).
+
+Run the commands below as a non-root user.
+
+Stop Solr (usually `sudo service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/6.5/installation/prerequisites.html#solr-init-script)).
+
+```shell
+sudo service solr stop
+```
+
+Replace schema.xml
+
+Please note that the path to Solr may differ from the example below.
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.5/conf/solr/schema.xml
+sudo cp schema.xml /usr/local/solr/solr-9.4.1/server/solr/collection1/conf
+```
+
+Start Solr (but if you use any custom metadata blocks, perform the next step, 7a first).
+
+```shell
+sudo service solr start
+```
+
+7a\. For installations with custom or experimental metadata blocks:
+
+Before starting Solr, update the `schema.xml` file to include all the extra metadata fields that your installation uses.
+
+We do this by collecting the output of Dataverse's Solr schema API endpoint (`/api/admin/index/solr/schema`) and piping it to the `update-fields.sh` script which updates the `schema.xml` file supplied as an argument.
+
+The example below assumes the default installation location of Solr, but you can modify the commands as needed.
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.5/conf/solr/update-fields.sh
+chmod +x update-fields.sh
+curl "http://localhost:8080/api/admin/index/solr/schema" | sudo ./update-fields.sh /usr/local/solr/solr-9.4.1/server/solr/collection1/conf/schema.xml
+```
+
+Now start Solr.
+
+
+```shell
+sudo service solr start
+```
+
+8\. Reindex Solr
+
+Below is the simplest way to reindex Solr:
+
+```shell
+curl http://localhost:8080/api/admin/index
+```
+
+The API above rebuilds the existing index. If you want to be absolutely sure that your index is up-to-date and consistent, you may consider wiping it clean and reindexing everything from scratch (see [the guides](https://guides.dataverse.org/en/latest/admin/solr-search-index.html)). Just note that, depending on the size of your database, a full reindex may take a while and the users will be seeing incomplete search results during that window.
+
+9\. Run reExportAll to update dataset metadata exports
+
+Below is the simple way to reexport all dataset metadata. For more advanced usage, please see [the guides](http://guides.dataverse.org/en/6.4/admin/metadataexport.html#batch-exports-through-the-api).
+
+```shell
+curl http://localhost:8080/api/admin/metadata/reExportAll
+```
+
+10\. Clear metrics cache
+
+Run the [clearMetricsCache](https://guides.dataverse.org/en/6.5/api/native-api.html#metrics) API endpoint to remove old cached values that may be incorrect.
+
+```shell
+curl -X DELETE http://localhost:8080/api/admin/clearMetricsCache
+```
+
+11\. Pushing updated metadata to DataCite
+
+(If you don't use DataCite, you can skip this. Also, if you aren't affected by the "useless null" bug described above, you can skip this.)
+
+Entries at DataCite for published datasets can be updated by a superuser using an API call (newly [documented](https://guides.dataverse.org/en/6.5/admin/dataverses-datasets.html#update-metadata-for-all-published-datasets-at-the-pid-provider)):
+
+`curl  -X POST -H 'X-Dataverse-key:<key>' http://localhost:8080/api/datasets/modifyRegistrationPIDMetadataAll`
+
+This will loop through all published datasets (and released files with PIDs). As long as the loop completes, the call will return a 200/OK response. Any PIDs for which the update fails can be found using the following command:
+
+`grep 'Failure for id' server.log`
+
+Failures may occur if PIDs were never registered, or if they were never made findable. Any such cases can be fixed manually in DataCite Fabrica or using the [Reserve a PID](https://guides.dataverse.org/en/6.4/api/native-api.html#reserve-a-pid) API call and the newly documented `/api/datasets/<id>/modifyRegistration` call respectively. See https://guides.dataverse.org/en/6.4/admin/dataverses-datasets.html#send-dataset-metadata-to-pid-provider. Please reach out with any questions.
+
+PIDs can also be updated by a superuser on a per-dataset basis using
+
+`curl -X POST -H 'X-Dataverse-key:<key>' http://localhost:8080/api/datasets/<id>/modifyRegistrationMetadata`
diff --git a/doc/release-notes/6.6-release-notes.md b/doc/release-notes/6.6-release-notes.md
new file mode 100644
index 00000000000..751c471a0a3
--- /dev/null
+++ b/doc/release-notes/6.6-release-notes.md
@@ -0,0 +1,549 @@
+# Dataverse 6.6
+
+Please note: To read these instructions in full, please go to https://github.com/IQSS/dataverse/releases/tag/v6.6 rather than the [list of releases](https://github.com/IQSS/dataverse/releases), which will cut them off.
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project!
+
+## Release Highlights
+
+Highlights for Dataverse 6.6 include:
+
+- metadata fields can be "display on create" per collection
+- ORCIDs linked to accounts
+- version notes
+- harvesting from DataCite
+- citations using Citation Style Language (CSL)
+- license metadata enhancements
+- metadata fields now support range searches (dates, integers, etc.)
+- more accurate search highlighting
+- collections can be moved by using the superuser dashboard
+- new 3D Objects metadata block
+- new Archival metadata block (experimental)
+- optionally prevent publishing of datasets without files
+- Signposting output now contains links to all dataset metadata export formats
+- infrastructure updates (Payara and Solr)
+
+In a recent community call, we talked about many of these highlights if you'd like to watch the [video](https://harvard.zoom.us/rec/share/Ir5CkFHkzoya9b5Nk69rLFUpTyGics3-KGLl9WITSLMy4ezHRsB8CnY22cUNg2g.JPpxrjzHMeCii_zO) (around 22:30).
+
+## Features Added
+
+### Metadata Fields Can Be "Display on Create" Per Collection
+
+Collection administrators can now configure which metadata fields appear during dataset creation through the `displayOnCreate` property, even when fields are not required. This provides greater control over metadata visibility and can help improve metadata completeness.
+
+Currently this feature can only be configured [via API](https://guides.dataverse.org/en/6.6/api/native-api.html#update-collection-input-levels), but a UI implementation is planned in #11221. See #10476, #11224, and #11312.
+
+### ORCIDs Linked to Accounts
+
+Dataverse now includes improved integration with ORCID, supported through a grant to GDCC from the ([ORCID Global Participation Fund](https://info.orcid.org/global-participation-fund-announces-fourth-round-of-awardees/)).
+
+Specifically, Dataverse users can now link their Dataverse account with their ORCID profile. Previously, this was only available to users who logged in with ORCID. Once linked, Dataverse will automatically prepopulate their ORCID to their author metadata when they create a dataset.
+
+This functionality leverages Dataverse's existing support for login via ORCID, but can be turned on independently of it. If ORCID login is enabled, the user's ORCID will automatically be added to their profile. If the user has logged in via some other mechanism, they are able to click a button to initiate a similar authentication process in which the user must login to their ORCID account and approve the connection. 
+
+Feedback from installations that enable this functionality is requested and we expect that updates can be made in the next Dataverse release.
+
+See the [User Guide](http://guides.dataverse.org/en/6.6/user/account.html#linking-orcid-with-your-account-profile), [Installation Guide](http://guides.dataverse.org/en/6.6/installation/orcid.html), #7284, and #11222.
+
+### Version Notes
+
+Dataverse now supports the option of adding a version note before or during the publication of a dataset. These notes can be used, for example, to indicate why a version was created or how it differs from the prior version. Whether this feature is enabled is controlled by the flag `dataverse.feature.enable-version-note`. Version notes are shown in the user interface (in the dataset page version table), indexed (as `versionNote`), available via the API, and have been added to the JSON, DDI, DataCite, and OAI-ORE exports.
+
+With the addition of this feature, work has been done to clean-up and rename fields that have been used for specifying the reason for deaccessioning a dataset and providing an optional link to a non-Dataverse location where the dataset still can be found. The former was listed in some JSON-based API calls and exports as "versionNote" and is now "deaccessionNote", while the latter was referred to as "archiveNote" and is now "deaccessionLink".
+
+Further, some database consolidation has been done to combine the deaccessionlink and archivenote fields, which appear to have both been used for the same purpose. The deaccessionlink database field is older and also was not displayed in the current UI. Going forward, only the deaccessionlink column exists.
+
+See the [User Guide](https://guides.dataverse.org/en/6.6/user/dataset-management.html#data-provenance), [API Guide](https://guides.dataverse.org/en/6.6/api/native-api.html#dataset-version-notes) #8431, and #11068.
+
+### OAI-PMH Harvesting from DataCite
+
+DataCite maintains an OAI server (<https://oai.datacite.org/oai>) that serves records for every DOI they have registered. There's been a lot of interest in the community in being able to harvest from them. This way, it will be possible to harvest metadata from institution X even if the institution X does not maintain an OAI server of their own, if they happen to register their DOIs with DataCite. One extra element of this harvesting model that makes it especially powerful and flexible is the DataCite's concept of a "dynamic OAI set": a harvester is not limited to harvesting the pre-defined set of ALL the records registered by the institution X, but can instead harvest virtually any arbitrary subset thereof; any query that the DataCite search API understands can be used as an OAI set. The feature is already in use at Harvard Dataverse, as a beta version patch.
+
+For various reasons, in order to take advantage of this feature harvesting clients must be created using the `/api/harvest/clients` API. Once configured however, harvests can be run from the Harvesting Clients control panel in the UI.
+
+DataCite-harvesting clients must be configured with 2 new feature flags, `useListRecords` and `useOaiIdentifiersAsPids` (added in Dataverse 6.5). Note that these features may be of use when harvesting from other sources, not just from DataCite.
+
+See the [Admin Guide](http://guides.dataverse.org/en/6.6/admin/harvestclients.html#harvesting-from-datacite), [API Guide](http://guides.dataverse.org/en/6.6/api/native-api.html#harvesting-from-datacite), #10909, and #11011.
+
+### Citations Using Citation Style Language (CSL)
+
+This release adds support for generating citations in any of the standard independent formats specified using the [Citation Style Language](https://citationstyles.org).
+
+The CSL formats are available to copy/paste if you click "Cite Dataset" and then "View Styled Citations" on the dataset page. An API call to retrieve a dataset citation in EndNote, RIS, BibTeX, and CSLJson format has also been added. The first three have been available as downloads from the UI (CSLJson is not) but have not been directly accessible via API until now. The CSLJson format is new to Dataverse and can be used with open source libraries to generate all of the other CSL-style citations.
+
+Admins can use a new `dataverse.csl.common-styles` setting to highlight commonly used styles. Common styles are listed in the pop-up, while others can be found by type-ahead search in a list of 1000+ options.
+
+See the [User Guide](http://guides.dataverse.org/en/6.6/user/find-use-data.html#cite-data), [Settings](http://guides.dataverse.org/en/6.6/installation/config.html#dataverse-csl-common-styles), [API Guide](http://guides.dataverse.org/en/6.6/api/native-api.html#get-citation-in-other-formats), and #11163.
+
+### License Metadata Enhancements
+
+- Added new fields to licenses: rightsIdentifier, rightsIdentifierScheme, schemeUri, languageCode. See JSON files under [Adding Licenses](https://guides.dataverse.org/en/6.6/installation/config.html#adding-licenses) in the guides
+- Updated DataCite metadata export to include rightsIdentifier, rightsIdentifierScheme, and schemeUri consistent with the DataCite 4.5 schema and examples
+- Enhanced metadata exports to include all new license fields
+- Existing licenses from the example set included with Dataverse will be automatically updated with new fields
+- Existing API calls support the new optional fields
+
+See below for upgrade instructions. See also #10883 and #11232.
+
+### Range Search
+
+This release enhances how numerical and date fields are indexed in Solr. Previously, all fields were indexed as English text (`text_en`), but with this update:
+
+* Integer fields are indexed as `plong`
+* Float fields are indexed as `pdouble`
+* Date fields are indexed as `date_range` (`solr.DateRangeField`)
+
+This change enables range queries when searching from both the UI and the API, such as `dateOfDeposit:[2000-01-01 TO 2014-12-31]` or `targetSampleActualSize:[25 TO 50]`. See below for a full list of fields that now support range search.
+
+Additionally, search result highlighting is now more accurate, ensuring that only fields relevant to the query are highlighted in search results. If the query is specifically limited to certain fields, the highlighting is now limited to those fields as well. See #10887.
+
+Specifically, the following fields were updated:
+
+- coverage.Depth
+- coverage.ObjectCount
+- coverage.ObjectDensity
+- coverage.Redshift.MaximumValue
+- coverage.Redshift.MinimumValue
+- coverage.RedshiftValue
+- coverage.SkyFraction
+- coverage.Spectral.CentralWavelength
+- coverage.Spectral.MaximumWavelength
+- coverage.Spectral.MinimumWavelength
+- coverage.Temporal.StartTime
+- coverage.Temporal.StopTime
+- dateOfCollectionEnd
+- dateOfCollectionStart
+- dateOfDeposit
+- distributionDate
+- dsDescriptionDate
+- journalPubDate
+- productionDate
+- resolution.Redshift
+- targetSampleActualSize
+- timePeriodCoveredEnd
+- timePeriodCoveredStart
+
+### New 3D Objects Metadata Block
+
+A new metadata block has been added for describing 3D object data. You can download it from the [guides](https://guides.dataverse.org/en/6.6/user/appendix.html). See also #11120 and #11167.
+
+All new Dataverse installations will receive this metadata block by default. We recommend adding it by following the upgrade instructions below.
+
+### New Archival Metadata Block (Experimental)
+
+An experimental "Archival" metadata block has been added, [downloadable](https://guides.dataverse.org/en/6.6/user/appendix.html) from the User Guide. The purpose of the metadata block is to enable repositories to register metadata relating to the potential archiving of the dataset at a depositor archive, whether that being your own institutional archive or an external archive, i.e. a historical archive. Feedback is welcome! See also #10626.
+
+### Prevent Publishing of Datasets Without Files
+
+Datasets without files can be optionally prevented from being published through a new "requireFilesToPublishDataset" boolean defined at the collection level. This boolean can be set only via API and only by a superuser. See [Change Collection Attributes](https://guides.dataverse.org/en/6.6/api/native-api.html#change-collection-attributes). If the boolean is not set, the parent collection is consulted. If you do not set the boolean, the existing behavior of datasets being able to be published without files will continue. Superusers can still publish datasets whether or not the boolean is set. See #10981 and #10994.
+
+### Metadata Source Facet Can Now Differentiate Between Harvested Sources
+
+The behavior of the feature flag `index-harvested-metadata-source` and the "Metadata Source" facet, which were added and updated, respectively, in [Dataverse 6.3](https://github.com/IQSS/dataverse/releases/tag/v6.3) (through pull requests #10464 and #10651), have been updated. A new field called "Source Name" has been added to harvesting clients.
+
+Before Dataverse 6.3, all harvested content (datasets and files) appeared together under "Harvested" under the "Metadata Source" facet. This is still the behavior of Dataverse out of the box. Since Dataverse 6.3, enabling the `index-harvested-metadata-source` feature flag (and reindexing) resulted in harvested content appearing under the nickname for whatever harvesting client was used to bring in the content. This meant that instead of having all harvested content lumped together under "Harvested", content would appear under "client1", "client2", etc.
+
+With this release, enabling the `index-harvested-metadata-source` feature flag, populating a new field for harvesting clients called "Source Name" ("sourceName" in the [API](https://dataverse-guide--11217.org.readthedocs.build/en/11217/api/native-api.html#create-a-harvesting-client)), and reindexing (see upgrade instructions below) results in the source name appearing under the "Metadata Source" facet rather than the harvesting client nickname. This gives you more control over the name that appears under the "Metadata Source" facet and allows you to reuse the same source name to group harvested content from various harvesting clients under the same name if you wish.
+
+Previously, `index-harvested-metadata-source` was not documented in the guides, but now you can find information about it under [Feature Flags](https://guides.dataverse.org/en/6.6/installation/config.html#feature-flags). See also #10217 and #11217.
+
+### Globus Framework Improvements
+
+The improvements and optimizations in this release build on top of the earlier work (such as #10781). They are based on the experience gained at IQSS as part of the production rollout of the Large Data Storage services that utilizes Globus.
+
+The changes in this release focus on improving Globus *downloads*, i.e., transfers from Dataverse-linked Globus volumes to users' Globus collections. Most importantly, the mechanism of "Asynchronous Task Monitoring", first introduced in #10781 for *uploads*, has been extended to handle downloads as well. This generally makes downloads more reliable, specifically in how Dataverse manages temporary access rules granted to users, minimizing the risk of consequent downloads failing because of stale access rules left in place.
+
+Multiple other improvements have been made making the underlying Globus framework more reliable and robust.
+
+See `globus-use-experimental-async-framework` under [Feature Flags](https://guides.dataverse.org/en/6.6/installation/config.html#feature-flags) and [dataverse.files.globus-monitoring-server](https://guides.dataverse.org/en/6.6/installation/config.html#dataverse-files-globus-monitoring-server) in the Installation Guide, #11057, and #11125.
+
+### OIDC Bearer Tokens
+
+The release extends the OIDC API auth mechanism, available through feature flag `api-bearer-auth`, to properly handle cases where ``BearerTokenAuthMechanism`` successfully validates the token but cannot identify any Dataverse user because there is no account associated with the token.
+
+To register a new user who has authenticated via an OIDC provider, a new endpoint has been implemented (`/users/register`). A feature flag named `api-bearer-auth-provide-missing-claims` has been implemented to allow sending missing user claims in the request JSON. This is useful when the identity provider does not supply the necessary claims. However, this flag will only be considered if the `api-bearer-auth` feature flag is enabled. If the latter is not enabled, the `api-bearer-auth-provide-missing-claims` flag will be ignored.
+
+A feature flag named `api-bearer-auth-handle-tos-acceptance-in-idp` has been implemented. When enabled, it specifies that Terms of Service acceptance is managed by the identity provider, eliminating the need to explicitly include the acceptance in the user registration request JSON.
+
+See [the guides](https://guides.dataverse.org/en/6.6/api/auth.html#bearer-tokens), #10959, and #10972.
+
+### Signposting Output Now Contains Links to All Dataset Metadata Export Formats
+
+When Signposting was added in Dataverse 5.14 (#8981), it provided links only for the `schema.org` metadata export format.
+
+The output of HEAD, GET, and the Signposting "linkset" API have all been updated to include links to all available dataset metadata export formats, including any external exporters, such as Croissant, that have been enabled.
+
+This provides a lightweight machine-readable way to first retrieve a list of links, such as via a HTTP HEAD request, to each available metadata export format and then follow up with a request for the export format of interest.
+
+In addition, the content type for the `schema.org` dataset metadata export format has been corrected. It was `application/json` and now it is `application/ld+json`.
+
+See also [the guides](https://guides.dataverse.org/en/6.6/api/native-api.html#retrieve-signposting-information), #10542 and #11045.
+
+### Dataset Types Can Be Linked to Metadata Blocks
+
+Metadata blocks, such as  (e.g. "CodeMeta") can now be linked to dataset types (e.g. "software") using new superuser APIs.
+
+This will have the following effects for the APIs used by the [new Dataverse UI](https://github.com/IQSS/dataverse-frontend):
+
+- The list of fields shown when creating a dataset will include fields marked as "displayoncreate" (in the tsv/database) for metadata blocks (e.g. "CodeMeta") that are linked to the dataset type (e.g. "software") that is passed to the API.
+- The metadata blocks shown when editing a dataset will include metadata blocks (e.g. "CodeMeta") that are linked to the dataset type (e.g. "software") that is passed to the API.
+
+Mostly in order to write automated tests for the above, a [displayOnCreate](https://guides.dataverse.org/en/6.6/api/native-api.html#set-displayoncreate-for-a-dataset-field) API endpoint has been added.
+
+For more information, see the guides ([overview](https://guides.dataverse.org/en/6.6/user/dataset-management.html#dataset-types), [new APIs](https://guides.dataverse.org/en/6.6/api/native-api.html#link-dataset-type-with-metadata-blocks)), #10519 and #11001.
+
+### Other Features
+
+- In addition to the API [Move a Dataverse Collection](https://guides.dataverse.org/en/6.6/admin/dataverses-datasets.html#move-a-dataverse-collection), it is now possible for a Dataverse administrator to move a collection using the Dataverse dashboard. See #10304 and #11150.
+- The Preview URL popup and [related documentation](https://guides.dataverse.org/en/6.6/user/dataset-management.html#preview-url-to-review-unpublished-dataset) have been updated to give more information about anonymous access, including the names of the dataset fields that will be withheld from the Anonymous Preview URL user and to suggest how to review the URL before releasing it. See also #11159 and #11164.
+- [ROR](https://ror.org) (Research Organization Registry) has been added as an Author Identifier Type for when the author is an organization rather than a person. Like ORCID, ROR will appear in the "Datacite" metadata export format. See #11075 and #11118.
+- The publisher value of harvested datasets is now attributed to the dataset's distributor instead of its producer. This improves the citation associated with these datasets, but the change affects only newly harvested datasets. See "Upgrade Instructions" below on how to re-harvest. For more information, see [the guides](http://guides.dataverse.org/en/6.6/admin/harvestclients.html#harvesting-client-changelog), #8739, and #9013.
+- A new harvest status differentiates between a complete harvest with errors ("completed with failures") and without errors ("completed"). Also, harvest status labels are now internationalized. See #9294 and #11017.
+- The OAI-ORE exporter can now export metadata containing nested compound fields or compound fields within compound fields. See #10809 and #11190.
+- It is now possible to edit a custom role with the same alias. See #8808 and #10612.
+- The [Metadata Customization](https://guides.dataverse.org/en/6.6/admin/metadatacustomization.html#controlledvocabulary-enumerated-properties) documentation has been updated to explain how to implement a boolean fieldtype (look for "boolean"). See #7961 and #11064.
+- The version of Stata files is now detected during S3 direct upload (as it was for normal uploads), allowing ingest of Stata 14 and 15 files that have been uploaded directly. See [the guides](https://guides.dataverse.org/en/6.6/developers/big-data-support.html#features-that-are-disabled-if-s3-direct-upload-is-enabled) #10108, and #11054.
+- It is now possible to populate the "Keyword" metadata field from an [OntoPortal](https://ontoportal.org) service. The code has been shared to the GDCC [dataverse-external-vocab-support](https://github.com/gdcc/dataverse-external-vocab-support#scripts-in-production) GitHub repository. See #11258.
+- Support for legacy configuration of a PermaLink PID provider, such as using the :Protocol,:Authority, and :Shoulder settings, has been fixed. See #10516 and #10521.
+- On the home page for each guide (User Guide, etc.) there was an overwhelming amount of information in the form of a deeply nested table of contents. The depth of the table of contents has been reduced to two levels, making the home page for each guide more readable. Compare the User Guide for [6.5](https://guides.dataverse.org/en/6.5/user/index.html) vs. [6.6](https://guides.dataverse.org/en/6.6/user/index.html) and see #11166.
+- For compliance with GDPR and other privacy regulations, advice on adding a cookie consent popup has been added to the guides. See the new [cookie consent](https://guides.dataverse.org/en/6.6/installation/config.html#adding-cookie-consent-for-gdpr-etc) section and #10320.
+- A new file has been added to import the French Open License to Dataverse: licenseEtalab-2.0.json. You can download it from [the guides](http://guides.dataverse.org/en/6.6/installation/config.html#adding-licenses). This license, which is compatible with the Creative Commons license, is recommended by the French government for open documents. See #9301, #9302, and #11302.
+- The API that lists versions of a dataset now features an optional `excludeMetadataBlocks` parameter, which defaults to "false" for backward compatibility. For a dataset with a large number of versions and/or metadataBlocks, having the metadata blocks included can dramatically increase the volume of the output. See also [the guides](https://guides.dataverse.org/en/6.6/api/native-api.html#list-versions-of-a-dataset), #10171, and #10778.
+- Deeply nested metadata fields are not supported but the code used to generate the Solr schema has been adjusted to support them. See #11136.
+- The [tutorial](https://guides.dataverse.org/en/6.6/container/running/demo.html) on running Dataverse in Docker has been updated to explain how to configure the root collection using a JSON file (#10541 and #11201) and now uses the Permalink PID provider instead of the FAKE DOI Provider (#11107 and #11108).
+- Payara application server has been upgraded to version 6.2025.2. See #11126 and #11128.
+- Solr has been upgraded to version 9.8.0. See #10713.
+- For testing purposes, the FAKE PID provider can now be used with [file PIDs enabled](https://guides.dataverse.org/en/6.6/installation/config.html#filepidsenabled). (The FAKE provider is not recommended for any production use.) See #10979.
+
+## Bugs Fixed
+
+- A bug which causes users of the Anonymous Review URL to have some metadata of published datasets withheld has been fixed. See #11202 and #11164.
+- A bug that caused ORCIDs starting with "https://orcid.org/" entered as author identifier to be ignored when creating the DataCite metadata has been fixed. This primarily affected users of the ORCID external vocabulary script; for the manual entry form, we used to recommend not using the URL form. The display of authorIdentifier, when not using any external vocabulary scripts, has been improved so that either the plain identifier (e.g. "0000-0002-1825-0097") or its URL form (e.g. "https://orcid.org/0000-0002-1825-0097") will result in valid links in the display (for identifier types that have a URL form). The URL form is now [recommended](http://guides.dataverse.org/en/6.6/user/dataset-management.html#adding-a-new-dataset) when doing manual entry. See #11242 and #11242.
+- Multiple small issues with the formatting of PIDs in the DDI exporters, and EndNote and BibTeX citation formats have been addressed. These should improve the ability to import Dataverse citations into reference managers and fix potential issues harvesting datasets using PermaLinks. See #10768, #10769, #11165, and #10790.
+- On the Advanced Search page, the metadata fields are now displayed in the correct order as defined in the TSV file via the displayOrder value, making the order the same as when you view or edit metadata. Note that fields that are not defined in the TSV file, like the "Persistent ID" and "Publication Date", will be displayed at the end. See #11272 and #11279.
+- Bugs that caused 1) guestbook questions to appear along with terms of use/terms of access in the request access dialog when no guestbook was configured, and 2) terms of access to not be shown when using the per-file request access/download menu items have been fixed. Text related to configuring the choice to have guestbooks appear when file access is requested or when files are downloaded has been updated to make it clearer that this affects only datasets where guestbooks have been configured. See #11203.
+- The file page version table now shows whether a file has been replaced. See #11142 and #11145.
+- We fixed an issue where draft versions of datasets were sorted using the release timestamp of their most recent major version. This caused newer drafts to appear incorrectly alongside their corresponding major version, instead of at the top, when sorted by "newest first". Sorting now uses the last update timestamp when sorting draft datasets. The sorting behavior of published major and minor dataset versions is unchanged. There is no need to reindex datasets because Solr is being upgraded (see "Upgrade Instructions"), which will result in an empty database that will be reindexed. See #11178.
+- Some external controlled vocabulary scripts/configurations, when used on a metadata field that is single-valued, could result in indexing failure for the dataset, e.g. when the script tried to index both the identifier and name of the identified entity for indexing. Dataverse has been updated to correctly indicate the need for a multi-valued Solr field in these cases in the call to `/api/admin/index/solr/schema`. Configuring the Solr schema and running the update-fields.sh script as usually recommended when using custom metadata blocks (see "Upgrade Instructions") will resolve the issue. See [the guides](https://guides.dataverse.org/en/6.6/admin/metadatacustomization.html#using-external-vocabulary-services), #11095, and #11096.
+- The OpenAIRE metadata export format can now correctly process one or multiple productionPlaces as geolocation. See #9546 and #11194
+- We fixed a bug that caused adding free-form provenance to a file to fail. See #11145.
+- A bug has been fixed which could cause publication of datasets to fail in cases where they were not assigned a DOI at creation. See #11234 and #11236.
+- When users request access to files, the people who have permission to grant access received an email with a link that didn't work due to a trailing period (full stop) right next to the link, e.g. `https://demo.dataverse.org/permissions-manage-files.xhtml?id=9.` A space has been added to fix this. See #10384 and #11115.
+- Harvesting clients now use the correct granularity while re-running a partial harvest, using the `from` parameter. The correct granularity comes from the `Identify` verb request. See #11020 and #11038.
+- Access requests were missing on the File Permission page after upgrading from Dataverse 6.0. This has been corrected with a database update script. See #10714 and #11061.
+- When a dataset has a long running lock, including when it is "in review", Dataverse will now slow the page refresh rate over time. See #11264 and #11269.
+- The `/api/info/metrics/files/monthly` API call had a bug that resulted in files being counted each time they were published in a new version if those publication events occurred in different months. This resulted in an over-count. The `/api/info/metrics/files` and `/api/info/metrics/files/toMonth` API calls had a bug that resulted in files that were published but no longer in the latest published version as of the specified date (now, or the date entered in the `/toMonth` variant). This resulted in an under-count. See #11189.
+- DatasetFieldTypes in MetadataBlock response that are also a child of another DatasetFieldType were being returned twice. The child DatasetFieldType was included in the "fields" object as well as in the "childFields" of its parent DatasetFieldType. This fix suppresses the standalone object so only one instance of the DatasetFieldType is returned (in the "childFields" of its parent). This fix changes the JSON output of the API `/api/dataverses/{dataverseAlias}/metadatablocks` (see "Backward Incompatible Changes", below). See #10472 and #11066.
+- A bug that caused replacing files via API when file PIDs were enabled to fail has been fixed. See #10975 and #10979.
+- The [:CustomDatasetSummaryFields](https://guides.dataverse.org/en/6.6/installation/config.html#customdatasetsummaryfields) setting now allows spaces along with a comma separating field names. In addition, a bug that caused license information to be hidden if there are no values for any of the custom fields specified has been fixed. See #11228 and #11229.
+- Dataverse 6.5 introduced a bug which causes search to fail for non-superusers in multiple groups when the `AVOID_EXPENSIVE_SOLR_JOIN` feature flag is set to true. This release fixes the bug. See #11133 and #11134.
+- We fixed a bug with My Data where listing collections for a user with only rights on harvested collections would result in a server error response. See #11083.
+- Minor styling fixes for the Related Publication field and fields using ORCID or ROR have been made. See #11053, #10964, and #11106.
+- In the Search API, files were displaying DRAFT version instead of latest released version under `dataset_citation`. See #10735 and #11051.
+- Unnecessary Solr documents were being created when a file was added or deleted from a draft dataset. These documents could accumulate and potentially impact performance. There is no action to take because this release includes a new Solr version, which will start with an empty database. See #11113 and #11114.
+- When using the API to update a collection, omitting optional fields such as `inputLevels`, `facetIds`, or `metadataBlockNames` caused data to be deleted. The fix no longer deletes data for these fields. Two new flags have been added to the `metadataBlocks` JSON object to signal the deletion of the data: `inheritMetadataBlocksFromParent: true` and `inheritFacetsFromParent: true`. See [the guides](https://guides.dataverse.org/en/6.6/api/native-api.html#update-a-dataverse-collection), #11130, and #11144.
+
+## API Updates
+
+### Search API Returns Additional Fields for Files
+
+Added new fields to search results type=files
+
+For Files:
+
+- restricted: boolean
+- canDownloadFile: boolean (from file user permission)
+- categories: array of string "categories" would be similar to what it is in metadata api.
+
+For tabular files:
+
+- tabularTags: array of string for example, `{"tabularTags" : ["Event", "Genomics", "Geospatial"]}`
+- variables: number/int shows how many variables we have for the tabular file
+- observations: number/int shows how many observations for the tabular file
+
+See #11027 and #11097.
+
+### Backend Support for Collection Featured Items
+
+CRUD endpoints for Collection Featured Items have been implemented. In particular, the following endpoints have been implemented:
+
+- Create a feature item (POST `/api/dataverses/<dataverse_id>/featuredItems`)
+- Update a feature item (PUT `/api/dataverseFeaturedItems/<item_id>`)
+- Delete a feature item (DELETE `/api/dataverseFeaturedItems/<item_id>`)
+- List all featured items in a collection (GET `/api/dataverses/<dataverse_id>/featuredItems`)
+- Delete all featured items in a collection (DELETE `/api/dataverses/<dataverse_id>/featuredItems`)
+- Update all featured items in a collection (PUT `/api/dataverses/<dataverse_id>/featuredItems`)
+
+See also the "Settings Added" section, #10943 and #11124.
+
+### Other API Updates
+
+- Multiple files can be deleted from a dataset at once. See the [the guides](https://guides.dataverse.org/en/6.6/api/native-api.html#delete-files-from-a-dataset) and #11230.
+- An API has been added to get the "classic" download count from a dataset with an optional `includeMDC` parameter (for Make Data Count). See [the guides](http://guides.dataverse.org/en/6.6/api/native-api.html#get-the-download-count-of-a-dataset), #11244 and #11282.
+- An API has been added that lists the collections that the user has access to via the permission passed. See [the guides](http://guides.dataverse.org/en/6.6/api/native-api.html#list-dataverse-collections-a-user-can-act-on-based-on-their-permissions), #6467, and #10906.
+- An API has been added to get dataset versions including a summary of differences between consecutive versions where available. See [the docs](https://guides.dataverse.org/en/6.6/api/native-api.html#get-versions-of-a-dataset-with-summary-of-changes ), #10888, and #10945.
+- An API has been added to list of versions of a data file showing any changes that affected the file with each version. See [the guides](https://guides.dataverse.org/en/6.6/api/native-api.html#get-json-representation-of-a-file-s-versions), #11198 and #11237.
+- The Search API has a new [parameter](https://guides.dataverse.org/en/6.6/api/search.html#parameters) called `show_type_counts`. If you set it to true, it will return `total_count_per_object_type` for the types dataverse, dataset, and files (#11065 and #11082) even if the search result for any given type is 0 (#11127 and #11138).
+- CRUD operations for external tools are now available for superusers from non-localhost. See [the guides](https://guides.dataverse.org/en/6.6/admin/external-tools.html#managing-external-tools), #10930 and #11079.
+- A new API endpoint has been added that allows a global role to be updated. See [the guides](https://guides.dataverse.org/en/6.6/api/native-api.html#update-global-role) and #10612.
+- An API has been added to send feedback to the collection, dataset, or data file's contacts. If necessary, you can [rate limit](https://guides.dataverse.org/en/6.6/installation/config.html#rate-limiting) the `CheckRateLimitForDatasetFeedbackCommand` and configure the new [:ContactFeedbackMessageSizeLimit](https://guides.dataverse.org/en/6.6/installation/config.html#contactfeedbackmessagesizelimit) database setting. See [the guides](http://guides.dataverse.org/en/6.6/api/native-api.html#send-feedback-to-contact-s), #11129, and #11162.
+- /api/metadatablocks is no longer returning duplicated metadata properties and does not omit metadata properties when called. See "Backward Incompatible Changes" below and #10764.
+- A new query param, `returnChildCount`, has been added to the getDataverse endpoint (`/api/dataverses/{id}`) for optionally retrieving the child count, which represents the number of collections, datasets, or files within the collection (direct children only). See also #11255 and #11259.
+
+## End-Of-Life (EOL) Announcements
+
+### PostgreSQL 13 reaches EOL on 13 November 2025
+
+Per <https://www.postgresql.org/support/versioning/> PostgreSQL 13 reaches EOL on 13 November 2025. Our first step toward moving off version 13 was to [switch](https://github.com/gdcc/dataverse-ansible/commit/8ebbd84ad2cf3903b8f995f0d34578250f4223ff) our testing to version 16, as we've [noted](https://guides.dataverse.org/en/6.6/installation/prerequisites.html#postgresql) in the guides. You are encouraged to start planning your upgrade and may want to review the [Dataverse 5.4 release notes](https://github.com/IQSS/dataverse/releases/tag/v5.4) as the upgrade process (e.g. `pg_dumpall`, etc.) will likely be similar. If you notice any bumps along the way, please let us know!
+
+Dataverse developers [using Docker](https://guides.dataverse.org/en/6.6/container/dev-usage.html) have been using PostgreSQL 17 since Dataverse 6.5 (#10912). (Developers not using Docker who are still on PostgreSQL 13 are encouraged to upgrade.) Older or newer versions should work, within reason.
+
+See also #11212 and #11215.
+
+## Security
+
+### SameSite Cookie Attribute
+
+The SameSite cookie attribute is defined in an upcoming revision to [RFC 6265](https://datatracker.ietf.org/doc/html/rfc6265) (HTTP State Management Mechanism) called [6265bis](https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-rfc6265bis-19>) ("bis" meaning "repeated"). The possible values are "None", "Lax", and "Strict".
+
+"If no SameSite attribute is set, the cookie is treated as Lax by default" by browsers according to [MDN](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#controlling_third-party_cookies_with_samesite). This was the previous behavior of Dataverse, to not set the SameSite attribute.
+
+New Dataverse installations now explicitly set to the SameSite cookie attribute to "Lax" out of the box through the installer (in the case of a "classic" installation) or through an updated base image (in the case of a Docker installation). Classic installations should follow the upgrade instructions below to bring their installation up to date with the behavior for new installations. Docker installations will automatically get the updated base image.
+
+While you are welcome to experiment with "Strict", which is intended to help prevent Cross-Site Request Forgery (CSRF) attacks, as described in the RFC proposal and an OWASP [cheatsheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#samesite-cookie-attribute), our testing so far indicates that some functionality, such as OIDC login, seems to be incompatible with "Strict".
+
+You should avoid the use of "None" as it is less secure than "Lax". See also [the guides](https://guides.dataverse.org/en/6.6/installation/config.html#samesite-cookie-attribute), https://github.com/IQSS/dataverse-security/issues/27, #11210, and the upgrade instructions below.
+
+## Settings Added
+
+- dataverse.feature.enable-version-note
+- dataverse.csl.common-styles
+- dataverse.files.featured-items.image-maxsize - It sets the maximum allowed size of the image that can be added to a featured item.
+- dataverse.files.featured-items.image-uploads - It specifies the name of the subdirectory for saving featured item images within the docroot directory.
+- dataverse.feature.api-bearer-auth-provide-missing-claims
+- dataverse.feature.api-bearer-auth-handle-tos-acceptance-in-idp
+- :ContactFeedbackMessageSizeLimit
+
+## Backward Incompatible Changes
+
+Generally speaking, see the [API Changelog](https://guides.dataverse.org/en/latest/api/changelog.html) for a list of backward-incompatible API changes.
+
+- /api/metadatablocks is no longer returning duplicated metadata properties and does not omit metadata properties when called. See #10764.
+- The JSON response of API call `/api/dataverses/{dataverseAlias}/metadatablocks` will no longer include the DatasetFieldTypes in "fields" if they are children of another DatasetFieldType. The child DatasetFieldType will only be included in the "childFields" of its parent DatasetFieldType. See #10472 and #11066.
+- `versionNote` has been renamed to `deaccessionNote`. `archiveNote` has been renamed to `deaccessionLink`. See #11068.
+- The [Show Role](https://guides.dataverse.org/en/6.6/api/native-api.html#show-role) API endpoint was returning 401 Unauthorized when a permission check failed. This has been corrected to return 403 Forbidden instead. That is, the API token is known to be good (401 otherwise) but the user lacks permission (403 is now sent). See also the [API Changelog](https://guides.dataverse.org/en/6.6/11116/api/changelog.html), #10340, and #11116.
+- Changes to PID formatting occur in the DDI/DDI Html export formats and the EndNote and BibTex citation formats. These changes correct errors and improve conformance with best practices but could break parsing of these formats. See #10768, #10769, #11165, and #10790.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [6.6 milestone](https://github.com/IQSS/dataverse/issues?q=milestone%3A6.6+is%3Aclosed) in GitHub.
+
+## Getting Help
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/g/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please follow our [Installation Guide](https://guides.dataverse.org/en/latest/installation/). Please don't be shy about [asking for help](https://guides.dataverse.org/en/latest/installation/intro.html#getting-help) if you need it!
+
+Once you are in production, we would be delighted to update our [map of Dataverse installations](https://dataverse.org/installations) around the world to include yours! Please [create an issue](https://github.com/IQSS/dataverse-installations/issues) or email us at support@dataverse.org to join the club!
+
+You are also very welcome to join the [Global Dataverse Community Consortium](https://www.gdcc.io/) (GDCC).
+
+## Upgrade Instructions
+
+Upgrading requires a maintenance window and downtime. Please plan accordingly, create backups of your database, etc.
+
+These instructions assume that you've already upgraded through all the 5.x releases and are now running Dataverse 6.5.
+
+0\. These instructions assume that you are upgrading from the immediate previous version. If you are running an earlier version, the only supported way to upgrade is to progress through the upgrades to all the releases in between before attempting the upgrade to this version.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. By default, Payara runs as the `dataverse` user. In the commands below, we use sudo to run the commands as a non-root user.
+
+Also, we assume that Payara 6 is installed in `/usr/local/payara6`. If not, adjust as needed.
+
+```shell
+export PAYARA=/usr/local/payara6
+```
+
+(or `setenv PAYARA /usr/local/payara6` if you are using a `csh`-like shell)
+
+1\. List deployed applications
+
+```shell
+$PAYARA/bin/asadmin list-applications
+```
+
+2\. Undeploy the previous version (should match "list-applications" above)
+
+```shell
+$PAYARA/bin/asadmin undeploy dataverse-6.5
+```
+
+3\. Stop Payara
+
+```shell
+sudo service payara stop
+```
+
+4\. Upgrade to Payara 6.2025.2
+
+The steps below reuse your existing domain directory with the new distribution of Payara. You may also want to review the Payara upgrade instructions as it could be helpful during any troubleshooting:
+[Payara Release Notes](https://docs.payara.fish/community/docs/6.2025.2/Release%20Notes/Release%20Notes%206.2025.2.html).
+We also recommend you ensure you followed all update instructions from the past releases regarding Payara.
+(The most recent Payara update was for [v6.3](https://github.com/IQSS/dataverse/releases/tag/v6.3).)
+
+Move the current Payara directory out of the way:
+
+```shell
+mv $PAYARA $PAYARA.6.2024.6
+```
+
+Download the new Payara version 6.2025.2 (from https://www.payara.fish/downloads/payara-platform-community-edition/ or https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.2/payara-6.2025.2.zip), and unzip it in its place:
+
+```shell
+cd /usr/local
+unzip payara-6.2025.2.zip
+```
+
+Replace the brand new `payara/glassfish/domains/domain1` with your old, preserved domain1:
+
+```shell
+mv payara6/glassfish/domains/domain1 payara6/glassfish/domains/domain1_DIST
+mv payara6.6.2024.6/glassfish/domains/domain1 payara6/glassfish/domains/
+```
+
+5\. Download and deploy this version
+
+```shell
+wget https://github.com/IQSS/dataverse/releases/download/v6.6/dataverse-6.6.war
+$PAYARA/bin/asadmin deploy dataverse-6.6.war
+```
+
+Note: if you have any trouble deploying, stop Payara, remove the following directories, start Payara, and try to deploy again.
+
+```shell
+sudo service payara stop
+sudo rm -rf $PAYARA/glassfish/domains/domain1/generated
+sudo rm -rf $PAYARA/glassfish/domains/domain1/osgi-cache
+sudo rm -rf $PAYARA/glassfish/domains/domain1/lib/databases
+sudo service payara start
+```
+
+6\. For installations with internationalization or text customizations:
+
+Please remember to update translations via [Dataverse language packs](https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs).
+
+If you have text customizations you can get the latest English files from <https://github.com/IQSS/dataverse/tree/v6.6/src/main/java/propertyFiles>.
+
+7\. Decide to enable (or not) the `index-harvested-metadata-source` feature flag
+
+Decide whether or not to enable the `dataverse.feature.index-harvested-metadata-source` feature flag described above, in [the guides](https://guides.dataverse.org/en/6.6/installation/config.html#feature-flags), #10217 and #11217. The reason to decide now is that reindexing is required and the next steps involve restarting Payara and upgrading Solr, which will result in a fresh index.
+
+8\. Configure SameSite
+
+To bring your Dataverse installation in line with new installations, as described above and in [the guides](https://guides.dataverse.org/en/6.6/installation/config.html#samesite-cookie-attribute), we recommend running the following commands:
+
+```
+./asadmin set server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-value=Lax
+
+./asadmin set server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-enabled=true
+```
+
+Please note that "None" is less secure than "Lax" and should be avoided. You can test the setting by inspecting headers with curl, looking at the JSESSIONID cookie for "SameSite=Lax" (yes, it's expected to be repeated, probably due to a bug in Payara) like this:
+
+```
+% curl -s -I http://localhost:8080 | grep JSESSIONID
+Set-Cookie: JSESSIONID=6574324d75aebeb86dc96ecb3bb0; Path=/;SameSite=Lax;SameSite=Lax
+```
+
+Before making the changes above, SameSite attribute should be absent, like this:
+
+```
+% curl -s -I http://localhost:8080 | grep JSESSIONID
+Set-Cookie: JSESSIONID=6574324d75aebeb86dc96ecb3bb0; Path=/
+```
+
+8\. Restart Payara
+
+```shell
+sudo service payara stop
+sudo service payara start
+```
+
+9\. Update metadata blocks
+
+These changes reflect incremental improvements made to the handling of core metadata fields.
+
+Expect the loading of the citation block to take several seconds because of its size (especially due to the number of languages).
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.6/scripts/api/data/metadatablocks/citation.tsv
+
+curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file citation.tsv
+```
+
+The 3D Objects metadata block is included in all new installations of Dataverse so we recommend adding it.
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.6/scripts/api/data/metadatablocks/3d_objects.tsv
+
+curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file 3d_objects.tsv
+```
+
+10\. Upgrade Solr
+
+Solr 9.8.0 is now the version recommended in our Installation Guide and used with automated testing. Additionally, due to the new range search support feature and the addition of fields (e.g. versionNote, fileRestricted, canDownloadFile, variableCount, and observations), the default `schema.xml` files has changed so you must upgrade.
+
+Install Solr 9.8.0 following the [instructions](https://guides.dataverse.org/en/6.6/installation/prerequisites.html#solr) from the Installation Guide.
+
+The instructions in the guide suggest to use the config files from the installer zip bundle. When upgrading an existing instance, it may be easier to download them from the source tree:
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.6/conf/solr/solrconfig.xml
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.6/conf/solr/schema.xml
+cp solrconfig.xml schema.xml /usr/local/solr/solr-9.8.0/server/solr/collection1/conf
+```
+
+10a\. For installations with additional metadata blocks or external controlled vocabulary scripts, update fields
+
+- Stop Solr instance (usually `service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/6.6/installation/prerequisites.html#solr-init-script)).
+
+- Run the `update-fields.sh` script that we supply, as in the example below (modify the command lines as needed to reflect the correct path of your Solr installation):
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.6/conf/solr/update-fields.sh
+chmod +x update-fields.sh
+curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-9.8.0/server/solr/collection1/conf/schema.xml
+```
+
+- Start Solr instance (usually `service solr start` depending on Solr/OS).
+
+11\. Reindex Solr
+
+```shell
+curl http://localhost:8080/api/admin/index
+```
+
+12\. Run reExportAll to update dataset metadata exports
+
+For existing published datasets, additional license metadata will not be available from DataCite or in metadata exports until
+
+- the dataset is republished or
+- the /api/admin/metadata/{id}/reExportDataset is run for the dataset or
+- the /api/datasets/{id}/modifyRegistrationMetadata API is run for the dataset or
+- the global version of these API calls (/api/admin/metadata/reExportAll, /api/datasets/modifyRegistrationPIDMetadataAll) are used.
+
+For this reason, we recommend reexporting all dataset metadata. For more advanced usage, please see [the guides](http://guides.dataverse.org/en/6.6/admin/metadataexport.html#batch-exports-through-the-api).
+
+```shell
+curl http://localhost:8080/api/admin/metadata/reExportAll
+```
+
+13\. (Optional) Re-harvest datasets
+
+The publisher value of harvested datasets is now attributed to the dataset's distributor instead of its producer. For more information, see [the guides](http://guides.dataverse.org/en/6.6/admin/harvestclients.html#harvesting-client-changelog), #8739, and #9013.
+
+This improves the citation associated with these datasets, but the change only affects newly harvested datasets.
+
+If you would like to pick up this change for existing harvested datasets, you should re-harvest them. This can be accomplished by deleting and re-adding each harvesting client, followed by a harvesting run. You may want to use [harvesting client APIs](https://guides.dataverse.org/en/6.6/api/native-api.html#managing-harvesting-clients) to save (serialize), add, and remove clients.
diff --git a/doc/release-notes/6.7-release-notes.md b/doc/release-notes/6.7-release-notes.md
new file mode 100644
index 00000000000..6422102dbc1
--- /dev/null
+++ b/doc/release-notes/6.7-release-notes.md
@@ -0,0 +1,661 @@
+# Dataverse 6.7
+
+Please note: To read these instructions in full, please go to https://github.com/IQSS/dataverse/releases/tag/v6.7 rather than the [list of releases](https://github.com/IQSS/dataverse/releases), which will cut them off.
+
+This release brings new features, enhancements, and bug fixes to Dataverse. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project!
+
+## Release Highlights
+
+Highlights for Dataverse 6.7 include:
+
+- Keeping S3 storage working after December 2025
+- Limiting files per dataset
+- Curation status label enhancements
+- Configurable search services
+- Linking drafts
+- Dataset metadata exports from drafts
+- API for switching Datasets to DOIs, for example
+- TK Labels
+- Model Context Protocol (MCP) server
+- A new AI Guide
+- OJS 3 is now a supported integration
+- Tagged Docker images
+- Rate limiting statistics API
+- Infrastructure: Payara upgraded to 6.2025.3
+- Security fixes
+
+## Features Added
+
+### Keep S3 Storage Working After December 2025
+
+To support S3 storage, Dataverse uses the AWS SDK. We have upgraded to v2 of this SDK because v1 reaches End Of Life (EOL) in [December 2025](https://aws.amazon.com/fr/blogs/developer/announcing-end-of-support-for-aws-sdk-for-java-v1-x-on-december-31-2025/).
+
+As part of the upgrade, the payload-signing setting for S3 stores (`dataverse.files.<id>.payload-signing`) has been removed because it is no longer necessary. With the updated SDK, a payload signature will automatically be sent when required (and not sent when not required).
+
+Dataverse developers should note that LocalStack is used to test S3 and older versions appear to be incompatible. The development environment has been upgraded to LocalStack v2.3.2 to v4.2.0, which seems to work fine.
+
+See also #11073 and #11360.
+
+### Limiting Files Per Dataset
+
+It's now possible to set a limit on the number of files that can be uploaded to a dataset. Limits can be set globally, per collection, or per dataset.
+
+See also [the guides](https://guides.dataverse.org/en/6.7/api/native-api.html#imposing-a-limit-to-the-number-of-files-allowed-to-be-uploaded-to-a-dataset), #11275, and #11359.
+
+### Curation Status Label Enhancements
+
+The External/Curation Status Label mechanism has been enhanced:
+
+- adding tracking of who creates the status label and when
+- keeping a history of past statuses
+- updating the CSV report to include the creation time and assigner of a status
+- updating the [getCurationStatus API call](https://guides.dataverse.org/en/6.7/api/curation-labels.html#get-a-draft-dataset-s-curation-status) to return a JSON object for the status with label, assigner, and create time
+- adding an includeHistory query param for these API calls to allow seeing prior statuses
+- adding a facet to allow filtering by curation status (for users able to set them)
+- adding the creation time to Solr as a `pdate` to support search by time period, e.g. current status set prior to a given date
+- standardizing the language around "curation status" vs "external status"
+- adding a "curation-status" class to displayed labels to allow styling
+- adding a `dataverse.ui.show-curation-status-to-all` feature flag that allows users who can see a draft but not publish it to also view the curation status
+
+Due to changes in the Solr schema (the addition of fields "curationStatus" and "curationStatusCreateTime"), updating the Solr schema and reindexing is required as described below in upgrade instructions. Background reindexing should be OK. See also #9247 and #11268.
+
+### Configurable Search Services
+
+Dataverse now has an experimental capability to dynamically add and configure new search engines. The current Dataverse user interface can be configured to use a specified search engine instead of the built-in solr search. The Search API now supports an optional `searchService` query parameter that allows using any configured search engine. An additional /api/search/services endpoint allows discovery of the services installed.
+
+In addition to two trivial example services designed for testing, Dataverse ships with two search engine classes that support calling an externally-hosted search service (via HTTP GET or POST). These classes rely on the internal `solr` search to perform access-control and to format the final results, simplifying development of such an external engine.
+
+Details about the new functionality are described in [the guides](https://guides.dataverse.org/en/6.7/developers/search-services.html). See also #11281.
+
+### Linking Drafts
+
+It is now possible to link draft datasets to other Dataverse collections. As usual, the datasets will only become publicly visible in the linked collection(s) after they have been published. To publish a linked dataset, your account must have the "Publish Dataset" permission for the Dataverse collection in which the dataset was originally created. Permissions in the linked Dataverse collections do not apply. See also #10134.
+
+### Dataset Metadata Can Be Exported From Draft Datasets (via API)
+
+In previous versions of Dataverse, it was only possible to export metadata from published datasets. It is now possible to export metadata from draft datasets via API as long as you supply an API token that has access to the draft. As before, when exporting metadata from published datasets, only the latest published version is supported. Internal exporters have been updated to work with drafts but external exporters might need to be updated (Croissant definitely does). See "upgrade instructions" below for details. See [the guides](https://guides.dataverse.org/en/6.7/api/native-api.html#export-metadata-of-a-dataset-in-various-formats), #11305, and #11398.
+
+### API for Switching Datasets to DOIs, for Example
+
+In some cases, you might want draft datasets to begin their life with a zero-cost PIDs such as Permalinks and later decide to give certain datasets a DOI. To support use cases like this, a new API for persistent identifier reconciliation has been added.
+
+Here's how it works. An unpublished dataset can be updated with a new pidProvider. If a persistent identifier was already registered when the dataset was registered, this is undone and the new provider (if changed in the meantime) is used. Note that this change does not affect the storage repository where the old identifier is still used. See [the guides](https://guides.dataverse.org/en/6.7/api/native-api.html#reconcile-the-pid-of-a-dataset-if-multiple-pid-providers-are-enabled), #10501, and #10567.
+
+### TK Labels
+
+New API calls to find projects at https://localcontextshub.org associated with a dataset have been added. This supports integration via
+an external vocabulary script that allows users to associate such a project with their dataset and display the associated Notices and Tribal Knowledge Labels.
+
+Connecting to LocalContexts requires a LocalContexts API Key. Using both the production and sandbox (test) LocalContexts servers are supported.
+
+See also [the guides](https://guides.dataverse.org/en/6.7/installation/localcontexts.html) and #11294.
+
+### Model Context Protocol (MCP) Server for Dataverse
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is a standard for AI Agents to communicate with tools and services, [announced](https://www.anthropic.com/news/model-context-protocol) in November 2024.
+
+An MCP server for Dataverse has been deployed to https://mcp.dataverse.org, powered by the code at https://github.com/gdcc/mcp-dataverse written by Vyacheslav Tykhonov.
+
+All are welcome to experiment with the MCP Server and give feedback in the thread on [Google Group](https://groups.google.com/g/dataverse-community/c/BPne_ofDqjk/m/FGorv3mzAgAJ) and [Zulip](https://dataverse.zulipchat.com/#narrow/channel/375707-community/topic/MCP.20.28Model.20Context.20Protocol.29/near/522831393). See also #11474.
+
+### AI Guide
+
+Information about various Dataverse-related AI efforts have been documented in a new [AI Guide](https://guides.dataverse.org/en/6.7/11541/ai/index.html). See also #11540 and #11541.
+
+### OJS 3 is Supported
+
+OJS 3 (version 3.3 and higher) is now supported as an integration with Dataverse. See [the guides](https://guides.dataverse.org/en/6.7/admin/integrations.html#open-journal-systems-ojs) and #11518 for details.
+
+### Tagged Docker Images
+
+Container image management has been enhanced to provide better support for multiple Dataverse releases and improved maintenance workflows.
+
+**Versioned Image Tags**: Application ("dataverse") and Config Baker [images on Docker Hub](https://hub.docker.com/u/gdcc) now have versioned tags, supporting the latest three Dataverse software releases. This enables users to pin to specific versions (e.g. 6.7), providing better stability for production deployments. Previously, the "alpha" tag could be used, but it was always overwritten by the latest release. Now, you can choose the 6.7 tag, for example, to stay on that version. Please note that the "alpha" tag should no longer be used and will likely be deleted. The equivalent is the new "latest" tag.
+
+**Backport Support**: Application and Config Baker image builds now support including code backports for past releases, enabling the delivery of security fixes and critical updates to older (supported) versions.
+
+**Enhanced Documentation**: Container image [documentation](https://guides.dataverse.org/en/6.7/container/index.html) has been updated to reflect the new versioning scheme and maintenance processes.
+
+**Config Baker Base Image Change**: The Config Baker image has been migrated from Alpine to Ubuntu as its base operating system, aligning with other container images in the project for consistency and better compatibility. The past releases have not been migrated, only future releases (6.7+) will use Ubuntu.
+
+**Workflow Responsibility Split**: GitHub Actions workflows for containers have been reorganized with a clear separation of concerns:
+
+- `container_maintenance.yml` handles all release-time and maintenance activities
+- Other workflows focus solely on preview images for development merges and pull requests
+
+These improvements provide more robust container image lifecycle management, better security update delivery, and clearer operational procedures for both development and production environments.
+See also the [Container Guide](https://guides.dataverse.org/en/6.7/container/index.html), #10618, and #11477.
+
+### Rate Limiting Statistics API
+
+A new Rate Limiting Statistics API gives insight into the current state of rate limiting such as the number of users being limited and the number of available bucket tokens for a command.
+
+See also [the guides](https://guides.dataverse.org/en/6.7/admin/rate-limiting.html), #11413, and #11424.
+
+### Payara 6.2025.3
+
+The recommended Payara version has been updated to Payara-6.2025.3. See the upgrade instructions below and #11357.
+
+### Rclone Support
+
+Rclone ("rsync for cloud storage") is a command-line program to sync files and directories to and from different cloud storage providers. As of version 1.70 Rclone supports Dataverse. See [the announcement](https://groups.google.com/g/dataverse-community/c/IoxF85arJhA/m/QFD6vP-bBQAJ), [the guides](https://guides.dataverse.org/en/6.7/admin/integrations.html#rclone), #11608, and #11609.
+
+### Unique Filenames for Zip Downloads
+
+The Data Access APIs that generate multi-file zipped bundles will offer file name suggestions based on the persistent identifiers (for example, `doi-10.70122-fk2-xxyyzz.zip`), instead of the fixed filename `dataverse_files.zip` as in prior versions. This means you'll see unique names in your "downloads" folder. See [the guides](https://guides.dataverse.org/en/6.7/api/dataaccess.html#downloading-all-files-in-a-dataset), #9620, and #11466.
+
+### New Metadata Field Type: String
+
+The "string" type has been added as a new field type for metadata fields.
+
+In contrast to "text" fields, "string" fields are stored and indexed exactly as provided, without any text analysis or transformations.
+
+This field type is suitable for fields like IDs (e.g. ORCIDs) or enums, where exact matches are required when searching.
+
+See also #11147 and #11321.
+
+### Tabular Tags Can Now Be Replaced
+
+Previously the API POST /files/{id}/metadata/tabularTags could only add new tags to the tabular tags list. Now with the query parameter ?replace=true the list of tags will be replaced.
+
+See also [the guides](https://guides.dataverse.org/en/6.7/api/native-api.html#updating-file-tabular-tags), #11292, and #11359.
+
+### Make Data Count Improvements
+
+Counter Processor, used to power Make Data Count metrics in Dataverse, is now maintained in the https://github.com/gdcc/counter-processor repository. Multiple improvements to efficiency and scalability have been made. The example `counter_daily.sh` and `counter_weekly.sh` scripts that automate using Counter Processor, available from the [MDC section](https://guides.dataverse.org/en/6.7/admin/make-data-count.html) of the Dataverse Guides have been updated to work with the latest Counter Processor release and also have minor improvements. See also #11489.
+
+### Improved Navigation for Guides
+
+Navigation across [the guides](https://guides.dataverse.org/en/6.7) has been improved. You can now click in the upper left to go "home". The navbar has been simplified with fewer links. The bottom of every page now has "Next" and "Previous" links. A "Source" link at the bottom has also been added. See also #10942.
+
+### Video Subtitles (vtt Files)
+
+Video subtitles (vtt files) are now supported and indexed using full text indexing, if [configured](https://guides.dataverse.org/en/6.7/installation/config.html#solrfulltextindexing).
+
+All new files uploaded with a .vtt extension will be assigned the context type "text/vtt" and shown as "Web Video Text Tracks". See upgrade instructions below to convert existing files.
+
+The upgrade instructions below also explain how to upgrade to v1.5 of the Dataverse Previewers, which includes an updated video previewer that supports subtitles. The new previewer version presents vtt files as subtitles for videos, and the naming convention is `<video-basename>.<language-tag>.vtt`. The previewer does not rely on the content type. A proper content type may hint users to ask permission for the subtitles together with a video.
+
+See also #11041.
+
+### Dataset Types Can Set Available Licenses
+
+Licenses (e.g. "MIT") can now be linked to dataset types (e.g. "software") using new superuser APIs. The create Dataset Type APIs have been extended to allow you to set metadata blocks and/or licenses on the creation of a Dataset Type. (You can change both later.)
+
+If a license is not available for a given Dataset Type then the Create Dataset API will prevent that license from being applied to the dataset.
+Also, the UI will only show those licenses that are available to the Dataset Type.
+
+For more information, see the guides ([overview](https://guides.dataverse.org/en/6.7/user/dataset-management.html#dataset-types), [new APIs](https://guides.dataverse.org/en/6.7/api/native-api.html#set-available-licenses-for-a-dataset-type)), #10520, and #11385.
+
+### Loading Metadata Blocks in Docker
+
+The tutorial on running Dataverse in Docker has been updated to include [how to load a metadata block](https://guides.dataverse.org/en/6.7/container/running/demo.html#additional-metadata-blocks) and then update Solr to know about the new fields. See also #11004 and #11204.
+
+### Solr Indexing Speed Improved
+
+The performance of Solr indexing has been significantly improved, particularly for datasets with many files.
+
+A new dataverse.solr.min-files-to-use-proxy microprofile setting can be used to further improve performance/lower memory requirements for datasets with many files (e.g. 500+) (defaults to Integer.MAX, disabling use of the new functionality). See also #11374.
+
+### Improved Efficiency for Per-Request Filters
+
+This release improves the performance of Dataverse's per-request handling of CORS Headers and API calls.
+
+It adds new JVM options/Microprofile settings (starting with `dataverse.cors` and `dataverse.api`) replacing the now deprecated database settings (starting with `:BlockedApi` and `:AllowCors`). (See "new settings" and "deprecated settings" below for a full list.)
+
+Additional changes:
+
+- CORS headers can now be configured with a list of desired origins, methods, and allowed and exposed headers.
+- An `X-Dataverse-unblock-key` header has been added that can be used instead of the less secure `unblock-key` query parameter when the `:BlockedApiPolicy` is set to `unblock-key`.
+- Warnings have been added to the log if the Blocked API settings are misconfigured or if the key is weak (when the `unblock-key` policy is used).
+- The new `dataverse.api.blocked.key` can be configured using Payara password aliases or other secure storage options.
+
+See also [the guides](https://guides.dataverse.org/en/6.7/installation/config.html#blocking-api-endpoints) and #11454.
+
+### New OIDC Feature Flag
+
+A new feature flag called `API_BEARER_AUTH_USE_BUILTIN_USER_ON_ID_MATCH` has been introduced, which allows the use of a built-in user account when an identity match is found during OIDC API bearer token authentication.
+
+This feature enables automatic association of an incoming Identity Provider (IdP) identity with an existing built-in user account, bypassing the need for additional user registration steps.
+
+See [the guides](https://guides.dataverse.org/en/6.7/installation/config.html#feature-flags), #11193, #11197, and #11314.
+
+### dataverse-metadata-crawler
+
+The [dataverse-metadata-crawler](https://github.com/scholarsportal/dataverse-metadata-crawler) was added to the guides. See #11581.
+
+## Bugs Fixed
+
+### Reduced Chance of Losing Metadata Edits
+
+Changes were made to the "edit dataset metadata" page to reduce the chance of losing metadata edits.
+
+The remedy for the problem consists of two parts:
+- Do not show the "Host Dataverse" field when there is nothing to choose. This mimics the behaviour for templates.
+- When you accidentally start typing in the "Host Dataverse" field, undo the change with backspace, fill in the other metadata fields and save the draft, the page used to get blocked due to an exception. Reloading the page would erase all your input. The exception (caused by an invalid argument) is remedied returning the currently selected value.
+
+See also #11301.
+
+### Improved "Role Has Already Been Granted" Message
+
+A simple "role has already been granted" message is now given, fixing a bug where "dataset" was incorrectly indicated instead of "collection". See also #11191 and #11362.
+
+### NcML Previewer Bug Fix
+
+[Dataverse Previewers](https://github.com/gdcc/dataverse-previewers) v1.4 contains a bug in the NcML previewer that prevented it from working with signed URLs. See #11252 for screenshots.
+
+This has been [fixed](https://github.com/gdcc/dataverse-previewers/commit/2211989e7b9e12c875e18b4893ba4f1dfb1603a5) in the "betatest" and v1.5 versions of the previewer. See also #11252 and #11311. Upgrading to v1.5 of all previewers is recommended in the upgrade instructions below.
+
+### Search API Bug Fix
+
+The Search API now returns all type totals (Dataverses, Dataset, and Files) regardless of the list of types requested. None requested types were returned with total count set to 0.
+&type=dataverse&type=dataset would result in "Files": 0 since type=file was not requested. Now all counts show the correct totals. See also #11280.
+
+### Other Bug Fixes
+
+- Deeply nested compound fields are not (yet) supported by Dataverse but the Search API now properly avoids returning duplicate values for them. See #11172.
+- An issue causing more than one edit of a versionNote to fail, when done without a page refresh, has been fixed. See #11394.
+- The deaccessionedReason was missing in the fileDifferenceSummary json object returned by API GET "$SERVER_URL/api/files/{ID}/versionDifferences". See #11438.
+- Memory usage has been reduced and potential memory leaks closed in the metadata exporters. See #11417.
+
+## API Updates
+
+### Update File Metadata API
+
+A new API endpoint has been added to allow updating file metadata for one or more files in a dataset.
+See the [Native API documentation](https://guides.dataverse.org/en/6.7/api/native-api.html) for details on usage and #11271.
+
+### Extend Restrict API to Include New Attributes
+
+The "restrict" API only allowed for a boolean to update the restricted attribute of a file. For backward compatibility, this is still supported, but now a richer JSON object can be passed instead. The JSON object allows for the required `restrict` flag as well as optional attributes: `enableAccessRequest` and `termsOfAccess`.
+If `enableAccessRequest` is false then the `termsOfAccess` text must also be included.
+
+See [the guides](https://guides.dataverse.org/en/6.7/api/native-api.html#restrict-files), #11299, and #11349.
+
+### Categories Can Now Be Replaced
+
+Previously the API POST /files/{id}/metadata/categories could only add new categories to the categories list. Now with the query parameter ?replace=true the list of categories will be replaced.
+
+See also [the guides](https://guides.dataverse.org/en/6.7/api/native-api.html#updating-file-metadata-categories), #11401, and #11359.
+
+### Application Terms of Use Available via API
+
+It's now possible to retrieve the Application Terms of Use (called General Terms of Use in the UI) via API. These are the terms users agree to when creating an account. See [the guides](https://guides.dataverse.org/en/6.7/api/native-api.html#get-application-terms-of-use-general-terms-of-use), #11415 and #11422.
+
+### dvObject and type Fields Added to Featured Items
+
+Dataverse Featured Items can now be linked to Dataverses, Datasets, or Datafiles.
+
+Pre-existing featured items as well as new items without dvObjects will be defaulted to type=custom. See also #11414.
+
+### Edit Dataset Metadata: Removing Fields
+
+The "edit dataset metadata" endpoint now allows removing fields (by sending empty values) as long as they are not required by the dataset. See also #11243.
+
+### Edit Dataset Metadata: Prevent Inconsistencies
+
+A new `sourceInternalVersionNumber` optional query parameter, which prevents inconsistencies by managing updates that may occur from other users while a dataset is being edited. See also #11243.
+
+### api/roles/userSelectable
+
+A new endpoint (`api/roles/userSelectable`) has been implemented, which returns the appropriate roles that the calling user can use as filters when searching within their data. See #11434.
+
+## Security Updates
+
+This release contains important security updates. If you are not receiving security notices, please sign up by following [the steps](https://guides.dataverse.org/en/latest/installation/config.html#ongoing-security-of-your-installation) in the guides.
+
+## Updates for Documentation Writers
+
+### Sphinx Upgraded
+
+Sphinx has been upgraded to 7.4.0 and new dependencies have been added, including semver. Please re-run the `pip install -r requirements.txt` setup [step](https://guides.dataverse.org/en/6.7/contributor/documentation.html#installing-sphinx) to upgrade your environment. Otherwise you might see an error like `ModuleNotFoundError: No module named 'semver'`.
+
+## Updates for Developers
+
+### Development of Dataverse on Windows
+
+Development of Dataverse on Windows has been confirmed to work as long as you use WSL rather than cmd.exe. See the updated [quickstart](https://guides.dataverse.org/en/6.7/developers/dev-environment.html#quickstart), the rewritten [page on Windows](https://guides.dataverse.org/en/6.7/developers/windows.html), #10606, and #11583.
+
+### Keycloak SPI for Built-In Users
+
+A Keycloak SPI, `builtin-users-spi`, has been implemented that allows the use of Keycloak on instances with built-in accounts for OIDC authentication, enabling the use of the SPA on those instances.
+
+Looking ahead, this authenticator SPI could also support mapping Shibboleth users coming in through Keycloak to existing Shib users without changing the provider in the Dataverse database. However, this would require changes to the storage provider to support more than just built-in users.
+
+The SPI code is available in the Dataverse code repository (`conf/keycloak/builtin-users-spi`).
+
+### File Previews Available in Dev Environment, More Docs
+
+In Dataverse 6.5 File Previewers were enabled in the "demo or eval" containerized (Dockerized) environment (#11025). These previewers are now available in the development environment as well and [documentation](https://guides.dataverse.org/en/6.7/container/running/demo.html#file-previewers) has been added explaining how to configure them. See also #10506 and #11181.
+
+### XML Parsers
+
+The configuration of XML parsers used in Dataverse has been centralized and unused functionality has been turned off to enhance security. See #11619.
+
+## End-Of-Life (EOL) Announcements
+
+### Whole Tale EOL
+
+Unfortunately, the [Whole Tale](https://wholetale.org) project is no longer active and has been removed from the list of integrations in the Admin Guide. See #11497.
+
+## New Settings
+
+The following settings have been added:
+
+- `dataverse.api.blocked.policy`: Policy for blocking API endpoints
+- `dataverse.api.blocked.endpoints`: List of API endpoints to be blocked (comma-separated)
+- `dataverse.api.blocked.key`: Key for unblocking API endpoints
+- `dataverse.bagit.sourceorg.name`
+- `dataverse.cors.origin`: Allowed origins for CORS requests
+- `dataverse.cors.methods`: Allowed HTTP methods for CORS requests
+- `dataverse.cors.headers.allow`: Allowed headers for CORS requests
+- `dataverse.cors.headers.expose`: Headers to expose in CORS responses
+- `dataverse.files.hide-schema-dot-org-download-urls`: now configurable via MicroProfile Config, see #11482
+- `dataverse.localcontexts.url`
+- `dataverse.localcontexts.api-key`
+- `dataverse.search.services.directory`
+- `dataverse.search.default-service`
+- `dataverse.solr.min-files-to-use-proxy`
+- `dataverse.ui.show-curation-status-to-all`
+- `:GetExternalSearchUrl`
+- `:GetExternalSearchName`
+- `:PostExternalSearchUrl`
+- `:PostExternalSearchName`
+
+## Deprecated Settings
+
+- `bagit.SourceOrganization` entry in Bundle.properties
+- `:AllowCors`
+- `:BlockedApiPolicy`
+- `:BlockedApiEndpoints`
+- `:BlockedApiKey`
+
+## Removed Settings
+
+- `dataverse.files.<id>.payload-signing`: See #11360
+
+## Backward Incompatible Changes
+
+Generally speaking, see the [API Changelog](https://guides.dataverse.org/en/latest/api/changelog.html) for a list of backward-incompatible API changes.
+
+### show_my_data removed from Search API
+
+An undocumented Search API parameter called "show_my_data" has been removed. It was never exercised by tests and is believed to be unused. API users should use the MyData API instead. See #11287 and #11375.
+
+### curationStatus API
+
+/api/datasets/{id}/curationStatus API now includes a JSON object with curation label, createtime, and assigner rather than a string `label` and it supports a new boolean includeHistory parameter (default false) that returns a JSON array of statuses. See #11268.
+
+### listCurationStates API
+
+/api/datasets/{id}/listCurationStates includes new columns "Status Set Time" and "Status Set By" columns listing the time the current status was applied and by whom. It also supports the boolean includeHistory parameter. See #11268.
+
+### XML serialization of empty elements
+
+Due to updates in libraries used by Dataverse, XML serialization may have changed slightly with respect to whether self-closing tags are used for empty elements. This primarily affects XML-based metadata exports. The XML structure of the export itself has not changed, so this is only an incompatibility if you are not using an XML parser. See #11360.
+
+## Complete List of Changes
+
+For the complete list of code changes in this release, see the [6.7 milestone](https://github.com/IQSS/dataverse/issues?q=milestone%3A6.7+is%3Aclosed) in GitHub.
+
+## Getting Help
+
+For help with upgrading, installing, or general questions please post to the [Dataverse Community Google Group](https://groups.google.com/g/dataverse-community) or email support@dataverse.org.
+
+## Installation
+
+If this is a new installation, please follow our [Installation Guide](https://guides.dataverse.org/en/latest/installation/). Please don't be shy about [asking for help](https://guides.dataverse.org/en/latest/installation/intro.html#getting-help) if you need it!
+
+Once you are in production, we would be delighted to update our [map of Dataverse installations](https://dataverse.org/installations) around the world to include yours! Please [create an issue](https://github.com/IQSS/dataverse-installations/issues) or email us at support@dataverse.org to join the club!
+
+You are also very welcome to join the [Global Dataverse Community Consortium](https://www.gdcc.io/) (GDCC).
+
+## Upgrade Instructions
+
+Upgrading requires a maintenance window and downtime. Please plan accordingly, create backups of your database, etc.
+
+These instructions assume that you've already upgraded through all the 5.x releases and are now running Dataverse 6.6.
+
+0\. These instructions assume that you are upgrading from the immediate previous version. If you are running an earlier version, the only supported way to upgrade is to progress through the upgrades to all the releases in between before attempting the upgrade to this version.
+
+If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. By default, Payara runs as the `dataverse` user. In the commands below, we use sudo to run the commands as a non-root user.
+
+Also, we assume that Payara 6 is installed in `/usr/local/payara6`. If not, adjust as needed.
+
+```shell
+export PAYARA=/usr/local/payara6
+```
+
+(or `setenv PAYARA /usr/local/payara6` if you are using a `csh`-like shell)
+
+1\. List deployed applications
+
+```shell
+$PAYARA/bin/asadmin list-applications
+```
+
+2\. Undeploy the previous version (should match "list-applications" above)
+
+```shell
+$PAYARA/bin/asadmin undeploy dataverse-6.6
+```
+
+3\. Stop Payara
+
+```shell
+sudo service payara stop
+```
+
+4\. Upgrade to Payara-6.2025.3
+
+The steps below reuse your existing domain directory with the new distribution of Payara. You may also want to review the Payara upgrade instructions as it could be helpful during any troubleshooting:
+[Payara Release Notes](https://docs.payara.fish/community/docs/6.2025.3/Release%20Notes/Release%20Notes%206.2025.3.html).
+We also recommend you ensure you followed all update instructions from the past releases regarding Payara.
+(The most recent Payara update was for [v6.6](https://github.com/IQSS/dataverse/releases/tag/v6.6).)
+
+Move the current Payara directory out of the way:
+
+```shell
+mv $PAYARA $PAYARA.6.2025.2
+```
+
+Download the new Payara version 6.2025.3 (from https://www.payara.fish/downloads/payara-platform-community-edition/ or https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.3/payara-6.2025.3.zip), and unzip it in its place:
+
+```shell
+cd /usr/local
+unzip payara-6.2025.3.zip
+```
+
+Replace the brand new `payara/glassfish/domains/domain1` with your old, preserved domain1:
+
+```shell
+mv payara6/glassfish/domains/domain1 payara6/glassfish/domains/domain1_DIST
+mv payara6.6.2025.2/glassfish/domains/domain1 payara6/glassfish/domains/
+```
+
+5\. Download and deploy this version
+
+```shell
+wget https://github.com/IQSS/dataverse/releases/download/v6.7/dataverse-6.7.war
+$PAYARA/bin/asadmin deploy dataverse-6.7.war
+```
+
+Note: if you have any trouble deploying, stop Payara, remove the following directories, start Payara, and try to deploy again.
+
+```shell
+sudo service payara stop
+sudo rm -rf $PAYARA/glassfish/domains/domain1/generated
+sudo rm -rf $PAYARA/glassfish/domains/domain1/osgi-cache
+sudo rm -rf $PAYARA/glassfish/domains/domain1/lib/databases
+sudo service payara start
+```
+
+6\. For installations with internationalization or text customizations:
+
+Please remember to update translations via [Dataverse language packs](https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs).
+
+If you have text customizations you can get the latest English files from <https://github.com/IQSS/dataverse/tree/v6.7/src/main/java/propertyFiles>.
+
+7\. Restart Payara
+
+```shell
+sudo service payara stop
+sudo service payara start
+```
+
+8\. If you have enabled the Croissant exporter, update it and run reExportAll to update dataset metadata exports
+
+After Dataverse 6.6 was released on 2024-03-18, two versions of the Croissant exporter have been released. You are encouraged to upgrade to the latest version, which is 0.1.5.
+
+Under "installation" at the README at https://github.com/gdcc/exporter-croissant you'll find instructions about upgrading the Croissant exporter. In the same repo you can find a changelog if you are curious about what has changed.
+
+Afterwards, we recommend reexporting all dataset metadata. (Reexporting just a single export format, like Croissant, is not supported.) Below is the simple way to reexport all dataset metadata. For more advanced usage, please see [the guides](http://guides.dataverse.org/en/6.7/admin/metadataexport.html#batch-exports-through-the-api).
+
+```shell
+curl http://localhost:8080/api/admin/metadata/reExportAll
+```
+
+9\. Archival bags
+
+If you are using archival bags, be sure that the [dataverse.bagit.sourceorg.name](https://guides.dataverse.org/en/6.7/installation/config.html#dataverse-bagit-sourceorg-name) JVM option is set.
+
+Archival Bags now use the JVM option `dataverse.bagit.sourceorg.name` in generating the bag-info.txt file's "Internal-Sender-Identifier" (in addition to its use for "Source-Organization") rather than pulling the value from a deprecated `bagit.SourceOrganization` entry in Bundle.properties ("Internal-Sender-Identifier" is generated by appending " Catalog" in both cases). Sites using archival bags would not see a change if these settings were already using the same value. See #10680 and #11416.
+
+10\. API Filters
+
+Per-request filtering has been improved. Migrate to the new settings as explained below as the old settings have been deprecated.
+
+The deprecated database settings will continue to work in this version. To use the new settings (which are more efficient),
+
+If :AllowCors is not set or is true:
+
+```shell
+bin/asadmin create-jvm-options -Ddataverse.cors.origin=*
+```
+
+Optionally set origin to a list of hosts and/or set other CORS JvmSettings
+Your currently blocked API endpoints can be found at http://localhost:8080/api/admin/settings/:BlockedApiEndpoints
+
+Copy them into the new setting with the following command. As with the deprecated setting, the endpoints should be comma-separated.
+
+```shell
+bin/asadmin create-jvm-options '-Ddataverse.api.blocked.endpoints=<current :BlockedApiEndpoints>'
+```
+
+If :BlockedApiPolicy is set and is not 'drop'
+
+```shell
+bin/asadmin create-jvm-options '-Ddataverse.api.blocked.policy=<current :BlockedApiPolicy>'
+```
+If :BlockedApiPolicy is 'unblock-key' and :BlockedApiKey is set
+
+```shell
+`echo "API_BLOCKED_KEY_ALIAS=<value of :BlockedApiKey>" > /tmp/dataverse.api.blocked.key.txt`
+```
+
+```shell
+sudo -u dataverse /usr/local/payara6/bin/asadmin create-password-alias --passwordfile /tmp/dataverse.api.blocked.key.txt
+```
+
+When you are prompted "Enter the value for the aliasname operand", enter `api_blocked_key_alias`
+
+You should see "Command create-password-alias executed successfully."
+
+```shell
+   bin/asadmin create-jvm-options '-Ddataverse.api.blocked.key=${ALIAS=api_blocked_key_alias}'
+```
+
+Restart Payara:
+
+```shell
+service payara restart
+```
+
+Check server.log to verify that your new settings are in effect.
+
+Cleanup: delete deprecated settings:
+
+```shell
+curl -X DELETE http://localhost:8080/api/admin/settings/:AllowCors
+curl -X DELETE http://localhost:8080/api/admin/settings/:BlockedApiEndpoints
+curl -X DELETE http://localhost:8080/api/admin/settings/:BlockedApiPolicy
+curl -X DELETE http://localhost:8080/api/admin/settings/:BlockedApiKey
+```
+
+11\. Upgrade to Dataverse Previewers v1.5
+
+[Dataverse Previewers](https://github.com/gdcc/dataverse-previewers) has been upgraded to v1.5. See the [announcement](https://groups.google.com/g/dataverse-community/c/L6XLQ2exZHc/m/gtNoLaFrAQAJ) for upgrade instructions.
+
+12\. Re-detect video subtitle (vtt) files
+
+Existing files with extension ".vtt" will keep the content type `application/octet-stream` presented as "_Unknown_".
+The following query shows the number of files per extension with an "_Unknown_" content type:
+
+```sql
+SELECT substring(m.label from (length(label) - strpos(reverse(m.label), '.') + 2)) AS extension, COUNT(*) as count
+FROM datafile f LEFT JOIN filemetadata m ON f.id = m.datafile_id
+WHERE f.contenttype = 'application/octet-stream'
+GROUP BY extension;
+```
+
+If `vtt` does not appear in the result, you are done. Otherwise, you may want to update the content type for existing files and reindex those datasets.
+
+First figure out which datasets would need [reindexing](https://guides.dataverse.org/en/6.7/admin/solr-search-index.html#manual-reindexing):
+
+```sql
+select distinct
+  o.protocol, o.authority, o.identifier,
+  v.versionnumber, v.minorversionnumber, v.versionstate
+  from      datafile       f
+  left join filemetadata   m on f.id = m.datafile_id
+  left join datasetversion v on v.id = m.datasetversion_id
+  left join dvobject       o on o.id = v.dataset_id
+  WHERE contenttype = 'application/octet-stream'
+  AND 'vtt' = substring(m.label from (length(label) - strpos(reverse(m.label), '.') + 2))
+  ;
+```
+
+Then update the content type for the files:
+
+```sql
+UPDATE datafile SET contenttype = 'text/vtt' WHERE id IN (
+  SELECT datafile_id FROM filemetadata m
+  WHERE contenttype = 'application/octet-stream'
+  AND 'vtt' = substring(m.label from (length(label) - strpos(reverse(m.label), '.') + 2))
+);
+```
+
+The vtt files will be reindexed in a step below.
+
+13\. Update Solr schema and reindex
+
+Due to changes in the Solr schema (the addition of fields "curationStatus" and"curationStatusCreateTime"), updating the Solr schema and reindexing is required.
+
+Download the updated `schema.xml` file:
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.6/conf/solr/schema.xml
+cp schema.xml /usr/local/solr/solr-9.8.0/server/solr/collection1/conf
+```
+
+13a\. For installations with additional metadata blocks or external controlled vocabulary scripts, update fields
+
+- Stop Solr instance (usually `service solr stop`, depending on Solr installation/OS, see the [Installation Guide](https://guides.dataverse.org/en/6.7/installation/prerequisites.html#solr-init-script)).
+
+- Run the `update-fields.sh` script that we supply, as in the example below (modify the command lines as needed to reflect the correct path of your Solr installation):
+
+```shell
+wget https://raw.githubusercontent.com/IQSS/dataverse/v6.7/conf/solr/update-fields.sh
+chmod +x update-fields.sh
+curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-9.8.0/server/solr/collection1/conf/schema.xml
+```
+
+Note that Docker-based installations use a different directory: `solr/data/data/collection1/conf/schema.xml`.
+
+- Start Solr instance (usually `service solr start` depending on Solr/OS).
+
+14\. Reindex Solr
+
+```shell
+curl http://localhost:8080/api/admin/index
+```
diff --git a/doc/release-notes/README.md b/doc/release-notes/README.md
index 17334b3f11e..00f80926ca2 100644
--- a/doc/release-notes/README.md
+++ b/doc/release-notes/README.md
@@ -5,7 +5,7 @@ doc/sphinx-guides/source/developers/making-releases.rst documents the official p
 - As a developer, I want to express in my pull request when an addition to the release notes will be necessary.
 - As a developer, I want to be aware of changes that should be made to my dev environment after a pull request has been merged. These could be Solr schema changes or curl commands to reload metadata blocks, for example.
 
-# release-notes directory process
+## release-notes Directory Process
 
 - Create a Markdown file named after your branch (assuming your branch starts with an issue number as requested in doc/sphinx-guides/source/developers/version-control.rst) such as "5053-apis-custom-homepage.md".
 - In the file you created, give instructions for non-SQL upgrade steps that must be taken to run the branch in your pull request. Examples include Solr schema updates or reloading metadata blocks. (SQL updates are handled separately as indicated in doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst.)
diff --git a/doc/release-notes/issue-10523.md b/doc/release-notes/issue-10523.md
new file mode 100644
index 00000000000..3ce292646a7
--- /dev/null
+++ b/doc/release-notes/issue-10523.md
@@ -0,0 +1,6 @@
+
+## Developer Updates
+
+### Writing External Exporters
+
+The getDatasetFileDetails data structure now contains "directoryLabel" (file path). See #10523 and #11618.
\ No newline at end of file
diff --git a/doc/shib/shib.md b/doc/shib/shib.md
index 2c178a93f35..9cff6d827e7 100644
--- a/doc/shib/shib.md
+++ b/doc/shib/shib.md
@@ -82,11 +82,7 @@ Run `service httpd restart`.
 
 ## Update/verify files under /etc/shibboleth
 
-For /etc/shibboleth/shibboleth2.xml use the version from https://github.com/IQSS/dataverse/blob/master/conf/vagrant/etc/shibboleth/shibboleth2.xml but replace "pdurbin.pagekite.me" with the "shibtest.dataverse.org".
-
-Put https://github.com/IQSS/dataverse/blob/master/conf/vagrant/etc/shibboleth/dataverse-idp-metadata.xml at /etc/shibboleth/dataverse-idp-metadata.xml
-
-Put https://github.com/IQSS/dataverse/blob/master/conf/vagrant/etc/shibboleth/attribute-map.xml at 
+Get files from the Installation Guide.
 
 After making these changes, run `service shibd restart` and `service httpd restart`.
 
diff --git a/doc/sphinx-guides/HOWTO-SPHINX-INSTALL.txt b/doc/sphinx-guides/HOWTO-SPHINX-INSTALL.txt
deleted file mode 100755
index 4185b174720..00000000000
--- a/doc/sphinx-guides/HOWTO-SPHINX-INSTALL.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-This is how to install sphinx: 
-
-On a Mac: 
-
-Download the sphinx zip file; I got mine from here: 
-http://sphinx-doc.org/install.html
-
-Unzip it somewhere. In the unzipped directory, do the following as
-root, (sudo -i):
-
-python setup.py build
-python setup.py install
-
-Another option (Mac/Unix/Windows): Use pip
-* Unless you already have it, install pip (https://pip.pypa.io/en/latest/installing.html)
-* run
-    pip install sphinx
-
-
-
-This is all you need. You should now be able to build HTML/pdf documentation from git sources locally. 
-
-And this is how you build: 
-
-make html
-
-in this directory will generate html files, and leave them in the build subdirectory here. 
-To have it build the html files AND deploy them under your glassfish environment, type
-
-make htmldeploy
-
-For this the Makefile assumes that your glassfish is in /usr/local/glassfish4.
-If it's installed elsewhere, you need to specify the directory on the command line, 
-for example, like this:
-
-make htmldeploy DOCROOT=/Applications/NetBeans/glassfish-4.1/glassfish/domains/domain1/docroot
-
-If you need more information on sphinx (probably not), for ex., on how to start a new
-documentation project of your own, etc., here's a good link:
-
-http://pythonhosted.org/an_example_pypi_project/sphinx.html
-
-As always, Google is your friend. 
-
-For a super useful quick start doc on how to format your source
-documents in sphinx, remember to consult Eleni's ".rst cheat sheet":
-http://bit.ly/1eGnxxI (Google Doc)
diff --git a/doc/sphinx-guides/Makefile b/doc/sphinx-guides/Makefile
index fd0a8f260fb..b11416165a7 100755
--- a/doc/sphinx-guides/Makefile
+++ b/doc/sphinx-guides/Makefile
@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
+SPHINXOPTS    = -W
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build
diff --git a/doc/sphinx-guides/SphinxRSTCheatSheet.md b/doc/sphinx-guides/SphinxRSTCheatSheet.md
index 1ccd293080c..300260cb5b1 100755
--- a/doc/sphinx-guides/SphinxRSTCheatSheet.md
+++ b/doc/sphinx-guides/SphinxRSTCheatSheet.md
@@ -10,7 +10,7 @@ RST Cheat Sheet for Sphinx v 1.2.2
 | Bold text                     | **text**                                                   |                                                            |
 | Italics/emphasis              | *text*                                                     |                                                            |
 | literal                       | ``literal``                                                |                                                            |
-| Internal cross-reference link | See section 5.3.1 of Sphinx documentationand example below | See section 5.3.1 of Sphinx documentationand example below |
+| Internal cross-reference link | See section 5.3.1 of Sphinx documentation and example below | See section 5.3.1 of Sphinx documentation and example below |
 | code block                    | .. code-block:: guess<?xml version="1.0""?>                | Allows for code blocks to be displayed properly            |
 
 For more cheats please visit the [RST cheat sheet google doc] (https://docs.google.com/document/d/105H3iwPwgnPqwuMJI7q-h6FLtXV_EUCiwq2P13lADgA/edit?usp=sharing)
\ No newline at end of file
diff --git a/doc/sphinx-guides/requirements.txt b/doc/sphinx-guides/requirements.txt
index 9fc0e3b8cf6..9c74ed75f6d 100755
--- a/doc/sphinx-guides/requirements.txt
+++ b/doc/sphinx-guides/requirements.txt
@@ -1,2 +1,16 @@
-# match version used by Jenkins
-Sphinx==1.5.6
+Sphinx==7.4.0
+
+# inline icons
+sphinx-icon==0.1.2
+
+# Markdown support
+myst-parser==2.0.0
+
+# tabs
+sphinx-tabs==3.4.5
+
+# jQuery
+sphinxcontrib-jquery
+
+Sphinx-Substitution-Extensions==2025.1.2
+semver>=3,<4
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/Dataverse_3ring-brand_icon_EqualSpace.svg b/doc/sphinx-guides/source/_static/Dataverse_3ring-brand_icon_EqualSpace.svg
new file mode 100644
index 00000000000..76edf7c1492
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/Dataverse_3ring-brand_icon_EqualSpace.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 400 400">
+  <!-- Generator: Adobe Illustrator 29.5.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 141)  -->
+  <defs>
+    <style>
+      .st0 {
+        fill: #c65b28;
+      }
+    </style>
+  </defs>
+  <path class="st0" d="M170.4,397.4c-22.5,0-43.7-8.8-59.6-24.7-15.9-15.9-24.7-37.1-24.7-59.6,0-22.5,8.8-43.7,24.7-59.6,15.9-15.9,37.1-24.7,59.6-24.7s27,3.3,39,9.5l15.5-26c-1.5-1.2-3-2.6-4.4-3.9-10.3-10.3-16-24.1-16-38.7,0-14.6,5.7-28.4,16-38.7,5.9-5.9,13.2-10.4,21.1-13.1l-8.4-37.7c-10.1-.2-19.5-4.2-26.6-11.3-7.3-7.3-11.3-17-11.3-27.4,0-10.3,4-20,11.3-27.3,7.3-7.3,17-11.3,27.3-11.3s20,4,27.3,11.3c7.3,7.3,11.3,17,11.3,27.3s-4,20-11.3,27.3c-2.6,2.6-5.6,4.8-9,6.7l8.8,39.5c13.9.5,26.9,6.1,36.8,16,10.3,10.3,16,24.1,16,38.7s-5.7,28.4-16,38.7c-10.3,10.3-24.1,16-38.7,16s-11.5-.9-17-2.7l-16.5,27.7c1.6,1.4,3,2.7,4.4,4.1,15.9,15.9,24.7,37.1,24.7,59.6s-8.8,43.7-24.7,59.6c-15.9,15.9-37.1,24.7-59.6,24.7ZM170.4,248.4c-17.3,0-33.5,6.7-45.7,18.9-12.2,12.2-18.9,28.5-18.9,45.7s6.7,33.5,18.9,45.7c12.2,12.2,28.5,18.9,45.7,18.9s33.5-6.7,45.7-18.9c12.2-12.2,18.9-28.5,18.9-45.7s-6.7-33.5-18.9-45.7c-12.2-12.2-28.5-18.9-45.7-18.9h0ZM259.2,134.4c-9.4,0-18.2,3.7-24.8,10.3-6.6,6.6-10.3,15.4-10.3,24.8s3.6,18.2,10.3,24.8c6.6,6.6,15.4,10.3,24.8,10.3,9.4,0,18.2-3.7,24.8-10.3,6.6-6.6,10.3-15.4,10.3-24.8,0-9.4-3.7-18.2-10.3-24.8-6.6-6.6-15.4-10.3-24.8-10.3ZM234,18.6c-6.1,0-11.8,2.4-16,6.6-4.3,4.3-6.6,10-6.6,16s2.4,11.8,6.7,16c4.3,4.3,10,6.6,16,6.6,6.1,0,11.8-2.4,16-6.6,4.3-4.3,6.6-10,6.6-16s-2.4-11.7-6.6-16c-4.3-4.3-10-6.6-16-6.6Z"/>
+  <path class="st0" d="M234,5.1c10,0,19.1,4.1,25.6,10.6,6.5,6.5,10.6,15.6,10.6,25.6s-4.1,19.1-10.6,25.6c-2.9,2.9-6.3,5.3-10.1,7.1l9.6,43.2s0,0,0,0h0c14.4,0,27.5,5.9,37,15.3,9.5,9.4,15.3,22.6,15.3,37s-5.9,27.5-15.3,37c-9.4,9.4-22.6,15.3-37,15.3s-12.5-1.1-18.1-3.2l-18.6,31.2c2,1.7,4,3.5,5.9,5.3,14.8,14.8,24,35.3,24,57.9s-9.2,43.1-24,57.9c-14.8,14.8-35.3,24-57.9,24s-43.1-9.2-57.9-24c-14.8-14.8-24-35.3-24-57.9,0-22.6,9.2-43.1,24-57.9,14.8-14.8,35.3-24,57.9-24,0,0,0,0,0,0,0,0,0,0,0,0,14.4,0,28,3.8,39.8,10.3l17.8-29.9c-2.1-1.5-4.1-3.2-5.9-5.1-9.5-9.4-15.3-22.6-15.3-37,0-14.4,5.9-27.5,15.3-37,6.1-6.1,13.8-10.7,22.3-13.2l-9.3-41.8c-.4,0-.8,0-1.2,0s0,0,0,0c-10,0-19-4.1-25.6-10.6-6.5-6.5-10.6-15.6-10.6-25.6,0-10,4.1-19.1,10.6-25.6,6.5-6.5,15.6-10.6,25.6-10.6M234,66.5c7,0,13.2-2.8,17.8-7.4,4.6-4.6,7.4-10.8,7.4-17.8s-2.8-13.2-7.4-17.8c-4.6-4.6-10.8-7.4-17.8-7.4-7,0-13.2,2.8-17.8,7.4-4.6,4.6-7.4,10.8-7.4,17.8s2.8,13.2,7.4,17.8c4.6,4.6,10.8,7.4,17.8,7.4M259.2,207.1c10.4,0,19.7-4.2,26.6-11,6.8-6.8,11-16.2,11-26.6,0-10.4-4.2-19.7-11-26.6-6.8-6.8-16.2-11-26.6-11-10.4,0-19.7,4.2-26.5,11-6.8,6.8-11,16.2-11,26.6s4.2,19.7,11,26.6c6.8,6.8,16.1,11,26.5,11M170.4,380.1c18.6,0,35.3-7.5,47.5-19.7,12.2-12.2,19.7-28.9,19.7-47.5s-7.5-35.3-19.7-47.5c-12.2-12.2-28.9-19.7-47.5-19.7-18.6,0-35.3,7.5-47.5,19.7-12.2,12.2-19.7,28.9-19.7,47.5s7.5,35.3,19.7,47.5c12.2,12.2,28.9,19.7,47.5,19.7M234,.2c-11,0-21.3,4.3-29.1,12.1-7.8,7.8-12.1,18.1-12.1,29.1,0,11,4.3,21.3,12.1,29.1,7.1,7.1,16.4,11.3,26.3,12l7.5,33.7c-7.5,2.9-14.3,7.3-20,13-10.8,10.8-16.8,25.2-16.7,40.5,0,15.3,5.9,29.7,16.8,40.5,1,.9,1.9,1.9,3,2.7l-13.3,22.3c-11.8-5.7-24.8-8.7-37.9-8.7h0c-23.2,0-45,9-61.4,25.4-16.4,16.4-25.4,38.2-25.4,61.4,0,23.2,9,45,25.4,61.4,16.4,16.4,38.2,25.4,61.4,25.4s45-9,61.4-25.4c16.4-16.4,25.4-38.2,25.4-61.4s-9-45-25.4-61.4c-1-1-2-1.9-3-2.9l14.5-24.3c5.2,1.5,10.5,2.2,15.9,2.2,15.3,0,29.7-6,40.5-16.8,10.8-10.8,16.8-25.2,16.8-40.5s-6-29.7-16.8-40.5c-9.9-9.9-22.7-15.7-36.5-16.6l-8-35.8c2.9-1.7,5.6-3.8,7.9-6.2,7.8-7.8,12-18.1,12-29.1s-4.3-21.3-12-29.1C255.3,4.5,245,.2,234,.2h0ZM234,61.5c-5.4,0-10.5-2.1-14.3-5.9-3.8-3.8-5.9-8.9-5.9-14.3s2.1-10.5,5.9-14.3c3.8-3.8,8.9-5.9,14.3-5.9,5.4,0,10.5,2.1,14.3,5.9,3.8,3.8,5.9,8.9,5.9,14.3s-2.1,10.5-5.9,14.3c-3.8,3.8-8.9,5.9-14.3,5.9h0ZM259.2,202.1c-8.7,0-16.9-3.4-23.1-9.6-6.2-6.2-9.6-14.4-9.6-23.1s3.4-16.9,9.6-23.1c6.2-6.2,14.3-9.5,23.1-9.6,8.7,0,16.9,3.4,23.1,9.6,6.1,6.2,9.5,14.4,9.6,23.1,0,8.7-3.4,16.9-9.6,23.1-6.2,6.1-14.4,9.5-23.1,9.5h0ZM170.4,375.2c-16.6,0-32.2-6.5-44-18.2-11.7-11.8-18.2-27.4-18.2-44s6.5-32.2,18.2-44c11.7-11.7,27.4-18.2,44-18.2,16.6,0,32.2,6.5,44,18.2,11.7,11.8,18.2,27.4,18.2,44s-6.5,32.2-18.2,44c-11.8,11.7-27.4,18.2-44,18.2h0Z"/>
+</svg>
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/admin/counter-processor-config.yaml b/doc/sphinx-guides/source/_static/admin/counter-processor-config.yaml
index fc47b0f4e9a..f3501ead7b3 100644
--- a/doc/sphinx-guides/source/_static/admin/counter-processor-config.yaml
+++ b/doc/sphinx-guides/source/_static/admin/counter-processor-config.yaml
@@ -1,8 +1,8 @@
 # currently no other option but to have daily logs and have year-month-day format in the name with
 # 4-digit year and 2-digit month and day
-# /usr/local/glassfish4/glassfish/domains/domain1/logs/counter_2019-01-11.log
+# /usr/local/payara6/glassfish/domains/domain1/logs/counter_2019-01-11.log
 #log_name_pattern: sample_logs/counter_(yyyy-mm-dd).log
-log_name_pattern: /usr/local/glassfish4/glassfish/domains/domain1/logs/counter_(yyyy-mm-dd).log
+log_name_pattern: /usr/local/payara6/glassfish/domains/domain1/logs/mdc/counter_(yyyy-mm-dd).log
 
 # path_types regular expressions allow matching to classify page urls as either an investigation or request
 # based on specific URL structure for your system.
@@ -33,8 +33,10 @@ path_types:
 
 # Robots and machines urls are urls where the script can download a list of regular expressions to determine
 # if something is a robot or machine user-agent.  The text file has one regular expression per line
-robots_url: https://raw.githubusercontent.com/CDLUC3/Make-Data-Count/master/user-agents/lists/robot.txt
-machines_url: https://raw.githubusercontent.com/CDLUC3/Make-Data-Count/master/user-agents/lists/machine.txt
+#robots_url: https://raw.githubusercontent.com/CDLUC3/Make-Data-Count/master/user-agents/lists/robot.txt
+#machines_url: https://raw.githubusercontent.com/CDLUC3/Make-Data-Count/master/user-agents/lists/machine.txt
+robots_url: https://raw.githubusercontent.com/IQSS/counter-processor/refs/heads/goto-gdcc/user-agents/lists/robots.txt
+machines_url: https://raw.githubusercontent.com/IQSS/counter-processor/refs/heads/goto-gdcc/user-agents/lists/machine.txt
 
 # the year and month for the report you are creating.
 year_month: 2019-01
@@ -42,12 +44,13 @@ year_month: 2019-01
 # Don't put the filename extension, the code will tack on the tsv or json extension for you.
 # Output formats are either tsv or json currently.  TSV is currently broken until anyone accepts reports in that format.
 # FIXME: "/tmp" is fine for a quick test but pick another directory that
-# the "counter" user can write to and that the "glassfish" user can read from.
+# the "counter" user can write to and that the "dataverse" user can read from.
 output_file: /tmp/make-data-count-report
 output_format: json
 
 # the name of the platform that goes into your reports
-# FIXME: Change "platform" to the brand of your Dataverse installation.
+# FIXME: Change "platform" to match the name of your Dataverse installation. Examples
+# are "Harvard Dataverse" for Harvard University or "LibraData" for the University of Virginia.
 platform: LibreScholar
 
 # Don't put your api token in here if you're going to commit it, but put in separate secrets.yaml in same
diff --git a/doc/sphinx-guides/source/_static/admin/dataverse-external-tools.tsv b/doc/sphinx-guides/source/_static/admin/dataverse-external-tools.tsv
index 5de06df2bd3..dfe9226bbf1 100644
--- a/doc/sphinx-guides/source/_static/admin/dataverse-external-tools.tsv
+++ b/doc/sphinx-guides/source/_static/admin/dataverse-external-tools.tsv
@@ -1,5 +1,8 @@
-TwoRavens	explore	file	A system of interlocking statistical tools for data exploration, analysis, and meta-analysis: http://2ra.vn. See the :doc:`/user/data-exploration/tworavens` section of the User Guide for more information on TwoRavens from the user perspective and the :doc:`/installation/r-rapache-tworavens` section of the Installation Guide. 
-Data Explorer	explore	file	A GUI which lists the variables in a tabular data file allowing searching, charting and cross tabulation analysis. See the README.md file at https://github.com/scholarsportal/Dataverse-Data-Explorer for the instructions on adding Data Explorer to your Dataverse; and the :doc:`/installation/prerequisites` section of the Installation Guide for the instructions on how to set up **basic R configuration required** (specifically, Dataverse uses R to generate .prep metadata files that are needed to run Data Explorer). 
-Whole Tale	explore	dataset	A platform for the creation of reproducible research packages that allows users to launch containerized interactive analysis environments based on popular tools such as Jupyter and RStudio. Using this integration, Dataverse users can launch Jupyter and RStudio environments to analyze published datasets. For more information, see the `Whole Tale User Guide <https://wholetale.readthedocs.io/en/stable/users_guide/integration.html>`_.
-File Previewers	explore	file	A set of tools that display the content of files - including audio, html, `Hypothes.is <https://hypothes.is/>`_ annotations, images, PDF, text, video - allowing them to be viewed without downloading. The previewers can be run directly from github.io, so the only required step is using the Dataverse API to register the ones you want to use. Documentation, including how to optionally brand the previewers, and an invitation to contribute through github are in the README.md file. https://github.com/QualitativeDataRepository/dataverse-previewers
-Data Curation Tool	configure	file	A GUI for curating data by adding labels, groups, weights and other details to assist with informed reuse. See the README.md file at https://github.com/scholarsportal/Dataverse-Data-Curation-Tool for the installation instructions.
+Tool	Type	Scope	Description
+Data Explorer	explore	file	"A GUI which lists the variables in a tabular data file allowing searching, charting and cross tabulation analysis. The latest version incorporates the Data Curation Tool, a GUI for curating data by adding labels, groups, weights and other details to assist with informed reuse. See the README.md file at https://github.com/scholarsportal/Dataverse-Data-Explorer for the instructions on adding Data Explorer to your Dataverse."
+Binder	explore	dataset	Binder allows you to spin up custom computing environments in the cloud (including Jupyter notebooks) with the files from your dataset. See https://github.com/IQSS/dataverse-binder-redirect for installation instructions.
+File Previewers	explore	file	"A set of tools that display the content of files - including audio, html, `Hypothes.is <https://hypothes.is/>`_ annotations, images, PDF, Markdown, text, video, tabular data, spreadsheets, GeoJSON, zip, and NcML files - allowing them to be viewed without downloading the file. The previewers can be run directly from github.io, so the only required step is using the Dataverse API to register the ones you want to use. Documentation, including how to optionally brand the previewers, and an invitation to contribute through github are in the README.md file. Initial development was led by the Qualitative Data Repository and the spreasdheet previewer was added by the Social Sciences and Humanities Open Cloud (SSHOC) project. https://github.com/gdcc/dataverse-previewers"
+Ask the Data	query	file	Ask the Data is an experimental tool that allows you ask natural language questions about the data contained in Dataverse tables (tabular data). See the README.md file at https://github.com/IQSS/askdataverse/tree/main/askthedata for the instructions on adding Ask the Data to your Dataverse installation. 
+TurboCurator by ICPSR	configure	dataset	TurboCurator generates metadata improvements for title, description, and keywords. It relies on open AI's ChatGPT & ICPSR best practices. See the `TurboCurator Dataverse Administrator <https://turbocurator.icpsr.umich.edu/tc/adminabout/>`_ page for more details on how it works and adding TurboCurator to your Dataverse installation.
+JupyterHub	explore	file	The `Dataverse-to-JupyterHub Data Transfer Connector <https://forge.inrae.fr/dipso/eosc-pillar/dataverse-jupyterhub-connector>`_ is a tool that simplifies the transfer of data between Dataverse repositories and the cloud-based platform JupyterHub. It is designed for researchers, scientists, and data analysts, facilitating collaboration on projects by seamlessly moving datasets and files. The tool is a lightweight client-side web application built using React and relies on the Dataverse External Tool feature, allowing for easy deployment on modern integration systems. Currently optimized for small to medium-sized files, future plans include extending support for larger files and signed Dataverse endpoints. For more details, you can refer to the external tool manifest: https://forge.inrae.fr/dipso/eosc-pillar/dataverse-jupyterhub-connector/-/blob/master/externalTools.json
+3DViewer by openforestdata.pl	explore	file	The 3DViewer by openforestdata.pl can be used to explore 3D files (e.g. STL format). It was presented by Kamil Guryn during the 2020 community meeting (`slide deck <https://osf.io/aqgr5>`_, `video <https://youtu.be/YH4I_kldmGI?si=Y-9dZ3xPXeswchAl&t=2379>`_) and can be found at https://github.com/OpenForestData/open-forest-data-previewers
diff --git a/doc/sphinx-guides/source/_static/admin/ejb-jar.xml b/doc/sphinx-guides/source/_static/admin/ejb-jar.xml
new file mode 100644
index 00000000000..b25cefb6340
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/admin/ejb-jar.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns = "http://java.sun.com/xml/ns/javaee" 
+         version = "3.1"
+         xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd">
+    <enterprise-beans>
+        <session>
+            <ejb-name>SavedSearchServiceBean</ejb-name>
+            <ejb-class>edu.harvard.iq.dataverse.search.savedsearch.SavedSearchServiceBean</ejb-class>
+            <session-type>Stateless</session-type>
+            <timer>
+                <schedule>
+                    <minute>30</minute>
+                    <hour>14</hour>
+                    <day-of-week>2</day-of-week>
+                </schedule>
+                <timeout-method>
+                    <method-name>makeLinksForAllSavedSearchesTimer</method-name>
+                </timeout-method>
+            </timer>
+        </session>
+    </enterprise-beans>
+</ejb-jar>
diff --git a/doc/sphinx-guides/source/_static/api/add-license.json b/doc/sphinx-guides/source/_static/api/add-license.json
new file mode 100644
index 00000000000..9a5c478dc36
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/add-license.json
@@ -0,0 +1,12 @@
+{
+  "name": "CC-BY-4.0",
+  "uri": "http://creativecommons.org/licenses/by/4.0",
+  "shortDescription": "Creative Commons Attribution 4.0 International License.",
+  "iconUrl": "https://i.creativecommons.org/l/by/4.0/88x31.png",
+  "active": true,
+  "sortOrder": 2,
+  "rightsIdentifier": "CC-BY-4.0",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/api/dataset-add-single-compound-field-metadata.json b/doc/sphinx-guides/source/_static/api/dataset-add-single-compound-field-metadata.json
new file mode 100644
index 00000000000..f49a9e47d5b
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataset-add-single-compound-field-metadata.json
@@ -0,0 +1,13 @@
+{
+    "fields": [
+        {
+            "typeName": "targetSampleSize",
+            "value": {
+                "targetSampleActualSize": {
+                    "typeName": "targetSampleSizeFormula",
+                    "value": "n = N*X / (X + N – 1)"
+                }
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/api/dataset-add-single-cvoc-field-metadata.json b/doc/sphinx-guides/source/_static/api/dataset-add-single-cvoc-field-metadata.json
new file mode 100644
index 00000000000..620f3df10d1
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataset-add-single-cvoc-field-metadata.json
@@ -0,0 +1,4 @@
+{
+    "typeName": "journalArticleType",
+    "value": "abstract"
+}
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/api/dataset-add-subject-metadata.json b/doc/sphinx-guides/source/_static/api/dataset-add-subject-metadata.json
index ea0922dadc8..c81c5b32aab 100644
--- a/doc/sphinx-guides/source/_static/api/dataset-add-subject-metadata.json
+++ b/doc/sphinx-guides/source/_static/api/dataset-add-subject-metadata.json
@@ -2,7 +2,7 @@
         "typeName": "subject",
                 "value": 
                     ["Astronomy and Astrophysics", "Agricultural Sciences",
-"Arts and Humanities", "Physics"]
+"Arts and Humanities", "Physics", "Mathematical Sciences"]
 
         }
         
diff --git a/doc/sphinx-guides/source/_static/api/dataset-create-software.json b/doc/sphinx-guides/source/_static/api/dataset-create-software.json
new file mode 100644
index 00000000000..4c649bff0aa
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataset-create-software.json
@@ -0,0 +1,82 @@
+{
+  "datasetType": "software",
+  "datasetVersion": {
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
+    "metadataBlocks": {
+      "citation": {
+        "fields": [
+          {
+            "value": "pyDataverse",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "title"
+          },
+          {
+            "value": [
+              {
+                "authorName": {
+                  "value": "Range, Jan",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorName"
+                },
+                "authorAffiliation": {
+                  "value": "University of Stuttgart",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorAffiliation"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "author"
+          },
+          {
+            "value": [ 
+                { "datasetContactEmail" : {
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "datasetContactEmail",
+                    "value" : "jan@mailinator.com"
+                },
+                "datasetContactName" : {
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "datasetContactName",
+                    "value": "Range, Jan"
+                }
+            }],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "datasetContact"
+          },
+          {
+            "value": [ {
+               "dsDescriptionValue":{
+                "value": "A Python module for Dataverse.",
+                "multiple":false,
+               "typeClass": "primitive",
+               "typeName": "dsDescriptionValue"
+            }}],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "dsDescription"
+          },
+          {
+            "value": [
+              "Computer and Information Science"
+            ],
+            "typeClass": "controlledVocabulary",
+            "multiple": true,
+            "typeName": "subject"
+          }
+        ],
+        "displayName": "Citation Metadata"
+      }
+    }
+  }
+}
diff --git a/doc/sphinx-guides/source/_static/api/dataset-create-software.jsonld b/doc/sphinx-guides/source/_static/api/dataset-create-software.jsonld
new file mode 100644
index 00000000000..6f072967dc8
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataset-create-software.jsonld
@@ -0,0 +1,16 @@
+{
+  "http://purl.org/dc/terms/title": "Darwin's Finches",
+  "http://purl.org/dc/terms/subject": "Medicine, Health and Life Sciences",
+  "http://purl.org/dc/terms/creator": {
+      "https://dataverse.org/schema/citation/authorName": "Finch, Fiona",
+      "https://dataverse.org/schema/citation/authorAffiliation": "Birds Inc."
+  },
+  "https://dataverse.org/schema/citation/datasetContact": {
+    "https://dataverse.org/schema/citation/datasetContactEmail": "finch@mailinator.com",
+    "https://dataverse.org/schema/citation/datasetContactName": "Finch, Fiona"
+  },
+  "https://dataverse.org/schema/citation/dsDescription": {
+    "https://dataverse.org/schema/citation/dsDescriptionValue": "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds."
+  },
+  "https://dataverse.org/schema/core#datasetType": "software"
+}
diff --git a/doc/sphinx-guides/source/_static/api/dataset-create.jsonld b/doc/sphinx-guides/source/_static/api/dataset-create.jsonld
new file mode 100644
index 00000000000..a010e30bf7b
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataset-create.jsonld
@@ -0,0 +1,15 @@
+{
+  "http://purl.org/dc/terms/title": "Darwin's Finches",
+  "http://purl.org/dc/terms/subject": "Medicine, Health and Life Sciences",
+  "http://purl.org/dc/terms/creator": {
+      "https://dataverse.org/schema/citation/authorName": "Finch, Fiona",
+      "https://dataverse.org/schema/citation/authorAffiliation": "Birds Inc."
+  },
+  "https://dataverse.org/schema/citation/datasetContact": {
+    "https://dataverse.org/schema/citation/datasetContactEmail": "finch@mailinator.com",
+    "https://dataverse.org/schema/citation/datasetContactName": "Finch, Fiona"
+  },
+  "https://dataverse.org/schema/citation/dsDescription": {
+    "https://dataverse.org/schema/citation/dsDescriptionValue": "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds."
+  }
+}
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/api/dataset-create_en.jsonld b/doc/sphinx-guides/source/_static/api/dataset-create_en.jsonld
new file mode 100644
index 00000000000..9bb36a609ed
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataset-create_en.jsonld
@@ -0,0 +1,16 @@
+{
+  "http://purl.org/dc/terms/title": "Darwin's Finches",
+  "http://purl.org/dc/terms/subject": "Medicine, Health and Life Sciences",
+  "http://schema.org/inLanguage":"en",
+  "http://purl.org/dc/terms/creator": {
+      "https://dataverse.org/schema/citation/author#Name": "Finch, Fiona",
+      "https://dataverse.org/schema/citation/author#Affiliation": "Birds Inc."
+  },
+  "https://dataverse.org/schema/citation/Contact": {
+    "https://dataverse.org/schema/citation/datasetContact#E-mail": "finch@mailinator.com",
+    "https://dataverse.org/schema/citation/datasetContact#Name": "Finch, Fiona"
+  },
+  "https://dataverse.org/schema/citation/Description": {
+    "https://dataverse.org/schema/citation/dsDescription#Text": "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds."
+  }
+}
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/api/dataset-edit-metadata-delete-fields-sample.json b/doc/sphinx-guides/source/_static/api/dataset-edit-metadata-delete-fields-sample.json
new file mode 100644
index 00000000000..94625f2f7fb
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataset-edit-metadata-delete-fields-sample.json
@@ -0,0 +1,50 @@
+{
+  "fields": [
+    {
+      "typeName": "alternativeTitle",
+      "multiple": true,
+      "typeClass": "primitive",
+      "value": []
+    },
+    {
+      "typeName": "distributor",
+      "multiple": true,
+      "typeClass": "compound",
+      "value": [
+        {
+          "distributorName": {
+            "typeName": "distributorName",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": ""
+          },
+          "distributorAffiliation": {
+            "typeName": "distributorAffiliation",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": ""
+          }
+        }
+      ]
+    },
+    {
+      "fields": [
+        {
+          "typeName": "author",
+          "value": [
+            {
+              "authorName": {
+                "typeName": "authorName",
+                "value": "Belicheck, Bill"
+              },
+              "authorAffiliation": {
+                "typeName": "authorIdentifierScheme",
+                "value": ""
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/doc/sphinx-guides/source/_static/api/dataset-migrate.jsonld b/doc/sphinx-guides/source/_static/api/dataset-migrate.jsonld
new file mode 100644
index 00000000000..bd882846da1
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataset-migrate.jsonld
@@ -0,0 +1,63 @@
+{
+"citation:depositor": "Admin, Dataverse",
+"title": "Test Dataset",
+"socialscience:collectionMode": [
+  "demonstration"
+],
+"subject": "Computer and Information Science",
+"geospatial:geographicCoverage": [
+  {
+    "geospatial:otherGeographicCoverage": "Cambridge"
+  },
+  {
+    "geospatial:otherGeographicCoverage": "Massachusetts"
+  }
+],
+"author": {
+  "citation:authorName": "Admin, Dataverse",
+  "citation:authorAffiliation": "GDCC"
+},
+"kindOfData": "demonstration data",
+"citation:keyword": [
+  {
+    "citation:keywordValue": "first keyword"
+  },
+  {
+    "citation:keywordValue": "second keyword"
+  }
+],
+"dateOfDeposit": "2020-10-08",
+"citation:distributor": {
+  "citation:distributorName": "Demo Dataverse Repository",
+  "citation:distributorAffiliation": "Dataverse Community",
+  "citation:distributorAbbreviation": "GDCC",
+  "citation:distributorURL": "https://dataverse.org/global-dataverse-community-consortium"
+},
+"citation:datasetContact": {
+"citation:datasetContactName": "Admin, Dataverse",
+"citation:datasetContactAffiliation": "GDCC",
+"citation:datasetContactEmail": "admin@demo.dataverse.org"
+},
+"citation:dsDescription": {
+  "citation:dsDescriptionValue": "A short description"
+},
+"@id": "doi:10.33564/FK27U7YBV",
+"schema:version": "1.0",
+"schema:license": "http://creativecommons.org/publicdomain/zero/1.0",
+"schema:datePublished": "2021-07-21",
+"dvcore:fileTermsOfAccess": {
+"dvcore:fileRequestAccess": false
+},
+"@context": {
+  "author": "http://purl.org/dc/terms/creator",
+  "dateOfDeposit": "http://purl.org/dc/terms/dateSubmitted",
+  "subject": "http://purl.org/dc/terms/subject",
+  "title": "http://purl.org/dc/terms/title",
+  "citation": "https://dataverse.org/schema/citation/",
+  "dvcore": "https://dataverse.org/schema/core#",
+  "schema": "http://schema.org/",
+  "geospatial": "dataverse.siteUrl/schema/geospatial#",
+  "socialscience": "dataverse.siteUrl/schema/socialscience#",
+  "kindOfData": "http://rdf-vocabulary.ddialliance.org/discovery#kindOfData"
+  }
+}
diff --git a/doc/sphinx-guides/source/_static/api/dataset-schema.json b/doc/sphinx-guides/source/_static/api/dataset-schema.json
new file mode 100644
index 00000000000..85ea5a0d773
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataset-schema.json
@@ -0,0 +1,125 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$defs": {
+    "field": {
+        "type": "object",
+        "required": ["typeClass", "multiple", "typeName"],
+        "properties": {
+            "value": {
+                "anyOf": [
+                    {
+                        "type": "array"
+                    },
+                    {
+                        "type": "string"
+                    },
+                    {
+                        "$ref": "#/$defs/field"
+                    }
+                ]
+            },
+            "typeClass": {
+                "type": "string"
+            },
+            "multiple": {
+                "type": "boolean"
+            },
+            "typeName": {
+                "type": "string"
+            },
+            "displayOnCreate": {
+                "type": "boolean"
+            }
+        }
+    }
+},
+"type": "object",
+"properties": {
+    "datasetVersion": {
+        "type": "object",
+        "properties": {
+           "license": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "uri": {
+                        "type": "string",
+                        "format": "uri"
+                   }
+                },
+                "required": ["name", "uri"]
+            },
+            "metadataBlocks": {
+                "type": "object",
+               "properties": {
+                           "citation": {
+                            "type": "object",
+                            "properties": {
+                                "fields": {
+                                    "type": "array",
+                                    "items": {
+                                        "$ref": "#/$defs/field"
+                                    },
+                                    "minItems": 5,
+                                    "allOf": [
+                                        {
+                                            "contains": {
+                                                "properties": {
+                                                    "typeName": {
+                                                        "const": "title"
+                                                    }
+                                                }
+                                            }
+                                        },
+                                        {
+                                            "contains": {
+                                                "properties": {
+                                                    "typeName": {
+                                                        "const": "author"
+                                                    }
+                                                }
+                                            }
+                                        },
+                                        {
+                                            "contains": {
+                                                "properties": {
+                                                    "typeName": {
+                                                        "const": "datasetContact"
+                                                    }
+                                                }
+                                            }
+                                        },
+                                        {
+                                            "contains": {
+                                                "properties": {
+                                                    "typeName": {
+                                                        "const": "dsDescription"
+                                                    }
+                                                }
+                                            }
+                                        },
+                                        {
+                                            "contains": {
+                                                "properties": {
+                                                    "typeName": {
+                                                        "const": "subject"
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    ]
+                                }
+                            },
+                            "required": ["fields"]
+                        }
+                     },
+                    "required": ["citation"]
+                }
+            },
+            "required": ["metadataBlocks"]
+        }
+    },
+    "required": ["datasetVersion"]
+}
diff --git a/doc/sphinx-guides/source/_static/api/dataset-update-metadata.json b/doc/sphinx-guides/source/_static/api/dataset-update-metadata.json
index 6e499d4e164..dcb3e136907 100644
--- a/doc/sphinx-guides/source/_static/api/dataset-update-metadata.json
+++ b/doc/sphinx-guides/source/_static/api/dataset-update-metadata.json
@@ -1,4 +1,8 @@
 {
+  "license": {
+    "name": "CC0 1.0",
+    "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+  },
   "metadataBlocks": {
     "citation": {
       "displayName": "Citation Metadata",
diff --git a/doc/sphinx-guides/source/_static/api/dataverse-complete-optional-params.json b/doc/sphinx-guides/source/_static/api/dataverse-complete-optional-params.json
new file mode 100644
index 00000000000..fef32aa1e2c
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataverse-complete-optional-params.json
@@ -0,0 +1,65 @@
+{
+  "name": "Scientific Research",
+  "alias": "science",
+  "dataverseContacts": [
+    {
+      "contactEmail": "pi@example.edu"
+    },
+    {
+      "contactEmail": "student@example.edu"
+    }
+  ],
+  "affiliation": "Scientific Research University",
+  "description": "We do all the science.",
+  "dataverseType": "LABORATORY",
+  "metadataBlocks": {
+    "metadataBlockNames": [
+      "citation", "geospatial"
+    ],
+    "inputLevels": [
+      {
+        "datasetFieldTypeName": "geographicCoverage",
+        "include": true,
+        "required": true
+      },
+      {
+        "datasetFieldTypeName": "country",
+        "include": true,
+        "required": true
+      },
+      {
+        "datasetFieldTypeName": "geographicUnit",
+        "include": false,
+        "required": false
+      },
+      {
+        "datasetFieldTypeName": "geographicBoundingBox",
+        "include": false,
+        "required": false
+      },
+      {
+        "datasetFieldTypeName": "westLongitude",
+        "include": false,
+        "required": false
+      },
+      {
+        "datasetFieldTypeName": "eastLongitude",
+        "include": false,
+        "required": false
+      },
+      {
+        "datasetFieldTypeName": "northLatitude",
+        "include": false,
+        "required": false
+      },
+      {
+        "datasetFieldTypeName": "southLatitude",
+        "include": false,
+        "required": false
+      }
+    ],
+    "facetIds": [
+      "authorName", "authorAffiliation"
+    ]
+  }
+}
diff --git a/doc/sphinx-guides/source/_static/api/dataverse-facets.json b/doc/sphinx-guides/source/_static/api/dataverse-facets.json
new file mode 100644
index 00000000000..20a8412440d
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataverse-facets.json
@@ -0,0 +1 @@
+["authorName", "authorAffiliation"]
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/api/dataverse-template.json b/doc/sphinx-guides/source/_static/api/dataverse-template.json
new file mode 100644
index 00000000000..373d3edefa7
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataverse-template.json
@@ -0,0 +1,27 @@
+{
+  "name": "Dataverse template",
+  "isDefault": true,
+  "fields": [
+    {
+      "typeName": "author",
+      "value": [
+        {
+          "authorName": {
+            "typeName": "authorName",
+            "value": "Belicheck, Bill"
+          },
+          "authorAffiliation": {
+            "typeName": "authorIdentifierScheme",
+            "value": "ORCID"
+          }
+        }
+      ]
+    }
+  ],
+  "instructions": [
+    {
+      "instructionField": "author",
+      "instructionText": "The author data"
+    }
+  ]
+}
diff --git a/doc/sphinx-guides/source/_static/api/ddi_dataset.xml b/doc/sphinx-guides/source/_static/api/ddi_dataset.xml
new file mode 100644
index 00000000000..3b155fc7e55
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/ddi_dataset.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<codeBook xmlns="ddi:codebook:2_5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddi:codebook:2_5 https://ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd" version="2.5">
+  <docDscr>
+    <citation>
+      <titlStmt>
+        <titl>Replication Data for: Title</titl>
+      </titlStmt>
+      <distStmt>
+        <distrbtr source="archive">Root</distrbtr>
+        <distDate>2020-02-19</distDate>
+      </distStmt>
+      <verStmt source="archive">
+        <version date="2020-02-19" type="RELEASED">1</version>
+      </verStmt>
+      <biblCit>LastAuthor1, FirstAuthor1; LastAuthor2, FirstAuthor2, 2020, "Replication Data for: Title", Root, V1</biblCit>
+    </citation>
+  </docDscr>
+  <stdyDscr>
+    <citation>
+      <titlStmt>
+        <titl>Replication Data for: Title</titl>
+        <subTitl>Subtitle</subTitl>
+        <altTitl>Alternative Title</altTitl>
+        <IDNo agency="OtherIDAgency1">OtherIDIdentifier1</IDNo>
+        <IDNo agency="OtherIDAgency2">OtherIDIdentifier2</IDNo>
+      </titlStmt>
+      <rspStmt>
+        <AuthEnty affiliation="AuthorAffiliation1">LastAuthor1, FirstAuthor1</AuthEnty>
+        <AuthEnty affiliation="AuthorAffiliation2">LastAuthor2, FirstAuthor2</AuthEnty>
+        <othId role="Data Collector">LastContributor1, FirstContributor1</othId>
+        <othId role="Data Curator">LastContributor2, FirstContributor2</othId>
+      </rspStmt>
+      <prodStmt>
+        <producer affiliation="ProducerAffiliation1" abbr="ProducerAbbreviation1" role="http://ProducerLogoURL1.org" URI="http://ProducerURL1.org">LastProducer1, FirstProducer1</producer>
+        <producer affiliation="ProducerAffiliation2" abbr="ProducerAbbreviation2" role="http://ProducerLogoURL2.org" URI="http://ProducerURL2.org">LastProducer2, FirstProducer2</producer>
+        <prodDate>1003-01-01</prodDate>
+        <prodPlac>ProductionPlace One</prodPlac>
+        <prodPlac>ProductionPlace Two</prodPlac>
+        <software version="SoftwareVersion1">SoftwareName1</software>
+        <software version="SoftwareVersion2">SoftwareName2</software>
+        <grantNo agency="GrantInformationGrantAgency1">GrantInformationGrantNumber1</grantNo>
+        <grantNo agency="GrantInformationGrantAgency2">GrantInformationGrantNumber2</grantNo>
+      </prodStmt>
+      <distStmt>
+        <distrbtr source="archive">Root</distrbtr>
+        <distrbtr affiliation="DistributorAffiliation1" abbr="DistributorAbbreviation1" URI="http://DistributorURL1.org" role="http://DistributorLogoURL1.org">LastDistributor1, FirstDistributor1</distrbtr>
+        <distrbtr affiliation="DistributorAffiliation2" abbr="DistributorAbbreviation2" URI="http://DistributorURL2.org" role="http://DistributorLogoURL2.org">LastDistributor2, FirstDistributor2</distrbtr>
+        <contact affiliation="ContactAffiliation1" email="ContactEmail1@mailinator.com">LastContact1, FirstContact1</contact>
+        <contact affiliation="ContactAffiliation2" email="ContactEmail2@mailinator.com">LastContact2, FirstContact2</contact>
+        <distDate>1004-01-01</distDate>
+        <depositr>LastDepositor, FirstDepositor</depositr>
+        <depDate>1002-01-01</depDate>
+      </distStmt>
+      <serStmt>
+        <serName>SeriesName One</serName>
+        <serInfo>SeriesInformation One</serInfo>
+      </serStmt>
+      <serStmt>
+        <serName>SeriesName Two</serName>
+        <serInfo>SeriesInformation Two</serInfo>
+      </serStmt>
+    </citation>
+    <stdyInfo>
+      <subject>
+        <keyword xml:lang="en">Agricultural Sciences</keyword>
+        <keyword xml:lang="en">Business and Management</keyword>
+        <keyword xml:lang="en">Engineering</keyword>
+        <keyword xml:lang="en">Law</keyword>
+        <keyword vocab="KeywordVocabulary1" vocabURI="http://KeywordVocabularyURL1.org">KeywordTerm1</keyword>
+        <keyword vocab="KeywordVocabulary2" vocabURI="http://KeywordVocabularyURL2.org">KeywordTerm2</keyword>
+      </subject>
+      <abstract date="1000-01-01">DescriptionText 1</abstract>
+      <abstract date="1000-02-02">DescriptionText2</abstract>
+      <sumDscr>
+        <timePrd cycle="P1" event="start" date="1005-01-01">1005-01-01</timePrd>
+        <timePrd cycle="P1" event="end" date="1005-01-02">1005-01-02</timePrd>
+        <timePrd cycle="P2" event="start" date="1005-02-01">1005-02-01</timePrd>
+        <timePrd cycle="P2" event="end" date="1005-02-02">1005-02-02</timePrd>
+        <collDate cycle="P1" event="start" date="1006-01-01">1006-01-01</collDate>
+        <collDate cycle="P1" event="end" date="1006-01-01">1006-01-01</collDate>
+        <collDate cycle="P2" event="start" date="1006-02-01">1006-02-01</collDate>
+        <collDate cycle="P2" event="end" date="1006-02-02">1006-02-02</collDate>
+        <dataKind>KindOfData1</dataKind>
+        <dataKind>KindOfData2</dataKind>
+        <nation>Afghanistan</nation>
+        <geogCover>GeographicCoverageCity1</geogCover>
+        <geogCover>GeographicCoverageStateProvince1</geogCover>
+        <geogCover>GeographicCoverageOther1</geogCover>
+        <nation>Albania</nation>
+        <geogCover>GeographicCoverageCity2</geogCover>
+        <geogCover>GeographicCoverageStateProvince2</geogCover>
+        <geogCover>GeographicCoverageOther2</geogCover>
+        <geoBndBox>
+          <westBL>10</westBL>
+          <eastBL>20</eastBL>
+          <northBL>40</northBL>
+          <southBL>30</southBL>
+        </geoBndBox>
+        <geoBndBox>
+          <southBL>70</southBL>
+          <northBL>80</northBL>
+          <eastBL>60</eastBL>
+          <westBL>50</westBL>
+        </geoBndBox>
+        <geogUnit>GeographicUnit1</geogUnit>
+        <geogUnit>GeographicUnit2</geogUnit>
+        <anlyUnit>UnitOfAnalysis1</anlyUnit>
+        <anlyUnit>UnitOfAnalysis2</anlyUnit>
+        <universe>Universe1</universe>
+        <universe>Universe2</universe>
+      </sumDscr>
+      <notes>Notes1</notes>
+    </stdyInfo>
+    <method>
+      <dataColl>
+        <timeMeth>TimeMethod</timeMeth>
+        <dataCollector>LastDataCollector1, FirstDataCollector1</dataCollector>
+        <collectorTraining>CollectorTraining</collectorTraining>
+        <frequenc>Frequency</frequenc>
+        <sampProc>SamplingProcedure</sampProc>
+        <targetSampleSize>
+          <sampleSizeFormula>TargetSampleSizeFormula</sampleSizeFormula>
+          <sampleSize>100</sampleSize>
+        </targetSampleSize>
+        <deviat>MajorDeviationsForSampleDesign</deviat>
+        <sources>
+          <dataSrc>DataSources1</dataSrc>
+          <dataSrc>DataSources2</dataSrc>
+          <srcOrig>OriginOfSources</srcOrig>
+          <srcChar>CharacteristicOfSourcesNoted</srcChar>
+          <srcDocu>DocumentationAndAccessToSources</srcDocu>
+        </sources>
+        <collMode>CollectionMode</collMode>
+        <resInstru>TypeOfResearchInstrument</resInstru>
+        <collSitu>CharacteristicsOfDataCollectionSituation</collSitu>
+        <actMin>ActionsToMinimizeLosses</actMin>
+        <conOps>ControlOperations</conOps>
+        <weight>Weighting</weight>
+        <cleanOps>CleaningOperations</cleanOps>
+      </dataColl>
+      <anlyInfo>
+        <respRate>ResponseRate</respRate>
+        <EstSmpErr>EstimatesOfSamplingError</EstSmpErr>
+        <dataAppr>OtherFormsOfDataAppraisal</dataAppr>
+      </anlyInfo>
+      <notes type="NotesType" subject="NotesSubject">NotesText</notes>
+    </method>
+    <dataAccs>
+      <notes type="DVN:TOA" level="dv">Terms of Access</notes>
+      <notes type="DVN:TOU" level="dv">Terms of Use</notes>
+      <setAvail>
+        <accsPlac>Data Access Place</accsPlac>
+        <origArch>Original Archive</origArch>
+        <avlStatus>Availability Status</avlStatus>
+        <collSize>Size of Collection</collSize>
+        <complete>Study Completion</complete>
+      </setAvail>
+      <useStmt>
+        <confDec>Confidentiality Declaration</confDec>
+        <specPerm>Special Permissions</specPerm>
+        <restrctn>Restrictions</restrctn>
+        <contact>Contact for Access</contact>
+        <citReq>Citation Requirements</citReq>
+        <deposReq>Depositor Requirements</deposReq>
+        <conditions>Conditions </conditions>
+        <disclaimer>Disclaimer</disclaimer>
+      </useStmt>
+    </dataAccs>
+    <othrStdyMat>
+      <relMat>RelatedMaterial1</relMat>
+      <relMat>RelatedMaterial2</relMat>
+      <relStdy>RelatedDatasets1</relStdy>
+      <relStdy>RelatedDatasets2</relStdy>
+      <relPubl>
+        <citation>
+          <titlStmt>
+            <IDNo agency="ark">RelatedPublicationIDNumber1</IDNo>
+          </titlStmt>
+          <biblCit>RelatedPublicationCitation1</biblCit>
+        </citation>
+        <ExtLink URI="http://RelatedPublicationURL1.org"/>
+      </relPubl>
+      <relPubl>
+        <citation>
+          <titlStmt>
+            <IDNo agency="arXiv">RelatedPublicationIDNumber2</IDNo>
+          </titlStmt>
+          <biblCit>RelatedPublicationCitation2</biblCit>
+        </citation>
+        <ExtLink URI="http://RelatedPublicationURL2.org"/>
+      </relPubl>
+      <othRefs>OtherReferences1</othRefs>
+      <othRefs>OtherReferences2</othRefs>
+    </othrStdyMat>
+    <notes>StudyLevelErrorNotes</notes>
+  </stdyDscr>
+</codeBook>
diff --git a/doc/sphinx-guides/source/_static/api/file-provenance.json b/doc/sphinx-guides/source/_static/api/file-provenance.json
new file mode 100644
index 00000000000..6c823cdb5f3
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/file-provenance.json
@@ -0,0 +1 @@
+{"prefix": {"pre_0": "http://www.w3.org/2001/XMLSchema", "s-prov": "http://s-prov/ns/#", "provone": "http://purl.dataone.org/provone/2015/01/15/ontology#", "vargen": "http://openprovenance.org/vargen#", "foaf": "http://xmlns.com/foaf/0.1/", "dcterms": "http://purl.org/dc/terms/", "tmpl": "http://openprovenance.org/tmpl#", "var": "http://openprovenance.org/var#", "vcard": "http://www.w3.org/2006/vcard/ns#", "swirrl": "http://project-dare.eu/ns#"}, "bundle": {"vargen:SessionSnapshot": {"prefix": {"s-prov": "http://s-prov/ns/#", "provone": "http://purl.dataone.org/provone/2015/01/15/ontology#", "vargen": "http://openprovenance.org/vargen#", "tmpl": "http://openprovenance.org/tmpl#", "var": "http://openprovenance.org/var#", "vcard": "http://www.w3.org/2006/vcard/ns#", "swirrl": "http://project-dare.eu/ns#"}, "entity": {"vargen:inData": {"swirrl:volumeId": {"$": "var:rawVolumeId", "type": "prov:QUALIFIED_NAME"}, "prov:type": {"$": "provone:Data", "type": "prov:QUALIFIED_NAME"}}, "vargen:inFile": {"prov:atLocation": {"$": "var:atLocation", "type": "prov:QUALIFIED_NAME"}, "s-prov:format": {"$": "var:format", "type": "prov:QUALIFIED_NAME"}, "s-prov:checksum": {"$": "var:checksum", "type": "prov:QUALIFIED_NAME"}}, "vargen:WorkData": {"swirrl:volumeId": {"$": "var:workVolumeId", "type": "prov:QUALIFIED_NAME"}, "prov:type": {"$": "provone:Data", "type": "prov:QUALIFIED_NAME"}}, "var:JupSnapshot": {"prov:generatedAt": {"$": "var:generatedAt", "type": "prov:QUALIFIED_NAME"}, "prov:atLocation": {"$": "var:repoUrl", "type": "prov:QUALIFIED_NAME"}, "s-prov:description": {"$": "var:description", "type": "prov:QUALIFIED_NAME"}, "prov:type": {"$": "swirrl:NotebookSnapshot", "type": "prov:QUALIFIED_NAME"}, "swirrl:sessionId": {"$": "var:sessionId", "type": "prov:QUALIFIED_NAME"}}}, "used": {"_:id1": {"prov:activity": "vargen:snapshot", "prov:entity": "var:Jupyter"}, "_:id2": {"prov:activity": "vargen:snapshot", "prov:entity": "vargen:WorkData"}, "_:id3": {"prov:activity": "vargen:snapshot", "prov:entity": "vargen:inData"}}, "wasDerivedFrom": {"_:id4": {"prov:usedEntity": "var:Jupyter", "prov:generatedEntity": "var:JupSnapshot"}}, "wasAssociatedWith": {"_:id5": {"prov:activity": "vargen:snapshot", "prov:agent": "var:snapAgent"}}, "actedOnBehalfOf": {"_:id6": {"prov:delegate": "var:snapAgent", "prov:responsible": "var:user"}}, "activity": {"vargen:snapshot": {"prov:atLocation": {"$": "var:method_path", "type": "prov:QUALIFIED_NAME"}, "tmpl:startTime": {"$": "var:startTime", "type": "prov:QUALIFIED_NAME"}, "tmpl:endTime": {"$": "var:endTime", "type": "prov:QUALIFIED_NAME"}}}, "wasGeneratedBy": {"_:id7": {"prov:activity": "vargen:snapshot", "prov:entity": "var:JupSnapshot"}}, "agent": {"var:user": {"vcard:uid": {"$": "var:name", "type": "prov:QUALIFIED_NAME"}, "swirrl:authMode": {"$": "var:authmode", "type": "prov:QUALIFIED_NAME"}, "swirrl:group": {"$": "var:group", "type": "prov:QUALIFIED_NAME"}, "prov:type": {"$": "prov:Person", "type": "prov:QUALIFIED_NAME"}}, "var:snapAgent": {"vcard:uid": {"$": "var:name_api", "type": "prov:QUALIFIED_NAME"}, "prov:type": {"$": "prov:SoftwareAgent", "type": "prov:QUALIFIED_NAME"}}}, "hadMember": {"_:id8": {"prov:collection": "vargen:inData", "prov:entity": "vargen:inFile"}}}}}
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/api/harvesting-client.json b/doc/sphinx-guides/source/_static/api/harvesting-client.json
new file mode 100644
index 00000000000..eaaa4489381
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/harvesting-client.json
@@ -0,0 +1,12 @@
+{
+  "nickName": "zenodo",
+  "dataverseAlias": "zenodoHarvested",
+  "harvestUrl": "https://zenodo.org/oai2d",
+  "archiveUrl": "https://zenodo.org",
+  "archiveDescription": "MoissonnÊ depuis la collection LMOPS de l'entrepôt Zenodo. En cliquant sur ce jeu de donnÊes, vous serez redirigÊ vers Zenodo.",
+  "metadataFormat": "oai_dc",
+  "customHeaders": "x-oai-api-key: xxxyyyzzz",
+  "set": "user-lmops",
+  "schedule": "Weekly, Sat 5 AM",
+  "allowHarvestingMissingCVV":true
+}
diff --git a/doc/sphinx-guides/source/_static/api/metadata-block-facets.json b/doc/sphinx-guides/source/_static/api/metadata-block-facets.json
new file mode 100644
index 00000000000..bc497846592
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/metadata-block-facets.json
@@ -0,0 +1 @@
+["socialscience", "geospatial"]
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/api/subject-update-metadata.json b/doc/sphinx-guides/source/_static/api/subject-update-metadata.json
new file mode 100644
index 00000000000..ad9f15b8f8a
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/subject-update-metadata.json
@@ -0,0 +1,11 @@
+{
+    "fields": [
+        {
+            "typeName": "subject",
+            "typeClass": "controlledVocabulary",
+            "value": ["Social Sciences"]
+        }
+    ]
+}
+
+
diff --git a/doc/sphinx-guides/source/_static/api/transform-oai-ore-jsonld.xq b/doc/sphinx-guides/source/_static/api/transform-oai-ore-jsonld.xq
new file mode 100644
index 00000000000..6292f39fbde
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/transform-oai-ore-jsonld.xq
@@ -0,0 +1,16 @@
+declare option output:method "json";
+
+let $parameters:={ 'method': 'json' }
+for $record in /json
+  let $metadata:=$record/ore_003adescribes
+  
+
+  let $json:=
+    <json type="object">
+      {$metadata/*}
+      {$record/_0040context}
+    </json>
+
+
+  return if ($metadata) then
+      file:write("converted.json",$json, $parameters)
\ No newline at end of file
diff --git a/scripts/vagrant/counter-processor-config.yaml b/doc/sphinx-guides/source/_static/developers/counter-processor-config.yaml
similarity index 99%
rename from scripts/vagrant/counter-processor-config.yaml
rename to doc/sphinx-guides/source/_static/developers/counter-processor-config.yaml
index 4227de89f40..445c47827f1 100644
--- a/scripts/vagrant/counter-processor-config.yaml
+++ b/doc/sphinx-guides/source/_static/developers/counter-processor-config.yaml
@@ -44,7 +44,7 @@ output_file: /dataverse/sushi_sample_logs
 output_format: json
 
 # the name of the platform that goes into your reports
-platform: Dash
+platform: Dataverse
 
 # Don't put your api token in here if you're going to commit it, but put in separate secrets.yaml in same
 # directory as the config or else set a environment variable when starting up in order to override the key.
diff --git a/doc/sphinx-guides/source/_static/docsdataverse_org.css b/doc/sphinx-guides/source/_static/docsdataverse_org.css
index 7ed784e91e0..d861a788681 100755
--- a/doc/sphinx-guides/source/_static/docsdataverse_org.css
+++ b/doc/sphinx-guides/source/_static/docsdataverse_org.css
@@ -35,6 +35,10 @@ iframe {
 
 a.navbar-brand, a.navbar-brand:hover {
     color:#C55B28 !important;
+    height: 50px;
+    background: rgba(0, 0, 0, 0) url("../_static/images/dataverseicon.png") no-repeat scroll 0 8px;
+    line-height: 20px;
+    padding-left: 26px;
 }
 span.navbar-brand {color:#C55B28 !important; padding-left: 32px; height: 50px;}
 span.navbar-brand .icon-dataverse {color:#C55B28; font-size:28px; margin: -4px 0 0 -27px; position: absolute;}
@@ -48,25 +52,20 @@ ul.navbar-nav li.dropdown.open > span.dropdown-toggle {background: #e7e7e7;}
 .text-dataset {color:#31708F;}
 .text-file {color:#777777;}
 
-#dataverse-org-homepage-url {
-    height: 50px;
-    background: rgba(0, 0, 0, 0) url("../_static/images/dataverseicon.png") no-repeat scroll 0 8px;
-    line-height: 20px;
-    padding-left: 26px;
-}
-
 .navbar-default .navbar-nav > li > a {
     color: #303030 !important;
 }
 
 a.headerlink {
-	display: none;
+    font-size: 60%;
+    vertical-align: middle;
+    color: #d14e6f;
 }
 
 #sidebar.bs-sidenav {
     background-color: #f8d5b8;
 }
-#sidebar.bs-sidenav .nav > li > a:hover, #sidebar.bs-sidenav .nav > li > a:focus {
+#sidebar.bs-sidenav .nav > li > a:hover, #sidebar.bs-sidenav .nav > li > a:focus, #sidebar.bs-sidenav .nav > li > a.current {
     background-color: #fbf4c5;
     border-right: 1px solid #dbd8e0;
     text-decoration: none;
@@ -103,6 +102,67 @@ div.code-example .messagePanel .glyphicon {
 div.code-example span.glyphicon-question-sign.tooltip-icon {color: #99bcdb !important;}
 div.code-example span.glyphicon-question-sign.tooltip-icon:hover {color: #337AB7 !important;}
 
+div.code-example .btn-group .btn-link {font-size:2em !important;}
+div.code-example .btn-group .btn.btn-link.bootstrap-button-tooltip span.caret {margin-left: 6px;}
+
+div.code-example .btn.btn-default.btn-access {background-color: #fff;background-image:none;}
+div.code-example .btn.btn-default.btn-access:focus, div.code-example .btn.btn-default.btn-access:hover, div.code-example .btn.btn-default.btn-access:active {background-color: #e6e6e6;background-image:none;}
+
+/* Dropdown submenu */
+div.code-example .dropdown-submenu {
+    position: relative;
+}
+div.code-example .dropdown-submenu.pull-left {
+    width: 100%;
+}
+div.code-example .dropdown-submenu>.dropdown-menu {
+    top: 0;
+    left: 100%;
+    margin-top: -6px;
+    margin-left: -1px;
+    -webkit-border-radius: 0 6px 6px 6px;
+    -moz-border-radius: 0 6px 6px;
+    border-radius: 0 6px 6px 6px;
+}
+div.code-example .dropdown-submenu.pull-left>.dropdown-menu {
+    float: right;
+    min-width: 100%;
+}
+
+div.code-example .dropdown-submenu:hover>.dropdown-menu {
+    display: block;
+}
+
+div.code-example .dropdown-submenu>a:after {
+    display: block;
+    content: " ";
+    float: right;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+    border-width: 5px 0 5px 5px;
+    border-left-color: #ccc;
+    margin-top: 5px;
+    margin-right: -10px;
+}
+
+div.code-example .dropdown-submenu:hover>a:after {
+    border-left-color: #fff;
+}
+
+div.code-example .dropdown-submenu.pull-left {
+    float: none;
+}
+
+div.code-example .dropdown-submenu.pull-left>.dropdown-menu {
+    left: -100%;
+    margin-left: 10px;
+    -webkit-border-radius: 6px 0 6px 6px;
+    -moz-border-radius: 6px 0 6px 6px;
+    border-radius: 6px 0 6px 6px;
+}
+
 #breadcrumbNavBlock {margin-top:.5em;}
 #breadcrumbNavBlock .breadcrumbBlock {float:left; position:relative;}
 #breadcrumbNavBlock .breadcrumbActive {font-weight:bold;}
@@ -119,3 +179,11 @@ div.form-group .glyphicon.glyphicon-asterisk {font-size: .5em; vertical-align: t
 pre {
     white-space: pre-wrap;
 }
+
+div.sphinx-tabs {
+    width: 100%;
+}
+
+li div.sphinx-tabs {
+    padding-left: 0;
+}
diff --git a/doc/sphinx-guides/source/_static/fontcustom-preview.html b/doc/sphinx-guides/source/_static/fontcustom-preview.html
new file mode 100644
index 00000000000..7d0d707a674
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/fontcustom-preview.html
@@ -0,0 +1,429 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>fontcustom glyphs preview</title>
+
+    <style>
+      /* Page Styles */
+
+      * {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        margin: 0;
+        padding: 0;
+      }
+
+      body {
+        background: #fff;
+        color: #444;
+        font: 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
+      }
+
+      a,
+      a:visited {
+        color: #888;
+        text-decoration: underline;
+      }
+      a:hover,
+      a:focus { color: #000; }
+
+      header {
+        border-bottom: 2px solid #ddd;
+        margin-bottom: 20px;
+        overflow: hidden;
+        padding: 20px 0;
+      }
+
+      header h1 {
+        color: #888;
+        float: left;
+        font-size: 36px;
+        font-weight: 300;
+      }
+
+      header a {
+        float: right;
+        font-size: 14px;
+      }
+
+      .container {
+        margin: 0 auto;
+        max-width: 1200px;
+        min-width: 960px;
+        padding: 0 40px;
+        width: 90%;
+      }
+
+      .glyph {
+        border-bottom: 1px dotted #ccc;
+        padding: 10px 0 20px;
+        margin-bottom: 20px;
+      }
+
+      .preview-glyphs { vertical-align: bottom; }
+
+      .preview-scale {
+        color: #888;
+        font-size: 12px;
+        margin-top: 5px;
+      }
+
+      .step {
+        display: inline-block;
+        line-height: 1;
+        position: relative;
+        width: 10%;
+      }
+
+      .step .letters,
+      .step i {
+        -webkit-transition: opacity .3s;
+        -moz-transition: opacity .3s;
+        -ms-transition: opacity .3s;
+        -o-transition: opacity .3s;
+        transition: opacity .3s;
+      }
+
+      .step:hover .letters { opacity: 1; }
+      .step:hover i { opacity: .3; }
+
+      .letters {
+        opacity: .3;
+        position: absolute;
+      }
+
+      .characters-off .letters { display: none; }
+      .characters-off .step:hover i { opacity: 1; }
+
+      
+      .size-12 { font-size: 12px; }
+      
+      .size-14 { font-size: 14px; }
+      
+      .size-16 { font-size: 16px; }
+      
+      .size-18 { font-size: 18px; }
+      
+      .size-21 { font-size: 21px; }
+      
+      .size-24 { font-size: 24px; }
+      
+      .size-36 { font-size: 36px; }
+      
+      .size-48 { font-size: 48px; }
+      
+      .size-60 { font-size: 60px; }
+      
+      .size-72 { font-size: 72px; }
+      
+
+      .usage { margin-top: 10px; }
+
+      .usage input {
+        font-family: monospace;
+        margin-right: 3px;
+        padding: 2px 5px;
+        text-align: center;
+      }
+
+      .usage .point { width: 150px; }
+
+      .usage .class { width: 250px; }
+
+      footer {
+        color: #888;
+        font-size: 12px;
+        padding: 20px 0;
+      }
+
+      /* Icon Font: fontcustom */
+
+      @font-face {
+  font-family: "fontcustom";
+  src: url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot");
+  src: url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot?#iefix") format("embedded-opentype"),
+       url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff2") format("woff2"),
+       url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff") format("woff"),
+       url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.ttf") format("truetype"),
+       url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg#fontcustom") format("svg");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  @font-face {
+    font-family: "fontcustom";
+    src: url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg#fontcustom") format("svg");
+  }
+}
+
+      [data-icon]:before { content: attr(data-icon); }
+
+      [data-icon]:before,
+      .icon-astro:before,
+.icon-audio:before,
+.icon-code:before,
+.icon-dataset:before,
+.icon-dataverse:before,
+.icon-document:before,
+.icon-file:before,
+.icon-geodata:before,
+.icon-image:before,
+.icon-network:before,
+.icon-other:before,
+.icon-package:before,
+.icon-tabular:before,
+.icon-unlock:before,
+.icon-video:before {
+        display: inline-block;
+  font-family: "fontcustom";
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  line-height: 1;
+  text-decoration: inherit;
+  text-rendering: optimizeLegibility;
+  text-transform: none;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  font-smoothing: antialiased;
+      }
+
+      .icon-astro:before { content: "\f114"; }
+.icon-audio:before { content: "\f115"; }
+.icon-code:before { content: "\f116"; }
+.icon-dataset:before { content: "\f117"; }
+.icon-dataverse:before { content: "\f118"; }
+.icon-document:before { content: "\f119"; }
+.icon-file:before { content: "\f11a"; }
+.icon-geodata:before { content: "\f11b"; }
+.icon-image:before { content: "\f11c"; }
+.icon-network:before { content: "\f11d"; }
+.icon-other:before { content: "\f11f"; }
+.icon-package:before { content: "\f120"; }
+.icon-tabular:before { content: "\f122"; }
+.icon-unlock:before { content: "\f123"; }
+.icon-video:before { content: "\f124"; }
+    </style>
+
+    <!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+    <script>
+      function toggleCharacters() {
+        var body = document.getElementsByTagName('body')[0];
+        body.className = body.className === 'characters-off' ? '' : 'characters-off';
+      }
+    </script>
+  </head>
+
+  <body class="characters-off">
+    <div id="page" class="container">
+      <header>
+        <h1>fontcustom contains 15 glyphs:</h1>
+        <a onclick="toggleCharacters(); return false;" href="#">Toggle Preview Characters</a>
+      </header>
+
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-astro" class="icon-astro"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-astro" class="icon-astro"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-astro" class="icon-astro"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-astro" class="icon-astro"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-astro" class="icon-astro"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-astro" class="icon-astro"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-astro" class="icon-astro"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-astro" class="icon-astro"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-astro" class="icon-astro"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-astro" class="icon-astro"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-astro" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf114;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-audio" class="icon-audio"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-audio" class="icon-audio"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-audio" class="icon-audio"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-audio" class="icon-audio"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-audio" class="icon-audio"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-audio" class="icon-audio"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-audio" class="icon-audio"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-audio" class="icon-audio"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-audio" class="icon-audio"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-audio" class="icon-audio"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-audio" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf115;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-code" class="icon-code"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-code" class="icon-code"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-code" class="icon-code"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-code" class="icon-code"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-code" class="icon-code"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-code" class="icon-code"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-code" class="icon-code"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-code" class="icon-code"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-code" class="icon-code"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-code" class="icon-code"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-code" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf116;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-dataset" class="icon-dataset"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-dataset" class="icon-dataset"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-dataset" class="icon-dataset"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-dataset" class="icon-dataset"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-dataset" class="icon-dataset"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-dataset" class="icon-dataset"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-dataset" class="icon-dataset"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-dataset" class="icon-dataset"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-dataset" class="icon-dataset"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-dataset" class="icon-dataset"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-dataset" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf117;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-dataverse" class="icon-dataverse"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-dataverse" class="icon-dataverse"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-dataverse" class="icon-dataverse"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-dataverse" class="icon-dataverse"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-dataverse" class="icon-dataverse"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-dataverse" class="icon-dataverse"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-dataverse" class="icon-dataverse"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-dataverse" class="icon-dataverse"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-dataverse" class="icon-dataverse"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-dataverse" class="icon-dataverse"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-dataverse" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf118;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-document" class="icon-document"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-document" class="icon-document"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-document" class="icon-document"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-document" class="icon-document"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-document" class="icon-document"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-document" class="icon-document"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-document" class="icon-document"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-document" class="icon-document"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-document" class="icon-document"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-document" class="icon-document"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-document" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf119;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-file" class="icon-file"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-file" class="icon-file"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-file" class="icon-file"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-file" class="icon-file"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-file" class="icon-file"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-file" class="icon-file"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-file" class="icon-file"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-file" class="icon-file"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-file" class="icon-file"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-file" class="icon-file"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-file" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11a;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-geodata" class="icon-geodata"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-geodata" class="icon-geodata"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-geodata" class="icon-geodata"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-geodata" class="icon-geodata"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-geodata" class="icon-geodata"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-geodata" class="icon-geodata"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-geodata" class="icon-geodata"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-geodata" class="icon-geodata"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-geodata" class="icon-geodata"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-geodata" class="icon-geodata"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-geodata" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11b;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-image" class="icon-image"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-image" class="icon-image"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-image" class="icon-image"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-image" class="icon-image"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-image" class="icon-image"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-image" class="icon-image"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-image" class="icon-image"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-image" class="icon-image"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-image" class="icon-image"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-image" class="icon-image"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-image" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11c;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-network" class="icon-network"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-network" class="icon-network"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-network" class="icon-network"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-network" class="icon-network"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-network" class="icon-network"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-network" class="icon-network"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-network" class="icon-network"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-network" class="icon-network"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-network" class="icon-network"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-network" class="icon-network"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-network" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11d;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-other" class="icon-other"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-other" class="icon-other"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-other" class="icon-other"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-other" class="icon-other"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-other" class="icon-other"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-other" class="icon-other"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-other" class="icon-other"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-other" class="icon-other"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-other" class="icon-other"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-other" class="icon-other"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-other" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11f;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-package" class="icon-package"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-package" class="icon-package"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-package" class="icon-package"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-package" class="icon-package"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-package" class="icon-package"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-package" class="icon-package"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-package" class="icon-package"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-package" class="icon-package"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-package" class="icon-package"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-package" class="icon-package"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-package" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf120;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-tabular" class="icon-tabular"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-tabular" class="icon-tabular"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-tabular" class="icon-tabular"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-tabular" class="icon-tabular"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-tabular" class="icon-tabular"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-tabular" class="icon-tabular"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-tabular" class="icon-tabular"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-tabular" class="icon-tabular"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-tabular" class="icon-tabular"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-tabular" class="icon-tabular"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-tabular" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf122;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-unlock" class="icon-unlock"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-unlock" class="icon-unlock"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-unlock" class="icon-unlock"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-unlock" class="icon-unlock"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-unlock" class="icon-unlock"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-unlock" class="icon-unlock"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-unlock" class="icon-unlock"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-unlock" class="icon-unlock"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-unlock" class="icon-unlock"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-unlock" class="icon-unlock"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-unlock" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf123;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-video" class="icon-video"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-video" class="icon-video"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-video" class="icon-video"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-video" class="icon-video"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-video" class="icon-video"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-video" class="icon-video"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-video" class="icon-video"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-video" class="icon-video"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-video" class="icon-video"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-video" class="icon-video"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-video" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf124;" />
+        </div>
+      </div>
+      
+
+      <footer>
+        Made with love using <a href="http://fontcustom.com">Font Custom</a>.
+      </footer>
+    </div>
+  </body>
+</html>
diff --git a/doc/sphinx-guides/source/_static/fontcustom.css b/doc/sphinx-guides/source/_static/fontcustom.css
index 9499403bf7e..6e12425c1f6 100644
--- a/doc/sphinx-guides/source/_static/fontcustom.css
+++ b/doc/sphinx-guides/source/_static/fontcustom.css
@@ -4,12 +4,12 @@
 
 @font-face {
   font-family: "fontcustom";
-  src: url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot");
-  src: url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot?#iefix") format("embedded-opentype"),
-       url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff2") format("woff2"),
-       url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff") format("woff"),
-       url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.ttf") format("truetype"),
-       url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg#fontcustom") format("svg");
+  src: url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot");
+  src: url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot?#iefix") format("embedded-opentype"),
+       url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff2") format("woff2"),
+       url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff") format("woff"),
+       url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.ttf") format("truetype"),
+       url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg#fontcustom") format("svg");
   font-weight: normal;
   font-style: normal;
 }
@@ -17,7 +17,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: "fontcustom";
-    src: url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg#fontcustom") format("svg");
+    src: url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg#fontcustom") format("svg");
   }
 }
 
@@ -53,18 +53,18 @@
   font-smoothing: antialiased;
 }
 
-.icon-astro:before { content: "\f104"; }
-.icon-audio:before { content: "\f105"; }
-.icon-code:before { content: "\f10b"; }
-.icon-dataset:before { content: "\f102"; }
-.icon-dataverse:before { content: "\f100"; }
-.icon-document:before { content: "\f106"; }
-.icon-file:before { content: "\f10a"; }
-.icon-geodata:before { content: "\f107"; }
-.icon-image:before { content: "\f103"; }
-.icon-network:before { content: "\f10c"; }
-.icon-other:before { content: "\f10d"; }
-.icon-package:before { content: "\f10f"; }
-.icon-tabular:before { content: "\f108"; }
-.icon-unlock:before { content: "\f10e"; }
-.icon-video:before { content: "\f109"; }
+.icon-astro:before { content: "\f114"; }
+.icon-audio:before { content: "\f115"; }
+.icon-code:before { content: "\f116"; }
+.icon-dataset:before { content: "\f117"; }
+.icon-dataverse:before { content: "\f118"; }
+.icon-document:before { content: "\f119"; }
+.icon-file:before { content: "\f11a"; }
+.icon-geodata:before { content: "\f11b"; }
+.icon-image:before { content: "\f11c"; }
+.icon-network:before { content: "\f11d"; }
+.icon-other:before { content: "\f11f"; }
+.icon-package:before { content: "\f120"; }
+.icon-tabular:before { content: "\f122"; }
+.icon-unlock:before { content: "\f123"; }
+.icon-video:before { content: "\f124"; }
diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot
new file mode 100644
index 00000000000..bf233901ed7
Binary files /dev/null and b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot differ
diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg
new file mode 100644
index 00000000000..b35ccdb6076
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2021-7-23: Created with FontForge (http://fontforge.org)
+-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata>
+Created by FontForge 20201107 at Fri Jul 23 16:57:46 2021
+ By Philip Durbin
+
+</metadata>
+<defs>
+<font id="fontcustom" horiz-adv-x="512" >
+  <font-face 
+    font-family="fontcustom"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="512"
+    panose-1="2 0 5 3 0 0 0 0 0 0"
+    ascent="448"
+    descent="-64"
+    bbox="38 -64 476 448.377"
+    underline-thickness="25.6"
+    underline-position="-51.2"
+    unicode-range="U+0020-F124"
+  />
+    <missing-glyph />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
+ />
+    <glyph glyph-name="astro" unicode="&#xf114;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM391 262c11.3333 -11.3333 6.33333 -34.3333 -15 -69c-6 -8.66667 -12.6667 -18 -20 -28c4.66667 -11.3333 7 -23.3333 7 -36c0 -19.3333 -4.83333 -37 -14.5 -53s-22.5 -28.6667 -38.5 -38s-33.6667 -14 -53 -14c-12 0 -24 2 -36 6
+c-10 -7.33333 -19.3333 -14 -28 -20c-12 -7.33333 -22.3333 -12.6667 -31 -16c-8.66667 -3.33333 -16.3333 -5 -23 -5s-12 2 -16 6c-4.66667 4.66667 -6.33333 11.3333 -5 20c0.666667 6.66667 3 14.6667 7 24c7.33333 15.3333 18.6667 33 34 53
+c-4.66667 12 -7 24.3333 -7 37c0 29.3333 10.3333 54.1667 31 74.5s45.3333 30.5 74 30.5c13.3333 0 25.6667 -2 37 -6c20.6667 15.3333 38.6667 26.3333 54 33c8.66667 4 16.3333 6.33333 23 7c8.66667 1.33333 15.3333 -0.666667 20 -6zM183 27
+c6 3.33333 12.3333 7.33333 19 12c-14 8.66667 -25.3333 20 -34 34c-11.3333 -16 -19.6667 -29.6667 -25 -41c-6.66667 -13.3333 -8.66667 -21.3333 -6 -24c1.33333 -1.33333 5.33333 -1 12 1c9.33333 3.33333 20.6667 9.33333 34 18zM347 184
+c4.66667 6.66667 8.66667 12.6667 12 18c8.66667 14 14.3333 25.3333 17 34c2.66667 7.33333 3.33333 11.6667 2 13c-2.66667 2 -10.3333 0.333333 -23 -5c-12 -6 -26 -14.6667 -42 -26c14 -8.66667 25.3333 -20 34 -34z" />
+    <glyph glyph-name="audio" unicode="&#xf115;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM371 265v-190c-0.666667 -7.33333 -3.33333 -14 -8 -20s-10.8333 -10.8333 -18.5 -14.5s-16.1667 -5.5 -25.5 -5.5c-14 0 -26 4 -36 12s-15 17.6667 -15 29s5 21 15 29s22 12 36 12c10 0 19.3333 -2 28 -6v100l-111 -26v-148
+c0.666667 -1.33333 1 -2.66667 1 -4c0 -11.3333 -5.16667 -21 -15.5 -29s-22.5 -12 -36.5 -12s-26.1667 4 -36.5 12s-15.5 17.6667 -15.5 29s5.16667 21 15.5 29s22.5 12 36.5 12c10 0 19 -2 27 -6v158z" />
+    <glyph glyph-name="code" unicode="&#xf116;" 
+d="M334 448l118 -116v-377c0 -5.2998 -1.7998 -9.7998 -5.5 -13.5s-8.2002 -5.5 -13.5 -5.5h-334c-5.2998 0 -9.7998 1.7998 -13.5 5.5s-5.5 8.2002 -5.5 13.5v474c0 5.2998 1.7998 9.7998 5.5 13.5s8.2002 5.5 13.5 5.5h235zM329 422v-93h96zM101 -43h330v351h-123v119
+h-207v-470zM218.1 90.2002c0 -2.60059 -0.0996094 -4.7002 -0.299805 -6.10059c-0.200195 -1.5 -0.5 -2.5 -1 -3.19922c-0.5 -0.600586 -1 -0.900391 -1.7002 -0.800781c-0.699219 0.100586 -1.5 0.400391 -2.59961 0.800781l-81.2002 40.5
+c-1 0.599609 -1.7002 1.69922 -2.2002 3.5c-0.5 1.7998 -0.699219 4.5 -0.699219 8.09961c0 1.7998 0.0996094 3.40039 0.199219 4.7998c0.100586 1.40039 0.300781 2.5 0.5 3.40039c0.200195 0.899414 0.5 1.59961 0.900391 2.09961s0.799805 0.900391 1.2998 1.2002
+l81.1006 40.2002c2 1 3.5 0.799805 4.2998 -0.600586c0.799805 -1.39941 1.2998 -4.19922 1.2998 -8.39941c0 -2.90039 -0.0996094 -5.2002 -0.200195 -6.90039c-0.0996094 -1.7002 -0.299805 -3 -0.599609 -4s-0.700195 -1.7002 -1.2002 -2.09961
+c-0.5 -0.400391 -1.2002 -0.799805 -2 -1.2998l-61 -28.6006l59.7998 -27.7998c1.10059 -0.5 1.90039 -1 2.60059 -1.5c0.699219 -0.5 1.19922 -1.2998 1.5 -2.2998c0.399414 -1 0.599609 -2.40039 0.699219 -4.10059c0.400391 -1.59961 0.5 -3.89941 0.5 -6.89941z
+M247.2 44.4004c-0.400391 -0.900391 -0.799805 -1.7002 -1.40039 -2.2002c-0.599609 -0.600586 -1.39941 -1 -2.39941 -1.40039c-1 -0.399414 -2.30078 -0.599609 -3.80078 -0.799805s-3.39941 -0.299805 -5.7998 -0.299805c-2.89941 0 -5.2998 0.0996094 -7.09961 0.399414
+c-1.7998 0.300781 -3.2002 0.700195 -4.2002 1.30078c-1 0.599609 -1.5 1.2998 -1.59961 2.19922c-0.100586 0.900391 0 1.90039 0.399414 3.10059l63.2998 177.8c0.300781 0.900391 0.700195 1.7002 1.30078 2.2998c0.599609 0.600586 1.2998 1.10059 2.2998 1.40039
+c1 0.399414 2.2998 0.599609 3.89941 0.799805c1.60059 0.200195 3.5 0.299805 5.80078 0.299805c3 0 5.2998 -0.0996094 7.09961 -0.399414c1.7998 -0.300781 3.2002 -0.700195 4.09961 -1.30078c0.900391 -0.599609 1.40039 -1.2998 1.60059 -2.19922
+c0.0996094 -0.900391 0 -1.90039 -0.299805 -3.10059zM405.7 132.7c0 -1.7998 -0.100586 -3.40039 -0.200195 -4.7998c-0.0996094 -1.30078 -0.299805 -2.5 -0.599609 -3.40039c-0.200195 -0.900391 -0.600586 -1.59961 -1 -2.2002
+c-0.400391 -0.5 -0.800781 -0.899414 -1.30078 -1.09961l-81.2998 -40.2002c-1 -0.5 -1.7998 -0.700195 -2.5 -0.599609c-0.700195 0.0996094 -1.2998 0.5 -1.7002 1.19922c-0.5 0.700195 -0.799805 1.7002 -1 3.10059
+c-0.199219 1.39941 -0.299805 3.09961 -0.299805 5.2002c0 2.89941 0.100586 5.19922 0.200195 6.89941s0.299805 3 0.599609 4c0.300781 1 0.700195 1.7002 1.2002 2.2002s1.2002 0.900391 2 1.2002l61 28.5996l-59.7998 27.7998c-1.09961 0.5 -2 1 -2.7002 1.5
+s-1.2002 1.30078 -1.5 2.30078c-0.399414 1 -0.599609 2.39941 -0.700195 4.09961c-0.0996094 1.7002 -0.199219 4.09961 -0.199219 7c0 2.59961 0.0996094 4.7002 0.299805 6.09961c0.200195 1.5 0.5 2.5 1 3.2002c0.5 0.600586 1 0.900391 1.7002 0.799805
+c0.699219 -0.0996094 1.59961 -0.399414 2.5 -0.799805l81.2998 -40.5996c0.899414 -0.400391 1.59961 -1.60059 2.2002 -3.40039c0.5 -1.7998 0.799805 -4.5 0.799805 -8.09961z" />
+    <glyph glyph-name="dataset" unicode="&#xf117;" 
+d="M207.6 366.2c-2.39941 1.09961 -4.09961 3.5 -4.09961 6.39941v3.10059c0 3.89941 3.09961 7 7 6h105.1c3.90039 1 7 -2.10059 7 -6v-3.10059c0 -3.89941 -3.09961 -7 -7 -7h-12.5996h-92.5c-1.09961 0 -2 0.200195 -2.90039 0.600586zM405.4 257.5
+c3.89941 0 7 -3.09961 7 -7v-2.40039c0 -3.89941 -3.10059 -7 -7 -7h-0.100586h-194.8c-3.90039 0 -7 3.10059 -7 7v2.40039c0 3.90039 3.09961 7 7 6zM405.4 139.8c3.89941 0 7 -3.09961 7 -7v-3.09961c0 -3.90039 -3.10059 -7 -7 -7h-0.100586h-194.8
+c-3.90039 -0.100586 -7 3.09961 -7 7v3.09961c0 3.90039 3.09961 7 7 6zM362.2 447.8l89.7998 -88.2998v-286.9c0 -4 -1.40039 -7.5 -4.2002 -10.2998s-6.2002 -4.2002 -10.2998 -4.2002h-15.5996v-27c0 -4 -1.40039 -7.5 -4.2002 -10.2998
+s-6.2002 -4.2002 -10.2998 -4.2002h-15.1006v-25.6992c0 -4 -1.39941 -7.5 -4.2002 -10.3008c-2.7998 -2.7998 -6.19922 -4.19922 -10.2998 -4.19922h-14.5996v-25.7002c0 -4 -1.40039 -7.5 -4.2002 -10.2998c-2.7998 -2.80078 -6.2002 -4.2002 -10.2998 -4.2002h-254.2
+c-4 0 -7.5 1.39941 -10.2998 4.2002c-2.7998 2.7998 -4.2002 6.19922 -4.2002 10.2998v360.8c0 4 1.40039 7.5 4.2002 10.2998s6.2002 4.2002 10.2998 4.2002h14.7002v25.7002c0 4 1.39941 7.5 4.2002 10.2998c2.7998 2.7998 6.19922 4.2002 10.2998 4.2002h15.0996v25.7002
+c0 4 1.40039 7.5 4.2002 10.2998s6.2002 4.2002 10.2998 4.2002h15.6006v26.8994c0 4 1.39941 7.5 4.19922 10.2998c2.80078 2.80078 6.2002 4.2002 10.3008 4.2002h178.8zM358.1 428.9l-0.5 -72.8008l74.5 -0.5zM346.5 -47.7002v24.1006h-222.8
+c-4 0 -7.5 1.39941 -10.2998 4.19922c-2.80078 2.80078 -4.2002 6.2002 -4.2002 10.3008v319h-13.7998v-357.601h251.1zM375.7 -7.5v24.0996h-222.4c-4 0 -7.5 1.40039 -10.2998 4.2002s-4.2002 6.2002 -4.2002 10.2998v319h-14.2998v-357.6h251.2zM405.3 32.7002v25.3994
+h-221.899c-4 0 -7.5 1.40039 -10.3008 4.2002c-2.7998 2.7998 -4.19922 6.2002 -4.19922 10.2998v317.7h-14.8008v-357.6h251.2zM435.3 74.2002v267.1h-93.5996v90.5h-157.5v-357.6h251.1zM203.5 289.9c0 3.89941 3.09961 7 7 6l194.9 1c3.89941 0 7 -3.10059 7 -7v-2.40039
+c0 -3.90039 -3.10059 -7 -7 -7h-0.100586h-194.8c-3.90039 0 -7 3.09961 -7 7v2.40039zM405.4 179.4c3.89941 0 7 -3.10059 7 -7v-3.10059c0 -3.89941 -3.10059 -7 -7 -7h-0.100586h-194.8c-3.90039 -0.0996094 -7 3.10059 -7 7v3.10059c0 3.89941 3.09961 7 7 6z
+M405.4 218.8c3.89941 0 7 -3.09961 7 -7v-2.39941c0 -3.90039 -3.10059 -7 -7 -7l-194.9 -1c-3.90039 1 -7 4.19922 -7 8v2.39941c0 3.90039 3.09961 7 7 7h194.8h0.100586z" />
+    <glyph glyph-name="dataverse" unicode="&#xf118;" 
+d="M267 -64c-36 0 -65.3333 12 -88 36c-24 26 -36 55.3333 -36 88c0 34 12 63 36 87c15.3333 14.6667 33 25 53 31l-22 99h-1h-2c-23.3333 0 -43.5 8.33333 -60.5 25s-25.5 36.8333 -25.5 60.5s8.5 43.8333 25.5 60.5s37.3333 25 61 25s43.8333 -8.33333 60.5 -25
+c16.6667 -16.6667 25 -36.8333 25 -60.5s-8.33333 -43.8333 -25 -60.5c-6.66667 -6.66667 -14.6667 -12.3333 -24 -17l23 -102c34 0 63.1667 -12 87.5 -36s36.5 -53 36.5 -87s-12.1667 -63.1667 -36.5 -87.5c-24.3333 -24.3333 -53.5 -36.5 -87.5 -36.5zM147 362.5
+c0 -16.3333 5.83333 -30.3333 17.5 -42s25.8333 -17.5 42.5 -17.5s30.8333 5.83333 42.5 17.5c11.6667 11.6667 17.5 25.6667 17.5 42s-5.83333 30.3333 -17.5 42c-11.6667 11.6667 -25.8333 17.5 -42.5 17.5s-30.8333 -5.83333 -42.5 -17.5s-17.5 -25.6667 -17.5 -42z
+M330 -3c17.3333 17.3333 26 38.1667 26 62.5s-8.66667 45.1667 -26 62.5c-17.3333 17.3333 -38.3333 26 -63 26c-24.6667 0 -45.6667 -8.66667 -63 -26c-17.3333 -17.3333 -26 -38.1667 -26 -62.5s8.66667 -45.1667 26 -62.5s38.3333 -26 63 -26
+c24.6667 0 45.6667 8.66667 63 26z" />
+    <glyph glyph-name="document" unicode="&#xf119;" 
+d="M334 448l118 -116v-377c0 -5.2998 -1.7998 -9.7998 -5.5 -13.5s-8.2002 -5.5 -13.5 -5.5h-334c-5.2998 0 -9.7998 1.7998 -13.5 5.5s-5.5 8.2002 -5.5 13.5v474c0 5.2998 1.7998 9.7998 5.5 13.5s8.2002 5.5 13.5 5.5h235zM307.1 308v119h-207v-470h330v351zM328.7 423.2
+l97.0996 -96.2998l-97.8994 0.5zM125.4 347.9v4.09961c0 5.09961 4.09961 9.2002 9.19922 9.2002h138.101c5.09961 0 9.2002 -4.10059 9.2002 -9.2002v-4.09961c0 -5.10059 -4.10059 -9.2002 -9.2002 -9.2002h-138.101c-5.09961 -0.100586 -9.19922 4.09961 -9.19922 9.2002
+zM125.4 236v3.09961c0 5.10059 4.09961 9.2002 9.19922 9.2002h256.2c5.10059 0 9.2002 -4.09961 9.2002 -9.2002v-3.09961c0 -5.09961 -4.09961 -9.2002 -9.2002 -9.2002h-256.2c-5.09961 0 -9.19922 4.10059 -9.19922 9.2002zM125.4 184.3v3.10059
+c0 5.09961 4.09961 9.19922 9.19922 9.19922h256.2c5.10059 0 9.2002 -4.09961 9.2002 -9.19922v-3.10059c0 -5.09961 -4.09961 -9.2002 -9.2002 -9.2002h-256.2c-5.09961 -0.0996094 -9.19922 4.10059 -9.19922 9.2002zM125.4 133.4v3.09961
+c0 5.09961 4.09961 9.2002 9.19922 9.2002h256.2c5.10059 0 9.2002 -4.10059 9.2002 -9.2002v-3.09961c0 -5.10059 -4.09961 -9.2002 -9.2002 -9.2002h-256.2c-5.09961 0 -9.19922 4.09961 -9.19922 9.2002zM125.4 80.7002v4.09961c0 5.10059 4.09961 9.2002 9.19922 9.2002
+h256.2c5.10059 0 9.2002 -4.09961 9.2002 -9.2002v-4.09961c0 -5.10059 -4.09961 -9.2002 -9.2002 -9.2002h-256.2c-5.09961 -0.0996094 -9.19922 4.09961 -9.19922 9.2002zM125.4 28.5996v4.10059c0 5.09961 4.09961 9.2002 9.19922 9.2002h256.2
+c5.10059 0 9.2002 -4.10059 9.2002 -9.2002v-4.10059c0 -5.09961 -4.09961 -9.19922 -9.2002 -9.19922h-256.2c-5.09961 0 -9.19922 4.09961 -9.19922 9.19922z" />
+    <glyph glyph-name="file" unicode="&#xf11a;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM116 230h281v-200h-281v200zM218 157h76v36h-76v-36zM294 140h-76v-41h76v41zM132 193v-36h69v36h-69zM132 140v-41h69v41h-69zM132 47h69v36h-69v-36zM218 47h76v36h-76v-36zM380 47v36h-69v-36h69zM380 99v41h-69v-41h69zM311 157h69v36h-69v-36z" />
+    <glyph glyph-name="geodata" unicode="&#xf11b;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM255.5 -11c37.6667 0 70 13.5 97 40.5s40.5 59.3333 40.5 97s-13.5 70 -40.5 97s-59.3333 40.5 -97 40.5c-37.6667 0 -70 -13.5 -97 -40.5s-40.5 -59.3333 -40.5 -97s13.5 -70 40.5 -97s59.3333 -40.5 97 -40.5zM264 6v17h-17v-17
+c-30 2 -55.6667 13.6667 -77 35c-21.3333 21.3333 -33 47 -35 77h23v17h-23c2 30 13.6667 55.6667 35 77s47 33 77 35v-23h17v23c30 -2 55.6667 -13.6667 77 -35s33 -47 35 -77h-23v-17h23c-2 -30 -13.6667 -55.6667 -35 -77c-21.3333 -21.3333 -47 -33 -77 -35zM255.5 263
+c37.6667 0 69.8333 -13.3333 96.5 -40s40 -58.8333 40 -96.5s-13.3333 -69.8333 -40 -96.5c-26.6667 -26.6667 -58.8333 -40 -96.5 -40c-37.6667 0 -69.8333 13.3333 -96.5 40c-26.6667 26.6667 -40 58.8333 -40 96.5s13.3333 69.8333 40 96.5s58.8333 40 96.5 40zM263 225
+h-15v22v1h-1c-30 -2.66667 -55.6667 -14.6667 -77 -36s-33.3333 -47 -36 -77v-1h1h22v-15h-22h-1v-1c2.66667 -30 14.6667 -55.6667 36 -77c21.3333 -21.3333 47 -33.3333 77 -36h1v1v16h15v-16v-1h1c30 2.66667 55.6667 14.6667 77 36c21.3333 21.3333 33.3333 47 36 77v1
+h-1h-22v15h22h1v1c-2.66667 30 -14.6667 55.6667 -36 77s-47 33.3333 -77 36h-1v-1v-22zM255.5 264c38.3333 0 70.8333 -13.3333 97.5 -40s40 -59.1667 40 -97.5s-13.3333 -70.8333 -40 -97.5c-26.6667 -26.6667 -59.1667 -40 -97.5 -40
+c-38.3333 0 -70.8333 13.3333 -97.5 40c-26.6667 26.6667 -40 59.1667 -40 97.5s13.3333 70.8333 40 97.5s59.1667 40 97.5 40zM247 224v23c-30 -2.66667 -55.5 -14.5 -76.5 -35.5s-32.8333 -46.5 -35.5 -76.5h23v-17h-23c2.66667 -30 14.5 -55.5 35.5 -76.5
+s46.5 -32.8333 76.5 -35.5v17h17v-17c30 2.66667 55.5 14.5 76.5 35.5s32.8333 46.5 35.5 76.5h-23v17h23c-2.66667 30 -14.5 55.5 -35.5 76.5s-46.5 32.8333 -76.5 35.5v-23h-17zM223 159l-49 -114l114 49l49 114zM201 72l61 27l-34 34zM336 207l-49 -112l-112 -49l49 112z
+M200 71l2 3l25 59l1 1l1 -1l33 -33l1 -1l-1 -1l-59 -26zM338 209l-50 -115l-115 -50l50 115zM202 73l60 26l-34 34z" />
+    <glyph glyph-name="image" unicode="&#xf11c;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM155 219c0 12 4.33333 22.3333 13 31c8.66667 8.66667 19.1667 13 31.5 13s22.8333 -4.33333 31.5 -13c8.66667 -8.66667 13 -19 13 -31s-4.33333 -22.3333 -13 -31s-19.1667 -13 -31.5 -13s-22.8333 4.33333 -31.5 13s-13 19 -13 31zM337 229l60 -105
+v-119v-7h-281v98l14 12l33 27l56 -55l59 110zM204 58l5 12l-47 45l-32 -27l2 -24l14 17l24 -29l24 17zM360 93l15 28l-45 81l-46 -31l-25 -49l25 11l34 -34l28 38z" />
+    <glyph glyph-name="network" unicode="&#xf11d;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM114 197.5c0 14.3333 5 26.5 15 36.5s22.1667 15 36.5 15s26.5 -5 36.5 -15s15 -22.1667 15 -36.5s-5 -26.5 -15 -36.5s-22.1667 -15 -36.5 -15s-26.5 5 -36.5 15s-15 22.1667 -15 36.5zM155 41.5c0 14.3333 5 26.6667 15 37s22.1667 15.5 36.5 15.5
+s26.6667 -5.16667 37 -15.5s15.5 -22.6667 15.5 -37s-5.16667 -26.5 -15.5 -36.5s-22.6667 -15 -37 -15s-26.5 5 -36.5 15s-15 22.1667 -15 36.5zM270 214c0 14.6667 5 27 15 37s22.1667 15 36.5 15s26.5 -5 36.5 -15s15 -22.1667 15 -36.5s-5 -26.6667 -15 -37
+s-22 -15.5 -36 -15.5c-6 0 -11.6667 1 -17 3s-10 4.5 -14 7.5s-7.66667 6.66667 -11 11s-5.83333 9.16667 -7.5 14.5s-2.5 10.6667 -2.5 16zM296 78.5c0 14.3333 5 26.5 15 36.5s22.1667 15 36.5 15s26.5 -5 36.5 -15s15 -22.1667 15 -36.5s-5 -26.6667 -15 -37
+s-22.1667 -15.5 -36.5 -15.5s-26.5 5.16667 -36.5 15.5s-15 22.6667 -15 37zM223 44c-0.666667 -0.666667 -1.33333 -1.16667 -2 -1.5s-1.66667 -0.5 -3 -0.5h-4l-6 1l-6.5 2l-3.5 2.5l-1 2.5l1 3l107 156c0 0.666667 0.333333 1.16667 1 1.5s1.5 0.5 2.5 0.5h4l6.5 -1
+l6.5 -2l3.5 -2.5l1 -2.5l-1 -3zM154 194l184 -130c1.33333 -0.666667 2.5 -1.16667 3.5 -1.5s2 -0.166667 3 0.5s2 1.83333 3 3.5s1.83333 3.83333 2.5 6.5c0.666667 2 1.16667 3.83333 1.5 5.5s0.5 3 0.5 4s-0.166667 2 -0.5 3s-1.16667 1.5 -2.5 1.5l-184 131
+c-1.33333 0.666667 -2.5 1.16667 -3.5 1.5s-2 0.166667 -3 -0.5s-2 -1.83333 -3 -3.5s-1.83333 -3.83333 -2.5 -6.5l-2 -5.5v-4c0 -1 0.166667 -2 0.5 -3s1.16667 -1.83333 2.5 -2.5zM227 28l-55 180c-0.666667 1.33333 -1.33333 2.16667 -2 2.5s-1.5 0.5 -2.5 0.5
+s-2.33333 -0.333333 -4 -1s-3.83333 -2 -6.5 -4c-1.33333 -1.33333 -2.66667 -2.5 -4 -3.5s-2.33333 -2 -3 -3s-1 -1.83333 -1 -2.5s0.333333 -1.66667 1 -3l55 -180c0 -1.33333 0.333333 -2.33333 1 -3s1.66667 -0.833333 3 -0.5s2.83333 0.833333 4.5 1.5s3.5 2 5.5 4
+l4.5 3.5l2.5 3l1 2.5v3zM361 92c0.666667 -0.666667 0.833333 -1.33333 0.5 -2s-0.833333 -1.5 -1.5 -2.5s-1.5 -2 -2.5 -3l-3.5 -3.5l-6 -4.5l-3.5 -2h-2.5l-1 1.5l-36 139v2l1 2.5l2.5 3l4.5 3.5c2 2 3.83333 3.5 5.5 4.5s2.83333 1.66667 3.5 2s1.33333 0.333333 2 0
+s1 -0.833333 1 -1.5z" />
+    <glyph glyph-name="other" unicode="&#xf11f;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470z" />
+    <glyph glyph-name="package" unicode="&#xf120;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM392 217v-178c0 -4.66667 -2 -7.33333 -6 -8l-129 -38v0h-1v0h-1.5h-0.5v0h-1v0l-129 38c-4.66667 0.666667 -7 3.33333 -7 8v178v0v1l1 1v0v1v0v1v0l1 1v0v1h1v0v1h1v0v0l1 1v0h1v0h1v1l132 35h5l125 -36h1v0h1v0c0.666667 0 1 -0.333333 1 -1v0h1v-1
+v0h1v-1v0l1 -1v0v-1v0v-1v0v-1v-1zM246 13v161l-111 32v-161zM255 189l40 12l58 16l-95 27l-100 -27l64 -19zM375 45v161l-111 -32v-161z" />
+    <glyph glyph-name="tabular" unicode="&#xf122;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM116 230h281v-200h-281v200zM218 157h76v36h-76v-36zM294 140h-76v-41h76v41zM132 193v-36h69v36h-69zM132 140v-41h69v41h-69zM132 47h69v36h-69v-36zM218 47h76v36h-76v-36zM380 47v36h-69v-36h69zM380 99v41h-69v-41h69zM311 157h69v36h-69v-36z" />
+    <glyph glyph-name="unlock" unicode="&#xf123;" 
+d="M476 -26c0 -10.6667 -3.66667 -19.6667 -11 -27s-16.3333 -11 -27 -11h-362c-10 0 -18.8333 3.66667 -26.5 11s-11.5 16.3333 -11.5 27v242c0 10.6667 3.83333 19.8333 11.5 27.5s16.5 11.5 26.5 11.5h362c10.6667 0 19.6667 -3.83333 27 -11.5s11 -16.8333 11 -27.5
+v-242zM366 397c-8.66667 20.6667 -23.1667 35.5 -43.5 44.5s-40.8333 9.16667 -61.5 0.5l-109 -43c-20.6667 -8 -35.5 -22.1667 -44.5 -42.5s-9.5 -40.8333 -1.5 -61.5l70 -178l74 30l-62 159c-2.66667 5.33333 -2.83333 10.6667 -0.5 16s6.5 9 12.5 11l72 29
+c6 2 11.6667 1.83333 17 -0.5s9 -6.16667 11 -11.5l13 -34l73 29z" />
+    <glyph glyph-name="video" unicode="&#xf124;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM393 155v-136l-80 46v-54h-194v141h25c-18 8.66667 -27 23 -27 43c0 13.3333 4.83333 24.6667 14.5 34c9.66667 9.33333 21.1667 14 34.5 14s24.6667 -4.66667 34 -14s14 -20.6667 14 -34c0 -20 -8.66667 -34.3333 -26 -43h57
+c-17.3333 8.66667 -26 23 -26 43c0 13.3333 4.66667 24.6667 14 34s20.6667 14 34 14c13.3333 0 24.8333 -4.66667 34.5 -14s14.5 -20.6667 14.5 -34c0 -20 -9 -34.3333 -27 -43h24v-43z" />
+  </font>
+</defs></svg>
diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.ttf b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.ttf
new file mode 100644
index 00000000000..de307f17f62
Binary files /dev/null and b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.ttf differ
diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff
new file mode 100644
index 00000000000..a38775fee1f
Binary files /dev/null and b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff differ
diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff2 b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff2
new file mode 100644
index 00000000000..f246005260c
Binary files /dev/null and b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff2 differ
diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot
deleted file mode 100644
index 1f5dccf4cf4..00000000000
Binary files a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot and /dev/null differ
diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg
deleted file mode 100644
index c26d77cbd2a..00000000000
--- a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<!--
-2017-8-17: Created with FontForge (http://fontforge.org)
--->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
-<metadata>
-Created by FontForge 20141215 at Thu Aug 17 11:31:46 2017
- By Michael Heppler 
-
-</metadata>
-<defs>
-<font id="fontcustom" horiz-adv-x="512" >
-  <font-face 
-    font-family="fontcustom"
-    font-weight="400"
-    font-stretch="normal"
-    units-per-em="512"
-    panose-1="2 0 5 3 0 0 0 0 0 0"
-    ascent="448"
-    descent="-64"
-    bbox="38.2715 -64 541.491 501.248"
-    underline-thickness="25.6"
-    underline-position="-51.2"
-    unicode-range="U+0020-F10F"
-  />
-    <missing-glyph />
-    <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
- />
-    <glyph glyph-name="tabular" unicode="&#xf108;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM115.707 229.528l280.893 -0.000976562v-199.242h-280.893v199.243zM217.554 156.534l76.8027 -0.000976562v36.7969h-76.8027v-36.7959zM294.356 139.839l-76.8027 0.000976562v-40.5293h76.8027v40.5283z
-M132.402 193.33v-36.7959h68.4561v36.7959h-68.4561zM132.402 139.84v-40.5293h68.4561v40.5293h-68.4561zM132.402 46.9814h68.4561v35.6348h-68.4561v-35.6348zM217.554 46.9814h76.8027v35.6348h-76.8027v-35.6348zM379.905 46.9814h-0.000976562v35.6348h-68.8535
-v-35.6348h68.8545zM379.905 99.3105h-0.000976562v40.5283h-68.8535v-40.5283h68.8545zM311.051 156.533h68.8535v36.7969h-68.8535v-36.7969z" />
-    <glyph glyph-name="document" unicode="&#xf106;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM115.578 390.442v22.5859h169.49v-22.5859h-169.49zM115.578 344.247v22.5859h169.489v-22.5859h-169.489zM115.578 298.051v22.5859h169.49v-22.5859h-169.49zM115.578 251.854v22.5859h280.844v-22.5859h-280.844z
-M115.578 204.896v22.5859h280.844v-22.5859h-280.844zM115.578 158.699v22.5859h280.844v-22.5859h-280.844zM115.578 112.504v22.5859h280.844v-22.5859h-280.844zM115.578 66.3076v22.5859h280.844v-22.5859h-280.844zM115.578 19.0879v22.5859h280.844v-22.5859h-280.844
-zM115.578 -27.1084v22.5859h280.844v-22.5859h-280.844z" />
-    <glyph glyph-name="file" unicode="&#xf10a;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM115.707 229.528l280.893 -0.000976562v-199.242h-280.893v199.243zM217.554 156.534l76.8027 -0.000976562v36.7969h-76.8027v-36.7959zM294.356 139.839l-76.8027 0.000976562v-40.5293h76.8027v40.5283z
-M132.402 193.33v-36.7959h68.4561v36.7959h-68.4561zM132.402 139.84v-40.5293h68.4561v40.5293h-68.4561zM132.402 46.9814h68.4561v35.6348h-68.4561v-35.6348zM217.554 46.9814h76.8027v35.6348h-76.8027v-35.6348zM379.905 46.9814h-0.000976562v35.6348h-68.8535
-v-35.6348h68.8545zM379.905 99.3105h-0.000976562v40.5283h-68.8535v-40.5283h68.8545zM311.051 156.533h68.8535v36.7969h-68.8535v-36.7969z" />
-    <glyph glyph-name="package" unicode="&#xf10f;" 
-d="M423.424 501.248l118.067 -115.559v-376.985c0 -10.752 -8.7041 -19.4561 -19.4561 -19.4561h-333.466c-10.752 0 -19.4561 8.7041 -19.4561 19.4561v473.088c0 10.752 8.7041 19.4561 19.4561 19.4561h234.854zM418.816 475.699v-93.082h95.0781zM190.669 10.752
-h329.318v350.361h-122.676v118.631h-206.643v-468.992zM492.083 270.541v0v0v-178.433c0 -3.83984 -2.55957 -7.16797 -6.19531 -8.24316l-128.819 -37.2734c-0.0507812 0 -0.15332 -0.0507812 -0.204102 -0.0507812c-0.102539 0 -0.154297 -0.0517578 -0.255859 -0.0517578
-c-0.154297 -0.0507812 -0.256836 -0.102539 -0.410156 -0.102539c-0.102539 0 -0.15332 -0.0507812 -0.255859 -0.0507812c-0.15332 0 -0.307617 -0.0507812 -0.460938 -0.0507812h-0.205078c-0.255859 -0.0517578 -0.459961 -0.0517578 -0.665039 -0.0517578v0v0
-c-0.255859 0 -0.460938 0.0517578 -0.666016 0.0517578h-0.204102c-0.154297 0 -0.307617 0.0507812 -0.460938 0.0507812c-0.102539 0 -0.154297 0.0507812 -0.255859 0.0507812c-0.154297 0.0517578 -0.256836 0.0517578 -0.410156 0.102539
-c-0.102539 0 -0.15332 0.0517578 -0.255859 0.0517578c-0.0507812 0 -0.15332 0.0507812 -0.205078 0.0507812l-128.973 37.2734c-3.68652 1.0752 -6.19531 4.45508 -6.19531 8.24316v178.433v0.0507812v0.0517578v0.101562
-c0.0517578 0.154297 0.0517578 0.358398 0.0517578 0.512695v0.204102c0.0507812 0.205078 0.0507812 0.410156 0.102539 0.615234v0.102539c0 0.15332 0.0507812 0.358398 0.101562 0.511719c0 0.0507812 0.0517578 0.15332 0.0517578 0.205078
-c0.0507812 0.15332 0.102539 0.306641 0.15332 0.459961c0 0.0517578 0.0517578 0.102539 0.0517578 0.154297c0.0507812 0.204102 0.101562 0.40918 0.204102 0.5625c0.0517578 0.0517578 0.0517578 0.102539 0.102539 0.154297
-c0.0517578 0.15332 0.15332 0.255859 0.205078 0.40918c0.0507812 0.0517578 0.0507812 0.102539 0.102539 0.15332c0.102539 0.154297 0.204102 0.358398 0.306641 0.512695l0.0517578 0.0507812c0.102539 0.102539 0.204102 0.255859 0.306641 0.410156
-c0.0517578 0.0507812 0.0517578 0.101562 0.102539 0.15332c0.102539 0.102539 0.205078 0.255859 0.307617 0.358398l0.102539 0.102539c0.101562 0.15332 0.255859 0.255859 0.40918 0.40918c0.0507812 0 0.102539 0.0517578 0.15332 0.102539
-c0.154297 0.102539 0.255859 0.205078 0.358398 0.307617c0.0517578 0.0507812 0.102539 0.101562 0.154297 0.15332c0.0507812 0 0.0507812 0.0507812 0.101562 0.0507812c0.102539 0.0517578 0.205078 0.154297 0.307617 0.205078
-c0.0507812 0 0.0507812 0.0507812 0.102539 0.0507812c0.15332 0.102539 0.358398 0.205078 0.511719 0.307617c0.102539 0.0507812 0.15332 0.0507812 0.205078 0.102539c0.15332 0.0507812 0.255859 0.15332 0.40918 0.205078
-c0.0517578 0 0.102539 0.0507812 0.154297 0.0507812c0.204102 0.0507812 0.358398 0.15332 0.5625 0.205078c0.0517578 0 0.102539 0.0507812 0.154297 0.0507812c0.204102 0.0517578 0.358398 0.102539 0.511719 0.15332
-c0.0507812 0.0517578 0.0507812 0.0517578 0.102539 0.0517578l132.557 35.123c1.48438 0.358398 3.02051 0.358398 4.50586 -0.0507812l125.439 -35.124h0.0517578c0.204102 -0.0507812 0.40918 -0.15332 0.614258 -0.204102h0.0507812
-c0.15332 -0.0517578 0.358398 -0.102539 0.511719 -0.205078c0.0517578 -0.0507812 0.102539 -0.0507812 0.154297 -0.102539c0.15332 -0.0507812 0.255859 -0.15332 0.40918 -0.205078c0.0517578 0 0.102539 0 0.15332 -0.0507812
-c0.205078 -0.102539 0.358398 -0.205078 0.512695 -0.307617c0.0507812 -0.0507812 0.102539 -0.0507812 0.15332 -0.101562c0.0507812 -0.0517578 0.15332 -0.102539 0.205078 -0.154297c0.0507812 0 0.102539 -0.0507812 0.15332 -0.102539
-c0.0507812 -0.0507812 0.102539 -0.101562 0.15332 -0.15332c0.154297 -0.102539 0.255859 -0.255859 0.410156 -0.358398l0.0507812 -0.0507812c0.15332 -0.154297 0.255859 -0.307617 0.410156 -0.460938c0.0507812 0 0.0507812 -0.0517578 0.101562 -0.102539
-c0.102539 -0.102539 0.205078 -0.255859 0.307617 -0.358398c0.0507812 0 0.0507812 -0.0507812 0.102539 -0.102539c0.15332 -0.15332 0.255859 -0.358398 0.358398 -0.511719c0 -0.0517578 0.0507812 -0.0517578 0.0507812 -0.102539
-c0.102539 -0.15332 0.154297 -0.307617 0.255859 -0.460938c0.0517578 -0.0507812 0.0517578 -0.102539 0.102539 -0.15332c0.0517578 -0.15332 0.154297 -0.307617 0.205078 -0.460938c0 0 0.0507812 -0.0507812 0.0507812 -0.102539
-c0.0517578 -0.205078 0.154297 -0.358398 0.205078 -0.563477c0 -0.101562 0.0517578 -0.15332 0.0517578 -0.204102c0 -0.102539 0.0507812 -0.255859 0.101562 -0.410156c0 -0.102539 0.0517578 -0.15332 0.0517578 -0.204102
-c0 -0.154297 0.0507812 -0.358398 0.102539 -0.563477v-0.102539c0 -0.15332 0.0507812 -0.358398 0.0507812 -0.511719v-0.205078v-0.563477v-0.0507812zM357.99 296.755l-100.403 -26.5723l63.8975 -18.4834l33.0244 -9.57422l40.3965 11.6738l57.3447 16.5879z
-M234.086 259.123v-160.563l111.872 -32.3584v160.615zM363.11 66.1504l111.872 32.4092v160.615l-111.872 -32.3584v-160.666z" />
-    <glyph glyph-name="image" unicode="&#xf103;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM155.146 219.049c0 24.5439 19.8975 44.4404 44.4414 44.4404s44.4414 -19.8965 44.4414 -44.4404c0 -24.5449 -19.8975 -44.4414 -44.4414 -44.4414s-44.4414 19.8965 -44.4414 44.4414zM337.292 229.049
-l59.3076 -105.122v-119.061h-0.0273438v-6.91602h-280.865v98.5039l13.832 11.0566v-0.000976562l33.2598 27.4824l55.8594 -55.3271l59.0508 110.654zM203.555 58.1465l5.6709 11.9092l-47.0703 45.3682l-32.0762 -27.248l2.01953 -24.3584l13.6113 17.0137
-l23.8184 -28.9229l24.3857 17.5801zM360.41 93.1396l14.1836 28.3125l-44.8008 80.5283l-45.4492 -30.8574l-24.8623 -49.3389l24.9473 11.2832l34.0186 -34.1289l27.2168 38.4795z" />
-    <glyph glyph-name="dataset" unicode="&#xf102;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM115.578 390.442v22.5859h169.49v-22.5859h-169.49zM115.578 344.247v22.5859h169.489v-22.5859h-169.489zM115.578 298.051v22.5859h169.49v-22.5859h-169.49zM115.578 251.854v22.5859h280.844v-22.5859h-280.844z
-M115.578 204.896v22.5859h280.844v-22.5859h-280.844zM115.578 158.699v22.5859h280.844v-22.5859h-280.844zM115.578 112.504v22.5859h280.844v-22.5859h-280.844zM115.578 66.3076v22.5859h280.844v-22.5859h-280.844zM115.578 19.0879v22.5859h280.844v-22.5859h-280.844
-zM115.578 -27.1084v22.5859h280.844v-22.5859h-280.844z" />
-    <glyph glyph-name="astro" unicode="&#xf104;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.369v350.35h-122.69v118.652h-206.679v-469.002zM391.215 262.411c11.5938 -11.5947 6.47559 -34.2588 -15.6455 -69.2871c-5.60742 -8.88086 -12.1367 -18.2422 -19.4346 -27.9131c4.13086 -11.2793 6.38379 -23.4639 6.38379 -36.1738
-c0 -58.1104 -47.1074 -105.22 -105.218 -105.22c-12.666 0 -24.8096 2.23926 -36.0566 6.3418c-9.90332 -7.49902 -19.4893 -14.1963 -28.5703 -19.9307c-22.9121 -14.4688 -40.5381 -21.6641 -53.2314 -21.665c-6.71191 -0.000976562 -12.0449 2.01074 -16.0547 6.02051
-c-4.83789 4.83984 -6.7627 11.7695 -5.71973 20.5986c0.783203 6.62402 3.31445 14.6055 7.52441 23.7236c6.91895 14.9814 18.4443 33.2529 33.5459 53.2275c-4.30176 11.4834 -6.65625 23.918 -6.65625 36.9033c0 58.1094 47.1084 105.218 105.22 105.218
-c13.0293 0 25.5039 -2.36816 37.0195 -6.69824c20.1035 15.1475 38.4668 26.6494 53.4287 33.4414c8.91797 4.04785 16.7324 6.46094 23.2285 7.17285c8.65723 0.949219 15.4648 -0.989258 20.2363 -5.75977zM183.484 26.7207
-c5.99414 3.81348 12.2236 8.07129 18.627 12.7158c-13.749 8.48438 -25.3965 20.0449 -33.9854 33.7217c-11.2783 -15.5518 -19.9834 -29.6807 -25.5049 -41.4551c-8.75781 -18.6748 -5.94531 -23.7559 -5.91113 -23.7949
-c0.463867 -0.397461 3.97656 -1.33203 12.6104 1.42676c8.99023 2.87109 20.8037 8.88379 34.1641 17.3857zM346.835 184.338c4.45801 6.17285 8.55762 12.1826 12.2422 17.9717c8.50293 13.3594 14.5146 25.1738 17.3877 34.1641
-c2.75684 8.63672 1.82324 12.1494 1.42285 12.6172c-0.0351562 0.0283203 -4.96387 2.77148 -23.04 -5.56641c-11.7383 -5.41406 -25.915 -14.0859 -41.5566 -25.3838c13.5928 -8.55762 25.0879 -20.1406 33.5439 -33.8027z" />
-    <glyph glyph-name="unlock" unicode="&#xf10e;" 
-d="M475.929 -25.8672c0 -21.0557 -16.9902 -38.125 -37.9463 -38.125h-361.764c-20.958 0 -37.9473 17.0693 -37.9473 38.125v242.271c0 21.0547 16.9893 38.125 37.9473 38.125h361.763c20.957 0 37.9473 -17.0703 37.9473 -38.125v-242.271v0zM365.643 397.034
-l20.6064 -52.3926l-73.0195 -28.7412l-13.3633 33.9902c-4.25781 10.8203 -16.5273 16.1201 -27.4043 11.8389l-72.8105 -28.6602c-10.8779 -4.28125 -16.2432 -16.5225 -11.9844 -27.3418l62.624 -159.1l-74.207 -29.208l-69.8672 177.501
-c-16.2607 41.3125 4.04688 87.9824 45.3584 104.243l109.825 43.2295c41.3105 16.2598 87.9814 -4.04688 104.242 -45.3594z" />
-    <glyph glyph-name="code" unicode="&#xf10b;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM206.965 90.2354c0 -2.6084 -0.105469 -4.65234 -0.316406 -6.13281c-0.211914 -1.48145 -0.546875 -2.53809 -1.00488 -3.17188c-0.458984 -0.634766 -1.02246 -0.916992 -1.69141 -0.845703
-c-0.670898 0.0693359 -1.5332 0.351562 -2.59082 0.845703l-81.1055 40.3936c-0.988281 0.564453 -1.71094 1.74512 -2.16797 3.54297c-0.458984 1.79785 -0.6875 4.49414 -0.6875 8.08984c0 1.83203 0.0693359 3.43652 0.211914 4.81055
-c0.139648 1.375 0.317383 2.50195 0.52832 3.38379c0.211914 0.880859 0.510742 1.58691 0.898438 2.11523c0.386719 0.52832 0.828125 0.932617 1.32227 1.21582l81 40.1826c2.04395 0.986328 3.48926 0.792969 4.33594 -0.582031
-c0.845703 -1.375 1.26855 -4.17676 1.26855 -8.40723c0 -2.89062 -0.0527344 -5.18164 -0.158203 -6.87305c-0.106445 -1.69141 -0.300781 -3.03125 -0.582031 -4.01855c-0.282227 -0.987305 -0.670898 -1.69141 -1.16309 -2.11426
-c-0.494141 -0.422852 -1.16211 -0.845703 -2.00879 -1.26953l-60.9082 -28.5508l59.7451 -27.7051c1.05664 -0.494141 1.91992 -0.988281 2.59082 -1.48047c0.668945 -0.494141 1.17969 -1.25293 1.5332 -2.27344c0.352539 -1.02246 0.597656 -2.39746 0.740234 -4.12402
-c0.139648 -1.72656 0.209961 -4.07031 0.209961 -7.03125zM236.053 44.4492c-0.352539 -0.916016 -0.811523 -1.65625 -1.37402 -2.22168c-0.56543 -0.563477 -1.3584 -1.02051 -2.37988 -1.375c-1.02246 -0.351562 -2.29199 -0.616211 -3.80664 -0.792969
-c-1.5166 -0.174805 -3.43652 -0.264648 -5.7627 -0.264648c-2.8916 0 -5.25195 0.142578 -7.08496 0.422852c-1.83398 0.283203 -3.22461 0.705078 -4.17676 1.26953c-0.952148 0.56543 -1.49902 1.28711 -1.63965 2.16797c-0.141602 0.881836 0 1.9209 0.423828 3.11914
-l63.2344 177.544c0.28125 0.916016 0.703125 1.67383 1.26953 2.27344c0.5625 0.597656 1.33789 1.07422 2.32617 1.42773c0.986328 0.351562 2.27344 0.616211 3.85938 0.792969c1.58594 0.174805 3.50684 0.263672 5.76367 0.263672
-c2.95996 0 5.33984 -0.141602 7.1377 -0.422852c1.79785 -0.282227 3.15332 -0.705078 4.07031 -1.26855c0.915039 -0.56543 1.44434 -1.28711 1.58594 -2.16797c0.140625 -0.882812 0.0351562 -1.9209 -0.317383 -3.11914zM394.254 132.64
-c0 -1.83398 -0.0712891 -3.4209 -0.211914 -4.75879c-0.140625 -1.33984 -0.333984 -2.46875 -0.581055 -3.38379c-0.24707 -0.916992 -0.564453 -1.63867 -0.951172 -2.16699c-0.388672 -0.529297 -0.830078 -0.899414 -1.32227 -1.11035l-81.1055 -40.1826
-c-0.988281 -0.494141 -1.83496 -0.705078 -2.53809 -0.634766c-0.705078 0.0703125 -1.28711 0.458008 -1.74512 1.16309c-0.458008 0.704102 -0.775391 1.74512 -0.951172 3.12012c-0.176758 1.37402 -0.263672 3.11914 -0.263672 5.23438
-c0 2.88965 0.0527344 5.18066 0.158203 6.87305s0.298828 3.03027 0.582031 4.01855c0.28125 0.987305 0.669922 1.70801 1.16309 2.16797c0.491211 0.458008 1.16309 0.861328 2.00879 1.21582l60.9092 28.5508l-59.7461 27.7051
-c-1.12793 0.492188 -2.02637 0.986328 -2.69629 1.48047c-0.670898 0.492188 -1.18164 1.25 -1.5332 2.27344c-0.353516 1.02051 -0.582031 2.39551 -0.6875 4.12402c-0.105469 1.72656 -0.158203 4.07031 -0.158203 7.03125c0 2.60742 0.0869141 4.65332 0.263672 6.13379
-c0.175781 1.47949 0.493164 2.53711 0.951172 3.17188c0.458984 0.633789 1.04004 0.915039 1.74512 0.845703c0.703125 -0.0712891 1.5498 -0.353516 2.53809 -0.845703l81.2109 -40.5c0.915039 -0.423828 1.63965 -1.55176 2.16797 -3.38379
-c0.52832 -1.83398 0.792969 -4.54785 0.792969 -8.14258z" />
-    <glyph glyph-name="video" unicode="&#xf109;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM393.035 155.245h0.000976562v-136.743l-80.1689 46.2861v-54.1758h-193.78v141.273h24.5869c-15.6006 8.04688 -26.2744 24.3066 -26.2744 43.0693c0 26.7549 21.6895 48.4443 48.4453 48.4443
-c26.7549 0 48.4453 -21.6895 48.4453 -48.4443c0 -18.7627 -10.6748 -35.0225 -26.2754 -43.0693h56.9707c-15.6006 8.04688 -26.2734 24.3066 -26.2734 43.0693c0 26.7549 21.6885 48.4443 48.4443 48.4443c26.7549 0 48.4453 -21.6895 48.4453 -48.4443
-c0 -18.7627 -10.6748 -35.0225 -26.2754 -43.0693h23.541v-42.9268z" />
-    <glyph glyph-name="dataverse" unicode="&#xf100;" 
-d="M266.787 -63.7441c-34.1826 0 -63.501 10.5283 -87.6299 36.1436c-24.1299 25.6182 -36.3027 53.2461 -36.2842 87.2793c-0.0175781 34.0371 13.877 65.0029 36.2842 87.2861c14.4639 14.4277 32.6104 25.2881 52.8447 31.1895l-22.0381 98.7832
-c-0.977539 -0.0371094 -1.90625 -0.142578 -2.88477 -0.142578c-23.6602 -0.0136719 -45.1855 9.58691 -60.6836 25.0381c-15.5146 15.417 -25.1621 36.8779 -25.1387 60.4395c-0.0234375 23.5586 9.62402 45.0039 25.1387 60.4355
-c15.4971 15.4355 37.0234 25.0361 60.6836 25.0361c23.6699 0 45.1748 -9.60059 60.6846 -25.0361c15.498 -15.4326 25.1416 -36.8896 25.1416 -60.4355c0 -23.5615 -9.6416 -45.0225 -25.1416 -60.4395c-6.86328 -6.84082 -14.9756 -12.4639 -23.8604 -16.6787
-l22.7598 -102.048c0.0478516 0 0.0761719 0.0146484 0.124023 0.0146484c34.1836 0.0126953 65.2773 -13.8594 87.6484 -36.1553c22.3984 -22.2734 36.3086 -53.249 36.3086 -87.2861c0 -34.0332 -13.9102 -64.9814 -36.3086 -87.2803
-c-22.373 -22.2979 -53.4658 -36.1436 -87.6484 -36.1436zM147.449 362.272c0 -16.4385 6.66211 -31.2129 17.4727 -41.9951c10.8281 -10.7734 25.6445 -17.3965 42.1572 -17.4082c16.5215 0.0107422 31.3281 6.63379 42.1582 17.3926
-c10.8086 10.7979 17.4521 25.5596 17.4521 42.0107c0 16.4336 -6.64355 31.1895 -17.4521 41.9785c-10.8301 10.7754 -25.6357 17.3867 -42.1582 17.3975c-16.5127 -0.0117188 -31.3291 -6.62207 -42.1572 -17.3975c-10.8398 -10.7891 -17.4727 -25.5449 -17.4727 -41.9785z
-M329.748 -3.00293c16.1152 16.0977 26.041 38.1455 26.0713 62.6836c-0.0302734 24.541 -9.95605 46.5889 -26.0713 62.6914c-16.1611 16.0684 -38.3037 25.9434 -62.9609 25.9551c-24.6387 -0.00878906 -46.752 -9.88574 -62.9141 -25.9551
-c-16.1445 -16.1025 -26.0713 -38.1523 -26.0713 -62.6914c0 -24.5371 9.92676 -46.585 26.0713 -62.6836c16.1611 -16.0693 38.2754 -25.9424 62.9141 -25.957c24.6572 0.0126953 46.7988 9.88672 62.9609 25.957z" />
-    <glyph glyph-name="geodata" unicode="&#xf107;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM255.517 -10.7539c-36.6543 0 -71.1143 14.2744 -97.0322 40.1924c-25.9189 25.9199 -40.1934 60.3799 -40.1934 97.0332s14.2744 71.1133 40.1934 97.0332c25.918 25.9189 60.3779 40.1924 97.0322 40.1924
-c36.6533 0 71.1143 -14.2734 97.0332 -40.1924c25.918 -25.9199 40.1924 -60.3799 40.1924 -97.0332s-14.2744 -71.1133 -40.1924 -97.0332c-25.9199 -25.918 -60.3799 -40.1924 -97.0332 -40.1924zM263.665 5.82031l0.548828 0.0390625
-c28.9033 2.06348 56.167 14.5459 76.7676 35.1465s33.083 47.8643 35.1475 76.7686l0.0390625 0.547852h-22.708v16.2979h22.708l-0.0390625 0.547852c-2.06445 28.9043 -14.5469 56.167 -35.1475 76.7686c-20.6006 20.5996 -47.8633 33.083 -76.7676 35.1465
-l-0.548828 0.0390625v-22.707h-16.2969v22.707l-0.548828 -0.0390625c-28.9043 -2.06445 -56.167 -14.5469 -76.7686 -35.1465c-20.6006 -20.6016 -33.083 -47.8643 -35.1465 -76.7686l-0.0390625 -0.547852h22.708v-16.2979h-22.708l0.0390625 -0.547852
-c2.06445 -28.9043 14.5469 -56.168 35.1465 -76.7686c20.6016 -20.6006 47.8643 -33.083 76.7686 -35.1465l0.548828 -0.0390625v17.1553h16.2969v-17.1553zM255.517 263.185c-36.5176 0 -70.8486 -14.2207 -96.6709 -40.042
-c-25.8213 -25.8232 -40.042 -60.1543 -40.042 -96.6719c0 -36.5166 14.2207 -70.8477 40.042 -96.6709c25.8223 -25.8213 60.1533 -40.042 96.6709 -40.042c36.5166 0 70.8486 14.2207 96.6709 40.042c25.8223 25.8232 40.042 60.1543 40.042 96.6709
-c0 36.5176 -14.2197 70.8486 -40.042 96.6719c-25.8223 25.8213 -60.1543 40.042 -96.6709 40.042zM263.153 224.928v21.6455v1.09961l1.09668 -0.078125c29.0264 -2.07324 56.4062 -14.6084 77.0938 -35.2959s33.2227 -48.0674 35.2959 -77.0938l0.0791016 -1.09766
-h-1.10059h-21.6455v-15.2725h21.6455h1.10059l-0.0791016 -1.09766c-2.07324 -29.0264 -14.6084 -56.4062 -35.2959 -77.0928c-20.6875 -20.6885 -48.0674 -33.2236 -77.0938 -35.2969l-1.09668 -0.078125v1.09961v16.0947h-15.2734v-16.0947v-1.09961l-1.09766 0.078125
-c-29.0264 2.07324 -56.4053 14.6084 -77.0928 35.2969c-20.6885 20.6865 -33.2227 48.0664 -35.2959 77.0928l-0.078125 1.09766h1.09961h21.6465v15.2725h-21.6465h-1.09961l0.078125 1.09766c2.07324 29.0273 14.6074 56.4062 35.2959 77.0938
-c20.6875 20.6875 48.0664 33.2227 77.0928 35.2959l1.09766 0.078125v-1.09961v-21.6455h15.2734zM255.517 264.208v0c36.79 0 71.3799 -14.3271 97.3945 -40.3418c26.0156 -26.0156 40.3428 -60.6045 40.3428 -97.3955c0 -36.79 -14.3271 -71.3789 -40.3428 -97.3945
-c-26.0146 -26.0146 -60.6045 -40.3418 -97.3945 -40.3418c-36.791 0 -71.3789 14.3271 -97.3945 40.3418c-26.0156 26.0156 -40.3428 60.6045 -40.3428 97.3945c0 36.792 14.3271 71.3799 40.3428 97.3955c26.0146 26.0146 60.6035 40.3418 97.3945 40.3418z
-M246.855 223.903v0v22.6699c-59.5088 -4.25 -107.191 -51.9316 -111.44 -111.441h22.6699v-17.3203h-22.6699c4.25 -59.5088 51.9316 -107.191 111.44 -111.441v17.1182h17.3213v-17.1182c59.5088 4.25 107.19 51.9316 111.441 111.441h-22.6699v17.3203h22.6699
-c-4.25098 59.5098 -51.9326 107.191 -111.441 111.441v-22.6699h-17.3213zM223.457 158.531l113.237 49.1191l-49.1201 -113.237l-113.236 -49.1201zM201.481 72.4375l60.9619 26.4434l-34.5176 34.5176zM335.709 206.665l-111.862 -48.5234l-48.5234 -111.863
-l111.862 48.5244zM200.496 71.4521l1.03125 2.37891l25.6289 59.0811l0.598633 1.38086l1.06445 -1.06445l33.4531 -33.4531l1.06445 -1.06445l-1.38086 -0.599609l-59.0811 -25.627zM337.681 208.636v0l-49.7168 -114.611l-114.612 -49.7168l49.7168 114.613z
-M202.468 73.4238v0l59.0811 25.627l-33.4531 33.4531z" />
-    <glyph glyph-name="audio" unicode="&#xf105;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM371.032 265.229l0.0410156 -190.561h-0.0859375c-1.10156 -21.9277 -23.7656 -39.4336 -51.5654 -39.4336c-28.5068 0 -51.6133 18.4014 -51.6133 41.1035c0 22.6992 23.1064 41.1035 51.6133 41.1035
-c10.0078 0 19.3486 -2.27246 27.2607 -6.19922v100.195l-110.433 -26.915v-147.39c0.197266 -1.46191 0.301758 -2.94629 0.301758 -4.4502c0 -22.7021 -23.1084 -41.1035 -51.6123 -41.1035s-51.6104 18.4014 -51.6104 41.1035c0 22.7012 23.1064 41.1035 51.6104 41.1035
-c9.86523 0 19.083 -2.20508 26.9209 -6.0293l-0.106445 158.653z" />
-    <glyph glyph-name="other" unicode="&#xf10d;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002z" />
-    <glyph glyph-name="network" unicode="&#xf10c;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM113.53 197.376c0 28.6289 23.209 51.8379 51.8379 51.8379s51.8369 -23.209 51.8369 -51.8379s-23.208 -51.8379 -51.8369 -51.8379s-51.8379 23.209 -51.8379 51.8379zM155.128 41.6895
-c0 28.6289 23.208 51.8369 51.8369 51.8369c28.6299 0 51.8379 -23.208 51.8379 -51.8369s-23.208 -51.8379 -51.8379 -51.8379c-28.6289 0 -51.8369 23.209 -51.8369 51.8379zM269.815 214.272c0 28.6289 23.209 51.8379 51.8379 51.8379s51.8369 -23.209 51.8369 -51.8379
-s-23.208 -51.8369 -51.8369 -51.8369s-51.8379 23.208 -51.8379 51.8369zM295.542 78.2793c0 28.6289 23.209 51.8369 51.8379 51.8369s51.8369 -23.208 51.8369 -51.8369s-23.208 -51.8379 -51.8369 -51.8379s-51.8379 23.209 -51.8379 51.8379zM222.548 44.2441
-c-0.575195 -0.795898 -1.20703 -1.39551 -1.89453 -1.79883c-0.69043 -0.400391 -1.57324 -0.641602 -2.65137 -0.723633c-1.07812 -0.0800781 -2.37305 -0.0126953 -3.88281 0.201172c-1.51172 0.216797 -3.3916 0.619141 -5.64062 1.21094
-c-2.7959 0.735352 -5.04395 1.47363 -6.74414 2.21094c-1.70215 0.739258 -2.94043 1.50195 -3.7168 2.29004c-0.776367 0.789062 -1.12207 1.62598 -1.03418 2.51367c0.0878906 0.888672 0.489258 1.8584 1.20312 2.9082l106.321 155.616
-c0.504883 0.814453 1.10547 1.44043 1.80566 1.87598c0.696289 0.435547 1.56738 0.699219 2.61328 0.789062c1.04395 0.0898438 2.35547 0.0185547 3.93457 -0.213867c1.57812 -0.234375 3.45801 -0.636719 5.64062 -1.21094
-c2.86328 -0.75293 5.12891 -1.49609 6.79492 -2.22461c1.66699 -0.730469 2.87109 -1.48438 3.61426 -2.2627c0.741211 -0.779297 1.06934 -1.6123 0.982422 -2.5c-0.0888672 -0.888672 -0.454102 -1.86719 -1.10059 -2.93555zM153.63 194.42
-c-0.941406 0.699219 -1.64746 1.42773 -2.11621 2.18359c-0.46582 0.758789 -0.735352 1.69141 -0.811523 2.79785c-0.0732422 1.10645 0.0351562 2.41211 0.324219 3.91406c0.291992 1.50391 0.814453 3.35449 1.57227 5.55371
-c0.941406 2.7334 1.875 4.90918 2.79688 6.53027c0.922852 1.62109 1.86328 2.76855 2.8252 3.44434c0.962891 0.674805 1.97363 0.904297 3.03711 0.686523c1.06348 -0.21582 2.21777 -0.763672 3.46289 -1.64062l184.372 -130.411
-c0.964844 -0.629883 1.70215 -1.33105 2.21094 -2.10449c0.504883 -0.770508 0.803711 -1.69238 0.889648 -2.76758c0.0849609 -1.07324 -0.0292969 -2.39453 -0.342773 -3.96387c-0.3125 -1.56836 -0.835938 -3.41992 -1.57129 -5.55371
-c-0.963867 -2.7998 -1.9043 -4.99219 -2.81348 -6.58105c-0.912109 -1.58691 -1.8418 -2.7002 -2.79004 -3.34375c-0.951172 -0.639648 -1.95801 -0.853516 -3.01953 -0.636719c-1.06543 0.21875 -2.23145 0.730469 -3.49805 1.54102zM226.966 27.6621
-c0.262695 -0.945312 0.336914 -1.8125 0.222656 -2.60254c-0.117188 -0.788086 -0.480469 -1.62988 -1.08789 -2.52246c-0.610352 -0.892578 -1.4707 -1.8623 -2.58105 -2.9082c-1.1123 -1.04688 -2.59961 -2.26465 -4.46582 -3.65332
-c-2.31934 -1.72656 -4.29883 -3.02051 -5.93652 -3.88965c-1.63965 -0.868164 -3.00781 -1.36035 -4.10938 -1.47559c-1.10059 -0.114258 -1.96973 0.137695 -2.6084 0.760742c-0.639648 0.62207 -1.14648 1.54199 -1.52246 2.75488l-55.251 180.189
-c-0.321289 0.902344 -0.435547 1.7627 -0.338867 2.58203c0.0947266 0.81543 0.431641 1.66016 1.01367 2.53418c0.582031 0.871094 1.45605 1.85156 2.62305 2.94043c1.16797 1.08691 2.65527 2.30469 4.46582 3.65137c2.375 1.76758 4.36914 3.07422 5.97949 3.92188
-c1.61133 0.84668 2.95117 1.31641 4.02246 1.41211c1.07227 0.0927734 1.92773 -0.170898 2.56641 -0.792969c0.639648 -0.624023 1.17578 -1.51953 1.60742 -2.69238zM361.474 91.7939c0.163086 -0.733398 0.166016 -1.43848 0.00683594 -2.11621
-c-0.163086 -0.676758 -0.548828 -1.44531 -1.15625 -2.30566c-0.609375 -0.860352 -1.44727 -1.83203 -2.51172 -2.91699c-1.06836 -1.08496 -2.48242 -2.38477 -4.24609 -3.90137c-2.19336 -1.88477 -4.05078 -3.34473 -5.57324 -4.38477
-c-1.52441 -1.04004 -2.77832 -1.71582 -3.7666 -2.02539c-0.989258 -0.308594 -1.74414 -0.269531 -2.26758 0.12207c-0.523438 0.392578 -0.90625 1.05664 -1.15137 1.99023l-35.8848 138.773c-0.220703 0.685547 -0.257812 1.37793 -0.112305 2.07617
-c0.144531 0.695312 0.507812 1.46191 1.09082 2.30078c0.582031 0.835938 1.43262 1.82031 2.55176 2.95215c1.12012 1.12988 2.53516 2.42969 4.24609 3.90137c2.24512 1.92969 4.11816 3.40234 5.61328 4.41992c1.49707 1.0166 2.72559 1.66797 3.68555 1.95605
-c0.961914 0.286133 1.7041 0.234375 2.22656 -0.157227c0.523438 -0.393555 0.935547 -1.0332 1.23242 -1.9209z" />
-  </font>
-</defs></svg>
diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.ttf b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.ttf
deleted file mode 100644
index 56ba52dc77c..00000000000
Binary files a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.ttf and /dev/null differ
diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff
deleted file mode 100644
index 7a7815808cf..00000000000
Binary files a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff and /dev/null differ
diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff2 b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff2
deleted file mode 100644
index 50886942958..00000000000
Binary files a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff2 and /dev/null differ
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/httpd/conf.d/ssl.conf b/doc/sphinx-guides/source/_static/installation/files/etc/httpd/conf.d/ssl.conf
index d17ca127b4a..e1e11423d9d 100644
--- a/doc/sphinx-guides/source/_static/installation/files/etc/httpd/conf.d/ssl.conf
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/httpd/conf.d/ssl.conf
@@ -223,14 +223,10 @@ CustomLog logs/ssl_request_log \
 #  Require all granted
 #</Location>
 
-# don't pass paths used by rApache and TwoRavens to Glassfish
-ProxyPassMatch ^/RApacheInfo$ !
-ProxyPassMatch ^/custom !
-ProxyPassMatch ^/dataexplore !
-# don't pass paths used by Shibboleth to Glassfish
+# don't pass paths used by Shibboleth to app server
 ProxyPassMatch ^/Shibboleth.sso !
 ProxyPassMatch ^/shibboleth-ds !
-# pass everything else to Glassfish
+# pass everything else to app server
 ProxyPass / ajp://localhost:8009/
 
 <Location /shib.xhtml>
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/glassfish.init.root b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/glassfish.init.root
deleted file mode 100755
index 8d74f89ec18..00000000000
--- a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/glassfish.init.root
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# chkconfig: 2345 99 01
-# description: GlassFish App Server
-
-set -e
-
-ASADMIN=/usr/local/glassfish4/bin/asadmin
-
-case "$1" in
-  start)
-        echo -n "Starting GlassFish server: glassfish"
-        # Increase file descriptor limit:
-        ulimit -n 32768
-        # Allow "memory overcommit":
-        # (basically, this allows to run exec() calls from inside the
-        # app, without the Unix fork() call physically hogging 2X
-        # the amount of memory glassfish is already using)
-        echo 1 > /proc/sys/vm/overcommit_memory
-
-        #echo
-        #echo "GLASSFISH IS UNDER MAINTENANCE;"
-        #echo "PLEASE DO NOT USE service init script."
-        #echo
-	LANG=en_US.UTF-8; export LANG
-        $ASADMIN start-domain domain1
-        echo "."
-        ;;
-  stop)
-        echo -n "Stopping GlassFish server: glassfish"
-        #echo
-        #echo "GLASSFISH IS UNDER MAINTENANCE;"
-        #echo "PLEASE DO NOT USE service init script."
-        #echo
-
-        $ASADMIN stop-domain domain1
-        echo "."
-        ;;
-
-  *)
-        echo "Usage: /etc/init.d/glassfish {start|stop}"
-        exit 1
-esac
-
-exit 0
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/glassfish.init.service b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/glassfish.init.service
deleted file mode 100755
index 32769763f5d..00000000000
--- a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/glassfish.init.service
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# chkconfig: 2345 80 01
-# description: GlassFish App Server
-set -e
-
-ASADMIN=/usr/local/glassfish4/bin/asadmin
-GF_USER=glassfish
-
-case "$1" in
-  start)
-        echo -n "Starting GlassFish server: glassfish"
-        # Increase file descriptor limit:
-        ulimit -n 32768
-        # Allow "memory overcommit":
-        # (basically, this allows to run exec() calls from inside the
-        # app, without the Unix fork() call physically hogging 2X
-        # the amount of memory glassfish is already using)
-        echo 1 > /proc/sys/vm/overcommit_memory
-	LANG=en_US.UTF-8; export LANG
-
-        sudo -u $GF_USER $ASADMIN start-domain domain1
-        ;;
-  stop)
-        echo -n "Stopping GlassFish server: glassfish"
-
-        sudo -u $GF_USER $ASADMIN stop-domain domain1
-        echo "."
-         ;;
-  *)
-        echo "Usage: /etc/init.d/glassfish {start|stop}"
-
-        exit 1
-esac
-exit 0
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/payara.init.root b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/payara.init.root
new file mode 100755
index 00000000000..b9ef9960318
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/payara.init.root
@@ -0,0 +1,44 @@
+#! /bin/sh
+# chkconfig: 2345 99 01
+# description: Payara App Server
+
+set -e
+
+ASADMIN=/usr/local/payara6/bin/asadmin
+
+case "$1" in
+  start)
+        echo -n "Starting Payara"
+        # Increase file descriptor limit:
+        ulimit -n 32768
+        # Allow "memory overcommit":
+        # (basically, this allows to run exec() calls from inside the
+        # app, without the Unix fork() call physically hogging 2X
+        # the amount of memory Payara is already using)
+        echo 1 > /proc/sys/vm/overcommit_memory
+
+        #echo
+        #echo "PAYARA IS UNDER MAINTENANCE;"
+        #echo "PLEASE DO NOT USE service init script."
+        #echo
+	LANG=en_US.UTF-8; export LANG
+        $ASADMIN start-domain domain1
+        echo "."
+        ;;
+  stop)
+        echo -n "Stopping Payara"
+        #echo
+        #echo "PAYARA IS UNDER MAINTENANCE;"
+        #echo "PLEASE DO NOT USE service init script."
+        #echo
+
+        $ASADMIN stop-domain domain1
+        echo "."
+        ;;
+
+  *)
+        echo "Usage: /etc/init.d/payara {start|stop}"
+        exit 1
+esac
+
+exit 0
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/payara.init.service b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/payara.init.service
new file mode 100755
index 00000000000..19bb190e740
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/payara.init.service
@@ -0,0 +1,34 @@
+#! /bin/sh
+# chkconfig: 2345 80 01
+# description: Payara App Server
+set -e
+
+ASADMIN=/usr/local/payara6/bin/asadmin
+APP_SERVER_USER=dataverse
+
+case "$1" in
+  start)
+        echo -n "Starting Payara"
+        # Increase file descriptor limit:
+        ulimit -n 32768
+        # Allow "memory overcommit":
+        # (basically, this allows to run exec() calls from inside the
+        # app, without the Unix fork() call physically hogging 2X
+        # the amount of memory Payara is already using)
+        echo 1 > /proc/sys/vm/overcommit_memory
+	LANG=en_US.UTF-8; export LANG
+
+        sudo -u $APP_SERVER_USER $ASADMIN start-domain domain1
+        ;;
+  stop)
+        echo -n "Stopping Payara"
+
+        sudo -u $APP_SERVER_USER $ASADMIN stop-domain domain1
+        echo "."
+         ;;
+  *)
+        echo "Usage: /etc/init.d/payara {start|stop}"
+
+        exit 1
+esac
+exit 0
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr
index 0c6f27ccf40..303cd3c7534 100755
--- a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr
@@ -5,7 +5,7 @@
 # chkconfig: 35 92 08
 # description: Starts and stops Apache Solr
 
-SOLR_DIR="/usr/local/solr/solr-7.3.1"
+SOLR_DIR="/usr/local/solr/solr-9.8.0"
 SOLR_COMMAND="bin/solr"
 SOLR_ARGS="-m 1g"
 SOLR_USER=solr
@@ -33,4 +33,3 @@ case $1 in
         exit 1
         ;;
 esac
-
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/attribute-map.xml b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/attribute-map.xml
index f6386b620f5..0633f055222 100644
--- a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/attribute-map.xml
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/attribute-map.xml
@@ -6,67 +6,65 @@
     few exceptions for newer attributes where the name is the same for both versions. You will
     usually want to uncomment or map the names for both SAML versions as a unit.
     -->
-    
-    <!-- First some useful eduPerson attributes that many sites might use. -->
-    
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName" id="eppn">
-        <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
+  
+    <!-- New standard identifier attributes for SAML. -->
+
+<!-- Changed from "subject-id" to "eppn" to make Dataverse happy. -->
+<!--
+    <Attribute name="urn:oasis:names:tc:SAML:attribute:subject-id" id="subject-id">
+-->
+    <Attribute name="urn:oasis:names:tc:SAML:attribute:subject-id" id="eppn">
+        <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
+    </Attribute>
+  
+    <Attribute name="urn:oasis:names:tc:SAML:attribute:pairwise-id" id="pairwise-id">
+        <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
     </Attribute>
+
+    <!-- The most typical eduPerson attributes. -->
+
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" id="eppn">
-        <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
+        <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
     </Attribute>
-    
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" id="affiliation">
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName" id="eppn">
         <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
     </Attribute>
+
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" id="affiliation">
         <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
     </Attribute>
-    
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation" id="unscoped-affiliation">
-        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
-    </Attribute>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" id="unscoped-affiliation">
-        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" id="affiliation">
+        <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
     </Attribute>
-    
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonEntitlement" id="entitlement"/>
+
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" id="entitlement"/>
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonEntitlement" id="entitlement"/>
 
-    <!-- A persistent id attribute that supports personalized anonymous access. -->
-    
-    <!-- First, the deprecated/incorrect version, decoded as a scoped string: -->
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="targeted-id">
-        <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
-        <!-- <AttributeDecoder xsi:type="NameIDFromScopedAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/> -->
-    </Attribute>
-    
-    <!-- Second, an alternate decoder that will decode the incorrect form into the newer form. -->
     <!--
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="persistent-id">
-        <AttributeDecoder xsi:type="NameIDFromScopedAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
-    </Attribute>
+    Legacy pairwise identifier attribute / NameID format, intended to be replaced by the
+    simpler pairwise-id attribute (see top of file).
     -->
     
-    <!-- Third, the new version (note the OID-style name): -->
+    <!-- The eduPerson attribute version (note the OID-style name): -->
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" id="persistent-id">
         <AttributeDecoder xsi:type="NameIDAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
     </Attribute>
 
-    <!-- Fourth, the SAML 2.0 NameID Format: -->
+    <!-- The SAML 2.0 NameID Format: -->
     <Attribute name="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" id="persistent-id">
         <AttributeDecoder xsi:type="NameIDAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
     </Attribute>
     
-    <!-- Some more eduPerson attributes, uncomment these to use them... -->
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" id="primary-affiliation">
+    <!-- Other eduPerson attributes (SAML 2 names followed by SAML 1 names)... -->
+    <!--
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" id="assurance"/>    
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" id="member"/>
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" id="eduCourseOffering"/>
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" id="eduCourseMember"/>
+
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" id="unscoped-affiliation">
         <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
     </Attribute>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonNickname" id="nickname"/>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" id="primary-orgunit-dn"/>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" id="orgunit-dn"/>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonOrgDN" id="org-dn"/>
-
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" id="primary-affiliation">
         <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
     </Attribute>
@@ -75,18 +73,53 @@
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" id="orgunit-dn"/>
     <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" id="org-dn"/>
 
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" id="assurance"/>
-    
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" id="member"/>
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation" id="unscoped-affiliation">
+        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+    </Attribute>
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" id="primary-affiliation">
+        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+    </Attribute>
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonNickname" id="nickname"/>
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" id="primary-orgunit-dn"/>
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" id="orgunit-dn"/>
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonOrgDN" id="org-dn"/>
+    -->
     
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" id="eduCourseOffering"/>
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" id="eduCourseMember"/>
+    <!-- Older LDAP-defined attributes (SAML 2.0 names followed by SAML 1 names)... -->
+    <!-- Uncommented because Dataverse needs some of these attributes. -->
+    <Attribute name="urn:oid:2.5.4.3" id="cn"/>
+    <Attribute name="urn:oid:2.5.4.4" id="sn"/>
+    <Attribute name="urn:oid:2.5.4.42" id="givenName"/>
+    <Attribute name="urn:oid:2.16.840.1.113730.3.1.241" id="displayName"/>
+    <Attribute name="urn:oid:0.9.2342.19200300.100.1.1" id="uid"/>
+    <Attribute name="urn:oid:0.9.2342.19200300.100.1.3" id="mail"/>
+    <Attribute name="urn:oid:2.5.4.20" id="telephoneNumber"/>
+    <Attribute name="urn:oid:2.5.4.12" id="title"/>
+    <Attribute name="urn:oid:2.5.4.43" id="initials"/>
+    <Attribute name="urn:oid:2.5.4.13" id="description"/>
+    <Attribute name="urn:oid:2.16.840.1.113730.3.1.1" id="carLicense"/>
+    <Attribute name="urn:oid:2.16.840.1.113730.3.1.2" id="departmentNumber"/>
+    <Attribute name="urn:oid:2.16.840.1.113730.3.1.3" id="employeeNumber"/>
+    <Attribute name="urn:oid:2.16.840.1.113730.3.1.4" id="employeeType"/>
+    <Attribute name="urn:oid:2.16.840.1.113730.3.1.39" id="preferredLanguage"/>
+    <Attribute name="urn:oid:0.9.2342.19200300.100.1.10" id="manager"/>
+    <Attribute name="urn:oid:2.5.4.34" id="seeAlso"/>
+    <Attribute name="urn:oid:2.5.4.23" id="facsimileTelephoneNumber"/>
+    <Attribute name="urn:oid:2.5.4.9" id="street"/>
+    <Attribute name="urn:oid:2.5.4.18" id="postOfficeBox"/>
+    <Attribute name="urn:oid:2.5.4.17" id="postalCode"/>
+    <Attribute name="urn:oid:2.5.4.8" id="st"/>
+    <Attribute name="urn:oid:2.5.4.7" id="l"/>
+    <Attribute name="urn:oid:2.5.4.10" id="o"/>
+    <Attribute name="urn:oid:2.5.4.11" id="ou"/>
+    <Attribute name="urn:oid:2.5.4.15" id="businessCategory"/>
+    <Attribute name="urn:oid:2.5.4.19" id="physicalDeliveryOfficeName"/>
 
-    <!-- Examples of LDAP-based attributes, uncomment to use these... -->
     <Attribute name="urn:mace:dir:attribute-def:cn" id="cn"/>
     <Attribute name="urn:mace:dir:attribute-def:sn" id="sn"/>
     <Attribute name="urn:mace:dir:attribute-def:givenName" id="givenName"/>
     <Attribute name="urn:mace:dir:attribute-def:displayName" id="displayName"/>
+    <Attribute name="urn:mace:dir:attribute-def:uid" id="uid"/>
     <Attribute name="urn:mace:dir:attribute-def:mail" id="mail"/>
     <Attribute name="urn:mace:dir:attribute-def:telephoneNumber" id="telephoneNumber"/>
     <Attribute name="urn:mace:dir:attribute-def:title" id="title"/>
@@ -110,32 +143,27 @@
     <Attribute name="urn:mace:dir:attribute-def:businessCategory" id="businessCategory"/>
     <Attribute name="urn:mace:dir:attribute-def:physicalDeliveryOfficeName" id="physicalDeliveryOfficeName"/>
 
-    <Attribute name="urn:oid:0.9.2342.19200300.100.1.1" id="uid"/>
-    <Attribute name="urn:oid:2.5.4.3" id="cn"/>
-    <Attribute name="urn:oid:2.5.4.4" id="sn"/>
-    <Attribute name="urn:oid:2.5.4.42" id="givenName"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.241" id="displayName"/>
-    <Attribute name="urn:oid:0.9.2342.19200300.100.1.3" id="mail"/>
-    <Attribute name="urn:oid:2.5.4.20" id="telephoneNumber"/>
-    <Attribute name="urn:oid:2.5.4.12" id="title"/>
-    <Attribute name="urn:oid:2.5.4.43" id="initials"/>
-    <Attribute name="urn:oid:2.5.4.13" id="description"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.1" id="carLicense"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.2" id="departmentNumber"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.3" id="employeeNumber"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.4" id="employeeType"/>
-    <Attribute name="urn:oid:2.16.840.1.113730.3.1.39" id="preferredLanguage"/>
-    <Attribute name="urn:oid:0.9.2342.19200300.100.1.10" id="manager"/>
-    <Attribute name="urn:oid:2.5.4.34" id="seeAlso"/>
-    <Attribute name="urn:oid:2.5.4.23" id="facsimileTelephoneNumber"/>
-    <Attribute name="urn:oid:2.5.4.9" id="street"/>
-    <Attribute name="urn:oid:2.5.4.18" id="postOfficeBox"/>
-    <Attribute name="urn:oid:2.5.4.17" id="postalCode"/>
-    <Attribute name="urn:oid:2.5.4.8" id="st"/>
-    <Attribute name="urn:oid:2.5.4.7" id="l"/>
-    <Attribute name="urn:oid:2.5.4.10" id="o"/>
-    <Attribute name="urn:oid:2.5.4.11" id="ou"/>
-    <Attribute name="urn:oid:2.5.4.15" id="businessCategory"/>
-    <Attribute name="urn:oid:2.5.4.19" id="physicalDeliveryOfficeName"/>
+    <!-- SCHAC attributes... -->
+    <!--
+    <Attribute name="urn:oid:1.3.6.1.4.1.25178.1.2.9" id="schacHomeOrganization">
+        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+    </Attribute>
+    <Attribute name="urn:oid:1.3.6.1.4.1.25178.1.2.10" id="schacHomeOrganizationType">
+        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+    </Attribute>
+    <Attribute name="urn:oid:1.3.6.1.4.1.25178.1.2.14" id="schacPersonalUniqueCode">
+        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+    </Attribute>
+    <Attribute name="urn:oid:1.3.6.1.4.1.25178.1.2.15" id="schacPersonalUniqueID"/>
+    <Attribute name="urn:oid:1.3.6.1.4.1.25178.1.2.19" id="schacUserStatus">
+        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+    </Attribute>
+    <Attribute name="urn:oid:1.3.6.1.4.1.25178.1.2.20" id="schacProjectMembership">
+        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+    </Attribute>
+    <Attribute name="urn:oid:1.3.6.1.4.1.25178.1.2.21" id="schacProjectSpecificRole">
+        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+    </Attribute>
+    -->
 
 </Attributes>
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/dataverse-idp-metadata.xml b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/dataverse-idp-metadata.xml
index 07970b26c2d..861829aedb5 100644
--- a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/dataverse-idp-metadata.xml
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/dataverse-idp-metadata.xml
@@ -1,124 +1,122 @@
-<?xml version="1.0"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdalg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="https://dataverse.org/shibboleth">
-  <!-- This file contains the metadata for the testing IdP and SP
-     that are operated by TestShib as a service for testing new
-     Shibboleth and SAML providers. -->
-  <EntityDescriptor entityID="https://idp.testshib.org/idp/shibboleth">
-    <Extensions>
-      <mdalg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <mdalg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <mdalg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <mdalg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <mdalg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <mdalg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <mdalg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <mdalg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <Extensions>
-        <shibmd:Scope regexp="false">testshib.org</shibmd:Scope>
-        <mdui:UIInfo>
-          <mdui:DisplayName xml:lang="en">TestShib Test IdP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">TestShib IdP. Use this as a source of attributes for your test SP.</mdui:Description>
-          <mdui:Logo height="88" width="253">https://idp.testshib.org/idp/images/logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </Extensions>
-      <KeyDescriptor>
-        <ds:KeyInfo>
-          <ds:X509Data>
-            <ds:X509Certificate>
-                            MIIEDjCCAvagAwIBAgIBADANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJVUzEV
-                            MBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYDVQQHEwpQaXR0c2J1cmdoMREwDwYD
-                            VQQKEwhUZXN0U2hpYjEZMBcGA1UEAxMQaWRwLnRlc3RzaGliLm9yZzAeFw0wNjA4
-                            MzAyMTEyMjVaFw0xNjA4MjcyMTEyMjVaMGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQI
-                            EwxQZW5uc3lsdmFuaWExEzARBgNVBAcTClBpdHRzYnVyZ2gxETAPBgNVBAoTCFRl
-                            c3RTaGliMRkwFwYDVQQDExBpZHAudGVzdHNoaWIub3JnMIIBIjANBgkqhkiG9w0B
-                            AQEFAAOCAQ8AMIIBCgKCAQEArYkCGuTmJp9eAOSGHwRJo1SNatB5ZOKqDM9ysg7C
-                            yVTDClcpu93gSP10nH4gkCZOlnESNgttg0r+MqL8tfJC6ybddEFB3YBo8PZajKSe
-                            3OQ01Ow3yT4I+Wdg1tsTpSge9gEz7SrC07EkYmHuPtd71CHiUaCWDv+xVfUQX0aT
-                            NPFmDixzUjoYzbGDrtAyCqA8f9CN2txIfJnpHE6q6CmKcoLADS4UrNPlhHSzd614
-                            kR/JYiks0K4kbRqCQF0Dv0P5Di+rEfefC6glV8ysC8dB5/9nb0yh/ojRuJGmgMWH
-                            gWk6h0ihjihqiu4jACovUZ7vVOCgSE5Ipn7OIwqd93zp2wIDAQABo4HEMIHBMB0G
-                            A1UdDgQWBBSsBQ869nh83KqZr5jArr4/7b+QazCBkQYDVR0jBIGJMIGGgBSsBQ86
-                            9nh83KqZr5jArr4/7b+Qa6FrpGkwZzELMAkGA1UEBhMCVVMxFTATBgNVBAgTDFBl
-                            bm5zeWx2YW5pYTETMBEGA1UEBxMKUGl0dHNidXJnaDERMA8GA1UEChMIVGVzdFNo
-                            aWIxGTAXBgNVBAMTEGlkcC50ZXN0c2hpYi5vcmeCAQAwDAYDVR0TBAUwAwEB/zAN
-                            BgkqhkiG9w0BAQUFAAOCAQEAjR29PhrCbk8qLN5MFfSVk98t3CT9jHZoYxd8QMRL
-                            I4j7iYQxXiGJTT1FXs1nd4Rha9un+LqTfeMMYqISdDDI6tv8iNpkOAvZZUosVkUo
-                            93pv1T0RPz35hcHHYq2yee59HJOco2bFlcsH8JBXRSRrJ3Q7Eut+z9uo80JdGNJ4
-                            /SJy5UorZ8KazGj16lfJhOBXldgrhppQBb0Nq6HKHguqmwRfJ+WkxemZXzhediAj
-                            Geka8nz8JjwxpUjAiSWYKLtJhGEaTqCYxCCX2Dw+dOTqUzHOZ7WKv4JXPK5G/Uhr
-                            8K/qhmFT2nIQi538n6rVYLeWj8Bbnl+ev0peYzxFyF5sQA==
+<!-- The entity describing the SAMLtest IdP, named by the entityID below --> 
+
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" ID="SAMLtestIdP" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://samltest.id/saml/idp">
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+
+        <Extensions>
+<!-- An enumeration of the domains this IdP is able to assert scoped attributes, which are
+typically those with a @ delimiter, like mail.  Most IdP's serve only a single domain.  It's crucial
+for the SP to check received attribute values match permitted domains to prevent a recognized IdP from 
+sending attribute values for which a different recognized IdP is authoritative. -->
+            <shibmd:Scope regexp="false">samltest.id</shibmd:Scope>
+
+<!-- Display information about this IdP that can be used by SP's and discovery
+services to identify the IdP meaningfully for end users --> 
+            <mdui:UIInfo>
+                <mdui:DisplayName xml:lang="en">SAMLtest IdP</mdui:DisplayName>
+                <mdui:Description xml:lang="en">A free and basic IdP for testing SAML deployments</mdui:Description>
+                <mdui:Logo height="90" width="225">https://samltest.id/saml/logo.png</mdui:Logo>
+            </mdui:UIInfo>
+        </Extensions>
+
+        <KeyDescriptor use="signing">
+            <ds:KeyInfo>
+                    <ds:X509Data>
+                        <ds:X509Certificate>
+MIIDETCCAfmgAwIBAgIUZRpDhkNKl5eWtJqk0Bu1BgTTargwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLc2FtbHRlc3QuaWQwHhcNMTgwODI0MjExNDEwWhcNMzgw
+ODI0MjExNDEwWjAWMRQwEgYDVQQDDAtzYW1sdGVzdC5pZDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJrh9/PcDsiv3UeL8Iv9rf4WfLPxuOm9W6aCntEA
+8l6c1LQ1Zyrz+Xa/40ZgP29ENf3oKKbPCzDcc6zooHMji2fBmgXp6Li3fQUzu7yd
++nIC2teejijVtrNLjn1WUTwmqjLtuzrKC/ePoZyIRjpoUxyEMJopAd4dJmAcCq/K
+k2eYX9GYRlqvIjLFoGNgy2R4dWwAKwljyh6pdnPUgyO/WjRDrqUBRFrLQJorR2kD
+c4seZUbmpZZfp4MjmWMDgyGM1ZnR0XvNLtYeWAyt0KkSvFoOMjZUeVK/4xR74F8e
+8ToPqLmZEg9ZUx+4z2KjVK00LpdRkH9Uxhh03RQ0FabHW6UCAwEAAaNXMFUwHQYD
+VR0OBBYEFJDbe6uSmYQScxpVJhmt7PsCG4IeMDQGA1UdEQQtMCuCC3NhbWx0ZXN0
+LmlkhhxodHRwczovL3NhbWx0ZXN0LmlkL3NhbWwvaWRwMA0GCSqGSIb3DQEBCwUA
+A4IBAQBNcF3zkw/g51q26uxgyuy4gQwnSr01Mhvix3Dj/Gak4tc4XwvxUdLQq+jC
+cxr2Pie96klWhY/v/JiHDU2FJo9/VWxmc/YOk83whvNd7mWaNMUsX3xGv6AlZtCO
+L3JhCpHjiN+kBcMgS5jrtGgV1Lz3/1zpGxykdvS0B4sPnFOcaCwHe2B9SOCWbDAN
+JXpTjz1DmJO4ImyWPJpN1xsYKtm67Pefxmn0ax0uE2uuzq25h0xbTkqIQgJzyoE/
+DPkBFK1vDkMfAW11dQ0BXatEnW7Gtkc0lh2/PIbHWj4AzxYMyBf5Gy6HSVOftwjC
+voQR2qr2xJBixsg+MIORKtmKHLfU
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-      </KeyDescriptor>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.testshib.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.testshib.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.testshib.org/idp/profile/Shibboleth/SSO"/>
-      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.testshib.org/idp/profile/SAML2/POST/SSO"/>
-      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.testshib.org/idp/profile/SAML2/Redirect/SSO"/>
-      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.testshib.org/idp/profile/SAML2/SOAP/ECP"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo>
-          <ds:X509Data>
-            <ds:X509Certificate>
-                            MIIEDjCCAvagAwIBAgIBADANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJVUzEV
-                            MBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYDVQQHEwpQaXR0c2J1cmdoMREwDwYD
-                            VQQKEwhUZXN0U2hpYjEZMBcGA1UEAxMQaWRwLnRlc3RzaGliLm9yZzAeFw0wNjA4
-                            MzAyMTEyMjVaFw0xNjA4MjcyMTEyMjVaMGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQI
-                            EwxQZW5uc3lsdmFuaWExEzARBgNVBAcTClBpdHRzYnVyZ2gxETAPBgNVBAoTCFRl
-                            c3RTaGliMRkwFwYDVQQDExBpZHAudGVzdHNoaWIub3JnMIIBIjANBgkqhkiG9w0B
-                            AQEFAAOCAQ8AMIIBCgKCAQEArYkCGuTmJp9eAOSGHwRJo1SNatB5ZOKqDM9ysg7C
-                            yVTDClcpu93gSP10nH4gkCZOlnESNgttg0r+MqL8tfJC6ybddEFB3YBo8PZajKSe
-                            3OQ01Ow3yT4I+Wdg1tsTpSge9gEz7SrC07EkYmHuPtd71CHiUaCWDv+xVfUQX0aT
-                            NPFmDixzUjoYzbGDrtAyCqA8f9CN2txIfJnpHE6q6CmKcoLADS4UrNPlhHSzd614
-                            kR/JYiks0K4kbRqCQF0Dv0P5Di+rEfefC6glV8ysC8dB5/9nb0yh/ojRuJGmgMWH
-                            gWk6h0ihjihqiu4jACovUZ7vVOCgSE5Ipn7OIwqd93zp2wIDAQABo4HEMIHBMB0G
-                            A1UdDgQWBBSsBQ869nh83KqZr5jArr4/7b+QazCBkQYDVR0jBIGJMIGGgBSsBQ86
-                            9nh83KqZr5jArr4/7b+Qa6FrpGkwZzELMAkGA1UEBhMCVVMxFTATBgNVBAgTDFBl
-                            bm5zeWx2YW5pYTETMBEGA1UEBxMKUGl0dHNidXJnaDERMA8GA1UEChMIVGVzdFNo
-                            aWIxGTAXBgNVBAMTEGlkcC50ZXN0c2hpYi5vcmeCAQAwDAYDVR0TBAUwAwEB/zAN
-                            BgkqhkiG9w0BAQUFAAOCAQEAjR29PhrCbk8qLN5MFfSVk98t3CT9jHZoYxd8QMRL
-                            I4j7iYQxXiGJTT1FXs1nd4Rha9un+LqTfeMMYqISdDDI6tv8iNpkOAvZZUosVkUo
-                            93pv1T0RPz35hcHHYq2yee59HJOco2bFlcsH8JBXRSRrJ3Q7Eut+z9uo80JdGNJ4
-                            /SJy5UorZ8KazGj16lfJhOBXldgrhppQBb0Nq6HKHguqmwRfJ+WkxemZXzhediAj
-                            Geka8nz8JjwxpUjAiSWYKLtJhGEaTqCYxCCX2Dw+dOTqUzHOZ7WKv4JXPK5G/Uhr
-                            8K/qhmFT2nIQi538n6rVYLeWj8Bbnl+ev0peYzxFyF5sQA==
+                    </ds:X509Data>
+            </ds:KeyInfo>
+
+        </KeyDescriptor>
+        <KeyDescriptor use="signing">
+            <ds:KeyInfo>
+                    <ds:X509Data>
+                        <ds:X509Certificate>
+MIIDEjCCAfqgAwIBAgIVAMECQ1tjghafm5OxWDh9hwZfxthWMA0GCSqGSIb3DQEB
+CwUAMBYxFDASBgNVBAMMC3NhbWx0ZXN0LmlkMB4XDTE4MDgyNDIxMTQwOVoXDTM4
+MDgyNDIxMTQwOVowFjEUMBIGA1UEAwwLc2FtbHRlc3QuaWQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC0Z4QX1NFKs71ufbQwoQoW7qkNAJRIANGA4iM0
+ThYghul3pC+FwrGv37aTxWXfA1UG9njKbbDreiDAZKngCgyjxj0uJ4lArgkr4AOE
+jj5zXA81uGHARfUBctvQcsZpBIxDOvUUImAl+3NqLgMGF2fktxMG7kX3GEVNc1kl
+bN3dfYsaw5dUrw25DheL9np7G/+28GwHPvLb4aptOiONbCaVvh9UMHEA9F7c0zfF
+/cL5fOpdVa54wTI0u12CsFKt78h6lEGG5jUs/qX9clZncJM7EFkN3imPPy+0HC8n
+spXiH/MZW8o2cqWRkrw3MzBZW3Ojk5nQj40V6NUbjb7kfejzAgMBAAGjVzBVMB0G
+A1UdDgQWBBQT6Y9J3Tw/hOGc8PNV7JEE4k2ZNTA0BgNVHREELTArggtzYW1sdGVz
+dC5pZIYcaHR0cHM6Ly9zYW1sdGVzdC5pZC9zYW1sL2lkcDANBgkqhkiG9w0BAQsF
+AAOCAQEASk3guKfTkVhEaIVvxEPNR2w3vWt3fwmwJCccW98XXLWgNbu3YaMb2RSn
+7Th4p3h+mfyk2don6au7Uyzc1Jd39RNv80TG5iQoxfCgphy1FYmmdaSfO8wvDtHT
+TNiLArAxOYtzfYbzb5QrNNH/gQEN8RJaEf/g/1GTw9x/103dSMK0RXtl+fRs2nbl
+D1JJKSQ3AdhxK/weP3aUPtLxVVJ9wMOQOfcy02l+hHMb6uAjsPOpOVKqi3M8XmcU
+ZOpx4swtgGdeoSpeRyrtMvRwdcciNBp9UZome44qZAYH1iqrpmmjsfI9pJItsgWu
+3kXPjhSfj1AJGR1l9JGvJrHki1iHTA==
+                        </ds:X509Certificate>
+                    </ds:X509Data>
+            </ds:KeyInfo>
+
+        </KeyDescriptor>
+        <KeyDescriptor use="encryption">
+            <ds:KeyInfo>
+                    <ds:X509Data>
+                        <ds:X509Certificate>
+MIIDEjCCAfqgAwIBAgIVAPVbodo8Su7/BaHXUHykx0Pi5CFaMA0GCSqGSIb3DQEB
+CwUAMBYxFDASBgNVBAMMC3NhbWx0ZXN0LmlkMB4XDTE4MDgyNDIxMTQwOVoXDTM4
+MDgyNDIxMTQwOVowFjEUMBIGA1UEAwwLc2FtbHRlc3QuaWQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCQb+1a7uDdTTBBFfwOUun3IQ9nEuKM98SmJDWa
+MwM877elswKUTIBVh5gB2RIXAPZt7J/KGqypmgw9UNXFnoslpeZbA9fcAqqu28Z4
+sSb2YSajV1ZgEYPUKvXwQEmLWN6aDhkn8HnEZNrmeXihTFdyr7wjsLj0JpQ+VUlc
+4/J+hNuU7rGYZ1rKY8AA34qDVd4DiJ+DXW2PESfOu8lJSOteEaNtbmnvH8KlwkDs
+1NvPTsI0W/m4SK0UdXo6LLaV8saIpJfnkVC/FwpBolBrRC/Em64UlBsRZm2T89ca
+uzDee2yPUvbBd5kLErw+sC7i4xXa2rGmsQLYcBPhsRwnmBmlAgMBAAGjVzBVMB0G
+A1UdDgQWBBRZ3exEu6rCwRe5C7f5QrPcAKRPUjA0BgNVHREELTArggtzYW1sdGVz
+dC5pZIYcaHR0cHM6Ly9zYW1sdGVzdC5pZC9zYW1sL2lkcDANBgkqhkiG9w0BAQsF
+AAOCAQEABZDFRNtcbvIRmblnZItoWCFhVUlq81ceSQddLYs8DqK340//hWNAbYdj
+WcP85HhIZnrw6NGCO4bUipxZXhiqTA/A9d1BUll0vYB8qckYDEdPDduYCOYemKkD
+dmnHMQWs9Y6zWiYuNKEJ9mf3+1N8knN/PK0TYVjVjXAf2CnOETDbLtlj6Nqb8La3
+sQkYmU+aUdopbjd5JFFwbZRaj6KiHXHtnIRgu8sUXNPrgipUgZUOVhP0C0N5OfE4
+JW8ZBrKgQC/6vJ2rSa9TlzI6JAa5Ww7gMXMP9M+cJUNQklcq+SBnTK8G+uBHgPKR
+zBDsMIEzRtQZm4GIoHJae4zmnCekkQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.testshib.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.testshib.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">TestShib Two Identity Provider</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">TestShib Two</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.testshib.org/testshib-two/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Nate</GivenName>
-      <SurName>Klingenstein</SurName>
-      <EmailAddress>ndk@internet2.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-</EntitiesDescriptor>
+                    </ds:X509Data>
+            </ds:KeyInfo>
+
+        </KeyDescriptor>
+
+<!-- An endpoint for artifact resolution.  Please see Wikipedia for more details about SAML
+     artifacts and when you may find them useful. -->
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samltest.id/idp/profile/SAML2/SOAP/ArtifactResolution" index="1" />
+
+<!-- A set of endpoints where the IdP can receive logout messages. These must match the public
+facing addresses if this IdP is hosted behind a reverse proxy.  --> 
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.id/idp/profile/SAML2/Redirect/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.id/idp/profile/SAML2/POST/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samltest.id/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+
+<!-- A set of endpoints the SP can send AuthnRequests to in order to trigger user authentication. -->
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://samltest.id/idp/profile/Shibboleth/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.id/idp/profile/SAML2/POST/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samltest.id/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.id/idp/profile/SAML2/Redirect/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samltest.id/idp/profile/SAML2/SOAP/ECP"/>
+
+    </IDPSSODescriptor>
+
+</EntityDescriptor>
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibGroupSAMLtest.json b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibGroupSAMLtest.json
new file mode 100644
index 00000000000..8cfe2285e40
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibGroupSAMLtest.json
@@ -0,0 +1,5 @@
+{
+  "name": "All samltest.id Shibboleth Users",
+  "attribute": "Shib-Identity-Provider",
+  "pattern": "https://samltest.id/saml/idp"
+}
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibGroupTestShib.json b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibGroupTestShib.json
deleted file mode 100644
index 01b2bd51b2d..00000000000
--- a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibGroupTestShib.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "All testshib.org Shibboleth Users",
-  "attribute": "Shib-Identity-Provider",
-  "pattern": "https://idp.testshib.org/idp/shibboleth"
-}
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibboleth2.xml b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibboleth2.xml
index 41bf4709ba9..3960d003ad2 100644
--- a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibboleth2.xml
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibboleth2.xml
@@ -18,7 +18,7 @@ https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPConfiguration
 
         <!-- You should use secure cookies if at all possible.  See cookieProps in this Wiki article. -->
         <!-- https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPSessions -->
-        <Sessions lifetime="28800" timeout="3600" checkAddress="false" relayState="ss:mem" handlerSSL="false">
+        <Sessions lifetime="28800" timeout="3600" checkAddress="false" relayState="ss:mem" handlerSSL="false" redirectLimit="exact">
 
 	    <SSO>
 	      SAML2 SAML1
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/glassfish.service b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/glassfish.service
deleted file mode 100644
index 37c2107412a..00000000000
--- a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/glassfish.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description = GlassFish Server v4.1
-After = syslog.target network.target
-
-[Service]
-Type = forking
-ExecStart = /usr/bin/java -jar /usr/local/glassfish4/glassfish/lib/client/appserver-cli.jar start-domain
-ExecStop = /usr/bin/java -jar /usr/local/glassfish4/glassfish/lib/client/appserver-cli.jar stop-domain
-ExecReload = /usr/bin/java -jar /usr/local/glassfish4/glassfish/lib/client/appserver-cli.jar restart-domain
-User=glassfish
-LimitNOFILE=32768
-Environment="LANG=en_US.UTF-8"
-TimeoutStartSec=120s
-
-[Install]
-WantedBy = multi-user.target
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/payara.service b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/payara.service
new file mode 100644
index 00000000000..c8efcb9c6f9
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/payara.service
@@ -0,0 +1,16 @@
+[Unit]
+Description = Payara Server
+After = syslog.target network.target
+
+[Service]
+Type = forking
+ExecStart = /usr/bin/java -jar /usr/local/payara6/glassfish/lib/client/appserver-cli.jar start-domain
+ExecStop = /usr/bin/java -jar /usr/local/payara6/glassfish/lib/client/appserver-cli.jar stop-domain
+ExecReload = /usr/bin/java -jar /usr/local/payara6/glassfish/lib/client/appserver-cli.jar restart-domain
+User=dataverse
+LimitNOFILE=32768
+Environment="LANG=en_US.UTF-8"
+TimeoutStartSec=120s
+
+[Install]
+WantedBy = multi-user.target
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service
index 8960e708fff..f3eed1479bc 100644
--- a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service
@@ -5,9 +5,9 @@ After = syslog.target network.target remote-fs.target nss-lookup.target
 [Service]
 User = solr
 Type = forking
-WorkingDirectory = /usr/local/solr/solr-7.3.1
-ExecStart = /usr/local/solr/solr-7.3.1/bin/solr start -m 1g
-ExecStop = /usr/local/solr/solr-7.3.1/bin/solr stop
+WorkingDirectory = /usr/local/solr/solr-9.8.0
+ExecStart = /usr/local/solr/solr-9.8.0/bin/solr start -m 1g
+ExecStop = /usr/local/solr/solr-9.8.0/bin/solr stop
 LimitNOFILE=65000
 LimitNPROC=65000
 Restart=on-failure
diff --git a/doc/sphinx-guides/source/_static/installation/files/examples/rate-limit-actions-setting.json b/doc/sphinx-guides/source/_static/installation/files/examples/rate-limit-actions-setting.json
new file mode 100644
index 00000000000..3dfc7648dc3
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/installation/files/examples/rate-limit-actions-setting.json
@@ -0,0 +1,40 @@
+[
+    {
+      "tier": 0,
+      "limitPerHour": 10,
+      "actions": [
+        "GetLatestPublishedDatasetVersionCommand",
+        "GetPrivateUrlCommand",
+        "GetDatasetCommand",
+        "GetLatestAccessibleDatasetVersionCommand"
+      ]
+    },
+    {
+      "tier": 0,
+      "limitPerHour": 1,
+      "actions": [
+        "CreateGuestbookResponseCommand",
+        "UpdateDatasetVersionCommand",
+        "DestroyDatasetCommand",
+        "DeleteDataFileCommand",
+        "FinalizeDatasetPublicationCommand",
+        "PublishDatasetCommand"
+      ]
+    },
+    {
+      "tier": 1,
+      "limitPerHour": 30,
+      "actions": [
+        "CreateGuestbookResponseCommand",
+        "GetLatestPublishedDatasetVersionCommand",
+        "GetPrivateUrlCommand",
+        "GetDatasetCommand",
+        "GetLatestAccessibleDatasetVersionCommand",
+        "UpdateDatasetVersionCommand",
+        "DestroyDatasetCommand",
+        "DeleteDataFileCommand",
+        "FinalizeDatasetPublicationCommand",
+        "PublishDatasetCommand"
+      ]
+    }
+]
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.6-rpm0.x86_64.rpm b/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.6-rpm0.x86_64.rpm
deleted file mode 100644
index b578d63144f..00000000000
Binary files a/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.6-rpm0.x86_64.rpm and /dev/null differ
diff --git a/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.7-rpm0.x86_64.rpm b/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.7-rpm0.x86_64.rpm
deleted file mode 100644
index 9ca6086c86a..00000000000
Binary files a/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.7-rpm0.x86_64.rpm and /dev/null differ
diff --git a/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.9_R-3.5-RH6.x86_64.rpm b/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.9_R-3.5-RH6.x86_64.rpm
deleted file mode 100644
index 1743a2ce9a7..00000000000
Binary files a/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.9_R-3.5-RH6.x86_64.rpm and /dev/null differ
diff --git a/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.9_R-3.5.x86_64.rpm b/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.9_R-3.5.x86_64.rpm
deleted file mode 100644
index 6c4e30672eb..00000000000
Binary files a/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.9_R-3.5.x86_64.rpm and /dev/null differ
diff --git a/doc/sphinx-guides/source/_static/installation/files/issues/2180/grizzly-patch/glassfish-grizzly-extra-all.jar b/doc/sphinx-guides/source/_static/installation/files/issues/2180/grizzly-patch/glassfish-grizzly-extra-all.jar
deleted file mode 100644
index 5e2690688c5..00000000000
Binary files a/doc/sphinx-guides/source/_static/installation/files/issues/2180/grizzly-patch/glassfish-grizzly-extra-all.jar and /dev/null differ
diff --git a/doc/sphinx-guides/source/_static/installation/files/issues/2180/grizzly-patch/readme.md b/doc/sphinx-guides/source/_static/installation/files/issues/2180/grizzly-patch/readme.md
deleted file mode 100644
index 88bb7a039fd..00000000000
--- a/doc/sphinx-guides/source/_static/installation/files/issues/2180/grizzly-patch/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-This patch was created on 2015-06-30 by pdurbin for Glassfish 4.1. The file AjpHttpRequest.class was replaced with the one from https://java.net/jira/secure/attachment/55000/grizzly-http-ajp-2.3.19.jar with the following command:
-
-`jar uf glassfish-grizzly-extra-all.jar org/glassfish/grizzly/http/ajp/AjpHttpRequest.class`
-
-For details on this patch, see https://github.com/payara/Payara/issues/350 and https://java.net/jira/browse/GRIZZLY-1787
-
-Here is the MD5 for the updated jar:
-
-547af1855e697bc2e51ca4ec9c45cf00  glassfish-grizzly-extra-all.jar
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/microsoft.json b/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/microsoft.json
new file mode 100644
index 00000000000..8c555735577
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/microsoft.json
@@ -0,0 +1,8 @@
+{
+    "id":"microsoft",
+    "factoryAlias":"oauth2",
+    "title":"Microsoft",
+    "subtitle":"",
+    "factoryData":"type: microsoft | userEndpoint: NONE | clientId: FIXME | clientSecret: FIXME",
+    "enabled":true
+}
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/oidc.json b/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/oidc.json
new file mode 100644
index 00000000000..9df38988a25
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/oidc.json
@@ -0,0 +1,8 @@
+{
+    "id":"<a unique id>",
+    "factoryAlias":"oidc",
+    "title":"<a title - shown in UI>",
+    "subtitle":"<a subtitle - currently unused in UI>",
+    "factoryData":"type: oidc | issuer: <issuer url> | clientId: <client id> | clientSecret: <client secret> | pkceEnabled: <true/false> | pkceMethod: <PLAIN/S256/...>",
+    "enabled":true
+}
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid.json b/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid-member.json
similarity index 100%
rename from doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid.json
rename to doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid-member.json
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid-public.json b/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid-public.json
new file mode 100644
index 00000000000..8a0c7bbe6c5
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid-public.json
@@ -0,0 +1,8 @@
+{
+    "id":"orcid-public",
+    "factoryAlias":"oauth2",
+    "title":"ORCID",
+    "subtitle":"",
+    "factoryData":"type: orcid | userEndpoint: https://pub.orcid.org/v2.1/{ORCID}/person | clientId: FIXME | clientSecret: FIXME",
+    "enabled":true
+}
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/big-data-support/checksumValidationSuccess.json b/doc/sphinx-guides/source/_static/installation/files/root/big-data-support/checksumValidationSuccess.json
deleted file mode 100644
index 6b609c4c65e..00000000000
--- a/doc/sphinx-guides/source/_static/installation/files/root/big-data-support/checksumValidationSuccess.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "status": "validation passed",
-  "uploadFolder": "OS7O8Y",
-  "totalSize": 72
-}
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/external-tools/auxFileTool.json b/doc/sphinx-guides/source/_static/installation/files/root/external-tools/auxFileTool.json
new file mode 100644
index 00000000000..b188520dabb
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/installation/files/root/external-tools/auxFileTool.json
@@ -0,0 +1,26 @@
+{
+  "displayName": "AuxFileViewer",
+  "description": "Show an auxiliary file from a dataset file.",
+  "toolName": "auxPreviewer",
+  "scope": "file",
+  "types": [
+    "preview"
+  ],
+  "toolUrl": "https://example.com/AuxFileViewer.html",
+  "toolParameters": {
+    "queryParameters": [
+      {
+        "fileid": "{fileId}"
+      }
+    ]
+  },
+  "requirements": {
+    "auxFilesExist": [
+      {
+        "formatTag": "myFormatTag",
+        "formatVersion": "0.1"
+      }
+    ]
+  },
+  "contentType": "application/foobar"
+}
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/external-tools/dynamicDatasetTool.json b/doc/sphinx-guides/source/_static/installation/files/root/external-tools/dynamicDatasetTool.json
index 2a9a888dddf..22dd6477cb4 100644
--- a/doc/sphinx-guides/source/_static/installation/files/root/external-tools/dynamicDatasetTool.json
+++ b/doc/sphinx-guides/source/_static/installation/files/root/external-tools/dynamicDatasetTool.json
@@ -2,7 +2,9 @@
   "displayName": "Dynamic Dataset Tool",
   "description": "Dazzles! Dizzying!",
   "scope": "dataset",
-  "type": "explore",
+  "types": [
+    "explore"
+  ],
   "toolUrl": "https://dynamicdatasettool.com/v2",
   "toolParameters": {
     "queryParameters": [
@@ -10,8 +12,16 @@
         "PID": "{datasetPid}"
       },
       {
-        "apiToken": "{apiToken}"
+        "locale":"{localeCode}"
       }
     ]
-  }
+  },
+  "allowedApiCalls": [
+    {
+      "name":"retrieveDatasetJson",
+      "httpMethod":"GET",
+      "urlTemplate":"/api/v1/datasets/{datasetId}",
+      "timeOut":10
+    }
+  ]
 }
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/external-tools/fabulousFileTool.json b/doc/sphinx-guides/source/_static/installation/files/root/external-tools/fabulousFileTool.json
index e1dc0475d28..2b6a0b8e092 100644
--- a/doc/sphinx-guides/source/_static/installation/files/root/external-tools/fabulousFileTool.json
+++ b/doc/sphinx-guides/source/_static/installation/files/root/external-tools/fabulousFileTool.json
@@ -1,18 +1,34 @@
 {
   "displayName": "Fabulous File Tool",
-  "description": "Fabulous Fun for Files!",
+  "description": "A non-existent tool that is fabulous fun for files!",
+  "toolName": "fabulous",
   "scope": "file",
-  "type": "explore",
+  "types": [
+    "explore",
+    "preview"
+  ],
   "toolUrl": "https://fabulousfiletool.com",
   "contentType": "text/tab-separated-values",
+  "httpMethod":"GET",
   "toolParameters": {
     "queryParameters": [
       {
         "fileid": "{fileId}"
       },
       {
-        "key": "{apiToken}"
+        "datasetPid": "{datasetPid}"
+      },
+      {
+        "locale":"{localeCode}"
       }
     ]
-  }
+  },
+  "allowedApiCalls": [
+    {
+      "name":"retrieveDataFile",
+      "httpMethod":"GET",
+      "urlTemplate":"/api/v1/access/datafile/{fileId}",
+      "timeOut":270
+    }
+  ]
 }
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/external-tools/twoRavens.json b/doc/sphinx-guides/source/_static/installation/files/root/external-tools/twoRavens.json
deleted file mode 100644
index a8862dbf7e9..00000000000
--- a/doc/sphinx-guides/source/_static/installation/files/root/external-tools/twoRavens.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "displayName": "TwoRavens",
-  "description": "A system of interlocking statistical tools for data exploration, analysis, and meta-analysis.",
-  "scope": "file",
-  "type": "explore",
-  "toolUrl": "https://tworavens.dataverse.example.edu/dataexplore/gui.html",
-  "toolParameters": {
-    "queryParameters": [
-      {
-        "dfId": "{fileId}"
-      },
-      {
-        "key": "{apiToken}"
-      }
-    ]
-  }
-}
diff --git a/doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/analytics-code.html b/doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/analytics-code.html
index 4e6a01f2d5d..46700e875e8 100644
--- a/doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/analytics-code.html
+++ b/doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/analytics-code.html
@@ -10,8 +10,8 @@
 
   function enableAnalyticsEventCapture() {
     // Download button
-    $(document).on("click", ".btn-download", function() {
-      var category = $(this).text();
+    $(document).on("click", ".btn-download, .btn-download.dropdown-toggle + ul.dropdown-menu li a", function() {
+      var category = stripSize($(this).text());
       var label = getFileId($(this));
       gtag('event', 'Download',{'event_category' : category,
                                 'event_label' : label});
@@ -26,7 +26,7 @@
     });
 
     // Explore button
-    $(document).on("click", ".btn-explore + ul.dropdown-menu li a", function() {
+    $(document).on("click", ".btn-explore, .btn-explore.dropdown-toggle + ul.dropdown-menu li a", function() {
       var category = $(this).text();
       var label = getFileId($(this));
       gtag('event', 'Explore', {'event_category' : category,
@@ -34,7 +34,7 @@
     });
 
     // Compute button
-    $(document).on("click", ".btn-compute", function() {
+    $(document).on("click", ".btn-compute, .btn-compute.dropdown-toggle + ul.dropdown-menu li a", function() {
       var category = $(this).text();
       var label = getFileId($(this));
       gtag('event', 'Compute', {'event_category' : category,
@@ -42,7 +42,7 @@
     });
 
     // Preview button
-    $(document).on("click", ".btn-preview", function() {
+    $(document).on("click", ".btn-preview, .btn-preview.dropdown-toggle + ul.dropdown-menu li a", function() {
       var category = $(this).text();
       var label = getFileId($(this));
       gtag('event', 'Preview', {'event_category' : category,
@@ -110,14 +110,14 @@
 
   function getFileId(target) {
     var label = 'Unknown';
-    if(target.parents('th').length>0) {
+    if(target.parents('th, #actionButtonBlock .btn-access-dataset + ul.dropdown-menu').length>0) {
       //Special case - the Download button that downloads all selected files in the dataset
       label = 'file(s) from ' + stripId($('#datasetForm').attr('action'));
     } else {
       var row = target.parents('tr')[0];
       if(row != null) {
         //finds the file id/DOI in the Dataset page
-        label = $(row).find('td.col-file-metadata > a').attr('href');
+        label = $(row).find('td.col-file-metadata  a').attr('href');
       } else {
         //finds the file id/DOI in the file page
         label = $('#fileForm').attr('action');
@@ -145,5 +145,13 @@
     label = label.substring(label.indexOf('/dataverse/') + 11, index).split(/[?#]/)[0];
     return(label);
   }
+
+  function stripSize(category) {
+    var index = category.indexOf('ZIP (');
+    if(index >= 0) {
+      category = category.substring(0, index + 3);
+    }
+    return(category);
+  }
   //]]>
 </script>
diff --git a/doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/custom-homepage-dynamic.html b/doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/custom-homepage-dynamic.html
deleted file mode 100644
index d648f530290..00000000000
--- a/doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/custom-homepage-dynamic.html
+++ /dev/null
@@ -1,357 +0,0 @@
-
-<style>
-    /* Custom CSS for the custom homepage... */
-    .lite-header {font-weight: normal;}
-    .heavy-rule {border: 1px solid #DDD;}
-    .spacer-rule {border:0;margin-top:0;}
-    .activity-rule {width:85%;margin-left:30px;}
-    div.hmpg-action-block {padding-top:1em;}
-    .btn-harvard { 
-      color: #A51C30;
-      background: #FFFFFF;
-      font-weight: bold;
-    }
-    .btn-harvard:hover, 
-    .btn-harvard:focus, 
-    .btn-harvard:active, 
-    .btn-harvard.active, 
-    .open .dropdown-toggle.btn-harvard { 
-      color: #7F000A;
-      background: #FFFFFF;
-      font-weight: bold;
-    }
-    .btn-harvard span.glyphicon {margin-right:0;}
-
-    div.search-widget {padding-bottom: 2em;}
-    
-    @media (min-width: 768px) {
-        #dataversesBySubject {-webkit-column-count: 3; -moz-column-count: 3; column-count: 3; overflow: hidden; -webkit-column-break-inside: avoid; page-break-inside: avoid; break-inside: avoid; break-inside: avoid-column;}
-
-        #journals {-webkit-column-count: 1; -moz-column-count: 1; column-count: 1; overflow: hidden;}
-        #researchers {-webkit-column-count: 2; -moz-column-count: 2; column-count: 2; overflow: hidden;}
-        #journals div.hmpg-recent-block, #researchers div.hmpg-recent-block {-webkit-column-break-inside: avoid; page-break-inside: avoid; break-inside: avoid; break-inside: avoid-column;}
-
-    }
-    #browseBySubject p.browse-subjects {display:inline-block; width:100%; padding:0 2px;}
-    #browseBySubject p.browse-subjects a {color: #C55B28;}
-    #browseBySubject p.browse-subjects a:focus, #browseBySubject p.browse-subjects a:hover {color: #9F3502;}
-
-    div.hmpg-recent-col p.placeholder {display:inline-block;}
-    div.hmpg-recent-col div.hmpg-recent-block {border-bottom:1px solid #DDD;margin-bottom:12px;}
-    
-    /* NOTE: REMOVED THUMBNAILS
-    div.hmpg-recent-col div.col-xs-2.hmpg-recent-thumb {width: 48px !important;height:48px;padding: 0 !important;}
-    div.hmpg-recent-col div.hmpg-recent-thumb img {max-height:48px;max-width:48px;}
-    div.hmpg-recent-col div.hmpg-recent-thumb span {font-size:38px;}
-    */
-
-    div.activity-label {line-height: 19px;margin-top: 10px;margin-bottom: 10px;}
-</style>
-
-    <!-- ACTIONS -->
-    <div class="row hmpg-action-block">
-        <div class="col-sm-6 col-xs-12">
-            <div class="h4 lite-header">Deposit and share your data. Get academic credit.</div>
-            <p class="text-muted margin-bottom">Harvard Dataverse is a repository for research data. Deposit data and code here.</p>
-            
-            <p class="margin-bottom-half">
-                <span id="headAllTimeAllDatasetsValue" class="h4 lite-header"></span> <span class="text-muted">datasets</span>
-                &nbsp;&nbsp;
-                <span id="headAllTimeAllDownloadsValue" class="h4 lite-header"></span> <span class="text-muted">downloads</span>
-            </p>
-
-            <a class="btn btn-default btn-harvard margin-top margin-bottom" href="/dataset.xhtml?ownerId=1">
-                Add a dataset <span class="glyphicon glyphicon-plus text-muted"></span>
-            </a>
-        </div>
-        <div class="col-sm-6 col-xs-12">
-            <div class="h4 lite-header">Organize datasets and gather metrics in your own repository.</div>
-            <p class="text-muted margin-bottom">A dataverse is a container for all your datasets, files, and metadata.</p>
-            
-            <p class="margin-bottom-half">
-                <span id="headAllTimeAllDataversesValue" class="h4 lite-header"></span> <span class="text-muted">dataverses</span>
-            </p>
-
-            <a class="btn btn-default btn-harvard margin-top margin-bottom" href="/dataverse.xhtml?ownerId=1">
-                Add a dataverse <span class="glyphicon glyphicon-plus text-muted"></span>
-            </a>
-        </div>
-    </div>
-
-    <hr class="heavy-rule"/>
-
-    <!-- SEARCH + BROWSE + RECENT -->
-    <div class="row hmpg-browse-block">
-        
-        <!-- SEARCH -->
-        <!-- 
-        NOTE: The alias of the root dataverse will need to be configured in this URL 
-        -->
-        <div class="col-xs-12">
-            <div class="h4 lite-header margin-bottom">Find data across research fields, preview metadata, and download files</div>
-            <div class="row">
-                <div class="col-md-5 col-sm-6 col-xs-11">
-                    <div class="search-widget input-group">
-                        <input id="inputDataverseSearch" class="form-control" type="text" placeholder="" onkeydown="if (event.keyCode == 13) document.getElementById('btnDataverseSearch').click();">
-                        <span class="input-group-btn">
-                            <button id="btnDataverseSearch" class="btn btn-default" type="button" onclick="window.location = '/dataverse/root?q=' + document.getElementById('inputDataverseSearch').value;return false;"><span class="glyphicon glyphicon-search"></span> Find</button>
-                        </span>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <!-- BROWSE SUBJECT -->
-        <div id="browseBySubject" class="col-xs-12">
-            <p class="text-muted margin-bottom">Browse by subject</p>
-            <div class="row margin-bottom">
-                <!-- SUBJECTS -->
-                <div id="dataversesBySubject" class="col-xs-12">
-                </div>
-                
-                <!-- VIEW ALL -->
-                <!-- 
-                NOTE: The alias of the root dataverse will need to be configured in this URL 
-                -->
-                <div class="col-xs-12 margin-top">
-                    <p class="browse-subjects small text-muted"><a href= "/dataverse/root">ALL DATA</a> <span class="glyphicon glyphicon-chevron-right"></span></p>
-                </div>
-            </div>
-        </div>
-
-        <!-- RECENT CATEGORY -->
-        <div id="recentActivity" class="col-xs-12">
-            <div class="row">
-                <div class="col-lg-4 col-xs-12 hmpg-recent-col">
-                    <div class="h4 lite-header margin-bottom">Datasets from journal dataverses</div>
-
-                    <hr class="col-xs-11 no-margin-top"/>
-
-                    <!-- JOURNAL RESULTS -->
-                    <div id="journals" class="row col-xs-12"><p class="text-muted">Loading...</p></div>
-
-                    <!-- VIEW ALL -->
-                    <!-- 
-                    NOTE: The alias of the root dataverse will need to be configured in this URL 
-                    -->
-                    <div class="row col-xs-12 hidden-lg">
-                        <p class="small text-muted"><a href="/dataverse/root?q=%28categoryOfDataverse%3A%22Journal%22+OR+dvCategory%3A%22Journal%22%29&types=datasets%3Adataverses&sort=dateSort">ALL RECENT JOURNAL ACTIVITY</a> <span class="glyphicon glyphicon-chevron-right"></span></p>
-                    </div>
-                </div>
-
-                <hr class="col-xs-12 hidden-lg spacer-rule" />
-
-                <div class="col-lg-8 col-xs-12 hmpg-recent-col">
-                    <div class="h4 lite-header margin-bottom">Datasets from other dataverses</div>
-
-                    <hr class="col-xs-11 no-margin-top"/>
-
-                    <!-- RESEARCHERS RESULTS -->
-                    <div id="researchers" class="row col-xs-12"><p class="placeholder text-muted">Loading...</p></div>
-                </div>
-            </div>
-            
-            <div class="row">
-                <div class="col-lg-4 col-xs-12 hmpg-recent-col">
-                    <!-- VIEW ALL -->
-                    <!-- 
-                    NOTE: The alias of the root dataverse will need to be configured in this URL 
-                    -->
-                    <div class="row col-xs-12 hidden-md hidden-sm hidden-xs margin-top">
-                        <p class="small text-muted"><a href="/dataverse/root?q=%28categoryOfDataverse%3A%22Journal%22+OR+dvCategory%3A%22Journal%22%29&types=datasets%3Adataverses&sort=dateSort">ALL RECENT JOURNAL ACTIVITY</a> <span class="glyphicon glyphicon-chevron-right"></span></p>
-                    </div>
-                </div>
-                <div class="col-lg-8 col-xs-12 hmpg-recent-col">
-                    <!-- VIEW ALL -->
-                    <!-- 
-                    NOTE: The alias of the root dataverse will need to be configured in this URL 
-                    -->
-                    <div class="row col-xs-12 margin-top">
-                        <p class="small text-muted"><a href= "/dataverse/root">ALL RECENT ACTIVITY</a> <span class="glyphicon glyphicon-chevron-right"></span></p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <hr/>
-
-    <!-- ACTIVITY -->
-    <div class="row hmpg-activity-block">
-        <div class="col-xs-12">
-            <div class="h4 lite-header margin-bottom">Activity</div>
-        </div>
-
-        <div class="row">
-
-            <div class="col-md-6 col-xs-12">
-                <div class="col-xs-12 row">
-                    <div class="col-xs-4 highlightBold">Datasets</div>
-                    <div class="col-xs-4 highlightBold">All Activity</div>
-                    <div class="col-xs-4 highlightBold">Past 30 Days</div>
-                </div>
-                <div class="col-xs-12 row">
-                    <div class="col-xs-4 activity-label">Total</div>
-                    <div class="col-xs-4 h4 lite-header" id="activityAllTimeAllDatasetsValue"><span class="text-muted">...</span></div>
-                    <div class="col-xs-4 h4 lite-header" id="activity30DaysAllDatasetsValue"><span class="text-muted">...</span></div>
-                </div>
-                <div class="col-xs-12 row">
-                    <div class="col-xs-4 activity-label">Deposited</div>
-                    <div class="col-xs-4 h4 lite-header" id="activityAllTimeDepositedDatasetsValue"><span class="text-muted">...</span></div>
-                    <div class="col-xs-4 h4 lite-header" id="activity30DaysDepositedDatasetsValue"><span class="text-muted">...</span></div>
-                </div>
-                <div class="col-xs-12 row">
-                    <div class="col-xs-4 activity-label">Harvested</div>
-                    <div class="col-xs-4 h4 lite-header" id="activityAllTimeHarvestedDatasetsValue"><span class="text-muted">...</span></div>
-                    <div class="col-xs-4 h4 lite-header" id="activity30DaysHarvestedDatasetsValue"><span class="text-muted">...</span></div>
-                </div>
-            </div>
-
-            <hr class="col-sm-12 hidden-md hidden-lg activity-rule" />
-
-            <div class="col-md-6 col-xs-12">
-                <div class="col-xs-12 row">
-                    <div class="col-xs-4 highlightBold">Files</div>
-                    <div class="col-xs-4 highlightBold">All Activity</div>
-                    <div class="col-xs-4 highlightBold">Past 30 Days</div>
-                </div>
-                <div class="col-xs-12 row">
-                    <div class="col-xs-4 activity-label">Downloaded</div>
-                    <div class="col-xs-4 h4 lite-header" id="activityAllTimeAllDownloadsValue"><span class="text-muted">...</span></div>
-                    <div class="col-xs-4 h4 lite-header" id="activity30DaysAllDownloadsValue"><span class="text-muted">...</span></div>
-                </div>
-                <div class="col-xs-12 row">
-                    <div class="col-xs-4 activity-label">Deposited</div>
-                    <div class="col-xs-4 h4 lite-header" id="activityAllTimeDepositedFilesValue"><span class="text-muted">...</span></div>
-                    <div class="col-xs-4 h4 lite-header" id="activity30DaysDepositedFilesValue"><span class="text-muted">...</span></div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-
-    <hr class="heavy-rule"/>
-
-    <!-- OTHER LINKS -->
-    <div class="row hmpg-other-block">
-        <div class="col-xs-12">
-            <div class="h4 lite-header margin-bottom">Looking for other online repositories at Harvard?</div>
-            <div class="row">
-                <div class="col-lg-4 col-xs-12">
-                    <p class="text-muted"><a href="https://library.harvard.edu/services-tools/dash" target="_blank">Harvard DASH central, open-access repository</a> <span class="glyphicon glyphicon-chevron-right"></span></p>
-                </div>
-                <div class="col-lg-4 col-xs-12">
-                    <p class="text-muted"><a href="https://library.harvard.edu/services-tools/harvard-library-apis-datasets" target="_blank">Other data at Harvard</a> <span class="glyphicon glyphicon-chevron-right"></span></p>
-                </div>
-            </div>
-        </div>
-    </div>
-
-<script type="text/javascript">
-//<![CDATA[
-
-    //switch baseUrl to point to a different server than the local box
-    var baseUrl = ""; 
-
-    // NOTE: REMOVED THUMBNAILS
-    // var thumbBaseURL = baseUrl + "/api/datasets/:persistentId/thumbnail" + "?persistentId=";
-    var metricBaseUrl = baseUrl + "/api/info/metrics/";
-    var simpleCatSearch = baseUrl + "/api/search?q=*&type=dataset&sort=dateSort&order=desc&fq=categoryOfDataverse:";
-
-    function writeRecentDatasetsInDataverses(fqString, resultCount, elm) {
-        $.get(simpleCatSearch + fqString + "&per_page=" + resultCount, function(jData) {
-            var resultHtml = "";
-            jData.data.items.forEach(function(item){
-                var options = { year: 'numeric', month: 'short', day: 'numeric' };
-                var date = new Date(item.published_at).toLocaleString('en-US', options);
-                resultHtml += "<div class=\"hmpg-recent-block clearfix\">";
-                // NOTE: REMOVED THUMBNAILS
-                // resultHtml += "<div class=\"col-xs-2 text-center hmpg-recent-thumb\"><a href=\"/dataset.xhtml?persistentId=" + item.global_id + "\">";
-                // resultHtml += "<object data=\"" + thumbBaseURL + item.global_id + "\" type=\"image/png\"/><span class=\"icon-dataset\"></span></object>";
-                // resultHtml += "</a></div>";
-                // NOTE: REMOVED THUMBNAILS... in next line, change grid layout class to `col-xs-9 col-md-10`
-                resultHtml += "<div class=\"col-xs-12 hmpg-recent-metadata\"><p><a href=\"/dataset.xhtml?persistentId=" + item.global_id + "\">" + item.name + "</a></p><p class=\"small text-muted\"><a href=\"/dataverse/" + item.identifier_of_dataverse + "\" class=\"highlightBold\">" + item.name_of_dataverse + "</a> " + date + "</p></div>";
-                resultHtml += "</div>";
-            });
-            document.getElementById(elm).innerHTML = resultHtml;
-        });
-    }
-    
-    //For metrics that return simple json with a count
-    //Can take a single element or an array of elements
-    function queryMetricSimple(metricRelPath, month, elm) {
-        $.get(metricBaseUrl + metricRelPath + month, function(jData) {
-            var resultCount = jData.data.count;
-            if(Array.isArray(elm)) {
-                elm.forEach(function(e) {
-                    document.getElementById(e).innerHTML = resultCount.toLocaleString('en');
-                });
-            } else {
-                document.getElementById(elm).innerHTML = resultCount.toLocaleString('en');
-            }
-        });
-    }
-    
-    function queryMetricSearch(metricRelPath, month) {
-        $.get(metricBaseUrl + metricRelPath + month, function(jData) {
-            var resultCount = jData.data.count;
-            var roundedDatasetCount = Math.floor(resultCount / 100) * 100;
-            var dynamicSearchPlaceholder = "Search over " + roundedDatasetCount.toLocaleString('en') + " datasets...";
-            $("#inputDataverseSearch").attr({"placeholder" : dynamicSearchPlaceholder});
-        });
-    }
-    
-    function querySubjectDataverseDataset(elm) {
-        var dvArray = [];
-        var fullArray = [];
-        $.get(metricBaseUrl + "dataverses/bySubject", function(jData) {
-            jData.data.forEach(function(item) {
-                if(item.subject !== "N/A" && item.subject !== "Other") {
-                    dvArray.push([item.subject, item.count]);
-                }
-            });
-            $.get(metricBaseUrl + "datasets/bySubject?dataLocation=all", function(jData) {
-                var resultHtml = "";
-                jData.data.forEach(function(item) {
-                    if(item.subject !== "N/A" && item.subject !== "Other") {
-                        var dvCount = 0;
-                        for (var dvi = 0; dvi < dvArray.length; dvi++) {
-                            if(item.subject === dvArray[dvi][0]) {
-                                dvCount = dvArray[dvi][1];
-                                break;
-                            }
-                        }
-                        fullArray.push([item.subject, (item.count + dvCount -1).toLocaleString('en')]); //subtract 1 to remove root dv from counts
-                    }
-                });
-                fullArray.sort();
-                fullArray.forEach(function(subject){
-                    // NOTE: The alias of the root dataverse will need to be configured in this URL 
-                    resultHtml += "<p class=\"browse-subjects\"><a href=\"/dataverse/root?q=&fq0=subject_ss%3A%22" + subject[0] + "%22&types=dataverses%3Adatasets&sort=dateSort&order=desc\">" + subject[0] + "</a> <span class=\"text-muted\">" + subject[1] + "</span></p>";
-                });
-                document.getElementById(elm).innerHTML = resultHtml;
-            });
-        });
-    }
-
-    queryMetricSimple("datasets", "?dataLocation=all", ["headAllTimeAllDatasetsValue", "activityAllTimeAllDatasetsValue"]);
-    queryMetricSimple("downloads", "", ["headAllTimeAllDownloadsValue", "activityAllTimeAllDownloadsValue"]);
-    queryMetricSimple("dataverses", "", "headAllTimeAllDataversesValue");
-
-    writeRecentDatasetsInDataverses("(Journal)" , 3, "journals");
-    writeRecentDatasetsInDataverses("(\"Research+Project\"%20OR%20Researcher%20OR%20\"Research+Group\")" , 6, "researchers");
-    
-    queryMetricSimple("datasets/pastDays", "/30?dataLocation=all", "activity30DaysAllDatasetsValue");
-    queryMetricSimple("datasets", "?dataLocation=local", "activityAllTimeDepositedDatasetsValue");
-    queryMetricSimple("datasets/pastDays", "/30?dataLocation=local", "activity30DaysDepositedDatasetsValue");
-    queryMetricSimple("datasets", "?dataLocation=remote", "activityAllTimeHarvestedDatasetsValue");
-    queryMetricSimple("datasets/pastDays", "/30?dataLocation=remote", "activity30DaysHarvestedDatasetsValue");
-
-    queryMetricSimple("downloads/pastDays", "/30", "activity30DaysAllDownloadsValue");
-    queryMetricSimple("files", "", "activityAllTimeDepositedFilesValue");
-    queryMetricSimple("files/pastDays", "/30", "activity30DaysDepositedFilesValue");
-
-    querySubjectDataverseDataset("dataversesBySubject");
-    queryMetricSearch("datasets", "?dataLocation=all");
-//]]>
-</script>
diff --git a/doc/sphinx-guides/source/_static/navbar_from_dataverse_org.js b/doc/sphinx-guides/source/_static/navbar_from_dataverse_org.js
deleted file mode 100644
index 7432b63d38d..00000000000
--- a/doc/sphinx-guides/source/_static/navbar_from_dataverse_org.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*  
-    Use the HTML from the Dataverse.org navbar 
-    See:  https://github.com/IQSS/dataverse.org/tree/master/dataverse_org/templates/sphinx-navbar    
-*/
-function load_navbar(){
-    //var navbar_url = 'http://127.0.0.1:8000/nav-only-json/?callback=?';    
-    //var navbar_url = 'http://beta.dataverse.org/nav-only-json/?callback=?';    
-    var navbar_url = 'http://dataverse.org/nav-only-json/?callback=?';    
-    
-    var jqxhr = $.getJSON( navbar_url, function(data) {
-        console.log( "success" );
-        $('#dv-bs-navbar-details').html(data.navbar_html);
-        $("#dataverse-org-homepage-url").attr("href", data.dataverse_dot_org_homepage_url)
-    })
-    .fail(function() {
-        console.log( "error" );
-        $('#dv-bs-navbar-details').html('<!-- failed to retrieve navbar -->');
-    })
-}
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/_static/navbarscroll.js b/doc/sphinx-guides/source/_static/navbarscroll.js
index 66c9d4d7995..735f80870cd 100644
--- a/doc/sphinx-guides/source/_static/navbarscroll.js
+++ b/doc/sphinx-guides/source/_static/navbarscroll.js
@@ -1,6 +1,6 @@
 /*  
     Use to fix hidden section headers behind the navbar when using links with targets
-    See: http://stackoverflow.com/questions/10732690/offsetting-an-html-anchor-to-adjust-for-fixed-header    
+    See: https://stackoverflow.com/questions/10732690/offsetting-an-html-anchor-to-adjust-for-fixed-header    
 */
 $jqTheme(document).ready(function() {
   $jqTheme('a[href*="#"]:not([href="#"])').on('click', function() {
diff --git a/doc/sphinx-guides/source/_static/primefaces.css b/doc/sphinx-guides/source/_static/primefaces.css
index d03f2c1ef19..2d8a8510d84 100644
--- a/doc/sphinx-guides/source/_static/primefaces.css
+++ b/doc/sphinx-guides/source/_static/primefaces.css
@@ -1,6 +1,6 @@
 /*!* jQuery UI CSS Framework 1.8.20** Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT or GPL Version 2 licenses.* http://jquery.org/license** http://docs.jquery.com/UI/Theming/API*//* Layout helpers----------------------------------*/.ui-helper-hidden{display:none;}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:0px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:0px;}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none;}.ui-helper-clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden;}.ui-helper-clearfix{display:inline-block;}/* required comment for clearfix to work in Opera \*/* html .ui-helper-clearfix{height:1%;}.ui-helper-clearfix{display:block;}/* end clearfix */.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0);}/* Interaction Cues----------------------------------*/.ui-state-disabled{cursor:default !important;}/* Icons----------------------------------*//* states and images */.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;}/* Misc visuals----------------------------------*//* Overlays */.ui-widget-overlay{position:absolute;top:0;left:0;width:100%;height:100%;}/*!* jQuery UI Resizable 1.8.20** Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT or GPL Version 2 licenses.* http://jquery.org/license** http://docs.jquery.com/UI/Resizable#theming*/.ui-resizable{position:relative;}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;}.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle{display:none;}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0;}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0;}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%;}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%;}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px;}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px;}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px;}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px;}/*!* jQuery UI Selectable 1.8.20** Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT or GPL Version 2 licenses.* http://jquery.org/license** http://docs.jquery.com/UI/Selectable#theming*/.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black;}/*!* jQuery UI Slider 1.8.20** Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT or GPL Version 2 licenses.* http://jquery.org/license** http://docs.jquery.com/UI/Slider#theming*/.ui-slider{position:relative;text-align:left;}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0;}.ui-slider-horizontal{height:.8em;}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em;}.ui-slider-horizontal .ui-slider-range{top:0;height:100%;}.ui-slider-horizontal .ui-slider-range-min{left:0;}.ui-slider-horizontal .ui-slider-range-max{right:0;}.ui-slider-vertical{width:.8em;height:100px;}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em;}.ui-slider-vertical .ui-slider-range{left:0;width:100%;}.ui-slider-vertical .ui-slider-range-min{bottom:0;}.ui-slider-vertical .ui-slider-range-max{top:0;}/*!* jQuery UI Datepicker 1.8.20** Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT or GPL Version 2 licenses.* http://jquery.org/license** http://docs.jquery.com/UI/Datepicker#theming*/.ui-datepicker{width:17em;padding:.2em .2em 0;display:none;}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0;}.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em;}.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover{top:1px;}.ui-datepicker .ui-datepicker-prev{left:2px;}.ui-datepicker .ui-datepicker-next{right:2px;}.ui-datepicker .ui-datepicker-prev-hover{left:1px;}.ui-datepicker .ui-datepicker-next-hover{right:1px;}.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px;}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center;}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0;}.ui-datepicker select.ui-datepicker-month-year{width:100%;}.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year{width:49%;}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em;}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0;}.ui-datepicker td{border:0;padding:1px;}.ui-datepicker td span, .ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none;}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0;}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible;}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left;}/* with multiple calendars */.ui-datepicker.ui-datepicker-multi{width:auto;}.ui-datepicker-multi .ui-datepicker-group{float:left;}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em;}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%;}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%;}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%;}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header{border-left-width:0;}.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0;}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left;}.ui-datepicker-row-break{clear:both;width:100%;font-size:0em;}/* RTL support */.ui-datepicker-rtl{direction:rtl;}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto;}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto;}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto;}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto;}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right;}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left;}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current{float:right;}.ui-datepicker-rtl .ui-datepicker-group{float:right;}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header{border-right-width:0;border-left-width:1px;}.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px;}/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */.ui-datepicker-cover{display:none;/*sorry for IE5*/display/**/:block;/*sorry for IE5*/position:absolute;/*must have*/z-index:-1;/*must have*/filter:mask();/*must have*/top:-4px;/*must have*/left:-4px;/*must have*/width:200px;/*must have*/height:200px;/*must have*/}/* css for timepicker */.ui-timepicker-div .ui-widget-header{margin-bottom:8px;}.ui-timepicker-div dl{text-align:left;}.ui-timepicker-div dl dt{height:25px;margin-bottom:-25px;}.ui-timepicker-div dl dd{margin:0 10px 10px 65px;}.ui-timepicker-div td{font-size:90%;}.ui-tpicker-grid-label{background:none;border:none;margin:0;padding:0;}.ui-timepicker-rtl{direction:rtl;}.ui-timepicker-rtl dl{text-align:right;}.ui-timepicker-rtl dl dd{margin:0 65px 10px 10px;}/* PrimeFaces Extensions */.ui-datepicker-trigger.ui-button-icon-only .ui-button-text{padding:0.3em;}
 .ui-accordion .ui-accordion-header{cursor:pointer;position:relative;margin-top:1px;min-height:0;padding:.5em .5em .5em 2.2em;}.ui-accordion .ui-accordion-header .ui-icon{position:absolute;left:.5em;top:50%;margin-top:-8px;}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;margin-top:-2px;position:relative;top:1px;margin-bottom:2px;overflow:auto;zoom:1;}.ui-accordion .ui-accordion-header.ui-state-disabled, .ui-accordion .ui-accordion-header.ui-state-disabled a{cursor:default;}/** RTL **/.ui-accordion.ui-accordion-rtl{direction:rtl;}.ui-accordion.ui-accordion-rtl .ui-accordion-header .ui-icon{right:0.5m;left:auto;}.ui-accordion.ui-accordion-rtl .ui-accordion-header a{padding:0.5em 2.2em 0.5em 0.5em;}.ui-tabs-outline{outline:dotted thin;z-index:1;}
-.ui-autocomplete{width:auto;zoom:1;cursor:pointer;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;position:relative;display:inline-block;}.ui-autocomplete .ui-autocomplete-dropdown{position:absolute;height:100%;width:2.4em;}.ui-autocomplete-query{font-weight:bold;}.ui-autocomplete-panel{position:absolute;overflow:auto;}.ui-autocomplete-panel .ui-autocomplete-item{cursor:pointer;}.ui-autocomplete-panel .ui-autocomplete-list{padding:0.4em;border:0 none;}.ui-autocomplete-panel .ui-autocomplete-list-item{border:0px none;font-weight:normal;margin:1px 0;padding:3px 5px;text-align:left;}.ui-autocomplete-panel .ui-autocomplete-table{border-collapse:collapse;width:100%;}.ui-autocomplete-panel .ui-autocomplete-table th,.ui-autocomplete-panel .ui-autocomplete-table td{border-width:1px;border-style:solid;border-color:inherit;padding:4px 10px 4px 10px;}.ui-autocomplete .ui-button-icon-only .ui-button-text{padding:0.29em;}/* Multiple Selection */.ui-autocomplete-multiple-container{clear:left;cursor:text;list-style-type:none;margin:0;min-height:1px;overflow:hidden;width:400px;}.ui-autocomplete-multiple-container.ui-inputfield{padding:0;}.ui-autocomplete-token{cursor:default;float:left;overflow:hidden;padding:1px 3px;white-space:nowrap;position:relative;margin:2px;}.ui-autocomplete-token-label{display:block;padding:0em 2.1em 0em 0.5em;}.ui-autocomplete-token-icon{margin-top:-9px;position:absolute;right:0.2em;top:50%;cursor:pointer;}.ui-autocomplete-input-token{float:left;list-style-type:none;margin:1px;padding:0;}.ui-autocomplete-input-token input{border:0 none;width:140px;outline:medium none;background-color:transparent;margin:2px;}.ui-autocomplete-itemtip-content{display:none;}.ui-autocomplete-itemtip{position:absolute;display:none;padding:0.4em;}.ui-autocomplete-emptyMessage{padding:3px 5px;}.ui-autocomplete-panel .ui-autocomplete-group{font-weight:bold;cursor:default;}
+.ui-autocomplete{width:auto;zoom:1;cursor:pointer;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;position:relative;display:inline-block;}.ui-autocomplete .ui-autocomplete-dropdown{position:absolute;height:100%;width:2.4em;}.ui-autocomplete-query{font-weight:bold;}.ui-autocomplete-panel{position:absolute;overflow:auto;}.ui-autocomplete-panel .ui-autocomplete-item{cursor:pointer;}.ui-autocomplete-panel .ui-autocomplete-list{padding:0.4em;border:0 none;}.ui-autocomplete-panel .ui-autocomplete-list-item{border:0px none;font-weight:normal;margin:1px 0;padding:3px 5px;text-align:left;}.ui-autocomplete-panel .ui-autocomplete-table{border-collapse:collapse;width:100%;}.ui-autocomplete-panel .ui-autocomplete-table th,.ui-autocomplete-panel .ui-autocomplete-table td{border-width:1px;border-style:solid;border-color:inherit;padding:4px 10px 4px 10px;}.ui-autocomplete .ui-button-icon-only .ui-button-text{padding:0.29em;}/* Multiple Selection */.ui-autocomplete-multiple-container{clear:left;cursor:text;list-style-type:none;margin:0;min-height:1px;overflow:hidden;width:400px;}.ui-autocomplete-multiple-container.ui-inputfield{padding:0;}.ui-autocomplete-token{cursor:default;float:left;overflow:hidden;padding:1px 3px;white-space:nowrap;position:relative;margin:2px;}.ui-autocomplete-token-label{display:block;padding:0em 2.1em 0em 0.5em;}.ui-autocomplete-token-icon{margin-top:-9px;position:absolute;right:0.2em;top:50%;cursor:pointer;}.ui-autocomplete-input-token{float:left;list-style-type:none;margin:1px;padding:0;}.ui-autocomplete-input-token input{border:0 none;width:140px;outline:medium none;background-color:transparent;margin:2px;}.ui-autocomplete-itemtip-content{display:none;}.ui-autocomplete-itemtip{position:absolute;display:none;padding:0.4em;}.ui-autocomplete-empty-message{padding:3px 5px;}.ui-autocomplete-panel .ui-autocomplete-group{font-weight:bold;cursor:default;}
 .ui-blockui{position:absolute;top:0;left:0;text-align:center;width:100%;height:100%;}.ui-blockui-content{position:absolute;text-align:center;padding:1em;}
 .ui-carousel{position:relative;padding:1px;}.ui-carousel .ui-carousel-viewport .ui-carousel-items{list-style:none outside none;margin:0;padding:0;position:relative;width:32000px;left:0;}.ui-carousel .ui-carousel-viewport .ui-carousel-items .ui-carousel-item{margin:1px;padding:0;float:left;}.ui-carousel .ui-carousel-viewport{overflow:hidden;position:relative;border:0;}.ui-carousel .ui-carousel-footer{margin:1px 1px 0px 1px;padding-top:9px;padding-bottom:6px;padding-right:10px;padding-left:10px;overflow:hidden;}.ui-carousel .ui-carousel-header{margin:0 1px;overflow:hidden;padding-top:7px;padding-bottom:8px;padding-right:10px;padding-left:10px;}.ui-carousel .ui-carousel-header .ui-carousel-header-title{display:inline-block;width:30%;padding-top:2px;overflow:hidden;}.ui-carousel .ui-carousel-dropdown,.ui-carousel .ui-carousel-mobiledropdown{float:right;margin:0px 10px;background-image:none;}.ui-carousel .ui-carousel-dropdown option,.ui-carousel .ui-carousel-mobiledropdown option{background-image:none;border:0 none;box-shadow:none;-moz-box-shadow:none;-webkit-box-shadow:none;}.ui-carousel .ui-carousel-button{float:right;margin:2px;}.ui-carousel .ui-carousel-page-link{float:left;margin:0 2px;}.ui-carousel .ui-carousel-page-link, .ui-carousel .ui-carousel-button{cursor:pointer;}.ui-carousel .ui-carousel-page-links{margin:0px 9px;margin-top:1px;display:inline-table;float:right;}.ui-carousel .ui-carousel-mobiledropdown{display:none;}
 .ui-columntoggler{padding:0;position:absolute;overflow:auto;display:none;}.ui-columntoggler .ui-columntoggler-items{border:0 none;padding:0.4em;margin:0;}.ui-columntoggler .ui-columntoggler-item{border:0px none;cursor:pointer;font-weight:normal;margin:1px 0;padding:3px 5px;text-align:left;white-space:nowrap;display:block;position:relative;}.ui-columntoggler .ui-columntoggler-item .ui-chkbox{position:absolute;top:50%;margin-top:-8px;}.ui-columntoggler .ui-columntoggler-item label{display:block;padding-left:2.2em;}
diff --git a/doc/sphinx-guides/source/_static/util/clear_timer.sh b/doc/sphinx-guides/source/_static/util/clear_timer.sh
index 73e87e8850c..641b2695084 100755
--- a/doc/sphinx-guides/source/_static/util/clear_timer.sh
+++ b/doc/sphinx-guides/source/_static/util/clear_timer.sh
@@ -1,33 +1,23 @@
 #!/bin/sh
 
-# EBJ timers sometimes cause problems; utility to clear generated directories and database rows
+# EBJ timers sometimes cause problems; utility to clear generated directories
 
-# assumes this script is being run as root, and that the postgres user had passwordless 
-# access to the database (local sockets, or appropriate environmental variables).
+# assumes this script is being run as root
 
-# will restart glassfish if it's stopped; comment out the `start-domain` command at the end
+# will restart Payara if it's stopped; comment out the `start-domain` command at the end
 # if you'd like to avoid that.
 
-# directory where glassfish is installed
-GLASSFISH_DIR=/usr/local/glassfish4
+# directory where Payara is installed
+PAYARA_DIR=/usr/local/payara6
 
-# directory within glassfish (defaults)
-DV_DIR=${GLASSFISH_DIR}/glassfish/domains/domain1
+# directory within Payara (defaults)
+DV_DIR=${PAYARA_DIR}/glassfish/domains/domain1
 
-# name of dataverse database
-DV_DB=dvndb
+# stop the domain (generates a warning if app server is stopped)
+${PAYARA_DIR}/bin/asadmin stop-domain
 
-# OS user for the database
-DB_USER=postgres
-
-# stop the glassfish domain (generates a warning if glassfish is stopped)
-${GLASSFISH_DIR}/bin/asadmin stop-domain
-
-rm -rf ${GLASSFISH_DIR}/${DV_DIR}/generated/
-rm -rf ${GLASSFISH_DIR}/${DV_DIR}/osgi-cache/felix
-
-sudo -u ${DB_USER} psql ${DV_DB} -c 'delete from "EJB__TIMER__TBL"';
-
-# restart the domain (also generates a warning if glassfish is stopped)
-${GLASSFISH_DIR}/bin/asadmin start-domain
+rm -rf ${PAYARA_DIR}/${DV_DIR}/generated/
+rm -rf ${PAYARA_DIR}/${DV_DIR}/osgi-cache/
 
+# restart the domain (also generates a warning if app server is stopped)
+${PAYARA_DIR}/bin/asadmin start-domain
diff --git a/doc/sphinx-guides/source/_static/util/counter_daily.sh b/doc/sphinx-guides/source/_static/util/counter_daily.sh
new file mode 100644
index 00000000000..07c32882a0b
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/util/counter_daily.sh
@@ -0,0 +1,56 @@
+#! /bin/bash
+#counter_daily.sh
+
+COUNTER_PROCESSOR_DIRECTORY="/usr/local/counter-processor-1.06"
+MDC_LOG_DIRECTORY="/usr/local/payara6/glassfish/domains/domain1/logs/mdc"
+COUNTER_PROCESSOR_TMP_DIRECTORY="/tmp"
+# If you wish to keep the logs, use a directory that is not periodically cleaned, e.g.
+#COUNTER_PROCESSOR_TMP_DIRECTORY="/usr/local/counter-processor-1.06/tmp"
+
+cd $COUNTER_PROCESSOR_DIRECTORY
+
+echo >>$COUNTER_PROCESSOR_TMP_DIRECTORY/counter_daily.log
+date >>$COUNTER_PROCESSOR_TMP_DIRECTORY/counter_daily.log
+echo >>$COUNTER_PROCESSOR_TMP_DIRECTORY/counter_daily.log
+
+# "You should run Counter Processor once a day to create reports in SUSHI (JSON) format that are saved to disk for Dataverse to process and that are sent to the DataCite hub."
+
+LAST=$(date -d "yesterday 13:00" '+%Y-%m-%d')
+# echo $LAST
+YEAR_MONTH=$(date -d "yesterday 13:00" '+%Y-%m')
+# echo $YEAR_MONTH
+d=$(date -I -d "$YEAR_MONTH-01")
+#echo $d
+while [ "$(date -d "$d" +%Y%m%d)" -le "$(date -d "$LAST" +%Y%m%d)" ];
+do
+  if [ -f "$MDC_LOG_DIRECTORY/counter_$d.log" ]; then
+      echo "Found counter_$d.log"
+  else
+      touch "$MDC_LOG_DIRECTORY/counter_$d.log"
+  fi
+  d=$(date -I -d "$d + 1 day")
+done
+
+#run counter-processor as counter user
+
+sudo -u counter YEAR_MONTH=$YEAR_MONTH python3 main.py >>$COUNTER_PROCESSOR_TMP_DIRECTORY/counter_daily.log
+
+# Process all make-data-count-report.json.* files
+for report_file in $COUNTER_PROCESSOR_TMP_DIRECTORY/make-data-count-report.json.*; do
+    if [ -f "$report_file" ]; then
+        echo "Processing $report_file" >>$COUNTER_PROCESSOR_TMP_DIRECTORY/counter_daily.log
+        curl -X POST "http://localhost:8080/api/admin/makeDataCount/addUsageMetricsFromSushiReport?reportOnDisk=$report_file"
+        echo "Finished processing $report_file" >>$COUNTER_PROCESSOR_TMP_DIRECTORY/counter_daily.log
+        
+        # Extract the base filename and the extension
+        file_base=$(basename "$report_file" | sed 's/\.json\..*//')
+        file_ext=$(echo "$report_file" | sed -n 's/.*\.json\.\(.*\)/\1/p')
+        echo $file_base
+        echo $file_ext
+        # Remove the old file if it exists
+        rm -f $COUNTER_PROCESSOR_TMP_DIRECTORY/${file_base}.${YEAR_MONTH}.json.${file_ext}
+
+        # Move the processed file
+        mv $report_file $COUNTER_PROCESSOR_TMP_DIRECTORY/${file_base}.${YEAR_MONTH}.json.${file_ext}
+    fi
+done
diff --git a/doc/sphinx-guides/source/_static/util/counter_weekly.sh b/doc/sphinx-guides/source/_static/util/counter_weekly.sh
new file mode 100644
index 00000000000..7cc9e31d86e
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/util/counter_weekly.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+#counter_weekly.sh
+
+# This script iterates through all published Datasets in all Dataverses and calls the Make Data Count API to update their citations from DataCite
+# Note: Requires curl and jq for parsing JSON responses form curl
+
+# A recursive method to process each Dataverse
+processDV () {
+echo "Running counter_weekly.sh on $(date)"
+echo "Processing Dataverse ID#: $1"
+
+#Call the Dataverse API to get the contents of the Dataverse (without credentials, this will only list published datasets and dataverses
+DVCONTENTS=$(curl -s http://localhost:8080/api/dataverses/$1/contents)
+
+# Iterate over all datasets, pulling the value of their DOIs (as part of the persistentUrl) from the json returned
+for subds in $(echo "${DVCONTENTS}" | jq -r '.data[] | select(.type == "dataset") | .persistentUrl'); do
+
+#The authority/identifier are preceded by a protocol/host, i.e. https://doi.org/
+DOI=`expr "$subds" : '.*:\/\/\doi\.org\/\(.*\)'`
+
+# Call the Dataverse API for this dataset and get the response
+RESULT=$(curl -s -X POST "http://localhost:8080/api/admin/makeDataCount/:persistentId/updateCitationsForDataset?persistentId=doi:$DOI" )
+# Parse the status and number of citations found from the response
+STATUS=$(echo "$RESULT" | jq -j '.status' )
+CITATIONS=$(echo "$RESULT" | jq -j '.data.citationCount')
+
+# The status for a call that worked
+OK='OK'
+
+# Check the status and report
+if [ "$STATUS" = "$OK" ]; then
+        echo "Updated: $CITATIONS citations for doi:$DOI"
+else
+        echo "Failed to update citations for doi:$DOI"
+        echo "Run curl -s -X POST 'http://localhost:8080/api/admin/makeDataCount/:persistentId/updateCitationsForDataset?persistentId=doi:$DOI ' to retry/see the error message"
+fi
+#processDV $subds
+done
+
+# Now iterate over any child Dataverses and recursively process them
+for subdv in $(echo "${DVCONTENTS}" | jq -r '.data[] | select(.type == "dataverse") | .id'); do
+echo $subdv
+processDV $subdv
+done
+
+}
+
+# Call the function on the root dataverse to start processing
+processDV 1
diff --git a/doc/sphinx-guides/source/_static/util/createsequence.sql b/doc/sphinx-guides/source/_static/util/createsequence.sql
index 2677832abd8..7ac1968de2c 100644
--- a/doc/sphinx-guides/source/_static/util/createsequence.sql
+++ b/doc/sphinx-guides/source/_static/util/createsequence.sql
@@ -1,14 +1,14 @@
--- A script for creating a numeric identifier sequence, and an external 
--- stored procedure, for accessing the sequence from inside the application, 
--- in a non-hacky, JPA way. 
+-- A script for creating a numeric identifier sequence, and an external
+-- stored procedure, for accessing the sequence from inside the application,
+-- in a non-hacky, JPA way.
 
 -- NOTE:
 
 -- 1. The database user name "dvnapp" is hard-coded here - it may
 -- need to be changed to match your database user name;
-  
+
 -- 2. In the code below, the sequence starts with 1, but it can be adjusted by
--- changing the MINVALUE as needed. 
+-- changing the MINVALUE as needed.
 
 CREATE SEQUENCE datasetidentifier_seq
   INCREMENT 1
@@ -22,12 +22,12 @@ ALTER TABLE datasetidentifier_seq OWNER TO "dvnapp";
 -- And now create a PostgreSQL FUNCTION, for JPA to
 -- access as a NamedStoredProcedure:
 
-CREATE OR REPLACE FUNCTION generateIdentifierAsSequentialNumber(
-    OUT identifier int)
-  RETURNS int AS
-$BODY$
+CREATE OR REPLACE FUNCTION generateIdentifierFromStoredProcedure()
+RETURNS varchar AS $$
+DECLARE
+  identifier varchar;
 BEGIN
-    select nextval('datasetidentifier_seq') into identifier;
+  identifier := nextval('datasetidentifier_seq')::varchar;
+  RETURN identifier;
 END;
-$BODY$
-  LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql IMMUTABLE;
diff --git a/doc/sphinx-guides/source/_static/util/default.config b/doc/sphinx-guides/source/_static/util/default.config
deleted file mode 100644
index 3fb3d98472c..00000000000
--- a/doc/sphinx-guides/source/_static/util/default.config
+++ /dev/null
@@ -1,16 +0,0 @@
-HOST_DNS_ADDRESS	localhost
-GLASSFISH_DIRECTORY	/usr/local/glassfish4
-ADMIN_EMAIL	 
-MAIL_SERVER	mail.hmdc.harvard.edu
-POSTGRES_ADMIN_PASSWORD	secret
-POSTGRES_SERVER	127.0.0.1
-POSTGRES_PORT	5432
-POSTGRES_DATABASE	dvndb
-POSTGRES_USER	dvnapp
-POSTGRES_PASSWORD	secret
-SOLR_LOCATION	localhost:8983
-TWORAVENS_LOCATION	NOT INSTALLED
-RSERVE_HOST	localhost
-RSERVE_PORT	6311
-RSERVE_USER	rserve
-RSERVE_PASSWORD	rserve
diff --git a/doc/sphinx-guides/source/_static/util/identifier_from_timestamp.sql b/doc/sphinx-guides/source/_static/util/identifier_from_timestamp.sql
new file mode 100644
index 00000000000..a755b5ecd4a
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/util/identifier_from_timestamp.sql
@@ -0,0 +1,46 @@
+-- A script for creating, through a database stored procedure, sequential
+-- 8 character identifiers from a base36 representation of current timestamp.
+
+CREATE OR REPLACE FUNCTION base36_encode(
+  IN digits bigint, IN min_width int = 0)
+RETURNS varchar AS $$
+DECLARE
+    chars char[];
+    ret varchar;
+    val bigint;
+BEGIN
+    chars := ARRAY[
+      '0','1','2','3','4','5','6','7','8','9',
+      'a','b','c','d','e','f','g','h','i','j',
+      'k','l','m','n','o','p','q','r','s','t',
+      'u','v','w','x','y','z'];
+    val := digits;
+    ret := '';
+    IF val < 0 THEN
+        val := val * -1;
+    END IF;
+    WHILE val != 0 LOOP
+        ret := chars[(val % 36)+1] || ret;
+        val := val / 36;
+    END LOOP;
+
+    IF min_width > 0 AND char_length(ret) < min_width THEN
+        ret := lpad(ret, min_width, '0');
+    END IF;
+
+    RETURN ret;
+END;
+$$ LANGUAGE plpgsql IMMUTABLE;
+
+
+CREATE OR REPLACE FUNCTION generateIdentifierFromStoredProcedure()
+RETURNS varchar AS $$
+DECLARE
+    curr_time_msec bigint;
+    identifier varchar;
+BEGIN
+    curr_time_msec := extract(epoch from now())*1000;
+    identifier := base36_encode(curr_time_msec);
+    RETURN identifier;
+END;
+$$ LANGUAGE plpgsql IMMUTABLE;
diff --git a/doc/sphinx-guides/source/_templates/navbar.html b/doc/sphinx-guides/source/_templates/navbar.html
deleted file mode 100644
index 08e363408f4..00000000000
--- a/doc/sphinx-guides/source/_templates/navbar.html
+++ /dev/null
@@ -1,70 +0,0 @@
-{#      For dataverse.org SPHINX projects                                                               #}
-{#      Instructions:                                                                                   #}
-{#          (1) For a Sphinx project, copy the **contents** of this file into **navbar.html**           #}
-{#          (2) Location of **navbar.html** within a SPHINX project:                                    #}
-{#              - /source/_templates/**navbar.html**                                                    #}
-
-
-<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
-    <div class="container">
-        <!-- Brand and toggle get grouped for better mobile display -->
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#dv-bs-navbar-details">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="http://dataverse.org" id="dataverse-org-homepage-url">Dataverse Project</a>
-        </div>
-        <!-- Collect the nav links, forms, and other content for toggling -->
-
-       <div class="collapse navbar-collapse" id="dv-bs-navbar-details">
-           <ul class="nav navbar-nav">
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About <span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li><a target="_blank" href="http://dataverse.org/about">About the Project</a></li>
-                        <li><a target="_blank" href="http://dataverse.org/add-data">Add Data</a></li>
-                        <li><a target="_blank" href="http://dataverse.org/blog">Blog</a></li>
-                        <li><a target="_blank" href="http://dataverse.org/presentations">Presentations</a></li>
-                        <li><a target="_blank" href="http://dataverse.org/publications">Publications</a></li>
-                    </ul>
-                </li>
-                <li>
-                    <a target="_blank" href="http://dataverse.org/">
-                        Community
-                    </a>
-                </li>
-                <li>
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Best Practices <span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li><a target="_blank" href="http://dataverse.org/data-citation">Academic Credit</a></li>
-                        <li><a target="_blank" href="http://dataverse.org/harvard-dataverse-policies">Harvard Dataverse Policies</a></li>
-                        <li><a target="_blank" href="http://dataverse.org/data-management">Data Management</a></li>
-                        <li><a target="_blank" href="http://dataverse.org/replication-dataset">Replication Dataset Guidelines</a></li>
-                    </ul>
-                </li>
-                <li>
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Software <span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li><a target="_blank" href="http://dataverse.org/software-features">Features</a></li>
-                        <li><a target="_blank" href="http://github.com/IQSS/dataverse">Source Code</a></li>
-                        <li><a target="_blank" href="http://guides.dataverse.org/en/latest/user/index.html">User Guide</a></li>
-                        <li><a target="_blank" href="http://guides.dataverse.org/en/latest/installation/index.html">Installation Guide</a></li>
-                        <li><a target="_blank" href="http://guides.dataverse.org/en/latest/api/index.html">API Guide</a></li>
-                        <li><a target="_blank" href="http://guides.dataverse.org/en/latest/developers/index.html">Developer Guide</a></li>
-                        <li><a target="_blank" href="http://guides.dataverse.org/en/latest/style/index.html">Style Guide</a></li>
-                        <li><a target="_blank" href="http://guides.dataverse.org/en/latest/admin/index.html">Admin Guide</a></li>
-                    </ul>
-                </li>
-                <li>
-                    <a target="_blank" href="http://dataverse.org/">
-                        Contact
-                    </a>
-                </li>
-            </ul>
-       </div><!-- /.navbar-collapse -->
-    </div>
-    <!-- /.container -->
-</nav>
diff --git a/doc/sphinx-guides/source/admin/backups.rst b/doc/sphinx-guides/source/admin/backups.rst
index e11aa84ebfc..0e4bda8026b 100644
--- a/doc/sphinx-guides/source/admin/backups.rst
+++ b/doc/sphinx-guides/source/admin/backups.rst
@@ -4,8 +4,8 @@ Backups
 .. contents:: Contents:
 	:local:
 
-Running tape, or similar backups to ensure the long term preservation of all the data stored in the Dataverse is an implied responsibility that should be taken most seriously. 
+Running tape, or similar backups to ensure the long term preservation of all the data stored in the Dataverse Repository is an implied responsibility that should be taken most seriously. 
 
-*In addition* to running these disk-level backups, we have provided an experimental script that can be run on schedule (via a cron job or something similar) to create extra archival copies of all the Datafiles stored in the Dataverse on a remote storage server, accessible via an ssh connection. The script and some documentation can be found in ``scripts/backup/run_backup`` in the Dataverse source tree at https://github.com/IQSS/dataverse . Some degree of knowledge of system administration and Python is required. 
+*In addition* to running these disk-level backups, we have provided an experimental script that can be run on schedule (via a cron job or something similar) to create extra archival copies of all the Datafiles stored in the Dataverse Repository on a remote storage server, accessible via an ssh connection. The script and some documentation can be found in ``scripts/backup/run_backup`` in the Dataverse Software source tree at https://github.com/IQSS/dataverse . Some degree of knowledge of system administration and Python is required. 
 
 Once again, the script is experimental and NOT a replacement of regular and reliable disk backups!
diff --git a/doc/sphinx-guides/source/admin/collectionquotas.rst b/doc/sphinx-guides/source/admin/collectionquotas.rst
new file mode 100644
index 00000000000..2ce3132e2ba
--- /dev/null
+++ b/doc/sphinx-guides/source/admin/collectionquotas.rst
@@ -0,0 +1,19 @@
+
+Storage Quotas for Collections
+==============================
+
+Please note that this is a new and still experimental feature (as of Dataverse v6.1 release).
+
+Instance admins can now define storage quota limits for specific collections. These limits can be set, changed and/or deleted via the provided APIs (please see the :ref:`collection-storage-quotas` section of the :doc:`/api/native-api` guide). The Read version of the API is available to the individual collection admins (i.e., a collection owner can check on the quota configured for their collection), but only superusers can set, change or disable storage quotas.
+
+Storage quotas are *inherited* by subcollections. In other words, when storage use limit is set for a specific collection, it applies to all the datasets immediately under it and in its sub-collections, unless different quotas are defined there and so on. Each file added to any dataset in that hierarchy counts for the purposes of the quota limit defined for the top collection. A storage quota defined on a child sub-collection overrides whatever quota that may be defined on the parent, or inherited from an ancestor.
+
+For example, a collection ``A`` has the storage quota set to 10GB. It has 3 sub-collections, ``B``, ``C`` and ``D``. Users can keep uploading files into the datasets anywhere in this hierarchy until the combined size of 10GB is reached between them. However, if an admin has reasons to limit one of the sub-collections, ``B`` to 3GB only, that quota can be explicitly set there. This both limits the growth of ``B`` to 3GB, and also *guarantees* that allocation to it. I.e. the contributors to collection ``B`` will be able to keep adding data until the 3GB limit is reached, even after the parent collection ``A`` reaches the combined 10GB limit (at which point ``A`` and all its subcollections except for ``B`` will become read-only).
+
+We do not yet know whether this is going to be a popular, or needed use case - a child collection quota that is different from the quota it inherits from a parent. It is likely that for many instances it will be sufficient to be able to define quotas for collections and have them apply to all the child objects underneath. We will examine the response to this feature and consider making adjustments to this scheme based on it. We are already considering introducing other types of quotas, such as limits by users or specific storage volumes.  
+
+Please note that only the sizes of the main datafiles and the archival tab-delimited format versions, as produced by the ingest process are counted for the purposes of enforcing the limits. Automatically generated "auxiliary" files, such as rescaled image thumbnails and metadata exports for datasets are not.
+
+When quotas are set and enforced, the users will be informed of the remaining storage allocation on the file upload page together with other upload and processing limits.
+
+Part of the new and experimental nature of this feature is that we don't know for the fact yet how well it will function in real life on a very busy production system, despite our best efforts to test it prior to the release. One specific issue is having to update the recorded storage use for every parent collection of the given dataset whenever new files are added. This includes updating the combined size of the root, top collection - which will need to be updated after *every* file upload. In an unlikely case that this will start causing problems with race conditions and database update conflicts, it is possible to disable these updates (and thus disable the storage quotas feature), by setting the :ref:`dataverse.storageuse.disable-storageuse-increments` JVM setting to true.
diff --git a/doc/sphinx-guides/source/admin/dashboard.rst b/doc/sphinx-guides/source/admin/dashboard.rst
index 5ee53790471..3f77729d0ab 100644
--- a/doc/sphinx-guides/source/admin/dashboard.rst
+++ b/doc/sphinx-guides/source/admin/dashboard.rst
@@ -1,7 +1,7 @@
 Dashboard
 =========
 
-Dataverse offers a dashboard of administrative tools for superusers only. If you are a logged-in superuser, you can access it by clicking your username in the navbar, and then clicking "Dashboard" from the dropdown. You can verify that you are a superuser by checking the color of your username in the navbar. If it's red, you have the right permissions to use the Dashboard. Superusers can give other users the superuser status via :doc:`user-administration`.
+The Dataverse Software offers a dashboard of administrative tools for superusers only. If you are a logged-in superuser, you can access it by clicking your username in the navbar, and then clicking "Dashboard" from the dropdown. You can verify that you are a superuser by checking the color of your username in the navbar. If it's red, you have the right permissions to use the Dashboard. Superusers can give other users the superuser status via :doc:`user-administration`.
 
 .. contents:: Contents:
 	:local:
@@ -22,7 +22,7 @@ This dashboard tool allows you to define sets of local datasets to make availabl
 Metadata Export
 ---------------
 
-This part of the Dashboard is simply a reminder message that metadata export happens through the Harvard Dataverse API. See the :doc:`metadataexport` section and the :doc:`/api/native-api` section of the API Guide for more details.
+This part of the Dashboard is simply a reminder message that metadata export happens through the Dataverse Software API. See the :doc:`/admin/metadataexport` section and the :doc:`/api/native-api` section of the API Guide for more details.
 
 Users
 -----
@@ -32,4 +32,4 @@ This dashboard tool allows you to search a list of all users of your Dataverse i
 Move Data
 ---------
 
-This tool allows you to move datasets. To move dataverses, see the :doc:`dataverses-datasets` section.
+This tool allows you to move datasets. To move Dataverse collections, see the :doc:`dataverses-datasets` section.
diff --git a/doc/sphinx-guides/source/admin/dataverses-datasets.rst b/doc/sphinx-guides/source/admin/dataverses-datasets.rst
index 7b5c5fbd4a0..a37819c90e1 100644
--- a/doc/sphinx-guides/source/admin/dataverses-datasets.rst
+++ b/doc/sphinx-guides/source/admin/dataverses-datasets.rst
@@ -1,44 +1,107 @@
-Managing Datasets and Dataverses
-================================
+Managing Datasets and Dataverse Collections
+===========================================
 
 .. contents:: |toctitle|
 	:local:
 
-Dataverses
-----------
+Dataverse Collections
+---------------------
 
-Delete a Dataverse
-^^^^^^^^^^^^^^^^^^
+Delete a Dataverse Collection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Dataverses have to be empty to delete them. Navigate to the dataverse and click "Edit" and then "Delete Dataverse" to delete it. To delete a dataverse via API, see the :doc:`/api/native-api` section of the API Guide.
+Dataverse collections have to be empty to delete them. Navigate to the Dataverse collection and click "Edit" and then "Delete Dataverse" to delete it. To delete a Dataverse collection via API, see the :doc:`/api/native-api` section of the API Guide.
 
-Move a Dataverse
-^^^^^^^^^^^^^^^^
+Move a Dataverse Collection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Moves a dataverse whose id is passed to a new dataverse whose id is passed. The dataverse alias also may be used instead of the id. If the moved dataverse has a guestbook, template, metadata block, link, or featured dataverse that is not compatible with the destination dataverse, you will be informed and given the option to force the move and remove the association. Only accessible to superusers. ::
+Moves a Dataverse collection whose id is passed to an existing Dataverse collection whose id is passed. The Dataverse collection alias also may be used instead of the id. If the moved Dataverse collection has a guestbook, template, metadata block, link, or featured Dataverse collection that is not compatible with the destination Dataverse collection, you will be informed and given the option to force the move and remove the association. Only accessible to superusers. ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/dataverses/$id/move/$destination-id
 
-Link a Dataverse
-^^^^^^^^^^^^^^^^
+Link a Dataverse Collection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Creates a link between a dataverse and another dataverse (see the Linked Dataverses + Linked Datasets section of the :doc:`/user/dataverse-management` guide for more information). Only accessible to superusers. ::
+Creates a link between a Dataverse collection and another Dataverse collection (see the :ref:`dataverse-linking` section of the User Guide for more information). Only accessible to superusers. ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X PUT http://$SERVER/api/dataverses/$linked-dataverse-alias/link/$linking-dataverse-alias
 
-Unlink a Dataverse
-^^^^^^^^^^^^^^^^^^
+Unlink a Dataverse Collection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Removes a link between a dataverse and another dataverse. Only accessible to superusers. ::
+Removes a link between a Dataverse collection and another Dataverse collection. Only accessible to superusers. ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://$SERVER/api/dataverses/$linked-dataverse-alias/deleteLink/$linking-dataverse-alias
 
-Add Dataverse RoleAssignments to Child Dataverses
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+List Dataverse Collection Links
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Provides information about whether a certain Dataverse collection ($dataverse-alias) is linked to or links to another collection. Only accessible to superusers. ::
+
+    curl -H "X-Dataverse-key:$API_TOKEN" http://$SERVER/api/dataverses/$dataverse-alias/links
+
+Add Dataverse Collection RoleAssignments to Dataverse Subcollections
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Recursively assigns the users and groups having a role(s),that are in the set configured to be inheritable via the :InheritParentRoleAssignments setting, on a specified Dataverse collections to have the same role assignments on all of the Dataverse collections that have been created within it. The response indicates success or failure and lists the individuals/groups and Dataverse collections involved in the update. Only accessible to superusers. ::
+ 
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/$dataverse-alias/addRoleAssignmentsToChildren
+    
+Configure a Dataverse Collection to Store All New Files in a Specific File Store
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To direct new files (uploaded when datasets are created or edited) for all datasets in a given Dataverse collection, the store can be specified via the API as shown below, or by editing the 'General Information' for a Dataverse collection on the Dataverse collection page. Only accessible to superusers. ::
+ 
+    curl -H "X-Dataverse-key: $API_TOKEN" -X PUT -d $storageDriverLabel http://$SERVER/api/admin/dataverse/$dataverse-alias/storageDriver
+
+(Note that for ``dataverse.files.store1.label=MyLabel``, you should pass ``MyLabel``.)
+    
+The current driver can be seen using::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/$dataverse-alias/storageDriver
+
+(Note that for ``dataverse.files.store1.label=MyLabel``, ``store1`` will be returned.)
+
+and can be reset to the default store with::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://$SERVER/api/admin/dataverse/$dataverse-alias/storageDriver
+    
+The available drivers can be listed with::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/storageDrivers
+    
+(Individual datasets can be configured to use specific file stores as well. See the "Datasets" section below.)
+
+Configure a Dataverse Collection to Allow Use of a Given Curation Label Set
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Datasets within a given Dataverse collection can be annotated with a Curation Label to indicate the status of the dataset with respect to a defined curation process. Labels are completely customizable (alphanumeric or spaces, up to 32 characters, e.g. "Author contacted", "Privacy Review", "Awaiting paper publication").
 
-Recursively assigns the users and groups having a role(s),that are in the set configured to be inheritable via the :InheritParentRoleAssignments setting, on a specified dataverse to have the same role assignments on all of the dataverses that have been created within it. The response indicates success or failure and lists the individuals/groups and dataverses involved in the update. Only accessible to superusers. ::
+The label is applied to a draft Dataset version via the user interface or API and the available label sets are defined by :ref:`:AllowedCurationLabels <:AllowedCurationLabels>`. Internally, the labels have no effect, and at publication, any existing label will be removed. A reporting API call allows admins to get a list of datasets and their curation statuses.
+
+The label set used for a collection can be specified via the API as shown below, or by editing the 'General Information' for a Dataverse collection on the Dataverse collection page. Only accessible to superusers.
+
+The curationLabelSet to use within a given collection can be set by specifying its name using::
  
-    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/$dataverse-alias//addRoleAssignmentsToChildren
+    curl -H "X-Dataverse-key: $API_TOKEN" -X PUT http://$SERVER/api/admin/dataverse/$dataverse-alias/curationLabelSet?name=$curationLabelSetName
+    
+The reserved word "DISABLED" can be used to disable this feature within a given Dataverse collection. 
+    
+The name of the current curationLabelSet can be seen using::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/$dataverse-alias/curationLabelSet
+
+and can be reset to the default (inherited from the parent collection or DISABLED for the root collection) with::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://$SERVER/api/admin/dataverse/$dataverse-alias/curationLabelSet
+    
+The available curation label sets can be listed with::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/curationLabelSets
+    
+If the :AllowedCurationLabels setting has a value, one of the available choices will always be "DISABLED" which allows curation labels to be turned off for a given collection/dataset.
+    
+Individual datasets can be configured to use specific curationLabelSets as well. See the "Datasets" section below.
 
 Datasets
 --------
@@ -48,21 +111,51 @@ Move a Dataset
 
 Superusers can move datasets using the dashboard. See also :doc:`dashboard`.
 
-Moves a dataset whose id is passed to a dataverse whose alias is passed. If the moved dataset has a guestbook or a dataverse link that is not compatible with the destination dataverse, you will be informed and given the option to force the move (with ``forceMove=true`` as a query parameter) and remove the guestbook or link (or both). Only accessible to users with permission to publish the dataset in the original and destination dataverse. ::
+Moves a dataset whose id is passed to a Dataverse collection whose alias is passed. If the moved dataset has a guestbook or a Dataverse collection link that is not compatible with the destination Dataverse collection, you will be informed and given the option to force the move (with ``forceMove=true`` as a query parameter) and remove the guestbook or link (or both). Only accessible to users with permission to publish the dataset in the original and destination Dataverse collection. Note: any roles granted to users on the dataset will continue to be in effect after the dataset has been moved. ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/$id/move/$alias
 
 Link a Dataset
 ^^^^^^^^^^^^^^
 
-Creates a link between a dataset and a dataverse (see the Linked Dataverses + Linked Datasets section of the :doc:`/user/dataverse-management` guide for more information). ::
+Creates a link between a dataset and a Dataverse collection (see the :ref:`dataset-linking` section of the User Guide for more information). Accessible to users with Link Dataset permission on the Dataverse collection. ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X PUT http://$SERVER/api/datasets/$linked-dataset-id/link/$linking-dataverse-alias
 
+.. _list-collections-linked-from-dataset:
+
+List Collections that are Linked from a Dataset
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Lists the link(s) created between a dataset and a Dataverse collection (see the :ref:`dataset-linking` section of the User Guide for more information). ::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/datasets/$linked-dataset-id/links
+
+It returns a list in the following format (new format as of v6.4):
+
+.. code-block:: json
+
+  {
+    "status": "OK",
+    "data": {
+      "id": 5,
+      "identifier": "FK2/OTCWMM",
+      "linked-dataverses": [
+        {
+          "id": 2,
+          "alias": "dataverse1",
+          "displayName": "Lab experiments 2023 June"
+        }
+      ]
+    }
+  }
+
+.. _unlink-a-dataset:
+
 Unlink a Dataset
 ^^^^^^^^^^^^^^^^
 
-Removes a link between a dataset and a dataverse. Only accessible to superusers. ::
+Removes a link between a dataset and a Dataverse collection. Accessible to users with Link Dataset permission on the Dataverse collection. ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://$SERVER/api/datasets/$linked-dataset-id/deleteLink/$linking-dataverse-alias
 
@@ -72,15 +165,35 @@ Mint a PID for a File That Does Not Have One
 In the following example, the database id of the file is 42::
 
     export FILE_ID=42
-    curl http://localhost:8080/api/admin/$FILE_ID/registerDataFile
+    curl "http://localhost:8080/api/admin/$FILE_ID/registerDataFile"
+    
+This method will return a FORBIDDEN response if minting of file PIDs is not enabled for the collection the file is in. (Note that it is possible to have file PIDs enabled for a specific collection, even when it is disabled for the Dataverse installation as a whole. See :ref:`collection-attributes-api` in the Native API Guide.)
+
+Mint PIDs for all unregistered published files in the specified collection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following API will register the PIDs for all the yet unregistered published files in the datasets **directly within the collection** specified by its alias::
 
-Mint PIDs for Files That Do Not Have Them
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    curl "http://localhost:8080/api/admin/registerDataFiles/{collection_alias}"
 
-If you have a large number of files, you might want to consider miniting PIDs for files individually using the ``registerDataFile`` endpoint above in a for loop, sleeping between each registration::
+It will not attempt to register the datafiles in its sub-collections, so this call will need to be repeated on any sub-collections where files need to be registered as well.
+File-level PID registration must be enabled on the collection. (Note that it is possible to have it enabled for a specific collection, even when it is disabled for the Dataverse installation as a whole. See :ref:`collection-attributes-api` in the Native API Guide.)
+
+This API will sleep for 1 second between registration calls by default. A longer sleep interval can be specified with an optional ``sleep=`` parameter::
+
+      curl "http://localhost:8080/api/admin/registerDataFiles/{collection_alias}?sleep=5"
+
+Mint PIDs for ALL unregistered files in the database
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following API will attempt to register the PIDs for all the published files in your instance, in collections that allow file PIDs, that do not yet have them::
 
     curl http://localhost:8080/api/admin/registerDataFileAll
 
+The application will attempt to sleep for 1 second between registration attempts as not to overload your persistent identifier service provider. Note that if you have a large number of files that need to be registered in your Dataverse, you may want to consider minting file PIDs within indivdual collections, or even for individual files using the ``registerDataFiles`` and/or ``registerDataFile`` endpoints above in a loop, with a longer sleep interval between calls.
+
+
+
 Mint a New DOI for a Dataset with a Handle
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -88,12 +201,48 @@ Mints a new identifier for a dataset previously registered with a handle. Only a
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/admin/$dataset-id/reregisterHDLToPID
     
-Send Dataset metadata to PID provider
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. _send-metadata-to-pid-provider:
+
+Update Target URL for a Published Dataset at the PID provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Forces update to the target URL provided to the PID provider of a published dataset and assures the PID is findable.
+Only accessible to superusers. ::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/$dataset-id/modifyRegistration
+    
+Update Target URL for all Published Datasets at the PID provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Forces update to metadata provided to the PID provider of a published dataset. Only accessible to superusers. ::
+Forces update to the target URL provided to the PID provider of all published datasets and assures the PID is findable.
+Only accessible to superusers. ::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/modifyRegistrationAll
+    
+Update Metadata for a Published Dataset at the PID provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Checks to see that the PID metadata for a published dataset (and any released files in it using file PIDs)
+is up-to-date at the provider and updates the metadata if necessary.
+Only accessible to superusers. ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/$dataset-id/modifyRegistrationMetadata
+    
+Update Metadata for all Published Datasets at the PID provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Checks to see that the PID metadata is up-to-date at the provider for all published datasets
+(and any released files in them using file PIDs) and updates the metadata if necessary.
+Only accessible to superusers. ::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/modifyRegistrationPIDMetadataAll
+    
+The call returns 200/OK as long as the call completes. Any errors for individual datasets are reported in the log.
+
+Check for Unreserved PIDs and Reserve Them
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+See :ref:`pids-api` in the API Guide for details.
 
 Make Metadata Updates Without Changing Dataset Version
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -103,5 +252,54 @@ As a superuser, click "Update Current Version" when publishing. (This option is
 Diagnose Constraint Violations Issues in Datasets
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To identify invalid data values in specific datasets (if, for example, an attempt to edit a dataset results in a ConstraintViolationException in the server log), or to check all the datasets in the Dataverse for constraint violations, see :ref:`Dataset Validation <dataset-validation-api>` in the :doc:`/api/native-api` section of the User Guide.
+To identify invalid data values in specific datasets (if, for example, an attempt to edit a dataset results in a ConstraintViolationException in the server log), or to check all the datasets in the Dataverse installation for constraint violations, see :ref:`Dataset Validation <dataset-validation-api>` in the :doc:`/api/native-api` section of the User Guide.
+
+Configure a Dataset to Store All New Files in a Specific File Store
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Configure a dataset to use a specific file store (this API can only be used by a superuser) ::
+ 
+    curl -H "X-Dataverse-key: $API_TOKEN" -X PUT -d $storageDriverLabel http://$SERVER/api/datasets/$dataset-id/storageDriver
+    
+The current driver can be seen using::
+
+    curl http://$SERVER/api/datasets/$dataset-id/storageDriver
+
+It can be reset to the default store as follows (only a superuser can do this) ::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://$SERVER/api/datasets/$dataset-id/storageDriver
+    
+The available drivers can be listed with::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/storageDrivers
+    
+Configure a Dataset to Allow Use of a Curation Label Set
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A dataset can be annotated with a Curation Label to indicate the status of the dataset with respect to a defined curation process. Labels are completely customizable (alphanumeric or spaces, up to 32 characters, e.g. "Author contacted", "Privacy Review", "Awaiting paper publication").
+
+The label is applied to a draft Dataset version via the user interface or API and the available label sets are defined by :ref:`:AllowedCurationLabels <:AllowedCurationLabels>`. Internally, the labels have no effect, and at publication, any existing label will be removed. A reporting API call allows admins to get a list of datasets and their curation statuses.
+
+The label set used for a dataset can be specified via the API as shown below. Only accessible to superusers.
+ 
+The curationLabelSet to use within a given dataset can be set by specifying its name using::
+ 
+    curl -H "X-Dataverse-key: $API_TOKEN" -X PUT http://$SERVER/api/datasets/$dataset-id/curationLabelSet?name=$curationLabelSetName
+    
+The reserved word "DISABLED" can be used to disable this feature within a given Dataverse collection. 
+    
+The name of the current curationLabelSet can be seen using::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/datasets/$dataset-id/curationLabelSet
+
+and can be reset to the default (inherited from the parent collection) with (only a superuser can do this) ::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://$SERVER/api/datasets/$dataset-id/curationLabelSet
+    
+The available curationLabelSets can be listed with::
+
+    curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/curationLabelSets
+    
+If the :AllowedCurationLabels setting has a value, one of the available choices will always be "DISABLED" which allows curation labels to be turned off for a given collection/dataset.
 
+Collections can be configured to use specific curationLabelSets as well. See the "Dataverse Collections" section above.
diff --git a/doc/sphinx-guides/source/admin/discoverability.rst b/doc/sphinx-guides/source/admin/discoverability.rst
new file mode 100644
index 00000000000..22ff66246f0
--- /dev/null
+++ b/doc/sphinx-guides/source/admin/discoverability.rst
@@ -0,0 +1,83 @@
+Discoverability
+===============
+
+Datasets are made discoverable by a variety of methods.
+
+.. contents:: |toctitle|
+  :local:
+
+DataCite Integration
+--------------------
+
+If you are using `DataCite <https://datacite.org>`_ as your DOI provider, when datasets are published, metadata is pushed to DataCite, where it can be searched. For more information, see :ref:`:DoiProvider` in the Installation Guide.
+
+OAI-PMH (Harvesting)
+--------------------
+
+The Dataverse software supports a protocol called OAI-PMH that facilitates harvesting dataset metadata from one system into another. For details on harvesting, see the :doc:`harvestserver` section.
+
+Machine-Readable Metadata on Dataset Landing Pages
+--------------------------------------------------
+
+As recommended in `A Data Citation Roadmap for Scholarly Data Repositories <https://doi.org/10.1101/097196>`_, the Dataverse software embeds metadata on dataset landing pages in a variety of machine-readable ways. 
+
+Dublin Core HTML Meta Tags
+++++++++++++++++++++++++++
+
+The HTML source of a dataset landing page includes "DC" (Dublin Core) ``<meta>`` tags such as the following::
+
+        <meta name="DC.identifier" content="..."
+        <meta name="DC.type" content="Dataset"
+        <meta name="DC.title" content="..."
+
+.. _schema.org-head:
+
+Schema.org JSON-LD/Croissant Metadata
++++++++++++++++++++++++++++++++++++++
+
+The ``<head>`` of the HTML source of a dataset landing page includes Schema.org JSON-LD metadata like this::
+
+
+        <script type="application/ld+json">{"@context":"http://schema.org","@type":"Dataset","@id":"https://doi.org/...
+
+If you enable the Croissant metadata export format (see :ref:`external-exporters`) the ``<head>`` will show Croissant metadata instead. It looks similar, but you should see ``"cr": "http://mlcommons.org/croissant/"`` in the output.
+
+For backward compatibility, if you enable Croissant, the older Schema.org JSON-LD format (``schema.org`` in the API) will still be available from both the web interface (see :ref:`metadata-export-formats`) and the API (see :ref:`export-dataset-metadata-api`).
+
+The Dataverse team has been working with Google on both formats. Google has `indicated <https://github.com/mlcommons/croissant/issues/530#issuecomment-1964227662>`_ that for `Google Dataset Search <https://datasetsearch.research.google.com>`_ (the main reason we started adding this extra metadata in the ``<head>`` of dataset pages), Croissant is the successor to the older format.
+
+.. _discovery-sign-posting:
+
+Signposting
++++++++++++
+
+The Dataverse software supports `Signposting <https://signposting.org>`_. This allows machines to request more information about a dataset through the `Link <https://tools.ietf.org/html/rfc5988>`_ HTTP header. Links to all enabled metadata export formats are given. See :ref:`metadata-export-formats` for a list.
+
+There are 2 Signposting profile levels, level 1 and level 2. In this implementation, 
+ * Level 1 links are shown `as recommended <https://signposting.org/FAIR/>`_ in the "Link"
+   HTTP header, which can be fetched by sending an HTTP HEAD request, e.g. ``curl -I https://demo.dataverse.org/dataset.xhtml?persistentId=doi:10.5072/FK2/KPY4ZC``.
+   The number of author and file links in the level 1 header can be configured as described below. 
+ * The level 2 linkset can be fetched by visiting the dedicated linkset page for 
+   that artifact. The link can be seen in level 1 links with key name ``rel="linkset"``.
+
+Note: Authors without author link will not be counted nor shown in any profile/linkset. 
+The following configuration options are available:
+
+- :ref:`dataverse.signposting.level1-author-limit`
+
+  Sets the max number of authors to be shown in `level 1` profile.
+  If the number of authors (with identifier URLs) exceeds this value, no author links will be shown in `level 1` profile.
+  The default is 5.
+
+- :ref:`dataverse.signposting.level1-item-limit`
+
+  Sets the max number of items/files which will be shown in `level 1` profile. Datasets with
+  too many files will not show any file links in `level 1` profile. They will be shown in `level 2` linkset only. 
+  The default is 5.
+
+See also :ref:`signposting-api` in the API Guide.
+
+Additional Discoverability Through Integrations
+-----------------------------------------------
+
+See :ref:`integrations-discovery` in the Integrations section for additional discovery methods you can enable.
diff --git a/doc/sphinx-guides/source/admin/external-tools.rst b/doc/sphinx-guides/source/admin/external-tools.rst
index 6054334e4a6..c3e71c13ac6 100644
--- a/doc/sphinx-guides/source/admin/external-tools.rst
+++ b/doc/sphinx-guides/source/admin/external-tools.rst
@@ -1,7 +1,7 @@
 External Tools
 ==============
 
-External tools can provide additional features that are not part of Dataverse itself, such as data exploration.
+External tools can provide additional features that are not part of the Dataverse Software itself, such as data file previews, visualization, and curation.
 
 .. contents:: |toctitle|
   :local:
@@ -12,7 +12,7 @@ Inventory of External Tools
 ---------------------------
 
 .. csv-table:: 
-   :header: "Tool", "Type", "Scope", "Description"
+   :header-rows: 1
    :widths: 20, 10, 5, 65
    :delim: tab
    :file: ../_static/admin/dataverse-external-tools.tsv
@@ -22,42 +22,60 @@ Inventory of External Tools
 Managing External Tools
 -----------------------
 
-Adding External Tools to Dataverse
-+++++++++++++++++++++++++++++++++++
+Adding External Tools to a Dataverse Installation
++++++++++++++++++++++++++++++++++++++++++++++++++
 
-To add an external tool to your installation of Dataverse you must first download a JSON file for that tool, which we refer to as a "manifest". It should look something like this:
+To add an external tool to your Dataverse installation you must first download a JSON file for that tool, which we refer to as a "manifest". It should look something like this:
 
 .. literalinclude:: ../_static/installation/files/root/external-tools/fabulousFileTool.json
 
 Go to :ref:`inventory-of-external-tools` and download a JSON manifest for one of the tools by following links in the description to installation instructions.
 
-In the curl command below, replace the placeholder "fabulousFileTool.json" placeholder for the actual name of the JSON file you downloaded.
+Configure the tool with the curl command below, making sure to replace the ``fabulousFileTool.json`` placeholder for name of the JSON manifest file you downloaded.
 
 .. code-block:: bash
 
-  curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools --upload-file fabulousFileTool.json 
+  curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools --upload-file fabulousFileTool.json
 
-Listing All External Tools in Dataverse
-+++++++++++++++++++++++++++++++++++++++
+This API is Superuser only. Note the endpoint difference (/api/externalTools instead of /api/admin/externalTools).
 
-To list all the external tools that are available in Dataverse:
+.. code-block:: bash
+
+  curl -s -H "X-Dataverse-key:$API_TOKEN" -X POST -H 'Content-type: application/json' http://localhost:8080/api/externalTools --upload-file fabulousFileTool.json
+
+Listing All External Tools in a Dataverse Installation
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+To list all the external tools that are available in a Dataverse installation:
 
 .. code-block:: bash
 
   curl http://localhost:8080/api/admin/externalTools
 
-Showing an External Tool in Dataverse
-+++++++++++++++++++++++++++++++++++++
+This API is open to any user. Note the endpoint difference (/api/externalTools instead of /api/admin/externalTools).
+
+.. code-block:: bash
+
+  curl http://localhost:8080/api/externalTools
 
-To show one of the external tools that are available in Dataverse, pass its database id:
+Showing an External Tool in a Dataverse Installation
+++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+To show one of the external tools that are available in a Dataverse installation, pass its database id:
 
 .. code-block:: bash
 
   export TOOL_ID=1
   curl http://localhost:8080/api/admin/externalTools/$TOOL_ID
 
-Removing an External Tool From Dataverse
-++++++++++++++++++++++++++++++++++++++++
+This API is open to any user. Note the endpoint difference (/api/externalTools instead of /api/admin/externalTools).
+
+.. code-block:: bash
+
+  curl http://localhost:8080/api/externalTools/$TOOL_ID
+
+Removing an External Tool From a Dataverse Installation
++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 Assuming the external tool database id is "1", remove it with the following command:
 
@@ -66,19 +84,47 @@ Assuming the external tool database id is "1", remove it with the following comm
   export TOOL_ID=1
   curl -X DELETE http://localhost:8080/api/admin/externalTools/$TOOL_ID
 
+This API is Superuser only. Note the endpoint difference (/api/externalTools instead of /api/admin/externalTools).
+
+.. code-block:: bash
+
+  curl -s -H "X-Dataverse-key:$API_TOKEN" -X DELETE http://localhost:8080/api/externalTools/$TOOL_ID
+
 .. _testing-external-tools:
 
 Testing External Tools
 ----------------------
 
-Once you have added an external tool to your installation of Dataverse, you will probably want to test it to make sure it is functioning properly.
+Once you have added an external tool to your Dataverse installation, you will probably want to test it to make sure it is functioning properly.
+
+File Level vs. Dataset Level
+++++++++++++++++++++++++++++
+
+File level tools are specific to the file type (content type or MIME type). For example, a tool may work with PDFs, which have a content type of "application/pdf". 
+
+In contrast, dataset level tools are always available no matter what file types are within the dataset.
 
 File Level Explore Tools
 ++++++++++++++++++++++++
 
-File level explore tools are specific to the file type (content type or MIME type) of the file. For example, there is a tool for exploring PDF files in the "File Previewers" set of tools.
+File level explore tools provide a variety of features from data visualization to statistical analysis.
+
+For each supported file type, file level explore tools appear in the file listing of the dataset page as well as under the "Access" button on each file page.
+
+File Level Preview Tools
+++++++++++++++++++++++++
+
+File level preview tools allow the user to see a preview of the file contents without having to download it.
+
+When a file has a preview available, a preview icon will appear next to that file in the file listing on the dataset page. On the file page itself, the preview will appear in a Preview tab (renamed File Tools, if multiple tools are available) either immediately or once a guestbook has been filled in or terms, if any, have been agreed to.
+
+File Level Query Tools
+++++++++++++++++++++++++
+
+File level query tools allow the user to ask questions (e.g. natural language queries) of a data table's contents without having to download it.
+
+When a file has a query tool available, a query icon will appear next to that file in the file listing on the dataset page. On the file page itself, the query tool will appear in a Query tab (renamed File Tools, if multiple tools are available) either immediately or once a guestbook has been filled in or terms, if any, have been agreed to.
 
-An "Explore" button will appear (on both the dataset page and the file landing page) for files that match the type that the tool has been built for. When there are multiple explore tools for a filetype, the button becomes a dropdown.
 
 File Level Configure Tools
 ++++++++++++++++++++++++++
@@ -88,16 +134,16 @@ File level configure tools are only available when you log in and have write acc
 Dataset Level Explore Tools
 +++++++++++++++++++++++++++
 
-When a dataset level explore tool is added, an "Explore" button on the dataset page will appear. This button becomes a drop down when there are multiple tools.
+Dataset level explore tools allow the user to explore all the files in a dataset.
 
 Dataset Level Configure Tools
 +++++++++++++++++++++++++++++
 
-Configure tools at the dataset level are not currently supported. No button appears in the GUI if you add this type of tool.
+Dataset level configure tools can be launched by users who have edit access to the dataset. These tools are found under the "Edit Dataset" menu.
 
 Writing Your Own External Tool
 ------------------------------
 
 If you plan to write a external tool, see the :doc:`/api/external-tools` section of the API Guide.
 
-If you have an idea for an external tool, please let the Dataverse community know by posting about it on the dataverse-community mailing list: https://groups.google.com/forum/#!forum/dataverse-community
+If you have an idea for an external tool, please let the Dataverse Project community know by posting about it on the dataverse-community mailing list: https://groups.google.com/forum/#!forum/dataverse-community
diff --git a/doc/sphinx-guides/source/admin/geoconnect-worldmap.rst b/doc/sphinx-guides/source/admin/geoconnect-worldmap.rst
deleted file mode 100644
index 0af163a2916..00000000000
--- a/doc/sphinx-guides/source/admin/geoconnect-worldmap.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-Geoconnect and WorldMap
-=======================
-
-One of the optional components listed under "Architecture and Components" in the :doc:`/installation/prep` section of the Installation Guide is `Geoconnect <https://github.com/IQSS/geoconnect>`_, a piece of middleware that allows Dataverse users to create maps in `WorldMap <http://worldmap.harvard.edu>`_ based on geospatial data stored in Dataverse. For more details on the feature from the user perspective, see the :doc:`/user/data-exploration/worldmap` section of the User Guide.
-
-.. contents:: |toctitle|
-	:local:
-
-Update "mapitlink"
-------------------
-
-SQL commands to point a Dataverse installation at different Geoconnect servers:
-
-
-**Geoconnect Production** *geoconnect.datascience.iq.harvard.edu*
-
-.. code-block:: sql
-
-    update worldmapauth_tokentype set mapitlink = 'https://geoconnect.datascience.iq.harvard.edu/shapefile/map-it', hostname='geoconnect.datascience.iq.harvard.edu' where name = 'GEOCONNECT';
-
-**Heroku Test** *geoconnect-dev.herokuapp.com*
-
-.. code-block:: sql
-
-    update worldmapauth_tokentype set mapitlink = 'https://geoconnect-dev.herokuapp.com/shapefile/map-it', hostname='geoconnect-dev.herokuapp.com' where name = 'GEOCONNECT';
-
-
-**View Current Settings**
-
-.. code-block:: sql
-
-    SELECT * from worldmapauth_tokentype;
-
-
-Removing Dead Explore Links
----------------------------
-
-After a map has been created in WorldMap (assuming all the setup has been done), an "Explore" button will appear next to the name of the file in Dataverse. The "Explore" button should open the map in WorldMap. In rare occasions, the map has been deleted on the WorldMap side such that the "Explore" button goes nowhere, resulting in a dead link, a 404.
-
-Functionality has been added on the Dataverse side to iterate through all the maps Dataverse knows about (stored in the ``maplayermetadata`` database table) and to check for the existence of each map in WorldMap. The status code returned from WorldMap (200, 404, etc.) is recorded in Dataverse along with a timestamp of when the check was performed. To perform this check, you can execute the following ``curl`` command:
-
-``curl -X POST http://localhost:8080/api/admin/geoconnect/mapLayerMetadatas/check``
-
-The output above will contain the ``layerLink`` being checked as well as the HTTP response status code (200, 404, etc.) in the ``lastVerifiedStatus`` field. 200 means OK and 404 means not found. 500 might indicate that the map is only temporarily unavailable. The ``lastVerifiedStatus`` and ``lastVerifiedTime`` will be persisted to the ``maplayermetadata`` database table.
-
-Armed with this information about WorldMap returning a 404 for a map, you may want to delete any record of the map on the Dataverse side so that the "Explore" button goes away (and so that thumbnail files are cleaned up). To accomplish this, use the following ``curl`` command, substituting the id of the file:
-
-``curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://localhost:8080/api/files/{file_id}/map``
-
-End users can also run the ``DELETE`` command above (if they have permission to edit the dataset) but it's more likely that the sysadmin reading this guide will run it for them. It is recommended that you add the "check" command above to cron so that Dataverse periodically checks on the status of maps in WorldMap. In addition to the "check all maps" command above, you can also check an individual map with the following ``curl`` command, substituting the id of the row from the ``maplayermetadata`` table:
-
-``curl -X POST http://localhost:8080/api/admin/geoconnect/mapLayerMetadatas/check/{id}``
diff --git a/doc/sphinx-guides/source/admin/harvestclients.rst b/doc/sphinx-guides/source/admin/harvestclients.rst
index cd841aeba85..6ac8c480745 100644
--- a/doc/sphinx-guides/source/admin/harvestclients.rst
+++ b/doc/sphinx-guides/source/admin/harvestclients.rst
@@ -3,36 +3,69 @@ Managing Harvesting Clients
 
 .. contents:: |toctitle|
 	:local:
-	
-Your Dataverse as a Metadata Harvester
---------------------------------------
 
-Harvesting is a process of exchanging metadata with other repositories. As a harvesting *client*, your Dataverse can
-gather metadata records from remote sources. These can be other Dataverse instances or other archives that support OAI-PMH, the standard harvesting protocol. Harvested metadata records will be indexed and made searchable by your users. Clicking on a harvested dataset in the search results takes the user to the original repository. Harvested datasets cannot be edited in your Dataverse installation.
+Your Dataverse Installation as a Metadata Harvester
+---------------------------------------------------
 
-Harvested records can be kept in sync with the original repository through scheduled incremental updates, daily or weekly. 
-Alternatively, harvests can be run on demand, by the Admin. 
+Harvesting is a process of exchanging metadata with other repositories. As a harvesting *client*, your Dataverse installation can gather metadata records from remote sources. These can be other Dataverse installations or other archives that support OAI-PMH, the standard harvesting protocol. Harvested metadata records will be indexed and made searchable by your users. Clicking on a harvested dataset in the search results takes the user to the original repository. Harvested datasets cannot be edited in your Dataverse installation.
+
+Harvested records can be kept in sync with the original repository through scheduled incremental updates, daily or weekly.
+Alternatively, harvests can be run on demand, by the Admin.
+
+.. _managing-harvesting-clients:
 
 Managing Harvesting Clients
 ---------------------------
 
-To start harvesting metadata from a remote OAI repository, you first create and configure a *Harvesting Client*. 
+To start harvesting metadata from a remote OAI repository, you first create and configure a *Harvesting Client*.
 
 Clients are managed on the "Harvesting Clients" page accessible via the :doc:`dashboard`. Click on the *Add Client* button to get started.
 
-The process of creating a new, or editing an existing client, is largely self-explanatory. It is split into logical steps, in a way that allows the user to go back and correct the entries made earlier. The process is interactive and guidance text is provided. For example, the user is required to enter the URL of the remote OAI server. When they click *Next*, the application will try to establish a connection to the server in order to verify that it is working, and to obtain the information about the sets of metadata records and the metadata formats it supports. The choices offered to the user on the next page will be based on this extra information. If the application fails to establish a connection to the remote archive at the address specified, or if an invalid response is received, the user is given an opportunity to check and correct the URL they entered. 
+The process of creating a new, or editing an existing client, is largely self-explanatory. It is split into logical steps, in a way that allows the user to go back and correct the entries made earlier. The process is interactive and guidance text is provided. For example, the user is required to enter the URL of the remote OAI server. When they click *Next*, the application will try to establish a connection to the server in order to verify that it is working, and to obtain the information about the sets of metadata records and the metadata formats it supports. The choices offered to the user on the next page will be based on this extra information. If the application fails to establish a connection to the remote archive at the address specified, or if an invalid response is received, the user is given an opportunity to check and correct the URL they entered.
+
+Please note that in some rare cases this GUI may fail to create a client because of some unexpected errors during these real time exchanges with an OAI server that is otherwise known to be valid. For example, in the past we have had issues with servers offering very long lists of sets (*really* long, in the thousands). To allow an admin to still be able to create a client in a situation like that, we provide the REST API that will do so without attempting any validation in real time. This obviously makes it the responsibility of the admin to supply the values that are definitely known to be valid - a working OAI url, the name of a set that does exist on the server, and/or a supported metadata format. See the :ref:`managing-harvesting-clients-api` section of the :doc:`/api/native-api` guide for more information.
+
+"Custom HTTP Header" is part of step 1 of the Create or Edit form. This optional field can be used to configure this client with a specific HTTP header to be added to every OAI request. This is to accommodate a (rare) use case where the remote server may require a special token of some kind in order to offer some content not available to other clients. Most OAI servers offer the same publicly-available content to all clients, so few admins will have a use for this feature. However, it appears in Step 1 of the form screen in case the OAI server requires this token even for the "ListSets" and "ListMetadataFormats" requests, which need to be sent in Step 2 of creating or editing a client. Multiple headers can be supplied separated by `\\n` - actual "backslash" and "n" characters, not a single "new line" character.
+
+.. _harvesting-from-datacite:
+
+Harvesting from Datacite
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+It is possible to harvest metadata directly from DataCite. Their OAI gateway (https://oai.datacite.org/oai) serves records for every DOI they have registered. Therefore, it is now possible to harvest metadata from any participating institution even if they do not maintain an OAI server of their own. Their OAI implementation offers a concept of a "dynamic set", making it possible to use any query supported by the DataCite search API as though it were a "set". This makes harvesting from them extra flexible, allowing users to harvest virtually any arbitrary subset of metadata records, potentially spanning multiple institutions and registration authorities.
 
-New in Dataverse 4, vs. DVN 3
------------------------------
+For various reasons, in order to take advantage of this feature harvesting clients must be created via the ``/api/harvest/clients`` API. Once configured however, harvests can be run from the Harvesting Clients control panel in the UI. See the :ref:`managing-harvesting-clients-api` section of the :doc:`/api/native-api` guide for more information.
 
+How to Stop a Harvesting Run in Progress
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- Note that when creating a client you will need to select an existing local dataverse to host the datasets harvested. In DVN 3, a dedicated "harvesting dataverse" would be created specifically for each remote harvesting source. In Dataverse 4, harvested content can be added to *any dataverse*. This means that a dataverse can now contain datasets harvested from multiple sources and/or a mix of local and harvested datasets.
+Some harvesting jobs, especially the initial full harvest of a very large set - such as the default set of public datasets at IQSS - can take many hours. In case it is necessary to terminate such a long-running job, the following mechanism is provided (note that it is only available to a sysadmin with shell access to the application server): Create an empty file in the domain logs directory with the following name: ``stopharvest_<name>.<pid>``, where ``<name>`` is the nickname of the harvesting client and ``<pid>`` is the process id of the Application Server (Payara). This flag file needs to be owned by the same user that's running Payara, so that the application can remove it after stopping the job in progress.
 
+For example:
 
-- An extra "Archive Type" pull down menu is added to the Create and Edit dialogs. This setting, selected from the choices such as "Dataverse 4", "DVN, v2-3", "Generic OAI", etc. is used to properly format the harvested metadata as they are shown in the search results. It is **very important** to select the type that best describes this remote server, as failure to do so can result in information missing from the search results, and, a **failure to redirect the user to the archival source** of the data!
+.. code-block:: bash
 
-  It is, however, **very easy to correct** a mistake like this. For example, let's say you have created a client to harvest from the XYZ Institute and specified the archive type as "Dataverse 4". You have been able to harvest content, the datasets appear in search result, but clicking on them results in a "Page Not Found" error on the remote site. At which point you realize that the XYZ Institute admins have not yet upgraded to Dataverse 4, still running DVN v3.1.2 instead. All you need to do is go back to the Harvesting Clients page, and change the setting to "DVN, v2-3". This will fix the redirects **without having to re-harvest** the datasets. 
+  sudo touch /usr/local/payara6/glassfish/domains/domain1/logs/stopharvest_bigarchive.70916
+  sudo chown dataverse /usr/local/payara6/glassfish/domains/domain1/logs/stopharvest_bigarchive.70916
+
+Note: If the application server is stopped and restarted, any running harvesting jobs will be killed but may remain marked as in progress in the database. We thus recommend using the mechanism here to stop ongoing harvests prior to a server restart.
+
+		
+What if a Run Fails?
+~~~~~~~~~~~~~~~~~~~~
+
+Each harvesting client run logs a separate file per run to the app server's default logging directory (``/usr/local/payara6/glassfish/domains/domain1/logs/`` unless you've changed it). Look for filenames in the format  ``harvest_TARGET_YYYY_MM_DD_timestamp.log`` to get a better idea of what's going wrong.
+
+Note that you'll want to run a minimum of Dataverse Software 4.6, optimally 4.18 or beyond, for the best OAI-PMH interoperability.
+
+Harvesting Client Changelog
+---------------------------
 
-- Another extra entry, "Archive Description", is added to the *Edit Harvesting Client* dialog. This description appears at the bottom of each search result card for a harvested dataset or datafile. By default, this text reads "This Dataset is harvested from our partners. Clicking the link will take you directly to the archival source of the data." Here it can be customized to be more descriptive, for example, "This Dataset is harvested from our partners at the XYZ Institute..."
+- As of Dataverse 6.6, it is possible to harvest metadata directly from DataCite. See :ref:`harvesting-from-datacite`.
+- As of Dataverse 6.6, the publisher value of harvested datasets is now attributed to the dataset's distributor instead of its producer. This change affects all newly harvested datasets. For more information, see https://github.com/IQSS/dataverse/pull/9013
+- As of Dataverse 5.13, a new entry called "Custom HTTP Header" has been added to the Step 1. of Create or Edit form. For usage see :ref:`managing-harvesting-clients`.
 
+Harvesting Non-OAI-PMH
+----------------------
 
+`DOI2PMH <https://github.com/IQSS/doi2pmh-server>`__ is a community-driven project intended to allow OAI-PMH harvesting from non-OAI-PMH sources.  
diff --git a/doc/sphinx-guides/source/admin/harvestserver.rst b/doc/sphinx-guides/source/admin/harvestserver.rst
index c24968e0c9b..773e048aa76 100644
--- a/doc/sphinx-guides/source/admin/harvestserver.rst
+++ b/doc/sphinx-guides/source/admin/harvestserver.rst
@@ -4,12 +4,11 @@ Managing Harvesting Server and Sets
 .. contents:: |toctitle|
   :local:
 
-Your Dataverse as an OAI server
--------------------------------
+Your Dataverse Installation as an OAI server
+--------------------------------------------
 
-As a harvesting *server*, your Dataverse can make some of the local
-dataset metadata available to remote harvesting clients. These can be
-other Dataverse instances, or any other clients that support OAI-PMH
+As a harvesting *server*, your Dataverse installation can make some of the local dataset metadata available to remote harvesting clients. These can be
+other Dataverse installations, or any other clients that support OAI-PMH
 harvesting protocol. Note that the terms "Harvesting Server" and "OAI
 Server" are being used interchangeably throughout this guide and in
 the inline help text.
@@ -18,14 +17,16 @@ If you want to learn more about OAI-PMH, you could take a look at
 `DataCite OAI-PMH guide <https://support.datacite.org/docs/datacite-oai-pmh>`_
 or the `OAI-PMH protocol definition <https://www.openarchives.org/OAI/openarchivesprotocol.html>`_.
 
-You might consider adding your OAI-enabled production instance of Dataverse to
-`this shared list <https://docs.google.com/spreadsheets/d/12cxymvXCqP_kCsLKXQD32go79HBWZ1vU_tdG4kvP5S8/>`_
+You might consider adding your OAI-enabled Dataverse installation to
+`this shared list <https://docs.google.com/spreadsheets/d/1bfsw7gnHlHerLXuk7YprUT68liHfcaMxs1rFciA-mEo/>`_
 of such instances.
 
-How does it work? 
+The email portion of :ref:`systemEmail` will be visible via OAI-PMH (from the "Identify" verb).
+
+How does it work?
 -----------------
 
-Only the published, unrestricted datasets in your Dataverse can
+Only the published datasets in your Dataverse installation can
 be made harvestable. Remote clients normally keep their records in sync
 through scheduled incremental updates, daily or weekly, thus
 minimizing the load on your server. Note that it is only the metadata
@@ -34,9 +35,9 @@ download the data files associated with the harvested datasets.
 
 Harvesting server can be enabled or disabled on the "Harvesting
 Server" page accessible via the :doc:`dashboard`. Harvesting server is by
-default disabled on a brand new, "out of the box" Dataverse.
+default disabled on a brand new, "out of the box" Dataverse installation.
 
-The OAI-PMH endpoint can be accessed at ``http(s)://<Your Dataverse FQDN>/oai``.
+The OAI-PMH endpoint can be accessed at ``http(s)://<Your Dataverse Installation FQDN>/oai``.
 If you want other services to harvest your repository, point them to this URL.
 *Example URL for 'Identify' verb*: `demo.dataverse.org OAI <https://demo.dataverse.org/oai?verb=Identify>`_
 
@@ -48,11 +49,10 @@ that will be available to remote harvesters as *OAI Sets*. Once again,
 the terms "OAI Set" and "Harvesting Set" are used
 interchangeably. Sets are defined by search queries. Any such query
 that finds any number of published, local (non-harvested) datasets can
-be used to create an OAI set. Sets can overlap local dataverses, and
-can include as few or as many of your local datasets as you wish. A
-good way to master the Dataverse search query language is to
+be used to create an OAI set. Sets can overlap local Dataverse collections, and can include as few or as many of your local datasets as you wish. A
+good way to master the Dataverse Software search query language is to
 experiment with the Advanced Search page. We also recommend that you
-consult the Search API section of the Dataverse User Guide. 
+consult the :doc:`/api/search` section of the API Guide. 
 
 Once you have entered the search query and clicked *Next*, the number
 of search results found will be shown on the next screen. This way, if
@@ -61,7 +61,7 @@ can go back and try to re-define the query.
 
 Some useful examples of search queries to define OAI sets: 
 
-- A good way to create a set that would include all your local, published datasets is to do so by the Unique Identifier authority registered to your Dataverse, for example: 
+- A good way to create a set that would include all your local, published datasets is to do so by the Unique Identifier authority registered to your Dataverse installation, for example: 
 
   ``dsPersistentId:"doi:1234/"``
 
@@ -69,19 +69,31 @@ Some useful examples of search queries to define OAI sets:
   
   Note also that the search terms limiting the results to published and local datasets **are added to the query automatically**, so you don't need to worry about that. 
   
-- A query to create a set to include the datasets from a specific local dataverse: 
+- A query to create a set to include the datasets from a specific Dataverse collection:
 
   ``parentId:NNN``
 
-  where NNN is the database id of the dataverse object (consult the Dataverse table of the SQL database used by the application to verify the database id). 
+  where NNN is the database id of the Dataverse collection object (to verify the database ID, consult the Dataverse table of the SQL database used by the application or use the :ref:`view-dataverse` API endpoint).
+  
+  Note that this query does **not** provide datasets that are linked into the specified Dataverse collection.
+
+- A query to create a set to include the datasets from a specific Dataverse collection including datasets that have been deposited into other Dataverse collections but linked into the specified Dataverse collection: 
+
+  ``subtreePaths:"/NNN"``
+
+  where NNN is the database ID of the Dataverse collection (to verify the database ID, consult the Dataverse table of the SQL database used by the application or use the :ref:`view-dataverse` API endpoint). If the Dataverse collection has one or more parent collections, the subtreePaths query has to include the database IDs of each of the collection's parent collections, up to but excluding the "Root" collection. For example:
+
+  ``subtreePaths:"/AAA/BBB/NNN"``
+
+  where NNN is the database ID of the Dataverse collection containing the desired dataset and AAA and BBB are the database IDs of the parent collections.
 
-- A query to find all the dataset by a certain author: 
+- A query to find all the dataset by a certain author:
 
   ``authorName:YYY``
 
   where YYY is the name. 
 
-- Complex queries can be created with multiple logical AND and OR operators. For example, 
+- Complex queries can be created with multiple logical AND and OR operators. For example,
 
   ``(authorName:YYY OR authorName:ZZZ) AND dsPublicationDate:NNNN``
   
@@ -95,7 +107,7 @@ Some useful examples of search queries to define OAI sets:
   
   ``dsPersistentId:10.5000/XXYYZZ``
 
-  For all dataverses with subjects of Astronomy and Astrophysics or Earth and Environmental Sciences:
+  For all Dataverse collections with subjects of Astronomy and Astrophysics or Earth and Environmental Sciences:
  
   ``(dvSubject:"Astronomy and Astrophysics" OR dvSubject:"Earth and Environmental Sciences")``
 
@@ -103,17 +115,17 @@ Some useful examples of search queries to define OAI sets:
 
   ``keywordValue:censorship``
 
-Important: New SOLR schema required!
+Important: New Solr schema required!
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In order to be able to define OAI sets, your SOLR server must be upgraded with the search schema that came with the Dataverse release 4.5 (or later), and all your local datasets must be re-indexed, once the new schema is installed. 
+In order to be able to define OAI sets, your Solr server must be upgraded with the search schema that came with release 4.5 (or later), and all your local datasets must be re-indexed, once the new schema is installed. 
 
 OAI Set updates
 ---------------
 
 Every time a new harvesting set is created, or changes are made to an
 existing set, the contents of the set are automatically updated - the
-Dataverse application will find the datasets defined by the query, and
+Dataverse installation will find the datasets defined by the query, and
 attempt to run the metadata export on the ones that haven't been
 exported yet. Only the datasets for which the export has completed
 successfully, and the results cached on the filesystem are included in
@@ -134,9 +146,7 @@ the sets every time any changes to the metadata are made.
 The OAI set will however be updated automatically by a scheduled metadata export job that
 runs every night (at 2AM, by default). This export timer is created
 and activated automatically every time the application is deployed
-or restarted. Once again, this is new in Dataverse 4, and unlike DVN
-v3, where export jobs had to be scheduled and activated by the admin
-user. See the "Export" section of the Admin guide, for more information on the automated metadata exports.
+or restarted. See the :doc:`/admin/metadataexport` section of the Admin Guide, for more information on the automated metadata exports.
 
 It is still possible however to make changes like this be immediately
 reflected in the OAI server, by going to the *Harvesting Server* page
diff --git a/doc/sphinx-guides/source/admin/index.rst b/doc/sphinx-guides/source/admin/index.rst
index 39b4f5748d3..a8a543571a7 100755
--- a/doc/sphinx-guides/source/admin/index.rst
+++ b/doc/sphinx-guides/source/admin/index.rst
@@ -11,9 +11,11 @@ This guide documents the functionality only available to superusers (such as "da
 **Contents:**
 
 .. toctree::
+   :maxdepth: 2
 
    dashboard
    external-tools
+   discoverability
    harvestclients
    harvestserver
    metadatacustomization
@@ -21,13 +23,15 @@ This guide documents the functionality only available to superusers (such as "da
    timers
    make-data-count
    integrations
-   geoconnect-worldmap
    user-administration
    dataverses-datasets
    solr-search-index
    ip-groups
+   mail-groups
+   collectionquotas
    monitoring
-   reporting-tools
+   rate-limiting
+   reporting-tools-and-queries
    maintenance
    backups
    troubleshooting
diff --git a/doc/sphinx-guides/source/admin/integrations.rst b/doc/sphinx-guides/source/admin/integrations.rst
index 2ed8581eb50..0bc5fe7395c 100644
--- a/doc/sphinx-guides/source/admin/integrations.rst
+++ b/doc/sphinx-guides/source/admin/integrations.rst
@@ -1,7 +1,7 @@
 Integrations
 ============
 
-Now that you've installed Dataverse, you might want to set up some integrations with other systems. Many of these integrations are open source and are cross listed in the :doc:`/api/apps` section of the API Guide.
+Now that you've installed a Dataverse installation, you might want to set up some integrations with other systems. Many of these integrations are open source and are cross listed in the :doc:`/api/apps` section of the API Guide.
 
 .. contents:: Contents:
 	:local:
@@ -9,37 +9,153 @@ Now that you've installed Dataverse, you might want to set up some integrations
 Getting Data In
 ---------------
 
-A variety of integrations are oriented toward making it easier for your researchers to deposit data into your installation of Dataverse.
+A variety of integrations are oriented toward making it easier for your researchers to deposit data into your Dataverse installation.
+
+GitHub
+++++++
+
+GitHub can be integrated with a Dataverse installation in multiple ways.
+
+One Dataverse integration is implemented via a Dataverse Uploader GitHub Action. It is a reusable, composite workflow for uploading a git repository or subdirectory into a dataset on a target Dataverse installation. The action is customizable, allowing users to choose to replace a dataset, add to the dataset, publish it or leave it as a draft version in the Dataverse installation. The action provides some metadata to the dataset, such as the origin GitHub repository, and it preserves the directory tree structure. 
+
+For instructions on using Dataverse Uploader GitHub Action, visit https://github.com/marketplace/actions/dataverse-uploader-action
+
+In addition to the Dataverse Uploader GitHub Action, the :ref:`integrations-dashboard` also enables a pull of data from GitHub to a dataset.
 
 Dropbox
 +++++++
 
-If your researchers have data on Dropbox, you can make it easier for them to get it into Dataverse by setting the :ref:`dataverse.dropbox.key` JVM option described in the :doc:`/installation/config` section of the Installation Guide.
+If your researchers have data on Dropbox, you can make it easier for them to get it into your Dataverse installation by setting the :ref:`dataverse.dropbox.key` JVM option described in the :doc:`/installation/config` section of the Installation Guide.
 
 Open Science Framework (OSF)
 ++++++++++++++++++++++++++++
 
-The Center for Open Science's Open Science Framework (OSF) is an open source software project that facilitates open collaboration in science research across the lifespan of a scientific project. 
+The Center for Open Science's Open Science Framework (OSF) is an open source software project that facilitates open collaboration in science research across the lifespan of a scientific project.
 
-For instructions on depositing data from OSF to your installation of Dataverse, your researchers can visit http://help.osf.io/m/addons/l/863978-connect-dataverse-to-a-project 
+OSF can be integrated with a Dataverse installation in multiple ways.
+
+Researcher can configure OSF itself to deposit to your Dataverse installation by following `instructions from OSF <https://help.osf.io/article/208-connect-dataverse-to-a-project>`_.
+
+In addition to the method mentioned above, the :ref:`integrations-dashboard` also enables a pull of data from OSF to a dataset.
 
 RSpace
 ++++++
 
 RSpace is an affordable and secure enterprise grade electronic lab notebook (ELN) for researchers to capture and organize data.
 
-For instructions on depositing data from RSpace to your installation of Dataverse, your researchers can visit https://www.researchspace.com/help-and-support-resources/dataverse-integration/
+For instructions on depositing data from RSpace to your Dataverse installation, your researchers can visit https://www.researchspace.com/help-and-support-resources/dataverse-integration/
 
-Open Journal Systems (OJS)
-++++++++++++++++++++++++++
+Open Journal Systems (OJS) and OPS
+++++++++++++++++++++++++++++++++++
 
 Open Journal Systems (OJS) is a journal management and publishing system that has been developed by the Public Knowledge Project to expand and improve access to research.
 
-The OJS Dataverse Plugin adds data sharing and preservation to the OJS publication process.
+Open Preprint Systems (OPS) is similar, but for preprints.
+
+The following plugin adds data sharing and preservation to the OJS/OPS publication process.
+
+OJS/OPS 3.x can use https://github.com/lepidus/dataversePlugin
+
+OJS 2.x can use https://github.com/pkp/ojs/tree/ojs-2_4_8-5/plugins/generic/dataverse
+
+Amnesia
++++++++
+
+Amnesia is a flexible data anonymization tool that transforms relational and transactional databases to datasets where formal privacy guarantees hold. Amnesia transforms original data to provide k-anonymity and km-anonymity: the original data are transformed by generalizing (i.e., replacing one value with a more abstract one) or suppressing values to achieve the statistical properties required by the anonymization guarantees. Amnesia employs visualization tools and supportive mechanisms to allow non expert users to anonymize relational and object-relational data.
+
+For instructions on depositing or loading data from Dataverse installations to Amnesia, visit https://amnesia.openaire.eu/about-documentation.html
+
+SampleDB
+++++++++
+
+SampleDB is a web-based electronic lab notebook (ELN) with a focus on flexible metadata. SampleDB can export this flexible, process-specific metadata to a new Dataset in a Dataverse installation using the EngMeta Process Metadata block.
+
+For instructions on using the Dataverse export, you can visit https://scientific-it-systems.iffgit.fz-juelich.de/SampleDB/administrator_guide/dataverse_export.html
+
+RedCap
+++++++
+
+RedCap is a web-based application to capture data for clinical research and create databases and projects.
 
-As of this writing only OJS 2.x is supported and instructions for getting started can be found at https://github.com/pkp/ojs/tree/ojs-stable-2_4_8/plugins/generic/dataverse
+The :ref:`integrations-dashboard` enables a pull of data from RedCap to a dataset in Dataverse.
+
+GitLab
+++++++
+
+GitLab is an open source Git repository and platform that provides free open and private repositories, issue-following capabilities, and wikis for collaborative software development.
+
+The :ref:`integrations-dashboard` enables a pull of data from GitLab to a dataset in Dataverse.
+
+iRODS
++++++
+
+An open source, metadata driven data management system that is accessible through a host of different clients.
+
+The :ref:`integrations-dashboard` enables a pull of data from iRODS to a dataset in Dataverse.
+
+.. _integrations-dashboard:
+
+Integrations Dashboard
+++++++++++++++++++++++
+
+The integrations dashboard is software by the Dataverse community to enable easy data transfer from an existing data management platform to a dataset in a Dataverse collection.
+
+Instead of trying to set up Dataverse plug-ins in existing tools and systems to push data to a Dataverse installation, the dashboard works in reverse by being a portal to pull data from tools such as iRODS and GitHub into a dataset.
+
+Its aim is to make integrations more flexible and less dependent on the cooperation of system to integrate with. You can use it to either create a dataset from scratch and add metadata after files have been transferred, or you can use it to compare what is already in an existing dataset to make updating files in datasets easier.
+
+Its goal is to make the dashboard adjustable for a Dataverse installation's needs and easy to connect other systems to as well.
+
+The integrations dashboard is currently in development. A preview and more information can be found at: `rdm-integration GitHub repository <https://github.com/libis/rdm-integration>`_
+
+Globus
+++++++
+
+Globus transfer uses an efficient transfer mechanism and has additional features that make it suitable for large files and large numbers of files:
+
+* robust file transfer capable of restarting after network or endpoint failures
+* third-party transfer, which enables a user accessing a Dataverse installation in their desktop browser to initiate transfer of their files from a remote endpoint (i.e. on a local high-performance computing cluster), directly to an S3 store managed by the Dataverse installation
+
+Users can transfer files via `Globus <https://www.globus.org>`_ into and out of datasets, or reference files on a remote Globus endpoint, when their Dataverse installation is configured to use a Globus accessible store(s) 
+and a community-developed `dataverse-globus <https://github.com/scholarsportal/dataverse-globus>`_ app has been properly installed and configured.
+
+DataLad
++++++++
 
-If you are interested in OJS 3.x supporting deposit from Dataverse, please leave a comment on https://github.com/pkp/pkp-lib/issues/1822
+`DataLad`_ is a free and open source decentralized data management system that is built on `git`_
+and `git-annex`_ and provides a unified interface for version control, deposition, content retrieval,
+provenance tracking, reproducible execution, and further collaborative management of distributed and
+arbitrarily large datasets.
+
+If your dataset is structured as a `DataLad dataset`_ and you have a local DataLad installation,
+the `datalad-dataverse`_ extension package provides interoperability with Dataverse for the purpose
+of depositing DataLad datasets to and retrieving DataLad datasets from Dataverse instances, together
+with full version history.
+
+For further information, visit the ``datalad-dataverse`` extension's `documentation page`_, see the
+`quickstart`_ for installation details, or follow the step-by-step `tutorial`_ to get hands-on
+experience.
+
+.. _DataLad: https://www.datalad.org
+.. _git: https://git-scm.com
+.. _git-annex: https://git-annex.branchable.com
+.. _DataLad dataset: https://handbook.datalad.org/en/latest/basics/basics-datasets.html
+.. _datalad-dataverse: https://github.com/datalad/datalad-dataverse
+.. _documentation page: https://docs.datalad.org/projects/dataverse/en/latest/index.html
+.. _quickstart: https://docs.datalad.org/projects/dataverse/en/latest/settingup.html
+.. _tutorial: https://docs.datalad.org/projects/dataverse/en/latest/tutorial.html
+
+
+Embedding Data on Websites
+--------------------------
+
+OpenScholar
++++++++++++
+
+`OpenScholar <https://theopenscholar.com>`_ is oriented toward hosting websites for academic institutions and offers `Dataverse Project Widgets <https://help.theopenscholar.com/dataverse>`_ that can be added to web pages. See also:
+
+- :ref:`openscholar-dataverse-level` (Dataverse collection level)
+- :ref:`openscholar-dataset-level` (dataset level)
 
 Analysis and Computation
 ------------------------
@@ -47,50 +163,84 @@ Analysis and Computation
 Data Explorer
 +++++++++++++
 
-Data Explorer is a GUI which lists the variables in a tabular data file allowing searching, charting and cross tabulation analysis. 
+Data Explorer is a GUI which lists the variables in a tabular data file allowing searching, charting and cross tabulation analysis.
 
 For installation instructions, see the :doc:`external-tools` section.
 
-TwoRavens/Zelig
-+++++++++++++++
+Compute Button
+++++++++++++++
+
+The "Compute" button is still highly experimental and has special requirements such as use of a Swift object store, but it is documented under "Setting up Compute" in the :doc:`/installation/config` section of the Installation Guide.
 
-TwoRavens is a web application for tabular data exploration and statistical analysis with Zelig.
+.. _binder:
 
-For installation instructions, see the :doc:`external-tools` section.
+Binder
+++++++
 
-WorldMap
-++++++++
+Researchers can launch Jupyter Notebooks, RStudio, and other computational environments by entering the DOI of a dataset in a Dataverse installation at https://mybinder.org
 
-WorldMap helps researchers visualize and explore geospatial data by creating maps.
+A Binder button can also be added to every dataset page to launch Binder from there. Instructions on enabling this feature can be found under :doc:`external-tools`.
 
-For installation instructions, see :doc:`geoconnect-worldmap`.
+Additionally, institutions can self host `BinderHub <https://binderhub.readthedocs.io/en/latest/>`_ (the software that powers mybinder.org), which lists the Dataverse software as one of the supported `repository providers <https://binderhub.readthedocs.io/en/latest/developer/repoproviders.html#supported-repoproviders>`_.
 
-Compute Button
-++++++++++++++
+.. _renku:
 
-The "Compute" button is still highly experimental and has special requirements such as use of a Swift object store, but it is documented under "Setting up Compute" in the :doc:`/installation/config` section of the Installation Guide.
+Renku
++++++
+
+Renku is a platform for collaborative data science. It provides a simple, seamless way to bring data, code, and compute together into shared collaborative projects. 
+Users can connect to a variety of "cloud" data sources, including datasets from Dataverse. Datasets are available immediately in interactive compute sessions, without the need
+to download them first - data is transferred on-demand. 
+
+For more information about using published datasets in Renku interactive sessions, have a look at `the documentation <https://renku.notion.site/How-to-connect-data-from-data-repositories-such-as-Zenodo-or-Dataverse-1eb0df2efafc802ab3bef1c47c8c45b4>`_.
 
-Whole Tale
+Documentation, tutorials, and how-to guides are available on the `Renku Community Portal <https://renku.notion.site/Renku-Community-Portal-2a154d7d30b24ab8a5968c60c2592d87>`_. 
+
+To use Renku, feel free to head to https://renkulab.io - anyone can create an account and there are free public compute resources that you can access. 
+
+Avgidea Data Search
++++++++++++++++++++
+
+Researchers can use a Google Sheets add-on to search for Dataverse installation's CSV data and then import that data into a sheet. See `Avgidea Data Search <https://www.avgidea.io/avgidea-data-platform.html>`_ for details.
+
+JupyterHub
 ++++++++++
 
-`Whole Tale <https://wholetale.org>`_  enables researchers to analyze data using popular tools including Jupyter and RStudio with the ultimate goal of supporting publishing of reproducible research packages. Users can
-`import data from Dataverse
-<https://wholetale.readthedocs.io/en/stable/users_guide/manage.html>`_ via identifier (e.g., DOI, URI, etc) or through the External Tools integration.  For installation instructions, see the :doc:`external-tools` section or the `Integration <https://wholetale.readthedocs.io/en/stable/users_guide/integration.html#dataverse-external-tools>`_ section of the Whole Tale User Guide.
+The `Dataverse-to-JupyterHub Data Transfer Connector <https://forge.inrae.fr/dipso/eosc-pillar/dataverse-jupyterhub-connector>`_ streamlines data transfer between Dataverse repositories and the cloud-based platform JupyterHub, enhancing collaborative research.
+This connector facilitates seamless two-way transfer of datasets and files, emphasizing the potential of an integrated research environment.
+It is a lightweight client-side web application built using React and relying on the Dataverse External Tool feature, allowing for easy deployment on modern integration systems. Currently, it supports small to medium-sized files, with plans to enable support for large files and signed Dataverse endpoints in the future.
 
-Discoverability
----------------
+What kind of user is the feature intended for?
+The feature is intended for researchers, scientists and data analyst who are working with Dataverse instances and JupyterHub looking to ease the data transfer process. See `presentation <https://harvard.zoom.us/rec/share/0RpoN_a7HPXF9jpBovtvxVgcaEbqrv5ZBSIKISVemdZjswGxOzbalQYpjebCbLA1.y2ZjRXYxhq8C_SU7>`_ for details.
 
-Integration with `DataCite <https://datacite.org>`_ is built in to Dataverse. When datasets are published, metadata is sent to DataCite. You can futher increase the discoverability of your datasets by setting up additional integrations.
+Rclone
+++++++
+
+`Rclone <https://rclone.org>`_ ("rsync for cloud storage") is a command-line program to sync files and directories to and from different cloud storage providers.
+
+Rclone v1.70+ supports listing and downloading files from Dataverse datasets. For details, consult the Rclone `DOI remote <https://rclone.org/doi/>`_ documentation and the `discussion <https://groups.google.com/g/dataverse-community/c/IoxF85arJhA/m/QFD6vP-bBQAJ>`_ on the Dataverse mailing list.
 
-OAI-PMH (Harvesting)
-++++++++++++++++++++
+.. _integrations-discovery:
 
-Dataverse supports a protocol called OAI-PMH that facilitates harvesting datasets from one system into another. For details on harvesting, see the :doc:`harvestserver` section.
+Discoverability
+---------------
+
+A number of builtin features related to data discovery are listed under :doc:`discoverability` but you can further increase the discoverability of your data by setting up integrations.
 
 SHARE
 +++++
 
-`SHARE <http://www.share-research.org>`_ is building a free, open, data set about research and scholarly activities across their life cycle. It's possible to add and installation of Dataverse as one of the `sources <https://share.osf.io/sources>`_ they include if you contact the SHARE team.
+`SHARE <http://www.share-research.org>`_ is building a free, open, data set about research and scholarly activities across their life cycle. It's possible to add a Dataverse installation as one of the `sources <https://share.osf.io/sources>`_ they include if you contact the SHARE team.
+
+Geodisy
++++++++
+
+`Geodisy <https://researchdata.library.ubc.ca/find/geodisy>`_ will take your Dataverse installation’s data, search for geospatial metadata and files, and copy them to a new system that allows for visual searching. Your original data and search methods are untouched; you have the benefit of both. For more information, please refer to `Geodisy's GitHub Repository. <https://github.com/ubc-library/geodisy>`_
+
+DataONE
++++++++
+
+`DataONE <https://dataone.org/>`_ is a community driven program providing access to data across multiple `member repositories <https://www.dataone.org/network/>`_, supporting enhanced search and discovery of Earth and environmental data. Membership is free and is most easily achieved by providing schema.org data via `science-on-schema.org <https://science-on-schema.org>`_ metadata markup on dataset landing pages, support for which is native in Dataverse. Dataverse installations are welcome `join the network <https://www.dataone.org/jointhenetwork/>`_ to have their datasets included.
 
 Research Data Preservation
 --------------------------
@@ -98,24 +248,33 @@ Research Data Preservation
 Archivematica
 +++++++++++++
 
-`Archivematica <https://www.archivematica.org>`_ is an integrated suite of open-source tools for processing digital objects for long-term preservation, developed and maintained by Artefactual Systems Inc. Its configurable workflow is designed to produce system-independent, standards-based Archival Information Packages (AIPs) suitable for long-term storage and management. 
+`Archivematica <https://www.archivematica.org>`_ is an integrated suite of open-source tools for processing digital objects for long-term preservation, developed and maintained by Artefactual Systems Inc. Its configurable workflow is designed to produce system-independent, standards-based Archival Information Packages (AIPs) suitable for long-term storage and management.
+
+Sponsored by the `Ontario Council of University Libraries (OCUL) <https://ocul.on.ca/>`_, this technical integration enables users of Archivematica to select datasets from connected Dataverse installations and process them for long-term access and digital preservation. For more information and list of known issues, please refer to Artefactual's `release notes <https://wiki.archivematica.org/Archivematica_1.8_and_Storage_Service_0.13_release_notes>`_, `integration documentation <https://www.archivematica.org/en/docs/archivematica-1.8/user-manual/transfer/dataverse/>`_, and the `project wiki <https://wiki.archivematica.org/Dataverse>`_.
+
+.. _rda-bagit-archiving:
+
+RDA BagIt (BagPack) Archiving
++++++++++++++++++++++++++++++
 
-Sponsored by the `Ontario Council of University Libraries (OCUL) <https://ocul.on.ca/>`_, this technical integration enables users of Archivematica to select datasets from connected Dataverse instances and process them for long-term access and digital preservation. For more information and list of known issues, please refer to Artefactual's `release notes <https://wiki.archivematica.org/Archivematica_1.8_and_Storage_Service_0.13_release_notes>`_, `integration documentation <https://www.archivematica.org/en/docs/archivematica-1.8/user-manual/transfer/dataverse/>`_, and the `project wiki <https://wiki.archivematica.org/Dataverse>`_.
+A Dataverse installation can be configured to submit a copy of published Dataset versions, packaged as `Research Data Alliance conformant <https://www.rd-alliance.org/system/files/Research%20Data%20Repository%20Interoperability%20WG%20-%20Final%20Recommendations_reviewed_0.pdf>`_ zipped `BagIt <https://tools.ietf.org/html/draft-kunze-bagit-17>`_ bags to `Chronopolis <https://libraries.ucsd.edu/chronopolis/>`_ via `DuraCloud <https://duraspace.org/duracloud/>`_, a local file system, any S3 store, or to `Google Cloud Storage <https://cloud.google.com/storage>`_.
+Submission can be automated to occur upon publication, or can be done periodically (via external scripting).
+The archival status of each Dataset version can be seen in the Dataset page version table and queried via API.
 
-DuraCloud/Chronopolis
-+++++++++++++++++++++
+The archival Bags include all of the files and metadata in a given dataset version and are sufficient to recreate the dataset, e.g. in a new Dataverse instance, or potentially in another RDA-conformant repository.
+Specifically, the archival Bags include an OAI-ORE Map serialized as JSON-LD that describe the dataset and it's files, as well as information about the version of Dataverse used to export the archival Bag.
 
-Dataverse can be configured to submit a copy of published Datasets, packaged as `Research Data Alliance conformant <https://www.rd-alliance.org/system/files/Research%20Data%20Repository%20Interoperability%20WG%20-%20Final%20Recommendations_reviewed_0.pdf>`_ zipped `BagIt <https://tools.ietf.org/html/draft-kunze-bagit-17>`_ bags to the `Chronopolis <https://libraries.ucsd.edu/chronopolis/>`_ via `DuraCloud <https://duraspace.org/duracloud/>`_
+The `DVUploader <https://github.com/GlobalDataverseCommunityConsortium/dataverse-uploader>`_ includes functionality to recreate a Dataset from an archival Bag produced by Dataverse (using the Dataverse API to do so).
 
-For details on how to configure this integration, look for "DuraCloud/Chronopolis" in the :doc:`/installation/config` section of the Installation Guide.
+For details on how to configure this integration, see :ref:`BagIt Export` in the :doc:`/installation/config` section of the Installation Guide.
 
 Future Integrations
 -------------------
 
-The `Dataverse roadmap <https://www.iq.harvard.edu/roadmap-dataverse-project>`_ is a good place to see integrations that the core Dataverse team is working on.
+The `Dataverse Project Roadmap <https://www.iq.harvard.edu/roadmap-dataverse-project>`_ is a good place to see integrations that the core Dataverse Project team is working on.
 
-The `Community Dev <https://github.com/orgs/IQSS/projects/2#column-5298405>`_ column of our project board is a good way to track integrations that are being worked on by the Dataverse community but many are not listed and if you have an idea for an integration, please ask on the `dataverse-community <https://groups.google.com/forum/#!forum/dataverse-community>`_ mailing list if someone is already working on it.
+If you have an idea for an integration, please ask on the `dataverse-community <https://groups.google.com/forum/#!forum/dataverse-community>`_ mailing list if someone is already working on it.
 
 Many integrations take the form of "external tools". See the :doc:`external-tools` section for details. External tool makers should check out the :doc:`/api/external-tools` section of the API Guide.
 
-Please help us keep this page up to date making a pull request! To get started, see the :doc:`/developers/documentation` section of the Developer Guide.
+Please help us keep this page up to date making a pull request! To get started, see the :doc:`/contributor/documentation` section of the Contributor Guide.
diff --git a/doc/sphinx-guides/source/admin/ip-groups.rst b/doc/sphinx-guides/source/admin/ip-groups.rst
index 642b19878f5..6d9f520cb4d 100644
--- a/doc/sphinx-guides/source/admin/ip-groups.rst
+++ b/doc/sphinx-guides/source/admin/ip-groups.rst
@@ -20,7 +20,7 @@ IP Groups must be expressed as ranges in IPv4 or IPv6 format. For illustrative p
 
 .. literalinclude:: ../_static/admin/ipGroupAll.json
 
-Let's say you download the example above and edit it to give it a range used by your library, giving it a filename of ``ipGroup1.json`` and putting it in the ``/tmp`` directory. Next, load it into Dataverse using the following curl command:
+Let's say you download the example above and edit it to give it a range used by your library, giving it a filename of ``ipGroup1.json`` and putting it in the ``/tmp`` directory. Next, load it into your Dataverse installation using the following curl command:
 
 ``curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/groups/ip --upload-file /tmp/ipGroup1.json``
 
diff --git a/doc/sphinx-guides/source/admin/mail-groups.rst b/doc/sphinx-guides/source/admin/mail-groups.rst
new file mode 100644
index 00000000000..cbcd09b4c7d
--- /dev/null
+++ b/doc/sphinx-guides/source/admin/mail-groups.rst
@@ -0,0 +1,106 @@
+Mail Domain Groups
+==================
+
+Groups can be defined based on the domain part of users (verified) email addresses. Email addresses that match one or more groups configuration will add the user to them.
+
+Within the scientific community, in many cases users will use a institutional email address for their account in a Dataverse installation. This might offer a simple solution for building groups of people, as the domain part can be seen as a selector for group membership.
+
+Some use cases: installations that like to avoid Shibboleth, enable self sign up, offer multi-tenancy or can't use
+:doc:`ip-groups` plus many more.
+
+.. hint:: Please be aware that non-verified mail addresses will exclude the user even if matching. This is to avoid
+          privilege escalation.
+
+.. contents:: Contents:
+	:local:
+
+Listing Mail Domain Groups
+--------------------------
+
+Mail Domain Groups can be listed with the following curl command:
+
+``curl http://localhost:8080/api/admin/groups/domain``
+
+Listing a specific Mail Domain Group
+------------------------------------
+
+Let's say you used "domainGroup1" as the alias of the Mail Domain Group you created below.
+To list just that Mail Domain Group, you can include the alias in the curl command like this:
+
+``curl http://localhost:8080/api/admin/groups/domain/domainGroup1``
+
+
+Creating a Mail Domain Group
+----------------------------
+
+Mail Domain Groups can be created with a simple JSON file such as domainGroup1.json:
+
+.. code-block:: json
+
+    {
+      "name": "Users from @example.org",
+      "alias": "exampleorg",
+      "description": "Any verified user from Example Org will be included in this group.",
+      "domains": ["example.org"]
+    }
+
+Giving a ``description`` is optional. The ``name`` will be visible in the permission UI, so be sure to pick a sensible
+value.
+
+The ``domains`` field is mandatory to be an array. This enables creation of multi-domain groups, too.
+
+Obviously you can create as many of these groups you might like, as long as the ``alias`` is unique.
+
+To load it into your Dataverse installation, either use a ``POST`` or ``PUT`` request (see below):
+
+``curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/groups/domain --upload-file domainGroup1.json``
+
+Matching with Domains or Regular Expressions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Adding simple domain names requires exact matches of user email domains and the configured domains of a group. Although you could add multiple domains to a group, those still require exact matches. 
+
+You can also use one or multiple regular expressions instead of simple domains for a group. Those should not be mixed, although it would work. Regular expressions still require exact matches, but are much more flexible and are designed to support installation-specific use cases for group management.
+
+Some hints:
+
+- Due to their excessive CPU usage, regular expressions should be used rarely.
+- Remember to properly escape "\" in your regular expression. Both Java and JSON are a bit picky about this. E.g. a character class "\d" would have to be escaped as "\\d". Plenty of tutorials on the web explain this in more detail.
+- There is no way the Dataverse Software can detect a wrong regular expression for you. Be sure to do extensive testing, as a misconfigured group could result in privilege escalation or an unexpected influx of support contacts.
+- Remember to enable the regular expression support for a group by adding ``"regex": true``!
+
+A short example for a group using regular expressions:
+
+.. code-block:: json
+
+  {
+    "name": "Users from @example.org",
+    "alias": "exampleorg-regex",
+    "description": "Any verified user from x@example.org or x@sub.example.org will be included.",
+    "regex": true,
+    "domains": ["example\\.org", "[a-z]+\\.example\\.org"]
+  }
+
+Updating a Mail Domain Group
+----------------------------
+
+Editing a group is done by replacing it. Grab your group definition like the domainGroup1.json example above,
+change it as you like and ``PUT`` it into your installation:
+
+``curl -X PUT -H 'Content-type: application/json' http://localhost:8080/api/admin/groups/domain/domainGroup1 --upload-file domainGroup1.json``
+
+Please make sure that the alias of the group you want to change is included in the path. You also need to ensure
+that this alias matches with the one given in your JSON file.
+
+.. hint:: This is an idempotent call, so it will create the group given if not present.
+
+Deleting a Mail Domain Group
+----------------------------
+
+To delete a Mail Domain Group with an alias of "domainGroup1", use the curl command below:
+
+``curl -X DELETE http://localhost:8080/api/admin/groups/domain/domainGroup1``
+
+Please note: it is not recommended to delete a Mail Domain Group that has been assigned roles. If you want to delete
+a Mail Domain Group, you should first remove its permissions.
+
diff --git a/doc/sphinx-guides/source/admin/make-data-count.rst b/doc/sphinx-guides/source/admin/make-data-count.rst
index 157b71d3e20..0103a6f9e38 100644
--- a/doc/sphinx-guides/source/admin/make-data-count.rst
+++ b/doc/sphinx-guides/source/admin/make-data-count.rst
@@ -1,7 +1,7 @@
 Make Data Count
 ===============
 
-`Make Data Count`_ is a project to collect and standardize metrics on data use, especially views, downloads, and citations. Dataverse can integrate Make Data Count to collect and display usage metrics including counts of dataset views, file downloads, and dataset citations.
+`Make Data Count`_ is a project to collect and standardize metrics on data use, especially views, downloads, and citations. The Dataverse Software can integrate Make Data Count to collect and display usage metrics including counts of dataset views, file downloads, and dataset citations.
 
 .. contents:: Contents:
 	:local:
@@ -9,27 +9,27 @@ Make Data Count
 Introduction
 ------------
 
-`Make Data Count`_ is part of a broader Research Data Alliance (RDA) `Data Usage Metrics Working Group`_ which helped to produce a specification called the `COUNTER Code of Practice for Research Data`_ (`PDF`_, `HTML`_) that Dataverse makes every effort to comply with. The Code of Practice (CoP) is built on top of existing standards such as COUNTER and SUSHI that come out of the article publishing world.  The Make Data Count project has emphasized that they would like feedback on the code of practice. You can keep up to date on the Make Data Count project by subscribing to their `newsletter`_.
+`Make Data Count`_ is part of a broader Research Data Alliance (RDA) `Data Usage Metrics Working Group`_ which helped to produce a specification called the `COUNTER Code of Practice for Research Data`_ (`PDF`_, `HTML`_) that the Dataverse Software makes every effort to comply with. The Code of Practice (CoP) is built on top of existing standards such as COUNTER and SUSHI that come out of the article publishing world.  The Make Data Count project has emphasized that they would like feedback on the code of practice. You can keep up to date on the Make Data Count project by subscribing to their `newsletter`_.
 
 Architecture
 ------------
 
 Dataverse installations who would like support for Make Data Count must install `Counter Processor`_, a Python project created by California Digital Library (CDL) which is part of the Make Data Count project and which runs the software in production as part of their `DASH`_ data sharing platform.
 
-.. _Counter Processor: https://github.com/CDLUC3/counter-processor
+.. _Counter Processor: https://github.com/gdcc/counter-processor
 .. _DASH: https://cdluc3.github.io/dash/
 
-The diagram below shows how Counter Processor interacts with Dataverse and the DataCite hub, once configured. Installations of Dataverse using Handles rather than DOIs should note the limitations in the next section of this page.
+The diagram below shows how Counter Processor interacts with your Dataverse installation and the DataCite hub, once configured. Dataverse installations using Handles rather than DOIs should note the limitations in the next section of this page.
 
 |makedatacount_components|
 
 The most important takeaways from the diagram are:
 
-- Once enabled, Dataverse will log activity (views and downloads) to a specialized date-stamped file.
-- You should run Counter Processor once a day to create reports in SUSHI (JSON) format that are saved to disk for Dataverse to process and that are sent to the DataCite hub.
-- You should set up a cron job to have Dataverse process the daily SUSHI reports, updating the Dataverse database with the latest metrics.
-- You should set up a cron job to have Dataverse pull the latest list of citations for each dataset on a periodic basis, perhaps weekly or daily. These citations come from Crossref via the DataCite hub.
-- APIs are available in Dataverse to retrieve Make Data Count metrics: views, downloads, and citations.
+- Once enabled, your Dataverse installation will log activity (views and downloads) to a specialized date-stamped file.
+- You should run Counter Processor once a day to create reports in SUSHI (JSON) format that are saved to disk for your Dataverse installation to process and that are sent to the DataCite hub.
+- You should set up a cron job to have your Dataverse installation process the daily SUSHI reports, updating the Dataverse installation database with the latest metrics.
+- You should set up a cron job to have your Dataverse installation pull the latest list of citations for each dataset on a periodic basis, perhaps weekly or daily. These citations come from Crossref via the DataCite hub.
+- APIs are available in the Dataverse Software to retrieve Make Data Count metrics: views, downloads, and citations.
 
 
 Limitations for Dataverse Installations Using Handles Rather Than DOIs
@@ -49,28 +49,31 @@ Data repositories using Handles and other identifiers are not supported by Make
 |                     | MDC citations |                  |
 +---------------------+---------------+------------------+
 
-This being said, the Dataverse usage logging can still generate logs and process those logs with Counter Processor to create json that details usage on a dataset level. Dataverse can ingest this locally generated json.
+This being said, the Dataverse Software usage logging can still generate logs and process those logs with Counter Processor to create json that details usage on a dataset level. Dataverse installations can ingest this locally generated json.
 
 When editing the ``counter-processor-config.yaml`` file mentioned below, make sure that the ``upload_to_hub`` boolean is set to ``False``.
 
-Configuring Dataverse for Make Data Count Views and Downloads
--------------------------------------------------------------
+Configuring Your Dataverse Installation for Make Data Count Views and Downloads
+-------------------------------------------------------------------------------
 
 If you haven't already, follow the steps for installing Counter Processor in the :doc:`/installation/prerequisites` section of the Installation Guide.
 
 Enable Logging for Make Data Count
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To make Dataverse log dataset usage (views and downloads) for Make Data Count, you must set the ``:MDCLogPath`` database setting. See :ref:`MDCLogPath` for details.
+To make your Dataverse installation log dataset usage (views and downloads) for Make Data Count, you must set the ``:MDCLogPath`` database setting. See :ref:`:MDCLogPath` for details.
 
-If you wish to start logging in advance of setting up other components, or wish to log without display MDC metrics for any other reason, you can set the optional ``:DisplayMDCMetrics`` database setting to false. See :ref:`DisplayMDCMetrics` for details.
+If you wish to start logging in advance of setting up other components, or wish to log without display MDC metrics for any other reason, you can set the optional ``:DisplayMDCMetrics`` database setting to false. See :ref:`:DisplayMDCMetrics` for details.
 
 After you have your first day of logs, you can process them the next day.
 
 Enable or Disable Display of Make Data Count Metrics
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-By default, when MDC logging is enabled (when ``:MDCLogPath`` is set), Dataverse will display MDC metrics instead of it's internal (legacy) metrics. You can avoid this (e.g. to collect MDC metrics for some period of time before starting to display them) by setting ``:DisplayMDCMetrics`` to false.
+By default, when MDC logging is enabled (when ``:MDCLogPath`` is set), your Dataverse installation will display MDC metrics instead of it's internal (legacy) metrics. You can avoid this (e.g. to collect MDC metrics for some period of time before starting to display them) by setting ``:DisplayMDCMetrics`` to false.
+
+The following discussion assumes ``:MDCLogPath`` has been set to ``/usr/local/payara6/glassfish/domains/domain1/logs/mdc``
+You can also decide to display MDC metrics along with Dataverse's traditional download counts from the time before MDC was enabled. To do this, set the :ref:`:MDCStartDate` to when you started MDC logging.
 
 Configure Counter Processor
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -81,9 +84,9 @@ Configure Counter Processor
 
 * Change to the directory where you installed Counter Processor.
 
-  * ``cd /usr/local/counter-processor-0.0.1``
+  * ``cd /usr/local/counter-processor-1.06``
 
-* Download :download:`counter-processor-config.yaml <../_static/admin/counter-processor-config.yaml>` to ``/usr/local/counter-processor-0.0.1``.
+* Download :download:`counter-processor-config.yaml <../_static/admin/counter-processor-config.yaml>` to ``/usr/local/counter-processor-1.06``.
 
 * Edit the config file and pay particular attention to the FIXME lines.
 
@@ -92,15 +95,15 @@ Configure Counter Processor
 Populate Views and Downloads for the First Time
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Soon we will be setting up a cron job to run nightly but we start with a single successful configuration and run of Counter Processor and calls to Dataverse APIs.
+Soon we will be setting up a cron job to run nightly but we start with a single successful configuration and manual run of Counter Processor and calls to your Dataverse installation's APIs. (The scripts discussed in the next section automate the steps described here, including creating empty log files if you're starting mid-month.) 
 
 * Change to the directory where you installed Counter Processor.
 
-  * ``cd /usr/local/counter-processor-0.0.1``
+  * ``cd /usr/local/counter-processor-1.06``
 
 * If you are running Counter Processor for the first time in the middle of a month, you will need create blank log files for the previous days. e.g.:
 
-  * ``cd /usr/local/glassfish4/glassfish/domains/domain1/logs``
+  * ``cd /usr/local/payara6/glassfish/domains/domain1/logs/mdc``
 
   * ``touch counter_2019-02-01.log``
   
@@ -110,7 +113,7 @@ Soon we will be setting up a cron job to run nightly but we start with a single
  
 * Run Counter Processor.
 
-  * ``CONFIG_FILE=counter-processor-config.yaml python36 main.py``
+  * ``CONFIG_FILE=counter-processor-config.yaml python39 main.py``
 
   * A JSON file in SUSHI format will be created in the directory you specified under "output_file" in the config file.
 
@@ -120,12 +123,14 @@ Soon we will be setting up a cron job to run nightly but we start with a single
 
 * Verify that views and downloads are available via API.
 
-  * Now that views and downloads have been recorded in the Dataverse database, you should make sure you can retrieve them from a dataset or two. Use the :ref:`Dataset Metrics <dataset-metrics-api>` endpoints in the :doc:`/api/native-api` section of the API Guide.
+  * Now that views and downloads have been recorded in the Dataverse installation's database, you should make sure you can retrieve them from a dataset or two. Use the :ref:`Dataset Metrics <dataset-metrics-api>` endpoints in the :doc:`/api/native-api` section of the API Guide.
 
 Populate Views and Downloads Nightly
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Running ``main.py`` to create the SUSHI JSON file and the subsequent calling of the Dataverse API to process it should be added as a cron job.
+Running ``main.py`` to create the SUSHI JSON file and the subsequent calling of the Dataverse Software API to process it should be added as a cron job.
+
+The Dataverse Software provides an example script that run the steps to process new accesses and uploads and update your Dataverse installation's database :download:`counter_daily.sh <../_static/util/counter_daily.sh>` The script should be configured for your environment and can be run manually or as a cron job.
 
 Sending Usage Metrics to the DataCite Hub
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -137,12 +142,14 @@ Once you are satisfied with your testing, you should contact support@datacite.or
 
 .. _MDC-updateCitationsForDataset:
 
-Configuring Dataverse for Make Data Count Citations
----------------------------------------------------
+Configuring Your Dataverse Installation for Make Data Count Citations
+---------------------------------------------------------------------
 
-Please note: as explained in the note above about limitations, this feature is not available to installations of Dataverse that use Handles.
+Please note: as explained in the note above about limitations, this feature is not available to Dataverse installations that use Handles.
 
-To configure Dataverse to pull citations from the test vs. production DataCite server see :ref:`doi.mdcbaseurlstring` in the Installation Guide.
+To configure your Dataverse installation to pull citations from the test vs.
+production DataCite server see :ref:`dataverse.pid.datacite.rest-api-url` in
+the Installation Guide.
 
 Please note that in the curl example, Bash environment variables are used with the idea that you can set a few environment variables and copy and paste the examples as is. For example, "$DOI" could become "doi:10.5072/FK2/BL2IBM" by issuing the following export command from Bash:
 
@@ -153,14 +160,15 @@ To confirm that the environment variable was set properly, you can use echo like
 ``echo $DOI``
 
 On some periodic basis (perhaps weekly) you should call the following curl command for each published dataset to update the list of citations that have been made for that dataset.
+The example :download:`counter_weekly.sh <../_static/util/counter_weekly.sh>` will do this for you. The script should be configured for your environment and can be run manually or as a cron job.
 
 ``curl -X POST "http://localhost:8080/api/admin/makeDataCount/:persistentId/updateCitationsForDataset?persistentId=$DOI"``
 
-Citations will be retrieved for each published dataset and recorded in the Dataverse database.
+Citations will be retrieved for each published dataset and recorded in the your Dataverse installation's database.
 
-For how to get the citations out of Dataverse, see "Retrieving Citations for a Dataset" under :ref:`Dataset Metrics <dataset-metrics-api>` in the :doc:`/api/native-api` section of the API Guide.
+For how to get the citations out of your Dataverse installation, see "Retrieving Citations for a Dataset" under :ref:`Dataset Metrics <dataset-metrics-api>` in the :doc:`/api/native-api` section of the API Guide.
   
-Please note that while Dataverse has a metadata field for "Related Dataset" this information is not currently sent as a citation to Crossref.
+Please note that while the Dataverse Software has a metadata field for "Related Dataset" this information is not currently sent as a citation to Crossref.
 
 Retrieving Make Data Count Metrics from the DataCite Hub
 --------------------------------------------------------
@@ -173,10 +181,10 @@ The following metrics can be downloaded directly from the DataCite hub (see http
 - Downloads for a Dataset
 - Citations for a Dataset (via Crossref)
 
-Retrieving Make Data Count Metrics from Dataverse
--------------------------------------------------
+Retrieving Make Data Count Metrics from a Dataverse Installation
+----------------------------------------------------------------
 
-The Dataverse API endpoints for retrieving Make Data Count metrics are described below under :ref:`Dataset Metrics <dataset-metrics-api>` in the :doc:`/api/native-api` section of the API Guide.
+The Dataverse Software API endpoints for retrieving Make Data Count metrics are described below under :ref:`Dataset Metrics <dataset-metrics-api>` in the :doc:`/api/native-api` section of the API Guide.
 
 Please note that it is also possible to retrieve metrics from the DataCite hub itself via https://api.datacite.org
 
diff --git a/doc/sphinx-guides/source/admin/metadatacustomization.rst b/doc/sphinx-guides/source/admin/metadatacustomization.rst
index 1a41d329b3b..3cdee6d779a 100644
--- a/doc/sphinx-guides/source/admin/metadatacustomization.rst
+++ b/doc/sphinx-guides/source/admin/metadatacustomization.rst
@@ -1,7 +1,7 @@
 Metadata Customization
 ======================
 
-Dataverse has a flexible data-driven metadata system powered by "metadata blocks" that are listed in the :doc:`/user/appendix` section of the User Guide. In this section we explain the customization options.
+The Dataverse Software has a flexible data-driven metadata system powered by "metadata blocks" that are listed in the :doc:`/user/appendix` section of the User Guide. In this section we explain the customization options.
 
 .. contents:: |toctitle|
 	:local:
@@ -9,26 +9,25 @@ Dataverse has a flexible data-driven metadata system powered by "metadata blocks
 Introduction
 ------------
 
-Before you embark on customizing metadata in Dataverse you should make sure you are aware of the modest amount of customization that is available with the Dataverse web interface. It's possible to hide fields and make field required by clicking "Edit" at the dataverse level, clicking "General Information" and making adjustments under "Metadata Fields" as described in the context of dataset templates in the :doc:`/user/dataverse-management` section of the User Guide.
+Before you embark on customizing metadata in your Dataverse installation you should make sure you are aware of the modest amount of customization that is available with your Dataverse installation's web interface. It's possible to hide fields and make fields required or conditionally required by clicking "Edit" at the Dataverse collection level, clicking "General Information" and making adjustments under "Metadata Fields" as described in the :ref:`create-dataverse` section of the Dataverse Collection Management page in the User Guide.
 
 Much more customization of metadata is possible, but this is an advanced topic so feedback on what is written below is very welcome. The possibilities for customization include:
 
 -  Editing and adding metadata fields
 
--  Editing and adding instructional text (field label tooltips and text
-   box watermarks)
+-  Editing and adding instructional text (field label tooltips and text box watermarks)
 
 -  Editing and adding controlled vocabularies
 
--  Changing which fields depositors must use in order to save datasets (see also "dataset templates" in the :doc:`/user/dataverse-management` section of the User Guide.)
+-  Changing which fields depositors must use in order to save datasets (see also :ref:`dataset-templates` section of the User Guide.)
 
 -  Changing how saved metadata values are displayed in the UI
 
-Generally speaking it is safer to create your own custom metadata block rather than editing metadata blocks that ship with Dataverse, because changes to these blocks may be made in future releases of Dataverse. If you'd like to make improvements to any of the metadata blocks shipped with Dataverse, please open an issue at https://github.com/IQSS/dataverse/issues so it can be discussed before a pull request is made. Please note that the metadata blocks shipped with Dataverse are based on standards (e.g. DDI for social science) and you can learn more about these standards in the :doc:`/user/appendix` section of the User Guide. If you have developed your own custom metadata block that you think may be of interest to the Dataverse community, please create an issue and consider making a pull request as described in the :doc:`/developers/version-control` section of the Developer Guide.
+Generally speaking it is safer to create your own custom metadata block rather than editing metadata blocks that ship with the Dataverse Software, because changes to these blocks may be made in future releases. If you'd like to make improvements to any of the metadata blocks shipped with the  Dataverse Software, please open an issue at https://github.com/IQSS/dataverse/issues so it can be discussed before a pull request is made. Please note that the metadata blocks shipped with the Dataverse Software are based on standards (e.g. DDI for social science) and you can learn more about these standards in the :doc:`/user/appendix` section of the User Guide. If you have developed your own custom metadata block that you think may be of interest to the Dataverse community, please create an issue and consider making a pull request as described in the :doc:`/developers/version-control` section of the Developer Guide.
 
-In Dataverse 4, custom metadata are no longer defined as individual
+In current versions of the Dataverse Software, custom metadata are no longer defined as individual
 fields, as they were in Dataverse Network (DVN) 3.x, but in metadata blocks.
-Dataverse 4 ships with a citation metadata block, which includes
+The Dataverse Software now ships with a citation metadata block, which includes
 mandatory fields needed for assigning persistent IDs to datasets, and
 domain specific metadata blocks. For a complete list, see the
 :doc:`/user/appendix` section of the User Guide.
@@ -38,11 +37,9 @@ tab-separated value (TSV). [1]_\ :sup:`,`\  [2]_ While it is technically
 possible to define more than one metadata block in a TSV file, it is
 good organizational practice to define only one in each file.
 
-The metadata block TSVs shipped with Dataverse are in `this folder in
-the Dataverse github
-repo <https://github.com/IQSS/dataverse/tree/develop/scripts/api/data/metadatablocks>`__ and the corresponding ResourceBundle property files are `here <https://github.com/IQSS/dataverse/tree/develop/src/main/java>`__.
-Human-readable copies are available in `this Google Sheets
-document <https://docs.google.com/spreadsheets/d/13HP-jI_cwLDHBetn9UKTREPJ_F4iHdAvhjmlvmYdSSw/edit#gid=0>`__ but they tend to get out of sync with the TSV files, which should be considered authoritative. The Dataverse installation process operates on the TSVs, not the Google spreadsheet.
+The metadata block TSVs shipped with the Dataverse Software are in `/scripts/api/data/metadatablocks
+<https://github.com/IQSS/dataverse/tree/develop/scripts/api/data/metadatablocks>`__ with the corresponding ResourceBundle property files in `/src/main/java/propertyFiles <https://github.com/IQSS/dataverse/tree/develop/src/main/java/propertyFiles>`__ of the Dataverse Software GitHub repo. Human-readable copies are available in `this Google Sheets
+document <https://docs.google.com/spreadsheets/d/13HP-jI_cwLDHBetn9UKTREPJ_F4iHdAvhjmlvmYdSSw/edit#gid=0>`__ but they tend to get out of sync with the TSV files, which should be considered authoritative. The Dataverse Software installation process operates on the TSVs, not the Google spreadsheet.
 
 About the metadata block TSV
 ----------------------------
@@ -56,7 +53,7 @@ the metadata block TSV.
 
    -  Cardinality:
 
-      -  0 or more per Dataverse
+      -  0 or more per Dataverse installation
 
       -  1 per Metadata Block definition
 
@@ -79,419 +76,347 @@ Each of the three main sections own sets of properties:
 #metadataBlock properties
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-+-----------------------+-----------------------+-----------------------+
-| **Property**          | **Purpose**           | **Allowed values and  |
-|                       |                       | restrictions**        |
-+-----------------------+-----------------------+-----------------------+
-| name                  | A user-definable      | \â€ĸ No spaces or       |
-|                       | string used to        | punctuation,          |
-|                       | identify a            | except underscore.    |
-|                       | #metadataBlock        |                       |
-|                       |                       | \â€ĸ By convention,     |
-|                       |                       | should start with     |
-|                       |                       | a letter, and use     |
-|                       |                       | lower camel           |
-|                       |                       | case [3]_             |
-|                       |                       |                       |
-|                       |                       | \â€ĸ Must not collide   |
-|                       |                       | with a field of       |
-|                       |                       | the same name in      |
-|                       |                       | the same or any       |
-|                       |                       | other                 |
-|                       |                       | #datasetField         |
-|                       |                       | definition,           |
-|                       |                       | including metadata    |
-|                       |                       | blocks defined        |
-|                       |                       | elsewhere. [4]_       |
-+-----------------------+-----------------------+-----------------------+
-| dataverseAlias        | If specified, this    | Free text. For an     |
-|                       | metadata block will   | example, see          |
-|                       | be available only to  | custom_hbgdki.tsv.    |
-|                       | the dataverse         |                       |
-|                       | designated here by    |                       |
-|                       | its alias and to      |                       |
-|                       | children of that      |                       |
-|                       | dataverse.            |                       |
-+-----------------------+-----------------------+-----------------------+
-| displayName           | Acts as a brief label | Should be relatively  |
-|                       | for display related   | brief. The limit is   |
-|                       | to this               | 256 character, but    |
-|                       | #metadataBlock.       | very long names might |
-|                       |                       | cause display         |
-|                       |                       | problems.             |
-+-----------------------+-----------------------+-----------------------+
++----------------+---------------------------------------------------------+---------------------------------------------------------+
+| **Property**   | **Purpose**                                             | **Allowed values and restrictions**                     |
++----------------+---------------------------------------------------------+---------------------------------------------------------+
+| name           | A user-definable string used to identify a              | \â€ĸ No spaces or punctuation, except underscore.         |
+|                | #metadataBlock                                          |                                                         |
+|                |                                                         | \â€ĸ By convention, should start with a letter, and use   |
+|                |                                                         | lower camel case [3]_                                   |
+|                |                                                         |                                                         |
+|                |                                                         | \â€ĸ Must not collide with a field of the same name in    |
+|                |                                                         | the same or any other #datasetField definition,         |
+|                |                                                         | including metadata blocks defined elsewhere. [4]_       |
++----------------+---------------------------------------------------------+---------------------------------------------------------+
+| dataverseAlias | If specified, this metadata block will be available     | Free text. For an example, see custom_hbgdki.tsv.       |
+|                | only to the Dataverse collection designated here by     |                                                         |
+|                | its alias and to children of that Dataverse collection. |                                                         |
++----------------+---------------------------------------------------------+---------------------------------------------------------+
+| displayName    | Acts as a brief label for display related to this       | Should be relatively brief. The limit is 256 character, |
+|                | #metadataBlock.                                         | but very long names might cause display problems.       |
++----------------+---------------------------------------------------------+---------------------------------------------------------+
+| displayFacet   | Label displayed in the search area when this            | Should be brief. Long names will cause display problems |
+|                | #metadataBlock is configured as a search facet          | in the search area.                                     |
+|                | for a collection. See                                   |                                                         |
+|                | :ref:`the API <metadata-block-facet-api>`.              |                                                         |
++----------------+---------------------------------------------------------+---------------------------------------------------------+
+| blockURI       | Associates the properties in a block with an external   | The citation #metadataBlock has the blockURI            |
+|                | URI.                                                    | https://dataverse.org/schema/citation/ which assigns a  |
+|                | Properties will be assigned the                         | default global URI to terms such as                     |
+|                | global identifier blockURI<name> in the OAI_ORE         | https://dataverse.org/schema/citation/subtitle          |
+|                | metadata and archival Bags                              |                                                         |
++----------------+---------------------------------------------------------+---------------------------------------------------------+
 
 #datasetField (field) properties
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-+-----------------------+-----------------------+------------------------+
-| **Property**          | **Purpose**           | **Allowed values and   |
-|                       |                       | restrictions**         |
-+-----------------------+-----------------------+------------------------+
-| name                  | A user-definable      | \â€ĸ (from               |
-|                       | string used to        | DatasetFieldType.java) |
-|                       | identify a            | The internal           |
-|                       | #datasetField. Maps   | DDI-like name, no      |
-|                       | directly to field     | spaces, etc.           |
-|                       | name used by Solr.    |                        |
-|                       |                       | \â€ĸ (from Solr) Field   |
-|                       |                       | names should           |
-|                       |                       | consist of             |
-|                       |                       | alphanumeric or        |
-|                       |                       | underscore             |
-|                       |                       | characters only        |
-|                       |                       | and not start with     |
-|                       |                       | a digit. This is       |
-|                       |                       | not currently          |
-|                       |                       | strictly enforced,     |
-|                       |                       | but other field        |
-|                       |                       | names will not         |
-|                       |                       | have first class       |
-|                       |                       | support from all       |
-|                       |                       | components and         |
-|                       |                       | back compatibility     |
-|                       |                       | is not guaranteed.     |
-|                       |                       | Names with both        |
-|                       |                       | leading and            |
-|                       |                       | trailing               |
-|                       |                       | underscores (e.g.      |
-|                       |                       | \_version_) are        |
-|                       |                       | reserved.              |
-|                       |                       |                        |
-|                       |                       | \â€ĸ Must not collide    |
-|                       |                       | with a field of        |
-|                       |                       | the same same name     |
-|                       |                       | in another             |
-|                       |                       | #metadataBlock         |
-|                       |                       | definition or any      |
-|                       |                       | name already           |
-|                       |                       | included as a          |
-|                       |                       | field in the Solr      |
-|                       |                       | index.                 |
-+-----------------------+-----------------------+------------------------+
-| title                 | Acts as a brief label | Should be relatively   |
-|                       | for display related   | brief.                 |
-|                       | to this               |                        |
-|                       | #datasetField.        |                        |
-+-----------------------+-----------------------+------------------------+
-| description           | Used to provide a     | Free text              |
-|                       | description of the    |                        |
-|                       | field.                |                        |
-+-----------------------+-----------------------+------------------------+
-| watermark             | A string to initially | Free text              |
-|                       | display in a field as |                        |
-|                       | a prompt for what the |                        |
-|                       | user should enter.    |                        |
-+-----------------------+-----------------------+------------------------+
-| fieldType             | Defines the type of   | | \â€ĸ none              |
-|                       | content that the      | | \â€ĸ date              |
-|                       | field, if not empty,  | | \â€ĸ email             |
-|                       | is meant to contain.  | | \â€ĸ text              |
-|                       |                       | | \â€ĸ textbox           |
-|                       |                       | | \â€ĸ url               |
-|                       |                       | | \â€ĸ int               |
-|                       |                       | | \â€ĸ float             |
-|                       |                       | | \â€ĸ See below for     |
-|                       |                       | | fieldtype definitions|
-+-----------------------+-----------------------+------------------------+
-| displayOrder          | Controls the sequence | Non-negative integer.  |
-|                       | in which the fields   |                        |
-|                       | are displayed, both   |                        |
-|                       | for input and         |                        |
-|                       | presentation.         |                        |
-+-----------------------+-----------------------+------------------------+
-| displayFormat         | Controls how the      | See below for          |
-|                       | content is displayed  | displayFormat          |
-|                       | for presentation (not | variables              |
-|                       | entry). The value of  |                        |
-|                       | this field may        |                        |
-|                       | contain one or more   |                        |
-|                       | special variables     |                        |
-|                       | (enumerated below).   |                        |
-|                       | HTML tags, likely in  |                        |
-|                       | conjunction with one  |                        |
-|                       | or more of these      |                        |
-|                       | values, may be used   |                        |
-|                       | to control the        |                        |
-|                       | display of content in |                        |
-|                       | the web UI.           |                        |
-+-----------------------+-----------------------+------------------------+
-| advancedSearchField   | Specify whether this  | TRUE (available) or    |
-|                       | field is available in | FALSE (not available)  |
-|                       | advanced search.      |                        |
-+-----------------------+-----------------------+------------------------+
-| allowControlledVocabu\| Specify whether the   | TRUE (controlled) or   |
-| \lary                 | possible values of    | FALSE (not             |
-|                       | this field are        | controlled)            |
-|                       | determined by values  |                        |
-|                       | in the                |                        |
-|                       | #controlledVocabulary |                        |
-|                       | section.              |                        |
-+-----------------------+-----------------------+------------------------+
-| allowmultiples        | Specify whether this  | TRUE (repeatable) or   |
-|                       | field is repeatable.  | FALSE (not             |
-|                       |                       | repeatable)            |
-+-----------------------+-----------------------+------------------------+
-| facetable             | Specify whether the   | TRUE (controlled) or   |
-|                       | field is facetable    | FALSE (not             |
-|                       | (i.e., if the         | controlled)            |
-|                       | expected values for   |                        |
-|                       | this field are        |                        |
-|                       | themselves useful     |                        |
-|                       | search terms for this |                        |
-|                       | field). If a field is |                        |
-|                       | "facetable" (able to  |                        |
-|                       | be faceted on), it    |                        |
-|                       | appears under         |                        |
-|                       | "Browse/Search        |                        |
-|                       | Facets" when you edit |                        |
-|                       | "General Information" |                        |
-|                       | for a dataverse.      |                        |
-|                       | Setting this value to |                        |
-|                       | TRUE generally makes  |                        |
-|                       | sense for enumerated  |                        |
-|                       | or controlled         |                        |
-|                       | vocabulary fields,    |                        |
-|                       | fields representing   |                        |
-|                       | identifiers (IDs,     |                        |
-|                       | names, email          |                        |
-|                       | addresses), and other |                        |
-|                       | fields that are       |                        |
-|                       | likely to share       |                        |
-|                       | values across         |                        |
-|                       | entries. It is less   |                        |
-|                       | likely to make sense  |                        |
-|                       | for fields containing |                        |
-|                       | descriptions,         |                        |
-|                       | floating point        |                        |
-|                       | numbers, and other    |                        |
-|                       | values that are       |                        |
-|                       | likely to be unique.  |                        |
-+-----------------------+-----------------------+------------------------+
-| displayoncreate [5]_  | Designate fields that | TRUE (display during   |
-|                       | should display during | creation) or FALSE     |
-|                       | the creation of a new | (don’t display during  |
-|                       | dataset, even before  | creation)              |
-|                       | the dataset is saved. |                        |
-|                       | Fields not so         |                        |
-|                       | designated will not   |                        |
-|                       | be displayed until    |                        |
-|                       | the dataset has been  |                        |
-|                       | saved.                |                        |
-+-----------------------+-----------------------+------------------------+
-| required              | Specify whether or    | TRUE (required) or     |
-|                       | not the field is      | FALSE (optional)       |
-|                       | required. This means  |                        |
-|                       | that at least one     |                        |
-|                       | instance of the field |                        |
-|                       | must be present. More |                        |
-|                       | than one field may be |                        |
-|                       | allowed, depending on |                        |
-|                       | the value of          |                        |
-|                       | allowmultiples.       |                        |
-+-----------------------+-----------------------+------------------------+
-| parent                | For subfields,        | \â€ĸ Must not result in  |
-|                       | specify the name of   | a cyclical             |
-|                       | the parent or         | reference.             |
-|                       | containing field.     |                        |
-|                       |                       | \â€ĸ Must reference an   |
-|                       |                       | existing field in      |
-|                       |                       | the same               |
-|                       |                       | #metadataBlock.        |
-+-----------------------+-----------------------+------------------------+
-| metadatablock_id      | Specify the name of   | \â€ĸ Must reference an   |
-|                       | the #metadataBlock    | existing               |
-|                       | that contains this    | #metadataBlock.        |
-|                       | field.                |                        |
-|                       |                       | \â€ĸ As a best           |
-|                       |                       | practice, the          |
-|                       |                       | value should           |
-|                       |                       | reference the          |
-|                       |                       | #metadataBlock in      |
-|                       |                       | the current            |
-|                       |                       | definition             |
-|                       |                       | (it is technically     |
-|                       |                       | possible to            |
-|                       |                       | reference another      |
-|                       |                       | existing metadata      |
-|                       |                       | block.)                |
-+-----------------------+-----------------------+------------------------+
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| **Property**              | **Purpose**                                            | **Allowed values and restrictions**                      |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| name                      | A user-definable string used to identify a             | \â€ĸ (from DatasetFieldType.java) The internal DDI-like    |                       |
+|                           | #datasetField. Maps directly to field name used by     | name, no spaces, etc.                                    |                       |
+|                           | Solr.                                                  |                                                          |                       |
+|                           |                                                        | \â€ĸ (from Solr) Field names should consist of             |                       |
+|                           |                                                        | alphanumeric or underscore characters only and not start |                       |
+|                           |                                                        | with a digit. This is not currently strictly enforced,   |                       |
+|                           |                                                        | but other field names will not have first class          |                       |
+|                           |                                                        | support from all components and back compatibility       |                       |
+|                           |                                                        | is not guaranteed.                                       |                       |
+|                           |                                                        | Names with both leading and trailing underscores         |                       |
+|                           |                                                        | (e.g. \_version_) are reserved.                          |                       |
+|                           |                                                        |                                                          |                       |
+|                           |                                                        | \â€ĸ Must not collide with a field of                      |                       |
+|                           |                                                        | the same same name in another #metadataBlock             |                       |
+|                           |                                                        | definition or any name already included as a             |                       |
+|                           |                                                        | field in the Solr index.                                 |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| title                     | Acts as a brief label for display                      | Should be relatively brief.                              |                       |
+|                           | related to this #datasetField.                         |                                                          |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| description               | Used to provide a description of the                   | Free text                                                |                       |
+|                           | field.                                                 |                                                          |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| watermark                 | A string to initially display in a field               | Free text                                                |                       |
+|                           | as a prompt for what the user should enter.            |                                                          |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| fieldType                 | Defines the type of content that the                   |                                                          | \â€ĸ none               |
+|                           | field, if not empty, is meant to contain.              |                                                          | \â€ĸ date               |
+|                           |                                                        |                                                          | \â€ĸ email              |
+|                           |                                                        |                                                          | \â€ĸ text               |
+|                           |                                                        |                                                          | \â€ĸ textbox            |
+|                           |                                                        |                                                          | \â€ĸ string             |
+|                           |                                                        |                                                          | \â€ĸ url                |
+|                           |                                                        |                                                          | \â€ĸ int                |
+|                           |                                                        |                                                          | \â€ĸ float              |
+|                           |                                                        |                                                          | \â€ĸ See below for      |
+|                           |                                                        |                                                          | fieldtype definitions |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| displayOrder              | Controls the sequence in which the fields              | Non-negative integer.                                    |                       |
+|                           | are displayed, both for input and                      |                                                          |                       |
+|                           | presentation.                                          |                                                          |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| displayFormat             | Controls how the content is displayed                  | See below for displayFormat                              |                       |
+|                           | for presentation (not entry). The value of             | variables                                                |                       |
+|                           | this field may contain one or more                     |                                                          |                       |
+|                           | special variables (enumerated below).                  |                                                          |                       |
+|                           | HTML tags, likely in conjunction with one              |                                                          |                       |
+|                           | or more of these values, may be used                   |                                                          |                       |
+|                           | to control the display of content in                   |                                                          |                       |
+|                           | the web UI.                                            |                                                          |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| advancedSearchField       | Specify whether this field is available in             | TRUE (available) or                                      |                       |
+|                           | advanced search.                                       | FALSE (not available)                                    |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| allowControlledVocabulary | Specify whether the possible values of                 | TRUE (controlled) or FALSE (not                          |                       |
+|                           | this field are determined by values                    | controlled)                                              |                       |
+|                           | in the #controlledVocabulary section.                  |                                                          |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| allowmultiples            | Specify whether this field is repeatable.              | TRUE (repeatable) or FALSE (not                          |                       |
+|                           |                                                        | repeatable)                                              |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| facetable                 | Specify whether the field is facetable                 | TRUE (controlled) or FALSE (not                          |                       |
+|                           | (i.e., if the expected values for                      | controlled)                                              |                       |
+|                           | this field are themselves useful                       |                                                          |                       |
+|                           | search terms for this field). If a field is            |                                                          |                       |
+|                           | "facetable" (able to be faceted on), it                |                                                          |                       |
+|                           | appears under "Browse/Search                           |                                                          |                       |
+|                           | Facets" when you edit                                  |                                                          |                       |
+|                           | "General Information" for a Dataverse                  |                                                          |                       |
+|                           | collection.                                            |                                                          |                       |
+|                           | Setting this value to TRUE generally makes             |                                                          |                       |
+|                           | sense for enumerated or controlled                     |                                                          |                       |
+|                           | vocabulary fields, fields representing                 |                                                          |                       |
+|                           | identifiers (IDs, names, email                         |                                                          |                       |
+|                           | addresses), and other fields that are                  |                                                          |                       |
+|                           | likely to share values across                          |                                                          |                       |
+|                           | entries. It is less likely to make sense               |                                                          |                       |
+|                           | for fields containing descriptions,                    |                                                          |                       |
+|                           | floating point numbers, and other                      |                                                          |                       |
+|                           | values that are likely to be unique.                   |                                                          |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| displayoncreate [5]_      | Designate fields that should display during            | TRUE (display during creation) or FALSE                  |                       |
+|                           | the creation of a new dataset, even before             | (don’t display during creation)                          |                       |
+|                           | the dataset is saved.                                  |                                                          |                       |
+|                           | Fields not so designated will not                      |                                                          |                       |
+|                           | be displayed until the dataset has been                |                                                          |                       |
+|                           | saved.                                                 |                                                          |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| required                  | For primitive fields, specify whether or not the       | For primitive fields, TRUE                               |                       |
+|                           | field is required.                                     | (required) or FALSE (optional).                          |                       |
+|                           |                                                        |                                                          |                       |
+|                           | For compound fields, also specify if one or more       | For compound fields:                                     |                       |
+|                           | subfields are required or conditionally required. At   |                                                          |                       |
+|                           | least one instance of a required field must be         | \â€ĸ To make one or more                                   |                       |
+|                           | present. More than one instance of a field may be      | subfields optional, the parent                           |                       |
+|                           | allowed, depending on the value of allowmultiples.     | field and subfield(s) must be                            |                       |
+|                           |                                                        | FALSE (optional).                                        |                       |
+|                           |                                                        |                                                          |                       |
+|                           |                                                        | \â€ĸ To make one or more subfields                         |                       |
+|                           |                                                        | required, the parent field and                           |                       |
+|                           |                                                        | the required subfield(s) must be                         |                       |
+|                           |                                                        | TRUE (required).                                         |                       |
+|                           |                                                        |                                                          |                       |
+|                           |                                                        | \â€ĸ To make one or more subfields                         |                       |
+|                           |                                                        | conditionally required, make the                         |                       |
+|                           |                                                        | parent field FALSE (optional)                            |                       |
+|                           |                                                        | and make TRUE (required) any                             |                       |
+|                           |                                                        | subfield or subfields that are                           |                       |
+|                           |                                                        | required if any other subfields                          |                       |
+|                           |                                                        | are filled.                                              |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| parent                    | For subfields, specify the name of the parent or       | \â€ĸ Must not result in a cyclical reference.              |                       |
+|                           | containing field.                                      |                                                          |                       |
+|                           |                                                        | \â€ĸ Must reference an existing field in the same          |                       |
+|                           |                                                        | #metadataBlock.                                          |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| metadatablock_id          | Specify the name of the #metadataBlock that contains   | \â€ĸ Must reference an existing #metadataBlock.            |                       |
+|                           | this field.                                            |                                                          |                       |
+|                           |                                                        | \â€ĸ As a best practice, the value should reference the    |                       |
+|                           |                                                        | #metadataBlock in the current                            |                       |
+|                           |                                                        | definition (it is technically                            |                       |
+|                           |                                                        | possible to reference another                            |                       |
+|                           |                                                        | existing metadata block.)                                |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+| termURI                   | Specify a global URI identifying this term in an       | For example, the existing citation                       |                       |
+|                           | external community vocabulary.                         | #metadataBlock defines the property                      |                       |
+|                           |                                                        | named 'title' as http://purl.org/dc/terms/title          |                       |
+|                           | This value overrides the default (created by appending | - i.e. indicating that it can                            |                       |
+|                           | the property name to the blockURI defined for the      | be interpreted as the Dublin Core term 'title'           |                       |
+|                           | #metadataBlock)                                        |                                                          |                       |
++---------------------------+--------------------------------------------------------+----------------------------------------------------------+-----------------------+
+
+.. _cvoc-props:
 
 #controlledVocabulary (enumerated) properties
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-+-----------------------+-----------------------+-----------------------+
-| **Property**          | **Purpose**           | **Allowed values and  |
-|                       |                       | restrictions**        |
-+-----------------------+-----------------------+-----------------------+
-| DatasetField          | Specifies the         | Must reference an     |
-|                       | #datasetField to which| existing              |
-|                       | this entry applies.   | #datasetField.        |
-|                       |                       | As a best practice,   |
-|                       |                       | the value should      |
-|                       |                       | reference a           |
-|                       |                       | #datasetField in the  |
-|                       |                       | current metadata      |
-|                       |                       | block definition. (It |
-|                       |                       | is technically        |
-|                       |                       | possible to reference |
-|                       |                       | an existing           |
-|                       |                       | #datasetField from    |
-|                       |                       | another metadata      |
-|                       |                       | block.)               |
-+-----------------------+-----------------------+-----------------------+
-| Value                 | A short display       | Free text             |
-|                       | string, representing  |                       |
-|                       | an enumerated value   |                       |
-|                       | for this field. If    |                       |
-|                       | the identifier        |                       |
-|                       | property is empty,    |                       |
-|                       | this value is used as |                       |
-|                       | the identifier.       |                       |
-+-----------------------+-----------------------+-----------------------+
-| identifier            | A string used to      | Free text             |
-|                       | encode the selected   |                       |
-|                       | enumerated value of a |                       |
-|                       | field. If this        |                       |
-|                       | property is empty,    |                       |
-|                       | the value of the      |                       |
-|                       | “Value” field is used |                       |
-|                       | as the identifier.    |                       |
-+-----------------------+-----------------------+-----------------------+
-| displayOrder          | Control the order in  | Non-negative integer. |
-|                       | which the enumerated  |                       |
-|                       | values are displayed  |                       |
-|                       | for selection.        |                       |
-+-----------------------+-----------------------+-----------------------+
++--------------+--------------------------------------------+-----------------------------------------+
+| **Property** | **Purpose**                                | **Allowed values and restrictions**     |
++--------------+--------------------------------------------+-----------------------------------------+
+| DatasetField | Specifies the #datasetField to which       | Must reference an existing              |
+|              | #datasetField to which this entry applies. | #datasetField.                          |
+|              |                                            | As a best practice, the value should    |
+|              |                                            | reference a #datasetField in the        |
+|              |                                            | current metadata  block definition. (It |
+|              |                                            | is technically possible to reference    |
+|              |                                            | an existing #datasetField from          |
+|              |                                            | another metadata block.)                |
++--------------+--------------------------------------------+-----------------------------------------+
+| Value        | A short display string, representing       | Free text. When defining a boolean, the |
+|              | an enumerated value for this field. If     | values "True" and "False" are           |
+|              | the identifier property is empty,          | recommended and "Unknown" can be added  |
+|              | this value is used as the identifier.      | if needed.                              |
++--------------+--------------------------------------------+-----------------------------------------+
+| identifier   | A string used to encode the selected       | Free text                               |
+|              | enumerated value of a field. If this       |                                         |
+|              | property is empty, the value of the        |                                         |
+|              | “Value” field is used as the identifier.   |                                         |
++--------------+--------------------------------------------+-----------------------------------------+
+| displayOrder | Control the order in which the enumerated  | Non-negative integer.                   |
+|              | values are displayed for selection. When   |                                         |
+|              | adding new values, you don't have to add   |                                         |
+|              | them at the end. You can renumber existing |                                         |
+|              | values to update the order in which they   |                                         |
+|              | appear.                                    |                                         |
++--------------+--------------------------------------------+-----------------------------------------+
 
 FieldType definitions
 ~~~~~~~~~~~~~~~~~~~~~
 
-+-----------------------------------+-----------------------------------+
-| **Fieldtype**                     | **Definition**                    |
-+-----------------------------------+-----------------------------------+
-| none                              | Used for compound fields, in which|
-|                                   | case the parent field would have  |
-|                                   | no value and display no data      |
-|                                   | entry control.                    |
-+-----------------------------------+-----------------------------------+
-| date                              | A date, expressed in one of three |
-|                                   | resolutions of the form           |
-|                                   | YYYY-MM-DD, YYYY-MM, or YYYY.     |
-+-----------------------------------+-----------------------------------+
-| email                             | A valid email address. Not        |
-|                                   | indexed for privacy reasons.      |
-+-----------------------------------+-----------------------------------+
-| text                              | Any text other than newlines may  |
-|                                   | be entered into this field.       |
-+-----------------------------------+-----------------------------------+
-| textbox                           | Any text may be entered. For      |
-|                                   | input, Dataverse presents a       |
-|                                   | multi-line area that accepts      |
-|                                   | newlines. While any HTML is       |
-|                                   | permitted, only a subset of HTML  |
-|                                   | tags will be rendered in the UI.  |
-|                                   | A `list of supported tags is      |
-|                                   | included in the Dataverse User    |
-|                                   | Guide <http://guides.dataverse.or |
-|                                   | g/en/latest/user/dataset-manageme |
-|                                   | nt.html#supported-html-fields>`__ |
-|                                   | .                                 |
-+-----------------------------------+-----------------------------------+
-| url                               | If not empty, field must contain  |
-|                                   | a valid URL.                      |
-+-----------------------------------+-----------------------------------+
-| int                               | An integer value destined for a   |
-|                                   | numeric field.                    |
-+-----------------------------------+-----------------------------------+
-| float                             | A floating point number destined  |
-|                                   | for a numeric field.              |
-+-----------------------------------+-----------------------------------+
++---------------+------------------------------------+
+| **Fieldtype** | **Definition**                     |
++---------------+------------------------------------+
+| none          | Used for compound fields, in which |
+|               | case the parent field would have   |
+|               | no value and display no data       |
+|               | entry control.                     |
++---------------+------------------------------------+
+| date          | A date, expressed in one of three  |
+|               | resolutions of the form            |
+|               | YYYY-MM-DD, YYYY-MM, or YYYY.      |
++---------------+------------------------------------+
+| email         | A valid email address. Not         |
+|               | indexed for privacy reasons.       |
++---------------+------------------------------------+
+| text          | Any text other than newlines may   |
+|               | be entered into this field.        |
+|               | The text fieldtype may be used to  |
+|               | define a boolean (see "Value"      |
+|               | under :ref:`cvoc-props`).          |
++---------------+------------------------------------+
+| textbox       | Any text may be entered. For       |
+|               | input, the Dataverse Software      |
+|               | presents a                         |
+|               | multi-line area that accepts       |
+|               | newlines. While any HTML is        |
+|               | permitted, only a subset of HTML   |
+|               | tags will be rendered in the UI.   |
+|               | See the                            |
+|               | :ref:`supported-html-tags`         |
+|               | section of the Dataset + File      |
+|               | Management page in the User Guide. |
++---------------+------------------------------------+
+| string        | Any text may be entered into this  |
+|               | field. The value is stored and     |
+|               | indexed exactly as provided,       |
+|               | without any text analysis or       |
+|               | transformations.                   |
++---------------+------------------------------------+
+| url           | If not empty, field must contain   |
+|               | a valid URL.                       |
++---------------+------------------------------------+
+| int           | An integer value destined for a    |
+|               | numeric field.                     |
++---------------+------------------------------------+
+| float         | A floating point number destined   |
+|               | for a numeric field.               |
++---------------+------------------------------------+
 
 displayFormat variables
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 These are common ways to use the displayFormat to control how values are displayed in the UI. This list is not exhaustive.
 
-+-----------------------------------+-----------------------------------+
-| **Variable**                      | **Description**                   |
-+-----------------------------------+-----------------------------------+
-| (blank)                           | The displayFormat is left blank   |
-|                                   | for primitive fields (e.g.        |
-|                                   | subtitle) and fields that do not  |
-|                                   | take values (e.g. author), since  |
-|                                   | displayFormats do not work for    |
-|                                   | these fields.                     |
-+-----------------------------------+-----------------------------------+
-| #VALUE                            | The value of the field (instance  |
-|                                   | level).                           |
-+-----------------------------------+-----------------------------------+
-| #NAME                             | The name of the field (class      |
-|                                   | level).                           |
-+-----------------------------------+-----------------------------------+
-| #EMAIL                            | For displaying emails.            |
-+-----------------------------------+-----------------------------------+
-| <a href="#VALUE">#VALUE</a>       | For displaying the value as a     |
-|                                   | link (if the value entered is a   |
-|                                   | link).                            |         
-+-----------------------------------+-----------------------------------+
-| <a href='URL/#VALUE'>#VALUE</a>   | For displaying the value as a     |
-|                                   | link, with the value included in  |
-|                                   | the URL (e.g. if URL is           |
-|                                   | \http://emsearch.rutgers.edu/atla\|
-|                                   | \s/#VALUE_summary.html,           |
-|                                   | and the value entered is 1001,    |
-|                                   | the field is displayed as         |
-|                                   | `1001 <http://emsearch.rutgers.ed |
-|                                   | u/atlas/1001_summary.html>`__     |
-|                                   | (hyperlinked to                   |
-|                                   | \http://emsearch.rutgers.edu/atlas|
-|                                   | /1001_summary.html)).             |
-+-----------------------------------+-----------------------------------+
-| <img src="#VALUE" alt="#NAME"     | For displaying the image of an    |
-| class="metadata-logo"/><br/>      | entered image URL (used to        |
-|                                   | display images in the producer    |
-|                                   | and distributor logos metadata    |
-|                                   | fields).                          |
-+-----------------------------------+-----------------------------------+
-| #VALUE:                           | Appends and/or prepends           |
-|                                   | characters to the value of the    |
-| \- #VALUE:                        | field. e.g. if the displayFormat  |
-|                                   | for the distributorAffiliation is |
-| (#VALUE)                          | (#VALUE) (wrapped with parens)    |
-|                                   | and the value entered             |
-|                                   | is University of North            |
-|                                   | Carolina, the field is displayed  |
-|                                   | in the UI as (University of       |
-|                                   | North Carolina).                  |
-+-----------------------------------+-----------------------------------+
-|    ;                              | Displays the character (e.g.      |
-|                                   | semicolon, comma) between the     |
-|    :                              | values of fields within           |
-|                                   | compound fields. For example,     |
-|    ,                              | if the displayFormat for the      |
-|                                   | compound field “series” is a      |
-|                                   | colon, and if the value           |
-|                                   | entered for seriesName is         |
-|                                   | IMPs and for                      |
-|                                   | seriesInformation is A            |
-|                                   | collection of NMR data, the       |
-|                                   | compound field is displayed in    |
-|                                   | the UI as IMPs: A                 |
-|                                   | collection of NMR data.           |
-+-----------------------------------+-----------------------------------+
++---------------------------------+--------------------------------------------------------+
+| **Variable**                    | **Description**                                        |
++---------------------------------+--------------------------------------------------------+
+| (blank)                         | The displayFormat is left blank                        |
+|                                 | for primitive fields (e.g.                             |
+|                                 | subtitle) and fields that do not                       |
+|                                 | take values (e.g. author), since                       |
+|                                 | displayFormats do not work for                         |
+|                                 | these fields.                                          |
++---------------------------------+--------------------------------------------------------+
+| #VALUE                          | The value of the field (instance level).               |
++---------------------------------+--------------------------------------------------------+
+| #NAME                           | The name of the field (class level).                   |
++---------------------------------+--------------------------------------------------------+
+| #EMAIL                          | For displaying emails.                                 |
++---------------------------------+--------------------------------------------------------+
+| <a href="#VALUE">#VALUE</a>     | For displaying the value as a                          |
+|                                 | link (if the value entered is a                        |
+|                                 | link).                                                 |
++---------------------------------+--------------------------------------------------------+
+| <a href='URL/#VALUE'>#VALUE</a> | For displaying the value as a                          |
+|                                 | link, with the value included in                       |
+|                                 | the URL (e.g. if URL is                                |
+|                                 | \http://emsearch.rutgers.edu/atla\                     |
+|                                 | \s/#VALUE_summary.html,                                |
+|                                 | and the value entered is 1001,                         |
+|                                 | the field is displayed as                              |
+|                                 | `1001 <http://emsearch.rutgers.ed                      |
+|                                 | u/atlas/1001_summary.html>`__                          |
+|                                 | (hyperlinked to                                        |
+|                                 | http://emsearch.rutgers.edu/atlas/1001_summary.html)). |
++---------------------------------+--------------------------------------------------------+
+| <img src="#VALUE" alt="#NAME"   | For displaying the image of an                         |
+| class="metadata-logo"/><br/>    | entered image URL (used to                             |
+|                                 | display images in the producer                         |
+|                                 | and distributor logos metadata                         |
+|                                 | fields).                                               |
++---------------------------------+--------------------------------------------------------+
+| #VALUE:                         | Appends and/or prepends                                |
+|                                 | characters to the value of the                         |
+| \- #VALUE:                      | field. e.g. if the displayFormat                       |
+|                                 | for the distributorAffiliation is                      |
+| (#VALUE)                        | (#VALUE) (wrapped with parens)                         |
+|                                 | and the value entered                                  |
+|                                 | is University of North                                 |
+|                                 | Carolina, the field is displayed                       |
+|                                 | in the UI as (University of                            |
+|                                 | North Carolina).                                       |
++---------------------------------+--------------------------------------------------------+
+| ;                               | Displays the character (e.g.                           |
+|                                 | semicolon, comma) between the                          |
+| :                               | values of fields within                                |
+|                                 | compound fields. For example,                          |
+| ,                               | if the displayFormat for the                           |
+|                                 | compound field “series” is a                           |
+|                                 | colon, and if the value                                |
+|                                 | entered for seriesName is                              |
+|                                 | IMPs and for                                           |
+|                                 | seriesInformation is A                                 |
+|                                 | collection of NMR data, the                            |
+|                                 | compound field is displayed in                         |
+|                                 | the UI as IMPs: A                                      |
+|                                 | collection of NMR data.                                |
++---------------------------------+--------------------------------------------------------+
 
 Metadata Block Setup
 --------------------
 
-Now that you understand the TSV format used for metadata blocks, the next step is to attempt to make improvements to existing metadata blocks or create entirely new metadata blocks. For either task, you should have a Dataverse environment set up for testing where you can drop the database frequently while you make edits to TSV files. Once you have tested your TSV files, you should consider making a pull request to contribute your improvement back to the community.
+Now that you understand the TSV format used for metadata blocks, the next step is to attempt to make improvements to existing metadata blocks or create entirely new metadata blocks. For either task, you should have a Dataverse Software development environment set up for testing where you can drop the database frequently while you make edits to TSV files. Once you have tested your TSV files, you should consider making a pull request to contribute your improvement back to the community.
+
+.. _exploring-metadata-blocks:
 
 Exploring Metadata Blocks
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In addition to studying the TSV files themselves you might find the following highly experimental and subject-to-change API endpoints useful to understand the metadata blocks that have already been loaded into your installation of Dataverse:
+In addition to studying the TSV files themselves you will probably find the :ref:`metadata-blocks-api` API helpful in getting a structured dump of metadata blocks in JSON format.
+
+There are also a few older, highly experimental, and subject-to-change API endpoints under the "admin" API documented below but the public API above is preferred.
 
-You can get a dump of metadata fields (yes, the output is odd, please open a issue) like this:
+You can get a dump of metadata fields like this:
 
 ``curl http://localhost:8080/api/admin/datasetfield``
 
@@ -504,39 +429,36 @@ Setting Up a Dev Environment for Testing
 
 You have several options for setting up a dev environment for testing metadata block changes:
 
-- Vagrant: See the :doc:`/developers/tools` section of the Dev Guide.
-- docker-aio: See https://github.com/IQSS/dataverse/tree/develop/conf/docker-aio
-- AWS deployment: See the :doc:`/developers/deployment` section of the Dev Guide.
-- Full dev environment: See the :doc:`/developers/dev-environment` section of the Dev Guide.
-
-To get a clean environment in Vagrant, you'll be running ``vagrant destroy``. In Docker, you'll use ``docker rm``. For a full dev environment or AWS installation, you might find ``rebuild`` and related scripts at ``scripts/deploy/phoenix.dataverse.org`` useful.
+- Docker: See :doc:`/container/running/metadata-blocks` in the Container Guide.
+- AWS deployment: See the :doc:`/developers/deployment` section of the Developer Guide.
+- Full dev environment: See the :doc:`/developers/dev-environment` section of the Developer Guide.
 
 Editing TSV files
 ~~~~~~~~~~~~~~~~~
 
-Early in Dataverse 4 development metadata blocks were edited in the Google spreadsheet mentioned above and then exported in TSV format. This worked fine when there was only one person editing the Google spreadsheet but now that contributions are coming in from all over, the TSV files are edited directly. We are somewhat painfully aware that another format such as XML might make more sense these days. Please see https://github.com/IQSS/dataverse/issues/4451 for a discussion of non-TSV formats.
+Early in Dataverse Software 4.0 development, metadata blocks were edited in the Google spreadsheet mentioned above and then exported in TSV format. This worked fine when there was only one person editing the Google spreadsheet but now that contributions are coming in from all over, the TSV files are edited directly. We are somewhat painfully aware that another format such as XML might make more sense these days. Please see https://github.com/IQSS/dataverse/issues/4451 for a discussion of non-TSV formats.
 
-Please note that metadata fields share a common namespace so they must be unique. The following curl command will print list of metadata fields already available in the system:
+Please note that metadata fields share a common namespace so they must be unique. The following curl command will print the list of metadata fields already available in the system:
 
 ``curl http://localhost:8080/api/admin/index/solr/schema``
 
 We'll use this command again below to update the Solr schema to accomodate metadata fields we've added.
 
-Loading TSV files into Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Loading TSV files into a Dataverse Installation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A number of TSV files are loaded into Dataverse on every new installation, becoming the metadata blocks you see in the UI. For the list of metadata blocks that are included with Dataverse out of the box, see the :doc:`/user/appendix` section of the User Guide.
+A number of TSV files are loaded into a newly-installed Dataverse installation, becoming the metadata blocks you see in the UI. For the list of metadata blocks that are included with the Dataverse Software out of the box, see the :doc:`/user/appendix` section of the User Guide.
 
-Along with TSV file, there are corresponding ResourceBundle property files with key=value pair `here <https://github.com/IQSS/dataverse/tree/develop/src/main/java>`__.  To add other language files, see the :doc:`/installation/config` for dataverse.lang.directory JVM Options section, and add a file, for example: "citation_lang.properties" to the path you specified for the ``dataverse.lang.directory`` JVM option, and then restart Glassfish.
+Along with TSV file, there are corresponding ResourceBundle property files with key=value pair `here <https://github.com/IQSS/dataverse/tree/develop/src/main/java/propertyFiles>`__.  To add other language files, see the :doc:`/installation/config` for dataverse.lang.directory JVM Options section, and add a file, for example: "citation_lang.properties" to the path you specified for the ``dataverse.lang.directory`` JVM option, and then restart the app server.
 
-If you are improving an existing metadata block, the Dataverse installation process will load the TSV for you, assuming you edited the TSV file in place. The TSV file for the Citation metadata block, for example, can be found at ``scripts/api/data/metadatablocks/citation.tsv``.
-If any of the below mentioned property values are changed, corresponsing ResourceBundle property file has to be edited and stored under ``dataverse.lang.directory`` location
+If you are improving an existing metadata block, the Dataverse Software installation process will load the TSV for you, assuming you edited the TSV file in place. The TSV file for the Citation metadata block, for example, can be found at ``scripts/api/data/metadatablocks/citation.tsv``.
+If any of the below mentioned property values are changed, corresponding ResourceBundle property file has to be edited and stored under ``dataverse.lang.directory`` location
 
 - name, displayName property under #metadataBlock
 - name, title, description, watermark properties under #datasetfield
 - DatasetField, Value property under #controlledVocabulary
 
-If you are creating a new custom metadata block (hopefully with the idea of contributing it back to the community if you feel like it would provide value to others), the Dataverse installation process won't know about your new TSV file so you must load it manually. The script that loads the TSV files into the system is ``scripts/api/setup-datasetfields.sh`` and contains a series of curl commands. Here's an example of the necessary curl command with the new custom metadata block in the "/tmp" directory.
+If you are creating a new custom metadata block (hopefully with the idea of contributing it back to the community if you feel like it would provide value to others), the Dataverse Software installation process won't know about your new TSV file so you must load it manually. The script that loads the TSV files into the system is ``scripts/api/setup-datasetfields.sh`` and contains a series of curl commands. Here's an example of the necessary curl command with the new custom metadata block in the "/tmp" directory.
 
 ``curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file /tmp/new-metadata-block.tsv``
 
@@ -548,12 +470,16 @@ metadatablock.name=(the value of **name** property from #metadatablock)
 
 metadatablock.displayName=(the value of **displayName** property from #metadatablock)
 
+metadatablock.displayFacet=(the value of **displayFacet** property from #metadatablock)
+
 example:
 
 metadatablock.name=citation
 
 metadatablock.displayName=Citation Metadata
 
+metadatablock.displayFacet=Citation
+
 #datasetField (field) properties
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 datasetfieldtype.(the value of **name** property from #datasetField).title=(the value of **title** property from #datasetField)
@@ -586,61 +512,183 @@ controlledvocabulary.language.marathi_(marathi)=Marathi (Mar\u0101\u1E6Dh\u012B)
 Enabling a Metadata Block
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Running a curl command like "load" example above should make the new custom metadata block available within the system but in order to start using the fields you must either enable it from the GUI (see "General Information" in the :doc:`/user/dataverse-management` section of the User Guide) or by running a curl command like the one below using a superuser API token. In the example below we are enabling the "journal" and "geospatial" metadata blocks for the root dataverse:
+Running a curl command like "load" example above should make the new custom metadata block available within the system but in order to start using the fields you must either enable it from the UI (see :ref:`general-information` section of Dataverse Collection Management in the User Guide) or by running a curl command like the one below using a superuser API token. In the example below we are enabling the "journal" and "geospatial" metadata blocks for the root Dataverse collection:
 
 ``curl -H "X-Dataverse-key:$API_TOKEN" -X POST -H "Content-type:application/json" -d "[\"journal\",\"geospatial\"]" http://localhost:8080/api/dataverses/:root/metadatablocks``
 
+.. _update-solr-schema:
+
 Updating the Solr Schema
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 Once you have enabled a new metadata block you should be able to see the new fields in the GUI but before you can save
 the dataset, you must add additional fields to your Solr schema.
 
-An API endpoint of Dataverse provides you with a generated set of all fields that need to be added to the Solr schema
-configuration, including any enabled metadata schemas:
+An API endpoint of your Dataverse installation provides you with a generated set of all fields that need to be added to
+the Solr schema configuration, including any enabled metadata schemas:
 
-``curl http://localhost:8080/api/admin/index/solr/schema``
+``curl "http://localhost:8080/api/admin/index/solr/schema"``
+
+You can use :download:`update-fields.sh <../../../../conf/solr/update-fields.sh>` to easily add these to the
+Solr schema you installed for your Dataverse installation.
+
+The script needs a target XML file containing your Solr schema. (See the :doc:`/installation/prerequisites/` section of
+the Installation Guide for a suggested location on disk for the Solr schema file.)
+
+You can either pipe the downloaded schema to the script or provide the file as an argument. (We recommended you to take
+a look at usage output of ``update-fields.sh -h``)
+
+.. code-block::
+    :caption: Example usage of ``update-fields.sh``
+
+    curl "http://localhost:8080/api/admin/index/solr/schema" | update-fields.sh /usr/local/solr/server/solr/collection1/conf/schema.xml
 
-For convenience and automation you can download and consider running :download:`updateSchemaMDB.sh <../../../../conf/solr/7.3.1/updateSchemaMDB.sh>`. It uses the API endpoint above and writes schema files to the filesystem (so be sure to run it on the Solr server itself as the Unix user who owns the Solr files) and then triggers a Solr reload.
+You will need to reload your Solr schema via an HTTP-API call, targeting your Solr instance:
 
-By default, it will download from Dataverse at `http://localhost:8080` and reload Solr at `http://localhost:8983`.
-You may use the following environment variables with this script or mix'n'match with options:
+``curl "http://localhost:8983/solr/admin/cores?action=RELOAD&core=collection1"``
 
-====================  ======  ===============================================  =========================================================
-Environment variable  Option  Description                                      Example
-====================  ======  ===============================================  =========================================================
-`DATAVERSE_URL`       `-d`    Provide the URL to your Dataverse installation   *http://localhost:8080*
-`SOLR_URL`            `-s`    Provide the URL to your Solr instance            *http://localhost:8983*
-`UNBLOCK_KEY`         `-u`    If your installation has a blocked admin API     *xyz* or */secrets/unblock.key*
-                              endpoint, you can provide either the key itself
-                              or a path to a keyfile
-`TARGET`              `-t`    Provide the config directory of your Solr core   */usr/local/solr/solr-7.3.1/server/solr/collection1/conf*
-                              "collection1"
-====================  ======  ===============================================  =========================================================
+You can easily roll your own little script to automate the process (which might involve fetching the schema bits
+from some place else than your Dataverse installation).
 
-See the :doc:`/installation/prerequisites/` section of the Installation Guide for a suggested location on disk for the Solr schema file.
+Please note that reconfigurations of your Solr index might require a re-index. Usually release notes indicate
+a necessary re-index, but for your custom metadata you will need to keep track on your own.
 
-Please note that if you are going to make a pull request updating ``conf/solr/7.3.1/schema.xml`` with fields you have added, you should first load all the custom metadata blocks in ``scripts/api/data/metadatablocks`` (including ones you don't care about) to create a complete list of fields.
+Please note also that if you are going to make a pull request updating ``conf/solr/schema.xml`` with fields you have
+added, you should first load all the custom metadata blocks in ``scripts/api/data/metadatablocks`` (including ones you
+don't care about) to create a complete list of fields. (This might change in the future.) Please see :ref:`update-solr-schema-dev` in the Developer Guide.
 
 Reloading a Metadata Block
 --------------------------
 
-As mentioned above, changes to metadata blocks that ship with Dataverse will be made over time to improve them and release notes will sometimes instruct you to reload an existing metadata block. The syntax for reloading is the same as reloading. Here's an example with the "citation" metadata block:
+As mentioned above, changes to metadata blocks that ship with the Dataverse Software will be made over time to improve them and release notes will sometimes instruct you to reload an existing metadata block. The syntax for reloading is the same as loading. Here's an example with the "citation" metadata block:
 
 ``curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file citation.tsv``
 
 Great care must be taken when reloading a metadata block. Matching is done on field names (or identifiers and then names in the case of controlled vocabulary values) so it's easy to accidentally create duplicate fields.
 
-The ability to reload metadata blocks means that SQL update scripts don't need to be written for these changes. See also the :doc:`/developers/sql-upgrade-scripts` section of the Dev Guide.
+The ability to reload metadata blocks means that SQL update scripts don't need to be written for these changes. See also the :doc:`/developers/sql-upgrade-scripts` section of the Developer Guide.
+
+.. _using-external-vocabulary-services:
+
+Using External Vocabulary Services
+----------------------------------
+
+The Dataverse software has a mechanism to associate specific fields defined in metadata blocks with a vocabulary(ies) managed by external services. The mechanism relies on trusted third-party Javascripts. The mapping from field type to external vocabulary(ies) is managed via the :ref:`:CVocConf <:CVocConf>` setting.
+
+*This functionality may require significant effort to configure and is likely to evolve in subsequent Dataverse software releases.*
+
+The effect of configuring this mechanism is similar to that of defining a field in a metadata block with 'allowControlledVocabulary=true':
+
+- Users are able to select from a controlled list of values.
+- Values can be shown in any language the term has been defined in.
+  
+In general, the external vocabulary support mechanism may be a better choice for large vocabularies, hierarchical/structured vocabularies, and/or vocabularies managed by third-parties. In addition, the external vocabulary mechanism differs from the internal controlled vocabulary mechanism in several ways that may make it a preferred option:
+
+- the machine-readable URI form of a vocabulary is stored in the Dataverse database and can be included in exported metadata files.
+- vocabulary mappings can be changed without changing the metadata block, making it possible for different Dataverse installations to use different vocabularies in the same field.
+- mappings can associate a field with more than one vocabulary.
+- mappings can be configured to also allow custom/free-text entries as well as vocabulary values.
+- mappings can be configured for compound fields and a user's selection of a given vocabulary value can be used to fill in related child fields (e.g. selection of a keyword could fill in a vocabulary name field as well).
+- removing a mapping does not affect stored values (the field would revert to allowing free text).
+ 
+The specifics of the user interface for entering/selecting a vocabulary term and how that term is then displayed are managed by third-party Javascripts. The initial Javascripts that have been created provide auto-completion, displaying a list of choices that match what the user has typed so far, but other interfaces, such as displaying a tree of options for a hierarchical vocabulary, are possible. 
+Similarly, existing scripts do relatively simple things for displaying a term - showing the term's name in the appropriate language and providing a link to an external URL with more information, but more sophisticated displays are possible.
+
+Scripts supporting use of vocabularies from services supporting the SKOSMOS protocol (see https://skosmos.org), retrieving ORCIDs (from https://orcid.org), services based on Ontoportal product (see https://ontoportal.org/), and using ROR (https://ror.org/) are available https://github.com/gdcc/dataverse-external-vocab-support. (Custom scripts can also be used and community members are encouraged to share new scripts through the dataverse-external-vocab-support repository.)
+
+Configuration involves specifying which fields are to be mapped, to which Solr field they should be indexed, whether free-text entries are allowed, which vocabulary(ies) should be used, what languages those vocabulary(ies) are available in, and several service protocol and service instance specific parameters, including the ability to send HTTP headers on calls to the service.
+These are all defined in the :ref:`:CVocConf <:CVocConf>` setting as a JSON array. Details about the required elements as well as example JSON arrays are available at https://github.com/gdcc/dataverse-external-vocab-support, along with an example metadata block that can be used for testing.
+The scripts required can be hosted locally or retrieved dynamically from https://gdcc.github.io/ (similar to how dataverse-previewers work).
+
+Since external vocabulary scripts can change how fields are indexed (storing an identifier and name and/or values in different languages),
+updating the Solr schema as described in :ref:`update-solr-schema` should be done after adding new scripts to your configuration.
+
+Please note that in addition to the :ref:`:CVocConf` described above, an alternative is the :ref:`:ControlledVocabularyCustomJavaScript` setting.
+
+Protecting MetadataBlocks
+-------------------------
+
+Dataverse can be configured to only allow entries for a metadata block to be changed (created, edited, deleted) by entities that know a defined secret key. 
+Metadata blocks protected by such a key are referred to as "System" metadata blocks. 
+A primary use case for system metadata blocks is to handle metadata created by third-party tools interacting with Dataverse where unintended changes to the metadata could cause a failure. Examples might include archiving systems or workflow engines.
+To protect an existing metadatablock, one must set a key (recommended to be long and un-guessable) for that block:
+
+dataverse.metadata.block-system-metadata-keys.<block name>=<key value>
+
+This can be done using system properties (see :ref:`jvm-options`), environment variables or other MicroProfile Config mechanisms supported by the app server.
+   `See Payara docs for supported sources <https://docs.payara.fish/community/docs/documentation/microprofile/config/README.html#config-sources>`_. Note that a Payara restart may be required to enable the new option.
+
+For these secret keys, Payara password aliases are recommended.
+
+   Alias creation example using the codemeta metadata block (actual name: codeMeta20):
+
+   .. code-block:: shell
+
+      echo "AS_ADMIN_ALIASPASSWORD=1234ChangeMeToSomethingLong" > /tmp/key.txt
+      asadmin create-password-alias --passwordfile /tmp/key.txt dataverse.metadata.block-system-metadata-keys.codeMeta20
+      rm /tmp/key.txt
+      
+   Alias deletion example for the codemeta metadata block (removes protected status)
+   
+   .. code-block:: shell
+
+      asadmin delete-password-alias dataverse.metadata.block-system-metadata-keys.codeMeta20
+
+A Payara restart is required after these example commands.
+
+When protected via a key, a metadata block will not be shown in the user interface when a dataset is being created or when metadata is being edited. Entries in such a system metadata block will be shown to users, consistent with Dataverse's design in which all metadata in published datasets is publicly visible.
+
+Note that protecting a block with required fields, or using a template with an entry in a protected block, will make it impossible to create a new dataset via the user interface. Also note that for this reason protecting the citation metadatablock is not recommended. (Creating a dataset also automatically sets the date of deposit field in the citation block, which would be prohibited if the citation block is protected.) 
+
+To remove proted status and return a block to working normally, remove the associated key.
+
+To add metadata to a system metadata block via API, one must include an additional key of the form 
+
+mdkey.<blockName>=<key value>
+
+as an HTTP Header or query parameter (case sensitive) for each system metadata block to any API call in which metadata values are changed in that block. Multiple keys are allowed if more than one system metadatablock is being changed in a given API call.
+
+For example, following the :ref:`Add Dataset Metadata <add-semantic-metadata>` example from the :doc:`/developers/dataset-semantic-metadata-api`:
+
+.. code-block:: bash
+
+  curl -X PUT -H X-Dataverse-key:$API_TOKEN -H 'Content-Type: application/ld+json' -H 'mdkey.codeMeta20:1234ChangeMeToSomethingLong' -d '{"codeVersion": "1.0.0", "@context":{"codeVersion": "https://schema.org/softwareVersion"}}' "$SERVER_URL/api/datasets/$DATASET_ID/metadata"
+  
+  curl -X PUT -H X-Dataverse-key:$API_TOKEN -H 'Content-Type: application/ld+json' -d '{"codeVersion": "1.0.1", "@context":{"codeVersion": "https://schema.org/softwareVersion"}}' "$SERVER_URL/api/datasets/$DATASET_ID/metadata?mdkey.codeMeta20=1234ChangeMeToSomethingLong&replace=true"
+    
 
 Tips from the Dataverse Community
 ---------------------------------
 
+When creating new metadata blocks, please review the :doc:`/style/text` section of the Style Guide, which includes guidance about naming metadata fields and writing text for metadata tooltips and watermarks.
+
 If there are tips that you feel are omitted from this document, please open an issue at https://github.com/IQSS/dataverse/issues and consider making a pull request to make improvements. You can find this document at https://github.com/IQSS/dataverse/blob/develop/doc/sphinx-guides/source/admin/metadatacustomization.rst
 
-Alternatively, you are welcome to request "edit" access to this "Tips for Dataverse metadata blocks from the community" Google doc: https://docs.google.com/document/d/1XpblRw0v0SvV-Bq6njlN96WyHJ7tqG0WWejqBdl7hE0/edit?usp=sharing
+Alternatively, you are welcome to request "edit" access to this "Tips for Dataverse Software metadata blocks from the community" Google doc: https://docs.google.com/document/d/1XpblRw0v0SvV-Bq6njlN96WyHJ7tqG0WWejqBdl7hE0/edit?usp=sharing
+
+The thinking is that the tips can become issues and the issues can eventually be worked on as features to improve the Dataverse Software metadata system.
+
+Development Tasks Specific to Changing Fields in Core Metadata Blocks
+---------------------------------------------------------------------
+
+When it comes to the fields from the core blocks that are distributed with Dataverse (such as Citation, Social Science and Geospatial blocks), code dependencies may exist in Dataverse, primarily in the Import and Export subsystems, on these fields being configured a certain way. So, if it becomes necessary to modify one of such core fields, code changes may be necessary to accompany the change in the block tsv, plus some sample and test files maintained in the Dataverse source tree will need to be adjusted accordingly. 
+
+Making a Field Multi-Valued
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+As a recent real life example, a few fields from the Citation and Social Science block were changed to support multiple values, in order to accommodate specific needs of some community member institutions. A PR for one of these fields, ``alternativeTitle`` from the Citation block is linked below. Each time a number of code changes, plus some changes in the sample metadata files in the Dataverse code tree had to be made. The checklist below is to help another developer in the event that a similar change becomes necessary in the future. Note that some of the steps below may not apply 1:1 to a different metadata field, depending on how it is exported and imported in various formats by Dataverse. It may help to consult the PR `#9440 <https://github.com/IQSS/dataverse/pull/9440/files>`_ as a specific example of the changes that had to be made for the ``alternativeTitle`` field. 
+
+- Change the value from ``FALSE`` to ``TRUE`` in the ``allowmultiples`` column of the .tsv file for the block.
+- Change the value of the ``multiValued`` attribute for the search field in the Solr schema (``conf/solr/x.x.x/schema.xml``).
+- Modify the DDI import code (``ImportDDIServiceBean.java``) to support multiple values. (You may be able to use the change in the PR above as a model.)
+- Modify the DDI export utility (``DdiExportUtil.java``).
+- Modify the OpenAire export utility (``OpenAireExportUtil.java``).
+- Modify the following JSON source files in the Dataverse code tree to actually include multiple values for the field (two should be quite enough!): ``scripts/api/data/dataset-create-new-all-default-fields.json``, ``src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt``, ``src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json`` and ``src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-create-new-all-ddi-fields.json``. (These are used as examples for populating datasets via the import API and by the automated import and export code tests).
+- Similarly modify the following XML files that are used by the DDI export code tests: ``src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.xml`` and ``src/test/java/edu/harvard/iq/dataverse/export/ddi/exportfull.xml``.
+- Make sure all the automated unit and integration tests are passing. See :doc:`/developers/testing` in the Developer Guide.
+- Write a short release note to announce the change in the upcoming release. See :ref:`writing-release-note-snippets` in the Developer Guide.
+- Make a pull request. 
 
-The thinking is that the tips can become issues and the issues can eventually be worked on as features to improve the Dataverse metadata system.
 
 Footnotes
 ---------
@@ -660,7 +708,7 @@ Footnotes
    duplicated. See "Editing TSV files" for how to check for duplication.
 
 .. [5]
-   "displayoncreate" was "showabovefold" in Dataverse versions before 4.3.1 (see
+   "displayoncreate" was "showabovefold" in Dataverse Software ``<=4.3.1`` (see
    `#3073 <https://github.com/IQSS/dataverse/issues/3073>`__) but parsing is
    done based on column order rather than name so this only matters to the
    person reading the TSV file.
diff --git a/doc/sphinx-guides/source/admin/metadataexport.rst b/doc/sphinx-guides/source/admin/metadataexport.rst
index 1d1deb37a2f..97baf3e0c8e 100644
--- a/doc/sphinx-guides/source/admin/metadataexport.rst
+++ b/doc/sphinx-guides/source/admin/metadataexport.rst
@@ -9,33 +9,61 @@ Automatic Exports
 
 Publishing a dataset automatically starts a metadata export job, that will run in the background, asynchronously. Once completed, it will make the dataset metadata exported and cached in all the supported formats listed under :ref:`Supported Metadata Export Formats <metadata-export-formats>` in the :doc:`/user/dataset-management` section of the User Guide.
 
-A scheduled timer job that runs nightly will attempt to export any published datasets that for whatever reason haven't been exported yet. This timer is activated automatically on the deployment, or restart, of the application. So, again, no need to start or configure it manually. (See the "Application Timers" section of this guide for more information)
+A scheduled timer job that runs nightly will attempt to export any published datasets that for whatever reason haven't been exported yet. This timer is activated automatically on the deployment, or restart, of the application. So, again, no need to start or configure it manually. (See the :doc:`timers` section of this Admin Guide for more information.)
 
-Batch exports through the API 
+.. _batch-exports-through-the-api:
+
+Batch Exports Through the API
 -----------------------------
 
-In addition to the automated exports, a Dataverse admin can start a batch job through the API. The following 2 API calls are provided: 
+In addition to the automated exports, a Dataverse installation admin can start a batch job through the API. The following four API calls are provided: 
 
 ``curl http://localhost:8080/api/admin/metadata/exportAll``
 
 ``curl http://localhost:8080/api/admin/metadata/reExportAll``
 
-The former will attempt to export all the published, local (non-harvested) datasets that haven't been exported yet. 
-The latter will *force* a re-export of every published, local dataset, regardless of whether it has already been exported or not. 
+``curl http://localhost:8080/api/admin/metadata/clearExportTimestamps``
+
+``curl http://localhost:8080/api/admin/metadata/:persistentId/reExportDataset?persistentId=doi:10.5072/FK2/AAA000``
+
+The first will attempt to export all the published, local (non-harvested) datasets that haven't been exported yet. 
+The second will *force* a re-export of every published, local dataset, regardless of whether it has already been exported or not. 
+
+The first two calls return a status message informing the administrator that the process has been launched (``{"status":"WORKFLOW_IN_PROGRESS"}``). The administrator can check the progress of the process via log files: ``[Payara directory]/glassfish/domains/domain1/logs/export_[time stamp].log``.
+
+Instead of running "reExportAll" the same can be accomplished using "clearExportTimestamps" followed by "exportAll".
+The difference is that when exporting prematurely fails due to some problem, the datasets that did not get exported yet still have the timestamps cleared. A next call to exportAll will skip the datasets already exported and try to export the ones that still need it. 
+Calling clearExportTimestamps should return ``{"status":"OK","data":{"message":"cleared: X"}}`` where "X" is the total number of datasets cleared.
+
+The reExportDataset call gives you the opportunity to *force* a re-export of only a specific dataset and (with some script automation) could allow you the export specific batches of datasets. This might be usefull when handling exporting problems or when reExportAll takes too much time and is overkill. Note that :ref:`export-dataset-metadata-api` is a related API.
+
+reExportDataset can be called with either ``persistentId`` (as shown above, with a DOI) or with the database id of a dataset (as shown below, with "42" as the database id).
+
+``curl http://localhost:8080/api/admin/metadata/42/reExportDataset``
 
 Note, that creating, modifying, or re-exporting an OAI set will also attempt to export all the unexported datasets found in the set.
 
 Export Failures
 ---------------
 
-An export batch job, whether started via the API, or by the application timer, will leave a detailed log in your configured logs directory. This is the same location where your main Glassfish server.log is found. The name of the log file is ``export_[timestamp].log`` - for example, *export_2016-08-23T03-35-23.log*. The log will contain the numbers of datasets processed successfully and those for which metadata export failed, with some information on the failures detected. Please attach this log file if you need to contact Dataverse support about metadata export problems.
+An export batch job, whether started via the API, or by the application timer, will leave a detailed log in your configured logs directory. This is the same location where your main app server logs are found. The name of the log file is ``export_[timestamp].log`` - for example, *export_2016-08-23T03-35-23.log*. The log will contain the numbers of datasets processed successfully and those for which metadata export failed, with some information on the failures detected. Please attach this log file if you need to contact Dataverse Project support about metadata export problems.
 
 Downloading Metadata via GUI
 ----------------------------
 
-The :doc:`/user/dataset-management` section of the User Guide explains how end users can download the metadata formats above from the Dataverse GUI.
+The :doc:`/user/dataset-management` section of the User Guide explains how end users can download the metadata formats above from your Dataverse installation's GUI.
 
 Downloading Metadata via API
 ----------------------------
 
 The :doc:`/api/native-api` section of the API Guide explains how end users can download the metadata formats above via API.
+
+Exporter Configuration
+----------------------
+
+Two exporters - Schema.org JSONLD and OpenAire - use an algorithm to determine whether an author, or contact, name belongs to a person or organization. While the algorithm works well, there are cases in which it makes mistakes, usually inferring that an organization is a person.
+
+The Dataverse software implements two jvm-options that can be used to tune the algorithm:
+
+- :ref:`dataverse.person-or-org.assume-comma-in-person-name` - boolean, default false. If true, Dataverse will assume any name without a comma must be an organization. This may be most useful for curated Dataverse instances that enforce the "family name, given name" convention.
+- :ref:`dataverse.person-or-org.org-phrase-array` - a JsonArray of strings. Any name that contains one of the strings is assumed to be an organization. For example, "Project" is a word that is not otherwise associated with being an organization. 
diff --git a/doc/sphinx-guides/source/admin/monitoring.rst b/doc/sphinx-guides/source/admin/monitoring.rst
index 84d6f31e6d7..16bb18b7ad2 100644
--- a/doc/sphinx-guides/source/admin/monitoring.rst
+++ b/doc/sphinx-guides/source/admin/monitoring.rst
@@ -1,7 +1,7 @@
 Monitoring
 ===========
 
-Once you're in production, you'll want to set up some monitoring. This page may serve as a starting point for you but you are encouraged to share your ideas with the Dataverse community!
+Once you're in production, you'll want to set up some monitoring. This page may serve as a starting point for you but you are encouraged to share your ideas with the Dataverse community! You may also be interested in the :doc:`/developers/performance` section of the Developer Guide.
 
 .. contents:: Contents:
 	:local:
@@ -14,7 +14,7 @@ In production you'll want to monitor the usual suspects such as CPU, memory, fre
 Munin
 +++++
 
-http://munin-monitoring.org says, "A default installation provides a lot of graphs with almost no work." From RHEL or CentOS 7, you can try the following steps.
+https://munin-monitoring.org says, "A default installation provides a lot of graphs with almost no work." From RHEL or CentOS 7, you can try the following steps.
 
 Enable the EPEL yum repo (if you haven't already):
 
@@ -36,7 +36,7 @@ Create a username/password (i.e. "admin" for both):
 
 ``htpasswd /etc/munin/munin-htpasswd admin``
 
-Assuming you are fronting Glassfish with Apache, prevent Apache from proxying "/munin" traffic to Glassfish by adding the following line to your Apache config:
+Assuming you are fronting your app server with Apache, prevent Apache from proxying "/munin" traffic to the app server by adding the following line to your Apache config:
 
 ``ProxyPassMatch ^/munin !``
 
@@ -88,14 +88,14 @@ Process the logs:
 
 ``/usr/share/awstats/tools/awstats_updateall.pl now``
 
-Please note that load balancers (such as Amazon's ELB) might interfer with the ``LogFormat`` mentioned above.  To start troubleshooting errors such as ``AWStats did not find any valid log lines that match your LogFormat parameter``, you might need to bump up the value of ``NbOfLinesForCorruptedLog`` in the config files above and re-try while you interate on your Apache and AWStats config.
+Please note that load balancers (such as Amazon's ELB) might interfere with the ``LogFormat`` mentioned above.  To start troubleshooting errors such as ``AWStats did not find any valid log lines that match your LogFormat parameter``, you might need to bump up the value of ``NbOfLinesForCorruptedLog`` in the config files above and re-try while you interate on your Apache and AWStats config.
 
-Please note that the Dataverse team has attempted to parse Glassfish logs using AWStats but it didn't seem to just work and posts have been made at https://stackoverflow.com/questions/49134154/what-logformat-definition-does-awstats-require-to-parse-glassfish-http-access-logs and https://sourceforge.net/p/awstats/discussion/43428/thread/9b1befda/ that can be followed up on some day.
+Please note that the Dataverse Project team has attempted to parse Glassfish/Payara logs using AWStats but it didn't seem to just work and posts have been made at https://stackoverflow.com/questions/49134154/what-logformat-definition-does-awstats-require-to-parse-glassfish-http-access-logs and https://sourceforge.net/p/awstats/discussion/43428/thread/9b1befda/ that can be followed up on some day.
 
-Database Connection Pool used by Glassfish
-------------------------------------------
+Database Connection Pool Used by App Server
+-------------------------------------------
 
-https://github.com/IQSS/dataverse/issues/2595 contains some information on enabling monitoring of Glassfish, which is disabled by default. It's a TODO to document what to do here if there is sufficient interest.
+https://github.com/IQSS/dataverse/issues/2595 contains some information on enabling monitoring of app servers, which is disabled by default. It's a TODO to document what to do here if there is sufficient interest.
 
 
 actionlogrecord
@@ -103,6 +103,13 @@ actionlogrecord
 
 There is a database table called ``actionlogrecord`` that captures events that may be of interest. See https://github.com/IQSS/dataverse/issues/2729 for more discussion around this table.
 
+An Important Note about ActionLogRecord Table:
+++++++++++++++++++++++++++++++++++++++++++++++
+
+Please note that in a busy production installation this table will be growing constantly. See the note on :ref:`How to Keep ActionLogRecord in Trim <actionlogrecord-trimming>` in the Troubleshooting section of the guide.
+
+.. _edit-draft-versions-logging:
+
 Edit Draft Versions Logging
 ---------------------------
 
@@ -111,7 +118,7 @@ Changes made to draft versions of datasets are logged in a folder called logs/ed
 Solr Indexing Failures Logging
 ------------------------------
 
-Failures occurring during the indexing of dataverses and datasets are logged in a folder called logs/process-failures. This logging will include instructions for manually re-running the failed processes. It may be advantageous to set up a automatic job to monitor new entries into this log folder so that indexes could be re-run.
+Failures occurring during the indexing of Dataverse collections and datasets are logged in a folder called logs/process-failures. This logging will include instructions for manually re-running the failed processes. It may be advantageous to set up a automatic job to monitor new entries into this log folder so that indexes could be re-run.
 
 EJB Timers
 ----------
@@ -119,3 +126,35 @@ EJB Timers
 Should you be interested in monitoring the EJB timers, this script may be used as an example:
 
 .. literalinclude:: ../_static/util/check_timer.bash
+
+AWS RDS
+-------
+
+Some installations of Dataverse use AWS's "database as a service" offering called RDS (Relational Database Service) so it's worth mentioning some monitoring tips here.
+
+There are two documents that are especially worth reviewing:
+
+- `Monitoring an Amazon RDS DB instance <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Monitoring.html>`_: The official documentation.
+- `Performance Monitoring Workshop for RDS PostgreSQL and Aurora PostgreSQL <https://rdspg-monitoring.workshop.aws/en/intro.html>`_: A workshop that steps through practical examples and even includes labs featuring tools to generate load.
+
+Tips:
+
+- Enable **Performance Insights**. The `product page <https://aws.amazon.com/rds/performance-insights/>`_ includes a `video from 2017 <https://youtu.be/4462hcfkApM>`_ that is still compelling today. For example, the `Top SQL <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.UsingDashboard.Components.AvgActiveSessions.TopLoadItemsTable.TopSQL.html>`_ tab shows the SQL queries that are contributing the most to database load. There's also a `video from 2018 <https://www.youtube.com/watch?v=yOeWcPBT458>`_ mentioned in the `overview <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.Overview.html>`_ that's worth watching.
+
+  - Note that Performance Insights is only available for `PostgreSQL 10 and higher <https://aws.amazon.com/about-aws/whats-new/2018/04/rds-performance-insights-on-rds-for-postgresql/>`_ (also mentioned `in docs <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.Overview.Engines.html>`_). Version 11 has digest statistics enabled automatically but there's an `extra step <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.UsingDashboard.AnalyzeDBLoad.AdditionalMetrics.PostgreSQL.html#USER_PerfInsights.UsingDashboard.AnalyzeDBLoad.AdditionalMetrics.PostgreSQL.digest>`_ for version 10.
+  - `Performance Insights policies <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.access-control.html>`_ describes how to give access to Performance Insights to someone who doesn't have full access to RDS (``AmazonRDSFullAccess``).
+
+- Enable the **slow query log** and consider using pgbadger to analyze the log files. Set ``log_min_duration_statement`` to "5000", for example, to log all queries that take 5 seconds or more. See `enable query logging <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.Concepts.PostgreSQL.html#USER_LogAccess.Concepts.PostgreSQL.Query_Logging>`_ in the user guide or `slides <https://rdspg-monitoring.workshop.aws/en/postgresql-logs/enable-slow-query-log.html>`_ from the workshop for details. Using pgbadger is also mentioned as a `common DBA task <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Appendix.PostgreSQL.CommonDBATasks.html#Appendix.PostgreSQL.CommonDBATasks.Badger>`_.
+- Use **CloudWatch**. CloudWatch gathers metrics about CPU utilization from the hypervisor for a DB instance. It's a separate service to log into so access can be granted more freely than to RDS. See `CloudWatch docs <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/monitoring-cloudwatch.html>`_.
+- Use **Enhanced Monitoring**. Enhanced Monitoring gathers its metrics from an agent on the instance. See `Enhanced Monitoring docs <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html>`_.
+- It's possible to view and act on **RDS Events** such as snapshots, parameter changes, etc. See `Working with Amazon RDS events <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.access-control.html>`_ for details.
+- RDS monitoring is available via API and the ``aws`` command line tool. For example, see `Retrieving metrics with the Performance Insights API <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.API.html>`_.
+- To play with monitoring RDS using a server configured by `dataverse-ansible <https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible>`_ set ``use_rds`` to true to skip some steps that aren't necessary when using RDS. See also the :doc:`/developers/deployment` section of the Developer Guide.
+
+MicroProfile Metrics endpoint
+-----------------------------
+
+Payara provides the metrics endpoint: <https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Metrics/Metrics%20Rest%20Endpoint.html>_
+The metrics you can retrieve that way:
+- `index_permit_wait_time_seconds_mean` displays how long does it take to receive a permit to index a dataset.
+- `index_time_seconds` displays how long does it take to index a dataset.
diff --git a/doc/sphinx-guides/source/admin/rate-limiting.rst b/doc/sphinx-guides/source/admin/rate-limiting.rst
new file mode 100644
index 00000000000..ce7eb254306
--- /dev/null
+++ b/doc/sphinx-guides/source/admin/rate-limiting.rst
@@ -0,0 +1,47 @@
+Rate Limiting
+=============
+
+.. contents:: Contents:
+	:local:
+
+Configuration
+-------------
+
+Rate limiting is used to prevent users from over taxing the system either deliberately or by runaway automated processes.
+Rate limiting can be configured on a tier level with tier 0 being reserved for guest users and tiers 1-any for authenticated users. New users are defaulted to tier 1.
+Superuser accounts are exempt from rate limiting.
+Rate limits can be imposed on command APIs by configuring the tier, the command, and the hourly limit in the database.
+Two database settings configure the rate limiting.
+Note: If either of these settings exist in the database rate limiting will be enabled (note that a Payara restart is required for the :RateLimitingDefaultCapacityTiers setting to take effect). If neither setting exists rate limiting is disabled.
+
+- :RateLimitingDefaultCapacityTiers is the number of calls allowed per hour if the specific command is not configured. The values represent the number of calls per hour per user for tiers 0,1,...
+  A value of -1 can be used to signify no rate limit. Tiers not specified in this setting will default to `-1` (No Limit). I.e., -d "10000" is equivalent to -d "10000,-1,-1,..."
+
+.. code-block:: bash
+
+  curl http://localhost:8080/api/admin/settings/:RateLimitingDefaultCapacityTiers -X PUT -d '10000,20000'
+
+- :RateLimitingCapacityByTierAndAction is a JSON object specifying the rate by tier and a list of actions (commands). This allows for more control over the rate limit of individual API command calls.
+  In the following example, calls made by a guest user (tier 0) for API GetLatestPublishedDatasetVersionCommand is further limited to only 10 calls per hour, while an authenticated user (tier 1) will be able to make 30 calls per hour to the same API.
+
+:download:`rate-limit-actions.json </_static/installation/files/examples/rate-limit-actions-setting.json>`  Example JSON for RateLimitingCapacityByTierAndAction
+
+.. code-block:: bash
+
+  curl http://localhost:8080/api/admin/settings/:RateLimitingCapacityByTierAndAction -X PUT -d '[{"tier": 0, "limitPerHour": 10, "actions": ["GetLatestPublishedDatasetVersionCommand", "GetPrivateUrlCommand", "GetDatasetCommand", "GetLatestAccessibleDatasetVersionCommand"]}, {"tier": 0, "limitPerHour": 1, "actions": ["CreateGuestbookResponseCommand", "UpdateDatasetVersionCommand", "DestroyDatasetCommand", "DeleteDataFileCommand", "FinalizeDatasetPublicationCommand", "PublishDatasetCommand"]}, {"tier": 1, "limitPerHour": 30, "actions": ["CreateGuestbookResponseCommand", "GetLatestPublishedDatasetVersionCommand", "GetPrivateUrlCommand", "GetDatasetCommand", "GetLatestAccessibleDatasetVersionCommand", "UpdateDatasetVersionCommand", "DestroyDatasetCommand", "DeleteDataFileCommand", "FinalizeDatasetPublicationCommand", "PublishDatasetCommand"]}]'
+
+Statistics
+----------
+
+In order to monitor the rate limiting cache for investigative purposes there is a stats endpoint which returns CSV formatted text.
+
+The CSV contains multiple lists.
+
+- The first list contains the username:command, and number of tokens remaining. This list is sorted by the values and has the header "#<username>:<command>, <available tokens>".
+
+- The second list contains username:command, last updated timestamp in minutes, and delta minutes before now. The header for this list is "#<username>:<command>, <timestamp>, <delta minutes> ## deltaMinutesFilter=1". This list can be filtered to show only the entries with updates within the deltaMinutesFilter requested. ("## deltaMinutesFilter=n" will be added to the header when the filter is included in the call.
+
+.. code-block:: bash
+
+  curl http://localhost:8080/api/admin/rateLimitStats
+  curl http://localhost:8080/api/admin/rateLimitStats?deltaMinutesFilter=10
diff --git a/doc/sphinx-guides/source/admin/reporting-tools-and-queries.rst b/doc/sphinx-guides/source/admin/reporting-tools-and-queries.rst
new file mode 100644
index 00000000000..722586f8ae3
--- /dev/null
+++ b/doc/sphinx-guides/source/admin/reporting-tools-and-queries.rst
@@ -0,0 +1,23 @@
+.. role:: fixedwidthplain
+
+Reporting Tools and Common Queries
+==================================
+
+Reporting tools and queries created by members of the Dataverse community. 
+
+.. contents:: Contents:
+	:local:
+  
+* Matrix (<https://github.com/rindataverse/matrix>): Collaboration Matrix is a visualization showing the connectedness and collaboration between authors and their affiliations. Visit https://rin.lipi.go.id/matrix/ to play with a production installation.
+  
+* Dataverse Installation Web Report (<https://github.com/scholarsportal/Dataverse-Web-Report>): Creates interactive charts showing data extracted from the Dataverse installation Excel Report
+
+* Dataverse Installation Reports for Texas Digital Library (<https://github.com/TexasDigitalLibrary/dataverse-reports>): A python3-based tool to generate and email statistical reports from Dataverse (https://dataverse.org/) using the native API and database queries.
+
+* dataverse-metrics (<https://github.com/IQSS/dataverse-metrics>): Aggregates and visualizes metrics for Dataverse installations around the world or a single Dataverse installation.
+
+* Automated Dataverse Metrics Reports (<https://github.com/QualitativeDataRepository/dataverse-metrics>): Create beautiful, customizable reports about your Dataverse installation at the click of a button, using R-Markdown and GitHub Actions.
+
+* dataverse-metadata-crawler (https://github.com/scholarsportal/dataverse-metadata-crawler): A Python CLI tool for extracting and exporting metadata from Dataverse repositories. It supports bulk extraction of dataverses, datasets, and data file metadata from any chosen level of dataverse collection (an entire Dataverse repository/sub-Dataverse), with flexible export options to JSON and CSV formats.
+
+* Useful queries from the Dataverse Community (<https://docs.google.com/document/d/1-Y_iUduSxdDNeK1yiGUxe7t-Md7Fy965jp4o4m1XEoE/edit#heading=h.avuoo5kf0mdt>): A community-generated and maintained document of postgresql queries for getting information about users and dataverse collections, datasets, and files in your Dataverse installation. If you are trying to find out some information from your Dataverse installation, chances are that someone else has had the same questions and it's now listed in this document. If it's not listed, please feel free to add it to the document.
diff --git a/doc/sphinx-guides/source/admin/reporting-tools.rst b/doc/sphinx-guides/source/admin/reporting-tools.rst
deleted file mode 100644
index c309744be63..00000000000
--- a/doc/sphinx-guides/source/admin/reporting-tools.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-.. role:: fixedwidthplain
-
-Reporting Tools
-===============
-
-Reporting tools created by members of the Dataverse community.
-
-.. contents:: Contents:
-	:local:
-  
-* Matrix (<https://github.com/rindataverse/matrix>): Collaboration Matrix is a visualization showing the connectedness and collaboration between authors and their affiliations. Visit https://rin.lipi.go.id/matrix/ to play with a production installation.
-  
-  
-* Dataverse Web Report (<https://github.com/scholarsportal/Dataverse-Web-Report>): Creates interactive charts showing data extracted from the Dataverse Excel Report
-
-* Dataverse Reports for Texas Digital Library (<https://github.com/TexasDigitalLibrary/dataverse-reports>): A python3-based tool to generate and email statistical reports from Dataverse (https://dataverse.org/) using the native API and database queries.
-
-* dataverse-metrics (<https://github.com/IQSS/dataverse-metrics>): Aggregates and visualizes metrics for installations of Dataverse around the world or a single Dataverse installation.
diff --git a/doc/sphinx-guides/source/admin/solr-search-index.rst b/doc/sphinx-guides/source/admin/solr-search-index.rst
index 07e51b4564f..3f7b9d5b547 100644
--- a/doc/sphinx-guides/source/admin/solr-search-index.rst
+++ b/doc/sphinx-guides/source/admin/solr-search-index.rst
@@ -1,7 +1,7 @@
 Solr Search Index
 =================
 
-Dataverse requires Solr to be operational at all times. If you stop Solr, you should see a error about this on the root dataverse page, which is powered by the search index Solr provides. You can set up Solr by following the steps in our Installation Guide's :doc:`/installation/prerequisites` and :doc:`/installation/config` sections explaining how to configure it. This section you're reading now is about the care and feeding of the search index. PostgreSQL is the "source of truth" and the Dataverse application will copy data from PostgreSQL into Solr. For this reason, the search index can be rebuilt at any time. Depending on the amount of data you have, this can be a slow process. You are encouraged to experiment with production data to get a sense of how long a full reindexing will take.
+A Dataverse installation requires Solr to be operational at all times. If you stop Solr, you should see an error about this on the root Dataverse installation page, which is powered by the search index Solr provides. You can set up Solr by following the steps in our Installation Guide's :doc:`/installation/prerequisites` and :doc:`/installation/config` sections explaining how to configure it. This section you're reading now is about the care and feeding of the search index. PostgreSQL is the "source of truth" and the Dataverse installation will copy data from PostgreSQL into Solr. For this reason, the search index can be rebuilt at any time. Depending on the amount of data you have, this can be a slow process. You are encouraged to experiment with production data to get a sense of how long a full reindexing will take.
 
 .. contents:: Contents:
 	:local:
@@ -9,22 +9,34 @@ Dataverse requires Solr to be operational at all times. If you stop Solr, you sh
 Full Reindex
 -------------
 
-There are two ways to perform a full reindex of the Dataverse search index. Starting with a "clear" ensures a completely clean index but involves downtime. Reindexing in place doesn't involve downtime but does not ensure a completely clean index.
+There are two ways to perform a full reindex of the Dataverse installation search index. Starting with a "clear" ensures a completely clean index but involves downtime. Reindexing in place doesn't involve downtime but does not ensure a completely clean index (e.g. stale entries from destroyed datasets can remain in the index).
 
 Clear and Reindex
 +++++++++++++++++
 
-Clearing Data from Solr
-~~~~~~~~~~~~~~~~~~~~~~~
 
-Please note that the moment you issue this command, it will appear to end users looking at the root dataverse page that all data is gone! This is because the root dataverse page is powered by the search index.
+Index and Database Consistency
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Get a list of all database objects that are missing in Solr, and Solr documents that are missing in the database:
+
+``curl http://localhost:8080/api/admin/index/status``
+
+Remove all Solr documents that are orphaned (i.e. not associated with objects in the database):
+
+``curl http://localhost:8080/api/admin/index/clear-orphans``
+
+Clearing ALL Data from Solr
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Please note that the moment you issue this command, it will appear to end users looking at the root Dataverse installation page that all data is gone! This is because the root Dataverse installation page is powered by the search index.
 
 ``curl http://localhost:8080/api/admin/index/clear``
 
 Start Async Reindex
 ~~~~~~~~~~~~~~~~~~~
 
-Please note that this operation may take hours depending on the amount of data in your system. This known issue is being tracked at https://github.com/IQSS/dataverse/issues/50
+Please note that this operation may take hours depending on the amount of data in your system and whether or not you installation is using full-text indexing. More information on this, as well as some reference times, can be found at https://github.com/IQSS/dataverse/issues/50.
 
 ``curl http://localhost:8080/api/admin/index``
 
@@ -48,20 +60,20 @@ If indexing stops, this command should pick up where it left off based on which
 Manual Reindexing
 -----------------
 
-If you have made manual changes to a dataset in the database or wish to reindex a dataset that solr didn't want to index properly, it is possible to manually reindex dataverses and datasets.
+If you have made manual changes to a dataset in the database or wish to reindex a dataset that Solr didn't want to index properly, it is possible to manually reindex Dataverse collections and datasets.
 
-Reindexing Dataverses
-++++++++++++++++++++++
+Reindexing Dataverse Collections
+++++++++++++++++++++++++++++++++
 
-Dataverses must be referenced by database object ID. If you have direct database access an SQL query such as
+Dataverse collections must be referenced by database object ID. If you have direct database access an SQL query such as
 
-``select id from dataverse where alias='datavarsealias';``
+``select id from dataverse where alias='dataversealias';``
 
-should work, or you may click the Dataverse's "Edit" menu and look for dataverseId= in the URLs produced by the drop-down. Then, to re-index:
+should work, or you may click the Dataverse Software's "Edit" menu and look for *dataverseId=* in the URLs produced by the drop-down. Then, to re-index:
 
 ``curl http://localhost:8080/api/admin/index/dataverses/135``
 
-which should return: _{"status":"OK","data":{"message":"starting reindex of dataverse 135"}}_
+which should return: *{"status":"OK","data":{"message":"starting reindex of dataverse 135"}}*
 
 Reindexing Datasets
 ++++++++++++++++++++
@@ -74,11 +86,21 @@ To re-index a dataset by its database ID:
 
 ``curl http://localhost:8080/api/admin/index/datasets/7504557``
 
+Clearing a Dataset from Solr
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This API will clear the Solr entry for the dataset specified. It can be useful if you have reasons to want to hide a published dataset from showing in search results and/or on Collection pages, but don't want to destroy and purge it from the database just yet. 
+
+``curl -X DELETE http://localhost:8080/api/admin/index/datasets/<DATABASE_ID>``
+
+This can be reversed of course by re-indexing the dataset with the API above. 
+
+
 Manually Querying Solr
 ----------------------
 
-If you suspect something isn't indexed properly in solr, you may bypass the Dataverse web interface and query the command line directly to verify what solr returns:
+If you suspect something isn't indexed properly in Solr, you may bypass the Dataverse installation's web interface and query the command line directly to verify what Solr returns:
 
 ``curl "http://localhost:8983/solr/collection1/select?q=dsPersistentId:doi:10.15139/S3/HFV0AO"``
 
-to see the JSON you were hopefully expecting to see passed along to Dataverse.
\ No newline at end of file
+to see the JSON you were hopefully expecting to see passed along to the Dataverse installation.
diff --git a/doc/sphinx-guides/source/admin/timers.rst b/doc/sphinx-guides/source/admin/timers.rst
index 3c1ff40f935..f9ac8d8a498 100644
--- a/doc/sphinx-guides/source/admin/timers.rst
+++ b/doc/sphinx-guides/source/admin/timers.rst
@@ -1,17 +1,17 @@
 .. role:: fixedwidthplain
 
-Dataverse Application Timers
-============================
+Dataverse Installation Application Timers
+=========================================
 
-Dataverse uses timers to automatically run scheduled Harvest and Metadata export jobs. 
+Your Dataverse installation uses timers to automatically run scheduled Harvest and Metadata export jobs. 
 
 .. contents:: |toctitle|
 	:local:
 
-Dedicated timer server in a Dataverse server cluster
-----------------------------------------------------
+Dedicated timer server in a Dataverse Installation server cluster
+-----------------------------------------------------------------
 
-When running a Dataverse cluster - i.e. multiple Dataverse application
+When running a Dataverse installation cluster - i.e. multiple Dataverse installation application
 servers talking to the same database - **only one** of them must act
 as the *dedicated timer server*. This is to avoid starting conflicting
 batch jobs on multiple nodes at the same time.
@@ -22,9 +22,7 @@ The following JVM option instructs the application to act as the dedicated timer
 
 ``-Ddataverse.timerServer=true``
 
-**IMPORTANT:** Note that this option is automatically set by the Dataverse installer script. That means that when **configuring a multi-server cluster**, it will be the responsibility of the installer to remove the option from the :fixedwidthplain:`domain.xml` of every node except the one intended to be the timer server. We also recommend that the following entry in the :fixedwidthplain:`domain.xml`: ``<ejb-timer-service timer-datasource="jdbc/VDCNetDS">`` is changed back to ``<ejb-timer-service>`` on all the non-timer server nodes. Similarly, this option is automatically set by the installer script. Changing it back to the default setting on a server that doesn't need to run the timer will prevent a potential race condition, where multiple servers try to get a lock on the timer database. 
-
-**Note** that for the timer to work, the version of the PostgreSQL JDBC driver your instance is using must match the version of your PostgreSQL database. See the 'Timer not working' section of the :doc:`/admin/troubleshooting` guide.
+**IMPORTANT:** Note that this option is automatically set by the Dataverse Software installer script. That means that when **configuring a multi-server cluster**, it will be the responsibility of the installer to remove the option from the :fixedwidthplain:`domain.xml` of every node except the one intended to be the timer server.
 
 Harvesting Timers 
 -----------------
@@ -40,11 +38,57 @@ Metadata Export Timer
 
 This timer is created automatically whenever the application is deployed or restarted. There is no admin user-accessible configuration for this timer. 
 
-This timer runs a daily job that tries to export all the local, published datasets that haven't been exported yet, in all supported metadata formats, and cache the results on the filesystem. (Note that normally an export will happen automatically whenever a dataset is published. This scheduled job is there to catch any datasets for which that export did not succeed, for one reason or another). Also, since this functionality has been added in version 4.5: if you are upgrading from a previous version, none of your datasets are exported yet. So the first time this job runs, it will attempt to export them all. 
+This timer runs a daily job that tries to export all the local, published datasets that haven't been exported yet, in all supported metadata formats, and cache the results on the filesystem. (Note that normally an export will happen automatically whenever a dataset is published. This scheduled job is there to catch any datasets for which that export did not succeed, for one reason or another). Also, since this functionality has been added in Dataverse Software 4.5: if you are upgrading from a previous version, none of your datasets are exported yet. So the first time this job runs, it will attempt to export them all. 
 
 This daily job will also update all the harvestable OAI sets configured on your server, adding new and/or newly published datasets or marking deaccessioned datasets as "deleted" in the corresponding sets as needed. 
 
-This job is automatically scheduled to run at 2AM local time every night. If really necessary, it is possible (for an advanced user) to change that time by directly editing the EJB timer application table in the database.  
+This job is automatically scheduled to run at 2AM local time every night.
+
+.. _saved-search-timer:
+
+Saved Searches Links Timer
+--------------------------
+
+This timer is created automatically from an @Schedule annotation on the makeLinksForAllSavedSearchesTimer method of the SavedSearchServiceBean when the bean is deployed. 
+
+This timer runs a weekly job to create links for any saved searches that haven't been linked yet.
+
+This job is automatically scheduled to run once a week at 12:30AM local time on Sunday. If really necessary, it is possible to change that time by deploying the application war file with an ejb-jar.xml file in the WEB-INF directory of the war file. A :download:`sample file <../_static/admin/ejb-jar.xml>` would run the job every Tuesday at 2:30PM. The schedule can be modified to your choice by editing the fields in the session section. If other EJBs require some form of configuration using an ejb-jar file, there should be one ejb-jar file for the entire application, which can have different sections for each EJB. Below are instructions for the simple case of adding the ejb-jar.xml for the first time and making a custom schedule for the saved search timer.
+
+* Create or edit dataverse/src/main/webapp/WEB-INF/ejb-jar.xml, following the :download:`sample file <../_static/admin/ejb-jar.xml>` provided.
+
+* Edit the parameters in the <schedule> section of the ejb-jar file in the WEB-INF directory to suit your preferred schedule
+
+  * The provided parameters in the sample file are <minute>, <hour>, and <dayOfWeek>; additional parameters are available
+
+    * For a complete reference for calendar expressions that can be used to schedule Timer services see: https://docs.oracle.com/javaee/7/tutorial/ejb-basicexamples004.htm
+
+* Build and deploy the application
+
+* Alternatively, you can insert an ejb-jar.xml file into a provided Dataverse Software war file without building the application.
+
+  * Check if there is already an ejb-jar.xml file in the war file 
+
+    * jar tvf $DATAVERSE-WAR-FILENAME | grep ejb-jar.xml
+
+      * if the response includes " WEB-INF/ejb-jar.xml", you will need to extract the ejb-jar.xml file for editing
+
+        * jar xvf $DATAVERSE-WAR-FILENAME WEB-INF/ejb-jar.xml 
+
+          * edit the extracted WEB-INF/ejb-jar.xml, following the :download:`sample file <../_static/admin/ejb-jar.xml>` provided.
+
+        * if the response is empty, create a WEB-INF directory and create en ejb-jar.xml file in it, following the :download:`sample file <../_static/admin/ejb-jar.xml>` provided.
+
+          * edit the parameters in the <schedule> section of the WEB-INF/ejb-jar.xml to suit your preferred schedule
+
+  * Insert the edited WEB-INF/ejb-jar.xml into the dataverse war file
+
+    * jar uvf $DATAVERSE-WAR-FILENAME WEB-INF/ejb-jar.xml
+
+  * Deploy the war file
+
+
+See also :ref:`saved-search` in the API Guide.
 
 Known Issues
 ------------
diff --git a/doc/sphinx-guides/source/admin/troubleshooting.rst b/doc/sphinx-guides/source/admin/troubleshooting.rst
index eb7872bac20..178938af6dc 100644
--- a/doc/sphinx-guides/source/admin/troubleshooting.rst
+++ b/doc/sphinx-guides/source/admin/troubleshooting.rst
@@ -3,27 +3,38 @@
 Troubleshooting
 ===============
 
-Sometimes Dataverse users get into trouble. Sometimes Dataverse itself gets into trouble. If something has gone wrong, this section is for you.
+Sometimes a Dataverse installation's users get into trouble. Sometimes a Dataverse installation itself gets into trouble. If something has gone wrong, this section is for you.
 
 .. contents:: Contents:
 	:local:
 
-Using Dataverse APIs to Troubleshoot and Fix Problems
------------------------------------------------------
+Using Dataverse Installation APIs to Troubleshoot and Fix Problems
+------------------------------------------------------------------
 
-See the :doc:`/api/intro` section of the API Guide for a high level overview of Dataverse APIs. Below are listed problems that support teams might encounter that can be handled via API (sometimes only via API).
+See the :doc:`/api/intro` section of the API Guide for a high level overview of Dataverse Software APIs. Below are listed problems that support teams might encounter that can be handled via API (sometimes only via API).
 
 A Dataset Is Locked And Cannot Be Edited or Published
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-It's normal for the ingest process described in the :doc:`/user/tabulardataingest/ingestprocess` section of the User Guide to take some time but if hours or days have passed and the dataset is still locked, you might want to inspect the locks and consider deleting some or all of them.
+There are several types of dataset locks. Locks can be managed using the locks API, or by accessing them directly in the database. Internally locks are maintained in the ``datasetlock`` database table, with the field ``dataset_id`` linking them to specific datasets, and the column ``reason`` specifying the type of lock.
 
-See :doc:`dataverses-datasets`.
+It's normal for the ingest process described in the :doc:`/user/tabulardataingest/ingestprocess` section of the User Guide to take some time but if hours or days have passed and the dataset is still locked, you might want to inspect the locks and consider deleting some or all of them. It is recommended to restart the application server if you are deleting an ingest lock, to make sure the ingest job is no longer running in the background. Ingest locks are idetified by the label ``Ingest`` in the ``reason`` column of the ``DatasetLock`` table in the database.
+
+A dataset is locked with a lock of type ``finalizePublication`` while the persistent identifiers for the datafiles in the dataset are registered or updated, and/or while the physical files are being validated by recalculating the checksums and verifying them against the values stored in the database, before the publication process can be completed (Note that either of the two tasks can be disabled via database options - see :doc:`/installation/config`). If a dataset has been in this state for a long period of time, for hours or longer, it is somewhat safe to assume that it is stuck (for example, the process may have been interrupted by an application server restart, or a system crash), so you may want to remove the lock (to be safe, do restart the application server, to ensure that the job is no longer running in the background) and advise the user to try publishing again. See :doc:`dataverses-datasets` for more information on publishing.
+
+If any files in the dataset fail the validation above the dataset will be left locked with a ``DatasetLock.Reason=FileValidationFailed``. The user will be notified that they need to contact their Dataverse installation's support in order to address the issue before another attempt to publish can be made. The admin will have to address and fix the underlying problems (by either restoring the missing or corrupted files, or by purging the affected files from the dataset) before deleting the lock and advising the user to try to publish again. The goal of the validation framework is to catch these types of conditions while the dataset is still in DRAFT. 
+
+During an attempt to publish a dataset, the validation will stop after encountering the first file that fails it. It is strongly recommended for the admin to review and verify *all* the files in the dataset, so that all the compromised files can be fixed before the lock is removed. We recommend using the ``/api/validate/dataset/files/{id}`` API. It will go through all the files for the dataset specified, and will report which ones have failed validation. see :ref:`Physical Files Validation in a Dataset <dataset-files-validation-api>` in the :doc:`/api/native-api` section of the User Guide.
+
+The following are two real life examples of problems that have resulted in corrupted datafiles during normal operation of a Dataverse installation: 
+
+1. Botched file deletes - while a datafile is in DRAFT, attempting to delete it from the dataset involves deleting both the ``DataFile`` database table entry, and the physical file. (Deleting a datafile from a *published* version merely removes it from the future versions - but keeps the file in the dataset). The problem we've observed in the early versions of the Dataverse Software was a *partially successful* delete, where the database transaction would fail (for whatever reason), but only after the physical file had already been deleted from the filesystem. Thus resulting in a datafile entry remaining in the dataset, but with the corresponding physical file missing. We believe we have addressed the issue that was making this condition possible, so it shouldn't happen again - but there may be a datafile in this state in your database. Assuming the user's intent was in fact to delete the file, the easiest solution is simply to confirm it and purge the datafile entity from the database. Otherwise the file needs to be restored from backups, or obtained from the user and copied back into storage. 
+2. Another issue we've observed: a failed tabular data ingest that leaves the datafile un-ingested, BUT with the physical file already replaced by the generated tab-delimited version of the data. This datafile will fail the validation because the checksum in the database matches the file in the original format (Stata, SPSS, etc.) as uploaded by the user. To fix: luckily, this is easily reversible, since the uploaded original should be saved in your storage, with the .orig extension. Simply swapping the .orig copy with the main file associated with the datafile will fix it. Similarly, we believe this condition should not happen again in Dataverse Software 4.20+, but you may have some legacy cases on your server. 
 
 Someone Created Spam Datasets and I Need to Delete Them
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Depending on how open your installation of Dataverse is to the general public creating datasets, you may sometimes need to deal with spam datasets.
+Depending on how open your Dataverse installation is to the general public creating datasets, you may sometimes need to deal with spam datasets.
 
 Look for "destroy" in the :doc:`/api/native-api` section of the API Guide.
 
@@ -32,22 +43,40 @@ A User Needs Their Account to Be Converted From Institutional (Shibboleth), ORCI
 
 See :ref:`converting-shibboleth-users-to-local` and :ref:`converting-oauth-users-to-local`.
 
-.. _troubleshooting-glassfish:
+.. _troubleshooting-ingest:
+
+Ingest
+------
+
+Long-Running Ingest Jobs Have Exhausted System Resources
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Glassfish
----------
+Ingest is both CPU- and memory-intensive, and depending on your system resources and the size and format of tabular data files uploaded, may render your Dataverse installation unresponsive or nearly inoperable. It is possible to cancel these jobs by purging the ingest queue.
 
-.. _glassfish-log:
+``/usr/local/payara6/mq/bin/imqcmd -u admin query dst -t q -n DataverseIngest`` will query the DataverseIngest destination. The password, unless you have changed it, matches the username.
 
-Finding the Glassfish Log File
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``/usr/local/payara6/mq/bin/imqcmd -u admin purge dst -t q -n DataverseIngest`` will purge the DataverseIngest queue, and prompt for your confirmation.
 
-``/usr/local/glassfish4/glassfish/domains/domain1/logs/server.log`` is the main place to look when you encounter problems (assuming you installed Glassfish in the default directory). Hopefully an error message has been logged. If there's a stack trace, it may be of interest to developers, especially they can trace line numbers back to a tagged version or commit. Send more of the stack trace (the entire file if possible) to developers who can help (see "Getting Help", below) and be sure to say which version of Dataverse you are running.
+Finally, list destinations to verify that the purge was successful:
 
-.. _increase-glassfish-logging:
+``/usr/local/payara6/mq/bin/imqcmd -u admin list dst``
 
-Increasing Glassfish Logging
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. _troubleshooting-payara:
+
+Payara
+------
+
+.. _payara-log:
+
+Finding the Payara Log File
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``/usr/local/payara6/glassfish/domains/domain1/logs/server.log`` is the main place to look when you encounter problems (assuming you installed Payara in the default directory). Hopefully an error message has been logged. If there's a stack trace, it may be of interest to developers, especially they can trace line numbers back to a tagged version or commit. Send more of the stack trace (the entire file if possible) to developers who can help (see "Getting Help", below) and be sure to say which version of the Dataverse Software you have installed.
+
+.. _increase-payara-logging:
+
+Increasing Payara Logging
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 For debugging purposes, you may find it helpful to temporarily increase logging levels. Here's an example of increasing logging for the Java class behind the "datasets" API endpoints:
 
@@ -55,33 +84,31 @@ For debugging purposes, you may find it helpful to temporarily increase logging
 
 For more on setting log levels, see the :doc:`/developers/debugging` section of the Developer Guide.
 
-Our guides focus on using the command line to manage Glassfish but you might be interested in an admin GUI at http://localhost:4848
+Our guides focus on using the command line to manage Payara but you might be interested in an admin GUI at http://localhost:4848
 
 
 Deployment fails, "EJB Timer Service not available"
 ---------------------------------------------------
 
-Sometimes the Dataverse application fails to deploy, or Glassfish fails to restart once the application is deployed, with the following error message: :fixedwidthplain:`"remote failure: Error occurred during deployment: Exception while loading the app : EJB Timer Service is not available. Please see server.log for more details."`
+Sometimes your Dataverse installation fails to deploy, or Payara fails to restart once the application is deployed, with the following error message: :fixedwidthplain:`"remote failure: Error occurred during deployment: Exception while loading the app : EJB Timer Service is not available. Please see server.log for more details."`
 
 We don't know what's causing this issue, but here's a known workaround: 
 
-- Stop Glassfish; 
-
-- Remove the ``generated`` and ``osgi-cache`` directories; 
-
-- Delete all the rows from the ``EJB__TIMER__TBL`` table in the database;
-
-- Start Glassfish
+- Stop Payara;
+- Remove the ``generated`` and ``osgi-cache`` directories from the ``domain1`` directory;
+- Start Payara
 
 The shell script below performs the steps above. 
-Note that it may or may not work on your system, so it is provided as an example only, downloadable :download:`here </_static/util/clear_timer.sh>`. Aside from the configuration values that need to be changed to reflect your environment (the Glassfish directory, name of the database, etc.) the script relies on the database being configured in a certain way for access. (See the comments in the script for more information)
+Note that it may or may not work on your system, so it is provided as an example only, downloadable :download:`here </_static/util/clear_timer.sh>`. The configuration values might need to be changed to reflect your environment (the Payara directory). See the comments in the script for more information.
 
 .. literalinclude:: ../_static/util/clear_timer.sh
 
-Timer not working 
+.. _timer-not-working:
+
+Timer Not Working
 -----------------
 
-Dataverse relies on EJB timers to perform scheduled tasks: harvesting from remote servers, updating the local OAI sets and running metadata exports. (See :doc:`timers` for details.) If these scheduled jobs are not running on your server, this may be the result of the incompatibility between the version of PostgreSQL database you are using, and PostgreSQL JDBC driver in use by your instance of Glassfish. The symptoms:
+Your Dataverse installation relies on EJB timers to perform scheduled tasks: harvesting from remote servers, updating the local OAI sets and running metadata exports. (See :doc:`timers` for details.) If these scheduled jobs are not running on your server, you might experience the following symptoms:
 
 If you are seeing the following in your server.log...
 
@@ -94,15 +121,15 @@ followed by an Exception stack trace with these lines in it:
 :fixedwidthplain:`Exception Description: Could not deserialize object from byte array` ...
 
 
-... it most likely means that it is the JDBC driver incompatibility that's preventing the timer from working correctly. 
-Make sure you install the correct version of the driver. For example, if you are running the version 9.3 of PostgreSQL, make sure you have the driver postgresql-9.3-1104.jdbc4.jar in your :fixedwidthplain:`<GLASSFISH FOLDER>/glassfish/lib` directory. Go `here <https://jdbc.postgresql.org/download.html>`_
-to download the correct version of the driver. If you have an older driver in glassfish/lib, make sure to remove it, replace it with the new version and restart Glassfish. (You may need to remove the entire contents of :fixedwidthplain:`<GLASSFISH FOLDER>/glassfish/domains/domain1/generated` before you start Glassfish). 
+... you should reach out by opening an issue. In the good ol' days of running Dataverse Software 4.x running on Glassfish 4, this
+was a hint for an unsupported JDBC driver. In Dataverse Software 5.x this would be a new regression and its cause would need to be
+investigated.
 
 
 Constraint Violations Issues
 ----------------------------
 
-In real life production use, it may be possible to end up in a situation where some values associated with the datasets in your database are no longer valid under the constraints enforced by the latest version of Dataverse. This is not very likely to happen, but if it does, the symptomps will be as follows: Some datasets can no longer be edited, long exception stack traces logged in the Glassfish server log, caused by::
+In real life production use, it may be possible to end up in a situation where some values associated with the datasets in your database are no longer valid under the constraints enforced by the later versions of the Dataverse Software. This is not very likely to happen, but if it does, the symptoms will be as follows: Some datasets can no longer be edited, long exception stack traces logged in the app server log, caused by::
 
    javax.validation.ConstraintViolationException: 
    Bean Validation constraint(s) violated while executing Automatic Bean Validation on callback event:'preUpdate'. 
@@ -110,12 +137,35 @@ In real life production use, it may be possible to end up in a situation where s
 
 (contrary to what the message suggests, there are no specific "details" anywhere in the stack trace that would explain what values violate which constraints)  
 
-To identifiy the specific invalid values in the affected datasets, or to check all the datasets in the Dataverse for constraint violations, see :ref:`Dataset Validation <dataset-validation-api>` in the :doc:`/api/native-api` section of the User Guide.
+To identify the specific invalid values in the affected datasets, or to check all the datasets in the Dataverse installation for constraint violations, see :ref:`Dataset Validation <dataset-validation-api>` in the :doc:`/api/native-api` section of the User Guide.
 
 Many Files with a File Type of "Unknown", "Application", or "Binary"
 --------------------------------------------------------------------
 
-From the home page of a Dataverse installation you can get a count of files by file type by clicking "Files" and then scrolling down to "File Type". If you see a lot of files that are "Unknown", "Application", or "Binary" you can have Dataverse attempt to redetect the file type by using the :ref:`Redetect File Type <redetect-file-type>` API endpoint.
+From the home page of a Dataverse installation you can get a count of files by file type by clicking "Files" and then scrolling down to "File Type". If you see a lot of files that are "Unknown", "Application", or "Binary" you can have the Dataverse installation attempt to redetect the file type by using the :ref:`Redetect File Type <redetect-file-type>` API endpoint.
+
+.. _actionlogrecord-trimming:
+
+What's with this Table "ActionLogRecord" in Our Database, It Seems to be Growing Uncontrollably?
+------------------------------------------------------------------------------------------------
+
+An entry is created in ActionLogRecord table every time an application command is executed (to be precise, certain non-command actions, such as logins are recorded there as well). This is very useful for investigating problems or usage patterns. However, please note that there is no builtin mechanism in the Application for trimming this table, so it will continue growing as your Dataverse installation is kept in operation. For example, multiple entries in this table are created every time a guest user views the page of a published dataset. Many more are created when an author is actively working on a dataset, making edits, adding new files, etc. On a busy installation this table is likely to grow at a faster rate than the actual data holdings. For example, after five years of production use at Harvard IQSS, the raw size of ActionLogRecord appeared to exceed the combined size of the rest of the database (!). It's worth pointing out that the sheer size of this one table does not by itself result in performance issues in any linear way. But it may still be undesirable to keep that much extra data around; especially since for most installations these records are unlikely to have much value past a certain number of months or years. Some installations may be purchasing their database services from cloud computing providers (RDS, etc.) where extra data may result in higher costs.
+Here at Harvard we chose to periodically trim the table manually, deleting all the entries older than 2 years. We recommend that you check on the size of this table in your database, and choose whether, and how often you want to trim it. You will also need to decide whether you want to archive these older records outside the database before deleting them. If you see no reason to keep them around, older records can be erased with a simple query. For example, to delete everything before the year 2021:
+
+``DELETE FROM ACTIONLOGRECORD WHERE starttime < '2021-01-01 00:00:00';``
+
+If you want to preserve these old entries before deleting them, you can save them with, for example, psql:
+
+``psql <CREDENTIALS> -d <DATABASE_NAME> -t -c "SELECT * FROM actionlogrecord WHERE starttime < '2021-01-01 00:00:00' ORDER BY starttime;"``
+
+A full backup of the table can be made with pg_dump, for example:
+
+``pg_dump <CREDENTIALS> --table=actionlogrecord --data-only <DATABASE_NAME> > /tmp/actionlogrecord_backup.sql``
+
+In the example above, the output will be saved in raw SQL format. It is portable and human-readable, but uses a lot of space. It does, however, compress very well.
+
+Add the ``-Fc`` option to save the output in a proprietary, compressed binary format which will dump and restore much more quickly, but note that in this format dead tuples will be copied as well. To reduce the amount of storage consumed by the newly-trimmed ``actionlogrecord`` table, you must issue ``vacuum full actionlogrecord`` before dumping the database in this custom format.
+
 
 Getting Help
 ------------
diff --git a/doc/sphinx-guides/source/admin/user-administration.rst b/doc/sphinx-guides/source/admin/user-administration.rst
index 764de6977ab..5efd56fbd33 100644
--- a/doc/sphinx-guides/source/admin/user-administration.rst
+++ b/doc/sphinx-guides/source/admin/user-administration.rst
@@ -9,7 +9,7 @@ This section focuses on user administration tools and tasks.
 Manage Users
 ------------
 
-The Manage Users table gives the network administrator a list of all user accounts in table form. You can access it by clicking the "Manage Users" button on the :doc:`dashboard`, which is linked from the header of all Dataverse pages (if you're logged in as an administrator). It lists username, full name, email address, affiliation, the authentication method they use, the roles their account has been granted, and whether or not they have Superuser status.
+The Manage Users table gives the network administrator a list of all user accounts in table form. You can access it by clicking the "Manage Users" button on the :doc:`dashboard`, which is linked from the header of all Dataverse installation pages (if you're logged in as an administrator). It lists username, full name, email address, affiliation, the authentication method they use, the roles their account has been granted, and whether or not they have Superuser status.
 
 Users are listed alphabetically by username. The search bar above the table allows you to search for a specific user. It performs a right-truncated wildcard search of the Username, Name, and Email columns. This means, if you search "baseba" then it will search those three columns for any string of text that begins with "baseba", e.g. "baseball" or "baseballfan".
 
@@ -44,16 +44,26 @@ Change User Identifier
 
 See :ref:`change-identifier-label`
 
+Delete a User
+-------------
+
+See :ref:`delete-a-user`
+
+Deactivate a User
+-----------------
+
+See :ref:`deactivate-a-user`
+
 Confirm Email
 -------------
 
-Dataverse encourages builtin/local users to verify their email address upon signup or email change so that sysadmins can be assured that users can be contacted.
+A Dataverse installation encourages builtin/local users to verify their email address upon sign up or email change so that sysadmins can be assured that users can be contacted.
 
-The app will send a standard welcome email with a URL the user can click, which, when activated, will store a ``lastconfirmed`` timestamp in the ``authenticateduser`` table of the database. Any time this is "null" for a user (immediately after signup and/or changing of their Dataverse email address), their current email on file is considered to not be verified. The link that is sent expires after a time (the default is 24 hours), but this is configurable by a superuser via the ``:MinutesUntilConfirmEmailTokenExpires`` config option.
+The app will send a standard welcome email with a URL the user can click, which, when activated, will store a ``lastconfirmed`` timestamp in the ``authenticateduser`` table of the database. Any time this is "null" for a user (immediately after sign up and/or changing of their Dataverse installation email address), their current email on file is considered to not be verified. The link that is sent expires after a time (the default is 24 hours), but this is configurable by a superuser via the ``:MinutesUntilConfirmEmailTokenExpires`` config option.
 
 Should users' URL token expire, they will see a "Verify Email" button on the account information page to send another URL.
 
-Sysadmins can determine which users have verified their email addresses by looking for the presence of the value ``emailLastConfirmed`` in the JSON output from listing users (see the "Admin" section of the :doc:`/api/native-api`). As mentioned in the :doc:`/user/account` section of the User Guide, the email addresses for Shibboleth users are re-confirmed on every login.
+Sysadmins can determine which users have verified their email addresses by looking for the presence of the value ``emailLastConfirmed`` in the JSON output from listing users (see :ref:`admin` section of Native API in the API Guide). As mentioned in the :doc:`/user/account` section of the User Guide, the email addresses for Shibboleth users are re-confirmed on every login (so their welcome email does not contain a URL to click for this purpose).
 
 Deleting an API Token
 ---------------------
@@ -65,3 +75,51 @@ Using the API token 7ae33670-be21-491d-a244-008149856437 as an example:
 ``delete from apitoken where tokenstring = '7ae33670-be21-491d-a244-008149856437';``
 
 You should expect the output ``DELETE 1`` after issuing the command above.
+
+.. _mute-notifications:
+
+Letting Users Manage Notifications
+-----------------------------------
+
+See :ref:`account-notifications` in the User Guide for how notifications are described to end users.
+
+You can let users manage which notification types they wish to receive by setting :ref:`:ShowMuteOptions` to "true":
+
+``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:ShowMuteOptions``
+
+This enables additional settings for each user in the notifications tab of their account page. The users can select which in-app notifications and/or e-mails they wish to receive out of the following list:
+
+* ``APIGENERATED`` API token is generated
+* ``ASSIGNROLE`` Role is assigned
+* ``CHECKSUMFAIL`` Checksum validation failed
+* ``CHECKSUMIMPORT`` Dataset had file checksums added via a batch job
+* ``CONFIRMEMAIL`` Email Verification
+* ``CREATEACC`` Account is created
+* ``CREATEDS`` Your dataset is created
+* ``CREATEDV`` Dataverse collection is created
+* ``DATASETCREATED`` Dataset was created by user
+* ``FILESYSTEMIMPORT`` Dataset has been successfully uploaded and verified
+* ``GRANTFILEACCESS`` Access to file is granted
+* ``INGESTCOMPLETEDWITHERRORS`` Ingest completed with errors
+* ``INGESTCOMPLETED`` Ingest is completed
+* ``PUBLISHEDDS`` Dataset is published
+* ``PUBLISHFAILED_PIDREG`` Publish has failed
+* ``REJECTFILEACCESS`` Access to file is rejected
+* ``REQUESTFILEACCESS`` Access to file is requested
+* ``RETURNEDDS`` Returned from review
+* ``REVOKEROLE`` Role is revoked
+* ``STATUSUPDATED`` Status of dataset has been updated
+* ``SUBMITTEDDS`` Submitted for review
+* ``WORKFLOW_FAILURE`` External workflow run has failed
+* ``WORKFLOW_SUCCESS`` External workflow run has succeeded
+* ``PIDRECONCILED``   Dataset persistent identifier changed
+
+After enabling this feature, all notifications are enabled by default, until this is changed by the user.
+
+You can shorten this list by configuring some notification types (e.g., ``ASSIGNROLE`` and ``REVOKEROLE``) to be always muted for everyone and not manageable by users (not visible in the user interface) with the :ref:`:AlwaysMuted` setting:
+
+``curl -X PUT -d 'ASSIGNROLE,REVOKEROLE' http://localhost:8080/api/admin/settings/:AlwaysMuted``
+
+Finally, you can set some notifications (e.g., ``REQUESTFILEACCESS``, ``GRANTFILEACCESS`` and ``REJECTFILEACCESS``) as always enabled for everyone and not manageable by users (grayed out in the user interface) with the :ref:`:NeverMuted` setting:
+
+``curl -X PUT -d 'REQUESTFILEACCESS,GRANTFILEACCESS,REJECTFILEACCESS' http://localhost:8080/api/admin/settings/:NeverMuted``
diff --git a/doc/sphinx-guides/source/ai/index.md b/doc/sphinx-guides/source/ai/index.md
new file mode 100644
index 00000000000..18d9cec29f2
--- /dev/null
+++ b/doc/sphinx-guides/source/ai/index.md
@@ -0,0 +1,42 @@
+# AI Guide
+
+Artificial Intelligence (AI) is a growing component of the Dataverse ecosystem.
+
+```{contents} Contents:
+:local:
+:depth: 2
+```
+
+## Tools
+
+### Ask Dataverse
+
+Ask Dataverse ([ask.dataverse.org](https://ask.dataverse.org)) is a place to ask questions about the Dataverse Project and the Dataverse software. It was created by Slava Tykhonov who [announced](https://groups.google.com/g/dataverse-community/c/tqwCoygO4oE/m/MNSfrw_QAwAJ) it in December 2024 and presented it February 2025 ([video](https://harvard.zoom.us/rec/share/bOizatNdMdxINRCnqpt87fPITPvsDWTv3ysvA8kIaEE4wnmZPSeSUkdmpKYP1ooA.rKoNMqED_L8KtHOi), [slides](https://docs.google.com/presentation/d/1HFN-wAe4eUGwJAhYCLbNcNHAsi-Hy8jQ/edit?usp=sharing&ouid=117275479921759507378&rtpof=true&sd=true), [notes](https://docs.google.com/document/d/1Dz07WKceGrBGdq5wWf0NJS08CO0FEmi4TgQBcsDcpRE/edit?usp=sharing)).
+
+### Ask the Data
+
+Ask the Data is an {ref}`external tool <inventory-of-external-tools>` that allows you ask natural language questions about the data contained in Dataverse tables (tabular data). See the README.md file at <https://github.com/IQSS/askdataverse/tree/main/askthedata> for the instructions on adding Ask the Data to your Dataverse installation.
+
+### AutoSage
+
+AutoSage provides metadata suggestions for datasets. Learn more at <https://github.com/siacus/autosage>.
+
+### DataChat
+
+DataChat is a multilingual open source natural language interface for Dataverse and other data platforms with an experimental Graph AI implementation for Croissant support. DataChat can literally talk back to you and explain what is inside of every single dataset, you can ask any question and it responds on the level of metadata described by Croissant standard. Learn more at <https://github.com/gdcc/datachat>.
+
+### TurboCurator
+
+TurboCurator is an {ref}`external tool <inventory-of-external-tools>` that generates metadata improvements for title, description, and keywords. It relies on OpenAI's ChatGPT & ICPSR best practices. See the [TurboCurator Dataverse Administrator](https://turbocurator.icpsr.umich.edu/tc/adminabout/) page for more details on how it works and adding TurboCurator to your Dataverse installation.
+
+
+## Protocols
+
+(mcp)=
+### Model Context Protocol (MCP)
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is a standard for AI Agents to communicate with tools and services, [announced](https://www.anthropic.com/news/model-context-protocol) in November 2024.
+
+An MCP server for Dataverse has been deployed to [mcp.dataverse.org][], powered by the code at <https://github.com/gdcc/mcp-dataverse>. See the code's README for information on configuring MCP clients (e.g. Cursor, Visual Studio Code, Windsurf, Zed, etc.) to use [mcp.dataverse.org][] or your own local installation (setup instructions are also provided).
+
+[mcp.dataverse.org]: https://mcp.dataverse.org
diff --git a/doc/sphinx-guides/source/api/apps.rst b/doc/sphinx-guides/source/api/apps.rst
index de5ace23e86..93950d70e5c 100755
--- a/doc/sphinx-guides/source/api/apps.rst
+++ b/doc/sphinx-guides/source/api/apps.rst
@@ -1,9 +1,9 @@
 Apps
 ====
 
-The introduction of Dataverse APIs has fostered the development of a variety of software applications that are listed in the :doc:`/admin/integrations`, :doc:`/admin/external-tools`, and :doc:`/admin/reporting-tools` sections of the Admin Guide.
+The introduction of Dataverse Software APIs has fostered the development of a variety of software applications that are listed in the :doc:`/admin/integrations`, :doc:`/admin/external-tools`, and :doc:`/admin/reporting-tools-and-queries` sections of the Admin Guide.
 
-The apps below are open source and demonstrate how to use Dataverse APIs. Some of these apps are built on :doc:`/api/client-libraries` that are available for Dataverse APIs in Python, Javascript, R, and Java.
+The apps below are open source and demonstrate how to use Dataverse Software APIs. Some of these apps are built on :doc:`/api/client-libraries` that are available for Dataverse Software APIs in Python, Javascript, R, and Java.
 
 .. contents:: |toctitle|
 	:local:
@@ -16,7 +16,7 @@ Data Explorer
 
 Data Explorer is a GUI which lists the variables in a tabular data file allowing searching, charting and cross tabulation analysis.
 
-https://github.com/scholarsportal/Dataverse-Data-Explorer
+https://github.com/scholarsportal/Dataverse-Data-Explorer-v2
 
 Data Curation Tool
 ~~~~~~~~~~~~~~~~~~
@@ -28,21 +28,14 @@ https://github.com/scholarsportal/Dataverse-Data-Curation-Tool
 File Previewers
 ~~~~~~~~~~~~~~~
 
-File Previewers are tools that display the content of files - including audio, html, Hypothes.is annotations, images, PDF, text, video - allowing them to be viewed without downloading.
+File Previewers are tools that display the content of files - including audio, html, Hypothes.is annotations, images, PDF, text, video, GeoJSON - allowing them to be viewed without downloading.
 
-https://github.com/QualitativeDataRepository/dataverse-previewers
-
-TwoRavens
-~~~~~~~~~
-
-TwoRavens is a system of interlocking statistical tools for data exploration, analysis, and meta-analysis.
-
-https://github.com/IQSS/TwoRavens
+https://github.com/gdcc/dataverse-previewers
 
 Python
 ------
 
-Please note that there are multiple Python modules for Dataverse APIs listed in the :doc:`client-libraries` section.
+Please note that there are multiple Python modules for Dataverse Software APIs listed in the :doc:`client-libraries` section.
 
 dataverse-sample-data
 ~~~~~~~~~~~~~~~~~~~~~
@@ -54,37 +47,30 @@ https://github.com/IQSS/dataverse-sample-data
 Texas Digital Library dataverse-reports
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Dataverse Reports for Texas Digital Library generates and emails statistical reports for an installation of Dataverse using the native API and database queries.
+Dataverse Installation Reports from Texas Digital Library generates and emails statistical reports for a Dataverse installation using the native API and database queries.
 
 https://github.com/TexasDigitalLibrary/dataverse-reports
 
 OSF
 ~~~
 
-OSF allows you to view, download, and upload files to and from a Dataverse dataset from an Open Science Framework (OSF) project.
+OSF allows you to view, download, and upload files to and from a dataset in a Dataverse installation from an Open Science Framework (OSF) project.
 
 https://github.com/CenterForOpenScience/osf.io/tree/develop/addons/dataverse
 
-GeoConnect
-~~~~~~~~~~
-
-GeoConnect allows Dataverse files to be visualized on http://worldmap.harvard.edu with the "Explore" button. Read more about it in the :doc:`/user/data-exploration/worldmap` section of the User Guide.
-
-https://github.com/IQSS/geoconnect
-
 dataverse-metrics
 ~~~~~~~~~~~~~~~~~
 
-dataverse-metrics aggregates and visualizes metrics across multiple Dataverse installations but can also be used with a single installation
+dataverse-metrics aggregates and visualizes metrics across multiple Dataverse installations but can also be used with a single installation.
 
 https://github.com/IQSS/dataverse-metrics
 
 Whole Tale
 ~~~~~~~~~~
 
-Whole Tale enables researchers to analyze data using popular tools including Jupyter and RStudio with the ultimate goal of supporting publishing of reproducible research packages.
+Whole Tale enables researchers to analyze data using popular tools including Jupyter and RStudio with the ultimate goal of supporting publishing of reproducible research packages. As of 2025 the project is not active.
 
-https://github.com/whole-tale/girder_wholetale/tree/v0.7/server/lib/dataverse
+https://github.com/whole-tale/girder-wholetale/blob/v2.0.7/girder_wholetale/lib/dataverse/provider.py
 
 Archivematica
 ~~~~~~~~~~~~~
@@ -93,31 +79,89 @@ Archivematica is an integrated suite of open-source tools for processing digital
 
 https://github.com/artefactual/archivematica/tree/v1.9.2/src/MCPClient/lib/clientScripts
 
+repo2docker
+~~~~~~~~~~~
+
+repo2docker is a command line tool that allows you to create and start a
+Docker image from a code repository that follows the [reproducible executable environment specification](https://repo2docker.readthedocs.io/en/latest/specification.html). repo2docker supports Dataverse installation DOIs to find and retrieve datasets.
+
+https://github.com/jupyter/repo2docker/blob/master/repo2docker/contentproviders/dataverse.py
+
+dataverse-migration-scripts
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This series of Python scripts offers a starting point for migrating datasets from one Dataverse installation to another. Multiple parts of the process are handled in these scripts, including adding users, collections, and multiple versions of datasets. These scripts were developed to migrate data from version 4.20 to 5.1, but may provide a helpful starting point for other software versions. The :doc:`migration APIs </developers/dataset-migration-api>` added in version 5.6 are not used. You can find more details in the repository, as well as `this Google group thread <https://groups.google.com/g/dataverse-community/c/4yy3U5RtUAs/m/OLogk12NBgAJ>`_.
+
+https://github.com/scholarsportal/dataverse-migration-scripts
+
+idsc.dataverse
+~~~~~~~~~~~~~~
+
+This module can, among others, help you migrate one dataverse to another. (see `migrate.md <https://github.com/iza-institute-of-labor-economics/idsc.dataverse/blob/main/migrate.md>`_)
+
+https://github.com/iza-institute-of-labor-economics/idsc.dataverse
+
+dataverse-metadata-crawler
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A Python CLI tool for bulk extraction of dataverses, datasets, and data file metadata from any chosen level of dataverse collection (an entire Dataverse repository/sub-Dataverse), with flexible export options to JSON and CSV formats.
+
+https://github.com/scholarsportal/dataverse-metadata-crawler
+
+mcp-dataverse
+~~~~~~~~~~~~~
+
+The code at https://github.com/gdcc/mcp-dataverse powers a :ref:`mcp` server for Dataverse.
+
 Java
 ----
 
-Please note that there is a Java library for Dataverse APIs listed in the :doc:`client-libraries` section.
+Please note that there is a Java library for Dataverse Software APIs listed in the :doc:`client-libraries` section.
 
 DVUploader
 ~~~~~~~~~~
 
-The open-source DVUploader tool is a stand-alone command-line Java application that uses the Dataverse API to upload files to a specified Dataset. Files can be specified by name, or the DVUploader can upload all files in a directory or recursively from a directory tree. The DVUploader can also verify that uploaded files match their local sources by comparing the local and remote fixity checksums. Source code, release 1.0.0- jar file, and documentation are available on GitHub. DVUploader's creation was supported by the Texas Digital Library.
+The open-source DVUploader tool is a stand-alone command-line Java application that uses the Dataverse Software API to upload files to a specified Dataset. Files can be specified by name, or the DVUploader can upload all files in a directory or recursively from a directory tree. The DVUploader can also verify that uploaded files match their local sources by comparing the local and remote fixity checksums. Source code, the latest release - jar file, and documentation are available on GitHub. DVUploader's creation was supported by the Texas Digital Library.
 
-https://github.com/IQSS/dataverse-uploader
+https://github.com/GlobalDataverseCommunityConsortium/dataverse-uploader
 
 Dataverse for Android
 ~~~~~~~~~~~~~~~~~~~~~
 
-Dataverse for Android makes use of Dataverse's Search API.
+Dataverse Software on Android makes use of a Dataverse installation's Search API.
 
 https://github.com/IQSS/dataverse-android
 
+Go
+--
+
+Integrations Dashboard
+~~~~~~~~~~~~~~~~~~~~~~
+
+The integrations dashboard is software by the Dataverse community to enable easy data transfer from an existing data management platform to a dataset in a Dataverse collection. See :ref:`integrations-dashboard` for details.
+
+https://github.com/libis/rdm-integration
+
 PHP
 ---
 
+DOI2PMH
+~~~~~~~
+
+The DOI2PMH server allow Dataverse instances to harvest DOI through OAI-PMH from otherwise unharvestable sources.
+
+https://github.com/IQSS/doi2pmh-server
+
 OJS
 ~~~
 
 The Open Journal Systems (OJS) Dataverse Plugin adds data sharing and preservation to the OJS publication process.
 
-https://github.com/pkp/ojs/tree/ojs-stable-2_4_8/plugins/generic/dataverse
+https://github.com/lepidus/dataversePlugin
+
+OpenScholar
+~~~~~~~~~~~
+
+The Dataverse Software module from OpenScholar allows a Dataverse installation's widgets to be easily embedded in its web pages:
+
+https://github.com/openscholar/openscholar/tree/SCHOLAR-3.x/openscholar/modules/os_features/os_dataverse
diff --git a/doc/sphinx-guides/source/api/auth.rst b/doc/sphinx-guides/source/api/auth.rst
index 6d53e52d3b4..8dffb914e29 100644
--- a/doc/sphinx-guides/source/api/auth.rst
+++ b/doc/sphinx-guides/source/api/auth.rst
@@ -1,7 +1,7 @@
 API Tokens and Authentication 
 =============================
 
-An API token is similar to a password and allows you to authenticate to Dataverse APIs to perform actions as you. Many Dataverse APIs require the use of an API token.
+An API token is similar to a password and allows you to authenticate to Dataverse Software APIs to perform actions as you. Many Dataverse Software APIs require the use of an API token.
 
 .. contents:: |toctitle|
     :local:
@@ -21,9 +21,11 @@ Anyone who has your API Token can add and delete data as you so you should treat
 Passing Your API Token as an HTTP Header (Preferred) or a Query Parameter
 -------------------------------------------------------------------------
 
+Note: The SWORD API uses a different way of passing the API token. Please see :ref:`sword-auth` for details.
+
 See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
 
-There are two ways to pass your API token to Dataverse APIs. The preferred method is to send the token in the ``X-Dataverse-key`` HTTP header, as in the following curl example.
+There are two ways to pass your API token to Dataverse Software APIs. The preferred method is to send the token in the ``X-Dataverse-key`` HTTP header, as in the following curl example.
 
 .. code-block:: bash
 
@@ -60,4 +62,47 @@ Use of the ``X-Dataverse-key`` HTTP header form is preferred to passing ``key``
 Resetting Your API Token
 ------------------------
 
-You can reset your API Token from your account page in Dataverse as described in the :doc:`/user/account` section of the User Guide.
+You can reset your API Token from your account page in your Dataverse installation as described in the :doc:`/user/account` section of the User Guide.
+
+.. _bearer-tokens:
+
+Bearer Tokens
+-------------
+
+Bearer tokens are defined in `RFC 6750`_ and can be used as an alternative to API tokens if your installation has been set up to use them (see :ref:`bearer-token-auth` in the Installation Guide).
+
+.. _RFC 6750: https://tools.ietf.org/html/rfc6750
+
+To test if bearer tokens are working, you can try something like the following (using the :ref:`User Information` API endpoint), substituting in parameters for your installation and user.
+
+.. code-block:: bash
+
+  export TOKEN=`curl -s -X POST --location "http://keycloak.mydomain.com:8090/realms/test/protocol/openid-connect/token" -H "Content-Type: application/x-www-form-urlencoded" -d "username=user&password=user&grant_type=password&client_id=test&client_secret=94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8" | jq '.access_token' -r | tr -d "\n"`
+  
+  curl -H "Authorization: Bearer $TOKEN" http://localhost:8080/api/users/:me
+
+To register a new user who has authenticated via an OIDC provider, the following endpoint should be used:
+
+.. code-block:: bash
+
+  curl  -H "Authorization: Bearer $TOKEN" -X POST http://localhost:8080/api/users/register --data '{"termsAccepted":true}'
+
+By default, the Bearer token is expected to include the following claims that will be used to create the user account:
+
+- ``username``
+- ``firstName``
+- ``lastName``
+- ``emailAddress``
+
+The one parameter required by default is ``termsAccepted`` which must be set to true, indicating that the user has seen and accepted the Terms of Use of the installation. 
+
+If the feature flag ``api-bearer-auth-handle-tos-acceptance-in-idp`` is enabled (along with the ``api-bearer-auth`` feature flag), Dataverse assumes that the Terms of Service acceptance was handled by the identity provider, e.g. in the OIDC ``consent`` dialog, and the ``termsAccepted`` parameter is not needed.
+
+There is another flag called ``api-bearer-auth-provide-missing-claims`` that can be enabled (along with the ``api-bearer-auth`` feature flag) to allow sending missing user claims in the registration JSON. This is useful when the identity provider does not supply the necessary claims listed above. If properties are provided in the JSON, but corresponding claims already exist in the identity provider, an error will be thrown, outlining the conflicting properties. Note that supplying missing claims is configured via a separate feature flag because using it may introduce user impersonation issues, for example if the identity provider does not provide an email field and the user submits an email address they do not own.
+
+In all cases, the submitted JSON can optionally include the fields ``position`` or ``affiliation``, which will be added to the user's Dataverse account. These fields are optional, and if not provided, they will be persisted as empty in Dataverse.
+
+Signed URLs
+-----------
+
+See :ref:`signed-urls`.
diff --git a/doc/sphinx-guides/source/api/changelog.rst b/doc/sphinx-guides/source/api/changelog.rst
new file mode 100644
index 00000000000..16157459220
--- /dev/null
+++ b/doc/sphinx-guides/source/api/changelog.rst
@@ -0,0 +1,77 @@
+API Changelog (Breaking Changes)
+================================
+
+This API changelog is experimental and we would love feedback on its usefulness. Its primary purpose is to inform API developers of any breaking changes. (We try not to ship any backward incompatible changes, but it happens.) To see a list of new APIs and backward-compatible changes to existing API, please see each version's release notes at https://github.com/IQSS/dataverse/releases
+
+.. contents:: |toctitle|
+    :local:
+    :depth: 1
+
+v6.8
+----
+
+- For POST /api/files/{id}/metadata passing an empty string ("description":"")  or array ("categories":[]) will no longer be ignored. Empty fields will now clear out the values in the file's metadata. To ignore the fields simply do not include them in the JSON string.
+- For PUT /api/datasets/{id}/editMetadata the query parameter "sourceInternalVersionNumber" has been removed and replaced with "sourceLastUpdateTime" to verify that the data being edited hasn't been modified and isn't stale.
+- For GET /api/dataverses/$dataverse-alias/links the Json response has changed breaking the backward compatibility of the API.
+
+v6.7
+----
+
+- An undocumented :doc:`search` parameter called "show_my_data" has been removed. It was never exercised by tests and is believed to be unused. API users should use the :ref:`api-mydata` API instead.
+- /api/datasets/{id}/curationStatus API now includes a JSON object with curation label, createtime, and assigner rather than a string 'label' and it supports a new boolean includeHistory parameter (default false) that returns a JSON array of statuses
+- /api/datasets/{id}/listCurationStates includes new columns "Status Set Time" and "Status Set By" columns listing the time the current status was applied and by whom. It also supports the boolean includeHistory parameter. 
+- Due to updates in libraries used by Dataverse, XML serialization may have changed slightly with respect to whether self-closing tags are used for empty elements. This primarily affects XML-based metadata exports. The XML structure of the export itself has not changed, so this is only an incompatibility if you are not using an XML parser.
+
+v6.6
+----
+
+- The JSON representation for a datasetVersion sent or received in API calls has changed such that
+
+  - "versionNote" -> "deaccessionNote"
+  -  "archiveNote" --> "deaccessionLink"
+  - These may be non-null for deaccessioned versions and an optional new "versionNote" field indicating the reason a version was created may be present on any datasetversion. 
+
+- **/api/metadatablocks** is no longer returning duplicated metadata properties and does not omit metadata properties when called.
+- **/api/roles**: :ref:`show-role` now properly returns 403 Forbidden instead of 401 Unauthorized when you pass a working API token that doesn't have the right permission.
+- The content type for the ``schema.org`` dataset metadata export format has been corrected. It was ``application/json`` and now it is ``application/ld+json``. See also :ref:`export-dataset-metadata-api`.
+
+v6.5
+----
+
+- **/api/datasets/{identifier}/links**: The response from :ref:`list-collections-linked-from-dataset` has been improved to provide a more structured (but backward-incompatible) JSON response.
+
+v6.4
+----
+
+- **/api/datasets/$dataset-id/modifyRegistration**: Changed from GET to POST
+- **/api/datasets/modifyRegistrationPIDMetadataAll**: Changed from GET to POST
+
+v6.3
+----
+
+- **/api/admin/superuser/{identifier}**: The POST endpoint that toggles superuser status has been deprecated in favor of a new PUT endpoint that allows you to specify true or false. See :ref:`set-superuser-status`.
+
+v6.2
+----
+
+- The fields "northLongitude" and "southLongitude" have been deprecated in favor of "northLatitude" and "southLatitude" in the Geolocation metadata block. After upgrading to 6.2 or later, you will need to use the new fields when creating or updating a dataset.
+
+- **/api/datasets/{id}/versions/{versionId}**: The includeFiles parameter has been renamed to excludeFiles. The default behavior remains the same, which is to include files. However, when excludeFiles is set to true, the files will be excluded. A bug that caused the API to only return a deaccessioned dataset if the user had edit privileges has been fixed.
+- **/api/datasets/{id}/versions**: The includeFiles parameter has been renamed to excludeFiles. The default behavior remains the same, which is to include files. However, when excludeFiles is set to true, the files will be excluded.
+- **/api/files/$ID/uningest**: Can now be used by users with the ability to publish the dataset to undo a failed ingest. (Removing a successful ingest still requires being superuser)
+
+v6.1
+----
+
+- The metadata field "Alternative Title" now supports multiple values so you must pass an array rather than a string when populating that field via API. See https://github.com/IQSS/dataverse/pull/9440
+
+v6.0
+----
+
+- **/api/access/datafile**: When a null or invalid API token is provided to download a public (non-restricted) file with this API call, it will result on a ``401`` error response. Previously, the download was allowed (``200`` response). Please note that we noticed this change sometime between 5.9 and 6.0. If you can help us pinpoint the exact version (or commit!), please get in touch. See :doc:`dataaccess`.
+- **/openapi**: This endpoint is currently broken. See https://github.com/IQSS/dataverse/issues/9981
+
+v5.6
+----
+
+- **/api/dataverses/$PARENT/datasets**: The "create dataset" API endpoint now requires the header ``Content-type:application/json`` to be passed. The error can be confusing, saying something about validation, such as ``'{"status":"ERROR","message":"Validation Failed: Title is required. (Invalid value:edu.harvard.iq.dataverse.DatasetField[ id=null ])...``. See :ref:`create-dataset-command`.
diff --git a/doc/sphinx-guides/source/api/client-libraries.rst b/doc/sphinx-guides/source/api/client-libraries.rst
index ef3671256e6..6279ea8329e 100755
--- a/doc/sphinx-guides/source/api/client-libraries.rst
+++ b/doc/sphinx-guides/source/api/client-libraries.rst
@@ -1,21 +1,30 @@
 Client Libraries
 ================
 
-Currently there are client libraries for Python, Javascript, R, and Java that can be used to develop against Dataverse APIs. We use the term "client library" on this page but "Dataverse SDK" (software development kit) is another way of describing these resources. They are designed to help developers express Dataverse concepts more easily in the languages listed below. For support on any of these client libraries, please consult each project's README.
+Listed below are a variety of clienty libraries to help you interact with Dataverse APIs from Python, R, Javascript, etc.
 
-Because Dataverse is a SWORD server, additional client libraries exist for Java, Ruby, and PHP per the :doc:`/api/sword` page.
+To get support for any of these client libraries, please consult each project's README.
 
 .. contents:: |toctitle|
 	:local:
 
-Python
-------
+C/C++
+-----
+
+https://github.com/aeonSolutions/OpenScience-Dataverse-API-C-library is the official C/C++ library for Dataverse APIs.
+
+This C/C++ library was created and is currently maintained by `Miguel T. <https://www.linkedin.com/in/migueltomas/>`_ To learn how to install and use it, see the project's `wiki page <https://github.com/aeonSolutions/OpenScience-Dataverse-API-C-library/wiki>`_.
 
-There are two Python modules for interacting with Dataverse APIs.
+Go
+--
+https://github.com/libis/rdm-dataverse-go-api is Go API library that can be used in your project by simply adding ``github.com/libis/rdm-dataverse-go-api`` as a dependency in your ``go.mod`` file. See the GitHub page for more details and usage examples.
 
-`pyDataverse <https://github.com/AUSSDA/pyDataverse>`_ had its initial release in 2019 and can be installed with ``pip install pyDataverse``. The module is developed by `Stefan Kasberger <http://stefankasberger.at>`_ from `AUSSDA - The Austrian Social Science Data Archive <https://aussda.at>`_.  
+Java
+----
+
+https://github.com/IQSS/dataverse-client-java is the official Java library for Dataverse APIs.
 
-`dataverse-client-python <https://github.com/IQSS/dataverse-client-python>`_ had its initial release in 2015. `Robert Liebowitz <https://github.com/rliebz>`_ created this library while at the `Center for Open Science (COS) <https://centerforopenscience.org>`_ and the COS uses it to integrate the `Open Science Framework (OSF) <https://osf.io>`_ with Dataverse via an add-on which itself is open source and listed on the :doc:`/api/apps` page.
+`Richard Adams <https://www.researchspace.com/electronic-lab-notebook/about_us_team.html>`_ from `ResearchSpace <https://www.researchspace.com>`_ created and maintains this library.
 
 Javascript
 ----------
@@ -24,16 +33,55 @@ https://github.com/IQSS/dataverse-client-javascript is the official Javascript p
 
 It was created and is maintained by `The Agile Monkeys <https://www.theagilemonkeys.com>`_.
 
+Julia
+-----
+
+https://github.com/gaelforget/Dataverse.jl is the official Julia package for Dataverse APIs. It can be found on JuliaHub (https://juliahub.com/ui/Packages/Dataverse/xWAqY/) and leverages pyDataverse to provide an interface to Dataverse's data access API and native API. Dataverse.jl provides a few additional functionalities with documentation (https://gaelforget.github.io/Dataverse.jl/dev/) and a demo notebook (https://gaelforget.github.io/Dataverse.jl/dev/notebook.html).
+
+It was created and is maintained by `Gael Forget <https://github.com/gaelforget>`_.
+
+PHP
+---
+
+There is no official PHP library for Dataverse APIs (please :ref:`get in touch <getting-help-developers>` if you'd like to create one!) but there is a SWORD library written in PHP listed under :ref:`client-libraries` in the :doc:`/api/sword` documentation.
+
+Python
+------
+
+There are multiple Python modules for interacting with Dataverse APIs.
+
+`EasyDataverse <https://github.com/gdcc/easyDataverse>`_ is a Python library designed to simplify the management of Dataverse datasets in an object-oriented way, giving users the ability to upload, download, and update datasets with ease. By utilizing metadata block configurations, EasyDataverse automatically generates Python objects that contain all the necessary details required to create the native Dataverse JSON format used to create or edit datasets. Adding files and directories is also possible with EasyDataverse and requires no additional API calls. This library is particularly well-suited for client applications such as workflows and scripts as it minimizes technical complexities and facilitates swift development.
+
+`python-dvuploader <https://github.com/gdcc/python-dvuploader>`_ implements Jim Myers' excellent `dv-uploader <https://github.com/GlobalDataverseCommunityConsortium/dataverse-uploader>`_ as a Python module. It offers parallel direct uploads to Dataverse backend storage, streams files directly instead of buffering them in memory, and supports multi-part uploads, chunking data accordingly.
+
+`pyDataverse <https://github.com/gdcc/pyDataverse>`_ primarily allows developers to manage Dataverse collections, datasets and datafiles. Its intention is to help with data migrations and DevOps activities such as testing and configuration management. The module is developed by `Stefan Kasberger <https://stefankasberger.at>`_ from `AUSSDA - The Austrian Social Science Data Archive <https://aussda.at>`_.  
+
+`UBC's Dataverse Utilities <https://ubc-library-rc.github.io/dataverse_utils/>`_ are a set of Python console utilities which allow one to upload datasets from a tab-separated-value spreadsheet, bulk release multiple datasets, bulk delete unpublished datasets, quickly duplicate records. replace licenses, and more. For additional information see their `PyPi page <https://pypi.org/project/dataverse-utils/>`_.
+
+`dataverse-client-python <https://github.com/IQSS/dataverse-client-python>`_ had its initial release in 2015. `Robert Liebowitz <https://github.com/rliebz>`_ created this library while at the `Center for Open Science (COS) <https://centerforopenscience.org>`_ and the COS uses it to integrate the `Open Science Framework (OSF) <https://osf.io>`_ with Dataverse installations via an add-on which itself is open source and listed on the :doc:`/api/apps` page.
+
+`Pooch <https://github.com/fatiando/pooch>`_ is a Python library that allows library and application developers to download data. Among other features, it takes care of various protocols, caching in OS-specific locations, checksum verification and adds optional features like progress bars or log messages. Among other popular repositories, Pooch supports Dataverse in the sense that you can reference Dataverse-hosted datasets by just a DOI and Pooch will determine the data repository type, query the Dataverse API for contained files and checksums, giving you an easy interface to download them.
+
+`idsc.dataverse <https://github.com/iza-institute-of-labor-economics/idsc.dataverse>`_ reads metadata and files of datasets from a dataverse dataverse.example1.com and writes them into ~/.idsc/dataverse/api/dataverse.example1.com organized in directories PID_type/prefix/suffix, where PID_type is one of: hdl, doi or ark. It can then ''export'' the local copy of the dataverse from ~/.idsc/dataverse/api/dataverse.example1.com to ~/.idsc/.cache/dataverse.example2.com so that one can upload them to dataverse.example2.com.
+
 R
 -
 
-https://github.com/IQSS/dataverse-client-r is the official R package for Dataverse APIs. The latest release can be installed from `CRAN <https://cran.r-project.org/package=dataverse>`_.
+https://github.com/IQSS/dataverse-client-r is the official R package for Dataverse APIs. The latest release can be installed from `CRAN <https://cran.r-project.org/package=dataverse>`_. 
+The R client can search and download datasets. It is useful when automatically (instead of manually) downloading data files as part of a script. For bulk edit and upload operations, we currently recommend pyDataverse.
 
-It was created by `Thomas Leeper <http://thomasleeper.com>`_ whose dataverse can be found at https://dataverse.harvard.edu/dataverse/leeper
+The package is currently maintained by  `Shiro Kuriwaki <https://github.com/kuriwaki>`_. It was originally created by `Thomas Leeper <https://thomasleeper.com>`_ and then formerly maintained by `Will Beasley <https://github.com/wibeasley>`_.
 
-Java
+Ruby
 ----
 
-https://github.com/IQSS/dataverse-client-java is the official Java library for Dataverse APIs.
+https://github.com/libis/dataverse_api is a Ruby gem for Dataverse APIs. It is registered as a library on Rubygems (https://rubygems.org/search?query=dataverse).
+
+The gem is created and maintained by the LIBIS team (https://www.libis.be) at the University of Leuven (https://www.kuleuven.be).
+
+Rust
+----
+
+https://github.com/gdcc/rust-dataverse
 
-`Richard Adams <http://www.researchspace.com/electronic-lab-notebook/about_us_team.html>`_ from `ResearchSpace <http://www.researchspace.com>`_ created and maintains this library.
+The Rust Dataverse client is a comprehensive crate designed for seamless interaction with the Dataverse API. It facilitates essential operations such as collection, dataset, and file management. Additionally, the crate includes a user-friendly command-line interface (CLI) that brings the full functionality of the library to the command line. This project is actively maintained by `Jan Range <https://github.com/jr-1991>`_.
diff --git a/doc/sphinx-guides/source/api/curation-labels.rst b/doc/sphinx-guides/source/api/curation-labels.rst
new file mode 100644
index 00000000000..50ac05b670f
--- /dev/null
+++ b/doc/sphinx-guides/source/api/curation-labels.rst
@@ -0,0 +1,135 @@
+Dataset Curation Status API
+===========================
+
+When the :ref:`:AllowedCurationLabels <:AllowedCurationLabels>` setting has been used to define Curation Labels, this API can be used to set these labels on draft datasets. 
+Superusers can define which set of labels are allowed for a given datasets in a collection/an individual dataset using the api described in the :doc:`/admin/dataverses-datasets` section.
+The API here can be used by curators/those who have permission to publish the dataset to get/set/change/delete the label currently assigned to a draft dataset.
+If the :ref:`dataverse.ui.show-curation-status-to-all` flag is enabled, users who can see the draft dataset version can use the get API call.
+
+This functionality is intended as a mechanism to integrate the Dataverse software with an external curation process/application: it is a way to make the state of a draft dataset, 
+as defined in the external process, visible within Dataverse. These labels have no other effect in Dataverse and are only visible to curators/those with permission to publish the dataset. 
+Any curation label assigned to a draft dataset will be removed upon publication.
+
+Dataverse tracks the Curation Label as well as when it was assigned and by whom. It also keeps track of the history of prior assignments.
+  
+Get a Draft Dataset's Curation Status
+-------------------------------------
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export DATASET_ID='12345'
+  export DATASET_PID='doi:10.5072/FK2A1B2C3'
+  export SERVER_URL=https://demo.dataverse.org
+ 
+  Example 1: Get the label using the DATASET ID
+ 
+    curl -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/datasets/$DATASET_ID/curationStatus"
+
+  Example 2: Get the label using the DATASET PID
+
+    curl -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/datasets/:persistentId/curationStatus?persistentId=$DATASET_PID"
+
+You should expect a 200 ("OK") response and the draft dataset's curation status as a JSON object contained in a JSON 'data' object. The status will include a 'label','createTime', and the 'assigner'.
+
+If the optional includeHistory query parameter is set to true, the responses 'data' entry will be a JSON array of curation status objects 
+
+    curl -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/datasets/:persistentId/curationStatus?persistentId=$DATASET_PID&includeHistory=true"
+
+For draft datasets that were created prior to v6.7, it is possible that curation status objects will have no createTime or assigner.
+
+Set a Draft Dataset's Curation Label
+------------------------------------
+
+To add a curation label for a draft Dataset, specify the Dataset ID (DATASET_ID) or Persistent identifier (DATASET_PID) and the label desired.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export DATASET_ID='12345'
+  export DATASET_PID='doi:10.5072/FK2A1B2C3'
+  export LABEL='Author contacted'
+  export SERVER_URL=https://demo.dataverse.org
+ 
+  Example: Add the label using the DATASET ID 
+ 
+    curl -X PUT -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/datasets/$DATASET_ID/curationStatus?label=$LABEL"
+
+  Example 2: Add a description using the DATASET PID
+
+    curl -X PUT -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/datasets/:persistentId/curationStatus?label=$LABEL&persistentId=$DATASET_PID"
+
+You should expect a 200 ("OK") response indicating that the label has been set. 403/Forbidden and 400/Bad Request responses are also possible, i.e. if you don't have permission to make this change or are trying to add a label that isn't in the allowed set or to add a label to a dataset with no draft version.
+
+Note that Dataverse will add the current time as the createTime and the user as the 'assigner' of the label.
+
+
+Delete a Draft Dataset's Curation Label
+---------------------------------------
+
+To delete the curation label on a draft Dataset, specify the Dataset ID (DATASET_ID) or Persistent identifier (DATASET_PID).
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export DATASET_PID='doi:10.5072/FK2A1B2C3'
+  export SERVER_URL=https://demo.dataverse.org
+ 
+  Example: Delete the label using the DATASET PID
+
+    curl -X DELETE -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/datasets/:persistentId/curationStatus?persistentId=$DATASET_PID"
+
+You should expect a 200 ("OK") response indicating the label has been removed.
+
+
+Get the Set of Allowed Labels for a Dataset
+-------------------------------------------
+
+To get the list of allowed curation labels allowed for a given Dataset
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export DATASET_ID='12345'
+  export DATASET_PID='doi:10.5072/FK2A1B2C3'
+  export SERVER_URL=https://demo.dataverse.org
+ 
+  Example 1: Get the label using the DATASET ID
+ 
+    curl -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/datasets/$DATASET_ID/allowedCurationLabels"
+
+  Example 2: Get the label using the DATASET PID
+
+    curl -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/datasets/:persistentId/allowedCurationLabels?persistentId=$DATASET_PID"
+
+You should expect a 200 ("OK") response with a comma-separated list of allowed labels contained in a JSON 'data' object.
+
+
+Get a Report on the Curation Status of All Datasets
+---------------------------------------------------
+
+To get a CSV file listing the curation statuses assigned to each Dataset with a draft version, along with the creation and last modification dates, and list of those with permissions to publish the version.
+
+This API call is restricted to superusers.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+ 
+  Example: Get the report
+ 
+    curl -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/datasets/listCurationStates"
+
+You should expect a 200 ("OK") response with a CSV formatted response.
+
+The CSV response includes the following columns in order:
+#. Dataset Title (as a hyperlink to the dataset page)
+#. Creation Date of the draft dataset version
+#. Latest Modification Date of the draft dataset version
+#. Assigned curation status or '<none>' if no curation status is assigned but was previously, null if no curation state has every been set.
+#. Time when the curation status was applied to the draft dataset version
+#. The user who assigned this curation status
+#. (and beyond): Users (comma separated list) with the Roles (column headings) that can publish datasets and therefore see/set curation status
+When includeHistory is true, multiple rows may be present for each dataset, showing the full history of curation statuses.
+
diff --git a/doc/sphinx-guides/source/api/dataaccess.rst b/doc/sphinx-guides/source/api/dataaccess.rst
index eca43ba1c5e..0782665776d 100755
--- a/doc/sphinx-guides/source/api/dataaccess.rst
+++ b/doc/sphinx-guides/source/api/dataaccess.rst
@@ -1,12 +1,83 @@
 Data Access API
 ===============
 
-The Data Access API provides programmatic download access to the files stored under Dataverse. 
+The Data Access API provides programmatic download access to the files stored in a Dataverse installation. 
 More advanced features of the Access API include format-specific transformations (thumbnail generation/resizing for images; converting tabular data into alternative file formats) and access to the data-level metadata that describes the contents of the tabular files. 
 
 .. contents:: |toctitle|
    :local:
 
+.. _download-by-dataset-api:
+
+Downloading All Files in a Dataset
+----------------------------------
+
+The "download by dataset" API downloads as many files as possible from a dataset as a zipped bundle.
+
+By default, tabular files are downloaded in their "archival" form (tab-separated values). To download the original files (Stata, for example), add ``format=original`` as a query parameter.
+
+There are a number of reasons why not all of the files can be downloaded:
+
+- Some of the files are restricted and your API token doesn't have access (you will still get the unrestricted files).
+- The Dataverse installation has limited how large the zip bundle can be.
+
+In the curl example below, the flags ``-O`` and ``-J`` are used. When there are no errors, this has the effect of saving the file under the name suggested by Dataverse (which as of v6.7 will be based on the persistent identifier of the dataset and the latest version number, for example ``doi-10.70122-fk2-n2xgbj_1.1.zip``; in prior versions the file name was ``dataverse_files.zip`` in all cases). This mirrors the way the files are saved when downloaded in a browser. The flags also force error messages to be downloaded as a file.
+
+Please note that in addition to the files from dataset, an additional file call "MANIFEST.TXT" will be included in the zipped bundle. It has additional information about the files.
+
+There are two forms of the "download by dataset" API, a basic form and one that supports dataset versions.
+
+Basic Download By Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The basic form downloads files from the latest accessible version of the dataset. If you are not using an API token, this means the most recently published version. If you are using an API token with full access to the dataset, this means the draft version or the most recently published version if no draft exists.
+
+A curl example using a DOI (no version):
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.70122/FK2/N2XGBJ
+
+  curl -L -O -J -H "X-Dataverse-key:$API_TOKEN" $SERVER_URL/api/access/dataset/:persistentId/?persistentId=$PERSISTENT_ID
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -L -O -J -H X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx https://demo.dataverse.org/api/access/dataset/:persistentId/?persistentId=doi:10.70122/FK2/N2XGBJ
+
+Download By Dataset By Version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The second form of the "download by dataset" API allows you to specify which version you'd like to download files from. As with the ``datasets`` API endpoints described in the :doc:`native-api` section, the following identifiers can be used.
+
+* ``:draft``  the draft version, if any
+* ``:latest`` either a draft (if exists) or the latest published version.
+* ``:latest-published`` the latest published version
+* ``x.y`` a specific version, where ``x`` is the major version number and ``y`` is the minor version number.
+* ``x`` same as ``x.0``
+
+A curl example using a DOI (with version):
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.70122/FK2/N2XGBJ
+  export VERSION=2.0
+
+  curl -O -J -H "X-Dataverse-key:$API_TOKEN" $SERVER_URL/api/access/dataset/:persistentId/versions/$VERSION?persistentId=$PERSISTENT_ID
+
+Similarly to the API above, this will save the downloaded bundle under the name based on the persistent identifier and the version number, for example, ``doi-10.70122-fk2-n2xgbj_1.1.zip`` or ``doi-10.70122-fk2-n2xgbj_draft.zip``.
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -O -J -H X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx https://demo.dataverse.org/api/access/dataset/:persistentId/versions/2.0?persistentId=doi:10.70122/FK2/N2XGBJ
+
 Basic File Access
 -----------------
 
@@ -14,11 +85,11 @@ Basic access URI:
 
 ``/api/access/datafile/$id``
 
-.. note:: Files can be accessed using persistent identifiers. This is done by passing the constant ``:persistentId`` where the numeric id of the file is expected, and then passing the actual persistent id as a query parameter with the name ``persistentId``.
+.. note:: Files can be accessed using persistent identifiers. This is done by passing the constant ``:persistentId`` where the numeric id of the file is expected, and then passing the actual persistent id as a query parameter with the name ``persistentId``. However, this file access method is only effective when the FilePIDsEnabled option is enabled, which can be authorized by the admin. For further information, refer to :ref:`:FilePIDsEnabled`. 
 
   Example: Getting the file whose DOI is *10.5072/FK2/J8SJZB* ::
 
-    GET http://$SERVER/api/access/datafile/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB
+    GET http://$SERVER/api/access/datafile/:persistentId?persistentId=doi:10.5072/FK2/J8SJZB
 
 
 Parameters:
@@ -58,16 +129,53 @@ the following parameter values are supported (for image and pdf files only):
 ==============  ===========
 Value           Description
 ==============  ===========
-true            Generates a thumbnail image, by rescaling to the default thumbnail size (64 pixels)
-``N``           Rescales the image to ``N`` pixels.
+true            Generates a thumbnail image by rescaling to the default thumbnail size (64 pixels wide).
+``N``           Rescales the image to ``N`` pixels wide. ``imageThumb=true`` and ``imageThumb=64`` are equivalent.
+==============  ===========
+
+Headers:
+~~~~~~~~
+
+==============  ===========
+Header          Description
+==============  ===========
+Range           Download a specified byte range. Examples:
+
+                - ``bytes=0-9`` gets the first 10 bytes.
+                - ``bytes=10-19`` gets 10 bytes from the middle.
+                - ``bytes=-10`` gets the last 10 bytes.
+                - ``bytes=9-`` gets all bytes except the first 10.
+
+                Only a single range is supported. The "If-Range" header is not supported. For more on the "Range" header, see https://developer.mozilla.org/en-US/docs/Web/HTTP/Range_requests
 ==============  ===========
 
+Examples
+~~~~~~~~
+
+A curl example of using the ``Range`` header to download the first 10 bytes of a file using its file id (database id):
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export FILE_ID=42
+  export RANGE=0-9
+
+  curl -H "Range:bytes=$RANGE" $SERVER_URL/api/access/datafile/$FILE_ID
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "Range:bytes=0-9" https://demo.dataverse.org/api/access/datafile/42
+
 Multiple File ("bundle") download
 ---------------------------------
 
 ``/api/access/datafiles/$id1,$id2,...$idN``
 
-Returns the files listed, zipped. 
+Alternate Form: POST to ``/api/access/datafiles`` with a ``fileIds`` input field containing the same comma separated list of file ids. This is most useful when your list of files surpasses the allowed URL length (varies but can be ~2000 characters).  
+
+Returns the files listed, zipped. As of v6.7 the name of the zipped bundle will be based on the persistent identifier of the parent dataset, for example, ``doi-10.70122-fk2-xxyyzz.zip``; in prior versions the file name was ``dataverse_files.zip`` in all cases).
 
 .. note:: If the request can only be completed partially - if only *some* of the requested files can be served (because of the permissions and/or size restrictions), the file MANIFEST.TXT included in the zipped bundle will have entries specifying the reasons the missing files could not be downloaded. IN THE FUTURE the API will return a 207 status code to indicate that the result was a partial success. (As of writing this - v.4.11 - this hasn't been implemented yet)
 
@@ -112,6 +220,7 @@ Value           Description
 ID              Exports file with specific file metadata ``ID``.
 ==============  ===========
 
+.. _data-variable-metadata-access:
 
 Data Variable Metadata Access
 -----------------------------
@@ -212,9 +321,9 @@ especially with data files with large numbers of variables. See
 Preprocessed Data
 -----------------
 
-``/api/access/datafile/$id/metadata/preprocessed``
+``/api/access/datafile/$id?format=prep``
 
-This method provides the "preprocessed data" - a summary record that describes the values of the data vectors in the tabular file, in JSON. These metadata values are used by TwoRavens, the companion data exploration utility of the Dataverse application. Please note that this format might change in the future.
+This method provides the "preprocessed data" - a summary record that describes the values of the data vectors in the tabular file, in JSON. These metadata values are used by earlier versions of Data Explorer, an external tool that integrates with a Dataverse installation (see :doc:`/admin/external-tools`). Please note that this format might change in the future.
 
 Authentication and Authorization
 -------------------------------- 
@@ -296,3 +405,32 @@ This method returns a list of Authenticated Users who have requested access to t
 A curl example using an ``id``::
 
     curl -H "X-Dataverse-key:$API_TOKEN" -X GET http://$SERVER/api/access/datafile/{id}/listRequests
+
+User Has Requested Access to a File:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``/api/access/datafile/{id}/userFileAccessRequested``
+
+This method returns true or false depending on whether or not the calling user has requested access to a particular file.
+
+A curl example using an ``id``::
+
+    curl -H "X-Dataverse-key:$API_TOKEN" -X GET "http://$SERVER/api/access/datafile/{id}/userFileAccessRequested"
+
+
+Get User Permissions on a File:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``/api/access/datafile/{id}/userPermissions``
+
+This method returns the permissions that the calling user has on a particular file.
+
+In particular, the user permissions that this method checks, returned as booleans, are the following:
+
+* Can download the file
+* Can manage the file permissions
+* Can edit the file owner dataset
+
+A curl example using an ``id``::
+
+    curl -H "X-Dataverse-key:$API_TOKEN" -X GET "http://$SERVER/api/access/datafile/{id}/userPermissions"
diff --git a/doc/sphinx-guides/source/api/external-tools.rst b/doc/sphinx-guides/source/api/external-tools.rst
index fc5adf00c2b..ae0e44b36aa 100644
--- a/doc/sphinx-guides/source/api/external-tools.rst
+++ b/doc/sphinx-guides/source/api/external-tools.rst
@@ -1,7 +1,7 @@
 Building External Tools
 =======================
 
-External tools can provide additional features that are not part of Dataverse itself, such as data exploration. Thank you for your interest in building an external tool for Dataverse!
+External tools can provide additional features that are not part of the Dataverse Software itself, such as data exploration. Thank you for your interest in building an external tool for the Dataverse Software!
 
 .. contents:: |toctitle|
   :local:
@@ -9,11 +9,19 @@ External tools can provide additional features that are not part of Dataverse it
 Introduction
 ------------
 
-You can think of a external tool as **a glorified hyperlink** that opens a browser window in a new tab on some other website. The term "external" is used to indicate that the user has left the Dataverse web interface. For example, perhaps the user is looking at a dataset on https://demo.dataverse.org . They click "Explore" and are brought to https://fabulousfiletool.com?fileId=42&siteUrl=http://demo.dataverse.org
+External tools are additional applications the user can access or open from your Dataverse installation to preview, explore, and manipulate data files and datasets. The term "external" is used to indicate that the tool is not part of the main Dataverse Software.
 
-The "other website" (fabulousfiletool.com in the example above) is probably part of the same ecosystem of scholarly publishing that Dataverse itself participates in. Sometimes the other website runs entirely in the browser. Sometimes the other website is a full blown server side web application like Dataverse itself.
+Once you have created the external tool itself (which is most of the work!), you need to teach a Dataverse installation how to construct URLs that your tool needs to operate. For example, if you've deployed your tool to fabulousfiletool.com your tool might want the ID of a file and the siteUrl of the Dataverse installation like this: https://fabulousfiletool.com?fileId=42&siteUrl=https://demo.dataverse.org
 
-The possibilities for external tools are endless. Let's look at some examples to get your creative juices flowing.
+In short, you will be creating a manifest in JSON format that describes not only how to construct URLs for your tool, but also what types of files your tool operates on, where it should appear in the Dataverse installation web interfaces, etc. 
+
+The possibilities for external tools are endless. Let's look at some examples to get your creative juices flowing. Then we'll look at a complete list of parameters you can use when creating the manifest file for your tool.
+
+If you're still looking for more information on external tools, you can also watch a video introduction called `Background on the External Tool Framework`_ (slides_) from the 2020 Dataverse Community Meeting.
+
+.. _Background on the External Tool Framework: https://youtu.be/YH4I_kldmGI?t=159
+
+.. _slides: https://osf.io/xjdfw/
 
 Examples of External Tools
 --------------------------
@@ -21,7 +29,7 @@ Examples of External Tools
 Note: This is the same list that appears in the :doc:`/admin/external-tools` section of the Admin Guide.
 
 .. csv-table:: 
-   :header: "Tool", "Type", "Scope", "Description"
+   :header-rows: 1
    :widths: 20, 10, 5, 65
    :delim: tab
    :file: ../_static/admin/dataverse-external-tools.tsv
@@ -29,25 +37,37 @@ Note: This is the same list that appears in the :doc:`/admin/external-tools` sec
 How External Tools Are Presented to Users
 -----------------------------------------
 
-In short, an external tool appears under an "Explore" or "Configure" button either on a dataset landing page or a file landing page. See also the :ref:`testing-external-tools` section of the Admin Guide for some perspective on how installations of Dataverse will expect to test your tool before announcing it to their users.
+An external tool can appear in your Dataverse installation in a variety of ways:
+
+- as an explore, preview, query or configure option for a file
+- as an explore or configure option for a dataset
+- as an embedded preview on the file landing page
+
+See also the :ref:`testing-external-tools` section of the Admin Guide for some perspective on how Dataverse installations will expect to test your tool before announcing it to their users.
 
 Creating an External Tool Manifest
 ----------------------------------
 
-External tools must be expressed in an external tool manifest file, a specific JSON format Dataverse requires. As the author of an external tool, you are expected to provide this JSON file and installation instructions on a web page for your tool.
+External tools must be expressed in an external tool manifest file, a specific JSON format a Dataverse installation requires. As the author of an external tool, you are expected to provide this JSON file and installation instructions on a web page for your tool.
 
 Examples of Manifests
 +++++++++++++++++++++
 
-Let's look at two examples of external tool manifests (one at the file level and one at the dataset level) before we dive into how they work.
+Let's look at a few examples of external tool manifests (both at the file level and at the dataset level) before we dive into how they work.
+
+.. _tools-for-files:
 
 External Tools for Files
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-:download:`fabulousFileTool.json <../_static/installation/files/root/external-tools/fabulousFileTool.json>` is a file level explore tool that operates on tabular files:
+:download:`fabulousFileTool.json <../_static/installation/files/root/external-tools/fabulousFileTool.json>` is a file level (both an "explore" tool and a "preview" tool) that operates on tabular files:
 
 .. literalinclude:: ../_static/installation/files/root/external-tools/fabulousFileTool.json
 
+:download:`auxFileTool.json <../_static/installation/files/root/external-tools/auxFileTool.json>` is a file level preview tool that operates on auxiliary files associated with a data file (note the "requirements" section):
+
+.. literalinclude:: ../_static/installation/files/root/external-tools/auxFileTool.json
+
 External Tools for Datasets
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -64,29 +84,47 @@ Terminology
     ===========================  ==========
     Term                         Definition
     ===========================  ==========
-    external tool manifest       A **JSON file** the defines the URL constructed by Dataverse when users click "Explore" or "Configure" buttons. External tool makers are asked to host this JSON file on a website (no app store yet, sorry) and explain how to use install and use the tool. Examples include :download:`fabulousFileTool.json <../_static/installation/files/root/external-tools/fabulousFileTool.json>` and :download:`dynamicDatasetTool.json <../_static/installation/files/root/external-tools/dynamicDatasetTool.json>` as well as the real world examples above such as Data Explorer.
+    external tool manifest       A **JSON file** the defines the URL constructed by a Dataverse installation when users click explore or configure tool options. External tool makers are asked to host this JSON file on a website (no app store yet, sorry) and explain how to use install and use the tool. Examples include :download:`fabulousFileTool.json <../_static/installation/files/root/external-tools/fabulousFileTool.json>` and :download:`dynamicDatasetTool.json <../_static/installation/files/root/external-tools/dynamicDatasetTool.json>` as well as the real world examples above such as Data Explorer.
 
-    displayName                  The **name** of the tool in the Dataverse web interface. For example, "Data Explorer".
+    displayName                  The **name** of the tool in the Dataverse installation web interface. For example, "Data Explorer".
 
-    description                  The **description** of the tool, which appears in a popup (for configure tools only) so the user who clicked the tool can learn about the tool before being redirected the tool in a new tab in their browser. HTML is supported.
+    description                  The **description** of the tool, which appears in a popup (for configure tools only) so the user who clicked the tool can learn about the tool before being redirected to the tool in a new tab in their browser. HTML is supported.
 
     scope                        Whether the external tool appears and operates at the **file** level or the **dataset** level. Note that a file level tool much also specify the type of file it operates on (see "contentType" below).
 
-    type                         Whether the external tool is an **explore** tool or a **configure** tool. Configure tools require an API token because they make changes to data files (files within datasets). Configure tools are currently not supported at the dataset level (no "Configure" button appears in the GUI for datasets).
+    types                        Whether the external tool is an **explore** tool, a **preview** tool, a **query** tool, a **configure** tool or any combination of these (multiple types are supported for a single tool). Configure tools require an API token because they make changes to data files (files within datasets). The older "type" keyword that allows you to pass a single type as a string is deprecated but still supported.
 
     toolUrl                      The **base URL** of the tool before query parameters are added.
-
+    
     contentType                  File level tools operate on a specific **file type** (content type or MIME type such as "application/pdf") and this must be specified. Dataset level tools do not use contentType.
 
-    toolParameters               **Query parameters** are supported and described below.
+    toolParameters               **httpMethod**, **queryParameters**, and **allowedApiCalls** are supported and described below.
+    
+    httpMethod                   Either ``GET`` or ``POST``.
 
-    queryParameters              **Key/value combinations** that can be appended to the toolUrl. For example, once substitution takes place (described below) the user may be redirected to ``https://fabulousfiletool.com?fileId=42&siteUrl=http://demo.dataverse.org``.
+    queryParameters              **Key/value combinations** that can be appended to the toolUrl. For example, once substitution takes place (described below) the user may be redirected to ``https://fabulousfiletool.com?fileId=42&siteUrl=https://demo.dataverse.org``.
 
     query parameter keys         An **arbitrary string** to associate with a value that is populated with a reserved word (described below). As the author of the tool, you have control over what "key" you would like to be passed to your tool. For example, if you want to have your tool receive and operate on the query parameter "dataverseFileId=42" instead of just "fileId=42", that's fine.
 
     query parameter values       A **mechanism for substituting reserved words with dynamic content**. For example, in your manifest file, you can use a reserved word (described below) such as ``{fileId}`` to pass a file's database id to your tool in a query parameter. Your tool might receive this query parameter as "fileId=42".
 
     reserved words               A **set of strings surrounded by curly braces** such as ``{fileId}`` or ``{datasetId}`` that will be inserted into query parameters. See the table below for a complete list.
+    
+    allowedApiCalls              An array of objects defining callbacks the tool is allowed to make to the Dataverse API. If the dataset or file being accessed is not public, the callback URLs will be signed to allow the tool access for a defined time.
+    
+    allowedApiCalls name         A name the tool will use to identify this callback URL such as ``retrieveDataFile``.
+    
+    allowedApiCalls urlTemplate  The relative URL for the callback using reserved words to indicate where values should by dynamically substituted such as ``/api/v1/datasets/{datasetId}``.
+    
+    allowedApiCalls httpMethod   Which HTTP method the specified callback uses such as ``GET`` or ``POST``.
+    
+    allowedApiCalls timeOut      For non-public datasets and datafiles, how many minutes the signed URLs given to the tool should be valid for. Must be an integer.
+
+    requirements                 **Resources your tool needs to function.** For now, the only requirement you can specify is that one or more auxiliary files exist (see auxFilesExist in the :ref:`tools-for-files` example). Currently, requirements only apply to preview tools. If the requirements are not met, the preview tool is not shown.
+
+    auxFilesExist                **An array containing formatTag and formatVersion pairs** for each auxiliary file that your tool needs to download to function properly. For example, a required aux file could have a ``formatTag`` of "NcML" and a ``formatVersion`` of "1.0". See also :doc:`/developers/aux-file-support`.
+    
+    toolName                     A **name** of an external tool that is used to differentiate between external tools and also used in bundle.properties for localization in the Dataverse installation web interface. For example, the toolName for Data Explorer is ``explorer``. For the Data Curation Tool the toolName is ``dct``. This is an optional parameter in the manifest JSON file.   
     ===========================  ==========
 
 Reserved Words
@@ -102,9 +140,9 @@ Reserved Words
 
     ``{fileId}``                 depends     The database ID of a file the user clicks "Explore" or "Configure" on. For example, ``42``. This reserved word is **required for file level tools** unless you use ``{filePid}`` instead.
 
-    ``{filePid}``                depends     The Persistent ID (DOI or Handle) of a file the user clicks "Explore" or "Configure" on. For example, ``doi:10.7910/DVN/TJCLKP/3VSTKY``. Note that not all installations of Dataverse have Persistent IDs (PIDs) enabled at the file level. This reserved word is **required for file level tools** unless you use ``{fileId}`` instead.
+    ``{filePid}``                depends     The Persistent ID (DOI or Handle) of a file the user clicks "Explore" or "Configure" on. For example, ``doi:10.7910/DVN/TJCLKP/3VSTKY``. Note that not all Dataverse installations have Persistent IDs (PIDs) enabled at the file level. This reserved word is **required for file level tools** unless you use ``{fileId}`` instead.
 
-    ``{apiToken}``               optional    The Dataverse API token of the user launching the external tool, if available. Please note that API tokens should be treated with the same care as a password. For example, ``f3465b0c-f830-4bc7-879f-06c0745a5a5c``.
+    ``{apiToken}``               optional    The Dataverse installation's API token of the user launching the external tool, if available. Please note that API tokens should be treated with the same care as a password. For example, ``f3465b0c-f830-4bc7-879f-06c0745a5a5c``.
 
     ``{datasetId}``              depends     The database ID of the dataset. For example, ``42``. This reseved word is **required for dataset level tools** unless you use ``{datasetPid}`` instead.
 
@@ -112,20 +150,59 @@ Reserved Words
 
     ``{datasetVersion}``         optional    The friendly version number ( or \:draft ) of the dataset version the file level tool is being launched from. For example, ``1.0`` or ``:draft``.
 
-    ``{localeCode}``             optional    The code for the language ("en" for English, "fr" for French, etc.) that user has selected from the language toggle in Dataverse. See also :ref:`i18n`.
+    ``{localeCode}``             optional    The code for the language ("en" for English, "fr" for French, etc.) that user has selected from the language toggle in a Dataverse installation. See also :ref:`i18n`.
     ===========================  ==========  ===========
 
+.. _api-exttools-auth:
+
+Authorization Options
++++++++++++++++++++++
+
+When called for datasets or data files that are not public (i.e. in a draft dataset or for a restricted file), external tools are allowed access via the user's credentials. This is accomplished by one of two mechanisms:
+
+.. _signed-urls:
+
+Signed URLs
+^^^^^^^^^^^
+
+The signed URL mechanism is more secure than exposing API tokens and therefore recommended.
+
+- Configured via the ``allowedApiCalls`` section of the manifest. The tool will be provided with signed URLs allowing the specified access to the given dataset or datafile for the specified amount of time. The tool will not be able to access any other datasets or files the user may have access to and will not be able to make calls other than those specified.
+- For tools invoked via a GET call, Dataverse will include a callback query parameter with a Base64 encoded value. The decoded value is a signed URL that can be called to retrieve a JSON response containing all of the queryParameters and allowedApiCalls specified in the manfiest.
+- For tools invoked via POST, Dataverse will send a JSON body including the requested queryParameters and allowedApiCalls. Dataverse expects the response to the POST to indicate a redirect which Dataverse will use to open the tool.
+
+API Token
+^^^^^^^^^
+
+The API token mechanism is deprecated. Because it is less secure than signed URLs, it is not recommended for new external tools.
+
+- Configured via the ``queryParameters`` by including an ``{apiToken}`` value. When this is present Dataverse will send the user's apiToken to the tool. With the user's API token, the tool can perform any action via the Dataverse API that the user could. External tools configured via this method should be assessed for their trustworthiness.
+- For tools invoked via GET, this will be done via a query parameter in the request URL which could be cached in the browser's history. Dataverse expects the response to the POST to indicate a redirect which Dataverse will use to open the tool.
+- For tools invoked via POST, Dataverse will send a JSON body including the apiToken.
+
+Internationalization of Your External Tool
+++++++++++++++++++++++++++++++++++++++++++
+
+The name and description of your tool can be localized and made available in different languages in your Dataverse installation's web interface. Use the ``toolName`` parameter in the manifest JSON file and then add that toolName to bundle.properties.
+
+For example, if the ``toolName`` of your external tool is ``fabulous`` then the lines in Bundle.properties should be:
+
+``externaltools.fabulous.displayname=Fabulous File Tool``
+``externaltools.fabulous.description=Fabulous Fun for Files!``
+
+
 Using Example Manifests to Get Started
 ++++++++++++++++++++++++++++++++++++++
 
 Again, you can use :download:`fabulousFileTool.json <../_static/installation/files/root/external-tools/fabulousFileTool.json>` or :download:`dynamicDatasetTool.json <../_static/installation/files/root/external-tools/dynamicDatasetTool.json>` as a starting point for your own manifest file.
+Additional working examples, including ones using :ref:`signed-urls`, are available at https://github.com/gdcc/dataverse-previewers .
 
 Testing Your External Tool
 --------------------------
 
-As the author of an external tool, you are not expected to learn how to install and operate Dataverse. There's a very good chance your tool can be added to a server Dataverse developers use for testing if you reach out on any of the channels listed under :ref:`getting-help-developers` in the Developer Guide.
+As the author of an external tool, you are not expected to learn how to install and operate a Dataverse installation. There's a very good chance your tool can be added to a server Dataverse Community developers use for testing if you reach out on any of the channels listed under :ref:`getting-help-developers` in the Developer Guide.
 
-By all means, if you'd like to install Dataverse yourself, a number of developer-centric options are available. For example, there's a script to spin up Dataverse on EC2 at https://github.com/IQSS/dataverse-sample-data . The process for using curl to add your external tool to a Dataverse installation is documented under :ref:`managing-external-tools` in the Admin Guide.
+By all means, if you'd like to install a Dataverse installation yourself, a number of developer-centric options are available. For example, there's a script to spin up a Dataverse installation on EC2 at https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible . The process for using curl to add your external tool to your Dataverse installation is documented under :ref:`managing-external-tools` in the Admin Guide.
 
 Spreading the Word About Your External Tool
 -------------------------------------------
@@ -135,18 +212,19 @@ Adding Your Tool to the Inventory of External Tools
 
 Once you've gotten your tool working, please make a pull request to update the list of tools above! You are also welcome to download :download:`dataverse-external-tools.tsv <../_static/admin/dataverse-external-tools.tsv>`, add your tool to the TSV file, create and issue at https://github.com/IQSS/dataverse/issues , and then upload your TSV file there.
 
-Unless your tool runs entirely in a browser, you may have integrated server-side software with Dataverse. If so, please double check that your software is listed in the :doc:`/admin/integrations` section of the Admin Guide and if not, please open an issue or pull request to add it. Thanks!
+Unless your tool runs entirely in a browser, you may have integrated server-side software with your Dataverse installation. If so, please double check that your software is listed in the :doc:`/admin/integrations` section of the Admin Guide and if not, please open an issue or pull request to add it. Thanks!
 
-If you've thought to yourself that there ought to be an app store for Dataverse external tools, you're not alone. Please see https://github.com/IQSS/dataverse/issues/5688 :)
+If you've thought to yourself that there ought to be an app store for Dataverse Software external tools, you're not alone. Please see https://github.com/IQSS/dataverse/issues/5688 :)
 
 Demoing Your External Tool
 ++++++++++++++++++++++++++
 
-https://demo.dataverse.org is the place to play around with Dataverse and your tool can be included. Please email support@dataverse.org to start the conversation about adding your tool. Additionally, you are welcome to open an issue at https://github.com/IQSS/dataverse-ansible which already includes a number of the tools listed above.
+https://demo.dataverse.org is the place to play around with the Dataverse Software and your tool can be included. Please email support@dataverse.org to start the conversation about adding your tool. Additionally, you are welcome to open an issue at https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible which already includes a number of the tools listed above.
 
 Announcing Your External Tool
 +++++++++++++++++++++++++++++
 
 You are welcome to announce your external tool at https://groups.google.com/forum/#!forum/dataverse-community
 
-If you're too shy, we'll do it for you. We'll probably tweet about it too. Thank you for your contribution to Dataverse!
+If you're too shy, we'll do it for you. We'll probably tweet about it too. Thank you for your contribution to the Dataverse Project!
+
diff --git a/doc/sphinx-guides/source/api/faq.rst b/doc/sphinx-guides/source/api/faq.rst
index a3994501f6c..c335b30a0e0 100644
--- a/doc/sphinx-guides/source/api/faq.rst
+++ b/doc/sphinx-guides/source/api/faq.rst
@@ -11,13 +11,13 @@ What is an API?
 
 See "What is an API?" in the :doc:`intro` section.
 
-What Are Common Use Cases for Dataverse APIs?
----------------------------------------------
+What Are Common Use Cases for Dataverse Software APIs?
+----------------------------------------------------------
 
 See the :doc:`getting-started` section for common use cases for researchers and curators. Other types of API users should find starting points at :ref:`types-of-api-users`.
 
-Where Can I Find Examples of Using Dataverse APIs?
---------------------------------------------------
+Where Can I Find Examples of Using Dataverse Software APIs?
+-----------------------------------------------------------
 
 See the :doc:`getting-started` section links to examples using curl.
 
@@ -26,7 +26,7 @@ For examples in Javascript, Python, R, and Java, and PHP, see the :doc:`apps` an
 When Should I Use the Native API vs. the SWORD API?
 ---------------------------------------------------
 
-The :doc:`sword` is based on a standard, works fine, and is fully supported, but much more development effort has been going into the :doc:`native-api`, which is not based on a standard. It is specific to Dataverse.
+The :doc:`sword` is based on a standard, works fine, and is fully supported, but much more development effort has been going into the :doc:`native-api`, which is not based on a standard. It is specific to the Dataverse Software.
 
 SWORD uses XML. The Native API uses JSON.
 
@@ -35,7 +35,7 @@ SWORD only supports a dozen or so operations. The Native API supports many more.
 To Operate on a Dataset Should I Use Its DOI (or Handle) or Its Database ID?
 ----------------------------------------------------------------------------
 
-It is fine to target a datasets using either its Persistent ID (PID such as DOI or Handle) or its database id.
+It is fine to target a dataset using either its Persistent ID (PID such as DOI or Handle) or its database id.
 
 Here's an example from :ref:`publish-dataset-api` of targeting a dataset using its DOI:
 
@@ -54,14 +54,14 @@ Note that when multiple query parameters are used (such as ``persistentId`` and
 Where is the Comprehensive List of All API Functionality?
 ---------------------------------------------------------
 
-There are so many Dataverse APIs that a single page in this guide would probably be overwhelming. See :ref:`list-of-dataverse-apis` for links to various pages.
+There are so many Dataverse Software APIs that a single page in this guide would probably be overwhelming. See :ref:`list-of-dataverse-apis` for links to various pages.
 
-It is possible to get a complete list of API functionality in Swagger/OpenAPI format if you deploy Dataverse to Payara 5+. For details, see https://github.com/IQSS/dataverse/issues/5794
+It is possible to get a complete list of API functionality in Swagger/OpenAPI format. See :ref:`openapi`.
 
 Is There a Changelog of API Functionality That Has Been Added Over Time?
 ------------------------------------------------------------------------
 
-No, but there probably should be. If you have suggestions for how it should look, please create an issue at https://github.com/IQSS/dataverse/issues
+Changes to the API that don't break anything can be found in the `release notes <https://github.com/IQSS/dataverse/releases>`_ of each release. Breaking changes are documented in :doc:`changelog`.
 
 .. _no-api:
 
@@ -70,8 +70,8 @@ What Functionality is GUI Only and Not Available Via API
 
 The following tasks cannot currently be automated via API because no API exists for them. The web interface should be used instead for these GUI-only features:
 
-- Setting a logo image, URL, and tagline when creating a dataverse.
-- Editing properties of an existing dataverse.
+- Setting a logo image, URL, and tagline when creating a Dataverse collection.
+- Editing properties of an existing Dataverse collection.
 - Set "Enable Access Request" for Terms of Use: https://groups.google.com/d/msg/dataverse-community/oKdesT9rFGc/qM6wrsnnBAAJ
 - Downloading a guestbook.
 - Set guestbook_id for a dataset: https://groups.google.com/d/msg/dataverse-community/oKdesT9rFGc/qM6wrsnnBAAJ
@@ -82,12 +82,14 @@ The following tasks cannot currently be automated via API because no API exists
 
 If you would like APIs for any of the features above, please open a GitHub issue at https://github.com/IQSS/dataverse/issues
 
-You are also welcome to open an issue to add to the list above. Or you are welcome to make a pull request. Please see the :doc:`/developers/documentation` section of the Developer Guide for instructions.
+You are also welcome to open an issue to add to the list above. Or you are welcome to make a pull request. Please see the :doc:`/contributor/documentation` section of the Contributor Guide for instructions.
 
 Why Are the Return Values (HTTP Status Codes) Not Documented?
 -------------------------------------------------------------
 
-They should be. Please consider making a pull request to help. The :doc:`/developers/documentation` section of the Developer Guide should help you get started. :ref:`create-dataverse-api` has an example you can follow or you can come up with a better way.
+They should be. Please consider making a pull request to help. The :doc:`/contributor/documentation` section of the Contriburor Guide should help you get started. :ref:`create-dataverse-api` has an example you can follow or you can come up with a better way.
+
+Also, please note that we are starting to experiment with putting response codes in our OpenAPI document. See :ref:`openapi`.
 
 What If My Question Is Not Answered Here?
 -----------------------------------------
diff --git a/doc/sphinx-guides/source/api/getting-started.rst b/doc/sphinx-guides/source/api/getting-started.rst
index 3c9bfd9b137..3f93f4ac444 100644
--- a/doc/sphinx-guides/source/api/getting-started.rst
+++ b/doc/sphinx-guides/source/api/getting-started.rst
@@ -1,7 +1,7 @@
 Getting Started with APIs
 =========================
 
-If you are a researcher or curator who wants to automate parts of your workflow, this section should help you get started. The :doc:`intro` section lists resources for other groups who may be interested in Dataverse APIs such as developers of integrations and support teams.
+If you are a researcher or curator who wants to automate parts of your workflow, this section should help you get started. The :doc:`intro` section lists resources for other groups who may be interested in Dataverse Software APIs such as developers of integrations and support teams.
 
 .. contents:: |toctitle|
     :local:
@@ -9,14 +9,14 @@ If you are a researcher or curator who wants to automate parts of your workflow,
 Servers You Can Test With
 -------------------------
 
-Rather than using a production installation of Dataverse, API users are welcome to use http://demo.dataverse.org for testing. You can email support@dataverse.org if you have any trouble with this server.  
+Rather than using a production Dataverse installation, API users are welcome to use https://demo.dataverse.org for testing. You can email support@dataverse.org if you have any trouble with this server.  
 
-If you would rather have full control over your own test server, deployments to AWS, Docker, Vagrant, and more are covered in the :doc:`/developers/index` and the :doc:`/installation/index`.
+If you would rather have full control over your own test server, deployments to AWS, Docker, and more are covered in the :doc:`/developers/index` and the :doc:`/installation/index`.
 
 Getting an API Token
 --------------------
 
-Many Dataverse APIs require an API token.
+Many Dataverse Software APIs require an API token.
 
 Once you have identified a server to test with, create an account, click on your name, and get your API token. For more details, see the :doc:`auth` section.
 
@@ -52,6 +52,20 @@ If you ever want to check an environment variable, you can "echo" it like this:
 
   echo $SERVER_URL
 
+With curl version 7.56.0 and higher, it is recommended to use --form-string with outer quote rather than -F flag without outer quote.
+
+For example, curl command parameter below might cause error such as ``warning: garbage at end of field specification: ,"categories":["Data"]}``.
+
+.. code-block:: bash
+
+  -F jsonData={\"description\":\"My description.\",\"categories\":[\"Data\"]}
+
+Instead, use --form-string with outer quote. See https://github.com/curl/curl/issues/2022
+
+.. code-block:: bash
+
+  --form-string 'jsonData={"description":"My description.","categories":["Data"]}'
+
 If you don't like curl, don't have curl, or want to use a different programming language, you are encouraged to check out the Python, Javascript, R, and Java options in the :doc:`client-libraries` section.
 
 .. _curl: https://curl.haxx.se
@@ -59,8 +73,8 @@ If you don't like curl, don't have curl, or want to use a different programming
 Depositing Data
 ---------------
 
-Creating a Dataverse
-~~~~~~~~~~~~~~~~~~~~
+Creating a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 See :ref:`create-dataverse-api`.
 
@@ -72,10 +86,10 @@ See :ref:`create-dataset-command`.
 Uploading Files
 ~~~~~~~~~~~~~~~
 
-See :ref:`add-file-api`.
+See :ref:`add-file-api`. In addition, when a Dataverse installation is configured to use S3 storage with direct upload enabled, there is API support to send a file directly to S3. This facilitates an efficient method to upload big files, but is more complex. The procedure is described in the :doc:`/developers/s3-direct-upload-api` section of the Developer Guide.
 
-Publishing a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~
+Publishing a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 See :ref:`publish-dataverse-api`.
 
@@ -94,8 +108,8 @@ A quick example search for the word "data" is https://demo.dataverse.org/api/sea
 
 See the :doc:`search` section for details.
 
-Finding Recently Published Dataverses, Datasets, and Files
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Finding Recently Published Dataverse Collections, Datasets, and Files
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 See :ref:`search-date-range`.
 
@@ -106,7 +120,9 @@ Downloading Files
 
 The :doc:`dataaccess` section explains how to download files.
 
-In order to download files, you must know their database IDs which you can get from the ``dataverse_json`` metadata at the dataset level. See :ref:`export-dataset-metadata-api`.
+To download all the files in a dataset, see :ref:`download-by-dataset-api`.
+
+In order to download individual files, you must know their database IDs which you can get from the ``dataverse_json`` metadata at the dataset level. See :ref:`export-dataset-metadata-api`.
 
 Downloading Metadata
 ~~~~~~~~~~~~~~~~~~~~
@@ -115,8 +131,8 @@ Dataset metadata is available in a variety of formats listed at :ref:`metadata-e
 
 See :ref:`export-dataset-metadata-api`.
 
-Listing the Contents of a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Listing the Contents of a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 See :ref:`show-contents-of-a-dataverse-api`.
 
@@ -138,14 +154,40 @@ Listing Permissions (Role Assignments)
 
 See :ref:`list-role-assignments-on-a-dataverse-api`.
 
+.. _openapi:
+
+Getting the OpenAPI Document
+----------------------------
+
+You can access our `OpenAPI document`_ using the ``/openapi`` endpoint. The default format is YAML if no parameter is provided, but you can also obtain the JSON version by either passing ``format=json`` as a query parameter or by sending ``Accept:application/json`` (case-sensitive) as a header.
+
+.. _OpenAPI document: https://spec.openapis.org/oas/latest.html#openapi-document
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export FORMAT=json
+
+  curl "$SERVER_URL/openapi?format=$FORMAT"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/openapi?format=json"
+
+We are aware that our OpenAPI document is not perfect. You can find more information about validating the document under :ref:`openapi-dev` in the Developer Guide.
+
 Beyond "Getting Started" Tasks
 ------------------------------
 
-In addition to the tasks listed above, Dataverse supports many other operations via API.
+In addition to the tasks listed above, your Dataverse installation supports many other operations via API.
 
 See :ref:`list-of-dataverse-apis` and :ref:`types-of-api-users` to get oriented.
 
-If you're looking for some inspiration for how you can use Dataverse APIs, there are open source projects that integrate with Dataverse listed in the :doc:`apps` section.
+If you're looking for some inspiration for how you can use the Dataverse Software APIs, there are open source projects that integrate with the Dataverse Software listed in the :doc:`apps` section.
 
 Getting Help
 -------------
diff --git a/doc/sphinx-guides/source/api/img/dataset_page_files_view.png b/doc/sphinx-guides/source/api/img/dataset_page_files_view.png
new file mode 100644
index 00000000000..dbf20afa93e
Binary files /dev/null and b/doc/sphinx-guides/source/api/img/dataset_page_files_view.png differ
diff --git a/doc/sphinx-guides/source/api/img/dataset_page_tree_view.png b/doc/sphinx-guides/source/api/img/dataset_page_tree_view.png
new file mode 100644
index 00000000000..3c505bc1598
Binary files /dev/null and b/doc/sphinx-guides/source/api/img/dataset_page_tree_view.png differ
diff --git a/doc/sphinx-guides/source/api/img/index_view_subfolder.png b/doc/sphinx-guides/source/api/img/index_view_subfolder.png
new file mode 100644
index 00000000000..6c940ad2354
Binary files /dev/null and b/doc/sphinx-guides/source/api/img/index_view_subfolder.png differ
diff --git a/doc/sphinx-guides/source/api/img/index_view_top.png b/doc/sphinx-guides/source/api/img/index_view_top.png
new file mode 100644
index 00000000000..da87a0cd3eb
Binary files /dev/null and b/doc/sphinx-guides/source/api/img/index_view_top.png differ
diff --git a/doc/sphinx-guides/source/api/index.rst b/doc/sphinx-guides/source/api/index.rst
index 45cdb1918fe..5ff7626271d 100755
--- a/doc/sphinx-guides/source/api/index.rst
+++ b/doc/sphinx-guides/source/api/index.rst
@@ -9,6 +9,7 @@ API Guide
 **Contents:**
 
 .. toctree::
+   :maxdepth: 2
 
    intro
    getting-started
@@ -20,5 +21,8 @@ API Guide
    sword
    client-libraries
    external-tools
+   curation-labels
+   linkeddatanotification
    apps
    faq
+   changelog
diff --git a/doc/sphinx-guides/source/api/intro.rst b/doc/sphinx-guides/source/api/intro.rst
index 6ce77f5fe7d..8eb11798dd7 100755
--- a/doc/sphinx-guides/source/api/intro.rst
+++ b/doc/sphinx-guides/source/api/intro.rst
@@ -1,16 +1,16 @@
 Introduction
 ============
 
-Dataverse APIs allow users to accomplish many tasks such as...
+The Dataverse Software APIs allow users to accomplish many tasks such as...
 
 - creating datasets
 - uploading files
 - publishing datasets
 - and much, much more
 
-... all without using the Dataverse web interface.
+... all without using the Dataverse installation's web interface.
 
-APIs open the door for integrations between Dataverse and other software. For a list, see the :doc:`/admin/integrations` section of the Admin Guide.
+APIs open the door for integrations between the Dataverse Software and other software. For a list, see the :doc:`/admin/integrations` section of the Admin Guide.
 
 .. contents:: |toctitle|
     :local:
@@ -18,7 +18,7 @@ APIs open the door for integrations between Dataverse and other software. For a
 What is an API?
 ---------------
 
-API stands for "Application Programming Interface" and an example is Dataverse's "file upload" API. In the diagram below, we can see that while users can click a button within Dataverse's web interface to upload a file, there are many other ways to get files into Dataverse, all using an API that allows for uploading of files.
+API stands for "Application Programming Interface" and an example is the Dataverse Software's "file upload" API. In the diagram below, we can see that while users can click a button within Dataverse installation's web interface to upload a file, there are many other ways to get files into a Dataverse installation, all using an API that allows for uploading of files.
 
 .. graphviz::
 
@@ -65,34 +65,34 @@ API stands for "Application Programming Interface" and an example is Dataverse's
 The components above that use the "file" upload API are:
 
 - DvUploader is terminal-based application for uploading files that is described in the :doc:`/user/dataset-management` section of the User Guide.
-- OJS, OSF, and RSpace are all web applications that can integrate with Dataverse and are described in "Getting Data In" in the :doc:`/admin/integrations` section of the Admin Guide.
+- OJS, OSF, and RSpace are all web applications that can integrate with a Dataverse installation and are described in "Getting Data In" in the :doc:`/admin/integrations` section of the Admin Guide.
 - The script in the diagram can be as simple as a single line of code that is run in a terminal. You can copy and paste "one-liners" like this from the guide. See the :doc:`getting-started` section for examples using a tool called "curl".
 
 The diagram above shows only a few examples of software using a specific API but many more APIs are available.
 
 .. _types-of-api-users:
 
-Types of Dataverse API Users
-----------------------------
+Types of Dataverse Software API Users
+-------------------------------------
 
 This guide is intended to serve multiple audiences but pointers various sections of the guide are provided below based on the type of API user you are.
 
-API Users Within a Single Installation of Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+API Users Within a Single Dataverse Installation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Each installation of Dataverse will have its own groups of people interested in APIs.
+Each Dataverse installation will have its own groups of people interested in APIs.
 
 Users of Integrations and Apps
 ++++++++++++++++++++++++++++++
 
 Integrations and apps can take many forms but two examples are:
 
-- Using Open Science Framework (OSF), a web application, to deposit and publish data into Dataverse.
-- Using DVUploader, a terminal-based desktop application, to upload files into Dataverse.
+- Using Open Science Framework (OSF), a web application, to deposit and publish data into a Dataverse installation.
+- Using DVUploader, a terminal-based desktop application, to upload files into a Dataverse installation.
 
-In both examples, users need to obtain an API Token to authenticate with Dataverse.
+In both examples, users need to obtain an API Token to authenticate with a Dataverse installation.
 
-|Start| A good starting point is "API Tokens" in the :doc:`/user/account` section of the User Guide. DvUploader is documented in the :doc:`/user/dataset-management` section of the User Guide. The integrations that are enabled depend on your installation of Dataverse. You can find a list in the :doc:`/admin/integrations` section of the Admin Guide.
+|Start| A good starting point is "API Tokens" in the :doc:`/user/account` section of the User Guide. DvUploader is documented in the :doc:`/user/dataset-management` section of the User Guide. The integrations that are enabled depend on your Dataverse installation. You can find a list in the :doc:`/admin/integrations` section of the Admin Guide.
 
 Power Users
 +++++++++++
@@ -104,53 +104,53 @@ Power users may be researchers or curators who are comfortable with automating p
 Support Teams and Superusers
 ++++++++++++++++++++++++++++
 
-Support teams that answer questions about their installation of Dataverse should familiarize themselves with the :doc:`getting-started` section to get a sense of common tasks that researchers and curators might be trying to accomplish by using Dataverse APIs.
+Support teams that answer questions about their Dataverse installation should familiarize themselves with the :doc:`getting-started` section to get a sense of common tasks that researchers and curators might be trying to accomplish by using Dataverse Software APIs.
 
-Superusers of an installation of Dataverse have access a superuser dashboard described in the :doc:`/admin/dashboard` section of the Admin Guide but some operations can only be done via API.
+Superusers of a Dataverse installation have access a superuser dashboard described in the :doc:`/admin/dashboard` section of the Admin Guide but some operations can only be done via API.
 
 |Start| A good starting point for both groups is the :doc:`getting-started` section of this guide followed by the :doc:`/admin/troubleshooting` section of the Admin Guide.
 
 Sysadmins
 +++++++++
 
-Sysadmins often write scripts to automate tasks and Dataverse APIs make this possible. Sysadmins have control over the server that Dataverse is running on and may be called upon to execute API commands that are limited to "localhost" (the server itself) for security reasons.
+Sysadmins often write scripts to automate tasks and Dataverse Software APIs make this possible. Sysadmins have control over the server that the Dataverse installation is running on and may be called upon to execute API commands that are limited to "localhost" (the server itself) for security reasons.
 
 |Start| A good starting point for sysadmins is "Blocking API Endpoints" in the :doc:`/installation/config` section of the Installation Guide, followed by the :doc:`getting-started` section of this guide, followed by the :doc:`/admin/troubleshooting` section of the Admin Guide.
 
 In House Developers
 +++++++++++++++++++
 
-Some organizations that run Dataverse employ developers who are tasked with using Dataverse APIs to accomplish specific tasks such as building custom integrations with in house systems or creating reports specific to the organization's needs. 
+Some organizations that run a Dataverse installation employ developers who are tasked with using the Dataverse installation's APIs to accomplish specific tasks such as building custom integrations with in house systems or creating reports specific to the organization's needs. 
 
 |Start| A good starting point for in house developers is the :doc:`getting-started` section.
 
 API Users Across the Dataverse Project
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The Dataverse project loves contributors! Depending on your interests and skills, you might fall into one or more of the groups below.
+The Dataverse Project loves contributors! Depending on your interests and skills, you might fall into one or more of the groups below.
 
 Developers of Integrations, External Tools, and Apps
 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-One of the primary purposes for Dataverse APIs in the first place is to enable integrations with third party software. Integrations are listed in the following places:
+One of the primary purposes for Dataverse Software APIs in the first place is to enable integrations with third party software. Integrations are listed in the following places:
 
 - The :doc:`/admin/integrations` section of the Admin Guide.
 - The :doc:`/api/external-tools` section this guide.
 - The :doc:`apps` section of this guide.
 
-|Start| Good starting points are the three sections above to get a sense of third-party software that already integrates with Dataverse, followed by the :doc:`getting-started` section.
+|Start| Good starting points are the three sections above to get a sense of third-party software that already integrates with the Dataverse Software, followed by the :doc:`getting-started` section.
 
-Developers of Dataverse API Client Libraries 
-++++++++++++++++++++++++++++++++++++++++++++
+Developers of Dataverse Software API Client Libraries 
++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-A client library helps developers using a specific programming language such as Python, Javascript, R, or Java interact with Dataverse APIs in a manner that is idiomatic for their language. For example, a Python programmer may want to
+A client library helps developers using a specific programming language such as Python, Javascript, R, or Java interact with Dataverse Software APIs in a manner that is idiomatic for their language. For example, a Python programmer may want to
 
 |Start| A good starting point is the :doc:`client-libraries` section, followed by the :doc:`getting-started` section.
 
-Developers of Dataverse Itself
-++++++++++++++++++++++++++++++
+Developers of The Dataverse Software Itself
++++++++++++++++++++++++++++++++++++++++++++
 
-Developers working on Dataverse itself use Dataverse APIs when adding features, fixing bugs, and testing those features and bug fixes.
+Developers working on the Dataverse Software itself use the APIs when adding features, fixing bugs, and testing those features and bug fixes.
 
 |Start| A good starting point is the :doc:`/developers/testing` section of the Developer Guide.
 
@@ -178,7 +178,7 @@ See :doc:`auth`.
 Lists of Dataverse APIs
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-- :doc:`search`: For searching dataverses, datasets, and files.
+- :doc:`search`: For searching dataverse collections, datasets, and files.
 - :doc:`dataaccess`: For downloading and subsetting data.
 - :doc:`native-api`: For performing most tasks that are possible in the GUI. See :doc:`getting-started` for the most common commands which operate on endpoints with names like:
 
@@ -187,6 +187,10 @@ Lists of Dataverse APIs
   - Files
   - etc.
 
+- :doc:`/developers/dataset-semantic-metadata-api`: For creating, reading, editing, and deleting dataset metadata using JSON-LD.
+- :doc:`/developers/dataset-migration-api`: For migrating datasets from other repositories while retaining the original persistent identifiers and publication date.
+- :doc:`/developers/s3-direct-upload-api`: For the transfer of larger files/larger numbers of files directly to an S3 bucket managed by Dataverse. 
+- :doc:`/developers/globus-api`: For the Globus transfer of larger files/larger numbers of files directly via Globus endpoints managed by Dataverse or referencing files in remote endpoints. 
 - :doc:`metrics`: For query statistics about usage of a Dataverse installation.
 - :doc:`sword`: For depositing data using a standards-based approach rather than the :doc:`native-api`.
 
@@ -198,17 +202,25 @@ Please note that some APIs are only documented in other guides that are more sui
   - :doc:`/admin/metadatacustomization`  
   - :doc:`/admin/metadataexport`
   - :doc:`/admin/make-data-count`
-  - :doc:`/admin/geoconnect-worldmap`
   - :doc:`/admin/solr-search-index`
 
 - Installation Guide
 
   - :doc:`/installation/config`
 
+- Developer Guide
+
+  - :doc:`/developers/aux-file-support`
+  - :doc:`/developers/big-data-support`
+  - :doc:`/developers/dataset-migration-api`
+  - :doc:`/developers/dataset-semantic-metadata-api`
+  - :doc:`/developers/s3-direct-upload-api`
+  - :doc:`/developers/workflows`
+
 Client Libraries
 ~~~~~~~~~~~~~~~~
 
-See :doc:`client-libraries` for how to use Dataverse APIs from Python, R, and Java.
+See :doc:`client-libraries` for how to use Dataverse Software APIs from Python, R, Java, and Javascript.
 
 Examples
 ~~~~~~~~
@@ -225,11 +237,11 @@ See :doc:`faq`.
 Getting Help
 ------------
 
-Dataverse API questions are on topic in all the usual places:
+Dataverse Software API questions are on topic in all the usual places:
 
 - The dataverse-community Google Group: https://groups.google.com/forum/#!forum/dataverse-community
-- Dataverse community calls: https://dataverse.org/community-calls
-- The Dataverse chat room: http://chat.dataverse.org 
-- The Dataverse ticketing system: support@dataverse.org
+- The Dataverse Project community calls: https://dataverse.org/community-calls
+- The Dataverse Project chat room: https://chat.dataverse.org 
+- The Dataverse Project ticketing system: support@dataverse.org
 
 After your question has been answered, you are welcome to help improve the :doc:`faq` section of this guide.
diff --git a/doc/sphinx-guides/source/api/linkeddatanotification.rst b/doc/sphinx-guides/source/api/linkeddatanotification.rst
new file mode 100644
index 00000000000..d55dc4da084
--- /dev/null
+++ b/doc/sphinx-guides/source/api/linkeddatanotification.rst
@@ -0,0 +1,65 @@
+Linked Data Notification API
+============================
+
+Dataverse has a limited, experimental API implementing a Linked Data Notification inbox allowing it to receive messages indicating a link between an external resource and a Dataverse dataset.
+The motivating use case is to support a use case where Dataverse administrators may wish to create back-links to the remote resource (e.g. as a Related Publication, Related Material, etc.).
+
+Upon receipt of a relevant message, Dataverse will create Announcement Received notifications for superusers, who can edit the dataset involved. (In the motivating use case, these users may then add an appropriate relationship and use the Update Curent Version publishing option to add it to the most recently published version of the dataset.)
+
+The ``:LDNMessageHosts`` setting is a comma-separated whitelist of hosts from which Dataverse will accept and process messages. By default, no hosts are allowed. ``*`` can be used in testing to indicate all hosts are allowed.
+
+Messages can be sent via POST, using the application/ld+json ContentType:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  
+  curl -X POST -H 'ContentType:application/ld+json' $SERVER_URL/api/inbox --upload-file message.jsonld
+
+The supported message format is described by `our preliminary specification <https://docs.google.com/document/d/1dqj8_vEcIBeyDIZCaPQvp0FM1eSGO_5CSNCdXOpoUz0/edit?usp=sharing>`_. The format is expected to change in the near future to match the standard for relationship announcements being developed as part of `the COAR Notify Project <https://notify.coar-repositories.org/>`_. 
+
+An example message is shown below. It indicates that a resource with the name "An Interesting Title" exists and "IsSupplementedBy" the dataset with DOI https://doi.org/10.5072/FK2/GGCCDL. If this dataset is managed in the receiving Dataverse, a notification will be sent to user with the relevant permissions (as described above).
+
+.. code:: json
+
+  {
+    "@context": [
+      "https://www.w3.org/ns/activitystreams",
+      "https://purl.org/coar/notify"
+    ],
+    "id": "urn:uuid:94ecae35-dcfd-4182-8550-22c7164fe23f",
+    "actor": {
+      "id": "https://research-organisation.org/dspace",
+      "name": "DSpace Repository",
+      "type": "Service"
+    },
+    "context": {
+      "IsSupplementedBy":
+        {
+          "id": "http://dev-hdc3b.lib.harvard.edu/dataset.xhtml?persistentId=doi:10.5072/FK2/GGCCDL",
+          "ietf:cite-as": "https://doi.org/10.5072/FK2/GGCCDL",
+          "type": "sorg:Dataset"
+        }
+    },
+    "object": {
+      "id": "https://research-organisation.org/dspace/item/35759679-5df3-4633-b7e5-4cf24b4d0614",
+      "ietf:cite-as": "https://research-organisation.org/authority/resolve/35759679-5df3-4633-b7e5-4cf24b4d0614",
+      "sorg:name": "An Interesting Title",
+      "type": "sorg:ScholarlyArticle"
+    },
+    "origin": {
+      "id": "https://research-organisation.org/dspace",
+      "inbox": "https://research-organisation.org/dspace/inbox/",
+      "type": "Service"
+    },
+    "target": {
+      "id": "https://research-organisation.org/dataverse",
+      "inbox": "https://research-organisation.org/dataverse/inbox/",
+      "type": "Service"
+    },
+    "type": [
+      "Announce",
+      "coar-notify:ReleaseAction"
+    ]
+  }
+
diff --git a/doc/sphinx-guides/source/api/metrics.rst b/doc/sphinx-guides/source/api/metrics.rst
index 70a55a27cc8..14402096650 100755
--- a/doc/sphinx-guides/source/api/metrics.rst
+++ b/doc/sphinx-guides/source/api/metrics.rst
@@ -1,90 +1,86 @@
 Metrics API
 ===========
 
-The Metrics API provides counts of downloads, datasets created, files uploaded, and more, as described below. Dataverse also supports Make Data Count, which is described in the :doc:`/admin/make-data-count` section of the Admin Guide.
+The Metrics API provides counts of downloads, datasets created, files uploaded, user accounts created, and more, as described below. The Dataverse Software also includes aggregate counts of Make Data Count metrics (described in the :doc:`/admin/make-data-count` section of the Admin Guide and available per-Dataset through the :doc:`/api/native-api`). A table of all the endpoints is listed below.
 
 .. contents:: |toctitle|
     :local:
 
 .. note:: |CORS| The Metrics API can be used from scripts running in web browsers, as it allows cross-origin resource sharing (CORS).
 
-.. note:: For all metrics `besides` Past Days Count (``/pastDays/$days``), Database setting ``MetricsCacheTimeoutMinutes`` defines how long the cached value will be returned by subsequent queries.
+.. note:: For all metrics `besides` Past Days Count (``/pastDays/$days``) - recalculated daily, and (``/toMonth/$month``) for prior months - never recalculated, the setting ``MetricsCacheTimeoutMinutes`` defines how long the cached value will be returned by subsequent queries.
 
 .. _CORS: https://www.w3.org/TR/cors/
 
-Total
------
+Categories
+----------
 
-Returns a count of various objects in dataverse over all-time::
+The Metrics API includes several categories of endpoints that provide different ways of understanding the evolution of metrics over time:
 
-    GET https://$SERVER/api/info/metrics/$type
+* Total - an aggregate count over all-time:
 
-``$type`` can be set to ``dataverses``, ``datasets``, ``files`` or ``downloads``.
+  * Form: GET https://$SERVER/api/info/metrics/$type
 
-Example: ``curl https://demo.dataverse.org/api/info/metrics/downloads``
+  * where ``$type`` can be set, for example, to ``dataverses`` (Dataverse collections), ``datasets``, ``files``, ``downloads`` or ``accounts``.
 
-To-Month
---------
+  * Example: ``curl https://demo.dataverse.org/api/info/metrics/downloads``
 
-Returns a count of various objects in dataverse up to a specified month ``$YYYY-DD`` in YYYY-MM format (e.g. ``2018-01``)::
+  * Return: Most of these calls return a simple JSON object with a ``count`` whose value is the metric's total count. Some calls, such as ``filedownloads`` return aggregate metrics per item (e.g. per file or by subject) as a JSONArray or CSV (see Return Formats below)
 
-    GET https://$SERVER/api/info/metrics/$type/toMonth/$YYYY-DD
+* To-Month - a count of various objects in dataverse up to and including a specified month ``$YYYY-DD`` in YYYY-MM format (e.g. ``2018-01``):
 
-``$type`` can be set to ``dataverses``, ``datasets``, ``files`` or ``downloads``.
+  * Form: GET https://$SERVER/api/info/metrics/$type/toMonth/$YYYY-DD
 
-Example: ``curl https://demo.dataverse.org/api/info/metrics/dataverses/toMonth/2018-01``
+  * where ``$type`` can be set, for example, to ``dataverses`` (Dataverse collections), ``datasets``, ``files``, ``downloads`` or ``accounts``.
 
+  * Example: ``curl https://demo.dataverse.org/api/info/metrics/dataverses/toMonth/2018-01``
+    
+  * Return: Most of these calls return a simple JSON object with a ``count`` whose value is the metric's total count. One variant, ``/api/info/metrics/datasets/bySubject/toMonth`` return aggregate metrics per Dataset Subject as a JSONArray or CSV (see Return Formats below)
 
-Past Days
----------
+* Past Days - a count of various objects in a Dataverse installation for the past ``$days`` (e.g. ``30``):
 
-Returns a count of various objects in dataverse for the past ``$days`` (e.g. ``30``):: 
+  * Form: GET https://$SERVER/api/info/metrics/$type/pastDays/$days
 
-    GET https://$SERVER/api/info/metrics/$type/pastDays/$days
+  * where ``$type`` can be set, for example, to ``dataverses`` (Dataverse collections), ``datasets``, ``files``, ``downloads`` or ``accounts``.
 
-``$type`` can be set to ``dataverses``, ``datasets``, ``files`` or ``downloads``.
+  * Example: ``curl https://demo.dataverse.org/api/info/metrics/datasets/pastDays/30``
 
-Example: ``curl https://demo.dataverse.org/api/info/metrics/datasets/pastDays/30``
+  * Return: A simple JSON object with a ``count`` whose value is the metric's total count.
 
+* Monthly - a time series of the metric with aggregate values per month with counts up to and including the given month:
 
-Dataverse Specific Metrics
---------------------------
+  * Form: GET https://$SERVER/api/info/metrics/$type/monthly
 
-By Subject
-~~~~~~~~~~~~~~~
+  * where ``$type`` can be set, for example, to ``dataverses`` (Dataverse collections), ``datasets``, ``files``, ``downloads`` or ``accounts``.
 
-Returns the number of dataverses by each subject::
+  * Example: ``curl https://demo.dataverse.org/api/info/metrics/downloads/monthly``
 
-    GET https://$SERVER/api/info/metrics/dataverses/bySubject
+  * Return: A JSON Array or CSV file with an array of counts per month. Variants of this this category that provide a time series per object return that information in the same formats (JSON array, CSV) with one time-series column per item (see Return Formats below).
 
+* Tree - endpoints that describe the structure of the tree of published Dataverses, as of now or as of the end of a specified month. The monthly version could be used to show growth of the Dataverse instance over time, but the initial use case for these endpoints was to provide a means to list the tree in a selection widget to scope the metrics displayed in the local Dataverse metrics page in the `dataverse-metrics app <https://github.com/IQSS/dataverse-metrics>`_.
 
-By Category
-~~~~~~~~~~~~~~~~~~~~~~
+  * Form: GET https://$SERVER/api/info/metrics/tree
+  * or
+  * Form: GET https://$SERVER/api/info/metrics/tree/toMonth/$YYYY-DD
 
-Returns the number of dataverses by each category::
+  * Example: ``curl https://demo.dataverse.org/api/info/metrics/tree``
 
-    GET https://$SERVER/api/info/metrics/dataverses/byCategory
+  * Return: A nested JSON array containing JSON objects for each Dataverse collection with key/values for id, ownerId, alias, depth, and name, and a JSON array containing analogous objects for Dataverse collections within the current one.
 
+Return Formats
+--------------
 
-Dataset Specific Metrics
-------------------------
+There are a number of API calls that provide time series, information reported per item (e.g. per dataset, per file, by subject, by category, and by file Mimetype), or both (time series per item). Because these calls all report more than a single number, the API provides two optional formats for the return that can be selected by specifying an HTTP Accept Header for the desired format:
 
-By Subject
-~~~~~~~~~~
+* application/json - a JSON array of objects. For time-series, the objects include key/values for the ``date`` and ``count`` for that month. For per-item calls, the objects include the item (e.g. for a subject), or it's id/pid (for a dataset or datafile (which may/may not not have a PID)). For timeseries per-item, the objects also include a date. In all cases, the response is a single array.
 
-Returns the number of datasets by each subject::
+  * Example: ``curl -H 'Accept:application/json' https://demo.dataverse.org/api/info/metrics/downloads/monthly``
 
-    GET https://$SERVER/api/info/metrics/datasets/bySubject
+* comma-separated-value (CSV) - a CSV file with rows corresponding to each JSON object in the application/json format. Column headers are included (e.g. ``date,count`` or ``subject,count`` or ``date,pid,id,count`` (for a time series per file)).
 
+  * Example: ``curl -H 'Accept:text/csv' https://demo.dataverse.org/api/info/metrics/downloads/monthly``
 
-By Subject, and to Month
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Returns the number of datasets by each subject, and up to a specified month ``$YYYY-DD`` in YYYY-MM format (e.g. ``2018-01``)::
-
-    GET https://$SERVER/api/info/metrics/datasets/bySubject/toMonth/$YYYY-DD
-
-Example: ``curl https://demo.dataverse.org/api/info/metrics/datasets/bySubject/toMonth/2018-01``
+  * The default format is CSV, so ``curl https://demo.dataverse.org/api/info/metrics/downloads/monthly``, or typing this URL into a browser return the CSV format.
 
 .. |CORS| raw:: html
 
@@ -93,10 +89,17 @@ Example: ``curl https://demo.dataverse.org/api/info/metrics/datasets/bySubject/t
       </span>
 
 
-Metric Query Parameters
------------------------
+Filtering with Query Parameters
+-------------------------------
+
+To further tailor your metric, query parameters can be provided. On relevant endpoints, these query parameters can be used together.
 
-To further tailor your metric, query parameters can be provided.
+parentAlias
+~~~~~~~~~~~
+
+Specifies which Dataverse sub-collection the metric should be collected for. Not including this parameter gathers metrics for the entire instance.
+
+Example: ``curl https://demo.dataverse.org/api/info/metrics/datasets/?parentAlias=abc`` would return the number of datasets in the Dataverse collection with alias 'abc' and in sub-collections within it.
 
 dataLocation
 ~~~~~~~~~~~~
@@ -104,3 +107,70 @@ dataLocation
 Specifies whether the metric should query ``local`` data, ``remote`` data (e.g. harvested), or ``all`` data when getting results. Only works for dataset metrics.
 
 Example: ``curl https://demo.dataverse.org/api/info/metrics/datasets/?dataLocation=remote``
+
+country
+~~~~~~~
+
+The Make Data Count endpoints are also able to filter results by Country (specified using the ISO 3166 Country codes)
+
+Example: ``curl https://demo.dataverse.org/api/info/metrics/makeDataCount/viewsTotal?country=au``
+
+
+
+Endpoint Table
+--------------
+
+The following table lists the available metrics endpoints (not including the Make Data Counts endpoints for a single dataset which are part of the :doc:`/api/native-api`) along with additional notes about them.
+
+
+.. csv-table:: Metrics Endpoints
+   :header: endpoint,variables,formats,scope,limits,cached,meaning,notes
+   :widths: 100, 15, 10, 20, 20, 8, 30, 70
+
+    /api/info/metrics/dataverses,count,json,collection subtree,published,y,as of now/total,collection subtree means you can get info for the instance or with ?parentAlias={alias} can optionally specify a dataverse which should be used to scope the query. 
+    /api/info/metrics/dataverses/toMonth/{yyyy-MM},count,json,collection subtree,published,y,cumulative up to month specified,
+    /api/info/metrics/dataverses/monthly,"date, count","json, csv",collection subtree,published,y,monthly cumulative  timeseries from first date of first entry to now,
+    /api/info/metrics/dataverses/pastDays/{n},count,json,collection subtree,published,y,aggregate count for past n days,
+    /api/info/metrics/dataverses/byCategory,"category, count","json, csv",collection subtree,published,y,total count per category,
+    /api/info/metrics/dataverses/bySubject,"subject, count","json, csv",collection subtree,all,y,total count per subject,
+    /api/info/metrics/datasets,count,json,collection subtree,"released, choice of all, local or remote (harvested)",y,as of now/total,released means only currently released dataset versions (not unpublished or DEACCESSIONED versions)
+    /api/info/metrics/datasets/toMonth/{yyyy-MM},count,json,collection subtree,"released, choice of all, local or remote (harvested)",y,cumulative up to month specified,
+    /api/info/metrics/datasets/monthly,"date, count","json, csv",collection subtree,"released, choice of all, local or remote (harvested)",y,monthly cumulative  timeseries from first date of first entry to now,released means only currently released dataset versions (not unpublished or DEACCESSIONED versions)
+    /api/info/metrics/datasets/pastDays/{n},count,json,collection subtree,"released, choice of all, local or remote (harvested)",y,aggregate count for past n days,
+    /api/info/metrics/datasets/bySubject,"subject, count","json, csv",collection subtree,"released, choice of all, local or remote (harvested)",y,total count per subject,
+    /api/info/metrics/datasets/bySubject/toMonth/{yyyy-MM},"subject, count","json, csv",collection subtree,"released, choice of all, local or remote (harvested)",y,cumulative cont per subject up to month specified,
+    /api/info/metrics/files,count,json,collection subtree,in released datasets,y,as of now/total,
+    /api/info/metrics/files/toMonth/{yyyy-MM},count,json,collection subtree,in released datasets,y,cumulative up to month specified,
+    /api/info/metrics/files/monthly,"date, count","json, csv",collection subtree,in released datasets,y,monthly cumulative  timeseries from first date of first entry to now,date is the month when the first version containing the file was released (or created for harvested versions)
+    /api/info/metrics/files/pastDays/{n},count,json,collection subtree,in released datasets,y,aggregate count for past n days,
+    /api/info/metrics/files/byType,"mimetype, count, size","json, csv",collection subtree,in released datasets,y,current totals,
+    /api/info/metrics/files/byType/monthly,"date, mimetype, count, size","json, csv",collection subtree,in released datasets,y,monthly cumulative  timeseries from first date of first entry to now,data for a specific mimetype is only listed starting with the first month there are files of that type
+    /api/info/metrics/downloads,count,json,collection subtree,published,y,as of now/total,"published for downloads means 'recorded in guestbookresponse' which occurs for any files that were ever in a published version, even if that version is now DEACCESSIONED, the file isn't in a current version, etc."
+    /api/info/metrics/downloads/toMonth/{yyyy-MM},count,json,collection subtree,published,y,cumulative up to month specified,downloads from versions that do not have a releasetime (from older Dataverse versions) are included in this cumulative count and the total as of now (line above)
+    /api/info/metrics/downloads/pastDays/{n},count,json,collection subtree,published,y,aggregate count for past n days,
+    /api/info/metrics/downloads/monthly,"date, count","json, csv",collection subtree,published,y,monthly cumulative  timeseries from first date of first entry to now,counts from dataset versions with no releasetime (legacy from old Dataverse versions) are counted as occuring in the month prior to the first count that does have a date
+    /api/info/metrics/filedownloads,"count by id, pid","json, csv",collection subtree,published,y,as of now/totals,download counts per file id. PIDs are also included in output if they exist
+    /api/info/metrics/filedownloads/toMonth/{yyyy-MM},"count by id, pid","json, csv",collection subtree,published,y,cumulative up to month specified,download counts per file id to the specified month. PIDs are also included in output if they exist
+    /api/info/metrics/filedownloads/monthly,"date, count, id, pid","json, csv",collection subtree,published,y,"monthly cumulative  timeseries by file id, pid from first date of first entry to now","unique downloads per month by file (id, pid) sorted in decreasing order of counts"
+    /api/info/metrics/makeDataCount/{metric},count,json,"collection subtree, optionally also by {country}","published, MDC",y,count for specified {metric} as of now/total,"published means in the mdc logs which are not created for unpublished datasets, so this is filtered like downloads and includes counts from DEACCESSED, old versions. "
+    /api/info/metrics/makeDataCount/{metric}/toMonth/{yyyy-MM},count,json,"collection subtree, optionally also by {country}","published, MDC",y,cumulative count for specified {metric} through specified month,These metrics are also limited by the MDC start date and by MDC filtering done by counter-processor
+    /api/info/metrics/makeDataCount/{metric}/monthly,"date, count","json, csv","collection subtree, optionally also by {country}","published, MDC",y,monthly cumulative timeseries of counts for specified {metric},These metrics are also limited by the MDC start date and by MDC filtering done by counter-processor
+    /api/info/metrics/uniquedownloads,"pid, count",json,collection subtree,published,y,total count of unique users who have downloaded from the datasets in scope,The use case for this metric (uniquedownloads) is to more fairly assess which datasets are getting downloaded/used by only counting each users who downloads any file from a dataset as one count (versus downloads of multiple files or repeat downloads counting as multiple counts which adds a bias for large datasets and/or use patterns where a file is accessed repeatedly for new analyses)
+    /api/info/metrics/uniquedownloads/monthly,"date, pid, count","json, csv",collection subtree,published,y,monthly cumulative timeseries of unique user counts for datasets in the dataverse scope,
+    /api/info/metrics/uniquedownloads/toMonth/{yyyy-MM},"pid, count",json,collection subtree,published,y,cumulative count of unique users who have downloaded from the datasets in scope through specified month,
+    /api/info/metrics/uniquefiledownloads,"count by id, pid","json, csv",collection subtree,published,y,as of now/totals,unique download counts per file id. PIDs are also included in output if they exist
+    /api/info/metrics/uniquefiledownloads/monthly,"date, count, id, pid","json, csv",collection subtree,published,y,"monthly cumulative  timeseries by file id, pid from first date of first entry to now","unique downloads per month by file (id, pid) sorted in decreasing order of counts"
+    /api/info/metrics/uniquefiledownloads/toMonth/{yyyy-MM},"count by id, pid","json, csv",collection subtree,published,y,cumulative up to month specified,unique download counts per file id to the specified month. PIDs are also included in output if they exist
+    /api/info/metrics/tree,"id, ownerId, alias, depth, name, children",json,collection subtree,published,y,"tree of dataverses starting at the root or a specified parentAlias with their id, owner id, alias, name, a computed depth, and array of children dataverses","underlying code can also include draft dataverses, this is not currently accessible via api, depth starts at 0"
+    /api/info/metrics/tree/toMonth/{yyyy-MM},"id, ownerId, alias, depth, name, children",json,collection subtree,published,y,"tree of dataverses in existence as of specified date starting at the root or a specified parentAlias with their id, owner id, alias, name, a computed depth, and array of children dataverses","underlying code can also include draft dataverses, this is not currently accessible via api, depth starts at 0"
+    /api/info/metrics/accounts,count,json,Dataverse installation,all,y,as of now/totals,
+    /api/info/metrics/accounts/toMonth/{yyyy-MM},count,json,Dataverse installation,all,y,cumulative up to month specified,
+    /api/info/metrics/accounts/pastDays/{n},count,json,Dataverse installation,all,y,aggregate count for past n days,
+    /api/info/metrics/accounts/monthly,"date, count","json, csv",Dataverse installation,all,y,monthly cumulative timeseries from first date of first entry to now,
+
+Related API Endpoints
+---------------------
+
+The following endpoints are not under the metrics namespace but also return counts:
+
+- :ref:`file-download-count` 
diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 5aae0977c28..04aaf59de98 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -1,33 +1,33 @@
 Native API
 ==========
 
-Dataverse 4 exposes most of its GUI functionality via a REST-based API. This section describes that functionality. Most API endpoints require an API token that can be passed as the ``X-Dataverse-key`` HTTP header or in the URL as the ``key`` query parameter.
+The Dataverse Software exposes most of its GUI functionality via a REST-based API. This section describes that functionality. Most API endpoints require an API token that can be passed as the ``X-Dataverse-key`` HTTP header or in the URL as the ``key`` query parameter.
 
-.. note:: |CORS| Some API endpoint allow CORS_ (cross-origin resource sharing), which makes them usable from scripts runing in web browsers. These endpoints are marked with a *CORS* badge.
+.. note:: |CORS| Some API endpoint allow CORS_ (cross-origin resource sharing), which makes them usable from scripts running in web browsers. These endpoints are marked with a *CORS* badge.
 
 .. note:: Bash environment variables shown below. The idea is that you can "export" these environment variables before copying and pasting the commands that use them. For example, you can set ``$SERVER_URL`` by running ``export SERVER_URL="https://demo.dataverse.org"`` in your Bash shell. To check if the environment variable was set properly, you can "echo" it (e.g. ``echo $SERVER_URL``). See also :ref:`curl-examples-and-environment-variables`.
 
 .. _CORS: https://www.w3.org/TR/cors/
 
-.. warning:: Dataverse 4's API is versioned at the URI - all API calls may include the version number like so: ``http://server-address/api/v1/...``. Omitting the ``v1`` part would default to the latest API version (currently 1). When writing scripts/applications that will be used for a long time, make sure to specify the API version, so they don't break when the API is upgraded.
+.. warning:: The Dataverse Software's API is versioned at the URI - all API calls may include the version number like so: ``https://server-address/api/v1/...``. Omitting the ``v1`` part would default to the latest API version (currently 1). When writing scripts/applications that will be used for a long time, make sure to specify the API version, so they don't break when the API is upgraded.
 
 .. contents:: |toctitle|
     :local:
 
-Dataverses
-----------
+Dataverse Collections
+---------------------
 
 .. _create-dataverse-api:
 
-Create a Dataverse
-~~~~~~~~~~~~~~~~~~
+Create a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A dataverse is a container for datasets and other dataverses as explained in the :doc:`/user/dataverse-management` section of the User Guide.
+A Dataverse collection is a container for datasets and other Dataverse collections as explained in the :doc:`/user/dataverse-management` section of the User Guide.
 
-The steps for creating a dataverse are:
+The steps for creating a Dataverse collection are:
 
-- Prepare a JSON file containing the name, description, etc, of the dataverse you'd like to create.
-- Figure out the alias or database id of the "parent" dataverse into which you will be creating your new dataverse.
+- Prepare a JSON file containing the name, description, etc, of the Dataverse collection you'd like to create.
+- Figure out the alias or database id of the "parent" Dataverse collection into which you will be creating your new Dataverse collection.
 - Execute a curl command or equivalent.
 
 Download :download:`dataverse-complete.json <../_static/api/dataverse-complete.json>` file and modify it to suit your needs. The fields ``name``, ``alias``, and ``dataverseContacts`` are required. The controlled vocabulary for ``dataverseType`` is the following:
@@ -46,488 +46,517 @@ Download :download:`dataverse-complete.json <../_static/api/dataverse-complete.j
 
 The curl command below assumes you have kept the name "dataverse-complete.json" and that this file is in your current working directory.
 
-Next you need to figure out the alias or database id of the "parent" dataverse into which you will be creating your new dataverse. Out of the box the top level dataverse has an alias of "root" and a database id of "1" but your installation may vary. The easiest way to determine the alias of your root dataverse is to click "Advanced Search" and look at the URL. You may also choose a parent under the root.
+Next you need to figure out the alias or database id of the "parent" Dataverse collection into which you will be creating your new Dataverse collection. Out of the box the top level Dataverse collection has an alias of "root" and a database id of "1" but your installation may vary. The easiest way to determine the alias of your root Dataverse collection is to click "Advanced Search" and look at the URL. You may also choose a parent under the root.
 
 .. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
 
 .. code-block:: bash
 
   export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  export PARENT=root
   export SERVER_URL=https://demo.dataverse.org
-  
-  curl -H X-Dataverse-key:$API_TOKEN -X POST $SERVER_URL/api/dataverses/$PARENT --upload-file dataverse-complete.json
+  export PARENT=root
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$PARENT" --upload-file dataverse-complete.json
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl -H X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx -X POST https://demo.dataverse.org/api/dataverses/root --upload-file dataverse-complete.json
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/dataverses/root" --upload-file dataverse-complete.json
 
-You should expect a 201 ("CREATED") response and JSON indicating the database id that has been assigned to your newly created dataverse.
+You should expect an HTTP 200 response and JSON beginning with "status":"OK" followed by a representation of the newly-created Dataverse collection.
 
-.. _view-dataverse:
+The request JSON supports an optional ``metadataBlocks`` object, with the following supported sub-objects:
 
-View a Dataverse
-~~~~~~~~~~~~~~~~
+- ``metadataBlockNames``: The names of the metadata blocks you want to add to the Dataverse collection.
+- ``inputLevels``: The names of the fields in each metadata block for which you want to add a custom configuration regarding their inclusion or requirement when creating and editing datasets in the new Dataverse collection. Note that if the corresponding metadata blocks names are not specified in the ``metadataBlockNames``` field, they will be added automatically to the Dataverse collection.
+- ``facetIds``: The names of the fields to use as facets for browsing datasets and collections in the new Dataverse collection. Note that the order of the facets is defined by their order in the provided JSON array.
 
-|CORS| View data about the dataverse identified by ``$id``. ``$id`` can be the id number of the dataverse, its identifier (a.k.a. alias), or the special value ``:root`` for the root dataverse.
+To obtain an example of how these objects are included in the JSON file, download :download:`dataverse-complete-optional-params.json <../_static/api/dataverse-complete-optional-params.json>` file and modify it to suit your needs.
 
-``curl $SERVER_URL/api/dataverses/$id``
+.. _update-dataverse-api:
 
-Delete a Dataverse
-~~~~~~~~~~~~~~~~~~
+Update a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In order to delete a dataverse you must first delete or move all of its contents elsewhere.
+Updates an existing Dataverse collection using a JSON file following the same structure as the one used in the API for the creation. (see :ref:`create-dataverse-api`).
 
-Deletes the dataverse whose ID is given:
+The steps for updating a Dataverse collection are:
 
-``curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE $SERVER_URL/api/dataverses/$id``
+- Prepare a JSON file containing the fields for the properties you want to update. You do not need to include all the properties, only the ones you want to update.
+- Execute a curl command or equivalent.
 
-.. _show-contents-of-a-dataverse-api:
+As an example, you can download :download:`dataverse-complete.json <../_static/api/dataverse-complete.json>` file and modify it to suit your needs. The controlled vocabulary for ``dataverseType`` is the following:
 
-Show Contents of a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- ``DEPARTMENT``
+- ``JOURNALS``
+- ``LABORATORY``
+- ``ORGANIZATIONS_INSTITUTIONS``
+- ``RESEARCHERS``
+- ``RESEARCH_GROUP``
+- ``RESEARCH_PROJECTS``
+- ``TEACHING_COURSES``
+- ``UNCATEGORIZED``
 
-|CORS| Lists all the dataverses and datasets directly under a dataverse (direct children only). You must specify the "alias" of a dataverse or its database id. If you specify your API token and have access, unpublished dataverses and datasets will be included in the listing.
+The curl command below assumes you are using the name "dataverse-complete.json" and that this file is in your current working directory.
 
-.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+Next you need to figure out the alias or database id of the Dataverse collection you want to update.
 
 .. code-block:: bash
 
   export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  export ALIAS=root
   export SERVER_URL=https://demo.dataverse.org
-  
-  curl -H X-Dataverse-key:$API_TOKEN $SERVER_URL/api/dataverses/$ALIAS/contents
+  export DV_ALIAS=dvAlias
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/dataverses/$DV_ALIAS" --upload-file dataverse-complete.json
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl -H X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx https://demo.dataverse.org/api/dataverses/root/contents
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/dataverses/dvAlias" --upload-file dataverse-complete.json
 
-Report the data (file) size of a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+You should expect an HTTP 200 response and JSON beginning with "status":"OK" followed by a representation of the updated Dataverse collection.
 
-Shows the combined size in bytes of all the files uploaded into the dataverse ``id``. ::
+Same as in :ref:`create-dataverse-api`, the request JSON supports an optional ``metadataBlocks`` object, with the following supported sub-objects:
 
-``curl -H "X-Dataverse-key:$API_TOKEN" http://$SERVER_URL/api/dataverses/$id/storagesize``
+- ``metadataBlockNames``: The names of the metadata blocks to be assigned to the Dataverse collection.
+- ``inputLevels``: The names of the fields in each metadata block for which you want to add a custom configuration regarding their inclusion or requirement when creating and editing datasets in the Dataverse collection. Note that if the corresponding metadata blocks names are not specified in the ``metadataBlockNames``` field, they will be added automatically to the Dataverse collection.
+- ``facetIds``: The names of the fields to use as facets for browsing datasets and collections in the Dataverse collection. Note that the order of the facets is defined by their order in the provided JSON array.
 
-Both published and unpublished files will be counted, in the dataverse specified, and in all its sub-dataverses, recursively. 
-By default, only the archival files are counted - i.e., the files uploaded by users (plus the tab-delimited versions generated for tabular data files on ingest). If the optional argument ``includeCached=true`` is specified, the API will also add the sizes of all the extra files generated and cached by Dataverse - the resized thumbnail versions for image files, the metadata exports for published datasets, etc. 
+Note that setting any of these fields overwrites the previous configuration.
 
+When it comes to omitting these fields in the JSON:
 
-List Roles Defined in a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Omitting ``facetIds`` or ``metadataBlockNames`` causes no change to the Dataverse collection. To delete the current configuration and inherit the corresponding configuration from its parent include the flag ``inheritFacetsFromParent`` and/or ``inheritMetadataBlocksFromParent`` respectively.
+- Omitting ``inputLevels`` causes no change to the Dataverse collection. Including the flag ``inheritMetadataBlocksFromParent`` will cause the custom ``inputLevels`` to be deleted and inherited from the parent.
+- Omitting the entire ``metadataBlocks`` object in the request JSON would cause no change to the ``inputLevels``, ``facetIds`` or ``metadataBlockNames`` of the Dataverse collection.
 
-All the roles defined directly in the dataverse identified by ``id``::
+To obtain an example of how these objects are included in the JSON file, download :download:`dataverse-complete-optional-params.json <../_static/api/dataverse-complete-optional-params.json>` file and modify it to suit your needs.
 
-  GET http://$SERVER/api/dataverses/$id/roles?key=$apiKey
+To force the configurations to be deleted and inherited from the parent's configuration include the following ``metadataBlocks`` object in your JSON
 
-List Facets Configured for a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: json
 
-|CORS| List all the facets for a given dataverse ``id``. ::
+  "metadataBlocks": {
+    "inheritMetadataBlocksFromParent": true,
+    "inheritFacetsFromParent": true
+  }
 
-  GET http://$SERVER/api/dataverses/$id/facets?key=$apiKey
+.. note:: Including both the list ``metadataBlockNames`` and the flag ``"inheritMetadataBlocksFromParent": true`` will result in an error being returned {"status": "ERROR", "message": "Metadata block can not contain both metadataBlockNames and inheritMetadataBlocksFromParent: true"}. The same is true for ``facetIds`` and ``inheritFacetsFromParent``.
 
-Set Facets for a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+See also :ref:`collection-attributes-api`.
 
-Assign search facets for a given dataverse with alias ``$alias``
+.. _view-dataverse:
 
-``curl -H "X-Dataverse-key: $apiKey" -X POST http://$server/api/dataverses/$alias/facets --upload-file facets.json``
+View a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Where ``facets.json`` contains a JSON encoded list of metadata keys (e.g. ``["authorName","authorAffiliation"]``).
+|CORS| View a JSON representation of the Dataverse collection identified by ``$id``. ``$id`` can be the database ID of the Dataverse collection, its alias, or the special value ``:root`` for the root Dataverse collection.
 
-Create a New Role in a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To view a published Dataverse collection:
 
-Creates a new role under dataverse ``id``. Needs a json file with the role description::
+.. code-block:: bash
 
-  POST http://$SERVER/api/dataverses/$id/roles?key=$apiKey
-  
-POSTed JSON example::
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-  {
-    "alias": "sys1",
-    "name": “Restricted System Role”,
-    "description": “A person who may only add datasets.”,
-    "permissions": [
-      "AddDataset"
-    ]
-  } 
+  curl "$SERVER_URL/api/dataverses/$ID"
 
-.. _list-role-assignments-on-a-dataverse-api:
+The fully expanded example above (without environment variables) looks like this:
 
-List Role Assignments in a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-List all the role assignments at the given dataverse::
+  curl "https://demo.dataverse.org/api/dataverses/root"
 
-  GET http://$SERVER/api/dataverses/$id/assignments?key=$apiKey
-  
-Assign Default Role to User Creating a Dataset in a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+If you want to include the Dataverse collections that this collection is part of, you must set ``returnOwners`` query parameter to ``true``.
 
-Assign a default role to a user creating a dataset in a dataverse ``id`` where ``roleAlias`` is the database alias of the role to be assigned::
+Usage example:
 
-  PUT http://$SERVER/api/dataverses/$id/defaultContributorRole/$roleAlias?key=$apiKey
-  
-Note: You may use "none" as the ``roleAlias``. This will prevent a user who creates a dataset from having any role on that dataset. It is not recommended for dataverses with human contributors.
+.. code-block:: bash
 
-.. _assign-role-on-a-dataverse-api:
+  curl "https://demo.dataverse.org/api/dataverses/root?returnOwners=true"
 
-Assign a New Role on a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+If you want to include the child count of the Dataverse, which represents the number of dataverses, datasets, or files within the dataverse, you must set ``returnChildCount`` query parameter to ``true``. Please note that this count is for direct children only. It doesn't count children of subdataverses.
 
-Assigns a new role, based on the POSTed JSON. ::
+Usage example:
 
-  POST http://$SERVER/api/dataverses/$id/assignments?key=$apiKey
+.. code-block:: bash
 
-POSTed JSON example::
+  curl "https://demo.dataverse.org/api/dataverses/root?returnChildCount=true"
 
-  {
-    "assignee": "@uma",
-    "role": "curator"
-  }
 
-.. _revoke-role-on-a-dataverse-api:
+To view an unpublished Dataverse collection:
 
-Delete Role Assignment from a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-Delete the assignment whose id is ``$id``::
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-  DELETE http://$SERVER/api/dataverses/$id/assignments/$id?key=$apiKey
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID"
 
-List Metadata Blocks Defined on a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The fully expanded example above (without environment variables) looks like this:
 
-|CORS| Get the metadata blocks defined on a dataverse which determine which field are available to authors when they create and edit datasets within that dataverse. This feature is described under "General Information" in the :doc:`/user/dataverse-management` section of the User Guide.
+.. code-block:: bash
 
-Please note that an API token is only required if the dataverse has not been published.
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root"
 
-.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+Delete a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Before you may delete a Dataverse collection you must first delete or move all of its contents elsewhere.
+
+Deletes the Dataverse collection whose database ID or alias is given:
 
 .. code-block:: bash
 
   export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  export ALIAS=root
   export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-  curl -H X-Dataverse-key:$API_TOKEN $SERVER_URL/api/dataverses/$ALIAS/metadatablocks
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/dataverses/$ID"
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl -H X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx https://demo.dataverse.org/api/dataverses/root/metadatablocks
-
-Define Metadata Blocks for a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/dataverses/root"
 
-You can define the metadata blocks available to authors within a dataverse.
+.. _show-contents-of-a-dataverse-api:
 
-The metadata blocks that are available with a default installation of Dataverse are in :download:`define-metadatablocks.json <../_static/api/define-metadatablocks.json>` (also shown below) and you should download this file and edit it to meet your needs. Please note that the "citation" metadata block is required. You must have "EditDataverse" permission on the dataverse.
+Show Contents of a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../_static/api/define-metadatablocks.json
+|CORS| Lists all the Dataverse collections and datasets directly under a Dataverse collection (direct children only, not recursive) specified by database id or alias. If you pass your API token and have access, unpublished Dataverse collections and datasets will be included in the response. The list will be ordered by database id within type of object. That is, all Dataverse collections will be listed first and ordered by database id, then all datasets will be listed ordered by database id.
 
 .. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
 
 .. code-block:: bash
 
   export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  export ALIAS=root
   export SERVER_URL=https://demo.dataverse.org
-  
-  curl -H X-Dataverse-key:$API_TOKEN -X POST -H \"Content-type:application/json\" --upload-file define-metadatablocks.json $SERVER_URL/api/dataverses/$ALIAS/metadatablocks
+  export ID=root
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/contents"
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl -H X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx -X POST -H "Content-type:application/json" --upload-file define-metadatablocks.json https://demo.dataverse.org/api/dataverses/root/metadatablocks
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/contents"
 
-Determine if a Dataverse Inherits Its Metadata Blocks from Its Parent
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Report the data (file) size of a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Get whether the dataverse is a metadata block root, or does it uses its parent blocks::
+Shows the combined size in bytes of all the files uploaded into the Dataverse collection ``id``:
 
-  GET http://$SERVER/api/dataverses/$id/metadatablocks/isRoot?key=$apiKey
+.. code-block:: bash
 
-Configure a Dataverse to Inherit Its Metadata Blocks from Its Parent
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-Set whether the dataverse is a metadata block root, or does it uses its parent blocks. Possible
-values are ``true`` and ``false`` (both are valid JSON expressions). ::
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/storagesize"
 
-  PUT http://$SERVER/api/dataverses/$id/metadatablocks/isRoot?key=$apiKey
+The fully expanded example above (without environment variables) looks like this:
 
-.. note:: Previous endpoints ``GET http://$SERVER/api/dataverses/$id/metadatablocks/:isRoot?key=$apiKey`` and ``POST http://$SERVER/api/dataverses/$id/metadatablocks/:isRoot?key=$apiKey`` are deprecated, but supported.
+.. code-block:: bash
 
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/storagesize"
 
-.. _create-dataset-command: 
+The size of published and unpublished files will be summed both in the Dataverse collection specified and beneath all its sub-collections, recursively. 
+By default, only the archival files are counted - i.e., the files uploaded by users (plus the tab-delimited versions generated for tabular data files on ingest). If the optional argument ``includeCached=true`` is specified, the API will also add the sizes of all the extra files generated and cached by the Dataverse installation - the resized thumbnail versions for image files, the metadata exports for published datasets, etc. 
 
-Create a Dataset in a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+List Roles Defined in a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A dataset is a container for files as explained in the :doc:`/user/dataset-management` section of the User Guide.
+All the roles defined directly in the Dataverse collection identified by ``id``:
 
-To create a dataset, you must supply a JSON file that contains at least the following required metadata fields:
+.. code-block:: bash
 
-- Title
-- Author
-- Contact
-- Description
-- Subject
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-As a starting point, you can download :download:`dataset-finch1.json <../../../../scripts/search/tests/data/dataset-finch1.json>` and modify it to meet your needs. (In addition to this minimal example, you can download :download:`dataset-create-new-all-default-fields.json <../../../../scripts/api/data/dataset-create-new-all-default-fields.json>` which populates all of the metadata fields that ship with Dataverse.)
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/roles"
 
-The curl command below assumes you have kept the name "dataset-finch1.json" and that this file is in your current working directory.
+The fully expanded example above (without environment variables) looks like this:
 
-Next you need to figure out the alias or database id of the "parent" dataverse into which you will be creating your new dataset. Out of the box the top level dataverse has an alias of "root" and a database id of "1" but your installation may vary. The easiest way to determine the alias of your root dataverse is to click "Advanced Search" and look at the URL. You may also choose a parent dataverse under the root dataverse.
+.. code-block:: bash
 
-.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/roles"
+
+List Facets Configured for a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| List all the facets for a given Dataverse collection ``id``:
 
 .. code-block:: bash
 
   export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  export PARENT=root
   export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-  curl -H X-Dataverse-key:$API_TOKEN -X POST $SERVER_URL/api/dataverses/$PARENT/datasets --upload-file dataset-finch1.json
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/facets"
 
-The fully expanded example above (without the environment variables) looks like this:
+The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl -H X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx -X POST https://demo.dataverse.org/api/dataverses/root/datasets --upload-file dataset-finch1.json
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/facets"
 
-You should expect a 201 ("CREATED") response and JSON indicating the database ID and Persistent ID (PID such as DOI or Handle) that has been assigned to your newly created dataset.
+By default, this endpoint will return an array including the facet names. If more detailed information is needed, we can set the query parameter ``returnDetails`` to ``true``, which will return the display name and id in addition to the name for each facet:
 
-Import a Dataset into a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-.. note:: This action requires a Dataverse account with super-user permissions.
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-To import a dataset with an existing persistent identifier (PID), the dataset's metadata should be prepared in Dataverse's native JSON format. The PID is provided as a parameter at the URL. The following line imports a dataset with the PID ``PERSISTENT_IDENTIFIER`` to Dataverse, and then releases it::
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/facets?returnDetails=true"
 
-  curl -H "X-Dataverse-key: $API_TOKEN" -X POST $SERVER_URL/api/dataverses/$DV_ALIAS/datasets/:import?pid=$PERSISTENT_IDENTIFIER&release=yes --upload-file dataset.json
+The fully expanded example above (without environment variables) looks like this:
 
-The ``pid`` parameter holds a persistent identifier (such as a DOI or Handle). The import will fail if no PID is provided, or if the provided PID fails validation.
+.. code-block:: bash
 
-The optional ``release`` parameter tells Dataverse to immediately publish the dataset. If the parameter is changed to ``no``, the imported dataset will remain in ``DRAFT`` status.
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/facets?returnDetails=true"
 
-The JSON format is the same as that supported by the native API's :ref:`create dataset command<create-dataset-command>`, although it also allows packages.  For example:
+Set Facets for a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../../../scripts/api/data/dataset-package-files.json
+Assign search facets for a given Dataverse collection identified by ``id``:
 
-Before calling the API, make sure the data files referenced by the ``POST``\ ed JSON are placed in the dataset directory with filenames matching their specified storage identifiers. In installations using POSIX storage, these files must be made readable by GlassFish.
+.. code-block:: bash
 
-.. tip:: If possible, it's best to avoid spaces and special characters in the storage identifier in order to avoid potential portability problems. The storage identifier corresponds with the filesystem name (or bucket identifier) of the data file, so these characters may cause unpredictability with filesystem tools.
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-.. warning:: 
-  
-  * This API does not cover staging files (with correct contents, checksums, sizes, etc.) in the corresponding places in the Dataverse filestore.
-  * This API endpoint does not support importing *files'* persistent identifiers.
-  * A Dataverse server can import datasets with a valid PID that uses a different protocol or authority than said server is configured for. However, the server will not update the PID metadata on subsequent update and publish actions.
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$ID/facets" --upload-file dataverse-facets.json
 
+The fully expanded example above (without environment variables) looks like this:
 
-Import a Dataset into a Dataverse with a DDI file
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-.. note:: This action requires a Dataverse account with super-user permissions.
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/dataverses/root/facets" --upload-file dataverse-facets.json
 
-To import a dataset with an existing persistent identifier (PID), you have to provide the PID as a parameter at the URL. The following line imports a dataset with the PID ``PERSISTENT_IDENTIFIER`` to Dataverse, and then releases it::
+Where :download:`dataverse-facets.json <../_static/api/dataverse-facets.json>` contains a JSON encoded list of metadata keys (e.g. ``["authorName","authorAffiliation"]``).
 
-  curl -H "X-Dataverse-key: $API_TOKEN" -X POST $SERVER_URL/api/dataverses/$DV_ALIAS/datasets/:importddi?pid=$PERSISTENT_IDENTIFIER&release=yes --upload-file ddi_dataset.xml
+.. _metadata-block-facet-api:
 
-The optional ``pid`` parameter holds a persistent identifier (such as a DOI or Handle). The import will fail if the provided PID fails validation.
+List Metadata Block Facets Configured for a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The optional ``release`` parameter tells Dataverse to immediately publish the dataset. If the parameter is changed to ``no``, the imported dataset will remain in ``DRAFT`` status.
+|CORS| List the metadata block facet configuration with all the metadata block configured for a given Dataverse collection ``id``:
 
-The file is a DDI xml file.
+.. code-block:: bash
 
-.. warning::
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-  * This API does not handle files related to the DDI file.
-  * A Dataverse server can import datasets with a valid PID that uses a different protocol or authority than said server is configured for. However, the server will not update the PID metadata on subsequent update and publish actions.
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/metadatablockfacets"
 
-.. _publish-dataverse-api:
+The fully expanded example above (without environment variables) looks like this:
 
-Publish a Dataverse
-~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-In order to publish a dataverse, you must know either its "alias" (which the GUI calls an "identifier") or its database ID.
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/metadatablockfacets"
 
-.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+List Field Type Input Levels Configured for a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| List the dataverse field type input levels configured for a given Dataverse collection ``id``:
 
 .. code-block:: bash
 
   export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  export ALIAS=root
   export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-  curl -H X-Dataverse-key:$API_TOKEN -X POST $SERVER_URL/api/dataverses/$ALIAS/actions/:publish
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/inputLevels"
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl -H X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx -X POST https://demo.dataverse.org/api/dataverses/root/actions/:publish
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/inputLevels"
 
-You should expect a 200 ("OK") response and JSON output.
+Set Metadata Block Facets for a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Datasets
---------
+Sets the metadata blocks that will appear in the ``Dataset Features`` facet category for a given Dataverse collection identified by ``id``.
 
-**Note** Creation of new datasets is done with a ``POST`` onto dataverses. See Dataverses_ section.
+In order to set or clear the metadata blocks for a collection, you must first :ref:`set the metadata block facet root to true<metadata-block-facet-root-api>`.
 
-**Note** In all commands below, dataset versions can be referred to as:
+To clear the metadata blocks set by a parent collection, submit an empty array (e.g. ``[]``):
 
-* ``:draft``  the draft version, if any
-* ``:latest`` either a draft (if exists) or the latest published version.
-* ``:latest-published`` the latest published version
-* ``x.y`` a specific version, where ``x`` is the major version number and ``y`` is the minor version number.
-* ``x`` same as ``x.0``
+.. code-block:: bash
 
-Get JSON Representation of a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-.. note:: Datasets can be accessed using persistent identifiers. This is done by passing the constant ``:persistentId`` where the numeric id of the dataset is expected, and then passing the actual persistent id as a query parameter with the name ``persistentId``.
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST -H "Content-type:application/json" "$SERVER_URL/api/dataverses/$ID/metadatablockfacets" --upload-file metadata-block-facets.json
 
-  Example: Getting the dataset whose DOI is *10.5072/FK2/J8SJZB* ::
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
 
-    curl http://$SERVER/api/datasets/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST -H "Content-type:application/json" "https://demo.dataverse.org/api/dataverses/root/metadatablockfacets" --upload-file metadata-block-facets.json
 
-  fully expanded::
+Where :download:`metadata-block-facets.json <../_static/api/metadata-block-facets.json>` contains a JSON encoded list of metadata block names (e.g. ``["socialscience","geospatial"]``). This endpoint supports an empty list (e.g. ``[]``)
 
-    curl http://localhost:8080/api/datasets/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB
+.. _metadata-block-facet-root-api:
 
-  Getting its draft version::
+Configure a Dataverse Collection to Inherit Its Metadata Block Facets from Its Parent
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    curl http://$SERVER/api/datasets/:persistentId/versions/:draft?persistentId=doi:10.5072/FK2/J8SJZB
+Set whether the Dataverse collection is a metadata block facet root, or does it uses its parent metadata block facets. Possible values are ``true`` and ``false`` (both are valid JSON expressions).
 
-  fully expanded::
+When updating the root to false, it will clear any metadata block facets from the collection. When updating to true, it will copy the metadata block facets from the parent collection:
 
-    curl http://localhost:8080/api/datasets/:persistentId/versions/:draft?persistentId=doi:10.5072/FK2/J8SJZB
+.. code-block:: bash
 
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-|CORS| Show the dataset whose id is passed::
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST -H "Content-type:application/json" "$SERVER_URL/api/dataverses/$ID/metadatablockfacets/isRoot" -d 'true'
 
-  GET http://$SERVER/api/datasets/$id?key=$apiKey
+The fully expanded example above (without environment variables) looks like this:
 
-List Versions of a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-|CORS| List versions of the dataset::
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST -H "Content-type:application/json" "https://demo.dataverse.org/api/dataverses/root/metadatablockfacets/isRoot" -d 'true'
 
-  GET http://$SERVER/api/datasets/$id/versions?key=$apiKey
+.. _create-role-in-collection:
 
-Get Version of a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~
+Create a New Role in a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-|CORS| Show a version of the dataset. The Dataset also include any metadata blocks the data might have::
+Creates a new role under Dataverse collection ``id``. Needs a json file with the role description:
 
-  GET http://$SERVER/api/datasets/$id/versions/$versionNumber?key=$apiKey
+.. code-block:: bash
 
-.. _export-dataset-metadata-api:
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-Export Metadata of a Dataset in Various Formats
+  curl -H "X-Dataverse-key:$API_TOKEN" -H "Content-type:application/json" -X POST "$SERVER_URL/api/dataverses/$ID/roles" --upload-file roles.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -H "Content-type:application/json" -X POST "https://demo.dataverse.org/api/dataverses/root/roles" --upload-file roles.json
+
+For ``roles.json`` see :ref:`json-representation-of-a-role`
+
+.. note:: Only a Dataverse installation account with superuser permissions is allowed to create roles in a Dataverse Collection.
+
+.. _list-role-assignments-on-a-dataverse-api:
+
+List Role Assignments in a Dataverse Collection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-|CORS| Export the metadata of the current published version of a dataset in various formats see Note below::
+List all the role assignments at the given Dataverse collection:
 
-    GET http://$SERVER/api/datasets/export?exporter=ddi&persistentId=$persistentId
+.. code-block:: bash
 
-.. note:: Supported exporters (export formats) are ``ddi``, ``oai_ddi``, ``dcterms``, ``oai_dc``, ``schema.org`` , ``OAI_ORE`` , ``Datacite``, ``oai_datacite`` and ``dataverse_json``. Descriptive names can be found under :ref:`metadata-export-formats` in the User Guide.
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/assignments"
 
-Schema.org JSON-LD
-^^^^^^^^^^^^^^^^^^
+The fully expanded example above (without environment variables) looks like this:
 
-Please note that the ``schema.org`` format has changed in backwards-incompatible ways after Dataverse 4.9.4:
+.. code-block:: bash
 
-- "description" was a single string and now it is an array of strings.
-- "citation" was an array of strings and now it is an array of objects.
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/assignments"
 
-Both forms are valid according to Google's Structured Data Testing Tool at https://search.google.com/structured-data/testing-tool . (This tool will report "The property affiliation is not recognized by Google for an object of type Thing" and this known issue is being tracked at https://github.com/IQSS/dataverse/issues/5029 .) Schema.org JSON-LD is an evolving standard that permits a great deal of flexibility. For example, https://schema.org/docs/gs.html#schemaorg_expected indicates that even when objects are expected, it's ok to just use text. As with all metadata export formats, we will try to keep the Schema.org JSON-LD format Dataverse emits backward-compatible to made integrations more stable, despite the flexibility that's afforded by the standard.
+Assign Default Role to User Creating a Dataset in a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-List Files in a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~
+Assign a default role to a user creating a dataset in a Dataverse collection ``id`` where ``roleAlias`` is the database alias of the role to be assigned:
 
-|CORS| Lists all the file metadata, for the given dataset and version::
+.. code-block:: bash
 
-  GET http://$SERVER/api/datasets/$id/versions/$versionId/files?key=$apiKey
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+  export ROLE_ALIAS=curator
 
-List All Metadata Blocks for a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/dataverses/$ID/defaultContributorRole/$ROLE_ALIAS"
 
-|CORS| Lists all the metadata blocks and their content, for the given dataset and version::
+The fully expanded example above (without environment variables) looks like this:
 
-  GET http://$SERVER/api/datasets/$id/versions/$versionId/metadata?key=$apiKey
+.. code-block:: bash
 
-List Single Metadata Block for a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/dataverses/root/defaultContributorRole/curator"
 
-|CORS| Lists the metadata block block named `blockname`, for the given dataset and version::
+Note: You may use "none" as the ``ROLE_ALIAS``. This will prevent a user who creates a dataset from having any role on that dataset. It is not recommended for Dataverse collections with human contributors.
 
-  GET http://$SERVER/api/datasets/$id/versions/$versionId/metadata/$blockname?key=$apiKey
+.. _assign-role-on-a-dataverse-api:
 
-Update Metadata For a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Assign a New Role on a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Updates the metadata for a dataset. If a draft of the dataset already exists, the metadata of that draft is overwritten; otherwise, a new draft is created with this metadata.
+Assigns a new role, based on the POSTed JSON:
 
-You must download a JSON representation of the dataset, edit the JSON you download, and then send the updated JSON to the Dataverse server.
+.. code-block:: bash
 
-For example, after making your edits, your JSON file might look like :download:`dataset-update-metadata.json <../_static/api/dataset-update-metadata.json>` which you would send to Dataverse like this::
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-    curl -H "X-Dataverse-key: $API_TOKEN" -X PUT $SERVER_URL/api/datasets/:persistentId/versions/:draft?persistentId=$PID --upload-file dataset-update-metadata.json
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST -H "Content-Type: application/json" "$SERVER_URL/api/dataverses/$ID/assignments" --upload-file role.json
 
-Note that in the example JSON file above, there is a single JSON object with ``metadataBlocks`` as a key. When you download a representation of your dataset in JSON format, the ``metadataBlocks`` object you need is nested inside another object called ``json``. To extract just the ``metadataBlocks`` key when downloading a JSON representation, you can use a tool such as ``jq`` like this::
+The fully expanded example above (without environment variables) looks like this:
 
-    curl -H "X-Dataverse-key: $API_TOKEN" $SERVER_URL/api/datasets/:persistentId/versions/:latest?persistentId=$PID | jq '.data | {metadataBlocks: .metadataBlocks}' > dataset-update-metadata.json
+.. code-block:: bash
 
-Now that the resulting JSON file only contains the ``metadataBlocks`` key, you can edit the JSON such as with ``vi`` in the example below::
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST -H "Content-Type: application/json" "https://demo.dataverse.org/api/dataverses/root/assignments" --upload-file role.json
 
-    vi dataset-update-metadata.json
+POSTed JSON example (the content of ``role.json`` file)::
 
-Now that you've made edits to the metadata in your JSON file, you can send it to Dataverse as described above.
+  {
+    "assignee": "@uma",
+    "role": "curator"
+  }
 
-Edit Dataset Metadata
-~~~~~~~~~~~~~~~~~~~~~
+.. _revoke-role-on-a-dataverse-api:
 
-Alternatively to replacing an entire dataset version with its JSON representation you may add data to dataset fields that are blank or accept multiple values with the following ::
+Delete Role Assignment from a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    curl -H "X-Dataverse-key: $API_TOKEN" -X PUT $SERVER_URL/api/datasets/:persistentId/editMetadata/?persistentId=$PID --upload-file dataset-add-metadata.json    
+Delete the assignment whose id is ``$id``:
 
-You may also replace existing metadata in dataset fields with the following (adding the parameter replace=true)   ::
+.. code-block:: bash
 
-    curl -H "X-Dataverse-key: $API_TOKEN" -X PUT $SERVER_URL/api/datasets/:persistentId/editMetadata?persistentId=$PID&replace=true --upload-file dataset-update-metadata.json
-    
-For these edits your JSON file need only include those dataset fields which you would like to edit. A sample JSON file may be downloaded here: :download:`dataset-edit-metadata-sample.json <../_static/api/dataset-edit-metadata-sample.json>` 
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+  export ASSIGNMENT_ID=6
 
-Delete Dataset Metadata
-~~~~~~~~~~~~~~~~~~~~~~~
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/dataverses/$ID/assignments/$ASSIGNMENT_ID"
 
-You may delete some of the metadata of a dataset version by supplying a file with a JSON representation of dataset fields that you would like to delete with the following ::
+The fully expanded example above (without environment variables) looks like this:
 
-    curl -H "X-Dataverse-key: $API_TOKEN" -X PUT $SERVER_URL/api/datasets/:persistentId/deleteMetadata/?persistentId=$PID --upload-file dataset-delete-author-metadata.json    
-    
-For these deletes your JSON file must include an exact match of those dataset fields which you would like to delete. A sample JSON file may be downloaded here: :download:`dataset-delete-author-metadata.json <../_static/api/dataset-delete-author-metadata.json>` 
+.. code-block:: bash
 
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/dataverses/root/assignments/6"
 
-.. _publish-dataset-api:
+.. _list-metadata-blocks-for-a-collection:
 
-Publish a Dataset
-~~~~~~~~~~~~~~~~~
+List Metadata Blocks Defined on a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When publishing a dataset it's good to be aware of Dataverse's versioning system, which is described in the :doc:`/user/dataset-management` section of the User Guide.
+|CORS| Get the metadata blocks defined on a Dataverse collection which determine which field are available to authors when they create and edit datasets within that Dataverse collection. This feature is described in :ref:`general-information` section of Dataverse Collection Management of the User Guide.
 
-If this is the first version of the dataset, its version number will be set to ``1.0``. Otherwise, the new dataset version number is determined by the most recent version number and the ``type`` parameter. Passing ``type=minor`` increases the minor version number (2.3 is updated to 2.4). Passing ``type=major`` increases the major version number (2.3 is updated to 3.0). (Superusers can pass ``type=updatecurrent`` to update metadata without changing the version number.)
+Please note that an API token is only required if the Dataverse collection has not been published.
 
 .. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
 
@@ -535,760 +564,6090 @@ If this is the first version of the dataset, its version number will be set to `
 
   export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
   export SERVER_URL=https://demo.dataverse.org
-  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
-  export MAJOR_OR_MINOR=major
+  export ID=root
 
-  curl -H X-Dataverse-key:$API_TOKEN -X POST \""$SERVER_URL/api/datasets/:persistentId/actions/:publish?persistentId=$PERSISTENT_ID&type=$MAJOR_OR_MINOR"\"
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/metadatablocks"
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl -H X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx -X POST "https://demo.dataverse.org/api/datasets/:persistentId/actions/:publish?persistentId=doi:10.5072/FK2/J8SJZB&type=major"
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/metadatablocks"
 
-The quotes around the URL are required because there is more than one query parameter separated by an ampersand (``&``), which has special meaning to Unix shells such as Bash. Putting the ``&`` in quotes ensures that "type" is interpreted as one of the query parameters.
+This endpoint supports the following optional query parameters:
 
-You should expect JSON output and a 200 ("OK") response in most cases. If you receive a 202 ("ACCEPTED") response, this is normal for installations that have workflows configured. Workflows are described in the :doc:`/developers/workflows` section of the Developer Guide.
+- ``returnDatasetFieldTypes``: Whether or not to return the dataset field types present in each metadata block. If not set, the default value is false.
+- ``onlyDisplayedOnCreate``: Whether or not to return only the metadata blocks that are displayed on dataset creation. If ``returnDatasetFieldTypes`` is true, only the dataset field types shown on dataset creation will be returned within each metadata block. If not set, the default value is false.
+- ``datasetType``: Optionally return additional fields from metadata blocks that are linked with a particular dataset type (see :ref:`dataset-types` in the User Guide). Pass a single dataset type as a string. For a list of dataset types you can pass, see :ref:`api-list-dataset-types`.
 
-.. note:: POST should be used to publish a dataset. GET is supported for backward compatibility but is deprecated and may be removed: https://github.com/IQSS/dataverse/issues/2431
+An example using the optional query parameters is presented below:
 
-Delete Dataset Draft
-~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-Deletes the draft version of dataset ``$id``. Only the draft version can be deleted::
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+  export DATASET_TYPE=software
 
-    DELETE http://$SERVER/api/datasets/$id/versions/:draft?key=$apiKey
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/metadatablocks?returnDatasetFieldTypes=true&onlyDisplayedOnCreate=true&datasetType=$DATASET_TYPE"
 
-Set Citation Date Field for a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
 
-Sets the dataset field type to be used as the citation date for the given dataset (if the dataset does not include the dataset field type, the default logic is used). The name of the dataset field type should be sent in the body of the request.
-To revert to the default logic, use ``:publicationDate`` as the ``$datasetFieldTypeName``.
-Note that the dataset field used has to be a date field::
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/metadatablocks?returnDatasetFieldTypes=true&onlyDisplayedOnCreate=true&datasetType=software"
 
-    PUT http://$SERVER/api/datasets/$id/citationdate?key=$apiKey --data "$datasetFieldTypeName"
+.. _define-metadata-blocks-for-a-dataverse-collection:
 
-Revert Citation Date Field to Default for Dataset
+Define Metadata Blocks for a Dataverse Collection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Restores the default logic of the field type to be used as the citation date. Same as ``PUT`` with ``:publicationDate`` body::
+You can define the metadata blocks available to authors within a Dataverse collection.
 
-    DELETE http://$SERVER/api/datasets/$id/citationdate?key=$apiKey
+The metadata blocks that are available with a default Dataverse installation are in :download:`define-metadatablocks.json <../_static/api/define-metadatablocks.json>` (also shown below) and you should download this file and edit it to meet your needs. Please note that the "citation" metadata block is required. You must have "EditDataverse" permission on the Dataverse collection.
 
-List Role Assignments for a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. literalinclude:: ../_static/api/define-metadatablocks.json
 
-List all the role assignments at the given dataset::
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
 
-    GET http://$SERVER/api/datasets/$id/assignments?key=$apiKey
+.. code-block:: bash
 
-Create a Private URL for a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-Create a Private URL (must be able to manage dataset permissions)::
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$ID/metadatablocks" -H \"Content-type:application/json\" --upload-file define-metadatablocks.json
 
-    POST http://$SERVER/api/datasets/$id/privateUrl?key=$apiKey
+The fully expanded example above (without environment variables) looks like this:
 
-Get the Private URL for a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-Get a Private URL from a dataset (if available)::
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST -H "Content-type:application/json" --upload-file define-metadatablocks.json "https://demo.dataverse.org/api/dataverses/root/metadatablocks"
 
-    GET http://$SERVER/api/datasets/$id/privateUrl?key=$apiKey
+An alternative to defining metadata blocks at a collection level is to create and use a dataset type. See :ref:`api-link-dataset-type`.
 
-Delete the Private URL from a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Determine if a Dataverse Collection Inherits Its Metadata Blocks from Its Parent
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Delete a Private URL from a dataset (if it exists)::
+Get whether the Dataverse collection is a metadata block root, or does it uses its parent blocks:
 
-    DELETE http://$SERVER/api/datasets/$id/privateUrl?key=$apiKey
+.. code-block:: bash
 
-.. _add-file-api: 
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-Add a File to a Dataset
-~~~~~~~~~~~~~~~~~~~~~~~
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/metadatablocks/isRoot"
 
-When adding a file to a dataset, you can optionally specify the following:
+The fully expanded example above (without environment variables) looks like this:
 
-- A description of the file.
-- The "File Path" of the file, indicating which folder the file should be uploaded to within the dataset.
-- Whether or not the file is restricted.
+.. code-block:: bash
 
-In the curl example below, all of the above are specified but they are optional.
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/metadatablocks/isRoot"
 
-.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+Configure a Dataverse Collection to Inherit Its Metadata Blocks from Its Parent
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Set whether the Dataverse collection is a metadata block root, or does it uses its parent blocks. Possible
+values are ``true`` and ``false`` (both are valid JSON expressions):
 
 .. code-block:: bash
 
   export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  export FILENAME='data.tsv'
   export SERVER_URL=https://demo.dataverse.org
-  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+  export ID=root
 
-  curl -H X-Dataverse-key:$API_TOKEN -X POST -F "file=@$FILENAME" -F 'jsonData={"description":"My description.","directoryLabel":"data/subdir1","categories":["Data"], "restrict":"false"}' "$SERVER_URL/api/datasets/:persistentId/add?persistentId=$PERSISTENT_ID"
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/dataverses/$ID/metadatablocks/isRoot"
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl -H X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx -X POST -F file=@data.tsv -F jsonData={"description":"My description.","directoryLabel":"data/subdir1","categories":["Data"], "restrict":"false"} https://demo.dataverse.org/api/datasets/:persistentId/add?persistentId=doi:10.5072/FK2/J8SJZB
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/dataverses/root/metadatablocks/isRoot"
 
-You should expect a 201 ("CREATED") response and JSON indicating the database id that has been assigned to your newly uploaded file.
+.. note:: Previous endpoints ``$SERVER/api/dataverses/$id/metadatablocks/:isRoot`` and ``POST https://$SERVER/api/dataverses/$id/metadatablocks/:isRoot?key=$apiKey`` are deprecated, but supported.
 
-Please note that it's possible to "trick" Dataverse into giving a file a content type (MIME type) of your choosing. For example, you can make a text file be treated like a video file with ``-F 'file=@README.txt;type=video/mpeg4'``, for example. If Dataverse does not properly detect a file type, specifying the content type via API like this a potential workaround.
+.. _get-dataset-json-schema:
 
-The curl syntax above to upload a file is tricky and a Python version is provided below. (Please note that it depends on libraries such as "requests" that you may need to install but this task is out of scope for this guide.) Here are some parameters you can set in the script:
+Retrieve a Dataset JSON Schema for a Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-* ``dataverse_server`` - e.g. https://demo.dataverse.org
-* ``api_key`` - See the top of this document for a description
-* ``persistentId`` - Example: ``doi:10.5072/FK2/6XACVA``
-* ``dataset_id`` - Database id of the dataset
+Retrieves a JSON schema customized for a given collection in order to validate a dataset JSON file prior to creating the dataset:
 
-In practice, you only need one the ``dataset_id`` or the ``persistentId``. The example below shows both uses.
+.. code-block:: bash
 
-.. code-block:: python
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
 
-    from datetime import datetime
-    import json
-    import requests  # http://docs.python-requests.org/en/master/
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/datasetSchema"
 
-    # --------------------------------------------------
-    # Update the 4 params below to run this code
-    # --------------------------------------------------
-    dataverse_server = 'https://your dataverse server' # no trailing slash
-    api_key = 'api key'
-    dataset_id = 1  # database id of the dataset
-    persistentId = 'doi:10.5072/FK2/6XACVA' # doi or hdl of the dataset
+The fully expanded example above (without environment variables) looks like this:
 
-    # --------------------------------------------------
-    # Prepare "file"
-    # --------------------------------------------------
-    file_content = 'content: %s' % datetime.now()
-    files = {'file': ('sample_file.txt', file_content)}
+.. code-block:: bash
 
-    # --------------------------------------------------
-    # Using a "jsonData" parameter, add optional description + file tags
-    # --------------------------------------------------
-    params = dict(description='Blue skies!',
-                categories=['Lily', 'Rosemary', 'Jack of Hearts'])
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/datasetSchema"
 
-    params_as_json_string = json.dumps(params)
+Note: you must have "Add Dataset" permission in the given collection to invoke this endpoint.
 
-    payload = dict(jsonData=params_as_json_string)
+While it is recommended to download a copy of the JSON Schema from the collection (as above) to account for any fields that have been marked as required, you can also download a minimal :download:`dataset-schema.json <../_static/api/dataset-schema.json>` to get a sense of the schema when no customizations have been made.
 
-    # --------------------------------------------------
-    # Add file using the Dataset's id
-    # --------------------------------------------------
-    url_dataset_id = '%s/api/datasets/%s/add?key=%s' % (dataverse_server, dataset_id, api_key)
+.. _validate-dataset-json:
 
-    # -------------------
-    # Make the request
-    # -------------------
-    print '-' * 40
-    print 'making request: %s' % url_dataset_id
-    r = requests.post(url_dataset_id, data=payload, files=files)
+Validate Dataset JSON File for a Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    # -------------------
-    # Print the response
-    # -------------------
-    print '-' * 40
-    print r.json()
-    print r.status_code
+Validates a dataset JSON file customized for a given collection prior to creating the dataset.
 
-    # --------------------------------------------------
-    # Add file using the Dataset's persistentId (e.g. doi, hdl, etc)
-    # --------------------------------------------------
-    url_persistent_id = '%s/api/datasets/:persistentId/add?persistentId=%s&key=%s' % (dataverse_server, persistentId, api_key)
+The validation tests for:
 
-    # -------------------
-    # Update the file content to avoid a duplicate file error
-    # -------------------
-    file_content = 'content2: %s' % datetime.now()
-    files = {'file': ('sample_file2.txt', file_content)}
+- JSON formatting
+- required fields
+- typeClass must follow these rules:
 
+  - if multiple = true then value must be a list
+  - if typeClass = ``primitive`` the value object is a String or a List of Strings depending on the multiple flag
+  - if typeClass = ``compound`` the value object is a FieldDTO or a List of FieldDTOs depending on the multiple flag
+  - if typeClass = ``controlledVocabulary`` the values are checked against the list of allowed values stored in the database
+  - typeName validations (child objects with their required and allowed typeNames are configured automatically by the database schema). Examples include:
 
-    # -------------------
-    # Make the request
-    # -------------------
-    print '-' * 40
-    print 'making request: %s' % url_persistent_id
-    r = requests.post(url_persistent_id, data=payload, files=files)
+    - dsDescription validation includes checks for typeName = ``dsDescriptionValue`` (required) and ``dsDescriptionDate`` (optional)
+    - datasetContact validation includes checks for typeName = ``datasetContactName`` (required) and ``datasetContactEmail``; ``datasetContactAffiliation`` (optional)
 
-    # -------------------
-    # Print the response
-    # -------------------
-    print '-' * 40
-    print r.json()
-    print r.status_code
+.. code-block:: bash
 
-Submit a Dataset for Review
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$ID/validateDatasetJson" -H 'Content-type:application/json' --upload-file dataset.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/dataverses/root/validateDatasetJson" -H 'Content-type:application/json' --upload-file dataset.json
+
+Note: you must have "Add Dataset" permission in the given collection to invoke this endpoint.
+
+.. _featured-collections:
+
+List Featured Collections for a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The response is a JSON array of the alias strings of the featured collections of a given Dataverse collection identified by ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/dataverses/$ID/featured" 
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET "https://demo.dataverse.org/api/dataverses/root/featured" 
+
+
+Set Featured Collections for a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add featured collections to a given Dataverse collection identified by ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$ID/featured" --upload-file collection-alias.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/dataverses/root/featured" --upload-file collection-alias.json
+
+Where collection-alias.json contains a JSON encoded list of collections aliases to be featured (e.g. ``["collection1-alias","collection2-alias"]``).
+
+Note: You must have "Edit Dataverse" permission in the given Dataverse to invoke this endpoint. You may only feature collections that are published and owned by or linked to the featuring collection. Also, using this endpoint will only add new featured collections it will not remove collections that have already been featured.
+
+Remove Featured Collections from a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Remove featured collections from a given Dataverse collection identified by ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/dataverses/$ID/featured" 
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/dataverses/root/featured" 
+
+Note: You must have "Edit Dataverse" permission in the given Dataverse to invoke this endpoint.
+
+Get User Permissions on a Dataverse
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This API call returns the permissions that the calling user has on a particular dataverse.
+
+In particular, the user permissions that this API call checks, returned as booleans, are the following:
+
+* Can add a dataverse
+* Can add a dataset
+* Can view the unpublished dataverse
+* Can edit the dataverse
+* Can manage the dataverse permissions
+* Can publish the dataverse
+* Can delete the dataverse
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X GET "$SERVER_URL/api/dataverses/$ID/userPermissions"
+
+.. _create-dataset-command:
+
+Create a Dataset in a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A dataset is a container for files as explained in the :doc:`/user/dataset-management` section of the User Guide.
+
+To create a dataset, you must supply a JSON file that contains at least the following required metadata fields:
+
+- Title
+- Author Name
+- Point of Contact Email
+- Description Text
+- Subject
+
+.. _api-create-dataset-incomplete:
+
+Submit Incomplete Dataset
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Note:** This feature requires :ref:`dataverse.api.allow-incomplete-metadata` to be enabled and your Solr
+Schema to be up-to-date with the ``datasetValid`` field. If not done yet with the version upgrade, you will
+also need to reindex all dataset after enabling the :ref:`dataverse.api.allow-incomplete-metadata` feature.
+
+Providing a ``.../datasets?doNotValidate=true`` query parameter turns off the validation of metadata.
+In this situation, only the "Author Name" is required, except for the case when the setting :ref:`:MetadataLanguages`
+is configured and the value of "Dataset Metadata Language" setting of a collection is left with the default
+"Chosen at Dataset Creation" value. In that case, a language that is a part of the :ref:`:MetadataLanguages` list must be
+declared in the incomplete dataset.
+
+For example, a minimal JSON file, without the language specification, would look like this:
+
+.. code-block:: json
+  :name: dataset-incomplete.json
+
+  {
+    "datasetVersion": {
+      "metadataBlocks": {
+        "citation": {
+          "fields": [
+            {
+              "value": [
+                {
+                  "authorName": {
+                    "value": "Finch, Fiona",
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "authorName"
+                  }
+                }
+              ],
+              "typeClass": "compound",
+              "multiple": true,
+              "typeName": "author"
+            }
+          ],
+          "displayName": "Citation Metadata"
+        }
+      }
+    }
+  }
+
+The following is an example HTTP call with deactivated validation:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export PARENT=root
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$PARENT/datasets?doNotValidate=true" --upload-file dataset-incomplete.json -H 'Content-type:application/json'
+
+**Note:** You may learn about an instance's support for deposition of incomplete datasets via :ref:`info-incomplete-metadata`.
+
+.. _api-create-dataset:
+
+Submit Dataset
+^^^^^^^^^^^^^^
+
+As a starting point, you can download :download:`dataset-finch1.json <../../../../scripts/search/tests/data/dataset-finch1.json>` and modify it to meet your needs. (:download:`dataset-finch1_fr.json <../../../../scripts/api/data/dataset-finch1_fr.json>` is a variant of this file that includes setting the metadata language (see :ref:`:MetadataLanguages`) to French (fr). In addition to this minimal example, you can download :download:`dataset-create-new-all-default-fields.json <../../../../scripts/api/data/dataset-create-new-all-default-fields.json>` which populates all of the metadata fields that ship with a Dataverse installation.)
+
+The curl command below assumes you have kept the name "dataset-finch1.json" and that this file is in your current working directory.
+
+Next you need to figure out the alias or database id of the "parent" Dataverse collection into which you will be creating your new dataset. Out of the box the top level Dataverse collection has an alias of "root" and a database id of "1" but your installation may vary. The easiest way to determine the alias of your root Dataverse collection is to click "Advanced Search" and look at the URL. You may also choose a parent Dataverse collection under the root Dataverse collection.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export PARENT=root
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$PARENT/datasets" --upload-file dataset-finch1.json -H 'Content-type:application/json'
+
+The fully expanded example above (without the environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/dataverses/root/datasets" --upload-file "dataset-finch1.json" -H 'Content-type:application/json'
+
+You should expect an HTTP 200 ("OK") response and JSON indicating the database ID and Persistent ID (PID such as DOI or Handle) that has been assigned to your newly created dataset.
+
+.. note:: Only a Dataverse installation account with superuser permissions is allowed to include files when creating a dataset via this API. Adding files this way only adds their file metadata to the database, you will need to manually add the physical files to the file system.
+
+.. _api-create-dataset-with-type:
+
+Create a Dataset with a Dataset Type (Software, etc.)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+By default, datasets are given the type "dataset" but if your installation had added additional types (see :ref:`api-add-dataset-type`), you can specify the type.
+
+Follow :ref:`api-create-dataset` as normal but include a line like ``"datasetType": "software"`` in your JSON. You can check which types are supported by your installation using the :ref:`api-list-dataset-types` API endpoint.
+
+Here is an example JSON file for reference: :download:`dataset-create-software.json <../_static/api/dataset-create-software.json>`.
+
+See also :ref:`dataset-types`.
+
+.. _api-import-dataset:
+
+Import a Dataset into a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note:: This action requires a Dataverse installation account with super-user permissions.
+
+To import a dataset with an existing persistent identifier (PID), the dataset's metadata should be prepared in Dataverse installation's native JSON format. The PID is provided as a parameter at the URL. The following line imports a dataset with the PID ``PERSISTENT_IDENTIFIER`` to the Dataverse installation, and then releases it:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export DATAVERSE_ID=root
+  export PERSISTENT_IDENTIFIER=doi:ZZ7/MOSEISLEYDB94
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$DATAVERSE_ID/datasets/:import?pid=$PERSISTENT_IDENTIFIER&release=yes" --upload-file dataset.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+    curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/dataverses/root/datasets/:import?pid=doi:ZZ7/MOSEISLEYDB94&release=yes" --upload-file dataset.json
+
+The ``pid`` parameter holds a persistent identifier (such as a DOI or Handle). The import will fail if no PID is provided, or if the provided PID fails validation.
+
+The optional ``release`` parameter tells the Dataverse installation to immediately publish the dataset. If the parameter is changed to ``no``, the imported dataset will remain in ``DRAFT`` status.
+
+The JSON format is the same as that supported by the native API's :ref:`create dataset command<create-dataset-command>`, although it also allows packages.  For example:
+
+.. literalinclude:: ../../../../scripts/api/data/dataset-package-files.json
+
+Before calling the API, make sure the data files referenced by the ``POST``\ ed JSON are placed in the dataset directory with filenames matching their specified storage identifiers. In installations using POSIX storage, these files must be made readable by the app server user.
+
+.. tip:: If possible, it's best to avoid spaces and special characters in the storage identifier in order to avoid potential portability problems. The storage identifier corresponds with the filesystem name (or bucket identifier) of the data file, so these characters may cause unpredictability with filesystem tools.
+
+.. warning:: 
+  
+  * This API does not cover staging files (with correct contents, checksums, sizes, etc.) in the corresponding places in the Dataverse installation's filestore.
+  * This API endpoint does not support importing *files'* persistent identifiers.
+  * A Dataverse installation can only import datasets with a valid PID that is managed by one of the PID providers that said installation is configured for.
+
+.. _import-dataset-with-type:
+
+Import a Dataset with a Dataset Type (Software, etc.)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+By default, datasets are given the type "dataset" but if your installation had added additional types (see :ref:`api-add-dataset-type`), you can specify the type.
+
+The same native JSON file as above under :ref:`api-create-dataset-with-type` can be used when importing a dataset.
+
+A file like this is the only difference. Otherwise, follow :ref:`api-import-dataset` as normal.
+
+See also :ref:`dataset-types`.
+
+Import a Dataset into a Dataverse Installation with a DDI file
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note:: This action requires a Dataverse installation account with super-user permissions.
+
+To import a dataset with an existing persistent identifier (PID), you have to provide the PID as a parameter at the URL. The following line imports a dataset with the PID ``PERSISTENT_IDENTIFIER`` to the Dataverse installation, and then releases it:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export DATAVERSE_ID=root
+  export PERSISTENT_IDENTIFIER=doi:ZZ7/MOSEISLEYDB94
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$DATAVERSE_ID/datasets/:importddi?pid=$PERSISTENT_IDENTIFIER&release=yes" --upload-file ddi_dataset.xml
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/dataverses/root/datasets/:importddi?pid=doi:ZZ7/MOSEISLEYDB94&release=yes" --upload-file ddi_dataset.xml
+
+The optional ``pid`` parameter holds a persistent identifier (such as a DOI or Handle). The import will fail if the provided PID fails validation.
+
+The optional ``release`` parameter tells the Dataverse installation to immediately publish the dataset. If the parameter is changed to ``no``, the imported dataset will remain in ``DRAFT`` status.
+
+The file is a DDI XML file. A sample DDI XML file may be downloaded here: :download:`ddi_dataset.xml <../_static/api/ddi_dataset.xml>`
+
+Note that DDI XML does not have a field that corresponds to the "Subject" field in Dataverse. Therefore the "Import DDI" API endpoint populates the "Subject" field with ``N/A``. To update the "Subject" field one will need to call the :ref:`edit-dataset-metadata-api` API with a JSON file that contains an update to "Subject" such as :download:`subject-update-metadata.json <../_static/api/subject-update-metadata.json>`. Alternatively, the web interface can be used to add a subject.
+
+.. warning::
+
+  * This API does not handle files related to the DDI file.
+  * A Dataverse installation can only import datasets with a valid PID that is managed by one of the PID providers that said installation is configured for.
+
+.. _publish-dataverse-api:
+
+Publish a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to publish a Dataverse collection, you must know either its "alias" (which the GUI calls an "identifier") or its database ID.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$ID/actions/:publish"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/dataverses/root/actions/:publish"
+
+You should expect a 200 ("OK") response and JSON output.
+
+.. _download-guestbook-api:
+
+Retrieve Guestbook Responses for a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For more about guestbooks, see :ref:`dataset-guestbooks` in the User Guide.
+
+In order to retrieve the Guestbook Responses for a Dataverse collection, you must know either its "alias" (which the GUI calls an "identifier") or its database ID. If the Dataverse collection has more than one guestbook you may provide the id of a single guestbook as an optional parameter. If no guestbook id is provided the results returned will be the same as pressing the "Download All Responses" button on the Manage Dataset Guestbook page. If the guestbook id is provided then only those responses from that guestbook will be included.  The FILENAME parameter is optional, and if it is not included, the responses will be displayed in the console.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+  export GUESTBOOK_ID=1
+  export FILENAME=myResponses.csv 
+
+  curl -H  "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/guestbookResponses?guestbookId=$GUESTBOOK_ID" -o $FILENAME
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/guestbookResponses?guestbookId=1" -o myResponses.csv
+
+.. _collection-attributes-api:
+  
+Change Collection Attributes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: 
+
+  curl -X PUT -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/attribute/$ATTRIBUTE?value=$VALUE"
+
+The following attributes are supported:
+
+* ``alias``  Collection alias
+* ``name`` Name
+* ``description`` Description
+* ``affiliation`` Affiliation
+* ``filePIDsEnabled`` ("true" or "false") Restricted to use by superusers and only when the :ref:`:AllowEnablingFilePIDsPerCollection <:AllowEnablingFilePIDsPerCollection>` setting is true. Enables or disables registration of file-level PIDs in datasets within the collection (overriding the instance-wide setting).
+* ``requireFilesToPublishDataset`` ("true" or "false") Restricted to use by superusers. Defines if Dataset needs files in order to be published.  If not set the determination will be made through inheritance by checking the owners of this collection. Publishing by a superusers will not be blocked.
+
+See also :ref:`update-dataverse-api`.
+
+.. _collection-storage-quotas:
+
+Update Collection Input Levels
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Updates the dataset field type input levels in a collection.
+
+Please note that this endpoint overwrites all the input levels of the collection page, so if you want to keep the existing ones, you will need to add them to the JSON request body.
+
+If one of the input levels corresponds to a dataset field type belonging to a metadata block that does not exist in the collection, the metadata block will be added to the collection.
+
+This endpoint expects a JSON with the following format::
+
+  [
+    {
+      "datasetFieldTypeName": "datasetFieldTypeName1",
+      "required": true,
+      "include": true,
+      "displayOnCreate": null
+    },
+    {
+      "datasetFieldTypeName": "datasetFieldTypeName2",
+      "required": true,
+      "include": true,
+      "displayOnCreate": true
+    }
+  ]
+
+.. note::
+   Required fields will always be displayed regardless of their displayOnCreate setting, as this is necessary for dataset creation.
+   When displayOnCreate is null, the field's default display behavior is used.
+
+Parameters:
+
+- ``datasetFieldTypeName``: Name of the metadata field
+- ``required``: Whether the field is required (boolean)
+- ``include``: Whether the field is included (boolean)
+- ``displayOnCreate`` (optional): Whether the field is displayed during dataset creation, even when not required (boolean)
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+  export JSON='[{"datasetFieldTypeName":"geographicCoverage", "required":true, "include":true}, {"datasetFieldTypeName":"country", "required":true, "include":true}]'
+
+  curl -X PUT -H "X-Dataverse-key: $API_TOKEN" -H "Content-Type:application/json" "$SERVER_URL/api/dataverses/$ID/inputLevels" -d "$JSON"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -X PUT -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -H "Content-Type:application/json" "https://demo.dataverse.org/api/dataverses/root/inputLevels" -d '[{"datasetFieldTypeName":"geographicCoverage", "required":true, "include":false}, {"datasetFieldTypeName":"country", "required":true, "include":false}]'
+
+Collection Storage Quotas
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: 
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/storage/quota"
+
+Will output the storage quota allocated (in bytes), or a message indicating that the quota is not defined for the specific collection. The user identified by the API token must have the ``Manage`` permission on the collection. 
+
+
+To set or change the storage allocation quota for a collection:
+
+.. code-block:: 
+
+  curl -X POST -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/storage/quota/$SIZE_IN_BYTES"
+
+This is API is superuser-only.
+  
+
+To delete a storage quota configured for a collection:
+
+.. code-block:: 
+
+  curl -X DELETE -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/storage/quota"
+
+This is API is superuser-only.
+
+Use the ``/settings`` API to enable or disable the enforcement of storage quotas that are defined across the instance via the following setting. For example,
+
+.. code-block:: 
+
+   curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:UseStorageQuotas
+
+List All Collection Featured Items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+List the featured items configured for a given Dataverse collection ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/featuredItems"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/dataverses/root/featuredItems"
+
+Update All Collection Featured Items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Updates all featured items in the given Dataverse collection ``id``.
+
+The data sent to the endpoint represents the desired final state of the featured items in the Dataverse collection and overwrites any existing featured items configuration.
+
+The parameters ``id``, ``content``, ``displayOrder``, and ``fileName`` must be specified as many times as the number of items we want to add or update. The order in which these parameters are repeated must match to ensure they correspond to the same featured item.
+
+The ``file`` parameter must be specified for each image we want to attach to featured items. Note that images can be shared between featured items, so ``fileName`` can have the same value in different featured items.
+
+The ``id`` parameter must be ``0`` for new items or set to the item's identifier for updates. The ``fileName`` parameter should be empty to exclude an image or match the name of a file sent in a ``file`` parameter to set a new image. ``keepFile`` must always be set to ``false``, unless it's an update to a featured item where we want to preserve the existing image, if one exists.
+
+The ``type`` and ``dvObjectIdentifier`` parameters are optional. These allow you to link the featured item to a Dataverse, Dataset, or Datafile.
+The ``dvObjectIdentifier`` can be passed as the alias, id, or the persistent identifier and the ``type`` must be passed as either "dataverse", "dataset", or "datafile", depending on the type of object.
+If no ``dvObjectIdentifier`` is passed the ``type`` will default to "custom" designating no linked object.
+
+Note that any existing featured item not included in the call with its associated identifier and corresponding properties will be removed from the collection.
+
+The following example creates two featured items, with an image and a dataset assigned to the second one:
+
+.. code-block:: bash
+
+    export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+    export SERVER_URL=https://demo.dataverse.org
+    export ID=root
+
+    export FIRST_ITEM_CONTENT='Content 1'
+    export FIRST_ITEM_DISPLAY_ORDER=1
+
+    export SECOND_ITEM_IMAGE_FILENAME='image.png'
+    export SECOND_ITEM_CONTENT='Content 2'
+    export SECOND_ITEM_DISPLAY_ORDER=2
+    export SECOND_ITEM_TYPE="dataset"
+    export SECOND_ITEM_DVOBJECT="doi:ZZ7/MOSEISLEYDB94"
+
+    curl -H "X-Dataverse-key:$API_TOKEN" \
+         -X PUT \
+         -F "id=0" -F "id=0" \
+         -F "content=$FIRST_ITEM_CONTENT" -F "content=$SECOND_ITEM_CONTENT" \
+         -F "displayOrder=$FIRST_ITEM_DISPLAY_ORDER" -F "displayOrder=$SECOND_ITEM_DISPLAY_ORDER" \
+         -F "fileName=" -F "fileName=$SECOND_ITEM_IMAGE_FILENAME" \
+         -F "keepFile=false" -F "keepFile=false" \
+         -F "file=@$SECOND_ITEM_IMAGE_FILENAME" \
+         -F "type=" -F "type=@$SECOND_ITEM_TYPE" \
+         -F "dvObjectIdentifier=" -F "dvObjectIdentifier=@$SECOND_ITEM_DVOBJECT" \
+         "$SERVER_URL/api/dataverses/$ID/featuredItems"
+
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+    curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" \
+         -X PUT \
+         -F "id=0" -F "id=0" \
+         -F "content=Content 1" -F "content=Content 2" \
+         -F "displayOrder=1" -F "displayOrder=2" \
+         -F "fileName=" -F "fileName=image.png" \
+         -F "keepFile=false" -F "keepFile=false" \
+         -F "file=@image.png" \
+         -F "type=" -F "type=dataset" \
+         -F "dvObjectIdentifier=" -F "dvObjectIdentifier=doi:ZZ7/MOSEISLEYDB94" \
+         "https://demo.dataverse.org/api/dataverses/root/featuredItems"
+
+The following example creates one featured item and updates a second one, keeping the existing image it may have had but removes the dataset link and defaults the type to "custom":
+
+.. code-block:: bash
+
+    curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" \
+         -X PUT \
+         -F "id=0" -F "id=1" \
+         -F "content=Content 1" -F "content=Updated content 2" \
+         -F "displayOrder=1" -F "displayOrder=2" \
+         -F "fileName=" -F "fileName=" \
+         -F "keepFile=false" -F "keepFile=true" \
+         "https://demo.dataverse.org/api/dataverses/root/featuredItems"
+
+Delete All Collection Featured Items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Deletes the featured items configured for a given Dataverse collection ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/dataverses/$ID/featuredItems"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/dataverses/root/featuredItems"
+
+Create a Collection Featured Item
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Creates a featured item in the given Dataverse collection ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export IMAGE_FILENAME='image.png'
+  export CONTENT='Content for featured item.'
+  export DISPLAY_ORDER=1
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=root
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST -F "file=@$IMAGE_FILENAME" -F "content=$CONTENT" -F "displayOrder=$DISPLAY_ORDER" "$SERVER_URL/api/dataverses/$ID/featuredItems"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST -F "file=@image.png" -F "content=Content for featured item." -F "displayOrder=1" "https://demo.dataverse.org/api/dataverses/root/featuredItems"
+
+A featured item may or may not contain an image. If you wish to create it without an image, omit the file parameter in the request.
+
+Update a Collection Featured Item
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Updates a featured item given its ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export IMAGE_FILENAME='image.png'
+  export CONTENT='Content for featured item.'
+  export DISPLAY_ORDER=1
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT -F "file=@$IMAGE_FILENAME" -F "content=$CONTENT" -F "displayOrder=$DISPLAY_ORDER" "$SERVER_URL/api/dataverseFeaturedItems/$ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT -F "file=@image.png" -F "content=Content for featured item." -F "displayOrder=1" "https://demo.dataverse.org/api/dataverseFeaturedItems/1"
+
+``content`` and ``displayOrder`` must always be provided; otherwise, an error will occur. Use the ``file`` parameter to set a new image for the featured item. To keep the existing image, omit ``file`` and send ``keepFile=true``. To remove the image, omit the file parameter.
+
+Updating the featured item keeping the existing image:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT -F "keepFile=true" -F "content=Content for featured item." -F "displayOrder=1" "https://demo.dataverse.org/api/dataverseFeaturedItems/1"
+
+Updating the featured item removing the existing image:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT -F "content=Content for featured item." -F "displayOrder=1" "https://demo.dataverse.org/api/dataverseFeaturedItems/1"
+
+Delete a Collection Featured Item
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Deletes a featured item given its ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/dataverseFeaturedItems/$ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/dataverseFeaturedItems/1"
+
+Get a Collection Featured Item Image
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Returns the image of a featured item if one is assigned, given the featured item ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/access/dataverseFeaturedItemImage/{ID}"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET "https://demo.dataverse.org/api/access/dataverseFeaturedItemImage/1"
+
+List Templates of a Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Lists the templates for a given Dataverse collection ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/dataverses/{ID}/templates"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET "https://demo.dataverse.org/api/dataverses/1/templates"
+
+Create a Template for a Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Creates a template for a given Dataverse collection ``id``.
+
+To create the template, you must send a JSON file. Your JSON file might look like :download:`dataverse-template.json <../_static/api/dataverse-template.json>` which you would send to the Dataverse installation like this:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X POST "$SERVER_URL/api/dataverses/{ID}/templates" --upload-file dataverse-template.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/dataverses/1/templates" --upload-file dataverse-template.json
+
+Datasets
+--------
+
+**Note** Creation of new datasets is done with a ``POST`` onto a Dataverse collection. See the Dataverse Collections section above.
+
+.. _dataset-version-specifiers:
+
+Dataset Version Specifiers
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In all commands below, dataset versions can be referred to as:
+
+* ``:draft``  the draft version, if any
+* ``:latest`` either a draft (if exists) or the latest published version.
+* ``:latest-published`` the latest published version
+* ``x.y`` a specific version, where ``x`` is the major version number and ``y`` is the minor version number.
+* ``x`` same as ``x.0``
+
+Get JSON Representation of a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note:: Datasets can be accessed using persistent identifiers. This is done by passing the constant ``:persistentId`` where the numeric id of the dataset is expected, and then passing the actual persistent id as a query parameter with the name ``persistentId``.
+
+Example: Getting the dataset whose DOI is *10.5072/FK2/J8SJZB*:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/?persistentId=$PERSISTENT_IDENTIFIER"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "https://demo.dataverse.org/api/datasets/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB"
+
+Getting its draft version:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "https://$SERVER/api/datasets/:persistentId/versions/:draft?persistentId=$PERSISTENT_IDENTIFIER"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "https://demo.dataverse.org/api/datasets/:persistentId/versions/:draft?persistentId=doi:10.5072/FK2/J8SJZB"
+
+|CORS| Show the dataset whose database id is passed:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl "$SERVER_URL/api/datasets/$ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24"
+
+The dataset id can be extracted from the response retrieved from the API which uses the persistent identifier (``/api/datasets/:persistentId/?persistentId=$PERSISTENT_IDENTIFIER``).
+
+If you want to include the Dataverse collections that this dataset is part of, you must set ``returnOwners`` query parameter to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24?returnOwners=true"
+
+List Versions of a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| List versions of the dataset:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl "$SERVER_URL/api/datasets/$ID/versions"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions"
+
+It returns a list of versions with their metadata, and file list:
+
+.. code-block:: bash
+
+  {
+    "status": "OK",
+    "data": [
+      {
+        "id": 7,
+        "datasetId": 24,
+        "datasetPersistentId": "doi:10.5072/FK2/U6AEZM",
+        "storageIdentifier": "file://10.5072/FK2/U6AEZM",
+        "versionNumber": 2,
+        "versionMinorNumber": 0,
+        "versionState": "RELEASED",
+        "lastUpdateTime": "2015-04-20T09:58:35Z",
+        "releaseTime": "2015-04-20T09:58:35Z",
+        "createTime": "2015-04-20T09:57:32Z",
+        "license": {
+          "name": "CC0 1.0",
+          "uri": "http://creativecommons.org/publicdomain/zero/1.0",
+          "iconUri": "https://licensebuttons.net/p/zero/1.0/88x31.png",
+          "rightsIdentifier": "CC0",
+          "rightsIdentifierScheme": "Creative Commons",
+          "schemeUri": "https://creativecommons.org/",
+          "languageCode": "en",
+        },
+        "termsOfAccess": "You need to request for access.",
+        "fileAccessRequest": true,
+        "metadataBlocks": {...},
+        "files": [...]
+      },
+      {
+        "id": 6,
+        "datasetId": 24,
+        "datasetPersistentId": "doi:10.5072/FK2/U6AEZM",
+        "storageIdentifier": "file://10.5072/FK2/U6AEZM",
+        "versionNumber": 1,
+        "versionMinorNumber": 0,
+        "versionState": "RELEASED",
+        "UNF": "UNF:6:y4dtFxWhBaPM9K/jlPPuqg==",
+        "lastUpdateTime": "2015-04-20T09:56:34Z",
+        "releaseTime": "2015-04-20T09:56:34Z",
+        "createTime": "2015-04-20T09:43:45Z",
+        "license": {
+          "name": "CC0 1.0",
+          "uri": "http://creativecommons.org/publicdomain/zero/1.0",
+          "iconUri": "https://licensebuttons.net/p/zero/1.0/88x31.png",
+          "rightsIdentifier": "CC0",
+          "rightsIdentifierScheme": "Creative Commons",
+          "schemeUri": "https://creativecommons.org/",
+          "languageCode": "en",
+        },
+        "termsOfAccess": "You need to request for access.",
+        "fileAccessRequest": true,
+        "metadataBlocks": {...},
+        "files": [...]
+      }
+    ]
+  }
+
+The optional ``excludeFiles`` parameter specifies whether the files should be listed in the output. It defaults to ``true``, preserving backward compatibility. (Note that for a dataset with a large number of versions and/or files having the files included can dramatically increase the volume of the output). A separate ``/files`` API can be used for listing the files, or a subset thereof in a given version. 
+
+The optional ``excludeMetadataBlocks`` parameter specifies whether the metadata blocks should be listed in the output. It defaults to ``false``, preserving backward compatibility. (Note that for a dataset with a large number of versions and/or metadata blocks having the metadata blocks included can dramatically increase the volume of the output).
+
+The optional ``offset`` and ``limit`` parameters can be used to specify the range of the versions list to be shown. This can be used to paginate through the list in a dataset with a large number of versions.
+
+
+Get Version of a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| Show a version of the dataset. The output includes any metadata blocks the dataset might have:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export VERSION=1.0
+
+  curl "$SERVER_URL/api/datasets/$ID/versions/$VERSION?excludeFiles=false"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0?excludeFiles=false"
+
+Note: the data object will contain the fields ``datasetId``, ``datasetPersistentId`` (since `4.18 <https://github.com/IQSS/dataverse/issues/6397>`_) and ``datasetType`` (since `6.7 <https://github.com/IQSS/dataverse/issues/11573>`_).
+All of these fields are equal and constant for all versions of a dataset.
+
+The optional ``excludeFiles`` parameter specifies whether the files should be listed in the output (defaults to ``true``). Note that a separate ``/files`` API can be used for listing the files, or a subset thereof in a given version. 
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0?excludeMetadataBlocks=false"
+
+The optional ``excludeMetadataBlocks`` parameter specifies whether the metadata blocks should be listed in the output (defaults to ``false``).
+
+
+By default, deaccessioned dataset versions are not included in the search when applying the :latest or :latest-published identifiers. Additionally, when filtering by a specific version tag, you will get a "not found" error if the version is deaccessioned and you do not enable the ``includeDeaccessioned`` option described below.
+
+If you want to include deaccessioned dataset versions, you must set ``includeDeaccessioned`` query parameter to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0?includeDeaccessioned=true"
+
+If you want to include the Dataverse collections that this dataset version is part of, you must set ``returnOwners`` query parameter to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0?returnOwners=true"
+
+.. _export-dataset-metadata-api:
+
+Export Metadata of a Dataset in Various Formats
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| Export the metadata of either the current published version or the draft version of a dataset in various formats.
+
+To get a list of available formats, see :ref:`available-exporters` and :ref:`get-export-formats`.
+
+If you don't specify a version (see :ref:`dataset-version-specifiers`), ``:latest-published`` is assumed and an API token is not necessary. ``:draft`` is supported if you pass an API token that has access. If you try to pass a version number (e.g. "1.0"), it will only work if it happens to be the latest published version. That is to say, for published versions, only the latest published version is supported.
+
+See also :ref:`batch-exports-through-the-api` and the note below:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export METADATA_FORMAT=ddi
+  export VERSION=:draft
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+  curl -H "X-Dataverse-key: $API_TOKEN" "$SERVER_URL/api/datasets/export?exporter=$METADATA_FORMAT&persistentId=$PERSISTENT_IDENTIFIER&version=$VERSION"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/datasets/export?exporter=ddi&persistentId=doi:10.5072/FK2/J8SJZB&version=:draft"
+
+.. _available-exporters:
+
+Available Dataset Metadata Exporters
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following dataset metadata exporters ship with Dataverse:
+
+- ``Datacite``
+- ``dataverse_json``
+- ``dcterms``
+- ``ddi``
+- ``oai_datacite``
+- ``oai_dc``
+- ``oai_ddi``
+- ``OAI_ORE``
+- ``schema.org``
+
+These are the strings to pass as ``$METADATA_FORMAT`` in the examples above. Descriptive names for each format can be found under :ref:`metadata-export-formats` in the User Guide.
+
+Additional exporters can be enabled, as described under :ref:`external-exporters` in the Installation Guide. The machine-readable name/identifier for each external exporter can be found under :ref:`inventory-of-external-exporters`. If you are interested in creating your own exporter, see :doc:`/developers/metadataexport`.
+
+To discover the machine-readable name of exporters (e.g. ``ddi``) that have been enabled on the installation of Dataverse you are using see :ref:`get-export-formats`. Alternatively, you can use the Signposting "linkset" API documented under :ref:`signposting-api`.
+
+To discover the machine-readable name of exporters generally, check :ref:`inventory-of-external-exporters` or ``getFormatName`` in the exporter's source code.
+
+Schema.org JSON-LD
+^^^^^^^^^^^^^^^^^^
+
+Please note that the ``schema.org`` format has changed in backwards-incompatible ways after Dataverse 4.9.4:
+
+- "description" was a single string and now it is an array of strings.
+- "citation" was an array of strings and now it is an array of objects.
+
+Both forms are valid according to Google's Structured Data Testing Tool at https://search.google.com/structured-data/testing-tool . Schema.org JSON-LD is an evolving standard that permits a great deal of flexibility. For example, https://schema.org/docs/gs.html#schemaorg_expected indicates that even when objects are expected, it's ok to just use text. As with all metadata export formats, we will try to keep the Schema.org JSON-LD format backward-compatible to make integrations more stable, despite the flexibility that's afforded by the standard.
+
+The standard has further evolved into a format called Croissant. For details, see :ref:`schema.org-head` in the Admin Guide.
+
+The ``schema.org`` format changed after Dataverse 6.4 as well. Previously its content type was "application/json" but now it is "application/ld+json".
+
+List Files in a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| Lists all the file metadata, for the given dataset and version:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export VERSION=1.0
+
+  curl "$SERVER_URL/api/datasets/$ID/versions/$VERSION/files"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+ 
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files"
+
+This endpoint supports optional pagination, through the ``limit`` and ``offset`` query parameters.
+
+To aid in pagination the JSON response also includes the total number of rows (totalCount) available.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files?limit=10&offset=20"
+
+Category name filtering is also optionally supported. To return files to which the requested category has been added.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files?categoryName=Data"
+
+Tabular tag name filtering is also optionally supported. To return files to which the requested tabular tag has been added.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files?tabularTagName=Survey"
+
+Content type filtering is also optionally supported. To return files matching the requested content type.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files?contentType=image/png"
+
+Filtering by search text is also optionally supported. The search will be applied to the labels and descriptions of the dataset files, to return the files that contain the text searched in one of such fields.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files?searchText=word"
+
+File access filtering is also optionally supported. In particular, by the following possible values:
+
+* ``Public``
+* ``Restricted``
+* ``EmbargoedThenRestricted``
+* ``EmbargoedThenPublic``
+* ``RetentionPeriodExpired``
+
+If no filter is specified, the files will match all of the above categories.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files?accessStatus=Public"
+
+Ordering criteria for sorting the results is also optionally supported. In particular, by the following possible values:
+
+* ``NameAZ`` (Default)
+* ``NameZA``
+* ``Newest``
+* ``Oldest``
+* ``Size``
+* ``Type``
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files?orderCriteria=Newest"
+
+Please note that both filtering and ordering criteria values are case sensitive and must be correctly typed for the endpoint to recognize them.
+
+By default, deaccessioned dataset versions are not included in the search when applying the :latest or :latest-published identifiers. Additionally, when filtering by a specific version tag, you will get a "not found" error if the version is deaccessioned and you do not enable the ``includeDeaccessioned`` option described below.
+
+If you want to include deaccessioned dataset versions, you must set ``includeDeaccessioned`` query parameter to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files?includeDeaccessioned=true"
+
+.. note:: Keep in mind that you can combine all of the above query parameters depending on the results you are looking for.
+
+Get File Counts in a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Get file counts, for the given dataset and version.
+
+The returned file counts are based on different criteria:
+
+- Total (The total file count)
+- Per content type
+- Per category name
+- Per tabular tag name
+- Per access status (Possible values: Public, Restricted, EmbargoedThenRestricted, EmbargoedThenPublic, RetentionPeriodExpired)
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export VERSION=1.0
+
+  curl "$SERVER_URL/api/datasets/$ID/versions/$VERSION/files/counts"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files/counts"
+
+Category name filtering is optionally supported. To return counts only for files to which the requested category has been added.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files/counts?categoryName=Data"
+
+Tabular tag name filtering is also optionally supported. To return counts only for files to which the requested tabular tag has been added.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files/counts?tabularTagName=Survey"
+
+Content type filtering is also optionally supported. To return counts only for files matching the requested content type.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files/counts?contentType=image/png"
+
+Filtering by search text is also optionally supported. The search will be applied to the labels and descriptions of the dataset files, to return counts only for files that contain the text searched in one of such fields.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files/counts?searchText=word"
+
+File access filtering is also optionally supported. In particular, by the following possible values:
+
+* ``Public``
+* ``Restricted``
+* ``EmbargoedThenRestricted``
+* ``EmbargoedThenPublic``
+* ``RetentionPeriodExpired``
+
+If no filter is specified, the files will match all of the above categories.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files/counts?accessStatus=Public"
+
+By default, deaccessioned dataset versions are not supported by this endpoint and will be ignored in the search when applying the :latest or :latest-published identifiers. Additionally, when filtering by a specific version tag, you will get a not found error if the version is deaccessioned and you do not enable the option described below.
+
+If you want to include deaccessioned dataset versions, you must specify this through the ``includeDeaccessioned`` query parameter.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/files/counts?includeDeaccessioned=true"
+
+Please note that filtering values are case sensitive and must be correctly typed for the endpoint to recognize them.
+
+Keep in mind that you can combine all of the above query parameters depending on the results you are looking for.
+
+View Dataset Files and Folders as a Directory Index
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| Provides a *crawlable* view of files and folders within the given dataset and version:
+
+.. code-block:: bash
+
+  curl "$SERVER_URL/api/datasets/${ID}/dirindex/"
+  # or
+  curl "${SERVER_URL}/api/datasets/:persistentId/dirindex?persistentId=doi:${PERSISTENT_ID}"
+
+
+Optional parameters:
+
+* ``folder`` - A subfolder within the dataset (default: top-level view of the dataset)
+* ``version`` - Specifies the version (default: latest published version)
+* ``original=true`` - Download original versions of ingested tabular files. 
+  
+This API outputs a simple html listing, based on the standard Apache
+directory index, with Access API download links for individual files,
+and recursive calls to the API above for sub-folders.
+
+Using this API, ``wget --recursive`` (or a similar crawling client) can
+be used to download all the files in a dataset, preserving the file
+names and folder structure; without having to use the download-as-zip
+API. In addition to being faster (zipping is a relatively
+resource-intensive operation on the server side), this process can be
+restarted if interrupted (with ``wget --continue`` or equivalent) -
+unlike zipped multi-file downloads that always have to start from the
+beginning.
+
+On a system that uses S3 with download redirects, the individual file
+downloads will be handled by S3 directly, without having to be proxied
+through the Dataverse application.
+
+For example, if you have a dataset version with 2 files, one with the folder named "subfolder":
+
+|image1|
+
+.. |image1| image:: ./img/dataset_page_files_view.png
+
+or, as viewed as a tree on the dataset page:
+
+|image2|
+
+.. |image2| image:: ./img/dataset_page_tree_view.png
+
+The output of the API for the top-level folder (``/api/datasets/{dataset}/dirindex/``) will be as follows:
+
+|image3|
+
+.. |image3| image:: ./img/index_view_top.png
+
+with the underlying html source:
+
+.. code-block:: html
+
+    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+    <html><head><title>Index of folder /</title></head>
+    <body><h1>Index of folder / in dataset doi:XXX/YY/ZZZZ (v. MM)</h1>
+    <table>
+    <tr><th>Name</th><th>Last Modified</th><th>Size</th><th>Description</th></tr>
+    <tr><th colspan="4"><hr></th></tr>
+    <tr><td><a href="/api/datasets/NNNN/dirindex/?folder=subfolder">subfolder/</a></td><td align="right"> - </td><td align="right"> - </td><td align="right">&nbsp;</td></tr>
+    <tr><td><a href="/api/access/datafile/KKKK">testfile.txt</a></td><td align="right">13-January-2021 22:35</td><td align="right">19 B</td><td align="right">&nbsp;</td></tr>
+    </table></body></html>
+
+The ``/dirindex/?folder=subfolder`` link above will produce the following view:
+
+|image4|
+
+.. |image4| image:: ./img/index_view_subfolder.png
+
+with the html source as follows:
+
+.. code-block:: html
+
+    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+    <html><head><title>Index of folder /subfolder</title></head>
+    <body><h1>Index of folder /subfolder in dataset doi:XXX/YY/ZZZZ (v. MM)</h1>
+    <table>
+    <tr><th>Name</th><th>Last Modified</th><th>Size</th><th>Description</th></tr>
+    <tr><th colspan="4"><hr></th></tr>
+    <tr><td><a href="/api/access/datafile/subfolder/LLLL">50by1000.tab</a></td><td align="right">11-January-2021 09:31</td><td align="right">102.5 KB</td><td align="right">&nbsp;</td></tr>
+    </table></body></html>
+
+An example of a ``wget`` command line for crawling ("recursive downloading") of the files and folders in a dataset: 
+
+.. code-block:: bash
+
+  wget -r -e robots=off -nH --cut-dirs=3 --content-disposition https://demo.dataverse.org/api/datasets/${ID}/dirindex/
+  # or
+  wget -r -e robots=off -nH --cut-dirs=3 --content-disposition https://demo.dataverse.org/api/datasets/:persistentId/dirindex?persistentId=doi:${PERSISTENT_ID}
+
+.. note:: In addition to the files and folders in the dataset, the command line above will also save the directory index of each folder, in a separate folder "dirindex".
+
+.. note:: The recipe above does NOT work if the Dataverse instance serves the files via direct download (i.e., when instead of streaming the content, the download API issues redirect links to the files stored on S3). Unfortunately, this describes **every** file served by some popular Dataverse instances. With direct download, saving an entire dataset while preserving its folders structure is possible, but requires some extra scripting.  
+	  
+List All Metadata Blocks for a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| Lists all the metadata blocks and their content, for the given dataset and version:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export VERSION=1.0
+
+  curl "$SERVER_URL/api/datasets/$ID/versions/$VERSION/metadata"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/metadata"
+
+List Single Metadata Block for a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| Lists the metadata block named `METADATA_BLOCK`, for the given dataset and version:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export VERSION=1.0
+  export METADATA_BLOCK=citation
+
+  curl "$SERVER_URL/api/datasets/$ID/versions/$VERSION/metadata/$METADATA_BLOCK"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/metadata/citation"
+
+Compare Versions of a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Returns a list of fields that have changed between 2 Dataset versions within the Metadata and Terms of Access. Also includes the files that have been added or removed as well as files that have been modified.
+When compare includes an unpublished/draft version the api token must be associated with a user having view unpublished privileges
+An error will be returned if VERSION0 was not created before VERSION1
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export VERSION0=1.0
+  export VERSION1=:draft
+
+  curl "$SERVER_URL/api/datasets/$ID/versions/$VERSION0/compare/$VERSION1"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/:latest-published/compare/:draft"
+
+By default, deaccessioned dataset versions are not included in the search when applying the :latest or :latest-published identifiers. Additionally, when filtering by a specific version tag, you will get a "not found" error if the version is deaccessioned and you do not enable the ``includeDeaccessioned`` option described below.
+
+If you want to include deaccessioned dataset versions, you must set ``includeDeaccessioned`` query parameter to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+   curl "https://demo.dataverse.org/api/datasets/24/versions/:latest-published/compare/:draft?includeDeaccessioned=true"
+
+
+Get Versions of a Dataset with Summary of Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Returns a list of versions for a given dataset including a summary of differences between consecutive versions where available. Draft versions will only
+be available to users who have permission to view unpublished drafts. The api token is optional.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/BCCP9Z
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X PUT "$SERVER_URL/api/datasets/:persistentId/versions/compareSummary?persistentId=$PERSISTENT_IDENTIFIER"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/datasets/:persistentId/versions/compareSummary?persistentId=doi:10.5072/FK2/BCCP9Z"
+
+
+Update Metadata For a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Updates the metadata for a dataset. If a draft of the dataset already exists, the metadata of that draft is overwritten; otherwise, a new draft is created with this metadata.
+
+You must download a JSON representation of the dataset, edit the JSON you download, and then send the updated JSON to the Dataverse installation.
+
+For example, after making your edits, your JSON file might look like :download:`dataset-update-metadata.json <../_static/api/dataset-update-metadata.json>` which you would send to the Dataverse installation like this:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/BCCP9Z
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X PUT "$SERVER_URL/api/datasets/:persistentId/versions/:draft?persistentId=$PERSISTENT_IDENTIFIER" --upload-file dataset-update-metadata.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/datasets/:persistentId/versions/:draft?persistentId=doi:10.5072/FK2/BCCP9Z" --upload-file dataset-update-metadata.json
+
+Note that in the example JSON file above, there are only two JSON objects with the ``license`` and ``metadataBlocks`` keys respectively. When you download a representation of your latest dataset version in JSON format, these objects will be nested inside another object called ``data`` in the API response. Note that there may be more objects in there, in addition to the ``license`` and ``metadataBlocks`` that you may need to preserve and re-import as well. Basically, you need everything in there except for the ``files``. This can be achived by downloading the metadata and selecting the sections you need with a JSON tool such as ``jq``, like this:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/BCCP9Z
+
+  curl -H "X-Dataverse-key: $API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/versions/:latest?persistentId=$PERSISTENT_IDENTIFIER" | jq '.data | del(.files)' > dataset-update-metadata.json
+  
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/datasets/:persistentId/versions/:latest?persistentId=doi:10.5072/FK2/BCCP9Z" | jq '.data | {metadataBlocks: .metadataBlocks}' > dataset-update-metadata.json
+
+
+Now you can edit the JSON produced by the command above with a text editor of your choice. For example, with ``vi`` in the example below.
+
+Note that you don't need to edit the top-level fields such as ``versionNumber``, ``minorVersonNumber``, ``versionState`` or any of the time stamps - these will be automatically updated as needed by the API::
+
+    vi dataset-update-metadata.json
+
+Now that you've made edits to the metadata in your JSON file, you can send it to a Dataverse installation as described above.
+
+.. _edit-dataset-metadata-api:
+
+Edit Dataset Metadata
+~~~~~~~~~~~~~~~~~~~~~
+
+Alternatively to replacing an entire dataset version with its JSON representation you may add data to dataset fields that are blank or accept multiple values with the following:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/BCCP9Z
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X PUT "$SERVER_URL/api/datasets/:persistentId/editMetadata/?persistentId=$PERSISTENT_IDENTIFIER" --upload-file dataset-add-metadata.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/datasets/:persistentId/editMetadata/?persistentId=doi:10.5072/FK2/BCCP9Z" --upload-file dataset-add-metadata.json
+
+You may also replace existing metadata in dataset fields with the following (adding the parameter replace=true):
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/BCCP9Z
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X PUT "$SERVER_URL/api/datasets/:persistentId/editMetadata?persistentId=$PERSISTENT_IDENTIFIER&replace=true" --upload-file dataset-update-metadata.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/datasets/:persistentId/editMetadata/?persistentId=doi:10.5072/FK2/BCCP9Z&replace=true" --upload-file dataset-update-metadata.json
+
+For these edits your JSON file need only include those dataset fields which you would like to edit. A sample JSON file may be downloaded here: :download:`dataset-edit-metadata-sample.json <../_static/api/dataset-edit-metadata-sample.json>` 
+
+This endpoint also allows removing fields, as long as they are not required by the dataset. To remove a field, send an empty value (``""``) for individual fields. For multiple fields, send an empty array (``[]``). A sample JSON file for removing fields may be downloaded here: :download:`dataset-edit-metadata-delete-fields-sample.json <../_static/api/dataset-edit-metadata-delete-fields-sample.json>`
+
+If another user updates the dataset version metadata before you send the update request, metadata inconsistencies may occur. To prevent this, you can use the optional ``sourceLastUpdateTime`` query parameter. This parameter must include the ``lastUpdateTime`` corresponding to the dataset version being updated. The date must be in the format ``yyyy-MM-dd'T'HH:mm:ss'Z'``.
+
+If this parameter is provided, the update will proceed only if the ``lastUpdateTime`` remains unchanged (meaning no one has updated the dataset metadata since you retrieved it). Otherwise, the request will fail with an error.
+
+Example using ``sourceLastUpdateTime``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/BCCP9Z
+  export SOURCE_LAST_UPDATE_TIME=2025-04-25T13:58:28Z
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X PUT "$SERVER_URL/api/datasets/:persistentId/editMetadata?persistentId=$PERSISTENT_IDENTIFIER&replace=true&sourceLastUpdateTime=SOURCE_LAST_UPDATE_TIME" --upload-file dataset-update-metadata.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/datasets/:persistentId/editMetadata/?persistentId=doi:10.5072/FK2/BCCP9Z&replace=true&sourceLastUpdateTime=2025-04-25T13:58:28Z" --upload-file dataset-update-metadata.json
+
+
+Delete Dataset Metadata
+~~~~~~~~~~~~~~~~~~~~~~~
+
+You may delete some of the metadata of a dataset version by supplying a file with a JSON representation of dataset fields that you would like to delete with the following:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/BCCP9Z
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X PUT "$SERVER_URL/api/datasets/:persistentId/deleteMetadata/?persistentId=$PERSISTENT_IDENTIFIER" --upload-file dataset-delete-author-metadata.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/datasets/:persistentId/deleteMetadata/?persistentId=doi:10.5072/FK2/BCCP9Z" --upload-file dataset-delete-author-metadata.json
+
+For these deletes your JSON file must include an exact match of those dataset fields which you would like to delete. A sample JSON file may be downloaded here: :download:`dataset-delete-author-metadata.json <../_static/api/dataset-delete-author-metadata.json>` 
+
+.. _publish-dataset-api:
+
+Publish a Dataset
+~~~~~~~~~~~~~~~~~
+
+When publishing a dataset it's good to be aware of the Dataverse Software's versioning system, which is described in the :doc:`/user/dataset-management` section of the User Guide.
+
+If this is the first version of the dataset, its version number will be set to ``1.0``. Otherwise, the new dataset version number is determined by the most recent version number and the ``type`` parameter. Passing ``type=minor`` increases the minor version number (2.3 is updated to 2.4). Passing ``type=major`` increases the major version number (2.3 is updated to 3.0). (Superusers can pass ``type=updatecurrent`` to update metadata without changing the version number.)
+
+This call also supports an optional boolean query parameter: ``assureIsIndexed``. If true, the call will fail with a 409 ("CONFLICT") response if the dataset is awaiting re-indexing. If indexing occurs during publishing it could cause the publish request to fail, after a 202 response has been received. Using this parameter allows the caller to wait for indexing to occur and avoid this possibility. It is most useful in situations where edits are made immediately before publication.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+  export MAJOR_OR_MINOR=major
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X POST "$SERVER_URL/api/datasets/:persistentId/actions/:publish?persistentId=$PERSISTENT_ID&type=$MAJOR_OR_MINOR"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/datasets/:persistentId/actions/:publish?persistentId=doi:10.5072/FK2/J8SJZB&type=major"
+
+The quotes around the URL are required because there is more than one query parameter separated by an ampersand (``&``), which has special meaning to Unix shells such as Bash. Putting the ``&`` in quotes ensures that "type" is interpreted as one of the query parameters.
+
+You should expect JSON output and a 200 ("OK") response in most cases. If you receive a 202 ("ACCEPTED") response, this is normal for installations that have workflows configured. Workflows are described in the :doc:`/developers/workflows` section of the Developer Guide. A 409 ("CONFLICT") response is also possible if you set ``assureIsIndexed=true``. (In this case, one could then repeat the call until a 200/202 response is sent.)
+
+.. note:: POST should be used to publish a dataset. GET is supported for backward compatibility but is deprecated and may be removed: https://github.com/IQSS/dataverse/issues/2431
+
+Delete Dataset Draft
+~~~~~~~~~~~~~~~~~~~~
+
+Deletes the draft version of dataset ``$ID``. Only the draft version can be deleted:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/$ID/versions/:draft"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/24/versions/:draft"
+
+Deaccession Dataset
+~~~~~~~~~~~~~~~~~~~
+
+Given a version of a dataset, updates its status to deaccessioned.
+
+The JSON body required to deaccession a dataset (``deaccession.json``) looks like this::
+
+  {
+    "deaccessionReason": "Description of the deaccession reason.",
+    "deaccessionForwardURL": "https://demo.dataverse.org"
+  }
+
+
+Note that the field ``deaccessionForwardURL`` is optional.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export VERSIONID=1.0
+  export FILE_PATH=deaccession.json
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/datasets/$ID/versions/$VERSIONID/deaccession" -H "Content-type:application/json" --upload-file $FILE_PATH
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/datasets/24/versions/1.0/deaccession" -H "Content-type:application/json" --upload-file deaccession.json
+
+.. note:: You cannot deaccession a dataset more than once. If you call this endpoint twice for the same dataset version, you will get a not found error on the second call, since the dataset you are looking for will no longer be published since it is already deaccessioned.
+
+.. _set-citation-date-field:
+
+Set Citation Date Field Type for a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sets the dataset citation date field type for a given dataset. ``:publicationDate`` is the default. 
+Note that the dataset citation date field type must be a date field. This change applies to all versions of the dataset that have an entry for the new date field. It also applies to all file citations in the dataset. 
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export DATASET_FIELD_TYPE_NAME=dateOfDeposit
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X PUT "$SERVER_URL/api/datasets/:persistentId/citationdate?persistentId=$PERSISTENT_IDENTIFIER" --data "$DATASET_FIELD_TYPE_NAME"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/datasets/:persistentId/citationdate?persistentId=doi:10.5072/FK2/J8SJZB" --data "dateOfDeposit"
+
+Revert Citation Date Field Type to Default for Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Restores the default citation date field type, ``:publicationDate``, for a given dataset.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/:persistentId/citationdate?persistentId=$PERSISTENT_IDENTIFIER"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/:persistentId/citationdate?persistentId=doi:10.5072/FK2/J8SJZB"
+
+.. _list-roles-on-a-dataset-api:
+
+List Role Assignments in a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Lists all role assignments on a given dataset:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=2347
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/datasets/$ID/assignments"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"  "https://demo.dataverse.org/api/datasets/2347/assignments"
+  
+.. _assign-role-on-a-dataset-api:
+
+Assign a New Role on a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Assigns a new role, based on the POSTed JSON:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=2347
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST -H "Content-Type: application/json" "$SERVER_URL/api/datasets/$ID/assignments" --upload-file role.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST -H "Content-Type: application/json" "https://demo.dataverse.org/api/datasets/2347/assignments" --upload-file role.json
+
+POSTed JSON example (the content of ``role.json`` file)::
+
+  {
+    "assignee": "@uma",
+    "role": "curator"
+  }
+  
+.. _revoke-role-on-a-dataset-api:
+
+Delete Role Assignment from a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Delete the assignment whose id is ``$id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=2347
+  export ASSIGNMENT_ID=6
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/$ID/assignments/$ASSIGNMENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/2347/assignments/6"
+
+
+Create a Preview URL for a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Create a Preview URL (must be able to manage dataset permissions):
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X POST "$SERVER_URL/api/datasets/$ID/previewUrl"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/datasets/24/previewUrl"
+  
+If Anonymized Access has been enabled on a Dataverse installation (see the :ref:`:AnonymizedFieldTypeNames` setting), an optional 'anonymizedAccess' query parameter is allowed.
+Setting anonymizedAccess=true in your call will create a PreviewURL that only allows an anonymized view of the Dataset (see :ref:`previewUrl`).
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/datasets/24/previewUrl?anonymizedAccess=true"
+
+Note: Previous endpoints with privateUrl instead of previewUrl are deprecated, but supported.
+
+Get the Preview URL for a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Get a Preview URL from a dataset (if available):
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key: $API_TOKEN" "$SERVER_URL/api/datasets/$ID/previewUrl"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/datasets/24/previewUrl"
+
+Delete the Preview URL from a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Delete a Preview URL from a dataset (if it exists):
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/$ID/previewUrl"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/24/previewUrl"
+
+.. _add-file-api: 
+
+Add a File to a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~
+
+When adding a file to a dataset, you can optionally specify the following:
+
+- A description of the file.
+- The "File Path" of the file, indicating which folder the file should be uploaded to within the dataset.
+- Whether or not the file is restricted.
+- Whether or not the file skips :doc:`tabular ingest </user/tabulardataingest/index>`. If the ``tabIngest`` parameter is not specified, it defaults to ``true``.
+
+Note that when a Dataverse installation is configured to use S3 storage with direct upload enabled, there is API support to send a file directly to S3. This is more complex and is described in the :doc:`/developers/s3-direct-upload-api` guide. Also, see :ref:`set-dataset-file-limit-api`, for limitations to the number of files allowed per Dataset.
+ 
+In the curl example below, all of the above are specified but they are optional.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export FILENAME='data.tsv'
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST -F "file=@$FILENAME" -F 'jsonData={"description":"My description.","directoryLabel":"data/subdir1","categories":["Data"], "restrict":"false", "tabIngest":"false"}' "$SERVER_URL/api/datasets/:persistentId/add?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST -F file=@data.tsv -F 'jsonData={"description":"My description.","directoryLabel":"data/subdir1","categories":["Data"], "restrict":"false", "tabIngest":"false"}' "https://demo.dataverse.org/api/datasets/:persistentId/add?persistentId=doi:10.5072/FK2/J8SJZB"
+
+You should expect a 201 ("CREATED") response and JSON indicating the database id that has been assigned to your newly uploaded file.
+
+Please note that it's possible to "trick" a Dataverse installation into giving a file a content type (MIME type) of your choosing. For example, you can make a text file be treated like a video file with ``-F 'file=@README.txt;type=video/mpeg4'``, for example. If the Dataverse installation does not properly detect a file type, specifying the content type via API like this a potential workaround.
+
+The curl syntax above to upload a file is tricky and a Python version is provided below. (Please note that it depends on libraries such as "requests" that you may need to install but this task is out of scope for this guide.) Here are some parameters you can set in the script:
+
+* ``dataverse_server`` - e.g. https://demo.dataverse.org
+* ``api_key`` - See the top of this document for a description
+* ``persistentId`` - Example: ``doi:10.5072/FK2/6XACVA``
+* ``dataset_id`` - Database id of the dataset
+
+In practice, you only need one the ``dataset_id`` or the ``persistentId``. The example below shows both uses.
+
+.. code-block:: python
+
+    from datetime import datetime
+    import json
+    import requests  # http://docs.python-requests.org/en/master/
+
+    # --------------------------------------------------
+    # Update the 4 params below to run this code
+    # --------------------------------------------------
+    dataverse_server = 'https://your dataverse installation' # no trailing slash
+    api_key = 'api key'
+    dataset_id = 1  # database id of the dataset
+    persistentId = 'doi:10.5072/FK2/6XACVA' # doi or hdl of the dataset
+
+    # --------------------------------------------------
+    # Prepare "file"
+    # --------------------------------------------------
+    file_content = 'content: %s' % datetime.now()
+    files = {'file': ('sample_file.txt', file_content)}
+
+    # --------------------------------------------------
+    # Using a "jsonData" parameter, add optional description + file tags
+    # --------------------------------------------------
+    params = dict(description='Blue skies!',
+                categories=['Lily', 'Rosemary', 'Jack of Hearts'])
+
+    params_as_json_string = json.dumps(params)
+
+    payload = dict(jsonData=params_as_json_string)
+
+    # --------------------------------------------------
+    # Add file using the Dataset's id
+    # --------------------------------------------------
+    url_dataset_id = '%s/api/datasets/%s/add?key=%s' % (dataverse_server, dataset_id, api_key)
+
+    # -------------------
+    # Make the request
+    # -------------------
+    print '-' * 40
+    print 'making request: %s' % url_dataset_id
+    r = requests.post(url_dataset_id, data=payload, files=files)
+
+    # -------------------
+    # Print the response
+    # -------------------
+    print '-' * 40
+    print r.json()
+    print r.status_code
+
+    # --------------------------------------------------
+    # Add file using the Dataset's persistentId (e.g. doi, hdl, etc)
+    # --------------------------------------------------
+    url_persistent_id = '%s/api/datasets/:persistentId/add?persistentId=%s&key=%s' % (dataverse_server, persistentId, api_key)
+
+    # -------------------
+    # Update the file content to avoid a duplicate file error
+    # -------------------
+    file_content = 'content2: %s' % datetime.now()
+    files = {'file': ('sample_file2.txt', file_content)}
+
+
+    # -------------------
+    # Make the request
+    # -------------------
+    print '-' * 40
+    print 'making request: %s' % url_persistent_id
+    r = requests.post(url_persistent_id, data=payload, files=files)
+
+    # -------------------
+    # Print the response
+    # -------------------
+    print '-' * 40
+    print r.json()
+    print r.status_code
+
+.. _add-remote-file-api:
+    
+Add a Remote File to a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If your Dataverse installation has been configured to support :ref:`trusted-remote-storage`
+you can add files from remote URLs to datasets. These remote files appear in your Dataverse
+installation as if they were ordinary files but are stored remotely.
+
+The location of the remote file is specified in the ``storageIdentifier`` field in JSON you supply.
+The base URL of the file is contained in the "store" (e.g. "trsa" in the example below) and is followed by the
+path to the file (e.g. "themes/custom...").
+
+In the JSON example below, all fields are required except for ``description``. Other optional fields are shown under :ref:`add-file-api`.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+  export JSON_DATA='{"description":"A remote image.","storageIdentifier":"trsa://themes/custom/qdr/images/CoreTrustSeal-logo-transparent.png","checksumType":"MD5","md5Hash":"509ef88afa907eaf2c17c1c8d8fde77e","label":"testlogo.png","fileName":"testlogo.png","mimeType":"image/png"}'
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X POST "$SERVER_URL/api/datasets/:persistentId/add?persistentId=$PERSISTENT_ID" -F "jsonData=$JSON_DATA"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/datasets/:persistentId/add?persistentId=doi:10.5072/FK2/J8SJZB" -F 'jsonData={"description":"A remote image.","storageIdentifier":"trsa://themes/custom/qdr/images/CoreTrustSeal-logo-transparent.png","checksumType":"MD5","md5Hash":"509ef88afa907eaf2c17c1c8d8fde77e","label":"testlogo.png","fileName":"testlogo.png","mimeType":"image/png"}'
+
+Update File Metadata
+~~~~~~~~~~~~~~~~~~~~
+
+Updates metadata for one or more files in a dataset. This API call allows you to modify file-level metadata without the need to replace the actual file content.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/datasets/:persistentId/files/metadata?persistentId=$PERSISTENT_ID" --upload-file file-metadata-update.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/datasets/:persistentId/files/metadata?:persistentId=doi:10.5072/FK2/J8SJZB" --upload-file file-metadata-update.json
+
+The ``file-metadata-update.json`` file should contain a JSON array of objects, each representing a file to be updated. Here's an example structure:
+
+.. code-block:: json
+
+  [
+    {
+      "dataFileId": 42,
+      "label": "Updated File Name",
+      "directoryLabel": "data/",
+      "description": "Updated file description",
+      "restricted": false,
+      "categories": ["Documentation", "Data"],
+      "provFreeForm": "Updated provenance information"
+    },
+    {
+      "dataFileId": 43,
+      "label": "Another Updated File",
+      "description": "Another updated description",
+      "restricted": true
+    }
+  ]
+
+Each object in the array must include the ``dataFileId`` field to identify the file. Other fields are optional and will only be updated if included.
+
+The API will return a JSON object with information about the update operation, including any errors that occurred during the process.
+
+Note: This API call requires appropriate permissions to edit the dataset and its files.
+
+.. _cleanup-storage-api:
+
+Cleanup Storage of a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This is an experimental feature and should be tested on your system before using it in production.
+Also, make sure that your backups are up-to-date before using this on production servers.
+It is advised to first call this method with the ``dryrun`` parameter set to ``true`` before actually deleting the files.
+This will allow you to manually inspect the files that would be deleted if that parameter is set to ``false`` or is omitted (a list of the files that would be deleted is provided in the response).
+
+If your Dataverse installation has been configured to support direct uploads, or in some other situations,
+you could end up with some files in the storage of a dataset that are not linked to that dataset directly. Most commonly, this could
+happen when an upload fails in the middle of a transfer, i.e. if a user does a UI direct upload and leaves the page without hitting cancel or save,
+Dataverse doesn't know and doesn't clean up the files. Similarly in the direct upload API, if the final /addFiles call isn't done, the files are abandoned. 
+
+All the files stored in the Dataset storage location that are not in the file list of that Dataset (and follow the naming pattern of the dataset files) can be removed, as shown in the example below.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+  export DRYRUN=true
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X GET "$SERVER_URL/api/datasets/:persistentId/cleanStorage?persistentId=$PERSISTENT_ID&dryrun=$DRYRUN"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET "https://demo.dataverse.org/api/datasets/:persistentId/cleanStorage?persistentId=doi:10.5072/FK2/J8SJZB&dryrun=true"
+
+Adding Files To a Dataset via Other Tools
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In some circumstances, it may be useful to move or copy files into Dataverse's storage manually or via external tools and then add then to a dataset (i.e. without involving Dataverse in the file transfer itself). 
+Two API calls are available for this use case to add files to a dataset or to replace files that were already in the dataset.
+These calls were developed as part of Dataverse's direct upload mechanism and are detailed in :doc:`/developers/s3-direct-upload-api`.
+
+Imposing a limit to the number of files allowed to be uploaded to a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Having thousands of files in a Dataset can cause issues. Most users would be better off with the data repackaged in fewer large bundles. To help curtail these issues, a limit can be set to prevent the number of file uploads from getting out of hand.
+
+The limit can be set via JVM setting :ref:`dataverse.files.default-dataset-file-count-limit` to be installation wide, or, set on each Collection/Dataset.
+
+For Installation wide limit, the limit can be set via JVM. ./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.files.default-dataset-file-count-limit=<limit>"
+
+For Collections, the attribute can be controlled by calling the Create or Update Dataverse API and adding ``datasetFileCountLimit=500`` to the Json body (Must be a superuser to change this value).
+
+For Datasets, the attribute can be set using the `Update Dataset Files Limit <#setting-the-files-count-limit-on-a-dataset>`_ API and passing the qp `fileCountLimit=500` (Must be a superuser to change this value).
+
+Setting a value of -1 will clear the limit for that level. If no limit is found on the Dataset, the hierarchy of parent nodes will be checked until finally the JVM setting is checked.
+
+With this setting set a 400 error response stating that the limit has been reached, including the effective limit, will be returned.
+
+Please note that a superuser will be exempt from this rule.
+
+The check will use the value defined in the Dataset first, and if not set (value <1) the Dataverse/Collection will be checked, and finally the JVM setting.
+
+.. _set-dataset-file-limit-api:
+
+Setting the files count limit on a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In order to update the number of files allowed for a Dataset, without causing a Draft version of the Dataset being created, the following API can be used
+
+.. note:: To clear the limit simply set the limit to -1 or call the DELETE API (Must be a superuser to change this value).
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export LIMIT=500
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/datasets/$ID/files/uploadlimit/$LIMIT"
+
+To delete the existing limit:
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/$ID/files/uploadlimit"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/datasets/24/files/uploadlimit/500"
+
+To delete the existing limit:
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/24/files/uploadlimit"
+
+Report the data (file) size of a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Shows the combined size in bytes of all the files uploaded into the dataset ``id``.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/datasets/$ID/storagesize"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/datasets/24/storagesize"
+
+The size of published and unpublished files will be summed in the dataset specified. 
+By default, only the archival files are counted - i.e., the files uploaded by users (plus the tab-delimited versions generated for tabular data files on ingest). If the optional argument ``includeCached=true`` is specified, the API will also add the sizes of all the extra files generated and cached by the Dataverse installation - the resized thumbnail versions for image files, the metadata exports for published datasets, etc. Because this deals with unpublished files the token supplied must have permission to view unpublished drafts. 
+
+
+Get the size of Downloading all the files of a Dataset Version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Shows the combined size in bytes of all the files available for download from version ``versionId`` of dataset ``id``.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export VERSIONID=1.0
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/datasets/$ID/versions/$VERSIONID/downloadsize"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/datasets/24/versions/1.0/downloadsize"
+
+The size of all files available for download will be returned. 
+If :draft is passed as versionId the token supplied must have permission to view unpublished drafts. A token is not required for published datasets. Also restricted files will be included in this total regardless of whether the user has access to download the restricted file(s).
+
+There is an optional query parameter ``mode`` which applies a filter criteria to the operation. This parameter supports the following values:
+
+* ``All`` (Default): Includes both archival and original sizes for tabular files
+* ``Archival``: Includes only the archival size for tabular files
+* ``Original``: Includes only the original size for tabular files
+
+Usage example:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/datasets/24/versions/1.0/downloadsize?mode=Archival"
+
+Category name filtering is also optionally supported. To return the size of all files available for download matching the requested category name.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/downloadsize?categoryName=Data"
+
+Tabular tag name filtering is also optionally supported. To return the size of all files available for download for which the requested tabular tag has been added.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/downloadsize?tabularTagName=Survey"
+
+Content type filtering is also optionally supported. To return the size of all files available for download matching the requested content type.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/downloadsize?contentType=image/png"
+
+Filtering by search text is also optionally supported. The search will be applied to the labels and descriptions of the dataset files, to return the size of all files available for download that contain the text searched in one of such fields.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/downloadsize?searchText=word"
+
+File access filtering is also optionally supported. In particular, by the following possible values:
+
+* ``Public``
+* ``Restricted``
+* ``EmbargoedThenRestricted``
+* ``EmbargoedThenPublic``
+* ``RetentionPeriodExpired``
+
+If no filter is specified, the files will match all of the above categories.
+
+Please note that filtering query parameters are case sensitive and must be correctly typed for the endpoint to recognize them.
+
+By default, deaccessioned dataset versions are not included in the search when applying the :latest or :latest-published identifiers. Additionally, when filtering by a specific version tag, you will get a "not found" error if the version is deaccessioned and you do not enable the ``includeDeaccessioned`` option described below.
+
+If you want to include deaccessioned dataset versions, you must set ``includeDeaccessioned`` query parameter to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/versions/1.0/downloadsize?includeDeaccessioned=true"
+
+.. note:: Keep in mind that you can combine all of the above query parameters depending on the results you are looking for.
+
+Get the Download count of a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Shows the total number of downloads requested for a dataset. If MDC is enabled the count will be limited to the time before MDC start if the optional `includeMDC` parameter is not included or set to False.
+Setting `includeMDC` to True will ignore the `:MDCStartDate` setting and return a total count.
+
+.. code-block:: bash
+
+  API_TOKEN='xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+  export DATASET_ID=1
+  export includeMDC=True
+
+  curl -s -H "X-Dataverse-key:$API_TOKEN" -X GET http://localhost:8080/api/datasets/$DATASET_ID/download/count
+  curl -s -H "X-Dataverse-key:$API_TOKEN" -X GET http://localhost:8080/api/datasets/$DATASET_ID/download/count?includeMDC=true
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/datasets/1/download/count?includeMDC=False"
+
+
+
+Submit a Dataset for Review
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When dataset authors do not have permission to publish directly, they can click the "Submit for Review" button in the web interface (see :doc:`/user/dataset-management`), or perform the equivalent operation via API:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X POST "$SERVER_URL/api/datasets/:persistentId/submitForReview?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/datasets/:persistentId/submitForReview?persistentId=doi:10.5072/FK2/J8SJZB"
+
+The people who need to review the dataset (often curators or journal editors) can check their notifications periodically via API to see if any new datasets have been submitted for review and need their attention. See the :ref:`Notifications` section for details. Alternatively, these curators can simply check their email or notifications to know when datasets have been submitted (or resubmitted) for review.
+
+.. _return-a-dataset:
+
+Return a Dataset to Author
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+After the curators or journal editors have reviewed a dataset that has been submitted for review (see "Submit for Review", above) they can either choose to publish the dataset (see the ``:publish`` "action" above) or return the dataset to its authors. In the web interface there is a "Return to Author" button (see :doc:`/user/dataset-management`).  The same operation can be done via this API call.
+
+Here's how curators can send a "reason for return" to the dataset authors. First, the curator creates a JSON file that contains the reason for return:
+
+.. literalinclude:: ../_static/api/reason-for-return.json
+
+In the example below, the curator has saved the JSON file as :download:`reason-for-return.json <../_static/api/reason-for-return.json>` in their current working directory. Then, the curator sends this JSON file to the ``returnToAuthor`` API endpoint like this:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X POST "$SERVER_URL/api/datasets/:persistentId/returnToAuthor?persistentId=$PERSISTENT_ID" -H "Content-type: application/json" -d @reason-for-return.json
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/datasets/:persistentId/returnToAuthor?persistentId=doi:10.5072/FK2/J8SJZB" -H "Content-type: application/json" -d @reason-for-return.json
+
+The review process can sometimes resemble a tennis match, with the authors submitting and resubmitting the dataset over and over until the curators are satisfied. Each time the curators send a "reason for return" via API, that reason is sent by email and is persisted into the database, stored at the dataset version level.
+Note the reason is required, unless the `disable-return-to-author-reason` feature flag has been set (see :ref:`feature-flags`). Reason is a free text field and could be as simple as "The author would like to modify his dataset", "Files are missing", "Nothing to report" or "A curation report with comments and suggestions/instructions will follow in another email" that suits your situation.
+
+The :ref:`send-feedback-admin` Admin only API call may be useful as a way to move the conversation to email. However, note that these emails go to contacts (versus authors) and there is no database record of the email contents. (:ref:`dataverse.mail.cc-support-on-contact-email` will send a copy of these emails to the support email address which would provide a record.)
+The :ref:`send-feedback` API call may be useful as a way to move the conversation to email. However, note that these emails go to contacts (versus authors) and there is no database record of the email contents. (:ref:`dataverse.mail.cc-support-on-contact-email` will send a copy of these emails to the support email address which would provide a record.)
+
+Link a Dataset
+~~~~~~~~~~~~~~
+
+Creates a link between a dataset and a Dataverse collection (see :ref:`dataset-linking` section of Dataverse Collection Management in the User Guide for more information):
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export DATASET_ID=24
+  export DATAVERSE_ID=test
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X PUT "$SERVER_URL/api/datasets/$DATASET_ID/link/$DATAVERSE_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/datasets/24/link/test"
+
+Dataset Locks
+~~~~~~~~~~~~~
+
+Manage Locks on a Specific Dataset
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To check if a dataset is locked:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl "$SERVER_URL/api/datasets/$ID/locks"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/locks"
+
+Optionally, you can check if there's a lock of a specific type on the dataset:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export LOCK_TYPE=Ingest
+
+  curl "$SERVER_URL/api/datasets/$ID/locks?type=$LOCK_TYPE"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/24/locks?type=Ingest"
+
+Currently implemented lock types are ``Ingest``, ``Workflow``, ``InReview``, ``DcmUpload`` (deprecated), ``finalizePublication``, ``EditInProgress`` and ``FileValidationFailed``.
+
+The API will output the list of locks, for example:: 
+
+  {"status":"OK","data":
+    [
+      {
+        "lockType":"Ingest",
+        "date":"Fri Aug 17 15:05:51 EDT 2018",
+        "user":"dataverseAdmin",
+        "dataset":"doi:12.34567/FK2/ABCDEF"
+      },
+      {
+        "lockType":"Workflow",
+        "date":"Fri Aug 17 15:02:00 EDT 2018",
+        "user":"dataverseAdmin",
+        "dataset":"doi:12.34567/FK2/ABCDEF"
+      }
+    ]
+  }
+
+If the dataset is not locked (or if there is no lock of the requested type), the API will return an empty list. 
+
+The following API end point will lock a Dataset with a lock of specified type. Note that this requires “superuser” credentials:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export LOCK_TYPE=Ingest
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X POST "$SERVER_URL/api/datasets/$ID/lock/$LOCK_TYPE"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/datasets/24/lock/Ingest"
+
+Use the following API to unlock the dataset, by deleting all the locks currently on the dataset. Note that this requires “superuser” credentials:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/$ID/locks"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/24/locks"
+
+Or, to delete a lock of the type specified only. Note that this requires “superuser” credentials:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export LOCK_TYPE=finalizePublication
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/$ID/locks?type=$LOCK_TYPE"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/24/locks?type=finalizePublication"
+
+If the dataset is not locked (or if there is no lock of the specified type), the API will exit with a warning message.
+
+(Note that the API calls above all support both the database id and persistent identifier notation for referencing the dataset)
+
+List Locks Across All Datasets
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Note that this API requires “superuser” credentials. You must supply the ``X-Dataverse-key`` header with the api token of an admin user (as in the example below).
+
+The output of this API is formatted identically to the API that lists the locks for a specific dataset, as in one of the examples above. 
+
+Use the following API to list ALL the locks on all the datasets in your installation:
+
+  ``/api/datasets/locks``
+
+The listing can be filtered by specific lock type **and/or** user, using the following *optional* query parameters:
+
+* ``userIdentifier`` - To list the locks owned by a specific user
+* ``type`` - To list the locks of the type specified. If the supplied value does not match a known lock type, the API will return an error and a list of valid lock types. As of writing this, the implemented lock types are ``Ingest``, ``Workflow``, ``InReview``, ``DcmUpload`` (deprecated), ``finalizePublication``, ``EditInProgress`` and ``FileValidationFailed``.
+
+For example:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxx" "http://localhost:8080/api/datasets/locks?type=Ingest&userIdentifier=davis4ever"
+
+
+.. _dataset-metrics-api:
+
+Dataset Metrics
+~~~~~~~~~~~~~~~
+
+Please note that these dataset level metrics are only available if support for Make Data Count has been enabled in your Dataverse installation. See the :ref:`Dataset Metrics <dataset-metrics-user>` in the :doc:`/user/dataset-management` section of the User Guide and the :doc:`/admin/make-data-count` section of the Admin Guide for details.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+To confirm that the environment variable was set properly, you can use ``echo`` like this:
+
+.. code-block:: bash
+
+  echo $SERVER_URL
+
+Please note that for each of these endpoints except the "citations" endpoint, you can optionally pass the query parameter "country" with a two letter code (e.g. "country=us") and you can specify a particular month by adding it in yyyy-mm format after the requested metric (e.g. "viewsTotal/2019-02").
+
+Retrieving Total Views for a Dataset
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Please note that "viewsTotal" is a combination of "viewsTotalRegular" and "viewsTotalMachine" which can be requested separately.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl "$SERVER_URL/api/datasets/:persistentId/makeDataCount/viewsTotal?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/:persistentId/makeDataCount/viewsTotal?persistentId=10.5072/FK2/J8SJZB"
+
+Retrieving Unique Views for a Dataset
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Please note that "viewsUnique" is a combination of "viewsUniqueRegular" and "viewsUniqueMachine" which can be requested separately.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl "$SERVER_URL/api/datasets/:persistentId/makeDataCount/viewsUnique?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/:persistentId/makeDataCount/viewsUnique?persistentId=10.5072/FK2/J8SJZB"
+
+Retrieving Total Downloads for a Dataset
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Please note that "downloadsTotal" is a combination of "downloadsTotalRegular" and "downloadsTotalMachine" which can be requested separately.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl "$SERVER_URL/api/datasets/:persistentId/makeDataCount/downloadsTotal?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/:persistentId/makeDataCount/downloadsTotal?persistentId=10.5072/FK2/J8SJZB"
+
+Retrieving Unique Downloads for a Dataset
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Please note that "downloadsUnique" is a combination of "downloadsUniqueRegular" and "downloadsUniqueMachine" which can be requested separately.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl "$SERVER_URL/api/datasets/:persistentId/makeDataCount/downloadsUnique?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/:persistentId/makeDataCount/downloadsUnique?persistentId=10.5072/FK2/J8SJZB"
+
+Retrieving Citations for a Dataset
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl "$SERVER_URL/api/datasets/:persistentId/makeDataCount/citations?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/:persistentId/makeDataCount/citations?persistentId=10.5072/FK2/J8SJZB"
+
+Delete Unpublished Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Delete the dataset whose id is passed:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/$ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/24"
+
+Delete Published Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Normally published datasets should not be deleted, but there exists a "destroy" API endpoint for superusers which will act on a dataset given a persistent ID or dataset database ID:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/:persistentId/destroy/?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/:persistentId/destroy/?persistentId=doi:10.5072/FK2/AAA000"
+
+Delete with dataset identifier:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/$ID/destroy"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/24/destroy"
+  
+Calling the destroy endpoint is permanent and irreversible. It will remove the dataset and its datafiles, then re-index the parent Dataverse collection in Solr. This endpoint requires the API token of a superuser.
+
+Configure a Dataset to Use a Specific File Store
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``/api/datasets/$dataset-id/storageDriver`` can be used to check, configure or reset the designated file store (storage driver) for a dataset. Please see the :doc:`/admin/dataverses-datasets` section of the guide for more information on this API.
+
+View the Timestamps on a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``/api/datasets/$dataset-id/timestamps`` can be used to view timestamps associated with various events in the dataset's lifecycle. For published datasets, this API call provides the ``createTime``, ``publicationTime``, ``lastMetadataExportTime`` and ``lastMajorVersionReleaseTime``, as well as two booleans - ``hasStaleIndex`` and ``hasStalePermissionIndex`` - which, if false, indicate the Dataverse displays for the dataset are up-to-date. The response is ``application/json`` with the timestamps included in the returned ``data`` object.
+
+When called by a user who can view the draft version of the dataset, additional timestamps are reported: ``lastUpdateTime``, ``lastIndexTime``, ``lastPermissionUpdateTime``, and ``globalIdCreateTime``.
+
+One use case where this API call could be useful is in allowing an external application to poll and wait for changes being made by the Dataverse software or other external tool to complete prior to continuing its own processing.
+
+Set an Embargo on Files in a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``/api/datasets/$dataset-id/files/actions/:set-embargo`` can be used to set an embargo on one or more files in a dataset. Embargoes can be set on files that are only in a draft dataset version (and are not in any previously published version) by anyone who can edit the dataset. The same API call can be used by a superuser to add an embargo to files that have already been released as part of a previously published dataset version. 
+
+The API call requires a Json body that includes the embargo's end date (dateAvailable), a short reason (optional), and a list of the fileIds that the embargo should be set on. The dateAvailable must be after the current date and the duration (dateAvailable - today's date) must be less than the value specified by the :ref:`:MaxEmbargoDurationInMonths` setting. All files listed must be in the specified dataset. For example: 
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export JSON='{"dateAvailable":"2021-10-20", "reason":"Standard project embargo", "fileIds":[300,301,302]}'
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -H "Content-Type:application/json" "$SERVER_URL/api/datasets/:persistentId/files/actions/:set-embargo?persistentId=$PERSISTENT_IDENTIFIER" -d "$JSON"
+
+Remove an Embargo on Files in a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``/api/datasets/$dataset-id/files/actions/:unset-embargo`` can be used to remove an embargo on one or more files in a dataset. Embargoes can be removed from files that are only in a draft dataset version (and are not in any previously published version) by anyone who can edit the dataset. The same API call can be used by a superuser to remove embargos from files that have already been released as part of a previously published dataset version.
+
+The API call requires a Json body that includes the list of the fileIds that the embargo should be removed from. All files listed must be in the specified dataset. For example: 
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export JSON='{"fileIds":[300,301]}'
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -H "Content-Type:application/json" "$SERVER_URL/api/datasets/:persistentId/files/actions/:unset-embargo?persistentId=$PERSISTENT_IDENTIFIER" -d "$JSON"
+
+Set a Retention Period on Files in a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``/api/datasets/$dataset-id/files/actions/:set-retention`` can be used to set a retention period on one or more files in a dataset. Retention periods can be set on files that are only in a draft dataset version (and are not in any previously published version) by anyone who can edit the dataset. The same API call can be used by a superuser to add a retention period to files that have already been released as part of a previously published dataset version.
+
+The API call requires a Json body that includes the retention period's end date (dateUnavailable), a short reason (optional), and a list of the fileIds that the retention period should be set on. The dateUnavailable must be after the current date and the duration (dateUnavailable - today's date) must be larger than the value specified by the :ref:`:MinRetentionDurationInMonths` setting. All files listed must be in the specified dataset. For example:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export JSON='{"dateUnavailable":"2051-12-31", "reason":"Standard project retention period", "fileIds":[300,301,302]}'
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -H "Content-Type:application/json" "$SERVER_URL/api/datasets/:persistentId/files/actions/:set-retention?persistentId=$PERSISTENT_IDENTIFIER" -d "$JSON"
+
+Remove a Retention Period on Files in a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``/api/datasets/$dataset-id/files/actions/:unset-retention`` can be used to remove a retention period on one or more files in a dataset. Retention periods can be removed from files that are only in a draft dataset version (and are not in any previously published version) by anyone who can edit the dataset. The same API call can be used by a superuser to remove retention periods from files that have already been released as part of a previously published dataset version.
+
+The API call requires a Json body that includes the list of the fileIds that the retention period should be removed from. All files listed must be in the specified dataset. For example:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export JSON='{"fileIds":[300,301]}'
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -H "Content-Type:application/json" "$SERVER_URL/api/datasets/:persistentId/files/actions/:unset-retention?persistentId=$PERSISTENT_IDENTIFIER" -d "$JSON"
+  
+.. _Archival Status API:
+
+Get the Archival Status of a Dataset By Version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Archival :ref:`BagIt Export` is an optional feature that may be configured for a Dataverse installation. When that is enabled, this API call be used to retrieve the status. Note that this requires "superuser" credentials.
+
+``GET /api/datasets/$dataset-id/$version/archivalStatus`` returns the archival status of the specified dataset version.
+
+The response is a JSON object that will contain a "status" which may be "success", "pending", or "failure" and a "message" which is archive system specific. For "success" the message should provide an identifier or link to the archival copy. For example:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export VERSION=1.0
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -H "Accept:application/json" "$SERVER_URL/api/datasets/:persistentId/$VERSION/archivalStatus?persistentId=$PERSISTENT_IDENTIFIER"
+  
+Set the Archival Status of a Dataset By Version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Archiving is an optional feature that may be configured for a Dataverse installation. When that is enabled, this API call be used to set the status. Note that this is intended to be used by the archival system and requires "superuser" credentials.
+
+``PUT /api/datasets/$dataset-id/$version/archivalStatus`` sets the archival status of the specified dataset version.
+
+The body is a JSON object that must contain a "status" which may be "success", "pending", or "failure" and a "message" which is archive system specific. For "success" the message should provide an identifier or link to the archival copy. For example:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export VERSION=1.0
+  export JSON='{"status":"failure","message":"Something went wrong"}'
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -H "Content-Type:application/json" -X PUT "$SERVER_URL/api/datasets/:persistentId/$VERSION/archivalStatus?persistentId=$PERSISTENT_IDENTIFIER" -d "$JSON"
+  
+Note that if the configured archiver only supports archiving a single version, the call may return 409 CONFLICT if/when another version already has a non-null status.
+
+Delete the Archival Status of a Dataset By Version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Archiving is an optional feature that may be configured for a Dataverse installation. When that is enabled, this API call be used to delete the status. Note that this is intended to be used by the archival system and requires "superuser" credentials.
+
+``DELETE /api/datasets/$dataset-id/$version/archivalStatus`` deletes the archival status of the specified dataset version.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export VERSION=1.0
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/:persistentId/$VERSION/archivalStatus?persistentId=$PERSISTENT_IDENTIFIER"
+  
+Get External Tool Parameters
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This API call is intended as a callback that can be used by :doc:`/installation/external-tools` to retrieve signed Urls  necessary for their interaction with Dataverse.
+It can be called directly as well.
+
+The response is a JSON object described in the :doc:`/api/external-tools` section of the API guide.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export VERSION=1.0
+  export TOOL_ID=1
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -H "Accept:application/json" "$SERVER_URL/api/datasets/:persistentId/versions/$VERSION/toolparams/$TOOL_ID?persistentId=$PERSISTENT_IDENTIFIER"
+
+.. _signposting-api:
+
+Retrieve Signposting Information
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dataverse supports :ref:`discovery-sign-posting` as a discovery mechanism.
+Signposting involves the addition of a `Link <https://tools.ietf.org/html/rfc5988>`__ HTTP header providing summary information on GET and HEAD requests to retrieve the dataset page and a separate /linkset API call to retrieve additional information.
+
+Signposting Link HTTP Header
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Here is an example of a HTTP "Link" header from a GET or HEAD request for a dataset landing page:
+
+``Link: <https://doi.org/10.5072/FK2/YD5QDG>;rel="cite-as", <https://doi.org/10.5072/FK2/YD5QDG>;rel="describedby";type="application/vnd.citationstyles.csl+json",<https://demo.dataverse.org/api/datasets/export?exporter=OAI_ORE&persistentId=doi:10.5072/FK2/YD5QDG>;rel="describedby";type="application/json",<https://demo.dataverse.org/api/datasets/export?exporter=Datacite&persistentId=doi:10.5072/FK2/YD5QDG>;rel="describedby";type="application/xml",<https://demo.dataverse.org/api/datasets/export?exporter=oai_dc&persistentId=doi:10.5072/FK2/YD5QDG>;rel="describedby";type="application/xml",<https://demo.dataverse.org/api/datasets/export?exporter=oai_datacite&persistentId=doi:10.5072/FK2/YD5QDG>;rel="describedby";type="application/xml",<https://demo.dataverse.org/api/datasets/export?exporter=schema.org&persistentId=doi:10.5072/FK2/YD5QDG>;rel="describedby";type="application/ld+json",<https://demo.dataverse.org/api/datasets/export?exporter=ddi&persistentId=doi:10.5072/FK2/YD5QDG>;rel="describedby";type="application/xml",<https://demo.dataverse.org/api/datasets/export?exporter=dcterms&persistentId=doi:10.5072/FK2/YD5QDG>;rel="describedby";type="application/xml",<https://demo.dataverse.org/api/datasets/export?exporter=html&persistentId=doi:10.5072/FK2/YD5QDG>;rel="describedby";type="text/html",<https://demo.dataverse.org/api/datasets/export?exporter=dataverse_json&persistentId=doi:10.5072/FK2/YD5QDG>;rel="describedby";type="application/json",<https://demo.dataverse.org/api/datasets/export?exporter=oai_ddi&persistentId=doi:10.5072/FK2/YD5QDG>;rel="describedby";type="application/xml", <https://schema.org/AboutPage>;rel="type",<https://schema.org/Dataset>;rel="type", <http://creativecommons.org/publicdomain/zero/1.0>;rel="license", <https://demo.dataverse.org/api/datasets/:persistentId/versions/1.0/linkset?persistentId=doi:10.5072/FK2/YD5QDG> ; rel="linkset";type="application/linkset+json"``
+
+The URL for linkset information (described below) is discoverable under the ``rel="linkset";type="application/linkset+json`` entry in the "Link" header, such as in the example above.
+
+Signposting Linkset API Endpoint
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The reponse includes a JSON object conforming to the `Signposting <https://signposting.org>`__ specification. As part of this conformance, unlike most Dataverse API responses, the output is not wrapped in a ``{"status":"OK","data":{`` object.
+Signposting is not supported for draft dataset versions.
+
+Like :ref:`get-export-formats`, this API can be used to get URLs to dataset metadata export formats, but with URLs for the dataset in question.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+  export VERSION=1.0
+
+  curl -H "Accept:application/json" "$SERVER_URL/api/datasets/:persistentId/versions/$VERSION/linkset?persistentId=$PERSISTENT_IDENTIFIER"
+
+Get Dataset By Preview URL Token
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PREVIEW_URL_TOKEN=a56444bc-7697-4711-8964-e0577f055fd2
+
+  curl "$SERVER_URL/api/datasets/privateUrlDatasetVersion/$PREVIEW_URL_TOKEN"
+
+If you want to include the Dataverse collections that this dataset is part of, you must set ``returnOwners`` query parameter to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/previewUrlDatasetVersion/a56444bc-7697-4711-8964-e0577f055fd2?returnOwners=true"
+
+
+.. _get-citation:
+
+Get Citation
+~~~~~~~~~~~~
+
+This API call returns the dataset citation as seen on the dataset page, wrapped as a JSON object, with the value in the "data" sub-object's "message" key.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+  export VERSION=1.0
+
+  curl -H "Accept:application/json" "$SERVER_URL/api/datasets/:persistentId/versions/$VERSION/citation?persistentId=$PERSISTENT_IDENTIFIER"
+
+See :ref:`dataset-version-specifiers` for how to specify a version. By default, deaccessioned dataset versions are not included in the search when applying the :latest or :latest-published identifiers. Additionally, when filtering by a specific version tag, you will get a "not found" error if the version is deaccessioned and you do not enable the ``includeDeaccessioned`` option described below.
+
+If you want to include deaccessioned dataset versions, you must set ``includeDeaccessioned`` query parameter to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl -H "Accept:application/json" "$SERVER_URL/api/datasets/:persistentId/versions/$VERSION/citation?persistentId=$PERSISTENT_IDENTIFIER&includeDeaccessioned=true"
+
+Get Citation In Other Formats
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dataverse can also generate dataset citations in "EndNote", "RIS", "BibTeX", and "CSLJson" formats.
+Unlike the call above, which wraps the result in JSON, this API call sends the raw format with the appropriate content-type (EndNote is XML, RIS and BibTeX are plain text, and CSLJson is JSON). ("Internal" is also a valid value, returning the same content as the above call as HTML).
+This API call adds a format parameter in the API call which can be any of the values listed above.
+
+Usage example:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+  export VERSION=1.0
+  export FORMAT=EndNote
+
+  curl "$SERVER_URL/api/datasets/:persistentId/versions/$VERSION/citation/$FORMAT?persistentId=$PERSISTENT_IDENTIFIER"
+
+By default, deaccessioned dataset versions are not included in the search when applying the :latest or :latest-published identifiers. Additionally, when filtering by a specific version tag, you will get a "not found" error if the version is deaccessioned and you do not enable the ``includeDeaccessioned`` option described below.
+
+If you want to include deaccessioned dataset versions, you must set ``includeDeaccessioned`` query parameter to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+  curl "$SERVER_URL/api/datasets/:persistentId/versions/$VERSION/citation/$FORMAT?persistentId=$PERSISTENT_IDENTIFIER&includeDeaccessioned=true"
+
+
+Get Citation by Preview URL Token
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PREVIEW_URL_TOKEN=a56444bc-7697-4711-8964-e0577f055fd2
+
+  curl "$SERVER_URL/api/datasets/previewUrlDatasetVersion/$PREVIEW_URL_TOKEN/citation"
+
+.. _get-dataset-summary-field-names:
+
+Get Summary Field Names
+~~~~~~~~~~~~~~~~~~~~~~~
+
+See :ref:`:CustomDatasetSummaryFields` in the Installation Guide for how the list of dataset fields that summarize a dataset can be customized. Here's how to list them:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/datasets/summaryFieldNames"
+
+.. _get-available-dataset-file-categories:
+
+Get Available Dataset File Categories
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This api returns a list of Categories that may be applied to the files of a given dataset.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+
+  curl "$SERVER_URL/api/datasets/:persistentId/availableFileCategories?persistentId=$PERSISTENT_IDENTIFIER"
+
+
+.. _guestbook-at-request-api:
+  
+Configure When a Dataset Guestbook Appears (If Enabled)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+By default, users are asked to fill out a configured Guestbook when they down download files from a dataset. If enabled for a given Dataverse instance (see XYZ), users may instead be asked to fill out a Guestbook only when they request access to restricted files.
+This is configured by a global default, collection-level settings, or directly at the dataset level via these API calls (superuser access is required to make changes).
+
+To see the current choice for this dataset:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+
+  curl "$SERVER_URL/api/datasets/:persistentId/guestbookEntryAtRequest?persistentId=$PERSISTENT_IDENTIFIER"
+  
+  
+  The response will be true (guestbook displays when making a request), false (guestbook displays at download), or will indicate that the dataset inherits one of these settings.
+
+To set the behavior for this dataset:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+
+  curl -X PUT -H "X-Dataverse-key:$API_TOKEN" -H Content-type:application/json -d true "$SERVER_URL/api/datasets/:persistentId/guestbookEntryAtRequest?persistentId=$PERSISTENT_IDENTIFIER"
+
+
+  This example uses true to set the behavior to guestbook at request. Note that this call will return a 403/Forbidden response if guestbook at request functionality is not enabled for this Dataverse instance.
+  
+The API can also be used to reset the dataset to use the default/inherited value:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+
+  curl -X DELETE -H "X-Dataverse-key:$API_TOKEN" -H Content-type:application/json "$SERVER_URL/api/datasets/:persistentId/guestbookEntryAtRequest?persistentId=$PERSISTENT_IDENTIFIER"
+
+Get User Permissions on a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This API call returns the permissions that the calling user has on a particular dataset.
+
+In particular, the user permissions that this API call checks, returned as booleans, are the following:
+
+* Can view the unpublished dataset
+* Can edit the dataset
+* Can publish the dataset
+* Can manage the dataset permissions
+* Can delete the dataset draft
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X GET "$SERVER_URL/api/datasets/$ID/userPermissions"
+
+Know If a User Can Download at Least One File from a Dataset Version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This API endpoint indicates if the calling user can download at least one file from a dataset version. Note that permissions based on :ref:`shib-groups` are not considered.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export VERSION=1.0
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X GET "$SERVER_URL/api/datasets/$ID/versions/$VERSION/canDownloadAtLeastOneFile"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/datasets/24/versions/1.0/canDownloadAtLeastOneFile"
+
+.. _dataset-pid-generator:
+
+Configure The PID Generator a Dataset Uses (If Enabled)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dataverse can be configured to use multiple PID Providers (see the :ref:`pids-configuration` section for more information).
+When there are multiple PID Providers and File PIDs are enabled, it is possible to set which provider will be used to generate (mint) those PIDs.
+While it usually makes sense to use the same PID Provider that manages the dataset PID, there are cases, specifically if the PID Provider for the dataset PID cannot generate
+other PIDs with the same authority/shoulder, etc. as in the dataset PID, where another Provider is needed. Dataverse has a set of API calls to see what PID provider will be
+used to generate datafile PIDs and, as a superuser, to change it (to a new one or back to a default).
+
+To see the current choice for this dataset:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+
+  curl "$SERVER_URL/api/datasets/:persistentId/pidGenerator?persistentId=$PERSISTENT_IDENTIFIER"
+  
+The response will be the id of the PID Provider that will be used. Details of that provider's configration can be obtained via the :ref:`pids-providers-api`.
+
+To set the behavior for this dataset:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+  export GENERATOR_ID=perma1
+
+  curl -X PUT -H "X-Dataverse-key:$API_TOKEN" -H Content-type:application/json -d $GENERATOR_ID "$SERVER_URL/api/datasets/:persistentId/pidGenerator?persistentId=$PERSISTENT_IDENTIFIER"
+
+
+The PID Provider id used must be one of the those configured - see :ref:`pids-providers-api`.
+The return status code may be 200/OK, 401/403 if an api key is not sent or the user is not a superuser, or 404 if the dataset or PID provider are not found.
+Note that using a PIDProvider that generates DEPENDENT datafile PIDs that doesn't share the dataset PID's protocol/authority/separator/shoulder is not supported. (INDEPENDENT should be used in this case see the :ref:`pids-configuration` section for more information).
+  
+The API can also be used to reset the dataset to use the default/inherited value:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+
+  curl -X DELETE -H "X-Dataverse-key:$API_TOKEN" -H Content-type:application/json "$SERVER_URL/api/datasets/:persistentId/pidGenerator?persistentId=$PERSISTENT_IDENTIFIER"
+
+The default will always be the same provider as for the dataset PID if that provider can generate new PIDs, and will be the PID Provider set for the collection or the global default otherwise.
+
+Reconcile the PID of a Dataset (If Multiple PID Providers Are Enabled)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dataverse supports configuration with multiple Persistent Identifier (PID) providers (refer to the :ref:`pids-configuration` section for further details).
+This API endpoint assigns new PIDs to a draft Dataset - and, if applicable, to its Datafiles (cf. :ref:`:AllowEnablingFilePIDsPerCollection <:AllowEnablingFilePIDsPerCollection>`) —
+using the currently configured PIDProvider. In cases where the active PIDProvider differs from the one initially used to mint the dataset’s original PID, this API call facilitates reconciliation.
+It ensures consistency by reassigning a PID that aligns with the current provider’s specifications. More specifically, for a draft dataset,
+a new PID is minted through the active provider, and the previously assigned PID is preserved as an alternativePersistentIdentifier.
+The same procedure applies to associated datafiles, provided that DataFile PIDs are enabled. (Note: If the currently configured PID provider is identical to the one originally used, this API call has no effect. )
+
+The API is restricted to superusers and to datasets that have not already been published. (It does not make any changes to any PID Provider.)
+Warning: This change does not affect the storage repository, where the old PID is still
+used in the name of where files are stored for the dataset. If you want to remove the PID from the name used in storage, you could manually
+move the files offline and remove the old identifier from the database (by setting storagelocationdesignator to false for the old identifier
+in the alternativepersistentidentifier table). However, this step is not required for Dataverse to function correctly.
+
+To reconcile the PID of a dataset:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/YD5QDG
+
+  curl -X PUT -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/pidReconcile?persistentId=$PERSISTENT_IDENTIFIER"
+
+.. _api-dataset-types:
+
+Dataset Types
+~~~~~~~~~~~~~
+
+See :ref:`dataset-types` in the User Guide for an overview of the feature.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+
+.. _api-list-dataset-types:
+
+List Dataset Types
+^^^^^^^^^^^^^^^^^^
+
+Show which dataset types are available.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/datasets/datasetTypes"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/datasetTypes"
+
+.. _api-list-dataset-type:
+
+Get Dataset Type
+^^^^^^^^^^^^^^^^
+
+Show a dataset type by passing either its database id (e.g. "2") or its name (e.g. "software").
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export TYPE=software
+
+  curl $SERVER_URL/api/datasets/datasetTypes/$TYPE"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasets/datasetTypes/software"
+
+.. _api-add-dataset-type:
+
+Add Dataset Type
+^^^^^^^^^^^^^^^^
+
+Note: Before you add any types of your own, there should be a single type called "dataset". If you add "software" or "workflow", these types will be sent to DataCite (if you use DataCite). Otherwise, the only functionality you gain currently from adding types is an entry in the "Dataset Type" facet but be advised that if you add a type other than "software" or "workflow", you will need to add your new type to your Bundle.properties file for it to appear in Title Case rather than lower case in the "Dataset Type" facet.
+
+With all that said, we'll add a "software" type in the example below. This API endpoint is superuser only. The "name" of a type cannot be only digits. Note that this endpoint also allows you to add metadata blocks and available licenses for your new dataset type by adding "linkedMetadataBlocks" and/or "availableLicenses" arrays to your JSON.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export JSON='{"name":"software","linkedMetadataBlocks":["codeMeta20"],"availableLicenses":["MIT", "Apache-2.0"]}'
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -H "Content-Type: application/json" "$SERVER_URL/api/datasets/datasetTypes" -X POST -d $JSON
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -H "Content-Type: application/json" "https://demo.dataverse.org/api/datasets/datasetTypes" -X POST -d '{"name":"software","linkedMetadataBlocks":["codeMeta20"],"availableLicenses":["MIT", "Apache-2.0"]}'
+
+.. _api-delete-dataset-type:
+
+Delete Dataset Type
+^^^^^^^^^^^^^^^^^^^
+
+Superuser only.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export TYPE_ID=3
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/datasetTypes/$TYPE_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/datasetTypes/3"
+
+.. _api-link-dataset-type:
+
+Link Dataset Type with Metadata Blocks
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Linking a dataset type with one or more metadata blocks results in additional fields from those blocks appearing in the output from the :ref:`list-metadata-blocks-for-a-collection` API endpoint. The new frontend for Dataverse (https://github.com/IQSS/dataverse-frontend) uses the JSON output from this API endpoint to construct the page that users see when creating or editing a dataset. Once the frontend has been updated to pass in the dataset type (https://github.com/IQSS/dataverse-client-javascript/issues/210), specifying a dataset type in this way can be an alternative way to display additional metadata fields than the traditional method, which is to enable a metadata block at the collection level (see :ref:`define-metadata-blocks-for-a-dataverse-collection`).
+
+For example, a superuser could create a type called "software" and link it to the "CodeMeta" metadata block (this example is below). Then, once the new frontend allows it, the user can specify that they want to create a dataset of type software and see the additional metadata fields from the CodeMeta block when creating or editing their dataset.
+
+This API endpoint is for superusers only.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export TYPE=software
+  export JSON='["codeMeta20"]'
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -H "Content-Type: application/json" "$SERVER_URL/api/datasets/datasetTypes/$TYPE" -X PUT -d $JSON
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -H "Content-Type: application/json" "https://demo.dataverse.org/api/datasets/datasetTypes/software" -X PUT -d '["codeMeta20"]'
+
+To update the blocks that are linked, send an array with those blocks.
+
+To remove all links to blocks, send an empty array.
+
+Set Available Licenses for a Dataset Type
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+With this API a superuser may limit the available licenses for a dataset of a given type to a subset of those available in the installation.
+
+For example, a superuser could create a type called "software" and limit the available licenses to only "MIT" and "Apache-2.0".
+
+This API endpoint is for superusers only.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export TYPE=software
+  export JSON='["MIT", "Apache-2.0"]'
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -H "Content-Type: application/json" "$SERVER_URL/api/datasets/datasetTypes/$TYPE/licenses" -X PUT -d $JSON
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -H "Content-Type: application/json" "https://demo.dataverse.org/api/datasets/datasetTypes/software/licenses" -X PUT -d '["MIT", "Apache-2.0"]'
+
+To update the licenses available, send an array with those licenses.
+
+To remove all links to licenses, send an empty array. If no licenses are set then the default is all active licenses in the installation.
+
+.. _api-dataset-version-note:
+
+Dataset Version Notes
+~~~~~~~~~~~~~~~~~~~~~
+
+Intended as :ref:`provenance` information about why the version was created/how it differs from the prior version
+
+Depositors who can edit the dataset and curators can add a version note for the draft version. Superusers can add/delete version notes for any version.
+
+Version notes can be retrieved via the following, with authorization required to see a note on the :draft version
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=3
+  export VERSION=:draft
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/datasets/$ID/versions/$VERSION/versionNote"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/datasets/3/versions/:draft/versionNote"
+
+Notes can be set with:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=3
+  export VERSION=:draft
+  export NOTE=Files updated to correct typos
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT -d "$NOTE" "$SERVER_URL/api/datasets/$ID/versions/$VERSION/versionNote"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT -d "Files updated to correct typos" "https://demo.dataverse.org/api/datasets/3/versions/:draft/versionNote"
+
+And deleted via:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=3
+  export VERSION=2.0
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/$ID/versions/$VERSION/versionNote"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/3/versions/2.0/versionNote"
+
+Delete Files from a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Delete files from a dataset. This API call allows you to delete multiple files from a dataset in a single operation.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2ABCDEF
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/datasets/:persistentId/deleteFiles?persistentId=$PERSISTENT_IDENTIFIER" \
+  -H "Content-Type: application/json" \
+  -d '{"fileIds": [1, 2, 3]}'
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/datasets/:persistentId/deleteFiles?persistentId=doi:10.5072/FK2ABCDEF" \
+  -H "Content-Type: application/json" \
+  -d '{"fileIds": [1, 2, 3]}'
+
+The ``fileIds`` in the JSON payload should be an array of file IDs that you want to delete from the dataset.
+
+You must have the appropriate permissions to delete files from the dataset.
+
+Upon success, the API will return a JSON response with a success message and the number of files deleted.
+
+The API call will report a 400 (BAD REQUEST) error if any of the files specified do not exist or are not in the latest version of the specified dataset.
+The ``fileIds`` in the JSON payload should be an array of file IDs that you want to delete from the dataset.
+
+
+Files
+-----
+
+.. _get-json-rep-of-file:
+
+Get JSON Representation of a File
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note:: When a file has been assigned a persistent identifier, it can be used in the API. This is done by passing the constant ``:persistentId`` where the numeric id of the file is expected, and then passing the actual persistent id as a query parameter with the name ``persistentId``.
+
+This endpoint returns the file metadata present in the latest dataset version.
+
+Example: Getting the file whose DOI is *10.5072/FK2/J8SJZB*:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/:persistentId/?persistentId=$PERSISTENT_IDENTIFIER"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB"
+
+You may get its draft version of an unpublished file if you pass an api token with view draft permissions:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER/api/files/:persistentId/?persistentId=$PERSISTENT_IDENTIFIER"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB"
+
+
+|CORS| Show the file whose id is passed:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=408730
+
+  curl "$SERVER_URL/api/file/$ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/files/408730"
+
+You may get its draft version of an published file if you pass an api token with view draft permissions and use the draft path parameter:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER/api/files/:persistentId/draft/?persistentId=$PERSISTENT_IDENTIFIER"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/draft/?persistentId=doi:10.5072/FK2/J8SJZB"
+
+The file id can be extracted from the response retrieved from the API which uses the persistent identifier (``/api/datasets/:persistentId/?persistentId=$PERSISTENT_IDENTIFIER``).
+
+By default, files from deaccessioned dataset versions are not included in the search. If no accessible dataset draft version exists, the search of the latest published file will ignore dataset deaccessioned versions unless ``includeDeaccessioned`` query parameter is set to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/:persistentId/?persistentId=$PERSISTENT_IDENTIFIER&includeDeaccessioned=true"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB&includeDeaccessioned=true"
+
+If you want to include the dataset version of the file in the response, there is an optional parameter for this called ``returnDatasetVersion`` whose default value is ``false``.
+
+Usage example:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/:persistentId/?persistentId=$PERSISTENT_IDENTIFIER&returnDatasetVersion=true"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB&returnDatasetVersion=true"
+
+Get JSON Representation of a File given a Dataset Version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note:: When a file has been assigned a persistent identifier, it can be used in the API. This is done by passing the constant ``:persistentId`` where the numeric id of the file is expected, and then passing the actual persistent id as a query parameter with the name ``persistentId``.
+
+This endpoint returns the file metadata present in the requested dataset version. To specify the dataset version, you can use ``:latest-published``, or ``:latest``, or ``:draft`` or ``1.0`` or any other style listed under :ref:`dataset-version-specifiers`.
+
+Example: Getting the file whose DOI is *10.5072/FK2/J8SJZB* present in the published dataset version ``1.0``:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export DATASET_VERSION=1.0
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/:persistentId/versions/$DATASET_VERSION?persistentId=$PERSISTENT_IDENTIFIER"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/versions/1.0?persistentId=doi:10.5072/FK2/J8SJZB"
+
+You may obtain a not found error depending on whether or not the specified version exists or you have permission to view it.
+
+By default, files from deaccessioned dataset versions are not included in the search unless ``includeDeaccessioned`` query parameter is set to ``true``.
+
+Usage example:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export DATASET_VERSION=:latest-published
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/:persistentId/versions/$DATASET_VERSION?persistentId=$PERSISTENT_IDENTIFIER&includeDeaccessioned=true"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/versions/:latest-published?persistentId=doi:10.5072/FK2/J8SJZB&includeDeaccessioned=true"
+
+If you want to include the dataset version of the file in the response, there is an optional parameter for this called ``returnDatasetVersion`` whose default value is ``false``.
+
+Usage example:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export DATASET_VERSION=:draft
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/:persistentId/versions/$DATASET_VERSION?persistentId=$PERSISTENT_IDENTIFIER&returnDatasetVersion=true"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/versions/:draft?persistentId=doi:10.5072/FK2/J8SJZB&returnDatasetVersion=true"
+
+If you want to include the dataset and collections that the file is part of in the response, there is an optional parameter for this called ``returnOwners`` whose default value is ``false``.
+
+Usage example:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+  export DATASET_VERSION=:draft
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/:persistentId/versions/$DATASET_VERSION?persistentId=$PERSISTENT_IDENTIFIER&returnOwners=true"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/versions/:draft?persistentId=doi:10.5072/FK2/J8SJZB&returnOwners=true"
+
+Get JSON Representation of a file's versions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Gets a list of versions of a data file showing any changes that affected the file with each version.
+The fileIdOrPersistentId can be either "persistentId": "doi:10.5072/FK2/ADMYJF" or "datafileId": 19.
+
+Usage example:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1234
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X GET "$SERVER_URL/api/files/$ID/versionDifferences"
+  curl -H "X-Dataverse-key: $API_TOKEN" -X GET "$SERVER_URL/api/files/:persistentId/versionDifferences?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl  -X GET "https://demo.dataverse.org/api/files/1234/versionDifferences"
+  curl  -X GET "https://demo.dataverse.org/api/files/:persistentId/versionDifferences?persistentId=doi:10.5072/FK2/J8SJZB"
+
+Adding Files
+~~~~~~~~~~~~
+
+.. Note:: Files can be added via the native API but the operation is performed on the parent object, which is a dataset. Please see the Datasets_ endpoint above for more information.
+
+Accessing (downloading) files
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. Note:: Access API has its own section in the Guide: :doc:`/api/dataaccess`
+
+**Note** Data Access API calls can now be made using persistent identifiers (in addition to database ids). This is done by passing the constant ``:persistentId`` where the numeric id of the file is expected, and then passing the actual persistent id as a query parameter with the name ``persistentId``.
+
+Example: Getting the file whose DOI is *10.5072/FK2/J8SJZB*
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/J8SJZB
+
+  curl "$SERVER_URL/api/access/datafile/:persistentId/?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/access/datafile/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB"
+
+Note: you can use the combination of cURL's ``-J`` (``--remote-header-name``) and ``-O`` (``--remote-name``) options to save the file in its original file name, such as
+
+.. code-block:: bash
+
+  curl -J -O "https://demo.dataverse.org/api/access/datafile/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB"
+
+Restrict Files
+~~~~~~~~~~~~~~
+
+Restrict or unrestrict an existing file where ``id`` is the database id of the file or ``pid`` is the persistent id (DOI or Handle) of the file to restrict. Note that some Dataverse installations do not allow the ability to restrict files (see :ref:`:PublicInstall`).
+Restricting or Unrestricting a file, not in a draft version of the Dataset, will result in a new Draft version being created.
+Optionally the API can receive a JSON string with additional parameters related to the ability to request access to the file and the terms of that access.
+
+A curl example using an ``id``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT -d true "$SERVER_URL/api/files/$ID/restrict"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT -d true "https://demo.dataverse.org/api/files/24/restrict"
+
+A curl example using a ``pid``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT -d true "$SERVER_URL/api/files/:persistentId/restrict?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT -d true "https://demo.dataverse.org/api/files/:persistentId/restrict?persistentId=doi:10.5072/FK2/AAA000"
+
+Optional JSON string with additional attributes:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/files/$ID/restrict" \
+  -H "Content-Type: application/json" \
+  -d '{"restrict": true, "enableAccessRequest":false, "termsOfAccess": "Reason for the restricted access"}'
+
+Note the behavior of the optional parameters:
+
+- If restrict is false then enableAccessRequest and termsOfAccess are ignored
+- If restrict is true and enableAccessRequest is false then termsOfAccess is required. A status of CONFLICT (409) will be returned if the termsOfAccess is missing
+
+The enableAccessRequest and termsOfAccess are applied to the Draft version of the Dataset and affect all of the restricted files in said Draft version.
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/files/:persistentId/restrict?persistentId=doi:10.5072/FK2/AAA000" \
+  -H "Content-Type: application/json" \
+  -d '{"restrict": true, "enableAccessRequest":false, "termsOfAccess": "Reason for the restricted access"}'
+
+.. _file-uningest:
+
+Uningest a File
+~~~~~~~~~~~~~~~
+
+Reverse the tabular data ingest process performed on a file where ``ID`` is the database id or ``PERSISTENT_ID`` is the persistent id (DOI or Handle) of the file to process.
+
+Note that this requires "superuser" credentials to undo a successful ingest and remove the variable-level metadata and .tab version of the file.
+It can also be used by a user who can publish the dataset to clear the error from an unsuccessful ingest.
+
+A curl example using an ``ID``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/$ID/uningest"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/24/uningest"
+
+A curl example using a ``PERSISTENT_ID``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/:persistentId/uningest?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/:persistentId/uningest?persistentId=doi:10.5072/FK2/AAA000"
+
+.. _file-reingest:
+
+Reingest a File
+~~~~~~~~~~~~~~~
+
+Attempt to ingest an existing datafile as tabular data. This API can be used on a file that was not ingested as tabular back when it was uploaded. For example, a Stata v.14 file that was uploaded before ingest support for Stata 14 was added (in Dataverse Software v.4.9). It can also be used on a file that failed to ingest due to a bug in the ingest plugin that has since been fixed (hence the name "reingest").
+
+Note that this requires "superuser" credentials.
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/$ID/reingest"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/24/reingest"
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/:persistentId/reingest?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/:persistentId/reingest?persistentId=doi:10.5072/FK2/AAA000"
+
+Note: at present, the API cannot be used on a file that's already successfully ingested as tabular.
+
+.. _redetect-file-type:
+
+Redetect File Type
+~~~~~~~~~~~~~~~~~~
+
+The Dataverse Software uses a variety of methods for determining file types (MIME types or content types) and these methods (listed below) are updated periodically. If you have files that have an unknown file type, you can have the Dataverse Software attempt to redetect the file type.
+
+When using the curl command below, you can pass ``dryRun=true`` if you don't want any changes to be saved to the database. Change this to ``dryRun=false`` (or omit it) to save the change.
+
+A curl example using an ``id``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/$ID/redetect?dryRun=true"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/24/redetect?dryRun=true"
+
+A curl example using a ``pid``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/:persistentId/redetect?persistentId=$PERSISTENT_ID&dryRun=true"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/:persistentId/redetect?persistentId=doi:10.5072/FK2/AAA000&dryRun=true"
+
+Currently the following methods are used to detect file types:
+
+- The file type detected by the browser (or sent via API).
+- Custom code that reads the first few bytes. As explained at :ref:`s3-direct-upload-features-disabled`, most of these methods are not utilized during direct upload to S3, since by nature of direct upload Dataverse never sees the contents of the file. However, this code is utilized when the "redetect" API is used.
+- JHOVE: https://jhove.openpreservation.org . Note that the same applies about direct upload to S3 and the "redetect" API.
+- The file extension (e.g. ".ipybn") is used, defined in a file called ``MimeTypeDetectionByFileExtension.properties``.
+- The file name (e.g. "Dockerfile") is used, defined in a file called ``MimeTypeDetectionByFileName.properties``.
+
+.. _extractNcml:
+
+Extract NcML
+~~~~~~~~~~~~
+
+As explained in the :ref:`netcdf-and-hdf5` section of the User Guide, when those file types are uploaded, an attempt is made to extract an NcML file from them and store it as an auxiliary file.
+
+This happens automatically but superusers can also manually trigger this NcML extraction process with the API endpoint below.
+
+Note that "true" will be returned if an NcML file was created. "false" will be returned if there was an error or if the NcML file already exists (check server.log for details).
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/$ID/extractNcml"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/24/extractNcml"
+
+A curl example using a PID:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/:persistentId/extractNcml?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/:persistentId/extractNcml?persistentId=doi:10.5072/FK2/AAA000"
+
+Replacing Files
+~~~~~~~~~~~~~~~
+
+Replace an existing file where ``ID`` is the database id of the file to replace or ``PERSISTENT_ID`` is the persistent id (DOI or Handle) of the file. Requires the ``file`` to be passed as well as a ``jsonString`` expressing the new metadata.  Note that metadata such as description, directoryLabel (File Path) and tags are not carried over from the file being replaced.
+
+Note that when a Dataverse installation is configured to use S3 storage with direct upload enabled, there is API support to send a replacement file directly to S3. This is more complex and is described in the :doc:`/developers/s3-direct-upload-api` guide.
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST -F 'file=@file.extension' -F 'jsonData={json}' "$SERVER_URL/api/files/$ID/replace"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST -F 'file=@data.tsv' \
+    -F 'jsonData={"description":"My description.","categories":["Data"],"forceReplace":false}' \
+    "https://demo.dataverse.org/api/files/24/replace"
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST -F 'file=@file.extension' -F 'jsonData={json}' \
+    "$SERVER_URL/api/files/:persistentId/replace?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST -F 'file=@data.tsv' \
+    -F 'jsonData={"description":"My description.","categories":["Data"],"forceReplace":false}' \
+    "https://demo.dataverse.org/api/files/:persistentId/replace?persistentId=doi:10.5072/FK2/AAA000"
+
+Deleting Files
+~~~~~~~~~~~~~~
+
+Delete an existing file where ``ID`` is the database id of the file to delete or ``PERSISTENT_ID`` is the persistent id (DOI or Handle, if it exists) of the file.
+
+Note that the behavior of deleting files depends on if the dataset has ever been published or not.
+
+- If the dataset has never been published, the file will be deleted forever.
+- If the dataset has published, the file is deleted from the draft (and future published versions).
+- If the dataset has published, the deleted file can still be downloaded because it was part of a published version.
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/files/$ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/files/24"
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/files/:persistentId?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/files/:persistentId?persistentId=doi:10.5072/FK2/AAA000"
+
+Getting File Metadata
+~~~~~~~~~~~~~~~~~~~~~
+
+Provides a json representation of the file metadata for an existing file where ``ID`` is the database id of the file to get metadata from or ``PERSISTENT_ID`` is the persistent id (DOI or Handle) of the file.
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl "$SERVER_URL/api/files/$ID/metadata"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/files/24/metadata"
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl "$SERVER_URL/api/files/:persistentId/metadata?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/files/:persistentId/metadata?persistentId=doi:10.5072/FK2/AAA000"
+
+The current draft can also be viewed if you have permissions and pass your API token
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/$ID/metadata/draft"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/24/metadata/draft"
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/:persistentId/metadata/draft?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/metadata/draft?persistentId=doi:10.5072/FK2/AAA000"
+
+Note: The ``id`` returned in the json response is the id of the file metadata version.
+
+Getting File Data Tables
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+This endpoint is oriented toward tabular files and provides a JSON representation of the file data tables for an existing tabular file. ``ID`` is the database id of the file to get the data tables from or ``PERSISTENT_ID`` is the persistent id (DOI or Handle) of the file.
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl $SERVER_URL/api/files/$ID/dataTables
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl https://demo.dataverse.org/api/files/24/dataTables
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl "$SERVER_URL/api/files/:persistentId/dataTables?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/files/:persistentId/dataTables?persistentId=doi:10.5072/FK2/AAA000"
+
+Note that if the requested file is not tabular, the endpoint will return an error.
+
+.. _file-download-count:
+
+Getting File Download Count
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Provides the download count for a particular file, where ``ID`` is the database id of the file to get the download count from or ``PERSISTENT_ID`` is the persistent id (DOI or Handle) of the file.
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/files/$ID/downloadCount"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET "https://demo.dataverse.org/api/files/24/downloadCount"
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/files/:persistentId/downloadCount?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET "https://demo.dataverse.org/api/files/:persistentId/downloadCount?persistentId=doi:10.5072/FK2/AAA000"
+
+If you are interested in download counts for multiple files, see :doc:`/api/metrics`.
+
+File Has Been Deleted
+~~~~~~~~~~~~~~~~~~~~~
+
+Know if a particular file that existed in a previous version of the dataset no longer exists in the latest version.
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/files/$ID/hasBeenDeleted"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET "https://demo.dataverse.org/api/files/24/hasBeenDeleted"
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/files/:persistentId/hasBeenDeleted?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET  "https://demo.dataverse.org/api/files/:persistentId/hasBeenDeleted?persistentId=doi:10.5072/FK2/AAA000"
+
+Updating File Metadata
+~~~~~~~~~~~~~~~~~~~~~~
+
+Updates the file metadata for an existing file where ``ID`` is the database id of the file to update or ``PERSISTENT_ID`` is the persistent id (DOI or Handle) of the file. Requires a ``jsonString`` expressing the new metadata. No metadata from the previous version of this file will be persisted, so if you want to update a specific field first get the json with the above command and alter the fields you want.
+
+An optional parameter, sourceLastUpdateTime=datetime (in format: ``yyyy-MM-dd'T'HH:mm:ss'Z'``), can be used to verify that the file metadata being edited has not been changed since you last retrieved it, thereby avoiding potential lost metadata updates. The value for sourceLastUpdateTime can be taken from ``lastUpdateTime`` in the response to get $SERVER_URL/api/files/$ID API call.
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST \
+    -F 'jsonData={"description":"My description bbb.","provFreeform":"Test prov freeform","categories":["Data"],"dataFileTags":["Survey"],"restrict":false}' \
+    "$SERVER_URL/api/files/$ID/metadata"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST \
+    -F 'jsonData={"description":"My description bbb.","provFreeform":"Test prov freeform","categories":["Data"],"dataFileTags":["Survey"],"restrict":false}' \
+    "https://demo.dataverse.org/api/files/24/metadata"
+
+A curl example using a ``PERSISTENT_ID`` and the sourceLastUpdateTime parameter:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+  export UPDATE_TIME=2025-04-25T13:58:28Z
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST \
+    -F 'jsonData={"description":"My description bbb.","provFreeform":"Test prov freeform","categories":["Data"],"dataFileTags":["Survey"],"restrict":false}' \
+    "$SERVER_URL/api/files/:persistentId/metadata?persistentId=$PERSISTENT_ID&sourceLastUpdateTime=$UPDATE_TIME"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST \
+    -F 'jsonData={"description":"My description bbb.","provFreeform":"Test prov freeform","categories":["Data"],"dataFileTags":["Survey"],"restrict":false}' \
+    "https://demo.dataverse.org/api/files/:persistentId/metadata?persistentId=doi:10.5072/FK2/AAA000&sourceLastUpdateTime=2025-04-25T13:58:28Z"
+
+Note: To update the 'tabularTags' property of file metadata, use the 'dataFileTags' key when making API requests. This property is used to update the 'tabularTags' of the file metadata.
+
+Also note that dataFileTags are not versioned and changes to these will update the published version of the file.
+
+.. _EditingVariableMetadata:
+
+Updating File Metadata Categories
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Updates the categories for an existing file where ``ID`` is the database id of the file to update or ``PERSISTENT_ID`` is the persistent id (DOI or Handle) of the file. Requires a ``jsonString`` expressing the category names.
+
+The list of "categories" will be added to the existing list unless the optional ``replace=true`` query parameter is included. The inclusion of this parameter will cause the pre-existing categories to be deleted and the new "categories" to be added. Sending an empty list will remove all of the pre-existing categories.
+
+Although updating categories can also be done with the previous endpoint, this has been created to be more practical when it is only necessary to update categories and not other metadata fields.
+
+The JSON representation of file categories (``categories.json``) looks like this::
+
+  {
+    "categories": [
+      "Data",
+      "Custom"
+    ]
+  }
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export FILE_PATH=categories.json
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST \
+    "$SERVER_URL/api/files/$ID/metadata/categories" \
+    -H "Content-type:application/json" --upload-file $FILE_PATH
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST \
+    "http://demo.dataverse.org/api/files/24/metadata/categories" \
+    -H "Content-type:application/json" --upload-file categories.json
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST \
+    "http://demo.dataverse.org/api/files/24/metadata/categories?replace=true" \
+    -H "Content-type:application/json" --upload-file categories.json
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+  export FILE_PATH=categories.json
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST \
+    "$SERVER_URL/api/files/:persistentId/metadata/categories?persistentId=$PERSISTENT_ID" \
+    -H "Content-type:application/json" --upload-file $FILE_PATH
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST \
+    "$SERVER_URL/api/files/:persistentId/metadata/categories?persistentId=$PERSISTENT_ID&replace=true" \
+    -H "Content-type:application/json" --upload-file $FILE_PATH
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST \
+    "https://demo.dataverse.org/api/files/:persistentId/metadata/categories?persistentId=doi:10.5072/FK2/AAA000" \
+    -H "Content-type:application/json" --upload-file categories.json
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST \
+    "https://demo.dataverse.org/api/files/:persistentId/metadata/categories?persistentId=doi:10.5072/FK2/AAA000&replace=true" \
+    -H "Content-type:application/json" --upload-file tags.json
+
+Note that if the specified categories do not exist, they will be created.
+
+Updating File Tabular Tags
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Updates the tabular tags for an existing tabular file where ``ID`` is the database id of the file to update or ``PERSISTENT_ID`` is the persistent id (DOI or Handle) of the file. Requires a ``jsonString`` expressing the tabular tag names.
+
+The list of "tabularTags" will be added to the existing list unless the optional ``replace=true`` query parameter is included. The inclusion of this parameter will cause the pre-existing tags to be deleted and the "tabularTags" to be added. Sending an empty list will remove all of the pre-existing tags.
+
+The JSON representation of tabular tags (``tags.json``) looks like this::
+
+  {
+    "tabularTags": [
+      "Survey",
+      "Genomics"
+    ]
+  }
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export FILE_PATH=tags.json
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST \
+    "$SERVER_URL/api/files/$ID/metadata/tabularTags" \
+    -H "Content-type:application/json" --upload-file $FILE_PATH
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST \
+    "http://demo.dataverse.org/api/files/24/metadata/tabularTags" \
+    -H "Content-type:application/json" --upload-file tags.json
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST \
+    "http://demo.dataverse.org/api/files/24/metadata/tabularTags?replace=true" \
+    -H "Content-type:application/json" --upload-file tags.json
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+  export FILE_PATH=tags.json
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST \
+    "$SERVER_URL/api/files/:persistentId/metadata/tabularTags?persistentId=$PERSISTENT_ID" \
+    -H "Content-type:application/json" --upload-file $FILE_PATH
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST \
+    "$SERVER_URL/api/files/:persistentId/metadata/tabularTags?persistentId=$PERSISTENT_ID&replace=true" \
+    -H "Content-type:application/json" --upload-file $FILE_PATH
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST \
+    "https://demo.dataverse.org/api/files/:persistentId/metadata/tabularTags?persistentId=doi:10.5072/FK2/AAA000" \
+    -H "Content-type:application/json" --upload-file tags.json
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST \
+    "https://demo.dataverse.org/api/files/:persistentId/metadata/tabularTags?persistentId=doi:10.5072/FK2/AAA000&replace=true" \
+    -H "Content-type:application/json" --upload-file tags.json
+
+Note that the specified tabular tags must be valid. The supported tags are:
+
+* ``Survey``
+* ``Time Series``
+* ``Panel``
+* ``Event``
+* ``Genomics``
+* ``Network``
+* ``Geospatial``
+
+Editing Variable Level Metadata
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Updates variable level metadata using ddi xml ``FILE``, where ``ID`` is file id.
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export FILE=dct.xml
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/edit/$ID" --upload-file $FILE
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/edit/24" --upload-file dct.xml
+
+You can download :download:`dct.xml <../../../../src/test/resources/xml/dct.xml>` from the example above to see what the XML looks like.
+
+Get File Citation as JSON
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This API is for getting the file citation as it appears on the file landing page. It is formatted in HTML and encoded in JSON.
+
+To specify the version, you can use ``:latest-published`` or ``:draft`` or ``1.0`` or any other style listed under :ref:`dataset-version-specifiers`.
+
+When the dataset version is published, authentication is not required:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export FILE_ID=42
+  export DATASET_VERSION=:latest-published
+
+  curl "$SERVER_URL/api/files/$FILE_ID/versions/$DATASET_VERSION/citation"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/files/42/versions/:latest-published/citation"
+
+When the dataset version is a draft or deaccessioned, authentication is required.
+
+By default, deaccessioned dataset versions are not included in the search when applying the :latest or :latest-published identifiers. Additionally, when filtering by a specific version tag, you will get a "unauthorized" error if the version is deaccessioned and you do not enable the ``includeDeaccessioned`` option described below.
+
+If you want to include deaccessioned dataset versions, you must set ``includeDeaccessioned`` query parameter to ``true``.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export FILE_ID=42
+  export DATASET_VERSION=:draft
+  export INCLUDE_DEACCESSIONED=true
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/$FILE_ID/versions/$DATASET_VERSION/citation?includeDeaccessioned=$INCLUDE_DEACCESSIONED"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/42/versions/:draft/citation?includeDeaccessioned=true"
+
+If your file has a persistent identifier (PID, such as a DOI), you can pass it using the technique described under :ref:`get-json-rep-of-file`.
+
+This API is not for downloading various citation formats such as EndNote XML, RIS, or BibTeX. This functionality has been requested in https://github.com/IQSS/dataverse/issues/3140 and https://github.com/IQSS/dataverse/issues/9994.
+
+Provenance
+~~~~~~~~~~
+
+Get Provenance JSON for an uploaded file
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/$ID/prov-json"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/24/prov-json"
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/:persistentId/prov-json?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/prov-json?persistentId=doi:10.5072/FK2/AAA000"
+
+Get Provenance Description for an uploaded file
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/$ID/prov-freeform"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/24/prov-freeform"
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/files/:persistentId/prov-freeform?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/files/:persistentId/prov-freeform?persistentId=doi:10.5072/FK2/AAA000"
+
+Create/Update Provenance JSON and provide related entity name for an uploaded file
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export ENTITY_NAME="..."
+  export FILE_PATH=provenance.json
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/$ID/prov-json?entityName=$ENTITY_NAME" -H "Content-type:application/json" --upload-file $FILE_PATH
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/24/prov-json?entityName=..." -H "Content-type:application/json" --upload-file provenance.json
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+  export ENTITY_NAME="..."
+  export FILE_PATH=provenance.json
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/:persistentId/prov-json?persistentId=$PERSISTENT_ID&entityName=$ENTITY_NAME" -H "Content-type:application/json" --upload-file $FILE_PATH
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/:persistentId/prov-json?persistentId=doi:10.5072/FK2/AAA000&entityName=..." -H "Content-type:application/json" --upload-file provenance.json
+
+Create/Update Provenance Description for an uploaded file
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Requires a JSON file with the description connected to a key named "text"
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+  export FILE_PATH=provenance.json
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/$ID/prov-freeform" -H "Content-type:application/json" --upload-file $FILE_PATH
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/24/prov-freeform" -H "Content-type:application/json" --upload-file provenance.json
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+  export FILE_PATH=provenance.json
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/files/:persistentId/prov-freeform?persistentId=$PERSISTENT_ID" -H "Content-type:application/json" --upload-file $FILE_PATH
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/files/:persistentId/prov-freeform?persistentId=doi:10.5072/FK2/AAA000" -H "Content-type:application/json" --upload-file provenance.json
+
+See a sample JSON file :download:`file-provenance.json <../_static/api/file-provenance.json>` from https://openprovenance.org (c.f. Huynh, Trung Dong and Moreau, Luc (2014) ProvStore: a public provenance repository. At 5th International Provenance and Annotation Workshop (IPAW'14), Cologne, Germany, 09-13 Jun 2014. pp. 275-277).
+
+Delete Provenance JSON for an uploaded file
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/files/$ID/prov-json"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/files/24/prov-json"
+
+A curl example using a ``PERSISTENT_ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_ID=doi:10.5072/FK2/AAA000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/files/:persistentId/prov-json?persistentId=$PERSISTENT_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/files/:persistentId/prov-json?persistentId=doi:10.5072/FK2/AAA000"
+
+.. _datafile-integrity:
+
+Datafile Integrity
+~~~~~~~~~~~~~~~~~~
+
+Starting with the release 4.10 the size of the saved original file (for an ingested tabular datafile) is stored in the database. The following API will retrieve and permanently store the sizes for any already existing saved originals:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://localhost
+
+  curl "$SERVER_URL/api/admin/datafiles/integrity/fixmissingoriginalsizes"
+
+with limit parameter:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://localhost
+  export LIMIT=10
+
+  curl "$SERVER_URL/api/admin/datafiles/integrity/fixmissingoriginalsizes?limit=$LIMIT"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://localhost/api/admin/datafiles/integrity/fixmissingoriginalsizes"
+
+with limit parameter:
+
+.. code-block:: bash
+
+  curl "https://localhost/api/admin/datafiles/integrity/fixmissingoriginalsizes?limit=10"
+
+Note the optional "limit" parameter. Without it, the API will attempt to populate the sizes for all the saved originals that don't have them in the database yet. Otherwise it will do so for the first N such datafiles. 
+
+By default, the admin API calls are blocked and can only be called from localhost. See more details in :ref:`:BlockedApiEndpoints <:BlockedApiEndpoints>` and :ref:`:BlockedApiPolicy <:BlockedApiPolicy>` settings in :doc:`/installation/config`.
+
+Get External Tool Parameters
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This API call is intended as a callback that can be used by :doc:`/installation/external-tools` to retrieve signed Urls  necessary for their interaction with Dataverse.
+It can be called directly as well. (Note that the required FILEMETADATA_ID is the "id" returned in the JSON response from the /api/files/$FILE_ID/metadata call.)
+
+The response is a JSON object described in the :doc:`/api/external-tools` section of the API guide.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export FILE_ID=3
+  export FILEMETADATA_ID=1
+  export TOOL_ID=1
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -H "Accept:application/json" "$SERVER_URL/api/files/$FILE_ID/metadata/$FILEMETADATA_ID/toolparams/$TOOL_ID"
+
+.. _get-fixity-algorithm:
+
+Get Fixity Algorithm
+~~~~~~~~~~~~~~~~~~~~~~
+
+This API call can be used to discover the configured fixity/checksum algorithm being used by a Dataverse installation (as configured by - :ref:`:FileFixityChecksumAlgorithm`).
+Currently, the possible values are MD5, SHA-1, SHA-256, and SHA-512.
+This algorithm will be used when the Dataverse software manages a file upload and should be used by external clients uploading files to a Dataverse instance. (Existing files may or may not have checksums with this algorithm.) 
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/files/fixityAlgorithm"
+
+
+Users Token Management
+----------------------
+
+The following endpoints will allow users to manage their API tokens.
+
+Find a Token's Expiration Date
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to obtain the expiration date of a token use::
+
+	curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/users/token"
+
+Recreate a Token
+~~~~~~~~~~~~~~~~
+
+In order to obtain a new token use::
+
+	curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/users/token/recreate"
+
+This endpoint by default will return a response message indicating the user identifier and the new token.
+
+To also include the expiration time in the response message, the query parameter ``returnExpiration`` must be set to true::
+
+	curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/users/token/recreate?returnExpiration=true"
+
+Delete a Token
+~~~~~~~~~~~~~~
+
+In order to delete a token use::
+
+	curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/users/token"
+	
+	
+
+Builtin Users
+-------------
+
+Builtin users are known as "Username/Email and Password" users in the :doc:`/user/account` of the User Guide. The Dataverse installation stores a password (encrypted, of course) for these users, which differs from "remote" users such as Shibboleth or OAuth users where the password is stored elsewhere. See also :ref:`auth-modes` section of Configuration in the Installation Guide. It's a valid configuration of a Dataverse installation to not use builtin users at all.
+
+Create a Builtin User
+~~~~~~~~~~~~~~~~~~~~~
+
+For security reasons, builtin users cannot be created via API unless the team who runs the Dataverse installation has populated a database setting called ``BuiltinUsers.KEY``, which is described under :ref:`securing-your-installation` and :ref:`database-settings` sections of Configuration in the Installation Guide. You will need to know the value of ``BuiltinUsers.KEY`` before you can proceed.
+
+To create a builtin user via API, you must first construct a JSON document.  You can download :download:`user-add.json <../_static/api/user-add.json>` or copy the text below as a starting point and edit as necessary.
+
+.. literalinclude:: ../_static/api/user-add.json
+
+Place this ``user-add.json`` file in your current directory and run the following curl command, substituting variables as necessary. Note that both the password of the new user and the value of ``BuiltinUsers.KEY`` are passed as query parameters::
+
+  curl -d @user-add.json -H "Content-type:application/json" "$SERVER_URL/api/builtin-users?password=$NEWUSER_PASSWORD&key=$BUILTIN_USERS_KEY"
+
+Optionally, you may use a third query parameter "sendEmailNotification=false" to explicitly disable sending an email notification to the new user.
+
+Roles
+-----
+
+A role is a set of permissions.
+
+.. _json-representation-of-a-role:
+
+JSON Representation of a Role
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The JSON representation of a role (``roles.json``) looks like this::
+
+  {
+    "alias": "sys1",
+    "name": "Restricted System Role",
+    "description": "A person who may only add datasets.",
+    "permissions": [
+      "AddDataset"
+    ]
+  }
+
+.. note:: alias is constrained to a length of 16 characters
+
+Create Role
+~~~~~~~~~~~
+
+Roles can be created globally (:ref:`create-global-role`) or for individual Dataverse collections (:ref:`create-role-in-collection`).
+
+.. _show-role:
+
+Show Role
+~~~~~~~~~
+
+You must have ``ManageDataversePermissions`` to be able to show a role that was created using :ref:`create-role-in-collection`. Global roles (:ref:`create-global-role`) can only be shown with a superuser API token.
+
+An example using a role alias:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ALIAS=sys1
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/roles/:alias?alias=$ALIAS"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/roles/:alias?alias=sys1"
+
+An example using a role id:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=11
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/roles/$ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/roles/11"
+
+Delete Role
+~~~~~~~~~~~
+
+An example using a role id:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/roles/$ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/roles/24"
+
+An example using a role alias:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ALIAS=sys1
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/roles/:alias?alias=$ALIAS"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/roles/:alias?alias=sys1"
+
+Get User Selectable Roles
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Returns the appropriate roles that the calling user can use as filters when searching within their data.
+
+This endpoint returns the same set of roles displayed as filters on the MyData UI page. The logic for determining which roles are returned is as follows:
+
+- If the user is a superuser, all available roles are returned.
+
+- If the user is not a superuser, only their assigned roles are returned.
+
+- If the user has no assigned roles, all roles are returned as a fallback.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/roles/userSelectable"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"  "https://demo.dataverse.org/api/roles/userSelectable"
+
+Explicit Groups
+---------------
+
+Create New Explicit Group
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Explicit groups list their members explicitly. These groups are defined in Dataverse collections, which is why their API endpoint is under ``api/dataverses/$id/``, where ``$id`` is the id of the Dataverse collection.
+
+Create a new explicit group under Dataverse collection ``$id``::
+
+  POST http://$server/api/dataverses/$id/groups
+
+Data being POSTed is json-formatted description of the group::
+
+  {
+   "description":"Describe the group here",
+   "displayName":"Close Collaborators",
+   "aliasInOwner":"ccs"
+  }
+
+A curl example:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/dataverses/$ID/groups" --data '{"description":"Describe the group here","displayName":"Close Collaborators", "aliasInOwner":"ccs"}'
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"  "https://demo.dataverse.org/api/dataverses/24/groups" --data '{"description":"Describe the group here","displayName":"Close Collaborators", "aliasInOwner":"ccs"}'
+
+List Explicit Groups in a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+List explicit groups under Dataverse collection ``ID``. A curl example using an ``ID``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/groups"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"  "https://demo.dataverse.org/api/dataverses/24/groups"
+
+Show Single Group in a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Show group ``$GROUP_ALIAS`` under dataverse ``$DATAVERSE_ID`` and a ``$GROUP_ALIAS``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export GROUP_ALIAS=ccs
+  export DATAVERSE_ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$DATAVERSE_ID/groups/$GROUP_ALIAS"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"  "https://demo.dataverse.org/api/dataverses/24/groups/ccs"
+
+Update Group in a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Show group ``$GROUP_ALIAS`` under dataverse ``$DATAVERSE_ID`` and a ``$GROUP_ALIAS``. The request body is the same as the create group one, except that the group alias cannot be changed. Thus, the field ``aliasInOwner`` is ignored.:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export GROUP_ALIAS=ccs
+  export DATAVERSE_ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/dataverses/$DATAVERSE_ID/groups/$GROUP_ALIAS" --data '{"description":"Describe the group here","displayName":"Close Collaborators"}'
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/dataverses/24/groups/ccs" --data '{"description":"Describe the group here","displayName":"Close Collaborators"}'
+
+Delete Group from a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Delete group ``$GROUP_ALIAS`` under Dataverse collection ``$DATAVERSE_ID``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export GROUP_ALIAS=ccs
+  export DATAVERSE_ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/dataverses/$DATAVERSE_ID/groups/$GROUP_ALIAS"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/dataverses/24/groups/ccs"
+
+Add Multiple Role Assignees to an Explicit Group
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Bulk add role assignees to an explicit group. The request body is a JSON array of role assignee identifiers, such as ``@admin``, ``&ip/localhosts`` or ``:authenticated-users``::
+
+  POST http://$server/api/dataverses/$dv/groups/$groupAlias/roleAssignees
+
+Add a Role Assignee to an Explicit Group
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add a single role assignee to a group. Request body is ignored::
+
+  PUT http://$server/api/dataverses/$dv/groups/$groupAlias/roleAssignees/$roleAssigneeIdentifier
+
+Remove a Role Assignee from an Explicit Group
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Remove a single role assignee from an explicit group::
+
+  DELETE http://$server/api/dataverses/$dv/groups/$groupAlias/roleAssignees/$roleAssigneeIdentifier
+
+Shibboleth Groups
+-----------------
+
+Management of Shibboleth groups via API is documented in the :doc:`/installation/shibboleth` section of the Installation Guide.
+
+.. _info:
+
+Info
+----
+
+Show Dataverse Software Version and Build Number
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| Get the Dataverse installation version. The response contains the version and build numbers:
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/info/version"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/info/version"
+
+Show Dataverse Installation Server Name
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Get the server name. This is useful when a Dataverse installation is composed of multiple app servers behind a load balancer:
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/info/server"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/info/server"
+
+Show Custom Popup Text for Publishing Datasets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For now, only the value for the :ref:`:DatasetPublishPopupCustomText` setting from the Configuration section of the Installation Guide is exposed:
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/info/settings/:DatasetPublishPopupCustomText"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/info/settings/:DatasetPublishPopupCustomText"
+
+.. _api-get-app-tou:
+
+Get Application Terms of Use (General Terms of Use)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In the UI, Application Terms of Use is called "General Terms of Use" and can be seen when you sign up for an account. The terms come from the database setting :ref:`:ApplicationTermsOfUse`. If you have enabled :ref:`i18n` you can pass a two-character language code (e.g. "en") as the ``lang`` parameter.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export LANG=en
+
+  curl "$SERVER_URL/api/info/applicationTermsOfUse?lang=$LANG"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/info/applicationTermsOfUse?lang=en"
+
+Get API Terms of Use URL
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Get API Terms of Use. The response contains the text value inserted as API Terms of use which uses the database setting  ``:ApiTermsOfUse``:
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/info/apiTermsOfUse"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/info/apiTermsOfUse"
+
+.. _info-incomplete-metadata:
+
+Show Support Of Incomplete Metadata Deposition
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Learn if an instance has been configured to allow deposition of incomplete datasets via the API.
+See also :ref:`create-dataset-command` and :ref:`dataverse.api.allow-incomplete-metadata`
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/info/settings/incompleteMetadataViaApi"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/info/settings/incompleteMetadataViaApi"
+
+Get Zip File Download Limit
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Get the configured zip file download limit. The response contains the long value of the limit in bytes.
+
+This limit comes from the database setting :ref:`:ZipDownloadLimit` if set, or the default value if the database setting is not set, which is 104857600 (100MB).
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/info/zipDownloadLimit"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/info/zipDownloadLimit"
+
+Get Maximum Embargo Duration In Months
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Get the maximum embargo duration in months, if available, configured through the database setting :ref:`:MaxEmbargoDurationInMonths` from the Configuration section of the Installation Guide.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/info/settings/:MaxEmbargoDurationInMonths"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/info/settings/:MaxEmbargoDurationInMonths"
+
+.. _get-export-formats:
+
+Get Dataset Metadata Export Formats
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Get the available dataset metadata export formats, including formats from external exporters (see :ref:`available-exporters`).
+
+The response contains a JSON object with the available format names as keys (these can be passed to :ref:`export-dataset-metadata-api`), and values as objects with the following properties:
+
+* ``displayName``
+* ``mediaType``
+* ``isHarvestable``
+* ``isVisibleInUserInterface`` (corresponds to isAvailableToUsers)
+* ``XMLNameSpace`` (only for XML exporters)
+* ``XMLSchemaLocation`` (only for XML exporters)
+* ``XMLSchemaVersion`` (only for XML exporters)
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/info/exportFormats"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/info/exportFormats"
+
+Get Customization File Contents
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Customization API is used to retrieve the analytics-code.html as well as other customization file contents.
+
+See also :ref:`web-analytics-code` in the Configuration section of the Installation Guide and :ref:`Branding Your Installation`
+
+The Content-Type returned in the header is based on the media type of the file being returned (example: analytics-code.html returns "text/html; charset=UTF-8"
+
+Valid types are "homePage", "header", "footer", "style", "analytics", and "logo".
+
+A curl example getting the analytics-code
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export TYPE=analytics
+
+  curl -X GET "$SERVER_URL/api/info/settings/customization/$TYPE"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -X GET "https://demo.dataverse.org/api/info/settings/customization/analytics"
+
+.. _customization-analytics:
+
+.. _metadata-blocks-api:
+
+Metadata Blocks
+---------------
+
+See also :ref:`exploring-metadata-blocks`.
+
+Show Info About All Metadata Blocks
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| Lists brief info about all metadata blocks registered in the system.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/metadatablocks"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/metadatablocks"
+
+This endpoint supports the following optional query parameters:
+
+- ``returnDatasetFieldTypes``: Whether or not to return the dataset field types present in each metadata block. If not set, the default value is false.
+- ``onlyDisplayedOnCreate``: Whether or not to return only the metadata blocks that are displayed on dataset creation. If ``returnDatasetFieldTypes`` is true, only the dataset field types shown on dataset creation will be returned within each metadata block. If not set, the default value is false.
+
+An example using the optional query parameters is presented below:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/metadatablocks?returnDatasetFieldTypes=true&onlyDisplayedOnCreate=true"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/metadatablocks?returnDatasetFieldTypes=true&onlyDisplayedOnCreate=true"
+
+Show Info About Single Metadata Block
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|CORS| Return data about the block whose ``identifier`` is passed, including allowed controlled vocabulary values. ``identifier`` can either be the block's database id, or its name (i.e. "citation").
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export IDENTIFIER=citation
+
+  curl "$SERVER_URL/api/metadatablocks/$IDENTIFIER"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/metadatablocks/citation"
+
+.. _dataset-fields-api:
+
+Dataset Fields
+--------------
+
+List All Facetable Dataset Fields
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+List all facetable dataset fields defined in the installation.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/datasetfields/facetables"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "https://demo.dataverse.org/api/datasetfields/facetables"
+
+.. _setDisplayOnCreate:
+
+Set displayOnCreate for a Dataset Field
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Set displayOnCreate for a dataset field. See also :doc:`/admin/metadatacustomization` in the Admin Guide.
+
+.. code-block:: bash
+
+  export SERVER_URL=http://localhost:8080
+  export FIELD=subtitle
+  export BOOLEAN=true
+
+  curl -X POST "$SERVER_URL/api/admin/datasetfield/setDisplayOnCreate?datasetFieldType=$FIELD&setDisplayOnCreate=$BOOLEAN"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -X POST "http://localhost:8080/api/admin/datasetfield/setDisplayOnCreate?datasetFieldType=studyAssayCellType&setDisplayOnCreate=true"
+
+.. _Notifications:
+
+Notifications
+-------------
+
+See :ref:`account-notifications` in the User Guide for an overview. For a list of all the notification types mentioned below (e.g. ASSIGNROLE), see :ref:`mute-notifications` in the Admin Guide.
+
+.. _get-all-notifications:
+
+Get All Notifications by User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Each user can get a dump of their notifications by passing in their API token:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/notifications/all"
+
+The expected OK (200) response looks something like this:
+
+.. code-block:: text
+
+  {
+      "status": "OK",
+      "data": {
+          "notifications": [
+              {
+                  "id": 38,
+                  "type": "CREATEACC",
+                  "displayAsRead": true,
+                  "subjectText": "Root: Your account has been created",
+                  "messageText": "Hello, \nWelcome to...",
+                  "sentTimestamp": "2025-07-21T19:15:37Z"
+              }
+  ...
+
+This endpoint supports an optional query parameter ``inAppNotificationFormat`` which, if sent as ``true``, retrieves the fields needed to build the in-app notifications for the Notifications section of the Dataverse UI, omitting fields related to email notifications.
 
-When dataset authors do not have permission to publish directly, they can click the "Submit for Review" button in the web interface (see :doc:`/user/dataset-management`), or perform the equivalent operation via API::
+.. code-block:: bash
 
-    curl -H "X-Dataverse-key: $API_TOKEN" -X POST "$SERVER_URL/api/datasets/:persistentId/submitForReview?persistentId=$DOI_OR_HANDLE_OF_DATASET"
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/notifications/all?inAppNotificationFormat=true"
 
-The people who need to review the dataset (often curators or journal editors) can check their notifications periodically via API to see if any new datasets have been submitted for review and need their attention. See the :ref:`Notifications` section for details. Alternatively, these curators can simply check their email or notifications to know when datasets have been submitted (or resubmitted) for review.
+The expected OK (200) response looks something like this:
 
-Return a Dataset to Author
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: text
 
-After the curators or journal editors have reviewed a dataset that has been submitted for review (see "Submit for Review", above) they can either choose to publish the dataset (see the ``:publish`` "action" above) or return the dataset to its authors. In the web interface there is a "Return to Author" button (see :doc:`/user/dataset-management`), but the interface does not provide a way to explain **why** the dataset is being returned. There is a way to do this outside of this interface, however. Instead of clicking the "Return to Author" button in the UI, a curator can write a "reason for return" into the database via API.
+  {
+      "status": "OK",
+      "data": {
+          "notifications": [
+              {
+                  "id": 79,
+                  "type": "CREATEACC",
+                  "displayAsRead": false,
+                  "sentTimestamp": "2025-08-08T08:00:16Z",
+                  "installationBrandName": "Your Installation Name",
+                  "userGuidesBaseUrl": "https://guides.dataverse.org",
+                  "userGuidesVersion": "6.7.1",
+                  "userGuidesSectionPath": "user/index.html"
+              }
+          ]
+      }
+  }
+  ...
 
-Here's how curators can send a "reason for return" to the dataset authors. First, the curator creates a JSON file that contains the reason for return:
+Get Unread Count
+~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../_static/api/reason-for-return.json
+You can get a count of your unread notifications as shown below.
 
-In the example below, the curator has saved the JSON file as :download:`reason-for-return.json <../_static/api/reason-for-return.json>` in their current working directory. Then, the curator sends this JSON file to the ``returnToAuthor`` API endpoint like this::
+.. code-block:: bash
 
-    curl -H "Content-type:application/json" -d @reason-for-return.json -H "X-Dataverse-key: $API_TOKEN" -X POST "$SERVER_URL/api/datasets/:persistentId/returnToAuthor?persistentId=$DOI_OR_HANDLE_OF_DATASET"
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/notifications/unreadCount"
 
-The review process can sometimes resemble a tennis match, with the authors submitting and resubmitting the dataset over and over until the curators are satisfied. Each time the curators send a "reason for return" via API, that reason is persisted into the database, stored at the dataset version level.
+Mark Notification As Read
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Link a Dataset
-~~~~~~~~~~~~~~
+After finding the ID of a notification using :ref:`get-all-notifications`, you can pass it to the "markAsRead" API endpoint as shown below. Note that this endpoint is idempotent; you can mark an already-read notification as read over and over.
 
-Creates a link between a dataset and a dataverse (see the Linked Dataverses + Linked Datasets section of the :doc:`/user/dataverse-management` guide for more information). ::
+.. code-block:: bash
 
-    curl -H "X-Dataverse-key: $API_TOKEN" -X PUT http://$SERVER/api/datasets/$linked-dataset-id/link/$linking-dataverse-alias
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export NOTIFICATION_ID=555
 
-Dataset Locks
-~~~~~~~~~~~~~
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/notifications/$NOTIFICATION_ID/markAsRead"
 
-To check if a dataset is locked:: 
+The fully expanded example above (without environment variables) looks like this:
 
-    curl "$SERVER_URL/api/datasets/{database_id}/locks
+.. code-block:: bash
 
-Optionally, you can check if there's a lock of a specific type on the dataset:: 
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/notifications/555/markAsRead"
 
-    curl "$SERVER_URL/api/datasets/{database_id}/locks?type={lock_type}
+Delete Notification by User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Currently implemented lock types are ``Ingest, Workflow, InReview, DcmUpload, pidRegister, and EditInProgress``. 
+Each user can delete notifications by passing in their API token and specifying notification ID (e.g., 555):
 
-The API will output the list of locks, for example:: 
+.. code-block:: bash
 
-    {"status":"OK","data":
-	[
-		{
-		 "lockType":"Ingest",
-		 "date":"Fri Aug 17 15:05:51 EDT 2018",
-		 "user":"dataverseAdmin"
-		},
-		{
-		 "lockType":"Workflow",
-		 "date":"Fri Aug 17 15:02:00 EDT 2018",
-		 "user":"dataverseAdmin"
-		}
-	]
-    }
+  export NOTIFICATION_ID=555
 
-If the dataset is not locked (or if there is no lock of the requested type), the API will return an empty list. 
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/notifications/$NOTIFICATION_ID"
 
-The following API end point will lock a Dataset with a lock of specified type::
+Get All Muted In-app Notifications by User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    POST /api/datasets/{database_id}/lock/{lock_type}
+Each user can get a list of their muted in-app notification types by passing in their API token:
 
-For example::
+.. code-block:: bash
 
-    curl -X POST "$SERVER_URL/api/datasets/1234/lock/Ingest?key=$ADMIN_API_TOKEN"
-    or 
-    curl -X POST -H "X-Dataverse-key: $ADMIN_API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/lock/Ingest?persistentId=$DOI_OR_HANDLE_OF_DATASET"
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/notifications/mutedNotifications"
 
-Use the following API to unlock the dataset, by deleting all the locks currently on the dataset::
+Mute In-app Notification by User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    DELETE /api/datasets/{database_id}/locks
+Each user can mute in-app notifications by passing in their API token and specifying notification type to be muted (e.g., ASSIGNROLE):
 
-Or, to delete a lock of the type specified only::
+.. code-block:: bash
 
-    DELETE /api/datasets/{database_id}/locks?type={lock_type}
+  export NOTIFICATION_TYPE=ASSIGNROLE
 
-For example::
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/notifications/mutedNotifications/$NOTIFICATION_TYPE"
 
-    curl -X DELETE -H "X-Dataverse-key: $ADMIN_API_TOKEN" "$SERVER_URL/api/datasets/1234/locks?type=pidRegister"
+Unmute In-app Notification by User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If the dataset is not locked (or if there is no lock of the specified type), the API will exit with a warning message. 
+Each user can unmute in-app notifications by passing in their API token and specifying notification type to be unmuted (e.g., ASSIGNROLE):
 
-(Note that the API calls above all support both the database id and persistent identifier notation for referencing the dataset)
+.. code-block:: bash
 
-.. _dataset-metrics-api:
+  export NOTIFICATION_TYPE=ASSIGNROLE
 
-Dataset Metrics
-~~~~~~~~~~~~~~~
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/notifications/mutedNotifications/$NOTIFICATION_TYPE"
 
-Please note that these dataset level metrics are only available if support for Make Data Count has been enabled in your installation of Dataverse. See the :ref:`Dataset Metrics <dataset-metrics-user>` in the :doc:`/user/dataset-management` section of the User Guide and the :doc:`/admin/make-data-count` section of the Admin Guide for details.
+Get All Muted Email Notifications by User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+Each user can get a list of their muted email notification types by passing in their API token:
 
-``export DV_BASE_URL=https://demo.dataverse.org``
+.. code-block:: bash
 
-To confirm that the environment variable was set properly, you can use ``echo`` like this:
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/notifications/mutedEmails"
 
-``echo $DV_BASE_URL``
+Mute Email Notification by User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Please note that for each of these endpoints except the "citations" endpoint, you can optionally pass the query parameter "country" with a two letter code (e.g. "country=us") and you can specify a particular month by adding it in yyyy-mm format after the requested metric (e.g. "viewsTotal/2019-02").
+Each user can mute email notifications by passing in their API token and specifying notification type to be muted (e.g., ASSIGNROLE):
 
-Retrieving Total Views for a Dataset
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. code-block:: bash
 
-Please note that "viewsTotal" is a combination of "viewsTotalRegular" and "viewsTotalMachine" which can be requested separately.
+  export NOTIFICATION_TYPE=ASSIGNROLE
 
-``curl "$DV_BASE_URL/api/datasets/:persistentId/makeDataCount/viewsTotal?persistentId=$DOI"``
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/notifications/mutedEmails/$NOTIFICATION_TYPE"
 
-Retrieving Unique Views for a Dataset
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Unmute Email Notification by User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Please note that "viewsUnique" is a combination of "viewsUniqueRegular" and "viewsUniqueMachine" which can be requested separately.
+Each user can unmute email notifications by passing in their API token and specifying notification type to be unmuted (e.g., ASSIGNROLE):
 
-``curl "$DV_BASE_URL/api/datasets/:persistentId/makeDataCount/viewsUnique?persistentId=$DOI"``
+.. code-block:: bash
 
-Retrieving Total Downloads for a Dataset
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  export NOTIFICATION_TYPE=ASSIGNROLE
 
-Please note that "downloadsTotal" is a combination of "downloadsTotalRegular" and "downloadsTotalMachine" which can be requested separately.
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/notifications/mutedEmails/$NOTIFICATION_TYPE"
 
-``curl "$DV_BASE_URL/api/datasets/:persistentId/makeDataCount/downloadsTotal?persistentId=$DOI"``
+.. _User Information:
 
-Retrieving Unique Downloads for a Dataset
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+User Information
+----------------
 
-Please note that "downloadsUnique" is a combination of "downloadsUniqueRegular" and "downloadsUniqueMachine" which can be requested separately.
+Get User Information in JSON Format
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-``curl "$DV_BASE_URL/api/datasets/:persistentId/makeDataCount/downloadsUnique?persistentId=$DOI"``
+Each user can get a dump of their basic information in JSON format by passing in their API token::
 
-Retrieving Citations for a Dataset
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/users/:me"
 
-``curl "$DV_BASE_URL/api/datasets/:persistentId/makeDataCount/citations?persistentId=$DOI"``
 
-Delete Unpublished Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Delete the dataset whose id is passed:
+Managing Harvesting Server and Sets
+-----------------------------------
 
-``curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE http://$SERVER/api/datasets/$id``
+This API can be used to manage the Harvesting sets that your installation makes available over OAI-PMH. For more information, see the :doc:`/admin/harvestserver` section of the Admin Guide.
 
-Delete Published Dataset
+List All Harvesting Sets
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Normally published datasets should not be deleted, but there exists a "destroy" API endpoint for superusers which will act on a dataset given a persistent ID or dataset database ID:
-
-``curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE http://$SERVER/api/datasets/:persistentId/destroy/?persistentId=doi:10.5072/FK2/AAA000``
-  
-``curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE http://$SERVER/api/datasets/999/destroy``
-  
-Calling the destroy endpoint is permanent and irreversible. It will remove the dataset and its datafiles, then re-index the parent dataverse in Solr. This endpoint requires the API token of a superuser.
+Shows all Harvesting Sets defined in the installation::
 
-Files
------
+  GET http://$SERVER/api/harvest/server/oaisets/
 
-Adding Files
-~~~~~~~~~~~~
+List A Specific Harvesting Set
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. Note:: Files can be added via the native API but the operation is performed on the parent object, which is a dataset. Please see the Datasets_ endpoint above for more information.
+Shows a Harvesting Set with a defined specname::
 
-Accessing (downloading) files
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  GET http://$SERVER/api/harvest/server/oaisets/$specname
 
-.. Note:: Access API has its own section in the Guide: :doc:`/api/dataaccess`
+Create a Harvesting Set
+~~~~~~~~~~~~~~~~~~~~~~~
 
-**Note** Data Access API calls can now be made using persistent identifiers (in addition to database ids). This is done by passing the constant ``:persistentId`` where the numeric id of the file is expected, and then passing the actual persistent id as a query parameter with the name ``persistentId``.
+To create a harvesting set you must supply a JSON file that contains the following fields: 
 
-  Example: Getting the file whose DOI is *10.5072/FK2/J8SJZB* ::
+- Name: Alpha-numeric may also contain -, _, or %, but no spaces. It must also be unique in the installation.
+- Definition: A search query to select the datasets to be harvested. For example, a query containing authorName:YYY would include all datasets where ‘YYY’ is the authorName.
+- Description: Text that describes the harvesting set. The description appears in the Manage Harvesting Sets dashboard and in API responses. This field is optional.
 
-    GET http://$SERVER/api/access/datafile/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB
+An example JSON file would look like this::
 
+  {
+   "name":"ffAuthor",
+   "definition":"authorName:Finch, Fiona",
+   "description":"Fiona Finch’s Datasets"
+  }
 
-Restrict Files
-~~~~~~~~~~~~~~
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
-Restrict or unrestrict an existing file where ``id`` is the database id of the file or ``pid`` is the persistent id (DOI or Handle) of the file to restrict. Note that some Dataverse installations do not allow the ability to restrict files.
+.. code-block:: bash
 
-A curl example using an ``id``::
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
 
-    curl -H "X-Dataverse-key:$API_TOKEN" -X PUT -d true http://$SERVER/api/files/{id}/restrict
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/harvest/server/oaisets/add" --upload-file harvestset-finch.json
 
-A curl example using a ``pid``::
+The fully expanded example above (without the environment variables) looks like this:
 
-    curl -H "X-Dataverse-key:$API_TOKEN" -X PUT -d true http://$SERVER/api/files/:persistentId/restrict?persistentId={pid}
-    
-Uningest a File
-~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-Reverse the tabular data ingest process performed on a file where ``{id}`` is the database id of the file to process. Note that this requires "superuser" credentials::
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/harvest/server/oaisets/add" --upload-file "harvestset-finch.json"
 
-    POST http://$SERVER/api/files/{id}/uningest?key={apiKey}
+Only users with superuser permissions may create harvesting sets.
 
-Reingest a File
-~~~~~~~~~~~~~~~
+Modify an Existing Harvesting Set
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Attempt to ingest an existing datafile as tabular data. This API can be used on a file that was not ingested as tabular back when it was uploaded. For example, a Stata v.14 file that was uploaded before ingest support for Stata 14 was added (in Dataverse v.4.9). It can also be used on a file that failed to ingest due to a bug in the ingest plugin that has since been fixed (hence the name "reingest").
+To modify a harvesting set, you must supply a JSON file that contains one or both of the following fields:
 
-Note that this requires "superuser" credentials:: 
+- Definition: A search query to select the datasets to be harvested. For example, a query containing authorName:YYY would include all datasets where ‘YYY’ is the authorName.
+- Description: Text that describes the harvesting set. The description appears in the Manage Harvesting Sets dashboard and in API responses. This field is optional.
 
-    POST http://$SERVER/api/files/{id}/reingest?key={apiKey}
+Note that you may not modify the name of an existing harvesting set.
 
-(``{id}`` is the database id of the file to process)
+An example JSON file would look like this::
 
-Note: at present, the API cannot be used on a file that's already successfully ingested as tabular.
+  {
+   "definition":"authorName:Finch, Fiona AND subject:trees",
+   "description":"Fiona Finch’s Datasets with subject of trees"
+  }
 
-.. _redetect-file-type:
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
-Redetect File Type
-~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-Dataverse uses a variety of methods for determining file types (MIME types or content types) and these methods (listed below) are updated periodically. If you have files that have an unknown file type, you can have Dataverse attempt to redetect the file type.
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export SPECNAME=ffAuthor
 
-When using the curl command below, you can pass ``dryRun=true`` if you don't want any changes to be saved to the database. Change this to ``dryRun=false`` (or omit it) to save the change. In the example below, the file is identified by database id "42".
+  curl -H "X-Dataverse-key:$API_TOKEN" -X PUT "$SERVER_URL/api/harvest/server/oaisets/$SPECNAME" --upload-file modify-harvestset-finch.json
 
-``export FILE_ID=42``
+The fully expanded example above (without the environment variables) looks like this:
 
-``curl -H "X-Dataverse-key:$API_TOKEN" -X POST $SERVER_URL/api/files/$FILE_ID/redetect?dryRun=true``
+.. code-block:: bash
 
-Currently the following methods are used to detect file types:
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/harvest/server/oaisets/ffAuthor" --upload-file "modify-harvestset-finch.json"
 
-- The file type detected by the browser (or sent via API).
-- JHOVE: http://jhove.openpreservation.org
-- As a last resort the file extension (e.g. ".ipybn") is used, defined in a file called ``MimeTypeDetectionByFileExtension.properties``.
+Only users with superuser permissions may modify harvesting sets.
 
-Replacing Files
-~~~~~~~~~~~~~~~
+Delete an Existing Harvesting Set
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Replace an existing file where ``id`` is the database id of the file to replace or ``pid`` is the persistent id (DOI or Handle) of the file. Requires the ``file`` to be passed as well as a ``jsonString`` expressing the new metadata.  Note that metadata such as description, directoryLabel (File Path) and tags are not carried over from the file being replaced::
+To delete a harvesting set, use the set's database name. For example, to delete an existing harvesting set whose database name is "ffAuthor":
 
-    POST -F 'file=@file.extension' -F 'jsonData={json}' http://$SERVER/api/files/{id}/metadata?key={apiKey}
+.. code-block:: bash
 
-Example::
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export SPECNAME=ffAuthor
 
-  curl -H "X-Dataverse-key:$API_TOKEN" -X POST -F 'file=@data.tsv' \
-  -F 'jsonData={"description":"My description.","categories":["Data"],"forceReplace":false}'\
-  "https://demo.dataverse.org/api/files/$FILE_ID/replace"
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/harvest/server/oaisets/$SPECNAME"
 
-Getting File Metadata
-~~~~~~~~~~~~~~~~~~~~~
+The fully expanded example above (without the environment variables) looks like this:
 
-Provides a json representation of the file metadata for an existing file where ``id`` is the database id of the file to replace or ``pid`` is the persistent id (DOI or Handle) of the file::
+.. code-block:: bash
 
-    GET http://$SERVER/api/files/{id}/metadata
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/harvest/server/oaisets/ffAuthor"
 
-The current draft can also be viewed if you have permissions and pass your ``apiKey``::
+Only users with superuser permissions may delete harvesting sets.
 
-    GET http://$SERVER/api/files/{id}/metadata/draft?key={apiKey}
 
-Note: The ``id`` returned in the json response is the id of the file metadata version.
+.. _managing-harvesting-clients-api:
 
-Updating File Metadata
-~~~~~~~~~~~~~~~~~~~~~~
+Managing Harvesting Clients
+---------------------------
 
-Updates the file metadata for an existing file where ``id`` is the database id of the file to replace or ``pid`` is the persistent id (DOI or Handle) of the file. Requires a ``jsonString`` expressing the new metadata. No metadata from the previous version of this file will be persisted, so if you want to update a specific field first get the json with the above command and alter the fields you want::
+The following API can be used to create and manage "Harvesting Clients". A Harvesting Client is a configuration entry that allows your Dataverse installation to harvest and index metadata from a specific remote location, either regularly, on a configured schedule, or on a one-off basis. For more information, see the :doc:`/admin/harvestclients` section of the Admin Guide.
 
-    POST -F 'jsonData={json}' http://$SERVER/api/files/{id}/metadata?key={apiKey}
+List All Configured Harvesting Clients
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Example::
+Shows all the harvesting clients configured.
 
-    curl -H "X-Dataverse-key:{apiKey}" -X POST -F 'jsonData={"description":"My description bbb.","provFreeform":"Test prov freeform","categories":["Data"],"restrict":false}' 'http://localhost:8080/api/files/264/metadata'
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
-Also note that dataFileTags are not versioned and changes to these will update the published version of the file.
+.. code-block:: bash
 
-.. _EditingVariableMetadata:
+  export SERVER_URL=https://demo.dataverse.org
 
-Editing Variable Level Metadata
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  curl "$SERVER_URL/api/harvest/clients"
 
-Updates variable level metadata using ddi xml ``$file``, where ``$id`` is file id::
+The fully expanded example above (without the environment variables) looks like this:
 
-    PUT https://$SERVER/api/edit/$id --upload-file $file
+.. code-block:: bash
 
-Example: ``curl -H "X-Dataverse-key:$API_TOKEN" -X PUT http://localhost:8080/api/edit/95 --upload-file dct.xml``
+  curl "https://demo.dataverse.org/api/harvest/clients"
 
-You can download :download:`dct.xml <../../../../src/test/resources/xml/dct.xml>` from the example above to see what the XML looks like.
+Show a Specific Harvesting Client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Provenance
-~~~~~~~~~~
-Get Provenance JSON for an uploaded file::
+Shows a harvesting client by nickname.
 
-    GET http://$SERVER/api/files/{id}/prov-json?key=$apiKey
+.. code-block:: bash
 
-Get Provenance Description for an uploaded file::
+  export SERVER_URL=https://demo.dataverse.org
+  export NICKNAME=myclient
 
-    GET http://$SERVER/api/files/{id}/prov-freeform?key=$apiKey
+  curl "$SERVER_URL/api/harvest/clients/$NICKNAME"
 
-Create/Update Provenance JSON and provide related entity name for an uploaded file::
+The fully expanded example above (without the environment variables) looks like this:
 
-    POST http://$SERVER/api/files/{id}/prov-json?key=$apiKey&entityName=$entity -H "Content-type:application/json" --upload-file $filePath
+.. code-block:: bash
 
-Create/Update Provenance Description for an uploaded file. Requires a JSON file with the description connected to a key named "text"::
+  curl "https://demo.dataverse.org/api/harvest/clients/myclient"
 
-    POST http://$SERVER/api/files/{id}/prov-freeform?key=$apiKey -H "Content-type:application/json" --upload-file $filePath
+The output will look something like the following.
 
-Delete Provenance JSON for an uploaded file::
+.. code-block:: bash
 
-    DELETE http://$SERVER/api/files/{id}/prov-json?key=$apiKey
+  {
+    "status":"OK",
+    {
+      "data": {
+        "lastDatasetsFailed": "22",
+        "lastDatasetsDeleted": "0",
+        "metadataFormat": "oai_dc",
+        "archiveDescription": "This Dataset is harvested from our partners. Clicking the link will take you directly to the archival source of the data.",
+        "archiveUrl": "https://dataverse.foo.edu",
+        "harvestUrl": "https://dataverse.foo.edu/oai",
+        "style": "dataverse",
+        "type": "oai",
+        "dataverseAlias": "fooData",
+        "nickName": "myClient",
+        "sourceName": "",
+        "set": "fooSet",
+	"useOaiIdentifiersAsPids": false,
+	"useListRecords": false,
+        "schedule": "none",
+        "status": "inActive",
+        "lastHarvest": "Thu Oct 13 14:48:57 EDT 2022",
+        "lastResult": "SUCCESS",
+        "lastSuccessful": "Thu Oct 13 14:48:57 EDT 2022",
+        "lastNonEmpty": "Thu Oct 13 14:48:57 EDT 2022",
+        "lastDatasetsHarvested": "137"
+      }
+    }
 
-Datafile Integrity
-~~~~~~~~~~~~~~~~~~
 
-Starting the release 4.10 the size of the saved original file (for an ingested tabular datafile) is stored in the database. The following API will retrieve and permanently store the sizes for any already existing saved originals::
+.. _create-a-harvesting-client:
 
-	    GET http://$SERVER/api/admin/datafiles/integrity/fixmissingoriginalsizes{?limit=N}
+Create a Harvesting Client
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+  
+To create a harvesting client you must supply a JSON file that describes the configuration, similarly to the output of the GET API above. The following fields are mandatory:
+
+- ``dataverseAlias``: The alias of an existing collection where harvested datasets will be deposited
+- ``harvestUrl``: The URL of the remote OAI archive
+- ``archiveUrl``: The URL of the remote archive that will be used in the redirect links pointing back to the archival locations of the harvested records. It may or may not be on the same server as the harvestUrl above. If this OAI archive is another Dataverse installation, it will be the same URL as harvestUrl minus the "/oai". For example: https://demo.dataverse.org/ vs. https://demo.dataverse.org/oai
+- ``metadataFormat``: A supported metadata format. As of writing this the supported formats are "oai_dc", "oai_ddi" and "dataverse_json".
+
+The following optional fields are supported:
+
+- ``sourceName``: When ``index-harvested-metadata-source`` is enabled (see :ref:`feature-flags`), sourceName will override the nickname in the Metadata Source facet. It can be used to group the content from many harvesting clients under the same name.
+- ``archiveDescription``: What the name suggests. If not supplied, will default to "This Dataset is harvested from our partners. Clicking the link will take you directly to the archival source of the data."
+- ``set``: The OAI set on the remote server. If not supplied, will default to none, i.e., "harvest everything". (Note: see the note below on using sets when harvesting from DataCite; this is new as of v6.6).
+- ``style``: Defaults to "default" - a generic OAI archive. (Make sure to use "dataverse" when configuring harvesting from another Dataverse installation).
+- ``schedule``: Defaults to "none" (not scheduled). Two formats are supported, for weekly- and daily-scheduled harvests; examples: ``Weekly, Sat 5 AM``; ``Daily, 11 PM``. Note that if a schedule definition is not formatted exactly as described here, it will be ignored silently and the client will be left unscheduled.
+- ``customHeaders``: This can be used to configure this client with a specific HTTP header that will be added to every OAI request. This is to accommodate a use case where the remote server requires this header to supply some form of a token in order to offer some content not available to other clients. See the example below. Multiple headers can be supplied separated by `\\n` - actual "backslash" and "n" characters, not a single "new line" character.
+- ``allowHarvestingMissingCVV``: Flag to allow datasets to be harvested with Controlled Vocabulary Values that existed in the originating Dataverse Project but are not in the harvesting Dataverse Project. (Default is false). Currently only settable using API.
+- ``useOaiIdentifiersAsPids``: Defaults to false; if set to true, the harvester will attempt to use the identifier from the OAI-PMH record header as the **first choice** for the persistent id of the harvested dataset. When set to false, Dataverse will still attempt to use this identifier, but only if none of the ``<dc:identifier>`` entries in the OAI_DC record contain a valid persistent id (this is new as of v6.5).
+- ``useListRecords``: Defaults to false; if set to true, the harvester will attempt to retrieve multiple records in a single pass using the OAI-PMH verb ListRecords. By default, our harvester relies on the combination of ListIdentifiers followed by multiple GetRecord calls for each individual record. Note that this option is required when configuring harvesting from DataCite. (this is new as of v6.6).
+
+Generally, the API will accept the output of the GET version of the API for an existing client as valid input, but some fields will be ignored.
+  
+You can download this :download:`harvesting-client.json <../_static/api/harvesting-client.json>` file to use as a starting point.
 
-Note the optional "limit" parameter. Without it, the API will attempt to populate the sizes for all the saved originals that don't have them in the database yet. Otherwise it will do so for the first N such datafiles. 
+.. literalinclude:: ../_static/api/harvesting-client.json
 
-Users Token Management
-----------------------
+Something important to keep in mind about this API is that, unlike the harvesting clients GUI, it will create a client with the values supplied without making any attempts to validate them in real time. In other words, for the `harvestUrl` it will accept anything that looks like a well-formed url, without making any OAI calls to verify that the name of the set and/or the metadata format entered are supported by it. This is by design, to give an admin an option to still be able to create a client, in a rare case when it cannot be done via the GUI because of some real time failures in an exchange with an otherwise valid OAI server. This however puts the responsibility on the admin to supply the values already confirmed to be valid. 
 
-The following endpoints will allow users to manage their API tokens.
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
-Find a Token's Expiration Date
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In order to obtain the expiration date of a token use::
+``nickName`` in the JSON file and ``$NICKNAME`` in the URL path below is the name identifying the new client. It should be alpha-numeric and may also contain -, _, or %, but no spaces. It must be unique in the installation.
 
-	curl -H X-Dataverse-key:$API_TOKEN -X GET $SERVER_URL/api/users/token
+.. code-block:: bash
 
-Recreate a Token
-~~~~~~~~~~~~~~~~
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=http://localhost:8080
+  export NICKNAME=zenodo
 
-In order to obtain a new token use::
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST -H "Content-Type: application/json" "$SERVER_URL/api/harvest/clients/$NICKNAME" --upload-file harvesting-client.json
 
-	curl -H X-Dataverse-key:$API_TOKEN -X POST $SERVER_URL/api/users/token/recreate
+The fully expanded example above (without the environment variables) looks like this:
 
-Delete a Token
-~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-In order to delete a token use::
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST -H "Content-Type: application/json" "http://localhost:8080/api/harvest/clients/zenodo" --upload-file "harvesting-client.json"
 
-	curl -H X-Dataverse-key:$API_TOKEN -X DELETE $SERVER_URL/api/users/token
-	
-	
+The output will look something like the following.
 
-Builtin Users
--------------
+.. code-block:: bash
 
-Builtin users are known as "Username/Email and Password" users in the :doc:`/user/account` of the User Guide. Dataverse stores a password (encrypted, of course) for these users, which differs from "remote" users such as Shibboleth or OAuth users where the password is stored elsewhere. See also "Auth Modes: Local vs. Remote vs. Both" in the :doc:`/installation/config` section of the Installation Guide. It's a valid configuration of Dataverse to not use builtin users at all.
+  {
+    "status": "OK",
+    "data": {
+      "metadataFormat": "oai_dc",
+      "archiveDescription": "MoissonnÊ depuis la collection LMOPS de l'entrepôt Zenodo. En cliquant sur ce jeu de donnÊes, vous serez redirigÊ vers Zenodo.",
+      "archiveUrl": "https://zenodo.org",
+      "harvestUrl": "https://zenodo.org/oai2d",
+      "style": "default",
+      "type": "oai",
+      "dataverseAlias": "zenodoHarvested",
+      "nickName": "zenodo",
+      "set": "user-lmops",
+      "schedule": "none",
+      "status": "inActive",
+      "lastHarvest": "N/A",
+      "lastSuccessful": "N/A",
+      "lastNonEmpty": "N/A",
+      "lastDatasetsHarvested": "N/A",
+      "lastDatasetsDeleted": "N/A"
+    }
+  }
 
-Create a Builtin User
-~~~~~~~~~~~~~~~~~~~~~
+Only users with superuser permissions may create or configure harvesting clients.
 
-For security reasons, builtin users cannot be created via API unless the team who runs the Dataverse installation has populated a database setting called ``BuiltinUsers.KEY``, which is described under "Securing Your Installation" and "Database Settings" in the :doc:`/installation/config` section of the Installation Guide. You will need to know the value of ``BuiltinUsers.KEY`` before you can proceed.
+Modify a Harvesting Client
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To create a builtin user via API, you must first construct a JSON document.  You can download :download:`user-add.json <../_static/api/user-add.json>` or copy the text below as a starting point and edit as necessary.
+Similar to the API above, using the same JSON format, but run on an existing client and using the PUT method instead of POST. 
 
-.. literalinclude:: ../_static/api/user-add.json
+Delete a Harvesting Client
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Place this ``user-add.json`` file in your current directory and run the following curl command, substituting variables as necessary. Note that both the password of the new user and the value of ``BuiltinUsers.KEY`` are passed as query parameters::
+.. code-block:: bash
 
-  curl -d @user-add.json -H "Content-type:application/json" "$SERVER_URL/api/builtin-users?password=$NEWUSER_PASSWORD&key=$BUILTIN_USERS_KEY"
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=http://localhost:8080
+  export NICKNAME=zenodo
 
-Roles
------
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/harvest/clients/$NICKNAME"
 
-Create a New Role in a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The fully expanded example above (without the environment variables) looks like this:
 
-Creates a new role in dataverse object whose Id is ``dataverseIdtf`` (that's an id/alias)::
+.. code-block:: bash
 
-  POST http://$SERVER/api/roles?dvo=$dataverseIdtf&key=$apiKey
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "http://localhost:8080/api/harvest/clients/zenodo"
 
-Show Role
-~~~~~~~~~
+Only users with superuser permissions may delete harvesting clients.
 
-Shows the role with ``id``::
+Harvesting from DataCite
+~~~~~~~~~~~~~~~~~~~~~~~~
 
-  GET http://$SERVER/api/roles/$id
+The following 2 options are **required** when harvesting from DataCite (https://oai.datacite.org/oai):
 
-Delete Role
-~~~~~~~~~~~
+.. code-block:: bash
 
-Deletes the role with ``id``::
+  "useOaiIdentifiersAsPids": true,
+  "useListRecords": true,
 
-  DELETE http://$SERVER/api/roles/$id
+There are two ways the ``set`` parameter can be used when harvesting from DataCite:
 
-Explicit Groups
----------------
+- DataCite maintains pre-configured OAI sets for every subscribing institution that registers DOIs with them. This can be used to harvest the entire set of metadata registered by this organization or school, etc. (this is identical to how the set parameter is used with any other standard OAI archive);
+- As a unique, proprietary DataCite feature, it can be used to harvest virtually any arbitrary subset of records (potentially spanning different institutions and authorities, etc.). Any query that the DataCite search API understands can be used as an OAI set name (!). For example, the following search query finds one specific dataset:
 
-Create New Explicit Group
-~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-Explicit groups list their members explicitly. These groups are defined in dataverses, which is why their API endpoint is under ``api/dataverses/$id/``, where ``$id`` is the id of the dataverse.
+  https://api.datacite.org/dois?query=doi:10.7910/DVN/TJCLKP
 
-Create a new explicit group under dataverse ``$id``::
+you can now create a single-record OAI set by using its base64-encoded form as the set name:
 
-  POST http://$server/api/dataverses/$id/groups
+.. code-block:: bash
 
-Data being POSTed is json-formatted description of the group::
+  echo "doi:10.7910/DVN/TJCLKP" | base64
+  ZG9pOjEwLjc5MTAvRFZOL1RKQ0xLUAo=
 
-  {
-   "description":"Describe the group here",
-   "displayName":"Close Collaborators",
-   "aliasInOwner":"ccs"
-  }
+use the encoded string above prefixed by the ``~`` character in your harvesting client configuration:
 
-List Explicit Groups in a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-List explicit groups under dataverse ``$id``::
+  "set": "~ZG9pOjEwLjc5MTAvRFZOL1RKQ0xLUAo="
 
-  GET http://$server/api/dataverses/$id/groups
+The following configuration will create a client that will harvest the IQSS dataset specified above on a weekly schedule:
 
-Show Single Group in a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-Show group ``$groupAlias`` under dataverse ``$dv``::
+  {
+    "useOaiIdentifiersAsPids": true,
+    "useListRecords": true,
+    "set": "~ZG9pOjEwLjc5MTAvRFZOL1RKQ0xLUAo=",
+    "nickName": "iqssTJCLKP",
+    "dataverseAlias": "harvestedCollection",
+    "type": "oai",
+    "style": "default",
+    "harvestUrl": "https://oai.datacite.org/oai",
+    "archiveUrl": "https://oai.datacite.org",
+    "archiveDescription": "The metadata for this IQSS Dataset was harvested from DataCite. Clicking the dataset link will take you directly to the original archival location, as registered with DataCite.",
+    "schedule": "Weekly, Tue 4 AM",
+    "metadataFormat": "oai_dc"
+  }
 
-  GET http://$server/api/dataverses/$dv/groups/$groupAlias
+The queries can be as complex and/or long as necessary, with sub-queries combined via logical ANDs and ORs. Please keep in mind that white spaces must be encoded as ``%20``. For example, the following query:
 
-Update Group in a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-Update group ``$groupAlias`` under dataverse ``$dv``. The request body is the same as the create group one, except that the group alias cannot be changed. Thus, the field ``aliasInOwner`` is ignored. ::
+  prefix:10.17603 AND (types.resourceType:Report* OR types.resourceType:Mission*)
 
-  PUT http://$server/api/dataverses/$dv/groups/$groupAlias
+must be encoded as follows:
 
-Delete Group from a Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-Delete group ``$groupAlias`` under dataverse ``$dv``::
+  echo "prefix:10.17603%20AND%20(types.resourceType:Report*%20OR%20types.resourceType:Mission*)" | base64
+  cHJlZml4OjEwLjE3NjAzJTIwQU5EJTIwKHR5cGVzLnJlc291cmNlVHlwZTpSZXBvcnQqJTIwT1IlMjB0eXBlcy5yZXNvdXJjZVR5cGU6TWlzc2lvbiopCg==
 
-  DELETE http://$server/api/dataverses/$dv/groups/$groupAlias
 
-Add Multiple Role Assignees to an Explicit Group
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. _pids-api:
 
-Bulk add role assignees to an explicit group. The request body is a JSON array of role assignee identifiers, such as ``@admin``, ``&ip/localhosts`` or ``:authenticated-users``::
+PIDs
+----
 
-  POST http://$server/api/dataverses/$dv/groups/$groupAlias/roleAssignees
+PIDs is short for Persistent IDentifiers. Examples include DOI or Handle. There are some additional PID operations listed in the :doc:`/admin/dataverses-datasets` section of the Admin Guide.
 
-Add a Role Assignee to an Explicit Group
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Get Info on a PID
+~~~~~~~~~~~~~~~~~
 
-Add a single role assignee to a group. Request body is ignored::
+Get information on a PID, especially its "state" such as "draft" or "findable". Currently, this API only works on DataCite DOIs. A superuser API token is required.
 
-  PUT http://$server/api/dataverses/$dv/groups/$groupAlias/roleAssignees/$roleAssigneeIdentifier
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
-Remove a Role Assignee from an Explicit Group
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: bash
 
-Remove a single role assignee from an explicit group::
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PID=doi:10.70122/FK2/9BXT5O
 
-  DELETE http://$server/api/dataverses/$dv/groups/$groupAlias/roleAssignees/$roleAssigneeIdentifier
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/pids?persistentId=$PID"
 
-Shibboleth Groups
------------------
+The fully expanded example above (without environment variables) looks like this:
 
-Management of Shibboleth groups via API is documented in the :doc:`/installation/shibboleth` section of the Installation Guide.
+.. code-block:: bash
 
-Info
-----
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/pids?persistentId=doi:10.70122/FK2/9BXT5O"
 
-Show Dataverse Version and Build Number
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+List Unreserved PIDs
+~~~~~~~~~~~~~~~~~~~~
 
-|CORS| Get the Dataverse version. The response contains the version and build numbers:
+Get a list of PIDs that have not been reserved on the PID provider side. This can happen, for example, if a dataset is created while the PID provider is down. A superuser API token is required.
 
 .. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
 .. code-block:: bash
 
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
   export SERVER_URL=https://demo.dataverse.org
 
-  curl $SERVER_URL/api/info/version
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/pids/unreserved"
+
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl https://demo.dataverse.org/api/info/version
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/pids/unreserved"
 
-Show Dataverse Server Name
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+Reserve a PID
+~~~~~~~~~~~~~
 
-Get the server name. This is useful when a Dataverse system is composed of multiple Java EE servers behind a load balancer:
+Reserve a PID for a dataset if not yet registered, and, if FilePIDs are enabled, reserve any file PIDs that are not yet registered. A superuser API token is required.
 
 .. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
 .. code-block:: bash
 
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
   export SERVER_URL=https://demo.dataverse.org
+  export PID=doi:10.70122/FK2/9BXT5O
 
-  curl $SERVER_URL/api/info/server
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/pids/:persistentId/reserve?persistentId=$PID"
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl https://demo.dataverse.org/api/info/server
-
-Show Custom Popup Text for Publishing Datasets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "https://demo.dataverse.org/api/pids/:persistentId/reserve?persistentId=doi:10.70122/FK2/9BXT5O"
 
-For now, only the value for the ``:DatasetPublishPopupCustomText`` setting from the :doc:`/installation/config` section of the Installation Guide is exposed:
+Delete a PID
+~~~~~~~~~~~~
+
+Delete PID (this is only possible for PIDs that are in the "draft" state) and within a Dataverse installation, set ``globalidcreatetime`` to null and ``identifierregistered`` to false. A superuser API token is required.
 
 .. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
 .. code-block:: bash
 
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
   export SERVER_URL=https://demo.dataverse.org
+  export PID=doi:10.70122/FK2/9BXT5O
 
-  curl $SERVER_URL/api/info/settings/:DatasetPublishPopupCustomText
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/pids/:persistentId/delete?persistentId=$PID"
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl https://demo.dataverse.org/api/info/settings/:DatasetPublishPopupCustomText
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/pids/:persistentId/delete?persistentId=doi:10.70122/FK2/9BXT5O"
 
-Get API Terms of Use URL
-~~~~~~~~~~~~~~~~~~~~~~~~
+.. _pids-providers-api:
 
-Get API Terms of Use. The response contains the text value inserted as API Terms of use which uses the database setting  ``:ApiTermsOfUse``:
+Get Information about Configured PID Providers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dataverse can be configured with one or more PID Providers that it uses to create new PIDs and manage existing ones.
+This API call returns a JSONObject listing the configured providers and details about the protocol/authority/separator/shoulder they manage,
+along with information about about how new dataset and datafile PIDs are generated. See the :ref:`pids-configuration` section for more information.
 
 .. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
 .. code-block:: bash
 
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
   export SERVER_URL=https://demo.dataverse.org
 
-  curl $SERVER_URL/api/info/apiTermsOfUse
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/pids/providers"
 
 The fully expanded example above (without environment variables) looks like this:
 
 .. code-block:: bash
 
-  curl https://demo.dataverse.org/api/info/apiTermsOfUse
-
-Metadata Blocks
----------------
-
-Show Info About All Metadata Blocks
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/pids/providers"
 
-|CORS| Lists brief info about all metadata blocks registered in the system::
+Get the id of the PID Provider Managing a Given PID
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  GET http://$SERVER/api/metadatablocks
+Dataverse can be configured with one or more PID Providers that it uses to create new PIDs and manage existing ones.
+This API call returns the string id of the PID Provider than manages a given PID. See the :ref:`pids-configuration` section for more information.
+Delete PID (this is only possible for PIDs that are in the "draft" state) and within a Dataverse installation, set ``globalidcreatetime`` to null and ``identifierregistered`` to false. A superuser API token is required.
 
-Show Info About Single Metadata Block
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
-|CORS| Return data about the block whose ``identifier`` is passed. ``identifier`` can either be the block's id, or its name::
+.. code-block:: bash
 
-  GET http://$SERVER/api/metadatablocks/$identifier
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PID=doi:10.70122/FK2/9BXT5O
+  
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/pids/providers/$PID"
 
-.. _Notifications:
+The fully expanded example above (without environment variables) looks like this:
 
-Notifications
--------------
+.. code-block:: bash
 
-Get All Notifications by User
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/pids/providers/doi:10.70122/FK2/9BXT5O"
 
-Each user can get a dump of their notifications by passing in their API token::
+If the PID is not managed by Dataverse, this call will report if the PID is recognized as a valid PID for a given protocol (doi, hdl, or perma)
+ or will return a 400/Bad Request response if it is not.
+ 
 
-    curl -H "X-Dataverse-key:$API_TOKEN" $SERVER_URL/api/notifications/all
+.. _admin:
 
 Admin
 -----
 
-This is the administrative part of the API. For security reasons, it is absolutely essential that you block it before allowing public access to a Dataverse installation. Blocking can be done using settings. See the ``post-install-api-block.sh`` script in the ``scripts/api`` folder for details. See also "Blocking API Endpoints" under "Securing Your Installation" in the :doc:`/installation/config` section of the Installation Guide.
+This is the administrative part of the API. For security reasons, it is absolutely essential that you block it before allowing public access to a Dataverse installation. Blocking can be done using settings. See the ``post-install-api-block.sh`` script in the ``scripts/api`` folder for details. See :ref:`blocking-api-endpoints` in Securing Your Installation section of the Configuration page of the Installation Guide.
 
 List All Database Settings
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1318,6 +6677,95 @@ Delete the setting under ``name``::
 
   DELETE http://$SERVER/api/admin/settings/$name
 
+.. _list-all-feature-flags:
+
+List All Feature Flags
+~~~~~~~~~~~~~~~~~~~~~~
+
+Experimental and preview features are sometimes hidden behind feature flags. See :ref:`feature-flags` in the Installation Guide for a list of flags and how to configure them.
+
+This API endpoint provides a list of feature flags and "enabled" or "disabled" for each one.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=http://localhost:8080
+
+  curl "$SERVER_URL/api/admin/featureFlags"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "http://localhost:8080/api/admin/featureFlags"
+
+.. _show-feature-flag-status:
+
+Show Feature Flag Status
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+This endpoint reports "enabled" as true for false for a single feature flag. (For all flags, see :ref:`list-all-feature-flags`.)
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=http://localhost:8080
+  export FLAG=DATASET_TYPES
+
+  curl "$SERVER_URL/api/admin/featureFlags/$FLAG"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl "http://localhost:8080/api/admin/featureFlags/DATASET_TYPES"
+
+Manage Banner Messages
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. warning:: Adding a banner message with a language that is not supported by the installation will result in a 500-Internal Server Error response when trying to access to the /bannerMessage.
+
+Communications to users can be handled via banner messages that are displayed at the top of all pages within your Dataverse installation. Two types of banners can be configured:
+
+- A banner message where dismissibleByUser is set to false will be displayed to anyone viewing the application. These messages will be dismissible for a given session but will be displayed in any subsequent session until they are deleted by the Admin. This type of banner message is useful for situations such as upcoming maintenance windows and other downtime.
+- A banner message where dismissibleByUser is set to true is intended to be used in situations where the Admin wants to make sure that all logged in users see a certain notification. These banner messages will only be displayed to users when they are logged in and can be dismissed by the logged in user. Once they have been dismissed by a user, that user will not see the message again. This type of banner message is useful for situations where a message needs to communicated once, such as a minor terms of use update or an update about a new workflow in your Dataverse installation. 
+
+Note that HTML can be included in banner messages.
+
+Add a Banner Message::
+
+  curl -H "Content-type:application/json" -X POST "http://$SERVER/api/admin/bannerMessage" --upload-file messages.json
+  
+Where ``messages.json`` looks like this::
+
+  {
+    "dismissibleByUser": "true",
+    "messageTexts": [
+    {
+      "lang": "en",
+      "message": "Dismissible Banner Message added via API"
+    },
+    {
+      "lang": "fr",
+      "message": "Message de bannière ajoutÊ via l'API"
+    }
+    ]
+  }
+     
+Get a list of active Banner Messages::
+
+  curl  -X GET "http://$SERVER/api/admin/bannerMessage"
+  
+Delete a Banner Message by its id::
+
+  curl  -X DELETE "http://$SERVER/api/admin/bannerMessage/$id"
+  
+Deactivate a Banner Message by its id (allows you to hide a message while retaining information about which users have dismissed the banner)::
+
+  curl  -X PUT "http://$SERVER/api/admin/bannerMessage/$id/deactivate"
+
 List Authentication Provider Factories
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -1369,7 +6817,7 @@ Check whether an authentication proider is enabled::
 
 The body of the request should be either ``true`` or ``false``. Content type has to be ``application/json``, like so::
 
-  curl -H "Content-type: application/json"  -X POST -d"false" http://localhost:8080/api/admin/authenticationProviders/echo-dignified/:enabled
+  curl -H "Content-type: application/json"  -X POST -d"false" "http://localhost:8080/api/admin/authenticationProviders/echo-dignified/:enabled"
 
 Delete an Authentication Provider
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1379,12 +6827,14 @@ Deletes an authentication provider from the system. The command succeeds even if
   DELETE http://$SERVER/api/admin/authenticationProviders/$id/
 
 List Global Roles
-~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~
 
 List all global roles in the system. ::
 
     GET http://$SERVER/api/admin/roles
 
+.. _create-global-role:
+
 Create Global Role
 ~~~~~~~~~~~~~~~~~~
 
@@ -1392,6 +6842,72 @@ Creates a global role in the Dataverse installation. The data POSTed are assumed
 
     POST http://$SERVER/api/admin/roles
 
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=http://localhost:8080
+
+  curl -H "Content-Type: application/json" -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/admin/roles" --upload-file roles.json
+
+``roles.json`` see :ref:`json-representation-of-a-role`
+
+Update Global Role
+~~~~~~~~~~~~~~~~~~
+
+Update a global role in the Dataverse installation. The PUTed data is assumed to be a complete JSON role as it will overwrite the existing role. ::
+
+    PUT http://$SERVER/api/admin/roles/$ID
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export SERVER_URL=http://localhost:8080
+  export ID=24
+
+  curl -H "Content-Type: application/json" -X PUT "$SERVER_URL/api/admin/roles/$ID" --upload-file roles.json
+
+``roles.json`` see :ref:`json-representation-of-a-role`
+
+Delete Global Role
+~~~~~~~~~~~~~~~~~~
+
+Deletes an ``DataverseRole`` whose ``id``  is passed. ::
+
+    DELETE http://$SERVER/api/admin/roles/$ID
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=http://localhost:8080
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/admin/roles/$ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/admin/roles/24"
+
+A curl example using a Role alias ``ALIAS``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ALIAS=roleAlias
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/admin/roles/:alias?alias=$ALIAS"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/admin/roles/:alias?alias=roleAlias"
+
 List Users
 ~~~~~~~~~~
 
@@ -1400,11 +6916,27 @@ List users with the options to search and "page" through results. Only accessibl
 * ``searchTerm`` A string that matches the beginning of a user identifier, first name, last name or email address.
 * ``itemsPerPage`` The number of detailed results to return.  The default is 25.  This number has no limit. e.g. You could set it to 1000 to return 1,000 results
 * ``selectedPage`` The page of results to return.  The default is 1.
+* ``sortKey`` A string that represents a field that is used for sorting the results. Possible values are "id", "useridentifier" (username), "lastname" (last name), "firstname" (first name), "email" (email address), "affiliation" (affiliation), "superuser" (flag that denotes if the user is an administrator of the site), "position", "createdtime" (created time), "lastlogintime" (last login time), "lastapiusetime" (last API use time), "authproviderid" (the authentication provider ID). To sort in reverse order you can add " desc" e.g. "id desc". The default value is "useridentifier".
 
-::
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/list-users"
+
+  # sort by createdtime (the creation time of the account)
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/list-users?sortKey=createdtime"
+
+The fully expanded example above (without environment variables) looks like this:
 
-    GET http://$SERVER/api/admin/list-users
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/admin/list-users"
 
+  # sort by createdtime (the creation time of the account)
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" "https://demo.dataverse.org/api/admin/list-users?sortKey=createdtime"
 
 Sample output appears below.
 
@@ -1502,76 +7034,227 @@ Sample output appears below.
 
 .. note:: "List all users" ``GET http://$SERVER/api/admin/authenticatedUsers`` is deprecated, but supported.
 
-List Single User
-~~~~~~~~~~~~~~~~
+List Single User
+~~~~~~~~~~~~~~~~
+
+List user whose ``identifier`` (without the ``@`` sign) is passed::
+
+    GET http://$SERVER/api/admin/authenticatedUsers/$identifier
+
+Sample output using "dataverseAdmin" as the ``identifier``::
+
+    {
+      "authenticationProviderId": "builtin",
+      "persistentUserId": "dataverseAdmin",
+      "position": "Admin",
+      "id": 1,
+      "identifier": "@dataverseAdmin",
+      "displayName": "Dataverse Admin",
+      "firstName": "Dataverse",
+      "lastName": "Admin",
+      "email": "dataverse@mailinator.com",
+      "superuser": true,
+      "affiliation": "Dataverse.org"
+    }
+
+Create an Authenticated User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Create an authenticatedUser::
+
+    POST http://$SERVER/api/admin/authenticatedUsers
+
+POSTed JSON example::
+
+    {
+      "authenticationProviderId": "orcid",
+      "persistentUserId": "0000-0002-3283-0661",
+      "identifier": "@pete",
+      "firstName": "Pete K.",
+      "lastName": "Dataversky",
+      "email": "pete@mailinator.com"
+    }
+
+.. _merge-accounts-label:
+
+Merge User Accounts
+~~~~~~~~~~~~~~~~~~~
+
+If a user has created multiple accounts and has been performed actions under both accounts that need to be preserved, these accounts can be combined.  One account can be merged into another account and all data associated with both accounts will be combined in the surviving account. Only accessible to superusers.::
+
+    POST https://$SERVER/api/users/$toMergeIdentifier/mergeIntoUser/$continuingIdentifier
+
+Example: ``curl -H "X-Dataverse-key: $API_TOKEN" -X POST "http://demo.dataverse.org/api/users/jsmith2/mergeIntoUser/jsmith"``
+
+This action moves account data from jsmith2 into the account jsmith and deletes the account of jsmith2.
+
+Note: User accounts can only be merged if they are either both active or both deactivated. See :ref:`deactivate a user<deactivate-a-user>`.
+
+.. _change-identifier-label:
+
+Change User Identifier
+~~~~~~~~~~~~~~~~~~~~~~
+
+Changes identifier for user in ``AuthenticatedUser``, ``BuiltinUser``, ``AuthenticatedUserLookup`` & ``RoleAssignment``. Allows them to log in with the new identifier. Only accessible to superusers.::
+
+    POST http://$SERVER/api/users/$oldIdentifier/changeIdentifier/$newIdentifier
+
+Example: ``curl -H "X-Dataverse-key: $API_TOKEN" -X POST  "https://demo.dataverse.org/api/users/johnsmith/changeIdentifier/jsmith"``
+
+This action changes the identifier of user johnsmith to jsmith.
+
+Toggle Superuser Status
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Toggle the superuser status of a user.
+
+.. note:: This endpoint is deprecated as explained in :doc:`/api/changelog`. Please use the :ref:`set-superuser-status` endpoint instead.
+
+.. code-block:: bash
+
+  export SERVER_URL=http://localhost:8080
+  export USERNAME=jdoe
+  curl -X POST "$SERVER_URL/api/admin/superuser/$USERNAME"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -X POST "http://localhost:8080/api/admin/superuser/jdoe"
+
+.. _set-superuser-status:
+
+Set Superuser Status
+~~~~~~~~~~~~~~~~~~~~
+
+Specify the superuser status of a user with a boolean value (``true`` or ``false``).
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of ``export`` below.
+
+.. code-block:: bash
+
+  export SERVER_URL=http://localhost:8080
+  export USERNAME=jdoe
+  export IS_SUPERUSER=true
+  curl -X PUT "$SERVER_URL/api/admin/superuser/$USERNAME" -d "$IS_SUPERUSER"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -X PUT "http://localhost:8080/api/admin/superuser/jdoe" -d true
+
+.. _delete-a-user:
+
+Delete a User
+~~~~~~~~~~~~~
+
+Deletes an ``AuthenticatedUser`` whose ``identifier`` (without the ``@`` sign) is passed. ::
+
+    DELETE http://$SERVER/api/admin/authenticatedUsers/$identifier
+    
+Deletes an ``AuthenticatedUser`` whose ``id``  is passed. ::
+
+    DELETE http://$SERVER/api/admin/authenticatedUsers/id/$id
+    
+Note: If the user has performed certain actions such as creating or contributing to a Dataset or downloading a file they cannot be deleted. To see where in the database these actions are stored you can use the :ref:`show-user-traces-api` API. If a user cannot be deleted for this reason, you can choose to :ref:`deactivate a user<deactivate-a-user>`.
+
+.. _deactivate-a-user:
+
+Deactivate a User
+~~~~~~~~~~~~~~~~~
+
+Deactivates a user. A superuser API token is not required but the command will operate using the first superuser it finds.
+
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
+
+.. code-block:: bash
+
+  export SERVER_URL=http://localhost:8080
+  export USERNAME=jdoe
+
+  curl -X POST "$SERVER_URL/api/admin/authenticatedUsers/$USERNAME/deactivate"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -X POST "http://localhost:8080/api/admin/authenticatedUsers/jdoe/deactivate"
+
+The database ID of the user can be passed instead of the username.
+
+.. code-block:: bash
+
+  export SERVER_URL=http://localhost:8080
+  export USERID=42
+
+  curl -X POST "$SERVER_URL/api/admin/authenticatedUsers/id/$USERID/deactivate"
+
+Note: A primary purpose of most Dataverse installations is to serve an archive. In the archival space, there are best practices around the tracking of data access and the tracking of modifications to data and metadata. In support of these key workflows, a simple mechanism to delete users that have performed edit or access actions in the system is not provided. Providing a Deactivate User endpoint for users who have taken certain actions in the system alongside a Delete User endpoint to remove users that haven't taken certain actions in the system is by design.
+
+This is an irreversible action. There is no option to undeactivate a user.
 
-List user whose ``identifier`` (without the ``@`` sign) is passed::
+Deactivating a user with this endpoint will:
 
-    GET http://$SERVER/api/admin/authenticatedUsers/$identifier
+- Deactivate the user's ability to log in to the Dataverse installation. A message will be shown, stating that the account has been deactivated. The user will not able to create a new account with the same email address, ORCID, Shibboleth, or other login type.
+- Deactivate the user's ability to use the API
+- Remove the user's access from all Dataverse collections, datasets and files
+- Prevent a user from being assigned any roles
+- Cancel any pending file access requests generated by the user
+- Remove the user from all groups
+- No longer have notifications generated or sent by the Dataverse installation
+- Prevent the account from being converted into an OAuth or Shibboleth account.
+- Prevent the user from becoming a superuser.
 
-Sample output using "dataverseAdmin" as the ``identifier``::
+Deactivating a user with this endpoint will keep:
 
-    {
-      "authenticationProviderId": "builtin",
-      "persistentUserId": "dataverseAdmin",
-      "position": "Admin",
-      "id": 1,
-      "identifier": "@dataverseAdmin",
-      "displayName": "Dataverse Admin",
-      "firstName": "Dataverse",
-      "lastName": "Admin",
-      "email": "dataverse@mailinator.com",
-      "superuser": true,
-      "affiliation": "Dataverse.org"
-    }
+- The user's contributions to datasets, including dataset creation, file uploads, and publishing.
+- The user's access history to datafiles in the Dataverse installation, including guestbook records.
+- The user's account information (specifically name, email, affiliation, and position)
 
-Create an authenticateUser::
+.. _show-user-traces-api:
 
-    POST http://$SERVER/api/admin/authenticatedUsers
+Show User Traces
+~~~~~~~~~~~~~~~~
 
-POSTed JSON example::
+Show the traces that the user has left in the system, such as datasets created, guestbooks filled out, etc. This can be useful for understanding why a user cannot be deleted. A superuser API token is required.
 
-    {
-      "authenticationProviderId": "orcid",
-      "persistentUserId": "0000-0002-3283-0661",
-      "identifier": "@pete",
-      "firstName": "Pete K.",
-      "lastName": "Dataversky",
-      "email": "pete@mailinator.com"
-    }
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
-.. _merge-accounts-label:
+.. code-block:: bash
 
-Merge User Accounts
-~~~~~~~~~~~~~~~~~~~
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export USERNAME=jdoe
 
-If a user has created multiple accounts and has been performed actions under both accounts that need to be preserved, these accounts can be combined.  One account can be merged into another account and all data associated with both accounts will be combined in the surviving account. Only accessible to superusers.::
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/users/$USERNAME/traces"
 
-    POST https://$SERVER/api/users/$toMergeIdentifier/mergeIntoUser/$continuingIdentifier
+The fully expanded example above (without environment variables) looks like this:
 
-Example: ``curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://demo.dataverse.org/api/users/jsmith2/mergeIntoUser/jsmith``
+.. code-block:: bash
 
-This action moves account data from jsmith2 into the account jsmith and deletes the account of jsmith2.
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET "https://demo.dataverse.org/api/users/jdoe/traces"
 
-.. _change-identifier-label:
+Remove All Roles from a User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Change User Identifier
-~~~~~~~~~~~~~~~~~~~~~~
+Removes all roles from the user. This is equivalent of clicking the "Remove All Roles" button in the superuser dashboard. Note that you can preview the roles that will be removed with the :ref:`show-user-traces-api` API. A superuser API token is required.
 
-Changes identifier for user in ``AuthenticatedUser``, ``BuiltinUser``, ``AuthenticatedUserLookup`` & ``RoleAssignment``. Allows them to log in with the new identifier. Only accessible to superusers.::
+.. note:: See :ref:`curl-examples-and-environment-variables` if you are unfamiliar with the use of export below.
 
-    PUT http://$SERVER/api/users/$oldIdentifier/changeIdentifier/$newIdentifier
+.. code-block:: bash
 
-Example: ``curl -H "X-Dataverse-key: $API_TOKEN" -X POST  https://demo.dataverse.org/api/users/johnsmith/changeIdentifier/jsmith``
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export USERNAME=jdoe
 
-This action changes the identifier of user johnsmith to jsmith.
+  curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/users/$USERNAME/removeRoles"
 
-Make User a SuperUser
-~~~~~~~~~~~~~~~~~~~~~
+The fully expanded example above (without environment variables) looks like this:
 
-Toggles superuser mode on the ``AuthenticatedUser`` whose ``identifier`` (without the ``@`` sign) is passed. ::
+.. code-block:: bash
 
-    POST http://$SERVER/api/admin/superuser/$identifier
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X POST "http://localhost:8080/api/users/jdoe/removeRoles"
 
 List Role Assignments of a Role Assignee
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1582,14 +7265,46 @@ List all role assignments of a role assignee (i.e. a user or a group)::
 
 Note that ``identifier`` can contain slashes (e.g. ``&ip/localhost-users``).
 
-List Permissions a User Has on a Dataverse or Dataset
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+List Permissions a User Has on a Dataverse Collection or Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-List permissions a user (based on API Token used) has on a dataverse or dataset::
+List permissions a user (based on API Token used) has on a Dataverse collection or dataset::
 
     GET http://$SERVER/api/admin/permissions/$identifier
 
-The ``$identifier`` can be a dataverse alias or database id or a dataset persistent ID or database id.
+The ``$identifier`` can be a Dataverse collection alias or database id or a dataset persistent ID or database id.
+
+.. note:: Datasets can be selected using persistent identifiers. This is done by passing the constant ``:persistentId`` where the numeric id of the dataset is expected, and then passing the actual persistent id as a query parameter with the name ``persistentId``.
+
+Example: List permissions a user (based on API Token used) has on a dataset whose DOI is *10.5072/FK2/J8SJZB*:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/J8SJZB
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/permissions/:persistentId?persistentId=$PERSISTENT_IDENTIFIER"
+
+List Dataverse collections a user can act on based on their permissions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+List Dataverse collections a user can act on based on a particular permission ::
+
+    GET http://$SERVER/api/users/$identifier/allowedCollections/$permission
+
+.. note:: This API can only be called by an Administrator or by a User requesting their own list of accessible collections.
+
+The ``$identifier`` is the username of the requested user.
+The ``$permission`` is the permission (tied to the roles) that gives the user access to the collection.
+Passing ``$permission`` as 'any' will return the collection as long as the user has any access/permission on the collection
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export $USERNAME=jsmith
+  export PERMISSION=PublishDataverse
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/users/$USERNAME/allowedCollections/$PERMISSION"
 
 Show Role Assignee
 ~~~~~~~~~~~~~~~~~~
@@ -1600,26 +7315,68 @@ List a role assignee (i.e. a user or a group)::
 
 The ``$identifier`` should start with an ``@`` if it's a user. Groups start with ``&``. "Built in" users and groups start with ``:``. Private URL users start with ``#``.
 
+.. _saved-search:
+
 Saved Search
 ~~~~~~~~~~~~
 
-The Saved Search, Linked Dataverses, and Linked Datasets features shipped with Dataverse 4.0, but as a "`superuser-only <https://github.com/IQSS/dataverse/issues/90#issuecomment-86094663>`_" because they are **experimental** (see `#1364 <https://github.com/IQSS/dataverse/issues/1364>`_, `#1813 <https://github.com/IQSS/dataverse/issues/1813>`_, `#1840 <https://github.com/IQSS/dataverse/issues/1840>`_, `#1890 <https://github.com/IQSS/dataverse/issues/1890>`_, `#1939 <https://github.com/IQSS/dataverse/issues/1939>`_, `#2167 <https://github.com/IQSS/dataverse/issues/2167>`_, `#2186 <https://github.com/IQSS/dataverse/issues/2186>`_, `#2053 <https://github.com/IQSS/dataverse/issues/2053>`_, and `#2543 <https://github.com/IQSS/dataverse/issues/2543>`_). The following API endpoints were added to help people with access to the "admin" API make use of these features in their current form. Of particular interest should be the "makelinks" endpoint because it needs to be called periodically (via cron or similar) to find new dataverses and datasets that match the saved search and then link the search results to the dataverse in which the saved search is defined (`#2531 <https://github.com/IQSS/dataverse/issues/2531>`_ shows an example). There is a known issue (`#1364 <https://github.com/IQSS/dataverse/issues/1364>`_) that once a link to a dataverse or dataset is created, it cannot be removed (apart from database manipulation and reindexing) which is why a ``DELETE`` endpoint for saved searches is neither documented nor functional. The Linked Dataverses feature is `powered by Saved Search <https://github.com/IQSS/dataverse/issues/1852>`_ and therefore requires that the "makelinks" endpoint be executed on a periodic basis as well.
+The Saved Search, Linked Dataverses, and Linked Datasets features are only accessible to superusers except for linking a dataset. The following API endpoints were added to help people with access to the "admin" API make use of these features in their current form. Keep in mind that they are partially experimental.
+The update of all saved search is run by a timer once a week (See :ref:`saved-search-timer`) so if you just created a saved search, you can run manually the ``makelinks`` endpoint that will find new dataverses and datasets that match the saved search and then link the search results to the dataverse in which the saved search is defined.
+
+List All Saved Searches
+^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+
+  curl "$SERVER_URL/api/admin/savedsearches/list"
+
+List a Saved Search by Database ID
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
+
+  curl "$SERVER_URL/api/admin/savedsearches/$ID"
+
+Delete a Saved Search by Database ID
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The ``unlink=true`` query parameter unlinks all links (linked dataset or Dataverse collection) associated with the deleted saved search. Use of this parameter should be well considered as you cannot know if the links were created manually or by the saved search. After deleting a saved search with ``unlink=true``, we recommend running ``/makelinks/all`` just in case there was a dataset that was linked by another saved search. (Saved searches can link the same dataset.) Reindexing might be necessary as well.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
+
+  curl -X DELETE "$SERVER_URL/api/admin/savedsearches/$ID?unlink=true"
+
+Execute a Saved Search and Make Links
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Execute a saved search by database id and make links to Dataverse collections and datasets that are found. The JSON response indicates which Dataverse collections and datasets were newly linked versus already linked. The ``debug=true`` query parameter adds to the JSON response extra information about the saved search being executed (which you could also get by listing the saved search).
 
-List all saved searches. ::
+.. code-block:: bash
 
-  GET http://$SERVER/api/admin/savedsearches/list
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
 
-List a saved search by database id. ::
+  curl -X PUT "$SERVER_URL/api/admin/savedsearches/makelinks/$ID?debug=true"
 
-  GET http://$SERVER/api/admin/savedsearches/$id
+Execute All Saved Searches and Make Links
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Execute a saved search by database id and make links to dataverses and datasets that are found. The JSON response indicates which dataverses and datasets were newly linked versus already linked. The ``debug=true`` query parameter adds to the JSON response extra information about the saved search being executed (which you could also get by listing the saved search). ::
+Execute all saved searches and make links to Dataverse collections and datasets that are found. ``debug`` works as described above. This happens automatically with a timer. For details, see :ref:`saved-search-timer` in the Admin Guide.
 
-  PUT http://$SERVER/api/admin/savedsearches/makelinks/$id?debug=true
+.. code-block:: bash
 
-Execute all saved searches and make links to dataverses and datasets that are found. ``debug`` works as described above.  ::
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
 
-  PUT http://$SERVER/api/admin/savedsearches/makelinks/all?debug=true
+  curl -X PUT "$SERVER_URL/api/admin/savedsearches/makelinks/all?debug=true"
 
 Dataset Integrity
 ~~~~~~~~~~~~~~~~~
@@ -1633,14 +7390,53 @@ Datafile Integrity
 
 Recalculate the check sum value value of a datafile, by supplying the file's database id and an algorithm (Valid values for $ALGORITHM include MD5, SHA-1, SHA-256, and SHA-512)::
 
-   curl -H X-Dataverse-key:$API_TOKEN -X POST $SERVER_URL/api/admin/computeDataFileHashValue/{fileId}/algorithm/$ALGORITHM
+   curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/admin/computeDataFileHashValue/{fileId}/algorithm/$ALGORITHM"
   
 Validate an existing check sum value against one newly calculated from the saved file:: 
 
-   curl -H X-Dataverse-key:$API_TOKEN -X POST $SERVER_URL/api/admin/validateDataFileHashValue/{fileId}
+   curl -H "X-Dataverse-key:$API_TOKEN" -X POST "$SERVER_URL/api/admin/validateDataFileHashValue/{fileId}"
+
+.. _dataset-files-validation-api:
+
+Physical Files Validation in a Dataset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following validates all the physical files in the dataset specified, by recalculating the checksums and comparing them against the values saved in the database::
+
+  $SERVER_URL/api/admin/validate/dataset/files/{datasetId}
+
+It will report the specific files that have failed the validation. For example::
+   
+   curl "http://localhost:8080/api/admin/validate/dataset/files/:persistentId/?persistentId=doi:10.5072/FK2/XXXXX"
+     {"dataFiles": [
+     		  {"datafileId":2658,"storageIdentifier":"file://123-aaa","status":"valid"},
+		  {"datafileId":2659,"storageIdentifier":"file://123-bbb","status":"invalid","errorMessage":"Checksum mismatch for datafile id 2669"}, 
+		  {"datafileId":2659,"storageIdentifier":"file://123-ccc","status":"valid"}
+		  ]
+      }
   
 These are only available to super users.
 
+.. _UpdateChecksums:
+
+Update Checksums To Use New Algorithm
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The fixity algorithm used on existing files can be changed by a superuser using this API call. An optional query parameter (num) can be used to limit the number of updates attempted (i.e. to do processing in batches).
+The API call will only update the algorithm and checksum for a file if the existing checksum can be validated against the file.
+Statistics concerning the updates are returned in the response to the API call with details in the log.
+The primary use for this API call is to update existing files after the algorithm used when uploading new files is changes - see - :ref:`:FileFixityChecksumAlgorithm`.
+Allowed values are MD5, SHA-1, SHA-256, and SHA-512
+
+.. code-block:: bash
+
+  export ALG=SHA-256
+  export BATCHSIZE=1
+
+  curl "http://localhost:8080/api/admin/updateHashValues/$ALG"
+  curl "http://localhost:8080/api/admin/updateHashValues/$ALG?num=$BATCHSIZE"
+
+
 .. _dataset-validation-api:
 
 Dataset Validation
@@ -1648,7 +7444,7 @@ Dataset Validation
 
 Validate the dataset and its components (DatasetVersion, FileMetadatas, etc.) for constraint violations::
 
-  curl $SERVER_URL/api/admin/validate/dataset/{datasetId}
+  curl "$SERVER_URL/api/admin/validate/dataset/{datasetId}"
 
 if validation fails, will report the specific database entity and the offending value. For example::
    
@@ -1656,9 +7452,9 @@ if validation fails, will report the specific database entity and the offending
 
 If the optional argument ``variables=true`` is specified, the API will also validate the metadata associated with any tabular data files found in the dataset specified. (For example: an invalid or empty variable name). 
 
-Validate all the datasets in the Dataverse, report any constraint violations found::
+Validate all the datasets in the Dataverse installation, report any constraint violations found::
 
-  curl $SERVER_URL/api/admin/validate/datasets
+  curl "$SERVER_URL/api/admin/validate/datasets"
 
 If the optional argument ``variables=true`` is specified, the API will also validate the metadata associated with any tabular data files. (For example: an invalid or empty variable name). Note that validating all the tabular metadata may significantly increase the run time of the full validation pass. 
 
@@ -1675,11 +7471,75 @@ This API streams its output in real time, i.e. it will start producing the outpu
 		  ]
       }
 
-Note that if you are attempting to validate a very large number of datasets in your Dataverse, this API may time out - subject to the timeout limit set in your Glassfish configuration. If this is a production Dataverse instance serving large amounts of data, you most likely have that timeout set to some high value already. But if you need to increase it, it can be done with the asadmin command. For example::
+Note that if you are attempting to validate a very large number of datasets in your Dataverse installation, this API may time out - subject to the timeout limit set in your app server configuration. If this is a production Dataverse installation serving large amounts of data, you most likely have that timeout set to some high value already. But if you need to increase it, it can be done with the asadmin command. For example::
  
      asadmin set server-config.network-config.protocols.protocol.http-listener-1.http.request-timeout-seconds=3600
 
+Datafile Audit
+~~~~~~~~~~~~~~
 
+Produce an audit report of missing files and FileMetadata for Datasets.
+Scans the Datasets in the database and verifies that the stored files exist. If the files are missing or if the FileMetadata is missing, this information is returned in a JSON response.
+The call will return a status code of 200 if the report was generated successfully.  Issues found will be documented in the report and will not return a failure status code unless the report could not be generated::
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/datafiles/auditFiles"
+
+Optional Parameters are available for filtering the Datasets scanned.
+
+For auditing the Datasets in a paged manner (firstId and lastId)::
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
+
+Auditing specific Datasets (comma separated list)::
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/datafiles/auditFiles?datasetIdentifierList=doi:10.5072/FK2/JXYBJS,doi:10.7910/DVN/MPU019"
+
+Sample JSON Audit Response::
+
+     {
+       "status": "OK",
+       "data": {
+          "firstId": 0,
+          "lastId": 100,
+          "datasetIdentifierList": [
+              "doi:10.5072/FK2/XXXXXX",
+              "doi:10.5072/FK2/JXYBJS",
+              "doi:10.7910/DVN/MPU019"
+          ],
+          "datasetsChecked": 100,
+          "datasets": [
+               {
+                  "id": 6,
+                  "pid": "doi:10.5072/FK2/JXYBJS",
+                  "persistentURL": "https://doi.org/10.5072/FK2/JXYBJS",
+                  "missingFileMetadata": [
+                    {
+                       "storageIdentifier": "local://1930cce4f2d-855ccc51fcbb",
+                       "dataFileId": "7"
+                    }
+                  ]
+              },
+              {
+                  "id": 47731,
+                  "pid": "doi:10.5072/FK2/MPU019",
+                  "persistentURL": "https://doi.org/10.7910/DVN/MPU019",
+                  "missingFiles": [
+                    {
+                       "storageIdentifier": "s3://dvn-cloud:298910",
+                       "directoryLabel": "trees",
+                       "label": "trees.png"
+                    }
+                  ]
+                }
+          ],
+          "failures": [
+              {
+                "datasetIdentifier": "doi:10.5072/FK2/XXXXXX",
+                "reason": "Not Found"
+              }
+          ]
+       }
+     }
 
 Workflows
 ~~~~~~~~~
@@ -1719,7 +7579,7 @@ Unset the default workflow for ``triggerType``. After this call, dataset release
 
   DELETE http://$SERVER/api/admin/workflows/default/$triggerType
 
-Set the whitelist of IP addresses separated by a semicolon (``;``) allowed to resume workflows. Request body is a list of IP addresses allowed to send "resume workflow" messages to this Dataverse instance::
+Set the whitelist of IP addresses separated by a semicolon (``;``) allowed to resume workflows. Request body is a list of IP addresses allowed to send "resume workflow" messages to this Dataverse installation::
 
   PUT http://$SERVER/api/admin/workflows/ip-whitelist
 
@@ -1748,13 +7608,264 @@ Clear a specific metric cache. Currently this must match the name of the row in
         CORS
       </span>
 
-Inherit Dataverse Role Assignments
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Inherit Dataverse Collection Role Assignments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Recursively applies the role assignments of the specified dataverse, for the roles specified by the ``:InheritParentRoleAssignments`` setting, to all dataverses contained within it:: 
+Recursively applies the role assignments of the specified Dataverse collection, for the roles specified by the ``:InheritParentRoleAssignments`` setting, to all Dataverse collections contained within it:: 
 
   GET http://$SERVER/api/admin/dataverse/{dataverse alias}/addRoleAssignmentsToChildren
   
-Note: setting ``:InheritParentRoleAssignments`` will automatically trigger inheritance of the parent dataverse's role assignments for a newly created dataverse. Hence this API call is intended as a way to update existing child dataverses or to update children after a change in role assignments has been made on a parent dataverse.
+Note: setting ``:InheritParentRoleAssignments`` will automatically trigger inheritance of the parent Dataverse collection's role assignments for a newly created Dataverse collection. Hence this API call is intended as a way to update existing child Dataverse collections or to update children after a change in role assignments has been made on a parent Dataverse collection.
+
+.. _license-management-api:
+
+Manage Available Standard License Terms
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For more context about configuring licenses, see :ref:`license-config` in the Installation Guide.
+
+View the list of standard license terms that can be selected for a dataset:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  curl "$SERVER_URL/api/licenses"
+
+View the details of the standard license with the database ID specified in ``$ID``:
+
+.. code-block:: bash
+
+  export ID=1
+  curl "$SERVER_URL/api/licenses/$ID"
+
+
+Superusers can add a new license by posting a JSON file adapted from this example :download:`add-license.json <../_static/api/add-license.json>`. The ``name`` and ``uri`` of the new license must be unique. Sort order field is mandatory. If you are interested in adding a Creative Commons license, you are encouarged to use the JSON files under :ref:`adding-creative-commons-licenses`:
+
+Licenses must have a "name" and "uri" and may have the following optional fields: "shortDescription", "iconUri", "rightsIdentifier", "rightsIdentifierScheme", "schemeUri", "languageCode", "active", "sortOrder".
+The "name" and "uri" are used to display the license in the user interface, with "shortDescription" and "iconUri" being used to enhance the display if available.
+The "rightsIdentifier", "rightsIdentifierScheme", and "schemeUri" should be added if the license is available from https://spdx.org . "languageCode" should be sent if the language is not in English ("en"). "active" is a boolean indicating whether the license should be shown to users as an option. "sortOrder" is a numeric value - licenses are shown in the relative numeric order of this value.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  curl -X POST -H 'Content-Type: application/json' -H "X-Dataverse-key:$API_TOKEN" --upload-file add-license.json "$SERVER_URL/api/licenses"
+
+Superusers can change whether an existing license is active (usable for new dataset versions) or inactive (only allowed on already-published versions) specified by the license ``$ID``:
+
+.. code-block:: bash
+
+  export STATE=true
+  curl -X PUT -H 'Content-Type: application/json' -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/licenses/$ID/:active/$STATE"
+
+Superusers may change the default license by specifying the license ``$ID``:
+
+.. code-block:: bash
+
+  curl -X PUT -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/licenses/default/$ID"
+
+Superusers can delete a license, provided it is not in use, by the license ``$ID``:
+
+.. code-block:: bash
+
+  curl -X DELETE -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/licenses/$ID"
+
+Superusers can change the sorting order of a license specified by the license ``$ID``:
+
+.. code-block:: bash
+
+  export SORT_ORDER=100
+  curl -X PUT -H 'Content-Type: application/json' -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/licenses/$ID/:sortOrder/$SORT_ORDER"
+  
+List Dataset Templates
+~~~~~~~~~~~~~~~~~~~~~~
+
+List all templates in the system. ::
+
+    GET http://$SERVER/api/admin/templates
+    
+List templates in a given dataverse by the dataverse's alias or id. ::
+
+    GET http://$SERVER/api/admin/templates/{alias or id}
+
+    
+Delete Dataset Template
+~~~~~~~~~~~~~~~~~~~~~~~
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=24
+
+  curl -X DELETE "$SERVER_URL/api/admin/template/$ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -X DELETE "https://demo.dataverse.org/api/admin/template/24"
+
+.. _api-native-signed-url:
+  
+Request Signed URL
+~~~~~~~~~~~~~~~~~~
+
+Dataverse has the ability to create signed URLs for it's API calls.
+A signature, which is valid only for the specific API call and only for a specified duration, allows the call to proceed with the authentication of the specified user.
+It is intended as an alternative to the use of an API key (which is valid for a long time period and can be used with any API call).
+Signed URLs were developed to support External Tools but may be useful in other scenarios where Dataverse or a third-party tool needs to delegate limited access to another user or tool. 
+This API call allows a Dataverse superUser to generate a signed URL for such scenarios.
+The JSON input parameter required is an object with the following keys:
+
+- ``url`` - the exact URL to sign, including api version number and all query parameters
+- ``timeOut`` - how long in minutes the signature should be valid for, default is 10 minutes
+- ``httpMethod`` - which HTTP method is required, default is GET
+- ``user`` - the user identifier for the account associated with this signature, the default is the superuser making the call. The API call will succeed/fail based on whether the specified user has the required permissions. 
+
+A curl example using allowing access to a dataset's metadata
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export API_KEY=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export JSON='{"url":"https://demo.dataverse.org/api/v1/datasets/:persistentId/?persistentId=doi:10.5072/FK2/J8SJZB","timeOut":5,"user":"alberteinstein"}'
+
+  curl -H "X-Dataverse-key:$API_KEY" -H 'Content-Type:application/json' -d "$JSON" "$SERVER_URL/api/admin/requestSignedUrl"
+
+Please see :ref:`dataverse.api.signature-secret` for the configuration option to add a shared secret, enabling extra
+security.
+
+.. _send-feedback-admin:
+
+Send Feedback To Contact(s) Admin API
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This API call allows sending an email to the contacts for a collection, dataset, or datafile or to the support email address when no object is specified.
+The call is protected by the normal /admin API protections (limited to localhost or requiring a separate key), but does not otherwise limit the sending of emails.
+Administrators should be sure only trusted applications have access to avoid the potential for spam.
+
+The call is a POST with a JSON object as input with four keys:
+- "targetId" - the id of the collection, dataset, or datafile. Persistent ids and collection aliases are not supported. (Optional)
+- "subject" - the email subject line
+- "body" - the email body to send
+- "fromEmail" - the email to list in the reply-to field. (Dataverse always sends mail from the system email, but does it "on behalf of" and with a reply-to for the specified user.)
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export SERVER_URL=http://localhost
+  export JSON='{"targetId":24, "subject":"Data Question", "body":"Please help me understand your data. Thank you!", "fromEmail":"dataverseSupport@mailinator.com"}'
+
+  curl -X POST -H 'Content-Type:application/json' -d "$JSON" "$SERVER_URL/api/admin/feedback"
+
+Note that this call could be useful in coordinating with dataset authors (assuming they are also contacts) as an alternative/addition to the functionality provided by :ref:`return-a-dataset`.
+
+.. _send-feedback:
+
+Send Feedback To Contact(s)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This API call allows sending an email to the contacts for a collection, dataset, or datafile or to the support email address when no object is specified.
+The call is protected from embedded html in the body as well as the ability to configure body size limits and rate limiting to avoid the potential for spam.
+
+The call is a POST with a JSON object as input with four keys:
+- "targetId" - the id of the collection, dataset, or datafile. Persistent ids and collection aliases are not supported. (Optional)
+- "identifier" - the alias of a collection or the persistence id of a dataset or datafile. (Optional)
+- "subject" - the email subject line. (Required)
+- "body" - the email body to send (Required)
+- "fromEmail" - the email to list in the reply-to field. (Dataverse always sends mail from the system email, but does it "on behalf of" and with a reply-to for the specified user. Authenticated users will have the 'fromEmail' filled in from their profile if this field is not specified)
+
+A curl example using an ``ID``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export JSON='{"targetId":24, "subject":"Data Question", "body":"Please help me understand your data. Thank you!"}'
+
+  curl -X POST -H "X-Dataverse-key:$API_KEY" -H 'Content-Type:application/json' -d "$JSON" "$SERVER_URL/api/sendfeedback"
+
+
+A curl example using a ``Dataverse Alias or Dataset/DataFile PersistentId``
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export JSON='{"identifier":"root", "subject":"Data Question", "body":"Please help me understand your data. Thank you!"}'
+
+  curl -X POST -H "X-Dataverse-key:$API_KEY" -H 'Content-Type:application/json' -d "$JSON" "$SERVER_URL/api/sendfeedback"
+
+Note that this call could be useful in coordinating with dataset authors (assuming they are also contacts) as an alternative/addition to the functionality provided by :ref:`return-a-dataset`.
+
+.. _thumbnail_reset:
+
+Reset Thumbnail Failure Flags
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If Dataverse attempts to create a thumbnail image for an image or PDF file and the attempt fails, Dataverse will set a flag for the file to avoid repeated attempts to generate the thumbnail.
+For cases where the problem may have been temporary (or fixed in a later Dataverse release), the API calls below can be used to reset this flag for all files or for a given file.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export FILE_ID=1234
+
+  curl -X DELETE $SERVER_URL/api/admin/clearThumbnailFailureFlag
+  
+  curl -X DELETE $SERVER_URL/api/admin/clearThumbnailFailureFlag/$FILE_ID
+
+.. _download-file-from-tmp:
+
+Download File from /tmp
+~~~~~~~~~~~~~~~~~~~~~~~
+
+As a superuser::
+
+    GET /api/admin/downloadTmpFile?fullyQualifiedPathToFile=/tmp/foo.txt
+
+Note that this API is probably only useful for testing.
+
+.. _api-mydata:
+
+MyData
+------
+
+The MyData API is used to get a list of just the datasets, dataverses or datafiles an authenticated user can edit.
+
+The API excludes dataverses linked to an harvesting client. This results in `a known issue <https://github.com/IQSS/dataverse/issues/11083>`_ where regular datasets in harvesting dataverses are missing from the results.
+
+A curl example listing objects
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ROLE_IDS=6
+  export DVOBJECT_TYPES=Dataset
+  export PUBLISHED_STATES=Unpublished
+  export PER_PAGE=10
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/mydata/retrieve?role_ids=$ROLE_IDS&dvobject_types=$DVOBJECT_TYPES&published_states=$PUBLISHED_STATES&per_page=$PER_PAGE"
+
+Parameters:
+
+``role_id`` Roles are customizable. Standard roles include:
+
+- ``1`` = Admin
+- ``2`` = File Downloader
+- ``3`` = Dataverse + Dataset Creator
+- ``4`` = Dataverse Creator
+- ``5`` = Dataset Creator
+- ``6`` = Contributor
+- ``7`` = Curator
+- ``8`` = Member
+
+``dvobject_types`` Type of object, several possible values among: ``DataFile`` , ``Dataset`` & ``Dataverse`` .
+
+``published_states`` State of the object, several possible values among:``Published`` , ``Unpublished`` , ``Draft`` , ``Deaccessioned`` & ``In+Review`` .
 
+``per_page`` Number of results returned per page.
 
diff --git a/doc/sphinx-guides/source/api/search.rst b/doc/sphinx-guides/source/api/search.rst
index fdca7074261..9e69df86d16 100755
--- a/doc/sphinx-guides/source/api/search.rst
+++ b/doc/sphinx-guides/source/api/search.rst
@@ -4,9 +4,9 @@ Search API
 .. contents:: |toctitle|
     :local:
 
-The Search API supports the same searching, sorting, and faceting operations as the Dataverse web interface.
+The Search API supports the same searching, sorting, and faceting operations as the Dataverse Software's web interface.
 
-Unlike the web interface, this new API is limited to *published* data.
+To search unpublished content, you must pass in an API token as described in the :doc:`auth` section.
 
 The parameters and JSON response are partly inspired by the `GitHub Search API <https://developer.github.com/v3/search/>`_.
 
@@ -15,18 +15,18 @@ The parameters and JSON response are partly inspired by the `GitHub Search API <
 .. _CORS: https://www.w3.org/TR/cors/
 
 
-Please note that in Dataverse 4.3 and older the "citation" field wrapped the persistent ID URL in an ``<a>`` tag but this has been changed to plaintext. If you want the old value with HTML in it, a new field called "citationHtml" can be used.
+Please note that in Dataverse Software 4.3 and older the "citation" field wrapped the persistent ID URL in an ``<a>`` tag but this has been changed to plaintext. If you want the old value with HTML in it, a new field called "citationHtml" can be used.
 
 
 Parameters
 ----------
 
-===============  =======  ===========
+================ =======  ===========
 Name             Type     Description
-===============  =======  ===========
+================ =======  ===========
 q                string   The search term or terms. Using "title:data" will search only the "title" field. "*" can be used as a wildcard either alone or adjacent to a term (i.e. "bird*"). For example, https://demo.dataverse.org/api/search?q=title:data . For a list of fields to search, please see https://github.com/IQSS/dataverse/issues/2558 (for now).
 type             string   Can be either "dataverse", "dataset", or "file". Multiple "type" parameters can be used to include multiple types (i.e. ``type=dataset&type=file``). If omitted, all types will be returned.  For example, https://demo.dataverse.org/api/search?q=*&type=dataset
-subtree          string   The identifier of the dataverse to which the search should be narrowed. The subtree of this dataverse and all its children will be searched.  Multiple "subtree" parameters can be used to include multiple Dataverses. For example, https://demo.dataverse.org/api/search?q=data&subtree=birds&subtree=cats .
+subtree          string   The identifier of the Dataverse collection to which the search should be narrowed. The subtree of this Dataverse collection and all its children will be searched.  Multiple "subtree" parameters can be used to include multiple Dataverse collections. For example, https://demo.dataverse.org/api/search?q=data&subtree=birds&subtree=cats .
 sort             string   The sort field. Supported values include "name" and "date". See example under "order".
 order            string   The order in which to sort. Can either be "asc" or "desc".  For example, https://demo.dataverse.org/api/search?q=data&sort=name&order=asc
 per_page         int      The number of results to return per request. The default is 10. The max is 1000. See :ref:`iteration example <iteration-example>`.
@@ -35,8 +35,15 @@ show_relevance   boolean  Whether or not to show details of which fields were ma
 show_facets      boolean  Whether or not to show facets that can be operated on by the "fq" parameter. False by default. See :ref:`advanced search example <advancedsearch-example>`.
 fq               string   A filter query on the search term. Multiple "fq" parameters can be used. See :ref:`advanced search example <advancedsearch-example>`.
 show_entity_ids  boolean  Whether or not to show the database IDs of the search results (for developer use).
-query_entities   boolean  Whether entities are queried via direct database calls (for developer use).
-===============  =======  ===========
+show_api_urls    boolean  Whether or not to show API URLs for the search results
+query_entities   boolean  Whether to query entities for extra metadata (slower). Default is true.
+metadata_fields  string   Includes the requested fields for each dataset in the response. Multiple "metadata_fields" parameters can be used to include several fields. The value must be in the form "{metadata_block_name}:{field_name}" to include a specific field from a metadata block (see :ref:`example <dynamic-citation-some>`) or "{metadata_field_set_name}:\*" to include all the fields for a metadata block (see :ref:`example <dynamic-citation-all>`). "{field_name}" cannot be a subfield of a compound field. If "{field_name}" is a compound field, all subfields are included.
+geo_point        string   Latitude and longitude in the form ``geo_point=42.3,-71.1``. You must supply ``geo_radius`` as well. See also :ref:`geospatial-search`.
+geo_radius       string   Radial distance in kilometers from ``geo_point`` (which must be supplied as well) such as ``geo_radius=1.5``.
+show_type_counts boolean  Whether or not to include total_count_per_object_type for types: Dataverse, Dataset, and Files.
+show_collections boolean  Whether or not to include a list of Dataverse collections for each dataset search result.
+search_service   string   The name of the search service to use for this query. If omitted, the default search service will be used. For available search services, see :ref:`discovering-available-search-services`.
+================ =======  ===========
 
 Basic Search Example
 --------------------
@@ -49,7 +56,7 @@ https://demo.dataverse.org/api/search?q=trees
         "status":"OK",
         "data":{
             "q":"trees",
-            "total_count":4,
+            "total_count":5,
             "start":0,
             "spelling_alternatives":{
                 "trees":"[tree]"
@@ -59,25 +66,37 @@ https://demo.dataverse.org/api/search?q=trees
                     "name":"Trees",
                     "type":"dataverse",
                     "url":"https://demo.dataverse.org/dataverse/trees",
-                    "image_url":"https://demo.dataverse.org/api/access/dvCardImage/7",
+                    "image_url":"https://demo.dataverse.org/api/access/dvCardImage/1",
                     "identifier":"trees",
                     "description":"A tree dataverse with some birds",
-                    "published_at":"2016-05-10T12:53:38Z"
+                    "published_at":"2016-05-10T12:53:38Z",
+                    "publicationStatuses": [
+                        "Published"
+                    ],
+                    "affiliation": "Dataverse.org",
+                    "parentDataverseName": "Root",
+                    "parentDataverseIdentifier": "root"
                 },
                 {
                     "name":"Chestnut Trees",
                     "type":"dataverse",
                     "url":"https://demo.dataverse.org/dataverse/chestnuttrees",
-                    "image_url":"https://demo.dataverse.org/api/access/dvCardImage/9",
+                    "image_url":"https://demo.dataverse.org/api/access/dvCardImage/2",
                     "identifier":"chestnuttrees",
                     "description":"A dataverse with chestnut trees and an oriole",
-                    "published_at":"2016-05-10T12:52:38Z"
+                    "published_at":"2016-05-10T12:52:38Z",
+                    "publicationStatuses": [
+                        "Published"
+                    ],
+                    "affiliation": "Dataverse.org",
+                    "parentDataverseName": "Root",
+                    "parentDataverseIdentifier": "root"
                 },
                 {
                     "name":"trees.png",
                     "type":"file",
                     "url":"https://demo.dataverse.org/api/access/datafile/12",
-                    "image_url":"https://demo.dataverse.org/api/access/fileCardImage/12",
+                    "image_url":"https://demo.dataverse.org/api/access/datafile/12?imageThumb=true",
                     "file_id":"12",
                     "description":"",
                     "published_at":"2016-05-10T12:53:39Z",
@@ -89,30 +108,87 @@ https://demo.dataverse.org/api/search?q=trees
                     "dataset_name": "Dataset One",
                     "dataset_id": "32",
                     "dataset_persistent_id": "doi:10.5072/FK2/XTT5BV",
-                    "dataset_citation":"Spruce, Sabrina, 2016, \"Spruce Goose\", http://dx.doi.org/10.5072/FK2/XTT5BV, Root Dataverse, V1"
+                    "dataset_citation":"Spruce, Sabrina, 2016, \"Spruce Goose\", http://dx.doi.org/10.5072/FK2/XTT5BV, Root Dataverse, V1",
+                    "publicationStatuses": [
+                        "Published"
+                    ],
+                    "releaseOrCreateDate": "2016-05-10T12:53:39Z"
                 },
                 {
                     "name":"Birds",
                     "type":"dataverse",
                     "url":"https://demo.dataverse.org/dataverse/birds",
-                    "image_url":"https://demo.dataverse.org/api/access/dvCardImage/2",
+                    "image_url":"https://demo.dataverse.org/api/access/dvCardImage/3",
                     "identifier":"birds",
-                    "description":"A bird dataverse with some trees",
-                    "published_at":"2016-05-10T12:57:27Z"
-                }
+                    "description":"A bird Dataverse collection with some trees",
+                    "published_at":"2016-05-10T12:57:27Z",
+                    "publicationStatuses": [
+                        "Published"
+                    ],
+                    "affiliation": "Dataverse.org",
+                    "parentDataverseName": "Root",
+                    "parentDataverseIdentifier": "root"
+                },
+                {  
+                    "name":"Darwin's Finches",
+                    "type":"dataset",
+                    "url":"https://doi.org/10.70122/FK2/MB5VGR",
+                    "global_id":"doi:10.70122/FK2/MB5VGR",
+                    "description":"Darwin's finches (also known as the GalÃƒÂĄpagos finches) are a group of about fifteen species of passerine birds.",
+                    "published_at":"2019-12-11T15:26:10Z",
+                    "publisher":"dvbe69f5e1",
+                    "citationHtml":"Finch, Fiona; Spruce, Sabrina; Poe, Edgar Allen; Mulligan, Hercules, 2019, \"Darwin's Finches\", <a href=\"https://doi.org/10.70122/FK2/MB5VGR\" target=\"_blank\">https://doi.org/10.70122/FK2/MB5VGR</a>, Root, V3",
+                    "identifier_of_dataverse":"dvbe69f5e1",
+                    "name_of_dataverse":"dvbe69f5e1",
+                    "citation":"Finch, Fiona; Spruce, Sabrina; Poe, Edgar Allen; Mulligan, Hercules, 2019, \"Darwin's Finches\", https://doi.org/10.70122/FK2/MB5VGR, Root, V3",
+                    "publicationStatuses": [
+                        "Published"
+                    ],
+                    "storageIdentifier":"file://10.70122/FK2/MB5VGR",
+                    "subjects":[  
+                       "Astronomy and Astrophysics",
+                       "Other"
+                    ],
+                    "fileCount":3,
+                    "versionId":1260,
+                    "versionState":"RELEASED",
+                    "majorVersion":3,
+                    "minorVersion":0,
+                    "createdAt":"2019-09-20T18:08:29Z",
+                    "updatedAt":"2019-12-11T15:26:10Z",
+                    "contacts":[  
+                       {  
+                          "name":"Finch, Fiona",
+                          "affiliation":""
+                       }
+                    ],
+                    "producers":[  
+                       "Allen, Irwin",
+                       "Spielberg, Stephen"
+                    ],
+                    "authors":[  
+                       "Finch, Fiona",
+                       "Spruce, Sabrina",
+                       "Poe, Edgar Allen",
+                       "Mulligan, Hercules"
+                    ]
+                 }
             ],
-            "count_in_response":4
+            "count_in_response":5
         }
     }
 
 .. _advancedsearch-example:
 
-Advanced Search Example
------------------------
+Advanced Search Examples
+------------------------
+
+Narrowed to Collection, Show Relevance and Facets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 https://demo.dataverse.org/api/search?q=finch&show_relevance=true&show_facets=true&fq=publicationDate:2016&subtree=birds
 
-In this example, ``show_relevance=true`` matches per field are shown. Available facets are shown with ``show_facets=true`` and of the facets is being used with ``fq=publicationDate:2016``. The search is being narrowed to the dataverse with the identifier "birds" with the parameter ``subtree=birds``.
+In this example, ``show_relevance=true`` matches per field are shown. Available facets are shown with ``show_facets=true`` and of the facets is being used with ``fq=publicationDate:2016``. The search is being narrowed to the Dataverse collection with the identifier "birds" with the parameter ``subtree=birds``.
 
 .. code-block:: json
 
@@ -129,15 +205,15 @@ In this example, ``show_relevance=true`` matches per field are shown. Available
                     "name":"Finches",
                     "type":"dataverse",
                     "url":"https://demo.dataverse.org/dataverse/finches",
-                    "image_url":"https://demo.dataverse.org/api/access/dvCardImage/3",
+                    "image_url":"https://demo.dataverse.org/api/access/dvCardImage/2",
                     "identifier":"finches",
-                    "description":"A dataverse with finches",
+                    "description":"A Dataverse collection with finches",
                     "published_at":"2016-05-10T12:57:38Z",
                     "matches":[
                         {
                             "description":{
                                 "snippets":[
-                                    "A dataverse with <span class=\"search-term-match\">finches</span>"
+                                    "A Dataverse collection with <span class=\"search-term-match\">finches</span>"
                                 ]
                             }
                         },
@@ -161,6 +237,9 @@ In this example, ``show_relevance=true`` matches per field are shown. Available
                     "published_at":"2016-05-10T12:57:45Z",
                     "citationHtml":"Finch, Fiona, 2016, \"Darwin's Finches\", <a href=\"http://dx.doi.org/10.5072/FK2/G2VPE7\" target=\"_blank\">http://dx.doi.org/10.5072/FK2/G2VPE7</a>, Root Dataverse, V1",
                     "citation":"Finch, Fiona, 2016, \"Darwin's Finches\", http://dx.doi.org/10.5072/FK2/G2VPE7, Root Dataverse, V1",
+                    "publicationStatuses": [
+                        "Published"
+                    ],
                     "matches":[
                         {
                             "authorName":{
@@ -222,12 +301,425 @@ In this example, ``show_relevance=true`` matches per field are shown. Available
         }
     }
 
+Retrieve Released Versions Only
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+https://demo.dataverse.org/api/search?q=finch&fq=publicationStatus:Published&type=dataset
+
+The above example ``fq=publicationStatus:Published`` retrieves only "RELEASED" versions of datasets. The same could be done to retrieve "DRAFT" versions, ``fq=publicationStatus:Draft``
+
+.. code-block:: json
+
+    {
+        "status": "OK",
+        "data": {
+            "q": "finch",
+            "total_count": 2,
+            "start": 0,
+            "spelling_alternatives": {},
+            "items": [
+                {
+                    "name": "Darwin's Finches",
+                    "type": "dataset",
+                    "url": "https://doi.org/10.70122/FK2/GUAS41",
+                    "global_id": "doi:10.70122/FK2/GUAS41",
+                    "description": "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.",
+                    "published_at": "2019-12-24T08:05:02Z",
+                    "publisher": "mdmizanur rahman Dataverse collection",
+                    "citationHtml": "Finch, Fiona, 2019, \"Darwin's Finches\", <a href=\"https://doi.org/10.70122/FK2/GUAS41\" target=\"_blank\">https://doi.org/10.70122/FK2/GUAS41</a>, Demo Dataverse, V1",
+                    "identifier_of_dataverse": "rahman",
+                    "name_of_dataverse": "mdmizanur rahman Dataverse collection",
+                    "citation": "Finch, Fiona, 2019, \"Darwin's Finches\", https://doi.org/10.70122/FK2/GUAS41, Demo Dataverse, V1",
+                    "publicationStatuses": [
+                        "Published"
+                    ],
+                    "storageIdentifier": "file://10.70122/FK2/GUAS41",
+                    "subjects": [
+                        "Medicine, Health and Life Sciences"
+                    ],
+                    "fileCount":6,
+                    "versionId": 53001,
+                    "versionState": "RELEASED",
+                    "majorVersion": 1,
+                    "minorVersion": 0,
+                    "createdAt": "2019-12-05T09:18:30Z",
+                    "updatedAt": "2019-12-24T08:38:00Z",
+                    "contacts": [
+                        {
+                            "name": "Finch, Fiona",
+                            "affiliation": ""
+                        }
+                    ],
+                    "authors": [
+                        "Finch, Fiona"
+                    ]
+                },
+                {
+                    "name": "Darwin's Finches",
+                    "type": "dataset",
+                    "url": "https://doi.org/10.70122/FK2/7ZXYRH",
+                    "global_id": "doi:10.70122/FK2/7ZXYRH",
+                    "description": "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.",
+                    "published_at": "2020-01-22T21:47:34Z",
+                    "publisher": "Demo Dataverse",
+                    "citationHtml": "Finch, Fiona, 2020, \"Darwin's Finches\", <a href=\"https://doi.org/10.70122/FK2/7ZXYRH\" target=\"_blank\">https://doi.org/10.70122/FK2/7ZXYRH</a>, Demo Dataverse, V1",
+                    "identifier_of_dataverse": "demo",
+                    "name_of_dataverse": "Demo Dataverse",
+                    "citation": "Finch, Fiona, 2020, \"Darwin's Finches\", https://doi.org/10.70122/FK2/7ZXYRH, Demo Dataverse, V1",
+                    "publicationStatuses": [
+                        "Published"
+                    ],
+                    "storageIdentifier": "file://10.70122/FK2/7ZXYRH",
+                    "subjects": [
+                        "Medicine, Health and Life Sciences"
+                    ],
+                    "fileCount":9,
+                    "versionId": 53444,
+                    "versionState": "RELEASED",
+                    "majorVersion": 1,
+                    "minorVersion": 0,
+                    "createdAt": "2020-01-22T21:23:43Z",
+                    "updatedAt": "2020-01-22T21:47:34Z",
+                    "contacts": [
+                        {
+                            "name": "Finch, Fiona",
+                            "affiliation": ""
+                        }
+                    ],
+                    "authors": [
+                        "Finch, Fiona"
+                    ]
+                }
+            ],
+            "count_in_response": 2
+        }
+    }
+    
+.. _dynamic-citation-all:
+
+Include Metadata Blocks and/or Metadata Fields
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+https://demo.dataverse.org/api/search?q=\*&type=dataset&metadata_fields=citation:\*
+
+The above example ``metadata_fields=citation:*`` returns under "metadataBlocks" all fields from the "citation" metadata block.
+
+..  code-block:: json
+
+    {
+        "status": "OK",
+        "data": {
+            "q": "*",
+            "total_count": 4,
+            "start": 0,
+            "spelling_alternatives": {},
+            "items": [
+                {
+                    "name": "JDD avec GeoJson 2021-07-13T10:23:46.409Z",
+                    "type": "dataset",
+                    "url": "https://doi.org/10.5072/FK2/GIWCKB",
+                    "global_id": "doi:10.5072/FK2/GIWCKB",
+                    "description": "DÊmo sprint 5. Cette couche reprÊsente l'emprise des cimetières sur le territoire des MÊtropole. Ces pÊrimètres d'emprise des cimetières sont issus du recensement des informations des PLU/POS de chaque commune de la mÊtropole, des donnÊes du cadastre DGFiP et d'un inventaire terrain du Service Planification et Études Urbaines de MÊtropole",
+                    "publisher": "Sample Data",
+                    "citationHtml": "Rennes M&eacute;tropole, 2021, \"JDD avec GeoJson 2021-07-13T10:23:46.409Z\", <a href=\"https://doi.org/10.5072/FK2/GIWCKB\" target=\"_blank\">https://doi.org/10.5072/FK2/GIWCKB</a>, Root, DRAFT VERSION",
+                    "identifier_of_dataverse": "Sample_data",
+                    "name_of_dataverse": "Sample Data",
+                    "citation": "MÊtropole, 2021, \"JDD avec GeoJson 2021-07-13T10:23:46.409Z\", https://doi.org/10.5072/FK2/GIWCKB, Root, DRAFT VERSION",
+                    "publicationStatuses": [
+                        "Unpublished",
+                        "Draft"
+                    ],
+                    "storageIdentifier": "file://10.5072/FK2/GIWCKB",
+                    "subjects": [
+                        "Other"
+                    ],
+                    "fileCount": 0,
+                    "versionId": 9976,
+                    "versionState": "DRAFT",
+                    "createdAt": "2021-07-13T10:28:45Z",
+                    "updatedAt": "2021-07-13T10:28:45Z",
+                    "contacts": [
+                        {
+                            "name": "string",
+                            "affiliation": "string"
+                        }
+                    ],
+                    "metadataBlocks": {
+                        "citation": {
+                            "displayName": "Citation Metadata",
+                            "fields": [
+                                {
+                                    "typeName": "dsDescription",
+                                    "multiple": true,
+                                    "typeClass": "compound",
+                                    "value": [
+                                        {
+                                            "dsDescriptionValue": {
+                                                "typeName": "dsDescriptionValue",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "DÊmo sprint 5. Cette couche reprÊsente l'emprise des cimetières sur le territoire des MÊtropole. Ces pÊrimètres d'emprise des cimetières sont issus du recensement des informations des PLU/POS de chaque commune de la mÊtropole, des donnÊes du cadastre DGFiP et d'un inventaire terrain du Service Planification et Études Urbaines de MÊtropole"
+                                            },
+                                            "dsDescriptionDate": {
+                                                "typeName": "dsDescriptionDate",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "2021-07-13"
+                                            }
+                                        }
+                                    ]
+                                },
+                                {
+                                    "typeName": "author",
+                                    "multiple": true,
+                                    "typeClass": "compound",
+                                    "value": [
+                                        {
+                                            "authorName": {
+                                                "typeName": "authorName",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "MÊtropole"
+                                            },
+                                            "authorAffiliation": {
+                                                "typeName": "authorAffiliation",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "string"
+                                            }
+                                        }
+                                    ]
+                                },
+                                {
+                                    "typeName": "datasetContact",
+                                    "multiple": true,
+                                    "typeClass": "compound",
+                                    "value": [
+                                        {
+                                            "datasetContactName": {
+                                                "typeName": "datasetContactName",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "string"
+                                            },
+                                            "datasetContactAffiliation": {
+                                                "typeName": "datasetContactAffiliation",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "string"
+                                            },
+                                            "datasetContactEmail": {
+                                                "typeName": "datasetContactEmail",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "contact@Sample.fr"
+                                            }
+                                        }
+                                    ]
+                                },
+                                {
+                                    "typeName": "subject",
+                                    "multiple": true,
+                                    "typeClass": "controlledVocabulary",
+                                    "value": [
+                                        "Other"
+                                    ]
+                                },
+                                {
+                                    "typeName": "title",
+                                    "multiple": false,
+                                    "typeClass": "primitive",
+                                    "value": "JDD avec GeoJson 2021-07-13T10:23:46.409Z"
+                                }
+                            ]
+                        }
+                    },
+                    "authors": [
+                        "MÊtropole"
+                    ]
+                },
+                {
+                    "name": "Raja Ampat Islands",
+                    "type": "dataset",
+                    "url": "https://doi.org/10.5072/FK2/ITNXGR",
+                    "global_id": "doi:10.5072/FK2/ITNXGR",
+                    "description": "Raja Ampat is located off the northwest tip of Bird's Head Peninsula on the island of New Guinea, in Indonesia's West Papua province, Raja Ampat, or the Four Kings, is an archipelago comprising over 1,500 small islands, cays, and shoals surrounding the four main islands of Misool, Salawati, Batanta, and Waigeo, and the smaller island of Kofiau. The Raja Ampat archipelago straddles the Equator and forms part of Coral Triangle which contains the richest marine biodiversity on earth. Administratively, the archipelago is part of the province of West Papua (formerly known as Irian Jaya). Most of the islands constitute the Raja Ampat Regency, which was separated out from Sorong Regency in 2004. The regency encompasses around 70,000 square kilometres (27,000 sq mi) of land and sea, and has a population of about 50,000 (as of 2017). (Wikipedia: https://en.wikipedia.org/wiki/Raja_Ampat_Islands)",
+                    "published_at": "2020-07-30T09:23:34Z",
+                    "publisher": "Root",
+                    "citationHtml": "Admin, Dataverse, 2020, \"Raja Ampat Islands\", <a href=\"https://doi.org/10.5072/FK2/ITNXGR\" target=\"_blank\">https://doi.org/10.5072/FK2/ITNXGR</a>, Root, V1",
+                    "identifier_of_dataverse": "root",
+                    "name_of_dataverse": "Root",
+                    "citation": "Admin, Dataverse, 2020, \"Raja Ampat Islands\", https://doi.org/10.5072/FK2/ITNXGR, Root, V1",
+                    "authors": [
+                        "Admin, Dataverse"
+                    ]
+                },
+                {
+                    "name": "Sample Test",
+                    "type": "dataverse",
+                    "url": "https://68b2d8bb37c6/dataverse/Sample_test",
+                    "identifier": "Sample_test",
+                    "description": "Dataverse utilisÊ pour les tests unitaires de Sample",
+                    "published_at": "2021-03-16T08:11:54Z"
+                },
+                {
+                    "name": "Sample Media Test",
+                    "type": "dataverse",
+                    "url": "https://68b2d8bb37c6/dataverse/Sample_media_test",
+                    "identifier": "Sample_media_test",
+                    "description": "Dataverse de test contenant les mÊdias de Sample, comme les images des fournisseurs et des producteurs",
+                    "published_at": "2021-04-08T15:04:14Z"
+                }
+            ],
+            "count_in_response": 4
+        }
+    }
+
+.. _dynamic-citation-some:
+
+Include Specific Fields Only
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+https://demo.dataverse.org/api/search?q=*&type=dataset&metadata_fields=citation:dsDescription&metadata_fields=citation:author
+
+The above example ``metadata_fields=citation:dsDescription&metadata_fields=citation:author`` returns under "metadataBlocks" only the compound fields "dsDescription" and "author" metadata fields from the "citation" metadata block.
+
+.. code-block:: json
+
+    {
+        "status": "OK",
+        "data": {
+            "q": "*",
+            "total_count": 4,
+            "start": 0,
+            "spelling_alternatives": {},
+            "items": [
+                {
+                    "name": "JDD avec GeoJson 2021-07-13T10:23:46.409Z",
+                    "type": "dataset",
+                    "url": "https://doi.org/10.5072/FK2/GIWCKB",
+                    "global_id": "doi:10.5072/FK2/GIWCKB",
+                    "description": "DÊmo sprint 5. Cette couche reprÊsente l'emprise des cimetières sur le territoire des MÊtropole. Ces pÊrimètres d'emprise des cimetières sont issus du recensement des informations des PLU/POS de chaque commune de la mÊtropole, des donnÊes du cadastre DGFiP et d'un inventaire terrain du Service Planification et Études Urbaines de MÊtropole",
+                    "publisher": "Sample Data",
+                    "citationHtml": "Rennes M&eacute;tropole, 2021, \"JDD avec GeoJson 2021-07-13T10:23:46.409Z\", <a href=\"https://doi.org/10.5072/FK2/GIWCKB\" target=\"_blank\">https://doi.org/10.5072/FK2/GIWCKB</a>, Root, DRAFT VERSION",
+                    "identifier_of_dataverse": "Sample_data",
+                    "name_of_dataverse": "Sample Data",
+                    "citation": "MÊtropole, 2021, \"JDD avec GeoJson 2021-07-13T10:23:46.409Z\", https://doi.org/10.5072/FK2/GIWCKB, Root, DRAFT VERSION",
+                    "storageIdentifier": "file://10.5072/FK2/GIWCKB",
+                    "subjects": [
+                        "Other"
+                    ],
+                    "fileCount": 0,
+                    "versionId": 9976,
+                    "versionState": "DRAFT",
+                    "createdAt": "2021-07-13T10:28:45Z",
+                    "updatedAt": "2021-07-13T10:28:45Z",
+                    "contacts": [
+                        {
+                            "name": "string",
+                            "affiliation": "string"
+                        }
+                    ],
+                    "metadataBlocks": {
+                        "citation": {
+                            "displayName": "Citation Metadata",
+                            "fields": [
+                                {
+                                    "typeName": "dsDescription",
+                                    "multiple": true,
+                                    "typeClass": "compound",
+                                    "value": [
+                                        {
+                                            "dsDescriptionValue": {
+                                                "typeName": "dsDescriptionValue",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "DÊmo sprint 5. Cette couche reprÊsente l'emprise des cimetières sur le territoire des MÊtropole. Ces pÊrimètres d'emprise des cimetières sont issus du recensement des informations des PLU/POS de chaque commune de la mÊtropole, des donnÊes du cadastre DGFiP et d'un inventaire terrain du Service Planification et Études Urbaines de MÊtropole"
+                                            },
+                                            "dsDescriptionDate": {
+                                                "typeName": "dsDescriptionDate",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "2021-07-13"
+                                            }
+                                        }
+                                    ]
+                                },
+                                {
+                                    "typeName": "author",
+                                    "multiple": true,
+                                    "typeClass": "compound",
+                                    "value": [
+                                        {
+                                            "authorName": {
+                                                "typeName": "authorName",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "MÊtropole"
+                                            },
+                                            "authorAffiliation": {
+                                                "typeName": "authorAffiliation",
+                                                "multiple": false,
+                                                "typeClass": "primitive",
+                                                "value": "string"
+                                            }
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    },
+                    "authors": [
+                        "MÊtropole"
+                    ]
+                },
+                {
+                    "name": "Raja Ampat Islands",
+                    "type": "dataset",
+                    "url": "https://doi.org/10.5072/FK2/ITNXGR",
+                    "global_id": "doi:10.5072/FK2/ITNXGR",
+                    "description": "Raja Ampat is located off the northwest tip of Bird's Head Peninsula on the island of New Guinea, in Indonesia's West Papua province, Raja Ampat, or the Four Kings, is an archipelago comprising over 1,500 small islands, cays, and shoals surrounding the four main islands of Misool, Salawati, Batanta, and Waigeo, and the smaller island of Kofiau. The Raja Ampat archipelago straddles the Equator and forms part of Coral Triangle which contains the richest marine biodiversity on earth. Administratively, the archipelago is part of the province of West Papua (formerly known as Irian Jaya). Most of the islands constitute the Raja Ampat Regency, which was separated out from Sorong Regency in 2004. The regency encompasses around 70,000 square kilometres (27,000 sq mi) of land and sea, and has a population of about 50,000 (as of 2017). (Wikipedia: https://en.wikipedia.org/wiki/Raja_Ampat_Islands)",
+                    "published_at": "2020-07-30T09:23:34Z",
+                    "publisher": "Root",
+                    "citationHtml": "Admin, Dataverse, 2020, \"Raja Ampat Islands\", <a href=\"https://doi.org/10.5072/FK2/ITNXGR\" target=\"_blank\">https://doi.org/10.5072/FK2/ITNXGR</a>, Root, V1",
+                    "identifier_of_dataverse": "root",
+                    "name_of_dataverse": "Root",
+                    "citation": "Admin, Dataverse, 2020, \"Raja Ampat Islands\", https://doi.org/10.5072/FK2/ITNXGR, Root, V1",
+                    "authors": [
+                        "Admin, Dataverse"
+                    ]
+                },
+                {
+                    "name": "Sample Media Test",
+                    "type": "dataverse",
+                    "url": "https://68b2d8bb37c6/dataverse/Sample_media_test",
+                    "identifier": "Sample_media_test",
+                    "description": "Dataverse de test contenant les mÊdias de Sample, comme les images des fournisseurs et des producteurs",
+                    "published_at": "2021-04-08T15:04:14Z"
+                },
+                {
+                    "name": "Sample Test",
+                    "type": "dataverse",
+                    "url": "https://68b2d8bb37c6/dataverse/Sample_test",
+                    "identifier": "Sample_test",
+                    "description": "Dataverse utilisÊ pour les tests unitaires de Sample",
+                    "published_at": "2021-03-16T08:11:54Z"
+                }
+            ],
+            "count_in_response": 4,
+            "total_count_per_object_type": {
+                "Datasets": 2,
+                "Dataverses": 2
+            }
+        }
+    }
+
 .. _search-date-range:
 
 Date Range Search Example
 -------------------------
 
-Below is an example of searching across a date range of dataverses, datasets, and files that were published in 2018.
+Below is an example of searching across a date range of Dataverse collections, datasets, and files that were published in 2018.
 
 `https://demo.dataverse.org/api/search?q=*&per_page=1000&sort=date&order=asc&q=*&fq=dateSort:[2018-01-01T00\:00\:00Z+TO+2019-01-01T00\:00\:00Z] <https://demo.dataverse.org/api/search?q=*&per_page=1000&sort=date&order=asc&q=*&fq=dateSort:[2018-01-01T00\:00\:00Z+TO+2019-01-01T00\:00\:00Z]>`_
 
@@ -287,3 +779,58 @@ Output from iteration example
       <span class="label label-success pull-right">
         CORS
       </span>
+
+.. _search-services:
+
+Search Services
+---------------
+
+.. _discovering-available-search-services:
+
+Discovering Available Search Services
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To discover available search services and their capabilities, you can use the Search Services API endpoint.
+Note: Configurable Search Services are an optional, experimental feature than may evolve faster than other parts of Dataverse.
+
+Example API endpoint: https://demo.dataverse.org/api/search/services
+
+This endpoint returns a list of available search services, including their names, and display names. It also indicates the default search service.
+
+Example response:
+
+.. code-block:: json
+
+    {
+        "status": "OK",
+        "data": {
+         "services": [
+            {
+                "name": "solr",
+                "displayName": "Solr Search",
+            },
+            {
+                "name": "externalSearch",
+                "displayName": "External Search for Datasets",
+            }
+        ],
+        "defaultService": "solr"
+    }
+
+You can use the ``name`` values returned by this endpoint in the ``search_service`` parameter of the main search API to specify which search service to use for a particular query.
+
+Using Different Search Services
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To use a specific search service, include the ``search_service`` parameter in your search query and pass the ``name``. For example:
+
+https://demo.dataverse.org/api/search?q=trees&search_service=externalSearch
+
+This query will use the ``externalSearch`` service (assuming it exists) instead of the default search service (``solr``).
+
+.. note:: Other search services may not be complete replacements for the included ``solr`` service. For example, they may not support searching for collections or files (just datasets).
+
+Developing Search Services
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+See :doc:`/developers/search-services` in the Developer Guide.
diff --git a/doc/sphinx-guides/source/api/sword-atom-entry.xml b/doc/sphinx-guides/source/api/sword-atom-entry.xml
index d47a3dd4f56..8d73653e93e 100755
--- a/doc/sphinx-guides/source/api/sword-atom-entry.xml
+++ b/doc/sphinx-guides/source/api/sword-atom-entry.xml
@@ -27,8 +27,8 @@
    <dcterms:coverage>United States</dcterms:coverage>
    <dcterms:coverage>Canada</dcterms:coverage>
    <!-- license and restrictions -->
-   <dcterms:license>NONE</dcterms:license>
-   <dcterms:rights>Downloader will not use the Materials in any way prohibited by applicable laws.</dcterms:rights>
+   <dcterms:license>CC0 1.0</dcterms:license>
+   <!--<dcterms:rights>Downloader will not use the Materials in any way prohibited by applicable laws.</dcterms:rights>-->
    <!-- related publications -->
    <dcterms:isReferencedBy holdingsURI="http://dx.doi.org/10.1038/dvn333" agency="DOI" IDNo="10.1038/dvn333">Peets, J., &amp; Stumptown, J. (2013). Roasting at Home. New England Journal of Coffee, 3(1), 22-34.</dcterms:isReferencedBy>
 </entry>
diff --git a/doc/sphinx-guides/source/api/sword.rst b/doc/sphinx-guides/source/api/sword.rst
index f031f78f822..51391784bde 100755
--- a/doc/sphinx-guides/source/api/sword.rst
+++ b/doc/sphinx-guides/source/api/sword.rst
@@ -1,7 +1,7 @@
 SWORD API
 =========
 
-SWORD_ stands for "Simple Web-service Offering Repository Deposit" and is a "profile" of AtomPub (`RFC 5023`_) which is a RESTful API that allows non-Dataverse software to deposit files and metadata into a Dataverse installation. :ref:`client-libraries` are available in Python, Javascript, Java, R, Ruby, and PHP.
+SWORD_ stands for "Simple Web-service Offering Repository Deposit" and is a "profile" of AtomPub (`RFC 5023`_) which is a RESTful API that allows non-Dataverse Software to deposit files and metadata into a Dataverse installation. :ref:`client-libraries` are available in Python, Javascript, Java, R, Ruby, and PHP.
 
 .. contents:: |toctitle|
     :local:
@@ -9,19 +9,42 @@ SWORD_ stands for "Simple Web-service Offering Repository Deposit" and is a "pro
 About
 -----
 
-Introduced in Dataverse Network (DVN) `3.6 <http://guides.dataverse.org/en/3.6.2/dataverse-api-main.html#data-deposit-api>`_, the SWORD API was formerly known as the "Data Deposit API" and ``data-deposit/v1`` appeared in the URLs. For backwards compatibility these URLs continue to work (with deprecation warnings). Due to architectural changes and security improvements (especially the introduction of API tokens) in Dataverse 4.0, a few backward incompatible changes were necessarily introduced and for this reason the version has been increased to ``v1.1``. For details, see :ref:`incompatible`.
+Introduced in Dataverse Network (DVN) `3.6 <https://guides.dataverse.org/en/3.6.2/dataverse-api-main.html#data-deposit-api>`_, the SWORD API was formerly known as the "Data Deposit API" and ``data-deposit/v1`` appeared in the URLs. For backwards compatibility these URLs continue to work (with deprecation warnings). Due to architectural changes and security improvements (especially the introduction of API tokens) in Dataverse Software 4.0, a few backward incompatible changes were necessarily introduced and for this reason the version has been increased to ``v1.1``. For details, see :ref:`incompatible`.
 
-Dataverse implements most of SWORDv2_, which is specified at http://swordapp.github.io/SWORDv2-Profile/SWORDProfile.html . Please reference the `SWORDv2 specification`_ for expected HTTP status codes (i.e. 201, 204, 404, etc.), headers (i.e. "Location"), etc.
+The Dataverse Software implements most of SWORDv2_, which is specified at https://swordapp.github.io/SWORDv2-Profile/SWORDProfile.html . Please reference the `SWORDv2 specification`_ for expected HTTP status codes (i.e. 201, 204, 404, etc.), headers (i.e. "Location"), etc.
 
-As a profile of AtomPub, XML is used throughout SWORD. As of Dataverse 4.0 datasets can also be created via JSON using the "native" API. SWORD is limited to the dozen or so fields listed below in the crosswalk, but the native API allows you to populate all metadata fields available in Dataverse.
+As a profile of AtomPub, XML is used throughout SWORD. As of Dataverse Software 4.0 datasets can also be created via JSON using the "native" API. SWORD is limited to the dozen or so fields listed below in the crosswalk, but the native API allows you to populate all metadata fields available in a Dataverse installation.
 
-.. _SWORD: http://en.wikipedia.org/wiki/SWORD_%28protocol%29
+.. _SWORD: https://en.wikipedia.org/wiki/SWORD_%28protocol%29
 
 .. _SWORDv2: http://swordapp.org/sword-v2/sword-v2-specifications/
 
 .. _RFC 5023: https://tools.ietf.org/html/rfc5023
 
-.. _SWORDv2 specification: http://swordapp.github.io/SWORDv2-Profile/SWORDProfile.html
+.. _SWORDv2 specification: https://swordapp.github.io/SWORDv2-Profile/SWORDProfile.html
+
+.. _sword-auth:
+
+Authentication for SWORD
+------------------------
+
+The :doc:`/api/auth` section describes how to pass API tokens for the "native" API (as a header or query parameter) but SWORD uses a different mechanism known as HTTP Basic Authentication (`RFC 7617`_).
+
+HTTP Basic Authentication commonly makes use of both a username and a password but the SWORD API uses only a username that is populated with the user's API token. The password should be blank or empty.
+
+Clients such as ``curl`` expect both a username and a password separated by a colon. With ``curl``, the way to indicate that the password should be blank or empty is to include the colon at the end of the username (the API token) like this:
+
+.. code-block:: bash
+
+  curl -u 54b143b5-d001-4254-afc0-a1c0f6a5b5a7:
+
+All the curl examples below take this form but instead of showing an API token like above, a Bash environment variable called ``$API_TOKEN`` is shown instead like this:
+
+.. code-block:: bash
+
+  curl -u $API_TOKEN:
+
+.. _RFC 7617: https://tools.ietf.org/html/rfc7617
 
 .. _incompatible:
 
@@ -30,38 +53,40 @@ Backward incompatible changes
 
 For better security than in DVN 3.x, usernames and passwords are no longer accepted. The use of an API token is required.
 
-Differences in Dataverse 4 from DVN 3.x lead to a few minor backward incompatible changes in the Dataverse implementation of SWORD, which are listed below. Old ``v1`` URLs should continue to work but the ``Service Document`` will contain a deprecation warning and responses will contain ``v1.1`` URLs. See also :ref:`known-issues`.
+Differences in Dataverse Software 4 from DVN 3.x lead to a few minor backward incompatible changes in the Dataverse Software implementation of SWORD, which are listed below. Old ``v1`` URLs should continue to work but the ``Service Document`` will contain a deprecation warning and responses will contain ``v1.1`` URLs. See also :ref:`known-issues`.
 
 - Newly required fields when creating/editing datasets for compliance with the `Joint Declaration for Data Citation principles <http://thedata.org/blog/joint-declaration-data-citation-principles-and-dataverse>`_.
 
-  - dcterms:creator (maps to authorName)
+  - ``dcterms:creator`` (maps to authorName)
 
-  - dcterms:description
+  - ``dcterms:description``
 
 - Deaccessioning is no longer supported. An alternative will be developed at https://github.com/IQSS/dataverse/issues/778
 
-- The Service Document will show a single API Terms of Use rather than root level and dataverse level Deposit Terms of Use.
+- The Service Document will show a single API Terms of Use rather than root level and Dataverse collection level Deposit Terms of Use.
+
+- As of Dataverse Software 5.10, ``NONE`` is no longer supported as a license.
 
 New features as of v1.1
 -----------------------
 
-- Dataverse 4 supports API tokens and requires them to be used for APIs instead of a username and password. In the ``curl`` examples below, you will see ``curl -u $API_TOKEN:`` showing that you should send your API token as the username and nothing as the password. For example, ``curl -u 54b143b5-d001-4254-afc0-a1c0f6a5b5a7:``.
+- The Dataverse Software supports API tokens and requires them to be used for APIs instead of a username and password. In the ``curl`` examples below, you will see ``curl -u $API_TOKEN:`` showing that you should send your API token as the username and nothing as the password. For example, ``curl -u 54b143b5-d001-4254-afc0-a1c0f6a5b5a7:``. See also :ref:`sword-auth`.
 
-- SWORD operations no longer require "admin" permission. In order to use any SWORD operation in DVN 3.x, you had to be an "admin" on a dataverse (the container for your dataset) and similar rules were applied in Dataverse 4.4 and earlier (the ``EditDataverse`` permission was required). The SWORD API has now been fully integrated with the Dataverse 4 permission model such that any action you have permission to perform in the GUI or "native" API you are able to perform via SWORD. This means that even a user with a "Contributor" role can operate on datasets via SWORD. Note that users with the "Contributor" role do not have the ``PublishDataset`` permission and will not be able publish their datasets via any mechanism, GUI or API.
+- SWORD operations no longer require "admin" permission. In order to use any SWORD operation in DVN 3.x, you had to be an "admin" on a Dataverse collection (the container for your dataset) and similar rules were applied in Dataverse Software 4.4 and earlier (the ``EditDataverse`` permission was required). The SWORD API has now been fully integrated with the Dataverse Software permission model such that any action you have permission to perform in the GUI or "native" API you are able to perform via SWORD. This means that even a user with a "Contributor" role can operate on datasets via SWORD. Note that users with the "Contributor" role do not have the ``PublishDataset`` permission and will not be able publish their datasets via any mechanism, GUI or API.
 
-- Dataverses can be published via SWORD.
+- Dataverse collections can be published via SWORD.
 
 - Datasets versions will only be increased to the next minor version (i.e. 1.1) rather than a major version (2.0) if possible. This depends on the nature of the change. Adding or removing a file, for example, requires a major version bump.
 
-- "Author Affiliation" can now be populated with an XML attribute. For example: <dcterms:creator affiliation="Coffee Bean State University">Stumptown, Jane</dcterms:creator>
+- "Author Affiliation" can now be populated with an XML attribute. For example: ``<dcterms:creator affiliation="Coffee Bean State University">Stumptown, Jane</dcterms:creator>``
 
-- "Contributor" can now be populated and the "Type" (Editor, Funder, Researcher, etc.) can be specified with an XML attribute. For example: <dcterms:contributor type="Funder">CaffeineForAll</dcterms:contributor>
+- "Contributor" can now be populated and the "Type" (Editor, Funder, Researcher, etc.) can be specified with an XML attribute. For example: ``<dcterms:contributor type="Funder">CaffeineForAll</dcterms:contributor>``
 
-- "License" can now be set with dcterms:license and the possible values are "CC0" and "NONE". "License" interacts with "Terms of Use" (dcterms:rights) in that if you include dcterms:rights in the XML, the license will be set to "NONE". If you don't include dcterms:rights, the license will default to "CC0". It is invalid to specify "CC0" as a license and also include dcterms:rights; an error will be returned. For backwards compatibility, dcterms:rights is allowed to be blank (i.e. <dcterms:rights></dcterms:rights>) but blank values will not be persisted to the database and the license will be set to "NONE".
+- "License" can now be set with ``dcterms:license`` and the possible values determined by the installation ("CC0 1.0" and "CC BY 4.0" by default). "License" interacts with "Terms of Use" (``dcterms:rights``) in that if you include ``dcterms:rights`` in the XML and don't include ``dcterms:license``, the license will be "Custom Dataset Terms" and "Terms of Use" will be populated. If you don't include ``dcterms:rights``, the default license will be used. It is invalid to specify a license and also include ``dcterms:rights``; an error will be returned. For backwards compatibility, ``dcterms:rights`` is allowed to be blank (i.e. ``<dcterms:rights></dcterms:rights>``) but blank values will not be persisted to the database and the license will be set to "Custom Dataset Terms". Note that if admins of an installation have disabled "Custom Dataset Terms" you will get an error if you try to pass ``dcterms:rights``.
 
 - "Contact E-mail" is automatically populated from dataset owner's email.
 
-- "Subject" uses our controlled vocabulary list of subjects. This list is in the Citation Metadata of our User Guide > `Metadata References <http://guides.dataverse.org/en/latest/user/appendix.html#metadata-references>`_. Otherwise, if a term does not match our controlled vocabulary list, it will put any subject terms in "Keyword". If Subject is empty it is automatically populated with "N/A".
+- "Subject" uses our controlled vocabulary list of subjects. This list is in the Citation Metadata of our User Guide > `Metadata References <https://guides.dataverse.org/en/latest/user/appendix.html#metadata-references>`_. Otherwise, if a term does not match our controlled vocabulary list, it will put any subject terms in "Keyword". If Subject is empty it is automatically populated with "N/A".
 
 - Zero-length files are now allowed (but not necessarily encouraged).
 
@@ -73,31 +98,36 @@ curl examples
 Retrieve SWORD service document
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The service document enumerates the dataverses ("collections" from a SWORD perspective) the user can deposit data into. The "collectionPolicy" element for each dataverse contains the Terms of Use. Any user with an API token can use this API endpoint. Institution-wide Shibboleth groups are not respected because membership in such a group can only be set via a browser.
+The service document enumerates the Dataverse collections (also "collections" from a SWORD perspective) the user can deposit data into. The "collectionPolicy" element for each Dataverse collections contains the Terms of Use. Any user with an API token can use this API endpoint. Institution-wide Shibboleth groups are not respected because membership in such a group can only be set via a browser.
+
+.. code-block:: bash
 
-``curl -u $API_TOKEN: https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/service-document``
+  curl -u $API_TOKEN: https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/service-document
 
 Create a dataset with an Atom entry
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To create a dataset, you must have the "Dataset Creator" role (the ``AddDataset`` permission) on a dataverse. Practically speaking, you should first retrieve the service document to list the dataverses into which you are authorized to deposit data.
+To create a dataset, you must have the "Dataset Creator" role (the ``AddDataset`` permission) on a Dataverse collection. Practically speaking, you should first retrieve the service document to list the Dataverse collections into which you are authorized to deposit data.
 
-``curl -u $API_TOKEN: --data-binary "@path/to/atom-entry-study.xml" -H "Content-Type: application/atom+xml" https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/collection/dataverse/$DATAVERSE_ALIAS``
+.. code-block:: bash
+
+  curl -u $API_TOKEN: --data-binary "@path/to/atom-entry-study.xml" -H "Content-Type: application/atom+xml" https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/collection/dataverse/$DATAVERSE_ALIAS
 
 Example Atom entry (XML)
 
 .. literalinclude:: sword-atom-entry.xml
+    :language: xml
 
-Dublin Core Terms (DC Terms) Qualified Mapping - Dataverse DB Element Crosswalk
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Dublin Core Terms (DC Terms) Qualified Mapping - Dataverse Project DB Element Crosswalk
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 +-----------------------------+----------------------------------------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|DC (terms: namespace)        |                Dataverse DB Element          |   Required   |                                                                     Note                                                                                    |
+|DC (terms: namespace)        |       Dataverse Software DB Element          |   Required   |                                                                     Note                                                                                    |
 +=============================+==============================================+==============+=============================================================================================================================================================+
 |dcterms:title                |                    title                     |       Y      |  Title of the Dataset.                                                                                                                                      |
 +-----------------------------+----------------------------------------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
 |dcterms:creator              |         authorName (LastName, FirstName)     |       Y      |  Author(s) for the Dataset.                                                                                                                                 |
 +-----------------------------+----------------------------------------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|dcterms:subject              |   subject (Controlled Vocabulary) OR keyword |       Y      |  Controlled Vocabulary list is in our User Guide > `Metadata References <http://guides.dataverse.org/en/latest/user/appendix.html#metadata-references>`_.   |                                                                                                                
+|dcterms:subject              |   subject (Controlled Vocabulary) OR keyword |       Y      |  Controlled Vocabulary list is in our User Guide > `Metadata References <https://guides.dataverse.org/en/latest/user/appendix.html#metadata-references>`_.  |                                                                                                                
 +-----------------------------+----------------------------------------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
 |dcterms:description          |              dsDescriptionValue              |       Y      |  Describing the purpose, scope or nature of the Dataset. Can also use dcterms:abstract.                                                                     |
 +-----------------------------+----------------------------------------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -115,26 +145,30 @@ Dublin Core Terms (DC Terms) Qualified Mapping - Dataverse DB Element Crosswalk
 +-----------------------------+----------------------------------------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
 |dcterms:coverage             |              otherGeographicCoverage         |              |  General information on the geographic coverage of the Dataset.                                                                                             |
 +-----------------------------+----------------------------------------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|dcterms:license              |                   license                    |              |  Set the license to CC0 (default in Dataverse for new Datasets), otherwise enter "NONE" and fill in the dcterms:rights field.                               |                
+|dcterms:license              |                   license                    |              |  Set the license. Alternatively, use the dcterms:rights field instead.                                                                                      |
 +-----------------------------+----------------------------------------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|dcterms:rights               |                 termsofuse                   |              |  If not using CC0, enter any terms of use or restrictions for the Dataset.                                                                                  |
+|dcterms:rights               |                 termsofuse                   |              |  If not using dcterms:license, enter any terms of use or restrictions for the Dataset.                                                                      |
 +-----------------------------+----------------------------------------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
 |dcterms:isReferencedBy       |             publicationCitation              |              |  The publication (journal article, book, other work) that uses this dataset (include citation, permanent identifier (DOI), and permanent URL).              |
 +-----------------------------+----------------------------------------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
-List datasets in a dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+List datasets in a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You must have permission to add datasets in a Dataverse collection (the Dataverse collection should appear in the service document) to list the datasets inside. Institution-wide Shibboleth groups are not respected because membership in such a group can only be set via a browser.
 
-You must have permission to add datasets in a dataverse (the dataverse should appear in the service document) to list the datasets inside. Institution-wide Shibboleth groups are not respected because membership in such a group can only be set via a browser.
+.. code-block:: bash
 
-``curl -u $API_TOKEN: https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/collection/dataverse/$DATAVERSE_ALIAS``
+  curl -u $API_TOKEN: https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/collection/dataverse/$DATAVERSE_ALIAS
 
 Add files to a dataset with a zip file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You must have ``EditDataset`` permission (Contributor role or above such as Curator or Admin) on the dataset to add files.
 
-``curl -u $API_TOKEN: --data-binary @path/to/example.zip -H "Content-Disposition: filename=example.zip" -H "Content-Type: application/zip" -H "Packaging: http://purl.org/net/sword/package/SimpleZip" https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit-media/study/doi:TEST/12345``
+.. code-block:: bash
+
+  curl -u $API_TOKEN: --data-binary @path/to/example.zip -H "Content-Disposition: filename=example.zip" -H "Content-Type: application/zip" -H "Packaging: http://purl.org/net/sword/package/SimpleZip" https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit-media/study/doi:TEST/12345
 
 Display a dataset atom entry
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -143,56 +177,72 @@ You must have ``ViewUnpublishedDataset`` permission (Contributor role or above s
 
 Contains data citation (bibliographicCitation), alternate URI (persistent URI of study), edit URI, edit media URI, statement URI.
 
-``curl -u $API_TOKEN: https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit/study/doi:TEST/12345``
+.. code-block:: bash
+  
+  curl -u $API_TOKEN: https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit/study/doi:TEST/12345
 
 Display a dataset statement
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Contains title, author, feed of file entries, latestVersionState, locked boolean, updated timestamp. You must have ``ViewUnpublishedDataset`` permission (Contributor role or above such as Curator or Admin) on the dataset to display the statement.
 
-``curl -u $API_TOKEN: https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/statement/study/doi:TEST/12345``
+.. code-block:: bash
+
+  curl -u $API_TOKEN: https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/statement/study/doi:TEST/12345
 
 Delete a file by database id
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You must have ``EditDataset`` permission (Contributor role or above such as Curator or Admin) on the dataset to delete files.
 
-``curl -u $API_TOKEN: -X DELETE https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit-media/file/123``
+.. code-block:: bash
+
+  curl -u $API_TOKEN: -X DELETE https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit-media/file/123
 
 Replacing metadata for a dataset
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Please note that **ALL** metadata (title, author, etc.) will be replaced, including fields that can not be expressed with "dcterms" fields. You must have ``EditDataset`` permission (Contributor role or above such as Curator or Admin) on the dataset to replace metadata.
 
-``curl -u $API_TOKEN: --upload-file "path/to/atom-entry-study2.xml" -H "Content-Type: application/atom+xml" https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit/study/doi:TEST/12345``
+.. code-block:: bash
+
+  curl -u $API_TOKEN: --upload-file "path/to/atom-entry-study2.xml" -H "Content-Type: application/atom+xml" https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit/study/doi:TEST/12345``
 
 Delete a dataset
 ~~~~~~~~~~~~~~~~
 
 You must have the ``DeleteDatasetDraft`` permission (Contributor role or above such as Curator or Admin) on the dataset to delete it. Please note that if the dataset has never been published you will be able to delete it completely but if the dataset has already been published you will only be able to delete post-publication drafts, never a published version.
 
-``curl -u $API_TOKEN: -i -X DELETE https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit/study/doi:TEST/12345``
+.. code-block:: bash
+
+  curl -u $API_TOKEN: -i -X DELETE https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit/study/doi:TEST/12345
+
+Determine if a Dataverse Collection has been published
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Determine if a dataverse has been published
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This API endpoint is the same as the "list datasets in a Dataverse collection" endpoint documented above and the same permissions apply but it is documented here separately to point out that you can look for a boolean called ``dataverseHasBeenReleased`` to know if a Dataverse collection has been released, which is required for publishing a dataset.
 
-This API endpoint is the same as the "list datasets in a dataverse" endpoint documented above and the same permissions apply but it is documented here separately to point out that you can look for a boolean called ``dataverseHasBeenReleased`` to know if a dataverse has been released, which is required for publishing a dataset.
+.. code-block:: bash
 
-``curl -u $API_TOKEN: https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/collection/dataverse/$DATAVERSE_ALIAS``
+  curl -u $API_TOKEN: https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/collection/dataverse/$DATAVERSE_ALIAS
 
-Publish a dataverse
-~~~~~~~~~~~~~~~~~~~
+Publish a Dataverse Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The ``cat /dev/null`` and ``--data-binary @-`` arguments are used to send zero-length content to the API, which is required by the upstream library to process the ``In-Progress: false`` header. You must have the ``PublishDataverse`` permission (Admin role) on the dataverse to publish it.
+The ``cat /dev/null`` and ``--data-binary @-`` arguments are used to send zero-length content to the API, which is required by the upstream library to process the ``In-Progress: false`` header. You must have the ``PublishDataverse`` permission (Admin role) on the Dataverse collection to publish it.
 
-``cat /dev/null | curl -u $API_TOKEN: -X POST -H "In-Progress: false" --data-binary @- https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit/dataverse/$DATAVERSE_ALIAS``
+.. code-block:: bash
+
+  cat /dev/null | curl -u $API_TOKEN: -X POST -H "In-Progress: false" --data-binary @- https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit/dataverse/$DATAVERSE_ALIAS
 
 Publish a dataset
 ~~~~~~~~~~~~~~~~~
 
 The ``cat /dev/null`` and ``--data-binary @-`` arguments are used to send zero-length content to the API, which is required by the upstream library to process the ``In-Progress: false`` header. You must have the ``PublishDataset`` permission (Curator or Admin role) on the dataset to publish it.
 
-``cat /dev/null | curl -u $API_TOKEN: -X POST -H "In-Progress: false" --data-binary @- https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit/study/doi:TEST/12345``
+.. code-block:: bash
+
+  cat /dev/null | curl -u $API_TOKEN: -X POST -H "In-Progress: false" --data-binary @- https://$HOSTNAME/dvn/api/data-deposit/v1.1/swordv2/edit/study/doi:TEST/12345
 
 .. _known-issues:
 
@@ -203,7 +253,7 @@ Known issues
 
 - The Service Document does not honor groups within groups: https://github.com/IQSS/dataverse/issues/3056
 
-- Should see all the fields filled in for a dataset regardless of what the parent dataverse specifies: https://github.com/IQSS/dataverse/issues/756
+- Should see all the fields filled in for a dataset regardless of what the parent Dataverse collection specifies: https://github.com/IQSS/dataverse/issues/756
 
 - SWORD 2.0 Profile 6.4 "Retrieving the content" has not been implemented: https://github.com/IQSS/dataverse/issues/183
 
@@ -230,4 +280,3 @@ Client libraries
 - R: https://github.com/IQSS/dataverse-client-r
 - Ruby: https://github.com/swordapp/sword2ruby
 - PHP: https://github.com/swordapp/swordappv2-php-library
-
diff --git a/doc/sphinx-guides/source/conf.py b/doc/sphinx-guides/source/conf.py
index b73d1fdc4ac..e67ed559e0c 100755
--- a/doc/sphinx-guides/source/conf.py
+++ b/doc/sphinx-guides/source/conf.py
@@ -15,6 +15,7 @@
 import sys
 import os
 from datetime import datetime
+import semver
 sys.path.insert(0, os.path.abspath('../../'))
 import sphinx_bootstrap_theme
 
@@ -38,10 +39,14 @@
 # ones.
 extensions = [
     'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
     'sphinx.ext.ifconfig',
     'sphinx.ext.viewcode',
-    'sphinx.ext.graphviz'
+    'sphinx.ext.graphviz',
+    'sphinxcontrib.icon',
+    'sphinxcontrib.jquery',
+    'myst_parser',
+    'sphinx_tabs.tabs',
+    'sphinx_substitution_extensions',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -65,13 +70,13 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.17'
+version = '6.7.1'
 # The full version, including alpha/beta/rc tags.
-release = '4.17'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+language = 'en'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -141,7 +146,7 @@
     #     ("Link", "http://example.com", True),
     # ],
     'navbar_links': [
-        ("View 3.6.2 Guides", "http://docs.dataverse.org/en/3.6.2/", True),
+        ("About Dataverse", "https://dataverse.org", True),
     ],
     
     # Global TOC depth for "site" navbar tab. (Default: 1)
@@ -222,11 +227,9 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['_static', '_static/fontcustom-preview.html']
 
-html_js_files = [
-    'js/jquery-3.4.1.min.js',
-]
+#html_js_files = []
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -241,6 +244,10 @@
 # typographically correct entities.
 #html_use_smartypants = True
 
+# Enable and customize the permanent headerlinks with a nice icon (chain symbol from FontAwesome)
+html_permalinks = True
+html_permalinks_icon = "<i class=\"fas fa-link\"></i>"
+
 # Custom sidebar templates, maps document names to template names.
 #html_sidebars = {}
 #html_sidebars = {'sidebar': ['localtoc.html', 'sourcelink.html', 'searchbox.html']}
@@ -427,12 +434,11 @@
 # If false, no index is generated.
 #epub_use_index = True
 
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
 # Suppress "WARNING: unknown mimetype for ..." https://github.com/IQSS/dataverse/issues/3391
 suppress_warnings = ['epub.unknown_project_files']
 rst_prolog = """
 .. |toctitle| replace:: Contents:
 .. |anotherSub| replace:: Yes, there can be multiple.
-"""
+.. |version| replace:: %s
+.. |nextVersion| replace:: %s
+""" % (version, "%s.%s" % semver.Version.parse(version, optional_minor_and_patch=True).bump_minor().to_tuple()[0:2] )
diff --git a/doc/sphinx-guides/source/container/app-image.rst b/doc/sphinx-guides/source/container/app-image.rst
new file mode 100644
index 00000000000..afffeae1c0b
--- /dev/null
+++ b/doc/sphinx-guides/source/container/app-image.rst
@@ -0,0 +1,256 @@
+Application Image
+=================
+
+The application image is a layer on top of the base image and contains the Dataverse software.
+
+.. contents:: |toctitle|
+    :local:
+
+An "application image" offers you a deployment ready Dataverse application running on the underlying
+application server, which is provided by the :doc:`base-image`. Its sole purpose is to bundle the application
+and any additional material necessary to successfully jumpstart the application.
+
+Until all :ref:`jvm-options` are *MicroProfile Config* enabled, it also adds the necessary scripting glue to
+configure the applications domain during booting the application server. See :ref:`app-tunables`.
+
+Within the main repository, you may find the application image's files at ``<git root>/src/main/docker``.
+This is the same Maven module providing a Dataverse WAR file for classic installations, and uses the
+`Maven Docker Plugin <https://dmp.fabric8.io>`_ to build and ship the image within a special Maven profile.
+
+**NOTE: This image is created, maintained and supported by the Dataverse community on a best-effort basis.**
+IQSS will not offer you support how to deploy or run it, please reach out to the community for help on using it.
+You might be interested in taking a look at :doc:`../developers/containers`, linking you to some (community-based)
+efforts.
+
+.. _app-image-supported-tags:
+
+Supported Image Tags
+++++++++++++++++++++
+
+This image is sourced from the main upstream code `repository of the Dataverse software <https://github.com/IQSS/dataverse>`_.
+Development and maintenance of the `image's code <https://github.com/IQSS/dataverse/tree/develop/src/main/docker>`_
+happens there (again, by the community).
+
+All supported images receive scheduled maintenance, executed every Sunday.
+New revisions are kept to a minimum, usually created when some dependency needs (security) updates.
+For the application images it correlates mostly to the :doc:`base image <base-image>` receiving updates.
+
+Our tagging is inspired by `Bitnami <https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html>`_ and we offer two categories of tags:
+
+- rolling: images change over time
+- immutable: images are fixed and never change
+
+In the tags below you'll see the term "flavor". This refers to flavor of Linux the container is built on. We use Ubuntu as the basis for our images and, for the time being, the only operating system flavors we use and support are ``noble`` (6.4+) and ``jammy`` (pre-6.4).
+
+You can find all the tags at https://hub.docker.com/r/gdcc/dataverse/tags
+
+Tags for Production Use
+^^^^^^^^^^^^^^^^^^^^^^^
+
+The images of the three latest releases of Dataverse will receive updates such as security patches for the underlying operating system.
+Content will be fairly stable as disruptive changes like Payara or Java upgrades will be handled in a new major or minor upgrade to Dataverse (a new ``<dv-major>.<dv-minor>`` tag).
+Expect disruptive changes in case of high risk security threats.
+
+- | **Latest**
+  | Definition: ``latest``
+  | Summary: Rolling tag, always pointing to the latest revision of the most current Dataverse release. In Dataverse 6.6 and lower, the equivalent was the ``alpha`` tag, which has been deleted.
+- | **Rolling Production**
+  | Definition: ``<dv-major>.<dv-minor>-<flavor>``
+  | Example: :substitution-code:`|version|-noble`
+  | Summary: Rolling tag, pointing to the latest revision of an immutable production image for released versions of Dataverse.
+- | **Immutable Production**
+  | Definition: ``<dv-major>.<dv-minor>-<flavor>-r<revision>``
+  | Example: :substitution-code:`|version|-noble-r1`
+  | Summary: An **immutable tag** where the revision is incremented for rebuilds of the image.
+  | This image should be especially attractive if you want explict control over when your images are updated.
+
+Tags for Development Use
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+All of the tags below are strongly recommended only for development purposes due to their fast-changing nature.
+In addition to updates due to PR merges, the most recent tags undergo scheduled maintenance to ensure timely security fixes.
+When a development cycle of Dataverse finishes (see :doc:`/developers/making-releases`), maintenance ceases for any of the tags below carrying version numbers.
+For now, stale images will be kept on Docker Hub indefinitely.
+
+- | **Unstable**
+  | Definition: ``unstable``
+  | Summary: Rolling tag, tracking the ``develop`` branch (see also :ref:`develop-branch`). (`Dockerfile <https://github.com/IQSS/dataverse/tree/develop/modules/container-base/src/main/docker/Dockerfile>`__)
+  | Please expect abrupt changes like new Payara or Java versions as well as OS updates or flavor switches when using this tag.
+- | **Upcoming**
+  | Definition: ``<dv-major>.<dv-minor-next>-<flavor>``
+  | Example: :substitution-code:`|nextVersion|-noble`
+  | Summary: Rolling tag, equivalent to ``unstable`` for current development cycle.
+    Will roll over to the rolling production tag after a Dataverse release.
+  | Discussion: Perhaps you are eager to starting testing features of an upcoming version (e.g. |nextVersion|) in a staging environment. You select the :substitution-code:`|nextVersion|-noble` tag (as opposed to ``unstable``) because you want to stay on |nextVersion| rather switching to the version **after that** when a release is made (which would happen if you had selected the ``unstable`` tag). Also, when the next release comes out (|nextVersion| in this example), you would stay on the :substitution-code:`|nextVersion|-noble` tag, which is the same tag that someone would use who wants the final release of |nextVersion|. (See "Rolling Production", above.)
+
+**NOTE**: In these tags for development usage, the version number will always be 1 minor version ahead of existing Dataverse releases.
+Example: Assume Dataverse ``6.x`` is released, ``6.(x+1)`` is underway.
+The rolling tag in use during the cycle will be ``6.(x+1)-FFF`` and ``6.(x+1)-FFF-p6.202P.P-jJJ``.
+See also: :doc:`/developers/making-releases`.
+
+
+Image Contents
+++++++++++++++
+
+The application image builds by convention upon the :doc:`base image <base-image>` and provides:
+
+- Dataverse class files
+- Resource files
+- Dependency JAR files
+- `JHove <http://jhove.openpreservation.org>`_ configuration
+- Script to configure the application server domain for :ref:`jvm-options` not yet *MicroProfile Config* enabled.
+
+The image is provided as a multi-arch image to support the most common architectures Dataverse usually runs on:
+AMD64 (Windows/Linux/...) and ARM64 (Apple M1/M2). (Easy to extend.)
+
+
+
+Build Instructions
+++++++++++++++++++
+
+Assuming you have `Docker <https://docs.docker.com/engine/install/>`_, `Docker Desktop <https://www.docker.com/products/docker-desktop/>`_,
+`Moby <https://mobyproject.org/>`_ or some remote Docker host configured, up and running from here on.
+
+Simply execute the Maven modules packaging target with activated "container" profile from the projects Git root to
+compile the Java code and build the image:
+
+``mvn -Pct clean package``
+
+Some additional notes, using Maven parameters to change the build and use ...:
+
+- | ... a different tag only: add ``-Dapp.image.tag=tag``.
+  | *Note:* default is ``unstable``
+- | ... a different image name and tag: add ``-Dapp.image=name:tag``.
+  | *Note:* default is ``gdcc/dataverse:${app.image.tag}``
+- ... a different image registry than Docker Hub: add ``-Ddocker.registry=registry.example.org`` (see also
+  `DMP docs on registries <https://dmp.fabric8.io/#registry>`__)
+- | ... a different base image tag: add ``-Dbase.image.tag=tag``
+  | *Note:* default is ``unstable``
+- | ... a different base image: add ``-Dbase.image=name:tag``
+  | *Note:* default is ``gdcc/base:${base.image.tag}``. See also :doc:`base-image` for more details on it.
+
+Automated Builds & Publishing
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+See note above at "Supported Image Tags".
+
+.. _app-multiarch:
+
+Processor Architecture and Multiarch
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This image is created as a "multi-arch image", supporting the most common architectures Dataverse usually runs on:
+AMD64 (Windows/Linux/...) and ARM64 (Apple M1/M2), by using `Maven Docker Plugin's BuildX mode <https://dmp.fabric8.io/#build-buildx>`_.
+
+Building the image via ``mvn -Pct package`` or ``mvn -Pct install`` as above will only build for the architecture of
+the Docker machine's CPU.
+
+Only ``mvn -Pct clean deploy -Ddocker.platforms=linux/amd64,linux/arm64`` will trigger building on all enabled architectures.
+Yet, to enable building with non-native code on your build machine, you will need to setup a cross-platform builder.
+
+On Linux, you should install `qemu-user-static <https://github.com/multiarch/qemu-user-static>`__ (preferably via
+your package management) on the host and run ``docker run --rm --privileged multiarch/qemu-user-static --reset -p yes``
+to enable that builder. The Docker plugin will setup everything else for you.
+
+
+
+.. _app-tunables:
+
+Tunables
+++++++++
+
+The :doc:`base-image` provides a long list of possible options to tune many aspects of the application server, and,
+as the application image builds upon it, :ref:`Base Image Tunables <base-tunables>` apply to it as well.
+
+In addition, the application image provides the following tunables:
+
+.. list-table::
+    :align: left
+    :width: 100
+    :widths: 10 10 10 50
+    :header-rows: 1
+
+    * - Env. variable
+      - Default
+      - Type
+      - Description
+    * - ``MP_CONFIG_PROFILE``
+      - ``ct``
+      - String
+      - Set to switch the activated *MicroProfile Config Profile*. Note that certain defaults will not apply any longer.
+        See :ref:`:ApplicationServerSettings` for details.
+    * - ``dataverse_*`` and ``doi_*``
+      - \-
+      - String
+      - Configure any :ref:`jvm-options` not yet *MicroProfile Config* enabled with this magic trick.
+
+        1. Simply pick a JVM option from the list and replace any ``.`` with ``_``.
+        2. Replace any ``-`` in the option name with ``__``.
+
+
+Note that the script ``init_2_configure.sh`` will apply a few very important defaults to enable quick usage
+by a) activating the scheduled tasks timer, b) add local file storage if not disabled, and c) a sensible password
+reset timeout:
+
+.. code-block:: shell
+
+    dataverse_auth_password__reset__timeout__in__minutes=60
+    dataverse_timerServer=true
+    dataverse_files_storage__driver__id=local
+
+    if dataverse_files_storage__driver__id = "local" then
+        dataverse_files_local_type=file
+        dataverse_files_local_label=Local
+        dataverse_files_local_directory=${STORAGE_DIR}/store
+
+
+
+.. _app-locations:
+
+Locations
++++++++++
+
+There are only a few important additions to the list of `locations by the base image <base-locations>`_.
+Please make sure to back these locations with volumes or tmpfs to avoid writing data into the overlay filesystem, which
+will significantly hurt performance.
+
+.. list-table::
+    :align: left
+    :width: 100
+    :widths: 10 10 50
+    :header-rows: 1
+
+    * - Location
+      - Value
+      - Description
+    * - ``${STORAGE_DIR}``
+      - ``/dv``
+      - Defined by base image. Either back this folder or, if suitable, the locations below it with volumes
+        or tmpfs.
+    * - ``${STORAGE_DIR}/uploads``
+      - ``/dv/uploads``
+      - See :ref:`dataverse.files.uploads` for a detailed description.
+    * - ``${STORAGE_DIR}/temp``
+      - ``/dv/temp``
+      - See :ref:`dataverse.files.directory` for a detailed description.
+    * - ``${STORAGE_DIR}/store``
+      - ``/dv/store``
+      - Important when using the default provided local storage option (see above and :ref:`storage-files-dir`)
+    * - ``/tmp``
+      - \-
+      - Location for temporary files, see also :ref:`temporary-file-storage`
+
+
+
+Exposed Ports
++++++++++++++
+
+See base image :ref:`exposed port <base-exposed-ports>`.
+
+
+
+Entry & Extension Points
+++++++++++++++++++++++++
+
+The application image makes use of the base image provided system to execute scripts on boot, see :ref:`base-entrypoint`.
+See there for potential extension of this image in your own derivative.
diff --git a/doc/sphinx-guides/source/container/base-image.rst b/doc/sphinx-guides/source/container/base-image.rst
new file mode 100644
index 00000000000..4adc6bb6fb1
--- /dev/null
+++ b/doc/sphinx-guides/source/container/base-image.rst
@@ -0,0 +1,445 @@
+Base Image
+==========
+
+The base image contains Payara and other dependencies that the Dataverse software runs on. It is the foundation for the :doc:`app-image`. Note that some dependencies, such as PostgreSQL and Solr, run in their own containers and are not part of the base image.
+
+.. contents:: |toctitle|
+    :local:
+
+A "base image" offers you a pre-installed and pre-tuned application server to deploy Dataverse software to.
+Adding basic functionality like executing scripts at container boot, monitoring, memory tweaks etc. is all done
+at this layer, to make the application image focus on the app itself.
+
+**NOTE: The base image does not contain the Dataverse application itself.**
+
+Within the main repository, you may find the base image's files at ``<git root>/modules/container-base``.
+This Maven module uses the `Maven Docker Plugin <https://dmp.fabric8.io>`_ to build and ship the image.
+You may use, extend, or alter this image to your liking and/or host in some different registry if you want to.
+
+**NOTE: This image is created, maintained and supported by the Dataverse community on a best-effort basis.**
+IQSS will not offer you support how to deploy or run it, please reach out to the community (:ref:`support`) for help on using it.
+You might be interested in taking a look at :doc:`../developers/containers`, linking you to some (community-based)
+efforts.
+
+.. _base-image-supported-tags:
+
+Supported Image Tags
+++++++++++++++++++++
+
+This image is sourced from the main upstream code `repository of the Dataverse software <https://github.com/IQSS/dataverse>`_.
+Development and maintenance of the `image's code <https://github.com/IQSS/dataverse/tree/develop/modules/container-base>`_
+happens there (again, by the community).
+
+All supported images receive scheduled maintenance, executed every Sunday.
+New revisions are kept to a minimum, usually created when some dependency needs (security) updates.
+(Examples: JRE patch releases, ImageMagick fixes, etc.)
+
+Our tagging is inspired by `Bitnami <https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html>`_ and we offer two categories of tags:
+
+- rolling: images change over time
+- immutable: images are fixed and never change
+
+In the tags below you'll see the term "flavor". This refers to flavor of Linux the container is built on. We use Ubuntu as the basis for our images and, for the time being, the only operating system flavors we use and support are ``noble`` (6.4+) and ``jammy`` (pre-6.4).
+
+You can find all the tags at https://hub.docker.com/r/gdcc/base/tags
+
+Tags for Production Use
+^^^^^^^^^^^^^^^^^^^^^^^
+
+The images of the three latest releases of the Dataverse project will receive updates such as security patches for the underlying operating system.
+Content will be fairly stable as disruptive changes like Payara or Java upgrades will be handled in a new major or minor upgrade to Dataverse (a new ``<dv-major>.<dv-minor>`` tag).
+Expect disruptive changes in case of high risk security threats.
+
+- | **Latest**
+  | Definition: ``latest``
+  | Summary: Rolling tag, always pointing to the latest revision of the most current Dataverse release.
+- | **Rolling Production**
+  | Definition: ``<dv-major>.<dv-minor>-<flavor>``
+  | Example: :substitution-code:`|version|-noble`
+  | Summary: Rolling tag, pointing to the latest revision of an immutable production image for released versions of Dataverse.
+- | **Immutable Production**
+  | Definition: ``<dv-major>.<dv-minor>-<flavor>-r<revision>``
+  | Example: :substitution-code:`|version|-noble-r1`
+  | Summary: An **immutable tag** where the revision is incremented for rebuilds of the image.
+  | This image should be especially attractive if you want explict control over when your images are updated.
+
+Tags for Development Use
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+All of the tags below are strongly recommended for development purposes only due to their fast changing nature.
+In addition to updates due to PR merges, the most recent are undergoing scheduled maintenance to ensure timely security fixes.
+When a development cycle of the Dataverse project finishes, maintenance ceases for any tags carrying version numbers.
+For now, stale images will be kept on Docker Hub indefinitely.
+
+- | **Unstable**
+  | Definition: ``unstable``
+  | Summary: Rolling tag, tracking the ``develop`` branch (see also :ref:`develop-branch`). (`Dockerfile <https://github.com/IQSS/dataverse/tree/develop/modules/container-base/src/main/docker/Dockerfile>`__)
+  | Please expect abrupt changes like new Payara or Java versions as well as OS updates or flavor switches when using this tag.
+- | **Upcoming**
+  | Definition: ``<dv-major>.<dv-minor-next>-<flavor>``
+  | Example: :substitution-code:`|nextVersion|-noble`
+  | Summary: Rolling tag, equivalent to ``unstable`` for current development cycle.
+    Will roll over to the rolling production tag after a Dataverse release.
+- | **Flexible Stack**
+  | Definition: ``<dv-major>.<dv-minor-next>-<flavor>-p<payara.version>-j<java.version>``
+  | Example: :substitution-code:`|nextVersion|-noble-p6.2025.3-j17`
+  | Summary: Rolling tag during a development cycle of the Dataverse software (`Dockerfile <https://github.com/IQSS/dataverse/tree/develop/modules/container-base/src/main/docker/Dockerfile>`__).
+
+**NOTE**: In these tags for development usage, the version number will always be 1 minor version ahead of existing Dataverse releases.
+Example: Assume Dataverse ``6.x`` is released, ``6.(x+1)`` is underway.
+The rolling tag in use during the cycle will be ``6.(x+1)-FFF`` and ``6.(x+1)-FFF-p6.202P.P-jJJ``.
+See also: :doc:`/developers/making-releases`.
+
+Image Contents
+++++++++++++++
+
+The base image provides:
+
+- `Eclipse Temurin JRE using Java 17 <https://adoptium.net/temurin/releases?version=17>`_
+- `Payara Community Application Server <https://docs.payara.fish/community>`_
+- CLI tools necessary to run Dataverse (i. e. ``curl`` or ``jq`` - see also :doc:`../installation/prerequisites` in Installation Guide)
+- Linux tools for analysis, monitoring and so on
+- `Jattach <https://github.com/apangin/jattach>`__ (attach to running JVM)
+- `wait4x <https://github.com/atkrad/wait4x>`__ (tool to "wait for" a service to be available)
+- `dumb-init <https://github.com/Yelp/dumb-init>`__ (see :ref:`below <base-entrypoint>` for details)
+
+This image is created as a "multi-arch image", see :ref:`below <base-multiarch>`.
+
+It inherits (is built on) an Ubuntu environment from the upstream
+`base image of Eclipse Temurin <https://hub.docker.com/_/eclipse-temurin>`_.
+You are free to change the JRE/JDK image to your liking (see below).
+
+.. _base-image-build-instructions:
+
+Build Instructions
+++++++++++++++++++
+
+Assuming you have `Docker <https://docs.docker.com/engine/install/>`_, `Docker Desktop <https://www.docker.com/products/docker-desktop/>`_,
+`Moby <https://mobyproject.org/>`_ or some remote Docker host configured, up and running from here on.
+
+Simply execute the Maven modules packaging target with activated "container" profile. Either from the projects Git root:
+
+``mvn -Pct -f modules/container-base install``
+
+Or move to the module and execute:
+
+``cd modules/container-base && mvn -Pct install``
+
+Some additional notes, using Maven parameters to change the build and use ...:
+
+- | ... a different tag only: add ``-Dbase.image.tag=tag``.
+  | *Note:* default is ``unstable``
+- | ... a different image name and tag: add ``-Dbase.image=name:tag``.
+  | *Note:* default is ``gdcc/base:${base.image.tag}``
+- ... a different image registry than Docker Hub: add ``-Ddocker.registry=registry.example.org`` (see also
+  `DMP docs on registries <https://dmp.fabric8.io/#registry>`__)
+- ... a different Payara version: add ``-Dpayara.version=V.YYYY.R``.
+- | ... a different Temurin JRE version ``A``: add ``-Dtarget.java.version=A`` (i.e. ``11``, ``17``, ...).
+  | *Note:* must resolve to an available image tag ``A-jre`` of Eclipse Temurin!
+    (See also `Docker Hub search example <https://hub.docker.com/_/eclipse-temurin/tags?page=1&name=11-jre>`_)
+- ... a different Java Distribution: add ``-Djava.image="name:tag"`` with precise reference to an
+  image available local or remote.
+- ... a different UID/GID for the ``payara`` user/group (default ``1000:1000``): add ``-Dbase.image.uid=1234`` (or ``.gid``)
+
+Automated Builds & Publishing
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To make reusing most simple, the image is built with a Github Action within the IQSS repository and then pushed
+to `Docker Hub gdcc/base repository <https://hub.docker.com/r/gdcc/base>`_. It is built and pushed on every edit to
+its sources plus uncached scheduled nightly builds to make sure security updates are finding their way in.
+
+*Note:* For the Github Action to be able to push to Docker Hub, two repository secrets
+(DOCKERHUB_USERNAME, DOCKERHUB_TOKEN) have been added by IQSS admins to their repository.
+
+.. _base-multiarch:
+
+Processor Architecture and Multiarch
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This image is created as a "multi-arch image", supporting the most common architectures Dataverse usually runs on:
+AMD64 (Windows/Linux/...) and ARM64 (Apple M1/M2), by using `Maven Docker Plugin's BuildX mode <https://dmp.fabric8.io/#build-buildx>`_.
+
+Building the image via ``mvn -Pct package`` or ``mvn -Pct install`` as above will only build for the architecture of
+the Docker machine's CPU.
+
+Only ``mvn -Pct deploy`` will trigger building on all enabled architectures (and will try to push the images to a
+registry, which is Docker Hub by default).
+
+You can specify which architectures you would like to build for and include by them as a comma separated list:
+``mvn -Pct deploy -Ddocker.platforms="linux/amd64,linux/arm64"``. The shown configuration is the default and may be omitted.
+
+Yet, to enable building with non-native code on your build machine, you will need to setup a cross-platform builder!
+
+On Linux, you should install `qemu-user-static <https://github.com/multiarch/qemu-user-static>`__ (preferably via
+your package management) on the host and run ``docker run --rm --privileged multiarch/qemu-user-static --reset -p yes``
+to enable that builder. The Docker plugin will setup everything else for you.
+
+The upstream CI workflows publish images supporting AMD64 and ARM64 (see e.g. tag details on Docker Hub)
+
+.. _base-tunables:
+
+Tunables
+++++++++
+
+The base image provides a Payara domain suited for production use, but can also be used during development.
+Many settings have been carefully selected for best performance and stability of the Dataverse application.
+
+As with any service, you should always monitor any metrics and make use of the tuning capabilities the base image
+provides. These are mostly based on environment variables (very common with containers) and provide sane defaults.
+
+.. list-table::
+    :align: left
+    :width: 100
+    :widths: 10 10 10 50
+    :header-rows: 1
+
+    * - Env. variable
+      - Default
+      - Type
+      - Description
+    * - ``DEPLOY_PROPS``
+      - (empty)
+      - String
+      - Set to add arguments to generated `asadmin deploy` commands.
+    * - ``PREBOOT_COMMANDS``
+      - [preboot]_
+      - Abs. path
+      - Provide path to file with ``asadmin`` commands to run **before** boot of application server.
+        See also `Pre/postboot script docs`_. Must be writeable by Payara Linux user!
+    * - ``POSTBOOT_COMMANDS``
+      - [postboot]_
+      - Abs. path
+      - Provide path to file with ``asadmin`` commands to run **after** boot of application server.
+        See also `Pre/postboot script docs`_. Must be writeable by Payara Linux user!
+    * - ``JVM_ARGS``
+      - (empty)
+      - String
+      - Additional arguments to pass to application server's JVM on start.
+    * - ``MEM_MAX_RAM_PERCENTAGE``
+      - ``70.0``
+      - Percentage
+      - Maximum amount of container's allocated RAM to be used as heap space.
+        Make sure to leave some room for native memory, OS overhead etc!
+    * - ``MEM_XSS``
+      - ``512k``
+      - Size
+      - Tune the maximum JVM stack size.
+    * - ``MEM_MIN_HEAP_FREE_RATIO``
+      - ``20``
+      - Integer
+      - Make the heap shrink aggressively and grow conservatively. See also `run-java-sh recommendations`_.
+    * - ``MEM_MAX_HEAP_FREE_RATIO``
+      - ``40``
+      - Integer
+      - Make the heap shrink aggressively and grow conservatively. See also `run-java-sh recommendations`_.
+    * - ``MEM_MAX_GC_PAUSE_MILLIS``
+      - ``500``
+      - Milliseconds
+      - Shorter pause times might result in lots of collections causing overhead without much gain.
+        This needs monitoring and tuning. It's a complex matter.
+    * - ``MEM_METASPACE_SIZE``
+      - ``256m``
+      - Size
+      - Initial size of memory reserved for class metadata, also used as trigger to run a garbage collection
+        once passing this size.
+    * - ``MEM_MAX_METASPACE_SIZE``
+      - ``2g``
+      - Size
+      - The metaspace's size will not outgrow this limit.
+    * - ``ENABLE_DUMPS``
+      - ``0``
+      - Bool, ``0|1``
+      - If enabled, the argument(s) given in ``JVM_DUMP_ARG`` will be added to the JVM starting up.
+        This means it will enable dumping the heap to ``${DUMPS_DIR}`` (see below) in "out of memory" cases.
+        (You should back this location with disk space / ramdisk, so it does not write into an overlay filesystem!)
+    * - ``JVM_DUMPS_ARG``
+      - [dump-option]_
+      - String
+      - Can be fine tuned for more grained controls of dumping behaviour.
+    * - ``ENABLE_JMX``
+      - ``0``
+      - Bool, ``0|1``
+      - Allow insecure JMX connections, enable AMX and tune all JMX monitoring levels to ``HIGH``.
+        See also `Payara Docs - Basic Monitoring <https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/Logging%20and%20Monitoring/Monitoring%20Service/Basic%20Monitoring%20Configuration.html>`_.
+        A basic JMX service is enabled by default in Payara, exposing basic JVM MBeans, but especially no Payara MBeans.
+    * - ``ENABLE_JDWP``
+      - ``0``
+      - Bool, ``0|1``
+      - Enable the "Java Debug Wire Protocol" to attach a remote debugger to the JVM in this container.
+        Listens on port 9009 when enabled. Search the internet for numerous tutorials to use it.
+    * - ``ENABLE_RELOAD``
+      - ``0``
+      - Bool, ``0|1``
+      - Enable the dynamic "hot" reloads of files when changed in a deployment. Useful for development,
+        when new artifacts are copied into the running domain. Also, export Dataverse specific environment variables
+        ``DATAVERSE_JSF_PROJECT_STAGE=Development`` and ``DATAVERSE_JSF_REFRESH_PERIOD=0`` to enable dynamic JSF page
+        reloads.
+    * - ``SKIP_DEPLOY``
+      - ``0``
+      - Bool, ``0|1`` or ``false|true``
+      - When active, do not deploy applications from ``DEPLOY_DIR`` (see below), just start the application server.
+        Will still execute any provided init scripts and only skip deployments within the default init scripts.
+    * - ``DATAVERSE_HTTP_TIMEOUT``
+      - ``900``
+      - Seconds
+      - See :ref:`:ApplicationServerSettings` ``http.request-timeout-seconds``.
+
+        *Note:* can also be set using any other `MicroProfile Config Sources`_ available via ``dataverse.http.timeout``.
+    * - ``PAYARA_ADMIN_PASSWORD``
+      - ``admin``
+      - String
+      - Set to secret string to change `Payara Admin Console`_ Adminstrator User ("admin") password.
+    * - ``LINUX_PASSWORD``
+      - ``payara``
+      - String
+      - Set to secret string to change the Payara Linux User ("payara", default UID=1000) password.
+        *Note: changes /etc/shadow, usually incompatible with a read-only rootfs!*
+    * - ``DOMAIN_PASSWORD``
+      - ``changeit``
+      - String
+      - Set to secret string to change the `Domain Master Password`_.
+
+
+.. [preboot] ``${CONFIG_DIR}/pre-boot-commands.asadmin``
+.. [postboot] ``${CONFIG_DIR}/post-boot-commands.asadmin``
+.. [dump-option] ``-XX:+HeapDumpOnOutOfMemoryError``
+
+
+.. _base-locations:
+
+Locations
++++++++++
+
+This environment variables represent certain locations and might be reused in your scripts etc.
+All of these variables aren't meant to be reconfigurable and reflect state in the filesystem layout!
+
+**Writeable at build time:**
+
+The overlay filesystem of Docker and other container technologies is not meant to be used for any performance IO.
+You should avoid *writing* data anywhere in the file tree at runtime, except for well known locations with mounted
+volumes backing them (see below).
+
+The locations below are meant to be written to when you build a container image, either this base or anything
+building upon it. You can also use these for references in scripts, etc.
+
+.. list-table::
+    :align: left
+    :width: 100
+    :widths: 10 10 50
+    :header-rows: 1
+
+    * - Env. variable
+      - Value
+      - Description
+    * - ``HOME_DIR``
+      - ``/opt/payara``
+      - Home base to Payara and the application
+    * - ``PAYARA_DIR``
+      - ``${HOME_DIR}/appserver``
+      - Installation directory of Payara server
+    * - ``SCRIPT_DIR``
+      - ``${HOME_DIR}/scripts``
+      - Any scripts like the container entrypoint, init scripts, etc
+    * - ``CONFIG_DIR``
+      - ``${HOME_DIR}/config``
+      - Payara Server configurations like pre/postboot command files go here
+        (Might be reused for Dataverse one day)
+    * - ``DEPLOY_DIR``
+      - ``${HOME_DIR}/deployments``
+      - Any EAR or WAR file, exploded WAR directory etc are autodeployed on start.
+        See also ``SKIP_DEPLOY`` above.
+    * - ``DOMAIN_DIR``
+      - ``${PAYARA_DIR}/glassfish`` ``/domains/${DOMAIN_NAME}``
+      - Path to root of the Payara domain applications will be deployed into. Usually ``${DOMAIN_NAME}`` will be ``domain1``.
+
+
+**Writeable at runtime:**
+
+The locations below are defined as `Docker volumes <https://docs.docker.com/storage/volumes/>`_ by the base image.
+They will by default get backed by an "anonymous volume", but you can (and should) bind-mount a host directory or
+named Docker volume in these places to avoid data loss, gain performance and/or use a network file system.
+
+**Notes:**
+1. On Kubernetes you still need to provide volume definitions for these places in your deployment objects!
+2. You should not write data into these locations at build time - it will be shadowed by the mounted volumes!
+
+.. list-table::
+    :align: left
+    :width: 100
+    :widths: 10 10 50
+    :header-rows: 1
+
+    * - Env. variable
+      - Value
+      - Description
+    * - ``STORAGE_DIR``
+      - ``/dv``
+      - This place is writeable by the Payara user, making it usable as a place to store research data, customizations or other.
+        Images inheriting the base image should create distinct folders here, backed by different mounted volumes.
+        Enforce correct filesystem permissions on the mounted volume using ``fix-fs-perms.sh`` from :doc:`configbaker-image` or similar scripts.
+    * - ``SECRETS_DIR``
+      - ``/secrets``
+      - Mount secrets or other here, being picked up automatically by
+        `Directory Config Source <https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Directory.html>`_.
+        See also various :doc:`../installation/config` options involving secrets.
+    * - ``DUMPS_DIR``
+      - ``/dumps``
+      - Default location where heap dumps will be stored (see above).
+        You should mount some storage here (disk or ephemeral).
+
+
+.. _base-exposed-ports:
+
+Exposed Ports
++++++++++++++
+
+The default ports that are exposed by this image are:
+
+- 8080 - HTTP listener
+- 4848 - Admin Service HTTPS listener
+- 8686 - JMX listener
+- 9009 - "Java Debug Wire Protocol" port (when ``ENABLE_JDWP=1``)
+
+The HTTPS listener (on port 8181) becomes deactivated during the build, as we will always need to reverse-proxy the
+application server and handle SSL/TLS termination at this point. Save the memory and some CPU cycles!
+
+
+
+.. _base-entrypoint:
+
+Entry & Extension Points
+++++++++++++++++++++++++
+
+The entrypoint shell script provided by this base image will by default ensure to:
+
+- Run any scripts named ``${SCRIPT_DIR}/init_*`` or in ``${SCRIPT_DIR}/init.d/*`` directory for initialization
+  **before** the application server starts.
+- Run an executable script ``${SCRIPT_DIR}/startInBackground.sh`` in the background - if present.
+- Run the application server startup scripting in foreground (``${SCRIPT_DIR}/startInForeground.sh``).
+
+If you need to create some scripting that runs in parallel under supervision of `dumb-init <https://github.com/Yelp/dumb-init>`_,
+e.g. to wait for the application to deploy before executing something, this is your point of extension: simply provide
+the ``${SCRIPT_DIR}/startInBackground.sh`` executable script with your application image.
+
+
+
+Other Hints
++++++++++++
+
+By default, ``domain1`` is enabled to use the ``G1GC`` garbage collector.
+
+To access the Payara Admin Console or use the ``asadmin`` command, use username ``admin`` and password ``admin``.
+
+For running a Java application within a Linux based container, the support for CGroups is essential. It has been
+included and activated by default since Java 8u192, Java 11 LTS and later. If you are interested in more details,
+you can read about those in a few places like https://developers.redhat.com/articles/2022/04/19/java-17-whats-new-openjdks-container-awareness,
+https://www.eclipse.org/openj9/docs/xxusecontainersupport, etc. The other memory defaults are inspired
+from `run-java-sh recommendations`_.
+
+
+
+.. _Pre/postboot script docs: https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Micro%20Documentation/Payara%20Micro%20Configuration%20and%20Management/Micro%20Management/Asadmin%20Commands/Pre%20and%20Post%20Boot%20Commands.html
+.. _MicroProfile Config Sources: https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Overview.html
+.. _run-java-sh recommendations: https://github.com/fabric8io-images/run-java-sh/blob/master/TUNING.md#recommandations
+.. _Domain Master Password: https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/Security%20Guide/Administering%20System%20Security.html#to-change-the-master-password
+.. _Payara Admin Console: https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/General%20Administration/Overview.html#administration-console
diff --git a/doc/sphinx-guides/source/container/configbaker-image.rst b/doc/sphinx-guides/source/container/configbaker-image.rst
new file mode 100644
index 00000000000..4cc64fb150e
--- /dev/null
+++ b/doc/sphinx-guides/source/container/configbaker-image.rst
@@ -0,0 +1,282 @@
+Config Baker Image
+==================
+
+The config baker container may be used to execute all sorts of tasks around setting up, preparing and finalizing
+an instance of the Dataverse software. Its focus is bootstrapping non-initialized installations.
+
+.. contents:: |toctitle|
+    :local:
+
+Quickstart
+++++++++++
+
+To see the Config Baker help screen:
+
+``docker run -it --rm gdcc/configbaker:unstable``
+
+.. _config-image-supported-tags:
+
+Supported Image Tags
+++++++++++++++++++++
+
+This image is sourced from the main upstream code `repository of the Dataverse software <https://github.com/IQSS/dataverse>`_.
+Development and maintenance of the `image's code <https://github.com/IQSS/dataverse/tree/develop/modules/container-configbaker>`_
+happens there (again, by the community).
+
+All supported images receive scheduled maintenance, executed every Sunday.
+New revisions are kept to a minimum, usually created when some dependency needs (security) updates.
+The `Trivy <https://trivy.dev>`_ scanner is used to check for fixed vulnerabilities and rebuilds are issued if such a fix is detected.
+
+Our tagging is inspired by `Bitnami <https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html>`_ and we offer two categories of tags:
+
+- rolling: images change over time
+- immutable: images are fixed and never change
+
+In the tags below you'll see the term "flavor". This refers to flavor of Linux the container is built on. We use Ubuntu as the basis for our images and, for the time being, the only operating system flavors we use and support are ``noble`` (6.7+) and ``alpine`` (pre-6.7).
+
+You can find all the tags at https://hub.docker.com/r/gdcc/configbaker/tags
+
+Tags for Production Use
+^^^^^^^^^^^^^^^^^^^^^^^
+
+The images of the three latest releases of the Dataverse project will receive updates such as security patches for the underlying operating system.
+Content will be fairly stable as disruptive changes like Payara or Java upgrades will be handled in a new major or minor upgrade to Dataverse (a new ``<dv-major>.<dv-minor>`` tag).
+Expect disruptive changes in case of high risk security threats.
+
+- | **Latest**
+  | Definition: ``latest``
+  | Summary: Rolling tag, always pointing to the latest revision of the most current Dataverse release.
+- | **Rolling Production**
+  | Definition: ``<dv-major>.<dv-minor>-<flavor>``
+  | Example: :substitution-code:`|version|-noble`
+  | Summary: Rolling tag, pointing to the latest revision of an immutable production image for released versions of Dataverse.
+- | **Immutable Production**
+  | Definition: ``<dv-major>.<dv-minor>-<flavor>-r<revision>``
+  | Example: :substitution-code:`|version|-noble-r1`
+  | Summary: An **immutable tag** where the revision is incremented for rebuilds of the image.
+  | This image should be especially attractive if you want explict control over when your images are updated.
+
+Tags for Development Use
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+All of the tags below are strongly recommended only for development purposes due to their fast-changing nature.
+In addition to updates due to PR merges, the most recent tags undergo scheduled maintenance to ensure timely security fixes.
+When a development cycle of Dataverse finishes, maintenance ceases for any tags carrying version numbers.
+For now, stale images will be kept on Docker Hub indefinitely.
+
+- | **Unstable**
+  | Definition: ``unstable``
+  | Summary: Rolling tag, tracking the ``develop`` branch (see also :ref:`develop-branch`). (`Dockerfile <https://github.com/IQSS/dataverse/tree/develop/modules/container-base/src/main/docker/Dockerfile>`__)
+  | Please expect abrupt changes like new Payara or Java versions as well as OS updates or flavor switches when using this tag.
+- | **Upcoming**
+  | Definition: ``<dv-major>.<dv-minor-next>-<flavor>``
+  | Example: :substitution-code:`|nextVersion|-noble`
+  | Summary: Rolling tag, equivalent to ``unstable`` for current development cycle.
+    Will roll over to the rolling production tag after a Dataverse release.
+
+**NOTE**: In these tags for development usage, the version number will always be 1 minor version ahead of existing Dataverse releases.
+Example: Assume Dataverse ``6.x`` is released, ``6.(x+1)`` is underway.
+The rolling tag in use during the cycle will be ``6.(x+1)-FFF`` and ``6.(x+1)-FFF-p6.202P.P-jJJ``.
+See also: :doc:`/developers/making-releases`.
+
+
+Image Contents
+++++++++++++++
+
+This image contains some crucial parts to make a freshly baked Dataverse installation usable.
+
+Scripts
+^^^^^^^
+
+.. list-table::
+  :align: left
+  :widths: 20 80
+  :header-rows: 1
+
+  * - Script
+    - Description
+  * - ``bootstrap.sh``
+    - Run an initialization script contained in a persona. See ``bootstrap.sh -h`` for usage details.
+      For development purposes, use ``bootstrap.sh dev`` or provide your own.
+  * - ``fix-fs-perms.sh``
+    - Fixes filesystem permissions. App and Solr container run as non-privileged users and might need adjusted
+      filesystem permissions on mounted volumes to be able to write data. Run without parameters to see usage details.
+  * - ``help.sh``
+    - Default script when running container without parameters. Lists available scripts and details about them.
+  * - ``update-fields.sh``
+    - Update a Solr ``schema.xml`` with a given list of metadata fields. See ``update-fields.sh -h`` for usage details
+      and example use cases at :ref:`update-solr-schema` and :ref:`update-solr-schema-dev`.
+
+Solr Template
+^^^^^^^^^^^^^
+
+In addition, at ``/template`` a `Solr Configset <https://solr.apache.org/guide/solr/latest/configuration-guide/config-sets.html>`_
+is available, ready for Dataverse usage with a tuned core config and schema.
+
+Providing this template to a vanilla Solr image and using `solr-precreate <https://solr.apache.org/guide/solr/latest/deployment-guide/solr-in-docker.html#using-solr-precreate-command>`_
+with it will create the necessary Solr search index.
+
+The ``solrconfig.xml`` and ``schema.xml`` are included from the upstream project ``conf/solr/...`` folder. You are
+obviously free to provide such a template in some other way, maybe tuned for your purposes.
+As a start, the contained script ``update-fields.sh`` may be used to edit the field definitions.
+
+
+
+Build Instructions
+++++++++++++++++++
+
+Assuming you have `Docker <https://docs.docker.com/engine/install/>`_, `Docker Desktop <https://www.docker.com/products/docker-desktop/>`_,
+`Moby <https://mobyproject.org/>`_ or some remote Docker host configured, up and running from here on.
+Note: You need to use Maven when building this image, as we collate selective files from different places of the upstream
+repository. (Building with pure Docker Compose does not support this kind of selection.)
+
+By default, when building the application image, it will also create a new config baker image. Simply execute the
+Maven modules packaging target with activated "container" profile from the projects Git root to build the image:
+
+``mvn -Pct package``
+
+If you specifically want to build a config baker image *only*, try
+
+``mvn -Pct docker:build -Ddocker.filter=dev_bootstrap``
+
+The build of config baker involves copying Solr configset files. The Solr version used is inherited from Maven,
+acting as the single source of truth. Also, the tag of the image should correspond the application image, as
+their usage is intertwined.
+
+Some additional notes, using Maven parameters to change the build and use ...:
+
+- | ... a different tag only: add ``-Dconf.image.tag=tag``.
+  | *Note:* default is ``${app.image.tag}``, which defaults to ``unstable``
+- | ... a different image name and tag: add ``-Dconf.image=name:tag``.
+  | *Note:* default is ``gdcc/configbaker:${conf.image.tag}``
+- ... a different image registry than Docker Hub: add ``-Ddocker.registry=registry.example.org`` (see also
+  `DMP docs on registries <https://dmp.fabric8.io/#registry>`__)
+- ... a different Solr version: use ``-Dsolr.version=x.y.z``
+
+Processor Architecture and Multiarch
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This image is published as a "multi-arch image", supporting the most common architectures Dataverse usually runs on:
+AMD64 (Windows/Linux/...) and ARM64 (Apple M1/M2), by using `Maven Docker Plugin's BuildX mode <https://dmp.fabric8.io/#build-buildx>`_.
+
+Building the image via ``mvn -Pct package``, etc. will only build for the architecture of the Docker machine's CPU.
+
+Only ``mvn -Pct deploy -Ddocker.platforms=linux/amd64,linux/arm64`` will trigger building on all enabled architectures.
+Yet, to enable building with non-native code on your build machine, you will need to setup a cross-platform builder.
+
+On Linux, you should install `qemu-user-static <https://github.com/multiarch/qemu-user-static>`__ (preferably via
+your package management) on the host and run ``docker run --rm --privileged multiarch/qemu-user-static --reset -p yes``
+to enable that builder. The Docker plugin will setup everything else for you.
+
+
+
+Tunables
+++++++++
+
+This image has no tunable runtime parameters yet.
+
+
+
+Locations
++++++++++
+
+.. list-table::
+    :align: left
+    :width: 100
+    :widths: 10 10 50
+    :header-rows: 1
+
+    * - Location
+      - Value
+      - Description
+    * - ``${SCRIPT_DIR}``
+      - ``/scripts``
+      - Place to store the scripts. Part of ``$PATH``.
+    * - ``${SOLR_TEMPLATE}``
+      - ``/template``
+      - Place where the Solr Configset resides to create an index core from it.
+    * - ``${BOOTSTRAP_DIR}``
+      - ``/scripts/bootstrap``
+      - Stores the bootstrapping personas in sub-folders.
+    * - ``${BOOTSTRAP_DIR}/base``
+      - ``/scripts/bootstrap/base``
+      - Minimal set of scripts and data from upstream ``scripts/api`` folder, just enough for the most basic setup.
+        The idea is that other personas may reuse it within their own ``init.sh``, avoiding (some) code duplication.
+        See ``dev`` persona for an example.
+
+
+
+Exposed Ports
++++++++++++++
+
+This image contains no runnable services yet, so no ports exposed.
+
+
+
+Entry & Extension Points
+++++++++++++++++++++++++
+
+The entrypoint of this image is pinned to ``dumb-init`` to safeguard signal handling. You may feed any script or
+executable to it as command.
+
+By using our released images as base image to add your own scripting, personas, Solr configset and so on, simply
+adapt and alter any aspect you need changed.
+
+
+
+Examples
+++++++++
+
+Docker Compose snippet to wait for Dataverse deployment and execute bootstrapping using a custom persona you added
+by bind mounting (as an alternative to extending the image):
+
+.. code-block:: yaml
+
+  bootstrap:
+    image: gdcc/configbaker:unstable
+    restart: "no"
+    command:
+      - bootstrap.sh
+      - mypersona
+    volumes:
+      - ./mypersona:/scripts/bootstrap/mypersona
+    networks:
+      - dataverse
+
+Docker Compose snippet to prepare execution of Solr and copy your custom configset you added by bind mounting
+(instead of an extension). Note that ``solr-precreate`` will not overwrite an already existing core! To update
+the config of an existing core, you need to mount the right volume with the stateful data!
+
+.. code-block:: yaml
+
+  solr_initializer:
+    container_name: solr_initializer
+    image: gdcc/configbaker:unstable
+    restart: "no"
+    command:
+      - sh
+      - -c
+      - "fix-fs-perms.sh solr && cp -a /template/* /solr-template"
+    volumes:
+      - ./volumes/solr/data:/var/solr
+      - ./volumes/solr/conf:/solr-template
+      - /tmp/my-generated-configset:/template
+
+  solr:
+    container_name: solr
+    hostname: solr
+    image: solr:${SOLR_VERSION}
+    depends_on:
+      - dev_solr_initializer
+    restart: on-failure
+    ports:
+      - "8983:8983"
+    networks:
+      - dataverse
+    command:
+      - "solr-precreate"
+      - "collection1"
+      - "/template"
+    volumes:
+      - ./volumes/solr/data:/var/solr
+      - ./volumes/solr/conf:/template
diff --git a/doc/sphinx-guides/source/container/dev-usage.rst b/doc/sphinx-guides/source/container/dev-usage.rst
new file mode 100644
index 00000000000..c02c1d4010f
--- /dev/null
+++ b/doc/sphinx-guides/source/container/dev-usage.rst
@@ -0,0 +1,414 @@
+Development Usage
+=================
+
+Please note! This Docker setup is not for production!
+
+.. contents:: |toctitle|
+        :local:
+
+Quickstart
+----------
+
+See :ref:`container-dev-quickstart`.
+
+Intro
+-----
+
+Assuming you have `Docker <https://docs.docker.com/engine/install/>`_, `Docker Desktop <https://www.docker.com/products/docker-desktop/>`_,
+`Moby <https://mobyproject.org/>`_ or some remote Docker host configured, up and running from here on. Also assuming
+you have Java and Maven installed, as you are at least about to develop code changes.
+
+To test drive these local changes to the Dataverse codebase in a containerized application server (and avoid the
+setup described in :doc:`../developers/dev-environment`), you must a) build the application and b) run it in addition
+to the necessary dependencies. (Which might involve building a new local version of the :doc:`configbaker-image`.)
+
+.. _dev-build:
+
+Building
+--------
+
+To build the :doc:`application <app-image>` and :doc:`config baker image <configbaker-image>`, run the following command:
+
+``mvn -Pct clean package``
+
+Once this is done, you will see images ``gdcc/dataverse:unstable`` and ``gdcc/configbaker:unstable`` available in your
+Docker cache.
+
+**Note:** This will skip any unit tests. If you have built the code before for testing, etc. you might omit the
+``clean`` to avoid recompiling.
+
+**Note:** Also we have a ``docker-compose-dev.yml`` file, it's currently not possible to build the images without
+invoking Maven. This might change in the future.
+
+
+.. _dev-run:
+
+Running
+-------
+
+After building the app and config baker image containing your local changes to the Dataverse application, you want to
+run it together with all dependencies. There are four ways to do this (commands executed at root of project directory):
+
+.. list-table:: Cheatsheet: Running Containers
+   :widths: 15 40 45
+   :header-rows: 1
+   :stub-columns: 1
+   :align: left
+
+   * - \
+     - Using Maven
+     - Using Compose
+   * - In foreground
+     - ``mvn -Pct docker:run``
+     - ``docker compose -f docker-compose-dev.yml up``
+   * - In background
+     - ``mvn -Pct docker:start``
+     - ``docker compose -f docker-compose-dev.yml up -d``
+
+Both ways have their pros and cons:
+
+.. list-table:: Decision Helper: Fore- or Background?
+   :widths: 15 40 45
+   :header-rows: 1
+   :stub-columns: 1
+   :align: left
+
+   * - \
+     - Pros
+     - Cons
+   * - Foreground
+     - | Logs scroll by when interacting with API / UI
+       | To stop all containers simply hit ``Ctrl+C``
+     - | Lots and lots of logs scrolling by
+       | Must stop all containers to restart
+   * - Background
+     - | No logs scrolling by
+       | Easy to replace single containers
+     - | No logs scrolling by
+       | Stopping containers needs an extra command
+
+In case you want to concatenate building and running, here's a cheatsheet for you:
+
+.. list-table:: Cheatsheet: Building and Running Containers
+   :widths: 15 40 45
+   :header-rows: 1
+   :stub-columns: 1
+   :align: left
+
+   * - \
+     - Using Maven
+     - Using Compose
+   * - In foreground
+     - ``mvn -Pct package docker:run``
+     - ``mvn -Pct package && docker compose -f docker-compose-dev.yml up``
+   * - In background
+     - ``mvn -Pct package docker:start``
+     - ``mvn -Pct package && docker compose -f docker-compose-dev.yml up -d``
+
+Once all containers have been started, you can check if the application was deployed correctly by checking the version
+at http://localhost:8080/api/info/version or watch the logs.
+
+**Note:** To stop all containers you started in background, invoke ``mvn -Pct docker:stop`` or
+``docker compose -f docker-compose-dev.yml down``.
+
+Check that you can log in to http://localhost:8080 using user ``dataverseAdmin`` and password ``admin1``.
+
+You can also access the Payara Admin Console if needed, which is available at http://localhost:4848. To log in, use
+user ``admin`` and password ``admin``. As a reminder, the application container is for development use only, so we
+are exposing the admin console for testing purposes. In a production environment, it may be more convenient to leave
+this console unopened.
+
+Note that data is persisted in ``./docker-dev-volumes`` in the root of the Git repo. For a clean start, you should
+remove this directory before running the ``mvn`` commands above.
+
+
+.. _dev-logs:
+
+Viewing Logs
+------------
+
+In case you started containers in background mode (see :ref:`dev-run`), you can use the following commands to view and/or
+watch logs from the containers.
+
+The safe bet for any running container's logs is to lookup the container name via ``docker ps`` and use it in
+``docker logs <name>``. You can tail logs by adding ``-n`` and follow them by adding ``-f`` (just like ``tail`` cmd).
+See ``docker logs --help`` for more.
+
+Alternatives:
+
+- In case you used Maven for running, you may use ``mvn -Pct docker:logs -Ddocker.filter=<service name>``.
+- If you used Docker Compose for running, you may use ``docker compose -f docker-compose-dev.yml logs <service name>``.
+  Options are the same.
+
+Accessing Harvesting Log Files
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+\1. Open a terminal and access the Dataverse container.
+
+Run the following command to access the Dataverse container (assuming your container is named dataverse-1):
+
+.. code-block::
+
+  docker exec -it dataverse-1 bash
+
+This command opens an interactive shell within the dataverse-1 container.
+
+\2. Navigate to the log files directory.
+
+Once inside the container, navigate to the directory where Dataverse logs are stored:
+
+.. code-block::
+
+  cd /opt/payara/appserver/glassfish/domains/domain1/logs
+
+This directory contains various log files, including those relevant to harvesting.
+
+\3. Create a directory for copying files.
+
+Create a directory where you'll copy the files you want to access on your local machine:
+
+.. code-block::
+
+  mkdir /dv/filesToCopy
+
+This will create a new folder named filesToCopy inside /dv.
+
+\4. Copy the files to the new directory.
+
+Copy all files from the current directory to the newly created filesToCopy directory:
+
+.. code-block::
+
+  cp * /dv/filesToCopy
+
+This command copies all files in the logs directory to /dv/filesToCopy.
+
+\5. Access the files on your local machine.
+
+On your local machine, the copied files should appear in the following directory:
+
+.. code-block::
+
+  docker-dev-volumes/app/data/filesToCopy
+
+Redeploying
+-----------
+
+The safest and most reliable way to redeploy code is to stop the running containers (with Ctrl-c if you started them in the foreground) and then build and run them again with ``mvn -Pct clean package docker:run``.
+Safe, but also slowing down the development cycle a lot.
+
+Triggering redeployment of changes using an IDE can greatly improve your feedback loop when changing code.
+You have at least two options:
+
+#. Use builtin features of IDEs or `IDE plugins from Payara <https://docs.payara.fish/community/docs/documentation/ecosystem/ecosystem.html>`_.
+#. Use a paid product like `JRebel <https://www.jrebel.com/>`_.
+
+The main differences between the first and the second options are support for hot deploys of non-class files and limitations in what the JVM HotswapAgent can do for you.
+Find more details in a `blog article by JRebel <https://www.jrebel.com/blog/java-hotswap-guide>`_.
+
+.. _ide-trigger-code-deploy:
+
+IDE Triggered Code Re-Deployments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To make use of builtin features or Payara IDE Tools (option 1), please follow steps below.
+Note that using this method, you may redeploy a complete WAR or single methods.
+Redeploying WARs supports swapping and adding classes and non-code materials, but is slower (still faster than rebuilding containers).
+Hotswapping methods requires using JDWP (Debug Mode), but does not allow switching non-code material or adding classes.
+
+#. | Download the version of Payara shown in :ref:`install-payara-dev` and unzip it to a reasonable location such as ``/usr/local/payara6``.
+   | - Note that Payara can also be downloaded from `Maven Central <https://mvnrepository.com/artifact/fish.payara.distributions/payara>`_.
+   | - Note that another way to check the expected version of Payara is to run this command:
+   |   ``mvn help:evaluate -Dexpression=payara.version -q -DforceStdout``
+
+#. Install Payara Tools plugin in your IDE:
+
+   .. tabs::
+     .. group-tab:: Netbeans
+
+       This step is not necessary for Netbeans. The feature is builtin.
+
+     .. group-tab:: IntelliJ
+
+       **Requires IntelliJ Ultimate!**
+       (Note that `free educational licenses <https://www.jetbrains.com/community/education/>`_ are available)
+
+       .. image:: img/intellij-payara-plugin-install.png
+
+#. Configure a connection to Payara:
+
+   .. tabs::
+     .. group-tab:: Netbeans
+
+        Launch Netbeans and click "Tools" and then "Servers". Click "Add Server" and select "Payara Server" and set the installation location to ``/usr/local/payara6`` (or wherever you unzipped Payara). Choose "Remote Domain". Use the settings in the screenshot below. Most of the defaults are fine.
+
+        Under "Common", the username and password should be "admin". Make sure "Enable Hot Deploy" is checked.
+
+        .. image:: img/netbeans-servers-common.png
+
+        Under "Java", change the debug port to 9009.
+
+        .. image:: img/netbeans-servers-java.png
+
+        Open the project properties (under "File"), navigate to "Compile" and make sure "Compile on Save" is checked.
+
+        .. image:: img/netbeans-compile.png
+
+        Under "Run", under "Server", select "Payara Server". Make sure "Deploy on Save" is checked.
+
+        .. image:: img/netbeans-run.png
+
+     .. group-tab:: IntelliJ
+        Create a new running configuration with a "Remote Payara".
+        (Open dialog by clicking "Run", then "Edit Configurations")
+
+        .. image:: img/intellij-payara-add-new-config.png
+
+        Click on "Configure" next to "Application Server".
+        Add an application server and select unzipped local directory.
+
+        .. image:: img/intellij-payara-config-add-server.png
+
+        Add admin password "admin" and add "building artifact" before launch.
+        Make sure to select the WAR, *not* exploded!
+
+        .. image:: img/intellij-payara-config-server.png
+
+        Go to "Deployment" tab and add the Dataverse WAR, *not* exploded!.
+
+        .. image:: img/intellij-payara-config-deployment.png
+
+        Go to "Startup/Connection" tab, select "Debug" and change port to ``9009``.
+
+        .. image:: img/intellij-payara-config-startup.png
+
+        You might want to tweak the hot deploy behavior in the "Server" tab now.
+        "Update action" can be found in the run window (see below).
+        "Frame deactivation" means switching from IntelliJ window to something else, e.g. your browser.
+        *Note: static resources like properties, XHTML etc will only update when redeploying!*
+
+        .. image:: img/intellij-payara-config-server-behaviour.png
+
+#. Start all the containers, but take care to skip application deployment.
+
+   .. tabs::
+     .. group-tab:: Maven
+        ``mvn -Pct docker:run -Dapp.skipDeploy``
+
+        Run above command in your terminal to start containers in foreground and skip deployment.
+        See cheat sheet above for more options.
+        Note that this command either assumes you built the :doc:`app-image` first or will download it from Docker Hub.
+     .. group-tab:: Compose
+        ``SKIP_DEPLOY=1 docker compose -f docker-compose-dev.yml up``
+
+        Run above command in your terminal to start containers in foreground and skip deployment.
+        See cheat sheet above for more options.
+        Note that this command either assumes you built the :doc:`app-image` first or will download it from Docker Hub.
+     .. group-tab:: IntelliJ
+        You can create a service configuration to automatically start services for you.
+
+        **IMPORTANT**: This requires installation of the `Docker plugin <https://plugins.jetbrains.com/plugin/7724-docker>`_.
+
+        **NOTE**: You might need to change the Docker Compose executable in your IDE settings to ``docker`` if you have no ``docker-compose`` binary. Start from the ``File`` menu if you are on Linux/Windows or ``IntelliJ IDEA`` on Mac and then go to Settings > Build > Docker > Tools.
+
+        .. image:: img/intellij-compose-add-new-config.png
+
+        Give your configuration a meaningful name, select the compose file to use (in this case the default one), add the environment variable ``SKIP_DEPLOY=1``, and optionally select the services to start.
+        You might also want to change other options like attaching to containers to view the logs within the "Services" tab.
+
+        .. image:: img/intellij-compose-setup.png
+
+        Now run the configuration to prepare for deployment and watch it unfold in the "Services" tab.
+
+        .. image:: img/intellij-compose-run.png
+        .. image:: img/intellij-compose-services.png
+
+   Note: the Admin Console can be reached at http://localhost:4848 or https://localhost:4949
+
+#. To deploy the application to the running server, use the configured tools to deploy.
+   Using the "Run" configuration only deploys and enables redeploys, while running "Debug" enables hot swapping of classes via JDWP.
+
+   .. tabs::
+     .. group-tab:: Netbeans
+
+        Click "Debug" then "Debug Project". After some time, Dataverse will be deployed.
+
+        Try making a code change, perhaps to ``Info.java``.
+
+        Click "Debug" and then "Apply Code Changes". If the change was correctly applied, you should see output similar to this:
+
+        .. code-block::
+
+          Classes to reload:
+          edu.harvard.iq.dataverse.api.Info
+
+          Code updated
+
+        Check to make sure the change is live by visiting, for example, http://localhost:8080/api/info/version
+
+        See below for a `video <https://www.youtube.com/watch?v=yo3aKOg96f0>`_ demonstrating the steps above but please note that the ports used have changed and now that we have the concept of "skip deploy" the undeployment step shown is no longer necessary.
+
+        .. raw:: html
+
+          <iframe width="560" height="315" src="https://www.youtube.com/embed/yo3aKOg96f0?si=2OCDj-_fmQFBMOLc" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+     .. group-tab:: IntelliJ
+        Choose "Run" or "Debug" in the toolbar.
+
+        .. image:: img/intellij-payara-run-toolbar.png
+
+        Watch the WAR build and the deployment unfold.
+        Note the "Update" action button (see config to change its behavior).
+
+        .. image:: img/intellij-payara-run-output.png
+
+        Manually hotswap classes in "Debug" mode via "Run" > "Debugging Actions" > "Reload Changed Classes".
+
+        .. image:: img/intellij-payara-run-menu-reload.png
+
+Note: in the background, the bootstrap job will wait for Dataverse to be deployed and responsive.
+When your IDE automatically opens the URL a newly deployed, not bootstrapped Dataverse application, it might take some more time and page refreshes until the job finishes.
+
+IDE Triggered Non-Code Re-Deployments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Either redeploy the WAR (see above), use JRebel or look into copying files into the exploded WAR within the running container.
+The steps below describe options to enable the later in different IDEs.
+
+.. tabs::
+  .. group-tab:: IntelliJ
+
+    This imitates the Netbeans builtin function to copy changes to files under ``src/main/webapp`` into a destination folder.
+    It is different in the way that it will copy the files into the running container deployment without using a bind mount.
+
+    1. Install the `File Watchers plugin <https://plugins.jetbrains.com/plugin/7177-file-watchers>`_
+    2. Import the :download:`watchers.xml <../../../../docker/util/intellij/watchers.xml>` file at *File > Settings > Tools > File Watchers*
+    3. Once you have the deployment running (see above), editing files under ``src/main/webapp`` will be copied into the container after saving the edited file.
+       Note: by default, IDE auto-saves will not trigger the copy.
+    4. Changes are visible once you reload the browser window.
+
+    **IMPORTANT**: This tool assumes you are using the :ref:`ide-trigger-code-deploy` method to run Dataverse.
+
+    **IMPORTANT**: This tool uses a Bash shell script and is thus limited to Mac and Linux OS.
+
+Exploring the Database
+----------------------
+
+See :ref:`db-name-creds` in the Developer Guide.
+
+Using a Debugger
+----------------
+
+The :doc:`base-image` enables usage of the `Java Debugging Wire Protocol <https://dzone.com/articles/remote-debugging-java-applications-with-jdwp>`_
+for remote debugging if you set ``ENABLE_JDWP=1`` as environment variable for the application container.
+The default configuration when executing containers with the commands listed at :ref:`dev-run` already enables this.
+
+There are a lot of tutorials how to connect your IDE's debugger to a remote endpoint. Please use ``localhost:9009``
+as the endpoint. Here are links to the most common IDEs docs on remote debugging:
+`Eclipse <https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/concepts/cremdbug.htm?cp=1_2_12>`_,
+`IntelliJ <https://www.jetbrains.com/help/idea/tutorial-remote-debug.html#debugger_rc>`_
+
+Building Your Own Base Image
+----------------------------
+
+If you find yourself tasked with upgrading Payara, you will need to create your own base image before running the :ref:`container-dev-quickstart`. For instructions, see :doc:`base-image`.
diff --git a/doc/sphinx-guides/source/container/img/intellij-compose-add-new-config.png b/doc/sphinx-guides/source/container/img/intellij-compose-add-new-config.png
new file mode 100644
index 00000000000..cec9bb357fe
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-compose-add-new-config.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-compose-run.png b/doc/sphinx-guides/source/container/img/intellij-compose-run.png
new file mode 100644
index 00000000000..e01744134f9
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-compose-run.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-compose-services.png b/doc/sphinx-guides/source/container/img/intellij-compose-services.png
new file mode 100644
index 00000000000..1c500c54201
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-compose-services.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-compose-setup.png b/doc/sphinx-guides/source/container/img/intellij-compose-setup.png
new file mode 100644
index 00000000000..42c2accf2b4
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-compose-setup.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-payara-add-new-config.png b/doc/sphinx-guides/source/container/img/intellij-payara-add-new-config.png
new file mode 100644
index 00000000000..d1c7a8f2777
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-payara-add-new-config.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-payara-config-add-server.png b/doc/sphinx-guides/source/container/img/intellij-payara-config-add-server.png
new file mode 100644
index 00000000000..54ffbd1b713
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-payara-config-add-server.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-payara-config-deployment.png b/doc/sphinx-guides/source/container/img/intellij-payara-config-deployment.png
new file mode 100644
index 00000000000..52adee056b5
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-payara-config-deployment.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-payara-config-server-behaviour.png b/doc/sphinx-guides/source/container/img/intellij-payara-config-server-behaviour.png
new file mode 100644
index 00000000000..5d23672e614
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-payara-config-server-behaviour.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-payara-config-server.png b/doc/sphinx-guides/source/container/img/intellij-payara-config-server.png
new file mode 100644
index 00000000000..614bda6f6d7
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-payara-config-server.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-payara-config-startup.png b/doc/sphinx-guides/source/container/img/intellij-payara-config-startup.png
new file mode 100644
index 00000000000..35b87148859
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-payara-config-startup.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-payara-plugin-install.png b/doc/sphinx-guides/source/container/img/intellij-payara-plugin-install.png
new file mode 100644
index 00000000000..7c6896574de
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-payara-plugin-install.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-payara-run-menu-reload.png b/doc/sphinx-guides/source/container/img/intellij-payara-run-menu-reload.png
new file mode 100644
index 00000000000..b1fd8bea260
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-payara-run-menu-reload.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-payara-run-output.png b/doc/sphinx-guides/source/container/img/intellij-payara-run-output.png
new file mode 100644
index 00000000000..aa139485a9d
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-payara-run-output.png differ
diff --git a/doc/sphinx-guides/source/container/img/intellij-payara-run-toolbar.png b/doc/sphinx-guides/source/container/img/intellij-payara-run-toolbar.png
new file mode 100644
index 00000000000..2aecb27c5f3
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/intellij-payara-run-toolbar.png differ
diff --git a/doc/sphinx-guides/source/container/img/netbeans-compile.png b/doc/sphinx-guides/source/container/img/netbeans-compile.png
new file mode 100644
index 00000000000..e429695ccb0
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/netbeans-compile.png differ
diff --git a/doc/sphinx-guides/source/container/img/netbeans-run.png b/doc/sphinx-guides/source/container/img/netbeans-run.png
new file mode 100644
index 00000000000..00f8af23cc5
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/netbeans-run.png differ
diff --git a/doc/sphinx-guides/source/container/img/netbeans-servers-common.png b/doc/sphinx-guides/source/container/img/netbeans-servers-common.png
new file mode 100644
index 00000000000..a9ded5dbec3
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/netbeans-servers-common.png differ
diff --git a/doc/sphinx-guides/source/container/img/netbeans-servers-java.png b/doc/sphinx-guides/source/container/img/netbeans-servers-java.png
new file mode 100644
index 00000000000..2593cacc5ae
Binary files /dev/null and b/doc/sphinx-guides/source/container/img/netbeans-servers-java.png differ
diff --git a/doc/sphinx-guides/source/container/index.rst b/doc/sphinx-guides/source/container/index.rst
new file mode 100644
index 00000000000..38641cce642
--- /dev/null
+++ b/doc/sphinx-guides/source/container/index.rst
@@ -0,0 +1,14 @@
+Container Guide
+===============
+
+**Contents:**
+
+.. toctree::
+  :maxdepth: 2
+
+  intro
+  running/index
+  dev-usage
+  base-image
+  app-image
+  configbaker-image
diff --git a/doc/sphinx-guides/source/container/intro.rst b/doc/sphinx-guides/source/container/intro.rst
new file mode 100644
index 00000000000..5099531dcc9
--- /dev/null
+++ b/doc/sphinx-guides/source/container/intro.rst
@@ -0,0 +1,28 @@
+Introduction
+============
+
+Dataverse in containers!
+
+.. contents:: |toctitle|
+        :local:
+
+Intended Audience
+-----------------
+
+This guide is intended for anyone who wants to run Dataverse in containers. This is potentially a wide audience, from sysadmins interested in running Dataverse in production in containers (not recommended yet) to contributors working on a bug fix (encouraged!). See :doc:`running/index` for various scenarios and please let us know if your use case is not covered.
+
+.. _getting-help-containers:
+
+Getting Help
+------------
+
+Please ask in #containers at https://chat.dataverse.org
+
+Alternatively, you can try one or more of the channels under :ref:`support`.
+
+.. _helping-containers:
+
+Helping with the Containerization Effort
+----------------------------------------
+
+In 2023 the Containerization Working Group started meeting regularly. All are welcome to join! We talk in #containers at https://chat.dataverse.org and have a regular video call. For details, please visit https://ct.gdcc.io 
diff --git a/doc/sphinx-guides/source/container/running/backend-dev.rst b/doc/sphinx-guides/source/container/running/backend-dev.rst
new file mode 100644
index 00000000000..8b2dab956ad
--- /dev/null
+++ b/doc/sphinx-guides/source/container/running/backend-dev.rst
@@ -0,0 +1,10 @@
+Backend Development
+===================
+
+.. contents:: |toctitle|
+	:local:
+
+Intro
+-----
+
+See :doc:`../dev-usage`.
diff --git a/doc/sphinx-guides/source/container/running/demo.rst b/doc/sphinx-guides/source/container/running/demo.rst
new file mode 100644
index 00000000000..d4afee8a18a
--- /dev/null
+++ b/doc/sphinx-guides/source/container/running/demo.rst
@@ -0,0 +1,350 @@
+Demo or Evaluation
+==================
+
+In the following tutorial we'll walk through spinning up Dataverse in containers for demo or evaluation purposes.
+
+.. contents:: |toctitle|
+	:local:
+
+Quickstart
+----------
+
+First, let's confirm that we can get Dataverse running on your system.
+
+- Download :download:`compose.yml <../../../../../docker/compose/demo/compose.yml>`
+- Run ``docker compose up`` in the directory where you put ``compose.yml``
+- Visit http://localhost:8080 and try logging in:
+
+  - username: dataverseAdmin
+  - password: admin1
+
+If you can log in, great! Please continue through the tutorial. If you have any trouble, please consult the sections below on troubleshooting and getting help.
+
+Stopping and Starting the Containers
+------------------------------------
+
+Let's practice stopping the containers and starting them up again. Your data, stored in a directory called ``data``, will remain intact
+
+To stop the containers hit ``Ctrl-c`` (hold down the ``Ctrl`` key and then hit the ``c`` key).
+
+To start the containers, run ``docker compose up``.
+
+.. _starting-over:
+
+Deleting Data and Starting Over
+-------------------------------
+
+Again, data related to your Dataverse installation such as the database is stored in a directory called ``data`` that gets created in the directory where you ran ``docker compose`` commands.
+
+You may reach a point during your demo or evaluation that you'd like to start over with a fresh database. Simply make sure the containers are not running and then remove the ``data`` directory. Now, as before, you can run ``docker compose up`` to spin up the containers.
+
+Setting Up for a Demo
+---------------------
+
+Now that you are familiar with the basics of running Dataverse in containers, let's move on to a better setup for a demo or evaluation.
+
+Starting Fresh
+++++++++++++++
+
+For this exercise, please start fresh by stopping all containers and removing the ``data`` directory.
+
+.. _demo-persona:
+
+Creating and Running a Demo Persona
++++++++++++++++++++++++++++++++++++
+
+Previously we used the "dev" persona to bootstrap Dataverse, but for security reasons, we should create a persona more suited to demos and evaluations.
+
+Edit the ``compose.yml`` file and look for the following section.
+
+.. code-block:: bash
+
+  bootstrap:
+    container_name: "bootstrap"
+    image: gdcc/configbaker:latest
+    restart: "no"
+    environment:
+      - TIMEOUT=3m
+    command:
+      - bootstrap.sh
+      - dev
+      #- demo
+    #volumes:
+    #  - ./demo:/scripts/bootstrap/demo
+    networks:
+      - dataverse
+
+Comment out "dev" and uncomment "demo".
+
+Uncomment the "volumes" section.
+
+Create a directory called "demo" and copy :download:`init.sh <../../../../../modules/container-configbaker/scripts/bootstrap/demo/init.sh>` into it. You are welcome to edit this demo init script, customizing the final message, for example.
+
+Note that the init script contains a key for using the admin API once it is blocked. You should change it in the script from "unblockme" to something only you know.
+
+Now run ``docker compose up``. The "bootstrap" container should exit with the message from the init script and Dataverse should be running on http://localhost:8080 as before during the quickstart exercise.
+
+One of the main differences between the "dev" persona and our new "demo" persona is that we are now running the setup-all script without the ``--insecure`` flag. This makes our installation more secure, though it does block "admin" APIs that are useful for configuration. 
+
+Smoke Testing
+-------------
+
+At this point, please try the following basic operations within your installation:
+
+- logging in as dataverseAdmin (password "admin1")
+- publishing the "root" collection (dataverse)
+- creating a collection
+- creating a dataset
+- uploading a data file
+- publishing the dataset
+
+If anything isn't working, please see the sections below on troubleshooting, giving feedback, and getting help.
+
+Further Configuration
+---------------------
+
+Now that we've verified through a smoke test that basic operations are working, let's configure our installation of Dataverse.
+
+Please refer to the :doc:`/installation/config` section of the Installation Guide for various configuration options.
+
+Below we'll explain some specifics for configuration in containers.
+
+JVM Options/MicroProfile Config
++++++++++++++++++++++++++++++++
+
+:ref:`jvm-options` can be configured under ``JVM_ARGS`` in the ``compose.yml`` file. Here's an example:
+
+.. code-block:: bash
+
+    environment:
+      JVM_ARGS: -Ddataverse.files.storage-driver-id=file1
+
+Some JVM options can be configured as environment variables. For example, you can configure the database host like this:
+
+.. code-block:: bash
+
+    environment:
+      DATAVERSE_DB_HOST: postgres
+
+We are in the process of making more JVM options configurable as environment variables. Look for the term "MicroProfile Config" in under :doc:`/installation/config` in the Installation Guide to know if you can use them this way.
+
+There is a final way to configure JVM options that we plan to deprecate once all JVM options have been converted to MicroProfile Config. Look for "magic trick" under "tunables" at :doc:`../app-image` for more information.
+
+Database Settings
++++++++++++++++++
+
+Generally, you should be able to look at the list of :ref:`database-settings` and configure them but the "demo" persona above secured your installation to the point that you'll need an "unblock key" to access the "admin" API and change database settings.
+
+In the example below of configuring :ref:`:FooterCopyright` we use the default unblock key of "unblockme" but you should use the key you set above.
+
+``curl -X PUT -d ", My Org" "http://localhost:8080/api/admin/settings/:FooterCopyright?unblock-key=unblockme"``
+
+One you make this change it should be visible in the copyright in the bottom left of every page.
+
+Root Collection Customization (Alias, Name, etc.)
++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Before running ``docker compose up`` for the first time, you can customize the root collection by placing a JSON file in the right place.
+
+First, in the "demo" directory you created (see :ref:`demo-persona`), create a subdirectory called "config":
+
+``mkdir demo/config``
+
+Next, download :download:`dataverse-complete.json <../../_static/api/dataverse-complete.json>` and put it in the "config" directory you just created. The contents of your "demo" directory should look something like this:
+
+.. code-block:: bash
+
+        % find demo
+        demo
+        demo/config
+        demo/config/dataverse-complete.json
+        demo/init.sh
+
+Edit ``dataverse-complete.json`` to have the values you want. You'll want to refer to :ref:`update-dataverse-api` in the API Guide to understand the format. In that documentation you can find optional parameters as well.
+
+To test your JSON file, run ``docker compose up``. Again, this only works when you are running ``docker compose up`` for the first time. (You can always start over. See :ref:`starting-over`.)
+
+Multiple Languages
+++++++++++++++++++
+
+Generally speaking, you'll want to follow :ref:`i18n` in the Installation Guide to set up multiple languages. (You need to create your own "languages.zip" file, for example.) Here will give you guidance specific to this demo tutorial. We'll be setting up a toggle between English and French.
+
+First, edit the ``compose.yml`` file and uncomment the following line:
+
+.. code-block:: text
+
+        #-Ddataverse.lang.directory=/dv/lang
+
+Next, upload "languages.zip" to the "loadpropertyfiles" API endpoint as shown below. This will place files ending in ".properties" into the ``/dv/lang`` directory configured above.
+
+Please note that we are using a slight variation on the command in the instructions above, adding the unblock key we created above:
+
+``curl "http://localhost:8080/api/admin/datasetfield/loadpropertyfiles?unblock-key=unblockme" -X POST --upload-file /tmp/languages/languages.zip -H "Content-Type: application/zip"``
+
+Next, set up the UI toggle between English and French, again using the unblock key:
+
+``curl "http://localhost:8080/api/admin/settings/:Languages?unblock-key=unblockme" -X PUT -d '[{"locale":"en","title":"English"},{"locale":"fr","title":"Français"}]'``
+
+Stop and start the Dataverse container in order for the language toggle to work.
+
+PID Providers
++++++++++++++
+
+Dataverse supports multiple Persistent ID (PID) providers. The ``compose.yml`` file uses the Permalink PID provider. Follow :ref:`pids-configuration` to reconfigure as needed.
+
+.. _file-previewers-ct:
+
+File Previewers
++++++++++++++++
+
+By default, all available file previewers are enabled (see :ref:`file-previews` in the User Guide for details). Specifically, we enable all the previewers that are available in the `trivadis/dataverse-previewers-provider <https://hub.docker.com/r/trivadis/dataverse-previewers-provider>`_ image (`code <https://github.com/TrivadisPF/docker-register-dataverse-previewers>`_). You can run the following command to see a list of available previewers:
+
+``docker run --rm trivadis/dataverse-deploy-previewers:latest previewers``
+
+You should expect to see output like this:
+
+.. code-block:: text
+
+        name     description
+        ----------------------------
+        text     Read the text file.
+        html     View the html file.
+        ...
+
+If you want to specify fewer previewers, you can edit the ``compose.yml`` file. Uncomment "INCLUDE_PREVIEWERS" and list the previewers you want, separated by commas, like this:
+
+``INCLUDE_PREVIEWERS=text,html,pdf,csv``
+
+
+.. _additional-metadata-blocks:
+
+Additional Metadata Blocks
+++++++++++++++++++++++++++
+
+Metadata fields such as "Title" are part of a metadata block such as "Citation". See :ref:`metadata-references` in the User Guide for the metadata blocks that ship with Dataverse.
+
+At a high level, we will be loading a metadata block and then adjusting our Solr config to know about it.
+
+Care should be taken when adding additional metadata blocks. There is no way to `preview <https://github.com/IQSS/dataverse/issues/2551>`_ or `delete <https://github.com/IQSS/dataverse/issues/9628>`_ a metadata block so please use a throwaway environment.
+
+:ref:`metadata-references` lists some experimental metadata blocks. In the example below, we'll use the CodeMeta block.
+
+First, download a metadata block or create one by following :doc:`/admin/metadatacustomization` in the Admin Guide.
+
+Load the metadata block like this:
+
+``curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file codemeta.tsv``
+
+Next, reconfigure Solr to know about the new metadata block.
+
+You can back up your existing Solr schema like this:
+
+``cp docker-dev-volumes/solr/data/data/collection1/conf/schema.xml docker-dev-volumes/solr/data/data/collection1/conf/schema.xml.orig``
+
+You can see the existing fields Solr knows about like this:
+
+``curl http://localhost:8983/solr/collection1/schema/fields``
+
+Update your Solr schema with the following command:
+
+``curl http://localhost:8080/api/admin/index/solr/schema | docker run -i --rm -v ./docker-dev-volumes/solr/data:/var/solr gdcc/configbaker:unstable update-fields.sh /var/solr/data/collection1/conf/schema.xml``
+
+Then, reload Solr:
+
+``curl "http://localhost:8983/solr/admin/cores?action=RELOAD&core=collection1"``
+
+You can get a diff of your old and new Solr schema like this:
+
+``diff docker-dev-volumes/solr/data/data/collection1/conf/schema.xml.orig docker-dev-volumes/solr/data/data/collection1/conf/schema.xml``
+
+You should be able to see the new fields from the metadata block you added in the following output:
+
+``curl http://localhost:8983/solr/collection1/schema/fields``
+
+At this point you can proceed with testing the metadata block in the Dataverse UI. First you'll need to enable it for a collection (see :ref:`general-information` in the User Guide section about collection). Afterwards, create a new dataset, save it, and then edit the metadata for that dataset. Your metadata block should appear.
+
+Next Steps
+----------
+
+From here, you are encouraged to continue poking around, configuring, and testing. You probably spend a lot of time reading the :doc:`/installation/config` section of the Installation Guide.
+
+Please consider giving feedback using the methods described below. Good luck with your demo!
+
+About the Containers
+--------------------
+
+Now that you've gone through the tutorial, you might be interested in the various containers you've spun up and what they do.
+
+Container List
+++++++++++++++
+
+If you run ``docker ps``, you'll see that multiple containers are spun up in a demo or evaluation. Here are the most important ones:
+
+- dataverse
+- postgres
+- solr
+- smtp
+- bootstrap
+
+Most are self-explanatory, and correspond to components listed under :doc:`/installation/prerequisites` in the (traditional) Installation Guide, but "bootstrap" refers to :doc:`../configbaker-image`.
+
+Additional containers are used in development (see :doc:`../dev-usage`), but for the purposes of a demo or evaluation, fewer moving (sometimes pointy) parts are included.
+
+Tags and Versions
++++++++++++++++++
+
+The compose file references a tag called "latest", which corresponds to the latest released version of Dataverse.
+This means that if a release of Dataverse comes out while you are demo'ing or evaluating, the version of Dataverse you are using could change if you do a ``docker pull``.
+Feel free to change it to a specific version to avoid this.
+For more on available tags, see supported tags section for :ref:`Application <app-image-supported-tags>` and :ref:`Config Baker <config-image-supported-tags>` images.
+
+Once Dataverse is running, you can check which version you have through the normal methods:
+
+- Check the bottom right in a web browser.
+- Check http://localhost:8080/api/info/version via API.
+
+Troubleshooting
+---------------
+
+Hardware and Software Requirements
+++++++++++++++++++++++++++++++++++
+
+- 8 GB RAM (if not much else is running)
+- Mac, Linux, or Windows (experimental)
+- Docker
+
+Windows support is experimental but we are very interested in supporting Windows better. Please report bugs (see :ref:`helping-containers`).
+
+Bootstrapping Did Not Complete
+++++++++++++++++++++++++++++++
+
+In the compose file, try increasing the timeout for the bootstrap container:
+
+.. code-block:: bash
+
+   environment:
+     - TIMEOUT=10m
+
+As described above, you'll want to stop containers, delete data, and start over with ``docker compose up``. To make sure the increased timeout is in effect, you can run ``docker logs bootstrap`` and look for the new value in the output:
+
+``Waiting for http://dataverse:8080 to become ready in max 10m.``
+
+Wrapping Up
+-----------
+
+Deleting the Containers and Data
+++++++++++++++++++++++++++++++++
+
+If you no longer need the containers because your demo or evaluation is finished and you want to reclaim disk space, run ``docker compose down`` in the directory where you put ``compose.yml``.
+
+You might also want to delete the ``data`` directory, as described above.
+
+Giving Feedback
+---------------
+
+Your feedback is extremely valuable to us! To let us know what you think, please see :ref:`helping-containers`.
+
+Getting Help
+------------
+
+Please do not be shy about reaching out for help. We very much want you to have a pleasant demo or evaluation experience. For ways to contact us, please see :ref:`getting-help-containers`.
diff --git a/doc/sphinx-guides/source/container/running/frontend-dev.rst b/doc/sphinx-guides/source/container/running/frontend-dev.rst
new file mode 100644
index 00000000000..88d40c12053
--- /dev/null
+++ b/doc/sphinx-guides/source/container/running/frontend-dev.rst
@@ -0,0 +1,10 @@
+Frontend Development
+====================
+
+.. contents:: |toctitle|
+	:local:
+
+Intro
+-----
+
+The frontend (web interface) of Dataverse is being decoupled from the backend. This evolving codebase has its own repo at https://github.com/IQSS/dataverse-frontend which includes docs and scripts for running the backend of Dataverse in Docker.
diff --git a/doc/sphinx-guides/source/container/running/github-action.rst b/doc/sphinx-guides/source/container/running/github-action.rst
new file mode 100644
index 00000000000..ae42dd494d1
--- /dev/null
+++ b/doc/sphinx-guides/source/container/running/github-action.rst
@@ -0,0 +1,18 @@
+GitHub Action
+=============
+
+.. contents:: |toctitle|
+	:local:
+
+Intro
+-----
+
+A GitHub Action is under development that will spin up a Dataverse instance within the context of GitHub CI workflows: https://github.com/gdcc/dataverse-action
+
+Use Cases
+---------
+
+Use cases for the GitHub Action include:
+
+- Testing :doc:`/api/client-libraries` that interact with Dataverse APIs
+- Testing :doc:`/admin/integrations` of third party software with Dataverse
diff --git a/doc/sphinx-guides/source/container/running/index.rst b/doc/sphinx-guides/source/container/running/index.rst
new file mode 100755
index 00000000000..a02266f7cba
--- /dev/null
+++ b/doc/sphinx-guides/source/container/running/index.rst
@@ -0,0 +1,13 @@
+Running Dataverse in Docker
+===========================
+
+Contents:
+
+.. toctree::
+
+   production
+   demo
+   metadata-blocks
+   github-action
+   frontend-dev
+   backend-dev
diff --git a/doc/sphinx-guides/source/container/running/metadata-blocks.rst b/doc/sphinx-guides/source/container/running/metadata-blocks.rst
new file mode 100644
index 00000000000..fcc80ce1909
--- /dev/null
+++ b/doc/sphinx-guides/source/container/running/metadata-blocks.rst
@@ -0,0 +1,15 @@
+Editing Metadata Blocks
+=======================
+
+.. contents:: |toctitle|
+	:local:
+
+Intro
+-----
+
+The Admin Guide has a section on :doc:`/admin/metadatacustomization` and suggests running Dataverse in containers (Docker) for this purpose.
+
+Status
+------
+
+For now, please see :doc:`demo`, which should also provide a suitable Dockerized Dataverse environment.
diff --git a/doc/sphinx-guides/source/container/running/production.rst b/doc/sphinx-guides/source/container/running/production.rst
new file mode 100644
index 00000000000..4fe16447d7e
--- /dev/null
+++ b/doc/sphinx-guides/source/container/running/production.rst
@@ -0,0 +1,39 @@
+Production (Future)
+===================
+
+.. contents:: |toctitle|
+	:local:
+
+Status
+------
+
+The images described in this guide are not yet recommended for production usage, but we think we are close. (Tagged releases are done; see the "supported image tags" section for :ref:`Application <app-image-supported-tags>` and :ref:`Config Baker <config-image-supported-tags>` images.) For now, please see :doc:`demo`.
+
+We'd like to make the following improvements:
+
+- More docs on setting up additional features
+
+  - How to set up Rserve.
+
+- Go through all the features in docs and check what needs to be done differently with containers
+
+  - Check ports, for example.
+
+To join the discussion on what else might be needed before declaring images ready for production, please comment on https://dataverse.zulipchat.com/#narrow/stream/375812-containers/topic/containers.20for.20production/near/434979159
+
+You are also very welcome to join our meetings. See "how to help" below.
+
+Limitations
+-----------
+
+- Multiple apps servers are not supported. See :ref:`multiple-app-servers` for more on this topic.
+
+How to Help
+-----------
+
+You can help the effort to support these images in production by trying them out (see :doc:`demo`) and giving feedback (see :ref:`helping-containers`).
+
+Alternatives
+------------
+
+Until the images are ready for production, please use the traditional installation method described in the :doc:`/installation/index`.
diff --git a/doc/sphinx-guides/source/contributor/code.md b/doc/sphinx-guides/source/contributor/code.md
new file mode 100644
index 00000000000..c7154d14169
--- /dev/null
+++ b/doc/sphinx-guides/source/contributor/code.md
@@ -0,0 +1,59 @@
+# Contributing Code
+
+We love code contributions! There are lots of ways you can help.
+
+```{contents} Contents:
+:local:
+:depth: 3
+```
+
+## Finding an Issue to Work On
+
+New contributors often wonder what issues they should work on first.
+
+### Many Codebases, Many Languages
+
+The primary codebase and issue tracker for Dataverse is <https://github.com/IQSS/dataverse>. It's mostly backend code written in Java. However, there are many other codebases you can work on in a variety of languages. Here are a few that are especially active:
+
+- <https://github.com/IQSS/dataverse> (Java)
+- <https://github.com/IQSS/dataverse-frontend> (React)
+- <https://github.com/IQSS/dataverse-client-javascript> (TypeScript)
+- <https://github.com/gdcc/dataverse-previewers> (Javascript)
+- <https://github.com/gdcc/pyDataverse> (Python)
+- <https://github.com/gdcc/rust-dataverse> (Rust)
+- <https://github.com/gdcc/dataverse-ansible> (Ansible)
+- <https://github.com/gdcc/dv-metrics> (Javascript)
+
+If nothing above sparks joy, you can find more projects to work on under {doc}`/api/client-libraries`, {doc}`/api/external-tools`, {ref}`related-projects`, and {doc}`/api/apps`.
+
+### Picking a Good First Issue
+
+Once you've decided which codebase suits you, you should try to identify an issue to work on. Some codebases use a label like "good first issue" to suggest issues for newcomers.
+
+For the main codebase, please see {ref}`finding-github-issues-to-work-on` which includes information on labels like "good first issue".
+
+Other codebases may use different labels. Check the README or other documentation for that codebase.
+
+If there is a linked pull request that is trying to close the issue, you should probably find another issue.
+
+If you are having trouble finding an issue or have any questions at all, please do not hesitate to reach out. See {ref}`getting-help-developers`.
+
+## Making a Pull Request
+
+For the main codebase, please see {ref}`how-to-make-a-pull-request`.
+
+For other codebases, consult the README.
+
+## Reviewing Code
+
+Reviewing code is a great way to learn about a codebase. For any codebase you can browse open pull requests, of course, but for the primary codebases, you can take a look at the "Ready for Review" and "In Review" columns at <https://github.com/orgs/IQSS/projects/34>.
+
+You are welcome to review code informally or to leave an actual review. We're interested in what you think.
+
+## Reproducing Bugs
+
+At times, bugs are reported that we haven't had time to confirm. You can help out by reproducing bugs and commenting on the issue the results you find.
+
+## Getting Help
+
+If you have any questions at all, please do not hesitate to reach out. See {ref}`getting-help-developers`.
diff --git a/doc/sphinx-guides/source/contributor/documentation.md b/doc/sphinx-guides/source/contributor/documentation.md
new file mode 100644
index 00000000000..2a8d6794921
--- /dev/null
+++ b/doc/sphinx-guides/source/contributor/documentation.md
@@ -0,0 +1,207 @@
+# Writing Documentation
+
+Thank you for your interest in contributing documentation to Dataverse! Good documentation is absolutely critical to the success of software.
+
+```{contents} Contents:
+:local:
+:depth: 3
+```
+
+## Overview
+
+The Dataverse guides are written using [Sphinx](https://sphinx-doc.org).
+
+The source files are stored under [doc/sphinx-guides](https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides) in the main "dataverse" repo on GitHub.
+
+Historically, guides have been written in the default Sphinx format, [reStructuredText][] (.rst), but newer guides such as the {doc}`/contributor/index` are written in [Markdown][] (.md).
+
+[reStructuredText]: https://en.wikipedia.org/wiki/ReStructuredText
+[Markdown]: https://en.wikipedia.org/wiki/Markdown
+
+Below we'll present a technique for making quick edits to the guides using GitHub's web editor ("quick fix"). We'll also describe how to install Sphinx locally for more significant edits.
+
+Finally, we'll provide some guidelines on writing content.
+
+We could use some help on writing this very page and helping newcomers get started. Please don't be shy about suggesting improvements! You can open an issue at <https://github.com/IQSS/dataverse/issues>, post to <https://chat.dataverse.org>, write to the [mailing list](https://groups.google.com/g/dataverse-community), or suggest a change with a pull request.
+
+## Quick Fix
+
+If you find a typo or a small error in the documentation you can fix it using GitHub's online web editor. Generally speaking, we will be following [GitHub's guidance on editing files in another user's repository](https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files#editing-files-in-another-users-repository).
+
+- Navigate to <https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source> where you will see folders for each of the guides: [admin][], [api][], [container][], etc.
+- Find the file you want to edit under one of the folders above.
+- Click the pencil icon in the upper-right corner. If this is your first contribution to Dataverse, the hover text over the pencil icon will say "Fork this project and edit this file".
+- Make changes to the file and preview them.
+- In the **Commit changes** box, enter a description of the changes you have made and click **Propose file change**.
+- Under the **Write** tab, delete the long welcome message and write a few words about what you fixed.
+- Click **Create Pull Request**.
+
+That's it! Thank you for your contribution! Your pull request will be added manually to the main Dataverse project board at <https://github.com/orgs/IQSS/projects/34> and will go through code review and QA before it is merged into the "develop" branch. Along the way, developers might suggest changes or make them on your behalf. Once your pull request has been merged you will be listed as a contributor at <https://github.com/IQSS/dataverse/graphs/contributors>! 🎉
+
+Please see <https://github.com/IQSS/dataverse/pull/5857> for an example of a quick fix that was merged (the "Files changed" tab shows how a typo was fixed).
+
+Preview your documentation changes which will be built automatically as part of your pull request in Github.  It will show up as a check entitled: `docs/readthedocs.org:dataverse-guide — Read the Docs build succeeded!`.  For example, this PR built to <https://dataverse-guide--9249.org.readthedocs.build/en/9249/>.
+
+If you would like to read more about the Dataverse's use of GitHub, please see the {doc}`/developers/version-control` section of the Developer Guide. For bug fixes and features we request that you create an issue before making a pull request but this is not at all necessary for quick fixes to the documentation.
+
+[admin]: https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source/admin
+[api]: https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source/api
+[container]: https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source/container
+
+## Building the Guides with Sphinx
+
+While the "quick fix" technique shown above should work fine for minor changes, especially for larger changes, we recommend installing Sphinx on your computer or using a Sphinx Docker container to build the guides locally so you can get an accurate preview of your changes.
+
+In case you decide to use a Sphinx Docker container to build the guides, you can skip the next two installation sections, but you will need to have Docker installed.
+
+### Installing Sphinx
+
+First, make a fork of <https://github.com/IQSS/dataverse> and clone your fork locally. Then change to the ``doc/sphinx-guides`` directory.
+
+``cd doc/sphinx-guides``
+
+Create a Python virtual environment, activate it, then install dependencies:
+
+``python3 -m venv venv``
+
+``source venv/bin/activate``
+
+``pip install -r requirements.txt``
+
+### Installing GraphViz
+
+In some parts of the documentation, graphs are rendered as images using the Sphinx GraphViz extension.
+
+Building the guides requires the ``dot`` executable from GraphViz.
+
+This requires having [GraphViz](https://graphviz.org) installed and either having ``dot`` on the path or
+[adding options to the `make` call](https://groups.google.com/forum/#!topic/sphinx-users/yXgNey_0M3I).
+
+On a Mac we recommend installing GraphViz through [Homebrew](<https://brew.sh>). Once you have Homebrew installed and configured to work with your shell, you can type `brew install graphviz`.
+
+### Editing and Building the Guides
+
+To edit the existing documentation:
+
+- Create a branch (see {ref}`how-to-make-a-pull-request`).
+- In ``doc/sphinx-guides/source`` you will find the .rst files that correspond to https://guides.dataverse.org.
+- Using your preferred text editor, open and edit the necessary files, or create new ones.
+
+Once you are done, you can preview the changes by building the guides locally. As explained, you can build the guides with Sphinx locally installed, or with a Docker container.
+
+#### Building the Guides with Sphinx Installed Locally
+
+Open a terminal, change directories to `doc/sphinx-guides`, activate (or reactivate) your Python virtual environment, and build the guides.
+
+`cd doc/sphinx-guides`
+
+`source venv/bin/activate`
+
+`make clean`
+
+`make html`
+
+#### Building the Guides with a Sphinx Docker Container and a Makefile
+
+We have added a Makefile to simplify the process of building the guides using a Docker container, you can use the following commands from the repository root:
+
+- `make docs-html`
+- `make docs-pdf`
+- `make docs-epub`
+- `make docs-all`
+
+#### Building the Guides with a Sphinx Docker Container and CLI
+
+If you want to build the guides using a Docker container, execute the following command in the repository root:
+
+`docker run -it --rm -v $(pwd):/docs sphinxdoc/sphinx:7.2.6 bash -c "cd doc/sphinx-guides && pip3 install -r requirements.txt && make html"`
+
+#### Previewing the Guides
+
+After Sphinx is done processing the files you should notice that the `html` folder in `doc/sphinx-guides/build` directory has been updated. You can click on the files in the `html` folder to preview the changes.
+
+Now you can make a commit with the changes to your own fork in GitHub and submit a pull request. See {ref}`how-to-make-a-pull-request`.
+
+## Writing Guidelines
+
+### Writing Style Guidelines
+
+Please observe the following when writing documentation:
+
+- Use American English spelling.
+- Use examples when possible.
+- Break up longer paragraphs.
+- Use Title Case in Headings.
+- Use "double quotes" instead of 'single quotes'.
+- Favor "and" (data and code) over slashes (data/code).
+
+### Table of Contents
+
+Every non-index page should use the following code to display a table of contents of internal sub-headings. This code should be placed below any introductory text and directly above the first subheading, much like a Wikipedia page.
+
+If the page is written in reStructuredText (.rst), use this form:
+
+    .. contents:: |toctitle|
+        :local:
+
+If the page is written in Markdown (.md), use this form:
+
+    ```{contents} Contents:
+    :local:
+    :depth: 3
+    ```
+
+### Links
+
+Getting links right with .rst files can be tricky.
+
+#### Custom Titles
+
+You can use a custom title when linking to a document like this:
+
+    :doc:`Custom title </api/intro>`
+
+See also <https://docs.readthedocs.io/en/stable/guides/cross-referencing-with-sphinx.html#the-doc-role>
+
+### Images
+
+A good documentation is just like a website enhanced and upgraded by adding high quality and self-explanatory images.  Often images depict a lot of written text in a simple manner. Within our Sphinx docs, you can add them in two ways: a) add a PNG image directly and include or b) use inline description languages like GraphViz (current only option).
+
+While PNGs in the git repo can be linked directly via URL, Sphinx-generated images do not need a manual step and might provide higher visual quality. Especially in terms of quality of content, generated images can be extendend and improved by a textbased and reviewable commit, without needing raw data or source files and no diff around.
+
+### Cross References
+
+When adding ReStructured Text (.rst) [cross references](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#ref-role), use the hyphen character (`-`) as the word separator for the cross reference label. For example, `my-reference-label` would be the preferred label for a cross reference as opposed to, for example, `my_reference_label`.
+
+## PDF Version of the Guides
+
+The HTML version of the guides is the official one. Any other formats are maintained on a best effort basis.
+
+If you would like to build a PDF version of the guides and have Docker installed, please try the command below from the root of the git repo:
+
+`docker run -it --rm -v $(pwd):/docs sphinxdoc/sphinx-latexpdf:7.2.6 bash -c "cd doc/sphinx-guides && pip3 install -r requirements.txt && make latexpdf LATEXMKOPTS=\"-interaction=nonstopmode\"; cd ../.. && ls -1 doc/sphinx-guides/build/latex/Dataverse.pdf"`
+
+A few notes about the command above:
+
+- Hopefully the PDF was created at `doc/sphinx-guides/build/latex/Dataverse.pdf`.
+- For now, we are using "nonstopmode" but this masks some errors.
+- See requirements.txt for a note regarding the version of Sphinx we are using.
+
+Also, as of this writing we have enabled PDF builds from the "develop" branch. You download the PDF from <http://preview.guides.gdcc.io/_/downloads/en/develop/pdf/>
+
+If you would like to help improve the PDF version of the guides, please get in touch! Please see {ref}`getting-help-developers` for ways to contact the developer community.
+
+
+## Hosting Your Own Version of the Guides
+
+Some installations of Dataverse maintain their own versions of the guides and use settings like {ref}`:NavbarGuidesUrl` or {ref}`:GuidesBaseUrl` to point their users to them.
+
+### Having Google Index the Latest Version
+
+As each version of the Dataverse software is released, there is an updated version of the guides released with it. Google and other search engines index all versions, which may confuse users who discover your guides in the search results as to which version they should be looking at. When learning about your installation from the search results, it is best to be viewing the *latest* version.
+
+In order to make it clear to the crawlers that we only want the latest version discoverable in their search results, we suggest adding this to your `robots.txt` file:
+
+    User-agent: *
+    Allow: /en/latest/
+    Disallow: /en/
diff --git a/doc/sphinx-guides/source/contributor/index.md b/doc/sphinx-guides/source/contributor/index.md
new file mode 100644
index 00000000000..f7979b1dd0c
--- /dev/null
+++ b/doc/sphinx-guides/source/contributor/index.md
@@ -0,0 +1,105 @@
+# Contributor Guide
+
+Thank you for your interest in contributing to Dataverse!  We are open to contributions from everyone. We welcome contributions of ideas, bug reports, documentation, code, and more!
+
+```{contents} Contents:
+:local:
+:depth: 2
+```
+
+## Ideas and Feature Requests
+
+We would love to hear your ideas!💡
+
+1. Please check if your idea or feature request is already captured in our [issue tracker][] or [roadmap][].
+1. Bring your idea to the community by posting on our [Google Group][] or [chat.dataverse.org][].
+1. To discuss privately, email us at <support@dataverse.org>.
+
+[issue tracker]: https://github.com/IQSS/dataverse/issues
+[roadmap]: https://www.iq.harvard.edu/roadmap-dataverse-project
+[chat.dataverse.org]: http://chat.dataverse.org
+[Google Group]: https://groups.google.com/group/dataverse-community
+
+## Bug Reports
+
+Before submitting an issue, please search for existing issues in our [issue tracker][]. If there is an existing open issue that matches the issue you want to report, please add a comment to it or give it a 👍 (thumbs up).
+
+If there is no pre-existing issue or it has been closed, please open a new issue (unless it is a security issue which should be reported privately to <security@dataverse.org> as discussed under {ref}`reporting-security-issues` in the Installation Guide).
+
+If you do not receive a reply to your new issue or comment in a timely manner, please ping us at [chat.dataverse.org][].
+
+## Documentation
+
+Documentation is such a large topic (and important!) that we have a dedicate section on it:
+
+```{toctree}
+:maxdepth: 1
+documentation.md
+```
+
+## Translations
+
+If you speak multiple languages, you are very welcome to help us translate Dataverse! Please see {ref}`help-translate` for details.
+
+## Code
+
+Dataverse is open source and we love code contributions. Developers are not limited to the main Dataverse code in this git repo. We have projects in C, C++, Go, Java, Javascript, Julia, PHP, Python, R, Ruby, Rust, TypeScript and more. To get started, please see the following pages:
+
+```{toctree}
+:maxdepth: 1
+code.md
+```
+
+## Usability Testing
+
+Please email us at <support@dataverse.org> or fill in our [feedback form][] if you are interested in participating in usability testing.
+
+[feedback form]: https://goo.gl/forms/p7uu3GfiWYSlJrsi1
+
+## Answering Questions
+
+People come along with questions on the [mailing list](https://groups.google.com/g/dataverse-community) and in [chat][] all the time. You are very welcome to help out by answering these questions to the best of your ability.
+
+[chat]: https://chat.dataverse.org
+
+## Sample Data
+
+Consider contributing to <https://github.com/IQSS/dataverse-sample-data>, a git repo of realistic-looking data that is used for testing.
+
+## Issue Triage
+
+New issues come in all the time, especially for the main issue tracker at <https://github.com/IQSS/dataverse/issues>.
+
+You can help by leaving comments. You can mention related issues or answer questions.
+
+If you are interested in adding issue labels or related curation, please get in touch!
+
+## Giving Talks
+
+If you give a recorded talk about Dataverse, we are happy to add it to [DataverseTV](https://dataverse.org/dataversetv). You can just leave a comment on the [spreadsheet](https://docs.google.com/spreadsheets/d/1uVk_57Ek_A49sLZ5OKdI6QASKloWNzykni3kcYNzpxA/edit#gid=0) or make some noise in [chat][].
+
+For non-recorded talks, we are happy to upload your slides to <https://dataverse.org/presentations>. Please email <support@dataverse.org>.
+
+## Working Groups
+
+Most working groups are wide open to participation. For the current list of groups, please see <https://www.gdcc.io/working-groups.html>.
+
+You're welcome to start your own working group, of course. We can help you get the word out.
+
+## GDCC
+
+The popularity of the Dataverse software has resulted in a continuously growing community with different needs and requirements. The Global Dataverse Community Consortium (GDCC) helps coordinate community efforts and sustain the software and community in the long term. Please consider contributing to GDCC by joining as an institutional member (<https://www.gdcc.io/members.html>).
+
+## Artwork
+
+Surely we can put artistic talent to use. A contributor [drew cartoon animals chatting about Dataverse](https://github.com/IQSS/chat.dataverse.org/issues/18), for example.
+
+As [annnounced](https://groups.google.com/g/dataverse-community/c/pM39_9O5Rug/m/CK-gJqZFBgAJ), we have a [sticker template](https://dataverse.org/sites/projects.iq.harvard.edu/files/dataverseorg/files/dataverse_community_stickers_template.zip) you can use.
+
+See [Illustrations from The Turing Way](https://zenodo.org/doi/10.5281/zenodo.3332807) for how that community has created artwork. Perhaps we can create a similar collection.
+
+## Other Contributions
+
+We consulted <https://opensource.guide/how-to-contribute/> but no list is comprehensive.
+
+What else should we list here? How to YOU want to contribute to Dataverse? 🎉
diff --git a/doc/sphinx-guides/source/developers/api-design.rst b/doc/sphinx-guides/source/developers/api-design.rst
new file mode 100755
index 00000000000..d51481fece4
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/api-design.rst
@@ -0,0 +1,78 @@
+==========
+API Design
+==========
+
+API design is a large topic. We expect this page to grow over time.
+
+.. contents:: |toctitle|
+	:local:
+
+.. _openapi-dev:
+
+OpenAPI
+-------
+
+As you add API endpoints, please be conscious that we are exposing these endpoints as an OpenAPI document at ``/openapi`` (e.g. http://localhost:8080/openapi ). See :ref:`openapi` in the API Guide for the user-facing documentation.
+
+We've played around with validation tools such as https://quobix.com/vacuum/ and https://pb33f.io/doctor/ only to discover that our OpenAPI output is less than ideal, generating various warnings and errors.
+
+You can prevent additional problems in our OpenAPI document by observing the following practices:
+
+- When creating a method name within an API class, make it unique.
+
+If you are looking for a reference about the annotations used to generate the OpenAPI document, you can find it in the `MicroProfile OpenAPI Specification <https://download.eclipse.org/microprofile/microprofile-open-api-3.1/microprofile-openapi-spec-3.1.html#_detailed_usage_of_key_annotations>`_.
+
+Paths
+-----
+
+A reminder `from Wikipedia <https://en.wikipedia.org/wiki/Uniform_Resource_Identifier>`_ of what a path is:
+
+.. code-block:: bash
+
+          userinfo       host      port
+          ┌──┴───┐ ┌──────┴──────┐ ┌┴┐
+  https://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top
+  └─â”Ŧ─┘   └─────────────â”Ŧ────────────┘└───────â”Ŧ───────┘ └────────────â”Ŧ────────────┘ └â”Ŧ┘
+  scheme          authority                  path                  query           fragment
+
+Exposing Settings
+~~~~~~~~~~~~~~~~~
+
+Since Dataverse 4, database settings have been exposed via API at http://localhost:8080/api/admin/settings
+
+(JVM options are probably available via the Payara REST API, but this is out of scope.)
+
+Settings need to be exposed outside to API clients outside of ``/api/admin`` (which is typically restricted to localhost). Here are some guidelines to follow when exposing settings.
+
+- When you are exposing a database setting as-is:
+
+  - Use ``/api/info/settings`` as the root path.
+
+  - Append the name of the setting including the colon (e.g. ``:DatasetPublishPopupCustomText``)
+
+  - Final path example: ``/api/info/settings/:DatasetPublishPopupCustomText``
+
+- If the absence of the database setting is filled in by a default value (e.g. ``:ZipDownloadLimit`` or ``:ApiTermsOfUse``):
+
+  - Use ``/api/info`` as the root path.
+
+  - Append the setting but remove the colon and downcase the first character (e.g. ``zipDownloadLimit``)
+
+  - Final path example: ``/api/info/zipDownloadLimit``
+
+- If the database setting you're exposing make more sense outside of ``/api/info`` because there's more context (e.g. ``:CustomDatasetSummaryFields``):
+
+  - Feel free to use a path outside of ``/api/info`` as the root path.
+
+  - Given additional context, append a shortened name (e.g. ``/api/datasets/summaryFieldNames``).
+
+  - Final path example: ``/api/datasets/summaryFieldNames``
+
+- If you need to expose a JVM option (MicroProfile setting) such as ``dataverse.api.allow-incomplete-metadata``:
+
+  - Use ``/api/info`` as the root path.
+
+  - Append a meaningful name for the setting (e.g. ``incompleteMetadataViaApi``).
+
+  - Final path example: ``/api/info/incompleteMetadataViaApi``
+
diff --git a/doc/sphinx-guides/source/developers/aux-file-support.rst b/doc/sphinx-guides/source/developers/aux-file-support.rst
new file mode 100644
index 00000000000..9b2734b3a25
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/aux-file-support.rst
@@ -0,0 +1,69 @@
+Auxiliary File Support
+======================
+
+Auxiliary file support is experimental and as such, related APIs may be added, changed or removed without standard backward compatibility. Auxiliary files in the Dataverse Software are being added to support depositing and downloading differentially private metadata, as part of the `OpenDP project <https://opendp.org>`_. In future versions, this approach will likely become more broadly used and supported.
+
+Adding an Auxiliary File to a Datafile
+--------------------------------------
+To add an auxiliary file, specify the primary key of the datafile (FILE_ID), and the formatTag and formatVersion (if applicable) associated with the auxiliary file. There are multiple form parameters. "Origin" specifies the application/entity that created the auxiliary file, and "isPublic" controls access to downloading the file. If "isPublic" is true, any user can download the file if the dataset has been published, else, access authorization is based on the access rules as defined for the DataFile itself. The "type" parameter is used to group similar auxiliary files in the UI. Currently, auxiliary files with type "DP" appear under "Differentially Private Statistics", while all other auxiliary files appear under "Other Auxiliary Files".
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export FILENAME='auxfile.json'
+  export FILETYPE='application/json'
+  export FILE_ID='12345'
+  export FORMAT_TAG='dpJson'
+  export FORMAT_VERSION='v1'
+  export TYPE='DP'
+  export SERVER_URL=https://demo.dataverse.org
+  
+  curl -H X-Dataverse-key:$API_TOKEN -X POST -F "file=@$FILENAME;type=$FILETYPE" -F 'origin=myApp' -F 'isPublic=true' -F "type=$TYPE" "$SERVER_URL/api/access/datafile/$FILE_ID/auxiliary/$FORMAT_TAG/$FORMAT_VERSION"
+
+You should expect a 200 ("OK") response and JSON with information about your newly uploaded auxiliary file.
+
+Downloading an Auxiliary File that Belongs to a Datafile
+--------------------------------------------------------
+To download an auxiliary file, use the primary key of the datafile, and the formatTag and formatVersion (if applicable) associated with the auxiliary file. An API token is shown in the example below but it is not necessary if the auxiliary file was uploaded with isPublic=true and the dataset has been published.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export FILE_ID='12345'
+  export FORMAT_TAG='dpJson'
+  export FORMAT_VERSION='v1'
+  
+  curl -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/access/datafile/$FILE_ID/auxiliary/$FORMAT_TAG/$FORMAT_VERSION"
+  
+Listing Auxiliary Files for a Datafile by Origin
+------------------------------------------------
+To list auxiliary files, specify the primary key of the datafile (FILE_ID), and the origin associated with the auxiliary files to list (the application/entity that created them).
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export FILE_ID='12345'
+  export SERVER_URL=https://demo.dataverse.org
+  export ORIGIN='app1'
+  
+  curl -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/access/datafile/$FILE_ID/auxiliary/$ORIGIN"
+  
+You should expect a 200 ("OK") response and a JSON array with objects representing the auxiliary files found, or a 404/Not Found response if no auxiliary files exist with that origin.
+  
+Deleting an Auxiliary File that Belongs to a Datafile
+-----------------------------------------------------
+To delete an auxiliary file, use the primary key of the datafile, and the
+formatTag and formatVersion (if applicable) associated with the auxiliary file:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export FILE_ID='12345'
+  export FORMAT_TAG='dpJson'
+  export FORMAT_VERSION='v1'
+  
+  curl -H X-Dataverse-key:$API_TOKEN DELETE -X "$SERVER_URL/api/access/datafile/$FILE_ID/auxiliary/$FORMAT_TAG/$FORMAT_VERSION"
+  
+  
diff --git a/doc/sphinx-guides/source/developers/big-data-support.rst b/doc/sphinx-guides/source/developers/big-data-support.rst
index 37a794e804e..75a50e2513d 100644
--- a/doc/sphinx-guides/source/developers/big-data-support.rst
+++ b/doc/sphinx-guides/source/developers/big-data-support.rst
@@ -1,270 +1,192 @@
 Big Data Support
 ================
 
-Big data support is highly experimental. Eventually this content will move to the Installation Guide.
+Big data support includes some experimental options. Eventually more of this content will move to the Installation Guide.
 
 .. contents:: |toctitle|
         :local:
 
-Various components need to be installed and configured for big data support.
+Various components will need to be installed and/or configured for big data support via the methods described below.
 
-Data Capture Module (DCM)
--------------------------
+S3 Direct Upload and Download
+-----------------------------
 
-Data Capture Module (DCM) is an experimental component that allows users to upload large datasets via rsync over ssh.
+A lightweight option for supporting file sizes beyond a few gigabytes - a size that can cause performance issues when uploaded through a Dataverse installation itself - is to configure an S3 store to provide direct upload and download via 'pre-signed URLs'. When these options are configured, file uploads and downloads are made directly to and from a configured S3 store using secure (https) connections that enforce a Dataverse installation's access controls. (The upload and download URLs are signed with a unique key that only allows access for a short time period and a Dataverse installation will only generate such a URL if the user has permission to upload/download the specific file in question.)
 
-Install a DCM
-~~~~~~~~~~~~~
+This option can handle files >300GB and could be appropriate for files up to a TB or larger. Other options can scale farther, but this option has the advantages that it is simple to configure and does not require any user training - uploads and downloads are done via the same interface as normal uploads to a Dataverse installation.
 
-Installation instructions can be found at https://github.com/sbgrid/data-capture-module/blob/master/doc/installation.md. Note that shared storage (posix or AWS S3) between Dataverse and your DCM is required. You cannot use a DCM with Swift at this point in time.
+To configure these options, an administrator must set two JVM options for the Dataverse installation using the same process as for other configuration options:
 
-.. FIXME: Explain what ``dataverse.files.dcm-s3-bucket-name`` is for and what it has to do with ``dataverse.files.s3-bucket-name``.
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.download-redirect=true"``
 
-Once you have installed a DCM, you will need to configure two database settings on the Dataverse side. These settings are documented in the :doc:`/installation/config` section of the Installation Guide:
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.upload-redirect=true"``
 
-- ``:DataCaptureModuleUrl`` should be set to the URL of a DCM you installed.
-- ``:UploadMethods`` should include ``dcm/rsync+ssh``.
-  
-This will allow your Dataverse installation to communicate with your DCM, so that Dataverse can download rsync scripts for your users.
-
-Downloading rsync scripts via Dataverse API
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The rsync script can be downloaded from Dataverse via API using an authorized API token. In the curl example below, substitute ``$PERSISTENT_ID`` with a DOI or Handle:
-
-``curl -H "X-Dataverse-key: $API_TOKEN" $DV_BASE_URL/api/datasets/:persistentId/dataCaptureModule/rsync?persistentId=$PERSISTENT_ID``
-
-How a DCM reports checksum success or failure to Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Once the user uploads files to a DCM, that DCM will perform checksum validation and report to Dataverse the results of that validation. The DCM must be configured to pass the API token of a superuser. The implementation details, which are subject to change, are below.
-
-The JSON that a DCM sends to Dataverse on successful checksum validation looks something like the contents of :download:`checksumValidationSuccess.json <../_static/installation/files/root/big-data-support/checksumValidationSuccess.json>` below:
-
-.. literalinclude:: ../_static/installation/files/root/big-data-support/checksumValidationSuccess.json
-   :language: json
-
-- ``status`` - The valid strings to send are ``validation passed`` and ``validation failed``.
-- ``uploadFolder`` - This is the directory on disk where Dataverse should attempt to find the files that a DCM has moved into place. There should always be a ``files.sha`` file and a least one data file. ``files.sha`` is a manifest of all the data files and their checksums. The ``uploadFolder`` directory is inside the directory where data is stored for the dataset and may have the same name as the "identifier" of the persistent id (DOI or Handle). For example, you would send ``"uploadFolder": "DNXV2H"`` in the JSON file when the absolute path to this directory is ``/usr/local/glassfish4/glassfish/domains/domain1/files/10.5072/FK2/DNXV2H/DNXV2H``.
-- ``totalSize`` - Dataverse will use this value to represent the total size in bytes of all the files in the "package" that's created. If 360 data files and one ``files.sha`` manifest file are in the ``uploadFolder``, this value is the sum of the 360 data files.
-
-
-Here's the syntax for sending the JSON.
-
-``curl -H "X-Dataverse-key: $API_TOKEN" -X POST -H 'Content-type: application/json' --upload-file checksumValidationSuccess.json $DV_BASE_URL/api/datasets/:persistentId/dataCaptureModule/checksumValidation?persistentId=$PERSISTENT_ID``
-
-
-Steps to set up a DCM mock for Development
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-See instructions at https://github.com/sbgrid/data-capture-module/blob/master/doc/mock.md
-
-
-Add Dataverse settings to use mock (same as using DCM, noted above):
-
-- ``curl http://localhost:8080/api/admin/settings/:DataCaptureModuleUrl -X PUT -d "http://localhost:5000"``
-- ``curl http://localhost:8080/api/admin/settings/:UploadMethods -X PUT -d "dcm/rsync+ssh"``
-
-At this point you should be able to download a placeholder rsync script. Dataverse is then waiting for news from the DCM about if checksum validation has succeeded or not. First, you have to put files in place, which is usually the job of the DCM. You should substitute "X1METO" for the "identifier" of the dataset you create. You must also use the proper path for where you store files in your dev environment.
-
-- ``mkdir /usr/local/glassfish4/glassfish/domains/domain1/files/10.5072/FK2/X1METO``
-- ``mkdir /usr/local/glassfish4/glassfish/domains/domain1/files/10.5072/FK2/X1METO/X1METO``
-- ``cd /usr/local/glassfish4/glassfish/domains/domain1/files/10.5072/FK2/X1METO/X1METO``
-- ``echo "hello" > file1.txt``
-- ``shasum file1.txt > files.sha``
-
-
-
-Now the files are in place and you need to send JSON to Dataverse with a success or failure message as described above. Make a copy of ``doc/sphinx-guides/source/_static/installation/files/root/big-data-support/checksumValidationSuccess.json`` and put the identifier in place such as "X1METO" under "uploadFolder"). Then use curl as described above to send the JSON.
-
-Troubleshooting
-~~~~~~~~~~~~~~~
 
-The following low level command should only be used when troubleshooting the "import" code a DCM uses but is documented here for completeness.
+With multiple stores configured, it is possible to configure one S3 store with direct upload and/or download to support large files (in general or for specific Dataverse collections) while configuring only direct download, or no direct access for another store.
 
-``curl -H "X-Dataverse-key: $API_TOKEN" -X POST "$DV_BASE_URL/api/batch/jobs/import/datasets/files/$DATASET_DB_ID?uploadFolder=$UPLOAD_FOLDER&totalSize=$TOTAL_SIZE"``
-
-Steps to set up a DCM via Docker for Development
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you need a fully operating DCM client for development purposes, these steps will guide you to setting one up. This includes steps to set up the DCM on S3 variant.
-
-Docker Image Set-up
-^^^^^^^^^^^^^^^^^^^
-
-See https://github.com/IQSS/dataverse/blob/develop/conf/docker-dcm/readme.md
-
-- Install docker if you do not have it
-      
-Optional steps for setting up the S3 Docker DCM Variant
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-- Before: the default bucket for DCM to hold files in S3 is named test-dcm. It is coded into `post_upload_s3.bash` (line 30). Change to a different bucket if needed.
-
-  - Add AWS bucket info to dcmsrv
-    - Add AWS credentials to ``~/.aws/credentials``
-
-      - ``[default]``
-      - ``aws_access_key_id =``
-      - ``aws_secret_access_key =``
-
-- Dataverse configuration (on dvsrv):
-
-  - Set S3 as the storage driver
-
-    - ``cd /opt/glassfish4/bin/``
-    - ``./asadmin delete-jvm-options "\-Ddataverse.files.storage-driver-id=file"``
-    - ``./asadmin create-jvm-options "\-Ddataverse.files.storage-driver-id=s3"``
-
-  - Add AWS bucket info to Dataverse
-    - Add AWS credentials to ``~/.aws/credentials``
-    
-      - ``[default]``
-      - ``aws_access_key_id =``
-      - ``aws_secret_access_key =``
-
-    - Also: set region in ``~/.aws/config`` to create a region file. Add these contents:
-
-      - ``[default]``
-      - ``region = us-east-1``
-
-  - Add the S3 bucket names to Dataverse
-
-    - S3 bucket for Dataverse
-
-      - ``/usr/local/glassfish4/glassfish/bin/asadmin create-jvm-options "-Ddataverse.files.s3-bucket-name=iqsstestdcmbucket"``
-
-    - S3 bucket for DCM (as Dataverse needs to do the copy over)
+The direct upload option now switches between uploading the file in one piece (up to 1 GB by default) and sending it as multiple parts. The default can be changed by setting:
+  
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.min-part-size=<size in bytes>"``
 
-      - ``/usr/local/glassfish4/glassfish/bin/asadmin create-jvm-options "-Ddataverse.files.dcm-s3-bucket-name=test-dcm"``
+For AWS, the minimum allowed part size is 5*1024*1024 bytes and the maximum is 5 GB (5*1024**3). Other providers may set different limits.
 
-  - Set download method to be HTTP, as DCM downloads through S3 are over this protocol ``curl -X PUT "http://localhost:8080/api/admin/settings/:DownloadMethods" -d "native/http"``
+It is also possible to set file upload size limits per store. See the :MaxFileUploadSizeInBytes setting described in the :doc:`/installation/config` guide.
 
-Using the DCM Docker Containers
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+At present, one potential drawback for direct-upload is that files are only partially 'ingested' - tabular and FITS files are processed, but zip files are not unzipped, and the file contents are not inspected to evaluate their mimetype. This could be appropriate for large files, or it may be useful to completely turn off ingest processing for performance reasons (ingest processing requires a copy of the file to be retrieved by the Dataverse installation from the S3 store). A store using direct upload can be configured to disable all ingest processing for files above a given size limit:
 
-For using these commands, you will need to connect to the shell prompt inside various containers (e.g. ``docker exec -it dvsrv /bin/bash``)
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.ingestsizelimit=<size in bytes>"``
 
-- Create a dataset and download rsync upload script
+.. _s3-direct-upload-features-disabled:
 
-  - connect to client container: ``docker exec -it dcm_client bash``
-  - create dataset: ``cd /mnt ; ./create.bash`` ; this will echo the database ID to stdout
-  - download transfer script: ``./get_transfer.bash $database_id_from_create_script``
-  - execute the transfer script: ``bash ./upload-${database_id_from-create_script}.bash`` , and follow instructions from script.
+Features that are Disabled if S3 Direct Upload is Enabled
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- Run script
+The following features are disabled when S3 direct upload is enabled.
 
-  - e.g. ``bash ./upload-3.bash`` (``3`` being the database id from earlier commands in this example).
+- Unzipping of zip files. (See :ref:`compressed-files`.)
+- Detection of file type based on JHOVE and custom code that reads the first few bytes except for the refinement of Stata file types to include the version. (See :ref:`redetect-file-type`.)
+- Extraction of metadata from FITS files. (See :ref:`fits`.)
+- Creation of NcML auxiliary files (See :ref:`netcdf-and-hdf5`.)
+- Extraction of a geospatial bounding box from NetCDF and HDF5 files (see :ref:`netcdf-and-hdf5`) unless :ref:`dataverse.netcdf.geo-extract-s3-direct-upload` is set to true.
 
-- Manually run post upload script on dcmsrv
+.. _cors-s3-bucket:
 
-  - for posix implementation: ``docker exec -it dcmsrv /opt/dcm/scn/post_upload.bash``
-  - for S3 implementation: ``docker exec -it dcmsrv /opt/dcm/scn/post_upload_s3.bash``
+Allow CORS for S3 Buckets
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Additional DCM docker development tips
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+**IMPORTANT:** One additional step that is required to enable direct uploads via a Dataverse installation and for direct download to work with previewers and direct upload to work with dvwebloader (:ref:`folder-upload`) is to allow cross site (CORS) requests on your S3 store.
+The example below shows how to enable CORS rules (to support upload and download) on a bucket using the AWS CLI command line tool. Note that you may want to limit the AllowedOrigins and/or AllowedHeaders further.  https://github.com/gdcc/dataverse-previewers/wiki/Using-Previewers-with-download-redirects-from-S3 has some additional information about doing this.
 
-- You can completely blow away all the docker images with these commands (including non DCM ones!)
-  - ``docker-compose -f docmer-compose.yml down -v``
+If you'd like to check the CORS configuration on your bucket before making changes:
 
-- There are a few logs to tail
+``aws s3api get-bucket-cors --bucket <BUCKET_NAME>``
 
-  - dvsrv : ``tail -n 2000 -f /opt/glassfish4/glassfish/domains/domain1/logs/server.log``
-  - dcmsrv : ``tail -n 2000 -f /var/log/lighttpd/breakage.log``
-  - dcmsrv : ``tail -n 2000 -f /var/log/lighttpd/access.log``
+To proceed with making changes:
 
-- You may have to restart the glassfish domain occasionally to deal with memory filling up. If deployment is getting reallllllly slow, its a good time.
+``aws s3api put-bucket-cors --bucket <BUCKET_NAME> --cors-configuration file://cors.json``
 
-Repository Storage Abstraction Layer (RSAL)
--------------------------------------------
+with the contents of the file cors.json as follows:
 
-Steps to set up a DCM via Docker for Development
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: json
 
-See https://github.com/IQSS/dataverse/blob/develop/conf/docker-dcm/readme.md
+        {
+          "CORSRules": [
+             {
+                "AllowedOrigins": ["*"],
+                "AllowedHeaders": ["*"],
+                "AllowedMethods": ["PUT", "GET"],
+                "ExposeHeaders": ["ETag", "Accept-Ranges", "Content-Encoding", "Content-Range"]
+             }
+          ]
+        }
 
-Using the RSAL Docker Containers
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Alternatively, you can enable CORS using the AWS S3 web interface, using json-encoded rules as in the example above. 
 
-- Create a dataset (either with the procedure mentioned in DCM Docker Containers, or another process)
-- Publish the dataset (from the client container): ``cd /mnt; ./publish_major.bash ${database_id}``
-- Run the RSAL component of the workflow (from the host): ``docker exec -it rsalsrv /opt/rsal/scn/pub.py``
-- If desired, from the client container you can download the dataset following the instructions in the dataset access section of the dataset page.
+.. _s3-tags-and-direct-upload:
 
-Configuring the RSAL Mock
+S3 Tags and Direct Upload
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Info for configuring the RSAL Mock: https://github.com/sbgrid/rsal/tree/master/mocks
-
-Also, to configure Dataverse to use the new workflow you must do the following (see also the :doc:`workflows` section):
+Since the direct upload mechanism creates the final file rather than an intermediate temporary file, user actions, such as neither saving or canceling an upload session before closing the browser page, can leave an abandoned file in the store. The direct upload mechanism attempts to use S3 tags to aid in identifying/removing such files. Upon upload, files are given a "dv-state":"temp" tag which is removed when the dataset changes are saved and new files are added in the Dataverse installation. Note that not all S3 implementations support tags. Minio, for example, does not. With such stores, direct upload may not work and you might need to disable tagging. For details, see :ref:`s3-tagging` in the Installation Guide.
 
-1. Configure the RSAL URL:
+Trusted Remote Storage with the ``remote`` Store Type
+-----------------------------------------------------
 
-``curl -X PUT -d 'http://<myipaddr>:5050' http://localhost:8080/api/admin/settings/:RepositoryStorageAbstractionLayerUrl``
+For very large, and/or very sensitive data, it may not make sense to transfer or copy files to Dataverse at all. The experimental ``remote`` store type in the Dataverse software now supports this use case. 
 
-2. Update workflow json with correct URL information:
+With this storage option Dataverse stores a URL reference for the file rather than transferring the file bytes to a store managed directly by Dataverse. Basic configuration for a remote store is described at :ref:`file-storage` in the Configuration Guide.
 
-Edit internal-httpSR-workflow.json and replace url and rollbackUrl to be the url of your RSAL mock.
+Once the store is configured, it can be assigned to a collection or individual datasets as with other stores. In a dataset using this store, users can reference remote files which will then appear the same basic way as other datafiles. 
 
-3. Create the workflow:
+Currently, remote files can only be added via the API. Users can also upload smaller files via the UI or API which will be stored in the configured base store.
 
-``curl http://localhost:8080/api/admin/workflows -X POST --data-binary @internal-httpSR-workflow.json -H "Content-type: application/json"``
+If the store has been configured with a remote-store-name or remote-store-url, the dataset file table will include this information for remote files. These provide a visual indicator that the files are not managed directly by Dataverse and are stored/managed by a remote trusted store.
 
-4. List available workflows:
+Rather than sending the file bytes, metadata for the remote file is added using the "jsonData" parameter.
+jsonData normally includes information such as a file description, tags, provenance, whether the file is restricted, etc. For remote references, the jsonData object must also include values for:
 
-``curl http://localhost:8080/api/admin/workflows``
+* "storageIdentifier" - String, as specified in prior calls
+* "fileName" - String
+* "mimeType" - String
+* fixity/checksum: either: 
 
-5. Set the workflow (id) as the default workflow for the appropriate trigger:
+  * "md5Hash" - String with MD5 hash value, or
+  * "checksum" - Json Object with "@type" field specifying the algorithm used and "@value" field with the value from that algorithm, both Strings 
 
-``curl http://localhost:8080/api/admin/workflows/default/PrePublishDataset -X PUT -d 2``
+The allowed checksum algorithms are defined by the edu.harvard.iq.dataverse.DataFile.CheckSumType class and currently include MD5, SHA-1, SHA-256, and SHA-512
 
-6. Check that the trigger has the appropriate default workflow set:
+(The remote store leverages the same JSON upload syntax as the last step in direct upload to S3 described in the :ref:`Adding the Uploaded file to the Dataset <direct-add-to-dataset-api>` section of the :doc:`/developers/s3-direct-upload-api`.)
 
-``curl http://localhost:8080/api/admin/workflows/default/PrePublishDataset``
+.. code-block:: bash
 
-7. Add RSAL to whitelist
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK27U7YBV
+  export JSON_DATA='{"description":"My description.","directoryLabel":"data/subdir1","categories":["Data"], "restrict":"false", "storageIdentifier":"trs://images/dataverse_project_logo.svg", "fileName":"dataverse_logo.svg", "mimeType":"image/svg+xml", "checksum": {"@type": "SHA-1", "@value": "123456"}}'
 
-8. When finished testing, unset the workflow:
-
-``curl -X DELETE http://localhost:8080/api/admin/workflows/default/PrePublishDataset``
+  curl -X POST -H "X-Dataverse-key: $API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/add?persistentId=$PERSISTENT_IDENTIFIER" -F "jsonData=$JSON_DATA"
+  
+The variant allowing multiple files to be added once that is discussed in the :doc:`/developers/s3-direct-upload-api` document can also be used.
 
-Configuring download via rsync
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Considerations:
 
-In order to see the rsync URLs, you must run this command:
+* Remote stores are configured with a base-url which limits what files can be referenced, i.e. the absolute URL for the file is <base-url>/<path in storageidentifier>.
+* The current store will not prevent you from providing a relative URL that results in a 404 when resolved. (I.e. if you make a typo). You should check to make sure the file exists at the location you specify - by trying to download in Dataverse, by checking to see that Dataverse was able to get the file size (which it does by doing a HEAD call to that location), or just manually trying the URL in your browser.
+* Admins are trusting the organization managing the site/service at base-url to maintain the referenced files for as long as the Dataverse instance needs them. Formal agreements are recommended for production
+* For large files, direct-download should always be used with a remote store. (Otherwise the Dataverse will be involved in the download.)
+* For simple websites, a remote store should be marked public which will turn off restriction and embargo functionality in Dataverse (since Dataverse cannot restrict access to the file on the remote website)
+* Remote stores can be configured with a secret-key. This key will be used to sign URLs when Dataverse retrieves the file content or redirects a user for download. If remote service is able to validate the signature and reject invalid requests, the remote store mechanism can be used to manage restricted and embargoes files, access requests in Dataverse, etc. Dataverse contains Java code that validates these signatures which could be used, for example, to create a validation proxy in front of a web server to allow Dataverse to manage access. The secret-key is a shared secret between Dataverse and the remote service and is not shared with/is not accessible by users or those with access to user's machines.
+* Sophisticated remote services may wish to register file URLs that do not directly reference the file contents (bytes) but instead direct the user to a website where further information about the remote service's download process can be found.
+* Due to the current design, ingest cannot be done on remote files and administrators should disable ingest when using a remote store. This can be done by setting the ingest size limit for the store to 0 and/or using the recently added option to not perform tabular ingest on upload. 
+* Dataverse will normally try to access the file contents itself, i.e. for ingest (in future versions), full-text indexing, thumbnail creation, etc. This processing may not be desirable for large/sensitive data, and, for the case where the URL does not reference the file itself, would not be possible. At present, administrators should configure the relevant size limits to avoid such actions.
+* The current implementation of remote stores is experimental in the sense that future work to enhance it is planned. This work may result in changes to how the store works and lead to additional work when upgrading for sites that start using this mechanism now.
 
-``curl -X PUT -d 'rsal/rsync' http://localhost:8080/api/admin/settings/:DownloadMethods``
+To configure the options mentioned above, an administrator must set two JVM options for the Dataverse installation using the same process as for other configuration options:
 
-..  TODO: Document these in the Installation Guide once they're final.
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.download-redirect=true"``
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.secret-key=somelongrandomalphanumerickeythelongerthebetter123456"``
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.public=true"``
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.ingestsizelimit=<size in bytes>"``
 
-To specify replication sites that appear in rsync URLs:
+.. _globus-support:
 
-Download :download:`add-storage-site.json <../../../../scripts/api/data/storageSites/add-storage-site.json>` and adjust it to meet your needs. The file should look something like this:
+Globus File Transfer
+--------------------
 
-.. literalinclude:: ../../../../scripts/api/data/storageSites/add-storage-site.json
+Note: Globus file transfer is still experimental but feedback is welcome! See :ref:`support`.
 
-Then add the storage site using curl:
+Users can transfer files via `Globus <https://www.globus.org>`_ into and out of datasets, or reference files on a remote Globus endpoint, when their Dataverse installation is configured to use a Globus accessible store(s) 
+and a community-developed `dataverse-globus <https://github.com/scholarsportal/dataverse-globus>`_ app has been properly installed and configured.
 
-``curl -H "Content-type:application/json" -X POST http://localhost:8080/api/admin/storageSites --upload-file add-storage-site.json``
+Globus endpoints can be in a variety of places, from data centers to personal computers. 
+This means that from within the Dataverse software, a Globus transfer can feel like an upload or a download (with Globus Personal Connect running on your laptop, for example) or it can feel like a true transfer from one server to another (from a cluster in a data center into a Dataverse dataset or vice versa).
 
-You make a storage site the primary site by passing "true". Pass "false" to make it not the primary site. (id "1" in the example):
+Globus transfer uses an efficient transfer mechanism and has additional features that make it suitable for large files and large numbers of files:
 
-``curl -X PUT -d true http://localhost:8080/api/admin/storageSites/1/primaryStorage``
+* robust file transfer capable of restarting after network or endpoint failures
+* third-party transfer, which enables a user accessing a Dataverse installation in their desktop browser to initiate transfer of their files from a remote endpoint (i.e. on a local high-performance computing cluster), directly to an S3 store managed by the Dataverse installation
 
-You can delete a storage site like this (id "1" in the example):
+Note: Due to differences in the access control models of a Dataverse installation and Globus and the current Globus store model, Dataverse cannot enforce per-file-access restrictions.
+It is therefore recommended that a store be configured as public, which disables the ability to restrict and embargo files in that store, when Globus access is allowed.
 
-``curl -X DELETE http://localhost:8080/api/admin/storageSites/1``
+Dataverse supports three options for using Globus, two involving transfer to Dataverse-managed endpoints and one allowing Dataverse to reference files on remote endpoints.
+Dataverse-managed endpoints must be Globus 'guest collections' hosted on either a file-system-based endpoint or an S3-based endpoint (the latter requires use of the Globus
+S3 connector which requires a paid Globus subscription at the host institution). In either case, Dataverse is configured with the Globus credentials of a user account that can manage the endpoint.
+Users will need a Globus account, which can be obtained via their institution or directly from Globus (at no cost).
 
-You can view a single storage site like this: (id "1" in the example):
+With the file-system endpoint, Dataverse does not currently have access to the file contents. Thus, functionality related to ingest, previews, fixity hash validation, etc. are not available. (Using the S3-based endpoint, Dataverse has access via S3 and all functionality normally associated with direct uploads to S3 is available.)
 
-``curl http://localhost:8080/api/admin/storageSites/1``
+For the reference use case, Dataverse must be configured with a list of allowed endpoint/base paths from which files may be referenced. In this case, since Dataverse is not accessing the remote endpoint itself, it does not need Globus credentials. 
+Users will need a Globus account in this case, and the remote endpoint must be configured to allow them access (i.e. be publicly readable, or potentially involving some out-of-band mechanism to request access (that could be described in the dataset's Terms of Use and Access).
 
-You can view all storage site like this:
+All of Dataverse's Globus capabilities are now store-based (see the store documentation) and therefore different collections/datasets can be configured to use different Globus-capable stores (or normal file, S3 stores, etc.)
 
-``curl http://localhost:8080/api/admin/storageSites``
+More details of the setup required to enable Globus is described in the `Community Dataverse-Globus Setup and Configuration document <https://docs.google.com/document/d/1mwY3IVv8_wTspQC0d4ddFrD2deqwr-V5iAGHgOy4Ch8/edit?usp=sharing>`_ and the references therein.
 
-In the GUI, this is called "Local Access". It's where you can compute on files on your cluster.
+As described in that document, Globus transfers can be initiated by choosing the Globus option in the dataset upload panel. (Globus, which does asynchronous transfers, is not available during dataset creation.) Analogously, "Globus Transfer" is one of the download options in the "Access Dataset" menu and optionally the file landing page download menu (if/when supported in the dataverse-globus app).
 
-``curl http://localhost:8080/api/admin/settings/:LocalDataAccessPath -X PUT -d "/programs/datagrid"``
+An overview of the control and data transfer interactions between components was presented at the 2022 Dataverse Community Meeting and can be viewed in the `Integrations and Tools Session Video <https://youtu.be/3ek7F_Dxcjk?t=5289>`_ around the 1 hr 28 min mark.
 
+See also :ref:`Globus settings <:GlobusSettings>`.
 
+An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag (see :ref:`feature-flags`) and the JVM option :ref:`dataverse.files.globus-monitoring-server`.
diff --git a/doc/sphinx-guides/source/developers/classic-dev-env.rst b/doc/sphinx-guides/source/developers/classic-dev-env.rst
new file mode 100755
index 00000000000..d1f54fd9d5f
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/classic-dev-env.rst
@@ -0,0 +1,232 @@
+=======================
+Classic Dev Environment
+=======================
+
+These are the old instructions we used for Dataverse 4 and 5. They should still work but these days we favor running Dataverse in Docker as described in :doc:`dev-environment`.
+
+These instructions are purposefully opinionated and terse to help you get your development environment up and running as quickly as possible! Please note that familiarity with running commands from the terminal is assumed.
+
+.. contents:: |toctitle|
+	:local:
+
+Quick Start (Docker)
+--------------------
+
+The quickest way to get Dataverse running is in Docker as explained in :doc:`../container/dev-usage` section of the Container Guide.
+
+
+Classic Dev Environment
+-----------------------
+
+Since before Docker existed, we have encouraged installing Dataverse and all its dependencies directly on your development machine, as described below. This can be thought of as the "classic" development environment for Dataverse.
+
+However, in 2023 we decided that we'd like to encourage all developers to start using Docker instead and opened https://github.com/IQSS/dataverse/issues/9616 to indicate that we plan to rewrite this page to recommend the use of Docker.
+
+There's nothing wrong with the classic instructions below and we don't plan to simply delete them. They are a valid alternative to running Dataverse in Docker. We will likely move them to another page.
+
+Set Up Dependencies
+-------------------
+
+Supported Operating Systems
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Mac OS X or Linux is required because the setup scripts assume the presence of standard Unix utilities.
+
+Windows is gaining support through Docker as described in the :doc:`windows` section.
+
+Install Java
+~~~~~~~~~~~~
+
+The Dataverse Software requires Java 17.
+
+We suggest downloading OpenJDK from https://adoptopenjdk.net
+
+On Linux, you are welcome to use the OpenJDK available from package managers.
+
+Install Netbeans or Maven
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+NetBeans IDE is recommended, and can be downloaded from https://netbeans.org . Developers may use any editor or IDE. We recommend NetBeans because it is free, works cross platform, has good support for Jakarta EE projects, and includes a required build tool, Maven.
+
+Below we describe how to build the Dataverse Software war file with Netbeans but if you prefer to use only Maven, you can find installation instructions in the :doc:`tools` section.
+
+Install Homebrew (Mac Only)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On Mac, install Homebrew to simplify the steps below: https://brew.sh
+
+Clone the Dataverse Software Git Repo
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Fork https://github.com/IQSS/dataverse and then clone your fork like this:
+
+``git clone git@github.com:[YOUR GITHUB USERNAME]/dataverse.git``
+
+Build the Dataverse Software War File
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you installed Netbeans, follow these steps:
+
+- Launch Netbeans and click "File" and then "Open Project". Navigate to where you put the Dataverse Software code and double-click "Dataverse" to open the project.
+- If you see "resolve project problems," go ahead and let Netbeans try to resolve them. This will probably including downloading dependencies, which can take a while.
+- Allow Netbeans to install nb-javac (required for Java 8 and below).
+- Select "Dataverse" under Projects and click "Run" in the menu and then "Build Project (Dataverse)". Check back for "BUILD SUCCESS" at the end.
+
+If you installed Maven instead of Netbeans, run ``mvn package``. Check for "BUILD SUCCESS" at the end.
+
+NOTE: Do you use a locale different than ``en_US.UTF-8`` on your development machine? Are you in a different timezone
+than Harvard (Eastern Time)? You might experience issues while running tests that were written with these settings
+in mind. The Maven  ``pom.xml`` tries to handle this for you by setting the locale to ``en_US.UTF-8`` and timezone
+``UTC``, but more, not yet discovered building or testing problems might lurk in the shadows.
+
+Install jq
+~~~~~~~~~~
+
+On Mac, run this command:
+
+``brew install jq``
+
+On Linux, install ``jq`` from your package manager or download a binary from https://stedolan.github.io/jq/
+
+.. _install-payara-dev:
+
+Install Payara
+~~~~~~~~~~~~~~
+
+Payara 6.2025.3 or higher is required.
+
+To install Payara, run the following commands:
+
+``cd /usr/local``
+
+``sudo curl -O -L https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.3/payara-6.2025.3.zip``
+
+``sudo unzip payara-6.2025.3.zip``
+
+``sudo chown -R $USER /usr/local/payara6``
+
+If nexus.payara.fish is ever down for maintenance, Payara distributions are also available from https://repo1.maven.org/maven2/fish/payara/distributions/payara/
+
+Install Service Dependencies Directly on localhost
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Install PostgreSQL
+^^^^^^^^^^^^^^^^^^
+
+The Dataverse Software has been tested with PostgreSQL versions up to 17. PostgreSQL version 10+ is required.
+
+On Mac, go to https://www.postgresql.org/download/macosx/ and choose "Interactive installer by EDB" option. Note that version 16 is used in the command line examples below, but the process should be similar for other versions. When prompted to set a password for the "database superuser (postgres)" just enter "password".
+
+After installation is complete, make a backup of the ``pg_hba.conf`` file like this:
+
+``sudo cp /Library/PostgreSQL/16/data/pg_hba.conf /Library/PostgreSQL/16/data/pg_hba.conf.orig``
+
+Then edit ``pg_hba.conf`` with an editor such as vi:
+
+``sudo vi /Library/PostgreSQL/16/data/pg_hba.conf``
+
+In the "METHOD" column, change all instances of "scram-sha-256" (or whatever is in that column) to "trust". This will make it so PostgreSQL doesn't require a password.
+
+In the Finder, click "Applications" then "PostgreSQL 16" and launch the "Reload Configuration" app. Click "OK" after you see "server signaled".
+
+Next, to confirm the edit worked, launch the "pgAdmin" application from the same folder. Under "Browser", expand "Servers" and double click "PostgreSQL 16". When you are prompted for a password, leave it blank and click "OK". If you have successfully edited "pg_hba.conf", you can get in without a password.
+
+On Linux, you should just install PostgreSQL using your favorite package manager, such as ``yum``. (Consult the PostgreSQL section of :doc:`/installation/prerequisites` in the main Installation guide for more info and command line examples). Find ``pg_hba.conf`` and set the authentication method to "trust" and restart PostgreSQL.
+
+Install Solr
+^^^^^^^^^^^^
+
+`Solr <https://lucene.apache.org/solr/>`_ 9.8.0 is required.
+
+Follow the instructions in the "Installing Solr" section of :doc:`/installation/prerequisites` in the main Installation guide.
+
+Install Service Dependencies Using Docker Compose
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To avoid having to install service dependencies like PostgreSQL or Solr directly on your localhost, there is the alternative of using the ``docker-compose-dev.yml`` file available in the repository root. For this option you need to have Docker and Docker Compose installed on your machine.
+
+The ``docker-compose-dev.yml`` can be configured to only run the service dependencies necessary to support a Dataverse installation running directly on localhost. In addition to PostgreSQL and Solr, it also runs a SMTP server.
+
+Before running the Docker Compose file, you need to update the value of the ``DATAVERSE_DB_USER`` environment variable to ``postgres``. The variable can be found inside the ``.env`` file in the repository root. This step is required as the Dataverse installation script expects that database user.
+
+To run the Docker Compose file, go to the Dataverse repository root, then run:
+
+``docker-compose -f docker-compose-dev.yml up -d --scale dev_dataverse=0``
+
+Note that this command omits the Dataverse container defined in the Docker Compose file, since Dataverse is going to be installed directly on localhost in the next section.
+
+The command runs the containers in detached mode, but if you want to run them attached and thus view container logs in real time, remove the ``-d`` option from the command.
+
+Data volumes of each dependency will be persisted inside the ``docker-dev-volumes`` folder, inside the repository root.
+
+If you want to stop the containers, then run (for detached mode only, otherwise use ``Ctrl + C``):
+
+``docker-compose -f docker-compose-dev.yml stop``
+
+If you want to remove the containers, then run:
+
+``docker-compose -f docker-compose-dev.yml down``
+
+If you want to run a single container (the mail server, for example) then run:
+
+``docker-compose -f docker-compose-dev.yml up dev_smtp``
+
+For a fresh installation, and before running the Software Installer Script, it is recommended to delete the docker-dev-env folder to avoid installation problems due to existing data in the containers.
+
+Run the Dataverse Software Installer Script
+-------------------------------------------
+
+Navigate to the directory where you cloned the Dataverse Software git repo change directories to the ``scripts/installer`` directory like this:
+
+``cd scripts/installer``
+
+Create a Python virtual environment, activate it, then install dependencies:
+
+``python3 -m venv venv``
+
+``source venv/bin/activate``
+
+``pip install psycopg2-binary``
+
+The installer will try to connect to the SMTP server you tell it to use. If you haven't used the Docker Compose option for setting up the dependencies, or you don't have a mail server handy, you can run ``nc -l 25`` in another terminal and choose "localhost" (the default) to get past this check.
+
+Finally, run the installer (see also :download:`README_python.txt <../../../../scripts/installer/README_python.txt>` if necessary):
+
+``python3 install.py``
+
+Verify the Dataverse Software is Running
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+After the script has finished, you should be able to log into your Dataverse installation with the following credentials:
+
+- http://localhost:8080
+- username: dataverseAdmin
+- password: admin
+
+Configure Your Development Environment for Publishing
+-----------------------------------------------------
+
+Run the following command:
+
+``curl http://localhost:8080/api/admin/settings/:DoiProvider -X PUT -d FAKE``
+
+This will disable DOI registration by using a fake (in-code) DOI provider. Please note that this feature is only available in Dataverse Software 4.10+ and that at present, the UI will give no indication that the DOIs thus minted are fake.
+
+Developers may also wish to consider using :ref:`PermaLinks <permalinks>`
+
+Configure Your Development Environment for GUI Edits
+----------------------------------------------------
+
+Out of the box, a JSF setting is configured for production use and prevents edits to the GUI (xhtml files) from being visible unless you do a full deployment.
+
+It is recommended that you run the following command so that simply saving the xhtml file in Netbeans is enough for the change to show up.
+
+``asadmin create-system-properties "dataverse.jsf.refresh-period=1"``
+
+For more on JSF settings like this, see :ref:`jsf-config`.
+
+Next Steps
+----------
+
+If you can log in to the Dataverse installation, great! If not, please see the :doc:`troubleshooting` section. For further assistance, please see "Getting Help" in the :doc:`intro` section.
+
+You're almost ready to start hacking on code. Now that the installer script has you up and running, you need to continue on to the :doc:`tips` section to get set up to deploy code from your IDE or the command line.
diff --git a/doc/sphinx-guides/source/developers/coding-style.rst b/doc/sphinx-guides/source/developers/coding-style.rst
index 1ae11a2f4ca..2a1c0d5d232 100755
--- a/doc/sphinx-guides/source/developers/coding-style.rst
+++ b/doc/sphinx-guides/source/developers/coding-style.rst
@@ -2,7 +2,7 @@
 Coding Style
 ============
 
-Like all development teams, the `Dataverse developers at IQSS <https://dataverse.org/about>`_ have their habits and styles when it comes to writing code. Let's attempt to get on the same page. :)
+Like all development teams, the `Dataverse  Project developers at IQSS <https://dataverse.org/about>`_ have their habits and styles when it comes to writing code. Let's attempt to get on the same page. :)
 
 .. contents:: |toctitle|
 	:local:
@@ -18,6 +18,11 @@ Tabs vs. Spaces
 
 Don't use tabs. Use 4 spaces.
 
+Imports
+^^^^^^^
+
+Wildcard imports are neither encouraged nor discouraged. 
+
 Braces Placement
 ^^^^^^^^^^^^^^^^
 
@@ -57,12 +62,12 @@ Place curly braces according to the style below, which is an example you can see
 Format Code You Changed with Netbeans
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-As you probably gathered from the :doc:`dev-environment` section, IQSS has standardized on Netbeans. It is much appreciated when you format your code (but only the code you touched!) using the out-of-the-box Netbeans configuration. If you have created an entirely new Java class, you can just click Source -> Format. If you are adjusting code in an existing class, highlight the code you changed and then click Source -> Format. Keeping the "diff" in your pull requests small makes them easier to code review.
+IQSS has standardized on Netbeans. It is much appreciated when you format your code (but only the code you touched!) using the out-of-the-box Netbeans configuration. If you have created an entirely new Java class, you can just click Source -> Format. If you are adjusting code in an existing class, highlight the code you changed and then click Source -> Format. Keeping the "diff" in your pull requests small makes them easier to code review.
 
 Checking Your Formatting With Checkstyle
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The easiest way to adopt Dataverse coding style is to use Netbeans as your IDE, avoid change the default Netbeans formatting settings, and only reformat code you've changed, as described above.
+The easiest way to adopt the Dataverse Project coding style is to use Netbeans as your IDE, avoid change the default Netbeans formatting settings, and only reformat code you've changed, as described above.
 
 If you do not use Netbeans, you are encouraged to check the formatting of your code using Checkstyle.
 
@@ -85,7 +90,7 @@ Use this ``logger`` field with varying levels such as ``fine`` or ``info`` like
 
     logger.fine("will get thumbnail from dataset logo");
 
-Generally speaking you should use ``fine`` for everything that you don't want to show up in Glassfish's ``server.log`` file by default. If you use a higher level such as ``info`` for common operations, you will probably hear complaints that your code is too "chatty" in the logs. These logging levels can be controlled at runtime both on your development machine and in production as explained in the :doc:`debugging` section.
+Generally speaking you should use ``fine`` for everything that you don't want to show up by default in the app server's log file. If you use a higher level such as ``info`` for common operations, you will probably hear complaints that your code is too "chatty" in the logs. These logging levels can be controlled at runtime both on your development machine and in production as explained in the :doc:`debugging` section.
 
 When adding logging, do not simply add ``System.out.println()`` lines because the logging level cannot be controlled.
 
@@ -97,7 +102,7 @@ Special strings should be defined as public constants. For example, ``DatasetFie
 Avoid Hard-Coding User-Facing Messaging in English
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-There is an ongoing effort to translate Dataverse into various languages. Look for "lang" or "languages" in the :doc:`/installation/config` section of the Installation Guide for details if you'd like to help or play around with this feature.
+There is an ongoing effort to translate the Dataverse Software into various languages. Look for "lang" or "languages" in the :doc:`/installation/config` section of the Installation Guide for details if you'd like to help or play around with this feature.
 
 The translation effort is hampered if you hard code user-facing messages in English in the Java code. Put English strings in ``Bundle.properties`` and use ``BundleUtil`` to pull them out. This is especially important for messages that appear in the UI. We are aware that the API has many, many hard coded English strings in it. If you touch a method in the API and notice English strings, you are strongly encouraged to use that opportunity to move the English to ``Bundle.properties``.
 
@@ -131,7 +136,3 @@ Bike Shedding
 What color should the `bike shed <https://en.wiktionary.org/wiki/bikeshedding>`_ be? :)
 
 Come debate with us about coding style in this Google doc that has public comments enabled: https://docs.google.com/document/d/1KTd3FpM1BI3HlBofaZjMmBiQEJtFf11jiiGpQeJzy7A/edit?usp=sharing
-
-----
-
-Previous: :doc:`debugging` | Next: :doc:`deployment`
diff --git a/doc/sphinx-guides/source/developers/configuration.rst b/doc/sphinx-guides/source/developers/configuration.rst
new file mode 100644
index 00000000000..d342c28efc6
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/configuration.rst
@@ -0,0 +1,126 @@
+Consuming Configuration
+=======================
+
+.. contents:: |toctitle|
+	:local:
+
+The Dataverse Software uses different types of configuration:
+
+1. JVM system properties
+2. Simple database value settings
+3. Complex database stored data structures
+
+1 and 2 are usually simple text strings, boolean switches or digits. All of those can be found in :doc:`/installation/config`.
+
+Anything for 3 is configured via the API using either TSV or JSON structures. Examples are metadata blocks,
+authentication providers, harvesters and others.
+
+Simple Configuration Options
+----------------------------
+
+Developers can access simple properties via:
+
+1. ``JvmSettings.<SETTING NAME>.lookup(...)`` for JVM system property settings.
+2. ``SettingsServiceBean.get(...)`` for database settings.
+3. ``SystemConfig.xxx()`` for specially treated settings, maybe mixed from 1 and 2 and other sources.
+4. ``SettingsWrapper`` for use in frontend JSF (xhtml) pages to obtain settings from 2 and 3. Using the wrapper is a must for performance as explained in :ref:`avoid common efficiency issues with JSF render logic expressions
+   <avoid-efficiency-issues-with-render-logic-expressions>`.
+5. ``System.getProperty()`` only for very special use cases not covered by ``JvmSettings``.
+
+As of Dataverse Software 5.3, we start to streamline our efforts into using a more consistent approach, also bringing joy and
+happiness to all the system administrators out there. This will be done by adopting the use of
+`MicroProfile Config <https://github.com/eclipse/microprofile-config>`_ over time.
+
+So far we streamlined configuration of these Dataverse Software parts:
+
+- ✅ Database Connection
+
+Complex Configuration Options
+-----------------------------
+
+We should enable variable substitution in JSON configuration. Example: using substitution to retrieve values from
+MicroProfile Config and insert into the authentication provider would allow much easier provisioning of secrets
+into the providers.
+
+Why should I care about MicroProfile Config API?
+------------------------------------------------
+
+Developers benefit from:
+
+- A streamlined API to retrieve configuration, backward-compatible renaming strategies and easier testbed configurations.
+- Config API is also pushing for validation of configuration, as it's typesafe and converters for non-standard types
+  can be added within our codebase.
+- Defaults in code or bundled in ``META-INF/microprofile-config.properties`` allow for optional values without much hassle.
+- A single place to lookup any existing JVM setting in code, easier to keep in sync with the documentation.
+
+System administrators benefit from:
+
+- Lots of database settings have been introduced in the past, but should be more easily configurable and not rely on a
+  database connection.
+- Running a Dataverse installation in containers gets much easier when configuration can be provisioned in a
+  streamlined fashion, mitigating the need for scripting glue and distinguishing between setting types.
+- Classic installations have a profit, too: we can enable using a single config file, e.g. living in
+  ``/etc/dataverse/config.properties`` by adding our own, hot-reload config source.
+- Features for monitoring resources and others are easier to use with this streamlined configuration, as we can
+  avoid people having to deal with ``asadmin`` commands and change a setting with comfort instead.
+
+Adopting MicroProfile Config API
+---------------------------------
+
+This technology is introduced on a step-by-step basis. There will not be a big shot, crashing upgrades for everyone.
+Instead, we will provide backward compatibility by deprecating renamed or moved config options, while still
+supporting the old way of setting them.
+
+- Introducing a new setting or moving an old one should result in a scoped key
+  ``dataverse.<scope/task/module/...>.<setting>``. That way we enable sys admins to recognize the meaning of an option
+  and avoid name conflicts.
+  Starting with ``dataverse`` makes it perfectly clear that this is a setting meant for this application, which is
+  important when using environment variables, system properties or other MPCONFIG sources.
+- Replace ``System.getProperty()`` calls with ``JvmSettings.<SETTING NAME>.lookup(...)``, adding the setting there first.
+  This might be paired with renaming and providing backward-compatible aliases.
+- Database settings need to be refactored in multiple steps and it is not yet clear how this will be done.
+  Many Database settings are of very static nature and might be moved to JVM settings (in backward compatible ways).
+
+Adding a JVM Setting
+^^^^^^^^^^^^^^^^^^^^
+
+Whenever a new option gets added or an existing configuration gets migrated to
+``edu.harvard.iq.dataverse.settings.JvmSettings``, you will attach the setting to an existing scope or create new
+sub-scopes first.
+
+- Scopes and settings are organised in a tree-like structure within a single enum ``JvmSettings``.
+- The root scope is "dataverse".
+- All sub-scopes are below that.
+- Scopes are separated by dots (periods).
+- A scope may be a placeholder, filled with a variable during lookup. (Named object mapping.)
+- The setting should be in kebab case (``signing-secret``) rather than camel case (``signingSecret``).
+
+Any consumer of the setting can choose to use one of the fluent ``lookup()`` methods, which hides away alias handling,
+conversion etc from consuming code. See also the detailed Javadoc for these methods.
+
+Moving or Replacing a JVM Setting
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When moving an old key to a new (especially when doing so with a former JVM system property setting), you should
+add an alias to the ``JvmSettings`` definition to enable backward compatibility. Old names given there are capable of
+being used with patterned lookups.
+
+Another option is to add the alias in ``src/main/resources/META-INF/microprofile-aliases.properties``. The format is
+always like ``dataverse.<scope/....>.newname...=old.property.name``. Note this doesn't provide support for patterned
+aliases.
+
+Details can be found in ``edu.harvard.iq.dataverse.settings.source.AliasConfigSource``
+
+Adding a Feature Flag
+^^^^^^^^^^^^^^^^^^^^^
+
+Some parts of our codebase might be opt-in only. Experimental or optional feature previews can be switched on using our
+usual configuration mechanism, a JVM setting.
+
+Feature flags are implemented in the enumeration ``edu.harvard.iq.dataverse.settings.FeatureFlags``, which allows for
+convenient usage of it anywhere in the codebase. When adding a flag, please add it to the enum, think of a default
+status, add some Javadocs about the flagged feature and add a ``@since`` tag to make it easier to identify when a flag
+has been introduced.
+
+We want to maintain a list of all :ref:`feature flags <feature-flags>` in the :ref:`configuration guide <feature-flags>`,
+please add yours to the list.
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/developers/containers.rst b/doc/sphinx-guides/source/developers/containers.rst
index 31d13b38314..ed477ccefea 100755
--- a/doc/sphinx-guides/source/developers/containers.rst
+++ b/doc/sphinx-guides/source/developers/containers.rst
@@ -1,412 +1,31 @@
-================================= 
-Docker, Kubernetes, and OpenShift
-=================================
+================================== 
+Docker, Kubernetes, and Containers
+==================================
 
-Dataverse is exploring the use of Docker, Kubernetes, OpenShift and other container-related technologies.
+The Dataverse community is exploring the use of Docker, Kubernetes, and other container-related technologies.
 
 .. contents:: |toctitle|
 	:local:
 
-OpenShift
----------
+Container Guide
+---------------
 
-From the Dataverse perspective, we are in the business of providing a "template" for OpenShift that describes how the various components we build our application on (Glassfish, PostgreSQL, Solr, the Dataverse war file itself, etc.) work together. We publish Docker images to DockerHub at https://hub.docker.com/u/iqss/ that are used in this OpenShift template.
+We recommend starting with the :doc:`/container/index`. The core Dataverse development team, with lots of help from the community, is iterating on containerizing the Dataverse software and its dependencies there.
 
-Dataverse's (light) use of Docker is documented below in a separate section. We actually started with Docker in the context of OpenShift, which is why OpenShift is listed first but we can imagine rearranging this in the future.
+Help Containerize Dataverse
+---------------------------
 
-The OpenShift template for Dataverse can be found at ``conf/openshift/openshift.json`` and if you need to hack on the template or related files under ``conf/docker`` it is recommended that you iterate on them using Minishift.
+If you would like to contribute to the containerization effort, please consider joining the `Containerization Working Group <https://dataverse.org/working-groups#cwg>`_.
 
-The instructions below will walk you through spinning up Dataverse within Minishift. It is recommended that you do this on the "develop" branch to make sure everything is working before changing anything.
+Community-Lead Projects
+-----------------------
 
-Install Minishift
-~~~~~~~~~~~~~~~~~
+The primary community-lead projects (which the core team is drawing inspiration from!) are:
 
-Minishift requires a hypervisor and since we already use VirtualBox for Vagrant, you should install VirtualBox from http://virtualbox.org .
+- https://github.com/IQSS/dataverse-docker
+- https://github.com/IQSS/dataverse-kubernetes (especially the https://github.com/EOSC-synergy/dataverse-kubernetes fork)
 
-Download the Minishift tarball from https://docs.openshift.org/latest/minishift/getting-started/installing.html and put the ``minishift`` binary in ``/usr/local/bin`` or somewhere in your ``$PATH``. This assumes Mac or Linux. These instructions were last tested on version ``v1.14.0+1ec5877`` of Minishift.
+Using Containers for Reproducible Research
+------------------------------------------
 
-At this point, you might want to consider going through the Minishift quickstart to get oriented: https://docs.openshift.org/latest/minishift/getting-started/quickstart.html
-
-Start Minishift
-~~~~~~~~~~~~~~~
-
-``minishift start --vm-driver=virtualbox --memory=8GB``
-
-Make the OpenShift Client Binary (oc) Executable
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-``eval $(minishift oc-env)``
-
-Log in to Minishift from the Command Line
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Note that if you just installed and started Minishift, you are probably logged in already. This ``oc login`` step is included in case you aren't logged in anymore.
-
-``oc login --username developer --password=whatever``
-
-Use "developer" as the username and a couple characters as the password.
-
-Create a Minishift Project
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Calling the project "project1" is fairly arbitrary. We'll probably want to revisit this name in the future. A project is necessary in order to create an OpenShift app.
-
-``oc new-project project1``
-
-Note that ``oc projects`` will return a list of projects.
-
-Create a Dataverse App within the Minishift Project
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The following command operates on the ``conf/openshift/openshift.json`` file that resides in the main Dataverse git repo. It will download images from Docker Hub and use them to spin up Dataverse within Minishift/OpenShift. Later we will cover how to make changes to the images on Docker Hub.
-
-``oc new-app conf/openshift/openshift.json``
-
-Log into Minishift and Visit Dataverse in your Browser
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-After running the ``oc new-app`` command above, deployment of Dataverse within Minishift/OpenShift will begin. You should log into the OpenShift web interface to check on the status of the deployment. If you just created the Minishift VM with the ``minishift start`` command above, the ``oc new-app`` step is expected to take a while because the images need to be downloaded from Docker Hub. Also, the installation of Dataverse takes a while.
-
-Typing ``minishift console`` should open the OpenShift web interface in your browser. The IP address might not be "192.168.99.100" but it's used below as an example.
-
-- https://192.168.99.100:8443 (or URL from ``minishift console``)
-- username: developer
-- password: <any password>
-
-In the OpenShift web interface you should see a link that looks something like http://dataverse-project1.192.168.99.100.nip.io but the IP address will vary and will match the output of ``minishift ip``. Eventually, after deployment is complete, the Dataverse web interface will appear at this URL and you will be able to log in with the username "dataverseAdmin" and the password "admin".
-
-Another way to verify that Dataverse has been succesfully deployed is to make sure that the Dataverse "info" API endpoint returns a version (note that ``minishift ip`` is used because the IP address will vary):
-
-``curl http://dataverse-project1.`minishift ip`.nip.io/api/info/version``
-
-From the perspective of OpenShift and the ``openshift.json`` config file, the HTTP link to Dataverse in called a route. See also documentation for ``oc expose``.
-
-Troubleshooting
-~~~~~~~~~~~~~~~
-
-Here are some tips on troubleshooting your deployment of Dataverse to Minishift.
-
-Check Status of Dataverse Deployment to Minishift
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-``oc status``
-
-Once images have been downloaded from Docker Hub, the output below will change from ``Pulling`` to ``Pulled``.
-
-``oc get events | grep Pull``
-
-This is a deep dive:
-
-``oc get all``
-
-Review Logs of Dataverse Deployment to Minishift
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Logs are provided in the web interface to each of the deployment configurations. The URLs should be something like this (but the IP address) will vary and you should click "View Log". The installation of Dataverse is done within the one Glassfish deployment configuration:
-
-- https://192.168.99.100:8443/console/project/project1/browse/dc/dataverse-glassfish
-- https://192.168.99.100:8443/console/project/project1/browse/dc/dataverse-postgresql
-- https://192.168.99.100:8443/console/project/project1/browse/dc/dataverse-solr
-
-You can also see logs from each of the components (Glassfish, PostgreSQL, and Solr) from the command line with ``oc logs`` like this (just change the ``grep`` at the end):
-
-``oc logs $(oc get po -o json | jq '.items[] | select(.kind=="Pod").metadata.name' -r | grep glassfish)``
-
-Get a Shell (ssh/rsh) on Containers Deployed to Minishift
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can get a shell on any of the containers for each of the components (Glassfish, PostgreSQL, and Solr) with ``oc rc`` (just change the ``grep`` at the end):
-
-``oc rsh $(oc get po -o json | jq '.items[] | select(.kind=="Pod").metadata.name' -r | grep glassfish)``
-
-From the ``rsh`` prompt of the Glassfish container you could run something like the following to make sure that Dataverse is running on port 8080:
-
-``curl http://localhost:8080/api/info/version``
-
-Cleaning up
-~~~~~~~~~~~
-
-If you simply wanted to try out Dataverse on Minishift and want to clean up, you can run ``oc delete project project1`` to delete the project or ``minishift stop`` and ``minishift delete`` to delete the entire Minishift VM and all the Docker containers inside it.
-
-Making Changes
-~~~~~~~~~~~~~~
-
-Making Changes to Docker Images
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If you're interested in using Minishift for development and want to change the Dataverse code, you will need to get set up to create Docker images based on your changes and make them available within Minishift.
-
-It is recommended to add experimental images to Minishift's internal registry. Note that despite what https://docs.openshift.org/latest/minishift/openshift/openshift-docker-registry.html says you will not use ``docker push`` because we have seen "unauthorized: authentication required” when trying to push to it as reported at https://github.com/minishift/minishift/issues/817 . Rather you will run ``docker build`` and run ``docker images`` to see that your newly build images are listed in Minishift's internal registry.
-
-First, set the Docker environment variables so that ``docker build`` and ``docker images`` refer to the internal Minishift registry rather than your normal Docker setup:
-
-``eval $(minishift docker-env)``
-
-When you're ready to build, change to the right directory:
-
-``cd conf/docker``
-
-And then run the build script in "internal" mode:
-
-``./build.sh internal``
-
-Note that ``conf/openshift/openshift.json`` must not have ``imagePullPolicy`` set to ``Always`` or it will pull from "iqss" on Docker Hub. Changing it to ``IfNotPresent`` allow Minishift to use the images shown from ``docker images`` rather than the ones on Docker Hub.
-
-Using Minishift for day to day Dataverse development might be something we want to investigate in the future. These blog posts talk about developing Java applications using Minishift/OpenShift:
-
-- https://blog.openshift.com/fast-iterative-java-development-on-openshift-kubernetes-using-rsync/
-- https://blog.openshift.com/debugging-java-applications-on-openshift-kubernetes/
-
-Making Changes to the OpenShift Config
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If you are interested in changing the OpenShift config file for Dataverse at ``conf/openshift/openshift.json`` note that in many cases once you have Dataverse running in Minishift you can use ``oc process`` and ``oc apply`` like this (but please note that some errors and warnings are expected):
-
-``oc process -f conf/openshift/openshift.json | oc apply -f -``
-
-The slower way to iterate on the ``openshift.json`` file is to delete the project and re-create it.
-
-Making Changes to the PostgreSQL Database from the Glassfish Pod
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can access and modify the PostgreSQL database via an interactive terminal called psql.
-
-To log in to psql from the command line of the Glassfish pod, type the following command:
-
-``PGPASSWORD=$POSTGRES_PASSWORD; export PGPASSWORD; /usr/bin/psql -h $POSTGRES_SERVER.$POSTGRES_SERVICE_HOST -U $POSTGRES_USER -d $POSTGRES_DATABASE``
-
-To log in as an admin, type this command instead:
-
-``PGPASSWORD=$POSTGRESQL_ADMIN_PASSWORD; export PGPASSWORD; /usr/bin/psql -h $POSTGRES_SERVER.$POSTGRES_SERVICE_HOST -U postgres -d $POSTGRES_DATABASE``
-
-Scaling Dataverse by Increasing Replicas in a StatefulSet
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Glassfish, Solr and PostgreSQL Pods are in a "StatefulSet" which is a concept from OpenShift and Kubernetes that you can read about at https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/
-
-As of this writing, the ``openshift.json`` file has a single "replica" for each of these two stateful sets. It's possible to increase the number of replicas from 1 to 3, for example, with this command:
-
-``oc scale statefulset/dataverse-glassfish --replicas=3``
-
-The command above should result in two additional Glassfish pods being spun up. The name of the pods is significant and there is special logic in the "zeroth" pod ("dataverse-glassfish-0" and "dataverse-postgresql-0"). For example, only "dataverse-glassfish-0" makes itself the dedicated timer server as explained in :doc:`/admin/timers` section of the Admin Guide. "dataverse-glassfish-1" and other higher number pods will not be configured as a timer server.
-
-Once you have multiple Glassfish servers you may notice bugs that will require additional configuration to fix. One such bug has to do with Dataverse logos which are stored at ``/usr/local/glassfish4/glassfish/domains/domain1/docroot/logos`` on each of the Glassfish servers. This means that the logo will look fine when you just uploaded it because you're on the server with the logo on the local file system but when you visit that dataverse in the future and you're on a differernt Glassfish server, you will see a broken image. (You can find some discussion of this logo bug at https://github.com/IQSS/dataverse-aws/issues/10 and http://irclog.iq.harvard.edu/dataverse/2016-10-21 .) This is all "advanced" installation territory (see the :doc:`/installation/advanced` section of the Installation Guide) and OpenShift might be a good environment in which to work on some of these bugs.
-
-Multiple PostgreSQL servers are possible within the OpenShift environment as well and have been set up with some amount of replication. "dataverse-postgresql-0" is the master and non-zero pods are the slaves. We have just scratched the surface of this configuration but replication from master to slave seems to we working. Future work could include failover and making Dataverse smarter about utilizing multiple PostgreSQL servers for reads. Right now we assume Dataverse is only being used with a single PostgreSQL server and that it's the master.
-
-Solr supports index distribution and replication for scaling. For OpenShift use, we choose replication. It's possible to scale up Solr using the method method similar to Glassfish, as mentioned aboved
-In OpenShift, the first Solr pod, dataverse-solr-0, will be the master node, and the rest will be slave nodes
-
-
-Configuring Persistent Volumes and Solr master node recovery 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Solr requires backing up the search index to persistent storage. For our proof of concept, we configure a hostPath, which allows Solr containers to access the hosts' file system, for our Solr containers backups. To read more about OpenShift/Kubernetes' persistent volumes, please visit: https://kubernetes.io/docs/concepts/storage/persistent-volumes
-
-To allow containers to use a host's storage, we need to allow access to that directory first. In this example, we expose /tmp/share to the containers::
-
-# mkdir /tmp/share            
-# chcon -R -t svirt_sandbox_file_t 
-# chgrp root -R /tmp/share 
-# oc login -u system:admin 
-# oc edit scc restricted     # Update allowHostDirVolumePlugin to true and runAsUser type to RunAsAny
-
-
-To add a persistent volume and persistent volume claim, in conf/docker/openshift/openshift.json, add the following to objects in openshift.json.
-Here, we are using hostPath for development purposes. Since OpenShift supports many types of cluster storages, 
-if the administrator wishes to use any cluster storage like EBS, Google Cloud Storage, etc, they would have to use a different type of Persistent Storage::
-
-    {
-      "kind" : "PersistentVolume",
-      "apiVersion" : "v1",
-      "metadata":{
-        "name" : "solr-index-backup",
-        "labels":{
-          "name" : "solr-index-backup",
-          "type" : "local"
-        }
-      },
-      "spec":{
-        "capacity":{
-          "storage" : "8Gi"
-        },
-        "accessModes":[
-          "ReadWriteMany", "ReadWriteOnce",  "ReadOnlyMany"
-        ],
-        "hostPath": {
-          "path" : "/tmp/share"
-        }
-      }
-    },
-    {
-      "kind" : "PersistentVolumeClaim",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "solr-claim"
-      },
-      "spec": {
-        "accessModes": [
-          "ReadWriteMany", "ReadWriteOnce",  "ReadOnlyMany"
-        ],
-        "resources": {
-          "requests": {
-            "storage": "3Gi"
-          }
-        },
-        "selector":{
-          "matchLabels":{
-            "name" : "solr-index-backup",
-            "type" : "local"
-            }
-          }
-        }
-      }
-
-
-To make solr container mount the hostPath, add the following part under .spec.spec (for Solr StatefulSet)::
-
-    {
-      "kind": "StatefulSet",
-      "apiVersion": "apps/v1beta1",
-	  "metadata": {
-        "name": "dataverse-solr",
-	  ....
-
-      "spec": {
-        "serviceName" : "dataverse-solr-service",
-		.....
-
-          "spec": {
-            "volumes": [
-              {
-                "name": "solr-index-backup",
-                "persistentVolumeClaim": {
-                  "claimName": "solr-claim"
-                }
-              }
-            ],
-
-			"containers": [
-              ....
-
-                "volumeMounts":[
-                  {
-                    "mountPath" : "/var/share",
-                    "name" : "solr-index-backup"
-                  }  
-
-
-
-Solr is now ready for backup and recovery. In order to backup::
-
-  oc rsh dataverse-solr-0
-  curl 'http://localhost:8983/solr/collection1/replication?command=backup&location=/var/share'  
-
-
-In solr entrypoint.sh, it's configured so that if dataverse-solr-0 failed, it will get the latest version of the index in the backup and restore. All backups are stored in /tmp/share in the host, or /home/share in solr containers.
-
-Running Containers to Run as Root in Minishift
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-It is **not** recommended to run containers as root in Minishift because for security reasons OpenShift doesn't support running containers as root. However, it's good to know how to allow containers to run as root in case you need to work on a Docker image to make it run as non-root.
-
-For more information on improving Docker images to run as non-root, see "Support Arbitrary User IDs" at https://docs.openshift.org/latest/creating_images/guidelines.html#openshift-origin-specific-guidelines
-
-Let's say you have a container that you suspect works fine when it runs as root. You want to see it working as-is before you start hacking on the Dockerfile and entrypoint file. You can configure Minishift to allow containers to run as root with this command:
-
-``oc adm policy add-scc-to-user anyuid -z default --as system:admin``
-
-Once you are done testing you can revert Minishift back to not allowing containers to run as root with this command:
-
-``oc adm policy remove-scc-from-user anyuid -z default --as system:admin``
-
-Minishift Resources
-~~~~~~~~~~~~~~~~~~~
-
-The following resources might be helpful.
-
-- https://blog.openshift.com/part-1-from-app-to-openshift-runtimes-and-templates/
-- https://blog.openshift.com/part-2-creating-a-template-a-technical-walkthrough/
-- https://docs.openshift.com/enterprise/3.0/architecture/core_concepts/templates.html
-
-Docker
-------
-
-From the Dataverse perspective, Docker is important for a few reasons:
-
-- There is interest from the community in running Dataverse on OpenShift and some initial work has been done to get Dataverse running on Minishift in Docker containers. Minishift makes use of Docker images on Docker Hub. To build new Docker images and push them to Docker Hub, you'll need to install Docker. The main issue to follow is https://github.com/IQSS/dataverse/issues/4040 .
-- Docker may aid in testing efforts if we can easily spin up Docker images based on code in pull requests and run the full integration suite against those images. See the :doc:`testing` section for more information on integration tests.
-
-Installing Docker
-~~~~~~~~~~~~~~~~~
-
-On Linux, you can probably get Docker from your package manager.
-
-On Mac, download the ``.dmg`` from https://www.docker.com and install it. As of this writing is it known as Docker Community Edition for Mac.
-
-On Windows, we have heard reports of success using Docker on a Linux VM running in VirtualBox or similar. There's something called "Docker Community Edition for Windows" but we haven't tried it. See also the :doc:`windows` section.
-
-As explained above, we use Docker images in two different contexts:
-
-- Testing using an "all in one" Docker image (ephemeral, unpublished)
-- Future production use on Minishift/OpenShift/Kubernetes (published to Docker Hub)
-
-All In One Docker Images for Testing
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The "all in one" Docker files are in ``conf/docker-aio`` and you should follow the readme in that directory for more information on how to use them.
-
-Future production use on Minishift/OpenShift/Kubernetes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-FIXME: rewrite this section to talk about only pushing stable images to Docker Hub.
-
-When working with Docker in the context of Minishift, follow the instructions above and make sure you get the Dataverse Docker images running in Minishift before you start messing with them.
-
-As of this writing, the Dataverse Docker images we publish under https://hub.docker.com/u/iqss/ are highly experimental. They were originally tagged with branch names like ``kick-the-tires`` and as of this writing the ``latest`` tag should be considered highly experimental and not for production use. See https://github.com/IQSS/dataverse/issues/4040 for the latest status and please reach out if you'd like to help!
-
-Change to the docker directory:
-
-``cd conf/docker``
-
-Edit one of the files:
-
-``vim dataverse-glassfish/Dockerfile``
-
-At this point you want to build the image and run it. We are assuming you want to run it in your Minishift environment. We will be building your image and pushing it to Docker Hub.
-
-Log in to Docker Hub with an account that has access to push to the ``iqss`` organization:
-
-``docker login``
-
-(If you don't have access to push to the ``iqss`` organization, you can push elsewhere and adjust your ``openshift.json`` file accordingly.)
-
-Build and push the images to Docker Hub:
-
-``./build.sh``
-
-Note that you will see output such as ``digest: sha256:213b6380e6ee92607db5d02c9e88d7591d81f4b6d713224d47003d5807b93d4b`` that should later be reflected in Minishift to indicate that you are using the latest image you just pushed to Docker Hub.
-
-You can get a list of all repos under the ``iqss`` organization with this:
-
-``curl https://hub.docker.com/v2/repositories/iqss/``
-
-To see a specific repo:
-
-``curl https://hub.docker.com/v2/repositories/iqss/dataverse-glassfish/``
-
-Known Issues with Dataverse Images on Docker Hub
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Again, Dataverse Docker images on Docker Hub are highly experimental at this point. As of this writing, their purpose is primarily for kicking the tires on Dataverse. Here are some known issues:
-
-- The Dataverse installer is run in the entrypoint script every time you run the image. Ideally, Dataverse would be installed in the Dockerfile instead. Dataverse is being installed in the entrypoint script because it needs PosgreSQL to be up already so that database tables can be created when the war file is deployed.
-- The storage should be abstracted. Storage of data files and PostgreSQL data. Probably Solr data.
-- Better tuning of memory by examining ``/sys/fs/cgroup/memory/memory.limit_in_bytes`` and incorporating this into the Dataverse installation script.
-- Only a single Glassfish server can be used. See "Dedicated timer server in a Dataverse server cluster" in the :doc:`/admin/timers` section of the Installation Guide.
-- Only a single PostgreSQL server can be used.
-- Only a single Solr server can be used.
-
-----
-
-Previous: :doc:`deployment` | Next: :doc:`making-releases`
+Please see :ref:`research-code` in the User Guide for this related topic.
diff --git a/doc/sphinx-guides/source/developers/dataset-migration-api.rst b/doc/sphinx-guides/source/developers/dataset-migration-api.rst
new file mode 100644
index 00000000000..941527133ef
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/dataset-migration-api.rst
@@ -0,0 +1,69 @@
+Dataset Migration API
+=====================
+
+The Dataverse software includes several ways to add Datasets originally created elsewhere (not to mention Harvesting capabilities). These include the Sword API (see the :doc:`/api/sword` guide) and the /dataverses/{id}/datasets/:import methods (json and ddi) (see the :doc:`/api/native-api` guide).
+
+This experimental migration API offers an additional option with some potential advantages:
+
+* Metadata can be specified using the json-ld format used in the OAI-ORE metadata export. Please note that the json-ld generated by OAI-ORE metadata export is not directly compatible with the Migration API. OAI-ORE export nests resource metadata under :code:`ore:describes` wrapper and Dataset Migration API requires that metadata is on the root level. Please check example file below for reference.
+  
+  * If you need a tool to convert OAI-ORE exported json-ld into a format compatible with the Dataset Migration API, or if you need to generate compatible json-ld from sources other than an existing Dataverse installation, the `BaseX <http://basex.org>`_ database engine, used together with the XQuery language, provides an efficient solution. Please see example script :download:`transform-oai-ore-jsonld.xq <../_static/api/transform-oai-ore-jsonld.xq>` for a simple conversion from exported OAI-ORE json-ld to a Dataset Migration API -compatible version. 
+
+* Existing publication dates and PIDs are maintained (currently limited to the case where the PID can be managed by the Dataverse software, e.g. where the authority and shoulder match those the software is configured for)
+
+* Updating the PID at the provider can be done immediately or later (with other existing APIs).
+
+* Adding files can be done via the standard APIs, including using direct-upload to S3.
+
+This API consists of 2 calls: one to create an initial Dataset version, and one to 'republish' the dataset through Dataverse with a specified publication date.
+Both calls require super-admin privileges.
+
+These calls can be used in concert with other API calls to add files, update metadata, etc. before the 'republish' step is done.
+
+
+Start Migrating a Dataset into a Dataverse Collection
+-----------------------------------------------------
+
+.. note:: This action requires a Dataverse installation account with superuser permissions.
+
+To import a dataset with an existing persistent identifier (PID), the provided json-ld metadata should include it.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export DATAVERSE_ID=root
+  
+  curl -H X-Dataverse-key:$API_TOKEN -X POST $SERVER_URL/api/dataverses/$DATAVERSE_ID/datasets/:startmigration --upload-file dataset-migrate.jsonld
+
+An example jsonld file is available at :download:`dataset-migrate.jsonld <../_static/api/dataset-migrate.jsonld>` . Note that you would need to replace the PID in the sample file with one supported in your Dataverse instance. 
+
+You also need to replace the :code:`dataverse.siteUrl` in the json-ld :code:`@context` with your current Dataverse site URL. This is necessary to define a local URI for metadata terms originating from community metadata blocks (in the case of the example file, from the Social Sciences and Humanities and Geospatial blocks).
+
+Currently, as of Dataverse 6.5 and earlier, community metadata blocks do not assign a default global URI to the terms used in the block in contrast to citation metadata, which has global URI defined.
+
+
+
+Publish a Migrated Dataset
+--------------------------
+
+The call above creates a Dataset. Once it is created, other APIs can be used to add files, add additional metadata, etc. When a version is complete, the following call can be used to publish it with its original publication date.
+
+.. note:: This action requires a Dataverse installation account with superuser permissions.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+ 
+  curl -H 'Content-Type: application/ld+json' -H X-Dataverse-key:$API_TOKEN -X POST -d '{"schema:datePublished": "2020-10-26","@context":{ "schema":"http://schema.org/"}}' "$SERVER_URL/api/datasets/{id}/actions/:releasemigrated"
+
+datePublished is the only metadata supported in this call.
+
+An optional query parameter: updatepidatprovider (default is false) can be set to true to automatically update the metadata and targetUrl of the PID at the provider. With this set true, the result of this call will be that the PID redirects to this dataset rather than the dataset in the source repository.
+
+.. code-block:: bash
+
+  curl -H 'Content-Type: application/ld+json' -H X-Dataverse-key:$API_TOKEN -X POST -d '{"schema:datePublished": "2020-10-26","@context":{ "schema":"http://schema.org/"}}' "$SERVER_URL/api/datasets/{id}/actions/:releasemigrated?updatepidatprovider=true"
+
+If the parameter is not added and set to true, other existing APIs can be used to update the PID at the provider later, e.g. :ref:`send-metadata-to-pid-provider`
diff --git a/doc/sphinx-guides/source/developers/dataset-semantic-metadata-api.rst b/doc/sphinx-guides/source/developers/dataset-semantic-metadata-api.rst
new file mode 100644
index 00000000000..4f374bdc039
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/dataset-semantic-metadata-api.rst
@@ -0,0 +1,121 @@
+Dataset Semantic Metadata API
+=============================
+.. contents:: |toctitle|
+	:local:
+
+
+The OAI_ORE metadata export format represents Dataset metadata using json-ld (see the :doc:`/admin/metadataexport` section). As part of an RDA-supported effort to allow import of Datasets exported as Bags with an included OAI_ORE metadata file, 
+an experimental API has been created that provides a json-ld alternative to the v1.0 API calls to get/set/delete Dataset metadata in the :doc:`/api/native-api`.
+
+You may prefer to work with this API if you are building a tool to import from a Bag/OAI-ORE source or already work with json-ld representations of metadata, or if you prefer the flatter json-ld representation to Dataverse software's json representation (which includes structure related to the metadata blocks involved and the type/multiplicity of the metadata fields.) 
+You may not want to use this API if you need stability and backward compatibility (the 'experimental' designation for this API implies that community feedback is desired and that, in future Dataverse software versions, the API may be modified based on that feedback).
+
+Note: The examples use the 'application/ld+json' mimetype. For compatibility reasons, the APIs also be used with mimetype "application/json-ld"
+  
+Get Dataset Metadata
+--------------------
+
+To get the json-ld formatted metadata for a Dataset, specify the Dataset ID (DATASET_ID) or Persistent identifier (DATASET_PID), and, for specific versions, the version number.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export DATASET_ID='12345'
+  export DATASET_PID='doi:10.5072/FK2A1B2C3'
+  export VERSION='1.0'
+  export SERVER_URL=https://demo.dataverse.org
+ 
+  Example 1: Get metadata for version '1.0'
+ 
+    curl -H X-Dataverse-key:$API_TOKEN -H 'Accept: application/ld+json' "$SERVER_URL/api/datasets/$DATASET_ID/versions/$VERSION/metadata"
+
+  Example 2: Get metadata for the latest version using the DATASET PID
+
+    curl -H X-Dataverse-key:$API_TOKEN -H 'Accept: application/ld+json' "$SERVER_URL/api/datasets/:persistentId/metadata?persistentId=$DATASET_PID"
+
+You should expect a 200 ("OK") response and JSON-LD mirroring the OAI-ORE representation in the returned 'data' object.
+
+
+.. _add-semantic-metadata:
+
+Add Dataset Metadata
+--------------------
+
+To add json-ld formatted metadata for a Dataset, specify the Dataset ID (DATASET_ID) or Persistent identifier (DATASET_PID). Adding '?replace=true' will overwrite an existing metadata value. The default (replace=false) will only add new metadata or add a new value to a multi-valued field. 
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export DATASET_ID='12345'
+  export DATASET_PID='doi:10.5072/FK2A1B2C3'
+  export VERSION='1.0'
+  export SERVER_URL=https://demo.dataverse.org
+ 
+  Example: Change the Dataset title 
+ 
+    curl -X PUT -H X-Dataverse-key:$API_TOKEN -H 'Content-Type: application/ld+json' -d '{"title": "Submit menu test", "@context":{"title": "http://purl.org/dc/terms/title"}}' "$SERVER_URL/api/datasets/$DATASET_ID/metadata?replace=true"
+
+  Example 2: Add a description using the DATASET PID
+
+    curl -X PUT -H X-Dataverse-key:$API_TOKEN -H 'Content-Type: application/ld+json' -d '{"citation:dsDescription": {"citation:dsDescriptionValue": "New description"}, "@context":{"citation": "https://dataverse.org/schema/citation/"}}' "$SERVER_URL/api/datasets/:persistentId/metadata?persistentId=$DATASET_PID"
+
+You should expect a 200 ("OK") response indicating whether a draft Dataset version was created or an existing draft was updated.
+
+
+Delete Dataset Metadata
+-----------------------
+
+To delete metadata for a Dataset, send a json-ld representation of the fields to delete and specify the Dataset ID (DATASET_ID) or Persistent identifier (DATASET_PID).
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export DATASET_ID='12345'
+  export DATASET_PID='doi:10.5072/FK2A1B2C3'
+  export VERSION='1.0'
+  export SERVER_URL=https://demo.dataverse.org
+ 
+  Example: Delete the TermsOfUseAndAccess 'restrictions' value 'No restrictions' for the latest version using the DATASET PID
+
+    curl -X PUT -H X-Dataverse-key:$API_TOKEN -H 'Content-Type: application/ld+json' -d '{"https://dataverse.org/schema/core#restrictions":"No restrictions"}' "$SERVER_URL/api/datasets/:persistentId/metadata/delete?persistentId=$DATASET_PID"
+
+Note, this example uses the term URI directly rather than adding an ``@context`` element. You can use either form in any of these API calls. 
+
+You should expect a 200 ("OK") response indicating whether a draft Dataset version was created or an existing draft was updated.
+
+.. _api-semantic-create-dataset:
+
+Create a Dataset
+----------------
+
+Specifying the Content-Type as application/ld+json with the existing /api/dataverses/{id}/datasets API call (see :ref:`create-dataset-command`) supports using the same metadata format when creating a Dataset.
+
+With curl, this is done by adding the following header:
+
+.. code-block:: bash
+
+  -H 'Content-Type: application/ld+json' 
+  
+  .. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export DATAVERSE_ID=root
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK27U7YBV
+
+  curl -H X-Dataverse-key:$API_TOKEN -H 'Content-Type: application/ld+json' -X POST $SERVER_URL/api/dataverses/$DATAVERSE_ID/datasets --upload-file dataset-create.jsonld
+
+An example jsonld file is available at :download:`dataset-create.jsonld <../_static/api/dataset-create.jsonld>` (:download:`dataset-create_en.jsonld <../_static/api/dataset-create.jsonld>` is a version that sets the metadata language (see :ref:`:MetadataLanguages`) to English (en).)
+
+.. _api-semantic-create-dataset-with-type:
+
+Create a Dataset with a Dataset Type
+------------------------------------
+
+By default, datasets are given the type "dataset" but if your installation had added additional types (see :ref:`api-add-dataset-type`), you can specify the type.
+
+An example JSON-LD file is available at :download:`dataset-create-software.jsonld <../_static/api/dataset-create-software.jsonld>`.
+
+You can use this file with the normal :ref:`api-semantic-create-dataset` endpoint above.
+
+See also :ref:`dataset-types`.
diff --git a/doc/sphinx-guides/source/developers/debugging.rst b/doc/sphinx-guides/source/developers/debugging.rst
index e2cfd0ac9f4..ffee6764b7f 100644
--- a/doc/sphinx-guides/source/developers/debugging.rst
+++ b/doc/sphinx-guides/source/developers/debugging.rst
@@ -8,8 +8,58 @@ Debugging
 Logging
 -------
 
-By default, Glassfish logs at the "INFO" level but logging can be increased to "FINE" on the fly with (for example) ``./asadmin set-log-levels edu.harvard.iq.dataverse.api.Datasets=FINE``. Running ``./asadmin list-log-levels`` will show the current logging levels.
+By default, the app server logs at the "INFO" level but logging can be increased to "FINE" on the fly with (for example) ``./asadmin set-log-levels edu.harvard.iq.dataverse.api.Datasets=FINE``. Running ``./asadmin list-log-levels`` will show the current logging levels.
 
-----
+.. _jsf-config:
 
-Previous: :doc:`documentation` | Next: :doc:`coding-style`
+Java Server Faces (JSF) Configuration Options
+---------------------------------------------
+
+Some JSF options can be easily changed via MicroProfile Config (using environment variables, system properties, etc.)
+during development without recompiling. Changing the options will require at least a redeployment, obviously depending
+how you get these options in. (Variable substitution only happens during deployment and when using system properties
+or environment variables, you'll need to pass these into the domain, which usually will require an app server restart.)
+
+Please note you can use
+`MicroProfile Config <https://download.eclipse.org/microprofile/microprofile-config-2.0/microprofile-config-spec-2.0.html#configprofile>`_
+to maintain your settings more easily for different environments.
+
+.. list-table::
+   :widths: 15 15 60 10
+   :header-rows: 1
+   :align: left
+
+   * - JSF Option
+     - MPCONFIG Key
+     - Description
+     - Default
+   * - javax.faces.PROJECT_STAGE
+     - dataverse.jsf.project-stage
+     - Switch to different levels to make JSF more verbose, disable caches etc.
+       Read more `at <https://www.ibm.com/support/pages/changes-xhtml-and-java-sources-jsf-20-web-project-not-refreshed-publish-was-v8-server>`_
+       `various <https://docs.oracle.com/javaee/6/tutorial/doc/bnaxj.html#giqxl>`_ `places <https://javaee.github.io/tutorial/jsf-facelets003.html>`_.
+     - ``Production``
+   * - javax.faces.INTERPRET_EMPTY
+       _STRING_SUBMITTED_VALUES_AS_NULL
+     - dataverse.jsf.empty-string-null
+     - See `Jakarta Server Faces 3.0 Spec`_
+     - ``true``
+   * - javax.faces.FACELETS_SKIP_COMMENTS
+     - dataverse.jsf.skip-comments
+     - See `Jakarta Server Faces 3.0 Spec`_
+     - ``true``
+   * - javax.faces.FACELETS_BUFFER_SIZE
+     - dataverse.jsf.buffer-size
+     - See `Jakarta Server Faces 3.0 Spec`_
+     - ``102400`` (100 KB)
+   * - javax.faces.FACELETS_REFRESH_PERIOD
+     - dataverse.jsf.refresh-period
+     - See `Jakarta Server Faces 3.0 Spec`_
+     - ``-1``
+   * - primefaces.THEME
+     - dataverse.jsf.primefaces.theme
+     - See `PrimeFaces Configuration Docs`_
+     - ``bootstrap``
+
+.. _Jakarta Server Faces 3.0 Spec: https://jakarta.ee/specifications/faces/3.0/jakarta-faces-3.0.html#a6088
+.. _PrimeFaces Configuration Docs: https://primefaces.github.io/primefaces/11_0_0/#/gettingstarted/configuration
diff --git a/doc/sphinx-guides/source/developers/dependencies.rst b/doc/sphinx-guides/source/developers/dependencies.rst
index 72fdad03e43..26880374f23 100644
--- a/doc/sphinx-guides/source/developers/dependencies.rst
+++ b/doc/sphinx-guides/source/developers/dependencies.rst
@@ -3,27 +3,35 @@ Dependency Management
 =====================
 
 .. contents:: |toctitle|
-	:local:
+    :local:
 
-Dataverse is (currently) a Java EE 7 based application, that uses a lot of additional libraries for special purposes.
-This includes features like support for SWORD-API, S3 storage and many others.
+Introduction
+------------
+
+As explained under :ref:`core-technologies`, the Dataverse Software is a Jakarta EE 8 based application that uses a lot of additional libraries for
+special purposes. This includes support for the SWORD API, S3 storage, and many other features.
+
+Besides the code that glues together individual pieces, any developer needs to describe dependencies used within the
+Maven-based build system. As is familiar to any Maven user, this happens inside the "Project Object Model" (POM) file, ``pom.xml``.
+
+Recursive and convergent dependency resolution makes dependency management with Maven quite easy, but sometimes, in
+projects with many complex dependencies like the Dataverse Software, you have to help Maven make the right choices.
+
+Maven can foster good development practices by enabling modulithic (modular monolithic) architecture: splitting
+functionalities into different Maven submodules while expressing dependencies between them. But there's more: the
+parent-child model allows you to create consistent dependency versioning (see below) within children.
 
-Besides the code that glues together the single pieces, any developer needs to describe used dependencies for the
-Maven-based build system. As is familiar to any Maven user, this happens inside the "Project Object Model" (POM) living in
-``pom.xml`` at the root of the project repository. Recursive and convergent dependency resolution makes dependency
-management with Maven very easy. But sometimes, in projects with many complex dependencies like Dataverse, you have
-to help Maven make the right choices.
 
 Terms
 -----
 
 As a developer, you should familiarize yourself with the following terms:
 
-- **Direct dependencies**: things *you use* yourself in your own code for Dataverse.
+- **Direct dependencies**: things *you use* yourself in your own code for the Dataverse Software.
 - **Transitive dependencies**: things *others use* for things you use, pulled in recursively.
   See also: `Maven docs <https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Transitive_Dependencies>`_.
 
-.. graphviz::
+  .. graphviz::
 
     digraph {
         rankdir="LR";
@@ -44,6 +52,94 @@ As a developer, you should familiarize yourself with the following terms:
         yc -> dtz;
     }
 
+- **Project Object Model** (POM): the basic XML file unit to describe a Maven-based project.
+- **Bill Of Materials** (BOM): larger projects like Payara, Amazon SDK etc. provide lists of their direct dependencies.
+  This comes in handy when adding these dependencies (transitive for us) as direct dependencies, see below.
+
+  .. graphviz::
+
+    digraph {
+        rankdir="TD";
+        node [fontsize=10]
+        edge [fontsize=8]
+
+        msp [label="Maven Super POM"]
+        sp  [label="Your POM"]
+        bom [label="Some BOM"]
+        td  [label="Direct & Transitive\nDependency"]
+
+        msp -> sp [label="inherit", dir="back"];
+        bom -> sp [label="import", dir="back"];
+        bom -> td [label="depend on"];
+        sp -> td [label="depend on\n(same version)", constraint=false];
+    }
+
+- **Parent POM**, **Super POM**: any project may be a child of a parent.
+
+  Project silently inherit from a "super POM", which is the global Maven standard parent POM.
+  Children may also be aggregated by a parent (without them knowing) for convenient builds of larger projects.
+
+  .. graphviz::
+
+    digraph {
+        rankdir="TD";
+        node [fontsize=10]
+        edge [fontsize=8]
+
+        msp [label="Maven Super POM"]
+        ap  [label="Any POM"]
+        msp -> ap [label="inherit", dir="back"];
+
+        pp [label="Parent 1 POM"]
+        cp1 [label="Submodule 1 POM"]
+        cp2 [label="Submodule 2 POM"]
+
+        msp -> pp [label="inherit", dir="back", constraint=false];
+        pp -> cp1 [label="aggregate"];
+        pp -> cp2 [label="aggregate"];
+    }
+
+  Children may inherit dependencies, properties, settings, plugins etc. from the parent (making it possible to share
+  common ground). Both approaches may be combined. Children may import as many BOMs as they want, but can have only a
+  single parent to inherit from at a time.
+
+  .. graphviz::
+
+    digraph {
+        rankdir="TD";
+        node [fontsize=10]
+        edge [fontsize=8]
+
+        msp [label="Maven Super POM"]
+        pp  [label="Parent POM"]
+        cp1 [label="Submodule 1 POM"]
+        cp2 [label="Submodule 2 POM"]
+
+        msp -> pp [label="inherit", dir="back", constraint=false];
+        pp -> cp1 [label="aggregate"];
+        pp -> cp2 [label="aggregate"];
+        cp1 -> pp [label="inherit"];
+        cp2 -> pp [label="inherit"];
+
+        d [label="Dependency"]
+        pp -> d [label="depends on"]
+        cp1 -> d [label="inherit:\ndepends on", style=dashed];
+        cp2 -> d [label="inherit:\ndepends on", style=dashed];
+    }
+
+- **Modules**: when using parents and children, these are called "modules" officially, each having their own POM.
+
+  Using modules allows bundling different aspects of (Dataverse) software in their own domains, with their own
+  behavior, dependencies etc. Parent modules allow for sharing of common settings, properties, dependencies and more.
+  Submodules may also be used as parent modules for a lower level of submodules.
+
+  Maven modules within the same software project may also depend on each other, allowing to create complex structures
+  of packages and projects. Each module may be released on their own (e. g. on Maven Central) and other projects may
+  rely on and reuse them. This is especially useful for parent POMs: they may be reused as BOMs or to share a standard
+  between independent software projects.
+
+  Maven modules should not be confused with the `Java Platform Module System (JPMS) <https://en.wikipedia.org/wiki/Java_Platform_Module_System>`_ introduced in Java 9 under Project Jigsaw.
+
 Direct dependencies
 -------------------
 
@@ -62,24 +158,34 @@ Within the POM, any direct dependencies reside within the ``<dependencies>`` tag
 
 
 Anytime you add a ``<dependency>``, Maven will try to fetch it from defined/configured repositories and use it
-within the build lifecycle. You have to define a ``<version>``, but ``<scope>`` is optional for ``compile``.
-(See `Maven docs: Dep. Scope <https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope>`_)
+within the build lifecycle. You have to define a ``<version>`` (note exception below), but ``<scope>`` is optional for
+``compile``. (See `Maven docs: Dep. Scope <https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope>`_)
 
-
-During fetching, Maven will analyse all transitive dependencies (see graph above) and, if necessary, fetch those, too.
+During fetching, Maven will analyze all transitive dependencies (see graph above) and, if necessary, fetch those too.
 Everything downloaded once is cached locally by default, so nothing needs to be fetched again and again, as long as the
 dependency definition does not change.
 
 **Rules to follow:**
 
 1. You should only use direct dependencies for **things you are actually using** in your code.
-2. **Clean up** direct dependencies no longer in use. It will bloat the deployment package otherwise!
-3. Care about the **scope**. Do not include "testing only" dependencies in the package - it will hurt you in IDEs and bloat things. [#f1]_
-4. Avoid using different dependencies for the **same purpose**, e. g. different JSON parsing libraries.
-5. Refactor your code to **use Java EE** standards as much as possible.
-6. When you rely on big SDKs or similar big cool stuff, try to **include the smallest portion possible**. Complete SDK
+2. When declaring a direct dependency with its **version** managed by ``<dependencyManagement>``, a BOM or parent POM, you
+   may not provide one unless you want to explicitly override!
+3. **Clean up** direct dependencies no longer in use. It will bloat the deployment package otherwise!
+4. Care about the **scope** [#f1]_:
+
+   * Do not include "testing only" dependencies in the final package - it will hurt you in IDEs and bloat things.
+     There is scope ``test`` for this!
+   * Make sure to use the ``runtime`` scope when you need to ensure a library is present on our classpath at runtime.
+     An example is the SLF4J JUL bridge: we want to route logs from SLF4J into ``java.util.logging``, so it needs to be
+     present on the classpath, although we aren't using SLF4J unlike, some of our dependencies.
+   * Some dependencies might be ``provided`` by the runtime environment. Good example: everything from Jakarta EE!
+     We use the Payara BOM to ensure using the same version during development and runtime.
+
+5. Avoid using different dependencies for the **same purpose**, e. g. different JSON parsing libraries.
+6. Refactor your code to **use Jakarta EE** standards as much as possible.
+7. When you rely on big SDKs or similar big cool stuff, try to **include the smallest portion possible**. Complete SDK
    bundles are typically heavyweight and most of the time unnecessary.
-7. **Don't include transitive dependencies.** [#f2]_
+8. **Don't include transitive dependencies.** [#f2]_
 
    * Exception: if you are relying on it in your code (see *Z* in the graph above), you must declare it. See below
      for proper handling in these (rare) cases.
@@ -92,8 +198,8 @@ Maven is comfortable for developers; it handles recursive resolution, downloadin
 However, as life is a box of chocolates, you might find yourself in *version conflict hell* sooner than later without even
 knowing, but experiencing unintended side effects.
 
-When you look at the graph above, imagine *B* and *TB* rely on different *versions* of *TC*. How does Maven decide
-which version it will include? Easy: the dependent version of the nearest version wins:
+When you look at the topmost graph above, imagine *B* and *TB* rely on different *versions* of *TC*. How does Maven
+decide which version it will include? Easy: the version of the dependency nearest to our project ("Your Code)" wins. The following graph gives an example:
 
 .. graphviz::
 
@@ -110,19 +216,19 @@ which version it will include? Easy: the dependent version of the nearest versio
         yc -> dtz2;
     }
 
-In this case, version "2.0" will be included. If you know something about semantic versioning, a red alert should ring in your mind right now.
-How do we know that *B* is compatible with *Z v2.0* when depending on *Z v1.0*?
+In this case, version "2.0" will be included. If you know something about semantic versioning, a red alert should ring
+in your mind right now. How do we know that *B* is compatible with *Z v2.0* when depending on *Z v1.0*?
 
 Another scenario getting us in trouble: indirect use of transitive dependencies. Imagine the following: we rely on *Z*
-in our code, but do not include a direct dependency for it within the POM. Now *B* is updated and removed its dependency
-on *Z*. You definitely don't want to head down that road.
+in our code, but do not include a direct dependency for it within the POM. Now assume *B* is updated and removed its 
+dependency on *Z*. You definitely don't want to head down that road.
 
 **Follow the rules to be safe:**
 
-1. Do **not use transitive deps implicit**: add a direct dependency for transitive deps you re-use in your code.
-2. On every build check that no implicit usage was added by accident.
+1. Do **not use transitive deps implicitly**: add a direct dependency for transitive deps you re-use in your code.
+2. On every build, check that no implicit usage was added by accident.
 3. **Explicitly declare versions** of transitive dependencies in use by multiple direct dependencies.
-4. On every build check that there are no convergence problems hiding in the shadows.
+4. On every build, check that there are no convergence problems hiding in the shadows.
 5. **Do special tests** on every build to verify these explicit combinations work.
 
 Managing transitive dependencies in ``pom.xml``
@@ -130,15 +236,24 @@ Managing transitive dependencies in ``pom.xml``
 
 Maven can manage versions of transitive dependencies in four ways:
 
-1. Make a transitive-only dependency not used in your code a direct one and add a ``<version>`` tag.
-   Typically a bad idea, don't do that.
-2. Use ``<optional>`` or ``<exclusion>`` tags on direct dependencies that request the transitive dependency.
-   *Last resort*, you really should avoid this. Not explained or used here.
-   `See Maven docs <https://maven.apache.org/guides/introduction/introduction-to-optional-and-excludes-dependencies.html>`_.
-3. Explicitly declare the transitive dependency in ``<dependencyManagement>`` and add a ``<version>`` tag.
-4. For more complex transitive dependencies, reuse a "Bill of Materials" (BOM) within ``<dependencyManagement>``
-   and add a ``<version>`` tag. Many bigger and standard use projects provide those, making the POM much less bloated
-   compared to adding every bit yourself.
+.. list-table::
+    :align: left
+    :stub-columns: 1
+    :widths: 12 40 40
+
+    * - Safe Good Practice
+      - (1) Explicitly declare the transitive dependency in ``<dependencyManagement>`` with a ``<version>`` tag.
+      - (2) For more complex transitive dependencies, reuse a "Bill of Materials" (BOM) within ``<dependencyManagement>``.
+            Many bigger projects provide them, making the POM much less bloated compared to adding every bit yourself.
+    * - Better Avoid or Don't
+      - (3) Use ``<optional>`` or ``<exclusion>`` tags on direct dependencies that request the transitive dependency.
+            *Last resort*, you really should avoid this. Not explained or used here, but sometimes unavoidable.
+            `See Maven docs <https://maven.apache.org/guides/introduction/introduction-to-optional-and-excludes-dependencies.html>`_.
+      - (4) Make a transitive-only dependency not used in your code a direct one and add a ``<version>`` tag.
+            Typically a bad idea; don't do that.
+
+**Note:** when the same transitive dependency is used in multiple Maven modules of a software project, it might be added
+to a common ``<dependencyManagement>`` section of an inherited parent POM instead. (Overrides are still possible.)
 
 A reduced example, only showing bits relevant to the above cases and usage of an explicit transitive dep directly:
 
@@ -167,7 +282,7 @@ A reduced example, only showing bits relevant to the above cases and usage of an
                 <scope>import</scope>
             </dependency>
             <!-- Second example for case 4 and an example for explicit direct usage of a transitive dependency.
-                 Jackson is used by AWS SDK and others, but we also use it in Dataverse. -->
+                 Jackson is used by AWS SDK and others, but we also use it in the Dataverse Software. -->
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
@@ -175,7 +290,7 @@ A reduced example, only showing bits relevant to the above cases and usage of an
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <!-- Example for case 3. Joda is not used in Dataverse (as of writing this). -->
+            <!-- Example for case 3. Joda is not used in the Dataverse Software (as of writing this). -->
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
@@ -194,13 +309,13 @@ A reduced example, only showing bits relevant to the above cases and usage of an
             <artifactId>aws-java-sdk-s3</artifactId>
             <!-- no version here as managed by BOM above! -->
         </dependency>
-        <!-- Should be refactored and removed once on Java EE 8 -->
+        <!-- Should be refactored and removed now that we are on Jakarta EE 8 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
             <!-- no version here as managed above! -->
         </dependency>
-        <!-- Should be refactored and removed once on Java EE 8 -->
+        <!-- Should be refactored and removed now that we are on Jakarta EE 8 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -214,12 +329,12 @@ Helpful tools
 
 Maven provides some plugins that are of great help to detect possible conflicts and implicit usage.
 
-For *implicit usage detection*, use `mvn dependency:analyze`. Examine the output with great care. Sometimes you will
+For *implicit usage detection*, use ``mvn dependency:analyze``. Examine the output with great care. Sometimes you will
 see implicit usages that do no harm, especially if you are using bigger SDKs having some kind of `core` package.
 This will also report on any direct dependency which is not in use and can be removed from the POM. Again, do this with
 great caution and double check.
 
-If you want to see the dependencies both direct and transitive in a *dependency tree format*, use `mvn dependency:tree`.
+If you want to see the dependencies both direct and transitive in a *dependency tree format*, use ``mvn dependency:tree``.
 
 This will however not help you with detecting possible version conflicts. For this you need to use the `Enforcer Plugin
 <https://maven.apache.org/enforcer/maven-enforcer-plugin/index.html>`_ with its built in `dependency convergence rule
@@ -228,11 +343,10 @@ This will however not help you with detecting possible version conflicts. For th
 Repositories
 ------------
 
-Maven receives all dependencies from *repositories*. Those can be public like `Maven Central <https://search.maven.org/>`_
-and others, but you can also use a private repository on premises or in the cloud. Last but not least, you can use
-local repositories, which can live next to your application code (see ``local_lib`` dir within Dataverse codebase).
+Maven receives all dependencies from *repositories*. These can be public like `Maven Central <https://search.maven.org/>`_
+and others, but you can also use a private repository on premises or in the cloud.
 
-Repositories are defined within the Dataverse POM like this:
+Repositories are defined within the Dataverse Software POM like this:
 
 .. code:: xml
 
@@ -249,11 +363,6 @@ Repositories are defined within the Dataverse POM like this:
             <url>http://repository.primefaces.org</url>
             <layout>default</layout>
         </repository>
-        <repository>
-            <id>dvn.private</id>
-            <name>Local repository for hosting jars not available from network repositories.</name>
-            <url>file://${project.basedir}/local_lib</url>
-        </repository>
     </repositories>
 
 You can also add repositories to your local Maven settings, see `docs <https://maven.apache.org/ref/3.6.0/maven-settings/settings.html>`_.
@@ -262,13 +371,76 @@ Typically you will skip the addition of the central repository, but adding it to
 dependencies are first looked up there (which in theory can speed up downloads). You should keep in mind that repositories
 are used in the order they appear.
 
+
+Dataverse Parent POM
+--------------------
+
+Within ``modules/dataverse-parent`` you will find the parent POM for the Dataverse codebase. It serves different
+purposes:
+
+1. Provide the common version number for a Dataverse release (may be overriden where necessary).
+2. Provide common metadata necessary for releasing modules to repositories like Maven Central.
+3. Declare aggregated submodules via ``<modules>``.
+4. Collate common BOMs and transitive dependencies within ``<dependencyManagement>``.
+   (Remember: a direct dependency declaration may omit the version element when defined in that area!)
+5. Collect common ``<properties>`` regarding the Maven project (encoding, ...), dependency versions, target Java version, etc.
+6. Gather common ``<repositories>`` and ``<pluginRepositories>`` - no need to repeat those in submodules.
+7. Make submodules use current Maven plugin release versions via ``<pluginManagement>``.
+
+As of this writing (2022-02-10), our parent module looks like this:
+
+.. graphviz::
+
+  digraph {
+    rankdir="TD";
+    node [fontsize=10]
+    edge [fontsize=8]
+
+    dvp [label="Dataverse Parent"]
+    dvw [label="Submodule:\nDataverse WAR"]
+    zip [label="Submodule:\nZipdownloader JAR"]
+
+    dvw -> dvp [label="inherit"];
+    dvp -> dvw [label="aggregate"];
+    zip -> dvp [label="inherit"];
+    dvp -> zip [label="aggregate"];
+
+    pay [label="Payara BOM"]
+    aws [label="AWS SDK BOM"]
+    ggl [label="Googe Cloud BOM"]
+    tc  [label="Testcontainers BOM"]
+    td  [label="Multiple (transitive) dependencies\n(PSQL, Logging, Apache Commons, ...)"]
+
+    dvp -> td [label="manage"];
+
+    pay -> dvp [label="import", dir="back"];
+    aws -> dvp [label="import", dir="back"];
+    ggl -> dvp [label="import", dir="back"];
+    tc -> dvp  [label="import", dir="back"];
+
+  }
+
+The codebase is structured like this:
+
+.. code-block::
+
+    <project root>              # Dataverse WAR Module
+    ├── pom.xml                 # (POM file of WAR module)
+    ├── modules                 #
+    │   └── dataverse-parent    # Dataverse Parent Module
+    │       └── pom.xml         # (POM file of Parent Module)
+    └── scripts                 #
+        └── zipdownload         # Zipdownloader JAR Module
+            └── pom.xml         # (POM file of Zipdownloader Module)
+
+- Any developer cloning the project and running ``mvn`` within the project root will interact with the Dataverse WAR
+  module, which is the same behavior since Dataverse 4.0 has been released.
+- Running ``mvn`` targets within the parent module will execute all aggregated submodules in one go.
+
+
 ----
 
 .. rubric:: Footnotes
 
 .. [#f1] Modern IDEs import your Maven POM and offer import autocompletion for classes based on direct dependencies in the model. You might end up using legacy or repackaged classes because of a wrong scope.
 .. [#f2] This is going to bite back in modern IDEs when importing classes from transitive dependencies by "autocompletion accident".
-
-----
-
-Previous: :doc:`documentation` | Next: :doc:`debugging`
diff --git a/doc/sphinx-guides/source/developers/deployment.rst b/doc/sphinx-guides/source/developers/deployment.rst
index 9532e7c769f..89ae9ac4c2e 100755
--- a/doc/sphinx-guides/source/developers/deployment.rst
+++ b/doc/sphinx-guides/source/developers/deployment.rst
@@ -2,15 +2,15 @@
 Deployment
 ==========
 
-Developers often only deploy Dataverse to their :doc:`dev-environment` but it can be useful to deploy Dataverse to cloud services such as Amazon Web Services (AWS).
+Developers often only deploy the Dataverse Software to their :doc:`dev-environment` but it can be useful to deploy the Dataverse Software to cloud services such as Amazon Web Services (AWS).
 
 .. contents:: |toctitle|
 	:local:
 
-Deploying Dataverse to Amazon Web Services (AWS)
-------------------------------------------------
+Deploying the Dataverse Software to Amazon Web Services (AWS)
+-------------------------------------------------------------
 
-We have written scripts to deploy Dataverse to Amazon Web Services (AWS) but they require some setup.
+We have written scripts to deploy the Dataverse Software to Amazon Web Services (AWS) but they require some setup.
 
 Install AWS CLI
 ~~~~~~~~~~~~~~~
@@ -40,10 +40,10 @@ After all this, you can try the "version" command again.
 
 Note that it's possible to add an ``export`` line like the one above to your ``~/.bash_profile`` file so you don't have to run it yourself when you open a new terminal.
 
-Configure AWS CLI
-~~~~~~~~~~~~~~~~~
+Configure AWS CLI with Stored Credentials
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Next you need to configure AWS CLI.
+Dataverse can access S3 using credentials stored as described below, or using an IAM role described a little further below.
 
 Create a ``.aws`` directory in your home directory (which is called ``~``) like this:
 
@@ -70,36 +70,73 @@ Then update the file and replace the values for "aws_access_key_id" and "aws_sec
 
 If you are having trouble configuring the files manually as described above, see https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html which documents the ``aws configure`` command.
 
+Configure Role-Based S3 Access
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Amazon offers instructions on using an IAM role to grant permissions to applications running in EC2 at https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2.html
+
 Configure Ansible File (Optional)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In order to configure Dataverse settings such as the password of the dataverseAdmin user, download https://raw.githubusercontent.com/IQSS/dataverse-ansible/master/defaults/main.yml and edit the file to your liking.
+In order to configure Dataverse installation settings such as the password of the dataverseAdmin user, download https://raw.githubusercontent.com/GlobalDataverseCommunityConsortium/dataverse-ansible/master/defaults/main.yml and edit the file to your liking.
 
 You can skip this step if you're fine with the values in the "main.yml" file in the link above.
 
 Download and Run the "Create Instance" Script
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Once you have done the configuration above, you are ready to try running the "ec2-create-instance.sh" script to spin up Dataverse in AWS.
+Once you have done the configuration above, you are ready to try running the "ec2-create-instance.sh" script to spin up a Dataverse installation in AWS.
+
+Download `ec2-create-instance.sh`_ and put it somewhere reasonable. For the purpose of these instructions we'll assume it's in the "Downloads" directory in your home directory.
+
+.. _ec2-create-instance.sh: https://raw.githubusercontent.com/GlobalDataverseCommunityConsortium/dataverse-ansible/master/ec2/ec2-create-instance.sh
+
+To run the script, you can make it executable (``chmod 755 ec2-create-instance.sh``) or run it with bash, like this with ``-h`` as an argument to print the help:
+
+``bash ~/Downloads/ec2-create-instance.sh -h``
+
+If you run the script without any arguments, it should spin up the latest version of Dataverse.
+
+You will need to wait for 15 minutes or so until the deployment is finished, longer if you've enabled sample data and/or the API test suite. Eventually, the output should tell you how to access the Dataverse installation in a web browser or via SSH. It will also provide instructions on how to delete the instance when you are finished with it. Please be aware that AWS charges per minute for a running instance. You may also delete your instance from https://console.aws.amazon.com/console/home?region=us-east-1 .
+
+Caveat Recipiens
+~~~~~~~~~~~~~~~~
+
+Please note that while the script should work well on new-ish branches, older branches that have different dependencies such as an older version of Solr may not produce a working Dataverse installation. Your mileage may vary.
+
+
+Migrating Datafiles from Local Storage to S3
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A number of pilot Dataverse installations start on local storage, then administrators are tasked with migrating datafiles into S3 or similar object stores. The files may be copied with a command-line utility such as `s3cmd <https://s3tools.org/s3cmd>`_. You will want to retain the local file hierarchy, keeping the authority (for example: 10.5072) at the bucket "root."
+
+The below example queries may assist with updating dataset and datafile locations in the Dataverse installation's PostgresQL database. Depending on the initial version of the Dataverse Software and subsequent upgrade path, Datafile storage identifiers may or may not include a ``file://`` prefix, so you'll want to catch both cases.
 
-Download :download:`ec2-create-instance.sh <../../../../scripts/installer/ec2-create-instance.sh>` and put it somewhere reasonable. For the purpose of these instructions we'll assume it's in the "Downloads" directory in your home directory.
+To Update Dataset Location to S3, Assuming a ``file://`` Prefix
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-ec2-create-instance accepts a number few command-line switches:
+::
 
-* -r: GitHub Repository URL (defaults to https://github.com/IQSS/dataverse.git)
-* -b: branch to build (defaults to develop)
-* -p: pemfile directory (defaults to $HOME)
-* -g: Ansible GroupVars file (if you wish to override role defaults)
+  UPDATE dvobject SET storageidentifier=REPLACE(storageidentifier,'file://','s3://')
+    WHERE dtype='Dataset';
 
-``bash ~/Downloads/ec2-create-instance.sh -b develop -r https://github.com/scholarsportal/dataverse.git -g main.yml``
+To Update Datafile Location to your-s3-bucket, Assuming a ``file://`` Prefix
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Now you will need to wait around 15 minutes until the deployment is finished. Eventually, the output should tell you how to access the installation of Dataverse in a web browser or via ssh. It will also provide instructions on how to delete the instance when you are finished with it. Please be aware that AWS charges per minute for a running instance. You can also delete your instance from https://console.aws.amazon.com/console/home?region=us-east-1 .
+::
 
-Caveats
-~~~~~~~
+  UPDATE dvobject
+    SET storageidentifier=REPLACE(storageidentifier,'file://','s3://your-s3-bucket:')
+    WHERE id IN (SELECT o.id FROM dvobject o, dataset s WHERE o.dtype = 'DataFile'
+    AND s.id = o.owner_id AND s.harvestingclient_id IS null
+    AND o.storageidentifier NOT LIKE 's3://%');
 
-Please note that while the script should work fine on newish branches, older branches that have different dependencies such as an older version of Solr may not produce a working Dataverse installation. Your mileage may vary.
+To Update Datafile Location to your-s3-bucket, Assuming no ``file://`` Prefix
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-----
+::
 
-Previous: :doc:`coding-style` | Next: :doc:`containers`
+  UPDATE dvobject SET storageidentifier=CONCAT('s3://your-s3-bucket:', storageidentifier)
+	  WHERE id IN (SELECT o.id FROM dvobject o, dataset s WHERE o.dtype = 'DataFile'
+	  AND s.id = o.owner_id AND s.harvestingclient_id IS null
+	  AND o.storageidentifier NOT LIKE '%://%');
diff --git a/doc/sphinx-guides/source/developers/dev-environment.rst b/doc/sphinx-guides/source/developers/dev-environment.rst
index 82b2f0bcc56..26f09417af2 100755
--- a/doc/sphinx-guides/source/developers/dev-environment.rst
+++ b/doc/sphinx-guides/source/developers/dev-environment.rst
@@ -2,209 +2,89 @@
 Development Environment
 =======================
 
-These instructions are purposefully opinionated and terse to help you get your development environment up and running as quickly as possible! Please note that familiarity with running commands from the terminal is assumed.
+These instructions are oriented around Docker but the "classic" instructions we used for Dataverse 4 and 5 are still available at :doc:`classic-dev-env`.
 
 .. contents:: |toctitle|
 	:local:
 
-Quick Start
------------
+.. _container-dev-quickstart:
 
-The quickest way to get Dataverse running is to use Vagrant as described in the :doc:`tools` section, but for day to day development work, we recommended the following setup.
-
-Set Up Dependencies
--------------------
-
-Supported Operating Systems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Mac OS X or Linux is required because the setup scripts assume the presence of standard Unix utilities.
-
-Windows is not well supported, unfortunately, but Vagrant and Minishift environments are described in the :doc:`windows` section.
-
-Install Java
-~~~~~~~~~~~~
-
-Dataverse requires Java 8.
-
-On Mac, we recommend Oracle's version of the JDK, which can be downloaded from http://www.oracle.com/technetwork/java/javase/downloads/index.html
-
-On Linux, you are welcome to use the OpenJDK available from package managers.
-
-Install Netbeans or Maven
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-NetBeans IDE (Java EE bundle) is recommended, and can be downloaded from http://netbeans.org . Developers may use any editor or IDE. We recommend NetBeans because it is free, works cross platform, has good support for Java EE projects, and includes a required build tool, Maven.
-
-Below we describe how to build the Dataverse war file with Netbeans but if you prefer to use only Maven, you can find installation instructions in the :doc:`tools` section.
-
-Install Homebrew (Mac Only)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-On Mac, install Homebrew to simplify the steps below: https://brew.sh
-
-Clone the Dataverse Git Repo
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Fork https://github.com/IQSS/dataverse and then clone your fork like this:
-
-``git clone git@github.com:[YOUR GITHUB USERNAME]/dataverse.git``
-
-Build the Dataverse War File
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To build the Dataverse war file using versions of Netbeans newer than 8.2 requires some setup because Java EE support is not enabled by default. An alternative is to build the war file with Maven, which is explained below.
-
-Launch Netbeans and click "File" and then "Open Project". Navigate to where you put the Dataverse code and double-click "dataverse" to open the project.
-
-If you are using Netbeans 8.2, Java EE support should "just work" but if you are using a newer version of Netbeans, you will see "dataverse (broken)". If you see "broken", click "Tools", "Plugins", and "Installed". Check the box next to "Java Web and EE" and click "Activate". Let Netbeans install all the dependencies. You will observe that the green "Active" checkmark does not appear next to "Java Web and EE". Restart Netbeans.
-
-In Netbeans, select "dataverse" under Projects and click "Run" in the menu and then "Build Project (dataverse)". The first time you build the war file, it will take a few minutes while dependencies are downloaded from Maven Central. Feel free to move on to other steps but check back for "BUILD SUCCESS" at the end.
-
-If you installed Maven instead of Netbeans, run ``mvn package``.
-
-NOTE: Do you use a locale different than ``en_US.UTF-8`` on your development machine? Are you in a different timezone
-than Harvard (Eastern Time)? You might experience issues while running tests that were written with these settings
-in mind. The Maven  ``pom.xml`` tries to handle this for you by setting the locale to ``en_US.UTF-8`` and timezone
-``UTC``, but more, not yet discovered building or testing problems might lurk in the shadows.
-
-Install jq
-~~~~~~~~~~
-
-On Mac, run this command:
-
-``brew install jq``
-
-On Linux, install ``jq`` from your package manager or download a binary from http://stedolan.github.io/jq/
-
-Install Glassfish
-~~~~~~~~~~~~~~~~~
-
-Glassfish 4.1 is required.
-
-To install Glassfish, run the following commands:
-
-``cd /usr/local``
-
-``sudo curl -O http://download.oracle.com/glassfish/4.1/release/glassfish-4.1.zip``
-
-``sudo unzip glassfish-4.1.zip``
-
-``sudo chown -R $USER /usr/local/glassfish4``
-
-Test Glassfish Startup Time on Mac
-++++++++++++++++++++++++++++++++++
-
-``cd /usr/local/glassfish4/glassfish/bin``
-
-``./asadmin start-domain``
-
-``grep "startup time" /usr/local/glassfish4/glassfish/domains/domain1/logs/server.log``
-
-If you are seeing startup times in the 30 second range (31,584ms for "Felix" for example) please be aware that startup time can be greatly reduced (to less than 1.5 seconds in our testing) if you make a small edit to your ``/etc/hosts`` file as described at https://stackoverflow.com/questions/39636792/jvm-takes-a-long-time-to-resolve-ip-address-for-localhost/39698914#39698914 and https://thoeni.io/post/macos-sierra-java/
-
-Look for a line that says ``127.0.0.1 localhost`` and add a space followed by the output of ``hostname`` which should be something like ``foobar.local`` depending on the name of your Mac. For example, the line would say ``127.0.0.1 localhost foobar.local`` if your Mac's name is "foobar".
-
-Install PostgreSQL
-~~~~~~~~~~~~~~~~~~
-
-PostgreSQL 9.6 is recommended to match the version in the Installation Guide.
-
-On Mac, go to https://www.postgresql.org/download/macosx/ and choose "Interactive installer by EnterpriseDB" option. We've tested version 9.6.9. When prompted to set a password for the "database superuser (postgres)" just enter "password".
-
-After installation is complete, make a backup of the ``pg_hba.conf`` file like this:
+Quickstart
+----------
 
-``sudo cp /Library/PostgreSQL/9.6/data/pg_hba.conf /Library/PostgreSQL/9.6/data/pg_hba.conf.orig``
+First, install Java 17, Maven, and Docker.
 
-Then edit ``pg_hba.conf`` with an editor such as vi:
+After cloning the `dataverse repo <https://github.com/IQSS/dataverse>`_, run this:
 
-``sudo vi /Library/PostgreSQL/9.6/data/pg_hba.conf``
+``mvn -Pct clean package docker:run``
 
-In the "METHOD" column, change all instances of "md5" to "trust".
+(Note that if you are Windows, you must run the command above in `WSL <https://learn.microsoft.com/windows/wsl>`_ rather than cmd.exe. See :doc:`windows`.)
 
-In the Finder, click "Applications" then "PostgreSQL 9.6" and launch the "Reload Configuration" app. Click "OK" after you see "server signaled".
+After some time you should be able to log in:
 
-Next, launch the "pgAdmin" application from the same folder. Under "Browser", expand "Servers" and double click "PostgreSQL 9.6". When you are prompted for a password, leave it blank and click "OK". If you have successfully edited "pg_hba.conf", you can get in without a password.
+- url: http://localhost:8080
+- username: dataverseAdmin
+- password: admin1
 
-On Linux, you should just install PostgreSQL from your package manager without worrying about the version as long as it's 9.x. Find ``pg_hba.conf`` and set the authentication method to "trust" and restart PostgreSQL.
+Detailed Steps
+--------------
 
-Install Solr
+Install Java
 ~~~~~~~~~~~~
 
-`Solr <http://lucene.apache.org/solr/>`_ 7.3.1 is required.
-
-To install Solr, execute the following commands:
-
-``sudo mkdir /usr/local/solr``
-
-``sudo chown $USER /usr/local/solr``
-
-``cd /usr/local/solr``
-
-``curl -O http://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz``
-
-``tar xvfz solr-7.3.1.tgz``
-
-``cd solr-7.3.1/server/solr``
+The recommended version is Java 17 because it's the version we test with. See https://github.com/IQSS/dataverse/pull/9764.
 
-``cp -r configsets/_default collection1``
+On Mac and Windows, we suggest using `SDKMAN <https://sdkman.io>`_ to install Temurin (Eclipe's name for its OpenJDK distribution). Type ``sdk install java 17`` and then hit the "tab" key until you get to a version that ends with ``-tem`` and then hit enter.
 
-``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema.xml``
+Alternatively you can download Temurin from https://adoptium.net (formerly `AdoptOpenJDK <https://adoptopenjdk.net>`_).
 
-``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema_dv_mdb_fields.xml``
+On Linux, you are welcome to use the OpenJDK available from package managers.
 
-``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema_dv_mdb_copies.xml``
+Install Maven
+~~~~~~~~~~~~~
 
-``mv schema*.xml collection1/conf``
+If you are using SKDMAN, run this command:
 
-``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/solrconfig.xml``
+``sdk install maven``
 
-``mv solrconfig.xml collection1/conf/solrconfig.xml``
+Otherwise, follow instructions at https://maven.apache.org.
 
-``cd /usr/local/solr/solr-7.3.1``
+Install and Start Docker
+~~~~~~~~~~~~~~~~~~~~~~~~
 
-``bin/solr start``
+Follow instructions at https://www.docker.com
 
-``bin/solr create_core -c collection1 -d server/solr/collection1/conf``
+Be sure to start Docker.
 
-Run the Dataverse Installer Script
-----------------------------------
+Git Clone Repo
+~~~~~~~~~~~~~~
 
-Navigate to the directory where you cloned the Dataverse git repo and run these commands:
+Fork https://github.com/IQSS/dataverse and then clone your fork like this:
 
-``cd scripts/installer``
+``git clone git@github.com:[YOUR GITHUB USERNAME]/dataverse.git``
 
-``./install``
+Build and Run
+~~~~~~~~~~~~~
 
-It's fine to accept the default values.
+Change into the ``dataverse`` directory you just cloned and run the following command:
 
-After a while you will see ``Enter admin user name [Enter to accept default]>`` and you can just hit Enter.
+``mvn -Pct clean package docker:run``
 
-Verify Dataverse is Running
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Verify 
+~~~~~~
 
-After the script has finished, you should be able to log into Dataverse with the following credentials:
+After some time you should be able to log in:
 
-- http://localhost:8080
+- url: http://localhost:8080
 - username: dataverseAdmin
-- password: admin
-
-Configure Your Development Environment for Publishing
------------------------------------------------------
-
-Run the following command:
-
-``curl http://localhost:8080/api/admin/settings/:DoiProvider -X PUT -d FAKE``
-
-This will disable DOI registration by using a fake (in-code) DOI provider. Please note that this feature is only available in version >= 4.10 and that at present, the UI will give no indication that the DOIs thus minted are fake.
+- password: admin1
 
 Next Steps
 ----------
 
-If you can log in to Dataverse, great! If not, please see the :doc:`troubleshooting` section. For further assitance, please see "Getting Help" in the :doc:`intro` section.
-
-You're almost ready to start hacking on code. Now that the installer script has you up and running, you need to continue on to the :doc:`tips` section to get set up to deploy code from your IDE or the command line.
+See the :doc:`/container/dev-usage` section of the Container Guide for tips on fast redeployment, viewing logs, and more.
 
-----
+Getting Help
+------------
 
-Previous: :doc:`intro` | Next: :doc:`tips`
+Please feel free to reach out at https://chat.dataverse.org or https://groups.google.com/g/dataverse-dev if you have any difficulty setting up a dev environment!
diff --git a/doc/sphinx-guides/source/developers/documentation.rst b/doc/sphinx-guides/source/developers/documentation.rst
deleted file mode 100755
index f16c0d311ba..00000000000
--- a/doc/sphinx-guides/source/developers/documentation.rst
+++ /dev/null
@@ -1,138 +0,0 @@
-=====================
-Writing Documentation
-=====================
-
-.. contents:: |toctitle|
-	:local:
-
-Quick Fix
------------
-
-If you find a typo or a small error in the documentation you can fix it using GitHub's online web editor. Generally speaking, we will be following https://help.github.com/en/articles/editing-files-in-another-users-repository
-
-- Navigate to https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source where you will see folders for each of the guides:
-
-  - `admin`_
-  - `api`_
-  - `developers`_
-  - `installation`_
-  - `user`_
-
-- Find the file you want to edit under one of the folders above.
-- Click the pencil icon in the upper-right corner. If this is your first contribution to Dataverse, the hover text over the pencil icon will say "Fork this project and edit this file".
-- Make changes to the file and preview them.
-- In the **Commit changes** box, enter a description of the changes you have made and click **Propose file change**.
-- Under the **Write** tab, delete the long welcome message and write a few words about what you fixed.
-- Click **Create Pull Request**.
-
-That's it! Thank you for your contribution! Your pull request will be added manually to the main Dataverse project board at https://github.com/orgs/IQSS/projects/2 and will go through code review and QA before it is merged into the "develop" branch. Along the way, developers might suggest changes or make them on your behalf. Once your pull request has been merged you will be listed as a contributor at https://github.com/IQSS/dataverse/graphs/contributors
-
-Please see https://github.com/IQSS/dataverse/pull/5857 for an example of a quick fix that was merged (the "Files changed" tab shows how a typo was fixed).
-
-If you would like to read more about the Dataverse project's use of GitHub, please see the :doc:`version-control` section. For bug fixes and features we request that you create an issue before making a pull request but this is not at all necessary for quick fixes to the documentation.
-
-.. _admin: https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source/admin
-.. _api: https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source/api
-.. _developers: https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source/developers
-.. _installation: https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source/installation
-.. _user: https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source/user
-
-Other Changes (Sphinx)
-----------------------
-
-The documentation for Dataverse was written using Sphinx (http://sphinx-doc.org/). 
-If you are interested in suggesting changes or updates we recommend that you create 
-the html files using Sphinx locally and then submit a pull request through GitHub. Here are the instructions on how to proceed:
-
-
-Installing Sphinx
-~~~~~~~~~~~~~~~~~
-
-On a Mac: 
-
-Download the sphinx zip file from http://sphinx-doc.org/install.html
-
-Unzip it somewhere. In the unzipped directory, do the following as
-root, (sudo -i):
-
-python setup.py build
-python setup.py install
-
-Alternative option (Mac/Unix/Windows):
-
-Unless you already have it, install pip (https://pip.pypa.io/en/latest/installing.html)
-
-run ``pip install sphinx`` in a terminal
-
-This is all you need. You should now be able to build HTML/pdf documentation from git sources locally.
-
-Using Sphinx
-~~~~~~~~~~~~
-
-First, you will need to make a fork of the dataverse repository in GitHub. Then, you will need to make a clone of your fork so you can manipulate the files outside GitHub.
-
-To edit the existing documentation:
-
-- Create a branch (refer to http://guides.dataverse.org/en/latest/developers/version-control.html > *Create a New Branch off the develop Branch*) to record the changes you are about to perform.
-- Go to ~/dataverse/doc/sphinx-guides/source directory inside your clone. There, you will find the .rst files that correspond to the guides in the dataverse page (http://guides.dataverse.org/en/latest/).
-- Using your preferred text editor, open and edit the necessary files, or create new ones.
-
-**NOTE:** When adding ReStructured Text (RST) `cross references <https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#ref-role>`_, use the hyphen character (``-``) as the word separator for the cross reference label. For example, ``my-reference-label`` would be the preferred label for a cross reference as opposed to, for example, ``my_reference_label``.
-
-Once you are done, open a terminal and change directories to ~/dataverse/doc/sphinx-guides . Then, run the following commands:
-
-- ``make clean``
-
-- ``make html``
-
-After sphinx is done processing the files you should notice that the html folder in ~/dataverse/doc/sphinx-guides/build directory has been updated.
-You can click on the files in the html folder to preview the changes.
-
-Now you can make a commit with the changes to your own fork in GitHub and submit a pull request to the original (upstream) dataverse repository.
-
-Table of Contents
------------------
-
-Every non-index page should use the following code to display a table of contents of internal sub-headings: ::
-
-	.. contents:: |toctitle|
-		:local:
-
-This code should be placed below any introductory text/images and directly above the first subheading, much like a Wikipedia page.
-
-Images
-------
-
-A good documentation is just like a website enhanced and upgraded by adding high quality and self-explanatory images.
-Often images depict a lot of written text in a simple manner. Within our Sphinx docs, you can add them in two ways: a) add a
-PNG image directly and include or b) use inline description languages like GraphViz (current only option).
-
-While PNGs in the git repo can be linked directly via URL, Sphinx-generated images do not need a manual step and might
-provide higher visual quality. Especially in terms of quality of content, generated images can be extendend and improved
-by a textbased and reviewable commit, without needing raw data or source files and no diff around.
-
-GraphViz based images
-~~~~~~~~~~~~~~~~~~~~~
-
-In some parts of the documentation, graphs are rendered as images via Sphinx GraphViz extension.
-
-This requires `GraphViz <http://graphviz.org/>`_ installed and either ``dot`` on the path or
-`adding options to the make call <https://groups.google.com/forum/#!topic/sphinx-users/yXgNey_0M3I>`_.
-
-This has been tested and works on Mac, Linux, and Windows. If you have not properly configured GraphViz, then the worst thing that might happen is a warning and missing images in your local documentation build.
-
-
-Versions
---------
-
-For installations hosting their own copies of the guides, note that as each version of Dataverse is released, there is an updated version of the guides released with it. Google and other search engines index all versions, which may confuse users who discover your guides in the search results as to which version they should be looking at. When learning about your installation from the search results, it is best to be viewing the *latest* version.
-
-In order to make it clear to the crawlers that we only want the latest version discoverable in their search results, we suggest adding this to your ``robots.txt`` file::
-
-        User-agent: *
-        Allow: /en/latest/
-        Disallow: /en/
-
-----
-
-Previous: :doc:`testing` | Next: :doc:`dependencies`
diff --git a/doc/sphinx-guides/source/developers/fontcustom.rst b/doc/sphinx-guides/source/developers/fontcustom.rst
new file mode 100755
index 00000000000..edcda1e69ab
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/fontcustom.rst
@@ -0,0 +1,102 @@
+===========
+Font Custom
+===========
+
+As mentioned under :ref:`style-guide-fontcustom` in the Style Guide, Dataverse uses `Font Custom`_ to create custom icon fonts.
+
+.. _Font Custom: https://github.com/FontCustom/fontcustom
+
+.. contents:: |toctitle|
+	:local:
+
+Previewing Icons
+----------------
+
+The process below updates a `preview page`_ that you can use to see how the icons look.
+
+.. _preview page: ../_static/fontcustom-preview.html
+
+In `scripts/icons/svg`_ in the source tree, you can see the SVG files that the icons are built from. 
+
+.. _scripts/icons/svg: https://github.com/IQSS/dataverse/tree/develop/scripts/icons
+
+Install Font Custom
+-------------------
+
+You'll need Font Custom and its dependencies installed if you want to update the icons.
+
+Ruby Version
+~~~~~~~~~~~~
+
+Font Custom is written in Ruby. Ruby 3.0 didn't "just work" with FontAwesome but Ruby 2.7 was fine.
+
+RVM is a good way to install a specific version of Ruby: https://rvm.io
+
+Install Dependencies and Font Custom Gem
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The brew commands below assume you are on a Mac.
+
+.. code-block:: bash
+
+        brew tap bramstein/webfonttools
+        brew update
+        brew install woff2
+        brew install sfnt2woff
+        brew install fontforge
+        brew install eot-utils
+        gem install fontcustom
+
+
+(``brew install sfnt2woff`` isn't currently listed in the FontCustom README but it's in mentioned in https://github.com/FontCustom/fontcustom/pull/385)
+
+If ``fontcustom --help`` works now, you have it installed.
+
+Updating Icons
+--------------
+
+Navigate to ``scripts/icons`` in the source tree (or `online`_) and you will find:
+
+- An ``svg`` directory containing the "source" for the icons.
+- Scripts to update the icons.
+
+.. _online: https://github.com/IQSS/dataverse/tree/develop/scripts/icons
+
+There is a copy of these icons in both the app and the guides. We'll update the guides first because it's much quicker to iterate and notice any problems with the icons.
+
+Updating the Guides Icons
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Run ``docs.sh`` and then open ``../../doc/sphinx-guides/source/_static/fontcustom-preview.html`` in a browser to look at the icons. (This is the `preview page`_ mentioned above that gets incorporated in the next Sphinx build.)
+
+Update any files in the ``svg`` directory and run the script again to see any differences.
+
+Note that Font Custom creates font files with unique names. For this reason, we should remove the old files from git as we add the new ones. The script deletes the old files for you but in a step below we'll do a ``git add`` to stage this change.
+
+Updating the App Icons
+~~~~~~~~~~~~~~~~~~~~~~
+
+Assuming you're happy with how the icons look in the preview page in the guides, you can move on to updating the icons in the Dataverse app itself.
+
+This time the script is called ``app.sh`` and it works the same way with the addition of tweaking some URLs. Go ahead and run this script and do a full "clean and build" before making sure the changes are visible in the application.
+
+Committing Changes to Git
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+As mentioned above, icons are in both the app and the docs. Again, because the filenames change, we should make sure the old files are removed from git.
+
+From the root of the repo, run the following:
+
+.. code-block:: bash
+
+        git add doc/sphinx-guides/source/_static
+        git add src/main/webapp/resources
+
+That should be enough to make sure old files are replaced by new ones. At this point, you can commit and make a pull request.
+
+Caveats About Font Custom
+-------------------------
+
+Font Custom is a useful tool and has an order of magnitude more stars on GitHub than its competitors. However, an `issue`_ suggests that the tool is somewhat abandoned. Its domain has expired but you can still get at what used to be its website at https://fontcustom.github.io/fontcustom/
+
+.. _issue: https://github.com/FontCustom/fontcustom/issues/321
diff --git a/doc/sphinx-guides/source/developers/geospatial.rst b/doc/sphinx-guides/source/developers/geospatial.rst
index 2857f7df9bf..48d300524c2 100644
--- a/doc/sphinx-guides/source/developers/geospatial.rst
+++ b/doc/sphinx-guides/source/developers/geospatial.rst
@@ -5,19 +5,12 @@ Geospatial Data
 .. contents:: |toctitle|
 	:local:
 
-Geoconnect
-----------
+How The Dataverse Software Ingests Shapefiles
+---------------------------------------------
 
-Geoconnect works as a middle layer, allowing geospatial data files in Dataverse to be visualized with Harvard WorldMap. To set up a Geoconnect development environment, you can follow the steps outlined in the `local_setup.md <https://github.com/IQSS/geoconnect/blob/master/local_setup.md>`_ guide. You will need Python and a few other prerequisites.
+A shapefile is a set of files, often uploaded/transferred in ``.zip`` format. This set may contain up to fifteen files. A minimum of three specific files (``.shp``, ``.shx``, ``.dbf``) are needed to be a valid shapefile and a fourth file (``.prj``) is required for some applications -- or any type of meaningful visualization.
 
-As mentioned under "Architecture and Components" in the :doc:`/installation/prep` section of the Installation Guide, Geoconnect is an optional component of Dataverse, so this section is only necessary to follow it you are working on an issue related to this feature.
-
-How Dataverse Ingests Shapefiles
---------------------------------
-
-A shapefile is a set of files, often uploaded/transferred in ``.zip`` format. This set may contain up to fifteen files. A minimum of three specific files (``.shp``, ``.shx``, ``.dbf``) are needed to be a valid shapefile and a fourth file (``.prj``) is required for WorldMap -- or any type of meaningful visualization.
-
-For ingest and connecting to WorldMap, four files are the minimum required:
+For ingest, four files are the minimum required:
 
 - ``.shp`` - shape format; the feature geometry itself
 - ``.shx`` - shape index format; a positional index of the feature geometry to allow seeking forwards and backwards quickly
@@ -27,7 +20,7 @@ For ingest and connecting to WorldMap, four files are the minimum required:
 Ingest
 ~~~~~~
 
-When uploaded to Dataverse, the ``.zip`` is unpacked (same as all ``.zip`` files). Shapefile sets are recognized by the same base name and specific extensions. These individual files constitute a shapefile set. The first four are the minimum required (``.shp``, ``.shx``, ``.dbf``, ``.prj``)
+When uploaded to a Dataverse installation, the ``.zip`` is unpacked (same as all ``.zip`` files). Shapefile sets are recognized by the same base name and specific extensions. These individual files constitute a shapefile set. The first four are the minimum required (``.shp``, ``.shx``, ``.dbf``, ``.prj``)
 
 For example:
 
@@ -38,19 +31,19 @@ For example:
 - bicycles.sbx	(NOT required extension)
 - bicycles.sbn	(NOT required extension)
 
-Upon recognition of the four required files, Dataverse will group them as well as any other relevant files into a shapefile set. Files with these extensions will be included in the shapefile set:
+Upon recognition of the four required files, the Dataverse installation will group them as well as any other relevant files into a shapefile set. Files with these extensions will be included in the shapefile set:
 
 - Required: ``.shp``, ``.shx``, ``.dbf``, ``.prj``
-- Optional: ``.sbn``, ``.sbx``, ``.fbn``, ``.fbx``, ``.ain``, ``.aih``, ``.ixs``, ``.mxs``, ``.atx``, ``.cpg``, ``shp.xml``
+- Optional: ``.sbn``, ``.sbx``, ``.fbn``, ``.fbx``, ``.ain``, ``.aih``, ``.ixs``, ``.mxs``, ``.atx``, ``.cpg``, ``.qpj``, ``.qmd``, ``shp.xml``
 
-Then Dataverse creates a new ``.zip`` with mimetype as a shapefile. The shapefile set will persist as this new ``.zip``.
+Then the Dataverse installation creates a new ``.zip`` with mimetype as a shapefile. The shapefile set will persist as this new ``.zip``.
 
 Example
 ~~~~~~~
 
 **1a.** Original ``.zip`` contents:
 
-A file named ``bikes_and_subways.zip`` is uploaded to the Dataverse. This ``.zip`` contains the following files.
+A file named ``bikes_and_subways.zip`` is uploaded to the Dataverse installation. This ``.zip`` contains the following files.
 
 - ``bicycles.shp``  (shapefile set #1)
 - ``bicycles.shx``  (shapefile set #1)
@@ -66,9 +59,9 @@ A file named ``bikes_and_subways.zip`` is uploaded to the Dataverse. This ``.zip
 - ``subway_line.prj``  (shapefile set #2)
 - ``subway_line.dbf``  (shapefile set #2)
 
-**1b.** Dataverse unzips and re-zips files:
+**1b.** The Dataverse installation unzips and re-zips files:
 
-Upon ingest, Dataverse unpacks the file ``bikes_and_subways.zip``. Upon recognizing the shapefile sets, it groups those files together into new ``.zip`` files:
+Upon ingest, the Dataverse installation unpacks the file ``bikes_and_subways.zip``. Upon recognizing the shapefile sets, it groups those files together into new ``.zip`` files:
 
 - files making up the "bicycles" shapefile become a new ``.zip``
 - files making up the "subway_line" shapefile become a new ``.zip``
@@ -76,7 +69,7 @@ Upon ingest, Dataverse unpacks the file ``bikes_and_subways.zip``. Upon recogniz
 
 To ensure that a shapefile set remains intact, individual files such as ``bicycles.sbn`` are kept in the set -- even though they are not used for mapping.
 
-**1c.** Dataverse final file listing:
+**1c.** The Dataverse installation final file listing:
 
 - ``bicycles.zip`` (contains shapefile set #1: ``bicycles.shp``, ``bicycles.shx``, ``bicycles.prj``, ``bicycles.dbf``, ``bicycles.sbx``, ``bicycles.sbn``)
 - ``bicycles.txt``  (separate, not part of a shapefile set)
@@ -88,128 +81,3 @@ For two "final" shapefile sets, ``bicycles.zip`` and ``subway_line.zip``, a new
 
 - Mimetype: ``application/zipped-shapefile``
 - Mimetype Label: "Shapefile as ZIP Archive"
-
-WorldMap JoinTargets + API Endpoint
------------------------------------
-
-WorldMap supplies target layers -- or JoinTargets -- that a tabular file may be mapped against. A JSON description of these `CGA <http://gis.harvard.edu>`_-curated JoinTargets may be retrieved via API at ``http://worldmap.harvard.edu/datatables/api/jointargets/``. Please note: login is required. You may use any WorldMap account credentials via HTTP Basic Auth.
-
-Example of JoinTarget information returned via the API:
-
-.. code-block:: json
-
-    {
-	  "data":[
-	    {
-	      "layer":"geonode:census_tracts_2010_boston_6f6",
-	      "name":"Census Tracts, Boston (GEOID10: State+County+Tract)",
-	      "geocode_type_slug":"us-census-tract",
-	      "geocode_type":"US Census Tract",
-	      "attribute":{
-	        "attribute":"CT_ID_10",
-	        "type":"xsd:string"
-	      },
-	      "abstract":"As of the 2010 census, Boston, MA contains 7,288 city blocks [truncated for example]",
-	      "title":"Census Tracts 2010, Boston (BARI)",
-	      "expected_format":{
-	        "expected_zero_padded_length":-1,
-	        "is_zero_padded":false,
-	        "description":"Concatenation of state, county and tract for 2010 Census Tracts.  Reference: https://www.census.gov/geo/maps-data/data/tract_rel_layout.html\r\n\r\nNote:  Across the US, this can be a zero-padded \"string\" but the original Boston layer has this column as \"numeric\" ",
-	        "name":"2010 Census Boston GEOID10 (State+County+Tract)"
-	      },
-	      "year":2010,
-	      "id":28
-	    },
-	    {
-	      "layer":"geonode:addresses_2014_boston_1wr",
-	      "name":"Addresses, Boston",
-	      "geocode_type_slug":"boston-administrative-geography",
-	      "geocode_type":"Boston, Administrative Geography",
-	      "attribute":{
-	        "attribute":"LocationID",
-	        "type":"xsd:int"
-	      },
-	      "abstract":"Unique addresses present in the parcels data set, which itself is derived from [truncated for example]",
-	      "title":"Addresses 2015, Boston (BARI)",
-	      "expected_format":{
-	        "expected_zero_padded_length":-1,
-	        "is_zero_padded":false,
-	        "description":"Boston, Administrative Geography, Boston Address Location ID.  Example: 1, 2, 3...nearly 120000",
-	        "name":"Boston Address Location ID (integer)"
-	      },
-	      "year":2015,
-	      "id":18
-	    },
-	    {
-	      "layer":"geonode:bra_neighborhood_statistical_areas_2012__ug9",
-	      "name":"BRA Neighborhood Statistical Areas, Boston",
-	      "geocode_type_slug":"boston-administrative-geography",
-	      "geocode_type":"Boston, Administrative Geography",
-	      "attribute":{
-	        "attribute":"BOSNA_R_ID",
-	        "type":"xsd:double"
-	      },
-	      "abstract":"BRA Neighborhood Statistical Areas 2015, Boston. Provided by [truncated for example]",
-	      "title":"BRA Neighborhood Statistical Areas 2015, Boston (BARI)",
-	      "expected_format":{
-	        "expected_zero_padded_length":-1,
-	        "is_zero_padded":false,
-	        "description":"Boston, Administrative Geography, Boston BRA Neighborhood Statistical Area ID (integer).  Examples: 1, 2, 3, ... 68, 69",
-	        "name":"Boston BRA Neighborhood Statistical Area ID (integer)"
-	      },
-	      "year":2015,
-	      "id":17
-	    }
-	  ],
-	  "success":true
-    }
-
-How Geoconnect Uses Join Target Information
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When a user attempts to map a tabular file, the application looks in the Geoconnect database for ``JoinTargetInformation``. If this information is more than 10 minutes* old, the application will retrieve fresh information and save it to the db.
-
-(* Change the timing via the Django settings variable ``JOIN_TARGET_UPDATE_TIME``.)
-
-This JoinTarget info is used to populate HTML forms used to match a tabular file column to a JoinTarget column. Once a JoinTarget is chosen, the JoinTarget ID is an essential piece of information used to make an API call to the WorldMap and attempt to map the file.
-
-Retrieving Join Target Information from WorldMap API
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The ``get_join_targets()`` function in ``dataverse_layer_services.py`` uses the WorldMap API, retrieves a list of available tabular file JointTargets. (See the `dataverse_layer_services code in GitHub <https://github.com/IQSS/geoconnect/blob/master/gc_apps/worldmap_connect/dataverse_layer_services.py#L275>`_.)
-
-Saving Join Target Information to Geoconnect Database
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The ``get_latest_jointarget_information()`` in ``utils.py`` retrieves recent JoinTarget Information from the database. (See the `utils code in GitHub <https://github.com/IQSS/geoconnect/blob/master/gc_apps/worldmap_connect/utils.py#L16>`_.)
-
-Setting Up WorldMap Test Data
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-For the dataset page, this script gives a query to add test WorldMap map data. After the query is run, the "Explore Map" button should appear for a tabular file or shapefile. In the example SQL queries below, substitute ``$DATASET_ID`` and ``$DATAFILE_ID`` with the appropriate ID's.
-
-To add sample map data for a tabular file:
-
-.. code::
-
-    INSERT INTO maplayermetadata (id, isjoinlayer, joindescription, embedmaplink, layerlink, layername, mapimagelink, worldmapusername, dataset_id, datafile_id) 
-    VALUES (DEFAULT, true, 'This file was joined with WorldMap layer x, y, z',
-    'https://worldmap.harvard.edu/maps/embed/?layer=geonode:zip_codes_2015_zip_s9i','https://worldmap.harvard.edu/data/geonode:zip_codes_2015_zip_s9i',
-    'geonode:zip_codes_2015_zip_s9i',
-    'http://worldmap.harvard.edu/download/wms/27289/png?layers=geonode%3Azip_codes_2015_zip_s9i&#38;width=865&#38;bbox=-71.1911091251%2C42.2270382738%2C-70.9228275369%2C42.3976144794&#38;service=WMS&#38;format=image%2Fpng&#38;srs=EPSG%3A4326&#38;request=GetMap&#38;height=550',
-    'admin',$DATASET_ID,$DATAFILE_ID});
-
-To add sample map data for a tabular shapefile:
-
-.. code::
-
-    INSERT INTO maplayermetadata (id, isjoinlayer, embedmaplink, layerlink, layername, mapimagelink, worldmapusername, dataset_id, datafile_id) 
-    VALUES (DEFAULT, false,
-    'https://worldmap.harvard.edu/maps/embed/?layer=geonode:zip_codes_2015_zip_s9i','https://worldmap.harvard.edu/data/geonode:zip_codes_2015_zip_s9i',
-    'geonode:zip_codes_2015_zip_s9i',
-    'http://worldmap.harvard.edu/download/wms/27289/png?layers=geonode%3Azip_codes_2015_zip_s9i&#38;width=865&#38;bbox=-71.1911091251%2C42.2270382738%2C-70.9228275369%2C42.3976144794&#38;service=WMS&#38;format=image%2Fpng&#38;srs=EPSG%3A4326&#38;request=GetMap&#38;height=550',
-    'admin',$DATASET_ID,$DATAFILE_ID);
-
-----
-
-Previous: :doc:`unf/index` | Next: :doc:`remote-users`
diff --git a/doc/sphinx-guides/source/developers/globus-api.rst b/doc/sphinx-guides/source/developers/globus-api.rst
new file mode 100644
index 00000000000..43c237546be
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/globus-api.rst
@@ -0,0 +1,249 @@
+Globus Transfer API
+===================
+
+.. contents:: |toctitle|
+        :local:
+
+The Globus API addresses three use cases:
+
+* Transfer to a Dataverse-managed Globus endpoint (File-based or using the Globus S3 Connector)
+* Reference of files that will remain in a remote Globus endpoint
+* Transfer from a Dataverse-managed Globus endpoint
+
+The ability for Dataverse to interact with Globus endpoints is configured via a Globus store - see :ref:`globus-storage`.
+
+Globus transfers (or referencing a remote endpoint) for upload and download transfers involve a series of steps. These can be accomplished using the Dataverse and Globus APIs. (These are used internally by the `dataverse-globus app <https://github.com/scholarsportal/dataverse-globus>`_ when transfers are done via the Dataverse UI.) 
+
+Requesting Upload or Download Parameters
+----------------------------------------
+
+The first step in preparing for a Globus transfer/reference operation is to request the parameters relevant for a given dataset:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/globusUploadParameters?persistentId=$PERSISTENT_IDENTIFIER&locale=$LOCALE"
+
+The response will be of the form:
+
+.. code-block:: bash
+
+  {
+          "status": "OK",
+          "data": {
+              "queryParameters": {
+                  "datasetId": 29,
+                  "siteUrl": "http://ec2-34-204-169-194.compute-1.amazonaws.com",
+                  "datasetVersion": ":draft",
+                  "dvLocale": "en",
+                  "datasetPid": "doi:10.5072/FK2/ILLPXE",
+                  "managed": "true",
+                  "fileSizeLimit": 100000000000,
+                  "remainingQuota": 1000000000000,
+                  "endpoint": "d8c42580-6528-4605-9ad8-116a61982644"
+              },
+              "signedUrls": [
+                  {
+                      "name": "requestGlobusTransferPaths",
+                      "httpMethod": "POST",
+                      "signedUrl": "http://ec2-34-204-169-194.compute-1.amazonaws.com/api/v1/datasets/29/requestGlobusUploadPaths?until=2023-11-22T01:52:03.648&user=dataverseAdmin&method=POST&token=63ac4bb748d12078dded1074916508e19e6f6b61f64294d38e0b528010b07d48783cf2e975d7a1cb6d4a3c535f209b981c7c6858bc63afdfc0f8ecc8a139b44a",
+                      "timeOut": 300
+                  },
+                  {
+                      "name": "addGlobusFiles",
+                      "httpMethod": "POST",
+                      "signedUrl": "http://ec2-34-204-169-194.compute-1.amazonaws.com/api/v1/datasets/29/addGlobusFiles?until=2023-11-22T01:52:03.648&user=dataverseAdmin&method=POST&token=2aaa03f6b9f851a72e112acf584ffc0758ed0cc8d749c5a6f8c20494bb7bc13197ab123e1933f3dde2711f13b347c05e6cec1809a8f0b5484982570198564025",
+                      "timeOut": 300
+                  },
+                  {
+                      "name": "getDatasetMetadata",
+                      "httpMethod": "GET",
+                      "signedUrl": "http://ec2-34-204-169-194.compute-1.amazonaws.com/api/v1/datasets/29/versions/:draft?until=2023-11-22T01:52:03.649&user=dataverseAdmin&method=GET&token=1878d6a829cd5540e89c07bdaf647f1bea5314cc7a55433b0b506350dd330cad61ade3714a8ee199a7b464fb3b8cddaea0f32a89ac3bfc4a86cd2ea3004ecbb8",
+                      "timeOut": 300
+                  },
+                  {
+                      "name": "getFileListing",
+                      "httpMethod": "GET",
+                      "signedUrl": "http://ec2-34-204-169-194.compute-1.amazonaws.com/api/v1/datasets/29/versions/:draft/files?until=2023-11-22T01:52:03.650&user=dataverseAdmin&method=GET&token=78e8ca8321624f42602af659227998374ef3788d0feb43d696a0e19086e0f2b3b66b96981903a1565e836416c504b6248cd3c6f7c2644566979bd16e23a99622",
+                      "timeOut": 300
+                  }
+              ]
+          }
+    }
+
+The response includes the id for the Globus endpoint to use along with several parameters and signed URLs. The parameters include whether the Globus endpoint is "managed" by Dataverse and,
+if so, if there is a "fileSizeLimit" (see :ref:`:MaxFileUploadSizeInBytes`) that will be enforced and/or, if there is a quota (see :doc:`/admin/collectionquotas`) on the overall size of data
+that can be upload, what the "remainingQuota" is. Both are in bytes.
+
+Note that while Dataverse will not add files that violate the size or quota rules, Globus itself doesn't enforce these during the transfer. API users should thus check the size of the files
+they intend to transfer before submitting a transfer request to Globus.
+
+The getDatasetMetadata and getFileListing URLs are just signed versions of the standard Dataset metadata and file listing API calls. The other two are Globus specific.
+
+If called for a dataset using a store that is configured with a remote Globus endpoint(s), the return response is similar but the response includes a
+the "managed" parameter will be false, the "endpoint" parameter is replaced with a JSON array of "referenceEndpointsWithPaths" and the
+requestGlobusTransferPaths and addGlobusFiles URLs are replaced with ones for requestGlobusReferencePaths and addFiles. All of these calls are
+described further below.
+
+The call to set up for a transfer out (download) is similar:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/globusDownloadParameters?persistentId=$PERSISTENT_IDENTIFIER&locale=$LOCALE"
+
+Note that this API call supports an additional downloadId query parameter. This is only used when the globus-dataverse app is called from the Dataverse user interface. There is no need to use it when calling the API directly.
+
+The returned response includes the same getDatasetMetadata and getFileListing URLs as in the upload case and includes "monitorGlobusDownload" and "requestGlobusDownload" URLs. The response will also indicate whether the store is "managed" and will provide the "endpoint" from which downloads can be made.
+
+
+Performing an Upload/Transfer In
+--------------------------------
+
+The information from the API call above can be used to provide a user with information about the dataset and to prepare to transfer (managed=true) or to reference files (managed=false).
+
+Once the user identifies which files are to be added, the requestGlobusTransferPaths or requestGlobusReferencePaths URLs can be called. These both reference the same API call but must be used with different entries in the JSON body sent:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export LOCALE=en-US
+  export JSON_DATA="... (SEE BELOW)" 
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -H "Content-type:application/json" -X POST  -d "$JSON_DATA" "$SERVER_URL/api/datasets/:persistentId/requestGlobusUploadPaths?persistentId=$PERSISTENT_IDENTIFIER"
+
+Note that when using the dataverse-globus app or the return from the previous call, the URL for this call will be signed and no API_TOKEN is needed. 
+  
+In the managed case, the JSON body sent must include the id of the Globus user that will perform the transfer and the number of files that will be transferred:
+
+.. code-block:: bash
+
+  {
+    "principal":"d15d4244-fc10-47f3-a790-85bdb6db9a75", 
+    "numberOfFiles":2
+  }
+
+In the remote reference case, the JSON body sent must include the Globus endpoint/paths that will be referenced:
+
+.. code-block:: bash
+
+  {
+    "referencedFiles":[
+      "d8c42580-6528-4605-9ad8-116a61982644/hdc1/test1.txt"
+    ]
+  }
+    
+The response will include a JSON object. In the managed case, the map is from new assigned file storageidentifiers and specific paths on the managed Globus endpoint:
+
+.. code-block:: bash
+
+  {
+    "status":"OK",
+    "data":{
+      "globusm://18b49d3688c-62137dcb06e4":"/hdc1/10.5072/FK2/ILLPXE/18b49d3688c-62137dcb06e4",
+      "globusm://18b49d3688c-5c17d575e820":"/hdc1/10.5072/FK2/ILLPXE/18b49d3688c-5c17d575e820"
+    }
+  }
+
+In the managed case, the specified Globus principal is granted write permission to the specified endpoint/path,
+which will allow initiation of a transfer from the external endpoint to the managed endpoint using the Globus API.
+The permission will be revoked if the transfer is not started and the next call to Dataverse to finish the transfer are not made within a short time (configurable, default of 5 minutes).
+ 
+In the remote/reference case, the map is from the initially supplied endpoint/paths to the new assigned file storageidentifiers:
+
+.. code-block:: bash
+
+  {
+    "status":"OK",
+    "data":{
+      "d8c42580-6528-4605-9ad8-116a61982644/hdc1/test1.txt":"globus://18bf8c933f4-ed2661e7d19b//d8c42580-6528-4605-9ad8-116a61982644/hdc1/test1.txt"
+    }
+  }
+
+
+
+Adding Files to the Dataset
+---------------------------
+
+In the managed case, you must initiate a Globus transfer and take note of its task identifier. As in the JSON example below, you will pass it as ``taskIdentifier`` along with details about the files you are transferring:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export JSON_DATA='{"taskIdentifier":"3f530302-6c48-11ee-8428-378be0d9c521", \
+                    "files": [{"description":"My description.","directoryLabel":"data/subdir1","categories":["Data"], "restrict":"false", "storageIdentifier":"globusm://18b3972213f-f6b5c2221423", "fileName":"file1.txt", "mimeType":"text/plain", "checksum": {"@type": "MD5", "@value": "1234"}}, \
+                    {"description":"My description.","directoryLabel":"data/subdir1","categories":["Data"], "restrict":"false", "storageIdentifier":"globusm://18b39722140-50eb7d3c5ece", "fileName":"file2.txt", "mimeType":"text/plain", "checksum": {"@type": "MD5", "@value": "2345"}}]}'
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -H "Content-type:multipart/form-data" -X POST "$SERVER_URL/api/datasets/:persistentId/addGlobusFiles?persistentId=$PERSISTENT_IDENTIFIER" -F "jsonData=$JSON_DATA"
+
+Note that the mimetype is multipart/form-data, matching the /addFiles API call. Also note that the API_TOKEN is not needed when using a signed URL.
+
+With this information, Dataverse will begin to monitor the transfer and when it completes, will add all files for which the transfer succeeded.
+As the transfer can take significant time and the API call is asynchronous, the only way to determine if the transfer succeeded via API is to use the standard calls to check the dataset lock state and contents.
+
+Once the transfer completes, Dataverse will remove the write permission for the principal.
+
+An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This new framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag (see :ref:`feature-flags`) and the JVM option :ref:`dataverse.files.globus-monitoring-server`.
+
+Note that when using a managed endpoint that uses the Globus S3 Connector, the checksum should be correct as Dataverse can validate it. For file-based endpoints, the checksum should be included if available but Dataverse cannot verify it.
+
+In the remote/reference case, where there is no transfer to monitor, the standard /addFiles API call (see :ref:`direct-add-to-dataset-api`) is used instead. There are no changes for the Globus case.
+
+Downloading/Transfer Out Via Globus
+-----------------------------------
+
+To begin downloading files, the requestGlobusDownload URL is used:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  
+  curl -H "X-Dataverse-key:$API_TOKEN" -H "Content-type:application/json" -X POST -d "$JSON_DATA" "$SERVER_URL/api/datasets/:persistentId/requestGlobusDownload?persistentId=$PERSISTENT_IDENTIFIER"
+
+The JSON body sent should include a list of file ids to download and, for a managed endpoint, the Globus principal that will make the transfer:
+
+.. code-block:: bash
+
+  export JSON_DATA='{ \
+    "principal":"d15d4244-fc10-47f3-a790-85bdb6db9a75", \ 
+    "fileIds":[60, 61] \
+  }'
+  
+Note that this API call takes an optional downloadId parameter that is used with the dataverse-globus app. When downloadId is included, the list of fileIds is not needed.
+
+The response is a JSON object mapping the requested file Ids to Globus endpoint/paths. In the managed case, the principal will have been given read permissions for the specified paths:
+
+.. code-block:: bash
+
+  {
+    "status":"OK",
+    "data":{
+      "60": "d8c42580-6528-4605-9ad8-116a61982644/hdc1/10.5072/FK2/ILLPXE/18bf3af9c78-92b8e168090e",
+     "61": "d8c42580-6528-4605-9ad8-116a61982644/hdc1/10.5072/FK2/ILLPXE/18bf3af9c78-c8d81569305c"
+    }
+  }
+
+For the remote case, the use can perform the transfer without further contact with Dataverse. In the managed case, the user must initiate the transfer via the Globus API and then inform Dataverse.
+Dataverse will then monitor the transfer and revoke the read permission when the transfer is complete. (Not making this last call could result in failure of the transfer.)
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  
+  curl -H "X-Dataverse-key:$API_TOKEN" -H "Content-type:application/json" -X POST -d "$JSON_DATA" "$SERVER_URL/api/datasets/:persistentId/monitorGlobusDownload?persistentId=$PERSISTENT_IDENTIFIER"
+  
+The JSON body sent just contains the task identifier for the transfer:
+
+.. code-block:: bash
+
+  export JSON_DATA='{ \
+    "taskIdentifier":"b5fd01aa-8963-11ee-83ae-d5484943e99a" \
+  }'
+ 
+
diff --git a/doc/sphinx-guides/source/developers/index.rst b/doc/sphinx-guides/source/developers/index.rst
index 96595220e07..28b1fbaae82 100755
--- a/doc/sphinx-guides/source/developers/index.rst
+++ b/doc/sphinx-guides/source/developers/index.rst
@@ -4,11 +4,12 @@
    contain the root `toctree` directive.
 
 Developer Guide
-=======================================================
+===============
 
 **Contents:**
 
 .. toctree::
+   :maxdepth: 2
 
    intro
    dev-environment
@@ -18,13 +19,18 @@ Developer Guide
    version-control
    sql-upgrade-scripts
    testing
-   documentation
+   api-design
+   security
+   performance
    dependencies
    debugging
    coding-style
+   configuration
    deployment
    containers
    making-releases
+   making-library-releases
+   metadataexport
    tools
    unf/index
    make-data-count
@@ -32,4 +38,13 @@ Developer Guide
    geospatial
    selinux
    big-data-support
+   aux-file-support
+   s3-direct-upload-api
+   globus-api
+   dataset-semantic-metadata-api
+   dataset-migration-api 
    workflows
+   fontcustom
+   classic-dev-env
+   search-services
+   
diff --git a/doc/sphinx-guides/source/developers/intro.rst b/doc/sphinx-guides/source/developers/intro.rst
index ea8e924b4ef..0e74dc1c36f 100755
--- a/doc/sphinx-guides/source/developers/intro.rst
+++ b/doc/sphinx-guides/source/developers/intro.rst
@@ -2,7 +2,7 @@
 Introduction
 ============
 
-Welcome! `Dataverse <http://dataverse.org>`_ is an `open source <https://github.com/IQSS/dataverse/blob/master/LICENSE.md>`_ project that loves `contributors <https://github.com/IQSS/dataverse/blob/develop/CONTRIBUTING.md>`_!
+Welcome! `The Dataverse Project <https://dataverse.org>`_ is an `open source <https://github.com/IQSS/dataverse/blob/master/LICENSE.md>`_ project that loves contributors!
 
 .. contents:: |toctitle|
 	:local:
@@ -10,7 +10,7 @@ Welcome! `Dataverse <http://dataverse.org>`_ is an `open source <https://github.
 Intended Audience
 -----------------
 
-This guide is intended primarily for developers who want to work on the main Dataverse code base at https://github.com/IQSS/dataverse but see "Related Projects" below for other code you can work on!
+This guide is intended primarily for developers who want to work on the main Dataverse codebase at https://github.com/IQSS/dataverse but see the :doc:`/contributor/code` section of the Contributor Guide for other code you can work on!
 
 To get started, you'll want to set up your :doc:`dev-environment` and make sure you understand the branching strategy described in the :doc:`version-control` section and how to make a pull request. :doc:`testing` is expected. Opinions about :doc:`coding-style` are welcome!
 
@@ -19,58 +19,65 @@ To get started, you'll want to set up your :doc:`dev-environment` and make sure
 Getting Help
 ------------
 
-If you have any questions at all, please reach out to other developers via the channels listed in https://github.com/IQSS/dataverse/blob/develop/CONTRIBUTING.md such as http://chat.dataverse.org (#dataverse on freenode), the `dataverse-dev <https://groups.google.com/forum/#!forum/dataverse-dev>`_ mailing list, `community calls <https://dataverse.org/community-calls>`_, or support@dataverse.org.
+If you have any questions at all, please reach out to other developers via https://chat.dataverse.org, the `dataverse-dev <https://groups.google.com/g/dataverse-dev>`_ mailing list, the `dataverse-community <https://groups.google.com/g/dataverse-community>`_ mailing list, or `community calls <https://dataverse.org/community-calls>`_.
+
+.. _core-technologies:
 
 Core Technologies
 -----------------
 
-Dataverse is a `Java EE <http://en.wikipedia.org/wiki/Java_Platform,_Enterprise_Edition>`_ application that is compiled into a war file and deployed to an application server (Glassfish) which is configured to work with a relational database (PostgreSQL) and a search engine (Solr).
+Dataverse is a `Jakarta EE <https://en.wikipedia.org/wiki/Jakarta_EE>`_ application that is compiled into a WAR file and deployed to an application server (app server) which is configured to work with a relational database (PostgreSQL) and a search engine (Solr).
+
+We make use of a variety of Jakarta EE technologies such as JPA, JAX-RS, JMS, and JSF. In addition, we use parts of Eclipse MicroProfile such as `MicroProfile Config <https://github.com/eclipse/microprofile-config>`_.
 
-We make use of a variety of Java EE technologies such as JPA, JAX-RS, JMS, and JSF. The front end is built using PrimeFaces and Bootstrap.
+The frontend is built using PrimeFaces and Bootstrap. A new frontend is being built using React at https://github.com/IQSS/dataverse-frontend
 
 Roadmap
 -------
 
-For the Dataverse development roadmap, please see https://www.iq.harvard.edu/roadmap-dataverse-project
+For the roadmap, please see https://www.iq.harvard.edu/roadmap-dataverse-project
+
+.. _kanban-board:
 
 Kanban Board
 ------------
 
-You can get a sense of what's currently in flight (in dev, in QA, etc.) by looking at https://github.com/orgs/IQSS/projects/2
+You can get a sense of what's currently in flight (in dev, in QA, etc.) by looking at https://github.com/orgs/IQSS/projects/34
 
 Issue Tracker
 -------------
 
-We use GitHub Issues as our issue tracker: https://github.com/IQSS/dataverse/issues
+The main issue tracker is https://github.com/IQSS/dataverse/issues but note that individual projects have their own issue trackers.
 
 Related Guides
 --------------
 
-If you are a developer who wants to make use of Dataverse APIs, please see the :doc:`/api/index`. If you have front-end UI questions, please see the :doc:`/style/index`.
+If you are wondering about how to contribute generally, please see the :doc:`/contributor/index`.
+
+If you are a developer who wants to make use of the Dataverse APIs, please see the :doc:`/api/index`.
+
+If you have frontend UI questions, please see the :doc:`/style/index`. For the new frontend, see https://github.com/IQSS/dataverse-frontend
 
-If you are a sysadmin who likes to code, you may be interested in hacking on installation scripts mentioned in the :doc:`/installation/index`. We validate the installation scripts with :doc:`/developers/tools` such as `Vagrant <http://vagrantup.com>`_ and Docker (see the :doc:`containers` section).
+If you are a Docker enthusiasts, please check out the :doc:`/container/index`.
+
+.. _related-projects:
 
 Related Projects
 ----------------
 
+Note: this list is somewhat old. Please see also the :doc:`/contributor/code` section of the Contributor Guide.
+
 As a developer, you also may be interested in these projects related to Dataverse:
 
-- External Tools - add additional features to Dataverse without modifying the core: :doc:`/api/external-tools`
-- Dataverse API client libraries - use Dataverse APIs from various languages: :doc:`/api/client-libraries`
-- DVUploader - a stand-alone command-line Java application that uses the Dataverse API to support upload of files from local disk to a Dataset: https://github.com/IQSS/dataverse-uploader 
+- External Tools - add additional features to the Dataverse Software without modifying the core: :doc:`/api/external-tools`
+- Dataverse Software API client libraries - use Dataverse Software APIs from various languages: :doc:`/api/client-libraries`
+- DVUploader - a stand-alone command-line Java application that uses the Dataverse Software API to support upload of files from local disk to a Dataset: https://github.com/IQSS/dataverse-uploader 
 - dataverse-sample-data - populate your Dataverse installation with sample data: https://github.com/IQSS/dataverse-sample-data
-- dataverse-metrics - aggregate and visualize metrics for installations of Dataverse around the world: https://github.com/IQSS/dataverse-metrics
-- Configuration management scripts - Ansible, Puppet, etc.: See "Advanced Installation" in the :doc:`/installation/prep` section of the Installation Guide.
+- dataverse-metrics - aggregate and visualize metrics for Dataverse installations around the world: https://github.com/IQSS/dataverse-metrics
+- Configuration management scripts - Ansible, Puppet, etc.: See :ref:`advanced` section in the Installation Guide.
 - :doc:`/developers/unf/index` (Java) -  a Universal Numerical Fingerprint: https://github.com/IQSS/UNF
-- GeoConnect (Python) - create a map by uploading files to Dataverse: https://github.com/IQSS/geoconnect
 - `DataTags <https://github.com/IQSS/DataTags>`_ (Java and Scala) - tag datasets with privacy levels: https://github.com/IQSS/DataTags
-- `TwoRavens <http://2ra.vn>`_ (Javascript) - a `d3.js <http://d3js.org>`_ interface for exploring data and running Zelig models: https://github.com/IQSS/TwoRavens
-- `Zelig <http://zeligproject.org>`_ (R) - run statistical models on files uploaded to Dataverse: https://github.com/IQSS/Zelig
 - `Matrix <https://github.com/rindataverse/matrix>`_ - a visualization showing the connectedness and collaboration between authors and their affiliations.
-- Third party apps - make use of Dataverse APIs: :doc:`/api/apps`
-- chat.dataverse.org - chat interface for Dataverse users and developers: https://github.com/IQSS/chat.dataverse.org
+- Third party apps - make use of Dataverse installation APIs: :doc:`/api/apps`
+- chat.dataverse.org - chat interface for Dataverse Project users and developers: https://github.com/IQSS/chat.dataverse.org
 - [Your project here] :)
-
-----
-
-Next: :doc:`dev-environment`
diff --git a/doc/sphinx-guides/source/developers/make-data-count.rst b/doc/sphinx-guides/source/developers/make-data-count.rst
index 0bb7e9e0ffd..9fb41f67be4 100644
--- a/doc/sphinx-guides/source/developers/make-data-count.rst
+++ b/doc/sphinx-guides/source/developers/make-data-count.rst
@@ -1,7 +1,7 @@
 Make Data Count
 ===============
 
-Support for Make Data Count is a feature of Dataverse that is described in the :doc:`/admin/make-data-count` section of the Admin Guide. In order for developers to work on the feature, they must install Counter Processor, a Python 3 application, as described below. Counter Processor can be found at https://github.com/CDLUC3/counter-processor
+Support for Make Data Count is a feature of the Dataverse Software that is described in the :doc:`/admin/make-data-count` section of the Admin Guide. In order for developers to work on the feature, they must install Counter Processor, a Python 3 application, as described below. Counter Processor can be found at https://github.com/gdcc/counter-processor
 
 .. contents:: |toctitle|
         :local:
@@ -9,7 +9,7 @@ Support for Make Data Count is a feature of Dataverse that is described in the :
 Architecture
 ------------
 
-There are many components involved in Dataverse's architecture for Make Data Count as shown in the diagram below.
+There are many components involved in the Dataverse Software's architecture for Make Data Count as shown in the diagram below.
 
 |makedatacount_components|
 
@@ -28,20 +28,18 @@ To insert a citation you could insert a row like below, changing "72" in the exa
 Full Setup
 ~~~~~~~~~~
 
-The recommended way to work on the Make Data Count feature is to spin up an EC2 instance that has both Dataverse and Counter Processor installed. Go to the :doc:`deployment` page for details on how to spin up an EC2 instance and make sure that your Ansible file is configured to install Counter Processor before running the "create" script.
+The recommended way to work on the Make Data Count feature is to spin up an EC2 instance that has both the Dataverse Software and Counter Processor installed. Go to the :doc:`deployment` page for details on how to spin up an EC2 instance and make sure that your Ansible file is configured to install Counter Processor before running the "create" script.
 
-(Alternatively, you can try installing Counter Processor in Vagrant. :download:`setup-counter-processor.sh <../../../../scripts/vagrant/setup-counter-processor.sh>` might help you get it installed.)
+After you have spun to your EC2 instance, set ``:MDCLogPath`` so that the Dataverse installation creates a log for Counter Processor to operate on. For more on this database setting, see the :doc:`/installation/config` section of the Installation Guide.
 
-After you have spun to your EC2 instance, set ``:MDCLogPath`` so that Dataverse creates a log for Counter Processor to operate on. For more on this database setting, see the :doc:`/installation/config` section of the Installation Guide.
+Next you need to have the Dataverse installation add some entries to the log that Counter Processor will operate on. To do this, click on some published datasets and download some files.
 
-Next you need to have Dataverse add some entries to the log that Counter Processor will operate on. To do this, click on some published datasets and download some files.
+Next you should run Counter Processor to convert the log into a SUSHI report, which is in JSON format. Before running Counter Processor, you need to put a configuration file into place. As a starting point use :download:`counter-processor-config.yaml <../_static/developers/counter-processor-config.yaml>` and edit the file, paying particular attention to the following settings:
 
-Next you should run Counter Processor to convert the log into a SUSHI report, which is in JSON format. Before running Counter Processor, you need to put a configuration file into place. As a starting point use :download:`counter-processor-config.yaml <../../../../scripts/vagrant/counter-processor-config.yaml>` and edit the file, paying particular attention to the following settings:
-
-- ``log_name_pattern`` You might want something like ``/usr/local/glassfish4/glassfish/domains/domain1/logs/counter_(yyyy-mm-dd).log``
+- ``log_name_pattern`` You might want something like ``/usr/local/payara6/glassfish/domains/domain1/logs/counter_(yyyy-mm-dd).log``
 - ``year_month`` You should probably set this to the current month.
-- ``output_file`` This needs to be a directory that the "glassfish" Unix user can read but that the "counter" user can write to. In dev, you can probably get away with "/tmp" as the directory.
-- ``platform`` Out of the box from Counter Processor this is set to ``Dash`` but we're not 100% sure if this should be "Dataverse" or a branch for a Dataverse installation like "LibreScholar".
+- ``output_file`` This needs to be a directory that the "dataverse" Unix user can read but that the "counter" user can write to. In dev, you can probably get away with "/tmp" as the directory.
+- ``platform`` Out of the box from Counter Processor this is set to ``Dash`` but this should be changed to match the name of your Dataverse installation. Examples are "Harvard Dataverse Repository" for Harvard University or "LibraData" for the University of Virginia.
 - ``upload_to_hub`` This should be "False" unless you are testing sending SUSHI reports to the DataCite hub.
 - ``simulate_date`` You should probably set this to tomorrow.
 
@@ -51,9 +49,9 @@ Once you are done with your configuration, you can run Counter Processor like th
 
 ``su - counter``
 
-``cd /usr/local/counter-processor-0.0.1``
+``cd /usr/local/counter-processor-1.06``
 
-``CONFIG_FILE=counter-processor-config.yaml python36 main.py``
+``CONFIG_FILE=counter-processor-config.yaml python39 main.py``
 
 (Please note that the Counter Processor README says you can also pass in values like ``START_DATE``, ``END_DATE`` etc. at the command line if you find this to be more convenient.)
 
@@ -71,12 +69,12 @@ If all this is working and you want to send data to the test instance of the Dat
 
 ``curl --header "Content-Type: application/json; Accept: application/json" -H "Authorization: Bearer $JSON_WEB_TOKEN" -X POST https://api.test.datacite.org/reports/ -d @sushi_report.json``
 
-For how to put citations into your dev database and how to get them out again, see "Configuring Dataverse for Make Data Count Citations" in the :doc:`/admin/make-data-count` section of the Admin Guide.
+For how to put citations into your dev database and how to get them out again, see :ref:`MDC-updateCitationsForDataset` section in Make Data Count of the Admin Guide.
 
-Testing Make Data Count and Dataverse
--------------------------------------
+Testing Make Data Count and Your Dataverse Installation
+-------------------------------------------------------
 
-A developer running Counter Processor alongside Dataverse for development or testing purposes will notice that once the raw Dataverse logs have been processed, there is no straightforward way to re-test those same logs.
+A developer running Counter Processor alongside the Dataverse installation for development or testing purposes will notice that once the raw Dataverse installation logs have been processed, there is no straightforward way to re-test those same logs.
 
 The first thing to fix is to clear two files from Counter Processor ``state`` folder, ``statefile.json`` and ``counter_db_[yyyy-mm].sqlite3``
 
@@ -84,11 +82,42 @@ Second, if you are also sending your SUSHI report to Make Data Count, you will n
 
 ``curl -H "Authorization: Bearer $JSON_WEB_TOKEN" -X DELETE https://$MDC_SERVER/reports/$REPORT_ID``
 
-To get the ``REPORT_ID``, look at the logs generated in ``/usr/local/counter-processor-0.0.1/tmp/datacite_response_body.txt``
+To get the ``REPORT_ID``, look at the logs generated in ``/usr/local/counter-processor-1.06/tmp/datacite_response_body.txt``
 
 To read more about the Make Data Count api, see https://github.com/datacite/sashimi
 
-You can compare the MDC metrics display with Dataverse's original by toggling the ``:DisplayMDCMetrics`` setting (true by default to display MDC metrics).
+You can compare the MDC metrics display with the Dataverse installation's original by toggling the ``:DisplayMDCMetrics`` setting (true by default to display MDC metrics).
+
+Processing Archived Logs
+------------------------
+
+A new script (release date TBD) will be available for processing archived Dataverse log files. Monthly logs that are zipped, TARed, and copied to an archive can be processed by this script running nightly or weekly.
+
+The script will keep track of the state of each tar file they are processed and will make use of the following "processingState" API endpoints, which allow the state of each file to be checked or modified.
+
+The possible states are new, done, skip, processing, and failed.
+
+Setting the state to "skip" will prevent the file from being processed if the developer needs to analyze the contents.
+
+"failed" files will be re-tried in a later run.
+
+"done" files are successful and will be ignored going forward.
+
+The files currently being processed will have the state "processing".
+
+The script will process the newest set of log files (merging files from multiple nodes) and call Counter Processor.
+
+APIs to manage the states include GET, POST, and DELETE (for testing), as shown below.
+
+Note: ``yearMonth`` must be in the format ``yyyymm`` or ``yyyymmdd``.
+Note: If running the new script on multiple servers add the query parameter &server=serverName on the first POST call. The server name can not be changed once set. To clear the name out you must delete the state and post a new one.
+
+``curl -X GET http://localhost:8080/api/admin/makeDataCount/{yearMonth}/processingState``
+
+``curl -X POST http://localhost:8080/api/admin/makeDataCount/{yearMonth}/processingState?state=processing&server=server1``
+``curl -X POST http://localhost:8080/api/admin/makeDataCount/{yearMonth}/processingState?state=done``
+
+``curl -X DELETE http://localhost:8080/api/admin/makeDataCount/{yearMonth}/processingState``
 
 Resources
 ---------
diff --git a/doc/sphinx-guides/source/developers/making-library-releases.rst b/doc/sphinx-guides/source/developers/making-library-releases.rst
new file mode 100755
index 00000000000..be867f9196a
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/making-library-releases.rst
@@ -0,0 +1,146 @@
+=======================
+Making Library Releases
+=======================
+
+.. contents:: |toctitle|
+	:local:
+
+Introduction
+------------
+
+Note: See :doc:`making-releases` for Dataverse itself.
+
+We release Java libraries to Maven Central that are used by Dataverse (and perhaps `other <https://github.com/gdcc/xoai/issues/141>`_ `software <https://github.com/gdcc/xoai/issues/170>`_!):
+
+- https://central.sonatype.com/namespace/org.dataverse
+- https://central.sonatype.com/namespace/io.gdcc
+
+We release JavaScript/TypeScript libraries to npm:
+
+- https://www.npmjs.com/package/@iqss/dataverse-design-system
+
+Maven Central (Java)
+--------------------
+
+From the perspective of the Maven Central, we are both `producers <https://central.sonatype.org/publish/>`_ because we publish/release libraries there and `consumers <https://central.sonatype.org/consume/>`_ because we pull down those libraries (and many others) when we build Dataverse. 
+
+Releasing Existing Libraries to Maven Central
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you need to release an existing library, all the setup should be done already. The steps below assume that GitHub Actions are in place to do the heavy lifting for you, such as signing artifacts with GPG.
+
+Releasing a Snapshot Version to Maven Central
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`Snapshot <https://maven.apache.org/guides/getting-started/index.html#what-is-a-snapshot-version>`_ releases are published automatically through GitHub Actions (e.g. through a `snapshot workflow <https://github.com/gdcc/sword2-server/blob/main/.github/workflows/maven-snapshot.yml>`_ for the SWORD library) every time a pull request is merged (or the default branch, typically ``main``, is otherwise updated).
+
+That is to say, to make a snapshot release, you only need to get one or more commits into the default branch.
+
+Releasing a Release (Non-Snapshot) Version to Maven Central
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+From a pom.xml it may not be apparent that snapshots like ``6.0-SNAPSHOT`` might be changing under your feet. Browsing the snapshot repository (e.g. our `UNF 6.0-SNAPSHOT <https://s01.oss.sonatype.org/content/groups/staging/org/dataverse/unf/6.0-SNAPSHOT/>`_), may reveal versions changing over time. To finalize the code and stop it from changing, we publish/release what Maven calls a "`release version <https://maven.apache.org/guides/getting-started/index.html#what-is-a-snapshot-version>`_". This will remove ``-SNAPSHOT`` from the version (through an ``mvn`` command).
+
+Non-snapshot releases (`release <https://maven.apache.org/guides/getting-started/index.html#what-is-a-snapshot-version>`_ versions) are published automatically through GitHub Actions (e.g. through a `release workflow <https://github.com/gdcc/sword2-server/blob/main/.github/workflows/maven-release.yml>`_), kicked off locally by an ``mvn`` command that invokes the `Maven Release Plugin <https://maven.apache.org/maven-release/maven-release-plugin/>`_.
+
+First, run a clean:
+
+``mvn release:clean``
+
+Then run a prepare:
+
+``mvn release:prepare``
+
+The prepare step is interactive. You will be prompted for the following information:
+
+- the release version (e.g. `2.0.0 <https://repo.maven.apache.org/maven2/io/gdcc/sword2-server/2.0.0/>`_)
+- the git tag to create and push (e.g. `sword2-server-2.0.0 <https://github.com/gdcc/sword2-server/releases/tag/sword2-server-2.0.0>`_)
+- the next development (snapshot) version (e.g. `2.0.1-SNAPSHOT <https://s01.oss.sonatype.org/#nexus-search;checksum~47575aed5471adeb0a08a02098ce3a23a5778afb>`_)
+
+These examples from the SWORD library. Below is what to expect from the interactive session. In many cases, you can just hit enter to accept the defaults.
+
+.. code-block:: bash
+
+        [INFO] 5/17 prepare:map-release-versions
+        What is the release version for "SWORD v2 Common Server Library (forked)"? (sword2-server) 2.0.0: :
+        [INFO] 6/17 prepare:input-variables
+        What is the SCM release tag or label for "SWORD v2 Common Server Library (forked)"? (sword2-server) sword2-server-2.0.0: :
+        [INFO] 7/17 prepare:map-development-versions
+        What is the new development version for "SWORD v2 Common Server Library (forked)"? (sword2-server) 2.0.1-SNAPSHOT: :
+        [INFO] 8/17 prepare:rewrite-poms-for-release
+
+Note that a commit or two will be made and pushed but if you do a ``git status`` you will see that locally you are behind by that number of commits. To fix this, you can just do a ``git pull``.
+
+It can take some time for the jar to be visible on Maven Central. You can start by looking on the repo1 server, like this: https://repo1.maven.org/maven2/io/gdcc/sword2-server/2.0.0/
+
+Don't bother putting the new version in a pom.xml until you see it on repo1.
+
+Note that the next snapshot release should be available as well, like this: https://s01.oss.sonatype.org/content/groups/staging/io/gdcc/sword2-server/2.0.1-SNAPSHOT/ 
+
+Releasing a New Library to Maven Central
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+At a high level:
+
+- Start with a snapshot release.
+- Use an existing pom.xml as a starting point.
+- Use existing GitHub Actions workflows as a starting point.
+- Create secrets in the new library's GitHub repo used by the workflow.
+- If you need an entire new namespace, look at previous issues such as https://issues.sonatype.org/browse/OSSRH-94575 and https://issues.sonatype.org/browse/OSSRH-94577
+
+Updating pom.xml for a Snapshot Release
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Before publishing a final version to Maven Central, you should publish a snapshot release or two. For each snapshot release you publish, the jar name will be unique each time (e.g. ``foobar-0.0.1-20240430.175110-3.jar``), so you can safely publish over and over with the same version number.
+
+We use the `Nexus Staging Maven Plugin <https://github.com/sonatype/nexus-maven-plugins/blob/main/staging/maven-plugin/README.md>`_ to push snapshot releases to https://s01.oss.sonatype.org/content/groups/staging/io/gdcc/ and https://s01.oss.sonatype.org/content/groups/staging/org/dataverse/
+
+Add the following to your pom.xml:
+
+.. code-block:: xml
+
+    <version>0.0.1-SNAPSHOT</version>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+   <plugin>
+       <groupId>org.sonatype.plugins</groupId>
+       <artifactId>nexus-staging-maven-plugin</artifactId>
+       <version>${nexus-staging.version}</version>
+       <extensions>true</extensions>
+       <configuration>
+           <serverId>ossrh</serverId>
+           <nexusUrl>https://s01.oss.sonatype.org</nexusUrl>
+           <autoReleaseAfterClose>true</autoReleaseAfterClose>
+       </configuration>
+   </plugin>
+
+Configuring Secrets
+~~~~~~~~~~~~~~~~~~~
+
+In GitHub, you will likely need to configure the following secrets:
+
+- DATAVERSEBOT_GPG_KEY
+- DATAVERSEBOT_GPG_PASSWORD
+- DATAVERSEBOT_SONATYPE_TOKEN
+- DATAVERSEBOT_SONATYPE_USERNAME
+
+Note that some of these secrets might be configured at the org level (e.g. gdcc or IQSS).
+
+Many of the automated tasks are performed by the dataversebot account on GitHub: https://github.com/dataversebot
+
+npm (JavaScript/TypeScript)
+---------------------------
+
+Currently, publishing `@iqss/dataverse-design-system <https://www.npmjs.com/package/@iqss/dataverse-design-system>`_ to npm done manually. We plan to automate this as part of https://github.com/IQSS/dataverse-frontend/issues/140
+
+https://www.npmjs.com/package/js-dataverse is the previous 1.0 version of js-dataverse. No 1.x releases are planned. We plan to publish 2.0 (used by the new frontend) as discussed in https://github.com/IQSS/dataverse-frontend/issues/13
diff --git a/doc/sphinx-guides/source/developers/making-releases.rst b/doc/sphinx-guides/source/developers/making-releases.rst
index cbd88b1a357..028b80e2892 100755
--- a/doc/sphinx-guides/source/developers/making-releases.rst
+++ b/doc/sphinx-guides/source/developers/making-releases.rst
@@ -5,75 +5,405 @@ Making Releases
 .. contents:: |toctitle|
 	:local:
 
-Use the number of the milestone with a "v" in front for the release tag. For example: ``v4.6.2``.
+Introduction
+------------
 
-Create the release GitHub issue and branch 
-------------------------------------------
+This document is about releasing the main Dataverse app (https://github.com/IQSS/dataverse). See :doc:`making-library-releases` for how to release our various libraries. Other projects have their own release documentation.
 
-Use the GitHub issue number and the release tag for the name of the branch. 
-For example: 4734-update-v-4.8.6-to-4.9
+Below you'll see branches like "develop" and "master" mentioned. For more on our branching strategy, see :doc:`version-control`.
 
-**Note:** the changes below must be the very last commits merged into the develop branch before it is merged into master and tagged for the release!
+Regular or Hotfix?
+------------------
 
-Make the following changes in the release branch:
+Early on, make sure it's clear what type of release this is. The steps below describe making both regular releases and hotfix releases.
 
-1. Bump Version Numbers
-=======================
+- regular
 
-Increment the version number to the milestone (e.g. 4.6.2) in the following two files:
+  - e.g. 6.5 (minor)
+  - e.g. 7.0 (major)
 
-- pom.xml
-- doc/sphinx-guides/source/conf.py (two places)
+- hotfix
 
-Add the version being released to the lists in the following two files:
+  - e.g. 6.4.1 (patch)
+  - e.g. 7.0.1 (patch)
 
-- doc/sphinx-guides/source/versions.rst 
-- scripts/database/releases.txt
+Ensure Issues Have Been Created
+-------------------------------
 
-Here's an example commit where three of the four files above were updated at once: https://github.com/IQSS/dataverse/commit/99e23f96ec362ac2f524cb5cd80ca375fa13f196
+Some of the steps in this document are well-served by having their own dedicated GitHub issue. You'll see a label like this on them:
 
-2. Check in the Changes Above...
-================================
+|dedicated|
 
-... into the release branch, make a pull request and merge the release branch into develop. 
+There are a variety of reasons why a step might deserve its own dedicated issue:
 
+- The step can be done by a team member other than the person doing the release.
+- Stakeholders might be interested in the status of a step (e.g. has the release been deployed to the demo site).
 
-Merge "develop" into "master"
------------------------------
+Steps don't get their own dedicated issue if it would be confusing to have multiple people involved. Too many cooks in the kitchen, as they say. Also, some steps are so small the overhead of an issue isn't worth it.
+
+Before the release even begins you can coordinate with the project manager about the creation of these issues.
+
+.. |dedicated| raw:: html
+
+      <span class="label label-success pull-left">
+        Dedicated Issue
+      </span>&nbsp;
+
+Declare a Code Freeze
+---------------------
+
+The following steps are made more difficult if code is changing in the "develop" branch. Declare a code freeze until the release is out. Do not allow pull requests to be merged.
+
+For a hotfix, a code freeze (no merging) is necessary not because we want code to stop changing in the branch being hotfix released, but because bumping the version used in Jenkins/Ansible means that API tests will fail in pull requests until the version is bumped in those pull requests.
+
+Conduct Performance Testing
+---------------------------
 
-The "develop" branch should be merged into "master" before tagging. See also the branching strategy described in the :doc:`version-control` section.
+|dedicated|
+
+See :doc:`/qa/performance-tests` for details.
+
+Conduct Regression Testing
+---------------------------
+
+|dedicated|
+
+See :doc:`/qa/testing-approach` for details.
+Refer to the provided regression checklist for the list of items to verify during the testing process: `Regression Checklist <https://docs.google.com/document/d/1OsGJV0sMLDSmfkU9-ee8h_ozbQcUDJ1EOwNPm4dC63Q/edit?usp=sharing>`_.
+
+.. _write-release-notes:
 
 Write Release Notes
 -------------------
 
-Developers should express the need for an addition to release notes by creating a file in ``/doc/release-notes`` containing the name of the issue they're working on. The name of the branch could be used for the filename with ".md" appended (release notes are written in Markdown) such as ``5053-apis-custom-homepage.md``. 
+|dedicated|
+
+Developers express the need for an addition to release notes by creating a "release note snippet" in ``/doc/release-notes`` containing the name of the issue they're working on. The name of the branch could be used for the filename with ".md" appended (release notes are written in Markdown) such as ``5053-apis-custom-homepage.md``. See :ref:`writing-release-note-snippets` for how this is described for contributors.
+
+The task at or near release time is to collect these snippets into a single file.
+
+- Find the issue in GitHub that tracks the work of creating release notes for the upcoming release.
+- Create a branch, add a .md file for the release (ex. 5.10.1 Release Notes) in ``/doc/release-notes`` and write the release notes, making sure to pull content from the release note snippets mentioned above. Snippets may not include any issue number or pull request number in the text so be sure to copy the number from the filename of the snippet into the final release note.
+- Delete (``git rm``) the release note snippets as the content is added to the main release notes file.
+- Include instructions describing the steps required to upgrade the application from the previous version. These must be customized for release numbers and special circumstances such as changes to metadata blocks and infrastructure.
+- Make a pull request. Here's an example: https://github.com/IQSS/dataverse/pull/11613
+- Note that we won't merge the release notes until after we have confirmed that the upgrade instructions are valid by performing a couple upgrades.
+
+For a hotfix, don't worry about release notes yet.
+
+Deploy Release Candidate to Internal
+------------------------------------
+
+|dedicated|
+
+First, build the release candidate. For a regular release, you will use the "develop" branch, as shown below. For a hotfix, you will use whatever branch name is used for the hotfix.
+
+Go to https://jenkins.dataverse.org/job/IQSS_Dataverse_Internal/ and make the following adjustments to the config:
+
+- Repository URL: ``https://github.com/IQSS/dataverse.git``
+- Branch Specifier (blank for 'any'): ``*/develop``
+- Execute shell: Update version in filenames to ``dataverse-5.10.war`` (for example)
+
+Click "Save" then "Build Now". The release candidate war file will be available at https://jenkins.dataverse.org/job/IQSS_Dataverse_Internal/ws/target/
+
+ssh into the dataverse-internal server and download the release candidate war file from the URL above.
+
+Go to /doc/release-notes, open the release-notes.md file for the release we're working on, and perform all the steps under "Upgrade Instructions". Note that for regular releases, we haven't bumped the version yet so you won't be able to follow the steps exactly. (For hotfix releases, the version will be bumped already.)
+
+Deploy Release Candidate to Demo
+--------------------------------
+
+|dedicated|
+
+Deploy the same war file to https://demo.dataverse.org using the same upgrade instructions as above.
+
+Merge Release Notes (Once Ready)
+--------------------------------
+
+If the upgrade instructions are perfect, simply merge the release notes.
+
+If the upgrade instructions aren't quite right, work with the authors of the release notes until they are good enough, and then merge.
+
+For a hotfix, there are no release notes to merge yet.
+
+Prepare Release Branch
+----------------------
+
+|dedicated|
+
+The release branch will have the final changes such as bumping the version number.
+
+Usually we branch from the "develop" branch to create the release branch. If we are creating a hotfix for a particular version (5.11, for example), we branch from the tag (e.g. ``v5.11``).
+
+Create a release branch named after the issue that tracks bumping the version with a descriptive name like "10852-bump-to-6.4" from https://github.com/IQSS/dataverse/pull/10871.
+
+**Note:** the changes below must be the very last commits merged into the develop branch before it is merged into master and tagged for the release!
+
+Make the following changes in the release branch.
+
+Increment the version number to the milestone (e.g. 5.10.1) in the following two files:
+
+- modules/dataverse-parent/pom.xml -> ``<properties>`` -> ``<revision>`` (e.g. `pom.xml commit <https://github.com/IQSS/dataverse/commit/3943aa0>`_)
+- doc/sphinx-guides/source/conf.py
+
+In the following ``versions.rst`` file:
+
+- doc/sphinx-guides/source/versions.rst - Below the ``- |version|`` bullet (``|version|`` comes from the ``conf.py`` file you just edited), add a bullet for what is soon to be the previous release.
+
+Return to the parent pom and make the following change, which is necessary for proper tagging of images:
+
+- modules/dataverse-parent/pom.xml -> ``<profiles>`` -> profile "ct" -> ``<properties>`` -> Set ``<base.image.version>`` to ``${revision}``
+
+When testing the version change in Docker note that you will have to build the base image manually. See :ref:`base-image-build-instructions`.
+
+(Before you make this change the value should be ``${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}``. Later on, after cutting a release, we'll change it back to that value.)
+
+For a regular release, make the changes above in the release branch you created, but hold off for a moment on making a pull request because Jenkins will fail because it will be testing the previous release.
+
+In the dataverse-ansible repo bump the version in `jenkins.yml <https://github.com/gdcc/dataverse-ansible/blob/develop/tests/group_vars/jenkins.yml>`_ and make a pull request such as https://github.com/gdcc/dataverse-ansible/pull/386. Wait for it to be merged. Note that bumping on the Jenkins side like this will mean that all pull requests will show failures in Jenkins until they are updated to the version we are releasing.
+
+Once dataverse-ansible has been merged, return to the branch you created above ("10852-bump-to-6.4" or whatever) and make a pull request. Ensure that all tests are passing and then put the PR through the normal review and QA process.
+
+If you are making a hotfix release, ``<base.image.version>`` should already be set to ``${revision}``. If so, leave it alone. Go ahead and do the normal bumping of version numbers described above. Make the pull request against the "master" branch. Put it through review and QA. Do not delete the branch after merging because we will later merge it into the "develop" branch to pick up the hotfix. More on this later.
+
+Merge "develop" into "master" (non-hotfix only)
+-----------------------------------------------
+
+If this is a regular (non-hotfix) release, create a pull request to merge the "develop" branch into the "master" branch using this "compare" link: https://github.com/IQSS/dataverse/compare/master...develop
+
+Once important tests have passed (compile, unit tests, etc.), merge the pull request (skipping code review is ok). Don't worry about style tests failing such as for shell scripts. 
+
+If this is a hotfix release, skip this whole "merge develop to master" step (the "develop" branch is not involved until later).
+
+Add Milestone to Pull Requests and Issues
+-----------------------------------------
+
+Often someone is making sure that the proper milestone (e.g. 5.10.1) is being applied to pull requests and issues, but sometimes this falls between the cracks.
+
+Check for merged pull requests that have no milestone by going to https://github.com/IQSS/dataverse/pulls and entering `is:pr is:merged no:milestone <https://github.com/IQSS/dataverse/pulls?q=is%3Apr+is%3Amerged+no%3Amilestone>`_ as a query. If you find any, add the milestone to the pull request and any issues it closes. This includes the "merge develop into master" pull request above.
+
+(Optional) Test Docker Images
+-----------------------------
+
+After the "master" branch has been updated and the GitHub Action to build and push Docker images has run (see `PR #9776 <https://github.com/IQSS/dataverse/pull/9776>`_), go to https://hub.docker.com/u/gdcc and make sure the "latest" tag for the following images has been updated:
+
+- https://hub.docker.com/r/gdcc/base
+- https://hub.docker.com/r/gdcc/dataverse
+- https://hub.docker.com/r/gdcc/configbaker
+
+TODO: Get https://github.com/gdcc/api-test-runner working.
+
+.. _build-guides:
+
+Build the Guides for the Release
+--------------------------------
+
+Go to https://jenkins.dataverse.org/job/guides.dataverse.org/ and make the following adjustments to the config:
+
+- Repository URL: ``https://github.com/IQSS/dataverse.git``
+- Branch Specifier (blank for 'any'): ``*/master``
+- ``VERSION`` (under "Build Steps"): bump to the next release. Don't prepend a "v". Use ``5.10.1`` (for example)
+
+Click "Save" then "Build Now".
+
+Make sure the guides directory appears in the expected location such as https://guides.dataverse.org/en/5.10.1/
+
+As described below, we'll soon point the "latest" symlink to that new directory.
+
+Create a Draft Release on GitHub
+--------------------------------
 
-At or near release time:
+Go to https://github.com/IQSS/dataverse/releases/new to start creating a draft release.
 
-- Create an issue in Github to track the work of creating release notes for the upcoming release
-- Create a branch, add a .md file for the release (ex. 4.16 Release Notes) in ``/doc/release-notes`` and write the release notes, making sure to pull content from the issue-specific release notes mentioned above
-- Delete the previously-created, issue-specific release notes as the content is added to the main release notes file
-- Take the release notes .md through the regular Code Review and QA process
-- Create a draft release at https://github.com/IQSS/dataverse/releases/new
-- The "tag version" and "title" should be the number of the milestone with a "v" in front (i.e. v4.16).
-- Copy in the content from the .md file
-- For the description, follow post-4.16 examples at https://github.com/IQSS/dataverse/releases
+- Under "Choose a tag" you will be creating a new tag. Have it start with a "v" such as ``v5.10.1``. Click "Create new tag on publish".
+- Under "Target", choose "master". This commit will appear in ``/api/info/version`` from a running installation.
+- Under "Release title" use the same name as the tag such as ``v5.10.1``.
+- In the description, copy and paste the content from the release notes .md file created in the "Write Release Notes" steps above.
+- Click "Save draft" because we do not want to publish the release yet.
 
+At this point you can send around the draft release for any final feedback. Links to the guides for this release should be working now, since you build them above.
+
+Make corrections to the draft, if necessary. It will be out of sync with the .md file, but that's ok (`#7988 <https://github.com/IQSS/dataverse/issues/7988>`_ is tracking this).
+
+.. _run-build-create-war:
+
+Run a Build to Create the War File
+----------------------------------
+
+ssh into the dataverse-internal server and undeploy the current war file.
+
+Go to https://jenkins.dataverse.org/job/IQSS_Dataverse_Internal/ and make the following adjustments to the config:
+
+- Repository URL: ``https://github.com/IQSS/dataverse.git``
+- Branch Specifier (blank for 'any'): ``*/master``
+- Execute shell: Update version in filenames to ``dataverse-5.10.1.war`` (for example)
+
+Click "Save" then "Build Now".
+
+This will build the war file, and then automatically deploy it on dataverse-internal. Verify that the application has deployed successfully. 
+
+The build number will appear in ``/api/info/version`` (along with the commit mentioned above) from a running installation (e.g. ``{"version":"5.10.1","build":"907-b844672``). 
+
+Note that the build number comes from the following script in an early Jenkins build step...
+
+.. code-block:: bash
+
+  COMMIT_SHA1=`echo $GIT_COMMIT | cut -c-7`
+  echo "build.number=${BUILD_NUMBER}-${COMMIT_SHA1}" > $WORKSPACE/src/main/java/BuildNumber.properties
+
+... but we can explore alternative methods of specifying the build number, as described in :ref:`auto-custom-build-number`.
+
+Build Installer (dvinstall.zip)
+-------------------------------
+
+ssh into the dataverse-internal server and do the following:
+
+- In a git checkout of the dataverse source switch to the master branch and pull the latest.
+- Copy the war file from the previous step to the ``target`` directory in the root of the repo (create it, if necessary):
+- ``mkdir target``
+- ``cp /tmp/dataverse-5.10.1.war target``
+- ``cd scripts/installer``
+- ``make clean``
+- ``make``
+
+A zip file called ``dvinstall.zip`` should be produced.
+
+Alternatively, you can build the installer on your own dev. instance. But make sure you use the war file produced in the step above, not a war file build from master on your own system! That's because we want the released application war file to contain the build number described above. Download the war file directly from Jenkins, or from dataverse-internal. 
 
 Make Artifacts Available for Download
 -------------------------------------
 
 Upload the following artifacts to the draft release you created:
 
-- war file (``mvn package`` from Jenkins)
-- installer (``cd scripts/installer && make``)
-- other files as needed, such as updated Solr schema and config files
+- the war file (e.g. ``dataverse-5.10.1.war``, from above)
+- the installer (``dvinstall.zip``, from above)
+- other files as needed:
 
-Publish Release
----------------
+  - updated Solr schema
+  - metadata block tsv files
+  - config files
+
+Publish the Release
+-------------------
 
 Click the "Publish release" button.
 
-----
+Update Guides Link
+------------------
+
+"latest" at https://guides.dataverse.org/en/latest/ is a symlink to the directory with the latest release. That directory (e.g. ``5.10.1``) was put into place by the Jenkins "guides" job described above.
+
+ssh into the guides server and update the symlink to point to the latest release, as in the example below.
+
+.. code-block:: bash
+
+  cd /var/www/html/en
+  ln -s 5.10.1 latest
+
+This step could be done before publishing the release if you'd like to double check that links in the release notes work.
+
+Close Milestone on GitHub and Create a New One
+----------------------------------------------
+
+You can find our milestones at https://github.com/IQSS/dataverse/milestones
+
+Now that we've published the release, close the milestone and create a new one for the **next** release, the release **after** the one we're working on, that is.
+
+Note that for milestones we use just the number without the "v" (e.g. "5.10.1").
+
+On the project board at https://github.com/orgs/IQSS/projects/34 edit the tab (view) that shows the milestone to show the next milestone.
+
+.. _base_image_post_release:
+
+Update the Container Base Image Version Property
+------------------------------------------------
+
+|dedicated|
+
+Create a new branch (any name is fine but ``prepare-next-iteration`` is suggested) and update the following files to prepare for the next development cycle:
+
+- modules/dataverse-parent/pom.xml -> ``<profiles>`` -> profile "ct" -> ``<properties>`` -> Set ``<base.image.version>`` to ``${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}``
+
+Create a pull request and put it through code review, like usual. Give it a milestone of the next release, the one **after** the one we're working on. Once the pull request has been approved, merge it. It should be the first PR merged of the next release.
+
+For more background, see :ref:`base-image-supported-tags`. For an example, see https://github.com/IQSS/dataverse/pull/10896
+
+For a hotfix, we will do this later and in a different branch. See below.
+
+Deploy Final Release on Demo
+----------------------------
+
+|dedicated|
+
+Above you already did the hard work of deploying a release candidate to https://demo.dataverse.org. It should be relatively straightforward to undeploy the release candidate and deploy the final release.
+
+.. _update-schemaspy:
+
+Update SchemaSpy
+----------------
+
+We maintain SchemaSpy at URLs like https://guides.dataverse.org/en/latest/schemaspy/index.html and (for example) https://guides.dataverse.org/en/6.6/schemaspy/index.html
+
+Get the attention of the core team and ask someone to update it for the new release.
+
+Consider updating `the thread <https://groups.google.com/g/dataverse-community/c/f95DQU-wlVM/m/cvUp3E9OBgAJ>`_ on the mailing list once the update is in place.
+
+See also :ref:`schemaspy`.
+
+Alert Translators About the New Release
+---------------------------------------
+
+Create an issue at https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs/issues to say a new release is out and that we would love for the properties files for English to be added.
+
+For example, for 6.4 we wrote "Update en_US/Bundle.properties etc. for Dataverse 6.4" at https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs/issues/125
+
+Add the Release to the Dataverse Roadmap
+----------------------------------------
+
+Add an entry to the list of releases at https://www.iq.harvard.edu/roadmap-dataverse-project 
+
+Announce the Release on the Dataverse Blog
+------------------------------------------
+
+Make a blog post at https://dataverse.org/blog
+
+Announce the Release on the Mailing List
+----------------------------------------
+
+Post a message at https://groups.google.com/g/dataverse-community
+
+Announce the Release on Zulip
+-----------------------------
+
+Post a message under #community at https://dataverse.zulipchat.com
+
+For Hotfixes, Merge Hotfix Branch into "develop"
+------------------------------------------------
+
+Note: this only applies to hotfixes!
+
+We've merged the hotfix into the "master" branch but now we need the fixes (and version bump) in the "develop" branch.
+
+Make a new branch off the hotfix branch. You can call it something like "6.7.1-merge-hotfix-to-develop".
+
+In that branch, do the :ref:`base_image_post_release` step you skipped above. Now is the time.
+
+Create a pull request against develop. Merge conflicts are possible and this pull request should go through review and QA like normal. Afterwards it's fine to delete this branch and the hotfix branch that was merged into master.
+
+For Hotfixes, Tell Developers to Merge "develop" into Their Branches and Rename SQL Scripts
+-------------------------------------------------------------------------------------------
+
+Note: this only applies to hotfixes!
+
+Because we have merged a version bump from the hotfix into the "develop" branch, any SQL scripts in the "develop" branch should be renamed (from "5.11.0" to "5.11.1" for example). (To read more about our naming conventions for SQL scripts, see :doc:`sql-upgrade-scripts`.)
+
+Look at ``src/main/resources/db/migration`` in the "develop" branch and if any SQL scripts have the wrong version, make a pull request (or ask a developer to) to update them (all at once in a single PR is fine).
+
+Tell developers to merge the "develop" into their open pull requests (to pick up the new version and any fixes) and rename SQL scripts (if any) with the new version.
+
+Lift the Code Freeze and Encourage Developers to Update Their Branches
+----------------------------------------------------------------------
+
+It's now safe to lift the code freeze. We can start merging pull requests into the "develop" branch for the next release.
 
-Previous: :doc:`containers` | Next: :doc:`tools`
+Let developers know that they should merge the latest from the "develop" branch into any branches they are working on. (For hotfixes we've already told them this.)
diff --git a/doc/sphinx-guides/source/developers/metadataexport.rst b/doc/sphinx-guides/source/developers/metadataexport.rst
new file mode 100644
index 00000000000..63630b64c44
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/metadataexport.rst
@@ -0,0 +1,91 @@
+=======================
+Metadata Export Formats
+=======================
+
+.. contents:: |toctitle|
+    :local:
+
+Introduction
+------------
+
+Dataverse ships with a number of metadata export formats available for published datasets. A given metadata export
+format may be available for user download (via the UI and API) and/or be available for use in Harvesting between
+Dataverse instances.
+
+As of v5.14, Dataverse provides a mechanism for third-party developers to create new metadata Exporters than implement
+new metadata formats or that replace existing formats. All the necessary dependencies are packaged in an interface JAR file
+available from Maven Central. Developers can distribute their new Exporters as JAR files which can be dynamically loaded
+into Dataverse instances - see :ref:`external-exporters`. Developers are encouraged to work with the core Dataverse team
+(see :ref:`getting-help-developers`) to distribute these JAR files via Maven Central. See the
+`Croissant <https://central.sonatype.com/artifact/io.gdcc.export/croissant>`_ and
+`Debug <https://central.sonatype.com/artifact/io.gdcc.export/debug>`_ artifacts as examples. You may find other examples
+under :ref:`inventory-of-external-exporters` in the Installation Guide.
+
+Exporter Basics
+---------------
+
+New Exports must implement the ``io.gdcc.spi.export.Exporter`` interface. The interface includes a few methods for the Exporter
+to provide Dataverse with the format it produces, a display name, format mimetype, and whether the format is for download 
+and/or harvesting use, etc. It also includes a main ``exportDataset(ExportDataProvider dataProvider, OutputStream outputStream)``
+method through which the Exporter receives metadata about the given dataset (via the ``ExportDataProvider``, described further 
+below) and writes its output (as an OutputStream).
+
+Exporters that create an XML format must implement the ``io.gdcc.spi.export.XMLExporter`` interface (which extends the Exporter
+interface). XMLExporter adds a few methods through which the XMLExporter provides information to Dataverse about the XML 
+namespace and version being used.
+
+Exporters also need to use the ``@AutoService(Exporter.class)`` which makes the class discoverable as an Exporter implementation.
+
+The ``ExportDataProvider`` interface provides several methods through which your Exporter can receive dataset and file metadata
+in various formats. Your exporter would parse the information in one or more of these inputs to retrieve the values needed to
+generate the Exporter's output format.
+
+The most important methods/input formats are:
+
+- ``getDatasetJson()`` - metadata in the internal Dataverse JSON format used in the native API and available via the built-in JSON metadata export.
+- ``getDatasetORE()`` - metadata in the OAI_ORE format available as a built-in metadata format and as used in Dataverse's BagIT-based Archiving capability. 
+- ``getDatasetFileDetails`` - detailed file-level metadata for ingested tabular files.
+ 
+The first two of these provide ~complete metadata about the dataset along with the metadata common to all files. This includes all metadata
+entries from all metadata blocks, PIDs, tags, Licenses and custom terms, etc. Almost all built-in exporters today use the JSON input.
+The newer OAI_ORE export, which is JSON-LD-based, provides a flatter structure and references metadata terms by their external vocabulary ids
+(e.g. http://purl.org/dc/terms/title) which may make it a prefereable starting point in some cases.
+ 
+The last method above provides a new JSON-formatted serialization of the variable-level file metadata Dataverse generates during ingest of tabular files.
+This information has only been included in the built-in DDI export, as the content of a ``dataDscr`` element. (Hence inspecting the edu.harvard.iq.dataverse.export.DDIExporter and related classes would be a good way to explore how the JSON is structured.) 
+
+The interface also provides
+
+- ``getDatasetSchemaDotOrg();`` and
+- ``getDataCiteXml();``.
+  
+These provide subsets of metadata in the indicated formats. They may be useful starting points if your exporter will, for example, only add one or two additional fields to the given format.
+
+If an Exporter cannot create a requested metadata format for some reason, it should throw an ``io.gdcc.spi.export.ExportException``.
+
+Building an Exporter
+--------------------
+
+The examples at https://github.com/gdcc/exporter-croissant and https://github.com/gdcc/exporter-debug provide a Maven pom.xml file suitable for building an Exporter JAR file and those repositories provide additional development guidance.
+
+There are four dependencies needed to build an Exporter:
+
+- ``io.gdcc dataverse-spi`` library containing the interfaces discussed above and the ExportException class
+- ``com.google.auto.service auto-service``, which provides the @AutoService annotation
+- ``jakarta.json jakarata.json-api`` for JSON classes
+- ``jakarta.ws.rs jakarta.ws.rs-api``, which provides a MediaType enumeration for specifying mime types.
+
+Specifying a Prerequisite Export
+--------------------------------
+
+An advanced feature of the Exporter mechanism allows a new Exporter to specify that it requires, as input, 
+the output of another Exporter. An example of this is the builting HTMLExporter which requires the output 
+of the DDI XML Exporter to produce an HTML document with the same DDI content.
+
+This is configured by providing the metadata format name via the ``Exporter.getPrerequisiteFormatName()`` method.
+When this method returns a non-empty format name, Dataverse will provide the requested format to the Exporter via
+the ``ExportDataProvider.getPrerequisiteInputStream()`` method.
+
+Developers and administrators deploying Exporters using this mechanism should be aware that, since metadata formats
+can be changed by other Exporters, the InputStream received may not hold the expected metadata. Developers should clearly
+document their compatability with the built-in or third-party Exporters they support as prerequisites.
diff --git a/doc/sphinx-guides/source/developers/performance.rst b/doc/sphinx-guides/source/developers/performance.rst
new file mode 100644
index 00000000000..6c864bec257
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/performance.rst
@@ -0,0 +1,201 @@
+Performance
+===========
+
+`Performance is a feature <https://blog.codinghorror.com/performance-is-a-feature/>`_ was a mantra when Stack Overflow was being developed. We endeavor to do the same with Dataverse!
+
+In this section we collect ideas and share practices for improving performance.
+
+.. contents:: |toctitle|
+        :local:
+
+Problem Statement
+-----------------
+
+Performance has always been important to the Dataverse Project, but results have been uneven. We've seen enough success in the marketplace that performance must be adequate, but internally we sometimes refer to Dataverse as a pig. 🐷
+
+Current Practices
+-----------------
+
+We've adopted a number of practices to help us maintain our current level of performance and most should absolutely continue in some form, but challenges mentioned throughout should be addressed to further improve performance.
+
+Cache When You Can
+~~~~~~~~~~~~~~~~~~
+
+The Metrics API, for example, caches values for 7 days by default. We took a look at JSR 107 (JCache - Java Temporary Caching API) in `#2100 <https://github.com/IQSS/dataverse/issues/2100>`_. We're aware of the benefits of caching.
+
+Use Async
+~~~~~~~~~
+
+We index datasets (and all objects) asynchronously. That is, we let changes persist in the database and afterward copy the data into Solr.
+
+Use a Queue
+~~~~~~~~~~~
+
+We use a JMS queue for when ingesting tabular files. We've talked about adding a queue (even `an external queue <https://github.com/IQSS/dataverse/issues/1100%23issuecomment-311341995>`_) for indexing, DOI registration, and other services.
+
+Offload Expensive Operations Outside the App Server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When operations are computationally expensive, we have realized performance gains by offloading them to systems outside of the core code. For example, rather than having files pass through our application server when they are downloaded, we use direct download so that client machines download files directly from S3. (We use the same trick with upload.) When a client downloads multiple files, rather than zipping them within the application server as before, we now have a separate "zipper" process that does this work out of band.
+
+Drop to Raw SQL as Necessary
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We aren't shy about writing raw SQL queries when necessary. We've written `querycount <https://github.com/IQSS/dataverse/blob/v6.0/scripts/database/querycount/README.txt>`_  scripts to help identify problematic queries and mention slow query log at :doc:`/admin/monitoring`.
+
+Add Indexes to Database Tables
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There was a concerted effort in `#1880 <https://github.com/IQSS/dataverse/issues/1880>`_ to add indexes to a large number of columns, but it's something we're mindful of, generally. Perhaps we could use some better detection of when indexes would be valuable.
+
+Find Bottlenecks with a Profiler
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+VisualVM is popular and bundled with Netbeans. Many options are available including `JProfiler <https://github.com/IQSS/dataverse/pull/9413>`_.
+
+Warn Developers in Code Comments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For code that has been optimized for performance, warnings are sometimes inserted in the form of comments for future developers to prevent backsliding.
+
+Write Docs for Devs about Perf
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Like this doc. :)
+
+Sometimes perf is written about in other places, such as :ref:`avoid-efficiency-issues-with-render-logic-expressions`.
+
+Horizontal Scaling of App Server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We've made it possible to run more than one application server, though it requires some special configuration. This way load can be spread out across multiple servers. For details, see :ref:`multiple-app-servers` in the Installation Guide.
+
+Code Review and QA
+~~~~~~~~~~~~~~~~~~
+
+Before code is merged, while it is in review or QA, if a performance problem is detected (usually on an ad hoc basis), the code is returned to the developer for improvement. Developers and reviewers typically do not have many tools at their disposal to test code changes against anything close to production data. QA maintains a machine with a copy of production data but tests against smaller data unless a performance problem is suspected.
+
+A new QA guide is coming in https://github.com/IQSS/dataverse/pull/10103
+
+Locust Testing at Release Time
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+As one of the final steps in preparing for a release, QA runs performance tests using a tool called Locust as explained the Developer Guide (see :ref:`locust`). The tests are not comprehensive, testing only a handful of pages with anonymous users, but they increase confidence that the upcoming release is not drastically slower than previous releases.
+
+Issue Tracking and Prioritization
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Performance issues are tracked in our issue tracker under the `Feature: Performance & Stability <https://github.com/IQSS/dataverse/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature%3A+Performance+%26+Stability%22>`_ label (e.g. `#7788 <https://github.com/IQSS/dataverse/issues/7788>`_). That way, we can track performance problems throughout the application. Unfortunately, the pain is often felt by users in production before we realize there is a problem. As needed, performance issues are prioritized to be included in a sprint, to \ `speed up the collection page <https://github.com/IQSS/dataverse/pull/8143>`_, for example.
+
+Document Performance Tools
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In the :doc:`/admin/monitoring` page section of the Admin Guide we describe how to set up Munin for monitoring performance of an operating system. We also explain how to set up Performance Insights to monitor AWS RDS (PostgreSQL as a service, in our case). In the :doc:`/developers/tools` section of the Developer Guide, we have documented how to use Eclipse Memory Analyzer Tool (MAT), SonarQube, jmap, and jstat.
+
+Google Analytics
+~~~~~~~~~~~~~~~~
+
+Emails go to a subset of the team monthly with subjects like "Your September Search performance for https://dataverse.harvard.edu" with a link to a report but it's mostly about the number clicks, not how fast the site is. It's unclear if it provides any value with regard to performance.
+
+Abandoned Tools and Practices
+-----------------------------
+
+New Relic
+~~~~~~~~~
+
+For many years Harvard Dataverse was hooked up to New Relic, a tool that promises all-in-one observability, according to their `website <https://newrelic.com>`_. In practice, we didn't do much with `the data <https://github.com/IQSS/dataverse/issues/3665>`_.
+
+Areas of Particular Concern
+---------------------------
+
+Command Engine Execution Rate Metering
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We'd like to rate limit commands (CreateDataset, etc.) so that we can keep them at a reasonable level (`#9356 <https://github.com/IQSS/dataverse/issues/9356>`_). This is similar to how many APIs are rate limited, such as the GitHub API.
+
+Solr
+~~~~
+
+While in the past Solr performance hasn't been much of a concern, in recent years we've noticed performance problems when Harvard Dataverse is under load. Improvements were made in `PR #10050 <https://github.com/IQSS/dataverse/pull/10050>`_, for example.
+
+We are tracking performance problems in `#10469 <https://github.com/IQSS/dataverse/issues/10469>`_.
+
+In a meeting with a Solr expert on 2024-05-10 we were advised to avoid joins as much as possible. (It was acknowledged that many Solr users make use of joins because they have to, like we do, to keep some documents private.) Toward that end we have added two feature flags called ``avoid-expensive-solr-join`` and ``add-publicobject-solr-field`` as explained under :ref:`feature-flags`. It was confirmed experimentally that performing the join on all the public objects (published collections, datasets and files), i.e., the bulk of the content in the search index, was indeed very expensive, especially on a large instance the size of the IQSS prod. archive, especially under indexing load. We confirmed that it was in fact unnecessary and were able to replace it with a boolean field directly in the indexed documents, which is achieved by the two feature flags above. However, as of writing this, this mechanism should still be considered experimental.
+Another flag, ``reduce-solr-deletes``, avoids deleting solr documents for files in a dataset prior to sending updates. It also eliminates several causes of orphan permission documents. This is expected to improve indexing performance to some extent and is a step towards avoiding unnecessary updates (i.e. when a doc would not change).
+
+Datasets with Large Numbers of Files or Versions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We'd like to scale Dataverse to better handle large number of files or versions. Progress was made in `PR #9883 <https://github.com/IQSS/dataverse/pull/9883>`_.
+
+Withstanding Bots
+~~~~~~~~~~~~~~~~~
+
+Google bot, etc.
+
+Suggested Practices
+-------------------
+
+Many of our current practices should remain in place unaltered. Others could use some refinement. Some new practices should be adopted as well. Here are some suggestions.
+
+Implement the Frontend Plan for Performance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The `Dataverse - SPA MVP Definition doc <https://docs.google.com/document/d/1WnJzLeVK5eVP4_10eX6BwPAnmiamO1n2uGzcwrAsucQ/edit?usp%3Dsharing>`_  has some ideas around how to achieve good performance for the new front end in the areas of rendering, monitoring,file upload/download, pagination, and caching. We should create as many issues as necessary in the frontend repo and work on them in time. The doc recommends the use of `React Profiler <https://legacy.reactjs.org/blog/2018/09/10/introducing-the-react-profiler.html>`_ and other tools. Not mentioned is https://pagespeed.web.dev but we can investigate it as well. See also `#183 <https://github.com/IQSS/dataverse-frontend/issues/183>`_, a parent issue about performance. In `#184 <https://github.com/IQSS/dataverse-frontend/issues/184>`_  we plan to compare the performance of the old JSF UI vs. the new React UI. Cypress plugins for load testing could be investigated.
+
+Set up Query Counter in Jenkins
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+See countquery script above. See also https://jenkins.dataverse.org/job/IQSS-dataverse-develop/ws/target/query_count.out
+
+Show the plot over time. Make spikes easily apparent. 320,035 queries as of this writing.
+
+Count Database Queries per API Test
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Is it possible? Just a thought.
+
+Teach Developers How to Do Performance Testing Locally
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Do developers know how to use a profiler? Should they use `JMeter <https://github.com/BU-NU-CLOUD-SP18/Dataverse-Scaling%23our-project-video>`_? `statsd-jvm-profiler <https://github.com/etsy/statsd-jvm-profiler>`_? How do you run our :ref:`locust` tests? Should we continue using that tool? Give developers time and space to try out tools and document any tips along the way. For this stage, small data is fine.
+
+Automate Performance Testing
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We are already using two excellent continuous integration (CI) tools, Jenkins and GitHub Actions, to test our code. We should add performance testing into the mix (`#4201 <https://github.com/IQSS/dataverse/issues/4201>`_ is an old issue for this but we can open a fresh one). Currently we test every commit on every PR and we should consider if this model makes sense since performance testing will likely take longer to run than regular tests. Once developers are comfortable with their favorite tools, we can pick which ones to automate.
+
+Make Production Data or Equivalent Available to Developers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If developers are only testing small amounts of data on their laptops, it's hard to detect performance problems. Not every bug fix requires access to data similar to production, but it should be made available. This is not a trivial task! If we are to use actual production data, we need to be very careful to de-identify it. If we start with our `sample-data <https://github.com/IQSS/dataverse-sample-data>`_  repo instead, we'll need to figure out how to make sure we cover cases like many files, many versions, etc.
+
+Automate Performance Testing with Production Data or Equivalent
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Hopefully the environment developers use with production data or equivalent can be made available to our CI tools. Perhaps these tests don't need to be run on every commit to every pull request, but they should be run regularly.
+
+Use Monitoring as Performance Testing
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Monitoring can be seen as a form of testing. How long is a round trip ping to production? What is the Time to First Byte? First Contentful Paint? Largest Contentful Paint? Time to Interactive? We now have a beta server that we could monitor continuously to know if our app is getting faster or slower over time. Should our monitoring of production servers be improved?
+
+Learn from Training and Conferences
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Most likely there is training available that is oriented toward performance. The subject of performance often comes up at conferences as well.
+
+Learn from the Community How They Monitor Performance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Some members of the Dataverse community are likely users of newish tools like the ELK stack (Elasticsearch, Logstash, and Kibana), the TICK stack (Telegraph InfluxDB Chronograph and Kapacitor), GoAccess, Prometheus, Graphite, and more we haven't even heard of. In the :doc:`/admin/monitoring` section of the Admin Guide, we already encourage the community to share findings, but we could dedicate time to this topic at our annual meeting or community calls.
+
+Teach the Community to Do Performance Testing
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We have a worldwide community of developers. We should do what we can in the form of documentation and other resources to help them develop performant code.
+
+Conclusion
+----------
+
+Given its long history, Dataverse has encountered many performance problems over the years. The core team is conversant in how to make the app more performant, but investment in learning additional tools and best practices would likely yield dividends. We should automate our performance testing, catching more problems before code is merged.
diff --git a/doc/sphinx-guides/source/developers/remote-users.rst b/doc/sphinx-guides/source/developers/remote-users.rst
index 4a517c1beb2..38b3edab772 100755
--- a/doc/sphinx-guides/source/developers/remote-users.rst
+++ b/doc/sphinx-guides/source/developers/remote-users.rst
@@ -1,6 +1,6 @@
-====================
-Shibboleth and OAuth
-====================
+==========================
+Shibboleth, OAuth and OIDC
+==========================
 
 .. contents:: |toctitle|
 	:local:
@@ -8,9 +8,9 @@ Shibboleth and OAuth
 Shibboleth and OAuth
 --------------------
 
-If you are working on anything related to users, please keep in mind that your changes will likely affect Shibboleth and OAuth users. For some background on user accounts in Dataverse, see "Auth Modes: Local vs. Remote vs. Both" in the :doc:`/installation/config` section of the Installation Guide.
+If you are working on anything related to users, please keep in mind that your changes will likely affect Shibboleth and OAuth users. For some background on user accounts in the Dataverse Software, see :ref:`auth-modes` section of Configuration in the Installation Guide.
 
-Rather than setting up Shibboleth on your laptop, developers are advised to simply add a value to their database to enable Shibboleth "dev mode" like this:
+Rather than setting up Shibboleth on your laptop, developers are advised to add the Shibboleth auth provider (see "Add the Shibboleth Authentication Provider to Your Dataverse Installation" at :doc:`/installation/shibboleth`) and add a value to their database to enable Shibboleth "dev mode" like this:
 
 ``curl http://localhost:8080/api/admin/settings/:DebugShibAccountType -X PUT -d RANDOM``
 
@@ -26,8 +26,52 @@ In addition to setting up OAuth on your laptop for real per above, you can also
 
 For a list of possible values, please "find usages" on the settings key above and look at the enum.
 
-Now when you go to http://localhost:8080/oauth2/firstLogin.xhtml you should be prompted to create a Shibboleth account.
+Now when you go to http://localhost:8080/oauth2/firstLogin.xhtml you should be prompted to create an OAuth account.
 
 ----
 
-Previous: :doc:`unf/index` | Next: :doc:`geospatial`
+.. _oidc-dev:
+
+OpenID Connect (OIDC)
+---------------------
+
+STOP! ``oidc-keycloak-auth-provider.json`` was changed from http://localhost:8090 to http://keycloak.mydomain.com:8090 to test :ref:`bearer-tokens`. In addition, ``docker-compose-dev.yml`` in the root of the repo was updated to start up Keycloak. To use these, you should add ``127.0.0.1 keycloak.mydomain.com`` to your ``/etc/hosts file``. If you'd like to use the docker compose as described below (``conf/keycloak/docker-compose.yml``), you should revert the change to ``oidc-keycloak-auth-provider.json``.
+
+If you are working on the OpenID Connect (OIDC) user authentication flow, you do not need to connect to a remote provider (as explained in :doc:`/installation/oidc`) to test this feature. Instead, you can use the available configuration that allows you to run a test Keycloak OIDC identity management service locally through a Docker container.
+
+(Please note! The client secret (``94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8``) is hard-coded in ``test-realm.json`` and ``oidc-keycloak-auth-provider.json``. Do not use this config in production! This is only for developers.)
+
+You can find this configuration in ``conf/keycloak``. There are two options available in this directory to run a Keycloak container: bash script or docker-compose.
+
+To run the container via bash script, execute the following command (positioned in ``conf/keycloak``):
+
+``./run-keycloak.sh``
+
+The script will create a Keycloak container or restart it if the container was already created and stopped. Once the script is executed, Keycloak should be accessible from http://localhost:8090/
+
+Now load the configuration defined in ``oidc-keycloak-auth-provider.json`` into your Dataverse installation to enable Keycloak as an authentication provider.
+
+``curl -X POST -H 'Content-type: application/json' --upload-file oidc-keycloak-auth-provider.json http://localhost:8080/api/admin/authenticationProviders``
+
+You should see the new provider, called "OIDC-Keycloak", under "Other options" on the Log In page.
+
+You should be able to log into Keycloak with the one of the following credentials:
+
+.. list-table::
+
+  * - Username
+    - Password
+  * - admin
+    - admin
+  * - curator
+    - curator
+  * - user
+    - user
+  * - affiliate
+    - affiliate
+
+In case you want to stop and remove the Keycloak container, just run the other available bash script:
+
+``./rm-keycloak.sh``
+
+Note: the Keycloak admin to login at the admin console is ``kcadmin:kcpassword``
diff --git a/doc/sphinx-guides/source/developers/s3-direct-upload-api.rst b/doc/sphinx-guides/source/developers/s3-direct-upload-api.rst
new file mode 100644
index 00000000000..a8f87f13375
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/s3-direct-upload-api.rst
@@ -0,0 +1,299 @@
+Direct DataFile Upload/Replace API
+==================================
+
+The direct Datafile Upload API is used internally to support direct upload of files to S3 storage and by tools such as the DVUploader.
+
+.. contents:: |toctitle|
+	:local:
+
+Overview
+--------
+
+Direct upload involves a series of three activities, each involving interacting with the server for a Dataverse installation:
+
+* Requesting initiation of a transfer from the server
+* Use of the pre-signed URL(s) returned in that call to perform an upload/multipart-upload of the file to S3
+* A call to the server to register the file/files as part of the dataset/replace a file in the dataset or to cancel the transfer
+
+This API is only enabled when a Dataset is configured with a data store supporting direct S3 upload.
+Administrators should be aware that partial transfers, where a client starts uploading the file/parts of the file and does not contact the server to complete/cancel the transfer, will result in data stored in S3 that is not referenced in the Dataverse installation (e.g. should be considered temporary and deleted.)
+
+
+Requesting Direct Upload of a DataFile
+--------------------------------------
+To initiate a transfer of a file to S3, make a call to the Dataverse installation indicating the size of the file to upload. The response will include a pre-signed URL(s) that allow the client to transfer the file. Pre-signed URLs include a short-lived token authorizing the action represented by the URL.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK27U7YBV
+  export SIZE=1000000000
+
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/uploadurls?persistentId=$PERSISTENT_IDENTIFIER&size=$SIZE"
+
+The response to this call, assuming direct uploads are enabled, will be one of two forms:
+
+Single URL: when the file is smaller than the size at which uploads must be broken into multiple parts
+
+.. code-block:: bash
+
+  {
+    "status":"OK",
+    "data":{
+      "url":"...",
+      "partSize":1073741824,
+      "storageIdentifier":"s3://demo-dataverse-bucket:177883619b8-892ca9f7112e"
+    }
+  }
+
+Multiple URLs: when the file must be uploaded in multiple parts. The part size is set by the Dataverse installation and, for AWS-based storage, range from 5 MB to 5 GB
+
+.. code-block:: bash
+
+  {
+    "status":"OK",
+    "data":{
+    "urls":{
+      "1":"...",
+      "2":"...",
+      "3":"...",
+      "4":"...",
+      "5":"..."
+    }
+    "abort":"/api/datasets/mpupload?...",
+    "complete":"/api/datasets/mpupload?..."
+    "partSize":1073741824,
+    "storageIdentifier":"s3://demo-dataverse-bucket:177883b000e-49cedef268ac"
+  }
+
+The call will return a 400 (BAD REQUEST) response if the file is larger than what is allowed by the :ref:`:MaxFileUploadSizeInBytes`) and/or a quota (see :doc:`/admin/collectionquotas`).
+
+In the example responses above, the URLs, which are very long, have been omitted. These URLs reference the S3 server and the specific object identifier that will be used, starting with, for example, https://demo-dataverse-bucket.s3.amazonaws.com/10.5072/FK2FOQPJS/177883b000e-49cedef268ac?...
+
+.. _direct-upload-to-s3:
+
+Upload Files to S3
+------------------
+
+The client must then use the URL(s) to PUT the file, or if the file is larger than the specified partSize, parts of the file.
+
+In the single part case, only one call to the supplied URL is required:
+
+.. code-block:: bash
+
+    curl -i -H 'x-amz-tagging:dv-state=temp' -X PUT -T <filename> "<supplied url>"
+
+Or, if you have disabled S3 tagging (see :ref:`s3-tagging`), you should omit the header like this:
+
+.. code-block:: bash
+
+    curl -i -X PUT -T <filename> "<supplied url>"
+
+Note that without the ``-i`` flag, you should not expect any output from the command above. With the ``-i`` flag, you should expect to see a "200 OK" response.
+
+In the multipart case, the client must send each part and collect the 'eTag' responses from the server. The calls for this are the same as the one for the single part case except that each call should send a <partSize> slice of the total file, with the last part containing the remaining bytes.
+The responses from the S3 server for these calls will include the 'eTag' for the uploaded part.
+
+To successfully conclude the multipart upload, the client must call the 'complete' URI, sending a json object including the part eTags:
+
+.. code-block:: bash
+
+    curl -X PUT "$SERVER_URL/api/datasets/mpload?..." -d '{"1":"<eTag1 string>","2":"<eTag2 string>","3":"<eTag3 string>","4":"<eTag4 string>","5":"<eTag5 string>"}'
+
+If the client is unable to complete the multipart upload, it should call the abort URL:
+
+.. code-block:: bash
+
+    curl -X DELETE "$SERVER_URL/api/datasets/mpload?..."
+
+.. note::
+    If you encounter an ``HTTP 501 Not Implemented`` error, ensure the ``Content-Length`` header is correctly set to the file or chunk size. This issue may arise when streaming files or chunks asynchronously to S3 via ``PUT`` requests, particularly if the library or tool you're using doesn't set the ``Content-Length`` header automatically.
+
+.. _direct-add-to-dataset-api:
+
+Adding the Uploaded File to the Dataset
+---------------------------------------
+
+Once the file exists in the s3 bucket, a final API call is needed to add it to the Dataset. This call is the same call used to upload a file to a Dataverse installation but, rather than sending the file bytes, additional metadata is added using the "jsonData" parameter.
+jsonData normally includes information such as a file description, tags, provenance, whether the file is restricted, etc. For direct uploads, the jsonData object must also include values for:
+
+* "storageIdentifier" - String, as specified in prior calls
+* "fileName" - String
+* "mimeType" - String
+* fixity/checksum: either:
+
+  * "md5Hash" - String with MD5 hash value, or
+  * "checksum" - Json Object with "@type" field specifying the algorithm used and "@value" field with the value from that algorithm, both Strings
+
+The allowed checksum algorithms are defined by the edu.harvard.iq.dataverse.DataFile.CheckSumType class and currently include MD5, SHA-1, SHA-256, and SHA-512
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK27U7YBV
+  export JSON_DATA="{'description':'My description.','directoryLabel':'data/subdir1','categories':['Data'], 'restrict':'false', 'storageIdentifier':'s3://demo-dataverse-bucket:176e28068b0-1c3f80357c42', 'fileName':'file1.txt', 'mimeType':'text/plain', 'checksum': {'@type': 'SHA-1', '@value': '123456'}}"
+
+  curl -X POST -H "X-Dataverse-key: $API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/add?persistentId=$PERSISTENT_IDENTIFIER" -F "jsonData=$JSON_DATA"
+
+Note that this API call can be used independently of the others, e.g. supporting use cases in which the file already exists in S3/has been uploaded via some out-of-band method. Enabling out-of-band uploads is described at :ref:`file-storage` in the Configuration Guide.
+With current S3 stores the object identifier must be in the correct bucket for the store, include the PID authority/identifier of the parent dataset, and be guaranteed unique, and the supplied storage identifier must be prefaced with the store identifier used in the Dataverse installation, as with the internally generated examples above.
+
+To Add Multiple Uploaded Files to the Dataset
+---------------------------------------------
+
+Once the files exists in the s3 bucket, a final API call is needed to add all the files to the Dataset. In this API call, additional metadata is added using the "jsonData" parameter.
+jsonData for this call is an array of objects that normally include information such as a file description, tags, provenance, whether the file is restricted, etc. For direct uploads, the jsonData object must also include values for:
+
+* "description" - A description of the file
+* "directoryLabel" - The "File Path" of the file, indicating which folder the file should be uploaded to within the dataset
+* "storageIdentifier" - String
+* "fileName" - String
+* "mimeType" - String
+* "fixity/checksum" either:
+
+  * "md5Hash" - String with MD5 hash value, or
+  * "checksum" - Json Object with "@type" field specifying the algorithm used and "@value" field with the value from that algorithm, both Strings
+
+The allowed checksum algorithms are defined by the edu.harvard.iq.dataverse.DataFile.CheckSumType class and currently include MD5, SHA-1, SHA-256, and SHA-512
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export JSON_DATA="[{'description':'My description.','directoryLabel':'data/subdir1','categories':['Data'], 'restrict':'false', 'storageIdentifier':'s3://demo-dataverse-bucket:176e28068b0-1c3f80357c42', 'fileName':'file1.txt', 'mimeType':'text/plain', 'checksum': {'@type': 'SHA-1', '@value': '123456'}}, \
+                      {'description':'My description.','directoryLabel':'data/subdir1','categories':['Data'], 'restrict':'false', 'storageIdentifier':'s3://demo-dataverse-bucket:176e28068b0-1c3f80357d53', 'fileName':'file2.txt', 'mimeType':'text/plain', 'checksum': {'@type': 'SHA-1', '@value': '123789'}}]"
+
+  curl -X POST -H "X-Dataverse-key: $API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/addFiles?persistentId=$PERSISTENT_IDENTIFIER" -F "jsonData=$JSON_DATA"
+
+Note that this API call can be used independently of the others, e.g. supporting use cases in which the files already exists in S3/has been uploaded via some out-of-band method. Enabling out-of-band uploads is described at :ref:`file-storage` in the Configuration Guide.
+With current S3 stores the object identifier must be in the correct bucket for the store, include the PID authority/identifier of the parent dataset, and be guaranteed unique, and the supplied storage identifier must be prefaced with the store identifier used in the Dataverse installation, as with the internally generated examples above.
+
+Replacing an Existing File in the Dataset
+-----------------------------------------
+
+Once the file exists in the s3 bucket, a final API call is needed to register it as a replacement of an existing file. This call is the same call used to replace a file to a Dataverse installation but, rather than sending the file bytes, additional metadata is added using the "jsonData" parameter.
+jsonData normally includes information such as a file description, tags, provenance, whether the file is restricted, whether to allow the mimetype to change (forceReplace=true), etc. For direct uploads, the jsonData object must include values for:
+
+* "storageIdentifier" - String, as specified in prior calls
+* "fileName" - String
+* "mimeType" - String
+* fixity/checksum: either:
+
+  * "md5Hash" - String with MD5 hash value, or
+  * "checksum" - Json Object with "@type" field specifying the algorithm used and "@value" field with the value from that algorithm, both Strings
+
+The allowed checksum algorithms are defined by the edu.harvard.iq.dataverse.DataFile.CheckSumType class and currently include MD5, SHA-1, SHA-256, and SHA-512.
+Note that the API call does not validate that the file matches the hash value supplied. If a Dataverse instance is configured to validate file fixity hashes at publication time, a mismatch would be caught at that time and cause publication to fail.
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export FILE_IDENTIFIER=5072
+  export JSON_DATA='{"description":"My description.","directoryLabel":"data/subdir1","categories":["Data"], "restrict":"false", "forceReplace":"true", "storageIdentifier":"s3://demo-dataverse-bucket:176e28068b0-1c3f80357c42", "fileName":"file1.txt", "mimeType":"text/plain", "checksum": {"@type": "SHA-1", "@value": "123456"}}'
+
+  curl -X POST -H "X-Dataverse-key: $API_TOKEN" "$SERVER_URL/api/files/$FILE_IDENTIFIER/replace" -F "jsonData=$JSON_DATA"
+
+Note that this API call can be used independently of the others, e.g. supporting use cases in which the file already exists in S3/has been uploaded via some out-of-band method. Enabling out-of-band uploads is described at :ref:`file-storage` in the Configuration Guide.
+With current S3 stores the object identifier must be in the correct bucket for the store, include the PID authority/identifier of the parent dataset, and be guaranteed unique, and the supplied storage identifier must be prefaced with the store identifier used in the Dataverse installation, as with the internally generated examples above.
+
+Replacing Multiple Existing Files in the Dataset
+------------------------------------------------
+
+Once the replacement files exist in the s3 bucket, a final API call is needed to register them as replacements for existing files. In this API call, additional metadata is added using the "jsonData" parameter.
+jsonData for this call is array of objects that normally include information such as a file description, tags, provenance, whether the file is restricted, etc. For direct uploads, the jsonData object must include some additional values:
+
+* "fileToReplaceId" - the id of the file being replaced
+* "forceReplace" - whether to replace a file with one of a different mimetype (optional, default is false)
+* "description" - A description of the file
+* "directoryLabel" - The "File Path" of the file, indicating which folder the file should be uploaded to within the dataset
+* "storageIdentifier" - String
+* "fileName" - String
+* "mimeType" - String
+* "fixity/checksum" either:
+
+  * "md5Hash" - String with MD5 hash value, or
+  * "checksum" - Json Object with "@type" field specifying the algorithm used and "@value" field with the value from that algorithm, both Strings
+
+
+The allowed checksum algorithms are defined by the edu.harvard.iq.dataverse.DataFile.CheckSumType class and currently include MD5, SHA-1, SHA-256, and SHA-512
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export PERSISTENT_IDENTIFIER=doi:10.5072/FK2/7U7YBV
+  export JSON_DATA='[{"fileToReplaceId": 10, "description":"My description.","directoryLabel":"data/subdir1","categories":["Data"], "restrict":"false", "storageIdentifier":"s3://demo-dataverse-bucket:176e28068b0-1c3f80357c42", "fileName":"file1.txt", "mimeType":"text/plain", "checksum": {"@type": "SHA-1", "@value": "123456"}},{"fileToReplaceId": 11, "forceReplace": true, "description":"My description.","directoryLabel":"data/subdir1","categories":["Data"], "restrict":"false", "storageIdentifier":"s3://demo-dataverse-bucket:176e28068b0-1c3f80357d53", "fileName":"file2.txt", "mimeType":"text/plain", "checksum": {"@type": "SHA-1", "@value": "123789"}}]'
+
+  curl -X POST -H "X-Dataverse-key: $API_TOKEN" "$SERVER_URL/api/datasets/:persistentId/replaceFiles?persistentId=$PERSISTENT_IDENTIFIER" -F "jsonData=$JSON_DATA"
+
+The JSON object returned as a response from this API call includes a "data" that indicates how many of the file replacements succeeded and provides per-file error messages for those that don't, e.g.
+
+.. code-block::
+
+  {
+    "status": "OK",
+    "data": {
+      "Files": [
+        {
+          "storageIdentifier": "s3://demo-dataverse-bucket:176e28068b0-1c3f80357c42",
+          "errorMessage": "Bad Request:The file to replace does not belong to this dataset.",
+          "fileDetails": {
+            "fileToReplaceId": 10,
+            "description": "My description.",
+            "directoryLabel": "data/subdir1",
+            "categories": [
+              "Data"
+            ],
+            "restrict": "false",
+            "storageIdentifier": "s3://demo-dataverse-bucket:176e28068b0-1c3f80357c42",
+            "fileName": "file1.Bin",
+            "mimeType": "application/octet-stream",
+            "checksum": {
+              "@type": "SHA-1",
+              "@value": "123456"
+            }
+          }
+        },
+        {
+          "storageIdentifier": "s3://demo-dataverse-bucket:176e28068b0-1c3f80357d53",
+          "successMessage": "Replaced successfully in the dataset",
+          "fileDetails": {
+            "description": "My description.",
+            "label": "file2.txt",
+            "restricted": false,
+            "directoryLabel": "data/subdir1",
+            "categories": [
+              "Data"
+            ],
+            "dataFile": {
+              "persistentId": "",
+              "pidURL": "",
+              "filename": "file2.txt",
+              "contentType": "text/plain",
+              "filesize": 2407,
+              "description": "My description.",
+              "storageIdentifier": "s3://demo-dataverse-bucket:176e28068b0-1c3f80357d53",
+              "rootDataFileId": 11,
+              "previousDataFileId": 11,
+              "checksum": {
+                "type": "SHA-1",
+                "value": "123789"
+              }
+            }
+          }
+        }
+      ],
+      "Result": {
+        "Total number of files": 2,
+        "Number of files successfully replaced": 1
+      }
+    }
+  }
+
+
+Note that this API call can be used independently of the others, e.g. supporting use cases in which the files already exists in S3/has been uploaded via some out-of-band method. Enabling out-of-band uploads is described at :ref:`file-storage` in the Configuration Guide.
+With current S3 stores the object identifier must be in the correct bucket for the store, include the PID authority/identifier of the parent dataset, and be guaranteed unique, and the supplied storage identifier must be prefaced with the store identifier used in the Dataverse installation, as with the internally generated examples above.
diff --git a/doc/sphinx-guides/source/developers/search-services.rst b/doc/sphinx-guides/source/developers/search-services.rst
new file mode 100644
index 00000000000..9a124babeb0
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/search-services.rst
@@ -0,0 +1,141 @@
+Search Services
+===============
+
+Dataverse supports configurable search services, allowing developers to integrate additional search engines dynamically. This guide outlines the design and provides details on how to use the interfaces and classes involved.
+
+Design Overview
+---------------
+The configurable search services feature is designed to allow:
+
+1. Dynamic addition of new search engines
+2. Configuration of the Dataverse UI to use a specified search engine
+3. Use of different search engines via the API
+4. Discovery of installed search engines
+
+Key Components
+--------------
+
+1. SearchService Interface
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+The ``SearchService`` interface is the core of the configurable search services. It defines the methods that any search engine implementation must provide. (The methods below are accurate as of this writing.)
+
+.. code-block:: java
+
+   public interface SearchService {
+       String getServiceName();
+       String getDisplayName();
+       
+       SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query,
+               List<String> filterQueries, String sortField, String sortOrder, int paginationStart,
+               boolean onlyDatatRelatedToMe, int numResultsPerPage, boolean retrieveEntities, String geoPoint,
+               String geoRadius, boolean addFacets, boolean addHighlights) throws SearchException;
+
+       default void setSolrSearchService(SearchService solrSearchService);
+   }
+
+The interface allows you to provide a service name and display name, and to respond to the same search parameters that are normally sent to the Solr search engine.
+
+The ``setSolrSearchService`` method is used by Dataverse to give your class a reference to the ``SolrSearchService``, allowing your class to perform Solr queries as needed. (See the ``ExternalSearchServices`` for an example.)
+
+2. ConfigurableSearchService Interface
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The ``ConfigurableSearchService`` interface extends the ``SearchService`` interface and adds a method for Dataverse to set the ``SettingsServiceBean``. This allows search services to be configurable through Dataverse settings.
+
+.. code-block:: java
+
+   public interface ConfigurableSearchService extends SearchService {
+       void setSettingsService(SettingsServiceBean settingsService);
+   }
+
+The ``GetExternalSearchServiceBean`` and ``PostExternalSearchServiceBean`` classes provide a use case for this.
+
+3. JVM Options for Search Configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Dataverse uses two JVM options to configure the search functionality:
+
+- ``dataverse.search.services.directory``: Specifies the local directory where jar files with search engines (classes implementing the ``SearchService`` interface) can be found. Dataverse will dynamically load engines from this directory.
+
+- ``dataverse.search.default-service``: The ``serviceName`` of the service that should be used in the Dataverse UI.
+
+Example configuration:
+
+.. code-block:: bash
+
+   ./asadmin create-jvm-options "-Ddataverse.search.services.directory=/var/lib/dataverse/searchServices"
+   ./asadmin create-jvm-options "-Ddataverse.search.default-service=solr"
+
+Remember to restart your Payara server after modifying these JVM options for the changes to take effect.
+
+4. Using Different Search Engines via API
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The loaded search services can be discovered using the ``/api/search/services`` endpoint.
+
+Queries can be made to different engines by including the optional ``search_service=<serviceName>`` query parameter.
+
+Use of these endpoints is described for end users in the API Guide under :ref:`search-services`.
+
+Available Search Services
+-------------------------
+
+The class definitions for four example search services are included in the Dataverse repository.
+They are not included in the Dataverse .war file but can be built as three separate .jar files using
+
+.. code-block:: bash 
+
+    mvn clean package -DskipTests=true -Pexternal-search-get -Pexternal-search-post
+
+or
+
+.. code-block:: bash 
+
+    mvn clean package -DskipTests=true -Ptrivial-search-examples
+
+1. GetExternalSearchServiceBean
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+2. PostExternalSearchServiceBean
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+These classes implement the ``ConfigurableSearchService`` interface.
+They make a GET or POST call (respectively) to an external search engine that must return a JSON array of objects with "PID" (preferred) or "DOI" and "Distance" keys.
+The query sent to the external engine use the same query parameters as the Dataverse search API (GET) or have a JSON payload with those keys (POST).
+The results they return are then searched for using the solr search engine which enforces access control and provides the standard formatting expected by the Dataverse UI and API.
+The distance values are used to order the results, smallest distances first. 
+
+They can be configured via two settings each:
+
+- GET
+
+  - :GetExternalSearchUrl - the URL to send GET search queries to
+  - :GetExternalSearchName - the display name to use for this configuration
+
+- POST
+
+  - :PostExternalSearchUrl - the URL to send POST search queries to
+  - :PostExternalSearchName - the display name to use for this configuration
+
+As these classes use PIDs as identifiers, they cannot reference collections or, unless file PIDs are enabled, files.
+Similar classes, or extensions of these classes could search by database ids instead, etc. to support the additional types.
+
+3. GoldenOldiesSearchServiceBean
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+4. OddlyEnoughSearchServiceBean
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+These classes implement the ``SearchService`` interface.
+They are intended only as code examples and simple tests of the design and are not intended for production use.
+The former simply replaces the user query with a query for entities with a db id < 1000. It demonstrates how a class can leverage the solr engine and achieve results solely by modifying/replacing the user query. 
+The latter only returns hits from the user's query that also have an odd database id. Since the filtering in the class changes the number of total hits available and pagination, this class demonstrates one way a developer can adjust those aspects of the Solr response.
+
+Notes
+-----
+
+1. Unless you use the Solr engine to provide access control, you must implement proper access control in your search engine
+2. The design currently limits search results to be in the format returned by Solr and the hits are expected to be collections, datasets, or files - other classes are not supported.
+3. Search services could be designed to completely replace Solr or to just support certain use cases (e.g. the external search classes only handling datasets).
+4. While search services can be deployed as independent jar files, they currently import multiple Dataverse classes and, unlike exporters, cannot be built using just the Dataverse SPI.
+5. As with other experimental features, we expect the ``SearchService`` interface may change over time as we learn about how people use it. Please keep in touch if you are developing search services.
+
diff --git a/doc/sphinx-guides/source/developers/security.rst b/doc/sphinx-guides/source/developers/security.rst
new file mode 100755
index 00000000000..09b80a4c840
--- /dev/null
+++ b/doc/sphinx-guides/source/developers/security.rst
@@ -0,0 +1,34 @@
+========
+Security
+========
+
+This section describes security practices and procedures for the Dataverse team.
+
+.. contents:: |toctitle|
+	:local:
+
+Intake of Security Issues
+-------------------------
+
+As described under :ref:`reporting-security-issues`, we encourage the community to email security@dataverse.org if they have any security concerns. These emails go into our private ticket tracker (RT_).
+
+.. _RT: https://help.hmdc.harvard.edu
+
+We use a private GitHub issue tracker at https://github.com/IQSS/dataverse-security/issues for security issues.
+
+Sending Security Notices
+------------------------
+
+When drafting the security notice, it might be helpful to look at `previous examples`_.
+
+.. _previous examples: https://drive.google.com/drive/folders/0B_qMYwdHFZghaDZIU2hWQnBDZVE?resourcekey=0-SYjuhCohAIM7_pmysVc3Xg&usp=sharing
+
+Gather email addresses from the following sources (these are also described under :ref:`ongoing-security` in the Installation Guide):
+
+- "contact_email" in the `public installation spreadsheet`_
+- "Other Security Contacts" in the `private installation spreadsheet`_
+
+Once you have the emails, include them as bcc.
+
+.. _public installation spreadsheet: https://docs.google.com/spreadsheets/d/1bfsw7gnHlHerLXuk7YprUT68liHfcaMxs1rFciA-mEo/edit#gid=0
+.. _private installation spreadsheet: https://docs.google.com/spreadsheets/d/1EWDwsj6eptQ7nEr-loLvdU7I6Tm2ljAplfNSVWR42i0/edit?usp=sharing
diff --git a/doc/sphinx-guides/source/developers/selinux.rst b/doc/sphinx-guides/source/developers/selinux.rst
index d7f5b0d7519..1d3d01610fe 100644
--- a/doc/sphinx-guides/source/developers/selinux.rst
+++ b/doc/sphinx-guides/source/developers/selinux.rst
@@ -8,7 +8,7 @@ SELinux
 Introduction
 ------------
 
-The ``shibboleth.te`` file below that is mentioned in the :doc:`/installation/shibboleth` section of the Installation Guide was created on CentOS 6 as part of https://github.com/IQSS/dataverse/issues/3406 but may need to be revised for future versions of RHEL/CentOS (pull requests welcome!). The file is versioned with the docs and can be found in the following location:
+The ``shibboleth.te`` file below that was mentioned in the :doc:`/installation/shibboleth` section of the Installation Guide was created on CentOS 6 as part of https://github.com/IQSS/dataverse/issues/3406 but may need to be revised for future versions of RHEL/CentOS (pull requests welcome!). The file is versioned with the docs and can be found in the following location:
 
 ``doc/sphinx-guides/source/_static/installation/files/etc/selinux/targeted/src/policy/domains/misc/shibboleth.te``
 
@@ -44,7 +44,7 @@ Use ``semodule -l | grep shibboleth`` to see if the ``shibboleth.te`` rules are
 Exercising SELinux denials
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-As of this writing, there are two optional components of Dataverse that are known not to work with SELinux out of the box with SELinux: Shibboleth and rApache.
+As of this writing, the only component of the Dataverse Software which is known not to work with SELinux out of the box is Shibboleth.
 
 We will be exercising SELinux denials with Shibboleth, and the SELinux-related issues are expected out the box:
 
@@ -109,7 +109,3 @@ Once your updated SELinux rules are in place, try logging in with Shibboleth aga
 Keep iterating until it works and then create a pull request based on your updated file. Good luck!
 
 Many thanks to Bill Horka from IQSS for his assistance in explaining how to construct a SELinux Type Enforcement (TE) file!
-
-----
-
-Previous: :doc:`geospatial`
diff --git a/doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst b/doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst
index 07f65f6828a..409242101b8 100644
--- a/doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst
+++ b/doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst
@@ -2,7 +2,7 @@
 SQL Upgrade Scripts
 ===================
 
-The database schema for Dataverse is constantly evolving and we have adopted a tool called Flyway to help keep your development environment up to date and in working order. As you make changes to the database schema (changes to ``@Entity`` classes), you must write SQL upgrade scripts when needed and follow Flyway file naming conventions.
+The database schema for the Dataverse Software is constantly evolving and we have adopted a tool called Flyway to help keep your development environment up to date and in working order. As you make changes to the database schema (changes to ``@Entity`` classes), you must write SQL upgrade scripts when needed and follow Flyway file naming conventions.
 
 .. contents:: |toctitle|
 	:local:
@@ -17,20 +17,24 @@ In the past (before adopting Flyway) we used to keep SQL upgrade scripts in ``sc
 How to Determine if You Need to Create a SQL Upgrade Script
 -----------------------------------------------------------
 
-If you are creating a new database table (which maps to an ``@Entity`` in JPA), you do not need to create or update a SQL upgrade script. The reason for this is that we use ``create-tables`` in ``src/main/resources/META-INF/persistence.xml`` so that new tables are automatically created by Glassfish when you deploy your war file.
+If you are creating a new database table (which maps to an ``@Entity`` in JPA), you do not need to create or update a SQL upgrade script. The reason for this is that we use ``create-tables`` in ``src/main/resources/META-INF/persistence.xml`` so that new tables are automatically created by the app server when you deploy your war file.
 
 If you are doing anything other than creating a new database table such as adding a column to an existing table, you must create or update a SQL upgrade script.
 
+.. _create-sql-script:
+
 How to Create a SQL Upgrade Script
 ----------------------------------
 
 We assume you have already read the :doc:`version-control` section and have been keeping your feature branch up to date with the "develop" branch.
 
-Create a new file called something like ``V4.11.0.1__5565-sanitize-directory-labels.sql`` in the ``src/main/resources/db/migration`` directory. Use a version like "4.11.0.1" in the example above where the previously released version was 4.11, ensuring that the version number is unique. Note that this is not the version that you expect the code changes to be included in (4.12 in this example). For the "description" you should the name of your branch, which should include the GitHub issue you are working on, as in the example above. To read more about Flyway file naming conventions, see https://flywaydb.org/documentation/migrations#naming
+Create a new SQL file in the ``src/main/resources/db/migration`` directory and put a short, meaningful comment at the top. Make the filename something like ``V6.1.0.1.sql``. In this example ``6.1`` represents the current version of Dataverse, with the last digit representing number of the script for that version. (The zero in this example is a placeholder in case the current version has a third number like ``6.1.1``.) Should a newer version be merged while you work on your pull request (PR), you must update your script to the next available number such as ``V6.1.0.2.sql``.
+
+Previously, we used longer, more descriptive file naming conventions supported by Flyway. However, this approach occasionally led to inadvertent merging of multiple scripts with the same version, such as ``V6.0.0.1__0000-wonderful-pr.sql`` and ``V6.0.0.1__0001-lovely-pr.sql`` where ``V6.0.0.1`` must be unique. After careful consideration, we agreed to adopt the convention mentioned above for naming files. This helps us detect conflicts before merging a PR, preventing the develop branch from being undeployable due to a Flyway conflict. For more information on Flyway file naming conventions, see https://documentation.red-gate.com/fd/migrations-184127470.html 
 
 The SQL migration script you wrote will be part of the war file and executed when the war file is deployed. To see a history of Flyway database migrations that have been applied, look at the ``flyway_schema_history`` table.
 
-As with any task related to Dataverse development, if you need any help writing SQL upgrade scripts, please reach out using any of the channels mentioned under "Getting Help" in the :doc:`intro` section.
+As with any task related to the development of the Dataverse Software, if you need any help writing SQL upgrade scripts, please reach out using any of the channels mentioned under "Getting Help" in the :doc:`intro` section.
 
 Troubleshooting
 ---------------
@@ -38,10 +42,6 @@ Troubleshooting
 Renaming SQL Upgrade Scripts
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Please note that if you need to rename your script (because a new version of Dataverse was released, for example), you will see the error "FlywayException: Validate failed: Detected applied migration not resolved locally" when you attempt to deploy and deployment will fail.
+Please note that if you need to rename your script (because a new version of the Dataverse Software was released, for example), you will see the error "FlywayException: Validate failed: Detected applied migration not resolved locally" when you attempt to deploy and deployment will fail.
 
 To resolve this problem, delete the old migration from the ``flyway_schema_history`` table and attempt to redeploy.
-
-----
-
-Previous: :doc:`version-control` | Next: :doc:`testing`
diff --git a/doc/sphinx-guides/source/developers/testing.rst b/doc/sphinx-guides/source/developers/testing.rst
index fc3910ac36a..1690864d453 100755
--- a/doc/sphinx-guides/source/developers/testing.rst
+++ b/doc/sphinx-guides/source/developers/testing.rst
@@ -2,10 +2,10 @@
 Testing
 =======
 
-In order to keep our codebase healthy, the Dataverse project encourages developers to write automated tests in the form of unit tests and integration tests. We also welcome ideas for how to improve our automated testing.
+In order to keep our codebase healthy, the Dataverse Project encourages developers to write automated tests in the form of unit tests and integration tests. We also welcome ideas for how to improve our automated testing.
 
 .. contents:: |toctitle|
-	:local:
+    :local:
 
 The Health of a Codebase
 ------------------------
@@ -23,34 +23,38 @@ Testing in Depth
 
 `Security in depth <https://en.wikipedia.org/wiki/Defense_in_depth_(computing)>`_ might mean that your castle has a moat as well as high walls. Likewise, when testing, you should consider testing a various layers of the stack using both unit tests and integration tests.
 
-When writing tests, you may find it helpful to first map out which functions of your code you want to test, and then write a functional unit test for each which can later comprise a larger integration test. 
+When writing tests, you may find it helpful to first map out which functions of your code you want to test, and then write a functional unit test for each which can later comprise a larger integration test.
 
 Unit Tests
 ----------
 
 Creating unit tests for your code is a helpful way to test what you've built piece by piece.
 
-Unit tests can be executed without runtime dependencies on PostgreSQL, Solr, or any other external system. They are the lowest level of testing and are executed constantly on developers' laptops as part of the build process and via continous integration services in the cloud.
+Unit tests can be executed without runtime dependencies on PostgreSQL, Solr, or any other external system. They are the lowest level of testing and are executed constantly on developers' laptops as part of the build process and via continuous integration services in the cloud.
 
-A unit test should execute an operation of your code in a controlled fashion. You must make an assertion of what the expected response gives back. It's important to test optimistic output and assertions (the "happy path"), as well as unexpected input that leads to failure conditions. Know how your program should handle anticipated errors/exceptions and confirm with your test(s) that it does so properly. 
+A unit test should execute an operation of your code in a controlled fashion. You must make an assertion of what the expected response gives back. It's important to test optimistic output and assertions (the "happy path"), as well as unexpected input that leads to failure conditions. Know how your program should handle anticipated errors/exceptions and confirm with your test(s) that it does so properly.
 
 Unit Test Automation Overview
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-We use a variety of tools to write, execute, and measure the code coverage of unit tests, including Maven, JUnit, Jacoco, GitHub, Travis, and Coveralls. We'll explain the role of each tool below, but here's an overview of what you can expect from the automation we've set up.
+We use a variety of tools to write, execute, and measure the code coverage of unit tests, including Maven, JUnit, Jacoco, GitHub, and Coveralls. We'll explain the role of each tool below, but here's an overview of what you can expect from the automation we've set up.
 
-As you prepare to make a pull request, as described in the :doc:`version-control` section, you will be working on a new branch you create from the "develop" branch. Let's say your branch is called ``1012-private-url``. As you work, you are constantly invoking Maven to build the war file. When you do a "clean and build" in Netbeans, Maven runs all the unit tests (anything ending with ``Test.java``) and the runs the results through a tool called Jacoco that calculates code coverage. When you push your branch to GitHub and make a pull request, a web service called Travis CI runs Maven and Jacoco on your branch and pushes the results to Coveralls, which is a web service that tracks changes to code coverage over time.
-
-To make this more concrete, observe that https://github.com/IQSS/dataverse/pull/3111 has comments from a GitHub user called ``coveralls`` saying things like "Coverage increased (+0.5%) to 5.547% when pulling dd6ceb1 on 1012-private-url into be5b26e on develop." Clicking on the comment should lead you to a URL such as https://coveralls.io/builds/7013870 which shows how code coverage has gone up or down. That page links to a page such as https://travis-ci.org/IQSS/dataverse/builds/144840165 which shows the build on the Travis side that pushed the results ton Coveralls.
+As you prepare to make a pull request, as described in the :doc:`version-control` section, you will be working on a new branch you create from the "develop" branch. Let's say your branch is called ``1012-private-url``. As you work, you are constantly invoking Maven to build the war file. When you do a "clean and build" in Netbeans, Maven runs all the unit tests (anything ending with ``Test.java``) and then runs the results through a tool called Jacoco that calculates code coverage. When you push your branch to GitHub and make a pull request, GitHub Actions runs Maven and Jacoco on your branch and pushes the results to Coveralls, which is a web service that tracks changes to code coverage over time. Note that we have configured Coveralls to not mark small decreases in code coverage as a failure. You can find the Coveralls reports at https://coveralls.io/github/IQSS/dataverse
 
 The main takeaway should be that we care about unit testing enough to measure the changes to code coverage over time using automation. Now let's talk about how you can help keep our code coverage up by writing unit tests with JUnit.
 
 Writing Unit Tests with JUnit
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-We are aware that there are newer testing tools such as TestNG, but we use `JUnit <http://junit.org>`_ because it's tried and true.
+We are aware that there are newer testing tools such as TestNG, but we use `JUnit <https://junit.org>`_ because it's tried and true.
+We support JUnit 5 based testing and require new tests written with it.
+(Since Dataverse 6.0, we migrated all of our tests formerly based on JUnit 4.)
 
-If writing tests is new to you, poke around existing unit tests which all end in ``Test.java`` and live under ``src/test``. Each test is annotated with ``@Test`` and should have at least one assertion which specifies the expected result. In Netbeans, you can run all the tests in it by clicking "Run" -> "Test File". From the test file, you should be able to navigate to the code that's being tested by right-clicking on the file and clicking "Navigate" -> "Go to Test/Tested class". Likewise, from the code, you should be able to use the same "Navigate" menu to go to the tests.
+If writing tests is new to you, poke around existing unit tests which all end in ``Test.java`` and live under ``src/test``.
+Each test is annotated with ``@Test`` and should have at least one assertion which specifies the expected result.
+In Netbeans, you can run all the tests in it by clicking "Run" -> "Test File".
+From the test file, you should be able to navigate to the code that's being tested by right-clicking on the file and clicking "Navigate" -> "Go to Test/Tested class".
+Likewise, from the code, you should be able to use the same "Navigate" menu to go to the tests.
 
 NOTE: Please remember when writing tests checking possibly localized outputs to check against ``en_US.UTF-8`` and ``UTC``
 l10n strings!
@@ -60,16 +64,60 @@ Refactoring Code to Make It Unit-Testable
 
 Existing code is not necessarily written in a way that lends itself to easy testing. Generally speaking, it is difficult to write unit tests for both JSF "backing" beans (which end in ``Page.java``) and "service" beans (which end in ``Service.java``) because they require the database to be running in order to test them. If service beans can be exercised via API they can be tested with integration tests (described below) but a good technique for making the logic testable it to move code to "util beans" (which end in ``Util.java``) that operate on Plain Old Java Objects (POJOs). ``PrivateUrlUtil.java`` is a good example of moving logic from ``PrivateUrlServiceBean.java`` to a "util" bean to make the code testable.
 
-Parameterized Tests and JUnit Theories
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Often times you will want to test a method multiple times with similar values. In order to avoid test bloat (writing a test for every data combination), JUnit offers Data-driven unit tests with ``Parameterized.class`` and ``Theories.class``. This allows a test to be run for each set of defined data values. For reference, take a look at issue https://github.com/IQSS/dataverse/issues/5619 .
+Parameterized Tests
+^^^^^^^^^^^^^^^^^^^
+
+Often times you will want to test a method multiple times with similar values.
+In order to avoid test bloat (writing a test for every data combination),
+JUnit offers Data-driven unit tests. This allows a test to be run for each set
+of defined data values.
+
+JUnit 5 offers great parameterized testing. Some guidance how to write those:
+
+- https://junit.org/junit5/docs/current/user-guide/#writing-tests-parameterized-tests
+- https://www.baeldung.com/parameterized-tests-junit-5
+- https://blog.codefx.org/libraries/junit-5-parameterized-tests/
+- See also many examples in our codebase.
+
+Note that JUnit 5 also offers support for custom test parameter resolvers. This enables keeping tests cleaner,
+as preparation might happen within some extension and the test code is more focused on the actual testing.
+See https://junit.org/junit5/docs/current/user-guide/#extensions-parameter-resolution for more information.
+
+JUnit 5 Test Helper Extensions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Our codebase provides little helpers to ease dealing with state during tests.
+Some tests might need to change something which should be restored after the test ran.
+
+For unit tests, the most interesting part is to set a JVM setting just for the current test or a whole test class.
+(Which might be an inner class, too!). Please make use of the ``@JvmSetting(key = JvmSettings.XXX, value = "")``
+annotation and also make sure to annotate the test class with ``@LocalJvmSettings``.
+
+Inspired by JUnit's ``@MethodSource`` annotation, you may use ``@JvmSetting(key = JvmSettings.XXX, method = "zzz")``
+to reference a static method located in the same test class by name (i. e. ``private static String zzz() {}``) to allow
+retrieving dynamic data instead of String constants only. (Note the requirement for a *static* method!)
+
+If you want to delete a setting, simply provide a ``null`` value. This can be used to override a class-wide setting
+or some other default that is present for some reason.
+
+To set arbitrary system properties for the current test, a similar extension ``@SystemProperty(key = "", value = "")``
+has been added. (Note: it does not support method references.)
+
+Both extensions will ensure the global state of system properties is non-interfering for
+test executions. Tests using these extensions will be executed in serial.
+
+This settings helper may be extended at a later time to manipulate settings in a remote instance during integration
+or end-to-end testing. Stay tuned!
 
 Observing Changes to Code Coverage
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Once you've written some tests, you're probably wondering how much you've helped to increase the code coverage. In Netbeans, do a "clean and build." Then, under the "Projects" tab, right-click "dataverse" and click "Code Coverage" -> "Show Report". For each Java file you have open, you should be able to see the percentage of code that is covered by tests and every line in the file should be either green or red. Green indicates that the line is being exercised by a unit test and red indicates that it is not.
 
-In addition to seeing code coverage in Netbeans, you can also see code coverage reports by opening ``target/site/jacoco/index.html`` in your browser.
+In addition to seeing code coverage in Netbeans, you can also see code coverage reports by opening ``target/site/jacoco-X-test-coverage-report/index.html`` in your browser.
+Depending on the report type you want to look at, let ``X`` be one of ``unit``, ``integration`` or ``merged``.
+"Merged" will display combined coverage of both unit and integration test, but does currently not cover API tests.
+
 
 Testing Commands
 ^^^^^^^^^^^^^^^^
@@ -85,105 +133,159 @@ In addition, there is a writeup on "The Testable Command" at https://github.com/
 Running Non-Essential (Excluded) Unit Tests
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-You should be aware that some unit tests have been deemed "non-essential" and have been annotated with ``@Category(NonEssentialTests.class)`` and are excluded from the "dev" Maven profile, which is the default profile. All unit tests (that have not been annotated with ``@Ignore``), including these non-essential tests, are run from continuous integration systems such as Jenkins and Travis CI with the following ``mvn`` command that invokes a non-default profile:
+You should be aware that some unit tests have been deemed "non-essential" and have been annotated with ``@Tag(Tags.NOT_ESSENTIAL_UNITTESTS)`` and are excluded from the "dev" Maven profile, which is the default profile.
+All unit tests (that have not been annotated with ``@Disable``), including these non-essential tests, are run from continuous integration systems such as Jenkins and GitHub Actions with the following ``mvn`` command that invokes a non-default profile:
 
 ``mvn test -P all-unit-tests``
 
-Typically https://travis-ci.org/IQSS/dataverse will show a higher number of unit tests executed because it uses the profile above.
+Generally speaking, unit tests have been flagged as non-essential because they are slow or because they require an Internet connection.
+You should not feel obligated to run these tests continuously but you can use the ``mvn`` command above to run them.
+To iterate on the unit test in Netbeans and execute it with "Run -> Test File", you must temporarily comment out the annotation flagging the test as non-essential.
 
-Generally speaking, unit tests have been flagged as non-essential because they are slow or because they require an Internet connection. You should not feel obligated to run these tests continuously but you can use the ``mvn`` command above to run them. To iterate on the unit test in Netbeans and execute it with "Run -> Test File", you must temporarily comment out the annotation flagging the test as non-essential.
+.. _integration-tests:
 
 Integration Tests
 -----------------
 
-Unit tests are fantastic for low level testing of logic but aren't especially real-world-applicable because they do not exercise Dataverse as it runs in production with a database and other runtime dependencies. We test in-depth by also writing integration tests to exercise a running system.
+Unit tests are fantastic for low level testing of logic but aren't especially real-world-applicable because they do not exercise the Dataverse Software as it runs in production with a database and other runtime dependencies. We test in-depth by also writing integration tests to exercise a running system.
 
-Unfortunately, the term "integration tests" can mean different things to different people. For our purposes, an integration test has the following qualities:
+Unfortunately, the term "integration tests" can mean different things to
+different people. For our purposes, an integration test can have two flavors:
 
-- Integration tests exercise Dataverse APIs.
-- Integration tests are not automatically on developers' laptops.
-- Integration tests operate on an installation of Dataverse that is running and able to talk to both PostgreSQL and Solr.
-- Integration tests are written using REST Assured.
+1. Be an API Test:
 
-Running the full API test suite using Docker
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   - Exercise the Dataverse Software APIs.
+   - Running not automatically on developers' laptops.
+   - Operate on a Dataverse installation that is running and able to talk to both PostgreSQL and Solr.
+   - Written using REST Assured.
 
-To run the full suite of integration tests on your laptop, we recommend using the "all in one" Docker configuration described in ``conf/docker-aio/readme.txt`` in the root of the repo.
+2. Be a `Testcontainers <https://testcontainers.org>`__ Test:
 
-Alternatively, you can run tests against Glassfish running on your laptop by following the "getting set up" steps below.
+   - Operates any dependencies via the Testcontainers API, using containers.
+   - Written as a JUnit test, using all things necessary to test.
+   - Makes use of the Testcontainers framework.
+   - Able to run anywhere having Docker around (podman support under construction).
 
-Getting Set Up to Run REST Assured Tests
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Running the Full API Test Suite Using EC2
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**Prerequisite:** To run the API test suite in an EC2 instance you should first follow the steps in the :doc:`deployment` section to get set up with the AWS binary to launch EC2 instances. If you're here because you just want to spin up a branch, you'll still want to follow the AWS deployment setup steps, but may find the `ec2-create README.md <https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible/blob/master/ec2/README.md>`_ Quick Start section helpful.
+
+You may always retrieve a current copy of the ec2-create-instance.sh script and accompanying group_var.yml file from the `dataverse-ansible repo <https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible/>`_. Since we want to run the test suite, let's grab the group_vars used by Jenkins:
 
-Unit tests are run automatically on every build, but dev environments and servers require special setup to run REST Assured tests. In short, Dataverse needs to be placed into an insecure mode that allows arbitrary users and datasets to be created and destroyed. This differs greatly from the out-of-the-box behavior of Dataverse, which we strive to keep secure for sysadmins installing the software for their institutions in a production environment.
+- `ec2-create-instance.sh <https://raw.githubusercontent.com/GlobalDataverseCommunityConsortium/dataverse-ansible/master/ec2/ec2-create-instance.sh>`_
+- `jenkins.yml <https://raw.githubusercontent.com/GlobalDataverseCommunityConsortium/dataverse-ansible/master/tests/group_vars/jenkins.yml>`_
 
-The :doc:`dev-environment` section currently refers developers here for advice on getting set up to run REST Assured tests, but we'd like to add some sort of "dev" flag to the installer to put Dataverse in "insecure" mode, with lots of scary warnings that this dev mode should not be used in production.
+Edit ``jenkins.yml`` to set the desired GitHub repo and branch, and to adjust any other options to meet your needs:
 
-The instructions below assume a relatively static dev environment on a Mac. There is a newer "all in one" Docker-based approach documented in the :doc:`/developers/containers` section under "Docker" that you may like to play with as well.
+- ``dataverse_repo: https://github.com/IQSS/dataverse.git``
+- ``dataverse_branch: develop``
+- ``dataverse.api.test_suite: true``
+- ``dataverse.unittests.enabled: true``
+- ``dataverse.sampledata.enabled: true``
+
+If you wish, you may pass the script a ``-l`` flag with a local relative path in which the script will `copy various logs <https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible/blob/master/ec2/ec2-create-instance.sh#L185>`_ at the end of the test suite for your review.
+
+Finally, run the script:
+
+.. code-block:: bash
+
+  $ ./ec2-create-instance.sh -g jenkins.yml -l log_dir
+
+Running the Full API Test Suite Using Docker
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To run the full suite of integration tests on your laptop, we recommend running Dataverse and its dependencies in Docker, as explained in the :doc:`/container/dev-usage` section of the Container Guide. This environment provides additional services (such as S3) that are used in testing.
+
+Running the APIs Without Docker (Classic Dev Env)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+While it is possible to run a good number of API tests without using Docker in our :doc:`classic-dev-env`, we are transitioning toward including additional services (such as S3) in our Dockerized development environment (:doc:`/container/dev-usage`), so you will probably find it more convenient to it instead.
+
+Unit tests are run automatically on every build, but dev environments and servers require special setup to run API (REST Assured) tests. In short, the Dataverse software needs to be placed into an insecure mode that allows arbitrary users and datasets to be created and destroyed (this is done automatically in the Dockerized environment, as well as the steps described below). This differs greatly from the out-of-the-box behavior of the Dataverse software, which we strive to keep secure for sysadmins installing the software for their institutions in a production environment.
 
 The Burrito Key
 ^^^^^^^^^^^^^^^
 
-For reasons that have been lost to the mists of time, Dataverse really wants you to to have a burrito. Specifically, if you're trying to run REST Assured tests and see the error "Dataverse config issue: No API key defined for built in user management", you must run the following curl command (or make an equivalent change to your database):
+For reasons that have been lost to the mists of time, the Dataverse software really wants you to to have a burrito. Specifically, if you're trying to run REST Assured tests and see the error "Dataverse config issue: No API key defined for built in user management", you must run the following curl command (or make an equivalent change to your database):
 
 ``curl -X PUT -d 'burrito' http://localhost:8080/api/admin/settings/BuiltinUsers.KEY``
 
-Without this "burrito" key in place, REST Assured will not be able to create users. We create users to create objects we want to test, such as dataverses, datasets, and files.
+Without this "burrito" key in place, REST Assured will not be able to create users. We create users to create objects we want to test, such as collections, datasets, and files.
 
-Root Dataverse Permissions
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+Root Collection Permissions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-In your browser, log in as dataverseAdmin (password: admin) and click the "Edit" button for your root dataverse. Navigate to Permissions, then the Edit Access button. Under "Who can add to this dataverse?" choose "Anyone with a dataverse account can add sub dataverses" if it isn't set to this already. 
+In your browser, log in as dataverseAdmin (password: admin) and click the "Edit" button for your root collection. Navigate to Permissions, then the Edit Access button. Under "Who can add to this collection?" choose "Anyone with a Dataverse installation account can add sub collections and datasets" if it isn't set to this already.
 
 Alternatively, this same step can be done with this script: ``scripts/search/tests/grant-authusers-add-on-root``
 
-Publish Root Dataverse
-^^^^^^^^^^^^^^^^^^^^^^
+Publish Root Collection
+^^^^^^^^^^^^^^^^^^^^^^^
 
-The root dataverse must be published for some of the REST Assured tests to run.
+The root collection must be published for some of the REST Assured tests to run.
 
 dataverse.siteUrl
 ^^^^^^^^^^^^^^^^^
 
-When run locally (as opposed to a remote server), some of the REST Assured tests require the ``dataverse.siteUrl`` JVM option to be set to ``http://localhost:8080``. See "JVM Options" under the :doc:`/installation/config` section of the Installation Guide for advice changing JVM options. First you should check to check your JVM options with:
+When run locally (as opposed to a remote server), some of the REST Assured tests require the ``dataverse.siteUrl`` JVM option to be set to ``http://localhost:8080``. See :ref:`jvm-options` section in the Installation Guide for advice changing JVM options. First you should check to check your JVM options with:
 
 ``./asadmin list-jvm-options | egrep 'dataverse|doi'``
 
 If ``dataverse.siteUrl`` is absent, you can add it with:
 
-``./asadmin create-jvm-options "-Ddataverse.siteUrl=http\://localhost\:8080"`` 
+``./asadmin create-jvm-options "-Ddataverse.siteUrl=http\://localhost\:8080"``
+
+dataverse.oai.server.maxidentifiers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The OAI Harvesting tests require that the paging limit for ListIdentifiers must be set to 2, in order to be able to trigger this paging behavior without having to create and export too many datasets:
+
+``./asadmin create-jvm-options "-Ddataverse.oai.server.maxidentifiers=2"``
+
+dataverse.oai.server.maxrecords
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Identifier Generation 
+The OAI Harvesting tests require that the paging limit for ListRecords must be set to 2, in order to be able to trigger this paging behavior without having to create and export too many datasets:
+
+``./asadmin create-jvm-options "-Ddataverse.oai.server.maxrecords=2"``
+
+Identifier Generation
 ^^^^^^^^^^^^^^^^^^^^^
 
 ``DatasetsIT.java`` exercises the feature where the "identifier" of a DOI can be a digit and requires a sequence to be added to your database.  See ``:IdentifierGenerationStyle`` under the :doc:`/installation/config` section for adding this sequence to your installation of PostgreSQL.
 
 
-Writing Integration Tests with REST Assured
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Writing API Tests with REST Assured
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Before writing any new REST Assured tests, you should get the tests to pass in an existing REST Assured test file. ``BuiltinUsersIT.java`` is relatively small and requires less setup than other test files. 
+Before writing any new REST Assured tests, you should get the tests to pass in an existing REST Assured test file. ``BuiltinUsersIT.java`` is relatively small and requires less setup than other test files.
 
 You do not have to reinvent the wheel. There are many useful methods you can call in your own tests -- especially within UtilIT.java -- when you need your test to create and/or interact with generated accounts, files, datasets, etc. Similar methods can subsequently delete them to get them out of your way as desired before the test has concluded.
 
 For example, if you’re testing your code’s operations with user accounts, the method ``UtilIT.createRandomUser();`` can generate an account for your test to work with. The same account can then be deleted by your program by calling the ``UtilIT.deleteUser();`` method on the imaginary friend your test generated.
 
-Remember, it’s only a test (and it's not graded)! Some guidelines to bear in mind: 
+Remember, it’s only a test (and it's not graded)! Some guidelines to bear in mind:
 
 - Map out which logical functions you want to test
 - Understand what’s being tested and ensure it’s repeatable
 - Assert the conditions of success / return values for each operation
-  * A useful resource would be `HTTP status codes <http://www.restapitutorial.com/httpstatuscodes.html>`_
+  * A useful resource would be `HTTP status codes <https://www.restapitutorial.com/httpstatuscodes.html>`_
 - Let the code do the labor; automate everything that happens when you run your test file.
+- If you need to test an optional service (S3, etc.), add it to our docker compose file. See :doc:`/container/dev-usage`.
 - Just as with any development, if you’re stuck: ask for help!
 
-To execute existing integration tests on your local Dataverse, a helpful command line tool to use is `Maven <http://maven.apache.org/ref/3.1.0/maven-embedder/cli.html>`_. You should have Maven installed as per the `Development Environment <http://guides.dataverse.org/en/latest/developers/dev-environment.html>`_ guide, but if not it’s easily done via Homebrew: ``brew install maven``. 
+To execute existing integration tests on your local Dataverse installation from the command line, use Maven. You should have Maven installed as per :doc:`dev-environment`, but if not it's easily done via Homebrew: ``brew install maven``.
+
+Once installed, you may run commands with ``mvn [options] [<goal(s)>] [<phase(s)>]``.
+
++ If you want to run just one particular API test class:
 
-Once installed, you may run commands with ``mvn [options] [<goal(s)>] [<phase(s)>]``. 
+  ``mvn test -Dtest=UsersIT``
 
-+ If you want to run just one particular API test, it’s as easy as you think:
++ If you want to run just one particular API test method,
 
-  ``mvn test -Dtest=FileRecordJobIT``
+  ``mvn test -Dtest=UsersIT#testMergeAccounts``
 
 + To run more than one test at a time, separate by commas:
 
@@ -193,38 +295,84 @@ Once installed, you may run commands with ``mvn [options] [<goal(s)>] [<phase(s)
 
   ``mvn test -Dtest=FileMetadataIT -Ddataverse.test.baseurl='http://localhost:8080'``
 
-To see the full list of tests used by the Docker option mentioned above, see :download:`run-test-suite.sh <../../../../conf/docker-aio/run-test-suite.sh>`.
+If you are adding a new test class, be sure to add it to :download:`tests/integration-tests.txt <../../../../tests/integration-tests.txt>` so that our automated testing knows about it.
 
-Measuring Coverage of Integration Tests
----------------------------------------
 
-Measuring the code coverage of integration tests with Jacoco requires several steps. In order to make these steps clear we'll use "/usr/local/glassfish4" as the Glassfish directory and "glassfish" as the Glassfish Unix user.
+Writing and Using a Testcontainers Test
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Add jacocoagent.jar to Glassfish
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Most scenarios of integration testing involve having dependent services running.
+This is where `Testcontainers <https://www.testcontainers.org>`__ kicks in by
+providing a JUnit interface to drive them before and after executing your tests.
+
+Test scenarios are endless. Some examples are migration scripts, persistance,
+storage adapters etc.
+
+To run a test with Testcontainers, you will need to write a JUnit 5 test.
+`The upstream project provides some documentation about this. <https://www.testcontainers.org/test_framework_integration/junit_5>`_
+
+Please make sure to:
+
+1. End your test class with ``IT``
+2. Annotate the test class with two tags:
+
+   .. code:: java
+
+       /** A very minimal example for a Testcontainers integration test class. */
+       @Testcontainers(disabledWithoutDocker = true)
+       @Tag(edu.harvard.iq.dataverse.util.testing.Tags.INTEGRATION_TEST)
+       @Tag(edu.harvard.iq.dataverse.util.testing.Tags.USES_TESTCONTAINERS)
+       class MyExampleIT { /* ... */ }
+
+If using upstream modules, e.g. for PostgreSQL or similar, you will need to add
+a dependency to ``pom.xml`` if not present. `See the PostgreSQL module example. <https://www.testcontainers.org/modules/databases/postgres/>`_
+
+To run these tests, simply call out to Maven:
 
-In order to get code coverage reports out of Glassfish we'll be adding jacocoagent.jar to the Glassfish "lib" directory.
+.. code::
+
+    mvn verify
+
+Notes:
+
+1. Remember to have Docker ready to serve or tests will fail.
+2. You can skip running unit tests by adding ``-DskipUnitTests``
+3. You can choose to ignore test with Testcontainers by adding ``-Dit.groups='integration & !testcontainers'``
+   Learn more about `filter expressions in the JUnit 5 guide <https://junit.org/junit5/docs/current/user-guide/#running-tests-tag-expressions>`_.
+
+
+Measuring Coverage of API Tests
+-------------------------------
+
+Measuring the code coverage of API tests with Jacoco requires several steps. In order to make these steps clear we'll use "/usr/local/payara6" as the Payara directory and "dataverse" as the Payara Unix user.
+
+Please note that this was tested under Glassfish 4 but it is hoped that the same steps will work with Payara.
+
+Add jacocoagent.jar to Payara
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to get code coverage reports out of Payara we'll be adding jacocoagent.jar to the Payara "lib" directory.
 
 First, we need to download Jacoco. Look in pom.xml to determine which version of Jacoco we are using. As of this writing we are using 0.8.1 so in the example below we download the Jacoco zip from https://github.com/jacoco/jacoco/releases/tag/v0.8.1
 
-Note that we are running the following commands as the user "glassfish". In short, we stop Glassfish, add the Jacoco jar file, and start up Glassfish again.
+Note that we are running the following commands as the user "dataverse". In short, we stop Payara, add the Jacoco jar file, and start up Payara again.
 
 .. code-block:: bash
 
-  su - glassfish
-  cd /home/glassfish
+  su - dataverse
+  cd /home/dataverse
   mkdir -p local/jacoco-0.8.1
   cd local/jacoco-0.8.1
   wget https://github.com/jacoco/jacoco/releases/download/v0.8.1/jacoco-0.8.1.zip
   unzip jacoco-0.8.1.zip
-  /usr/local/glassfish4/bin/asadmin stop-domain
-  cp /home/glassfish/local/jacoco-0.8.1/lib/jacocoagent.jar /usr/local/glassfish4/glassfish/lib
-  /usr/local/glassfish4/bin/asadmin start-domain
+  /usr/local/payara6/bin/asadmin stop-domain
+  cp /home/dataverse/local/jacoco-0.8.1/lib/jacocoagent.jar /usr/local/payara6/glassfish/lib
+  /usr/local/payara6/bin/asadmin start-domain
 
 Add jacococli.jar to the WAR File
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-As the "glassfish" user download :download:`instrument_war_jacoco.bash <../_static/util/instrument_war_jacoco.bash>` (or skip ahead to the "git clone" step to get the script that way) and give it two arguments:
+As the "dataverse" user download :download:`instrument_war_jacoco.bash <../_static/util/instrument_war_jacoco.bash>` (or skip ahead to the "git clone" step to get the script that way) and give it two arguments:
 
 - path to your pristine WAR file
 - path to the new WAR file the script will create with jacococli.jar in it
@@ -238,40 +386,41 @@ Deploy the Instrumented WAR File
 
 Please note that you'll want to undeploy the old WAR file first, if necessary.
 
-Run this as the "glassfish" user.
+Run this as the "dataverse" user.
 
 .. code-block:: bash
 
-  /usr/local/glassfish4/bin/asadmin deploy dataverse-jacoco.war
+  /usr/local/payara6/bin/asadmin deploy dataverse-jacoco.war
 
-Note that after deployment the file "/usr/local/glassfish4/glassfish/domains/domain1/config/jacoco.exec" exists and is empty.
+Note that after deployment the file "/usr/local/payara6/glassfish/domains/domain1/config/jacoco.exec" exists and is empty.
 
-Run Integration Tests
-~~~~~~~~~~~~~~~~~~~~~
+Run API Tests to Determine Code Coverage
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Note that even though you see "docker-aio" in the command below, we assume you are not necessarily running the test suite within Docker. (Some day we'll probably move this script to another directory.) For this reason, we pass the URL with the normal port (8080) that Glassfish runs on to the ``run-test-suite.sh`` script.
+Note that if you are looking for how to run API tests generally, you should refer to :ref:`integration-tests`.
 
-Note that "/usr/local/glassfish4/glassfish/domains/domain1/config/jacoco.exec" will become non-empty after you stop and start Glassfish. You must stop and start Glassfish before every run of the integration test suite.
+Note that "/usr/local/payara6/glassfish/domains/domain1/config/jacoco.exec" will become non-empty after you stop and start Payara. You must stop and start Payara before every run of the integration test suite.
 
 .. code-block:: bash
 
-  /usr/local/glassfish4/bin/asadmin stop-domain
-  /usr/local/glassfish4/bin/asadmin start-domain
+  /usr/local/payara6/bin/asadmin stop-domain
+  /usr/local/payara6/bin/asadmin start-domain
   git clone https://github.com/IQSS/dataverse.git
   cd dataverse
-  conf/docker-aio/run-test-suite.sh http://localhost:8080
+  TESTS=$(<tests/integration-tests.txt)
+  mvn test -Dtest=$TESTS
 
 (As an aside, you are not limited to API tests for the purposes of learning which code paths are being executed. You could click around the GUI, for example. Jacoco doesn't know or care how you exercise the application.)
 
 Create Code Coverage Report
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Run these commands as the "glassfish" user. The ``cd dataverse`` means that you should change to the directory where you cloned the "dataverse" git repo.
+Run these commands as the "dataverse" user. The ``cd dataverse`` means that you should change to the directory where you cloned the "dataverse" git repo.
 
 .. code-block:: bash
 
   cd dataverse
-  java -jar /home/glassfish/local/jacoco-0.8.1/lib/jacococli.jar report --classfiles target/classes --sourcefiles src/main/java --html target/coverage-it/ /usr/local/glassfish4/glassfish/domains/domain1/config/jacoco.exec
+  java -jar /home/dataverse/local/jacoco-0.8.1/lib/jacococli.jar report --classfiles target/classes --sourcefiles src/main/java --html target/coverage-it/ /usr/local/payara6/glassfish/domains/domain1/config/jacoco.exec
 
 Read Code Coverage Report
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -281,6 +430,10 @@ target/coverage-it/index.html is the place to start reading the code coverage re
 Load/Performance Testing
 ------------------------
 
+See also :doc:`/qa/performance-tests` in the QA Guide.
+
+.. _locust:
+
 Locust
 ~~~~~~
 
@@ -298,19 +451,19 @@ The script requires a file called ``files.txt`` to operate and database IDs for
 Continuous Integration
 ----------------------
 
-The Dataverse Project currently makes use of two Continuous Integration platforms, Travis and Jenkins.
-
-Travis builds are configured via :download:`.travis.yml <../../../../.travis.yml>` and a `GitHub webhook <https://docs.travis-ci.com/user/notifications/#configuring-webhook-notifications>`; build output is viewable at https://travis-ci.org/IQSS/dataverse/builds
+The Dataverse Project currently makes use of two Continuous Integration platforms, Jenkins and GitHub Actions.
 
 Our Jenkins config is a work in progress and may be viewed at https://github.com/IQSS/dataverse-jenkins/ A corresponding GitHub webhook is required. Build output is viewable at https://jenkins.dataverse.org/
 
+GitHub Actions jobs can be found in ``.github/workflows``.
+
 As always, pull requests to improve our continuous integration configurations are welcome.
 
 Enhance build time by caching dependencies
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In the future, CI builds in ephemeral build environments and Docker builds can benefit from caching all dependencies and plugins.
-As Dataverse is a huge project, build times can be enhanced by avoiding re-downloading everything when the Maven POM is unchanged.
+As the Dataverse Project is a huge project, build times can be enhanced by avoiding re-downloading everything when the Maven POM is unchanged.
 To seed the cache, use the following Maven goal before using Maven in (optional) offline mode in your scripts:
 
 .. code:: shell
@@ -324,41 +477,15 @@ reduced anyway.
 
 You will obviously have to utilize caching functionality of your CI service or do proper Docker layering.
 
-The Phoenix Server
-~~~~~~~~~~~~~~~~~~
-
-How the Phoenix Tests Work
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-A server at http://phoenix.dataverse.org has been set up to test the latest code from the develop branch. Testing is done using chained builds of Jenkins jobs:
-
-- A war file is built from the latest code in develop: https://build.hmdc.harvard.edu:8443/job/phoenix.dataverse.org-build-develop/
-- The resulting war file is depoyed to the Phoenix server: https://build.hmdc.harvard.edu:8443/job/phoenix.dataverse.org-deploy-develop/
-- REST Assured Tests are run across the wire from the Jenkins server to the Phoenix server:  https://build.hmdc.harvard.edu:8443/job/phoenix.dataverse.org-apitest-develop/
-
-How to Run the Phoenix Tests
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-- Take a quick look at http://phoenix.dataverse.org to make sure the server is up and running Dataverse. If it's down, fix it.
-- Log into Jenkins and click "Build Now" at https://build.hmdc.harvard.edu:8443/job/phoenix.dataverse.org-build-develop/
-- Wait for all three chained Jenkins jobs to complete and note if they passed or failed. If you see a failure, open a GitHub issue or at least get the attention of some developers.
-
-List of Tests Run Against the Phoenix Server
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-We haven't thought much about a good way to publicly list the "IT" classes that are executed against the phoenix server. (Currently your best bet is to look at the ``Executing Maven`` line at the top of the "Full Log" of "Console Output" of ``phoenix.dataverse.org-apitest-develop`` Jenkins job mentioned above.) We endeavor to keep the list of tests in the "all-in-one" Docker environment described above in sync with the list of tests configured in Jenkins. That is to say, refer to :download:`run-test-suite.sh <../../../../conf/docker-aio/run-test-suite.sh>` mentioned in ``conf/docker-aio/readme.txt`` for the current list of IT tests that are expected to pass. Here's a dump of that file:
-
-.. literalinclude:: ../../../../conf/docker-aio/run-test-suite.sh
-
 Accessibility Testing
 ---------------------
 
 Accessibility Policy
 ~~~~~~~~~~~~~~~~~~~~
 
-Dataverse aims to improve the user experience for those with disabilities, and are in the process of following the recommendations of the `Harvard University Digital Accessibility Policy <https://accessibility.huit.harvard.edu/digital-accessibility-policy>`__,  which use the Worldwide Web Consortium’s Web Content Accessibility Guidelines version 2.1, Level AA Conformance (WCAG 2.1 Level AA) as the standard.
+The Dataverse Project aims to improve the user experience for those with disabilities, and are in the process of following the recommendations of the `Harvard University Digital Accessibility Policy <https://accessibility.huit.harvard.edu/digital-accessibility-policy>`__,  which use the Worldwide Web Consortium’s Web Content Accessibility Guidelines version 2.1, Level AA Conformance (WCAG 2.1 Level AA) as the standard.
 
-To report an accessibility issue with Dataverse, you can create a new issue in our GitHub repo at: https://github.com/IQSS/dataverse/issues/
+To report an accessibility issue with the Dataverse Software, you can create a new issue in our GitHub repo at: https://github.com/IQSS/dataverse/issues/
 
 Accessibility Tools
 ~~~~~~~~~~~~~~~~~~~
@@ -372,14 +499,14 @@ There are browser developer tools such as the `Wave toolbar <https://wave.webaim
 Future Work
 -----------
 
-We'd like to make improvements to our automated testing. See also 'this thread from our mailing list <https://groups.google.com/forum/#!topic/dataverse-community/X8OrRWbPimA>'_ asking for ideas from the community, and discussion at 'this GitHub issue. <https://github.com/IQSS/dataverse/issues/2746>'_ 
+We'd like to make improvements to our automated testing. See also 'this thread from our mailing list <https://groups.google.com/forum/#!topic/dataverse-community/X8OrRWbPimA>'_ asking for ideas from the community, and discussion at 'this GitHub issue. <https://github.com/IQSS/dataverse/issues/2746>'_
 
 Future Work on Unit Tests
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 - Review pull requests from @bencomp for ideas for approaches to testing: https://github.com/IQSS/dataverse/pulls?q=is%3Apr+author%3Abencomp
 - Come up with a way to test commands: http://irclog.iq.harvard.edu/dataverse/2015-11-04#i_26750
-- Test EJBs using Arquillian, embedded Glassfish, or similar. @bmckinney kicked the tires on Arquillian at https://github.com/bmckinney/bio-dataverse/commit/2f243b1db1ca704a42cd0a5de329083763b7c37a
+- Test EJBs using Arquillian, embedded app servers, or similar. @bmckinney kicked the tires on Arquillian at https://github.com/bmckinney/bio-dataverse/commit/2f243b1db1ca704a42cd0a5de329083763b7c37a
 
 Future Work on Integration Tests
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -387,8 +514,7 @@ Future Work on Integration Tests
 - Automate testing of dataverse-client-python: https://github.com/IQSS/dataverse-client-python/issues/10
 - Work with @leeper on testing the R client: https://github.com/IQSS/dataverse-client-r
 - Review and attempt to implement "API Test Checklist" from @kcondon at https://docs.google.com/document/d/199Oq1YwQ4pYCguaeW48bIN28QAitSk63NbPYxJHCCAE/edit?usp=sharing
-- Attempt to use @openscholar approach for running integration tests using Travis https://github.com/openscholar/openscholar/blob/SCHOLAR-3.x/.travis.yml (probably requires using Ubuntu rather than CentOS)
-- Generate code coverage reports for **integration** tests: https://github.com/pkainulainen/maven-examples/issues/3 and http://www.petrikainulainen.net/programming/maven/creating-code-coverage-reports-for-unit-and-integration-tests-with-the-jacoco-maven-plugin/
+- Generate code coverage reports for **integration** tests: https://github.com/pkainulainen/maven-examples/issues/3 and https://www.petrikainulainen.net/programming/maven/creating-code-coverage-reports-for-unit-and-integration-tests-with-the-jacoco-maven-plugin/
 - Consistent logging of API Tests. Show test name at the beginning and end and status codes returned.
 - expected passing and known/expected failing integration tests: https://github.com/IQSS/dataverse/issues/4438
 
@@ -400,22 +526,16 @@ Browser-Based Testing
 Installation Testing
 ~~~~~~~~~~~~~~~~~~~~
 
-- Run `vagrant up` on a server to test the installer: http://guides.dataverse.org/en/latest/developers/tools.html#vagrant . We haven't been able to get this working in Travis: https://travis-ci.org/IQSS/dataverse/builds/96292683 . Perhaps it would be possible to use AWS as a provider from Vagrant judging from https://circleci.com/gh/critical-alert/circleci-vagrant/6 .
-- Work with @lwo to automate testing of https://github.com/IQSS/dataverse-puppet . Consider using Travis: https://github.com/IQSS/dataverse-puppet/issues/10
-- Work with @donsizemore to automate testing of https://github.com/IQSS/dataverse-ansible with Travis or similar.
+- Work with @donsizemore to automate testing of https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible
 
 Future Work on Load/Performance Testing
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 - Clean up and copy stress tests code, config, and docs into main repo from https://github.com/IQSS/dataverse-helper-scripts/tree/master/src/stress_tests
-- Marcel Duran created a command-line wrapper for the WebPagetest API that can be used to test performance in your continuous integration pipeline (TAP, Jenkins, Travis-CI, etc): https://github.com/marcelduran/webpagetest-api/wiki/Test-Specs#jenkins-integration
+- Marcel Duran created a command-line wrapper for the WebPagetest API that can be used to test performance in your continuous integration pipeline (TAP, Jenkins, etc.): https://github.com/marcelduran/webpagetest-api/wiki/Test-Specs#jenkins-integration
 - Create top-down checklist, building off the "API Test Coverage" spreadsheet at https://github.com/IQSS/dataverse/issues/3358#issuecomment-256400776
 
 Future Work on Accessibility Testing
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- Using https://github.com/IQSS/dataverse-ansible and hooks available from accessibily testing tools, automate the running of accessibility tools on PRs so that developers will receive quicker feedback on proposed code changes that reduce the accessibility of the application. 
-
-----
-
-Previous: :doc:`sql-upgrade-scripts` | Next: :doc:`documentation`
+- Using https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible and hooks available from accessibility testing tools, automate the running of accessibility tools on PRs so that developers will receive quicker feedback on proposed code changes that reduce the accessibility of the application.
diff --git a/doc/sphinx-guides/source/developers/tips.rst b/doc/sphinx-guides/source/developers/tips.rst
index 9084f3d1993..9295f3a8d12 100755
--- a/doc/sphinx-guides/source/developers/tips.rst
+++ b/doc/sphinx-guides/source/developers/tips.rst
@@ -2,7 +2,7 @@
 Tips
 ====
 
-If you just followed the steps in :doc:`dev-environment` for the first time, you will need to get set up to deploy code to Glassfish. Below you'll find other tips as well.
+If you just followed the steps in :doc:`classic-dev-env` for the first time, you will need to get set up to deploy code to your app server. Below you'll find other tips as well.
 
 .. contents:: |toctitle|
 	:local:
@@ -10,40 +10,38 @@ If you just followed the steps in :doc:`dev-environment` for the first time, you
 Iterating on Code and Redeploying
 ---------------------------------
 
-When you followed the steps in the :doc:`dev-environment` section, the war file was deployed to Glassfish by the ``install`` script. That's fine but once you're ready to make a change to the code you will need to get comfortable with undeploying and redeploying code (a war file) to Glassfish.
+When you followed the steps in the :doc:`classic-dev-env` section, the war file was deployed to Payara by the Dataverse Software installation script. That's fine but once you're ready to make a change to the code you will need to get comfortable with undeploying and redeploying code (a war file) to Payara.
 
-It's certainly possible to manage deployment and undeployment of the war file via the command line using the ``asadmin`` command that ships with Glassfish (that's what the ``install`` script uses and the steps are documented below), but we recommend getting set up with and IDE such as Netbeans to manage deployment for you.
+It's certainly possible to manage deployment and undeployment of the war file via the command line using the ``asadmin`` command that ships with Payara (that's what the Dataverse Software installation script uses and the steps are documented below), but we recommend getting set up with an IDE such as Netbeans to manage deployment for you.
 
-Undeploy the war File from the ``install`` Script
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Undeploy the war File from the Dataverse Software Installation Script
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Because the initial deployment of the war file was done outside of Netbeans by the ``install`` script, it's a good idea to undeploy that war file to give Netbeans a clean slate to work with.
+Because the initial deployment of the war file was done outside of Netbeans by the Dataverse Software installation script, it's a good idea to undeploy that war file to give Netbeans a clean slate to work with.
 
-Assuming you installed Glassfish in ``/usr/local/glassfish4``, run the following ``asadmin`` command to see the version of Dataverse that the ``install`` script deployed:
+Assuming you installed Payara in ``/usr/local/payara6``, run the following ``asadmin`` command to see the version of the Dataverse Software that the Dataverse Software installation script deployed:
 
-``/usr/local/glassfish4/bin/asadmin list-applications``
+``/usr/local/payara6/bin/asadmin list-applications``
 
-You will probably see something like ``dataverse-4.8.5  <ejb, web>`` as the output. To undeploy, use whichever version you see like this:
+You will probably see something like ``dataverse-5.0 <ejb, web>`` as the output. To undeploy, use whichever version you see like this:
 
-``/usr/local/glassfish4/bin/asadmin undeploy dataverse-4.8.5``
+``/usr/local/payara6/bin/asadmin undeploy dataverse-5.0``
 
-Now that Glassfish doesn't have anything deployed, we can proceed with getting Netbeans set up to deploy the code.
+Now that Payara doesn't have anything deployed, we can proceed with getting Netbeans set up to deploy the code.
 
-Add Glassfish 4.1 as a Server in Netbeans
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Add Payara as a Server in Netbeans
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Dataverse only works with a specific version of Glassfish (see https://github.com/IQSS/dataverse/issues/2628 ) so you need to make sure Netbeans is deploying to that version rather than a newer version of Glassfish that may have come bundled with Netbeans.
+Launch Netbeans and click "Tools" and then "Servers". Click "Add Server" and select "Payara Server" and set the installation location to ``/usr/local/payara6``. The defaults are fine so you can click "Next" and "Finish".
 
-Launch Netbeans and click "Tools" and then "Servers". Click "Add Server" and select "Glassfish Server" and set the installation location to ``/usr/local/glassfish4``. The default are fine so you can click "Next" and "Finish". If you are running Netbeans 8.2 and there is already a bundled version of Glassfish, you should probably remove it because (again) you need a specific version of Glassfish (4.1 as of this writing).
+Please note that if you are on a Mac, Netbeans may be unable to start Payara due to proxy settings in Netbeans. Go to the "General" tab in Netbeans preferences and click "Test connection" to see if you are affected. If you get a green checkmark, you're all set. If you get a red exclamation mark, change "Proxy Settings" to "No Proxy" and retest. A more complicated answer having to do with changing network settings is available at https://discussions.apple.com/thread/7680039?answerId=30715103022#30715103022 and the bug is also described at https://netbeans.org/bugzilla/show_bug.cgi?id=268076
 
-Please note that if you are on a Mac, Netbeans may be unable to start Glassfish due to proxy settings in Netbeans. Go to the "General" tab in Netbeans preferences and click "Test connection" to see if you are affected. If you get a green checkmark, you're all set. If you get a red exclamation mark, change "Proxy Settings" to "No Proxy" and retest. A more complicated answer having to do with changing network settings is available at https://discussions.apple.com/thread/7680039?answerId=30715103022#30715103022 and the bug is also described at https://netbeans.org/bugzilla/show_bug.cgi?id=268076
+At this point you can manage Payara using Netbeans. Click "Window" and then "Services". Expand "Servers" and right-click Payara to stop and then start it so that it appears in the Output window. Note that you can expand "Payara" and "Applications" to see if any applications are deployed.
 
-At this point you can manage Glassfish using Netbeans. Click "Window" and then "Services". Expand "Servers" and right-click Glassfish to stop and then start it so that it appears in the Output window. Note that you can expand "Glassfish" and "Applications" to see if any applications are deployed.
+Ensure that the Dataverse Software Will Be Deployed to Payara
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Ensure that Dataverse Will Be Deployed to Glassfish 4.1
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Click "Window" and then "Projects". Click "File" and then "Project Properties (dataverse)". Click "Run" and change "Server" from "No Server Selected" to your installation of Glassfish 4.1. Click OK.
+Click "Window" and then "Projects". Click "File" and then "Project Properties (dataverse)". Click "Run" and change "Server" from "No Server Selected" to your installation of Payara. Click OK.
 
 .. _custom_build_num_script:
 
@@ -60,6 +58,8 @@ From the root of the git repo, run the following command to set the build number
 
 This should update or place a file at ``src/main/java/BuildNumber.properties``.
 
+(See also :ref:`auto-custom-build-number` for other ways of changing the build number.)
+
 Then, from Netbeans, click "Run" and then "Clean and Build Project (dataverse)". After this completes successfully, click "Run" and then "Run Project (dataverse)"
 
 Confirm the Change Was Deployed
@@ -80,61 +80,135 @@ Netbeans Connector Chrome Extension
 
 For faster iteration while working on JSF pages, it is highly recommended that you install the Netbeans Connector Chrome Extension listed in the :doc:`tools` section. When you save XHTML or CSS files, you will see the changes immediately. Hipsters call this "hot reloading". :)
 
+Thumbnails
+----------
+
+In order for thumnails to be generated for PDFs, you need to install ImageMagick and configure Dataverse to use the ``convert`` binary.
+
+Assuming you're using Homebrew:
+
+``brew install imagemagick``
+
+Then configure the JVM option mentioned in :ref:`install-imagemagick` to the path to ``convert`` which for Homebrew is usually ``/usr/local/bin/convert``.
+
 Database Schema Exploration
 ---------------------------
 
-With over 100 tables, the Dataverse PostgreSQL database ("dvndb") can be somewhat daunting for newcomers. Here are some tips for coming up to speed. (See also the :doc:`sql-upgrade-scripts` section.)
+With over 100 tables, the Dataverse PostgreSQL database can be somewhat daunting for newcomers. Here are some tips for coming up to speed. (See also the :doc:`sql-upgrade-scripts` section.)
+
+.. _db-name-creds:
+
+Database Name and Credentials
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The default database name and credentials depends on how you set up your dev environment.
+
+.. list-table::
+   :header-rows: 1
+   :align: left
+
+   * - MPCONFIG Key
+     - Docker
+     - Classic
+   * - dataverse.db.name
+     - ``dataverse``
+     - ``dvndb``
+   * - dataverse.db.user
+     - ``dataverse``
+     - ``dvnapp``
+   * - dataverse.db.password
+     - ``secret``
+     - ``secret``
+
+Here's an example of using these credentials from within the PostgreSQL container (see :doc:`/container/index`):
+
+.. code-block:: bash
+
+    pdurbin@beamish dataverse % docker exec -it postgres-1 bash
+    root@postgres:/# export PGPASSWORD=secret
+    root@postgres:/# psql -h localhost -U dataverse dataverse
+    psql (16.3 (Debian 16.3-1.pgdg120+1))
+    Type "help" for help.
+    
+    dataverse=# select id,alias from dataverse limit 1;
+     id | alias 
+    ----+-------
+      1 | root
+    (1 row)
+
+See also :ref:`database-persistence` in the Installation Guide.
 
 pgAdmin
-~~~~~~~~
+~~~~~~~
+
+If you followed the :doc:`classic-dev-env` section, we had you install pgAdmin, which can help you explore the tables and execute SQL commands. It's also listed in the :doc:`tools` section.
 
-Back in the :doc:`dev-environment` section, we had you install pgAdmin, which can help you explore the tables and execute SQL commands. It's also listed in the :doc:`tools` section.
+.. _schemaspy:
 
 SchemaSpy
 ~~~~~~~~~
 
 SchemaSpy is a tool that creates a website of entity-relationship diagrams based on your database.
 
-As part of our build process for running integration tests against the latest code in the "develop" branch, we drop the database on the "phoenix" server, recreate the database by deploying the latest war file, and run SchemaSpy to create the following site: http://phoenix.dataverse.org/schemaspy/latest/relationships.html
+As part of our release process (:ref:`update-schemaspy`), we run SchemaSpy and publish the output at https://guides.dataverse.org/en/latest/schemaspy/index.html and (for example) https://guides.dataverse.org/en/6.6/schemaspy/index.html
 
-To run this command on your laptop, download SchemaSpy and take a look at the syntax in ``scripts/deploy/phoenix.dataverse.org/post``
+To run SchemaSpy locally, you can try something like this (after downloading the jars from https://github.com/schemaspy/schemaspy/releases and https://jdbc.postgresql.org/download/):
 
-To read more about the phoenix server, see the :doc:`testing` section.
+``java -jar /tmp/schemaspy-6.2.4.jar -t pgsql -host localhost -db dvndb -u postgres -p secret -s public -dp /tmp/postgresql-42.7.5.jar -o /tmp/latest``
+
+See also :ref:`db-name-creds`.
 
 Deploying With ``asadmin``
 --------------------------
 
 Sometimes you want to deploy code without using Netbeans or from the command line on a server you have ssh'ed into.
 
-For the ``asadmin`` commands below, we assume you have already changed directories to ``/usr/local/glassfish4/glassfish/bin`` or wherever you have installed Glassfish.
+For the ``asadmin`` commands below, we assume you have already changed directories to ``/usr/local/payara6/glassfish/bin`` or wherever you have installed Payara.
 
 There are four steps to this process:
 
 1. Build the war file: ``mvn package``
-2. Check which version of Dataverse is deployed: ``./asadmin list-applications``
-3. Undeploy the Dataverse application (if necessary): ``./asadmin undeploy dataverse-VERSION``
+2. Check which version of the Dataverse Software is deployed: ``./asadmin list-applications``
+3. Undeploy the Dataverse Software (if necessary): ``./asadmin undeploy dataverse-VERSION``
 4. Copy the war file to the server (if necessary)
 5. Deploy the new code: ``./asadmin deploy /path/to/dataverse-VERSION.war``
 
-Running the Dataverse ``install`` Script in Non-Interactive Mode
-----------------------------------------------------------------
+Running the Dataverse Software Installation Script in Non-Interactive Mode
+--------------------------------------------------------------------------
 
 Rather than running the installer in "interactive" mode, it's possible to put the values in a file. See "non-interactive mode" in the :doc:`/installation/installation-main` section of the Installation Guide.
 
-Preventing Glassfish from Phoning Home
---------------------------------------
+Preventing Payara from Phoning Home
+-----------------------------------
 
-By default, Glassfish reports analytics information. The administration guide suggests this can be disabled with ``./asadmin create-jvm-options -Dcom.sun.enterprise.tools.admingui.NO_NETWORK=true``, should this be found to be undesirable for development purposes.
+By default, Glassfish reports analytics information. The administration guide suggests this can be disabled with ``./asadmin create-jvm-options -Dcom.sun.enterprise.tools.admingui.NO_NETWORK=true``, should this be found to be undesirable for development purposes. It is unknown if Payara phones home or not.
 
 Solr
 ----
 
 .. TODO: This section should be moved into a dedicated guide about Solr for developers. It should be extended with
-         information about the way Solr is used within Dataverse, ideally explaining concepts and links to upstream docs.
+         information about the way Solr is used within the Dataverse Software, ideally explaining concepts and links to upstream docs.
+
+Once some Dataverse collections, datasets, and files have been created and indexed, you can experiment with searches directly from Solr at http://localhost:8983/solr/#/collection1/query and look at the JSON output of searches, such as this wildcard search: http://localhost:8983/solr/collection1/select?q=*%3A*&wt=json&indent=true . You can also get JSON output of static fields Solr knows about: http://localhost:8983/solr/collection1/schema/fields
+
+You can simply double-click "start.jar" rather than running ``java -jar start.jar`` from the command line. Figuring out how to stop Solr after double-clicking it is an exercise for the reader.
+
+.. _update-solr-schema-dev:
+
+Updating the Solr Schema (Developers)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Both developers and sysadmins need to update the Solr schema from time to time. One difference is that developers will be committing changes to ``conf/solr/schema.xml`` in git. To prevent cross-platform differences in the git history, when running the ``update-fields.sh`` script, we ask all developers to run the script from within Docker. (See :doc:`/container/configbaker-image` for more on the image we'll use below.)
+
+.. code-block::
+
+    curl http://localhost:8080/api/admin/index/solr/schema | docker run -i --rm -v ./docker-dev-volumes/solr/data:/var/solr gdcc/configbaker:unstable update-fields.sh /var/solr/data/collection1/conf/schema.xml
 
-Once some dataverses, datasets, and files have been created and indexed, you can experiment with searches directly from Solr at http://localhost:8983/solr/#/collection1/query and look at the JSON output of searches, such as this wildcard search: http://localhost:8983/solr/collection1/select?q=*%3A*&wt=json&indent=true . You can also get JSON output of static fields Solr knows about: http://localhost:8983/solr/collection1/schema/fields
+    cp docker-dev-volumes/solr/data/data/collection1/conf/schema.xml conf/solr/schema.xml
 
-You can simply double-click "start.jar" rather that running ``java -jar start.jar`` from the command line. Figuring out how to stop Solr after double-clicking it is an exercise for the reader.
+At this point you can do a ``git diff`` and see if your changes make sense before committing.
+
+Sysadmins are welcome to run ``update-fields.sh`` however they like. See :ref:`update-solr-schema` in the Admin Guide and :ref:`additional-metadata-blocks` in the Container Guide for details.
 
 Git
 ---
@@ -155,6 +229,8 @@ Git on Mac
 
 On a Mac, you won't have git installed unless you have "Command Line Developer Tools" installed but running ``git clone`` for the first time will prompt you to install them.
 
+.. _auto-custom-build-number:
+
 Automation of Custom Build Number on Webpage
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -164,14 +240,75 @@ commit id in your test deployment webpages on the bottom right corner next to th
 
 When you prefer manual updates, there is another script, see above: :ref:`custom_build_num_script`.
 
+An alternative to that is using *MicroProfile Config* and set the option ``dataverse.build`` via a system property,
+environment variable (``DATAVERSE_BUILD``) or `one of the other config sources
+<https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Overview.html#config-sources>`__.
+
+You could even override the version itself with the option ``dataverse.version`` in the same way, which is usually
+picked up from a build time source.
+
+See also discussion of version numbers in :ref:`run-build-create-war`.
+
 Sample Data
 -----------
 
-You may want to populate your **non-production** installation(s) of Dataverse with sample data. You have a couple options:
+You may want to populate your **non-production** Dataverse installations with sample data.
 
-- Code in https://github.com/IQSS/dataverse-sample-data (recommended). This set of sample data includes several common data types, data subsetted from production datasets in dataverse.harvard.edu, datasets with file hierarchy, and more.
-- Scripts called from ``scripts/deploy/phoenix.dataverse.org/post``.
+https://github.com/IQSS/dataverse-sample-data includes several common data types, data subsetted from production datasets in dataverse.harvard.edu, datasets with file hierarchy, and more.
 
-----
+Switching from Glassfish to Payara
+----------------------------------
+
+If you already have a working dev environment with Glassfish and want to switch to Payara, you must do the following:
+
+- Copy the "domain1" directory from Glassfish to Payara.
+
+UI Pages Development
+--------------------
+
+While most of the information in this guide focuses on service and backing beans ("the back end") development in Java, working on JSF/Primefaces xhtml pages presents its own unique challenges. 
+
+.. _avoid-efficiency-issues-with-render-logic-expressions:
+
+Avoiding Inefficiencies in JSF Render Logic
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+It is important to keep in mind that the expressions in JSF ``rendered=`` attributes may be evaluated **multiple** times. So it is crucial not to use any expressions that require database lookups, or otherwise take any appreciable amount of time and resources. Render attributes should exclusively contain calls to methods in backing beans or caching service wrappers that perform any real work on the first call only, then keep returning the cached result on all the consecutive calls. This way it is irrelevant how many times PrimeFaces may need to call the method as any effect on the performance will be negligible.
+
+If you are ever in doubt as to how many times the method in your render logic expression is called, you can simply add a logging statement to the method in question. Or you can simply err on the side of assuming that it's going to be called a lot, and ensure that any repeated calls are not expensive to process.
+
+A simplest, trivial example would be a direct call to a method in SystemConfig service bean. For example, 
+
+``<h:outputText rendered="#{systemConfig.advancedModeEnabled}" ...``
+
+If this method (``public boolean isAdvancedModeEnabled()`` in ``SystemConfig.java``) consults a database setting every time it is called, this database query will be repeated every time JSF reevaluates the expression above. A lookup of a single database setting is not very expensive of course, but repeated enough times unnecessary queries do add up, especially on a busy server. So instead of SystemConfig, SettingsWrapper (a ViewScope bean) should be used to cache the result on the first call:
+
+``<h:outputText rendered="#{settingsWrapper.advancedModeEnabled}" ...``
+
+with the following code in ``SettingsWrapper.java``:
+
+.. code:: java
+	  
+	  private Boolean  advancedModeEnabled = null; 
+	  
+	  public boolean isAdvancedModeEnabled() {
+	     if (advancedModeEnabled == null) {
+                advancedModeEnabled = systemConfig.isAdvancedModeEnabled();
+             }
+             return advancedModeEnabled; 
+          }
+
+A more serious example would be direct calls to PermissionServiceBean methods used in render logic expressions. This is something that has happened and caused some problems in real life. A simple permission service lookup (for example, whether a user is authorized to create a dataset in the current dataverse) can easily take 15 database queries. Repeated multiple times, this can quickly become a measurable delay in rendering the page. PermissionsWrapper must be used exclusively for any such lookups from JSF pages.
+
+See also :doc:`performance`.
+
+JSF1103 Errors
+~~~~~~~~~~~~~~
+
+Errors of the form ``JSF1103: The metadata facet must be a direct child of the view in viewId /dataverse.xhtml`` come from use of the f:metadata tag at the wrong depth in the .xhtml.
+
+Most/all known instances of the problem were corrected in https://github.com/IQSS/dataverse/pull/11128.
 
-Previous: :doc:`dev-environment` | Next: :doc:`troubleshooting`
+Any page that used <ui:composition template="/dataverse_template.xhtml"> was including the f:metadata farther down in the tree rather than as a direct child of the view.
+As of Payara 6.2025.2, it is not clear that this error was resulting in changes to UI behavior, but the error messages were in the log.
+If you see these errors, this note and the examples in the PR will hopefully provide some insight as to how to fix them.
diff --git a/doc/sphinx-guides/source/developers/tools.rst b/doc/sphinx-guides/source/developers/tools.rst
index 767a4a91694..b0ade669d52 100755
--- a/doc/sphinx-guides/source/developers/tools.rst
+++ b/doc/sphinx-guides/source/developers/tools.rst
@@ -2,11 +2,16 @@
 Tools
 =====
 
-These are handy tools for your :doc:`/developers/dev-environment/`.
+These are handy tools for your :doc:`dev-environment`.
 
 .. contents:: |toctitle|
 	:local:
 
+Tools for Faster Deployment
++++++++++++++++++++++++++++
+
+See :ref:`ide-trigger-code-deploy` in the Container Guide.
+
 Netbeans Connector Chrome Extension
 +++++++++++++++++++++++++++++++++++
 
@@ -18,43 +23,30 @@ Unfortunately, while the Netbeans Connector Chrome Extension used to "just work"
 pgAdmin
 +++++++
 
-You probably installed pgAdmin when following the steps in the :doc:`dev-environment` section but if not, you can download it from https://www.pgadmin.org
+You may have installed pgAdmin when following the steps in the :doc:`classic-dev-env` section but if not, you can download it from https://www.pgadmin.org
 
 Maven
 +++++
 
 With Maven installed you can run ``mvn package`` and ``mvn test`` from the command line. It can be downloaded from https://maven.apache.org
 
-Vagrant
-+++++++
-
-Vagrant allows you to spin up a virtual machine running Dataverse on your development workstation. You'll need to install Vagrant from https://www.vagrantup.com and VirtualBox from https://www.virtualbox.org.
-
-We assume you have already cloned the repo from https://github.com/IQSS/dataverse as explained in the :doc:`/developers/dev-environment` section.
-
-From the root of the git repo (where the ``Vagrantfile`` is), run ``vagrant up`` and eventually you should be able to reach an installation of Dataverse at http://localhost:8888 (the ``forwarded_port`` indicated in the ``Vagrantfile``).
-
-Please note that running ``vagrant up`` for the first time should run the ``downloads/download.sh`` script for you to download required software such as Glassfish and Solr and any patches. However, these dependencies change over time so it's a place to look if ``vagrant up`` was working but later fails.
-
-On Windows if you see an error like ``/usr/bin/perl^M: bad interpreter`` you might need to run ``dos2unix`` on the installation scripts. 
-
 PlantUML
 ++++++++
 
-PlantUML is used to create diagrams in the guides and other places. Download it from http://plantuml.com and check out an example script at https://github.com/IQSS/dataverse/blob/v4.6.1/doc/Architecture/components.sh . Note that for this script to work, you'll need the ``dot`` program, which can be installed on Mac with ``brew install graphviz``.
+PlantUML is used to create diagrams in the guides and other places. Download it from https://plantuml.com and check out an example script at https://github.com/IQSS/dataverse/blob/v4.6.1/doc/Architecture/components.sh . Note that for this script to work, you'll need the ``dot`` program, which can be installed on Mac with ``brew install graphviz``.
 
 Eclipse Memory Analyzer Tool (MAT)
 ++++++++++++++++++++++++++++++++++
 
 The Memory Analyzer Tool (MAT) from Eclipse can help you analyze heap dumps, showing you "leak suspects" such as seen at https://github.com/payara/Payara/issues/350#issuecomment-115262625
 
-It can be downloaded from http://www.eclipse.org/mat
+It can be downloaded from https://www.eclipse.org/mat
 
-If the heap dump provided to you was created with ``gcore`` (such as with ``gcore -o /tmp/gf.core $glassfish_pid``) rather than ``jmap``, you will need to convert the file before you can open it in MAT. Using ``gf.core.13849`` as example of the original 33 GB file, here is how you could convert it into a 26 GB ``gf.core.13849.hprof`` file. Please note that this operation took almost 90 minutes:
+If the heap dump provided to you was created with ``gcore`` (such as with ``gcore -o /tmp/app.core $app_pid``) rather than ``jmap``, you will need to convert the file before you can open it in MAT. Using ``app.core.13849`` as example of the original 33 GB file, here is how you could convert it into a 26 GB ``app.core.13849.hprof`` file. Please note that this operation took almost 90 minutes:
 
-``/usr/java7/bin/jmap -dump:format=b,file=gf.core.13849.hprof /usr/java7/bin/java gf.core.13849``
+``/usr/java7/bin/jmap -dump:format=b,file=app.core.13849.hprof /usr/java7/bin/java app.core.13849``
 
-A file of this size may not "just work" in MAT. When you attempt to open it you may see something like "An internal error occurred during: "Parsing heap dump from '/tmp/heapdumps/gf.core.13849.hprof'". Java heap space". If so, you will need to increase the memory allocated to MAT. On Mac OS X, this can be done by editing ``MemoryAnalyzer.app/Contents/MacOS/MemoryAnalyzer.ini`` and increasing the value "-Xmx1024m" until it's high enough to open the file. See also http://wiki.eclipse.org/index.php/MemoryAnalyzer/FAQ#Out_of_Memory_Error_while_Running_the_Memory_Analyzer
+A file of this size may not "just work" in MAT. When you attempt to open it you may see something like "An internal error occurred during: "Parsing heap dump from '/tmp/heapdumps/app.core.13849.hprof'". Java heap space". If so, you will need to increase the memory allocated to MAT. On Mac OS X, this can be done by editing ``MemoryAnalyzer.app/Contents/MacOS/MemoryAnalyzer.ini`` and increasing the value "-Xmx1024m" until it's high enough to open the file. See also https://wiki.eclipse.org/index.php/MemoryAnalyzer/FAQ#Out_of_Memory_Error_while_Running_the_Memory_Analyzer
 
 PageKite
 ++++++++
@@ -69,9 +61,9 @@ Sign up at https://pagekite.net and follow the installation instructions or simp
 
 The first time you run ``./pagekite.py`` a file at ``~/.pagekite.rc`` will be
 created. You can edit this file to configure PageKite to serve up port 8080
-(the default GlassFish HTTP port) or the port of your choosing.
+(the default app server HTTP port) or the port of your choosing.
 
-According to https://pagekite.net/support/free-for-foss/ PageKite (very generously!) offers free accounts to developers writing software the meets http://opensource.org/docs/definition.php such as Dataverse.
+According to https://pagekite.net/support/free-for-foss/ PageKite (very generously!) offers free accounts to developers writing software the meets https://opensource.org/docs/definition.php such as the Dataverse Project.
 
 MSV
 +++
@@ -109,7 +101,7 @@ Download SonarQube from https://www.sonarqube.org and start look in the `bin` di
     -Dsonar.test.exclusions='src/test/**,src/main/webapp/resources/**' \
     -Dsonar.issuesReport.html.enable=true \
     -Dsonar.issuesReport.html.location='sonar-issues-report.html' \
-    -Dsonar.jacoco.reportPath=target/jacoco.exec
+    -Dsonar.jacoco.reportPath=target/coverage-reports/jacoco-unit.exec
 
 Once the analysis is complete, you should be able to access http://localhost:9000/dashboard?id=edu.harvard.iq%3Adataverse to see the report. To learn about resource leaks, for example, click on "Bugs", the "Tag", then "leak" or "Rule", then "Resources should be closed".
 
@@ -129,7 +121,7 @@ Look for "RESOURCE_LEAK", for example.
 lsof
 ++++
 
-If file descriptors are not closed, eventually the open but unused resources can cause problems with system (glassfish in particular) stability.
+If file descriptors are not closed, eventually the open but unused resources can cause problems with system (app servers in particular) stability.
 Static analysis and heap dumps are not always sufficient to identify the sources of these problems.
 For a quick sanity check, it can be helpful to check that the number of file descriptors does not increase after a request has finished processing.
 
@@ -145,6 +137,14 @@ For example...
 
 would be consistent with a file descriptor leak on the dataset page.
 
+JProfiler
++++++++++
+
+Tracking down resource drainage, bottlenecks etc gets easier using a profiler.
+
+We thank EJ Technologies for granting us a free open source project license for their Java profiler
+`JProfiler <https://www.ej-technologies.com/products/jprofiler/overview.html>`_.
+
 jmap and jstat
 ++++++++++++++
 
@@ -153,12 +153,12 @@ jmap allows you to look at the contents of the java heap. It can be used to crea
 
 .. code-block:: bash
 
-   $ jmap -histo <glassfish process id> 
+   $ jmap -histo <app process id> 
 
 will output a list of all classes, sorted by the number of instances of each individual class, with the size in bytes. 
 This can be very useful when looking for memory leaks in the application. Another useful tool is ``jstat``, that can be used in combination with ``jmap`` to monitor the effectiveness of garbage collection in reclaiming allocated memory. 
 
-In the example script below we stress running Dataverse applicatione with GET requests to a specific dataverse page, use ``jmap`` to see how many Dataverse, Dataset and DataFile class object get allocated, then run ``jstat`` to see how the numbers are affected by both "Young Generation" and "Full" garbage collection runs (``YGC`` and ``FGC`` respectively):
+In the example script below we stress running Dataverse Software applicatione with GET requests to a specific page in a Dataverse installation, use ``jmap`` to see how many Dataverse collection, Dataset and DataFile class object get allocated, then run ``jstat`` to see how the numbers are affected by both "Young Generation" and "Full" garbage collection runs (``YGC`` and ``FGC`` respectively):
 
 (This is script is provided **as an example only**! You will have to experiment and expand it to suit any specific needs and any specific problem you may be trying to diagnose, and this is just to give an idea of how to go about it)
 
@@ -166,12 +166,12 @@ In the example script below we stress running Dataverse applicatione with GET re
 
    #!/bin/sh
 
-   # the script takes the numeric id of the glassfish process as the command line argument:
+   # the script takes the numeric id of the app server process as the command line argument:
    id=$1 
 
    while :
    do  
-       # Access the dataverse xxx 10 times in a row: 
+       # Access the Dataverse collection xxx 10 times in a row: 
        for ((i = 0; i < 10; i++))
        do 
        	  # hide the output, standard and stderr:
@@ -184,7 +184,7 @@ In the example script below we stress running Dataverse applicatione with GET re
 
        jmap -histo $id > /tmp/jmap.histo.out
 
-       # grep the output for Dataverse, Dataset and DataFile classes: 
+       # grep the output for Dataverse Collection, Dataset and DataFile classes: 
        grep '\.Dataverse$' /tmp/jmap.histo.out
        grep '\.Dataset$' /tmp/jmap.histo.out
        grep '\.DataFile$' /tmp/jmap.histo.out
@@ -235,7 +235,7 @@ The script above will run until you stop it, and will output something like:
 
 How to analyze the output, what to look for: 
 
-First, look at the numbers in the jmap output. In the example above, you can immediately see, after the first three iterations, that every 10 dataverse page loads results in the increase of the number of Dataset classes by 160. I.e., each page load leaves 16 of these on the heap. We can also see that each of the 10 page load cycles increased the heap by roughly 3GB; that each cycle resulted in a couple of YG (young generation) garbage collections, and in the old generation allocation being almost 70% full. These numbers in the example are clearly quite high and are an indication of some problematic memory allocation by the dataverse page - if this is the result of something you have added to the page, you probably would want to investigate and fix it. However, overly generous memory use **is not the same as a leak** necessarily. What you want to see now is how much of this allocation can be reclaimed by "Full GC". If all of it gets freed by ``FGC``, it is not the end of the world (even though you do not want your system to spend too much time running ``FGC``; it costs CPU cycles, and actually freezes the application while it's in progress!). It is however a **really** serious problem, if you determine that a growing portion of the old. gen. memory (``"O"`` in the ``jmap`` output) is not getting freed, even by ``FGC``. This *is* a real leak now, i.e. something is leaving behind some objects that are still referenced and thus off limits to garbage collector. So look for the lines where the ``FGC`` counter is incremented. For example, the first ``FGC`` in the example output above: 
+First, look at the numbers in the jmap output. In the example above, you can immediately see, after the first three iterations, that every 10 Dataverse installation page loads results in the increase of the number of Dataset classes by 160. I.e., each page load leaves 16 of these on the heap. We can also see that each of the 10 page load cycles increased the heap by roughly 3GB; that each cycle resulted in a couple of YG (young generation) garbage collections, and in the old generation allocation being almost 70% full. These numbers in the example are clearly quite high and are an indication of some problematic memory allocation by the Dataverse installation page - if this is the result of something you have added to the page, you probably would want to investigate and fix it. However, overly generous memory use **is not the same as a leak** necessarily. What you want to see now is how much of this allocation can be reclaimed by "Full GC". If all of it gets freed by ``FGC``, it is not the end of the world (even though you do not want your system to spend too much time running ``FGC``; it costs CPU cycles, and actually freezes the application while it's in progress!). It is however a **really** serious problem, if you determine that a growing portion of the old. gen. memory (``"O"`` in the ``jmap`` output) is not getting freed, even by ``FGC``. This *is* a real leak now, i.e. something is leaving behind some objects that are still referenced and thus off limits to garbage collector. So look for the lines where the ``FGC`` counter is incremented. For example, the first ``FGC`` in the example output above: 
 
 .. code-block:: none
 
@@ -255,7 +255,7 @@ First, look at the numbers in the jmap output. In the example above, you can imm
 	0.00 100.00  71.95  20.12      ?     22   25.034     1    4.455   29.489
 	Wed Aug 14 23:21:40 EDT 2019
 
-We can see that the first ``FGC`` resulted in reducing the ``"O"`` by almost 7GB, from 15GB down to 8GB (from 88% to 20% full). The number of Dataset classes has not budged at all - it has grown by the same 160 objects as before (very suspicious!). To complicate matters, ``FGC`` does not **guarantee** to free everything that can be freed - it will balance how much the system needs memory vs. how much it is willing to spend in terms of CPU cycles performing GC (remember, the application freezes while ``FGC`` is running!). So you should not assume that the "20% full" number above means that you have 20% of your stack already wasted and unrecoverable. Instead, look for the next **minium** value of ``"O"``; then for the next, etc. Now compare these consecutive miniums. With the above test (this is an output of a real experiment, a particularly memory-hungry feature added to the dataverse page), the minimums sequence (of old. gen. usage, in %) was looking as follows: 
+We can see that the first ``FGC`` resulted in reducing the ``"O"`` by almost 7GB, from 15GB down to 8GB (from 88% to 20% full). The number of Dataset classes has not budged at all - it has grown by the same 160 objects as before (very suspicious!). To complicate matters, ``FGC`` does not **guarantee** to free everything that can be freed - it will balance how much the system needs memory vs. how much it is willing to spend in terms of CPU cycles performing GC (remember, the application freezes while ``FGC`` is running!). So you should not assume that the "20% full" number above means that you have 20% of your stack already wasted and unrecoverable. Instead, look for the next **minium** value of ``"O"``; then for the next, etc. Now compare these consecutive miniums. With the above test (this is an output of a real experiment, a particularly memory-hungry feature added to the Dataverse installation page), the minimums sequence (of old. gen. usage, in %) was looking as follows: 
 
 
 .. code-block:: none
@@ -274,10 +274,3 @@ We can see that the first ``FGC`` resulted in reducing the ``"O"`` by almost 7GB
    etc. ...
 
 It is clearly growing - so now we can conclude that indeed something there is using memory in a way that's not recoverable, and this is a clear problem. 
-
-       
-
-
-----
-
-Previous: :doc:`making-releases` | Next: :doc:`unf/index`
diff --git a/doc/sphinx-guides/source/developers/troubleshooting.rst b/doc/sphinx-guides/source/developers/troubleshooting.rst
index ec49b442016..2c437ca8b2e 100755
--- a/doc/sphinx-guides/source/developers/troubleshooting.rst
+++ b/doc/sphinx-guides/source/developers/troubleshooting.rst
@@ -2,7 +2,7 @@
 Troubleshooting
 ===============
 
-Over in the :doc:`dev-environment` section we described the "happy path" of when everything goes right as you set up your Dataverse development environment. Here are some common problems and solutions for when things go wrong.
+Over in the :doc:`classic-dev-env` section we described the "happy path" of when everything goes right as you set up your Dataverse Software development environment. Here are some common problems and solutions for when things go wrong.
 
 .. contents:: |toctitle|
 	:local:
@@ -14,7 +14,7 @@ For unknown reasons, Netbeans will sometimes change the following line under ``s
 
 ``<context-root>/</context-root>``
 
-Sometimes Netbeans will change ``/`` to ``/dataverse``. Sometimes it will delete the line entirely. Either way, you will see very strange behavior when attempting to click around Dataverse in a browser. The homepage will load but icons will be missing. Any other page will fail to load entirely and you'll see a Glassfish error.
+Sometimes Netbeans will change ``/`` to ``/dataverse``. Sometimes it will delete the line entirely. Either way, you will see very strange behavior when attempting to click around the Dataverse installation in a browser. The homepage will load but icons will be missing. Any other page will fail to load entirely and you'll see an app server error.
 
 The solution is to put the file back to how it was before Netbeans touched it. If anyone knows of an open Netbeans bug about this, please let us know.
 
@@ -35,13 +35,13 @@ You can check the current SMTP server with the ``asadmin`` command:
 
 ``./asadmin get server.resources.mail-resource.mail/notifyMailSession.host``
 
-This command helps verify what host your domain is using to send mail. Even if it's the correct hostname, you may still need to adjust settings. If all else fails, there are some free SMTP service options available such as Gmail and MailGun. This can be configured from the GlassFish console or the command line.
+This command helps verify what host your domain is using to send mail. Even if it's the correct hostname, you may still need to adjust settings. If all else fails, there are some free SMTP service options available such as Gmail and MailGun. This can be configured from the Payara console or the command line.
 
-1. First, navigate to your Glassfish admin console: http://localhost:4848
+1. First, navigate to your Payara admin console: http://localhost:4848
 2. From the left-side panel, select **JavaMail Sessions**
 3. You should see one session named **mail/notifyMailSession** -- click on that.
 
-From this window you can modify certain fields of your Dataverse's notifyMailSession, which is the JavaMail session for outgoing system email (such as on user signup or data publication). Two of the most important fields we need are:
+From this window you can modify certain fields of your Dataverse installation's notifyMailSession, which is the JavaMail session for outgoing system email (such as on user sign up or data publication). Two of the most important fields we need are:
 
 - **Mail Host:** The DNS name of the default mail server (e.g. smtp.gmail.com)
 - **Default User:** The username provided to your Mail Host when you connect to it (e.g. johndoe@gmail.com)
@@ -50,7 +50,7 @@ Most of the other defaults can safely be left as is. **Default Sender Address**
 
 If your user credentials for the SMTP server require a password, you'll need to configure some **Additional Properties** at the bottom.
 
-**IMPORTANT:** Before continuing, it's highly recommended that your Default User account does NOT use a password you share with other accounts, as one of the additional properties includes entering the Default User's password (without concealing it on screen). For smtp.gmail.com you can safely use an `app password <https://support.google.com/accounts/answer/185833?hl=en>`_ or create an extra Gmail account for use with your Dataverse dev environment.
+**IMPORTANT:** Before continuing, it's highly recommended that your Default User account does NOT use a password you share with other accounts, as one of the additional properties includes entering the Default User's password (without concealing it on screen). For smtp.gmail.com you can safely use an `app password <https://support.google.com/accounts/answer/185833?hl=en>`_ or create an extra Gmail account for use with your Dataverse Software development environment.
 
 Authenticating yourself to a Mail Host can be tricky. As an example, we'll walk through setting up our JavaMail Session to use smtp.gmail.com as a host by way of SSL on port 465. Use the Add Property button to generate a blank property for each name/value pair.
 
@@ -67,16 +67,16 @@ mail.smtp.socketFactory.class			javax.net.ssl.SSLSocketFactory
 
 **\*WARNING**: Entering a password here will *not* conceal it on-screen. It’s recommended to use an *app password* (for smtp.gmail.com users) or utilize a dedicated/non-personal user account with SMTP server auths so that you do not risk compromising your password.
 
-Save these changes at the top of the page and restart your Glassfish server to try it out.
+Save these changes at the top of the page and restart your app server to try it out.
 
 The mail session can also be set from command line. To use this method, you will need to delete your notifyMailSession and create a new one. See the below example:
 
 - Delete: ``./asadmin delete-javamail-resource mail/MyMailSession``
 - Create (remove brackets and replace the variables inside): ``./asadmin create-javamail-resource --mailhost [smtp.gmail.com] --mailuser [test\@test\.com] --fromaddress [test\@test\.com] --property mail.smtp.auth=[true]:mail.smtp.password=[password]:mail.smtp.port=[465]:mail.smtp.socketFactory.port=[465]:mail.smtp.socketFactory.fallback=[false]:mail.smtp.socketFactory.class=[javax.net.ssl.SSLSocketFactory] mail/notifyMailSession``
 
-These properties can be tailored to your own preferred mail service, but if all else fails these settings work fine with Dataverse development environments for your localhost.
+These properties can be tailored to your own preferred mail service, but if all else fails these settings work fine with Dataverse Software development environments for your localhost.
 
-+ If you're seeing a "Relay access denied" error in your Glassfish logs when your app attempts to send an email, double check your user/password credentials for the Mail Host you're using.
++ If you're seeing a "Relay access denied" error in your app server logs when the Dataverse installation attempts to send an email, double check your user/password credentials for the Mail Host you're using.
 + If you're seeing a "Connection refused" / similar error upon email sending, try another port.
 
 As another example, here is how to create a Mail Host via command line for Amazon SES:
@@ -84,19 +84,23 @@ As another example, here is how to create a Mail Host via command line for Amazo
 - Delete: ``./asadmin delete-javamail-resource mail/MyMailSession``
 - Create (remove brackets and replace the variables inside): ``./asadmin create-javamail-resource --mailhost email-smtp.us-east-1.amazonaws.com --mailuser [test\@test\.com] --fromaddress [test\@test\.com] --transprotocol aws --transprotocolclass com.amazonaws.services.simpleemail.AWSJavaMailTransport --property mail.smtp.auth=true:mail.smtp.user=[aws_access_key]:mail.smtp.password=[aws_secret_key]:mail.transport.protocol=smtp:mail.smtp.port=587:mail.smtp.starttls.enable=true mail/notifyMailSession``
 
+.. _rebuilding-dev-environment:
+
 Rebuilding Your Dev Environment
 -------------------------------
 
-If you have an old copy of the database and old Solr data and want to start fresh, here are the recommended steps:
+A script called :download:`dev-rebuild.sh <../../../../scripts/dev/dev-rebuild.sh>` is available that does the following:
 
-- drop your old database
-- clear out your existing Solr index: ``scripts/search/clear``
-- run the installer script above - it will create the db, deploy the app, populate the db with reference data and run all the scripts that create the domain metadata fields. You no longer need to perform these steps separately.
-- confirm you are using the latest Dataverse-specific Solr schema.xml and included XML files (schema_dv_cmb_[copies|fields].xml)
-- confirm http://localhost:8080 is up
-- If you want to set some dataset-specific facets, go to the root dataverse (or any dataverse; the selections can be inherited) and click "General Information" and make choices under "Select Facets". There is a ticket to automate this: https://github.com/IQSS/dataverse/issues/619
+- Drops the database.
+- Clears our Solr.
+- Deletes all data files uploaded by users (assuming you are using the default directory).
+- Deploys the war file located in the ``target`` directory.
+- Runs ``setup-all.sh`` in insecure mode so tests will pass.
+- Runs post-install SQL statements.
+- Publishes the root Dataverse collection.
+- Adjusts permissions on on the root Dataverse collection so tests will pass.
 
-You may also find https://github.com/IQSS/dataverse/blob/develop/scripts/deploy/phoenix.dataverse.org/deploy and related scripts interesting because they demonstrate how we have at least partially automated the process of tearing down a Dataverse installation and having it rise again, hence the name "phoenix." See also "Fresh Reinstall" in the :doc:`/installation/installation-main` section of the Installation Guide.
+To execute the script, make sure you have built a war file already and then ``cd`` to the root of the source tree and run ``scripts/dev/dev-rebuild.sh``. Feedback on this script is welcome!
 
 DataCite
 --------
@@ -106,7 +110,3 @@ If you are seeing ``Response code: 400, [url] domain of URL is not allowed`` it'
 ``./asadmin delete-jvm-options '-Ddataverse.siteUrl=http\://localhost\:8080'``
 
 ``./asadmin create-jvm-options '-Ddataverse.siteUrl=http\://demo.dataverse.org'``
-
-----
-
-Previous: :doc:`tips` | Next: :doc:`version-control`
diff --git a/doc/sphinx-guides/source/developers/unf/index.rst b/doc/sphinx-guides/source/developers/unf/index.rst
index af9265a7fc0..596bb0cf3bf 100644
--- a/doc/sphinx-guides/source/developers/unf/index.rst
+++ b/doc/sphinx-guides/source/developers/unf/index.rst
@@ -20,14 +20,14 @@ computed. The signature is thus independent of the storage
 format. E.g., the same data object stored in, say, SPSS and Stata,
 will have the same UNF.
 
-Early versions of Dataverse were using the first released
+Early versions of the Dataverse Software were using the first released
 implementation of the UNF algorithm (v.3, implemented in R).  Starting
-with Dataverse 2.0 and throughout the 3.* lifecycle, UNF v.5
-(implemented in Java) was used. Dataverse 4.0 uses the latest release,
+with Dataverse Software 2.0 and throughout the 3.* lifecycle, UNF v.5
+(implemented in Java) was used. Dataverse Software 4.0 uses the latest release,
 UNF v.6. Two parallel implementation, in R and Java, will be
 available, for cross-validation.
 
-Learn more: Micah Altman and Gary King. 2007. “A Proposed Standard for the Scholarly Citation of Quantitative Data.” D-Lib Magazine, 13. Publisher’s Version Copy at http://j.mp/2ovSzoT
+Learn more: Micah Altman and Gary King. 2007. “A Proposed Standard for the Scholarly Citation of Quantitative Data.” D-Lib Magazine, 13. Publisher’s Version Copy at https://j.mp/2ovSzoT
 
 **Contents:**
 
@@ -37,7 +37,3 @@ Learn more: Micah Altman and Gary King. 2007. “A Proposed Standard for the Sch
    unf-v3
    unf-v5
    unf-v6
-
-----
-
-Previous: :doc:`/developers/tools` | Next: :doc:`/developers/remote-users`
diff --git a/doc/sphinx-guides/source/developers/unf/unf-v3.rst b/doc/sphinx-guides/source/developers/unf/unf-v3.rst
index 3f0018d7fa5..98c07b398e0 100644
--- a/doc/sphinx-guides/source/developers/unf/unf-v3.rst
+++ b/doc/sphinx-guides/source/developers/unf/unf-v3.rst
@@ -34,11 +34,11 @@ For example, the number pi at five digits is represented as -3.1415e+, and the n
 
 1. Terminate character strings representing nonmissing values with a POSIX end-of-line character.
 
-2. Encode each character string with `Unicode bit encoding <http://www.unicode.org/versions/Unicode4.0.0/>`_. Versions 3 through 4 use UTF-32BE; Version 4.1 uses UTF-8.
+2. Encode each character string with `Unicode bit encoding <https://www.unicode.org/versions/Unicode4.0.0/>`_. Versions 3 through 4 use UTF-32BE; Version 4.1 uses UTF-8.
 
 3. Combine the vector of character strings into a single sequence, with each character string separated by a POSIX end-of-line character and a null byte.
 
-4. Compute a hash on the resulting sequence using the standard MD5 hashing algorithm for Version 3 and using `SHA256 <http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf>`_ for Version 4. The resulting hash is `base64 <http://www.ietf.org/rfc/rfc3548.txt>`_ encoded to support readability.
+4. Compute a hash on the resulting sequence using the standard MD5 hashing algorithm for Version 3 and using `SHA256 <https://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf>`_ for Version 4. The resulting hash is `base64 <https://www.ietf.org/rfc/rfc3548.txt>`_ encoded to support readability.
 
 5. Calculate the UNF for each lower-level data object, using a consistent UNF version and level of precision across the individual UNFs being combined.
 
@@ -49,4 +49,4 @@ For example, the number pi at five digits is represented as -3.1415e+, and the n
 8. Combine UNFs from multiple variables to form a single UNF for an entire data frame, and then combine UNFs for a set of data frames to form a single UNF that represents an entire research study.
 
 Learn more: 
-Software for computing UNFs is available in an R Module, which includes a Windows standalone tool and code for Stata and SAS languages. Also see the following for more details: Micah Altman and Gary King. 2007. "A Proposed Standard for the Scholarly Citation of Quantitative Data," D-Lib Magazine, Vol. 13, No. 3/4 (March). (Abstract: `HTML <http://gking.harvard.edu/files/abs/cite-abs.shtml>`_ | Article: `PDF <http://gking.harvard.edu/files/cite.pdf>`_)
+Software for computing UNFs is available in an R Module, which includes a Windows standalone tool and code for Stata and SAS languages. Also see the following for more details: Micah Altman and Gary King. 2007. "A Proposed Standard for the Scholarly Citation of Quantitative Data," D-Lib Magazine, Vol. 13, No. 3/4 (March). (Abstract: `HTML <https://gking.harvard.edu/files/abs/cite-abs.shtml>`_ | Article: `PDF <https://gking.harvard.edu/files/cite.pdf>`_)
diff --git a/doc/sphinx-guides/source/developers/unf/unf-v5.rst b/doc/sphinx-guides/source/developers/unf/unf-v5.rst
index 29b4556b1f9..664ebe61da9 100644
--- a/doc/sphinx-guides/source/developers/unf/unf-v5.rst
+++ b/doc/sphinx-guides/source/developers/unf/unf-v5.rst
@@ -8,8 +8,8 @@ UNF Version 5
 
 **Important Update:**
 
-UNF Version 5 has been in use by the Dataverse project since 2009. It was built into every version of the DVN, starting with 2.0 and up to 3.6.2. However, some problems were recently found in that implementation. Namely, in certain cases data normalization is not implemented fully to the spec. UNF signatures it generates are still reasonably strong statistically; however, this means that at least some of our signatures are not independently verifiable. I.e., if somebody fully implements their own version of UNF calculator, for certain datasets it would calculate signatures different from those generated by the DVN. Unless of course they implement it with the exact same bugs as ours.
+UNF Version 5 has been in use by the Dataverse Project since 2009. It was built into every version of The Dataverse Software, starting with 2.0 and up to 3.6.2. However, some problems were recently found in that implementation. Namely, in certain cases data normalization is not implemented fully to the spec. UNF signatures it generates are still reasonably strong statistically; however, this means that at least some of our signatures are not independently verifiable. I.e., if somebody fully implements their own version of UNF calculator, for certain datasets it would calculate signatures different from those generated by the DVN. Unless of course they implement it with the exact same bugs as ours.
 
-To address this, the Project is about to release UNF Version 6. The release date is still being discussed. It may coincide with the release of Dataverse 4.0. Alternatively, the production version of DVN 3.6.3 may get upgraded to use UNF v6 prior to that. This will be announced shortly. In the process, we are solving another problem with UNF v5 - this time we've made an effort to offer very implementer-friendly documentation that describes the algorithm fully and unambiguously. So if you are interested in implementing your own version of a UNF calculator, (something we would like to encourage!) please proceed directly to the Version 6 documentation.
+To address this, the Project is about to release UNF Version 6. The release date is still being discussed. It may coincide with the release of Dataverse Software 4.0. Alternatively, the production release of DVN 3.6.3 may get upgraded to use UNF v6 prior to that. This will be announced shortly. In the process, we are solving another problem with UNF v5 - this time we've made an effort to offer very implementer-friendly documentation that describes the algorithm fully and unambiguously. So if you are interested in implementing your own version of a UNF calculator, (something we would like to encourage!) please proceed directly to the Version 6 documentation.
 
 Going forward, we are going to offer a preserved version of the Version 5 library and, possibly, an online UNF v5 calculator, for the purposes of validating vectors and data sets for which published Version 5 UNFs exist.
diff --git a/doc/sphinx-guides/source/developers/unf/unf-v6.rst b/doc/sphinx-guides/source/developers/unf/unf-v6.rst
index b5c898a9a08..b2495ff3dd9 100644
--- a/doc/sphinx-guides/source/developers/unf/unf-v6.rst
+++ b/doc/sphinx-guides/source/developers/unf/unf-v6.rst
@@ -156,11 +156,11 @@ For example, to specify a non-default precision the parameter it is specified us
 | Allowed values are {``128`` , ``192`` , ``196`` , ``256``} with ``128`` being the default. 
 | ``R1`` - **truncate** numeric values to ``N`` digits, **instead of rounding**, as previously described.
 
-`Dr. Micah Altman's classic UNF v5 paper <http://www.researchgate.net/publication/200043172_A_Fingerprint_Method_for_Scientific_Data_Verification>`_ mentions another optional parameter ``T###``, for specifying rounding of date and time values (implemented as stripping the values of entire components - fractional seconds, seconds, minutes, hours... etc., progressively) - but it doesn't specify its syntax. It is left as an exercise for a curious reader to contact the author and work out the details, if so desired. (Not implemented in UNF Version 6 by the Dataverse Project).
+`Dr. Micah Altman's classic UNF v5 paper <https://www.researchgate.net/publication/200043172_A_Fingerprint_Method_for_Scientific_Data_Verification>`_ mentions another optional parameter ``T###``, for specifying rounding of date and time values (implemented as stripping the values of entire components - fractional seconds, seconds, minutes, hours... etc., progressively) - but it doesn't specify its syntax. It is left as an exercise for a curious reader to contact the author and work out the details, if so desired. (Not implemented in UNF Version 6 by the Dataverse Project).
 
 Note: we do not recommend truncating character strings at fewer bytes than the default ``128`` (the ``X`` parameter). At the very least this number **must** be high enough so that the printable UNFs of individual variables or files are not truncated, when calculating combined UNFs of files or datasets, respectively. 
 
-It should also be noted that the Dataverse application never calculates UNFs with any non-default parameters. And we are not aware of anyone else actually doing so. If you are considering creating your own implementation of the UNF, it may be worth trying to create a simplified, defaults-only version first. Such an implementation would be sufficient to independently verify Dataverse-produced UNFs, among other things.
+It should also be noted that the Dataverse Software never calculates UNFs with any non-default parameters. And we are not aware of anyone else actually doing so. If you are considering creating your own implementation of the UNF, it may be worth trying to create a simplified, defaults-only version first. Such an implementation would be sufficient to independently verify Dataverse Software-produced UNFs, among other things.
 
 .. _note2:
 
diff --git a/doc/sphinx-guides/source/developers/version-control.rst b/doc/sphinx-guides/source/developers/version-control.rst
index 618468392b7..fad8cac1400 100644
--- a/doc/sphinx-guides/source/developers/version-control.rst
+++ b/doc/sphinx-guides/source/developers/version-control.rst
@@ -2,16 +2,16 @@
 Version Control
 ==================
 
-The Dataverse Project uses git for version control and GitHub for hosting. On this page we'll explain where to find the code, our branching strategey, advice on how to make a pull request, and other git tips.
+The Dataverse Project uses git for version control and GitHub for hosting. On this page we'll explain where to find the code, our branching strategy, advice on how to make a pull request, and other git tips.
 
 .. contents:: |toctitle|
 	:local:
 
 
-Where to Find the Dataverse Code
---------------------------------
+Where to Find the Dataverse Software Code
+-----------------------------------------
 
-The main Dataverse code at https://github.com/IQSS/dataverse but as explained in the :doc:`intro` section under "Related Projects", there are many other code bases you can hack on if you wish!
+The main Dataverse Software code is available at https://github.com/IQSS/dataverse but as explained in the :doc:`intro` section under "Related Projects", there are many other code bases you can hack on if you wish!
 
 Branching Strategy
 ------------------
@@ -19,12 +19,12 @@ Branching Strategy
 Goals
 ~~~~~
 
-The goals of the Dataverse branching strategy are:
+The goals of the Dataverse Software branching strategy are:
 
 - allow for concurrent development
 - only ship stable code
 
-We follow a simplified "git flow" model described at http://nvie.com/posts/a-successful-git-branching-model/ involving a "master" branch, a "develop" branch, and feature branches such as "1234-bug-fix".
+We follow a simplified "git flow" model described at https://nvie.com/posts/a-successful-git-branching-model/ involving a "master" branch, a "develop" branch, and feature branches such as "1234-bug-fix".
 
 Branches
 ~~~~~~~~
@@ -32,7 +32,9 @@ Branches
 The "master" Branch
 *******************
 
-The "`master <https://github.com/IQSS/dataverse/tree/master>`_" branch represents released versions of Dataverse. As mentioned in the :doc:`making-releases` section, at release time we update the master branch to include all the code for that release. Commits are never made directly to master. Rather, master is updated only when we merge code into it from the "develop" branch.
+The "`master <https://github.com/IQSS/dataverse/tree/master>`_" branch represents released versions of the Dataverse Software. As mentioned in the :doc:`making-releases` section, at release time we update the master branch to include all the code for that release. Commits are never made directly to master. Rather, master is updated only when we merge code into it from the "develop" branch.
+
+.. _develop-branch:
 
 The "develop" Branch
 ********************
@@ -46,6 +48,13 @@ Feature branches are used for both developing features and fixing bugs. They are
 
 "3728-doc-apipolicy-fix" is an example of a fine name for your feature branch. It tells us that you are addressing https://github.com/IQSS/dataverse/issues/3728 and the "slug" is short, descriptive, and starts with the issue number.
 
+Hotfix Branches
+***************
+
+Hotfix branches are described under :doc:`making-releases`.
+
+.. _how-to-make-a-pull-request:
+
 How to Make a Pull Request
 --------------------------
 
@@ -58,47 +67,197 @@ The example of creating a pull request below has to do with fixing an important
 Find or Create a GitHub Issue
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For guidance on which issue to work on, please ask! Also, see https://github.com/IQSS/dataverse/blob/develop/CONTRIBUTING.md
+An issue represents a bug (unexpected behavior) or a new feature in Dataverse. We'll use the issue number in the branch we create for our pull request.
+
+.. _finding-github-issues-to-work-on:
+
+Finding GitHub Issues to Work On
+********************************
+
+Assuming this is your first contribution to Dataverse, you should start with something small. The following issue labels might be helpful in your search:
+
+- `good first issue <https://github.com/IQSS/dataverse/labels/good%20first%20issue>`_ (these appear at https://github.com/IQSS/dataverse/contribute )
+- `hacktoberfest <https://github.com/IQSS/dataverse/labels/hacktoberfest>`_
+- `Help Wanted: Code <https://github.com/IQSS/dataverse/labels/Help%20Wanted%3A%20Code>`_
+- `Help Wanted: Documentation <https://github.com/IQSS/dataverse/labels/Help%20Wanted%3A%20Documentation>`_
+
+For guidance on which issue to work on, please ask! :ref:`getting-help-developers` explains how to get in touch.
+
+Creating GitHub Issues to Work On
+*********************************
 
-Let's say you want to tackle https://github.com/IQSS/dataverse/issues/3728 which points out a typo in a page of Dataverse's documentation.
+You are very welcome to create a GitHub issue to work on. However, for significant changes, please reach out (see :ref:`getting-help-developers`) to make sure the team and community agree with the proposed change.
+
+For small changes and especially typo fixes, please don't worry about reaching out first.
+
+Communicate Which Issue You Are Working On
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In the issue you can simply leave a comment to say you're working on it.
 
 If you tell us your GitHub username we are happy to add you to the "read only" team at https://github.com/orgs/IQSS/teams/dataverse-readonly/members so that we can assign the issue to you while you're working on it. You can also tell us if you'd like to be added to the `Dataverse Community Contributors spreadsheet <https://docs.google.com/spreadsheets/d/1o9DD-MQ0WkrYaEFTD5rF_NtyL8aUISgURsAXSL7Budk/edit?usp=sharing>`_.
 
-Create a New Branch off the develop Branch
+.. _create-branch-for-pr:
+
+Create a New Branch Off the develop Branch
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Always create your feature branch from the latest code in develop, pulling the latest code if necessary. As mentioned above, your branch should have a name like "3728-doc-apipolicy-fix" that starts with the issue number you are addressing, and ends with a short, descriptive name. Dashes ("-") and underscores ("_") in your branch name are ok, but please try to avoid other special characters such as ampersands ("&") than have special meaning in Unix shells.
+Always create your feature branch from the latest code in develop, pulling the latest code if necessary. As mentioned above, your branch should have a name like "3728-doc-apipolicy-fix" that starts with the issue number you are addressing (e.g. `#3728 <https://github.com/IQSS/dataverse/issues/3728>`_) and ends with a short, descriptive name. Dashes ("-") and underscores ("_") in your branch name are ok, but please try to avoid other special characters such as ampersands ("&") that have special meaning in Unix shells. Please do not call your branch "develop" as it can cause maintainers :ref:`trouble <develop-into-develop>`.
 
 Commit Your Change to Your New Branch
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Making a commit (or several commits) to that branch. Ideally the first line of your commit message includes the number of the issue you are addressing, such as ``Fixed BlockedApiPolicy #3728``.
+For each commit to that branch, try to include the issue number along with a summary in the first line of the commit message, such as ``Fixed BlockedApiPolicy #3728``. You are welcome to write longer descriptions in the body as well!
+
+.. _writing-release-note-snippets:
+
+Writing a Release Note Snippet
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We highly value your insight as a contributor when in comes to describing your work in our release notes. Not every pull request will be mentioned in release notes but most are.
+
+As described at :ref:`write-release-notes`, at release time we compile together release note "snippets" into the final release notes.
+
+Here's how to add a release note snippet to your pull request:
+
+- Create a Markdown file under ``doc/release-notes``. You can reuse the name of your branch and append ".md" to it, e.g. ``3728-doc-apipolicy-fix.md``
+- Edit the snippet to include anything you think should be mentioned in the release notes. Please include the following if they apply:
+
+  - Descriptions of new features or bug fixed, including a link to the HTML preview of the docs you wrote (e.g. https://dataverse-guide--9939.org.readthedocs.build/en/9939/installation/config.html#smtp-email-configuration ) and the phrase "For more information, see #3728" (the issue number). If you know the PR number, you can add that too.
+  - New configuration settings
+  - Upgrade instructions
+  - Etc.
+
+Release note snippets do not need to be long. For a new feature, a single line description might be enough. Please note that your release note will likely be edited (expanded or shortened) when the final release notes are being created.
 
 Push Your Branch to GitHub
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Push your feature branch to your fork of Dataverse. Your git command may look something like ``git push origin 3728-doc-apipolicy-fix``.
+Push your feature branch to your fork of the Dataverse Software. Your git command may look something like ``git push origin 3728-doc-apipolicy-fix``.
 
 Make a Pull Request
 ~~~~~~~~~~~~~~~~~~~
 
-Make a pull request to get approval to merge your changes into the develop branch. Note that once a pull request is created, we'll remove the corresponding issue from our kanban board so that we're only tracking one card.
+Make a pull request to get approval to merge your changes into the develop branch.
+
+Feedback on the pull request template we use is welcome!
+
+Here's an example of a pull request for issue #9729: https://github.com/IQSS/dataverse/pull/10474
+
+Replace Issue with Pull Request
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If the pull request closes an issue that has been prioritized, someone from the core team will do the following:
+
+- Move the open issue to the "Done" column of the `project board`_. We do this to track only one card, the pull request, on the project board. Merging the pull request will close the issue because we use the "closes #1234" `keyword <https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue>`_ .
+- Copy all labels from the issue to the pull request with the exception of the "size" label.
+- Add a size label to the pull request that reflects the amount of review and QA time needed.
+- Move the pull request to the "Ready for Review" column.
 
-Feedback on the pull request template we use is welcome! Here's an example of a pull request for issue #3827: https://github.com/IQSS/dataverse/pull/3827
+.. _project board: https://github.com/orgs/IQSS/projects/34
 
 Make Sure Your Pull Request Has Been Advanced to Code Review
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Now that you've made your pull request, your goal is to make sure it appears in the "Code Review" column at https://github.com/orgs/IQSS/projects/2. 
+Now that you've made your pull request, your goal is to make sure it appears in the "Code Review" column on the `project board`_.
+
+Look at :ref:`getting-help-developers` for various ways to reach out to developers who have enough access to the GitHub repo to move your issue and pull request to the "Code Review" column.
+
+Summary of Git commands
+~~~~~~~~~~~~~~~~~~~~~~~
+
+This section provides sequences of Git commands for three scenarios:
+
+* preparing the first request, when the IQSS Dataverse Software repository and the forked repository are identical
+* creating an additional request after some time, when the IQSS Dataverse Software repository is ahead of the forked repository
+* while your pull requests are in review the develop branch has been updated, so you have to keep your code base synchronized with the current state of develop branch
+
+In the examples we use 123-COOL-FEATURE as the name of the feature branch, and https://github.com/YOUR_NAME/dataverse.git as your forked repository's URL. In practice modify both accordingly.
+
+**1st scenario: preparing the first pull request**
+
+.. code-block:: bash
+
+        # clone Dataverse at Github.com ... then
+
+        git clone https://github.com/YOUR_NAME/dataverse.git dataverse_fork
+        cd dataverse_fork
+
+        # create a new branch locally for the pull request
+        git checkout -b 123-COOL-FEATURE
+
+        # working on the branch ... then commit changes
+        git commit -am "#123 explanation of changes"
+
+        # upload the new branch to https://github.com/YOUR_NAME/dataverse
+        git push -u origin 123-COOL-FEATURE
+
+        # ... then create pull request at github.com/YOUR_NAME/dataverse
+
+
+**2nd scenario: preparing another pull request some month later**
+
+.. code-block:: bash
+
+        # register IQSS Dataverse repo
+        git remote add upstream https://github.com/IQSS/dataverse.git
+
+        git checkout develop
+
+        # update local develop branch from https://github.com/IQSS/dataverse
+        git fetch upstream develop
+        git rebase upstream/develop
+
+        # update remote develop branch at https://github.com/YOUR_NAME/dataverse
+        git push
+
+        # create a new branch locally for the pull request
+        git checkout -b 123-COOL-FEATURE
+
+        # work on the branch and commit changes
+        git commit -am "#123 explanation of changes"
+
+        # upload the new branch to https://github.com/YOUR_NAME/dataverse
+        git push -u origin 123-COOL-FEATURE
+
+        # ... then create pull request at github.com/YOUR_NAME/dataverse
+
+
+**3rd scenario: synchronize your branch with develop branch**
+
+.. code-block:: bash
+
+        git checkout develop
+
+        # update local develop branch from https://github.com/IQSS/dataverse
+        git fetch upstream develop
+        git rebase upstream/develop
+
+        # update remote develop branch at https://github.com/YOUR_NAME/dataverse
+        git push
+
+        # change to the already existing feature branch
+        git checkout 123-COOL-FEATURE
+
+        # merge changes of develop to the feature branch
+        git merge develop
+
+        # check if there are conflicts, if there are follow the next command, otherwise skip to next block
+        # 1. fix the relevant files (including testing)
+        # 2. commit changes
+        git add <fixed files>
+        git commit
+
+        # update remote feature branch at https://github.com/YOUR_NAME/dataverse
+        git push
 
-Look at https://github.com/IQSS/dataverse/blob/master/CONTRIBUTING.md for various ways to reach out to developers who have enough access to the GitHub repo to move your issue and pull request to the "Code Review" column.
 
 How to Resolve Conflicts in Your Pull Request
 ---------------------------------------------
 
 Unfortunately, pull requests can quickly become "stale" and unmergable as other pull requests are merged into the develop branch ahead of you. This is completely normal, and often occurs because other developers made their pull requests before you did.
 
-The Dataverse team may ping you to ask you to merge the latest from the develop branch into your branch and resolve merge conflicts. If this sounds daunting, please just say so and we will assist you.
+The Dataverse Project team may ping you to ask you to merge the latest from the develop branch into your branch and resolve merge conflicts. If this sounds daunting, please just say so and we will assist you.
 
 If you'd like to resolve the merge conflicts yourself, here are some steps to do so that make use of GitHub Desktop and Netbeans.
 
@@ -110,7 +269,7 @@ If you'd like to resolve the merge conflicts yourself, here are some steps to do
 
 **In Netbeans:**
 
-4. Click Window -> Favorites and open your local Dataverse project folder in the Favorites panel.
+4. Click Window -> Favorites and open your local Dataverse Software project folder in the Favorites panel.
 5. In this file browser, you can follow the red cylinder icon to find files with merge conflicts.
 6. Double click the red merge conflicted file.
 7. Right click on the red tab for that file and select Git -> Resolve Conflicts.
@@ -123,26 +282,59 @@ If you'd like to resolve the merge conflicts yourself, here are some steps to do
 
 **In GitHub Issues:**
 
-11. Leave a comment for the Dataverse team that you have resolved the merge conflicts.
+11. Leave a comment for the Dataverse Project team that you have resolved the merge conflicts.
 
 Adding Commits to a Pull Request from a Fork 
 --------------------------------------------
 
 By default, when a pull request is made from a fork, "Allow edits from maintainers" is checked as explained at https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/
 
-This is a nice feature of GitHub because it means that the core dev team for Dataverse can make small (or even large) changes to a pull request from a contributor to help the pull request along on its way to QA and being merged.
+This is a nice feature of GitHub because it means that the core dev team for the Dataverse Project can make small (or even large) changes to a pull request from a contributor to help the pull request along on its way to QA and being merged.
 
-GitHub documents how to make changes to a fork at https://help.github.com/articles/committing-changes-to-a-pull-request-branch-created-from-a-fork/ but as of this writing the steps involve making a new clone of the repo. This works but you might find it more convenient to add a "remote" to your existing clone. The example below uses the fork at https://github.com/OdumInstitute/dataverse and the branch ``4709-postgresql_96`` but the technique can be applied to any fork and branch:
+GitHub documents how to make changes to a fork at https://help.github.com/articles/committing-changes-to-a-pull-request-branch-created-from-a-fork/ but as of this writing the steps involve making a new clone of the repo. This works but you might find it more convenient to add a "remote" to your existing clone. The example below uses the fork at https://github.com/uncch-rdmc/dataverse and the branch ``4709-postgresql_96`` but the technique can be applied to any fork and branch:
 
 .. code-block:: bash
 
-        git remote add OdumInstitute git@github.com:OdumInstitute/dataverse.git
-        git fetch OdumInstitute
+        git remote add uncch-rdmc git@github.com:uncch-rdmc/dataverse.git
+        git fetch uncch-rdmc
         git checkout 4709-postgresql_96
         vim path/to/file.txt
         git commit
-        git push OdumInstitute 4709-postgresql_96
+        git push uncch-rdmc 4709-postgresql_96
+
+.. _develop-into-develop:
+
+Handing a Pull Request from a "develop" Branch
+----------------------------------------------
+
+Note: this is something only maintainers of Dataverse need to worry about, typically.
+
+From time to time a pull request comes in from a fork of Dataverse that uses "develop" as the branch behind the PR. (We've started asking contributors not to do this. See :ref:`create-branch-for-pr`.) This is problematic because the "develop" branch is the main integration branch for the project. (See :ref:`develop-branch`.)
 
-----
+If the PR is perfect and can be merged as-is, no problem. Just merge it. However, if you would like to push commits to the PR, you are likely to run into trouble with multiple "develop" branches locally.
+
+The following is a list of commands oriented toward the simple task of merging the latest from the "develop" branch into the PR but the same technique can be used to push other commits to the PR as well. In this example the PR is coming from username "coder123" on GitHub. At a high level, what we're doing is working in a safe place (/tmp) away from our normal copy of the repo. We clone the main repo from IQSS, check out coder123's version of "develop" (called "dev2" or "false develop"), merge the real "develop" into it, and push to the PR.
+
+If there's a better way to do this, please get in touch!
+
+.. code-block:: bash
 
-Previous: :doc:`troubleshooting` | Next: :doc:`sql-upgrade-scripts`
+        # do all this in /tmp away from your normal code
+        cd /tmp
+        git clone git@github.com:IQSS/dataverse.git
+        cd dataverse
+        git remote add coder123 git@github.com:coder123/dataverse.git
+        git fetch coder123
+        # check out coder123's "develop" to a branch with a different name ("dev2")
+        git checkout coder123/develop -b dev2
+        # merge IQSS "develop" into coder123's "develop" ("dev2")
+        git merge origin/develop
+        # delete the IQSS "develop" branch locally (!)
+        git branch -d develop
+        # checkout "dev2" (false "develop") as "develop" for now
+        git checkout -b develop
+        # push the false "develop" to coder123's fork (to the PR)
+        git push coder123 develop 
+        cd ..
+        # delete the tmp space (done! \o/)
+        rm -rf /tmp/dataverse
diff --git a/doc/sphinx-guides/source/developers/windows.rst b/doc/sphinx-guides/source/developers/windows.rst
index 0386713a161..3af844805b2 100755
--- a/doc/sphinx-guides/source/developers/windows.rst
+++ b/doc/sphinx-guides/source/developers/windows.rst
@@ -2,142 +2,112 @@
 Windows Development
 ===================
 
-Development on Windows is not well supported, unfortunately. You will have a much easier time if you develop on Mac or Linux as described under :doc:`dev-environment` section.
-
-If you want to try using Windows for Dataverse development, your best best is to use Vagrant, as described below. Minishift is also an option. These instructions were tested on Windows 10.
-
 .. contents:: |toctitle|
-	:local:
-
-Running Dataverse in Vagrant
-----------------------------
+       :local:
 
-Install Vagrant
-~~~~~~~~~~~~~~~
+Running Dataverse in Windows WSL
+--------------------------------
 
-Download and install Vagrant from https://www.vagrantup.com
+The simplest method to run Dataverse in Windows 10 and 11 is using Docker and Windows Subsystem for Linux (WSL) - specifically WSL 2. 
+Once Docker and WSL are installed, you can follow the :ref:`quickstart instructions <container-dev-quickstart>`.
 
-Vagrant advises you to reboot but let's install VirtualBox first.
+Please note: these instructions have not been extensively tested. They have been found to work with the Ubuntu-24.04 distribution for WSL. If you find any problems, please open an issue at https://github.com/IQSS/dataverse/issues and/or submit a PR to update this guide.
 
-Install VirtualBox
-~~~~~~~~~~~~~~~~~~
+Install Docker Desktop
+~~~~~~~~~~~~~~~~~~~~~~
 
-Download and install VirtualBox from https://www.virtualbox.org
+Follow the directions at https://www.docker.com to install Docker Desktop on Windows. If prompted, turn on WSL 2 during installation.
 
-Note that we saw an error saying "Oracle VM VirtualBox 5.2.8 Setup Wizard ended prematurely" but then we re-ran the installer and it seemed to work.
+Settings you may need in Docker Desktop:
 
-Reboot
-~~~~~~
+* **General/Expose daemon on tcp://localhost:2375 without TLS**: true
+* **General/Use the WSL 2 based engine**: true
+* **General/Add the \*.docker.internal names to the host's /etc/hosts file (Requires password)**: true
+* **Resources/WSL Integration/Enable integration with my default WSL distro**: true
+* **Resources/WSL Integration/Enable integration with additional distros**: select any you run Dataverse in
 
-Again, Vagrant asks you to reboot, so go ahead.
-
-Install Git
+Install WSL
 ~~~~~~~~~~~
+If you install Docker Desktop, you should already have WSL installed. If not, or if you wish to add an additional Linux distribution, open PowerShell.
 
-Download and install Git from https://git-scm.com
-
-Configure Git to use Unix Line Endings
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Launch Git Bash and run the following commands:
-
-``git config --global core.autocrlf input``
-
-Pro tip: Use Shift-Insert to paste into Git Bash.
-
-See also https://help.github.com/articles/dealing-with-line-endings/
-
-If you skip this step you are likely to see the following error when you run ``vagrant up``.
+If WSL itself is not installed run:
+ 
+.. code-block:: powershell
+  
+   wsl --install
 
-``/tmp/vagrant-shell: ./install: /usr/bin/perl^M: bad interpreter: No such file or directory``
+For use with Docker, you should use WSL v2 - run:
 
-Clone Git Repo
-~~~~~~~~~~~~~~
+.. code-block:: powershell
+  
+   wsl  --set-default-version 2
 
-From Git Bash, run the following command:
+Install a specific Linux distribution. To see the list of possible distributions:
 
-``git clone https://github.com/IQSS/dataverse.git``
+.. code-block:: powershell
 
-vagrant up
-~~~~~~~~~~
+  wsl --list --online
 
-From Git Bash, run the following commands:
+Choose the distribution you would like. Then run the following command. These instructions were tested with ``Ubuntu 24.04 LTS``.
 
-``cd dataverse``
+.. code-block:: powershell
 
-The ``dataverse`` directory you changed is the one you just cloned. Vagrant will operate on a file called ``Vagrantfile``.
+  wsl --install -d <Distribution Name>
 
-``vagrant up``
+You will be asked to create an initial Linux user.
 
-After a long while you hopefully will have Dataverse installed at http://localhost:8888
+.. note::
+   Using wsl --set-version to upgrade an existing distribution from WSL 1 to WSL 2 may not work - installing a new distribution using WSL 2 is recommended.
 
-Running Dataverse in Minishift
-------------------------------
-
-Minishift is a dev environment for OpenShift, which is Red Hat's distribution of Kubernetes.  The :doc:`containers` section contains much more detail but the essential steps for using Minishift on Windows are described below.
-
-Install VirtualBox
-~~~~~~~~~~~~~~~~~~
-
-Download and install VirtualBox from https://www.virtualbox.org
-
-Install Git
+Prepare WSL
 ~~~~~~~~~~~
 
-Download and install Git from https://git-scm.com
-
-Install Minishift
-~~~~~~~~~~~~~~~~~
-
-Download Minishift from https://docs.openshift.org/latest/minishift/getting-started/installing.html . It should be a zip file.
-
-From Git Bash:
+Once that you have WSL installed, You will need Java and MVN working inside WSL, how you go about this will depend on the Linux distribution you installed in WSL.
 
-``cd ~/Downloads``
+Here is an example using SDKMAN, which is not required, but it is recommended for managing Java and other SDKs.
 
-``unzip minishift*.zip``
+.. code-block:: bash
 
-``mkdir ~/bin``
+   sudo apt update
+   sudo apt install zip
 
-``cp minishift*/minishift.exe ~/bin``
+.. code-block:: bash
 
-Clone Git Repo
-~~~~~~~~~~~~~~
+   sudo apt update
+   sudo apt install unzip
 
-From Git Bash, run the following commands:
+.. code-block:: bash
 
-``git config --global core.autocrlf input``
+   curl -s "https://get.sdkman.io" | bash
+   source "$HOME/.sdkman/bin/sdkman-init.sh"
 
-``git clone https://github.com/IQSS/dataverse.git``
+.. code-block:: bash
 
-Start Minishift VM and Run Dataverse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   sdk install java 17.0.7-tem
 
-``minishift start --vm-driver=virtualbox --memory=8GB``
+.. code-block:: bash
 
-``eval $(minishift oc-env)``
+   sdk install maven
 
-``oc new-project project1``
-
-``cd ~/dataverse``
+Install Dataverse
+~~~~~~~~~~~~~~~~~
 
-``oc new-app conf/openshift/openshift.json``
+Open a Linux terminal (e.g. use Windows Terminal and open a tab for the Linux distribution you selected). Then install Dataverse in WSL following the :ref:`quickstart instructions <container-dev-quickstart>`. You should then have a working Dataverse instance.
 
-``minishift console``
+We strongly recommend that you clone the Dataverse repository from WSL, not from Windows. This will ensure that builds are much faster.
 
-This should open a web browser. In Microsoft Edge we saw ``INET_E_RESOURCE_NOT_FOUND`` so if you see that, try Chrome instead. A cert error is expected. Log in with the username "developer" and any password such as "asdf".
+IDEs for Dataverse in Windows
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Under "Overview" you should see a URL that has "dataverse-project1" in it. You should be able to click it and log into Dataverse with the username "dataverseAdmin" and the password "admin".
+You can use your favorite editor or IDE to edit Dataverse project files. Files in WSL are accessible from Windows for editing using the path ``\\wsl.localhost``. Your Linux distribution files should also be visible in File Explorer under the This PC/Linux entry.
 
-Improving Windows Support
--------------------------
+.. note:: FYI: For the best performance, it is recommended, with WSL 2, to store Dataverse files in the WSL/Linux file system and to access them from there with your Windows-based IDE (versus storing Dataverse files in your Windows file system and trying to run maven and build from Linux - access to /mnt/c files using WSL 2 is slow).
 
-Windows Subsystem for Linux
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+pgAdmin in Windows for Dataverse
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-We have been unable to get Windows Subsystem for Linux (WSL) to work. We tried following the steps at https://docs.microsoft.com/en-us/windows/wsl/install-win10 but the "Get" button was greyed out when we went to download Ubuntu.
+You can access the Dataverse database from Windows.
 
-Discussion and Feedback
-~~~~~~~~~~~~~~~~~~~~~~~
+Install pgAdmin from https://www.pgadmin.org/download/pgadmin-4-windows/
 
-For more discussion of Windows support for Dataverse development see our community list thread `"Do you want to develop on Windows?" <https://groups.google.com/d/msg/dataverse-community/Hs9j5rIxqPI/-q54751aAgAJ>`_ We would be happy to inconrporate feedback from Windows developers into this page. The :doc:`documentation` section describes how.
+In pgAdmin, register a server using ``127.0.0.1`` with port ``5432``. For the database name, username, and password, see :ref:`db-name-creds`. Now you will be able to access, monitor, and update the Dataverse database. 
diff --git a/doc/sphinx-guides/source/developers/workflows.rst b/doc/sphinx-guides/source/developers/workflows.rst
index b9090b86be3..38ca6f4e141 100644
--- a/doc/sphinx-guides/source/developers/workflows.rst
+++ b/doc/sphinx-guides/source/developers/workflows.rst
@@ -1,7 +1,7 @@
 Workflows
-================
+=========
 
-Dataverse has a flexible workflow mechanism that can be used to trigger actions before and after Dataset publication.
+The Dataverse Software has a flexible workflow mechanism that can be used to trigger actions before and after Dataset publication.
 
 .. contents:: |toctitle|
         :local:
@@ -10,35 +10,37 @@ Dataverse has a flexible workflow mechanism that can be used to trigger actions
 Introduction
 ------------
 
-Dataverse can perform two sequences of actions when datasets are published: one prior to publishing (marked by a ``PrePublishDataset`` trigger), and one after the publication has succeeded (``PostPublishDataset``). The pre-publish workflow is useful for having an external system prepare a dataset for being publicly accessed (a possibly lengthy activity that requires moving files around, uploading videos to a streaming server, etc.), or to start an approval process. A post-publish workflow might be used for sending notifications about the newly published dataset.
+The Dataverse Software can perform two sequences of actions when datasets are published: one prior to publishing (marked by a ``PrePublishDataset`` trigger), and one after the publication has succeeded (``PostPublishDataset``). The pre-publish workflow is useful for having an external system prepare a dataset for being publicly accessed (a possibly lengthy activity that requires moving files around, uploading videos to a streaming server, etc.), or to start an approval process. A post-publish workflow might be used for sending notifications about the newly published dataset.
 
-Workflow steps are created using *step providers*. Dataverse ships with an internal step provider that offers some basic functionality, and with the ability to load 3rd party step providers. This allows installations to implement functionality they need without changing the Dataverse source code.
+Workflow steps are created using *step providers*. The Dataverse Software ships with an internal step provider that offers some basic functionality, and with the ability to load 3rd party step providers (currently disabled). This allows installations to implement functionality they need without changing the Dataverse Software source code.
 
-Steps can be internal (say, writing some data to the log) or external. External steps involve Dataverse sending a request to an external system, and waiting for the system to reply. The wait period is arbitrary, and so allows the external system unbounded operation time. This is useful, e.g., for steps that require human intervension, such as manual approval of a dataset publication.
+Steps can be internal (say, writing some data to the log) or external. External steps involve the Dataverse Software sending a request to an external system, and waiting for the system to reply. The wait period is arbitrary, and so allows the external system unbounded operation time. This is useful, e.g., for steps that require human intervention, such as manual approval of a dataset publication.
 
-The external system reports the step result back to dataverse, by sending a HTTP ``POST`` command to ``api/workflows/{invocation-id}``. The body of the request is passed to the paused step for further processing.
+The external system reports the step result back to the Dataverse installation, by sending a HTTP ``POST`` command to ``api/workflows/{invocation-id}`` with Content-Type: text/plain. The body of the request is passed to the paused step for further processing.
 
-If a step in a workflow fails, Dataverse make an effort to roll back all the steps that preceded it. Some actions, such as writing to the log, cannot be rolled back. If such an action has a public external effect (e.g. send an EMail to a mailing list) it is advisable to put it in the post-release workflow.
+Steps can define messages to send to the log and to users. If defined, the message to users is sent as a user notification (creating an email and showing in the user notification tab) and will show once for the given user if/when they view the relevant dataset page. The latter provides a means for the asynchronous workflow execution to report success or failure analogous to the way the publication and other processes report on the page.
+
+If a step in a workflow fails, the Dataverse installation makes an effort to roll back all the steps that preceded it. Some actions, such as writing to the log, cannot be rolled back. If such an action has a public external effect (e.g. send an EMail to a mailing list) it is advisable to put it in the post-release workflow.
 
 .. tip::
-  For invoking external systems using a REST api, Dataverse's internal step
-  provider offers a step for sending and receiving customizable HTTP requests.
-  It's called *http/sr*, and is detailed below.
+  For invoking external systems using a REST api, the Dataverse Software's internal step
+  provider offers two steps for sending and receiving customizable HTTP requests.
+  *http/sr* and *http/authExt*, detailed below, with the latter able to use the API to make changes to the dataset being processed. (Both lock the dataset to prevent other processes from changing the dataset between the time the step is launched to when the external process responds to the Dataverse instance.)
 
 Administration
 ~~~~~~~~~~~~~~
 
-A Dataverse instance stores a set of workflows in its database. Workflows can be managed using the ``api/admin/workflows/`` endpoints of the :doc:`/api/native-api`. Sample workflow files are available in ``scripts/api/data/workflows``.
+A Dataverse installation stores a set of workflows in its database. Workflows can be managed using the ``api/admin/workflows/`` endpoints of the :doc:`/api/native-api`. Sample workflow files are available in ``scripts/api/data/workflows``.
 
 At the moment, defining a workflow for each trigger is done for the entire instance, using the endpoint ``api/admin/workflows/default/ÂĢtrigger typeÂģ``.
 
-In order to prevent unauthorized resuming of workflows, Dataverse maintains a "white list" of IP addresses from which resume requests are honored. This list is maintained using the ``/api/admin/workflows/ip-whitelist`` endpoint of the :doc:`/api/native-api`. By default, Dataverse honors resume requests from localhost only (``127.0.0.1;::1``), so set-ups that use a single server work with no additional configuration.
+In order to prevent unauthorized resuming of workflows, the Dataverse installation maintains a "white list" of IP addresses from which resume requests are honored. This list is maintained using the ``/api/admin/workflows/ip-whitelist`` endpoint of the :doc:`/api/native-api`. By default, the Dataverse installation honors resume requests from localhost only (``127.0.0.1;::1``), so set-ups that use a single server work with no additional configuration.
 
 
 Available Steps
 ~~~~~~~~~~~~~~~
 
-Dataverse has an internal step provider, whose id is ``:internal``. It offers the following steps:
+The Dataverse Software has an internal step provider, whose id is ``:internal``. It offers the following steps:
 
 log
 +++
@@ -60,7 +62,8 @@ A step that writes data about the current workflow invocation to the instance lo
 pause
 +++++
 
-A step that pauses the workflow. The workflow is paused until a POST request is sent to ``/api/workflows/{invocation-id}``.
+A step that pauses the workflow. The workflow is paused until a POST request is sent to ``/api/workflows/{invocation-id}``. Sending 'fail' in the POST body (Content-type:text/plain) will trigger a failure and workflow rollback. All other responses are considered as successes.
+The pause step is intended for testing - the invocationId required to end the pause is only available in the log (and database). Adding a parameter (see log step) with the key/value "authorized":"true" will allow the invocationId to be used as a credential as with the http/authext step below. 
 
 .. code:: json
 
@@ -69,11 +72,29 @@ A step that pauses the workflow. The workflow is paused until a POST request is
       "stepType":"pause"
   }
 
+pause/message
++++++++++++++
+
+A variant of the  pause step that pauses the workflow and allows the external process to send a success/failure message. The workflow is paused until a POST request is sent to ``/api/workflows/{invocation-id}``. 
+The response in the POST body (Content-type:application/json) should be a json object (the same as for the http/extauth step) containing:
+- "status" - can be "success" or "failure"
+- "reason" - a message that will be logged
+- "message" - a message to send to the user that will be sent as a notification and as a banner on the relevant dataset page.
+An unparsable reponse will be considered a Failure that will be logged with no user message. (See the http/authext step for an example POST call)
+
+.. code:: json
+
+  {
+      "provider":":internal",
+      "stepType":"pause/message"
+  }
+
 
 http/sr
 +++++++
 
 A step that sends a HTTP request to an external system, and then waits for a response. The response has to match a regular expression specified in the step parameters. The url, content type, and message body can use data from the workflow context, using a simple markup language. This step has specific parameters for rollback.
+The workflow is restarted when the external system replies with a POST request  to ``/api/workflows/{invocation-id}``. Responses starting with "OK" (Content-type:text/plain) are considered successes. Other responses will be considered failures and trigger workflow rollback.
 
 .. code:: json
 
@@ -103,12 +124,63 @@ Available variables are:
 * ``majorVersion``
 * ``releaseStatus``
 
+http/authext
+++++++++++++
+
+Similar to the *http/sr* step. A step that sends a HTTP request to an external system, and then waits for a response. The receiver can use the invocationId of the workflow in lieu of an api key to perform work on behalf of the user launching the workflow. 
+The invocationId must be sent as an 'X-Dataverse-invocationId' HTTP Header or as an ?invocationId= query parameter. *Note that any external process started using this step then has the ability to access a Dataverse instance via the API as the user.*
+Once this step completes and responds, the invocationId is invalidated and will not allow further access.
+
+The url, content type, and message body can use data from the workflow context, using a simple markup language. This step has specific parameters for rollback.
+The workflow is restarted when the external system replies with a POST request  to ``/api/workflows/{invocation-id}`` (Content-Type: application/json).
+
+The response has is expected to be a json object with three keys:
+- "status" - can be "success" or "failure"
+- "reason" - a message that will be logged
+- "message" - a message to send to the user that will be sent as a notification and as a banner on the relevant dataset page.
+
+.. code-block:: bash
+
+  export INVOCATION_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export MESSAGE={"status":"success", "reason":"Workflow completed in 10 seconds", "message":"An external workflow to virus check your data was successfully run prior to publication of your data"}
+ 
+  curl -H 'Content-Type:application/json' -X POST -d $MESSAGE "$SERVER_URL/api/workflows/$INVOCATION_ID"
+
+.. code:: json
+
+  {
+    "provider":":internal",
+    "stepType":"http/authext",
+    "parameters": {
+        "url":"http://localhost:5050/dump/${invocationId}",
+        "method":"POST",
+        "contentType":"text/plain",
+        "body":"START RELEASE ${dataset.id} as ${dataset.displayName}",
+        "rollbackUrl":"http://localhost:5050/dump/${invocationId}",
+        "rollbackMethod":"DELETE ${dataset.id}"
+    }
+  }
+
+Available variables are:
+
+* ``invocationId``
+* ``dataset.id``
+* ``dataset.identifier``
+* ``dataset.globalId``
+* ``dataset.displayName``
+* ``dataset.citation``
+* ``minorVersion``
+* ``majorVersion``
+* ``releaseStatus``
+
+
 archiver
 ++++++++
 
-A step that sends an archival copy of a Dataset Version to a configured archiver, e.g. the DuraCloud interface of Chronopolis. See the `DuraCloud/Chronopolis Integration documentation <http://guides.dataverse.org/en/latest/admin/integrations.html#id15>`_ for further detail.
+A step that sends an archival copy of a Dataset Version to a configured archiver, e.g. the DuraCloud interface of Chronopolis. See :ref:`rda-bagit-archiving` for further detail.
 
-Note - the example step includes two settings required for any archiver and three (DuraCloud*) that are specific to DuraCloud.
+Note - the example step includes two settings required for any archiver, three (DuraCloud*) that are specific to DuraCloud, and the optional BagGeneratorThreads setting that controls parallelism when creating the Bag.
 
 .. code:: json
 
@@ -124,7 +196,36 @@ Note - the example step includes two settings required for any archiver and thre
       ":ArchiverSettings": "string",
       ":DuraCloudHost":"string",
       ":DuraCloudPort":"string",
-      ":DuraCloudContext":"string" 
+      ":DuraCloudContext":"string",
+      ":BagGeneratorThreads":"string"
+    }
+  }
+
+
+ldnannounce
++++++++++++
+
+An experimental step that sends a Linked Data Notification (LDN) message to a specific LDN Inbox announcing the publication/availability of a dataset meeting certain criteria. 
+
+The two parameters are
+* ``:LDNAnnounceRequiredFields`` - a list of metadata fields that must exist to trigger the message. Currently, the message also includes the values for these fields but future versions may only send the dataset's persistent identifier (making the receiver responsible for making a call-back to get any metadata).
+* ``:LDNTarget`` - a JSON object containing an ``inbox`` key whose value is the URL of the target LDN inbox to which messages should be sent, e.g. ``{"id": "https://dashv7-dev.lib.harvard.edu","inbox": "https://dashv7-api-dev.lib.harvard.edu/server/ldn/inbox","type": "Service"}`` ).
+
+The supported message format is desribed by `our preliminary specification <https://docs.google.com/document/d/1dqj8_vEcIBeyDIZCaPQvp0FM1eSGO_5CSNCdXOpoUz0/edit?usp=sharing>`_. The format is expected to change in the near future to match the standard for relationship announcements being developed as part of `the COAR Notify Project <https://notify.coar-repositories.org/>`_. 
+
+
+.. code:: json
+
+
+  {
+    "provider":":internal",
+    "stepType":"ldnannounce",
+    "parameters": {
+      "stepName":"LDN Announce"
+    },
+    "requiredSettings": {
+      ":LDNAnnounceRequiredFields": "string",
+      ":LDNTarget": "string"
     }
   }
 
diff --git a/doc/sphinx-guides/source/index.rst b/doc/sphinx-guides/source/index.rst
index 5ab11da54e6..0b1d85718b2 100755
--- a/doc/sphinx-guides/source/index.rst
+++ b/doc/sphinx-guides/source/index.rst
@@ -6,7 +6,7 @@
 Dataverse Documentation v. |version|
 ====================================
 
-These documentation guides are for the |version| version of Dataverse. To find guides belonging to previous versions, :ref:`guides_versions` has a list of all available versions.
+These documentation guides are for the |version| version of Dataverse. To find guides belonging to previous or future versions, :ref:`guides_versions` has a list of all available versions.
 
 .. toctree::
   :glob:
@@ -15,34 +15,40 @@ These documentation guides are for the |version| version of Dataverse. To find g
 
   user/index
   admin/index
+  ai/index
   api/index
   installation/index
+  contributor/index
   developers/index
+  container/index
   style/index
+  qa/index.md
 
 How the Guides Are Organized
-============================
+----------------------------
 
 The guides are documentation that explain how to use Dataverse,
 which are divided into the following sections: User Guide,
-Installation Guide, Developer Guide, API Guide and Style Guide. The User Guide is further divided into primary activities: finding & using
+Installation Guide, Developer Guide, API Guide, Style Guide and Container Guide.
+The User Guide is further divided into primary activities: finding & using
 data, adding Datasets, administering dataverses or Datasets, and Dataset exploration/visualizations. Details
 on all of the above tasks can be found in the Users Guide. The
 Installation Guide is for people or organizations who want to host their
-own Dataverse. The Developer Guide contains instructions for
+own Dataverse. The Container Guide gives information on how to deploy Dataverse with containers.
+The Developer Guide contains instructions for
 people who want to contribute to the Open Source Dataverse
 project or who want to modify the code to suit their own needs. Finally, the API Guide is for
 Developers that work on other applications and are interested in connecting with Dataverse through our APIs.
 
 Other Resources
-===============
+---------------
 
 **Dataverse Project Site**
 
 Additional information about the Dataverse Project itself
 including presentations, information about upcoming releases, data
 management and citation, and announcements can be found at
-`http://dataverse.org/ <http://dataverse.org/>`__
+`https://dataverse.org/ <https://dataverse.org/>`__
 
 **User Group**
 
@@ -65,14 +71,12 @@ The support email address is `support@dataverse.org <mailto:support@dataverse.or
 **Reporting Issues and Contributing**
 
 Report bugs and add feature requests in `GitHub Issues <https://github.com/IQSS/dataverse/issues>`__
-or use `GitHub pull requests <http://guides.dataverse.org/en/latest/developers/version-control.html#how-to-make-a-pull-request>`__,
+or use `GitHub pull requests <https://guides.dataverse.org/en/latest/developers/version-control.html#how-to-make-a-pull-request>`__,
 if you have some code, scripts or documentation that you'd like to share.
-If you have a **security issue** to report, please email `security@dataverse.org <mailto:security@dataverse.org>`__.
+If you have a **security issue** to report, please email `security@dataverse.org <mailto:security@dataverse.org>`__. See also :ref:`reporting-security-issues`.
 
 
 Indices and Tables
-==================
+------------------
 
-* :ref:`genindex`
-* :ref:`modindex`
 * :ref:`search`
diff --git a/doc/sphinx-guides/source/installation/advanced.rst b/doc/sphinx-guides/source/installation/advanced.rst
index a1f559af57d..bee289ecd5b 100644
--- a/doc/sphinx-guides/source/installation/advanced.rst
+++ b/doc/sphinx-guides/source/installation/advanced.rst
@@ -7,22 +7,24 @@ Advanced installations are not officially supported but here we are at least doc
 .. contents:: |toctitle|
 	:local:
 
-Multiple Glassfish Servers
---------------------------
+.. _multiple-app-servers:
 
-You should be conscious of the following when running multiple Glassfish servers.
+Multiple App Servers
+--------------------
 
-- Only one Glassfish server can be the dedicated timer server, as explained in the :doc:`/admin/timers` section of the Admin Guide.
-- When users upload a logo or footer for their dataverse using the "theme" feature described in the :doc:`/user/dataverse-management` section of the User Guide, these logos are stored only on the Glassfish server the user happend to be on when uploading the logo. By default these logos and footers are written to the directory ``/usr/local/glassfish4/glassfish/domains/domain1/docroot/logos``.
-- When a sitemp is created by a Glassfish server it is written to the filesystem of just that Glassfish server. By default the sitemap is written to the directory ``/usr/local/glassfish4/glassfish/domains/domain1/docroot/sitemap``.
-- If Make Data Count is used, its raw logs must be copied from each Glassfish server to single instance of Counter Processor. See also the ``:MDCLogPath`` database setting in the :doc:`config` section of this guide and the :doc:`/admin/make-data-count` section of the Admin Guide.
-- Dataset draft version logging occurs separately on each Glassfish server. See "Edit Draft Versions Logging" in the :doc:`/admin/monitoring` section of the Admin Guide for details.
-- Password aliases (``db_password_alias``, etc.) are stored per Glassfish server.
+You should be conscious of the following when running multiple app servers.
 
-Detecting Which Glassfish Server a User Is On
-+++++++++++++++++++++++++++++++++++++++++++++
+- Only one app server can be the dedicated timer server, as explained in the :doc:`/admin/timers` section of the Admin Guide.
+- When users upload a logo or footer for their Dataverse collection using the "theme" feature described in the :doc:`/user/dataverse-management` section of the User Guide, these logos are stored only on the app server the user happened to be on when uploading the logo. By default these logos and footers are written to the directory ``/usr/local/payara6/glassfish/domains/domain1/docroot/logos``.
+- When a sitemap is created by an app server it is written to the filesystem of just that app server. By default the sitemap is written to the directory ``/usr/local/payara6/glassfish/domains/domain1/docroot/sitemap``.
+- If Make Data Count is used, its raw logs must be copied from each app server to single instance of Counter Processor. See also :ref:`:MDCLogPath` section in the Configuration section of this guide and the :doc:`/admin/make-data-count` section of the Admin Guide.
+- Dataset draft version logging occurs separately on each app server. See :ref:`edit-draft-versions-logging` section in Monitoring of the Admin Guide for details.
+- Password aliases (``dataverse.db.password``, etc.) are stored per app server.
 
-If you have successfully installed multiple Glassfish servers behind a load balancer you might like to know which server a user has landed on. A straightforward solution is to place a file called ``host.txt`` in a directory that is served up by Apache such as ``/var/www/html`` and then configure Apache not to proxy requests to ``/host.txt`` to Glassfish. Here are some example commands on RHEL/CentOS 7 that accomplish this::
+Detecting Which App Server a User Is On
++++++++++++++++++++++++++++++++++++++++
+
+If you have successfully installed multiple app servers behind a load balancer you might like to know which server a user has landed on. A straightforward solution is to place a file called ``host.txt`` in a directory that is served up by Apache such as ``/var/www/html`` and then configure Apache not to proxy requests to ``/host.txt`` to the app server. Here are some example commands on RHEL/derivatives that accomplish this::
 
         [root@server1 ~]# vim /etc/httpd/conf.d/ssl.conf
         [root@server1 ~]# grep host.txt /etc/httpd/conf.d/ssl.conf
@@ -32,6 +34,114 @@ If you have successfully installed multiple Glassfish servers behind a load bala
         [root@server1 ~]# curl https://dataverse.example.edu/host.txt
         server1.example.edu
 
-You would repeat the steps above for all of your Glassfish servers. If users seem to be having a problem with a particular server, you can ask them to visit https://dataverse.example.edu/host.txt and let you know what they see there (e.g. "server1.example.edu") to help you know which server to troubleshoot.
+You would repeat the steps above for all of your app servers. If users seem to be having a problem with a particular server, you can ask them to visit https://dataverse.example.edu/host.txt and let you know what they see there (e.g. "server1.example.edu") to help you know which server to troubleshoot.
+
+Please note that :ref:`network-ports` under the Configuration section has more information on fronting your app server with Apache. The :doc:`shibboleth` section talks about the use of ``ProxyPassMatch``.
+
+Licensing
+---------
+
+Dataverse allows superusers to specify the list of allowed licenses, to define which license is the default, to decide whether users can instead define custom terms, and to mark obsolete licenses as "inactive" to stop further use of them.
+These can be accomplished using the :ref:`native API <license-management-api>` and the :ref:`:AllowCustomTermsOfUse <:AllowCustomTermsOfUse>` setting. See also :ref:`license-config`.
+
+.. _standardizing-custom-licenses:
+
+Standardizing Custom Licenses
++++++++++++++++++++++++++++++
+
+In addition, if many datasets use the same set of Custom Terms, it may make sense to create and register a standard license including those terms. Doing this would include:
+
+- Creating and posting an external document that includes the custom terms, i.e. an HTML document with sections corresponding to the terms fields that are used.
+- Defining a name, short description, URL (where it is posted), and optionally an icon URL for this license.
+- Using the Dataverse API to register the new license as one of the options available in your installation.
+- Using the API to make sure the license is active and deciding whether the license should also be the default.
+- Once the license is registered with Dataverse, making an SQL update to change datasets/versions using that license to reference it instead of having their own copy of those custom terms.
+
+The benefits of this approach are:
+
+- usability: the license can be selected for new datasets without allowing custom terms and without users having to cut/paste terms or collection administrators having to configure templates with those terms
+- efficiency: custom terms are stored per dataset whereas licenses are registered once and all uses of it refer to the same object and external URL
+- security: with the license terms maintained external to Dataverse, users cannot edit specific terms and curators do not need to check for edits
+
+Once a standardized version of you Custom Terms are registered as a license, an SQL update like the following can be used to have datasets use it:
+
+::
+
+    UPDATE termsofuseandaccess
+        SET license_id = (SELECT license.id FROM license WHERE license.name = '<Your License Name>'), termsofuse=null, confidentialitydeclaration=null, t.specialpermissions=null, t.restrictions=null, citationrequirements=null, depositorrequirements=null, conditions=null, disclaimer=null 
+        WHERE termsofuseandaccess.termsofuse LIKE '%<Unique phrase in your Terms of Use>%';
+
+Optional Components
+-------------------
+
+.. _zipdownloader:
+
+Standalone "Zipper" Service Tool
+++++++++++++++++++++++++++++++++
+
+As of Dataverse Software 5.0 we offer an **experimental** optimization for the multi-file, download-as-zip functionality.
+If this option (``:CustomZipDownloadServiceUrl``) is enabled, instead of enforcing the size limit on multi-file zipped
+downloads (as normally specified by the option ``:ZipDownloadLimit``), we attempt to serve all the files that the user
+requested (that they are authorized to download), but the request is redirected to a standalone zipper service running
+as a cgi-bin executable under Apache. This moves these potentially long-running jobs completely outside the Application Server (Payara), and prevents worker threads from becoming locked serving them. Since zipping is also a CPU-intensive task, it is possible to have
+this service running on a different host system, freeing the cycles on the main Application Server. (The system running
+the service needs to have access to the database as well as to the storage filesystem, and/or S3 bucket).
+
+Please consult the `README at scripts/zipdownload <https://github.com/IQSS/dataverse/tree/master/scripts/zipdownload>`_
+in the Dataverse Software 5.0+ source tree for more information.
+
+To install:
+
+1. Follow the instructions in the file above to build ``zipdownloader-0.0.1.jar``. Please note that the package name and
+   the version were changed as of the release 5.10, as part of an overall cleanup and reorganization of the project 
+   tree. In the releases 5.0-5.9 it existed under the name ``ZipDownloadService-v1.0.0``. (A pre-built jar file was
+   distributed under that name as part of the 5.0 release on GitHub. Aside from the name change, there have been no 
+   changes in the functionality of the tool). 
+2. Copy it, together with the shell script :download:`cgi-bin/zipdownload <../../../../scripts/zipdownload/cgi-bin/zipdownload>`
+   to the ``cgi-bin`` directory of the chosen Apache server (``/var/www/cgi-bin`` standard).
+3. Make sure the shell script (``zipdownload``) is executable, and edit it to configure the database access credentials.
+   Do note that the executable does not need access to the entire Dataverse installation database. A security-conscious
+   admin can create a dedicated database user with access to just one table: ``CUSTOMZIPSERVICEREQUEST``.
+
+You may need to make extra Apache configuration changes to make sure ``/cgi-bin/zipdownload`` is accessible from the outside.
+For example, if this is the same Apache that's in front of your Dataverse installation Payara instance, you will need to
+add another pass through statement to your configuration:
+
+``ProxyPassMatch ^/cgi-bin/zipdownload !``
+
+Test this by accessing it directly at ``<SERVER URL>/cgi-bin/download``. You should get a ``404 No such download job!``.
+If instead you are getting an "internal server error", this may be an SELinux issue; try ``setenforce Permissive``.
+If you are getting a generic Dataverse collection "not found" page, review the ``ProxyPassMatch`` rule you have added.
+
+To activate in your Dataverse installation::
+
+   curl -X PUT -d '/cgi-bin/zipdownload' http://localhost:8080/api/admin/settings/:CustomZipDownloadServiceUrl
+
+.. _external-exporters:
+
+External Metadata Exporters
++++++++++++++++++++++++++++
+
+Dataverse 5.14+ supports the configuration of external metadata exporters (just "external exporters" or "exporters" for short) as a way to add additional metadata export formats or replace built-in formats. For a list of built-in formats, see :ref:`metadata-export-formats` in the User Guide.
+
+This should be considered an **experimental** capability in that the mechanism is expected to evolve and using it may require additional effort when upgrading to new Dataverse versions.
+
+Enabling External Exporters
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Use the :ref:`dataverse.spi.exporters.directory` configuration option to specify a directory from which external exporters (JAR files) should be loaded.
+
+.. _inventory-of-external-exporters:
+
+Inventory of External Exporters
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For a list of external exporters, see the README at https://github.com/gdcc/dataverse-exporters. To highlight a few:
+
+- Croissant
+- RO-Crate
+
+Developing New Exporters
+^^^^^^^^^^^^^^^^^^^^^^^^
 
-Please note that "Network Ports" under the :doc:`config` section has more information on fronting Glassfish with Apache. The :doc:`shibboleth` section talks about the use of ``ProxyPassMatch``.
+See :doc:`/developers/metadataexport` for details about how to develop new exporters.
diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index 0a66a010ac9..f12a5d7dc7d 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -1,16 +1,17 @@
-=============
 Configuration
 =============
 
-Now that you've successfully logged into Dataverse with a superuser account after going through a basic :doc:`installation-main`, you'll need to secure and configure your installation.
+Now that you've successfully logged into your Dataverse installation with a superuser account after going through a basic :doc:`installation-main`, you'll need to secure and configure your installation.
 
-Settings within Dataverse itself are managed via JVM options or by manipulating values in the ``setting`` table directly or through API calls.
+Settings within your Dataverse installation itself are managed via JVM options or by manipulating values in the ``setting`` table directly or through API calls.
 
-Once you have finished securing and configuring your Dataverse installation, you may proceed to the :doc:`/admin/index` for more information on the ongoing administration of a Dataverse installation. Advanced configuration topics are covered in the :doc:`r-rapache-tworavens`, :doc:`shibboleth` and :doc:`oauth2` sections.
+Once you have finished securing and configuring your Dataverse installation, you may proceed to the :doc:`/admin/index` for more information on the ongoing administration of a Dataverse installation. Advanced configuration topics are covered in the :doc:`shibboleth` and :doc:`oauth2` sections.
 
 .. contents:: |toctitle|
   :local:
 
+.. _securing-your-installation:
+
 Securing Your Installation
 --------------------------
 
@@ -24,18 +25,75 @@ The default password for the "dataverseAdmin" superuser account is "admin", as m
 Blocking API Endpoints
 ++++++++++++++++++++++
 
-The :doc:`/api/native-api` contains a useful but potentially dangerous API endpoint called "admin" that allows you to change system settings, make ordinary users into superusers, and more. The "builtin-users" endpoint lets people create a local/builtin user account if they know the key defined in :ref:`BuiltinUsers.KEY`. The endpoint "test" is not used but is where testing code maybe be added (see https://github.com/IQSS/dataverse/issues/4137 ).
+The :doc:`/api/native-api` contains a useful but potentially dangerous set of API endpoints called "admin" that allows you to change system settings, make ordinary users into superusers, and more. The "builtin-users" endpoints let admins do tasks such as creating a local/builtin user account if they know the key defined in :ref:`BuiltinUsers.KEY`.
+
+By default in the code, most of these API endpoints can be operated on remotely and a number of endpoints do not require authentication. However, the endpoints "admin" and "builtin-users" are limited to localhost out of the box by the installer, using the JvmSettings :ref:`dataverse.api.blocked.endpoints` and :ref:`dataverse.api.blocked.policy`.
+
+.. note::
+   The database settings :ref:`:BlockedApiEndpoints` and :ref:`:BlockedApiPolicy` are deprecated and will be removed in a future version. Please use the JvmSettings mentioned above instead.
+
+It is **very important** to keep the block in place for the "admin" endpoint, and to leave the "builtin-users" endpoint blocked unless you need to access it remotely. Documentation for the "admin" endpoint is spread across the :doc:`/api/native-api` section of the API Guide and the :doc:`/admin/index`.
+
+Given how important it is to avoid exposing the "admin" and "builtin-user" APIs, sites using a proxy, e.g. Apache or Nginx, should also consider blocking them through rules in the proxy.
+The following examples may be useful:
+
+Apache/Httpd Rule:
+
+Rewrite lines added to /etc/httpd/conf.d/ssl.conf. They can be the first lines inserted after the RewriteEngine On statement:
 
-By default, most APIs can be operated on remotely and a number of endpoints do not require authentication. The endpoints "admin" and "test" are limited to localhost out of the box by the settings :ref:`:BlockedApiEndpoints` and :ref:`:BlockedApiPolicy`.
+.. code-block:: apache
 
-It is very important to keep the block in place for the "admin" endpoint (and at least consider blocking "builtin-users"). Please note that documentation for the "admin" endpoint is spread across the :doc:`/api/native-api` section of the API Guide and the :doc:`/admin/index`.
+    RewriteRule   ^/api/(admin|builtin-users)           - [R=403,L]
+    RewriteRule   ^/api/(v[0-9]*)/(admin|builtin-users) - [R=403,L]
 
-It's also possible to prevent file uploads via API by adjusting the :ref:`:UploadMethods` database setting.
+Nginx Configuration Rule:
+
+.. code-block:: nginx
+
+    location ~ ^/api/(admin|v1/admin|builtin-users|v1/builtin-users) {
+        deny all;
+        return 403;
+    }
+ 
+If you are using a load balancer or a reverse proxy, there are some additional considerations. If no additional configurations are made and the upstream is configured to redirect to localhost, the API will be accessible from the outside, as your installation will register as origin the localhost for any requests to the endpoints "admin" and "builtin-users". To prevent this, you have two options:
+
+- If your upstream is configured to redirect to localhost, you will need to set the :ref:`JVM option <useripaddresssourceheader>` to one of the following values ``%client.name% %datetime% %request% %status% %response.length% %header.referer% %header.x-forwarded-for%`` and configure from the load balancer side the chosen header to populate with the client IP address.
+
+- Another solution is to set the upstream to the client IP address. In this case no further configuration is needed.
+
+For more information on configuring blocked API endpoints, see :ref:`dataverse.api.blocked.endpoints` and :ref:`dataverse.api.blocked.policy` in the JvmSettings documentation.
+
+.. note::
+   It's also possible to prevent file uploads via API by adjusting the :ref:`:UploadMethods` database setting.
 
 Forcing HTTPS
 +++++++++++++
 
-To avoid having your users send credentials in the clear, it's strongly recommended to force all web traffic to go through HTTPS (port 443) rather than HTTP (port 80). The ease with which one can install a valid SSL cert into Apache compared with the same operation in Glassfish might be a compelling enough reason to front Glassfish with Apache. In addition, Apache can be configured to rewrite HTTP to HTTPS with rules such as those found at https://wiki.apache.org/httpd/RewriteHTTPToHTTPS or in the section on :doc:`shibboleth`.
+To avoid having your users send credentials in the clear, it's strongly recommended to force all web traffic to go through HTTPS (port 443) rather than HTTP (port 80). The ease with which one can install a valid SSL cert into Apache compared with the same operation in Payara might be a compelling enough reason to front Payara with Apache. In addition, Apache can be configured to rewrite HTTP to HTTPS with rules such as those found at https://wiki.apache.org/httpd/RewriteHTTPToHTTPS or in the section on :doc:`shibboleth`.
+
+
+.. _user-ip-addresses-proxy-security:
+
+Recording User IP Addresses
++++++++++++++++++++++++++++
+
+By default, the Dataverse installation captures the IP address from which requests originate. This is used for multiple purposes including controlling access to the admin API, IP-based user groups and Make Data Count reporting. When the Dataverse installation is configured behind a proxy such as a load balancer, this default setup may not capture the correct IP address. In this case all the incoming requests will be logged in the access logs, MDC logs etc., as if they are all coming from the IP address(es) of the load balancer itself. Proxies usually save the original address in an added HTTP header, from which it can be extracted. For example, AWS LB records the "true" original address in the standard ``X-Forwarded-For`` header. If your Dataverse installation is running behind an IP-masking proxy, but you would like to use IP groups, or record the true geographical location of the incoming requests with Make Data Count, you may enable the IP address lookup from the proxy header using the JVM option  ``dataverse.useripaddresssourceheader``, described further below. 
+
+Before doing so however, you must absolutely **consider the security risks involved**! This option must be enabled **only** on a Dataverse installation that is in fact fully behind a proxy that properly, and consistently, adds the ``X-Forwarded-For`` (or a similar) header to every request it forwards. Consider the implications of activating this option on a Dataverse installation that is not running behind a proxy, *or running behind one, but still accessible from the insecure locations bypassing the proxy*: Anyone can now add the header above to an incoming request, supplying an arbitrary IP address that the Dataverse installation will trust as the true origin of  the call. Thus giving an attacker an easy way to, for example, get in a privileged IP group. The implications could be even more severe if an attacker were able to pretend to be coming from ``localhost``, if a Dataverse installation is configured to trust localhost connections for unrestricted access to the admin API! We have addressed this by making it so that Dataverse installation should never accept ``localhost``, ``127.0.0.1``, ``0:0:0:0:0:0:0:1`` etc. when supplied in such a header. But if you have reasons to still find this risk unacceptable, you may want to consider turning open localhost access to the API off (See :ref:`Securing Your Installation <securing-your-installation>` for more information.)
+
+This is how to verify that your proxy or load balancer, etc. is handling the originating address headers properly and securely: Make sure access logging is enabled in your application server (Payara) configuration. (``<http-service access-logging-enabled="true">`` in the ``domain.xml``). Add the address header to the access log format. For example, on a system behind AWS ELB, you may want to use something like ``%client.name% %datetime% %request% %status% %response.length% %header.referer% %header.x-forwarded-for%``. Once enabled, access the Dataverse installation from outside the LB. You should now see the real IP address of your remote client in the access log. For example, something like: 
+``"1.2.3.4" "01/Jun/2020:12:00:00 -0500" "GET /dataverse.xhtml HTTP/1.1" 200 81082  "NULL-REFERER" "128.64.32.16"`` 
+
+In this example, ``128.64.32.16`` is your remote address (that you should verify), and ``1.2.3.4`` is the address of your LB. If you're not seeing your remote address in the log, do not activate the JVM option! Also, verify that all the entries in the log have this header populated. The only entries in the access log that you should be seeing without this header (logged as ``"NULL-HEADER-X-FORWARDED-FOR"``) are local requests, made from localhost, etc. In this case, since the request is not coming through the proxy, the local IP address should be logged as the primary one (as the first value in the log entry, ``%client.name%``). If you see any requests coming in from remote, insecure subnets without this header - do not use the JVM option! 
+
+Once you are ready, enable the :ref:`JVM option <useripaddresssourceheader>`. Verify that the remote locations are properly tracked in your MDC metrics, and/or your IP groups are working. As a final test, if your Dataverse installation is allowing unrestricted localhost access to the admin API, imitate an attack in which a malicious request is pretending to be coming from ``127.0.0.1``. Try the following from a remote, insecure location:
+
+``curl https://your.dataverse.edu/api/admin/settings --header "X-FORWARDED-FOR: 127.0.0.1"``
+
+First of all, confirm that access is denied! If you are in fact able to access the settings api from a location outside the proxy, **something is seriously wrong**, so please let us know, and stop using the JVM option.  Otherwise check the access log entry for the header value. What you should see is something like ``"127.0.0.1, 128.64.32.16"``. Where the second address should be the real IP of your remote client. The fact that the "fake" ``127.0.0.1`` you sent over is present in the header is perfectly ok. This is the proper proxy behavior - it preserves any incoming values in the ``X-Forwarded-Header``, if supplied, and adds the detected incoming address to it, *on the right*. It is only this rightmost comma-separated value that Dataverse installation should ever be using. 
+
+Still feel like activating this option in your configuration? - Have fun and be safe!
+
 
 .. _PrivacyConsiderations:
 
@@ -45,23 +103,69 @@ Privacy Considerations
 Email Privacy
 ^^^^^^^^^^^^^
 
-Out of the box, Dataverse will list email addresses of the contacts for datasets when users visit a dataset page and click the "Export Metadata" button. Additionally, out of the box, Dataverse will list email addresses of dataverse contacts via API (see :ref:`View a Dataverse <view-dataverse>` in the :doc:`/api/native-api` section of the API Guide). If you would like to exclude these email addresses from export, set :ref:`:ExcludeEmailFromExport <:ExcludeEmailFromExport>` to true.
+Out of the box, your Dataverse installation will list email addresses of the contacts for datasets when users visit a dataset page and click the "Export Metadata" button. Additionally, out of the box, the Dataverse installation will list email addresses of Dataverse collection contacts via API (see :ref:`View a Dataverse Collection <view-dataverse>` in the :doc:`/api/native-api` section of the API Guide). If you would like to exclude these email addresses from export, set :ref:`:ExcludeEmailFromExport <:ExcludeEmailFromExport>` to true.
 
 Additional Recommendations
 ++++++++++++++++++++++++++
-Run Glassfish as a User Other Than Root
-+++++++++++++++++++++++++++++++++++++++
 
-See the Glassfish section of :doc:`prerequisites` for details and init scripts for running Glassfish as non-root.
+Run Payara as a User Other Than Root
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+See the :ref:`payara` section of :doc:`prerequisites` for details and init scripts for running Payara as non-root.
+
+Related to this is that you should remove ``/root/.payara/pass`` to ensure that Payara isn't ever accidentally started as root. Without the password, Payara won't be able to start as root, which is a good thing.
+
+.. _secure-password-storage:
+
+Secure Password Storage
+^^^^^^^^^^^^^^^^^^^^^^^
 
-Related to this is that you should remove ``/root/.glassfish/pass`` to ensure that Glassfish isn't ever accidentally started as root. Without the password, Glassfish won't be able to start as root, which is a good thing.
+In development or demo scenarios, we suggest not to store passwords in files permanently.
+We recommend the use of at least environment variables or production-grade mechanisms to supply passwords.
+
+In a production setup, permanently storing passwords as plaintext should be avoided at all cost.
+Environment variables are dangerous in shared environments and containers, as they may be easily exploited; we suggest not to use them.
+Depending on your deployment model and environment, you can make use of the following techniques to securely store and access passwords.
+
+**Password Aliases**
+
+A `password alias`_ allows you to have a plaintext reference to an encrypted password stored on the server, with the alias being used wherever the password is needed.
+This method is especially useful in a classic deployment, as it does not require any external secrets management.
+
+Password aliases are consumable as a MicroProfile Config source and can be referrenced by their name in a `property expression`_.
+You may also reference them within a `variable substitution`_, e.g. in your ``domain.xml``.
+
+Creation example for an alias named *my.alias.name*:
+
+.. code-block:: shell
+
+  echo "AS_ADMIN_ALIASPASSWORD=changeme" > /tmp/p.txt
+  asadmin create-password-alias --passwordfile "/tmp/p.txt" "my.alias.name"
+  rm /tmp/p.txt
+
+Note: omitting the ``--passwordfile`` parameter allows creating the alias in an interactive fashion with a prompt.
+
+**Secrets Files**
+
+Payara has a builtin MicroProfile Config source to consume values from files in a directory on your filesystem.
+This `directory config source`_ is most useful and secure with external secrets management in place, temporarily mounting cleartext passwords as files.
+Examples are Kubernetes / OpenShift `Secrets <https://kubernetes.io/docs/concepts/configuration/secret/>`_ or tools like `Vault Agent <https://developer.hashicorp.com/vault/docs/agent-and-proxy/agent>`_.
+
+Please follow the `directory config source`_ documentation to learn about its usage.
+
+**Cloud Providers**
+
+Running Dataverse on a cloud platform or running an external secret management system like `Vault <https://developer.hashicorp.com/vault>`_ enables accessing secrets without any intermediate storage of cleartext.
+Obviously this is the most secure option for any deployment model, but it may require more resources to set up and maintain - your mileage may vary.
+
+Take a look at `cloud sources`_ shipped with Payara to learn about their usage.
 
 Enforce Strong Passwords for User Accounts
-++++++++++++++++++++++++++++++++++++++++++
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Dataverse only stores passwords (as salted hash, and using a strong hashing algorithm) for "builtin" users. You can increase the password complexity rules to meet your security needs. If you have configured your Dataverse installation to allow login from remote authentication providers such as Shibboleth, ORCID, GitHub or Google, you do not have any control over those remote providers' password complexity rules. See the "Auth Modes: Local vs. Remote vs. Both" section below for more on login options.
+Your Dataverse installation only stores passwords (as salted hash, and using a strong hashing algorithm) for "builtin" users. You can increase the password complexity rules to meet your security needs. If you have configured your Dataverse installation to allow login from remote authentication providers such as Shibboleth, ORCID, GitHub or Google, you do not have any control over those remote providers' password complexity rules. See the :ref:`auth-modes` section below for more on login options.
 
-Even if you are satisfied with the out-of-the-box password complexity rules Dataverse ships with, for the "dataverseAdmin" account you should use a strong password so the hash cannot easily be cracked through dictionary attacks.
+Even if you are satisfied with the out-of-the-box password complexity rules the Dataverse Software ships with, for the "dataverseAdmin" account you should use a strong password so the hash cannot easily be cracked through dictionary attacks.
 
 Password complexity rules for "builtin" accounts can be adjusted with a variety of settings documented below. Here's a list:
 
@@ -74,79 +178,532 @@ Password complexity rules for "builtin" accounts can be adjusted with a variety
 - :ref:`:PVGoodStrength`
 - :ref:`:PVCustomPasswordResetAlertMessage`
 
+.. _samesite-cookie-attribute:
+
+SameSite Cookie Attribute
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The SameSite cookie attribute is defined in an upcoming revision to `RFC 6265 <https://datatracker.ietf.org/doc/html/rfc6265>`_ (HTTP State Management Mechanism) called `6265bis <https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-rfc6265bis-19>`_ ("bis" meaning "repeated"). The possible values are "None", "Lax", and "Strict". "Strict" is intended to help prevent Cross-Site Request Forgery (CSRF) attacks, as described in the RFC proposal and an OWASP `cheetsheet <https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#samesite-cookie-attribute>`_. We don't recommend "None" for security reasons.
+
+By default, Payara doesn't send the SameSite cookie attribute, which browsers should interpret as "Lax" according to `MDN <https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#controlling_third-party_cookies_with_samesite>`_.
+Dataverse installations are explicity set to "Lax" out of the box by the installer (in the case of a "classic" installation) or through the base image (in the case of a Docker installation). For classic, see :ref:`http.cookie-same-site-value` and :ref:`http.cookie-same-site-enabled` for how to change the values. For Docker, you must rebuild the :doc:`base image </container/base-image>`. See also Payara's `documentation <https://docs.payara.fish/community/docs/6.2024.6/Technical%20Documentation/Payara%20Server%20Documentation/General%20Administration/Administering%20HTTP%20Connectivity.html>`_ for the settings above.
+
+To inspect cookie attributes like SameSite, you can use ``curl -s -I http://localhost:8080 | grep JSESSIONID``, for example, looking for the "Set-Cookie" header.
+
+.. _ongoing-security:
+
+Ongoing Security of Your Installation
++++++++++++++++++++++++++++++++++++++
+
+Like any application, you should keep up-to-date with patches to both the Dataverse software and the platform (usually Linux) it runs on. Dataverse releases are announced on the dataverse-community_ mailing list, the Dataverse blog_, and in chat.dataverse.org_.
+
+.. _dataverse-community: https://groups.google.com/g/dataverse-community
+.. _blog: https://dataverse.org/blog
+.. _chat.dataverse.org: https://chat.dataverse.org
+
+In addition to these public channels, you can subscribe to receive security notices via email from the Dataverse team. These notices are sent to the ``contact_email`` in the installation spreadsheet_ and you can open an issue in the dataverse-installations_ repo to add or change the contact email. Security notices are also sent to people and organizations that prefer to remain anonymous. To be added to this private list, please email support@dataverse.org.
+
+.. _spreadsheet: https://docs.google.com/spreadsheets/d/1bfsw7gnHlHerLXuk7YprUT68liHfcaMxs1rFciA-mEo/edit#gid=0
+.. _dataverse-installations: https://github.com/IQSS/dataverse-installations
+
+For additional details about security practices by the Dataverse team, see the :doc:`/developers/security` section of the Developer Guide.
+
+.. _reporting-security-issues:
+
+Reporting Security Issues
++++++++++++++++++++++++++
+
+If you have a security issue to report, please email it to security@dataverse.org.
+
+.. _network-ports:
+
 Network Ports
 -------------
 
-Remember how under "Decisions to Make" in the :doc:`prep` section we mentioned you'll need to make a decision about whether or not to introduce a proxy in front of Dataverse such as Apache or nginx? The time has come to make that decision.
-
-The need to redirect port HTTP (port 80) to HTTPS (port 443) for security has already been mentioned above and the fact that Glassfish puts these services on 8080 and 8181, respectively, was touched on in the :doc:`installation-main` section. In production, you don't want to tell your users to use Dataverse on ports 8080 and 8181. You should have them use the standard HTTPS port, which is 443.
+Remember how under "Decisions to Make" in the :doc:`prep` section we mentioned you'll need to make a decision about whether or not to introduce a proxy in front of the Dataverse Software such as Apache or nginx? The time has come to make that decision.
 
-Your decision to proxy or not should primarily be driven by which features of Dataverse you'd like to use. If you'd like to use Shibboleth, the decision is easy because proxying or "fronting" Glassfish with Apache is required. The details are covered in the :doc:`shibboleth` section.
+The need to redirect port HTTP (port 80) to HTTPS (port 443) for security has already been mentioned above and the fact that Payara puts these services on 8080 and 8181, respectively, was touched on in the :doc:`installation-main` section. In production, you don't want to tell your users to use your Dataverse installation on ports 8080 and 8181. You should have them use the standard HTTPS port, which is 443.
 
-If you'd like to use TwoRavens, you should also consider fronting with Apache because you will be required to install an Apache anyway to make use of the rApache module. For details, see the :doc:`r-rapache-tworavens` section.
+Your decision to proxy or not should primarily be driven by which features of the Dataverse Software you'd like to use. If you'd like to use Shibboleth, the decision is easy because proxying or "fronting" Payara with Apache is required. The details are covered in the :doc:`shibboleth` section.
 
-Even if you have no interest in Shibboleth nor TwoRavens, you may want to front Dataverse with Apache or nginx to simply the process of installing SSL certificates. There are many tutorials on the Internet for adding certs to Apache, including a some `notes used by the Dataverse team <https://github.com/IQSS/dataverse/blob/v4.6.1/doc/shib/shib.md>`_, but the process of adding a certificate to Glassfish is arduous and not for the faint of heart. The Dataverse team cannot provide much help with adding certificates to Glassfish beyond linking to `tips <http://stackoverflow.com/questions/906402/importing-an-existing-x509-certificate-and-private-key-in-java-keystore-to-use-i>`_ on the web.
+Even if you have no interest in Shibboleth, you may want to front your Dataverse installation with Apache or nginx to simply the process of installing SSL certificates. There are many tutorials on the Internet for adding certs to Apache, including a some `notes used by the Dataverse Project team <https://github.com/IQSS/dataverse/blob/v4.6.1/doc/shib/shib.md>`_, but the process of adding a certificate to Payara is arduous and not for the faint of heart. The Dataverse Project team cannot provide much help with adding certificates to Payara beyond linking to `tips <https://stackoverflow.com/questions/906402/importing-an-existing-x509-certificate-and-private-key-in-java-keystore-to-use-i>`_ on the web.
 
-Still not convinced you should put Glassfish behind another web server? Even if you manage to get your SSL certificate into Glassfish, how are you going to run Glassfish on low ports such as 80 and 443? Are you going to run Glassfish as root? Bad idea. This is a security risk. Under "Additional Recommendations" under "Securing Your Installation" above you are advised to configure Glassfish to run as a user other than root. (The Dataverse team will close https://github.com/IQSS/dataverse/issues/1934 after updating the Glassfish init script provided in the :doc:`prerequisites` section to not require root.)
+Still not convinced you should put Payara behind another web server? Even if you manage to get your SSL certificate into Payara, how are you going to run Payara on low ports such as 80 and 443? Are you going to run Payara as root? Bad idea. This is a security risk. Under "Additional Recommendations" under "Securing Your Installation" above you are advised to configure Payara to run as a user other than root.
 
 There's also the issue of serving a production-ready version of robots.txt. By using a proxy such as Apache, this is a one-time "set it and forget it" step as explained below in the "Going Live" section.
 
-If you are convinced you'd like to try fronting Glassfish with Apache, the :doc:`shibboleth` section should be good resource for you.
+If you are convinced you'd like to try fronting Payara with Apache, the :doc:`shibboleth` section should be good resource for you.
 
-If you really don't want to front Glassfish with any proxy (not recommended), you can configure Glassfish to run HTTPS on port 443 like this:
+If you really don't want to front Payara with any proxy (not recommended), you can configure Payara to run HTTPS on port 443 like this:
 
 ``./asadmin set server-config.network-config.network-listeners.network-listener.http-listener-2.port=443``
 
-What about port 80? Even if you don't front Dataverse with Apache, you may want to let Apache run on port 80 just to rewrite HTTP to HTTPS as described above. You can use a similar command as above to change the HTTP port that Glassfish uses from 8080 to 80 (substitute ``http-listener-1.port=80``). Glassfish can be used to enforce HTTPS on its own without Apache, but configuring this is an exercise for the reader. Answers here may be helpful: http://stackoverflow.com/questions/25122025/glassfish-v4-java-7-port-unification-error-not-able-to-redirect-http-to
+What about port 80? Even if you don't front your Dataverse installation with Apache, you may want to let Apache run on port 80 just to rewrite HTTP to HTTPS as described above. You can use a similar command as above to change the HTTP port that Payara uses from 8080 to 80 (substitute ``http-listener-1.port=80``). Payara can be used to enforce HTTPS on its own without Apache, but configuring this is an exercise for the reader. Answers here may be helpful: https://stackoverflow.com/questions/25122025/glassfish-v4-java-7-port-unification-error-not-able-to-redirect-http-to
 
-If you are running an installation with Apache and Glassfish on the same server, and would like to restrict Glassfish from responding to any requests to port 8080 from external hosts (in other words, not through Apache), you can restrict the AJP listener to localhost only with:
+If you are running an installation with Apache and Payara on the same server, and would like to restrict Payara from responding to any requests to port 8080 from external hosts (in other words, not through Apache), you can restrict the AJP listener to localhost only with:
 
 ``./asadmin set server-config.network-config.network-listeners.network-listener.http-listener-1.address=127.0.0.1``
 
 You should **NOT** use the configuration option above if you are running in a load-balanced environment, or otherwise have the web server on a different host than the application server.
 
-Root Dataverse Permissions
---------------------------
+Root Dataverse Collection Permissions
+-------------------------------------
 
-The user who creates a dataverse is given the "Admin" role on that dataverse. The root dataverse is created automatically for you by the installer and the "Admin" is the superuser account ("dataverseAdmin") we used in the :doc:`installation-main` section to confirm that we can log in. These next steps of configuring the root dataverse require the "Admin" role on the root dataverse, but not the much more powerful superuser attribute. In short, users with the "Admin" role are subject to the permission system. A superuser, on the other hand, completely bypasses the permission system. You can give non-superusers the "Admin" role on the root dataverse if you'd like them to configure the root dataverse.
+The user who creates a Dataverse collection is given the "Admin" role on that Dataverse collection. The root Dataverse collection is created automatically for you by the installer and the "Admin" is the superuser account ("dataverseAdmin") we used in the :doc:`installation-main` section to confirm that we can log in. These next steps of configuring the root Dataverse collection require the "Admin" role on the root Dataverse collection, but not the much more powerful superuser attribute. In short, users with the "Admin" role are subject to the permission system. A superuser, on the other hand, completely bypasses the permission system. You can give non-superusers the "Admin" role on the root Dataverse collection if you'd like them to configure the root Dataverse collection.
 
-In order for non-superusers to start creating dataverses or datasets, you need click "Edit" then "Permissions" and make choices about which users can add dataverses or datasets within the root dataverse. (There is an API endpoint for this operation as well.) Again, the user who creates a dataverse will be granted the "Admin" role on that dataverse. Non-superusers who are not "Admin" on the root dataverse will not be able to to do anything useful until the root dataverse has been published.
+In order for non-superusers to start creating Dataverse collections or datasets, you need click "Edit" then "Permissions" and make choices about which users can add Dataverse collections or datasets within the root Dataverse collection. (There is an API endpoint for this operation as well.) Again, the user who creates a Dataverse collection will be granted the "Admin" role on that Dataverse collection. Non-superusers who are not "Admin" on the root Dataverse collection will not be able to do anything useful until the root Dataverse collection has been published.
 
-As the person installing Dataverse you may or may not be a local metadata expert. You may want to have others sign up for accounts and grant them the "Admin" role at the root dataverse to configure metadata fields, templates, browse/search facets, guestbooks, etc. For more on these topics, consult the :doc:`/user/dataverse-management` section of the User Guide.
+As the person installing the Dataverse Software, you may or may not be a local metadata expert. You may want to have others sign up for accounts and grant them the "Admin" role at the root Dataverse collection to configure metadata fields, templates, browse/search facets, guestbooks, etc. For more on these topics, consult the :doc:`/user/dataverse-management` section of the User Guide.
+
+.. _pids-configuration:
 
 Persistent Identifiers and Publishing Datasets
 ----------------------------------------------
 
-Persistent identifiers are a required and integral part of the Dataverse platform. They provide a URL that is guaranteed to resolve to the datasets or files they represent. Dataverse currently supports creating identifiers using DOI and Handle.
+Persistent identifiers (PIDs) are a required and integral part of the Dataverse Software. They provide a URL that is
+guaranteed to resolve to the datasets or files they represent. The Dataverse Software currently supports creating
+identifiers using any of several PID types. The most appropriate PIDs for public data are DOIs (e.g., provided by
+DataCite or EZID) and Handles. Dataverse also supports PermaLinks which could be useful for intranet or catalog use
+cases. A DOI provider called "FAKE" is recommended only for testing and development purposes.
 
-By default, the installer configures a default DOI namespace (10.5072) with DataCite as the registration provider. Please note that as of the release 4.9.3, we can no longer use EZID as the provider. Unlike EZID, DataCite requires that you register for a test account, configured with your own prefix (please contact support@datacite.org). Once you receive the login name, password, and prefix for the account, configure the credentials in your domain.xml, as the following two JVM options::
+Dataverse can be configured with one or more PID providers, each of which can mint and manage PIDs with a given protocol 
+(e.g., doi, handle, permalink) using a specific service provider/account (e.g. with DataCite, EZId, or HandleNet) 
+to manage an authority/shoulder combination, aka a "prefix" (PermaLinks also support custom separator characters as part of the prefix), 
+along with an optional list of individual PIDs (with different authority/shoulders) than can be managed with that account.
 
-      <jvm-options>-Ddoi.username=...</jvm-options>
-      <jvm-options>-Ddoi.password=...</jvm-options>
+Dataverse automatically manages assigning PIDs and making them findable when datasets are published. There are also :ref:`API calls that
+allow updating the PID target URLs and metadata of already-published datasets manually if needed <send-metadata-to-pid-provider>`, e.g. if a Dataverse instance is
+moved to a new URL or when the software is updated to generate additional metadata or address schema changes at the PID service.
 
-and restart Glassfish. The prefix can be configured via the API (where it is referred to as "Authority"):
+Note that while some forms of PIDs (Handles, PermaLinks) are technically case sensitive, common practice is to avoid creating PIDs that differ only by case.
+Dataverse treats PIDs of all types as case-insensitive (as DOIs are by definition). This means that Dataverse will find datasets (in search, to display dataset pages, etc.) 
+when the PIDs entered do not match the case of the original but will have a problem if two PIDs that differ only by case exist in one instance.
 
-``curl -X PUT -d 10.xxxx http://localhost:8080/api/admin/settings/:Authority``
+Testing PID Providers
++++++++++++++++++++++
 
-Once this is done, you will be able to publish datasets and files, but the persistent identifiers will not be citable, and they will only resolve from the DataCite test environment (and then only if the Dataverse from which you published them is accessible - DOIs minted from your laptop will not resolve). Note that any datasets or files created using the test configuration cannot be directly migrated and would need to be created again once a valid DOI namespace is configured.
+By default, the installer configures the Fake DOI provider as the registration provider. Unlike other DOI Providers, the Fake Provider does not involve any
+external resolution service and is not appropriate for use beyond development and testing. You may wish instead to test with 
+PermaLinks or with a DataCite test account (which uses DataCite's test infrastructure and will help assure your Dataverse instance can make network connections to DataCite.
+DataCite requires that you register for a test account, which will have a username, password and your own prefix (please contact support@datacite.org for a test account.
+You may wish to `contact the GDCC <https://www.gdcc.io/about.html>`_ instead - GDCC is able to provide DataCite accounts with a group discount and can also provide test accounts.).
 
-To properly configure persistent identifiers for a production installation, an account and associated namespace must be acquired for a fee from a DOI or HDL provider. **DataCite** (https://www.datacite.org) is the recommended DOI provider (see https://dataverse.org/global-dataverse-community-consortium for more on joining DataCite) but **EZID** (http://ezid.cdlib.org) is an option for the University of California according to https://www.cdlib.org/cdlinfo/2017/08/04/ezid-doi-service-is-evolving/ . **Handle.Net** (https://www.handle.net) is the HDL provider.
+Once you receive the login name, password, and prefix for the account,
+configure the credentials as described below. 
 
-Once you have your DOI or Handle account credentials and a namespace, configure Dataverse to use them using the JVM options and database settings below.
+Alternately, you may wish to configure other providers for testing: 
 
-Configuring Dataverse for DOIs
-++++++++++++++++++++++++++++++
+- EZID is available to University of California scholars and researchers. Testing can be done using the authority 10.5072 and shoulder FK2 with the "apitest" account (contact EZID for credentials) or an institutional account. Configuration in Dataverse is then analogous to using DataCite.
+   
+- The PermaLink provider, like the FAKE DOI provider, does not involve an external account.
+  Unlike the Fake DOI provider, the PermaLink provider creates PIDs that begin with "perma:", making it clearer that they are not DOIs,
+  and that do resolve to the local dataset/file page in Dataverse, making them useful for some production use cases. See :ref:`permalinks` and (for the FAKE DOI provider) the :doc:`/developers/dev-environment` section of the Developer Guide.
 
-By default Dataverse attempts to register DOIs for each dataset and file under a test authority, though you must apply for your own credentials as explained above.
+Provider-specific configuration is described below.
 
-Here are the configuration options for DOIs:
+Once all is configured, you will be able to publish datasets and files, but **the persistent identifiers will not be citable**
+as they, with the exception of PermaLinks, will not redirect to your dataset page in Dataverse.
 
-**JVM Options:**
+Note that any datasets or files created using a test configuration cannot be directly migrated to a production PID provider 
+and would need to be created again once a valid PID Provider(s) are configured.
+
+One you are done testing, to properly configure persistent identifiers for a production installation, an account and associated namespace (e.g. authority/shoulder) must be
+acquired for a fee from a DOI or HDL provider. (As noted above, PermaLinks May be appropriate for intranet and catalog uses cases.)
+**DataCite** (https://www.datacite.org) is the recommended DOI provider
+(see https://dataversecommunity.global for more on joining DataCite through the Global Dataverse Community Consortium) but **EZID**
+(http://ezid.cdlib.org) is an option for the University of California according to
+https://www.cdlib.org/cdlinfo/2017/08/04/ezid-doi-service-is-evolving/ .
+**Handle.Net** (https://www.handle.net) is the HDL provider.
+
+Once you have your DOI or Handle account credentials and a prefix, configure your Dataverse installation
+using the settings below.
+
+ 
+Configuring PID Providers
++++++++++++++++++++++++++
+
+There are two required global settings to configure PID providers - the list of ids of providers and which one of those should be the default.
+Per-provider settings are also required - some that are common to all types and some type specific. All of these settings are defined 
+to be compatible with the MicroProfile specification which means that
+
+1. Any of these settings can be set via system properties (see :ref:`jvm-options` for how to do this), environment variables, or other
+   MicroProfile Config mechanisms supported by the app server.
+   `See Payara docs for supported sources <https://docs.payara.fish/community/docs/documentation/microprofile/config/README.html#config-sources>`_.
+2. Remember to protect your secrets. For passwords, use an environment variable (bare minimum), a password alias named the same
+   as the key (OK) or use the `"dir config source" of Payara <https://docs.payara.fish/community/docs/documentation/microprofile/config/directory.html>`_ (best).
+
+   Alias creation example:
+
+   .. code-block:: shell
+
+      echo "AS_ADMIN_ALIASPASSWORD=changeme" > /tmp/p.txt
+      asadmin create-password-alias --passwordfile /tmp/p.txt dataverse.pid.datacite1.datacite.password
+      rm /tmp/p.txt
+
+3. Environment variables follow the key, replacing any dot, colon, dash, etc. into an underscore "_" and all uppercase
+   letters. Example: ``dataverse.pid.default-provider`` -> ``DATAVERSE_PID_DEFAULT_PROVIDER``
+   
+Global Settings
+^^^^^^^^^^^^^^^
+
+The following two global settings are required to configure PID Providers in the Dataverse software:
+
+.. _dataverse.pid.providers:
+
+dataverse.pid.providers
+^^^^^^^^^^^^^^^^^^^^^^^
+
+A comma-separated list of the ids of the PID providers to use. IDs should be simple unique text strings, e.g. datacite1, perma1, etc.
+IDs are used to scope the provider-specific settings but are not directly visible to users. 
+
+.. _dataverse.pid.default-provider:
+
+dataverse.pid.default-provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The ID of the default PID provider to use.
+
+.. _dataverse.spi.pidproviders.directory:
+
+dataverse.spi.pidproviders.directory
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The path to the directory where JAR files containing additional types of PID Providers can be added.
+Dataverse includes providers that support DOIs (DataCite, EZId, or FAKE), Handles, and PermaLinks.
+PID provider jar files added to this directory can replace any of these or add new PID Providers.
+
+Per-Provider Settings
+^^^^^^^^^^^^^^^^^^^^^
+
+Each Provider listed by id in the dataverse.pid.providers setting must be configured with the following common settings and any settings that are specific to the provider type.
+
+.. _dataverse.pid.*.type:
+
+dataverse.pid.*.type
+^^^^^^^^^^^^^^^^^^^^
+
+The Provider type, currently one of ``datacite``, ``ezid``, ``FAKE``, ``hdl``, or ``perma``. The type defines which protocol a service supports (DOI, Handle, or PermaLink) and, for DOI Providers, which 
+DOI service is used.
+
+.. _dataverse.pid.*.label:
+
+dataverse.pid.*.label
+^^^^^^^^^^^^^^^^^^^^^
+
+A human-readable label for the provider
+
+.. _dataverse.pid.*.authority:
+
+dataverse.pid.*.authority
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. _dataverse.pid.*.shoulder:
+
+dataverse.pid.*.shoulder
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+In general, PIDs are of the form ``<protocol>:<authority>/<shoulder>*`` where ``*`` is the portion unique to an individual PID. PID Providers must define
+the authority and shoulder (with the protocol defined by the ``dataverse.pid.*.type`` setting) that defines the set of existing PIDs they can manage and the prefix they can use when minting new PIDs.
+(Often an account with a PID service provider will be limited to using a single authority/shoulder. If your PID service provider account allows more than one combination that you wish to use in Dataverse, configure multiple PID Provider, one for each combination.)
+ 
+.. _dataverse.pid.*.identifier-generation-style:
+
+dataverse.pid.*.identifier-generation-style
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+By default, Pid Providers in Dataverse generate a random 6 character string,
+pre-pended by the Shoulder if set, to use as the identifier for a Dataset.
+Set this to ``storedProcGenerated`` to generate instead a custom *unique*
+identifier (again pre-pended by the Shoulder if set) through a database
+stored procedure or function (the assumed default setting is ``randomString``).
+When using the ``storedProcGenerated`` setting, a stored procedure or function must be created in
+the database.
+
+As a first example, the script below (downloadable
+:download:`here </_static/util/createsequence.sql>`) produces
+sequential numerical values. You may need to make some changes to suit your
+system setup, see the comments for more information:
+
+.. literalinclude:: ../_static/util/createsequence.sql
+   :language: plpgsql
+
+As a second example, the script below (downloadable
+:download:`here </_static/util/identifier_from_timestamp.sql>`) produces
+sequential 8 character identifiers from a base36 representation of current
+timestamp.
+
+.. literalinclude:: ../_static/util/identifier_from_timestamp.sql
+   :language: plpgsql
+
+Note that the SQL in these examples scripts is Postgres-specific.
+If necessary, it can be reimplemented in any other SQL flavor - the standard
+JPA code in the application simply expects the database to have a saved
+function ("stored procedure") named ``generateIdentifierFromStoredProcedure()``
+returning a single ``varchar`` argument.
+
+Please note that this setting interacts with the ``dataverse.pid.*.datafile-pid-format``
+setting below to determine how datafile identifiers are generated.
+
+
+.. _dataverse.pid.*.datafile-pid-format:
+
+dataverse.pid.*.datafile-pid-format
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This setting controls the way that the "identifier" component of a file's
+persistent identifier (PID) relates to the PID of its "parent" dataset - for a give PID Provider.
+
+By default the identifier for a file is dependent on its parent dataset.
+For example, if the identifier of a dataset is "TJCLKP", the identifier for
+a file within that dataset will consist of the parent dataset's identifier
+followed by a slash ("/"), followed by a random 6 character string,
+yielding "TJCLKP/MLGWJO". Identifiers in this format are what you should
+expect if you leave ``dataverse.pid.*.datafile-pid-format`` undefined or set it to
+``DEPENDENT`` and have not changed the ``dataverse.pid.*.identifier-generation-style``
+setting from its default.
+
+Alternatively, the identifier for File PIDs can be configured to be
+independent of Dataset PIDs using the setting ``INDEPENDENT``.
+In this case, file PIDs will not contain the PIDs of their parent datasets,
+and their PIDs will be generated the exact same way that datasets' PIDs are,
+based on the ``dataverse.pid.*.identifier-generation-style`` setting described above
+(random 6 character strings or custom unique identifiers through a stored
+procedure, pre-pended by any shoulder).
+
+The chart below shows examples from each possible combination of parameters
+from the two settings. ``dataverse.pid.*.identifier-generation-style`` can be either
+``randomString`` (the default) or ``storedProcGenerated`` and
+``dataverse.pid.*.datafile-pid-format`` can be either ``DEPENDENT`` (the default) or
+``INDEPENDENT``. In the examples below the "identifier" for the dataset is
+"TJCLKP" for ``randomString`` and "100001" for ``storedProcGenerated`` (when
+using sequential numerical values, as described in
+:ref:`dataverse.pid.*.identifier-generation-style` above), or "krby26qt" for
+``storedProcGenerated`` (when using base36 timestamps, as described in
+:ref:`dataverse.pid.*.identifier-generation-style` above).
+
++-----------------+---------------+----------------------+---------------------+
+|                 | randomString  | storedProcGenerated  | storedProcGenerated |
+|                 |               |                      |                     |
+|                 |               | (sequential numbers) | (base36 timestamps) |
++=================+===============+======================+=====================+
+| **DEPENDENT**   | TJCLKP/MLGWJO | 100001/1             | krby26qt/1          |
++-----------------+---------------+----------------------+---------------------+
+| **INDEPENDENT** | MLGWJO        | 100002               | krby27pz            |
++-----------------+---------------+----------------------+---------------------+
+
+As seen above, in cases where ``dataverse.pid.*.identifier-generation-style`` is set to
+``storedProcGenerated`` and ``dataverse.pid.*.datafile-pid-format`` is set to ``DEPENDENT``,
+each file within a dataset will be assigned a number *within* that dataset
+starting with "1".
+
+Otherwise, if ``dataverse.pid.*.datafile-pid-format`` is set to ``INDEPENDENT``, each file
+within the dataset is assigned with a new PID which is the next available
+identifier provided from the database stored procedure. In our example:
+"100002" when using sequential numbers or "krby27pz" when using base36
+timestamps.
+
+.. _dataverse.pid.*.managed-list:
+
+dataverse.pid.*.managed-list
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. _dataverse.pid.*.excluded-list:
+
+dataverse.pid.*.excluded-list
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+With at least some PID services, it is possible for the authority(permission) to manage specific individual PIDs
+to be transferred between accounts. To handle these cases, the individual PIDs, written in the
+standard format, e.g. doi:10.5072/FK2ABCDEF can be added to the comma-separated ``managed`` or ``excluded`` list
+for a given provider. For entries on the ``managed- list``, Dataverse will assume this PID
+Provider/account can update the metadata and landing URL for the PID at the service provider
+(even though it does not match the provider's authority/shoulder settings). Conversely,
+Dataverse will assume that PIDs on the ``excluded-list`` cannot be managed/updated by this provider
+(even though they match the provider's authority/shoulder settings). These settings are optional
+with the default assumption that these lists are empty.
+
+.. _dataverse.pid.*.datacite:
+
+DataCite-specific Settings
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.datacite.mds-api-url
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+dataverse.pid.*.datacite.rest-api-url
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+dataverse.pid.*.datacite.username
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+dataverse.pid.*.datacite.password
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+PID Providers of type ``datacite`` require four additional parameters that define how the provider connects to DataCite.
+DataCite has two APIs that are used in Dataverse:
+
+The base URL of the `DataCite MDS API <https://support.datacite.org/reference/overview>`_,
+used to mint and manage DOIs. Current valid values for ``dataverse.pid.*.datacite.mds-api-url`` are "https://mds.datacite.org" (production) and "https://mds.test.datacite.org" (testing, the default).
+
+The `DataCite REST API <https://support.datacite.org/reference/introduction>`_ is also used - :ref:`PIDs API <pids-api>` information retrieval and :doc:`/admin/make-data-count`.
+Current valid values for ``dataverse.pid.*.datacite.rest-api-url`` are "https://api.datacite.org" (production) and "https://api.test.datacite.org" (testing, the default).
+
+DataCite uses `HTTP Basic authentication <https://en.wikipedia.org/wiki/Basic_access_authentication>`_
+for `Fabrica <https://doi.datacite.org/>`_ and their APIs. You need to provide
+the same credentials (``username``, ``password``) to Dataverse software to mint and manage DOIs for you.
+As noted above, you should use one of the more secure options for setting the password.
+
+CrossRef-specific Settings
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.crossref.url
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+dataverse.pid.*.crossref.rest-api-url
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+dataverse.pid.*.crossref.username
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+dataverse.pid.*.crossref.password
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+dataverse.pid.*.crossref.depositor
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+dataverse.pid.*.crossref.depositor-email
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+CrossRef is an experimental provider.
+PID Providers of type ``crossref`` require six additional parameters that define how the provider connects to CrossRef.
+CrossRef has two APIs that are used in Dataverse:
+
+The base URL of the `CrossRef <https://api.crossref.org>`_,
+used to mint and manage DOIs. Current valid values for ``dataverse.pid.*.crossref.url`` are "https://doi.crossref.org" and ``dataverse.pid.*.crossref.rest-api-url`` are "https://api.crossref.org" (production).
+``dataverse.pid.*.crossref.username=crusername``
+``dataverse.pid.*.crossref.password=secret``
+``dataverse.pid.*.crossref.depositor=xyz``
+``dataverse.pid.*.crossref.depositor-email=xyz@example.com``
+
+CrossRef uses `HTTP Basic authentication <https://en.wikipedia.org/wiki/Basic_access_authentication>`_
+XML files can be POSTed to CrossRef where they are added to the submission queue to await processing
+`Post URL <https://doi.crossref.org/>`_
+REST API allows the search and reuse our members' metadata.
+`Rest API <https://api.crossref.org/>`_ and their APIs.
+You need to provide the same credentials (``username``, ``password``) to Dataverse software to mint and manage DOIs for you.
+As noted above, you should use one of the more secure options for setting the password.
+Depositor and Depositor Email are used for the generation and distribution of Depositor reports.
+
+.. _dataverse.pid.*.ezid:
+
+EZId-specific Settings
+^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.ezid.api-url
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+dataverse.pid.*.ezid.username
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+dataverse.pid.*.ezid.password
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Note that use of `EZId <https://ezid.cdlib.org/>`_ is limited primarily to University of California institutions. If you have an EZId account,
+you will need to configure the ``api-url`` and your account ``username`` and ``password``. As above, you should use one of the more secure 
+options for setting the password.
+
+.. _dataverse.pid.*.permalink:
+
+PermaLink-specific Settings
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.permalink.base-url
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.permalink.separator
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+PermaLinks are a simple PID option intended for intranet and catalog use cases. They can be used without an external service or
+be configured with the ``base-url`` of a resolution service. PermaLinks also allow a custom ``separator`` to be used.
+
+Note:
+
+- If you configure ``base-url``, it should include a "/" after the hostname like this: ``https://demo.dataverse.org/``.
+- When using multiple PermaLink providers, you should avoid ambiguous authority/separator/shoulder combinations that would result in the same overall prefix.
+- Configuring PermaLink providers differing only by their separator values is not supported.
+- In general, PermaLink authority/shoulder values should be alphanumeric. For other cases, admins may need to consider the potential impact of special characters in S3 storage identifiers, resolver URLs, exports, etc.
+
+.. _dataverse.pid.*.handlenet:
+
+Handle-specific Settings
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.handlenet.index
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.handlenet.independent-service
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.handlenet.auth-handle
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.handlenet.key
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.handlenet.path
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+dataverse.pid.*.handlenet.passphrase
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Note: If you are **minting your own handles** and plan to set up your own handle service, please refer to `Handle.Net documentation <https://handle.net/hnr_documentation.html>`_.
+
+Configure your Handle.net ``index`` to be used registering new persistent
+identifiers. Defaults to ``300``. 
+
+Indices are used to separate concerns within the Handle system. To add data to
+an index, authentication is mandatory. See also chapter 1.4 "Authentication" of
+the `Handle.Net Technical Documentation <http://www.handle.net/tech_manual/HN_Tech_Manual_8.pdf>`__
+
+Handle.Net servers use a public key authentication method where the public key
+is stored in a handle itself and the matching private key is provided from this
+file. Typically, the absolute path ends like ``handle/svr_1/admpriv.bin``. 
+The key file may (and should) be encrypted with a passphrase (used for
+encryption with AES-128). See
+also chapter 1.4 "Authentication" of the `Handle.Net Technical Documentation
+<http://www.handle.net/tech_manual/HN_Tech_Manual_8.pdf>`__
+
+Provide an absolute ``key.path`` to a private key file authenticating requests to your
+Handle.Net server.
+
+Provide a ``key.passphrase`` to decrypt the private key file at ``dataverse.pid.*.handlenet.key.path``.
+
+Set ``independent-service`` to true if you want to use a Handle service which is setup to work 'independently' (No communication with the Global Handle Registry).
+By default this setting is false.
+
+Set ``auth-handle`` to <prefix>/<suffix> to be used on a global handle service when the public key is NOT stored in the default handle.
+This setting is optional. If the public key is, for instance, stored in handle: ``21.T12996/USER01``, ``auth-handle`` should be set to this value.
+
+
+.. _pids-doi-configuration:
+
+Backward-compatibility for Single PID Provider Installations
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-- :ref:`doi.baseurlstring`
-- :ref:`doi.username`
-- :ref:`doi.password`
-- :ref:`doi.mdcbaseurlstring`
+While using the PID Provider configuration settings described above is recommended, Dataverse installations
+only using a single PID Provider can use the settings below instead. In general, these legacy settings mirror
+those above except for not including a PID Provider id. 
+
+Configuring Your Dataverse Installation for a Single DOI Provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Here are the configuration options for DOIs.:
+
+**JVM Options for DataCite:**
+
+- :ref:`dataverse.pid.datacite.mds-api-url`
+- :ref:`dataverse.pid.datacite.rest-api-url`
+- :ref:`dataverse.pid.datacite.username`
+- :ref:`dataverse.pid.datacite.password`
+
+**JVM Options for EZID:**
+
+As stated above, with very few exceptions (e.g. University of California), you will not be able to use
+this provider.
+
+- :ref:`dataverse.pid.ezid.api-url`
+- :ref:`dataverse.pid.ezid.username`
+- :ref:`dataverse.pid.ezid.password`
 
 **Database Settings:**
 
@@ -156,18 +713,21 @@ Here are the configuration options for DOIs:
 - :ref:`:Shoulder <:Shoulder>`
 - :ref:`:IdentifierGenerationStyle <:IdentifierGenerationStyle>` (optional)
 - :ref:`:DataFilePIDFormat <:DataFilePIDFormat>` (optional)
-- :ref:`:FilePIDsEnabled <:FilePIDsEnabled>` (optional, defaults to true)
+- :ref:`:FilePIDsEnabled <:FilePIDsEnabled>` (optional, defaults to false)
 
-Configuring Dataverse for Handles
-+++++++++++++++++++++++++++++++++
+.. _pids-handle-configuration:
 
-Here are the configuration options for handles:
+Configuring Your Dataverse Installation for a Single Handle Provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Here are the configuration options for handles. Most notably, you need to
+change the ``:Protocol`` setting, as it defaults to DOI usage.
 
 **JVM Options:**
 
-- :ref:`dataverse.handlenet.admcredfile`
-- :ref:`dataverse.handlenet.admprivphrase`
-- :ref:`dataverse.handlenet.index`
+- :ref:`dataverse.pid.handlenet.key.path`
+- :ref:`dataverse.pid.handlenet.key.passphrase`
+- :ref:`dataverse.pid.handlenet.index`
 
 **Database Settings:**
 
@@ -176,25 +736,50 @@ Here are the configuration options for handles:
 - :ref:`:IdentifierGenerationStyle <:IdentifierGenerationStyle>` (optional)
 - :ref:`:DataFilePIDFormat <:DataFilePIDFormat>` (optional)
 - :ref:`:IndependentHandleService <:IndependentHandleService>` (optional)
+- :ref:`:HandleAuthHandle <:HandleAuthHandle>` (optional)
+
+Note: If you are **minting your own handles** and plan to set up your own handle service, please refer to `Handle.Net documentation <https://handle.net/hnr_documentation.html>`_.
+
+.. _permalinks:
+
+Configuring Your Dataverse Installation for a Single PermaLink Provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Here are the configuration options for PermaLinks:
+
+**JVM Options:**
+
+- :ref:`dataverse.pid.permalink.base-url`
 
-Note: If you are **minting your own handles** and plan to set up your own handle service, please refer to `Handle.Net documentation <http://handle.net/hnr_documentation.html>`_.
+**Database Settings:**
+
+- :ref:`:Protocol <:Protocol>`
+- :ref:`:Authority <:Authority>`
+- :ref:`:Shoulder <:Shoulder>`
+- :ref:`:IdentifierGenerationStyle <:IdentifierGenerationStyle>` (optional)
+- :ref:`:DataFilePIDFormat <:DataFilePIDFormat>` (optional)
+- :ref:`:FilePIDsEnabled <:FilePIDsEnabled>` (optional, defaults to false)
+
+You must restart Payara after making changes to these settings.
+
+.. _auth-modes:
 
 Auth Modes: Local vs. Remote vs. Both
 -------------------------------------
 
-There are three valid configurations or modes for authenticating users to Dataverse:
+There are three valid configurations or modes for authenticating users to your Dataverse installation:
 
 Local Only Auth
 +++++++++++++++
 
-Out of the box, Dataverse is configured in "local only" mode. The "dataverseAdmin" superuser account mentioned in the :doc:`/installation/installation-main` section is an example of a local account. Internally, these accounts are called "builtin" because they are built in to the Dataverse application itself.
+Out of the box, your Dataverse installation is configured in "local only" mode. The "dataverseAdmin" superuser account mentioned in the :doc:`/installation/installation-main` section is an example of a local account. Internally, these accounts are called "builtin" because they are built in to the Dataverse Software application itself.
 
 Both Local and Remote Auth
 ++++++++++++++++++++++++++
 
-The ``authenticationproviderrow`` database table controls which "authentication providers" are available within Dataverse. Out of the box, a single row with an id of "builtin" will be present. For each user in Dataverse, the ``authenticateduserlookup`` table will have a value under ``authenticationproviderid`` that matches this id. For example, the default "dataverseAdmin" user will have the value "builtin" under  ``authenticationproviderid``. Why is this important? Users are tied to a specific authentication provider but conversion mechanisms are available to switch a user from one authentication provider to the other. As explained in the :doc:`/user/account` section of the User Guide, a graphical workflow is provided for end users to convert from the "builtin" authentication provider to a remote provider. Conversion from a remote authentication provider to the builtin provider can be performed by a sysadmin with access to the "admin" API. See the :doc:`/api/native-api` section of the API Guide for how to list users and authentication providers as JSON.
+The ``authenticationproviderrow`` database table controls which "authentication providers" are available within a Dataverse installation. Out of the box, a single row with an id of "builtin" will be present. For each user in a Dataverse installation, the ``authenticateduserlookup`` table will have a value under ``authenticationproviderid`` that matches this id. For example, the default "dataverseAdmin" user will have the value "builtin" under  ``authenticationproviderid``. Why is this important? Users are tied to a specific authentication provider but conversion mechanisms are available to switch a user from one authentication provider to the other. As explained in the :doc:`/user/account` section of the User Guide, a graphical workflow is provided for end users to convert from the "builtin" authentication provider to a remote provider. Conversion from a remote authentication provider to the builtin provider can be performed by a sysadmin with access to the "admin" API. See the :doc:`/api/native-api` section of the API Guide for how to list users and authentication providers as JSON.
 
-Adding and enabling a second authentication provider (:ref:`native-api-add-auth-provider` and :ref:`api-toggle-auth-provider`) will result in the Log In page showing additional providers for your users to choose from. By default, the Log In page will show the "builtin" provider, but you can adjust this via the :ref:`conf-default-auth-provider` configuration option. Further customization can be achieved by setting :ref:`conf-allow-signup` to "false", thus preventing users from creating local accounts via the web interface. Please note that local accounts can also be created via API, and the way to prevent this is to block the ``builtin-users`` endpoint (:ref:`:BlockedApiEndpoints`) or scramble (or remove) the ``BuiltinUsers.KEY`` database setting (:ref:`BuiltinUsers.KEY`).
+Adding and enabling a second authentication provider (:ref:`native-api-add-auth-provider` and :ref:`api-toggle-auth-provider`) will result in the Log In page showing additional providers for your users to choose from. By default, the Log In page will show the "builtin" provider, but you can adjust this via the :ref:`conf-default-auth-provider` configuration option. Further customization can be achieved by setting :ref:`conf-allow-signup` to "false", thus preventing users from creating local accounts via the web interface. Please note that local accounts can also be created through the API by enabling the ``builtin-users`` endpoint (:ref:`:BlockedApiEndpoints`) and setting the ``BuiltinUsers.KEY`` database setting (:ref:`BuiltinUsers.KEY`).
 
 To configure Shibboleth see the :doc:`shibboleth` section and to configure OAuth see the :doc:`oauth2` section.
 
@@ -206,17 +791,275 @@ As for the "Remote only" authentication mode, it means that:
 - Shibboleth or OAuth has been enabled.
 - ``:AllowSignUp`` is set to "false" to prevent users from creating local accounts via the web interface.
 - ``:DefaultAuthProvider`` has been set to use the desired authentication provider
-- The "builtin" authentication provider has been disabled (:ref:`api-toggle-auth-provider`). Note that disabling the "builtin" authentication provider means that the API endpoint for converting an account from a remote auth provider will not work. Converting directly from one remote authentication provider to another (i.e. from GitHub to Google) is not supported. Conversion from remote is always to "builtin". Then the user initiates a conversion from "builtin" to remote. Note that longer term, the plan is to permit multiple login options to the same Dataverse account per https://github.com/IQSS/dataverse/issues/3487 (so all this talk of conversion will be moot) but for now users can only use a single login option, as explained in the :doc:`/user/account` section of the User Guide. In short, "remote only" might work for you if you only plan to use a single remote authentication provider such that no conversion between remote authentication providers will be necessary.
+- The "builtin" authentication provider has been disabled (:ref:`api-toggle-auth-provider`). Note that disabling the "builtin" authentication provider means that the API endpoint for converting an account from a remote auth provider will not work. Converting directly from one remote authentication provider to another (i.e. from GitHub to Google) is not supported. Conversion from remote is always to "builtin". Then the user initiates a conversion from "builtin" to remote. Note that longer term, the plan is to permit multiple login options to the same Dataverse installation account per https://github.com/IQSS/dataverse/issues/3487 (so all this talk of conversion will be moot) but for now users can only use a single login option, as explained in the :doc:`/user/account` section of the User Guide. In short, "remote only" might work for you if you only plan to use a single remote authentication provider such that no conversion between remote authentication providers will be necessary.
+
+.. _bearer-token-auth:
+
+Bearer Token Authentication
+---------------------------
+
+Bearer tokens are defined in `RFC 6750`_ and can be used as an alternative to API tokens. This is an experimental feature hidden behind a feature flag.
+
+.. _RFC 6750: https://tools.ietf.org/html/rfc6750
+
+To enable bearer tokens, you must install and configure Keycloak (for now, see :ref:`oidc-dev` in the Developer Guide) and enable ``api-bearer-auth`` under :ref:`feature-flags`.
+
+You can test that bearer tokens are working by following the example under :ref:`bearer-tokens` in the API Guide.
+
+.. _smtp-config:
+
+SMTP/Email Configuration
+------------------------
+
+The installer prompts you for some basic options to configure Dataverse to send email using your SMTP server, but in many cases, extra configuration may be necessary.
+
+Make sure the :ref:`dataverse.mail.system-email` has been set. Email will not be sent without it. A hint will be logged about this fact.
+If you want to separate system email from your support team's email, take a look at :ref:`dataverse.mail.support-email`.
+
+Then check the list of commonly used settings at the top of :ref:`dataverse.mail.mta`.
+
+If you have trouble, consider turning on debugging with :ref:`dataverse.mail.debug`.
+
+.. _database-persistence:
+
+Database Persistence
+--------------------
+
+The Dataverse software uses a PostgreSQL database to store objects users create.
+You can configure basic and advanced settings for the PostgreSQL database connection with the help of
+MicroProfile Config API.
+
+Basic Database Settings
++++++++++++++++++++++++
+
+1. Any of these settings can be set via system properties (see :ref:`jvm-options` starting at :ref:`dataverse.db.name`), environment variables or other
+   MicroProfile Config mechanisms supported by the app server.
+   `See Payara docs for supported sources <https://docs.payara.fish/community/docs/documentation/microprofile/config/README.html#config-sources>`_.
+2. Remember to protect your secrets.
+   See :ref:`secure-password-storage` for more information.
+
+3. Environment variables follow the key, replacing any dot, colon, dash, etc. into an underscore "_" and all uppercase
+   letters. Example: ``dataverse.db.host`` -> ``DATAVERSE_DB_HOST``
+
+.. list-table::
+   :widths: 15 60 25
+   :header-rows: 1
+   :align: left
+
+   * - MPCONFIG Key
+     - Description
+     - Default
+   * - dataverse.db.host
+     - The PostgreSQL server to connect to.
+     - ``localhost``
+   * - dataverse.db.port
+     - The PostgreSQL server port to connect to.
+     - ``5432``
+   * - dataverse.db.user
+     - The PostgreSQL user name to connect with.
+     - | ``dataverse``
+       | (installer sets to ``dvnapp``)
+   * - dataverse.db.password
+     - The PostgreSQL users password to connect with.
+
+       **Please note the safety advisory above.**
+     - *No default*
+   * - dataverse.db.name
+     - The PostgreSQL database name to use for the Dataverse installation.
+     - | ``dataverse``
+       | (installer sets to ``dvndb``)
+   * - dataverse.db.parameters
+     - Connection parameters, such as ``sslmode=require``. See `Postgres JDBC docs <https://jdbc.postgresql.org/documentation/head/connect.html>`_
+       Note: you don't need to provide the initial "?".
+     - *Empty string*
+
+Advanced Database Settings
+++++++++++++++++++++++++++
+
+The following options are useful in many scenarios. You might be interested in debug output during development or
+monitoring performance in production.
+
+You can find more details within the Payara docs:
+
+- `User Guide: Connection Pool Configuration <https://docs.payara.fish/community/docs/documentation/user-guides/connection-pools/connection-pools.html>`_
+- `Tech Doc: Advanced Connection Pool Configuration <https://docs.payara.fish/community/docs/documentation/payara-server/jdbc/advanced-connection-pool-properties.html>`_.
+
+Connection Validation
+^^^^^^^^^^^^^^^^^^^^^
+
+.. list-table::
+   :widths: 15 60 25
+   :header-rows: 1
+   :align: left
+
+   * - MPCONFIG Key
+     - Description
+     - Default
+   * - dataverse.db.is-connection-validation-required
+     - ``true``: Validate connections, allow server to reconnect in case of failure.
+     - false
+   * - dataverse.db.connection-validation-method
+     - | The method of connection validation:
+       | ``table|autocommit|meta-data|custom-validation``.
+     - *Empty string*
+   * - dataverse.db.validation-table-name
+     - The name of the table used for validation if the validation method is set to ``table``.
+     - *Empty string*
+   * - dataverse.db.validation-classname
+     - The name of the custom class used for validation if the ``validation-method`` is set to ``custom-validation``.
+     - *Empty string*
+   * - dataverse.db.validate-atmost-once-period-in-seconds
+     - Specifies the time interval in seconds between successive requests to validate a connection at most once.
+     - ``0`` (disabled)
+
+Connection & Statement Leaks
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. list-table::
+   :widths: 15 60 25
+   :header-rows: 1
+   :align: left
+
+   * - MPCONFIG Key
+     - Description
+     - Default
+   * - dataverse.db.connection-leak-timeout-in-seconds
+     - Specify timeout when connections count as "leaked".
+     - ``0`` (disabled)
+   * - dataverse.db.connection-leak-reclaim
+     - If enabled, leaked connection will be reclaimed by the pool after connection leak timeout occurs.
+     - ``false``
+   * - dataverse.db.statement-leak-timeout-in-seconds
+     - Specifiy timeout when statements should be considered to be "leaked".
+     - ``0`` (disabled)
+   * - dataverse.db.statement-leak-reclaim
+     - If enabled, leaked statement will be reclaimed by the pool after statement leak timeout occurs.
+     - ``false``
+
+Logging & Slow Performance
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. list-table::
+   :widths: 15 60 25
+   :header-rows: 1
+   :align: left
+
+   * - MPCONFIG Key
+     - Description
+     - Default
+   * - dataverse.db.statement-timeout-in-seconds
+     - Timeout property of a connection to enable termination of abnormally long running queries.
+     - ``-1`` (disabled)
+   * - dataverse.db.slow-query-threshold-in-seconds
+     - SQL queries that exceed this time in seconds will be logged.
+     - ``-1`` (disabled)
+   * - dataverse.db.log-jdbc-calls
+     - When set to true, all JDBC calls will be logged allowing tracing of all JDBC interactions including SQL.
+     - ``false``
+
+Database Configuration Tips
++++++++++++++++++++++++++++
+
+In this section you can find some example scenarios of advanced configuration for the database connection that can improve service performance and availability.
+
+Database Connection Recovery
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Consider the following scenario: if there is no advanced configuration for the database connection and the Dataverse server loses that connection, for example if the database host is down, the server will be "dead" even after the database server is back to normal.
+The only solution to recover Dataverse would be to restart the service. To avoid this situation, the following settings can be used to configure validation of the database connection. 
+This way, the database connection can be automatically recovered after a failure, improving the server availability. For a Docker installation, it is suggested to create an init.d script so that if the container needs to be recreated, these settings will always be configured.
+
+.. code-block:: bash
+
+  # Enable database connection validation
+  asadmin create-jvm-options "-Ddataverse.db.is-connection-validation-required=true"
+  # Configure to use a database table as the validation method
+  asadmin create-jvm-options "-Ddataverse.db.connection-validation-method=table"
+  # Configure the "setting" table to be used for connection validation, but any tables can be used
+  asadmin create-jvm-options "-Ddataverse.db.validation-table-name=setting"
+  # Configure a validation period of 60 seconds, but different values may be used
+  asadmin create-jvm-options "-Ddataverse.db.validate-atmost-once-period-in-seconds=60"
+
+.. _file-storage:
+
+File Storage
+------------
+
+By default, a Dataverse installation stores all data files (files uploaded by end users) on the filesystem at ``/usr/local/payara6/glassfish/domains/domain1/files``. This path can vary based on answers you gave to the installer (see the :ref:`dataverse-installer` section of the Installation Guide) or afterward by reconfiguring the ``dataverse.files.\<id\>.directory`` JVM option described below.
+
+A Dataverse installation can alternately store files in a Swift or S3-compatible object store, or on a Globus endpoint, and can now be configured to support multiple stores at once. With a multi-store configuration, the location for new files can be controlled on a per-Dataverse collection basis.
+
+A Dataverse installation may also be configured to reference some files (e.g. large and/or sensitive data) stored in a web or Globus accessible trusted remote store.
+
+A Dataverse installation can be configured to allow out of band upload by setting the ``dataverse.files.\<id\>.upload-out-of-band`` JVM option to ``true``.
+By default, Dataverse supports uploading files via the :ref:`add-file-api`. With S3 stores, a direct upload process can be enabled to allow sending the file directly to the S3 store (without any intermediate copies on the Dataverse server).
+With the upload-out-of-band option enabled, it is also possible for file upload to be managed manually or via third-party tools, with the :ref:`Adding the Uploaded file to the Dataset <direct-add-to-dataset-api>` API call (described in the :doc:`/developers/s3-direct-upload-api` page) used to add metadata and inform Dataverse that a new file has been added to the relevant store.
+
+The following sections describe how to set up various types of stores and how to configure for multiple stores.
+
+Multi-store Basics
+++++++++++++++++++
+
+To support multiple stores, a Dataverse installation now requires an id, type, and label for each store (even for a single store configuration). These are configured by defining two required jvm options:
+
+.. code-block:: none
+
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.type=<type>"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.label=<label>"
+
+Out of the box, a Dataverse installation is configured to use local file storage in the 'file' store by default. You can add additional stores and, as a superuser, configure specific Dataverse collections to use them (by editing the 'General Information' for the Dataverse collection as described in the :doc:`/admin/dataverses-datasets` section).
+
+Note that the "\-Ddataverse.files.directory", if defined, continues to control where temporary files are stored
+(in the /temp subdir of that directory), independent of the location of any 'file' store defined above.
+(See also the option reference: :ref:`dataverse.files.directory`)
+
+If you wish to change which store is used by default, you'll need to delete the existing default storage driver and set a new one using jvm options.
+
+.. code-block:: none
+
+    ./asadmin $ASADMIN_OPTS delete-jvm-options "-Ddataverse.files.storage-driver-id=file"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.files.storage-driver-id=<id>"
+
+It is also possible to set maximum file upload size limits per store. See the :ref:`:MaxFileUploadSizeInBytes` setting below.
+
+.. _labels-file-stores:
+
+Labels for File Stores
+++++++++++++++++++++++
+
+If you find yourself adding many file stores with various configurations such as per-file limits and direct upload, you might find it helpful to make the label descriptive.
+
+For example, instead of simply labeling an S3 store as "S3"...
+
+.. code-block:: none
 
-File Storage: Local Filesystem vs. Swift vs. S3
------------------------------------------------
+    ./asadmin create-jvm-options "\-Ddataverse.files.s3xl.label=S3"
 
-By default, a Dataverse installation stores data files (files uploaded by end users) on the filesystem at ``/usr/local/glassfish4/glassfish/domains/domain1/files`` but this path can vary based on answers you gave to the installer (see the :ref:`dataverse-installer` section of the Installation Guide) or afterward by reconfiguring the ``dataverse.files.directory`` JVM option described below.
+... you might want to include some extra information such as the example below.
+
+.. code-block:: none
+
+    ./asadmin create-jvm-options "\-Ddataverse.files.s3xl.label=S3XL, Filesize limit: 100GB, direct-upload"
+
+Please keep in mind that the UI will only show so many characters, so labels are best kept short.
+
+.. _storage-files-dir:
+
+File Storage
+++++++++++++
+
+File stores have one option - the directory where files should be stored. This can be set using
+
+.. code-block:: none
+
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.directory=<file directory>"
+
+Multiple file stores should specify different directories (which would nominally be the reason to use multiple file stores), but one may share the same directory as "\-Ddataverse.files.directory" option - this would result in temp files being stored in the /temp subdirectory within the file store's root directory.
 
 Swift Storage
 +++++++++++++
 
-Rather than storing data files on the filesystem, you can opt for an experimental setup with a `Swift Object Storage <http://swift.openstack.org>`_ backend. Each dataset that users create gets a corresponding "container" on the Swift side, and each data file is saved as a file within that container.
+Rather than storing data files on the filesystem, you can opt for an experimental setup with a `Swift Object Storage <https://swift.openstack.org>`_ backend. Each dataset that users create gets a corresponding "container" on the Swift side, and each data file is saved as a file within that container.
 
 **In order to configure a Swift installation,** you need to complete these steps to properly modify the JVM options:
 
@@ -224,14 +1067,15 @@ First, run all the following create commands with your Swift endpoint informatio
 
 .. code-block:: none
 
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.defaultEndpoint=endpoint1"
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.authType.endpoint1=your-auth-type"
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.authUrl.endpoint1=your-auth-url"
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.tenant.endpoint1=your-tenant-name"
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.username.endpoint1=your-username"
-    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.swift.endpoint.endpoint1=your-swift-endpoint"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.type=swift"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.defaultEndpoint=endpoint1"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.authType.endpoint1=your-auth-type"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.authUrl.endpoint1=your-auth-url"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.tenant.endpoint1=your-tenant-name"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.username.endpoint1=your-username"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.endpoint.endpoint1=your-swift-endpoint"
 
-``auth_type`` can either be ``keystone``, ``keystone_v3``, or it will assumed to be ``basic``. ``auth_url`` should be your keystone authentication URL which includes the tokens (e.g. for keystone, ``https://openstack.example.edu:35357/v2.0/tokens`` and for keystone_v3, ``https://openstack.example.edu:35357/v3/auth/tokens``). ``swift_endpoint`` is a URL that looks something like ``http://rdgw.swift.example.org/swift/v1``.
+``auth_type`` can either be ``keystone``, ``keystone_v3``, or it will assumed to be ``basic``. ``auth_url`` should be your keystone authentication URL which includes the tokens (e.g. for keystone, ``https://openstack.example.edu:35357/v2.0/tokens`` and for keystone_v3, ``https://openstack.example.edu:35357/v3/auth/tokens``). ``swift_endpoint`` is a URL that looks something like ``https://rdgw.swift.example.org/swift/v1``.
 
 Then create a password alias by running (without changes):
 
@@ -242,6 +1086,8 @@ Then create a password alias by running (without changes):
 
 The second command will trigger an interactive prompt asking you to input your Swift password.
 
+Note: you may choose a different way to secure this password, depending on your use case. See :ref:`secure-password-storage` for more options.
+
 Second, update the JVM option ``dataverse.files.storage-driver-id`` by running the delete command:
 
 ``./asadmin $ASADMIN_OPTS delete-jvm-options "\-Ddataverse.files.storage-driver-id=file"``
@@ -267,26 +1113,26 @@ You also have the option to set a custom expiration length, in seconds, for a ge
 In this example, you would be setting the expiration length for one hour.
 
 
-Setting up Compute
-+++++++++++++++++++
+Setting up Compute with Swift
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Once you have configured a Swift Object Storage backend, you also have the option of enabling a connection to a computing environment. To do so, you need to configure the database settings for :ref:`:ComputeBaseUrl` and  :ref:`:CloudEnvironmentName`.
 
-Once you have set up ``:ComputeBaseUrl`` properly in both Dataverse and your cloud environment, validated users will have three options for accessing the computing environment:
+Once you have set up ``:ComputeBaseUrl`` properly in both the Dataverse installation and your cloud environment, validated users will have three options for accessing the computing environment:
 
 - Compute on a single dataset
 - Compute on multiple datasets
 - Compute on a single datafile
 
-The compute buttons on dataset and file pages will link validated users to your computing environment. If a user is computing on one dataset, the compute button will redirect to:
+The compute tool options on dataset and file pages will link validated users to your computing environment. If a user is computing on one dataset, the compute tool option will redirect to:
 
 ``:ComputeBaseUrl?datasetPersistentId``
 
-If a user is computing on multiple datasets, the compute button will redirect to:
+If a user is computing on multiple datasets, the compute tool option will redirect to:
 
 ``:ComputeBaseUrl/multiparty?datasetPersistentId&anotherDatasetPersistentId&anotherDatasetPersistentId&...``
 
-If a user is computing on a single file, depending on the configuration of your installation, the compute button will either redirect to: 
+If a user is computing on a single file, depending on the configuration of your installation, the compute tool option will either redirect to:
 
 ``:ComputeBaseUrl?datasetPersistentId=yourObject``
 
@@ -299,22 +1145,27 @@ You can configure this redirect properly in your cloud environment to generate a
 Amazon S3 Storage (or Compatible)
 +++++++++++++++++++++++++++++++++
 
-For institutions and organizations looking to use some kind of S3-based object storage for files uploaded to Dataverse,
-this is entirely possible. You can either use Amazon Web Services or use some other, even on-site S3-compatible
-storage (like Minio, Ceph RADOS S3 Gateway and many more). 
+The Dataverse Software supports Amazon S3 storage as well as other S3-compatible stores (like Minio, Ceph RADOS S3 Gateway and many more) for files uploaded to your Dataverse installation.
 
-**Note:** The Dataverse Team is most familiar with AWS S3, and can provide support on its usage with Dataverse. Thanks to community contributions, the application's architecture also allows non-AWS S3 providers. The Dataverse Team can provide very limited support on these other providers. We recommend reaching out to the wider Dataverse community if you have questions.
+The Dataverse Software S3 driver supports multi-part upload for large files (over 1 GB by default - see the min-part-size option in the table below to change this).
+
+**Note:** The Dataverse Project Team is most familiar with AWS S3, and can provide support on its usage with the Dataverse Software. Thanks to community contributions, the application's architecture also allows non-AWS S3 providers. The Dataverse Project Team can provide very limited support on these other providers. We recommend reaching out to the wider Dataverse Project Community if you have questions.
 
 First: Set Up Accounts and Access Credentials
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Dataverse and the AWS SDK make use of the "AWS credentials profile file" and "AWS config profile file" located in
-``~/.aws/`` where ``~`` is the home directory of the user you run Glassfish as. This file can be generated via either
+**Note:** As of version 5.14, if Dataverse is running in an EC2 instance it will prefer Role-Based Access Control over the S3 default profile, even if administrators configure Dataverse with programmatic access keys. Named profiles can still be used to override RBAC for specific datastores. RBAC is preferential from a security perspective as there are no keys to rotate or have stolen. If you intend to assign a role to your EC2 instance, you will still need the ``~/.aws/config`` file to specify the region but you need not generate credentials for the default profile. For more information please see https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2.html
+
+The Dataverse Software and the AWS SDK make use of the "AWS credentials profile file" and "AWS config profile file" located in
+``~/.aws/`` where ``~`` is the home directory of the user you run Payara as. This file can be generated via either
 of two methods described below:
 
 1. Manually through creation of the credentials and config files or
 2. Automatically via the AWS console commands.
 
+Some usage scenarios might be eased without generating these files. You may also provide :ref:`static credentials via
+MicroProfile Config <s3-mpconfig>`, see below.
+
 Preparation When Using Amazon's S3 Service
 ##########################################
 
@@ -324,17 +1175,10 @@ You'll need an AWS account with an associated S3 bucket for your installation to
 **Make note** of the **bucket's name** and the **region** its data is hosted in.
 
 To **create a user** with full S3 access and nothing more for security reasons, we recommend using IAM
-(Identity and Access Management). See `IAM User Guide <http://docs.aws.amazon.com/IAM/latest/UserGuide/id_users.html>`_
+(Identity and Access Management). See `IAM User Guide <https://docs.aws.amazon.com/IAM/latest/UserGuide/id_users.html>`_
 for more info on this process.
 
-**Generate the user keys** needed for Dataverse afterwards by clicking on the created user.
-(You can skip this step when running on EC2, see below.)
-
-.. TIP::
-  If you are hosting Dataverse on an AWS EC2 instance alongside storage in S3, it is possible to use IAM Roles instead
-  of the credentials file (the file at ``~/.aws/credentials`` mentioned below). Please note that you will still need the
-  ``~/.aws/config`` file to specify the region. For more information on this option, see
-  http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html
+To use programmatic access, **Generate the user keys** needed for a Dataverse installation afterwards by clicking on the created user.
 
 Preparation When Using Custom S3-Compatible Service
 ###################################################
@@ -345,38 +1189,23 @@ Please make note of the following details:
 
 - **Endpoint URL** - consult the documentation of your service on how to find it.
 
-    * Example: https://play.minio.io:9000
-    
-- **Region:** Optional, but some services might use it. Consult your service documentation.
-
-    * Example: *us-east-1*
-    
-- **Access key ID and secret access key:** Usually you can generate access keys within the user profile of your service.
+  * Example: https://play.minio.io:9000
 
-    * Example:
-    
-      - ID: *Q3AM3UQ867SPQQA43P2F*
-      
-      - Key: *zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG*
-      
-- **Bucket name:** Dataverse will fail opening and uploading files on S3 if you don't create one.
+- **Region:** Optional, but some services might use it. Consult your service documentation.
 
-    * Example: *dataverse*
+  * Example: *us-east-1*
 
+- **Access key ID and secret access key:** Usually you can generate access keys within the user profile of your service.
 
-Reported Working S3-Compatible Storage
-######################################
+  * Example:
 
-`Minio v2018-09-12 <http://minio.io>`_
-  Set ``dataverse.files.s3-path-style-access=true``, as Minio works path-based. Works pretty smooth, easy to setup.
-  **Can be used for quick testing, too:** just use the example values above. Uses the public (read: unsecure and
-  possibly slow) https://play.minio.io:9000 service.
+    - ID: *Q3AM3UQ867SPQQA43P2F*
 
+    - Key: *zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG*
 
-**HINT:** If you are successfully using an S3 storage implementation not yet listed above, please feel free to
-`open an issue at Github <https://github.com/IQSS/dataverse/issues/new>`_ and describe your setup.
-We will be glad to add it here.
+- **Bucket name:** The Dataverse installation will fail opening and uploading files on S3 if you don't create one.
 
+  * Example: *dataverse*
 
 Manually Set Up Credentials File
 ################################
@@ -397,15 +1226,27 @@ While using Amazon's service, you must also specify the AWS region in the ``~/.a
   [default]
   region = us-east-1
 
-Place these two files in a folder named ``.aws`` under the home directory for the user running your Dataverse Glassfish
-instance. (From the `AWS Command Line Interface Documentation <http://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html>`_:
+
+Additional profiles can be added to these files by appending the relevant information in additional blocks:
+
+::
+
+  [default]
+  aws_access_key_id = <insert key, no brackets>
+  aws_secret_access_key = <insert secret key, no brackets>
+
+  [profilename2]
+  aws_access_key_id = <insert key, no brackets>
+  aws_secret_access_key = <insert secret key, no brackets>
+
+Place these two files in a folder named ``.aws`` under the home directory for the user running your Dataverse Installation on Payara. (From the `AWS Command Line Interface Documentation <https://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html>`_:
 "In order to separate credentials from less sensitive options, region and output format are stored in a separate file
 named config in the same folder")
 
 Console Commands to Set Up Access Configuration
 ###############################################
 
-Begin by installing the CLI tool `pip <https://pip.pypa.io//en/latest/>`_ to install the
+Begin by installing the CLI tool `pip (package installer for Python) <https://pip.pypa.io/en/latest/>`_ to install the
 `AWS command line interface <https://aws.amazon.com/cli/>`_ if you don't have it.
 
 First, we'll get our access keys set up. If you already have your access keys configured, skip this step.
@@ -421,106 +1262,431 @@ The subsequent config steps after the access keys are up to you. For reference,
 **TIP:** When using a custom S3 URL endpoint, you need to add it to every ``aws`` call: ``aws --endpoint-url <URL> s3 ...``
   (you may omit it while configuring).
 
-Second: Configure Dataverse to use S3 Storage
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Second: Configure Your Dataverse Installation to use S3 Storage
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-With access to your bucket in place, we'll want to navigate to ``/usr/local/glassfish4/glassfish/bin/``
-and execute the following ``asadmin`` commands to set up the proper JVM options. Recall that out of the box, Dataverse
-is configured to use local file storage. You'll need to delete the existing storage driver before setting the new one.
+To set up an S3 store, you must define the id, type, and label as for any store:
 
-::
+.. code-block:: bash
 
-  ./asadmin $ASADMIN_OPTS delete-jvm-options "-Ddataverse.files.storage-driver-id=file"
-  ./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.files.storage-driver-id=s3"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.type=s3"
+    ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.<id>.label=<label>"
 
-Then, we'll need to identify which S3 bucket we're using. Replace ``your_bucket_name`` with, of course, your bucket:
 
-``./asadmin create-jvm-options "-Ddataverse.files.s3-bucket-name=your_bucket_name"``
+Then, we'll need to identify which S3 bucket we're using. Replace ``<your_bucket_name>`` with, of course, your bucket:
 
-Optionally, you can have users download files from S3 directly rather than having files pass from S3 through Glassfish to your users. To accomplish this, set ``dataverse.files.s3-download-redirect`` to ``true`` like this:
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.bucket-name=<your_bucket_name>"``
 
-``./asadmin create-jvm-options "-Ddataverse.files.s3-download-redirect=true"``
+Optionally, you can have users download files from S3 directly rather than having files pass from S3 through Payara to your users. To accomplish this, set ``dataverse.files.<id>.download-redirect`` to ``true`` like this:
 
-If you enable ``dataverse.files.s3-download-redirect`` as described above, note that the S3 URLs expire after an hour by default but you can configure the expiration time using the ``dataverse.files.s3-url-expiration-minutes`` JVM option. Here's an example of setting the expiration time to 120 minutes:
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.download-redirect=true"``
 
-``./asadmin create-jvm-options "-Ddataverse.files.s3-url-expiration-minutes=120"``
+If you enable ``dataverse.files.<id>.download-redirect`` as described above, note that the S3 URLs expire after an hour by default but you can configure the expiration time using the ``dataverse.files.<id>.url-expiration-minutes`` JVM option. Here's an example of setting the expiration time to 120 minutes:
 
-In case you would like to configure Dataverse to use a custom S3 service instead of Amazon S3 services, please
-add the options for the custom URL and region as documented below. Please read above if your desired combination has
-been tested already and what other options have been set for a successful integration.
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.url-expiration-minutes=120"``
 
-Lastly, go ahead and restart your glassfish server. With Dataverse deployed and the site online, you should be able to upload datasets and data files and see the corresponding files in your S3 bucket. Within a bucket, the folder structure emulates that found in local file storage.
+By default, your store will use the [default] profile in you .aws configuration files. To use a different profile, which would be necessary if you have two s3 stores at different locations, you can specify the profile to use:
 
-S3 Storage Options
-##################
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.profile=<profilename>"``
 
-=========================================  ==================  ==================================================================  =============
-JVM Option                                 Value               Description                                                         Default value
-=========================================  ==================  ==================================================================  =============
-dataverse.files.storage-driver-id          s3                  Enable S3 storage driver.                                           ``file``
-dataverse.files.s3-bucket-name             <?>                 The bucket name. See above.                                         (none)
-dataverse.files.s3-download-redirect       ``true``/``false``  Enable direct download or proxy through Dataverse.                  ``false``
-dataverse.files.s3-url-expiration-minutes  <?>                 If direct downloads: time until links expire. Optional.             60
-dataverse.files.s3-custom-endpoint-url     <?>                 Use custom S3 endpoint. Needs URL either with or without protocol.  (none)
-dataverse.files.s3-custom-endpoint-region  <?>                 Only used when using custom endpoint. Optional.                     ``dataverse``
-dataverse.files.s3-path-style-access       ``true``/``false``  Use path style buckets instead of subdomains. Optional.             ``false``
-=========================================  ==================  ==================================================================  =============
+Larger installations may want to increase the number of open S3 connections allowed (default is 256): For example, 
+
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.connection-pool-size=4096"``
+
+.. _s3-tagging:
+
+S3 Tagging
+##########
+
+By default, when direct upload to an S3 store is configured, Dataverse will place a ``temp`` tag on the file being uploaded for an easier cleanup in case the file is not added to the dataset after upload (e.g., if the user cancels the operation). (See :ref:`s3-tags-and-direct-upload`.)
+If your S3 store does not support tagging and gives an error when direct upload is configured, you can disable the tagging by using the ``dataverse.files.<id>.disable-tagging`` JVM option. For example:
+
+``./asadmin create-jvm-options "-Ddataverse.files.<id>.disable-tagging=true"``
+
+Disabling the ``temp`` tag makes it harder to identify abandoned files that are not used by your Dataverse instance (i.e. one cannot search for the ``temp`` tag in a delete script). These should still be removed to avoid wasting storage space. To clean up these files and any other leftover files, regardless of whether the ``temp`` tag is applied, you can use the :ref:`cleanup-storage-api` API endpoint.
+
+Note that if you disable tagging, you should should omit the ``x-amz-tagging:dv-state=temp`` header when using the :doc:`/developers/s3-direct-upload-api`, as noted in that section.
+
+Finalizing S3 Configuration
+###########################
+
+In case you would like to configure Dataverse to use a custom S3 service instead of Amazon S3 services, please
+add the options for the custom URL and region as documented below. Please read above if your desired combination has
+been tested already and what other options have been set for a successful integration.
+
+Lastly, go ahead and restart your Payara server. With Dataverse deployed and the site online, you should be able to upload datasets and data files and see the corresponding files in your S3 bucket. Within a bucket, the folder structure emulates that found in local file storage.
+
+.. _list-of-s3-storage-options:
+
+List of S3 Storage Options
+##########################
+
+.. table::
+    :align: left
+
+    ===========================================  ==================  ===================================================================================  =============
+    JVM Option                                   Value               Description                                                                          Default value
+    ===========================================  ==================  ===================================================================================  =============
+    dataverse.files.storage-driver-id            <id>                Enable <id> as the default storage driver.                                           ``file``
+    dataverse.files.<id>.type                    ``s3``              **Required** to mark this storage as S3 based.                                       (none)
+    dataverse.files.<id>.label                   <?>                 **Required** label to be shown in the UI for this storage                            (none)
+    dataverse.files.<id>.bucket-name             <?>                 The bucket name. See above.                                                          (none)
+    dataverse.files.<id>.download-redirect       ``true``/``false``  Enable direct download or proxy through Dataverse.                                   ``false``
+    dataverse.files.<id>.upload-redirect         ``true``/``false``  Enable direct upload of files added to a dataset in the S3 store.                    ``false``
+    dataverse.files.<id>.upload-out-of-band      ``true``/``false``  Allow upload of files by out-of-band methods (using some tool other than Dataverse)  ``false``
+    dataverse.files.<id>.ingestsizelimit         <size in bytes>     Maximum size of directupload files that should be ingested                           (none)
+    dataverse.files.<id>.url-expiration-minutes  <?>                 If direct uploads/downloads: time until links expire. Optional.                      60
+    dataverse.files.<id>.min-part-size           <?>                 Multipart direct uploads will occur for files larger than this. Optional.            ``1024**3``
+    dataverse.files.<id>.custom-endpoint-url     <?>                 Use custom S3 endpoint. Needs URL either with or without protocol.                   (none)
+    dataverse.files.<id>.custom-endpoint-region  <?>                 Only used when using custom endpoint. Optional.                                      ``dataverse``
+    dataverse.files.<id>.profile                 <?>                 Allows the use of AWS profiles for storage spanning multiple AWS accounts.           (none)
+    dataverse.files.<id>.proxy-url               <?>                 URL of a proxy protecting the S3 store. Optional.                                    (none)
+    dataverse.files.<id>.path-style-access       ``true``/``false``  Use path style buckets instead of subdomains. Optional.                              ``false``
+    dataverse.files.<id>.chunked-encoding        ``true``/``false``  Disable chunked encoding. Optional                                                   ``true``
+    dataverse.files.<id>.connection-pool-size    <?>                 The maximum number of open connections to the S3 server                              ``256``
+    dataverse.files.<id>.disable-tagging         ``true``/``false``  Do not place the ``temp`` tag when redirecting the upload to the S3 server.          ``false``
+    ===========================================  ==================  ===================================================================================  =============
+
+.. table::
+    :align: left
+
+    ===========================================  ==================  ==========================================================================  =============
+    MicroProfile Config Option                   Value               Description                                                                 Default value
+    ===========================================  ==================  ==========================================================================  =============
+    dataverse.files.<id>.access-key              <?>                 :ref:`Provide static access key ID. Read before use! <s3-mpconfig>`         ``""``
+    dataverse.files.<id>.secret-key              <?>                 :ref:`Provide static secret access key. Read before use! <s3-mpconfig>`     ``""``
+    ===========================================  ==================  ==========================================================================  =============
+
+
+.. _s3-mpconfig:
+
+Credentials via MicroProfile Config
+###################################
+
+Optionally, you may provide static credentials for each S3 storage using MicroProfile Config options:
+
+- ``dataverse.files.<id>.access-key`` for this storage's "access key ID"
+- ``dataverse.files.<id>.secret-key`` for this storage's "secret access key"
+
+You may provide the values for these via any `supported MicroProfile Config API source`_.
+
+**WARNING:**
+*For security, do not use the sources "environment variable" or "system property" (JVM option) in a production context!*
+*Rely on password alias, secrets directory or cloud based sources as described at* :ref:`secure-password-storage` *instead!*
+
+**NOTE:**
+
+1. Providing both AWS CLI profile files (as setup in first step) and static keys, credentials from ``~/.aws``
+   will win over configured keys when valid!
+2. A non-empty ``dataverse.files.<id>.profile`` will be ignored when no credentials can be found for this profile name.
+   Current codebase does not make use of "named profiles" as seen for AWS CLI besides credentials.
+
+Reported Working S3-Compatible Storage
+######################################
+
+`Minio v2018-09-12 <https://minio.io>`_
+  Set ``dataverse.files.<id>.path-style-access=true``, as Minio works path-based. Works pretty smooth, easy to setup.
+  **Can be used for quick testing, too:** just use the example values above. Uses the public (read: unsecure and
+  possibly slow) https://play.minio.io:9000 service.
+
+`StorJ Object Store <https://www.storj.io>`_
+ StorJ is a distributed object store that can be configured with an S3 gateway. Per the S3 Storage instructions above, you'll first set up the StorJ S3 store by defining the id, type, and label. After following the general installation, set the following configuration to use a StorJ object store: ``dataverse.files.<id>.chunked-encoding=false``. For step-by-step instructions see https://docs.storj.io/dcs/how-tos/dataverse-integration-guide/
+
+ Note that for direct uploads and downloads, Dataverse redirects to the proxy-url but presigns the urls based on the ``dataverse.files.<id>.custom-endpoint-url``. Also, note that if you choose to enable ``dataverse.files.<id>.download-redirect`` the S3 URLs expire after 60 minutes by default. You can change that minute value to reflect a timeout value that’s more appropriate by using ``dataverse.files.<id>.url-expiration-minutes``.
+
+`Surf Object Store v2019-10-30 <https://www.surf.nl/en>`_
+  Set ``dataverse.files.<id>.chunked-encoding=false`` and ``dataverse.files.<id>.path-style-request=true`` to use Surf Object
+  Store. You will need the Swift client (documented at <http://doc.swift.surfsara.nl/en/latest/Pages/Clients/s3cred.html>) to create the access key and secret key for the S3 interface.
+
+Note that the ``dataverse.files.<id>.proxy-url`` setting can be used in installations where the object store is proxied, but it should be considered an advanced option that will require significant expertise to properly configure. 
+For direct uploads and downloads, Dataverse redirects to the proxy-url but presigns the urls based on the ``dataverse.files.<id>.custom-endpoint-url``.
+Additional configuration (appropriate CORS settings, proxy caching/timeout configuration, and proxy settings to pass headers to/from S3 and to avoid adding additional headers) will also be needed to enable use of a proxy with direct upload and download.
+For Amazon AWS, see comments in the edu.harvard.iq.dataverse.dataaccess.S3AccessIO class about support for AWS's bucket-specific DNS names.
+ 
+`SeaweedFS <https://github.com/chrislusf/seaweedfs>`_
+  SeaweedFS is a distributed storage system that has S3 compatibility. Set the S3 storage options as explained above. Make sure to set ``dataverse.files.<id>.path-style-access`` to ``true``. You will need to create the bucket beforehand. You can do this with the filer API using curl commands. For example, to create an empty bucket called ``dataverse``:
+  
+.. code-block:: bash
+
+  curl -X POST "http://localhost:8888/buckets/"
+  curl -X POST "http://localhost:8888/buckets/dataverse/"
+  
+You will also need to set an access and secret key. One way to do this is via a `static file <https://github.com/chrislusf/seaweedfs/wiki/Amazon-S3-API#static-configuration>`_. As an example, your ``config.json`` might look like this if you're using a bucket called ``dataverse``:
+  
+.. code-block:: json
+
+  {
+    "identities": [
+      {
+        "name": "anonymous",
+	"credentials": [
+	  {
+	    "accessKey": "secret",
+	    "secretKey": "secret"
+	  }
+	],
+	"actions": [
+	  "Read:dataverse",
+	  "List:dataverse",
+	  "Tagging:dataverse",
+	  "Write:dataverse"
+	]
+      }
+    ]
+  }
+
+And lastly, to start up the SeaweedFS server and various components you could use a command like this:
+  
+.. code-block:: bash
+
+  weed server -s3 -metricsPort=9327 -dir=/data -s3.config=/config.json
+
+`VAST DataStore <https://www.vastdata.com/platform/datastore>`_
+  VAST DataStore must be configured with an S3 gateway. A Dataverse bucket must be created. 
+  Follow `VAST DataStore documentation <https://support.vastdata.com/s/document-item?bundleId=vast-cluster-administrator-s-guide4.7&topicId=managing-access-protocols/s3-object-storage-protocol.html&_LANG=enus>`_ to configure the S3 gateway.
+  Set ``dataverse.files.<id>.path-style-access=true`` since VAST DataStore uses path style access.
+
+**Additional Reported Working S3-Compatible Storage**
+
+If you are successfully using an S3 storage implementation not yet listed above, please feel free to
+`open an issue at Github <https://github.com/IQSS/dataverse/issues/new>`_ and describe your setup.
+We will be glad to add it.
+
+
+Migrating from Local Storage to S3
+##################################
+
+Is currently documented on the :doc:`/developers/deployment` page.
+
+.. _trusted-remote-storage:
+
+Trusted Remote Storage
+++++++++++++++++++++++
+
+In addition to having the type "remote" and requiring a label, Trusted Remote Stores are defined in terms of a baseURL - all files managed by this store must be at a path starting with this URL, and a baseStore - a file, s3, or swift store that can be used to store additional ancillary dataset files (e.g. metadata exports, thumbnails, auxiliary files, etc.).
+These and other available options are described in the table below.
+
+Trusted remote stores can range from being a static trusted website to a sophisticated service managing access requests and logging activity
+and/or managing access to a secure enclave.  See :doc:`/developers/big-data-support` for additional information on how to use a trusted remote store. For specific remote stores, consult their documentation when configuring the remote store in your Dataverse installation.
+
+Note that in the current implementation, activites where Dataverse needs access to data bytes, e.g. to create thumbnails or validate hash values at publication will fail if a remote store does not allow Dataverse access. Implementers of such trusted remote stores should consider using Dataverse's settings to disable ingest, validation of files at publication, etc. as needed.
+
+Once you have configured a trusted remote store, you can point your users to the :ref:`add-remote-file-api` section of the API Guide.
+
+.. table::
+    :align: left
+
+    ===========================================  ==================  ==========================================================================  ===================
+    JVM Option                                   Value               Description                                                                 Default value
+    ===========================================  ==================  ==========================================================================  ===================
+    dataverse.files.<id>.type                    ``remote``          **Required** to mark this storage as remote.                                (none)
+    dataverse.files.<id>.label                   <?>                 **Required** label to be shown in the UI for this storage.                  (none)
+    dataverse.files.<id>.base-url                <?>                 **Required** All files must have URLs of the form <baseUrl>/* .             (none)
+    dataverse.files.<id>.base-store              <?>                 **Required** The id of a base store (of type file, s3, or swift).           (the default store)
+    dataverse.files.<id>.download-redirect       ``true``/``false``  Enable direct download (should usually be true).                            ``false``
+    dataverse.files.<id>.secret-key               <?>                 A key used to sign download requests sent to the remote store. Optional.   (none)
+    dataverse.files.<id>.url-expiration-minutes  <?>                 If direct downloads and using signing: time until links expire. Optional.   60
+    dataverse.files.<id>.remote-store-name       <?>                 A short name used in the UI to indicate where a file is located. Optional.  (none)
+    dataverse.files.<id>.remote-store-url        <?>                 A url to an info page about the remote store used in the UI. Optional.      (none)
+    
+    ===========================================  ==================  ==========================================================================  ===================
+
+.. _globus-storage:
+
+Globus Storage
+++++++++++++++
+
+Globus stores allow Dataverse to manage files stored in Globus endpoints or to reference files in remote Globus endpoints, with users leveraging Globus to transfer files to/from Dataverse (rather than using HTTP/HTTPS).
+See :doc:`/developers/big-data-support` for additional information on how to use a globus store. Consult the `Globus documentation <https://docs.globus.org/>`_ for information about using Globus and configuring Globus endpoints.
+
+In addition to having the type "globus" and requiring a label, Globus Stores share many options with Trusted Remote Stores and options to specify and access a Globus endpoint(s). As with Remote Stores, Globus Stores also use a baseStore - a file, s3, or swift store that can be used to store additional ancillary dataset files (e.g. metadata exports, thumbnails, auxiliary files, etc.).
+These and other available options are described in the table below.
+
+There are two types of Globus stores:
+
+- managed - where Dataverse manages the Globus endpoint, deciding where transferred files are stored and managing access control for users transferring files to/from Dataverse
+- remote - where Dataverse references files that remain on trusted remote Globus endpoints
+
+A managed Globus store connects to standard/file-based Globus endpoint. It is also possible to configure an S3 store as a managed store, if the managed endpoint uses an underlying S3 store via the Globus S3 Connector.
+With the former, Dataverse has no direct access to the file contents and functionality related to ingest, fixity hash validation, etc. are not available. With the latter, Dataverse can access files internally via S3 and the functionality supported is similar to that when using S3 direct upload. 
+
+Once you have configured a globus store, or configured an S3 store for Globus access, it is recommended that you install the `dataverse-globus app <https://github.com/scholarsportal/dataverse-globus>`_ to allow transfers in/out of Dataverse to be initated via the Dataverse user interface. Alternately, you can point your users to the :doc:`/developers/globus-api` for information about API support.
+
+.. table::
+    :align: left
+
+    =======================================================  ==================  ==========================================================================  ===================
+    JVM Option                                               Value               Description                                                                 Default value
+    =======================================================  ==================  ==========================================================================  ===================
+    dataverse.files.<id>.type                                ``globus``          **Required** to mark this storage as globus enabled.                        (none)
+    dataverse.files.<id>.label                               <?>                 **Required** label to be shown in the UI for this storage.                  (none)
+    dataverse.files.<id>.base-store                          <?>                 **Required** The id of a base store (of type file, s3, or swift).           (the default store)
+    dataverse.files.<id>.remote-store-name                   <?>                 A short name used in the UI to indicate where a file is located. Optional.  (none)
+    dataverse.files.<id>.remote-store-url                    <?>                 A url to an info page about the remote store used in the UI. Optional.      (none)
+    dataverse.files.<id>.managed                             ``true``/``false``  Whether dataverse manages an associated Globus endpoint                     ``false``
+    dataverse.files.<id>.transfer-endpoint-with-basepath     <?>                 The *managed* Globus endpoint id and associated base path for file storage  (none)
+    dataverse.files.<id>.globus-token                        <?>                 A Globus token (base64 endcoded <Globus user id>:<Credential> 
+                                                                                 for a managed store) - using a microprofile alias is recommended            (none)
+    dataverse.files.<id>.reference-endpoints-with-basepaths  <?>                 A comma separated list of *remote* trusted Globus endpoint id/<basePath>s   (none)
+    dataverse.files.<id>.files-not-accessible-by-dataverse   ``true``/``false``  Should be false for S3 Connector-based *managed* stores, true for others    ``false``
+    
+    =======================================================  ==================  ==========================================================================  ===================
+    
+.. _temporary-file-storage:
+
+Temporary Upload File Storage
++++++++++++++++++++++++++++++
+
+When uploading files via the API or Web UI, you need to be aware that multiple steps are involved to enable
+features like ingest processing, transfer to a permanent storage, checking for duplicates, unzipping etc.
+
+All of these processes are triggered after finishing transfers over the wire and moving the data into a temporary
+(configurable) location on disk at :ref:`${dataverse.files.directory} <dataverse.files.directory>`\ ``/temp``.
+
+Before being moved there,
+
+- JSF Web UI uploads are stored at :ref:`${dataverse.files.uploads} <dataverse.files.uploads>`, defaulting to
+  ``/usr/local/payara6/glassfish/domains/domain1/uploads`` folder in a standard installation. This place is
+  configurable and might be set to a separate disk volume where stale uploads are purged periodically.
+- API uploads are stored at the system's temporary files location indicated by the Java system property
+  ``java.io.tmpdir``, defaulting to ``/tmp`` on Linux. If this location is backed by a `tmpfs <https://www.kernel.org/doc/html/latest/filesystems/tmpfs.html>`_
+  on your machine, large file uploads via API will cause RAM and/or swap usage bursts. You might want to point this to
+  a different location, restrict maximum size of it, and monitor for stale uploads.
+
+.. _cache-rate-limiting:
+
+Rate Limiting
+-------------
+
+Rate limiting has been added to prevent users from over taxing the system either deliberately or by runaway automated processes.
+Rate limiting can be configured on a tier level with tier 0 being reserved for guest users and tiers 1-any for authenticated users.
+Superuser accounts are exempt from rate limiting.
+Rate limits can be imposed on command APIs by configuring the tier, the command, and the hourly limit in the database.
+Two database settings configure the rate limiting.
+Note: If either of these settings exist in the database rate limiting will be enabled (note that a Payara restart is required for the setting to take effect). If neither setting exists rate limiting is disabled.
+
+- :RateLimitingDefaultCapacityTiers is the number of calls allowed per hour if the specific command is not configured. The values represent the number of calls per hour per user for tiers 0,1,...
+  A value of -1 can be used to signify no rate limit. Tiers not specified in this setting will default to `-1` (No Limit). I.e., -d "10000" is equivalent to -d "10000,-1,-1,..."
+
+.. code-block:: bash
+
+  curl http://localhost:8080/api/admin/settings/:RateLimitingDefaultCapacityTiers -X PUT -d '10000,20000'
+
+- :RateLimitingCapacityByTierAndAction is a JSON object specifying the rate by tier and a list of actions (commands). This allows for more control over the rate limit of individual API command calls.
+  In the following example, calls made by a guest user (tier 0) for API GetLatestPublishedDatasetVersionCommand is further limited to only 10 calls per hour, while an authenticated user (tier 1) will be able to make 30 calls per hour to the same API.
+
+:download:`rate-limit-actions.json </_static/installation/files/examples/rate-limit-actions-setting.json>`  Example JSON for RateLimitingCapacityByTierAndAction
+
+.. code-block:: bash
+
+  curl http://localhost:8080/api/admin/settings/:RateLimitingCapacityByTierAndAction -X PUT -d '[{"tier": 0, "limitPerHour": 10, "actions": ["GetLatestPublishedDatasetVersionCommand", "GetPrivateUrlCommand", "GetDatasetCommand", "GetLatestAccessibleDatasetVersionCommand"]}, {"tier": 0, "limitPerHour": 1, "actions": ["CreateGuestbookResponseCommand", "UpdateDatasetVersionCommand", "DestroyDatasetCommand", "DeleteDataFileCommand", "FinalizeDatasetPublicationCommand", "PublishDatasetCommand"]}, {"tier": 1, "limitPerHour": 30, "actions": ["CreateGuestbookResponseCommand", "GetLatestPublishedDatasetVersionCommand", "GetPrivateUrlCommand", "GetDatasetCommand", "GetLatestAccessibleDatasetVersionCommand", "UpdateDatasetVersionCommand", "DestroyDatasetCommand", "DeleteDataFileCommand", "FinalizeDatasetPublicationCommand", "PublishDatasetCommand"]}]'
 
 .. _Branding Your Installation:
 
 Branding Your Installation
 --------------------------
 
-The name of your root dataverse is the brand of your installation of Dataverse and appears in various places such as notifications and support links, as outlined in the :ref:`systemEmail` section below. To further brand your installation and make it your own, Dataverse provides configurable options for easy-to-add (and maintain) custom branding for your Dataverse installation. Here are the custom branding and content options you can add:
+A Dataverse installation can be branded in a number of ways.
+
+A simple option for branding your installation is to adjust the theme of a Dataverse collection. You can change colors, add a logo, add a tagline, or add a website link to the Dataverse collection header section of the page. These options are outlined under :ref:`theme` in the :doc:`/user/dataverse-management` section of the User Guide.
 
+More advanced customization is described below and covers the following areas.
+
+- Custom installation name/brand
+- Custom header
+- Navbar settings
 - Custom welcome/homepage
-- Logo image to navbar
-- Header
-- Footer
+- Custom footer
+- Footer settings
 - CSS stylesheet
 
 Downloadable sample HTML and CSS files are provided below which you can edit as you see fit. It's up to you to create a directory in which to store these files, such as ``/var/www/dataverse`` in the examples below.
 
-You may also want to look at samples at https://github.com/shlake/LibraDataHomepage from community member Sherry Lake as well as her poster from the Dataverse Community Meeting 2018 called "Branding Your Local Dataverse": https://github.com/IQSS/dataverse/files/2128735/UVaHomePage.pdf
+Additional samples from community member Sherry Lake are available at https://github.com/shlake/LibraDataHomepage.
 
-A simpler option to brand and customize your installation is to utilize the dataverse theme, which each dataverse has, that allows you to change colors, add a logo, tagline or website link to the dataverse header section of the page. Those options are outlined in the :doc:`/user/dataverse-management` section of the User Guide.
+.. _parts-of-webpage:
 
-Custom Homepage
-++++++++++++++++
+Parts of a Dataverse Installation Webpage
++++++++++++++++++++++++++++++++++++++++++
 
-Dataverse allows you to use a custom homepage or welcome page in place of the default root dataverse page. This allows for complete control over the look and feel of your installation's homepage.
+Before reading about the available customization options, you might want to familiarize yourself with the parts of a Dataverse installation webpage.
 
-Download this sample: :download:`custom-homepage.html </_static/installation/files/var/www/dataverse/branding/custom-homepage.html>` and place it at ``/var/www/dataverse/branding/custom-homepage.html``.
+The image below indicates that the page layout consists of three main blocks: a header block, a content block, and a footer block:
 
-Once you have the location of your custom homepage HTML file, run this curl command to add it to your settings:
+|dvPageBlocks|
 
-``curl -X PUT -d '/var/www/dataverse/branding/custom-homepage.html' http://localhost:8080/api/admin/settings/:HomePageCustomizationFile``
+.. To edit, use dvBrandingCustBlocks.drawio with https://app.diagrams.net
+.. |dvPageBlocks| image:: ./img/dvBrandingCustBlocks.png
+   :class: img-responsive
 
-If you prefer to start with less of a blank slate, you can download the :download:`custom-homepage-dynamic.html </_static/installation/files/var/www/dataverse/branding/custom-homepage-dynamic.html>` template which was built for the Harvard Dataverse, and includes branding messaging, action buttons, search input, subject links, and recent dataset links. This page was built to utilize the :doc:`/api/metrics` to deliver dynamic content to the page via javascript.
+Installation Name/Brand Name
+++++++++++++++++++++++++++++
 
-Note that the ``custom-homepage.html`` and ``custom-homepage-dynamic.html`` files provided have multiple elements that assume your root dataverse still has an alias of "root". While you were branding your root dataverse, you may have changed the alias to "harvard" or "librascholar" or whatever and you should adjust the custom homepage code as needed.
+It's common for a Dataverse installation to have some sort of installation name or brand name like "HeiDATA", "Libra Data", or "MELDATA".
 
-For more background on what this curl command above is doing, see the "Database Settings" section below. If you decide you'd like to remove this setting, use the following curl command:
+The installation name appears in various places such as notifications, support links, and metadata exports.
 
-``curl -X DELETE http://localhost:8080/api/admin/settings/:HomePageCustomizationFile``
+Out of the box, the installation name comes from the name of root Dataverse collection ("Root" by default). You can simply change the name of this collection to set the installation name you want.
+
+Alternatively, you can have independent names for the root Dataverse collection and the installation name by having the installation name come from the :ref:`:InstallationName` setting.
+
+Note that you can use :ref:`systemEmail` to control the name that appears in the "from" address of email messages sent by a Dataverse installation. This overrides the name of the root Dataverse collection and :ref:`:InstallationName`.
+
+If you have an image for your installation name, you can use it as the "Custom Navbar Logo", described below.
+
+Header Block
+++++++++++++
+
+Within the header block, you have a navbar (which will always be displayed) and you may insert a custom header that will be displayed above the navbar.
+
+Navbar
+^^^^^^
+
+The navbar is the component displayed by default on the header block and will be present on every Dataverse webpage.
+
+The navbar encompasses several configurable settings (described below) that manage user interaction with a Dataverse installation.
 
 Custom Navbar Logo
-+++++++++++++++++++
+##################
 
-Dataverse allows you to replace the default Dataverse icon and name branding in the navbar with your own custom logo. Note that this logo is separate from the *root dataverse theme* logo.
+The Dataverse Software allows you to replace the default Dataverse Project icon and name branding in the navbar with your own custom logo. Note that this logo is separate from the logo used in the theme of the root Dataverse collection (see :ref:`theme`).
 
-The custom logo image file is expected to be small enough to fit comfortably in the navbar, no more than 50 pixels in height and 160 pixels in width. Create a ``navbar`` directory in your Glassfish ``logos`` directory and place your custom logo there. By Glassfish default, your logo image file will be located at ``/usr/local/glassfish4/glassfish/domains/domain1/docroot/logos/navbar/logo.png``.
+The custom logo image file is expected to be small enough to fit comfortably in the navbar, no more than 50 pixels in height and 160 pixels in width. Create a ``navbar`` directory in your Payara ``logos`` directory and place your custom logo there. By default, your logo image file will be located at ``/usr/local/payara6/glassfish/domains/domain1/docroot/logos/navbar/logo.png``.
 
-Once you have the location of your custom logo image file, run this curl command to add it to your settings:
+Given this location for the custom logo image file, run this curl command to add it to your settings:
 
 ``curl -X PUT -d '/logos/navbar/logo.png' http://localhost:8080/api/admin/settings/:LogoCustomizationFile``
 
+To revert to the default configuration and have the Dataverse Project icon be displayed, run the following command:
+
+``curl -X DELETE http://localhost:8080/api/admin/settings/:LogoCustomizationFile``
+
+About URL
+#########
+
+Refer to :ref:`:NavbarAboutUrl` for setting a fully-qualified URL which will be used for the "About" link in the navbar.
+
+User Guide URL
+##############
+
+Refer to :ref:`:NavbarGuidesUrl`, :ref:`:GuidesBaseUrl`, and :ref:`:GuidesVersion` for setting a fully-qualified URL which will be used for the "User Guide" link in the navbar.
+
+Support URL
+###########
+
+Refer to :ref:`:NavbarSupportUrl` for setting to a fully-qualified URL which will be used for the "Support" link in the navbar.
+
+Sign Up
+#######
+
+Refer to :ref:`:SignUpUrl` and :ref:`conf-allow-signup` for setting a relative path URL to which users will be sent for sign up and for controlling the ability for creating local user accounts.
+
 Custom Header
-+++++++++++++
+^^^^^^^^^^^^^
 
-Download this sample: :download:`custom-header.html </_static/installation/files/var/www/dataverse/branding/custom-header.html>` and place it at ``/var/www/dataverse/branding/custom-header.html``.
+As a starting point you can download :download:`custom-header.html </_static/installation/files/var/www/dataverse/branding/custom-header.html>` and place it at ``/var/www/dataverse/branding/custom-header.html``.
 
-Once you have the location of your custom header HTML file, run this curl command to add it to your settings:
+Given this location for the custom header HTML file, run this curl command to add it to your settings:
 
 ``curl -X PUT -d '/var/www/dataverse/branding/custom-header.html' http://localhost:8080/api/admin/settings/:HeaderCustomizationFile``
 
@@ -528,26 +1694,70 @@ If you have enabled a custom header or navbar logo, you might prefer to disable
 
 ``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:DisableRootDataverseTheme``
 
-Please note: Disabling the display of the root dataverse theme also disables your ability to edit it. Remember that dataverse owners can set their dataverses to "inherit theme" from the root. Those dataverses will continue to inherit the root dataverse theme (even though it no longer displays on the root). If you would like to edit the root dataverse theme in the future, you will have to re-enable it first.
+Please note: Disabling the display of the root Dataverse collection theme also disables your ability to edit it. Remember that Dataverse collection owners can set their Dataverse collections to "inherit theme" from the root. Those Dataverse collections will continue to inherit the root Dataverse collection theme (even though it no longer displays on the root). If you would like to edit the root Dataverse collection theme in the future, you will have to re-enable it first.
+
+Content Block
++++++++++++++
+
+As shown in the image under :ref:`parts-of-webpage`, the content block is the area below the header and above the footer.
+
+By default, when you view the homepage of a Dataverse installation, the content block shows the root Dataverse collection. This page contains the data available in the Dataverse installation (e.g. dataverses and datasets) and the functionalities that allow the user to interact with the platform (e.g. search, create/edit data and metadata, etc.).
+
+Rather than showing the root Dataverse collection on the homepage, the content block can show a custom homepage instead. Read on for details.
+
+Custom Homepage
+^^^^^^^^^^^^^^^
+
+When you configure a custom homepage, it **replaces** the root Dataverse collection in the content block, serving as a welcome page. This allows for complete control over the look and feel of the content block for your installation's homepage.
+
+As a starting point, download :download:`custom-homepage.html </_static/installation/files/var/www/dataverse/branding/custom-homepage.html>` and place it at ``/var/www/dataverse/branding/custom-homepage.html``.
+
+Given this location for the custom homepage HTML file, run this curl command to add it to your settings:
+
+``curl -X PUT -d '/var/www/dataverse/branding/custom-homepage.html' http://localhost:8080/api/admin/settings/:HomePageCustomizationFile``
+
+Note that the ``custom-homepage.html`` file provided has multiple elements that assume your root Dataverse collection still has an alias of "root". While you were branding your root Dataverse collection, you may have changed the alias to "harvard" or "librascholar" or whatever and you should adjust the custom homepage code as needed.
+
+Note: If you prefer to start with less of a blank slate, you can review the custom homepage used by the Harvard Dataverse Repository, which includes branding messaging, action buttons, search input, subject links, and recent dataset links. This page was built to utilize the :doc:`/api/metrics` to deliver dynamic content to the page via Javascript. The files can be found at https://github.com/IQSS/dataverse.harvard.edu
+
+If you decide you'd like to remove this setting, use the following curl command:
+
+``curl -X DELETE http://localhost:8080/api/admin/settings/:HomePageCustomizationFile``
+
+Footer Block
+++++++++++++
+
+Within the footer block you have the default footer section (which will always be displayed) and you can insert a custom footer that will be displayed below the default footer.
+
+Default Footer
+^^^^^^^^^^^^^^
+
+The default footer is the component displayed by default on the footer block and will be present on every Dataverse webpage. Its configuration options are described below.
+
+Footer Copyright
+################
 
+Refer to :ref:`:FooterCopyright` to add customized text to the Copyright section of the default Dataverse footer
 
 Custom Footer
-+++++++++++++
+^^^^^^^^^^^^^
 
-Download this sample: :download:`custom-footer.html </_static/installation/files/var/www/dataverse/branding/custom-footer.html>` and place it at ``/var/www/dataverse/branding/custom-footer.html``.
+As mentioned above, the custom footer appears below the default footer.
 
-Once you have the location of your custom footer HTML file, run this curl command to add it to your settings:
+As a starting point, download :download:`custom-footer.html </_static/installation/files/var/www/dataverse/branding/custom-footer.html>` and place it at ``/var/www/dataverse/branding/custom-footer.html``.
+
+Given this location for the custom footer HTML file, run this curl command to add it to your settings:
 
 ``curl -X PUT -d '/var/www/dataverse/branding/custom-footer.html' http://localhost:8080/api/admin/settings/:FooterCustomizationFile``
 
 Custom Stylesheet
 +++++++++++++++++
 
-You can style your custom homepage, footer and header content with a custom CSS file. With advanced CSS know-how, you can achieve custom branding and page layouts by utilizing ``position``, ``padding`` or ``margin`` properties.
+You can style your custom homepage, footer, and header content with a custom CSS file. With advanced CSS know-how, you can achieve custom branding and page layouts by utilizing ``position``, ``padding`` or ``margin`` properties.
 
-Download this sample: :download:`custom-stylesheet.css </_static/installation/files/var/www/dataverse/branding/custom-stylesheet.css>` and place it at ``/var/www/dataverse/branding/custom-stylesheet.css``.
+As a starting point, download :download:`custom-stylesheet.css </_static/installation/files/var/www/dataverse/branding/custom-stylesheet.css>` and place it at ``/var/www/dataverse/branding/custom-stylesheet.css``.
 
-Once you have the location of your custom CSS file, run this curl command to add it to your settings:
+Given this location for the custom CSS file, run this curl command to add it to your settings:
 
 ``curl -X PUT -d '/var/www/dataverse/branding/custom-stylesheet.css' http://localhost:8080/api/admin/settings/:StyleCustomizationFile``
 
@@ -556,42 +1766,59 @@ Once you have the location of your custom CSS file, run this curl command to add
 Internationalization
 --------------------
 
-Dataverse is being translated into multiple languages by the Dataverse community! Please see below for how to help with this effort!
+The Dataverse Software is being translated into multiple languages by the Dataverse Project Community! Please see below for how to help with this effort!
 
 Adding Multiple Languages to the Dropdown in the Header
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 The presence of the :ref:`:Languages` database setting adds a dropdown in the header for multiple languages. For example to add English and French to the dropdown:
 
 ``curl http://localhost:8080/api/admin/settings/:Languages -X PUT -d '[{"locale":"en","title":"English"},{"locale":"fr","title":"Français"}]'``
 
+When a user selects one of the available choices, the Dataverse user interfaces will be translated into that language (assuming you also configure the "lang" directory and populate it with translations as described below).
+
+Allowing the Language Used for Dataset Metadata to be Specified
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Since dataset metadata can only be entered in one language, and administrators may wish to limit which languages metadata can be entered in, Dataverse also offers a separate setting defining allowed metadata languages.
+The presence of the :ref:`:MetadataLanguages` database setting identifies the available options (which can be different from those in the :Languages setting above, with fewer or more options).
+
+Dataverse collection admins can select from these options to indicate which language should be used for new Datasets created with that specific collection. If they do not, users will be asked when creating a dataset to select the language they want to use when entering metadata.
+Similarly, when this setting is defined, Datasets created/imported/migrated are required to specify a metadataLanguage compatible with the collection's requirement.
+
+When creating or editing a dataset, users will be asked to enter the metadata in that language. The metadata language selected will also be shown when dataset metadata is viewed and will be included in metadata exports (as appropriate for each format) for published datasets:
+
+``curl http://localhost:8080/api/admin/settings/:MetadataLanguages -X PUT -d '[{"locale":"en","title":"English"},{"locale":"fr","title":"Français"}]'``
+
+Note that metadata selected from Controlled Vocabularies will also display in the metadata language of the dataset, but only if translations have been configured, i.e. you configure the "lang" directory and populate it with translations as described below). In metadata export files, controlled vocabulary values will be included in the Dataverse installations default language and in the metadata language of the dataset (if specified).
+
 Configuring the "lang" Directory
 ++++++++++++++++++++++++++++++++
 
-Translations for Dataverse are stored in "properties" files in a directory on disk (e.g. ``/home/glassfish/langBundles``) that you specify with the :ref:`dataverse.lang.directory` ``dataverse.lang.directory`` JVM option, like this:
+Translations for the Dataverse Software are stored in "properties" files in a directory on disk (e.g. ``/home/dataverse/langBundles``) that you specify with the :ref:`dataverse.lang.directory` ``dataverse.lang.directory`` JVM option, like this:
 
-``./asadmin create-jvm-options '-Ddataverse.lang.directory=/home/glassfish/langBundles'``
+``./asadmin create-jvm-options '-Ddataverse.lang.directory=/home/dataverse/langBundles'``
 
 Go ahead and create the directory you specified.
 
-``mkdir /home/glassfish/langBundles``
+``mkdir /home/dataverse/langBundles``
 
 Creating a languages.zip File
 +++++++++++++++++++++++++++++
 
-Dataverse provides and API endpoint for adding languages using a zip file.
+The Dataverse Software provides and API endpoint for adding languages using a zip file.
 
 First, clone the "dataverse-language-packs" git repo.
 
 ``git clone https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs.git``
 
-Take a look at https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs/branches to see if the version of Dataverse you're running has translations.
+Take a look at https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs/branches to see if the version of the Dataverse Software you're running has translations.
 
 Change to the directory for the git repo you just cloned.
 
 ``cd dataverse-language-packs``
 
-Switch (``git checkout``) to the branch based on Dataverse version you are running. The branch "dataverse-v4.13" is used in the example below.
+Switch (``git checkout``) to the branch based on the Dataverse Software version you are running. The branch "dataverse-v4.13" is used in the example below.
 
 ``export BRANCH_NAME=dataverse-v4.13``
 
@@ -613,24 +1840,38 @@ Create the zip file
 
 ``zip languages.zip *.properties``
 
-Load the languages.zip file into Dataverse
-++++++++++++++++++++++++++++++++++++++++++
+Load the languages.zip file into your Dataverse Installation
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-Now that you have a "languages.zip" file, you can load it into Dataverse with the command below.
+Now that you have a "languages.zip" file, you can load it into your Dataverse installation with the command below.
 
 ``curl http://localhost:8080/api/admin/datasetfield/loadpropertyfiles -X POST --upload-file /tmp/languages/languages.zip -H "Content-Type: application/zip"``
 
-Click on the languages using the drop down in the header to try them out.
+Stop and start Payara and then click on the languages using the drop down in the header to try them out.
 
-How to Help Translate Dataverse Into Your Language
-++++++++++++++++++++++++++++++++++++++++++++++++++
+.. _help-translate:
+
+How to Help Translate the Dataverse Software Into Your Language
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-Please join the `dataverse-internationalization-wg`_ mailing list and contribute to https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs to help translate Dataverse into various languages!
+Please join the `dataverse-internationalization-wg`_ mailing list and contribute to https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs to help translate the Dataverse Software into various languages!
 
 Some external tools are also ready to be translated, especially if they are using the ``{localeCode}`` reserved word in their tool manifest. For details, see the :doc:`/api/external-tools` section of the API Guide.
 
 .. _dataverse-internationalization-wg: https://groups.google.com/forum/#!forum/dataverse-internationalization-wg
 
+
+Tools for Translators
++++++++++++++++++++++
+
+The list below depicts a set of tools that can be used to ease the amount of work necessary for translating the Dataverse software by facilitating this collaborative effort and enabling the reuse of previous work:
+
+- `Weblate for the Dataverse Software <https://weblate.dataverse.org/>`_, made available in the scope of the `SSHOC <https://sshopencloud.eu/>`_ project.
+
+- `easyTranslationHelper <https://github.com/universidadeaveiro/easyTranslationHelper>`_, a tool developed by `University of Aveiro <https://www.ua.pt/>`_.
+
+- `Dataverse General User Interface Translation Guide for Weblate <https://doi.org/10.5281/zenodo.4807371>`_, a guide produced as part of the `SSHOC Dataverse Translation <https://www.sshopencloud.eu/news/workshop-notes-sshoc-dataverse-translation-follow-event/>`_ event.
+
 .. _Web-Analytics-Code:
 
 Web Analytics Code
@@ -638,7 +1879,7 @@ Web Analytics Code
 
 Your analytics code can be added to your Dataverse installation in a similar fashion to how you brand it, by adding a custom HTML file containing the analytics code snippet and adding the file location to your settings.
 
-Popular analytics providers Google Analytics (https://www.google.com/analytics/) and Matomo (formerly "Piwik"; https://matomo.org/) have been set up with Dataverse. Use the documentation they provide to add the analytics code to your custom HTML file. This allows for more control of your analytics, making it easier to customize what you prefer to track.
+Popular analytics providers Google Analytics (https://www.google.com/analytics/) and Matomo (formerly "Piwik"; https://matomo.org/) have been set up to work with the Dataverse Software. Use the documentation they provide to add the analytics code to your custom HTML file. This allows for more control of your analytics, making it easier to customize what you prefer to track.
 
 Create your own ``analytics-code.html`` file using the analytics code snippet provided by Google or Matomo and place it somewhere on the server, outside the application deployment directory; for example: ``/var/www/dataverse/branding/analytics-code.html``. Here is an *example* of what your HTML file will look like:
 
@@ -665,1188 +1906,3540 @@ Once you have created the analytics file, run this curl command to add it to you
 Tracking Button Clicks
 ++++++++++++++++++++++
 
-The basic analytics configuration above tracks page navigation. However, it does not capture potentially interesting events, such as those from users clicking buttons on pages, that do not result in a new page opening. In Dataverse, these events include file downloads, requesting access to restricted data, exporting metadata, social media sharing, requesting citation text, launching external tools or WorldMap, contacting authors, and launching computations. 
+The basic analytics configuration above tracks page navigation. However, it does not capture potentially interesting events, such as those from users clicking buttons on pages, that do not result in a new page opening. In a Dataverse installation, these events include file downloads, requesting access to restricted data, exporting metadata, social media sharing, requesting citation text, launching external tools, contacting authors, and launching computations.
 
-Both Google and Matomo provide the optional capability to track such events and Dataverse has added CSS style classes (btn-compute, btn-contact, btn-download, btn-explore, btn-export, btn-preview, btn-request, btn-share, anddownloadCitation) to it's HTML to facilitate it.
+Both Google and Matomo provide the optional capability to track such events and the Dataverse Software has added CSS style classes (btn-compute, btn-contact, btn-download, btn-explore, btn-export, btn-preview, btn-request, btn-share, and downloadCitation) to it's HTML to facilitate it.
 
-For Google Analytics, the example script at :download:`analytics-code.html </_static/installation/files/var/www/dataverse/branding/analytics-code.html>` will track both page hits and events within Dataverse. You would use this file in the same way as the shorter example above, putting it somewhere outside your deployment directory, replacing ``YOUR ACCOUNT CODE`` with your actual code and setting :WebAnalyticsCode to reference it.
+For Google Analytics, the example script at :download:`analytics-code.html </_static/installation/files/var/www/dataverse/branding/analytics-code.html>` will track both page hits and events within your Dataverse installation. You would use this file in the same way as the shorter example above, putting it somewhere outside your deployment directory, replacing ``YOUR ACCOUNT CODE`` with your actual code and setting :WebAnalyticsCode to reference it.
 
 Once this script is running, you can look in the Google Analytics console (Realtime/Events or Behavior/Events) and view events by type and/or the Dataset or File the event involves.
 
-BagIt Export
-------------
-
-Dataverse may be configured to submit a copy of published Datasets, packaged as `Research Data Alliance conformant <https://www.rd-alliance.org/system/files/Research%20Data%20Repository%20Interoperability%20WG%20-%20Final%20Recommendations_reviewed_0.pdf>`_ zipped `BagIt <https://tools.ietf.org/html/draft-kunze-bagit-17>`_ bags to `Chronopolis <https://libraries.ucsd.edu/chronopolis/>`_ via `DuraCloud <https://duraspace.org/duracloud/>`_ or alternately to any folder on the local filesystem.
+Adding Cookie Consent (for GDPR, etc.)
+++++++++++++++++++++++++++++++++++++++
 
-Dataverse offers an internal archive workflow which may be configured as a PostPublication workflow via an admin API call to manually submit previously published Datasets and prior versions to a configured archive such as Chronopolis. The workflow creates a `JSON-LD <http://www.openarchives.org/ore/0.9/jsonld>`_ serialized `OAI-ORE <https://www.openarchives.org/ore/>`_ map file, which is also available as a metadata export format in the Dataverse web interface.
+Cookie consent may be required on websites that use analytics tracking codes to comply with privacy regulations, such as the GDPR, which mandate informing users about the collection and use of their data, thereby giving them the option to accept or reject cookies for enhanced privacy and control over their personal information.
 
-At present, the DPNSubmitToArchiveCommand and LocalSubmitToArchiveCommand are the only implementations extending the AbstractSubmitToArchiveCommand and using the configurable mechanisms discussed below.
+Members of the Dataverse community have used the CookieConsent (https://cookieconsent.orestbida.com) JavaScript library for this purpose. Configuration advice is below.
 
-.. _Duracloud Configuration:
+To allow users to opt out of the use of Google Analytics tracking you can do the following:
 
-Duracloud Configuration
-+++++++++++++++++++++++
+1. Assuming you already have ``analytics-code.html`` added and configured, update the Google Analytics scripts by adding  ``type``, ``data-category``, and ``data-service`` arguments like this:
 
-Also note that while the current Chronopolis implementation generates the bag and submits it to the archive's DuraCloud interface, the step to make a 'snapshot' of the space containing the Bag (and verify it's successful submission) are actions a curator must take in the DuraCloud interface.
+.. code-block:: html
 
-The minimal configuration to support an archiver integration involves adding a minimum of two Dataverse Keys and any required Glassfish jvm options. The example instructions here are specific to the DuraCloud Archiver\:
+    <!-- Global Site Tag (gtag.js) - Google Analytics -->
+    <script
+        async="async"
+        src="https://www.googletagmanager.com/gtag/js?id=YOUR-ACCOUNT-CODE"
+        type="text/plain"
+        data-category="analytics"
+        data-service="Google Analytics"></script>
+    <script
+        type="text/plain"
+        data-category="analytics"
+        data-service="Google Analytics">
+        //<![CDATA[
+	window.dataLayer = window.dataLayer || [];
+	function gtag(){dataLayer.push(arguments);}
+	gtag('js', new Date());
 
-\:ArchiverClassName - the fully qualified class to be used for archiving. For example: 
+	gtag('config', 'YOUR-ACCOUNT-CODE');
+        //]]>
+    </script>
 
-``curl http://localhost:8080/api/admin/settings/:ArchiverClassName -X PUT -d "edu.harvard.iq.dataverse.engine.command.impl.DuraCloudSubmitToArchiveCommand"``
+2. Add to ``analytics-code.html``:
+
+``<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/orestbida/cookieconsent@v3.0.0/dist/cookieconsent.css">``
+
+3. Go to https://playground.cookieconsent.orestbida.com to configure, download and copy contents of ``cookieconsent-config.js`` to ``analytics-code.html``. It should look something like this:
+
+.. code-block:: html
+
+    <script type="module">
+      import 'https://cdn.jsdelivr.net/gh/orestbida/cookieconsent@v3.0.0/dist/cookieconsent.umd.js';
+
+      CookieConsent.run({
+        guiOptions: {
+          consentModal: {
+            layout: "box",
+            position: "middle center",
+            equalWeightButtons: false,
+            flipButtons: false
+          },
+          preferencesModal: {
+            layout: "box",
+            position: "right",
+            equalWeightButtons: true,
+            flipButtons: false
+          }
+        },
+        categories: {
+          necessary: {
+            readOnly: true
+          },
+          analytics: {},
+        },
+        language: {
+          default: "en",
+          autoDetect: "browser",
+          translations: {
+            en: {
+              consentModal: {
+                title: "Hello traveller, it's cookie time!",
+                description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip.",
+                acceptAllBtn: "Accept all",
+                acceptNecessaryBtn: "Reject all",
+                showPreferencesBtn: "Manage preferences",
+                footer: "<a href=\"#link\">Privacy Policy</a>\n<a href=\"#link\">Terms and conditions</a>"
+              },
+              preferencesModal: {
+                title: "Consent Preferences Center",
+                acceptAllBtn: "Accept all",
+                acceptNecessaryBtn: "Reject all",
+                savePreferencesBtn: "Save preferences",
+                closeIconLabel: "Close modal",
+                serviceCounterLabel: "Service|Services",
+                sections: [
+                  {
+                    title: "Cookie Usage",
+                    description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
+                  },
+                  {
+                    title: "Strictly Necessary Cookies <span class=\"pm__badge\">Always Enabled</span>",
+                    description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+                    linkedCategory: "necessary"
+                  },
+                  {
+                    title: "Analytics Cookies",
+                    description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+                    linkedCategory: "analytics"
+                  },
+                  {
+                    title: "More information",
+                    description: "For any query in relation to my policy on cookies and your choices, please <a class=\"cc__link\" href=\"#yourdomain.com\">contact me</a>."
+                  }
+                ]
+              }
+            }
+          }
+        },
+        disablePageInteraction: true
+      });
+    </script>
 
-\:ArchiverSettings - the archiver class can access required settings including existing Dataverse settings and dynamically defined ones specific to the class. This setting is a comma-separated list of those settings. For example\: 
+After restarting or reloading Dataverse the cookie consent popup should appear, looking something like this:
 
-``curl http://localhost:8080/api/admin/settings/:ArchiverSettings -X PUT -d ":DuraCloudHost, :DuraCloudPort, :DuraCloudContext"``
+|cookieconsent|
 
-The DPN archiver defines three custom settings, one of which is required (the others have defaults):
+.. |cookieconsent| image:: ./img/cookie-consent-example.png
+   :class: img-responsive
 
-\:DuraCloudHost - the URL for your organization's Duracloud site. For example: 
+If you change the cookie consent config in ``CookieConsent.run()`` and want to test your changes, you should remove the cookie called ``cc_cookie`` in your browser and reload the Dataverse page to have the popup appear again. To remove cookies use Application > Cookies in the Chrome/Edge dev tool, and Storage > Cookies in Firefox and Safari.
 
-``curl http://localhost:8080/api/admin/settings/:DuraCloudHost -X PUT -d "qdr.duracloud.org"``
+.. _license-config:
 
-:DuraCloudPort and :DuraCloudContext are also defined if you are not using the defaults ("443" and "duracloud" respectively). (Note\: these settings are only in effect if they are listed in the \:ArchiverSettings. Otherwise, they will not be passed to the DuraCloud Archiver class.)
+Configuring Licenses
+--------------------
 
-Archivers may require glassfish settings as well. For the Chronopolis archiver, the username and password associated with your organization's Chronopolis/DuraCloud account should be configured in Glassfish:
+On a new Dataverse installation, users may select from the following licenses or terms:
 
-``./asadmin create-jvm-options '-Dduracloud.username=YOUR_USERNAME_HERE'``
-    
-``./asadmin create-jvm-options '-Dduracloud.password=YOUR_PASSWORD_HERE'``
+- CC0 1.0 (default)
+- CC BY 4.0
+- Custom Dataset Terms
 
-.. _Local Path Configuration:
+(Note that existing Dataverse installations which are upgraded from 5.9 or previous will only offer CC0 1.0, added automatically during the upgrade to version 5.10.)
 
-Local Path Configuration
-++++++++++++++++++++++++
+If the Dataverse Installation supports multiple languages, the license name/description translations should be added to the ``License`` properties files. (See :ref:`i18n` for more on properties files and internationalization in general.)
+To create the key, the license name has to be converted to lowercase, replace space with underscore.
 
-ArchiverClassName - the fully qualified class to be used for archiving. For example\:
+Example::
 
-``curl -X PUT -d "edu.harvard.iq.dataverse.engine.command.impl.LocalSubmitToArchiveCommand" http://localhost:8080/api/admin/settings/:ArchiverClassName``
+  license.cc0_1.0.description=Creative Commons CC0 1.0 Universal Public Domain Dedication.
+  license.cc0_1.0.name=CC0 1.0
 
-\:BagItLocalPath - the path to where you want to store BagIt. For example\:
+You have a lot of control over which licenses and terms are available. You can remove licenses and add new ones. You can decide which license is the default. You can remove "Custom Dataset Terms" as a option. You can remove all licenses and make "Custom Dataset Terms" the only option.
 
-``curl -X PUT -d /home/path/to/storage http://localhost:8080/api/admin/settings/:BagItLocalPath``
+Before making changes, you are encouraged to read the :ref:`license-terms` section of the User Guide about why CC0 is the default and what the "Custom Dataset Terms" option allows.
 
-\:ArchiverSettings - the archiver class can access required settings including existing Dataverse settings and dynamically defined ones specific to the class. This setting is a comma-separated list of those settings. For example\: 
+Setting the Default License
++++++++++++++++++++++++++++
 
-``curl http://localhost:8080/api/admin/settings/:ArchiverSettings -X PUT -d ":BagItLocalPath”``
+The default license can be set with a curl command as explained in the API Guide under :ref:`license-management-api`.
 
-:BagItLocalPath is the file path that you've set in :ArchiverSettings.
+Note that "Custom Dataset Terms" is not a license and cannot be set to be the default.
 
-API Call
-++++++++
+Adding Licenses
++++++++++++++++
 
-Once this configuration is complete, you, as a user with the *PublishDataset* permission, should be able to use the API call to manually submit a DatasetVersion for processing:
+Licenses are added with curl using JSON file as explained in the API Guide under :ref:`license-management-api`.
 
-``curl -H "X-Dataverse-key: <key>" http://localhost:8080/api/admin/submitDataVersionToArchive/{id}/{version}``
-    
-where:
+.. _adding-creative-commons-licenses:
 
-{id} is the DatasetId (or :persistentId with the ?persistentId="\<DOI\>" parameter), and
+Adding Creative Common Licenses
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-{version} is the friendly version number, e.g. "1.2".
-     
-The submitDataVersionToArchive API (and the workflow discussed below) attempt to archive the dataset version via an archive specific method. For Chronopolis, a DuraCloud space named for the dataset (it's DOI with ':' and '.' replaced with '-') is created and two files are uploaded to it: a version-specific datacite.xml metadata file and a BagIt bag containing the data and an OAI-ORE map file. (The datacite.xml file, stored outside the Bag as well as inside is intended to aid in discovery while the ORE map file is 'complete', containing all user-entered metadata and is intended as an archival record.)
+JSON files for `Creative Commons licenses <https://creativecommons.org/about/cclicenses/>`_ are provided below. Note that a new installation of Dataverse already includes CC0 and CC BY.
 
-In the Chronopolis case, since the transfer from the DuraCloud front-end to archival storage in Chronopolis can take significant time, it is currently up to the admin/curator to submit a 'snap-shot' of the space within DuraCloud and to monitor its successful transfer. Once transfer is complete the space should be deleted, at which point the Dataverse API call can be used to submit a Bag for other versions of the same Dataset. (The space is reused, so that archival copies of different Dataset versions correspond to different snapshots of the same DuraCloud space.).
+- :download:`licenseCC0-1.0.json <../../../../scripts/api/data/licenses/licenseCC0-1.0.json>`
+- :download:`licenseCC-BY-4.0.json <../../../../scripts/api/data/licenses/licenseCC-BY-4.0.json>`
+- :download:`licenseCC-BY-SA-4.0.json <../../../../scripts/api/data/licenses/licenseCC-BY-SA-4.0.json>`
+- :download:`licenseCC-BY-NC-4.0.json <../../../../scripts/api/data/licenses/licenseCC-BY-NC-4.0.json>`
+- :download:`licenseCC-BY-NC-SA-4.0.json <../../../../scripts/api/data/licenses/licenseCC-BY-NC-SA-4.0.json>`
+- :download:`licenseCC-BY-ND-4.0.json <../../../../scripts/api/data/licenses/licenseCC-BY-ND-4.0.json>`
+- :download:`licenseCC-BY-NC-ND-4.0.json <../../../../scripts/api/data/licenses/licenseCC-BY-NC-ND-4.0.json>`
 
-PostPublication Workflow
-++++++++++++++++++++++++
+.. _adding-custom-licenses:
 
-To automate the submission of archival copies to an archive as part of publication, one can setup a Dataverse Workflow using the "archiver" workflow step - see the :doc:`/developers/workflows` guide.
-. The archiver step uses the configuration information discussed above including the :ArchiverClassName setting. The workflow step definition should include the set of properties defined in \:ArchiverSettings in the workflow definition.
+Adding Software Licenses
+^^^^^^^^^^^^^^^^^^^^^^^^
 
-To active this workflow, one must first install a workflow using the archiver step. A simple workflow that invokes the archiver step configured to submit to DuraCloud as its only action is included in dataverse at /scripts/api/data/workflows/internal-archiver-workflow.json.
+JSON files for software licenses are provided below.
 
-Using the Workflow Native API (see the :doc:`/api/native-api` guide) this workflow can be installed using:
+- :download:`licenseMIT.json <../../../../scripts/api/data/licenses/licenseMIT.json>`
+- :download:`licenseApache-2.0.json <../../../../scripts/api/data/licenses/licenseApache-2.0.json>`
 
-``curl -X POST -H 'Content-type: application/json' --upload-file internal-archiver-workflow.json http://localhost:8080/api/admin/workflows``
-    
-The workflow id returned in this call (or available by doing a GET of /api/admin/workflows ) can then be submitted as the default PostPublication workflow:
+Adding Country-Specific Licenses
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-``curl -X PUT -d {id} http://localhost:8080/api/admin/workflows/default/PostPublishDataset``
+- :download:`licenseEtalab-2.0.json <../../../../scripts/api/data/licenses/licenseEtalab-2.0.json>` used in France (Etalab Open License 2.0, CC-BY 2.0 compliant).
 
-Once these steps are taken, new publication requests will automatically trigger submission of an archival copy to the specified archiver, Chronopolis' DuraCloud component in this example. For Chronopolis, as when using the API, it is currently the admin's responsibility to snap-shot the DuraCloud space and monitor the result. Failure of the workflow, (e.g. if DuraCloud is unavailable, the configuration is wrong, or the space for this dataset already exists due to a prior publication action or use of the API), will create a failure message but will not affect publication itself.  
+Contributing to the Collection of Standard Licenses Above
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Going Live: Launching Your Production Deployment
-------------------------------------------------
+If you do not find the license JSON you need above, you are encouraged to contribute it to this documentation. Following the Dataverse 6.2 release, we have standardized on the following procedure:
 
-This guide has attempted to take you from kicking the tires on Dataverse to finalizing your installation before letting real users in. In theory, all this work could be done on a single server but better would be to have separate staging and production environments so that you can deploy upgrades to staging before deploying to production. This "Going Live" section is about launching your **production** environment.
+- Look for the license at https://spdx.org/licenses/
+- ``cd scripts/api/data/licenses``
+- Copy an existing license as a starting point.
+- Name your file using the SPDX identifier. For example, if the identifier is ``Apache-2.0``, you should name your file ``licenseApache-2.0.json``.
+- For the ``name`` field, use the "short identifier" from the SPDX landing page (e.g. ``Apache-2.0``).
+- For the ``description`` field, use the "full name" from the SPDX landing page (e.g. ``Apache License 2.0``).
+- For the ``uri`` field, we encourage you to use the same resource that DataCite uses, which is often the same as the first "Other web pages for this license" on the SPDX page for the license. When these differ, or there are other concerns about the URI DataCite uses, please reach out to the community to see if a consensus can be reached.
+- For the ``active`` field, put ``true``.
+- For the ``sortOrder`` field, put the next sequential number after checking previous files with ``grep sortOrder scripts/api/data/licenses/*``.
 
-Before going live with your installation of Dataverse, you must take the steps above under "Securing Your Installation" and you should at least review the various configuration options listed below. An attempt has been made to put the more commonly-configured options earlier in the list.
+Note that prior to Dataverse 6.2, various license above have been added that do not adhere perfectly with this procedure. For example, the ``name`` for the CC0 license is ``CC0 1.0`` (no dash) rather than ``CC0-1.0`` (with a dash). We are keeping the existing names for backward compatibility. For more on standarizing license configuration, see https://github.com/IQSS/dataverse/issues/8512
 
-Out of the box, Dataverse attempts to block search engines from crawling your installation of Dataverse so that test datasets do not appear in search results until you're ready.
+Adding Custom Licenses
+^^^^^^^^^^^^^^^^^^^^^^
 
-Letting Search Engines Crawl Your Installation
-++++++++++++++++++++++++++++++++++++++++++++++
+If you are interested in adding a custom license, you will need to create your own JSON file as explained in  see :ref:`standardizing-custom-licenses`.
 
-Ensure robots.txt Is Not Blocking Search Engines
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Removing Licenses
++++++++++++++++++
 
-For a public production Dataverse installation, it is probably desired that search agents be able to index published pages (AKA - pages that are visible to an unauthenticated user).
-Polite crawlers usually respect the `Robots Exclusion Standard <https://en.wikipedia.org/wiki/Robots_exclusion_standard>`_; we have provided an example of a production robots.txt :download:`here </_static/util/robots.txt>`).
+Licenses can be removed with a curl command as explained in the API Guide under :ref:`license-management-api`.
 
-We **strongly recommend** using the crawler rules in the sample robots.txt linked above. Note that they make the dataverse and dataset pages accessible to the search engine bots; but discourage them from actually crawling the site, by following any search links - facets and such - on the dataverse pages. Such crawling is very inefficient in terms of system resources, and often results in confusing search results for the end users of the search engines (for example, when partial search results are indexed as individual pages).
+Disabling Custom Dataset Terms
+++++++++++++++++++++++++++++++
 
-The recommended solution instead is to directly point the bots to the dataset and dataverse pages that need to be indexed, by advertising them via an explicit sitemap (please see the next section for details on how to generate the sitemap). 
+See :ref:`:AllowCustomTermsOfUse` for how to disable the "Custom Dataset Terms" option.
 
-You can of course modify your own robots.txt to suit your specific needs as necessary. If you don't want your datasets to be indexed at all, you can tell the bots to stay away from your site completely. But, as noted above, keep in mind that only the good, "polite" bots honor these rules! You are not really blocking anyone from accessing your site by adding a "Disallow" rule in robots.txt - it is a suggestion only. A rogue bot can and will violate it. If you are having trouble with the site being overloaded with what looks like heavy automated crawling, you may have to resort to blocking this traffic by other means - for example, via rewrite rules in Apache, or even by a Firewall. 
+.. _ChangeLicenseSortOrder:
 
-(See the sample robots.txt file linked above for some comments on how to set up different "Allow" and "Disallow" rules for different crawler bots)
+Sorting licenses
+----------------
 
-You have a couple of options for putting an updated robots.txt file into production. If you are fronting Glassfish with Apache as recommended above, you can place robots.txt in the root of the directory specified in your ``VirtualHost`` and to your Apache config a ``ProxyPassMatch`` line like the one below to prevent Glassfish from serving the version of robots.txt that is embedded in the Dataverse war file:
+The default order of licenses in the dropdown in the user interface is as follows:
 
-.. code-block:: text
+* The default license is shown first
+* Followed by the remaining installed licenses in the order of installation
+* The custom license is at the end
 
-    # don't let Glassfish serve its version of robots.txt
-    ProxyPassMatch ^/robots.txt$ !
+Only the order of the installed licenses can be changed with the API calls. The default license always remains first and the custom license last.
 
-For more of an explanation of ``ProxyPassMatch`` see the :doc:`shibboleth` section.
+The order of licenses can be changed by setting the ``sortOrder`` property of a license. For the purpose of making sorting easier and to allow grouping of the licenses, ``sortOrder`` property does not have to be unique. Licenses with the same ``sortOrder`` are sorted by their ID, i.e., first by the sortOrder, then by the ID. Nevertheless, you can set a unique ``sortOrder`` for every license in order to sort them fully manually.
 
-If you are not fronting Glassfish with Apache you'll need to prevent Glassfish from serving the robots.txt file embedded in the war file by overwriting robots.txt after the war file has been deployed. The downside of this technique is that you will have to remember to overwrite robots.txt in the "exploded" war file each time you deploy the war file, which probably means each time you upgrade to a new version of Dataverse. Furthermore, since the version of Dataverse is always incrementing and the version can be part of the file path, you will need to be conscious of where on disk you need to replace the file. For example, for Dataverse 4.6.1 the path to robots.txt may be ``/usr/local/glassfish4/glassfish/domains/domain1/applications/dataverse-4.6.1/robots.txt`` with the version number ``4.6.1`` as part of the path.
+The ``sortOrder`` is an whole number and is used to sort licenses in ascending fashion.
 
-Creating a Sitemap and Submitting it to Search Engines
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changing the sorting order of a license specified by the license ``$ID`` is done by superusers using the following API call:
 
-Search engines have an easier time indexing content when you provide them a sitemap. The Dataverse sitemap includes URLs to all published dataverses and all published datasets that are not harvested or deaccessioned.
+.. code-block:: bash
 
-Create or update your sitemap by adding the following curl command to cron to run nightly or as you see fit:
+  export SORT_ORDER=100
+  curl -X PUT -H 'Content-Type: application/json' -H X-Dataverse-key:$API_TOKEN $SERVER_URL/api/licenses/$ID/:sortOrder/$SORT_ORDER
+.. _BagIt File Handler:
 
-``curl -X POST http://localhost:8080/api/admin/sitemap``
+BagIt File Handler
+------------------
 
-This will create or update a file in the following location unless you have customized your installation directory for Glassfish:
+BagIt file handler detects and transforms zip files with a BagIt package format into Dataverse DataFiles. The system validates the checksums of the files in the package payload as described in the first manifest file with a hash algorithm that we support. Take a look at `BagChecksumType class <https://github.com/IQSS/dataverse/tree/develop/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagChecksumType.java>`_ for the list of the currently supported hash algorithms.
 
-``/usr/local/glassfish4/glassfish/domains/domain1/docroot/sitemap/sitemap.xml``
+The checksum validation uses a thread pool to improve performance. This thread pool can be adjusted to your Dataverse installation requirements.
 
-On an installation of Dataverse with many datasets, the creation or updating of the sitemap can take a while. You can check Glassfish's server.log file for "BEGIN updateSiteMap" and "END updateSiteMap" lines to know when the process started and stopped and any errors in between.
+BagIt file handler configuration settings:
 
-https://demo.dataverse.org/sitemap.xml is the sitemap URL for the Dataverse Demo site and yours should be similar. 
+- :ref:`:BagItHandlerEnabled`
+- :ref:`:BagValidatorJobPoolSize`
+- :ref:`:BagValidatorMaxErrors`
+- :ref:`:BagValidatorJobWaitInterval`
 
-Once the sitemap has been generated and placed in the domain docroot directory, it will become available to the outside callers at <YOUR_SITE_URL>/sitemap/sitemap.xml; it will also be accessible at <YOUR_SITE_URL>/sitemap.xml (via a *pretty-faces* rewrite rule). Some search engines will be able to find it at this default location. Some, **including Google**, need to be **specifically instructed** to retrieve it. 
+.. _BagIt Export:
 
-One way to submit your sitemap URL to Google is by using their "Search Console" (https://search.google.com/search-console). In order to use the console, you will need to authenticate yourself as the owner of your Dataverse site. Various authentication methods are provided; but if you are already using Google Analytics, the easiest way is to use that account. Make sure you are logged in on Google with the account that has the edit permission on your Google Analytics property; go to the search console and enter the root URL of your Dataverse server, then choose Google Analytics as the authentication method. Once logged in, click on "Sitemaps" in the menu on the left. (todo: add a screenshot?) Consult `Google's "submit a sitemap" instructions`_ for more information; and/or similar instructions for other search engines.
+BagIt Export
+------------
 
-.. _Google's "submit a sitemap" instructions: https://support.google.com/webmasters/answer/183668
+Your Dataverse installation may be configured to submit a copy of published Datasets, packaged as `Research Data Alliance conformant <https://www.rd-alliance.org/system/files/Research%20Data%20Repository%20Interoperability%20WG%20-%20Final%20Recommendations_reviewed_0.pdf>`_ zipped `BagIt <https://tools.ietf.org/html/draft-kunze-bagit-17>`_ archival Bags (sometimes called BagPacks) to one of several supported storage services.
+Supported services include `Chronopolis <https://libraries.ucsd.edu/chronopolis/>`_ via `DuraCloud <https://duraspace.org/duracloud/>`_, Google's Cloud, and any service that can provide an S3 interface or handle files transferred to a folder on the local filesystem.
 
+These archival Bags include all of the files and metadata in a given dataset version and are sufficient to recreate the dataset, e.g. in a new Dataverse instance, or potentially in another RDA-conformant repository. The `DVUploader <https://github.com/GlobalDataverseCommunityConsortium/dataverse-uploader>`_ includes functionality to recreate a Dataset from an archival Bag produced by Dataverse. (Note that this functionality is distinct from the :ref:`BagIt File Handler` upload files to an existing Dataset via the Dataverse user interface.)
 
-Putting Your Dataverse Installation on the Map at dataverse.org
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+The Dataverse Software offers an internal archive workflow which may be configured as a PostPublication workflow via an admin API call to manually submit previously published Datasets and prior versions to a configured archive such as Chronopolis. The workflow creates a `JSON-LD <http://www.openarchives.org/ore/0.9/jsonld>`_ serialized `OAI-ORE <https://www.openarchives.org/ore/>`_ map file, which is also available as a metadata export format in the Dataverse Software web interface.
 
-Congratulations! You've gone live! It's time to announce your new data repository to the world! You are also welcome to contact support@dataverse.org to have the Dataverse team add your installation to the map at http://dataverse.org . Thank you for installing Dataverse!
+At present, archiving classes include the DuraCloudSubmitToArchiveCommand, LocalSubmitToArchiveCommand, GoogleCloudSubmitToArchive, and S3SubmitToArchiveCommand , which all extend the AbstractSubmitToArchiveCommand and use the configurable mechanisms discussed below. (A DRSSubmitToArchiveCommand, which works with Harvard's DRS also exists and, while specific to DRS, is a useful example of how Archivers can support single-version-only semantics and support archiving only from specified collections (with collection specific parameters)). 
 
-Administration of Your Dataverse Installation
-+++++++++++++++++++++++++++++++++++++++++++++
+All current options support the :ref:`Archival Status API` calls and the same status is available in the dataset page version table (for contributors/those who could view the unpublished dataset, with more detail available to superusers).
 
-Now that you're live you'll want to review the :doc:`/admin/index` for more information about the ongoing administration of a Dataverse installation.
+.. _Duracloud Configuration:
 
-Setting Up Integrations
+Duracloud Configuration
 +++++++++++++++++++++++
 
-Before going live, you might want to consider setting up integrations to make it easier for your users to deposit or explore data. See the :doc:`/admin/integrations` section of the Admin Guide for details.
+The current Chronopolis implementation generates the archival Bag and submits it to the archive's DuraCloud interface. The step to make a 'snapshot' of the space containing the archival Bag (and verify it's successful submission) are actions a curator must take in the DuraCloud interface.
 
-JVM Options
------------
+The minimal configuration to support archiver integration involves adding a minimum of two Dataverse Software settings. Individual archivers may require additional settings and/or Payara jvm options and micro-profile settings. The example instructions here are specific to the DuraCloud Archiver\:
 
-JVM stands Java Virtual Machine and as a Java application, Glassfish can read JVM options when it is started. A number of JVM options are configured by the installer below is a complete list of the Dataverse-specific JVM options. You can inspect the configured options by running:
+\:ArchiverClassName - the fully qualified class to be used for archiving. For example:
 
-``./asadmin list-jvm-options | egrep 'dataverse|doi'``
+``curl http://localhost:8080/api/admin/settings/:ArchiverClassName -X PUT -d "edu.harvard.iq.dataverse.engine.command.impl.DuraCloudSubmitToArchiveCommand"``
 
-When changing values these values with ``asadmin``, you'll need to delete the old value before adding a new one, like this:
+\:ArchiverSettings - the archiver class can access required settings including existing Dataverse installation settings and dynamically defined ones specific to the class. This setting is a comma-separated list of those settings. For example\:
 
-``./asadmin delete-jvm-options "-Ddataverse.fqdn=old.example.com"``
+``curl http://localhost:8080/api/admin/settings/:ArchiverSettings -X PUT -d ":DuraCloudHost, :DuraCloudPort, :DuraCloudContext, :BagGeneratorThreads"``
 
-``./asadmin create-jvm-options "-Ddataverse.fqdn=dataverse.example.com"``
+The DuraCloud archiver defines three custom settings, one of which is required (the others have defaults):
 
-It's also possible to change these values by stopping Glassfish, editing ``glassfish4/glassfish/domains/domain1/config/domain.xml``, and restarting Glassfish.
+\:DuraCloudHost - the URL for your organization's Duracloud site. For example:
 
-dataverse.fqdn
-++++++++++++++
+``curl http://localhost:8080/api/admin/settings/:DuraCloudHost -X PUT -d "qdr.duracloud.org"``
 
-If the Dataverse server has multiple DNS names, this option specifies the one to be used as the "official" host name. For example, you may want to have dataverse.example.edu, and not the less appealing server-123.socsci.example.edu to appear exclusively in all the registered global identifiers, Data Deposit API records, etc.
+:DuraCloudPort and :DuraCloudContext are also defined if you are not using the defaults ("443" and "duracloud" respectively). (Note\: these settings are only in effect if they are listed in the \:ArchiverSettings. Otherwise, they will not be passed to the DuraCloud Archiver class.)
 
-The password reset feature requires ``dataverse.fqdn`` to be configured.
+It also can use one setting that is common to all Archivers: :BagGeneratorThreads
 
-| Do note that whenever the system needs to form a service URL, by default, it will be formed with ``https://`` and port 443. I.e.,
-| ``https://{dataverse.fqdn}/``
-| If that does not suit your setup, you can define an additional option, ``dataverse.siteUrl``, explained below.
+``curl http://localhost:8080/api/admin/settings/:BagGeneratorThreads -X PUT -d '8'``
 
-dataverse.siteUrl
-+++++++++++++++++
+By default, the Bag generator zips two datafiles at a time when creating the archival Bag. This setting can be used to lower that to 1, i.e. to decrease system load, or to increase it, e.g. to 4 or 8, to speed processing of many small files.
 
-| and specify the protocol and port number you would prefer to be used to advertise the URL for your Dataverse.
-| For example, configured in domain.xml:
-| ``<jvm-options>-Ddataverse.fqdn=dataverse.example.edu</jvm-options>``
-| ``<jvm-options>-Ddataverse.siteUrl=http://${dataverse.fqdn}:8080</jvm-options>``
+Archivers may require JVM options as well. For the Chronopolis archiver, the username and password associated with your organization's Chronopolis/DuraCloud account should be configured in Payara:
 
-dataverse.files.directory
-+++++++++++++++++++++++++
+``./asadmin create-jvm-options '-Dduracloud.username=YOUR_USERNAME_HERE'``
 
-This is how you configure the path to which files uploaded by users are stored.
+``./asadmin create-jvm-options '-Dduracloud.password=YOUR_PASSWORD_HERE'``
 
-dataverse.auth.password-reset-timeout-in-minutes
-++++++++++++++++++++++++++++++++++++++++++++++++
+.. _Local Path Configuration:
 
-Users have 60 minutes to change their passwords by default. You can adjust this value here.
+Local Path Configuration
+++++++++++++++++++++++++
 
-dataverse.rserve.host
-+++++++++++++++++++++
+ArchiverClassName - the fully qualified class to be used for archiving. For example\:
 
-Configuration for :doc:`r-rapache-tworavens`.
+``curl -X PUT -d "edu.harvard.iq.dataverse.engine.command.impl.LocalSubmitToArchiveCommand" http://localhost:8080/api/admin/settings/:ArchiverClassName``
 
-dataverse.rserve.port
-+++++++++++++++++++++
+\:BagItLocalPath - the path to where you want to store the archival Bags. For example\:
 
-Configuration for :doc:`r-rapache-tworavens`.
+``curl -X PUT -d /home/path/to/storage http://localhost:8080/api/admin/settings/:BagItLocalPath``
 
-dataverse.rserve.user
-+++++++++++++++++++++
+\:ArchiverSettings - the archiver class can access required settings including existing Dataverse installation settings and dynamically defined ones specific to the class. This setting is a comma-separated list of those settings. For example\:
 
-Configuration for :doc:`r-rapache-tworavens`.
+``curl http://localhost:8080/api/admin/settings/:ArchiverSettings -X PUT -d ":BagItLocalPath, :BagGeneratorThreads"``
 
-dataverse.rserve.tempdir
-++++++++++++++++++++++++
-Configuration for :doc:`r-rapache-tworavens`.
-
-dataverse.rserve.password
-+++++++++++++++++++++++++
+:BagItLocalPath is the file path that you've set in :ArchiverSettings. See the DuraCloud  Configuration section for a description of :BagGeneratorThreads.
 
-Configuration for :doc:`r-rapache-tworavens`.
+.. _Google Cloud Configuration:
 
-.. _dataverse.dropbox.key:
+Google Cloud Configuration
+++++++++++++++++++++++++++
 
-dataverse.dropbox.key
-+++++++++++++++++++++
+The Google Cloud Archiver can send Dataverse Archival Bags to a bucket in Google's cloud, including those in the 'Coldline' storage class (cheaper, with slower access) 
 
-Dropbox provides a Chooser app, which is a Javascript component that allows you to upload files to Dataverse from Dropbox. It is an optional configuration setting, which requires you to pass it an app key and configure the ``:UploadMethods`` database setting. For more information on setting up your Chooser app, visit https://www.dropbox.com/developers/chooser.
+``curl http://localhost:8080/api/admin/settings/:ArchiverClassName -X PUT -d "edu.harvard.iq.dataverse.engine.command.impl.GoogleCloudSubmitToArchiveCommand"``
 
-``./asadmin create-jvm-options "-Ddataverse.dropbox.key={{YOUR_APP_KEY}}"``
+``curl http://localhost:8080/api/admin/settings/:ArchiverSettings -X PUT -d ":GoogleCloudBucket, :GoogleCloudProject, :BagGeneratorThreads"``
 
-dataverse.path.imagemagick.convert
-++++++++++++++++++++++++++++++++++
+The Google Cloud Archiver defines two custom settings, both are required. It can also use the :BagGeneratorThreads setting as described in the DuraCloud Configuration section above. The credentials for your account, in the form of a json key file, must also be obtained and stored locally (see below):
 
-For overriding the default path to the ``convert`` binary from ImageMagick (``/usr/bin/convert``).
+In order to use the Google Cloud Archiver, you must have a Google account. You will need to create a project and bucket within that account and provide those values in the settings:
 
-dataverse.dataAccess.thumbnail.image.limit
-++++++++++++++++++++++++++++++++++++++++++
+\:GoogleCloudBucket - the name of the bucket to use. For example:
 
-For limiting the size (in bytes) of thumbnail images generated from files.
+``curl http://localhost:8080/api/admin/settings/:GoogleCloudBucket -X PUT -d "qdr-archive"``
 
-dataverse.dataAccess.thumbnail.pdf.limit
-++++++++++++++++++++++++++++++++++++++++
+\:GoogleCloudProject - the name of the project managing the bucket. For example:
 
-For limiting the size (in bytes) of thumbnail images generated from files.
+``curl http://localhost:8080/api/admin/settings/:GoogleCloudProject -X PUT -d "qdr-project"``
 
-.. _doi.baseurlstring:
+The Google Cloud Archiver also requires a key file that must be renamed to 'googlecloudkey.json' and placed in the directory identified by your 'dataverse.files.directory' jvm option. This file can be created in the Google Cloud Console. (One method: Navigate to your Project 'Settings'/'Service Accounts', create an account, give this account the 'Cloud Storage'/'Storage Admin' role, and once it's created, use the 'Actions' menu to 'Create Key', selecting the 'JSON' format option. Use this as the 'googlecloudkey.json' file.)
 
-doi.baseurlstring
-+++++++++++++++++
+For example:
 
-As of this writing, "https://mds.datacite.org" (DataCite) and "https://ezid.cdlib.org" (EZID) are the main valid values.
+``cp <your key file> /usr/local/payara6/glassfish/domains/domain1/files/googlecloudkey.json``
 
-While the above two options are recommended because they have been tested by the Dataverse team, it is also possible to use a DataCite Client API as a proxy to DataCite. In this case, requests made to the Client API are captured and passed on to DataCite for processing. The application will interact with the DataCite Client API exactly as if it were interacting directly with the DataCite API, with the only difference being the change to the base endpoint URL.
+.. _S3 Archiver Configuration:
 
-For example, the Australian Data Archive (ADA) successfully uses the Australian National Data Service (ANDS) API (a proxy for DataCite) to mint their DOIs through Dataverse using a ``doi.baseurlstring`` value of "https://researchdata.ands.org.au/api/doi/datacite" as documented at https://documentation.ands.org.au/display/DOC/ANDS+DataCite+Client+API . As ADA did for ANDS DOI minting, any DOI provider (and their corresponding DOI configuration parameters) other than DataCite must be tested with Dataverse to establish whether or not it will function properly.
+S3 Configuration
+++++++++++++++++
 
-Out of the box, Dataverse is configured to use a test MDS DataCite base URL string. You can delete it like this:
+The S3 Archiver can send Dataverse Archival Bag to a bucket at any S3 endpoint. The configuration for the S3 Archiver is independent of any S3 store that may be configured in Dataverse and may, for example, leverage colder (cheaper, slower access) storage. 
 
-``./asadmin delete-jvm-options '-Ddoi.baseurlstring=https\://mds.test.datacite.org'``
+``curl http://localhost:8080/api/admin/settings/:ArchiverClassName -X PUT -d "edu.harvard.iq.dataverse.engine.command.impl.S3SubmitToArchiveCommand"``
 
-Then, to switch to production DataCite, you can issue the following command:
+``curl http://localhost:8080/api/admin/settings/:ArchiverSettings -X PUT -d ":S3ArchiverConfig, :BagGeneratorThreads"``
 
-``./asadmin create-jvm-options '-Ddoi.baseurlstring=https\://mds.datacite.org'``
+The S3 Archiver defines one custom setting, a required :S3ArchiverConfig. It can also use the :BagGeneratorThreads setting as described in the DuraCloud Configuration section above.
 
-See also these related database settings below:
+The credentials for your S3 account, can be stored in a profile in a standard credentials file (e.g. ~/.aws/credentials) referenced via "profile" key in the :S3ArchiverConfig setting (will default to the default entry), or can via MicroProfile settings as described for S3 stores (dataverse.s3archiver.access-key and dataverse.s3archiver.secret-key)
 
-- :ref:`:DoiProvider`
-- :ref:`:Protocol`  
-- :ref:`:Authority`
-- :ref:`:Shoulder`
+The :S3ArchiverConfig setting is a JSON object that must include an "s3_bucket_name" and may include additional S3-related parameters as described for S3 Stores, including "profile", "connection-pool-size","custom-endpoint-url", "custom-endpoint-region", "path-style-access", and "chunked-encoding".
 
-.. _doi.mdcbaseurlstring:
+\:S3ArchiverConfig - minimally includes the name of the bucket to use. For example:
 
-doi.mdcbaseurlstring
-++++++++++++++++++++
+``curl http://localhost:8080/api/admin/settings/:S3ArchiverConfig -X PUT -d '{"s3_bucket_name":"archival-bucket"}'``
 
-This configuration option affects the ``updateCitationsForDataset`` API endpoint documented under :ref:`MDC-updateCitationsForDataset` in the Admin Guide.
+\:S3ArchiverConfig - example to also set the name of an S3 profile to use. For example:
 
-As of this writing, "https://api.datacite.org" (DataCite) and "https://api.test.datacite.org" (DataCite Testing) are the main valid values.
+``curl http://localhost:8080/api/admin/settings/:S3ArchiverConfig -X PUT -d '{"s3_bucket_name":"archival-bucket", "profile":"archiver"}'``
 
-Out of the box, Dataverse is configured to use a test DataCite MDC base URL string. You can delete it like this:
+.. _Archiving API Call:
 
-``./asadmin delete-jvm-options '-Ddoi.mdcbaseurlstring=https\://api.test.datacite.org'``
+BagIt Export API Calls
+++++++++++++++++++++++
 
-Then, to switch to production DataCite, you can issue the following command:
+Once this configuration is complete, you, as a user with the *PublishDataset* permission, should be able to use the admin API call to manually submit a DatasetVersion for processing:
 
-``./asadmin create-jvm-options '-Ddoi.mdcbaseurlstring=https\://api.datacite.org'``
+``curl -X POST -H "X-Dataverse-key: <key>" http://localhost:8080/api/admin/submitDatasetVersionToArchive/{id}/{version}``
 
-For backward compatibility, if this option is not defined, the default used is "https\://api.datacite.org:.
+where:
 
-See also these related database settings below:
+``{id}`` is the DatasetId (the database id of the dataset) and
 
-- :ref:`:MDCLogPath`
-- :ref:`:DisplayMDCMetrics`
+``{version}`` is the friendly version number, e.g. "1.2".
 
-.. _doi.username:
+or in place of the DatasetID, you can use the string ``:persistentId`` as the ``{id}`` and add the DOI/PID as a query parameter like this: ``?persistentId="<DOI>"``. Here is how the full command would look:
 
-doi.username
-++++++++++++
+``curl -X POST -H "X-Dataverse-key: <key>" http://localhost:8080/api/admin/submitDatasetVersionToArchive/:persistentId/{version}?persistentId="<DOI>"``
 
-Used in conjuction with ``doi.baseurlstring``.
+The submitDatasetVersionToArchive API (and the workflow discussed below) attempt to archive the dataset version via an archive specific method. For Chronopolis, a DuraCloud space named for the dataset (its DOI with ":" and "." replaced with "-", e.g. ``doi-10-5072-fk2-tgbhlb``) is created and two files are uploaded to it: a version-specific datacite.xml metadata file and a BagIt bag containing the data and an OAI-ORE map file. (The datacite.xml file, stored outside the Bag as well as inside, is intended to aid in discovery while the ORE map file is "complete", containing all user-entered metadata and is intended as an archival record.)
 
-Once you have a username from your provider, you can enter it like this:
+In the Chronopolis case, since the transfer from the DuraCloud front-end to archival storage in Chronopolis can take significant time, it is currently up to the admin/curator to submit a 'snap-shot' of the space within DuraCloud and to monitor its successful transfer. Once transfer is complete the space should be deleted, at which point the Dataverse Software API call can be used to submit a Bag for other versions of the same dataset. (The space is reused, so that archival copies of different dataset versions correspond to different snapshots of the same DuraCloud space.).
 
-``./asadmin create-jvm-options '-Ddoi.username=YOUR_USERNAME_HERE'``
+A batch version of this admin API call is also available:
 
-.. _doi.password:
+``curl -X POST -H "X-Dataverse-key: <key>" 'http://localhost:8080/api/admin/archiveAllUnarchivedDatasetVersions?listonly=true&limit=10&latestonly=true'``
 
-doi.password
-++++++++++++
+The archiveAllUnarchivedDatasetVersions call takes 3 optional configuration parameters.
 
-Used in conjuction with ``doi.baseurlstring``.
+* listonly=true will cause the API to list dataset versions that would be archived but will not take any action.
+* limit=<n> will limit the number of dataset versions archived in one API call to ``<=`` <n>. 
+* latestonly=true will limit archiving to only the latest published versions of datasets instead of archiving all unarchived versions.
 
-Once you have a password from your provider, you can enter it like this:
+Note that because archiving is done asynchronously, the calls above will return OK even if the user does not have the *PublishDataset* permission on the dataset(s) involved. Failures are indicated in the log and the archivalStatus calls in the native API can be used to check the status as well.
 
-``./asadmin create-jvm-options '-Ddoi.password=YOUR_PASSWORD_HERE'``
+PostPublication Workflow
+++++++++++++++++++++++++
 
-.. _dataverse.handlenet.admcredfile:
+To automate the submission of archival copies to an archive as part of publication, one can setup a Dataverse Software Workflow using the "archiver" workflow step - see the :doc:`/developers/workflows` guide.
 
-dataverse.handlenet.admcredfile
-+++++++++++++++++++++++++++++++
+The archiver step uses the configuration information discussed above including the :ArchiverClassName setting. The workflow step definition should include the set of properties defined in \:ArchiverSettings in the workflow definition.
 
-If you're using **handles**, this JVM setting configures access credentials so your dataverse can talk to your Handle.Net server. This is the private key generated during Handle.Net server installation. Typically the full path is set to ``handle/svr_1/admpriv.bin``. Please refer to `Handle.Net's documentation <http://handle.net/hnr_documentation.html>`_ for more info.
+To active this workflow, one must first install a workflow using the archiver step. A simple workflow that invokes the archiver step configured to submit to DuraCloud as its only action is included in the Dataverse Software at /scripts/api/data/workflows/internal-archiver-workflow.json.
 
-.. _dataverse.handlenet.admprivphrase:
+Using the Workflow Native API (see the :doc:`/api/native-api` guide) this workflow can be installed using:
 
-dataverse.handlenet.admprivphrase
-+++++++++++++++++++++++++++++++++
-This JVM setting is also part of **handles** configuration. The Handle.Net installer lets you choose whether to encrypt the admcredfile private key or not. If you do encrypt it, this is the pass phrase that it's encrypted with. 
+``curl -X POST -H 'Content-type: application/json' --upload-file internal-archiver-workflow.json http://localhost:8080/api/admin/workflows``
 
-.. _dataverse.handlenet.index:
+The workflow id returned in this call (or available by doing a GET of /api/admin/workflows ) can then be submitted as the default PostPublication workflow:
 
-dataverse.handlenet.index
-+++++++++++++++++++++++++++++++++
-If you want to use different index than the default 300
+``curl -X PUT -d {id} http://localhost:8080/api/admin/workflows/default/PostPublishDataset``
 
-.. _dataverse.timerServer:
+Once these steps are taken, new publication requests will automatically trigger submission of an archival copy to the specified archiver, Chronopolis' DuraCloud component in this example. For Chronopolis, as when using the API, it is currently the admin's responsibility to snap-shot the DuraCloud space and monitor the result. Failure of the workflow, (e.g. if DuraCloud is unavailable, the configuration is wrong, or the space for this dataset already exists due to a prior publication action or use of the API), will create a failure message but will not affect publication itself.
 
-dataverse.timerServer
-+++++++++++++++++++++
+.. _bag-info.txt:
 
-This JVM option is only relevant if you plan to run multiple Glassfish servers for redundancy. Only one Glassfish server can act as the dedicated timer server and for details on promoting or demoting a Glassfish server to handle this responsibility, see :doc:`/admin/timers`.
+Configuring bag-info.txt
+++++++++++++++++++++++++
 
-.. _dataverse.lang.directory:
+Out of the box, placeholder values like below will be placed in bag-info.txt:
 
-dataverse.lang.directory
-++++++++++++++++++++++++
+.. code-block:: text
 
-This JVM option is used to configure the path where all the language specific property files are to be stored.  If this option is set then the English property file must be present in the path along with any other language property file. You can download language property files from https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs
+  Source-Organization: Dataverse Installation (<Site Url>)
+  Organization-Address: <Full address>
+  Organization-Email: <Email address>
 
-``./asadmin create-jvm-options '-Ddataverse.lang.directory=PATH_LOCATION_HERE'``
+To customize these values for your institution, use the following JVM options:
 
-If this value is not set, by default, a Dataverse installation will read the English language property files from the Java Application.
+- :ref:`dataverse.bagit.sourceorg.name`
+- :ref:`dataverse.bagit.sourceorg.address`
+- :ref:`dataverse.bagit.sourceorg.email`
 
-See also :ref:`i18n`.
+Going Live: Launching Your Production Deployment
+------------------------------------------------
 
-dataverse.files.hide-schema-dot-org-download-urls
-+++++++++++++++++++++++++++++++++++++++++++++++++
+This guide has attempted to take you from kicking the tires on the Dataverse Software to finalizing your installation before letting real users in. In theory, all this work could be done on a single server but better would be to have separate staging and production environments so that you can deploy upgrades to staging before deploying to production. This "Going Live" section is about launching your **production** environment.
 
-Please note that this setting is experimental.
+Before going live with your Dataverse installation, you must take the steps above under "Securing Your Installation" and you should at least review the various configuration options listed below. An attempt has been made to put the more commonly-configured options earlier in the list.
 
-By default, download URLs to files will be included in Schema.org JSON-LD output. To prevent these URLs from being included in the output, set ``dataverse.files.hide-schema-dot-org-download-urls`` to true as in the example below.
+Out of the box, the Dataverse Software attempts to block search engines from crawling your Dataverse installation so that test datasets do not appear in search results until you're ready.
 
-``./asadmin create-jvm-options '-Ddataverse.files.hide-schema-dot-org-download-urls=true'``
+Letting Search Engines Crawl Your Installation
+++++++++++++++++++++++++++++++++++++++++++++++
 
-Please note that there are other reasons why download URLs may not be included for certain files such as if a guestbook entry is required or if the file is restricted.
+Ensure robots.txt Is Not Blocking Search Engines
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-For more on Schema.org JSON-LD, see the :doc:`/admin/metadataexport` section of the Admin Guide.
+For a public production Dataverse installation, it is probably desired that search agents be able to index published pages (AKA - pages that are visible to an unauthenticated user).
+Polite crawlers usually respect the `Robots Exclusion Standard <https://en.wikipedia.org/wiki/Robots_exclusion_standard>`_; we have provided an example of a production robots.txt :download:`here </_static/util/robots.txt>`).
 
-Database Settings
------------------
+We **strongly recommend** using the crawler rules in the sample robots.txt linked above. Note that they make the Dataverse collection and dataset pages accessible to the search engine bots; but discourage them from actually crawling the site, by following any search links - facets and such - on the Dataverse collection pages. Such crawling is very inefficient in terms of system resources, and often results in confusing search results for the end users of the search engines (for example, when partial search results are indexed as individual pages).
 
-These settings are stored in the ``setting`` database table but can be read and modified via the "admin" endpoint of the :doc:`/api/native-api` for easy scripting.
+The recommended solution instead is to directly point the bots to the dataset and Dataverse collection pages that need to be indexed, by advertising them via an explicit sitemap (please see the next section for details on how to generate the sitemap).
 
-The most commonly used configuration options are listed first.
+You can of course modify your own robots.txt to suit your specific needs as necessary. If you don't want your datasets to be indexed at all, you can tell the bots to stay away from your site completely. But, as noted above, keep in mind that only the good, "polite" bots honor these rules! You are not really blocking anyone from accessing your site by adding a "Disallow" rule in robots.txt - it is a suggestion only. A rogue bot can and will violate it. If you are having trouble with the site being overloaded with what looks like heavy automated crawling, you may have to resort to blocking this traffic by other means - for example, via rewrite rules in Apache, or even by a Firewall.
 
-The pattern you will observe in curl examples below is that an HTTP ``PUT`` is used to add or modify a setting. If you perform an HTTP ``GET`` (the default when using curl), the output will contain the value of the setting, if it has been set. You can also do a ``GET`` of all settings with ``curl http://localhost:8080/api/admin/settings`` which you may want to pretty-print by piping the output through a tool such as jq by appending ``| jq .``. If you want to remove a setting, use an HTTP ``DELETE`` such as ``curl -X DELETE http://localhost:8080/api/admin/settings/:GuidesBaseUrl`` .
+(See the sample robots.txt file linked above for some comments on how to set up different "Allow" and "Disallow" rules for different crawler bots)
 
-.. _:BlockedApiPolicy:
+You have a couple of options for putting an updated robots.txt file into production. If you are fronting Payara with Apache as recommended above, you can place robots.txt in the root of the directory specified in your ``VirtualHost`` and to your Apache config a ``ProxyPassMatch`` line like the one below to prevent Payara from serving the version of robots.txt that is embedded in the Dataverse Software war file:
 
-:BlockedApiPolicy
-+++++++++++++++++
+.. code-block:: text
 
-``:BlockedApiPolicy`` affects access to the list of API endpoints defined in :ref:`:BlockedApiEndpoints`.
+    # don't let Payara serve its version of robots.txt
+    ProxyPassMatch ^/robots.txt$ !
 
-Out of the box, ``localhost-only`` is the default policy, as mentioned in :ref:`blocking-api-endpoints`. The other valid options are the following.
+For more of an explanation of ``ProxyPassMatch`` see the :doc:`shibboleth` section.
 
-- localhost-only: Allow from localhost.
-- unblock-key: Require a key defined in :ref:`:BlockedApiKey`.
-- drop: Disallow the blocked endpoints completely.
+If you are not fronting Payara with Apache you'll need to prevent Payara from serving the robots.txt file embedded in the war file by overwriting robots.txt after the war file has been deployed. The downside of this technique is that you will have to remember to overwrite robots.txt in the "exploded" war file each time you deploy the war file, which probably means each time you upgrade to a new version of the Dataverse Software. Furthermore, since the version of the Dataverse Software is always incrementing and the version can be part of the file path, you will need to be conscious of where on disk you need to replace the file. For example, for Dataverse Software 4.6.1 the path to robots.txt may be ``/usr/local/payara6/glassfish/domains/domain1/applications/dataverse-4.6.1/robots.txt`` with the version number ``4.6.1`` as part of the path.
 
-Below is an example of setting ``localhost-only``.
+Creating a Sitemap and Submitting it to Search Engines
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-``curl -X PUT -d localhost-only http://localhost:8080/api/admin/settings/:BlockedApiPolicy``
+Creating a Sitemap
+##################
 
-.. _:BlockedApiEndpoints:
+Search engines have an easier time indexing content when you provide them a sitemap. Dataverse can generate a sitemap that includes URLs to all published collections and all published datasets that are not harvested or deaccessioned.
 
-:BlockedApiEndpoints
-++++++++++++++++++++
+Create or update your sitemap by adding the following curl command to cron to run nightly or as you see fit:
 
-A comma separated list of API endpoints to be blocked. For a production installation, "admin" should be blocked (and perhaps "builtin-users" as well), as mentioned in the section on security above:
+``curl -X POST http://localhost:8080/api/admin/sitemap``
 
-``curl -X PUT -d "admin,builtin-users" http://localhost:8080/api/admin/settings/:BlockedApiEndpoints``
+On a Dataverse installation with many datasets, the creation or updating of the sitemap can take a while. You can check Payara's server.log file for "BEGIN updateSiteMap" and "END updateSiteMap" lines to know when the process started and stopped and any errors in between.
 
-See the :ref:`list-of-dataverse-apis` for lists of API endpoints.
+For compliance with the `Sitemap protocol <https://sitemaps.org/protocol.html>`_, the generated sitemap will be a single file with 50,000 items or fewer or it will be split into multiple files.
 
-.. _:BlockedApiKey:
+Single Sitemap File
+###################
 
-:BlockedApiKey
-++++++++++++++
+If you have 50,000 items or fewer, a single sitemap will be generated in the following location (unless you have customized your installation directory for Payara):
 
-``:BlockedApiKey`` is used in conjunction with :ref:`:BlockedApiEndpoints` and :ref:`:BlockedApiPolicy` and will not be enabled unless the policy is set to ``unblock-key`` as demonstrated below. Please note that the order is significant. You should set ``:BlockedApiKey`` first to prevent locking yourself out.
+``/usr/local/payara6/glassfish/domains/domain1/docroot/sitemap/sitemap.xml``
 
-``curl -X PUT -d s3kretKey http://localhost:8080/api/admin/settings/:BlockedApiKey``
+Once the sitemap has been generated in the location above, it will be served at ``/sitemap.xml`` like this: https://demo.dataverse.org/sitemap.xml
 
-``curl -X PUT -d unblock-key http://localhost:8080/api/admin/settings/:BlockedApiPolicy``
+Multiple Sitemap Files (Sitemap Index File)
+###########################################
 
-Now that ``:BlockedApiKey`` has been enabled, blocked APIs can be accessed using the query parameter ``unblock-key=theKeyYouChose`` as in the example below.
+According to the `Sitemaps.org protocol <https://www.sitemaps.org/protocol.html#index>`_, a sitemap file must have no more than 50,000 URLs and must be no larger than 50MiB. In this case, the protocol instructs you to create a sitemap index file called ``sitemap_index.xml`` (instead of ``sitemap.xml``), which references multiple sitemap files named ``sitemap1.xml``, ``sitemap2.xml``, etc. These referenced files are also generated in the same place as other sitemap files (``domain1/docroot/sitemap``) and there will be as many files as necessary to contain the URLs of collections and datasets present in your installation, while respecting the limit of 50,000 URLs per file.
 
-``curl https://demo.dataverse.org/api/admin/settings?unblock-key=theKeyYouChose``
+If you have over 50,000 items, a sitemap index file will be generated in the following location (unless you have customized your installation directory for Payara):
 
-.. _BuiltinUsers.KEY:
+``/usr/local/payara6/glassfish/domains/domain1/docroot/sitemap/sitemap_index.xml``
 
-BuiltinUsers.KEY
-++++++++++++++++
+Once the sitemap has been generated in the location above, it will be served at ``/sitemap_index.xml`` like this: https://demo.dataverse.org/sitemap_index.xml
 
-The key required to create users via API as documented at :doc:`/api/native-api`. Unlike other database settings, this one doesn't start with a colon.
+Note that the sitemap is also available at (for example) https://demo.dataverse.org/sitemap/sitemap_index.xml and in that ``sitemap`` directory you will find the files it references such as ``sitemap1.xml``, ``sitemap2.xml``, etc.
 
-``curl -X PUT -d builtInS3kretKey http://localhost:8080/api/admin/settings/BuiltinUsers.KEY``
+Submitting Your Sitemap to Search Engines
+#########################################
 
-:SearchApiRequiresToken
-+++++++++++++++++++++++
+Some search engines will be able to find your sitemap file at ``/sitemap.xml`` or ``/sitemap_index.xml``, but others, **including Google**, need to be **specifically instructed** to retrieve it.
 
-In Dataverse 4.7 and lower, the :doc:`/api/search` required an API token, but as of Dataverse 4.7.1 this is no longer the case. If you prefer the old behavior of requiring API tokens to use the Search API, set ``:SearchApiRequiresToken`` to ``true``.
+As described above, Dataverse will automatically detect whether you need to create a single sitemap file or several files and generate them for you. However, when submitting your sitemap file to Google or other search engines, you must be careful to supply the correct file name (``sitemap.xml`` or ``sitemap_index.xml``) depending on your situation.
 
-``curl -X PUT -d true http://localhost:8080/api/admin/settings/:SearchApiRequiresToken``
+One way to submit your sitemap URL to Google is by using their "Search Console" (https://search.google.com/search-console). In order to use the console, you will need to authenticate yourself as the owner of your Dataverse site. Various authentication methods are provided; but if you are already using Google Analytics, the easiest way is to use that account. Make sure you are logged in on Google with the account that has the edit permission on your Google Analytics property; go to the Search Console and enter the root URL of your Dataverse installation, then choose Google Analytics as the authentication method. Once logged in, click on "Sitemaps" in the menu on the left. Consult `Google's "submit a sitemap" instructions`_ for more information.
 
-.. _systemEmail:
+.. _Google's "submit a sitemap" instructions: https://support.google.com/webmasters/answer/183668
 
-:SystemEmail
-++++++++++++
+Putting Your Dataverse Installation on the Map at dataverse.org
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-This is the email address that "system" emails are sent from such as password reset links. Your Dataverse installation will not send mail without this setting in place.
+Congratulations! You've gone live! It's time to announce your new data repository to the world! You are also welcome to contact support@dataverse.org to have the Dataverse Project Team add your installation to the map at http://dataverse.org . Thank you for installing the Dataverse Software!
 
-``curl -X PUT -d 'LibraScholar SWAT Team <support@librascholar.edu>' http://localhost:8080/api/admin/settings/:SystemEmail``
+Administration of Your Dataverse Installation
++++++++++++++++++++++++++++++++++++++++++++++
 
-Note that only the email address is required, which you can supply without the ``<`` and ``>`` signs, but if you include the text, it's the way to customize the name of your support team, which appears in the "from" address in emails as well as in help text in the UI.
+Now that you're live you'll want to review the :doc:`/admin/index` for more information about the ongoing administration of a Dataverse installation.
 
-Please note that if you're having any trouble sending email, you can refer to "Troubleshooting" under :doc:`installation-main`.
+Setting Up Integrations
++++++++++++++++++++++++
 
-:HomePageCustomizationFile
-++++++++++++++++++++++++++
+Before going live, you might want to consider setting up integrations to make it easier for your users to deposit or explore data. See the :doc:`/admin/integrations` section of the Admin Guide for details.
 
-See :ref:`Branding Your Installation` above.
+.. _jvm-options:
 
-:LogoCustomizationFile
-++++++++++++++++++++++
+JVM Options
+-----------
 
-See :ref:`Branding Your Installation` above.
+JVM stands for Java Virtual Machine and as a Java application, Payara can read JVM options when it is started. A number of JVM options are configured by the installer below is a complete list of the Dataverse Software-specific JVM options. You can inspect the configured options by running:
 
-:HeaderCustomizationFile
-++++++++++++++++++++++++
+``./asadmin list-jvm-options | egrep 'dataverse|doi'``
 
-See :ref:`Branding Your Installation` above.
+When changing values these values with ``asadmin``, you'll need to delete the old value before adding a new one, like this:
 
-:DisableRootDataverseTheme
-++++++++++++++++++++++++++
+``./asadmin delete-jvm-options "-Ddataverse.fqdn=old.example.com"``
 
-See :ref:`Branding Your Installation` above.
+``./asadmin create-jvm-options "-Ddataverse.fqdn=dataverse.example.com"``
 
-:FooterCustomizationFile
-++++++++++++++++++++++++
+It's also possible to change these values by stopping Payara, editing ``payara6/glassfish/domains/domain1/config/domain.xml``, and restarting Payara.
 
-See :ref:`Branding Your Installation` above.
+In addition, JVM options enabled for "MicroProfile Config" (see docs of any option), can be used with any
+`supported MicroProfile Config API source`_ to provide their values. The most notable source are environment variables;
+many examples are given in detail documentation of enabled options.
 
-:StyleCustomizationFile
-+++++++++++++++++++++++
 
-See :ref:`Branding Your Installation` above.
+.. _dataverse.fqdn:
 
-:WebAnalyticsCode
-+++++++++++++++++
+dataverse.fqdn
+++++++++++++++
 
-See :ref:`Web-Analytics-Code` above.
+If the Dataverse installation has multiple DNS names, this option specifies the one to be used as the "official"
+hostname. For example, you may want to have ``dataverse.example.edu``, and not the less appealing
+``server-123.example.edu`` to appear exclusively in all the registered global identifiers, etc.
 
-:FooterCopyright
-++++++++++++++++
+- Email confirmation links
+- Password reset links
+- Generating a Private URL
+- PID minting
+- Exporting to Schema.org format (and showing JSON-LD in HTML's <meta/> tag)
+- Exporting to DDI format
+- Which Dataverse installation an "external tool" should return to
+- URLs embedded in SWORD API responses
+- ...
 
-By default the footer says "Copyright Š [YYYY]" but you can add text after the year, as in the example below.
+Usually it will follow the pattern ``https://<full-qualified-domain-name>/<some-place-to-go-to>``.
+*Only* the FQDN part of your Dataverse installation URL can be determined by setting ``dataverse.fqdn``.
 
-``curl -X PUT -d ", Your Institution" http://localhost:8080/api/admin/settings/:FooterCopyright``
+**Notes:**
 
-.. _:DoiProvider:
+- The URL will default to using ``https://`` and no additional port information. If that does not suit your setup, you
+  can define an additional option, ``dataverse.siteUrl``, :ref:`explained below <dataverse.siteUrl>`, which always
+  takes precedence.
+- Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_FQDN``.
+  Defaults to ``localhost`` when used with ``mp.config.profile=ct``
 
-:DoiProvider
-++++++++++++
+.. _dataverse.siteUrl:
 
-As of this writing "DataCite" and "EZID" are the only valid options for production installations. Developers using version 4.10 and above are welcome to use the keyword "FAKE" to configure a non-production installation with an non-resolving, in-code provider, which will basically short-circuit the DOI publishing process. ``:DoiProvider`` is only needed if you are using DOI.
+dataverse.siteUrl
++++++++++++++++++
 
-``curl -X PUT -d DataCite http://localhost:8080/api/admin/settings/:DoiProvider``
+``dataverse.siteUrl`` is used to configure the URL for your Dataverse installation that you plan to advertise to your
+users. As explained in the :ref:`installation <importance-of-siteUrl>` docs, this setting is critical for the correct
+operation of your installation. For example, your site URL could be https://dataverse.example.edu . That is, even though
+the server might also be available at uglier URLs such as https://server-123.example.edu, the site URL is the
+"official" URL.
 
-This setting relates to the ``:Protocol``, ``:Authority``, ``:Shoulder``, and ``:IdentifierGenerationStyle`` database settings below as well as the following JVM options:
+That said, some environments may require using a different URL pattern to access your installation. You might need to
+use HTTP without "S", a non-standard port and so on. This is especially useful in development or testing environments.
 
-- :ref:`doi.baseurlstring`
-- :ref:`doi.username`
-- :ref:`doi.password`
+You can provide any custom tailored site URL via ``dataverse.siteUrl``, which always takes precedence.
+Example: ``dataverse.siteUrl=http://localhost:8080``
 
-.. _:Protocol:
+If you wish to change your site URL by changing the domain configuration, you should edit your ``domain.xml`` directly
+to avoid problems with colons in commands. Find a line similar to
+``<jvm-options>-Ddataverse.siteUrl=https://dataverse.example.edu</jvm-options>`` and change it. You can specify the
+protocol, host, and port number and should not include a trailing slash.
 
-:Protocol
-+++++++++
+**Notes:**
 
-As of this writing "doi" and "hdl" are the only valid option for the protocol for a persistent ID.
+- This setting may be used in combination with variable replacement, referencing :ref:`dataverse.fqdn` with
+  ``./asadmin create-jvm-options "\-Ddataverse.siteUrl=http\://\${dataverse.fqdn}\:8080"``
+- Remember to restart Payara after editing ``domain.xml``.
+- Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SITEURL``.
+  Defaults to ``http://${dataverse.fqdn}:8080`` when used with ``mp.config.profile=ct``
+- We are absolutely aware that it's confusing to have both ``dataverse.fqdn`` and ``dataverse.siteUrl``.
+  https://github.com/IQSS/dataverse/issues/6636 is about resolving this confusion.
 
-``curl -X PUT -d doi http://localhost:8080/api/admin/settings/:Protocol``
+.. _dataverse.files.directory:
 
-.. _:Authority:
+dataverse.files.directory
++++++++++++++++++++++++++
 
-:Authority
-++++++++++
+Providing an explicit location here makes it easier to reuse some mounted filesystem and we recommend doing so
+to avoid filled up disks, aid in performance, etc. This directory is used for a number of purposes:
 
-Use the authority assigned to you by your DoiProvider or HandleProvider.
+1. ``<dataverse.files.directory>/temp`` after uploading, data is temporarily stored here for ingest and/or before
+   shipping to the final storage destination.
+2. ``<dataverse.files.directory>/sword`` a place to store uploads via the :doc:`../api/sword` before transfer
+   to final storage location and/or ingest.
+3. ``<dataverse.files.directory>/googlecloudkey.json`` used with :ref:`Google Cloud Configuration` for BagIt exports.
+   This location is deprecated and might be refactored into a distinct setting in the future.
+4. The experimental DCM feature for :doc:`../developers/big-data-support` is able to trigger imports for externally
+   uploaded files in a directory tree at ``<dataverse.files.directory>/<PID Authority>/<PID Identifier>``
+   under certain conditions. This directory may also be used by file stores for :ref:`permanent file storage <storage-files-dir>`,
+   but this is controlled by other, store-specific settings.
 
-Please note that the authority cannot have a slash ("/") in it.
+Notes:
 
-``curl -X PUT -d 10.xxxx http://localhost:8080/api/admin/settings/:Authority``
+- Please provide an absolute path to a directory backed by some mounted file system.
+- Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_FILES_DIRECTORY``.
+- Defaults to ``/tmp/dataverse`` in a :doc:`default installation <installation-main>`.
+- Defaults to ``${STORAGE_DIR}`` using our :ref:`Dataverse container <app-locations>` (resolving to ``/dv``).
+- During startup, this directory will be checked for existence and write access. It will be created for you
+  if missing. If it cannot be created or does not have proper write access, application deployment will fail.
 
-.. _:Shoulder:
+.. _dataverse.files.default-dataset-file-count-limit:
 
-:Shoulder
-++++++++++++
+dataverse.files.default-dataset-file-count-limit
+++++++++++++++++++++++++++++++++++++++++++++++++
 
-Out of the box, the DOI shoulder is set to "FK2/" but this is for testing only! When you apply for your DOI namespace, you may have requested a shoulder. The following is only an example and a trailing slash is optional.
+Configure a limit to the maximum number of Datafiles that can be uploaded to a Dataset.
 
-``curl -X PUT -d "MyShoulder/" http://localhost:8080/api/admin/settings/:Shoulder``
+Notes:
 
-.. _:IdentifierGenerationStyle:
+- This is a default that can be overwritten in any Dataverse/Collection or Dataset.
+- A value less than 1 will be treated as no limit set.
+- Changing this value will not delete any existing files. It is only intended for preventing new files from being uploaded.
+- Superusers will not be governed by this rule.
 
-:IdentifierGenerationStyle
-++++++++++++++++++++++++++
+.. _dataverse.files.uploads:
 
-By default, Dataverse generates a random 6 character string, pre-pended by the Shoulder if set, to use as the identifier
-for a Dataset. Set this to ``sequentialNumber`` to use sequential numeric values 
-instead (again pre-pended by the Shoulder if set). (the assumed default setting is ``randomString``). 
-In addition to this setting, a database sequence must be created in the database. 
-We provide the script below (downloadable :download:`here </_static/util/createsequence.sql>`).
-You may need to make some changes to suit your system setup, see the comments for more information: 
+dataverse.files.uploads
++++++++++++++++++++++++
 
-.. literalinclude:: ../_static/util/createsequence.sql
+Configure a folder to store the incoming file stream during uploads (before transfering to ``${dataverse.files.directory}/temp``).
+Providing an explicit location here makes it easier to reuse some mounted filesystem.
+Please also see :ref:`temporary-file-storage` for more details.
 
-Note that the SQL above is Postgres-specific. If necessary, it can be reimplemented 
-in any other SQL flavor - the standard JPA code in the application simply expects 
-the database to have a saved function ("stored procedure") named ``generateIdentifierAsSequentialNumber``
-with the single return argument ``identifier``. 
+Notes:
 
-Please note that ``:IdentifierGenerationStyle`` also plays a role for the "identifier" for files. See the section on ``:DataFilePIDFormat`` below for more details.
+- Please provide an absolute path to a directory backed by some mounted file system.
+- Defaults to ``${com.sun.aas.instanceRoot}/uploads`` in a :doc:`default installation <installation-main>`
+  (resolving to ``/usr/local/payara6/glassfish/domains/domain1/uploads``).
+- Defaults to ``${STORAGE_DIR}/uploads`` using our :ref:`Dataverse container <app-locations>` (resolving to ``/dv/uploads``).
+- Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_FILES_UPLOADS``.
+- During startup, this directory will be checked for existence and write access. It will be created for you
+  if missing. If it cannot be created or does not have proper write access, application deployment will fail.
 
-.. _:DataFilePIDFormat:
+.. _dataverse.files.docroot:
 
-:DataFilePIDFormat
-++++++++++++++++++
+dataverse.files.docroot
++++++++++++++++++++++++
 
-This setting controls the way that the "identifier" component of a file's persistent identifier (PID) relates to the PID of its "parent" dataset.
+Configure a folder to store and retrieve additional materials like user uploaded collection logos, generated sitemaps,
+and so on. Providing an explicit location here makes it easier to reuse some mounted filesystem.
+See also logo customization above.
 
-By default the identifier for a file is dependent on its parent dataset. For example, if the identifier of a dataset is "TJCLKP", the identifier for a file within that dataset will consist of the parent dataset's identifier followed by a slash ("/"), followed by a random 6 character string, yielding "TJCLKP/MLGWJO". Identifiers in this format are what you should expect if you leave ``:DataFilePIDFormat`` undefined or set it to ``DEPENDENT`` and have not changed the ``:IdentifierGenerationStyle`` setting from its default.
+Notes:
 
-Alternatively, the identifier for File PIDs can be configured to be independent of Dataset PIDs using the setting "``INDEPENDENT``". In this case, file PIDs will not contain the PIDs of their parent datasets, and their PIDs will be generated the exact same way that datasets' PIDs are, based on the ``:IdentifierGenerationStyle`` setting described above (random 6 character strings or sequential numbers, pre-pended by any shoulder).
+- Defaults to ``${com.sun.aas.instanceRoot}/docroot`` in a :doc:`default installation <installation-main>`
+  (resolves to ``/usr/local/payara6/glassfish/domains/domain1/docroot``).
+- Defaults to ``${STORAGE_DIR}/docroot`` using our :ref:`Dataverse container <app-locations>` (resolving to ``/dv/docroot``).
+- Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_FILES_DOCROOT``.
+- During startup, this directory will be checked for existence and write access. It will be created for you
+  if missing. If it cannot be created or does not have proper write access, application deployment will fail.
 
-The chart below shows examples from each possible combination of parameters from the two settings. ``:IdentifierGenerationStyle`` can be either ``randomString`` (the default) or ``sequentialNumber`` and ``:DataFilePIDFormat`` can be either ``DEPENDENT`` (the default) or ``INDEPENDENT``. In the examples below the "identifier" for the dataset is "TJCLKP" for "randomString" and "100001" for "sequentialNumber".
+dataverse.auth.password-reset-timeout-in-minutes
+++++++++++++++++++++++++++++++++++++++++++++++++
 
-+-----------------+---------------+------------------+
-|                 | randomString  | sequentialNumber |
-|                 |               |                  |
-+=================+===============+==================+
-| **DEPENDENT**   | TJCLKP/MLGWJO |     100001/1     |
-+-----------------+---------------+------------------+
-| **INDEPENDENT** |    MLGWJO     |      100002      |
-+-----------------+---------------+------------------+
+Users have 60 minutes to change their passwords by default. You can adjust this value here.
 
-As seen above, in cases where ``:IdentifierGenerationStyle`` is set to *sequentialNumber* and ``:DataFilePIDFormat`` is set to *DEPENDENT*, each file within a dataset will be assigned a number *within* that dataset starting with "1". 
+.. _dataverse.db.name:
 
-Otherwise, if ``:DataFilePIDFormat`` is set to *INDEPENDENT*, then each file will be assigned a PID with the next number in the overall sequence, regardless of what dataset it is in. If the file is created after a dataset with the PID 100001, then the file will be assigned the PID 100002. This option is functional, but it is not a recommended use case.
+dataverse.db.name
++++++++++++++++++
 
-Note that in either case, when using the ``sequentialNumber`` option, datasets and files share the same database sequence that was created as part of the setup described in ``:IdentifierGenerationStyle`` above.
+The PostgreSQL database name to use for the Dataverse installation.
 
-.. _:FilePIDsEnabled:
+Defaults to ``dataverse`` (but the installer sets it to ``dvndb``).
 
-:FilePIDsEnabled
-++++++++++++++++
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_DB_NAME``.
 
-Toggles publishing of file-based PIDs for the entire installation. By default this setting is absent and Dataverse assumes it to be true.
+See also :ref:`database-persistence`.
 
-If you don't want to register file-based PIDs for your installation, set:
+dataverse.db.user
++++++++++++++++++
 
-``curl -X PUT -d 'false' http://localhost:8080/api/admin/settings/:FilePIDsEnabled``
+The PostgreSQL user name to connect with.
 
-Note: File-level PID registration was added in 4.9 and is required until version 4.9.3.
+Defaults to ``dataverse`` (but the installer sets it to ``dvnapp``).
 
-.. _:IndependentHandleService:
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_DB_USER``.
 
-:IndependentHandleService
-+++++++++++++++++++++++++++
+dataverse.db.password
++++++++++++++++++++++
 
-Specific for Handle PIDs. Set this setting to true if you want to use a Handle service which is setup to work 'independently' (No communication with the Global Handle Registry). 
-By default this setting is absent and Dataverse assumes it to be false.
+The PostgreSQL users password to connect with.
 
-``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:IndependentHandleService``
+See :ref:`secure-password-storage` to learn about options to securely store this password.
 
-:ApplicationTermsOfUse
-++++++++++++++++++++++
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_DB_PASSWORD`` (although you shouldn't use environment variables for passwords).
 
-Upload an default language HTML file containing the Terms of Use to be displayed at sign up. Supported HTML tags are listed under the :doc:`/user/dataset-management` section of the User Guide.
+dataverse.db.host
++++++++++++++++++
 
-``curl -X PUT -d@/tmp/apptou.html http://localhost:8080/api/admin/settings/:ApplicationTermsOfUse``
+The PostgreSQL server to connect to.
 
-To upload a language specific Terms of Use file,
+Defaults to ``localhost``.
 
-``curl -X PUT -d@/tmp/apptou_fr.html http://localhost:8080/api/admin/settings/:ApplicationTermsOfUse/lang/fr``
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_DB_HOST``.
 
-To delete language specific option,
+dataverse.db.port
++++++++++++++++++
 
-``curl -X DELETE http://localhost:8080/api/admin/settings/:ApplicationTermsOfUse/lang/fr``
+The PostgreSQL server port to connect to.
 
-Unfortunately, in most cases, the text file will probably be too big to upload (>1024 characters) due to a bug. A workaround has been posted to https://github.com/IQSS/dataverse/issues/2669
+Defaults to ``5432``, the default PostgreSQL port.
 
-:ApplicationPrivacyPolicyUrl
-++++++++++++++++++++++++++++
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_DB_PORT``.
 
-Specify a URL where users can read your Privacy Policy, linked from the bottom of the page.
+dataverse.db.parameters
++++++++++++++++++++++++
 
-``curl -X PUT -d https://dataverse.org/best-practices/harvard-dataverse-privacy-policy http://localhost:8080/api/admin/settings/:ApplicationPrivacyPolicyUrl``
+The PostgreSQL server connection parameters.
 
-:ApiTermsOfUse
-++++++++++++++
+Defaults to *empty string*
 
-Specify a URL where users can read your API Terms of Use.
-API users can retrieve this URL from the SWORD Service Document or the "info" section of our :doc:`/api/native-api` documentation.
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_DB_PARAMETERS``.
 
-``curl -X PUT -d https://dataverse.org/best-practices/harvard-api-tou http://localhost:8080/api/admin/settings/:ApiTermsOfUse``
+.. _dataverse.solr.host:
 
+dataverse.solr.host
++++++++++++++++++++
 
-.. _:ExcludeEmailFromExport:
+The hostname of a Solr server to connect to. Remember to restart / redeploy Dataverse after changing the setting
+(as with :ref:`:SolrHostColonPort`).
 
-:ExcludeEmailFromExport
-+++++++++++++++++++++++
+Defaults to ``localhost``.
 
-See also :ref:`Privacy Considerations <PrivacyConsiderations>` above.
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SOLR_HOST``.
+Defaults to ``solr``, when used with ``mp.config.profile=ct`` (:ref:`see below <:ApplicationServerSettings>`).
 
-Set ``:ExcludeEmailFromExport`` to prevent email addresses for contacts from being exposed in XML or JSON representations of dataset and dataverse metadata. For a list exported formats such as DDI, see the :doc:`/admin/metadataexport` section of the Admin Guide.
+dataverse.solr.port
++++++++++++++++++++
 
-``curl -X PUT -d true http://localhost:8080/api/admin/settings/:ExcludeEmailFromExport``
+The Solr server port to connect to. Remember to restart / redeploy Dataverse after changing the setting
+(as with :ref:`:SolrHostColonPort`).
 
-:NavbarAboutUrl
-+++++++++++++++
+Defaults to ``8983``, the default Solr port.
 
-Set ``NavbarAboutUrl`` to a fully-qualified URL which will be used for the "About" link in the navbar. 
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SOLR_PORT``.
 
-Note: The "About" link will not appear in the navbar until this option is set.
+dataverse.solr.core
++++++++++++++++++++
 
-``curl -X PUT -d http://dataverse.example.edu http://localhost:8080/api/admin/settings/:NavbarAboutUrl``
+The name of the Solr core to use for this Dataverse installation. Might be used to switch to a different core quickly.
+Remember to restart / redeploy Dataverse after changing the setting (as with :ref:`:SolrHostColonPort`).
 
+Defaults to ``collection1``.
 
-:GuidesBaseUrl
-++++++++++++++
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SOLR_CORE``.
 
-Set ``GuidesBaseUrl`` to override the default value "http://guides.dataverse.org". If you are interested in writing your own version of the guides, you may find the :doc:`/developers/documentation` section of the Developer Guide helpful.
+dataverse.solr.protocol
++++++++++++++++++++++++
 
-``curl -X PUT -d http://dataverse.example.edu http://localhost:8080/api/admin/settings/:GuidesBaseUrl``
+The Solr server URL protocol for the connection. Remember to restart / redeploy Dataverse after changing the setting
+(as with :ref:`:SolrHostColonPort`).
 
-:GuidesVersion
-++++++++++++++
+Defaults to ``http``, but might be set to ``https`` for extra secure Solr installations.
 
-Set ``:GuidesVersion`` to override the version number in the URL of guides. For example, rather than http://guides.dataverse.org/en/4.6/user/account.html the version is overriden to http://guides.dataverse.org/en/1234-new-feature/user/account.html in the example below:
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SOLR_PROTOCOL``.
 
-``curl -X PUT -d 1234-new-feature http://localhost:8080/api/admin/settings/:GuidesVersion``
+dataverse.solr.path
++++++++++++++++++++
 
-:NavbarSupportUrl
-+++++++++++++++++
-Set ``:NavbarSupportUrl`` to a fully-qualified URL which will be used for the "Support" link in the navbar.
+The path part of the Solr endpoint URL (e.g. ``/solr/collection1`` of ``http://localhost:8389/solr/collection1``).
+Might be used to target a Solr API at non-default places. Remember to restart / redeploy Dataverse after changing the
+setting (as with :ref:`:SolrHostColonPort`).
 
-Note that this will override the default behaviour for the "Support" menu option, which is to display the dataverse 'feedback' dialog.
+Defaults to ``/solr/${dataverse.solr.core}``, interpolating the core name when used. Make sure to include the variable
+when using it to configure your core name!
 
-``curl -X PUT -d http://dataverse.example.edu/supportpage.html http://localhost:8080/api/admin/settings/:NavbarSupportUrl``
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SOLR_PATH``.
 
-:MetricsUrl
-+++++++++++
+dataverse.solr.min-files-to-use-proxy
++++++++++++++++++++++++++++++++++++++
 
-Make the metrics component on the root dataverse a clickable link to a website where you present metrics on your Dataverse installation, perhaps one of the community-supported tools mentioned in the :doc:`/admin/reporting-tools` section of the Admin Guide.
+Specifies when to use a smaller datafile proxy object for the purposes of dataset indexing. This can lower memory requirements
+and improve performance when reindexing large datasets (e.g. those with hundreds or thousands of files). (Creating the proxy may slightly slow indexing datasets with only a few files.)
 
-``curl -X PUT -d http://metrics.dataverse.example.edu http://localhost:8080/api/admin/settings/:MetricsUrl``
+This setting represents a number of files for which the datafile procy should be used. By default, this is set to Interger.MAX which disables using the proxy.
+A recommended value would be ~1000 but the optimal value may vary depending on details of your installation.  
 
-:StatusMessageHeader
-++++++++++++++++++++
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SOLR_MIN_FILES_TO_USE_PROXY``.
 
-For dynamically adding an informational header to the top of every page. StatusMessageText must also be set for a message to show. For example, "For testing only..." at the top of https://demo.dataverse.org is set with this:
+dataverse.solr.concurrency.max-async-indexes
+++++++++++++++++++++++++++++++++++++++++++++
 
-``curl -X PUT -d "For testing only..." http://localhost:8080/api/admin/settings/:StatusMessageHeader``
+Maximum number of simultaneously running asynchronous dataset index operations.
 
-You can make the text clickable and include an additional message in a pop up by setting ``:StatusMessageText``.
+Defaults to ``4``.
 
-:StatusMessageText
-++++++++++++++++++
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SOLR_CONCURRENCY_MAX_ASYNC_INDEXES``.
 
-Alongside the ``:StatusMessageHeader`` you need to add StatusMessageText for the message to show.:
+dataverse.rserve.host
++++++++++++++++++++++
 
-``curl -X PUT -d "This appears in a popup." http://localhost:8080/api/admin/settings/:StatusMessageText``
+Host name for Rserve, used for tasks that require use of R (to ingest RData
+files and to save tabular data as RData frames).
 
-:MaxFileUploadSizeInBytes
-+++++++++++++++++++++++++
+Defaults to ``localhost``.
 
-Set `MaxFileUploadSizeInBytes` to "2147483648", for example, to limit the size of files uploaded to 2 GB.
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_RSERVE_HOST``.
 
-Notes:
+dataverse.rserve.port
++++++++++++++++++++++
 
-- For SWORD, this size is limited by the Java Integer.MAX_VALUE of 2,147,483,647. (see: https://github.com/IQSS/dataverse/issues/2169)
+Port number for Rserve, used for tasks that require use of R (to ingest RData
+files and to save tabular data as RData frames).
 
-- If the MaxFileUploadSizeInBytes is NOT set, uploads, including SWORD may be of unlimited size.
+Defaults to ``6311`` when not configured or no valid integer.
 
-- For larger file upload sizes, you may need to configure your reverse proxy timeout. If using apache2 (httpd) with Shibboleth, add a timeout to the ProxyPass defined in etc/httpd/conf.d/ssl.conf (which is described in the :doc:`/installation/shibboleth` setup).
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_RSERVE_PORT``.
 
-``curl -X PUT -d 2147483648 http://localhost:8080/api/admin/settings/:MaxFileUploadSizeInBytes``
+dataverse.rserve.user
++++++++++++++++++++++
 
-:ZipDownloadLimit
-+++++++++++++++++
+Username for Rserve, used for tasks that require use of R (to ingest RData
+files and to save tabular data as RData frames).
 
-For performance reasons, Dataverse will only create zip files on the fly up to 100 MB but the limit can be increased. Here's an example of raising the limit to 1 GB:
+Defaults to ``rserve``.
 
-``curl -X PUT -d 1000000000 http://localhost:8080/api/admin/settings/:ZipDownloadLimit``
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_RSERVE_USER``.
 
-:TabularIngestSizeLimit
-+++++++++++++++++++++++
+dataverse.rserve.password
++++++++++++++++++++++++++
 
-Threshold in bytes for limiting whether or not "ingest" it attempted for tabular files (which can be resource intensive). For example, with the below in place, files greater than 2 GB in size will not go through the ingest process:
+Password for Rserve, used for tasks that require use of R (to ingest RData
+files and to save tabular data as RData frames).
 
-``curl -X PUT -d 2000000000 http://localhost:8080/api/admin/settings/:TabularIngestSizeLimit``
+Defaults to ``rserve``.
 
-(You can set this value to 0 to prevent files from being ingested at all.)
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_RSERVE_PASSWORD``.
+
+dataverse.rserve.tempdir
+++++++++++++++++++++++++
+
+Temporary directory used by Rserve (defaults to ``/tmp/Rserv``). Note that this
+location is local to the host on which Rserv is running (specified in
+``dataverse.rserve.host`` above). When talking to Rserve, Dataverse needs to
+know this location in order to generate absolute path names of the files on the
+other end.
+
+Defaults to ``/tmp/Rserv``.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_RSERVE_TEMPDIR``.
+
+.. _dataverse.dropbox.key:
+
+dataverse.dropbox.key
++++++++++++++++++++++
+
+Dropbox provides a Chooser app, which is a Javascript component that allows you to upload files to your Dataverse installation from Dropbox. It is an optional configuration setting, which requires you to pass it an app key and configure the ``:UploadMethods`` database setting. For more information on setting up your Chooser app, visit https://www.dropbox.com/developers/chooser.
+
+``./asadmin create-jvm-options "-Ddataverse.dropbox.key={{YOUR_APP_KEY}}"``
+
+dataverse.path.imagemagick.convert
+++++++++++++++++++++++++++++++++++
+
+For overriding the default path to the ``convert`` binary from ImageMagick (``/usr/bin/convert``).
+
+dataverse.dataAccess.thumbnail.image.limit
+++++++++++++++++++++++++++++++++++++++++++
+
+For limiting the size (in bytes) of thumbnail images generated from files. The default is 3000000 bytes (3 MB).
+
+dataverse.dataAccess.thumbnail.pdf.limit
+++++++++++++++++++++++++++++++++++++++++
+
+For limiting the size (in bytes) of thumbnail images generated from files. The default is 1000000 bytes (1 MB).
+
+
+.. _dataverse.pid.datacite.mds-api-url:
+
+Legacy Single PID Provider: dataverse.pid.datacite.mds-api-url
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Configure the base URL of the `DataCite MDS API <https://support.datacite.org/reference/overview>`_,
+used to mint and manage DOIs. Valid values are "https://mds.datacite.org" and "https://mds.test.datacite.org"
+(see also note below).
+
+Out of the box, the installer configures your installation to use a DataCite REST Test API base URL (see DataCite's `testing guide <https://support.datacite.org/docs/testing-guide>`_). You can delete it like this:
+
+``./asadmin delete-jvm-options '-Ddataverse.pid.datacite.mds-api-url=https\://mds.test.datacite.org'``
+
+Then, to switch to the production DataCite base URL (see the `DataCite MDS API Guide <https://support.datacite.org/docs/mds-api-guide>`_), you can issue the following command:
+
+``./asadmin create-jvm-options '-Ddataverse.pid.datacite.mds-api-url=https\://mds.datacite.org'``
+
+Without setting an option, always defaults to testing API endpoint.
+
+**Notes:**
+
+- See also these related database settings below: :ref:`:DoiProvider`, 
+  :ref:`:Protocol`, :ref:`:Authority`, :ref:`:Shoulder`.
+- Can also be set via *MicroProfile Config API* sources, e.g. the environment
+  variable ``DATAVERSE_PID_DATACITE_MDS_API_URL``.
+- This setting was formerly known as ``doi.baseurlstring`` and has been renamed.
+  You should delete and re-add it.
+- While using DataCite directly is recommended because it is tested by the Dataverse
+  Project Team plus field tested with most installations, it is also possible
+  to use a DataCite Client API as a proxy to DataCite. `Since the launch of DataCite Fabrica in
+  2019, the only example by Australian National Data Services (ANDS) has been decommissioned
+  <https://intranet.ands.org.au/display/DOC/DOI+Technical+Changes%3A+Transition+to+DataCite+DOI+services>`_.
+
+
+.. _dataverse.pid.datacite.rest-api-url:
+
+Legacy Single PID Provider: dataverse.pid.datacite.rest-api-url
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Configure the base URL endpoint of the `DataCite REST API <https://support.datacite.org/reference/introduction>`_, used for
+:ref:`PIDs API <pids-api>` information retrieval and :doc:`/admin/make-data-count`.
+
+Valid values are "https://api.datacite.org" and "https://api.test.datacite.org". When unset, the default is the testing API endpoint.
+
+Out of the box, the installer configures your installation to use a DataCite REST test base URL (see DataCite's `testing guide <https://support.datacite.org/docs/testing-guide>`_). You can delete it like this:
+
+``./asadmin delete-jvm-options '-Ddataverse.pid.datacite.rest-api-url=https\://api.test.datacite.org'``
+
+Then, to switch to the production DataCite base URL (see the `DataCite REST API Guide <https://support.datacite.org/docs/api>`_),
+you can issue the following command:
+
+``./asadmin create-jvm-options '-Ddataverse.pid.datacite.rest-api-url=https\://api.datacite.org'``
+
+**Notes:**
+
+- See also these related database settings below: :ref:`:MDCLogPath`,
+  :ref:`:DisplayMDCMetrics`.
+- Can also be set via *MicroProfile Config API* sources, e.g. the environment
+  variable ``DATAVERSE_PID_DATACITE_REST_API_URL``.
+- This setting was formerly known as ``doi.dataciterestapiurlstring`` or
+  ``doi.mdcbaseurlstring`` and has been renamed. You should delete these and re-add it (once) under the new name.
+
+.. _dataverse.pid.datacite.username:
+
+Legacy Single PID Provider: dataverse.pid.datacite.username
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+DataCite uses `HTTP Basic authentication <https://en.wikipedia.org/wiki/Basic_access_authentication>`_
+for `Fabrica <https://doi.datacite.org/>`_ and their APIs. You need to provide
+the same credentials to Dataverse software to mint and manage DOIs for you.
+
+Once you have a username from DataCite, you can enter it like this:
+
+``./asadmin create-jvm-options '-Ddataverse.pid.datacite.username=YOUR_USERNAME_HERE'``
+
+**Notes:**
+
+- Used in conjuction with :ref:`dataverse.pid.datacite.mds-api-url`, 
+  :ref:`dataverse.pid.datacite.rest-api-url` and :ref:`dataverse.pid.datacite.password`.
+- Can also be set via *MicroProfile Config API* sources, e.g. the environment
+  variable ``DATAVERSE_PID_DATACITE_USERNAME``.
+- This setting was formerly known as ``doi.username`` and has been renamed.
+  You should delete and re-add it.
+
+.. _dataverse.pid.datacite.password:
+
+Legacy Single PID Provider: dataverse.pid.datacite.password
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Once you have a password from your provider, you should create a password alias called *dataverse.pid.datacite.password* or use another method described at :ref:`secure-password-storage` to safeguard it.
+
+**Notes:**
+
+- Used in conjuction with :ref:`dataverse.pid.datacite.mds-api-url`, 
+  :ref:`dataverse.pid.datacite.rest-api-url` and :ref:`dataverse.pid.datacite.username`.
+- Can also be set via *MicroProfile Config API* sources, e.g. the environment
+  variable ``DATAVERSE_PID_DATACITE_PASSWORD`` (although you shouldn't use
+  environment variables for passwords).
+- This setting was formerly known as ``doi.password`` and has been renamed.
+  You should delete the old JVM option and the wrapped password alias, then recreate
+  as described above.
+
+
+
+.. _dataverse.pid.handlenet.key.path:
+
+Legacy Single PID Provider: dataverse.pid.handlenet.key.path
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Related to :ref:`Handle.Net PID provider usage <pids-handle-configuration>`.
+
+Provide an absolute path to a private key file authenticating requests to your
+Handle.Net server.
+
+Handle.Net servers use a public key authentication method where the public key
+is stored in a handle itself and the matching private key is provided from this
+file. Typically, the absolute path ends like ``handle/svr_1/admpriv.bin``. See
+also chapter 1.4 "Authentication" of the `Handle.Net Technical Documentation
+<http://www.handle.net/tech_manual/HN_Tech_Manual_8.pdf>`__
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_PID_HANDLENET_KEY_PATH``. This setting was formerly known
+as ``dataverse.handlenet.admcredfile`` and has been renamed. You should delete
+and re-add it.
+
+
+.. _dataverse.pid.handlenet.key.passphrase:
+
+Legacy Single PID Provider: dataverse.pid.handlenet.key.passphrase
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Related to :ref:`Handle.Net PID provider usage <pids-handle-configuration>`.
+
+Provide a passphrase to decrypt the :ref:`private key file <dataverse.pid.handlenet.key.path>`.
+See :ref:`secure-password-storage` for ways to do this securely.
+
+The key file may (and should) be encrypted with a passphrase (used for
+encryption with AES-128). See also chapter 1.4 "Authentication" of the
+`Handle.Net Technical Documentation <http://www.handle.net/tech_manual/HN_Tech_Manual_8.pdf>`__
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_PID_HANDLENET_KEY_PASSPHRASE`` (although you shouldn't use
+environment variables for passwords).
+
+This setting was formerly known as ``dataverse.handlenet.admprivphrase`` and has been renamed.
+You should delete the old JVM option and the wrapped password alias, then recreate as shown for :ref:`dataverse.pid.datacite.password` but with this option as alias name.
+
+
+.. _dataverse.pid.handlenet.index:
+
+Legacy Single PID Provider: dataverse.pid.handlenet.index
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Related to :ref:`Handle.Net PID provider usage <pids-handle-configuration>`.
+
+Configure your *Handle.Net Index* to be used registering new persistent
+identifiers. Defaults to ``300``. 
+
+Indices are used to separate concerns within the Handle system. To add data to
+an index, authentication is mandatory. See also chapter 1.4 "Authentication" of
+the `Handle.Net Technical Documentation <http://www.handle.net/tech_manual/HN_Tech_Manual_8.pdf>`__
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_PID_HANDLENET_INDEX``. This setting was formerly known as
+``dataverse.handlenet.index`` and has been renamed. You should delete and
+re-add it.
+
+.. _dataverse.pid.permalink.base-url:
+
+Legacy Single PID Provider: dataverse.pid.permalink.base-url
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+When using :ref:`PermaLinks <permalinks>`, this setting can be used to configure an external resolver. Dataverse will associate a PermaLink PID with the URL:
+``<dataverse.pid.permalink.base-url>/citation?persistentId=perma:<permalink>``. The default value is your Dataverse site URL, which will result in PermaLinks correctly resolving to the appropriate dataset page.
+
+To set this option, issue a command such as:
+
+``./asadmin create-jvm-options '-Ddataverse.pid.permalink.base-url=https\://localresolver.yourdataverse.org'``
+
+See also these related database settings:
+
+- :ref:`:Protocol`
+- :ref:`:Authority`
+- :ref:`:Shoulder`
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_PID_PERMALINK_BASE_URL``. This setting was formerly known as
+``perma.baseurlstring`` and has been renamed. You should delete and re-add it.
+
+.. _dataverse.pid.ezid.api-url:
+
+Legacy Single PID Provider: dataverse.pid.ezid.api-url
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+The EZID DOI provider is likely not an option if you are `not associated with
+California Digital Library (CDL) or Purdue University 
+<https://www.cdlib.org/cdlinfo/2017/08/04/ezid-doi-service-is-evolving/>`_.
+
+Defaults to ``https://ezid.cdlib.org``.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_PID_EZID_API_URL``. This setting was formerly known as
+``doi.baseurlstring`` and has been renamed. You should delete and re-add it.
+
+.. _dataverse.pid.ezid.username:
+
+Legacy Single PID Provider: dataverse.pid.ezid.username
++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+The EZID DOI provider is likely not an option if you are `not associated with
+California Digital Library (CDL) or Purdue University 
+<https://www.cdlib.org/cdlinfo/2017/08/04/ezid-doi-service-is-evolving/>`_.
+
+Works the same way as :ref:`dataverse.pid.datacite.username`, but for the EZID DOI
+provider.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_PID_EZID_USERNAME``.
+
+This setting was formerly known as ``doi.username`` and has been renamed. You
+should delete and re-add it.
+
+.. _dataverse.pid.ezid.password:
+
+Legacy Single PID Provider: dataverse.pid.ezid.password
++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+The EZID DOI provider is likely not an option if you are `not associated with
+California Digital Library (CDL) or Purdue University 
+<https://www.cdlib.org/cdlinfo/2017/08/04/ezid-doi-service-is-evolving/>`_.
+
+Works the same way as :ref:`dataverse.pid.datacite.password`, but for the EZID DOI
+provider.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_PID_EZID_PASSWORD`` (although you shouldn't use
+environment variables for passwords). 
+
+This setting was formerly known as ``doi.password`` and has been renamed. You
+should delete the old JVM option and the wrapped password alias, then recreate
+as shown for :ref:`dataverse.pid.datacite.password` but with the EZID alias
+name.
+
+.. _dataverse.timerServer:
+
+dataverse.timerServer
++++++++++++++++++++++
+
+This JVM option is only relevant if you plan to run multiple Payara servers for redundancy. Only one Payara server can act as the dedicated timer server and for details on promoting or demoting a Payara server to handle this responsibility, see :doc:`/admin/timers`.
+
+.. _dataverse.lang.directory:
+
+dataverse.lang.directory
+++++++++++++++++++++++++
+
+This JVM option is used to configure the path where all the language specific property files are to be stored.  If this option is set then the English property file must be present in the path along with any other language property file. You can download language property files from https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs
+
+``./asadmin create-jvm-options '-Ddataverse.lang.directory=PATH_LOCATION_HERE'``
+
+If this value is not set, by default, a Dataverse installation will read the English language property files from the Java Application.
+
+See also :ref:`i18n`.
+
+dataverse.files.hide-schema-dot-org-download-urls
++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Please note that this setting is experimental.
+
+By default, download URLs to files will be included in Schema.org JSON-LD output. To prevent these URLs from being included in the output, set ``dataverse.files.hide-schema-dot-org-download-urls`` to true as in the example below.
+
+``./asadmin create-jvm-options '-Ddataverse.files.hide-schema-dot-org-download-urls=true'``
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment
+variable ``DATAVERSE_FILES_HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS``.
+
+For more on Schema.org JSON-LD, see the :doc:`/admin/metadataexport` section of the Admin Guide.
+
+.. _useripaddresssourceheader:
+
+dataverse.useripaddresssourceheader
++++++++++++++++++++++++++++++++++++
+
+**Make sure** to read the section about the :ref:`Security Implications 
+<user-ip-addresses-proxy-security>` of using this option earlier in the guide!
+
+If set, specifies an HTTP Header such as X-Forwarded-For to use to retrieve the user's IP address. For example:
+
+``./asadmin create-jvm-options '-Ddataverse.useripaddresssourceheader=X-Forwarded-For'``
+
+This setting is useful in cases such as running your Dataverse installation behind load balancers where the default option of getting the Remote Address from the servlet isn't correct (e.g. it would be the load balancer IP address). Note that unless your installation always sets the header you configure here, this could be used as a way to spoof the user's address. Allowed values are: 
+
+.. code::
+
+	"X-Forwarded-For",
+	"Proxy-Client-IP",
+	"WL-Proxy-Client-IP",
+	"HTTP_X_FORWARDED_FOR",
+	"HTTP_X_FORWARDED",
+	"HTTP_X_CLUSTER_CLIENT_IP",
+	"HTTP_CLIENT_IP",
+	"HTTP_FORWARDED_FOR",
+	"HTTP_FORWARDED",
+	"HTTP_VIA",
+	"REMOTE_ADDR"
+	
+.. _dataverse.person-or-org.assume-comma-in-person-name:
+
+dataverse.person-or-org.assume-comma-in-person-name
++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Please note that this setting is experimental.
+
+The Schema.org metadata and OpenAIRE exports and the Schema.org metadata included in DatasetPages try to infer whether each entry in the various fields (e.g. Author, Contributor) is a Person or Organization. If you are sure that
+users are following the guidance to add people in the recommended family name, given name order, with a comma, you can set this true to always assume entries without a comma are for Organizations. The default is false.
+
+``./asadmin create-jvm-options '-Ddataverse.person-or-org.assume-comma-in-person-name=true'``
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_PERSON_OR_ORG_ASSUME_COMMA_IN_PERSON_NAME``.
+
+**Note:** This setting was previously called `dataverse.personOrOrg.assumeCommaInPersonName`, which is still available as an alias for backwards compatiblity.
+
+.. _dataverse.person-or-org.org-phrase-array:
+
+dataverse.person-or-org.org-phrase-array
+++++++++++++++++++++++++++++++++++++++++
+
+Please note that this setting is experimental.
+
+The Schema.org metadata and OpenAIRE exports and the Schema.org metadata included in DatasetPages try to infer whether each entry in the various fields (e.g. Author, Contributor) is a Person or Organization.
+If you have examples where an orgization name is being inferred to belong to a person, you can use this setting to force it to be recognized as an organization.
+The value is expected to be a comma-separated list of strings. Any name that contains one of the strings is assumed to be an organization. For example, "Project" is a word that is not otherwise associated with being an organization.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_PERSON_OR_ORG_ORG_PHRASE_ARRAY``.
+
+**Note:** This setting was previously called `dataverse.personOrOrg.orgPhraseArray` and expected a JsonArray of strings. Please update both the name and value format if using the old setting.
+
+.. _dataverse.api.signature-secret:
+
+dataverse.api.signature-secret
+++++++++++++++++++++++++++++++
+
+Context: Dataverse has the ability to create "Signed URLs" for it's API calls. Using a signed URLs is more secure than
+providing API tokens, which are long-lived and give the holder all of the permissions of the user. In contrast, signed URLs
+are time limited and only allow the action of the API call in the URL. See :ref:`api-exttools-auth` and
+:ref:`api-native-signed-url` for more details. 
+
+The key used to sign a URL is created from the API token of the creating user plus a signature-secret provided by an administrator.
+**Using a signature-secret is highly recommended.** This setting defaults to an empty string. Using a non-empty 
+signature-secret makes it impossible for someone who knows an API token from forging signed URLs and provides extra security by 
+making the overall signing key longer.
+
+**WARNING**:
+*Since the signature-secret is sensitive, you should treat it like a password.*
+*See* :ref:`secure-password-storage` *to learn about ways to safeguard it.*
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_API_SIGNATURE_SECRET`` (although you shouldn't use environment variables for passwords) .
+
+.. _dataverse.api.allow-incomplete-metadata:
+
+dataverse.api.allow-incomplete-metadata
++++++++++++++++++++++++++++++++++++++++
+
+When enabled, dataset with incomplete metadata can be submitted via API for later corrections.
+See :ref:`create-dataset-command` for details.
+
+Defaults to ``false``.
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable
+``DATAVERSE_API_ALLOW_INCOMPLETE_METADATA``. Will accept ``[tT][rR][uU][eE]|1|[oO][nN]`` as "true" expressions.
+
+.. _dataverse.api.blocked.endpoints:
+
+dataverse.api.blocked.endpoints
++++++++++++++++++++++++++++++++
+
+A comma-separated list of API endpoints that should be blocked. A minimal example that blocks endpoints for security reasons:
+
+``./asadmin create-jvm-options '-Ddataverse.api.blocked.endpoints=api/admin,api/builtin-users'``
+
+Another example:
+
+``./asadmin create-jvm-options '-Ddataverse.api.blocked.endpoints=api/admin,api/builtin-users,api/datasets/:persistentId/versions/:versionId/files,api/files/:id'``
+
+Defaults to an empty string (no endpoints blocked), but, in almost all cases, should include at least ``admin, builtin-users`` as a security measure.
+
+For more information on API blocking, see :ref:`blocking-api-endpoints` in the Admin Guide.
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_API_BLOCKED_ENDPOINTS``.
+
+.. _dataverse.api.blocked.policy:
+
+dataverse.api.blocked.policy
+++++++++++++++++++++++++++++
+
+Specifies how to treat blocked API endpoints. Valid values are:
+
+- ``drop``: Blocked requests are dropped (default).
+- ``localhost-only``: Blocked requests are only allowed from localhost.
+- ``unblock-key``: Blocked requests are allowed if they include a valid unblock key.
+
+For example:
+
+``./asadmin create-jvm-options '-Ddataverse.api.blocked.policy=localhost-only'``
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_API_BLOCKED_POLICY``.
+
+.. note::
+   This setting will be ignored unless the :ref:`dataverse.api.blocked.endpoints` and, for the unblock-key policy, the :ref:`dataverse.api.blocked.key` are also set. Otherwise the deprecated :ref:`:BlockedApiPolicy` will be used
+
+.. _dataverse.api.blocked.key:
+
+dataverse.api.blocked.key
++++++++++++++++++++++++++
+
+When the blocked API policy is set to ``unblock-key``, this setting specifies the key that allows access to blocked endpoints. For example:
+
+``./asadmin create-jvm-options '-Ddataverse.api.blocked.key=your-secret-key-here'``
+
+**WARNING**:
+*Since the blocked API key is sensitive, you should treat it like a password.*
+*See* :ref:`secure-password-storage` *to learn about ways to safeguard it.*
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_API_BLOCKED_KEY`` (although you shouldn't use environment variables for sensitive information).
+
+.. note::
+   This setting will be ignored unless the :ref:`dataverse.api.blocked.policy` is set to ``unblock-key``.  Otherwise the deprecated :ref:`:BlockedApiKey` will be used
+
+
+.. _dataverse.ui.show-validity-label-when-published:
+
+dataverse.ui.show-validity-label-when-published
++++++++++++++++++++++++++++++++++++++++++++++++
+
+Even when you do not allow incomplete metadata to be saved in dataverse, some metadata may end up being incomplete, e.g., after making a metadata field mandatory. Datasets where that field is
+not filled out, become incomplete, and therefore can be labeled with the ``incomplete metadata`` label. By default, this label is only shown for draft datasets and published datasets that the
+user can edit. This option can be disabled by setting it to ``false`` where only draft datasets with incomplete metadata will have that label. When disabled, all published dataset will not have
+that label. Note that you need to reindex the datasets after changing the metadata definitions. Reindexing will update the labels and other dataset information according to the new situation.
+
+When enabled (by default), published datasets with incomplete metadata will have an ``incomplete metadata`` label attached to them, but only for the datasets that the user can edit.
+You can list these datasets, for example, with the validity of metadata filter shown in "My Data" page that can be turned on by enabling the :ref:`dataverse.ui.show-validity-filter` option.
+
+Defaults to ``true``.
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable
+``DATAVERSE_API_SHOW_LABEL_FOR_INCOMPLETE_WHEN_PUBLISHED``. Will accept ``[tT][rR][uU][eE]|1|[oO][nN]`` as "true" expressions.
+
+.. _dataverse.ui.show-curation-status-to-all:
+
+dataverse.ui.show-curation-status-to-all
+++++++++++++++++++++++++++++++++++++++++
+
+By default the curation status assigned to a draft dataset versioncan only be seen by those who can publish it. When this flag is true, anyone who can see the draft dataset can see the assigned status.
+These users will also get notifications/emails about changes to the status.
+See :ref:`:AllowedCurationLabels <:AllowedCurationLabels>` and the :doc:`/admin/dataverses-datasets` section for more information about curation status.
+
+Defaults to ``false``.
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable
+``DATAVERSE_API_SHOW_CURATION_STATUS_TO_ALL``. Will accept ``[tT][rR][uU][eE]|1|[oO][nN]`` as "true" expressions.
+
+
+.. _dataverse.signposting.level1-author-limit:
+
+dataverse.signposting.level1-author-limit
++++++++++++++++++++++++++++++++++++++++++
+
+See :ref:`discovery-sign-posting` for details.
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_SIGNPOSTING_LEVEL1_AUTHOR_LIMIT``.
+
+.. _dataverse.signposting.level1-item-limit:
+
+dataverse.signposting.level1-item-limit
++++++++++++++++++++++++++++++++++++++++
+
+See :ref:`discovery-sign-posting` for details.
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_SIGNPOSTING_LEVEL1_ITEM_LIMIT``.
+
+.. _systemEmail:
+.. _dataverse.mail.system-email:
+
+dataverse.mail.system-email
++++++++++++++++++++++++++++
+
+This is the email address that "system" emails are sent from such as password reset links, notifications, etc.
+It replaces the database setting :ref:`legacySystemEmail` since Dataverse 6.2.
+
+**WARNING**: Your Dataverse installation will not send mail without this setting in place.
+
+Note that only the email address is required, which you can supply without the ``<`` and ``>`` signs, but if you include the text, it's the way to customize the name of your support team, which appears in the "from" address in emails as well as in help text in the UI.
+If you don't include the text, the installation name (see :ref:`Branding Your Installation`) will appear in the "from" address.
+In case you want your system email address to of no-reply style, have a look at :ref:`dataverse.mail.support-email` setting, too.
+
+Please note that if you're having any trouble sending email, you can refer to "Troubleshooting" under :doc:`installation-main`.
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_MAIL_SYSTEM_EMAIL``.
+
+See also :ref:`smtp-config`.
+
+.. _dataverse.mail.support-email:
+
+dataverse.mail.support-email
+++++++++++++++++++++++++++++
+
+This provides an email address distinct from the :ref:`systemEmail` that will be used as the email address for Contact Forms and Feedback API.
+This address is used as the To address when the Contact form is launched from the Support entry in the top navigation bar and, if configured via :ref:`dataverse.mail.cc-support-on-contact-email`, as a CC address when the form is launched from a Dataverse/Dataset Contact button.
+This allows configuration of a no-reply email address for :ref:`systemEmail` while allowing feedback to go to/be cc'd to the support email address, which would normally accept replies.
+If not set, the :ref:`systemEmail` is used for the feedback API/contact form email.
+
+Note that only the email address is required, which you can supply without the ``<`` and ``>`` signs, but if you include the text, it's the way to customize the name of your support team, which appears in the "from" address in emails as well as in help text in the UI.
+If you don't include the text, the installation name (see :ref:`Branding Your Installation`) will appear in the "from" address.
+
+Also note that the support email address is used at the end of notification mails where it states; "contact us for support at", followed by the support mail address if configured and the system email otherwise.
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_MAIL_SUPPORT_EMAIL``.
+
+See also :ref:`smtp-config`.
+
+.. _dataverse.mail.cc-support-on-contact-email:
+
+dataverse.mail.cc-support-on-contact-email
+++++++++++++++++++++++++++++++++++++++++++
+
+If this boolean setting is true, the contact forms and feedback API will cc the system (``dataverse.mail.support-mail`` if set, ``dataverse.mail.system-email`` if not) when sending email to the collection, dataset, or datafile contacts.
+A CC line is added to the contact form when this setting is true so that users are aware that the cc will occur.
+The default is false.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_MAIL_CC_SUPPORT_ON_CONTACT_EMAIL``.
+
+See also :ref:`smtp-config`.
+
+.. _dataverse.mail.debug:
+
+dataverse.mail.debug
+++++++++++++++++++++
+
+When this boolean setting is true, sending an email will generate more verbose logging, enabling you to analyze mail delivery malfunctions.
+Defaults to ``false``.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_MAIL_DEBUG``.
+
+See also :ref:`smtp-config`.
+
+.. _dataverse.mail.mta:
+
+dataverse.mail.mta.*
+++++++++++++++++++++
+
+The following options allow you to configure a target Mail Transfer Agent (MTA) to be used for sending emails to users.
+Be advised: as the mail server connection (session) is cached once created, you need to restart Payara when applying configuration changes.
+
+All can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_MAIL_MTA_HOST``.
+(For environment variables: simply replace "." and "-" with "_" and write as all caps.)
+
+The following table describes the most important settings commonly used.
+
+.. list-table::
+    :widths: 15 60 25
+    :header-rows: 1
+    :align: left
+
+    * - Setting Key
+      - Description
+      - Default Value
+    * - ``dataverse.mail.mta.host``
+      - The SMTP server to connect to.
+      - *No default*
+    * - ``dataverse.mail.mta.port``
+      - The SMTP server port to connect to. (Common are ``25`` for plain, ``587`` for SSL, ``465`` for legacy SSL)
+      - ``25``
+    * - ``dataverse.mail.mta.ssl.enable``
+      - Enable if your mail provider uses SSL.
+      - ``false``
+    * - ``dataverse.mail.mta.auth``
+      - If ``true``, attempt to authenticate the user using the AUTH command.
+      - ``false``
+    * - ``dataverse.mail.mta.user``
+      - The username to use in an AUTH command.
+      - *No default*
+    * - ``dataverse.mail.mta.password``
+      - The password to use in an AUTH command. (Might be a token when using XOAUTH2 mechanism)
+      - *No default*
+    * - ``dataverse.mail.mta.allow-utf8-addresses``
+      - If set to ``true``, UTF-8 strings are allowed in message headers, e.g., in addresses.
+        This should only be set if the mail server also supports UTF-8.
+        (Quoted from `Jakarta Mail Javadoc <https://jakarta.ee/specifications/mail/2.1/apidocs/jakarta.mail/jakarta/mail/internet/package-summary>`_)
+        Setting to ``false`` will also make mail address validation in UI/API fail on UTF-8 chars.
+      - ``true``
+
+**WARNING**:
+*For security of your password use only safe ways to store and access it.*
+*See* :ref:`secure-password-storage` *to learn about your options.*
+
+Find below a list of even more options you can use to configure sending mails.
+Detailed description for every setting can be found in the table included within the `Jakarta Mail Documentation <https://eclipse-ee4j.github.io/angus-mail/docs/api/org.eclipse.angus.mail/org/eclipse/angus/mail/smtp/package-summary.html>`_.
+(Simply replace ``dataverse.mail.mta.`` with ``mail.smtp.``.)
+
+* Timeouts:
+    ``dataverse.mail.mta.connectiontimeout``,
+    ``dataverse.mail.mta.timeout``,
+    ``dataverse.mail.mta.writetimeout``
+* SSL/TLS:
+    ``dataverse.mail.mta.starttls.enable``,
+    ``dataverse.mail.mta.starttls.required``,
+    ``dataverse.mail.mta.ssl.checkserveridentity``,
+    ``dataverse.mail.mta.ssl.trust``,
+    ``dataverse.mail.mta.ssl.protocols``,
+    ``dataverse.mail.mta.ssl.ciphersuites``
+* Proxy Connection:
+    ``dataverse.mail.mta.proxy.host``,
+    ``dataverse.mail.mta.proxy.port``,
+    ``dataverse.mail.mta.proxy.user``,
+    ``dataverse.mail.mta.proxy.password``,
+    ``dataverse.mail.mta.socks.host``,
+    ``dataverse.mail.mta.socks.port``
+* SMTP EHLO command details:
+    ``dataverse.mail.mta.ehlo``,
+    ``dataverse.mail.mta.localhost``,
+    ``dataverse.mail.mta.localaddress``,
+    ``dataverse.mail.mta.localport``
+* Authentication details:
+    ``dataverse.mail.mta.auth.mechanisms``,
+    ``dataverse.mail.mta.auth.login.disable``,
+    ``dataverse.mail.mta.auth.plain.disable``,
+    ``dataverse.mail.mta.auth.digest-md5.disable``,
+    ``dataverse.mail.mta.auth.ntlm.disable``,
+    ``dataverse.mail.mta.auth.xoauth2.disable``,
+    ``dataverse.mail.mta.auth.ntlm.domain``,
+    ``dataverse.mail.mta.auth.ntlm.flag``,
+    ``dataverse.mail.mta.sasl.enable``,
+    ``dataverse.mail.mta.sasl.usecanonicalhostname``,
+    ``dataverse.mail.mta.sasl.mechanisms``,
+    ``dataverse.mail.mta.sasl.authorizationid``,
+    ``dataverse.mail.mta.sasl.realm``
+* Miscellaneous:
+    ``dataverse.mail.mta.allow8bitmime``,
+    ``dataverse.mail.mta.submitter``,
+    ``dataverse.mail.mta.dsn.notify``,
+    ``dataverse.mail.mta.dsn.ret``,
+    ``dataverse.mail.mta.sendpartial``,
+    ``dataverse.mail.mta.quitwait``,
+    ``dataverse.mail.mta.quitonsessionreject``,
+    ``dataverse.mail.mta.userset``,
+    ``dataverse.mail.mta.noop.strict``,
+    ``dataverse.mail.mta.mailextension``
+
+See also :ref:`smtp-config`.
+
+dataverse.ui.allow-review-for-incomplete
+++++++++++++++++++++++++++++++++++++++++
+
+Determines if dataset submitted via API with incomplete metadata (for later corrections) can be submitted for review
+from the UI.
+
+Defaults to ``false``.
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable
+``DATAVERSE_UI_ALLOW_REVIEW_FOR_INCOMPLETE``. Will accept ``[tT][rR][uU][eE]|1|[oO][nN]`` as "true" expressions.
+
+.. _dataverse.ui.show-validity-filter:
+
+dataverse.ui.show-validity-filter
++++++++++++++++++++++++++++++++++
+
+When enabled, the filter for validity of metadata is shown in "My Data" page.
+**Note:** When you wish to use this filter, you must reindex the datasets first, otherwise datasets with valid metadata
+will not be shown in the results.
+
+Defaults to ``false``.
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable
+``DATAVERSE_UI_SHOW_VALIDITY_FILTER``. Will accept ``[tT][rR][uU][eE]|1|[oO][nN]`` as "true" expressions.
+
+.. _dataverse.spi.exporters.directory:
+
+dataverse.spi.exporters.directory
++++++++++++++++++++++++++++++++++
+
+For some background, see :ref:`external-exporters` and :ref:`inventory-of-external-exporters`.
+
+This JVM option is used to configure the file system path where external exporter JARs should be loaded from. For example:
+
+``./asadmin create-jvm-options '-Ddataverse.spi.exporters.directory=/var/lib/dataverse/exporters'``
+
+If this value is set, Dataverse will examine all JARs in the specified directory and will use them to add new metadata export formats or (if the machine-readable name used in :ref:`export-dataset-metadata-api` is the same) replace built-in metatadata export formats.
+
+If this value is not set (the default), Dataverse will not load any external exporters.
+
+If you place a new JAR in this directory, you must restart Payara for Dataverse to load it.
+
+If the JAR is for an exporter that replaces built-in format, you must delete the cached exports and/or use a reExport API call (see :ref:`batch-exports-through-the-api`) for the new format to be visible for existing datasets.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SPI_EXPORTERS_DIRECTORY``.
+
+.. _dataverse.netcdf.geo-extract-s3-direct-upload:
+
+dataverse.netcdf.geo-extract-s3-direct-upload
++++++++++++++++++++++++++++++++++++++++++++++
+
+This setting was added to keep S3 direct upload lightweight. When that feature is enabled and you still want NetCDF and HDF5 files to go through metadata extraction of a Geospatial Bounding Box (see :ref:`netcdf-and-hdf5`), which requires the file to be downloaded from S3 in this scenario, make this setting true.
+
+See also :ref:`s3-direct-upload-features-disabled`.
+
+.. _dataverse.storageuse.disable-storageuse-increments:
+
+dataverse.storageuse.disable-storageuse-increments
+++++++++++++++++++++++++++++++++++++++++++++++++++
+
+This setting serves the role of an emergency "kill switch" that will disable maintaining the real time record of storage use for all the datasets and collections in the database. Because of the experimental nature of this feature (see :doc:`/admin/collectionquotas`) that hasn't been used in production setting as of this release, v6.1 this setting is provided in case these updates start causing database race conditions and conflicts on a busy server. 
+
+dataverse.auth.oidc.*
++++++++++++++++++++++
+
+Provision a single :doc:`OpenID Connect authentication provider <oidc>` using MicroProfile Config. You can find a list of
+all available options at :ref:`oidc-mpconfig`.
+
+.. _dataverse.files.guestbook-at-request:
+
+dataverse.files.guestbook-at-request
+++++++++++++++++++++++++++++++++++++
+
+This setting enables functionality to allow guestbooks to be displayed when a user requests access to a restricted data file(s) or when a file is downloaded (the historic default). Providing a true/false value for this setting enables the functionality and provides a global default. The behavior can also be changed at the collection level via the user interface and by a superuser for a give dataset using the API.
+
+See also :ref:`guestbook-at-request-api` in the API Guide, and .
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_FILES_GUESTBOOK_AT_REQUEST``.
+
+.. _dataverse.bagit.sourceorg.name:
+
+dataverse.bagit.sourceorg.name
+++++++++++++++++++++++++++++++
+
+The name for your institution that you'd like to appear in bag-info.txt. See :ref:`bag-info.txt`.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_BAGIT_SOURCEORG_NAME``.
+
+.. _dataverse.bagit.sourceorg.address:
+
+dataverse.bagit.sourceorg.address
++++++++++++++++++++++++++++++++++
+
+The mailing address for your institution that you'd like to appear in bag-info.txt. See :ref:`bag-info.txt`. The example in https://datatracker.ietf.org/doc/html/rfc8493 uses commas as separators: ``1 Main St., Cupertino, California, 11111``.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_BAGIT_SOURCEORG_ADDRESS``.
+
+.. _dataverse.bagit.sourceorg.email:
+
+dataverse.bagit.sourceorg.email
++++++++++++++++++++++++++++++++
+
+The email for your institution that you'd like to appear in bag-info.txt. See :ref:`bag-info.txt`.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_BAGIT_SOURCEORG_EMAIL``.
+
+.. _dataverse.files.globus-monitoring-server:
+
+dataverse.files.globus-monitoring-server
+++++++++++++++++++++++++++++++++++++++++
+
+This setting is required in conjunction with the ``globus-use-experimental-async-framework`` feature flag (see :ref:`feature-flags`). Setting it to true designates the Dataverse instance to serve as the dedicated polling server. It is needed so that the new framework can be used in a multi-node installation. 
+
+.. _dataverse.csl.common-styles:
+
+dataverse.csl.common-styles
++++++++++++++++++++++++++++
+
+This setting allows admins to highlight a few of the 1000+ CSL citation styles available from the dataset page. The value should be a comma-separated list of styles.
+These will be listed above the alphabetical list of all styles in the "View Styled Citations" pop-up.
+The default value when not set is "chicago-author-date, ieee". 
+
+.. _localcontexts:
+
+localcontexts.url
++++++++++++++++++
+
+.. note::
+   For more information about LocalContexts integration, see :doc:`/installation/localcontexts`.
+
+The URL for the Local Contexts Hub API.
+
+| Example: ``https://localcontextshub.org/``
+| The sandbox URL ``https://sandbox.localcontextshub.org/`` can be used for testing.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_LOCALCONTEXTS_URL``.
+
+localcontexts.api-key
++++++++++++++++++++++
+
+The API key for accessing the Local Contexts Hub.
+
+| Example: ``your_api_key_here``
+| It's recommended to use a password alias for this setting, as described in the :ref:`secure-password-storage` section.
+
+Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_LOCALCONTEXTS_API_KEY``.
+
+dataverse.search.services.directory
++++++++++++++++++++++++++++++++++++
+
+Experimental. See :doc:`/developers/search-services`.
+
+dataverse.search.default-service
+++++++++++++++++++++++++++++++++
+
+Experimental. See :doc:`/developers/search-services`.
+
+.. _dataverse.cors:
+
+CORS Settings
+-------------
+
+The following settings control Cross-Origin Resource Sharing (CORS) for your Dataverse installation.
+
+.. _dataverse.cors.origin:
+
+dataverse.cors.origin
++++++++++++++++++++++
+
+Allowed origins for CORS requests. The default with no value set is to not include CORS headers. However, if the deprecated :AllowCors setting is explicitly set to true the default is "\*" (all origins).
+When the :AllowsCors setting is not used, you must set this setting to "\*" or a list of origins to enable CORS headers.
+
+Multiple origins can be specified as a comma-separated list.
+
+Example:
+
+``./asadmin create-jvm-options '-Ddataverse.cors.origin=https://example.com,https://subdomain.example.com'``
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_CORS_ORIGIN``.
+
+.. _dataverse.cors.methods:
+
+dataverse.cors.methods
+++++++++++++++++++++++
+
+Allowed HTTP methods for CORS requests. The default when this setting is missing is "GET,POST,OPTIONS,PUT,DELETE".
+Multiple methods can be specified as a comma-separated list.
+
+Example:
+
+``./asadmin create-jvm-options '-Ddataverse.cors.methods=GET,POST,OPTIONS'``
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_CORS_METHODS``.
+
+.. _dataverse.cors.headers.allow:
+
+dataverse.cors.headers.allow
+++++++++++++++++++++++++++++
+
+Allowed headers for CORS requests. The default when this setting is missing is "Accept,Content-Type,X-Dataverse-key,Range".
+Multiple headers can be specified as a comma-separated list.
+
+Example:
+
+``./asadmin create-jvm-options '-Ddataverse.cors.headers.allow=Accept,Content-Type,X-Custom-Header'``
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_CORS_HEADERS_ALLOW``.
+
+.. _dataverse.cors.headers.expose:
+
+dataverse.cors.headers.expose
++++++++++++++++++++++++++++++
+
+Headers to expose in CORS responses. The default when this setting is missing is "Accept-Ranges,Content-Range,Content-Encoding".
+Multiple headers can be specified as a comma-separated list.
+
+Example:
+
+``./asadmin create-jvm-options '-Ddataverse.cors.headers.expose=Accept-Ranges,Content-Range,X-Custom-Header'``
+
+Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_CORS_HEADERS_EXPOSE``.
+
+.. _feature-flags:
+
+Feature Flags
+-------------
+
+Certain features might be deactivated because they are experimental and/or opt-in capabilities. If you want to enable these,
+please find all known feature flags below. Any of these flags can be activated using a boolean value
+(case-insensitive, one of "true", "1", "YES", "Y", "ON") for the setting.
+
+.. list-table::
+    :widths: 35 50 15
+    :header-rows: 1
+    :align: left
+
+    * - Flag Name
+      - Description
+      - Default status
+    * - api-session-auth
+      - Enables API authentication via session cookie (JSESSIONID). **Caution: Enabling this feature flag exposes the installation to CSRF risks!** We expect this feature flag to be temporary (only used by frontend developers, see `#9063 <https://github.com/IQSS/dataverse/issues/9063>`_) and for the feature to be removed in the future.
+      - ``Off``
+    * - api-bearer-auth
+      - Enables API authentication via Bearer Token.
+      - ``Off``
+    * - api-bearer-auth-provide-missing-claims
+      - Enables sending missing user claims in the request JSON provided during OIDC user registration, when these claims are not returned by the identity provider and are required for registration. This feature only works when the feature flag ``api-bearer-auth`` is also enabled. **Caution: Enabling this feature flag exposes the installation to potential user impersonation issues.**
+      - ``Off``
+    * - api-bearer-auth-handle-tos-acceptance-in-idp
+      - Specifies that Terms of Service acceptance is handled by the IdP, eliminating the need to include ToS acceptance boolean parameter (termsAccepted) in the OIDC user registration request body. This feature only works when the feature flag ``api-bearer-auth`` is also enabled.
+      - ``Off``
+    * - api-bearer-auth-use-builtin-user-on-id-match
+      - Allows the use of a built-in user account when an identity match is found during API bearer authentication. This feature enables automatic association of an incoming IdP identity with an existing built-in user account, bypassing the need for additional user registration steps. This feature only works when the feature flag ``api-bearer-auth`` is also enabled. **Caution: Enabling this flag could result in impersonation risks if (and only if) used with a misconfigured IdP.**
+      - ``Off``
+    * - api-bearer-auth-use-shib-user-on-id-match
+      - Allows the use of a Shibboleth user account when an identity match is found during API bearer authentication. This feature enables automatic association of an incoming IdP identity with an existing Shibboleth user account, bypassing the need for additional user registration steps. This feature only works when the feature flag ``api-bearer-auth`` is also enabled. **Caution: Enabling this flag could result in impersonation risks if (and only if) used with a misconfigured IdP.**
+      - ``Off``
+    * - api-bearer-auth-use-oauth-user-on-id-match
+      - Allows the use of an OAuth user account (GitHub, Google, or ORCID) when an identity match is found during API bearer authentication. This feature enables automatic association of an incoming IdP identity with an existing OAuth user account, bypassing the need for additional user registration steps. This feature only works when the feature flag ``api-bearer-auth`` is also enabled. **Caution: Enabling this flag could result in impersonation risks if (and only if) used with a misconfigured IdP.**
+      - ``Off``
+    * - avoid-expensive-solr-join
+      - Changes the way Solr queries are constructed for public content (published Collections, Datasets and Files). It removes a very expensive Solr join on all such documents, improving overall performance, especially for large instances under heavy load. Before this feature flag is enabled, the corresponding indexing feature (see next feature flag) must be turned on and a full reindex performed (otherwise public objects are not going to be shown in search results). See :doc:`/admin/solr-search-index`. 
+      - ``Off``
+    * - add-publicobject-solr-field
+      - Adds an extra boolean field `PublicObject_b:true` for public content (published Collections, Datasets and Files). Once reindexed with these fields, we can rely on it to remove a very expensive Solr join on all such documents in Solr queries, significantly improving overall performance (by enabling the feature flag above, `avoid-expensive-solr-join`). These two flags are separate so that an instance can reindex their holdings before enabling the optimization in searches, thus avoiding having their public objects temporarily disappear from search results while the reindexing is in progress. 
+      - ``Off``
+    * - reduce-solr-deletes
+      - Avoids deleting and recreating solr documents for dataset files when reindexing. 
+      - ``Off``
+    * - disable-return-to-author-reason
+      - Removes the reason field in the `Publish/Return To Author` dialog that was added as a required field in v6.2 and makes the reason an optional parameter in the :ref:`return-a-dataset` API call. 
+      - ``Off``
+    * - disable-dataset-thumbnail-autoselect
+      - Turns off automatic selection of a dataset thumbnail from image files in that dataset. When set to ``On``, a user can still manually pick a thumbnail image or upload a dedicated thumbnail image.
+      - ``Off``
+    * - globus-use-experimental-async-framework
+      - Activates a new experimental implementation of Globus polling of ongoing remote data transfers that does not rely on the instance staying up continuously for the duration of the transfers and saves the state information about Globus upload requests in the database. Added in v6.4; extended in v6.6 to cover download transfers, in addition to uploads. Affects :ref:`:GlobusPollingInterval`. Note that the JVM option :ref:`dataverse.files.globus-monitoring-server` described above must also be enabled on one (and only one, in a multi-node installation) Dataverse instance. 
+      - ``Off``
+    * - index-harvested-metadata-source
+      - Index the nickname or the source name (See the optional ``sourceName`` field in :ref:`create-a-harvesting-client`) of the harvesting client as the "metadata source" of harvested datasets and files. If enabled, the Metadata Source facet will show separate groupings of the content harvested from different sources (by harvesting client nickname or source name) instead of the default behavior where there is one "Harvested" grouping for all harvested content.
+      - ``Off``
+    * - enable-version-note
+      - Turns on the ability to add/view/edit/delete per-dataset-version notes intended to provide :ref:`provenance` information about why the dataset/version was created.  
+      - ``Off``
+
+**Note:** Feature flags can be set via any `supported MicroProfile Config API source`_, e.g. the environment variable
+``DATAVERSE_FEATURE_XXX`` (e.g. ``DATAVERSE_FEATURE_API_SESSION_AUTH=1``). These environment variables can be set in your shell before starting Payara. If you are using :doc:`Docker for development </container/dev-usage>`, you can set them in the `docker compose <https://docs.docker.com/compose/environment-variables/set-environment-variables/>`_ file.
+
+To check the status of feature flags via API, see :ref:`list-all-feature-flags` in the API Guide.
+
+.. _:ApplicationServerSettings:
+
+Application Server Settings
+---------------------------
+
+http.request-timeout-seconds
+++++++++++++++++++++++++++++
+
+To facilitate large file upload and download, the Dataverse Software installer bumps the Payara **server-config.network-config.protocols.protocol.http-listener-1.http.request-timeout-seconds** setting from its default 900 seconds (15 minutes) to 1800 (30 minutes). Should you wish to shorten or lengthen this window, issue for example:
+
+``./asadmin set server-config.network-config.protocols.protocol.http-listener-1.http.request-timeout-seconds=3600``
+
+and restart Payara to apply your change.
+
+.. _http.cookie-same-site-value:
+
+http.cookie-same-site-value
+++++++++++++++++++++++++++++
+
+See :ref:`samesite-cookie-attribute` for context.
+
+The Dataverse installer configures the Payara **server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-value** setting to "Lax". From `Payara's documentation <https://docs.payara.fish/community/docs/6.2024.6/Technical%20Documentation/Payara%20Server%20Documentation/General%20Administration/Administering%20HTTP%20Connectivity.html>`_, the other possible values are "Strict" or "None". To change this to "Strict", for example, you could run the following command...
+
+``./asadmin set server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-value=Strict``
+
+... and restart Payara to apply your change.
+
+.. _http.cookie-same-site-enabled:
+
+http.cookie-same-site-enabled
++++++++++++++++++++++++++++++
+
+See :ref:`samesite-cookie-attribute` for context.
+
+The Dataverse installer configures the Payara **server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-enabled** setting to true. To change this to false, you could run the following command...
+
+``./asadmin set server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-enabled=true``
+
+... and restart Payara to apply your change.
+
+mp.config.profile
++++++++++++++++++
+
+MicroProfile Config 2.0 defines the `concept of "profiles" <https://download.eclipse.org/microprofile/microprofile-config-2.0/microprofile-config-spec-2.0.html#configprofile>`_.
+They can be used to change configuration values by context. This is used in Dataverse to change some configuration
+defaults when used inside container context rather classic installations.
+
+As per the spec, you will need to set the configuration value ``mp.config.profile`` to ``ct`` as early as possible.
+This is best done with a system property:
+
+``./asadmin create-system-properties 'mp.config.profile=ct'``
+
+*Note: the* :doc:`../container/app-image` *uses an (overrideable) environment variable to activate this.*
+
+You might also create your own profiles and use these, please refer to the upstream documentation linked above.
+
+
+.. _database-settings:
+
+Database Settings
+-----------------
+
+These settings are stored in the ``setting`` database table but can be read and modified via the "admin" endpoint of the :doc:`/api/native-api` for easy scripting.
+
+The most commonly used configuration options are listed first.
+
+The pattern you will observe in curl examples below is that an HTTP ``PUT`` is used to add or modify a setting. If you perform an HTTP ``GET`` (the default when using curl), the output will contain the value of the setting, if it has been set. You can also do a ``GET`` of all settings with ``curl http://localhost:8080/api/admin/settings`` which you may want to pretty-print by piping the output through a tool such as jq by appending ``| jq .``. If you want to remove a setting, use an HTTP ``DELETE`` such as ``curl -X DELETE http://localhost:8080/api/admin/settings/:GuidesBaseUrl`` .
+
+.. _:BlockedApiPolicy:
+
+:BlockedApiPolicy (Deprecated)
+++++++++++++++++++++++++++++++
+
+.. note::
+   This setting is deprecated. Please use the JvmSetting :ref:`dataverse.api.blocked.policy` instead. This legacy setting will only be used if the newer JvmSettings are not set.
+
+``:BlockedApiPolicy`` affects access to the list of API endpoints defined in :ref:`:BlockedApiEndpoints`.
+
+Out of the box, ``localhost-only`` is the default policy, as mentioned in :ref:`blocking-api-endpoints`. The other valid options are the following.
+
+- localhost-only: Allow from localhost.
+- unblock-key: Require a key defined in :ref:`:BlockedApiKey`.
+- drop: Disallow the blocked endpoints completely.
+
+Below is an example of setting ``localhost-only``.
+
+``curl -X PUT -d localhost-only http://localhost:8080/api/admin/settings/:BlockedApiPolicy``
+
+.. _:BlockedApiEndpoints:
+
+:BlockedApiEndpoints (Deprecated)
++++++++++++++++++++++++++++++++++
+
+.. note::
+   This setting is deprecated. Please use the JvmSetting :ref:`dataverse.api.blocked.endpoints` instead. This legacy setting will only be used if the newer JvmSettings are not set. 
+
+A comma-separated list of API endpoints to be blocked. For a standard production installation, the installer blocks both "admin" and "builtin-users" by default per the security section above:
+
+``curl -X PUT -d "admin,builtin-users" http://localhost:8080/api/admin/settings/:BlockedApiEndpoints``
+
+See the :ref:`list-of-dataverse-apis` for lists of API endpoints.
+
+.. _:BlockedApiKey:
+
+:BlockedApiKey (Deprecated)
++++++++++++++++++++++++++++
+
+.. note::
+   This setting is deprecated. Please use the JvmSetting :ref:`dataverse.api.blocked.key` instead. This legacy setting will only be used if the newer JvmSettings are not set.
+
+``:BlockedApiKey`` is used in conjunction with :ref:`:BlockedApiEndpoints` and :ref:`:BlockedApiPolicy` and will not be enabled unless the policy is set to ``unblock-key`` as demonstrated below. Please note that the order is significant. You should set ``:BlockedApiKey`` first to prevent locking yourself out.
+
+``curl -X PUT -d s3kretKey http://localhost:8080/api/admin/settings/:BlockedApiKey``
+
+``curl -X PUT -d unblock-key http://localhost:8080/api/admin/settings/:BlockedApiPolicy``
+
+Now that ``:BlockedApiKey`` has been enabled, blocked APIs can be accessed using the header ``X-Dataverse-unblock-key: theKeyYouChoose`` or, less securely, the query parameter ``unblock-key=theKeyYouChose`` as in the examples below.
+
+``curl -H 'X-Dataverse-unblock-key:theKeyYouChoose' https://demo.dataverse.org/api/admin/settings``
+
+``curl https://demo.dataverse.org/api/admin/settings?unblock-key=theKeyYouChose``
+
+.. _BuiltinUsers.KEY:
+
+BuiltinUsers.KEY
+++++++++++++++++
+
+The key required to create users via API as documented at :doc:`/api/native-api`. Unlike other database settings, this one doesn't start with a colon.
+
+``curl -X PUT -d builtInS3kretKey http://localhost:8080/api/admin/settings/BuiltinUsers.KEY``
+
+:SearchApiRequiresToken
++++++++++++++++++++++++
+
+In Dataverse Software 4.7 and lower, the :doc:`/api/search` required an API token, but as of Dataverse Software 4.7.1 this is no longer the case. If you prefer the old behavior of requiring API tokens to use the Search API, set ``:SearchApiRequiresToken`` to ``true``.
+
+``curl -X PUT -d true http://localhost:8080/api/admin/settings/:SearchApiRequiresToken``
+
+.. _legacySystemEmail:
+
+:SystemEmail
+++++++++++++
+
+Please note that this setting is deprecated since Dataverse 6.2.
+It will be picked up for backward compatibility, but please migrate to usage of :ref:`dataverse.mail.system-email`.
+
+:HomePageCustomizationFile
+++++++++++++++++++++++++++
+
+See :ref:`Branding Your Installation` above.
+
+:LogoCustomizationFile
+++++++++++++++++++++++
+
+See :ref:`Branding Your Installation` above.
+
+:HeaderCustomizationFile
+++++++++++++++++++++++++
+
+See :ref:`Branding Your Installation` above.
+
+:DisableRootDataverseTheme
+++++++++++++++++++++++++++
+
+See :ref:`Branding Your Installation` above.
+
+:FooterCustomizationFile
+++++++++++++++++++++++++
+
+See :ref:`Branding Your Installation` above.
+
+:StyleCustomizationFile
++++++++++++++++++++++++
+
+See :ref:`Branding Your Installation` above.
+
+:WebAnalyticsCode
++++++++++++++++++
+
+See :ref:`Web-Analytics-Code` above.
+
+.. _:FooterCopyright:
+
+:FooterCopyright
+++++++++++++++++
+
+By default the footer says "Copyright Š [YYYY]" but you can add text after the year, as in the example below.
+
+``curl -X PUT -d ", Your Institution" http://localhost:8080/api/admin/settings/:FooterCopyright``
+
+.. _:DoiProvider:
+
+Legacy Single PID Provider: :DoiProvider
+++++++++++++++++++++++++++++++++++++++++
+
+As of this writing "DataCite" and "EZID" are the only valid options for production installations. Developers using
+Dataverse Software 4.10+ are welcome to use the keyword "FAKE" to configure a non-production installation with an
+non-resolving, in-code provider, which will basically short-circuit the DOI publishing process. ``:DoiProvider``
+is only needed if you are using DOI.
+
+``curl -X PUT -d DataCite http://localhost:8080/api/admin/settings/:DoiProvider``
+
+This setting relates to the ``:Protocol``, ``:Authority``, ``:Shoulder``, and
+``:IdentifierGenerationStyle`` database settings below as well as the following
+JVM options:
+
+- :ref:`dataverse.pid.datacite.mds-api-url`
+- :ref:`dataverse.pid.datacite.rest-api-url`
+- :ref:`dataverse.pid.datacite.username`
+- :ref:`dataverse.pid.datacite.password`
+
+.. _:Protocol:
+
+Legacy Single PID Provider: :Protocol
++++++++++++++++++++++++++++++++++++++
+
+As of this writing "doi","hdl", and "perma" are the only valid option for the protocol for a persistent ID.
+
+``curl -X PUT -d doi http://localhost:8080/api/admin/settings/:Protocol``
+
+.. _:Authority:
+
+Legacy Single PID Provider: :Authority
+++++++++++++++++++++++++++++++++++++++
+
+Use the authority assigned to you by your DoiProvider or HandleProvider, or your choice if using PermaLinks.
+
+Please note that a DOI or Handle authority cannot have a slash ("/") in it (slash is also not recommended for PermaLink authorities).
+
+``curl -X PUT -d 10.xxxx http://localhost:8080/api/admin/settings/:Authority``
+
+.. _:Shoulder:
+
+Legacy Single PID Provider: :Shoulder
++++++++++++++++++++++++++++++++++++++
+
+The shoulder is used with DOIs and PermaLinks. Out of the box, the shoulder is set to "FK2/" but this is for testing only! When you apply for your DOI authority/namespace, you may have been assigned a shoulder. The following is only an example and a trailing slash is optional.
+
+``curl -X PUT -d "MyShoulder/" http://localhost:8080/api/admin/settings/:Shoulder``
+
+.. _:IdentifierGenerationStyle:
+
+Legacy Single PID Provider: :IdentifierGenerationStyle
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+By default, the Dataverse Software generates a random 6 character string,
+pre-pended by the Shoulder if set, to use as the identifier for a Dataset.
+Set this to ``storedProcGenerated`` to generate instead a custom *unique*
+identifier (again pre-pended by the Shoulder if set) through a database
+stored procedure or function (the assumed default setting is ``randomString``).
+In addition to this setting, a stored procedure or function must be created in
+the database.
+
+As a first example, the script below (downloadable
+:download:`here </_static/util/createsequence.sql>`) produces
+sequential numerical values. You may need to make some changes to suit your
+system setup, see the comments for more information:
+
+.. literalinclude:: ../_static/util/createsequence.sql
+   :language: plpgsql
+
+As a second example, the script below (downloadable
+:download:`here </_static/util/identifier_from_timestamp.sql>`) produces
+sequential 8 character identifiers from a base36 representation of current
+timestamp.
+
+.. literalinclude:: ../_static/util/identifier_from_timestamp.sql
+   :language: plpgsql
+
+Note that the SQL in these examples scripts is Postgres-specific.
+If necessary, it can be reimplemented in any other SQL flavor - the standard
+JPA code in the application simply expects the database to have a saved
+function ("stored procedure") named ``generateIdentifierFromStoredProcedure()``
+returning a single ``varchar`` argument.
+
+Please note that ``:IdentifierGenerationStyle`` also plays a role for the
+"identifier" for files. See the section on :ref:`:DataFilePIDFormat` below for
+more details.
+
+.. _:DataFilePIDFormat:
+
+Legacy Single PID Provider: :DataFilePIDFormat
+++++++++++++++++++++++++++++++++++++++++++++++
+
+This setting controls the way that the "identifier" component of a file's
+persistent identifier (PID) relates to the PID of its "parent" dataset.
+
+By default the identifier for a file is dependent on its parent dataset.
+For example, if the identifier of a dataset is "TJCLKP", the identifier for
+a file within that dataset will consist of the parent dataset's identifier
+followed by a slash ("/"), followed by a random 6 character string,
+yielding "TJCLKP/MLGWJO". Identifiers in this format are what you should
+expect if you leave ``:DataFilePIDFormat`` undefined or set it to
+``DEPENDENT`` and have not changed the ``:IdentifierGenerationStyle``
+setting from its default.
+
+Alternatively, the identifier for File PIDs can be configured to be
+independent of Dataset PIDs using the setting ``INDEPENDENT``.
+In this case, file PIDs will not contain the PIDs of their parent datasets,
+and their PIDs will be generated the exact same way that datasets' PIDs are,
+based on the ``:IdentifierGenerationStyle`` setting described above
+(random 6 character strings or custom unique identifiers through a stored
+procedure, pre-pended by any shoulder).
+
+The chart below shows examples from each possible combination of parameters
+from the two settings. ``:IdentifierGenerationStyle`` can be either
+``randomString`` (the default) or ``storedProcGenerated`` and
+``:DataFilePIDFormat`` can be either ``DEPENDENT`` (the default) or
+``INDEPENDENT``. In the examples below the "identifier" for the dataset is
+"TJCLKP" for ``randomString`` and "100001" for ``storedProcGenerated`` (when
+using sequential numerical values, as described in
+:ref:`:IdentifierGenerationStyle` above), or "krby26qt" for
+``storedProcGenerated`` (when using base36 timestamps, as described in
+:ref:`:IdentifierGenerationStyle` above).
+
++-----------------+---------------+----------------------+---------------------+
+|                 | randomString  | storedProcGenerated  | storedProcGenerated |
+|                 |               |                      |                     |
+|                 |               | (sequential numbers) | (base36 timestamps) |
++=================+===============+======================+=====================+
+| **DEPENDENT**   | TJCLKP/MLGWJO | 100001/1             | krby26qt/1          |
++-----------------+---------------+----------------------+---------------------+
+| **INDEPENDENT** | MLGWJO        | 100002               | krby27pz            |
++-----------------+---------------+----------------------+---------------------+
+
+As seen above, in cases where ``:IdentifierGenerationStyle`` is set to
+``storedProcGenerated`` and ``:DataFilePIDFormat`` is set to ``DEPENDENT``,
+each file within a dataset will be assigned a number *within* that dataset
+starting with "1".
+
+Otherwise, if ``:DataFilePIDFormat`` is set to ``INDEPENDENT``, each file
+within the dataset is assigned with a new PID which is the next available
+identifier provided from the database stored procedure. In our example:
+"100002" when using sequential numbers or "krby27pz" when using base36
+timestamps.
+
+.. _:FilePIDsEnabled:
+
+:FilePIDsEnabled
+++++++++++++++++
+
+Toggles publishing of file-level PIDs for the entire installation. By default this setting is absent and Dataverse Software assumes it to be false. If enabled, the registration will be performed asynchronously (in the background) during publishing of a dataset.
+
+It is possible to override the installation-wide setting for specific collections, see :ref:`:AllowEnablingFilePIDsPerCollection <:AllowEnablingFilePIDsPerCollection>`. For example, registration of PIDs for files can be enabled in a specific collection when it is disabled instance-wide. Or it can be disabled in specific collections where it is enabled by default. See :ref:`collection-attributes-api` for details. 
+
+To enable file-level PIDs for the entire installation::
+
+``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:FilePIDsEnabled``
+
+
+If you don't want to register file-based PIDs for your entire installation::
+
+``curl -X PUT -d 'false' http://localhost:8080/api/admin/settings/:FilePIDsEnabled``
+
+.. _:AllowEnablingFilePIDsPerCollection:
+
+:AllowEnablingFilePIDsPerCollection
++++++++++++++++++++++++++++++++++++
+
+Toggles whether superusers can change the File PIDs policy per collection. By default this setting is absent and Dataverse Software assumes it to be false.
+
+For example, if this setting is true, registration of PIDs for files can be enabled in a specific collection when it is disabled instance-wide. Or it can be disabled in specific collections where it is enabled by default. See :ref:`collection-attributes-api` for details. 
+
+To enable setting file-level PIDs per collection::
+
+``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:AllowEnablingFilePIDsPerCollection``
+
+
+When :AllowEnablingFilePIDsPerCollection is true, setting File PIDs to be enabled/disabled for a given collection can be done via the Native API - see :ref:`collection-attributes-api` in the Native API Guide.
+
+.. _:IndependentHandleService:
+
+Legacy Single PID Provider: :IndependentHandleService
++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Specific for Handle PIDs. Set this setting to true if you want to use a Handle service which is setup to work 'independently' (No communication with the Global Handle Registry).
+By default this setting is absent and the Dataverse Software assumes it to be false.
+
+``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:IndependentHandleService``
+
+.. _:HandleAuthHandle:
+
+Legacy Single PID Provider: :HandleAuthHandle
++++++++++++++++++++++++++++++++++++++++++++++
+
+Specific for Handle PIDs. Set this setting to <prefix>/<suffix> to be used on a global handle service when the public key is NOT stored in the default handle.
+By default this setting is absent and the Dataverse Software assumes it to be not set. If the public key for instance is stored in handle: 21.T12996/USER01.
+For this handle the prefix is '21.T12996' and the suffix is 'USER01'. The command to execute is then:
+
+``curl -X PUT -d '21.T12996/USER01' http://localhost:8080/api/admin/settings/:HandleAuthHandle``
+
+.. _:FileValidationOnPublishEnabled:
+
+:FileValidationOnPublishEnabled
++++++++++++++++++++++++++++++++
+
+Toggles validation of the physical files in the dataset when it's published, by recalculating the checksums and comparing against the values stored in the DataFile table. By default this setting is absent and the Dataverse Software assumes it to be true. If enabled, the validation will be performed asynchronously, similarly to how we handle assigning persistent identifiers to datafiles, with the dataset locked for the duration of the publishing process. 
+
+If you don't want the datafiles to be validated on publish, set:
+
+``curl -X PUT -d 'false' http://localhost:8080/api/admin/settings/:FileValidationOnPublishEnabled``
+
+.. _:ApplicationTermsOfUse:
+
+:ApplicationTermsOfUse
+++++++++++++++++++++++
+
+Application Terms of Use (called "General Terms of Use" in the UI) are shown to the user when they sign up for an account. Some HTML tags are supported. For a list, see :ref:`supported-html-tags` in the User Guide.
+
+You can set terms like this:
+
+``curl -X PUT http://localhost:8080/api/admin/settings/:ApplicationTermsOfUse --upload-file /tmp/apptou.html``
+
+To delete terms:
+
+``curl -X DELETE http://localhost:8080/api/admin/settings/:ApplicationTermsOfUse``
+
+If :ref:`i18n` is enabled, you can set the terms per language. To set terms for a specific language ("fr", for example):
+
+``curl -X PUT http://localhost:8080/api/admin/settings/:ApplicationTermsOfUse/lang/fr --upload-file /tmp/apptou_fr.html``
+
+To delete terms for a specific language ("fr", for example):
+
+``curl -X DELETE http://localhost:8080/api/admin/settings/:ApplicationTermsOfUse/lang/fr``
+
+To retrieve the values, see :ref:`api-get-app-tou` in the API Guide.
+
+:ApplicationPrivacyPolicyUrl
+++++++++++++++++++++++++++++
+
+Specify a URL where users can read your Privacy Policy, linked from the bottom of the page.
+
+``curl -X PUT -d https://dataverse.org/best-practices/harvard-dataverse-privacy-policy http://localhost:8080/api/admin/settings/:ApplicationPrivacyPolicyUrl``
+
+:ApiTermsOfUse
+++++++++++++++
+
+Specify a URL where users can read your API Terms of Use.
+API users can retrieve this URL from the SWORD Service Document or the :ref:`info` section of our :doc:`/api/native-api` documentation.
+
+``curl -X PUT -d https://dataverse.org/best-practices/harvard-api-tou http://localhost:8080/api/admin/settings/:ApiTermsOfUse``
+
+
+.. _:ExcludeEmailFromExport:
+
+:ExcludeEmailFromExport
++++++++++++++++++++++++
+
+See also :ref:`Privacy Considerations <PrivacyConsiderations>` above.
+
+Set ``:ExcludeEmailFromExport`` to prevent email addresses for contacts from being exposed in XML or JSON representations of dataset and Dataverse collection metadata. For a list exported formats such as DDI, see the :doc:`/admin/metadataexport` section of the Admin Guide.
+
+``curl -X PUT -d true http://localhost:8080/api/admin/settings/:ExcludeEmailFromExport``
+
+Note: After making a change to this setting, a reExportAll needs to be run before the changes will be reflected in the exports:
+
+``curl http://localhost:8080/api/admin/metadata/reExportAll``
+
+This will *force* a re-export of every published, local dataset, regardless of whether it has already been exported or not.
+
+The call returns a status message informing the administrator, that the process has been launched (``{"status":"WORKFLOW_IN_PROGRESS"}``). The administrator can check the progress of the process via log files: ``[Payara directory]/glassfish/domains/domain1/logs/export_[time stamp].log``.
+
+.. _:NavbarAboutUrl:
+
+:NavbarAboutUrl
++++++++++++++++
+
+Set ``:NavbarAboutUrl`` to a fully-qualified URL which will be used for the "About" link in the navbar.
+
+Note: The "About" link will not appear in the navbar until this option is set.
+
+``curl -X PUT -d http://dataverse.example.edu http://localhost:8080/api/admin/settings/:NavbarAboutUrl``
+
+.. _:NavbarGuidesUrl:
+
+:NavbarGuidesUrl
+++++++++++++++++
+
+Set ``:NavbarGuidesUrl`` to a fully-qualified URL which will be used for the "User Guide" link in the navbar.
+
+Note: by default, the URL is composed from the settings ``:GuidesBaseUrl`` and ``:GuidesVersion`` below.
+
+``curl -X PUT -d http://example.edu/fancy-dataverse-guide http://localhost:8080/api/admin/settings/:NavbarGuidesUrl``
+
+.. _:GuidesBaseUrl:
+
+:GuidesBaseUrl
+++++++++++++++
+
+Set ``:GuidesBaseUrl`` to override the default value "https://guides.dataverse.org". If you are interested in writing your own version of the guides, you may find the :doc:`/contributor/documentation` section of the Contributor Guide helpful.
+
+``curl -X PUT -d http://dataverse.example.edu http://localhost:8080/api/admin/settings/:GuidesBaseUrl``
+
+.. _:GuidesVersion:
+
+:GuidesVersion
+++++++++++++++
+
+Set ``:GuidesVersion`` to override the version number in the URL of guides. For example, rather than http://guides.dataverse.org/en/4.6/user/account.html the version is overriden to http://guides.dataverse.org/en/1234-new-feature/user/account.html in the example below:
+
+``curl -X PUT -d 1234-new-feature http://localhost:8080/api/admin/settings/:GuidesVersion``
+
+.. _:NavbarSupportUrl:
+
+:NavbarSupportUrl
++++++++++++++++++
+Set ``:NavbarSupportUrl`` to a fully-qualified URL which will be used for the "Support" link in the navbar.
+
+Note that this will override the default behaviour for the "Support" menu option, which is to display the Dataverse collection 'feedback' dialog.
+
+``curl -X PUT -d https://dataverse.example.edu/supportpage.html http://localhost:8080/api/admin/settings/:NavbarSupportUrl``
+
+:MetricsUrl
++++++++++++
+
+Make the metrics component on the root Dataverse collection a clickable link to a website where you present metrics on your Dataverse installation, perhaps one of the community-supported tools mentioned in the :doc:`/admin/reporting-tools-and-queries` section of the Admin Guide.
+
+``curl -X PUT -d https://metrics.dataverse.example.edu http://localhost:8080/api/admin/settings/:MetricsUrl``
+
+.. _:MaxFileUploadSizeInBytes:
+
+:MaxFileUploadSizeInBytes
++++++++++++++++++++++++++
+
+This setting controls the maximum size of uploaded files.
+- To have one limit for all stores, set `MaxFileUploadSizeInBytes` to "2147483648", for example, to limit the size of files uploaded to 2 GB:
+
+``curl -X PUT -d 2147483648 http://localhost:8080/api/admin/settings/:MaxFileUploadSizeInBytes``
+
+- To have limits per store with an optional default, use a serialized json object for the value of `MaxFileUploadSizeInBytes` with an entry per store, as in the following example, which maintains a 2 GB default and adds higher limits for stores with ids "fileOne" and "s3".
+
+``curl -X PUT -d '{"default":"2147483648","fileOne":"4000000000","s3":"8000000000"}' http://localhost:8080/api/admin/settings/:MaxFileUploadSizeInBytes``
+
+Notes:
+
+- For SWORD, this size is limited by the Java Integer.MAX_VALUE of 2,147,483,647. (see: https://github.com/IQSS/dataverse/issues/2169)
+
+- If the MaxFileUploadSizeInBytes is NOT set, uploads, including SWORD may be of unlimited size.
+
+- For larger file upload sizes, you may need to configure your reverse proxy timeout. If using apache2 (httpd) with Shibboleth, add a timeout to the ProxyPass defined in etc/httpd/conf.d/ssl.conf (which is described in the :doc:`/installation/shibboleth` setup).
+
+:MultipleUploadFilesLimit
++++++++++++++++++++++++++
+
+This setting controls the number of files that can be uploaded through the UI at once. The default is 1000. It should be set to 1 or higher since 0 has no effect. To limit the number of files in a zip file, see ``:ZipUploadFilesLimit``.
+
+``curl -X PUT -d 500 http://localhost:8080/api/admin/settings/:MultipleUploadFilesLimit``
+
+.. _:ZipDownloadLimit:
+
+:ZipDownloadLimit
++++++++++++++++++
+
+For performance reasons, your Dataverse installation will only allow creation of zip files up to 100 MB, but the limit can be increased. Here's an example of raising the limit to 1 GB:
+
+``curl -X PUT -d 1000000000 http://localhost:8080/api/admin/settings/:ZipDownloadLimit``
+
+In the UI, users trying to download a zip file larger than the Dataverse installation's :ZipDownloadLimit will receive messaging that the zip file is too large, and the user will be presented with alternate access options. 
+
+:TabularIngestSizeLimit
++++++++++++++++++++++++
+
+Threshold in bytes for limiting whether or not "ingest" it attempted for tabular files (which can be resource intensive). For example, with the below in place, files greater than 2 GB in size will not go through the ingest process:
+
+``curl -X PUT -d 2000000000 http://localhost:8080/api/admin/settings/:TabularIngestSizeLimit``
+
+(You can set this value to 0 to prevent files from being ingested at all.)
 
 You can override this global setting on a per-format basis for the following formats:
 
-- DTA
-- POR
-- SAV
-- Rdata
-- CSV
-- XLSX
+- DTA
+- POR
+- SAV
+- Rdata
+- CSV
+- XLSX (in lower-case)
+
+For example :
+
+* if you want your Dataverse installation to not attempt to ingest Rdata files larger than 1 MB, use this setting:
+
+``curl -X PUT -d 1000000 http://localhost:8080/api/admin/settings/:TabularIngestSizeLimit:Rdata``
+
+* if you want your Dataverse installation to not attempt to ingest XLSX files at all, use this setting:
+
+``curl -X PUT -d 0 http://localhost:8080/api/admin/settings/:TabularIngestSizeLimit:xlsx``
+
+:ZipUploadFilesLimit
+++++++++++++++++++++
+
+Limit the number of files in a zip that your Dataverse installation will accept. In the absence of this setting, your Dataverse instalation defaults to a limit of 1,000 files per zipfile.
+
+``curl -X PUT -d 2048 http://localhost:8080/api/admin/settings/:ZipUploadFilesLimit``
+
+.. _:SolrHostColonPort:
+
+:SolrHostColonPort
+++++++++++++++++++
+
+By default your Dataverse installation will attempt to connect to Solr on port 8983 on localhost. Use this setting to change the hostname or port. You must restart Payara after making this change.
+
+``curl -X PUT -d localhost:8983 http://localhost:8080/api/admin/settings/:SolrHostColonPort``
+
+**Note:** instead of using a database setting, you could alternatively use JVM settings like :ref:`dataverse.solr.host`.
+
+:SolrFullTextIndexing
++++++++++++++++++++++
+
+Whether or not to index the content of files such as PDFs. The default is false.
+
+``curl -X PUT -d true http://localhost:8080/api/admin/settings/:SolrFullTextIndexing``
+
+:SolrMaxFileSizeForFullTextIndexing
++++++++++++++++++++++++++++++++++++
+
+If ``:SolrFullTextIndexing`` is set to true, the content of files of any size will be indexed. To set a limit in bytes for which files to index in this way:
+
+``curl -X PUT -d 314572800 http://localhost:8080/api/admin/settings/:SolrMaxFileSizeForFullTextIndexing``
+
+
+.. _:DisableSolrFacets:
+
+:DisableSolrFacets
+++++++++++++++++++
+
+Setting this to ``true`` will make the collection ("dataverse") page start showing search results without the usual search facets on the left side of the page. A message will be shown in that column informing the users that facets are temporarily unavailable. Generating the facets may in some cases be more resource-intensive for Solr than the main search results themselves, so applying this measure will significantly reduce the load on the search engine when its performance becomes an issue.
+
+This setting can be used in combination with the "circuit breaker" mechanism on the Solr side (see the "Installing Solr" section of the Installation Prerequisites guide). An admin can choose to enable it, or even create an automated system for enabling it in response to Solr beginning to drop incoming requests with the HTTP code 503.
+
+To enable the setting::
+
+  curl -X PUT -d true "http://localhost:8080/api/admin/settings/:DisableSolrFacets"
+
+
+:DisableSolrFacetsForGuestUsers
++++++++++++++++++++++++++++++++
+
+Similar to the above, but will disable the facets for Guest (unauthenticated) users only. 
+
+:DisableSolrFacetsWithoutJsession
++++++++++++++++++++++++++++++++++
+
+Same idea as with the 2 settings above. For the purposes of this setting, a request is considered "anonymous", if it came in without the JSESSION cookie supplied. A UI user who is browsing the holdings without logging in will have a valid JSESSION cookie, tied to a guest session. The main purpose of this setting is to hide the facets from bots, scripted crawlers and such (most of which - though not all - do not use cookies). Not letting the bots anywhere near the facets can serve a dual purpose on a busy instance experiencing problems with such abuse - some CPU cycles and resources can be saved by not having to generate the facets. And, even more importantly, it can prevent bots from attempting to crawl the facet trees, which has a potential for multiplying the service load. 
+
+.. _:DisableUncheckedTypesFacet:
+
+:DisableUncheckedTypesFacet
++++++++++++++++++++++++++++
+
+Another option for reducing the load on solr on a busy instance. Rather than disabling all the search facets, this setting affects only one - the facet on the upper left of the collection page, where users can select the type of objects to search - Collections ("Dataverses"), Datasets and/or Files. With this option set to true, the numbers of results will only be shown for the types actually  selected (i.e. only for the search results currently shown to the user). This minor feature - being able to tell the user how many files (for example) they *would* find, *if* they chose to search for files, by clicking the Files facet - essentially doubles the expense of running the search. That may still be negligible on an instance with lighter holdings, but can make a significant difference for a large and heavily used archive.  
+
+.. _:SignUpUrl:
+
+:SignUpUrl
+++++++++++
+
+The relative path URL to which users will be sent for sign up. The default setting is below.
+
+``curl -X PUT -d '/dataverseuser.xhtml?editMode=CREATE' http://localhost:8080/api/admin/settings/:SignUpUrl``
+
+:LoginSessionTimeout
+++++++++++++++++++++
+
+Session timeout (in minutes) for logged-in users. The default is 8 hours (480 minutes). For the anonymous user sessions, the timeout is set to the default value, configured in the web.xml file of the Dataverse installation.
+
+In the example below we reduce the timeout to 4 hours:
+
+``curl -X PUT -d 240 http://localhost:8080/api/admin/settings/:LoginSessionTimeout``
+
+.. _:DatasetPublishPopupCustomText:
+
+:DatasetPublishPopupCustomText
+++++++++++++++++++++++++++++++
+
+Set custom text a user will view when publishing a dataset. Note that this text is exposed via the "Info" endpoint of the :doc:`/api/native-api`.
+
+``curl -X PUT -d "Deposit License Requirements" http://localhost:8080/api/admin/settings/:DatasetPublishPopupCustomText``
+
+If you have a long text string, you can upload it as a file as in the example below.
+
+``curl -X PUT --upload-file /tmp/long.txt http://localhost:8080/api/admin/settings/:DatasetPublishPopupCustomText``
+
+:DatasetPublishPopupCustomTextOnAllVersions
++++++++++++++++++++++++++++++++++++++++++++
+
+Set whether a user will see the custom text when publishing all versions of a dataset
+
+``curl -X PUT -d true http://localhost:8080/api/admin/settings/:DatasetPublishPopupCustomTextOnAllVersions``
+
+:SearchHighlightFragmentSize
+++++++++++++++++++++++++++++
+
+Set ``:SearchHighlightFragmentSize`` to override the default value of 100 from https://wiki.apache.org/solr/HighlightingParameters#hl.fragsize . In practice, a value of "320" seemed to fix the issue at https://github.com/IQSS/dataverse/issues/2191
+
+``curl -X PUT -d 320 http://localhost:8080/api/admin/settings/:SearchHighlightFragmentSize``
+
+:ScrubMigrationData
++++++++++++++++++++
+
+Allow for migration of non-conformant data (especially dates) from Dataverse Software 3.x to Dataverse Software 4.x
+
+:MinutesUntilConfirmEmailTokenExpires
++++++++++++++++++++++++++++++++++++++
+
+The duration in minutes before "Confirm Email" URLs expire. The default is 1440 minutes (24 hours).  See also the :doc:`/admin/user-administration` section of our Admin Guide.
+
+.. _conf-default-auth-provider:
+
+:DefaultAuthProvider
+++++++++++++++++++++
+
+If you have enabled Shibboleth and/or one or more OAuth providers, you may wish to make one of these authentication providers the default when users visit the Log In page. If unset, this will default to ``builtin`` but these valid options (depending if you've done the setup described in the :doc:`shibboleth` or :doc:`oauth2` sections) are:
+
+- ``builtin``
+- ``shib``
+- ``orcid``
+- ``github``
+- ``google``
+
+Here is an example of setting the default auth provider back to ``builtin``:
+
+``curl -X PUT -d builtin http://localhost:8080/api/admin/settings/:DefaultAuthProvider``
+
+.. _conf-allow-signup:
+
+:AllowSignUp
+++++++++++++
+
+Set to false to disallow local accounts from being created. See also the sections on :doc:`shibboleth` and :doc:`oauth2`.
+
+``curl -X PUT -d 'false' http://localhost:8080/api/admin/settings/:AllowSignUp``
+
+.. _:AllowRemoteAuthSignUp:
+
+:AllowRemoteAuthSignUp
+++++++++++++++++++++++
+
+This is a **compound** setting that enables or disables sign up for new accounts for individual OAuth2 authentication methods (such as Orcid, Google and GitHub). This way it is possible to continue allowing logins via an OAuth2 provider for already existing accounts, without letting new users create accounts with this method.
+
+By default, if the setting is not present, all configured OAuth sign ups are allowed. If the setting is present, but the value for this specific method is not specified, it is assumed that the sign ups are allowed for it.
+
+Examples:
+
+This curl command...
+
+``curl -X PUT -d '{"default":"false"}' http://localhost:8080/api/admin/settings/:AllowRemoteAuthSignUp``
+
+...disables all OAuth sign ups.
+
+This curl command...
+
+``curl -X PUT -d '{"default":"true","google":"false"}' http://localhost:8080/api/admin/settings/:AllowRemoteAuthSignUp``
+
+...keeps sign ups open for all the OAuth login providers except google. (That said, note that the ``"default":"true"`` part in this example is redundant, since it would default to true anyway for all the methods other than google.)
+
+See also :doc:`oauth2`.
+
+.. _:FileFixityChecksumAlgorithm:
+
+:FileFixityChecksumAlgorithm
+++++++++++++++++++++++++++++
+
+The Dataverse Software calculates checksums for uploaded files so that users can determine if their file was corrupted via upload or download. This is sometimes called "file fixity": https://en.wikipedia.org/wiki/File_Fixity
+
+The default checksum algorithm used is MD5 and should be sufficient for establishing file fixity. "SHA-1", "SHA-256" and "SHA-512" are alternate values for this setting. For example:
+
+``curl -X PUT -d 'SHA-512' http://localhost:8080/api/admin/settings/:FileFixityChecksumAlgorithm``
+
+To update the algorithm used for existing files, see :ref:`UpdateChecksums`
+
+The fixity checksum algorithm in use can be discovered via API. See :ref:`get-fixity-algorithm` in the API Guide.
+
+.. _:PVMinLength:
+
+:PVMinLength
+++++++++++++
+
+Password policy setting for builtin user accounts: a password's minimum valid character length. The default is 6.
+
+``curl -X PUT -d 6 http://localhost:8080/api/admin/settings/:PVMinLength``
+
+
+.. _:PVMaxLength:
+
+:PVMaxLength
+++++++++++++
+
+Password policy setting for builtin user accounts: a password's maximum valid character length.
+
+``curl -X PUT -d 0 http://localhost:8080/api/admin/settings/:PVMaxLength``
+
+
+.. _:PVNumberOfConsecutiveDigitsAllowed:
+
+:PVNumberOfConsecutiveDigitsAllowed
++++++++++++++++++++++++++++++++++++
+
+By default, passwords can contain an unlimited number of digits in a row. However, if your password policy specifies otherwise (e.g. only four digits in a row are allowed), then you can issue the following curl command to set the number of consecutive digits allowed (this example uses 4):
+
+``curl -X PUT -d 4 http://localhost:8080/api/admin/settings/:PVNumberOfConsecutiveDigitsAllowed``
+
+.. _:PVCharacterRules:
+
+:PVCharacterRules
++++++++++++++++++
+
+Password policy setting for builtinuser accounts: dictates which types of characters can be required in a password. This setting goes hand-in-hand with :ref:`:PVNumberOfCharacteristics`. The default setting contains two rules:
+
+- one letter
+- one digit
+
+The default setting above is equivalent to specifying "Alphabetical:1,Digit:1".
+
+By specifying "UpperCase:1,LowerCase:1,Digit:1,Special:1", for example, you can put the following four rules in place instead:
+
+- one uppercase letter
+- one lowercase letter
+- one digit
+- one special character
+
+If you have implemented 4 different character rules in this way, you can also optionally increase ``:PVNumberOfCharacteristics`` to as high as 4. However, please note that ``:PVNumberOfCharacteristics`` cannot be set to a number higher than the number of character rules or you will see the error, "Number of characteristics must be <= to the number of rules".
+
+Also note that the Alphabetical setting should not be used in tandem with the UpperCase or LowerCase settings. The Alphabetical setting encompasses both of those more specific settings, so using it with them will cause your password policy to be unnecessarily confusing, and potentially easier to bypass.
+
+``curl -X PUT -d 'UpperCase:1,LowerCase:1,Digit:1,Special:1' http://localhost:8080/api/admin/settings/:PVCharacterRules``
+
+``curl -X PUT -d 3 http://localhost:8080/api/admin/settings/:PVNumberOfCharacteristics``
+
+.. _:PVNumberOfCharacteristics:
+
+:PVNumberOfCharacteristics
+++++++++++++++++++++++++++
+
+Password policy setting for builtin user accounts: the number indicates how many of the character rules defined by ``:PVCharacterRules`` are required as part of a password. The default is 2. ``:PVNumberOfCharacteristics`` cannot be set to a number higher than the number of rules or you will see the error, "Number of characteristics must be <= to the number of rules".
+
+``curl -X PUT -d 2 http://localhost:8080/api/admin/settings/:PVNumberOfCharacteristics``
+
+
+.. _:PVDictionaries:
+
+:PVDictionaries
++++++++++++++++
+
+Password policy setting for builtin user accounts: set a comma separated list of dictionaries containing words that cannot be used in a user password. ``/usr/share/dict/words`` is suggested and shown modified below to not contain words 3 letters or less. You are free to choose a different dictionary. By default, no dictionary is checked.
+
+``DIR=THE_PATH_YOU_WANT_YOUR_DICTIONARY_TO_RESIDE``
+``sed '/^.\{,3\}$/d' /usr/share/dict/words > $DIR/pwdictionary``
+``curl -X PUT -d "$DIR/pwdictionary" http://localhost:8080/api/admin/settings/:PVDictionaries``
+
+
+.. _:PVGoodStrength:
+
+:PVGoodStrength
++++++++++++++++
+
+Password policy setting for builtin user accounts: passwords of equal or greater character length than the :PVGoodStrength setting are always valid, regardless of other password constraints.
+
+``curl -X PUT -d 20 http://localhost:8080/api/admin/settings/:PVGoodStrength``
+
+Recommended setting: 20.
+
+.. _:PVCustomPasswordResetAlertMessage:
+
+:PVCustomPasswordResetAlertMessage
+++++++++++++++++++++++++++++++++++
+
+Changes the default info message displayed when a user is required to change their password on login. The default is:
+
+``{0} Reset Password{1} – Our password requirements have changed. Please pick a strong password that matches the criteria below.``
+
+Where the {0} and {1} denote surrounding HTML **bold** tags. It's recommended to put a single space before your custom message for better appearance (as in the default message above). Including the {0} and {1} to bolden part of your message is optional.
+
+Customize the message using the following curl command's syntax:
+
+``curl -X PUT -d '{0} Action Required:{1} Your current password does not meet all requirements. Please enter a new password meeting the criteria below.' http://localhost:8080/api/admin/settings/:PVCustomPasswordResetAlertMessage``
+
+:ShibPassiveLoginEnabled
+++++++++++++++++++++++++
+
+Set ``:ShibPassiveLoginEnabled`` to true to enable passive login for Shibboleth. When this feature is enabled, an additional Javascript file (isPassive.js) will be loaded for every page. It will generate a passive login request to your Shibboleth SP when an anonymous user navigates to the site. A cookie named "_check_is_passive_dv" will be created to keep track of whether or not a passive login request has already been made for the user.
+
+This implementation follows the example on the Shibboleth wiki documentation page for the isPassive feature: https://wiki.shibboleth.net/confluence/display/SHIB2/isPassive
+
+It is recommended that you configure additional error handling for your Service Provider if you enable passive login. A good way of doing this is described in the Shibboleth wiki documentation:
+
+- *In your Service Provider 2.x shibboleth2.xml file, add redirectErrors="#THIS PAGE#" to the Errors element.*
+
+You can set the value of "#THIS PAGE#" to the URL of your Dataverse installation homepage, or any other page on your site that is accessible to anonymous users and will have the isPassive.js file loaded.
+
+``curl -X PUT -d true http://localhost:8080/api/admin/settings/:ShibPassiveLoginEnabled``
+
+:ShibAffiliationAttribute
++++++++++++++++++++++++++
+
+The Shibboleth affiliation attribute holds information about the affiliation of the user (e.g. "OU") and is read from the DiscoFeed at each login. ``:ShibAffiliationAttribute`` is a name of a Shibboleth attribute in the Shibboleth header which your Dataverse installation will read from instead of DiscoFeed. If this value is not set or empty, your Dataverse installation uses the DiscoFeed.
+
+If the attribute is not yet set for the Shibboleth, please consult the Shibboleth Administrators at your institution. Typically it requires changing of the `/etc/shibboleth/attribute-map.xml` file by adding an attribute request, e.g.
+
+.. code::
+
+    <Attribute name="urn:oid:2.5.4.11" id="ou">
+        <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+    </Attribute>
+
+
+In order to implement the change, you should restart Shibboleth and Apache2 services:
+
+.. code::
+
+	sudo service shibd restart
+	sudo service apache2 restart
+
+To check if the attribute is sent, you should log in again to the Dataverse installation and check Shibboleth's transaction log. You should see something like this:
+
+.. code::
+
+	INFO Shibboleth-TRANSACTION [25]: Cached the following attributes with session (ID: _9d1f34c0733b61c0feb0ca7596ef43b2) for (applicationId: default) {
+	INFO Shibboleth-TRANSACTION [25]: 	givenName (1 values)
+	INFO Shibboleth-TRANSACTION [25]: 	ou (1 values)
+	INFO Shibboleth-TRANSACTION [25]: 	sn (1 values)
+	INFO Shibboleth-TRANSACTION [25]: 	eppn (1 values)
+	INFO Shibboleth-TRANSACTION [25]: 	mail (1 values)
+	INFO Shibboleth-TRANSACTION [25]: 	displayName (1 values)
+	INFO Shibboleth-TRANSACTION [25]: }
+
+If you see the attribue you requested in this list, you can set the attribute in the Dataverse installation.
+
+To set ``:ShibAffiliationAttribute``:
+
+``curl -X PUT -d "ou" http://localhost:8080/api/admin/settings/:ShibAffiliationAttribute``
+
+To delete ``:ShibAffiliationAttribute``:
+
+``curl -X DELETE http://localhost:8080/api/admin/settings/:ShibAffiliationAttribute``
+
+To check the current value of ``:ShibAffiliationAttribute``:
+
+``curl -X GET http://localhost:8080/api/admin/settings/:ShibAffiliationAttribute``
+
+:ShibAttributeCharacterSetConversionEnabled
++++++++++++++++++++++++++++++++++++++++++++
+
+It seems that the application server (usually Glassfish or Payara) will interpret all Shibboleth attributes that come through AJP as ISO-8859-1, even if they where originally UTF-8.
+To circumvent that, we re-encode all received Shibboleth attributes manually as UTF-8 by default. 
+In the case you get garbled characters in Shibboleth-supplied fields (e.g. given name, surname, affiliation), you can disable this behaviour by setting ShibAttributeCharacterSetConversionEnabled to false:
+
+``curl -X PUT -d false http://localhost:8080/api/admin/settings/:ShibAttributeCharacterSetConversionEnabled``
+
+If you managed to get correct accented characters from shibboleth while this setting is _false_, please contact us with your application server and Shibboleth configuration!
+
+:ShibAffiliationOrder
++++++++++++++++++++++
+
+Will select the last or first value of an array in affiliation, the array separator can be set using ``:ShibAffiliationSeparator`` .
+
+To select the last value : 
+
+``curl -X PUT -d "lastAffiliation" http://localhost:8080/api/admin/settings/:ShibAffiliationOrder``
+
+To select the first value :
+
+``curl -X PUT -d "firstAffiliation" http://localhost:8080/api/admin/settings/:ShibAffiliationOrder``
+
+
+:ShibAffiliationSeparator
++++++++++++++++++++++++++
+
+Set the separator to be used for ``:ShibAffiliationOrder``.
+Default separator : ";"
+
+To change the separator :
+
+``curl -X PUT -d ";" http://localhost:8080/api/admin/settings/:ShibAffiliationSeparator``
+
+.. _:ComputeBaseUrl:
+
+:ComputeBaseUrl
++++++++++++++++
+
+Set the base URL for the "Compute" button for a dataset.
+
+``curl -X PUT -d 'https://giji.massopencloud.org/application/dataverse' http://localhost:8080/api/admin/settings/:ComputeBaseUrl``
+
+.. _:CloudEnvironmentName:
+
+:CloudEnvironmentName
++++++++++++++++++++++
+
+Set the name of the cloud environment you've integrated with your Dataverse installation.
+
+``curl -X PUT -d 'Massachusetts Open Cloud (MOC)' http://localhost:8080/api/admin/settings/:CloudEnvironmentName``
+
+.. _:PublicInstall:
+
+:PublicInstall
+++++++++++++++
+
+Setting an installation to public will remove the ability to restrict data files or datasets. This functionality of the Dataverse Software will be disabled from your installation.
+
+This is useful for specific cases where an installation's files are stored in public access. Because files stored this way do not obey the Dataverse Software's file restrictions, users would still be able to access the files even when they're restricted. In these cases it's best to use :PublicInstall to disable the feature altogether.
+
+``curl -X PUT -d true http://localhost:8080/api/admin/settings/:PublicInstall``
+
+.. _:UploadMethods:
+
+:UploadMethods
+++++++++++++++
+
+This setting controls which upload methods are available to users of your Dataverse installation. The following upload methods are available:
+
+- ``native/http``: Corresponds to "Upload with HTTP via your browser" and APIs that use HTTP (SWORD and native).
+- ``dvwebloader``: Corresponds to :ref:`folder-upload`. Note that ``dataverse.files.<id>.upload-redirect`` must be set to "true" on an S3 store for this method to show up in the UI. In addition, :ref:`:WebloaderUrl` must be set. CORS allowed on the S3 bucket. See :ref:`cors-s3-bucket`.
+
+Out of the box only ``native/http`` is enabled and will work without further configuration. To add multiple upload method, separate them using a comma like this:
+
+``curl -X PUT -d 'native/http,dvwebloader' http://localhost:8080/api/admin/settings/:UploadMethods``
+
+You'll always want at least one upload method, so the easiest way to remove one of them is to simply ``PUT`` just the one you want, like this:
+
+``curl -X PUT -d 'native/http' http://localhost:8080/api/admin/settings/:UploadMethods``
+
+:GuestbookResponsesPageDisplayLimit
++++++++++++++++++++++++++++++++++++
+
+Limit on how many guestbook entries to display on the guestbook-responses page. By default, only the 5000 most recent entries will be shown. Use the standard settings API in order to change the limit. For example, to set it to 10,000, make the following API call:
+
+``curl -X PUT -d 10000 http://localhost:8080/api/admin/settings/:GuestbookResponsesPageDisplayLimit``
+
+.. _:CustomDatasetSummaryFields:
+
+:CustomDatasetSummaryFields
++++++++++++++++++++++++++++
+
+You can replace the default dataset metadata fields that are displayed above files table on the dataset page with a custom list separated by commas (with optional spaces) using the curl command below.
+Note that the License is always displayed and that the description, subject, keywords, etc. will NOT be displayed if you do not include them in the :CustomDatasetSummaryFields.
+
+``curl http://localhost:8080/api/admin/settings/:CustomDatasetSummaryFields -X PUT -d 'producer,subtitle, alternativeTitle'``
+
+You have to put the datasetFieldType name attribute in the :CustomDatasetSummaryFields setting for this to work.
+
+The default fields are ``dsDescription,subject,keyword,publication,notesText``.
+
+This setting can be retrieved via API. See :ref:`get-dataset-summary-field-names` in the API Guide.
+
+:AllowApiTokenLookupViaApi
+++++++++++++++++++++++++++
+
+The Dataverse Software 4.8.1 and below allowed API Token lookup via API but for better security this has been disabled by default. Set this to true if you really want the old behavior.
+
+``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:AllowApiTokenLookupViaApi``
+
+:ProvCollectionEnabled
+++++++++++++++++++++++
+
+Enable the collection of provenance metadata on your Dataverse installation via the provenance popup.
+
+``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:ProvCollectionEnabled``
+
+:MetricsCacheTimeoutMinutes
++++++++++++++++++++++++++++
+
+Sets how long a cached metrics result is used before re-running the query for a request. This timeout is only applied to some of the metrics that query the current state of the system, previous months queries are cached indefinitely. See :doc:`/api/metrics` for more info. The default timeout value is 7 days (10080 minutes).
+
+``curl -X PUT -d 10080 http://localhost:8080/api/admin/settings/:MetricsCacheTimeoutMinutes``
+
+.. _:MDCLogPath:
+
+:MDCLogPath
++++++++++++
+
+Sets the path where the raw Make Data Count logs are stored before being processed. If not set, no logs will be created for Make Data Count. See also the :doc:`/admin/make-data-count` section of the Admin Guide.
+
+``curl -X PUT -d '/usr/local/payara6/glassfish/domains/domain1/logs' http://localhost:8080/api/admin/settings/:MDCLogPath``
+
+.. _:DisplayMDCMetrics:
+
+:DisplayMDCMetrics
+++++++++++++++++++
+
+``:DisplayMDCMetrics`` can be set to false to disable display of MDC metrics (e.g. to enable collection of MDC metrics for some period prior to completing the set-up of Counter and performing the other steps described in the :doc:`/admin/make-data-count` section of the Admin Guide).
+
+``curl -X PUT -d 'false' http://localhost:8080/api/admin/settings/:DisplayMDCMetrics``
+
+.. _:MDCStartDate:
+
+:MDCStartDate
++++++++++++++
+
+It is possible to display MDC metrics (as of the start date of MDC logging) along with legacy download counts, generated before MDC was enabled.
+This is enabled via the new setting `:MDCStartDate` that specifies the cut-over date. If a dataset has any legacy access counts collected prior to that date, those numbers will be displayed in addition to the MDC views and downloads recorded since then.
+(Nominally, this date should be when your installation started logging MDC metrics but it can be any date after that if desired.)
+
+
+``curl -X PUT -d '2019-10-01' http://localhost:8080/api/admin/settings/:MDCStartDate``
+
+:ContactFeedbackMessageSizeLimit
+++++++++++++++++++++++++++++++++
+
+Maximum length of the text body that can be sent to the contacts of a Collection, Dataset, or DataFile. Setting this limit to Zero will denote unlimited length.
+
+``curl -X PUT -d 1080 http://localhost:8080/api/admin/settings/:ContactFeedbackMessageSizeLimit``
+
+.. _:Languages:
+
+:Languages
+++++++++++
+
+Sets which languages should be available. If there is more than one, a dropdown is displayed
+in the header.
+
+See :ref:`i18n` for a curl example and related settings.
+
+.. _:MetadataLanguages:
+
+:MetadataLanguages
+++++++++++++++++++
+
+Sets which languages can be used when entering dataset metadata.
+
+See :ref:`i18n` for further discussion, a curl example, and related settings.
+
+
+:InheritParentRoleAssignments
++++++++++++++++++++++++++++++
+
+``:InheritParentRoleAssignments`` can be set to a comma-separated list of role aliases or '*' (all) to cause newly created Dataverse collections to inherit the set of users and/or internal groups who have assignments for those role(s) on the parent Dataverse collection, i.e. those users/groups will be assigned the same role(s) on the new Dataverse collection (in addition to the creator of the new Dataverse collection having an admin role).
+This can be helpful in situations where multiple organizations are sharing one Dataverse installation. The default, if ``:InheritParentRoleAssignments`` is not set is for the creator of the new Dataverse collection to be the only one assigned a role.
+
+``curl -X PUT -d 'admin, curator' http://localhost:8080/api/admin/settings/:InheritParentRoleAssignments``
+or
+``curl -X PUT -d '*' http://localhost:8080/api/admin/settings/:InheritParentRoleAssignments``
+
+:AllowCors (Deprecated)
++++++++++++++++++++++++
 
-For example, if you want your installation of Dataverse to not attempt to ingest Rdata files larger that 1 MB, use this setting:
+.. note::
+   This setting is deprecated. Please use the JVM settings above instead.
+   This legacy setting will only be used if the newer JVM settings are not set.
 
-``curl -X PUT -d 1000000 http://localhost:8080/api/admin/settings/:TabularIngestSizeLimit:Rdata``
+Enable or disable support for Cross-Origin Resource Sharing (CORS) by setting ``:AllowCors`` to ``true`` or ``false``.
 
-:ZipUploadFilesLimit
-++++++++++++++++++++
+``curl -X PUT -d true http://localhost:8080/api/admin/settings/:AllowCors``
 
-Limit the number of files in a zip that Dataverse will accept.
+.. note::
+   New values for this setting will only be used after a server restart.
 
-:SolrHostColonPort
-++++++++++++++++++
+:ChronologicalDateFacets
+++++++++++++++++++++++++
 
-By default Dataverse will attempt to connect to Solr on port 8983 on localhost. Use this setting to change the hostname or port. You must restart Glassfish after making this change.
+Unlike other facets, those indexed by Date/Year are sorted chronologically by default, with the most recent value first. To have them sorted by number of hits, e.g. with the year with the most results first, set this to false 
 
-``curl -X PUT -d localhost:8983 http://localhost:8080/api/admin/settings/:SolrHostColonPort``
+If you don’t want date facets to be sorted chronologically, set:
 
-:SolrFullTextIndexing
-+++++++++++++++++++++
+``curl -X PUT -d 'false' http://localhost:8080/api/admin/settings/:ChronologicalDateFacets``
 
-Whether or not to index the content of files such as PDFs. The default is false.
+:CustomZipDownloadServiceUrl
+++++++++++++++++++++++++++++
 
-``curl -X PUT -d true http://localhost:8080/api/admin/settings/:SolrFullTextIndexing``
+The location of the "Standalone Zipper" service. If this option is specified, the Dataverse installation will be
+redirecing bulk/multi-file zip download requests to that location, instead of serving them internally.
+See :ref:`zipdownloader` of the Advanced Installation guide for information on how to install the external zipper.
+(This is still an **experimental** feature, as of Dataverse Software 5.0).
 
-:SolrMaxFileSizeForFullTextIndexing
-+++++++++++++++++++++++++++++++++++
+To enable redirects to the zipper installed on the same server as the main Dataverse Software application: 
 
-If ``:SolrFullTextIndexing`` is set to true, the content of files of any size will be indexed. To set a limit in bytes for which files to index in this way:
+``curl -X PUT -d '/cgi-bin/zipdownload' http://localhost:8080/api/admin/settings/:CustomZipDownloadServiceUrl``
 
-``curl -X PUT -d 314572800 http://localhost:8080/api/admin/settings/:SolrMaxFileSizeForFullTextIndexing``
+To enable redirects to the zipper on a different server: 
 
-:SignUpUrl
-++++++++++
+``curl -X PUT -d 'https://zipper.example.edu/cgi-bin/zipdownload' http://localhost:8080/api/admin/settings/:CustomZipDownloadServiceUrl``
 
-The relative path URL to which users will be sent for signup. The default setting is below.
+:CreateDataFilesMaxErrorsToDisplay
+++++++++++++++++++++++++++++++++++
 
-``curl -X PUT -d '/dataverseuser.xhtml?editMode=CREATE' http://localhost:8080/api/admin/settings/:SignUpUrl``
+Number of errors to display to the user when creating DataFiles from a file upload. It defaults to 5 errors.
 
-:LoginSessionTimeout
+``curl -X PUT -d '1' http://localhost:8080/api/admin/settings/:CreateDataFilesMaxErrorsToDisplay``
+
+.. _:BagItHandlerEnabled:
+
+:BagItHandlerEnabled
 ++++++++++++++++++++
 
-Session timeout (in minutes) for logged-in users. The default is 8 hours (480 minutes). For the anonymous user sessions, the timeout is set to the default value, configured in the web.xml file of the Dataverse application. 
+Part of the database settings to configure the BagIt file handler. Enables the BagIt file handler. By default, the handler is disabled.
 
-In the example below we reduce the timeout to 4 hours: 
+``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:BagItHandlerEnabled``
 
-``curl -X PUT -d 240 http://localhost:8080/api/admin/settings/:LoginSessionTimeout``
+.. _:BagValidatorJobPoolSize:
 
-:TwoRavensUrl
-+++++++++++++
+:BagValidatorJobPoolSize
+++++++++++++++++++++++++
 
-The ``:TwoRavensUrl`` option is no longer valid. See :doc:`r-rapache-tworavens` and the :doc:`/admin/external-tools` section of the Admin Guide.
+Part of the database settings to configure the BagIt file handler. The number of threads the checksum validation class uses to validate a single zip file. Defaults to 4 threads
 
-:TwoRavensTabularView
-+++++++++++++++++++++
+``curl -X PUT -d '10' http://localhost:8080/api/admin/settings/:BagValidatorJobPoolSize``
 
-The ``:TwoRavensTabularView`` option is no longer valid. See :doc:`r-rapache-tworavens` and the :doc:`/admin/external-tools` section of the Admin Guide.
+.. _:BagValidatorMaxErrors:
 
-:GeoconnectCreateEditMaps
-+++++++++++++++++++++++++
+:BagValidatorMaxErrors
+++++++++++++++++++++++
 
-Set ``GeoconnectCreateEditMaps`` to true to allow the user to create GeoConnect Maps. This boolean effects whether the user sees the map button on the dataset page and if the ingest will create a shape file.
+Part of the database settings to configure the BagIt file handler. The maximum number of errors allowed before the validation job aborts execution. This is to avoid processing the whole BagIt package. Defaults to 5 errors.
 
-``curl -X PUT -d true http://localhost:8080/api/admin/settings/:GeoconnectCreateEditMaps``
+``curl -X PUT -d '2' http://localhost:8080/api/admin/settings/:BagValidatorMaxErrors``
 
-:GeoconnectViewMaps
-+++++++++++++++++++
+.. _:BagValidatorJobWaitInterval:
 
-Set ``GeoconnectViewMaps`` to true to allow a user to view existing maps. This boolean effects whether a user will see the "Explore" button.
+:BagValidatorJobWaitInterval
+++++++++++++++++++++++++++++
 
-``curl -X PUT -d true http://localhost:8080/api/admin/settings/:GeoconnectViewMaps``
+Part of the database settings to configure the BagIt file handler. This is the period in seconds to check for the number of errors during validation. Defaults to 10.
 
-:DatasetPublishPopupCustomText
-++++++++++++++++++++++++++++++
+``curl -X PUT -d '60' http://localhost:8080/api/admin/settings/:BagValidatorJobWaitInterval``
 
-Set custom text a user will view when publishing a dataset. Note that this text is exposed via the "Info" endpoint of the :doc:`/api/native-api`.
+:ArchiverClassName
+++++++++++++++++++
 
-``curl -X PUT -d "Deposit License Requirements" http://localhost:8080/api/admin/settings/:DatasetPublishPopupCustomText``
+Your Dataverse installation can export archival "Bag" files to an extensible set of storage systems (see :ref:`BagIt Export` above for details about this and for further explanation of the other archiving related settings below).
+This setting specifies which storage system to use by identifying the particular Java class that should be run. Current configuration options include DuraCloudSubmitToArchiveCommand, LocalSubmitToArchiveCommand, GoogleCloudSubmitToArchiveCommand, and S3SubmitToArchiveCommand.
 
-If you have a long text string, you can upload it as a file as in the example below.
+For examples, see the specific configuration above in :ref:`BagIt Export`.
+ 
+:ArchiverSettings
++++++++++++++++++
 
-``curl -X PUT --upload-file /tmp/long.txt http://localhost:8080/api/admin/settings/:DatasetPublishPopupCustomText``
+Each Archiver class may have its own custom settings. Along with setting which Archiver class to use, one must use this setting to identify which setting values should be sent to it when it is invoked. The value should be a comma-separated list of setting names.
+For example, the LocalSubmitToArchiveCommand only uses the :BagItLocalPath setting. To allow the class to use that setting, this setting must set as:
 
-:DatasetPublishPopupCustomTextOnAllVersions
-+++++++++++++++++++++++++++++++++++++++++++
+``curl -X PUT -d ':BagItLocalPath' http://localhost:8080/api/admin/settings/:ArchiverSettings`` 
 
-Set whether a user will see the custom text when publishing all versions of a dataset
+:BagGeneratorThreads
+++++++++++++++++++++
 
-``curl -X PUT -d true http://localhost:8080/api/admin/settings/:DatasetPublishPopupCustomTextOnAllVersions``
+An archiver setting shared by several implementations (e.g. DuraCloud, Google, and Local) that can make Bag generation use fewer or more threads in zipping datafiles that the default of 2
+ 
+``curl http://localhost:8080/api/admin/settings/:BagGeneratorThreads -X PUT -d '8'``
 
-:SearchHighlightFragmentSize
-++++++++++++++++++++++++++++
+:DuraCloudHost
+++++++++++++++
+:DuraCloudPort
+++++++++++++++
+:DuraCloudContext
++++++++++++++++++
 
-Set ``SearchHighlightFragmentSize`` to override the default value of 100 from https://wiki.apache.org/solr/HighlightingParameters#hl.fragsize . In practice, a value of "320" seemed to fix the issue at https://github.com/IQSS/dataverse/issues/2191
+These three settings define the host, port, and context used by the DuraCloudSubmitToArchiveCommand. :DuraCloudHost is required. The other settings have default values as noted in the :ref:`Duracloud Configuration` section above.
 
-``curl -X PUT -d 320 http://localhost:8080/api/admin/settings/:SearchHighlightFragmentSize``
+:BagItLocalPath
++++++++++++++++
 
-:ScrubMigrationData
+This is the local file system path to be used with the LocalSubmitToArchiveCommand class. It is recommended to use an absolute path. See the :ref:`Local Path Configuration` section above.
+
+:GoogleCloudBucket
+++++++++++++++++++
+:GoogleCloudProject
 +++++++++++++++++++
 
-Allow for migration of non-conformant data (especially dates) from DVN 3.x to Dataverse 4.
+These are the bucket and project names to be used with the GoogleCloudSubmitToArchiveCommand class. Further information is in the :ref:`Google Cloud Configuration` section above.
 
-:MinutesUntilConfirmEmailTokenExpires
-+++++++++++++++++++++++++++++++++++++
+:S3ArchiverConfig
++++++++++++++++++
 
-The duration in minutes before "Confirm Email" URLs expire. The default is 1440 minutes (24 hours).  See also the :doc:`/admin/user-administration` section of our Admin Guide.
+This is the JSON configuration object setting to be used with the S3SubmitToArchiveCommand class. Further information is in the :ref:`S3 Archiver Configuration` section above.
 
-.. _conf-default-auth-provider:
 
-:DefaultAuthProvider
-++++++++++++++++++++
+.. _:InstallationName:
 
-If you have enabled Shibboleth and/or one or more OAuth providers, you may wish to make one of these authentication providers the default when users visit the Log In page. If unset, this will default to ``builtin`` but these valid options (depending if you've done the setup described in the :doc:`shibboleth` or :doc:`oauth2` sections) are:
+:InstallationName
++++++++++++++++++
 
-- ``builtin``
-- ``shib``
-- ``orcid``
-- ``github``
-- ``google``
+As explained under :ref:`Branding Your Installation`, by default, the name of the root Dataverse collection is used as the "brand name" of the installation, i.e. in emails and metadata exports. If set, ``:InstallationName`` overrides this default, allowing the root collection name and brandname to be set independently. (Note that, since metadata export files are cached, they will have to be reexported (see :doc:`/admin/metadataexport`) before they incorporate a change in this setting.)
 
-Here is an example of setting the default auth provider back to ``builtin``:
+:ExportInstallationAsDistributorOnlyWhenNotSet
+++++++++++++++++++++++++++++++++++++++++++++++
 
-``curl -X PUT -d builtin http://localhost:8080/api/admin/settings/:DefaultAuthProvider``
+In the DDI metadata exports, the default behavior is to always add the repository (using its brandname - the root collection name or the value of :ref:`:InstallationName <:InstallationName>`) to the stdyDscr/distStmt/distrbtr element. If this setting is true, this will only be done when a Distributor is not already defined in the Dataset metadata. (Note that, since metadata export files are cached, they will have to be reexported (see :doc:`/admin/metadataexport`) before they incorporate a change in this setting.) 
 
-.. _conf-allow-signup:
+.. _:AnonymizedFieldTypeNames:
 
-:AllowSignUp
-++++++++++++
+:AnonymizedFieldTypeNames
++++++++++++++++++++++++++
 
-Set to false to disallow local accounts to be created. See also the sections on :doc:`shibboleth` and :doc:`oauth2`.
+A comma-separated list of field type names that should be 'withheld' when dataset access occurs via a Private Url with Anonymized Access (e.g. to support anonymized review). 
+A suggested minimum includes author, datasetContact, and contributor, but additional fields such as depositor, grantNumber, and publication might also need to be included.
 
-:FileFixityChecksumAlgorithm
-++++++++++++++++++++++++++++
+``curl -X PUT -d 'author, datasetContact, contributor, depositor, grantNumber, publication' http://localhost:8080/api/admin/settings/:AnonymizedFieldTypeNames``
 
-Dataverse calculates checksums for uploaded files so that users can determine if their file was corrupted via upload or download. This is sometimes called "file fixity": https://en.wikipedia.org/wiki/File_Fixity
+:DatasetChecksumValidationSizeLimit
++++++++++++++++++++++++++++++++++++
 
-The default checksum algorithm used is MD5 and should be sufficient for establishing file fixity. "SHA-1", "SHA-256" and "SHA-512" are alternate values for this setting. For example:
+Setting ``DatasetChecksumValidationSizeLimit`` to a threshold in bytes, disables the checksum validation while publishing for any dataset size greater than the limit.
 
-``curl -X PUT -d 'SHA-512' http://localhost:8080/api/admin/settings/:FileFixityChecksumAlgorithm``
+For example, if you want your Dataverse installation to skip validation for any dataset larger than 5 GB while publishing, use this setting:
 
-The fixity algorithm used on existing files can be changed by a superuser using the API. An optional query parameter (num) can be used to limit the number of updates attempted.
-The API call will only update the algorithm and checksum for a file if the existing checksum can be validated against the file.
-Statistics concerning the updates are returned in the response to the API call with details in the log.
+``curl -X PUT -d 5000000000 http://localhost:8080/api/admin/settings/:DatasetChecksumValidationSizeLimit``
 
-``curl http://localhost:8080/api/admin/updateHashValues/{alg}``
-``curl http://localhost:8080/api/admin/updateHashValues/{alg}?num=1``
+When this option is used to disable the checksum validation, it's strongly recommended to perform periodic asynchronous checks via the integrity API
 
-.. _:PVMinLength:
+Refer to "Physical Files Validation in a Dataset" API :ref:`dataset-files-validation-api` section of our :doc:`/api/native-api` documentation.
 
-:PVMinLength
-++++++++++++
+Also refer to the "Datafile Integrity" API  :ref:`datafile-integrity`
 
-Password policy setting for builtin user accounts: a password's minimum valid character length. The default is 6.
+:DataFileChecksumValidationSizeLimit
+++++++++++++++++++++++++++++++++++++
 
-``curl -X PUT -d 6 http://localhost:8080/api/admin/settings/:PVMinLength``
+Setting ``DataFileChecksumValidationSizeLimit`` to a threshold in bytes, disables the checksum validation while publishing for any datafiles greater than the limit.
 
+For example, if you want your Dataverse installation to skip validation for any data files larger than 2 GB while publishing, use this setting:
 
-.. _:PVMaxLength:
+``curl -X PUT -d 2000000000 http://localhost:8080/api/admin/settings/:DataFileChecksumValidationSizeLimit``
 
-:PVMaxLength
-++++++++++++
+When this option is used to disable the checksum validation, it's strongly recommended to perform periodic asynchronous checks via the integrity API
 
-Password policy setting for builtin user accounts: a password's maximum valid character length.
+Refer to "Physical Files Validation in a Dataset" API :ref:`dataset-files-validation-api` section of our :doc:`/api/native-api` documentation.
 
-``curl -X PUT -d 0 http://localhost:8080/api/admin/settings/:PVMaxLength``
+Also refer to the "Datafile Integrity" API  :ref:`datafile-integrity`
 
+:SendNotificationOnDatasetCreation
+++++++++++++++++++++++++++++++++++
 
-.. _:PVNumberOfConsecutiveDigitsAllowed:
+A boolean setting that, if true, will send an email and notification to users when a Dataset is created. Messages go to those, other than the dataset creator, who have the ability/permission necessary to publish the dataset. The intent of this functionality is to simplify tracking activity and planning to follow-up contact.
+  
+``curl -X PUT -d true http://localhost:8080/api/admin/settings/:SendNotificationOnDatasetCreation``
 
-:PVNumberOfConsecutiveDigitsAllowed
-+++++++++++++++++++++++++++++++++++
+.. _:CVocConf:
 
-By default, passwords can contain an unlimited number of digits in a row. However, if your password policy specifies otherwise (e.g. only four digits in a row are allowed), then you can issue the following curl command to set the number of consecutive digits allowed (this example uses 4):
+:CVocConf
++++++++++
 
-``curl -X PUT -d 4 http://localhost:8080/api/admin/settings/:PVNumberOfConsecutiveDigitsAllowed``
+The ``:CVocConf`` database setting is used to allow metadatablock fields to look up values in external vocabulary services. For example, you could configure the "Author Affiliation" field to look up organizations in the `Research Organization Registry (ROR) <https://ror.org>`_. For a high-level description of this feature, see :ref:`using-external-vocabulary-services` in the Admin Guide.
 
-.. _:PVCharacterRules:
+The expected format for the ``:CVocConf`` database setting is JSON but the details are not documented here. Instead, please refer to `docs/readme.md <https://github.com/gdcc/dataverse-external-vocab-support/blob/main/docs/readme.md>`_ in the https://github.com/gdcc/dataverse-external-vocab-support repo.
 
-:PVCharacterRules
-+++++++++++++++++
+That repository also includes scripts that implement the lookup for specific service protocols, a JSON Schema for validating the structure required by this setting, and an example metadatablock with a sample ``:CVocConf`` config that associates fields in the example block with ORCID and SKOSMOS based services.
 
-Password policy setting for builtinuser accounts: dictates which types of characters can be required in a password. This setting goes hand-in-hand with :ref:`:PVNumberOfCharacteristics`. The default setting contains two rules:
+The commands below should give you an idea of how to load the configuration, but you'll want to study the examples and make decisions about which configuration to use:
 
-- one letter
-- one digit
+``wget https://gdcc.github.io/dataverse-external-vocab-support/examples/config/cvoc-conf.json``
 
-The default setting above is equivalent to specifying "Alphabetical:1,Digit:1".
+``curl -X PUT --upload-file cvoc-conf.json http://localhost:8080/api/admin/settings/:CVocConf``
 
-By specifying "UpperCase:1,LowerCase:1,Digit:1,Special:1", for example, you can put the following four rules in place instead:
+Since external vocabulary scripts can change how fields are indexed (storing an identifier and name and/or values in different languages),
+updating the Solr schema as described in :ref:`update-solr-schema` should be done after adding new scripts to your configuration.
 
-- one uppercase letter
-- one lowercase letter
-- one digit
-- one special character
+.. _:ControlledVocabularyCustomJavaScript:
 
-If you have implemented 4 different character rules in this way, you can also optionally increase ``:PVNumberOfCharacteristics`` to as high as 4. However, please note that ``:PVNumberOfCharacteristics`` cannot be set to a number higher than the number of character rules or you will see the error, "Number of characteristics must be <= to the number of rules".
+:ControlledVocabularyCustomJavaScript
++++++++++++++++++++++++++++++++++++++
 
-Also note that the Alphabetical setting should not be used in tandem with the UpperCase or LowerCase settings. The Alphabetical setting encompasses both of those more specific settings, so using it with them will cause your password policy to be unnecessarily confusing, and potentially easier to bypass.
+``:ControlledVocabularyCustomJavaScript`` allows a JavaScript file to be loaded into the dataset page for the purpose of showing controlled vocabulary as a list (with optionally translated values) such as author names.
 
-``curl -X PUT -d 'UpperCase:1,LowerCase:1,Digit:1,Special:1' http://localhost:8080/api/admin/settings/:PVCharacterRules``
+To specify the URL for a custom script ``covoc.js`` to be loaded from an external site:
 
-``curl -X PUT -d 3 http://localhost:8080/api/admin/settings/:PVNumberOfCharacteristics``
+``curl -X PUT -d 'https://example.com/js/covoc.js' http://localhost:8080/api/admin/settings/:ControlledVocabularyCustomJavaScript``
 
-.. _:PVNumberOfCharacteristics:
+To remove the custom script URL:
 
-:PVNumberOfCharacteristics
-++++++++++++++++++++++++++
+``curl -X DELETE http://localhost:8080/api/admin/settings/:ControlledVocabularyCustomJavaScript``
 
-Password policy setting for builtin user accounts: the number indicates how many of the character rules defined by ``:PVCharacterRules`` are required as part of a password. The default is 2. ``:PVNumberOfCharacteristics`` cannot be set to a number higher than the number of rules or you will see the error, "Number of characteristics must be <= to the number of rules".
+Please note that :ref:`:CVocConf` is a better option if the list is large or needs to be searchable from an external service using protocols such as SKOSMOS.
 
-``curl -X PUT -d 2 http://localhost:8080/api/admin/settings/:PVNumberOfCharacteristics``
+.. _:AllowedCurationLabels:
 
+:AllowedCurationLabels
+++++++++++++++++++++++
 
-.. _:PVDictionaries:
+A JSON Object containing lists of allowed labels (up to 32 characters, spaces allowed) that can be set, via API or UI by users with the permission to publish a dataset. The set of labels allowed
+for datasets can be selected by a superuser - via the Dataverse collection page (Edit/General Info) or set via API call.
+The labels in a set should correspond to the states in an organization's curation process and are intended to help users/curators track the progress of a dataset through a defined curation process.
+A dataset may only have one label at a time and if a label is set, it will be removed at publication time.
+This functionality is disabled when this setting is empty/not set.
+Each set of labels is identified by a curationLabelSet name and a JSON Array of the labels allowed in that set.
 
-:PVDictionaries
-+++++++++++++++
+``curl -X PUT -d '{"Standard Process":["Author contacted", "Privacy Review", "Awaiting paper publication", "Final Approval"], "Alternate Process":["State 1","State 2","State 3"]}' http://localhost:8080/api/admin/settings/:AllowedCurationLabels``
 
-Password policy setting for builtin user accounts: set a comma separated list of dictionaries containing words that cannot be used in a user password. ``/usr/share/dict/words`` is suggested and shown modified below to not contain words 3 letters or less. You are free to choose a different dictionary. By default, no dictionary is checked.
+If the Dataverse Installation supports multiple languages, the curation label translations should be added to the ``CurationLabels`` properties files. (See :ref:`i18n` for more on properties files and internationalization in general.)
+Since the Curation labels are free text, while creating the key, it has to be converted to lowercase, replace space with underscore.
 
-``DIR=THE_PATH_YOU_WANT_YOUR_DICTIONARY_TO_RESIDE``
-``sed '/^.\{,3\}$/d' /usr/share/dict/words > $DIR/pwdictionary``
-``curl -X PUT -d "$DIR/pwdictionary" http://localhost:8080/api/admin/settings/:PVDictionaries``
+Example::
 
+  standard_process=Standard Process
+  author_contacted=Author contacted
 
-.. _:PVGoodStrength:
+.. _:AllowCustomTermsOfUse:
 
-:PVGoodStrength
-+++++++++++++++
+:AllowCustomTermsOfUse
+++++++++++++++++++++++
 
-Password policy setting for builtin user accounts: passwords of equal or greater character length than the :PVGoodStrength setting are always valid, regardless of other password constraints.
+By default, custom terms of data use and access can be specified after selecting "Custom Terms" from the License/DUA dropdown on the Terms tab. When ``:AllowCustomTermsOfUse`` is  set to ``false`` the "Custom Terms" item is not made available to the depositor.
 
-``curl -X PUT -d 20 http://localhost:8080/api/admin/settings/:PVGoodStrength``
+``curl -X PUT -d false http://localhost:8080/api/admin/settings/:AllowCustomTermsOfUse``
 
-Recommended setting: 20.
+.. _:MaxEmbargoDurationInMonths:
 
-.. _:PVCustomPasswordResetAlertMessage:
+:MaxEmbargoDurationInMonths
++++++++++++++++++++++++++++
 
-:PVCustomPasswordResetAlertMessage
-++++++++++++++++++++++++++++++++++
+This setting controls whether embargoes are allowed in a Dataverse instance and can limit the maximum duration users are allowed to specify. A value of 0 months or non-existent
+setting indicates embargoes are not supported. A value of -1 allows embargoes of any length. Any other value indicates the maximum number of months (from the current date) a user
+can enter for an embargo end date. This limit will be enforced in the popup dialog in which users enter the embargo date. For example, to set a two year maximum:
 
-Changes the default info message displayed when a user is required to change their password on login. The default is:
+``curl -X PUT -d 24 http://localhost:8080/api/admin/settings/:MaxEmbargoDurationInMonths``
 
-``{0} Reset Password{1} – Our password requirements have changed. Please pick a strong password that matches the criteria below.``
+.. _:MinRetentionDurationInMonths:
 
-Where the {0} and {1} denote surrounding HTML **bold** tags. It's recommended to put a single space before your custom message for better appearance (as in the default message above). Including the {0} and {1} to bolden part of your message is optional.
+:MinRetentionDurationInMonths
++++++++++++++++++++++++++++++
 
-Customize the message using the following curl command's syntax:
+This setting controls whether retention periods are allowed in a Dataverse instance and can limit the minimum duration users are allowed to specify. A value of 0 months or non-existent
+setting indicates retention periods are not supported. A value of -1 allows retention periods of any length. Any other value indicates the minimum number of months (from the current date) a user
+can enter for a retention period end date. This limit will be enforced in the popup dialog in which users enter the retention period end date. For example, to set a ten year minimum:
 
-``curl -X PUT -d '{0} Action Required:{1} Your current password does not meet all requirements. Please enter a new password meeting the criteria below.' http://localhost:8080/api/admin/settings/:PVCustomPasswordResetAlertMessage``
+``curl -X PUT -d 120 http://localhost:8080/api/admin/settings/:MinRetentionDurationInMonths``
 
-:ShibPassiveLoginEnabled
-++++++++++++++++++++++++
 
-Set ``:ShibPassiveLoginEnabled`` to true to enable passive login for Shibboleth. When this feature is enabled, an additional Javascript file (isPassive.js) will be loaded for every page. It will generate a passive login request to your Shibboleth SP when an anonymous user navigates to the site. A cookie named "_check_is_passive_dv" will be created to keep track of whether or not a passive login request has already been made for the user.
+:DataverseMetadataValidatorScript
++++++++++++++++++++++++++++++++++
 
-This implementation follows the example on the Shibboleth wiki documentation page for the isPassive feature: https://wiki.shibboleth.net/confluence/display/SHIB2/isPassive
+An optional external script that validates Dataverse collection metadata as it's being updated or published. The script provided should be an executable that takes a single command line argument, the name of the file containing the metadata exported in the native json format. I.e., Dataverse application will be exporting the collection metadata in json format, saving it in a temp file, and passing the name of the temp file to the validation script as the command line argument. The script should exit with a non-zero error code if the validation fails. If that happens, a failure message (customizable in the next two settings below, `:DataverseMetadataPublishValidationFailureMsg` and `:DataverseMetadataUpdateValidationFailureMsg`) will be shown to the user.
 
-It is recommended that you configure additional error handling for your Service Provider if you enable passive login. A good way of doing this is described in the Shibboleth wiki documentation:
+For example, once the following setting is created:
 
-- *In your Service Provider 2.x shibboleth2.xml file, add redirectErrors="#THIS PAGE#" to the Errors element.*
+``curl -X PUT -d /usr/local/bin/dv_validator.sh http://localhost:8080/api/admin/settings/:DataverseMetadataValidatorScript``
 
-You can set the value of "#THIS PAGE#" to the URL of your Dataverse homepage, or any other page on your site that is accessible to anonymous users and will have the isPassive.js file loaded.
+:DataverseMetadataPublishValidationFailureMsg
++++++++++++++++++++++++++++++++++++++++++++++
 
-``curl -X PUT -d true http://localhost:8080/api/admin/settings/:ShibPassiveLoginEnabled``
+Specifies a custom error message shown to the user when a Dataverse collection fails an external metadata validation (as specified in the setting above) during an attempt to publish. If not specified, the default message "This dataverse collection cannot be published because it has failed an external metadata validation test" will be used.
 
-.. _:ComputeBaseUrl:
+For example: 
 
-:ComputeBaseUrl
-+++++++++++++++
+``curl -X PUT -d "This content needs to go through an additional review by the Curation Team before it can be published." http://localhost:8080/api/admin/settings/:DataverseMetadataPublishValidationFailureMsg``
 
-Set the base URL for the "Compute" button for a dataset.
 
-``curl -X PUT -d 'https://giji.massopencloud.org/application/dataverse' http://localhost:8080/api/admin/settings/:ComputeBaseUrl``
+:DataverseMetadataUpdateValidationFailureMsg
+++++++++++++++++++++++++++++++++++++++++++++
 
-.. _:CloudEnvironmentName:
+Same as above, but specifies a custom error message shown to the user when an external metadata validation check fails during an attempt to modify a Dataverse collection. If not specified, the default message "This dataverse collection cannot be updated because it has failed an external metadata validation test" will be used.
 
-:CloudEnvironmentName
-+++++++++++++++++++++
 
-Set the name of the cloud environment you've integrated with your Dataverse installation.
+:DatasetMetadataValidatorScript
++++++++++++++++++++++++++++++++
 
-``curl -X PUT -d 'Massachusetts Open Cloud (MOC)' http://localhost:8080/api/admin/settings/:CloudEnvironmentName``
+An optional external script that validates dataset metadata during publishing. The script provided should be an executable that takes a single command line argument, the name of the file containing the metadata exported in the native json format. I.e., Dataverse application will be exporting the dataset metadata in json format, saving it in a temp file, and passing the name of the file to the validation script as the command line argument. The script should exit with a non-zero error code if the validation fails. If that happens, the dataset is left unpublished, and a failure message (customizable in the next setting below, `:DatasetMetadataValidationFailureMsg`) will be shown to the user.
 
-.. _:PublicInstall:
+For example:
 
-:PublicInstall
-+++++++++++++++++++++
+``curl -X PUT -d /usr/local/bin/ds_validator.sh http://localhost:8080/api/admin/settings/:DatasetMetadataValidatorScript``
 
-Setting an installation to public will remove the ability to restrict data files or datasets. This functionality of Dataverse will be disabled from your installation.
+In some ways this duplicates a workflow mechanism, since it is possible to define a workflow with additional validation steps. But please note that the important difference is that this external validation happens *synchronously*, while the user is wating; while a workflow is performed asynchronously with a lock placed on the dataset. This can be useful to some installations, in some situations. But it also means that the script provided should be expected to always work reasonably fast - ideally, in seconds, rather than minutes, etc.
 
-This is useful for specific cases where an installation's files are stored in public access. Because files stored this way do not obey Dataverse's file restrictions, users would still be able to access the files even when they're restricted. In these cases it's best to use :PublicInstall to disable the feature altogether.
+:DatasetMetadataValidationFailureMsg
+++++++++++++++++++++++++++++++++++++
 
-``curl -X PUT -d true http://localhost:8080/api/admin/settings/:PublicInstall``
+Specifies a custom error message shown to the user when a dataset fails an external metadata validation (as specified in the setting above) during an attempt to publish. If not specified, the default message "This dataset cannot be published because it has failed an external metadata validation test" will be used.
 
-:DataCaptureModuleUrl
-+++++++++++++++++++++
+For example: 
 
-The URL for your Data Capture Module (DCM) installation. This component is experimental and can be downloaded from https://github.com/sbgrid/data-capture-module .
+``curl -X PUT -d "This content needs to go through an additional review by the Curation Team before it can be published." http://localhost:8080/api/admin/settings/:DatasetMetadataValidationFailureMsg``
 
-``curl -X PUT -d 'https://dcm.example.edu' http://localhost:8080/api/admin/settings/:DataCaptureModuleUrl``
 
-:RepositoryStorageAbstractionLayerUrl
-+++++++++++++++++++++++++++++++++++++
+:ExternalValidationAdminOverride
+++++++++++++++++++++++++++++++++
 
-The URL for your Repository Storage Abstraction Layer (RSAL) installation. This component is experimental and can be downloaded from https://github.com/sbgrid/rsal .
+When set to ``true``, this setting allows a superuser to publish and/or update Dataverse collections and datasets bypassing the external validation checks (specified by the settings above). In an event where an external script is reporting validation failures that appear to be in error, this option gives an admin with superuser privileges a quick way to publish the dataset or update a collection for the user. 
 
-``curl -X PUT -d 'https://rsal.example.edu' http://localhost:8080/api/admin/settings/:RepositoryStorageAbstractionLayerUrl``
+.. _:FileCategories:
 
-.. _:UploadMethods:
+:FileCategories
++++++++++++++++
 
-:UploadMethods
-++++++++++++++
+Overrides the default list of file categories that is used in the UI when adding tags to files. The default list is Documentation, Data, and Code.
 
-This setting controls which upload methods are available to users of your installation of Dataverse. The following upload methods are available:
+This setting is a comma-separated list of the new tags.
 
-- ``native/http``: Corresponds to "Upload with HTTP via your browser" and APIs that use HTTP (SWORD and native).
-- ``dcm/rsync+ssh``: Corresponds to "Upload with rsync+ssh via Data Capture Module (DCM)". A lot of setup is required, as explained in the :doc:`/developers/big-data-support` section of the Dev Guide.
+To override the default list with Docs, Data, Code, and Workflow:
 
-Out of the box only ``native/http`` is enabled and will work without further configuration. To add multiple upload method, separate them using a comma like this:
+``curl -X PUT -d 'Docs,Data,Code,Workflow' http://localhost:8080/api/admin/settings/:FileCategories``
 
-``curl -X PUT -d 'native/http,dcm/rsync+ssh' http://localhost:8080/api/admin/settings/:UploadMethods``
+To remove the override and go back to the default list:
 
-You'll always want at least one upload method, so the easiest way to remove one of them is to simply ``PUT`` just the one you want, like this:
+``curl -X PUT -d '' http://localhost:8080/api/admin/settings/:FileCategories``
 
-``curl -X PUT -d 'native/http' http://localhost:8080/api/admin/settings/:UploadMethods``
+.. _:ShowMuteOptions:
 
-:DownloadMethods
+:ShowMuteOptions
 ++++++++++++++++
 
-This setting is experimental and related to Repository Storage Abstraction Layer (RSAL).
+Allows users to mute notifications by showing additional configuration options in the Notifications tab of the account page (see :ref:`account-notifications` in the User Guide). By default, this setting is "false" and users cannot mute any notifications (this feature is not shown in the user interface).
 
-``curl -X PUT -d 'rsal/rsync' http://localhost:8080/api/admin/settings/:DownloadMethods``
+For configuration details, see :ref:`mute-notifications`.
 
-:GuestbookResponsesPageDisplayLimit
-+++++++++++++++++++++++++++++++++++
+.. _:AlwaysMuted:
+
+:AlwaysMuted
+++++++++++++
 
-Limit on how many guestbook entries to display on the guestbook-responses page. By default, only the 5000 most recent entries will be shown. Use the standard settings API in order to change the limit. For example, to set it to 10,000, make the following API call: 
+Overrides the default empty list of always muted notifications. Always muted notifications cannot be unmuted by the users. Always muted notifications are not shown in the notification settings for the users.
 
-``curl -X PUT -d 10000 http://localhost:8080/api/admin/settings/:GuestbookResponsesPageDisplayLimit``
+For configuration details, see :ref:`mute-notifications`.
 
-:CustomDatasetSummaryFields
-+++++++++++++++++++++++++++
+.. _:NeverMuted:
 
-You can replace the default dataset metadata fields that are displayed above files table on the dataset page with a custom list separated by commas using the curl command below.
+:NeverMuted
++++++++++++
 
-``curl http://localhost:8080/api/admin/settings/:CustomDatasetSummaryFields -X PUT -d 'producer,subtitle,alternativeTitle'``
+Overrides the default empty list of never muted notifications. Never muted notifications cannot be muted by the users. Always muted notifications are grayed out and are not adjustable by the user.
 
-You have to put the datasetFieldType name attribute in the :CustomDatasetSummaryFields setting for this to work. 
+For configuration details, see :ref:`mute-notifications`.
 
-:AllowApiTokenLookupViaApi
+:LDNMessageHosts
+++++++++++++++++
+
+The comma-separated list of hosts allowed to send Dataverse Linked Data Notification messages. See :doc:`/api/linkeddatanotification` for details. ``*`` allows messages from anywhere (not recommended for production). By default, messages are not accepted from anywhere.
+
+
+:LDN_TARGET
++++++++++++
+
+The URL of an LDN Inbox to which the LDN Announce workflow step will send messages. See :doc:`/developers/workflows` for details.
+
+:LDNAnnounceRequiredFields
 ++++++++++++++++++++++++++
 
-Dataverse 4.8.1 and below allowed API Token lookup via API but for better security this has been disabled by default. Set this to true if you really want the old behavior.
+The list of parent dataset field names for which the LDN Announce workflow step should send messages. See :doc:`/developers/workflows` for details.
 
-``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:AllowApiTokenLookupViaApi``
+.. _:GlobusSettings:
 
-:ProvCollectionEnabled
+:GlobusAppUrl
++++++++++++++
+
+The URL where the `dataverse-globus <https://github.com/scholarsportal/dataverse-globus>`_ "transfer" app has been deployed to support Globus integration. See :ref:`globus-support` for details.
+
+.. _:GlobusPollingInterval:
+
+:GlobusPollingInterval
 ++++++++++++++++++++++
 
-Enable the collection of provenance metadata on Dataverse via the provenance popup.
+The interval in seconds between Dataverse calls to Globus to check on upload progress. Defaults to 50 seconds (or to 10 minutes, when the ``globus-use-experimental-async-framework`` feature flag is enabled). See :ref:`globus-support` for details.
 
-``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:ProvCollectionEnabled``
+.. _:GlobusBatchLookupSize:
 
-:MetricsCacheTimeoutMinutes
-+++++++++++++++++++++++++++
+:GlobusBatchLookupSize
+++++++++++++++++++++++
 
-Sets how long a cached metrics result is used before re-running the query for a request. This timeout is only applied to some of the metrics that query the current state of the system, previous months queries are cached indefinitely. See :doc:`/api/metrics` for more info. The default timeout value is 7 days (10080 minutes). 
+In the initial implementation, when files were added to the dataset upon completion of a Globus upload task, Dataverse would make a separate Globus API call to look up the size of every new file. This proved to be a significant bottleneck at Harvard Dataverse with users transferring batches of many thousands of files (this in turn was made possible by the Globus improvements in v6.4). An optimized lookup mechanism was added in response, where the Globus Service makes a listing API call on the entire remote folder, then populates the file sizes for all the new file entries before passing them to the Ingest service. This approach however may in fact slow things down in a scenario where there are already thousands of files in the Globus folder for the dataset, and only a small number of new files are being added. To address this, the number of files in a batch for which this method should be used was made configurable. If not set, it will default to 50 (a completely arbitrary number). Setting it to 0 will always use this method with Globus uploads. Setting it to some very large number will disable it completely. This was made a database setting, as opposed to a JVM option, in order to make it configurable in real time. 
 
-``curl -X PUT -d 10080 http://localhost:8080/api/admin/settings/:MetricsCacheTimeoutMinutes``
+:GlobusSingleFileTransfer
++++++++++++++++++++++++++
 
-.. _MDCLogPath:
+A true/false option to add a Globus transfer option to the file download menu which is not yet fully supported in the dataverse-globus app. See :ref:`globus-support` for details.
 
-:MDCLogPath
-+++++++++++
+.. _:WebloaderUrl:
 
-Sets the path where the raw Make Data Count logs are stored before being processed. If not set, no logs will be created for Make Data Count. See also the :doc:`/admin/make-data-count` section of the Admin Guide.
+:WebloaderUrl
++++++++++++++
 
-``curl -X PUT -d '/usr/local/glassfish4/glassfish/domains/domain1/logs' http://localhost:8080/api/admin/settings/:MDCLogPath``
+The URL of `dvuploader <https://github.com/gdcc/dvwebloader>`'s HTML file when dvuploader is enabled in :ref:`:UploadMethods`.
 
-:DisplayMDCMetrics
-++++++++++++++++++
+To use the current GDCC version directly:
 
-``:DisplayMDCMetrics`` can be set to false to disable display of MDC metrics (e.g. to enable collection of MDC metrics for some period prior to completing the set-up of Counter and performing the other steps described in the :doc:`/admin/make-data-count` section of the Admin Guide).
+``curl -X PUT -d 'https://gdcc.github.io/dvwebloader/src/dvwebloader.html' http://localhost:8080/api/admin/settings/:WebloaderUrl``
 
-``curl -X PUT -d 'false' http://localhost:8080/api/admin/settings/:DisplayMDCMetrics``
+:CategoryOrder
+++++++++++++++
 
-.. _:Languages:
+A comma separated list of Category/Tag names defining the order in which files with those tags should be displayed. 
+The setting can include custom tag names along with the pre-defined tags (Documentation, Data, and Code are the defaults but the :ref:`:FileCategories` setting can be used to use a different set of tags).
+The default is category ordering disabled.
 
-:Languages
-++++++++++
+``curl -X PUT -d 'Documentation,Data,Code' http://localhost:8080/api/admin/settings/:CategoryOrder``
 
-Sets which languages should be available. If there is more than one, a dropdown is displayed
-in the header.
+:OrderByFolder
+++++++++++++++
 
-See :ref:`i18n` for a curl example and related settings.
+A true(default)/false option determining whether datafiles listed on the dataset page should be grouped by folder.
 
-:InheritParentRoleAssignments
-+++++++++++++++++++++++++++++
+``curl -X PUT -d true http://localhost:8080/api/admin/settings/:OrderByFolder``
+
+:AllowUserManagementOfOrder
++++++++++++++++++++++++++++
 
-``:InheritParentRoleAssignments`` can be set to a comma-separated list of role aliases or '*' (all) to cause newly created Dataverses to inherit the set of users and/or internal groups who have assignments for those role(s) on the parent Dataverse, i.e. those users/groups will be assigned the same role(s) on the new Dataverse (in addition to the creator of the new Dataverse having an admin role). 
-This can be helpful in situations where multiple organizations are sharing one Dataverse instance. The default, if ``::InheritParentRoleAssignments`` is not set is for the creator of the new Dataverse to be the only one assigned a role.
+A true/false (default) option determining whether the dataset datafile table display includes checkboxes enabling users to turn folder ordering and/or category ordering (if an order is defined by :CategoryOrder) on and off dynamically. 
 
-``curl -X PUT -d 'admin, curator' http://localhost:8080/api/admin/settings/:InheritParentRoleAssignments``
-or 
-``curl -X PUT -d '*' http://localhost:8080/api/admin/settings/:InheritParentRoleAssignments``
+``curl -X PUT -d true http://localhost:8080/api/admin/settings/:AllowUserManagementOfOrder``
+
+.. _:UseStorageQuotas:
+
+:UseStorageQuotas
++++++++++++++++++
+
+Enables storage use quotas in collections. See the :doc:`/api/native-api` for details.
 
-:AllowCors
-++++++++++
 
-Allows Cross-Origin Resource sharing(CORS). By default this setting is absent and Dataverse assumes it to be true.
+.. _:StoreIngestedTabularFilesWithVarHeaders:
 
-If you don’t want to allow CORS for your installation, set:
+:StoreIngestedTabularFilesWithVarHeaders
+++++++++++++++++++++++++++++++++++++++++
+
+With this setting enabled, tabular files produced during Ingest will
+be stored with the list of variable names added as the first
+tab-delimited line. As the most significant effect of this feature,
+Access API will be able to take advantage of Direct Download for
+tab. files saved with these headers on S3 - since they no longer have
+to be generated and added to the streamed file on the fly.
+
+The setting is ``false`` by default, preserving the legacy behavior. 
+
+:RateLimitingDefaultCapacityTiers
++++++++++++++++++++++++++++++++++
+Number of calls allowed per hour if the specific command is not configured. The values represent the number of calls per hour per user for tiers 0,1,...
+A value of -1 can be used to signify no rate limit. Also, by default, a tier not defined would receive a default of no limit.
+
+See also :ref:`cache-rate-limiting`.
+
+:RateLimitingCapacityByTierAndAction
+++++++++++++++++++++++++++++++++++++
+JSON object specifying the rate by tier and a list of actions (commands). This allows for more control over the rate limit of individual API command calls.
+In the following example, calls made by a guest user (tier 0) for API GetLatestPublishedDatasetVersionCommand is further limited to only 10 calls per hour, while an authenticated user (tier 1) will be able to make 30 calls per hour to the same API.
+
+.. code-block:: shell
 
-``curl -X PUT -d 'false' http://localhost:8080/api/admin/settings/:AllowCors``
+  {"rateLimits":[
+    {"tier": 0, "limitPerHour": 10, "actions": ["GetLatestPublishedDatasetVersionCommand", "GetPrivateUrlCommand", "GetDatasetCommand", "GetLatestAccessibleDatasetVersionCommand"]},
+    {"tier": 0, "limitPerHour": 1, "actions": ["CreateGuestbookResponseCommand", "UpdateDatasetVersionCommand", "DestroyDatasetCommand", "DeleteDataFileCommand", "FinalizeDatasetPublicationCommand", "PublishDatasetCommand"]},
+    {"tier": 1, "limitPerHour": 30, "actions": ["CreateGuestbookResponseCommand", "GetLatestPublishedDatasetVersionCommand", "GetPrivateUrlCommand", "GetDatasetCommand", "GetLatestAccessibleDatasetVersionCommand", "UpdateDatasetVersionCommand", "DestroyDatasetCommand", "DeleteDataFileCommand", "FinalizeDatasetPublicationCommand", "PublishDatasetCommand"]}
+  ]}
+
+See also :ref:`cache-rate-limiting`.
+
+.. _supported MicroProfile Config API source: https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Overview.html
+.. _password alias: https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/Server%20Configuration%20And%20Management/Configuration%20Options/Password%20Aliases.html
+.. _variable substitution: https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/Server%20Configuration%20And%20Management/Configuration%20Options/Variable%20Substitution/Usage%20of%20Variables.html
+.. _property expression: https://download.eclipse.org/microprofile/microprofile-config-3.1/microprofile-config-spec-3.1.html#property-expressions
+.. _directory config source: https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Directory.html
+.. _cloud sources: https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Cloud/Overview.html
+
+
+:GetExternalSearchUrl
++++++++++++++++++++++
+:GetExternalSearchName
+++++++++++++++++++++++
+:PostExternalSearchUrl
+++++++++++++++++++++++
+:PostExternalSearchName
++++++++++++++++++++++++
+Experimental - settings for Search Services. See :doc:`/developers/search-services`.
diff --git a/doc/sphinx-guides/source/installation/external-tools.rst b/doc/sphinx-guides/source/installation/external-tools.rst
index 028802fd736..eb56b158e0a 100644
--- a/doc/sphinx-guides/source/installation/external-tools.rst
+++ b/doc/sphinx-guides/source/installation/external-tools.rst
@@ -1,7 +1,7 @@
 External Tools
 ==============
 
-External tools can provide additional features that are not part of Dataverse itself, such as data exploration.
+External tools can provide additional features that are not part of the Dataverse Software itself, such as data exploration.
 
 .. contents:: |toctitle|
   :local:
diff --git a/doc/sphinx-guides/source/installation/geoconnect.rst b/doc/sphinx-guides/source/installation/geoconnect.rst
deleted file mode 100644
index 30d07f3f76c..00000000000
--- a/doc/sphinx-guides/source/installation/geoconnect.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-Geoconnect
-==========
-
-.. contents:: |toctitle|
-	:local:
-
-Geoconnect works as a middle layer, allowing geospatial data files in Dataverse to be visualized with Harvard WorldMap.
-
-To understand the feature from the user perspective, see the :doc:`/user/data-exploration/worldmap` section of the User Guide.
-
-As of this writing, the README at https://github.com/IQSS/geoconnect recommends not installing Geoconnect at this time due to an ongoing rewrite of the WorldMap code. If you are not deterred by this, read on!
-
-To set up a Geoconnect development environment, you can follow the steps outlined in the `local_setup.md <https://github.com/IQSS/geoconnect/blob/master/local_setup.md>`_ guide. Although those instructions are for a local development setup, they may assist in installing Geoconnect in your production environment. See also "Geoconnect" under the :doc:`/developers/dev-environment` section of the Developer Guide.
-
-Harvard Dataverse runs Geoconnect on Heroku. To make use of Heroku, you will need a Heroku account, as well as a few other prerequisites. Follow the instructions outlined in the `heroku_setup.md <https://github.com/IQSS/geoconnect/blob/master/heroku_setup.md>`_ guide. The `heroku.py <https://github.com/IQSS/geoconnect/blob/master/geoconnect/settings/heroku.py>`_ settings file may also be adapted for other environments. Please note, for the production environment, remember to set ``DEBUG=False``.
-
-See also the :doc:`/admin/geoconnect-worldmap` section of the Admin Guide.
diff --git a/doc/sphinx-guides/source/installation/img/3webservers.png b/doc/sphinx-guides/source/installation/img/3webservers.png
index f072411ac10..b8bd222a56f 100644
Binary files a/doc/sphinx-guides/source/installation/img/3webservers.png and b/doc/sphinx-guides/source/installation/img/3webservers.png differ
diff --git a/doc/sphinx-guides/source/installation/img/LCDemo.png b/doc/sphinx-guides/source/installation/img/LCDemo.png
new file mode 100644
index 00000000000..cfedd74f1df
Binary files /dev/null and b/doc/sphinx-guides/source/installation/img/LCDemo.png differ
diff --git a/doc/sphinx-guides/source/installation/img/cookie-consent-example.png b/doc/sphinx-guides/source/installation/img/cookie-consent-example.png
new file mode 100644
index 00000000000..0dfe1fb113b
Binary files /dev/null and b/doc/sphinx-guides/source/installation/img/cookie-consent-example.png differ
diff --git a/doc/sphinx-guides/source/installation/img/dvBrandingCustBlocks.drawio b/doc/sphinx-guides/source/installation/img/dvBrandingCustBlocks.drawio
new file mode 100644
index 00000000000..111e683f7eb
--- /dev/null
+++ b/doc/sphinx-guides/source/installation/img/dvBrandingCustBlocks.drawio
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2022-04-20T15:47:31.467Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/17.2.4 Chrome/96.0.4664.174 Electron/16.1.0 Safari/537.36" etag="-m-sRqD_oSY1_h-Q2VvL" version="17.2.4" type="device"><diagram id="FZ_ui0qGbwUvnWfqfnq9" name="Page-1">5LzXkutKsiX4NfU4ZdDiEZIQhNZ4gyQ0QCiC+PqJyDynxK073T02t/qOWec5uXcmSAIRHu7L13KP2H/BhfF6rNnSGHNZDX/BkPL6Cy7+BcNQAsP+Av9Hyu/vFQb/48Jrbcs/3vT3C157V39cRP64erRltf3TG/d5HvZ2+eeLxTxNVbH/07VsXefPP7+tnod/fuqSvap/ueAV2fCvV6O23Js/ZkEif7+uVO2r+fPJKPLHK2P255v/uLA1WTl//uESLv0FF9Z53n9/Gi+hGqDx/rTL7+fk/4dX/zawtZr2/5UPBCg+37RQo8Jskd+IEAPz+L/Y37uc2XD8MeE/Brt//7TAOh9TWcGbIH/B+U/T7pW3ZAV89QPWHFxr9nEAv6Hgx21f574S5mFefz6NyzILvv72yp82JMCVf53AH3M6q3Wvrn+49MeEHtU8Vvv6BW/589U/rf2Hd6F/Gvvz97WiUfav5O/V5h9XiiH/+jdH+cNJXn97wN/tCH74w5T/L8xK/1vM+o/G+xdDCwICvv6rzPo3k/1hWAwYESf+1bZ/2v8fLftnbPyXWxX7n1sVBNkCf2zHn7jm4ZxbEM3PLK8Ge97avZ0n8Ho+7/s8gjcM8AU+K/rXz4L8adCyqrNj2P/hDtzQvuAn9xmuTbYtv2hTtxdcRP7ngdyfV5E/r8BbZXv2F5z7/RWTl+n1F0xoQ95yP4j+eM0c+DK9oJGCF/hpQeDvmcAl4C+w9sBgGF/i8CKvmIIXOqrAvdSaa/r25+KAuGGDBBg7lkrZFGPApRh55lGwF5j5TaPwKLDmLC1GPG8CfmIspTApJfiajGQRe6iyu4D3c0UcNqqoftSH3BYt9zVE9auKEmp1zm11xrcXvMEAY5QQTXMlOai0e58i1AnNmvwoLB7FQiyjdRUufPxJmtfcm4v2femvljUzMzQw1EkD9tDy4JthYpvetpvHfa74CDayM5Z1Yu6m7/fgJE5ySa6ma/rLkWoZ3Itz+Mf8MtpWp8/Nrhm7fACzRKlbmp+R3k7wS4ET9wf8TdITPtkGw97DRJPkTVMqoXBUo3OLIDw/DV2qxz9/P6GFq4tyQ2l86KWAvcPyn79j9s2+woaxG7Aebhqqi6xqvK65gp7yk1+XXNFL8yD9XLd/1kxGIoLC67pfPBJ9B3tJDXp87N7wPOMFOWLs6J22D17gc5MEYo3vShp5DX+7i/Zc3Fdx5Feo6VkUBP28LKnree04iJjPeSCaeJblZq8tfDB92RrsmtKvLZXPGvx65vHMkgSB4IZ2mqP0HYUqqGub40OKLFS/J6vgSdI7Rr8zbCeLb2qwfoCaYoX3JFKKbpNEss++I3wn63zHGF9qnt+hxi+TLI440/tFde6UIZ0QLZUI3fJ3Ni48l8B1ed/mgILMwo/lXcQPRDjBG8vjk/AfoiCsh6KwaYvsiutEw6KnYzqG4M0AM2VwLSjXDJtbo7PvrCwxs5mTB7j1u7JFnqejL0aX54bbkz9kWyQqOx3jGBZVwaC5H2JzNOpY34fiL9L6uLbEezQ9SeInDYdDjGr77CamWmxaSWiXAKMpPE26HcS0xWUhGU/mXcmXbsNk1bpmCLJcj3Jb9a+QEwr/Are79meKFRNN47gyb9GzXrLc+Rjik6dZjIqe4YbN8Y3TOy5dRXAV4LG5saIxmBxKPdp51qtpIZcbzJbH8Wl+niFlYxFcThK3EYSdxTZwvz54v4+wD+GKFI5QbB9lfZlmj2sBDunKYrphEi84L5UjGapM4OzA/3V0l8cSzW+hPck7wM3L8KUf59Bm9pTmWvxkstiwLZa7Z0NUEhfKYRiEZXxRS/imyQjP3u95t9nyF3g+0OdnfVzarJ11g6rsYMfKM0N2XEGpITjifJGiYc12s94FsIpySXFbo+0uSxZzKDYMuMmtp+aINGAojvopxzvFp3XNS4JIgng5L49hLeiyk+95l48LdITuVYNYC8myQx+4lQI+cm4YXdlwivb0M1cZfy6NKKy4ZYF0I9fTNO0Wg+MnvuLGdMN3LrrT94vl13EOp9Mc4OJsz/4Z25znjcNgU37KUEVSPlrXfxViM+cPfEKQAFiYi55XoTcOUTsU+HCU+EIOHCrjGPdogBvbxs19XsbQO0MYkts3JWhoMNXx3u+3Ogsv5ndJBLHES6ywpkhnqzMG/iCvSOaCJ316Q5RcV+bJX8BQ5AN/NnyCGR2IvYayQ4o47E73+uVTARB82unXuA1N3KDvAFgbUTujYziq9GPx3+zGzmg1pXGfHyAQicpOZucFIypNzhghqaqbo5YIcRzH4i2XrjsvBo/MHaRUePdiWVfiOc62x9szVp04vlunHfh6a5j5St5oticnDSfltfqn+x0y+C1gswg9rkj4MOzedLeG0Ox12A29b1k08amouxPJ2mUcoCJYFZnZHhmUADwGItb5mKIjObLsSp7UqPENIrkGKOQ4Mu9JwJBbnB/RW3/N7HGnDlhDNRm1tuz2cgKgtEU/WIeu+PQ7njpIFZfsyYLK4COO/XkSvHYsJngzfXU4fD5H1OKrDN9ppQhNdiVboa3K8mGqVM1NjPhYYqdSe7R6waIjx8pSumV/DfBJW/tKjePuSnsluwoAiqPR6ma75CGCu1tiGKKsLEjymn2Puj7nZbzLk9wQYG4fpfag1wSXUDIwrviJQnBc3skDRj/MWopDHPcKHQizuhH+IAjSZwyuDaeJ0g0f8/u9ConIzyj9IA6tQSk2bfZwhanDsmzBYewLe6PFUVuKD9BBFd3s4U/3AvD8SL90OaPNXCkw1dH42ZcQO0TuYwUDWXUggvg+UVxkMO8q5p0tCmS0XIuYmZOimgGS9qXoBBz4BB1dpAcTDs1+yZlBfO4hN0l+fz6vY373i+J+apASAugpleeXSgoWWnadmP8YfJ8+3A8YyhXH0yhTx/LOd4ppA2pKsGZudQGMCYydE1+Gy7Bkhr3fx51sicWc4pc66C1VGmrcnoIDY3tiGGU634POrfEKLTrNb1UAtvpg0Q1n/f5xVxDDBQezYPyEMBkX+5qD8ccHtkZPmMxgJH+e4Yp+X/DWpBUPXk174D0eYDyD/KRcgjK7WDlwEXBUnkn2etbn9y8O5TtB/7ihR/CcowTonnmTdhvQhx4uUZFd9RspDvI5l4CB/hUgDNu4ggAWsoXYUUAI2zUvGYNhzwVGKC28Tk6lv+fs0YQyjB62hqC2hm9k0DxP6lTCkIUrd/ASNcMhidqrONPx2joZZsgHWOWPcoaAssvvmn5T42JNYsvr3z1e395rNoSp8J1EFO/vVzAC+Sp85WLtYlK/D7dPsfeq9Z6pgIT2lkGkemG7hxONHyxz5SzB/OlLGX4esbtT1PEcSIYJQsHpVaKq1X7DcjM57EdXg9xVKzx/MR9oJpJpeCG5ozRa5Y7/8ST0eQOmxgPkWVDax+WrS7CTob4w9W+rcHvIrhLF4ag2SInRCtYMz0yw1q0vJL5LgHyeUUe3fhkbBLe9fbG83FThc3RHPqYw5U7T/fVA5MlXTGu9AO5iV/5ARr+phI83xgJMJPOkVp01EFlJ0+jCsb6IpjELBvLt+fm72hOF5jtCzS4qBeDKuVK7GX4hTU+YNRYolrG0Hfwmvzd2nN969wLcpL4i7oOYeWSOUbGgBsia76BkSbJhy6oi8ACVXQ/AngYGpoDYl9n2w9rsCZg+93zTBzuCjGE8XoTSXQTrh2itjF24buawaUIw9CnMdj62rzoZhcMvB4Do/S0mTQX3nCqlTSAtvRuRvgli3rNbYykK8E8AEuubOIxO/Wg6pNTQvztm0ogSsJNRQSGPk/HsPDmpspUjct2Lbl5OUSGKqjp67SMwt9Y3mewRKy6lfWM7ZHID/rcUsdOpSKYEjNUGIs0I4vPTa236NnyAnHwD0RnF7uZ63gBUuBdp+WBSD+dji7dB/3GjCtX8gBr3H2BOejRjf32/iKWrfWtGBNfXTFsA1by90AUuf7ORPNCjfLBxPQG+7bcg29c2wvap7mKvy6mUnnx6n+0pf6l+oSolLY5ozuY3jLrRQMeGF4GruHOEIxw05suqawe3Wff1O6ZHBdJ0oKrpRhUe5LLJg385IIWAXCbfdaNYxcXWMaDVBT6z9rKbQef/UCKyqieV8F+kMfoc7wTyoxnONqEt8gAe/6GsbpkBMe9olmKBOfrtcafG+qaOd/t+7+po/eQe0enlum54XnIREL/815BU/VhbwEMHTH+/F3C9AjTaGMEfJHxw1rzbGfB2umcPPFcmFO2IDXrvbSCm4U8TtLb1mykT3KEUyM59wI+fPEaHb0ky/MfVqJE8A6LYOoNWAsST3Dq+mLEnRqfn+SD0AtJKJxi1mn5HR1XF0EFhkHR6xpYYwmpe9hjBDP/0ERk/sf6NMvdCfV/m6zM1XzcEX3Ic5sqJ0YbcbpEAeYMMY5alQQBPK9XYCcsWdV5Z+EphZp+qjsh/yPlil82EgSQZwmfr9Kqul3VFIZHz0T19QI4Fb2/bOIJcJFvY1LNNhuaaP6kgPNSWOLotl12LoZcEvQrlibGn82oO5TkIbQ+Sz6sRuO2pAuUw2JCO1QdKoHhe/Ho8+8RJGN6jfXZnHqJRCGRUBT7nBXIUNs4WFyCvGQV+1A9XAwMBqKkTZXVEKH4hV44whi+7EQwj7Nqu+njWwynn1n2d016tCxUpJANcFeTbLRduwOQf/rXADFg1BmBSvCDxn4JWwgM1bKIh9XPAK5jJ9KKcHEQV5eR42BCNP53zarew3QARwzPvelqvbJ7bNSnJ91S00cmCEEVPMP+p7oiKSxQeJODV8kmSZCZLbJOAKq1fDID0fMgzFCwbyPO9C7xaFwAE7ji93EH33kGu1YcUupsNqWD5VID6SGMXkVWbd+QF+ARA4cgdU/BAWNnh/ZHcnh8J5m2mMQx+NjGl5zXPGdwgBNELdb+4PWyla5nx82v8req6jki+V4V/RADdzLUPeSwB7SINvONIa0jRiIcTqOkHgPKK3DnhtCQ9gQB4JQ93bLYn/wlWhiUq6szoAdClaWUY82U8BDRqK8S81a8zAT6jvluJJ6r7BAAGjb/RujcsSQyy7RvkoHM0HTCkYqXLtaIBTQczLR9N/dVI6BvSQ2bQEuiOHiYm7HbNmIpGxjpPivlDEtSy+puh7rdVQtJfJEVmPNLOTIFdZ3T8plyviM33tWSxTOAQvQGOQkJ5tItd1h1wtOL4RgfKSDXMdDbNjpjhtiawnwzRwZ9S3Ix/H0eFKDD/6k54irKlSNt0TLBnGtDYLWVdOWMnUDbROe4RXXweM1Jd5LkWORXQI0aR74xWSJphFa/QcBboNzxmVx9Qu76DlQvoHDQGswlIVez5hPhTVRRJ/qpRG+YnhoHViSQCXNAEoo+1U8yZOMLiXiAp1+6n42lwnarWtzN3F0h78jPD2P0yhpCWv2RB2DfJYO6U3sbXmJ9uZriz+dBvLAeSLXlivu5aC2Me+8d8AadXO/WSwjC2fvTiDw+XX1BPfaeseONA5PDtYQ9fsgaktLL3fX4BXkAf5AEVtiQJAP9iBaNlsJZPhtQ95nSB9wP69GjVr+FyHX/E9mSabCEFujNq4HnJFnN5cxGf9Dxt5QELH8vkBBIPGN+xAAb8EdhLCp4OZnYqCUjUXt/ZOSE0kM8XzCMcZLqM6d1A2PPSAsb72dLVSqHaSFY52e0XFVKR8CIs1BL3GyGmMj+rZ/wF+BNCIYBbd09Jkvo1O0gtCxSQQKwn4yEOrxqShuyuY/WrdrGtwEIt/ia+T1igsCFkP4dflxSV78XteYolE59AisQJpf+uS17cO2J4278syFygNrwRtg6X+7Iqa4p16NySWNnnvt8DDO3VGyMKjfL9SziR22vA2aBSkCIRpqyy+4N60fth0hX+mmKYnsKdpUGGfE1D+wZiQBM5yOWlQAWa0pPQ6F0y3Kbc0xy6tQwJ/3HXJ3w0BUN1MXf0vYvAt7LJ4numU70nyK4vgSgsoAuVtfidJXMAO4qjb07dmcz9JXYdPia+nmi0390UcFv7W4zalp7Qh+QDptL6GoopQof0VWvUHb1BfpQcR3Gx/coe00LUAJsfNHocSw1DX/nSday5KqwZ7l3iPdJRAwr+Vc4vkZt1IAPay3dQM5ehNWLVUrpbxVeUNtLBwKZUjoY5+/F+g/2N485skkjJ9PkzeWDRd60IABVtsac2CEBDJwlMEVwoF1Ge05T2ibiX/VMxQYAGeQ4U40nAEzfA95i6KTTB7xFzSL0A5AisBwhxVbbc4hOOxzkMjKcdSLjGfRjmY+oD1E3TEyIK1Q5BKLm20ClwburLBjINNaNwy3+4SHVB1AT61PJeurrEOHrVzvy8UkbUv9s8P1vyEZahxp5HCLJ21El5t+h4R1vXRh3n+i3Op/qFqXrVvfYTCdT7vU1K5465MRqSXZ+cKDYE8xYx+lBotnoJ0VOeBAYS2bi75jMXBIRnavED9PqrkQEmrkA9oW+ItbxTKAzj+LASJ/46A8zsqwlJSjVlpf/I79QDfHu0feHKdrUBxkjJO7EWWMyY9XZuOeZ3RTQwkA8jGo8TjCADknMUgMrmwC8tX584DX3olYkfn1+eypyviMw7/v37SAto9CXxZN7rz6DrxTs9cKOhaRpV6hhhOUfigfWEEmho6LS1pXlq+/qRETRMCLDO4ij8ZeSP70YOJmAM33BIA0MEI8pggAOa51DrQLHfFjAlQwf4XiG1POJ5g4SAhxT2hGQHi1siDDzCgaLS/tCrZYH7RD6NnhmYq/rWhfl3yCXuIplRsD95qBu0Kk5uPQVRacK0r8MgGWToG2Tlj+dZJxknSpfh39fFWxnuo2N34xhmO4BxwBQPq2fLOxl9j9meDx/e94yCgSztY8ifQ4t3hPEQ92eFJ3eWw2i9V5+d57IFKkyyyRSHGejbwvSosV8cIT+qkQNVrKwVXswsCiX6bskVrTM0FecArN7rVC8KjOfYM9/YwdhauPbQL6Bi1SHnA4m/NkOqYu2dP86ziTsyVNZpuli8pQWshl2JaaUjvKg1CJo4dhRLs9jxnVssuW/5D50lCOgj5PgndezhQ5jtPJnvutIkBSPJv+OtlkOzEAG0NL6XANWluPETpYb6CQCbJr8oa32XarlONKDzG0H6c8OeipjA0VIFexd5/IPCDch7iYkxFaxs/6q7CdZtWWoACmIwr46wIMUuLR/yw+deeuPA6pb0dRlmXRtbsEuPfsP55ExFDvQZ15BXoz89Pe+EWvRg1yM8SPqkYSELZ1i8K0Qol67QhC+nMHOP9ZeIyLtk63Oo1hPagoJ/8ijdmWZIAHS8a1eadIjdDJv4YOqt1zdAFH8sdPqgt7EHDCPHN7lsmUnRLLM79cwqKpKZihUrLQ8U0DauoT5fj5mtiOqXetahspXDNp31/EcPx/VsSmHsXE6e63s6CKpOopPoxCanQI7p73ewVBSqB0eZDU/oESzffNnqu5ywpAwjzVi3Hl/z85HI6zp8j/JvfRxeqxloZJYnkr93d2wm9O0upxCqf07R4qH4357BRlNI1hn1My7Bgf2d+Pv8ERV/6zo9L8u1q3gpf/pBg6zpvz2ipf7ajLg0lWplSWGiH9jv47wgtFydFBJVhU3S/5oOMfbPjXcMR/+KEsjfv9B/6RVTNPuvvWKM+ivO/pvaxfj/Ae3ix0+7uPttFwvVe3b1//5WcYA8L2x6OWBEePjTKs5UZR/xAUHNILzuPxo44K+LNlqp0YlRMp3cawdOWMtMAKoRC7PVC98BYDFbsPPfeF8+8LU3Jut9uLhezoeb7BaBy6fru2h/Oi2Spr0kszcmndYGAxBstGN6w2AGY3q6MnUMDORoY1mxJM3iZ11XfyR1/KfI5CWu8344Lv+udeIVY4SE8C/CdbSnMH6R3b5Yz4Nvt3+onqqyyipC/q7wQR3mL+2AL74LZ/6E4Vfzs5vtWFZT+Wf/EmwJ7Xvfv9pywVc10t1GGoRN4+PPLD5SnYQ2sYjyqcOZmMsD4ASgZZ/8faC5vJpYWNXqCCGSZdrccEo3o/zV5zGTumihoN8g+s94vpAvNT7J8ZOx21a9MIIcgHAwplPbhZHMG/11vzzh9fB1j3AgBXux36Sp4gFw5Cd6u5TEF0jJoq7zkuoXRVFHAjWQr6NdYIWo9TjxGsutJZWSIpAgKOUI91Wi8TIWSv0+IFWifKepi63LPBXfjd4L9DL+vLkNX85doDA8HFERjysteKlCefok5Czjk6vUVBOyuZGS7zeFYmOL61nos1ee9SLw3cwcvyBnoAqsu8s74VePqIKJhx9jjpC52E4SkBM/xF7e1IOgu1hBXN5LsdiDq7wIxzItIKO+w7nbYueHyn3e1auqLD8yyQKqqQ3geFCVEaEt68P/pgQl0BPgr8JPCmKc1/Z4aVLvvRrISpiXy6tWhyJP8uYgpekgW+CwGvm+EAQShE6Z+jv8JAtZvffnl5G2I8++LTR8UMzGqrtOKwmTQxdsUV6KecjA0hNmPOu52dikEDE7q2CbwepcK/xi5CHAB9Vv5nu84j58Le/OMc6JsA6/Nq58nfyAgrqrhel5oTEb77n+9ZgY03SBK/jPI9G5nRoBKwNic6IHO3VYVnzqtKHyWByHSj1CHf5cHOPoTndx1ifRsFaNcn3rIYsbN99oImaYzMP6c3iaruhPKoTti0l7Q8LQl2NXsFAEKEWM5Pn6G2OyU52YGHu42aqqeqwC4fpFKdYU4hrcW9kR5U1ntcMV52QY1/nURNiskctgLbqLojiYCujIW6KzgRwSlzbv+g3etB2Xj+QZsf2puANLaj9j2BdVXY/W0fxSVhkgB67al1ckXfZgn2ZfyAxYvM/ufUK/rGQphfVx4RorOYYNWWW8JzGmheeyteLsLz3QF/mNxoeTYiHkaPqESowOtdudNV+AWsmtvHbtM2BHaD2vl9A8Xey5ry/jYiH7d2BNWt8OuryN2n72mR8xt3NcVJcaxFdTGJwNYKGoyetF47ihIDOPARREbddwEDGmT5+pDSvnaUZRhb+JbreecTL5scLEZyaYK3MGnPVbK5JdFv8qX95/eyMsy318UX6TXOYu0od5yxYHgwZ6e6QVLwhf5D1mEP5eUGf7ta39UDHF4eCqPohmbQxFr+/I6XPAIz3ZgMAtMYzLUwtF6AyQ0gkDn72ji1S1jzDifqlsS1U9U1yDxOq6y4lNRKu6OefZpyEmo0G1dc2faadrqP39wKKGKMlkTp2XZ5+wESTVWC8fjgfQ3Hh+plB1EN4zO3PRgdAi62aZUDjiB1AjPEdTKpysUbzRn60elqpZvhETGfeAda/jpYV0GxiwpOoE7UPOm1PTUOFbfcshnjYVyUFmffVfC1ZRpVmFc8TEE1e/H0ktxfVjmqljKQZPAqLXbAVZvZ5Z3+kFGm9aGRcNiMSFvR78Q9kUz87nZkbkz8Aawa7AHlfgux1BzciLc5jp7WjqVDxqIynha+9DPBp1LFVLeJVrVZFBaU95FguDO5kPKTU/yjKT+HDoqo8iHGkkNCX4j1PKsVPEUNd2tyDkOehkr46EqsNWQEDjrAFCvXppVsYwiRY5mZ2vzUAidY/qYvw4oAOn7EnY62zI6twIrvZW90c/2XvOeUPV86zLk2SN9vrLqvzH8JnEl/nCci/bG+Sc262EcZ7H6ahT9ON0heB80AQq0anaE3GZcqmQb9uTL9jjOu0E6d4zy2uf0uPgphSSMWpvauO2fJmWjiAnTVAAOWHAcK8LV2EmPGots4eRliW2e+ZvbzthWxumGdvueV5SuBxjxPkRr9bwxtZ+I2D/jGfFtG+kS3AetOq4ovJuKB4AJUwrCzYke9JSLpZ1hva6hp5pGeSMXZMN37XfbHTUmulK3xfBO7PEDUsZIc91f97YrbbPmOIG5Ij54EyqjuqQ75NkH0z9s78kawI23dCr1Zrj6wOPOAR93VQnS7jZUjTYL7XJRXsLo3M6Hf0yggwRZ3uezG+GKNiJk/oCZx+rXfVOr+BSfgNaFKzXfbryDOOxHjkFZCkrYaLQzjZq1bY7dfNxmsoi/7bgPzWSKk+3D9sXeVwcTXb7oBitMNXFwi0q8qbud3VXvlUT2XOBpMLWIRwO4iASq62k4rnfz6VGngpdRj7lq8txpLXRloYbunNf3xXGsRvJ0EWIceTufubH47l83PKjUxA7FC1640r55nE21fEXekuOx9MzMeJKpHxT5urIa6XnDma2Ct/r6kae52mbSUWaOFXTjxF34dqL92TCJKDxiwhxAjNoZqoBO6C5anwpY2WNaruEgqpzRrvh84wdOwBt8FFDg3xQmhSN6FsY6Q9jnoLaL3nqiaPL198p+zgqnXsp+Yxp/pFFeqtUKsG0RHmgrDIXbM+aT3SEtQpCmzVPKTNXZ8ai5Mzhe2evL/+zKaTq6i2H/c7rXVfP73OOS5Zkuta8b8zANde8p+j+XHaBOiN3a5y7QHTC6CT69CmJO5jnJdvBT68rXrpaZkubYk8TrOeXPWKVirddy7kKJ+gKBTQCwes+zItLCG6uoBh5558HC5Y92tncPSdTvG3glPt+v+fF91nURixLP2dWmF3h4X0LQVL8tOcnE/FJ4TwIoj7OiMS6fMspOy5HTwuOCHEOMwP4utMpYAFsUwKCGnqX1LnknnhTZIfnB7DxpmLeu1AHHP4MlMIMSiea9Hk9hj6jH9EAe+I8NuWQBl3mk2K58NEn5cHqoYhrr+Fa54cdZ/gr8ylR05l0yqhwZ0hGPRpMOtbzg5WnMyTXIytouaBmHSVG8Wu6GdcS+bGrlx4b/GCO8v6AnUUursXC8cjX9szrK8Wtd3tDojUlrLda7w5XUX4W9iHPdgqbgDtnog44DpZV6I7lgj0yZ5XyhPV9wqRiEHuzu7MnvsACpCXhjV3OKhy3jHhSzYGeFy7rvfFfBhIna1WTtvmldVJPHzNLZjumFgvE14iOxassX9CPo8/+mnAkHA1gtoyliPbITbgfSKXkIcgGuZdHoyyvTFg2UsgBA76OngyLeiVdWEzPqEZC3VcaxvDO1c1FBSRXDDqeFMbBx/Ev+qmYjYXs7PODfUJkJ1k+RFee4eoYMYdPJxqnreZxMLMGSNpM4c/yzl7iRZFxpqxLyXTII7xhiZxPHJ5zgUV+9j6p4v4xz94HHtWULLupv3XN9Xiz5oPNJJomuPe7SCb9OGds0zFKX0/qAeO4fpVsv8CR+qGl0Djmz9t6UyasnUjJxyMmwIXTD9VdJKwTd/y3+Ta9j1rjiSXshIgaQITTZP0nFq7CftKHZRN2TRMMddJ77ociS3D0u0mukSTVqD++ldAckFBd8sg2qAJLNs3KhhmH92PkSZ77jKb1JmZa4q2wL2v0ggaVfTYL8eoLsWM+H9O81MZww45B5wUzkKYSd1L9InYiB/vZCZy/VT7dQAmQx5ttnotYePFg5KTur+yeFZBoDT56SQ2iorrbJyawOb9mnpiQWYpX1DfgOoLp/EAt2ugN2FFfjROJkyG79YX0Kq4rIDmh3qGjyetUr0+eJT+ZgPeAA3yTTjdDjS2f3/O7+XXHVfbDOOZek79k8qNHIPsrWzWcYBbZPqt2yYlm+Dtplt868CpbcGyRrBUlTRA/Y+lb07Ajfgmea1Tk+9Ziv48KSzu6+fOEJTuLTcT8Izu2smlwy65MpjDbxtTopym9sjgGRBu4IQLioS7ZfLLpp/rx6FjBs9RejBaAVWdN3zdpuwjdcN5zBclFsqrlTkTsO23QIwguL8SjpKS6d+SHax1dTPsekwKSuMHQZNEFKbpHboZqb+pEJXVUfFuXx9VL/YF0imt87LPprzwWfmohnDTIfu8dzigI/0XFLwL560+RC8MpiiYxmv4PtTDirzRDYyT2Ry0M+5daGMn+lSDBKwRC4QiJMPR/cj6F/SvCwkIajhAUA3Q/9m8qkzH//iNAOPj6tx0BQpH/cFYFpf6TQ0D/Ww+qoOi/36aC8O87VsX+x+M/+H92rgpD/rNzVTj1b7Pqv91TWVYQZPl/m1X/5pT/zafV0H/PKcD/4XE1BKGo/zI8Rth/tiv7/4fDav8Lp9X+v3krDvz13+etKPrPHR6a+O9GVez/gIYOz/9Qlv23ocPF99I6/40NHczqVNzqgitfkTUFN1A5/m9n//B4YEIzhpslbNk2OlNLu2eq/TRFezJyGgUNHTFPeVeW3mMnD2uGdexTmLHxuYYdWmVwexxkyRkSmQ99GxmZl51IcFTNQzjVKxqBndF+265eW8ZUe8JOubZMmySmfMVSp/xlJtg/YFiW/dAlRd7nWRU0Lb/zCN1dl5Ocf/gm/PdG44HMS5Lz929YP5SJnnu1nPqP3+bXEQRVff3jN65xqsq1wj9+F5LtVSjC/9OTqiyE5ypCYXH1JcaPFjaJt9oZLN/tJ6YOArUW7M9TOUQFP/oFH0rIp1HhYzzdWb/Jz2sP4DEIB+0eUgeH+Aih3DQpIfn7eGKpJCt/GNIoYF+vvMJ3kqjiqSTYlU1ZbVw0/SLbvlDnoilQr/E7jMPZe6igpqPJHDuwAfezj9As1YeB3pnUxP4MvWPJyWdDNLdGMM1nFGOBOOhwucennxH1p1YIkiBxKtom6YJiaCdHH/G+n3w+WuznyFlzhPcmYeZFhzKmRSWmZCqWvmbbfb8dbkYH8h4Qk/+VkQ3c5OGgOBTyYP4HzZ4qvhoyKsbPIpkzWOp/ktAKAspl87Ep+K20ZGV85UscY2MmtoT+brIveyVe4NHrKpb8xec02o62mClERXqIlX5Lczu6I3sbRRM06reAO/40ba6d9GC69E6hfLAlGfUYVqYHs06eQ89jp64cXnhR2nG4u8akBF5VJbFHwatl3KiJ643nc+ORrJNStXkw1QTH5pFtvFaG0qln+XCYs8Jh61BGjZ6xBxP1sPK9MaRLXq5dUXjYzuc98x1BBx9UZdwW2kSIxNBH4wwNYbvxieBYaAesdzrqvPcIVNZRP3b+xRDP8+DOg7rJL6wmjHN3Z+gNK/An+ta7U8R9mmqQaRNsfB8Vjd4F3J0im6X0QzqfY2ksuBnWNX+uOlaW8hnfJOrA32uTI1rKTx0fi/BqYd+WRQlwLQqbLT/p9qojP5/RNwVH2CkXXs+4BZtDXy0mvKyM8WydhQGalVTsM/+Bffn1rvIHsk+ard/Cc6veZFHZm4qUrhOT8CRXbX8apLZX+E9JyN/msExazU08OfLEqe+LC4tipc3BJdESq2OXc4jRPyyxMhXX/4lA8VieHmJKwFYCsothGYes+zZDsoqXlHOmFDP7rOtzEG6PC6rOE8Qp+7Xk0fBlnLn5ivnpyKpX5iuOFApqbIe28tBAsBoZ3iBszY4L3Bmm2GXIdo9urKcvpl9y1M5esyvo9lu6/VRUitNmDrdGw47gw3SkTWHkz5P7qRjj5pV/6ezxFNW3feVhXs511jPVrNjqHFDhhNnmwp9xQrgQK5uqv8nq/m2vdBcPsQ9uRZJFMZpK2lreW/VUBpDNJWxxb1hq5Fm46UXMBBneQLeeJAp3s0XisEjI9bLFJsCYs+5fH1iqS/2BD40BIvhbEBkqjRmcr3SWwv848Zf10okjhrHi+aHl108Tji0q/jC9ioA7wGWMgU7IeUeqsJ2yJb5JTrA8PkbY8aUlO9JgX+m1w7TRjyL5UXwlP6WijAycGIZqdLeHo5jsc/7dESWnPtrgaGKWE75vO/Y4i+CNrod7FpYd9pOISsyWMJwzGFRMYlhavs/461GMC1w4bmGHQvUX3o4yJjCFi7fW/B6dAvqiQz5STxEpO7wIOHvLSAbcOWnExIPsMNuhrCtVlP2XaJIaLCZ+WTO/D4X+tM1YridstSSf3MGf95n3R0RKH7aWl1oUnVqj0MufGPptBui5GOkUEQvPDF+lIRDPGb8KlUyk8YPiMKlxIC05zs8O30n9blht7y8nCYU5hOc/Ox6h2YGMmaBa3rmuku/kASfGcQ7fo6Jaq4nvRvKhcDXy4lTYh53VZBVT2nwHo58juARLa2pxkkJlLXQ/8jfvDrlu3hBU+8BkBOkoVa273jXgMHXdwJjVjW2QpF2r/Dh7t34jaizjXoELi5l9chFNlmfknMzUWNf1F6uD+oN00E7o2cMO+aUeltG/+1XahgJjE/GTURxBsicxvlLsuSiGqa+dbo2e55uio7+WajZGliC9gEKV4/jo9YUEjhub2N31+6KyO4MZ07SofYaYXyr37iGWmJbo0xBSg1KGSZQvDq2UK+jub9cjXaWLPIO6aQvdnBt/x539dInrhm3k/AUm9YJD1VQPlrL0RRfjEI1lQTEmSuJRjXt0hwVfgfMig6dWqmrBNR3pcY6IMSnspBrBI4Fth2ZZV7kVNcx6nQysDKtvvrza1s6LK+3fiuMCxhy79Z2bqQujmJV2b91zh+C75yTU008JV6C4mThGJL8+J7pLcynwNK5z+895u+8n8YZLtCJeCmSm9hIlz63ozFi8FjM//BLteahBhKeMQ9CPVvYb2PTiU4HsA3WuxmAmT6x4426CJFwQqxZP5fb1HEAE7T58QP7dqE9aGnyxrL3FFYMEXHKDAZztJrrZSutSTeYcQvGpGBmZF+xF7y/llIvqk4qjouhv0/RQvtOGb3wxN04b0/vSo+2sP103oczXpq1YXa1gXh7c/MwU/eNiSoT0cbXY05b1rzFDaH8R61R3Q6JXEHiuw0plahhY9s3qGkDA1o0N3dsIglEG4aIqV76Cd5fsZGrLyUke5bbAkincO6mewZ5oPGEAkFbHVC6n08Pfz5FZaJOWxpMf/YRX0f5TXxDMrHwn4WeVtntg9CPfNfRdVbHW3xdBoKiVfwFDOu4hzxx3tXK6k1e57yCae2T7wcp8fjRbEBWB/n3pTupU+Y6ttJKgyfFpTfSBHhaJ8ic3D/nTNOIxPlGUx9mXXT+dq3GK9L0iwZ4aBS0xBYMVuRPQ4iW2sQl86ajCfL3qrLWZC/c9uCXAZzd7I+53985Y2ndfuxajBYNXUqOLfFJ82HHTtaBpimK+ZNIjjbfXNbntqPjy6I0AKa9ympM+ZdZIvBn2IXGrN1dVdS7UCGv2l7DG3k5krDHsA7sue5i5xzPhbYJCmyAfN1g6n4r02TCrZkovtUvotvPHQ1F+4fvxmDoNGjR+VckkOejk38++40/tJuKuXLBMPzEhcr+uG+oVv+kl4qZ9nztdxzrjphnzaN+fQM7l8knFj3poCbTcbVfY6LEpfzm8Muvdh1G0UHcDIKCseCBTLx4+phMO2eMTCcRFxzST699hF4E0Emmjh9xCWTvGUMI9XMOoH1h4iIDa+jquzmqeA4/2Mmkb/zgJsLb1hYVBf+aeTuYSSpvT9axyi3iLFmyfGmh6TU8IveEqT0NJwASnwBwmaB0SeVVKbj3db3gVGnpvtm3qP7dHv6t6OXArTNWV+ygreo2m+itw1M/mhnp8D+CxE/x3R0iZ2K5IqbZA06eUce2QBKSQOFRdpKU5297NxpQNwbSvc7LLz1xxWnsgnog75eB4mvTtu5fyAW40qn3HpBEwYPWzZ2Dx4XYhM+Q3xydZOBK5c3tyD/yH5TxDNw6s+Ei4j8RJTcHEvhuE/MlbqSeNKvFIpxDjEoyf6wbu25IfFl17SKzVyuDN9WtkuooTneoZcegGm82JFdTxARbbn5UbTThtfQIuwecH0zMT6Us03BEmN7afuC8qYoGryj3XcjQEWHMeIsBr4IqIUSbBvz1WVmEqvEPxSqL9Z18W9qoe9POeHFvT65P2vEWOn1XQupDvB5DcsJZfjlx95fIzyuO3m2a2qcl10jknSFcjQyNDI6ILCIJKbMn+yxIIq3IGYrkRIeZiLeImy6wtYfa6bdR2unpKu/ky7DQllf3kzCThRRm6GEPheGW3S0Od12Wy1atZICHrmEQQR0gJmz1ThsVC9HmM5U/q7g8DJ6+FfVh8/mFDQYm41obNVGXAjSFkNs60vPjB9Vpuefnrngj7melDdniVMvCWthqx9abpQI+3BTM1D7AjT9cGj9lTTHsaC1M9E0XF/M99QeYB+BdgKWMm8mQHm3r4TKcsOjIR+GQLckIGs8KXBjljtg8U0gTu1YesumTuHs30jrTJ+1M9dFRjh8szcC4NejA0XFWMEtmh35pcwI9iHZFD/Dq86ClrEBZulnxfUG59hyG7EpPn97oNILNYa3guW94dKCwruFGTKCGlvO2DQe8YrQG6eVwuhC/zk3mTioryixkqzJ8E/Ll4MCH7plsQWGNi1zks7ud7+MbEGfDQiewiNG4ZRC96Zg+JKD2fBPWCDbYYDJ1c7RXIYdu+K7HwMJPYxXe5yHZk895EGB3Zrun6RRq9Wd6SpcFYMdlXiM7i8vhRLv1co3BzoUFu0ZzxV0X267OzlZOyzhJ/e9Rv3cD2rWvLHozNf6RG9UaxuYgVO254fiKa4uLTvrnku8LzsRk+ndgh7Zmo+YALSfhmZXiIltzntXelg3upkrMsuodLlXsZzHiBlBHeS1r8UxIFr9NUdD/jkQgfj/2YBWMwRJ1bdlXIThygUNkXXW7zj5YY5YF3Hp++7Lm1m3253Bg50Z+frI0rI0JFKfQvkWN9RJmQ7jheveNrXLlxrwHJEb+AW0XxWjorJzCsbfXe/kSthKlompGY5Mu9hdSQl6d1Y/LQPvxXLms4Fq3NfOYRHDY/xUDGEQhQRCsEJKuk3/CgNQ9R4wGLH8GZWm1bbSnpfTiptq8iM91lfh4erYg7CG8GEZnh0z1kKRKseEX9enveIzZ8rKlYlRThZm9dWHOJYk8sJaNb+R91EJuTM7+w63uE3MN4FUounJ6Vlq43YU8Of9xDJ2onbvNN5cW6OupsEOgRV0vQ18rm3FJkTMeAV8m+e9ZkdapFP/N2/M6GPkpKRJHYKn+RI4yv6+jcAssrfsbmbgmQy7ax2yoc8n3/wIXgDKefM+M2ZduchzW6QEyrax3/kF7yvDUGbdMLoKemmt39RB6rDVYxLjZC1t3G4F/id3561IPsl2vV+8QIBr6IONZswu8ieGKBf2TlSPJiF/1vhlwJT5BTkReNCXDGpLcARaTujnuieIivjyQghz8VlGahRpP9ccAWD+OEvqbKGPLgGHgR+/ZDdM8LJ6INxfNCj4SP0/TovQA5Q3O1HQhrtrE3BqyI4z/4QwPIscFcQdKPygw5RRVeN+6g2DDbLG6ezSMJUAG43pW9hj2AZeMyexSPjyGUVGes64VjM5S9dlkhdHLCjUQ3xV7rOtkmfg0P5oeUbGbdX2eLSYFhnh1p0BNZb7bZe3NbOeQ0VgjU+GS0B+75cp9k8Ektou+2+2sMzEqPtPRttgWVNLN8xdMPVqWko6lK2H3QB8TFnHBYe7aZtvicRLOxiNKar0+oL31dV8Y32VtBEcvBu3qHcLAg/DqAn25ewtw59AVOT+lBFNvi+aPpsXKdtz8VoV76+hJFJ5expwu3ONZis2TRCM/fudMCTz4/qZOar/qmhhTR4rGoWz3bH7GolzQiA15avjm1W6c4zPf16OCejj3PRaRMgdTL4IbNGrgalIoPFdXogyBM0iFmRAcgbrROiS5j6pkiunsqvr2Vi3/JNCzQqcsWTa/ijLmm/84C2qtPWUQqQGr5kCq5pCvWE9tUNXA/BTm5bKiPHzoskWw9dyew3taZJ9waIy/VwRRLtvwP95pEt8aU3sAyf640fykIfNHqPWuJWrfY6no/jDfgu1n2uFosGJ0xoGr24UuZE+V5PBR+6I1Qwdst0XDDU8ZDE1BiM62ZCWNe1abxg4RfZ019qV2wr7Fx0p1vmyWJH03//qLQmfSrzj+9MUql/npUU4/hcfNWvN2/M2bY25XhYf6YWv9RIdoas7m5IKY1e5H9HMkxqpbNkEzFaQf4b9rRVaFxYgOXdaAeSQeEoV89/CgQvv439xKEP/u3+V6zb6jgZ5rhlMgPgIvsKJ2n1OhLIYv4FaIAJb3tLt6VbueVq7UXcOu5HF2K9rPHI2LQeDT4jIornojbw/aPYRc+Q2OQ5JTE3kSxaNa9zFSxYM617VRYmXLWmPpbhKfWF7thilkaqN4jiX95bv/YUeO17NzVh1jfvVtHz2pbnZnPNZz9V65tyYteTJlsJX1Qrd/cMkNOn4pe1C1QWStH3Aa/5PdGPp99NaHmM+dYLz/AU2Tm4O3hFtoAV0IXLKsPdygDPHE//YLWU2ZKIqoZ6KMBZKyxfKpcHf4JRCI37mMYGiY8Hva1P2y3CLxX4MMTL29brkwkfOshiHJYePpeNCDtA12Xfu3Poi445fUVb5nQuxJ54zDuaMSOrRIGxMrij5JKTwQxK5bs1tiWP1NUaWjET4H2hM/rv94LDd/CQhTT/UUtgpPzN/cIylWr+sbVH3zVJVucBp0v2n4bJZH/LeEicfgTlkKnL/s8yi5ph2jtfXW/ufq9S3lfDINSGBm2hp9Yucjri2nxsZBLO2hWZXcXhtLfFhDxW1Vs9hIMC1Z8hZawvCw1Feahcr25q11+3XYUENiaOhjrFxvF0QEPZBHn8tJz1sXPbyGSiA5YtuGBVIAUi4mmSx8GCzZfYjQbEWTm4Kk/5oTk5VV9RP47G5/6E9YTVJmdPZHJAPXxN4Ql9kIbflAq/d58aD60N462p5OA69fGqVQOtHa0V635iLB6Ww0JtZtM6Rjy/qlQQzkI1OlTk8SffzmpWvhgEdppHrs5k5S3ee7VhZxIy3iKyzq+0s7Ft4ySAHYosiPFsVs2KokqruUe4c18V+ziJ6DrVq2vZ7wZCT4cXqApQZ/G/nW9aVZvnOn2udhEv+1ZFIp/VphW7TOGvot5zMlN3B8lhrMmH9/o1890icy+teYreLAj6RdVgBLgEaGs0+eKd2F9TpJ3wS3KVN3lSLFEhoCgtaXRl2ID7pXP1sQw/ovKuJ2wWhCHY/TYNH/oFq0vzxnJA1yWgfZ/Fmh8xJjYt51Gy+8Cip++pkHqh+JA+W6aNwnaNKcqZYy5Zdj0RfkpdqBlC5Ncs13MR8KDVyB2L6J8HLMJacRk82lBD6Maq9S2pQT14WvjwlrkgwACz5aOM3nK18CAQgvyF23GEkvHxtZS0ZzuDN/dCI5PgZFbAhZs2rj6+6nw7GxJ5Q3YaeN+H/Gy2xVQfXLGKm+7EHNIU0ilcrD7fCHWQJlmozpOGd1JUOD2x7xGyOPILeTFXSigKxF4eaapP/IFr6bimPp5fMMCXofhhvM9MPJVfzaSOa+yeJRGHW/++2TQfJ+oT9E4+MxaiBiaMPmjLNrxNkaIDPo9DJqkD5uoIKZbrHxvFEreeASLtejkmvPe+DFE8npxTGZ8emf/sAbt9X+392XLjipJtl90y5iHR2aEAAFifmOeQczD119CeU5V5qnT1d23u8rsmlVaKrdtSSlBhIf7Wu4eKzAgxhLfZBr/geT7R9oRhTFXYspQl+9tssAyXNbWWnxaxVHEU4FGWnE9zfJwauZzDWBl3VHrbJ2nnsOHNkGatFapRQrKWkLjRtq2cDQVbQbRtRkZiayo93uNEvOxnt5vjG2xryMSFpocxhRGjJ4CWzR4CCsmg1GNpb368qlXXsR3o1qDEa13AlYbu384zKkc6jUZT/uGctnnikJTslg+oAtuUzLqHSIDQ0vvDkcesSR9VrKvRQ16h8c3coqsFklox7OTmcgX5eJh5188/Ya9BOtHY3q5EXHQ8qNRHQhaatWE6t7JjP2to08sHsxPRYfn8uxvrOyv+HujEcfUVJxMUWH39UtfNiXoP2MOya7EEgnLy6qB55XiNGcwfoVua2Z7vx8hxpCg7nG2/UdU18IxNFGkAn7pmYOuI8D12QKfZgg9/M+avRrGNOVUfRy2hhOMqEUzOaNa/dUWgBHSEpWSO/1vg/s3w8lOEN2hhM2H7Fhg2wOHS2jTNvvpyH1BpN4mvP39QS3vd5J0lN2C0o1kP8eLhxRR+Xa0slGGuW/AyR19OuueA82R80pboEiCYh4s8lwF7iinBtFb1dZKXyC1qzAuL2r046rBxW0n0xgbTTYJiWBIbgyi02m68rriLOs/OaMR6YcJtksHeUlxnd5Bu5hPgwHlG+ClM257vlhsHYhCEHPzE38lN8jwmAqcqcaXDzyj4hH65JvNZ7A41kVhaOcpd4B8fjUL+RV4EtqAqFlqF3RjydPtdr0YtjC5IawkUIDSrZsVsCbWfOob3CGN+y0OHbMjGhWhyc9yYTyIHw/rOfPGJ2Ma9p3fEXrURixUiGzhiTRBOzon6C0F8IIgt361QD7ZR3x/1dMMx+8onH5wjUqzk6bmZzWrVKUmkiYqW/uS+6ngoqcN+zvT8Y0/1OvDIpu2DC49foY1/0FUH/fgMNGEfPcllepEdi/d9BT5/Z2bs/KIIUrydPsIQyhBe6koVCRykUDQeZLoM1gdQDVd3WXoHTfpBKO4A3XzoGqvdtU1C+AiHsMs5pI88cXq9bb4bd5O6xTWbaJj9/2+63an2M3bSMfNYy3BCTY4aoJudTlzOma2r8PZ08AAJJaPxa486o73ilbCmN5/zMzNh1IS1zvajbpytyUwxTTHXqsbZPzjsOaMBhKm7B3ub+rRZdtABIC7pNyy3eBRm9GkMU+NPkFVy7K2oLTk+f6+rxIwcEuwQ60hLDedOTQyMJ5YHwxe4/xwcTtdKD8wKWl6dyUS+q3oeQLZ+Gor+qFkL+ROIxsLER0Opu01TGVNnU1m6PJmjC7nbSjHBZReuHlEs+1HkT5XJV9X6M9RujaWFaugyETR9ahCXDdAIDHMn8uB9GjnU0kb6vRoUzSbUoQFM72RgVtlhEXJr/Ke5WAOwMbKLYrlijl7gmsodMlrkCoi3izPt7OZB/O60P4C1x/dj4qMP+pDmRlaFea8XJCEnxTsKNQEpDsj7rhKsueoPNJlp8QyZgglOj+IrsHtSqgrEzkHs2bi99uwCbzBLjrHiULxSo+tlYJkmmyFdoN9N+4NWrQ83zCCIIIFp/tSDntUTPReI3TsuyMuf2GH8pyTJeZOw+bq9jBWUGd6h8OrosAGKIKiS3S94br6AklgUTgwkpEQsh9zUKEK+ZF686uQ98J5A97DcUihFj9uILF4ebmFheukAccMY2SF8ea0WPA7W/1ujD3ZlBldS6CTU7bQRCGrUbo8EQgxdSZIeGXHwHjJ7TwGwLC3rEG80ytrABeXU8sn//RtM/B7jOu1mltaCA8XiydiSNZ4z+T4olsw9UIYxUPzgMiF6m1lqNbG8UFKaO29z/DVCWr8EV6rwW7ivCD6LtteDJKCD5RKiOmG1rRZNhYWpHq8v8y4L3JiWyjgO11k0DP8Wm9Q3r9AAlAkSQXRsZrRpmUJzghvAQlmHm/7wPI8dPMJDJgB79hzKJ91xouvK/osn6OnfQ74wi66ygOUBVEKD5UCABaGyQ/YFUGxk70JtLKtzUxvN2FNgA0ueN0Th2uoSdE/rRSMGW8yXnUsXQ5CLydqTaN/QPhcyFJH6LUAPUE1lx+8jrvvm4iTOXGp/Te+Yra8Ox/MlGNkBnsSrR/ZlCaJT6Z62sZELElPDCnjhbAC0aVuFJWd0KIghLp5TN0bIYrmdLAYpeqNsGbps8QZRFO0s4z8RjHeMimb/NxEgjiYlwQdX8Z3R3TPb9SEdnwS7lV2aetJ+RDZjnQgQKovETlHKTG4wc7xVtzNkt9WfKVgZcKBN9nj3iJJwT6VTbVzjibWEMNnY7ZxTDWoJAXwC9zNQhupJdxYhhO+BeCQ7nPLn5GC3naLYfeqJAStHmUEKnrIcr/1YQ1O6y2jfJo8jeWZSZj3GcKolNAhnLe5vsPVrJxRyjZuISqT+nxX3NAzGWrQ4b1aXnIUFju+Qnrt3cOOs5J1wB7Yr/GVixxedXYt04NqUvKT0KDFaFM6RXDBtnWOxQL1NtIWDYxuWiuCmfGWyPljo1GZMJI+jmajOHWREhiTHEB68iPPeqHKGLdS3hqzO6bC26z/ctc4im7fja/SFprtN/4D02I9BBQGZus5QAr6ngx11wPkZq+ht102YYyRjCzrhpuEr17EEx8snHfN7jlwBUREObll6G2yUIXTkPvUNAmzxdIon2KzKLSMS0dWi1Kat+lk+ChJkC21rjOdPDp4vbSbW0KPD6aTOrXG0aPXTr3+4ZmMHfW0zy5dmax0oMLdrgtFhn5BYXaa2fcdgUAPiCzh4heQTmF9Q17Ycz3xAS+hmt5mGtZ/VOBekrwvEU0fxDuZ6F1Xuo/0GkbISm8KoiE82kBwtFifA2daPGUDxLH0CssQ9UNg8baXbzIGGAptP/S770me8uOY9gNmtWk+PpEJsPYCr33bQZ4NPfsxQkziC8FIKJYHA30ArD/MJU17NtGV/TQbjH4AGH9zUrDOd7V3B/w6qmfngPdi2KkVklEeBLqBcHRzngjysmSPssUsZ7swQO3Tb79by0QsH4J3VZdt7znAvhKwdFHRuSxP7OQeC+ialFlnQMKgbbb5yl8REk84JHJm5bQoGh2z2PfAyQSEdxRBBewJA+CKZjCQB531Nbgheg7i3BM00XzfAQg29eVVbe7yiZDJ2s+9h/oJubUvo+hqG28nta2XspkUf8xoOfsSi4J+gSMsoE8OYId6O5IN0B6bsbc+7SYjoPWhNBQ6v7aK1Hjk0KuXW/OuwWRByb8QnOtVsF96GKMESxjO2FyvPSV7v02kpLxgPKe99wORHSZuEZvPTaUil9E7aBooZF7wELjnx/QtwseOEdr8R5feIAlRmUtZhYlQ4oKLKzzq5wqjVkYH3WjtC6G9AedxnkkGLDShqkVNdA1/+BkRM9LsFZs5cyyOb6KOktZ4aakk9LCVnqdGZKPnFsdeqX3UiOkKEEH6D1mElGwLDVEmT6m8IVrMz2/8FVbdFLj6+8NiJcgGebrKPEWKvKgPslkeWMFeQeCM4TtCBwPwM5ulkLx9mHhO5JUPoi7vUpw2IfzKsryH+NtBAyKjee0Byree66OwtL/TqQKzGgeeOYLwv3q0ox+3Cey/dJdyuyIEP/I1ZwnAfBaAzfbi9pBydD+FzLBsukshKoecx1O0dOGQ1RGfTYlB+tsdJjXJd+4gaySvHDKy1ytWf3al4CeYMSZO1WbEvNLkqMTTU0AuBSz7lH2CuEnz6Fvs4krvH3GOLdSJyeCGraOJeIqDA3pewsSnMm/1s8bp8uAygK8TKx1NcOa2rXw/vioYbvPtTCpIMZ2k3EbcqxT48XXoj2xcxsY0omCzbHceR2deDtFu5I1w8AUp9c9V7sK8m2CorPf6sI0xGBWQEPmsRKWEGslw4SK/3cV4GxReYb22tsBe2JyS1nuiBM2SHmDV23Bc6nJR7TZNkkHMMhcDaNzO7mSl42G+kWS20ZKxY7/lPJ9/7fzdOD5cQYW2KRJZlkLSLzwhc5/uPKAGmFPLRPfHG4eKzuBHGYtQAC0MN+eTgw7MkIWr4DSA6fAHhtiZ0X8cu0LG+rdjC+rpGRJXI2TNZ1kvrCxPXYh6rqWkS6wfH0sgU8ikse06Bcbybqo00i3r2bLanfGhkdA57N687NXn4jDUqJLYk9rpccV6CxXK3r0SnOVME6Lh2y8sGoAmGZuopSfN0LUAMairaQXTfetav/fqS/7cMeWNoki+MQmZVXtwdWRhI/lXeRG+QAbTutoJdH2+M4j81PoIdzMLiRTM7rwzmgnj8FheX4+zCD58j6++CMOsXPIW6Hl+wquV3BZG4sY0vg3hmfvYXAUMH/mywa9qzxoACXiPupDu2FMh63ExbDk9cQHPEG6YTJU5Zo3C0dhd0NsG3ysXkNMMYEfIaQtYhb1wlYQY7/W4bHmqVHtBkG7PyJwmpW0robA1bU0wYFHJP7ZNaN6DkWuuasaXqD+Qfo3p94HqAiHERPX5nEbzwk8hXd9eU224wafuqK3A9cy4ihjzUvyYyG0BIBsKKhb7qW+cT4Cu5OdmRdcdk2HcwEhufPvtJFJLEdH3jIuTOz05aSndc2Hwj7q601Kr2dpKDzvg6irqIUawiFbWL0wPB+vCVcgpAYDQHQO0jJInH7EXO43JuR2+ogpVA6AcoeE3xXshPLBpuhPs99gloTu9fDvKRsaGP+CqQ0tWV8eNliw02geghk272clzCj/qqasSRdtbs9W8RhmmnE7q6Q+GUIREs22pkpsMofX6U2NIdZWQYr/nfvDf1DS2pvkKkj0OMtNh8V6mGdXt67b2onPYCDnHyVXLTU/p+yEOXz4xr9G1bSsM+0nCyq4WEMvISfo4ETfGCyb2oG2A+FGiRwsEjh1NfE/YxPk3zXtNuwh/czKJ1ZxclrP8rgRATEAERiEQJ3CZO4gX82NGWZr6CMvGtTB7kPjc66j+A3dDUK+xuwQ1L/Et8Fe+Ysi2zmKG/phYNDhZ4pc+f53+POtagay9hSKNhjJ/HXSw+FlOT64E8kHbWMWy8pmacVjqjE7dhCOMpTcV75JYFZb0rPCDtj4CSLlYNsGiz2L5qDJvCVTPcVzBx9BT0OatczjEL7jLJq2aDViPqx4qxHwo4eLCBz+ylSdp72wR96i8VssnHk00jttqCu63JJ0ce39mY4veAEzEdWZIaEzqj0J6+TTvfzpF8yVA87koV6BXbj4VWC6TJ8o2EEWR2iHF7+iNbFO6cpyv5pqkZAgmHZ/iCVTJZxgnAPvZnh/vnPL0Dtry8yUFp+c6IQjvTQFwTBec5Trafho6VhXzW7/zA1WRZWswxbodkMEF6zwe9fTqgmekkGhh2R7Ii0ly+7mJzakSrEl2c3zmDDtu1yKZKEbkX9oWJ40epKSvJ9t06SBOIaMRhDOyXNdR4gciIHiF+3I7veIvudPXN8MqjI+rfBtnHnaFndrHmRlnFAggq85xP+3+6Jk84uKJOi2PqVgRW2t14Dq1e93gI8z09wtdXuWwJUXiELoQfphdozsWdcxGcnbxN1FzUUA67xhiLiOG8N1qYj1LEGaPWle/b3rUjoh+NMUwS8ksCl2LGGv0xOWBTu0sM3m/gVePlEX2BcoAkTjNkLU1481o0Sl7P746ymigJRbk97SzQ/oUce/9OOLhxmpwKxfbXnUhcRjyKQsVEiH9TSyFupFjyJokdHaegOBaudgllCJsZK+up9ltbOstvfLUR6Sl5sL7CKN/e7x3qZnF7Bom+iz57HJ4NHUh5nXwwYlOOp8i9xIk6CPCPFM0tuA8tmU4bU0PfAp1QQShATJIXLs0rjHfhZ0A4EPbtql63VyctrqPLw44R6eWhovghsfX9nyqxMFiTuHK2A+ZYEBoU1z9w14dehd+oKaNrMfJtFZ8Mw/bemsdUg57dlMonK/DG2BBvD6nmXs5Yy6pdGIpZLPY7zLAXyXMCnfMejb5p9N4qM01hbwixoMTRXag6mWSSNLvnZFQm9XHk5RySZkeUn0TbTKjPSP3iG0gagL9EMVhkq+zDUanSAhtZd9Hhj3Bdjchz/h7pGyMadjrczYygiWRLjqOY/BKRFt0i52LdfKlSuI8GTV8u3lzmyOGv1j5+6tA1tDpMFYXo3lBsydL9smngW5Jv7VbcmAO4/Miq8S3fAhpB+5khtfqxg3fDZpqAtlK9ko8iAMZzu1ViIPWkDdObax6EuqRPynRBYsvAwWYG+1QBb33XHYDkcbuRvW1kZe7rF3YszMoeoWXgy7zNcc6TN8+FTmapjbDrwI98LtmFuso7ZhIaOus4Z669VpooEWbJ3Fj6j+qk+DxsMmuUxjlhYv41bVsfZvkm9ChgXkwq8dEZ1Eiw9yI12ziHCX2EEudDb7P9Y07gAwQ88AfD+9N9NCyZtCSdTNIZdlB/NDRPKkUm6ma5whpuHnj1fljkJF+ee3YGIWJP5sWgx+KMjLAce97eIP11hQ5O7GxXLgxb8qRIPdb8lXsgfpBvdzenQ2SoM9WDXtVJGxjO3/pQb1ML9QAuy5F/zDC6CP2aK8KxirdmGNaxtP/ShsUKj5o8GOps+ssjmUYa7u3mZIitjxY5cl25Kq9ECjd1weT4AqHpr6KyI34ADXcx8Kd/k3bnAUgM45RuAOvelVXfLqJ++5tfnWPrDxRzr3AF2/xvXCJxGcM+r+hxOR5Jy2O/kZiIBlVtlPfPOMsivMfCHjR7WRgF7XvOfc8qwnsQJI7eyjnb/44d4oBmCD+PYSGwBjpIRc/c9FrM7T4PATNjQ1052N8Kay456RgkR7OVGhvmbEJWFZnb38rZMGwXCh5SXK08sy3JeNqWYYxy0qTPWzDkjdCoOsd4EdNQCAekQa2IGrIczu6hrbzBiJklHHOkQcSwSj1TpXBqRNoDS/s2TeKLLBLa8IqkqnvMFKC2xfjeIO6FOrQUHH4eQV2EABKcKB1J+00jCFv5KkQgCkDBncs43Oe5UvQvFDDMka0IKKSi1eHrYwWvvislpp2P11ACEBnBQL+me3TJc+jvlwDu1zkZb/cD+eYmMUQV/3Kt54prIdhuJ/zAF/NOqWcaO4i5vYMUvLKkYwERncwylGJ70nd6mAwTO2X7tpw3xqltVlidxN63SlSnynp/PbrPo7Knqi/Ang+LdA2J1owxgUw4uKxV6rgc3nbXbkzJgeqfg2v6ZH6TvOq3zfn4oN49uXrsDFMnDP2cYKjitiKXHnqkkfgUz+yTM8Ww/60Yi3yhCaxAxBqDZwzf0LlIZGE2YPusC13ewcDAKxRky3nC1BbFOsx7Sjb+7JF8KnP2TLiJKFRw0vlXi5M2QZuwxcJG0WDFSKLKvVSDq99kLB3Q14AhExG4+Vh2tm4TjKTyBak8AFCA94uqL9lG9GBcvE6tCXp1es1IuUEdFbcUHzrZQ/XdmGNNQ1whIi4Gx7cVefV++HWw8ROYoNZpBVxdI86mrdyHd4gi/VbBgjRadVB/df86M+xLHUlWkx9us1UsOQHqkEmXOeWB3CjbN0xmVyckYwJtnV6uuBNzWdBI5CUbselh76+gQx4FIqxGY5Z+VzH6ANLUUOX0/zU0YMBUbR4M0tyIuel9o/wBcZ2SaeFLaLRbi/WWL7K4s0xNpv+g49oGmkYN2NIX43REzYuk6BUyTja8TSqgK5Cz9OnirPLcfVPH0ZZ99lyyD1a7YUaBhFUDPfTvtaaowmufSrNVn3RNLDvzSvBL04PEoNB2Up2FwwdRF/Dsjna3qPODsPd02cyQyGIigK8DyBBeeCZnjw0sMNM1B6hUckZVd5ooJhs3rcyIQ6rfgM5pceW6AchLXOG4dlbFCUKKrstFioguygiAu/5OFEeaS0Q76xyTFsMXknKKzf71CuZV23HpUUQhZgngxHcsYJUZ3yQbo0QDbF9XiN2zctJHn3XpU9IPF7L25JjMIKbSQXh4/Mi2JJLgia9yKz0ohbof1mvqYrLdsTs3OjVwxx7m6Px2yeq9ke13+HovWciqS6MB4uCCaaiE0kjTUDwqM+eIgXY2Ylv0lDfo0mCiLmLiFopJPMlEwasHxFn+NvSuxHC1wdUCH9dbeDxIoBH4uHJ82nWXK7kg3U2Cg9h3muktn3i07MefXruiR/Kkg1xBEIqDA9l3vCGr0dEcDRdxW9DjjLm4T71HhrPG8YLg4TfbHGmFQ4WhK7c0H555YfIxlXUlfLgbtJzsBpSQnQ3dwCoHa6Fj0coi1qwiBO3Eo0kUkxe2KSQMq9ok99OE3TYsiN29Ey0unmEqB7EQ6txhx9+HSuhTdHc16HT6qLnP+5wtfs31uUwnUpIGaFzfGaouAT+8d26FxnVL100Pcy4mPwCWypEqHOfVkSF1z1WxOB3VNdFYzNar+iz12y7Sulk9XbcGw8v35xeiH/QvRewhzwDlcjg1W+J1ROC0m0Gpp0GQ6KVuW4eTcefeuPXmt6UKLc9+ikoaNnuCZfx/mh380bqE48vLGr7LSlVRjhNUee0L/ibZ/k8eSeIReLZq5KaBQ86Y3ZFZ5N2RuWKwZayf998/o5uoestoLebndPX9ZNvvR/AgGQ1ezmKKOMlyxPXCpz617Pff0kZt7+NNtWjBS7ljpNbVbdMT9GEDDtHpkW5bHNKujw/QMfKM2n8grjIJlplA4DptT8eYr55VCfTmUwiHvNYiVan5hVL8plaQ1yJl1M5081AGAuy6sG7cTvqPTCmCLuf983fD+2yfWS8ri/tTntgIyBrKd3OcZ8iZAOdY1aD+mU7bPGpuDSGW4JPShTSkiDJl+t05QGiPtZOP2h6/XD0cwreTbzjkkPpl5SoHzjpmg0nh9FCeEFZxZFf0tk8BttL+I5eu8RSGz1cpN2qIoz+wJqoBdYvY7oCTjzA3qCxm0FJIp75G5qp9bedk+CKQd+yHNbxhxu8I3A5uJB/bqa+SAHashsdwVwJPw4N31ZxvwSH8gdjf7fwUHWsYYJl/aIcABDtbXhvRl99te4XIlbhqrOVjR/6FU1TdNc0OXpNSNrMOp47Kysu3aLYFRaJnO86Cj612muqb3TVpHsArxZD/apfEBNm81E4z23C0HNb8jfPjx6KtipSzFvE9zRH2PuQ25OariZedYKV7aGJvwjjabXp/vGpCYGC/alW0on38I1t+lB/OIKzYD5YHijpn4rMsk9UvXovRCHDeFFvusPxbxFI+jKRRSl2PVnM9PVxHsqLOz2uqi/MyK0H+4uNvMCBwE3ImaagcEw1utzkRnHWuY5YBtyD9UDSBvRjsfnrnqNJ1Veweyv2o8mLTjzZ0r0xI9X967kztoC/+HZc2s/bEZlB5dBZEDzrFZfl9Pwmwq7b5KqPgK8pjlkm11haICQVNAkQcnXDHGbVQy7v1b5uiYnPZ2yOT19+miPbHEShcE9ffYCgn57pYr0/x6NaHYoShl1q9OUZy59HwfyMfUG9N3ELTWQzf8Df49tslcBzWtaaY2kf1JPqlftS758btBj2mZAvtmIW1USYfVa4eXpdTtQ6Cpf03v4wyh1LzdF9D645qvk2xDYGICZLFbXhugSzXvEIxmydHzNuEABKuGT+rJ8spD5mqpnsN2BaWiCyoMrPzgiMe2+fIDf6cUNR6VvVAKHonZJnEp0VeoiL5orR6PgtRqsguJOOyfxseWZcbr9bG0BqdhM+AkNG8A/1yOQSXjm2Fg7NL/HM/p5SI7Nn0j+JWFmzfiBuZ4e0FqZE0zsAZzopwplXeOaJLZ7479F5S8cc+yKcrrvpMDccZ3ZpeIGLhwCU9O64BLV2mj1naYuXlr6Xf934UPx0j+wjWay68g7UItk7G73zIDkO3446N2xFnUm3Yxj6cG5U9JpjMy7oAbDxFlraJBtDntTsZ0GWj1eYvW1YX4pPdDbHpaRvYT2Wox6qmNTBnbtERPvF4D6Gqvgl36sTod7Rca8NBls8UJ3ONXvh0pw21BPMo+/nYCPLUyHP3oAMq53yIzfKz/R80xcUm15Kkk9U0qTAtbGtihHllZxskafdvjz8qMrykoNwp461Obw0hpVb6AYPEf/Z9O9WpxjZNl1eyqV9MkblxXzB+AYB2hycll/PKdyehSOe8AeuUbjBT1tg1BDo0KZL27yPp9dMVWm0GkKOLg+TaZnKoPLFFiF3dBsDGPkNcUERb5CFV7IoYEpiaYnSyU5kzQVbloKXhzrtnnkaMY4xxniqj8Adzf+CY1T8txJIvpGHyCBfgW9jbxQO2I3bSU9wxBU4bQh7qdU+H5oteWSq2hDRfca3MKvMye8Oy5gM/yGyO+7iiS0gr8xLZPXEtgaXzOQ2vEc9kKv+Zo8kcSHm8QSXbvVtoVkZQQzb+ZZ70koHVYPK+w2jMHXf8ztBn6XNvSeXoLM8oqaH+fMaL5hpxOjmkIh1+lQB8uIbXLO5wbvX7+NkCo3nzEbZPfNMMjJ5mcFLflRyuSeIXkdOGzpl45R76vviThn8PCDL9IZfdoNjGbrYN69VZlK/pl0QLqpTRxDkxfr1AD92mg/fDSThwtiqJkSkbNc/4+4Q8RPtG/ZJdBrBg/xYOSDfFqL0iFYMh37Os/xAFoI0Tt/Tr1a1ClD9SMC5lVmSqxsaYqDC4wPKDbm15xI+jTirP1V6zgLQf8B5QvlodkF/8Ax5yWolcH6Oi2V5XxLIQrpobCNG6MaWfzXiBDB0VCZJTbP0CecpavzCKL+s0oyFRcO44We9HWUHVkzl1QIrKlTZ0lcJ6Z90ngmM/YWCfxW8wqG/wPRPf/5O/oqgsL/8rp32y6Em9F+If5YGFvYnGljEV6gqH+67/1kMixjX4fcX/s9cXfezzP0GmPgcf3vxfiL5q6TY35786rOBZvS/PUUUv/38flv8+xPcOgMlLQQSh2HJpt9fB07ij/8HrP3vRf7+9B/Eu+65Wv6R5lk/9EDTK6/a9g9PRb+JcyUZOB/zT1S7uipNwdf8qcjarzJs/wvWRNC/aqdR2J8K0sF/rvWH/tME1PB/kfEAZbo8/y8YDx8t0T2sc/Zv+/nFfsg/aO/Bf6+9B0Ro/6XGQ/yLjCdJgGbuf8F49GiLo38bzA9xxj9qi94+6M9cDv4v9jjkv8ho8vyrMfzfCFdyFqX/dje/4Zhf9VNh9E/cze8f+6+xmz9TpP3Fbv4DK/iB036ylh+G9NPb4H9oJP+5Pd5jffz9R/xuTRDbDuBA5//frQpc4vvH0MHEb7//maT3/4L1IX9Q76bJvxB/cnrgnyjN/tPM7/cP/gdu6x+a1X9knUnyq3X+r5kfd78p+17Yv+3vv21/v2ItjML/zvjIf6nx/Zl4/P/Y+Gg6Sf4TSP7/any/A/d/297/1PeR5D/T94E60gBm7q+vSfftl9qQZuAd/xc=</diagram></mxfile>
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/installation/img/dvBrandingCustBlocks.png b/doc/sphinx-guides/source/installation/img/dvBrandingCustBlocks.png
new file mode 100644
index 00000000000..1fe618c889d
Binary files /dev/null and b/doc/sphinx-guides/source/installation/img/dvBrandingCustBlocks.png differ
diff --git a/doc/sphinx-guides/source/installation/img/tworavens_components.png b/doc/sphinx-guides/source/installation/img/tworavens_components.png
deleted file mode 100644
index 23952d74d05..00000000000
Binary files a/doc/sphinx-guides/source/installation/img/tworavens_components.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/installation/img/tworavens_components.sh b/doc/sphinx-guides/source/installation/img/tworavens_components.sh
deleted file mode 100755
index 234bcf15a05..00000000000
--- a/doc/sphinx-guides/source/installation/img/tworavens_components.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -x
-java -jar ~/lib/plantuml.jar -tpng tworavens_components.uml
-#java -jar ~/bin/plantuml.jar -tsvg tworavens_components.uml
diff --git a/doc/sphinx-guides/source/installation/img/tworavens_components.uml b/doc/sphinx-guides/source/installation/img/tworavens_components.uml
deleted file mode 100644
index 6e64b60f672..00000000000
--- a/doc/sphinx-guides/source/installation/img/tworavens_components.uml
+++ /dev/null
@@ -1,26 +0,0 @@
-//http://plantuml.com/component.html#Component
-@startuml
-
-node "Server" {
-  component "Apache" {
-    component "TwoRavens (static content)" as Static {
-    }   
-    component "rApache" {
-    }
-  }
-  component "Glassfish" as Glassfish {
-    component "Dataverse" {
-    }
-  }
-  rApache <-- Dataverse
-  component "Rserve" {
-  }
-}
-
-Browser <-- Static
-Browser <--> rApache
-Browser <-- Dataverse
-
-Dataverse <--> Rserve
-
-@enduml
diff --git a/doc/sphinx-guides/source/installation/img/tworavens_test_empty.png b/doc/sphinx-guides/source/installation/img/tworavens_test_empty.png
deleted file mode 100644
index aa33825baa5..00000000000
Binary files a/doc/sphinx-guides/source/installation/img/tworavens_test_empty.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/installation/img/tworavens_test_file_ingested.png b/doc/sphinx-guides/source/installation/img/tworavens_test_file_ingested.png
deleted file mode 100644
index d9505d22da6..00000000000
Binary files a/doc/sphinx-guides/source/installation/img/tworavens_test_file_ingested.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/installation/img/tworavens_test_init.png b/doc/sphinx-guides/source/installation/img/tworavens_test_init.png
deleted file mode 100644
index ab94a91a1a7..00000000000
Binary files a/doc/sphinx-guides/source/installation/img/tworavens_test_init.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/installation/img/tworavens_test_output.png b/doc/sphinx-guides/source/installation/img/tworavens_test_output.png
deleted file mode 100644
index b75bf1126ea..00000000000
Binary files a/doc/sphinx-guides/source/installation/img/tworavens_test_output.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/installation/img/tworavens_test_select_model.png b/doc/sphinx-guides/source/installation/img/tworavens_test_select_model.png
deleted file mode 100644
index dda8aa75153..00000000000
Binary files a/doc/sphinx-guides/source/installation/img/tworavens_test_select_model.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/installation/img/tworavens_test_select_var.png b/doc/sphinx-guides/source/installation/img/tworavens_test_select_var.png
deleted file mode 100644
index 91bcfb1be57..00000000000
Binary files a/doc/sphinx-guides/source/installation/img/tworavens_test_select_var.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/installation/index.rst b/doc/sphinx-guides/source/installation/index.rst
index ab94d5b4949..a0a88700d3d 100755
--- a/doc/sphinx-guides/source/installation/index.rst
+++ b/doc/sphinx-guides/source/installation/index.rst
@@ -9,6 +9,7 @@ Installation Guide
 **Contents:**
 
 .. toctree::
+   :maxdepth: 2
 
    intro
    prep
@@ -16,9 +17,10 @@ Installation Guide
    installation-main
    config
    upgrading
-   r-rapache-tworavens
-   geoconnect
    shibboleth
    oauth2
+   oidc
+   orcid
    external-tools
+   localcontexts
    advanced
diff --git a/doc/sphinx-guides/source/installation/installation-main.rst b/doc/sphinx-guides/source/installation/installation-main.rst
index 4f10961936b..7f8481a3402 100755
--- a/doc/sphinx-guides/source/installation/installation-main.rst
+++ b/doc/sphinx-guides/source/installation/installation-main.rst
@@ -2,51 +2,54 @@
 Installation
 ============
 
-Now that the :doc:`prerequisites` are in place, we are ready to execute the Dataverse installation script (the "installer") and verify that the installation was successful by logging in with a "superuser" account.
+Now that the :doc:`prerequisites` are in place, we are ready to execute the Dataverse Software installation script (the "installer") and verify that the installation was successful by logging in with a "superuser" account.
 
 .. contents:: |toctitle|
 	:local:
 
 .. _dataverse-installer:
 
-Running the Dataverse Installer
--------------------------------
+Running the Dataverse Software Installer
+----------------------------------------
 
-A scripted, interactive installer is provided. This script will configure your Glassfish environment, create the database, set some required options and start the application. Some configuration tasks will still be required after you run the installer! So make sure to consult the next section. 
+A scripted, interactive installer is provided. This script will configure your app server environment, create the database, set some required options and start the application. Some configuration tasks will still be required after you run the installer! So make sure to consult the next section. 
 
-As mentioned in the :doc:`prerequisites` section, RHEL/CentOS is the recommended Linux distribution. (The installer is also known to work on Mac OS X for setting up a development environment.)
+As mentioned in the :doc:`prerequisites` section, RHEL or a derivative such as RockyLinux or AlmaLinux is recommended. (The installer is also known to work on Mac OS X for setting up a development environment.)
 
-Generally, the installer has a better chance of succeeding if you run it against a freshly installed Glassfish node that still has all the default configuration settings. In any event, please make sure that it is still configured to accept http connections on port 8080 - because that's where the installer expects to find the application once it's deployed.
+Generally, the installer has a better chance of succeeding if you run it against a freshly installed Payara node that still has all the default configuration settings. In any event, please make sure that it is still configured to accept http connections on port 8080 - because that's where the installer expects to find the application once it's deployed.
 
 You should have already downloaded the installer from https://github.com/IQSS/dataverse/releases when setting up and starting Solr under the :doc:`prerequisites` section. Again, it's a zip file with "dvinstall" in the name.
 
 Unpack the zip file - this will create the directory ``dvinstall``.
 
-**Important:** The installer will need to use the PostgreSQL command line utility ``psql`` in order to configure the database. If the executable is not in your system PATH, the installer will try to locate it on your system. However, we strongly recommend that you check and make sure it is in the PATH. This is especially important if you have multiple versions of PostgreSQL installed on your system. Make sure the psql that came with the version that you want to use with your Dataverse is the first on your path. For example, if the PostgreSQL distribution you are running is installed in  /Library/PostgreSQL/9.6, add /Library/PostgreSQL/9.6/bin to the beginning of your $PATH variable. If you are *running* multiple PostgreSQL servers, make sure you know the port number of the one you want to use, as the installer will need it in order to connect to the database (the first PostgreSQL distribution installed on your system is likely using the default port 5432; but the second will likely be on 5433, etc.) Does every word in this paragraph make sense? If it does, great - because you definitely need to be comfortable with basic system tasks in order to install Dataverse. If not - if you don't know how to check where your PostgreSQL is installed, or what port it is running on, or what a $PATH is... it's not too late to stop. Because it will most likely not work. And if you contact us for help, these will be the questions we'll be asking you - so, again, you need to be able to answer them comfortably for it to work. 
-
-Execute the installer script like this (but first read the note below about not running the installer as root)::
-
-        $ cd dvinstall
-        $ ./install
-
+**Important:** The installer will need to use the PostgreSQL command line utility ``psql`` in order to configure the database. If the executable is not in your system PATH, the installer will try to locate it on your system. However, we strongly recommend that you check and make sure it is in the PATH. This is especially important if you have multiple versions of PostgreSQL installed on your system. Make sure the psql that came with the version that you want to use with your Dataverse installation is the first on your path. For example, if the PostgreSQL distribution you are running is installed in  /Library/PostgreSQL/16, add /Library/PostgreSQL/16/bin to the beginning of your $PATH variable. If you are *running* multiple PostgreSQL servers, make sure you know the port number of the one you want to use, as the installer will need it in order to connect to the database (the first PostgreSQL distribution installed on your system is likely using the default port 5432; but the second will likely be on 5433, etc.) Does every word in this paragraph make sense? If it does, great - because you definitely need to be comfortable with basic system tasks in order to install the Dataverse Software. If not - if you don't know how to check where your PostgreSQL is installed, or what port it is running on, or what a $PATH is... it's not too late to stop. Because it will most likely not work. And if you contact us for help, these will be the questions we'll be asking you - so, again, you need to be able to answer them comfortably for it to work.
 
 **It is no longer necessary to run the installer as root!**
 
 Just make sure the user running the installer has write permission to:
 
-- /usr/local/glassfish4/glassfish/lib
-- /usr/local/glassfish4/glassfish/domains/domain1
+- /usr/local/payara6/glassfish/lib
+- /usr/local/payara6/glassfish/domains/domain1
 - the current working directory of the installer (it currently writes its logfile there), and
 - your jvm-option specified files.dir
 
-The only reason to run Glassfish as root would be to allow Glassfish itself to listen on the default HTTP(S) ports 80 and 443, or any other port below 1024. However, it is simpler and more secure to run Glassfish run on its default port of 8080 and hide it behind an Apache Proxy, via AJP, running on port 80 or 443. This configuration is required if you're going to use Shibboleth authentication. See more discussion on this here: :doc:`shibboleth`.)
+The only reason to run Payara as root would be to allow Payara itself to listen on the default HTTP(S) ports 80 and 443, or any other port below 1024. However, it is simpler and more secure to run Payara run on its default port of 8080 and hide it behind an Apache Proxy, via AJP, running on port 80 or 443. This configuration is required if you're going to use Shibboleth authentication. See more discussion on this here: :doc:`shibboleth`.)
+
+Read the installer script directions like this::
+
+        $ cd dvinstall
+        $ less README_python.txt
+
+Alternatively you can download :download:`README_python.txt <../../../../scripts/installer/README_python.txt>` from this guides.
+
+Follow the instructions in the text file.
 
 The script will prompt you for some configuration values. If this is a test/evaluation installation, it may be possible to accept the default values provided for most of the settings:
 
 - Internet Address of your host: localhost
-- Glassfish Directory: /usr/local/glassfish4
-- Glassfish User: current user running the installer script
-- Administrator email address for this Dataverse: (none)
+- Payara Directory: /usr/local/payara6
+- Payara User: current user running the installer script
+- Administrator email address for this Dataverse installation: (none)
 - SMTP (mail) server to relay notification messages: localhost
 - Postgres Server Address: [127.0.0.1]
 - Postgres Server Port: 5432
@@ -60,24 +63,28 @@ The script will prompt you for some configuration values. If this is a test/eval
 - Rserve User Name: rserve
 - Rserve User Password: rserve
 - Administration Email address for the installation;
-- Postgres admin password - We'll need it in order to create the database and user for the Dataverse to use, without having to run the installer as root. If you don't know your Postgres admin password, you may simply set the authorization level for localhost to "trust" in the PostgreSQL ``pg_hba.conf`` file (See the PostgreSQL section in the Prerequisites). If this is a production evnironment, you may want to change it back to something more secure, such as "password" or "md5", after the installation is complete.
-- Network address of a remote Solr search engine service (if needed) - In most cases, you will be running your Solr server on the same host as the Dataverse application (then you will want to leave this set to the default value of ``LOCAL``). But in a serious production environment you may set it up on a dedicated separate server.
+- Postgres admin password - We'll need it in order to create the database and user for the Dataverse Software installer to use, without having to run the installer as root. If you don't know your Postgres admin password, you may simply set the authorization level for localhost to "trust" in the PostgreSQL ``pg_hba.conf`` file (See the PostgreSQL section in the Prerequisites). If this is a production environment, you may want to change it back to something more secure, such as "password" or "md5", after the installation is complete.
+- Network address of a remote Solr search engine service (if needed) - In most cases, you will be running your Solr server on the same host as the Dataverse Software application (then you will want to leave this set to the default value of ``LOCAL``). But in a serious production environment you may set it up on a dedicated separate server.
 
-If desired, these default values can be configured by creating a ``default.config`` (example :download:`here <../_static/util/default.config>`) file in the installer's working directory with new values (if this file isn't present, the above defaults will be used).
+If desired, these default values can be configured by creating a ``default.config`` (example :download:`here <../../../../scripts/installer/default.config>`) file in the installer's working directory with new values (if this file isn't present, the above defaults will be used).
 
-This allows the installer to be run in non-interactive mode (with ``./install -y -f > install.out 2> install.err``), which can allow for easier interaction with automated provisioning tools.
+This allows the installer to be run in non-interactive mode (with ``./install.py -y -f > install.out 2> install.err``), which can allow for easier interaction with automated provisioning tools.
 
-All the Glassfish configuration tasks performed by the installer are isolated in the shell script ``dvinstall/glassfish-setup.sh`` (as ``asadmin`` commands). 
+All the Payara configuration tasks performed by the installer are isolated in the shell script ``dvinstall/as-setup.sh`` (as ``asadmin`` commands). 
 
-**IMPORTANT:** As a security measure, the ``glassfish-setup.sh`` script stores passwords as "aliases" rather than plaintext. If you change your database password, for example, you will need to update the alias with ``asadmin update-password-alias db_password_alias``, for example. Here is a list of the password aliases that are set by the installation process and entered into Glassfish's ``domain.xml`` file:
+While Postgres can accomodate usernames and database names containing hyphens, it is strongly recommended to use only alphanumeric characters.
 
-- ``db_password_alias``
+**IMPORTANT:** As a security measure, the ``as-setup.sh`` script stores passwords as "aliases" rather than plaintext. If you change your database password, for example, you will need to update the alias with ``asadmin update-password-alias dataverse.db.password``, for example. Here is a list of the password aliases that are set by the installation process and entered into Payara's ``domain.xml`` file:
+
+- ``dataverse.db.password``
 - ``doi_password_alias``
 - ``rserve_password_alias``
 
-Glassfish does not provide up to date documentation but Payara (a fork of Glassfish) does so for more information, please see https://docs.payara.fish/documentation/payara-server/password-aliases/password-alias-asadmin-commands.html
+For more information, please see https://docs.payara.fish/documentation/payara-server/password-aliases/password-alias-asadmin-commands.html
+
+.. _importance-of-siteUrl:
 
-**IMPORTANT:** The installer will also ask for an external site URL for Dataverse. It is *imperative* that this value be supplied accurately, or a long list of functions will be inoperable, including:
+**IMPORTANT:** The installer will also ask for an external site URL for the Dataverse installation. It is *imperative* that this value be supplied accurately, or a long list of functions will be inoperable, including:
 
 - email confirmation links
 - password reset links
@@ -85,25 +92,25 @@ Glassfish does not provide up to date documentation but Payara (a fork of Glassf
 - exporting to Schema.org format (and showing JSON-LD in HTML's <meta/> tag)
 - exporting to DDI format
 - which Dataverse installation an "external tool" should return to
-- which Dataverse installation Geoconnect should return to
+- URLs embedded in SWORD API responses
 
-**IMPORTANT:** Please note, that "out of the box" the installer will configure the Dataverse to leave unrestricted access to the administration APIs from (and only from) localhost. Please consider the security implications of this arrangement (anyone with shell access to the server can potentially mess with your Dataverse). An alternative solution would be to block open access to these sensitive API endpoints completely; and to only allow requests supplying a pre-defined "unblock token" (password). If you prefer that as a solution, please consult the supplied script ``post-install-api-block.sh`` for examples on how to set it up. See also "Securing Your Installation" under the :doc:`config` section.
+The supplied site URL will be saved under the JVM option :ref:`dataverse.siteUrl`.
 
-Dataverse uses JHOVE_ to help identify the file format (CSV, PNG, etc.) for files that users have uploaded. The installer places files called ``jhove.conf`` and ``jhoveConfig.xsd`` into the directory ``/usr/local/glassfish4/glassfish/domains/domain1/config`` by default and makes adjustments to the jhove.conf file based on the directory into which you chose to install Glassfish.
+**IMPORTANT:** Please note, that "out of the box" the installer will configure the Dataverse installation to leave unrestricted access to the administration APIs from (and only from) localhost. Please consider the security implications of this arrangement (anyone with shell access to the server can potentially mess with your Dataverse installation). An alternative solution would be to block open access to these sensitive API endpoints completely; and to only allow requests supplying a pre-defined "unblock token" (password). If you prefer that as a solution, please consult the supplied script ``post-install-api-block.sh`` for examples on how to set it up. See also "Securing Your Installation" under the :doc:`config` section.
 
-.. _JHOVE: http://jhove.openpreservation.org
+The Dataverse Software uses JHOVE_ to help identify the file format (CSV, PNG, etc.) for files that users have uploaded. The installer places files called ``jhove.conf`` and ``jhoveConfig.xsd`` into the directory ``/usr/local/payara6/glassfish/domains/domain1/config`` by default and makes adjustments to the jhove.conf file based on the directory into which you chose to install Payara.
 
-The script is to a large degree a derivative of the old installer from DVN 3.x. It is written in Perl. If someone in the community is eager to rewrite it, perhaps in a different language, please get in touch. :)
+.. _JHOVE: https://jhove.openpreservation.org
 
 Logging In
 ----------
 
-Out of the box, Glassfish runs on port 8080 and 8181 rather than 80 and 443, respectively, so visiting http://localhost:8080 (substituting your hostname) should bring up a login page. See the :doc:`shibboleth` page for more on ports, but for now, let's confirm we can log in by using port 8080. Poke a temporary hole in your firewall, if needed. 
+Out of the box, Payara runs on port 8080 and 8181 rather than 80 and 443, respectively, so visiting http://localhost:8080 (substituting your hostname) should bring up a login page. See the :doc:`shibboleth` page for more on ports, but for now, let's confirm we can log in by using port 8080. Poke a temporary hole in your firewall, if needed. 
 
 Superuser Account
 ^^^^^^^^^^^^^^^^^
 
-We'll use the superuser account created by the installer to make sure you can log into Dataverse. For more on the difference between being a superuser and having the "Admin" role, read about configuring the root dataverse in the :doc:`config` section.
+We'll use the superuser account created by the installer to make sure you can log into the Dataverse installation. For more on the difference between being a superuser and having the "Admin" role, read about configuring the root Dataverse collection in the :doc:`config` section.
 
 (The ``dvinstall/setup-all.sh`` script, which is called by the installer sets the password for the superuser account account and the username and email address come from a file it references at ``dvinstall/data/user-admin.json``.)
 
@@ -113,7 +120,7 @@ Use the following credentials to log in:
 - username: dataverseAdmin
 - password: admin
 
-Congratulations! You have a working Dataverse installation. Soon you'll be tweeting at `@dataverseorg <https://twitter.com/dataverseorg>`_ asking to be added to the map at http://dataverse.org :)
+Congratulations! You have a working Dataverse installation. Soon you'll be tweeting at `@dataverseorg <https://twitter.com/dataverseorg>`_ asking to be added to the map at https://dataverse.org :)
 
 Trouble? See if you find an answer in the troubleshooting section below.
 
@@ -122,87 +129,38 @@ Next you'll want to check out the :doc:`config` section, especially the section
 Troubleshooting
 ---------------
 
-If the following doesn't apply, please get in touch as explained in the :doc:`intro`. You may be asked to provide ``glassfish4/glassfish/domains/domain1/logs/server.log`` for debugging.
+If the following doesn't apply, please get in touch as explained in :ref:`support`.
 
 Dataset Cannot Be Published
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Check to make sure you used a fully qualified domain name when installing Dataverse. You can change the ``dataverse.fqdn`` JVM option after the fact per the :doc:`config` section.
-
-Problems Sending Email
-^^^^^^^^^^^^^^^^^^^^^^
-
-If your Dataverse installation is not sending system emails, you may need to provide authentication for your mail host. First, double check the SMTP server being used with this Glassfish asadmin command:
-
-``./asadmin get server.resources.mail-resource.mail/notifyMailSession.host``
-
-This should return the DNS of the mail host you configured during or after installation. mail/notifyMailSession is the JavaMail Session that's used to send emails to users. 
-
-If the command returns a host you don't want to use, you can modify your notifyMailSession with the Glassfish ``asadmin set`` command with necessary options (`click here for the manual page <https://docs.oracle.com/cd/E18930_01/html/821-2433/set-1.html>`_), or via the admin console at http://localhost:4848 with your domain running. 
-
-If your mail host requires a username/password for access, continue to the next section.
+Check to make sure you used a fully qualified domain name when installing the Dataverse Software. You can change the ``dataverse.fqdn`` JVM option after the fact per the :doc:`config` section.
 
-Mail Host Configuration & Authentication
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Got ERR_ADDRESS_UNREACHABLE While Navigating on Interface or API Calls
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If you need to alter your mail host address, user, or provide a password to connect with, these settings are easily changed in the Glassfish admin console or via command line. 
-
-For the Glassfish console, load a browser with your domain online, navigate to http://localhost:4848 and on the side panel find JavaMail Sessions. By default, Dataverse uses a session named mail/notifyMailSession for routing outgoing emails. Click this mail session in the window to modify it.
-
-When fine tuning your JavaMail Session, there are a number of fields you can edit. The most important are:
-
-+ **Mail Host:** Desired mail host’s DNS address (e.g. smtp.gmail.com)
-+ **Default User:** Username mail host will recognize (e.g. user\@gmail.com)
-+ **Default Sender Address:** Email address that your Dataverse will send mail from
-
-Depending on the SMTP server you're using, you may need to add additional properties at the bottom of the page (below "Advanced").
-
-From the "Add Properties" utility at the bottom, use the “Add Property” button for each entry you need, and include the name / corresponding value as needed. Descriptions are optional, but can be used for your own organizational needs. 
-
-**Note:** These properties are just an example. You may need different/more/fewer properties all depending on the SMTP server you’re using.
-
-==============================	==============================
-			Name 							Value
-==============================	==============================
-mail.smtp.auth					true
-mail.smtp.password				[Default User password*]
-mail.smtp.port					[Port number to route through]
-==============================	==============================
-
-**\*WARNING**: Entering a password here will *not* conceal it on-screen. It’s recommended to use an *app password* (for smtp.gmail.com users) or utilize a dedicated/non-personal user account with SMTP server auths so that you do not risk compromising your password.
-
-If your installation’s mail host uses SSL (like smtp.gmail.com) you’ll need these name/value pair properties in place:
-
-======================================	==============================
-				Name 								Value
-======================================	==============================
-mail.smtp.socketFactory.port			465
-mail.smtp.port							465
-mail.smtp.socketFactory.fallback		false
-mail.smtp.socketFactory.class			javax.net.ssl.SSLSocketFactory
-======================================	==============================
-
-The mail session can also be set from command line. To use this method, you will need to delete your notifyMailSession and create a new one. See the below example:
-
-- Delete: ``./asadmin delete-javamail-resource mail/notifyMailSession``
-- Create (remove brackets and replace the variables inside): ``./asadmin create-javamail-resource --mailhost [smtp.gmail.com] --mailuser [test\@test\.com] --fromaddress [test\@test\.com] --property mail.smtp.auth=[true]:mail.smtp.password=[password]:mail.smtp.port=[465]:mail.smtp.socketFactory.port=[465]:mail.smtp.socketFactory.fallback=[false]:mail.smtp.socketFactory.class=[javax.net.ssl.SSLSocketFactory] mail/notifyMailSession``
-
-Be sure you save the changes made here and then restart your Glassfish server to test it out.
+If you are receiving an ``ERR_ADDRESS_UNREACHABLE`` while navigating the GUI or making an API call, make sure the ``siteUrl`` JVM option is defined. For details on how to set ``siteUrl``, please refer to :ref:`dataverse.siteUrl` from the :doc:`config` section. For context on why setting this option is necessary, refer to :ref:`dataverse.fqdn` from the :doc:`config` section.
 
 UnknownHostException While Deploying
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If you are seeing "Caused by: java.net.UnknownHostException: myhost: Name or service not known" in server.log and your hostname is "myhost" the problem is likely that "myhost" doesn't appear in ``/etc/hosts``. See also http://stackoverflow.com/questions/21817809/glassfish-exception-during-deployment-project-with-stateful-ejb/21850873#21850873
+If you are seeing "Caused by: java.net.UnknownHostException: myhost: Name or service not known" in server.log and your hostname is "myhost" the problem is likely that "myhost" doesn't appear in ``/etc/hosts``. See also https://stackoverflow.com/questions/21817809/glassfish-exception-during-deployment-project-with-stateful-ejb/21850873#21850873
+
+.. _fresh-reinstall:
 
 Fresh Reinstall
 ---------------
 
-Early on when you're installing Dataverse, you may think, "I just want to blow away what I've installed and start over." That's fine. You don't have to uninstall the various components like Glassfish, PostgreSQL and Solr, but you should be conscious of how to clear out their data.
+Early on when you're installing the Dataverse Software, you may think, "I just want to blow away what I've installed and start over." That's fine. You don't have to uninstall the various components like Payara, PostgreSQL and Solr, but you should be conscious of how to clear out their data. For Payara, a common helpful process is to:
+
+- Stop Payara; 
+- Remove the ``generated``, ``lib/databases`` and ``osgi-cache`` directories from the ``domain1`` directory;
+- Start Payara
 
 Drop database
 ^^^^^^^^^^^^^
 
-In order to drop the database, you have to stop Glassfish, which will have open connections. Before you stop Glassfish, you may as well undeploy the war file. First, find the name like this:
+In order to drop the database, you have to stop Payara, which will have open connections. Before you stop Payara, you may as well undeploy the war file. First, find the name like this:
 
 ``./asadmin list-applications``
 
@@ -210,11 +168,11 @@ Then undeploy it like this:
 
 ``./asadmin undeploy dataverse-VERSION``
 
-Stop Glassfish with the init script provided in the :doc:`prerequisites` section or just use:
+Stop Payara with the init script provided in the :doc:`prerequisites` section or just use:
 
 ``./asadmin stop-domain``
 
-With Glassfish down, you should now be able to drop your database and recreate it:
+With Payara down, you should now be able to drop your database and recreate it:
 
 ``psql -U dvnapp -c 'DROP DATABASE "dvndb"' template1``
 
@@ -231,11 +189,16 @@ Deleting Uploaded Files
 
 The path below will depend on the value for ``dataverse.files.directory`` as described in the :doc:`config` section:
 
-``rm -rf /usr/local/glassfish4/glassfish/domains/domain1/files``
+``rm -rf /usr/local/payara6/glassfish/domains/domain1/files``
 
 Rerun Installer
 ^^^^^^^^^^^^^^^
 
 With all the data cleared out, you should be ready to rerun the installer per above.
 
-Related to all this is a series of scripts at https://github.com/IQSS/dataverse/blob/develop/scripts/deploy/phoenix.dataverse.org/deploy that Dataverse developers use have the test server http://phoenix.dataverse.org rise from the ashes before integration tests are run against it. Your mileage may vary. :) For more on this topic, see "Rebuilding Your Dev Environment" in the :doc:`/developers/dev-environment` section of the Developer Guide.
+For more on this topic, see :ref:`rebuilding-dev-environment` section of the Developer Guide.
+
+Getting Support for Installation Trouble
+----------------------------------------
+
+See :ref:`support`.
diff --git a/doc/sphinx-guides/source/installation/intro.rst b/doc/sphinx-guides/source/installation/intro.rst
index a7eee7e963d..1c239863e98 100644
--- a/doc/sphinx-guides/source/installation/intro.rst
+++ b/doc/sphinx-guides/source/installation/intro.rst
@@ -2,7 +2,7 @@
 Introduction
 ============
 
-Welcome! Thanks for installing `Dataverse <http://dataverse.org>`_!
+Welcome! Thanks for installing `The Dataverse Project <https://dataverse.org>`_!
 
 .. contents:: |toctitle|
 	:local:
@@ -10,38 +10,49 @@ Welcome! Thanks for installing `Dataverse <http://dataverse.org>`_!
 Quick Links
 -----------
 
-If you are installing Dataverse for the first time, please proceed to the :doc:`prep` section.
+If you are installing the Dataverse Software for the first time, please proceed to the :doc:`prep` section.
 
 Jump ahead to :doc:`config` or :doc:`upgrading` for an existing Dataverse installation.
 
 Intended Audience
 -----------------
 
-This guide is intended primarily for sysadmins who are installing, configuring, and upgrading Dataverse. 
+This guide is intended primarily for sysadmins who are installing, configuring, and upgrading a Dataverse installation. 
 
 Sysadmins are expected to be comfortable using standard Linux commands, issuing ``curl`` commands, and running SQL scripts.
 
 Related Guides
 --------------
 
-Many "admin" functions can be performed by Dataverse users themselves (non-superusers) as documented in the :doc:`/user/index` and that guide is a good introduction to the features of Dataverse from an end user perspective.
+Many "admin" functions can be performed by Dataverse installation users themselves (non-superusers) as documented in the :doc:`/user/index` and that guide is a good introduction to the features of the Dataverse Software from an end user perspective.
 
-If you are a sysadmin who likes to code, you may find the :doc:`/api/index` useful, and you may want to consider improving the installation script or hacking on the community-lead configuration management options mentioned in the :doc:`prep` section. If you **really** like to code and want to help with the Dataverse code, please check out the :doc:`/developers/index`!
+If you are a sysadmin who likes to code, you may find the :doc:`/api/index` useful, and you may want to consider improving the installation script or hacking on the community-lead configuration management options mentioned in the :doc:`prep` section. If you **really** like to code and want to help with the Dataverse Software code, please check out the :doc:`/developers/index`!
 
 .. _support:
 
 Getting Help
 ------------
 
-To get help installing or configuring Dataverse, please try one or more of:
+To get help installing or configuring a Dataverse installation, please try one or more of:
 
 - posting to the `dataverse-community <https://groups.google.com/forum/#!forum/dataverse-community>`_ Google Group.
-- asking at http://chat.dataverse.org (#dataverse on the freenode IRC network)
+- asking at https://chat.dataverse.org
 - emailing support@dataverse.org to open a private ticket at https://help.hmdc.harvard.edu
 
+Information to Send to Support When Installation Fails
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you've encountered a problem installing Dataverse and are ready to ask for help, please consider sending along the following information so that the Dataverse team and community can more easily assist you.
+
+- Version of Dataverse you are trying to install.
+- Operating system (usually a Linux distribution) and version.
+- Output from the installer (STDOUT, STDERR).
+- The ``scripts/api/setup-all.*.log`` files left behind by the installer.
+- The ``server.log`` file from Payara (by default at ``/usr/local/payara6/glassfish/domains/domain1/logs/server.log``).
+
 Improving this Guide
 --------------------
 
-If you spot a typo in this guide or would like to suggest an improvement, please find the appropriate file in https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source/installation and send a pull request as explained in the :doc:`/developers/documentation` section of the Developer Guide. You are also welcome to simply open an issue at https://github.com/IQSS/dataverse/issues to describe the problem with this guide.
+If you spot a typo in this guide or would like to suggest an improvement, please find the appropriate file in https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source/installation and send a pull request as explained in the :doc:`/contributor/documentation` section of the Contributor Guide. You are also welcome to simply open an issue at https://github.com/IQSS/dataverse/issues to describe the problem with this guide.
 
 Next is the :doc:`prep` section.
diff --git a/doc/sphinx-guides/source/installation/localcontexts.rst b/doc/sphinx-guides/source/installation/localcontexts.rst
new file mode 100644
index 00000000000..174b2d0ac94
--- /dev/null
+++ b/doc/sphinx-guides/source/installation/localcontexts.rst
@@ -0,0 +1,35 @@
+LocalContexts Integration
+=========================
+
+.. contents:: |toctitle|
+  :local:
+
+`Local Contexts <https://localcontexts.org/>`_ is a global initiative that supports Indigenous communities in the management and sharing of their cultural heritage and data.
+The `Local Contexts Hub <https://localcontextshub.org/>`_ is a platform that enables the creation and application of Traditional Knowledge (TK) and Biocultural (BC) Labels and Notices.
+These labels and notices help to communicate the cultural context and appropriate use of Indigenous data and cultural heritage materials.
+
+Dataverse supports integration with the Local Contexts Hub so that Labels and Notices associated with a dataset can be displayed on the dataset page:
+
+.. figure:: ./img/LCDemo.png
+   :alt: Dataset Page showing Local Contexts integration with Dataverse Software
+
+Configuration
+-------------
+
+There are several steps to LocalContexts integration.
+
+First, you need to configure the LOCALCONTEXTS_URL and LOCALCONTEXTS_API_KEY as described in the :ref:`localcontexts` section of the Configuration Guide.
+API Keys are available to Local Contexts Integration Partners - see https://localcontexts.org/hub-agreements/integration-partners/ for details.
+
+Next, you should add the Local Contexts metadatablock and configure the associated external vocabulary script.
+The metadatablock contains one field allowing Dataverse to store the URL of an associated Local Contexts Hub project.
+The external vocabulary script interacts with the Local Contexts Hub (via the Dataverse server) to display the Labels and Notices associated with the proect and provide a link to it.
+The script also supports adding/removing such a link from the dataset's metadata. Note that only a project that references the dataset in its `publication_doi` field can be linked to a dataset. 
+See https://github.com/gdcc/dataverse-external-vocab-support/blob/main/packages/local_contexts/README.md for details on these steps.
+
+Lastly, if you wish the Local Contexts information to be shown in the summary section of the dataset page, as shown in the image above, you should add `LCProjectUrl` to list of custom summary fields via use of the :ref:`:CustomDatasetSummaryFields` setting.
+
+Optionally, one could also set the dataverse.feature.add-local-contexts-permission-check FeatureFlag to true. This assures that only users editing datasets can use the LocalContexts search functionality.
+However, as this currently would also require setting the dataverse.feature.api-session-auth, the security implications of which haven't been fully explored, it is not recommended unless problematic use is seen.
+(When API access via OpenIdConnect is available, use of api-session-auth would not be required.)
+
diff --git a/doc/sphinx-guides/source/installation/oauth2.rst b/doc/sphinx-guides/source/installation/oauth2.rst
index d77a320446b..82d82c202b1 100644
--- a/doc/sphinx-guides/source/installation/oauth2.rst
+++ b/doc/sphinx-guides/source/installation/oauth2.rst
@@ -1,5 +1,5 @@
-OAuth Login: ORCID, GitHub, Google
-==================================
+OAuth Login Options
+===================
 
 .. contents:: |toctitle|
 	:local:
@@ -7,16 +7,18 @@ OAuth Login: ORCID, GitHub, Google
 Introduction
 ------------
 
-As explained under "Auth Modes" in the :doc:`config` section, OAuth2 is one of the ways that you can have end users log in to Dataverse.
+As explained under "Auth Modes" in the :doc:`config` section, OAuth2 is one of the ways that you can have end users log in to your Dataverse installation.
 
 `OAuth2 <https://oauth.net/2/>`_ is an authentication protocol that allows systems to share user data, while letting the users control what data is being shared. When you see buttons stating "login with Google" or "login through Facebook", OAuth2 is probably involved. For the purposes of this section, we will shorten "OAuth2" to just "OAuth." OAuth can be compared and contrasted with :doc:`shibboleth`.
 
-Dataverse supports three OAuth providers: `ORCID <http://orcid.org>`_, `GitHub <https://github.com>`_, and `Google <https://console.developers.google.com>`_.
+The Dataverse Software supports four OAuth providers: `ORCID <https://orcid.org>`_, `Microsoft Azure Active Directory (AD) <https://docs.microsoft.com/azure/active-directory/>`_, `GitHub <https://github.com>`_, and `Google <https://console.developers.google.com>`_.
+
+In addition :doc:`oidc` are supported, using a standard based on OAuth2.
 
 Setup
 -----
 
-Setting up an OAuth identity provider to work with Dataverse requires setup in two places: the provider, and the Dataverse installation.
+Setting up an OAuth identity provider to work with your Dataverse installation requires setup in two places: the provider, and the Dataverse installation.
 
 Identity Provider Side
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -24,23 +26,26 @@ Identity Provider Side
 Obtain Client ID and Client Secret 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Before OAuth providers will release information about their users (first name, last name, etc.) to your Dataverse installation, you must request a "Client ID" and "Client Secret" from them. In the case of GitHub and Google, this is as simple as clicking a few buttons and there is no cost associated with using their authentication service. ORCID, on the other hand, does not have an automated system for requesting these credentials, and it is not free to use the ORCID authentication service.
+Before OAuth providers will release information about their users (first name, last name, etc.) to your Dataverse installation, you must request a "Client ID" and "Client Secret" from them. In many cases you can use providers' automated system to request these credentials, but if not, contact the provider for assistance.
 
-URLs to help you request a Client ID and Client Secret from the providers supported by Dataverse are provided below.  For all of these providers, it's a good idea to request the Client ID and Client secret using a generic account, perhaps the one that's associated with the ``:SystemEmail`` you've configured for Dataverse, rather than your own personal ORCID, GitHub, or Google account:
+URLs to help you request a Client ID and Client Secret from the providers supported by the Dataverse Software are provided below.  For all of these providers, it's a good idea to request the Client ID and Client secret using a generic account, perhaps the one that's associated with the ``:SystemEmail`` you've configured for your Dataverse installation, rather than your own personal Microsoft Azure AD, ORCID, GitHub, or Google account:
 
-- ORCID: https://orcid.org/content/register-client-application-production-trusted-party
+- ORCID: https://orcid.org/content/register-client-application-0
+- Microsoft: https://docs.microsoft.com/en-us/azure/active-directory/develop/v1-protocols-oauth-code
 - GitHub: https://github.com/settings/applications/new via https://developer.github.com/v3/oauth/
 - Google: https://console.developers.google.com/projectselector/apis/credentials via https://developers.google.com/identity/protocols/OAuth2WebServer (pick "OAuth client ID")
 
 Each of these providers will require the following information from you:
 
 - Basic information about your Dataverse installation such as a name, description, URL, logo, privacy policy, etc.
-- OAuth2 Redirect URI (ORCID) or Authorization Callback URL (GitHub) or Authorized Redirect URIs (Google): This is the URL on the Dataverse side to which the user will be sent after successfully authenticating with the identity provider. This should be the advertised URL of your Dataverse installation (the protocol, fully qualified domain name, and optional port configured via the ``dataverse.siteUrl`` JVM option mentioned in the :doc:`config` section) appended with ``/oauth2/callback.xhtml`` such as ``https://dataverse.example.edu/oauth2/callback.xhtml``.
+- OAuth2 Redirect URI(s) (ORCID) or Redirect URI (Microsoft Azure AD) or Authorization Callback URL (GitHub) or Authorized Redirect URIs (Google): This is the URL on the Dataverse installation side to which the user will be sent after successfully authenticating with the identity provider. This should be the advertised URL of your Dataverse installation (the protocol, fully qualified domain name, and optional port configured via the ``dataverse.siteUrl`` JVM option mentioned in the :doc:`config` section) appended with ``/oauth2/callback.xhtml`` such as ``https://dataverse.example.edu/oauth2/callback.xhtml``.
 
+For ORCID, if you also want to enable the ability to associate ORCIDs with user accounts (when users did not login via ORCID) as discussed in :doc:`orcid`, you must add a second redirect URL: to ``/oauth2/orcidConfirm.xhtml`` such as ``https://dataverse.example.edu/oauth2/orcidConfirm.xhtml``.
+ 
 When you are finished you should have a Client ID and Client Secret from the provider. Keep them safe and secret.
 
-Dataverse Side
-~~~~~~~~~~~~~~
+Dataverse Installation Side
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 As explained under "Auth Modes" in the :doc:`config` section, available authentication providers are stored in the ``authenticationproviderrow`` database table and can be listed with this command:
 
@@ -48,20 +53,22 @@ As explained under "Auth Modes" in the :doc:`config` section, available authenti
 
 We will ``POST`` a JSON file containing the Client ID and Client Secret to this ``authenticationProviders`` API endpoint to add another authentication provider. As a starting point, you'll want to download the JSON template file matching the provider you're setting up:
 
-- :download:`orcid.json <../_static/installation/files/root/auth-providers/orcid.json>`
+- :download:`orcid-public.json <../_static/installation/files/root/auth-providers/orcid-public.json>`
+- :download:`orcid-member.json <../_static/installation/files/root/auth-providers/orcid-member.json>`
 - :download:`github.json <../_static/installation/files/root/auth-providers/github.json>`
 - :download:`google.json <../_static/installation/files/root/auth-providers/google.json>`
+- :download:`microsoft.json <../_static/installation/files/root/auth-providers/microsoft.json>`
 
 Here's how the JSON template for GitHub looks, for example:
 
 .. literalinclude:: ../_static/installation/files/root/auth-providers/github.json
    :language: json
 
-Edit the JSON template and replace the two "FIXME" values with the Client ID and Client Secret you obtained earlier. Then use curl to ``POST`` the JSON to Dataverse:
+Edit the JSON template and replace the two "FIXME" values with the Client ID and Client Secret you obtained earlier. Then use curl to ``POST`` the JSON to the Dataverse installation:
 
 ``curl -X POST -H 'Content-type: application/json' --upload-file github.json http://localhost:8080/api/admin/authenticationProviders``
 
-After restarting Glassfish you should see the new provider under "Other options" on the Log In page, as described in the :doc:`/user/account` section of the User Guide.
+After restarting your app server you should see the new provider under "Other options" on the Log In page, as described in the :doc:`/user/account` section of the User Guide.
 
 By default, the Log In page will show the "builtin" provider, but you can adjust this via the ``:DefaultAuthProvider`` configuration option. For details, see :doc:`config`.
 
@@ -73,12 +80,15 @@ This template can be used for configuring this setting (**this is not something
 
 - :download:`orcid-sandbox.json <../_static/installation/files/root/auth-providers/orcid-sandbox.json>`
 
-Please note that the :doc:`prerequisites` section contains an step regarding CA certs in Glassfish that must be followed to get ORCID login to work.
+Disabling Sign Up
+~~~~~~~~~~~~~~~~~
+
+See :ref:`:AllowRemoteAuthSignUp`.
 
 Converting Local Users to OAuth
 -------------------------------
 
-Once you have enabled at least one OAuth provider, existing users might want to change their login method from local to OAuth to avoid having a Dataverse-specific password. This is documented from the end user perspective in the :doc:`/user/account` section of the User Guide. Users will be prompted to create a new account but can choose to convert an existing local account after confirming their password.
+Once you have enabled at least one OAuth provider, existing users might want to change their login method from local to OAuth to avoid having a Dataverse installation-specific password. This is documented from the end user perspective in the :doc:`/user/account` section of the User Guide. Users will be prompted to create a new account but can choose to convert an existing local account after confirming their password.
 
 .. _converting-oauth-users-to-local:
 
@@ -88,11 +98,11 @@ Converting OAuth Users to Local
 Whereas users convert their own accounts from local to OAuth as described above, conversion in the opposite direction is performed by a sysadmin. A common scenario may be as follows:
 
 - A user emails Support saying, "Rather than logging in with Google, I want to log in with ORCID (or a local password). What should I do?"
-- Support replies asking the user for a new email address to associate with their Dataverse account.
-- The user replies with a new email address to associate with their Dataverse account.
+- Support replies asking the user for a new email address to associate with their Dataverse installation account.
+- The user replies with a new email address to associate with their Dataverse installation account.
 - Support runs the curl command below, supplying the database id of the user to convert and the new email address and notes the username returned.
 - Support emails the user and indicates that they should use the password reset feature to set a new password and to make sure to take note of their username under Account Information (or the password reset confirmation email) since the user never had a username before.
-- The user resets password and is able to log in with their local account. All permissions have been preserved. The user can continue to log in with this Dataverse-specific password or they can convert to an identity provider, if available.
+- The user resets password and is able to log in with their local account. All permissions have been preserved. The user can continue to log in with this Dataverse installation-specific password or they can convert to an identity provider, if available.
 
 In the example below, the user has indicated that the new email address they'd like to have associated with their account is "former.oauth.user@mailinator.com" and their user id from the ``authenticateduser`` database table is "42". The API token must belong to a superuser (probably the sysadmin executing the command).
 
diff --git a/doc/sphinx-guides/source/installation/oidc.rst b/doc/sphinx-guides/source/installation/oidc.rst
new file mode 100644
index 00000000000..d132fd2953d
--- /dev/null
+++ b/doc/sphinx-guides/source/installation/oidc.rst
@@ -0,0 +1,190 @@
+OpenID Connect Login Options
+============================
+
+.. contents:: |toctitle|
+	:local:
+
+Introduction
+------------
+
+The `OpenID Connect <https://openid.net/connect/>`_ (or OIDC) standard support is closely related to our :doc:`oauth2`,
+as it has been based on the `OAuth 2.0 <https://oauth.net/2/>`_ standard. Quick summary: OIDC is using OAuth 2.0, but
+adds a standardized way how authentication is done, while this is up to providers when using OAuth 2.0 for authentication.
+
+Being a standard, you can easily enable the use of any OpenID connect compliant provider out there for login into your Dataverse installation.
+
+Some prominent provider examples:
+
+- `Google <https://developers.google.com/identity/protocols/OpenIDConnect>`_
+- `Microsoft Azure AD <https://learn.microsoft.com/en-us/azure/active-directory/develop/v2-protocols-oidc>`_
+- `Yahoo <https://developer.yahoo.com/oauth2/guide/openid_connect>`_
+- ORCID `announced support <https://orcid.org/blog/2019/04/17/orcid-openid-connect-and-implicit-authentication>`_
+
+You can also either host an OpenID Connect identity management on your own or use a customizable hosted service:
+
+- `Okta <https://developer.okta.com/docs/reference/api/oidc/>`_ is a hosted solution
+- `Keycloak <https://www.keycloak.org>`_ is an open source solution for an IDM/IAM
+- `Unity IDM <https://www.unity-idm.eu>`_ is another open source IDM/IAM solution
+
+Other Use Cases and Combinations
+--------------------------------
+
+- Using your custom identity management solution might be a workaround when you seek for LDAP support, but
+  don't want to go for services like Microsoft Azure AD et al.
+- You want to enable users to login in multiple different ways but appear as one account to the Dataverse installation. This is
+  currently not possible within the Dataverse Software itself, but hosting an IDM and attaching the Dataverse installation solves it.
+- You want to use the `eduGain Federation <https://edugain.org>`_ or other well known SAML federations, but don't want
+  to deploy Shibboleth as your service provider. Using an IDM solution in front easily allows you to use them
+  without hassle.
+- There's also a `Shibboleth IdP (not SP!) extension <https://github.com/CSCfi/shibboleth-idp-oidc-extension>`_,
+  so if you already have a Shibboleth identity provider at your institution, you can reuse it more easily with your Dataverse installation.
+- In the future, OpenID Connect might become a successor to the large scale R&E SAML federations we have nowadays.
+  See also `OpenID Connect Federation Standard <https://openid.net/specs/openid-connect-federation-1_0.html>`_ (in development)
+
+How to Use
+----------
+
+Just like with :doc:`oauth2` you need to obtain a *Client ID* and a *Client Secret* from your provider(s).
+
+.. note::
+  The Dataverse Software does not support `OpenID Connect Dynamic Registration <https://openid.net/specs/openid-connect-registration-1_0.html>`_.
+  You need to apply for credentials out-of-band.
+
+The Dataverse installation will discover all necessary metadata for a given provider on its own (this is `part of the standard
+<https://openid.net/specs/openid-connect-discovery-1_0.html>`_).
+
+To enable this, you need to specify an *Issuer URL* when creating the configuration for your provider (see below).
+
+Finding the issuer URL is best done by searching for terms like "discovery" in the documentation of your provider.
+The discovery document is always located at ``<issuer url>/.well-known/openid-configuration`` (standardized).
+To be sure, you can always lookup the ``issuer`` value inside the live JSON-based discovery document.
+
+Note if you work with Keycloak, make sure the base URL is in the following format: ``https://host:port/realms/{realm}``
+where ``{realm}`` has to be replaced by the name of the Keycloak realm.
+
+After adding a provider, the Log In page will by default show the "builtin" provider, but you can adjust this via the
+``:DefaultAuthProvider`` configuration option. For details, see :doc:`config`.
+
+.. hint::
+   In contrast to our :doc:`oauth2`, you can use multiple providers by creating distinct configurations enabled by
+   the same technology and without modifying the Dataverse Software code base (standards for the win!).
+
+
+.. _oidc-pkce:
+
+Enabling PKCE Security
+^^^^^^^^^^^^^^^^^^^^^^
+
+Many providers these days support or even require the usage of `PKCE <https://oauth.net/2/pkce/>`_ to safeguard against
+some attacks and enable public clients that cannot have a secure secret to still use OpenID Connect (or OAuth2).
+
+The Dataverse-built OIDC client can be configured to use PKCE and the method to use when creating the code challenge can be specified.
+See also `this explanation of the flow <https://auth0.com/docs/get-started/authentication-and-authorization-flow/authorization-code-flow-with-proof-key-for-code-exchange-pkce>`_
+for details on how this works.
+
+As we are using the `Nimbus SDK <https://connect2id.com/products/nimbus-oauth-openid-connect-sdk>`_ as our client
+library, we support the standard ``PLAIN`` and ``S256`` (SHA-256) code challenge methods. "SHA-256 method" is the default
+as recommend in `RFC7636 <https://datatracker.ietf.org/doc/html/rfc7636#section-4.2>`_. If your provider needs some
+other method, please open an issue.
+
+The provisioning sections below contain in the example the parameters you may use to configure PKCE.
+
+Provision a Provider
+--------------------
+
+Depending on your use case, you can choose different ways to setup one or multiple OIDC identity providers.
+
+Using :ref:`jvm-options` has the advantage of being consistent and does not require additional calls to the API.
+It can only configure one provider though, yet you can mix with other provider definitions via API.
+
+Using the REST API has the advantage of provisioning multiple, different OIDC providers.
+Depending on your use case, it has the drawback of needing additional API calls.
+
+If you only need one single provider in your installation and it is using OIDC, use the JVM options, as it
+requires fewer extra steps and allows you to keep more configuration in a single source.
+
+Provision via REST API
+^^^^^^^^^^^^^^^^^^^^^^
+
+Note: you may omit the PKCE related settings from ``factoryData`` below if you don't plan on using PKCE - default is
+disabled.
+
+Please create a :download:`my-oidc-provider.json <../_static/installation/files/root/auth-providers/oidc.json>` file, replacing every ``<...>`` with your values:
+
+.. literalinclude:: /_static/installation/files/root/auth-providers/oidc.json
+    :name: oidc-provider-example
+    :language: json
+
+Now load the configuration into your Dataverse installation using the same API as with :doc:`oauth2`:
+
+``curl -X POST -H 'Content-type: application/json' --upload-file my-oidc-provider.json http://localhost:8080/api/admin/authenticationProviders``
+
+The Dataverse installation will automatically try to load the provider and retrieve the metadata. Watch the app server log for errors.
+You should see the new provider under "Other options" on the Log In page, as described in the :doc:`/user/account`
+section of the User Guide.
+
+.. _oidc-mpconfig:
+
+Provision via JVM Options
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A single provider may be provisioned using :ref:`jvm-options`.
+It may be accompanied by more providers configured via REST API.
+Note that this provider will only be deployed at startup time and (currently) cannot be reconfigured without a restart.
+
+All options below may be set via *MicroProfile Config API* sources. Examples: use environment variable
+``DATAVERSE_AUTH_OIDC_ENABLED`` for the ``dataverse.auth.oidc.enabled`` option or ``DATAVERSE_AUTH_OIDC_CLIENT_ID``
+for the ``dataverse.auth.oidc.client-id`` option.
+
+The following options are available:
+
+.. list-table::
+  :widths: 25 55 10 10
+  :header-rows: 1
+  :align: left
+
+  * - Option
+    - Description
+    - Mandatory
+    - Default
+  * - ``dataverse.auth.oidc.enabled``
+    - Enable or disable provisioning the provider via MicroProfile.
+    - N
+    - ``false``
+  * - ``dataverse.auth.oidc.client-id``
+    - The client-id of the application to identify it at your provider.
+    - Y
+    - \-
+  * - ``dataverse.auth.oidc.client-secret``
+    - A confidential secret to authorize application requests to the provider as legit.
+    - N
+    - \-
+  * - ``dataverse.auth.oidc.auth-server-url``
+    - The base URL of the OpenID Connect (OIDC) server as explained above.
+    - Y
+    - \-
+  * - ``dataverse.auth.oidc.pkce.enabled``
+    - Set to ``true`` to enable :ref:`PKCE <oidc-pkce>` in auth flow.
+    - N
+    - ``false``
+  * - ``dataverse.auth.oidc.pkce.method``
+    - Set code challenge method. The default value is the current best practice in the literature.
+    - N
+    - ``S256``
+  * - ``dataverse.auth.oidc.title``
+    - The UI visible name for this provider in login options.
+    - N
+    - ``OpenID Connect``
+  * - ``dataverse.auth.oidc.subtitle``
+    - A subtitle, currently not displayed by the UI.
+    - N
+    - ``OpenID Connect``
+  * - ``dataverse.auth.oidc.pkce.max-cache-size``
+    - Tune the maximum size of all OIDC providers' verifier cache (the number of outstanding PKCE-enabled auth responses).
+    - N
+    - 10000
+  * - ``dataverse.auth.oidc.pkce.max-cache-age``
+    - Tune the maximum age, in seconds, of all OIDC providers' verifier cache entries. Default is 5 minutes, equivalent to lifetime
+      of many OIDC access tokens.
+    - N
+    - 300
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/installation/orcid.rst b/doc/sphinx-guides/source/installation/orcid.rst
new file mode 100644
index 00000000000..c998b27f828
--- /dev/null
+++ b/doc/sphinx-guides/source/installation/orcid.rst
@@ -0,0 +1,26 @@
+ORCID Integration
+=================
+
+.. contents:: |toctitle|
+	:local:
+
+Introduction
+------------
+
+Dataverse leverages ORCIDs (and other types of persistent identifiers (PIDs)) to improve the findability of data and to simplify the process of adding metadata.
+When ORCIDs are included as metadata about authors, Dataverse includes them in metadata exports, advertises them through :ref:`discovery-sign-posting` and via metadata embedded in dataset pages, and includes them in the metadata associated with dataset DOIs.
+
+Dataverse can be configured to make it easier to include ORCIDs
+- via use of an ORCID "External Vocabulary Script" that allows users to lookup authors, depositors, etc. based on their ORCID profile metadata and then records these ORCIDs automatically and adds links to ORCID profiles in metadata displays. With this configured, there is no need enter ORCIDs directly. See :ref:`using-external-vocabulary-services` in the Admin Guide.
+- via association of ORCIDs with Dataverse user accounts, through the use of ORCID logins or, in addition or instead, a separate authenticated ORCID linking mechanism. When an ORCID is associated with a Dataverse account, it will automatically be added to the dataset metadata when a user creates a dataset and is added as an initial author.
+
+See also :ref:`orcid-integration` in the User Guide.
+
+Configuration
+--------------
+
+The steps needed to configure Dataverse to support lookup of ORCIDs for the author metadata field (and ROR identifiers for organizations as author affiliations) is described in the `Dataverse Author Field Example page <https://github.com/gdcc/dataverse-external-vocab-support/blob/main/examples/authorIDandAffilationUsingORCIDandROR.md>`_ in the `Dataverse External Vocabulary Suport Github Repository <https://github.com/gdcc/dataverse-external-vocab-support>`_. Briefly, this involves changing the :ref:`:CVocConf` setting and potentially creating local web-acessible copies of the relevant scripts.
+
+To configure Dataverse to support adding ORCIDs to user profiles, one must configure ORCID as an OAuth2 provider as described in :doc:`oauth2`. The ability to link ORCIDs to user accounts is automatically enabled if an ORCID provider is configured. To avoid also enabling ORCID login, the provider can be registered with "enabled":false.
+
+ 
diff --git a/doc/sphinx-guides/source/installation/prep.rst b/doc/sphinx-guides/source/installation/prep.rst
index 711693125f0..abb4349d3ad 100644
--- a/doc/sphinx-guides/source/installation/prep.rst
+++ b/doc/sphinx-guides/source/installation/prep.rst
@@ -14,33 +14,27 @@ We'll try to get you up and running as quickly as possible, but we thought you m
 Choose Your Own Installation Adventure
 --------------------------------------
 
-Vagrant (for Testing Only)
-++++++++++++++++++++++++++
-
-If you are looking to simply kick the tires on installing Dataverse and are familiar with Vagrant, you are welcome to read through the "Vagrant" section of the :doc:`/developers/tools` section of the Developer Guide. Checking out a tagged release is recommended rather than running ``vagrant up`` on unreleased code.
-
-Pilot Installation
-++++++++++++++++++
-
-Vagrant is not a bad way for a sysadmin to get a quick sense of how an application like Dataverse is put together in a sandbox (a virtual machine running on a laptop for example), but to allow end users to start playing with Dataverse, you'll need to install Dataverse on a server.
+Standard Installation
++++++++++++++++++++++
 
-Installing Dataverse involves some system configuration followed by executing an installation script that will guide you through the installation process as described in :doc:`installation-main`, but reading about the :ref:`architecture` of Dataverse is recommended first.
+Installing the Dataverse Software involves some system configuration followed by executing an installation script that will guide you through the installation process as described in :doc:`installation-main`, but reading about the :ref:`architecture` of the Dataverse Software is recommended first.
 
 .. _advanced:
 
 Advanced Installation
 +++++++++++++++++++++
 
-There are some community-lead projects to use configuration management tools such as Ansible and Puppet to automate Dataverse installation and configuration, but support for these solutions is limited to what the Dataverse community can offer as described in each project's webpage:
+There are some community-lead projects to use configuration management tools such as Ansible and Puppet to automate the installation and configuration of the Dataverse Software, but support for these solutions is limited to what the Dataverse Community can offer as described in each project's webpage:
 
-- https://github.com/IQSS/dataverse-ansible
+- https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible
+- https://gitlab.com/lip-computing/dataverse
 - https://github.com/IQSS/dataverse-puppet
 
-(Please note that the "dataverse-ansible" repo is used in a script that allows Dataverse to be installed on Amazon Web Services (AWS) from arbitrary GitHub branches as described in the :doc:`/developers/deployment` section of the Developer Guide.)
+(Please note that the "dataverse-ansible" repo is used in a script that allows the Dataverse Software to be installed on Amazon Web Services (AWS) from arbitrary GitHub branches as described in the :doc:`/developers/deployment` section of the Developer Guide.)
 
-The Dataverse development team is happy to "bless" additional community efforts along these lines (i.e. Docker, Chef, Salt, etc.) by creating a repo under https://github.com/IQSS and managing team access.
+The Dataverse Project team is happy to "bless" additional community efforts along these lines (i.e. Docker, Chef, Salt, etc.) by creating a repo under https://github.com/gdcc and managing team access.
 
-Dataverse permits a fair amount of flexibility in where you choose to install the various components. The diagram below shows a load balancer, multiple proxies and web servers, redundant database servers, and offloading of potentially resource intensive work to a separate server. 
+The Dataverse Software permits a fair amount of flexibility in where you choose to install the various components. The diagram below shows a load balancer, multiple proxies and web servers, redundant database servers, and offloading of potentially resource intensive work to a separate server. (Glassfish is shown rather than Payara.)
 
 |3webservers|
 
@@ -51,32 +45,31 @@ A setup such as this is advanced enough to be considered out of scope for this g
 Architecture and Components
 ---------------------------
 
-Dataverse is a Java Enterprise Edition (EE) web application that is shipped as a war (web archive) file.
+The Dataverse Software is a Java Enterprise Edition (EE) web application that is shipped as a WAR (Web ARchive) file. This WAR file is deployed to an application server or app server.
 
 Required Components
 +++++++++++++++++++
 
-When planning your installation you should be aware of the following components of the Dataverse architecture:
+When planning your installation you should be aware of the following components of the Dataverse Software architecture:
 
-- Linux: RHEL/CentOS is highly recommended since all development and QA happens on this distribution.
-- Glassfish: a Java EE application server to which the Dataverse application (war file) is to be deployed.
+- Linux: RHEL or derivative is highly recommended since all development and QA happens on this distribution.
+- App server: Payara is the recommended Jakarta EE application server.
 - PostgreSQL: a relational database.
-- Solr: a search engine. A Dataverse-specific schema is provided.
+- Solr: a search engine. A Dataverse Software-specific schema is provided.
 - SMTP server: for sending mail for password resets and other notifications.
 - Persistent identifier service: DOI and Handle support are provided. Production use requires a registered DOI or Handle.net authority.
+- Rserve: runs as a daemon to execute R code.
 
 Optional Components
 +++++++++++++++++++
 
 There are a number of optional components you may choose to install or configure, including:
 
-- External Tools: Third party tools for data exploration can be added to Dataverse by following the instructions in the :doc:`/admin/external-tools` section of the Admin Guide.
-- R, rApache, Zelig, and TwoRavens: :doc:`/user/data-exploration/tworavens` describes the feature and :doc:`r-rapache-tworavens` describes how to install these components. :doc:`/admin/external-tools` explains how third-party tools like TwoRavens can be added to Dataverse.
+- External Tools: Third party tools for data exploration can be added to the Dataverse installation by following the instructions in the :doc:`/admin/external-tools` section of the Admin Guide.
 - Dropbox integration :ref:`dataverse.dropbox.key`: for uploading files from the Dropbox API.
-- Apache: a web server that can "reverse proxy" Glassfish applications and rewrite HTTP traffic.
-- Shibboleth: an authentication system described in :doc:`shibboleth`. Its use with Dataverse requires Apache.
+- Apache: a web server that can "reverse proxy" Jakarta EE applications (like the Dataverse Software) and rewrite HTTP traffic.
+- Shibboleth: an authentication system described in :doc:`shibboleth`. Its use with a Dataverse installation requires Apache.
 - OAuth2: an authentication system described in :doc:`oauth2`.
-- Geoconnect: a system that allows users to create maps from geospatial files, described in :doc:`geoconnect`.
 
 See also the :doc:`/admin/integrations` section of the Admin Guide.
 
@@ -86,20 +79,29 @@ System Requirements
 Hardware Requirements
 +++++++++++++++++++++
 
-A basic installation of Dataverse runs fine on modest hardware. For example, as of this writing the test installation at http://phoenix.dataverse.org is backed by a single virtual machine with two 2.8 GHz processors, 8 GB of RAM and 50 GB of disk.
+A basic Dataverse installation runs fine on modest hardware. For example, in the recent past we had a test instance backed by a single virtual machine with two 2.8 GHz processors, 8 GB of RAM and 50 GB of disk.
+
+In contrast, before we moved it to the Amazon Cloud, the production installation at https://dataverse.harvard.edu was backed by six servers with two Intel Xeon 2.53 Ghz CPUs and either 48 or 64 GB of RAM. The three servers with 48 GB of RAM run were web frontends running Glassfish 4 and Apache and were load balanced by a hardware device. The remaining three servers with 64 GB of RAM were the primary and backup database servers and a server dedicated to running Rserve. Multiple TB of storage were mounted from a SAN via NFS.
+
+Currently, the Harvard Dataverse Repository is served by four AWS server nodes
+
+- two instances for web frontends running Payara fronted by Apache ("m4.4xlarge" with 64 GB RAM and 16 vCPUs)
+
+  - these are sitting behind an AWS ELB load balancer
 
-In contrast, before we moved it to the Amazon Cloud, the production installation at https://dataverse.harvard.edu was backed by six servers with two Intel Xeon 2.53 Ghz CPUs and either 48 or 64 GB of RAM. The three servers with 48 GB of RAM run were web frontends running Glassfish and Apache and were load balanced by a hardware device. The remaining three servers with 64 GB of RAM were the primary and backup database servers and a server dedicated to running Rserve. Multiple TB of storage were mounted from a SAN via NFS.
+- one instance for the Solr search engine ("m4.2xlarge" with 32 GB RAM and 8 vCPUs)
+- one instance for R ("m4.xlarge" instances with 16 GB RAM and 4 vCPUs)
 
-Currently, Harvard Dataverse is served by four AWS server nodes: two "m4.4xlarge" instances (64GB/16 vCPU) as web frontends, one 32GB/8 vCPU ("m4.2xlarge") instance for the Solr search engine, and one 16GB/4 vCPU ("m4.xlarge") instance for R and TwoRavens. The PostgreSQL database is served by Amazon RDS, and physical files are stored on Amazon S3.
+The PostgreSQL database is served by Amazon RDS.
 
-The Dataverse installation script will attempt to give Glassfish the right amount of RAM based on your system.
+Physical files are stored on Amazon S3. The primary bucket is replicated in real-time to a secondary bucket, which is backed up to Glacier. Deleted files are kept around on the secondary bucket for a little while for convenient recovery. In addition, we use a backup script mentioned under :doc:`/admin/backups`.
 
-Experimentation and testing with various hardware configurations is encouraged, or course, but do reach out as explained in the :doc:`intro` as needed for assistance.
+Experimentation and testing with various hardware configurations is encouraged, or course. Note that the installation script will attempt to give your app server (the web frontend) the right amount of RAM based on your system.
 
 Software Requirements
 +++++++++++++++++++++
 
-See :ref:`architecture` for an overview of required and optional components. The :doc:`prerequisites` section is oriented toward installing the software necessary to successfully run the Dataverse installation script. Pages on optional components contain more detail of software requirements for each component.
+See :ref:`architecture` for an overview of required and optional components. The :doc:`prerequisites` section is oriented toward installing the software necessary to successfully run the Dataverse Software installation script. Pages on optional components contain more detail of software requirements for each component.
 
 Clients are expected to be running a relatively modern browser.
 
@@ -110,15 +112,16 @@ Here are some questions to keep in the back of your mind as you test and move in
 
 - How much storage do I need?
 - Which features do I want based on :ref:`architecture`?
-- How do I want my users to log in to Dataverse? With local accounts? With Shibboleth/SAML? With OAuth providers such as ORCID, GitHub, or Google?
-- Do I want to to run Glassfish on the standard web ports (80 and 443) or do I want to "front" Glassfish with a proxy such as Apache or nginx? See "Network Ports" in the :doc:`config` section.
+- How do I want my users to log in to the Dataverse installation? With local accounts? With Shibboleth/SAML? With OAuth providers such as ORCID, GitHub, or Google?
+- Do I want to to run my app server on the standard web ports (80 and 443) or do I want to "front" my app server with a proxy such as Apache or nginx? See "Network Ports" in the :doc:`config` section.
 - How many points of failure am I willing to tolerate? How much complexity do I want?
 - How much does it cost to subscribe to a service to create persistent identifiers such as DOIs or handles?
+- What licenses should I make available to my users?
 
 Next Steps
 ----------
 
-Proceed to the :doc:`prerequisites` section which will help you get ready to run the Dataverse installation script.
+Proceed to the :doc:`prerequisites` section which will help you get ready to run the Dataverse Software installation script.
 
 .. |3webservers| image:: ./img/3webservers.png
    :class: img-responsive
diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst
index 0d3c9a26177..a5aacc4701c 100644
--- a/doc/sphinx-guides/source/installation/prerequisites.rst
+++ b/doc/sphinx-guides/source/installation/prerequisites.rst
@@ -4,187 +4,166 @@
 Prerequisites
 =============
 
-Before running the Dataverse installation script, you must install and configure Linux, Java, Glassfish, PostgreSQL, Solr, and jq. The other software listed below is optional but can provide useful features.
+Before running the Dataverse Software installation script, you must install and configure Linux, Java, Payara, PostgreSQL, Solr, and jq. The other software listed below is optional but can provide useful features.
 
 After following all the steps below, you can proceed to the :doc:`installation-main` section.
 
-You **may** find it helpful to look at how the configuration is done automatically by various tools such as Vagrant, Puppet, or Ansible. See the :doc:`prep` section for pointers on diving into these scripts.
-
 .. contents:: |toctitle|
 	:local:
 
 Linux
 -----
 
-We assume you plan to run Dataverse on Linux and we recommend RHEL/CentOS, which is the Linux distribution tested by the Dataverse development team. Please be aware that while el7 (RHEL/CentOS 7) is the recommended platform, the steps below were orginally written for el6 and may need to be updated (please feel free to make a pull request!).
+We assume you plan to run your Dataverse installation on Linux and we recommend RHEL or a derivative such as RockyLinux or AlmaLinux, which is the distribution family tested by the Dataverse Project team. Please be aware that while EL8 (RHEL/derivatives) is the recommended platform, the steps below were orginally written for EL6 and may need to be updated (please feel free to make a pull request!). A number of community members have installed the Dataverse Software in Debian/Ubuntu environments.
 
 Java
 ----
 
-Dataverse requires Java SE 8 (8u74/JDK 1.8.0u74 or higher).
+The recommended version is Java 17 because it's the version we test with.
 
 Installing Java
 ===============
 
-Dataverse should run fine with only the Java Runtime Environment (JRE) installed, but installing the Java Development Kit (JDK) is recommended so that useful tools for troubleshooting production environments are available. We recommend using Oracle JDK or OpenJDK.
+The Dataverse Software should run fine with only the Java Runtime Environment (JRE) installed, but installing the Java Development Kit (JDK) is recommended so that useful tools for troubleshooting production environments are available. We recommend using Oracle JDK or OpenJDK.
 
-The Oracle JDK can be downloaded from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+The Oracle JDK can be downloaded from https://www.oracle.com/technetwork/java/javase/downloads/index.html
 
-On a RHEL/CentOS, install OpenJDK (devel version) using yum::
+On a RHEL/derivative, install OpenJDK (devel version) using yum::
 
-	# yum install java-1.8.0-openjdk-devel
+	# sudo yum install java-17-openjdk
 
-If you have multiple versions of Java installed, Java 8 should be the default when ``java`` is invoked from the command line. You can test this by running ``java -version``.
+If you have multiple versions of Java installed, Java 17 should be the default when ``java`` is invoked from the command line. You can test this by running ``java -version``.
 
-On RHEL/CentOS you can make Java 8 the default with the ``alternatives`` command, having it prompt you to select the version of Java from a list::
+On RHEL/derivative you can make Java 17 the default with the ``alternatives`` command, having it prompt you to select the version of Java from a list::
 
         # alternatives --config java
 
-If you don't want to be prompted, here is an example of the non-interactive invocation::
-
-        # alternatives --set java /usr/lib/jvm/jre-1.8.0-openjdk.x86_64/bin/java
 
-Glassfish
----------
+.. _payara:
 
-Glassfish Version 4.1 is required. There are known issues with newer versions of the Glassfish 4.x series so it should be avoided. For details, see https://github.com/IQSS/dataverse/issues/2628 . The issue we are using the track support for Glassfish 5 is https://github.com/IQSS/dataverse/issues/4248 .
+Payara
+------
 
-Installing Glassfish
-====================
+Payara 6.2025.3 is recommended. Newer versions might work fine. Regular updates are recommended.
 
-**Note:** The Dataverse installer need not be run as root, and it is recommended that Glassfish not run as root either. We suggest the creation of a glassfish service account for this purpose.
+Installing Payara
+=================
 
-- Download and install Glassfish (installed in ``/usr/local/glassfish4`` in the example commands below)::
+**Note:** The Dataverse Software installer need not be run as root, and it is recommended that Payara not run as root either. We suggest the creation of a "dataverse" service account for this purpose::
 
-	# wget http://dlc-cdn.sun.com/glassfish/4.1/release/glassfish-4.1.zip
-	# unzip glassfish-4.1.zip
-	# mv glassfish4 /usr/local
+	# useradd dataverse
 
-If you intend to install and run Glassfish under a service account (and we hope you do), chown -R the Glassfish hierarchy to root to protect it but give the service account access to the below directories:
+- Download and install Payara (installed in ``/usr/local/payara6`` in the example commands below)::
 
-- Set service account permissions::
+	# wget https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.3/payara-6.2025.3.zip
+	# unzip payara-6.2025.3.zip
+	# mv payara6 /usr/local
 
-	# chown -R root:root /usr/local/glassfish4
-	# chown glassfish /usr/local/glassfish4/glassfish/lib
-	# chown -R glassfish:glassfish /usr/local/glassfish4/glassfish/domains/domain1
+If nexus.payara.fish is ever down for maintenance, Payara distributions are also available from https://repo1.maven.org/maven2/fish/payara/distributions/payara/
 
-After installation, you may chown the lib/ directory back to root; the installer only needs write access to copy the JDBC driver into that directory.
+If you intend to install and run Payara under a service account (and we hope you do), chown -R the Payara hierarchy to root to protect it but give the service account access to the below directories:
 
-Once Glassfish is installed, you'll need a newer version of the Weld library (v2.2.10.SP1) to fix a serious issue in the library supplied with Glassfish 4.1 (see https://github.com/IQSS/dataverse/issues/647 for details). If you plan to front Glassfish with Apache you must also patch Grizzly as explained in the :doc:`shibboleth` section.
+- Set service account permissions::
 
-- Remove the stock Weld jar; download Weld v2.2.10.SP1 and install it in the modules folder::
+	# chown -R root:root /usr/local/payara6
+	# chown dataverse /usr/local/payara6/glassfish/lib
+	# chown -R dataverse:dataverse /usr/local/payara6/glassfish/domains/domain1
 
-	# cd /usr/local/glassfish4/glassfish/modules
-	# rm weld-osgi-bundle.jar
-	# wget http://central.maven.org/maven2/org/jboss/weld/weld-osgi-bundle/2.2.10.SP1/weld-osgi-bundle-2.2.10.SP1-glassfish4.jar
+After installation, you may chown the lib/ directory back to root; the installer only needs write access to copy the JDBC driver into that directory.
 
 - Change from ``-client`` to ``-server`` under ``<jvm-options>-client</jvm-options>``::
 
-	# vim /usr/local/glassfish4/glassfish/domains/domain1/config/domain.xml
+	# vim /usr/local/payara6/glassfish/domains/domain1/config/domain.xml
 
 This recommendation comes from http://www.c2b2.co.uk/middleware-blog/glassfish-4-performance-tuning-monitoring-and-troubleshooting.php among other places.
 
-- Start Glassfish and verify the Weld version::
-
-	# /usr/local/glassfish4/bin/asadmin start-domain
-	# /usr/local/glassfish4/bin/asadmin osgi lb | grep 'Weld OSGi Bundle'
+Launching Payara on System Boot
+===============================
 
-The Certificate Authority (CA) certificate bundle file from Glassfish contains certs that expired in August 2018, causing problems with ORCID login.
+The Dataverse Software installation script will start Payara if necessary, but you may find the following scripts helpful to launch Payara start automatically on boot. They were originally written for Glassfish but have been adjusted for Payara.
 
-- The actual expiration date is August 22, 2018, which you can see with the following command::
+- This :download:`Systemd file<../_static/installation/files/etc/systemd/payara.service>` may be serve as a reference for systems using Systemd (such as RHEL/derivative or Debian 10, Ubuntu 16+)
+- This :download:`init script<../_static/installation/files/etc/init.d/payara.init.service>` may be useful for RHEL/derivative or Ubuntu >= 14 if you're using a Payara service account, or
+- This :download:`Payara init script <../_static/installation/files/etc/init.d/payara.init.root>` may be helpful if you're just going to run Payara as root (not recommended).
 
-	# keytool -list -v -keystore /usr/local/glassfish4/glassfish/domains/domain1/config/cacerts.jks
+It is not necessary for Payara to be running before you execute the Dataverse Software installation script; it will start Payara for you.
 
-- Overwrite Glassfish's CA certs file with the file that ships with the operating system and restart Glassfish::
+Please note that you must run Payara in an English locale. If you are using something like ``LANG=de_DE.UTF-8``, ingest of tabular data will fail with the message "RoundRoutines:decimal separator no in right place".
 
-	# cp /etc/pki/ca-trust/extracted/java/cacerts /usr/local/glassfish4/glassfish/domains/domain1/config/cacerts.jks
-	# /usr/local/glassfish4/bin/asadmin stop-domain
-	# /usr/local/glassfish4/bin/asadmin start-domain
-
-Launching Glassfish on system boot
-==================================
-
-The Dataverse installation script will start Glassfish if necessary, but you may find the following scripts helpful to launch Glassfish start automatically on boot.
-
-- This :download:`Systemd file<../_static/installation/files/etc/systemd/glassfish.service>` may be serve as a reference for systems using Systemd (such as RHEL/CentOS 7 or Ubuntu 16+)
-- This :download:`init script<../_static/installation/files/etc/init.d/glassfish.init.service>` may be useful for RHEL/CentOS 6 or Ubuntu >= 14 if you're using a Glassfish service account, or
-- This :download:`Glassfish init script <../_static/installation/files/etc/init.d/glassfish.init.root>` may be helpful if you're just going to run Glassfish as root.
-
-It is not necessary for Glassfish to be running before you execute the Dataverse installation script; it will start Glassfish for you.
-
-Please note that you must run Glassfish in an English locale. If you are using something like ``LANG=de_DE.UTF-8``, ingest of tabular data will fail with the message "RoundRoutines:decimal separator no in right place".
-
-Also note that Glassfish may utilize more than the default number of file descriptors, especially when running batch jobs such as harvesting. We have increased ours by adding ulimit -n 32768 to our glassfish init script. On operating systems which use systemd such as RHEL or CentOS 7, file descriptor limits may be increased by adding a line like LimitNOFILE=32768 to the systemd unit file. You may adjust the file descriptor limits on running processes by using the prlimit utility::
+Also note that Payara may utilize more than the default number of file descriptors, especially when running batch jobs such as harvesting. We have increased ours by adding ulimit -n 32768 to our Payara init script. On operating systems which use systemd such as RHEL/derivative, file descriptor limits may be increased by adding a line like LimitNOFILE=32768 to the systemd unit file. You may adjust the file descriptor limits on running processes by using the prlimit utility::
 
 	# sudo prlimit --pid pid --nofile=32768:32768
 
 PostgreSQL
 ----------
 
+PostgreSQL 16 is recommended because it's the version we test against. Version 10 or higher is required because that's what's `supported by Flyway <https://documentation.red-gate.com/fd/postgresql-184127604.html>`_, which we use for database migrations.
+
+You are welcome to experiment with newer versions of PostgreSQL, but please note that as of PostgreSQL 15, permissions have been restricted on the ``public`` schema (`release notes <https://www.postgresql.org/docs/release/15.0/>`_, `EDB blog post <https://www.enterprisedb.com/blog/new-public-schema-permissions-postgresql-15>`_, `Crunchy Data blog post <https://www.crunchydata.com/blog/be-ready-public-schema-changes-in-postgres-15>`_). The Dataverse installer has been updated to restore the old permissions, but this may not be a long term solution.
+
 Installing PostgreSQL
-=======================
+=====================
 
-Version 9.6 is strongly recommended because it is the version developers and QA test with::
+*For example*, to install PostgreSQL 16 under RHEL9/derivative::
 
-	# yum install -y https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
+	# yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm
 	# yum makecache fast
-	# yum install -y postgresql96-server
-	# /usr/pgsql-9.6/bin/postgresql96-setup initdb
-	# /usr/bin/systemctl start postgresql-9.6
-	# /usr/bin/systemctl enable postgresql-9.6
-	
-Note that the steps above are specific to RHEL/CentOS 7. For RHEL/CentOS 6 use::
-
-	# yum install -y https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-6-x86_64/pgdg-centos96-9.6-3.noarch.rpm
-	# yum makecache fast
-	# yum install -y postgresql96-server
-	# service postgresql-9.6 initdb
-	# service postgresql-9.6 start
+	# yum install -y postgresql16-server
+	# /usr/pgsql-16/bin/postgresql-16-setup initdb
+	# /usr/bin/systemctl start postgresql-16
+	# /usr/bin/systemctl enable postgresql-16
+
+For RHEL8/derivative the process would be identical, except for the first two commands: you would need to install the "EL-8" yum repository configuration and run ``yum makecache`` instead.
 
-Configuring Database Access for the Dataverse Application (and the Dataverse Installer) 
-=======================================================================================
+Configuring Database Access for the Dataverse Installation (and the Dataverse Software Installer)
+=================================================================================================
 
 - The application and the installer script will be connecting to PostgreSQL over TCP/IP, using password authentication. In this section we explain how to configure PostgreSQL to accept these connections.
 
 
-- If PostgreSQL is running on the same server as Glassfish, find the localhost (127.0.0.1) entry that's already in the ``pg_hba.conf`` and modify it to look like this:: 
+- If PostgreSQL is running on the same server as Payara, find the localhost (127.0.0.1) entry that's already in the ``pg_hba.conf`` and modify it to look like this::
 
   	host all all 127.0.0.1/32 md5
 
-  Once you are done with the prerequisites and run the installer script (documented here: :doc:`installation-main`) it will ask you to enter the address of the Postgres server. Simply accept the default value ``127.0.0.1`` there. 
+  Once you are done with the prerequisites and run the installer script (documented here: :doc:`installation-main`) it will ask you to enter the address of the Postgres server. Simply accept the default value ``127.0.0.1`` there.
 
 
-- The Dataverse installer script will need to connect to PostgreSQL **as the admin user**, in order to create and set up the database that the Dataverse will be using. If for whatever reason it is failing to connect (for example, if you don't know/remember what your Postgres admin password is), you may choose to temporarily disable all the access restrictions on localhost connections, by changing the above line to::
+- The Dataverse Software installer script will need to connect to PostgreSQL **as the admin user**, in order to create and set up the database that the Dataverse installation will be using. If for whatever reason it is failing to connect (for example, if you don't know/remember what your Postgres admin password is), you may choose to temporarily disable all the access restrictions on localhost connections, by changing the above line to::
 
   	host all all 127.0.0.1/32 trust
 
   Note that this rule opens access to the database server **via localhost only**. Still, in a production environment, this may constitute a security risk. So you will likely want to change it back to "md5" once the installer has finished.
 
 
-- If the Dataverse application is running on a different server, you will need to add a new entry to the ``pg_hba.conf`` granting it access by its network address::
+- If the Dataverse installation is running on a different server, you will need to add a new entry to the ``pg_hba.conf`` granting it access by its network address::
 
         host all all [ADDRESS]      255.255.255.255 md5
 
-  Where ``[ADDRESS]`` is the numeric IP address of the Glassfish server. Enter this address when the installer asks for the PostgreSQL server address.
+  Where ``[ADDRESS]`` is the numeric IP address of the Payara server. Enter this address when the installer asks for the PostgreSQL server address.
 
-- In some distributions, PostgreSQL is pre-configured so that it doesn't accept network connections at all. Check that the ``listen_address`` line in the configuration file ``postgresql.conf`` is not commented out and looks like this:: 
+- In some distributions, PostgreSQL is pre-configured so that it doesn't accept network connections at all. Check that the ``listen_address`` line in the configuration file ``postgresql.conf`` is not commented out and looks like this::
 
-        listen_addresses='*' 
+        listen_addresses='*'
 
   The file ``postgresql.conf`` will be located in the same directory as the ``pg_hba.conf`` above.
 
-- **Important: PostgreSQL must be restarted** for the configuration changes to take effect! On RHEL/CentOS 7 and similar (provided you installed Postgres as instructed above)::
+- **Important: PostgreSQL must be restarted** for the configuration changes to take effect! On RHEL7/derivative and similar (provided you installed Postgres as instructed above)::
 
-        # systemctl restart postgresql-9.6
+        # systemctl restart postgresql-16
 
-  On MacOS X a "Reload Configuration" icon is usually supplied in the PostgreSQL application folder. Or you could look up the process id of the PostgreSQL postmaster process, and send it the SIGHUP signal:: 
+  On MacOS X a "Reload Configuration" icon is usually supplied in the PostgreSQL application folder. Or you could look up the process id of the PostgreSQL postmaster process, and send it the SIGHUP signal::
 
       	kill -1 PROCESS_ID
 
-Solr 
+Solr
 ----
 
-The Dataverse search index is powered by Solr.
+The Dataverse software search index is powered by Solr.
+
+Supported Versions
+==================
+
+The Dataverse software has been tested with Solr version 9.8.0. Future releases in the 9.x series are likely to be compatible. Please get in touch (:ref:`support`) if you are having trouble with a newer version.
 
 Installing Solr
 ===============
@@ -199,19 +178,19 @@ Become the ``solr`` user and then download and configure Solr::
 
         su - solr
         cd /usr/local/solr
-        wget https://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz
-        tar xvzf solr-7.3.1.tgz
-        cd solr-7.3.1
+        wget https://archive.apache.org/dist/solr/solr/9.8.0/solr-9.8.0.tgz
+        tar xvzf solr-9.8.0.tgz
+        cd solr-9.8.0
         cp -r server/solr/configsets/_default server/solr/collection1
 
 You should already have a "dvinstall.zip" file that you downloaded from https://github.com/IQSS/dataverse/releases . Unzip it into ``/tmp``. Then copy the files into place::
 
-        cp /tmp/dvinstall/schema*.xml /usr/local/solr/solr-7.3.1/server/solr/collection1/conf
-        cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-7.3.1/server/solr/collection1/conf
+        cp /tmp/dvinstall/schema*.xml /usr/local/solr/solr-9.8.0/server/solr/collection1/conf
+        cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-9.8.0/server/solr/collection1/conf
 
-Note: Dataverse has customized Solr to boost results that come from certain indexed elements inside Dataverse, for example prioritizing results from Dataverses over Datasets. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ``<str name="qf">`` element and its contents. If you have ideas about how this boosting could be improved, feel free to contact us through our Google Group https://groups.google.com/forum/#!forum/dataverse-dev .
+Note: The Dataverse Project team has customized Solr to boost results that come from certain indexed elements inside the Dataverse installation, for example prioritizing results from Dataverse collections over Datasets. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ``<str name="qf">`` element and its contents. If you have ideas about how this boosting could be improved, feel free to contact us through our Google Group https://groups.google.com/forum/#!forum/dataverse-dev .
 
-Dataverse requires a change to the ``jetty.xml`` file that ships with Solr. Edit ``/usr/local/solr/solr-7.3.1/server/etc/jetty.xml`` , increasing ``requestHeaderSize`` from ``8192`` to ``102400``
+A Dataverse installation requires a change to the ``jetty.xml`` file that ships with Solr. Edit ``/usr/local/solr/solr-9.8.0/server/etc/jetty.xml`` , increasing ``requestHeaderSize`` from ``8192`` to ``102400``
 
 Solr will warn about needing to increase the number of file descriptors and max processes in a production environment but will still run with defaults. We have increased these values to the recommended levels by adding ulimit -n 65000 to the init script, and the following to ``/etc/security/limits.conf``::
 
@@ -220,7 +199,7 @@ Solr will warn about needing to increase the number of file descriptors and max
         solr soft nofile 65000
         solr hard nofile 65000
 
-On operating systems which use systemd such as RHEL or CentOS 7, you may then add a line like LimitNOFILE=65000 for the number of open file descriptors and a line with LimitNPROC=65000 for the max processes to the systemd unit file, or adjust the limits on a running process using the prlimit tool::
+On operating systems which use systemd such as RHEL/derivative, you may then add a line like LimitNOFILE=65000 for the number of open file descriptors and a line with LimitNPROC=65000 for the max processes to the systemd unit file, or adjust the limits on a running process using the prlimit tool::
 
         # sudo prlimit --pid pid --nofile=65000:65000
 
@@ -228,9 +207,28 @@ Solr launches asynchronously and attempts to use the ``lsof`` binary to watch fo
 
 	# yum install lsof
 
-Finally, you need to tell Solr to create the core "collection1" on startup:
+Finally, you need to tell Solr to create the core "collection1" on startup::
+
+        echo "name=collection1" > /usr/local/solr/solr-9.8.0/server/solr/collection1/core.properties
+
+Dataverse collection ("dataverse") page uses Solr very heavily. On a busy instance this may cause the search engine to become the performance bottleneck, making these pages take increasingly longer to load, potentially affecting the overall performance of the application and/or causing Solr itself to crash. If this is observed on your instance, we recommend uncommenting the following lines in the ``<circuitBreaker ...>`` section of the ``solrconfig.xml`` file::
+
+  <str name="memEnabled">true</str>
+  <str name="memThreshold">75</str>
+
+and::
+
+  <str name="cpuEnabled">true</str>
+  <str name="cpuThreshold">75</str>
+
+This will activate Solr "circuit breaker" mechanisms that make it start dropping incoming requests with the HTTP code 503 when it starts experiencing load issues. As of Dataverse 6.1, the collection page will recognize this condition and display a customizeable message to the users informing them that the search engine is unavailable because of heavy load, with the assumption that the condition is transitive and suggesting that they try again later. This is still an inconvenience to the users, but still a more graceful handling of the problem, rather than letting the pages time out or causing crashes. You may need to experiment and adjust the threshold values defined in the lines above. 
+
+If this becomes a common issue, another temporary workaround an admin may choose to use is to enable the following setting::
+
+  curl -X PUT -d true "http://localhost:8080/api/admin/settings/:DisableSolrFacets"
+
+This will make the collection page show the search results without the usual search facets on the left side of the page. Another customizeable message will be shown in that column informing the users that facets are temporarily unavailable. Generating these facets is more resource-intensive for Solr than the main search results themselves, so applying this measure will significantly reduce the load on the search engine. 
 
-        echo "name=collection1" > /usr/local/solr/solr-7.3.1/server/solr/collection1/core.properties
 
 Solr Init Script
 ================
@@ -238,7 +236,7 @@ Solr Init Script
 Please choose the right option for your underlying Linux operating system.
 It will not be necessary to execute both!
 
-For systems running systemd (like CentOS/RedHat since 7, Debian since 9, Ubuntu since 15.04), as root, download :download:`solr.service<../_static/installation/files/etc/systemd/solr.service>` and place it in ``/tmp``. Then start Solr and configure it to start at boot with the following commands::
+For systems running systemd (like RedHat or derivatives since 7, Debian since 9, Ubuntu since 15.04), as root, download :download:`solr.service<../_static/installation/files/etc/systemd/solr.service>` and place it in ``/tmp``. Then start Solr and configure it to start at boot with the following commands::
 
         cp /tmp/solr.service /etc/systemd/system
         systemctl daemon-reload
@@ -254,7 +252,23 @@ For systems using init.d (like CentOS 6), download this :download:`Solr init scr
 Securing Solr
 =============
 
-Solr must be firewalled off from all hosts except the server(s) running Dataverse. Otherwise, any host  that can reach the Solr port (8983 by default) can add or delete data, search unpublished data, and even reconfigure Solr. For more information, please see https://lucene.apache.org/solr/guide/7_2/securing-solr.html
+As of version 9.3.0, Solr listens solely on localhost for security reasons. If your installation will run Solr on its own host, you will need to edit ``bin/solr.in.sh``, setting ``JETTY_HOST`` to the external IP address of your Solr server to tell Solr to accept external connections.
+
+We strongly recommend that you also use a firewall to block access to the Solr port (8983) from outside networks. It is **very important** not to allow direct access to the Solr API from outside networks! Otherwise, any host that can reach Solr can add or delete data, search unpublished data, and even reconfigure Solr. For more information, please see https://solr.apache.org/guide/solr/latest/deployment-guide/securing-solr.html
+
+We additionally recommend that the Solr service account's shell be disabled, as it isn't necessary for daily operation::
+
+        # usermod -s /sbin/nologin solr
+
+For Solr upgrades or further configuration you may temporarily re-enable the service account shell::
+
+        # usermod -s /bin/bash solr
+
+or simply prepend each command you would run as the Solr user with "sudo -u solr"::
+
+        # sudo -u solr command
+
+Finally, we would like to reiterate that it is simply never a good idea to run Solr as root! Running the process as a non-privileged user would substantially minimize any potential damage even in the event that the instance is compromised.
 
 jq
 --
@@ -262,36 +276,30 @@ jq
 Installing jq
 =============
 
-``jq`` is a command line tool for parsing JSON output that is used by the Dataverse installation script. It is available in the EPEL repository::
+``jq`` is a command line tool for parsing JSON output that is used by the Dataverse Software installation script. It is available in the ``appstream`` repository::
 
-	# yum install epel-release
-	# yum install jq
+	# dnf install jq
 
-or you may install it manually::
+or you may install the latest binary for your OS and platform, available from https://github.com/jqlang/jq/releases
 
-        # cd /usr/bin
-        # wget http://stedolan.github.io/jq/download/linux64/jq
-        # chmod +x jq
-        # jq --version
+.. _install-imagemagick:
 
 ImageMagick
 -----------
 
-Dataverse uses `ImageMagick <https://www.imagemagick.org>`_ to generate thumbnail previews of PDF files. This is an optional component, meaning that if you don't have ImageMagick installed, there will be no thumbnails for PDF files, in the search results and on the dataset pages; but everything else will be working. (Thumbnail previews for non-PDF image files are generated using standard Java libraries and do not require any special installation steps). 
+The Dataverse Software uses `ImageMagick <https://www.imagemagick.org>`_ to generate thumbnail previews of PDF files. This is an optional component, meaning that if you don't have ImageMagick installed, there will be no thumbnails for PDF files, in the search results and on the dataset pages; but everything else will be working. (Thumbnail previews for non-PDF image files are generated using standard Java libraries and do not require any special installation steps).
 
 Installing and configuring ImageMagick
 ======================================
 
-On a Red Hat and similar Linux distributions, you can install ImageMagick with something like::
+On a Red Hat or derivative Linux distribution, you can install ImageMagick with something like::
 
-	# yum install ImageMagick 
+	# yum install ImageMagick
 
-(most RedHat systems will have it pre-installed). 
-When installed using standard ``yum`` mechanism, above, the executable for the ImageMagick convert utility will be located at ``/usr/bin/convert``. No further configuration steps will then be required. 
+(most RedHat systems will have it pre-installed).
+When installed using standard ``yum`` mechanism, above, the executable for the ImageMagick convert utility will be located at ``/usr/bin/convert``. No further configuration steps will then be required.
 
-On MacOS you can compile ImageMagick from sources, or use one of the popular installation frameworks, such as brew. 
-
-If the installed location of the convert executable is different from ``/usr/bin/convert``, you will also need to specify it in your Glassfish configuration using the JVM option, below. For example::
+If the installed location of the convert executable is different from ``/usr/bin/convert``, you will also need to specify it in your Payara configuration using the JVM option, below. For example::
 
    <jvm-options>-Ddataverse.path.imagemagick.convert=/opt/local/bin/convert</jvm-options>
 
@@ -300,46 +308,47 @@ If the installed location of the convert executable is different from ``/usr/bin
 R
 -
 
-Dataverse uses `R <https://https://cran.r-project.org/>`_ to handle
-tabular data files. The instructions below describe a **minimal** R
+The Dataverse Software uses `R <https://cran.r-project.org>`_ to handle
+tabular data files. The instructions below describe a **minimal** R Project
 installation. It will allow you to ingest R (.RData) files as tabular
-data; to export tabular data as .RData files; and to run `Data
-Explorer <https://github.com/scholarsportal/Dataverse-Data-Explorer>`_
-(specifically, R is used to generate .prep metadata files that Data
-Explorer uses).  R can be considered an optional component, meaning
+data and to export tabular data as .RData files.  R can be considered an optional component, meaning
 that if you don't have R installed, you will still be able to run and
-use Dataverse - but the functionality specific to tabular data
-mentioned above will not be available to your users.  **Note** that if
-you choose to also install `TwoRavens
-<https://github.com/IQSS/TwoRavens>`_, it will require some extra R
-components and libraries.  Please consult the instructions in the
-TowRavens section of the Installation Guide.
+use the Dataverse Software - but the functionality specific to tabular data
+mentioned above will not be available to your users.
 
 
 Installing R
 ============
 
-Can be installed with :fixedwidthplain:`yum`::
+For RHEL/derivative, the EPEL distribution is strongly recommended:
 
-       yum install R-core R-core-devel
+If :fixedwidthplain:`yum` isn't configured to use EPEL repositories ( https://fedoraproject.org/wiki/EPEL ):
 
-EPEL distribution is strongly recommended. The version of R currently available from epel6 and epel7 is 3.5; it has been tested and is known to work on RedHat and CentOS versions 6 and 7.
+RHEL8/derivative users can install the epel-release RPM::
 
-If :fixedwidthplain:`yum` isn't configured to use EPEL repositories ( https://fedoraproject.org/wiki/EPEL ):
+       yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 
-RHEL/CentOS users can install the RPM :fixedwidthplain:`epel-release`. For RHEL/CentOS 7::
+RHEL7/derivative users can install the epel-release RPM::
 
        yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 
-RHEL/CentOS users can install the RPM :fixedwidthplain:`epel-release`. For RHEL/CentOS 6::
+RHEL 8 users will need to enable the CodeReady-Builder repository::
+
+       subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms
 
-       yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
+Rocky or AlmaLinux 8.3+ users will need to enable the PowerTools repository::
 
-RHEL users will want to log in to their organization's respective RHN interface, find the particular machine in question and:
+       dnf config-manager --enable powertools
+
+RHEL 7 users will want to log in to their organization's respective RHN interface, find the particular machine in question and:
 
 â€ĸ click on "Subscribed Channels: Alter Channel Subscriptions"
 â€ĸ enable EPEL, Server Extras, Server Optional
 
+Finally, install R with :fixedwidthplain:`yum`::
+
+       yum install R-core R-core-devel
+
 Installing the required R libraries
 ===================================
 
@@ -362,11 +371,18 @@ Install them following the normal R package installation procedures. For example
 Rserve
 ======
 
-Dataverse uses `Rserve <https://rforge.net/Rserve/>`_ to communicate
+The Dataverse Software uses `Rserve <https://rforge.net/Rserve/>`_ to communicate
 to R. Rserve is installed as a library package, as described in the
 step above. It runs as a daemon process on the server, accepting
-network connections on a dedicated port. This requires some extra 
-configuration and we provide a  script (:fixedwidthplain:`scripts/r/rserve/rserve-setup.sh`) for setting it up.  
+network connections on a dedicated port. This requires some extra
+configuration and we provide a script for setting it up.
+
+You'll want to obtain local copies of the Rserve setup files found in
+https://github.com/IQSS/dataverse/tree/master/scripts/r/rserve
+either by cloning a local copy of the IQSS repository:
+:fixedwidthplain:`git clone -b master https://github.com/IQSS/dataverse.git`
+or by downloading the files individually.
+
 Run the script as follows (as root)::
 
     cd <DATAVERSE SOURCE TREE>/scripts/r/rserve
@@ -405,55 +421,63 @@ You should already have the following 4 JVM options added to your
 If you have changed the password, make sure it is correctly specified
 in the :fixedwidthplain:`dataverse.rserve.password` option above.  If
 Rserve is running on a host that's different from your Dataverse
-server, change the :fixedwidthplain:`dataverse.rserve.host` option
+installation, change the :fixedwidthplain:`dataverse.rserve.host` option
 above as well (and make sure the port 6311 on the Rserve host is not
-firewalled from your Dataverse host).
+firewalled from your Dataverse installation host).
 
 Counter Processor
 -----------------
 
-Counter Processor is required to enable Make Data Count metrics in Dataverse. See the :doc:`/admin/make-data-count` section of the Admin Guide for a description of this feature. Counter Processor is open source and we will be downloading it from https://github.com/CDLUC3/counter-processor
+Counter Processor is required to enable Make Data Count metrics in a Dataverse installation. See the :doc:`/admin/make-data-count` section of the Admin Guide for a description of this feature. Counter Processor is open source and we will be downloading it from https://github.com/gdcc/counter-processor
 
 Installing Counter Processor
 ============================
 
-Counter Processor has only been tested on el7 (see "Linux" above). Please note that a scripted installation using Ansible is mentioned in the :doc:`/developers/make-data-count` section of the Developer Guide.
+A scripted installation using Ansible is mentioned in the :doc:`/developers/make-data-count` section of the Developer Guide.
 
 As root, download and install Counter Processor::
 
         cd /usr/local
-        wget https://github.com/CDLUC3/counter-processor/archive/v0.0.1.tar.gz
-        tar xvfz v0.0.1.tar.gz
+        wget https://github.com/gdcc/counter-processor/archive/refs/tags/v1.06.tar.gz
+        tar xvfz v1.06.tar.gz
+        cd /usr/local/counter-processor-1.06
+
+Installing GeoLite Country Database
+===================================
+
+Counter Processor can report per country results if the optional GeoLite Country Database is installed. At present, this database is free but to use it one must signing an agreement (EULA) with MaxMind. 
+(The primary concern appears to be that individuals can opt-out of having their location tracked via IP address and, due to various privacy laws, MaxMind needs a way to comply with that for products it has "sold" (for no cost in this case). Their agreement requires you to either configure automatic updates to the GeoLite Country database or be responsible on your own for managing take down notices.)
+The process required to sign up, download the database, and to configure automated updating is described at https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/ and the links from that page.
 
-As root, change to the Counter Processor directory you just created, download the GeoLite2-Country tarball, untar it, and copy the geoip database into place::
+As root, change to the Counter Processor directory you just created, download the GeoLite2-Country tarball from MaxMind, untar it, and copy the geoip database into place::
 
-        cd /usr/local/counter-processor-0.0.1
-        wget https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz
+        <download or move the GeoLite2-Country.tar.gz to the /usr/local/counter-processor-1.06 directory>
         tar xvfz GeoLite2-Country.tar.gz
         cp GeoLite2-Country_*/GeoLite2-Country.mmdb maxmind_geoip
 
+Creating a counter User
+=======================
+
 As root, create a "counter" user and change ownership of Counter Processor directory to this new user::
 
         useradd counter
-        chown -R counter:counter /usr/local/counter-processor-0.0.1
+        chown -R counter:counter /usr/local/counter-processor-1.06
 
 Installing Counter Processor Python Requirements
 ================================================
 
-Counter Processor requires Python 3.6.4 or higher. The following commands are intended to be run as root but we are aware that Pythonistas might prefer fancy virtualenv or similar setups. Pull requests are welcome to improve these steps!
+Counter Processor version 1.06 requires Python 3.7 or higher.
 
-Enable the EPEL repo if you haven't already::
+The following commands are intended to be run as root but we are aware that Pythonistas might prefer fancy virtualenv or similar setups. Pull requests are welcome to improve these steps!
 
-        yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+Install Python 3.9::
 
-Install Python 3.6::
-
-        yum install python36
+        yum install python39
 
 Install Counter Processor Python requirements::
 
-        python3.6 -m ensurepip
-        cd /usr/local/counter-processor-0.0.1
+        python3.9 -m ensurepip
+        cd /usr/local/counter-processor-1.06
         pip3 install -r requirements.txt
 
 See the :doc:`/admin/make-data-count` section of the Admin Guide for how to configure and run Counter Processor.
@@ -462,5 +486,3 @@ Next Steps
 ----------
 
 Now that you have all the prerequisites in place, you can proceed to the :doc:`installation-main` section.
-
-
diff --git a/doc/sphinx-guides/source/installation/r-rapache-tworavens.rst b/doc/sphinx-guides/source/installation/r-rapache-tworavens.rst
deleted file mode 100644
index 10e901e1ce5..00000000000
--- a/doc/sphinx-guides/source/installation/r-rapache-tworavens.rst
+++ /dev/null
@@ -1,621 +0,0 @@
-.. role:: fixedwidthplain
-
-TwoRavens
-=========
-
-TwoRavens is a web application for tabular data exploration and statistical analysis.
-It can be integrated with Dataverse, as an **optional** component.  While TwoRavens was originally created at IQSS, its developers have since left the organization. Plans
-for the future of the Dataverse/TwoRavens collaboration are still being worked out. As
-such, **support for TwoRavens is somewhat limited at the
-moment (as of Spring of 2017).**
-
-Any questions regarding the features of TwoRavens, bug reports and
-such, should be addressed directly to the developers of the
-application.  The `TwoRavens GitHub repository
-<https://github.com/IQSS/TwoRavens>`_ and the `TwoRavens project page
-<http://2ra.vn/community/index.html>`_ are good places to start.
-
-For now, the Dataverse project will continue providing 
-installation and integration support. We have created a new (as
-of Dataverse v.4.6.1) version of the installer scripts and updated this guide. We have tried to improve and simplify the
-installation process, particularly the difficult process of installing
-correct versions of the required third party R packages.
-
-**Note that the installation process below supercedes the basic R
-setup described in the "Prerequisites" portion of the Installation
-Guide. Meaning that once completed, it installs everything needed to
-run TwoRavens, PLUS all the libraries and components required to
-ingest RData files, export as RData, and use Data Explorer.**
-
-
-
-Please be warned: 
-
-- This process may still require some system administration skills. 
-- The guide below is very Linux-specific. This process has been tested
-  on RedHat/CentOS servers only. In some ways it *may* actually be
-  easier to get it all installed on MacOS X (because
-  MacOS X versions of third party R packages are available
-  pre-compiled), or even on Windows. But it hasn't been attempted, and
-  is not supported by the Dataverse team.
-
-In addition to the TwoRavens web application proper, several required
-components need to be installed and configured. This includes R,
-rApache and a collection of required third-party R packages. The
-installation steps for these components are described in the
-individual sections of the document below.
-
-.. contents:: |toctitle|
-  :local:
-
-0. Overview
-+++++++++++
-
-TwoRavens is itself a compact JavaScript application that **runs on the user's 
-browser**. These JavaScript files, and the accompanying HTML, CSS, etc. files 
-are served by an HTTP server (Apache) as static objects. 
-
-The statistical calculations are performed by R programs that run **on the server**. 
-`rApache <http://rapache.net/>`_ is used as the web front end for R on the server, so 
-that the browser application can talk to R over HTTP. 
-
-See the "Advanced Installation" section of the :doc:`prep` section for an example of running various components on more than one server.
-
-TwoRavens will need to obtain some tabular-data-specific metadata from 
-Dataverse -- the DDI fragment that describes the variables and some pre-processed
-summary statistics for the data vectors. In order to produce the latter, the Dataverse
-application also needs to be able to execute some R code on the server. Instead of 
-``rApache``, Dataverse uses `Rserve <https://rforge.net/Rserve/>`_ to 
-communicate to R. Rserve is installed as a "contributor" R package. It runs as a 
-daemon process on the server, accepting network connections on a dedicated port. 
-Dataverse project supplies an :fixedwidthplain:`init.d`-style startup file for the 
-daemon. The R setup in step ``2.`` will set it up so that the daemon gets started
-automatically when the system boots. 
-
-When a user requests to run 
-a statistical model on a data file, TwoRavens will instruct the R code on the 
-server to download the file **directly from the Dataverse application**. Access 
-URLs need to be configured for this to work properly (this is done by the TwoRavens 
-installer script in step ``3.``)  
-
-If you install all components on a single server and front Glassfish with Apache 
-(see "Network Ports" under the :doc:`config` section), the component and 
-data flow diagram might looks something like this:
-
-|tworavens_components|
-
-In addition to Rserve, there are 14 more R library packages that the TwoRavens R 
-code requires in order to run. These in turn require 30 more as their own dependencies, 
-so a total of 45 packages must be installed. "Installed" in the 
-context of an R package means R must download the **source code** from the `CRAN 
-<https://cran.r-project.org/>`_ code repository and compile it locally. This
-historically has been the trickiest, least stable part of the installation process, 
-since the packages in question are being constantly (and independently) developed. 
-This means that every time you attempt to install these packages, you are building  
-from potentially different versions of the source code. An incompatibility introduced 
-between any two of the packages can result in a failure to install. In this release 
-we have attempted to resolve this by installing the **specific  versions of the R 
-packages that have been proven** to work together. If you have attempted to 
-install TwoRavens in the past, and it didn't work, please see the part of 
-section ``1.b.`` where we explain how to completely erase all the previously 
-built packages.
- 
-1. Prerequisites
-++++++++++++++++
-
-a. httpd (Apache): 
-------------------
-
-It's probably installed already, but if not: 
-
-``yum install httpd``
-
-This rApache configuration does not work with SELinux. Execute the following commands 
-to disable SELinux: 
-
-``setenforce permissive``
-
-``getenforce``
-
-(Note: If you can get rApache to work with SELinux, we encourage you to make a pull request! Please see the :doc:`/developers/selinux` section of the Developer Guide to get started.)
-
-If you choose to serve TwoRavens and run rApache under :fixedwidthplain:`https`, a "real" signed certificate (as opposed to self-signed) is recommended. 
-
-For security reasons, directory listing needs to be disabled on the web documents folder served by Apache: 
-
-In the main Apache configuration file (``/etc/httpd/conf/httpd.conf`` in the default setup), find the section that configures your web directory. For example, if the ``DocumentRoot``, defined elsewhere in the file, is set to the default ``"/var/www/html"``, the opening line of the section will look like this:
-
-``<Directory "/var/www/html">`` 
-
-Find the ``Options`` line in that section, and make sure that it doesn't contain the ``Indexes`` statement. 
-For example, if the options line in your configuration is 
-
-``Options Indexes FollowSymLinks``
-
-change it to 
-
-``Options FollowSymLinks``
-
-b. R:
------
-
-The simplest way to install R on RHEL/CentOS systems is with yum, using the EPEL repository::
-
-       yum install epel-release
-       yum install R-core R-core-devel
-
-Both EPEL6 and EPEL7 currently provide R 3.5, which has been tested and appears to work well. R 3.4, offered by EPEL until also works well. We recommend using the currently available EPEL version for all the new installations. But if you already have a working R 3.4 installation from EPEL and you don't have a specific need to upgrade, you may lock that version in place using the ``yum-versionlock`` yum plugin, or simply add this line to the "epel" section of /etc/yum.repos.d/epel.repo::
-
-	exclude=R-*,openblas-*,libRmath*
-
-RHEL users may need to log in to their organization's respective RHN interface, find the particular machine in question and:
-
-â€ĸ click on "Subscribed Channels: Alter Channel Subscriptions"
-â€ĸ enable EPEL, Server Extras, Server Optional
-
-If you are upgrading an existing installation of TwoRavens, or if you have attempted to 
-install it in the past and it didn't work, **we strongly recommend reinstalling 
-R completely**, erasing all the extra R packages that may have been already built. 
-
-Uninstall R::
-
-        yum erase R-core R-core-devel
-
-Wipe clean any R packages that were left behind:: 
-
-        rm -rf /usr/lib64/R/library/*
-        rm -rf /usr/share/R/library/*
-
-... then re-install R with :fixedwidthplain:`yum install`
-
-c. rApache: 
------------
-
-We maintain the following rpms of rApache, built for the following version of RedHat/CentOS distribution:
-
-For RHEL/CentOS 6 and R 3.4, download :download:`rapache-1.2.6-rpm0.x86_64.rpm <../_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.6-rpm0.x86_64.rpm>` and install it with::
-
-	yum install rapache-1.2.6-rpm0.x86_64.rpm
-
-For RHEL/CentOS 6 and R 3.5, download :download:`rapache-1.2.9_R-3.5-RH6.x86_64.rpm <../_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.9_R-3.5-RH6.x86_64.rpm>` and install it with::
-
-	yum install rapache-1.2.9_R-3.5-RH6.x86_64.rpm
-
-If you are using RHEL/CentOS 7 and R 3.4, download :download:`rapache-1.2.7-rpm0.x86_64.rpm <../_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.7-rpm0.x86_64.rpm>` and install it with::
-
-	yum install apache-1.2.7-rpm0.x86_64.rpm
-
-If you are using RHEL/CentOS 7 in combination with R 3.5, download :download:`rapache-1.2.9_R-3.5.x86_64.rpm <../_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.9_R-3.5.x86_64.rpm>` and install it with::
-
-       	yum install rapache-1.2.9_R-3.5.x86_64.rpm
-
-**Please note:** 
-The rpms above cannot be *guaranteed* to work on your
-system. You may have a collection of system libraries installed on
-your system that will create a version conflict. If that's the case,
-or if you are trying to install on an operating system that's listed
-above, do not despair: simply build rApache from `source
-<http://rapache.net/downloads.html>`_ . **Make sure** to build with
-the R that's the same version you are planning on using.
-
-d. Install the build environment for R:
----------------------------------------
-
-Once again, extra R packages will need to be built from sources. Make sure you have the standard GNU compilers installed: ``gcc``, ``gcc-c++`` and ``gcc-gfortran``. 
-
-One of the required packages needed :fixedwidthplain:`/bin/ed`. The R package build script needs :fixedwidthplain:`/usr/bin/wget`. If these are missing, the rpms can be installed with::
-
-        yum install ed wget
-
-Depending on how your system was originally set up, you may end up needing to install some other missing rpms. We'll explain how to troubleshoot compiler errors caused by missing libraries and/or executables. 
-
-2. Install Extra R Packages
-+++++++++++++++++++++++++++
-
-We provide a shell script (``r-setup.sh``) that will try to install all the needed packages. **Note:** the script is now part of the TwoRavens distribution (it **used to be** in the Dataverse source tree). 
-
-
-The script will attempt to download the packages from CRAN (or a mirror), so the system must have access to the Internet.
-
-In order to run the script: 
-
-Download the current snapshot of the "dataverse-distribution" branch
-of TwoRavens from github:
-`https://github.com/IQSS/TwoRavens/archive/dataverse-distribution.zip
-<https://github.com/IQSS/TwoRavens/archive/dataverse-distribution.zip>`_.
-Once again, it is important that you download the
-"dataverse-distribution" branch, and NOT the master distribution!
-Unpack the zip file, then run the script::
-
-        unzip dataverse-distribution.zip
-        cd TwoRavens-dataverse-distribution/r-setup
-        chmod +x r-setup.sh
-        ./r-setup.sh
-
-
-See the section ``II.`` of the Appendix for trouble-shooting tips. 
-
-For the Rserve package the setup script will also create a system user
-:fixedwidthplain:`rserve`, and install the startup script for the
-daemon (``/etc/init.d/rserve``).  The script will skip this part, if
-this has already been done on this system (i.e., it should be safe to
-run it repeatedly).
-
-Note that the setup will set the Rserve password to :fixedwidthplain:`"rserve"`. 
-Rserve daemon runs under a non-privileged user id, and there appears to be a 
-very limited potential for security damage through unauthorized access. It is however 
-still a good idea **to change the password**. The password is specified in ``/etc/Rserv.pwd``. 
-Please see `Rserve documentation <https://rforge.net/Rserve/doc.html>`_ for more 
-information on password encryption and access security. 
- 
-Make sure the rserve password is correctly specified in the ``domain.xml`` of your Dataverse::
-
-        <jvm-options>-Ddataverse.rserve.password=...</jvm-options>
-
-
-3. Install the TwoRavens Application
-++++++++++++++++++++++++++++++++++++
-
-a. download and unzip the application
--------------------------------------
-
-(though you may have already done so, in step ``2.`` above - see the instructions there). 
-
-
-b. Rename the resulting directory "dataexplore" ...
---------------------------------------------------------
-
-...and place it in the web root directory of your apache server. We'll assume ``/var/www/html/dataexplore`` in the examples below::
-
-        mv TwoRavens-dataverse-distribution /var/www/html/dataexplore
-
-
-c. run the installer
---------------------
-
-A scripted, interactive installer is provided at the top level of the TwoRavens 
-distribution. 
-
-The installer will ask you to provide the following:
-
-===================== ================================    ===========  
-Setting               default                             Comment
-===================== ================================    ===========  
-TwoRavens directory   ``/var/www/html/dataexplore``       File directory where TwoRavens is installed.
-Apache config dir.    ``/etc/httpd``                      rApache config file for TwoRavens will be placed under ``conf.d/`` there.
-Apache web dir.       ``/var/www/html``                   
-rApache/TwoRavens URL ``http://{your hostname}:80``       URL of the Apache server hosting TwoRavens and rApache.
-Dataverse URL         ``http://{your hostname}:8080``     URL of the Dataverse that integrates with this TwoRavens installation.
-===================== ================================    =========== 
-
-Please note the default values above. The installer assumes 
-
-- that you are running both the Dataverse and TwoRavens/rApache on the same host; 
-- the default ports for Apache (80) and Glassfish that is serving your Dataverse (8080); 
-- ``http`` (not ``https``!) for both . 
-
-This configuration is recommended if you are simply trying out/testing Dataverse 
-and TwoRavens. Accept all the defaults, and you should have a working installation 
-in no time.
-
-However, if you are planning to use this installation to actually serve data to 
-users, you'll most likely want to run under HTTPS. Please refer to the discussion 
-in the Appendix, ``I.`` for more information on setting it up. Configuring HTTPS 
-takes a little extra work. But note that the TwoRavens configuration 
-can actually end up being simpler. If you use our recommended configuration for 
-HTTPS (described in the Appendix), both the "TwoRavens URL" and "Dataverse URL" 
-**will be the same**: ``https://{your hostname}``.
-
-Run the installer as::
-
-   cd /var/www/html/dataexplore
-   chmod +x install.pl
-   ./install.pl
-
-
-
-
-Once everything is installed and configured, the installer script will print out a confirmation message with the URL of the TwoRavens application. For example:: 
-
-        The application URL is https://server.dataverse.edu/dataexplore/gui.html
-
-d. Version conflict check  (preprocess.R)
------------------------------------------
-
-One of the R files in the TwoRavens distribution, ``rook/preprocess/preprocess.R`` is used by both TwoRavens and 
-Dataverse. Dataverse application maintains its own copy of the file, ``<DOMAIN DIRECTORY>/applications/dataverse-<VERSION>/WEB-INF/classes/edu/harvard/iq/dataverse/rserve/scripts/preprocess.R``. 
-(Why not share the file from the same location? Because the two applications 
-can potentially be installed on 2 different servers).
-Compare the two files. **It is important that the two copies are identical**. 
-
-**If different**: 
-
-- the **TwoRavens version wins**. Meaning, you need to copy the version supplied with this TwoRavens distribution and overwrite the Glassfish version (above); then restart Glassfish. 
-
-- unless this is a brand new Dataverse installation, it may have cached summary statistics fragments that were produced with the older version of this R code. You **must remove** all such cached files::
-
-        cd <DATAVERSE FILES DIRECTORY>
-        find . -name '*.prep' | while read file; do /bin/rm $file; done
-
-*(Yes, this is a HACK! We are working on finding a better way to ensure this compatibility between 
-TwoRavens and Dataverse!)*
-
-e. Enable TwoRavens Button in Dataverse
----------------------------------------
-
-Now that you have installed TwoRavens, you can make it available to your users by adding it an "external tool" for your Dataverse installation. (For more on external tools in general, see the :doc:`/admin/external-tools` section of the Admin Guide.)
-
-First, download :download:`twoRavens.json <../_static/installation/files/root/external-tools/twoRavens.json>` as a starting point and edit ``toolUrl`` in that external tool manifest file to be the URL where you want TwoRavens to run. This is the URL reported by the installer script (as in the example at the end of step ``c.``, above).
-
-Once you have made your edits, make the tool available within Dataverse with the following curl command (assuming ``twoRavens.json`` is in your current working directory):
-
-``curl -X POST -H 'Content-type: application/json' --upload-file twoRavens.json http://localhost:8080/api/admin/externalTools``
-
-Once enabled, an "Explore" dropdown will appear next to ingested tabular data files a "TwoRavens" button; clicking it will redirect
-the user to the instance of TwoRavens, initialized with the data variables from the selected file. 
-
-f. Perform a quick test of TwoRavens functionality
---------------------------------------------------
-
-Ingest the dummy data file ``50by1000.dta`` (supplied in the Dataverse source tree in 
-``dataverse/scripts/search/data/tabular``). If successfully ingested as tabular data, 
-the file should appear on the Dataset page as follows: 
-
-|tworavens_test_file_ingested|
-
-
-If the file does NOT appear as Tabular Data - if it is shown as Stata/dta, 
-and no tabular attributes - the numbers of Variables and Observations and the UNF - 
-are being displayed, try to refresh the page a couple of times. If that doesn't 
-change the view to Tabular, it likely means that something went very wrong with the 
-tabular ingest. Consult the Glassfish server log for any error messages that may 
-explain the failure. 
-
-If the file is showing as Tabular Data, but the ``Explore`` button isn't present, 
-double-check that the steps in ``e.``, above, were correctly performed. 
-
-Otherwise, click on the ``Explore`` button. This will open TwoRavens in a new browser window.
-If the application initializes successfully, you should see the "data pebbles" representing 
-the first 3 variables in the file: 
-
-|tworavens_test_init| 
-
-If instead TwoRavens opens with an empty view - no variables listed on the left, and/or no "data pebbles" in the middle panel, we'll provide some diagnostics tips further below.
-
-Otherwise, mouse over ``var1``, and click on ``Dep Var``, selecting the variable as "dependent": 
-
-|tworavens_test_select_var| 
-
-Then select ``ls`` from the list of models on the right: 
-
-|tworavens_test_select_model|
-
-Then click the ``Estimate`` button, above. If the model is successfully executed, 
-the results will appear in a new popup panel, with some generated graph images, as shown below:
-
-|tworavens_test_output|
-
-**Troubleshooting:**
-
-If TwoRavens fails to initialize properly: 
-
-Symptom: instead of the "data pebbles" display shown in the second image, above, you are getting an empty view: 
-
-|tworavens_test_empty|
-
-A very likely cause of this condition is TwoRavens not being able to obtain the metadata describing the variables from your Dataverse. 
-Specifically, the "preprocessed summary statistics". 
-
-To diagnose: note the value of the ``dfId`` URL parameter in the view above. 
-Try to request the preprocessed fragment by going to the API end point directly:: 
-
-        <YOUR DATAVERSE URL>/api/access/datafile/<FILE ID>?format=prep
-
-Where the :fixedwidthplain:`<FILE ID>` is the value of the :fixedwidthplain:`dfId` parameter from the previous view. 
-You should get the output that looks like this::
-
-        {"dataset":{"private":false},"variables":{"var1":{"plottype":"bar","plotvalues":{"1":100,"2":100,"3":100,"4":100,"5":100,"6":100,"7":100,"8":100,"9":100,"10":100},"varnamesSumStat":"var1","median":5.5,"mean":5.5,"mode":"1","max":10,"min":1,"invalid":0,"valid":1000,"sd":2.87371854193452,"uniques":10,"herfindahl":0.1,"freqmode":100,"fewest":"1","mid":"1","freqfewest":"100","freqmid":"100","numchar":"numeric","nature":"ordinal","binary":"no","interval":"discrete","varnamesTypes":"var1","defaultInterval":"discrete","defaultNumchar":"numeric","defaultNature":"ordinal","defaultBinary":"no"},"var3":{"plottype":"bar","plotvalues":
-        ...
-
-If you are getting an error message instead, this is likely an Rserve connection problem. 
-Consult the Glassfish server log for any Rserve-related "connection refused" messages. 
-See if Rserve is running, and start it with ``service rserve start``, if necessary. 
-Check if the Rserve host name, username and password in the Glassfish configuration match 
-the actual Rserve configuration. (this is discussed in the section ``2.`` of the guide). 
-Correct this, if necessary, then try again. 
-
-If you ARE getting JSON output, but the TwoRavens view is still broken: 
-
-- Look closely at the very beginning of the JSON fragment. Does it have the ``{"private":false}`` entry, as shown in the example above? If not, this likely an R code version mismatch, described in section ``3.d.``, above. Correct the problem as described there, then try again. 
-
-- If the JSON looks *exactly* as the fragment above, yet still no data pebbles - enable the JavaScript error console in the TwoRavens window, and try again. Look for any error messages; and, specifically, for any URLs that TwoRavens is failing to access. Look for the debugging entry that shows TwoRavens attempting to download the ``format=prep`` fragment. Does the URL have the correct host name, port and/or the protocol (http vs. https)? If not, re-run the installer, specifying the correct Dataverse URL, and try again. 
-
-Symptom: the variables view is initialized properly, but no model output appears when you click ``Estimate``, with or without error messages. 
-
-- Make sure you properly selected the dependent variable (:fixedwidthplain:`var1`) and the model (:fixedwidthplain:`ls`). 
-
-- Consult the Apache error log files (``error_log`` and/or ``ssl_error_log``, in ``/var/log/httpd``) for any error messages. Possible error condition may include: missing R packages (double-check that the R setup, in step ``2.`` completed without errors); ``selinux`` ("Secure Linux") errors related to the rApache shared libraries, or directory permissions (disable Selinux, as described in ``1.a.``)
-
-
-4. Appendix
-+++++++++++
-
-
-I. Ports configuration discussion
----------------------------------
-
-By default, Glassfish will install itself on ports 8080 and 8181 (for
-``HTTP`` and ``HTTPS``, respectively). Apache will install itself on port 80 
-(the default port for ``HTTP``). Under this configuration, your Dataverse will 
-be accessible at ``http://{your host}:8080``, and rApache at 
-``http://{your host}/``. The TwoRavens installer, above, will default to these 
-values (and assume you are running both the Dataverse and TwoRavens/rApache on 
-the same host).
-
-This configuration is the easiest to set up if you are simply
-trying out/testing the Dataverse and TwoRavens integration. Accept all the
-defaults, and you should have a working installation in no
-time. However, if you are planning to use this installation to
-actually serve data to real users, you will most likely want to run your Dataverse 
-on a standard port; and to use ``HTTPS``. It is definitely possible to configure 
-Glassfish to serve the application under ``HTTPS`` on port 443. However, we 
-**do not recommend** this setup! For at least 2 reasons: 1. Running Glassfish on 
-port 443 will require you to **run it as root** user; which should be avoided, 
-if possible, for reasons of security. Also, 2) installing ``SSL`` certificates under 
-Glassfish is unnecessarily complicated. The alternative configuration that 
-we recommend is to "hide" your Glassfish behind Apache. In this setup Apache 
-serves as the ``HTTPS`` front running on port 443, proxying the traffic to 
-Glassfish using ``mod_proxy_ajp``; and Glassfish is running as 
-an non-privileged user on a high port that's not accessible from the outside. 
-Unlike Glassfish, Apache has a mechanism for running on a privileged port (in 
-this case, 443) as a non-privileged user. It is possible to use this 
-configuration, and have this Apache instance serve TwoRavens and rApache too, 
-all on the same server. Please see "Network Ports" under the :doc:`config` 
-section, and the :doc:`shibboleth` section of the Installation Guide for more 
-information and configuration instructions.  
-
-
-II. What the r-setup.sh script does:
-------------------------------------
-
-The script uses the list of 45 R library packages and specified
-package versions, supplied in ``TwoRavens/r-setup/package-versions.txt`` to 
-replicate the library environment that has been proven to work on the Dataverse
-servers. 
-
-If any packages fail to build, the script will alert the user. 
-
-For every package, the (potentially verbose) output of the build process is saved in 
-its own file, ``RINSTALL.{PACKAGE NAME}.LOG``. So if, for example, the package 
-Zelig fails to install, the log file :fixedwidthplain:`RINSTALL.Zelig.LOG` should 
-be consulted for any error messages that may explain the reason for the failure; 
-such as a missing library, or a missing compiler, etc. Be aware that diagnosing 
-compiler errors will require at least some programming and/or system administration 
-skills. 
-
-
-III. What the install.pl script does:
--------------------------------------
-
-The steps below are performed by the ``install.pl`` script. **Provided for reference only!** 
-The instruction below could be used to configure it all by hand, if necessary, or 
-to verify that the installer has done it correctly. 
-Once again: **normally you would NOT need to individually perform the steps below**!
-
-TwoRavens is distributed with a few hard-coded host and directory names. So these 
-need to be replaced with  the values specific to your system. 
-
-
-**In the file** ``/var/www/html/dataexplore/app_ddi.js`` **the following 3 lines need to be 
-edited:**
-
-1. ``var production=false;``
-
-   changed to ``true``;
-
-2. ``hostname="localhost:8080";``
-
-   changed to point to the dataverse app, from which TwoRavens will be obtaining the metadata and data files. (don't forget to change 8080 to the correct port number!)
-
-3. ``var rappURL = "http://0.0.0.0:8000/custom/";``
-
-   changed to the URL of your rApache server, i.e.
-
-   ``"http(s)://<rapacheserver>:<rapacheport>/custom/";``
-
-**In** ``dataexplore/rook`` **the following files need to be edited:**
-
-``rookdata.R, rookzelig.R, rooksubset.R, rooktransform.R, rookselector.R, rooksource.R``
-
-replacing *every* instance of ``production<-FALSE`` line with ``production<-TRUE``.
- 
-(yeah, that's why we provide that installer script...)
-
-
-**In** ``dataexplore/rook/rooksource.R`` **the following line:**
-
-``setwd("/usr/local/glassfish4/glassfish/domains/domain1/docroot/dataexplore/rook")``
-
-needs to be changed to: 
-
-``setwd("/var/www/html/dataexplore/rook")``
-
-(or your :fixedwidthplain:`dataexplore` directory, if different from the above)
-
-**In** ``dataexplore/rook/rookutils.R`` **the following lines need to be edited:**
-
-``url <- paste("https://beta.dataverse.org/custom/preprocess_dir/preprocessSubset_",sessionid,".txt",sep="")``
-
-and 
-
-``imageVector[[qicount]]<<-paste("https://beta.dataverse.org/custom/pic_dir/", mysessionid,"_",mymodelcount,qicount,".png", sep = "")``
-
-changing the URL to reflect the correct location of your rApache instance. make sure that the protocol (http vs. https) and the port number are correct too, not just the host name!
-
-
-**Next, in order to configure rApache to serve several TwoRavens "mini-apps",** 
-
-the installer creates the file ``tworavens-rapache.conf`` in the Apache's ``/etc/httpd/conf.d`` directory with the following configuration:
-
-.. code-block:: none
-
-   RSourceOnStartup "/var/www/html/dataexplore/rook/rooksource.R"
-   <Location /custom/zeligapp>
-      SetHandler r-handler
-      RFileEval /var/www/html/dataexplore/rook/rookzelig.R:Rook::Server$call(zelig.app)
-   </Location>
-   <Location /custom/subsetapp>
-      SetHandler r-handler
-      RFileEval /var/www/html/dataexplore/rook/rooksubset.R:Rook::Server$call(subset.app)
-   </Location>
-   <Location /custom/transformapp>
-      SetHandler r-handler
-      RFileEval /var/www/html/dataexplore/rook/rooktransform.R:Rook::Server$call(transform.app)
-   </Location>
-   <Location /custom/dataapp>
-      SetHandler r-handler
-      RFileEval /var/www/html/dataexplore/rook/rookdata.R:Rook::Server$call(data.app)
-   </Location>
-
-**The following directories are created by the installer to store various output files produced by TwoRavens:**
-
-.. code-block:: none
-
-   mkdir --parents /var/www/html/custom/pic_dir
-   
-   mkdir --parents /var/www/html/custom/preprocess_dir
-   
-   mkdir --parents /var/www/html/custom/log_dir
-
-**The ownership of the TwoRavens directories is changed to user** ``apache``:
-
-.. code-block:: none
-
-   chown -R apache.apache /var/www/html/custom
-
-   chown -R apache /var/www/html/dataexplore
-
-**Finally, the installer restarts Apache, for all the changes to take effect:**
-
-``service httpd restart``
-
-.. |tworavens_test_file_ingested| image:: ./img/tworavens_test_file_ingested.png
-   :class: img-responsive
-
-.. |tworavens_test_init| image:: ./img/tworavens_test_init.png
-   :class: img-responsive
-
-.. |tworavens_test_select_var| image:: ./img/tworavens_test_select_var.png
-   :class: img-responsive
-
-.. |tworavens_test_select_model| image:: ./img/tworavens_test_select_model.png
-   :class: img-responsive
-
-.. |tworavens_test_output| image:: ./img/tworavens_test_output.png
-   :class: img-responsive
-
-.. |tworavens_test_empty| image:: ./img/tworavens_test_empty.png
-   :class: img-responsive
-
-.. |tworavens_components| image:: ./img/tworavens_components.png
-   :class: img-responsive
diff --git a/doc/sphinx-guides/source/installation/shibboleth.rst b/doc/sphinx-guides/source/installation/shibboleth.rst
index 813c46203c3..6a8395c6d12 100644
--- a/doc/sphinx-guides/source/installation/shibboleth.rst
+++ b/doc/sphinx-guides/source/installation/shibboleth.rst
@@ -7,7 +7,7 @@ Shibboleth
 Introduction
 ------------
 
-By configuring and enabling Shibboleth support in Dataverse, your users will be able to log in using the identity system managed by their institution ("single sign on", or at least "single password") rather than having to create yet another password local to your Dataverse installation. Typically, users know their login system by some sort of internal branding such as "HarvardKey" or "Touchstone" (MIT) but within the Dataverse application, the Shibboleth feature is known as "Institutional Log In" as explained to end users in the :doc:`/user/account` section of the User Guide.
+By configuring and enabling Shibboleth support in your Dataverse installation, your users will be able to log in using the identity system managed by their institution ("single sign on", or at least "single password") rather than having to create yet another password local to your Dataverse installation. Typically, users know their login system by some sort of internal branding such as "HarvardKey" or "Touchstone" (MIT) but within the Dataverse Software application, the Shibboleth feature is known as :ref:`institutional-log-in` as explained to end users in the :doc:`/user/account` section of the User Guide.
 
 Shibboleth is an implementation of the `Security Assertion Markup Language (SAML) <https://en.wikipedia.org/wiki/Security_Assertion_Markup_Language>`_ protocol which is similar in spirit to systems used by many webapps that allow you to log in via Google, Facebook, or Twitter.
 
@@ -16,19 +16,19 @@ Shibboleth can be compared and contrasted with OAuth2, which you can read about
 Installation
 ------------
 
-We assume you've already gone through a basic installation as described in the :doc:`/installation/installation-main` section and that you've paid particular attention to the "Auth Modes: Local vs. Remote vs. Both" explanation in the :doc:`/installation/config` section. You're going to give Shibboleth a whirl. Let's get started.
+We assume you've already gone through a basic installation as described in the :doc:`/installation/installation-main` section and that you've paid particular attention to the :ref:`auth-modes` explanation in the :doc:`/installation/config` section. You're going to give Shibboleth a whirl. Let's get started.
 
 System Requirements
 ~~~~~~~~~~~~~~~~~~~
 
-Support for Shibboleth in Dataverse is built on the popular `"mod_shib" Apache module, "shibd" daemon <https://shibboleth.net/products/service-provider.html>`_, and the `Embedded Discovery Service (EDS) <https://shibboleth.net/products/embedded-discovery-service.html>`_ Javascript library, all of which are distributed by the `Shibboleth Consortium <https://shibboleth.net>`_. EDS is bundled with Dataverse, but ``mod_shib`` and ``shibd`` must be installed and configured per below.
+Support for Shibboleth in the Dataverse Software is built on the popular `"mod_shib" Apache module, "shibd" daemon <https://shibboleth.net/products/service-provider.html>`_, and the `Embedded Discovery Service (EDS) <https://shibboleth.net/products/embedded-discovery-service.html>`_ Javascript library, all of which are distributed by the `Shibboleth Consortium <https://shibboleth.net>`_. EDS is bundled with the Dataverse Software, but ``mod_shib`` and ``shibd`` must be installed and configured per below.
 
-Only Red Hat Enterprise Linux (RHEL) and derivatives such as CentOS have been tested (x86_64 versions) by the Dataverse team. See https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPLinuxInstall for details and note that (according to that page) as of this writing Ubuntu and Debian are not offically supported by the Shibboleth project.
+Only Red Hat Enterprise Linux (RHEL) and derivatives have been tested (x86_64 versions) by the Dataverse Project team. See https://shibboleth.atlassian.net/wiki/spaces/SP3/pages/2065335547/LinuxInstall for details and note that (according to that page) as of this writing Ubuntu and Debian are not officially supported by the Shibboleth project.
 
 Install Apache
 ~~~~~~~~~~~~~~
 
-We will be "fronting" Glassfish with Apache so that we can make use of the ``mod_shib`` Apache module. We will also make use of the ``mod_proxy_ajp`` module built in to Apache.
+We will be "fronting" the app server with Apache so that we can make use of the ``mod_shib`` Apache module. We will also make use of the ``mod_proxy_ajp`` module built in to Apache.
 
 We include the ``mod_ssl`` package to enforce HTTPS per below.
 
@@ -39,46 +39,31 @@ Install Shibboleth
 
 Installing Shibboleth will give us both the ``shibd`` service and the ``mod_shib`` Apache module.
 
-Enable Shibboleth Yum Repo
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This yum repo is recommended at https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPLinuxRPMInstall
-
-``cd /etc/yum.repos.d``
-
-If you are running el7 (RHEL/CentOS 7):
+Install Shibboleth Yum Repo
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-``wget http://download.opensuse.org/repositories/security:/shibboleth/CentOS_7/security:shibboleth.repo``
+The Shibboleth project now provides `a web form <https://shibboleth.net/downloads/service-provider/RPMS/>`_ to generate an appropriate package repository for use with YUM/DNF.
 
-If you are running el6 (RHEL/CentOS 6):
-
-``wget http://download.opensuse.org/repositories/security:/shibboleth/CentOS_CentOS-6/security:shibboleth.repo``
+You'll want to copy-paste the form results into ``/etc/yum.repos.d/shibboleth.repo`` or wherever is most appropriate for your operating system.
 
 Install Shibboleth Via Yum
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-``yum install shibboleth``
+Please note that during the installation it's ok to import GPG keys from the Shibboleth project. We trust them.
 
-Configure Glassfish
--------------------
-
-Apply GRIZZLY-1787 Patch
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-In order for the Dataverse "download as zip" feature to work well with large files without causing ``OutOfMemoryError`` problems on Glassfish 4.1 when fronted with Apache, you should stop Glassfish, with ``./asadmin stop-domain domain1``, make a backup of ``glassfish4/glassfish/modules/glassfish-grizzly-extra-all.jar``, replace it with a patched version of ``glassfish-grizzly-extra-all.jar`` downloaded from :download:`here </_static/installation/files/issues/2180/grizzly-patch/glassfish-grizzly-extra-all.jar>` (the md5 is in the :download:`README <../_static/installation/files/issues/2180/grizzly-patch/readme.md>`), and start Glassfish again with ``./asadmin start-domain domain1``.
-
-For more background on the patch, please see https://java.net/jira/browse/GRIZZLY-1787 and https://github.com/IQSS/dataverse/issues/2180 and https://github.com/payara/Payara/issues/350
+``yum install shibboleth``
 
-This problem has been reported to Glassfish at https://java.net/projects/glassfish/lists/users/archive/2015-07/message/1 and while Glassfish 4.1.1 includes a new enough version of Grizzly to fix the bug, other complicating factors prevent its adoption (look for "Glassfish 4.1.1" in the :doc:`prerequisites` section for details on why it is not recommended).
+Configure Payara
+----------------
 
-Glassfish HTTP and HTTPS ports
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+App Server HTTP and HTTPS ports
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Apache will be listening on ports 80 and 443 so we need to make sure Glassfish isn't using them. If you've been changing the default ports used by Glassfish per the :doc:`config` section, revert the Glassfish HTTP service to listen on 8080, the default port:
+Apache will be listening on ports 80 and 443 so we need to make sure the app server isn't using them. If you've been changing the default ports used by the app server per the :doc:`config` section, revert the HTTP service to listen on 8080, the default port:
 
 ``./asadmin set server-config.network-config.network-listeners.network-listener.http-listener-1.port=8080``
 
-Likewise, if necessary, revert the Glassfish HTTPS service to listen on port 8181:
+Likewise, if necessary, revert the HTTPS service to listen on port 8181:
 
 ``./asadmin set server-config.network-config.network-listeners.network-listener.http-listener-2.port=8181``
 
@@ -91,12 +76,14 @@ A ``jk-connector`` network listener should have already been set up when you ran
 
 You can verify this with ``./asadmin list-network-listeners``. 
 
-This enables the `AJP protocol <http://en.wikipedia.org/wiki/Apache_JServ_Protocol>`_ used in Apache configuration files below.
+This enables the `AJP protocol <https://en.wikipedia.org/wiki/Apache_JServ_Protocol>`_ used in Apache configuration files below.
 
 SSLEngine Warning Workaround
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When fronting Glassfish with Apache and using the jk-connector (AJP, mod_proxy_ajp), in your Glassfish server.log you can expect to see "WARNING ... org.glassfish.grizzly.http.server.util.RequestUtils ... jk-connector ... Unable to populate SSL attributes java.lang.IllegalStateException: SSLEngine is null".
+This workaround was required for Glassfish 4 but it is unknown if it is required under Payara.
+
+When fronting Payara with Apache and using the jk-connector (AJP, mod_proxy_ajp), in your Payara server.log you can expect to see "WARNING ... org.glassfish.grizzly.http.server.util.RequestUtils ... jk-connector ... Unable to populate SSL attributes java.lang.IllegalStateException: SSLEngine is null".
 
 To hide these warnings, run ``./asadmin set-log-levels org.glassfish.grizzly.http.server.util.RequestUtils=SEVERE`` so that the WARNING level is hidden as recommended at https://java.net/jira/browse/GLASSFISH-20694 and https://github.com/IQSS/dataverse/issues/643#issuecomment-49654847
 
@@ -106,7 +93,7 @@ Configure Apache
 Enforce HTTPS
 ~~~~~~~~~~~~~
 
-To prevent attacks such as `FireSheep <http://en.wikipedia.org/wiki/Firesheep>`_, HTTPS should be enforced. https://wiki.apache.org/httpd/RewriteHTTPToHTTPS provides a good method. You **could** copy and paste that those "rewrite rule" lines into Apache's main config file at ``/etc/httpd/conf/httpd.conf`` but using Apache's "virtual hosts" feature is recommended so that you can leave the main configuration file alone and drop a host-specific file into place.
+To prevent attacks such as `FireSheep <https://en.wikipedia.org/wiki/Firesheep>`_, HTTPS should be enforced. https://wiki.apache.org/httpd/RewriteHTTPToHTTPS provides a good method. You **could** copy and paste that those "rewrite rule" lines into Apache's main config file at ``/etc/httpd/conf/httpd.conf`` but using Apache's "virtual hosts" feature is recommended so that you can leave the main configuration file alone and drop a host-specific file into place.
 
 Below is an example of how "rewrite rule" lines look within a ``VirtualHost`` block. Download a :download:`sample file <../_static/installation/files/etc/httpd/conf.d/dataverse.example.edu.conf>` , edit it to substitute your own hostname under ``ServerName``, and place it at ``/etc/httpd/conf.d/dataverse.example.edu.conf`` or a filename that matches your hostname. The file must be in ``/etc/httpd/conf.d`` and must end in ".conf" to be included in Apache's configuration.
 
@@ -121,14 +108,10 @@ Near the bottom of ``/etc/httpd/conf.d/ssl.conf`` but before the closing ``</Vir
 
 .. code-block:: text
 
-    # don't pass paths used by rApache and TwoRavens to Glassfish
-    ProxyPassMatch ^/RApacheInfo$ !
-    ProxyPassMatch ^/custom !
-    ProxyPassMatch ^/dataexplore !
-    # don't pass paths used by Shibboleth to Glassfish
+    # don't pass paths used by Shibboleth to Payara
     ProxyPassMatch ^/Shibboleth.sso !
     ProxyPassMatch ^/shibboleth-ds !
-    # pass everything else to Glassfish
+    # pass everything else to Payara
     ProxyPass / ajp://localhost:8009/
 
     <Location /shib.xhtml>
@@ -153,28 +136,40 @@ Configure Shibboleth
 shibboleth2.xml
 ~~~~~~~~~~~~~~~
 
-``/etc/shibboleth/shibboleth2.xml`` should look something like the :download:`sample shibboleth2.xml file <../_static/installation/files/etc/shibboleth/shibboleth2.xml>` below, but you must substitute your hostname in the ``entityID`` value. If your starting point is a ``shibboleth2.xml`` file provided by someone else, you must ensure that ``attributePrefix="AJP_"`` is added under ``ApplicationDefaults`` per the `Shibboleth wiki <https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPJavaInstall>`_ . Without the ``AJP_`` configuration in place, the required :ref:`shibboleth-attributes` will be null and users will be unable to log in.
+``/etc/shibboleth/shibboleth2.xml`` should look something like the :download:`sample shibboleth2.xml file <../_static/installation/files/etc/shibboleth/shibboleth2.xml>` below, but you must substitute your hostname in the ``entityID`` value. If your starting point is a ``shibboleth2.xml`` file provided by someone else, you must ensure that ``attributePrefix="AJP_"`` is added under ``ApplicationDefaults`` per the `Shibboleth wiki <https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPJavaInstall>`_. Without the ``AJP_`` configuration in place, the required :ref:`shibboleth-attributes` will be null and users will be unable to log in.
 
 .. literalinclude:: ../_static/installation/files/etc/shibboleth/shibboleth2.xml
    :language: xml
 
+.. _specific-identity-providers:
+
 Specific Identity Provider(s)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 When configuring the ``MetadataProvider`` section of ``shibboleth2.xml`` you should consider if your users will all come from the same Identity Provider (IdP) or not.
 
-Most Dataverse installations will probably only want to authenticate users via Shibboleth using their home institution's Identity Provider (IdP).  The configuration above in ``shibboleth2.xml`` looks for the metadata for the Identity Providers (IdPs) in a file at ``/etc/shibboleth/dataverse-idp-metadata.xml``.  You can download a :download:`sample dataverse-idp-metadata.xml file <../_static/installation/files/etc/shibboleth/dataverse-idp-metadata.xml>` and that includes the TestShib IdP from http://testshib.org but you will want to edit this file to include the metadata from the Identity Provider(s) you care about. The identity people at your institution will be able to provide you with this metadata and they will very likely ask for a list of attributes that Dataverse requires, which are listed at :ref:`shibboleth-attributes`.
+Most Dataverse installations will probably only want to authenticate users via Shibboleth using their home institution's Identity Provider (IdP).  The configuration above in ``shibboleth2.xml`` looks for the metadata for the Identity Providers (IdPs) in a file at ``/etc/shibboleth/dataverse-idp-metadata.xml``.  You can download a :download:`sample dataverse-idp-metadata.xml file <../_static/installation/files/etc/shibboleth/dataverse-idp-metadata.xml>` and that includes the SAMLtest IdP from https://samltest.id but you will want to edit this file to include the metadata from the Identity Provider you care about. The identity people at your institution will be able to provide you with this metadata and they will very likely ask for a list of attributes that the Dataverse Software requires, which are listed at :ref:`shibboleth-attributes`.
+
+.. _identity-federation:
 
 Identity Federation
 ^^^^^^^^^^^^^^^^^^^
 
-Rather than or in addition to specifying individual Identity Provider(s) you may wish to broaden the number of users who can log into your Dataverse installation by registering your Dataverse installation as a Service Provider (SP) within an identity federation. For example, in the United States, users from the `many institutions registered with the "InCommon" identity federation <https://incommon.org/federation/info/all-entities.html#IdPs>`_ that release the `"Research & Scholarship Attribute Bundle" <https://spaces.internet2.edu/display/InCFederation/Research+and+Scholarship+Attribute+Bundle>`_  will be able to log into your Dataverse installation if you register it as an `InCommon Service Provider <https://incommon.org/federation/info/all-entities.html#SPs>`_ that is part of the `Research & Scholarship (R&S) category <https://incommon.org/federation/info/all-entity-categories.html#SPs>`_.
+Rather than or in addition to specifying individual Identity Providers (see :ref:`specific-identity-providers` above) you may wish to broaden the number of users who can log into your Dataverse installation (to include collaborators, for example) by registering it as a Service Provider (SP) within an identity federation.
+
+For example, in the United States, you would register your Dataverse installation with `InCommon <https://incommon.org>`_. For a list of federations around the world, see `REFEDS (the Research and Education FEDerations group) <https://refeds.org/federations>`_. The details of how to register with an identity federation are out of scope for this document.
+
+For a successful login to Dataverse, certain :ref:`shibboleth-attributes` must be released by the Identity Provider (IdP). Otherwise, in the federation context, users will have the frustrating experience of selecting their IdP in the list but then getting an error like ``Problem with Identity Provider – The SAML assertion for "eppn" was null``. We definitely want to prevent this! There's even some guidance about this problem in the User Guide under the heading :ref:`fix-shib-login` that links back here.
 
-The details of how to register with an identity federation are out of scope for this document, but a good starting point may be this list of identity federations across the world: http://www.protectnetwork.org/support/faq/identity-federations
+For InCommon, a decent strategy for ensuring that IdPs release the necessary attributes is to have both the SP (your Dataverse installation) and the IdP (there are many of these around the world) join the Research & Scholarship (R&S) category. The `R&S website <https://incommon.org/federation/research-and-scholarship/>`_ explains the R&S dream well:
 
-One of the benefits of using ``shibd`` is that it can be configured to periodically poll your identity federation for updates as new Identity Providers (IdPs) join the federation you've registered with. For the InCommon federation, the following page describes how to download and verify signed InCommon metadata every hour: https://spaces.internet2.edu/display/InCFederation/Shibboleth+Metadata+Config#ShibbolethMetadataConfig-ConfiguretheShibbolethSP . You can also see an example of this as ``maxRefreshDelay="3600"`` in the commented out section of the ``shibboleth2.xml`` file above.
+    "The Research and Scholarship (R&S) entity category defines a simple and scalable way to streamline federated research access. Identity providers (IdP) supporting R&S category agree to release basic, pre-defined person directory information to all service providers (SP) serving the Research and Scholarship community."
 
-Once you've joined a federation the list of IdPs in the dropdown can be quite long! If you're curious how many are in the list you could try something like this: ``curl https://dataverse.example.edu/Shibboleth.sso/DiscoFeed | jq '.[].entityID' | wc -l``
+In short, R&S IdPs trust R&S SPs and vice versa. R&S SPs (like Dataverse) agree to only require attributes that R&S IdPs agree to release (the `"Research & Scholarship Attribute Bundle" <https://refeds.org/research-and-scholarship>`_). Ideally, there is no need to make special arrangements with each IdP.
+
+For InCommon, follow their `instructions <https://spaces.at.internet2.edu/display/federation/Service+provider+-+apply+for+Research+and+Scholarship+category>`_ to make your Dataverse installation an R&S SP. For other federations, consult their documentation.
+
+Unfortunately, in practice, some R&S IdPs do not release the attributes they agreed to release to R&S SPs when joining R&S. In this case, you will have to contact the IdP, show them the list of :ref:`shibboleth-attributes` that Dataverse requires for a successful login, and try to convince them to release them.
 
 .. _shibboleth-attributes:
 
@@ -189,16 +184,16 @@ The following attributes are required for a successful Shibboleth login:
 - sn
 - email
 
-See also https://www.incommon.org/federation/attributesummary.html and https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPAttributeAccess
+See also https://incommon.org/federation/attributes/ and https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPAttributeAccess
 
 attribute-map.xml
 ~~~~~~~~~~~~~~~~~
 
-By default, some attributes ``/etc/shibboleth/attribute-map.xml`` are commented out. Edit the file to enable them so that all the require attributes come through. You can download a :download:`sample attribute-map.xml file <../_static/installation/files/etc/shibboleth/attribute-map.xml>`.
+By default, some attributes ``/etc/shibboleth/attribute-map.xml`` are commented out and "subject-id" is used instead of "eppn". We recommend downloading and using :download:`attribute-map.xml<../_static/installation/files/etc/shibboleth/attribute-map.xml>` instead which has these changes and should be compatible with the Dataverse installation.
 
 Shibboleth and ADFS
 ~~~~~~~~~~~~~~~~~~~
-With appropriate configuration, Dataverse and Shibboleth can make use of "single sign on" using Active Directory.
+With appropriate configuration, your Dataverse installation and Shibboleth can make use of "single sign on" using Active Directory.
 This requires configuring ``shibd`` and ``httpd`` to load appropriate libraries, and insuring that the attribute mapping matches those provided.
 Example configuration files for :download:`shibboleth2.xml <../_static/installation/files/etc/shibboleth/shibboleth2_adfs.xml>` and :download:`attribute-map.xml <../_static/installation/files/etc/shibboleth/attribute-map_adfs.xml>` may be helpful.
 Note that your ADFS server hostname goes in the file referenced under "MetadataProvider" in your shibboleth2.xml file.
@@ -211,53 +206,39 @@ SELinux is set to "enforcing" by default on RHEL/CentOS, but unfortunately Shibb
 Disable SELinux
 ~~~~~~~~~~~~~~~
 
-The first and easiest option is to set ``SELINUX=permisive`` in ``/etc/selinux/config`` and run ``setenforce permissive`` or otherwise disable SELinux to get Shibboleth to work. This is apparently what the Shibboleth project expects because their wiki page at https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPSELinux says, "At the present time, we do not support the SP in conjunction with SELinux, and at minimum we know that communication between the mod_shib and shibd components will fail if it's enabled. Other problems may also occur."
+The first and easiest option is to set ``SELINUX=permisive`` in ``/etc/selinux/config`` and run ``setenforce permissive`` or otherwise disable SELinux to get Shibboleth to work. This is apparently what the Shibboleth project expects because their `wiki page <https://shibboleth.atlassian.net/wiki/spaces/SP3/pages/2065335559/SELinux>`_ says, "At the present time, we do not support the SP in conjunction with SELinux, and at minimum we know that communication between the mod_shib and shibd components will fail if it's enabled. Other problems may also occur."
 
 Reconfigure SELinux to Accommodate Shibboleth
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The second (more involved) option is to use the ``checkmodule``, ``semodule_package``, and ``semodule`` tools to apply a local policy to make Shibboleth work with SELinux. Let's get started.
-
-Put Type Enforcement (TE) File in misc directory
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Copy and paste or download the :download:`shibboleth.te <../_static/installation/files/etc/selinux/targeted/src/policy/domains/misc/shibboleth.te>` Type Enforcement (TE) file below and put it at ``/etc/selinux/targeted/src/policy/domains/misc/shibboleth.te``.
-
-.. literalinclude:: ../_static/installation/files/etc/selinux/targeted/src/policy/domains/misc/shibboleth.te
-   :language: text
-
-(If you would like to know where the ``shibboleth.te`` came from and how to hack on it, please see the :doc:`/developers/selinux` section of the Developer Guide. Pull requests are welcome!)
-
-Navigate to misc directory
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-``cd /etc/selinux/targeted/src/policy/domains/misc``
+Issue the following commands to allow Shibboleth to function when SELinux is enabled:
 
-Run checkmodule
-^^^^^^^^^^^^^^^
+.. code-block:: none
 
-``checkmodule -M -m -o shibboleth.mod shibboleth.te``
+    # Allow httpd to connect to network and read content
+    sudo /usr/sbin/setsebool -P httpd_can_network_connect 1
+    sudo /usr/sbin/setsebool -P httpd_read_user_content 1
 
-Run semodule_package
-^^^^^^^^^^^^^^^^^^^^
+    # Allow httpd to connect to Shib socket
+    sudo grep httpd_t /var/log/audit/audit.log |/usr/bin/audit2allow -M allow_httpd_shibd_sock
+    sudo /usr/sbin/semodule -i allow_httpd_shibd_sock.pp
 
-``semodule_package -o shibboleth.pp -m shibboleth.mod``
+    # Allow httpd to read /var/cache/shibboleth
+    sudo /usr/sbin/semanage fcontext -a -t httpd_sys_content_t "/var/cache/shibboleth(/.*)?"
+    sudo /usr/sbin/restorecon -vR /var/cache/shibboleth
 
-Silent is golden. No output is expected.
+Restart Apache and Shibboleth
+-----------------------------
 
-Run semodule
-^^^^^^^^^^^^
+After configuration is complete, restart ``shib`` and ``httpd``.
 
-``semodule -i shibboleth.pp``
+On CentOS 7:
 
-Silent is golden. No output is expected. This will place a file in ``/etc/selinux/targeted/modules/active/modules/shibboleth.pp`` and include "shibboleth" in the output of ``semodule -l``. See the ``semodule`` man page if you ever want to remove or disable the module you just added.
+``systemctl restart shibd.service``
 
-Congrats! You've made the creator of http://stopdisablingselinux.com proud. :)
+``systemctl restart httpd.service``
 
-Restart Apache and Shibboleth
------------------------------
-
-After configuration is complete:
+On CentOS 6:
 
 ``service shibd restart``
 
@@ -266,6 +247,14 @@ After configuration is complete:
 Configure Apache and shibd to Start at Boot
 -------------------------------------------
 
+On CentOS 7/8:
+
+``systemctl enable httpd.service``
+
+``systemctl enable shibd.service``
+
+On CentOS 6:
+
 ``chkconfig httpd on``
 
 ``chkconfig shibd on``
@@ -280,76 +269,71 @@ As a sanity check, visit the following URLs (substituting your hostname) to make
 
 The JSON in ``DiscoFeed`` comes from the list of IdPs you configured in the ``MetadataProvider`` section of ``shibboleth2.xml`` and will form a dropdown list on the Login Page.
 
-Add the Shibboleth Authentication Provider to Dataverse
--------------------------------------------------------
+Add the Shibboleth Authentication Provider to Your Dataverse Installation
+-------------------------------------------------------------------------
 
-Now that you've configured Glassfish, Apache, and ``shibd``, you are ready to turn your attention back to Dataverse to enable Shibboleth as an "authentication provider." You will be using ``curl`` to POST the `following JSON file <../_static/installation/files/etc/shibboleth/shibAuthProvider.json>`_ to the ``authenticationProviders`` endpoint of the :doc:`/api/native-api`.
+Now that you've configured your app server, Apache, and ``shibd``, you are ready to turn your attention back to the Dataverse installation to enable Shibboleth as an "authentication provider." You will be using ``curl`` to POST the `following JSON file <../_static/installation/files/etc/shibboleth/shibAuthProvider.json>`_ to the ``authenticationProviders`` endpoint of the :doc:`/api/native-api`.
 
 .. literalinclude:: ../_static/installation/files/etc/shibboleth/shibAuthProvider.json
    :language: json
 
 ``curl -X POST -H 'Content-type: application/json' --upload-file shibAuthProvider.json http://localhost:8080/api/admin/authenticationProviders``
 
-Now that you've added the Shibboleth authentication provider to Dataverse, as described in the :doc:`/user/account` section of the User Guide, you should see a new "Your Institution" button under "Other Log In Options" on the Log In page. After clicking "Your Institution", you should see the institutions you configured in ``/etc/shibboleth/shibboleth2.xml`` above. If not, double check the content of the ``DiscoFeed`` URL above. If you don't see the "Your Institution" button, confirm that the the "shib" authentication provider has been added by listing all the authentication providers Dataverse knows about:
+Now that you've added the Shibboleth authentication provider to your Dataverse installation, as described in the :doc:`/user/account` section of the User Guide, you should see a new "Your Institution" button under "Other Log In Options" on the Log In page. After clicking "Your Institution", you should see the institutions you configured in ``/etc/shibboleth/shibboleth2.xml`` above. If not, double check the content of the ``DiscoFeed`` URL above. If you don't see the "Your Institution" button, confirm that the the "shib" authentication provider has been added by listing all the authentication providers the Dataverse installation knows about:
 
 ``curl http://localhost:8080/api/admin/authenticationProviders``
 
-Once you have confirmed that the Dataverse web interface is listing the institutions you expect, you'll want to temporarily remove the Shibboleth authentication provider you just added because users won't be able to log in via their institution until you have exchanged metadata with one or more Identity Providers (IdPs), which is described below.  As explained in the section of the :doc:`/api/native-api` of the API Guide, you can delete an authentication provider by passing its ``id``:
+Once you have confirmed that the Dataverse installation's web interface is listing the institutions you expect, you'll want to temporarily remove the Shibboleth authentication provider you just added because users won't be able to log in via their institution until you have exchanged metadata with one or more Identity Providers (IdPs), which is described below.  As explained in the section of the :doc:`/api/native-api` of the API Guide, you can delete an authentication provider by passing its ``id``:
 
 ``curl -X DELETE http://localhost:8080/api/admin/authenticationProviders/shib``
 
-Before contacting your actual Identity Provider, we recommend testing first with the "TestShib" Identity Provider (IdP) to ensure that you have configured everything correctly.
+Before contacting your actual Identity Provider, we recommend testing first with the "SAMLtest" Identity Provider (IdP) to ensure that you have configured everything correctly. This process is described next.
 
 Exchange Metadata with Your Identity Provider
 ---------------------------------------------
 
-http://testshib.org (TestShib) is a fantastic resource for testing Shibboleth configurations. Depending on your relationship with your identity people you may want to avoid bothering them until you have tested your Dataverse configuration with the TestShib Identity Provider (IdP). This process is explained below.
+https://samltest.id (SAMLtest) is a fantastic resource for testing Shibboleth configurations. Depending on your relationship with your identity people you may want to avoid bothering them until you have tested your Dataverse installation configuration with the SAMLtest Identity Provider (IdP). This process is explained below.
 
-If you've temporarily configured your ``MetadataProvider`` to use the TestShib Identity Provider (IdP) as outlined above, you can download your metadata like this (substituting your hostname in both places):
+If you've temporarily configured your ``MetadataProvider`` to use the SAMLtest Identity Provider (IdP) as outlined above, you can download your metadata like this (substituting your hostname in both places):
 
 ``curl https://dataverse.example.edu/Shibboleth.sso/Metadata > dataverse.example.edu``
 
-Then upload your metadata to http://testshib.org/register.html
+Then upload your metadata to https://samltest.id/upload.php (or click "Fetch").
 
-Then try to log in to Dataverse using the TestShib IdP. After logging in, you can visit the https://dataverse.example.edu/Shibboleth.sso/Session (substituting your hostname) to troubleshoot which attributes are being received. You should see something like the following:
+Then try to log in to your Dataverse installation using the SAMLtest IdP. After logging in, you can visit the https://dataverse.example.edu/Shibboleth.sso/Session (substituting your hostname) to troubleshoot which attributes are being received. You should see something like the following:
 
 .. code-block:: none
 
     Miscellaneous
     Session Expiration (barring inactivity): 479 minute(s)
-    Client Address: 65.112.10.82
+    Client Address: 75.69.182.6
     SSO Protocol: urn:oasis:names:tc:SAML:2.0:protocol
-    Identity Provider: https://idp.testshib.org/idp/shibboleth
-    Authentication Time: 2016-03-08T13:45:10.922Z
+    Identity Provider: https://samltest.id/saml/idp
+    Authentication Time: 2019-11-28T01:23:28.381Z
     Authentication Context Class: urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport
     Authentication Context Decl: (none)
-
+    
     Attributes
-    affiliation: Member@testshib.org;Staff@testshib.org
-    cn: Me Myself And I
-    entitlement: urn:mace:dir:entitlement:common-lib-terms
-    eppn: myself@testshib.org
-    givenName: Me Myself
-    persistent-id: https://idp.testshib.org/idp/shibboleth!https://dataverse.example.edu/sp!RuyCiLvUcgmKqyh/rOQPh+wyR7s=
-    sn: And I
-    telephoneNumber: 555-5555
-    uid: myself
-    unscoped-affiliation: Member;Staff
-
-(As of this writing the TestShib IdP does not send the "mail" attribute, a required attribute, but for testing purposes, Dataverse compensates for this for the TestShib IdP and permits login anyway.)
+    displayName: Rick Sanchez
+    eppn: rsanchez@samltest.id
+    givenName: Rick
+    mail: rsanchez@samltest.id
+    sn: Sanchez
+    telephoneNumber: +1-555-555-5515
+    uid: rick
 
-When you are done testing, you can delete the TestShib users you created like this (after you have deleted any data and permisions associated with the users):
+When you are done testing, you can delete the SAMLtest users you created like this (after you have deleted any data and permisions associated with the users):
 
-``curl -X DELETE http://localhost:8080/api/admin/authenticatedUsers/myself``
+``curl -X DELETE http://localhost:8080/api/admin/authenticatedUsers/rick``
 
 (Of course, you are also welcome to do a fresh reinstall per the :doc:`installation-main` section.)
 
-If your Dataverse installation is working with TestShib it **should** work with your institution's Identity Provider (IdP). Next, you should:
+If your Dataverse installation is working with SAMLtest it **should** work with your institution's Identity Provider (IdP). Next, you should:
 
 - Send your identity people your metadata file above (or a link to download it themselves). From their perspective you are a Service Provider (SP).
 - Ask your identity people to send you the metadata for the Identity Provider (IdP) they operate. See the section above on ``shibboleth2.xml`` and ``MetadataProvider`` for what to do with the IdP metadata. Restart ``shibd`` and ``httpd`` as necessary.
-- Re-add Shibboleth as an authentication provider to Dataverse as described above.
-- Test login to Dataverse via your institution's Identity Provider (IdP).
+- Re-add Shibboleth as an authentication provider to your Dataverse installation as described above.
+- Test login to your Dataverse installation via your institution's Identity Provider (IdP).
 
 Backup sp-cert.pem and sp-key.pem Files
 ---------------------------------------
@@ -361,14 +345,14 @@ The installation and configuration of Shibboleth will result in the following ce
 - ``/etc/shibboleth/sp-cert.pem``
 - ``/etc/shibboleth/sp-key.pem``
 
-If you have more than one Glassfish server, you should use the same ``sp-cert.pem`` and ``sp-key.pem`` files on all of them. If these files are compromised and you need to regenerate them, you can ``cd /etc/shibboleth`` and run ``keygen.sh`` like this (substituting you own hostname):
+If you have more than one Payara server, you should use the same ``sp-cert.pem`` and ``sp-key.pem`` files on all of them. If these files are compromised and you need to regenerate them, you can ``cd /etc/shibboleth`` and run ``keygen.sh`` like this (substituting you own hostname):
 
 ``./keygen.sh -f -u shibd -g shibd -h dataverse.example.edu -e https://dataverse.example.edu/sp``
 
 Debugging
 ---------
 
-The :doc:`/admin/troubleshooting` section of the Admin Guide explains how to increase Glassfish logging levels. The relevant classes and packages are:
+The :doc:`/admin/troubleshooting` section of the Admin Guide explains how to increase Payara logging levels. The relevant classes and packages are:
 
 - edu.harvard.iq.dataverse.Shib
 - edu.harvard.iq.dataverse.authorization.providers.shib
@@ -388,7 +372,7 @@ If you are running in "remote and local" mode and have existing local users that
 - Log out of your local account.
 - Log in with your Shibboleth account.
 - If the email address associated with your local account matches the email address asserted by the Identity Provider (IdP), you will be prompted for the password of your local account and asked to confirm the conversion of your account. You're done! Browse around to ensure you see all the data you expect to see. Permissions have been preserved. 
-- If the email address asserted by the Identity Provider (IdP) does not match the email address of any local user, you will be prompted to create a new account. If you were expecting account conversion, you should decline creating a new Shibboleth account, log back in to your local account, and let Support know the email on file for your local account. Support may ask you to change your email address for your local account to the one that is being asserted by the Identity Provider. Someone with access to the Glassfish logs will see this email address there.
+- If the email address asserted by the Identity Provider (IdP) does not match the email address of any local user, you will be prompted to create a new account. If you were expecting account conversion, you should decline creating a new Shibboleth account, log back in to your local account, and let Support know the email on file for your local account. Support may ask you to change your email address for your local account to the one that is being asserted by the Identity Provider. Someone with access to the Payara logs will see this email address there.
 
 .. _converting-shibboleth-users-to-local:
 
@@ -397,9 +381,9 @@ Converting Shibboleth Users to Local
 
 Whereas users convert their own accounts from local to Shibboleth as described above, conversion in the opposite direction is performed by a sysadmin. A common scenario may be as follows:
 
-- A user emails Support saying, "I left the university (or wherever) and can't log in to Dataverse anymore. What should I do?"
-- Support replies asking the user for a new email address (Gmail, new institution email, etc.) to associate with their Dataverse account.
-- The user replies with a new email address to associate with their Dataverse account.
+- A user emails Support saying, "I left the university (or wherever) and can't log in to the Dataverse installation anymore. What should I do?"
+- Support replies asking the user for a new email address (Gmail, new institution email, etc.) to associate with their Dataverse installation account.
+- The user replies with a new email address to associate with their Dataverse installation account.
 - Support runs the curl command below, supplying the database id of the user to convert and the new email address and notes the username returned.
 - Support emails the user and indicates that that they should use the password reset feature to set a new password and to make sure to take note of their username under Account Information (or the password reset confirmation email) since the user never had a username before.
 - The user resets password and is able to log in with their local account. All permissions have been preserved with the exception of any permissions assigned to an institution-wide Shibboleth group to which the user formerly belonged.
@@ -414,14 +398,18 @@ Rather than looking up the user's id in the ``authenticateduser`` database table
 
 Per above, you now need to tell the user to use the password reset feature to set a password for their local account.
 
+.. _shib-groups:
+
 Institution-Wide Shibboleth Groups
 ----------------------------------
 
-Dataverse allows you to optionally define "institution-wide Shibboleth groups" based on the the entityID of the Identity Provider (IdP) used to authenticate. For example, an "institution-wide Shibboleth group" with ``https://idp.testshib.org/idp/shibboleth`` as the IdP would include everyone who logs in via the TestShib IdP mentioned above.
+The Dataverse Software allows you to optionally define "institution-wide Shibboleth groups" based on the the entityID of the Identity Provider (IdP) used to authenticate. For example, an "institution-wide Shibboleth group" with ``https://samltest.id/saml/idp`` as the IdP would include everyone who logs in via the SAMLtest IdP mentioned above.
 
-To create an institution-wide Shibboleth groups, create a JSON file as below and issue this curl command: ``curl http://localhost:8080/api/admin/groups/shib -X POST -H 'Content-type:application/json' --upload-file shibGroupTestShib.json``
+To create an institution-wide Shibboleth groups, create a JSON file like :download:`shibGroupSAMLtest.json<../_static/installation/files/etc/shibboleth/shibGroupSAMLtest.json>` as below and issue this curl command:
 
-.. literalinclude:: ../_static/installation/files/etc/shibboleth/shibGroupTestShib.json 
+``curl http://localhost:8080/api/admin/groups/shib -X POST -H 'Content-type:application/json' --upload-file shibGroupSAMLtest.json``
+
+.. literalinclude:: ../_static/installation/files/etc/shibboleth/shibGroupSAMLtest.json
 
 Institution-wide Shibboleth groups are based on the "Shib-Identity-Provider" SAML attribute asserted at runtime after successful authentication with the Identity Provider (IdP) and held within the browser session rather than being persisted in the database for any length of time. It is for this reason that roles based on these groups, such as the ability to create a dataset, are not honored by non-browser interactions, such as through the SWORD API. 
 
@@ -430,3 +418,22 @@ To list institution-wide Shibboleth groups: ``curl http://localhost:8080/api/adm
 To delete an institution-wide Shibboleth group (assuming id 1): ``curl -X DELETE http://localhost:8080/api/admin/groups/shib/1``
 
 Support for arbitrary attributes beyond "Shib-Identity-Provider" such as "eduPersonScopedAffiliation", etc. is being tracked at https://github.com/IQSS/dataverse/issues/1515
+
+Multi-Factor Authentication
+---------------------------
+
+Institutions that wish to require MFA for their own accounts may add
+
+.. code-block:: text
+
+    authnContextClassRef="https://refeds.org/profile/mfa"
+
+to the shibboleth2.xml SSO element.
+
+Federated institutions that would like to require MFA for their own account but not require MFA of other federated institutions may add
+
+.. code-block:: text
+
+    <RelyingParty Name="urn:mace:incommon:yourinstitution.edu" authnContextClassRef="https://refeds.org/profile/mfa"/>
+
+to shibboleth2.xml, beneath the Sessions and Errors elements.
diff --git a/doc/sphinx-guides/source/installation/upgrading.rst b/doc/sphinx-guides/source/installation/upgrading.rst
index a180d6492a5..e312e1135e0 100644
--- a/doc/sphinx-guides/source/installation/upgrading.rst
+++ b/doc/sphinx-guides/source/installation/upgrading.rst
@@ -5,7 +5,7 @@ Upgrading
 .. contents:: |toctitle|
 	:local:
 
-When upgrading within Dataverse 4.x, you will need to follow the upgrade instructions for each intermediate version. 
+When upgrading within Dataverse Software 4.x, you will need to follow the upgrade instructions for each intermediate 4.x. Similarly, when upgrading within Dataverse Software 5.x, you will need to follow the upgrade instructions for each intermediate 5.x version.
 
 Upgrades always involve deploying the latest war file but may also include updating the schema used by Solr or other manual steps. Running database migration scripts was once required but this has been automated (see the ``flyway_schema_history`` database table to see migrations that have been run).
 
diff --git a/doc/sphinx-guides/source/qa/index.md b/doc/sphinx-guides/source/qa/index.md
new file mode 100644
index 00000000000..623b93ef31b
--- /dev/null
+++ b/doc/sphinx-guides/source/qa/index.md
@@ -0,0 +1,12 @@
+# QA Guide
+
+```{toctree}
+:caption: "Contents:"
+:maxdepth: 2
+overview.md
+testing-approach.md
+testing-infrastructure.md
+qa-workflow.md
+test-automation.md
+performance-tests.md
+```
diff --git a/doc/sphinx-guides/source/qa/overview.md b/doc/sphinx-guides/source/qa/overview.md
new file mode 100644
index 00000000000..60e6a28ee9a
--- /dev/null
+++ b/doc/sphinx-guides/source/qa/overview.md
@@ -0,0 +1,63 @@
+# Overview
+
+```{contents} Contents:
+:local: 
+:depth: 3
+```
+
+## Introduction
+
+This guide describes the testing process used by QA at IQSS and provides a reference for others filling in for that role. Please note that many variations are possible, and the main thing is to catch bugs and provide a good quality product to the user community.
+
+## Workflow
+
+Here is a brief description of our workflow: 
+
+### Issue Submission and Prioritization: 
+- Members of the community or the development team submit bugs or request features through GitHub as [Issues](https://github.com/IQSS/dataverse/issues).
+- These Issues are prioritized and added to a two-week-long sprint that can be tracked on the {ref}`kanban-board`.
+
+### Development Process:
+- Developers will work on a solution on a separate branch
+- Once a developer completes their work, they submit a [Pull Request](https://github.com/IQSS/dataverse/pulls) (PR).
+- The PR is reviewed by a developer from the team.
+- During the review, the reviewer may suggest coding or documentation changes to the original developer.
+
+### Quality Assurance (QA) Testing:
+- The QA tester performs a smoke test of core functionality and regression testing.
+- Documentation is used to understand the feature and validate any assertions made.
+- If no documentation is provided in the PR, the tester may refer to the original bug report to determine the desired outcome of the changes.
+- Once the branch is assumed to be safe, it is merged into the develop branch.
+
+### Final Steps:
+- The PR and the Issue are closed and assigned the “merged” status.
+- It is good practice to delete the branch if it is local.
+- The content from the PR becomes part of the codebase for {doc}`future releases </developers/making-releases>`.
+
+The complete suggested workflow can be found at {doc}`qa-workflow`.
+
+## Tips and Tricks
+
+- Start testing simply, with the most obvious test. You don’t need to know all your tests upfront. As you gain comfort and understanding of how it works, try more tests until you are done. If it is a complex feature, jot down your tests in an outline format, some beforehand as a guide, and some after as things occur to you. Save the doc in a testing folder (on Google Drive). This potentially will help with future testing.
+- When in doubt, ask someone. If you are confused about how something is working, it may be something you have missed, or it could be a documentation issue, or it could be a bug! Talk to the code reviewer and the contributor/developer for their opinion and advice.
+- Always tail the server.log file while testing. Open a terminal window to the test instance and `tail -F server.log`. This helps you get a real-time sense of what the server is doing when you interact with the application and makes it easier to identify any stack trace on failure.
+- When overloaded, QA the simple pull requests first to reduce the queue. It gives you a mental boost to complete something and reduces the perception of the amount of work still to be done.
+- When testing a bug fix, try reproducing the bug on the demo server before testing the fix. That way you know you are taking the correct steps to verify that the fix worked.
+- When testing an optional feature that requires configuration, do a smoke test without the feature configured and then with it configured. That way you know that folks using the standard config are unaffected by the option if they choose not to configure it.
+- Back up your DB before applying an irreversible DB update when you are using a persistent/reusable platform. Just in case it fails, and you need to carry on testing something else you can use the backup.
+
+## Release Cadence and Sprints
+
+A release likely spans multiple two-week sprints. Each sprint represents the priorities for that time and is sized so that the team can reasonably complete most of the work on time. This is a goal to help with planning, it is not a strict requirement. Some issues from the previous sprint may remain and likely be included in the next sprint but occasionally may be deprioritized and deferred to another time.
+
+The decision to make a release can be based on the time since the last release, some important feature needed by the community or contractual deadline, or some other logical reason to package the work completed into a named release and posted to the releases section on GitHub.
+
+## Test API
+
+The API test suite is added to and maintained by development. (See {doc}`/developers/testing` in the Developer Guide.) It is generally advisable for code contributors to add API tests when adding new functionality. The approach here is one of code coverage: exercise as much of the code base's code paths as possible, every time to catch bugs. 
+
+This type of approach is often used to give contributing developers confidence that their code didn’t introduce any obvious, major issues and is run on each commit. Since it is a broad set of tests, it is not clear whether any specific, conceivable test is run but it does add a lot of confidence that the code base is functioning due to its reach and consistency. (See {doc}`/qa/test-automation` in the Developer Guide.)
+
+## Making a Release
+
+See {doc}`/developers/making-releases` in the Developer Guide.
diff --git a/doc/sphinx-guides/source/qa/performance-tests.md b/doc/sphinx-guides/source/qa/performance-tests.md
new file mode 100644
index 00000000000..404188735a2
--- /dev/null
+++ b/doc/sphinx-guides/source/qa/performance-tests.md
@@ -0,0 +1,31 @@
+# Performance Testing
+
+```{contents} Contents:
+:local: 
+:depth: 3
+```
+
+## Introduction
+
+The final testing activity before producing a release is performance testing. This could be done throughout the release cycle but since it is time-consuming, it is done once near the end. Using a load-generating tool named {ref}`Locust <locust>`, our scripts load the statistically most-loaded pages (according to Google Analytics): 50% homepage and 50% some type of dataset page. 
+
+Since dataset page weight also varies by the number of files, a selection of about 10 datasets with varying file counts is used. The pages are called randomly as a guest user with increasing levels of user load, from 1 user to 250 users. Typical daily loads in production are around the 50-user level. Though the simulated user level does have a modest amount of random think time before repeated calls, from 5-20 seconds, it is not a real-world load so direct comparisons to production are not reliable. Instead, we compare performance to prior versions of the product, and based on how that performed in production we have some idea whether this might be similar in performance or whether there is some undetected issue that appears under load, such as inefficient or too many DB queries per page.
+
+## Testing Environment
+
+To run performance tests, we have a performance test cluster on AWS that employs web, database, and Solr. The database contains a copy of production that is updated weekly on Sundays. To ensure the homepage content is consistent between test runs across releases, two scripts set the datasets that will appear on the homepage. There is a script on the web server in the default CentOS user dir and one on the database server in the default CentOS user dir. Run these scripts before conducting the tests. 
+
+Once the performance has been tested and recorded in a [Google spreadsheet](https://docs.google.com/spreadsheets/d/1lwPlifvgu3-X_6xLwq6Zr6sCOervr1mV_InHIWjh5KA/edit?usp=sharing) for this proposed version, the release will be prepared and posted.
+
+## Access
+
+Access to performance cluster instances requires ssh keys. The cluster itself is normally not running to reduce costs. To turn on the cluster, log on to the demo server and run the perfenv scripts from the centos default user dir.
+
+## Special Notes ⚠ī¸ 
+
+Please note the performance database is also used occasionally by members of the Curation team to generate prod reports so a courtesy check with them would be good before taking over the env.
+
+
+Executing the Performance Script
+--------------------------------
+To execute the performance test script, you need to install a local copy of the database-helper-scripts project at <https://github.com/IQSS/dataverse-helper-scripts>. We have since produced a stripped-down script that calls just the collection and dataset pages and works with Python 3.
diff --git a/doc/sphinx-guides/source/qa/qa-workflow.md b/doc/sphinx-guides/source/qa/qa-workflow.md
new file mode 100644
index 00000000000..af462653dca
--- /dev/null
+++ b/doc/sphinx-guides/source/qa/qa-workflow.md
@@ -0,0 +1,104 @@
+# QA Workflow for Pull Requests
+
+```{contents} Contents:
+:local: 
+:depth: 3
+```
+## Checklist
+
+1. Assign the PR you are working on to yourself.
+
+1. What does it do?
+
+    Read the description at the top of the PR, any release notes, documentation, and the original issue.
+
+1. Does it address the issue it closes? 
+
+    The PR should address the issue entirely unless otherwise noted.
+
+1. How do you test it?
+    
+    Look at the “how to test" section at the top of the pull request. Does it make sense? This likely won’t be the only testing you perform. You can develop further tests from the original issue or problem description, from the description of functionality, the documentation, configuration, and release notes. Also consider trying to reveal bugs by trying to break it: try bad or missing data, very large values or volume of data, exceed any place that may have a limit or boundary.
+
+1. Does it have or need documentation?
+
+    Small changes or fixes usually don’t have docs but new features or extensions of a feature or new configuration options should have documentation.
+
+1. Does it have or need a release note snippet?
+
+    Same as for doc, just a heads up to an admin for something of note or especially upgrade instructions as needed. See also {ref}`writing-release-note-snippets` for what to expect in a release note snippet.
+
+1. Does it include a database migration script (Flyway)?
+    
+    First, check the numbering in the filename of the script. It must be in line with the rules defined at {ref}`create-sql-script`. If the number is out of date (very common for older pull requests), do not merge and ask the developer to rename the script. Otherwise, deployment will fail.
+
+    Once you're sure the numbering is ok (the next available number, basically), back up your database and proceeed with testing.
+
+1. Validate the documentation.
+
+    Build the doc using Jenkins or read the automated Read the Docs preview. Does it build without errors?
+    Read it through for sense.
+    Use it for test cases and to understand the feature.
+
+1. Build and deploy the pull request.
+
+    Normally this is done using Jenkins and automatically deployed to the QA test machine. See {ref}`deploy-to-internal`.
+
+1. Configure if required
+
+    If needed to operate and everyone installing or upgrading will use this, configure now as all testing will use it.
+
+1. Smoke test the branch.
+    
+    Standard, minimal test of core functionality.
+
+1. Regression test-related or potentially affected features
+
+    If config is optional and testing without config turned on, do some spot checks/ regression tests of related or potentially affected areas. 
+
+1. Configure if optional
+
+    What is the default, enabled or disabled? Is that clearly indicated? Test both.
+    By config here we mean enabling the functionality versus choosing a particular config option. Some complex features have config options in addition to enabling. Those will also need to be tested.
+
+1. Test all the new or changed functionality.
+
+    The heart of the PR, what is this PR adding or fixing? Is it all there and working?
+
+1. Regression test related or potentially affected features.
+    
+    Sometimes new stuff modifies and extends other functionality or functionality that is shared with other aspects of the system, e.g. export, import. Check the underlying functionality that was also modified but in a spot check or briefer manner.
+
+1. Report any issues found within the PR
+
+    It can be easy to lose track of what you’ve found, steps to reproduce, and any errors or stack traces from the server log. Add these in a numbered list to a comment in the pr. Easier to check off when fixed and to work on. Add large amounts of text as in the server log as attached, meaningfully named files.
+
+1. Retest all fixes, spot check feature functionality, smoke test
+    
+    Similar to your initial testing, it is only narrower.
+
+1. Test upgrade instructions, if required
+
+    Some features build upon the existing architecture but require modifications, such as adding a new column to the DB or changing or adding data. It is crucial that this works properly for our 100+ installations. This testing should be performed at the least on the prior version with basic data objects (collection, dataset, files) and any other data that will be updated by this feature. Using the sample data from the prior version would be good or deploying to dataverse-internal and upgrading there would be a good test. Remember to back up your DB before doing a transformative upgrade so that you can repeat it later if you find a bug.
+
+1. Make sure the API tests in the PR have been completed and passed.
+   
+    They are run with each commit to the PR and take approximately 42 minutes to run.
+
+1. Merge PR
+    
+    Click the "Merge pull request" button and be sure to use the "Create a merge commit" option to include this PR into the common develop branch.
+
+    Some of the reasons why we encourage using this option over Rebase or Squash are:
+
+    - Preservation of commit history
+    - Clearer context and treaceability
+    - Easier collaboration, bug tracking and reverting
+
+1. Delete merged branch
+    
+    Just a housekeeping move if the PR is from IQSS. Click the delete branch button where the merge button had been. There is no deletion for outside contributions.
+
+1. Ensure that deployment to beta.dataverse.org succeeded.
+
+    Go to <https://github.com/IQSS/dataverse/actions/workflows/deploy_beta_testing.yml> to keep any eye on the deployment to <https://beta.dataverse.org> to make sure it succeeded. The latest commit will appear at the bottom right and <https://beta.dataverse.org/api/info/version>.  
diff --git a/doc/sphinx-guides/source/qa/test-automation.md b/doc/sphinx-guides/source/qa/test-automation.md
new file mode 100644
index 00000000000..fa995bcaafd
--- /dev/null
+++ b/doc/sphinx-guides/source/qa/test-automation.md
@@ -0,0 +1,62 @@
+# Test Automation
+```{contents} Contents:
+:local: 
+:depth: 3
+```
+
+## Jenkins
+
+Jenkins is our primary tool for knowing if our API tests are passing. (Unit tests are executed locally by developers.)
+
+You can find our Jenkins installation at <https://jenkins.dataverse.org>.
+
+Please note that while it has been open to the public in the past, it is currently firewalled off. We can poke a hole in the firewall for your IP address if necessary. Please get in touch. (You might also be interested in <https://github.com/IQSS/dataverse/issues/9916> which is about restoring the ability of contributors to see if their pull requests are passing API tests or not.)
+
+### Jenkins Jobs
+
+Jenkins is organized into jobs. We'll highlight a few.
+
+#### IQSS-dataverse-develop
+
+<https://jenkins.dataverse.org/job/IQSS-dataverse-develop>, which we will refer to as the "develop" job, runs after pull requests are merged. It is crucial that this job stays green (passing) because we always want to stay in a "release ready" state. If you notice that this job is failing, make noise about it!
+
+You can access this job from the README at <https://github.com/IQSS/dataverse>.
+
+#### IQSS-Dataverse-Develop-PR
+
+<https://jenkins.dataverse.org/job/IQSS-Dataverse-Develop-PR/> can be thought of as "PR jobs". It's a collection of jobs run on pull requests. Typically, you will navigate directly into the job (and it's particular build number) from a pull request. For example, from <https://github.com/IQSS/dataverse/pull/10044>, look for a check called "continuous-integration/jenkins/pr-merge". Clicking it will bring you to a particular build like <https://jenkins.dataverse.org/blue/organizations/jenkins/IQSS-Dataverse-Develop-PR/detail/PR-10044/10/pipeline> (build #10).
+
+#### guides.dataverse.org
+
+<https://jenkins.dataverse.org/job/guides.dataverse.org/> is what we use to build guides. See {ref}`build-guides` in the Developer Guide for how this job is used at release time.
+
+### Checking if API Tests are Passing on Jenkins
+
+If API tests are failing, you should not merge the pull request.
+
+How can you know if API tests are passing? Here are the steps, by way of example.
+
+- From the pull request, navigate to the build. For example from <https://github.com/IQSS/dataverse/pull/10044>, look for a check called "continuous-integration/jenkins/pr-merge". Clicking it will bring you to a particular build like <https://jenkins.dataverse.org/blue/organizations/jenkins/IQSS-Dataverse-Develop-PR/detail/PR-10044/10/pipeline> (build #10).
+- You are now on the new "blue" interface for Jenkins. Click the button with an arrow on the right side of the header called "go to classic" which should take you to (for example) <https://jenkins.dataverse.org/job/IQSS-Dataverse-Develop-PR/job/PR-10044/10/>.
+- Click "Test Result".
+- Under "All Tests", look at the duration for "edu.harvard.iq.dataverse.api". It should be ten minutes or higher. If it was only a few seconds, tests did not run.
+- Assuming tests ran, if there were failures, they should appear at the top under "All Failed Tests". Inform the author of the pull request about the error.
+
+### Diagnosing Failures on Jenkins
+
+API test failures can have multiple causes. As described above, from the "Test Result" page, you might see the failure under "All Failed Tests". However, the test could have failed because of some underlying system issue.
+
+If you have determined that the API tests have not run at all, your next step should be to click on "Console Output". For example, <https://jenkins.dataverse.org/job/IQSS-Dataverse-Develop-PR/job/PR-10109/26/console>. Click "Full log" to see the full log in the browser or navigate to <https://jenkins.dataverse.org/job/IQSS-Dataverse-Develop-PR/job/PR-10109/26/consoleText> (for example) to get a plain text version.
+
+Go to the end of the log and then scroll up, looking for the failure. A failed Ansible task can look like this:
+
+```
+TASK [dataverse : download payara zip] *****************************************
+fatal: [localhost]: FAILED! => {"changed": false, "dest": "/tmp/payara.zip", "elapsed": 10, "msg": "Request failed: <urlopen error timed out>", "url": "https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.3/payara-6.2025.3.zip"}
+```
+
+In the example above, if Payara can't be downloaded, we're obviously going to have problems deploying Dataverse to it!
+
+## GitHub Actions
+
+We also use GitHub Actions. See <https://github.com/IQSS/dataverse/tree/develop/.github/workflows> for a list of actions.
diff --git a/doc/sphinx-guides/source/qa/testing-approach.md b/doc/sphinx-guides/source/qa/testing-approach.md
new file mode 100644
index 00000000000..817161d02a0
--- /dev/null
+++ b/doc/sphinx-guides/source/qa/testing-approach.md
@@ -0,0 +1,50 @@
+# Testing Approach
+
+```{contents} Contents:
+:local: 
+:depth: 3
+```
+## Introduction
+
+We use a risk-based, manual testing approach to achieve the most benefit with limited resources. This means we want to catch bugs where they are likely to exist, ensure core functions work, and failures do not have catastrophic results. In practice this means we do a brief positive check of core functions on each build called a smoke test, we test the most likely place for new bugs to exist, the area where things have changed, and attempt to prevent catastrophic failure by asking about the scope and reach of the code and how failures may occur. 
+
+If it seems possible through user error or some other occurrence that such a serious failure will occur, we try to make it happen in the test environment. If the code has a UI component, we also do a limited amount of browser compatibility testing using Chrome, Firefox, and Safari browsers. We do not currently do UX or accessibility testing on a regular basis, though both have been done product-wide by a Design group (in the past) and by the community.
+
+## Examining a Pull Request for Test Cases
+
+### What Problem Does It Solve?
+
+Read the top part of the pull request for a description, notes for reviewers, and usually a "how to test" section. Does it make sense? If not, read the underlying issue it closes and any release notes or documentation. Knowing in general what it does helps you to think about how to approach it.
+
+### How is It Configured?
+ 
+Most pull requests do not have any special configuration and are enabled on deployment, but some do. Configuration is part of testing. A sysadmin or superuser will need to follow these instructions so make sure they are in the release note snippet and try them out. Plus, that is the only way you will get it working to test it! 
+
+Identify test cases by examining the problem report or feature description and any documentation of functionality. Look for statements or assertions about functions, what it does, as well as conditions or conditional behavior. These become your test cases. Think about how someone might make a mistake using it and try it. Does it fail gracefully or in a confusing, or worse, damaging manner? Also, consider whether this pull request may interact with other functionality and try some spot checks there. For instance, if new metadata fields have been added, try the export feature. Of course, try the suggestions under "how to test." Those may be sufficient, but you should always think about the pull request based on what it does.
+
+Try adding, modifying, and deleting any objects involved. This is probably covered by using the feature, but this is a good basic approach to keep in mind.
+
+Make sure any server logging is appropriate. You should tail the server log while running your tests. Watch for unreported errors or stack traces especially chatty logging. If you do find a bug you will need to report the stack trace from the server.log. Err on the side of providing the developer too much of server.log rather than too little.
+
+Exercise the UI if there is one. We tend to use Chrome for most of our basic testing as it's used twice as much as the next most commonly-used browser, according to our site's Google Analytics. First go through all the options in the UI. Then, if all works, spot-check using Firefox and Safari.
+
+Check permissions. Is this feature limited to a specific set of users? Can it be accessed by a guest or by a non-privileged user? How about pasting a privileged page URL into a non-privileged user’s browser?
+
+Think about risk. Is the feature or function part of a critical area such as permissions? Does the functionality modify data? You may do more testing when the risk is higher.
+
+## Smoke Test
+
+1. Go to the homepage on <https://dataverse-internal.iq.harvard.edu>. Scroll to the bottom to ensure the build number is the one you intend to test from Jenkins.
+1. Create a new user: It's fine to use a formulaic name with your initials and date and make the username and password the same, eg. kc080622.
+1. Create a dataverse: You can use the same username.
+1. Create a dataset: You can use the same username; fill in the required fields (do not use a template).
+1. Upload 3 different types of files: You can use a tabular file, 50by1000.dta, an image file, and a text file.
+1. Publish the dataset.
+1. Download a file.
+
+
+## Alternative Deployment and Testing
+
+This workflow is fine for a single person testing a PR, one at a time. It would be awkward or impossible if there were multiple people wanting to test different PRs at the same time. If a developer is testing, they would likely just deploy to their dev environment. That might be ok, but is the env is fully configured enough to offer a real-world testing scenario? 
+
+An alternative might be to spin an EC2 branch on AWS, potentially using sample data. This can take some time so another option might be to spin up a few, persistent AWS instances with sample data this way, one per tester, and just deploy new builds there when you want to test. You could even configure Jenkins projects for each if desired to maintain consistency in how they’re built.
diff --git a/doc/sphinx-guides/source/qa/testing-infrastructure.md b/doc/sphinx-guides/source/qa/testing-infrastructure.md
new file mode 100644
index 00000000000..7f7f7c17063
--- /dev/null
+++ b/doc/sphinx-guides/source/qa/testing-infrastructure.md
@@ -0,0 +1,48 @@
+# Infrastructure for Testing
+
+```{contents} Contents:
+:local: 
+:depth: 3
+```
+
+## Dataverse Internal
+
+To build and test a PR, we use a job called `IQSS_Dataverse_Internal` on <https://jenkins.dataverse.org> (see {doc}`test-automation`), which deploys the .war file to an AWS instance named <https://dataverse-internal.iq.harvard.edu>.
+
+(deploy-to-internal)=
+### Building and Deploying a Pull Request from Jenkins to Dataverse-Internal
+
+1. Go to the QA column on our [project board](https://github.com/orgs/IQSS/projects/34), and select a pull request to test.
+
+1. From the pull request page, click the copy icon next to the pull request branch name.
+
+1. Log on to <https://jenkins.dataverse.org>, select the `IQSS_Dataverse_Internal` project, and configure the repository URL and branch specifier to match the ones from the pull request. For example:
+
+    * 8372-gdcc-xoai-library has IQSS implied
+        - **Repository URL:** https://github.com/IQSS/dataverse.git
+        - **Branch specifier:** */8372-gdcc-xoai-library
+    * GlobalDataverseCommunityConsortium:GDCC/DC-3B
+        - **Repository URL:** https://github.com/GlobalDataverseCommunityConsortium/dataverse.git
+        - **Branch specifier:** */GDCC/DC-3B.
+
+1. Click "Build Now" and note the build number in progress.
+
+1. Once complete, go to <https://dataverse-internal.iq.harvard.edu> and check that the deployment succeeded, and that the homepage displays the latest build number.
+
+1. If for some reason it didn't deploy, check the server.log file. It may just be a caching issue so try un-deploying, deleting cache, restarting, and re-deploying on the server (`su - dataverse` then `/usr/local/payara6/bin/asadmin list-applications; /usr/local/payara6/bin/asadmin undeploy dataverse-6.1; /usr/local/payara6/bin/asadmin deploy /tmp/dataverse-6.1.war`)
+
+1. When a Jenkins job fails after a release, it might be due to the version number in the `pom.xml` file not being updated in the pull request (PR). To verify this, open the relevant GitHub issue, navigate to the PR branch, and go to `dataverse > modules > dataverse-parent > pom.xml`. Look for the version number, typically shown as `<revision>6.3</revision>`, and ensure it matches the current Dataverse build version. If it doesn't match, ask the developer to update the branch with the latest from the "develop" branch.
+
+1. If that didn't work, you may have run into a Flyway DB script collision error but that should be indicated by the server.log. See {doc}`/developers/sql-upgrade-scripts` in the Developer Guide. In the case of a collision, ask the developer to rename the script.
+
+1.	Assuming the above steps worked, and they should 99% of the time, test away! Note: be sure to `tail -F server.log` in a terminal window while you are doing any testing. This way you can spot problems that may not appear in the UI and have easier access to any stack traces for easier reporting.
+
+## Guides Server
+
+There is also a guides job called `guides.dataverse.org` (see {doc}`test-automation`). Any test builds of guides are deployed to a named directory on guides.dataverse.org and can be found and tested by going to the existing guides, removing the part of the URL that contains the version, and browsing the resulting directory listing for the latest change. 
+
+Note that changes to guides can also be previewed on Read the Docs. In the pull request, look for a link like <https://dataverse-guide--10103.org.readthedocs.build/en/10103/qa/index.html>. This Read the Docs preview is also mentioned under also {doc}`/contributor/documentation`.
+
+## Other Servers
+
+We can spin up additional AWS EC2 instances as needed. See {doc}`/developers/deployment` in the Developer Guide for the scripts we use.
diff --git a/doc/sphinx-guides/source/style/foundations.rst b/doc/sphinx-guides/source/style/foundations.rst
index 0f96ca28ee9..54e2a659e1f 100755
--- a/doc/sphinx-guides/source/style/foundations.rst
+++ b/doc/sphinx-guides/source/style/foundations.rst
@@ -9,7 +9,7 @@ Foundation elements are the very basic building blocks to create a page in Datav
 Grid Layout
 ===========
 
-`Bootstrap <http://getbootstrap.com/css/#grid>`__ provides a responsive, fluid, 12-column grid system that we use to organize our page layouts.
+`Bootstrap <https://getbootstrap.com/css/#grid>`__ provides a responsive, fluid, 12-column grid system that we use to organize our page layouts.
 
 We use the fixed-width ``.container`` class which provides responsive widths (i.e. auto, 750px, 970px or 1170px) based on media queries for the page layout, with a series of rows and columns for the content.
 
@@ -42,7 +42,7 @@ The grid layout uses ``.col-sm-*`` classes for horizontal groups of columns, ins
 Typography
 ==========
 
-The typeface, text size, and line-height are set in the `Bootstrap CSS <http://getbootstrap.com/css/#type>`__. We use Bootstrap's global default ``font-size`` of **14px**, with a ``line-height`` of **1.428**, which is applied to the ``<body>`` and all paragraphs.
+The typeface, text size, and line-height are set in the `Bootstrap CSS <https://getbootstrap.com/css/#type>`__. We use Bootstrap's global default ``font-size`` of **14px**, with a ``line-height`` of **1.428**, which is applied to the ``<body>`` and all paragraphs.
 
 .. code-block:: css
 
@@ -57,13 +57,13 @@ The typeface, text size, and line-height are set in the `Bootstrap CSS <http://g
 Color Palette
 =============
 
-The default color palette is set in the `Bootstrap CSS <http://getbootstrap.com/css/#less-variables-colors>`__. It provides the background, border, text and link colors used across the application.
+The default color palette is set in the `Bootstrap CSS <https://getbootstrap.com/css/#less-variables-colors>`__. It provides the background, border, text and link colors used across the application.
 
 
 Brand Colors
 ------------
 
-Dataverse uses a particular color palette to help users quickly and easily identify the different types of objects: dataverses, datasets, and files.
+The Dataverse Project uses a particular color palette to help users quickly and easily identify the different types of objects: Dataverse collections, datasets, and files.
 
 We use our brand color, a custom burnt orange ``{color:#C55B28;}``, which is set in our CSS stylesheet, "structure.css". There is also a set of blue "dataset" classes and grey "file" classes, used to help identify those objects when searching and navigating the application.
 
@@ -138,7 +138,7 @@ We use our brand color, a custom burnt orange ``{color:#C55B28;}``, which is set
 Text Colors
 -----------
 
-Text color is the default setting from `Bootstrap CSS <http://getbootstrap.com/css/#less-variables-scaffolding>`__.
+Text color is the default setting from `Bootstrap CSS <https://getbootstrap.com/css/#less-variables-scaffolding>`__.
 
 .. code-block:: css
 
@@ -163,7 +163,7 @@ Text color is the default setting from `Bootstrap CSS <http://getbootstrap.com/c
 Link Colors
 -----------
 
-Link color is the default setting from `Bootstrap CSS <http://getbootstrap.com/css/#less-variables-links>`__. The hover state color is set to 15% darker.
+Link color is the default setting from `Bootstrap CSS <https://getbootstrap.com/css/#less-variables-links>`__. The hover state color is set to 15% darker.
 
 **Please note**, there is a CSS override issue with the link color due to the use of both a Bootstrap stylesheet and a PrimeFaces stylesheet in the UI. We've added CSS such as ``.ui-widget-content a {color: #428BCA;}`` to our stylesheet to keep the link color consistent.
 
@@ -204,7 +204,7 @@ Link color is the default setting from `Bootstrap CSS <http://getbootstrap.com/c
 Contextual Classes
 ------------------
 
-Contextual classes from `Bootstrap CSS <http://getbootstrap.com/css/#helper-classes>`__ can be used to style background and text colors. Semantic colors include various colors assigned to meaningful contextual values. We convey meaning through color with a handful of emphasis utility classes.
+Contextual classes from `Bootstrap CSS <https://getbootstrap.com/css/#helper-classes>`__ can be used to style background and text colors. Semantic colors include various colors assigned to meaningful contextual values. We convey meaning through color with a handful of emphasis utility classes.
 
 .. raw:: html
 
@@ -254,12 +254,12 @@ Contextual classes from `Bootstrap CSS <http://getbootstrap.com/css/#helper-clas
 Icons
 =====
 
-We use various icons across the application, which we get from Bootstrap, FontCustom and Socicon. They appear in buttons, in message blocks or as default thumbnails for dataverses, datasets, and files.
+We use various icons across the application, which we get from Bootstrap, FontCustom and Socicon. They appear in buttons, in message blocks or as default thumbnails for Dataverse collections, datasets, and files.
 
 Bootstrap Glyphicons
 --------------------
 
-There are over 250 glyphs in font format from the Glyphicon Halflings set provided by `Bootstrap <http://getbootstrap.com/components/#glyphicons>`__. We utilize these mainly as icons inside of buttons and in message blocks.
+There are over 250 glyphs in font format from the Glyphicon Halflings set provided by `Bootstrap <https://getbootstrap.com/components/#glyphicons>`__. We utilize these mainly as icons inside of buttons and in message blocks.
 
 .. raw:: html
 
@@ -277,10 +277,12 @@ There are over 250 glyphs in font format from the Glyphicon Halflings set provid
    <span class="glyphicon glyphicon-user"></span>
    <span class="glyphicon glyphicon-lock"></span>
 
-FontCustom Icon Font
---------------------
+.. _style-guide-fontcustom:
+
+Font Custom Icon Font
+---------------------
 
-With the use of `FontCustom <https://github.com/FontCustom/fontcustom>`__ we were able to generate our own custom icon webfonts. We use these in the search result cards to help distinguish between dataverse, dataset and file results.
+With the use of `Font Custom <https://github.com/FontCustom/fontcustom>`__ we generate our own custom icon fonts. We use these in the search result cards to help distinguish between Dataverse collection, dataset and file results.
 
 .. raw:: html
 
@@ -298,27 +300,28 @@ With the use of `FontCustom <https://github.com/FontCustom/fontcustom>`__ we wer
    <span class="icon-dataset text-dataset"></span>
    <span class="icon-file text-file"></span>
 
+The :doc:`/developers/fontcustom` section of the Developer Guide explains how to update these custom icons.
 
 Socicon Icon Font 
 -----------------
 
-We use `Socicon <http://www.socicon.com>`__ for our custom social icons. In the footer we use icons for Twitter and Github. In our Share feature, we also use custom social icons to allow users to select from a list of social media channels.
+We use `Socicon <https://www.socicon.com>`__ for our custom social icons. In the footer we use icons for Twitter and Github. In our Share feature, we also use custom social icons to allow users to select from a list of social media channels.
 
 .. raw:: html
 
 	<div class="panel panel-default code-example">
 	  <div class="panel-body">
-      <span class="socicon socicon-github h1" title="Dataverse On GitHub"></span>
-      <span class="socicon socicon-twitter h1" title="Dataverse On Twitter"></span>
-      <span class="socicon socicon-facebook h1" title="Dataverse On Facebook"></span>
+      <span class="socicon socicon-github h1" title="Dataverse Project On GitHub"></span>
+      <span class="socicon socicon-twitter h1" title="Dataverse Project On Twitter"></span>
+      <span class="socicon socicon-facebook h1" title="Dataverse Project On Facebook"></span>
 	  </div>
 	</div>
 
 .. code-block:: html
 
-   <span class="socicon socicon-github" title="Dataverse On GitHub"></span>
-   <span class="socicon socicon-twitter" title="Dataverse On Twitter"></span>
-   <span class="socicon socicon-facebook" title="Dataverse On Facebook"></span>
+   <span class="socicon socicon-github" title="Dataverse Project On GitHub"></span>
+   <span class="socicon socicon-twitter" title="Dataverse Project On Twitter"></span>
+   <span class="socicon socicon-facebook" title="Dataverse Project On Facebook"></span>
 
 
 Logos
@@ -336,9 +339,9 @@ Create both print and web version of the Dataverse Project logo by downloading t
     </div>
   </div>
 
-The brand logo (below) was created as a custom icon to represent the concept of a "dataverse." It is used as the brand logo in the Bootstrap navbar component and across the application.
+The brand logo (below) was created as a custom icon to represent the concept of a Dataverse collection. It is used as the logo in the Bootstrap navbar component and across the application.
 
-Create both print and web version of the Dataverse brand logo by downloading this vector-based SVG file: :download:`Dataverse_brand_icon.svg <../_static/Dataverse_brand_icon.svg>`
+Create both print and web version of the Dataverse collection logo by downloading this vector-based SVG file: :download:`Dataverse_brand_icon.svg <../_static/Dataverse_brand_icon.svg>`
 
 .. raw:: html
 
@@ -350,3 +353,5 @@ Create both print and web version of the Dataverse brand logo by downloading thi
 
 .. |image1| image:: ./img/dataverse-icon.jpg
    :class: img-responsive
+
+Here is another vector-based SVG file with three rings: :download:`Dataverse_3ring-brand_icon_EqualSpace.svg <../_static/Dataverse_3ring-brand_icon_EqualSpace.svg>`
diff --git a/doc/sphinx-guides/source/style/index.rst b/doc/sphinx-guides/source/style/index.rst
index ba6995e1b53..65a9f0b2b55 100755
--- a/doc/sphinx-guides/source/style/index.rst
+++ b/doc/sphinx-guides/source/style/index.rst
@@ -11,6 +11,8 @@ This style guide is meant to help developers implement clear and appropriate UI
 **Contents:**
 
 .. toctree::
+   :maxdepth: 2
 
    foundations
    patterns
+   text
diff --git a/doc/sphinx-guides/source/style/patterns.rst b/doc/sphinx-guides/source/style/patterns.rst
index 377fb4e3495..c6602ffa26e 100644
--- a/doc/sphinx-guides/source/style/patterns.rst
+++ b/doc/sphinx-guides/source/style/patterns.rst
@@ -1,7 +1,7 @@
 Patterns
 ++++++++
 
-Patterns are what emerge when using the foundation elements together with basic objects like buttons and alerts, more complex Javascript components from `Bootstrap <http://getbootstrap.com/components/>`__ like tooltips and dropdowns, and AJAX components from `PrimeFaces <https://www.primefaces.org/showcase/>`__ like datatables and commandlinks.
+Patterns are what emerge when using the foundation elements together with basic objects like buttons and alerts, more complex Javascript components from `Bootstrap <https://getbootstrap.com/components/>`__ like tooltips and dropdowns, and AJAX components from `PrimeFaces <https://www.primefaces.org/showcase/>`__ like datatables and commandlinks.
 
 .. contents:: |toctitle|
   :local:
@@ -9,49 +9,47 @@ Patterns are what emerge when using the foundation elements together with basic
 Navbar
 ======
 
-The `Navbar component <http://getbootstrap.com/components/#navbar>`__ from Bootstrap spans the top of the application and contains the logo/branding, aligned to the left, plus search form and links, aligned to the right.
+The `Navbar component <https://getbootstrap.com/components/#navbar>`__ from Bootstrap spans the top of the application and contains the logo/branding, aligned to the left, plus search form and links, aligned to the right.
 
 When logged in, the account name is a dropdown menu, linking the user to account-specific content and the log out link.
 
 .. raw:: html
 
-	<div class="panel panel-default code-example">
-	  <div class="panel-body">
-	  	
-  		<nav id="navbarFixed" class="navbar navbar-default"><!-- navbar-fixed-top -->
-            <div class="container" style="width:auto !important;">
-                <div class="navbar-header">
-                    <a href="#" onclick="return false;">
-                        <span class="navbar-brand"><i id="icon-dataverse" class="icon-dataverse"></i> Dataverse</span>
-                    </a>
-                </div>
-                <div class="collapse navbar-collapse" id="topNavBar">
-                    <ul class="nav navbar-nav navbar-right">
-                        <li class="dropdown">
-                            <span id="dataverseSupportLink" class="dropdown-toggle" data-toggle="dropdown">
-                                User Name <b class="caret"></b>
-                            </span>
-                            <ul class="dropdown-menu">
-                                <li><a href="#" onclick="return false;">My Data</a>
-                                </li>
-                                <li><a href="#" onclick="return false;">Notifications</a>
-                                </li>
-                                <li><a href="#" onclick="return false;">Account Information</a>
-                                </li>
-                                <li><a href="#" onclick="return false;">API Token</a>
-                                </li>
-                                <li class="divider"></li>
-                                <li class="logout"><a href="#" onclick="return false;">Log Out</a>
-                                </li>
-                            </ul>
-                        </li>
-                    </ul>
+    <div class="panel panel-default code-example">
+        <div class="panel-body">
+            <nav id="navbarFixed" class="navbar navbar-default"><!-- navbar-fixed-top -->
+                <div class="container" style="width:auto !important;">
+                    <div class="navbar-header">
+                        <a href="#" onclick="return false;">
+                            <span class="navbar-brand"><i id="icon-dataverse" class="icon-dataverse"></i> Dataverse</span>
+                        </a>
+                    </div>
+                    <div class="collapse navbar-collapse" id="topNavBar">
+                        <ul class="nav navbar-nav navbar-right">
+                            <li class="dropdown">
+                                <span id="dataverseSupportLink" class="dropdown-toggle" data-toggle="dropdown">
+                                    User Name <b class="caret"></b>
+                                </span>
+                                <ul class="dropdown-menu">
+                                    <li><a href="#" onclick="return false;">My Data</a>
+                                    </li>
+                                    <li><a href="#" onclick="return false;">Notifications</a>
+                                    </li>
+                                    <li><a href="#" onclick="return false;">Account Information</a>
+                                    </li>
+                                    <li><a href="#" onclick="return false;">API Token</a>
+                                    </li>
+                                    <li class="divider"></li>
+                                    <li class="logout"><a href="#" onclick="return false;">Log Out</a>
+                                    </li>
+                                </ul>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
-            </div>
-        </nav>
-  		
-	  </div>
-	</div>
+            </nav>
+        </div>
+    </div>
 
 .. code-block:: html
 
@@ -76,35 +74,30 @@ When logged in, the account name is a dropdown menu, linking the user to account
 Breadcrumbs
 ===========
 
-The breadcrumbs are displayed under the header, and provide a trail of links for users to navigate the hierarchy of containing objects, from file to dataset to dataverse. It utilizes a JSF `repeat component <http://docs.oracle.com/javaee/6/javaserverfaces/2.0/docs/pdldocs/facelets/ui/repeat.html>`_ to iterate through the breadcrumbs.
+The breadcrumbs are displayed under the header, and provide a trail of links for users to navigate the hierarchy of containing objects, from file to dataset to Dataverse collection. It utilizes a JSF `repeat component <https://docs.oracle.com/javaee/6/javaserverfaces/2.0/docs/pdldocs/facelets/ui/repeat.html>`_ to iterate through the breadcrumbs.
 
 .. raw:: html
 
-	<div class="panel panel-default code-example">
-	  <div class="panel-body">
-	  	
-  		<div id="breadcrumbNavBlock" class="container">
-            <div class="breadcrumbBlock">
-                <a id="breadcrumbLnk0" href="#" onclick="return false;">Name of a Dataverse</a>
-            </div>
-            <span class="breadcrumbCarrot"> &gt; </span>
-            <div class="breadcrumbBlock">
-                <a id="breadcrumbLnk1" href="#" onclick="return false;">Name of Another Dataverse</a>
-            </div>
-            <span class="breadcrumbCarrot"> &gt; </span>
-            <div class="breadcrumbBlock">
-                <span class="breadcrumbActive">Title of Dataset</span>
+    <div class="panel panel-default code-example">
+	<div class="panel-body">
+            <div id="breadcrumbNavBlock" class="container" style="width:auto !important;">
+                <div class="breadcrumbBlock">
+                    <a id="breadcrumbLnk0" href="#" onclick="return false;">Name of a Dataverse collection</a>
+                </div>
+                <span class="breadcrumbCarrot"> &gt; </span>
+                <div class="breadcrumbBlock">
+                    <a id="breadcrumbLnk1" href="#" onclick="return false;">Name of Another Dataverse collection</a>
+                </div>
+                <span class="breadcrumbCarrot"> &gt; </span>
             </div>
-        </div>
-  		
-	  </div>
 	</div>
+    </div>
 
 .. code-block:: html
 
     <div id="breadcrumbNavBlock" class="container" jsf:rendered="#{true}">
       <ui:repeat value="#{page.breadcrumbs}" var="breadcrumb" varStatus="status">
-        <h:outputText value=" > " styleClass="breadcrumbCarrot" rendered="#{true}"/>
+        <h:outputText value=" &gt; " styleClass="breadcrumbCarrot" rendered="#{true}"/>
         <div class="breadcrumbBlock">
           ...
         </div>
@@ -115,68 +108,70 @@ The breadcrumbs are displayed under the header, and provide a trail of links for
 Tables
 ======
 
-Most tables use the `DataTable components <https://www.primefaces.org/showcase/ui/data/datatable/basic.xhtml>`__ from PrimeFaces and are styled using the `Tables component <http://getbootstrap.com/css/#tables>`__ from Bootstrap.
+Most tables use the `DataTable components <https://www.primefaces.org/showcase/ui/data/datatable/basic.xhtml>`__ from PrimeFaces and are styled using the `Tables component <https://getbootstrap.com/css/#tables>`__ from Bootstrap.
 
 .. raw:: html
 
   <div class="panel panel-default code-example">
     <div class="panel-body">
     	<div class="ui-datatable ui-widget">
-	      	<div class="ui-datatable-tablewrapper">
-	      		<table role="grid">
-	      			<thead>
-	      				<tr role="row">
-	      					<th style="width:60px;" class="ui-state-default ui-selection-column col-select-width text-center" role="columnheader"><span class="ui-column-title"></span><div class="ui-chkbox ui-chkbox-all ui-widget"><div class="ui-helper-hidden-accessible"><input type="checkbox" name="table_checkbox"></div><div class="ui-chkbox-box ui-widget ui-corner-all ui-state-default"><span class="ui-chkbox-icon ui-icon ui-icon-blank ui-c"></span></div></div></th><th class="ui-state-default col-sm-2 text-center" role="columnheader"><span class="ui-column-title">Dataset</span></th><th class="ui-state-default" role="columnheader"><span class="ui-column-title">Summary</span></th><th class="ui-state-default col-sm-3" role="columnheader"><span class="ui-column-title">Published</span></th>
-	  					</tr>
-					</thead>
-					<tbody class="ui-datatable-data ui-widget-content">
-						<tr data-ri="0" class="ui-widget-content ui-datatable-even ui-datatable-selectable" role="row" aria-selected="false">
-							<td role="gridcell" class="ui-selection-column col-select-width text-center">
-								<div class="ui-chkbox ui-widget"><div class="ui-helper-hidden-accessible"><input type="checkbox" name="table_checkbox"></div><div class="ui-chkbox-box ui-widget ui-corner-all ui-state-default"><span class="ui-chkbox-icon ui-icon ui-icon-blank ui-c"></span></div></div>
-							</td>
-							<td role="gridcell" class="text-center">
-		                    	<a href="#" class="ui-commandlink ui-widget" onclick="return false;">3.0</a>
-			                </td>
-			                <td role="gridcell">
-			                	<span class="highlightBold">Files (Changed File Metadata: 1); </span><a href="#" class="ui-commandlink ui-widget" onclick="return false;">View Details</a>
-			                </td>
-			                <td role="gridcell"><span>March 8, 2017</span></td>
-		                </tr>
-		                <tr data-ri="1" class="ui-widget-content ui-datatable-odd ui-datatable-selectable" role="row" aria-selected="false">
-		                    <td role="gridcell" class="ui-selection-column col-select-width text-center">
-		                    	<div class="ui-chkbox ui-widget"><div class="ui-helper-hidden-accessible"><input type="checkbox" name="table_checkbox"></div><div class="ui-chkbox-box ui-widget ui-corner-all ui-state-default"><span class="ui-chkbox-icon ui-icon ui-icon-blank ui-c"></span></div></div>
-		                    </td>
-		                    <td role="gridcell" class="text-center">
-		                    	<a href="#" class="ui-commandlink ui-widget" onclick="return false;">2.0</a>
-		                    </td>
-		                    <td role="gridcell">
-		                    	<span class="highlightBold">Additional Citation Metadata: </span> (1 Added); <a href="#" class="ui-commandlink ui-widget" onclick="return false;">View Details</a>
-		                	</td>
-		                	<td role="gridcell"><span>January 25, 2017</span></td>
-		                </tr>
-		                <tr data-ri="2" class="ui-widget-content ui-datatable-even ui-datatable-selectable" role="row" aria-selected="false">
-		                	<td role="gridcell" class="ui-selection-column col-select-width text-center">
-		                		<div class="ui-chkbox ui-widget"><div class="ui-helper-hidden-accessible"><input type="checkbox" name="table_checkbox"></div><div class="ui-chkbox-box ui-widget ui-corner-all ui-state-default"><span class="ui-chkbox-icon ui-icon ui-icon-blank ui-c"></span></div></div>
-			                </td>
-			                <td role="gridcell" class="text-center">
-			                    <a href="#" class="ui-commandlink ui-widget" onclick="return false;">1.1</a></td><td role="gridcell"><span class="highlightBold">Additional Citation Metadata: </span> (1 Added); <a href="#" class="ui-commandlink ui-widget" onclick="return false;">View Details</a>
-			                </td>
-			                <td role="gridcell"><span>October 25, 2016</span></td>
-		                </tr>
-		                <tr data-ri="3" class="ui-widget-content ui-datatable-odd ui-datatable-selectable" role="row" aria-selected="false">
-		                	<td role="gridcell" class="ui-selection-column col-select-width text-center">
-		                		<div class="ui-chkbox ui-widget"><div class="ui-helper-hidden-accessible"><input type="checkbox" name="table_checkbox"></div><div class="ui-chkbox-box ui-widget ui-corner-all ui-state-default"><span class="ui-chkbox-icon ui-icon ui-icon-blank ui-c"></span></div></div>
-			                </td>
-			                <td role="gridcell" class="text-center">
-			                    <a href="#" class="ui-commandlink ui-widget" onclick="return false;">1.0</a></td><td role="gridcell">
-			                    This is the first published version.
-			                </td>
-			                <td role="gridcell"><span>September 19, 2016</span></td>
-		                </tr>
-		            </tbody>
-		        </table>
-		    </div>
-		</div>
+            <div class="ui-datatable-tablewrapper">
+                <table role="grid">
+                    <thead>
+                        <tr role="row">
+                            <th style="width:60px;" class="ui-state-default ui-selection-column col-select-width text-center" role="columnheader"><span class="ui-column-title"></span><div class="ui-chkbox ui-chkbox-all ui-widget"><div class="ui-helper-hidden-accessible"><input type="checkbox" name="table_checkbox"></div><div class="ui-chkbox-box ui-widget ui-corner-all ui-state-default"><span class="ui-chkbox-icon ui-icon ui-icon-blank ui-c"></span></div></div></th><th class="ui-state-default col-sm-2 text-center" role="columnheader"><span class="ui-column-title">Dataset</span></th><th class="ui-state-default" role="columnheader"><span class="ui-column-title">Summary</span></th><th class="ui-state-default col-sm-3" role="columnheader"><span class="ui-column-title">Published</span></th>
+                        </tr>
+                    </thead>
+                    <tbody class="ui-datatable-data ui-widget-content">
+                        <tr data-ri="0" class="ui-widget-content ui-datatable-even ui-datatable-selectable" role="row" aria-selected="false">
+                            <td role="gridcell" class="ui-selection-column col-select-width text-center">
+                                <div class="ui-chkbox ui-widget"><div class="ui-helper-hidden-accessible"><input type="checkbox" name="table_checkbox"></div><div class="ui-chkbox-box ui-widget ui-corner-all ui-state-default"><span class="ui-chkbox-icon ui-icon ui-icon-blank ui-c"></span></div></div>
+                            </td>
+                            <td role="gridcell" class="text-center">
+                                <a href="#" class="ui-commandlink ui-widget" onclick="return false;">3.0</a>
+                            </td>
+                            <td role="gridcell">
+                                <span class="highlightBold">Files (Changed File Metadata: 1); </span><a href="#" class="ui-commandlink ui-widget" onclick="return false;">View Details</a>
+                            </td>
+                            <td role="gridcell"><span>March 8, 2017</span></td>
+                        </tr>
+                        <tr data-ri="1" class="ui-widget-content ui-datatable-odd ui-datatable-selectable" role="row" aria-selected="false">
+                            <td role="gridcell" class="ui-selection-column col-select-width text-center">
+                                <div class="ui-chkbox ui-widget"><div class="ui-helper-hidden-accessible"><input type="checkbox" name="table_checkbox"></div><div class="ui-chkbox-box ui-widget ui-corner-all ui-state-default"><span class="ui-chkbox-icon ui-icon ui-icon-blank ui-c"></span></div></div>
+                            </td>
+                            <td role="gridcell" class="text-center">
+                                <a href="#" class="ui-commandlink ui-widget" onclick="return false;">2.0</a>
+                            </td>
+                            <td role="gridcell">
+                                <span class="highlightBold">Additional Citation Metadata: </span> (1 Added); <a href="#" class="ui-commandlink ui-widget" onclick="return false;">View Details</a>
+                            </td>
+                            <td role="gridcell"><span>January 25, 2017</span></td>
+                        </tr>
+                        <tr data-ri="2" class="ui-widget-content ui-datatable-even ui-datatable-selectable" role="row" aria-selected="false">
+                            <td role="gridcell" class="ui-selection-column col-select-width text-center">
+                                <div class="ui-chkbox ui-widget"><div class="ui-helper-hidden-accessible"><input type="checkbox" name="table_checkbox"></div><div class="ui-chkbox-box ui-widget ui-corner-all ui-state-default"><span class="ui-chkbox-icon ui-icon ui-icon-blank ui-c"></span></div></div>
+                            </td>
+                            <td role="gridcell" class="text-center">
+                                <a href="#" class="ui-commandlink ui-widget" onclick="return false;">1.1</a></td><td role="gridcell"><span class="highlightBold">Additional Citation Metadata: </span> (1 Added); <a href="#" class="ui-commandlink ui-widget" onclick="return false;">View Details</a>
+                            </td>
+                            <td role="gridcell"><span>October 25, 2016</span></td>
+                        </tr>
+                        <tr data-ri="3" class="ui-widget-content ui-datatable-odd ui-datatable-selectable" role="row" aria-selected="false">
+                            <td role="gridcell" class="ui-selection-column col-select-width text-center">
+                                <div class="ui-chkbox ui-widget"><div class="ui-helper-hidden-accessible"><input type="checkbox" name="table_checkbox"></div><div class="ui-chkbox-box ui-widget ui-corner-all ui-state-default"><span class="ui-chkbox-icon ui-icon ui-icon-blank ui-c"></span></div></div>
+                            </td>
+                            <td role="gridcell" class="text-center">
+                                <a href="#" class="ui-commandlink ui-widget" onclick="return false;">1.0</a>
+                            </td>
+                            <td role="gridcell">
+                                This is the first published version.
+                            </td>
+                            <td role="gridcell"><span>September 19, 2016</span></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
     </div>
   </div>
 
@@ -192,80 +187,77 @@ Most tables use the `DataTable components <https://www.primefaces.org/showcase/u
 Forms
 =====
 
-Forms fulfill various functions across the site, but we try to style them consistently. We use the ``.form-horizontal`` layout, which uses ``.form-group`` to create a grid of rows for the labels and inputs. The consistent style of forms is maintained using the `Forms component <http://getbootstrap.com/css/#forms>`__ from Bootstrap. Form elements like the `InputText component <https://www.primefaces.org/showcase/ui/input/inputText.xhtml>`__ from PrimeFaces are kept looking clean and consistent across each page.
+Forms fulfill various functions across the site, but we try to style them consistently. We use the ``.form-horizontal`` layout, which uses ``.form-group`` to create a grid of rows for the labels and inputs. The consistent style of forms is maintained using the `Forms component <https://getbootstrap.com/css/#forms>`__ from Bootstrap. Form elements like the `InputText component <https://www.primefaces.org/showcase/ui/input/inputText.xhtml>`__ from PrimeFaces are kept looking clean and consistent across each page.
 
 .. raw:: html
 
-  <div class="panel panel-default code-example">
-    <div class="panel-body">
-
-		      <div class="form-horizontal">
-			       <div class="form-group">
-                <label for="userNameEmail" class="col-sm-3 control-label">
-                    Username 
-                </label>
-                <div class="col-sm-4">
-                	<input name="userName" type="text" value="" tabindex="1" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all ui-state-default form-control" role="textbox" aria-disabled="false" aria-readonly="false">
+    <div class="panel panel-default code-example">
+        <div class="panel-body">
+            <div class="form-horizontal">
+                <div class="form-group">
+                    <label for="userNameEmail" class="col-sm-3 control-label">
+                        Username 
+                    </label>
+                    <div class="col-sm-4">
+                        <input name="userName" type="text" value="" tabindex="1" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all ui-state-default form-control" role="textbox" aria-disabled="false" aria-readonly="false">
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label for="email" class="col-sm-3 control-label">
-                    Email 
-                </label>
-                <div class="col-sm-4">
-                	<input name="email" type="text" value="" tabindex="6" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all form-control" role="textbox" aria-disabled="false" aria-readonly="false">
+                <div class="form-group">
+                    <label for="email" class="col-sm-3 control-label">
+                        Email 
+                    </label>
+                    <div class="col-sm-4">
+                        <input name="email" type="text" value="" tabindex="6" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all form-control" role="textbox" aria-disabled="false" aria-readonly="false">
+                    </div>
                 </div>
             </div>
         </div>
-
     </div>
-  </div>
 
 .. code-block:: html
 
-  <div class="form-horizontal">
-    <div class="form-group">
-      <label for="userNameEmail" class="col-sm-3 control-label">
-        #{bundle['user.username']} 
-      </label>
-      <div class="col-sm-4">
-        <p:inputText id="userName" styleClass="form-control"></p>
+    <div class="form-horizontal">
+      <div class="form-group">
+        <label for="userNameEmail" class="col-sm-3 control-label">
+          #{bundle['user.username']} 
+        </label>
+        <div class="col-sm-4">
+          <p:inputText id="userName" styleClass="form-control"></p>
+        </div>
       </div>
     </div>
-  </div>
 
 Here are additional form elements that are common across many pages, including required asterisks, icon tooltips, placeholder text, input info message with popover link, and validation error message.
 
 .. raw:: html
 
-  <div class="panel panel-default code-example">
-    <div class="panel-body">
-
-      <div class="form-group form-col-container col-sm-9 edit-compound-field">
-          <div class="form-col-container col-sm-12">
-              <p class="help-block">
-                  This field supports only certain <span class="text-info popoverHTML">HTML tags</span>.
-              </p>
-              <label class="control-label" for="metadata_dsDescriptionValue">
-                  Text <span class="glyphicon glyphicon-asterisk text-danger"></span>
-                  <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto right" data-original-title="A summary describing the purpose, nature, and scope of the Dataset."></span>
-              </label>
-              <div>
-                  <textarea id="datasetForm:description" name="datasetForm:description" cols="60" rows="5" tabindex="1" maxlength="2147483647" class="ui-inputfield ui-inputtextarea ui-widget ui-state-default ui-corner-all form-control ui-inputtextarea-resizable" role="textbox" aria-disabled="false" aria-readonly="false" aria-multiline="true" data-autosize-on="true" placeholder="" style="overflow: hidden; word-wrap: break-word; height: 114px;"></textarea>
-                  
-                  <div aria-live="polite" class="ui-message ui-message-error ui-widget ui-corner-all">
-                      <span class="ui-message-error-detail">Description Text is required.</span>
-                  </div>
-              </div>
-          </div>
-          <div class="form-col-container col-sm-6">
-               <label class="control-label" for="metadata_dsDescriptionDate">
+    <div class="panel panel-default code-example">
+        <div class="panel-body">
+            <div class="form-group form-col-container col-sm-9 edit-compound-field">
+                <div class="form-col-container col-sm-12">
+                    <p class="help-block">
+                        This field supports only certain <span class="text-info popoverHTML">HTML tags</span>.
+                    </p>
+                    <label class="control-label" for="metadata_dsDescriptionValue">
+                        Text <span class="glyphicon glyphicon-asterisk text-danger"></span>
+                        <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto right" data-original-title="A summary describing the purpose, nature, and scope of the Dataset."></span>
+                    </label>
+                    <div>
+                        <textarea id="datasetForm:description" name="datasetForm:description" cols="60" rows="5" tabindex="1" maxlength="2147483647" class="ui-inputfield ui-inputtextarea ui-widget ui-state-default ui-corner-all form-control ui-inputtextarea-resizable" role="textbox" aria-disabled="false" aria-readonly="false" aria-multiline="true" data-autosize-on="true" placeholder="" style="overflow: hidden; word-wrap: break-word; height: 114px;"></textarea>
+                        <div aria-live="polite" class="ui-message ui-message-error ui-widget ui-corner-all">
+                            <span class="ui-message-error-detail">Description Text is required.</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="form-col-container col-sm-6">
+                <label class="control-label" for="metadata_dsDescriptionDate">
                    Date
                    <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto right" data-original-title="In cases where a Dataset contains more than one description (for example, one might be supplied by the data producer and another prepared by the data repository where the data are deposited), the date attribute is used to distinguish between the two descriptions. The date attribute follows the ISO convention of YYYY-MM-DD."></span>
-              </label>
-              <div>
-                <input id="datasetForm:inputText" name="datasetForm:inputText" type="text" tabindex="1" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all form-control " role="textbox" aria-disabled="false" aria-readonly="false" placeholder="YYYY-MM-DD">
-              </div>
+                </label>
+                <div>
+                    <input id="datasetForm:inputText" name="datasetForm:inputText" type="text" tabindex="1" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all form-control " role="textbox" aria-disabled="false" aria-readonly="false" placeholder="YYYY-MM-DD">
+                </div>
             </div>
         </div>
     </div>
@@ -273,80 +265,78 @@ Here are additional form elements that are common across many pages, including r
 .. code-block:: html
 
   <div class="form-group form-col-container col-sm-9 edit-compound-field">
-      <div class="form-col-container col-sm-12">
-          <p class="help-block">
-              <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
-                  <f:param value="#{bundle.htmlAllowedTags}"/>
-              </h:outputFormat>
-          </p>
-          <label class="control-label" for="metadata_#{subdsf.datasetFieldType.name}">
-              #{subdsf.datasetFieldType.localeTitle}
-              <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" />
-              <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto right" data-original-title="#{subdsf.datasetFieldType.localeDescription}"></span>
-          </label>
-          <div>
-              <p:inputTextarea value="#{dsfv.valueForEdit}" id="description" tabindex="#{block.index+1}" rows="5" cols="60" styleClass="form-control" />
-              <div class="alert-danger" jsf:rendered="#{!empty subdsf.validationMessage}">
-                  <strong>#{subdsf.validationMessage}</strong>
-              </div>
-          </div>
+    <div class="form-col-container col-sm-12">
+      <p class="help-block">
+        <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
+          <f:param value="#{bundle.htmlAllowedTags}"/>
+        </h:outputFormat>
+      </p>
+      <label class="control-label" for="metadata_#{subdsf.datasetFieldType.name}">
+        #{subdsf.datasetFieldType.localeTitle}
+        <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" />
+        <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto right" data-original-title="#{subdsf.datasetFieldType.localeDescription}"></span>
+      </label>
+      <div>
+        <p:inputTextarea value="#{dsfv.valueForEdit}" id="description" tabindex="#{block.index+1}" rows="5" cols="60" styleClass="form-control" />
+        <div class="alert-danger" jsf:rendered="#{!empty subdsf.validationMessage}">
+            <strong>#{subdsf.validationMessage}</strong>
+        </div>
       </div>
+    </div>
   </div>
 
 
 Buttons
 =======
 
-There are various types of buttons for various actions, so we have many components to use, including the `CommandButton component <https://www.primefaces.org/showcase/ui/button/commandButton.xhtml>`__ and `CommandLink component <https://www.primefaces.org/showcase/ui/button/commandLink.xhtml>`__ from PrimeFaces, as well as the basic JSF `Link component <http://docs.oracle.com/javaee/6/javaserverfaces/2.0/docs/pdldocs/facelets/h/link.html>`__ and `OutputLink component <http://docs.oracle.com/javaee/6/javaserverfaces/2.0/docs/pdldocs/facelets/h/outputLink.html>`__. Those are styled using the `Buttons component <http://getbootstrap.com/css/#buttons>`__, `Button Groups component <http://getbootstrap.com/components/#btn-groups>`__ and `Buttons Dropdowns component <http://getbootstrap.com/components/#btn-dropdowns>`__ from Bootstrap.
+There are various types of buttons for various actions, so we have many components to use, including the `CommandButton component <https://www.primefaces.org/showcase/ui/button/commandButton.xhtml>`__ and `CommandLink component <https://www.primefaces.org/showcase/ui/button/commandLink.xhtml>`__ from PrimeFaces, as well as the basic JSF `Link component <https://docs.oracle.com/javaee/6/javaserverfaces/2.0/docs/pdldocs/facelets/h/link.html>`__ and `OutputLink component <https://docs.oracle.com/javaee/6/javaserverfaces/2.0/docs/pdldocs/facelets/h/outputLink.html>`__. Those are styled using the `Buttons component <https://getbootstrap.com/css/#buttons>`__, `Button Groups component <https://getbootstrap.com/components/#btn-groups>`__ and `Buttons Dropdowns component <https://getbootstrap.com/components/#btn-dropdowns>`__ from Bootstrap.
 
 Action Buttons
 --------------
 
-For action buttons on a page, we include an icon and text label. Action buttons are generally aligned to the right side of the page.
+For action buttons on a page, we include an icon and text label.
 
 .. raw:: html
 
 	<div class="panel panel-default code-example">
 	  <div class="panel-body">
-	  	
-	  	<div class="btn-group pull-right">
-            <button type="button" id="editDataSet" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
-                <span class="glyphicon glyphicon-pencil"></span> Edit <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu pull-right text-left" role="menu">
-                <li>
-                	<a href="#" onclick="return false;">Files (Upload)</a>
-                </li>
-                <li>
-                	<a id="datasetForm:editMetadata" href="#" class="ui-commandlink ui-widget" onclick="return false;">Metadata</a>
-                </li>
-                <li>
-                	<a id="datasetForm:editTerms" href="#" class="ui-commandlink ui-widget" onclick="return false;">Terms</a>
-                </li>
-                <li class="dropdown-submenu pull-left">
-                    <a tabindex="-1" href="#">Permissions</a>
-                    <ul class="dropdown-menu">
-                        <li>
-                        	<a id="datasetForm:managePermissions" href="#" onclick="return false;" class="ui-commandlink ui-widget">Dataset</a>
-                        </li>
-                        <li>
-                        	<a id="datasetForm:manageFilePermissions" href="#" onclick="return false;" class="ui-commandlink ui-widget">File</a>
-                        </li>
-                    </ul>
-                </li>
-                <li>
-                	<a id="datasetForm:privateUrl" href="#" class="ui-commandlink ui-widget" onclick="return false;">Private URL</a>
-                </li>
-                <li>
-                	<a href="#" onclick="return false;">Thumbnails + Widgets</a>
-                </li>
-                <li class="divider"></li>
-                <li>
-                	<a id="datasetForm:deaccessionDatasetLink" href="#" class="ui-commandlink ui-widget" onclick="return false;">Deaccession Dataset</a>
-                </li>
-            </ul>
-        </div>
-
+	    <div class="btn-group">
+                <button type="button" id="editDataSet" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
+                    <span class="glyphicon glyphicon-pencil"></span> Edit <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu text-left">
+                    <li>
+                        <a href="#" onclick="return false;">Files (Upload)</a>
+                    </li>
+                    <li>
+                        <a href="#" class="ui-commandlink ui-widget" onclick="return false;">Metadata</a>
+                    </li>
+                    <li>
+                        <a href="#" class="ui-commandlink ui-widget" onclick="return false;">Terms</a>
+                    </li>
+                    <li class="dropdown-submenu pull-left">
+                        <a tabindex="-1" href="#">Permissions</a>
+                        <ul class="dropdown-menu">
+                            <li>
+                                <a href="#" onclick="return false;" class="ui-commandlink ui-widget">Dataset</a>
+                            </li>
+                            <li>
+                                <a href="#" onclick="return false;" class="ui-commandlink ui-widget">File</a>
+                            </li>
+                        </ul>
+                    </li>
+                    <li>
+                        <a href="#" class="ui-commandlink ui-widget" onclick="return false;">Private URL</a>
+                    </li>
+                    <li>
+                        <a href="#" onclick="return false;">Thumbnails + Widgets</a>
+                    </li>
+                    <li class="divider"></li>
+                    <li>
+                        <a href="#" class="ui-commandlink ui-widget" onclick="return false;">Deaccession Dataset</a>
+                    </li>
+                </ul>
+            </div>
 	  </div>
 	</div>
 
@@ -356,7 +346,7 @@ For action buttons on a page, we include an icon and text label. Action buttons
       <button type="button" id="editDataSet" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
         <span class="glyphicon glyphicon-pencil"/> Edit <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu pull-right text-left" role="menu">
+      <ul class="dropdown-menu text-left">
         <li>
           <h:outputLink> ... </h:outputLink>
         </li>
@@ -375,6 +365,145 @@ For action buttons on a page, we include an icon and text label. Action buttons
       </ul>
     </div>
 
+Action Buttons Block
+--------------------
+
+For the main actions on a page, we use a container block to group them together. They use the Bootstrap justified button groups style class ``.btn-group.btn-group-justified`` in order to create a group of buttons that stretch at equal sizes to span the entire width of its parent.
+
+The Bootstrap theme provides a ``.btn-primary`` style class to highlight the primary action for the user. This stronger color provides extra visual weight and identifies the primary action in a set of buttons on the page. In this example button group from the file page, you can see the Download and Explore options are listed together, providing a more scalable solution to configurable options.
+
+.. raw:: html
+
+	<div class="panel panel-default code-example">
+	  <div class="panel-body">
+            <div class="col-xs-4">
+                <div id="actionButtonBlock">
+                    <div class="btn-group btn-group-justified">
+                        <div class="btn-group">
+                            <button type="button" id="accessFile" class="btn btn-primary btn-access-file dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                Access File <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu pull-right text-left">
+                                <li class="dropdown-header">
+                                    Download Options <span class="glyphicon glyphicon-download-alt"></span>
+                                </li>
+                                <li>
+                                    <a href="#" onclick="return false;" class="ui-commandlink ui-widget">
+                                        Original File Format (R Data)
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="#" onclick="return false;" class="ui-commandlink ui-widget">
+                                        Tab-Delimited
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="#" onclick="return false;" class="ui-commandlink ui-widget">
+                                        RData Format
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="#" onclick="return false;" class="ui-commandlink ui-widget">
+                                        Variable Metadata
+                                    </a>
+                                </li>
+                                <li class="dropdown-submenu pull-left">
+                                    <a tabindex="-1" href="javascript:void(0);">Data File Citation</a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="#" onclick="return false;">RIS</a>
+                                        </li>
+                                        <li><a href="#" onclick="return false;">EndNote XML</a>
+                                        </li>
+                                        <li><a href="#" onclick="return false;">BibTeX</a>
+                                        </li>
+                                    </ul>
+                                </li>
+                                <li role="presentation" class="clearfix"></li>
+                                <li class="dropdown-header">
+                                    Explore Options <span class="glyphicon glyphicon-equalizer"></span>
+                                </li>
+                                <li>
+                                    <a href="#" onclick="return false;" class="ui-commandlink ui-widget btn-explore">
+                                        Data Explorer
+                                    </a>
+                                </li>                    
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="btn-group btn-group-justified">
+                        <div class="btn-group">
+                            <button type="button" id="editFile" class="btn btn-default btn-access btn-edit dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                Edit File <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu pull-right text-left">
+                                <li>
+                                    <a href="#" onclick="return false;" class="ui-commandlink ui-widget" aria-label="Metadata" title="Metadata">Metadata</a>
+                                </li>
+                                <li>
+                                    <a href="#" onclick="return false;" class="ui-commandlink ui-widget" aria-label="Restrict" title="Restrict">Restrict</a>
+                                </li>                                        
+                                <li>
+                                    <a href="#" onclick="return false;" class="ui-commandlink ui-widget" aria-label="Replace" title="Replace">Replace</a>
+                                </li> 
+                                <li>
+                                    <a href="#" onclick="return false;" class="ui-commandlink ui-widget" aria-label="Delete" title="Delete">Delete</a>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="btn-group btn-group-justified">
+                        <a href="#" onclick="return false;" class="btn btn-default btn-xs btn-contact" aria-label="Contact Dataset Owner" title="Contact Dataset Owner">
+                            Contact Owner
+                        </a>
+                        <a href="#" onclick="return false;" class="btn btn-default btn-xs btn-share" aria-label="Share Dataset" title="Share Dataset">
+                            Share
+                        </a>
+                    </div>
+                </div>
+            </div>
+	  </div>
+	</div>
+
+.. code-block:: html
+
+        <div class="col-xs-4">
+          <div id="actionButtonBlock">
+            <div class="btn-group btn-group-justified">
+              <div class="btn-group">
+                <button type="button" id="accessFile" class="btn btn-primary btn-access-file dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    Access File
+                </button>
+                <ul class="dropdown-menu pull-right text-left">
+                  <li class="dropdown-header">
+                    Download Options <span class="glyphicon glyphicon-download-alt"></span>
+                  </li>
+                  ...
+                </ul>
+              </div>
+            </div>
+            <div class="btn-group btn-group-justified">
+              <div class="btn-group">
+                <button type="button" id="editFile" class="btn btn-default btn-access btn-edit dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    Edit File <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu pull-right text-left">
+                  <li>
+                    ...
+                  </li>
+                </ul>
+              </div>
+            </div>
+            <div class="btn-group btn-group-justified">
+              <a href="#" onclick="return false;" class="btn btn-default btn-xs btn-contact" aria-label="Contact Dataset Owner" title="Contact Dataset Owner">
+                Contact Owner
+              </a>
+              <a href="#" onclick="return false;" class="btn btn-default btn-xs btn-share" aria-label="Share Dataset" title="Share Dataset">
+                Share
+              </a>
+            </div>
+          </div>
+        </div>
+
 Form Buttons
 ------------
 
@@ -384,14 +513,14 @@ Form buttons typically appear at the bottom of a form, aligned to the left. They
 
 	<div class="panel panel-default code-example">
 	  <div class="panel-body">
-	  	<div class="button-block">
-	  		<button id="datasetForm:save" name="datasetForm:save" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only btn btn-default" onclick="return false;" tabindex="1000" type="submit" role="button" aria-disabled="false">
-	  			<span class="ui-button-text ui-c">Save Changes</span>
-	  		</button>
-	  		<button id="datasetForm:cancel" name="datasetForm:cancel" class="btn btn-link" onclick="return false;" tabindex="1000" type="submit" role="button" aria-disabled="false">
-	  			<span class="ui-button-text ui-c">Cancel</span>
-	  		</button>
-  		</div>
+            <div class="button-block">
+                <button id="datasetForm:save" name="datasetForm:save" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only btn btn-default" onclick="return false;" tabindex="1000" type="submit" role="button" aria-disabled="false">
+                    <span class="ui-button-text ui-c">Save Changes</span>
+                </button>
+                <button id="datasetForm:cancel" name="datasetForm:cancel" class="btn btn-link" onclick="return false;" tabindex="1000" type="submit" role="button" aria-disabled="false">
+                    <span class="ui-button-text ui-c">Cancel</span>
+                </button>
+            </div>
 	  </div>
 	</div>
 
@@ -416,11 +545,11 @@ We use the style class ``.no-text`` with the ``.glyphicon`` class to fix spacing
 	<div class="panel panel-default code-example">
 	  <div class="panel-body">
 	    <a href="#" class="ui-commandlink ui-widget btn btn-default btn-sm bootstrap-button-tooltip compound-field-btn" aria-label="Add" onclick="return false;" tabindex="1" title="" data-original-title="Add">
-            <span class="glyphicon glyphicon-plus no-text"></span>
-        </a>
-        <a href="#" class="ui-commandlink ui-widget btn btn-default btn-sm bootstrap-button-tooltip compound-field-btn" aria-label="Delete" onclick="return false;" tabindex="1" title="" data-original-title="Delete">
-            <span class="glyphicon glyphicon-minus no-text"></span>
-        </a>
+                <span class="glyphicon glyphicon-plus no-text"></span>
+            </a>
+            <a href="#" class="ui-commandlink ui-widget btn btn-default btn-sm bootstrap-button-tooltip compound-field-btn" aria-label="Delete" onclick="return false;" tabindex="1" title="" data-original-title="Delete">
+                <span class="glyphicon glyphicon-minus no-text"></span>
+            </a>
 	  </div>
 	</div>
 
@@ -433,11 +562,113 @@ We use the style class ``.no-text`` with the ``.glyphicon`` class to fix spacing
       <h:outputText styleClass="glyphicon glyphicon-minus no-text"/>
     </p:commandLink>
 
+Another variation of icon-only buttons uses the ``.btn-link`` style class from Bootstrap, styling it more like a link while maintaining button behavior. The button group provides space for up to three buttons for a file in the table, and if there are more than three action button, they utilize the "kebab" More Options button dropdown with the ``.glyphicon-option-vertical`` icon.
+
+.. raw:: html
+
+	<div class="panel panel-default code-example">
+	  <div class="panel-body">
+            <div class="btn-group" role="group" aria-label="File Actions">
+                <a href="#" onclick="return false;" class="ui-commandlink ui-widget btn-preview btn btn-link bootstrap-button-tooltip" aria-label="Preview" data-original-title="Preview">
+                    <span class="glyphicon glyphicon-eye-open"></span><span class="sr-only">Preview</span>
+                </a>
+                <a href="#" onclick="return false;" class="ui-commandlink ui-widget btn-download btn btn-link bootstrap-button-tooltip" aria-label="Download" data-original-title="Download">
+                    <span class="glyphicon glyphicon-download-alt"></span><span class="sr-only">Download</span>
+                </a>
+                <div class="btn-group">
+                    <a class="btn-explore btn btn-link bootstrap-button-tooltip dropdown-toggle" id="exploreBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-original-title="Explore">
+                        <span class="glyphicon glyphicon-equalizer"></span><span class="sr-only">Explore</span><span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu multi-level pull-right text-left" aria-labelledby="exploreBtn">
+                        <li>
+                            <a href="#" rel="noopener" class="ui-commandlink ui-widget" onclick="return false;">
+                                Data Explorer
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="btn-group">
+                    <a class="btn-options btn btn-link bootstrap-button-tooltip dropdown-toggle" id="optionsBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-original-title="More Options">
+                        <span class="glyphicon glyphicon-option-vertical"></span><span class="sr-only">More Options</span><span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu multi-level pull-right text-left" aria-labelledby="optionsBtn">
+                        <li>
+                            <a href="#" class="ui-commandlink ui-widget" onclick="return false;">
+                                Misc. Option
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#" class="ui-commandlink ui-widget" onclick="return false;">
+                                Misc. Option
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+	  </div>
+	</div>
+
+.. code-block:: html
+
+    <div class="btn-group" role="group" aria-label="#{bundle['file.actionsBlock']}">
+
+        <ui:fragment rendered="#{true}">
+            <a class="btn-preview btn btn-link bootstrap-button-tooltip" title="#{bundle.preview}"
+                href="#{widgetWrapper.wrapURL('/file.xhtml?'.concat(...)}">
+                <span class="glyphicon glyphicon-eye-open"/><span class="sr-only">#{bundle.preview}</span>
+            </a>
+        </ui:fragment>
+
+        <p:commandLink rendered="#{true}" styleClass="btn-download btn btn-link bootstrap-button-tooltip" 
+                       title="#{bundle.download}"
+                       disabled="#{locked ? 'disabled' : ''}" 
+                       process="@this" update="@widgetVar(popup)" oncomplete="PF('popup').show();">
+          <f:actionListener binding="#{pageBean.function()}" />
+          <f:actionListener binding="#{pageBean.function()}" />
+          <span class="glyphicon glyphicon-download-alt"/><span class="sr-only">#{bundle.download}</span>
+        </p:commandLink>
+
+        <div class="btn-group" jsf:rendered="#{true}">
+          <a class="btn-explore btn btn-link bootstrap-button-tooltip" 
+             title="#{bundle.explore}" id="exploreBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-original-title="#{bundle.explore}">
+            <span class="glyphicon glyphicon-equalizer"/><span class="sr-only">#{bundle.explore}</span><span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu multi-level pull-right text-left" aria-labelledby="exploreBtn">
+            <ui:repeat var="tool" value="#{exploreTools}">
+              <li>
+                <p:commandLink styleClass="#{locked ? 'disabled' : ''}"
+                               disabled="#{locked ? 'disabled' : ''}"
+                               action="#{pageBean.function()}">
+                  #{tool.getDisplayNameLang()}
+                </p:commandLink>
+              </li>
+            </ui:repeat>
+          </ul>
+        </div>
+
+        <div class="btn-group" jsf:rendered="#{true}">
+          <a class="btn-options btn btn-link bootstrap-button-tooltip" 
+             id="optionsBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="#{bundle.moreOptions}" data-original-title="#{bundle.moreOptions}">
+            <span class="glyphicon glyphicon-option-vertical"/><span class="sr-only">#{bundle.moreOptions}</span><span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu multi-level pull-right text-left" aria-labelledby="optionsBtn">
+            <ui:repeat var="options" value="#{fileOptions}">
+              <li>
+                <p:commandLink styleClass="#{locked ? 'disabled' : ''}"
+                               disabled="#{locked ? 'disabled' : ''}"
+                               action="#{pageBean.function()}">
+                  ...
+                </p:commandLink>
+              </li>
+            </ui:repeat>
+          </ul>
+        </div>
+    </div>
 
 Pagination
 ==========
 
-We use the `Pagination component <http://getbootstrap.com/components/#pagination>`__ from Bootstrap for paging through search results.
+We use the `Pagination component <https://getbootstrap.com/components/#pagination>`__ from Bootstrap for paging through search results.
 
 .. raw:: html
 
@@ -452,7 +683,7 @@ We use the `Pagination component <http://getbootstrap.com/components/#pagination
                 <a href="#" onclick="return false;">&lt; Previous</a>
             </li>
                 <li class="active"><a href="#" onclick="return false;">1
-                	<span class="sr-only">(Current)</span></a>
+                    <span class="sr-only">(Current)</span></a>
                 </li>
                 <li><a href="#" onclick="return false;">2</a>
                 </li>
@@ -507,7 +738,7 @@ We use the `Pagination component <http://getbootstrap.com/components/#pagination
 Labels
 ======
 
-The `Labels component <http://getbootstrap.com/components/#labels>`__ from Bootstrap is used for publication status (DRAFT, In Review, Unpublished, Deaccessioned), and Dataset version, as well as Tabular Data Tags (Survey, Time Series, Panel, Event, Genomics, Network, Geospatial).
+The `Labels component <https://getbootstrap.com/components/#labels>`__ from Bootstrap is used for publication status (DRAFT, In Review, Unpublished, Deaccessioned), and Dataset version, as well as Tabular Data Tags (Survey, Time Series, Panel, Event, Genomics, Network, Geospatial).
 
 .. raw:: html
 
@@ -537,7 +768,7 @@ The `Labels component <http://getbootstrap.com/components/#labels>`__ from Boots
 Alerts
 ======
 
-For our help/information, success, warning, and error message blocks we use a custom built UI component based on the `Alerts component <http://getbootstrap.com/components/#alerts>`__ from Bootstrap.
+For our help/information, success, warning, and error message blocks we use a custom built UI component based on the `Alerts component <https://getbootstrap.com/components/#alerts>`__ from Bootstrap.
 
 .. raw:: html
 
@@ -546,9 +777,9 @@ For our help/information, success, warning, and error message blocks we use a cu
       <div class="messagePanel">
         <div class="alert alert-dismissable alert-info">
           <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-	        <span class="glyphicon glyphicon-info-sign"></span>&nbsp;<strong>Edit Dataset Metadata</strong> - Add more metadata about this dataset to help others easily find it.
-	      </div>
-	      <div class="alert alert-success">
+          <span class="glyphicon glyphicon-info-sign"></span>&nbsp;<strong>Edit Dataset Metadata</strong> - Add more metadata about this dataset to help others easily find it.
+        </div>
+        <div class="alert alert-success">
           <span class="glyphicon glyphicon glyphicon-ok-sign"></span>&nbsp;<strong>Success!</strong> – The metadata for this dataset has been updated.
         </div>
         <div class="alert alert-warning">
@@ -580,7 +811,7 @@ Style classes can be added to ``p``, ``div``, ``span`` and other elements to add
     <div class="panel-body">
 
       <p class="help-block">
-        <span class="text-muted">Select dataverses to feature on the homepage of this dataverse.</span>
+        <span class="text-muted">Select Dataverse collections to feature on the homepage of this Dataverse collection.</span>
       </p>
 
       <p class="help-block">
@@ -588,7 +819,7 @@ Style classes can be added to ``p``, ``div``, ``span`` and other elements to add
       </p>
 
       <p class="help-block">
-        <span class="glyphicon glyphicon-asterisk text-info"></span> <span class="text-info">Permissions with an asterisk icon indicate actions that can be performed by users not logged into Dataverse.</span>
+        <span class="glyphicon glyphicon-asterisk text-info"></span> <span class="text-info">Permissions with an asterisk icon indicate actions that can be performed by users not logged into the Dataverse installation.</span>
       </p>
 
       <p class="help-block">
@@ -628,9 +859,9 @@ Style classes can be added to ``p``, ``div``, ``span`` and other elements to add
 Images
 ======
 
-For images, we use the `GraphicImage  component <https://www.primefaces.org/showcase/ui/multimedia/graphicImage.xhtml>`__ from PrimeFaces, or the basic JSF `GraphicImage component <http://docs.oracle.com/javaee/6/javaserverfaces/2.1/docs/vdldocs/facelets/h/graphicImage.html>`__.
+For images, we use the `GraphicImage  component <https://www.primefaces.org/showcase/ui/multimedia/graphicImage.xhtml>`__ from PrimeFaces, or the basic JSF `GraphicImage component <https://docs.oracle.com/javaee/6/javaserverfaces/2.1/docs/vdldocs/facelets/h/graphicImage.html>`__.
 
-To display images in a responsive way, they are styled with ``.img-responsive``, an `Images CSS class <http://getbootstrap.com/css/#images>`__ from Bootstrap.
+To display images in a responsive way, they are styled with ``.img-responsive``, an `Images CSS class <https://getbootstrap.com/css/#images>`__ from Bootstrap.
 
 .. raw:: html
 
@@ -648,7 +879,7 @@ To display images in a responsive way, they are styled with ``.img-responsive``,
 Panels
 ======
 
-The most common of our containers, the `Panels component <http://getbootstrap.com/components/#panels>`__ from Bootstrap is used to add a border and padding around sections of content like metadata blocks. Displayed with a header and/or footer, it can also be used with the  `Collapse plugin <http://getbootstrap.com/javascript/#collapse>`__ from Bootstrap.
+The most common of our containers, the `Panels component <https://getbootstrap.com/components/#panels>`__ from Bootstrap is used to add a border and padding around sections of content like metadata blocks. Displayed with a header and/or footer, it can also be used with the  `Collapse plugin <https://getbootstrap.com/javascript/#collapse>`__ from Bootstrap.
 
 .. raw:: html
 
@@ -712,7 +943,7 @@ Tabs
 
 Tabs are used to provide content panes on a page that allow the user to view different sections of content without navigating to a different page.
 
-We use the `TabView component <https://www.primefaces.org/showcase/ui/panel/tabView.xhtml>`__ from PrimeFaces, which is styled using the `Tab component <http://getbootstrap.com/javascript/#tabs>`__ from Bootstrap.
+We use the `TabView component <https://www.primefaces.org/showcase/ui/panel/tabView.xhtml>`__ from PrimeFaces, which is styled using the `Tab component <https://getbootstrap.com/javascript/#tabs>`__ from Bootstrap.
 
 .. raw:: html
 
@@ -758,7 +989,7 @@ Modals are dialog prompts that act as popup overlays, but don't create a new bro
 
 Buttons usually provide the UI prompt. A user clicks the button, which then opens a `Dialog component <https://www.primefaces.org/showcase/ui/overlay/dialog/basic.xhtml>`__  or `Confirm Dialog component <https://www.primefaces.org/showcase/ui/overlay/confirmDialog.xhtml>`__  from PrimeFaces that displays the modal with the necessary information and actions to take.
 
-The modal is styled using the `Modal component <http://getbootstrap.com/javascript/#modals>`__ from Bootstrap, for a popup window that prompts a user for information, with overlay and a backdrop, then header, content, and buttons. We can use style classes from Bootstrap for large (``.bs-example-modal-lg``) and small (``.bs-example-modal-sm``) width options.
+The modal is styled using the `Modal component <https://getbootstrap.com/javascript/#modals>`__ from Bootstrap, for a popup window that prompts a user for information, with overlay and a backdrop, then header, content, and buttons. We can use style classes from Bootstrap for large (``.bs-example-modal-lg``) and small (``.bs-example-modal-sm``) width options.
 
 .. raw:: html
 
diff --git a/doc/sphinx-guides/source/style/text.rst b/doc/sphinx-guides/source/style/text.rst
new file mode 100644
index 00000000000..10fbd08da4a
--- /dev/null
+++ b/doc/sphinx-guides/source/style/text.rst
@@ -0,0 +1,12 @@
+Text
+++++
+
+Here we describe the guidelines that help us provide helpful, clear and consistent textual information to users.
+
+.. contents:: |toctitle|
+  :local:
+
+Metadata Text Guidelines
+========================
+
+These guidelines are maintained in `a Google Doc <https://docs.google.com/document/d/1tY5t3gjrIgAGoRxVMWQSCh46fnbSmnFDLQ7aLkNLhJ8/>`__ as we expect to make frequent changes to them. We welcome comments in the Google Doc.
diff --git a/doc/sphinx-guides/source/user/account.rst b/doc/sphinx-guides/source/user/account.rst
index f9180a530c3..cd269ddac20 100755
--- a/doc/sphinx-guides/source/user/account.rst
+++ b/doc/sphinx-guides/source/user/account.rst
@@ -9,32 +9,33 @@ Account Information
 
 As a registered user, you can:
 
--  Create your own dataverse, if permitted, and customize it.
--  Add datasets to dataverses, if permitted.
+-  Create your own Dataverse collection, if permitted, and customize it.
+-  Add datasets to Dataverse collections, if permitted.
 -  Contribute to existing datasets, if permitted.
 -  Request access to restricted files, if permitted.
 
 Account Log In Options
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Dataverse has been configured for one or more of the following log in options:
+The Dataverse installation has been configured for one or more of the following log in options:
 
 - Username/Email and Password
 - Institutional Log In
 - ORCID
+- Microsoft Azure AD
 - GitHub
 - Google
 
-Please note that once you create your Dataverse account, it will be associated with only one of the log in options above.
+Please note that once you create your Dataverse installation account, it will be associated with only one of the log in options above.
 
-The Institutional Log In, ORCID, GitHub, and Google options are described in more detail below under "Remote Authentication."
+The Institutional Log In, ORCID, Microsoft, GitHub, and Google options are described in more detail below under "Remote Authentication."
 
 Create Account
 ~~~~~~~~~~~~~~
 
-To create a Dataverse account with the Username/Email log in option, use the "Sign Up" page. Fill out the fields, and then click the 'Create Account' button. Please note that the Username field does not support email addresses but will allow the following characters: a-Z, 0-9, _ (underscores), - (hyphens), and . (periods).
+To create a Dataverse installation account with the Username/Email log in option, use the "Sign Up" page. Fill out the fields, and then click the 'Create Account' button. Please note that the Username field does not support email addresses but will allow the following characters: a-Z, 0-9, _ (underscores), - (hyphens), and . (periods).
 
-To create a Dataverse account associated with the log in option for your institution, ORCID, GitHub, or Google, use the "Log In" page and select one of the authentication providers. See the "Remote Authentication" section below for details.
+To create a Dataverse installation account associated with the log in option for your institution, ORCID, GitHub, or Google, use the "Log In" page and select one of the authentication providers. See the "Remote Authentication" section below for details.
 
 Edit Account 
 ~~~~~~~~~~~~
@@ -43,124 +44,173 @@ Edit Account
 #. On the top right of your account page, click on the "Edit Account" button and from there you can select to edit either your Account Information or your Account Password.
 #. Select "Save Changes" when you are done.
 
-Please note that you cannot edit your account information within Dataverse if you use the Institutional Log In option. Instead, you should contact your institution to change your name, email, etc. Once the change is made by your institution, it will be reflected in Dataverse the next time you log in. Users of the Institutional Log In option are not required to verify their email address because the institution providing the email address is trusted.
+Please note that you cannot edit your account information within the Dataverse installation if you use the Institutional Log In option. Instead, you should contact your institution to change your name, email, etc. Once the change is made by your institution, it will be reflected in the Dataverse installation the next time you log in. Users of the Institutional Log In option are not required to verify their email address because the institution providing the email address is trusted.
 
 Convert Account
 ~~~~~~~~~~~~~~~
 
 If more than one log in option is available, you can convert from one to another and use the new option from now on.
 
-If you are converting from the Email/Username log in option you will need to have your password ready to complete the conversion process. Click Log In, select the new log in option, and go through the log in process. When you return to Dataverse, look for an option allowing you to convert and enter your password to complete the conversion. The section on Remote Authentication below has more specific information on converting to Institutional Log In, ORCID, GitHub, and Google.
+If you are converting from the Email/Username log in option you will need to have your password ready to complete the conversion process. Click Log In, select the new log in option, and go through the log in process. When you return to the Dataverse installation, look for an option allowing you to convert and enter your password to complete the conversion. The section on Remote Authentication below has more specific information on converting to Institutional Log In, ORCID, GitHub, and Google.
 
 If you need to perform any other conversion (i.e. from Google to GitHub), use the Support link at the top of the page for assistance.
 
 Reset Account Password
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Only Dataverse accounts using the Username/Email log in option have an associated password stored (securely!) in Dataverse. If you cannot remember this password, click on Log In in the top right corner of any page and click the "Forgot Password?" link below where you would enter your username/email and password. Enter your email address and click "Submit Password Request" to receive an email with a link to reset your password.
+Only Dataverse installation accounts using the Username/Email log in option have an associated password stored (securely!) in the Dataverse installation. If you cannot remember this password, click on Log In in the top right corner of any page and click the "Forgot Password?" link below where you would enter your username/email and password. Enter your email address and click "Submit Password Request" to receive an email with a link to reset your password.
 
 Please note that if you have forgotten your username, you can use this same process to receive your username in an email.
 
 Remote Authentication
 ---------------------
 
-Too many passwords? You can set up your Dataverse account to use log in credentials from one of the following remote authentication providers. This way, you can log in using your existing credentials from another service.
+Too many passwords? You can set up your Dataverse installation account to use log in credentials from one of the following remote authentication providers. This way, you can log in using your existing credentials from another service.
+
+.. _institutional-log-in:
 
 Institutional Log In
 ~~~~~~~~~~~~~~~~~~~~
 
-Institutional log in allows you to use your log in information for your university (e.g. HarvardKey at Harvard) to log in to your Dataverse account.
+Institutional log in allows you to use your log in information for your university (e.g. HarvardKey at Harvard) to log in to your Dataverse installation account.
 
-Create a Dataverse account using Institutional Log In
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Create a Dataverse installation account using Institutional Log In
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 #. Click the "Log In" link in the navbar.
 #. Select the "Your Institution" button under the "Other options" header
 #. Using the dropdown menu, select your institution then click the Continue button to go to your institution's log in page.
-#. After you put in your institutional credentials successfully, you will be brought back to Dataverse to confirm your account information, and click "Create Account".
+#. After you put in your institutional credentials successfully, you will be brought back to the Dataverse installation to confirm your account information, and click "Create Account".
 #. A username has been selected for you. You won't use this username to log in but it will appear next to your name when other users search for you to assign permissions within the system. To see what you username is, click on your name in the top right corner and click Account Information.
 
-If you do not find your institution listed, you will need to request that it is added to the Research & Scholarship category of InCommon. Contact support for assistance on how to get this process started with the identity provider support team at your institution.
+If you can't find your institution in a long list, you may need to request for it to be added to the "Research & Scholarship" category of an identity federation. See :ref:`fix-shib-login`.
+
+If your institution is listed but you get login error ("eppn was null" or similar), it may mean your institution has declared itself part of the "Research & Scholarship" category of an identity federation but it is not releasing required attributes (often email) as it should. To resolve this, see :ref:`fix-shib-login`.
 
-Convert your Dataverse account to use your Institutional Log In
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Convert your Dataverse installation account to use your Institutional Log In
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If you already have a Dataverse account associated with the Username/Email log in option, but you want to convert it to use your institutional log in, you can easily do so as long as your account uses an email address from that institution.
+If you already have a Dataverse installation account associated with the Username/Email log in option, but you want to convert it to use your institutional log in, you can easily do so as long as your account uses an email address from that institution.
 
-#. Go to the Account Information page to confirm that your account email address is the same as your institutional email address. If not, you will need to update your Dataverse account to make them match.
-#. Log out of Dataverse.
+#. Go to the Account Information page to confirm that your account email address is the same as your institutional email address. If not, you will need to update your Dataverse installation account to make them match.
+#. Log out of the Dataverse installation.
 #. Click the "Log In" link in the navbar.
 #. Select the "Your Institution" button under the "Other options" header.
 #. Using the dropdown menu, select your institution then click the Continue button to go to your institution's log in page.
-#. After you put in your institutional credentials successfully, you will be brought back to Dataverse to confirm your account information.
-#. Enter your current password for your Dataverse account and click "Convert Account".
-#. Now you have finished converting your Dataverse account to use your institutional log in.
+#. After you put in your institutional credentials successfully, you will be brought back to the Dataverse installation to confirm your account information.
+#. Enter your current password for your Dataverse installation account and click "Convert Account".
+#. Now you have finished converting your Dataverse installation account to use your institutional log in.
 
-Convert your Dataverse account away from your Institutional Log In
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Note that you cannot go through this conversion process if your Dataverse installation account associated with the Username/Email log in option has been deactivated.
+
+Convert your Dataverse installation account away from your Institutional Log In
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you are leaving your institution and need to convert your Dataverse installation account to the Dataverse Username/Email log in option, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link that will open a popup form to contact support for assistance.
+
+.. _fix-shib-login:
+
+Troubleshooting Federated Institutional Log In
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Dataverse can be configured to allow institutional log in from a worldwide federation (eduGAIN) but for a successful log in, the following Research & Scholarship (R&S) attributes must be released:
+
+- Shib-Identity-Provider
+- eppn
+- givenName
+- sn
+- email
+
+If you have attempted to log in but are seeing an error such as ``The SAML assertion for "eppn" was null``, you will need to contact the people who run the log in system (Identity Provider or IdP) for your organization and explain that the attributes above must be released. You can link them to this document, of course, as well as https://refeds.org/category/research-and-scholarship and :ref:`identity-federation` in the Installation Guide.
 
-If you are leaving your institution and need to convert your Dataverse account to the Dataverse Username/Email log in option, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link that will open a popup form to contact support for assistance.
+Note that while Identity Providers (IdPs) who have joined R&S are required to release the attributes above to all Service Providers (SPs) who have joined R&S (Harvard Dataverse or UNC Dataverse, for example), for a successful login to a Dataverse installation, the IdP could decide to release attributes to just that individual installation. This is explained under :ref:`specific-identity-providers` in the Installation Guide.
 
 ORCID Log In
 ~~~~~~~~~~~~~
 
-You can set up your Dataverse account to allow you to log in using your ORCID credentials. ORCIDÂŽ is an independent non-profit effort to provide an open registry of unique researcher identifiers and open services to link research activities and organizations to these identifiers. Learn more at `orcid.org <http://orcid.org>`_. 
+You can set up your Dataverse installation account to allow you to log in using your ORCID credentials. ORCIDÂŽ is an independent non-profit effort to provide an open registry of unique researcher identifiers and open services to link research activities and organizations to these identifiers. Learn more at `orcid.org <https://orcid.org>`_. 
 
-Create a Dataverse account using ORCID
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Create a Dataverse installation account using ORCID
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 #. Click the "Log In" link in the navbar.
 #. Click the "ORCID" button under the "Other options" header.
 #. Click the "Log In with ORCID" button to go to the ORCID website.
 #. If you do not already have an ORCID account, you can create one on this page. If you already have an ORCID account, click on "Sign in" and then enter your login under the "Personal account" tab.
-#. After you put in your ORCID credentials successfully, you will be brought back to Dataverse to confirm the creation of your Dataverse account. If your ORCID account's privacy settings permit it, the email address you've linked to your ORCID account will be suggested to you as an option. You can use this email if you like, or you can use any other email you might wish. If you have entered employment information within your ORCID account, the name of your employer will be suggested for the "Affiliation" field.
+#. After you put in your ORCID credentials successfully, you will be brought back to Dataverse installation to confirm the creation of your Dataverse installation account. If your ORCID account's privacy settings permit it, the email address you've linked to your ORCID account will be suggested to you as an option. You can use this email if you like, or you can use any other email you might wish. If you have entered employment information within your ORCID account, the name of your employer will be suggested for the "Affiliation" field.
 
-Convert your Dataverse account to use ORCID for log in
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Convert your Dataverse installation account to use ORCID for log in
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  
-If you already have a Dataverse account associated with the Username/Email log in option, but you want to convert it to use ORCID for log in, follow these steps:
+If you already have a Dataverse installation account associated with the Username/Email log in option, but you want to convert it to use ORCID for log in, follow these steps:
 
-#. Log out of Dataverse.
+#. Log out of the Dataverse installation.
 #. Click the "Log In" link in the navbar.
 #. Click the "ORCID" button under the "Other options" header.
 #. Click the "Log In with ORCID" button to go to the ORCID website.
 #. If you do not already have an ORCID account, you can create one on this page. If you already have an ORCID account, click on "Sign in" and then enter your login under the "Personal account" tab.
-#. After you put in your ORCID credentials successfully, you will be brought back to Dataverse. Click the "convert your account" link.
-#. Enter your username and password for your Dataverse account and click "Convert Account".
-#. Now you have finished converting your Dataverse account to use ORCID for log in.
+#. After you put in your ORCID credentials successfully, you will be brought back to the Dataverse installation. Click the "convert your account" link.
+#. Enter your username and password for your Dataverse installation account and click "Convert Account".
+#. Now you have finished converting your Dataverse installation account to use ORCID for log in.
 
-Convert your Dataverse account away from ORCID for log in
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Note that you cannot go through this conversion process if your Dataverse installation account associated with the Username/Email log in option has been deactivated.
 
-If you don't want to log in to Dataverse using ORCID any more, you will want to convert your Dataverse account to the Dataverse Username/Email log in option. To do this, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link that will open a popup form to contact support for assistance.
+Convert your Dataverse installation account away from ORCID for log in
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-GitHub and Google Log In
-~~~~~~~~~~~~~~~~~~~~~~~~~
+If you don't want to log in to the Dataverse installation using ORCID any more, you will want to convert your Dataverse installation account to the Dataverse installation Username/Email log in option. To do this, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link that will open a popup form to contact support for assistance.
 
-You can also convert your Dataverse account to use authentication provided by GitHub or Google. These options may be found in the "Other options" section of the log in page, and function similarly to how ORCID is outlined above. If you would like to convert your account away from using one of these services for log in, then you can follow the same steps as listed above for converting away from the ORCID log in.
+Microsoft Azure AD, GitHub, and Google Log In
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can also convert your Dataverse installation account to use authentication provided by GitHub, Microsoft, or Google. These options may be found in the "Other options" section of the log in page, and function similarly to how ORCID is outlined above. If you would like to convert your account away from using one of these services for log in, then you can follow the same steps as listed above for converting away from the ORCID log in.
+
+
+.. _orcid-integration:
+
+Linking ORCID with Your Account Profile
+---------------------------------------
+
+If you login using ORCID, Dataverse will add the link to your ORCID account in your account profile and, when you create datasets, will automatically add you, with your ORCID, as an author.
+
+If you login via other methods, you can add a link to your ORCID account as you create an account or later via the "Account Information" page.
+As when using ORCID login, you will be redirected to the ORCID website to log in there and allow the connection with Dataverse.
+Once you've done that, the link to your ORCID will be shown in the Account Information page and your ORCID will be added as your identifier when you create datasets (exactly the same as if you had logged in via ORCID).
+
+Note that the ability to login via ORCID (or other providers) and the ability to link to your ORCID profile are separate configuration options :doc:`available </installation/orcid>` to Dataverse administrators.
+
+.. _my-data:
 
 My Data
 -------
 
-The My Data section of your account page displays a listing of all the dataverses, datasets, and files you have either created, uploaded or that you have a role assigned on. If you see unexpected dataverses or datasets in your My Data page, it might be because someone has assigned your account a role on those dataverses or datasets. For example, some institutions automatically assign the "File Downloader" role on their datasets to all accounts using their institutional login.
+The My Data section of your account page displays a listing of all the Dataverse collections, datasets, and files you have either created, uploaded or that you have a role assigned on. You are able to filter through all the Dataverse collections, datasets, and files listed on your My Data page using the filter box. You may also use the facets on the left side to only view a specific Publication Status or Role.
 
+.. note:: If you see unexpected Dataverse collections or datasets in your My Data page, it might be because someone has assigned your account a role on those Dataverse collections or datasets. For example, some institutions automatically assign the "File Downloader" role on their datasets to all accounts using their institutional login.
 
-You are able to filter through all the dataverses, datasets, and files listed on your My Data page using the filter box. You may also use the facets on the left side to only view a specific Publication Status or Role.
+You can use the Add Data button to create a new Dataverse collection or dataset. By default, the new Dataverse collection or dataset will be created in the root Dataverse collection, but from the create form you can use the Host Dataverse collection dropdown menu to choose a different Dataverse collection, for which you have the proper access privileges. However, you will not be able to change this selection after you create your Dataverse collection or dataset.
 
+.. _account-notifications:
 
 Notifications
 -------------
 
-Notifications appear in the notifications tab on your account page and are also displayed as a number next to your account name.
+Notifications appear in the notifications tab on your account page and are also displayed as a number next to your account name. You also receive notifications via email.
+
+If your admin has enabled the option to change the notification settings, you will find an overview of the notification and email settings in the notifications tab. There, you can select which notifications and/or emails you wish to receive. If certain notification or email options are greyed out, you can’t change the setting for this notification because the admin has set these as never to be muted by the user. You control the in-app and the email notifications separately in the two lists.
+
+You will typically receive a notification or email when:
+
+- You've created your account.
+- You've created a Dataverse collection or added a dataset.
+- Another Dataverse installation user has requested access to restricted files in a dataset that you published. (If you submitted your dataset for review, and it was published by a curator, the curators of the Dataverse collection that contains your dataset will get a notification about requests to access your restricted files.)
+- A file in one of your datasets has finished the ingest process.
 
-You will receive a notification when:
+There are other notification types that you can receive, e.g., notification on granted roles, API key generation, etc. These types of notifications are less common and are not described here. Some other notifications are limited to specific roles. For example, if the installation has a curation workflow, reviewers get notified when a new dataset is submitted for review.
 
-- You've created your account
-- You've created a dataverse or added a dataset
-- Another Dataverse user has requested access to a restricted file in one of your datasets
-- A file in one of your datasets has finished the ingest process
+Notifications will only be emailed once, even if you haven't read the in-app notification.
 
-Notifications will only be emailed one time even if you haven't read the notification on the Dataverse site.
+It's possible to manage notifications via API. See :ref:`notifications` in the API Guide.
 
 API Token
 ---------
@@ -168,14 +218,14 @@ API Token
 What APIs Are and Why They Are Useful
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-API stands for "Application Programming Interface" and Dataverse APIs allow you to take advantage of integrations with other software that may have been set up by admins of your installation of Dataverse. See the :doc:`/admin/external-tools` and :doc:`/admin/integrations` sections of the Admin Guide for examples of software that is commonly integrated with Dataverse.
+API stands for "Application Programming Interface" and the Dataverse Software APIs allow you to take advantage of integrations with other software that may have been set up by admins of your Dataverse installation. See the :doc:`/admin/external-tools` and :doc:`/admin/integrations` sections of the Admin Guide for examples of software that is commonly integrated with a Dataverse installation.
 
-Additionally, if you are willing to write a little code (or find someone to write it for you), APIs provide a way to automate parts of your workflow. See the  :doc:`/api/getting-started` section of the API Guide for details.
+Additionally, if you are willing to write a little code (or find someone to write it for you), APIs provide a way to automate parts of your workflow. See the :doc:`/api/getting-started` section of the API Guide for details.
 
 How Your API Token Is Like a Password
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In many cases, such as when depositing data, an API Token is required to interact with Dataverse APIs. The word "token" indicates a series of letters and numbers such as ``c6527048-5bdc-48b0-a1d5-ed1b62c8113b``. Anyone who has your API Token can add and delete data as you so you should treat it with the same care as a password.
+In many cases, such as when depositing data, an API Token is required to interact with Dataverse Software APIs. The word "token" indicates a series of letters and numbers such as ``c6527048-5bdc-48b0-a1d5-ed1b62c8113b``. Anyone who has your API Token can add and delete data as you so you should treat it with the same care as a password.
 
 How to Create Your API Token
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -187,10 +237,10 @@ How to Recreate Your API Token
 
 If your API Token becomes compromised or has expired, click on your account name in the navbar, then select "API Token" from the dropdown menu. In this tab, click "Recreate Token".
 
-Additional Information about API Tokens and Dataverse APIs
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Additional Information about API Tokens and Dataverse Software APIs
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Dataverse APIs are documented in the :doc:`/api/index` but the following sections may be of particular interest:
+The Dataverse Software APIs are documented in the :doc:`/api/index` but the following sections may be of particular interest:
 
 - :doc:`/api/getting-started`
 - :doc:`/api/auth`
diff --git a/doc/sphinx-guides/source/user/appendix.rst b/doc/sphinx-guides/source/user/appendix.rst
index 8c769b3041a..d1c46a93fdf 100755
--- a/doc/sphinx-guides/source/user/appendix.rst
+++ b/doc/sphinx-guides/source/user/appendix.rst
@@ -8,23 +8,46 @@ Additional documentation complementary to the User Guide.
 .. contents:: |toctitle|
 	:local:
 
+.. _metadata-references:
+
 Metadata References
 ======================
 
-Dataverse is committed to using standard-compliant metadata to ensure that Dataverse
+The Dataverse Project is committed to using standard-compliant metadata to ensure that a Dataverse installation's
 metadata can be mapped easily to standard metadata schemas and be exported into JSON
 format (XML for tabular file metadata) for preservation and interoperability.
 
-Detailed below are what metadata schemas we support for Citation and Domain Specific Metadata in Dataverse:
+Supported Metadata
+~~~~~~~~~~~~~~~~~~
+
+Detailed below are what metadata schemas we support for Citation and Domain Specific Metadata in the Dataverse Project:
+
+- Citation Metadata (`see .tsv <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/citation.tsv>`__): compliant with `DDI Lite <https://www.ddialliance.org/specification/ddi2.1/lite/index.html>`_, `DDI 2.5 Codebook <https://www.ddialliance.org/>`__, `DataCite 4.5 <https://schema.datacite.org/meta/kernel-4.5/>`__, and Dublin Core's `DCMI Metadata Terms <https://dublincore.org/documents/dcmi-terms/>`__ . Language field uses `ISO 639-1 <https://www.loc.gov/standards/iso639-2/php/English_list.php>`__ controlled vocabulary.
+- Geospatial Metadata (`see .tsv <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/geospatial.tsv>`__): compliant with `DDI Lite <https://www.ddialliance.org/specification/ddi2.1/lite/index.html>`_, `DDI 2.5 Codebook <https://www.ddialliance.org/>`__, `DataCite 4.5 <https://schema.datacite.org/meta/kernel-4.5/>`__, and Dublin Core. Country / Nation field uses `ISO 3166-1 <https://en.wikipedia.org/wiki/ISO_3166-1>`_ controlled vocabulary. 
+
+  - Please note that a new and improved Geospatial metadata block is being proposed at `<https://github.com/IQSS/dataverse/pull/11507>`__. We encourage you to try the block and give feedback in that pull request. 
+- Social Science & Humanities Metadata (`see .tsv <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/social_science.tsv>`__): compliant with `DDI Lite <https://www.ddialliance.org/specification/ddi2.1/lite/index.html>`_, `DDI 2.5 Codebook <https://www.ddialliance.org/>`__, and Dublin Core.
+- Astronomy and Astrophysics Metadata (`see .tsv <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/astrophysics.tsv>`__): These metadata elements can be mapped/exported to the International Virtual Observatory Alliance’s (IVOA) 
+  `VOResource Schema format <https://www.ivoa.net/documents/latest/RM.html>`__ and is based on 
+  `Virtual Observatory (VO) Discovery and Provenance Metadata <https://perma.cc/H5ZJ-4KKY>`__.
+- Life Sciences Metadata (`see .tsv <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/biomedical.tsv>`__): based on `ISA-Tab Specification <https://isa-specs.readthedocs.io/en/latest/isamodel.html>`__, along with controlled vocabulary from subsets of the `OBI Ontology <https://bioportal.bioontology.org/ontologies/OBI>`__ and the `NCBI Taxonomy for Organisms <https://www.ncbi.nlm.nih.gov/Taxonomy/taxonomyhome.html/>`__.
+- Journal Metadata (`see .tsv <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/journals.tsv>`__): based on the `Journal Archiving and Interchange Tag Set, version 1.2 <https://jats.nlm.nih.gov/archiving/tag-library/1.2/chapter/how-to-read.html>`__.
+- 3D Objects Metadata (`see .tsv <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/3d_objects.tsv>`__).
+
+Experimental Metadata
+~~~~~~~~~~~~~~~~~~~~~
+
+Unlike supported metadata, experimental metadata is not enabled by default in a new Dataverse installation. Feedback via any `channel <https://dataverse.org/contact>`_ is welcome!
+
+- `CodeMeta Software Metadata <https://docs.google.com/spreadsheets/d/e/2PACX-1vTE-aSW0J7UQ0prYq8rP_P_AWVtqhyv46aJu9uPszpa9_UuOWRsyFjbWFDnCd7us7PSIpW7Qg2KwZ8v/pub>`__: based on the `CodeMeta Software Metadata Schema, version 2.0 <https://codemeta.github.io/terms/>`__ (`see .tsv version <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/codemeta.tsv>`__)
+- Computational Workflow Metadata (`see .tsv <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/computational_workflow.tsv>`__): adapted from `Bioschemas Computational Workflow Profile, version 1.0 <https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE>`__ and `Codemeta <https://codemeta.github.io/terms/>`__.
+- Archival Metadata (`see .tsv <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/archival.tsv>`__): Enables repositories to register metadata relating to the potential archiving of the dataset at a depositor archive, whether that be your own institutional archive or an external archive, i.e. a historical archive.
+- Local Contexts Metadata (`see .tsv <https://github.com/gdcc/dataverse-external-vocab-support/blob/main/packages/local_contexts/cvocLocalContexts.tsv>`__): Supports integration with the `Local Contexts <https://localcontexts.org/>`__ platform, enabling the use of Traditional Knowledge and Biocultural Labels, and Notices. For more information on setup and configuration, see :doc:`../installation/localcontexts`.
+
+Please note: these custom metadata schemas are not included in the Solr schema for indexing by default, you will need
+to add them as necessary for your custom metadata blocks. See "Update the Solr Schema" in :doc:`../admin/metadatacustomization`.
 
-- `Citation Metadata <https://docs.google.com/spreadsheet/ccc?key=0AjeLxEN77UZodHFEWGpoa19ia3pldEFyVFR0aFVGa0E#gid=0>`__: compliant with `DDI Lite <http://www.ddialliance.org/specification/ddi2.1/lite/index.html>`_, `DDI 2.5 Codebook <http://www.ddialliance.org/>`__, `DataCite 3.1 <http://schema.datacite.org/meta/kernel-3.1/doc/DataCite-MetadataKernel_v3.1.pdf>`__, and Dublin Core's `DCMI Metadata Terms <http://dublincore.org/documents/dcmi-terms/>`__ (`see .tsv version <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/citation.tsv>`__). Language field uses `ISO 639-1 <https://www.loc.gov/standards/iso639-2/php/English_list.php>`__ controlled vocabulary.
-- `Geospatial Metadata <https://docs.google.com/spreadsheet/ccc?key=0AjeLxEN77UZodHFEWGpoa19ia3pldEFyVFR0aFVGa0E#gid=4>`__: compliant with DDI Lite, DDI 2.5 Codebook, DataCite, and Dublin Core (`see .tsv version <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/geospatial.tsv>`__). Country / Nation field uses `ISO 3166-1 <http://en.wikipedia.org/wiki/ISO_3166-1>`_ controlled vocabulary.
-- `Social Science & Humanities Metadata <https://docs.google.com/spreadsheet/ccc?key=0AjeLxEN77UZodHFEWGpoa19ia3pldEFyVFR0aFVGa0E#gid=1>`__: compliant with DDI Lite, DDI 2.5 Codebook, and Dublin Core (`see .tsv version <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/social_science.tsv>`__).
-- `Astronomy and Astrophysics Metadata <https://docs.google.com/spreadsheet/ccc?key=0AjeLxEN77UZodHFEWGpoa19ia3pldEFyVFR0aFVGa0E#gid=3>`__
-  : These metadata elements can be mapped/exported to the International Virtual Observatory Alliance’s (IVOA) 
-  `VOResource Schema format <http://www.ivoa.net/documents/latest/RM.html>`__ and is based on 
-  `Virtual Observatory (VO) Discovery and Provenance Metadata <http://perma.cc/H5ZJ-4KKY>`__ (`see .tsv version <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/astrophysics.tsv>`__).
-- `Life Sciences Metadata <https://docs.google.com/spreadsheet/ccc?key=0AjeLxEN77UZodHFEWGpoa19ia3pldEFyVFR0aFVGa0E#gid=2>`__: based on `ISA-Tab Specification <https://isa-specs.readthedocs.io/en/latest/isamodel.html>`__, along with controlled vocabulary from subsets of the `OBI Ontology <http://bioportal.bioontology.org/ontologies/OBI>`__ and the `NCBI Taxonomy for Organisms <http://www.ncbi.nlm.nih.gov/Taxonomy/taxonomyhome.html/>`__ (`see .tsv version <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/biomedical.tsv>`__).
-- `Journal Metadata <https://docs.google.com/spreadsheets/d/13HP-jI_cwLDHBetn9UKTREPJ_F4iHdAvhjmlvmYdSSw/edit#gid=8>`__: based on the `Journal Archiving and Interchange Tag Set, version 1.2 <https://jats.nlm.nih.gov/archiving/tag-library/1.2/chapter/how-to-read.html>`__ (`see .tsv version <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/journals.tsv>`__).
+See Also
+~~~~~~~~
 
-See also the `Dataverse 4.0 Metadata Crosswalk: DDI, DataCite, DC, DCTerms, VO, ISA-Tab <https://docs.google.com/spreadsheets/d/10Luzti7svVTVKTA-px27oq3RxCUM-QbiTkm8iMd5C54/edit?usp=sharing>`__ document and the :doc:`/admin/metadatacustomization` section of the Admin Guide.
+See also the `Dataverse Software 4.0 Metadata Crosswalk: DDI, DataCite, DC, DCTerms, VO, ISA-Tab <https://docs.google.com/spreadsheets/d/10Luzti7svVTVKTA-px27oq3RxCUM-QbiTkm8iMd5C54/edit?usp=sharing>`__ document and the :doc:`/admin/metadatacustomization` section of the Admin Guide.
diff --git a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-1.png b/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-1.png
deleted file mode 100644
index 33198c3c0dc..00000000000
Binary files a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-1.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-2.png b/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-2.png
deleted file mode 100644
index f2a0b0fdf42..00000000000
Binary files a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-2.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-3.png b/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-3.png
deleted file mode 100644
index 55b4ff9c918..00000000000
Binary files a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-3.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-4.png b/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-4.png
deleted file mode 100644
index fc9664db94d..00000000000
Binary files a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-4.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-5.png b/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-5.png
deleted file mode 100644
index 806c290381c..00000000000
Binary files a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-5.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-6.png b/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-6.png
deleted file mode 100644
index 1df343e594b..00000000000
Binary files a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-6.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-7.png b/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-7.png
deleted file mode 100644
index c688992d260..00000000000
Binary files a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-7.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-8.png b/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-8.png
deleted file mode 100644
index 9bbc6a1dac7..00000000000
Binary files a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-8.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-9.png b/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-9.png
deleted file mode 100644
index 0996ff0513f..00000000000
Binary files a/doc/sphinx-guides/source/user/data-exploration/img/geoconnect-tabular-9.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/user/data-exploration/index.rst b/doc/sphinx-guides/source/user/data-exploration/index.rst
deleted file mode 100755
index 52833e3ae50..00000000000
--- a/doc/sphinx-guides/source/user/data-exploration/index.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-.. Dataverse Exploration Guide Documentation master file, created by
-   sphinx-quickstart on Wed Aug 28 17:54:16 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Data Exploration Guide
-=======================================================
-
-The installation of Dataverse you are using may have additional or different tools configured than what appears below. For the complete list of available tools, see :ref:`inventory-of-external-tools`.
-
-Contents:
-
-.. toctree::
-
-   tworavens
-   worldmap
diff --git a/doc/sphinx-guides/source/user/data-exploration/tworavens.rst b/doc/sphinx-guides/source/user/data-exploration/tworavens.rst
deleted file mode 100755
index 1c046d310d0..00000000000
--- a/doc/sphinx-guides/source/user/data-exploration/tworavens.rst
+++ /dev/null
@@ -1,84 +0,0 @@
-.. _two-ravens:
-
-TwoRavens: Tabular Data Exploration
-+++++++++++++++++++++++++++++++++++
-
-**Please note:** This document is a bit old and may need an update. The TwoRavens
-project has a more recently published user guide on their site: `http://2ra.vn/papers/tworavens-guide.pdf <http://2ra.vn/papers/tworavens-guide.pdf>`_. 
-
-
-.. contents:: |toctitle|
-	:local:
-
-Exploring and Analyzing Tabular files in Dataverse
-==================================================
-
-On the files tab, click on the “Explore” button to initiate TwoRavens Data Exploration and Analysis Tool.
-
-Selection/Left Panel
-====================
-
-The left panel contains two sets of buttons: (1) Original Data and Subset Data; and (2) Variables, Models, and Summary.
-
-Original Data and Subset Data
------------------------------
-
-When TwoRavens is initiated, you begin with the original dataset, and thus the Original Data button is selected.  You will not be able to select the Subset Data until you have subsetted the data using the subset and select features in the right panel.  After you have selected a subset of your data, you may toggle between that subset and the original data.  If you wish to select a different subset, you may do so, but note that only one subset is supported at a time.
-
-Variables, Models, and Summary
-------------------------------
-
-Each of these tabs displays something different in the left panel when selected.  The Variables tab shows a list of all the variables.  When a variable name is hovered over, you can see that variable’s summary statistics. The first three variables are selected by default and displayed in the center panel, but you may add or remove variables by clicking on their name in the Variables tab.
-
-The Models tab displays a list of Zelig models that are supported by TwoRavens. A brief model description is visible when hovering on the model name.  Depending on the level of measurement of the dependent variable (continuous, ordinal, dichotomous, etc.), particular models may or may not be appropriate.
-  
-Note that to estimate a model, you must select one from the list. Currently, please use only Ordinary Least Squares (ls) as we are working on making other models available.  
-(Suggestion: maybe we need to gray out the ones the other ones for the time being)
-
-The Summary tab shows summary statistics when a pebble is hovered over. If one removes the pointer from hovering over a pebble, the previous tab will be displayed. So, if you wish to have the summary tab displayed regardless of where the pointer is, click on Summary before hovering over a pebble. Otherwise, if Variables or Models has been the last tab selected, when the pointer is no longer hovering over a pebble, the table will return to Variables or Models.
-
-Modeling/Center Panel
-=====================
-
-The center panel displays a graphical representation of variable relations and denotes variables that have been tagged with certain properties.  Variables may be tagged as either a dependent variable, a time series variable, or a cross sectional variable.  Each of these are accomplished by clicking on the appropriate button at the top of the screen, and then clicking on a pebble in the center panel.  You’ll notice that when a variable is tagged with a property, the fill color becomes white, and the outline (or stroke) of the pebble turns the color of the property’s button.  Note that to estimate a model, the dependent variable must be selected.
-
-Variable relations are specified by point-click-drag from one pebble to the other.  When a path between pebbles has been specified, it is visually presented with a dotted arrow line and may be removed by pushing the delete key on your keyboard. 
-
-Results/Right Panel
-===================
-
-This section allows you to specify a subset of the data that you wish to estimate the model on, or that you wish to select and see updated summary statistics and distributions, and to set covariate values for the Zelig simulations (this is Zelig’s setx function).
-
-Subset
-------
-
-To subset the data, click on the subset button and highlight (or brush) the portion of the distribution that you wish to use. You may remove the selection by clicking anywhere on the plot that is outside of the selected area.  Or, if you wish to move the selected region, click inside the selection and move it to the left or right. If no region is selected, then by default the full range of values are used. If more than one variable is selected for subsetting, only the overlapping region is used in the model. If there are no overlapping regions, (i.e., if subsetted there would be no data), then only the first variable is used.  Notice that range (or extent) of the selection for each variable is displayed below.
-
-With a region selected, you have two options. First, you may click the Estimate button to estimate a model on using only the specified subset. Second, you may click the Select button. This will not estimate a model, but it will subset the data and return new summary statistics and plots for the subset. You may wish to use this feature to see how a subset will change the Set Covariate (Zelig’s setx) defaults, for example. After selecting a subset, you may toggle back and forth between the subsetted data and the original data by activating the appropriate button in the left panel.
-
-Set Covariates
---------------
-
-The Set Covariates button plots the distributions of each of the pebbles with an additional axis that contains two sliders, each of which default to the variable’s mean. This is TwoRavens' equivalent of Zelig’s setx function. Move these sliders to the left or right to set your covariates at the desired value prior to estimation. Notice that the selected values appear below each plot.
-
-After clicking the Estimate button, the model will be estimated and, upon completion, results appear in the Results tab. The results include figures produced by Zelig (and eventually the equation that has been estimated, the R code used to estimate the model, and a results table).
-
-Additional Buttons
-==================
-
-Estimate 
---------
-
-This executes the specified statistical model. Notice the presence of blue highlight on the “Estimate” button while process is running, turning into green upon completion. Note: you cannot use estimate without selecting a dependent variable and a model.
-
-Force 
------
-
-The Force button allows you to control the way layout of the pebbles. To use this feature, first make sure none of the pebbles are highlighted.  If one is, simply click on it to remove the highlighting. Second, press and hold the control key.  Third, while holding down the control key, click the Force button. Fourth, continue to hold the control key and click on a pebble. You may now release the control key.  Click on a pebble and drag it around on your screen.
-
-Reset
------
-
-This is your start over button. Clicking this is equivalent to reloading the Web page or re-initiating TwoRavens.
-
-
diff --git a/doc/sphinx-guides/source/user/data-exploration/worldmap.rst b/doc/sphinx-guides/source/user/data-exploration/worldmap.rst
deleted file mode 100644
index fe2a6e25785..00000000000
--- a/doc/sphinx-guides/source/user/data-exploration/worldmap.rst
+++ /dev/null
@@ -1,155 +0,0 @@
-.. _world-map:
-
-WorldMap: Geospatial Data Exploration
-+++++++++++++++++++++++++++++++++++++
-
-.. contents:: |toctitle|
-   :local:
-
-Dataverse and WorldMap
-======================
-
-`WorldMap <http://worldmap.harvard.edu/>`_ is developed by the Center for Geographic Analysis (CGA) at Harvard and is open source software that helps researchers visualize and explore their data in maps. The WorldMap and Dataverse collaboration allows researchers to upload shapefiles or tabular files to Dataverse for long term storage and receive a persistent identifier (through DOI), then easily navigate into WorldMap to interact with the data.
-
-Note: WorldMap hosts their own `user guide <http://worldmap.harvard.edu/static/docs/WorldMap_Help_en.pdf>`_ that covers some of the same material as this page.
-
-What is Geoconnect?
-===================
-
-Geoconnect is a platform that integrates Dataverse and WorldMap, allowing researchers to visualize their geospatial data. Geoconnect can be used to create maps of shapefiles or of tabular files containing geospatial information. Geoconnect is an optional component of Dataverse, so if you are interested in this feature but don't see it in the installation of Dataverse you are using, you should contact the support team for that installation and ask them to enable the Geoconnect feature.
-
-If a data file's owner has created a map of that data using Geoconnect, you can view the map by clicking the "Explore" button. If the data is in the form of a shapefile, the button takes you right to the map. If it's a tabular file, the Explore button will be a dropdown, and you'll need to select "Worldmap".
-
-Mapping shapefiles with Geoconnect
-==================================
-
-Geoconnect is capable of mapping shapefiles which are uploaded to Dataverse in .zip format. Specifically, Dataverse recognizes a zipped shapefile by:
-
-1. Examining the contents of the .zip file
-
-2. Checking for the existence of four similarly named files with the following extensions: .dbf, .prj, .shp, .shx
-
-Once you have uploaded your .zip shapefile, a Map Data button will appear next to the file in the dataset. In order to use this button, you'll need to publish your dataset. Once your dataset has been published, you can click on the Map Data button to be brought to Geoconnect, the portal between Dataverse and WorldMap that will allow you to create your map. 
-
-To get started with visualizing your shapefile, click on the blue "Visualize on WorldMap" button in Geoconnect. It may take up to 45 seconds for the data to be sent to WorldMap and then back to Geoconnect.
-
-Once this process has finished, you will be taken to a new page where you can style your map through Attribute, Classification Method, Number of Intervals, and Colors. Clicking "Apply Changes" will send your map to both Dataverse and WorldMap, creating a preview of your map that will be visible on your file page and your dataset page. 
-
-Clicking "View on WorldMap" will open WorldMap in a new tab, allowing you to see how your map will be displayed there.
-
-You can delete your map with the "Delete" button. If you decide to delete the map, it will no longer appear on WorldMap, and your dataset in Dataverse will no longer display the map preview.
-
-When you're satisfied with your map, you may click "Return to the Dataverse" to go back to Dataverse.
-
-In the future, to replace your shapefile's map with a new one, simply click the Map Data button on the dataset or file page to return to the Geoconnect edit map page. 
-
-Mapping tabular files with Geoconnect
-=====================================
-
-Geoconnect can map tabular files that contain geospatial information such as latitude/longitude coordinates, census tracts, zip codes, Boston election wards, etc.
-
-
-Preparing a tabular file to be mapped
--------------------------------------
-
-**1. Ingest**
-
-Geospatial tabular files need a bit of preparation in Dataverse before they can be mapped in Geoconnect. When you upload your file, Dataverse will take about ten seconds to ingest it. During the ingest process it will identify the file as tabular data. 
-
-|image1|
-
-
-**2.Tag as Geospatial**
-
-Next, you'll need to let Dataverse know that your tabular file contains geospatial data. Select your file, click the "Edit Files" button, and select "Tags" from the dropdown menu. This will take you to the Edit Tags menu (pictured below). Under the "Tabular Data Tags" dropdown, select "Geospatial". Then click "Save Changes".
-
-|image2|
-
-
-**3. Publish & Map Data**
-
-At this point, a "Map data" button will appear next to your file. Publish this new version of your dataset to activate this button.
-
-|image3|
-
-
-Creating the map
-----------------
-
-If your tabular file contains **latitude and longitude** columns, then the process is simple: those columns may be directly mapped. Otherwise, you will need to use a *spatial join*. Spatial joins tell WorldMap how to read your tabular data file in order to create a map that accurately represents it. 
-
-To carry out a spatial join, you'll manually connect
-
-- Geospatial column(s) from your Dataverse tabular file
-	- e.g., a census tract column from your table
-
-with
-
-- A WorldMap "target layer" that contains the same geospatial information
-	- e.g., WorldMap's "target layer" containing census tract parameters
-
-The following screenshots illustrate the mapping process:
-
-**1. Once you've pressed the "Map Data" button, you're brought to this page:**
-
-|image4|
-
-**2. Choose a Geospatial Data Type**
-
-|image5|
-
-**3. Choose a column from your file to match the WorldMap Layer you selected**
-
-|image6|
-
-**4. Choose from the list of WorldMap Layers available for the Geospatial Data Type you selected**
-
-|image7|
-
-**5.Submit the data for mapping!**
-
-|image8|
-
-**6. View Results**
-
-At this point you will be presented with a basic map that can be styled to your specifications. The example pictured below includes an error message - some of the rows weren't able to be matched properly. In this case, you could still go forward with your map, but without the information from the unmatched rows.
-
-|image9|
-
-Finalizing your map
-===================
-
-Now that you have created your map:
-
-- It exists on the WorldMap platform and may be viewed there -- with all of WorldMap's capabilities.
-
-- Dataverse will contain a preview of the map and links to the larger version on WorldMap.
-
-The map editor (pictured above) provides a set of options you can use to style your map. Clicking "Apply Changes" saves the current version of your map to Dataverse and Worldmap. The "Return to the Dataverse" button brings you back to Dataverse. "View on WorldMap" takes you to the map's page on WorldMap, which offers additional views and options. 
-
-If you'd like to make further changes to your map in the future, you can return to the editor by clicking the "Map Data" button on your file.
-
-Removing your map
-=================
-
-You can delete your map at any time. If you are on Dataverse, click "Map Data" and click the "Delete Map" button on the upper right. This completely removes the map and underlying data from the WorldMap platform.
-
-
-.. |image1| image:: ./img/geoconnect-tabular-1.png
-   :class: img-responsive
-.. |image2| image:: ./img/geoconnect-tabular-2.png
-   :class: img-responsive
-.. |image3| image:: ./img/geoconnect-tabular-3.png
-   :class: img-responsive
-.. |image4| image:: ./img/geoconnect-tabular-4.png
-   :class: img-responsive
-.. |image5| image:: ./img/geoconnect-tabular-5.png
-   :class: img-responsive
-.. |image6| image:: ./img/geoconnect-tabular-6.png
-   :class: img-responsive
-.. |image7| image:: ./img/geoconnect-tabular-7.png
-   :class: img-responsive
-.. |image8| image:: ./img/geoconnect-tabular-8.png
-   :class: img-responsive
-.. |image9| image:: ./img/geoconnect-tabular-9.png
-   :class: img-responsive
diff --git a/doc/sphinx-guides/source/user/dataset-management.rst b/doc/sphinx-guides/source/user/dataset-management.rst
index 3cdc9aec954..d73459969ce 100755
--- a/doc/sphinx-guides/source/user/dataset-management.rst
+++ b/doc/sphinx-guides/source/user/dataset-management.rst
@@ -1,7 +1,7 @@
 Dataset + File Management
 +++++++++++++++++++++++++
 
-A dataset in Dataverse is a container for your data, documentation, code, and the metadata describing this Dataset.
+A dataset in a Dataverse installation is a container for your data, documentation, code, and the metadata describing this Dataset.
 
 |image1|
 
@@ -25,52 +25,66 @@ For more details about what Citation and Domain Specific Metadata is supported p
 Supported Metadata Export Formats
 ---------------------------------
 
-Once a dataset has been published, its metadata can be exported in a variety of other metadata standards and formats, which help make datasets more discoverable and usable in other systems, such as other data repositories. On each dataset page's metadata tab, the following exports are available:
+Once a dataset has been published, its metadata can be exported in a variety of other metadata standards and formats, which help make datasets more :doc:`discoverable </admin/discoverability>` and usable in other systems, such as other data repositories. On each dataset page's metadata tab, the following exports are available:
 
 - Dublin Core
 - DDI (Data Documentation Initiative Codebook 2.5)
 - DDI HTML Codebook (A more human-readable, HTML version of the DDI Codebook 2.5 metadata export)
 - DataCite 4
-- JSON (native Dataverse format)
+- JSON (native Dataverse Software format)
 - OAI_ORE
 - OpenAIRE
 - Schema.org JSON-LD
 
+Additional formats can be enabled. See :ref:`inventory-of-external-exporters` in the Installation Guide. To highlight a few:
+
+- Croissant
+- RO-Crate
+
 Each of these metadata exports contains the metadata of the most recently published version of the dataset.
 
+For each dataset, links to each enabled metadata format are available programmatically via Signposting. For details, see :ref:`discovery-sign-posting` in the Admin Guide and :ref:`signposting-api` in the API Guide.
+
+.. _adding-new-dataset:
+
 Adding a New Dataset
 ====================
 
-#. Navigate to the dataverse in which you want to add a dataset. 
-#. Click on the "Add Data" button and select "New Dataset" in the dropdown menu.
-#. To quickly get started, enter at minimum all the required fields with an asterisk (e.g., the Dataset Title, Author, 
-   Description, Contact Email and Subject) to get a Data Citation with a DOI.
+#. Navigate to the Dataverse collection in which you want to add a dataset.
+#. Click on the "Add Data" button and select "New Dataset" in the dropdown menu. **Note:** If you are on the root Dataverse collection, your My Data page or click the "Add Data" link in the navbar, the dataset you create will be hosted in the root Dataverse collection. You can change this by selecting another Dataverse collection you have proper permissions to create datasets in, from the Host Dataverse collection dropdown in the create dataset form. This option to choose will not be available after you create the dataset.
+#. To quickly get started, enter at minimum all the required fields with an asterisk (e.g., the Dataset Title, Author Name, Description Text, Point of Contact Email, and Subject) to get a Data Citation with a DOI.
+
+   #. When entering author identifiers, select the type from the dropdown (e.g. "ORCID") and under "Identifier" enter the full URL (e.g. "https://orcid.org/0000-0002-1825-0097") for identifiers that have a URL form. The shorter form of the unique identifier (e.g. "0000-0002-1825-0097") can also be entered, but URL form is preferred when available.
+
 #. Scroll down to the "Files" section and click on "Select Files to Add" to add all the relevant files to your Dataset. 
    You can also upload your files directly from your Dropbox. **Tip:** You can drag and drop or select multiple files at a time from your desktop
    directly into the upload widget. Your files will appear below the "Select Files to Add" button where you can add a
    description and tags (via the "Edit Tag" button) for each file. Additionally, an MD5 checksum will be added for each file. If you upload a tabular file a :ref:`Universal Numerical Fingerprint (UNF) <unf>` will be added to this file.
 #. Click the "Save Dataset" button when you are done. Your unpublished dataset is now created. 
 
-Note: You can add additional metadata once you have completed the initial dataset creation by going to Edit Dataset > Metadata. 
+Note: You can add additional metadata once you have completed the initial dataset creation by going to clicking the Edit button and selecting Metadata from the dropdown menu.
+
+.. _supported-html-tags:
 
-Supported HTML Fields
----------------------
+Supported HTML Tags
+-------------------
 
 We currently only support the following HTML tags for any of our textbox metadata fields (i.e., Description) : <a>, <b>, <blockquote>, 
 <br>, <code>, <del>, <dd>, <dl>, <dt>, <em>, <hr>, <h1>-<h3>, <i>, <img>, <kbd>, <li>, <ol>, <p>, <pre>, <s>, <sup>, <sub>, 
-<strong>, <strike>, <ul>.
+<strong>, <strike>, <u>, <ul>.
+
+.. _dataset-file-upload:
 
 File Upload
-==============
+===========
 
-The Dataverse software offers multiple methods of uploading files to a dataset. These upload methods are configurable by the administrator of a Dataverse installation, so you might not see some of these options on the Dataverse site you're using.
+The Dataverse Software offers multiple methods of uploading files to a dataset. These upload methods are configurable by the administrator of a Dataverse installation, so you might not see some of these options on the Dataverse installation you're using.
 
 If there are multiple upload options available, then you must choose which one to use for your dataset. A dataset may only use one upload method. Once you upload a file using one of the available upload methods, that method is locked in for that dataset. If you need to switch upload methods for a dataset that already contains files, then please contact Support by clicking on the Support link at the top of the application.
 
 You can upload files to a dataset while first creating that dataset. You can also upload files after creating a dataset by clicking the "Edit" button at the top of the dataset page and from the dropdown list selecting "Files (Upload)" or clicking the "Upload Files" button above the files table in the Files tab. From either option you will be brought to the Upload Files page for that dataset.
 
-Certain file types in Dataverse are supported by additional functionality, which can include downloading in different formats, file-level metadata preservation, file-level data citation with UNFs, and exploration through data visualization and analysis. See the :ref:`File Handling <file-handling>` section of this page for more information.
-
+Certain file types in a Dataverse installation are supported by additional functionality, which can include downloading in different formats, previews, file-level metadata preservation, file-level data citation with UNFs, and exploration through data visualization and analysis. See the :ref:`File Handling <file-handling>` section of this page for more information.
 
 HTTP Upload
 -----------
@@ -79,7 +93,7 @@ HTTP Upload is a common browser-based file upload tool you may be familiar with
 
 Once you have uploaded files, you will be able to edit file metadata, restrict access to files [#f1]_ , and/or add tags. Click "Save Changes" to complete the upload. If you uploaded a file by mistake, you can delete it before saving by clicking the checkbox to select the file, and then clicking the "Delete" button above the Files Table.
 
-File upload limit size varies based on Dataverse installation. The file upload size limit can be found in the text above the HTTP upload widget. If you need to upload a very large file or a very large *number* of files, consider using rsync + SSH upload if your installation of Dataverse offers it.
+File upload limit size varies based on Dataverse installation. The file upload size limit can be found in the text above the HTTP upload widget. If you need to upload a very large file or a very large *number* of files, consider using DVUploader (see :ref:`DVUploader`).
 
 .. [#f1] Some Dataverse installations do not allow this feature.
 
@@ -88,125 +102,300 @@ Dropbox Upload
 
 Some Dataverse installations support the ability to upload files directly from Dropbox. To do so, click the "Upload from Dropbox" button, log in to Dropbox in the pop-up window, and select the files you'd like to transfer over.
 
-.. _rsync_upload:
+.. _folder-upload:
 
-rsync + SSH Upload
-------------------
+Folder Upload
+-------------
 
-rsync is typically used for synchronizing files and directories between two different systems, using SSH to connect rather than HTTP. Some Dataverse installations allow uploads using rsync, to facilitate large file transfers in a reliable and secure manner.
+Some Dataverse installations support the ability to upload files from a local folder and subfolders. To do this, click the "Upload from Folder" button, select the folder you wish to upload, select/unselect specific files, and click "Start Uploads". More detailed instructions are available in the `DVWebloader wiki <https://github.com/gdcc/dvwebloader/wiki#use>`_.
 
-File Upload Script
-~~~~~~~~~~~~~~~~~~
+.. _DVUploader:
 
-An rsync-enabled Dataverse installation has a file upload process that differs from the traditional browser-based upload process you may be used to. In order to transfer your data to Dataverse's storage, you will need to complete the following steps:
+Command-line DVUploader
+-----------------------
 
-1. Create your dataset. In rsync-enabled Dataverse installations, you cannot upload files until the dataset creation process is complete. After you hit "Save Dataset" on the Dataset Creation page, you will be taken to the page for your dataset.
+The open-source DVUploader tool is a stand-alone command-line Java application that uses the Dataverse installation's API to upload files to a specified Dataset. Since it can be installed by users, and requires no server-side configuration, it can be used with any Dataverse installation. It is intended as an alternative to uploading files through the Dataverse installation's web interface in situations where the web interface is inconvenient due to the number of files or file locations (spread across multiple directories, mixed with files that have already been uploaded or file types that should be excluded) or the need to automate uploads. Since it uses the Dataverse installation's API, transfers are limited in the same ways as HTTP uploads through the Dataverse installation's web interface in terms of size and performance. The DVUploader logs its activity and can be killed and restarted as desired. If stopped and resumed, it will continue processing from where it left off.
 
-2. On the dataset page, click the "+ Upload Files" button. This will open a box with instructions and a link to the file upload script.
+Usage
+~~~~~
 
-3. Make sure your files are ready for upload. You will need to have one directory that you can point the upload script to. All files in this directory and in any subdirectories will be uploaded. The directory structure will be preserved, and will be reproduced when your dataset is downloaded from Dataverse. Note that your data will be uploaded in the form of a data package, and each dataset can only host one such package. Be sure that all files you want to include are present before you upload.
+The DVUploader is open source and is available as source, as a Java jar, and with documentation at https://github.com/GlobalDataverseCommunityConsortium/dataverse-uploader. The DVUploader requires Java 1.8+. Users will need to install Java if they don't already have it and then download the latest release of the DVUploader - jar file. Users will need to know the URL of the Dataverse installation, the DOI of their existing dataset, and have generated an API Key for the Dataverse installation (an option in the user's profile menu). 
 
-4. Download the rsync file upload script by clicking the "Download Script" button in the Upload Files instruction box. There are no requirements for where you save the script; put it somewhere you can find it. Downloading the upload script will put a temporary lock on your dataset to prepare it for upload. While your dataset is locked, you will not be able to delete or publish your dataset, or edit its metadata. Once you upload your files and Dataverse processes them, your dataset will be automatically unlocked and these disabled functions will be enabled again. If you have downloaded the script and locked your dataset, but you have then changed your mind and decided *not* to upload files, please contact Support about unlocking your dataset.
+Basic usage is to run the command: ::
 
-5. To begin the upload process, you will need to run the script you downloaded. For this, you will have to go outside your browser and open a terminal (AKA command line) window on your computer. Use the terminal to navigate to the directory where you saved the upload script, and run the command that the Upload Files instruction box provides. This will begin the upload script. Please note that this upload script will expire 7 days after you downloaded it. If it expires and you still need to use it, simply download the script from Dataverse again.
+    java -jar DVUploader-*.jar -server=<Dataverse Installation URL> -did=<Dataset DOI> -key=<User's API Key> <file or directory list>
 
-**Note:** Unlike other operating systems, Windows does not come with rsync supported by default. We have not optimized this feature for Windows users, but you may be able to get it working if you install the right Unix utilities. (If you have found a way to get this feature working for you on Windows, you can contribute it to our project. Please reference our `Contributing to Dataverse <https://github.com/IQSS/dataverse/blob/master/CONTRIBUTING.md>`_ document in the root of the source tree.)
+Additional command line arguments are available to make the DVUploader list what it would do without uploading, limit the number of files it uploads, recurse through sub-directories, verify fixity, exclude files with specific extensions or name patterns, and/or wait longer than 60 seconds for any Dataverse installation ingest lock to clear (e.g. while the previously uploaded file is processed, as discussed in the :ref:`File Handling <file-handling>` section below). 
 
-6. Follow the instructions provided by the upload script running in your terminal. It will direct you to enter the full path of the directory where your dataset files are located, and then it will start the upload process. Once you've initiated the upload, if you need to cancel it then you can do so by canceling the script running in your terminal window. If your upload gets interrupted, you can resume it from the same point later.
+DVUploader is a community-developed tool, and its creation was primarily supported by the Texas Digital Library. Further information and support for DVUploader can be sought at `the project's GitHub repository <https://github.com/GlobalDataverseCommunityConsortium/dataverse-uploader>`_ . 
 
-7. Once the upload script completes its job, Dataverse will begin processing your data upload and running a checksum validation. This may take some time depending on the file size of your upload. During processing, you will see a blue bar at the bottom of the dataset page that reads "Upload in progress..." 
+Integrations Dashboard Uploader
+-------------------------------
 
-8. Once processing is complete, you will be notified. At this point you can publish your dataset and your data will be available for download on the dataset page.
+There is an experimental uploader described at :ref:`integrations-dashboard` that provides a graphical user interface (GUI) for uploading files from a local file system and various remote locations such as GitHub.
 
-**Note:** A dataset can only hold one data package. If you need to replace the data package in your dataset, contact Support.
+.. _duplicate-files:
 
-Command-line DVUploader
------------------------
+Duplicate Files
+---------------
 
-The open-source DVUploader tool is a stand-alone command-line Java application that uses the Dataverse API to upload files to a specified Dataset. Since it can be installed by users, and requires no server-side configuration, it can be used with any Dataverse installation. It is intended as an alternative to uploading files through the Dataverse web interface in situations where the web interface is inconvenient due to the number of files or file locations (spread across multiple directories, mixed with files that have already been uploaded or file types that should be excluded) or the need to automate uploads. Since it uses the Dataverse API, transfers are limited in the same ways as HTTP uploads through the Dataverse web interface in terms of size and performance. The DVUploader logs its activity and can be killed and restarted as desired. If stopped and resumed, it will continue processing from where it left off.
+Beginning with Dataverse Software 5.0, the way a Dataverse installation handles duplicate files (filename and checksums) is changing to be more flexible. Specifically:
 
-Usage
-~~~~~
+- Files with the same checksum can be included in a dataset, even if the files are in the same directory.
+- Files with the same filename can be included in a dataset as long as the files are in different directories.
+- If a user uploads a file to a directory where a file already exists with that directory/filename combination, the Dataverse installation will adjust the file path and names by adding "-1" or "-2" as applicable. This change will be visible in the list of files being uploaded. 
+- If the directory or name of an existing or newly uploaded file is edited in such a way that would create a directory/filename combination that already exists, the Dataverse installation will display an error.
+- If a user attempts to replace a file with another file that has the same checksum, an error message will be displayed and the file will not be able to be replaced.
+- If a user attempts to replace a file with a file that has the same checksum as a different file in the dataset, a warning will be displayed.
 
-The DVUploader is open source and is available as source, as a Java jar, and with documentation at https://github.com/IQSS/dataverse-uploader. The DVUploader requires Java 1.8+. Users will need to install Java if they don't already have it and then download the DVUploader-v1.0.0.jar file. Users will need to know the URL of the Dataverse server, the DOI of their existing Dataverse Dataset, and have generated a Dataverse API Key (an option in the user's profile menu). 
+BagIt Support
+-------------
 
-Basic usage is to run the command: ::
+BagIt is a set of hierarchical file system conventions designed to support disk-based storage and network transfer of arbitrary digital content. It offers several benefits such as integration with digital libraries, easy implementation, and transfer validation. See `the Wikipedia article <https://en.wikipedia.org/wiki/BagIt>`__ for more information.
 
-    java -jar DVUploader-v1.0.0.jar -server=<Dataverse server URL> -did=<Dataset DOI> -key=<User's API Key> <file or directory list>
+If the Dataverse installation you are using has enabled BagIt file handling, when uploading BagIt files the repository will validate the checksum values listed in each BagIt’s manifest file against the uploaded files and generate errors about any mismatches. The repository will identify a certain number of errors, such as the first five errors in each BagIt file, before reporting the errors.
 
-Additional command line arguments are available to make the DVUploader list what it would do without uploading, limit the number of files it uploads, recurse through sub-directories, verify fixity, exclude files with specific extensions or name patterns, and/or wait longer than 60 seconds for any Dataverse ingest lock to clear (e.g. while the previously uploaded file is processed, as discussed in the :ref:`File Handling <file-handling>` section below). 
+|bagit-image1|
 
-DVUploader is a community-developed tool, and its creation was primarily supported by the Texas Digital Library. Further information and support for DVUploader can be sought at `the project's GitHub repository <https://github.com/IQSS/dataverse-uploader>`_ . 
+You can fix the errors and reupload the BagIt files.
+
+More information on how your admin can enable and configure the BagIt file handler can be found in the :ref:`Installation Guide <BagIt File Handler>`.
 
 .. _file-handling:
 
 File Handling
 =============
 
-Certain file types in Dataverse are supported by additional functionality, which can include downloading in different formats, file-level metadata preservation, file-level data citation; and exploration through data visualization and analysis. See the sections below for information about special functionality for specific file types.
+Certain file types in the Dataverse installation are supported by additional functionality, which can include downloading in different formats, previews, file-level metadata preservation, file-level data citation; and exploration through data visualization and analysis. See the sections below for information about special functionality for specific file types.
+
+.. _file-previews:
+
+File Previews
+-------------
+
+Dataverse installations can add previewers for common file types uploaded by their research communities. The previews appear on the file page. If a preview tool for a specific file type is available, the preview will be created and will display automatically, after terms have been agreed to or a guestbook entry has been made, if necessary. File previews are not available for restricted files unless they are being accessed using a Preview URL. See also :ref:`previewUrl`. When the dataset license is not the default license, users will be prompted to accept the license/data use agreement before the preview is shown. See also :ref:`license-terms`.
+
+Previewers are available for the following file types:
+
+- Text
+- PDF
+- Markdown
+- Tabular (CSV, Excel, etc., see :doc:`tabulardataingest/index`)
+- Code (R, etc.)
+- Images (PNG, GIF, JPG)
+- Audio (MP3, MPEG, WAV, OGG, M4A)
+- Video (MP4, OGG, Quicktime)
+- Zip (preview and extract/download)
+- HTML
+- GeoJSON
+- GeoTIFF
+- Shapefile
+- NetCDF/HDF5
+- Hypothes.is
 
+Additional file types will be added to the `dataverse-previewers <https://github.com/gdcc/dataverse-previewers>`_ repo before they are listed above so please check there for the latest information or to request (or contribute!) an additional file previewer.
+
+Installation of previewers is explained in the :doc:`/admin/external-tools` section of in the Admin Guide.
 
 Tabular Data Files
 ------------------
 
-Files in certain formats - Stata, SPSS, R, Excel(xlsx) and CSV - may be ingested as tabular data (see :doc:`/user/tabulardataingest/index` section of the User Guide for details). Tabular data files can be further explored and manipulated with `TwoRavens <../user/data-exploration/tworavens.html>`_ - a statistical data exploration application integrated with Dataverse, as well as other :doc:`/admin/external-tools` if they have been enabled in the installation of Dataverse you are using. TwoRavens allows the user to run statistical models, view summary statistics, download subsets of variable vectors and more. To start, click on the "Explore" button, found next to each relevant tabular file (the application will be opened in a new window). Create and download your subset using `TwoRavens <../user/data-exploration/tworavens.html>`_. See the `TwoRavens documentation section <../user/data-exploration/tworavens.html>`_ for more information.
+Files in certain formats - Stata, SPSS, R, Excel (xlsx), CSV and TSV - may be ingested as tabular data (see :doc:`/user/tabulardataingest/index` section of the User Guide for details). Tabular data files can be further explored and manipulated with :doc:`/admin/external-tools` if they have been enabled in the Dataverse installation you are using.
 
 Additional download options available for tabular data (found in the same drop-down menu under the "Download" button): 
 
 - As tab-delimited data (with the variable names in the first row); 
 - The original file uploaded by the user; 
 - Saved as R data (if the original file was not in R format); 
-- Variable Metadata (as a `DDI Codebook <http://www.ddialliance.org/Specification/DDI-Codebook/>`_ XML file);
-- Data File Citation (currently in either RIS, EndNote XML, or BibTeX format); 
-- All of the above, as a zipped bundle. 
+- Variable Metadata (as a `DDI Codebook <https://www.ddialliance.org/Specification/DDI-Codebook/>`_ XML file);
+- Data File Citation (currently in either RIS, EndNote XML, or BibTeX format).
 
+Differentially Private (DP) Metadata can also be accessed for restricted tabular files if the data depositor has created a DP Metadata Release. See :ref:`dp-release-create` for more information.
 
-Geospatial
-----------
+.. _research-code:
+
+Research Code
+-------------
+
+Code files - such as Stata, R, MATLAB, or Python files or scripts - have become a frequent addition to the research data deposited in Dataverse repositories. Research code is typically developed by few researchers with the primary goal of obtaining results, while its reproducibility and reuse aspects are sometimes overlooked. Because several independent studies reported issues trying to rerun research code, please consider the following guidelines if your dataset contains code.
+
+The following are general guidelines applicable to all programming languages.
+
+- Create a README text file in the top-level directory to introduce your project. It should answer questions that reviewers or reusers would likely have, such as how to install and use your code. If in doubt, consider using existing templates such as `a  README template for social science replication packages <https://social-science-data-editors.github.io/template_README/template-README.html>`_.
+- Depending on the number of files in your dataset, consider having data and code in distinct directories, each of which should have some documentation like a README. 
+- Consider adding a license to your source code. You can do that by creating a LICENSE file in the dataset or by specifying the license(s) in the README or directly in the code. Find out more about code licenses at `the Open Source Initiative webpage <https://opensource.org/licenses>`_.
+- If possible, use free and open-source file formats and software to make your research outputs more reusable and accessible.
+- Consider testing your code in a clean environment before sharing it, as it could help you identify missing files or other errors. For example, your code should use relative file paths instead of absolute (or full) file paths, as they can cause an execution error.
+- Consider providing notes (in the README) on the expected code outputs or adding tests in the code, which would ensure that its functionality is intact.
+
+Capturing code dependencies will help other researchers recreate the necessary runtime environment. Without it, your code will not be able to run correctly (or at all). 
+One option is to use platforms such as `Jupyter Binder <https://mybinder.org>`_ or `Renku <https://renkulab.io>`_, which facilitate research reproducibility. For more information, have a look at :doc:`/admin/integrations` in the Admin Guide, especially the sections on :ref:`binder` and :ref:`renku`.
+Another option is to use an automatic code dependency capture, which is often supported through the programming language. Here are a few examples:
+
+- If you are using the conda package manager, you can export your environment with the command ``conda env export > environment.yml``. For more information, see the `official documentation <https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#sharing-an-environment>`__.
+- Python has multiple conventions for capturing its dependencies, but probably the best-known one is with the ``requirements.txt`` file, which is created using the command ``pip freeze > requirements. txt``. Managing environments with ``pip`` is explained in the `official documentation <https://docs.python.org/3/tutorial/venv.html#managing-packages-with-pip>`__.
+- If you are using the R programming language, create a file called ``install.R``, and list all library dependencies that your code requires. This file should be executable in R to set up the environment. See also other strategies for capturing the environment proposed by RStudio in the `official documentation <https://environments.rstudio.com>`__.
+- In case you are using multiple programming languages or different versions of the same language, consider using a containerization technology such as Docker. You can create a Dockerfile that builds your environment and deposit it within your dataset (see `the official documentation <https://docs.docker.com/language/python/build-images/>`__). It is worth noting that creating a reliable Dockerfile may be tricky. If you choose this route, make sure to specify dependency versions and check out `Docker's best practices <https://docs.docker.com/develop/develop-images/dockerfile_best-practices/>`_.
 
-Geospatial `shapefiles <http://en.wikipedia.org/wiki/Shapefile>`_ can be further explored and manipulated through our integration with `WorldMap <../user/data-exploration/worldmap.html>`_, a geospatial data visualization and analysis tool developed by the `Center for Geographic Analysis <http://gis.harvard.edu/>`_ at Harvard University. A shapefile is a set of files, often uploaded/transferred in .zip format.  This set may contain up to 15 files.  A minimum of 3 specific files (.shp, .shx, .dbf) are needed to be a valid shapefile and a 4th file (.prj) is required for WorldMap--or any type of meaningful visualization.
+Finally, automating your code can be immensely helpful to the code and research reviewers. Here are a few options on how to automate your code.
 
-For ingest into Dataverse and connecting to WorldMap, these 4 files are the minimum required:
+- A simple way to automate your code is using a bash script or Make. The Turing Way Community has `a detailed guide <https://the-turing-way.netlify.app/reproducible-research/make.html>`_ on how to use the Make build automation tool.
+- Consider using research workflow tools to automate your analysis. A popular workflow tool is called Common Workflow Language, and you can find more information about it `from the Common Workflow Language User Guide <https://www.commonwl.org/user_guide/>`_.
 
-* .shp - shape format; the feature geometry itself
-* .shx - shape index format; a positional index of the feature geometry to allow seeking forwards and backwards quickly
-* .dbf - attribute format; columnar attributes for each shape, in dBase IV format
-* .prj - projection format; the coordinate system and projection information, a plain text file describing the projection using well-known text format
+**Note:** Capturing code dependencies and automating your code will create new files in your directory. Make sure to include them when depositing your dataset.
 
-For a zipped shapefile, we require 4 files with these extensions. Other files may be included within the zipped shapefile, but they are not required: 
+Computational Workflow
+----------------------
 
-* .shp
-* .shx 
-* .prj 
-* .dbf 
+Computational Workflow Definition
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For example, if these files were included within a .zip, the “Map Data” button would appear: 
+Computational workflows precisely describe a multi-step process to coordinate multiple computational tasks and their data dependencies that lead to data products in a scientific application. The computational tasks take different forms, such as running code (e.g. Python, C++, MATLAB, R, Julia), invoking a service, calling a command-line tool, accessing a database (e.g. SQL, NoSQL), submitting a job to a compute cloud (e.g. on-premises cloud, AWS, GCP, Azure), and execution of data processing scripts or workflow. The following diagram shows an example of a computational workflow with multiple computational tasks.
 
-* subway_line.shp 
-* subway_line.shx 
-* subway_line.prj 
-* subway_line.dbf
+|cw-image1|
 
-Once you publish your dataset with your shape files, you will be able to use the "Map Data" button using `GeoConnect <https://github.com/IQSS/geoconnect>`_ to visualize and manipulate these files for users to Explore this geospatial data using the `WorldMap <http://worldmap.harvard.edu/>`__ interface. Please note: In order to map your data file, a copy will be sent to Harvard's `WorldMap <http://worldmap.harvard.edu/>`__ platform. You have the ability to delete any maps, and associated data, from the Harvard WorldMap platform, at any time.
+
+FAIR Computational Workflow
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The FAIR Principles (Findable, Accessible, Interoperable, Reusable) apply to computational workflows (https://doi.org/10.1162/dint_a_00033) in two areas: as FAIR data and as FAIR criteria for workflows as digital objects. In the FAIR data area, "*properly designed workflows contribute to FAIR data principles since they provide the metadata and provenance necessary to describe their data products, and they describe the involved data in a formalized, completely traceable way*" (https://doi.org/10.1162/dint_a_00033). Regarding the FAIR criteria for workflows as digital objects, "*workflows are research products in their own right, encapsulating methodological know-how that is to be found and published, accessed and cited, exchanged and combined with others, and reused as well as adapted*" (https://doi.org/10.1162/dint_a_00033).
+
+How to Create a Computational Workflow
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There are multiple approaches to creating computational workflows. You may consider standard frameworks and tools such as Common Workflow Language (CWL), Snakemake, Galaxy, Nextflow, Ruffus or *ad hoc* methods using different programming languages (e.g. Python, C++, MATLAB, Julia, R), notebooks (e.g. Jupyter Notebook, R Notebook, and MATLAB Live Script) and command-line interpreters (e.g. Bash). Each computational task is defined differently, but all meet the definition of a computational workflow and all result in data products. You can find a few examples of computational workflows in the following GitHub repositories, where each follows several aspects of FAIR principles:
+
+- Common Workflow Language (`GitHub Repository URL <https://github.com/fasrc/epa_cwl_airflow>`__)
+- R Notebook (`GitHub Repository URL <https://github.com/fasrc/R_computational_workflow>`__)
+- Jupyter Notebook (`GitHub Repository URL <https://github.com/fasrc/python-computational-workflow>`__)
+- MATLAB Script (`GitHub Repository URL <https://github.com/fasrc/Matlab_computational_workflow>`__)
+
+You are encouraged to review these examples when creating a computational workflow and publishing in a Dataverse repository.
+
+At https://workflows.community, the Workflows Community Initiative offers resources for computational workflows, such as a list of workflow systems (https://workflows.community/systems) and other workflow registries (https://workflows.community/registries). The initiative also helps organize working groups related to workflows research, development and application.
+
+How to Upload Your Computational Workflow
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+After you :ref:`upload your files <dataset-file-upload>`, you can apply a "Workflow" tag to your workflow files, such as your Snakemake or R Notebooks files, so that you and others can find them more easily among your deposit’s other files.
+
+|cw-image3|
+
+|cw-image4|
+
+How to Describe Your Computational Workflow
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Dataverse installation you are using may have enabled Computational Workflow metadata fields for your use. If so, when :ref:`editing your dataset metadata <adding-new-dataset>`, you will see the fields described below.
+
+|cw-image2|
+
+As described in the :ref:`metadata-references` section of the :doc:`/user/appendix`, the three fields are adapted from `Bioschemas Computational Workflow Profile, version 1.0 <https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE>`__ and `Codemeta <https://codemeta.github.io/terms/>`__:
+
+- **Workflow Type**: The kind of Computational Workflow, which is designed to compose and execute a series of computational or data manipulation steps in a scientific application
+- **External Code Repository URL**: A link to another public repository where the un-compiled, human-readable code and related code is also located (e.g., GitHub, GitLab, SVN)
+- **Documentation**: A link (URL) to the documentation or text describing the Computational Workflow and its use
+
+
+How to Search for Computational Workflows
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If the search page of the Dataverse repository you are using includes a "Dataset Feature" facet with a Computational Workflows link, you can follow that link to find only datasets that contain computational workflows.
+
+You can also search on the "Workflow Type" facet, if the Dataverse installation has the field enabled, to find datasets that contain certain types of computational workflows, such as workflows written in Common Workflow Language files or Jupyter Notebooks.
+
+|cw-image5|
+
+You can also search for files within datasets that have been tagged as "Workflow" files by clicking the Files checkbox to show only files and using the File Tag facet to show only files tagged as "Workflow".
+
+|cw-image6|
+
+.. _fits:
 
 Astronomy (FITS)
 ----------------
 
-Metadata found in the header section of `Flexible Image Transport System (FITS) files <http://fits.gsfc.nasa.gov/fits_primer.html>`_ are automatically extracted by Dataverse, aggregated and displayed in the Astronomy Domain-Specific Metadata of the Dataset that the file belongs to. This FITS file metadata, is therefore searchable and browsable (facets) at the Dataset-level.
+Metadata found in the header section of `Flexible Image Transport System (FITS) files <https://fits.gsfc.nasa.gov/fits_primer.html>`_ are automatically extracted by the Dataverse Software, aggregated and displayed in the Astronomy Domain-Specific Metadata of the Dataset that the file belongs to. This FITS file metadata, is therefore searchable and browsable (facets) at the Dataset-level.
+
+.. _geojson:
+
+GeoJSON
+-------
+
+A map will be shown as a preview of GeoJSON files when the previewer has been enabled (see :ref:`file-previews`). See also a `video demo <https://www.youtube.com/watch?v=EACJJaV3O1c&t=588s>`_ of the GeoJSON previewer by its author, Kaitlin Newson.
+
+.. _geotiff:
+
+GeoTIFF
+-------
+
+A map is also displayed as a preview of GeoTiFF image files, whose previewer must be enabled (see :ref:`file-previews`). Since GeoTIFFs do not have their own mimetype, it is advisable to use this previewer only when GeoTIFFs are used (and not "normal" TIFs). For performance reasons, this previewer has a file size limit of 15 MB and a row/column limit of 50,000 so that larger files are not loaded.
+
+.. _shapefile:
+
+Shapefile
+---------
+
+Another previewer can be enabled for shapefiles (see :ref:`file-previews`). This previewer only works with zipped shapefiles (see :doc:`/developers/geospatial`). A file size limit of 20 MB is set for this previewer (also because of performance reasons).
+
+.. _netcdf-and-hdf5:
+
+NetCDF and HDF5
+---------------
+
+H5Web Previewer
+~~~~~~~~~~~~~~~
+
+NetCDF and HDF5 files can be explored and visualized with H5Web_, which has been adapted into a file previewer tool (see :ref:`file-previews`) that can be enabled in your Dataverse installation.
+
+.. _H5Web: https://h5web.panosc.eu
+
+|h5web|
+
+NcML
+~~~~
+
+For NetCDF and HDF5 files, an attempt will be made to extract metadata in NcML_ (XML) format and save it as an auxiliary file. (See also :doc:`/developers/aux-file-support` in the Developer Guide.) A previewer for these NcML files is available (see :ref:`file-previews`).
+
+Please note that only modern versions of these formats, the ones based on HDF5 such as NetCDF 4+ and HDF5 itself (rather than HDF4), will yield an NcML auxiliary file.
+
+.. _NcML: https://docs.unidata.ucar.edu/netcdf-java/current/userguide/ncml_overview.html
+
+Geospatial Bounding Box
+~~~~~~~~~~~~~~~~~~~~~~~
+
+An attempt will be made to extract a geospatial bounding box (west, south, east, north) from NetCDF and HDF5 files and then insert these values into the geospatial metadata block, if enabled.
+
+This is the mapping that is used:
+
+- geospatial_lon_min: West Longitude
+- geospatial_lon_max: East Longitude
+- geospatial_lat_max: North Latitude
+- geospatial_lat_min: South Latitude
+
+Please note the following rules regarding these fields:
+
+- West Longitude and East Longitude are expected to be in the range of -180 and 180. (When using :ref:`geospatial-search`, you should use this range for longitude.)
+- If West Longitude and East Longitude are both over 180 (outside the expected -180:180 range), 360 will be subtracted to shift the values from the 0:360 range to the expected -180:180 range.
+- If either West Longitude or East Longitude are less than zero but the other longitude is greater than 180 (which would imply an indeterminate domain, a lack of clarity of if the domain is -180:180 or 0:360), metadata will be not be extracted.
+- If the bounding box was successfully populated, the subsequent removal of the NetCDF or HDF5 file from the dataset does not automatically remove the bounding box from the dataset metadata. You must remove the bounding box manually, if desired.
+- This feature is disabled if S3 direct upload is enabled (see :ref:`s3-direct-upload-features-disabled`) unless :ref:`dataverse.netcdf.geo-extract-s3-direct-upload` has been set to true.
+
+If the bounding box was successfully populated, :ref:`geospatial-search` should be able to find it.
+
+.. _compressed-files:
 
 Compressed Files
 ----------------
 
 Compressed files in .zip format are unpacked automatically. If a .zip file fails to unpack for whatever reason, it will upload as is. If the number of files inside are more than a set limit (1,000 by default, configurable by the Administrator), you will get an error message and the .zip file will upload as is.
 
-If the uploaded .zip file contains a folder structure, Dataverse will keep track of this structure. A file's location within this folder structure is displayed in the file metadata as the File Path. When you download the contents of the dataset, this folder structure will be preserved and files will appear in their original locations. 
+If the uploaded .zip file contains a folder structure, the Dataverse installation will keep track of this structure. A file's location within this folder structure is displayed in the file metadata as the File Path. When you download the contents of the dataset, this folder structure will be preserved and files will appear in their original locations. 
 
 These folder names are subject to strict validation rules. Only the following characters are allowed: the alphanumerics, '_', '-', '.' and ' ' (white space). When a zip archive is uploaded, the folder names are automatically sanitized, with any invalid characters replaced by the '.' character. Any sequences of dots are further replaced with a single dot. For example, the folder name ``data&info/code=@137`` will be converted to ``data.info/code.137``. When uploading through the Web UI, the user can change the values further on the edit form presented, before clicking the 'Save' button. 
 
 .. note:: If you upload multiple .zip files to one dataset, any subdirectories that are identical across multiple .zips will be merged together when the user downloads the full dataset.
 
-
-
 Other File Types
 ----------------
 
@@ -215,6 +404,17 @@ There are several advanced options available for certain file types.
 - Image files: .jpg, .png, and .tif files are able to be selected as the default thumbnail for a dataset. The selected thumbnail will appear on the search result card for that dataset.
 - SPSS files: SPSS files can be tagged with the language they were originally coded in. This is found by clicking on Advanced Options and selecting the language from the list provided.
 
+.. _restricted-files:
+
+Restricted Files
+================
+
+When you restrict a file it cannot be downloaded unless permission has been granted.
+
+Differentially Private (DP) Metadata can be accessed for restricted tabular files if the data depositor has created a DP Metadata Release. See :ref:`dp-release-create` for more information.
+
+See also :ref:`terms-of-access` and :ref:`permissions`.
+
 Edit Files
 ==========
 
@@ -241,7 +441,7 @@ Variable Metadata can be edited directly through an API call (:ref:`API Guide: E
 File Path
 ---------
 
-The File Path metadata field is Dataverse's way of representing a file's location in a folder structure. When a user uploads a .zip file containing a folder structure, Dataverse automatically fills in the File Path information for each file contained in the .zip. If a user downloads the full dataset or a selection of files from it, they will receive a folder structure with each file positioned according to its File Path.
+The File Path metadata field is a Dataverse installation's way of representing a file's location in a folder structure. When a user uploads a .zip file containing a folder structure, the Dataverse installation automatically fills in the File Path information for each file contained in the .zip. If a user downloads the full dataset or a selection of files from it, they will receive a folder structure with each file positioned according to its File Path. Only one file with a given path and name may exist in a dataset. Editing a file to give it the same path and name as another file already existing in the dataset will cause an error.
 
 A file's File Path can be manually added or edited on the Edit Files page. Changing a file's File Path will change its location in the folder structure that is created when a user downloads the full dataset or a selection of files from it.
 
@@ -268,60 +468,95 @@ After successfully replacing a file, a new dataset draft version will be created
 Terms
 =====
 
-Dataset terms can be viewed and edited from the Terms tab of the dataset page, or under the Edit dropdown button of a Dataset. There, you can set up how users can use your data once they have downloaded it (CC0 waiver or custom Terms of Use), how they can access your data if you have files that are restricted (terms of access), and enable a Guestbook for your dataset so that you can track who is using your data and for what purposes. These are explained in further detail below:
+Dataset terms can be viewed and edited from the Terms tab of the dataset page, or under the Edit dropdown button of a Dataset. There, you can set up how users can use your data once they have downloaded it (via a standard license or, if allowed, custom terms), how they can access your data if you have files that are restricted (terms of access), and enable a Guestbook for your dataset so that you can track who is using your data and for what purposes. These are explained in further detail below:
 
-CC0 Public Domain Dedication
-----------------------------
-By default, all new datasets created through Dataverse's web UI are given a `Creative Commons CC0 Public Domain Dedication <https://creativecommons.org/publicdomain/zero/1.0/>`_.
+Choosing a License
+------------------
+
+Each Dataverse installation provides a set of license(s) data can be released under, and whether users can specify custom terms instead (see below). 
+One of the available licenses (often the `Creative Commons CC0 Public Domain Dedication <https://creativecommons.org/publicdomain/zero/1.0>`_) serves as the default if you do not make an explicit choice.
+If you want to apply one of the other available licenses to your dataset, you can change it on the Terms tab of your Dataset page.
 
-The `Creative Commons <https://creativecommons.org>`_ organization defines a number of `licenses <https://creativecommons.org/licenses/>`_ that allow copyright holders to release their intellectual property more openly, with fewer legal restrictions than standard copyright enforces. Each Creative Commons license typically specifies simple terms for how the IP must be used, reused, shared, and attributed. In addition to these licenses, Creative Commons also provides public domain tools that make it easy to dedicate IP to the public domain. 
+License Selection and Professional Norms
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In the context of Dataverse, their `CC0 Public Domain Dedication <https://creativecommons.org/share-your-work/public-domain/cc0>`_ allows you to unambiguously waive all copyright control over your data in all jurisdictions worldwide. Data released with CC0 can be freely copied, modified, and distributed (even for commercial purposes) without violating copyright. In most parts of the world, factual data is exempt from copyright anyway, but applying CC0 removes all ambiguity and makes the legal copyright status of the data as clear as possible. Dataverse applies CC0 to datasets by default because it facilitates reuse, extensibility, and long-term preservation of research data by assuring that the data can be safely handled by anyone without fear of potential copyright pitfalls. 
+When selecting a license, data depositors should recognize that their data will be available internationally and, over the long term, may be used in new forms of research (for example, in machine learning where millions of datasets might be used in training).
+It is therefore useful to consider licenses that have been developed with awareness of international law and that place minimal restrictions on reuse.
+ 
+For example, the `Creative Commons <https://creativecommons.org>`_ organization defines a number of `licenses <https://creativecommons.org/licenses/>`_ that allow copyright holders to release their intellectual property more openly, with fewer legal restrictions than standard copyright enforces.
+(These licenses may or may not be available in the Dataverse instance you are using, but we expect them to be common in the community.)
+Each Creative Commons license typically specifies simple terms for how the IP must be used, reused, shared, and attributed and includes language intended to address variations in the laws of different countries.
 
-Though CC0 waives a dataset owner's legal copyright controls over the data, it does not exempt Dataverse users from following ethical and professional norms in scholarly communications. The `Dataverse Community Norms <https://dataverse.org/best-practices/dataverse-community-norms>`_ * as well as scientific best practices assert that proper credit should be given via citation. Regardless of whether CC0 has been applied or not, Dataverse users are expected to cite the data they use, giving credit to the data's authors. This expectation applies to both the Dataverse Community and the entire wider scholarly community. 
+In addition to these licenses, Creative Commons also provides the `CC0 1.0 Universal (CC0 1.0) Public Domain Dedication <https://creativecommons.org/share-your-work/public-domain/cc0>`_ which allows you to unambiguously waive all copyright control over your data in all jurisdictions worldwide.
+Data released with CC0 can be freely copied, modified, and distributed (even for commercial purposes) without violating copyright. 
+In most parts of the world, factual data is exempt from copyright anyway, but applying CC0 removes all ambiguity and makes the legal copyright status of the data as clear as possible. 
 
-Additionally, users are still expected to respect access restrictions and other terms applied to CC0 files in Dataverse. Additional restrictions, conditions, and terms can still be compatible with CC0, as CC0 only operates in the realm of copyright, which is rather limited when it comes to data.
+When available. CC0 can be a good choice for datasets because it facilitates reuse, extensibility, and long-term preservation of research data by assuring that the data can be safely handled by anyone without fear of potential copyright pitfalls. 
 
-If a data owner feels that CC0 is not suitable for their data, they are able to enter custom Terms of Use, as detailed in the following section.
+Data depositors and data users should also understand that while licenses define legal use, they do not exempt a Dataverse installation's users from following ethical and professional norms in scholarly communications.
+For example, though CC0 waives a dataset owner's legal copyright controls over the data, users, as scholarly researchers, are still expected to cite the data they use, giving credit to the data's authors following ethical and professional norms in scholarly communications.
+This is true of other licenses as well - users should cite data as appropriate even if the specified license does not require it. 
+The `Dataverse Community Norms <https://dataverse.org/best-practices/dataverse-community-norms>`_\* detail additional areas where data users should follow societal norms and scientific best practices.
 
-\* **Legal Disclaimer:** these `Community Norms <https://dataverse.org/best-practices/dataverse-community-norms>`_ are not a substitute for the CC0 waiver or custom terms and licenses applicable to each dataset. The Community Norms are not a binding contractual agreement, and that downloading datasets from Dataverse does not create a legal obligation to follow these policies.  
+\* **Legal Disclaimer:** these `Community Norms <https://dataverse.org/best-practices/dataverse-community-norms>`_ are not a substitute for the CC0 waiver or custom terms and licenses applicable to each dataset. The Community Norms are not a binding contractual agreement, and downloading datasets from a Dataverse installation does not create a legal obligation to follow these policies.
 
 Custom Terms of Use for Datasets
 --------------------------------
 
-If you are unable to use the CC0 Public Domain Dedication for your datasets, you may specify your own custom Terms of Use. To do so, select "No, do not apply CC0 - "Public Domain Dedication", and a Terms of Use text box will show up allowing you to enter your own custom terms of use for your dataset. To add more information about the Terms of Use, we have provided fields like Special Permissions, Restrictions, Citation Requirements, etc.
+If the Dataverse you are using allows it, you may specify your own Custom Dataset Terms. To do so, select Custom Dataset Terms for your license, and a panel will appear allowing you to enter custom Terms of Use. You can also enter information in additional fields including Special Permissions, Restrictions, and Citation Requirements to further clarify how your Dataset may be accessed and used.
 
-Here is an `example of a Data Usage Agreement <https://dataverse.org/best-practices/sample-dua>`_ for datasets that have de-identified human subject data.
+Here is an `example of a Data Usage Agreement <https://support.dataverse.harvard.edu/sample-data-usage-agreement>`_ for datasets that have de-identified human subject data.
 
-Restricted Files + Terms of Access 
+.. _terms-of-access:
+
+Restricted Files + Terms of Access
 ----------------------------------
 
-If you restrict any files in your dataset, you will be prompted by a pop-up to enter Terms of Access for the data. This can also be edited in the Terms tab or selecting Terms in the "Edit" dropdown button in the dataset. You may also allow users to request access for your restricted files by enabling "Request Access". To add more information about the Terms of Access, we have provided fields like Data Access Place, Availability Status, Contact for Access, etc.
+If you restrict any files in your dataset, you will be prompted by a pop-up to enter Terms of Access for the data. This can also be edited in the Terms tab or selecting Terms in the "Edit" dropdown button in the dataset. You may also allow users to request access for your restricted files by enabling "Request Access". To add more information about the Terms of Access, we have provided fields like Data Access Place, Availability Status, Contact for Access, etc. If you restrict a file, it will not have a preview shown on the file page.
 
 **Note:** Some Dataverse installations do not allow for file restriction.
 
+See also :ref:`restricted-files`.
+
+.. _dp-release-create:
+
+Creating and Depositing Differentially Private Metadata (Experimental)
+----------------------------------------------------------------------
+
+Through an integration with tools from the OpenDP Project (opendp.org), the Dataverse Software offers an experimental workflow that allows a data depositor to create and deposit Differentially Private (DP) Metadata files, which can then be used for exploratory data analysis. This workflow allows researchers to view the DP metadata for a tabular file, determine whether or not the file contains useful information, and then make an informed decision about whether or not to request access to the original file.
+
+If this integration has been enabled in your Dataverse installation, you can follow these steps to create a DP Metadata Release and make it available to researchers, while still keeping the files themselves restricted and able to be accessed after a successful access request.
+
+- Deposit a tabular file and let the ingest process complete
+- Restrict the File
+- In the kebab next to the file on the dataset page, or from the "Edit Files" dropdown on the file page, click "OpenDP Tool"
+- Go through the process to create a DP Metadata Release in the OpenDP tool, and at the end of the process deposit the DP Metadata Release back to the Dataverse installation
+- Publish the Dataset
+
+Once the dataset is published, users will be able to request access using the normal process, but will also have the option to download DP Statistics in order to get more information about the file. 
+
 Guestbook
 ---------
 
-This is where you will enable a particular Guestbook for your dataset, which is setup at the Dataverse-level. For specific instructions please visit the :ref:`Dataset Guestbooks <dataset-guestbooks>` section of the Dataverse Management page.
+This is where you will enable a particular Guestbook for your dataset, which is setup at the Dataverse collection level. For specific instructions please visit the :ref:`Dataset Guestbooks <dataset-guestbooks>` section of the Dataverse Collection Management page.
 
 .. _permissions:
 
 Roles & Permissions
-=====================
+===================
 
-Dataverse user accounts can be granted roles that define which actions they are allowed to take on specific dataverses, datasets, and/or files. Each role comes with a set of permissions, which define the specific actions that users may take.
+Dataverse installation user accounts can be granted roles that define which actions they are allowed to take on specific Dataverse collections, datasets, and/or files. Each role comes with a set of permissions, which define the specific actions that users may take. It is not possible to grant a role that comes with a permission that the granting user themselves does not have.
 
-Roles and permissions may also be granted to groups. Groups can be defined as a collection of Dataverse user accounts, a collection of IP addresses (e.g. all users of a library's computers), or a collection of all users who log in using a particular institutional login (e.g. everyone who logs in with a particular university's account credentials).
+Roles and permissions may also be granted to groups. Groups can be defined as a set of Dataverse user accounts, a collection of IP addresses (e.g. all users of a library's computers), or a collection of all users who log in using a particular institutional login (e.g. everyone who logs in with a particular university's account credentials).
 
-Dataset-Level 
+Dataset-Level
 -------------
 
 Admins or curators of a dataset can assign roles and permissions to the users of that dataset. If you are an admin or curator of a dataset, then you can get to the dataset permissions page by clicking the "Edit" button, highlighting "Permissions" from the dropdown list, and clicking "Dataset".
 
 When you access a dataset's permissions page, you will see two sections:
 
-**Users/Groups:** Here you can assign roles to specific users or groups, determining which actions they are permitted to take on your dataset. You can also reference a list of all users who have roles assigned to them for your dataset and remove their roles if you please. Some of the users listed may have roles assigned at the dataverse level, in which case those roles can only be removed from the dataverse permissions page.
+**Users/Groups:** Here you can assign roles to specific users or groups, determining which actions they are permitted to take on your dataset. You can also reference a list of all users who have roles assigned to them for your dataset and remove their roles if you please. Some of the users listed may have roles assigned at the Dataverse collection level, in which case those roles can only be removed from the Dataverse collection permissions page.
 
 **Roles:** Here you can reference a full list of roles that can be assigned to users of your dataset. Each role lists the permissions that it offers.
 
@@ -341,11 +576,30 @@ When you access a dataset's file-level permissions page, you will see two sectio
 Data Provenance
 ===============
 
-Data Provenance is a record of where your data came from and how it reached its current form. It describes the origin of a data file, any transformations that have been made to that file, and any persons or organizations associated with that file. A data file's provenance can aid in reproducibility and compliance with legal regulations. Dataverse can help you keep track of your data's provenance. Currently, Dataverse only makes provenance information available to those who have edit permissions on your dataset, but in the near future we plan to expand this feature to make provenance information available to the public. You can track our progress in `this issue <https://github.com/IQSS/dataverse/issues/4346>`_ on the Dataverse GitHub repository.
+Dataset-Level
+-------------
+When configured, the Dataverse software can allow data depositors, curators, and administrators
+to provide information about why a new version of a dataset was created and/or how its contents
+differ from a prior version. These users can add an optional "Version Note" to a draft dataset
+version in the dataset page/versions tab or during publication. This information is publicly 
+available via the user interface (dataset page/versions tab), API, and in metadata exports
+(including the DataCite, JSON, DDI, and OAI_ORE exports).
+
+File-Level
+----------
+
+Data Provenance is a record of where your data came from and how it reached its current form.
+It describes the origin of a data file, any transformations that have been made to that file,
+and any persons or organizations associated with that file. A data file's provenance can aid in
+reproducibility and compliance with legal regulations. When configured to support provenance, 
+the Dataverse Software can help you keep track of your data's provenance. Currently, the Dataverse
+Software only makes provenance information available to those who have edit permissions on your
+dataset, but in the future we plan to expand this feature to make provenance information available
+to the public. 
 
 .. COMMENTED OUT UNTIL PROV FILE DOWNLOAD IS ADDED: , and make it available to those who need it.
 
-Dataverse accepts provenance information in two forms: a *Provenance File* or a free-text *Provenance Description*. You can attach this provenance information to your data files in Dataverse as part of the file upload process, by clicking Edit -> Provenance:
+A Dataverse installation accepts provenance information in two forms: a *Provenance File* or a free-text *Provenance Description*. You can attach this provenance information to your data files in a Dataverse installation as part of the file upload process, by clicking Edit -> Provenance:
 
 |file-upload-prov-button|
 
@@ -353,15 +607,15 @@ This will open a window where you can add your Provenance File and/or Provenance
 
 |file-upload-prov-window|  
 
-A **Provenance File** is the preferred way of submitting provenance information to Dataverse because it provides a detailed and trustworthy record. Provenance files are typically generated during the process of data analysis, using provenance capture tools like provR, RDataTracker, NoWorkFlow, recordr, or CamFlow.
+A **Provenance File** is the preferred way of submitting provenance information to a Dataverse installation because it provides a detailed and trustworthy record. Provenance files are typically generated during the process of data analysis, using provenance capture tools like provR, RDataTracker, NoWorkFlow, recordr, or CamFlow.
 
-Once you upload a provenance file, Dataverse will need some additional information in order to accurately connect it to your data file. Once provenance file upload finishes, an input box labeled "Connect entity" will appear under the file. Provenance files contain a list of "entities", which include your data file as well as any objects associated with it (e.g. a chart, a spellchecker, etc.). You will need to tell Dataverse which entity within the provenance file represents your data file. You may type the name of the entity into the box, or click the arrow next to the box and select the entity from a list of all entities in the provenance file. 
+Once you upload a provenance file, the Dataverse installation will need some additional information in order to accurately connect it to your data file. Once provenance file upload finishes, an input box labeled "Connect entity" will appear under the file. Provenance files contain a list of "entities", which include your data file as well as any objects associated with it (e.g. a chart, a spellchecker, etc.). You will need to tell the Dataverse installation which entity within the provenance file represents your data file. You may type the name of the entity into the box, or click the arrow next to the box and select the entity from a list of all entities in the provenance file. 
 
 For more information on entities and the contents of provenance files, see `the W3C PROV Model Primer  <https://www.w3.org/TR/prov-primer/#intuitive-overview-of-prov>`_.
 
 Once you've uploaded your Provenance File and connected the proper entity, you can hit the Preview button to view the raw JSON of the Provenance File. This can help you confirm that you've uploaded the right file. Be sure to double-check it, because the Provenance File will made *permanent* once it's finalized. At that point you will not be able to *replace*, *remove*, or otherwise *edit* the Provenance File. This ensures that the Provenance File maintains a stable, immutable record of the data file's history. This finalization of the Provenance File happens at different points depending on the status of your data file. If this is a brand new data file that has never been published before, then its associated Provenance File will be made permanent once you publish the dataset. If this data file *has* been published in a previous version of your dataset, then its associated Provenance File will be made permanent as soon as you upload the Provenance File and click "Save Changes" on the warning popup.
 
-.. COMMENTED OUT UNTIL PROV GRAPH IS ADDED:  A **Provenance File** is the preferred way of submitting provenance information to Dataverse, as it allows Dataverse to automatically generate a detailed graph of the data file's provenance. Provenance files are typically generated during the process of data analysis, using provenance capture tools like provR, RDataTracker, NoWorkFlow, recordr, or CamFlow. Each data file in Dataverse can have one provenance file attached to it. Dataverse uses this provenance file to generate a provenance graph that can be viewed under the Provenance tab of the file page. Once you've added your provenance file, you can click the Preview button to make sure it's accurate.
+.. COMMENTED OUT UNTIL PROV GRAPH IS ADDED:  A **Provenance File** is the preferred way of submitting provenance information to a Dataverse installation, as it allows the Dataverse installation to automatically generate a detailed graph of the data file's provenance. Provenance files are typically generated during the process of data analysis, using provenance capture tools like provR, RDataTracker, NoWorkFlow, recordr, or CamFlow. Each data file in a Dataverse installation can have one provenance file attached to it. A Dataverse installation uses this provenance file to generate a provenance graph that can be viewed under the Provenance tab of the file page. Once you've added your provenance file, you can click the Preview button to make sure it's accurate.
 
 A **Provenance Description** allows you to add more provenance information in addition to or in place of a provenance file. This is a free-text field that allows you to enter any information you feel might be relevant to those interested in learning about the provenance of your data. This might be a good place to describe provenance factors like what operating system you used when working with the data file, what functions or libraries you used, how data was merged into the file, what version of the file you used, etc. The Provenance Description is not as useful or trustworthy as a provenance file, but it can still provide value. Unlike the Provenance File, the Provenance Description is never made permanent: you can always edit, remove, or replace it at any time.
 
@@ -383,7 +637,7 @@ Thumbnails + Widgets
 Thumbnails
 ----------
 
-Thumbnail images can be assigned to a dataset manually or automatically. The thumbnail for a dataset appears on the search result card for that dataset and on the dataset page itself. If a dataset contains one or more data files that Dataverse recognizes as an image, then one of those images is automatically selected as the dataset thumbnail. 
+Thumbnail images can be assigned to a dataset manually or automatically. The thumbnail for a dataset appears on the search result card for that dataset and on the dataset page itself. If a dataset contains one or more data files that a Dataverse installation recognizes as an image, then one of those images is automatically selected as the dataset thumbnail. 
 
 If you would like to manually select your dataset's thumbnail, you can do so by clicking the "Edit" button on your dataset, and selecting "Thumbnails + Widgets" from the dropdown menu.
 
@@ -409,28 +663,32 @@ In the Widgets tab, you can copy and paste the code snippets for the widget you
 Dataset Widget
 ~~~~~~~~~~~~~~
 
-The Dataset Widget allows the citation, metadata, files and terms of your dataset to be displayed on your website. When someone downloads a data file in the widget, it will download directly from the datasets on your website. If a file is restricted, they will be directed to your dataverse to log in, instead of logging in through the widget on your site. 
+The Dataset Widget allows the citation, metadata, files and terms of your dataset to be displayed on your website. When someone downloads a data file in the widget, it will download directly from the datasets on your website. If a file is restricted, they will be directed to your Dataverse installation to log in, instead of logging in through the widget on your site. 
 
-To edit your dataset, you will need to return to the Dataverse repository where the dataset is stored. You can easily do this by clicking on the link that says "Data Stored in (Name) Dataverse" found in the bottom of the widget.
+To edit your dataset, you will need to return to the Dataverse installation where the dataset is stored. You can easily do this by clicking on the link that says "Data Stored in (Name) Dataverse Collection" found in the bottom of the widget.
 
 Dataset Citation Widget
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-The Dataset Citation Widget will provide a citation for your dataset on your personal or project website. Users can download the citation in various formats by using the Cite Data button. The persistent URL in the citation will direct users to the dataset in your dataverse.
+The Dataset Citation Widget will provide a citation for your dataset on your personal or project website. Users can download the citation in various formats by using the Cite Data button. The persistent URL in the citation will direct users to the dataset in your Dataverse installation.
+
+.. _openscholar-dataset-level:
 
 Adding Widgets to an OpenScholar Website
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #. Log in to your OpenScholar website
-#. Either build a new page or navigate to the page you would like to use to show the Dataverse widgets.
+#. Either build a new page or navigate to the page you would like to use to show the Dataverse collection and dataset widgets.
 #. Click on the Settings Cog and select Layout
-#. At the top right, select Add New Widget and under Misc. you will see the Dataverse Dataset and the Dataverse Dataset Citation Widgets. Click on the widget you would like to add, fill out the form, and then drag it to where you would like it to display in the page.
+#. At the top right, select Add New Widget and under Misc. you will see the Dataverse Collection and the Dataverse Dataset Citation Widgets. Click on the widget you would like to add, fill out the form, and then drag it to where you would like it to display in the page.
 
 Publish Dataset
 ===============
 
 When you publish a dataset (available to an Admin, Curator, or any custom role which has this level of permission assigned), you make it available to the public so that other users can browse or search for it. Once your dataset is ready to go public, go to your dataset page and click on the "Publish" button on the right hand side of the page. A pop-up will appear to confirm that you are ready to actually Publish since once a dataset is made public it can no longer be unpublished. 
 
+Before the Dataverse installation finalizes the publication of the dataset, it will attempt to validate all the physical files in it, to make sure they are present and intact. In an unlikely event that any files fail the validation, you will see an error message informing you that the problem must be fixed by the local Dataverse Installation Admin before the dataset can be published. 
+
 Whenever you edit your dataset, you are able to publish a new version of the dataset. The publish dataset button will reappear whenever you edit the metadata of the dataset or add a file.
 
 Note: Prior to publishing your dataset the Data Citation will indicate that this is a draft but the "DRAFT VERSION" text
@@ -439,22 +697,58 @@ will be removed as soon as you Publish.
 Submit for Review
 =================
 
-If you have a Contributor role (can edit metadata, upload files, and edit files, edit Terms, Guestbook, and Submit datasets for review) in a Dataverse you can submit your dataset for review when you have finished uploading your files and filling in all of the relevant metadata fields. To Submit for Review, go to your dataset and click on the "Submit for Review" button, which is located next to the "Edit" button on the upper-right. Once Submitted for Review: the Admin or Curator for this Dataverse will be notified to review this dataset before they decide to either "Publish" the dataset or "Return to Author". If the dataset is published the contributor will be notified that it is now published. If the dataset is returned to the author, the contributor of this dataset will be notified that they need to make modifications before it can be submitted for review again.
+If you have a Contributor role (can edit metadata, upload files, and edit files, edit Terms, Guestbook, and submit datasets for review) in a Dataverse collection you can submit your dataset for review when you have finished uploading your files and filling in all of the relevant metadata fields. To submit your dataset for review, go to your dataset and click the "Submit for Review" button, which is located next to the "Edit" button on the upper-right. In the confirmation popup, you can review your selection of license (or custom terms, if available). Once you have confirmed the submission, the Admin or Curator for this Dataverse collection will be notified to review this dataset before they decide to either publish the dataset or click "Return to Author". If the dataset is published, the contributor will be notified that it is now published. If the dataset is returned to the author, the contributor of this dataset will be notified that they need to make modifications before it can be submitted for review again.
 
-.. _privateurl:
+.. _previewUrl:
 
-Private URL to Review Unpublished Dataset
+Preview URL to Review Unpublished Dataset
 =========================================
 
-Creating a Private URL for your dataset allows you to share your dataset (for viewing and downloading of files) before it is published to a wide group of individuals who may not have a user account on Dataverse. Anyone you send the Private URL to will not have to log into Dataverse to view the dataset.
+Creating a Preview URL for a draft version of your dataset allows you to share your dataset (for viewing and downloading of files) before it is published to a wide group of individuals who may not have a user account on the Dataverse installation. Anyone you send the Preview URL to will not have to log into the Dataverse installation to view the unpublished dataset. Once a dataset has been published you may create new General Preview URLs for subsequent draft versions, but the Anonymous Preview URL will no longer be available.
+
+**Note:** To create a Preview URL, you must have the *ManageDatasetPermissions* permission for your draft dataset, usually given by the :ref:`roles <permissions>` *Curator* or *Administrator*.
 
 #. Go to your unpublished dataset
 #. Select the “Edit” button
-#. Select “Private URL” in the dropdown menu
-#. In the pop-up select “Create Private URL”
-#. Copy the Private URL which has been created for this dataset and it can now be shared with anyone you wish to have access to view or download files in your unpublished dataset.
+#. Select “Preview URL” in the dropdown menu
+#. In the pop-up select “Create General Preview URL” or "Create Anonymous Preview URL". The latter supports anonymous review by removing author names and other potentially identifying information from citations, version history tables, and some metadata fields (as configured by the administrator).
+#. Copy the Preview URL which has been created for this dataset and it can now be shared with anyone you wish to have access to view or download files in your unpublished dataset.
+
+To disable a Preview URL and to revoke access, follow the same steps as above until step #3 when you return to the popup, click the “Disable Preview URL” button.
+
+**Note:** Before distributing an anonymized Preview URL it is recommended that you view the dataset as a potential user to verify that the metadata available does not reveal authorship, etc. 
+
+#. Create Anonymous Preview URL for your unpublished dataset via the Preview URL popup from Edit Dataset button
+#. Copy the Anonymous Preview URL to your clipboard
+#. Log out of Dataverse application 
+#. Open the dataset using the Anonymous Preview URL you plan to distribute to view it as a reviewer would.
+#. It may be necessary for you to further edit your draft dataset's metadata to remove identifying items before you distribute the Anonymous Preview URL
+
+Note that only one Preview URL (normal or with anonymized access) can be configured per dataset at a time. 
 
-To disable a Private URL and to revoke access, follow the same steps as above until step #3 when you return to the popup, click the “Disable Private URL” button.
+Embargoes
+=========
+
+A Dataverse instance may be configured to support file-level embargoes. Embargoes make file content inaccessible after a dataset version is published  - until the embargo end date.
+This means that file previews and the ability to download files will be blocked. The effect is similar to when a file is restricted except that the embargo will end at the specified date without further action and during the embargo, requests for file access cannot be made. 
+Embargoes of files in a version 1.0 dataset may also affect the date shown in the dataset and file citations. The recommended practice is for the citation to reflect the date on which all embargoes on files in version 1.0 end. (Since Dataverse creates one persistent identifier per dataset and doesn't create new ones for each version, the publication of later versions, with or without embargoed files, does not affect the citation date.)
+
+Embargoes are intended to support use cases where, for example, a journal or project team allows a period after publication of a dataset and/or the associated paper, during which the authors still have sole access to the data. Setting an embargo on relevant files and publishing the dataset in Dataverse publicizes the persistent identifier (e.g. DOI or Handle) for the dataset (and files if the instance is configured to create persistent identifiers for them ) and makes the metadata, and any the content of un-embargoed files immediately available, but automatically denies access to any embargoed files until the specified embargoes expire. 
+Once a dataset with embargoed files has been published, no further action is needed to cause the embargoed files to become accessible as of the specified embargo end date. (Note that embargoes can be set along with using the 'restrict' functionality on files. The restricted status will affect their availability as normal (and described elsewhere) once the embargo expires.)
+
+- Setting the same embargo on all files in the dataset can be seen as providing a dataset-level embargo - making the dataset persistent identifier and metadata available but restricting access to all files.
+
+- "Rolling" embargoes on time-series data can be supported by publishing multiple dataset versions and adding new embargoes on the files added in that version. For example, every year, files containing the prior year's results can be added to a dataset and given an embargo ending one year later than the embargoes set in the last dataset version, and the new dataset version can then be published. The datafiles published in the different versions will become available when their individual embargoes expire at yearly intervals.
+
+As the primary use case of embargoes is to make the existence of data known now, with a promise (to a journal, project team, etc.) that the data itself will become available at a given future date, users cannot change an embargo once a dataset version is published. Dataverse instance administrators do have the ability to correct mistakes and make changes if/when circumstances warrant.
+
+Retention Periods
+=================
+
+Support for file-level retention periods can also be configured in a Dataverse instance. Retention periods make file content inaccessible after the retention period end date. This means that file previews and the ability to download files will be blocked. The effect is similar to when a file is restricted except that the retention periods will end at the specified date without further action and after the retention periods expires, requests for file access cannot be made.
+
+Retention periods are intended to support use cases where files must be made unavailable - and in most cases destroyed, e.g. to meet legal requirements - after a certain period or date.
+Actual destruction is not automatically handled, but would have to be done on the storage if needed.
 
 Dataset Versions
 ================
@@ -463,9 +757,9 @@ Versioning is important for long-term research data management where metadata an
 
 |image3|
 
-Once you edit your published dataset a new draft version of this dataset will be created. To publish this new version of your dataset, select the "Publish Dataset" button on the top right side of the page. If you were at version 1 of your dataset, depending on the types of changes you had made, you would be asked to publish your draft as either version 1.1 or version 2.0.
+Once you edit your published dataset, a draft version will be created. To publish this draft version, use the “Publish Dataset” button at the top right side of the page.
 
-**Important Note:** If you add a file, your dataset will automatically be bumped up to a major version (e.g., if you were at 1.0 you will go to 2.0).
+If files were added or removed, or if your dataset's previous version was deaccessioned, you must agree to publish the draft as a major version, such as version 2.0. Otherwise, you can choose to publish the draft as a major version or as a minor version, such as version 1.1.
 
 On the Versions tab of a dataset page, there is a versions table that displays the version history of the dataset. You can use the version number links in this table to navigate between the different versions of the dataset, including the unpublished draft version, if you have permission to access it.
 
@@ -483,9 +777,9 @@ Once you have more than one version (this can simply be version 1 and a draft),
 Dataset Metrics and Make Data Count
 ===================================
 
-All installations of Dataverse count file downloads. These file download counts are aggregated and reported at the Dataset level as well as at the file level.
+All Dataverse installations count file downloads. These file download counts are aggregated and reported at the Dataset level as well as at the file level.
 
-Some installations of Dataverse also have support for expanded metrics at the dataset level for views, file downloads, and citations using Make Data Count standards. `Make Data Count`_ is a project to collect and standardize metrics on data use, especially views, downloads, and citations. Citations for datasets are retrieved from `Crossref`_ via DataCite using Make Data Count standards.
+Some Dataverse installations also have support for expanded metrics at the dataset level for views, file downloads, and citations using Make Data Count standards. `Make Data Count`_ is a project to collect and standardize metrics on data use, especially views, downloads, and citations. Citations for datasets are retrieved from `Crossref`_ via DataCite using Make Data Count standards.
 
 For the specific API calls for Make Data Count, see :ref:`Dataset Metrics <dataset-metrics-api>` in the :doc:`/api/native-api` section of the API Guide.
 
@@ -494,17 +788,17 @@ For the specific API calls for Make Data Count, see :ref:`Dataset Metrics <datas
 Cloud Storage + Computing
 =========================
 
-Dataverse installations can be configured to facilitate cloud-based storage and/or computing (this feature is considered experimental at this time, and some of the kinks are still being worked out). While the default configuration for Dataverse uses a local file system for storing data, a cloud-enabled Dataverse installation can use a Swift object storage database for its data. This allows users to perform computations on data using an integrated cloud computing environment.
+Dataverse installations can be configured to facilitate cloud-based storage and/or computing (this feature is considered experimental at this time, and some of the kinks are still being worked out). While the default configuration for the Dataverse Software uses a local file system for storing data, a cloud-enabled Dataverse installation can use a Swift object storage database for its data. This allows users to perform computations on data using an integrated cloud computing environment.
 
 Cloud Computing
 ---------------
 
-The "Compute" button on dataset and file pages will allow you to compute on a single dataset, multiple datasets, or a single file. You can use it to build a compute batch and go directly to the cloud computing environment that is integrated with Dataverse.
+The "Compute" button on dataset and file pages will allow you to compute on a single dataset, multiple datasets, or a single file. You can use it to build a compute batch and go directly to the cloud computing environment that is integrated with a Dataverse installation.
 
 Cloud Storage Access
 --------------------
 
-If you need to access a dataset in a more flexible way than the Compute button provides, then you can use the Cloud Storage Access box on the dataset page to copy the dataset's container name. This unique identifer can then be used to allow direct access to the dataset.
+If you need to access a dataset in a more flexible way than the Compute button provides, then you can use the Cloud Storage Access box on the dataset page to copy the dataset's container name. This unique identifier can then be used to allow direct access to the dataset.
 
 .. _deaccession:
 
@@ -523,6 +817,29 @@ If you deaccession the most recently published version of the dataset but not al
 
 **Important Note**: A tombstone landing page with the basic citation metadata will always be accessible to the public if they use the persistent URL (Handle or DOI) provided in the citation for that dataset.  Users will not be able to see any of the files or additional metadata that were previously available prior to deaccession.
 
+.. _dataset-types:
+
+Dataset Types
+=============
+
+.. note:: Development of the dataset types feature is ongoing. Please see https://github.com/IQSS/dataverse-pm/issues/307 for details.
+
+Out of the box, all datasets have a dataset type of "dataset". Superusers can add additional types such as "software" or "workflow" using the :ref:`api-add-dataset-type` API endpoint.
+
+Once more than one type appears in search results, a facet called "Dataset Type" will appear allowing you to filter down to a certain type.
+
+If your installation is configured to use DataCite as a persistent ID (PID) provider, the appropriate type ("Dataset", "Software", "Workflow") will be sent to DataCite when the dataset is published for those three types.
+
+Currently, specifying a type for a dataset can only be done via API and only when the dataset is created. The type can't currently be changed afterward. For details, see the following sections of the API guide:
+
+- :ref:`api-create-dataset-with-type` (Native API)
+- :ref:`api-semantic-create-dataset-with-type` (Semantic API)
+- :ref:`import-dataset-with-type`
+
+Dataset types can be listed, added, or deleted via API. See :ref:`api-dataset-types` in the API Guide for more.
+
+Dataset types can be linked with metadata blocks to make fields from those blocks available when datasets of that type are created or edited. See :ref:`api-link-dataset-type` and :ref:`list-metadata-blocks-for-a-collection` for details.
+
 .. |image1| image:: ./img/DatasetDiagram.png
    :class: img-responsive
 .. |image3| image:: ./img/data_publishing_version_workflow.png
@@ -533,7 +850,22 @@ If you deaccession the most recently published version of the dataset but not al
    :class: img-responsive
 .. |image-file-tree-view| image:: ./img/file-tree-view.png
    :class: img-responsive
+.. |cw-image1| image:: ./img/computational-workflow-diagram.png
+   :class: img-responsive
+.. |cw-image2| image:: ./img/computational-workflow-metadata.png
+   :class: img-responsive
+.. |cw-image3| image:: ./img/file-tags-link.png
+   :class: img-responsive
+.. |cw-image4| image:: ./img/file-tags-options.png
+   :class: img-responsive
+.. |cw-image5| image:: ./img/computational-workflow-facets.png
+   :class: img-responsive
+.. |cw-image6| image:: ./img/file-tags-facets.png
+   :class: img-responsive
+.. |bagit-image1| image:: ./img/bagit-handler-errors.png
+   :class: img-responsive
+.. |h5web| image:: ./img/h5web.png
+   :class: img-responsive
    
 .. _Make Data Count: https://makedatacount.org
 .. _Crossref: https://crossref.org
-
diff --git a/doc/sphinx-guides/source/user/dataverse-management.rst b/doc/sphinx-guides/source/user/dataverse-management.rst
index 046917673ef..96e8522af34 100755
--- a/doc/sphinx-guides/source/user/dataverse-management.rst
+++ b/doc/sphinx-guides/source/user/dataverse-management.rst
@@ -1,111 +1,117 @@
-Dataverse Management
-++++++++++++++++++++++++++++
+Dataverse Collection Management
++++++++++++++++++++++++++++++++
 
-A dataverse is a container for datasets (research data, code, documentation, and metadata) and other dataverses, which can be setup for individual researchers, departments, journals and organizations.
+A Dataverse collection is a container for datasets (research data, code, documentation, and metadata) and other Dataverse collections, which can be setup for individual researchers, departments, journals and organizations.
 
 |image1|
 
-Once a user creates a dataverse they, by default, become the
-administrator of that dataverse. The dataverse administrator has access
-to manage the settings described in this guide.
+Once a user creates a Dataverse collection they, by default, become the administrator of that Dataverse collection. The Dataverse collection administrator has access to manage the settings described in this guide.
 
 .. contents:: |toctitle|
   :local:
 
-Create a Dataverse (Within the "Root" Dataverse)
-===================================================
-
-Creating a dataverse is easy but first you must be a registered user (see :doc:`/user/account`).
-
-#. Once you are logged in click on the "Add Data" button and in the dropdown menu select "New Dataverse".
-#. Once on the "New Dataverse" page fill in the following fields:
-    * **Name**: Enter the name of your dataverse.
-    * **Identifier**: This is an abbreviation, usually lower-case, that becomes part of the URL for the new dataverse. Special characters (~,\`, !, @, #, $, %, ^, &, and \*) and spaces are not allowed. **Note**: if you change this field in the future, the URL for your Dataverse will change (http//.../'identifier'), which will break older links to the page.
-    * **Email**: This is the email address that will be used as the contact for this particular dataverse. You can have more than one contact email address for your dataverse.
-    * **Affiliation**: Add any Affiliation that can be associated with this particular dataverse (e.g., project name, institute name, department name, journal name, etc). This is automatically filled out if you have added an affiliation for your user account.
-    * **Description**: Provide a description of this dataverse. This will display on the landing page of your dataverse and in the search result list. The description field supports certain HTML tags, if you'd like to format your text (<a>, <b>, <blockquote>, <br>, <code>, <del>, <dd>, <dl>, <dt>, <em>, <hr>, <h1>-<h3>, <i>, <img>, <kbd>, <li>, <ol>, <p>, <pre>, <s>, <sup>, <sub>, <strong>, <strike>, <ul>).
-    * **Category**: Select a category that best describes the type of dataverse this will be. For example, if this is a dataverse for an individual researcher's datasets, select *Researcher*. If this is a dataverse for an institution, select *Organization or Institution*.
-    * **Choose the sets of Metadata Fields for datasets in this dataverse**: By default the metadata elements will be from the host dataverse that this new dataverse is created in. Dataverse offers metadata standards for multiple domains. To learn more about the metadata standards in Dataverse please check out the :doc:`/user/appendix`.
-    * **Select facets for this dataverse**:  Choose which metadata fields will be used as facets on your dataverse. These facets will allow users browsing or searching your dataverse to filter its contents according to the fields you’ve selected. For example, if you select “Subject” as a facet, users will be able to filter your dataverse’s contents by subject area. By default, the facets that will appear on your dataverse landing page will be from the host dataverse that this new dataverse was created in, but you can add or remove facets from this default.
-#. Selected metadata elements are also used to pick which metadata fields you would like to use for creating templates for your datasets. Metadata fields can be hidden, or selected as required or optional. Once you have selected all the fields you would like to use, you can create your template(s) after you finish creating your dataverse.
-#. Click "Create Dataverse" button and you're done! 
-
-\*Required fields are denoted by a red asterisk.
-
-Edit Dataverse 
-=================
-
-To edit your dataverse, navigate to your dataverse's landing page and select the "Edit Dataverse" button, 
-where you will be presented with the following editing options: 
-
-- :ref:`General Information <general-information>`: edit name, identifier, category, contact email, affiliation, description, Metadata Elements, and facets for your dataverse
-- :ref:`Theme <theme>`: upload a logo for your dataverse, add a link to your department or personal website, add a custom footer image, and select colors for your dataverse in order to brand it
-- :ref:`Widgets <dataverse-widgets>`: get code to add to your website to have your dataverse display on it
-- :ref:`Permissions <dataverse-permissions>`: give Dataverse users permissions to your dataverse, i.e.-can edit datasets, and see which users already have which permissions for your dataverse
-- :ref:`Dataset Templates <dataset-templates>`: these are useful when you have several datasets that have the same information in multiple metadata fields that you would prefer not to have to keep manually typing in
+.. _create-dataverse:
+
+Create a New Dataverse Collection
+=================================
+
+Creating a Dataverse collection is easy but first you must be a registered user (see :doc:`/user/account`). Once you are logged in, click on the "Add Data" button, or "Add Data" navbar link and in the dropdown menu select "New Dataverse".
+
+#. **Fill in the following fields on the "New Dataverse" page** (required fields in the form are denoted by a red asterisk, next to the label):
+    * **Host Dataverse**: Select a Dataverse collection you would like to create the new Dataverse collection in, by default the root Dataverse collection is selected if you click the Add Data button from the root Dataverse collection, your My Data page, the Add Data link in the navbar, or the Add a dataset button on the custom homepage (if configured), but you can select any Dataverse collection for which you the proper permissions to create Dataverse collections.
+    * **Dataverse Name**: Enter the name of your Dataverse collection.
+    * **Affiliation**: Add any affiliation that can be associated with this particular Dataverse collection (e.g., project name, institute name, department name, journal name, etc). This is automatically filled out if you have added an affiliation for your user account.
+    * **Identifier**: This is an abbreviation, usually lower-case, that becomes part of the URL for the new Dataverse collection. Special characters (~,\`, !, @, #, $, %, ^, &, and \*) and spaces are not allowed. **Note**: if you change this field in the future, the URL for your Dataverse collection will change (http//.../'identifier'), which will break older links to the page.
+    * **Category**: Select a category that best describes the type of Dataverse collection this will be. For example, if this is a Dataverse collection for an individual researcher's datasets, select *Researcher*. If this is a Dataverse collection for an institution, select *Organization or Institution*.
+    * **Email**: This is the email address that will be used as the contact for this particular Dataverse collection. You can have more than one contact email address for your Dataverse collection.
+    * **Description**: Provide a description of this Dataverse collection. This will display on the landing page of your Dataverse collection and in the search result list. The description field supports certain HTML tags, if you'd like to format your text (<a>, <b>, <blockquote>, <br>, <code>, <del>, <dd>, <dl>, <dt>, <em>, <hr>, <h1>-<h3>, <i>, <img>, <kbd>, <li>, <ol>, <p>, <pre>, <s>, <sup>, <sub>, <strong>, <strike>, <u>, <ul>).
+    * **Dataset Metadata Langauge**: (If enabled) Select which language should be used when entering dataset metadata, or leave that choice to dataset creators. 
+    * **Guestbook Entry Option**: (If enabled) Select whether guestbooks are displayed when a user requests access to restricted file(s) or when they initiate a download.
+#. **Choose the sets of Metadata Fields for datasets in this Dataverse collection**:
+    * By default the metadata elements will be from the host Dataverse collection that this new Dataverse collection is created in.
+    * The Dataverse Software offers metadata standards for multiple domains. To learn more about the metadata standards in the Dataverse Software please check out the :doc:`/user/appendix`.
+    * Most metadata fields can be hidden or can be selected as required or optional. Some fields may be selected as conditionally required, depending on metadata options chosen for the Dataverse installation.
+    * Selected metadata fields are also used to pick which metadata fields you would like to use for creating :ref:`Dataset Templates <dataset-templates>`: after you finish creating your Dataverse collection.
+#. **Choose which metadata fields will be used as browse/search facets on your Dataverse collection**:
+    * These facets will allow users browsing or searching your Dataverse collection to filter its contents according to the fields you have selected. For example, if you select “Subject” as a facet, users will be able to filter your Dataverse collection’s contents by subject area.
+    * By default, the facets that will appear on your Dataverse collection's landing page will be from the host Dataverse collection that this new Dataverse collection was created in, but you can add or remove facets from this default.
+#. **Click the "Create Dataverse" button** and you're done!
+
+Edit Dataverse Collection
+=========================
+
+To edit your Dataverse collection, navigate to your Dataverse collection's landing page and select the "Edit Dataverse" button, where you will be presented with the following editing options: 
+
+- :ref:`General Information <general-information>`: edit name, affiliation, identifier, category, contact email, description, metadata fields, and browse/search facets for your Dataverse collection
+- :ref:`Theme <theme>`: upload a logo for your Dataverse collection, add a link to your department or personal website, add a custom footer image, and select colors for your Dataverse collection in order to brand it
+- :ref:`Widgets <dataverse-widgets>`: get code to add to your website to have your Dataverse collection display on it
+- :ref:`Permissions <dataverse-permissions>`: give other users permissions to your Dataverse collection, i.e.-can edit datasets, and see which users already have which permissions for your Dataverse collection
+- :ref:`Dataset Templates <dataset-templates>`: these are useful when you want to provide custom instructions on how to fill out fields or have several datasets that have the same information in multiple metadata fields that you would prefer not to have to keep manually typing in
 - :ref:`Dataset Guestbooks <dataset-guestbooks>`: allows you to collect data about who is downloading the files from your datasets
-- :ref:`Featured Dataverses <featured-dataverses>`: if you have one or more dataverses, you can use this option to show them at the top of your dataverse page to help others easily find interesting or important dataverses
-- **Delete Dataverse**: you are able to delete your dataverse as long as it is not published and does not have any draft datasets 
+- :ref:`Featured Dataverse collections <featured-dataverses>`: if you have one or more Dataverse collection, you can use this option to show them at the top of your Dataverse collection page to help others easily find interesting or important Dataverse collections
+- **Delete Dataverse**: you are able to delete your Dataverse collection as long as it is not published and does not have any draft datasets 
 
 .. _general-information:
 
 General Information
----------------------
+-------------------
 
-The General Information page is how you edit the information you filled in while creating your dataverse. If you need to change or add a contact email address, this is the place to do it. Additionally, you can update the metadata elements used for datasets within the dataverse, change which metadata fields are hidden, required, or optional, and update the facets you would like displayed for browsing the dataverse. If you plan on using templates, you need to select the metadata fields on the General Information page.
+The General Information page is how you edit the information you filled in while creating your Dataverse collection. If you need to change or add a contact email address, this is the place to do it. Additionally, you can update the metadata elements used for datasets within the Dataverse collection, change which metadata fields are hidden, required, or optional, and update the facets you would like displayed for browsing the Dataverse collection. If you plan on using templates, you need to select the metadata fields on the General Information page.
 
-Tip: The metadata fields you select as required will appear on the Create Dataset form when someone goes to add a dataset to the dataverse. 
+Tip: The metadata fields you select as required will appear on the Create Dataset form when someone goes to add a dataset to the Dataverse collection. 
 
 .. _theme:
 
-Theme 
----------
+Theme
+-----
 
-The Theme features provides you with a way to customize the look of your dataverse. You can:
+The Theme features provides you with a way to customize the look of your Dataverse collection. You can:
 
-- Inherit the theme from the parent dataverse. This option is helpful if you'd like consistency across several dataverses that all share the same parent.
-- Add or update a logo image, which will appear at the top of your dataverse.
-- Add or update a footer image, which will appear at at the bottom of your dataverse.
-- Change the colors of the background, links, and text within the header of your dataverse.
-- Add or update the tagline for your dataverse, which can provide more information about your organization, journal, institution, etc.
+- Inherit the theme from the parent Dataverse collection. This option is helpful if you'd like consistency across several Dataverse collections that all share the same parent.
+- Add or update a logo image, which will appear at the top of your Dataverse collection.
+- Add or update a thumbnail image, which will appear on featured dataverses of your Dataverse collection.
+- Add or update a footer image, which will appear at the bottom of your Dataverse collection.
+- Change the colors of the background, links, and text within the header of your Dataverse collection.
+- Add or update the tagline for your Dataverse collection, which can provide more information about your organization, journal, institution, etc.
 - Add a URL for a website that will be accessed when visitors click the tagline text.
 
-Supported image types for logo images and footer images are JPEG, TIFF, or PNG and should be no larger than 500 KB. The maximum display size for an image file in a dataverse's theme is 940 pixels wide by 120 pixels high. 
+Supported image types for logo images and footer images are JPEG, TIFF, or PNG and should be no larger than 500 KB. The maximum display size for an image file in a Dataverse collection's theme is 940 pixels wide by 120 pixels high. 
 
 .. _dataverse-widgets:
 
 Widgets
---------------
+-------
 
-The Widgets feature provides you with code for you to put on your personal website to have your dataverse displayed there. There are two types of Widgets for a dataverse, a Dataverse Search Box widget and a Dataverse Listing widget. From the Widgets tab on the Theme + Widgets page, you can copy and paste the code snippets for the widget you would like to add to your website. If you need to adjust the height of the widget on your website, you may do so by editing the `heightPx=500` parameter in the code snippet.
+The Widgets feature provides you with code for you to put on your personal website to have your Dataverse collection displayed there. There are two types of Widgets for a Dataverse collection, a Dataverse collection Search Box widget and a Dataverse collection Listing widget. Once a Dataverse collection has been published, from the Widgets tab on the Dataverse collection's Theme + Widgets page, it is possible to copy the code snippets for the widget(s) you would like to add to your website. If you need to adjust the height of the widget on your website, you may do so by editing the `heightPx=500` parameter in the code snippet.
 
-Dataverse Search Box Widget
-***************************
+Dataverse Collection Search Box Widget
+**************************************
 
-The Dataverse Search Box Widget will add a search box to your website that is linked to your dataverse. Users are directed to your dataverse in a new browser window, to display the results for search terms entered in the input field. 
+The Dataverse Collection Search Box Widget will add a search box to your website that is linked to your Dataverse collection. Users are directed to your Dataverse collection in a new browser window, to display the results for search terms entered in the input field. 
 
-Dataverse Listing Widget
-*************************
+Dataverse Collection Listing Widget
+***********************************
 
-The Dataverse Listing Widget provides a listing of all your dataverses and datasets for users to browse, sort, filter and search. When someone clicks on a dataverse or dataset in the widget, it displays the content in the widget on your website. They can download data files directly from the datasets within the widget. If a file is restricted, they will be directed to your dataverse to log in, instead of logging in through the widget on your website.
+The Dataverse Collection Listing Widget provides a listing of all your Dataverse collections and datasets for users to browse, sort, filter and search. When someone clicks on a Dataverse collection or dataset in the widget, it displays the content in the widget on your website. They can download data files directly from the datasets within the widget. If a file is restricted, they will be directed to your Dataverse installation to log in, instead of logging in through the widget on your website.
 
+.. _openscholar-dataverse-level:
 
 Adding Widgets to an OpenScholar Website
-******************************************
+****************************************
 #. Log in to your OpenScholar website
-#. Either build a new page or navigate to the page you would like to use to show the Dataverse widgets.
+#. Either build a new page or navigate to the page you would like to use to show the Dataverse collection widgets.
 #. Click on the Settings Cog and select Layout
-#. At the top right, select Add New Widget and under Misc. you will see the Dataverse Search Box and the Dataverse Listing Widgets. Click on the widget you would like to add, fill out the form, and then drag it to where you would like it to display in the page.
+#. At the top right, select Add New Widget and under Misc. you will see the Dataverse Collection Search Box and the Dataverse Collection Listing Widgets. Click on the widget you would like to add, fill out the form, and then drag it to where you would like it to display in the page.
 
 .. _dataverse-permissions:
 
-Roles & Permissions 
----------------------
-Dataverse user accounts can be granted roles that define which actions they are allowed to take on specific dataverses, datasets, and/or files. Each role comes with a set of permissions, which define the specific actions that users may take.
+Roles & Permissions
+-------------------
+Dataverse installation user accounts can be granted roles that define which actions they are allowed to take on specific Dataverse collections, datasets, and/or files. Each role comes with a set of permissions, which define the specific actions that users may take.
 
-Roles and permissions may also be granted to groups. Groups can be defined as a collection of Dataverse user accounts, a collection of IP addresses (e.g. all users of a library's computers), or a collection of all users who log in using a particular institutional login (e.g. everyone who logs in with a particular university's account credentials).
+Roles and permissions may also be granted to groups. Groups can be defined as a collection of Dataverse installation user accounts, a collection of IP addresses (e.g. all users of a library's computers), or a collection of all users who log in using a particular institutional login (e.g. everyone who logs in with a particular university's account credentials).
 
-Admins of a dataverse can assign roles and permissions to the users of that dataverse. If you are an admin on a dataverse, then you will find the link to the Permissions page under the Edit dropdown on the dataverse page. 
+Admins of a Dataverse collection can assign roles and permissions to the users of that Dataverse collection. If you are an admin on a Dataverse collection, then you will find the link to the Permissions page under the Edit dropdown on the Dataverse collection page. 
 
 |image2|
 
@@ -113,121 +119,125 @@ Clicking on Permissions will bring you to this page:
 
 |image3|
 
-When you access a dataverse's permissions page, you will see three sections:
+When you access a Dataverse collection's permissions page, you will see three sections:
 
-**Permissions:** Here you can decide the requirements that determine which types of users can add datasets and sub dataverses to your dataverse, and what permissions they'll be granted when they do so.
+**Permissions:** Here you can decide the requirements that determine which types of users can add datasets and sub Dataverse collections to your Dataverse collection, and what permissions they'll be granted when they do so.
 
-**Users/Groups:** Here you can assign roles to specific users or groups, determining which actions they are permitted to take on your dataverse. You can also reference a list of all users who have roles assigned to them for your dataverse and remove their roles if you please.
+**Users/Groups:** Here you can assign roles to specific users or groups, determining which actions they are permitted to take on your Dataverse collection. You can also reference a list of all users who have roles assigned to them for your Dataverse collection and remove their roles if you please.
 
-**Roles:** Here you can reference a full list of roles that can be assigned to users of your dataverse. Each role lists the permissions that it offers.
+**Roles:** Here you can reference a full list of roles that can be assigned to users of your Dataverse collection. Each role lists the permissions that it offers.
 
-Please note that even on a newly created dataverse, you may see user and groups have already been granted role(s) if your installation has ``:InheritParentRoleAssignments`` set. For more on this setting, see the :doc:`/installation/config` section of the Installation Guide.
+Please note that even on a newly created Dataverse collection, you may see user and groups have already been granted role(s) if your installation has ``:InheritParentRoleAssignments`` set. For more on this setting, see the :doc:`/installation/config` section of the Installation Guide.
 
 Setting Access Configurations
-*******************************
-Under the Permissions tab, you can click the "Edit Access" button to open a box where you can add to your dataverse and what permissions are granted to those who add to your dataverse.
+*****************************
+
+Under the Permissions tab, you can click the "Edit Access" button to open a box where you can add to your Dataverse collection and what permissions are granted to those who add to your Dataverse collection.
 
 |image4|
 
-The first question on this page allows you to determine how open your dataverse is to new additions - you can set whether or not the entire userbase (all logged in users) has the ability to add datasets or sub dataverses to your dataverse. 
+The first question on this page allows you to determine how open your Dataverse collection is to new additions - you can set whether or not the entire userbase (all logged in users) has the ability to add datasets or sub Dataverse collections to your Dataverse collection. 
 
-The second question on this page allows you to choose the role (and thus the permissions) granted to users who add a dataset to your dataverse. The role you select will be automatically granted to any user who creates a dataset on your dataverse, on that dataset, at the moment that he or she creates it. The role the user is given determines his or her permissions for the dataset they've created. The key difference between the two roles is that curators can publish their own datasets, while contributors must submit the dataset to be reviewed before publication. Additionally, curators can manage dataset permissions. Note that this setting does not retroactively apply roles to users who have previously added datasets to your dataverse; it only applies to users adding new datasets going forward.
+The second question on this page allows you to choose the role (and thus the permissions) granted to users who add a dataset to your Dataverse collection. The role you select will be automatically granted to any user who creates a dataset on your Dataverse collection, on that dataset, at the moment that they create it. The role the user is given determines their permissions for the dataset they've created. The key difference between the two roles is that curators can publish their own datasets, while contributors must submit the dataset to be reviewed before publication. Additionally, curators can manage dataset permissions. Note that this setting does not retroactively apply roles to users who have previously added datasets to your Dataverse collection; it only applies to users adding new datasets going forward.
 
 Both of these settings can be changed at any time.
 
 Assigning Roles to Users and Groups
-*************************************
-Under the Users/Groups tab, you can add, edit, or remove the roles granted to users and groups on your dataverse. A role is a set of permissions granted to a user or group when they're using your dataverse. For example, giving your research assistant the "Contributor" role would give her the following self-explanatory permissions on your dataverse and all datasets within your dataverse: "ViewUnpublishedDataset", "DownloadFile", "EditDataset", and "DeleteDatasetDraft". She would, however, lack the "PublishDataset" permission, and thus would be unable to publish datasets on your dataverse. If you wanted to give her that permission, you would give her a role with that permission, like the Curator role. Users and groups can hold multiple roles at the same time if needed. Roles can be removed at any time. All roles and their associated permissions are listed under the "Roles" tab of the same page.
+***********************************
+
+Under the Users/Groups tab, you can add, edit, or remove the roles granted to users and groups on your Dataverse collection. A role is a set of permissions granted to a user or group when they're using your Dataverse collection. For example, giving your research assistant the "Contributor" role would give them the following self-explanatory permissions on your Dataverse collection and all datasets within your Dataverse collection: "ViewUnpublishedDataset", "DownloadFile", "EditDataset", and "DeleteDatasetDraft". They would, however, lack the "PublishDataset" permission, and thus would be unable to publish datasets on your Dataverse collection. If you wanted to give them that permission, you would give them a role with that permission, like the Curator role. Users and groups can hold multiple roles at the same time if needed. Roles can be removed at any time. All roles and their associated permissions are listed under the "Roles" tab of the same page.
 
 |image5|
 
-Note that the Dataset Creator role and Contributor role are sometimes confused. The Dataset Creator role is assigned at the dataverse level and allows a user to create new datasets in that dataverse. The Contributor role can be assigned at the dataset level, granting a user the ability to edit *that specific* dataset. Alternatively, the Contributor role can be assigned at the dataverse level, granting the user the ability to edit *all* datasets in that dataverse.
+Note that the Dataset Creator role and Contributor role are sometimes confused. The Dataset Creator role is assigned at the Dataverse collection level and allows a user to create new datasets in that Dataverse collection. The Contributor role can be assigned at the dataset level, granting a user the ability to edit *that specific* dataset. Alternatively, the Contributor role can be assigned at the Dataverse collection level, granting the user the ability to edit *all* datasets in that Dataverse collection.
 
 |image6|
 
-Note: If you need to assign a role to ALL Dataverse user accounts, you can assign the role to the ":authenticated-users" group.
+Note: If you need to assign a role to ALL user accounts in a Dataverse installation, you can assign the role to the ":authenticated-users" group.
 
 .. _dataset-templates: 
 
 Dataset Templates
--------------------
-Templates are useful when you have several datasets that have the same information in multiple metadata fields that you would prefer not to have to keep manually typing in, or if you want to use a custom set of Terms of Use and Access for multiple datasets in a dataverse. In Dataverse 4.0, templates are created at the dataverse level, can be deleted (so it does not show for future datasets), set to default (not required), or can be copied so you do not have to start over when creating a new template with similar metadata from another template. When a template is deleted, it does not impact the datasets that have used the template already.
+-----------------
+
+Templates are useful when you want to provide custom instructions on how to fill out a field, have several datasets that have the same information in multiple metadata fields that you would prefer not to have to keep manually typing in, or if you want to use a custom set of Terms of Use and Access for multiple datasets in a Dataverse collection. In Dataverse Software 4.0+, templates are created at the Dataverse collection level, can be deleted (so it does not show for future datasets), set to default (not required), or can be copied so you do not have to start over when creating a new template with similar metadata from another template. When a template is deleted, it does not impact the datasets that have used the template already.
 
 How do you create a template? 
 
-#. Navigate to your dataverse, click on the Edit Dataverse button and select Dataset Templates. 
-#. Once you have clicked on Dataset Templates, you will be brought to the Dataset Templates page. On this page, you can 1) decide to use the dataset templates from your parent dataverse 2) create a new dataset template or 3) do both.
+#. Navigate to your Dataverse collection, click on the Edit Dataverse button and select Dataset Templates. 
+#. Once you have clicked on Dataset Templates, you will be brought to the Dataset Templates page. On this page, you can 1) decide to use the dataset templates from your parent Dataverse collection 2) create a new dataset template or 3) do both.
 #. Click on the Create Dataset Template to get started. You will see that the template is the same as the create dataset page with an additional field at the top of the page to add a name for the template.
+#. To add custom instructions, click on ''(None - click to add)'' and enter the instructions you wish users to see. If you wish to edit existing instructions, click on them to make the text editable.
 #. After adding information into the metadata fields you have information for and clicking Save and Add Terms, you will be brought to the page where you can add custom Terms of Use and Access. If you do not need custom Terms of Use and Access, click the Save Dataset Template, and only the metadata fields will be saved.
 #. After clicking Save Dataset Template, you will be brought back to the Manage Dataset Templates page and should see your template listed there now with the make default, edit, view, or delete options. 
-#. A dataverse does not have to have a default template and users can select which template they would like to use while on the Create Dataset page. 
+#. A Dataverse collection does not have to have a default template and users can select which template they would like to use while on the Create Dataset page. 
 #. You can also click on the View button on the Manage Dataset Templates page to see what metadata fields have information filled in.
 
-\* Please note that the ability to choose which metadata fields are hidden, required, or optional is done on the General Information page for the dataverse.
+\* Please note that the ability to choose which metadata fields are hidden, required, or optional is done on the General Information page for the Dataverse collection.
 
 .. _dataset-guestbooks:
 
 Dataset Guestbooks
------------------------------
-Guestbooks allow you to collect data about who is downloading the files from your datasets. You can decide to collect account information (username, given name & last name, affiliation, etc.) as well as create custom questions (e.g., What do you plan to use this data for?). You are also able to download the data collected from the enabled guestbooks as Excel files to store and use outside of Dataverse.
-
-How do you create a guestbook?
+------------------
 
-#. After creating a dataverse, click on the Edit Dataverse button and select Dataset Guestbook
-#. By default, guestbooks created in the dataverse your dataverse is in, will appear. If you do not want to use or see those guestbooks, uncheck the checkbox that says Include Guestbooks from Root Dataverse.
-#. To create a new guestbook, click the Create Dataset Guestbook button on the right side of the page. 
-#. Name the guestbook, determine the account information that you would like to be required (all account information fields show when someone downloads a file), and then add Custom Questions (can be required or not required). 
-#. Hit the Create Dataset Guestbook button once you have finished.
+Guestbooks allow you to collect data about who is downloading the files from your datasets. You can decide to collect account information (username, given name & last name, affiliation, etc.) as well as create custom questions (e.g., What do you plan to use this data for?). You are also able to download the data collected from the enabled guestbooks as CSV files to store and use outside of the Dataverse installation.
 
-What can you do with a guestbook?
-After creating a guestbook, you will notice there are several options for a guestbook and appear in the list of guestbooks. 
-
-- If you want to use a guestbook you have created, you will first need to click the button in the Action column that says Enable. Once a guestbook has been enabled, you can go to the License + Terms for a dataset and select a guestbook for it.
+How do you create a guestbook?
 
-- There are also options to view, copy, edit, or delete a guestbook.
+#. After creating a Dataverse collection, click on the "Edit Dataverse" button and select "Dataset Guestbooks".
+#. To create a new guestbook, click the "Create Dataset Guestbook" button on the right side of the page. 
+#. Name the guestbook, determine the account information that you would like to be required (all account information fields show when someone downloads a file), and then add custom questions (can be required or not required), if desired.
+#. Click the "Create Dataset Guestbook" button once you have finished.
 
-- Once someone has downloaded a file in a dataset where a guestbook has been assigned, an option to download collected data will appear. 
+What can you do with a guestbook? After creating a guestbook, you will notice there are several options for a guestbook that appear in the list of guestbooks.
 
+- From the dataset page, you can select a guestbook by clicking "Terms" and then "Edit Terms Requirements", unless the guestbook is disabled.
+- From the "Manage Dataset Guestbooks" page, there are options to view, copy, edit, disable, or delete a guestbook. There are also options to download or view responses. By default, guestbooks inherited from the parent Dataverse collection will appear. If you do not want to use or see those guestbooks, uncheck the checkbox that says "Include Guestbooks from [Parent]".
+- Note that it is also possible to download guestbook responses via API. See :ref:`download-guestbook-api` for details.
 
 .. _featured-dataverses:
 
-Featured Dataverses
-----------------------
+Featured Dataverse Collection
+-----------------------------
 
-Featured Dataverses is a way to display sub dataverses in your dataverse that you want to feature for people to easily see when they visit your dataverse. 
+Featured Dataverse collections is a way to display sub Dataverse collections in your Dataverse collection that you want to feature for people to easily see when they visit your Dataverse collection. 
 
-Click on Featured Dataverses and a pop up will appear. Select which sub dataverses you would like to have appear. 
+Click on Featured Dataverse Collections and a pop up will appear. Select which Dataverse subcollections you would like to have appear. 
 
-Note: Featured Dataverses can only be used with published dataverses.
+Note: Featured Dataverse collections can only be used with published Dataverse collections.
+
+.. _dataset-linking:
 
 Dataset Linking
 ===============
 
-Dataset linking allows a dataverse owner to "link" their dataverse to a dataset that exists outside of that dataverse, so it appears in the dataverse’s list of contents without actually *being* in that dataverse. You can link other users' datasets to your dataverse, but that does not transfer editing or other special permissions to you. The linked dataset will still be under the original user's control. 
+Dataset linking allows a Dataverse collection owner to "link" their Dataverse collection to a dataset that exists outside of that Dataverse collection, so it appears in the Dataverse collection’s list of contents without actually *being* in that Dataverse collection. You can link other users' datasets to your Dataverse collection, but that does not transfer editing or other special permissions to you. The linked dataset will still be under the original user's control. 
 
-For example, researchers working on a collaborative study across institutions can each link their own individual institutional dataverses to the one collaborative dataset, making it easier for interested parties from each institution to find the study.
+For example, researchers working on a collaborative study across institutions can each link their own individual institutional Dataverse collections to the one collaborative dataset, making it easier for interested parties from each institution to find the study.
 
-In order to link a dataset, you will need your account to have the "Add Dataset" permission on the Dataverse that is doing the linking. If you created the dataverse then you should have this permission already, but if not then you will need to ask the admin of that dataverse to assign that permission to your account. You do not need any special permissions on the dataset being linked.
+In order to link a dataset, you will need your account to have the "Link Dataset" permission on the Dataverse collection that is doing the linking. If you created the Dataverse collection then you should have this permission already, but if not then you will need to ask the admin of that Dataverse collection to assign that permission to your account. You do not need any special permissions on the dataset being linked.
 
-To link a dataset to your dataverse, you must navigate to that dataset and click the white "Link" button in the upper-right corner of the dataset page. This will open up a window where you can type in the name of the dataverse that you would like to link the dataset to. Select your dataverse and click the save button. This will establish the link, and the dataset will now appear under your dataverse.
+To link a dataset to your Dataverse collection, you must navigate to that dataset and click the white "Link" button in the upper-right corner of the dataset page. This will open up a window where you can type in the name of the Dataverse collection that you would like to link the dataset to. Select your Dataverse collection and click the save button. This will establish the link, and the dataset will now appear under your Dataverse collection.
 
-There is currently no way to remove established links in the UI. If you need to remove a link between a dataverse and a dataset, please contact the support team for the Dataverse installation you are using.
+A draft dataset can be linked to other Dataverse collections. It will only become publicly visible in the linked collection(s) after it has been published. To publish the dataset, your account must have the "Publish Dataset" permission for the Dataverse collection in which the dataset was originally created. Permissions in the linked Dataverse collections do not apply.
 
+There is currently no way to remove established links in the UI. If you need to remove a link between a Dataverse collection and a dataset, please contact the support team for the Dataverse installation you are using (see the :ref:`unlink-a-dataset` section of the Admin Guide for more information).
 
-Dataverse Linking
-======================================================
+.. _dataverse-linking:
 
-Similarly to dataset linking, dataverse linking allows a dataverse owner to "link" their dataverse to another dataverse, so the dataverse being linked will appear in the linking dataverse's list of contents without actually *being* in that dataverse. Currently, the ability to link a dataverse to another dataverse is a superuser only feature. 
+Dataverse Collection Linking
+============================
 
-If you need to have a dataverse linked to your dataverse, please contact the support team for the Dataverse installation you are using.
+Similarly to dataset linking, Dataverse collection linking allows a Dataverse collection owner to "link" their Dataverse collection to another Dataverse collection, so the Dataverse collection being linked will appear in the linking Dataverse collection's list of contents without actually *being* in that Dataverse collection. Currently, the ability to link a Dataverse collection to another Dataverse collection is a superuser only feature. 
 
-Publish Your Dataverse
-=================================================================
+If you need to have a Dataverse collection linked to your Dataverse collection, please contact the support team for the Dataverse installation you are using.
 
-Once your dataverse is ready to go public, go to your dataverse page, click on the "Publish" button on the right 
-hand side of the page. A pop-up will appear to confirm that you are ready to actually Publish, since once a dataverse
-is made public, it can no longer be unpublished.
+Publish Your Dataverse Collection
+=================================
 
+Once your Dataverse collection is ready to go public, go to your Dataverse collection page, click on the "Publish" button on the right 
+hand side of the page. A pop-up will appear to confirm that you are ready to actually Publish, since once a Dataverse collection
+is made public, it can no longer be unpublished.
 
 .. |image1| image:: ./img/Dataverse-Diagram.png
 .. |image2| image:: ./img/dvperms1.png
@@ -240,6 +250,3 @@ is made public, it can no longer be unpublished.
    :class: img-responsive
 .. |image6| image:: ./img/dv5.png
    :class: img-responsive
-
-
-
diff --git a/doc/sphinx-guides/source/user/find-use-data.rst b/doc/sphinx-guides/source/user/find-use-data.rst
index c7670ceffb8..8e65108d680 100755
--- a/doc/sphinx-guides/source/user/find-use-data.rst
+++ b/doc/sphinx-guides/source/user/find-use-data.rst
@@ -7,14 +7,14 @@ Finding and Using Data
 Finding Data
 ============
 
-Without logging in to Dataverse, users can browse Dataverse, search for dataverses, datasets, and files, view dataset descriptions and files for
-published datasets, and subset, analyze, and visualize data for published (restricted & not restricted) data files. To view an unpublished dataverse, dataset, or file, a user will need to be given permission from that dataverse's administrator to access it.
+Without logging in, users can browse a Dataverse installation and search for Dataverse collections, datasets, and files, view dataset descriptions and files for
+published datasets, and subset, analyze, and visualize data for published (restricted & not restricted) data files. To view an unpublished Dataverse collection, dataset, or file, a user will need to be given permission from that Dataverse installation's administrator to access it.
 
-A user can search within a specific dataverse for the dataverses, datasets, and files it contains by using the search bar and facets displayed on that dataverse's page.
+A user can search within a specific Dataverse collection for the Dataverse collections, datasets, and files it contains by using the search bar and facets displayed on that Dataverse collection's page.
 
 Basic Search
 ------------
-You can search the entire contents of the Dataverse installation, including dataverses, datasets, and files. You can access the search by clicking the "Search" button in the header of every page. The search bar accepts search terms, queries, or exact phrases (in quotations).
+You can search the entire contents of the Dataverse installation, including Dataverse collections, datasets, and files. You can access the search by clicking the "Search" button in the header of every page. The search bar accepts search terms, queries, or exact phrases (in quotations).
 
 Sorting and Viewing Search Results
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -25,7 +25,7 @@ Facets: to the left of the search results, there are several facets a user can c
     - Viewing more or fewer facets: Each category in the facets panel lists the top 5 most common facets from that category. To view more, click on "More..." in the bottom right of that category. Once you've chosen to see more, an option to view less will appear in the bottom left of the facet.
    
 Result cards: after entering a search term or query, result cards that match your term or query appear underneath the search bar and to the right of the facets.
-    - Relevancy of results: each result card shows which metadata fields match the search query or term you entered into the search bar, with the matching term or query bolded. If the search term or query was found in the title or name of the dataverse, dataset, or file, the search term or query will be bolded within it.
+    - Relevancy of results: each result card shows which metadata fields match the search query or term you entered into the search bar, with the matching term or query bolded. If the search term or query was found in the title or name of the Dataverse collection, dataset, or file, the search term or query will be bolded within it.
 
 Other basic search features: 
     - Sorting results: search results can be sorted by name (A-Z or Z-A), by date (newest or oldest), or by relevancy of results. The sort button can be found above the search results, in the top right.
@@ -35,34 +35,45 @@ Advanced Search
 ---------------
 
 To perform an advanced search, click the "Advanced Search" link next to the search bar. There you will have the ability to 
-enter search terms for dataverses, dataset metadata (citation and domain-specific), and file-level 
+enter search terms for Dataverse collections, dataset metadata (citation and domain-specific), and file-level 
 metadata. If you are searching for tabular data files you can also search at the variable level for name and label. To find 
 out more about what each field searches, hover over the field name for a detailed description of the field.
 
-Browsing Dataverse
-------------------
+.. _geospatial-search:
 
-In Dataverse, browsing is the default view when a user hasn't begun a search on the root dataverse page or on a specific dataverse's page.  When browsing, only dataverses and datasets appear in the results list and the results can be sorted by Name (A-Z or Z-A) and by Newest or Oldest. You can toggle the "Files" facet on the left to include files in the results list.
+Geospatial Search
+-----------------
+
+Geospatial search is available from the :doc:`/api/search` (look for "geo" parameters). The metadata fields that are geospatially indexed are "West Longitude", "East Longitude", "North Latitude", and "South Latitude" from the "Geographic Bounding Box" field in the "Geospatial Metadata" block.
+
+Browsing a Dataverse Installation
+---------------------------------
+
+In a Dataverse installation, browsing is the default view when a user hasn't begun a search on the root Dataverse collection page or on a specific Dataverse collection's page.  When browsing, only Dataverse collections and datasets appear in the results list and the results can be sorted by Name (A-Z or Z-A) and by Newest or Oldest. You can toggle the "Files" facet on the left to include files in the results list.
 
 Saved Search
 ------------
 
-Saved Search is currently an experimental feature only available to superusers. Please see the :doc:`/api/native-api` section of the API Guide for more information.
+Saved Search is currently an experimental feature only available to superusers. Please see :ref:`saved-search` in the API Guide for more information.
 
 Using Data
 ==========
 
-View Dataverses + Datasets
---------------------------
+View Dataverse Collections + Datasets
+-------------------------------------
 
-After performing a search and finding the dataverse or dataset you are looking for, click on the name of the dataverse or dataset or on the thumbnail image to be taken to the page for that dataverse or dataset. Once on a dataverse page, you can view the dataverses, datasets, and files within that dataverse.
+After performing a search and finding the Dataverse collection or dataset you are looking for, click on the name of the Dataverse collection or dataset or on the thumbnail image to be taken to the page for that Dataverse collection or dataset. Once on a Dataverse collection page, you can view the Dataverse collections, datasets, and files within that Dataverse collection.
 
 Once on a dataset page, you will see the title, citation, description, and several other fields, as well as a button to email the dataset contact and a button to share the dataset on social media. Below that information, the files, metadata, terms of use, and version information for the dataset are available. 
 
 View Files
 ----------
 
-Files in Dataverse each have their own page that can be reached through the search results or through the Files table on their parent dataset's page. The dataset page and file page offer much the same functionality in terms of viewing and editing files, with a few small exceptions. The file page includes the file's persistent identifier (DOI or handle), which can be found under the Metadata tab. Also, the file page's Versions tab gives you a version history that is more focused on the individual file rather than the dataset as a whole. 
+Files in a Dataverse installation each have their own landing page that can be reached through the search results or through the Files table on their parent dataset's page. The dataset page and file page offer much the same functionality in terms of viewing and editing files, with a few small exceptions. 
+
+- In installations that have enabled support for persistent identifiers (PIDs) at the file level, the file page includes the file's DOI or handle, which can be found in the file citation and also under the Metadata tab.
+- Previewers for several common file types are available and can be added by installation administrators.
+- The file page's Versions tab gives you a version history that is more focused on the individual file rather than the dataset as a whole. 
 
 File Search within Datasets
 ---------------------------
@@ -85,18 +96,22 @@ Files can be organized in one or more folders (directories) within a dataset. If
 Cite Data
 ---------
 
-You can find the citation for the dataset at the top of the dataset page in a blue box. Additionally, there is a Cite Data button that offers the option to download the citation as EndNote XML, RIS Format, or BibTeX Format.
+You can find the citation for the dataset at the top of the dataset page in a blue box. Additionally, there is a Cite Data button that offers the option to download the citation as EndNote XML, RIS Format, or BibTeX Format, or to cut/paste the citation in any of the 1000+ standard journal/society/other formats defined via the `Citation Style Language <https://citationstyles.org/>`_.
 
 .. _download_files:
 
+In installations that have added file-level citations, you can find and download the file's citation on the file page in a similar manner.
+
 Download Files
 --------------
 
-Within the Files tab on a dataset page, you can download the files in that dataset. To download more than one file at a time, select the files you would like to download and then click the Download button above the files. The selected files will download in .zip format that preserves any folder structure that the dataset owner had set up.
+If you want to download all files in a dataset, you can click the Access Dataset dropdown on the dataset page and select one of the download options. The dataset's files will download in .zip format and will preserve any folder structure that the dataset owner had set up. 
+
+If you'd like to download a single file or some subset of the dataset's files, you can use the Files tab. To download more than one file at a time, select the files you would like to download and then click the Download button above the files. The dataset's files will download in .zip format and will preserve any folder structure that the dataset owner had set up.
 
-You may also download a file from its file page by clicking the Download button in the upper right corner of the page, or by :ref:`url_download` under the Metadata tab on the lower half of the page.
+You may also download a file from the Access File button on its file page or by :ref:`url_download` under the Metadata tab.
 
-Tabular data files offer additional options: You can explore using any data exploration or visualization :doc:`/admin/external-tools` (if they have been enabled) by clicking the Explore button, or choose from a number of tabular-data-specific download options available as a dropdown under the Download button.
+Tabular data files offer additional options: You can explore using any data exploration or visualization :doc:`/admin/external-tools` (if they have been enabled), or choose from a number of tabular-data-specific download options available.
 
 Tabular Data
 ^^^^^^^^^^^^
@@ -107,46 +122,43 @@ Ingested files can be downloaded in several different ways.
 
 - The original file, which may be in a proprietary format which requires special software
 
-- Rdata format if the instalation has configured this
+- RData format if the installation has configured this
 
 - The variable metadata for the file in DDI format
 
-- A subset of the columns of the data
-
-
 .. _url_download:
 
 Downloading via URL
 ^^^^^^^^^^^^^^^^^^^^
 
-Dataverse displays a plaintext URL for the location of the file under the Metadata tab on the file page. This Download URL can be used to directly access the file via API (or in a web browser, if needed). When downloading larger files, in order to ensure a reliable, resumable download, we recommend using `GNU Wget <https://www.gnu.org/software/wget/>`_ in a command line terminal or using a download manager software of your choice.
+The Dataverse installation displays a plaintext URL for the location of the file under the Metadata tab on the file page. This Download URL can be used to directly access the file via API (or in a web browser, if needed). When downloading larger files, in order to ensure a reliable, resumable download, we recommend using `GNU Wget <https://www.gnu.org/software/wget/>`_ in a command line terminal or using a download manager software of your choice.
  
-Certain files do not provide Download URLs for technical reasons: those that are restricted, have terms of use associated with them, or are part of a dataverse with a guestbook enabled. 
+Certain files do not provide Download URLs for technical reasons: those that are restricted, have terms of use associated with them, or are part of a Dataverse collection with a guestbook enabled. 
 
 .. _package_download_url:
 
-Downloading a Dataverse Package via URL
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Dataverse Packages are typically used to represent extremely large files or bundles containing a large number of files. Dataverse Packages are often too large to be reliably downloaded using a web browser. When you click to download a Dataverse Package, instead of automatically initiating the download in your web browser, Dataverse displays a plaintext URL for the location of the file. To ensure a reliable, resumable download, we recommend using `GNU Wget <https://www.gnu.org/software/wget/>`_ in a command line terminal or using a download manager software of your choice. If you try to simply paste the URL into your web browser then the download may overwhelm your browser, resulting in an interrupted, timed out, or otherwise failed download.
+Downloading a Dataverse File Package via URL
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. _rsync_download:
+Dataverse File Packages are typically used to represent extremely large files or bundles containing a large number of files. Dataverse File Packages are often too large to be reliably downloaded using a web browser. When you click to download a Dataverse File Package, instead of automatically initiating the download in your web browser, the Dataverse installation displays a plaintext URL for the location of the file. To ensure a reliable, resumable download, we recommend using `GNU Wget <https://www.gnu.org/software/wget/>`_ in a command line terminal or using a download manager software of your choice. If you try to simply paste the URL into your web browser then the download may overwhelm your browser, resulting in an interrupted, timed out, or otherwise failed download.
 
-Downloading a Dataverse Package via rsync
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-rsync is typically used for synchronizing files and directories between two different systems. Some Dataverse installations allow downloads using rsync, to facilitate large file transfers in a reliable and secure manner.
+Explore Data
+------------
 
-rsync-enabled Dataverse installations offer a new file download process that differs from traditional browser-based downloading. Instead of multiple files, each dataset uploaded via rsync contains a single "Dataverse Package". When you download this package you will receive a folder that contains all files from the dataset, arranged in the exact folder structure in which they were originally uploaded.
+Some file types and datasets offer data exploration options if external tools have been installed. The tools are described in the :doc:`/admin/external-tools` section of the Admin Guide.
 
-In a dataset containing a Dataverse Package, the information to download and/or access is in two places. You can find it on the **dataset page** under the **Files** tab, and on the **file page** under the **Data Access** tab. If the data is locally available to you (on a shared drive, for example) you will find the folder path to access the data locally. To download, use one of the rsync commands provided. There may be multiple commands, each corresponding to a different mirror that hosts the Dataverse Package. Go outside your browser and open a terminal (AKA command line) window on your computer. Use the terminal to run the command that corresponds with the mirror of your choice. It’s usually best to choose the mirror that is geographically closest to you. Running this command will initiate the download process.
+Exploratory Data Analysis Using Differentially Private Metadata (Experimental)
+------------------------------------------------------------------------------
 
-After you've downloaded the Dataverse Package, you may want to double-check that your download went perfectly. Under **Verify Data**, you'll find a command that you can run in your terminal that will initiate a checksum to ensure that the data you downloaded matches the data in Dataverse precisely. This way, you can ensure the integrity of the data you're working with. 
+Through an integration with tools from the OpenDP Project (opendp.org), the Dataverse Software offers an experimental workflow that allows a data depositor to create and deposit Differentially Private (DP) Metadata files, which can then be used for exploratory data analysis. This workflow allows researchers to view the DP metadata for a tabular file, determine whether or not the file contains useful information, and then make an informed decision about whether or not to request access to the original file.
 
-Explore Data
-------------
+If the data depositor has made available DP metadata for one or more files in their dataset, these access options will appear on the access dropdown on both the Dataset Page and the File Page. These access options will be available even if a file is restricted. Three types of DP metadata will be available:
 
-Please see the :doc:`/user/data-exploration/index` to get started.
+- .PDF
+- .XML
+- .JSON
+  
+For more information about how data depositors can enable access using the OpenDP tool, visit the :doc:`/user/dataset-management` section of the User Guide.
 
 .. |image-file-tree-view| image:: ./img/file-tree-view.png
    :class: img-responsive
diff --git a/doc/sphinx-guides/source/user/img/DatasetDiagram.png b/doc/sphinx-guides/source/user/img/DatasetDiagram.png
old mode 100755
new mode 100644
index 45a21456a08..471a54c2d83
Binary files a/doc/sphinx-guides/source/user/img/DatasetDiagram.png and b/doc/sphinx-guides/source/user/img/DatasetDiagram.png differ
diff --git a/doc/sphinx-guides/source/user/img/Dataverse-Diagram.ai b/doc/sphinx-guides/source/user/img/Dataverse-Diagram.ai
new file mode 100644
index 00000000000..7e72c1cc0a8
--- /dev/null
+++ b/doc/sphinx-guides/source/user/img/Dataverse-Diagram.ai
@@ -0,0 +1,1497 @@
+%PDF-1.6
%âãĪĶ
+1 0 obj
<</Metadata 2 0 R/OCProperties<</D<</OFF[25 0 R]/ON[26 0 R]/Order 27 0 R/RBGroups[]>>/OCGs[26 0 R 25 0 R]>>/Pages 3 0 R/Type/Catalog>>
endobj
2 0 obj
<</Length 45337/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="īģŋ" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 7.1-c000 79.a8731b9, 2021/09/09-00:37:38        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:dc="http://purl.org/dc/elements/1.1/"
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+            xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/"
+            xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+            xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
+            xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
+            xmlns:stMfs="http://ns.adobe.com/xap/1.0/sType/ManifestItem#"
+            xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/"
+            xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+            xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+            xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font#"
+            xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/"
+            xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+            xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/">
+         <dc:format>application/pdf</dc:format>
+         <dc:title>
+            <rdf:Alt>
+               <rdf:li xml:lang="x-default">DVN Schematic Diagram</rdf:li>
+            </rdf:Alt>
+         </dc:title>
+         <xmp:CreatorTool>Adobe Illustrator 26.0 (Macintosh)</xmp:CreatorTool>
+         <xmp:CreateDate>2021-11-08T15:00:32-05:00</xmp:CreateDate>
+         <xmp:ModifyDate>2021-11-08T15:00:32-05:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2021-11-08T15:00:32-05:00</xmp:MetadataDate>
+         <xmp:Thumbnails>
+            <rdf:Alt>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpGImg:width>256</xmpGImg:width>
+                  <xmpGImg:height>104</xmpGImg:height>
+                  <xmpGImg:format>JPEG</xmpGImg:format>
+                  <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAaAEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4qkfm7y5LrtpZQRTpb&#xA;vaXsF5zkQyqRCSSpj5Krcgf2qgdftAEKsLsPys882k5uE87XKyT3kV3f8VkPr+jFDEtfWlmCc/SZ&#xA;3VFCmoSgUYqp335UefbhrFV8+Xgt4Gt5bqJhPWZ4SGlHJbhWCyt2347U2qCqidO/KnXoIdGjvfMH&#xA;12XSXbjduk/qCMtbsnoqZykTols0IoKFWJYMxNVUr0n8rvzRsdXsLeXznJP5et/QMyIbiGQJCQHg&#xA;QCVtpkUfEW+A/Z2JXFWQ+UfIXnTSNTivdW84XOrIlxLJLaOriJoHg9OOEB5HpwlPqcjU9q4qo6d+&#xA;WvmWxtpZovM0p1q71K0vL7UnErmW2s4RF9W4tKwCytykZfsAuwVQKUVSjUfyZ82XXmq+1SPzc8Gm&#xA;3t7BeyWggYyusF8t4sMsnq0ZUVfSj4qvFVUd35KpbZ/kd+ZkGhw6O35j3L2lu0XposMsNI4Y4lEf&#xA;KKdHp+5K05EEOWPx74qmXlX8ovzH0SbSfrH5hXN5aaZJGz2foMkU0SSQFo2HrN1hjkj7jcPTlyqq&#xA;jb38p/Ml1BZW0nmT1rS1igi+qzxSvEGgsUtFmRVnUq6ymScUO7Fan4a4qo3v5U+fp9U1K8g8+Xls&#xA;l9NGbcIJi9vBGzsUTlM0RZuYqTHTbpQgKqi5/wAt/Pkl5cXI873lZbOOKKL41hjug0JlmEaOp4v6&#xA;c3w8thJQEcFOKrR+WHnRoFE/na8nuF0+/wBPMkiCnK/ZT9ZHptERJGBVNzx2C0Faqs58t6VPpOh2&#xA;mnT3H1qW3Uq01CBuxYKoYsQiA8VBJ+EDFUyxV2KuxV2KuxV2KuxV2KuxV2KuxVxIAqdgOpxV82fm&#xA;N/zlJrNz5ibyl+VWm/pfUg5hbUjG1wHkX7QtYU+0q03kf4eu1PixVKF07/nN6+Vbl7s25cVERfSY&#xA;iAdxVUG3Xvv44qo3muf85neT4TqWownVtOgBkni9KxvFoOvNbXjc0AFSQaDFXrH5I/8AOQOh/mVE&#xA;+nzwjTPM1tH6k9hy5Ryxg0aW3Y7kAkclO4r3G+KvWMVdirsVdirCPMv5q6PpVw9pZxHULqMlZCrB&#xA;IlYbU50apHsPpzJx6Yy3OzIRSQfmv5nIqNBqDuDSX+mWflo96eFUt/ziu4J1TVtHaGN/2o2ZWA8Q&#xA;kgHL/ghidIDyK8L0DRtb0zWbJbzT5hNC2zdmVu6sp3BzEnAxNFgQjsirsVYt5x/MPRvLIEMgN3qD&#xA;DktnGQCAehkY14A/In2y7FhM/c42fVRx7cyw1PzP/MW8Hr6b5dEls32GFtdTD/g0ZQfuy/8AL4xz&#xA;Lh/nMx3EdvcXH82PO2nMsmt+XxFbk03intifk0pkH4Y/l4HkV/O5I/VH7w9B8rebtI8y2RuLByJI&#xA;6C4tnoJIyfEDqD2IzGyYzA7ufhzxyCwnWVtzsVdirsVdirsVdirsVdirsVdirsVdiry//nJXzXee&#xA;W/yg1meykMV5f+np8MqmhUXLcZSO9fSDgU3HXFUl/wCcVPy80zy7+XFnr7Qhtb8xIbm4uWHxrb8i&#xA;IIUJ3CcVDnxY96DFXtWKuxV8i/8AOReiQ/ln+bnlr8wvLyfVf0lM9zeW8Q4o09syC42GwFxFNRh3&#xA;PI98VfXWKuxV2KsS/M7X5tI8tMts/C5vXFujjqqkEuw+gU+nMjTQ4pb9ExCH/LnyVY6ZpdvqVzEs&#xA;up3SLL6jgH0lcVVUr0NOp64dRmMjQ5JkWa5jMUPf6dY6hava3sCXFu4o0bio+Y8D7jDGRBsK8t0i&#xA;KfyZ+YqaUkjNpupFERT3SUkRE/5SSfDX5+OZ0j4mO+oZ8w9azAYIXVr9NO0u7v5BVLSGSYrWlfTU&#xA;tT6aYYizTGcuGJPc8r/K7y4nmLUb7zTrYF0wnKwxuKqZqB2YqeyBlCjp92ZmonwgRDrNHi8Qmct3&#xA;r2YTtVssUU0TRTIskTgq8bgMpB6gg7HG0EW8a1ywHkL8wLG+08mPS74gtDWoEbMFmi9wtQy/R4Zn&#xA;wPiQIPN1OSPgZQR9Jez5gO3dirsVdirsVdirsVQ2o6npumWcl7qV3DZWUIrLc3MixRIOlWdyqj6T&#xA;irHLH82vyvv7tbO0816VNcueMcS3kNXatKJVviJ8BirLMVdirsVdirwr/nMn/wAlHD/21bb/AJNT&#xA;Yq9A/JT/AMlH5Q/7ZVr/AMmhirNcVdir5g/5zj/45XlH/jPe/wDEIcVfSupala6dam4uCSCQkUSD&#xA;lJJI32Y41/aZuwxVAwx+bpkEr3FjaF/iFqbaWdoweitKtxErsB1IUDFV/wBW81f9XGx/6QZv+yvF&#xA;WGfmZonmu/sbJB6eo8JWPCztZI2Wq9WLTT1H0DMrSyAJtlFPLq+8waNo1rJPe2rTOscFpYpYyvcT&#xA;TFPhhjH1tAX2NSaKACzcVBIxpc2Ka+U7/WL7Q4p9ZWBNTEtzDcpaBxCGguJIgE5lmPwoKnud6Dpg&#xA;VN8VeaecvJnmzUPNdleWtx9Yg5j0J3WNTahG9SjhQOag7qTUnoffMw5oCBB/tZAh6PbRSxW8ccsz&#xA;XEiqA8zhVZz3JCBVH0DMQsUo846Jfa1oVzY2N2bSeRSBsCkgIoY5Kgni3iNxk8UxE2WnPjM4kA0x&#xA;PynZ3nkPyrPf6/cMA71h0uMoQsj7faH2nbj40AyOu1UIji/BR2dpJ/Sev2IMfmt5quAbiy0IPZ1P&#xA;xhZpBQdfjXiv4Zpf5QyHcR2+Lu/yOMbGW7K/JXnyz8yrJCYja6hAOUkBPIMlackag79R2zM0urGX&#xA;blJxdRpjj35hh359f9KL/o6/5k5udH1dD2l/D8f0PWcwnaOxV2KuxV2KuxV2Kvk788LXWPzH/wCc&#xA;iNI/LWW+ez0W3SMqqbgE2zXc83A0Bk9MFFr0p7nFU78+/wDOIXkDTfJeralot/qMWp6baTXcLXMs&#xA;UsUht4zIUkVYkPxhaVU7HffpirKP+cR/N+r+YPyxktdUma4k0S8extp3JZzb+mkkasTueHMqP8mg&#xA;7Yq9uxV2KuxV4V/zmT/5KOH/ALatt/yamxV6B+Sn/ko/KH/bKtf+TQxVmuKuxV8wf85x/wDHK8o/&#xA;8Z73/iEOKvbdB1LVdQEHmC+0K8knuI+dhCklkY7e3lFVC8rhSZHQj1Gp/kjYbqp7+mdR/wCrDff8&#xA;HY/9lOKu/TOo/wDVhvv+Dsf+ynFVC/8AM15Y2NxezaDf+jaxPNJR7EnjGpY0/wBJ8Birei6Ldi7O&#xA;s6yUl1mVCkcaEtDZwsQfQgqBWtB6klAZCOyhVVVW8s/8c6b/AJjtQ/6jpsVXa5rkemRxRxxG71O7&#xA;JTT9PQgPK4FSSTXhGlaySHZR4kgFVRg0/wAzmFGudWjW4IrKsNsvphj1Cc2ZuI7VNcVVP0dr3/V3&#xA;/wCnaP8Arirv0dr3/V3/AOnaP+uKvO/zXt/MqxWkVyxu9PElYrhFC/vSKcHRRsf5dzXNT2nxEAVt&#xA;3uy7P4bJvdNfKOs+bHu9Ht3jjg0QSNZTBlUl5I7WWRUgKBP7toaSMajl8AqQ3HYae+AWKcLNXEaN&#xA;oDSES3/OW7ihURxv6vJR0+KEOfvbfNbjFaogfjZz8m+mF/jdLFsbTUvMGom/ff1Zm9RnRWJEvEDn&#xA;JtRV7eApnXA8MBTxBiJ5ZcR7/vRMnk/Rx6ipqduzJyZWIiAI4AqNnO5aq7VyIzH+ayOlj/PH4+Ky&#xA;68p6Rb2sk36Rt5nWNmSKNUqXUBuJ+L3P+e2GOUk8mMtNEC+IFQ13QtCsYIGsbpLyRmKzgBKAhEYE&#xA;U7fH/Dtksc5SO4pjnxQgBwyt6N+X8kj+UbEuxYqZkUsSaKk7qq79lUAD2zXagesu70RJxRtkOUuU&#xA;7FXYq+YLz/1uOw/4wN/3RZcVe/8A5h/8oB5m/wC2Vff9Qz4q8V/5wl/5QHXf+2qf+oaLFX0VirsV&#xA;dirwr/nMn/yUcP8A21bb/k1Nir0D8lP/ACUflD/tlWv/ACaGKs1xV2KvmD/nOP8A45XlH/jPe/8A&#xA;EIcVfRXlL/lFdG/5gbb/AJMriqa4q7FUq82/8orrP/MDc/8AJlsVTXFWMW+txaRoEtw0Et1NJqOo&#xA;RWtrbxvLJLKb24YKAiuQAqlmamwBOKrNIvNOtbibUr2O9uNYuwq3FwNPv+KRr9mCEND8MS9aftGr&#xA;Hc4qmv8AibTv9833/cPvv+qOKu/xNp3++b7/ALh99/1RxV3+JtO/3zff9w++/wCqOKoJ7p/Mk01j&#xA;bCa20q2dU1GaSOS3nkk4rKIIlkCSIOLqzyUBoaJvVkVROqx29tc+X44kWG3gu2VI0AVURLC5ACqN&#xA;gAB0GKvPIru4i87y+a47ZpNPmZhCrHgWBi9Mb0I96Zzh1gjmOWjwu9GlJxeHY4la+l8u3N3NcSaP&#xA;NFLKxeRUueK8jux48dqnfNjH2i4RVF1k/ZyMjd81Nbfy8xAXSbpiQSALomoHX9jJD2iJ/hLWfZrG&#xA;OqYaNonle/1AWFxY3dnO6louUxYNQciDspHw7jMnTdtHJPhrhLRn7Bx448XMe9kP/KtvLP8ALP8A&#xA;8jWzYfmpuF/J2LuZDp9haafZxWdpGIreEURBU9TUkk7kkmpOY8pEmy5kICIockRgZOxV2KvmC8/9&#xA;bjsP+MDf90WXFXv/AOYf/KAeZv8AtlX3/UM+KvFf+cJf+UB13/tqn/qGixV9FYq7FXYq8K/5zJ/8&#xA;lHD/ANtW2/5NTYq9A/JT/wAlH5Q/7ZVr/wAmhirNcVdir5g/5zj/AOOV5R/4z3v/ABCHFWfaTpNl&#xA;f2EEs8qif0beOrsg4IltHw+FyC3L7KgEUPXNnimYxFBkmV15T0MMi2+o2/wwxvK7lGUu7FW40oQo&#xA;pXepyUc8useqLbbyhozKnDUYFZmCt6npClVU7qrt0aq9TvTtvj48v5q2kmvWOmWNlKLOcyXYhl9W&#xA;RAqpwli2ClSequQwxyEygbGyXtOapixWy/6VH/bc1P8A7uGKsqxV2KuxV2KpVo3/AB0de/5jk/6g&#xA;bbFVnmBDJd6Kg6veSqK9KmwuhgIsJHNh1jL5g0yKC2GlzNJafCXEE7q1Cx2ZPgIDNUEZzcI6jHQE&#xA;Pp9/m76Zw5LJnzRJ1rzCWDHSJmccvia1uGJL0rWo9sn4mo5+H9h6sPDwfz/tCxtX8yG49dNMuEcJ&#xA;JGtLW4IUSkE0BXqCOv34DPU8ViHQjl3pENPVGXd17kV5dttUuvMNvdy2Mlpb2sZVjIkka04MihfV&#xA;+JiS1T+OXaLDkOYSlHhAFNWry4xiMRLiJLOc3rp3Yq7FXYq7FXzBef8Arcdh/wAYG/7osuKvf/zD&#xA;/wCUA8zf9sq+/wCoZ8VeK/8AOEv/ACgOu/8AbVP/AFDRYq+isVdirsVeV/8AOTfli78wfk9rEdnH&#xA;6t1pxi1FIwKkrbtWWnuIWc7fLFUu/wCcV/P+m+YvyysdGEyjWPLy/VLu2J+L0QxMEqjrwKUX/WU+&#xA;2KvZcVdir5H/AOcltai/MT81/LP5eaBJ9Zl0+Zra8kiNUW4u3T1gSKg/V4oeTH9n4h2OKvoTRPJO&#xA;i3+haVeSerHNNY2pl9NwFJECCtGDU2HbL4amcRQTaM/5V3oX+/Lj/g0/5oyf5ya27/lXehf78uP+&#xA;DT/mjH85NbQWu+R9EstB1S7T1ZZYbK5aISOCob0Wo1FC1p75GepnIUVtk+r6rHp1uGEbXF3MTHZW&#xA;SECSeWhIRa7AbVZjsoqTsMx0JPBYXlinl+G9eOS8fUrq4uDCCIxJc295OyJy+Iqhk4gnrStB0xVB&#xA;XXnLWmvr2KxtYfq9nK8JaWpYmNihNeaCrFTxUb5q8mumJERG0UWsk81ebo4Y5XsYQkvPh+7kLfuz&#xA;R6qJOQp7jInW5gATHn+hFtN5q83LEJWsIgjAFSYpRUEE1A51pRTidbmq+D71tdY+dtWGp21rqNqi&#xA;JcSJFREeNwZWCK3xs1RU74cWvkZiMo1abZBo3/HR17/mOT/qBts2qXaz/wAdHQf+Y5/+oG5xVNcV&#xA;dirsVdirsVdirsVdirsVfMF5/wCtx2H/ABgb/uiy4q9//MP/AJQDzN/2yr7/AKhnxV4r/wA4S/8A&#xA;KA67/wBtU/8AUNFir6KxV2KuxVxAYEEVB2IPQjFXzN5//wCcYfNGkeZX82/lHqX6NumZpG0r1Tbt&#xA;GzGrLby/YMbf76koB4kbBVCW3mP/AJzXto/Rl0eO6dTQzSRafyNNusUiIfuxVDajF/zmh5qU6XPF&#xA;+h7OccZ5onsrQBTsayxs84/2Brir078jf+cedJ/LhX1a/nXVPNVxH6cl2oIht0ahaO3DfEeR+1I1&#xA;CRtRd6qs90V/MVho1hYyaSryWlvFA7LcpxLRoFJFR02xVG/pHXv+rR/08x/0xV36R17/AKtH/TzH&#xA;/TFUDrsnmO+0TULKHSAJbq2mhjLXMYHKSMqK7eJxVMNK0qaKZ9Q1B1n1WdeDulfThjrX0IK0PCoB&#xA;ZiKudzQBVVVbrP8Ax0dC/wCY5/8AqBucVYxP5e80WmqXstlCs0NxcPcRyVioC7tIp4yEUdOZFc1G&#xA;TS5hMmNUTbGl5tvPxCD0KLGjRooNuAEem2zduIpg8LU+X2Lu4W3n1VKi3ADEFj/o1SQSwPXryPL5&#xA;4+FqfL7F3WQ+XvNF9rFnc6jGIkt5Y5WlLRn4Y5fW4hYyd2bbDj0uaWQSn0/tWmT6N/x0de/5jk/6&#xA;gbbNuya1ogaloIJ3N89B/wBGNziqbYq7FXYq7FXYq7FXYq7FXYq+YLz/ANbjsP8AjA3/AHRZcVe/&#xA;/mH/AMoB5m/7ZV9/1DPirxX/AJwl/wCUB13/ALap/wCoaLFX0VirsVdirsVdirsVdirsVdirsVdi&#xA;rsVdiqVaz/x0dC/5jn/6gbnFU1xV2KuxV2Ksei1SDTrrXJJFaWaXUY4rW1iAMs0psLYiOMEgVoCS&#xA;SQFALMQoJxVG6Xpc6ztqWpMsuqSqUAQkxW8RIPoQVANKgF3IBcipoAqqqmmKuxV2KuxV2KuxV2Ku&#xA;xV2KvlHztrdh5W/5zJ07W9ckFlpbRRf6XL8MYSfT3tFkLdkEpozdBQ4q9s/ND8xPI1n+XWvyy67Y&#xA;v9a066gtY4riKV5pZoWSNI1RiWLMw6fM7Yq89/5wqs7mL8uNXuJIykNxqr+g5FOYSCJWI8QG2r44&#xA;q+hMVdirsVdirsVdirsVdirsVdirsVdirsVQWqaa96LZ4p2tp7SX14ZQquORjeIhlbqOMrYqh/0d&#xA;r3/V4/6d4/64q79Ha9/1eP8Ap3j/AK4q79Ha9/1eP+neP+uKu/R2vf8AV4/6d4/64qs0jy3FY6je&#xA;anPO17qN6wLTyAKI0EccfCJF2QN6Klz1Y0qaKoCqcYq7FXYq7FXYq7FXYq7FXYq7FWEfmf8Ak75M&#xA;/Meyhh16GSO7taiz1K1YR3EQbcrVg6shp9llPtQ4q8xtf+cKfy5iuI5LjV9VuIVNXh526cwOxYRV&#xA;A+WKvddA0DR/L+j2ujaNapZ6bZJ6dtbpWir1O5qSSTUkmpO5xVMMVdirsVdirsVdirsVdirsVdir&#xA;EPNunefZdS+teXbmNY1t40to5ZjHHHMJH+sPJEI3ExkhZRFyNEda0IJxVjWp6R/zkE+iNHaatpZ1&#xA;eW2t42c1jgSWkrXTjjAZDUyIkZDCgXl1rVVMdIsvzvGt6Gur6jpTaIsXLXmtY2+sNP6bOVhLrw9P&#xA;1eKD4a8KknlTFVHy5pP502FhJFrOq2V4YLO+eKSBfUnmvW4G0B9VY09IVcsKr8VAKJsqrdpZ/nuf&#xA;QF3faSI5bgC7aJGEkVu9xCzGGqMjMlsJUCt1c8q0oMVSyTy//wA5Axa5qbWOs6eujXk+omEXUjTT&#xA;RJK8xsWgHocY/SSSMMhZhVPfFVHUNO/5yhm0qCC11Py/BfmEpdXQWSnqNOSHjBicVWGg3FOuxJ2V&#xA;Taex/Pp4LWODUNKhlOoyfXJnHMjTCsKxhFENDOD6rV+z023oqq46V+dD3F7cPfWMcxIkslid/QAV&#xA;/TEfpsm1beV2Jbl+9Vf2RQKqmoaT+cIt7C4tr+1uNUTToEuVMpgtk1AuzXj+ksDesjxuEg5U9MqG&#xA;ZW5HFUk8reXf+chtK1izXUNY0+/0Jls/0iJZJJLsNFbW0Vx6TvFxAeVJXO24J6MwKqq1jo//ADkV&#xA;ZWmm2x1bSrxo2nfULqYsZJSZ53jX+5AAMZgQcAvEB+vwkKsv8h6N54tI7q+836wL/UL3iP0fAiLa&#xA;WoieQD0WCo5MkbIX5dCO/XFWV4q7FXYq7FXYq7FUHrVze2uk3dzZReveQxM8EPFn5uBULxWjGvtk&#xA;oAEgFQwnQfOP5g3msWltqGh/V7KVws8/1W5TitOvJ2Kj6cyZ4sYBIO/vDIgPQsxGLsVdirsVdirs&#xA;VdirsVdirzvUrD88IWa20vU9Lu0YKDqF3GYCAqIaxwRpLxdpPUD8nZePDiFbkSqpyn/nIJzayovl&#xA;yJ4xJ9ZtwboxSErGI/iIL0U+oduP7O53GKov1vzzFmR6Hlxr3kQpBvBFSsXEkFuWymUn3CjxOKrt&#xA;Qk/PEXCDT4vLjQGKEuZzehhN6KeuBxJ+D1ufDvxpXfFVLWv+V8GeeLR/8OC2+rRCC4uBeCX6z6I9&#xA;ZuIZk4etXgCPs9a4qiXb85Vn1h4k0N4GZzocchueQAnRUE5UL8Jtg7mlT6h68dgql+iR/wDOQC23&#xA;1fWJvLrSGCU/XYFuvUE5jkMS8DxTishjBNPs12riqzj/AM5AR3XqQHQZbRQ0UcF08xlKCpjmleGO&#xA;JTN0D8OKdaKNsVXL/wBDBRS3PH/Dk8TyyyW5m+tBliLn0owI+A2TjWrNvX4qUoq1Zw/n6ut3Ms8+&#xA;hvo5va21swlEy2vJgQXRd6q1V/a+Fa/tKVVS7m/P39KBLa38umwijtXMrNdIZpHj43UdKyMqxyVZ&#xA;DQVHHf7S4qr1/Oyb1Yp00W3hMcZWazaYXHKsRmCeus0QNPVCFkYfZJHUFVABf+ciqzkt5cpPDII1&#xA;Buj9XmWJhEyfCOYaXiX5k7dPDFU00FvzqTULWPW10GTS1bhdywG6+tMgU/GCQsXJjT9insOyqTmH&#xA;/nIpY7IpNoLzCIrfrKZfT9RbourR8I1Y87f4GBpTtvviqYW7fnyXuGuE8tgpAws1jN5wknMsBBlr&#xA;V1URCcfCftFcVQ8Z/wCcgDHO1yvl9GktysUdqbgtHMI5aMGmHEkyGP7Xw0HQdcVek4q7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq//2Q==</xmpGImg:image>
+               </rdf:li>
+            </rdf:Alt>
+         </xmp:Thumbnails>
+         <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass>
+         <xmpMM:OriginalDocumentID>uuid:65E6390686CF11DBA6E2D887CEACB407</xmpMM:OriginalDocumentID>
+         <xmpMM:DocumentID>xmp.did:fdb0b3e7-ebe6-42ad-9401-6b5c4f2bed8f</xmpMM:DocumentID>
+         <xmpMM:InstanceID>uuid:bef19ad7-6bb5-8c40-a2a5-d1cb07525733</xmpMM:InstanceID>
+         <xmpMM:DerivedFrom rdf:parseType="Resource">
+            <stRef:instanceID>uuid:5d51a9ee-4ee6-0d45-9973-ccf39a66b75e</stRef:instanceID>
+            <stRef:documentID>xmp.did:a42c9618-22b3-44da-a9fc-2e873989bd6a</stRef:documentID>
+            <stRef:originalDocumentID>uuid:65E6390686CF11DBA6E2D887CEACB407</stRef:originalDocumentID>
+            <stRef:renditionClass>proof:pdf</stRef:renditionClass>
+         </xmpMM:DerivedFrom>
+         <xmpMM:History>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:a42c9618-22b3-44da-a9fc-2e873989bd6a</stEvt:instanceID>
+                  <stEvt:when>2021-02-03T16:22:17-05:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator 24.1 (Macintosh)</stEvt:softwareAgent>
+                  <stEvt:changed>/</stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:fdb0b3e7-ebe6-42ad-9401-6b5c4f2bed8f</stEvt:instanceID>
+                  <stEvt:when>2021-11-08T14:56:19-05:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator 26.0 (Macintosh)</stEvt:softwareAgent>
+                  <stEvt:changed>/</stEvt:changed>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpMM:History>
+         <xmpMM:Manifest>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <stMfs:linkForm>EmbedByReference</stMfs:linkForm>
+                  <stMfs:reference rdf:parseType="Resource">
+                     <stRef:filePath>/Users/dwayneliburd/Downloads/Dataverse-Diagram.png</stRef:filePath>
+                  </stMfs:reference>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpMM:Manifest>
+         <xmpMM:Ingredients>
+            <rdf:Bag>
+               <rdf:li rdf:parseType="Resource">
+                  <stRef:filePath>/Users/dwayneliburd/Downloads/Dataverse-Diagram.png</stRef:filePath>
+               </rdf:li>
+            </rdf:Bag>
+         </xmpMM:Ingredients>
+         <illustrator:StartupProfile>Web</illustrator:StartupProfile>
+         <illustrator:CreatorSubTool>AIRobin</illustrator:CreatorSubTool>
+         <illustrator:Type>Document</illustrator:Type>
+         <xmpTPg:NPages>1</xmpTPg:NPages>
+         <xmpTPg:HasVisibleTransparency>False</xmpTPg:HasVisibleTransparency>
+         <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
+         <xmpTPg:MaxPageSize rdf:parseType="Resource">
+            <stDim:w>1433.000000</stDim:w>
+            <stDim:h>1080.000000</stDim:h>
+            <stDim:unit>Pixels</stDim:unit>
+         </xmpTPg:MaxPageSize>
+         <xmpTPg:Fonts>
+            <rdf:Bag>
+               <rdf:li rdf:parseType="Resource">
+                  <stFnt:fontName>MyriadVariableConcept-Roman</stFnt:fontName>
+                  <stFnt:fontFamily>Myriad Variable Concept</stFnt:fontFamily>
+                  <stFnt:fontFace>Light Condensed</stFnt:fontFace>
+                  <stFnt:fontType>Open Type</stFnt:fontType>
+                  <stFnt:versionString>Version 1.025;hotconv 1.0.108;makeotfexe 2.5.65593</stFnt:versionString>
+                  <stFnt:composite>False</stFnt:composite>
+                  <stFnt:fontFileName>MyriadVariableConcept-Roman.otf</stFnt:fontFileName>
+               </rdf:li>
+            </rdf:Bag>
+         </xmpTPg:Fonts>
+         <xmpTPg:PlateNames>
+            <rdf:Seq>
+               <rdf:li>Cyan</rdf:li>
+               <rdf:li>Magenta</rdf:li>
+               <rdf:li>Yellow</rdf:li>
+               <rdf:li>Black</rdf:li>
+            </rdf:Seq>
+         </xmpTPg:PlateNames>
+         <xmpTPg:SwatchGroups>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Default Swatch Group</xmpG:groupName>
+                  <xmpG:groupType>0</xmpG:groupType>
+                  <xmpG:Colorants>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>White</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>Black</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Red</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Yellow</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Green</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Cyan</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Blue</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Magenta</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=193 G=39 B=45</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>193</xmpG:red>
+                           <xmpG:green>39</xmpG:green>
+                           <xmpG:blue>45</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=237 G=28 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>237</xmpG:red>
+                           <xmpG:green>28</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=241 G=90 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>241</xmpG:red>
+                           <xmpG:green>90</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=247 G=147 B=30</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>247</xmpG:red>
+                           <xmpG:green>147</xmpG:green>
+                           <xmpG:blue>30</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=251 G=176 B=59</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>251</xmpG:red>
+                           <xmpG:green>176</xmpG:green>
+                           <xmpG:blue>59</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=252 G=238 B=33</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>252</xmpG:red>
+                           <xmpG:green>238</xmpG:green>
+                           <xmpG:blue>33</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=217 G=224 B=33</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>217</xmpG:red>
+                           <xmpG:green>224</xmpG:green>
+                           <xmpG:blue>33</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=140 G=198 B=63</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>140</xmpG:red>
+                           <xmpG:green>198</xmpG:green>
+                           <xmpG:blue>63</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=57 G=181 B=74</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>57</xmpG:red>
+                           <xmpG:green>181</xmpG:green>
+                           <xmpG:blue>74</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=146 B=69</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>146</xmpG:green>
+                           <xmpG:blue>69</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=104 B=55</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>104</xmpG:green>
+                           <xmpG:blue>55</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=34 G=181 B=115</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>34</xmpG:red>
+                           <xmpG:green>181</xmpG:green>
+                           <xmpG:blue>115</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=169 B=157</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>169</xmpG:green>
+                           <xmpG:blue>157</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=41 G=171 B=226</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>41</xmpG:red>
+                           <xmpG:green>171</xmpG:green>
+                           <xmpG:blue>226</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=113 B=188</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>113</xmpG:green>
+                           <xmpG:blue>188</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=46 G=49 B=146</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>46</xmpG:red>
+                           <xmpG:green>49</xmpG:green>
+                           <xmpG:blue>146</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=27 G=20 B=100</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>27</xmpG:red>
+                           <xmpG:green>20</xmpG:green>
+                           <xmpG:blue>100</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=102 G=45 B=145</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>102</xmpG:red>
+                           <xmpG:green>45</xmpG:green>
+                           <xmpG:blue>145</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=147 G=39 B=143</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>147</xmpG:red>
+                           <xmpG:green>39</xmpG:green>
+                           <xmpG:blue>143</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=158 G=0 B=93</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>158</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>93</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=212 G=20 B=90</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>212</xmpG:red>
+                           <xmpG:green>20</xmpG:green>
+                           <xmpG:blue>90</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=237 G=30 B=121</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>237</xmpG:red>
+                           <xmpG:green>30</xmpG:green>
+                           <xmpG:blue>121</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=199 G=178 B=153</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>199</xmpG:red>
+                           <xmpG:green>178</xmpG:green>
+                           <xmpG:blue>153</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=153 G=134 B=117</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>153</xmpG:red>
+                           <xmpG:green>134</xmpG:green>
+                           <xmpG:blue>117</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=115 G=99 B=87</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>115</xmpG:red>
+                           <xmpG:green>99</xmpG:green>
+                           <xmpG:blue>87</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=83 G=71 B=65</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>83</xmpG:red>
+                           <xmpG:green>71</xmpG:green>
+                           <xmpG:blue>65</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=198 G=156 B=109</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>198</xmpG:red>
+                           <xmpG:green>156</xmpG:green>
+                           <xmpG:blue>109</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=166 G=124 B=82</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>166</xmpG:red>
+                           <xmpG:green>124</xmpG:green>
+                           <xmpG:blue>82</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=140 G=98 B=57</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>140</xmpG:red>
+                           <xmpG:green>98</xmpG:green>
+                           <xmpG:blue>57</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=117 G=76 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>117</xmpG:red>
+                           <xmpG:green>76</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=96 G=56 B=19</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>96</xmpG:red>
+                           <xmpG:green>56</xmpG:green>
+                           <xmpG:blue>19</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=66 G=33 B=11</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>66</xmpG:red>
+                           <xmpG:green>33</xmpG:green>
+                           <xmpG:blue>11</xmpG:blue>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </xmpG:Colorants>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Grays</xmpG:groupName>
+                  <xmpG:groupType>1</xmpG:groupType>
+                  <xmpG:Colorants>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=0 B=0</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=26 G=26 B=26</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>26</xmpG:red>
+                           <xmpG:green>26</xmpG:green>
+                           <xmpG:blue>26</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=51 G=51 B=51</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>51</xmpG:red>
+                           <xmpG:green>51</xmpG:green>
+                           <xmpG:blue>51</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=77 G=77 B=77</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>77</xmpG:red>
+                           <xmpG:green>77</xmpG:green>
+                           <xmpG:blue>77</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=102 G=102 B=102</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>102</xmpG:red>
+                           <xmpG:green>102</xmpG:green>
+                           <xmpG:blue>102</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=128 G=128 B=128</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>128</xmpG:red>
+                           <xmpG:green>128</xmpG:green>
+                           <xmpG:blue>128</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=153 G=153 B=153</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>153</xmpG:red>
+                           <xmpG:green>153</xmpG:green>
+                           <xmpG:blue>153</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=179 G=179 B=179</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>179</xmpG:red>
+                           <xmpG:green>179</xmpG:green>
+                           <xmpG:blue>179</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=204 G=204 B=204</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>204</xmpG:red>
+                           <xmpG:green>204</xmpG:green>
+                           <xmpG:blue>204</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=230 G=230 B=230</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>230</xmpG:red>
+                           <xmpG:green>230</xmpG:green>
+                           <xmpG:blue>230</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=242 G=242 B=242</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>242</xmpG:red>
+                           <xmpG:green>242</xmpG:green>
+                           <xmpG:blue>242</xmpG:blue>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </xmpG:Colorants>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Web Color Group</xmpG:groupName>
+                  <xmpG:groupType>1</xmpG:groupType>
+                  <xmpG:Colorants>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=63 G=169 B=245</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>63</xmpG:red>
+                           <xmpG:green>169</xmpG:green>
+                           <xmpG:blue>245</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=122 G=201 B=67</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>122</xmpG:red>
+                           <xmpG:green>201</xmpG:green>
+                           <xmpG:blue>67</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=147 B=30</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>147</xmpG:green>
+                           <xmpG:blue>30</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=29 B=37</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>29</xmpG:green>
+                           <xmpG:blue>37</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=123 B=172</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>123</xmpG:green>
+                           <xmpG:blue>172</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=189 G=204 B=212</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>189</xmpG:red>
+                           <xmpG:green>204</xmpG:green>
+                           <xmpG:blue>212</xmpG:blue>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </xmpG:Colorants>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpTPg:SwatchGroups>
+         <pdf:Producer>Adobe PDF library 16.03</pdf:Producer>
+         <pdfx:CreatorVersion>21.0.0</pdfx:CreatorVersion>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
endstream
endobj
3 0 obj
<</Count 1/Kids[5 0 R]/Type/Pages>>
endobj
5 0 obj
<</ArtBox[19.0 28.4863 1406.53 1055.42]/BleedBox[0.0 0.0 1433.0 1080.0]/Contents 28 0 R/CropBox[0.0 0.0 1433.0 1080.0]/LastModified(D:20211108150032-05'00')/MediaBox[0.0 0.0 1433.0 1080.0]/Parent 3 0 R/PieceInfo<</Illustrator 7 0 R>>/Resources<</ColorSpace<</CS0 29 0 R>>/ExtGState<</GS0 30 0 R>>/Font<</T1_0 22 0 R/T1_1 23 0 R/T1_2 24 0 R>>/ProcSet[/PDF/Text]/Properties<</MC0 26 0 R/MC1 25 0 R>>>>/Thumb 31 0 R/TrimBox[0.0 0.0 1433.0 1080.0]/Type/Page>>
endobj
28 0 obj
<</Filter/FlateDecode/Length 1750>>stream
+H‰ėWK‹7ž÷¯ĐŅsčŠôžzlĮ˜Č!k™Ä	fmˆmČ1=_UIũ˜Y{Įq	„Ũî)•TīO%õūÅÁėŸŦyüä`†ũáƚĶãäĪ|8Ŋö߀õˇÜOōvEž÷?¯‡ß°ĐâäL.;0ãí0:kŧî ^7dĀën`-ŖŸIžũ:_Ē#‡Ņlš9|;Dķ;ŒŧÁķĖŦŦ_áėâŊXîÚ`§°]úz9‰'åēŗFgŋĘURŨÖvåŊ~Í45š„+äz&/Ãđ˛üSqđÚĀĒr0DúëSœ|.ķīYc
SŠ%›lŨ(nŧp<Į…lŠŨ”¨ÜË
+E4p>›­Ņ§4EĘ+ÖRķҚėT"Đdi]Ķ•ÄČQQÎl7M6\VĒ…M,qĒ‘ü6=M×ÆĩÎēZŅÚŖ›‡#ØØ]’ŠiJ×éX×āūĀKhn>¸Hå,öŦŪ3Ā@ߙw‚NP9…Ėīl“ļƒÅNŠÁäŠũ`
˕‰4U)°…'
Hcĸ);\Ž`'›upF˛ąg"'‘\t8ú
ęŽDGĒ‚:ƒŸ_€ģDčœŅŊYX°R˜,gë”XrvĨ1`dvļą Ļø‰S5Kų<ųčg­}8ģŠc,zgąNiWVŪS˜'t'Úž"ë‘EaĮŸįŪ98‹­FA„zēMØĐJāāG9€Ĩ÷ĩ5ĄyĖąFäíĄŗ¸HYvk¤˜Ļ\Ãĸĩ3šE.hã$/ĐL4éëŅėßĖq1KŨGōØž5+3;ĨCöRũÖ1+šSļ\w]m8ģļ*Åyŋ)°š*vJŽ’ÍՖáyËmYnGŊZMŽw
+ŋ]ŧ¨Vĩe
+ŠbËĀ­Up˜¤¤NčâŠ$āÕNQ{ŪN‚ą6:
ØGDß
ܘ<õq“ãļŽšÚ¨™8
m<ÎģķĒi;šŨéôPmŪWo^ÔŽšyYģô¤!ƒm<īÕՇŗ_ãįĘRĒ–%…˛9
¯Š‰Īŧw´2…ÂÅ˛qPå­KØhf‹ū	2|â&“5o đĪL€‹láÄ1ōÂļMŲōë4PMFŽBoCŸōŽúz&ĄŠá’Ü7¨ę@”ā2uuKđĨp@ÅdīĪR]Ü-΄Ā2hˆ=ˇą67Ž‡°[‰Ęŗ$ļ N
+V(Ôi°JÜ
u™įëSd˛đŪ•‹<Âģĩųb%PžÁŲĖ”¸„°‹™›]Į¤čjIũ(šW×$ûđŲ÷iî˙]FiqJIŊ’))gÉĐB
ĢBÔĘJ‘ĪEBÉ.e˛"š4áúȲ
YĨlÅÕĢŧˆ’Œpfdۧ؇ļ^HÎ%Nוf¨KY‰6Čz }9>*Y	ˆgČ]܉ŗëČĸbgd	­ČR6é9ĪÅPYR/šŦP¨†,ģF–UdšYô7"‹˛Đvd%A–H\“ėƒŦ}ū§.Ķh’ÕL*˛”TduÉĐB]#+!Įx{FV)7.Øŧ‹¸‘f\isæqËē+Ļ%…!“§škķwfÜMd@|?ä	íCOŖ7ô>Č^׊Ų5÷"HՃ¨h–Õ,A^\+ųã.āãÎâãÎn?îūÛÛvĒŨhq5b9–p?/näc+ã#ĮĘ-áßŨ5ÚĢIîŦ¸r<Á„9žōĶø'šÆËáņqP—ĨûŖûĶ|=D?.âjPĐåq•Ã	čq?žžtk}ŪÉ0‘đD<
ĮCģ |‡Įę<e<i7"“2Ål+îD…]>Š
+YÎŋ¤´ŦÍģWĮgâĨS/›ŽNnãĮėˎ‘ŨÕēļÂnTŲ•*žqŗ¯Ži]GCģ"îÚüGj†đ¸Ühüētûūöĩ`?Ũ’\jÉ
šÜ`đɀ¯–ŠĶ€ˇTWŠué“!ÅĪ„„TđU™&‡īēãOWh­"}ĸë~h„*lüdē:7Čp~į$wRBˇÎߒåž:É6ípíīĘ|×RÖĮΜĢFKÕ¸R˛ŽAIaĨ$	ŧÎęũh…+wûã­ĩym}w|snį¯Ôdqz…„Ĩüč/ŸŦ¨?žŧÖ	ŧ*Ļž=œ˜jÁqƒĪ9ßëūEZ>Wrœ,ĖÆņõĨĮ—×Ú_ÛvøĻđ6ę#ĻxëûuSPhčΑJđŠŲËžų×ī2ķm˜Ļ‡°Õۇđãk_áŖ]Ģ´đZځĨĻ’_}XũšĪˇ˙Xv‘wģąjŠ–=ÃNœ˛Ē\”?=OŸĖ°q0ûįg?ÁHX
+03ážæ
endstream
endobj
31 0 obj
<</BitsPerComponent 8/ColorSpace 32 0 R/Filter[/ASCII85Decode/FlateDecode]/Height 79/Length 1068/Width 105>>stream
+8;Z]"4)X(4&;GHX<B>r0_QYOt6?!N&K`E2=Q&HQ!OF+KX44i./.8o6rXUnXNn8Ll1
++03`&B(uYI9,kdS5,0o'qNi^BFreZ>1rhA`!MiAKh<'_3eM)dr3&R@gTm$0GAEYTC
+%rZedlc/Op4Z)BL*ZFF80Oo=p/GBTgg?)f=#0tmNm\':#*f65(L`5N<SjeL7-rn64
+0JXtW7#L9gOYIbbUe3UEK@T&1,W+.eXY1L/A!1R?;'CR>D,F-ma_.Wpqs2G"'UUg)
+8j"<C(_X60q(`?uSPFjJQ-CUNKER)ZnjS2WV0nA+Od]'=26[^h'\U)FT/1es>Y4YE
+>3=&a?[L`>.)+]'>u[qBbjHTpX-&puIW<aPcT8XA0/6qCLI@0c>d"n8=/dT'Nrl3\
+(@KW%)iArD=$Pt!:(kLQ8>:o<HT7TZ7F&"Pa6]Vb/7DeAbSeo`&b9t(e0I!ha;q(N
+_a.2Jl$1#JmfIaSpVZO>LE/%HaSS'N]OimYMNCA(XU'/,/.$kb3.Xm?$3CD,a%8Fg
+=(GTXOr?SlKd*Z-k>ioX1e_qC,+`po+@^4NU.FjSj:mKA'?#3[a9&1t>#ArS7G_I)
+OrR;$(U4BFRY1?1CQ1%!ML86>!Z6hWS,;Bd/Q_7lT(?0!J^T,M<s\_CNu@)8.)8(-
+r3-lpj3MtFhN`\qr=bdtn.\mm4EI_][N!8jOnuUjd4AY)Y2\jtJfATK>R=fS4.Zp?
+..Y<4."[q9*5t-N>805j1)!+AnYSS3:GE.+I?s<3X!/oXBZ6X?0fV6T[ma-u#\qSY
+/5WERJqgtBe-%?rh/4/!"82Vq*_9Rkko9'S0RZ`@]\`I45?%`!<P&PtAhR2^O(sR'
+0Fdg:3s!l1A/lD/DM4lqW2.L^aflRYZ$[s"Ph=E[U1*fTH<GQ,r03/CQNL7Hj;k].
+"B:5AEub/m:c1uL<0%[t<TI[2M;S#i`j0AL$e+uSG'5Pua["`pOUY\.0N&RMJOtqN
+K<;auKWf*R]dM#'2R_\D2\P6gC5p[C\,Y_I3mFG&^AB[Ak)u!OWaaj1M>@&;nbZBe
+[XSAZWphHD~>
endstream
endobj
32 0 obj
[/Indexed/DeviceRGB 255 33 0 R]
endobj
33 0 obj
<</Filter[/ASCII85Decode/FlateDecode]/Length 428>>stream
+8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0
+b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup`
+E1r!/,*0[*9.aFIR2&b-C#s<Xl5FH@[<=!#6V)uDBXnIr.F>oRZ7Dl%MLY\.?d>Mn
+6%Q2oYfNRF$$+ON<+]RUJmC0I<jlL.oXisZ;SYU[/7#<&37rclQKqeJe#,UF7Rgb1
+VNWFKf>nDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j<etJICj7e7nPMb=O6S7UOH<
+PO7r\I.Hu&e0d&E<.')fERr/l+*W,)q^D*ai5<uuLX.7g/>$XKrcYp0n+Xl_nU*O(
+l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~>
endstream
endobj
26 0 obj
<</Intent 34 0 R/Name(Layer 2)/Type/OCG/Usage 35 0 R>>
endobj
25 0 obj
<</Intent 36 0 R/Name(Original)/Type/OCG/Usage 37 0 R>>
endobj
36 0 obj
[/View/Design]
endobj
37 0 obj
<</CreatorInfo<</Creator(Adobe Illustrator 26.0)/Subtype/Artwork>>>>
endobj
34 0 obj
[/View/Design]
endobj
35 0 obj
<</CreatorInfo<</Creator(Adobe Illustrator 26.0)/Subtype/Artwork>>>>
endobj
22 0 obj
<</BaseFont/RCZMRJ+MyriadVariableConcept-Roman/Encoding 38 0 R/FirstChar 1/FontDescriptor 39 0 R/LastChar 141/Subtype/Type1/Type/Font/Widths[605 569 284 736 236 415 343 564 551 471 580 513 207 513 396 481 555 292 549 327 559 666 212 234 331 482 834 501 555 448 493 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 569 0 469 0 0 0 0 0 0 0 0 0 0 0 284]>>
endobj
23 0 obj
<</BaseFont/RCZMRJ+MyriadVariableConcept-Roman/Encoding 40 0 R/FirstChar 23/FontDescriptor 41 0 R/LastChar 31/Subtype/Type1/Type/Font/Widths[202 586 274 367 451 528 275 577 595]>>
endobj
24 0 obj
<</BaseFont/RCZMRJ+MyriadVariableConcept-Roman/Encoding 42 0 R/FirstChar 16/FontDescriptor 43 0 R/LastChar 31/Subtype/Type1/Type/Font/Widths[536 536 526 207 417 508 683 437 572 256 351 449 516 257 564 588]>>
endobj
42 0 obj
<</BaseEncoding/WinAnsiEncoding/Differences[16/gid00018/gid00019/gid00004/gid00001/gid00082/gid00064/gid00037/gid00011/gid00077/gid00072/gid00083/gid00066/gid00068/gid00075/gid00078/gid00036]/Type/Encoding>>
endobj
43 0 obj
<</Ascent 921/CapHeight 674/CharSet(/gid00018/gid00019/gid00004/gid00001/gid00082/gid00064/gid00037/gid00011/gid00077/gid00072/gid00083/gid00066/gid00068/gid00075/gid00078/gid00036)/Descent -250/Flags 32/FontBBox[-134 -250 970 921]/FontFamily(Myriad Variable Concept)/FontFile3 44 0 R/FontName/RCZMRJ+MyriadVariableConcept-Roman/FontStretch/Normal/FontWeight 300/ItalicAngle 0/StemV 44/Type/FontDescriptor/XHeight 480>>
endobj
44 0 obj
<</Filter/FlateDecode/Length 3051/Subtype/Type1C>>stream
+H‰|ViXSgūndŗF@$ČÎłĻ(B´XQÁAĒ"‰$CTėā”V° ´VĒ#Uf´H+Œ¸ÔÁēŠÅœĸ‚ĸĸĸU‰l§īÅĖ<íü˜?š÷~ËYŪ÷=į„cF"ÆqܛQŗâ"ĸÂ<"2ĩjš"VŽßååŦԔDešnRTj˛<E8æ¨÷āôžbIŋ}˙–že}“Œõąú¸1w͏Z1+Xb#ŲfĮ\Ų[Ė‡°™l[Ȗ09SŗÕ,“m䂹ˆ$ĩÂÛÛÛGfxŧ~zûž>¯Ÿ˛É¯Ÿ~†õ)ū†ķ†}ÃˇŋáœlŠáŧŸái°ī?Õđ4|Oņã}&ķ“øÉđÉĪT¤.Wō‹2ĶuĘät~^JbĒ6-U+×)īđ35^ĢNRéŌy­2]Š]+,žFˆW§ķJĩNĨÔōrl&Šq_ĢTđ:­\ĄL–kWņŠÂÎo>WüWŧ:…‡->&E-|-Ōa1—§(ŧ`%uØKb깝V­LĮkÎĸčĖ4%/ãĘŦ|dÁÆĐGą<.A¤­qĐxŦÉSĶf™#įŧá:Š0ĒW\¯ĪŨl¤Ī}9;iŌģEī"éŸŅģ͸ˇË¤F˙6㯗Iz…ī­ĻÃëũņũ5Ã+ŊÂn—I˛ū_á}ø´~ĢŠ9‰lĨĄÄļŲ[g!}åL´CcmB$zNt¸Ŋ˜DSA´×û$ąĩįxb*ã|ÃMîÎŅvÜT~ŖĸĄå=ųĻÄd3ˆųD–[]Ļ#Ļę+!åäKėƒúbÚ÷ŗ퉭\ĐEtlM
ą¸ĪTDŠŒč`ž¨úAŅí]åD7N!€ÆÖÎÄÜŦJˆö&…IÛĄįÄøÕŨÄŧk¯sšX@, ĮہXôXsņ—]Œ…s3\ˆČ=ƒ¨ĖĄ‡čh'~žw%Ų]#ŌbãÛG	đ–aKTV! až6˜ØåkâLī„HˆY>EîÕÂsÂåJĀōÄ<hŖ­Ė˜(Ķŋ„†ôŽ'qĖn^ąãûʅc•<ŽŨuĶÍ^…đ/ãM~â\%ąˆĀ/ˆÜŌŋõ¸Û°uh|´p+˜Ģzo•Ų2ÁnrQ˜	ĀĨŋíĶũĪ‰GYŋ?ąÛå,r<Ģ"“Œ­Į›*˙ûWKŒ°•dę}˙ī§YÆæÄ.íw3'îĢwÁ؛刍+ΕŦÃûUąŠ…ŽDO;3ˆMģŸĐŗķۈ͖šIlqŊJ}+´2÷´˜čĒ‹7ąI^ÍDû’lÁÎÂ
+3ĸī×CT6ÚlĸŽdÄĖ¯sž[U8ũb
†Á°äË
+bĩxķ°
$€ž8—čšBCĖz}TaĢ‚ÛXĩ€ąÅĄxĸ;ĢuĖX„1‡čĮxŠŅ–$HŠúF)ŅwsB!…Ä,C€t~!\L<Œ;܁áįÕũŧ´6Û ĸĮĒáHq>™ã‰“R{ĸö1ED÷.ģûsQuWa˛éq$QŊ1r˛Ē˛›ØčhĒu†ũ{Åĝ	š`CÔWŠ¸-ai°Jxû™ž˜į{HúPx
ĒfåĨ4˜JÁĄåéPXb+ŦYžjzëCDH÷˙ˇĘʅÔ!á
+'
RˇÔãęOl˛ĩ`‘DĖĢĸÜÄz!-.Äe<đ¨÷FÜŌč}ÚmJ~ôŗj_Ā‘W@tú"Ų$uÃ~Õi”Ŧ_ā>–õ,?Ęz×č,\ôāĶž
Ÿ4 ÎéÃ#zé!šaęΘA\OŽä;ā)§u€’ü š—€›ã`ŗw%ēLÛbt€į>¨Įļ(ôöP¤yéghŠŽÛb§ũ8”cŗyíaãĄŒE)@ūÃHM€gčz–JļŦ
+xÎŲŒÖ"Š,…ËžÖ"bŌ\4!ŋp;0bÜ# 
+ŊcånvĘ"tb1ąYĨ.HŽœ6čŋ5
ÛK>€‰Œŗy`G›ŽqĀ#2v1ŅŠeĀlęü
¤=ĨØ =G­~ŨŒEûšŅ(Ž|3$pT`ëNRŸPŒŊVH­Îš~֋!}{ĸeŒø1æ߸édG¤‚Á	ÛŗfņAOTėNWŪ@´Jčf—ŨÆÄ•ÜĒų(í—.x#hŪŊ‚ŲyQo \¤ĢO%ŽrOq’déĢ™įcšēĀŌ`k
+˙Ü.„ąĩÚ?r@AÔ|($0ū—ŲA†BÁA"ÕF@`׎‹eŖƒ!ØĻ€íxô&$9(Čžx6â͉@	…ļĄpš>ƒöôm7ōq°tA†Ģ•Ū‚>č‡RŨaˇ?CaĄhę"ˆ†íü3đėēé‰Į<Ģ\¨lęÜ$0,BĮb+ĐĪŲ†ˇy´-Q`#ēŌ{rÆŅzī4âœ3j!KsNLŒkCđæĀ„†ÆckÁŸû^p.ž…ūåz¸ßžąÅĄg°YĶ!6;ÄM?Ö
Įãn‘.4ô(Jj0ėę)ō'ô”}M(9ŋũ9ä„fS†^ÔXüoČ0XŦî?ƒîû•P>ķÆeÄĸ´D'ÆÕO-H‚C`ÔX‰ũpĻÚ]˜~
žß6ÛwúĸœË4dį
$Øô#Htxwølųxī˜Ÿƒ™)ô‰sĶ@+­Â4FĘū<ēÎíĨČ^ڐ‹ô<Šœũ‘4ÔīĐįvÆlø äéŪ\māŧS¨'GĄ´xe8@E˞ėDŲ}Ž#QŒž€<Ž˙–KÃčėLôx‡Ņ–āŠÆÄŖŅLš&R{Ėję…ŠĄ{a=¨év4(÷oāŖįsä=iFBšĐ舊>†Œ˙‰7“G!(ôŦ6¤1ˆ™Å–î¯kzč…đĶ3Ĩ7(ŒƒĪô(¸†ûÖXtÅįPÔ}āļZ$ĶŌj×8ÕâGäũÉmXߜ‚)Ī^GÜvŊŦ]ƒd^tŖwŨ{
Ŗˇ6ƒˇ—7ÁÛOÍÕ°\nÁsJ…<f ī$ļĘ`yÉô<ÐķßTCvƒÕĨĨ´M˜>N˛`m†^žIŊh†;’4›øBĖi&Æ_
ē#Ė˜+'âȇ¨į+9Öđ}°ėT#™-Gņ–"ƒœTØū•É˛
i*ŒâøaęÜÜ2uuG%Å íEĘbûe¤2EĘ´&ZL¤‘6ŗ‰}i•%]ĄZVZSJėÅH-#5ÍadíCFŦĸ.nŋĮžôew÷y.į9Īųŋœ#9JĶiø)@Öæ‡]&Š”‰â$}"ˇŌ;āĢ{X¸á˛ĄUķņ›:4ŽÍDḒļ
ŖĐüá')á%š#X7¯§{4™ĐîQŅ¯ËĢ rĪĻĸƈÚÕAáœ
Ā(i…‚žbđ°Îœ.\rû+ŅjˇrvbUļôƒņ×P°?3‚×÷ÁČQæŦwõđ:Ė, ž,ķsĪ›qøÁūt€?O âlTȝyˇ.|
(RÆ"EģsŊ´;˛û†ĻŠrA˛^ĨŠ<Š%ÕĀœ`zŨ*avšé?ø}pI7bXŨ?ŦjĖÆsĒ&4mōęŊ˜Ú•IÜû:3Žzd?|-—Ē7!˜ä-âØĶēKCĪËæõa¸ŒŠ7čåRĨ'Ė"ķˆ‹
+Ũš0OæöŸ|šæ=[ūN	'ķių7A/ƒAđíw‘ž§´ŨŠÄÉÃĨßĮ)ķ-4ƒu'QŸ=Ÿ[Uô
+TsˇIjTr*ûĩ_fČ>äÆĄƒ.Ô:ļˆ!ūJ%ÚDV;Ĩ­šĨÔ]ÕdYšŠ[Ŋ\äV4BsĖQîÂI2ķ–PÉŦõą1H˜Ÿqāh€æcajÚsÎulxSõŽÎŠ)r¤˜jOhžc2žĄ÷
++č6
đÚ㤒ųb.‰5×(ž…Šų×p^C¸dCcB3Ģ-~s‚G‘÷8›ZTE^‘ļ2NUåļ˛|ąR‘k:mŪJŒGY8Ĩ„7-­Į˛>ŖÄÉíŽ2]\ŗ.^nškŒĩjå¤)—Ėņ˙˛ķlMŖU§˙+ĀsĮäK
endstream
endobj
40 0 obj
<</BaseEncoding/WinAnsiEncoding/Differences[23/gid00001/gid00077/gid00072/gid00083/gid00066/gid00068/gid00075/gid00078/gid00036]/Type/Encoding>>
endobj
41 0 obj
<</Ascent 921/CapHeight 674/CharSet(/gid00001/gid00077/gid00072/gid00083/gid00066/gid00068/gid00075/gid00078/gid00036)/Descent -250/Flags 32/FontBBox[-134 -250 970 921]/FontFamily(Myriad Variable Concept)/FontFile3 45 0 R/FontName/RCZMRJ+MyriadVariableConcept-Roman/FontStretch/Normal/FontWeight 300/ItalicAngle 0/StemV 44/Type/FontDescriptor/XHeight 480>>
endobj
45 0 obj
<</Filter/FlateDecode/Length 1731/Subtype/Type1C>>stream
+H‰|TkX“į~žNrŌ(
˜|LjD"‚Ĩ(ÕõÄÁĸĩ\h0	D!	IĒdRlÅV*†"Š­‡j7iEÚRëŦõ°Úk8QÁY;™ļ¯9jŅI4ČŊ'Āūj~äũŪĶķÜĪ}ßĪ+TB‚ LÍY°bqNfÔbģÅ Ņæiøŋ°DˇĀd\­3ÛĸsLĨŖûX¨3\p>íĢp)]ĩG{8ü{BåWƒČ‡#‘ŌSFGɔF‚§ (2hcų7:Ι36ƏŽIŗFĮÄÄą1ilöØ86Ÿ•(Æ%'Į‹Ņb|ll‚˜Ļ5ęÄ\ģÕĻ+ĩŠÆÕ&‹ŲdŅØtڙbZI‰h1ÛŦĸEgÕYÖšGk
VQg°ë,ĸ†7‹|ßĸĶŠ6‹FĢ+ÕX֊&÷Î/Ļú_I%Œ"Į_6Üŗ\/ZEQÃQL#YV›^3Ú,ufĖšKíf˜$juzb>ˇx’ˇ›´Z.Dį%{ÆUIkĨG<ŠdĪ:Ģk¤ÎęGŲCÕO˛eƒĩNĩ•:¸Ãc°OæJuíđ8R tĪ‡ļËGÖ]ųŽĶ#+ƒî]WŸŦÔųĩÂũ=rÚš]îúîIŸ$īÜĨ\˟Ē/ü	‚Ō,ßÛJæ‚üėg@ãzymIWBÃõ īˇÚ@Áį[ASrø+ĸģ9”Øs4ŠJtvæ§*Ôž÷eĒ;p?„°ļ69h[Ā> õÛlĐķGŗ€FĪL 9ŗøÛ,:ŽonŲ˙ÜMĢã@C—Ŗd€ķū&Ђ+m@…TÉč$!ūœdę*†Ø;´¯˙8ëcVb¸åöm.Mō?ęJ^4	u€ĸ=žôN>hüä'HĘ^^ŽPŧuˆķū¸¤$ūŪ“atļķ†€K17@DRØü3“ĶQŧoĒįƒ]û{ųÜÅ- uŌl ûÕm Ø¨æ!žų{^|Š	vĀŠĖ9¨f\&ihIĢ$9û.0‚]]ŨĀ)'ßīl=(MūW`ÎĨ9pĸr€U¸\6÷1ëiu@ā͜üûÃeĖũz!cĸú{4 ¸¸‡œ8˛á]Px÷ĘÉ'¯
MØߧ†/p-ÖÆ?1ƒOŪNūįūģwķ0Oû;™ėUC€+MĀĪy.dļôŦ<]
:ļė:¨t+Į4§Û_Õ8Ö0ÂĩĩĀÍím\יŖíbV€**+¸Ž‡å_}{X–ŪĀāŅîĀ‡ˆ“|^ĀZMÅû/č•îéœ${ÂÜ15fíŽ%síŲ—4}2ģSyŒEvÖ?¯œ­<Éw&ˇzƒĘŧîy€|ĮąÄˇR˜ĘĢ=Tž‘üũDgËôcûė
åējŧõ€ųÎ@ĪÛ¤=‘4ř@{#rÆîœÛĢ—­Ŧ怌eô›˜šū D.=éW)ņ?Ņ	ánÛiĐŲ‹lÃæNĪķģųëL[ëŽŦ
+S‚ėJ_āœâhÃầĻ ČûžMÕRöXWq¨úā:ûŌÎļ2‘á7•1–ƒílô´ÆFĐsŗËbM<hgK}x›•˙O9ÃŌ?xŸU˜ž¸6Āģē8ØŖ`ˇAu—Ü6Ė<}S_έ9ŧ4oZāZ˙ŒÂÜĻX†Ī…ą ÅŠŦMßĐ
’Îy†Q{væ~ÉĨÎ_T´˙6e)( `G2æątųŒ'ķ™Ŧ)§dîÛuī¯ÆŖ#-ödoIæŋaÚÚÖ`/ļŽöׁ†Ã
<õgOk°SėT|pķ¨vĩT5_
+Ē<ÆŗäülPËüDíøŽ›ŦqĶ\ä[	ŦYîdŽz°#ËÂ,ė_ČBu07Ÿ]f_}qu
đŅqnŲļ?°õŒúÜĮlĀ¯#€´îd>
+sAšo˙”^Ã.9^	ĘlØĖĶēpîPInĘ*HžÂ ­Ę F_Ī/ŌßvpŋÅvü†;2s
]ūbđé2#hé-~"ˇ„ŗõv^`Fžã¯Œ,¨<…hęæW&_ÄûåŦÜ)'Hõâ6ļ°zŖ/ŨÉö+3˙Ē^ĘŊq‘E÷ˇ˛k>ũf§IØŧšÍ¯æß”ŅķyŨ_ņE÷šqÚī@w
+uLÚļŌŧˑ|šŽÍ<ūMnENĩßF‡*Ŋᅄ—Ē‰[su&‡Ãąß!séĒâCī+ŪsČ7:œåŽÁ™#ëžŧ~ŨáĨÚW¸Ō×ĢÆ×G9õ•Ū*Ed’Öä3:¨ļšãįųŽ˙ŋ°Ęâ
endstream
endobj
38 0 obj
<</BaseEncoding/WinAnsiEncoding/Differences[1/gid00007/gid00079/gid00009/gid00086/gid00075/gid00011/gid00016/gid00067/gid00084/gid00088/gid00036/gid00017/gid00015/gid00021/gid00082/gid00085/gid00077/gid00069/gid00078/gid00081/gid00070/gid00037/gid00001/gid00072/gid00083/gid00064/gid00076/gid00068/gid00071/gid00066/gid00052 127/gid00065 129/gid00074 141/gid00010]/Type/Encoding>>
endobj
39 0 obj
<</Ascent 921/CapHeight 674/CharSet(/gid00007/gid00079/gid00009/gid00086/gid00075/gid00011/gid00016/gid00067/gid00084/gid00088/gid00036/gid00017/gid00015/gid00021/gid00082/gid00085/gid00077/gid00069/gid00078/gid00081/gid00070/gid00037/gid00001/gid00072/gid00083/gid00064/gid00076/gid00068/gi\
d00071/gid00066/gid00052/gid00065/gid00074/gid00010)/Descent -250/Flags 32/FontBBox[-134 -250 970 921]/FontFamily(Myriad Variable Concept)/FontFile3 46 0 R/FontName/RCZMRJ+MyriadVariableConcept-Roman/FontStretch/Normal/FontWeight 300/ItalicAngle 0/StemV 44/Type/FontDescriptor/XHeight 480>>
endobj
46 0 obj
<</Filter/FlateDecode/Length 6979/Subtype/Type1C>>stream
+H‰|UyxĖį>3I&D¤	†ˆ%CėĩLŲšË%¸Ō†2d&ƒpĩ–7–¤öŌÄzQrĩÖzlˆ[ÕNx„ĸąGŗĪ{ß?Īs˙ēķĮ|ßī[ÎyĪ9īy?¸jEŖŅÄôŒíũy˙évkŧųīņü“h陜4Ö2ÉŅ.&ŲŸ¤kXÚMSđĢČ(+oįVæņY™—ĪĢ†MĶjI3Z’ęâ#õĨ‰´–@	•ŌGɉĢL–é2GĘ2Y+›d‡ė‘Cr\ÎÉš%å™ŧ‘2z¨ŽņŅ\ÖÜo5ųū8‡Ēßꤎwū8ĒŖē¤Ū餎!ĮŽę~ ē¨Ū7Š÷CLꨎĢį‚TŋÁĒõ|°QĩĢž3~Z˙d§Ŗz_Åü	Ÿj'X=¤ŽwVī}ō¯Ū4CCM†v“ŅØÉĐÜ<Æb<=ÅaąĨú$MļOJļĮ;,æö†‰‰ģu|‚#Å`ˇ¤XėS•ÅU5XSĢ#Áb7Ässŧ•÷íŗÁa7[lņö‰†deį>ĮũWk’ļC“ŦĘ×`SņIæ´’üÁËØä)IģՒŌžCÔā!Ķ'Y!ŗeœI˙l"

+]†jWš<tī–í–§Û¯ģW­muGd&5žyŠéę5Øëūgûŧgø„ÔōĒ}Cīĸ¯Ž_SwRŊ‡õÍ~É
o|Đ?Ü˙$ÄÖŅuąkiZŲĀĘ´Ēē’ŒR}ExÉ
+ˇ’§ēŠđŠn;âô%Ęwår÷ëŖ*r?Ŧ”(ģOuļŌczeūátérw/ČīWĐÆNkX¸Ņo&äķ–:ā^ā$Hķī2;Wƒ -V
…˜†M€tqņ‡4ĖĢ|æâ:ˆĩđm5`÷€,^z{|)đīŅ[€?ĮÍrŠĶ/—_ū\ۓ1†žr;܆ôŅßN_û$2¨)DBķ ._GúB&Ėˆ†tnĶŌ:1|;
•Sėļ”ļsōq1í&°ŗ^°´ĩ?p2ų
?õwŸ;č/*ĸŸ=¸xšŗĻë˛é~ĐîÆ~‹*oÍvö:üžŸčĪž
Ž/ļ´\ėd6Ŋégļ
?^bˆs¯EAĸ›ƒDøN…Ôc~¤ķŧŊ°mķCüŦ
+5C|ĖoĸŠÚæDÎ2WTƒ$Äm×Ášy‰ C;ë]>ģ€3‰!ŧŸšŌ˙û$†÷0†ųíBˇmŌ]ŗģļ^_;SŨk/íŊŌ×ĩ-Û˛Ō˛<Šņôđ ôģ/"‚7ô{)_€'q<s*ÁĢ
¤ÖĄŽĐ†ž/ÕĶoũš47ˆ[W•ũëØųâE´ņįnĀāH&KwĢÚMæōQęAHĀũũĀŗž¯š7ĢcŒÕQĮÄŽFŖ6BÚ;<iÖâlLūė]ÎP6Z×@ã›jĸˇËIíŠÃĪ+L’ļ ‡kçŌTdŖVīŒ%d~0CMXC>t!ØŅ
85-!i~rŲl˜ŗXÖÜœ7U˛Rs™áÍ9¯Y¤LOŽígŠZ˙|ŌmÃyŨa8QWM'j|qpâĖĶˇœ–JĸŧÕél_ÖŌî‡4=ĒŪŊčE*%ƒÆŨX”ÎŊKīf“Ķ—gđ*RčŅ,uvâšũ’|ĖZúxäį
Ë!ËĪ#1Î}
ŖđjŅķíĀëĻÔo!įģ,VĀ…Tģ{õ¨˙BvEEsŪŒąEš)Įš‘;ÚŗX‰ôŠŲ6Č?šČîđķ2@NŒn	íÔNäInörZģ8z=˜5ŅHúnøčb;ĪĘwsī
éš°;÷ÛCēÆäEÖaš{
l@ˇ‡ē;!c_[€sŅã ŗôėšŊ!™_Nu‚tĘbįÄ_…ôžYÉPVō‘]u^ЌčZHūx@ķ(˗]vÁ
gÃąOŨ mšŒ .+đDCđņiK^ė&ųŊĒŠXÂfėqĪr=,ž_ũt­A"āŒĸ&5ˇ°'.e’ŋ>ßUŪZŠĀo ~¨‰]˙ˇ?fķx–ŅüÁ+“ĩŖŸ0ŒÃ2;5Gröz)zúļ+uĻ˜ôČ÷x	”tb&.šl­Olã}įS,ģŽŪäÎ#˛///°#C•öŪŸCxo
+"|nģo€ę€WI”¨›ŽŌP7.¤š€÷a_ŌzŸBÅúŠ˙+ŒJHāxw܃ŅŽŧD0^Ë(ÎÉĀ1g÷ãúz
æ[]ˌ˛X}U,Ų6×Ŗ,V[ßIŒĪŗ,ˇŦ+|ĸ=ÛĪaëÍ`ĢŠ8y‘ĖÉĸ‚ŖÜrīO.uļÆd6÷üõJņŠeĘAĀ6ô.ôØÁ‹GûĻēCVzoĨčt3+:zœ‡ŌĩĀÆrÆž †Ũö¸„tôĪ%Ģ§ū˛dCP:ö×BēŌxĘéĶđ‰,dĀ>vāFŋ%T&N¤Å˛u-‰úŊņāE^Đs[&a3Õģ(ė2QhkG@žZĖ*ĪĖ`‡žČ¨EÕí8ۍ™¸l#Įzŧ_:VO6•Y	úȡåÔÄg#ĶĒø%‘/ŖÉ:ŲÉŌiV4ÚɔÁYĐmĖBÆÕbü9[5Ki’Ō_ŽĨ6`ÛE°J™{Šu,â†O!Ū\ĄØFgCbã™ŋŦĸc)Ļé
eŨIÉvėûV?0ē ßRŋ§Ū•fü–´suG;ãö̀Āį:…M”Ė&_åPN”F5Žū‘zåä¤íĶsģĸ&AîpēéÂ6’pæ3ãī6RŒ+đ¯Ø֋í”Āž}un%+ƒoöjEi0DũĻ–2ĢgHƄŪ„¨ŗD6y2[áū
ČČēO™šnԟ)¨_gP€kfīäģ ŨJa,žÁįSã9“lg'Ŗ8Ó¯×ÎöWĻm¸Ŋš{KĻĒMŒíßüįŗ1îUožw•éiäē2ĢH™GėC.ņM:ĀĢŖą|$ōšx=į×éMÄģסĄ2ū—æ2Ë9ÛãøyYKZŦ-RŠ'ˌ=ŠŦQâb0ļÜk$;#[¤Ą,—nČÖØnöŨX$ëP^BÜŦe))]ĸŒD}į}ų§×Ķī9Īīœķũ~ļ¯ß}rî­¨ÂP
^}qöI b0~ĸ†eŅ”{Ģ[āXûšāāCTŊ•=iåŲ‘Žæ:ˆ˛÷˙Y—~F”.ũĄdŪžˇŌ÷=åh*=oė[ĩŧôÆ1/aZÂÉzbō	Õ7ë?u¨¨*ū3žÉĶąaæRæû~o0?	mĄē2L‚'Ÿ*Á˜ĪÕÊJIė^­‹ö)bŖÃĄķ=šķëuˆũlDžĮŦ†t@ũä|Ũšėm
!î./BÖŅėŽŦËÍYÁk,`ˆ]ø<9ī)úeÆ=+ŧ„1M31@Ë"ŧß>ŨB:fMFsÉĘh›*jЎ1rž˛ÛŋPTԐ÷b:?]Úū[05ˆīWSʲę@Îĸ™ĩāîsléC ĖzXČ?ŽžÆq–úi]ŠgyąÍ,e˛%ŗc~G>qpåTÜJdũ bpx°]RgĶē‹™õā§āËBKĐۆˇyũŪĩ@´žĨV<°œ<Ģ

‘ˆ4Æ‚AãGĩķåRQGJnhtjĢEbko§}Eœž9N/…:[LÅΉE@Ônîų(šžT7pö\k¤<šÛn`×pzĻ?Û4ŋF›>KžîyÎi-âršDŖŸ-}†ËŸģOŲ¸áR]ĸɧ5ÂEYŨ!@8MŸßßDĄ\=BbC%÷eŸšp­yĨxÍļķĨ"Ëlnˆ¸-ņba“ž$3Z‰üÛÉ[Ԃ×M°ų•›ŅŨ
ŧ<Ė撨ĮQjĒBkŽâõ*lT˜]%W”č„{&Zēá
(„Įf ĩ!b–HК‹"ÃÂŽ}×	<söŲP´]€WĘCú¸wŖ¨}áoLÂJ}ŽxlÔōI…ÛWCŊF™áČ
Ë'é>ô‚ŒjĒá/läęuô6ņ¸¨ú9WŖ^)üÖ-°Ē6„Î@u!QŦžą9m<@AŸÔ™-’ãKŊŗCWßkuā܏Ú°|î(”d­E“]JŽŗ•aeŪv{QGŠļîfģ;ž÷‹Å°vūhp:ĨË[$eŖoÆ ŨW×Ļ‹ĄYÜĖ}V/æûû.ƒąžČx;SĮ]ļ†ōŨ#ļÖyØą*áĀJ{sũ@aĢŊ§ņ…UuaLđ"}˛$íI$Ø'oIōeŲđ4Þ\šQ{nAĐ7ļÔė¯¸žäå>Ōš´Š´#Zšh"ļ,952Zŋ›LGî~õÔaŖYLũpbƒĶWU~čĖŨTĶĘz†Øū#@Ēa†ū'mŌŊ˜ųbvjũÍō¨x–ÄäŠų4h‹Ĩ;ä.[Ŋ$Z43ļ¤SąÁˇ­ĀGŅ@°Ö&K6ŗ{Äļß…€ûš0’íH–ž‡aĒ,’›×ƒhĶ†˛bv<Ž‰%Õ/ĮęU*? \­AqšŒâ7ˇ˜jԐ „ëiP{ZĶĨw­}ĩNTŨu¤ŊÜôņz€ŠHŌ	DōÜ;•“ąŸķĻpĮīAßí?(Žu:[Sg‚ėˆy(^ŪūÆ"įöÄÂ5L˄ęåbšĀÜUžõžĖī{ú–ČvV	Alļž(epR
+´6Ĩ-‰īéŋ¤_oEzŪKĄĩ)(‘åZØ+…ķūAįōŠČ[]~O­ÛÜ>ŠÁĘŨRkĶÎ.ʔ™ėu^Ē&†FSG°ŋå\<Īl,ėˇŠ=^ˆĖĒęųųÔų;oæQĢËFzaŪŒ’Y NNwĻû9‡YzXŒl‹Ķ|œˆMâMALÎŋDaēģ!0„‰ÎŊöœ[M
+<âԞ´ĒũīN6u'6
‚uėīøMhMYžßŌ[ã˜ßŗoY>ũuËō,ŸūĻ?ÉtŲ zRö_ŗZĀUļ,Œô^ėÅ˙™Ôú!Šk<6ģƒ;×ķôâ(}ö°Č&ŒpéûˆPŨĮ…u5üŦŋCtâÔ%ÎčjIIÜģc‡ęŗŒY,æ€o9~ļvÍJZWŸÖ)
_é[y˜vĀRVyęH€ĖŦ:ĨOĮŸīSU)ЖĖ銤%ƒĸW‡ī(ÃĀΚ "aˇÅm¤,ČÜUŗnkÅÖb°ˇš,†7Ļ4Ö	mXˇ‘gÛHWâ—9>xöaŒĄ˙.DcĨ‰D“T¨žBæcæ*p8¯9^7BԚžđšvĖ‚?雅~°ÕķÛ
+øXoY>…nzõ‰‹æ>‡[ž‰í4Ļ|ÔŖV´ûĀūŨ"û[ēKíöŌ‘ûĨä'{ÜhøQōŽgv˜¨Ņ-CDXäD’Fl†ø%7íË
`öĪģYūÅ´­'š`9‘ĀeĻ?U7
Ēž) ĸÚ{‚Ŗ1y<Åy—ƒŦęvƒDU~Ä;evUæ„ĨT.š"8@'
:ũ},&Ģ}ĒKCáYūš}˜†\ņAÒ5ķŌÍBQʖ;ņ$W˙’ŠyōeĐ•Ņ\C+×4&ŽņĨƒîËËŗLęĀĢhÃË( uÜĖV÷d/Æg؜Ųé[ÂûĸGœSą	™:•‡îzžžbîhY36ķCëjDqUũļŌē‰ė@Je„ãĖÜŌqˆd|7‘_ᴚÃÖĒĪ
+ŠĐúmrĩđ‡cĶō€ëäd§˙p
{˜)‹—˛>Q_æv…¸>%—ļ‘ģov?‚ĸ7ĘÖŠ2M1+÷/ūœ:Ÿûe?Ëî~QÉŊֈ‡v¯EŋR^oķCāŽ8ō•öF†	ÕbQåmŪŽ1Šũ/ˆaŸ^ĀšÚôeęģ¤Â:Š[)ŧWļ}:ĩģ÷ōŖx”LšO˛įNOķL*ØŗBÛqúMĘûY—ôŨŨ>,úķÚ=œĻô$ՖJ=‰äB׃č¨~ÍNueë
ب-îĸĻÁ#ÕÉMˆ7ÛĀœjˆķ˙øļi¨Ŋˇ{ČËĄf;VˆŖ/EĖz&°Éûg$Ęw›b!ÜŪ4i°ą!:úŸĀ1
kŽrĖ	<{gá4š‘ĨąäIŸŅW¨Īĸ%.!môt5sø$2-tūí1›øčÜåĶ­!ß,F~Ô÷Ÿ˛0ķš´<ŸpĘZ’^.!ÃˇmĖÛŲgËĒ!ôn3	ÖaôŠôåŌgpIbĨ”t{{Rƒä¸™NR’vj™’‚ŠåŸļ3Ûāę<0?FxĒŨ‘W7ŧ°š=IpÍ,R9ōŠõđpXļi D@›Â(pßûâzF1ÅÕúN¤Į”^fF$ŨȸŠ:e^j	“Q„_rķ\5•ûÆläīķ&ĸâ÷ÅŲ›°_>ƒāZœÄø˙+bļÃú uĖŧĸ7|įĖryĻķ‡˛ņeëįļ
åŅËn&šĶ}pJģÄq]
+ņ;ëĻ$
BŋrxũģiÄĨŽ	ŋ—;tžnU
+ØKĻ§ˇŽk—įSGÄŦũ›írŠęēãø]Š oPQkeÄčQJE­ļˆn° bhBbHŒ1TŅąe‰
+ęnŒĘJņ5‰ˆ!Ĩ‹&<BÔ Šo3áMQöôséLgō:{Ŋįžķ=ßß÷!Ė"\
+øpf'=7æoCBĒmŅĶĶRĨÍĒĩŧö:4;w	ãæ˙[d0…{*nû¨Or‹SV{Č-yĮ’›BÉÍÃb"ōˆ NŖ´ãy?Ģų×U1S/k'vđWYĸ^Ą'´ÎČâ.k랃ī0_qˇ‚Rķ¤ŌÜĖķ˜æ´čšC^´Ų@Čô3˛Ãã7p´Ö Ë2,ĪR„ęČ!Ņđ ‡|ã6K3¤yéꚐŅđĢča=°Į<€ųˇžāāo9Ņ‰â§‡/öƒōWĒč”|jŌȤŌ
ķFöæÉ6úPĶX”éčŗ]"x™âÜqITŲƞ8ûųĖl|Ģp=‹ô”†˛ĶE’d*)Ãúiõ(j
¨nŋĩ—į%{aģĨŠĒ+‹O‹ū/gLBĶܗ2*“eÜÎŅ˛‡üLK#)îbûYļ6ķ‡Éû~>÷ųô#01Iiī%œ‰OČŦŊĮ,8Øu—c3W\¯g˜Ž71úÆ%§€ũû;<š9Ė‡¯¤ū@0)fˆ˙˛•KīƒvNãļQ$HũAÜäÉûƒJPēąãį´ėæ&"ĐļŲšÃŪ5㠊ƒŦļæ2jÚ6ž`ëS­!‘ŊĖSfãQžFî[“xūīörR{ČYĨĮYŸAaĶ
+Ŗ\8]¨<cžæŌŽĐŦĖŖë Ŗą9‰Qą-Ü –B†ˆ:le^:KØõ8
Ņ|â,¸GpĪ¸ĖÂ;'yĄj~˜zháņ•ĩ,\ā‹?Ú\áČAÆäß	hęÕ8ēĪēĸ[…ĩ™é™Ã’@l7%
â{āßŅŽ_´3GĒ˙AüqCāpif~ÖDäv)žß>a7“[ķ0žuÃAųĶˆ÷Y™|Kí"‘^dŪFį†	˙lŅ~BY|ˑ	9ģëå_
+la˙ؔD9—)I+„Ęíˇ‰¤‘ßÍKâōŌ˛ô
- ˛*$b
`4f—;3cũ&pėĄi
+Wāųũ|ÛôŸj)ĸQÎBĩÔ]FY•ÜŧUÖ?ų—e'-mÄz3iÉā֗a2ÛãáDŦ3šļ’$}ü–”ĩ-Vˆ„5ˇ„HääJä
+ī ŠLĩg?k×Qæf^âŌ/ĄöŖUG€k—Ž€<˙ƒ|˙˜1÷RWŅØŨpQîô;])DQfyÚŧP(ëÜfį‹fLø…@îņZŸ,
ĸFÅ.2
Ōė tŲžļŽīOß
ŦŽ—	dSĩ€8åvį—Ų/ųŸöĄĨĖ(K%ȝé˜-ųÁ‚Ą<6ÁÔ+ų]2Ēū(Ąlr%ŦėYÉâ~3ļŨ[	sēj‚Ļ•‹9\ãd~ė*§|´ysëm@y$ëVsPíđmTÔÖ#ƒž0eÁQfׅ
+Õá&&oĢ'ũˆNĻø+Ļį÷DæÉ\ØŨ÷1¤'[öŖ™Åį&wßųŧC´á7IŽ“°7“:†šäŧ-¸FØ9œ3qi ‡ôŽĨâšļ‘đēqhŅ
]œ3×ōÎČéwôŖ-ļšehũąÃ+áZ œH¸­ņčâk+¯Ņ%÷‡#Ö9ŌVwT<•hÜEā¤ĘîīNŨ™E™Ž?{m$Ä(cÜŽĘ[eâY“Ü’‹9es*=ą_
B[EGX)¯{Nc¯šg FđË\@TŽœ×Ÿe!ĢHø	šMDĖ:qŠ‹lHg–ōä˙™øˆŪp]ĩv= ^Íßí
qŊ(<Š;y—wÆã{ęĀ…ĐĸxI_ė0*?õÅ9Ĩ‚ŒÕŽb++˜FÅM?|āßz÷î!ãĨ;Cj	ÚRPuŅr3>Ck
+˜Œš’¨˛Á
+žÍÚ¨‡üx§zylˆyž…Ø[t˜@éŋ˜šodģ˛ˇČÎ8}éŨ†{ÛH	ÛXŠ
cûe<ŸË]Į6JÛ+ĖÆXoī'[^˜‡Ø=JŌ_ZĄbvhj]\Ėüã8Ķ
|jÖ]*„Ļ4L(sõÉü†4/Ÿ|ũT5ŪwHf]ŊĀZ}”4xÎr~’ŪÆļUãŠũjŽŊŽÚ¸œÆ-S—K
3øŖ}<“t|Ãúę€ūį&úĢčJĻæ@#4_‡Á…lÎ6¨o0ŲØ˛@Ō°€Y5ŅŅŊ
`š-ûzį
j‘ ø˛›XĐé
˛ģd'†Č腟”ä‰ģA%Ė¨Ķrg$`Ī%ÆՈGĩ~-9Ęĩjæm&ėn_1pū‹)Ā*fĶ$åõģ‚〔×ģ—ÔēøĢ"	¨ūZ(_ˆ’ĸˇŗDQŧ~…nųHĨÎŖDˆ19Fōδ*õAīQ/”’ōlĄT4¤3ąûĸyôîZöŽč>ž
—:eûé\žƒäëģũĘI=Ļ¤_ŗSãÄ{ŧ(b
įČH	ąË;|;%bĄæ°P6Ņ_%Ā/=NË/īÍĻŦŦ‡ŅéAĩĀyâ8“îŨOJ?mdĮA5ôēž<ŸyÜEˆtZ’×H°Œ*Õđ\¤Q˜Ä…hĩ˙Gp% ô7ö›tęWįÄčBtjg­ŸŲN÷‰Îâų*úƒŧ™ŅYnŌõ%ëžNü}8ŋßĐYŠ
ąŅļV™ļ6ęUų“r­ÕG-÷EÛüô—Zģėmak§^2ĮmĪôQj?ëtËéÎ˙`āeũč
endstream
endobj
30 0 obj
<</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>>
endobj
29 0 obj
[/ICCBased 47 0 R]
endobj
47 0 obj
<</Filter/FlateDecode/Length 2574/N 3>>stream
+H‰œ–yTSwĮoɞ•°Ãc
[€°5la‘QI
BHØADED„Ē•2ÖmtFOE.Žc­Ö}ęŌõ0ęč8´׎8GNgĻĶīī÷9÷wīīŨßŊ÷ķ 'ĨĒĩÕ0Ö ĪJŒÅb¤	
+ 2y­.-;!ā’ÆK°ZÜ	ü‹ž^iŊ"LĘĀ0đ˙‰-×é
@8(”ĩrœ;qŽĒ7čLöœyĨ•&†Qëņqļ4ąjžŊį|æ9ÚÄ
+Vŗ)gBŖ0ņiœWו8#Š8wÕŠ•õ8_ÅŲĨʨQãüÜĢQĘj
@é&ģA)/ĮŲgē>'K‚ķČtÕ;\ú”
ĶĨ$ÕēFŊZUnĀÜå˜(4TŒ%)ëĢ”ƒ0C&¯”阤ZŖ“i
˜ŋķœ8ĻÚbx‘ƒEĄÁÁBŅ;…ú¯›ŋPĻŪÎĶ“ĖšžAüom?įW=
+€x¯ÍúˇļŌ-Œ¯Āōæ[›Ëû0ņžžøÎ}øĻy)7tažžõõõ>jĨÜĮTĐ7úŸŋ@īŧĪĮtܛō`qĘ2™ąĘ€™ę&¯ŽĒ6ęąZLŽÄ„?â_øķyxg)˔zĨČçL­UáíÖ*ÔuĩSk˙SeØO4?׸¸c¯
¯Ø°.ōōˇåŌR´
߁Ūô-•’2đ5ßáŪüÜĪ	ú÷Sá>ĶŖV­š‹“då`rŖžn~ĪôY &ā
+`œ;ÂA4ˆÉ 䀰ČA9Đ=¨- t°lÃ`;ģÁ~pŒƒÁ	đGp|	Ž[`Lƒ‡`<¯ "AˆYA+äųCb(Š‡RĄ,¨*T2B-Đ
+¨ꇆĄĐnč÷ĐQčtē}MA ī —0ĶalģÁž°ŽSāx	Ŧ‚kā&¸^ÁŖđ>ø0|>_ƒ'á‡đ,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r9‹\A&‘GČ”ˆrQĸáhš‹ĘŅ´íE‡Ņ]čaô4zBgĐ×Á–āE#H	‹*B=Ą‹0HØIøˆp†p0MxJ$ųD
1„˜D, V›‰ŊÄ­ÄÄãÄKÄģÄY‰dEō"EŌI2’ÔEÚBÚGúŒt™4MzNĻ‘Čūär!YKî ’÷?%_&ß#ŋĸ°(Ž”0J:EAi¤ôQÆ(Į()Ķ”WT6U@ æP+¨íÔ!ę~ęęmęæDĨeŌÔ´å´!ÚīhŸĶĻh/čē']B/ĸéëčŌĶŋĸ?a0nŒhF!ÃĀXĮØÍ8Åøšņ܌kæc&5S˜ĩ™˜6ģlö˜Iaē2c˜K™MĖAæ!æEæ#…僰dŦVÖë(ëk–Íe‹Øél
ģ—Ŋ‡}Ž}ŸCâ¸qâ9
+N'įÎ)Î].ÂuæJ¸rî
+î÷wšGä	xR^¯‡÷[ŪoƜchžgŪ`>bū‰ų$áģņĨü*~˙ ˙:˙Ĩ…EŒ…ŌbÅ~‹ËĪ,m,Ŗ-•–Ũ–,¯Yž´ÂŦâ­*­6X[ŨąF­=­3­ë­ˇYŸą~dÃŗ	ˇ‘ÛtÛ´šiÛzÚfŲ6Û~`{ÁvÖÎŪ.ŅNgˇÅî”Ũ#{ž}´}…ũ€ũ§ö¸‘j‡
‡ĪūŠ™c1X6„Æfm“Ž;'_9	œr:œ8ŨqĻ:‹ËœœO:Ī¸8¸¤š´¸ėušéJqģ–ģnv=ëúĖMā–īļĘmÜížĀR 4	ö
+nģ3ÜŖÜkÜGŨ¯z=Ä•[=žô„=ƒ<Ë=G</zÁ^Á^j¯­^—ŧ	ŪĄŪZīQīBē0FX'Ü+œōáû¤útøŒû<öuņ-ôŨā{Ö÷ĩ__•ß˜ß-G”,ę}įīé/÷ņŋĀHh8đm W 2p[āŸƒ¸AiAĢ‚Nũ#8$Xŧ?øAˆKHIČ{!7Ä<q†¸Wüy(!46´-ôãĐaÁa†°ƒa†W†ī	ŋŋ@°@š`lÁŨ§YψÉH,˛$ōũČÉ(Į(YÔhÔ7ŅÎŅŠčŅ÷b<b*böÅ<Žõ‹ÕĮ~ûL&Y&9‡Ä%ÆuĮMÄsâsã‡ãŋNpJP%ėM˜IJlN<žDHJIڐtCj'•KwKg’C’—%ŸNĄ§d§§|“ę™ĒO=–§%§mLģŊĐuĄváx:H—ĻoLŋ“!ȨÉøC&13#s$ķ/YĸŦ–ŦŗŲÜėâė=ŲOsbsúrnåēįsOæ1ķŠōvį=ˏËīĪŸ\äģhŲĸķÖę‚#…¤Âŧ…ŗ‹ãoZ<]TÔUt}‰`IÒsK­—V-ũ¤˜Y,+>TB(É/ŲSōƒ,]6*›-•–žW:#—Č7Ë*ĸŠĘeŋō^YDYŲ}U„jŖęAyTų`ų#ĩD=Ŧūļ"Šb{ÅŗĘôĘ+ŦĘ¯: !kJ4GĩmĨötĩ}uCõ%—ŽK7YVŗŠfFŸĸßYÕ.Š=bāá?SŒîÆ•ÆŠēČē‘ēįõyõ‡Ø
چžkī5%4ũĻm–7Ÿlqlio™ZŗlG+ÔZÚz˛Íš­ŗmzyâō]íÔöĘö?uøuôw|ŋ"ÅąNģÎåwW&ŽÜÛeÖĨīēą*|ÕöÕčjõę‰5
kļŦyŨ­čūĸĮ¯g°į‡^yīkEk‡Öū¸ŽlŨD_pßļõÄõÚõ×7DmØÕĪîoęŋģ1mãá
l {āûMśÎ
nßLŨlÜ<9”úO¤
[ū˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dŌž@žŽŸŸ‹Ÿú i ØĄGĄļĸ&ĸ–ŖŖvŖæ¤V¤ĮĨ8ĨŠĻĻ‹Ļũ§n§ā¨R¨ÄŠ7ŠŠĒĒĢĢuĢéŦ\ŦĐ­D­¸Ž-ŽĄ¯¯‹°°u°ęą`ąÖ˛K˛Âŗ8ŗŽ´%´œĩĩŠļ
ļyļđˇhˇā¸Y¸ŅšJšÂē;ēĩģ.ģ§ŧ!ŧ›ŊŊž
+ž„ž˙ŋzŋõĀpĀėÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅČÆFÆÃĮAĮŋČ=ČŧÉ:ÉšĘ8ʡË6ËļĖ5ĖĩÍ5ÍĩÎ6ÎļĪ7Ī¸Đ9ĐēŅ<ŅžŌ?ŌÁĶDĶÆÔIÔËÕNÕŅÖUÖØ×\×āØdØčŲlŲņÚvÚûۀÜ܊ŨŨ–ŪŪĸß)߯ā6āŊáDáĖâSâÛãcãëäsäüå„æ
æ–įįŠč2čŧéFéĐę[ęåëpëûė†ííœî(î´ī@īĖđXđåņrņ˙ōŒķķ§ô4ôÂõPõŪömöû÷Šøø¨ų8ųĮúWúįûwüü˜ũ)ũēūKūÜ˙m˙˙÷„ķû
endstream
endobj
7 0 obj
<</LastModified(D:20211108150032-05'00')/Private 16 0 R>>
endobj
16 0 obj
<</AIMetaData 17 0 R/AIPrivateData1 18 0 R/AIPrivateData2 19 0 R/AIPrivateData3 20 0 R/ContainerVersion 12/CreatorVersion 26/NumBlock 3/RoundtripStreamType 2/RoundtripVersion 24>>
endobj
17 0 obj
<</Length 1477>>stream
+%!PS-Adobe-3.0 
%%Creator: Adobe Illustrator(R) 24.0
%%AI8_CreatorVersion: 26.0.1
%%For: (Dwayne Liburd) ()
%%Title: (DVN Schematic Diagram.ai)
%%CreationDate: 11/8/21 3:00 PM
%%Canvassize: 16383
%%BoundingBox: 276 -1052 2854 -24
%%HiResBoundingBox: 276 -1051.513671875 2853.64147949219 -24.576171875
%%DocumentProcessColors: Cyan Magenta Yellow Black
%AI5_FileFormat 14.0
%AI12_BuildNumber: 731
%AI3_ColorUsage: Color
%AI7_ImageSettings: 0
%%RGBProcessColor: 0 0 0 ([Registration])
%AI3_Cropmarks: 257 -1080 1690 0
%AI3_TemplateBox: 960.5 -540.5 960.5 -540.5
%AI3_TileBox: 595.5 -828 1329.5 -252
%AI3_DocumentPreview: None
%AI5_ArtSize: 14400 14400
%AI5_RulerUnits: 6
%AI24_LargeCanvasScale: 1
%AI9_ColorModel: 1
%AI5_ArtFlags: 0 0 0 1 0 0 1 0 0
%AI5_TargetResolution: 800
%AI5_NumLayers: 2
%AI17_Begin_Content_if_version_gt:24 4
%AI10_OpenToVie: 164.046056140012 246.906872150668 0.597223425638451 0 8187.04446024539 8139.16141411204 1378 967 18 0 0 125 104 0 0 0 1 1 0 1 1 0 1
%AI17_Alternate_Content
%AI9_OpenToView: 164.046056140012 246.906872150668 0.597223425638451 1378 967 18 0 0 125 104 0 0 0 1 1 0 1 1 0 1
%AI17_End_Versioned_Content
%AI5_OpenViewLayers: 27
%AI17_Begin_Content_if_version_gt:24 4
%AI17_Alternate_Content
%AI17_End_Versioned_Content
%%PageOrigin:560 -840
%AI7_GridSettings: 72 8 72 8 1 0 0.800000011920929 0.800000011920929 0.800000011920929 0.899999976158142 0.899999976158142 0.899999976158142
%AI9_Flatten: 1
%AI12_CMSettings: 00.MS
%%EndComments

endstream
endobj
18 0 obj
<</Length 65536>>stream
+%AI24_ZStandard_Data(ĩ/ũXdĢž †G
-°Öl’6d˛öĮˆuŅ‡ąø8į8|ŅČAÖZU˛rJɕŊš3‡C/™ū”žÜėė€9ōoæÍĪ„ISsj2ęvx˜tß÷ģëgfʐ÷4„ĻR]ŽŦĒj>™4ƒĮ1jŦĘ@Ā‘ ûÂĄĀÉģ"<<ƒč‹Áė[ĐHõHˇ˙ÖÛukʕ5ŨÁSĮn<ä|Ö^‹!šĸ,‰˜WžąąéĘ´ĸÖ¤ynČ°.Œã8.¸¸.VœÂt$I?æHôŲQļ5đ
ëņDMtPkΨڑH4ÎüŒ[¨ų~Ųxąđš„Íy(|<qāX0ŽÆ‰q=¨î0z
ŽÉ^q,(	‹:Ēu‹ĄS,ÔØ„÷ƍÉf/ÜđāsĖqšĒō'[vĻ2°qËŖ6–`dMCa;¨ŒãŠ<2-žč“fU†`5?EJO&v
+‘jĻgf‡ÔË´ŪXæUiƈĮŌ*ŊËãˇŸß-4!MeņîʐëY’ĩæĒ¯io-ėųōåVÉž•=Ō!Ũ~͸&Ŗ1™M”F‰VŒ…-h1‹Æ¨8E1<‰Æ-îhāŒ¤úX|Ąx1Ėtu–¨ëVÅÂCÄã8YĪFÎëwüŋx㓠„%œøBĸŠRœbTyü‰ՂAˆGŦĸūģâW™El|Õ!ÖgÚ*CĘ΃.ģŗš§ōH4†ŽŖČc(Žô´cƒŖU•å8QF]0Ž#cБLÂRDLZWo^<ëŧšīydöm0Í|E˛÷h[	ohķô¯ŽŊōĖ]Ë˙įcš*ņ¯™BĻŒÄ"E„ˆ§*CÄtSŠuą"m[jbr.ÍOé‘*1ˇ!cëģËŠ–­jæŪ=Ãēsö”vƒxËa™ƒ‡âXŒÃîø‚q؝q,ô˜yFĸaW(‹Zą`ÃfÔŠŖŽqØj?đjŲ¨ŦãīX8–‘X0)q ŗĸYĀãz4Ę´†d]ÔqeDķ8~$>;¨q$Н#á…<GÂEBōņ}œÕŅ…ãP¤Í‘8¨čšqŠËKēšÆ‘ČŠ1(A_Ta­Ō‘!ĖĖˆESŸŅĮ’ŌœŽwŠ)_šļ7hUŽ…ÄQļĐcŅCQÅæåų¨Ŗ„…-Fq%
,`§+“gēķyäšį\ŌąĐ1g4'cĄƎZŠėüŪŅŖ#ãĮá}EáØ(lĮ‘`,Ž˛ãŒG>ÁøÁ˜ŌagĖc‘h÷Ŗq”1Ÿ`4Į^ĢYXh,‰i,4ŠÄéP‚æ`(ž¸‰ņ¤c!ÉPÜB"káƒa…yĩp¤š†5la‰ã–FF‹ß‘ÖéAĮcq$~,0Eâč:ęcĄxâq§0<|V4ÕHāa;žÕ¯m,Ō
+"&LČ`îĘ_ķ2„ĻŒkĒ#§=ëæ*mô[NÖ5,žú2¤\†”;]Ú>åaQrˇ‘/¯îe˜î;-‹Æt˙‹ˇ2¤†îIĩ´Ŗ“˛Ŧü¯Š*~lvė”!ļwæĒæĘŦđ~5ļš$œ)|"Ų/sp ą8Æô(;įŠƒ1TŒ—ęŒĮo´NáãŠÆ˜WS*;į„bÁhô8ŽK3ŽrĸĮBÁP0Šn-'$ŧÆÁ(#‘8°Øŗ::ÆąĐP(§°‰ÄŅŠWĮ"‘—F‰cŸÆ1Ž‘‡īŒlˇPŖu5‰FÖætĮ
ŽAá`Ã'ü2yŧį3…%Čp5‹ãˇh8ƊzÆ0rđh‰D^ĸm$ŧŒ'ZZŌžņ:€‘!&
ˆ¯Ē؈IgJæš]æ°2G9šörË5T5eŽ›‹UģrPÁá""áĄÁPôōãeŠ$¯Ę‚ô™#*CŠfGX-K× U9ÛĶŗĮŽWZ/ūĒĖŗüU֔ÂŖ2ÄeČkŽô;KĖĖ›:D48eH22_2ģŠB%Dōs†äô•Z†dŪ arÆÖNW”yĩģ÷ĒĐČŪ2Ä<Žŗ}\č–9((lįŌ$sÄä
+Ń:f)$8he’˜!Ō98Ā8đH4O\hcŅ8ŧpQCŅX(
+…"qő¨°ÂŠS˜ÂHAĶx"pâ*A‰&Ž.0žø"‘ĮÛ^ũ,RņĖŖ˛’˛\$

Ģa†?ĐöŲlŽ†â—wF×…),aˇfed´(E-ĮĢŖą8‰'uÁ`,‰'ÆP‰'ŪâfáhŒcĄ8Ī}ĮBƒĄH<ąq ]hegôą˜Ŗ‡Õ\#/TUYYšŒ••õzŠR”‚1ļPĩZY™Ĩ%ŒF¯Ž;;Ÿ/ˇ8Æxáj—N(ŧX8jh*pąPËÃLE2˛1ī‘Š'žxã…‰\T*Ž…‚Aš`
ÆąĀ |čĻGMŅqÜÜā 1ƒŅ VŠæ3fŠ™ŠÄ‚Asô :Î>ą8ŗh4ÚŖT˜8Œ2į_Ā.4ĩĀh0Šq”hQ§S‰ē[¨ZhŖ
j0ZZ˜)%Ž
bЂ\†‚‘¨ģ‹YtaF#ŅH¸ájĐ4CÁ FÍ-Ø.œZ­…UÕ°Ų+ē(c
+
ĮB‡JDEFG&¤¤S‚´ 5hĻZTUVW.Ŧ#ë•(E-ŠQZ¨ąY™Ų™
-í–0…-Œa
[°š]Ũ/ī—8Å-Žq[¸c\“ËæŗNß	+ŧ0Ã
/x°HXhxhDL<&Pd`p˛IYiyéÄ<2Ÿ‰Tä"Ųȅœ÷ôēũîãķâŠ/ÎxãŸD”¨„%.á&2ņD"ĄH,ŒD#ą8FQ)JaŠSXŠT\‘P(CŅP,(fŅ-ja‹ËÅÆĸąXXL1Œq3q$ãŒCÁX0Œc16¨Q
k\Ã
ldãcē@ˇāL,(Œ…Æ,ĻTv^āâĀæŠE•1ŸP0Ž!?lÁŦh(ŒcJe×8ΘO(ŽŖąĐ˜´@egĖ…/O(ŒÆÂq€cÆÂbAą XH,$ž¸ā…[¸[ ….,4ƒŅX47ŪČ6°q
kPŖFƒą`(g$fãVÆ0ŒÅbĄX$šĀ.na‹:ē˜Å‚ĸĄ`(Š„âŠT âĻ(EŖXH4ŒÄ"ĄH(‰Ä™ĀÄ%,Q‰&&ąđÆWüĪûw{ũ Ī˛‘ŒTd"Ÿ˜ÎKKĘæä2p
+<&"
	‹ƒfxa…N8>›ÉõøX8Æ-nq‰ûáųėęęzÖ0†-,a	KC;3+Ģ5ŠQŠRÔ+ËeU‡‚Ļ…2Ū´v‘V*ĒŠ…cA	J	JP>‘đŦ¨mEĸŲ÷h×ײŌAĨ…Y˜iƒ1Å(ŽÄ$Fņ9NN΍s‡ÍÕT§8‰S"&“ŒŽ†m´ŅƒÁčĸŠ…ĸ‰Dß'Ž{=+ę´ą0ĮÂ4†1
Æ,F1Eâčš9Ί:Į
ŽŃÄ:Ž
+‚¤ä ā‚‡	‡† RA…‡‡	xPˇ¸†88€B„‡	
+ō

+
+0`øH„‡ 0˜ąh¨ā
HDC„>PA¨ĐđĀ AÁđĀ A
 `!Ąa	40FāP
B"$BÁ"*@@(¨Ą
ˆ‰Đp‡ˆ
+.ÁÁA‚†ECƒ„*P0
$@p¨Á 	(xĀÁ
€P "4H…ˆ80	¨‘Ą€P 
ĸä2ˆPT`ĀC"*T`@€A	xp¸ 	80€ĀqÁƒC…‡	<@@āÁƒ <0Áxāāh€
ƈ4\đĐp	ŦD*Hh`8ȗ”"āK$0@pˆĀáāŪƒ0\Đ0!ž%".h¨đāāĀ
 d
"†	2 āĀ"H`p¨Á€ƒ&8höˆh¨ĀĐq
+$˜ ‚ÃŒ%2ACˆ…%u9Ѐ	*᥹
+8pĀ¤‚"@@xhTÄ(Tā
ŽQã
"‚
‚ƒ4<@\á B&dÁpÁCpp@`¨ÁAÃ"<āā
"Ã(PhP
"‚,`D X€ƒc
h4„ƒ#Â… >P!ĸ
ƒ
+xh€
Â!ĸ
<A‚,pp@DdĐ`ˆ°@&hˆā0‡<aBƒƒP`ˆđĐāāh€pЈ@"á 
Pp €ƒ	
,hP
bBƒ	\đā
!Á‚
+ 8\!aƒ%hpđ@ˆ(4d 

2€@aB„
,ˆ
‘Á
&ČāÁa…$`p|€ƒ
+pĐH8° !Bˆ‡â "0DTpPá8D˜"4D4D88(Hđ@„†	
8ø0D0`ā Bƒ	xĀÁ„C
\đā !ĸĄ 8hhˆ¸ !‚ƒˆ†.`ˆƒ#ƒ2p



áāxpppphhhpp4@``pP‚	LČB„,āāˆ€ƒ†*@ĀAC… 040HāĄ
ÂÂÁ	(4D48DH8H*i
CÄ|Ō á‚
+
 2ƒ×Áƒ*4Pā	hĐā PáĄaˆE„‡FƒPf°x@}h¨PAÂYķjüéCo'KÂ	x€– ãĢāÁᇈ4\Ā H‚‡\„†$h¨ĀđŅPABâ
ÖĻä(KĐ'‰UbC­Õę–W“ŧÎhlfS0›dHĪ˛|dE„ŋ2$íšĻįÅF„:cõmŠ9\ĸ
DāÁt
‰‡Ŗ
+*\đ`,pxPᥥÂÄâÁƒÃ
ŠXR
…ˆ08`BČ
+H€ Đ0
+
D0T *D$œ„†8Š A
+4\Áā€FH48L* PÁáÁ
2˜ĀŒ*D$  @* AƒÃ"$@G WNU’”÷“āP+cWreü†
+0˜ĐPEæ.™œ€āŠ€B"&`AA .h˜0¤E&Đ Á1¤
+<8T¨Đ@†&,ā
. Ņā 4\Ā@Áj
‰GI
˜
"HpČ@ņ€ē€DI†	
Ü"44@Ā(Á !ƒ&0€
Ž x`˜1
+4@x€XD`pˆ0ÁH*<@,„ƒ!
„	
 .`xy`0Á‚T@!BĂ…¨đĐ0!Œ
Ž¯€ŧt;ZÍĨ.‰fŅÕ+ĨĐ0
4hp€Ø%ēi
ˆ‘H%€P\đāá!EƒGeš¤‚†8P Ā0‚†EƒĮ$@f*(RrZRACÆ„eCÄÁĄĆ@ Ā
 4H¨āP

+@(ˆ‘@LĀ@FH
-SL¤‚
+
xH4hpL1"L "*PČ@‚„RAD††ˆEƒ™RhđD„D
( 
4Dô´ŗ‹Ŋžyo¯^%ĒôĩN$×
á]ŲäíĪĸĢč|ØCSåQĢĖÛ:kŽ¯°îüåũleØ9Ī^:Įļ;"ΑõčägŪĨŅ
oŸ	­ääôEC¤˛ŊjÃį¯ÎŦ”´ŧŅ”Krƒ-ŨW…’$ũžU›O┠ųtuT=3ģšĐĨ 5ËnY+D„xWEhff›sJ„ö”s^TöøŒchwF“ũŦ/&"‡˙Į'ĘĘ)ËąaĮväzÕ­UÅÜs~*}áë\Ō="Æų>—ĩi9ęŪ`o4œüøČVöÖ$ēõĢKz…hvŦēd[ōJęĢÍäøUlšKķm\W;íSDĨÆr|÷Į›wZßķŽÜ¤JãķlDwˇ:ôÉŠēŖ!ģŨį—X™‡e,›ŗģ×,íDŸbƒÔķËlĒgƒ–EôųĒÔkŽŲ6;Š•îƈ°i7{ũl“VKU<eOŧ*G÷Û>žyŧ#b9¯åÚ˛ö"BÆôžė-ž%ŲÎ)ŲÜrĸ˛÷ËÔûĸÁhæ_ÉeŦW2×Ōæ,ßjSTkĸéę…N4šę.é¨Î'ZY˛}­Ž‘ojeĻå/oŌĪ×õĢ˛ģŽåL•ËMĪŽĐ“åŋŧÉXpęž.ú,úųl9õ”/ûĨNŠj™ÎXōŅŽÅV,›ŊDÁ/ĘĒBTJ”•zSŒČ&g‹()‹ÎwD“dXh4V‡¯’ųî,ēōw
+
MZũļŗ+Ũ‘_%+iDžA0ú úH”Šļ3ôo*KŌU­čcšęöÕĘ2r]Ŧ×s%ļÂŗŲ*T}Đā`ÛÕ`=é+ĸv&¯÷{šåÔWō÷(	sžŨLVYąČČŽ—;ž{šžĨQ1•TÍõ{úōˆŒŸM—ZéļÅōä'Ņ[	áķä2-1ģKûGCĨUōjŅ`Ûē˛Ÿķ–Ē’ô
Ú­5ˇŦ“ž2ŠTĒd™-•:>Û­vĨĨŪmf
+ŊHĶ{æe)æŋ>C흷'™•lšßg•įnW+÷šąz{
%ĸmJf6D?Ųɞŋ,G„/*û\ēŅÕķʊč÷B´aĩÜPŠ&ĪŠŅîßÅC…3˜öDOŠ!ŦÖ>gS,KvSw§ĸcqŠõũ|+…­9´ž1ņ~'œ)ãŪļĮwöŠ"Š-ˇžæåי…Ŧ†XS*XĩÚËËjW×ŲeŽīD–Ĩ°‰5ļģg°›Tw^,[mŨ§ãrŲģÕŠ8;&Ŧ;ļT–ŽæîÆfõŦÍ_y/ĸ‹š4XÍ{YąœÛ{%žŨģģ
+ąĩģš4kŖ{Îĩdļ÷V§ôũÕ´÷úŽÔkģ‹ĒøŊC˙öÖMɡŠ­š×íâˇ3—ƒŸy•kmÁƒWdēkÕ¯ėbFû˜ęsÆ7ééK´Ķ/;•RĸŊTin
R‘\Ŋ{–DBį}*šįézbŗ܈ ͌§õ(˟IŽSšz)Cģ\z–Mœŗō¤“Ė¤RŨꊝÔuŸ:žU
+‰tN“ykAŧ+ŅeR“ˆ‡Zė%ŸÖ+œĶmIeNFĻo°HGÛJ1Ë|Ī—ÂŪĢÖ93ž×`‡~ƒŸÖŠ[KĸK“ËîžQĶüô.Qî–~ĩuÖģŪÄžæēSΕĘ&Úë([XGv/į”fV{KC<4â1}¯īX•Ī:ö[ĸbÕĘ)Ĩ?Ø•<NēôĨÁ‚‰ˇ•šĢ
+Ŋ­,wĢâS:‹›+t,*õ¤—ēŊ“ueĻ.:"|feų´”Oŋ–Xˆz*D%4„ĨI÷/ĨÔĪT
žiV°­kŨSŽ}­Œ%ã}ō]ŪŪÍ2ũAĒRTė‘ĨzĸrT‘Ōˇá•Ŗžá=•7ēķû^Ŋ°ĘJĩŦōąėÅŦhSÍ/›)d-<^ŠĖO**ĩ&æ]ųEGÅŦ?Ŧ+hEkš+åUâŨž›îSčį+!ŨËĸĐwęT)–Ú%mraIŪ[Đ&ĢœĶ=Ī°Ŧw“QĄˇŊß%•"”–DøšbyMZÚ%O˜„Ø|ßûOÉ9æž3/~ŸxYîW[áK7‰ļœ—Ȳø"[iŊ*ÎīãN!×ô;ī˜ũåŊ5UÎĩÕĐQ"ŪŅ%å+.ęĄá?5ŧWæ•tį¤Wēē§åKe	UéɛXŊ÷ļB¯N:ŠĄÄÛKžänXė„ė…Ô‚C$¯y†wÖeĻÄdĨŠÕĢīē´M‰ –æ§äĄLŦ)[z(Ëyčĩŋ`KœĮ›ģ—\Ņk§KwĢō,Ą:;Âtŗvŋb•f	ŸÅļsw¯S‹ą¤¯§xꝩ„UîLšLßu9č[Oe|Su>fQU]ŪŊė°ļ7é;:_‘p¨^Ę%iS–ËJ.˙ŸÎ7"áš\aĄfXNTUX…7WŋŽUčJÎÎTøËįŨ
+ŗ”í?ZåŊŽYĖ}9ņė“]ŌĻĢ"*ķÕĶr×Ŧe÷Ú˛L6ņz;åQéš™+w¤Ž^ÛĪĄžÜ$Ë´ĸ"FØ,vîgF_b™SŒ—ÍŸ°ęŽ„W,Kú›rr|„˙ĩø)ˇXÛÛIUŽ‡67xôaË:xËlɖ Ք;ßmŽĘ‹A‚Ô֗D‚‡SBsōė“ŊbŊŪŲ›čríŲąmÁŠią$H=šŨĘîĩĒœ+M‚x3ûŨ`y‰ô–ÅGlBĢŊ“>“$´#+HVĶ#;fž éŊ>"û%^I"RKĪP­PŅ_0	ZVÕ^-*"uåB'-AĒ+>ɲbĸ+*wR“ˇŲú’CÅNœ6d;ĸŊPéI:ŊŅžæ)8ôNi’–ͤŨFYnˆžĘM¨z–öŪMą!Be*=BOēŗ[‘Ë•nfŠĄģ˛ŸŨJY–ų¸Đ~Fé›lĸĶ2=eîv™ĩŠš!•ÅR•GčōįgžŲ-cÕ*ĩ–¨cžáY!+ŠéËrJr…ˆåŗJYŸ.—Ī¤,ųŖ	uKNIŅŌsįqK~ŲŗEį×ÉĢ„Nõ¸%dh‡~•­$• 5‹đ—TåĶ’ŪĪ;–Đ´iT^­
ËF+ĄĻK™Pé¨>UVŠ+qR•ąŨ
+"ĄļF~Ũą¤áŧÔĪÁ;qjĻŽÆĪķįWį”Ã@
 ˇâ	0`xĀ
+ˆH<ˆĐPĄ
ƒ†	< °<hpX@ÜŦ”Ôˆ
+A0ŗ
Y‹æĻĄÛęr5DšĄã}Å-‚9/†ÄæÄ÷it[FĮ–B’7ŋŠ’-ĘrŠ#ö­„zŗVˇą+c"¤bÕ_…|VÕĒįPMĐÍ{rĘxÉ[ÕŠ–%<hp@ T7`ē”ŠÔXn‘!šÃ:ŦŠHÖYYbO.•Ŗ"Æ[Á$Ļ÷™ãōQ')eUÛ"¯Kr–Xtį]:Ejz%MúĶĄ6ąØĔ>}zU‰äŨÅLŠŠzQ)/­I–Ų\ŨL-xXUŌÄwcÖk˛
+ß`1×ÉÆ>Ķ,WDŪĸâ#fˇV–VĨËIēÂ1+"õ•,ō+ÛV\DĘĒåŠ|Æ/¯gĄ•1"g.%ōĖöõÃŋŒaÉĩDc'+×Ía™’ĒkÆnģ
+‘zŅ#huž>yS˛ˆ8{--9öÍ2ëY^Ō/uDĐ,¯”¤=û–“{ņ¨~ÕÛFåJŌ7ÕëĩbĄIÂr&ûûĒâ•Zš"–UĨF˛Jguô[~D튍Ūdõ¤ˇŒŗ¨ ēĒē˛”‰Pë4­Œęæŗ‚&RÍbFnĒ;Ûr۔ˋŲŊõĖĢryÚŲúŲ`š‰ÜZÅD°˜žēV1,]$R´öW&‰äéJÉ9"ļ¸ˆeáMwá”™J1‘NV-N"ÎÄr#H3–ô"YŠ$ō9:rjt$Wš¤
$ë-wäŌŠtĸŦ’IÄę<ō˖é†vé‰|îō#å—ŅĶHå/N•<rwdĨŸkJ[ ‡džÉâoķ˜čæė’ę0/Š:÷ Á
Šû Á‘48đ ÁA€	<¸āÁ!, "
Bá€ôAƒŖb‚F…ˆ„ƒ
Ž‡
8Ā
äAƒcyĐā˜@"éČȔ€”€€a€	2@!AėAƒ#ƒ
Ž†	2¸ŅŲ/)‹KäŌUY§ú3"e[I$V>(` @Á
 ā1‡1ĒĄ8FB‘HGƒą°ã8Ōĩ¨k•PüX4ãø⠀
>€
<˙5Ģ´‡-Öæíĸ•Ö`ķ°6eWÂڔ‡Jkö[‰eæ†ėN›2uE–DeCŸČ„DĻŅɚeīé†Ŧ\‹¯Î:_힤ęˊ~œôíŽąd§aË:ö"=;3į’Õ1t’ĸĄ
gėedč’d3vĒUÁĸúĻĶˇ),EīĢNÅZ|eũē+Ūj\hˆ^­=XÎz‡>ĄYIēŅsr˛j˛^>šœsƒU3YgTXø+w<tI˛c={.Ųw:ÖŽŅ¨î#Ŋr‰ËŠ‰Wˇ#kå˛âą>ĨŠUU&{īT–Šĩ.Hؙ´­l~ä^1ŌŽoll1fMDĒph|å%¯ڔ,éÔl
+šĖĩĶÉÜļ š†WæÚ
+–ôĖĘzu[æRû|39-ŗ ]ÖČKڋ‰NĩÎJŅ™Kd+sd~Ueģ×h˧lĖR"÷˛D˛•Ē+HfžęM˛2<šVΊDr
+īėĒÉĘ!,Ų"žēKéėU°N8fäŋåádöNē]°H%^žJOĢ"üœHM™"—¤"6XIÕ2EΜ•>*WÅÖNļURa™0gęõ#ĖÉVaI—
+a_Čđ“ÆŌŽĘ
žŒ^0ņ°Œ]ŠûVÅÖûíl.Ų5ES§ŗ”ŅziŖĻ‘Lú¤Ņ’h|õíĐJ’éįZIĘtb•¤4Õdô“ĐîŋŸ„Xō6.n1+ĪM¤đxÅ;L,fÄ.ũãĄũ/#­Ųīņfä:ū]ãߊBœ,ŲV^Íā‘j3R›­ˇKG#L’yõĢätđžû¯.}š;įäUųXlšįrČ^~Ä&G¯šk6;öí9ËÍö8%ënyã5{Ų㜭fsÎjį†Ēœ‰MiDŽîõYŠ‘ײĪ!īąÉúΡ4ÜVēMuęb6ą1ÂĪØŅķNõ+tSnēÉ[˜ibĢËĖB&ĢĖ#§Iž&šōō%īŽ?¯ō—wĶēũōž—š!“ÍyuSŦĒˆķ>F+õ–׏|…ŒPŗ¸t%	įzĨŠØŅĖígú5ŠÚŖßkōčח°SŲ×M}J]j1"ÖrũÆYL¤l†Æ/Û$mĄą/V¤^ĒßꕚrDŽÆŦĻĢų,ŗ&§ĨUŦäČnyVU†ŠXÎÕRēÉ3ģl1WĮ.ĪneŲKŖ+%BäĶɖgF+%RēbŽ{Đā°€)§ž7XI1Ī?Ä)gCō,ģBxM+SŊļe›Ũ\ŠU1Oî˛ÜŦV§wd•E>Úŧ¤ĩ\m)ן&N)ō§zC"ßŦĒ<Ģ<&ō§¯ōzÆe?+Åã*šÉŗ¯	ūęĒ§[Œ—s‘Je)ēIË2~ׯÅ#ßXl¤N'bąņ0˙D4OâĄk#I=ĸt§ +ÄfõŽPaī†nÉ{AO­œ…ĐSI=ĪedĨ_K}>‰ĻĐe631_x´›ÚŅZĘ$Û#ëfâ‘J™ØÉ‰æĄąR&Ot‡¨	™šIdTûIÎqÎŪŠsÍ-Fbíx×âr•Đ2ghĻđ.Ú+ŠŊŗܤö|Ū§hŸĄį mV>­–Aō˛ōqI$Īģš]8še6ɝ™aM•Db›Â3{^ŪeX.}XŽJĸ]}VŽ‡S;3•)&ąœ$q°|ä˙˛Žx¨FG'9˙šĐŠOÎlpîuĩœŲ‹sģČėF‡Å'ØÁĸöŽĘäoė†ø˛R™!kÁ“Ŗąėĩ4=šÚjTŌŌOlžŦ3|g°Œ“.‹UsfC%qōuÆšŖä;Ē;ēҏčo7–œ1]öŌUĻģũVĐęEXrlē“QšîõĒüËõĻî=K3ĢĻŨÔîTčŌ4![bs-˛âģ3ļ„'›CûŠf­AS"5;fH-mĻąkĨąڍįÃĪĖåųJ]<ŲŧL‡˛F,3f+EÂWšË´ô{­ôp?Íū\æŽéRÄVËôōŽ~-éĮhōŒU-´ŪīDåâ'>ī°Ô”ô’	˙ŗˏY¯˜}å'Nß>YgûåY5]ž5<ŲŦĐÔ%Û]ĄiĮđŊēĐÖˇæ•ērėåÂzÆĖ‡­ŌkÖf$#ÂÄúsĻ:1÷Xŋ÷B˙č^|yëՙĪ)ˇJ5œUwėË~rą`YŠ$”ΏV•o•W°T*IÖåįŠÎX•¤ˆCįĪŦ–#ņŗĻU<Í"•.ÚÅIĐĘŠÜŋbR9$F>NRš–CrŧËë™ë­oʕŊ0ķ|U#ËŠŽŅ&ķW“ĻÕ1ë<Ą9`2mLå­ĮĪ|–Ŗ)B4ŒĀ

hā
†
+VáĄ
BDƒLp`øĀ
+ ´ÍųEŽ’õ
+0đ A‚C&ā€œ	đ€Bƒ‹$€˜@…ˆˆ…*XĐā€$@,TxX€rŧŽ8	ëŌ?hp@Ā,øģÅĻŗT>)M$+”ĮKWŊ\ÖUÁüģSš{Đā€P‡Õ)xŸbÁŖ2õŌ)V-Žōŗ¸/ē ’KVjÉĨ°…īl
+ēū”áéîŌ)Ļa{…\į%ļeÚ!•Ä,åCŗbf.ēBUY†Žå3SWŒĘUĻ_œvåWĖdˇfÁSŠ}RI<•ãƒ„b]™ÄŌÄB9e^rZûĻOáoĖÅSto†?יĸËŅĐ-+iĶ”ß”ē–´y1CÄrvíä—Ņ­œĢ–Á:–ÂB*ÍsŠœâĖŌŧ4åņŠĘŧē[ĨčUg‰-lŨą\åĘn§gđ‡ˇ’v–w֋ŗG3æ{=¯ÚĨ LīŽĢ×}ŊßŪ÷Ū]™jĄī˜HE3÷ĮæīXĘbĘēæ=Ņ\BzŒ^ÄôëēeUc“öe&ųŊŧûo1¤N"bZ§„Ų¤Ĩ5KŠ\v¯’ž*{
Ŋhå.ÛŅO/Lē§ŅBb­LQš-šS]ą"c‹ŨMúÜų­ĨŌĖ
+A@ĸĘ,yū¯ælˇš)sōģMU:XæđJO*ŅsD+6ÕÔ1Įx­îxĖ–Jb¤šįĩ•KbvĻĪĐĄodW’¤?Ø)áwF¯-Ģw,ŗB§ãúUGĨ2+}2t+ÖŪ–)ĸÄëÔKĢæĪ-Į¨T4æŊ
+]VMÛR%"XWēã„@wnšœĩú™ō›dÅÖ$7ŠåäģoUU)Įî?˜ļQZ‘hōXæĩ×{?ü¸CžËŽÕé*į™M7Rû’Í)Ũīx×Û
ēĻĪn)GVōj-Ē!šS+ĸš;!M¯´č°2­°\Q6x-ĄucEĪ,ĸÛĶÍĸ)ßņ…h&Ī>ĢīÅ_Šģ㸊!6ÕėĻ6v…Pt'ĘģrŲ›ō
+KeíZ…u$B4œš‚÷{ŦŖ,3ĘúY­”QĻĖ°į‚€?›ņÕéčÅæ7Žį§ĨŽōz%KĸÕ¸ö+ˇ´¨Šš/Y”ã,,Ŗ#*ßQZ]ųčķBŦbG?,4zŲírŖŠëWTj*ĒRÖRa&5	qę˜4Ő¨%3ũÕŅK­,3ēMĢȨTjKHvąžfQÎī%|ŠKķ:ģ­Ž\‰ÎsVŦÔLÄ2"J|Ū\Ž7•./Ŗ$ŦM‘ŲØĪ†åĘWÎŦSÎ\Ú[%Ĩ{į[įŠËjFŸú)I˙Õ'­JÎŲMŌ˜Š!\–íYE…JĨü‰Úža)!ĐŲYŗ×ĻJ‰:>3+]zîŪšŋŌ^2z•–h°Tļģ*&ę™kE÷,VÔĖ}ōWĒFĩãā*jįȐČĮ3;5Ģŧt8vį‚CCw;ryįÆzôbš!„`cjĩ‘‘íķŠ’D¤Ėč"™¯Æw™Rĸ–œĢ=)­´L•S3đƒd'#+˙ØTRRšōōÎŪ>e-5Ë[1Ēûōåtn§ą,2ŗ,jŊÃûUąÛth“X’ØrũšĖR›Ũ
yČ/b˜īÃ)i5vwīĨŲ*Õī¨c„PŸŌŖ>K]–™wōá
ÍčhʜUæߖų#ŖYš[Fēãå‹ouŊrÜßė6‡KgGD*.åŲ]dvŋĒaM’í™f÷d™ĨWŋēžŨŌŪ¸–~RŅ‰eTuwÆŧ¯“Föē´ÂļŽ“ŸšŽMŸŦYEÂ4ōe¯HˇąoTI“ÔQÖ(›ö{[îĐ&īDĢ+ŖáÔæv¯•=%ÉhvķVTy†/Ũ!EųŋåÚ95¯×žz¯×
+}ęe&13+›%û3kpždíĶhōčSZb[DßŦYŧd7÷ŅHHĨŖ
žĘY\ŗ4:1Ķ1Iu’dmæXsûaéĐÍ;śēæuY|ŧŨ´ÛŦÂOąĘũŗ'RšfŽ>DŊĶŠG?’:¤ŌI=;_KŨ%=ļŊęõT=:ĖŌĄU’ĪĮuo]÷˛q&)Ė_]%ų*;W¤ÃĖ1Ū{ķÉEgmQ]öęĖĪî°Di‰HwĘŖ?ŗjÎ/}î9„wûĢ4ī›÷'ųį:Eôžū{“gCŦ§lö‰ŦŅ~MŖ÷LîLŋÚ~úéĻĒŒ{&×ē~GX?D—‹ĪNŋÚrL8Y˛äeų#Ėŗ)v„9ŲCWąZ[ŪC}×T&–‘ë[Ēæ|ŦkÉ*4ž`éĨ$ĸÎT%žŲ„I„C‰åsESƒŸ^%Á<Yš
+ø¤ôÉJcvƒÆō_V}˙2éˆ
+Õ ë3čjŌJÁž5M/Ž›ČŠ‹ Ö;ˆ”†”ƒĨ°.MUŦÛ¨Š¯NŪĩŲŽeÍ)zėĸ˛ąOSûuSUŧŸŸc6ĢŦŗV‹^Y$Ķ6ŗUŲŦĖ!ųˆf­™ˇ)ÛĐnĘyyUÔ)•ŧ’wōä”<b[{Ĩˇ2§ÜĒV^oEcŧÖUŠ‹rč—3U^/Ō"öEŌÅūęę/éW÷>ž¯˜īč%˙la'ãŗ†ú*‚7XÖˤ2TÄĖōDĖ{:XƒæL˛’™ŋ<ķîVFZL˛›ŧš$ģI˛{f*ģIĸ˛;eąL‘+Ã˛›,+g!$"æŪTąŲâ’;Wb‰‰°đ
+/]ÃŦq93LۙT.Ô#ŽOxTîZFhu™gâ‘O­–4;ß5ˇˆĖ?ē–!…fBģveČ™­ļ2×^†Tåŧr\ļĒōŲ•#v5Ž:!OÜ9Ų6VÆ,ø2MI:¯Ė>ÛU•"Ôjžo5Ŋ"cÍ2ĪSŠœ‹VũœIĖ‡¯#W-ˆČKōye—Ō¤]Ķ6ysôËüb‚‡–÷ųuŌ&ĨĶ¤_7ËåQĪ—V–6v0‹Å‹m–˜0[ĩæ¯ŌnX+6˜ļbrŪĮ<•ˇsņ
+iîØģé>_įŌ$šZYËØB=*J*Ū÷RÕ?Ŋvív}™šš•[žâ[uTûÔ:îY]kY‹G—ŠŊ“8eú“ŲĮXYjŠ4vUTSšÎÚĒ)ž˛nŠĘ _9%ŋŠ9Dã'‘aâųĻDW‹]íūØI_5ôąË“T=ûĢšŠq™í—UUΈ˛:×ÂģÎĢûĮf-uUė÷É‘ũ…<ã*2YŅí.K‡¨æ°ę3æR˜Tf<ÂÃB—ąešXâŲĪ\Å´$6WYĸzUũČ.e2š5VuÉ$Vcę	>
¯Ėū2¯áTyå˜č#ÃWĩ‰™uaNeå$I23ŦģlíÄĘ*LŗËšeŊž,–•U6¯Ŧ2"WÖŨ÷T9ˆiĨL…ĐÎåM°ÜhŽe?*Mbu““Í57í¸ęŦãĒËORū*īWuy-úÕ/1čŠ	ŪŅĒŽCUĘhr˛:Kš>E†õ˛īiʙ"KzíXŠGö⛝Ē;sŽU‘å˜ÕåXŽYMŽIå1ĮŦÆcoēŠj´ĸ!v7cv$S•9ąœNQŅyJŠõ_{&ä,ŪU
ņ¯|¨ÉååäŨeZ‡¨UüДŠöIŖÚ>čKâ!—ĒĮ…Vŗ‚'hؚͲ
+-gOįŖĒG8[[žfTT*{BWCį’mg÷LÂÛ%Īåml+ۊž×ū$á‘Ęįgë=Ķ,įWh’˛x
+ßą‹§gXUēŗÍh>YÁ÷VÅO›hē›)æLkh9ÍĘŦĄĨ­lcGD”I}eÁ!׊LŠ*@L`B $Š"*PĀ
Ą ~ĩ–*@nz”Séiq
+•_Z’iplvŧ+DTœxUĨnxEeEä˛sKŅšė47Ĩˆ˛ŌEį2"|gVú‘Ûw,ti§´Íŋy”…Î>Æē#ķ¤m>VnJMģũčšvC–Mģ)tŗi‡XŖz;St™Í?í[ƤeGŦÃãŲž<ž]ۄ6i_!Nž­crhĢ4ē§#ú˜Wîœu†ž"ĘÃŧZ[eé×äšĸ“lEÂŧWû)ŧ´‘VÚīļ›õōĖVęČ]?WVđ|6ļąlã+O™ öÆ>Ŗ´›N™ņƗ7Žr5ŗūĖŗĖŨ\5‰$žeq›^^bš]IWŗ†IxV•/EIlĪ÷ėY•Ĩ§XaŠ›OYÍÕÕXÕ=ÉĻŽXæQž‘§QÕYÖYļ’ęÅÎÉYr"xU˜‹Ûsŋ›s¯J‰–*fĻ#ŧBK˛§ō<9„îLä*
=-´™´RŠÕ6ĨĢŖ}N¯J$R7Ei“=ÄĄ,Ųl-‘ã]é=ĩđ•M2ûĖ™ˆĖ†lę5Ŗr2"+‚…Že•W•­ŠpėD7´4b/á˜ŨĮĒÆÎ%ÍjpzXWŦˆÎeÎ-ģ+ĻU•:’Å,[Í^•w‡¨ĻcŸúÆ°æÜ1•!ķģ֙ĘëŒöW4E’ū2{ī5=ŨX3+DŦ[VJ„ĨhŦ’˛h=–"ĸŌ"v×Ŗ˛3Ū´´H>m[’H!eŲ(_Ņg5:ĪėĻ`ᙕH}¯XiĐ>du;&]™9DŗÉ[ūÅ*Ö×f^ZųŽīY•ŧĩų*ELuW)rųk¯ū+æĄRoÛŗŊ˛B,E
+īöœwT˛ƒ˙į~÷Ī‡JåëĘJIJ›ėAJŸũrJĮX;ręTa1Bˆƒ—ÅŠ‘Úā”ÁN9ŌqöúbÄT_ŠĐËõef)Ō+F#†MÛaf+qV[Ōfž<›pښëā¯N/#1Ũ4÷
ÎÔÜWM*D÷Í)Ķgå0ÍåÍēĒ.d¤ÆtÖŠ!D;ZÚéЎĨ#ÅJ›ˆĨgV^XŌHņsŗ’h„>ˇK¤ŖÖŌ°$ļiC<ŗ˛lŽŅeŪHžąč>Ø+™ô‘%Rš‘ģąĸËl‹.ŗ7ōš]æ˨/‹ŲŊŒeuÆîu9…˛•˜HH—uaīÆųaļ´
+ZZ•ĢŊz[WXÛEåČw‡Ĩ6ĢüŦ+áå#´qÍŋķ™yŽ‘ÍG8G|fÂ2&8öä$åĩ'¤Rū^?KN›ËĄ‘ĄåPmŠö˙z]ŽģŸŨğ[ŧb,+mŽĪp†ˆîŦtŽ’å͔ĒĢĘRNĘD$ŦĶKM]ą,ĢĘ:vÅB­Uũ&¯”늯Ū…ĖĒ>G3Ũķæ4Hş	KĩuējŗĨĪÃBsšU˛WBC|’-[fcWyBūåØĶCnAz™•]s4šÂ*ŦmÔßU„Ž2-´+ä]En[Ļf",c…ėámōåsų)ņōĘ°§ÃēÍŠ Q–gŽW˜ŋ3ŲĩÔVØAĢ]ũÆ~ēĐđ9YWwËõÔü¯°ŽëęåĘrG˙ëę=M{CY+Öm„YM,_q|EĶ¯ž„TŦ^iĢˇ“ŽŒ&ˇTļjÖ;ŠZųj})[eĪ\ō&KĐ•<ĒÛՑä?/ˆ×ŋŠ˛Žu‡÷ī/{˛ū…5VäbæՐŨToQ’OķČj°YŒ
+	ŲílNfōėčWędyģRHXŽėfʎČ-22B¯–
%ΙŨÎ./ÕËŨeEtb¯’ØËb4„ļ+į0o2,L´}Č|mÎ ÚĻäėØÚđ”iE6–}:.DΚNŲŊøBŗ,Ũ§w­ēĩĐĮĪ)t,yR‡ø´ų>OZdiO{aNĄųIÕû4"U6X5ŗ™ŠR‡c+Õēš„9w+îĨėCGVhŽsx{ū’sužÎĮŊˇCåƒy*ũs\˛šĖ5Ŧ3,#Ē{Mō˜īšfĮõ­üI„­CC›â3ÉÅÚąĩŠOŸJí3Tüø/ÕK´Ķ!Ļ­ŋËÁ—zųšŗ\g_”/=xÎøl´KĢÁķākŽiė%–2ËÁwjå>høœßī5Ī:„”Ĩ({ƒfŸũ¤ŖĢÅh
+í7īŌ*SYŦåÚĨ
ĻŲ¨tîëd˛HRcL)…ŠH€ã€ @4
…ÂQá˜Z~€˛œF\2‘‚‹5¨1@¤	hÅfą4K[kfŽĪēČĻ(e„ē4–—ĸã¨d~Zč[;¯ũ]Đ90ĒnāÅZŦjyFŨ0rôt)åAņ°TÎT÷–UNĄ„˙ģÔXAĮp֍ͧØĪxú‹ęĖkPuûčĨ ^­mŲ	
gÉjCghé"ū´„b<MDũŠd	TIך¨
Oéīú6˜ŋkT~qōøö_ôįŽ’ŸIxė
÷č+GĨDŸžÜVŧ
‹ĶH}¤ggČn^M‡<ņásĒ] ˙ôÚh/˜‡Í…UėŪUŠĸ‡5"ÄoŅŽãĐĢ7qŲ$kŠyüŊOAHâ}mįŖZĻ|ø’roņz—Đ6‰xÃu…YŦ›
'ÉĩÃkĩcJZúu†ÉŒi˜Įå‰ˇ+ZĩnŌzüĢtzd<Áē!Û\é Ēs5ō&Ėú…HŪ“ %€5ŅT៊]|Ŋ|`úMW70å™Ģø>õ§j•4
˛ƒ°ū–CŠuĻ§øĘŖéüŲ/XЂŖõÁ)žJŒpķYū¨ņNĻ,PgIR‰!ė
ŖŸ,`hŠ&nß(ۆĖkyųsęæ- AfîFŲąĖ†Č%Ū5Ÿ03•í‹õ}‰ōálkŲĘ@@Nf}}"‡€žËî¯y>–õ
™4H|˙ËŨpIJš ­(üŌb’ĩek– ėûŋĪ8ē#đĪū+Āī<¯“rëįlVÁ¸#ũ閱ž īm˜@?Tdfgŧ…Ž‚s@LßZP‘ŪˇŦŊŒr…oĀãŪ|ČØĢˇœĻFP.^ĶËūĮ
+– 'Ŗ’š?–ôdIûņ-	/ <tf=,Āų—ųX|ö”•ûeßÅņ%ą@œÔ4#ØjĄcy°Ļ`qļŠĖB `…ŧDāk9[7ĐÕÕNÅ5O>4rŒžWĒž˜ô/QMļ˙8žÚ8vU8Ą‹ß›ú7!×Æ˛4Ëī’JzÖüė$ŌnįXNj~ŽUYĮ‹.#Bđ*/Ē!+|p$ëMqĶOĨ•wĪ=ų ąü–éS_
má¸-,m­ų„ķGĀR6Ё9ÂODą7‹éąZÅp§LIDHGŲ/:l[\“
ąėD C2v2Uņ$æ&ĩŅž`ũōŠ#ũČ!¸ÍˇN>2øt9â.XS,*X^Āi‹l´E#>ŨäŠNęD¸^‚ÄļīÉJL¨x­ĖŠīĸ”‡Ō 2i
+Íԝ+fí´zf—Îō-Z•‚zš#áĶ8yZexär‰–­šĩ[DkŽ^e×8$Ģ‡‹™Î “Z(oį
+ŋˆG7æ!BM™åaŨČzTUAĻƒ…š^!qņvܘNø¸wOÖqSqČp„˛ũ}ŲÕ[J}v– ]¤-q‘‡š‚m°ä§€ZŦę-Ë^âôO/W1HĸËsh‡Žō’sŽ
ExļäÖqS0gōSũ.<¸ˇ‰
+čBīŽÔÔŠA@—ę\ĒP+*[oˆŽÕŒ~Â()€úœØB`nčFÚØÁ.ŠHÕ&NŪycAĨLÁŖĪļįtæ "i2ڋčv˛7‹`O˜ÃÃŦŠ7ÃēxŽĮĐéĒLܡwpĩWü†ÄKR€Ž`‚Ā!Z
+ņŠÅ3§Ķ…ÚˆŖW4Gŋ­>üÎL›ötVä9QpĒlÜęAž‰Ū;Øl1{žn
÷âÜō/đĒŖw 5i>RŠx?9~û0Ua
+K	ĄĨŨ“c6ĢpNģ5åŗ9sĮú ˙ųƒB#o˜ĨĢŲmQ‰žq‹[ĘēŒĸ\BBö‰āŸĢ—°>&‡zVÉá=gį-fB$ÄÚ73BÖzYO0—ō­Ší`ĖÃG)9/RZØū]˜’ĢųĨvuååŒøüŸ
fgSi@xœ
q]œm<„.škã'Ō
+ Ž—'ī9ˆ´)iĢ'q–-[9.ß؁J™Úœ:ŽMXS
gĒ|HP`ÂŅ+-$Ú%Øõ1Š<˛Z]wÛ¤7Ē˜4Ĩ&ˇ÷	ĒÉʐNšŠ­§wĢQė_ĻŦYæȗ„Ī@rāΊ‡Ą{įTyÂJEŒžôzÂ].ĶˆÄfđÛŪbÕķjFŽ\ĢÎü-˙y •ę3š\nÆ>p”ą’jiØHIC…
ā°QÂ-ŦļĐãŧŪ
Iũd!é	üŊ+Ņ,Ę _“¤ŽÔmīKÖ%“0ņ`iå0o—IœČÚô˛”4‚&Š;Öŋ{dÆHXIĩ‡ũä/Uá-°Daôh°01˙dą@-°äŲEÁj	vbą8
Û¸\ŽQMr%y°xԍ–BD:$Dxd{ˇuÖö
+u)đ	‹W+‚Ú孕ØCo?3øÛv¤‚ŒßŲúÃN[ËĐĨŪ#ہ`K—´„-äˆīÙŪR'îaAĘÖŖ;Ė"0ŠpņņL_ဠĢĨ†.ž~]$Q¤ŠŽŨ”ĶėÁĖÛė8jĨ‘Āu“iė.x}ų›‰v5›nī‰•yjƒU˛[ęGĘL°‹û9ōtĒĖCr*zæ˜ÁqõIJ:ãŖĖK=$@àíŖæĖŗė Š-ŧ
+C“Ōķ <ŠžÂ[
ūw™õé÷Ņŗ	ßá‰%œî‡¸%QĒUĢzŽÚo#Š3éVęĨģ"ö
?ˆ|dĮįĮī‡Ō”'üQûå.^˜Ž­‚“Æđ¸æGķ=.'ø‹Ū6ˆ‘…^žF}˛{ˇŠ€ŪÂü­.ūaæĐĨHÎ	;ûvÉŊ.×;ëSÂDŊœ>E^ŲŽ}heÅ°Ífžđî1øŌ}õĀH3JõD(+Ē­•biÜĢa¨åŅ,Iu‚Ē’Éģ˜Ún~Ø1lŠĐ(zė\č}ŠŠëTĮÜÍ1ėŲ–˛~Īé2ÛJ‘Ŋä.#UWy›Īŧ
+DXOaĀv\r‰õí9`“~Ũī;Ą(×ŪAXōŧ	3üã§îk„1ž÷kܲ=›	7Ö§ö’ŪaKē¨ųâĩ7ĨœpļõŠroũ3ÕúÔ<ˇbQBf&{eų*l‰DP1#J‰Ũ–žŲ‘ŲzŽQ…ŌōáÎŦĪ&ĀVˇ%&nGn0ĄXž˜01˛¸ŌjˇW-׹s^#š
+ĪZ#,낰0;A
+܆6ķ?&jČ%<XųĻ‹øĒʲ*æ&ĸRų@ĻŅ TD<lˆŖöĨœNũQd‚ oÕ9ĶjŠáÔXCuciįkõņAöäėaš‚&ēŽ$&™¤­‚v
+	IÜįõÄ^	&Q3Ꮤ0)ŌŦzÎ4ĸ’ũDxęōgÄ4ëŧ-L˛ É됭`:ō Ûv,Š”BŅC:{åÄ ÎĸK}ėĶŠĪVY:¨€ëˇ=ģ]QÔ| øoˇ+ ßÄ?î)Ā¸øąĩÄ´ĻÔîĘüÍÔÖMu~ŗŅüV˙#P6­
ĪŗJø÷Ŗ~MkŽėâ|%ĖŗÍVŽĖņ­Û_m\Ĩíœø9ZĖNÕ~7OAŠxđ$	~Ō`PwÁ^kžˇšÁŗœ†“ŲčÅpû7ô\,AL–‡t…ŲCU§d*Ļá)CBM@2VĀaH;‰vN1é­H‚­ĘôQYÛä^’íšėˆÜGĀķГĪO.–ÍöaWtØoŦ’@ԜŠŽĖ…¨O‡XV?ŗ$“Fí&–`˜ˆČĸÖĢ1t{?@Sr‘ŊķŸ‰€T•ƒ×zŅęčWēs!´é#åÂk†ađ "ĪrųTĄŠy÷Ŧr‘mz÷—k
ÛŖĖŦį†YyīTú@"<Åsäå@‰Á0ôÁš
öJåĖŌہUÚ7d—˙đæŧ×ŲĨhˇüjUAr•Ųâ™Ŋ†U–Åd¸/]¤č÷-:üÜ&>J侞0ÔĪΨ0nL+MpDä›`	-_OÔȊô˛S8<ƒØ˙ĖúĪszˇcu[Ļ>mYęaoMO„p×U
a\ižø2ŒŌ
ߗœô{Ķ;Û|œ&ƒįvíT„ØnpΔÆĢŌ­%2ņé?*ĶzÃu:ĢŗiņLŅ+‹Œy–Éq$#hĸ‡ŒÛ2äsËĖuŊĒæ>Ī5Ūį	øÅjÅD%~Ļo‰bR“ą;r’øíBĻđ‚öíÄX\ŋÂÁu#ū4ķĒ”>ĸĖ7–nԅí¨ŗ–8PĘÁáú#,vLÍ59ÉŠ0ø=ˇIŦĮBĪëŋ8ÁŠč+Üũ¸[™W°‚ÅOiâ-ģ‡ĸ(Hø¤–4jãQšJC›ôvv%n*oTžŅšōĸP­ÎŦŽ>~6"ž|-OdĀØģĶÁ´IY–`/;–ŊģCĘŦ2K^Ģģ÷&—VüžāáÔ	ĩ‰Ν—~‚s’\Ô"€•Fj[ˆ~Įđ‘Ãōc.œÕk\”
}"´ŪET=˛žŠņŗRŸp¨˜ë›ŗŽ…ídŒÜū‰ÎnÎ_ô‰?¨hPÖŧa§‘Ö3Á´'ã.˙zŠqS–÷új’#Š•ęm9Ą`9pŒđ–@‡Is¨†ûjËĀ>
Hā}"ķwĻ\&qZ $ōĮ™Üņ‘3…/gž8AŸ—@cŠtÃixR_úiÃeŨ܆my2ķōÔûˆš(%VsÃēSxf'[HÃŠ$ãgš™ŧ}Øk7/ĸūČ^e
+xņ/ũjß+78Ö]EĨ¯H‹yČiEUé7qÕ×’×å°Ŋé“sĶ-ŽãT:ŨüēZŪâãƒ
[	ü—‚ŧ´p§qĄDD˙WļÂĒ´„qæZūˇø",ŸkŽéSŌėŊgÃ6”ŸuĖ`MJ0ô^TØDē´Hzŗ¨÷ˆe@Á#G‚čPĶH„ĩEŠŅĸōNuY'4%{ĩOé[,dëKõ.‘Ū)õā’4ņ‚#á™ĨĢŲ&ŽŖ]˜9JīĒy qũšÉ\7Ĉy
+A3B9ūŌ˛úŒ6DÂ{ˇ|s#K‘°¨aôš~_tņņMĘö` €Ģ‡đØ6Ņx˙˛TÂŧ,G×B
yũ7Ö
+%dį+:§Í2А	R+U3Â)Ũ“ŧÆL[Åmß "Åu0ļH
Šc‘ûŲ)rĨ*Ę&ˆLŒų(ų>œ!⑟Vü .MK
+X4āēlC§Ū6$<\2.Gō4 c$ëR9O÷xÕŗrW9ÂYāŽÜtĶÄ%2B^Āā€Ŧ˛“šZOMģʘÚJŌ Ā§	¨=FĀvāĸĐeŠvļá÷áōčÁÔíķ(Š#žÔfOm€ĸŲ÷˙ãnŒÉ(|!ĸᕁŅÜ?܌Ž˛ŪŒKl‘Ą/” ŸąQŋå”%įCŲ_FÆEŊA”c°9C&Å>ąË‚éÜˉā—õņøÃcÉ5KYāŖ^ĸŪęUI­ũB‚ŪöÂ)5.Ÿ„3FúĐí…Tka—öŊˇ×Æ4Xū†Ų”'rāÜpœKgŊŧsžĶn4Åaxgz¯š˙ŗŲMyČųh?øŸ }PøÎ}ûDčƇ%Ļ3D8‡Bņ3įēPãRBËa	MõP;]*áŌۗĻĪ
+rfŖå`ĩ`ŽRrí7†=}Ļë™ååĘ\õŠŽxÔxZ<QŊGęaí˙ŽžĩP÷N!SU8+7„Ė
û´lSžOcķ‰ĄÍn_í%	ŨĢâ-˜îYļŒFú1›ųÅhĻbŋ2 AĢéĖÂH~ÁŖØŲĒ^_rēĖ=VüfĒÖčDQ‹Å{XŌļl\Į4C4Č$W{3ūJié.0Û­Ä +áÆ„T“ŽR–k ņgĮy‡8ä(R!š“QâĘFZëģáë-]~víĘä9ĸd‰%ÄQ(äÁxmÆá)Š[Ë:ũœŠĶRFî˙Tâüą˛ūúZVÛ´bd‰¨8äŧ5ik\­Â5…˜ŗŽûP`5.įše}ĻqMÃĐ*ēž!Â}\*éF÷HũaÉbU\¯ÔšA9˙
ĸ)îĢ°y}Yã;‡O×ęÔmjr ø‹Kô"
īųšõ”§‹?5Ž Dŗ×g*Ņč
1ä7ų,LCÃķ`&.wcßBJ”ą˛QēŲąĸÎnQ
+Āo€ĸĢîͯ”ŽÅđ‚íŲųVTī›õãB=hĸ—,ÆÍ֐Ī~5đ“Æl\Vę;™‰ē#æažtƒ0ũˇ:1û*ŋ
+˙īáįL#Ų§:SíxLTÃûᐚXkÁäžAÄ:æ1
ŽžöˆtU'-—†Á!Î4€ fJK:`RŽ(÷<ĐæŲŠ!7{5Ō3™kf'CÚl8ŲęoĮÁ;Ö]€7n€đÕÂ\ōA˙k^ĩŌ†ŅŒBP„ī2>ęyârĄ|¸ĘXōë&[äŦ␊"=G:ŸF-SüČsÚŧ\éę|Hw ĸôō
CĒxN,Eõ”ģ\1{Qķ°ˆęčâāV…Žž”ˇ„’8feúŖō§éoˇĶ0,äæs…–ĢOėēđƒPūōl‡6\VmNáé¸đųŠ‡ķ
&æįj1SahVĮ.’,ÁF,ąúáS%¤L!ŨRĨĐnaxi§†\ģ†ß4/õdņe3/0;ŸoD>ĐÚŋ¸"ũ5‰|Īa
§*ÁM֐iō„6HlöČS‘<ĩģ“ū›Ú™›Âđ°É¸'%9ų>E2°oüÉGaūųĪכēRĀÖ|1=n˜Ē˛zË.:c9đig>ŨYĸāŦƒŒŧvŸ@|Æx…U?C?§¤›ėW$KšĖˆ_%o°ĐŲŋ8ŸŲeU‘˛ņ&Z÷xsŌáāœúđöÛĶ4:ÜuáŋdY!1æŽÜ2‰ÄlŅãâžŨI3ˇĘ˙)ąĒÄcûšM¯d9ĖĀŒ˙lģx;ĩ-ȈZŖé|gM…EĸV&q¯BZäCÎ_^xĢ‰•~÷}N¸Á#ĸb‰î#Wʲ4X´°˛‹:d6ž%ŊĪķū8Ŗ2ē¸ĖĄlĨ¨ŋ_Ž'Ūˆ@7§U9_2ÜJTzûāĶĖŌˇĸžøŋuŲŦ!öö•ōûˇ¸)Ķ)9öęæ)Č|W%´9F=‹3ę\:üËŠąeķŊ7'˜ĐįöД<H‡Ōĩaîßj%HėÅj2īdōÔ5ū­Y™>“Š'oēã¸9Ā¨N|Š
+Ļ,Ŧ—"ˆ¯ û5Žú7
ÕEŽ‡
,23•#ÂßC區î"ˆ!đ|‚âŅL
’U>´Ü„‚ģp2ƒā—'ƒ•¨ÆÎ
âēCŧÁi3¸#ÖĀčh‡ŸÉLĸ$âŦƒŸ$é#	ä÷Ž'8†ÛH˜ŧĶŊĶkG\æŋ€ŧB–fáąŅøŖlÕE–ûd˛Ęí)7\ĸųPšĨâ?Ėā|"5Š3šG,ŲD<4AS
Ađ037įúBåH2/‹`˛,d™ĨŊEmø=ˆŖŠWËEXŠŦ!‚m"Ik2AŦa…‡ŽÃ;bŋĖ6“-đTÖø[ņŠą'§´ķúi&ĐbKŖ&íô"n*Ģ=ŒQ<[,/Ž•íŠÔC´Ų¯"˙G§ė‹‡Ž¨3#æS*ąŗ`pÚÍíFŪˇÔ›X
+JÁma{~+ ;ĪGĒ“JDĨ$ņHĖ4ĮvĢŅ…ĸø_ÔĄÄŗ†ĶąJ<Ę]ģ;%x¯
+/ZS¨÷ûŖKIȨÁ-ũ#ę
+ÎęÁLÍÜVņŽ †žitL-ĻŲ^IX
+]!‰äĒÁäũ’w:ķ)q ¤!–ËQt*i“°Ã›]LŖŊYÎ؃>Ĩ¤#§a!ƒ:|‚Ņ䔾ŊZ~€’^$
}xĻŦ‹Õ➁{¨Ĩûoī2ä2ˆ}ŧč!^;¨c(_úZzļ•pyyl… ūZ€]GÖJ'Zą;c^ōHU”ĶrFä1#Rō‰š)ĸ!(]3yIØą˛ã­NĻIĻ4žÎ‰˙DöÚĒV—CĐs? ŗōÅ–Y(‰NÆË<ág^.acR#û­î4įĨ•¸J×îę
+_˜ô€A-´aŲļ|šúd™Oá`‡ÛQƒ‘ļ’ŗüÂeŅ;ĒŒŦĩūƒŠyJhzųŖrĢą­˜˛ē7ŋ’[É#@âD#9
+u'Áž\0Åyb3;Ë´æî8of|P­ ļŖ…ōß!™ŅōŖ ęļ€w2Upā/6icuõŲ…_lŅÅgÕk7Â2ėcbļ>¯6Æŋb~L*a`]æ7ķ&•P„GLŲ+K›oĄ1âũˇTÔ‡ĒPlŲ¨–:YGtœtŽ[ByRžÆ¤ôķōŧˆF€ICĻ˜o&ģG;ëtXÎ/'BŠ–&˜ŖŦÄŪįĕNgë[.ŋéxuÃoļmĐ&qbŸ>ŧA5ĐZ"TũÁílhÔz.‘xō<LŽ`͘ĸ‚ÜėĶ#Ļ‡J‘röÍŧ&ûg(mKįđ
ÀSË{—c#LÔc%ėž¯ˆÅŊÍŲĀZAuKjc.-dgĢŠT	Ņ$ÆŲ!ũH~ŋØŅ’Ā	áÂR˙qPÍ{ŲU€Fq—aš?.ė-ĒĻ3§Uæp¯}uŊÁ‹čČ­zˇČeãōmˆĘ
+`ŊŒáĢŸĶED
+ā+
\ŗŪ3dw=^ …Ę$Š˜“v&Qĩ4Ę<ŅË"ŲSíå­íˆA
‡ÁīŽP7ˇo†ĖĨIđ
ŅÖŌ¯°œ?ÛfrÉËøŗhĐĩņU~(O¯‘?­wúšļƒtĨŊkĸ”ô$L‰đÄw§HüÂB `5ŧÍæE
 ŖpfŒ–0ŗ,Ŋ'>’ĘXô€BÍę;BŪŋ°áíĀ…ļČ(MŸ#kš^DYŨ>K Ÿ;&¨šgĒÅS’oŋĨú1hĄ}R35!…"ë<Z"T1q8Ūŗ€(T˜‘mŖ>›­Ąt{Ánīےō˛xŲ°Đ€2¤w†Õ¸õÖ3YBøgÃéü—<áÕÕ †äÍE>t&;ԕąœp7¸ų"6(6ûjk“4ôŠ8W.ŒV˛?"1äÔË„(#ō%(ĶyōeË?c8†Ģ¸ÁČ7ÆrČ ŊK âxF5AWÔ{ŌŊx&ŨäøD}qpŲ‰ĶēafûØ O/õIéÚÜī3čĀnHh‘ĄBh4Ŗ/5ōÍÂę´n€ÎTŨĢq(đ˙#%éNĀĻØđ.Dŋh×aF5?Š9ƒĶ”vņs6m˛ō˙ë߉ŊƧėķ5PÅŲ™—Š­0ÖË÷HÍG#ē†‰˛8āÃĩŊŠhžZ‘<iglWĸcl‹•ŲøEE'Ūĸá›o˜]ŗ([n]ow0ēzäŌīe‡ŧHô,‹kģĀ OqĪøLû@h?tˇ2CložJæíĀbwf~v>
đ%°ßŅõ"“đŗ7%ąÉ/Xĩ„Č
+dũĢˆÁõ•	ō"qŦ!)Ŧ(¸Ųōc—ÉÛĒĒeŠŠ2Ž>uĻL[ˆ 3Į–`Ąé­RčDł^§„™fĸg‘W–W~
k-w÷ģK㊭Įˇ…˛Ca9ˆp6V;°5<X™Ŧ.5BV/`‹^ķG!peĒ™ŖŽ.m ūØ/ÉiP„:ŧķSQÂq|ŋđV°ëķd[ŽÜ2¸í|*aĨBääuÚé/NoŒ%ÎÄKĖ# !?, õôd!Ũu‚ņwō@ڗúH€Čkø­ũ•!}ÅņDëÔülŨ&mrUW[mbœß(XP‡ŠSŋ}9ÔIg´F Mđ ”ŲûĨŲqT§ŋ“mâíčWŒ),‘‡Û"ųƒæÃBĮ“Ŋ´š"ƒw2FB0ĄĖO§âyvâĀË7^ƒËá
Ēʅŧđ÷Á¨æs—žÁ×áøW!nZX<Xvˇy,„JĨ]Â9˜úR‘ķ1Gö‘ČĶŗTŠĖpÔûJmLVH+€Ā×´‚¯Ũ-IļS¸åũQx¤;gŽĖfŊįL”uaƒ§cCfÜŖ‰ZŲLJ_dC<šŊ`Ą¯đNYõoHŊl"ĻãÂÅĄŧāLM/šæwÚ(ķ0¨~{
+ņ’[ĻFøiü!’(į֘ .Áë\,J›Žž,ˆũá}‚ĄąęäáŽĩ’Šž˙‚zÅŌpOėņVĀ~ŧL	kĒŪ&ŠīHã(¯:+§ģęBŦFiš˜øšîÎ/Ō!Ÿ¨ŸŊ2ž*WlqAúFŽV61{f*ā‰Ųß}üäÎķOwDĀĢXJČ0Αsr1]ŪĄĻīéāRžĄŪ‚Ā >÷EásÄאĄ;ŸŠ­¨Ų	Ģæ:wĄŅyUQŪAÔVâgŨåZ,.åąƒ($Öú7¯˜æȓšvÅôf‡c3ļŠ\DCjú{é^ž‰‹vŠo‰Sv
a˜ąæ>œW`ÅlI0;x…0+ëÛÃ<ŧu°ĸ¨”3YĶŗHąÔŋy\…úČ
ĸĢEÕ
+Ę}æmėo
°ķ4-Š+c&É3	`ļ¯X‰syVȆ\n@Đ-Îãļ*ŒöČŪŦ;žl‚ÕŌSŲŠÆÁUĶTēĒQđ†ž8u;°GļũōܲbÁ{ņDYöčQĻ$š‹ZS_N\ĢĶüRė8,ĩ¤*įįā˛¸Å–ä<+ŗ_‘­‚Vô×t™æ¯•Ŋŧk˜~ŗ‡õ„ŧ¤I‘ųų98$ F–QA„.ûL¨Âū!—Ļ5įZŒa=!m ŊVģ
§cJ,-ŋbÚS:pԋ)ŸŠÆfAxë
+ęoŗ
+ä7æMA–9Kø‰'
+Ŗĸ}ōŠ
+ufũĖ&Ãī‘‘A¸‡iãģØ Ž€4č/β7zaŋA$žũK_=w‘Š0 Ģuˇ
€õÍĀĢąŖ/“}B1ã
‹Í1뎊kf‹*ĩ­Ãœ’	g[iBäiŲ;KąVw
˜ÜÛíŽĪ\†iüÜ~ĘīpžĢč˙dÉÖ1Ūíį&Ļ ;šÉy'hšąŋô	‰ßîBābÁČã^_ēX'	 ËN×ø–‹9^š0VuL5–nĶĀ\ŗ;ŅUŜ̀uT
¯oŋĮĄ>[^|>”6\ęŸæí‡L3ÚjK
+ÔXząDŨ˙P<–:'Ã˛ŦĶhÉibJXíîßÁIo6Q_ÜR`˙ĻŽ@e‚ČÜeŊđ
+ R#,A¤ŒåÕĸōä7Õ4=Ų)hņēÄŌŪ|wč"6Ī$é	ŊHÎbI•Ø+Ķ¸ä–āČüĸdOJ•!Č>oø1}cĮúôd͌ĸąšÕ=‰bH‰¸\âŋŊ¤RŦ
1°ė™Cø``“ÁZū`•’—›
]\u˜ũvE:NüUV]Íķ%iëšĮN¤”nūsi™ébĐgŽ•|e#šÕĪH0k74æLUë36¨ `0û¤#\3Ôũr~2Ķ˛Ę
Š\ŠaīûÄ]Č'WĻøųgĨäE}K@´™JŲdBũTG×+Ę]q?wLļ(.búE,D–ĸÎĢ‡–6”ņˆĒ3Õ{ĢÎW>›Ŗ§Ģ	ŨGŽipËŽËŅ7SCqö}ß+"Üla˙ĐÍBĸÆę9'´˛
c› RHTŖi#´ây¨ĄočpąL`×Üwž<†saĘM{˜ŸLLŲkŪ24cxųø"Ide”1+jå*LB›Ļ†’.ۈmĒ4-<Må>)訡ÅéŽ1}Žzt	†Å´k-ņä)š.pĸDŒJˆNîÂfĄ  J†"ߜúĘ{#]ŲĖ)˛­!^ÕŦžĨ~Ę[%ēAÕ7ĨT­^ëhé1€ĨÚĮ/‡ë`R‘âØ!,x*-vŦcÖŲKOféÍÉÁi’x€„üÕøôn=6ú  gN‹Ë´GĨp……)âz}ŨyĖj.{˜lFČ_tÆÛ¸ũDŧGd.ČūŅŅF	DԍĮsų Æ¸!iÉh¸šōˆgŸËÆą†|BŒdĐBx“ųáĩŅ+ĘÃķVûŖRXáĪÕÁdikųå<$,wēÕüÍ0}ōĀC6B>Iž^îPNQd’ŪāȅĖŠ @%Ŧ…vw˙L†ō­ų›tšÆ2¯›cđ;ԕįÃæ€ûA#øŋ[å‡R"@ß}ĩú?MŠ‡ōēT,Ŧ’éķ c âMfBĀ¨ŠkėÁųŠū°¯”ĒYۜ„TĻ픑úëXądaÔē’E˛’ĸ]=Ĩ_˛xäEÖbŽ!KÁhÎ0ļ6×GIį—’Ē€;,
¯ŅÏÅČ]ŗé/ŠL]˙¸kÜÁöųx7ęĻÛ`~Ÿ\‰ÂizMˆĶTxWAŋĖÖT)€!ÍĮĻŨJ`DOw„}ÔDęR ,kę„*…tøģī"NÔ%bēI‰CÆKĐ':ļģ	zúË÷ė`Î7Đŋˆĸ7ŧžÉ`ņö"ŒÚU˙ūm€§ŋ;¨öŽ	Ąsŋ_˜ã(>đ¤Ĩ `zŖ‡÷šĸĸũĒIœIŋ9T,wH¸k°ôĘn.%o4$ûŒNNDĻ߀w9|z–ĪŲÁ3$ĖUŋ­‚JX—i
+@íYų‹TnšÁEjˆƒČ
1ûŌáDÚROĆ\r
—;KtÛAK(pā°G.˙Ččā{z€¨]TÔō[›Đ)8Öĩ@fN!ė:øu)HÖŖ()đšûēō™DüĐØæJ~ VZ2Ûé<@bí%įS"…Ģ(jL—āqp>đLĀjyČ%ĐĒ*ƒ’¸3pcúYv*M˙‚ļôĸ%cx9ŽŠ^9&‹iŅųT`•w‚1};FŧŸËįĄ¤õ`Õ?Måžąī€‹“ƒÖx“•ržK	•YfnĘGd

);u?ņ`Ihp˛õ@Œ*ĨĶ8ųoI	¤%6-€VVģ9†ûHŽrø5ō˛hΗÄēf>]MŌ€ûp,§õ[¨
2^ˇ)ZŊr­¯"b@ņ$	ÄO’&¨+ČNÛJĶŪ‘›EWFiČ+ĒÜů0^°øŽ
+ƒ‡%´\K”o“šYäV~lđšĨ&ŸîâŌ"áû[Œ
+ĸļĮķ<ˆ0
‡o\H'[bRĻČ%
ÍšL˜.Õ0O_—Žëģđßŧ\–Íû~"ëé—ōxô*ƒ˛GBäŪņÉK4fĸōĀYÂüÔŨĸŋ0ø9ĖcÅ2›3Ą˜‡ųs1NËĨ$čˆÆnĮŦŋĒ ‘?„ĖÆō|å)
Ļ@ík˜ĶÃc	ÁbLžúyÁĀšĀ^ ÁæaÅÔɘuĖ›ō&4cä§v51

ˆ3ˆÚŸŋĘ‹ø6wl éā
mÆ|SŪ]Mh_‚{541ąú—ôŒų•ŠTĐĪˆbÜaؘĀ4xũÍ3Õ>4Ŗ6
Ŗɕ÷ˆ4šÃ‘›•&ŊI¨2Ņ4+ö4Čų5jwOÍ~ŦFFwqSÖ‰ÁĒ´æŧšFĐäkÎĻAÖ›c‰m׹1<î1ŋl”ÕUÚ°%Ļ‚=ĩŠū‚T<!ŠŨ‡–‚Č>3Č.RrˇxjúGPŠEŊ‡Eæ/mäÍúĶĻ`ž„iszgšĘŲĩ‰×/˜Z‰eų-Õ2?Ii%MĀ(īHÔ2ų¤hč,°•JŒ—6kI.lbŊYÛ4ŋDá¸$iŠH{˙ÜČzo‚œ1Í-Ŋa˜ģƒ~ЂlōSÄØö¸HÖžŨE#65ŽÍgz™f<–ŨR¨\O€Õ˙+û)ü’Ų>÷ĸŲÆËŊybÉxXb=eœTÖ`	ÎŌ™¯Ē;nėÁ&€’+q‹ĩČĖ$'×Øm#O{š†¯-&ļ#SģC´đQoįĸręÁ”Yv0~ŌÛM</GÛ÷NäkŽã[>č`t—)0MÛÅˑŽX?š
+Žđ6ĩˇ(_)œŽ]	ĻgŲSģ`įÃŅ!۝LLžF>á턗âAĩ¤S.°BŸˇrč[ĀãɔŋŦ­÷tü7‹æúßvĩ­„ø¸á‰*6˙‘¤DųzfģĄŌb=”4ēëŖvōĨîĩ8ļ7îûäĩ´M)?ËÉF‹áʞe‰ûaP¨*.‘*ykŦŅi~BVö°[Š3™ƒūq‹5ãlmėŖÎøˆų
ũŠ˙ëg
öĘ
Ŗļŗų)ÔcĐ@y™pTX?c\NEfģɎŊˆT’†ÅËOŽ"
JŧÚÖõ™’ĩŊękĘÕę6–ne§
$@YjxĄhđ}Ō&iāԗ'ļŧ€œŋ^ã1T–’ŖPÎ;B|úæŊ¯ž,ėû÷ã?
´ĢTz
+_ú‹{î^äe˜C{(ŧéĖ>
+
r%ĘY†IÄnˇģĒÜ2iŽįQ&Ž,ë3ŠÅļˇ?>XčÂbĐj+˙/Ã(s:ŧõÃĢ1ÎAÉ­č¤p‰hâ.7t	ŅEŅŅ˜ÕɜWVĘR9°°ŽūiNŗs˛Ĩ
+bmžĻ	;zŌÎ~¯E¤ļ›Ãŗ’aĶe§ÁČÚ6¯CpįIEíßAQÜ9õÂVŦâŖ.˙¸
iô˙­Š“'…øp•>˜íœÆĘŠ¤I}ōĐnDCĩŠcŖĖ‘ĶREÈčH´0qÃ3ãŦšķWÄŠŦŲ0zåØ[āTp[(÷' Đŧüã¤ėë‰đ:’ŦØ[ƒš_ˇĸpį¨žŧxĒŨ€r¤ÎyŅ}á§VD¸ĘrœÜ¨ĨáOY ŲÂ+ČŦ-žčĩQA’G\LĪõÛŲM“Ķ0‰žÄļX0=Ô#DríÎÂ
+<ėd{`>Šš!Փ[¨o´ũyQl"ˍĖ¤Ėč(›;°%œâ1h;ô7%=8˜LA)n*~AŠÄ­‹>ĢʡtŨĻášiˇIagë÷ōŠa‘ĀRūkŸēöÆnûŽŽ~3Šyũ˜ÚĨ>€ĸ*
‰ë)ōÉ?mˇzđšüŸŽĖ"-¤‡ÍU
+…föāû3hŋ!i< 1ė­ĸk‚*ņ6âh8r€USĐŗđ€ŠŽĮ˜ņ)DwŒŨmG	T¸SģQpg9‘@ÔBú‰‚ Ē„
ØŦŗ‚UĢäÆQ$“2ĸŋĪ=^QKpéB-šCL2-K<
CL“ÃĒeu
+ŽÛa´0\ĨÉu<Q$XZ/åP{ŖõA_5!h]K…îXĘ<
†ą˛QÄĶ<4˜##ŒŽÕD‰{dTĐK:-ÚöÂ,¯ĸJį	dĸĶ,Ez™'’`@a{&ĒD^	¤D:üđäOāŊ𤋨#Vĸ[…MƒčZ¤ î‡úh
+=t
+GmÚĘ*…CzĩBâŨ3ÄĨW8*†ôŒ…
+^ˆÕgáĐ,ä[بBG{öTŖ(T9\`ÂŒą‹ŽŲŨ!$G\Xā5`—KŒaPˆæM ņR‚3Ž ŲĮ觰š%l2NLVZPr9ō|áÂĻ›
ķúgš9ûĶœā‚ėãĪˆyíįüˇ ~a-rcĐ-Vx–
+n
+N!Đ'•éīĶÜJŧ:
+ō’Äĩ˙Ēü:āLũŠŪęZļQÅž=§fČ>gŽL<W]€&
ÕÎDbĻ%’}éĖŌ”¤ÄŦq{\&K6Žkļk ^N”­Gs?\AšW‰ļøŅĄÛ^&­įAėĸõď|3.Ņ¨)-§Vuā9‚8ĪĪČāŗÆeeŒk)"…­ę•Vp”p&ĘDZOÉĨ
1‡ÆIĐ­ĩn­PĢ„ėũŽ—ķfPOh€gÖC öö2ëGyí9]"Uęé
ēqXĸw5Ė
d8GŦgĶŗ Ģ ›§gŖhpO=Ēˆ&ŦŸčyÖ1z^œLÚ˛*=jøX-lxZhAyžō`‹öž€Ņž‡ŽėŌ“zžqčĄ7UaĨįyPØŪ\
úžGīŊ…Ânķ÷<,zäƧY*Hķyž-4ä;ąlŅ‹äQn=<4Dĸ;Ąčįׇ‡Ņ#úÁ­/j["'<x-y2V0đŖĮ
ņthŠšĪķŪ’Rhã[ķėŲšĒ“b0Q+éG=iđDV†ÃųŸ:äŽūîPĮHåXƒņīĖT„_õČk¤Ŋ#2ÛĨ~ĘĀąãŪî(•ĘžZrįۑ‘vq;)ģ0d‘vܗEˆT†›@=M‡ú2Mü¨^ũdЎˇÜĒړī0fĘn&aŗs“ Ņwå!PcšGĖŠa'djų#>-^ĀÕ$%k8ÆŋŽût’žA{ģøĩ3§āÔMËn&ÎH†xKĶęb˛˜!†ØšLCŌˆf—I_†	-(–včĶVËüĖö.Įĸ—ņv1­7s‡+ߒīģųŧtIŽÉ|ˆPvĀ˜ëąm…ˆLUĮá>eĮSmĀ‚UĮk xT>6ŽŌVŒÁŌËw
āōo€ÅJŸ3Ķ>j‰%Ō–ب<ķ	sÁÃXe&;ƒ†Ų8ŊČæhČUŠ"ÂŧbtâQw’hōĸÁôŗDA‚ąŠ.qt
 I
įũb‹ĮķUמ„2,ČäË{~ŽíĨũE]K9ŅPœ¸Ņ	,”Ēy;H]L>œ=p¤ĨhĒŒ›/8xŧYĀÎz)´cÛėē`Û?aܧŸēĄĐĨhļdS)z€{,H$H+  hĢˆ|
+ËĨ>NÎÆ}Æ­ĸÆķzÂeõŋZüÔ¯ļ§{x*„§zÁ@‚ŅFéÕ8%ĒĮ-Níōņ‡-ą^9øͲaę#|	ʅÔ4ŲžÉ¯÷ģE%M‘0Xé}.’\]ßq%0Ē˜hzŧĐw¤bGĸĸZØĪãUOŖՋŠM ímŗĢ[Ŧđė?ŅL4œģcās@ĨpfđYå8xÕú$KwŌ4ĩI|Ģ†6ŦW.“9d.Œ‚ÉRRs #UČ;˛ųã[•-z%8LV°ˇōRĪŅÚĪA$$(ÎŋЍÅ}đáĀD~H-uՃ˛™ëV
Ķ‰Îß'˜ĸY>ŊĘāˇQšķŖ€
+|d4‡œŋ(ŦČĄü2UČ9)Ī9Ŧ§G‘V4B‡*!B./CŌ‘Ŋ	I<,`Dé)Õ`œV(›9ŦøĖ§
+Ļ‡,ņúgolôĸ
q§ø˙WĸCšĐ–Å‘ãP˜YūÎĒÍמLk€qÍĀžēäũ’	ēŒ–cŠœö¯Ą•D2Āċę1š|ËÜ0ôËõa™ŸŅ:=Ė/I›õîæĮü<„Ā`!¯&Lđ°ęAĶ@JˇŋāÆ:r|níKĢ×f`¯ŋSË>ɓ䍈fŸ
<IVCr! ˜ĸ=œų™sī{Éz	zøĀPį%:AÃYÚW”n¨=Ų	ŗ@âEãP+Ŧ€ŋ/S¤@ķGɈŦų™×o"ä[Áu(õéiÚ5"‘ĩąūsș Nīŧ*Æ
íŸø`˙ØlžĘ˛ŽštĢᕒ#ČÔø
RCEäʘ%á@!öđøĒŅ2˛ģ]Ŗ§26(9vÉa…ûˇųÍL+Ģ›=FNšŠčbí{āfąO–K
+Ķ}ÁĶmĀ¨Ô›Ũ.ņL”M>ļÖŊđę–SėĐ(CīDąƒû)WõK+•4vÄ)LåĢ‹‡¸kõ“؃2PpÃŊķÖ%G
+Žeˆô0¨šļ•FáŸLį˛ž“ŨdB õŽÛQ+í¯Ö'¨bF$no­SWSĮōØøhAˆZøUģ­ŗˆUōs§ˇEĪzÎkI¤Ā‚YÅ;iå%/2)+&
+;}#§ĸ“ōŲ*g!/ŠčK6+N~P DXâf~Ãu
DáÁœ¸ĖŒ€FiRX¨ø(p¸k;"5}9éO Pn’ŋ.—ë.4™‘ ā÷k¨&čÃįˇōŅ\Ō+LÉÆVU&Ví.Ō-žōš4Z‘˙N]Ÿw–A 9‚Û_C™Ī$,Č%käZ‹ā븇Æ“Š<8FGWU.Ák´2pĀMhĪ5;ÉûÍÛ†q)ĩöE‡…ˇpM
+ã‡˙‚Dŋ¸WâŲĩzį†u?Ļ0•27
+ÉhEL°“šĄ—AA7M¸…Į>áVéĻ@ÛX(’O˛ŌŲOa	ĐīîBø	t[ÄŖ#ŗQy:‚*_l㠅Ã#S¸ëhū\|U-ƒ:€QbIûßG!i†ÜhĶŦƒ˙Øđ•#ˆč3Ņ­%XĐu‡'ąŽãRÛ¨dzÄđąÍ›\‹ôL	R…—”pI °ˇ°@‰)ˇ¤˛PĶE@īL¸†3IĶĄ¨É“ŦÛ?OŒ†€9ė&˜õ ßäNį5xŪCĖĢ͉9ā%52ĩË!õpĪX€,Ŗn\ū­ĩ ‚ėВsēKĀ¤)üķÄ)Ą´]ŨH¸ž
g{đģ	Cę÷í”âå×'NpyūĀØōo_D:ŠĄU¤Đä.}—ĀCĖl'
īøĨŪëĩ>î´Ä€4eAæžHđ'#,Å
+HŽ)§™] _˛Š X˜?3ÁĮĢ]_ˆ^V‚ŋCžFZÜ3J’LDā/Ž4ho”sūŲŽŽû×Îŧ@Ųąz^ė}Ŗf‘ĻGz–+ĶŊŪ5a7K×æƒĨ_ƒáéÔ(˙˜‚p•”ØßJę¤âĪMd6$3›tū¯X–éD’ '2ŸWģÜ"h	TŌ“"[uęâČ´
ŋõBÉ=ĢŲŽ+é,
Ũ›CŪë”`ZL=‹-Ŋˆš
>×a4ûfVš‚%0Vü7
ņē8(aķ¨Ø ­mÔۏž[Ú?yK]͖ȉ”Jûs[Ōļcé
+Ûn;ÖŅ
ŠēÜ[°	Yēü–čā~ũujŧE`,Ē]ãÉDéáęBWW9û¤?›\ΰr{…ā:ČglW(VĶĖÚ~Kë­Ęđ;DæĒU2—ĀŸ˛˜ë0ĶlŌ‡vÕŨ>’!`V.Ëņvä7SˇH"K*Į#JVvFöôk¨?ĩËÄ4¯—VĖc­I˜@Å})ÅaLéŪZJ+ZGŠĄĸ]Ščä’ú§Š]
+PŸĘšÃFUC-§’kQ7hæiD)l”pˇ†ZÍgQs„rFDläHP•G•oęŽî“ 
ŽļÜĀ’lVŧ‚|å)GˇÂŠŌiRĶyZINˆûMĶN“Č°Ņûg›ZŽhMė“&x(‹3å`Úgšą—äeM&†J—ŠīDŠiˇPȎô˜z 2’/^"fÍ[ŅF+˛Ôe+ũ!QÜ’ŽK
+˜”v;˜É	J­Ũ¤s2œØˆæ] {/Q’drÑôéD*Ú3Ė’G
ąü´Í’‹•å–FŸ,âã•KĖ 2GâŅ*Å
ÉfĄF˛b-Ŗå¤S›IŊw}JaĀxĐJâU)ÄŊGŠ ]Û{ŦtÕohÉ‹f™ôjt	]<3€č,ŸH,õË(ŠaRe†*ø`§ĄCȝō	ģ()ü|üį€Āū?ŠčU˙˙vÜ.Š	üš“<6ËĒ
|>0ļôČĸ0æĪ;`Ŋä{ü8ūä,(Đ —‚Ōš–Â:FŧĘĐF-ŗ;˙%fŅb<Öģ“‹ŋO€Kō…Ž˙¯8ķâāFNŨūĶNā䄄zA em¯	^î1æˆ+Ļp
qw>ŽnÉ’ņŲSŽĪ–	¨ĩ>83Ā‹s*$Ļ€*Tûųwv]oG˜˛GAJ+Ķ[tīåTT…l͓–}¤l%<|§SĮŸ>Ēˇėb…ļ÷*_o'R!߀ŧöø+Ž-ŒÅŌP… ŗRj 8ˆeÅG.ŊÕŖË-pnnšôX'CƒŌ-o[o'øī†$S߸XŪJ1ōÖr•—ŧ•\8™~
+á”.W-.ÜĻÜVōÎŨfĶ'¯…GNņÛ%˜Ā‹%o{,Ŋka{—|ųCšŊË­s'ŊrŅĶ‹ĄŽÚ(5Oī]-ÂĶôbmĘ
NäŦŪčôN&ø‚ZéíkIŌí›ötÄĸjŨ{æ|l/–
ų
+
ĸÛ^%íÅļëínUˆ
+9:í­Ę^-ÛáŅļĒĀėEV_’áWˇũÂ×ØAaoCu9Ŋ•€<čĢؗ˛Bwe"ĮįĀČĸ§vŨF
ÔģúÍ-ŋO‡‚šĻOyzAĪæ;v)ŪP<gí&ŽJz\”BĀëĩʐņĨāķ^JĀˇm˙Š,G`Ęq“ŲĶPŊŒdųTgŖ¯12‡PÖ§eq|l1°€ķßNĮ抒 ¤n°'÷ū'
+˙#žgv$ÃĻ Læ9­ąÉ^DÆņĢ‚‰Ē}ĢÄ
I0Q’Ã'*eéÄĶQ
+Lč“ÄɀĢÜŧXŪŲČDBø¸–MĪûeŋųįĮ怟YŦ‡ô)€0Yş”BŦĄü¤~ĢįkÕ+Äh,jé5˛ų<l¤5ŠƒpI‹+Áqf€8hW•‹Fá=Ų/†Hmi[ÂÆTŨ,F –Í^0ŋWķÅ)ĩ䗖Ŋw&ŅŽļ
…Ņgē„!hãžUΜ‹y_9gŽTŅĐkf@b<¤7øüųs˙Yqną˛x3RõE6î-×KŅqõc€—”āCų›˛ēÖ<e\]ŸÁąd&$ņd  €†“
+ļĸrÁ¨$z˛H†
OŋŌÚĩĩ††nnLĻč,#Æ,> _×ĒRčXė=ļ‰ĨË;ā(}šĀŖÅÖ]ē2ø•‹CiN’áܛąGËū¯FĀ|ƁÔũYÍē
+F+6îaÆ0Ûŧ–C§¤Í[ØTŊ%fîŋRžĪą•”_~îŪHųoá-˙§éM0]~`
+cī¤„Kũܤē÷äÕŧĐ”Ģė‰ pŦ-Ųâ&’ƒa?@ŒŨŒđš}Úĸ–=
õ`€*ōāú˙;ééú ›~˛‘ōFœŲ(	Ä/Ņ7fē{ŅkĖÂmPŅ60‰vœM¸„Ë%æ~™--
Áū[  HeÔą‰jˆ.zŠ0Ú|wh„×æĢžvõ$„ōŖ–h ŠšV”=Ķ;R3–7Ļ„96ĀŦ‘ųŸŅ?æJ”7´2oĶI'Fa‰)Ēd~–ī•!(˛Ž¨Áäy2VųŊ‹Žč_e:ŪJņTŪĪĄ­ĒČ
+ËĻŨ ЋÕ3Œ…v ķÕ…}“žöīI<˜ęžĀQ’ũ9}4΅Û?Ēõ׀˛Ņ.	Ÿ€-OCį­AJTŲš9_æģ­îÂė‰ŦÄ-ÁõÍ]+Ļ ųŗL°rīœ%|$ZîīÛĘ˙b9Ŋ¯ĶȸX&聊Ļ@ƒd-ĸû‹PŌ+LČdŨŊˆđeDŠęe9â_ņ×iŠˆo*”*jhũO+?Ōž×Ŧ)û˛’0AņO2C‡˙•¨Ä$>ÃĒPļĢ¤#­BˆOĸĸÁļ´7ä:AJŖ‡Ĩ‘Šˇqv!ĸzÆ4ôâ™R&uDn­xœÁ`žZõ†T+ÜĨčäéČ&:FHö–ĐËė…!
lŧ°ßC°h™nM QõâžP›Dŗ”t4’,ÉøÂeB‘đ[	jŋā“¸Žfd"pĐ6™™|eĻáņIv´oũlē?âāđŌyJĄŋJĩˆ+ˇj3‘ˇwūĻLŗXÂ2+ßĮZúXÎecÁwa2¯=s‚¯/Á
+ûäĶ¨ŽŽ/{/ô
+ĶՄĀ!¨Ŗn#$‹ą–n z,¨,dōŠcÂȐ9ĩŠ¨xģā:Ėú/†ˆWnŌPC,	Y LŠôx’ĄĀ{uč…ī˜ÁÄ#Ķ;Žpšõ$ŋ{ķāzĻHŠũnGH`†6wc^Ö
“P$ L(
¤‰œža÷PéaW›ąy&Ÿŋná7úēŅ|køÁnĘcRůsôÍÉã=4rõĖŌqxŨ3H…´ŽzvwË~ßæÕßDãS2§Ö˛!Ÿ5EKũ=IŅūûԌA4Ą„3‰eĀ3#Öá•ļ&ĀˇËהBŪ}ŗŠb^3qŸūķÁ–'A00‰Ոlá×Ô
Ęzå/¯Huíj/6ú
+ÜŋÕü^Ō“ÕĩÛZ׋)_=ÜûˇûæR˙ÎūH‰n0B?pŒMZ_XQĻņžRĒy#ÕGŋ°6@4)ūiēUŌ]iØ3m["ķ´-2ëís”ŦK§°ũo6÷‡ĩ[Ą‡ę1æ›cUKlFÁHáy‚Āƒ62ˇšs‚íø‚Mí`ŋjō Q„Râ”3úĢ\)=J$Ļė|Ü(Dü¨Uõ
e%éđ’ŧ×ÔÃú"¯ČŽį
äUâęņ
+ÜÆJ=ŽU‹ŋü6•€Ĩ2}î¯S};ŸrŨE{į4öyõ>cDÍčd:īĮģĶ`åxnиô`īᅍCT…›z8ū‚‡vßkTņ,Y	ú|ķ›Ąf§Qđ
`IdĀÂįL‹FķŦ!ÜÅJBÕįÁ*ųˆ;ÎĶ]ķ„0>Å$ˇ5ķdĪÅŋƒĖ#+đŸ‘-faLŌ†~ā	Ô2̓đw1S=ņLe
+éÂâC<CjŸ0Z@/xAÃņĨČ Ũ“hŗNŲĩŅąÚ”ū0mæ
+­¤ŸMãH[ã›
+Μ÷…h(Ą´pxģISĻåvŧüRuBĨr\!ŋ›WMō‘gCár9CEÎ8<}2ëĄDē4ÅwöŪ3Ĩ¨ŽģâI_ŨĖâ`ŽV“îîÕčĘ^ŪūˆĨ+‘ZKá0ĩÂĖÁD}ŸZĘh"w’/41ixWšhUh"­ˇĸjũåĒ%–øŽõF™¯y
'n@”_m˙×—ØžN¤OŠ Z}ß"#9ÆAÍö‡A9(…ĄīnN(kĸE 5."_ƒzCCO
į/pôi&’ГRũĖSCqŅö—´3lap¨ŨRv)œÚĄīĄ°’"ĀŸãÂÄLEŒÔJ,§)â‡úœžųš ōbÔ)“_û´iXû\g2ņ™77WiÚ8ūˆė!Dãī{mIü¤&éáw‚ŗ˜EëbO#Ÿû•bĘÍđ,#—Ģ‘•KôäÕeˇ*5æâŲģqēøį„	ŨEÎ\f™‰!ĸŅÃIÛšēÄgĶ“§ âF°nSL;ë^'sá)ŧŠ‘[jŊ|üĖØ?õԔ´E\Žšr
¤7G’B“–”G•;)Ž´	æYú;X)8+ÔÔ4nJ´ŽŊIbâÂÂ5§4{u+ŋ•Zˇ÷pZS+Š°ŋZĨan\$˙<Tû:Cže`yģã{?ģkAû"!:€˙ŒŋÃáoˇ˛pÉa˙d(_²K(b™1âží9LŨÄä	S*ųMWp––E„Â×ĨeuĨģD]ģ´Ļ›ŽMWãčâ÷ųÎ:š+Ëꂗ:0ąæčûĨô^YÂįgŒtom?UŊ‹pōĻŽģh!kŅa=	æ)ĩÃŸØ[ŋņ:

+Ų€šÍ{Ȩ.´ĩb8ĸJā¸_Âŗ
+‘ÖŲ	Ēm2ÎĨe\[˜ŠÔĢ.„j7wvQņ؝aŖčš1+f‚!0Éė7DĶČaHK@tÎĖv‹K[ŧōcá|HŨņVzB68:6ž™ąA8,6D~Ę<;%y‡ĸ9Ĩ˛ã¤hĒŧ'ŒUŅŸ^ÁE˙č;‚R5ŽŲĘmđ•
+Ë—uœeŦį5ėܜ=Ÿ1%Āä>yÉĸyŨĸ\2\N˙č
>Ēp/
+÷ZxĐz—Më“oŊ›×‹ŋfŒVŲā%Šöéé`| ~4Į8ŪŸÔ¸Å<šS ˆžĐsDKBtUĻŅ!čûq™ėkBņOĖšŋ
+˜+¤ōÁkō.šVŌ=؃¤ü9VÖ­€´Lûi\b‹đ‹˜ķÃÛú˛ōNö‰¯ Ą<Jî˜AšÃÁPĮnōI—%Č^×é:ט
+‚­ ‹Õ\žĻŪDė^úöÅ{Z´™Ĩ§ö`ŋÚ@*°C<>†"}Šzbq 9€ÕŽ3âŸ`;MØ'æՄĖĮy™YĘKbĝ_į
)ŌōĢēųUØ>MLsC˛ėmųPÆYÅPđ5_ORá‡cßĸÆĻč¨Xąąd ÆdŊfęīĻQˇ¸9˜°ZōĨYō]‘´ĐkîÍÍŨĖŒ9Ca^‘i÷€ŖŪĩ?$2íÜ+įÖ%(%;\‘3
+Á$üŧČØÃVōëcē[×åtL-Ũ43ÜxŦ¤fˆĀöÜÕņœSĻĶØ*8#w‰eđŌJėôËKȤ—Îm/™ŲŗoˆhŠîēT-o…yÃHOL¯­Ŋ1SįÁ<5hĸgéŅ‹Â|UfĻ
+Í\5“ÍIG—Œ|ƒ)•ŠIŠKŠ&^í¸ŠL‹Œ
+PڏVå,(>%8ŽŧbWe)¤ņŦA:;=:rŪüĻHö#ZOãĀNŌ#nĶšĶx‹Få†ŋā°Æsĸ˛a
6üŠ0j<BÃ‡
+Ŋ4oUQ'+&0‘Ą†ũâAŠŋáá{=­øūOáŽË™†/Éē†&íD#ˇ˙
+%wvã:–Ŧ„Gv1t˛EīđN{
+¯><øio"šXŦŠ‹:âĢŋFēķĒ1(ę/1rŠtĨ‡Ä_t‘2ž5	¸¨ĸ4×>š‘k<Č:”kˇ‘™-Ae8äR˙
_õ¸ˆÍL9[ŪL[Lî[ŅoĒüIôļ°Šk}ãĀ52ΓĩEįɡČ&QĐoPîOPš™VIĐ
GG+Ÿ&Āi•ús_
Ã#›"'ŋW4"#ÉēŗœžŪā™Ãü8=–ŸÍ4ļX]]Û&ĪāėĒ õR¯Ū2SĩŨMš$;R›D¯ƒÂ<ĩDŽ’BĶĸŧų¨‹]äĄųčđĐæyū¸Î1îéR^…Y(-qDŧ4	ĐŠOîĨũxiŽŠK‘éÂ
+VB
ähŌ84!ÕĪä™đ("qCCŗŊ›ôīĖQ~yæ!R,üˇL,4;õ+g	a…	é~ËJíÆ2MÄ!ĖŠP𩝤•Ž§ŠŖ.Ö,’IĪnđZ“™ĮÎÜS‰œ6ĄENK
yēéAđŽĩSSĄįĢ	Ō,
āģsļ4D
ėÛ6Ëæ¸6ãÁl˜fVÉōõ
)ÖEėĻo vQŨ˙ũ*Ņ_
[ƒJ^’CåŅž‚kĶÄMā\âą
õģhŽ!˧ĖCķ|Yŗ”į|´mã¨ļ
úč_	`$ķ6āšŠ4’”IÉsS ‘=tŽ{I‡ärN•ÛĄ’ØĻÜGSũCļkËÔîf
+”÷"OôU9āÉAoCP—ĪmM‡đ
+5…Š:Ũq⅗Ā ŽU%Ã1ŅŒÂS§QķâQÁc2úŊÄĮ’šL˙LÆÚōķF-Ka†ŖâLV_Š;ŽēJ¯;
+jÖŧ`.<ČNBAt°BĮĒéÎH
‚ŖŒ&wŊ˜;a‰_(˜VeĒ/žîGĄÆ¨äÎ	X%ĸ'	tmŒģ}*ņ¯Š’>ĐGīŗ?W¯4—:Ō:Đ]q’$~ŗ˛ÜˆĢR2$¯ļOVFR	Fągã¤­*=Č$ŗy.‹­	b%ŲobōrÄeģžjEöø(õR	ĻPķã7ûäÕ/‹‘3C-7ˇJBtRgŌÍ@ŗįMĸšáŊŽ­Æ›×e;^YÂ/X§N—1W:JõáÍŽ%ģĒT^ˍž–ŗ¯ŋB
ļģ9pãĐŽádbķįYŽ]ŽÉÍ$Re‘Ķģā|āĖņ­IÍ[[wm
+ˇ´›Ļ”‡7t[Ū„3	™ķÍF(WΚč
+ŽûK<šėŽūZ,âT˛8XßØMū°č
ŠöBDôŠŖIÎ/cšIĒjÜnĖiÛ¤dpēäI¯ AîD÷dƉžëd]ĶO1H	uŠS{ĄÖūܗN‰‡_ĐāŖ0{1áLũDĻä"–øđ,īŊ¨`–rD2ŸqÆŪeæė^qjđ
+ûh0œ‚7ü’&¯Ä›[d‹Ne‘Ũ6ŋŽ•7#Fl’u—įŖnš§ķÉmt|p9bĶįiĖĩ
+nüc=VD"MŒę{•Ī9ŽvScĮáWyQZÛü
ÁGš‚KB4~JX0]˛Mķ
+đ„Æ7ŪŒzĪYLÁ@V1';
+Û<1á(KŪ*U›¤Į­@Æd:ébzI
„'áã¸1–ē-¤Ęŗ!,ĸęKUg$Å5˜ĻąÚ#k"g'öƒyg(Lf? Ĩ^eđD~ŨĄf&õųŸŽ¸ÂŖ~?Á˜üPDŽŽoÛ_Õøė#k$BŅŋŠ@ŌP4č /~ŠĨ
ēR}ŨÅ+ˆˆœpÂ\L2`GSąuŽSr„AFĢÜWmĐėû|ĸíØ°?
sؐQgĘ;ŦˆmŅ:ßMl95;ŠęIŌ@<mTq†D~Ccˆĸ1H0å<­ûdL{.Mbø}ĐģDH2‚â{ĮļYãQŋ°ĘßDx'˜Ũ‡>øčoĪ,,IP),Ö0}e-PÂ"m!A‰č¨ßzž' ŖîœŧŦĐābęM=ÄNIŅÚn;ãJZ~ˆ`3Âyœ….h1‘ÕĄ-+_Īč{DÚNŗ1Î9™Ũ_ėpqŖÔĨíŅŪž€}30"2äTöC^O‚0…|Ô–ĩÆŪ|:ÔÖVl6Íu“4—#	”'¸…ēyĢO\™qQ$+¨ûŖédsĀ ÚŪŒŽØĄũįī÷	iÛÛ¤qėŦ4æĒĖŒķ Įp#¸1"Y†•˜Ąu§BLHč%č_LŖ!Ė~ķ™B›ÅôžOSúU(É
+"˙_ĶtuķrÅÁ;Ī\)]ĸ&x~ĩBm]Fc4ƒÛmtq,ĮÜ@ÕŨ`đ“YĒe
đžĀL-Ë
+Nƒ¸
Й'4˙ !×đ’„ŒŲÔqĨ
‰ŸJhęáŗ\HÃmÁā‚AˆŪ ÁĮũM%LáãīRdi‚ÄvĄŋdž,2ąQ÷5>NŊÂæŒ*yšĢ×Ė™FĮFŋ9Āē_ŽŽ˜Xûrđ­āÍf1äĸ‹ļD/wa^’Įp‰Ÿ=—=1… /{KsŦęĪĘ#€` ļ˙—,éôŸ´ĩBß\Is+ŸĘ¯)Øö˨Üũe`â!ųûĨōkĪša`
S넊¸ÂØ0ĖTjĩUØ8ŅĸŒAûõMAųA=1+/ÃFžz‡_E|xÚū}8}Ķû
+ŧ_‰ŨŅũ´ÜũbqˇŋÎÕBöôJ}ēŖ}œPX	‘}ŽÄ>H°OöúĖ"“v!×nä:”š&k}Á_R+ŌĶĪDLŌ/ÄIõ˛—ŗ×õtŲ‰lņX2í˙—ßdņĀQvˆĄ÷œWōe“ë?"Āā;û;ÔBáw†@í܆ģ‰2Û'L>ÚÍ]ũXĀ^W˙čönjŦ! Ļ:sŨŪ.…AÎõ\§Ãá0äŌ+a&ú­‹
{÷ÜÛCļã‚á˜>,ŖÄčT˙ЅĐņĒB/ŲŊvž2uˇ}^QŽÔķāîÎNŸįs#úŠ”ēDP×ÔęëëŲzЗ\ĐU(öČ)1
.wL˙
ˆ‰ˆbâđíŋ{įgŠSuÆOĘ{€ģĨ2Âēí6í¨ĩ*âuC€—Ŋļ\
+…e§ĢoßMH\ŋŽw˛ĘZ	åƒØĪöú´ÃĢ”ú–E}	M+K=ĸū¨õ—k9 õ\W_Wõ>Đ%ÅŲrxąīë1!­?—ƒ
+䆉Ü7ĩ’cŽ˜°•Œëũ÷ŋCų÷	Š‡5}ę4DŸ˙čkũ?Ŋånuõ˛:r\œ,ėԁ!ų;AčÄÔ
AîĪ
uôŽgüĐ˜­OüŗØŠ6/Ķô.™^]†ŋ49Šdĩ,ÜU
g
Ŧ/ė˸~!B	<Ē&Žšh"
íK^ŖøO“ˆ°I…ųæ{›[Ā˙C;ũ<Ž;ļ×ęŌ§2
΂7îKđ^DQ”bˆ`l:|ė%ņ9‡pGĀXKe…™H/2
đÄīöĨ:
N^Þ|æ°É€ŊŽúô
+>M^OG/¨–<Ū*KÚÕ'íH_qš˙+ÂAX1Ŧ˛čišŽˇ(¤ô´ÁŗZ“Ôōĸ×Í*ëĀœPbĻÉ°¤[×5š×Ī6_
Ų\	ôŠŠūJß]âD}áÅŋ)hÖö€[Ė'‘h~_I_I ŅZWšŽgęo­žŪl5,Йįę+/KĻ€ĻŖô'
J„"@1HR)œŠŗƒ36ŽNčŌUy9ô%žĮņāYŲ>æĐkz€VԆŽ÷¨ÅĄ%N:Æí9Šu#…ļ@č'–æ§ĄkTđá
sņ–%’ĪāŠmÕ Ąŧ F]OĶ~D$.HI!ŋą­f{3÷ŪĐEĨK‘ŽZ„ŋŽ´vĢ]$?Ždƒ{¤Ā)†Ų5SRėĖą …‘Ųš+fõ—ĩš&äVéRŽî‰čŒ˛Ŧ­dD¤É–nz# rŗaļæŠ^pnÉÂĘB¤P8ļĪ ü-¯l[tm„ßūļÃ9¯ŧĒåÉUĩ?VÕŋĒēĀ°”ĒĄĒMÕ¤JMĸĒ#PĩÖS%§šē”4•SU`Š
+(Õ]Råjæ¨DœXZ°ˆĘ‡BeQüķú펏⊙Ÿ Ė„NĄn
+hEÖ&Ā›Hę^É%á,ąũånŧŠîķ`û7SˇŖÚoyáuÆöf}°ā_õ×5ŽĢŋ,øÁéĮ&H×`ũq[‰÷‹]ËĘũŒĪúũfũáBÍ8Í—,ũîĶ÷hԒ-(›ŌgųÆÄÜ_ģČ°ö“Ėnā˛ŽƒC1‰Ē](V€Đ+6GÕ+;-d×&Åe'/Ëąé	ŗdėņŲCÁs\öX˛ë×ėäéhįB›Nm4SĒ31mK—Ņ>Ŋ:uÚ÷ĨĄ]oĮČtŦ’cW7ģĒƒíaG9ļápąaö4ākjxĻëTãēęÃhg…`x‰Á¨tmrH%L^/bāŖŌŌģHd]ßĢ%ÁÅ­¨)#‹2Â'SöS"3™;2€sP”„C9Y9—A9šo5ëVNŸ¸"cDķ_N	Ķ*ƒ9šgķÔ{&ÃxŪĐ<ī'RÄäK‚8UīÃŋ§d	Ē6j¨
+ũ9¯¨”_U…/‹%™•KÛpiŅŸ¨ô‰ZmW’ÖÁH !.ōėEōé™ūČŲ8ę5Tâđ’p ‚ƒpķžođz/Ūā•HVā)ē|–˜WĨ& ›@Á[GDBV"ú&aĒ)ĩēXįĨ E3¤4Ō¤‚)e%~Tņ˜öj“SÚ+”ž3Æav.0ꁕˆĸZŗ€Y„o†oę`sĸ6eE3z4q´|咖…ähr
+&¤$„MĢĮræĄ}ja‰nĩIxâ*‘ę=FA1ŖĀéÁ
+*´Į°eÁŽ
s=_“8åõŒ+‰šy:$¨ēGA`Ŋ`ĩ
+J
+Ē•Üā=á4f¯~5yĀ
4€
Ë-×.“|â1íË+Ŋ•Ļ@ÎG9ÃÉL‹õŊ>ĨMY¨MúčVˆ’Šģë6ĒōK#9‡žã
+N>ø|÷‘'†R‰!Ôū‚iĶž
Ž>0dN×@Q$é@Ŋ0Q1UĻaZú—"„t.ƒ9v\­Ŋ–›ŧÄP,3„Zé-7¤Á“ü’
8
Ôä]Æ(gečW%	ZDŦ&dK“sõōpíGIø…ŗ‹„ÃŨ„ĀÁwŨį߃ˆŋ'á7“o2ËŠLãÔĨūî•f7šū‡ĨūaÃÜbä†zq÷˙öĐF
ĢnÛk[õÚZģŲÔ^îQ•@ģʓYhũ—Ų/˜‘}Nö!xė†Ø¤€'„’Ē_ū¨ŋĪÚÍö¨8C9j9ũŖĻUöŧ=đ;Āūu†5YŽ‚šÁ@RĖŌ'ÂÉKĐQ_!7.îkE_Žąŧ§:§
V3zĩ@Qo͘&L8üW}D)°91˙
Q‹2C	ƒŌ
ũÛTĢ•$č$9ˆvK­ƒDWŦŠ[1Đē &PŗS,U>3ę诈
FfļtÍh¨ž•ĀĢ„u Īa>Ũņ "ˆē­RIWú‚ų§}`k>Ÿũ€’?Qķ“ņnŦ”ĸ+%Û<*6ÁŽąT/Šš 6p?`Ļô•‰đ*Ōˇ.Í 3X2ļŅÄBKē,9tâ
˜Eę]P˜özą3)
ŖWŸK¯äŖp‰–bŽņ„utv@…ŽģBĄ50ĩĘk!ĐãęŗåŲû°>Ä:RÜ.ÚĪSĘ2Ǝ9KWžđ€ÖwjĒ—惗M^WģŽįąņŠYÆ"Ãį>Nˇ9$J^ąO2•,$‘§™tZĩ)Fa‡2-ŽhÔql˜JéXĻĖūü-HwĀŅŪLbÔŲ)$­ĪD1ÆNPĻņP¸øĄ°č”1‡2ÖFPÅ,”
 Ŗƒ–…ævƒ#tPA-o#a@IŋUߚ7 
 Ņ&ŋ¸#ŨĶĒßzmĒâH0ũŠļR]—$_>aRäī*ܔ”(ž‚ {Æ|ŲĀXP>ü_u]GØw$jJa6o˛e
+ŒĖúöPÁÄ'hŦ0eņGŧtų‹į•rš×ĀV[`-E
€vîn<™
ĨŒ§1@/Éi1Cŗ°öąO]77—ŠƒĪįwJŲė)‰ô5t^Ē
ļodoīÉ&ŠšjŖœ
+ų]}SĩŒJė´nŋ˙
C§‘¨’}ȉÜŖSˇÛąŅɈâø÷˛{1HVBŅ•
+)Ɲ
+_QPŊėĻšOPĢŦ)ĘXī•{uĮFī	žēn•<v1ŗ#Ė
ĮĀ:ōP.ÂRyđ¨ÁšpûpõBØƑ`tׄ•tûyLE	žĻšĩ•Ģ(õ‰”ÕlŲ:‘Q(%Â#Ž	)J"×ÖūčK°yØéŽq×
6‡éą„°Ŧ„Ķ;Tŧ‡UyüjčŠ2ĸéÁP,ƒÉUĘZ,VĘP?“ę&›ÕîÉëęüĀJé%ÁGŠÔ­C&`å7ôykœ‚âė¯p$¯Ąƒc-Z1„¸žF>æë c9€Û¨í´"€švyũß
+^VËk×Ŗ?j”đĸ{čÕbíD—˛uōÎ%ģh@ī‡īVPaņļŧä	īÛrõ¤‚īŽĶ‘ā‰ˇŨ8›ĸ–~+ŪĻX
šK
Û-‹rC[ĩČįī{lH3uĐéĸEĘ6c	Oš{û×ËׄĮn‚€ŖĶ	*Œq.)°o-.7§)	Ü	;¨D0ĄKą˛-´ū˛¤ævˇú5ĒĄ""fX)Ō€ĒĒÄnĢ-~õ×ģ¨E5Cwžž>§ÁåĀŋ÷/xÕ>ŗ‘ZԂdŽ!BaßŲŅ†Qīš‘š–ōū0gxA'>#Žâ#ōģ33[Ķ‚!Ā]mĮŦqBÍ_"Ü=DųĮq¤ucPųhsžøMgž°Šj7ž÷Ë{ÜæP“ō9¤m;Ÿ n˛ Į¸GĢT0ā|‰RRGŽŦŖķŲûr”W´ö#4únķMhˇLXPŖ#›‘@øíĸ‚ƒA¨i,ļĩ…6ú§Ú€wu‡ 0ž
]ÔSô3•§IßA}Đ`<(ŋģ„
Q$
xÂĨ%>iˆš;Ė;S1Ø;ŋ;'ķė°”0žn$šVú]éĖ!u€œ@é
ŠÂzr„×aŠ¨ĢKˆŽ¤ZŽ6FoME[Ŗŋ))ÄĶęsËĸĄėacŠ“Ëų›’ļ´aŌŲo˙ûÁ>B–ž„Ķy‘íë\æo†{9\ļ,#‡ö$GŋLĀļ“$ü<}||{‰æ+ĘÕŧY8ÚÍņÂ-`ėšˆ×—œūØŽd,ÆReī,o
+rTft_NŅĢ˜ŪW‚Fō`xc,an¨‰HnX)’Ŋ÷Ė$–QĪįÂŲŸ
+’Ô˙b$ļļ_ģ%z ›T؋$ôŧîĸúyaʤ	ČÄŋˇ?˙Ëlˇė3ä*Đ_8Įpe]EjüIņãÍô¸.`Y|ņŒšFŠZ8e‹?Ķ˜PÕļE,P(ŲļLÕ×Yįé h!Æ<ŗ.Ík_•õk:vÎŗČOēMW—‚XĶáCō`AcZCz#Ĩz-?ūŊÉ$âAE˛]JKÎ[oZ,pîZ<Ū(ۛ¯˜PėÌ|G

ÃļŅüĶc˛‚‘'€™ î†Ķ‹SQOZzžĖˇžYĒ‘
#×Ŧw`z	‘QNmq qØr'˛4Bča$–ā=äVZ ëāXü(ŽļjNw’Ā(K=ĐßD+æūķŌÅļjēë–ŠĐÔ`Kž¸bŖXÖö¸d†]ūž™ØâķöārĪųC0Ãā7¯¯œõÁđŠš@l ĩ!-´˛ķ_ûößxö7ŌČĪĐ3“ŋ‡
B´%žē‰ÚÅķģg™öĀ(€šÉĻpâ"
ī‚ņÄë<„Ō°JKÜIēt­.FB(Ŋ2O€Ī,͞E丨‡!…åk‰ķ/ĸg˙ąēūŠ“âoŠüÍ`<˙ĖÚë,7Đ+ÜšęōęU`MA
+BŌ‚K`hr(į#Ž”I&™’ôųÍĒčRDJĩyŒ"_Œ(Ļ„\†-š*ęGGĩÕˆ”*Tņ1y…!bũHŒi_Ĩ×E“Į¨öžŗ"!l9§Ė}Ąō”TŅ(UåPU5Š|*<ˉ(â‡ËÚžéĸ‚lcU|#éÅČéŗ({ĮZR¯<œ&É{IUMM‰Ģ(iōkæ&ß#;ÜeNM¸iJ,ž Oä#ļCŒC"Ė›§iFõJáršH…î…Lđ_6đ3§ĸ#xč,8ĄÆ÷DŨįæûũų#Đ]Â@žNŖ֔ŦD„gĖ&“3Buöɤ‡×kå0%˜ĢĸÔ76DŗžÍÎm6›x%דrڄÄÅŊÕô͂*ū UĐW×PmėÆĒcq÷ĨļČ"—*žbũyŗDŲģͲ…x5U•Ą:°JRĩ9åŠŅ¯;;!äęÄÚUžXUC)ĘÕ2“)	yŠ&Q}Á‚Ū|¤m„3R”PžÎ„ģøÍf>˛ĀéLÚ7ņø<ž¯*žר!î“Hˆ!ˆDcCЃÆō0ŋ<t§ĨæģÔ|
2A&ČP4‚§/­h‚<ŠŊĻՃ§3„ąšĒÆؙ‰Š$Ęņ?ąĮæUG˜īÃēPLmžtD6ÔÍģÎF5æXž˜LŊIl‹‰į‘Ë^$oxôąN_:įų	ī‡ęIĻ9§*#M+›ģ¤q%ŽC'ŧh#8áčFŠÁņ‚ŽŠîĻ!?UŽũ”|Ŧû)JėŨĩĸ)'.ĪøŽĪæųižgãßf^ãÅ­Hiŧŗ˛ÄėĩUqŲ.¯™ũÄjˆBÎ)k2ģ1fĖd^*&2oü[<(¯ØŖĐzhI'´F&´&´Z2Z#ÄšKæŋ¨$Ą%Ą`(•VĄĘ•ž“E *×W.2¸æ’ā;.žmqoŌŅ*ąšbÄTÔi:ĸĸh+o‹¨ĒWŧdHŲÉŦš"I„šÕjæâh1E­’ËEæQũ×v<ėãSŅ–ąXOąŖ˜â™N<ĶíõÔxž"Žč™Čę.ĶU ŽUOnĪĄS_.šļĨ–}`Yb žB(°ĻIĖ1[/˜l•™VB*œTj¨XYúCđ!=ÉBHR!J(IÁa˜#d„„ Æ0„„¨)l0Į*Ãx*üĒœ-ƒ!øh…
+"P‰C'Äß	ÂÔ"gˆ0žęB…˜jc˜†Ąƒnh9Ķ0ålBëR(ŠvQ(6B4ÚRļ6PKEúUKIOėąX,&{BxfÛŗ-	6Å4Ø6mO.d$6M6]%ÁRĄ)áĻ‘‚ÍÆí
+v„qiaLŦ>'La8•ļA$LBJ&„„J¨|6Ąäž™ŧ9ˆSl Ûä;‚yŠĘ2žĖ4ĄÕ°Ã+&ŧČ}xŊČWxQ
#P9ꁆâĀĒÂK
`ÉcyDUĸ–/F´/æFEXâP4Œ‡*UôCwŒEŧjņą:YoM1(Ųģ=‚ĒB†Râ?4#õ°’ĸ°ōWaUDaUō‡•L]N§P‘„úJ"ÔŊˆPīÅm臟0ļkJ—ë…zĄ6›Â-īÆ÷ë\C…ĄÂ…J¨ü(RĻ?„đŸ=Cņc(
+ëŪ@ĪĐԄš††ßðS†.ÁøŸÛ"¯—ŊĄ÷‰ÚT}ŽlW|Em&qžF›÷¨âÄ‡Bn™1‘Ėģf¨ÃšËŒ1Mœá/&6As¯fC´øėØe†$EŸą™=Ü!QÅ!ˆįņRõôĸ7Kčö‡čūŦęb"Ō9^ã…i^R#->â;ĩŌöÖU]4‡KĒFRë<I°h$9¤ęƒnŽŠ	’”ƒŸQņū„KIUxVÆģ.ü
+n8z*!oJcdĘ~hÖ	4~6>…Æ‘Š:‰3NĨ$N­@˛Rs>:A
&ר˜ü[¤`r—q)DÆčÔá+ĒŅ†	Õ"‘‚aB_(„UNÍ$˛&ÕE…"åDûŒb<YŲ‘ârC.UëBÖjH|+”ėÔøŠRAĨHšˆFôō×@%•á—Ĩ
+)Cū9ĨL–}…¤TNĄŠ+ˆWCŠÍË(ך˙„ŗĒ>5*âĖ™0Nž>õųÂ9¤á„jx‘ˆĶx^áŋبaķī>-ŧkŨŠ9Ķ‘§JAÄ
+#‰f›Ô–Ņ:/ĒcÄ)ą,\ö‡ęd(’×Čģ;Ē:×ŧŸ\&	68O‡Âx!Qō´„1ą—(ųė:U4ŌTG4ÄSbdloxZ÷Ė
™‰ka)͸lāŦ\ôØåo-\)ˇ6Á­d­­—6Տē0eZŗ–äcgĶGu’ĸŽI!—¸â‹Gt=ŌéLBeo§(5Ą2Ērę!H2"SäĘBxŨ=édŧ™šš
+íh3í*&æDgfęfˇƒČ,ÔŠPvÊĻ¨^4%šŠGEXץZXĮŸfŨEęšFƒĐæEAŲF|ōm¯$¸Všc>¸žš?ė?vŒXQ‹āŠ6q˛ÖKp­cô톛 Ąž#ą)wÖ¨B<šKs
+^BĐ:fi™™/fÁ
+üL÷#įDah/uŅÆA"Ąžĩum-æ5JHKuĩ#\´Œ%Æĸ6}T⏏ÕfŸÉ´}į%”	V”cÜ:Åûˇb~Š z˜ }+^Æv>‰é4MŅĢi%Đ8ĨĄQū[dœŠôŠ–>™3ReFÚCŽu6‘…&!Č Gze!HĒą$Rsj qÆē”-Äč‡Ŗ(#EãHũc2ĩÕá|žŒ””ĸ"ŽtĢIĒ.CßL	=BX#ģčf’ktÉ&Ņ†Ú˜¨Ą!*R¨P(BĄPbfĶB"#‹|f&.!.Eqē_3”l()
+øDÅ	ØEjĩČeĸ×XáÅˇZ-""’xˆV“ŠTžûĶođ_†ķĶÄ9ĸ­Â*ŦĻÂĒhÄW Û5v™–’EhēXŅŸÂa„Å)ÃJŽX)‡đ†iXE$8DZ'LiáæÎa Š@(­$¨öÃeÕāĮ…Á6ņ^°ĀUšA‚°$"‡ÆĪÂĐÃ"+AÚj,TÃËڅ¨
ÔrĨˇĐÁB2/BÍŠ2Ôué’ĩ:Wؔ¸6ąČHS,
+b!N˜™žNāī*	üy™0ĻÛqŒ„jHˆqLLĨ%RĢ0"bÖCĩ!Ą­‰ږå…ļĨ†6ęˇĻ$5ĄBö‡)'”Ã91}…!ĢÂp8¤xnä0ü˜ĻĖŨm…rœh„y¨}AaĒõĸĖ-ÛöG9ņŲZ5ĩ•øQTä=A3ÅSTÔâ[(öĮ%¤ą8ãĶ9>ŅQš)CĘß°:1bŲĶąŧĪ°‚N1b!
+ņZą
+Ī­	bņ\V…e#•LGã9oksRĖmĘ'U2Sį¤ķšG8Émrß3˙=î¨>!°TR$!ŸgR;šeÕ3-}$>É+ZJrJ&đTé"1âmļĮ؛ņôę2Õį"[$ĒŠ™V3Ž%Q&Š¤Š°Ų͙ŖxךôĘA#‘•¯Øã­!h¨lC0 ĀÃÜŅđŠëöŽ0#đ˛o1…á"ü4axúÄU1Ŗjĩ
+ķՋķļž•ÄQ×7žˆū~ØÁ€\áĄ	ÎÕax‘„/
‚
+‹°ĻR}ÁСČPuD>!%ƃTb Āg"xa¯€Ōr;0!˜10Aā€Ā@™-DŪīá5$|W#™ĶÉõÖÃa_a\Q¤[4Ä*ƒÄŸHa‡ãDU"ŸhT1,Ģ†ccŦyŽ2)ĩDuŌ˛ŲÜnlߒ’fŲVęÔ}-ĒKņ ƒˇŠÕÖ,æĻ…Lɐ)RAķ†§tįˆX,č”"	‡!Iŗ¨IÔĩ/DëYRŖĒTœÃ•^Bå‘Fö#F{Ŧ—…k$ĻX‰į*šĻŽFæšĢ$Ŗė{ÃĶ’n\ŊBĒãŧ´ą4(øĪRŸoĸƕbڇ„Áʤ4!WÅÉ'ŲõŽ<Ŧ}ėî€×É]>E:å?koc~Bq¤ŠhhZaĐēyU1¨ĘŠĖdC9)51ũÔŠáXû(HĄ ü<į&šûŗĪ?sqy>ķ™=&ڌjöfv6ˇƒ$:6§ōī’ŽjƇĪŖŌ(uŲ—C¹ŠãEp8…URû#›ųnˆ´"Ģœ5Ģt÷”Å™<ÆxĶĪÄŧ>œĄ™ŅO2o’ĖRSĸšb ãĩž($N™bbėEfüˇ Ēšz5|Ë*0¸2CŗLXŽĩ(jęHBŗfÂFí^q/ŲHÃę„t˜ļÜÔ Y¨'6dí|AaĘ"ųšBæĻm+Bz#Ņô%‰TĒ¤ÄHXĒ°ˆˆX„ŗTL‡EŠã0¨LĄcÕĘŅSU›z”dœŒĨŏW…ĒČe’š¤AYt÷TŊ<ÔŲØĸ`ÅnW¸Â5o¤‚¸ęHØEåyzį”Ņĸd]ŖEČŠŅ¤Ĩõ}|BkCëųJÄ5šW
+v+ë3<ĩ1Ē˛ņjč˙ėŊf˛Fņ
+û3ŽÕ?§lâ›GDTsÔ¨ôÅČUڈPíęGĻ…¨"U.ŠNQM›pmŋKw‡ŪÆ\Ė"‰=Öŗf’Ų:‹Ã
+ËĮm–I]ÂÔ
3Š‰:”"ŲEęäĸ=äČM™qdŦčA]EzĶŦäí´Ũ5#ĘĐ8
+žq§Č%o•Xhd-J:ĩ(úØúI$&H
ŽĮ(,ĩGmQhc’jĻ,b™’Wcĩ§Ä=ĖŊ3žgī>ķUHt“ ×ŖÆÁđ:EŽÄė"öjŠĮRqŠ'
+V:§Jeîø"]‘ĩ&YF™Y$^áĖBb™éhâbéē?cj<bņ‡Ė¨ŧŲ‰SĒ”B"ąäè~#YXōÖTR ‘ rė^ˆ/ņEĩŧ(N˜‚ČeŋaAT×bų.6(ķą“ÉtŦ]R™Š¯=Ģ{Õ<õqë3’8ŸËHáųTętlŅ”i„swG‰ęXâ”}/åÍpœįCĖÛģšuéÄ"øˆŅe„ōŌ[=¯ČŌĩBĩUXm;†ĸũzS$fāÔ*%v%+oļYMJU.ĒąĻßŧ=$܋yq^Ž‰a(ĪŽzš<’ĘåŅŠĘeŲÂaU­E
+!õŦdÆ
+2›ß5Žĸ+f%ō’™°˙Íæ”k´ĄÍ6™ĐĢˆ]ôŸØõa>Ž&iT.czÃŦŲR^ģt4"5rˆžŒ
‰ŌĶaĩJąQ„"™YÃ4/dÎTeäš
+ŠŖ,īDMĸéÚĘäČ[%'ąKå.
6(4¸™"ŠąÃ!R"aä‚h8õeŧú”M.\ĢȃhS Kn˙ÅĨ
+"ŽøļÛ)a\ōņ<ŒÉņņ<îŊģ<
+—pr[“‡Dų-]R˛đĶxė`÷÷ƒ¸
#n]u}™Ã–PRŌ
+tĄā‘Ē0ķry°X,,틸4•–ĄąP)Rh*B•ŌčqV(
4)ĻœD<N<Ą(	Hd	áER­jģÚjMu„ŠVČÔ5øĢ.ø
žÖerƒoiMí;Úļë°T
+5VVœāŠ›Ņa_–Ķ1į0ÖŖČčyŦj•	ĻÕô@“@­kkøiJÂ׉•gŗ˛žđÆŖЍ…‘ŲRŽ\'x+…7bypŦÄڄX…Š6ęvĢh&Jۉ2^†GIī$ü3X3L4ØQ[*ŅŲ-ž†axQGķ1USĩĶ„Ē(
+UŽâ+˜ĒüáACąúëÁĢā)Öa<ÁŠ$¸*
.wÆÕapQŲõÛR–š˛Ô‰’TKüĄ[dĩ&˜XėZĻe‚~ú#°Zž'ŦL3xĩZąŧqŒĢjĸ¸(™āā"[!„ˆr
+&ōˆˆÂ$aD84B$‡“'dˆCžÎEbD!ō6Q.™ĻTÔĄ•'‘=iĶÄ ƒ!h‚h!X2ÔWœĒ°čâL™@úš¨Cl “LĐE
+tq˜ŅŠæŒX'ÆöĪ0ŽĄČ…S\˛Ąo ÃŧĖ6_åëebfŧ›¤2%,ĨĀ•05ō)$Ԙ­OĐđÅ‹˙4Hh¤ˆb>"ĮŠˆŧš¨ ĮL,…ø/Á)šđūČY)ôŦŗƒ‡~|čåR9däd‹•ƒ[aXadH(ˆ”Ãáķw|VĘJ\G˜X”PL^g^ī¨Hųī	Ãs(?ˇ:!ä†Įh =pKė@ˆž $ü=)
+n›xO0Íđb͈Ķ9Â}ģ:?€€˙‰Da„‰ˆC"Rˆ8DˇPŠØNi*FHˆbA!ė7Œo9ažÅ˜/|Åą%põÆŅž4äP‡[R”Ąšŗĩāâ\™šé¯jÅy‘D 	UüMUŒXDÅæ
+
+lÕ8´bQķĐh
š$¨Â…Ô AFŖė0”¤ÂŖ”@Ņfø°nÔÍĩ/Đ,PODŧ'hP°áķ†\á+M žKˆŠKÁęCPÆvđšh;…QĸlHr #”=ÍH(ĢÚÁ<#P;0Yŗ@f;0Ë,DÂ0J![áõHlˆ„Šę 8†l/P;(š@Œ¨ŠP$ëĄČTėGDĄØ"ĸů”ņûŲ2°"uɁm=
+ĩLƒ´%AZYpÛÁ§
+Ķvđ…ŠÕŪU=ŪĩŋČ'^m8ŊPš™´ƒR8”Ķĸˆ˜ )¯Ass‚HËA¤~Š8ˆđÔFsÄā6XÚ
mô	CUôš`qĻŸž[xUÂoÍđā]™œ.­XP
“īqÁ(ÚFå•HI7–@Œn8ŋpŠPŌ˛H*Q$  
ž!Åč#0\aQÁ)ĘĄN ˆÚHF¨"Đ˙8IxÍ%,"éˆ
+<ŧ$īJ"‡S+øŸĀh­%ē$Ōš#’ôÔ"ú ™ļHThąĸ–˜"Đ#ęTŦ¨!­Ņ\ °+^42ԔJjHŪ€aŧRpđH‚wÖĻ,N™§.ĐrÅaÆÄr˜Fq›0¤
+'{¸×'ÕģB‘!Õ?
+Ž’ĸāžôš‘{„ĨÚÄš ˙WS˜($JžĀæ1i&ĖWÁ¯š‚æ33-J.áJ8䄆D¨šÃ/j*B
;pĀ€4ĩŽÄRR3åpQ(z(bo¨ųåo ĸ	>ih8;ŗ-¨t4¸ŸBŖ`@…C‚ą¨xü
€ r6˜DŠCBA(*ĢT€IgiNxŒD‰ęÅ%K‰•FMÕ:à~Ԛü%õrņæęGõ+ctįOzįZUD´FŽ×Œ¨`ėČĶōpƒ…¸hƒ$ĄW	é	#ūöYÃZ.ŠŲFĐĉ“q¤Ÿ¨"›õoh 2ĀÎÔa1:lāžũŽį-ÄüĻ
+LķU9Ģʑ5č$
+īIŨ¤5]Ō*Œvx 'põöŋķ3E›;ÜŠØûX×6!§Wp‰™_^÷Ŋ1Oi¯÷BĖđ˛ÚĢ ŧšę‘6[ë`€
Ž?%TĮžëM}‘!ur’ēØTWĒ‚˙ÅI”ëŖO‡āc@Ņ˜)ÄÍ ”ŽS.y,ižp\/;ø)\āÚ-¤tcĒĨ—oÃø÷ŌLRPŋ÷€¤ eō.˜Û7›˙WVD¨ãĀĸ#՝đR
.Ôô~ÍėwälÄ'…ĪĨÂŧjæ¸#ûĢ™_}Є'l×ÔÛ;%Ę
ô~ĒwroŠqCqĸååžJŦN›J-Ûᔭ=¯Z{TæÔxtd­Ŗ|ž¯ƒL\vĐ ĻJsˆ"ĩFØs,‘3nëM,°‚¨•\ž…[‘^ã­kˇQ>ĒĘčÎo`~Ŗŗmz‘Ü.õ4ˆ‹áQĘ:äĸH%ē&§$âŠ
lz‹æ/A}ī›ˆL>2Û5ân¨!šN‰ũÔب9:™5û Į‘BģS€L
ö“ʲs#Ŋ+†)ŗ|"Bg
+9f81ôųeņ:ĐŠ˜*tžX!á|T%Ĩ‘ĮčÁ[“9!*ćMˇ;œŠ öŧĮĖoŲķ4›š	_ĩp×s7Žø}Ŗķ&ˇEúÂŌ.á‹æ‰.%*īe‘STŪģá¨'2
jÜŖ´Ą7˙á%Đ,€:d@Ur zX\úØËÂ#ŗåå+īã{ųC|‘	;ŠŦ0&<īŌđŅiØ|
+aįņ%ž2ädH¨¨6+ĩTĐ­t0éaj-÷ĖEg(#Ų3(!gôRbcf•mHÜųĩUOdˆąaCŦP6ąĐYĢøÅfKŲĨa }Ër¨xŋÔCŨ؂F7y{j<š…(ļf|ãM9ûË]K¸]#LĀŽ*)]—á
+ĩĖžP›‰úūíđqH\VYŠą>]+›CJfüFâĻÚ{B‹/á,”ŽÍäîiĩøé‰fĖhÕ´‡ė	LĐz°‹‡wĨžžNįÂX˛G}Œ',ĒM€%	!螁aÍVėFvŒXŦu3RY‘¯%ŒP‰Č^˙œ, ˛‰?ƒž˛bÁü´ĢÅ9¸’ĀĖ˙ûh1o:āLƒ÷°FŸÖc¤˛<Éą›,9S
„Šö×Xt ŽĻ‡=Ŗj÷ܡ‚	ŗĢ]ßÃ9jÂ4WŊw›/å|ŋũÆz¯TqxåJ9vŨ9ĨŨŗ—9er”ūŗ -e’Œüõ^ž^l{f'CJI˜T
M4G8$y+°ÉÁĐ dŌ¯č`*~H‘™NņŠa\’ų„ī50~SrWĪ:ŏÔ[՝/íÉCØI0D%öâÂd1^銹7Ķ€gØÍųÅJyīŽŨœīU"‚ĘÂIkz’¯2ėėģ~-„(˛í<ŽiŨi
+„:…k#vWĮ5x gĖ ;GŪ4tĖēú„ e¸Ĩ€ ĩ]rËN}A8ąNđūŧķĐNLĸ@XÔ™ÃĐŽ)ÚsGuŅŲÆt„Œ!ZĢÁä-4į~Ę ôMĻõĄŒŲ	„Í>Į$ˇķpI’?/Ŋ[÷éõ:E§äk
>€ ætgāŗô1ģ\,q0–ņĮžt‹„ōUtF,nĀÉ”c[î%†(ßL›¸m0,úĪģ5zíF€
Ė	DÅbņŗRũ{†ũg„^ŖjsnoJ89dë,Bb•
+˛Ü˛Ā¸ûZ6{ęÍPÜē[ŋ†SúŋؓSt˜ĩ‹eĘÍø*
š¤Eų“uĩļ/q5č’X°ØCũ5¸ũQåĮ|3‡ųL1°yŠ‘įƒe^gã%œŲ™Ī>.@ÁĻÍjļÕ…ėgœ›Ĩˇ|8o>/	ũ­.ðÕڟ%ļ+\§SaŸUį
+ÁŨĨ!‘/ĮØ´ylØéē`t–â]ĖRPŪ4;œžf”hÛËįjįš/ĨÆ~ؤíÄ1ÂHißņ,n–jģ@]"Ķą\Đ}’´ėS¨ę~+ņŌŧŪZÍԟ&
ęģQô+ĩÕlɡÜčˇ!؎đJp3÷#lC‘ÚÃegAōĶО
(}‰ŦfCfßsZ„YĒ‘:Ž7Ũ
F‰aŊ+†
rŲĒø?„Wąl¤X"đˇypA˙â"ae€Ú°o×įŠ)&éâ4~ŧĐĄZ%VĩEAöŗkåA!ūšcešú´acŨhqŽ‚ÉžP
ŸÜl‚ÂVlÉusØÎágÛņS×7¤v<ą„āŗĢ%Ú'ĨhHŧĢÃ4žYLŸojÚ/aĶŊÖÄS20ÆˇōKAîöE#1eŦ×Lį˙våíæ@]}]ņUZv™ļ{‘ēwOŽĶë„xîŅKĄEc@:ĀĐtJŅŨÃ<ŧ~Fî5PYpãŠn
ģPØâ—íĪ!H:Û%˛äô ÁģGĪč~į	Ņ|ž÷e
54)äÆ&*iāåÄĸŖi-šņd€—“FŠ%ŽéŪ—ÖĶbŪŽąy^1œÅ *ß4gZŌãâ›=
+ÔP&f | šˆÄ‰Ąōā¸į$ü)°i[	&])|“ÄČĶô6ŒM3"
|øE˙Į†CWÆ鉲TÂô€ĶŸKÆwdŌļmLĮđ]›?7ˆwEåČ~nEKķ[Ë\ġ"Ū\CRpĒˆY=Į˛Ė€BėŽũrHpÔVv	kŊĨ‹ĘړØLɈ
+{’ÖŖâüžā šBļ%´ZF]´f!,Æ/f§ŋ'?—f\0x?â¤C`^zoC†ĪrĐķ×ŧ5'jŅÂ-Ek<ÆU^h,íŖļ‰ë0gȧׄŖ¸&*ØD­Ō
+3š•Ā%ql…øĐv’‡LPÃ`øxųęā
+Â}YÔaeĖĘÍ2%FŪ[<ą§ģâæÁ8*—‘z¤.ŋû!Œ‚üäAÔø
˙ÖÉ}UI:æ
īyĻ7ĐM$˙tķsBIÕÆáĘ”OÔD.Ô]Œ’ŪĢ‡Āk­>ÖŽ>
+øĻ^eqpĨ@0-,KÁUc}…hôƒ 8ā[Xn
öš0‰ÄŸLø[P•EÍÛ]x{%ŽS™_@bBęÉ7(@W
v‚<Ī(šøqË\ÃB’5›b‘žĪū˜â¨™Ņļ뒐pcÖ|é¨ibqŨäe_YJ
ƒ†dbYhHAĒĻŠščņ4ˆđ7ŪÎh2ž4j‰].7&ÖĻ^fâ
+_ŽkMńđ7z™!…yrĩi\ë)čÔc$Ęvą&¤eŦ_ŗ‹ ÅĐŋ95	ŧÍæú
+ŧĀŽ;ÍGPÛ|—>TBũNÁV\ĒĒˇ1˛QFŊ&ž÷N@œā`ëöĪ=Ô
+]#ÃĐĀÕĖöÃ/×|ļn]}ŸCØhW(¸Ÿ˙*1ß[8ä&Š¤&F	ōqŒåžG
+JuĢÚ֙‘#ņļÂ"uƒ@ėaâg
Ú)KxĶ­dÁņ&æPØô\J;´˜
-ƒV#SR4ŖUę՘ĢĀęīš¨Ÿ¯čr8Ŗ°‹Čđ™’XŽ•6cŗŸx׈Čh–˜‡ŋEōÆ
+ا™qVo°MŦņdUÕ ķ¨D5L
:˛Û7f5LČ(@žÂŧ×Øl8Ī¸m\čÂũ›CØ:ŊFÂč*6ąA}°†•G‹~Ūã^ãAđdĩĸōTŕHĐÂ[BārfõĀ™H2o3ÕÖØės9„š7.Ũ—ZļkŖķwŲšĩ$[SxÜÂÁBšj@ZKĻQo Ü	Ír9‚ŠÕŪ4hÛƒÆ f‚š¸‘îąô# G%ČpöĀ—†U–†ũč\t¸Č
čAbË9CāŸb*ûę>ÄØĪ­ĸÄøūaœCƒ}“Ēĩŋ1RŦ'Ĩ$>äå
$ļũ(9æ—:*äjŊ
+hB2,'î՚Ŧ÷ 9#ƒpöšąûŋŪä B‰n›āųÜ_ÎßįŽÂ÷l…û?EŠ d´
3Ÿ\¸¯2§¤ā~öŠúŅM™w´kX)ԗv¨v
+(KƊ6ŠûÅw—Ė3IOx"aáЅ>ˇ%ĻãI=„i9JÛ˛ĩ$ßvßÜÚ÷5žˇĖ˙&?¨ ļH—ß<„Ú€ūČsa—¯Ëoö$UË4W+§Į [øPųĐa5Ļ“úŖN}F‚4ĸQú9f^tŲņ6ĨØ-v8˙â‚î%OĖŖ3Ô[`ÆŨŠc{n¯ŧ‘™mŗibNUXŪUŅėpCÃΏĸöklxÆ>[	ˆ’ĖėŸÖ/D$Áĩô7īˇ‰؅BĢcG§ā›
)…:Ā¯P'™Yg¨ÖP:ŧãĘ%
—ŋ$<b	)ĄĎiø’Ō۞MP…ˆåvĒ¤ŠYáeô×kō"XyŒKėXÛŽXĖ9ÜÄR(goŅ¸<ĸP§#maŋÕ=īH0LÃ@>§*žV@Ŗš ôqC⹒AãÕč,uˇCök˜€YVFŦl`ī(ąg­éÎWę"d>¸?d81ļĩ<@÷ËT$ĢŪëXŘ÷B(3.†M/Áqēë”Ģ#iī..•ģ&ËäŨã´>ôp‚ĶÕÃ_É´üx[Özŗâ΀ü&Ël^+đLt#6ąqZĖw)¨ųy¨úL蕄˛ŗ{˙Ì EĪŪ`Ŋ3=č9.К–¸)gÚAUč`Ļ&ņ˜“ ûē!˜įÜía>Ē“	ÂKëķkq,ÃÆ
eÕZŦŲ/ˆšį6‚oˆČ–sßē,Ÿ!pk{‘°FËž*I7Ē/ŽÁe+ĘQ—/Ž‘W<‡ŠÜÉWnëf”jH…Ų~¸ˇšVšŌ—QÆ5KOūŅtÎuybÜÖđûŅ`ہ{šfė„,k=^§Wo¤bĒ…UMHØ(ŗv´""´Jc„ķ†oõ™IFĢ~$
ØaSJ9Tė<¤š^¯ۋåũaëĢJ¸us;ž
'mjw_LŋĪygęĒž¨øy×éCáɂcK åZlŊ%bl9aœrŋbŌô<tß4–>/đ¤&ŋcdm)>ŗGŪøYJģw­ūÃūÜ3jZ9G1Č^vqŗSŦ*‚g4
ŧōŦk¸|A{ŠŌ1úaä&Q(ĸˆ ãĀČ9Ûqpbį\ĀļÍf1Ā=1}m
+–;´2‰{,v0_Čā‹õËČđŠ.ØĸŸvÔvQƒgƒ6§ž	kxģ˜˜ôSčkĒÖhšČTÕø]qW	Â_”ŋo߇2ŗrŠMKĖ<Ũ‰ē˙0<=žÃœėƒŠ"ÍÖ`píBmfH™;íΞF‹ĪÛ“ØžŪÖ.EĪ+"6ŒDHîĩ’Ÿģ™WāŽi‰(äå¤	c[¤˛°IWĢĐĖßV6‰‹Y<ļfũÔ˛ĩŨū…ÛܐK8–KņĐ#Ÿ Tj§^g^jVmh™ĸĘGgßNĖ/€I ļ_ŋui=MC/ÂuĶŅ9ōˆĶvuxĶt9Ÿ, Ą
ųō@YcŽ/%UQāģj*˜G—oP(&ŨՂQëv¯I˜?‘@Xė¯ŒÕ)&™Ü¨–8Z´ūúEp6Čë, ?GQ))›ļ:°ôY"G˛ÄĄ\Ųũ4c2â
lHvb>˛Ę%č'ü„Œ-ā}é$ ;Ō
+	šßŋëKicúÎÆÚJÛ§†J¸ŒAņ2ĶÅSääĻ¤
9Āꍗāōú‹Áüũ=Ģ	'ŧēDé˛IĄ”HlQÛĘų¸Ūo?įl,+>Í41Šw¸šŖĶƒ=|–ũÁtkĢēˆ„mņ‹›Ė÷ĀN‘ž„ĖÎ.Bb%ĪK5ö¤Ą•õ­?=âKĖüėÃn,ą¯Z"ũ_æx”¤L(‰§Jbr“ąĀWųĪô'õeĐä;7DĨOc{Ųõf^ŸëH”xÆíį+&~y\õč‹AŋĀ‡Ŧ04•Xn.፝p“
‚ÜõÔĨÂX¸œmĪäDíÜáÍ{¯“KhčöKv‰ôĀŋ /ƒ­ƒC×\М…›´ų Ą‡7ˆĄ e/8v/ķ…ˇĮg Žz 2ņƒÅã )
×åYÅZ†YYįŽøBŠ=Ō4d§ĄųícM`aīģ–X!H­X4_Ģ"ëdôįTj:`jä]B<īŖ;ŧĸHĮVĨîAtßFĄž“Č'C:ķz*w!Sņ
zr]ę€ĩ{0Ú~Zšũ֖Ļ/'rü0A„V@Đ×4‚,,­h)u%‘œsúPã.(ä×ZĀ›or5A= ˂ú-?¨vc‡‰ceŠYˇÖ%ŋ
†ú“ŅQ\aKw.×dātĶ•sNËđĸÄö`í['@28Äs˜ÔCÆ:™[ļīÁŠL¨›GČËЇm	]ɇ
+°$G]ŗŲŪĶÁu]Ų8ŠūƒĻ¤6đĀS¸÷W›ˆ{‡/ģĨ×M5/Éj@‡”‹ĘnHē?k4*ęyÃč­gtŦ@ە3,Âģ	ēāÃõv€*ZLįŒF—‹‡ˆzžk&6><lą´+üŠŒ#\ĐÃ:}–B\’2ĘĄĒ‘áíöĸuPaŠCđObbŝ•õjN™ūē"oTļ{´\ÕęüČ&Lŗe4<RĮ ¤tŋųŨ‹f
q1ÂܔŪl¨ā=ÆĻe‡yŪ	Ú%ä5áŋ°=”§‹á/ĸ<ŽYĢÉ%ƒžĀAUųčl…‘ē]tüĩ¨KŖEÖ _S	"‹Â[&ÍĄ4‚uņË|$÷­7TšaÖŦœsŖDq“ąf‚—"ī™#”åmv†cÎÜ_^OöUáÉõ?֘sŅ¸ũF†ĘŽ¯ã¤¨á
ŧAœdyB܄Ė÷×˙ûļazŦÔįI6\Áä×kŽõčTŖŦ/ûR虖8áäg0›ŊÁBâšĘ˛Ãtxĸ5Ŋø— ¸ŊkO"*úēŠ-įLøŊe(^Ž3ŌŽAĐēķXÔΆ(s#ė.YĢü
+a“
+hĖ´lˇ„7/ÁH=­ž2Jg%|ĶöE"Äü ÃÚ­îüĻđ9@į›âƒÕ>!q4ĪP,
+Ž>˜,‹OŪOf)J'Žnė)Ģ—@ĖÖE'ĄZ„"Wøesĩ'Õb"Žî,¸’ī–ˆ™0žK,íÔw„Úë…>°I€z2ŠCYūÖZO!p“ūÍ0~cõ™Ũzߝ‘^ Áû	”
+“(™ē
åv•%ûÂ	AÆ˙ņŠ’ļ;.ī.^Ë4O×@O0‹ãdž1ĨbÜÜRē<Îk00ÂÉJ­0Á“¸1ü]ÚÆO—:D:hjF§%¯ę¨V†ųĄ-=ôlÉ{j!k¤âj÷J‘CũQĶŠ'ŖI$Ÿ´ī_Ėî`ĻĖđĖ¯+ōŠwĪîėJ
+÷%bj#˛šņ‘Đââ,ön‚/ꑰ–lg2¨U N”†žžr‚	pŌŸPošö†&i÷ü7*Ié'í‘Ú됄fšHģ‚ę&ûvUö+D$?`‹ā-ĻŠhšC¨ üŅl‚|ÄP‰Zˆįš{ôĮ[%ļ¤ŧŽËÄ ‘.ŨÆâkgČ
(ī=ĄlņČ÷SËô/ŠëŗcjäRR‡[Ŧ'ē‚8d"4“
; T”IīJÅhĒ,qųV?×ŌQžu‘’Ën‡asvØÕĀø°Ũq(ė”W°;éa¤ôđĐ??ÉLÖn$­˛<})Đû°Íí}YV‚ĄķI-Qœ ôgtĐ7ĩ÷ “āš,Ũ‹ÄJYa°eąöž]’eũ!==ž™ī›u&6{uę–1ĶōY>Üęi$úëÅkiĻ×8-—j­ßß–iōŽ	ŦāØĶšs”åÄIM‰æ¸:Uƒ4â’BŋŠ?>›–†¯•–)ĐÜĩöđ‡kÁį–ŌE{Nß8„ˆ/=^Ų˜ŗ¨î!ƒpā]´nČš>Jē,o˛<ō$‚ĸl#$¯˙%ĐFhSWˆĸ&cU&ūËģ›É‚žiz™ē/.Ŧ?øZR鈒6)Ž[ž­=–„J­ˇ˛Eâš
+Z—ëÚMœsāA ŗÜcø†ąĮ˛ēÂč˜g,ŅPŊ8ŽĮ)9T3ɤ—aĘyŊ†BpįøđĄ9—’ÍĩŽĸz‹ēvĪ
[’Å3UÛ’Nĸ¸%ūŽ~æM@ģ&ŖPc^OE=5)‰´ú­(‰ÜĀ¨1Ë°ôZ>)ēĸō/O
+ē‚ZqŨÉŊfüt§dė¤“y,Ķ°}	Š$Pņ/B>FÂēĮ%|4)p5ūŖ9s‘
2gMžvž“‡ëđáōˆ,´…ét#šĐ#Čļ§J.K
+ú8nĄy‚Ĩ¨§œå1‰ėáƒÉvjž›Š˜žKå.Âuŧä„/›‘’°$ÃT(x†Ė›'3Šhô‚ŗ}ŊA­sŠËB(Acãčoõ„ŋeĀÕ4ŨۅËLū^Đe¤áGR4:Q•9΁1•û
=üĄ_§Đ9Ģ<É2ÔSŗĪŒMÎČļš_ŠÜ1RŅŨ@ŽbiĖPî57Dã/×$œWƒqYŊÕ 4Ąƒ>m	č‰Î¤_`ĸBږ[54´D•‘ęG]Ĥ:ËĶgû4ũÍūyZÚpGĩ¨&iĸ÷ŠŽu&u}ãéÁü§wOŋ%nigFõVĄ;#xvˈŽ=Åš6CiygđŦ9­īgn	$3†á¤ūĢC2AãŌ˜ŨÍOڐ@;e‰d4LQũÉ÷*$’EÕĮZĻÛĀ˛øÃ0¤ĮæŦ6z
BČÆovšQ¤å×į`€O“GÔu+Á¤(ōü´fŊÛ¨wAÍŌY#bŠk5\¨8ũz"ɏūßGŠ/ã]rx¨Qną&.BJlŪjŨdĶĪú °ŅyÃIlŌ=ÆC	{ûˇ]mú^÷Ģ#Á››2
VžŊ״ʃŅķˇ¸š	õa,%Å­ČŽ×ū\>ÕĄMISiMÄÆíÚĨ>o´DÄEmÅčÜDŠĖĸũģ“/ŅĢjŌËŋ{„ąā×1ÍIœžo ‹Ĩjæņļ¸FŠ6žaĪ~˜psx/ĻąuxÅČjltĨģn?ŠžëÛįŸDaëfđ‡ƒXPQFAÁ@2}Ôĕ!*Ø9ZÕŠ,¤
XIåĻyפÍ`u&įŠ­+[øŽ§˛xīĮŒJ8‰c˛čYTaũA#ödUļFļVēÖ 	–œcU¤gîKF€ËN9š,m%…€•ģÃĶņÆëb)EĻ+“M¨8tíŸ{h
ȀČ&é¤bb]ėÕLšˆ
+oRåKeD$ú§á@ZHŲézü8}FR;đ5™;‡Đ蚘ežÔžĶŒĘzâ‘„Η#Íi°{WÎ P€+Z›OŪ
+b,ayž[ÅãÔWW°Poˇ¨Žs@;i!j~qķ…€{#sbČĨÜ*jā­p_ &×<‚rÉĄ™~•9ÕĀÛŽ	âYdąWäã=~ę/ÂŦjõ>đؒņR’VDZ{Ã	xæ
+61ęģ+Fæ÷Ņ˙Á÷ŧYkn§îÎl[Iëë—˜ĐX‰Ķ؁Į ‰[žÔŋ%EH'ÆΘ‰Ũ"§ū.áä`
+=u)2r;Ĩ—Ģ¨DkY
˙ļåž’ųqøųÖŦTz>}SîŒn†TĖ¨ęI|d6 ¨Œ’6Įôx
?ôã֛ …įxÚŖƒ)˛Ļ+ŧe×LN@ŅĨc‘å¯r7‘.û|†čܝō–N°ÕĻÁķlīMTĀ°đ/ĻyŲ]eLŒ7Ę^Ēā÷F’9¸Â!LAzÄ­KÆėiÁĖRöZˇ¸÷1 Åf™†5Ag?h#ÁŖępÂ܃_ČÆ	}9úˇŲK
ÄÍģžU ęŠš
+3ĪõųŅ0vË* šœ+&+”æŲČ)°oąÛōRšĖ‰†H>ˆæĨĸčƒË.ÄB¯…Nä	Ōo
+^$Œ6‰DV1'ē˛ŗžl…0˛ĘņwúGīņS˜øuđ
Sŋ"ĸ%´…!P°°$K.Žå¯	Ÿß¯íĶR¨pĮöPs†Ķ!’;:c3:ĩ54+5”+ķŗōĨî4Ū|ËÂÉĨâ[
”Oā™ŠĖx‘ˆ	IŠ=dEja`é3Îx í ôšä! 5ODĒ÷ø‘"ōËB3(uĸö~h	ŖT‚,")áÆa`ŠÔ=–Ģæ€GqŗžÄ­`TôīE—õ
hą~a0mėŊE{Ī[$xÚgEø×gĒlÁužÆĸO°N–ʝPĒDĘû1*Ė;ã(VŒũ™sĪņŠ¯Žf7Ž8
+ŽŅ|&áāĀŊąDōŲs#“^™^Ą9ÍĢQôę‹xOÅÎÆ˙¸cíÕÕĩĶé
d‰‰1{Mjŋ#ežÛ+n˜ˇ$uŦžA:×
+ĩzW6+ŸHßPč,ä
õÆ+ĒzĮŠgfáēČģŋ‚;IZšFÎ?šŠ†ëĮú} ĪåŒØ~¸]ŸOĪwkt÷6Õ0×1	ëT8î˛Ļ‡X‚Ô~`Û>Úp1cЙvFe5ŗ_(üŸIÂk@—­Æšęōāāŋĸ:ŊŨëxîPøß+VCĻÁ‡Ú¸õi+9RŸØ•eÜëÃ	]ŧl“	\(´iĨíīKļ‡Æy[Û{Šĸ 
+-üLåÚÛV=QI9œ§ūn>ĩŒ…­síŠĮõ˜†?ÂŽ
+RŪęŠōĒöDqŨk'Ą‡Š.ŋ”…ÄL4¤rūeŦΊSh´BéįÁ}Ũ¯vb‹ƒ/;1`Í&âK€TAÂ@GCk Ú?ABŅĩûQ"ŧ$‘7ƒ4§ŦhMËĐæ)y›MŨ+ɂ֡ŽƒĢĘžŦ2ÎĶ1gbŊBdĩNī1u­V]ƒ°A0ŧ	3!¯ß<ĩūÅq
ÁŌœCü›> Ž/æLŽĪv@ėI”Öå?oPŒ#•€á^Wsu¸zšģîDtˇß¯^wgŽŲW7ŋĮßā¡Íķ%EŗŋÁU•‰ôÍf­@銷đ7ĐÁGƒũX|ūwÕķOŦ‚âĮ~œ)Ģĸ"Ŧ`~Õ
+÷Û\:=bČW`NĀ<=RXX`cŽë˛PJėä‘Q×R`”e[pˇ#$ä„ā‘_¸đ<3(ôÕĘÁģĀĸįNjøB#›_ tš‚Ą…;ĸO‡	ŅÄP¤ÔnG>^
+Lãf8ČĐD+ČņNhzËĀ
“ęŌāmĮ9ōØÎŌ‘ęg˜ū94Ž#¤!ŪtW$‚\Ĩ#tÕĀįČrŧZ™{Ķ@G,cƒ:ŗĄ„m #äá†I§ēaIœ7´
ũvŨș‚àl8P‡Æûã@ŊQŋ‘wĖ!ԍ”éԄGR'WåOl¤LtpŗFN™—ŗę@CØ^ÂŅČíėôIÜnÍČŨĶvw`D/ˈ7ņ Į–eElFķpdŒØFōa$<ëa°=´Á÷Ā0s|Øõ‹,.ëEx›í"øŅŠ\„ } Äøém‘Åų%-bAĶ‡6¨Žū‡,°ˆö
bŧ×\EˇT› qŠH"zRdxāĸA‡å2ÆŅ/Ķā°žˆčøQ7h"‚ĩ/†¨(gÕUEdĄœm‘ˆØ!x<ô ֌HũFĸ˙XžØmaKD&D¤vÖ"āFEŦDĢ%7cĸąˆÜELųCĈ9žAĢ‡hÖŠ{SĘņ‚]:x!}Äz‚$.Câr‘T$´ŠCĸ‰7GIĖeCÜb[jČI'1†@C	ŪeˆS‚w9ĢId]öJtō…˜rä…ƒK‘y.Äņ†Ē…x&ČÃB^õ—ˆ…R8Lč
+š3L<1
+)Æ1ąŠ'äÛ21>b|&Ú%FM¤EBúą‰Q#ĘML–N<!愈­NėŖy'š˙Až'{sāãv†ä'ÖÉA~
ňăb;
rã
+Åteæ<üŦ—Uĸxƒ¸ņ]¯DŨ(B° Ą€Î)Čģ:IąÜ ë%ˆ8ĨAČs)VAš0¤•LąąÆlŠĨ°v
+D` dęŽ@Œ˙­üĀQ1rŽTPŠ@Žj*2HyTĄÎ€œĩNL­‚‡€8U0@¤¯"÷æXÁ
@ÎЊ˙GŽl…9˙qR\ņÔ?ēÖ{ũcL¯ØŠXúËŗ?^s°˜
WpˆīøCŒv6ĮŅ~$UŦ~?+‹QûažfąfũØ=‹ÁčÛhA4?Ė=-Øȏk<üh…-œø/qĩ…Ģû¨Í-fļqoąû#\lZ÷Æńú[.8GōĪĮįãötl>ē­ĩåãļOÉČvA9>DŋŅÄGyąUø Ŗ#Q{1A_>$û‚xīąĻ_$wŪũģÜãFÆfĪ;0PÔ#/ķ˛‡„ą3!B)tŽ…2jTy$ÆúÔc$bŒ<=$MŒmĨĮŨŠ1=Ā^üŒÁŅķ¸Ã1"œGxÃ@ķxdŦ_…"c´ō8M2Ļ&NÆælʲ¯ŒŽČC—AaĮã	3d<J°Ûc><Ŧ˜Nc5c×āŅ›ą4đ˜4gLöwxŪcúŽŖã3fë €]ŧÃEĄA™ŨņaĸŨ‘ÆŅ0Ž;nZŌ¸øÛQéŌØl;–Œ1ĩvL@
=´clRcĪė0ĨĶȎyĢą#v€kĐ;ļØ1F×Hô:jûJŽãŅ°1Ō:ʏIû1XĮv´‘^uTŦ
ĨŠã}ĩ‡¨ŖʡąąĶ1î¸1¤L‡čÆJĨcķ-éXâ
‘˜œŊF‡'ŪˆFtp{„ëüĪAĸoPÚsėūPĩmįĐ¯,į¨!3ÛŽ3ŗ4Į&âØOs€¯8H]™Ã‰(¨ÁÅ.GŊWę>9Ļ™r4ņ•caDņVŽ%\/ųbæŽ3Į“ į0ō8Žō#GRĐą9ãø,:VŊ8P:&ôé5›AoĸŅTōyŊÔa´â€Ķę`0ÖÖÁļŋXe‚ÂąčŌÄ1_ą‰8ȉNŪ{‡ÍoI`Ö^ÚÁīUŖaZį:ĸÃFŌ7†CLø$Ĩö.ŲÁuÂ
Wzpü‚dmk<–šUôÖÁGÁáŦ­c
Ę4ÁŅĀ*phluČ
W‡‘ÕÁ‡ÔßX‚ŋą×:¤Ũ7čŦŽbˇ|ŖÃŊa|zÎ:„ĘG?đJūĄ¨ƒôvcŊĶē
5ęāˆnв:Ā^Š˙zX–Ė
‹?Č
ÄĶpÁKofÔÁÆmxįä6`ģi°t`€ŅÕĀÖiŒŧZ)
y6XWt
´Žâäˇ×Áé×ØMclÔ'  8<l ¸x—)ć˛¯FX°ŽņËĀq
ŅŗŖ­Ņļ+Z#;r\d
]ĮŽõWƒvÚjhĒ­şûQ
ĄÜISÚÁŠąX#j˜ĸŲ?
ž-v´#ēMƒZOĻĄĨŋĨQ\Jih"i´éūŅˆŅ
ˇRL‹†ĖÜÃ\ČM‹
ĸCģĄAĄ	
aúD
@ã-ķ>CšíØĘ=¸í’[gT¸ĘíŒSĶŽ%VËÔr+9cp8#Wû6cs;”sÍäíؗfxž#Ό‰îXîd}ŋ~š/f€āN‚dŊŧŒōÍpÕöYFcé•QPK5ŽĘĀŊ4ĻgĘČÃËCšŽNF–ú
ÜÁÆdÜéŽ<JFĢŧÃ˙‘ņ;ī˜ų™2lꎭ2D~ŒlCŒaŠ)ƒČîāĀ16Ž;˛ĢJuGG–YˆŽŅ2ī`ÆSžčX Å{cÔ`ĪüŽŧ’Œˇ8ė{,‡ĮãŅ$BTˇĘƒĄšy0ÖHžĮ°/zŦÕŽNA˙ R¨†,`/)k˜‚cwē˛b1D*TņCūUKõ˜Ļē”¨ŋAB¨Yėa ąLƒ؃Î53šr!Ã`´ŗ0;(–ˏ0Øöā‹ôëÁi0,´‡`#Œ{ŦE0(õc†4øXĮ5ãÃëãæÆGüQˇ|û‹ķįcŗũ"…ú˜Œ_aCûÂ<÷ąÁ,ü8Ĩ/üōCš|#Š›~°/î{{ņ/dŽîŖôâÁ q^4ɋŪ
6ņBS€
/Ū	HpwŅęvĄs@IJ‹o	dr]”wŦS3jĪēho ŠœK%Ũ/õ$cr!!av\LJzuáĸQ-1pĄƒpõ-6$o‘Zč—~įÛĸ;„ė¯-Ö !ģŗ…™A_O€ÃD!2¯Åë*ä™ĩ¨ÍBĻĒň˛	ĩC6˜ˇfČ|´[C8Cķtũ,äߐĀÎÅđkÜ,ėxČn?6EĪų0—D 2ôš˙ŊYˆ(“,ŠČĀ#Ân,|ŸDØ.L$fbQ
:,ü‰‹Pä\a_Š,^Š"…ĸ+2ē_1šEÆø
+rt‹p
+SãIĶ+w‘
x…02ēŽ˜HŒŒį
+”d„d\aŨŒp{+n¤‘H[jhņm#ÔjÅžZÁ˛YA÷ĄBV0t+Š:­KvUä-n;?™‹#Ŧ–U ĮŨŠĢ"„áĻ*äĸ#ĨŠ;;U„âįĻâø×ĨÉͤŗ;*<Š)*āļ*°zd™@Ej=˛(ŸY…§x¸H"üĀÄ%5…{$ŗlāžņSˆâ2.ÅĀ&,…ÚîSŠ˜!đ¤pŎpKŠ
Ë)ÔÂAŠá×Ŗ°¤ŖŌĘÃ#Īŋ(ŌbGļ…2Ĩ&Š€ˆBZņíPp×2LŨ
+Îë‹a8€`GˆMa˛XsķudxAáË9PĀĸP€œ#ˀ˙„ēĘüDéōúD‰9B1>!ûæŊ=1ԑž°GōĘÍ>xâk‰p'ĘĐ¯~P†PD¸ũSuėÛįÄZe–Ŧe'ˆģÖÁ	ļNo‚Ąq„Ô#,´	=!~MŧōGB€^ )f.ļ”‰ųB˛šā‘pu&¤*nĖĞ‘ÄP&ē
LØy$æbâT$š
;Ič
Î+	%˜XHîKØņuƒ™ōų*’ņt	ŗ'YrK\I(=Z§QŌ–PXJĻo%žOɀÅTI]*1”•d˛t%§„˙’™ŠĻ—Y’#Íi-i%0~Kč_GÄé.NâR^’ Ia_â„I<	&'–D„
“qĸHF\­­˜„DŅ=&ŌŽÎŽëH”P&TŒ„3áĄHŒéLr‰ōĐDUHœÅ4yėÕŠĮÚ áŽšŒ ŏāŨk"”@Ė&Ûô˙m˛€Gŧƒ7Ļ0“
+Nrįˆmåųâ„DqÄCå$ąČ¸1ė9ĄÎF´™N&Õ„šhÄö:QfF@âNČEđd<Œø”'SŋÆô„XĄÔžplŸņIŽ,"}â´"~ÕONTDæ?]`ô
eNĻ (ĖFD¨€jMÄ÷øb‰0Æ'Ų‘Ę+:âg(…åąC!ClŗŪūķʗŸyŠŠO‡ŧ(pˆ-Î(6Dål9C€y”ąbˆĀđ:”ģ‘Œ…hWRäâ9OĘí	‘K)CJˆĩ@iâÖq7ōQBG‰y„d
+7ÄL×ÂL‰] d
+‡
+bŧk	B’Ļ„ ØÉšqHš’2DTä=iJBŠ?X›LŅ= ˆĀ”-„öKŲ,@l‘)Ë@{ƒéRĮræ=snÅ2)Gūäh
+#-Má…Û[lSø p”¯ZŸÜ”4/§0Ā\*ž—<ĩ‘Æ)Čm
+ĩ€4eŸˆļ)ƒ ‰4¯˙nS¸ã$Ô:ūQB$Na}?ĐĢĢÚ>æ‡æl
+qøÁ€Mau†Ī”ėąhŠ4ęÃíčų€Ķlų€čŋĄi|Hž'í=ˆVäŧŅ”1í?2eėAûRĻŦŽZĘŪôĀĀ—ÂŅƒCĘž”2“rįAFAæA¤váėņ ŖXņ ˛2<ˆū~)Ģú°TŧÃeKŅŖ;`VÜáēvØČųZ)qąÃõ×
ų—u@éOu@4: ŧ-ĐxĀŦ€ĐÁ=J‘Ųsˆ/“sÛĻ9ˆ—Á\¤”Mīʁ¯ÃÉÁ:J	]äĀH)D4S‡z<6ģŨ¤hTĻ%)lM›Ã&ļâRJ6āļR¸klrŨRōáÃėeēSb‘^õ¸‹o2å˙–VŌ”P#ŨĀ4…XÂMŲŌĘ)ĖNĄÍ×S8t?…6¨tû
đ*’%ŖŠ<ˇ Pd͕
+'–4Fā įžŠxU†€ƒņÖ¨BXp{ĒPvŽ*”Vát*&bĒ“†UĀDĀ*5­~Uađ38H†6JŋKm°JeXĨÂa§UTCÃ*uĖę!rĸĻēĘžęĩā€ĪWMJĀ!Õ>)Vááĩ*ŧTVĨ1F
—킃`Ģ;W…ØS•hŌ$āPíWū'ĒđgpX ĸh0ČSV…C•­ĘV‡ĒU(Y(jĢh%U‡„jĀáaxsŋŗ?:[EßPŊŽ2F`tŋĘĻ+dō…ÛāXÃÜ :_Áãĩ*Rˇ
\ĩ2éqļ2Ä6Čŧ9ԆÖâĘäŗCįĘвA]™jlø„WV„
R¯Đė5ˆķzš†%"­ĄÃ‹Öpå`YŽÚËXÁBˍiĐS,Bž†VÆ2Ė4īXV)
‰,į&ɤ¤Ą×ʲžhČøeŲ.DˆCðEĐ`‰f	÷ā8]žaĐŗdŌ˛-œáÄhŲŦ‚•–‰3Χe[Ė ņÔ2ĖËđÖ˛že šŽ9Á#”Á,`ËsíŽÉ„lĄxd€€ļđ"2XØ–?†-)ŋú‘˜C Ü1$Õ-kƒ•ŧeLÆđœ}˂f#—ÃŧᒰĐŦ¸816.Ÿ†v‘Ë<Ã_å2Ŗ0H0ŦŖnŗNwĖEa¸Ėš\'Ѕž`0QŌ…:™–ÔĨPĀ@ÚēĖꞐ]¸ČËļķŧ°U_h2 Gëb_˜;ŧŒ:ü€ /~ƒ2™r°5ŅˇwÁÆÕËÂČc€NģāC{YŦ.@x/CtAæfg.lį‹raSq¸pãė‹´ßņË|Ũ‚bÛBÍúe[PBh-,ËQ<ũiÉ
†ųY0!fŗđĻN_g3A˛7†z‚ĶĒÁ\K,pŒ˙ÄÂ퐰â#
+`Áũ„ß+„øGtWĀ~Uˆ`,ˇ‚5‡Q åäĻBLŦvÄدÂ_]bŪíĢŸĄĢmĩSV1Œ ņ•
+^h1§‚îÅ&ÚƘĄ¨@îŗ
+TĐؘ!žÂëpĖ9§J:&bĻpĖcÆ.s~Ė^ī$k-b ķ]R°/d¨Â˜"“ÁQˆsdœ…ëkĸT’a
+ō.-…B}“™Ā2ˀ‚ÍOfĸ~ÂKĘ,ãPRŠž ~+C'ĖÖ	*Y&.}[†iNāÛeöÅ	j‰7!ô—ŲĮŠī1TMĒB.Df”ƒŨšî/ÁÍ
+ÆX3;_š6CÍ%Čžžj	9X…%T8_%´q3FS‚ãĄ(!͞Ųō$āúĖb&AÕ?3(€	M’.ā÷"á;û;$hjg	T+N~„1&;P‹=!á#ÍŽ€āIŗa#pXšÉ3‚ĻŲ‹Ô4Cé	ū‘0´Đã2Ú6§QĒ–ŒOsN
€ĘKÉBMāˆ€:jČÔ.5´?¨fį2G(lĒ9æ›+Uç!t˛š)VŋBx°ĢŅHbͤAVŗfû ėąÖŦj°įcdA`Ņ5ƒųx͚ ékīĀf<@ 7ÆÜĸ™ĢA?€Â˛ŧúąIĐ\y‹õ%Ėf?ør6SŲôCčOĶ†ëņÁFäå¯Íö{āĄmĻļOÜfo=`¨ˇá%=07,š§ã&Ž<~šq‡ĪhęwS7|ē1ąžÚÁAw“†”Ãëā4ķf=Toļ—Œí{ŗč9}3Ļ*Áo'˜¯œ
œįˆÔöø9čé4Z*‹8h7%Z
	•
+ĀŠîŪ@Z¸”ŋß°ä:‡¸m°-K(Ē%ôv
jMļ­8lČ@Â$“%p“ 9
Í'
$4Ššgh€=ÁYđœõ›Áá,Í¨`á^ęGe°Õ‡[Ūu"qRÅid ´8|ƒ×bœübĐ]ã¨&įë0hĐĮ˛=äpü#‡“É)X 	åØÁ+į9Yå°0ZáŨË!äŒ9lüĖpasšÃ95­ÎĄx§įpPũjĀ€Agž|DLŖÃIé´
+VŋĀ—Ļ3Ō€Ánô›Q‡ĮđÔĄ°:Öá7€ĨuƝrĩ0ö:Ēđ˜ōagļ0č;[Ø˛3PûŲyjG…‰íôt;\€
ųpgČ LPî8*žîĐČ0î΂_ *īėûU¸{'^^ßwí4€gFˆKđĖ#Œžáˇ€ÄáĄldJ<ŒÖ‚Ãœ&-¨¸ņX=<:+ČũxTɂ‡<˙ÂRņ(ĪK,Ōō˙
+’1ĪÖŽ§´ŧŗy(§CVû<žčĪSCOāD¨&üzôĀûĐßW G’֖&Š—ö¨m␈qĘĻ0÷觰CɉRĸ2ļÖÅŠąkPAO.r°ŽUæ}ʕTp^yUķR7c›ŧ
PÁđˆÕW5 ļ-Ō¨ā2ˆúŠFŗ@qS°>6`%-@ĐÂįRĢ‘0Ļ”+)X„A–P/}Ęüf€ūØë&út˛	ŋįŨ&Žmgĸ„I
:.îéW
+mcR+ÕY(šeRĀ 
ŒŖ^ņ˜cŨ”Š5)€ė
+'&i‡œÖ`ō+˜°9Oļ—Mâ°¤`yV'āi“”D‰‘tüŸpe
+Á’‚ŦĶ0aPRЋō0Ļî<r
+æ(
T!hP´{%
”DÎ%ƒœ(˜’ÄdāDAnv×Ā%a>Qāē{
+Ē‹Á‰´ß™-bˇš( ōßTm+ûyGĄ1‡K›(pí°
G^ŠEŪžŦÃaĻÔĪE\§‹zÉÔáŠčD
€ƒ¨‹ŒĀ‡rRj1üeB­)+l\‚…&ˇb?Ģ›æāėy4ãëwPO*0ęöœY„…õĀc[âx'øį2ũSeœ 1uNA{Ģ…ˆq‚Ôi€.A“]ãéôq‚į\$"ĖN 7Š§gWCėh§=`ŦąûbœØ	„ãŖÉS
IFj';AîŽī+Ž}˛^pœĀ
b(HMxŽ´	˜— /Š`‡&@MqAR…RWÔ]„A‚!wĻeŊŧM_‚D•-ˆęųĢ–`‘áO\Y‘‘Vķâ*ãüĸx×å;JĀŦųY§…Eebå¤w†ŋœēh˜ÕZV˛'O$wMēĪ„b(Oí?‡ C`0ƅq$ú`đũË(BéH°ÁŲ
äį+|
ŠôØČ<—Ą%ĸ>ŅH\s
í(ˆ=Ū…§”ŽĀ;ËK*0ģF`Š	ÉV2ģ§Ŗ¸ļĩE ZX<CŲæNRŒņÍ>MáI"ˆ&;Iœ_Â)•,,ʇ§œ Ēũ
öĩp.„ÚĮ‚E>SlFÃj	
îT*lŠzÂLВ?A3*`jWŗĒ@0Q´RĪŖ4°#Ø3TŽzŠiA 	æŌU/Pø
rswPH%ŅvGbŖŌå{`)“Éļ÷›ˇõ@m¨3Ö ÎCŋ
‚K{–Od'¸Ā^‚bj­	4}::`-ŠÍ@WŽU¤<•Šķø„¤*
+…`ßŽŲay¸õb´xĨ(†&(–Ú7đQī%yŧ˜ĸĀĻĩŲĶŸæqĀEm dĻ#}ĩ)l vûķ[%=…5€huDeJsāė;ītĐ|’¨gŌpItûĸũ'c(R40×Û<€ž
ÉŽ‚*<z{€TaļņđĖ@ TNP$šTÄ“ûjveō`XV%ŋVGš Iģh^€Z(ļ"oä; ŠH÷ŪRV000ēˇ‚~?ŋˆÔs÷ēë˙ØķžeŦ:͂që/¨ŦPŗ˜yÛÅĶ
›'Œ"ŧÆedhKÉU	a@l
ž1s’Eã,›ŋĖ—Ãülc
)‚„ËŌ'fL€ŗāЎ&Z
Ŋ—DĶeĮU
Æģ~˙ļ*pĐK×ŦcöcLŋNKīųÅĩWíŌši§ 	ĸ€{:üīÍî,˙	hŸķ~Îé˙Ä;˛^ķN§;6Ķ
+×ÆIh›U€‡ŊÄmË)ô:ķË:2&đ/Ã&´UˇšāĄ°Í¸(oMJ€jíUš„’€ŽĮŖgkŠ1ƒV)>cŊ=+8Jy1Fņ^p
+ŌôOMŪœ
Šeq)?SŪāGœ)aāī!Đ*™­ $%1wÃJ,•™—}~ŧ,( :sÅ֑kŌ)? ^Ē8Y¤iŨÃ<*S9έānĀ0‚\|€öā
ĘöļL§éUčë™ß˙‰ŲRâFąMw ^b*”6-OFŗPÄŧ
,x,ÍV(Åq`}j6`ÜVŗķ8$cĒ
ßõpÂk&­ĐMuR„€Ĩĩįp)š˙@‚’:îí_-+‡œ†vŸ¯•ÔÜ0IĸRHČa@ļE`xŒ;čdņV<Ô(vĨā{^#ÂĘo8ɘ“v1° L34+ Uio8ÛL‰P
ķ¯‚Q=ŨQ´ū˜Ũ øhé–âH	_M@Q=´7Ŗy:Kį‘ÂÁÔ@qvÂ=,ÆÆų‘€1…&,Œ
’MkđByņ@
‰
úX­‰„€I„x“‚É?Ā9GXaĖáO=ƒ-%[–¤Ų
 ąæΨ`ĀV4ŧŦ„°“ÚâÆŊ;”ŧ7uŅäŅ…Ĩšl×#Čy…–W /$”Põx ŋ4æj
"ßw¸tķ6+€§‘ÆėAT,R€­6”¯ƒâ7
’î4c¤…Īz6gĪθˆ†ß(l7côũ*nįĄŲlĐJÆãņ™€æûœŲ7€R‹ĩMyú<bBâ/´ųđŌ?îú4+Ŧ`aÕ Đø
Ņ\y]ĮŖ?՚×g
+āŠSIÄ$)Āb]ˆ¨ã¤&Ŗ$X38Ŧâƒ0V^n:\o$ÔÖbī3|`:
V­6
”Ĩ7ƒE€::+x”H'6^Œ‘h1œÚtL×ļžˆ:hZ|LkŌĻõ˙+uXŒKËņ˙_3¸
+qâ'¨č˙vQ­U€ÎāũŸ`XX
++mmŦ˙`ÅĒ§—VĮŒWķ˙Ņš™fPwn~˙Ĩg
õ7žžŲŨŋíb ]õÃC˛Ļą9
+ļÚDö/>=Ęū÷ŽcB'‹”°IŠR˙ŅÜ4äŸÆôoX§Ėrc´`Eŧ‚Ķ˙ŸÍrœÍ´
+YÂŋĸ3ŒŲû{ŽąCSAčūæÚ5–€fžŠjí˙"Ą™szŖØßtnšˇĩR•ŗūR~Ž4¨˙ŅO!cģôč/ÅjøÚtÕ]‚đų§rtV&í5˙€AŠBË*øÍâƒ>É?ķ7ūĩĮ}m]ÜŲ˙áīU•mM(čßÁßrŊĖ%üīįđ
+¯ŪDđ*ˇ÷'āoŅ?īũ ¸ņĪYÜYĘŧû¯9˜–fĐũŸOčŗ…n"ā~˙sŅ­‹H×~•i."Y&Õ/zäķÎ~k>•Cz„¤ō§Ø/´…(õ•ÍW”Ųõ‹¤8cV¸ÂØĒ[YĐhTÔd’XĒN!ŋr„. ūņėEŪBvĶĪ)˛ŌĪf$Å[™ŽĀÚŅv=žã3C$4ūųŲæį4÷í;Ë~ƒÜæ—}‡iÕe,™˙›×ü&@Ōœ[ūūžâ6ƒéÜō÷
>‘=āË‰ŒÉĄ"K›’üŽöŸ{Â@R_Üäõ[›ãW
uŠŠ–mļË˙âaY+R.&ū6Bŧíđ—ÍBõrDœÂßģn§ĸ gČ@˜:K€ ŲŒđo7è—#­›ü>%,{ąEĻž˙ūŠ‰ÔéŲMãĨķžq†P‘&ĮîŨ§Í-Ü=@u?//Žš˙ĸ†Eb€SŸÆá>"ĖŽŒÕōCT#‚#QÄzNØ@ÜWD”‚Iˆ×Á5?;…Ŧ Č*õÆŸ¸Ÿ*0Ũ$_ßnÂÜí—dŌœ%"ÛoégĮUSû^ˇvÕŋ/Ú¯Hjp¯rÚģ>CpJ@í#ĐlĖKQû&dĮV=Aí+CĄcšˇÔ>jB@ÂņÄ: ö”Hą‚Úˇé dx´ŽŗĄŖö­nOo(ÍcÔž€c)Ū)ÛOŌ}öáŧÃ_úĨHüėžûCe,°8ö[E^Ōãé.üŲīXŋÚž‰5‡§˛äHŖîôķOš˛ŋ†äšķõ4tbė—ø­ė+‹‚}F›vĒ’gÁ~	]ŧ„›đ‚ũÄ'Ē)KûŪ]Đ´ĪÔOæYB	ÖÔN‚}
+öõp‹âņ„Ɂ}͝ĀūĮŅ$ÂŅÃë÷IJōę’ŋõkē§†Âv2ĐŦ¸(´T¸kÖßĐ0Ū”†)›õC­ø§oŗū¯Ön"}ķ›‚úX*.!Lá!9ÕW7y™ęQs‚TŒDĩRŸÜMŠĒŠęĢKÔ§<R4Áá-NŸn“žIäĸĸK˙áR÷„ŧšE7–ô[ĸ€å)'Ŋ¤‘ô-}oôķû(ē+
+¯p=ˆū?Ī<ŧåĸ˙¸;įĪz"JúÆåKVŒą-˜ū|Ã˛ąˆƒŲYNĪo,R*č|&EDž‘Oš~ķųĘ	œ˙āŌ¸îA^ķ‡	Ąä{W^ ™_ 'KõaœLœ(æO
ÃSFœŠģŧüāõ;3R’đÃÅ@ŗļŒ!ēWå?\B0č~éãp-hesąÚķ˜ģŦÂäįaՐÅ7ZōføĮbÖĮOŽĀEq}Ë`:>DŊYI@h]o”ēēäŊĮ˜‘0,üÔsqB7xßŠ,žŸŖŠ{Ŗø­ŧÎ[	˙	:=ƒÄw÷˛ŗīF­ÁŸˇÔí5Ī€Ā؆™ŧ6ü&=xÄ,‰ēcß×[æ$ƒ6$|GJĪîh@ŸŽ7ø•ųkJâ¸"ø'™ŖŽ¨ ?_Éũ’PMū[Ŧ]Šč˙žöæ:Øö{ėī?	f&ۆoß1īzz{–lōŊ÷!ˇŠ†"ØŪWpŖŌ
ü%é=ĄũËŅx,•|ōžCã&bëimĀûđ-ˇI¤˛Üm÷ļĘv%õĪĮû§N­û7DĒČęįFē÷SĐz>ë\líw.#"†øRZâž&Ú,Iˇ¤¸¯L—¨FƒÖšÛëuˆø>ļáŨöđ|.+ā’ĒeûŲU“ÕlëÁĩ*Œæžh‹…R{õĢŨøGjŦČ~°ĸ\-*qn[
+7
íÃÎ@ŋäEúnö38Š¯¨x—ŊŠíģ܋&ãŌd
P˛)ŗŊåØÛõRŧCjOLė‘2~"úRĨ“WØsŪ÷—ņöŠö¸T!Kr+ķõė“Ũ&ŧ>KėĘ b6Mįz˜ˇŖM^do}ˇÜœ‡›%lĩžNEÎm$
ŗŪ}§ī&ĩÁ,ÜÃzĒy|‡õžō>ÆLWŋæņ`ŋ×čęûg¯¨ŽMrĢ?ôZšU
Ŗęņz#ĘØ	€Í}ęß;äũS‡á-?Ō””,õHËėēûåĐŖ/õĨi”ĨTn1ėq˛)Äč>=>įyÉŧr‡2¸Īé/ÂģjrŅÄBMŸēø˓Ļ@{›x	Ķ˙N.¸9OhüŅ÷ĄÚŨj'=Ā:$ôŦôIzōvΝ€˛ē­ôļu3$0ÁĒŠågĨĪ_ĩpkĀJ_"7bÖ¤ĸyĒ­ČŸ“ü›ôˆîRŸ„u@†y“ŪÁA!ƒ™ė‡Fō&Ŋīėøvük (ŨH>­éįgEŲÉ'XØČž[2"=uPûéģŪģۀĢ)tO€H˙ÖôŧáéŋPO¸l°[Š†H÷í
+oF”o‰ôÄ^īö$“!=UØÎQĐ†Ōƒ—ÍÖ`5ˆ]ßéË|æY`ŠĶäŅY1Š2AH‰€bWŒūđ|ŲPÍÆD,ũAM€6ā÷C–8—<š7Ŋ
+>œiJƒ~AļžģƒũQē–ĨJēŸ×CXœ€&$tΛ¨Âô|wb‡ũ9ÁķŒî§L*eį;í1QYi䐘åS`s
B¯ƒīq>ĮËKė%jŪÉÁæžy;-sŸũ‹[›W$
‘eÍgΚ^ßęVzøEķĸ¤īož…7įKŗ>3ŋã>BĘmd˛™Į>ZđÚ čķHPi âû‹SŊXp&°GÚÕåÍÚ2XŪļü”bš•ūb(JŸÉō<īžy+ßúl:ķ.n)Gå{ķ`Z<JwCʛí{üÁą2ōí{Y^ üL¯ģ {oō3ŖFū9hq‡œĨFßĘS„K~ÅfŦâøbm^KōW°HL˙eĶ8ōŪĘp"÷¨Ÿ‰<SĸE–B~ü‘”ŒÛđVDäįĄõĐMKū=žHtnčqeŌŸ€0Séōõ
+‰åxü—Q2hãëšŅōRu$ęS’ąĩÆÛfŖ5˙¸lƒ‡ŧ2ū2„,‹[ƛ#ž)qW“§!Šžˆš¯ž(ÖëŅ¯ø¸°ä“S|ûŗŋN|7ÕYšÆ7u(ņ4;?$ʡˆŒ¸ÖĶœŊu‡!‚q[L 'vj~k)Ąãđ”…RėŪŠ-‡†—Û€1îhÕųų…wiÜÔ{Žģģ”~ąqGđC–kÂkĐËBĖ{ŧ"|”uĻœgũȃg,,\8´<ņ¨˙ÄEĪåuŖF*›<ŠÕëŨ'ŽŸm@0đ9´Ú÷Åī>öPĻ”Ŋ¯„
ŪėBØõwN¨ķ°˙ū֊Ö4åūNyb RR…÷\Ãâ˙<TĻÎ#ŋ‹šÚ3k˛‚ûnUC‚D-˛;}Ÿ÷×s<A•ōŨøÄAĮ
ß˙Ų  ,-å•Ôí=mŗ$ÚÛxwŊw­˛Ļ3š*ŊĶ(ˆ8\YמáÎč5œ÷ĐĩÖ	Hyí”â–PĄ‹SGņ+§dĄß`ŧÃĀąßlŌ×Á;
+T ŨšĨíŨũøāZCąúe”ģ§ļēb¤Ũm(côpãŊŋîD2HÖîōuįõ},w2ą8W÷| Đ:Ũ=ÄqUŪŋŨĶ´h>h:$aöÜ'$['Ē„#Ķ܅Ū:•ŽļÜ%ÃĘũ
ŊíœÛŗšÃåPļ¤Ru •æ͸ëŊEEV“q¯}9€đQ$6îĖˆSŊŗšįƒûÍhpy{ÚĮÅOJØۏ&‡• ô—ĩÛOē6NVP2›%šũáŗŠųQšíŋî@ÃZˆN€3m¯€)éŊ2m‡VGvzīąÔĮėĘW7%–lĮč!¤ƒĢœvú'Ž]:G"ŋ!ÂÕNĪە54;ÁR{ŪÚņrÃ	å´¯<)$W‘žŌNēv”M˛{IiŅÎ"Šp(–A{™÷ærøfAgī*%lę×Ŋgˇ×fđ$r8J-}fī%Ę
8/ûkpIČãė"šĢi
ŒëbOP€ļš¯›¯Ķ ũíB4“nõīŪ0qėū—ÎŒ¸ ‚â;)HmfŒ˛mģöf)<ėEĐŪįeŊÍåWØĪ~ŸŧŽß$ƒũĀūÂ7**$%#°/ÎīLL•´¨~ÛZň“ę`Š¯›FŽøĒÔ#ÎõyũY‰<RŽ1ĀŨÛī:š%e/T.•|Õ`ĻīĘŗš^ŗˆü+W”ÄõlČs.7Ø­ģdˆaĶ§”RŲúZ’ˍÍ-z˜?ú¤˛Đē0jßÃļ¸FŧŦŸ×65MĖaÛtŞA˛$¤Î)0°x)C`Ņc{<”Š¯X	OKŽáõū¯°šz<$,kO
+A­Ļ¯4P­nKxz/a{aõrēN‚YõÖËAK­Ä…¨zĘ[|?
ˇmFđŒęÎtf4Ē´Û†ŊPœúķx<*sŲūR‡ŠæQLęėtÖŦr§Ŗ~8ĸۛŅ€G=—XéeŒÁļ¨{úSĻYn
õŌ –
+›ŽĄNz*¤, ¨;Ĩg$Ŧb?}ē­Ÿâ~)5ÎĨ`p<6žÅĀf0—ãņŅé¨ÛkŠhßt„Ž5qšæhMׇ4đÃ@ē™Ž4ˆũ/“2IųČ-+ãĮj{ŌMȜ4ŲÚētŸ™íá5žÂĨ‡ Ŧ+Ás”ŖŌ‰€[ųũŨ'ŨÜ~õĸîzYŌŸĀUÂbm9Ņ)}nĪFq“X¸nŽleHˆß+lãũ.čzđÕ=(„š”Ŗ?59%Îô2ŅĮx¨­Ļûũ/Ą€ŸĖÆ&ĢDĮ×d€ģv۞õęrĄ3ōC*ĄŦNzƒKS!á¤0ą'ûĀNĐ
`ęk˛ščGūĪčˆäČķq\Ŋ„ArR%ķøķū)įBúÉIMIŅû}Ö.úŧZÎŲÎyBüž6íšø,€‘ŨāŌz><YũÎķ\/á2U‚	8kĪiJ18yŖw~dx“ĻT֛Rv^#!}ߊC™“ųš8úų˙Rūœ
ĩ!-Ëš*jvãë%+Ë]3ΉĶÄyڌÆĒęā|7†‚LëÍŨîGGöæĄļ[§xŖū–#RŲč&š%¤ yõa=­ˆ†]b‡lŪ~é*XÄČĢy×7ĩŌÅi>ŪEŊ´‘÷tŅ\ęjÁSÅR8ķĖáÛ Ëų5õĪéh3s.‹ū•9ŒŲ
sɅĖW›ĘƟ5Kc>C´‚āĀ!wø§éÔT>˜Sâ’ˇz9
ąŅ×ËÕnzėrŖ0	Ŧá}ŗËø/ ‹oŦ&m9Ļ†ōÜÚBOÂHËĢ¯ßgĻMdš~ÎRߨûīW~\CzIåÍ/Ú8xN”.Åb9ؘ‚8Á4īäsKŖr¸EĩĒ)oË! äa"åAŦÅeRqI@€Uˆ&ãúÉåųíŌ"N<NH~”ēÖä-ÛŊ"jvũga1ÁÖ+ų Â	áR^W'š•/ŋîFrÆ<ōî&ŌGˆĶ5#ŋzčkô—Ôߓ"7ÄS¸æiÁũC–oČRÄô
+yÔĀˆ&šd!¸k䟁“‘ę–
+uäŧĢ€Ü2qĪ/
+|œAž˙ë<Žs€•ƒĘ;N”0å÷ĻRĮÉ DqĀŊ‡ņ!XŠH@…ã
BëÔpYsãúŠ•âšUx$´EBI˙iŧŗaWÁuĀ3ū˜;F4>ŌëDž•ņ8TÍČ VÆQ"œCĘ2ÆˇŋúžM+-‡%
+ˋ{~VČr’R>WP6åčŧ€JŸCiíä!"I5X„HŊÅå¨dLoņuKõžį,>U
S{OhŸÄĨRÔĪâ!•`ËUpņí‘yx..ebŧgE—¨‚ķļɔ›ņ.n7Ÿå€^<™Ō-§Ī&â*b8Ģ¯r(.NõMVgÕÉKĮÅã*Ŗp\ĮÅķŽaą¨ZãâUjØđkÔ¤ÆJ…qqs[ükfç͙sŗ]׎ââŸ<ĀĮÍáé>Å55Ž‹ãCæ<
+HîGš¸¸.9ŲüÔÆÅį@B‘p„ļ(Zܑm;J"ũŠßc­/üOŦŧįĩHĐ}ʼn¸kMō+Žû§ēũ˜wĢŦVq@\ũŋ3üŖšâJÉãĨ¯ō.CqđöJ]xV{^RŠ¸˙˜ø
p×Q;”û’]ŦIEÔČ=˙ˆkMXúšÁĘ
XĖ[Äá#åŸÁĮAcœH×Ę"Ž8A
ũįi. H$0ĩ”/AīÃĮ8¨Ų’&ČÃWaBÆĒk:Ü"~0nwģã†øÛX9RJĢyđđ
ėĘ›Üß=ŌžČŧ‰á÷bEbģ-yęŅ.ÜŊų5Jj+÷ˆ¤8ũ,/Šđ~R+ŪÂņßÎ"L‰
¯¨WÂŗ~&5CÍ?eFøŋ˜T&‹AxÃm"
fY=¸ūēēdâā€1ãĢōH	4xiKš1>Ā<`Š„'õŽVp÷ƒ˜õ›ŌėŠōv‚ĪU K
endstream
endobj
19 0 obj
<</Length 65536>>stream
+^ŅHEp—ãčÚ9Ŋ'cxhG)i¸5/:^n’Yé*đĖ[rz™$Äá^Ÿ~ŗĶT¯Í<ė­ųH‡Tj€Ûę姖:*đH;]ΞØ3˙į7uNnäßöOr)a|4ũ-}=eAڂŋ	Ņ?ēÃ&U&¯ß‹§5Z@{š­Øų
Ļ-É<$|ņ[†ÆŠßÍZŖZˆŒ÷ŨĻˆÖ1‡ŽŠœSēgßõ‡ōS}aŨÎĄŠž×Û1K%´yv^d\QĄM9Ą¤ĶĐw‘÷"õÕcŽˆ)V÷õ‡A€ųŽŒ“˜‡ãöąÍ?¯7Uy|‡”ĘøÔŧđBiŨ°Įq…oԋmˆÁ÷&Ôââ	…-÷nQÃuães‚Įiī̀lûœöŽųų5×Fŧ¨ËoEÚ;ĶĶŪHô›č´w>0oeˆb§Ŋ˙ä¤@ĄlŌŪۖÍUÆÂĮô´7äN?†O{3sdlĻ+ŸöŊJˇD‰š-˛ĶŪbž1#íŨŗjÅxųWî=-ukûZrīi)č‹-¨všw^ņ9€˛‰{›R€7ķä†Ü;R7žŲķN}‹rīp‰ŠĪ?u‹ÜģÔ<F´ĩē=š7xƝVÜÛâ5"œW‘,¤Aok<pyīr‘€4nJŋ¸ˇGš!p:ąéŊ+žôņÔ{‡˛ēIī=ø§ŗÃB
+įNhÖ{kķlŖĢ
+BõŪ†YŠ [‡ŠŪ;"
h921 ôåcõŪÜŧ!F˙žÖ{ûęĢa|qzīž%/žy-Å1ŋRęāģ@ccgÆ.|'ŸmÅiîÛVßsč˜a¯_č,žÁˇøPĒC‰ä|´W_Ø6Ŋ7ÉÜ1–VNGd’€ Đ{ĢņG߄W|ÆįŊ‡˜×îÍxzŽútđũƒÜ;J—ŗXŪģ*ĀĖgŪģ´š,AžČÂqîôFT˛îm˜‘÷Ž>kQ…Ļú}ÖŽÉ ™ŽÛ ĸœ÷.€ÉĒ-ŖŧwŒÉ6DũÚXļ”ŧw!TõōŪs	´3ŦŌáŪ,dOāSOpīŋŠÂŊmv=ģá;¸÷Eŧĸ7mīáŪ3EJ#o´Đ{‡ !r­ß6¤Ū›OĸÁ7ûËbyįß!KLößFÁxy
B|ûëSđ­â1wĻŪ›žl”6Ũ­‘õŪrhŋseēĮŊ—’ÁpU<	ȸu
ŠË0žÖ.F×Čëí“ļĖ)9âK0[`ļÜŠßģLĄK­ōÎYÚéŧ'%bŪ-âe”}…ō~ÍÄô
+˛~>ŪžĀ2—”#cļxŠ@˙dØĩhx{UZc
BLب‚ŧ_œwãnāiß]¤÷į[8@Ģ*Éģ/Ûā;ģT)Ũ­Šá'ĖŽ~ÃfĀŨN3ęŠ]ū¨LyŧvĪ	‹ŗ;ÜŲƒDS+ÄnąûģL•‡†# ĩÚ(ˇæ„q´Yˇ‘€~îŨW€ĒnŅ<°å_:Ô=OÆQŗ/_|/ŨÜŋ[ĩōMē…ÜÜUGw%&ĖŨRã¸^Íđé-t[û1Ŧ.ŠX΋a2֍ŗ´ŲŽ€\Î]4
ŗIBŽ^fin–­Xo9	ænŊ#|Æ]šuōŸĒÉhūQ'ˇ>Tp­T÷k§€‰Üš.Ė&Â%›áq?Ūw†ÚAw)3îŽU™´'dŠâ.¯ŠîM
ĄVę!îŗOĐåęļÃŨŗØã|p_\ŗ‰wÎjÃĀ=¤EˆÉŗÖčosfIûv'CĀļˇo9A=Įt¤y›L*8ŌÕė"GüōrĄlˇī–nƖ"ĸč$‰%ˇq'úMƸƒ.ávDā=‚ĐŒÄüÜváŗ
eÂÂļ{oĒuÚŽ´/:Õ"
aäįŲžuŠŒo-ÛØŋlī›¯']+k`ÖąōL`fōqpũaۚ÷
+ÛqÅB/ú÷áĘsč5ãzĖĩ'ąeôwƒĢY­mÆ7+¸VĩÎe2€kĮšaĩŖą'劝ē#ëhėž0ĩUīƒĄąõ´-ƒšTeŦø¯ŠíũąHFF‰ö7T$ÖÎuĨ=gtŧîŲ“ë†9hĄ¯Ø–trípL68:Ÿ!D{šÕķƒöŦ nFđgKg#HAīôBô1Iԍåvv+Ķƒņ	ŗ%ēkP˜l\Ę3($âxØį3dģŅė/d"˛úŲĐŌ&‘Ų2>M(ļ>xÎCáZŸ™mŲδe˛}ĐVöģ€(„oũs8RvX„NÃåÜÜdĢyĶ)áËģ$›†Ęƒ•â:‰lėYa
+įęšŗŲ(T.ČÖŨžĘâ~eC.m
åĮęĸëÆļ0›.~ŋ‡ŋŒÃôæbOvéĨ¸ÔčjĖĖ§ŽsŒHRÆę4žģIjĐvÚ v&kĘ9mĪ%YbwÃ	Đ)ĶåÄž…}	;š˜JĖ	;ßFØ×mƒ}ˇš°Mš&ØnO[”lØš[Î8'QË‹°{§h
+­DŠ¯TŲ÷ĩękÅ`=“œųZ;Yī{Ņ­”
cÜŪŊ&RĐzëĄĪ	ęuËËā Y^3{ŗË;įdœŠÂk=zČ'MãÅ+w
,Ũbī÷åmØu¤Z{…¨GĸŦéú‚ZwžåpQ;×Ŧ>Ԓá)åšDR3cæ-Ž;EáHp5cÁ5đBQcÔ
+jä­Ąbe}}‚.I8ī¤hká]\¤â_ëéô#ĸ÷€ŸÕēŌa;įōkh7­ņŋf`ÚæēúãūčpqûΚƒŧ‹Œėu?ŲīšöÂefŨ
+’’TÖėœPį§ą…c=&˛ž&@cĘđÍT-Bš‰/Æ
ãqō	"WîŨ|•aŧ„üę­ģ'™ÆG‰yõ‚ŠĨŦ0ķsuĩJ¸:擰†u7ļZmH[ķ°÷YŊˆeąĢgОŠ]uTÎ*$_>Œ/ŗj™ƒwVIRiFŋĒęTwĪĒ]Ēî:K™†âä8Î
Ō[!ŖZߊÔB5Ų•9|ę6’Ô팈֜šPnküŠĻV6WŽĨ0Ž
S7)ž/2˛?WŽĨ&giÁĻ={‹˜öwūŽFę"'šƒ<a[d=ęļ{ ­‚ą­Í¨UFQ'ĩˇŌ­øÚį›aėZ&Ē(;@Ģ¸—aC=.Ŋ›1h$žƒZS\ŽZ Ž? ˛ææOWUm܃Å3ŸžÄĖųôŅąuôŠ0I!ū[ĖŨjÕQŦrž0,a¯ĶFŊ;ri•Ũ9]¨¨›ū8ŌØČ~afĘ*\ėŗŌĖZŽ8ƒnfĶ°;Ŧévž
ŸÅŠd4]čÅÁs9Í´b™$~xËvWČô➲ÁYŧ÷aē‹é4)Œ÷K+‡(ŽČėøui5Aû,äYK›H@2•Į,Ésq„Aą4ÁÅôL5seĨŖÛv›B*Ũ¨Ÿ˜ˇĻ˜Ŗ4EžÁ?^Ÿt­Ÿ€š5V&ĩ&-–\člŌ“¨ļ+Sˇ`SČiI+āēyV°é&IO9•Œ|*o¤eÁ)/ĢpMî#‘>‹^ãMüzxéŧŅ9˙čĖ<y*æĨ`Lļ¯­“Äm)ŗŖšĩåí‰Ŗ‹ûOYúô÷cŖSaû¸ģ‰:*Īh`ČØ€Žē1:Í o&pۋÖ@JĀ¯ĀO‹äü
+ßäĘVŅEúȆ1¸x§Á~'ˆĸq‰*Ú	—Wš‰ļ33ŽūaHôbDˆHtŋFNŖD4ë¸^Y¨ÉčūMŪ!É]ÆÎŽŗĒŧņũSôœ‚c­o=LRŧĮížËĐšOoUŠzÚî@3ØđVÚ$…“Wl×A'Ą‚*ĪęŧS ´ŪŋŊ„J˛Ŋ†7čöŽrĻUlt-§L'	zē‡Öđ†Ų@×ĘĮ–ZX)¤íKP@įČ
čXÜ0IZT­ÁBáŸyЕ;BHŋŸõŪĪĀ¤U­‰¨ųŊËxevŸãĮȀ…\ō
T›ú|āÁ 
ÂVšų\•šŨꌒčŸi÷™‘ą¸gtŪHa•„3ŊøÎ7đzöūHā
+ŲDALĪ„õōĨÎ3ĶįrÂȉzĘ3Ârȁ_<KŊę"ũvÂŗJ˜ŅDĩØX	ĪÄĪ’\|%Kxfu n
+č05›đ†đœú°a‹õ)áŲRu :ĖxčÉ’`€æK%ĸwnĩãõ΀÷[ĘUMŦŪšŊH3€ËĘĨwö×{õâÎÛ÷$ƒŽ9îØ$
úK—|ÜYĀ,Ļ2Š+î|(^ÍO(ąr™qįÚ…•<Úqg˛%fG{|(ŽqgfÉ ˇi5č°*íŦf¯™ˇĄP:æîĨD;ëæ’|Cĸ ŠˆvŧSmNÜ9⒮흗'Iė+?‘~­Üyî&áģŲTMÉeīŧÜ0ĀŽđüŠ:ÁØ
+1ĶezRjÂsZ¨ÉQĖœđÁņ.+ČėëĶk§Eqß_āΙ9~	Ėä€;Ā÷ĚÜ(ŌˇsOIķÛųûr‰ kŅáS>ŪΡÍlÖ|`ÎCtĒ!Č´đ[7c¯<ķ“Šc×ãĖ(tBŊ[xŅåĢđXŗ3M&ö}"Ö6#tĢqā•h‡Bķ%6MŸU€™^†CtNĢ{ĢŖ™Ÿŗ
+phØļ’hsfž×įrGļœĩōe<€Î<Ë%É9wģ‡0–ƒ6Î×ÄY)‘á)‰ķ‰”R˙bŦ?Î]Ļ$šĒC÷ōįa o¤„ŖaīÍdŋ7īôd”JĘČíkģy(×Ŧ§#7HĀ˛EÛÃ]ÄžPFĢqķb”6ŗ
„Á…!mFAĩŋ§0‰ĻdsĖũI—âæ‡ ž+˜ü26ų>ØM+ŋÄŧ=‘?›¯´ÂÁ6?…›ņ|rãÁq6uķ04ßæMÆęņ›? `ԂķʎWÃ	¸õØB$ŽāôƏŗuáíÕÉŠĖ—Dŗh†9G+pęœđWįdčÜ´×7h1šéLQ¨:åņķ!Ē+÷:™žÍzv~ĻîÆĘ<Í
īô…TxGUĄĀ“j€Ũ*žw“ąSž÷ēĀ—ƒØyĖ-fzÆīžž‚Üãîɏ“ŸXmå9ɧ¤wCjĻôŲ´Ûį˙Ņ­”ütģũ.K´É~Ęs=IõįĢ•RPPœ˙ŦĶŲŽGi8ĸøbLôyLÍđCh)äR&ŌĀŠvØ-ūˆģ!
*!ŠåA%ÕMĄEąK@øYąP9W×P:ŋ—€Čjũ;+JšCĒ@s7œ‘CˆęĐeŒĨuæŲģ|?ƒ*õ9mK¨čtČĸš­H\”9šfA€[åg"èĖŒ"MÔŨ}VR+5=nTĮč”R€đn"j[ŽzL‡ld
+ēŖ†˙dŌ=
+Ļ[VūQA–Q)Bš1Œ‘égj¤Öõp$)ĸX,i3Ė
+wjR…åčOęsíŒUéÆZø“*÷Ūë#Ĩ \<‰Jg8ŖڙŸÅ	¸tRJķļô[Šag8˛.åBģ{~{ÃØ/•Ņ?8LsƒdzápqĨjeĻÛnŅ4HsŽĻ،euWq= e^qčŋŽĩmÚ9ãtëV{Nį‡R—"ÛŨ×`ÎFCÔŌčŖ7ÕHĸēŸ:%PeGø§5'ũšˇëÉ°BjéˇNQ
|Ųą*Ŗ"¯ŸcG-đÔ*ϗeåüSeÔVęu"¸•’wdĢĄ,CS7ąâTQŽ3wzjHi7¨
+.HjšĢÖQũ÷ĨT4čSĨ·KTUF.€XÕV]U†ÅVûY"˜ÕŠ)ŽZšõoÕl™PcŅē ėßšw
§V~FéÔŽvG
Åôël&ú —^Ŧ§CâWÁŦ$XÅ°×°(ëúcŦŪfbĖúŋ‚ŧĮ7fɕFį 7ÅÁ"4#ŽLĢņô_ĩnc5¯UOõéŲ:đaû­ü€Ü Üc0$xŽû‹Œqũø‚	ÆÉî9WŊ|P4ûĄew×uĨuģP5xu„‘X(¯Cß6	‘-¤éõ,‡ƒöJĩ VŋäkļĄJ’ŽLˇ¯3C	öĢ°áų˙jđÕh@`š~‚D.‚%
Å;ŽP17ÂöĖ}*„Žén'Ēa˙EHâÖY.âˆ-
uŨ(VY,š^
cųO€.¸ÆÎ:6sž~íqƒj—sīa‡ŦĘÛÉr[ģLVkŖxŦĸlđ1ŌUļ&NÖ6F˖ęQ‚^öØž+ą1ŊSôĖÖ,͏ÍFfđ„ŗėpĶŲuŋ!ˇ<ë$Ž6â…i˛<ĨBĐj#ĒˆVØčy*Z.%^?ßhk0{ÃAŲ$í=JĢpKģ26­°ŽãO{5˙ąGjOS:ˆ¨6”ƒ\Öjŗ‡ģņkAߎ­ĩLãņŽÆH¨ōĩv¨/qa‹@öq[Ũi!ŒËÖģ@[™Ö	_ƒíNcŖĢdÛŗvÛ2.î$nMđ—02sUˇvN†¸ō UyÆęŧ-đ÷ávvš—îŦžæ
îD ˆ.Įžßŋî7q‰mãĘöBāøötÜ\ķĪēŽûЄ!WĸģĢËä>Į94*÷ˇĶåJŽ­ũ23w|ŗLÅ(ĸņ\JLo(ŽĀųɃŌŊø€$ë']“Õ
ÅéĻ”ãKFģ¸ēbû[g`חĖëíd—1ŅŽ;ĨâÚ.NÜĨŠœ­ģ/‚Ū-ä>ÅæĄ‰×īáˆxå5^žžxÕ#/|\‰NLōĮĖĖ5ī/Pųŧģfā=ŠĘã&CŊ F… ^ZWôō%„‘x“õ†% lą—ųØ^E­{s'ö7°ēėļļZn*_bŲ<ö,ęŠÖHækļJ/I}ĀĮVĩV}6L—û]ã˜âšÚûzŠ_Eģ9wņ˯>õūÜ{ĸĢ_&\áũnj>œŋü<ÜP‡û Ģãō_ĀĶ™GŪ6îōhT¸|oh^lÆˇ7`OŽ%¯á×h9˙R;w_æîܛŠĀYq­Ôš%Āë.­ÎS;3‡lzĢ?û#!Ņ:|āĪ
âœĨDá‰÷ķxųČ%+•ôËW˛H.ûĀRëę7/ÉūĀņéĶWšQĖ˙÷āĢačÄT ¸K2œ$š>¨/0ī}@Pá{¯u	°
+€`¸ļ,<
+ũû؇äĨ0ĻÉŪĪßĀNŗËŌÁ
ŦTx\wû"š(‰Œ‹y2ŌëÎΈā´qø+×.đ”Ø[ĸŠ‡(xįcĸ×å#ūá#›éæô8™š–#(ÎKā87ÍĻb’Ā,áŠNh
ËĖķ=’Åd
+oĀņģĨęq>/´ˆâ0?
č ø4āŠr2×V2¯2ōbfŽÂxņˆīcĸ€&
+
+ä#
Xbšhã
ß ˙KÕģœ- R°šA
"`ŠÉ´
ŸDä}‚…Ë-0œĒŸ‚;eâ3˜Ŗ 
ŋëA4Ūc
‹ãé|zĢáž-/ĸ
×M'gIÛn™€spŸ280††^JŽ°BÅäû_ Ũ”ČY	Ũģ @Ūø?
+,@,3„÷@€/ÆbZ	}|
Ø2`‘šį(5—"dĀšF˛ZˇÅJQĪ€īmT%ÆîĪ8eĀh	r0!
vGŠĀ¤Ų{3‹xäŌZå<`ĐÆ)yē°GÅįoDúzŒ§\jZųŸžž8ôâū•‘C]%'ÆcSlŒ4˜[Ö4ČÉRX÷m›ŽŋņjƒÅTˇ*
üÄė
īĶĀÉÛ¨™Pˉ?gq9pĻ\
L?[84™ŋJĻ_÷Ā˜XĘ, øhSÍ/'Š˛ĶķāĶA>ęÃėäZËšÁ2}`h‚â$ą×õĘđiüĀėō¸o‘ėXÖ@įą¸“Ü1õV`ˆÕ ŦcåThA"ģX´žüĀÉÕˇi}™Ī[;§ęāP[û+Õ8Š)R“
+FüĀ׉ŸkđÔŠŨ/€lĢKÔC`ÃmæÉrĀĸŖČøĀ€;‚į—‹>?‚ķDÍ
LčÁƒžĩ^đ˜99tJR
+ôL‚ۏY&¨2]	^ģ|ßáČq„ŦStt6~[EvÖ+ÎŧVáQ‚ģÉ
+°îˆ)Á1Úŗ…„"J°	§.Djƒ	žpōLĸ)Ņ^Üa‹qD+ØĢņ#á+'xŽÄōōˀNđËŲĖ=ÁL˜e(Â1>Á6"
=O0ËYˇüÉJņ<ÁÃĮĨÕoē~„ŧd`•āV"[īO°a)|ærŸā%1]āÚ‚éÂŋ
YÃOđž[s…ī*œ`aĖ€'Ø> ,ŊeOj>p&DĘIļ+xoØr0¸íX@ōŧÕÎ~'Rĸs,˜ãkëXÁ‚…<[g-XBŗū“ˆšûd‘ŨŨįkÁtžž@Zđäö›Ä×é_gÁÂØå4āŠ,¸)č‚D„â?,˜x=S;–ß7$fí0Šy…M“2öz0i	mĀGyœtK5Îŗj𐊠^úījpL/2`'!É.āĸț#—QÂ'Šfå7Ųj0ũ‰č
+ŦŠ€#ķÁS[v°3Œ†đ'&y„éû$9aÂĀũÄ4î[wOQ…Wp&%¤ĒYØP\zōÂ÷w&”˙Ô°,+Ø"c8ežœũÜ^c¸“\Ã(X\pl#	ˇš1üeH°eĒ§-š1œĒĨmX´aCÆ0[xbtÔÃa-ijU´”øÄŗ2bQY§×ÎÜŖĒë]Î0“ÜC¤íOS"x¨
â
°gę'o‘6~^åŊû¨˛§áxæáãŗʗįIĪwŽ™Üą;ÃUŅDi†ÕB•BkØû€><ßptx&"bŽ‡‰Ĩ9ęÃĒSŠ‚á–Ķ÷a6õ?>A\÷‡
ąËƒEĖy‘GĖĨ=}sßōL‚ƒ‰i/dåďy˜Sļ“$(n˛XŸRœ¯E!˙fôA0
3“ĶņiÉ
@ė˛+Q'ŧŋÃ^ėęO`ŧÖé˜ķWŒm
+B1˙W›ĸæŒg7ŒĢiĀRKãuwū"ģĢ)%č6öOŊŽĮđļWĢgƒ™ãÖYF‡ĢžŠŊč8÷OĶŽŅ
+mĪ€ãq°ĮãLûé¨>^ž
+Ēū1€`Ąƒ¸ GaiņTBT†liīŽ^ėÃCdHEļ˛˙ŒLCđ+;˛ž
ŧ˜Ī×!’Ķsw“ÜęŸ%EW
+ø’#Ã9“uYíāä5ä”'k
NäúV$¤”ŠQVĨˆéįTĘS0\O™ŖVk9›ŪĒsS™R´āĢÜáũpŽĖ-˔H	ËúŗV—å(Ū'ĩÜņĮJ)nšū÷œ[všĸđ…Xåōü?ßňx
÷ōä˜%tœŧø…>Õ*¸š[$3X:NˇĖĻļ}Â4ĖŪđĒ-ķ=0&į.o™Ĩ„čļ‚L”63h–3˛ˆëP¸‹XŏúÚĖNx™šŸĶF4ĨØšĸķĘŲĖ"_{HÔ Lŋcæ
‰§Bâ=üg&F†#Ͳå4ô¤Īš˙§ÖÂMšHP!žb&Á9ĸ=;Ųŗæ—ôbˆUŲ86°æėtFéę|Xs	7`ukŪ'qš?k5,ņ÷ÉüŅƒĶšU—ZD¨âĶîj@h­9tx
˛†Ü$Zŗ_0™yZŗ)ļãâe͛ƒÔ¤á“-_Y}Ķä͆Ξ9ÍSÕËÜGš­%ũf“Ģęœ}ŖYúÛ<ÍnŒyZŪėl¤žfŋ˙§™Ė[§v? ,fu§č]+‡<EX{¸õp?zģ‚FF3įeûĶœ…Ø,ĶžÍĪķr8ë'ß>ŸbŊHŗĸt§Z4įp*/
+yoQ3^4ŋ{ōķ[­ĸŲ >^
}Ûh4c<Ž| \šgÕ›V4c=ë‹å™áīĨ)Ī<ĻēŸ†Ÿyfęå´ĄNQ¯3ãs>sŽ­tfĶ“īfē>ŋeY(S<rÛ#÷šĄņîĖ5AÄY‘JdæÔU@Ŗj23œīĖ+ŖJ4˙Ō@I|šų$+¨Š÷i.ƒ
;@äúKOķ4[í€ėx™Ž^ĘmŊFŗ2cÎOĨOsvÆĻŠė§™šą‚ãyo=ÍÃᝯĻb"cõi~’Ëxõ=ÍŋĻ\Xķĸēä6§'|jsv˙ÜLx6ž9Ū Gá|5ĨsœÆĻĜÃáU:—ĶA)ĸ:įCå؀(×y8kgga§æ'īŧ´H­xNŠK¨×įw W^ĪmÄ
&ÕšĢ7ˇōŗHŽ<ĩČyú,ÃÜĐ@¯Īø}AˇŒá¸@č	Ĩ\†BS(Đ8ahŋĄĘR‡ž2pKD­Ž°‰Ļ'NDëŠļk(n‚ŅŊ›§Ņ'Ö÷˜$GcÅÍöI‡]b1Ō/‰Kú (C™ĪĖFi’!ŗŖ}‡da_î,–æŦKã¤NĶC"§Ü–(áĖ˜i-jEËLįâ4Rj:
āØĄnú=Ĩy7§%@€:<-¤	˜‡ōiČT"u~†ÄPG¤š9E=ģBĒõ'652ī¨įF1Å`R§äĨÖ=šRUņXēĒ+—]$CĒßFÕg\;u­úös(c5
[-$ģYWž
™_nŸÂ„‡÷šivWt**ŗ–††Öž…Rk‡’.‹­Š0mMˇŽŗˇŦÖSĘ0×+súôęîeˆŪ5˜ōņwŽĖØ…¯xühũē‚6õgĀn¤ąãëvՄ-,	E:ėÎũ*ą9č H~ũkY7öcœ	ë*ęÍębīä™j7MĸUXė–ĩ_ˆ‰ž|- ›‚‡RæŨ›—<
ŗ•ô$ÍŠaĶ]lų8K‡?yĀ—nėb\¯*ÕÅVhkw[l
ēamlɁ6ôâ|Ûj˛z-QAøc‹īĄE	ß;Ōö„øą1Ų&wíŒå÷-kŌ(H(wpėîՁX

˛%„R˛$ģ2ifY8Iļ‰Rķ |P˛7!ΚČë¯dĪ¤Ãķ||Jļđ”} sŪČ'`”ũÅ`”Q@A¸ĶŖėEĮķĢČĢe%&ĶĻ¸hD=ĘZ´¨ō6 ‰˛A[ÎJMē&˜(Û]9q‚G’ŨŦT^IüAV<‘
Čūœ
LģĀdíŊKBĘH˛%
+RÕuôŪxtbÍ$Ų
ī’ÚÛjH{J˛éC Î([•Öbęée§Ę]ŦԆĘ^GX[Pv<jÁ[ī#[ųYœU!ËÃT1]ö4u°Ų‘}Ū|˙FļšD÷ęđląo?ą0,-{JCãĢ¨Ķ-#cė{ąč
+­eúą-œJ\)žqÖw‰FpHĸWõĪ‡ē]õđQHŖ?ļØf2ļ;3
JšĮ*`^O~l´1¯ml)kŽhŌãŠ<UÉöôVąQđ5Š,ļ˙ŲąFâ“'l4CĖlą€Â§ŽÅ64cU<†ŌšÔkąÕG¸SRŗac 
aķ ÂųŒ-Zl”Âtz'6ļÅŽ!ŸōĶbK|ęįŠŠøŠÄ^‰qę@bĪ~|6ėĩvĀŽzÃ6į`;7lũ^FehööķĄnũļfŸ9ça{dįĨEFģÕ°÷û¨VÃŪŪ>WĮ˛x4l7˛Ū‰ą§
ž†ũšŖŌ6^GjØ]ƒMđ`„Mī‹ŪŠ”°›@ū
”–ŊžÔXœ„ö2´C_<;ĸéÅV%[#l+į=b
ūU„MøA_×K„Ŋōčę[ÂļÃÛ˙-Ŋ`gžĖ$(‡Â	öĄ
ĩÅåėüæŊ}Tâ
0š`ãŪ:Øp›–`{„&•tļ\nÃæ•Ø.áf-[/ôËģLãKUNdĒō–Ō˙S]žr~P9ë dī˙§*6ė ģAöäeCm.ȖpšĨJļwa‹§lŠ1–]hŲSĩĘ
hS{köm†‘ÎĻû-¸LŸ-=OwÚ{lĐ m¨|ņû™öŨŲAØ9y‘iĸSŠÁ¸™:ągÚņíöCQ;Ų¸:ˇjßÉjíɚĀčNÃčˆĻĩ3Ã`)
U(	WÛŨ, 9ێôëâĨB’īŲÎY­/Ņ$`=Û`Ļd-E1ŽÖg[	äwȜoƒļáø¤ąOwļ˙B`ÜfļÅöõĨ\ĮÅļG‹Tgģ#’ĐēXŲ8ۗū¨šël¯‹ų#Ķ	qļËŲųA‘¯‘ČŲãÆ<jCygÄōãŅĩ#qü>H]Û7/•3tŽg›ŅúŪ“ƒļÄ4Aۖ°)h{kמŨ?GëøĀÚn|hĸæleŽmĶ
ŅAŠš_"h;?ķ˛Íë(î@Ûb4JY7hģÂx“a4
Ú^#ƒå˙ƒļ+ŨÆs.RAäČö&ĻŠé/!û؆Ėé ?w&ā%Ûr‰í™[‹
4ŲÎÍf'Ąåî˛ÂÍČ?ŖlOļ¨§€bĮ×YŽ1Û
+ˇ/ļY'BQR‚mŸV.(uį.eƒmÔsæ]+„5Øæ	ĮqtÍ`[Î!Ãq%“`´ÔüI¨éé€mKtĸž&ۘ
呋ˆîŲ†Ŗí'q6Hm‡įžļ­ėe–&œ"hÛ¤Ę;^ąfđQm{”ÜgUƒcŋ­mÛŋ'H`Ü˙VgˇƒĪĢŪĻ‹j>…T)Îôq;‹ŠvoĶ“¸ŏ¨Ä;;G*ˇÍíĄen;ĒKÜņ܍Ŋ¯2ēd’`ĪĶm
ëš’]…ŨĶŠQ힚˜	āĀ§Í§hmZŠæ*ŧÅŨ•㝂—wŠ™\ 7107{ę-éÜČŪkŸ íŪĀŌ%å~æ˙—^l6ßŦ(.ļūA(ÖwšīûXĻĄ)ô˜ĨŪņ÷$í1œķĐxäž
įWāôl;ŅöĀķíŗz‚Ÿ^đ*Ę˙ēķĐ`TŲāķlŠģ
(ņp3/Žv‡Č>ˆÜFÄíNbᯀáŖūNÃ4Ô9<æ
+×q˙Ān/2ˆúâEaËF*CâHÅğ­Đ(.}ę’â'Œžĸ§ø„ŠwĐ7Py劈Ô:Ô㨓ÍÉxągC×}ÖŨÆCŋ¤LCO;N?Lã6’…ŊTš×ņ4ƒČũ~F>ĻH.”į2îØęŦ¨’ßËëؘi8ãɧGGš$RBåĪ…&ĸÎ~YųōŌ^ËSš&dŒīnk-˙ęōĶ_4b>Î÷.ˇ	%û@æšš“Áh.ą˙‹ŊR ĩų›~‹Ø›wĘTÉâ|ąĘn{›“ÍB~°ņŲđõ|âû
ķyŌķįŸwū냞vŌgč>DDTŨˆ°ãp_Ņy–GķīĀ˜}6ŠƒŨH)ûŌc˛@
Kŋ1LĪ,2L5Ũg]kœÎšÔ+O	ęs•ĸn
	ŠbāSzpađ¤ŪŒąß#§—ę6oíĒ{ŽZuķĢR.Üęh`ũX˛~DÁü)­/ĄĐ_ZĪŊĩmũJ“ëĮS)f	 v]î+Œa¯øá¸`˙u28¸ēØą•T5å™?˛_åĮ‚e—īDÅŲėæŠ:W{1…ēŗ3Ũ‹ĀFíę~fŖĩķG]‚ÛßŧL5Ųvūéö›åŊĪîpô	ėÖlî32âŌÚ%øüÍÜ	Īeĸû˙Ģģĸ4í°šŖ8GgŊģ–ŠīģŋŲĪ;Kȇ8ėŊ…Ŋ˙´*ZY™đũ˛/D}_ZŌúųäߧ=†đ|E	Ŧ=‰æĀ˙qŲšāļ`
á­åswn{)ü$VËđ)ü”˛;üŊi`Mˆ&ūĄMĨ
YņčŋøĖ€"(4>ũ™‘8>uÜJÅĒ6=ūŨËBĩ„<’+(ŪF~8°c}=yû)/Véåxŋõ]žpxÄüĒėlæs0zĄŒ5O~ķ*ίāDįM.ÔÚō|áWäį#ô=öĪĄÍØ&.úV?úD^„¤ĸôzLÖî:túÕP?‰=7ĮĒOņ4æ8ƒn
[˜õņ	A/cļTĢEU~o€…#\”ŌØŽŠÜέ‡ŨÎčk2éM0öš eŨßüNFÖîÖįčöĸ^ė\YŸ"t÷Í+ëß
!/ë@nU+Ũúķ}×ËEî.ÃŽšˆ‰u×áŌØßŨõk]_ŧ둋xd×÷éeĶ¯ĪĒĀW ×_ZkĀIÁÂ{Åëã!+uöÃė^o7°?€Đ)Å~‹ėöĮ[¤F:
ړ–P˛öžWļũũíÛXÕČ=Â
Ũ×öŲũ|âŊTÁŖnŊ/9ĖS}o.
+oOúÁQ<˙“ú|w
SZTŽŋ2gƉøū$,ƒtŇ^‚OŒ	/}ßaÅ<Œ|X?ųŽĻ–?i*bÄül•ælŠ÷5ŋä=é|3˙
+JŸīĄũ‰&ˇãŅĪ[˙Aeú‚OH'ę÷ĸÃĀMĢžK1ž­˙Ā6ˆ?ĢøŊžŪ‡ˆIãÄØßOęĪqö%<Ō3f×ūWŸ_
¸?Oą2Ō}‘Q;äũŧž¤gß÷)D‚ß4tļ†˙q
+ŋ)Aß[üŧĖUȏ˙WČą	(ŋè 1?yTGF‡8˙„QĐī3ŌuŦô‡S˙‹ĮãúÁ(Ú,+ûÛŸx˛õŨ߲¨rƖ“CŅ'æëšLūtÎ?Ō˙âGNmũŗ*OB‚Ĩ+øũ5´ ˙ΌŲ3úį˙"
ŦũˇŸ^Å˙š­­’0ũ%qô?Ē"ę€ûĪøHāĻķŽÅ˙í¨z—įŋ`tI˛FÆ:Œđ}šņ×ē øVJīđ_4ŗD' cnÆÕ#Õî%%Ĩ}Î"˜BŗŲ-“~—īîÄ^hŦŦö(ÜÄ'ā:ž%Ã{Tcmd#e(ĩë[m$ŊÜt÷žIŗ‰˜šPulÂ*e›õ-Ɠ~Fŋ3´Ŋ"H†=ôDz—ŪÔũĒ@pôYĶáéĨ›HNËFB—ÂĨŒŒĄÕ>FÕ.—aã:i>ĶŠŒÚ•Ičyüŗņį”%2žJ	0>
8IËHŦƒ_›‹›wJōŠosƒ!)0ŌÎ<S¯žķ8ĖŨhvGWNâė¸ck:=LĻĨÜ.ĸ—§HŽtTNôņkn&LÔķĖíp+ŗCļJN¯2iL{›[ŠąaF&_šnmšÅ!ŪBR°ÄÕ?bSčŽÁM1¯&	fÉü…aSI„Ąo/ZÖJŪGŋŸĘgŅ_Ę5Ža…+Ė‡+ķķ–õô4‰Āæ.?Œ^¸€ļ(G]‚Æļ-Ŧ8ö-RØ,T"ÉֈÄŅI”"?‚í9ā^pī”ū˙§i;Ëöoēū˙¯üŦŸ§ßßũųyåį鷔)%)EögRΞ
+Ēŋäļ=ÛRS|!F#&#of3Í^ZmĶ×æqá>âžMDŲˇĩlë|ūÁi/6ƒk^jâgúôŪ2sh3īt†ŦĻaČjš‡}ã(xˆ‘ŗgŦâúZ
QLå2(kĻ‡	Ôû›<m*^‹‡¸K­&z%Îî?@zøĄLiôŌęk›ĪŪžõ F>ĸH@;ŽŒ†9Ģŗ2tfsĐc_Gp‚ą&Ōüë3vnŲ˜9[Ëë_ÜC…üKÂNwđpuûc9߸š§Ņnļ	tŖcęļZ›Á7§đ­†9Ģŗ\ģļÍ2MšĪņÆy)ÕE!	éáë{ųjšŋĩYÆîlļŲƒĢmüÚŧĪ!ž]TiãÎ}@ēzĮĢפxôŽœÎ=‡zŊČR°Wá ¤šŦˆŌ°ˆĘU3$=ŖŪįY¤ƒ*VÚüzĻ‡Å/Ĩzx7…ziîÔj@ļ_TéˇũQŧģeæĘf™ģ˛Z‡Îæ
×ŨGƒeOß˛$ĘŽ-´čw÷xõn$KÁ{č1đ÷ ÚÅämĩ0iZ°Ģœ-V¤HHBú5 ­&mÁģßSˆgë|ë:Í^Z-S—&9öŅVÃĢ&
Čæ,%âđ5ęunŨiØÆ˛Y/X
YYōŌŨ8r^§K÷ûŧ“gØV‚Ņf/nH˛Ī†=ŧĨLo9/ôØg7u†mĒŠw‚UĮoā4ė…"ũŧŽˇŽīpķ~Î Ũŋųsû5{mõN¸îqĪæųâųŊĩžđŨ탈gcüŖéSŖ™HģŪÉ|ĪĐĄu˜˛9cw-ķã:€q헐"ߧ@tŽĐJšŨ"Ō)sA1•'餙@šÛŖËAģŒÆOÁg=UBņ+ur™@Ŋ"žMŖ‡FËā‘Ņ;ašd9¸uę,Ü
+-úŨ3zhôÕm›™ÛÎ4|j´ŒY6ÎÆÖēÍ;†wķÎk9Ũåŗ–
›éSĶö0ŪÕDbĀEēšH؃&ųú
`\Ÿ‘kë;_:û3đ>p
+žœH´¯rˆkŽ*Ŗķ'Ļ>Î9‡PÎĪø™ŅJÜŋ ŖW€Âą?x1éĄN
īCŊ/ôØgMP
ÛK ázÁHzĢįŦ…DSVđ‚ą3‰rmĄIŊ´)ø¸ Ŧ'ņ¤#Ņ¤ˆpüS#ŋTđrÜrüëB“z
‰đ}U€ägåŪ6‚kžÆO’ÄÛ*mvm¨PÃíŅä ÍÃÍû7}qŸ&Ī­ž	”Ģs¸p?‡PŽÛbbüAäŲĸ‰jŊdyčûfæÚēŽ7në“hgÛēõ™ģ´9‡+į d‡ C\/u0=ėKœŪtÉí>†x[î#ߍAŠG¯ÔÉÅ
œû:\:žû>ažOô˜´ÉũN a,;‰ÃŽ´Ų|ë9Ũšîƒ¨×ƒ÷ 
íīœ}3WãÆuœĀšŽC÷ˇ`c×ļžÕ	ËuĄË<߸”ųzėÛN‰`ô\8~&NđwMėz„j9@íVDvŸCŧä¨W%ƒ˛Aū}œĀ¸¯Ãĩķ@Œ{6âž™g-ęUÁx$šô5~j=†n;Īü™É9߸ÚFđĻék“ƒũúiØv"ũÚ9ā9úę&g¯m}LĮnvRõvĒĩ	Ŏā„bGPbŅ#(ąx…“îjícMRí
KBũ“(øv5üT. ģËÎäųMÚäū	@8ëE@k-˜õƒ’ŋhōīžņƒû<āēÛéŗp+E"ÜÆŗŗŠljģXÕnā’*S@ō)K‰PüB“}žÅŖ— „s΀D´Ž tf Ō7…‚?PŖŪ§á[ĢiúĐčœÂ¸ęôđkhõ\J:“(÷žŲ;ĢeōĘæĄĘžĪDÚõP
˙§÷įÖũnŪ/’ŧõūÎaœŒÍå°°ë›<ÆtÚíXÍjų蔕4ŊߨRđÛôŊõĢÚVÎéÆŲIœƒvĄÜ§áS›…(û:ŒHú”ĐšĢu´K(ō9›hŦ•8ŋžh2đ'irŋ¤ß’'׆BMô
dHŌW70i/&kĻ…:ß:>6Į>[j5ŅC~%Ė¯€㧂ņčŸHÃ:ŨēäČ÷ƒ ûŧÎWîķ Ō}Å<ĪŽû;_:Ûgņî9ö} Å<ÛįĪž|ķ1wöS÷åŊ5yĻ/M›vëR%é-ŸÚWPkšõ„[ĸúģŒˆú(ÕD´ČwāŅO­2zžÁ<ÛÆĪ
*õđC™ÚBŽ}ļŸ›i3ĢyÂuļRf×6Pę%KĘŧ}ī~ÂzwîÛøŨÆõŖÎ@˙töKŸ_ŋ@Eão°B˛Ķ}-Œ™vŦ'’Žc
™ė˜|Ō
+€ėL§ŪÉį‹,û5„•4ƒĩÕ
Kú@*'pŽ˙(æũ$Ė¯?Pzø›Bŋļ(ø?x1é´`ôB|6 Üŋņƒû7€p~§;ˇjÄÛ
+AōŨ=†w¨˜b3pĒŊ@…TÆâ9H=ėE›€
+P8ú,—uVMÚĒFeÍÔųÅųžųē2­Ė]ŲÜÎķ	V ~
L>†#œvé×ĪėĨÍ1vļ6'WY~)"é<8i(TD)ŗëĄNŋ“i×vŅõO"ž~'<÷eîδ4j2Īc@ÅbŊÅÚ)gõȜ
€’Õėąõ™;ļų‰4lG*ūšŋļzæîlö
įŲMĸāž†cí‡d­õcsŽdsfĐÂŅ?~%@rÔû@Œ|]‰“đK@´ pėQĒ‰~‰Ķû…ûžĪâŨß)ĸüNĄ…ö“(øBüû<y>i“û›<ŋļŌ&¨ī>ĸ$´ŸDo§ĐÂÉrđRÜŗ}Āyöãß}T)xEÚI™‚wdŸŠÄķ<‰t_MKãgFÛp×zwM{3G+yz{-ŠķÖ	‹‚
+	úÁņldÉí@Œ|^‡kį{
+ķ>7ī×čąõBšoD)ø¤v)ÕCÛČōīÖáÎŲ9‚Ĩ‰7gw{ČögėŌę뚭•‰+Ģo¸m>į+įcæļZē3íĨŸ'ĘÜŗõzĨāOÚÜ*qzŋQ& ĮéÂõšžĩš“Ī+hąčА¤ @ôAâŊ:<Gãtá:Ž`\÷YÜÛü=Œv5
]Ķ÷F˙$îų ĮžoD8Dé—C(÷cāČč8˛ųŽæīŦ–É#ŖgčÎhB¸očÖ'´Šj¯†`jĖ€ė
h<*qzģ$ßgũú)}“u“ŪH’ûwëzÎwŽ#]ÚZ<ÄŊ‚Й‚OšËįĮō!ĻH
{OĸmĶ}› ÷ę§ŌÞõƒS{Ą‰¨ü†e}Ôč…(û:“iaáČeĄJ(ŊĀEczÔë2vgōM׍FôNŠ…uƒ‘}Ē„b“(¸'PÁؙBŊ_‡{×}ųjĄEŋûG‘Ī9úu!IĀzęDc§@tnĀBŌ=üS%’ũĀ)øî	įũ.ZĖŗ›Dŋ6éáG`"ŅKĨ&
+5ūũpŨį9´ķF˜€B“zw¤ ŊķÅķ5xn@‹z˙ÆOÎĶäšÕ8€sßœw#]ÚLí#ī#īĸ†JbīmDh÷ŪũG<Ģaß`d'Ēė5kķõÍÎ^áląē˛ėФ ĒėˉŲ˲֏N™é3ėuëėžÂŧŸÄIø—2ŋļxĪãĘų!Č?{Ē„âWpbŅ6ĸė1´ŗ‘,oCŧ[æŽl–‘#›ečļŗ
aÚ÷Qŧķ7„nũŠVgcäîŦĪŖĮ)|ĢeėČdŊ3­ÎWîßÆŅ;`ģÚĮąÎWęuĸK?otč{ņ:
 -cw&ĶôĄŅ7r>į;Gį|ß<Ob]ĪųŌÕ6~põФߎˇîãžyîÜĮŒķ6|o}Æ.­–‰+›iôŌj›?ˇ:ĻÎÖō-ˆ\û"&îË3vi5ׂyeũ¸ŦĖ€ėZ0~1&JÁ‰“› Ŗˇš!ŽœH´•8Ŋ\ûʆeį*âé5(
õ˜xö-VĖZÁÅĪÁ:	”°3‘~Ŋƒ“ĩ…'ĸķÖMÚé´đÛēŅ3xjŗ‘Ļ`ŋÚ1Ųĩ€dŌ
+V4ö"Ėŋ_#č&×ēÍ9Ū¸Žsį
œ†=„’=Í™ëĘŠ6CĶYƒ”Ōˇ˜F€ēøŸ6oĸH@ÛÆī­ūaäë‚pΊ€ÎH&íĸÉŋۈōī&‚´&	Ōe×nō,´—:šŠĶû§F,ū&?“g×:äģså~
[Ũsh'ôØgķ€īžŽwŽ'Œ÷wŧvv
Ūš§ąkë9Üš¤čg7uvˇJ™„ˇShĄ-Ĩzx;‰zī$1÷'qĪĪāĨÍ1teŲÄŧš
ŒHÚBQYŠĶÛ¯lˡŲ°˜ē­VLWUö+"•3ˆ˜ŗ]PÔ!¤Œ ­j`Ō;Ũģ´Č÷ĄL?–
ˎuÃ˛32u~mĻOīíãæoß<PcžŊ–ĄÛÎ5€ku͞[=×&ƒWĻ•ą#“iūÖæ™ģ´9&îË1w_žļŨØĢ[›É3“iÕän[­ĻĢmÛj™ģ[†Aķcœ,+ÆmíXL-ÛļŅ5ƒjtßM„éį›H}'×÷$â]Ûž6Ļm+ĶđŠužÅēŽĶ…ë×ĩŽŊžÕŲĢܝŲģŌymĖŨņ+Ķ^Ûz–qø0$éĮęĩ•:šC“~ČqĪãxįčÃŧúˆ°û(æųE;§ĪCo 4l;™víĨĪA;˛Īû4Ūu JŊūãˆWØ6ķ$ÚÕH™]›Ā8:FŽLk7]ú&ĐÂ?TÉ÷oã:
Ÿ$_ŊSˆGÛüšÕ6lŊį°î#iú(Ŋ†(§ķ˜ŨÃĶúęĨaŨī	įų¨†ŪÉ•Ē؅ û<O¸ÎÖņÎ	=îŲE”‚C•}_¨ņī˙ îŲB|6‘¤Ÿ-äøgAōŨ:\:?SˇFĶäĩuĀˇū­ë8\šēŧįû~P" 
”ČwãôŅŲ:‚u÷P$ßvéōģUĘäŪIbŽ}DIxƒéžĄ÷1Ôû9ƒt~æŽmžšK“õ:’ũ*‡˜îaŧĢaė>&s§Ļ˛üCĘ$üOŠ†õ•Īl—DhŊ¸¤Ö„ĘF‘„ļNˇŽ‚“OšÂO:JÄá“(øVÂôūžCŧoã×æküÖŧ [ĪéžŲ;‡sžĻ¯­ĮԑieōĖd3íØ5‹™ûc׸/&ŖW6į€įh›.-ŖwË1v?{ûØĢœ-6“§ĻĨņs“{ņęî[-c—Ļ•Š[“eāĖhģ2ų†ûVīÎųÆģ.DŲב:=]ŠÅCWĪäĄŅ?Šy˙H3đ'evwĀvõĩ͖¯oļ†­c¯qwVŒžŅC“gúĘf39ĻlƒaĶŠ
1ęũCŧžã­Ŗ}ņúФŸ×
ĶÕ5{p3Ÿš|3GëxëúÍ [ŋ	„ë;áģ(ŅīMú ĮžŽãĨķvd˛NXŽ>â´ņ{ŖiüÚæ›Áˇš†ĪmŽ‰#ËĘāĨiwīh#ņ Węä~D:?Ŗ—FËä™ņ(ŌÕO§a/4Ųįuēu˙&đÍ×đąÕ4zkĩŽ×ŽFpâqž°Tģĩ¤S6`zˆķ'įBÁ˙IÔĐ#]ÚC’€~Į[gįtį:ãž7z"Ęŋ˙Ŗ¸įyĀwŋÛüÁÕ7oîßøÅyœ?9oĶ÷ô˜į*m"ĘÁúH3ĐEöéxįėšŧ6÷(ø‹*
mĨMÂ;ČąīãÎõÁ¸Ū“ˆįƒ¨×sēsžĮ¯a
+v&ŅŽ=4	čsžs†OmūqÄķNĸa`õ°+ur˙¨÷3!9O€â)KHâ)GĨ*ŪüšqA
­%ņ”… 
}wîûę	-úŲ?Œx_į[×sŧq>H2ī=âŲ:aēēp­žēmŗ×ļųÍc¯t[,_›ŧƒhWMōuœđÛ|ëY˜ļZl†/MģŗH7ÎHžÜɓ[UúÕC”€uŅå`m¤9X?Š‚ûu	D	äČׅ(ų|ĸŨ“ˆ×§R$z	B:iŦ•ĩ‰<ˆtæîŦŽ™#ĶÆĖŲژš{•ëcס{}ŗą0kvØõ­ÆÂŦÕcJm EŊ߃hįÄ‚hŌĪĪđ­icčʲ7]7:Į×wžu^į;ׁõzQ%āWęėú¯¯é{ŖiøØhžÅē~@5lOXôC”5"]įAŧë8ƒqūF°ÍÛ˛užÄģZɓđ3p
Ų›@˙ \Ÿą[“iúÚä›Á8Zˆ’ĪHEėVÃ=‡v~įkįyÂwũįq¯VũÖQ'k(ûŅ%ˇ5öõĀÔ؁ųž‘XđKúŲFâAīZxGĨ*v,"i0*é+ëĻPī
´Øįuŧtg0ÎĪāŠŅ4xk]čąĪF BņC~ĸH@;ˆŅĪ/e~í)Œžę…ŖcŸ­Ķ­ëë9Ū8ĪƒHįõ>O¸îī€éžĪâŨŠėŗÄ‚H‘īīxëėœîœĪ)”ë<‡v^H’ī÷ŪũœoœßųÚų!I@O4č.
ŋR'÷7}zī'RđW‚ŅCū Å>ûĻ/Îö9ÄŗĄJŋ•
q€ĸũŗ¨÷köÖ|L[YÍŽŗ™>ģ6Ôiá)3ĐūQĖûAz7ĸŪĶ•û7‚m^æŽlŽácĢ6˙ū“iØ7†}ƒßA‹IO•ōQūũ8¯å[lĪŖ\ŋ2Ų+0áŦĀPėFœ€'‘îEú}.kŦ˜´’õ–MēAŒF_4ųwīxīzáŨ×éÖõBš_D)øĄRŊƒJŅ÷Ūũ›>8ķ'÷q¸p§;ˇũaŧģƒ÷ėÃģßcx÷kđāč˜7ŗ9ŽŒŪ
Ķ}ĸH@hQīY~Ĩͯ÷aĖĢgđÔfš>4ÚfđMŪ)ĖĢ÷<Đ"ßrÜķ<†wũg‘¯ūIÜķ;ß:ŋžĢ}ķ|Ņ% ‡REôV{‘Ĩ`ß
ßÕ7ܡšįĐÎ9ęũĄČ>ÛČ2đK@´!Ô°¤ pėMĸ_;˛ĪīÖõG<ŋ4ęíQĢ‰ĒÄĸo
{#LÁž´ÉũF˜‚ũˆS°OŠ`ŦĘŦŦhėS'ûT‰E˙D
+ūG™ƒ^(˛ī+izŋT	DoāÔ{‰ŋŅ%ā7z$MÂĪÔųĩŸF
˙iØNĘėz!Į>ˆ‘Ī÷(ÚyB:ßcx÷‰&ŊhĄũZx!úũB;ī“ˆį.íĨĖ¯t9h5ō} Æģ;é˛kC™ÚJÃöQĨā´¸gû„õî E?›hŌĪ.‚´*on]ŋ„ë=ˆvļPdß?Ęüģ‡"ûlo]×ņÎŲDb>›¨ōī#]ÚHš„Ÿ¨ōīYöŲI˜„ļ’f×>’$ŧ…ûžĪ!QeĐ"ŸÃ•ŗûâėĄĮž;Š4ŅNŌŧkôÖŧŖvĪ3veuÎ÷íįxãüU­Î^×lŦ$ß'ĘÔûB”|^i“k;zɞHÁŠsĐßžõ™<4z¨’īOŠ8üR(öĻRī×AœŖgúÔä=4ŲĐ­˙,ōÕFâA¤øuëč+Ûö&Žž	„ĢkōÚú
 œŋ	|ë9Üē^ŗW_ŨlųęvĪ6~nŪæoÍĶüu™<2Z†ÎlÆ!|ķ6€n5Œ…ŲÖŲŋ6zhŌĪ×č­ųB;?ų'G&Į´Ų˛L™Ŧķ­ë@Žz˙G1ĪßÆÕ8€tõMāŊShį‹Ä~<†xŊ¯Aöų ČžÎcXįiøØh›?¸ē¨ōī?~ˇK ‚w”ęáíFd‡2MüH?T*ĸ?˛ä~n]×ņÚÕKŸ_Oå˛ŽZ=üKž\Ûiü™6Ŋˇ%áw˙1,iĢ•]

+GĪ@Eã7PļÄ‚ōī1îyĸĘŋ#Ė@›į°Ž÷„ķ<dßGŌ$üNŸ…wÔęá—JM´Ä‚?ˆŅīķ„ëlÅ<OdŲgMúųFŧ?Ähīxīz
ž›×áÎŲ>‡xßf/ŽĪÔ­Õ8r(‘īfúėÚS$í*?ƒvTiĸŊ¤Ųĩ—6Ŋ7TéĄŨz„h'qÚR$m)TÃm’&á’äŗmúŪēM [ZÔûKš^;I“û“2ģ>čqĪÆ!„ķC_JõĐNp"Ņ>Šh9öũÁˇú&đÍ9ōŨ=āģoŖįæqūāėŸÃ=;	“Đ^ĘüÚ8q˙Ēöĩ1rļ,cW&ãxŲlDēŗeŪaÃnkÀķ~ĸ§éSŖqŧo>Čqīë„éj°]ŨĶX×u
+é<Qfßĸäķ?Šy^,×gúĘæē[ŽŠÛjså~Īb^}ÃuŖiÕčkZ=Æĩa_1reZ9ĩ9æÍLKŖ—VÛŽųš>ļ.3‡F_ŲníuíÖÎÜĄÍ4}ku×ō-ˆ|öâúVkečĖhŽáÅÃ8x]×>v'|W#uú9ļēfÍëpån!ÉžŸC(÷eâĘęēíŦãû@‹|_‡[×uēuũî÷|õ~Ņä /ĸüKŪ¯´Éĩsžt5a\­ļŖwëúĐ$ ?˛$üO¤ā…Šø
ū(TÄ…
+ž•8ģ^‡k÷qį~į }õģUâŧ•:švĶhØH˙Šāīô	ž§F(~(SC;IĖĩŖVÃwÔŠâ‡BMôLž_{č1đ5ōũ Į={§ĐÎëxįūN÷î˙ æŲA{÷PdŸũcØ÷õžĨāOâ´
˜Ú	D0ÚQŠ†ļ‘åßũæģsåüŒ]ZmķWû ęõB;3įuŧtžįĐÎ÷âŲ<_;›oÍĶØąÕ:Ũēo4)xK™ŪD
í#o/"īŠ‡7“fĄt9hAūũ Fŋ?Ôčw3iŪU2m1Ŋ‘XđYúŲC–{ŋfīŽÉsĢķlĄÆžģĮđîûâũœ@:‡PÎ+enĨN?‚‹ž(R°ãÆušŋ´™†­=ūm‡ûî?8;GPÎjŧģ‡$ûėœīۗĄ#Ŗ¯lv6ĻÎÖæ„ßž\Cgkaδa0gYąē[ž!|Ģq¸pßfpÍįxá>MŪ}uëc×7šģŗ7_ļTš×oßüĩ­gaÔü=“&‹Éämĩ8a8ZįPŽžņC“kĶj™ģ3íÕíÎ^×>–oe1´9Kç6ßĘÕ1s[-Œ™vŒ×_`܃…¸žyŦLŪV–ÉÛj¯p^Sįą2{wöēFc9‡
¸W5/–S(דBûLÜڗ‰+Ŗu¸rwŖßjäû6|oŨQ¯7}zo đßŋņ“ĢqįēOxĪ/ivo¤†Ÿ)ÔûķŧÍ`[}mëŲĢ۝Õ)´Ŗõž‘˜°# ŅXS`Ũôv\ö¨†ŋI´k˙,ę}pœ÷9ÄûD–~ļ”ęĄešø™>ģ6“į×öIÄķ8ƒtuĄœ'ēäģ¨xüJ,ŪE“÷ĪážũcØ÷yÂt÷ŒZ-3Į6û(æyŸÄ<oøÖiđÚhœÁ8/ôØg3rī¤ËŽÍsX÷o×>Oaž?Ēŧ•0ˇE’ļá]Ã…û7r~fŽq#›cÚļōL]š<ƒgFËĐĄÉ<_</´čw5ŪBŒ}wNßŨŊ#hˇ=ĸü#sâün›8ŋÛ'Īđö€¨áũôY¸íA´ŗmöâúMß\§ącë7|qũč‘đž’1ųˇnˆmĨLÂûî'‰š6' MÃį6ßđÅõžÂģ[hŅīNŌŧ‰˙n!Gž;	“ĐvõŪIžƒļdßŋžmĩWļ[ĢķëD“ŋ‰ķģEš$$ķ9Ôû:\š;§ûfĶô­Ņ2u7-ŗG–Ŋēy9Fîgi×f˜2YŒ‡iøĀ}ˆ1yÛąkÜģŌÕZ°\ũ™×{į<ŸY
s†
ÁÃ:dā>„WŒÚØ$^}}ŗŗ<æu…ÛbcŪļZnŗĻ
ģÆyėLߙŅMÆ1tŖmēn2ĖYVŒƒØĐÅģˆk[ĪŌüĄÍ3zhÚšŸŊļu1ŽõđÅm¯üƒ
ƒ&‹]ãēƒwgeđė™Ûb_0fX1˜ĩą0nÁ¨ÕaWļ[ėēöÅŽe}Ž#›uŧsļNˇî÷ÚŲ4ziĩc^”ŲõF“„?†|?ˆŅĪ#‰šöQæ 'vn]Ą3ÃÆĖŨc6]6ZhŌ¯MęũČŧšįPFâ$ėO¨…é“đūYÔû?ŠwˇŽwîë|ãėÁ6od	xGĄ"ę|åūŒ
ãfŲøŊÕMŖŨ;ˆEģRĐÆųŖķ5{p5Í^Z
sæŗ0eÚėuLËŽŗoáúžÚ<“ˇFĪÜąÍ4znŗO"ž˙‰ŧë1qf2ī2öšļ•iîÔzž›§ącĢgėŌč=ĩ/wV_Ņžŗĩ0is–æOæ9´ķ9ƒu´bžbÔŗ{
+īnžđܖoÍÛôĩŲC‘}ö‘$÷U
+ÚMĄŪģˆRđįÖũ›ŋˇ3(įoã:МįųÚŲN Ūû
+HûH’kÛøĩyœĀ¸¤č{
+ņžŒŨŲŦķŗ(íĻMđíÄųŨ"]ÚL›Ū{)ķk˙4âŲ:Ü9ģ§ĪÎņÆųš=ˇē†Ī­>ēäv&Îîļčp;äøwëxįlŋĩÆ­•ƒwkkŲč+[ãXø‡]<ËÁŋĮŧČÆždúĘ°5`5­LZöúöÃøYXN†ũšųSÃ1|Ķâ|åä˜:ŗą<5ėĩíã=ėãāqmāĩ‡+œėjˇƒ›Áxįđ{ p‡qu]ílą™Ŋ4,āš–fpM[C¸6ĶpÕ˛0mZ,˙_^ģ÷_`ÖÂBĀ Á˜Éa×3âĘF‹]Ųh1˜´lN‡øĀChčâô8ę­ŦŦĒ+'	fyfœŽ"T9U9]9EhĢ8AČrŠUåt?°‚ õ€ĘéĶ§ŋV;}õÔĐÜöÔ68ØéP;U9%˜ÚšSËÃ3ÃJ¨k€eÂé
V–ՎœĶŦ,-'XXZu\NUyfbNis];ōÎÚˆV
Xmemia=¨j
„VYXYY T]aE°j`A+‚•Ö,U´ 4€ Ąę
„Ŧ
heYiiieieieÉemaYAˆAƒV„XZ@Đj AĢ•ÖV••••Ö•–UŦ-ĢZY[Ŧ hhđĀ*„VW°°ŦŦŽŽ"X=ėŦíh¨Â²ēēĘÂj€eueuájkkmGƒÖ•U-­*Ģ­UWUWYZ
ĒŦ´´ \EÛāTÕĩ˛Ž"Dxpĩ
+ÂÕV•–V–ÖƒĢ™ŨÖĖI>):&ũ āĐĖŒÂ÷= ōbüĸôNĮ#Š•‚Ŧ>.ģ?XˆŊAPˆŊ=RX~qÄ°ôîp!öî¨qY¨CÅexĮéĨ!RĖD›—ˆ@2/wdŠwˆ/Ø;ÚƒpņÆ(6\į	üCxĀė0qŽÃeøá2œ†×pžÃuø
—á3\†Ëđ+‡á1<†ßđ.Ãe¸Ÿá5܆ķpîÔčÖ%„
+ö"Z5üpĩ3ëâST¸“ŽABĖŸ]!(GXÖ¸Į¸ņĀ*E­Ä9âq	čߔ&밌÷ @á<4r‰YHd´’PĘ.ânÄÜ 4.ƒœV
+É!扁iČõ2üŖTî1BŪAzyčŖ“ķ	ĸĻ‰*nŽT˛Ø‡YZ?øË߈e˗ŦŅ…ėoėÜ8
ąãVK_:št
+čÃCYfi9āNAP|(Ɖņ"žÃ{ø
Įá7\‡įđ>$cÄĄˆœø
#܁wÃbbĸé%aüÂ
-><H@„—Į/"Ü>Ļ^@$=4€ac'^…\
+ w‚ŸLFōEi"Ų×ĒD“ō‰āwē/VdņŒ-g™‰B*5pŠ”}œĐ<ô
ę)y¤đĶņHâæ!kffaPKB 3(YwTņQI胇f؇Ēˆ•˛:|ø´ąYĪW´~Œ$Ąq
CF3đ:1,~!A~Ĩd€7râR6JÜIƈ#]}8QĖ?âAüˆ'qĨ)NSS¸íp´?đŸ!BrĀ‘lp"îă8âJœˆ7q"ÜIi
˙_|Ä~aXˆĄč¤ŊŌ
+ŠI?)((ũžĐ˜ücrĶk¤”R‡
dpx’…l=ĀŪ4,’yé"ŗPHéæĄQĪEÖÉÎĪ&z›)Ļ´UÁBļ¨e‹ßL}B§ųX1ĶqĮ¤8ĖƒsQĮ&&#ĘËpŽ˜‰7J-)Yš]*	ĖÆL8$8@j׏Á.BųËzĀ1dQņ
+W8Wža+‹[pÅŊ2DāvļÂ5¯lCL][‡žČA0ãžöĐ%+îņÅ,ĶƖ4Į#üG"üĐÃÖČË@'-āNdLöĩūĐä:9Å4q…MoŧĀvåC×h5™„'ũ–ü€äk5’¯õ‹äߑ!—_VUĘÁ ;Ä\ 360Š_hAĢüÁ…ėRÅĩĖ0Rq×Įņ÷G	ņ×
+Ėo–ƒBnˆŊ=T|B&	wĻ âÆĩō¤ŗ}áQĢ€ŖÔŌ¤‡ŊtŠ-IXYŗ4m•ŗtd=ū(!)!Õl4’y$n+XŽqJ""ŋŒ6'Al}Yņ6ū
†6^‚
TĀĘ,ˆ–™Ę
Ūŗ‘ÉáfaÍÍM({œĒSä4]dYĢ,ō…ėđIOhÅ
+ˆeĩfꔸĪJ%ŪQF&Ŗ Pö4[`YËä‘­˛H—íf
XÖ>9›øYv}ĀĀķ(ášyđĶIÔÔÉ]¤“-÷÷“H…I÷>iâdšG7ŸnAũL,r)z™„đSE”ˇE$IĘĄąĶ
+ācî0f!† õ„=Ž‚›@˛!’ē!ēŪ¸cwcŒĄŋ„¨Į]ŧü˜Ë×=îōeĩ€ _	‘7Ā˜Ø–5ĖÂ$œ›ā'“›ĢWā¯l™?
ŠŒUĩ†‚	†
ū5ÉhÃR ėkŒ#Q˛UË&ßÍVØ“TĄŲž@ƒSÃā‚†yÂ
+$~a–-õŸ´ČŠTđ™4´¤]ÖØrĻ™ĸ
+›§*ēŅÔÖģKÖV4ĩāŋPbNĪ(Ęũø¤Ę-ųDË-Ļ‘-˛‡–­XĘ[Ļh“ģËĐ&v™—G/Ã?P/ÁC:58nZ"!Œ”ŅĨŦ{Ā2ßx
Ŧ\¸Œšĩˆ}ŗ`ÖL‘…-“ĐÉ(ĨŸ“–‚JTXz‹”Z&)axäƤŸ“~Nx N.
į)â
‹8é™-ŽŦ™šR'2ÉŖˆG$’Ŗ(žČ=˛ZŲÚ-Ebœ#,ÄØGˆî/sg
++o ŠF&AA[õ>/™b†”fūØė\$ŠibJÛÛø	6;Î1æÕr…ūl,â¨ē9‰Äģ9YœÉX„ŗQˆ#&bņ#Ģ•­`’"ļŸ!ßoÉ[nʏˆ$Éö°•ŠwŒbĀŋAåí2Ėē)æIÉ
BcŗĆXČ
KBÖ–ƒGRT")Q9ˆ¤„Øģ„sŗąIØķąܙŠۗ‰•.)¤ËšĨîŧDsĶģÄķŗŗE–4É&°-ƒp)ËÔą%ÍōĮ–2PRâDCŸč>iõ‹ŒšCĢZ­&ŸY¯
á¤čđâRĖFÅIēŖF
—(šŅ¸QįUáaī=éqĢMak[Um
\Le
^TĩvO||Ë TĖ8)RvĨ‡†eÅ}ÖŅũŊŦđ\ãÕl‚!”b~Ėšã€­Ļã‘CĖÂ"Ą˜_"Ĩ˜ß#Ŗ—Ũ!-,‘Đ˜ü[ĸcō‰ŽI?'=&ũžā˜ôsƒōoÉņ ˜á$’š–Qū2M`aãLĨMŗ€,j‹?ļܘ\I;M…’7ĒØÄ14RIĄØG—2I$]îD!­Û8%;ž\…†œ@
ŲÁ+Qjņ‘-e”CēlŠ āĩxĄ'‹`O.ér‡Ģ\é‡QŽxČÖ-÷žVO+°ĸĻ¯ŦÚ]­ÅXõgV`üŋåEUEM‹;–‘ĩ3Y,ZŖ/_G2MR'u›‹Ŧ—_VTKBV•‚C†Pū)B	ˆ„UŌ/ÉI?%C(đ Dō#’ī	ë¤ß–ƒKPˆŊEP-@ZF6ŧlLr¸)~XJÚĒ÷ÉbĘÛĨ*iœ(Ļ¸1æpRvWˆß*aņATQ‹ĩšÚnPhØvT†ÔsW‚Ô‚ZĸԘ6˛¤aŅrļ'ȗ`ĀŠŌ0c!ÄÆ>ÂŪpDv+€í}€!X8‚ĐŒIŦÜĄ& ČŽBŠ=…r×)Š\âôŋņ—,ãū†ĸĸģ9Ąaķ%éq×9šqĮ9Ąq›y) Ļë2„kŅŌ-_h9ËÔlŌ‡ŠhÄņ’Qˆ#&c‘ÄK°OKŽ‘•„JTÅ]$¨™…N*3›$ŠN:ųŠt1˛„Nå}\r¸ųEúų¸$ú¸Äđķķɞ%ë˛C%Uū#Ģ•mg
XØ<iTiŗ.šå/3dBÄXĒ‘˛ƒ –ÚH՚i‘ášFXīBV#drRnØXŗ€dÎŒxv¯)Ąˇ–	*™eėĨđw”˙ėŠ‹˙•EĩÖbՔ­~Hö/}/Ĩu™”vX$j
@!ÖV€$ŲĘ\Ė0EHyë}‚wų"KšŖžã”<¤lJ#	ܚ,°Ŧ}ŠBÉûŒTöTTâČ	6âŠYXdt5ŠÜ
Zą_c`
+°lËKĒ˜UĶ°h1&Țäcʸ’–icKš—	–ēM
%Z=)Fę8)@ę9
­
bdÉāĄ•ŗ¤vDråž’åLąÉģĐI_‰dY§*mœXYcD"e[+P€ļ
Kl!‘ō ĘnVdÜyJf”yHā”–’Ž'`ųÔvX@u1vũķâ¤Æŧq%ÍJ;ōH—[ĶġËXÔ"YŊܙĸPę0ÁBJ/ģCT\z‡¨j"Šä3ŋЂ&Ų〛rĮ˛KYÔ0IĄĐe6aÄ4âŠųXäPSuJ\á*]ΉûG9q‹ĩŽčxFplu0)Û’cKæ¤Å{˛úg(':“1H˛ĪQÜJKŸčž˜"‡‰Ã
+“öS	îŋŽŅ4'ķ
+A˜†5P€a–kĖĖlÚĀV$>‡•´LVÔy,1똂&éƒJYÛu–
ĸbMxĩJÃ?+ˆ˜öęrÚŊŧŦŌĒˆÎM¨Ũ4‰g7 ņX‡ Āl\”hÃZžÔ’:ŧaĒJÛ}r‡Éšdķŗ‰')”:OSā2mlIŗô‘ĨĖ›Jˇ“"¤—qÁAû)aũ‡Fĸ؋Iŧ|Í\Ô8Y\iû!Eî3E•7ËXĖ´nŊI–|A#Fė5)7zŋâĸÆzy!‡X …ŒF%Æw“"ÞcbÃĻs˛ã¯EšŅ;ōļŠŒnOQ›!IA††„Å–ĖIŠ[ÍH‹mÛŊ"7Č֜đÃļ¨ŋ1g-šœā¤ø ”Ãļ¨ˇYnĐwUŒĐ­ؚ/°ŦM"9ā^tōÅP…vKĀˆv-Cä2ɚ`H6°ŠÚņI[
+¯ø˗DÂe+IËö°É”ĪÆåĮ<6žíJ
+,%›Ø(Y	XLĮČĸĀčvGxØvCvÜrFlÜoMlØgWrĐkVnôģ':ėē%>~Ũ’ˇ!q’2B$Cîŋ#?n<)Až”^
+Ģ
$J™ß!ļeF=aAŗiÁáßĸÄØr‰đ(Ģ{bãÆā…Tΰ@ĒVíˍžö%G]‡EHÍge	ŨØJå~ŒĸÅÉRļÉĸ
+[d+Û;/3Ļ	+mšˆD*9‹b’BĄĢJy‹dõb‡šxŠš 3:9Ā/b	@gŦr€ōÅ~r€ŨE`Ļ@Y,.´ZJ8ĩK§‚vV1ũĄKiīâBJoČR:wØrJƒEAõcTT˙o=qĮ)ŠaŅQî!äėûƒ•ėīGífr”Ôí‡/Ą_‚ŸŲŦ-šZ.
¨fi/2äÚ/NČ0‘e#˛æ°¤ķæŗc¯HûļŌÂk@Ā,UJėäŸ
uzø¯x\ÎZ@6į/ éĄË?Ú(3Đ? AI8@ÄŦļ%G
hĨIŊ‡€“ymŦ[7†ĸ…tōÅŽŌ…ė°õŠ×‹Ō¤NkŨA{(+ŧ–Y[eÅüˇÔ˜m+0ę‹‹ÚöRcžŗr¤ÎĢb¤ĻÃ"¤ÆŗB¤×e
ŌÕ ƒŪrą1ĪX`ČY*-fyŠ‰€˛JĖfShxŗ',lz
+
+ÂĘzË	ēŽ‚ÂÙąÅbŖŒÍŒm˜”T¯Á
+Ēü%EĩîNVtŗVļMåE§­Ŧ¨û”}Ã
Ļr…)Ąō‡/Ē´VK
+ÚŦJ
ĩ ‘#Q•[‘uĘ]‡…HmvŲ'pCKĻ@ŽY<f7|Ôu[„ÔvY†Ôl]zĐjč¨ßĻėčhT
+đzģ…Fũ†E‡ˇ›ŌÃoģĖ ĩ	ĀA …VΉûm‰_ÖÚÂÆFAAw°bZ{I1í]THiVNém’djGN˜i“œnÅZU?X”Tī•å´SxŌIo%Ųœå-&z›Ûė•^‚”OmWŠō6É
+Û.3?7Î䈸0+S‚b{GIņīœÜØ6	bŋeŅáĪƒļ
¨1ar{ژŌ&&rĨ,˛‰•mc•,’‰[ŗĔ7ņ
+-i‘AžÜ_¸Đ`¸Ô~	@™éP"+^éâ—tąû E7nÅĘãb
+ Š­ @)vĢK§–+
ÕŦ†,Ŗô‡*¤ß‹JéĮ
+2Ų¤HüU7=–ŽĘNÁˆ'DL#PĄØ‰0
ë1ģWÔ–%õ{A!õt“Õ{–ĸz*&ėí–ž,‹Š_W¤€­_d]Ŧjyëd=´ąš3Ŧ†) Ŋ,Ȉ3K:;‡.ŖũÎŌÂßؘŧôY:.k+”õ•ŽĘŽĄutū %ĩ
eĩŪIqĪ
™QļG™āV[O
+Ģ÷¨!—! ‡–͝F@†€Ú`‘ũĀń{EmGyŅĪ ŧ°ˇM\øyJŠîŖœøgW\ü6-8úm@šgqAŸmĄŅˇ]bÔa ˜C`bá…K	ú—UzÃŲZPåUHå-"ō…VĐŲCŌî!*Ąutæ Ä´öFJlg%Ģ[0'¨>ŒŠĒ˙pĩö’bę9\9Ĩ1Pŗ„`ŌrHÖš„Ę°”Ę\XJe
+KDĩ¨”ÖeG^|ŧ 6ĘŌ”¸¸m(+ūŖgą¨ i*)ú˜—ķ˜
%j0¤Ãŧ¨ë+,ęzŠŠŽĨBĸc¸bĒĐäsæā%užŠŒøkSlx6&3ūŨGiŅû”}ŦK‰:Œ
+‰zCSZ‚ÎŲ‚Đ9BMËÆe•ŖŌGĄ‚É€ņʎ"ož…eJÃŋÁŒÆĪa
+蟙œ–A9ĩ1H
­ĖœĖ ¤'áŦ7´ŠÖ˜€Ū]H:oŦĶ-ZdrKflãšÔ°í.4čīEŊļĨ†'TbÄ.d-˛ÅĢōãĮqáŅí´Ą	ˆR'VÉâBŖ‹dĪ DģĻĀÚl=ä[ŗļ4´]ãbUL8Å¸0”›VéĨT/męWK­@Ŧą„XŌ˛~1&¤Û­!š4•ŒÅa&U‹ÆŸõƒ˛/•~š?ĩ.Í †â&žõ…'Ątƒ˙TÃ˙ ‡$Í
Ļ´Z’diGV]€JMęŅ;Švķbm†(ĄĩT*ĸ]4ųwK8˛Ykŗ č^
+ŋÁˆ§ŊõŗnũÚIž„_
+EbÍ%%UûA*-+qĪONx´$.n8%4î~Å}

Ul'šō “sՐɚžÂĸ—=iņe)*jߊâk[Qt2%)nī„…¯Ĩ˜đĩ5ļœ•¯ĘO–…FÍa
UY‚”N­…-¤YšŠŠÚ;aáąPLÔ^ZVéULgTFg- ›s!š´„#ž2…$Ÿŗ„$ž2…$ s…&Ąr(Ŗ4'¨>ŦUõ{hEĨ3´’ÎĒ˜ĘYB0i3(é(‡=A
+Å_5CŌ'HĄĀÄĸaįÆ$õoP2Ú1@
­?dQĨģ¨ ÎZIe1"ûVÎY‹USļĐ:Ēí˛bJ_€BJĄˆ']A	č\A	čœaJhŨŅ´ūŌĸZƒ¨’ÚģŽjņ°ė’€Î‚pÎV5"ŋ…%5…$ŸsUÉړp+Šw'mr˙…›Ë:j&!=ûETÍf&Ģ[
ODû
ŠDE#ÍęũE”‚ß'|wįĘmŖ@É&Ņė˛˜Öļõܓļ7[ë;‹åDīō‚:o8 Uū:`•î]\Đgč˜ÉĀ1ƒ …ļ#˛`\JĐ![ąŠå&_ÚtpūĄÔ“‰6˙Ŧ|`Ę	Z8ÖJ€ģ‰Â4=ƒũ	ĩ°
ŒGOtéįķ|S)×6@ÂûuĀqÜVEây§ĶB?UBqˆŌĪķŪy FŊ	H>į­Ļ?ÔQúĀˆÃnôX]öŅV>(ë)Œõjáqøą†PÖ˛ŒÎŽÎN
gæŪf™ģ˛Yį;×
 *ŌŠxÎbNFt
RFŧ ėV,ÚLĄŪī”ęũPĢ†ŸĒÆc}%ĒN ‚ąG•P¤ŗ€hĘŠ|ÎY>2é/")8ųœ=dAĨÁĸ ú-$ō”sIZëĮæL

+¨–ĢĘčŦ@Åcũ„ŠX_xbĒõ`5

+Fĩšø—<Á	H<ú¨TÅŽ@E„œķ•ũAËZ‹‡&ÅcsļēIk
Ųœ­lPÖŒpÖTDūĻÎî–hŌīæ9¤ÃĒĄI[ ":'ņØ$jØœPtc2ĒÔŅGŠ"BaIOō9s-Ĩĩv`ÖV8ūŠ‰v”ˆÃ­›´•É…Šh3z›@Ō&w
G˙D
+.ĒüûF•‚Y<,;•F{juņC"0‘č¸Püž][‰“đ@(˜,ISđæ
ß}#Ë@ÛįŦUDL7˜áx”9č“<	ũŅe•
ÉÎĀd?Ú$ėD‘‚Ÿ…÷ŽˇîĮȕe¯sļVFL.ĘŦĩˆdŌtLÖKĸŪŽķĨĢiôÖdš?6‡pNĻáS›cčȲ3}jZ:´72-
ßZíãˆ×qŧnæ/m6|ë9`8ĨÎĢ‹ļ
ĶÃŽÄéũB”}”ƒQĒˆ>Á‰DÛČĐjĖûIŸ‚
+Eĸoķ1tÛŲ
mūyĖķ[J>ĩ˛¨ŌW<.é%Pī÷ÚŲ@Œ|=‰sЖ*‘čŧpôGœ‚ũ2¯˛äëT/"ûĪy‘PŲĒ&=UÂąj†¤Ÿ:ąØLÃU7ũOyĢįLõÂŅ;•‚{Ķi¸ÖōŅ)kˆ’*oˆbJgåȤ›FÃūĀ)ĸOpĸą3`
Ųąx`ÎW5*{•Č>uĸą'iv¯rˆëGDåNBg,˜ķƒ“
+Ņ&˛ôŗÄ‚B“{ŋAH˙ቩ¯`ēRÜŗséj Č=/•ą_h%•ŊĒ¨Ö”ÎMœT,}Ę%cr	l
ßLž_Š‰öƒ’^A
+F ÆžÄžž¤Iø ~){Ây~(˛Ī*8čqĪNâÔųĘųĄĘĀ:JÄá?€jčĨHÚT-•H[ÁFÛ¨Rđ)îAĨ*vŠÕÄĪôųõOĻaŋ Å#‰@z?‰s°ü“¸į‡˙ėœĀš˜¸{§N‰tĐ#8ÁX_‰ôNŠŪ_ķ÷&_ŲČ°Wˇ?3W†ŨA´Û	įÍ3vnŲĀļY)”ĐĻ/ŽÎņÆy@ļz/mæYŦëIž\ŋ€…ŖÕ
ĘĸĖĀē(3°&AöYŨ°¤ąvXv-â+–ŨIÔđWÉ ŦŖTwĀtL÷°0ô!¸ ú
YJį¨‰õĨß_ŌôŪI˜„
+H,ŪvtÖX4ú Č=3Gķ(Ōu(UÄ*˜2Ö
Í9A
+F ÄĸŸąøTZhMzĻί}eÃ˛GčĄIG•@ėB–|}g‘nēüŖŖJ(ŌZC:eHHå*(ë§Ōīhá§r!Y7p1Y/HņčˆPüJš]ÛH,Č@ÅŖW€ÂQŠ„Ą€ĸ…Š¸ĘũNĻaOå˛K0Ō™ķķ8Ū7¯žģ@ÅT;?9áŊ”ū.*¯h\Öv\v#í%ņ÷zėģ‰(ûî$ÎÁ#ĖĀ*“^A
+F¯ÄIøuēuŊ&OŽ‚ėķS%}‹G˜NĄ`û@éĄíjøDŊ÷P%߯
\ĢgøÎæoœ?&8áØŠZ8~(Tđũs¸gãüÉũB;ĸÉ@oTIčŖLz, šT/"ģ‘e Ūī9ÄĢɃë5zl}Ļ–™3›eäĖēm#ØÖuĀqūĘæe3í˜
ĶC˙õ¤ô[x"*‰û|Œ\™vFO-;t	HC¨aISÁxôC•ƒŗĐĨßŧTú­
×JŸ\`DcīÅ´Ž D“jäû:ŪšŸ:čĐx,ö Č=¯äIø0ė
+T<ÖU3({TĒĄä9h#(ąčŒxôX<zE6˙ƒ“0j~Ŧ~râs1	­ŸR
ë ņ^í´úõŦœŌc­"<*ĸ2„•4Tęá_RJo8ú9ų´/ņŦĨP™>ŋ>JÕđž"ÁčąjdŌT'$ũTpUŒČ߀…¤gĘÛKžāŽ…cg âŅGĄ0Ŧ•LģubœŒ–›Vŋ^k§6ÎŲAHßôžÂ9_xJkõ؜§H4î„éę!J?_T	øƒû:’˜û¤ū)ÖË~ÁI(Ũ•¤´îšBJ[ŨĀ¤ŦxŦ˜†m¤ĖŽM [įZ¯3wi˛6ŠŠú¯ĮŽ2ĩ!/ļZSe(ĶD?5Bņ?pQŲĨP?Qc Ũãĩ++’ė#{ũn*oŸD;;ɓĐs	­=4ņÜfåФ˙úOâžWâôū-.mCŊoT9hK­&~+’jDĄ-dŠ÷oÛüÍā›ī
ÛŲD}Û¤‡?F;
+ņ‰{ņ|ĪĄ^'ö!ËŋūdęŊ¸`üX8z"uŧsB‘~^Šüīî›ŋˇ_ŖWĶäšÕ=āēmÎāœ-CgFÜ},ŋĩaÄ/æå%Ôø÷5DĨ#čđ”—>ģ>xN(v%ίß
ãÕE ~u‘44—Ø4$0n:2Ėf%&ū†%Ą^jb‘Ĩ ß["^o2ũú*“t‡'ŖC‘Íß ¤Ōđoú¤ŅKĢ9ģĒ}m×ŌúęGĻŧdÚ­•D	ģ‹õ–Ɂ‹ĘY
+Ebũ €ÉēÂOšĢU´KÉhį:Ú#ėĀŦĢ`Lz(SCģ)üDŋ6ĸŪ=ųgC™&ú;0ë,˜jÄĸ”ęĸoęÛRŠ‰öĒcĐã_WŅ+(`ą÷Ņ>‘xķRii¸ž"IK"Ēåšr*ĪNHØ Œv, š˛•4Ņ$ ×ųÖužC;Ã•ĢsēsũH,h”č›Lŋ>뇘îЊZcp2:GĐ
*{%9õ`JLī
CFû
TÃĪmŦŅá+
‹ÅĮ*c›†¤†ĄdD@d˙9üëCŽ7P#_Ž ŠäÛF•Ū
+P$ÚGbĀģ'œW!ˆæīBÂysáüW7(=Pĸ_aŪ˙YÔkōüÚH˜ƒ?‰{^hRo)tŠDĸí …ãEŠx?i†ˇLš…6gw›ųgO™H´ĢbXÖX;4e5,ë)=ŠŗëoßüÎ×ÎJ‡¤×@äķS0âI'iūFŧ¨SÃm‹wRg Ã…û0eõŸŊÂŽoۃˆ×ĨH,zŦâÚĀˆÂ4ÉWĪč­ÉW7{ĻŦ“ŠCËîŪŅ<w2Ф]äųG/˜ņH{(%nŗ$*î¯)Ēĩ%Ą?B
L/ôø'ÔøÉįküÚ虾4-& 
!G%áˆg§ĀĒŲĄPÁwP#ߎˇŽhōī–ÁXW՘ŦŦhd@’–jX?āA9Ohâ)K™0üJ „˙IÜ!ė¨¤) 	•/$	Ĩ1Ĩ5°Šv
F>=…žt*ĸ­ĶĨû4ykô͟ÛĪ!”[p‚ŅžĸA锐ôN…J“…wvÔ¨âísˆg+qÚžtŌ˜„ĘR-éđ›Lã×Ļ­!l›wžv*ącxr*wčĸ:‡IIũ^XLŊ…% 3„–5”	ÄÚ	5\+páX/pŅØ­nXŌ	D0ÚB~öNĄß)ÄŖhė^LTkIHį,˜}ƒ‘P-ĸz_`唑3Ģ…$ųūW늃Bĸ~ CSKĩ"˛=´•6ŋIĖũ6p5[í$ęŨjé¨ô[62ŋÔjâ‡ĢužuĘ4|OPüO¤`{H’Ī–‰;Ģų-ccÚļrM[rėûMœß;Isđæ	×}:˛ųęöŗ×ĩŽũIĖŗ!Ä ô
LHÚKƒˇMŪÛ]SĮfãøÉŲ3uiūzæåBšĪ …dŨáJ*ũJi¯€$Tv"5ėI™]o$zü[ęôÚX;*ëŦĸöÖMúĮ¯ĶčĩŅA|?
+Ņ†đŌ~ß4vl5ˇįėĩík‡Ä}‘ĪųB’Púé4ėßzëđwĐĀÅÃē:\ŨllÎ7Žö‘Ė›(ųčœC9Y锰c	ą¤
œún]ĮņŖķ=‰tˇMߚmČ֕2ģö”é3ėsžtußķŖ‡(˙>‘ĨŸížģ˙ŪūÍߛa'Ŗ3+Št’į ?0ĸđKHâ)syŊ˛œö
TDk'íĸKĀŠŠŠŖUĘžõ#ŗO`Ũ¤ĄNŋ$ßõíĪ1ne4Ūš§ŅcĢ{ĀudL›ŪûčqpëÎŗ‹o&Ėījôđ6 jh?uŪSĢŠw‹ŪA
’õ’iˇžŌ}0Nö%ŗwg‘8šŨ’ÎzkČ&}Uã˛ÎŌÁ)K‘XėB‘~ž)LG8Ō)s°bJ‡Q9ĩŗNPoFH?”hĸMéˇÅáÂ}DŊnቨėÕĩWš¨ėQ§ŠĒôĐvęEBˆI?x1é›BŊ_Č1°K@´ŗn`ÖfTv#JÁÃ;
+86?VŒĘ=ļ9GÎëpéîŋ¸oŗWĪÔ­ÍĖĄŅ1
vĩŠÄz+I§ĖĄ	m(ŖZ*į L?m&Ÿ|4J(CrŠũp€	9˛UM­Š—vB
×`DŌ\]Pŗ=
+ú–ŖÖFIQ‡’Ú;XY•5į(=„•´†)Ĩô•KÚ)ĩ°–:‘Ø+@ÕvyI•3dA•;t1‘Õ`€ˆ,É9	”Ûs
+įä˜ģ-–“eÁ`Ōä1pŨ܀†ŖOā‚ąį|ãę˜ē­–&°-Ģ$JØ
”w Č>ē&pmŽd“$÷Ļ`0æ€éæ›@ēyČōīH“[7‚i Č>zˆđHŗ[IöÕE˜ĩeāl„)ØĄNvĄI@:iĶÛ/\AÍv°ĒŊ"žȐŦĖ°œ—4Ã>'°Žû„ų|VRš•Tš*Ee
¤ČįīŌæž8Õđ˙$îųĢÚ6cÖąÜÎfaĖh,ˇĮĀ8ˆ
+øU-ÆŤŲ§5Ā1{ôɝŖT0j¯€\θ”j-t•,ųäŸJž,%™XHĄĩŗÄøđńVŠIŲȲ[HMŦ18Q͆a!QˇĩÖøsOx|šKŒ9%°\[TŗØVtV	‰Īõ„t~ ƒ˛žáØ7D1ĨŊĸ¨Ö”ˆŌœĘTį"MÂųÉ4ėĀ¨¤'°rÖHŋÛ?ļûšÖ˙Í™›MTɡEPbą/háčČhėB–~ķ_Ún‹•šcÃâÖÍ:ßē>s§ĻŊĸŲY>gÁ8Äîažŀ˙ĸAƯl‰”;k-ÅZąn^Ķė0ŽûššcĶB™@Ŧ3$ šÍā%U[DŦÍĐe5‹AÔŦRiĄÖ§2/[J˜å€,•´ŲžUm‘Ú¤Nom%DS;Ļ%ÅÜÆ$‡§3bc{;iáĶŽ¸¸ÉœØ†QQõ[CBĩT0&ˇœxj˜×;†wŗ`œŒĶ•›yíæĮ;šŠô[_ B*s]9Õf-ɔ§Z,ÖIĄ„ĩ͡m†QĢÃxâkæ¯,K¤ų×sĀuō5Îc¯röXÎ"œ,ķW†ŊļŅa1w[ėÎ"Ũ|@EĸŦ!
SY,K
+LK
+Ų‚•Ķ,ԉÅųIÄ!Ũ`Fåü ÆĨœ EcUKYAHi“ȑ¯Ö
ĶÕEœ€t'`MEcræ`€ųëK‰yB+¨véL‰	i&Qp—JE´ĨLŊĒâŸ*á؏*ģœã[-vÆ.­NēėÚU2mD4?  ÷ԈD¨1ĪžĻmežũ
+ÁA\čĀ3`MāRL¸VՍā–G˛N–é;ƒIĶz]íŧØĖ`šX‰ÃŦ.ŖcZ[FÅ°>j§n<b;ĀD6mĘ?ļå}Ä3{ā´q>šüú(‹ķVΚ+TšCĒr—
Šr˜´Ĩ…ŋ™¸øÚ%$|$Ą2ŌfˇH]ŦŜŦúoÄÄ
Ö:ĸ†Rm¤sŧu˛S)ØsA!7´ŽöŦ™W5Y†)ÃĘW´šžĄCë7}qŸ|÷sžtuã]
T駍ĄCãb^xœķâ}Ė‹‡đúĀ3xØĀÁ@|ā6lāLā ´¸
!*ū7ë´É—Ŋ°	1	YHą€ˆĩQ+e)ŽrV‘Mm†/§2——T-ôÍ ļĮĐo–E4;
¤X*–Ø
+_LŗÛ.ĐvT†ÔqP~ôCXĒ–Z
+­ĸÚ°-$ęl–4–3וSmWÕ9ŦJ‰úË
+	:QzPyAHņM„)(GĄXœ“FŊ´NøNžáÆÉR,Ö_^Vé..¤tƒ4S*˜fJõŌ?•xķuŽƒqŖÃj¸kŗdŪŒT:8ûHŪÍ6^7ųÚÖÃxœæĐá
+7‡Ũ€ã˛KĒ`YŅ,%ÆŦ&eGmfíâBÖJYAI1QcąfĘOĻ‰ô
+HšëJĒÖÃĶzPyOšÁĘščr°îaŧŖqÂos…(§ŲYŠū
ŲĢ#œY%R/ME’ž`DTkÁ‡(mõâ˛'U~Ãŧ.ܗÛÖÜką2te>ˆC˛
+G6;ÕÅģIôk;P!ųŸBŊdWŗ­–kaUāJ>xĐÂ9ĀŠ¤Žnã°D›4L6÷ ‹kČĸĀ'\EāÚ.
?›yŲ6ŐPŋX ËĀ1A0ąXÅ&p
)'@
I?¸A9;"Ö	X<ŌZJÄ´…ŊiĩîĐå”Îc­QVš‰ÛwÆ´5 2n
LJé"ÉA˙ãØG/pņXwĀrJK`Ršzô›•8åą+)hÛ	
+[ĖÉĒ¯šAŲoøäŧZŋųsû9t6➍ÃGįiøŌæëš6§[Gķ4æÉ\ëá‹KȲĀ'lYā]0Ččmŗ4}j˛ŒÚ
ā[–Đ
Ëk¸RŪ´ŗ€C1ālŲP>ÃĀÆ0˛ĐBėŪbƒ&d˛ũú(BöÆdÆũ

Õy)ÕKĮؕ‰Á˜õ9†rr
Āū.3f8Ívq!ŗQŅŅËļܘo,Đ[,8dą.,´ēŒ‹4‹Á‹jļŠĮĨVH8˙@öÍA’}ĩ¨—Žá8cŨМ5@I•šžœĘŒtŌŽlÖēĐέ)ú*ĸ5'ˇ#izP:k	M8g%R/Ã÷ĩüķâeØ/ĀļlQf`mÅĄ\ä	8ķ4ęÉR.g"OĀyFO-ËŋØˇŊžŽoŗXÎ!v¨S0ģT"Œ5pĸ1k!
cP1Ö€c]
p6Öå…ŦÁ€Õ,”ˆÄ:Hōo^"-¤訔šŽ¤jģ8ī()ėŗ).~Uą|ŗÅŽqĖĀ	ÃC—Tl•ąL¨mƒRŪFAaŖqqƒH’Ú™:ŋļНįųŪŨ=áģ›įpnkŖįæaČú<§ö}íėœ/]wË0eÚ°+ÛĮō°¯œ‚
|Ã
œ	Č
÷áC<¨ÆģĀÅ3‰‡ÂÜĶ¤‰¸îÍa1öĖœĖáÚˇũ„ę†eXŠEą!ĐAŦŅfWšœ¤xœCdI!w@ „–‚”ŅŦˇƒæōr*'¨ĄH3(Āąã‚úu9E}bךędn°F4¯&¨ũ€Šbow(éĻŌpm”ÉĨTg
YDdo$'ļŗļ‡(Ļĩ$¤ZŦŖŗ#¤ŪŠ¤-両•Š;Ģ¯guĻŦƒ!ë`G˜^šëJĒևqoæ[.p
+ļ8—ŽëÛ,&ĶWĻ	DÃ^íl0ŠŲãc> }`W;ڋģe(rÁ
Á€&XטXØ؆ؗɕîųâŠ"(÷VK
ZĢÉ'VÉÔ+ķęŅ<ŒyÚŒČÆIŅáí¤ü贖t†VŗHÍjP`‹Ā™NI_fe‡ŦĄËė
rSiĸ|ÔIHu
+ŌIĸ„}¨ō¯'uziĒ•ō.Ētö‰	OCIŅũū+Yņ?`1;¨Q)OXôA‹|7O¸Î.˛ė6\ˇ™ßY<ëA>ĨÅˇ˛0Ā¨yąŸI>í' 6HSPĖJĘæØÜÅÅŧĨ€ŠXf7ėčÔ0l
X€¨đcė>€‘ą°ņ0ã`[XËōbö€•sėFŒi(@
+ą+&ĸbR,j•Dŋ3’gĄl€„ĸŧTú­‹<
é-)ę<(:n8Õę8Ōeƒ2ųäĒ b-JĩL§á™(“PĢ
ÕŦ]EÅo;’ÂĔ՞„	ļ•(ī(PD˛Ģa3¨ŅÂ2žĀ;ŗ´íįsX–ƒu}ā(pq°Žtžo¨Đ_1ĀĀ?`čĀo_\ƒVūŋē|.÷°1}7ŋÅ:đ°f
+Ņ@@5‰a5>ņ!ĸ‰—ŲØ
+ØŲ˜
+˜<>B61
+´Č.€QŠU CR–0…Ëa'°yK€|ITĘēžÖ¨€j+Lé¤Ŋē ö3&-îû‰‹ĪF„ÆöDDˇ ts2zg¨b*+h
IEūÉ<ŠysÔGųj‡göBĢŠ–AÉÚiü-<•í %Č>09­´€ü;ƒt[îg,§ą`|›ÃéÚi1´–ÎbNDx°)#ę›Ā:-Ÿ°•_ØŌĀģ´2đē8Ų—ĸT/ÚøÖQŠŋolkĖ⃎j‡ž|pTëē~dr 0žņAĐ^´„	|‘ącbS8j*õh$é-(ĸŲlt  ÛFKĖ
+‹šĶĸČ°ĄXÎ@’Y(ĩö•ķa!gqElÜXC6ĩG˜^úˆŗK;Ōĸ„Ę–ˆj‡2ũjBēē¨‘đ–"]´ˆPüOĻ‹s’hĄœ4:X÷4æÍ2ygØ:[+CGF×ēÍ:Ũģš†/mæ`a^\K+oR°Å;|đŠĄ;‹ŠCŖéŌ…pš	âkl#ŦƒŒ}o€}€1nâbüĨƒ=€ظK	ãŽÆ#@d!€ˆ­ˆÛ0V!ÆaėB,+iX‚”X,# X^DČ ŧ '8ÍYŌ7‚sr(ā\e$
$f-8ĩVS4ą ĄĨ§ đaVLĐD4ĘK¤ˆZXTą!cŠ¸ËšÄđe­-ė	=@g#ČĀ­O×î,ˆ›ˇÄŨK‹AŗË8W0nĨĀ_ßY¯)ōEn†ã.løÉĖĶvdĐ|VˆxĀ,OjN:CĀ´ŲøY}"Œ[|ĮV>ĖÛû7.@–ŅÉ]ėÃKŲbV˛úËŲŠĩ3›$Z¨åB@‰ąF"­[Į$ZlšŠˆ[ƒ
¨Ú3&g
+J:éVHg&é!J??)Ø%°föI*š”Ō@Eb #=åRÆbŨ”•:Á4׎q-,<æ*ũʨÂ՞w]ãZXx†1rwVĮpŽ–š#Ë.‰†g3(ĩ;†{ڙŊļ1!NŽטÄX=΁í
+ Ë\h@s=ÖâĩaÜÚåÃŖËÅÃLņ§"Îdĝv†¸<AĖ!š…#Š†RÁ^9‰{aB–‚rT	EēëˈŦ^w7Č2ĮEĐžFXÉŪ’Ė¸;xY—BŋõS§ĸ§RĀܧ°¨5lA•ąrxj­`hÎW;<ŗvlfĢxhf“8éĢŲV{5ģm.†­y/,ˇ@Ą‹Đāa§qŽV"H/ ¤@˙zæŪl4('°
™• e5ėj	iÔ	KąĨQĮą§UÉ1ĸĶ/Îe^‡ `RZFģŦÆ,:Xëč`aœŖÕ8‡"%‘\0”gW܌Ëŋ°‰ĪWR|‹áÁĩkg ráõzĀå,ëiXTGė!˜ØÚK
™‰2ģ"2Ę°¨ÎÜšigöв4„hZŖRĀYęFcļË(ÆĐ´ÔčmJ\lÞ ˜ĨP'e ÆA­Gm—JdŊ "‹
Œė #ļÛtW*ÆŽh\ÖHˆƒiC„€k8vsgŧƒ-OJ‚Ā‘œp(üpōY(ĀęXטEX„JÅ`Ņģ0fB[dOĘ$ŨĪH%āB/_h*¨z’ņíęyŅĮĄF׌jÕļ1Ĩl[@C/ppH_	ÛÛŌ„VûÂcö€Š,JyÃPåģÖ_’ēˇ–°5`Ĩ!Ø Ŧ9`õ]VBũTŠDOã‡F߁ā"ĸ§1oŽÚ‘™íVfĐoLpü+›2×ĘĀ#% Ā“ (đ$(	éI‹cA€QŊpė†dz)Ņ/šN ÜŲĩLîŧ;Æŗ<đ2fÕ@H8Ā‰ec%b~ŒD{ņZ#ĸml=ÖōaÁxņuxŨŽA
OāCÄgø͎Œ¯põ@į2īË@‰Æ,֐MyÕT+E„ˇŠ´đsKjl
°–ũ
éąĨ™¤’Q`ŨėR¤Œ6S¨a7âäją’hjŗ\TĐē¨ĘthjH
;cÖ
Ną	!vÅډ%šôģy­ų–„ü‹ë‹PļŊ¸č](Ŧ7øÉ{îˏÚYM
3—%t8J—Žé"˚Ĩ
/fŒMĐÁS0V)€v;€—…q
Æ5¸˛`b€qÜFāZ-ÜĘH‰'ÅøđsuôÄīBPĐšŧ
Äé7–“H§đE4˧„Į–īIŽ-˜#ę	N:é%Qo÷	īÅÄmeŽûŠš#ËiōÉ€B;Æe…\SĄ1{(1Š•bŦŒ‚q„aÃą”cņĢ
¨^~l$ėëŀĶŖ´ĐÍVŋŅÔ(v] Ož‡-,ÆfōęĀxÕVī€!ÂĪ*ā‡>ŽüEšPf¸ņ1{Ü
+‚lÜÄŨąí؀/ã#zlrÁ0ö-ŽuĀ€ÉqžrTņ6`×ø:K@Į|VE†ī2ātÖ`%UîR`„Ö‚Õ1>V!v”mŠ.׊ÃūWTøL*ë™Ā3-döC
FČ0BLÆīŒėĻˆbƒQžtÃ'Xŧ×øˆ.0AđvÃhôđÂdÚčŠ.ÃÂÆ<ĀˇpŅ‚ŸxŠ#w|Ųv’¨X¤ĩæ0Æ
ĸˆ…؜‡ĸ†*Œox3ņš0>ĸ	
&(čIԒ1§Å˙B8ā_
+ž8â
âK6>\)Ļ‡qœyBU=f
{$’åvŧŅjVˇē¨ôxŦĩŒTÖž€vŗ+2ŧãŽ&f‚?ˆÜ6L‰
+:ËƧĖ Æ¤\5D3ÛŋĀ = °:c-ņÄ:ĩXË2€pã)Xŋą
Y¯.´
Œd¯˛Œ†-Ĩ‹QM‹y×ëc"aqã+cc/Z´qąc! ä10yŧ„vėäKm|XŨ8brãÄÎØ05Ļq!h
+$…+(Ų÷XP|ĒGˆ÷pÃg v’¸5k_EŠŲ'`ēŠ3™ū‹Ēô
]˙C9g+™ū*•4†'¤r!štM[į]ŧx+Ž+†ņ‹‰UčI°
āEk7Ƃ5ˇ†qņp5~ŅAk|ƒƒgņ"ŧ‚€\xãˡ„LâŲ´ė!ļ\ō×6&@ˆŽq–.Ģ1.	ãÖöx
/ĩq
@¤b#ā!ÂøH†ĸą¨*ŒfpČiņDŦžĨ’âZEL܇ķĖđ>!
TΧŦHÅė-3깉ģĒe=—Vķb`Ÿ(¨Ā…’>ÉÛDa…“Ä8o+ôØøEÖhDW,‚
D€Ĩ‰dŊÆ<@Đ@Žu¸ą”ûRÚņčĄlŒ%DË
uÚ îņ_Ø1ÂÆpxĖ¯ÕØŋ$Đâ
 
cF {gđņžŒÅ°ãpP0îqáHå–ĖgÜ>8oņ°ŦÅå:@ācVQ<+)‰Cåņ'!ŽTÄxŋf9xúĒ!ŌHXÕȧ$pXʕūV€#Ú{,ëįe	íHŀyZ&-iß$Uúā’'Î‹­ŲØ–	ŗ†¸“øb€%ԋR=ôq”¯Ā  õS@,">e	*kܐÍÆ[BŒ™xi#á`
¤p~nÕÄȋã(gqŸÅ€s˜šâ]đųj
wĢЀëy`Ā
ąTüƒĶ:ĀË<qŦ‡Dğl€d8RŒPŒŖalüŒđ€(õ]”ļ[’Û{Ko†ĀŒnļĀ‹?–ëĨZ0œ˜Û(āįeâÅ bžú!)6Õz	biˆŖ?Îōū‘@ßûRlŲ8_ÆUē ŒclP€&WP”E<ŦŪ
+3#äļ`.ˇWŧņ;ˆIuËúaâ8ÁĀø„…­ņ‘Xã#\Sc–ÆĢx”@jŌ€ŗâ“ß
G”đCš
ˇË€€‹MņŽ&"ŽÁ¨ˆG(ârŠŽ|Ļ‚0|ūŌ‰p˜6ŗo%qYr;ĪâŖÃ4)t/Á>TÅ]10}tZj&áëÉúq+ˆ?žB;nōÕaŧ¤‚ą
DP 1—¸@aŧ$Õ8F†#a	5:ü˛l€bé4YÄŌŌˆ…CäkÆĄ}l|„­n„0B ņąH%ãb
§\CĀ˙æ)nׁŠ-0Āü(ņ¤š"ădnŒd‚‚„t5ļ& sr…(
íņr9(¤ĩRpĢ%!0Ŋ<bˆģ>bXr{Ė°äö€‘šČ)î|r	ƒ‹Ųá<Ũøąģņ
c\ã%Œ]pũaŦ`ŖoK‡ˆwë‹d„ -b	GĨ€`ゃņŽŠ1MㆸLVŠagÅų.ā_OGœŠGˆ;Íņĸ ^$ĕd†øŌŒįÉÉ)â>;4v Ēæ1—á “F¸H!2jšÄ{D‹™įjëÜĻbĐÍDŖ›ĒOä,Y\IËLe"Gi
+›!-nŧ%lmü,øŠ†ã.\HctŦLBˆĄŅvÅ7éüŦ
ŋã’â˙Á§<ņ0O<’ˇ
+Jâ
€’8Po´Ä+4āØQM+ŠûqPĀ×ĒĸøĨ$Π‡ˆ3Åüp¤š>c`§(čG"ã!äÆVÆ
+ĨPégđ˜=ŒYŒy;[€5‹Y˜CFf—ĮRCEĐ6"++sž˜B
mØKc
+@JiC”É*"…Ž.ÚpQmūíšânpÁ3 Ä1-qHIœÂ‘Ī::âYFI\ËčˆoņMF\CĶĮuÄ?8=q.&'ž@'‰]ƒ8īá5œ„Ŗ|ƒy”đ$4bE´{$¨ B™l
Trœ	”Ėî!™ß84Ŋ<b`"îčŦlüą¨¸úd-ÎĶá‚06ráhŧ*aĮ‰$VL
+8üq,
—“ĐÄËqOEœŠˆ{A%q0Iŧ~ĀÄoL
+‰Aq
KEzŠ8SŒĐŅ5ˆq žÃyø
Ī™šú}ĒŊ,ŗ
ũLB$4J—ÎĀ%Lū!Šb98dFeWĮL¯Ž&˜_FÄá'.qLF’&Ą3ŦAå–sÃ0vĸÁĀø„…œ%‡Z×kTÜŅë‰[‚Aņn(WõÄ×8q3*'îu‰[	q>BüIGˆ?åņ9FüéĻˆ]…xâ?ŧŠFˆ)âlŠ¸SÎ7’	â;ÜÁŅQÔÄ|ąˇĒĨ ‘&•‚Ŧ<6;Ÿčm.‰{wÔĀôęĐQj˜ƒI¨a
H>_Đ ´Ô
~
‚ĮíÅˇģ„%ËĀĐ#eqëjJö€[b§x`ėZ⚸WC˙r€â~¤8œÕ
.h−øUĐwSÄčņŠ›"Žtâ=:|‡ãp!ÎÑŽAü‰ĻˆÅŅĀđ+RĪŅ„ą.ËÎ$y™Ũ:6LŲ$,‚E“u
+&aVĖŽ˜\!/.ģ=\vą|ėÁXYŲ#,ʃ¯/ČējĖzaH’Ž3ĐĒ8蜀wöŧ,ŠfxâuYKŧƒ:â\JG<눈C*ât†øš ntíáFWŪtâM1B|)&ˆ']ƒ8R?ēÉ\?,ˆĒ0^ĸrņHâ&—ÕG¨`“)ĸ\$SH	—På*ŲŌÉer9Țä˛ÛŖ‰æwG’Í°.Ø\\eÂÆ66,k$ÃÔ¸†,‘[1*ŌŽøĸW.įĀˇ(ņ˛)%ABœBP§tġ†Š8ÕO°3Äq:G<*'‰ŅņÄwxĪ•ĮÄpšîÁxŋŽa¸Įđē˙(õäQō9¸ÄËf ’.šƒFŧhr‡TūČąYˆ‡gᎠžāM8Ãšl¤áų8Z¤QÅ4ĩ1°ã*];K¸x&ց$$ŪU4Äڌ¸,eÄgIü+HâpWøڕ
>

ŋŠĸ¸Ŗ$îāįˆOáqŖëīÁ‘ąá×ĢÍ—`uā	ˇu6V„˜äÆ%÷GËn%—„B„ˆģ=j\î@!.BšyčTĸ‰yčŖSėåãRąGæåâŽĖKČ•ÜUlcvĸNā“_TŧF Ä?<
ņŽ¤".uÄŗŽ¸Ø%Ū•Ä-(ņ+"%~”Ää q3Eü‡ûÜØpœ^Ãm¸(āOŅ 6‚šÉR“äFfȎK/›Ū=6ģ<€lr‡ņüö(˛éåAdķĢ'"—Œ76š9˛x´q!~˛8N¸Žz,˜Đw9,āę‰oP2ât„8ÕMgPħd†xĶĖOēúp ÎÃ}xīá;ŧHæ‡;Ííđ>Ãobz˛ÆE2lvƒØø䲲z"ĘU˛ĨÔ{¤‹é—ˆ–Ķ0-Ŗ_ TL
w@)÷‚™ČÃķŌ°†
+ĖE›“§HäO<Ys[	›‹ØŖJĻÅĶ @q."$nĨCÄĢp„øƒ Ū ˆ;¨âv„8×*â‚Ž¸!$nÅcÄŖlŠ~øÎ¯áæĘcÄo¯	RUH9¨i	ÅĪrpI	ËžV(âÁ <.Á>N/Ã?P/
y”ŠÁ?D-š=f\ō@›ļÆAÚđBæČj€9YÄ{™Čcķ2‘ĮĻ˜‘G%wĮ–î`ŧƒk&G›îŊ €{ 2ân~ø%ĶÃŖf‚xĶՇ'q Äw8L_ŠâF0?<‡įpŽÃc¸LžÆŦ^’'°¤‰ÁG2ŅBJ/!^Z!ŧ´,B(6ä!zéåábķËŖĐnVŅÂD<ŋ;|l民ihãæb
ĐDNÔÖÆ„XŖV€ų´­8†\‹ā‰_
q$ŪÃ{l8
§šá1|&hgˆßĒîņ—/ĖÞ˜_20ģ>fdz}āČ$$ĸÄŗ+¤5´°GĢ§÷GÎî&™^B<u(šuB§čCœYzänrE5ŋq-Õ¸‡™o8ܖÁ‡č&†ĪčđžÃu¸īá8‡ëpš+á×kŒŅŅRÍd—=îō%nÁmķģäsŌŌOIJ@$E,ŊBDlN
‹ELqËŧT˜Ų8dņōđĮffãÆÍÉ"`ĖQ'u˜ĒRā.QŖÄa2´üūņ#‹ádã&Ž¤fYnÂßP”ÄĄf~¸ßáA<‡Ûp.Ãcjx
§šō˜^Ãcøįü†ßpŪs5âY
\
׸„NveqpĐ‹fĩė˛–Qqé5‚Š™X2s‘5RsŌČWŧDōōĢGfፙß62ģ@XpvČĐ,Ô!ĶģcFf8
+LÆž‘ Cô‰0{céęAōĩĀû84ā`đ¨ĸÎ9Ė•_yŒ˙ák`8Œ…|ø/sëc+ ÖÆ^Āƒ`[ą’É
âäŌģ#†¸ëcÆe÷q—Į
Ė0Ž—᧘‰=6/
y”bō@Í,āCs‰ßæĻ’>LQÜ,ˆ‚y„ĘöP‹•Ū6öĻ`\ĸkH
+#ga
—˛â6‡ËđÃaŽ<f‡ņ.ÄoøN§áœÃpžÃ‡tœ8ˆ
+VJ907ȍfŲ…RŠW	gä.ã“
tĮ(
đ—ŠSā.
ƒlŠģ@RXr{Ā}œāŒ$b8)C‹Ų&¤‘0%ᕃBn\QŊû@­ėîāqÖĄē9"
+œ#.ļÚx	–;ū"ķŊ`‰nāiX
8ƒ#>Äw8Ī•†ķđūSÃwx
ˇá2œæĘ9įœ_yįœsÎ9į†Ëp~Ãsø
×á3ŧ†_y¯á9\‡ûp ŽÄ§ŽĻøY°1
ZNc;s;ôNۃ¸ŦĒ,-'ŦUZTkYZgXj ˜mi™QeŠ­E ēŌŠpEõK+‹ęlë*-ÂÚÕVUڕ„*´´´3+*fj¨˛Ė°Ô¨  ™Aˆpvĩõ JKËé
+B;Ē°˛´œĒŦ `99ř]AhđāAÖUÚUڃ4ŗ4TĒ˜Qe­Y]QŠŠ­YQiYYÉfyføĖ°fmuq\jlfrœŽ |āRKŖCs›“8%°Bŗ:{Am-BÕ֖Ö•šÚÕ-3Ē5ĢĢŗiVWS>Čyw\dĒ>pM9MpJ@vEö€ėNÍĪĔ“§
d!j`;wjyxfXõŽYžŲ†´šŽ¨¨ą>(’/A‰Æeã˛Ž*H×6ĶđąŅJ@Î_QR{ˆ*ĢŦĘ
+­*ĢX!ĮĀ>SĮf$Ôp„”Vâô
+YöÕ	^8ÎdDÎP
„*v#JÂāŅSĨpdúėŪD‘€v'—‰ŗđEú}EēŽžĢ$÷f(ŒXDŌI™ŨŠT&m!ÆĀ˙Ķ¨—@Ŗ-%BņCĨūĮ>zÂQm&ĻßĒ&ŊÚũAėcŌ,´…ũžP¤ß‚ž
+HŸU'!Įfũ †%]U€%mUÒfáد
+¨ô	ķ}ÂēŸE=Ģ—uŒÉ’=j5ņQū¤ĖnŒ E@īsˆˇã­Kâ$”ZMüE—€žČō¯;…‚˙‚Œ>ęTņEöŲ\ FŊoŗ×uŧtŪiL”Ų÷…ũˆ$}'ˇ(5´ŖJ,í% =VËŋā„Ŗ#8įwë:há‡JE¤ŅKĢoūæúÎOČąīO•XôN a{L÷eÜÎh.gĮ8ö+lĻnNâ´˜p<Ōü9ß8¯ôŲõM¤…>ȑīķ âÕ9uŸ	ÔûBŊˇOXīÖéĘũ FžŋĀ„ã—2uėMĄ`%OÂ_„égį|å<á›7 úŊ˛aŲŖL˙ŸÜ`\ÍjدtdĘY<6e	@@劒ŗSŠaOĘôū¤Īn7Â|ÒÖōÁ);™†=M_›ķÖÃhŅčDŧŽ…CÜ-
­Ģ\ˆ“Ä_;Juą;‰zŖIB_$ôC’õSiĄŨö?ŽxžÆoMŽÁģĩ3~h2T*ĸҎāãS~Đ²fâ]
+rë’8m"˙R§7H˛Â
ņAȧļ’Q#ą ";…6‰-îmųØŦÁ˜¤ū,U›ëÉčL•"ō?‘‚¤hüˆ|ΐxÎZAg,•}
ŠČÎÄYøõ°xô\KDi	A>*˙Ķ¨á¯qY05´… û˜>	o*“ž
‹Į$MB ČŊn”čÄ‚E–‚ŠÅŖĮ* ŌCĄ‚īœA:ßÆCęô>‰y‘~‡PŽŽų[Ģ‡*ũzˆv‹>jõđO•PüY5,?‚ÕCÂēĪshĮSx÷köÜęžC;ŸäIøhü
`EöŅI™]ŋķÅķüĪXūÁ+„ĖÛ}eÃ˛WňüZ<,ģf 6;ƒWVë|éęp]šÜĢgčÔhĸÉ@ÔČ÷gđĐzŒš™˜žëĮįO€bŅįxã$=âžtŲĩŖV­fˆkIÁĢ”5Ũ¤„­]BÂgpZ(eŦGŋŪ
+‡¸ĻPēļē‘9GĐá){€‚Zw ’J'8áØkŲh˜´yėĒÖą=áŧ
+A:늏ĩ
RC(TĐ
‰Æîôy8E‚‘æOžĘũ,ŸŊôųõTDv1.eŦ›ŗÔjĸĶ'øFēü	ûũ#ĘA›
+¤WPĸ1'‡Xcųؔ5´žÎV3.kĨa;)Ķû‰&
ũT	Įžā„ã
Ķ°M	ˆ@5Ņļ ¤ŗWōY?h‘ã}›`dŗkrú“7ØC”|æîŦž	tķ;ŪģŪ€ÅŖ÷RBę/	Ĩ™8˙fāmD(
HfMĩĸņ–JŊ!îH ÚNĄŪ{ŠĶûŖF„m/?’&Ą÷IÄCĘ$üW6&=ÖÍÎ`ÅŖGĘėúĻΰÍ@EdÔjâGpâđmūũ?3ZÆî–oŨjŖË@„ŲõV<Ö`@ū§ā™8ļz&ož
”Ģu
+éę0^í”ęũXB0į2
 ūĨ‡ö
ŌÄīĀE$Ė-gkōÜę&ŅÕ#“Æ˛aŲFÁŋæoæ[l–gŊĀ8™V{uĢĩ9Ū8īØW5ō}§Ō¯
´¨÷eâĘčëÛ6KTų÷%ÜØô\8~)‡ß†ËÖĢd<ÚQ¤‰ļ‘ŋÁŠČžôIh/qrīĒ‘ŸĢIhĄH)=fuģæãZko?^˜e“˜đ=]ŋ/íA8įŦ™´VPųĢŠ‰yFbâ_@2:GĄ>ÖFbÁßsˆ—Ŗ‡*E´ĨTm(ĶDOuB˛'XuL`bqk‡įŦucŗĻR1Ų¨:EöŲGšŸiôĀ)ØŽĄYSėOĨ_û	4ܛ4o%N/âo2ũz"Κ0MKķˇĻe:õö-$ŸZ
+D>įĒ“^iķkeÃ˛Ö
Ë!i"UvkôÖ<÷X­ĖYĪpd´ŪIqÛMRؤÖTDöĻPī7˛üģœH$ŅX;‰~#ņ ’˜k;páøąpPz­™ũiÔp¨ŅīîA´“"ahcņ ôS)Ŋ
ĶB[)ŗpĐī¸ėU3(k¨ŌEŸ„ųõH
?ՊČ.
Hf Åá’Ôû6‚jžĻ/­ŪųÎ =üN8~ŠTĝ¯×éÚyBēڇ1īĀjĄ}åƒ˛†`ƒ˛6€jč6	ûh×GĄ"ÚR#ŋŌ&á#×sēsF–Ü!q_‘+Ķō›ãĩvŒwąąĢڟeîn™hPŦČ(™†!Ą]ˆ‘īÆņƒŗ}ņlž¯]$hĶô™u™ŊíĖÍ°a\H>ģ˜ŪNĪ€cŽ7.kG§ŒĄĩTĄäô‡=Ņį$$ėą"¨÷‚~Fn>Ōüģŧ`´ŸFŋÛ§Ķ°G@ĸą/h
IGØá9W`ģŽˆz.VĐ>ĩēČÄÉŨūæmƒųė¨SÅ
GfĮ’aiGĨÚMĸūIŅ?h1é¯fdŌ[=6é;0ë&—6š7OaŠ?BŽÍÆĨŸą(Ĩēč™:ÁŠŅŽmlėKPƒæqŦ“•FšŨ€Ēaw"5ė	JDÖ†ˆj1H1ÕŌNDÜ ŒöŦ šsU
•teāĮ¤Ŗoáęœo\Ũƒˆį›BÃ×ĩšæa!ÂpüäėŦĸŨI5ûRBjpRÚ=`!í„|Έtz)ÁĪęuđ‚˛Ļ:!é(	ŋxĪQv=
+HŋÅãŌ?h!Ž}õ>[M“ˇFëxé<Ņ¤ßí
+ūP¨‰^*Ņ^âŅO‘`ôD‘€žāBJ%ƒ2‡ôČ$Ęĩ°xôF ~,mÎC2&ÍÂ{‰“{5ō}ŖËŋ{ĘDĸũ †%áG§Ŧå#“nC’>ŠØ…,ųúĪã]”XX
w'PCžpĶ'á­ķ­ë6nĩŒ™|mëb0gYąē[Ū)´ķ<ˆwŊæÍÛļÕF˜‚!–ÚPDöŖJÁ[j5ŅIŪ3vi5ĸÜMˆVÜaĮxÍáKčņī‡‚¯idÚĢZŊ	„ĢFkIDešÉ	ŋA
+)]%ƒ˛]ôNŸßí7Nh2Ī6˙ŨG“^/Ĩē‡&a	h­5cŗ+eŪ4yk´ŒÛmŖįöué Pŧ´x´ŖF˙fwk4Iø:¯
+€đâ˛võŪ7o]fļŅsķ:„ußh’đ3Hąx_PųėNœß­Ņ䠝$ųĩŠL<ÚQĸ‰œƒ6'ŗMĄ›<ĶĮ†­!\›uŧuJŅcpr*wđ˛:AYũ_VLŊ%4֏ʞ
Ę(M!ˆfWĘ$ÜâžmeâĐę C>2,bĻäÔļ‚aŲ°X´-<•'ųœ!ШėAŒ~Ū)\5ƒŌBQ9Įæl
Č'Ũe$ÔSÂY_՘üP"ĀHĐY.a‚í'Ō°˜+á§Ņe`a”h˜ŒÁȚ=ˇZFŽl†a›ą0fÚŦbž}5cō7(ąŊŅëËŪøÅu*A@9õ\­Ļ2´
?o”	č§N$~+='øˆ’ĐžRe´(í>ˇÆlãÚ_\Ëá+&îËJœ„_ÁŠĮ~”9čeîŌä뛝Ĩņ[“4ŋŖ=s—6ī„ījĄG@=Ûfš,ˇ•kÕhļË˙1hfŗžœ`›‰ÛÎ1q[9†­LîQ´ķž„jŋ°ˆ¨­v\ÎGš‚ßÆī­ŽŅsËéĘAĄ"V
+.háč´pœŲ;Ģ¯m_“6Ë1oetÍ›§Ņ[SŌėÚI–Ũ-"ßm9h0
ÛS$}Œ~ÉŗKĶ§ÖcälųÚVË1ndtÍŨ]ä(x3anĄFīĸ†÷S§á=ĨĒø €Ézé´Û¯t6߂}ÅlJ˛Yīā”ĨF4Ĩ‚i­#œÚ.+ĻŗXÔ˙•ŒØj‹¤ŪSŠŒvĨ Ų‘Ĩ_YNîVn3°ŠÖ]EHģĒâbėëJžŪ.UŅ'0ąøąp`Ō\FDiŸŠZ;0kŦ˜Ŋ‘Ō.†$Õî""ęĢbD~§Ņî–Ȳī;…Ū‚tvF:;Š=…xöä߇*]ôS"Ŋg÷įÎũē´šĻ.ÍßøÁũ°[YŽ_™OážÔ¨w×ø­yNÁé"˙’f÷–™CŖy§ĩ0d5}%ë5áÆ5PđpmŗeĢ•ũƒ2WkŠ\5ƒ˛/`áØŖJ vrũ”	ÄÕ0hĐ/]5Ū1l[šcÁ@pDn&6ļƒHį¯|PÖU:&kŖLÁ>“g&s;Ɨ†…YëbügC\Õ|÷rˆŽ
“™3›s
+ãj™;ŠSÅEc“†0C\G­&î€ë~ÎwŽOĩ0üaZR=.§´Ô‰Ä$LBû¨Rđ&zü
+F ’iČ
zoå9ę5´FÁ?&îĻiöŌ<Q$O˜ŽæÍ-úŨF“÷‘äāöH¸=ē´™4oĻίMDŲw=âŲ5zl]Fn[ĶėĨų!ČŊ-O˜î–‰+›gôļ…ŪÁ­c ’Ôû2zd2‘fāė!	ŠĪ€$tįkįiôŌj:4šGQ^"åZŲ×O¤ažpÃŗqēnŸÁ
+Į/Ļ$ÕæBōŲõūÍ
š×ĨR vSJå°'":$§t§ĄŸęDäג!ļˆx´‘&ģöfwĨg@ÔĐÖē‘Ų!Ė¨ĖáÖõ›?ēÚį¯/izm$KnM_[ŸÁCë6kžFOíßøšŨ7lˇÍŸÚ}į¯k^æØ.0žS%ôO´ÆîY] ¸ö+ėGqĪS ō9WXRšÕ˛9kˆb*oxBJ+PĄø‰"
'ųî%ÍŽĄŪī	ãÉČĄuūąX˜2:K˜6ë|åžO"žG
ôS'{"”ūĀđŸąKĶ”Ía0g2Ø5ÎÆæ€éf HŊ^øĻŊž•Ņôąi›JŊ_ÉsĐŽé{ûRTüļ#1ļš`[GĖHHÁxšyą‚’I•*Ū?ˆ}>ĮKW#‰š6„•}itĐÛÃX÷ĨDnŗlLÚMĸÜ;ėöwįē§āÍäŲĩ—ÄŪˆqĪ1"qÚ6€nįûæÃXgK‰(Ü^՘üLĄƒ[A5#œ>9'pŽsį~
[Íí01žåë´¨Ō_LTëĨĘA:{FŽ­ëtáļ7€rõ‘XđSŊpė[=6i*ūH3H(Á§›Ī	ĪŅF™‚t…(§Yī„…K‚jC!ŽŦ2ö:,ũÔĒĸ4)HöÖģ}éȄ$ųl!I>{(˛ËfRf×ßÆu™77šį0ÉRČņîÎņžŲ2rÛZFÎŦž‘Cë1gdtLÛ]_ĶúĖĩBĀœią9†qĩOęŧĄLŊRæ×ŪņÖ}"ČFĻNÃĄG¨6ԁį,Ų÷uŧrŸ&/ÍãüÉí|élģļ4;{]ŗé82ÚæĪ­;•ĒØؐŪž„ŌB•{ūĘF†•ŅSÃqÖX80i-(÷æ&Ôp
e1‰Į:Œ	ĒŨŊÁ

J‹›Ã•Ō$JY˛žđä“Îe”î …´xbęģ€ūĢ–}ˆGî]—R]ôT/aŌęė5ŽÆÖ˛ÍQ¨ˆ6)ĸ~ƒÎÛĀŠ÷ŽTë7\ļŽ´)ø›DS(øAz$1×>€jøu
+éüÕÍk¯r5ļ&pmŪ%ÔohŌiĪč™ŅC•|ŸŠ´ËÔųĩqüčü7īEچ2°ëÛ,ÆtęíĄĩĶn-ŌĻāŸáK“ņXwUíŲ&§dbODøPLģ)ŖL0ÖLÃļŌf×6ŌäbŧbčĘ´´G26 1ļ¤ŦĘR¨‹ŠTņ-úŨ<Üš˛!Į=2(TđmDŠ
‰hbIč–ЙéŗkûōuÃŧoT9čĄRuŧsļŒœY§á;ûQŧģsŧn7O˜îžÂÕژ¸ŽÉSĶĘėĄeqĀmXEĩ^URëųÉ	U˛ú; ũQĢP¨ˆžAŠGßãÍŗgđĐú [ReáwōÛ?Žvtk4Oa]ŲãÆ?tuā^]€ûü)¤u„r’'áĪųÎŅ=Žwô跞:ąč•8Ŋũ°vĀ#’nPcrÖđ…ļuÆŊWŖÚĢŒƒ“S9
+Æz*cÍā$-Å␎ōA9Wō9G™0ôI ƒWA.gOJåHDëŽ$Ĩĩ’ŌfD”ėƒĐkf8Īžą3Ģ¯n^æķXˆëYŨųÚų2í¯'žd”|ÚN§…Ÿ&pm–Ņ#“"ķ|JšjEd7ĸœŅ3ŖaĖæ1ĩŽŨ)´ķ\,Úž|nģ’xÚL¤_/ŖwĻŊÎõ,Ná[mdÉí
+TDBū¤ĖîG0ņi„÷?‰(ü;ašCWĻáCËę0ĘÍR*é	H>į@8g(ŌđMŖĮVĪÔĨÍO¤`š>5:æíLæņâŲLŸ_OUãą†đC<_h•?\IđcTĄäôAŊ9°’Î Ā¸×ē 6ļnFp|ą%&z‚UÉÚībäģé“ķBydRĒ‡vƒŒ7Ōeā–įĐÎ+mrmŦ›ßI'%žļ–J˙sø—íë:\ēŸEŊODŲw/en“0	ī"Ęž›	”đ6ĘôEœ~~'\×cäļZ<{Ž	\›—BŋiL^ØbSNĐV72åŽÃŊë<_<¸ŗ"É@ûĘeí
‰¨}AÉg}´)ø}ëūOŖ^—:5Ü>háx'i
+Ū6€o=ë
ĕ­Æō$ÚÕR$û ą^§Ņ[“aÚzˇĩa1rgc9`ēY'ąNö™ŧŖ:é:$g˛'+lĩ"-ļaRDt
RFéĢˆ5'ˇGĄ8ėĻŒĘ]˜ŌbUVũוŌŸ`â7ĘôH„{ƒ‘JeĮúQYo	áœģŽ€~:I*™’T›ËČ(]ÕBŌžé‹û1m[y­=n-ņė ŒÖĒŒŌš„Ū |ŌF Ö>ŽzD˜€5•Éē’Rí"Ą´’Ļ÷ÛļÕ6‚mÉRđļP¤ŗÎe´Î0e”æ°äķŪ*Â9?ĨÖ=Œwt
wmîIÔŖ¤&ÖŽ„j50)M
ôC–ŨIܡ”`Ö\ZFį3ŊĪb^}mģą4€kZ$RĀúID˜ŽĒ1Y3Xņč“:ģŪÉÜ´€¤™Hŋ>‡KWķ€ķjŸ°ŪÍÎĢ{ųęđŪŧĀEd-ļ„DßĀ¤”–ācŗö:Rúë!ĢeX?ŋcŸˇ­…$ųŧ˜’T[~‚ĸcáøĖ6p1Y]ėK…5{oôLŨęŊ)Ųėrdū¨ÕDŋĻû3vj3WŽ†2
ß
+L,ÚOĻaÔ¨÷aĘē–‡ņC6ggōÎf E>ŋ„ŲŨ:vˇJ—„d3skũÚæŗ7ܷڇ1¯#H‘X;(@˛öqÔŖiėõí‡ÅĖ•a…$i
ŒĀÎ[XĐa\P0y‚;ÎŨįņęõ%OpgęüÚ<áŧ~ø֑0ģ>‚Ė„‘RÛB‘POmrÔĶ˛Ai;†í9ĩ™×X1ĩƒ“ŅÓPÚé´Đã„áh6Œ¸°_˜@o¨ĀcV‡ŅüĩÉ;Žu2PåŪœ“8§eÁĨ'0ņ”ŖF$vī]Ķč!ŊSˆGeri
+­ĸÚ[VûW—Ôē‚ĐYˆ’Īķ,Î%hąX?ŌNĄˆ}ĘDc×ŌĄIk`ũô‚ˆÖZP~¤ÉîÍÄYø¤ˆüvtÖ_HL?öHiYXŌÛk
+ŠßPÔgšŦ¸`ėKĨ^úIÜ#Ņ¤3(!¯lXöĻQpzôûNĄāoĄH(
‚‰č
ĸUôî0EÔcˆâŲ™$Ę­‘>kĨĐnÕ“îPĩÎ%´†‘XĶø­ÉWš;+dÉ×ĩX)='3•ŒĮ>$îë3|iXš@6‡WãēÕP#ûVΙĢĩôkË*íĩ%ĩž°Tģ`5ōđ<ŧƒũžLܙ–îp%uÆ&QĩˇxpÎT<z)o"˙ShØNĸôŪVDv
+BDį<4‰ 	û˙BĐzëGfmT)hĪä­Ņ9Ũšî†¤Ī€ãķĻĀŖŗ# ąčoßüŒž™|ĶW×uéîšŧļ.3‡6_Ī|–ÛōXLÛVžšmĩ2tf9Ū¸.É×shįy˜\ÛĄÃ
w.Ûā†ĨVC”Ō9iĶÛų<‚gŋžŽuw–§ąŽ6ē$ėĻtĘ˙€´Ų–ĩwÂÂK ĒÕŧ{ā‚˛k@"Ú7(íS$ģ‘%ˇ;ú¨TE™ģ˛™°°™ē4ųį1ĪMÚ@‹|˙ĒöĩÜƊ]ŨļŲŸĮ=Ē„"
DÉ7Įę‰ÁœiÃ8Ž.žEĩÅą¤´¸Ŧ	ŧ‡}˜áKĶæÆÉ4~kōuîŨxßäC8š×b`œÃ†J›āžÔÉõOĢ‰ķĐė‡/Ē4Tå-'ŸZ+ģPĨŪGâėžĘ`RRX•5אĐ:‚Mzëį\Uƒ˛ĻZéŠVDv3Ä5‡$Ą_L	ĒÍÁŠwā²vO™@´—@Ŋ_h˛ĪUöŅ=Šx´Oã]§ņkËAōÕH?Ōfˇ÷$ŪUvĨMpg
+õūĢ…6“(ךäķ‘ŧŖuëhœÂˇ:ĻŽËsˆG;‰†iüŪd˜ŗ.&3w–åI´Ģ2ŊPå^ŸŲK›gôŌ´9‡r´PåŊcxGĮȑÉ1s[yįpÎ7‘~} œsÍäÄC"cû ø–xŌI™Ũķ'į{ķž•´†#¤ĩ„ ŸķĶ¨á'rüģ}īl.’˜û”xô[>6ëĻPđ§ĄsĢmáf"K?›ęÄŖí ¤×éÖõ™ēŗ¨1ī =üT)"˙ƒ–u’t'ˇ÷$ŪÕ>á=¯ÃŊķ2pg4÷Ų°ë™6Čą/§;×eâÔæŊ5ÃĨ›‡&ë¤Moß	ßÕ×ĩ/Æą:вa'@ņ”7d){ķjŽ1“×&mÖGœ‚Q,gcc=3f2)1ü—•sSgØö1ÔûV<zʈÛ/)qcšœ•:ģ~ĘDcG`ĸ‘‚ôķ3xgķ•mÎÎäĄÍBŽ}ļSgá6h‘ĪŽ™ÛÎ0fZ1ˇ?Æˇc^\Ėƒ~‡}ˆŠģŗ3}iXâB€`‹ƒ €
MÂÆë&iÎ<ŠysĪã­Ú­ƒ*ųč˜72mŒY-ôø×āX˙-2jē(?ü”|õUŽM­R§ˇ[á°¤;´ĸÖ[#%ČühÔPĶËQĀ™VÉÛʆ¸v#˛S­ˆŦzQŲ1Ĩ=,1­ģZGûÖŅętąUv/]—ĄCĶ^ázļ&ūyÔŖiĶ´0ivØ΋ÕēÍ7‚rķuíc¯p[lŽˇŽ>ĸėz"ÉAĪ“hWĪ؝Í܋ņ:ÄWMāÚŧ4Zx}+ƒiĢÅäŌ˛rdb=‹{ķŅ&am„)ØkūÖj5{mĢĮŽr?L(“¯Ž`ÄSûdö7r>ŽLŽq+Ķę|īæ(*z˜´Õ
KzĮ°ŽīÚų<8iMHĩ$"iĄĮŊÄ=Û¨rĐ6pĘĨD”æ:Z# ąč	ãęžDŧäØ÷ƒ
}O!_/ĸüJœŪŠŽ}ˆ§ŦaĒŧĩ¤S–"ĄHĶ§FķŽ
ãÚ!føØ´F›_	”Đ1ōõœBš:§nžáÎe} õd!qŊ“ˆ'Ëܝieæβ?“|ÚŠ‹õ‡õ
7N†QŗĮ‚&÷ę4*é)Ž4ĶŠˇHaHKHāT,›€
+ë%m…cSî
īų=¸úAĘ'„ÅŲļȊ{éL×ėŊÍB“~ué×aūũ Č=Ÿ†Û ƒ“Ė+Įfš¨á§ņCĢ9ÚGû’É;ģŌŨa0kZ:aģ¨‰5/Ã~āPāb\lß°
+pÔVĐBšÕ⊭ō!Ö6 !ÖfũāÔnø""['9ao!é”ëœÜ¸'uL1K2åŽkÂÃĻ[Yô-ÖNŲAŒČūÁIiWĸÂ,¯Æ‹5ˇ+Đä%$ėVLĢl\ĘP0.@áčŖJŊÔjâ)˜Ęd­Äéũ2wf3Ná[ācŊZØaÜęŧu˜Ų[Ëî ÖŅ5~môõÍÆæxįhĻĪ¯wđb˛fōû™=4™û1ŧƒ….Ž&†@EbĮp5Ë$â;Ûpá´4|oÚē2íÕŦcųģ!œ“Œ8ė Œj
 .Ö׸;Ëī,ˆĢ=fĶu“˜0Ŧ7d9•'0
•—:ģN÷ŽãpåzĪĄ^_*ũÖĸŒf;|!đ"bĻzQ9+uzû
TC
‡xNpÂą;…"ÖS$‡(ũŧ	Åî!Ši]RĸßMTØö“•4ƒŽž'ŧWßÆŅ4~mröēFĻŠôûZ@6g5 ™Bģƒ“5†)Ĩ2W—RyÁHZˆŌ¯žÎŲY5?ļöÅn¸qķŽĄŨŦS8į&õh É=ú'roFōôĘD—‚´Pä_'ŌC—€ĩQ§ ͔ZH'…ziDģú&0Ž&ĒėS&;„•´MyK	įĖĩ5ëÅeÄŧÅÚ)ûöõļ3úȒđg•˜đl@\l3@Ĩƒ ûúVK$ôq´ķ5ƒjRĒ‡9Ū8ĪÉd1–Lš Ė=-T‹E-Ō¨Wžú‘)¸’Zg¸"Jë4Ęių-|îĐu´J˜ũ*@‰ųŽ’âƒØB‚žĸŠ5Â$¤¤.Ö߉‹îgC‡™\EEöądÛ$Ę60	OFEFģrbö E•î:bJw RÚŗKVo¯$Ļ~ëįaĮf]“–0$TKá	i֊gvAH)‡ŋ‰ÔkČö@´!Иė
+V?UĮ/Ąˆ§,ÁHį<DXĮĖĄaeôȲ6ƒqYĄI@ZȲ¯aÖMĨāŽÄŲũJģc^įūį€Ą‹û^6`6Ųę‡xŽ0…TaĮf6HPŽ‘;Ã^ÛėlŒœ=ī€…ըÕYL‚PHaHC0ĘA&ą•Æc€@@
ÄĸŌá\Ô­<Ā
!GŅ cĘBˆ1"""""H%I=:!€ĶęBčgįŪ9ƒ_ÄÕp]ŋiāGĀŠx×tnp&B¤§dMĐyĄ~žđ)c:)¨KN×î0ö×ĒŽxņoĒdĸ†î
+„FrŠķā—QÎÖeeĸˆÉÉų^Vƒz@;<ģõqíČŲ&§esZķĨŖc%BĀÎŒ2WɘœŲāĸœ.+gxļTÎÖ%fxŅÉšéę—Út9šū
Ņ¤WO‹våY,Zĩû|EõU#†‡áK;Â
+xO‹‘tĨcVDŲvFą,ÉædÖöŠŸ­ë“õBČÜ*æ6=â	O°P˙O?ÆĪ˛ôė›RđŌAVž)đéŧüO	bú_XWëIČ×ëyXÔkZ]ˇ]Đfap•BâŽ`č’ÂܨŠ)ĪôĶ~
nį¨įõ?æHhû÷
+?›ąÃË.ĸ<ü0ÎŒû×iŋ—Įã8Ņ~•ū	ŠßWȡRĘķuûxVrtÄÛÕs‡ėą%ßųļĒŊ(€B<ĄëQįbõĶüā}ËõéÔž™së“Ësõe<l‹—…D'ĸtąr‚¯Ę˜Íģ
+'—Úī8|Í9‰[­wÍ'ŪĶĢnOé~¸xįJ.
Ž_bķ=lûŽ°ø†íŨē<Ī)'?KĘߊą×@õëÕFØYīķ?kÎôqfÄn{ūŦŪĻ d1ŌķU#§&‹ŽûãæŖ—MôÜX<Ũ(0y+ôŧĪ90Úl"ú0›ņ—ęžĖã7Š—ņôPƒ˜‰Á…„7>WAŸ(ÂĮũügDÜYlôx{Ôđōižœą¤ šĒÕŋp…įë#lÖî@~ō{.dŠķy8!¨ŋûøĮųpß=kžOövL\ėčXŲXĘt>á~Vî˙˜ėŽzÉÛÃhá2?@ÔgÁÁd÷Nžīq}<> TDŠ“ŸZĪōÖ-M+DŒáJnI÷wŌĢQWVīŸ×ū@åĮˇMÖÃĪŠÃO^ķß°Ÿuķ4Üú(\ņúŗ2ųÁžė›~,üe°ŋ°ŋáŊv¯ūĄû›üö>=˜ÄV†ŋĩXûúYß
°öū
ęgmü“ūīöûXË~Û*ŒzhĪ‹IÕYöĪ<„V^žmÅrģ€_‹ĩSÜ0î˛z1„ŨķĘ}§˛ŲöNâœ‹Ÿę›ĨŽŧ›ß°„ŦōŗįŖĨŋ`Ôē_ŗĀ ĒĶ}eôˇUûøEtsäÕÖGb|úgmž5˙sÃŨ{Ū,Ūžī‹fģC(8ļØžģI1Ãe›O?k‡]]úŪ8}	ĮĀ0XûYŗŸØmÎjú)›^˙ķ˙Ķ^eU^Y×ķŸõųÍíéŦUōIfœˇą“ŸÕ䍰“'YíķuîÕK`›sŲōŋØ6d1ôøvö‡wîÆ÷?Ģ/WÍuöŗÆæ53>d¸ÍcÍŗ%‰Åg°ėͯ“‚˙Ģtļ›äėCã'˙=h3œ„ļũƒ˜Š'ŅvĀĶė/īgēŪâŗœÎč8äíOxžŖm/›R¨ŊŽ[~žÕ~B}ã°Î0+įÉí	Sî˙īŊŗymĀrA׏tŌÔžˆÃ-’ōFQՓ吏[‚k‰ŌčŦĨûO“ĐēķÚ÷R螎ņuüú#D&^Qėŋ>'ÜVJūŪ“1ûgGZ~ÚĻ™žXõą–ß›;pž¤"tuĪƒĐÖR•Úã—Įíy1~WC.ą!õ—Wo:1/‡\sĄ=‰ĸ÷<ŒĢĮw)ĸO¯ŧŲiĖ?ÎÍ|š•V™īKĢ‹6aĐUŗJķHoZ>’­}:bf%ų“šĶtíaˇž
Čųg2*'<>i%hÚMƎ>´ÜļšxŊķķø6õé<Ž^õąO¯vÂÅgŧã™ā4äûuÂų9üŠrJ*išĨ‹>ˇ Û§
ĨŨ„-kx-Š	7÷ÚuŋË`[l Ō ŒÜ-¤vÔ§•­Õ[[ÖĨ5‡P.;	nĩų K–šĶĘŦ&H;Ņ}ōü¯Čšš“ãģ;,’öĄõ$?’O	õKÔôīt0úģ؊Z )ß°Ä$—ŗ;;9ŗĒ-u€âŦĸ…ėö3ėW•ĢM—ŠĘՐũæ*ėĒoģ”7Ø#jHVr§„đĕök]V—Ŋ†(ObŅSÚ÷ëS_´e°k}‹ØÂ>:ˆõŽđ€đoۓŽáŠ3Æ3ō]ų^ŦˇúŲ]6J‰§Đãé÷˙šŲ'TŨDÃW\Ē$ô0YöaaČÂädr€ē;ŠJ%Ø鋐üķD‚*×
+™Q%îŠf}ČÜY°š3ˇ*zĻü’Õš˜ų›ŖÃ>o…9¨gĖ>6ūŋöZ‘œw3ØÕQCšØãô֏rÎ0˛
Ŧ…ˆč×ģÕř€cūS	lZôļĪ!šQúĖ
+V
+‘xõLé_1ä ­ú˙øyhv‹<Œŧ|IŗåšY—âeĶØü
+5~WqŠ†ĖöÔÉž9TK{~Ą

zũČ}˜I¸”RÎ1øŠ,3āĪ„ĻÅ\NūíŊæG=…oŒũiŪUŪõ3Ŋōs?Ú>LĘ6ÃĘ¯O‘w3÷yKŧ’˙cŽũš8–=š}
+NņÍ@ūS
}ˇÆŨ–Ģō‰ˇJáVAČújš÷ɛā4ĪjlXßkKĶąbŧ+ÆąĄō÷°!SkŖp[7y‡mæcyô`ķŖhčŗ|,Ĩ_đáĶŒŠƒŊP…
˙րŋåŊ+ÔbŠũwŖhå3‰Ú>‚úé
Îķú1<?ģ
7ũ\Ïáėßģ×Ķ`s†ÃŨĶÃFžšßŧĪ	]NIdaōã/ĮoŦ0Mĸ01ņwŖΉÆv—‰ĖŌī}îÎŋVķŠ+CžŊī4rŖô˛ûzåîãaˆ/†ĸEŪCėĀĒ˙iš1Ú‡ė<ã8ûŒwQÁ1ūšo’Ú¨ßč‰i

ĩ§Lũ343\œ+IøŨÖ;	Æ'Ö^&ģˇŸ
@úSYၚįWoDč#9ēśúĘ_Ŋƒœp“1œũĻ&Ū‘Į>žy—ÚFôõ”œÃŠxW3ãōĐü
+úkáJ;EatĮŲėãÎ)Aŋ&MüĖe[ZÅĐąŲkúŲāä§;Ž:­ļ—ŋ
Î@Rfoúŗ+y#垧ŗGiĄŊ[t+#W"4ÔÛîXō¨E‡Äčį üú˜ØÖŋyž(
¯3ÛžæÍōŲÎČmpiK’N@âĪ,ŪQ~<nģ‹Wö(fũÃ+n<KV7ęõĘÜũY§	Ë>íÚ""üĨ˜Ú_õO"ÔÂņ­šŗäFü›cãp5ŦëS•	¯Yŧ÷œũQOŋŽxķ™ô¸ŦķØõ.ĒāĖÖĩš3°žX°ƒĪū™V(ŅÂĪī9ä]í×ķ9úlĩTįŌK§ŨæĐđėē5ŠûfZßŪ!Øå¨wŦ/Ž‡ĸļYĩˆFŨ@ĻˇEDôoŅĪÛtŋ/Ō@-Fo
! •	á€îƒĘoÁ~ė[;‘.}ÖFÎi7ũÔ“cīã°¸áRāÚTΐāŠ=_™
ÚU8Í[a zĝŠ@Šô€ā–	 ‘‹dÄrDœ+Ĩõ§™I§žíįŪ‹+úÖh§Ņ”îŠå­+â›ߔP(Ė‰ã"8č5ƒ
+Ĩ§žÉɀųq÷´­,īķÕîßÂK?ËīŽÁt+iģ3mj?6ƒŅĖ€Ö^lų%‘nģËē莖Ō™æ˛Ę/ŲF“¤ÂŊūĀAĮÜsCŪæ3ļ˛¯¸į
$ü-Iīė û/ã’Îh›wž|–fåĪšōväK–”āÉØ6—g5üŸĨú@Í
+Ņ](į&Wrđ'֊*"' é—ĨđĨpžˆũœix;ꑅ(ĩŽĮ2eŒÄ“ _ūØŧū_&iá=%*`âpæUÂĶŠ~#ģtJčr`ą÷;ēį¸Ž=f€q?šy[P™Ą÷XžIÄĢ¨āŒ­øZWK_õ˛âģē
å€kEŊt*R˜Õ
+ĖX(Īũ+Q]IĄÉšé<Ÿ­”&gZJCß{ę[(iÄŠÃ-pš_zâˆhŨ”ĩƒÎ÷
Pf—æ¯:;ĢŪ,„đXöėwÉî
…!™°â4Ą(ÚčĨsÎū5ųƒ[͚/(ˆœ:tˇ‹ÃT=ļ”umÅ}¸T ÂFæâjÉ	Ą4;AqŲ×ãÔדoÕ	ęōؕiœđf÷üuzt?s#üÕĒ…
%ââ°L#Ōģ˙@v'åĢŪëúŒ
yeĊ
tâĶ~Ã[
ûĢU3&'=ĮIû%LŲįœõy2k‡‘ÚnŠÆčh…#vE?~Í-n>FŅŧOq%Ž†0qž˛lEBø—woŠxųžģSĒ@˛ŧʅe[$žsĖN!Ū)ÉėųŪ.Œ%č¨ŧZŗEāV’Y×Ā
8E1¸š°fąSÂ<ĩĀ›QūUúėėnoduįR—¤\Xŧ`ęŪøđSĘļĻ@Z:9›oü`ĐÁˆÔ-&‡66Aö~=ŊŌļ¯ˇUʡ!ŲWūĢ/ōž›KÍ°ˆOŨ3WPED*gžđĒĘü5û•ŋøŋéļG^ĀK7ŠCw'°)l}#EP‚3ŪĒâ‰Éép4
+´Ÿ'Ô¤AÕuzIZöāŦ„Í"×B“˛uÎĖ¨šĐ¤™AæEڄIYøÕžg¤XļŸ.Ty¨čĪ'xáØmÕÉԎī[”}Qžl(
”ŖÚ CäÍv¯ļ¸õÅØŦŲ
+Ŗˇ™\Ē`€rŠHēˇMåŪŪG€ÄtU{ņ‹cĐÄÆxK$8-ꍤ›.(:ŲŨŊoĄôž4Q×&ķ—S…ąqČy/ĒĪM‘2ƒ˙ŧ*2ÎŨČaÆj1ËēˇƒiāUŸkÚđåĶ§“­S=<Iŧn–t’ĀÁ˛#ņgŦŽ+.Õtq§ÄĢ'ēbĖØZBđž.^Jjėgņâhi­!6Tgū
+Â."_pš Ę`
+â!Kl‹ÂØícÜŌą{JŒ,™0/BÎ	ßŋC‚šA#ˇį…Š™Åj¸ī3p&›‹âā
אŸ{|ąëׁũōŸŠ`‚3$ęÆĒõŦztƒW‡ß‹8ëYØ3fƒWôüĸ\ĩ2˙tOœ–{MP#œՒՇhÂØnÁÚŲå@(Ž$­4ÎąžgŌ"ķ1Zīb”c@C”ŒbžēĀwƓ…žR
+K-BžiaF ‚įS—ÂX_“S.h r˜0ëüWļâ=9ôāÂNŊãŨHõQƒĒqŗ&ŋŖĀeŌųbåH€×{?	
14PŠ\ŗ¤ūm:
+´
+98a39f5dd-d149-45a0-8f4e-c79eec2c63d156276129-46f9-4442-8ca6-81318114510450 62389e78817e-0090-431d-a4c6-59e8b5b5769037ede6f1-c99a-447e-94a6-a44f2b10eb70034638.25212523713- 1!#<īøMŗũĻę aM\Ģéķ<Ôė‘“m§jœms"Áˇ3n¸ā ųĩĮ	äëŧÂ4hÖfāL@ÄS>Âųƒŋüvf=&8€;íÁ]gW ãNmčXŖ<Á9EáÅŦ˙æ!Đ6h@
	X8kĀ˙M#€—Ô@ô&F`8}į˙7oyß-6T¸Ēnô5€7i30303ÛĐ'Ô[
+ĩ[û´r÷á
CT`Dąoņ;TĨ$Ų;EHÄōŖ˛U	E
6

-‚ŽSâ
[
+ģđžjÛpnbbâ˙ML@ö‘€îžw*€.ļY?*
+, <!HÖ
ˆĨĶŲ$J@í"ĀÖXĶ…q‚D>R
—wok!Á
åĢDäID\Įž8ĸöņPkÕâ8	Ŧs),C… ÍGx!ĪDĶá=ČÕđd(Į2ˆ‰TčĘ0ԛ¸ŋDžôJ<æv°tGú!ß|ˇ†æļ
]ˆ~<ēa
bB4ÁečĖ#4Û‚Ũ
2›!_ēD€bX(jŲšAGģdģ+ž”AŗÅQŗ#62÷Vđˆ@áIņĖlĢÎËVņSá,
eĢFā81 PŌļž
üņc›ŸUž)—K—ĢūōV#g\‹ÃĻÅčĖ8aŊ:Ō—UëUå-	į¯ę”:}8!
$ĪÍĘ6?ƒá…ĮŖ°"Adn˙œĄk@*té|hŘ 7Ukėh˛Žĩ>øžG<N(CæĖ߯Es1*ÕîÜÚŋģ?Ėo7ŽOaąŅs%ĖËķܚQíf@ëKÁСæË°nŲÚÁˆ 1ļ‰į20ŧ)oŒČÄ
+°­¸
+ r8‘3ĨЏŨ? ŋ@Ŋz†b¸7åŪđ•7ÆĢ_äëؚī‚
šöa7ŗ,EŠzØVQ†üŽŦu#SJ)ĨO)Ĩņ)Ĩ4Ō°†4$ÁÚí`|ŦsôD”ÎiķŋOj7tkpQDf<÷„ v?z;ĪÍķq¯ųģĄYą BZl°ÍyJ4"ĩY8Čc€˛},ø
š°ĩ&×ÕäĻaŨ:÷œøÖH„ÆZâąõ	í%sČ>9ÔâÜ1O
՚‚đŊdŠR¤ŗ§”ļ@čĩÔx¯"\”w+9š[īlË=gņ×ō+ū’lYę­ÔPŽ=čØŌdŽ-‰:|_AÅ=åuˇØōŌ5wÉĄŪGeŠ'Į.ė-æŽÉ–JQ–ZĸKöZ|/ĘåR
+tM:RŖ9ŲkËĸDæZtßž9ÉŪ'
+{ī\:ķw,&LĨ¸E[[LŽ×ĸdū+Qø^s
RæÚZ~Š§DgŽÉįÎŧ­Ö>žÂäRNyÁöí1_*:	ŲÃgūęũJOšĒ5éü_yæ¤Įå˛ŧ‡Ī][RdĄģ5ÅlPĩ*,ÖÍyo@!Šš@#kîˆĒõ¨`÷mØցx<ēņŽæ@sÔĐXÜLˆæ(īT|åŠz˙^ü¨(KyŖĘ­ˇ(ɑXų7ŒĖ•üÔ @ZXPžtA-ļĨÚĄeŠÖ–zæ)bAŊrš”j’CQūž–˙RKƒPaqŠwëßĸH)™Tm
+“ūūĘ)QŊKZÔģÄ ÜI
é˓ɡšSPũ+鍚s¤†úWą-%ĨôčIÕÔ˛”ŒŪÖJŽØŌŖūWl)BšŠlKĄ™Ŧ!(Z¨7r°¸™š€×ģ"ōŊøA2Ij¯1ĨĩƔgmũ¨(¸oLÂ$ŽJs/æÉŲrHöÖŖ ŒĘ3EÁæû–&Ä/ņųōœRšTYg……ú”™„I˜„I˜„I˜„I˜„I˜„I˜„I˜„I˜„I˜„I˜„IŌÃ$Lĸ¤
+Ą\yjœÔpĖ=†[¨#;2SJŅˆ$I’é“@00$¤‰Dƒąž¨É
ãāh(‰BCPÁ@ Ą A ”ã 
+c„ENęŒq*#@šoÔVnP‰Xæ!xmŧŅgŠ §3=€jŦŲĀŅjᑚjíúŽĨ\ŋĐ]â Ã7sîĘģhÄB ĸųCÉĘí‚^.h uYĩøō$đĨo‘đŌÚūÚDN$CˆUœģ	Aî׊÷¨ĩļn>BHGņrņĖbšāI”ËW°<b‰;Rą™ĄÛzĩęŗŲĸ‘…T
Ŧš•p0Č=É×Āt…C>šÍ9į”;qĐMIh	:nB/Į%ڗˆrIũĩgƒu”{ĩ’Ėĸi~ it_KĘą¸uƒŸ[ģÃ5īŅG_“@Lŗ2gaĮŊgXĪr•
"*?PGAÜĘéöŒĢgūVLü
+?āGĨŠŲméDûz§ŋ}ã
+…DÎÛÄŧŠ…C#Ŗß.æj‡î ŦZęt‹lF6ÅĮhQS͒ãĪš[2įtPæwž˛”ėŖEc´Íü1S c.u‡xL̀VJhņĮé2唔崋DáŗŸ{<áĒ<ŽŠÁj_ņ؇aŅ4J2á@ę.26Ŋzų´Å9"B˙N	&6‹|´$ŗ|߅ԝ‚6.¨z!‡ŒĨEmÉÚ[haŪ•b'´ĮíS~ŊPžUö֝š€PL—jŽĘ“üeAe´—}‡„Į‰—ûE‰EtŖĖy1‘CzÄ^5Ā9!Î`œ7ū…Ü0/ŌæÜąņúl­­‰Kĸ†_ēĐüĻ‘éŒ
đŽeĻ]'eX¤yÁ5ÆÛH…0oUø÷€qq|7\›ō"ąčrtY\§kË:Ą5)ŽCú…€Œ‘øį)†žŠ‹ĩįŗīŽŅž‘P#+žüŠŠ”kÄšâ•OfP‘āŅViäûĶ`ššŌ­<ÆLæôÅ­į4žeÎā㸴đčL¯$ŠdãkĖĪ vēO.¸âqî¨īؘēĸ*ŧ
Q’—°Š‚ģúéŊ|N_äß3fqĀ¨\.‡ÎCĖÉ1ׄ!ËĨÔĩąĮ8ĀR(Ũ›Ķ9ŽÍĄ˙o’v;†¸)RDq@Mcya˙KŪ%„iŦáëÅ4*ÜŦ rŲ"¯ĪUŲū?ģũ#ūŲø9ōČHŒâŋģ%ŠĪˇ‘ĨsÆų3ņ’1‘Ũ¸­9k ÎäÚ?”á¯K”_Ag•8hĪÁëƒÛXŋRD{zNĨˇ˜“ ØŽ ˆZJ#Aû3šP‹Ā†(ęQēûũŌ(_jÙėĄ•ŠŒŸÂ…‘Q§Bŋ0Ŗvų˙s@›o˜÷Ī‰[ēūsßĀŽņ×wŽ¤čÂÅ"´}ĄØs° ånÉZ$卙X#í6ĮJË8ÄZidŪظœĨ›Ą9 'ˆgĸ—AērÚy‘?…-ö””å3Ũ8ōß@m	ønwAFã’âuNÂc¨u)3œ:†ĸßä`3žs÷ŖY[ŽųXܨ7ÄyōHÆŊxČŧ0uehąz4ÅĖ8ÎD
đ‘É]ž+KHŽē4– Í_VF#Âņ„ Gâ*(<¯mŅįųëÄqæœKû(]H!8Įl˜ĖÂĮöTx.XRËÃ'í	qŖ“!Į9˜ØéēYåDpv,}2ČÉAĄIœ—RytaÛhōPÅēü^UÁ(û­7Ư"ääĸ ˆōĘLžÄŽûŋ÷ŦÍĒÉtķÕVØ%:†ŲhˆIŒŒ¸
|Î:X’ĻŪh'ĢēWĢ>Q`E5Ąa,
NRzüI_Žķå…(đR7šę5Ø8ŗ_WÎ,˙BŒĖe§Ú¯Sãļ÷´ØÎĄûĘp;îÆ,™”6š´"NW…´.āĨĀ¨ąÕčįĀ•ŊŒé¨X*bĮ‘ëĀ‡’ˆx‰EˆŽĻa\NÎsúCąZģûƒ×Š„/„Z˛XM´…ęZŒŒ¯Nîŧ_[Åļ>ĸUģå2~Eņîe@jnļš*đ$Hž´#Q..Āe(Ė‚(%ĀĒøRãÉLŨcēGƒTLMl‰=EԊwĮūSŒB‰Vq€ĘÚ+L¯7×>ĒM'
âáļáŠ@Rž^/ø3!ÎbdĻŽg…Ä;ׁ4ŦkĄ‘.…7E/B¤Ŗ[™Z<;dü'ĐųJ1{œë‹‘7€ž|–AŸ$ˆČŦ”ÔZKˆČEôā›NĢ$ö#79šn†ŌĖx:20ą>q+ļŧH†ËÅŧúĒ,+ŪŠūXĘŨՋ’ĐĨ—ātC¨āė¤Fܔ”w
+‚A;¸PhX}­lTmEĐÛõąÜ+L¨„hFJ[ōÉIāqB˛\\ŨåXD>›œhjp´“ĮK* tSÃ$āJdēpPRHĸę}¨XÔÕÁjũ7ŠŊIP4ėč\˨8K#ąg5Rr´ēHŊôĢ&6cĖĢ˜Wä‡i,ĶFĒŅb‚%ÔeŦ7'ráÁŠ)‘ģ—ōéî	ÎÕw¤'âvûŨžØ^ĩė˙–āV)8á¨uū:Ō¸n{aX9ÁÖW1=*	ę´Ž_TŅ—ą,Ų˛Å{FrĄ”㆛sOÁiOR<k‘,ĘĮérä?u;Z×ģ*1uáÃPy†¤;u)5ŠfͅŅtë$bä‹ĐŖcq
ö~ō&*VÖU&†´
ûŠĒ
Ö+56ôΒ(„
÷Á)ĸ‹¨ĖmXRˇƒŋOü1auŒ(äJ¸í˙YfÄ0ÖõīQ
>Y›æî[•æ…„
´UÉGN/wÁAcfp z‘RsMät°U{đĸCĩ**ļ‰–ŨÅZsË;™{¤ŅÔįÆQĖŦš˛á…îšpœ#'ō=Ã)öĸéZ‘Kë¤'– I“+˛\öĀÔ?FuČ<Č7͙ÔQD9EņĘGÎī
+Úhz&ôár‚‹?ús>"áUs~Ŧlü WüōpE#'„­ r‘Án˛‡ˆÖ/ƌã{Ą<dÃ_āOP@ccؒN“ō4ÁnA!ëƅŽœvŠœ‹ø(Ņ(šˇáéÚ äG‹–ÕVŖ‡ė܋üąŅ$Š[įŸ$˜ĢägįĐ8˜ĩY§%ČŨų
dÔ5TĨōŸõIs#ĸvˆ‡đģŖ‹ˆäĄ†?†Žä5ļ@Ęúd€DOˆĄß§Ą%‰^Äļ‚bÛbX'EČ`VThPEžCöQĸ—ijĸ*ŋ’ĩœqhũƒFK×āøÃ6#ŊVM…Œ}ëûP>¸)Đ/ECí'úÉ_VH(P5ŪĩŌâđwÎŪB!2"ŗs;ˆt`0Äm‘ÍŋĢ#SīsDŦ`÷\Šöãī'3Čq)ÍH<R:'žŊų˜ÉËaHIQÛ8z]QÉ–=
+“•~ōĖčƒ•-4Ā}{´U¸0†šĄäƒCb3ęũØkĐå"d1jZ:Ļ>…|ŋÕĄh
u‹ŒcŠ]…ĸ.vUŗú_BØŊ
+,ŖhŦßmNßGĩH¤–×+Øē\ę;gzgHÂ,Å:čĸLꔲļĖ^¸îZdäša`
{—Ē¯"JÁB n|.•s€(vÃÜ´šwãúĻáG
+āí•cØŊŌųƒ…
+7…˙rØö`'~UiĮŗnÔ_‡ëRÜõųÛЊƒĸ^šææ€Ęq7Ā<lN=u‡;up>tĨštÅĻ•ļđ
nąÉUŸÔ4
†ˇĐ(YĸŧņZ	¨hBį×>ųÆGäÃĸŗĘĒSáFë멌8ŒØ.’˜Ē‹Û”ļ
ÁÁ&EĶáuחĻi’
 ŨzG˜ú„丆ƒe
v&CūČō:“EØnŖD&ļk×BXūŌ֝QŸÖBŲÂĀĩ!Ø
+EŽöĩ…)Âų+_AKФÜGƒ#šåųûRĸCjsb×ũKŠ¸Vō…1ƒ–k,Ē˜JFÂ"sž [€ģ@<ōX^„æū•wÄ*˛zĀ@ á5ą_ˆi
+ĮŸ­`q˛s~Ũ‰^¤#‰Đ4¨¤†
"8ī†güÔÜ´€‘ã´+eFoėīpg^ŗĮˆp¤ČÍdÂ+"†Ī ŽEvÔX™z !ąƒĀ×YøY˜Ēŧ SÆ_Ôđ¤Ę"SD?
+û<Ĩ”ˇ‘†iá	i^X`Tyô;Ã
+ĨĮŖ“Ov †Å‘{ƒ°đ	ĪkčmŦÂ%0žĨ‘ŠE	)ÕÛæ7üä2ĀŽL~ŧÃnëēąqMJGŅž+#Áœ*L´(_ƒ
+X(OĘTŽZã‘#‘ĨæaĘ3ž2ŧ†8hße¯Ø(ŦņAI_‘(^M1í>ũĩ|ļp_›
1hĖ5})ÁDva—dŠ­Üũ9ŲøbüPâ§-&<”<jt&‡ÜĸŸmb%`žu—Ļ˛ĒĒā$[‚l;YŒö7Ŧ¨•uéŠîč>ÍF3‹ÂXˇī)Æt(ÖZÅ{bŌ^§ßĪā¨O	œ'ņ÷}>īxQYôÚÁ|ĢņôvÍ <Øš¤ėȃbDŦęōFBãKˇ•‰]HđœĢđĶÖ`|žōBĻaŽ•$^ōģįt^uą
+)žFDĐgŽö“ĀzSzaâq´Q÷0žWĮūÆUĐŅ€õ" B§’g_Kšĩ”+fĒ°måeBŪß
ļĘI—HķŊŪr¸†_<͡&üL2t¤N](H
K4ž  <jk2:_=Ô…AŪŽęˆßĒ•į‚YĨÂ7@Ô6ä]N$S%iRMáĐtoĸ<4€%-<”(ļa’ŽŨ6ĻĪRĒˆ8|1¸¤<IĀÁ=eŽUFĶcl>'š+ŽĩėæƏw4Ą^•ÍÛE
ņ-ÉUŧfũŊ*j@,†j˜ŗ6úEÃÁeũŧŅÂgĒŽŒŽtŌJîVö2N)蕆“šE,/7ĸ˙wØũtlhtn
°Ā˛üĖÃUŧ¸‹
+(õŦm4xJÃmÅOɞŗyƒ°éښ%¤—ˆtĻGåŠŲąĖēáHrĒBÐPE@‰YMŦ˜*ėH<¤ÜhŲ|TxÔ"H‰/ą>ߑ"ŦÁŅĪÎĻJĸĻĢĄÄĖ™žnâqd û	äԝÆŽ—3N*x;œÂâė'ŨUįFė'Û	CU=„
/­Í„ÖČf•ÎĄėâŧākZ	¤ô=(éĶNml+HÁbV^^câęŠw†SD:ĐpŠåčë$2E.ĄUũJÎĨëâE7íVĄ¯‘É.–ōÛpJnæ}:{V‹ƒ[‰Õ…hI> ÖÉąķÚ"Ë6íģąĒĮoĨ]úęĨd5ũ%6ķG4uQ-Ü9Up€Ā†j‰thFŲ6MOÊ$ūĐ\jÜŗŗC
+Ō×qÖŪÎßl‹B#ÖmeD‰(āa/ŋīîĮ¯Ũ@€…ífvWÎ]íÅĐ3åŽlēeŌ›ÎF›ĪQWÔÍoN„†Án°Z¸Ô<œ|G-–\Öí>	”éOr0ƒLúzĻ叜VHo›ČŅīËuļ/ÛAY’†ôË=0ļ0@ũbj͐‰Jcpŧaæ0𸴂"
 ĪÁAėeEų`RŸÍɗ-ÐČ_ĨXĸnVSõŦ<Ķ-÷8P^Q:ĨN8¯Šš!׈‰ä$R”ŲCM0JtëÜîÉ2Ņ
ƒÕŠøDˇÚ@Myq¸ę€ŽÍX…Qr‹AĶĀã>Zõ­đRŠĸ§‘?ū€ƒvĖs0ĀĘįĶ4ŽŽ[dō›WÜ8W
+é˛¯’ļr_C–
Äac•bÎ61Q
\cģH”BæÅcY]Üsā$ŲÍ]@ؖôOOÕnģĒD6­ß5
2…ĸ4mIãÚõgœvŖ°ũæš8ō ž	ZycZ°H>^ūëü^
+vW$×$Ė	æî™Û™.[eŖ΍W#šĸí+â	J8Dō™×œÅī7Ŧ=—p.`ö~ŗģ7@u˛mĸ70ōf¤gÚ6°
Ā @—øhdŸØ%āl^ęŒ¯ŽC0E„:€\FDDDDDDDDDD
+WąZ[ļģ9Û#ĸëwú[Äą–}ž\×ĩNxCJ)Ĩ”2˛…Ú.…Ÿ"R!đ
Ģ	Ë	ķŋzۜûŽķŊëÆÚrmq~n펝ßZwí{cËuĩŸpÍØöĪöękõíĩ_ū}gü!ĖšnÖ´ßkëÆxßmõŨļیģĨ5áēwĻ˙vë\ģžZëŽ3ŪY‰˙ĩZīūÛÚz˙ëãĒųũRø•Jã÷ÅÍŪŧs‹ŋŌŽŗđ+•ąP$Q/¯L}ĨŠú$Ėc‘0•ķĪWhR€D’el$)Á˜”ŠoĩęĖO°›!čąĖ	ôčĪ—øz‰`K}t,YV z}ĄæUĒŅë ķ‘ŲĀœĀĻ֟š‰šŨ´î›õĻO1ë…!č	CĐS‚1ÕKܔŖG˛ĖŦ`Jf6	,ã(´_KKS
+$=M+å•Ļ’āƒež@‚ŠzÅ,Ÿ`™ú\Ū‚eNLŸÁ|
 ž,ŲëWįųu’lōŗÎ:-–:ë´ėi™V’M$ŲäTzĄį¤ëĖĻÍŠ€ŅCŨ–$8jNĄĖŧ3Ķ:īĨuŌ:ņŦ’l"É&vVŲgí3—^čÉõÎËkH2:'—÷™æøąJīëžXÆKl˜d¤ôČبQ…`ęõ‘&7COLkÃ"YŠ˜ØPzĄgŌ6s}IÆ͉EõŠ‰ĨIKØŧĶ2'ã§Gsü2ŧ—'š,26jf6ząôŗįLɎëp6ĀÄZĶJv\—ņĖtožī÷Nk&BŋæZ[ŒožŸˇŪŧßŋõŗŨ\Ķš•ČXJ\ŧoĖ”|
vŋŪœ^Îŗå\Ŋâ{+žõâ{+ž×ÖėZ3Í|ÛÎeËŊĨ8ë¸ÎeĒ-ļ×rķZú(¯äFOƒōl͛æŋûSûr‹ĢÍ\ySlSZĶߖg)LķsœëėüÚų晞‹Öįē‰-˙Ėuéå´ÍşštG5—šęÄ\gúYę~ÖõŪ)ŽÔZ?ũī°ÕēRŨ-͗ãšRîZúšĶūÜw™Z{éļĶv;mŪ™nN˙VĘ?Û<å—ūÄ?­õōLÛ¯_ô6Sd™ĒŊ4wÜ/ŨxfÜís’lķú-Ũü)Ī6ö3˙lc5wšų7Û<wž]ëLí÷lsíÄķŪŠ/ÅOą?mŽŽŧcŨqĨ7sXkéåfļœÎ\דm^gËšˇÕRËM<qŪīųšî‰{ŋ˜Z­7Oķė]§{ę~i}ŦmĻ•Û_ëŊŲâl31ļšSũˇĶmkÎTgŽžųĶŧˇÃĒÃyOœ­ŋšŠ}~ÚÂĶvÚÂ[-ŨĩĻģŨtgáÜĪ-ŨV÷Ģ3ås_nn\īŪĶrY8yįŲâÚīī§wöū8Sm'î[S;ņæ˛°Ō;qÅøķ?§˙¯oîÔūs™ëcŦÔč}ĻĘsߝ>žˇwz?ÛÜJĶ>;7ŸĶžš™ķŚvÎRÍqZ9ÍiĩTgŨĨšĶž­˛.ÛhjgįŋuĨ—Û—V§ž˜ūŧ˜ËROŸÚÎ)ÆôšÉkŽ–n‹;}ųķKëÖ´OœŸWzīéS#˜ĘRošŗTįôãÔãī}æ›īÆkĘ÷ÄZįLąÉTēüsfúsÛÛųļ\ˇ\Öq]Ļŋĩũī\3ĶŨí×|įnÛ×Ģ/Ī8ŗ
+Đmđäys—m¸­;ũËaŊ7åųžÕ>ļÛī´Ũ_īuMÍMûoŸ˙´úŽ0§Í\ĶÚûļŋŽö7]¯šËM[m­•gĘųonfÎMkûísZžųŦ¯¯Ģ_.˘•›˙Üä=ë˛ÍÜķ7å7ëfí2ÕxS~9Î^›uŽ\ŗŒYņ[˜L$eœ˙RËš0ī7ķu3WÎMŽ-vYŠ9ĩķŨĢåĻļY×qÎMŊ(?¯Öîįæ÷ģáį:ÎqSO=ųÜO÷ä<ãĖēÉēl3õėŗ÷ŠŗÍėŗs›]ĶŨšy7ĮMšfį&×ŖÃÍ)ü^ŠwœõĨģ˙ãj)æ.įlåvĮmļĘēĘ{ÖM\ésķZNŋwûßģģŽœžåˇÃĪÍ{īSk3×ġ˙Ĩ™›ˇ^—â]ˇŲ¸ēM×mēĶ֝ļŽ;m§-ëēĶvÚN[ļáŧv§í´e1ĘīĮŠÕŋæĒâR(Uįpū0WŋÚ9[QĩzĢ/Û÷ö{kįRŠs¯-æę~÷­î^YānŽuŊŗÛi1ĩî˛M—m˛Mļé6ŨĻÛtŲÆūūŽöģ9î´oŪe›{-­Ÿuõ˙˙uĪēl“ąÎœęģmĨ;ëļĨœķŦË6;ÖôZNoÖUŠŗMÎē_š7üZŒiŊ¯iĩØrZŋRë˛]ļŅ™Úˇ\ļÁŧ_ú_éwÜŽY×yĻ™Ë6įĒ)ž÷KņcnÕqÚ9Ė5į\ļŲšn_e]ļą?ņŪWë§öRû\‡oŨ`N{˙jíæ\Îüöž+ˇÛJëė+í§>…“ę`üHÔœbËĖPFrÚ4Īi;m§í´6ŒO[†ŌœļĶ–1røiO=Dy$ČŠ•ˆĶÖ÷w9Ē~^éĖ}Ûrn…˛˜ŗ(”Šģ*OĨēģĢT)ėéŒú§0ŠĢx…šŽ?įŨ|Q+Օ´HO40 æ™ũ´"NÛi€@°õOŧÎz§ÅÜØnŽâ´āŸĶvÚN§-‹]"ĘņāúZ/°ƒÁĀpC0[¤'˛xnī•~ūŦ5­÷ļÖ{ZÜ­ÅŋņŪ•īlyåægÍíŋŪt×­ëŽw˙}ĢąÕy[L37u՘ęũŊÛīzīÉķÆø_ëßØö\-ļ—æŋúoĮ{÷šwŊõęÍõ[\o˙ģyΚĶŧšÖŲVĖŗå˙ëŊ­ÕˇZŒ¯ÕœūãŪ)wqnÕŨį:Kī˙ũ,cVŠ+=OqŪYŗîfŽĮŲöj?īšķå™Öiuæ<ßÍĩ­o5לß];žöjZīæÖ>ĩķZëWl­åîßpŪéžģŽ]MJŗo}Ū˙kĪ\W˙ĩ}÷ZkĮŗŽsSĶŨ9Ũs}Ę9Î5ši3”&SEĖŸõô…”ĻrĖœz(srâĒ!”ŲÔ¯ŗĒ>Õ(ĻžR).XĻūl“uŊË6ų9.ë*Ũ\ļŅ;cŪ1Õ\įĘTĪĪËĖ@TÁđséÅŧõžwëįw?7īsķ÷Ž™hÖŋ˙¸1?ķ"fšyŊ¸ã\ųÍ;ߛ3Îc|ŗnŪœšjĩļVk+ĮÜÜļZ›šîžõŪ˙[kÅĩÖ{˙oũēšYīũŋēn}ķŊ9kļž8ĶįŦļÛŠ95ē>žš›œ›¸ëח›˜ËēųÜÄYW}3ÆYgMĻ¯3ÅÜÜYon~~n>7ŗÎY7375Į͜‰&ÖzO=õŪY757ĩæ6§Ußl{å˙ŋqŪĩëŠīæÜōĘsÕ}[Ģ?SŦ
+?Đķ•§NŽ§ū.ÛLÍqšsuËqY÷Ķn×Ô?ģÍ8ŗnĻĩœžÖf›iíԖ›ÖÎioŋ÷ŌįæĩĪ{ˇ´[.ë¸ĖĨ­UŪf– ę7ŽĒ1Uů|­\)uĨ˜“
+ŌÂ$Š˜Ē¯ô&5Qɘú^`¸úT–Ö,QĸÆę~lËŅCÕQõ}!jĩÉÖčšh˕
ķĀōåQ
00SF@ß#VÃO%ēT°°$ĮīC1eņ… JYÄO>XPÄT­ž~ž¤#ö0
KržĀ)žf×ÕDęf&Xž2:”™öC™o04–Ō$āa`¸™&RgūW¯JL˜åŊ˙2<ØËQ0°EŠ9~|Ŗ$ÅE‰K-I¯ŗĖ˛üH2ķ…(ĪRĻ@ŽddnVĖøÆIĀÂ\bjÂĀ0z¨)7n.ÂD°ôJ‰Š™ū7Llč[L}Ļ0ü6ųzøT¯PÆd‘āË{˜ŋ5/MßËIåęëféąpÅ@Õ'ĸ”1XÍĘLų‰fe&’æ—áÅ2^^7aąō3ÍÍ3^}ŨęëŪjģú:¯Ä˜ĪīĪS/p€|ĀāËAŖúžPķķŋ’€Nšú:V
+dA¸ÄÍ‚+q$Š>”Ģķ
Kæ7‰=R(ĶúRž§$ā+MaømŽ†Ū˗§?”KSÆ<ĄLĢŌJņb(nJf:Ų'ÉųŊĀ°Œ‰süVŗ†Ÿ_7(ÁЋ1ĖŒøúĘʌbâ&ŋ͟ļ—8E-ĸz4*püđÎ3lüÍI’߃ÅLs—)ķ…(¯ásyĄ—;’ŋōJ‰œŌ…ŸI2JFĒ<ØiS.=
+ÂTe'ˇØæ/DͯôB‘3f[)ņ՚ķĮųķæŦArŽĖƒÍ^ÉŠĮŒY@ęõŒ|yc9{(ãÍ^@	† Ę+AUg–|
ķIķ?”	]~õ¯žÎûÆL7d¨”!YnÖŽ_ĨBŨ÷˛Š[įííq[gĖĄP;s§V6uĮ/Œ•8Ū§M¤=UŽÉi{‰`	’"Š$6„_É°"ËÕךIJQÚÖĒm
ŊĶžës`ŗ%€×WŊbĸ&†?ĀŠ´)1üŒ¨z¨ō3ž.ą$c)[@Žž'ō‘@@žB
^éqžæōH

+NY~Ļ/Dyāč	đ^éŠŧōsõĶvÚTÉiƒ‰
aö•B%†Ÿ‡’•
–TßjĻå´u;1}N%	v’ũÎ[n{¯uož˙ņÕØVū8[ģíœ÷ĸ™Ũō¯_ßÚš÷į]íÛMëí<_n3žŲę\ų÷ˇôâÚë×Įöę‰ú $ķąŊhĻÅØ^JÍgÖk{§<Îü3ˇZķĒo}]ŋoüyÛŪ1¯šĪÄÕv\ųsÛ÷×ü¸ö×=ã­q˙žûî{īÚˇŪšjÎ[ŽkîēŪœmæĪ/æw?Ūxg‹íÛŋ”$ÖÖĮŸģũēīũŊkŪ7WūųŪ<ã˙ßģįŊ/šš÷å3÷îüVksÖē^û•į}ûWžˇåzg/šųųR’\4S[›ņĩ|Wkąíú­­–kŪģŽÚ^4ŗfæĪ	lZÔYS¤Ė劙$Ķf,Í˙ŊēŌjšæõîŋ\ŋå;˙žkũõæĘ/ŸŠģŊ™ī+Īu÷kqŨúw~LßZZ3žũ>ļ9ÛĒšŊį\­Í÷bŧĢîšßםgnoī—SnyŽüÖĢoŪ_ąÕ×ōŋ|ĻÖĩŪŧ~­Ī{ÕųnZyÕģŪŽŋcũŊęĖwÆX÷úüŋ^~ŗŪû÷å—VÜŗļV_4ķ÷å3/§õöˇŧöĮļãlųå_5Ək~\õíųfËīŽzķ‹fö~ųĖüz_^qÖļęk9îÜŪÎûĩģŪLëėī˙‹fâû—Īŧų_›såēōŒķĩ8לíÆõoįĶĒķæũ^ŪûÖVslŋ_Zīæŧ×Ū¯ŪÜbËšĩooˇų-ĪüVKëÕ7īĖyŨŊÛįõĩîßųæ™o{˙~ŅĖzųLž˙R’dĢyÅ7ŋˇōēo×ößō׏1˙¯9cŽ/ū˙>×õkåˇcûŋŊ_1įÚjüÚöΚŪߛ1îø/š™ņå3m}Zqįœ[[ëŪzÛģsŽšâœņŽõ/šYm¯ߎy­ũ1Îöv^_ÛĢ1ž|ĻÆûiÅ5W|ŋã­íŽoņ­×îįģī›ąîßīîß;įŅĖûÚڋfūūKI˛ķ_4ŗk}­ÖxÛZ˙ÖžuÆõÚį÷ëŨĩW}9Æ˙/×Zs­mĩošíĩzį|ŅL\1­s[œĢļw뎹Õ<sŪiŊũÚúŧâ{så¸^Îí­Ŋküų{žY×üšã]­ļģbÍņžhæķŋ|æÎ×nK/¯5ëŨ/Žoû÷Ģ5Ūē˙å3+~Ëk­8įû_oīēî×_kĪ<ßZ3ļû9×ļōšuĪßWœ7įOīĩųöŽĩĩųíĩ÷|ŅLŊ?ķj¯Ļuvjˇî[[­sļ›÷ąÎõ^4sãĮŨvēŋV^5ī´Îū–īZįÕVߡĩVZûå3kžņįũvWkŋkŨųūÎWũŊo}/šÉíå3÷ĩ—˙Îģļ×ÖĖ1ßÜ~ž×öߝÖų[oNĢ­ŲVŨmÍøĸ™ũ^>ķöŋ”$´âĘ­ívëJëÄö5ļ|Ûŧ­Ūûw˙Îõ{åëËđD¯s×[Wũ\[ũØžŽŋm,ÔüÅúö\mæúÖĖ7ŋœ{lrÆúŸßēŗ}noîŧōĪ¯ī?ÖöžĩÕvg‹ķÆõîœuĨĒ¯45Ÿ’¤•ōB$ķ" $™—"eŲ€é+Ë/ôHĒWįÔC™ÍĸcŪęãP”°™įbø™ãWÆF×nõWnķÆXgÍ­í_īĩŊãĖ{×_{­ûÎ:7ĻôgMøČņ{˜ß(Ž>ÍTŊ<
ŠŒ"Ģ3‘>2ö
+Q#™?
ÂYŊ‘ô`)&Žž*Ãđ3aâČÉÖj4ŗcZ§ÕÜęKkÆÂʗ†]ŲĀœ”äJÜ6_Z9Vé‘XĨGš|ķÜĶēĢŽø7īuëÚ9îßÜõÍũkĪFīAløK/üJ#Rõú`į3^ŸË99˜É,˜sĖÕWŌ@>’ü^ĒWLde€ ųšÄ‘ĩŲ\gú;ßzwŕßmíŋĩ¯ŗík]q¯ˇö~ëîU_~už´ŪÎ?åö펡ķˇ;kÜwÖ\_\­ũ‹wŊõ3ž›˙Ū;s}7ˇôÚ~÷ßī×rŦ7ļÖbZįæ;ÛŧņķŒ3ßÔvœ÷ĩX˙W‹ŋöœëÕõ>Ū=o­ŸĶzmîŲžÕĩīĪ˙Úfģ-­ëû÷ūŽ™ÖŦ¤1&ĖˇüųÖ|˙ŨØÖūVßĮŸ•ž…ųÅBÍՖw¯cžOÚūļëēņ­œcŦ­Ūöi;˙oüų¯Æũąægtĩvũ<ߝužü7ˇß{žŨbũWĖ+Ž8Ķųįß[ŋí_uŊģę‹ĩŨwrÍ/Ö:˙îš_ģĩÍŲŌ:{Öcü_iÕ[WlíĩÜn›{@ŧTKęUņ‘Î+Ō%‘W‚Į^¸\&Æáp}“9CĮ ô`dkg8-Ué­K(ĻáĒT˜4B)’ÖØ˛Hˇđ)Ā‚IĮą˛\ĢāÅpYšHļ2NĶ(#tí͸ĢÖ*
1ZĨ6@wU*؄ŸfâBúrMĀ߄âÁĨkŠAĨ‘1 U^HALQ<iJmŲCšĀS%eD‘T(ŠT€b …bž‰„0áA< x¨€—*).0Z˙Ú`ÄBx‚QaE¤Nû%ĄSĮÁž(ŧXMhŖ‹‡öđÅD‹ÎÄā`"X(°Ø2ĩĐ,00TEŸm*´ÔeRA]¨(.2Ž…\=E7é¸&D‚†‰ƒŽE0ą=m‚[
+	”ƒGb`T$RĸVFD¤2ŠĐ°éˆf5B86>
á°ĘČ@l6i&ČęA„a‰ūr‘Z
Ŗ‚i@BãđxHQPĢ2Ŗa$! 54đ†J…Ck€MF&TÉō19@>‹)ÁaÁU:°đ‡ŌÖ¸ĨJ˛HJ]Y1lŲ&é#‡čáą•…ÆP^”'RŦâ Dzx,KŠ´:Ŗ˜ƒbdëgTāŅ§ÂĀĩ°đȝY`eėʂV ŅYĐĄA´Ņ€Ņƒö‘ÅĢŖd"ĻnË4öté$F.éJP€ĨĐŊ¯¤đp1qQ )FĖ÷ĀJ°`5˜*“°`c“„ņĶ5B›…CHc2Ʉ0
+
ĄŒâa:ŦPk$q@…^Aã¤˛ņĨ6‹Ī–U&ĄĪįōį2!Đ>d9ByZ߂§ŗ,R"â‘pQĀNFĢpčL(\Ķ
1KĮ$€q2,ĨŖš0ÚU,B€ķđA­6	eiÚ`:›Ų\ĘŨlY%5Â4æB3V˜‚Æcč–ADÃō"™DD&CBÕɀŪÍ´,.´ŦåR!h›Ä„š;ƒ`ųŒ,Ũƒœ
w@ę`Ŗ‹q
sĐÚpÜ
Â0[ļE'Lˆĸ°€ą@q.˜Qá3€š9
vQx8]R,oá2QQ0—Ä
wÁ˜XmL*¸gJąH ÆÁ ?$ÕĸzeA$
BUĐYp
+ȇSāųlp*lįŌĀXŸÁįĀ‘@ 9< …`Ā€Ãē…Ā‡Ņ
X†{€h:IáŗŨ"Œ]A
ä˜	Ž58ÄHÄņJEnŠ8ĒvËbv„ÂÅgo™G5é[ã
+ʆHô
JB”>™J
ÚdŅx4ãš>ĐP(zS6rÍāRy2˛8ämŗųdĮ†čš¤´*™¸$&$>\
+P"°Ŗ"‘€!Ûā‚+›Ō‚ˇŦŽ ˜gtA [ÜÍ&]ŒŧšŦīËęÜČŖÛ°ÛôŠė‡R"ŦÄÅFÁ†c+‘‹ĩpcŗ$ĐëÅÍŖŪnŅáEÕ=kbēŧe˛đŋe$´}‹Ŋjž¨
+ÁÉx¨R™P=^>¨­‡Ã­‰¤ĸ.H–XY.&,ˇ$Y.@ą%?T܂*•8‹ÁMpXÂWBHA
+0č(„äAnŲ†ąhˆ‚h*ĸĐThČˆqŦmq"ˆ
+îVäN\…
+ÄÆB†Ëp›Ģ`6Žk5ŧDåč\ŒÔĀ%YH<ČÔhô

+‘3Xyė€æq’lŲ.9Ę
+å"ĘF:ŧĘ!‚¨„œ…ĘĒbp*(¨ rš­XdL&Š“XR(,ĀĨÂQ”‹O” x"„ō	\Ĩ…A”
Ž…Ļ<( ”RŲāl”ĖÍɖ4`Ā‰‚&bL 6	U‹’&$gã3ĄäÅÁĶu{BĒl,“Ô§‰L
+šRĸĢ&”t°•$åUTH ĻWƒʈ$žŽ¤ä	îZŅWTĸ]0ɖ ´ĘČ)Ôš"	ŊŠˆXą‹LBD0¤ˆĘ4
+E°¨ ‰T0D¨ÅŽDX>.ÂAĄ‹A(įĄČ_ƒÕƒ >Ë¤
ōjEˆ 
+úŲ2ID€P<‰RāØsA(„AՊ@°§Ō ŽÔ
+ļ‘0N›5TÛF+ŧØ"J‡Ä†@ˇi›\D‹õŲLĢĒŲ0ƒ­’)õöō~ĢˆÄ*[ˇ
Ųļė+Đ6ú)a1Ŗ%ĀR­(žéÁR!đ! r $!*"
.sA‘įl4˜F`ãTŅ\ZĐP(¨ŦĪEE c3XŒų`mJ¯Į–i(X‡Ë”ņ=Fä=°nņˆLîĸŅđĀ¤ĮĨŅ=<ÕzŒ8	ÂcU€ađ =T.$?¸ÄũH›¸
+œ<XōMŽ‡vˆ”Ž-qĖa
{¸ Ã†
+VuĄ'Ítr8ÂL…ŖĀĢŽ†‡ŌÁņbK,R#PEįC!V¸đ8L%ÖÆą!1"8ŧÆQņ"(pH"ܑ@ ‘[æũuxĸęĀØHÎQ6‡CKâ€<4‡H{8b^Hs€ė@Šm@¤6´‰Ú†KUHK+=‘ĨuÕJ€E¨4Sé
Ĩ
ä­"d¸ĐļCD…ļeŦËiBëˆšC#ö 9DT
‹B&
Ė ´†´Iå`A;m^§ebœ‚ö€BZli$&0B:ÚéAąŅ8Vų‚–qy8ĐF	Œļ! mËĘTĒ@ģĐ4öt트6ž~k
­%@˛ĻbW(Wû6ųÉUĩ˜aŅ&Šj
+N{¸xĐ4†ŠF(šhęL4Šđ@ĸ}*ADÛ˛<ē@4ĩ7
UąÚgāĄX@DĶ4mã4MĀ3&$B%ä ô€ĘE‰įĄišf!Ņ84Ō	(ÚFÄÂDsXP&MĶ´2á@Ķ6cGĶ0GĶ4@*‡æJY÷“‡6`F$Ōpnˇâ8(Į3¨ČĄÂŸųŦlGSai1SFėL™‡Ļ
`Ņ[•ĨÆĖ]‘–ŊQ[57D5[	ŠB
+†Îi*
™ÕCB!¨¨ÎD†
+DOáÚ¸˛R°´44žÕDg‡b*\{ËJU¸y!˜2	¯=–˜ŠĻĐ˛Š	\Ŋāé:•:Ø@øNÔŠ€.āæ!Ĩ õ(ä1đÄ2DWfŖQmŲhĀ€
Pba@EĐŌ`č
+͇!B:—†SšØČ ’-0?,
ä@Uʔ&$4Ÿ§—˜4ģŠhÚi¤iZ
lišvĄŅ´1A@ĶlŲŠĸiÚČņĐ´;
+L´(+‡‰Ļ
0`Ā€-Ģ`\,‹†Ķ:vB‚kĐ`‚ÖŖ2`@é0*
…ĮŠnˆcYÚ#SŲ˛{qc
+œ
Yq(PɈÁR4ĪFn4dHœEs)ŨĨ™ĮĀã¨
¨Ļ'ô€‹ÅjãqeŨ€ûˆbYMîšĻy’
F‡sØŋ§ķœĻi$Wĸœ<ZHpĶŅ4M[Đ4í.´ļOÉĄiŒĸiÚ@†F>[Öp™hšļŌ ņŒCĶ4‡DĶ4Øeā™Ajĸ
atPĀ¯Ļ !”ÂčD"šĻM6,˛Ļiōų4îĐ4aĶ4-Ė°Ø™MĶ´Q@Ķ´1ŒVĶ4mĀ¨ĶežeŽ‰Ļ9"Mã`L4mĀ€
°îņ°b#> Bä
{‰0"@(0DĢŖĻ-Üî!Z™4—qķ<4˛p.#Ą4	¤ëhšļeķS‰Š“y(´1e,“`j,ŦŌƒ2^ ĸčAĖ{™2)‘ķ‘ą§(QŖį=Â`€#g€šĒīŽ>Ž$5‹Ž0a°Ô+$?UL%ĻH˜Ha¤^ąIaŧ^9ĒFÔøŠ<IIØXīi+ŊpU~ä˜AaP
¨)ŽFX¨ĸåk•ú’ÚËø^!%aßK,_)EI˜ëõŖHUŖŨ§
†+ĒStS"l++cĖEĒSųŊR!Ės• Šô*JÔ (QÃEĮđõ	Āĸ0/?
DĒS!XR՘zĨR$
[N¨°MEį5 Q'$”;Q
+„´Ą<„„Š<\Ļ4’@TՕ1[ļĩNąQģŒßc´eĒØ'šwxHČ3 Œã–9čG…öЏ„r$¨‡‡z°´ļ‡.,<5Ãã ˇLF@ °ō‚CXPB`ā¤…f 1~>u˲vąe#­ņTîÂ㨘āVI%Ų2˜(!Ģ…¤mYKŧ`v+ÂRķIĶ6-LE#ŠNZlB!ŅT§
Ítņ0 A”8Ú(P´Į9­ka*šIƒ5 m
endstream
endobj
20 0 obj
<</Length 41812>>stream
+’DŗŦ:¯ŒFGĄV"¨Õh”	ĩä ĸĮD\H,ˆŗ`‰ÁÂQí\
+äÂ$"*$ĒqHhčfUéfU/Ũ°"4V‚ÂIDhlöÜÃ%b?ĨÃĶ‚UOŸ-Ow<}$Ģēe%Å%bŠ„`@B°ĒœãW/rx_EĪáQ‘Ã9ŧėøUŨ˛Šĸsx•Ã؈Ŧė…(|.Lâ!âá!"´ŲˆŦ*e#˛ĒļŌ"ˇėRYKA†ō”Ŗd([äWˇL|ø`ÄņÁ!‚ Cų
)j&9Cųˆ…¨ęĻÔŅŅąeĘmŲT'”L2ÁÕ͟ŧ¯ēHŒ‹ôq‘>S„T7‘¨FDā SĀۖ]ā@
6š8\ØD5•íî–]eË´Íáā–$‚ƒJ–o,áćĻ’°ŅŽĻä‰n‚ëšđÜ?HpA7ÁEˇ,¤ąQņÁTB,††ō%GrPŲ˛Æ$R)-lH#DŠšGŌ˜ŧHÛņ"ĒŌøtLøáHLšą ŒOĮœč)Bc;…ʘ(t$ŖĄątQ˜
+Čn(ƒŧˆĐØ
L9!!XElDVõŖútĖ–=|	 ‡“÷Տę3z´.ģeŪJč+A]´ŪÂT,("āũG%Ų˛Hėô!#.;ōÖÆU†ŨŦĒĮĢH4˜ģaQ
+š˜…õx’
Ņ%b#ąS¨ˇ0Ī†EÁFĸ>ŸŌáũ–YĘ¯"ĸĻ2ž,ˆÂįÂ$ ZäW;%ÎĮ˛@\¤ĻŌ!E
„’žúā$0†Ná*‡ŠN9 Š0@&NSéŒļ6 !ŌZ áøU…I|0•ŦÁT)€mJė$b 8¨”ļL#Å:ĄząÎĮ˛lœeŅl2”×”<Q4ĐÁ`*[Æđ!-:ĪĄøtL„ˇA0@•äđé˜	SŲ2)j Pвm9ĄjJž	"BH˜
+CŠ‚
ĸx‡GhPI`˜ņQUMÉÕ0æÁl™Õ%q‰ÂmHÜUāÍ`€āÁ ˇėTp_ ūĄXčD0,pōSąžŌĐ zĒuy[F!+bzãņĐ%WA…>Fl0a‰Ã ütŦ|É
+
9> Uį>žmšOĩ¨<Ž	,j…•EŖTA…#]"Ö1’8Ųqd(?A]@ËCd°ę.ĨĐÆ1qąÔȋ‹,-Esx€8iĄ‘ûĀ\ļT˜)c*‹fŗIQ͆t&8û Áŗ‰”„íÆqË$„;ŅĀŸ%i¨D™QFÉ)-@îÁE+Ąxž¤¸ØȈŗ^ã ËRÔä“ĮRa“–Ã
TˇlCQÕ
…Ûd(ŒP6 ›’ĄĄĘ‚ĘĨSA™`"`ĩĖ;läC‰2Ĩ"Ņ 	õJmlļ\Ā€ŠlOËÅ ą-ŒTjė‹
ãBĀŠ€Đ,¨
blU8/SŠĀņ+°âĐ7"+ŌÁ
q*åŦF¨Îŧ*]jb3‘Å1JË+B¤á`Ŋx‹üjÃéšŪŸÆļŠ@´‡†p2”gÅ6Pe=¸žA‚@ŧ€8€ôÉûjÆ':(Á†@#“[Ļ%ˆ_fëåŖ€f °!¸6ĀʜÂTļL;@•rÅ<TÃ8ã€fz	PxÚC“ēe•ƒōÉqŧlhœbã@†€‚Qģ
+ą[Fņē‰	ˆO.ę´OąqƒĸĒÎAspœLpę ĮqË´Ši_\čtyš`Ž-ãBŌĸō
+*Kh„Z#†‹S#r[ÆQ8€¨ŖŌņ9=8`uË.‡ív0…‡úAa0°L¯ČCŨ2Éd‚bá)8&'Så(ę5}
+Ŋe7R`"ØuŠ¨r.<ĒÖŪ˛‡ö&(ē
+ÛUĩœWŌâĸ<ˇģj0ˇĖĶĒčT\đÂ
ˆK8‰ƒG9JlÉÉÔĪÆĀ§n™ˇŊZÛC{,,<ud]%áqlŲBíž*!GVÆ„•Î%°Ų˛É†Ąôą¤…fPQ š ÆÁŖŊ€gkĄáÅ˛O°“+įH„´ešÚYˆĸĒ“)Ž„dŌab#D•Ą<FfÂ~8iĄ-Nƒ}N	1Đ>Ļ…•§^Hāė2_  ņÔ.„9<đ…Į‘a
*ŧe‰ˆ'aeN4!)ց+ž´eãöä(Ņļ¨ģz"ČûÃÉ-c¨YŒ	ˆĒ†ŸŒŠhlpüá"Ō’ĸ}0•ī.5 ĢÅČŌĨËë!Ēēe–xaJ'%&lŠĄ‰Šą,G˛čŨĨ,]ēTJŪ]
+ĄĄbe $&*ˇÄ°š OAF #c÷[Ō88ŲmCdŅh'ģ!™e,ˆæj€:&S‘Ąŧf˛Ņri“˜áøHð–Œ
Ē›)ĄZ‰-K]2Oƒ„g‚S'*ÆΞ=ÂÄ1dW@HX€
dP„†1s+žÉįŠ Īú-˛wF{LH›-Š,)>ą „EaËēG

BdCŠpl :8É0 4ÂĪËÌãæ;*ct€2VU!Buxšƒš2	•DEë˛$ūėHäre("Ō’¸cāqh¸e´ŠĪj3JÔ¯\`Rë–ŲŅdŖe˜Á†á286áĀÅą‡Ôs´ĮrHQSĄ<0@Օ1Ō ´ DāƒĪæ@ƒ2
+[VZ5tŦķĘx"V5A€.X:{r@8 ¨N6sąQ¨CædĮOgā[Ÿ-ë\ËGT
eËDZƒ\‹ĖÄj(
“Ĩs`šnƒ^ŦĻ
Y`X™
+Ŗm0”Ü–	\3L6ZæDx Úá&ÖrPE ø×	LÅáYękg(o‚āŸ)™<MƒCŗe!
ĘtÅSK‚éÁ3ÁšØG÷t”
Y*œ‰gAd„Ō§č\>
”Imq2Ļr€
Ē]bš‡×Ü
…WȆ@“%VĐ›…רnŲ§ƒ
š ØÁÉF0BFĸ!rš”ÔŠ‘¨+Žw)=@­O_q4eÃÁ-`¸؊*–zKÖAÅ"ĒXĒõpPŲSÉJž†÷JS zyßėęŪČyy°WĩĄĖøå˙BX†1Ņ'€gAˆ,ĶĻôpH’Y`A˜ˇéÔX˜z…ėĒ|…J%ŽŠLJ|‰"lm	\åëS…^ŋˆĘ|ž+$žD>mĒ—¸
KōãPjâå˜q‰Ŗɍmžhü^"X€7~BĐ{Ą\1VÃWzã÷ú>

åIé`ŋl(Ā?*ŧ9xãĮŽ
Ą/Ã#5hZŖ'ĘøJĮųqčkņÕzÅ&	ŽÄų‘ąz/Î+4Io˛R1rĻĀķfđÂésŠåT}ßkÆÄFq€ķz/°Uß|‰ķ兰øHŌaR‡ôō&éÍ/Wķå͌(€GÎ×Į`’/°,?rΏUÎoôæG~ŦÉø€ú JŌķ€¯yĖpwōpH˙ĄĖčŠ^^i:y8$ûĄĖ¤”$ØÍÖ+”ĸ%ļ^āįĘøHüŖČJŊ<ΜĶ~(#™§-à¯ļ	ųŲ”Ķø`AƏ^mtx!ˆŒÁā[– UDÆÉD‚=FÕÂ0(–qA	bI™Å¨$ķčc‘ EB¨FDHÃ0x(’‰„rQCeÖ€pP4zPB,‡‚Ą@#1
+¤0Ša d"„2UdšSA‹š§kŧ§gX´ŠģØ>“ęÄR.ŒN19ÆĀlŲ-ë:ĩĢ/Ūyælú;~XÆøģĸhg:ėãā¯rŲŨ¨…Ô@–Ŗnŧžx´ĄŲû*Ü9S#ÅSŨÉV&:šä]L˜‡Ŋ3¸Ú{ŲË%yy`P›ōYEäšv×ĻÁ(JôŖLÔ2C0_`|ŋíüŌėoi)~F[“iŽÄōDÖT—ŪvƒĩT…vEÎč,°S@6Ķ÷QdÚÍTa>+Úž~ÚŊĐhˇL„–&Дdw‰[ŧR“ôē˜Ŋž%vUūZkųĢŧhHÉŪĀį‚<eM@?NKEÜē%R°$jXR	'j[Æ*ģ1w}ms]í^ ÁÉ÷×}*ŸĄÁ.ģ_É{`ģØˇ¸ģ
j6לio
+ëœBúaú¤ņ–]•ũũéĢôßL¯`uËjrX)JˆBúnÄuáĨ?34ˇMŗuĀĨ3ÍéØĶŨēpaJ˛$Bą™@6TÉ1‹.ȍ^"&MĩSb5žūrÉ",–NéûŒzūš§×ô¤ŠX&9}ŒĪ§ŒĮô„UMaAœ6ŽĖĒpCHÚ+Ŗ|žöfÉ×qArĐP‡ -Ũzk6ˆÍėŅĀøÂ]ōÆŨ_ŨūęŊ*v#üĢûÎ:<ßÜDbtāĩä-ų'|ųđøQc‰ôŽ¸ąŋ488Ėdz‡×˙ˇ´‰XL`Ę,|¸gĶ"Ödb—4=e†ų€-(ø[ø†ÁXŒw¸2
$ĢéÃ;Ë%Žx_ˆ2ÎŽXOÄôPg$
yŧƒyبWĖUŠúēĪÃíĄ"+"†ÔŽĮƒeū‰ķaÄ@;UsNąJ˙…@Ėa_ôĨ9ļ%*_ĩ˙’T'õŦHŖ#Š!ŊwYZXššœWč6yrŖtš"ÔčŅY3›z:å×’ŧ+¸0 aŅ‚!.ĢUũq[0´ä”7ûš?Ī\"DØĘw%])ŨNŊ›đ{
+\qOâãä–ˆŸŸ‡ŪD[q4BŽĢ9]ə­&“É™Ŋč
ŗoÄŪM
…˙{ÜŖqÛs
‹š8:ÕgĖ¨~kP:Ø/ĖâΨĻĶ’ؤņONčcÎmL<™“W#Ą#š*ēQķ!§jāģŖÚûãĪđŗBāë ŅÆ_@ÎĒ…G3îyHįķ3Z+—RÅGXĮĢ’(ųéLÚęa´Û7fķÅėķ“b{	<Fņ.ĸā鲛˜į…įûÕS¸x#÷ĻŽÕ#DˇMb¤
2ā{ģl(ŽđÃɖĖÕŨ|^͐Z=1äŋũŪņŋũ Ö4ÉÍ+_Œ>lŧá3äMéÕđėežˆ?+ÍģYĨJ€–Oh<”Ø­‰Ūķ„Ąņ6
…•ĩA)g×äRį- ąo­ˆ´Íg|€KV xa›I‡7'˜´Ü0ŗgjŖlŊŠĀG(Œŗˆ˜X¯†ĨĻcŋãœļ%Ū3ˆVŪ.ŋ3ãsZ~PK>ų°â?[gãáä*VŸLm G`á-âB#.%bųW'ŲdģĶÉ
ķ€]Ma^ŗÆō
p!"k?›E‰EŒ&Cœ8Hˆøv&îdÜN%øļ˙O0S,Å?ŌˆlƒwÕŪR<ĮŗĀÖËrgYōŽ.’|ôÕO˛w‰zđ¤FĮ)îēz(€›ģN~Gx ˜Ī¸$Œ 0ķT'ūlļQæ˙‘¨)4Âڛžž„r„íE
ÍS(—Ÿ\ô‚ČFQ9ĢeâšLŊI¨RÓŅ‹F@5&ä#@đácŠiÛ$x_3ÖÃf*+ÄÅqŊWŽ^2`ÍøwēĮųũŠMÜĖQĄkåÍr;œĮš ;0¯Dv?F!ģÅpGú§u‘Û+öŦąÅ2ƀCL§Ģw„kË§Zá8af 1(ųį—°¸,‰–~d#ú%ĶÖōüōw–›[zæĨē"ÍŠņ‚ozëü%~Š^(Ndqn:û9~‚ŊÚGÆéjyŧ>\ŒĨ›éŽcTķŪ4W~
ŲŅ‹›…ë´ÎĒKTQ¨R
+•­t!SŪĶ퀚ę!¤ÕĮh6
+pŖŲuëĐlũÜ/6;ˇéáXŨ’w%ún—:ß:ģ'>L—;,  'ē~n—žÍĘįûúqā'AKlĄNcfÕøˆĘŨˆ§;g:ŠŊũPíšķ)</Õj.–ōŦÄ15@%z3û‹‹Úh5‹ˆÜüō˜c1ļø=´žl˙†ŌLģË4€énëe˛(-xbq˙Ī?ī×%˛ļw&
+´#\ęœÆI3āĮ$‹ĸ…õā‡´ŧ܉Ė¨Ę1Ģ°.ÚFõÄ´šũĮūõ_JŅ¨ĪgT/“Å–”eYŲ(F¯dķŲ*ŲiĪ;Ãü°ŦēH˜ōÍܚrüųĪ‚á5&›—ĖĀ¨dÕa:ŪÛ9G„Ŧėf‡džüøq5@æ"éy:øPĻėķÚ{"{3*aîåÖŲĮ—÷Īŗo6īyVPʓe{‘ōÂ3”B &¨’-Čš'
ĮÖ¤ËÎä^NāƒÍĘ4{3K­vœ\>
<cNßĀË'NĘh÷€™KĐ)%3mÔĸ¯ĨĶ7Ĩ/ÂGjŪ7đ!ĸj+ōĻĄ|)#C*ÅHôČ9ČÛ–u-:>	vUŖ™aJģã-ëüCË)™8FækЧ‰D ÍÂ=Z—ÆŽ’ĐĪ˜‰ĀúąkģP4 -ÄBÊįˇqč¸hĨ˜†]ZéĢŗ2¯@û:ˇaR™<>pđģÉũŽíxQr:6pvĨüUīP8…>ŊßŊEŋŽÚĻ
…nĖ	ôî5&ãíķ’ážĶ-zķ~ąĀžŅ
Œø@į=%>TÚ]Ĩ÷mŊÜŠ›9„ŌGėĀG#Ā&ĐIum0ßķī‰ā^-ęvš!į\]ä6m­G0&°ÄVvˇĘËN—ŽŠÖE˜ë?뚕Ą‚Ú:ÛįySaÃnô-Äŧfĩoęũ
6‰Š’YƒI;oSŊū§ō5ŪŌ՘ûöAUKXĐÔžtļ]Ÿe$IŽāŋ%J—`E*įé FÎŌ[yØÎø ˜VŨ2B;­ĘÃÖ(hmÃ*ąfœ‰h5Ų´}ØTSî-~ĀĖ ĨÃDëônŒXšú7ÁĀWrCņŧ΂˜Čf_7ZXõđ˛Å‘yņŽ1(HO_Ã.Ļ@ĩ§v(ĸŽ˜æ2@*ĢēʓhŠĻĄÜŸ† 
PΛ°íNĻõ!ũ•Ą(Å9õëŽ%Eļ!ÃzļŲá€sĻ8Ŧ}ŽA—)‹āÔÎiâ¤ÖĪ㌈:ƒ&ŗėvzÜ"áÂOāuāŪ”kš
Û\ØŊˇ´ėķâkŽŋ{œķé⸒Š$8S^ĩj´ņú&ą¤eũcؒĄé[p¨§õ
+ôß?Îڑž~`…Un͒ԂrCīėŋy”o=Ķ‰
+x79$Ā\iŧK‡DßSöā—‘y<7Ô¸Á$Kä'­.ø°né˙o’qŊĮđÕ N-Zg¨N2ANņ0y
ŪNËCyĖ‚ĘĖžČĻˆą„")h¨`ËnÄ3hæųˆ}$~‹b5õ .•-IØ<؍
¸ŠtOĮ~Ķ˙ÔQŸĶ‰ŒŠbD!lkõŲiŦ˜@|J8n7b"¨g`CÚ
ĘJiuae
B8Kļŗ"î‚LĢXXf_7Āåæ7BÅ;0ÃCã9˜ąŲЉlrŌCEģl$‡m0IĨkņî^pęC‚ą>˜-KzÛqė’cŊ)6KŠ‚a#Ĩdö­.ĄČĪįæˇ_fĖ’ÛÚ.Ū­:)ČāD˛‹Ųëāwé„ĮnO§ëÄąčS&Wŧ’Dc§B=7ö¤%ĪŠâøXåē›)ĀāĨmƒ&!ų˙õ°íÛģ1ļûņlmúŌa˙y t%t?ŗũĐaĖsSbtɑ™XÔ}ûš'5J\–Q¸Š3I—œÅqžņt…÷†a8^gŊ…Č_ôđ–ņšų@|U˜čR5Vm^…<ĸ!á4}"ü×Ę5īÅņžDfõwŒ3…>įUžvŽ$Ū›Z(Ņ 
+ûÔS Š~7Ûk{zŠÎŅŅŲælîŋVŋ]ą’Áöan•%= ųėph˜^ō š'­™ÛMō<‡ų3VŨĒ_$ŒFíę õ‡ÉB&ãIŽ;đ2ŖÚÉævbAĪâERæRíˇ9PÅĢ|ĐCĨxōáąkuHĩ–Ÿmķ&'n°ÖFp•Ę?˜¯l<ŋ‚Æ}%ĮÍėpĖ+ũ`Ņ,æ'‘–Ln–õƒė`ƒP?‚ß1e)č–"…Aōö;ŅC—­”¨aũa>„ëŧ<K%ø?ŋ
+ąuNˆ?ë7ԃ$
ÕIgėCČį¨' Æœ0ëYšîīeˆ0€Á˛ŦVEæJ‘䌸ŸūCî€a1ôC3yIú€ã';Gįss,uXŖũģû€ŨyÛÚ0š°jVíŠĨyÖNöÕBTLŧFj××Je°lĩíåKŸ"ŠÖ‰mfÄs¯7øęé–į¤Ļ֒÷	ˏ%ØmÃ&ŲS{wJÄøՌuckÔœÁNâˆ	X;sÖīOōĐõßĶ6Aņa?õՇHĨWūUņ¯>ų•ūŽ7ô˙Â:8\Ŧeė…	Čįųīš€œÄ ĮĶĀYA`‘GA:,iÁ4é+);?´ĘŌŪôQüÛ[iC,˜luäöíü
ĖvO*ĖÖĪČ`á*ÃÅsē&Ér6-ÍŌUĄ]ī14”>$ū9mdKg`+æÃˀą~[ŅS
+sBZYڎUü]ēũpíVĸzĮͯ?Enm0ĪņR‹ECœՔĄŊAe<?Œ\…ŦrúÄw4ĀM9č¤Ōh\ÉÆJWLwē6f’Ču@7xģ—ĶÅĻs¤o|qîā@m!a­JkņėFgsų6ߥL<Čņ'Žƒu-3āÛī`[cFĻNÕ{į7<Cû¸¤†ĮŽ¨X–6¨cšˇ‚¤-fw‚#lŠÚ‰ÉXí‰RŖ2iŅˇ÷mΖĨ1ž‚bcšŨÂčfž_d‹:­ĘOä&XŕōÆ+¨˙ՃŠEŋ|‘AF\ $QžŌyĄ]ļęÂW^@Ņ„ĄĪô”Sd—žtC(\ĨWęĀéĀ‚LŦÔš=eWqĪžcŦ‡—ßēĪ?QÔÄ}ÆgAK°Z”’õf¯įUÆ_—ÅB[(›ŌMĻB‡‹5ŨüU"ĸQv‚“rmĀ”!˜ŧštĻ>YēÃ×ū	xAČ"¸aōUŋjÜŖāû ܟbŽ:Ĩš¯3wŠ3ŒĮHŦ
$ÅĘāeOFTÃãtĢ=^2ā—‹ŪÕbquå~Ü#U'A$1\7ļRÆSî+׉|Aͭͯ|Ęßü¯'§€Hô9õrÄßvČŨS3ËPŪWžûÖÕt`ĩ€ÂęéĀ$’qdŽ!;^âz ņMAû@îN9ETđˆBįd<[­RkĶTŌ‰šŸĨØpīxŖæˇāÖqbŸHd-Rl íš4핈ú0|ĖGŒ’1›
	Bu踋Ũō'Î-p°×ÉīVXæjûˡŲ&€qnA…ą)ųD×Jbá™ø×/4ŊĖ\ĖæTæŖĒāb_¤ĢQ"xNnŖsCÉü“OĪôŦ˙¯n`OÚl€
ŊĘ(ŌęŲuÛã;úå	ÛŪBŠâ‹tÄmæĩĸMŖ…ayŖ*1ŌS„a_ÚIkæĐß;[$avļmŸQ 
•XOiėøsß8é…FÁā 
9SÅ1ã♟+7ßõ]Ā0“
+7Aâ;€˙¸TÔâûNHôôü’F1xŽ"ŌQˇ87ˆ°É§*øūWÁēZeüÔļ@kä 
+ģ –úĶuâˆÜ‹'%ČOt|ņ=ÎĖÂßÚJw]˜ķXÃĮm?•úmŖõ„G/^˙gĐ­LÕÄ<]3vL{‡åZĀ'ÅĄˇ!Á9ęvļBĢ(?~ŦŠCXˆüA<đf#í´°Límt5g3ĄôŅLÜēīOĐ3Ą˜Ė-Gģ1wܯĨØũvôŋė'˜?ZCۇĮæÆČō+íĖ.‚w/TÕęÉmā†¤æX5’Ū!c†Ģ‡â1RÃP¸`:d,:%Ē1¤įĄIe],zōqëŧ';é?¨z[Á˜¸ŅBrēĘ>ėøíÕŗ͇Ļ¯Q ˆe}o5YĨ>ö“ÅU/^p&…vĖjũeûrTņyē<+ilH8-7Ųę	a3ĸ+ķ.§Æˆ¤É°ËæČ¯N­ĸ&ö_ОQ
5	ŅŖ܆ŧ녙ōV Œ¸vŠD7¤Œ´üĶĖŦg`’Ø˙Ã&n!2žčz=<[ã.wē.Čôiå˜õ"ļÚđ'†Ę°f¸VZķF5oĻžÚÕ">IåôpHo=ziŋ¨ėWNŧ]ō3ú'!…h‡s1Pė)b¸påø&¸ĄĮMį?l[Ž‹'JũlŦ+DĻ./šÍ+ķ4ȈmꀸŪTN‹;äOZ¸XƒēpÅĨ	Å1ĸIh"Ļ€Úũ
ņN~Kņ™r#V5Ü# â•S€lë˜o“^:SznœoWˆãŧYbļ“Ú7ÚK‹RĶ2ū.ĘCĒFļU3ŠœŠô|N’x<Īö¤'ĪĄ§_˙)Š
ģå[†Ģ?Ņ;>BCiÛ%ßZDQ9tHjx§Säáŋą,¸OČĖJ{B

+B
Ā¤ˆüę„JBŽ’˛ČÛbQ†ËG;VžšM"ņđ‚uíæD1¤P_ũ@í™`3Ųä<î@e˯"7.úęf9ˆ‰$ÜōS@*ŨŠ° “P5ÅĻÉĪ„A+ĻŒÍË1bĘŖ:ŋ´ÔTuNĪ4´üY{ŧāæģĻâĐĪ‰ķ×f{Ŋ
+ĸ–žd18\2DƒĪļ˙d‚%׌ņYĖqbĄĀrũéé]Ã0|Ú˙üëPXŗĶēIr‚6ō&gBīÍúbPNÎ9Å4´ō‰mĀX×ôTÃėmu,1×Û6æâ vrĮā DÚdɍ˙‚ l%¯„ÃKĩĐ
Ēˆaā4ūRˆ7Fé˙X˛b.™iŨú~-k’ŌųË
+Đ|M2Ö)ŸûĶÚĐãöR…FIXsīŗ¸Küs)šŊ?\‰@pķĘ'>ĄBYÛę ­ÆSoi‘Ŗ°˙Ķī™œ¯ČácZ`W͒ųęX›nĪL;=>(xWĸÜęĸ´žęÖg÷>ŊXŗÉĮš“>4ĩÅĢe.V.ãËRsŨÕĖ$j)ĮÍ/kėąũU&FL)EŊ‚b&y›H=yoj%ĤdŗîxËE6DėnŊ•Ŗ-eƒŋ8܃ÜâîŠbėŌc˛9ė=7™S:û䐴ōdNįuƒŒŅŦ2ŒÆŅŌ<돱hæ.q-÷ĄĩœnÛ?’‹hŒ?đ›@ɞlƒrQÛ?</ĄŲ@`ørÖf1ų•bŠ”ŒŠaTˆķBŨNĄĸ!ēuZŠßNßsžĒ\D˜yeNÜÚ˛~â…ĀD֓ÎIL¨•Îˇūé‡!1AÍd[sʸŊ!‹ōÖ+fû‘&Šj`ō~ë˛røĸ
)BWf5’•cA!Tđb]žCË$ThvŲÖKM>ĢĶĶšŖ}RīTDø†›pä)øĀ
7¤%ŋ­8kĸÛ&.%1âŌđ~č„5û˙jĻ	Kîä<ˆ{ŋJ#,-¤	EBkŪŲBīTKh4ũųSĩ›ŲXâĻJØ* =‹ÛJ˛¤†ô<'ņQÆGŒ0čZ;čRJņänŪę)á,H|˜‰ņ˙,‘ŖAß	ķq%jėsŅŲô”÷ĀL-ŋ—	ôęæz0oôĪû›
Î+Høŧ¸Ɨ´'(!@?…cČ4¤`œįŽ^¯0ã^ÍVL¸ĩx\!]Ë?Ö;ĢĻOYlîŸāŽcL˜¨ĸšŽô3ļČÉ+i"ņ\#)wšä­MaÔP‘×Û~‚‰ļk†¯ĘMb2#Qö͂sŽiĖ˙Ūđsx‹qŗ(ŠÛŲ8
+‡–ĻÕ*ÚždČ°sáë­vˇŪĮ(ė8ũŨ
+ģyp&Ö§
Æb&=ÆāUp¨ĻO‘5­_søL/ĸšĨߨW˙‡–)Œ÷h}^q6‹×ŠKÁ"#ŽHX›¨kŅˇ[ä"UŦHá­ō<”°]žŽ$ëÅĸÜMÛ
+ßķŖ”ā oeC3ƝœĐÁõ’(Cã<Ce~¤ū‰ĢG=R¯Â‰+Y œ/ōųDØÅĸŽ\Æå":–Û˛†ujŽ_bÄrVvxx6Ū¯ĖHdÆįyŽtŠXÎĸäT+Aą'^"wÁ…ė_@äļũ´QĀņnø–	žÎUárQ‚ÅäG÷‚ÎĻwëũ;ß|b_ÚģšFŧ
+â¨äâ*ˆ™05ÉkÍxŨ“}Äs@DītŦYÄŧõvļšęo7u÷6Ā§øŽ4bwĘV27kH(šŅ}×Ît>Š0ŋ!.-Ršk% 1†ŽĒ%ÅV#ŖÃ—Æ ķ/ĩ
ŌŲœuՕ]ÅŨWEũE<^	Wūƒę¯GŨ‡<2æŖTK~ĻCÆSÅNE˙#“K{û 1ķR 	ˆ
ˆ”ž‹ ::uΏå6;:Eg–ŅuSeŌ†ŸÉĐ`ÉÍĨc¨'퐇Đz˜Eˁsģōũģ—W´[á8ĐŗßÖÎuUŨK˛¸z‹,ė%:ŌöĮĘOæQLRglaßōŗÖåÅøDžYą<œčÔ(1<ĐØ&[p'{ķ‚—áwŠ‡F›Ē3ÔDH:bX
ŅßĪqÔāąžķōrņĢÕ6f9ļEĸwU}¯~õĖ;ąf[÷gž2*ƒœöįUŗļpũĩ9*Ĩ3	4Šs\:LžÅSũ~´įõ%â1YŪ[,1¨ķΞbܲ?Su1——G<ÃnS^ŪÉĐĶ+æę˜ÖA,A•ęG+ŸÉÛĢ`§ČNä_ī僨2…<;ŧ&ۊTØ'
WxV;	$˛3ŋÔ;;MĶ¯ĒŦˇį‡!û
ĀWQÎß~CŧŽÚĻČ'4ĩÁ¸HqîĒ†VŨņ°ƒ%)ũEų>8ÜX8œĢ,)U$„Ģ–V*ĘÁŦē§.V1—Øô4€īĘf?×KÜGÉÉ>vŽ‰õ~œpÎzSJA†Ÿ[åKÃPž.Ö“CĘ“ī%L”îōäŋŋíķÂnÚĩ<_f›ōČŧ…U”épąŒLI<-NņõsÕ_´G
ļOŽf~“+OWÃn ŽK;Áo>p}čAY
+F+›ųî—&ƒ°Ÿ iŅū˛O!áĐKhąKJb¤jžųČbck1,Âá6+ô]Q.Ŋ y:ė]0Ĩî4ēk*æ€â-ŪœƒõB°…P„	ŨąÔ
ęâf*"­CŪ‰ÃĔ‹ūícÄ™^ZöÄÂĩÎ}ē	/Äę|c4ŊÁ;dņúĸ\|­Y÷VöËčëeZˆņ4vYI#úĀ;ä ČœŊĶã	x“Ü>Žj`D0ąÄō€ŊqāÕF|⌭8>ÆlîLáÆî
;1“ųÖF3Õ?ŅhëIIE
§Ųü>đŠY=—q"k#..¸Pžâ#cyÅąk‰čĐōģí{KūŖ×
H4H´âgŠ“§×ëųāįv=—l
+jhĸpĘ8mŖãTWŲM.q¯6šGÜ$ä(X}j_ÆĘŊĶą–UŌd>m­Yõ¯ũ*…îĶƒž<ēđ¨Î$Ŗ`jQ˙Ûz_˙¨*˜_æ
+<Œhā'B	0‹Ŋ¯īPF´Ēę¸ĒøĖ6ŌģŖk=˛WWŊĄk͏LŽŧŊNZGÎũ:éR6û+Ôwv-4ˆĘÃ>™îuy>
V5‘ė^ûgĩ
+äenæAĐz%Pc Ō‡@ĐKŨķ×_§}ģ:IcŠQ>ÉIÔ
+œëEz×5ā‚§āōúQYUE…ģpįŲ.IštčZsiŒrdĐyč8Q,S¤O•ׄĄøîŠr(‹RhĨ@Ųũb‘tíl’B?ž8ÄÉfLčgĨÁ
áŲYĢnˇ1H–ČŠˇ^#~ē05¨šÕ_Rĸzhë+lē§eūr#šzs…Ā¸Ĩ¨_šaųI/™c=G­šÎ*é醏FŲؤŧV—X¯ĸÂä##GiU!Ŧ”jŠzĻęixėšIÖԝ­šĄöÄKúāüIÆY/|m¤ĀrĮ`ĻžôUŠaŖtE$9?Č{ˇnų‡‘äp"nĖđ?ëÉ!PĐ唜ˇžūÆę`—1ģ&†ã„ĶO ã‚?“É>įļĘÉüņq–
øņjfžĪũGĒX#Ķy¸ō¯$ųDjÕJą<Ŋ†=\Ģäß
°ņÚˇ%œURŽã$wŠŅĖ†Ķ°‹Hˆœ‡ęŒŲŧŗ>N\@
—ƒŧD‰EĄqkÚČū”ÆߎĒw&@›ŧõrâŠRJŲMן‹9CĪ1ÁābO+ĶŖ
Nž­fīm"›CĄ3ĸŨĨaĒ?Õ]9ūü;‰f›vĸ?{Ži#ôRÛå$"ČM
BäļËĶNæËLĸÖé×Д×@éÜĸUh)ÅŦé_C‡ĶŽ2" 4™uŖQ1ô$"2F
+9Ec€ũŊĐGåT\‰g)&ÄKš
¸#ŅŽĖĶ
+ؐĪƒŠÆ:4
&7 ÚŊÁm­lŠ’ÆIdʁš”ãVdĮķ$•BūÖë1’éĩ,ŠLâÍTŦäQ1“N◨F rM08~|ßõ#§mIX*c@\‡Î^ʜ
˜MŨNw
+"Č…DĻ(î
+JŊ*Ā ĻMđĶĐ0!w–„N˛…›t°@w?4VIŸš˛ĄīXŌëbL°ō:s5îƂEņtąĐf‘ ÅŠĪO
+žm”ŽŒœ‰Ĩ+Šnî"kKŊ7EO/Wß8ŌŪ§
ņu´ĻĢˇ%?NęBfvŽ°ŨFdS•+Ž‚-ÅRQāˆHČ?‰0đb܅Ô1dŋ€
+…ĻÉ	P—ũVø¨ūĮËļiĮfŦũ
¸ 'Ÿmôn'O˜cÍéŽÍ3ÖڏoĘDIƒ‚Ƙ…æ.\ŦOŽŗBēQ^Cķ˜§IĀhŋœšíĸsō
+|.0#/Ŋ#YgĄDaû ÅΡCĸ"ė÷[6ŊžņĒ=…Xsē2ë\ÃéĒCCí6Hä'%9Ģãŗß1Ņ“ŧÅ)]›A˛tŖŽ›Y΍ūGŠ™W%{ŠĶ´¸ÜĘ	‰Ė‚Ö§¨>btqxŊ÷]÷b(=Ķšõ–ÖūWŖÉę7ŠĶŨ*#š*dŖč
Ë
,žÛÉāŠ"Ž|ĘJ‹˙b”øÍdēöĮÔĸĀŽXzÅVƒžiga
­øĀ'†÷$å‘Ē‡ļįāÅũšÁ¨+8åÜ{Ė‘Ę"¤ŨJía ›)„žáøí.˜ā”ã3ŗú×q>ÅũˇbŠ‡ž`¯ĪČĐjgXÕe:>ÄJˆAuûŸøb‚°č?…”!Fŧ2ÜeBŲ˙â¸Yā魛KT+–ͯ“ų!LĘ=Ēŗ%ęĄb›ōÁåÅHnzĸ'įûáÃŋDnĪLĨtˊ#ČܛÆ­Õ)ŠäF˙ítŋÆc­¨“^"qKÜĶ€ōėöÛØZ–ŊÕHšLEīčS{Ģöûä”Ü^æ€ēšÆ–Ļwg™v÷œŨÅŖũSø;ŖZ§úpNãĖƒG¯AŲÕæŨ¨
ŒūŦ™đvĮF„ÉFw†×ƒ…5,k,°nÉ%øĮų‹Ÿ)čbåābö>‹ÖęíG‡Ų§Ŧíšîb¯Æžīĩ?Ø
b
Ø*čõģŲđēåĪĩ7x}Úįˆ]mŊ!éĄ)ČŊō^KGŨÜ/ęSŌ—gŽ"€ä›ôŠt įAũĐNü! lcą2•{"ßåoØŋŊÆŨîŗ.RŠ¯‘y?B'ôĶŲ.‘hpŠ')ĶB-.-‚’ƒpHęwęžÖyF‹Û^7z•ŊŽĀ`{ķc‰›IŠJk™´›..e”ˇÅ˜4˜R@MáÔ^šĢßE(wEœũܒ	.5č(ŠZ€ā xN'øqûĘYĘP7îĪÄkķƒb,:5Žēāw0KōĻÖ.įŧļ
+‡įb'.y
ė´žËBoF’8JŌ§h5gSCŒAŒ§’.ũ'
+Éb—Ÿ‡ŪŒ
+—põŧ*e;ģŪ¤x’ˇĩSļŋ`UÉDFÔ

v)G“­k.ĐˏũŨЗkPã@õPÛĐÛ
b`ĩ É?JĩēHw›tĩšÁÛâJ0
¯ęeK"úŦ
ŠlE™[ũ1$q+Ēc~ĒGÄŽ tÁ´‚W¨=å+Ē”ŗDMtK4€&ÅYT;Ÿq´šŽB29<`ÎÕĖ
#´3‚2ĸŒ†
mklŦ
HKŌi'ZR†ŦŋlĪô”øļâŅ*‘ˇĐ¯íĘ C–_KžĖĶšJ“ŧøDFJä>ô1ëĮrks!LyƒŽ[..dŌ‚&Ū¤›ĸžPĻ3ŊbW.î¤ŅĨLˆĀΝėįÔņŨW–Ņ™Ö(%)R;äž(žæWōļŋķē6Ȏ
^$e@„HøžšWÛĩ[Ī¯ˆŠZ1é]šFĮĀ9]†šaJˆ”æpÍÃų“ģŧ™Qh\ZÁÆhDOŋųĘöšQ
W…Ų/ôîaxÍ+OU”aø$iôwÂĢ
+	Ä8Q™,(†B<˙čRc~L|ø}
]ėVÁ§ģ,@ŗŠ¨ŗu@MĨĖ‹rûßÛwĄ ›6ŅüKũâ˙•ĩŦؤ×SĨųŠI–ĨÄ%lc)‡3‚īž˛‚'K­“ķLė;{5XÕg[˛Ę_LdÜZbĖy"螄Ō é@eC?Ų@m퍨‹Û
+rß0>ŋŪļâÜíún’ĪîüÛ
üŪđ}Ī„:DÆ"<	 ¤‚ŅõŽ‡‘råEųG
+Äļ¤šé,I1ŋĄÁ[<_éŊ52„& Æfu™I? OCĻų‚tíƒ{1ÃNŒB–{mĪŊ8ÉzQĀöAd0¨ĸ˙+G›†PyUŽÂō+|lKį¤€•âL¤ãr”Sjė8u.F“ąĨŸwœŸî*-ߓ†#=øÄÚÍÁ%VēŊĸTjžĩŠhšŖ~›gČzĀåkFūĄLÜ˙šŋŽ–1áú-՝~c!0é!aÉn3ęËAVēûF`ĐȍáÖ!Ã\Ū1æ
Ã|üSōˆä€‘
§ĪÜÚ´ū}{Ė"`ę†Ņ ôÂ@Æŧø—Ĩ5°v„›~5ķĩ
ĻõéGĄ7* jįÜ&ŒâíõÎčābŲÁßØw€WÆQ##Gž4-Ŗy;ĻÜ6‚1‰Ũ÷îĩķÛšËR•G÷'.’Zô¨ú<Ō/gtZq­ĄĶxˇO|͑kÎļ+TŽÉ|A~bA¯´aŗƒ]&n/g':†<^};eõÖŅNkbWƒ(ü$ķF’eˎ´åw_Åf	Đß™HÕ0L¤aƒ˙‘™_|ĸą*Ķ#o€1ŒmÁRbIPą¨hãQ8%Qģ%ÖÕ7žŧŪęÉšxJWû€Íöí‘tą“™{GŠČdģb„SˆpMQJ–xÛ3 F _FÆé:Dî!qĸ°1}’Ž
%=	ʅ@p‰ÜTxĩčŦ˙ŌÜmœč`h_`Ąč“YĨ˛_™#-g}îũĖ♇‘hēÁgåiĸ”Jõãö1ŋZØī—Ö.ĪûQ*6C÷;&Šē¤Ņ“=Ņa´gĄ˙Ö[A§Ą—6XpŨÎõœ‘­ųŨâŦXĻŽ˛
+QũÁ"Œˆ“ūghü
Ũ]|ŽƒįŠŠLĩX˜4˜¨9Uí[¸5Ž<_ۍ rPJņ=ÆŪŨFĘ8=ŧ8åƒq[šŖßģ’žĩA1ORĪM0įĻ×yė]ĄZ2øßEĶsŽr†¨íÁõ)Ö_ž“ŽĢîąäŋAĶ-åyēģČuĸxęĶŽ’Ž5 á­ Sru:7ƒ
§>sj—cÂyOûM–čœ9ĸJa¯¯iŲęˇ$sÄeXZ•š‚Ī!ģÛí€(*Bã.1÷ĸ6­Ä6t7S"Šˇ×ČÂųq	ŋˆ@ņ,Jėŧ	œ–|š:ĩ+Ā2ģ'ä&/77ņ¸°iF„>yP¤ė)åėjß÷æâRÁÁš6Lf0Ũ¯XmPčXēÆųlđˇÁē—Îs¨¯>⨤ēŗ”$W˜ÁÎö:Ér@‡<JÄ`ŗg„ŅßēÔ˙ŋSBŌĸéxövéš5‚“B3ëÚNXGûeÛ[€‹ā,ZTV÷-\Ą	=]ŖBŦĖGnˇ‚4v^t¯ ÃQ=ÔŨíį!_ę°ÚŊŖ˜cOļgÚŋž¯æ>VKįą“0™õĩ)cˆ÷ÅĨŌâ­5Č
+‘NīãŠĀAą-`SOIū­rdkø†Ë^/_ž‚Ö[—É÷HŲzĀ€PģÜj6ú•Ö„ÂŽ*
@§{ˆClI¯ÜĻH{˙udņĄa§úY+ÄŖør›4'T“VŽpU7¸^ŸuŪšŖÄ,ĨO7M5y"b”8+áū
ĩĢ]A÷Z€ā62ąS‰RpĸđÅ
J\Žh„H'nÜæ-E€ˆŪĢžļŦĨŊM¨DŊ*H—cw’+gIf%uˇ‡‚Ŗž#¤ŗVbÖ%kÆį <
+^Ąņ§ã.ŋc˜ÜŽŸĐßĪŠĸˆÎŌåŽ>–CģT}ā,Ā>ĸ„ķjŖķ
/RĒbℝįœ…ëøíĶâ„ÛŽ$	8´õ×ÃėŒ,† Ņpf°Œ”‹č‹õz=zu}ŽÂ‘WĘăHĪöBs˛lL×ŌEœÅD‚kė@yPVĐ$-w2`;Īđ+ŏ$<ĖœG˜!'_ødEõm
ņ,jÄ3lū¸Î‡Ā‰QŦŠFë(įÖt†Ķ%Üą7dĖsLī´{VļÜŋZ•1Tddw#āLˆÉ$âûÅxéä€f4
ķÜ&­"Æ]œĄĖW˙''zSÚBņ/~zûlNéö Ë„Ēįî›ēÛߜîeAŲÁ°Ü`ĪjÍš80ņÉ
+zy.éŧžÁ9΍4Ä$fõ7Gē„#4l[Ą ÛŨ&ė„ã!A^ˇamcíāJ~”īaœV;Đ
j`“ĐGÆ)ŠOę]ĄôųĶíY—ŽaÔēP~G,ĶCŧCáԏT{:¨`"DühŽ’åY3üהđ™\ÅåLÄ!]|Éë&|맟ЉlčáÁgŒËüë`ĩ‰…JŅ“GŊaÃÆTw4Ž”¤[
51ŋ@ÆŽG„Æ„ĖŊā§ēôNyõŋĀք°ß:$ ž4-ŅÅGgß.dŪŸHO6fPÎĩ\Áīƒ+¯Î@ūfí°†yz{<i–ĶfŦƒ„~ąŦæn÷ɍŸ=˙
+ûWä>ÆĢS0´@ĩ)öūŒPŸ°ŒŠ@ŅģCY$T žtoXč ļz<8ƒƒŧ!‘ĨuĢ
5ȁ4
'Ģ	g
*‰ÕC˙u
™‚@‰™_+ŊÚ×}EheÕ^ģFä=ØtģÅɤīOm…ė´Ō0
ËéŪ:¤ĀŪnÍ:Ë­ß€íˇuÚ[˗8adŌˇĶ[3qyéîĶEU™ŲŒ§úōkĢy'*réåũŠq}ôzŗœ5֛/īõ3,*‚Ŗ[ųÁ%ĶI&Žc¨s@Årˆ™6ãĖU„HEāzy:Núô‰z*ŧōAԙé.´[{yÂ.ƒŦQËÃ]JŪ"!`C)U#<Ŧ@_¸ē\ÃŖęIM|*U˛Ļ.ՓMNÍRm_ERŒ\3Ž@AZbÄîØlåļ.‚đŊÎ7t‰iĨvLę,1ÂídíC˲´%+‹×Ž•%ËFásibBÁX$qđĪšÔ•Æg
Ŧãß33]Ę:ŋž2>Š bsā¯L
€K˖ĸ˙ņĖ­SÔUTßŲ¨›zļ|´°
+á“ÂĻ@4KšŲDÕA ųæčŧŠO¯käÍOôH¸Äo^ÃÉé×=|ôۚ8ī>ÁDĮ!.Ūę\U‚2„™ ĮŦ8,šå)ø’Ëx\ únwe0`„KcR3īG$yUD~‘ʨ¨øaĄŖņôŋ (¸tgqwÔžpŪ‡UFĻÜÎbøéôĄKĮúZÅî å
jÔrũFÛövkF>ŲÁ
ą6÷hfÉAA›	–{‹Ë´îTÆÆÔVŪGmŲ9nđ}ûâ-Ōƒ<+A—Á•”´@ĄÔôæɟãh¯$ũ¤_
+O#Uƍü¨ûFe
G GÕj˙RĮq˛…ĘmI(
>„=ĶÍ f–Áé>ņEƒSeHe9,å{ų1ņaēž2ÚíŠ	VÖ5@)ņ˜ī‡Ŗ#ą#/…Ŗ!=îvGÔÕ}5FĘ!ŒfÔxĪn}ėŲˆ€€†ŒųĮŌËč0âpī›Ģąhší>‹‹”Į0–t +ĶÜ{c‹%?ę`Q§Īר°*ŌņãąbØŠŊëųŖ&wās,âWą~4ŽĶŧŽAĄō­ĢI§LČ;Åh…æŸi˜Ö$úLiūŠŌil|lęøÆ]+ÔÉÃV+Ęæ -it]ãĸüé9Â^ŋšž˙Æ´+üÖ3\vņ‚°Í XĻØWƒO0íOUËĄšRûá6ití§‰…N+ķ›!Kt:xĐH/ũˇŽ‡ģv€ÂŪĨqtp]ܯŒ[éÖŅߞ´M'WÍČzÕåŌŪėš6Đ%]‹„šˆÁƒBg™cŨ|!W/|4u
ũę=Ąŋœšŧq€mũƒÂ|ˆüų@5¯ąX‰ą(ÁæL8vļī¨TGš~OgE˙âPĒ„V™rn}ęĘYaDlƒ},Xđ™.lž*aI…`›ZYĀÄÂ{RÁŽbŸŪ)ķX.05ĀƒĻ‚aAķĸÄŋsbRÍ1jAéÚĻ­0Sčļ”F…#Oü9Í>LREé\Äö0Č13F~ę–‘Ā<Q,•ų"˜•Jß"Û ļÂõ
Â$A–|Ė–ĮN"ŠĖR]ˇA–Æ>q7˛,%FˇÁđ$+ž‹…Mė´y
c#´ë¨ÚĄ}iŗßĩYųb‰ø“–M[ŽĶ”KÛĢ“)Øåb.˜ũ1K/=ęDj'B˜Ŗ3 īˆ^Äú<mį§ė:͛#ž¯dŲîŌ ,Az=čS
+ûķĸ'ė
+ķN`OŲĻŲ ¨žė%y1_DĖ"`)‘YSB
dI'Oâ&šēËąs8rõp…ŒŠNqúēŪŨ:ũÎ!Š=ËKbŅré
u‡Ķ`BxW˜Īy͝¤–ˆÚ5ėIETŽnû/Ût‡’¤ËfW7âp5ƒ°‹ä•8Ôŧ{-?pM]艩”–tĐę
+8h­ú
%5lžŪé,t/‰ÔÅõG•Á­9Ā	&wŊNÄ9¤CT}r@‹
°éן˛(1ߏĀIØÃ/ISNšâLy÷ĩ}-S
cāū0KÜJ"ÕŠh•Ø|>'Ą8Ũ_>q¯'6•Ũ>%Äyh6`)éIŽĀ*?JÜÆ}ā0–~Z
bųįÍŨp$觋Ų)Īf‰¸%’8ßķŌLBˆ}D^ųČđHdØlĄl
+
nCkáųđ ŧ
+i* B#øcBĶĘ	ɏŨƒÜŖrŸ^7š=b9
ĩ¨ÛGĢVĻ’”,ũ„ížGXˇīC I?-€|ü;zo
.*ôļ^ƒA×[8,Áā&ņdé‹ęZUâČÄ˙phŗmÕÔdāġg阔á1SV°ZÁ͘EųÍël°oSŊŒĮHķõ’‹ŊRk!Ÿb+/1Ō×ĐWËeRœ]mŽŦE÷˜Š!‘-é”–å–p‚CU™uŗŸÁW Y+ņ‹~IyÍ+ĩ)Ûøíĩ(nqŦĶ$ĸK&“]ËĄ-Åđģ§–.a°ųFŽŽÁ^T¯ŲŽÅü×]—Á^_Wbųhėē.}YkŗTvlS<đŠœûōØvšįæ…įœČqã겛/_k„lōĪPĩ=Ú=Jl‹’=˙ëÁÁRŗˇ?ĨšF,16Oœ“’hpį<ŽÄ
´åŖ/FENäĘ×v­˜€lxĨ˛ŨDdčeĮũėé%k
'Ä2€[qS13ąK$Ļ­uæéĄu\ARvƒŖ~Fƒ8"ŌOīZũážÉ”ĩŖÁ4ęÆĶ\DŖKO2tįB 
+Á>Ö9Ģ`N‰/ ›Ë[1<áIb0ØĘ°O›$zâobD0ŗJĀ^člfGc”B܇ØHĮ%
{@MÛ3ļN3w2ę1üËÛI´=Ųf“Ÿ=3-ŸŌ5Ÿģ‚TIh
ÕĮģ‡ĘH÷
+RéĪ˛D9|*Ĩ‡
r?¯ĩи>țA2ČĒ’%ˇQ/CÒnGâ˙<
ÜčĄ#4äd´NZ8§béÄŗûNÁĸ5č“xˆCĄa+Ã<Wvŧ¯Ûä$†,“Š¨dOÂ˙rũ†NĀN
ČÅtÜÆ0sÄƤ˛Ž@ŒĄ×Ė^ļæÑŖˆkP
8fOuø9ƒŌ
_?ŪMXŒ<“īĢĸ7J3Žc6և<F>]y@ÍČ3ëșīÚrĻ2ĖV¸ĩÁâÉY1NbinPĪ}ĮŅēĨ¤>+sI‡ęüĩˇCGÍÖ`JHķrDÖSŽ„Õęé€b”SĶŲSæ ũ÷ša–ŗͧelĮ/â>īâh9Zgh0A,ĢŊ8ŠąĢjį"vKUÎę.˜L=ČĄéĪ¸’N÷´¤7đĖn˜)â÷@TU_7ē†TÍ B‚	|Oo,¸EĨ ĩüI!ÚᏞ¨j7GĘ*s Jt4’‹gÛå`)$ŧˇWAm¤Sĸ\¨Ōœ\ŽĒ\ æĀ‰nĮ#mZkŌÎTŦÅíęöŽ×_r,ˇoĸ~„đ5{“CIq°%qâTī?#ąDRܞ÷JĨ‚äh-N)ƒ]Gn;‰nŦî8õz ę†¯bÆ SĪį…uēŠŸ¸ˇĐ$įnŠ?FfįũŒô!öuā‹á!žbÔ	=ꃸŋ„1uŌOUĢÔaoYj; ĄMņ-Ģ’58Äaös0§KšdˇĘŲ	ÕĐÕīÍ)͂Ž„t3K‡›1ˇ%é
+rČųœ3Bû¤Â'yˆZmš{¸ˇ9ˆWÉ4vnŸF„ ô‚:5bsxē^x2ÜĒOÕ`ŸŠe0X÷ŠpÜË-öX?ëw=lŅhžķ§VÍņWķܓ2u­ ôw™eÔŧ||tÅų”Æ$ē*šG`'C¯˛‘JBI]ĸ'“`$'
ødē¨V}=Ĩ!Ü\ÆMįãvĄ(jaá}Mü(ĀŒ_<™žæ>H ĸpn9ųQĄ
4\XĻĻĮ!ŽøįB֍zIœ!ųåĻĻY€Đ9jEš¨i3”G*‹E)Á‚UjM„˜"š§4FFč9ĸķ‰ŌŠ)e˜Z<]jU‰Šķ×ë]̓ĀŨ“ôĪjÎ1"†7XŸ¨H\?¤p-¸Îųš’x;a/œļą¯¯[{"Â.Õuš+a1.?ËģŌå	w.yÂV˙xÂŖŦx B¨íāQ´<MšË)Ŧ:K˜nI9˛ÚĪŅ`Í˙v!ÆԓnÁˆÅ_ļ]žģCX}U˜îØ\‡'`đ*|ųé+˛ČQ@ōVAÖߔˆ
Øŋküsc䝔ˇOŨņaĖ}ąÔ¤Ü(ĩ5ĀĖã5ĮF*›˛Ž’	y
ÅmÔJÃcíDx[rRÂ}
´åNMdĪˆ§@Ėī–ųū2ûižĩE|
Į6~bÜRĸšîģepˆ 
+såĮŅĻ%2ą”fžá‘qÂFšUjĄe˜0Iņ9/ļ
+ŧļ~"Ô˛™VrđĸĢ°ļŋNšŠ’ljSœ=b.Ī]‘ĀŽ*ę8ÛxK2<ų—˙—
+ģ•ŋ" ŠWŋtētÁ×{!h|ōęuŠûŊŨŠ§%ą@hôĖzËĻ›bĀĄÄđe}Ļ¸-Bœ§¤&‰&I‰įŲŅ‚ėŦĘ‘;ė–×â;ĮŨĖ8T4ĻtÂ@Ø&.Cã;ķ÷ŊČ'ZXŌXĪâ_úÂĢįÚ+äw_ĨJ’"ÃrvˆȈaŌĮRąĒpôYå-ä§æu#@ļĻ뎗Ü
 Ĩ?ą“s„P
+Ø2d˛Āwí"`U(öYČ#ŲÍ˙x‹€8œ˙UÆĐęĸÁ4R¸&å˜ËįAßßŌÃØŠ•U,iZ™§Ĩ"Wå69?4H´øo0˜õëī¨^ü˙hŸSØ.yö`˙ß*Č^¸
ĸ;.Ö÷Ÿž„įЕpFLyN\/Ąũc¸}>cjŋטXܚų;î6ã<T
ucÁ6Eאõ‹Ž›Zĩ^ŸëօĐ	fŗØxC@°ãáŖbîŗĪ€>œ`øZöŒ7ʋ/Ũ1/“Ė5yÚô*ũĒö¯†‡\ĩtŌFwôAâ‰Âøé@ԄŊČÁ%ØrRŲé+}UōäGû<)sHģ+(ĪžŲ‚$Žĸ×ņiķ9HŠwĀlpĄÚ­{…OxBē͈xÍ!
+ēķž!Æ˙”vb=ˇ´M/õŪĮd&đŗū‡PģûŒëÆ(,ž;Īú›´Ëmšü/õsh’ŋ æ§kjf§Õ =Đ|lļŨëž/ĒŌ
+ŧüPˆDL^w¯[|úaäũę˜īãĄ%@í€pŖņÅ.Aö~|Iš:0&J4<˜UĮÄø
ĪA<ZôæÂí–i—‚{šĄ÷ŗ ]ņiuΚûŽŨ­Õ˛?˅Ž’¨>–nūHjĻü5Å˙Ŧq@ŋŖ:wĖ4ųZA„•Z#ÆRåV’ÚáÍ
+n-]Í"ôKũũꊊ;ėˆ~ûN>”o–_˙žĀ'ÖfÍ‚Ŋ8Ÿ
XˆėM‘w&ļy͑¨Ų͚žœMŨļ
žGØģ ¯~
Ģläh5?j3/"Õi×v…3NIv8‰™sōb._™ī•XÆ‚°˛žâŦ†n6ˆvI¤kŠSGCÅL–iZ/ņú‘ Eáh`ī_ģĩøl&ž—§‰(Į!§ĻnÃyL'bÔ|Etĩ}›{[[˙ŖËCš+ã§TŸbQĶ÷MCĨn}Nu.}ŧˆiŨlGYŪ`87•öˇjMg–‰ķÛŽ°Ŗ¤e™ŒĪ~`–ôŸTā‘×fUúv8ė›ËtpOÁŽ„cˆŅĸ”ēšČŲÂn?ô÷čFxܤUmFŌ@°x°ŋ”l`0â“@Ŧí>,ČŅä
+B%˜ˇM21k‘¸ąvč÷8„w]O(7Œ¯?›Đžļ°lBūhĩ’´ËÔ ÜŒĮëŧĐ;@BŸLúLŠeYÎ,iŽ @uT¯<˙	=}ÁęÃBŠ+D‚iļ
ĀÃë54ؖMRRŊŪ3w-ŖŲ›Ņk
+
2"€ėÉĪœŦfēŖ.8I.Y\G
+žtœ/'ŧM‘ÂŸd’|v\lž˜@,ŌBéJšÃ‚!¨–ƒ÷åCZú÷8Ī%HŅCâ)ģ?žŌ–ÕĪ)đ“›¯VŒĄ°%
+ΝkZ2=P~Ėl„ö3×
˜á(ˆ&(īq‹Gąā˜ÃÂâU6^8
+B.'ŽÉ
+ĒHŒ‘ä”ÄĮP(Rx}"ņá
+''üŌ~4퉎+'qRÂ'1ŲL~ŅĒŊ
+’éÅ&I
DcŽ.^\ÕDy1đHäÃâՐ†QJŒ i†ŲĸŖ|0a—ŌĒØA:{č4˛YØY¤ØA=tl;O‚;ÛĮ×!lß!üŦYj‡“:iĨKIų†V2dæĢG”ŠVß’Rΰ.<­ÜX–fŽbNCÕÚë@4Ēqä`kÁf„Ч‡)M0Ņc6Đo1ņØøjõ¸`#ņŒķHäœz“ÄŠôÛĮ#jüØHŒ7o7tWD3)WĢęŊŽ{ųjy3L‰¤ģQ>éTËãP’ȧĩČO‹Ä"§ĩSÚt"q,WN4N$ūЉÄ÷UÜĶãĪ‰ÄdįDâĐPĸ`Qs:m&
+6mˆÄįŦ…’HŽ/g‚˙€HÜ=R–āM¤“ļŸŨōy\/q\aĶŸŽĀ§MHĀ‡‰dEƒ{Š$ē ŋFD
+Ġ	8
+ęֆԡ
‰m¯ķ 
‰CŽ.žÔlHÜŨ\Ûũô`‘‘÷@ō‹É†ÄGZ¤ßēD?§%ņ-Ą&ʟĄDÁāÁ'’!"…ĮĘc=˜>\ÛƯ‹÷¸ÅŖ%ņkT„ÆA‹^s$ĸ@×ãĀGAZį6R“íŋGÁŽÉ’‰bŖ$~ŌÄZ#2D\TĘĮ#
ɑÂQpWUHá(ÆŽ‚‹VíU$(œ4”(¸vĀQŅPĸāô‰äûŽHz$ō%ô‘&¯ƒé+ŠbrķB\Ԛ{Š×SۋOWįˆģ
˜ØĄ.Ö׍¤Øm´*v
+v–‚ITtŸLøIX…Ũm"Zt–Z;‘”ˇ\
+z˛˛<m}d§‡hÖĶŖ 
†4X¸RÃĨtzšĻ`z†ĨņH‹6
$Ÿ€pMQrđR+^bį~TJ	;ŒĨ…y
+x‚”kđ5Vė—LA—)a)mvčŦöģŪ„;kyŦĄ`āĀ(G ə¨gI|+WĩÕŧÁš#ĩ”é—mŊ’!;Ąl“<,K­)PY Ø\ŧžœj_°Ø†Ŗ`ę=`Īã&jÃÜē…ƒũ$œ4ˆsW<”ˠȐgĄāĩVK;°ņ"ŽF?l>bŅ!ˆ<ŠęĖP4”KLØ2fãl+:éFķĀūFkÄj4RBŖŅ˜N|t	Û4‡„UŸŅk
+'ū:Ą
VxÄ|{Œ<ØeÃŦZÕ:ØÃĒāScđęui0‚ęåbRĻâbņhąĮšŦØŗ—	fˆ	L&H$8Öb€ NÃ
ž3´
Ē	ą[QF‰N]|ĸC€^G3m@‹ÃFĻ,Ž
<¨`“$Fʇ OkˇC†hĒδP'tPė¨¤Ŧ8p0RÉ–¯&6Ęčmu[u4$hā qĮU5**Ī#‘×QÁPáĪ‡Fją‚ĄÂqvPp*˜HĶ¯…Wá‚O
&Į5Ą’ZHjɕ뀭Ú×ĒŊxņ&ŧxôl+"…WCB$ĶĢ?’éÕŸĪXĸāõĩym.ŪEvy¯Ņ™‚!Ā€@l#€hËËbyY,bdôÁ2ŽV5Q%áĢ$Ŧjĸœ+	_‘ž-
+R(„ŒÚH”LA ”Fš””KˇÔ'’)X2Rd6ŗ,bÃĘęâŲ5ąAKl1ˆWM>7Z¸y$ō!O:	ö\2Céļ<´¤›ŲžĄÜ8.<š&…oģBÅˇâ3Qķ¸Ė7Ŋöu㊒čZ-›j ŅĮ1˜žāg”n´ĪˇAĄ•Rúä1p ļ€&rjrđŲ´ „-ÁRėA0BØ
Ëk`,ddũKđ đMjDŪ¨üs–Ędlną(/Ļ1bŌã‘ÔT)ŽĪ’iÄÔDšQs$ĐÔNí$!˛¨@kíäqŠ]i$N¸g¤Xx•8;hŅ‚‚O
§`úŲA{Đz@Įķ1H~%T	UÔŽOa@]üÚĒ}Ģöb˛U{qĖ.ÜG2Ŋ	’éÅŲÅë@¸î"ģ|ČÅė@´rŅiyYôėÔ7ËC,/Å֖—EÁ8hmyŨ,ą=ļĢ•NúD˛&)ĩXä0ûDūŗa‘ąĄ ƂwCm¨ĄMĩ)ÃŲší‰ž˜ėäąd$
ŲÉKF"H2’,ĐÉ7ØĐĸÁ†
6ŗ!vÁ˛!$1í6A_Š×|$Ŗ™Ą„ŊnŖWĘ`ũΡcHQ”v—pĮ•ŠxžRØîÚ¤ åįÁįŖtŖžĐë0C)} ’é)ÉōˆO˜@ÛPŠcéFC'#ڀ"Vv–viÂ*ėVa:-bįq’Ķ"v#­Šdä	;’LėjYt™ŧ9,I`ędQA}åáaԊŠÍ´Z‰ú„Zã"3`ŗ‡¸Ō¯ŧ<Ā˛dēŲãVr\U¸v} čŖk§qU}ŠũŦ\ÁPa#+*|=ų““ãė`Qx°đ*,q2Ôĸžč@˛Ú4’_ĮYBõųJ˜§ybžļķY]uņkmĸ.~mÕ^üĀ`-l hŅĪ--QđŠIĻ“$Ķ‹IĻŋ6íēŊD#žK'Ā€ÜŌ’Ŧœ}ŗ<Äã,/Kž}ŗ<Ē¸<Äō˛.šÉ΃ŽYÂWĢBae¤’ Q@ĀĘxĒ‰2gĨx\ĻÔPĪö‰äĆ„(ø™‚)5ÔF3[Ø@Û‰á˜gËąĄ`›ÛT[‹EĀZoĩ)p21MnI×ĸāDË´d$a$/“ˆ ”Œ<NF†€’ĒQ
+›Í‹'	žˆŠ/Ÿ É[°'~äė<NŗˆFe˜Röz†€Œgt#-åÂwCAžQ¯°‰ŧvÛ'’Y’
ä
iŒĄ.ū%åûHd´+(}û,"…;"…ģ0C@ŗ
2úåR6˛ÛäÍ'(‘›T0}5ŗO$?žqЎļ”m5Qî›s'#´Į?Ø1ęâĪPĄ
á
=Ž1Ęß)hŨ˛‚úw’fD
+¸hĒæ
+•CäŧË+]“ô ņ
l@NC…)7VĨ€
7ãdu˛ļ—)ėq˜
Ž†“4*ëtxFOJsTō$vŽy’ĐŨ&:UĮČ1Cz,Pk0!Žú–pfbČnģđbã4nÕ}ší' F’ƒęí* VęCĶiŋąCvEā¯´!6úˆ:h‡%#ëį=š‡sbá „Í´P‚	äÁO¤OđCÉĶ>A
Ē¤¨TLL76ŠHHŽMB)eId…ž,‘âq™vZģPg]f’ÃÎÕĒ(JX…AgŨ¤…‚Ļŗ‡î“"…f’Ã.S=Ž“°
+;˛ŗ‡ÎR˲uū"æIŒœÄPĨėq{‹_žp8‹Ü8JY/*_Ž¤(¤Üm$IhÃ"Ëʗ&ˇā3°âxą9=TPŽ>ƒŨ…GyËŲ-ōö¸(ĨĄĸæÛĪĄBŗEF'
+n¨Čˆ†ŧJÔ…Waõ˛hcĨ‚™‰ÄŨ3r‡l}H*lōčaĀŸģ'B EA\āqŅ•Ļĸ˕čP¤ĐTË4šĄõI8ˆÚ÷°ąņH#…|ųQ3ljĻ¯U6œÁ#ęm4C.-U[ōhĖ5ĪDgRŌĢ42eÁ¨­Ä˜y*-‰céä9‹5Œ'î:Kž˜ZŦríoĘ4C†x]ŊĮŊX­Â”Đķ¤)ãéĢØĖöRâa5ˆL)’!č¨RŠÁ"ZSëˇJ„ŋ đDĢæq Ž"…
>ĩ3e¤PaFÅfÁ‘qĐšpø˛š]n9(‹¸8Jš<C_V?îé÷—! Á¨Ājēą`u"e=iYä…@‚Đ\Ŧ°Ų‚Ēî9ôĒlĪ#‘Aßėd„ž)2dŧD>5(ļlĸ,ģMPĐĨ‹¯¤ĻjEjJíqjHvúŸ@’ŧ&@ž\ŠÅ""W\8
+Žnü¯ġ„Zéq‰
?Š'#GÆ4MÁô ˇ†OĐā (2įŦ$fí{\ADŊŠ°‰˛E’ú2E’bķųųJyu[y((e‹¤qĐ	l)#ú
ĩį@ōĐÍ^žĄ`_=ų!Ôō
BAOëãq"ĸ5įBÕ\Q¨qIm/^˜œÄR]</ĩ'ęjm$Ž‚áĢIP΂jEzœE")e’úr$äžŪl|Ѝ8JšÅ!ԇjˇ	
+ĸ ã mˇ	
+vRÁôĨæCčšM

ĩE]|Ÿˆ”÷¸Ōu‘rĖЄ}"Ų%ŲVø  ˇ¨‹o?G)Ŗ/ņËgäEʒJ|m23Ą.$ņ…ˆ9 ÅWĸāąĐčL–dËŖ\ʊ‚V @Krß1	28‰3+ļ>$ēxŲ@+ö€6Ą41­‹å
+f’éŏíĒB(‚MˆēÚ*ržŒp¤Ļzk¤raCxR˜W
+¤¯ŖÎ4ëé5™L){‘5ûŽČō;=ēZ(ŠäVė*JŦđę)v“ĻbŠ”_œŋāJčUW‹!A›ĖR1}&K)
]-4E#ņˊ¯‘ca˜*
Ŗā*ŠúĀ,ĩ€zĩ6ITØlĄ}ū[ĖųrØg&ZĢ…‚ÜÍĄO$k;Ņ´,˜œ•:i­f@Ę6EXĘ	
LĨ$:UĖ‡$h¸Ō…
+*åŧiHđ(ˆŪãVšĸŒk„Ŗ0ˆM\’áœĖ
+FŦŌ Ĩ€°Ey‚…Ã9č’ĸjēE´~6SbØ™rf”r”'(mdēĄšž~÷	ŽnÄFĻÜQĨļJŖ­ī¸rHĮ ’š›k;Á‚`Z)™’ĸŒ#šÄ€
!˜ÔRD
+÷Ū9לķ…ķy‰’K”\Ę8¯ō˜Å0ƒYs”Ž˜ĮĻh2“$&=Žô¸•H’d‰‚1z\¸øū#ŋMCÆ’,­—ļ`(søĄbō¸0ą~ĨÎᤁ"4šĮIČX÷ĄË4ZKcj˛ut‹õ8U@bŗrXŒRë÷Œ“Ļ…Mčv0PccŽv
+Ŗˆrų"°„‚Ųpēzüt¤	‰ĄÚîēĶÕcwkwÁôĸDņÁ0ķÃTx5$.œ6’&ÕDŖįÉá8j?dĻ˙PĄÅƁä[ą‡ĢU°<ŽU7ŸÉ/žLbZA
:rXA	+ü<ĩ‚ēbqKk™FĢšKŲ•˛šHŋ<~ÖöÛÅBÕáWzY0eˆÍQõšz$ō@ŠĄU1Ĩ|Ĩ‹(ÚO& &p]6ilõ˛šđĄ˛ęb›Ôã"†ä„UōēiPlŽp6,ōDÜPM1T8ĸSl~5T])5Bg.BžÎœ,iPx¨Ÿ¸ŗV:!9Õö9Y0
	’čJ™sžŦrP‰Vl/fS‘Å›LŸ$§‹Ô8J™QP€Đëƒņ}īņ*ėšŦ„jUŲĒh_uÛ)P€@=lĻâŠEAsŸ3ōŌ/ÁĐŦá;L,B{Üd5°Č°Šˆ}PŅ¡H´$?ēB{ËQ´Ī2*šÂItS@SĩSå‹@õŲdŗā6AdķGĐĸNꤠŪ–2ĨĶząL[Ɯ°¤+Ũ1Ųž:áOōŠ‘~>›ûĻ&ĘWîւŋO8-‹ĖíčŅI)d¨‰=ĘC-đųƒ€ˇ!В<I8T}Đ"0Œt#˛°ų1ŽúęXî_"­ôR“aČÍ+Ž‹”GŽ‚cj@Ęŧ€Ŗ GȒL2}’<
+ŨØÜqą›+l.ā(8>(lZŠÛ—K9R¤DĻšŲ´¤5: Ŗf “Ŗī%į
¸FFųepō!”†‚zœ×5
+D
Ž‚âËN €7:åGÁė–”ĮĖĩÔ8jÁLÁm?ŗĒDŦz Œ§@HG*œx)O0x0ˆ3‰Ã…”a¯FQĐĸ)?-ĸÕmM7öC!ŦĮmT'vņ9‰##—úAĨˆ+đetBų˛Į=RˆƒQ6ļČ_Ž„Ԏ*ÕPPŠ@PäZĸ<î!ĸ^4¨đe ˆpZxŖ“Ŗ3Ú6Ĩe„ōī–<)OĻĘȐĩĄ}Į¨č´ˇũK>ÂŅ…!č–:‡÷Á°b•ĀéhÜŽâMxŋY¤iZha(#”ļPca^Ęãđ*ëī
+éŒÃ´°á“ŒŽ
+?ƒ…yŪÖb@Č]ēŅ&`Šsx:5}›Fŗq>ßã8¯†Ŗsy%‡ã A˜†EÎ<˛
”˛HIe‘0ĖˇŸÉ“Š=DŧÎPbDöR){l{SSØēKG‰5>’6‚
q €|aįqÆ
TdžÎį`Ė•Žž8’”ōj6xz89Ļz#0joY0d†ėŒ™Ā
ĩĮyœĮyœĮĨŖ›(‹&ĸ0EE	3…0jM
qĨĪ’ĀÔUœ…Ÿļ,˜MtĒ†frō9Yp§)/0rSW•žN”0;u’Ãî$ģ—Į4Û¤‹Cƒ‘Ūē”{œÅR5+ũđ[ģ}ņc2dÍ
+¤dÁ.”Ü"´—5,Z
–Ē+8ũr>3Ēö¸Ôĸ`‰ˆ!lI/æ@Δ"Ąa=§¨>1`g’oãŲ¤	M	ĄģÍâ^"Rh‰„Fŋ^tĨRķ	ĩŊ/mKÁ:
. 94ĩ§}ÉGšĸĶšnŽmLIŲŖ%ąĮĨÔViĨxLÄXÁijĸŦXQË*Ķ‹¨č3QĶL˛H„íÃ"ÃÍĒÂĸ.Mä„aŒž7áMPF…ÄŠŊy1
ÄQPœ™dčAēdÉŦŲĄZä"ŽîđÔ<ëĸŧJ
4‚Ír ųQU˛9”IĸOÜ`#´NŲÔ
bW˙mÁôc§EbŽpĒ8nĸJž=|Č9™ÜSI°>¨/ĄH>Ũ\Û0•@õ8ŲÅ\­%Ü!9 °úÆ×G
D/>×R5QūSM”1g3ēßÄĘ\7 W5­Û’˜Öy$ōHœ´#0m?Fëĸ„1õđÓˇ†īq‹K	†Ã˙TN,ÂŖŖÚŽHá((**ÂQ|ČQ-E@_6ېH3BQāąĩ@(˜ORÁôôôbļL)ī MŖĶK8îéŋQš8š")Šúáž
+‡^G‰ĨęĮHdŗĮ•ļÉÁü˛Š_$ķ¸K°`‰˛H‰¸@č‰ltúĩã|ų”Đžč¸ĒđŧĄāIÚ/ˇ}ģ蔧ųėŗL?9S_fĪ#ĩŧÄ/{\š‘ō9¨úąr)P*(åjYđcoŪ‹@
BOd(R.%´'Z;ā(8˛¨‹—X&ęÕZG…ˇŦĶž9n^ÜČ,Jš˙æÅĸQ{ĸ‘“ŽTkbäĨĮĄk˂ģį@ō12ĸYŠ¤”!Ô;iÉ4žqĐ聅аGđ
+žæCh/ČôĀC¨GąŠo ”p*Ėč œrGõøˆUūYP­ČObā<Ō›?ÂBĐ9KxœÖá_(ŽRVx*5ļ‘¨0í­Ô-Xå´r„,ŲãlžúĮÁ!Ô0ÍũĖxdԎF]}Ą&“ĨŗĐzz×Į0äFĨ€:s2UÖü‡ˇ	"…# ˜XH˛Į")/Ú1ŽJƒ0*e3␎Žzģ„yšŠŖ›É:H:RŨBՎđCĄāĮ›ŖŽ‰ôË7ķ¤jËã­ä&ŌJÛ4†!3ŇPT’wcãpėÔS?–Ę9Ā0jƑfHë´P_R^™Ōf\ e€Ą{hŸØIjĪãČÎH	°›´P°#…]ĝ=tŖĶ"ēÛZR¤°S[(؁R$Ž­´ĖŽÄ/›uŌZ0Ģ9zŌ'’-)…
+§kø'ë­Ųö¸*n\_ö8„iōØLqČšŽļ"ؤÍÔ!ÛRõ‡ĪÅĄJ60ĒŽ•ŽR–1BĻUbōÍZéųŪ=xT$Q`§ų`Âî3‰‹oķכđâ•dzņsuņąM‹€ Čm̀ÍĻį@ō“”â‚'{Éx ÚãԊ͂QŗŅ¨ÆfÁ-$ÄfnPŸžjEj. …­sĩ(8ģMPņŒōdNDʡHbÔ´^<‘Ą<[~‚Ā¯ÔĻą)J(g`¨LŋŪ@”ķ…Ø  ÆÉ4ÚXÉã$Ķ‹‰Ęƒ )Æē(÷éÅøsęžėqÄZh?“Ī‰O	Ÿ(Fy<y Ģ\ØĐ* zœåo-ŧ,<ÔĐĀR–hZ/fžđa)õ]ɀQ3ļr€4XQ˜ęq7ŽÃ_d
I&
ŊÍRh*å9r€Ŧ	<@-ÁĢđ[!—Ëí‹ģ÷/˜éJ™ĸK™ėĄÛŒ(°ģ´P0Õ@Ā ´Ätb‘ü
YđÚ-TmÎō	u¨ĐüÔ!n(x0jOT6€=DŽŧ:*ŧÖÜđ=Ĩ$ĖVlæi}o‹[Ŧ…ôyEDōē×ĪĀÕ$n<Ų‡˜‚éMOĀQ‘$fČå%fČ4p#R'?xp#…5ue<:å¨
‘8ØĄBfŠļ•õ
+‡įIc&)'h8äEÂ:ŊmōeTØhžĮBˆ #æ›đb†+ŽŖöS‘Š^<Į˙íÕi?V0ČĒĮ]f§b3I€8¤°ƒO^PnŌĄ+eUė4bgĒRą đDH†Ļ(‹œH$ĨœSŒđ%÷ôÜD#ņ<Īã^“L€ØĒđŌbļÚKCxL˛×f
+x0Õ8Úëb™h/‚iã€cŧ.ÖäMyWú`˛ņeĸ!˜XŦh˛™X˛–2Å\0
b,™ĸŨN,×Ā$@ŠŦŅŪZ‡Tp÷€ĮŨ™įßfįyü2ŸđåŸēãō4_sßæķ1‡¸x]Ŧ‰įq/ĘäÚ<§<įō7›Tī~?ĨâĸŠņ)nķˇ˜:šJÄīķŗ|QyŸœŋŠ÷Õ(ŊÅ7Ĩē˜J™[ěgsnŸtŠRm“>ĩ™Qø5‰ĻÖ[,S)“øũŨ:õâ]îTųžTšÜ&•ø)ķ$ūŠÜâίJėØ<aîå§Ūę&Juģ6b?ģ6‰ŸåšS*ŽÚ*ŨK\æžÅ”ĘÔEOmÅųû	•ĘĨÖoĀK€Rå™ŗ¸ĪS˲oŅTŊĨØOũ1Ö( ÅlxS°Ęû2Ņ&ąŦķž´	€9F€Šķ—n׸Ÿ™3í7K—äq¯œū€xÖeŲKüģŸ#6Í}æŗãą|n5qŗ6ͲĖĻÉš{ģÜjšÚä\nâlœĪģYöQŋËŗîf杗øK^æœ5ÖÚ;ĮĪŊôųŊēŪÚ4ķ6­.ˇš%~÷9~n-sųeÖŖÖnŪ%ˇî7ķ¸›Ü+€˙˜ŗ)âņėfægÉŨ-@Ā—į‰KãĶ<GŪ3	°](Κ8‡â<€ëœM=öwõĖĄžķŦ7×9›œsmüĨ_ã/÷.{ŠąāĪßÄcÆĨŲšxî×xäg>ų.ķsķ÷ÖüŸœåæŧ?/9×cYîü¯Ŋfž˙9›<@—ŋKÎËqwūgæĪŊēšÅÕåVSķĮš?įfūÜZš›ēģųÜÜZōRį‘—|įįųšWĪc69ĪKwįüøŗŲ_kí2Ģüšĩ^uYžųš7į}ü=nūåÆ:—Ŋķņ|qŽõ—¸?ū>žģĘĮšŧ˙Öåxš&˙sŸ?šŧ|ÍËį^˜w“[]nũ˛üō9—īōšĩo͟—ÜŨĨæÖ×ZëĮ[?æ|ķņÜú{'yĻŠ;—˜gŒ9îgīēw}öŊ—Û<IÉ#yîÉ­ßĪ\ō=žüŸsš9–eūŨŗÖgßæ>ąšË—ųKĖw~Î=ķsĢ‰ąÖēüČš4{‰w.÷˙ˆû?;Öü4˙ä¯Į7Oũš|^ūs&Œ3˙ąÄúÄ%¨˙ˆ?wW7wp=>?GŗĖ…ņhō>r×cŧwŲ5>˙õ™÷îû7.OĶÜøė8÷\šĻîŧ4wū˛Ü?šģÜĘķ—Ÿ÷ųĨiö7÷9öü™sˎĪžÍŗģÜúy4ûyūY➡É_|uš•ë˛˙ŠKnŽfÆš4Ëķė÷˜7ΜËKœš•kŽÍŪMžųī=âīŸOSënžũĖæķŦÅũ§ŠąŠˇÎ<—ø3Î{omæ3úüžG|â\’<’GōúëžĮRņâĀë–9Oķ|ŨqŲMžÍžËņܧIōLŽÂËŠUŒÂŽØĻë^vŗ4ĩÉõŸ§™õŪ=‹
Yķ_īĶÄÜĖæYŽŊã×p’GōHÉ{‘<Ö%>ĪŊķYŽ÷”Ÿ1ÖzėZ›åŠš•—&>ķivũ8˙‰ß4{Įæięmš—_æ|ūˆÍ˙Ųķ>˙ûÉu.Mœ{įøųæŖ‰˙ĖĻ>ķ¨yæŧ<yæåc^r]æķËņËü
fÉMÍ÷¸ÍĖ÷Œņ>yûëā§Y~)lŗįžĩiöĮb@._
›ëĮú4{Īåhr-jķ÷Šõ¸KũœIÅš8?î#×'įžãk-–g×įyî1Ÿs÷ÉĩŪgYöķĮswÎ59s—Ŗ6{Ųõ›%ÍÜ9—[ģųbĪå.ĪŒqĪų{î™÷ãRskÉË\rŽÆ&ˇšfŋ¸ąųfØ;oėnÜĪ3›|üW@īå™OĶėįšĮŪ3gâĪɞsūøĪŗŸ§Iō8”•ĮîB<17KŽúņÔÛõcžģūŨ_&šiĶČųņ3ųÃõš{iž6ˇÖ0–ÂDK™n.ËƂU´f00ƒņĘ 0ŊhąŒ‚R˛hĄb.íĩÁŪ•ÁxŽKķėgī#7w§ŊŽĖDa0ŪX.ƒÁ21,SĪįšËžĪŸfæ\^æ=öΚõ,ŗ‰_ܘgsĮ'֛gÎ5y>ûŠËqo6ā'œģēÜĒŗŪįõæY›küz›|<;Īœk–ģĖÜzâ7ģ9ę/ą‰ÍŅ,]žĪ^–xüįÜÚ;Ī%>57ķgŽËŪķX~Ī%Ūį›fÆûģø}÷’úÍ|æŪMSz›¯Ėģ8īOry.wĮ˙úņ|›b€™Ë˛<Ÿ?įā˛sŒwižÆ˙įÉuî¯Í=ęs‹
Ļ6šW€ŲÍ?{/ģÛšYn÷üuæį˜ņ?æ<īņä]č&ß{ëso“Ļ69<Ās90 Ī3—œ
|B@,ĸK1 <ß41Ūb@73÷
+ĀXcŧŨōäÜ+€ũ͜I5s07āË

+îÄpĀiœfįų9Ú;€ÉåR0	éŸC vÜ-)Ÿ'`ڎˇ}ō䁸ZįA?ÂGA$W‰đׅ¸¤#UˆŅQa‡Iķ„ÛUa1å$ž)*<P0}ÂPĸ(žˇ(8† Ąô‘&Ō•2ÛʑŠ'I Ŗĸ
+.v""X5ęËŖE,‹Đ<Ô@čŨÉMŠŪĘÍĶáĒPu0ē"œĩ+(ļABĒQ2ø|%΍„”˛¨DÔV˛$BČĖČĖ@Â6c0ŽČdbét+ÄX@*@>B,0$“
+eōP,
+Ã0Žĸ0Š‚„$SˆĄ3H˛˙võP	ÕŠ‚Ėˆš4‚gå€ÆƒeĻ'Ž˛ë
+ÜLš1Ŋ[˜° VŸéöšqĘ$ųŒÃFķø>›TŽLŠŦ)‡~5I•îÂT@_Í`åĘ ŧWSÖ$|Ē:
â–!Š3—’éŽe')ÔhEV/
+]¯™îd¸=ÄĒô”Põ¯ÂķĮėtĪ4ũÂP˙Ĩž‹Ŋ­y{IĖjMKë´Ƹ?â8oxÂö}GcØåG’gĖ’šāEĢ„Ã!#ÛĮ:Žâe—‘ŗ+0
áaÜ#ädŸFÛz‡$•Œ”
‘÷›1(ė˛0÷ü|ĀܨĢßkÕ
E€æĀ‰ƒ_,œ1yΘ{ÁËũĢ„äfmŸ˛.Ajx€ę°=8W€Ŗ;36
œf:b_~§XöËNY@sęCŋßë%ĢƒZ@$dĐĀ•Ųęאü*'6Ā_ͅ¤ži3d-ČčŽn§bũT2R¸!‹[Æ^Øp€ÔüG`Č
&ŋ2TÍƞÆæ5¸×Ã@Ž%JT{<AÜķ_ŠIŠtĘ	U<0
:cJ9Ė47ÄM@ëu
++;…6cáe}+=su™Co4dŠ"QrŽĐøĖoˆõeŖ†ŒÜFZŪДūm
+lĖÅúiģ@€Î |tb´ŌĨęAj\ZÃ3øŨTÆp„$Ŋ[Ķ‹ôąZYžŪBĩ¸[¯ôTƒ=]…ķž5Ą‹#™ ĀŐŠ€'‡„,7—a'6Ã-˛iōr…š cîŦ‚0Ãrį@8„[îjēN›æ­ũĻųŖ2(ĨˁœŽšIDŠ=’g`pRU}@ģ :ú5PÅčšž§‹ķĨwp&Ãę"JmŦŗPÄÄsŪ`Ž G¯eQ˙zzܡĒŽq?;HÂ+čØˁM3ö]ĀĩJ•
ØûJŦ˜į¤EÂŲ0ūF{ōĢč>f=Ļ!é8°5ĸk‡ëĪÖŌ_įIÁ0Ũšŋ/¨yŸ‘¤ũĮ,Ÿî ĸûÉČŠŨšƒ×˛7 °K?îĮ%5Üûā‹1@°­ĩÉŅØí`pŋ¨(ŽIˆ^ˆ)-LÔųŒÛåsĖIoi?1BŌŒhŸ$ķD&%×įÂÄ*šŖÄ|—"ŽĶ|ÄBÕ˙`ôCęß*ũ•AxŖmĐ:8ŦM?Ũ°§ŸA„_Ī–W°ū
]'9A˛:p&xŋƒTģļ\߯‡ŽåLũ8fŖšHą´é!¯öcß;.õI73™™xÄÁšc8)2¨!'c*ĩ=žŪôÅņŽ¨h¸qį7“‘Ģ–"Ķ
‡ũ8îsX/kŨ˛¨ÜU´j~<zōędČ~hŽöã„4k
ÃÍfŗIŅ°Ī1*ˇƒK)_ēņƒĖLcȅļū$‰ũwY
ÂÄ-äō„IfŖaĒEŲ–“†ŗ’_üV×A$š™Š+3sq?ļ96œĨ}?<" į|čd,ÉɆŽ+Ō
i&ã?āo7Ô,üD,ĖíMŒ øšŲČ@›t)wD2i…ŒP~mx^ČJ|7œƒS!?­Ā1ETMĐ2Œˆ:€H’$ ĘøC7An>u ˛ĢĮ)iįhĘ§ÛŒ‘pŽ*J‘ûyÆV׏EB$ĶsĀ
^ķ`LūĒé‡i:ģ›fmtØ?Nūál
+ƒĸōĶÁģS€	ĘT=•Ą­­8Ëž˛Īâ†lXėę|:ƒķĢn)u§Ī`kú˜‘í†,MŒ!‹Iū8¨v` s ­ŧ•}„
+Mn2Ø1Mc¸´Ąåü捉ܚx617	°ßĶzÛZķØ.	åŦ‰Ģ$
+‡Áf",Ÿė˛Ã âG›Í^ALrLŗÄš!ÃÍŌ@¨Mdĩrûļ?Ęz+OQbËpŋRáŦ
ž.?`P"SdІ;“æ†lũ'Žb›†jmŽ+ĪęVČvú?ÜĨ§wŲUEČĀŪ…Á˜ĢÍåg#†pt(ČûÛGüÁųÍ1dėȘ}’ë–@#N-×~gÄžüs3ŠĖĸ¨™Ĩƒˇâĸ•Ō†¯6X„ÕȡZÂ@‚2NtėU(ėĸƯYŨû€†0–÷XĄĸ)wĻōiĒÂ/õbCJ
(J73Õ"5Ū!:sŽˇ”{¤w Œ;<u–"?LÖõĖĩŅbtpĘŦ@4’ž!Ņ1ēQ†ā .˛gCĢp;éôMÖęÆäigoÕÛęËxŊđ_ūÖ.OMuĖŦķ˙YÔ]9ĩĻÕ
iˆÂ=ڋŒ<ë)„āęėšŅdäx,„(?S^0{7UzM<œ.”TķĻŧ?~Ė}ôEdŠ2s6’ķ¤ÕŦĢ—äĮWáo÷:j{րÎĩ8œ5āā/]Ņ[?ļtnp,¨Ä´íųûūÛÎĨšGųå
+ۉڸ4CÚÎ1¤:pÛY"&z"k3kHņ~ĄT1ũ–B1ŋaCIÆąŽÍv‹UŦ3ģ‰\•S	Ņ‰Ēhģbķ×îZÜBË5œ°fšą‹ˇRˆˇ˛ö§Ŋ~Ũũ}Æ1æ°Ģčjõ0°ŊBŪ-ė#xÖj–e‹‘~PZąüĘd|jĸŲŸJÚŠœsy‘+×~(đ¨HĒP0.‹pVgŨÂJŽ`sj— āÉōx€ũeĄŽą	¤¨dRŪļ0‘Ŗ (b¸4;Šöžāš€~Öķ5ÔJÉ<ū8œę=TŲßY3ų[ÔņLéÜ bSūŲÁĒ"b,ÁFę@āē*MĨ”O/Ö	N2ëpJv|ČĀV
#5[6Œn&°–㯤ēRBåqĮ ôÂ>ōÂąXšMQˇËĒ9O’`kÕĀKgv\ĸéMÃÛĒ URōé ŨØ^|WÃ>đ¸ĒøzķgAUĐėīí÷ŠėČš	Ņ+~Šü9vāöw÷ąVNg¯
+húĪ9?ëPD…˛ĄÂ;)JĪ•Ôc´n2’›Šnŧ@Đ[ø#‡jPëÅ+%ļÉú7´ŗšZöW­ĩ¤ĖS
&Ëk|7Ė0ʊņčjž;„äôãõ~ˆÚ=ū˜œetŠĐÛ"N&āā€W
ųƒŪĻ¸;
+šY:‘SLŠ8ʉY‘O+xūe7	Ø='ōeĻ	 ¯š5ЎPészxnm$ˇĶ<2í#€Šģ8‰UÅĻœPë^)æ¸]æbšĒĒü[œŋ$(
ķŦ‰[ú/¯›sôMBoj…žDÁŒ–Ás9„ē€FTøĘáĖxÅ.7"EūTĀ‹ŠRŌ@Ú÷Íx#ščâ=ęĶ@|TĄķĶ™õ})i˛]z,Ã%Ũûúŗg—*l'˙­-T0āFq)BfG*t,j5î	šybōúŊˇ
E}Ä.lžđ÷ŋ´*Yg˛Į>Ę\n.*/xGZķû!ĸ{_cIËGrR‰ú47ģ˙Y¸rrV*i/”<[eŠ#­W[ĩ˜™Üđ0Ļ¨ĸŠ˙¯û4+žŲm`Nã
ļtŊ¨53 j˙ösŦŲpi%*”&ë’ę^l
Éh;Å+ā›ō4,×Û
@ũ=kxWëũäēX}‚ĸ? ؕœÉDlßģVŲÕæw4GúHKVˇP/(˛`
+å~…ÛĘeÚ`VŨnÖ&?ú.R‰9=ô:ÔĻ͙ÉÎ9~÷“ã7G‰ÔƒEįE`änũ¯K܅Đb]búŅQ
ešEëÕ˟Ą¨NúHk; ›DĪ€žÉY—GˆV Ē‰šEh=Չš7“KĐĘÕÔ:k‰Ô•7eØŦcV\yGŸ\ãĖōaXh"OP›"J¤č˙§Žŧ&Î~ČÁ!XJõYËĻĻ5ū&‚ˇ/įēšŨÃÔ
35V!=5öYåœ`ÅˇžA•‘„Û(f“v11ėa@Wē"ZĄ6X,Ü/Îë՟usáŅ¸r˙ë}%>	D2˙–Øž!tešFZTŋŊ°cŸōķίÆā
æ…Fŧ_ÛG “LüŠoV_
­ĩ<ËmāGAš‹Y‰bāĻēˆk%%'}āhĢ„ˆÆphĸ+—Ī‘†Lz]08î~Ŋōģm#•šG¤‰)Îa¤f`\]܄ĸeIĒ
+klD
]æũĢGžŒŽgŠ˛
m‚Ķš„ņ…]@
¯ˆÜ…Š'Âí!EŅšpRÜHRŠÆBŽ5¸Ķ÷i"N2UŠv8ų†Gæ>VžŨøüPĶ+O¨
ŲAf;Ŗ†˛ķ)TŧSR7ĪÂVõa;˜Ú:=:ĄgTfGz Ņߏ§ĪD.ôbŌXžÕM?čČõs`6ŸØĻîú.iO­Į7	.冏ŊãS!-â\mY`?š‘`Uņ{BX>år§âãž$ęíUŽ6zJb
+k#„HxĩNú‡|=	WJ•hÁŋ%ŒHá•>tĘį\…ãR6ļˆĘU\úģ1‹1
m
+ŽĸAĩ1/)´
Ĩrƒæ÷˛IX@<™0‚hh3ķq\4ĄŲJ&e:ĮŅŊ85›áņ+úK¨ĮŸûcĶ;á§:§;&˜ãé$ŠL×É`W^˛V`„@n,‡â¯.šĐ|`ĢߓôŸ‰ ũü“T™U#ĢŪ/aPC͛?ŽĒũæ
+HĄæåTšŌwē˜ä4Ä[
+ fÍB˙ãØ6ˇAKÎ&ū'Ņ­Û‚(ĪSĩáVŌÆ(0<6Ųôß~åĀ‰˛VĸCŽ‚„p\™÷Ŧ'Tuu}ĸLâdŠ`Í$ËķmĶÜP	â€Âhl‘tœ–-g+ˇžíQKrH9˙,¤ã%ŃoU*{wŽkU¯l
+eœ'âí'"\7>ēāhY~T‚QÂDMÆŅJoŌãŒ\õ:|EŸ+ŦdūĖ–M…ąÆœļ܁žņŒQã0w{,!Ú¨"‚VpÚķ^4-‹ĸÆkEȧÃP‚ŦŊiŠhâėĢpI\(.4oÄ
7b“‚ÕÁÍÁ‰e]÷^T
|•y—í
Ęuâ­×ܟâX"MĨĨrLI1.g6uÃ\]B<’_¨ũĘ Ü
ė3ŽĖúY—ŠČŲÆv{ÄÅWģė¤c_˛LDFSjđ.qúÔ<u۟ŧpá§Ķã/ā¸_}EŅÖbˇyŪīđ‘ŪB04ą“EėßFXûŽ¤*{7â>ŧdYæ•B.âCįœë‘Āî9|"×M懭_‡ˇ2č,s!ņÕȜ)qÄ#ā‹ŧOŦ´c“Í›~D?”Ū&c–ķĖ{ŠcÕÛN¯6×™E$ ė)'‚ט)Z1Q*õ>ōÄķ\5œm8lŠß’SN2	’¯ž\ė!Ÿ06øũH–„¤E6}šŌđ€8âß­‰”đvZŒ’ũĸEƒû“$v	ÁЉ"1ČŽeÆŽT‹xąogūļØmīK4Ũ€
+L¨Ą¨˙í	@M‰XáB3ëM뎯Rt›é\
pˆ4˜cô×_ËC‘@f@=įā§ŧV‡ā…"zoâxA_)’œ{DûŧįˇŠH‚Ļ@’Ļc úĐĸû7×˙EœaȒøŅjlxūĩ•Ę*-É'+R
0ģōdĒö×ļ€–âⷜ\ŅĮCF~šD1›…guôb*)ŋWĪ–D˜iņėH54!&~™6ņéÍ@@ú\xė+ŠMĒ˜ŸÄ2܍H¯?÷đdŊœzz9ŌČVeš †(úF'K$ũqW÷ęŋGŋÚ|ߛPĘ}Vʘ‡yĐW´—ˇėM‰ Šøã=
˜6Žg)”„2MĒÜ˙q†`Į™:ą@Ķ— 4‘ņՀZŸúņú1øxČÔÃŦŽMø×7ŅچČČhGģüüËA—˜¨1ēęŲŊ~Q™¤ß˜Ú´=@rĒÄ9Ļ"zĐđŒ5Nˆ5FY	÷6Q“W¯J(˜§čtÖČ6hZ]\šRĨ`LüšÕ9|$Nå|?'Ų#Ķü˛Č6§ĶF>ƒëéZíÜ>ãĻ‹`{đgį$U%ÆÖ?ų
+=å4§ŠKiųAâĀ-°{F
+]Ē*:yÉHh~kĸŋ#3
’Ę÷ÕÜUŽ|ˇ‚‘$ē{E]%MÖFų(¸úã{œFhĨėÛųŗšlĸũZæļČDn
îÄjw›ēŒÆčÁ§ƒäėŖ<9V˛ÃqárāĻÂmņx ą>ûQœÉ{Ņ‰WÂnä@7ē¨ÉJĻŗácČq5PP4õ˜NzvÍĒŸ:bFV„ĮØ9ÂąŽ‚ŧ č-TĢēx”0čÁ@]ŖũėBG„ÕėŅ6bŠŨæūVã‚
+Gļ×ĨBí­#)—Q]Q]’)ß@2Ņ„0.ĖŊ4Cär+í:ØķéĻTĸëį•Ģ†ōÚZ$æbXVéRĻIî¤xÆÕÁ•°r52ôVüˆgvqhåœČŦ%rŗš–8APe1¸KŅĢ™GâÕhMâF!!ņ͇œI>Ūdߤ/pŠá¨ëī8Š˜ éžĄhčiÉ]vIW(™G0ltÄöz3ŋ`ŧ¸éā(fāEŗųÚ„ģy
3bŋdė3
đ“RŽ€ `ĸËx( Y<æ¨’!Éīęg*\ŧ¤a,ĘŲ
ôR
Ņø—į3|&iR@Ņ¨vM
ÁŸhß@†ø™8Ŗėđ	
áCĀ0‘˜•˜ļÛŖA_ÔR>C´G{™ĖzT6–Raŗ=ĸvL둏 ī F˛L¤¨Ģûvŗé.zų,šJčŧ5æ÷Ļ xÆ4Ú
XCÜæn°;f0dĄô“}ŨÉGä@gÃt”Øã(:ÃP1|':[ü›J  ŅUōŧYũ˜*>ą—Ō¸6œāīZ3PšÆķI•F6QōĄīB<Ũđ‰QËæņk$ֆ/0Hë1õ”@•¨ŗŦîRĀ˜Û×* ¸á,ŋ4ėbœŖÆN—ųŠƒÃ*ˆīėUî^BŪūJ$#k;‚¨ģČō”YCų_ë_˛QÛ˙īÉ8ĖąZŸĪNļ›Ōk*<…•.‚ųØ ŗc‰…Ē"ãąQ¯ꨊFžŠĸz&mæjxHbY¨¤M‘eĸjÚZQõ‡6Ö[]'Éĸq[
UJˆŊzÄīs-ĀŪG´*Jk܃ĩQĒBĘIíA <X9ĮÄ#wdT͑é-ą›&ŦB3ĄR/m†põ7ŋļü‡"ŗëÂ=ÎQŨą9ûOž;ÎP
+r?^Sšak/ô%öÆ2ŅXˆ‡v1:Ų’qL…yĖÖ&PJ—ĐÆā&Šü
+|͚•6
+´šÖ*‚‰˜’ŒŽÄuŽ‚	CøĒC*|×#ūđÍøĐŝē<4m™a ¸ęšĖÛ:T;VāĐ>ĨØ†•Ļ+Đ&F*°“ēƒŸĮ‘Ę­?`Ŧ„SÉæ0‡Îī@&rRM$ė5ûĖúڞ5ŖYļZŗÆE͸čēNžz:<Reʧš&Œ¯@ĘpíƒjŲvpž2ęÂŨMT
dyˆ¯Tg˙<?+]ã‘ŋfķir˛Øc;{æųĀtŠĐÕpģT—XĀ—šŖNx¨|Öŗ‹
ąšÛ‹ē>´Š
+yīL@ö7Ėđ€FgeVMláãëÃápaÔĮ-!Å°ŪöhßãKąLwpė#îķBč`Ė´Å‰;˜ŌKN|ÔB>šČŨõ@RM˜5œ•Ũ,(ēŗœęWâ¸pŅ#Ī!&äīd
ĀĮqFxtö.V‡…ĸ‘ŋļšDhĸÃÖ)uāĻëh
@+.“v”ŗßTö˛@tļhâĻ
+ĐQ…ÜĘL?áÃ/‹]CōpĨO˛ƒ6§ßŸú˜ƒä~ęÍ&+lō'ņŅûDŗYdÅ(ô5/ÂíeM@IŊ,ĢčPG×>ĮD
+)EjD˜Č‰PbĐÆEô…×Ũ$'rģZÍ]DĻMHeKÕ'’1l/æĒx_Æe]É>šCú<䯊ëbs3=¤Rä)
9ԒĘ;ŦõôVb€‡0–áxeđPfüOx¨f
Ķ:ÂCö“9î”Ú‘Y}đ_N€x"[Ņ ÷‹CęņPcš“ˇzOëašktŠ
ãhßÂą{‚+8:Ĩd‘8[Ä_Zva‹]uxfŲ™Œ
bĢaaGÂûûe HĒ…܈J˙šĘ´?ô¨ôuĢ'OĄa"Įš@DãčÕČ3×ËÎöŪģœŋn|,jo1&G,EMwįNę?Įn‡Éq ĖĮ2‹ÔåŠÔ—bîŲEIaõÃČÖašōŽĪt4/LōČnßüZo—õWX˜-x‚ŧ'â7ę+2;ūW)Ķi
+œlB?%Ą­¨ŧŦ
+Ø,jŦ­‚Åv€˜­R˛Uŗ
))ģŒ(h-ūšĩœŧđÖNw˛4ōXÁŲ‰-‡ųcœä XI‚Ë,U…
NĒāđˆ‚ũ
+Ō˙.Š”  Ô%_|ĄtÃ`įjöšQržķ$šßxsyŒ9Zõ)TW´Øxŧ3ÖfZÆ<!mtKáŦ
ˇ%IĶJäRM$Æŧk“ŧš‚;ūĄŽ܀‡kcûŸĀ8´
Ÿēƒí”eĢĀí°š’ãņÆŦ"K˛FCūOŲ^Ė/9!a’øMi’Aî5Õƈ0)ŲŽ
+áĢæ1˛"įˇ0kC„ĐW<€ÜœÔ˙ˆg/NÍMZ…ĘܑR˛9<:_ät‹&H:Ķļ¨!+ēÅU1ųO…úMVsŌŨ×YÁļví˙ÕJ&H“wļ,ĢÁi&Č/jĖdJųUȝĮ-ëõiĄ™[ƒęjĨTՂĮ’r'
tÉĀŠô˙gąÕ\žģDķZtČ ĸįYī‹°įßĖw9ęÔŽÚ1û}ū_mL4HŗygŖ~l†wrĸž76X…5•*ē…Ud/\¤jqæ—æŽéŪmĨürwģļŅĢ77\˛*­ŗP(}oÜt}8ŒÄEN[ÎQ”.,%s0aû_âëT˙薔´Ÿ0’hŋO:CÔiܘFģ:#4œŌ~ÆŌ=ŅRZ`ũq(ÕÂĸcĘ9žHH­ÆĀŌËŌ ‹×L2ÂRē§ŋŧwn~QøNq&(‚‰‹ƒ øKũ=ņ‚Kž‡r
á°?{5),S.öŽ=†‘5 îˇ6žŌļø¨„KĻ…˜}
+
CÍâˇˆā›ƒÚz"O~…š7aZ@¸•7Ļ“˙ ú:øéėô Ģ&LĨ„JMĐ?WjU°)b~P‘‰A$t˜4kI MÉzŠŽ&)ëčÂ9ģŠŗSŅœĄīn{ėdg:+ęü`ÆÜDŗË(Ę"}[ņĪēuŽ´‘kįŋ“Ĩ$ļŠHˈĒ\€y)•Dmô;^õ6,ˆÂqøæEL‘¸ŧŅ¸āīöĢCbO…œ˙ø„ãž~䯠s?ÕŦ[JU˜W­Wíp@€„ī“ģ9Ėíwę’RqíŧļãÄB~ەQĪŖ˛Â7¤ũ$/ĒöŠŨ ×`ØđēXÛēË9Ôy,ãę§1žR'‰œę
”Û
ĸ_lI|¯ž(X#ŊbnŖAņŠ'ü‡đ–ĒĖmžš1—îBŪņĖŗ sˆŠĖ}q2c­Z\Xņƙ'Ā/čQfĪW“!ÎŪ–N˜‡˜’âi†	89ĘXšĸ;8×ۈŪLܜqV†¸A§Ø-2Ā T‘24N]6ąäteķ™˛5ŪåĢīA&QÖ˛ÖI›ä“ļâ€øUq›`´mMœžQFÚöšjæĀĸ§­f[VĨ6äÖ¤x×L[æ æ]š7ėzīŗ­ä82%Ŋ‰(€~?˙2•L¤k/%ā“swŽ‘Ąŋ‚el?Ã_ßÔŋŸøūg€õįB¨ˆuŒąE,8˙—"Ѓ^SˇÄåĩččßTHߨĮ*_ZĮ}šUN.`Hļ…!›G	.,ôƒzj=9
¤˙ØЂjúz˙äükJ*O›\3wl5ZųūŊļŽEbcâĶœč€ąD`j´÷
+û	ęôUū|´‡đ›tÁąZĩ>0Î˙cIĶŖY
ëĀ!-émHBČÆwB÷7ĨŅg[?~)†ĩī[w§šå?`-ž›.i"§lĖ‡ŨâîēAÖ1Žņ⸂ûKŽ';
+ûe‡]—•ŦIh;œ€ËˇK‰„DĒ…}ZúâtÎČ4L=šĒę|<5ŗæƒ^[Ž˛“`ÜØÕÕŋúËKJ\’A]6Ŗ=1•;×čĖi™,(™
‰ŪûĄ´OHHŒ§#åäŋô!qžYa=ŧâŖCĮI˙­]†\)i:áķ$…ęä“B+X‹G0´7´Āy#”@\	Ö
Jt˜
ČáË
Ļ¸Õį„!d¯ÜÍ\˜a@aŠ+„ļdĄáöåB
é5@t^ŧRC00ÖŪÂæGōw$9ÁLķ^9ú@ŠáHūVšČ:.¸	2{ĩéÃå;Ž>ĸîvŖ—îL0@WøŖ
D}Ö6SčoDu›8ŋlV퉱nČ!O¨Ā’ū>'å~LūäJ…F”6’„¯#Ī$Žë>Ž4ļúŗŖZ"Ę4rÜP“o˙¤f1Čf¨cNa+đCŅa4>”`›?ärFR§Ņ‰Õ 3úģ…âđ7HėxÛë~]Ėi1&ö…ŸX[=+ä9—ۘ—d„jœEob##h”Ą\ŋgéAû
­b)ø´¯Ļ>ŲąĄ?~5ÅÆƓ0)yĐáeoŒCJ[ĩ…^¯ZŠ‚&6šŧŠ+}u+b>÷—˜Đûb‰Ÿ¨›Į™[˙HM¨ŪūWæōå´Ė‹ÕôŽÕīŖШ‘%ĶŸoādŒŦų­LäNŒqr––uĢ˛ôœÉæ˛	ØXTGÅo°eՁeV4ÖģZ`™…^85ŗĩwû¸™ViÁ˜ÔúĒ#ea-Đ!´Ģ”_@č¤@
w°“T\%gPl¸ô#ŦËá° ˙ö˛Bš‚+ƒjFvŊ>VZp|Ķüõũ¸Ē̓Ŗč­Āuôˆ/‚Ņ¯#€1äâcƒ›Nāå\ûOe÷/~P’đE“ŌŗΐZ°4Ļ“ÆŠŦYå[´Ž*,īÉž¯#ŗGnYhõ$`JkõËßĨ……ë˜ĒØX <úŊÍ}–¯ēĒRŪƍ/[ēŦ§Ž	 ŋÚČą¸ŊĒ)ŽÁ˙[Š	úˆeq/˛Y,ŽĨ%˛Ė!áä÷ĐĀx}gúPą¨`‡ü j‹›ĶËį+Í}Íc•`ØíkžU¯ėĸÕQ&âŊ"”g
+wÕîa™Z€$üYldŦ‚kekáÄöŪ>~
đ”ę[>Ž!&G+ūŊėėŊ‰wg:.ˇÜ‡{”Oã°id4˙ÆÜ!ųd[(aü+p2MâüđƔ˜ÃĒ:°ŧŋ(?ĀŽądØŒ?ĸ!)o:Äņ‡DK…iPÅ%ŽągEfsķ9Ėá)ũ°7ņ‡YųŒß{Üî'Ēvõnô.<ŗ*Ŧ•Uâų>CiWDš-ŋ
C†ĩŠ'z-âa>‹{čg–ī’?æLŌL¸å1`ÄpŽĄrČū'Õâ‰ĢŠÉËM›āo
ųĩ)	ZÅWņ4Í}{`D<Ą^šÕ°ÃüE’€īˇĩ*XCßC†ČÄjƒü¤¸­017ņoŧJŋ~
+Ą2rŪ˛ē‚×g25xK@!â+ŋ2ŪēåŠ}ØÅëķ5üŪ%áAÕÎ!ķ,§î§möOÆ­îÛ2ēÅ
+~˛wyk…/ąípāŧV€)˜(÷Âˉ˜d͘ĀŠå{ĩ`J”ĄŽĐ§5=:z”YËĐFÆ@\‹Ü¤– “SZ×h‰Š	E×n û͛ÃņYTˆ>Pšb’9ÂÄŌˆH­4Ú÷ŅŪX~vD_'­‹Ų•8Q—Ā?_4ŧÖ¨Ŋ#öÃą°Ō”Ŋ­Ę
+­2čyFõŠÃÖp7O~:ČĮtĖ僅ÄāO&†L5ą{$aOĖhØI"$ˆĪŦv‹!}ūãL™÷ÍÕsƌŽGwŜ“ÜerÖCŦķ°âūūU=æĄ*ēũę ų;Ā/Š‡ÉļO"ŖØˇÎ˙gļ¨ņD=ķ=’ũ$nüuSéĒXīJ'°
+cÅÜɍ'}†x€œmŅã‰%Ĩ§ûûGéß˙h4žB¸
0îõx’ũŌ_ūņ4X‚%ú+2I“ŗ,ģĄ/ɯ^Ā]4ĸÉfj;IâbJč”sĘ XŦ`+*‘P„O5Hę3š7+"šIK‹7œtp{]!ļBčw—M3cŋ)Âi€§Ŋü?ĸ­ÁķĩŊײ Š`ė’¸LĐûŗéw†ĩ=Ÿũ=ö”4ČŒņĩræ2‡K—Ã45ÛƒÖŃ(sØ65@y9ĘjŌ%ęęLÆŽ˙ĢĀũVŸē`l­":ÃmĨ¤éš`,÷ä
:žÍL÷ĨÜOī%7\jáH˛ûĻ¤kyp))“k D¤)Ø%tŖf4˛>*už'¨žĮ?¨YÜ\’rģîvIö>ęõ–ZøøĀ™åˇŪ/EyQ¸aږk
+„ž÷™ūBžxÎZÛ8Ēč5÷`)ŠË0זį¨&h~aũO)o­Č?É˃øū}˜í•tÁ•BQB`ĩWŊō.ˆOšļžzßÃÎ*ŗ¨ā€;n<>ļĩŗ(<{6ÖĸL›CU.:Uô’ ^í1w†
ņŽ@^6GēŅ?Fy:&ŽāÆ~^Ä+(îÔĪoEsũÆûŗ”
yĶ_O“ÅŌr>ÁĶHĘô+ˆŠŦNŠ=Š0Īütr‘ĐōītÔÉŊ¤Hí”ãjÅĮŊmŌ˙_‰CŖʜ”˛4;
+rJ
ûc*ŗ(°áüPIĀ^PhĘ*´ÖQŒĀQŠR:ųûë8­(ÅR{r ›˙e„š/õA?ŅōÆš/¯šē9bū—qH	ä=ÜÆĀXŠ’Iz/ü\§10@møĸĨ°ûĨWĒã
ĢîåRN¤=Ãe j€Šķd8#ĮØ!ŠÖŋũ@¸};
+Ž!0šŲéi‰NiŸƒė´ˇ]7æE€ļūĨÆXˆÚĩą3,ŖŲĩ/s¸ŗ§
JmĀ|ŒŽ›J§ĖMéˇĩ…ßAÆá;ĸ¤šIŌ3˙W.ƒFö„1ŒĻcn’ŗ~É]@Ģ17ívp†#į!ø7~T`m:­qüŋ]bMnĒ˙›™›Ę™6˙ÚJ˙zcw×ŌonĒęgHøwÚ
	­’@Xũë/ĨR‹ą?g)
+ŠūĩŪÎ5eT˙˛īĢ(5"ü[Ū}ŸūÕ9ߎø×
õŋûôīoÍđĀŋ/:8𚀧6¯Ī¤Ōč_Ĩ+íP‰§cõ~ˇYä†ã_WŅ*äāę_¨nZī”áß%ļSbmÚ˙šV´lÕWI HoX•úwĒ,ƒŠ“¯\ÛH¸āB”éĖ€×œ#ėXŒWđUSXJGĶiŽúĀcŧmŅĮĀÔ8Ÿ-„§ˆ{XQb›Ō:IŸ‚
+¸’"’õ>öĩÍ­ĻE$hŲ2š`ĘņĘTŖEĖī…ød˛äÜÂ!v´hü¤ųåGÜq”E9%!k™‹`č/Šķīƒøb€2vĩŌ	ĮĮhõd^!iX˙:U&ŒUŌ;#Š¯Ÿ#Й}3ōxŸVė*lÎ+RæX_z&ØĻĘé"?Öh9;¨į!kŖáĄ5č!’į	5ŧ?—umvŲîëūö'_×=(ŖžE°ĶlÚ3M„åÉŠ°b%[ö÷"Į4ŋ‡;Rsƒ‰JËN0QæņĘđ]{îžH”ŽųĐ&ęØڑũ ;5`Đ˙/ę;
=åt&ásŠg†đtØŅ10ŖˆA’ä÷âÄčaœņÄՔJ	
L[#ŋė]ã°OFŅfÆP°jʐ5ū…cÃL ?ô|Ji‡Ī
´ XB`'w™
+V–…=EˆúŨ€ŠiDęͨwËčÕē$6#rMF˜9äøÄy•zĪŠˆü—9Z¨W5‰)^3ˆūĄ^éĐR´Q/,õ:Iė
Y8SZŪ„=ÔûiN#…‚…gbeŽ(Ô{ÕËĶˆV2nŸjS#lLSQ†tÄmėí[A+]dôÕĮâķNĩžŠâܲ Öž×8›2Æôė!\­čEúlØŅ™+ûĘN0~P-—…JË^Ķ1ĩZZ-Sán $•Äâ™p߈jëšŨ[hĐqûøVÔĄ_˜íÕ3 B”ÕØ
ĩGķģ"iËT™ėg?X֋MKÂ1üē'w€b˛€ęZ
ŋ@Eą ÉRJR(6^Úė@ˆŸP_æė͔7—ˆ!I(îČEƘnôÄ\Ņ=čÅ2Ū{cˆ,Å1šŊūģã´ąĨå؇ÂËÄąđēÂKš)Š1	’	Ē9Ņ}Ĩęôéå.UXũäŖ“w!^xkËd	āü{yÔđÎrė(Š2¤›Rĩ„ėķ­éũ ā|rü—D
<KŖwį˙€ũ…Ą%Ä{ž˙8ßm!ĮÎĖŠĒWŦ^š˛l…ĮĻ/U¯“ģbų’ēŽŪt)ŒĮsyâBÅáëqõĻq1ÆŨ؇ŽzķۏW/%ĄåģÅûŽzõĨ:ŋex¨ŌU¯xäę…IhĢŽ¨ĩbŠ++đc—Ī0~õĘõ™l¨z?ŽãŗēÍī5rԘ"9ëú)ŧû€ĢŪ
ģŗë.
ļ1ČŪÕz*›aã1ī8ŧŲņĮÍ
×ÃHõšŠŧ1-MNËžk3´p.*¨Æ/ô”„8īO IMöBAāQÖÔ/‚hgš~Rļ› ÁßÄ[ËvéVP–]ŋdtaՄbŲŖaBqĨ)V¤ī]D ė8ØĶ9C\•nôŸmaxąg`ä¯*bqąø6dą0æŧĒĮZ/jųÄ=ø?ÉßՐš‘}:Ôôî}\;yOöÂŪœj,×Ã\3cLô‚ņ5æwžbFÉmģüų¸ŖVˆB9îâP*h—’Uw˛< :áÅĀúqUÔ,Y*†ū¨Č[†Đ%ž|¯'0ãōÍpĀā`s}Ŋļƒģ
+KMۋą°öš9¤Ā›+P‰ë9Ŧ“;„
2‡kųVUŋrbV“éņĩ\+?ĩē›ēÆŌöláø$*æÁąl9q†žˆˆERËT~7´Ađ˜ĐDR°‹Ä KŽZKöIą+Âų%ĩHŊâÃäŧģˇcE°×dËĄ ‚Ŋ­Ā	‚nŠ‚ö¯vŋģxØZ
GB'^ĐūūrHČpÖqO)ßՋ‹ŠüR‘Uiũx}īŽōášxĪėÖWŋæYfŅž 1Z#øŅh}ÜéywO´Ž“Yīnü”ØBŒwķąŨŧģiĀÁr'ŽwyÖ{h¨‡šˆw—Ō9tĪčS^Ŧ5T*ß]¤e
ô#k~ōōw÷¸Zų0ÆģZCæAš÷ˇ.6éžŨ•ƒģ)ÕTиD8š;ņ<īEÕŗŊ-”•Œ}EfhēyMAˇĢPJ‰ŽŸ.ŦúšWŖĀ§3'ܸ5PwŠ¨Ė!‰u.֛’@Ú7­KÍō4=7=M2‰™VqQ2Sē}6šüû
ÎŧŲ–ĨÆũô°>ņâĶlŠĨ<HöŅŠä6´<ĨgBn“ÄōqÕ`c—†˜ĩŋYkÜ&¸N›Ō}%zŒ÷28ĩ34ÚÉiāKqļœs ĨcG˙J9īĘž>q!z– ƒ‚m“°†§)ü>MQˆm>†B
+ŋĸ—j.7lŒą5lŨxëu%Y?Īs}՘îw×Ĩôđ…PUxũQą­9ÎēAihūŠ(K_Ä
āēģewvžā
ĻgU@ĢbĻĖvŪ5SųŦcÕúŌ˜Ūŋ,’#Ũ>šg*Š“sĻãk›Ā8Íī5ą°č_—Ŗp”f.īÂÅú„¸¤e™—‹ā9Ŋ’ŌÎÄåPÔʲŸGöģŽrŪģ	Š7ŗžzGkĄŪė–zįRZāÉĘÜûĐæ‰JiÛ
Æ×ēüŦHÉāŊ?ėB<	™žŖå]8ƒ]t哋D'~ŊŽ´ĢéŨĪäąģŨ j+ėqváŒŧ÷
+`%Õü†ä'MÃZød`IĀpč
6Õ,pAOx…ƒŧ¸
~ufŒ;ņ9pĀ]{?õæĄŊ6?>ËQ›Ūš0‚Ö.ī›î 	f1ƒė*N]u fīŌ“ŠĶ;æ&­=ŠP¨"0ĘîĘŦ‚cmØĨŽ´Ôz_[nÁuĻe!nâ>˙›lFEöH0JÚ˙Š‘ ¨EÂn“×"CųɀRĀ_î°dsĻ‡ũ+`ūT|û÷=Ą'‡ŨOQ-
+y†2°(Ą‘čŅ…+BŸĄø+\™ĘŅĸõÎRÔgĖ/ čdÉؗp<ĢÕāY•¨ŅŅmö>—AˆŖÛēžLKyŅ
‡1mbĨŽZįč"q5#bãčFܤPt_Ū÷'–¯žaÃYŗ­+.,č˜éŠ¯ŽĨÕAėŊŊÎÔ@÷/åbŎøɤâÔy—IxÃ4NZ؇æé°­XčȜŠ	:rÉÂÛE1_ŗF"ˆâ Šû¯ĸ§WWėžōûĖčaāˆĸf‰â֝Ĩ¤cŪĒU"?‡z1ŋqŨHg›RŒš‰}įe¤)ÆūPĶķ  ā^čÅ
ē°´:X	ÛK2éZ0ô>e6Á•ÂÆÃ+ŌS€8;ŧų0éĻü~%tČ‹—"V
+ž"X¯GŽ_Â'Ė
fŒKŽÂŽEnOĻļĻäU˙ÖĪEÔösLĀŒģŧ'Čԥ̓
ŋ-1ŊŖH;ÍĪčē4 í¸Č
Ųëî–Mü†8APåģ âA­ßüųĨŅM•+ŦÁ
ät—ĨU$Qšī/đ"eV‹ã-Ļœô¸	í„	ZârDC?FöÆÃuQ9fî˙ū dÆîôŒŒUŨ“žģ<į`5ÎKƒ"õYÁäůÎDâũ&„úĻ›ßlzĨ‹	Ĩ“ĶķkPĀ9eēÖĪeրĪtŸÁo$ ~ XL:z†ÉtUŊD6ûö×L—&(åöŋoĨ[´G¤0]:ŦÜĻ/
+ŌUĪÁąc‡¨…ƒŌÅQ`ēī
āhį׸ŌÂLŠßt…•#/ãŽč&ēAčŗƒP6NÛv‰X	h§ŦĄAô	]M/Ŧ]1€÷ßŌšŧŋ2΂ÄĢ+æúm![Ŗ2ŌŦqĩĪøļĘČõßbã'‘:#u;4˜Ę˜‰Č5Y†]ød”WnuSÉ*EŲq˛)÷ĩ’*ģéŋŠ–§2ļ´ÃLĪTÂ_ fĘĀÔŊÔ˛ēģ8<Ĩ9D\+XËØÜ8ļĪļĮJn‡|ô]<ąX@L`—Y—fz
<õM_ķ&Y%Xpë:P¸#áū’ÚÁWāš#îœKĻP‹=næ
´é~äĀįy=¨‰“'‰?iĨ†â8Wíŋ–qršž/|ˇČš-"ãtôãęˆ×€AŖĨÂíÂöī—ŨlËĐNäģ˜ŒÜûg×úJ^ØzúŲdVėtÅk{ÚIË,š ’~k
ʑSÚĪ:™}3„Ķ~ddĻäs
ûÚcP]3ųrsÄĢ z˛,%pur3Ôi)Ty—%Í}ėīpB!XúK§­ŗĮˉT,ŌģH°Ÿķ>Áq
ŽŗÁ&š_߉C'ĒĻĩ1ËōŸĶ”„ZMen˙×ŌãžBČ1Ņ vžę‚<•đ¸ÅŽ ęK1īÍÜwyī}uE9>TBAú.ņ%ÝÅ^üB}*ęĖĻ%ÎųŲ1ž˙’LąŠÕâĘiõĪ
cĀŅ‹ĩ';.ž(s;ĻP_ÕĢđĢīĘk‡ôF'>{xņ]Ę&nč¤#Ŗ‰äá	.û¸FsA3ÔIa" ÷x7íõNš>€ņŽũsv}žÆÍ'ģč>cY§âŧĖ>ŲŒ7Î.ĨSIČ…ē¨?ĨãÅ—€]ôö›á$l‚Û`-~{	yē
endstream
endobj
27 0 obj
[25 0 R 26 0 R]
endobj
48 0 obj
<</CreationDate(D:20211108150032-05'00')/Creator(Adobe Illustrator 26.0 \(Macintosh\))/CreatorVersion(21.0.0)/ModDate(D:20211108150032-05'00')/Producer(Adobe PDF library 16.03)/Title(DVN Schematic Diagram)>>
endobj
xref
+0 49
+0000000004 65535 f
+0000000016 00000 n
+0000000166 00000 n
+0000045580 00000 n
+0000000000 00000 f
+0000045631 00000 n
+0000000000 00000 f
+0000068002 00000 n
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000068075 00000 n
+0000068271 00000 n
+0000069799 00000 n
+0000135387 00000 n
+0000200975 00000 n
+0000000000 00000 f
+0000050069 00000 n
+0000050579 00000 n
+0000050775 00000 n
+0000049765 00000 n
+0000049694 00000 n
+0000242839 00000 n
+0000046102 00000 n
+0000065319 00000 n
+0000065206 00000 n
+0000047922 00000 n
+0000049133 00000 n
+0000049181 00000 n
+0000049953 00000 n
+0000049984 00000 n
+0000049837 00000 n
+0000049868 00000 n
+0000057145 00000 n
+0000057542 00000 n
+0000054795 00000 n
+0000054956 00000 n
+0000050999 00000 n
+0000051223 00000 n
+0000051659 00000 n
+0000055329 00000 n
+0000058142 00000 n
+0000065354 00000 n
+0000242871 00000 n
+trailer
<</Size 49/Root 1 0 R/Info 48 0 R/ID[<DD1F87D94A7A4B05BCA31ED6E573F9E9><A66D36C5EC8B469B9BBC8F182941BEBD>]>>
startxref
243095
%%EOF
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/user/img/Dataverse-Diagram.png b/doc/sphinx-guides/source/user/img/Dataverse-Diagram.png
old mode 100755
new mode 100644
index 77c12c7ce44..e8ebca4f475
Binary files a/doc/sphinx-guides/source/user/img/Dataverse-Diagram.png and b/doc/sphinx-guides/source/user/img/Dataverse-Diagram.png differ
diff --git a/doc/sphinx-guides/source/user/img/Dataverses-Datasets.png b/doc/sphinx-guides/source/user/img/Dataverses-Datasets.png
deleted file mode 100755
index 68044bc03e1..00000000000
Binary files a/doc/sphinx-guides/source/user/img/Dataverses-Datasets.png and /dev/null differ
diff --git a/doc/sphinx-guides/source/user/img/bagit-handler-errors.png b/doc/sphinx-guides/source/user/img/bagit-handler-errors.png
new file mode 100644
index 00000000000..d4059ca53c9
Binary files /dev/null and b/doc/sphinx-guides/source/user/img/bagit-handler-errors.png differ
diff --git a/doc/sphinx-guides/source/user/img/computational-workflow-diagram.png b/doc/sphinx-guides/source/user/img/computational-workflow-diagram.png
new file mode 100644
index 00000000000..efb073737dd
Binary files /dev/null and b/doc/sphinx-guides/source/user/img/computational-workflow-diagram.png differ
diff --git a/doc/sphinx-guides/source/user/img/computational-workflow-facets.png b/doc/sphinx-guides/source/user/img/computational-workflow-facets.png
new file mode 100644
index 00000000000..c790e1d5ffb
Binary files /dev/null and b/doc/sphinx-guides/source/user/img/computational-workflow-facets.png differ
diff --git a/doc/sphinx-guides/source/user/img/computational-workflow-metadata.png b/doc/sphinx-guides/source/user/img/computational-workflow-metadata.png
new file mode 100644
index 00000000000..2c477e75b1e
Binary files /dev/null and b/doc/sphinx-guides/source/user/img/computational-workflow-metadata.png differ
diff --git a/doc/sphinx-guides/source/user/img/file-tags-facets.png b/doc/sphinx-guides/source/user/img/file-tags-facets.png
new file mode 100644
index 00000000000..ce2a9bd72a8
Binary files /dev/null and b/doc/sphinx-guides/source/user/img/file-tags-facets.png differ
diff --git a/doc/sphinx-guides/source/user/img/file-tags-link.png b/doc/sphinx-guides/source/user/img/file-tags-link.png
new file mode 100644
index 00000000000..c0496a4e1ba
Binary files /dev/null and b/doc/sphinx-guides/source/user/img/file-tags-link.png differ
diff --git a/doc/sphinx-guides/source/user/img/file-tags-options.png b/doc/sphinx-guides/source/user/img/file-tags-options.png
new file mode 100644
index 00000000000..4af196c690e
Binary files /dev/null and b/doc/sphinx-guides/source/user/img/file-tags-options.png differ
diff --git a/doc/sphinx-guides/source/user/img/h5web.png b/doc/sphinx-guides/source/user/img/h5web.png
new file mode 100644
index 00000000000..176aa775114
Binary files /dev/null and b/doc/sphinx-guides/source/user/img/h5web.png differ
diff --git a/doc/sphinx-guides/source/user/index.rst b/doc/sphinx-guides/source/user/index.rst
index 05973e6fac9..cd6ccdbd421 100755
--- a/doc/sphinx-guides/source/user/index.rst
+++ b/doc/sphinx-guides/source/user/index.rst
@@ -9,11 +9,11 @@ User Guide
 **Contents:**
 
 .. toctree::
+   :maxdepth: 2
 
    account
    find-use-data
    dataverse-management
    dataset-management
    tabulardataingest/index
-   data-exploration/index
    appendix
diff --git a/doc/sphinx-guides/source/user/tabulardataingest/csv tsv.rst b/doc/sphinx-guides/source/user/tabulardataingest/csv tsv.rst
deleted file mode 100644
index 90d7e17ae98..00000000000
--- a/doc/sphinx-guides/source/user/tabulardataingest/csv tsv.rst	
+++ /dev/null
@@ -1,81 +0,0 @@
-CSV/TSV
-++++++++
-
-.. contents:: |toctitle|
-	:local:
-
-Ingest of Comma-Separated Values and Tab-Separated Values files as tabular data. 
---------------------------------------------------------------------------------
-
-Dataverse will make an attempt to turn CSV and TSV files uploaded by the user into tabular data, using the `Apache CSV parser <https://commons.apache.org/proper/commons-csv/>`_. 
-
-Main formatting requirements
------------------------------
-
-The first row in the document will be treated as the CSV's header, containing variable names for each column.
-
-Each following row must contain the same number of comma-separated values ("cells") as that header.
-
-As of the Dataverse 4.8 release, we allow ingest of CSV files with commas and line breaks within cells. A string with any number of commas and line breaks enclosed within double quotes is recognized as a single cell. Double quotes can be encoded as two double quotes in a row (``""``). 
-
-For example, the following lines:
-
-.. code-block:: none
-
-    a,b,"c,d
-    efgh""ijk""l",m,n
-
-are recognized as a **single** row with **5** comma-separated values (cells):
-
-.. code-block:: none
-
-    a
-    b 
-    c,d\nefgh"ijk"l
-    m
-    n 
-
-(where ``\n`` is a new line character)
-
-
-Limitations
-------------
-
-Compared to other formats, relatively little information about the data ("variable-level metadata") can be extracted from a CSV file. Aside from the variable names supplied in the top line, the ingest will make an educated guess about the data type of each comma-separated column. One of the supported rich file formats (Stata, SPSS and R) should be used if you need to provide more descriptive variable-level metadata (variable labels, categorical values and labels, explicitly defined data types, etc.). 
-
-Recognized data types and formatting
--------------------------------------
-
-The application will attempt to recognize numeric, string, and date/time values in the individual columns.
-
-
-For dates, the ``yyyy-MM-dd`` format is recognized. 
-
-For date-time values, the following 2 formats are recognized: 
-
-``yyyy-MM-dd HH:mm:ss``
-
-``yyyy-MM-dd HH:mm:ss z`` (same format as the above, with the time zone specified)
-
-For numeric variables, the following special values are recognized:
-
-``inf``, ``+inf`` - as a special IEEE 754 "positive infinity" value;
-
-``NaN`` - as a special IEEE 754 "not a number" value; 
-
-An empty value (i.e., a comma followed immediately by another comma, or the line end), or ``NA`` - as a *missing value*.
-
-``null`` - as a numeric *zero*. 
-
-(any combinations of lower and upper cases are allowed in the notations above). 
-
-In character strings, an empty value (a comma followed by another comma, or the line end) is treated as an empty string (NOT as a *missing value*). 
-
-Any non-Latin characters are allowed in character string values, **as long as the encoding is UTF8**. 
-
-
-**Note:** When the ingest recognizes a CSV or TSV column as a numeric vector, or as a date/time value, this information is reflected and saved in the database as the *data variable metadata*. To inspect that metadata, click on the *Download* button next to a tabular data file, and select *Variable Metadata*. This will export the variable records in the DDI XML format. (Alternatively, this metadata fragment can be downloaded via the Data Access API; for example: ``http://localhost:8080/api/access/datafile/<FILEID>/metadata/ddi``). 
-
-The most immediate implication is in the calculation of the UNF signatures for the data vectors, as different normalization rules are applied to numeric, character, and date/time values. (see the :doc:`/developers/unf/index` section for more information). If it is important to you that the UNF checksums of your data are accurately calculated, check that the numeric and date/time columns in your file were recognized as such (as ``type=numeric`` and ``type=character, category=date(time)``, respectively). If, for example, a column that was supposed to be numeric is recognized as a vector of character values (strings), double-check that the formatting of the values is consistent. Remember, a single improperly-formatted value in the column will turn it into a vector of character strings, and result in a different UNF. Fix any formatting errors you find, delete the file from the dataset, and try to ingest it again.
-
-
diff --git a/doc/sphinx-guides/source/user/tabulardataingest/csv-tsv.rst b/doc/sphinx-guides/source/user/tabulardataingest/csv-tsv.rst
new file mode 100644
index 00000000000..343dcdc56e4
--- /dev/null
+++ b/doc/sphinx-guides/source/user/tabulardataingest/csv-tsv.rst
@@ -0,0 +1,76 @@
+CSV/TSV
+++++++++
+
+.. contents:: |toctitle|
+	:local:
+
+Ingest of Comma-Separated Values and Tab-Separated Values files as tabular data
+--------------------------------------------------------------------------------
+
+The Dataverse installation will make an attempt to turn CSV and TSV files uploaded by the user into tabular data, using the `Apache CSV parser <https://commons.apache.org/proper/commons-csv/>`_. 
+
+Main formatting requirements
+-----------------------------
+
+The first row in the document will be treated as the CSV's header, containing variable names for each column.
+
+Each following row must contain the same number of comma-separated values ("cells") as that header.
+
+As of the Dataverse Software 4.8 release, we allow ingest of CSV files with commas and line breaks within cells. A string with any number of commas and line breaks enclosed within double quotes is recognized as a single cell. Double quotes can be encoded as two double quotes in a row (``""``). 
+
+For example, the following lines:
+
+.. code-block:: none
+
+    a,b,"c,d
+    efgh""ijk""l",m,n
+
+are recognized as a **single** row with **5** comma-separated values (cells):
+
+.. code-block:: none
+
+    a
+    b 
+    c,d\nefgh"ijk"l
+    m
+    n 
+
+(where ``\n`` is a new line character)
+
+Limitations
+------------
+
+Compared to other formats, relatively little information about the data ("variable-level metadata") can be extracted from a CSV file. Aside from the variable names supplied in the top line, the ingest will make an educated guess about the data type of each comma-separated column. One of the supported rich file formats (Stata, SPSS and R) should be used if you need to provide more descriptive variable-level metadata (variable labels, categorical values and labels, explicitly defined data types, etc.). 
+
+Recognized data types and formatting
+-------------------------------------
+
+The application will attempt to recognize numeric, string, and date/time values in the individual columns.
+
+For dates, the ``yyyy-MM-dd`` format is recognized. 
+
+For date-time values, the following 2 formats are recognized: 
+
+``yyyy-MM-dd HH:mm:ss``
+
+``yyyy-MM-dd HH:mm:ss z`` (same format as the above, with the time zone specified)
+
+For numeric variables, the following special values are recognized:
+
+``inf``, ``+inf`` - as a special IEEE 754 "positive infinity" value;
+
+``NaN`` - as a special IEEE 754 "not a number" value; 
+
+An empty value (i.e., a comma followed immediately by another comma, or the line end), or ``NA`` - as a *missing value*.
+
+``null`` - as a numeric *zero*. 
+
+(any combinations of lower and upper cases are allowed in the notations above). 
+
+In character strings, an empty value (a comma followed by another comma, or the line end) is treated as an empty string (NOT as a *missing value*). 
+
+Any non-Latin characters are allowed in character string values, **as long as the encoding is UTF8**. 
+
+**Note:** When the ingest recognizes a CSV or TSV column as a numeric vector, or as a date/time value, this information is reflected and saved in the database as the *data variable metadata*. To inspect that metadata, select *Variable Metadata* listed as a download option for the tabular file. This will export the variable records in the DDI XML format. (Alternatively, this metadata fragment can be downloaded via the Data Access API; for example: ``http://localhost:8080/api/access/datafile/<FILEID>/metadata/ddi``). 
+
+The most immediate implication is in the calculation of the UNF signatures for the data vectors, as different normalization rules are applied to numeric, character, and date/time values. (see the :doc:`/developers/unf/index` section for more information). If it is important to you that the UNF checksums of your data are accurately calculated, check that the numeric and date/time columns in your file were recognized as such (as ``type=numeric`` and ``type=character, category=date(time)``, respectively). If, for example, a column that was supposed to be numeric is recognized as a vector of character values (strings), double-check that the formatting of the values is consistent. Remember, a single improperly-formatted value in the column will turn it into a vector of character strings, and result in a different UNF. Fix any formatting errors you find, delete the file from the dataset, and try to ingest it again.
diff --git a/doc/sphinx-guides/source/user/tabulardataingest/excel.rst b/doc/sphinx-guides/source/user/tabulardataingest/excel.rst
index b8612092f06..0013b4eaf88 100644
--- a/doc/sphinx-guides/source/user/tabulardataingest/excel.rst
+++ b/doc/sphinx-guides/source/user/tabulardataingest/excel.rst
@@ -1,10 +1,32 @@
 Excel 
 +++++++
 
+Microsoft Excel files (XLSX format).
+
 .. contents:: |toctitle|
 	:local:
 
-Excel files (**New** in Dataverse 4.0!)
+Supported Formats
+------------------
+
+Only the newer XLSX Excel files are supported. We are not planning to add support for the old-style, binary XLS files.
+
+Limitations
+-----------
+
+If an Excel file has multiple sheets, only the first sheet of the file will be ingested. The other sheets will be available when a user downloads the original Excel file. To have all sheets of an Excel file ingested and searchable at the variable level, upload each sheet as an individual file in your dataset.
+
+Ingest Errors
+-------------
+
+You may encounter ingest errors after uploading an Excel file if the file is formatted in a way that can't be ingested by the Dataverse software. Ingest errors can be caused by a variety of formatting inconsistencies, including:
+
+* line breaks in a cell
+* blank cells
+* single cells that span multiple rows
+* missing headers
 
-Note: only the "new", XLSX Excel files are supported. We are not planning to add support for the old-style, binary XLS files.
+Example Data
+------------
 
+`An example of an Excel file that successfully ingests <https://github.com/IQSS/dataverse-sample-data/blob/master/data/dataverses/dataverseno/datasets/tabular-sample-data/files/Tabular_Sample_Data.xlsx>`_ is available in the Dataverse Sample Data GitHub repository.
diff --git a/doc/sphinx-guides/source/user/tabulardataingest/index.rst b/doc/sphinx-guides/source/user/tabulardataingest/index.rst
index fb2409f3edc..b58f982ac74 100755
--- a/doc/sphinx-guides/source/user/tabulardataingest/index.rst
+++ b/doc/sphinx-guides/source/user/tabulardataingest/index.rst
@@ -16,4 +16,4 @@ Contents:
    stata
    rdata
    excel
-   csv tsv
+   csv-tsv
diff --git a/doc/sphinx-guides/source/user/tabulardataingest/ingestprocess.rst b/doc/sphinx-guides/source/user/tabulardataingest/ingestprocess.rst
index 758da70e390..1e481a54da6 100644
--- a/doc/sphinx-guides/source/user/tabulardataingest/ingestprocess.rst
+++ b/doc/sphinx-guides/source/user/tabulardataingest/ingestprocess.rst
@@ -21,19 +21,18 @@ files. Some companies publish the specifications of their formats
 still frowning at you here at the Dataverse Project). Either way,
 reading these specially-formatted files requires some extra knowledge
 or special software. For these reasons they are not considered ideal
-for the purposes of archival preservation. Dataverse stores the raw
-data content extracted from such files in plain text, TAB-delimited
+for the purposes of archival preservation. The Dataverse installation stores the raw data content extracted from such files in plain text, TAB-delimited
 files. The metadata information that describes this content is stored
 separately, in a relational database, so that it can be accessed
 efficiently by the application. For the purposes of archival
 preservation it can be exported, in plain text XML files, using a
 standardized, open `DDI Codebook
-<http://www.ddialliance.org/Specification/DDI-Codebook/2.5/>`_
+<https://www.ddialliance.org/Specification/DDI-Codebook/2.5/>`_
 format. (more info below)
 
 
 Tabular Data and Metadata
-==========================
+=========================
 
 Data vs. Metadata
 -----------------
@@ -49,11 +48,30 @@ the 2 numeric values have *categorical labels* of "Democrat" for 0 and
 "Republican" for 1. This extra information that adds value to the data
 is *metadata*.
 
-Tabular Metadata in Dataverse
-------------------------------------
+Tabular Metadata in the Dataverse Software
+------------------------------------------
 
 The structure of the metadata defining tabular data variables used in
-Dataverse was originally based on the `DDI Codebook
-<http://www.ddialliance.org/Specification/DDI-Codebook/2.5/>`_ format.
+the Dataverse Software was originally based on the `DDI Codebook
+<https://www.ddialliance.org/Specification/DDI-Codebook/2.5/>`_ format.
 
-You can see an example of DDI output under the "Data Variable Metadata Access" section of the :doc:`/api/dataaccess` section of the API Guide.
+You can see an example of DDI output under the :ref:`data-variable-metadata-access` section of the :doc:`/api/dataaccess` section of the API Guide.
+
+Uningest and Reingest
+=====================
+
+Ingest will only work for files whose content can be interpreted as a table.
+Multi-sheet spreadsheets and CSV files with a different number of entries per row are two examples where ingest will fail.
+This is non-fatal. The Dataverse software will not produce a .tab version of the file and will show a warning to users
+who can see the draft version of the dataset containing the file that will indicate why ingest failed. When the file is published as 
+part of the dataset, there will be no indication that ingest was attempted and failed.
+
+If the warning message is a concern, the Dataverse software includes both an API call (see :ref:`file-uningest` in the :doc:`/api/native-api` guide) 
+and an Edit/Uningest menu option displayed on the file page, that allow a file to be uningested by anyone who can publish the dataset.
+
+Uningest will remove the warning. Uningest can also be done for a file that was successfully ingested.  This is only available to superusers.
+This will remove the variable-level metadata and the .tab version of the file that was generated.
+
+If a file is a tabular format but was never ingested, .e.g. due to the ingest file size limit being lower in the past, or if ingest had failed,
+e.g. in a prior Dataverse version, an reingest API (see :ref:`file-reingest` in the :doc:`/api/native-api` guide) and a file page Edit/Reingest option
+in the user interface allow ingest to be tried again. As with Uningest, this fucntionality is only available to superusers. 
diff --git a/doc/sphinx-guides/source/user/tabulardataingest/rdata.rst b/doc/sphinx-guides/source/user/tabulardataingest/rdata.rst
index 6196112cccb..91810543803 100644
--- a/doc/sphinx-guides/source/user/tabulardataingest/rdata.rst
+++ b/doc/sphinx-guides/source/user/tabulardataingest/rdata.rst
@@ -6,20 +6,19 @@ Support for R (.RData) files has been introduced in DVN 3.5.
 .. contents:: |toctitle|
     :local:
 
-Overview.
+Overview
 ===========
 
-
 R has been increasingly popular in the research/academic community,
 owing to the fact that it is free and open-source (unlike SPSS and
 STATA). Consequently, there is an increasing amount of data available
 exclusively in R format.  
 
-Data Formatting Requirements.
+Data Formatting Requirements
 ==============================
 
-The data must be formatted as an R dataframe (data.frame()). If an
-.RData file contains multiple dataframes, only the 1st one will be
+The data must be formatted as an R dataframe (``data.frame()``). If an
+.RData file contains multiple dataframes, only the first one will be
 ingested (this may change in the future).
 
 Data Types, compared to other supported formats (Stat, SPSS)
@@ -38,12 +37,12 @@ from SPSS and Stata.
 R explicitly supports Missing Values for all of the types above;
 Missing Values encoded in R vectors will be recognized and preserved
 in TAB files, counted in the generated summary statistics
-and data analysis. Please note however that the Dataverse notation for 
+and data analysis. Please note however that the Dataverse Software notation for 
 a missing value, as stored in a TAB file, is an empty string, an not "NA" as in R. 
 
 In addition to Missing Values, R recognizes "Not a Value" (NaN) and
 positive and negative infinity for floating point variables. These
-are now properly supported by the Dataverse.
+are now properly supported by the Dataverse Software.
 
 Also note, that unlike Stata, that does recognize "float" and "double"
 as distinct data types, all floating point values in R are in fact
@@ -52,13 +51,12 @@ doubles.
 R Factors 
 ---------
 
-These are ingested as "Categorical Values" in the Dataverse. 
+These are ingested as "Categorical Values" in the Dataverse installation. 
 
 One thing to keep in mind: in both Stata and SPSS, the actual value of
 a categorical variable can be both character and numeric. In R, all
 factor values are strings, even if they are string representations of
-numbers. So the values of the resulting categoricals in the Dataverse will
-always be of string type too.
+numbers. So the values of the resulting categoricals in the Dataverse installation will always be of string type too.
 
 Another thing to note is that R factors have no builtin support for
 SPSS or STATA-like descriptive labels. This is in fact potentially
@@ -67,16 +65,15 @@ in the context of a factor in R, it still refers to the "payload", or
 the data content of its value. For example, if you create a factor
 with the "labels" of *democrat*, *republican* and *undecided*, these
 strings become the actual values of the resulting vector. Once
-ingested in the Dataverse, these values will be stored in the
-tab-delimited file. The Dataverse DataVariable object representing the
-vector will be of type "Character" and have 3 VariableCategory objects
+ingested in the Dataverse installation, these values will be stored in the
+tab-delimited file. The Dataverse Software DataVariable object representing the vector will be of type "Character" and have 3 VariableCategory objects
 with the *democrat*, etc. for **both** the CategoryValue and
 CategoryLabel.  (In one of the future releases, we are planning to
 make it possible for the user to edit the CategoryLabel, using it for
 its intended purpose - as a descriptive, human-readable text text
 note).
 
-| To properly handle R vectors that are *ordered factors* Dataverse (starting with DVN 3.6) supports the concept of an "Ordered Categorical" - a categorical value where an explicit order is assigned to the list of value labels.
+| To properly handle R vectors that are *ordered factors* the Dataverse Software (starting with DVN 3.6) supports the concept of an "Ordered Categorical" - a categorical value where an explicit order is assigned to the list of value labels.
 
 Boolean values
 ---------------------
@@ -84,11 +81,11 @@ Boolean values
 R Boolean (logical) values are supported. 
 
 
-Limitations of R, as compared to SPSS and STATA. 
+Limitations of R, as compared to SPSS and STATA
 ------------------------------------------------
 
 Most noticeably, R lacks a standard mechanism for defining descriptive
-labels for the data frame variables.  In the Dataverse, similarly to
+labels for the data frame variables.  In the Dataverse Software, similarly to
 both Stata and SPSS, variables have distinct names and labels; with
 the latter reserved for longer, descriptive text.
 With variables ingested from R data frames the variable name will be
@@ -103,8 +100,7 @@ Similarly, R categorical values (factors) lack descriptive labels too.
 **Note:** This is potentially confusing, since R factors do
 actually have "labels".  This is a matter of terminology - an R
 factor's label is in fact the same thing as the "value" of a
-categorical variable in SPSS or Stata and Dataverse; it contains the actual
-meaningful data for the given observation. It is NOT a field reserved
+categorical variable in SPSS or Stata and the Dataverse Software; it contains the actual meaningful data for the given observation. It is NOT a field reserved
 for explanatory, human-readable text, such as the case with the
 SPSS/Stata "label". 
 
@@ -174,13 +170,12 @@ discussed in depth on R-related forums, and no attempt is made to
 summarize it all in any depth here; this is just to made you aware of
 this being a potentially complex issue!)
 
-An important thing to keep in mind, in connection with the Dataverse ingest
-of R files, is that it will **reject** an R data file with any time
+An important thing to keep in mind, in connection with the Dataverse Software ingest of R files, is that it will **reject** an R data file with any time
 values that have time zones that we can't recognize. This is done in
 order to avoid (some) of the potential issues outlined above.
 
 It is also recommended that any vectors containing time values
-ingested into the Dataverse are reviewed, and the resulting entries in the
+ingested into the Dataverse installation are reviewed, and the resulting entries in the
 TAB files are compared against the original values in the R data
 frame, to make sure they have been ingested as expected. 
 
diff --git a/doc/sphinx-guides/source/user/tabulardataingest/spss.rst b/doc/sphinx-guides/source/user/tabulardataingest/spss.rst
index eb0ed643fa2..a6d598cd68f 100644
--- a/doc/sphinx-guides/source/user/tabulardataingest/spss.rst
+++ b/doc/sphinx-guides/source/user/tabulardataingest/spss.rst
@@ -9,7 +9,7 @@ SPSS data files (POR and SAV formats).
 Supported Versions
 ------------------
 
-Dataverse supports reading of all SPSS versions 7 to 22. But please see the "Limitations" section. 
+The Dataverse Software supports reading of all SPSS versions 7 to 22. But please see the "Limitations" section. 
 
 Limitations
 -----------
@@ -17,21 +17,21 @@ Limitations
 SPSS does not openly publish the specifications of their proprietary file formats. Our ability to read and parse their files is based on some documentation online from unofficial sources, and some reverse engineering. Because of that we cannot, unfortunately, guarantee to be able
 to process *any* SPSS file uploaded. 
 
-However, we've been improving this process for a few years by now, and it should be quite robust in the current version of Dataverse. Thus your chances of success - uploading an SPSS files and having it turned into a fully functional tabular data table in the Dataverse - should be reasonably good. 
+However, we've been improving this process for a few years by now, and it should be quite robust in the current version of the Dataverse Software. Thus your chances of success - uploading an SPSS files and having it turned into a fully functional tabular data table in the Dataverse installation - should be reasonably good. 
 
 If you are having a problem with a particular SPSS file, please contact our support and we'll see if it's something we could further improve in our SPSS ingest driver. 
 
 SPSS Control Cards - not supported
 -----------------------------------
 
-In the past, there have been attempts to support SPSS "control cards", in addition to the .SAV and .POR files; both in the early VDC software, and in some versions of DVN. A "control card" is a plain text file with a set of SPSS commands that describe the raw data, provided in a separate, fixed-width-columns or comma-separated-values file. For various reasons, it has never been very successful. We weren't seeing too much demand for this ingest feature, so it was dropped from Dataverse 4.0. 
+In the past, there have been attempts to support SPSS "control cards", in addition to the .SAV and .POR files; both in the early VDC software, and in some versions of DVN. A "control card" is a plain text file with a set of SPSS commands that describe the raw data, provided in a separate, fixed-width-columns or comma-separated-values file. For various reasons, it has never been very successful.  
 
-Please contact us if you have any questions and/or strong feelings on this issue, or if you have serious amounts of data exclusively available in this format that you would like to ingest under Dataverse. 
+Please contact us if you have any questions and/or strong feelings on this issue, or if you have serious amounts of data exclusively available in this format that you would like to ingest under the Dataverse Software. 
 
 Support for Language Encodings in SPSS
 ---------------------------------------
 
-Historically, there was no support for specifying a particular language/code page encoding for the data stored in an SPSS file. Meaning, text values in none-ASCII encodings, or non-Latin characters could be entered and stored, but there was no setting to unambiguously specify what language, or what character set it was. By default, Dataverse will try to interpret binary characters as UTF8. If that's not working - for example, if the descriptive labels and/or categorical values ingest as garbage - and if you happen to know what encoding was used in the original file, you can now specify it in the Ingest Options. 
+Historically, there was no support for specifying a particular language/code page encoding for the data stored in an SPSS file. Meaning, text values in none-ASCII encodings, or non-Latin characters could be entered and stored, but there was no setting to unambiguously specify what language, or what character set it was. By default, the Dataverse Software will try to interpret binary characters as UTF8. If that's not working - for example, if the descriptive labels and/or categorical values ingest as garbage - and if you happen to know what encoding was used in the original file, you can now specify it in the Ingest Options. 
 
 For example, if you know that the text in your SAV file is in Mandarin, and is encoded using the GB2312, specify it as follows: 
 
diff --git a/doc/sphinx-guides/source/user/tabulardataingest/stata.rst b/doc/sphinx-guides/source/user/tabulardataingest/stata.rst
index e17e7321eae..70eb3ae9015 100644
--- a/doc/sphinx-guides/source/user/tabulardataingest/stata.rst
+++ b/doc/sphinx-guides/source/user/tabulardataingest/stata.rst
@@ -6,7 +6,35 @@ Stata
 
 Of all the third party statistical software providers, Stata does the best job at documenting the internal format of their files, by far. And at making that documentation freely and easily available to developers (yes, we are looking at you, SPSS). Because of that, Stata is the best supported format for tabular data ingest.  
 
+Supported Format Versions
+=========================
 
-**New in Dataverse 4.0:** support for Stata v.13 has been added.
 
+Of the **"New Stata dta"** formats (variations of the format in use since Stata 13) our ingest supports the following:
 
+
+=================== ================= =================
+Stata format name   Introduced in     Used by 
+=================== ================= =================
+dta_117             Stata 13          Stata 13
+dta_118             Stata 14          Stata 14 - 19 
+dta_119             Stata 15          Stata 15 - 19
+=================== ================= =================
+
+This means that, in theory, every dta file produced by Stata v.13 - 17 should be ingestible. (Please see below for more information on Stata 18 and 19). In practice, we cannot *guarantee* that our code will in fact be able to parse any such file. There is always a possibility that we missed a certain way to compose the data that the ingest will fail to understand. So, if you encounter such an error, where Dataverse **tries but fails** to ingest a Stata file in one of these 3 formats, please open a GitHub issue and we will try to address it. Please note that this a different scenario from when Dataverse skips even trying to ingest a file (with no ingest errors shown in the UI). As that will in most cases be the result of the file exceeding the size limit set by the Dataverse instance administrators, or a client uploading the file with a wrong content type attached, so that Dataverse fails to recognize it as Stata.
+
+Please note that there was an issue present in older versions of Dataverse where Stata 13-17 files were not ingested when deposited via direct upload to S3. The issue was accompanied by the confusing error message ``The file is not in a STATA format that we can read or support`` shown in the UI. Fortunately, a case like this can be addressed by running the reIngest API on the affected file. 
+
+The following 2 formats have been introduced in 2024 and are **not yet supported**:
+
+=================== ================ =================
+Stata format name   Introduced in    Used by 
+=================== ================ =================
+dta_120             Stata 18         Stata 18 - 19
+dta_121             Stata 18         Stata 18 - 19 
+=================== ================ =================
+
+Please note however, that this does not mean that no files produced by Stata 18 or 19 are ingestable! In reality, in most cases these versions of Stata still save files in the ``dta_118`` (i.e., Stata 14) format, with the later formats only utilized when necessary. When, for example, the number of variables in the datafile exceeds what ``dta_118`` can handle, or when it has "alias variables" introduced in Stata 18. Case in point, in a year since the introduction of these 2 newest formats, it appears that not a single file in either of them has been uploaded on production Dataverse instance at IQSS. We are planning to eventually add support for these formats, but it is not considered a priority as of yet. However, please feel free to open a GitHub issue if this is an important use case for you.
+
+**"Old Stata"**, a distinctly different format used by Stata versions prior to 13 is supported. 
+However, this functionality is considered legacy code that we no longer actively maintain. If any problems or bugs are found in it, we cannot promise that the core development team will be able to prioritize looking into such. We will of course gladly accept a properly submitted pull request from the user community. 
diff --git a/doc/sphinx-guides/source/user/tabulardataingest/supportedformats.rst b/doc/sphinx-guides/source/user/tabulardataingest/supportedformats.rst
index 6078d37ee84..e672099b384 100644
--- a/doc/sphinx-guides/source/user/tabulardataingest/supportedformats.rst
+++ b/doc/sphinx-guides/source/user/tabulardataingest/supportedformats.rst
@@ -11,10 +11,10 @@ Tabular Data ingest supports the following file formats:
 File format                      Versions supported 
 ================================ ==================================
 SPSS (POR and SAV formats)	 7 to 22
-STATA				 4 to 13
+STATA				 4 to 17 (see the Stata subsection)
 R 				 up to 3
 Excel				 XLSX only (XLS is NOT supported)
 CSV (comma-separated values) 	 (limited support)
 ================================ ==================================
 
-See the subsections in the left sidebar for more information on each of these supported formats.
\ No newline at end of file
+See the subsections in the left sidebar for more information on each of these supported formats.
diff --git a/doc/sphinx-guides/source/versions.rst b/doc/sphinx-guides/source/versions.rst
index 4937659fbed..b0315419959 100755
--- a/doc/sphinx-guides/source/versions.rst
+++ b/doc/sphinx-guides/source/versions.rst
@@ -1,13 +1,46 @@
 :orphan:
 .. _guides_versions:
 
-Dataverse Documentation Versions
-================================
+Dataverse Software Documentation Versions
+=========================================
 
-This list provides a way to refer to the documentation for previous versions of Dataverse. In order to learn more about the updates delivered from one version to another, visit the `Releases <https://github.com/IQSS/dataverse/releases>`__ page in our GitHub repo.
-
-- 4.17
+This list provides a way to refer to the documentation for previous and future versions of the Dataverse Software. In order to learn more about the updates delivered from one version to another, visit the `Releases <https://github.com/IQSS/dataverse/releases>`__ page in our GitHub repo.
 
+- pre-release `HTML (not final!) <http://preview.guides.gdcc.io/en/develop/>`__ and `PDF (experimental!) <http://preview.guides.gdcc.io/_/downloads/en/develop/pdf/>`__ built from the :doc:`develop </developers/version-control>` branch :doc:`(how to contribute!) </contributor/documentation>`
+- |version|
+- `6.7 </en/6.7/>`__
+- `6.6 </en/6.6/>`__
+- `6.5 </en/6.5/>`__
+- `6.4 </en/6.4/>`__
+- `6.3 </en/6.3/>`__
+- `6.2 </en/6.2/>`__
+- `6.1 </en/6.1/>`__
+- `6.0 </en/6.0/>`__
+- `5.14 </en/5.14/>`__
+- `5.13 </en/5.13/>`__
+- `5.12.1 </en/5.12.1/>`__
+- `5.12 </en/5.12/>`__
+- `5.11.1 </en/5.11.1/>`__
+- `5.11 </en/5.11/>`__
+- `5.10.1 </en/5.10.1/>`__
+- `5.10 </en/5.10/>`__
+- `5.9 </en/5.9/>`__
+- `5.8 </en/5.8/>`__
+- `5.7 </en/5.7/>`__
+- `5.6 </en/5.6/>`__
+- `5.5 </en/5.5/>`__
+- `5.4.1 </en/5.4.1/>`__
+- `5.4 </en/5.4/>`__
+- `5.3 </en/5.3/>`__
+- `5.2 </en/5.2/>`__
+- `5.1.1 </en/5.1.1/>`__
+- `5.1 </en/5.1/>`__
+- `5.0 </en/5.0/>`__
+- `4.20 </en/4.20/>`__
+- `4.19 </en/4.19/>`__
+- `4.18.1 </en/4.18.1/>`__
+- `4.18 </en/4.18/>`__
+- `4.17 </en/4.17/>`__
 - `4.16 </en/4.16/>`__
 - `4.15.1 </en/4.15.1/>`__
 - `4.15 </en/4.15/>`__
diff --git a/doc/sphinx_bootstrap_theme/bootstrap/globaltoc.html b/doc/sphinx_bootstrap_theme/bootstrap/globaltoc.html
index d5df46c60d5..aa1d860a924 100755
--- a/doc/sphinx_bootstrap_theme/bootstrap/globaltoc.html
+++ b/doc/sphinx_bootstrap_theme/bootstrap/globaltoc.html
@@ -1,9 +1,12 @@
 <li class="dropdown globaltoc-container">
+<!-- Comment out "Site" from navbar (we list guides in the sidebar anyway) -->
+<!--
   <a role="button"
      id="dLabelGlobalToc"
      data-toggle="dropdown"
      data-target="#"
      href="{{ pathto(master_doc) }}">{{ theme_navbar_site_name }} <b class="caret"></b></a>
+-->
   <ul class="dropdown-menu globaltoc"
       role="menu"
       aria-labelledby="dLabelGlobalToc">{{ toctree(maxdepth=theme_globaltoc_depth|toint, collapse=False, includehidden=theme_globaltoc_includehidden|tobool) }}</ul>
diff --git a/doc/sphinx_bootstrap_theme/bootstrap/layout.html b/doc/sphinx_bootstrap_theme/bootstrap/layout.html
index b8bde799511..3a8bc9330eb 100755
--- a/doc/sphinx_bootstrap_theme/bootstrap/layout.html
+++ b/doc/sphinx_bootstrap_theme/bootstrap/layout.html
@@ -9,7 +9,7 @@
 {% endif %}
 
 {% set script_files = script_files + [
-    '_static/js/jquery-3.4.1.min.js',
+    '_static/js/jquery-3.5.1.min.js',
     '_static/js/jquery-ui.min.js',
     '_static/bootstrap-' + bootstrap_version + '/js/bootstrap.min.js',
     '_static/js/jquery-fix.js',
@@ -84,8 +84,24 @@
 <div class="container">
   <div class="row">
     {%- block sidebar1 %}{{ bsidebar() }}{% endblock %}
-    <div class="{{ bs_span_prefix }}{{ bs_content_width }} content">
+    <div class="{{ bs_span_prefix }}{{ bs_content_width }} content" role="main">
       {% block body %}{% endblock %}
+      <!-- Previous button -->
+      {%- if prev %}
+        <a href="{{ prev.link|e }}" title="{{ _('Previous Chapter: ') + prev.title|striptags }}">
+          {%- if theme_bootstrap_version == "2" -%}<span class="icon-chevron-left visible-tablet"></span>{%- endif -%}
+          {%- if theme_bootstrap_version == "3" -%}<span class="glyphicon glyphicon-chevron-left visible-sm"></span>{%- endif -%}
+          <span class="hidden-sm hidden-tablet">{{ "&laquo;Previous"|safe }}</span>
+        </a>
+      {%- endif %}
+      <!-- Next button -->
+      {%- if next %}
+        <a href="{{ next.link|e }}" title="{{ _('Next Chapter: ') + next.title|striptags }}" style="float: right;">
+          {%- if theme_bootstrap_version == "2" -%}<span class="icon-chevron-right visible-tablet"></span>{%- endif -%}
+          {%- if theme_bootstrap_version == "3" -%}<span class="glyphicon glyphicon-chevron-right visible-sm"></span>{%- endif -%}
+          <span class="hidden-sm hidden-tablet">{{ "Next&raquo"|safe }}</span>
+        </a>
+      {%- endif %}
     </div>
     {% block sidebar2 %} {# possible location for sidebar #} {% endblock %}
   </div>
@@ -106,7 +122,7 @@
       {%- if hasdoc('copyright') %}
         {% trans path=pathto('copyright'), copyright=copyright|e %}<p><a href="{{ path }}">Copyright</a>  &#169; {{ copyright }}.</p>{% endtrans %}
       {%- else %}
-      {% trans copyright=copyright|e %}<p>Developed at the <a href="http://www.iq.harvard.edu/" title="Institute for Quantitative Social Science" target="_blank">Institute for Quantitative Social Science</a>  &nbsp;|&nbsp;  Code available at <a href="https://github.com/IQSS/dataverse" title="Dataverse on GitHub" target="_blank"><span class="socicon socicon-github"></span></a> &nbsp;|&nbsp; Created using <a href="http://sphinx.pocoo.org/" title="Sphinx" target="_blank">Sphinx</a> {{ sphinx_version }}<br/>Last updated on {{ last_updated }} &nbsp;|&nbsp; Dataverse v. {{ version }} &nbsp;|&nbsp; View the <a href="http://guides.dataverse.org/en/latest/" title="Dataverse Guides">latest version of Dataverse Guides</a></p>
+      {% trans copyright=copyright|e %}<p>Developed at the <a href="http://www.iq.harvard.edu/" title="Institute for Quantitative Social Science" target="_blank">Institute for Quantitative Social Science</a>  &nbsp;|&nbsp;  Code available at <a href="https://github.com/IQSS/dataverse" title="Dataverse on GitHub" target="_blank"><span class="socicon socicon-github"></span></a> &nbsp;|&nbsp; Created using <a href="https://www.sphinx-doc.org" title="Sphinx" target="_blank">Sphinx</a> {{ sphinx_version }}<br/>Last updated on {{ last_updated }} &nbsp;|&nbsp; Dataverse v. {{ version }} &nbsp;|&nbsp; View the <a href="http://guides.dataverse.org/en/latest/" title="Dataverse Guides">latest version of Dataverse Guides</a></p>
         <p>Copyright &#169; {{ copyright }}</p> {% endtrans %}
       {%- endif %}
     {%- endif %}
diff --git a/doc/sphinx_bootstrap_theme/bootstrap/navbar.html b/doc/sphinx_bootstrap_theme/bootstrap/navbar.html
index 5c1d9b9b928..f04d8742f54 100755
--- a/doc/sphinx_bootstrap_theme/bootstrap/navbar.html
+++ b/doc/sphinx_bootstrap_theme/bootstrap/navbar.html
@@ -11,9 +11,9 @@
           {%- block sidebarlogo %}
             {%- if logo %}<span><img src="{{ pathto('_static/' + logo, 1) }}"></span>{%- endif %}
           {%- endblock %}
-          {% if theme_navbar_title -%}{{ theme_navbar_title|e }}{%- else -%}{{ project|e }}{%- endif -%}
+          {% if theme_navbar_title -%}{{ theme_navbar_title|e }}{%- else -%}Dataverse Guides{%- endif -%}
         </a>
-        <span class="navbar-text navbar-version pull-left"><b>{{ version|e }}</b></span>
+        <span class="navbar-text navbar-version pull-left"><b><a href="{{ pathto('versions') }}">v{{ version|e }}</a></b></span>
       </div>
 
         <div class="collapse navbar-collapse nav-collapse">
@@ -31,7 +31,10 @@
             {% endblock %}
             {% if theme_navbar_sidebarrel %}
               {% block sidebarrel %}
+                <!-- comment out "prev" and "next" buttons -->
+                <!--
                 {% include "relations.html" %}
+                -->
               {% endblock %}
             {% endif %}
             {% block navbarextra %}
diff --git a/doc/sphinx_bootstrap_theme/bootstrap/navbartoc.html b/doc/sphinx_bootstrap_theme/bootstrap/navbartoc.html
index 8def043a6fe..0a8e0cbc9fb 100755
--- a/doc/sphinx_bootstrap_theme/bootstrap/navbartoc.html
+++ b/doc/sphinx_bootstrap_theme/bootstrap/navbartoc.html
@@ -1,9 +1,12 @@
 <li class="dropdown">
+<!-- Comment out "Page" from navbar (we put contents on every page anyway) -->
+<!--
   <a role="button"
      id="dLabelLocalToc"
      data-toggle="dropdown"
      data-target="#"
      href="#">{{ _(theme_navbar_pagenav_name) }} <b class="caret"></b></a>
+-->
   <ul class="dropdown-menu localtoc"
       role="menu"
       aria-labelledby="dLabelLocalToc">{{ toc }}</ul>
diff --git a/doc/sphinx_bootstrap_theme/bootstrap/search.html b/doc/sphinx_bootstrap_theme/bootstrap/search.html
index 0332637925b..398d8993314 100755
--- a/doc/sphinx_bootstrap_theme/bootstrap/search.html
+++ b/doc/sphinx_bootstrap_theme/bootstrap/search.html
@@ -9,7 +9,11 @@
 #}
 {%- extends "layout.html" %}
 {% set title = _('Search') %}
-{% set script_files = script_files + ['_static/searchtools.js'] %}
+{%- block scripts %}
+    {{ super() }}
+    <script src="{{ pathto('_static/searchtools.js', 1) }}"></script>
+    <script src="{{ pathto('_static/language_data.js', 1) }}"></script>
+{%- endblock %}
 {% block extrahead %}
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
diff --git a/doc/sphinx_bootstrap_theme/bootstrap/searchbox.html b/doc/sphinx_bootstrap_theme/bootstrap/searchbox.html
index 53755f37a39..efdc277cf58 100755
--- a/doc/sphinx_bootstrap_theme/bootstrap/searchbox.html
+++ b/doc/sphinx_bootstrap_theme/bootstrap/searchbox.html
@@ -1,7 +1,7 @@
 {%- if pagename != "search" %}
 <form action="{{ pathto('search') }}" method="get">
  <div class="form-group">
-  <input type="text" name="q" class="form-control" placeholder="Search" />
+  <input type="text" name="q" class="form-control" placeholder="Search" aria-label="Search"/>
  </div>
   <input type="hidden" name="check_keywords" value="yes" />
   <input type="hidden" name="area" value="default" />
diff --git a/doc/sphinx_bootstrap_theme/bootstrap/static/js/jquery-3.4.1.min.js b/doc/sphinx_bootstrap_theme/bootstrap/static/js/jquery-3.4.1.min.js
deleted file mode 100644
index a1c07fd803b..00000000000
--- a/doc/sphinx_bootstrap_theme/bootstrap/static/js/jquery-3.4.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
diff --git a/doc/sphinx_bootstrap_theme/bootstrap/static/js/jquery-3.5.1.min.js b/doc/sphinx_bootstrap_theme/bootstrap/static/js/jquery-3.5.1.min.js
new file mode 100644
index 00000000000..b0614034ad3
--- /dev/null
+++ b/doc/sphinx_bootstrap_theme/bootstrap/static/js/jquery-3.5.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/doc/sphinx_bootstrap_theme/bootstrap/theme.conf b/doc/sphinx_bootstrap_theme/bootstrap/theme.conf
index 294eacb3be0..500f0ac7213 100755
--- a/doc/sphinx_bootstrap_theme/bootstrap/theme.conf
+++ b/doc/sphinx_bootstrap_theme/bootstrap/theme.conf
@@ -48,7 +48,7 @@ navbar_fixed_top = true
 
 # Location of link to source.
 # Options are "nav" (default), "footer" or anything else to exclude.
-source_link_position = nav
+source_link_position = footer
 
 # Bootswatch (http://bootswatch.com/) theme.
 #
diff --git a/doc/theTestableCommand/TheTestableCommand.md b/doc/theTestableCommand/TheTestableCommand.md
index e60faa313f0..5a9fc259d4a 100644
--- a/doc/theTestableCommand/TheTestableCommand.md
+++ b/doc/theTestableCommand/TheTestableCommand.md
@@ -21,7 +21,7 @@ While they can't replace end-to-end tests, unit tests are a great way to validat
 
 Because unit tests are easy to create (Java only, no configuration needed) and quick to run, it is possible to write many of them, such that many aspects of the code are tested. Normally, a single unit test would test a single use case of the unit. This way, when a unit test fails, the failure describes exactly what part stopped functioning. Other unit tests are not blocked by the failure, and so by running the entire test suite, the developer can get a good overview of which parts are broken and which parts are functioning well.
 
-Because unit tests are easy to execute, it is recommended to get in the habit of running them prior to committing code changes to the repository. These tests are also integrated into Dataverse's automatic build processes (on [Travis-ci](https://travis-ci.org/IQSS/dataverse)). A failed test halts the build. Dataverse's build process also collects data about code coverage during the unit tests, using [Coveralls](https://coveralls.io/github/IQSS/dataverse). While code coverage is a problematic measure for Java EE applications (and has some inherent problems as well), generally speaking larger coverage means better testing.
+Because unit tests are easy to execute, it is recommended to get in the habit of running them prior to committing code changes to the repository. These tests are also integrated into Dataverse's automatic build processes. A failed test halts the build. Dataverse's build process also collects data about code coverage during the unit tests, using [Coveralls](https://coveralls.io/github/IQSS/dataverse). While code coverage is a problematic measure for Java EE applications (and has some inherent problems as well), generally speaking larger coverage means better testing.
 
 Unit Testing of application logic in Java EE applications is normally hard to do, as the application logic lives in the service beans, which rely on dependency injections. Writing unit tests for service beans is possible, but as it involves a test container, and a persistent context (read: in-memory database) these unit tests are not very unit-y.
 
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
new file mode 100644
index 00000000000..5936f3dcdab
--- /dev/null
+++ b/docker-compose-dev.yml
@@ -0,0 +1,282 @@
+version: "2.4"
+
+services:
+
+  dev_dataverse:
+    container_name: "dev_dataverse"
+    hostname: dataverse
+    image: ${APP_IMAGE}
+    restart: on-failure
+    user: payara
+    environment:
+      DATAVERSE_DB_HOST: postgres
+      DATAVERSE_DB_PASSWORD: secret
+      DATAVERSE_DB_USER: ${DATAVERSE_DB_USER}
+      ENABLE_JDWP: "1"
+      ENABLE_RELOAD: "1"
+      SKIP_DEPLOY: "${SKIP_DEPLOY}"
+      DATAVERSE_JSF_REFRESH_PERIOD: "1"
+      DATAVERSE_FEATURE_API_BEARER_AUTH: "1"
+      DATAVERSE_FEATURE_INDEX_HARVESTED_METADATA_SOURCE: "1"
+      DATAVERSE_FEATURE_API_BEARER_AUTH_PROVIDE_MISSING_CLAIMS: "1"
+      DATAVERSE_MAIL_SYSTEM_EMAIL: "dataverse@localhost"
+      DATAVERSE_MAIL_MTA_HOST: "smtp"
+      DATAVERSE_AUTH_OIDC_ENABLED: "1"
+      DATAVERSE_AUTH_OIDC_CLIENT_ID: test
+      DATAVERSE_AUTH_OIDC_CLIENT_SECRET: 94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8
+      DATAVERSE_AUTH_OIDC_AUTH_SERVER_URL: http://keycloak.mydomain.com:8090/realms/test
+      DATAVERSE_SPI_EXPORTERS_DIRECTORY: "/dv/exporters"
+      # These two oai settings are here to get HarvestingServerIT to pass
+      dataverse_oai_server_maxidentifiers: "2"
+      dataverse_oai_server_maxrecords: "2"
+      JVM_ARGS: -Ddataverse.files.storage-driver-id=file1
+        -Ddataverse.files.file1.type=file
+        -Ddataverse.files.file1.label=Filesystem
+        -Ddataverse.files.file1.directory=${STORAGE_DIR}/store
+        -Ddataverse.files.localstack1.type=s3
+        -Ddataverse.files.localstack1.label=LocalStack
+        -Ddataverse.files.localstack1.custom-endpoint-url=http://localstack:4566
+        -Ddataverse.files.localstack1.custom-endpoint-region=us-east-2
+        -Ddataverse.files.localstack1.bucket-name=mybucket
+        -Ddataverse.files.localstack1.path-style-access=true
+        -Ddataverse.files.localstack1.upload-redirect=true
+        -Ddataverse.files.localstack1.download-redirect=true
+        -Ddataverse.files.localstack1.access-key=default
+        -Ddataverse.files.localstack1.secret-key=default
+        -Ddataverse.files.minio1.type=s3
+        -Ddataverse.files.minio1.label=MinIO
+        -Ddataverse.files.minio1.custom-endpoint-url=http://minio:9000
+        -Ddataverse.files.minio1.custom-endpoint-region=us-east-1
+        -Ddataverse.files.minio1.bucket-name=mybucket
+        -Ddataverse.files.minio1.path-style-access=true
+        -Ddataverse.files.minio1.upload-redirect=false
+        -Ddataverse.files.minio1.download-redirect=false
+        -Ddataverse.files.minio1.access-key=4cc355_k3y
+        -Ddataverse.files.minio1.secret-key=s3cr3t_4cc355_k3y
+        -Ddataverse.pid.providers=fake
+        -Ddataverse.pid.default-provider=fake
+        -Ddataverse.pid.fake.type=FAKE
+        -Ddataverse.pid.fake.label=FakeDOIProvider
+        -Ddataverse.pid.fake.authority=10.5072
+        -Ddataverse.pid.fake.shoulder=FK2/
+        #-Ddataverse.lang.directory=/dv/lang
+    ports:
+      - "8080:8080" # HTTP (Dataverse Application)
+      - "4949:4848" # HTTPS (Payara Admin Console)
+      - "9009:9009" # JDWP
+      - "8686:8686" # JMX
+    networks:
+      - dataverse
+    depends_on:
+      - dev_postgres
+      - dev_solr
+      - dev_dv_initializer
+    volumes:
+      - ./docker-dev-volumes/app/data:/dv
+      - ./docker-dev-volumes/app/secrets:/secrets
+      - ./target/dataverse:/opt/payara/deployments/dataverse:ro
+    tmpfs:
+      - /dumps:mode=770,size=2052M,uid=1000,gid=1000
+      - /tmp:mode=770,size=2052M,uid=1000,gid=1000
+    mem_limit: 2147483648 # 2 GiB
+    mem_reservation: 1024m
+    privileged: false
+
+  dev_bootstrap:
+    container_name: "dev_bootstrap"
+    image: gdcc/configbaker:unstable
+    restart: "no"
+    command:
+      - bootstrap.sh
+      - dev
+    networks:
+      - dataverse
+    volumes:
+      - ./docker-dev-volumes/solr/data:/var/solr
+
+  dev_dv_initializer:
+    container_name: "dev_dv_initializer"
+    image: gdcc/configbaker:unstable
+    restart: "no"
+    command:
+      - sh
+      - -c
+      - "fix-fs-perms.sh dv"
+    volumes:
+      - ./docker-dev-volumes/app/data:/dv
+
+  dev_postgres:
+    container_name: "dev_postgres"
+    hostname: postgres
+    image: postgres:${POSTGRES_VERSION}
+    restart: on-failure
+    environment:
+      - POSTGRES_USER=${DATAVERSE_DB_USER}
+      - POSTGRES_PASSWORD=secret
+    ports:
+      - "5432:5432"
+    networks:
+      - dataverse
+    volumes:
+      - ./docker-dev-volumes/postgresql/data:/var/lib/postgresql/data
+
+  dev_solr_initializer:
+    container_name: "dev_solr_initializer"
+    image: gdcc/configbaker:unstable
+    restart: "no"
+    command:
+      - sh
+      - -c
+      - "fix-fs-perms.sh solr && cp -a /template/* /solr-template"
+    volumes:
+      - ./docker-dev-volumes/solr/data:/var/solr
+      - ./docker-dev-volumes/solr/conf:/solr-template
+
+  dev_solr:
+    container_name: "dev_solr"
+    hostname: "solr"
+    image: solr:${SOLR_VERSION}
+    depends_on:
+      - dev_solr_initializer
+    restart: on-failure
+    ports:
+      - "8983:8983"
+    networks:
+      - dataverse
+    command:
+      - "solr-precreate"
+      - "collection1"
+      - "/template"
+    volumes:
+      - ./docker-dev-volumes/solr/data:/var/solr
+      - ./docker-dev-volumes/solr/conf:/template
+
+  dev_smtp:
+    container_name: "dev_smtp"
+    hostname: "smtp"
+    image: maildev/maildev:2.0.5
+    restart: on-failure
+    ports:
+      - "25:25" # smtp server
+      - "1080:1080" # web ui
+    environment:
+      - MAILDEV_SMTP_PORT=25
+      - MAILDEV_MAIL_DIRECTORY=/mail
+    networks:
+      - dataverse
+    #volumes:
+    #  - ./docker-dev-volumes/smtp/data:/mail
+    tmpfs:
+      - /mail:mode=770,size=128M,uid=1000,gid=1000
+
+  dev_keycloak:
+    container_name: "dev_keycloak"
+    image: 'quay.io/keycloak/keycloak:26.3.2'
+    hostname: keycloak
+    environment:
+      - KEYCLOAK_ADMIN=kcadmin
+      - KEYCLOAK_ADMIN_PASSWORD=kcpassword
+      - KEYCLOAK_LOGLEVEL=DEBUG
+      - KC_HOSTNAME_STRICT=false
+    networks:
+      dataverse:
+        aliases:
+          - keycloak.mydomain.com #create a DNS alias within the network (add the same alias to your /etc/hosts to get a working OIDC flow)
+    command: start-dev --import-realm --http-port=8090  # change port to 8090, so within the network and external the same port is used
+    ports:
+      - "8090:8090"
+    volumes:
+      - './conf/keycloak/test-realm.json:/opt/keycloak/data/import/test-realm.json'
+
+  # This proxy configuration is only intended to be used for development purposes!
+  # DO NOT USE IN PRODUCTION! HIGH SECURITY RISK!
+  dev_proxy:
+    image: caddy:2-alpine
+    # The command below is enough to enable using the admin gui, but it will not rewrite location headers to HTTP.
+    # To achieve rewriting from https:// to http://, we need a simple configuration file
+    #command: ["caddy", "reverse-proxy", "-f", ":4848", "-t", "https://dataverse:4848", "--insecure"]
+    command: ["caddy", "run", "-c", "/Caddyfile"]
+    ports:
+      - "4848:4848" # Will expose Payara Admin Console (HTTPS) as HTTP
+    restart: always
+    volumes:
+      - ./conf/proxy/Caddyfile:/Caddyfile:ro
+    depends_on:
+      - dev_dataverse
+    networks:
+      - dataverse
+
+  dev_localstack:
+    container_name: "dev_localstack"
+    hostname: "localstack"
+    image: localstack/localstack:4.2.0
+    restart: on-failure
+    ports:
+      - "127.0.0.1:4566:4566"
+    environment:
+      - DEBUG=${DEBUG-}
+      - DOCKER_HOST=unix:///var/run/docker.sock
+      - HOSTNAME_EXTERNAL=localstack
+    networks:
+      - dataverse
+    volumes:
+      - ./conf/localstack:/etc/localstack/init/ready.d
+    tmpfs:
+      - /localstack:mode=770,size=128M,uid=1000,gid=1000
+
+  dev_minio:
+    container_name: "dev_minio"
+    hostname: "minio"
+    image: minio/minio
+    restart: on-failure
+    ports:
+      - "9000:9000"
+      - "9001:9001"
+    networks:
+      - dataverse
+    volumes:
+      - ./docker-dev-volumes/minio_storage:/data
+    environment:
+      MINIO_ROOT_USER: 4cc355_k3y
+      MINIO_ROOT_PASSWORD: s3cr3t_4cc355_k3y
+    command: server /data
+
+  previewers-provider:
+    container_name: previewers-provider
+    hostname: previewers-provider
+    image: trivadis/dataverse-previewers-provider:latest
+    ports:
+      - "9080:9080"
+    networks:
+      - dataverse
+    environment:
+      # have nginx match the port we run previewers on
+      - NGINX_HTTP_PORT=9080
+      - PREVIEWERS_PROVIDER_URL=http://localhost:9080
+      - VERSIONS="v1.4,betatest"
+    # https://docs.docker.com/reference/compose-file/services/#platform
+    # https://github.com/fabric8io/docker-maven-plugin/issues/1750
+    platform: linux/amd64
+
+  register-previewers:
+    container_name: register-previewers
+    hostname: register-previewers
+    image: trivadis/dataverse-deploy-previewers:latest
+    networks:
+      - dataverse
+    environment:
+      - DATAVERSE_URL=http://dataverse:8080
+      - TIMEOUT=10m
+      - PREVIEWERS_PROVIDER_URL=http://localhost:9080
+      # Uncomment to specify which previewers you want. Otherwise you get all of them.
+      #- INCLUDE_PREVIEWERS=text,html,pdf,csv,comma-separated-values,tsv,tab-separated-values,jpeg,png,gif,markdown,x-markdown
+      - EXCLUDE_PREVIEWERS=
+      - REMOVE_EXISTING=true
+    command:
+      - deploy
+    restart: "no"
+    platform: linux/amd64
+
+networks:
+  dataverse:
+    driver: bridge
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 00000000000..3e3e6c1b9ff
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,5 @@
+# Dataverse in Docker
+
+Please see the [Container Guide][].
+
+[Container Guide]: https://guides.dataverse.org/en/latest/container/index.html
diff --git a/docker/compose/demo/.gitignore b/docker/compose/demo/.gitignore
new file mode 100644
index 00000000000..1269488f7fb
--- /dev/null
+++ b/docker/compose/demo/.gitignore
@@ -0,0 +1 @@
+data
diff --git a/docker/compose/demo/compose.yml b/docker/compose/demo/compose.yml
new file mode 100644
index 00000000000..5f3ce59055c
--- /dev/null
+++ b/docker/compose/demo/compose.yml
@@ -0,0 +1,174 @@
+version: "2.4"
+
+services:
+
+  dataverse:
+    container_name: "dataverse"
+    hostname: dataverse
+    image: gdcc/dataverse:latest
+    restart: on-failure
+    user: payara
+    environment:
+      DATAVERSE_SITEURL: "http://${MACHINE_IP:-localhost}:8080"
+      DATAVERSE_DB_HOST: postgres
+      DATAVERSE_DB_PASSWORD: secret
+      DATAVERSE_DB_USER: dataverse
+      DATAVERSE_FEATURE_API_BEARER_AUTH: "1"
+      DATAVERSE_MAIL_SYSTEM_EMAIL: "Demo Dataverse <dataverse@example.org>"
+      DATAVERSE_MAIL_MTA_HOST: "smtp"
+      JVM_ARGS: -Ddataverse.files.storage-driver-id=file1
+        -Ddataverse.files.file1.type=file
+        -Ddataverse.files.file1.label=Filesystem
+        -Ddataverse.files.file1.directory=${STORAGE_DIR}/store
+        -Ddataverse.pid.providers=perma1
+        -Ddataverse.pid.default-provider=perma1
+        -Ddataverse.pid.perma1.type=perma
+        -Ddataverse.pid.perma1.label=Perma1
+        -Ddataverse.pid.perma1.authority=DV
+        -Ddataverse.pid.perma1.permalink.separator=/
+        #-Ddataverse.lang.directory=/dv/lang
+    ports:
+      - "8080:8080" # HTTP (Dataverse Application)
+      - "4848:4848" # HTTP (Payara Admin Console)
+      - "9009:9009" # JDWP
+      - "8686:8686" # JMX
+    networks:
+      - dataverse
+    depends_on:
+      - postgres
+      - solr
+      - dv_initializer
+    volumes:
+      - ./data/app/data:/dv
+      - ./data/app/secrets:/secrets
+    tmpfs:
+      - /dumps:mode=770,size=2052M,uid=1000,gid=1000
+      - /tmp:mode=770,size=2052M,uid=1000,gid=1000
+    mem_limit: 2147483648 # 2 GiB
+    mem_reservation: 1024m
+    privileged: false
+
+  bootstrap:
+    container_name: "bootstrap"
+    image: gdcc/configbaker:latest
+    restart: "no"
+    environment:
+      - TIMEOUT=3m
+    command:
+      - bootstrap.sh
+      - dev
+      #- demo
+    #volumes:
+    #  - ./demo:/scripts/bootstrap/demo
+    networks:
+      - dataverse
+
+  dv_initializer:
+    container_name: "dv_initializer"
+    image: gdcc/configbaker:latest
+    restart: "no"
+    command:
+      - sh
+      - -c
+      - "fix-fs-perms.sh dv"
+    volumes:
+      - ./data/app/data:/dv
+
+  previewers-provider:
+    image: trivadis/dataverse-previewers-provider:latest
+    container_name: previewers-provider
+    hostname: previewers-provider
+    ports:
+      - 9000:9000
+    networks:
+      - dataverse      
+    environment:
+      - NGINX_HTTP_PORT=9000
+      - PREVIEWERS_PROVIDER_URL=http://${MACHINE_IP:-localhost}:9000
+      - VERSIONS="v1.4,betatest"
+
+  register-previewers:
+    container_name: register-previewers
+    hostname: register-previewers
+    image: trivadis/dataverse-deploy-previewers:latest
+    networks:
+      - dataverse    
+    environment:
+      - DATAVERSE_URL=http://dataverse:8080
+      - TIMEOUT=10m
+      - PREVIEWERS_PROVIDER_URL=http://${MACHINE_IP:-localhost}:9000
+      # Uncomment to specify which previewers you want. Otherwise you get all of them.
+      #- INCLUDE_PREVIEWERS=text,html,pdf,csv,comma-separated-values,tsv,tab-separated-values,jpeg,png,gif,markdown,x-markdown
+      - EXCLUDE_PREVIEWERS=
+      - REMOVE_EXISTING=True
+    command:
+      - deploy
+    restart: no
+
+  postgres:
+    container_name: "postgres"
+    hostname: postgres
+    image: postgres:17
+    restart: on-failure
+    environment:
+      - POSTGRES_USER=dataverse
+      - POSTGRES_PASSWORD=secret
+    ports:
+      - "5432:5432"
+    networks:
+      - dataverse
+    volumes:
+      - ./data/postgresql/data:/var/lib/postgresql/data
+
+  solr_initializer:
+    container_name: "solr_initializer"
+    image: gdcc/configbaker:latest
+    restart: "no"
+    command:
+      - sh
+      - -c
+      - "fix-fs-perms.sh solr && cp -a /template/* /solr-template"
+    volumes:
+      - ./data/solr/data:/var/solr
+      - ./data/solr/conf:/solr-template
+
+  solr:
+    container_name: "solr"
+    hostname: "solr"
+    image: solr:9.8.0
+    depends_on:
+      - solr_initializer
+    restart: on-failure
+    ports:
+      - "8983:8983"
+    networks:
+      - dataverse
+    command:
+      - "solr-precreate"
+      - "collection1"
+      - "/template"
+    volumes:
+      - ./data/solr/data:/var/solr
+      - ./data/solr/conf:/template
+
+  smtp:
+    container_name: "smtp"
+    hostname: "smtp"
+    image: maildev/maildev:2.0.5
+    restart: on-failure
+    ports:
+      - "25:25" # smtp server
+      - "1080:1080" # web ui
+    environment:
+      - MAILDEV_SMTP_PORT=25
+      - MAILDEV_MAIL_DIRECTORY=/mail
+    networks:
+      - dataverse
+    #volumes:
+    #  - ./data/smtp/data:/mail
+    tmpfs:
+      - /mail:mode=770,size=128M,uid=1000,gid=1000
+
+networks:
+  dataverse:
+    driver: bridge
diff --git a/docker/util/intellij/README.md b/docker/util/intellij/README.md
new file mode 100644
index 00000000000..281d0e50ea6
--- /dev/null
+++ b/docker/util/intellij/README.md
@@ -0,0 +1,13 @@
+# IntelliJ Auto-Copy of Webapp Files
+
+When deploying the webapp via Payara Tools, you can use this tool to immediately copy changes to non-code files into the running deployment, instantly seeing changes in your browser.
+
+Note: as this relies on using a Bash shell script, it is pretty much limited to Mac and Linux.
+Feel free to extend and provide a PowerShell equivalent!
+
+1. Install the [File Watcher plugin](https://plugins.jetbrains.com/plugin/7177-file-watchers)
+2. Import the [watchers.xml](./watchers.xml) file at *File > Settings > Tools > File Watchers*
+3. Once you have the deployment running (see Container Guides), editing files at `src/main/webapp` will be copied into the deployment after saving the edited file.
+
+Alternatively, you can add an External tool and trigger via menu or shortcut to do the copying manually:
+https://www.jetbrains.com/help/idea/configuring-third-party-tools.html
diff --git a/docker/util/intellij/cpwebapp.sh b/docker/util/intellij/cpwebapp.sh
new file mode 100755
index 00000000000..2d08fb1a873
--- /dev/null
+++ b/docker/util/intellij/cpwebapp.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#
+# cpwebapp <project dir> <file in webapp>
+#
+
+set -eu
+
+PROJECT_DIR="$1"
+FILE_TO_COPY="$2"
+RELATIVE_PATH="${FILE_TO_COPY#"${PROJECT_DIR}/"}"
+
+# Check if RELATIVE_PATH starts with 'src/main/webapp', otherwise ignore
+if [[ "$RELATIVE_PATH" == "src/main/webapp"* ]]; then
+    # Extract version from POM, so we don't need to have Maven on the PATH
+    VERSION=$(grep -oPm1 "(?<=<revision>)[^<]+" "$PROJECT_DIR/modules/dataverse-parent/pom.xml")
+
+    # Construct the target path by cutting off the local prefix and prepend with in-container path
+    RELATIVE_PATH_WITHOUT_WEBAPP="${RELATIVE_PATH#src/main/webapp/}"
+    TARGET_PATH="/opt/payara/appserver/glassfish/domains/domain1/applications/dataverse-$VERSION/${RELATIVE_PATH_WITHOUT_WEBAPP}"
+
+    # Copy file to container
+    docker cp "$FILE_TO_COPY" "dev_dataverse:$TARGET_PATH"
+fi
diff --git a/docker/util/intellij/watchers.xml b/docker/util/intellij/watchers.xml
new file mode 100644
index 00000000000..4ccee125ec2
--- /dev/null
+++ b/docker/util/intellij/watchers.xml
@@ -0,0 +1,22 @@
+<TaskOptions>
+  <TaskOptions>
+    <option name="arguments" value="$ProjectFileDir$ $FilePath$" />
+    <option name="checkSyntaxErrors" value="false" />
+    <option name="description" />
+    <option name="exitCodeBehavior" value="ERROR" />
+    <option name="fileExtension" value="*" />
+    <option name="immediateSync" value="false" />
+    <option name="name" value="Dataverse webapp file copy on save" />
+    <option name="output" value="" />
+    <option name="outputFilters">
+      <array />
+    </option>
+    <option name="outputFromStdout" value="false" />
+    <option name="program" value="$ProjectFileDir$/docker/util/intellij/cpwebapp.sh" />
+    <option name="runOnExternalChanges" value="true" />
+    <option name="scopeName" value="Current File" />
+    <option name="trackOnlyRoot" value="false" />
+    <option name="workingDir" value="$ProjectFileDir$" />
+    <envs />
+  </TaskOptions>
+</TaskOptions>
\ No newline at end of file
diff --git a/downloads/.gitignore b/downloads/.gitignore
deleted file mode 100644
index 9eb4cbadeeb..00000000000
--- a/downloads/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-glassfish-4.1.zip
-solr-7.3.0.tgz
-weld-osgi-bundle-2.2.10.Final-glassfish4.jar
-schemaSpy_5.0.0.jar
diff --git a/downloads/download.sh b/downloads/download.sh
deleted file mode 100755
index 239d75288b6..00000000000
--- a/downloads/download.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-curl -L -O http://download.java.net/glassfish/4.1/release/glassfish-4.1.zip
-curl -L -O https://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz
-curl -L -O http://search.maven.org/remotecontent?filepath=org/jboss/weld/weld-osgi-bundle/2.2.10.Final/weld-osgi-bundle-2.2.10.Final-glassfish4.jar
-curl -s -L http://sourceforge.net/projects/schemaspy/files/schemaspy/SchemaSpy%205.0.0/schemaSpy_5.0.0.jar/download > schemaSpy_5.0.0.jar
diff --git a/downloads/stata-13-test-files/Stata14TestFile.dta b/downloads/stata-13-test-files/Stata14TestFile.dta
deleted file mode 100644
index 6f1c31dc798..00000000000
Binary files a/downloads/stata-13-test-files/Stata14TestFile.dta and /dev/null differ
diff --git a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar
deleted file mode 100644
index a23530b895c..00000000000
Binary files a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar and /dev/null differ
diff --git a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.md5 b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.md5
deleted file mode 100644
index d8b1ce2fa75..00000000000
--- a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-f578d8ec91811d5d72981355cb7a1f0f
diff --git a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.sha1 b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.sha1
deleted file mode 100644
index 4c7d114634b..00000000000
--- a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-523abaf48b4423eb874dbc086b876aa917930a04
diff --git a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom
deleted file mode 100644
index 2915745c27d..00000000000
--- a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>xoai</artifactId>
-        <groupId>com.lyncode</groupId>
-        <version>4.1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>XOAI Commons</name>
-    <artifactId>xoai-common</artifactId>
-    <version>4.1.0-header-patch</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.lyncode</groupId>
-            <artifactId>xml-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.lyncode</groupId>
-            <artifactId>test-support</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>stax2-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.stream</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-
-</project>
diff --git a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.md5 b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.md5
deleted file mode 100644
index 15f47f4140a..00000000000
--- a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-346e9f235523e52256006bbe8eba60bb
diff --git a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.sha1 b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.sha1
deleted file mode 100644
index 88668a4d49c..00000000000
--- a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cd83d08c097d6aa1b27b20ef4742c7e4fa47e6b5
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar
deleted file mode 100644
index 28e5da7b0d6..00000000000
Binary files a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar and /dev/null differ
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.md5 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.md5
deleted file mode 100644
index 67dda34a6c9..00000000000
--- a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-546f1ab3f3f654280f88e429ba3471ae
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.sha1 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.sha1
deleted file mode 100644
index 50e8f2f42cd..00000000000
--- a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f4da7ebc3fda69e1e7db12bda6d7b5fb4aecc7a4
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar
deleted file mode 100644
index bdec990e2c6..00000000000
Binary files a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar and /dev/null differ
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.md5 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.md5
deleted file mode 100644
index 77416d80f87..00000000000
--- a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-ec87ba7cb8e7396fc903acdbacd31ff6
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.sha1 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.sha1
deleted file mode 100644
index a6157b4dc0b..00000000000
--- a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-370c2955550a42b11fe7b9007771c506f5769639
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar
deleted file mode 100644
index 331c9a80cd1..00000000000
Binary files a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar and /dev/null differ
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.md5 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.md5
deleted file mode 100644
index 27381662d09..00000000000
--- a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-544e9b97062d054370695b9b09d4bb1c
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.sha1 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.sha1
deleted file mode 100644
index 37dd4e47c2c..00000000000
--- a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-67c505461f3c190894bb036cc866eb640c2f6a48
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom
deleted file mode 100644
index 87d67b8c4a7..00000000000
--- a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>xoai</artifactId>
-        <groupId>com.lyncode</groupId>
-        <version>4.1.0-header-patch</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>XOAI Data Provider</name>
-    <artifactId>xoai-data-provider</artifactId>
-    <version>4.1.0-header-patch</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.lyncode</groupId>
-            <artifactId>xoai-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lyncode</groupId>
-            <artifactId>builder-commons</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.md5 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.md5
deleted file mode 100644
index 5959ea476c7..00000000000
--- a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-a1b49c13fcf448de9628798f8682fcaa
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.sha1 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.sha1
deleted file mode 100644
index 87fd86c23e0..00000000000
--- a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-41be98af31f8d17d83ab6c38bd7939ba212eab8d
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar
deleted file mode 100644
index 4382b3ded5d..00000000000
Binary files a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar and /dev/null differ
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.md5 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.md5
deleted file mode 100644
index c9e720e6039..00000000000
--- a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-21bc45a29b715720f4b77f51bf9f1754
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.sha1 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.sha1
deleted file mode 100644
index 756955d2840..00000000000
--- a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b544162e82d322116b87d99f2fbb6ddd4c4745e1
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar
deleted file mode 100644
index 314dad81872..00000000000
Binary files a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar and /dev/null differ
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.md5 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.md5
deleted file mode 100644
index 27c55f9af58..00000000000
--- a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-88dc05805672ebe01ded1197a582cd60
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.sha1 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.sha1
deleted file mode 100644
index 1098e506b93..00000000000
--- a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fe41289cb74c56e9282dd09c22df2eda47c68a0d
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar
deleted file mode 100644
index 781fc1ce1e2..00000000000
Binary files a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar and /dev/null differ
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.md5 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.md5
deleted file mode 100644
index 84891040047..00000000000
--- a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-52f8b446f78009757d593312778f428c
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.sha1 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.sha1
deleted file mode 100644
index dbded3dd83f..00000000000
--- a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-feb6903ad32d4b42461b7ca1b3fae6146740bb31
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom
deleted file mode 100644
index c45e15a91f9..00000000000
--- a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>xoai</artifactId>
-        <groupId>com.lyncode</groupId>
-        <version>4.1.0-header-patch</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>XOAI Service Provider</name>
-    <artifactId>xoai-service-provider</artifactId>
-    <version>4.1.0-header-patch</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.lyncode</groupId>
-            <artifactId>xoai-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lyncode</groupId>
-            <artifactId>xml-io</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.lyncode</groupId>
-            <artifactId>xoai-data-provider</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.md5 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.md5
deleted file mode 100644
index 5e51f198572..00000000000
--- a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-b97b8ee92daa5fc4fd87004465f9ad2b
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.sha1 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.sha1
deleted file mode 100644
index 2c6dc74f02b..00000000000
--- a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f772583549263bd72ea4d5268d9db0a84c27cb9f
diff --git a/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom b/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom
deleted file mode 100644
index 89a14d88c51..00000000000
--- a/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom
+++ /dev/null
@@ -1,273 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>xoai-common</module>
-        <module>xoai-data-provider</module>
-        <module>xoai-service-provider</module>
-    </modules>
-
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-
-    <groupId>com.lyncode</groupId>
-    <artifactId>xoai</artifactId>
-    <version>4.1.0-header-patch</version>
-
-    <name>XOAI : OAI-PMH Java Toolkit</name>
-    <url>http://www.lyncode.com</url>
-
-    <properties>
-        <mockito.version>1.9.5</mockito.version>
-        <guava.version>15.0</guava.version>
-        <commons.lang3.version>3.1</commons.lang3.version>
-        <log4j.version>1.2.14</log4j.version>
-        <http-commons.version>4.2.1</http-commons.version>
-        <woodstox.version>4.0.0</woodstox.version>
-
-        <lyncode.builder-commons>1.0.2</lyncode.builder-commons>
-        <lyncode.xml-io>1.0.3</lyncode.xml-io>
-        <lyncode.test-support>1.0.4</lyncode.test-support>
-    </properties>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <scm>
-        <connection>scm:git:git@github.com:lyncode/xoai.git</connection>
-        <developerConnection>scm:git:git@github.com:lyncode/xoai.git</developerConnection>
-        <url>git@github.com:lyncode/xoai.git</url>
-      <tag>xoai-4.1.0</tag>
-  </scm>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.5</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.8.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>2.2.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.1</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <useReleaseProfile>false</useReleaseProfile>
-                    <releaseProfiles>release</releaseProfiles>
-                    <goals>deploy</goals>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <showDeprecation>false</showDeprecation>
-                    <showWarnings>false</showWarnings>
-                    <fork>true</fork>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <inherited>true</inherited>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <inherited>true</inherited>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.lyncode</groupId>
-                <artifactId>xml-io</artifactId>
-                <version>${lyncode.xml-io}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.lyncode</groupId>
-                <artifactId>test-support</artifactId>
-                <version>${lyncode.test-support}</version>
-            </dependency>
-
-
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>${log4j.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons.lang3.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${http-commons.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>wstx-asl</artifactId>
-                <version>${woodstox.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>stax2-api</artifactId>
-                <version>3.0.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-all</artifactId>
-                <version>1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>xalan</groupId>
-                <artifactId>xalan</artifactId>
-                <version>2.7.2</version>
-            </dependency>
-            <dependency>
-                <groupId>dom4j</groupId>
-                <artifactId>dom4j</artifactId>
-                <version>1.6.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.xml.stream</groupId>
-                <artifactId>stax-api</artifactId>
-                <version>1.0-2</version>
-            </dependency>
-            <dependency>
-                <groupId>jaxen</groupId>
-                <artifactId>jaxen</artifactId>
-                <version>1.1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.11</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>xml-apis</groupId>
-                <artifactId>xml-apis</artifactId>
-                <version>1.0.b2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>stax</groupId>
-                <artifactId>stax-api</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
-                <version>${mockito.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.lyncode</groupId>
-                <artifactId>builder-commons</artifactId>
-                <version>${lyncode.builder-commons}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-
-    <developers>
-        <developer>
-            <name>DSpace @ Lyncode</name>
-            <email>dspace@lyncode.com</email>
-            <organization>Lyncode</organization>
-            <organizationUrl>http://www.lyncode.com</organizationUrl>
-        </developer>
-    </developers>
-
-</project>
diff --git a/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.md5 b/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.md5
deleted file mode 100644
index d2fdadd114f..00000000000
--- a/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-b50966bebe8cfdcb58478cf029b08aa3
diff --git a/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.sha1 b/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.sha1
deleted file mode 100644
index b142cd649e8..00000000000
--- a/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-28a5d65399cbc25b29b270caebbb86e292c5ba18
diff --git a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar
deleted file mode 100644
index dc41f94046f..00000000000
Binary files a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar and /dev/null differ
diff --git a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.md5 b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.md5
deleted file mode 100644
index 7018ea4e822..00000000000
--- a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-eeef5c0dc201d1105b9529a51fa8cdab
diff --git a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.sha1 b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.sha1
deleted file mode 100644
index 97f192f3732..00000000000
--- a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1fa716d318920fd59fc63f77965d113decf97355
diff --git a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom
deleted file mode 100644
index ea2e4c03f9f..00000000000
--- a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>edu.harvard.iq.dvn</groupId>
-  <artifactId>unf5</artifactId>
-  <version>5.0</version>
-</project>
diff --git a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.md5 b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.md5
deleted file mode 100644
index a88cf2a1c02..00000000000
--- a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-2df5dac09375e1e7fcd66c705d9ca2ef
diff --git a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.sha1 b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.sha1
deleted file mode 100644
index 967b977b79e..00000000000
--- a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-431cd55e2e9379677d14e402dd3c474bb7be4ac9
diff --git a/local_lib/io/gdcc/xoai-common/5.3.2.1-local/xoai-common-5.3.2.1-local.jar b/local_lib/io/gdcc/xoai-common/5.3.2.1-local/xoai-common-5.3.2.1-local.jar
new file mode 100644
index 00000000000..3154ddbcb1f
Binary files /dev/null and b/local_lib/io/gdcc/xoai-common/5.3.2.1-local/xoai-common-5.3.2.1-local.jar differ
diff --git a/local_lib/io/gdcc/xoai-common/5.3.2.1-local/xoai-common-5.3.2.1-local.pom b/local_lib/io/gdcc/xoai-common/5.3.2.1-local/xoai-common-5.3.2.1-local.pom
new file mode 100644
index 00000000000..c272295d0fc
--- /dev/null
+++ b/local_lib/io/gdcc/xoai-common/5.3.2.1-local/xoai-common-5.3.2.1-local.pom
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ The contents of this file are subject to the license and copyright
+  ~ detailed in the LICENSE and NOTICE files at the root of the source
+  ~ tree and available online at
+  ~
+  ~ http://www.dspace.org/license/
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>xoai</artifactId>
+        <groupId>io.gdcc</groupId>
+        <version>5.3.2.1-local</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>XOAI Commons</name>
+    <artifactId>xoai-common</artifactId>
+    <description>OAI-PMH base functionality used for both data and service providers.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <!-- This library is not just used within tests, we also use it to match within real code! -->
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.gdcc</groupId>
+            <artifactId>xoai-xmlio</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>stax2-api</artifactId>
+        </dependency>
+        <!--
+        We need an actual StAX2 implementation at runtime (thus the scope). Yet appservers like Payara already ship
+        their version and using it should be just fine, so we prevent packaging the dep in the JAR via <optional>.
+        (Someone might also want to switch to another StAX2 engine like Aalto.)
+        -->
+        <dependency>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- TESTING DEPENDENCIES -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-matchers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>1.37</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>1.37</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/local_lib/io/gdcc/xoai-data-provider/5.3.2.1-local/xoai-data-provider-5.3.2.1-local.jar b/local_lib/io/gdcc/xoai-data-provider/5.3.2.1-local/xoai-data-provider-5.3.2.1-local.jar
new file mode 100644
index 00000000000..8899dccb8a9
Binary files /dev/null and b/local_lib/io/gdcc/xoai-data-provider/5.3.2.1-local/xoai-data-provider-5.3.2.1-local.jar differ
diff --git a/local_lib/io/gdcc/xoai-data-provider/5.3.2.1-local/xoai-data-provider-5.3.2.1-local.pom b/local_lib/io/gdcc/xoai-data-provider/5.3.2.1-local/xoai-data-provider-5.3.2.1-local.pom
new file mode 100644
index 00000000000..457991d699b
--- /dev/null
+++ b/local_lib/io/gdcc/xoai-data-provider/5.3.2.1-local/xoai-data-provider-5.3.2.1-local.pom
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ The contents of this file are subject to the license and copyright
+  ~ detailed in the LICENSE and NOTICE files at the root of the source
+  ~ tree and available online at
+  ~
+  ~ http://www.dspace.org/license/
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>xoai</artifactId>
+        <groupId>io.gdcc</groupId>
+        <version>5.3.2.1-local</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>XOAI Data Provider</name>
+    <artifactId>xoai-data-provider</artifactId>
+    <description>OAI-PMH data provider implementation. Use it to build an OAI-PMH endpoint, providing your data records as harvestable resources.</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.gdcc</groupId>
+            <artifactId>xoai-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <!-- TESTING DEPENDENCIES -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-matchers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/local_lib/io/gdcc/xoai-service-provider/5.3.2.1-local/xoai-service-provider-5.3.2.1-local.jar b/local_lib/io/gdcc/xoai-service-provider/5.3.2.1-local/xoai-service-provider-5.3.2.1-local.jar
new file mode 100644
index 00000000000..be8b7b2fdc3
Binary files /dev/null and b/local_lib/io/gdcc/xoai-service-provider/5.3.2.1-local/xoai-service-provider-5.3.2.1-local.jar differ
diff --git a/local_lib/io/gdcc/xoai-service-provider/5.3.2.1-local/xoai-service-provider-5.3.2.1-local.pom b/local_lib/io/gdcc/xoai-service-provider/5.3.2.1-local/xoai-service-provider-5.3.2.1-local.pom
new file mode 100644
index 00000000000..9a47a40f5f5
--- /dev/null
+++ b/local_lib/io/gdcc/xoai-service-provider/5.3.2.1-local/xoai-service-provider-5.3.2.1-local.pom
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ The contents of this file are subject to the license and copyright
+  ~ detailed in the LICENSE and NOTICE files at the root of the source
+  ~ tree and available online at
+  ~
+  ~ http://www.dspace.org/license/
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>io.gdcc</groupId>
+        <artifactId>xoai</artifactId>
+        <version>5.3.2.1-local</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>XOAI Service Provider</name>
+    <artifactId>xoai-service-provider</artifactId>
+    <description>OAI-PMH service provider implementation. Use it as a harvesting client to read remote repositories.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.gdcc</groupId>
+            <artifactId>xoai-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.gdcc</groupId>
+            <artifactId>xoai-xmlio</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <!-- TESTING DEPENDENCIES -->
+        <dependency>
+            <groupId>io.gdcc</groupId>
+            <artifactId>xoai-data-provider</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.gdcc</groupId>
+            <artifactId>xoai-data-provider</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/local_lib/io/gdcc/xoai-xmlio/5.3.2.1-local/xoai-xmlio-5.3.2.1-local.jar b/local_lib/io/gdcc/xoai-xmlio/5.3.2.1-local/xoai-xmlio-5.3.2.1-local.jar
new file mode 100644
index 00000000000..634f017657a
Binary files /dev/null and b/local_lib/io/gdcc/xoai-xmlio/5.3.2.1-local/xoai-xmlio-5.3.2.1-local.jar differ
diff --git a/local_lib/io/gdcc/xoai-xmlio/5.3.2.1-local/xoai-xmlio-5.3.2.1-local.pom b/local_lib/io/gdcc/xoai-xmlio/5.3.2.1-local/xoai-xmlio-5.3.2.1-local.pom
new file mode 100644
index 00000000000..f7b1c608c05
--- /dev/null
+++ b/local_lib/io/gdcc/xoai-xmlio/5.3.2.1-local/xoai-xmlio-5.3.2.1-local.pom
@@ -0,0 +1,63 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.gdcc</groupId>
+        <artifactId>xoai</artifactId>
+        <version>5.3.2.1-local</version>
+    </parent>
+
+    <artifactId>xoai-xmlio</artifactId>
+    <packaging>jar</packaging>
+    <name>XOAI XML IO Commons</name>
+    <description>Basic XML IO routines used for XOAI OAI-PMH implementation. Forked from obsolete Lyncode sources.</description>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>stax2-api</artifactId>
+        </dependency>
+        <!--
+        We need an actual StAX2 implementation at runtime (thus the scope). Yet appservers like Payara already ship
+        their version and using it should be just fine, so we prevent packaging the dep in the JAR via <optional>.
+        (Someone might also want to switch to another StAX2 engine like Aalto.)
+        -->
+        <dependency>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- This library is not just used within tests, we also use it to match within real code! -->
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+        </dependency>
+
+        <!-- TESTING DEPENDENCIES -->
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-matchers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/local_lib/io/gdcc/xoai/5.3.2.1-local/xoai-5.3.2.1-local.pom b/local_lib/io/gdcc/xoai/5.3.2.1-local/xoai-5.3.2.1-local.pom
new file mode 100644
index 00000000000..04d71ecfb71
--- /dev/null
+++ b/local_lib/io/gdcc/xoai/5.3.2.1-local/xoai-5.3.2.1-local.pom
@@ -0,0 +1,235 @@
+<!--
+  ~ The contents of this file are subject to the license and copyright
+  ~ detailed in the LICENSE and NOTICE files at the root of the source
+  ~ tree and available online at
+  ~
+  ~ http://www.dspace.org/license/
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>io.gdcc</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.10.2</version>
+    </parent>
+
+    <modules>
+        <module>xoai-common</module>
+        <module>xoai-data-provider</module>
+        <module>xoai-service-provider</module>
+        <module>xoai-xmlio</module>
+        <module>report</module>
+        <module>xoai-data-provider-tck</module>
+    </modules>
+
+    <artifactId>xoai</artifactId>
+    <version>5.3.2.1-local</version>
+
+    <name>XOAI : OAI-PMH Java Toolkit</name>
+    <!--<url>https://github.com/gdcc/xoai</url>-->
+    <description>An OAI-PMH data and/or service provider implementation, integration ready for your service.</description>
+    <url>https://github.com/${project.github.org}/${project.github.repo}</url>
+
+    <properties>
+        <jdk.version>11</jdk.version>
+        <project.github.repo>xoai</project.github.repo>
+        <skipEnforce.pomcheck-warn-is-no-error>true</skipEnforce.pomcheck-warn-is-no-error>
+
+        <!-- Dependencies -->
+        <jakarta.jaxb.version>4.0.1</jakarta.jaxb.version>
+        <jakarta.jaxb-impl.version>4.0.4</jakarta.jaxb-impl.version>
+        <stax2.api.version>4.2.2</stax2.api.version>
+        <woodstox.version>7.0.0</woodstox.version>
+
+        <!-- Testing dependencies -->
+        <dependency-check-maven.version>10.0.4</dependency-check-maven.version>
+    </properties>
+
+    <licenses>
+        <license>
+            <name>DuraSpace BSD License</name>
+            <url>https://raw.github.com/DSpace/DSpace/master/LICENSE</url>
+            <distribution>repo</distribution>
+            <comments>
+                A BSD 3-Clause license for the DSpace codebase.
+            </comments>
+        </license>
+    </licenses>
+
+    <build>
+        <plugins>
+            <!-- META -->
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>${spotless.version}</version>
+                <configuration>
+                    <!-- optional: limit format enforcement to just the files changed by this feature branch -->
+                    <ratchetFrom>origin/branch-5.0</ratchetFrom>
+                    <formats>
+                        <!-- you can define as many formats as you want, each is independent -->
+                        <format>
+                            <!-- define the files to apply to -->
+                            <includes>
+                                <include>*.md</include>
+                                <include>.gitignore</include>
+                            </includes>
+                            <!-- define the steps to apply to those files -->
+                            <trimTrailingWhitespace />
+                            <endWithNewline />
+                            <indent>
+                                <tabs>true</tabs>
+                                <spacesPerTab>4</spacesPerTab>
+                            </indent>
+                        </format>
+                    </formats>
+                    <!-- define a language-specific format -->
+                    <java>
+                        <!-- no need to specify files, inferred automatically, but you can if you want -->
+
+                        <importOrder /> <!-- standard import order -->
+                        <removeUnusedImports /> <!-- self-explanatory -->
+
+                        <!-- apply a specific flavor of google-java-format and reflow long strings -->
+                        <googleJavaFormat>
+                            <version>1.15.0</version>
+                            <style>AOSP</style>
+                            <reflowLongStrings>true</reflowLongStrings>
+                        </googleJavaFormat>
+
+                        <!-- make sure every file has the following copyright header.
+                          optionally, Spotless can set copyright years by digging
+                          through git history (see "license" section below) -->
+                        <!--<licenseHeader>-->
+                            <!--<content>/* (C)$YEAR */</content>-->
+                            <!-- or <file>${project.basedir}/license-header</file> -->
+                        <!--</licenseHeader>-->
+                    </java>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${jakarta.jaxb.version}</version>
+            </dependency>
+            <!--
+            This library is meant to be used with a Jakarta EE application server, so we do not include
+            the runtime dependency for JAXB. This is only necessary when using Java SE standalone. We mark this
+            as scope runtime (not necessary for compilation) and as optional (to exclude from packaging).
+
+            (Usually you would not add the scope in <dependencyManagement>, but as we want to provide a sane default,
+            lets do this anyway.)
+            -->
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jakarta.jaxb-impl.version}</version>
+                <scope>runtime</scope>
+                <optional>true</optional>
+            </dependency>
+
+            <!--
+            Some XML handling is not done via JAXB, but by using the Java native XML Stream API (but StAX2).
+            We are not using the JVM included parser, but the most common standard parser Woodstox.
+            (One might want to swap that to Aalto if more speed is required...)
+            -->
+            <dependency>
+                <groupId>com.fasterxml.woodstox</groupId>
+                <artifactId>woodstox-core</artifactId>
+                <version>${woodstox.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>stax2-api</artifactId>
+                <version>${stax2.api.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.gdcc</groupId>
+                <artifactId>xoai-xmlio</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <developers>
+        <developer>
+            <name>Oliver Bertuch</name>
+            <url>https://github.com/poikilotherm</url>
+            <email>xoai-lib@gdcc.io</email>
+            <organization>Forschungszentrum JÃŧlich GmbH</organization>
+            <organizationUrl>https://www.fz-juelich.de/en/zb</organizationUrl>
+        </developer>
+        <developer>
+            <name>DSpace @ Lyncode</name>
+            <email>dspace@lyncode.com</email>
+            <organization>Lyncode</organization>
+            <organizationUrl>http://www.lyncode.com</organizationUrl>
+        </developer>
+    </developers>
+
+    <profiles>
+        <profile>
+            <id>coverage</id>
+            <properties>
+                <sonar.coverage.jacoco.xmlReportPaths>${maven.multiModuleProjectDirectory}/report/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+            </properties>
+        </profile>
+        <profile>
+            <id>benchmark</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <skipTests>${skipUT}</skipTests>
+                            <includes>**/*Benchmark</includes>
+                            <systemPropertyVariables>
+                                <benchmark>true</benchmark>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>owasp</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <!-- https://jeremylong.github.io/DependencyCheck/dependency-check-maven/index.html -->
+                        <groupId>org.owasp</groupId>
+                        <artifactId>dependency-check-maven</artifactId>
+                        <version>${dependency-check-maven.version}</version>
+                        <configuration>
+                            <failBuildOnCVSS>7</failBuildOnCVSS>
+                            <skipProvidedScope>true</skipProvidedScope>
+                            <skipRuntimeScope>true</skipRuntimeScope>
+                            <!-- Use SARIF output so we can upload to Github Security tab -->
+                            <format>SARIF</format>
+                            <suppressionFile>owaspSuppression.xml</suppressionFile>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/local_lib/net/handle/handle/8.1.1/handle-8.1.1.jar b/local_lib/net/handle/handle/8.1.1/handle-8.1.1.jar
deleted file mode 100644
index 1f8e1c3eb12..00000000000
Binary files a/local_lib/net/handle/handle/8.1.1/handle-8.1.1.jar and /dev/null differ
diff --git a/local_lib/net/handle/handle/8.1.1/handle-8.1.1.pom b/local_lib/net/handle/handle/8.1.1/handle-8.1.1.pom
deleted file mode 100644
index e3c09349172..00000000000
--- a/local_lib/net/handle/handle/8.1.1/handle-8.1.1.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>net.handle</groupId>
-  <artifactId>handle</artifactId>
-  <version>8.1.1</version>
-  <description>POM was created from install:install-file</description>
-</project>
diff --git a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar
deleted file mode 100644
index b3bddd62c24..00000000000
Binary files a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar and /dev/null differ
diff --git a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.md5 b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.md5
deleted file mode 100644
index 576062f55a1..00000000000
--- a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-b0abb2fee242c479f305f47352600bbf
diff --git a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.sha1 b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.sha1
deleted file mode 100644
index e81e8450ef0..00000000000
--- a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9643e138cb5ed2684838e4b4faa118adfb2ecb4b
diff --git a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom
deleted file mode 100644
index b57cd67278b..00000000000
--- a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>nom.tam.fits</groupId>
-  <artifactId>fits</artifactId>
-  <version>2012-10-25-generated</version>
-</project>
diff --git a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.md5 b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.md5
deleted file mode 100644
index 777b4df3325..00000000000
--- a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-23ca47c46df791f220a87cfef3b2190c
diff --git a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.sha1 b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.sha1
deleted file mode 100644
index b5f41fd1a69..00000000000
--- a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c1ec9dfbbc72dc4623d309d772b804e47284ee27
diff --git a/local_lib/nom/tam/fits/fits/maven-metadata.xml b/local_lib/nom/tam/fits/fits/maven-metadata.xml
deleted file mode 100644
index 4fc3254df3f..00000000000
--- a/local_lib/nom/tam/fits/fits/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>nom.tam.fits</groupId>
-  <artifactId>fits</artifactId>
-  <versioning>
-    <release>2012-10-25-generated</release>
-    <versions>
-      <version>2012-10-25-generated</version>
-    </versions>
-    <lastUpdated>20130925190525</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/local_lib/nom/tam/fits/fits/maven-metadata.xml.md5 b/local_lib/nom/tam/fits/fits/maven-metadata.xml.md5
deleted file mode 100644
index b6d7e4a726f..00000000000
--- a/local_lib/nom/tam/fits/fits/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-545c78160393b4c80e40377f2a7cf406
\ No newline at end of file
diff --git a/local_lib/nom/tam/fits/fits/maven-metadata.xml.sha1 b/local_lib/nom/tam/fits/fits/maven-metadata.xml.sha1
deleted file mode 100644
index 188cf8ae044..00000000000
--- a/local_lib/nom/tam/fits/fits/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9cf56b8ef3f2bacdc669c2c7cdcd7cd50ed38dbb
\ No newline at end of file
diff --git a/local_lib/org/dataverse/unf/6.0/unf-6.0.jar b/local_lib/org/dataverse/unf/6.0/unf-6.0.jar
deleted file mode 100644
index d2738e2dadd..00000000000
Binary files a/local_lib/org/dataverse/unf/6.0/unf-6.0.jar and /dev/null differ
diff --git a/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.md5 b/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.md5
deleted file mode 100644
index 04ca3e73ce8..00000000000
--- a/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-bd9b84a9ad737a81a2699ab81541a901
diff --git a/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.sha1 b/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.sha1
deleted file mode 100644
index a48cef32570..00000000000
--- a/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4cad279c362e4c5c17a2058dc2c8f2fc97c76bf8
diff --git a/local_lib/org/dataverse/unf/6.0/unf-6.0.pom b/local_lib/org/dataverse/unf/6.0/unf-6.0.pom
deleted file mode 100644
index 06f1508723f..00000000000
--- a/local_lib/org/dataverse/unf/6.0/unf-6.0.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.dataverse</groupId>
-  <artifactId>unf</artifactId>
-  <version>6.0</version>
-</project>
diff --git a/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.md5 b/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.md5
deleted file mode 100644
index 138bc9c95f6..00000000000
--- a/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-230c5b1f5ae71bb2fe80ef9e7209f681
diff --git a/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.sha1 b/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.sha1
deleted file mode 100644
index 689e8045418..00000000000
--- a/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-286b819f2fc7432a94b5940c6171be1589f66a37
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/_maven.repositories b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/_maven.repositories
deleted file mode 100644
index cee0e46151c..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/_maven.repositories
+++ /dev/null
@@ -1,7 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Tue Oct 21 10:23:39 EDT 2014
-sword2-server-1.1-SNAPSHOT-sources.jar>=
-sword2-server-1.1-SNAPSHOT-classes.jar>=
-sword2-server-1.1-SNAPSHOT.pom>=
-sword2-server-1.1-SNAPSHOT-javadoc.jar>=
-sword2-server-1.1-SNAPSHOT.war>=
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/maven-metadata-local.xml b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index 458dda3db70..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.swordapp</groupId>
-  <artifactId>sword2-server</artifactId>
-  <version>1.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20141021142339</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20141021142339</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20141021142339</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>classes</classifier>
-        <extension>jar</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20141021142339</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>war</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20141021142339</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20141021142339</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar
deleted file mode 100644
index 20c7c258cb5..00000000000
Binary files a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar and /dev/null differ
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.md5 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.md5
deleted file mode 100644
index 940bfb7714e..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-a9eb5d004231d8edc21abff946368414
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.sha1 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.sha1
deleted file mode 100644
index f1b32c90caa..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-52ef5667fec4cdb33149d2a8d0730550565a29b9
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar
deleted file mode 100644
index b9ee72d323d..00000000000
Binary files a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar and /dev/null differ
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.md5 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.md5
deleted file mode 100644
index 78ad5fb77f2..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-e79bc5e0bd4dcc23fcc5e49f8010536d
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.sha1 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.sha1
deleted file mode 100644
index 6207b9d0478..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b3223f468f3f0dc991085ce1afe59b846cec8602
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar
deleted file mode 100644
index 79859a92bb3..00000000000
Binary files a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar and /dev/null differ
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.md5 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.md5
deleted file mode 100644
index 727dd333296..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-669fc3fc7b9e971f3fb089ea54fb4f93
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.sha1 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.sha1
deleted file mode 100644
index f52de46fbce..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-83b428fe09330a9a794b5d754b89f03cb9d78cd9
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom
deleted file mode 100644
index 4a13f40a43b..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.swordapp</groupId>
-    <artifactId>sword2-server</artifactId>
-    <version>1.1-SNAPSHOT</version>
-    <packaging>war</packaging>
-
-    <!-- brings the sonatype snapshot repository and signing requirement on board -->
-
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-
-    <name>SWORD v2 :: Common Server Library</name>
-    <description>
-        Common Server Library with interfaces to be implemented by servers
-        wishing to provide SWORD v2 support
-    </description>
-    <url>http://www.swordapp.org/</url>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <scm>
-        <url>git@github.com:swordapp/JavaServer2.0.git</url>
-        <developerConnection>scm:git:git@github.com:swordapp/JavaServer2.0.git</developerConnection>
-        <connection>scm:git:git@github.com:swordapp/JavaServer2.0.git</connection>
-    </scm>
-
-    <developers>
-        <developer>
-            <name>Richard Jones</name>
-            <email>swordv2@oneoverzero.com</email>
-        </developer>
-    </developers>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-release-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>6</source>
-                    <target>6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>
-                                true
-                            </addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>
-                                true
-                            </addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <attachClasses>true</attachClasses>
-                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-                    <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                    <webResources>
-                        <resource>
-                            <filtering>true</filtering>
-                            <directory>${basedir}/src/main/webapp</directory>
-                            <includes>
-                                <include>WEB-INF/web.xml</include>
-                            </includes>
-                        </resource>
-                    </webResources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <!--<goal>sign</goal>-->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.15</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.mail</groupId>
-                    <artifactId>mail</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.jms</groupId>
-                    <artifactId>jms</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jdmk</groupId>
-                    <artifactId>jmxtools</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jmx</groupId>
-                    <artifactId>jmxri</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.abdera</groupId>
-            <artifactId>abdera-client</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.hp.hpl.jena</groupId>
-            <artifactId>jena</artifactId>
-            <version>2.6.4</version>
-        </dependency>
-        <dependency>
-            <groupId>xom</groupId>
-            <artifactId>xom</artifactId>
-            <version>1.1</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.md5 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.md5
deleted file mode 100644
index 647a3d3d4b6..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-a5fd2dc5c41ae4840f20181f7ae7e740
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.sha1 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.sha1
deleted file mode 100644
index 67c9b409cf7..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b1dd4e9397d4781aa5ab9abb554cc090448fd467
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war
deleted file mode 100644
index c4ff24feca8..00000000000
Binary files a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war and /dev/null differ
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.md5 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.md5
deleted file mode 100644
index f2f1da69931..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.md5
+++ /dev/null
@@ -1 +0,0 @@
-07ee3115d24eab7ad772bc5997ea4a36
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.sha1 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.sha1
deleted file mode 100644
index c86067348f9..00000000000
--- a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a611e672715f0c08e737e3bdd0855458984b1125
diff --git a/makefile b/makefile
new file mode 100644
index 00000000000..315ff9c508c
--- /dev/null
+++ b/makefile
@@ -0,0 +1,14 @@
+
+SPHINX_VERSION = $(shell grep "Sphinx" ./doc/sphinx-guides/requirements.txt | awk -F'==' '{print $$2}')
+docs-html:
+	docker run -it --rm -v $$(pwd):/docs sphinxdoc/sphinx:$(SPHINX_VERSION) bash -c "cd doc/sphinx-guides && pip3 install -r requirements.txt && make clean && make html"
+
+docs-pdf:
+	docker run -it --rm -v $$(pwd):/docs sphinxdoc/sphinx-latexpdf:$(SPHINX_VERSION) bash -c "cd doc/sphinx-guides && pip3 install -r requirements.txt && make clean && make latexpdf LATEXMKOPTS=\"-interaction=nonstopmode\"; cd ../.. && ls -1 doc/sphinx-guides/build/latex/Dataverse.pdf"
+
+docs-epub:
+	docker run -it --rm -v $$(pwd):/docs sphinxdoc/sphinx:$(SPHINX_VERSION) bash -c "cd doc/sphinx-guides && pip3 install -r requirements.txt && make clean && make epub"
+
+docs-all:
+	docker run -it --rm -v $$(pwd):/docs sphinxdoc/sphinx:$(SPHINX_VERSION) bash -c "cd doc/sphinx-guides && pip3 install -r requirements.txt && make clean && make html && make epub"
+	docker run -it --rm -v $$(pwd):/docs sphinxdoc/sphinx-latexpdf:$(SPHINX_VERSION) bash -c "cd doc/sphinx-guides && pip3 install -r requirements.txt && make latexpdf LATEXMKOPTS=\"-interaction=nonstopmode\"; cd ../.. && ls -1 doc/sphinx-guides/build/latex/Dataverse.pdf"
\ No newline at end of file
diff --git a/mdc-logs/raw-mdc-2019-01-07.log b/mdc-logs/raw-mdc-2019-01-07.log
deleted file mode 100644
index d7a6386160e..00000000000
--- a/mdc-logs/raw-mdc-2019-01-07.log
+++ /dev/null
@@ -1,6 +0,0 @@
-#Fields: event_time	client_ip	session_cookie_id	user_cookie_id	user_id	request_url	identifier	filename	size	user-agent	title	publisher	publisher_id	authors	publication_date	version	other_id	target_url	publication_year
-2019-01-07T15:14:51-0500	0:0:0:0:0:0:0:1	9f4209d3c177d3cb77f4d06cf3ba	-	:guest	http://localhost:8080/dataset.xhtml?persistentId=doi:10.5072/FK2/XTT5BV	doi:10.5072/FK2/XTT5BV	-	-	Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36	Dataset One	-	1	Smith, Robert| Kew, Susie	2019-01-07T18:20:54Z	1	-	http://localhost:8080/dataset.xhtml?persistentId=doi:10.5072/FK2/XTT5BV	2019
-2019-01-07T15:15:15-0500	0:0:0:0:0:0:0:1	9f4209d3c177d3cb77f4d06cf3ba	-	:guest	http://localhost:8080/dataset.xhtml?persistentId=doi:10.5072/FK2/XTT5BV	doi:10.5072/FK2/XTT5BV	-	-	Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36	Dataset One	-	1	Smith, Robert| Kew, Susie	2019-01-07T18:20:54Z	1	-	http://localhost:8080/dataset.xhtml?persistentId=doi:10.5072/FK2/XTT5BV	2019
-2019-01-07T15:16:04-0500	0:0:0:0:0:0:0:1	9f4209d3c177d3cb77f4d06cf3ba	-	:guest	http://localhost:8080/dataset.xhtml?persistentId=doi:10.5072/FK2/XTT5BV	doi:10.5072/FK2/XTT5BV	-	-	Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36	Dataset One	-	1	Smith, Robert| Kew, Susie	2019-01-07T18:20:54Z	1	-	http://localhost:8080/dataset.xhtml?persistentId=doi:10.5072/FK2/XTT5BV	2019
-2019-01-07T15:16:14-0500	0:0:0:0:0:0:0:1	9f4209d3c177d3cb77f4d06cf3ba	-	:guest	http://localhost:8080/dataset.xhtml?persistentId=doi:10.5072/FK2/XTT5BV	doi:10.5072/FK2/XTT5BV	168298bae7c-2c5bbc1a9c8c	1	Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36	Dataset One	-	1	Smith, Robert| Kew, Susie	2019-01-07T18:20:54Z	1	-	http://localhost:8080/dataset.xhtml?persistentId=doi:10.5072/FK2/XTT5BV	2019
-2019-01-07T15:16:19-0500	0:0:0:0:0:0:0:1	9f4209d3c177d3cb77f4d06cf3ba	-	:guest	http://localhost:8080/dataset.xhtml?persistentId=doi:10.5072/FK2/XTT5BV	doi:10.5072/FK2/XTT5BV	168298bb8ce-337d8df49763	4026	Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36	Dataset One	-	1	Smith, Robert| Kew, Susie	2019-01-07T18:20:54Z	1	-	http://localhost:8080/dataset.xhtml?persistentId=doi:10.5072/FK2/XTT5BV	2019
diff --git a/modules/container-base/.gitignore b/modules/container-base/.gitignore
new file mode 100644
index 00000000000..d75620abf70
--- /dev/null
+++ b/modules/container-base/.gitignore
@@ -0,0 +1 @@
+.flattened-pom.xml
diff --git a/modules/container-base/README.md b/modules/container-base/README.md
new file mode 100644
index 00000000000..f6854482073
--- /dev/null
+++ b/modules/container-base/README.md
@@ -0,0 +1,68 @@
+# Dataverse Base Container Image
+
+The Dataverse Base Container Image contains primarily a pre-installed and pre-tuned application server with the
+necessary software dependencies for deploying and launching a Dataverse repository installation.
+
+Adding basic functionality like executing scripts at container boot, monitoring, memory tweaks, etc., is all done
+at this layer. Application images building from this very base focus on adding deployable Dataverse code and 
+actual scripts.
+
+There is a community based [application image](https://hub.docker.com/r/gdcc/dataverse) 
+([docs](https://guides.dataverse.org/en/latest/container/app-image.html)), but you may create your own or even reuse
+this image for other purposes than the Dataverse application.
+
+## Quick Reference
+
+**Maintained by:** 
+
+This image is created, maintained and supported by the Dataverse community on a best-effort basis.
+
+**Where to find documentation:**
+
+The [Dataverse Container Guide - Base Image](https://guides.dataverse.org/en/latest/container/base-image.html)
+provides in-depth information about content, building, tuning and so on for this image. 
+
+**Where to get help and ask questions:**
+
+IQSS will not offer support on how to deploy or run it. Please reach out to the community for help on using it.
+You can join the Community Chat on Matrix at https://chat.dataverse.org and https://groups.google.com/g/dataverse-community
+to ask for help and guidance.
+
+## Supported Image Tags
+
+This image is sourced within the main upstream code [repository of the Dataverse software](https://github.com/IQSS/dataverse).
+Development and maintenance of the [image's code](https://github.com/IQSS/dataverse/tree/develop/modules/container-base) happens there (again, by the community).
+
+Our tagging is inspired by [Bitnami](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html).
+For more detailed information about our tagging policy, please read about our [base image tags](https://guides.dataverse.org/en/latest/container/base-image.html#supported-image-tags) in the Dataverse Containers Guide.
+
+For ease of use, here is a list of images that are currently maintained.
+
+<!-- TAG BLOCK HERE -->
+
+All of them are rolling tags, except those ending with `-r<number>`, which are the most recent immutable tags.
+The `unstable` tags are the current development branch snapshot.
+We strongly recommend using only immutable tags for production use cases.
+
+Within the main repository, you may find the base image files at `<git root>/modules/container-base`.
+This Maven module uses the [Maven Docker Plugin](https://dmp.fabric8.io) to build and ship the image.
+You may use, extend, or alter this image to your liking and/or host in some different registry if you want to under the terms of the Apache 2.0 license.
+
+**Supported architectures:** This image is created as a "multi-arch image", supporting the most common architectures 
+Dataverse usually runs on: AMD64 (Windows/Linux/...) and ARM64 (Apple M1/M2).
+
+## License
+
+Image content created by the community is licensed under [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0), 
+like the [main Dataverse project](https://github.com/IQSS/dataverse/blob/develop/LICENSE.md).
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and limitations under the License.
+
+As with all Docker images, all images likely also contain other software which may be under other licenses (such as 
+[Payara Server](https://github.com/payara/Payara/blob/master/LICENSE.txt), Bash, etc., from the base
+distribution, along with any direct or indirect (Java) dependencies contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml
new file mode 100644
index 00000000000..6417b5b91fa
--- /dev/null
+++ b/modules/container-base/pom.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>edu.harvard.iq</groupId>
+        <artifactId>dataverse-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../dataverse-parent</relativePath>
+    </parent>
+    
+    <groupId>io.gdcc</groupId>
+    <artifactId>container-base</artifactId>
+    <packaging>${packaging.type}</packaging>
+    <name>Container Base Image</name>
+    <description>This module provides an application server base image to be decorated with the Dataverse app.</description>
+    
+    <developers>
+        <developer>
+            <id>poikilotherm</id>
+            <name>Oliver Bertuch</name>
+            <email>github@bertuch.eu</email>
+            <timezone>Europe/Berlin</timezone>
+            <roles>
+                <role>maintainer</role>
+            </roles>
+        </developer>
+    </developers>
+    
+    <properties>
+        <!-- By default, this module will produce a POM only. -->
+        <!-- This will be switched within the container profile! -->
+        <packaging.type>pom</packaging.type>
+    </properties>
+    
+    <profiles>
+        <profile>
+            <id>ct</id>
+            <properties>
+                <packaging.type>docker-build</packaging.type>
+                <!-- We default to the long version here for the sake of local development. CI will change this for releases. -->
+                <base.image>gdcc/base:${base.image.tag}</base.image>
+                <!-- base.image.version comes from dataverse-parent -->
+                <base.image.tag>${base.image.version}-${java.image.flavor}${base.image.tag.suffix}</base.image.tag>
+                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
+                <java.image>eclipse-temurin:${target.java.version}-jre-${java.image.flavor}</java.image>
+                <java.image.flavor>noble</java.image.flavor>
+                <base.image.uid>1000</base.image.uid>
+                <base.image.gid>1000</base.image.gid>
+                <docker.platforms>linux/amd64,linux/arm64</docker.platforms>
+            </properties>
+            
+            <build>
+                <plugins>
+                    <!-- Retrieve Payara Server as a dependency and cache it via Maven -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>unpack</id>
+                                <phase>initialize</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>fish.payara.distributions</groupId>
+                                            <artifactId>payara</artifactId>
+                                            <version>${payara.version}</version>
+                                            <type>zip</type>
+                                            <overWrite>false</overWrite>
+                                            <outputDirectory>${project.build.directory}</outputDirectory>
+                                            <fileMappers>
+                                                <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                                                    <pattern>^payara\d</pattern>
+                                                    <replacement>payara</replacement>
+                                                </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                                            </fileMappers>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <!-- Build image via Docker Maven Plugin -->
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <alias>base</alias>
+                                    <name>${base.image}</name>
+                                    <build>
+                                        <buildx>
+                                            <platforms>
+                                                <platform>${docker.platforms}</platform>
+                                            </platforms>
+                                            <dockerStateDir>${project.build.directory}/buildx-state</dockerStateDir>
+                                        </buildx>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <args>
+                                            <JAVA_IMAGE>${java.image}</JAVA_IMAGE>
+                                            <UID>${base.image.uid}</UID>
+                                            <GID>${base.image.gid}</GID>
+                                        </args>
+                                        <filter>@</filter>
+                                        <assembly>
+                                            <descriptor>assembly.xml</descriptor>
+                                        </assembly>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                    </plugin>
+    
+                    <!--
+                      Flatten the generated POM before installing it, so modules depending on us are not
+                      trying to lookup the parent POM, which isn't of much use to them anyway.
+                    -->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>flatten-maven-plugin</artifactId>
+                        <version>1.2.7</version>
+                        <configuration>
+                            <updatePomFile>true</updatePomFile>
+                            <flattenMode>oss</flattenMode>
+                            <pomElements>
+                                <distributionManagement>remove</distributionManagement>
+                                <repositories>remove</repositories>
+                            </pomElements>
+                        </configuration>
+                        <executions>
+                            <!-- enable flattening -->
+                            <execution>
+                                <id>flatten</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>flatten</goal>
+                                </goals>
+                            </execution>
+                            <!-- ensure proper cleanup -->
+                            <execution>
+                                <id>flatten.clean</id>
+                                <phase>clean</phase>
+                                <goals>
+                                    <goal>clean</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    
+                    <!--
+                      This is here as a workaround to install the generated POM,
+                      so we can pick this modules build up as a dependency in others.
+                      
+                      See also https://github.com/fabric8io/docker-maven-plugin/issues/1537
+                    -->
+                    <plugin>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>default-install</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>install</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file
diff --git a/modules/container-base/src/backports/v6.1/001-pom.xml.patch b/modules/container-base/src/backports/v6.1/001-pom.xml.patch
new file mode 100644
index 00000000000..6498f972889
--- /dev/null
+++ b/modules/container-base/src/backports/v6.1/001-pom.xml.patch
@@ -0,0 +1,26 @@
+--- a/modules/container-base/pom.xml	2024-08-26 21:53:55.985584815 +0200
++++ b/modules/container-base/pom.xml	2024-08-26 21:38:09.925910314 +0200
+@@ -40,8 +42,11 @@
+             <properties>
+                 <packaging.type>docker-build</packaging.type>
+                 <base.image>gdcc/base:${base.image.tag}</base.image>
+-                <base.image.tag>unstable</base.image.tag>
+-                <java.image>eclipse-temurin:${target.java.version}-jre</java.image>
++                <base.image>gdcc/base:${base.image.tag}</base.image>
++                <base.image.tag>${base.image.version}-${java.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
++                <java.image>eclipse-temurin:${target.java.version}-jre-${java.image.flavor}</java.image>
++                <java.image.flavor>jammy</java.image.flavor>
+                 <base.image.uid>1000</base.image.uid>
+                 <base.image.gid>1000</base.image.gid>
+                 <docker.platforms>linux/amd64,linux/arm64</docker.platforms>
+@@ -110,6 +113,9 @@
+                                         <assembly>
+                                             <descriptor>assembly.xml</descriptor>
+                                         </assembly>
++                                        <tags>
++                                            <tag>${base.image.tag.revision}</tag>
++                                        </tags>
+                                     </build>
+                                 </image>
+                             </images>
diff --git a/modules/container-base/src/backports/v6.1/002-Dockerfile.patch b/modules/container-base/src/backports/v6.1/002-Dockerfile.patch
new file mode 100644
index 00000000000..4bb7a1eac91
--- /dev/null
+++ b/modules/container-base/src/backports/v6.1/002-Dockerfile.patch
@@ -0,0 +1,10 @@
+--- a/modules/container-base/src/main/docker/Dockerfile
++++ b/modules/container-base/src/main/docker/Dockerfile
+@@ -233,4 +233,6 @@ LABEL org.opencontainers.image.created="@git.build.time@" \
+       org.opencontainers.image.vendor="Global Dataverse Community Consortium" \
+       org.opencontainers.image.licenses="Apache-2.0" \
+       org.opencontainers.image.title="Dataverse Base Image" \
+-      org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software"
++      org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software" \
++      org.opencontainers.image.base.name="@java.image@" \
++      org.dataverse.deps.payara.version="@payara.version@"
diff --git a/modules/container-base/src/backports/v6.1/003-parent-pom.xml.patch b/modules/container-base/src/backports/v6.1/003-parent-pom.xml.patch
new file mode 100644
index 00000000000..a69cfd43ea7
--- /dev/null
+++ b/modules/container-base/src/backports/v6.1/003-parent-pom.xml.patch
@@ -0,0 +1,11 @@
+--- a/modules/dataverse-parent/pom.xml
++++ b/modules/dataverse-parent/pom.xml
+@@ -457,7 +457,8 @@
+                 <!--
+                     With moving to Payara 6, we are aligned with containers and classic install again.
+                 -->
+                 <!-- <payara.version>5.2022.5</payara.version> -->
++                <base.image.version>${revision}</base.image.version>
+             </properties>
+     
+             <build>
diff --git a/modules/container-base/src/backports/v6.2/001-pom.xml.patch b/modules/container-base/src/backports/v6.2/001-pom.xml.patch
new file mode 100644
index 00000000000..6498f972889
--- /dev/null
+++ b/modules/container-base/src/backports/v6.2/001-pom.xml.patch
@@ -0,0 +1,26 @@
+--- a/modules/container-base/pom.xml	2024-08-26 21:53:55.985584815 +0200
++++ b/modules/container-base/pom.xml	2024-08-26 21:38:09.925910314 +0200
+@@ -40,8 +42,11 @@
+             <properties>
+                 <packaging.type>docker-build</packaging.type>
+                 <base.image>gdcc/base:${base.image.tag}</base.image>
+-                <base.image.tag>unstable</base.image.tag>
+-                <java.image>eclipse-temurin:${target.java.version}-jre</java.image>
++                <base.image>gdcc/base:${base.image.tag}</base.image>
++                <base.image.tag>${base.image.version}-${java.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
++                <java.image>eclipse-temurin:${target.java.version}-jre-${java.image.flavor}</java.image>
++                <java.image.flavor>jammy</java.image.flavor>
+                 <base.image.uid>1000</base.image.uid>
+                 <base.image.gid>1000</base.image.gid>
+                 <docker.platforms>linux/amd64,linux/arm64</docker.platforms>
+@@ -110,6 +113,9 @@
+                                         <assembly>
+                                             <descriptor>assembly.xml</descriptor>
+                                         </assembly>
++                                        <tags>
++                                            <tag>${base.image.tag.revision}</tag>
++                                        </tags>
+                                     </build>
+                                 </image>
+                             </images>
diff --git a/modules/container-base/src/backports/v6.2/002-Dockerfile.labels.patch b/modules/container-base/src/backports/v6.2/002-Dockerfile.labels.patch
new file mode 100644
index 00000000000..fbb7f80c4ce
--- /dev/null
+++ b/modules/container-base/src/backports/v6.2/002-Dockerfile.labels.patch
@@ -0,0 +1,10 @@
+--- a/modules/container-base/src/main/docker/Dockerfile
++++ b/modules/container-base/src/main/docker/Dockerfile
+@@ -242,4 +242,6 @@ LABEL org.opencontainers.image.created="@git.build.time@" \
+       org.opencontainers.image.vendor="Global Dataverse Community Consortium" \
+       org.opencontainers.image.licenses="Apache-2.0" \
+       org.opencontainers.image.title="Dataverse Base Image" \
+-      org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software"
++      org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software" \
++      org.opencontainers.image.base.name="@java.image@" \
++      org.dataverse.deps.payara.version="@payara.version@"
diff --git a/modules/container-base/src/backports/v6.2/003-Dockerfile.security.patch b/modules/container-base/src/backports/v6.2/003-Dockerfile.security.patch
new file mode 100644
index 00000000000..1ab4c3a980a
--- /dev/null
+++ b/modules/container-base/src/backports/v6.2/003-Dockerfile.security.patch
@@ -0,0 +1,10 @@
+--- a/modules/container-base/src/main/docker/Dockerfile
++++ b/modules/container-base/src/main/docker/Dockerfile
+@@ -226,6 +226,7 @@ USER root
+ RUN true && \
+     chgrp -R 0 "${DOMAIN_DIR}" && \
+     chmod -R g=u "${DOMAIN_DIR}"
++USER payara
+ 
+ # Set the entrypoint to tini (as a process supervisor)
+ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
diff --git a/modules/container-base/src/backports/v6.2/004-parent-pom.xml.patch b/modules/container-base/src/backports/v6.2/004-parent-pom.xml.patch
new file mode 100644
index 00000000000..a69cfd43ea7
--- /dev/null
+++ b/modules/container-base/src/backports/v6.2/004-parent-pom.xml.patch
@@ -0,0 +1,11 @@
+--- a/modules/dataverse-parent/pom.xml
++++ b/modules/dataverse-parent/pom.xml
+@@ -457,7 +457,8 @@
+                 <!--
+                     With moving to Payara 6, we are aligned with containers and classic install again.
+                 -->
+                 <!-- <payara.version>5.2022.5</payara.version> -->
++                <base.image.version>${revision}</base.image.version>
+             </properties>
+     
+             <build>
diff --git a/modules/container-base/src/backports/v6.3/001-pom.xml.patch b/modules/container-base/src/backports/v6.3/001-pom.xml.patch
new file mode 100644
index 00000000000..6498f972889
--- /dev/null
+++ b/modules/container-base/src/backports/v6.3/001-pom.xml.patch
@@ -0,0 +1,26 @@
+--- a/modules/container-base/pom.xml	2024-08-26 21:53:55.985584815 +0200
++++ b/modules/container-base/pom.xml	2024-08-26 21:38:09.925910314 +0200
+@@ -40,8 +42,11 @@
+             <properties>
+                 <packaging.type>docker-build</packaging.type>
+                 <base.image>gdcc/base:${base.image.tag}</base.image>
+-                <base.image.tag>unstable</base.image.tag>
+-                <java.image>eclipse-temurin:${target.java.version}-jre</java.image>
++                <base.image>gdcc/base:${base.image.tag}</base.image>
++                <base.image.tag>${base.image.version}-${java.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
++                <java.image>eclipse-temurin:${target.java.version}-jre-${java.image.flavor}</java.image>
++                <java.image.flavor>jammy</java.image.flavor>
+                 <base.image.uid>1000</base.image.uid>
+                 <base.image.gid>1000</base.image.gid>
+                 <docker.platforms>linux/amd64,linux/arm64</docker.platforms>
+@@ -110,6 +113,9 @@
+                                         <assembly>
+                                             <descriptor>assembly.xml</descriptor>
+                                         </assembly>
++                                        <tags>
++                                            <tag>${base.image.tag.revision}</tag>
++                                        </tags>
+                                     </build>
+                                 </image>
+                             </images>
diff --git a/modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch b/modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch
new file mode 100644
index 00000000000..c7744882153
--- /dev/null
+++ b/modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch
@@ -0,0 +1,10 @@
+--- a/modules/container-base/src/main/docker/Dockerfile
++++ b/modules/container-base/src/main/docker/Dockerfile
+@@ -240,4 +241,6 @@ LABEL org.opencontainers.image.created="@git.build.time@" \
+       org.opencontainers.image.vendor="Global Dataverse Community Consortium" \
+       org.opencontainers.image.licenses="Apache-2.0" \
+       org.opencontainers.image.title="Dataverse Base Image" \
+-      org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software"
++      org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software" \
++      org.opencontainers.image.base.name="@java.image@" \
++      org.dataverse.deps.payara.version="@payara.version@"
diff --git a/modules/container-base/src/backports/v6.3/003-Dockerfile.security.patch b/modules/container-base/src/backports/v6.3/003-Dockerfile.security.patch
new file mode 100644
index 00000000000..d8487b3aacc
--- /dev/null
+++ b/modules/container-base/src/backports/v6.3/003-Dockerfile.security.patch
@@ -0,0 +1,7 @@
+--- a/modules/container-base/src/main/docker/Dockerfile
++++ b/modules/container-base/src/main/docker/Dockerfile
+@@ -224,6 +224,7 @@ USER root
+ RUN true && \
+     chgrp -R 0 "${DOMAIN_DIR}" && \
+     chmod -R g=u "${DOMAIN_DIR}"
++USER payara
diff --git a/modules/container-base/src/backports/v6.3/004-parent-pom.xml.patch b/modules/container-base/src/backports/v6.3/004-parent-pom.xml.patch
new file mode 100644
index 00000000000..a69cfd43ea7
--- /dev/null
+++ b/modules/container-base/src/backports/v6.3/004-parent-pom.xml.patch
@@ -0,0 +1,11 @@
+--- a/modules/dataverse-parent/pom.xml
++++ b/modules/dataverse-parent/pom.xml
+@@ -457,7 +457,8 @@
+                 <!--
+                     With moving to Payara 6, we are aligned with containers and classic install again.
+                 -->
+                 <!-- <payara.version>5.2022.5</payara.version> -->
++                <base.image.version>${revision}</base.image.version>
+             </properties>
+     
+             <build>
diff --git a/modules/container-base/src/backports/v6.4/001-fix-password-script.patch b/modules/container-base/src/backports/v6.4/001-fix-password-script.patch
new file mode 100644
index 00000000000..3169d924084
--- /dev/null
+++ b/modules/container-base/src/backports/v6.4/001-fix-password-script.patch
@@ -0,0 +1,31 @@
+diff --git a/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh b/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
+index 0bf9d0b80f..b640e4d1fc 100644
+--- a/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
++++ b/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
+@@ -8,7 +8,7 @@ set -euo pipefail
+ # Someone set the env var for passwords - get the new password in. Otherwise print warning.
+ # https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#avoid-default-passwords
+ if [ "$LINUX_PASSWORD" != "payara" ]; then
+-  echo -e "$LINUX_USER\n$LINUX_PASSWORD\n$LINUX_PASSWORD" | passwd
++  echo -e "$LINUX_USER\n$LINUX_PASSWORD\n$LINUX_PASSWORD" | passwd || { echo "Linux password unchanged!"; }
+ else
+   echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT PASSWORD FOR USER \"${LINUX_USER}\"! ('payara')"
+   echo "           To change the password, set the LINUX_PASSWORD env var."
+@@ -19,7 +19,7 @@ if [ "$PAYARA_ADMIN_PASSWORD" != "admin" ]; then
+   PASSWORD_FILE=$(mktemp)
+   echo "AS_ADMIN_PASSWORD=admin" > "$PASSWORD_FILE"
+   echo "AS_ADMIN_NEWPASSWORD=${PAYARA_ADMIN_PASSWORD}" >> "$PASSWORD_FILE"
+-  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-admin-password --domain_name="${DOMAIN_NAME}"
++  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-admin-password --domain_name="${DOMAIN_NAME}" || { echo "Payara password unchanged!"; }
+   rm "$PASSWORD_FILE"
+ else
+   echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT PASSWORD FOR PAYARA ADMIN \"${PAYARA_ADMIN_USER}\"! ('admin')"
+@@ -35,7 +35,7 @@ if [ "$DOMAIN_PASSWORD" != "changeit" ]; then
+   PASSWORD_FILE=$(mktemp)
+   echo "AS_ADMIN_MASTERPASSWORD=changeit" >> "$PASSWORD_FILE"
+   echo "AS_ADMIN_NEWMASTERPASSWORD=${DOMAIN_PASSWORD}" >> "$PASSWORD_FILE"
+-  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-master-password --savemasterpassword false "${DOMAIN_NAME}"
++  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-master-password --savemasterpassword false "${DOMAIN_NAME}" || { echo "Domain password unchanged!"; }
+   rm "$PASSWORD_FILE"
+ else
+   echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT DOMAIN \"MASTER\" PASSWORD! ('changeit')"
diff --git a/modules/container-base/src/backports/v6.5/001-fix-password-script.patch b/modules/container-base/src/backports/v6.5/001-fix-password-script.patch
new file mode 100644
index 00000000000..3169d924084
--- /dev/null
+++ b/modules/container-base/src/backports/v6.5/001-fix-password-script.patch
@@ -0,0 +1,31 @@
+diff --git a/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh b/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
+index 0bf9d0b80f..b640e4d1fc 100644
+--- a/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
++++ b/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
+@@ -8,7 +8,7 @@ set -euo pipefail
+ # Someone set the env var for passwords - get the new password in. Otherwise print warning.
+ # https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#avoid-default-passwords
+ if [ "$LINUX_PASSWORD" != "payara" ]; then
+-  echo -e "$LINUX_USER\n$LINUX_PASSWORD\n$LINUX_PASSWORD" | passwd
++  echo -e "$LINUX_USER\n$LINUX_PASSWORD\n$LINUX_PASSWORD" | passwd || { echo "Linux password unchanged!"; }
+ else
+   echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT PASSWORD FOR USER \"${LINUX_USER}\"! ('payara')"
+   echo "           To change the password, set the LINUX_PASSWORD env var."
+@@ -19,7 +19,7 @@ if [ "$PAYARA_ADMIN_PASSWORD" != "admin" ]; then
+   PASSWORD_FILE=$(mktemp)
+   echo "AS_ADMIN_PASSWORD=admin" > "$PASSWORD_FILE"
+   echo "AS_ADMIN_NEWPASSWORD=${PAYARA_ADMIN_PASSWORD}" >> "$PASSWORD_FILE"
+-  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-admin-password --domain_name="${DOMAIN_NAME}"
++  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-admin-password --domain_name="${DOMAIN_NAME}" || { echo "Payara password unchanged!"; }
+   rm "$PASSWORD_FILE"
+ else
+   echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT PASSWORD FOR PAYARA ADMIN \"${PAYARA_ADMIN_USER}\"! ('admin')"
+@@ -35,7 +35,7 @@ if [ "$DOMAIN_PASSWORD" != "changeit" ]; then
+   PASSWORD_FILE=$(mktemp)
+   echo "AS_ADMIN_MASTERPASSWORD=changeit" >> "$PASSWORD_FILE"
+   echo "AS_ADMIN_NEWMASTERPASSWORD=${DOMAIN_PASSWORD}" >> "$PASSWORD_FILE"
+-  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-master-password --savemasterpassword false "${DOMAIN_NAME}"
++  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-master-password --savemasterpassword false "${DOMAIN_NAME}" || { echo "Domain password unchanged!"; }
+   rm "$PASSWORD_FILE"
+ else
+   echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT DOMAIN \"MASTER\" PASSWORD! ('changeit')"
diff --git a/modules/container-base/src/backports/v6.6/001-fix-password-script.patch b/modules/container-base/src/backports/v6.6/001-fix-password-script.patch
new file mode 100644
index 00000000000..3169d924084
--- /dev/null
+++ b/modules/container-base/src/backports/v6.6/001-fix-password-script.patch
@@ -0,0 +1,31 @@
+diff --git a/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh b/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
+index 0bf9d0b80f..b640e4d1fc 100644
+--- a/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
++++ b/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
+@@ -8,7 +8,7 @@ set -euo pipefail
+ # Someone set the env var for passwords - get the new password in. Otherwise print warning.
+ # https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#avoid-default-passwords
+ if [ "$LINUX_PASSWORD" != "payara" ]; then
+-  echo -e "$LINUX_USER\n$LINUX_PASSWORD\n$LINUX_PASSWORD" | passwd
++  echo -e "$LINUX_USER\n$LINUX_PASSWORD\n$LINUX_PASSWORD" | passwd || { echo "Linux password unchanged!"; }
+ else
+   echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT PASSWORD FOR USER \"${LINUX_USER}\"! ('payara')"
+   echo "           To change the password, set the LINUX_PASSWORD env var."
+@@ -19,7 +19,7 @@ if [ "$PAYARA_ADMIN_PASSWORD" != "admin" ]; then
+   PASSWORD_FILE=$(mktemp)
+   echo "AS_ADMIN_PASSWORD=admin" > "$PASSWORD_FILE"
+   echo "AS_ADMIN_NEWPASSWORD=${PAYARA_ADMIN_PASSWORD}" >> "$PASSWORD_FILE"
+-  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-admin-password --domain_name="${DOMAIN_NAME}"
++  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-admin-password --domain_name="${DOMAIN_NAME}" || { echo "Payara password unchanged!"; }
+   rm "$PASSWORD_FILE"
+ else
+   echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT PASSWORD FOR PAYARA ADMIN \"${PAYARA_ADMIN_USER}\"! ('admin')"
+@@ -35,7 +35,7 @@ if [ "$DOMAIN_PASSWORD" != "changeit" ]; then
+   PASSWORD_FILE=$(mktemp)
+   echo "AS_ADMIN_MASTERPASSWORD=changeit" >> "$PASSWORD_FILE"
+   echo "AS_ADMIN_NEWMASTERPASSWORD=${DOMAIN_PASSWORD}" >> "$PASSWORD_FILE"
+-  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-master-password --savemasterpassword false "${DOMAIN_NAME}"
++  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-master-password --savemasterpassword false "${DOMAIN_NAME}" || { echo "Domain password unchanged!"; }
+   rm "$PASSWORD_FILE"
+ else
+   echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT DOMAIN \"MASTER\" PASSWORD! ('changeit')"
diff --git a/modules/container-base/src/main/docker/Dockerfile b/modules/container-base/src/main/docker/Dockerfile
new file mode 100644
index 00000000000..ed13b77c449
--- /dev/null
+++ b/modules/container-base/src/main/docker/Dockerfile
@@ -0,0 +1,273 @@
+# Copyright 2022 Forschungszentrum JÃŧlich GmbH
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+################################################################################################################
+#
+# THIS FILE IS TO BE USED WITH MAVEN DOCKER BUILD:
+# mvn -Pct clean package docker:build
+#
+################################################################################################################
+#
+# Some commands used are inspired by https://github.com/payara/Payara/tree/master/appserver/extras/docker-images.
+# Most parts origin from older versions of https://github.com/gdcc/dataverse-kubernetes.
+#
+# We are not using upstream Payara images because:
+#  - Using same base image as Solr (https://hub.docker.com/_/solr) is reducing pulls
+#  - Their image is less optimised for production usage and Dataverse by design choices
+#  - We provide multi-arch images
+#  - We provide some tweaks for development and monitoring
+#
+
+# Make the Java base image and version configurable (useful for trying newer Java versions and flavors)
+ARG JAVA_IMAGE="eclipse-temurin:17-jre"
+FROM $JAVA_IMAGE
+
+# Default payara ports to expose
+# 4848: admin console
+# 9009: debug port (JDWP)
+# 8080: http
+# 8181: https - but http-listener-2 is disabled here!
+# 8686: JMX
+EXPOSE 4848 9009 8080 8686
+
+ENV HOME_DIR="/opt/payara"
+ENV PAYARA_DIR="${HOME_DIR}/appserver" \
+    SCRIPT_DIR="${HOME_DIR}/scripts" \
+    CONFIG_DIR="${HOME_DIR}/config" \
+    DEPLOY_DIR="${HOME_DIR}/deployments" \
+    STORAGE_DIR="/dv" \
+    SECRETS_DIR="/secrets" \
+    DUMPS_DIR="/dumps" \
+    PAYARA_ADMIN_USER="admin" \
+    # This is a public default, easy to change via this env var at runtime
+    PAYARA_ADMIN_PASSWORD="admin" \
+    DOMAIN_NAME="domain1" \
+    # This is the public default as per https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/Security%20Guide/Administering%20System%20Security.html#to-change-the-master-password
+    # Can be changed at runtime via this env var
+    DOMAIN_PASSWORD="changeit" \
+    PAYARA_ARGS="" \
+    LINUX_USER="payara" \
+    LINUX_GROUP="payara" \
+    # This is a public default and can be changed at runtime using this env var
+    LINUX_PASSWORD="payara"
+ENV PATH="${PATH}:${PAYARA_DIR}/bin:${SCRIPT_DIR}" \
+    DOMAIN_DIR="${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}" \
+    DEPLOY_PROPS="" \
+    JVM_ARGS="" \
+    MEM_MAX_RAM_PERCENTAGE="70.0" \
+    MEM_XSS="512k" \
+    # Source: https://github.com/fabric8io-images/run-java-sh/blob/master/TUNING.md#recommandations
+    MEM_MIN_HEAP_FREE_RATIO="20" \
+    MEM_MAX_HEAP_FREE_RATIO="40" \
+    MEM_MAX_GC_PAUSE_MILLIS="500" \
+    MEM_METASPACE_SIZE="256m" \
+    MEM_MAX_METASPACE_SIZE="2g" \
+    # Make heap dumps on OOM appear in DUMPS_DIR
+    ENABLE_DUMPS=0 \
+    JVM_DUMPS_ARG="-XX:+HeapDumpOnOutOfMemoryError" \
+    ENABLE_JMX=0 \
+    ENABLE_JDWP=0 \
+    ENABLE_RELOAD=0 \
+    SKIP_DEPLOY=0
+
+### PART 1: SYSTEM ###
+ARG UID=1000
+ARG GID=1000
+# Auto-populated by BuildKit / buildx
+#ARG TARGETARCH="amd64"
+ARG TARGETARCH
+
+USER root
+WORKDIR /
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+# Mark these directories as mutuable data containers to avoid cluttering the images overlayfs at runtime.
+VOLUME ${STORAGE_DIR} ${SECRETS_DIR} ${DUMPS_DIR}
+RUN <<EOF
+    # Create pathes
+    mkdir -p "${HOME_DIR}" "${PAYARA_DIR}" "${DEPLOY_DIR}" "${CONFIG_DIR}" "${SCRIPT_DIR}"
+    mkdir -p "${STORAGE_DIR}" "${SECRETS_DIR}" "${DUMPS_DIR}"
+    # Remove the default user if present (do not fail build if not, introduced by Ubuntu 24.04)
+    userdel --force --remove ubuntu || true
+    groupdel -f ubuntu || true # for some reason, groupdel on Ubuntu 22.04 does not like --force
+    # Create user
+    groupadd --gid "${GID}" "${LINUX_GROUP}"
+    useradd --system --uid "${UID}" --no-create-home --shell /bin/false --home "${HOME_DIR}" --gid "${LINUX_GROUP}" "${LINUX_USER}"
+    echo "${LINUX_USER}:$LINUX_PASSWORD" | chpasswd
+    # Set permissions
+    # Note: Following OpenShift best practices for arbitrary user id support:
+    #       https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#use-uid_create-images
+    chown -R "${LINUX_USER}:0" "${HOME_DIR}" "${STORAGE_DIR}" "${SECRETS_DIR}" "${DUMPS_DIR}"
+    chmod -R g=u "${HOME_DIR}" "${STORAGE_DIR}" "${SECRETS_DIR}" "${DUMPS_DIR}"
+EOF
+
+ARG JATTACH_VERSION="v2.2"
+ARG JATTACH_TGZ_CHECKSUM_AMD64="acd9e17f15749306be843df392063893e97bfecc5260eef73ee98f06e5cfe02f"
+ARG JATTACH_TGZ_CHECKSUM_ARM64="288ae5ed87ee7fe0e608c06db5a23a096a6217c9878ede53c4e33710bdcaab51"
+ARG WAIT4X_VERSION="v2.14.2"
+ARG PKGS="jq imagemagick curl unzip wget acl lsof procps netcat-openbsd dumb-init"
+
+# Installing the packages in an extra container layer for better caching
+RUN <<EOF
+    # Install packages
+    apt-get update -q
+    apt-get install -qqy --no-install-recommends ${PKGS}
+    rm -rf "/var/lib/apt/lists/*"
+
+    # Install jattach & wait4x
+    if [ "${TARGETARCH}" = "amd64" ]; then
+      curl -sSfL -o /usr/bin/jattach.tgz "https://github.com/jattach/jattach/releases/download/${JATTACH_VERSION}/jattach-linux-x64.tgz"
+      echo "${JATTACH_TGZ_CHECKSUM_AMD64} /usr/bin/jattach.tgz" | sha256sum -c -
+    elif [ "${TARGETARCH}" = "arm64" ]; then
+      curl -sSfL -o /usr/bin/jattach.tgz "https://github.com/jattach/jattach/releases/download/${JATTACH_VERSION}/jattach-linux-arm64.tgz"
+      echo "${JATTACH_TGZ_CHECKSUM_ARM64} /usr/bin/jattach.tgz" | sha256sum -c -
+    fi
+    tar -xzf /usr/bin/jattach.tgz -C /usr/bin && chmod +x /usr/bin/jattach
+
+    # Install wait4x
+    curl -sSfL -o /usr/bin/wait4x.tar.gz "https://github.com/atkrad/wait4x/releases/download/${WAIT4X_VERSION}/wait4x-linux-${TARGETARCH}.tar.gz"
+    curl -sSfL -o /tmp/w4x-checksum "https://github.com/atkrad/wait4x/releases/download/${WAIT4X_VERSION}/wait4x-linux-${TARGETARCH}.tar.gz.sha256sum"
+    echo "$(cat /tmp/w4x-checksum | cut -f1 -d" ") /usr/bin/wait4x.tar.gz" | sha256sum -c -
+    tar -xzf /usr/bin/wait4x.tar.gz -C /usr/bin && chmod +x /usr/bin/wait4x
+EOF
+
+### PART 2: PAYARA ###
+# After setting up system, now configure Payara
+USER ${LINUX_USER}
+WORKDIR ${HOME_DIR}
+
+# Copy Payara from build context (cached by Maven)
+COPY --chown=${LINUX_USER}:${LINUX_GROUP} maven/appserver ${PAYARA_DIR}/
+
+# Copy the system (appserver level) scripts like entrypoint, etc
+COPY --chown=${LINUX_USER}:${LINUX_USER} maven/scripts ${SCRIPT_DIR}/
+
+# Configure the domain to be container and production ready
+# -- This is mostly inherited from the "production domain template", experience with Dataverse and
+#    https://blog.payara.fish/fine-tuning-payara-server-5-in-production
+RUN <<EOF
+    # Set admin password
+    echo "AS_ADMIN_PASSWORD=" > /tmp/password-change-file.txt
+    echo "AS_ADMIN_NEWPASSWORD=${PAYARA_ADMIN_PASSWORD}" >> /tmp/password-change-file.txt
+    asadmin --user=${PAYARA_ADMIN_USER} --passwordfile=/tmp/password-change-file.txt change-admin-password --domain_name=${DOMAIN_NAME}
+
+    # Prepare shorthand
+    PASSWORD_FILE=$(mktemp)
+    echo "AS_ADMIN_PASSWORD=${PAYARA_ADMIN_PASSWORD}" >> ${PASSWORD_FILE}
+    ASADMIN="${PAYARA_DIR}/bin/asadmin --user=${PAYARA_ADMIN_USER} --passwordfile=${PASSWORD_FILE}"
+
+    # Start domain for configuration
+    ${ASADMIN} start-domain ${DOMAIN_NAME}
+    # Allow access to admin with password only
+    ${ASADMIN} enable-secure-admin
+
+    ### CONTAINER USAGE ENABLEMENT
+    # List & delete memory settings from domain
+    for MEMORY_JVM_OPTION in $(${ASADMIN} list-jvm-options | grep "Xm[sx]\|Xss\|NewRatio");
+       do
+         ${ASADMIN} delete-jvm-options $(echo $MEMORY_JVM_OPTION | sed -e 's/:/\\:/g');
+       done
+    # Tweak memory settings for containers
+    ${ASADMIN} create-jvm-options "-XX\:+UseContainerSupport"
+    ${ASADMIN} create-jvm-options "-XX\:MaxRAMPercentage=\${ENV=MEM_MAX_RAM_PERCENTAGE}"
+    ${ASADMIN} create-jvm-options "-Xss\${ENV=MEM_XSS}"
+    ${ASADMIN} create-jvm-options "-XX\:MinHeapFreeRatio=\${ENV=MEM_MIN_HEAP_FREE_RATIO}"
+    ${ASADMIN} create-jvm-options "-XX\:MaxHeapFreeRatio=\${ENV=MEM_MAX_HEAP_FREE_RATIO}"
+    ${ASADMIN} create-jvm-options "-XX\:HeapDumpPath=\${ENV=DUMPS_DIR}"
+    # Set logging to console only for containers
+    ${ASADMIN} set-log-attributes com.sun.enterprise.server.logging.GFFileHandler.logtoFile=false
+
+    ### PRODUCTION READINESS
+    ${ASADMIN} create-jvm-options '-XX\:+UseG1GC'
+    ${ASADMIN} create-jvm-options '-XX\:+UseStringDeduplication'
+    ${ASADMIN} create-jvm-options '-XX\:+DisableExplicitGC'
+    ${ASADMIN} create-jvm-options '-XX\:MaxGCPauseMillis=${ENV=MEM_MAX_GC_PAUSE_MILLIS}'
+    ${ASADMIN} create-jvm-options '-XX\:MetaspaceSize=${ENV=MEM_METASPACE_SIZE}'
+    ${ASADMIN} create-jvm-options '-XX\:MaxMetaspaceSize=${ENV=MEM_MAX_METASPACE_SIZE}'
+    ${ASADMIN} create-jvm-options '-XX\:+IgnoreUnrecognizedVMOptions'
+    # Disable autodeploy and hot reload
+    ${ASADMIN} set configs.config.server-config.admin-service.das-config.dynamic-reload-enabled="false"
+    ${ASADMIN} set configs.config.server-config.admin-service.das-config.autodeploy-enabled="false"
+    # Enlarge thread pools
+    ${ASADMIN} set server-config.thread-pools.thread-pool.http-thread-pool.max-thread-pool-size="50"
+    ${ASADMIN} set server-config.thread-pools.thread-pool.http-thread-pool.max-queue-size=""
+    ${ASADMIN} set default-config.thread-pools.thread-pool.thread-pool-1.max-thread-pool-size="250"
+    # Enable file caching
+    ${ASADMIN} set server-config.network-config.protocols.protocol.http-listener-1.http.file-cache.enabled="true"
+    ${ASADMIN} set server-config.network-config.protocols.protocol.http-listener-2.http.file-cache.enabled="true"
+    ${ASADMIN} set default-config.network-config.protocols.protocol.http-listener-1.http.file-cache.enabled="true"
+    ${ASADMIN} set default-config.network-config.protocols.protocol.http-listener-2.http.file-cache.enabled="true"
+    # Set SameSite cookie value: https://docs.payara.fish/community/docs/6.2024.6/Technical%20Documentation/Payara%20Server%20Documentation/General%20Administration/Administering%20HTTP%20Connectivity.html
+    # The following dynamic version is what we want, modeled off "${MPCONFIG=dataverse.http.timeout:900}"
+    # but it's not working so it's commented out. Instead, we hard code the value to "Lax". This means you have
+    # to build your own base image if you'd like to change it.
+    #${ASADMIN} set server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-value=${MPCONFIG=dataverse.cookie-same-site-value:Lax}'
+    ${ASADMIN} set server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-value="Lax"
+    ${ASADMIN} set server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-enabled="true"
+    # Disable the HTTPS listener (we are always fronting our appservers with a reverse proxy handling SSL)
+    ${ASADMIN} set configs.config.server-config.network-config.network-listeners.network-listener.http-listener-2.enabled="false"
+    # Enlarge and tune EJB pools (cannot do this for server-config as set does not create new entries)
+    ${ASADMIN} set default-config.ejb-container.pool-resize-quantity="2"
+    ${ASADMIN} set default-config.ejb-container.max-pool-size="128"
+    ${ASADMIN} set default-config.ejb-container.steady-pool-size="10"
+    # Misc settings
+    ${ASADMIN} create-system-properties fish.payara.classloading.delegate="false"
+    ${ASADMIN} create-system-properties jersey.config.client.readTimeout="300000"
+    ${ASADMIN} create-system-properties jersey.config.client.connectTimeout="300000"
+
+    ### DATAVERSE APPLICATION SPECIFICS
+    # Configure the MicroProfile directory config source to point to /secrets
+    ${ASADMIN} set-config-dir --directory="${SECRETS_DIR}"
+    # Password alias store = 105, default = 100 - lets sort between those to enable overriding from all of the others
+    # except alias config source and microprofile-config.properties
+    ${ASADMIN} set-config-ordinal --ordinal=104 --source=secrets
+    # Make request timeouts configurable via MPCONFIG (default to 900 secs = 15 min)
+    ${ASADMIN} set 'server-config.network-config.protocols.protocol.http-listener-1.http.request-timeout-seconds=${MPCONFIG=dataverse.http.timeout:900}'
+    # TODO: what of the below 3 items can be deleted for container usage?
+    ${ASADMIN} create-network-listener --protocol=http-listener-1 --listenerport=8009 --jkenabled=true jk-connector
+    ${ASADMIN} set server-config.network-config.protocols.protocol.http-listener-1.http.comet-support-enabled=true
+    ${ASADMIN} create-system-properties javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl
+    # Always disable phoning home
+    ${ASADMIN} disable-phone-home
+
+    ### CLEANUP
+    # Stop domain
+    ${ASADMIN} stop-domain "${DOMAIN_NAME}"
+    # Disable JSP servlet dynamic reloads
+    sed -i 's#<servlet-class>org.glassfish.wasp.servlet.JspServlet</servlet-class>#<servlet-class>org.glassfish.wasp.servlet.JspServlet</servlet-class>\n    <init-param>\n      <param-name>development</param-name>\n      <param-value>false</param-value>\n    </init-param>\n    <init-param>\n      <param-name>genStrAsCharArray</param-name>\n      <param-value>true</param-value>\n    </init-param>#' "${DOMAIN_DIR}/config/default-web.xml"
+    # Cleanup old CA certificates to avoid unnecessary log clutter during startup
+    ${SCRIPT_DIR}/removeExpiredCaCerts.sh
+    # Delete generated files
+    rm -rf \
+        "$PASSWORD_FILE" \
+        "/tmp/password-change-file.txt" \
+        "${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}/osgi-cache" \
+        "${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}/logs"
+EOF
+
+USER root
+# Prepare domain directory to be writeable when running on OpenShift (arbitrary UIDs)
+# https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#use-uid_create-images
+RUN true && \
+    chgrp -R 0 "${DOMAIN_DIR}" && \
+    chmod -R g=u "${DOMAIN_DIR}"
+USER ${LINUX_USER}
+
+# Set the entrypoint to tini (as a process supervisor)
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+# This works because we add ${SCRIPT_DIR} to $PATH above!
+CMD ["entrypoint.sh"]
+
+LABEL org.opencontainers.image.created="@git.build.time@" \
+      org.opencontainers.image.authors="Research Data Management at FZJ <forschungsdaten@fz-juelich.de>" \
+      org.opencontainers.image.url="https://guides.dataverse.org/en/latest/container/" \
+      org.opencontainers.image.documentation="https://guides.dataverse.org/en/latest/container/" \
+      org.opencontainers.image.source="https://github.com/IQSS/dataverse/tree/develop/modules/container-base" \
+      org.opencontainers.image.version="@project.version@" \
+      org.opencontainers.image.revision="@git.commit.id.abbrev@" \
+      org.opencontainers.image.vendor="Global Dataverse Community Consortium" \
+      org.opencontainers.image.licenses="Apache-2.0" \
+      org.opencontainers.image.title="Dataverse Base Image" \
+      org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software"
diff --git a/modules/container-base/src/main/docker/assembly.xml b/modules/container-base/src/main/docker/assembly.xml
new file mode 100644
index 00000000000..9fc62d49fa1
--- /dev/null
+++ b/modules/container-base/src/main/docker/assembly.xml
@@ -0,0 +1,17 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <fileSets>
+        <!-- Get the application server (unpacked by dependency plugin) -->
+        <fileSet>
+            <directory>${project.basedir}/target/payara</directory>
+            <outputDirectory>appserver</outputDirectory>
+        </fileSet>
+        <!-- Init scripts -->
+        <fileSet>
+            <directory>${project.basedir}/src/main/docker/scripts</directory>
+            <outputDirectory>scripts</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/modules/container-base/src/main/docker/scripts/entrypoint.sh b/modules/container-base/src/main/docker/scripts/entrypoint.sh
new file mode 100644
index 00000000000..ed3b8ea9aa4
--- /dev/null
+++ b/modules/container-base/src/main/docker/scripts/entrypoint.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/dumb-init /bin/bash
+##########################################################################################################
+#
+#  This script is a fork of https://github.com/payara/Payara/blob/master/appserver/extras/docker-images/
+#  server-full/src/main/docker/bin/entrypoint.sh and licensed under CDDL 1.1 by the Payara Foundation.
+#
+##########################################################################################################
+
+# This shellscript is supposed to be executed by https://github.com/Yelp/dumb-init to keep subprocesses
+# and zombies under control. If the ENTRYPOINT command is changed, it will still use dumb-init because shebang.
+# dumb-init takes care to send any signals to subshells, too! (Which might run in the background...)
+
+# We do not define these variables within our Dockerfile so the location can be changed when trying to avoid
+# writes to the overlay filesystem. (CONFIG_DIR is defined within the Dockerfile, but might be overridden.)
+PREBOOT_COMMANDS_FILE=${PREBOOT_COMMANDS:-"${CONFIG_DIR}/pre-boot-commands.asadmin"}
+export PREBOOT_COMMANDS_FILE
+POSTBOOT_COMMANDS_FILE=${POSTBOOT_COMMANDS:-"${CONFIG_DIR}/post-boot-commands.asadmin"}
+export POSTBOOT_COMMANDS_FILE
+
+# Remove existing POSTBOOT/PREBOOT files if they exist. Anything to be done needs to be injected by a script
+rm -rf "$POSTBOOT_COMMANDS_FILE" || exit 1
+rm -rf "$PREBOOT_COMMANDS_FILE" || exit 1
+
+# Execute any scripts BEFORE the appserver starts
+for f in "${SCRIPT_DIR}"/init_* "${SCRIPT_DIR}"/init.d/*; do
+      # shellcheck disable=SC1090
+      case "$f" in
+        *.sh)  echo "[Entrypoint] running $f"; . "$f" ;;
+        *)     echo "[Entrypoint] ignoring $f" ;;
+      esac
+      echo
+done
+
+# If present, run a startInBackground.sh in the background (e.g. to run tasks AFTER the application server starts)
+if [ -x "${SCRIPT_DIR}/startInBackground.sh" ]; then
+    echo "[Entrypoint] running ${SCRIPT_DIR}/startInBackground.sh in background"
+    "${SCRIPT_DIR}"/startInBackground.sh &
+fi
+
+# Start the application server and make it REPLACE this shell, so init system and Java directly interact
+# Remember - this means no code below this statement will be run!
+echo "[Entrypoint] running ${SCRIPT_DIR}/startInForeground.sh in foreground"
+exec "${SCRIPT_DIR}"/startInForeground.sh "${PAYARA_ARGS}"
diff --git a/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh b/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
new file mode 100644
index 00000000000..b640e4d1fc1
--- /dev/null
+++ b/modules/container-base/src/main/docker/scripts/init_1_change_passwords.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+set -euo pipefail
+
+# NOTE: ALL PASSWORD ENV VARS WILL BE SCRAMBLED IN startInForeground.sh FOR SECURITY!
+#       This is to avoid possible attack vectors where someone could extract the sensitive information
+#       from within an env var dump inside an application!
+
+# Someone set the env var for passwords - get the new password in. Otherwise print warning.
+# https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#avoid-default-passwords
+if [ "$LINUX_PASSWORD" != "payara" ]; then
+  echo -e "$LINUX_USER\n$LINUX_PASSWORD\n$LINUX_PASSWORD" | passwd || { echo "Linux password unchanged!"; }
+else
+  echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT PASSWORD FOR USER \"${LINUX_USER}\"! ('payara')"
+  echo "           To change the password, set the LINUX_PASSWORD env var."
+fi
+
+# Change the domain admin password if necessary
+if [ "$PAYARA_ADMIN_PASSWORD" != "admin" ]; then
+  PASSWORD_FILE=$(mktemp)
+  echo "AS_ADMIN_PASSWORD=admin" > "$PASSWORD_FILE"
+  echo "AS_ADMIN_NEWPASSWORD=${PAYARA_ADMIN_PASSWORD}" >> "$PASSWORD_FILE"
+  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-admin-password --domain_name="${DOMAIN_NAME}" || { echo "Payara password unchanged!"; }
+  rm "$PASSWORD_FILE"
+else
+  echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT PASSWORD FOR PAYARA ADMIN \"${PAYARA_ADMIN_USER}\"! ('admin')"
+  echo "           To change the password, set the PAYARA_ADMIN_PASSWORD env var."
+fi
+
+# Change the domain master password if necessary
+# > The master password is not tied to a user account, and it is not used for authentication.
+# > Instead, Payara Server strictly uses the master password to ONLY encrypt the keystore and truststore used to store keys and certificates for the DAS and instances usage.
+# It will be requested when booting the application server!
+# https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/Security%20Guide/Administering%20System%20Security.html#to-change-the-master-password
+if [ "$DOMAIN_PASSWORD" != "changeit" ]; then
+  PASSWORD_FILE=$(mktemp)
+  echo "AS_ADMIN_MASTERPASSWORD=changeit" >> "$PASSWORD_FILE"
+  echo "AS_ADMIN_NEWMASTERPASSWORD=${DOMAIN_PASSWORD}" >> "$PASSWORD_FILE"
+  asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" change-master-password --savemasterpassword false "${DOMAIN_NAME}" || { echo "Domain password unchanged!"; }
+  rm "$PASSWORD_FILE"
+else
+  echo "IMPORTANT: THIS CONTAINER USES THE DEFAULT DOMAIN \"MASTER\" PASSWORD! ('changeit')"
+  echo "           To change the password, set the DOMAIN_PASSWORD env var."
+fi
diff --git a/modules/container-base/src/main/docker/scripts/init_1_generate_deploy_commands.sh b/modules/container-base/src/main/docker/scripts/init_1_generate_deploy_commands.sh
new file mode 100644
index 00000000000..622ea82d6f6
--- /dev/null
+++ b/modules/container-base/src/main/docker/scripts/init_1_generate_deploy_commands.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+##########################################################################################################
+#
+# A script to append deploy commands to the post boot command file at
+# $PAYARA_HOME/scripts/post-boot-commands.asadmin file. All applications in the
+# $DEPLOY_DIR (either files or folders) will be deployed.
+# The $POSTBOOT_COMMANDS file can then be used with the start-domain using the
+#  --postbootcommandfile parameter to deploy applications on startup.
+#
+# Usage:
+# ./generate_deploy_commands.sh
+#
+# Optionally, any number of parameters of the asadmin deploy command can be
+# specified as parameters to this script.
+# E.g., to deploy applications with implicit CDI scanning disabled:
+#
+# ./generate_deploy_commands.sh --properties=implicitCdiEnabled=false
+#
+# Environment variables used:
+#   - $PREBOOT_COMMANDS - the pre boot command file.
+#   - $POSTBOOT_COMMANDS - the post boot command file.
+#
+# Note that many parameters to the deploy command can be safely used only when
+# a single application exists in the $DEPLOY_DIR directory.
+#
+##########################################################################################################
+#
+#  This script is a fork of https://github.com/payara/Payara/blob/master/appserver/extras/docker-images/
+#  server-full/src/main/docker/bin/init_1_generate_deploy_commands.sh and licensed under CDDL 1.1
+#  by the Payara Foundation.
+#
+##########################################################################################################
+
+set -euo pipefail
+
+# Check required variables are set
+if [ -z "$DEPLOY_DIR" ]; then echo "Variable DEPLOY_DIR is not set."; exit 1; fi
+if [ -z "$PREBOOT_COMMANDS_FILE" ]; then echo "Variable PREBOOT_COMMANDS_FILE is not set."; exit 1; fi
+if [ -z "$POSTBOOT_COMMANDS_FILE" ]; then echo "Variable POSTBOOT_COMMANDS_FILE is not set."; exit 1; fi
+# Test if files are writeable for us, exit otherwise
+touch "$PREBOOT_COMMANDS_FILE" || exit 1
+touch "$POSTBOOT_COMMANDS_FILE" || exit 1
+
+deploy() {
+
+  if [ -z "$1" ]; then
+    echo "No deployment specified";
+    exit 1;
+  fi
+
+  DEPLOY_STATEMENT="deploy $DEPLOY_PROPS $1"
+  if grep -q "$1" "$POSTBOOT_COMMANDS_FILE"; then
+    echo "Post boot commands already deploys $1, skip adding";
+  else
+    if [ -n "$SKIP_DEPLOY" ] && { [ "$SKIP_DEPLOY" = "1" ] || [ "$SKIP_DEPLOY" = "true" ]; }; then
+      echo "Skipping deployment of $1 as requested.";
+    else
+      echo "Adding deployment target $1 to post boot commands";
+      echo "$DEPLOY_STATEMENT" >> "$POSTBOOT_COMMANDS_FILE";
+    fi
+  fi
+}
+
+# RAR files first
+find "$DEPLOY_DIR" -mindepth 1 -maxdepth 1 -name "*.rar" -print0 \
+  | while IFS= read -r -d '' file; do deploy "$file"; done
+
+# Then every other WAR, EAR, JAR or directory
+find "$DEPLOY_DIR" -mindepth 1 -maxdepth 1 \
+  \( ! -name "*.rar" -a -name "*.war" -o -name "*.ear" -o -name "*.jar" -o -type d \) \
+  -print0 | while IFS= read -r -d '' file; do deploy "$file"; done
diff --git a/modules/container-base/src/main/docker/scripts/init_1_generate_devmode_commands.sh b/modules/container-base/src/main/docker/scripts/init_1_generate_devmode_commands.sh
new file mode 100644
index 00000000000..608113d1cf7
--- /dev/null
+++ b/modules/container-base/src/main/docker/scripts/init_1_generate_devmode_commands.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+set -euo pipefail
+
+###### ###### ###### ###### ###### ###### ###### ###### ###### ###### ######
+# This script enables different development options, like a JMX connector
+# usable with VisualVM, JRebel hot-reload support and JDWP debugger service.
+# Enable it by adding env vars on startup (e.g. via ConfigMap)
+#
+# As this script is "sourced" from entrypoint.sh, we can manipulate env vars
+# for the parent shell before executing Payara.
+###### ###### ###### ###### ###### ###### ###### ###### ###### ###### ######
+
+if [ -z "$PREBOOT_COMMANDS_FILE" ]; then echo "Variable PREBOOT_COMMANDS_FILE is not set."; exit 1; fi
+# Test if preboot file is writeable for us, exit otherwise
+touch "$PREBOOT_COMMANDS_FILE" || exit 1
+
+# 0. Init variables
+ENABLE_JMX=${ENABLE_JMX:-0}
+ENABLE_JDWP=${ENABLE_JDWP:-0}
+ENABLE_RELOAD=${ENABLE_RELOAD:-0}
+
+function inject() {
+  if [ -z "$1" ]; then echo "No line specified"; exit 1; fi
+  # If the line is not yet in the file, try to add it
+  if ! grep -q "$1" "$PREBOOT_COMMANDS_FILE"; then
+    # Check if the line is still not in the file when splitting at the first =
+    if ! grep -q "$(echo "$1" | cut -f1 -d"=")" "$PREBOOT_COMMANDS_FILE"; then
+      echo "$1" >> "$PREBOOT_COMMANDS_FILE"
+    fi
+  fi
+}
+
+# 1. Configure JMX (enabled by default on port 8686, but requires SSL)
+# See also https://blog.payara.fish/monitoring-payara-server-with-jconsole
+# To still use it, you can use a sidecar container proxying or using JMX via localhost without SSL.
+if [ "${ENABLE_JMX}" = "1" ]; then
+  echo "Enabling unsecured JMX on 0.0.0.0:8686, enabling AMX and tuning monitoring levels to HIGH. You'll need a sidecar for this, as access is allowed from same machine only (without SSL)."
+  inject "set configs.config.server-config.amx-configuration.enabled=true"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.jvm=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.connector-service=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.connector-connection-pool=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.jdbc-connection-pool=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.web-services-container=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.ejb-container=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.thread-pool=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.http-service=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.security=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.jms-service=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.jersey=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.transaction-service=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.jpa=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.web-container=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.orb=HIGH"
+  inject "set configs.config.server-config.monitoring-service.module-monitoring-levels.deployment=HIGH"
+  inject "set configs.config.server-config.admin-service.jmx-connector.system.security-enabled=false"
+fi
+
+# 2. Enable JDWP via debugging switch
+if [ "${ENABLE_JDWP}" = "1" ]; then
+  echo "Enabling JDWP remote debugging support via asadmin debugging switch."
+  export PAYARA_ARGS="${PAYARA_ARGS} --debug=true"
+fi
+
+# 3. Enable hot reload
+if [ "${ENABLE_RELOAD}" = "1" ]; then
+  echo "Enabling hot reload of deployments."
+  inject "set configs.config.server-config.admin-service.das-config.dynamic-reload-enabled=true"
+  inject "set configs.config.server-config.admin-service.das-config.autodeploy-enabled=true"
+fi
+
+# 4. Add the commands to the existing preboot file, but insert BEFORE deployment
+echo "DEBUG: preboot contains now the following commands:"
+echo "--------------------------------------------------"
+cat "${PREBOOT_COMMANDS_FILE}"
+echo "--------------------------------------------------"
diff --git a/modules/container-base/src/main/docker/scripts/removeExpiredCaCerts.sh b/modules/container-base/src/main/docker/scripts/removeExpiredCaCerts.sh
new file mode 100644
index 00000000000..c019c09130e
--- /dev/null
+++ b/modules/container-base/src/main/docker/scripts/removeExpiredCaCerts.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Remove expired certs from a keystore
+# ------------------------------------
+# This script was copied from https://gist.github.com/damkh/a4a0d74891f92b0285a3853418357c1e (thanks @damkh)
+# and slightly modified to be used within our scenario and comply with shellcheck good practices.
+
+set -euo pipefail
+
+KEYSTORE="${DOMAIN_DIR}/config/cacerts.jks"
+if [ ! -r "${KEYSTORE}" ]; then
+  KEYSTORE="${DOMAIN_DIR}/config/cacerts.p12"
+  if [ ! -r "${KEYSTORE}" ]; then
+    echo "Could not find CA certs keystore"
+    exit 1
+  fi
+fi
+
+keytool -list -v -keystore "${KEYSTORE}" -storepass changeit 2>/dev/null | \
+    grep -i 'alias\|until' > aliases.txt
+
+i=1
+# Split dates and aliases to different arrays
+while read -r p; do
+    # uneven lines are dates, evens are aliases
+    if ! ((i % 2)); then
+        arr_date+=("$p")
+    else
+        arr_cn+=("$p")
+    fi
+    i=$((i+1))
+done < aliases.txt
+i=0
+
+# Parse until-dates ->
+# convert until-dates to "seconds from 01-01-1970"-format ->
+# compare until-dates with today-date ->
+# delete expired aliases
+for date_idx in $(seq 0 $((${#arr_date[*]}-1)));
+do
+    a_date=$(echo "${arr_date[$date_idx]}" | awk -F"until: " '{print $2}')
+    if [ "$(date +%s --date="$a_date")" -lt "$(date +%s)" ];
+    then
+        echo "removing ${arr_cn[$i]} expired: $a_date"
+        alias_name=$(echo "${arr_cn[$i]}" | awk -F"name: " '{print $2}')
+        keytool -delete -alias "$alias_name" -keystore "${KEYSTORE}" -storepass changeit
+    fi
+    i=$((i+1))
+done
+echo "Done."
\ No newline at end of file
diff --git a/modules/container-base/src/main/docker/scripts/startInForeground.sh b/modules/container-base/src/main/docker/scripts/startInForeground.sh
new file mode 100644
index 00000000000..fa7d533b0d1
--- /dev/null
+++ b/modules/container-base/src/main/docker/scripts/startInForeground.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+##########################################################################################################
+#
+# This script is to execute Payara Server in foreground, mainly in a docker environment.
+# It allows to avoid running 2 instances of JVM, which happens with the start-domain --verbose command.
+#
+# Usage:
+#   Running
+#        startInForeground.sh <arguments>
+#   is equivalent to running
+#        asadmin start-domain <arguments>
+#
+# It's possible to use any arguments of the start-domain command as arguments to startInForeground.sh
+#
+# Environment variables used:
+#   - $ADMIN_USER - the username to use for the asadmin utility.
+#   - $PASSWORD_FILE - the password file to use for the asadmin utility.
+#   - $PREBOOT_COMMANDS - the pre boot command file.
+#   - $POSTBOOT_COMMANDS - the post boot command file.
+#   - $DOMAIN_NAME - the name of the domain to start.
+#   - $JVM_ARGS - extra JVM options to pass to the Payara Server instance.
+#   - $AS_ADMIN_MASTERPASSWORD - the master password for the Payara Server instance.
+#
+# This script executes the asadmin tool which is expected at ~/appserver/bin/asadmin.
+#
+##########################################################################################################
+#
+#  This script is a fork of https://github.com/payara/Payara/blob/master/appserver/
+#  extras/docker-images/server-full/src/main/docker/bin/startInForeground.sh and licensed under CDDL 1.1
+#  by the Payara Foundation.
+#
+##########################################################################################################
+
+# Check required variables are set
+if [ -z "$PAYARA_ADMIN_USER" ]; then echo "Variable ADMIN_USER is not set."; exit 1; fi
+if [ -z "$PAYARA_ADMIN_PASSWORD" ]; then echo "Variable ADMIN_PASSWORD is not set."; exit 1; fi
+if [ -z "$DOMAIN_PASSWORD" ]; then echo "Variable DOMAIN_PASSWORD is not set."; exit 1; fi
+if [ -z "$PREBOOT_COMMANDS_FILE" ]; then echo "Variable PREBOOT_COMMANDS_FILE is not set."; exit 1; fi
+if [ -z "$POSTBOOT_COMMANDS_FILE" ]; then echo "Variable POSTBOOT_COMMANDS_FILE is not set."; exit 1; fi
+if [ -z "$DOMAIN_NAME" ]; then echo "Variable DOMAIN_NAME is not set."; exit 1; fi
+
+# Check if dumps are enabled - add arg to JVM_ARGS in this case
+if [ -n "${ENABLE_DUMPS}" ] && [ "${ENABLE_DUMPS}" = "1" ]; then
+  JVM_ARGS="${JVM_DUMPS_ARG} ${JVM_ARGS}"
+fi
+
+# For safety reasons, do no longer expose the passwords - malicious code could extract it!
+# (We need to save the master password for booting the server though)
+MASTER_PASSWORD="${DOMAIN_PASSWORD}"
+export LINUX_PASSWORD="have-some-scrambled-eggs"
+export PAYARA_ADMIN_PASSWORD="have-some-scrambled-eggs"
+export DOMAIN_PASSWORD="have-some-scrambled-eggs"
+
+# The following command gets the command line to be executed by start-domain
+# - print the command line to the server with --dry-run, each argument on a separate line
+# - remove -read-string argument
+# - surround each line except with parenthesis to allow spaces in paths
+# - remove lines before and after the command line and squash commands on a single line
+
+# Create pre and post boot command files if they don't exist
+touch "$POSTBOOT_COMMANDS_FILE" || exit 1
+touch "$PREBOOT_COMMANDS_FILE" || exit 1
+
+# This workaround is necessary due to limitations of asadmin
+PASSWORD_FILE=$(mktemp)
+echo "AS_ADMIN_MASTERPASSWORD=$MASTER_PASSWORD" > "$PASSWORD_FILE"
+# shellcheck disable=SC2068
+#   -- Using $@ is necessary here as asadmin cannot deal with options enclosed in ""!
+OUTPUT=$("${PAYARA_DIR}"/bin/asadmin --user="${PAYARA_ADMIN_USER}" --passwordfile="$PASSWORD_FILE" start-domain --dry-run --prebootcommandfile="${PREBOOT_COMMANDS_FILE}" --postbootcommandfile="${POSTBOOT_COMMANDS_FILE}" $@ "$DOMAIN_NAME")
+STATUS=$?
+rm "$PASSWORD_FILE"
+if [ "$STATUS" -ne 0 ]
+  then
+    echo ERROR: "$OUTPUT" >&2
+    exit 1
+fi
+
+echo "Booting now..."
+
+COMMAND=$(echo "$OUTPUT"\
+ | sed -n -e '2,/^$/p'\
+ | sed "s|glassfish.jar|glassfish.jar $JVM_ARGS |g")
+
+echo Executing Payara Server with the following command line:
+echo "$COMMAND" | tr ' ' '\n'
+echo
+
+# Run the server in foreground - read master password from variable or file or use the default "changeit" password
+# shellcheck disable=SC2086
+#   -- Unquoted exec var is necessary, as otherwise things get escaped that may not be escaped (parameters for Java)
+exec ${COMMAND} < <(echo "AS_ADMIN_MASTERPASSWORD=$MASTER_PASSWORD")
diff --git a/modules/container-configbaker/Dockerfile b/modules/container-configbaker/Dockerfile
new file mode 100644
index 00000000000..5532cda1a9e
--- /dev/null
+++ b/modules/container-configbaker/Dockerfile
@@ -0,0 +1,103 @@
+# Copyright 2023 Forschungszentrum JÃŧlich GmbH
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# This build arg must be given or build will fail
+ARG SOLR_VERSION
+ARG BASE_IMAGE="ubuntu:noble"
+
+# We simply have this intermediate stage here without any activity to copy the default configset over
+FROM solr:${SOLR_VERSION} AS solr
+
+# Let's build ourselves a baker
+FROM ${BASE_IMAGE}
+
+ENV SCRIPT_DIR="/scripts" \
+    SECRETS_DIR="/secrets" \
+    SOLR_TEMPLATE="/template"
+ENV PATH="${PATH}:${SCRIPT_DIR}" \
+    BOOTSTRAP_DIR="${SCRIPT_DIR}/bootstrap"
+
+ARG PKGS="bc curl dnsutils dumb-init ed jq netcat-openbsd postgresql-client"
+# renovate: datasource=github-releases depName=wait4x/wait4x
+ARG WAIT4X_VERSION="v3.2.0"
+# renovate: datasource=pypi depName=awscli
+ARG AWSCLI_VERSION="1.40.15"
+ARG PYTHON_PKGS="awscli==${AWSCLI_VERSION}"
+
+# Auto-populated by BuildKit / buildx
+ARG TARGETARCH
+SHELL ["/bin/bash", "-eu", "-c"]
+
+RUN true && \
+  # Make our working directories
+  mkdir -p ${SCRIPT_DIR} ${SECRETS_DIR} ${SOLR_TEMPLATE} && \
+
+  # Install packages
+  apt-get update -q && \
+  apt-get install -qqy --no-install-recommends ${PKGS} && \
+
+  # Workaround to install Python and pipx 1.5+ on Ubuntu 24.04 LTS: first install Python and pipx 1.4 \
+  # Adapted from https://github.com/pypa/pipx/issues/1481#issuecomment-2593124603
+  apt -qqy --no-install-recommends install python3 python3-venv pipx && \
+  # Now install 1.5+ in ~/.local/bin/
+  pipx install pipx && \
+  # Remove 1.4 again
+  apt purge -qqy --autoremove pipx && \
+  # Install 1.5+ in /usr/local/bin/pipx
+  ~/.local/bin/pipx install --global pipx && \
+  # Remove the virtual env install of pipx
+  rm -rf "~/.local" && \
+
+  # Cleanup apt cache
+  rm -rf "/var/lib/apt/lists/*"
+
+# New step (and shell) as this is a different manager and we need pipx around as command
+RUN true && \
+  # Install things not available as packages \
+  ARCH="${TARGETARCH:-$(uname -m | sed -e 's/x86_64/amd64/' -e 's/\(arm\)\(64\)\?.*/\1\2/' -e 's/aarch64$/arm64/')}" && \
+
+  # 1. wait4x \
+  curl -sSfL -o /usr/bin/wait4x.tar.gz "https://github.com/wait4x/wait4x/releases/download/${WAIT4X_VERSION}/wait4x-linux-${ARCH}.tar.gz" && \
+  curl -sSfL -o /tmp/w4x-checksum "https://github.com/wait4x/wait4x/releases/download/${WAIT4X_VERSION}/wait4x-linux-${ARCH}.tar.gz.sha256sum" && \
+  echo "$(cat /tmp/w4x-checksum | cut -f1 -d" ") /usr/bin/wait4x.tar.gz" | sha256sum -c - && \
+  tar -xzf /usr/bin/wait4x.tar.gz -C /usr/bin && chmod +x /usr/bin/wait4x && \
+
+  # 2. Python packages
+  pipx install --global ${PYTHON_PKGS}
+
+# Get in the scripts 
+COPY maven/scripts maven/solr/update-fields.sh ${SCRIPT_DIR}/
+# Copy the data from scripts/api that provide the common base setup you'd get from the installer.
+# ".dockerignore" will take care of taking only the bare necessities
+COPY maven/setup ${SCRIPT_DIR}/bootstrap/base/
+# Make the scripts executable
+RUN chmod +x ${SCRIPT_DIR}/*.sh ${BOOTSTRAP_DIR}/*/*.sh
+
+# Copy the Solr config bits
+COPY --from=solr /opt/solr/server/solr/configsets/_default ${SOLR_TEMPLATE}/
+COPY maven/solr/*.xml ${SOLR_TEMPLATE}/conf/
+RUN rm ${SOLR_TEMPLATE}/conf/managed-schema.xml
+
+
+# Set the entrypoint to tini (as a process supervisor)
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+# By default run a script that will print a help message and terminate
+CMD ["help.sh"]
+
+# Workaround for fabric8io/docker-maven-plugin#1865
+ARG APP_IMAGE_VERSION
+LABEL org.opencontainers.image.created="@git.build.time@" \
+      org.opencontainers.image.authors="Research Data Management at FZJ <forschungsdaten@fz-juelich.de>" \
+      org.opencontainers.image.url="https://guides.dataverse.org/en/latest/container/" \
+      org.opencontainers.image.documentation="https://guides.dataverse.org/en/latest/container/" \
+      org.opencontainers.image.source="https://github.com/IQSS/dataverse/tree/develop/modules/container-configbaker" \
+      org.opencontainers.image.version="$APP_IMAGE_VERSION" \
+      org.opencontainers.image.revision="@git.commit.id.abbrev@" \
+      org.opencontainers.image.vendor="Global Dataverse Community Consortium" \
+      org.opencontainers.image.licenses="Apache-2.0" \
+      org.opencontainers.image.title="Dataverse Config Baker Image" \
+      org.opencontainers.image.description="This container image configures Dataverse and provides other tooling" \
+      org.opencontainers.image.base.name="$BASE_IMAGE"
diff --git a/modules/container-configbaker/README.md b/modules/container-configbaker/README.md
new file mode 100644
index 00000000000..75862ee0809
--- /dev/null
+++ b/modules/container-configbaker/README.md
@@ -0,0 +1,58 @@
+# Config Baker
+
+The Config Baker container may be used to execute all sorts of tasks around setting up, preparing and finalizing
+an instance of the Dataverse software. Its focus is bootstrapping non-initialized installations.
+
+You may use this image as is, base your own derivative image on it or use bind mounts to change behavior.
+
+## Quick Reference
+
+**Maintained by:** 
+
+This image is created, maintained and supported by the Dataverse community on a best-effort basis.
+
+**Where to find documentation:**
+
+The [Dataverse Container Guide - Config Baker Image](https://guides.dataverse.org/en/latest/container/configbaker-image.html)
+provides information about this image. 
+
+**Where to get help and ask questions:**
+
+IQSS will not offer support on how to deploy or run it. Please reach out to the community for help on using it.
+You can join the Community Chat on Matrix at https://chat.dataverse.org and https://groups.google.com/g/dataverse-community
+to ask for help and guidance.
+
+## Supported Image Tags
+
+This image is sourced within the main upstream code [repository of the Dataverse software](https://github.com/IQSS/dataverse).
+Development and maintenance of the [image's code](https://github.com/IQSS/dataverse/tree/develop/modules/container-configbaker) happens there (again, by the community).
+
+Our tagging is inspired by [Bitnami](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html).
+For more detailed information about our tagging policy, please read about our [config baker image tags](https://guides.dataverse.org/en/latest/container/configbaker-image.html#supported-image-tags) in the Dataverse Containers Guide.
+
+For ease of use, here is a list of images that are currently maintained.
+
+<!-- TAG BLOCK HERE -->
+
+All of them are rolling tags, except those ending with `-r<number>`, which are the most recent immutable tags.
+The `unstable` tags are the current development branch snapshot.
+We strongly recommend using only immutable tags for production use cases.
+
+Within the main repository, you may find the image's files at `<git root>/modules/container-configbaker`.
+This Maven module uses the [Maven Docker Plugin](https://dmp.fabric8.io) to build and ship the image.
+You may use, extend, or alter this image to your liking and/or host in some different registry if you want to.
+
+**Supported architectures:** This image is created as a "multi-arch image", supporting the most common architectures
+Dataverse usually runs on: AMD64 (Windows/Linux/...) and ARM64 (Apple M1/M2).
+
+## License
+
+Image content created by the community is licensed under [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0), 
+like the [main Dataverse project](https://github.com/IQSS/dataverse/blob/develop/LICENSE.md).
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and limitations under the License.
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
diff --git a/modules/container-configbaker/assembly.xml b/modules/container-configbaker/assembly.xml
new file mode 100644
index 00000000000..3c55e6d64b6
--- /dev/null
+++ b/modules/container-configbaker/assembly.xml
@@ -0,0 +1,46 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <fileSets>
+        <!-- Get the scripts -->
+        <fileSet>
+            <directory>modules/container-configbaker/scripts</directory>
+            <outputDirectory>scripts</outputDirectory>
+        </fileSet>
+        <!-- Get our custom Solr files -->
+        <fileSet>
+            <directory>conf/solr</directory>
+            <outputDirectory>solr</outputDirectory>
+        </fileSet>
+        <!-- Get the setup scripts from the installer (selected choice only) -->
+        <fileSet>
+            <directory>scripts/api</directory>
+            <outputDirectory>setup</outputDirectory>
+            <includes>
+                <include>setup-all.sh</include>
+                <include>setup-builtin-roles.sh</include>
+                <include>setup-datasetfields.sh</include>
+                <include>setup-identity-providers.sh</include>
+                
+                <include>data/licenses/*.json</include>
+                <include>data/authentication-providers/builtin.json</include>
+                <include>data/metadatablocks/*.tsv</include>
+                
+                <include>data/dv-root.json</include>
+                
+                <include>data/role-admin.json</include>
+                <include>data/role-curator.json</include>
+                <include>data/role-dsContributor.json</include>
+                <include>data/role-dvContributor.json</include>
+                <include>data/role-editor.json</include>
+                <include>data/role-filedownloader.json</include>
+                <include>data/role-fullContributor.json</include>
+                <include>data/role-member.json</include>
+                
+                <include>data/user-admin.json</include>
+            </includes>
+            <excludes>
+                <exclude>data/metadatablocks/custom*</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/modules/container-configbaker/backports/v6.4/001-parent-pom.xml.patch b/modules/container-configbaker/backports/v6.4/001-parent-pom.xml.patch
new file mode 100644
index 00000000000..9b2b9dd4b5c
--- /dev/null
+++ b/modules/container-configbaker/backports/v6.4/001-parent-pom.xml.patch
@@ -0,0 +1,10 @@
+--- a/modules/dataverse-parent/pom.xml
++++ b/modules/dataverse-parent/pom.xml
+@@ -455,6 +455,7 @@
+                 -->
+                 <!--<base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>-->
+                 <base.image.version>${revision}</base.image.version>
++                <app.image.version>${base.image.version}</app.image.version>
+             </properties>
+
+             <bu
diff --git a/modules/container-configbaker/backports/v6.4/002-pom.xml.patch b/modules/container-configbaker/backports/v6.4/002-pom.xml.patch
new file mode 100644
index 00000000000..ffe676ebf72
--- /dev/null
+++ b/modules/container-configbaker/backports/v6.4/002-pom.xml.patch
@@ -0,0 +1,111 @@
+--- a/pom.xml	2025-06-02 14:31:28.029431640 +0200
++++ b/pom.xml	2025-06-02 14:35:53.292611391 +0200
+@@ -996,18 +996,32 @@
+                 <postgresql.server.version>17</postgresql.server.version>
+             
+                 <app.image>gdcc/dataverse:${app.image.tag}</app.image>
++                <!--
++                    Note: We are still using the unstable tag here, as we need it most for development purposes.
++                          It will be overridden by the maintenance CI for released app versions.
++                    Note: During maintenance we will use the app.image.version setting from the DV parent POM.
++                 -->
+                 <app.image.tag>unstable</app.image.tag>
++                <app.skipBuild>false</app.skipBuild>
+                 <app.skipDeploy>false</app.skipDeploy>
++
+                 <base.image>gdcc/base:${base.image.tag}</base.image>
+                 <!-- Flavor is a release from a Linux distro, such as Ubuntu -->
+                 <base.image.flavor>noble</base.image.flavor>
+                 <!-- base.image.version is coming from parent module via build-helper plugin -->
+-                <base.image.tag>${base.image.version}-${base.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
++                <base.image.tag>${base.image.version}-${base.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <!-- Suffix is defaulting to use the image with a specific Payara and Java version for development purpose -->
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
++
+                 <conf.image>gdcc/configbaker:${conf.image.tag}</conf.image>
++                <!-- By default, we use the same tag as the app image for development purposes. Same rules as for app.image.tag apply! -->
+                 <conf.image.tag>${app.image.tag}</conf.image.tag>
+-    
++                <conf.image.flavor>alpine</conf.image.flavor>
++                <conf.image.base>alpine:3.18</conf.image.base>
++                <conf.skipBuild>false</conf.skipBuild>
++
+                 <docker.platforms></docker.platforms>
+-            
++
+                 <!-- Variables as used in docker-compose.yml -->
+                 <APP_IMAGE>${app.image}</APP_IMAGE>
+                 <POSTGRES_VERSION>${postgresql.server.version}</POSTGRES_VERSION>
+@@ -1015,7 +1029,7 @@
+                 <DATAVERSE_DB_USER>dataverse</DATAVERSE_DB_USER>
+                 <SKIP_DEPLOY>${app.skipDeploy}</SKIP_DEPLOY>
+             </properties>
+-        
++
+             <build>
+                 <plugins>
+                     <!-- Build the exploded WAR target directory -->
+@@ -1033,7 +1047,7 @@
+                         <configuration>
+                         </configuration>
+                     </plugin>
+-                
++
+                     <!-- Build image via Docker Maven Plugin -->
+                     <plugin>
+                         <groupId>io.fabric8</groupId>
+@@ -1046,6 +1060,9 @@
+                                     <alias>dev_dataverse</alias>
+                                     <name>${app.image}</name>
+                                     <build>
++                                        <skip>${app.skipBuild}</skip>
++                                        <skipPush>${app.skipBuild}</skipPush>
++                                        <skipTag>${app.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
+@@ -1060,21 +1077,24 @@
+                                             <descriptor>assembly.xml</descriptor>
+                                         </assembly>
+                                     </build>
+-                                    
++
+                                     <run>
+                                     </run>
+-                                    
++
+                                     <external>
+                                         <type>compose</type>
+                                         <basedir>${project.basedir}</basedir>
+                                         <composeFile>docker-compose-dev.yml</composeFile>
+                                     </external>
+                                 </image>
+-                                
++
+                                 <image>
+                                     <alias>dev_bootstrap</alias>
+                                     <name>${conf.image}</name>
+                                     <build>
++                                        <skip>${conf.skipBuild}</skip>
++                                        <skipPush>${conf.skipBuild}</skipPush>
++                                        <skipTag>${conf.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
+@@ -1082,6 +1102,7 @@
+                                         </buildx>
+                                         <dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
+                                         <args>
++                                            <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
+                                             <SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
+                                         </args>
+                                         <filter>@</filter>
+@@ -1089,7 +1110,7 @@
+                                             <descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
+                                         </assembly>
+                                     </build>
+-                                    
++
+                                     <!--
+                                         We skip the run here as it is already included in the external run config
+                                         above for the main image via the docker-compose file. Even if using
diff --git a/modules/container-configbaker/backports/v6.5/001-parent-pom.xml.patch b/modules/container-configbaker/backports/v6.5/001-parent-pom.xml.patch
new file mode 100644
index 00000000000..9b2b9dd4b5c
--- /dev/null
+++ b/modules/container-configbaker/backports/v6.5/001-parent-pom.xml.patch
@@ -0,0 +1,10 @@
+--- a/modules/dataverse-parent/pom.xml
++++ b/modules/dataverse-parent/pom.xml
+@@ -455,6 +455,7 @@
+                 -->
+                 <!--<base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>-->
+                 <base.image.version>${revision}</base.image.version>
++                <app.image.version>${base.image.version}</app.image.version>
+             </properties>
+
+             <bu
diff --git a/modules/container-configbaker/backports/v6.5/002-pom.xml.patch b/modules/container-configbaker/backports/v6.5/002-pom.xml.patch
new file mode 100644
index 00000000000..6356afa16b3
--- /dev/null
+++ b/modules/container-configbaker/backports/v6.5/002-pom.xml.patch
@@ -0,0 +1,111 @@
+--- a/pom.xml	2025-06-02 14:31:28.029431640 +0200
++++ b/pom.xml	2025-06-02 14:35:53.292611391 +0200
+@@ -1012,18 +1012,32 @@
+                 <postgresql.server.version>17</postgresql.server.version>
+             
+                 <app.image>gdcc/dataverse:${app.image.tag}</app.image>
++                <!--
++                    Note: We are still using the unstable tag here, as we need it most for development purposes.
++                          It will be overridden by the maintenance CI for released app versions.
++                    Note: During maintenance we will use the app.image.version setting from the DV parent POM.
++                 -->
+                 <app.image.tag>unstable</app.image.tag>
++                <app.skipBuild>false</app.skipBuild>
+                 <app.skipDeploy>false</app.skipDeploy>
++
+                 <base.image>gdcc/base:${base.image.tag}</base.image>
+                 <!-- Flavor is a release from a Linux distro, such as Ubuntu -->
+                 <base.image.flavor>noble</base.image.flavor>
+                 <!-- base.image.version is coming from parent module via build-helper plugin -->
+-                <base.image.tag>${base.image.version}-${base.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
++                <base.image.tag>${base.image.version}-${base.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <!-- Suffix is defaulting to use the image with a specific Payara and Java version for development purpose -->
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
++
+                 <conf.image>gdcc/configbaker:${conf.image.tag}</conf.image>
++                <!-- By default, we use the same tag as the app image for development purposes. Same rules as for app.image.tag apply! -->
+                 <conf.image.tag>${app.image.tag}</conf.image.tag>
+-    
++                <conf.image.flavor>alpine</conf.image.flavor>
++                <conf.image.base>alpine:3.18</conf.image.base>
++                <conf.skipBuild>false</conf.skipBuild>
++
+                 <docker.platforms></docker.platforms>
+-            
++
+                 <!-- Variables as used in docker-compose.yml -->
+                 <APP_IMAGE>${app.image}</APP_IMAGE>
+                 <POSTGRES_VERSION>${postgresql.server.version}</POSTGRES_VERSION>
+@@ -1031,7 +1045,7 @@
+                 <DATAVERSE_DB_USER>dataverse</DATAVERSE_DB_USER>
+                 <SKIP_DEPLOY>${app.skipDeploy}</SKIP_DEPLOY>
+             </properties>
+-        
++
+             <build>
+                 <plugins>
+                     <!-- Build the exploded WAR target directory -->
+@@ -1049,7 +1063,7 @@
+                         <configuration>
+                         </configuration>
+                     </plugin>
+-                
++
+                     <!-- Build image via Docker Maven Plugin -->
+                     <plugin>
+                         <groupId>io.fabric8</groupId>
+@@ -1062,6 +1076,9 @@
+                                     <alias>dev_dataverse</alias>
+                                     <name>${app.image}</name>
+                                     <build>
++                                        <skip>${app.skipBuild}</skip>
++                                        <skipPush>${app.skipBuild}</skipPush>
++                                        <skipTag>${app.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
+@@ -1076,21 +1093,24 @@
+                                             <descriptor>assembly.xml</descriptor>
+                                         </assembly>
+                                     </build>
+-                                    
++
+                                     <run>
+                                     </run>
+-                                    
++
+                                     <external>
+                                         <type>compose</type>
+                                         <basedir>${project.basedir}</basedir>
+                                         <composeFile>docker-compose-dev.yml</composeFile>
+                                     </external>
+                                 </image>
+-                                
++
+                                 <image>
+                                     <alias>dev_bootstrap</alias>
+                                     <name>${conf.image}</name>
+                                     <build>
++                                        <skip>${conf.skipBuild}</skip>
++                                        <skipPush>${conf.skipBuild}</skipPush>
++                                        <skipTag>${conf.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
+@@ -1098,6 +1118,7 @@
+                                         </buildx>
+                                         <dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
+                                         <args>
++                                            <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
+                                             <SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
+                                         </args>
+                                         <filter>@</filter>
+@@ -1105,7 +1126,7 @@
+                                             <descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
+                                         </assembly>
+                                     </build>
+-                                    
++
+                                     <!--
+                                         We skip the run here as it is already included in the external run config
+                                         above for the main image via the docker-compose file. Even if using
diff --git a/modules/container-configbaker/backports/v6.6/001-parent-pom.xml.patch b/modules/container-configbaker/backports/v6.6/001-parent-pom.xml.patch
new file mode 100644
index 00000000000..9b2b9dd4b5c
--- /dev/null
+++ b/modules/container-configbaker/backports/v6.6/001-parent-pom.xml.patch
@@ -0,0 +1,10 @@
+--- a/modules/dataverse-parent/pom.xml
++++ b/modules/dataverse-parent/pom.xml
+@@ -455,6 +455,7 @@
+                 -->
+                 <!--<base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>-->
+                 <base.image.version>${revision}</base.image.version>
++                <app.image.version>${base.image.version}</app.image.version>
+             </properties>
+
+             <bu
diff --git a/modules/container-configbaker/backports/v6.6/002-pom.xml.patch b/modules/container-configbaker/backports/v6.6/002-pom.xml.patch
new file mode 100644
index 00000000000..530937bead9
--- /dev/null
+++ b/modules/container-configbaker/backports/v6.6/002-pom.xml.patch
@@ -0,0 +1,111 @@
+--- a/pom.xml	2025-06-02 14:31:28.029431640 +0200
++++ b/pom.xml	2025-06-02 14:35:53.292611391 +0200
+@@ -1069,18 +1069,32 @@
+                 <postgresql.server.version>17</postgresql.server.version>
+             
+                 <app.image>gdcc/dataverse:${app.image.tag}</app.image>
++                <!--
++                    Note: We are still using the unstable tag here, as we need it most for development purposes.
++                          It will be overridden by the maintenance CI for released app versions.
++                    Note: During maintenance we will use the app.image.version setting from the DV parent POM.
++                 -->
+                 <app.image.tag>unstable</app.image.tag>
++                <app.skipBuild>false</app.skipBuild>
+                 <app.skipDeploy>false</app.skipDeploy>
++
+                 <base.image>gdcc/base:${base.image.tag}</base.image>
+                 <!-- Flavor is a release from a Linux distro, such as Ubuntu -->
+                 <base.image.flavor>noble</base.image.flavor>
+                 <!-- base.image.version is coming from parent module via build-helper plugin -->
+-                <base.image.tag>${base.image.version}-${base.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
++                <base.image.tag>${base.image.version}-${base.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <!-- Suffix is defaulting to use the image with a specific Payara and Java version for development purpose -->
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
++
+                 <conf.image>gdcc/configbaker:${conf.image.tag}</conf.image>
++                <!-- By default, we use the same tag as the app image for development purposes. Same rules as for app.image.tag apply! -->
+                 <conf.image.tag>${app.image.tag}</conf.image.tag>
+-    
++                <conf.image.flavor>alpine</conf.image.flavor>
++                <conf.image.base>alpine:3.18</conf.image.base>
++                <conf.skipBuild>false</conf.skipBuild>
++
+                 <docker.platforms></docker.platforms>
+-            
++
+                 <!-- Variables as used in docker-compose.yml -->
+                 <APP_IMAGE>${app.image}</APP_IMAGE>
+                 <POSTGRES_VERSION>${postgresql.server.version}</POSTGRES_VERSION>
+@@ -1088,7 +1102,7 @@
+                 <DATAVERSE_DB_USER>dataverse</DATAVERSE_DB_USER>
+                 <SKIP_DEPLOY>${app.skipDeploy}</SKIP_DEPLOY>
+             </properties>
+-        
++
+             <build>
+                 <plugins>
+                     <!-- Build the exploded WAR target directory -->
+@@ -1106,7 +1120,7 @@
+                         <configuration>
+                         </configuration>
+                     </plugin>
+-                
++
+                     <!-- Build image via Docker Maven Plugin -->
+                     <plugin>
+                         <groupId>io.fabric8</groupId>
+@@ -1119,6 +1133,9 @@
+                                     <alias>dev_dataverse</alias>
+                                     <name>${app.image}</name>
+                                     <build>
++                                        <skip>${app.skipBuild}</skip>
++                                        <skipPush>${app.skipBuild}</skipPush>
++                                        <skipTag>${app.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
+@@ -1133,21 +1150,24 @@
+                                             <descriptor>assembly.xml</descriptor>
+                                         </assembly>
+                                     </build>
+-                                    
++
+                                     <run>
+                                     </run>
+-                                    
++
+                                     <external>
+                                         <type>compose</type>
+                                         <basedir>${project.basedir}</basedir>
+                                         <composeFile>docker-compose-dev.yml</composeFile>
+                                     </external>
+                                 </image>
+-                                
++
+                                 <image>
+                                     <alias>dev_bootstrap</alias>
+                                     <name>${conf.image}</name>
+                                     <build>
++                                        <skip>${conf.skipBuild}</skip>
++                                        <skipPush>${conf.skipBuild}</skipPush>
++                                        <skipTag>${conf.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
+@@ -1155,6 +1175,7 @@
+                                         </buildx>
+                                         <dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
+                                         <args>
++                                            <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
+                                             <SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
+                                         </args>
+                                         <filter>@</filter>
+@@ -1162,7 +1183,7 @@
+                                             <descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
+                                         </assembly>
+                                     </build>
+-                                    
++
+                                     <!--
+                                         We skip the run here as it is already included in the external run config
+                                         above for the main image via the docker-compose file. Even if using
diff --git a/modules/container-configbaker/scripts/bootstrap.sh b/modules/container-configbaker/scripts/bootstrap.sh
new file mode 100644
index 00000000000..a00916880db
--- /dev/null
+++ b/modules/container-configbaker/scripts/bootstrap.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# [INFO]: Execute bootstrapping configuration of a freshly baked instance
+
+set -euo pipefail
+
+function usage() {
+  echo "Usage: $(basename "$0") [-h] [-u instanceUrl] [-t timeout] [-e targetEnvFile] [<persona>]"
+  echo ""
+  echo "Execute initial configuration (bootstrapping) of an empty Dataverse instance."
+  echo -n "Known personas: "
+  find "${BOOTSTRAP_DIR}" -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | paste -sd ' '
+  echo ""
+  echo "Parameters:"
+  echo "  instanceUrl - Location on container network where to reach your instance. Default: 'http://dataverse:8080'"
+  echo "      timeout - Provide how long to wait for the instance to become available (using wait4x). Default: '2m'"
+  echo "targetEnvFile - Path to a file where the bootstrap process can expose information as env vars (e.g. dataverseAdmin's API token)"
+  echo "      persona - Configure persona to execute. Calls ${BOOTSTRAP_DIR}/<persona>/init.sh. Default: 'base'"
+  echo ""
+  echo "Note: This script will wait for the Dataverse instance to be available before executing the bootstrapping."
+  echo "      It also checks if already bootstrapped before (availability of metadata blocks) and skip if true."
+  echo ""
+  exit 1
+}
+
+# Set some defaults as documented
+DATAVERSE_URL=${DATAVERSE_URL:-"http://dataverse:8080"}
+TIMEOUT=${TIMEOUT:-"3m"}
+TARGET_ENV_FILE=${TARGET_ENV_FILE:-""}
+
+while getopts "u:t:e:h" OPTION
+do
+  case "$OPTION" in
+    u) DATAVERSE_URL="$OPTARG" ;;
+    t) TIMEOUT="$OPTARG" ;;
+    e) TARGET_ENV_FILE="$OPTARG" ;;
+    h) usage;;
+    \?) usage;;
+  esac
+done
+shift $((OPTIND-1))
+
+# Assign persona if present or go default
+PERSONA=${1:-"base"}
+
+# Export the URL to be reused in the actual setup scripts
+export DATAVERSE_URL
+
+# Wait for the instance to become available
+echo "Waiting for ${DATAVERSE_URL} to become ready in max ${TIMEOUT}."
+wait4x http "${DATAVERSE_URL}/api/info/version" -i 8s -t "$TIMEOUT" --expect-status-code 200 --expect-body-json data.version
+
+# Avoid bootstrapping again by checking if a metadata block has been loaded
+BLOCK_COUNT=$(curl -sSf "${DATAVERSE_URL}/api/metadatablocks" | jq ".data | length")
+if [[ $BLOCK_COUNT -gt 0 ]]; then
+  echo "Your instance has been bootstrapped already, skipping."
+  exit 0
+fi
+
+# Provide a space to store environment variables output to
+ENV_OUT=$(mktemp)
+export ENV_OUT
+
+# Now execute the bootstrapping script
+echo "Now executing bootstrapping script at ${BOOTSTRAP_DIR}/${PERSONA}/init.sh."
+# shellcheck disable=SC1090
+source "${BOOTSTRAP_DIR}/${PERSONA}/init.sh"
+
+# If the env file option was given, check if the file is writeable and copy content from the temporary file
+if [[ -n "${TARGET_ENV_FILE}" ]]; then
+  if [[ -f "${TARGET_ENV_FILE}" && -w "${TARGET_ENV_FILE}" ]]; then
+    cat "${ENV_OUT}" > "${TARGET_ENV_FILE}"
+  else
+    echo "File ${TARGET_ENV_FILE} not found, is a directory or not writeable"
+    exit 2
+  fi
+fi
diff --git a/modules/container-configbaker/scripts/bootstrap/base/init.sh b/modules/container-configbaker/scripts/bootstrap/base/init.sh
new file mode 100644
index 00000000000..81c2b59f347
--- /dev/null
+++ b/modules/container-configbaker/scripts/bootstrap/base/init.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Set some defaults as documented
+DATAVERSE_URL=${DATAVERSE_URL:-"http://dataverse:8080"}
+export DATAVERSE_URL
+
+./setup-all.sh
diff --git a/modules/container-configbaker/scripts/bootstrap/demo/init.sh b/modules/container-configbaker/scripts/bootstrap/demo/init.sh
new file mode 100644
index 00000000000..aa73cb5edff
--- /dev/null
+++ b/modules/container-configbaker/scripts/bootstrap/demo/init.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Set some defaults
+DATAVERSE_URL=${DATAVERSE_URL:-"http://dataverse:8080"}
+export DATAVERSE_URL
+
+BLOCKED_API_KEY=${BLOCKED_API_KEY:-"unblockme"}
+export BLOCKED_API_KEY
+
+# --insecure is used so we can configure a few things but
+# later in this script we'll apply the changes as if we had
+# run the script without --insecure.
+echo "Running base setup-all.sh..."
+"${BOOTSTRAP_DIR}"/base/setup-all.sh --insecure -p=admin1 | tee /tmp/setup-all.sh.out
+
+echo ""
+echo "Setting DOI provider to \"FAKE\"..."
+curl -sS -X PUT -d FAKE "${DATAVERSE_URL}/api/admin/settings/:DoiProvider"
+
+API_TOKEN=$(grep apiToken "/tmp/setup-all.sh.out" | jq ".data.apiToken" | tr -d \")
+export API_TOKEN
+
+ROOT_COLLECTION_JSON=/scripts/bootstrap/demo/config/dataverse-complete.json
+if [ -f $ROOT_COLLECTION_JSON ]; then
+  echo ""
+  echo "Updating root collection based on $ROOT_COLLECTION_JSON..."
+  curl -sS -X PUT -H "X-Dataverse-key:$API_TOKEN" "$DATAVERSE_URL/api/dataverses/:root" --upload-file $ROOT_COLLECTION_JSON
+fi
+
+echo ""
+echo "Revoke the key that allows for creation of builtin users..."
+curl -sS -X DELETE "${DATAVERSE_URL}/api/admin/settings/BuiltinUsers.KEY"
+
+# TODO: stop using these deprecated database settings. See https://github.com/IQSS/dataverse/pull/11454
+echo ""
+echo "Set key for accessing blocked API endpoints..."
+curl -sS -X PUT -d "$BLOCKED_API_KEY" "${DATAVERSE_URL}/api/admin/settings/:BlockedApiKey"
+
+echo ""
+echo "Set policy to only allow access to admin APIs with with a key..."
+curl -sS -X PUT -d unblock-key "${DATAVERSE_URL}/api/admin/settings/:BlockedApiPolicy"
+
+echo ""
+echo "Block admin and other sensitive API endpoints..."
+curl -sS -X PUT -d 'admin,builtin-users' "${DATAVERSE_URL}/api/admin/settings/:BlockedApiEndpoints"
+
+echo ""
+echo "Done, your instance has been configured for demo or eval. Have a nice day!"
diff --git a/modules/container-configbaker/scripts/bootstrap/dev/init.sh b/modules/container-configbaker/scripts/bootstrap/dev/init.sh
new file mode 100644
index 00000000000..f8770436652
--- /dev/null
+++ b/modules/container-configbaker/scripts/bootstrap/dev/init.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Set some defaults as documented
+DATAVERSE_URL=${DATAVERSE_URL:-"http://dataverse:8080"}
+export DATAVERSE_URL
+
+echo "Running base setup-all.sh (INSECURE MODE)..."
+"${BOOTSTRAP_DIR}"/base/setup-all.sh --insecure -p=admin1 | tee /tmp/setup-all.sh.out
+
+echo "Setting DOI provider to \"FAKE\"..."
+curl "${DATAVERSE_URL}/api/admin/settings/:DoiProvider" -X PUT -d FAKE
+
+API_TOKEN=$(grep apiToken "/tmp/setup-all.sh.out" | jq ".data.apiToken" | tr -d \")
+export API_TOKEN
+# ${ENV_OUT} comes from bootstrap.sh and will expose the saved information back to the host if enabled.
+echo "API_TOKEN=${API_TOKEN}" >> "${ENV_OUT}"
+
+echo "Publishing root dataverse..."
+curl -H "X-Dataverse-key:$API_TOKEN" -X POST "${DATAVERSE_URL}/api/dataverses/:root/actions/:publish"
+
+echo "Allowing users to create dataverses and datasets in root..."
+curl -H "X-Dataverse-key:$API_TOKEN" -X POST -H "Content-type:application/json" -d "{\"assignee\": \":authenticated-users\",\"role\": \"fullContributor\"}" "${DATAVERSE_URL}/api/dataverses/:root/assignments"
+
+echo "Checking Dataverse version..."
+curl "${DATAVERSE_URL}/api/info/version"
+
+echo ""
+echo "Done, your instance has been configured for development. Have a nice day!"
diff --git a/modules/container-configbaker/scripts/fix-fs-perms.sh b/modules/container-configbaker/scripts/fix-fs-perms.sh
new file mode 100644
index 00000000000..9ce8f475d70
--- /dev/null
+++ b/modules/container-configbaker/scripts/fix-fs-perms.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# [INFO]: Fix folder permissions using 'chown' to be writeable by containers not running as root.
+
+set -euo pipefail
+
+if [[ "$(id -un)" != "root" ]]; then
+  echo "This script must be run as user root (not $(id -un)), otherwise no fix is possible."
+fi
+
+DEF_DV_PATH="/dv"
+DEF_SOLR_PATH="/var/solr"
+DEF_DV_UID="1000"
+DEF_SOLR_UID="8983"
+
+function usage() {
+  echo "Usage: $(basename "$0") (dv|solr|[1-9][0-9]{3,4}) [PATH [PATH [...]]]"
+  echo ""
+  echo "You may omit a path when using 'dv' or 'solr' as first argument:"
+  echo "  - 'dv' will default to user $DEF_DV_UID and $DEF_DV_PATH"
+  echo "  - 'solr' will default to user $DEF_SOLR_UID and $DEF_SOLR_PATH"
+  exit 1
+}
+
+# Get a target name or id
+TARGET=${1:-help}
+# Get the rest of the arguments as paths to apply the fix to
+PATHS=( "${@:2}" )
+
+ID=0
+case "$TARGET" in
+  dv)
+    ID="$DEF_DV_UID"
+    # If there is no path, add the default for our app image
+    if [[ ${#PATHS[@]} -eq 0 ]]; then
+      PATHS=( "$DEF_DV_PATH" )
+    fi
+    ;;
+  solr)
+    ID="$DEF_SOLR_UID"
+    # In case there is no path, add the default path for Solr images
+    if [[ ${#PATHS[@]} -eq 0 ]]; then
+      PATHS=( "$DEF_SOLR_PATH" )
+    fi
+    ;;
+  # If there is a digit in the argument, check if this is a valid UID (>= 1000, ...)
+  *[[:digit:]]* )
+    echo "$TARGET" | grep -q "^[1-9][0-9]\{3,4\}$" || usage
+    ID="$TARGET"
+    ;;
+  *)
+    usage
+    ;;
+esac
+
+# Check that we actually have at least 1 path
+if [[ ${#PATHS[@]} -eq 0 ]]; then
+  usage
+fi
+
+# Do what we came for
+chown -R "$ID:$ID" "${PATHS[@]}"
diff --git a/modules/container-configbaker/scripts/help.sh b/modules/container-configbaker/scripts/help.sh
new file mode 100644
index 00000000000..744ec8c8b4c
--- /dev/null
+++ b/modules/container-configbaker/scripts/help.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# [INFO]: This script.
+
+# This is the Dataverse logo in ASCII
+# shellcheck disable=SC2016
+echo -e '          ╓mÎąo\n         â•Ģ   jh\n         `%â•ĨÃĻ╨\n           â•ĢÂĩ\n          ╓@M%╗,\n         ▓`    â•ĢU\n         ▓²    â•Ģ╛\n          ▓M#M╝"\n  ┌ÃĻM╝╝%Ī†â•Ģ┘\n┌â•Ģ"      "â•Ģ┐\n▓          ▓\n▓          ▓\n`â•ĢÂĩ      Âŋâ•Ģ"\n  "╜%%MM╜`'
+echo ""
+echo "Hello!"
+echo ""
+echo "My name is Config Baker. I'm a container image with lots of tooling to 'bake' a containerized Dataverse instance!"
+echo "I can cook up an instance (initial config), put icing on your Solr search index configuration, and more!"
+echo ""
+echo "Here's a list of things I can do for you:"
+
+# Get the longest name length
+LENGTH=1
+for SCRIPT in "${SCRIPT_DIR}"/*.sh; do
+  L="$(basename "$SCRIPT" | wc -m)"
+  if [ "$L" -gt "$LENGTH" ]; then
+    LENGTH="$L"
+  fi
+done
+
+# Print script names and info, but formatted
+for SCRIPT in "${SCRIPT_DIR}"/*.sh; do
+  printf "%${LENGTH}s - " "$(basename "$SCRIPT")"
+  grep "# \[INFO\]: " "$SCRIPT" | sed -e "s|# \[INFO\]: ||"
+done
+
+echo ""
+echo "Simply execute this container with the script name (and potentially arguments) as 'command'."
diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml
new file mode 100644
index 00000000000..e6acf8d48be
--- /dev/null
+++ b/modules/dataverse-parent/pom.xml
@@ -0,0 +1,507 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;">
+    <modelVersion>4.0.0</modelVersion>
+ 
+    <groupId>edu.harvard.iq</groupId>
+    <artifactId>dataverse-parent</artifactId>
+    <version>${revision}</version>
+    <packaging>pom</packaging>
+ 
+    <name>dataverse-parent</name>
+    <url>https://dataverse.org</url>
+    
+    <modules>
+        <module>../../pom.xml</module>
+        <module>../../scripts/zipdownload</module>
+        <module>../container-base</module>
+        <module>../dataverse-spi</module>
+    </modules>
+    
+    <!-- Transitive dependencies, bigger library "bill of materials" (BOM) and
+         versions of dependencies used both directly and transitive are managed here. -->
+    <dependencyManagement>
+        <dependencies>
+            
+            <!-- MAJOR SYSTEM COMPONENTS, BOMs -->
+            
+            <dependency>
+                <groupId>fish.payara.api</groupId>
+                <artifactId>payara-bom</artifactId>
+                <version>${payara.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom</artifactId>
+                <version>${aws.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.cloud</groupId>
+                <artifactId>libraries-bom</artifactId>
+                <version>${google.library.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            
+            <!-- BASIC LIBRARIES / LOGGING / ... -->
+    
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${postgresql.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${commons.logging.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons.lang3.version}</version>
+            </dependency>
+            <!-- Dependency of SolrJ, DuraCloud & used by ourselves -->
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${apache.httpcomponents.client.version}</version>
+            </dependency>
+            <!-- Dependency of SolrJ, Tika, RestAssured, DuraCloud - added here for convergence reasons -->
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpmime</artifactId>
+                <version>${apache.httpcomponents.client.version}</version>
+            </dependency>
+            <!-- Dependency of SolrJ, DuraCloud Store Client & used in our codebase -->
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>${apache.httpcomponents.core.version}</version>
+            </dependency>
+            
+            <!-- Dependency of Tika, Sword2-server, JOSS (Swift), DuraCloud, Lyncode XOAI -->
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons.io.version}</version>
+            </dependency>
+            <!-- Dependency of Sword2-server, Apache POI and in our own codebase -->
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>${commons.compress.version}</version>
+            </dependency>
+            
+            <!-- Dependency of A LOT of libraries. Ensuring convergence here. -->
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-jdk14</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl-over-slf4j</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jul-to-slf4j</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            
+            <!-- TESTING DEPENDENCIES -->
+            
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${testcontainers.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+ 
+    <properties>
+        <!-- This is a special Maven property name, do not change! -->
+        <revision>6.7.1</revision>
+    
+        <target.java.version>17</target.java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <additionalparam>-Xdoclint:none</additionalparam>
+        <!-- Needed to avoid IDEA IDE compilation failures. See commits in GH #5059 -->
+        <compilerArgument></compilerArgument>
+        <project.timezone>UTC</project.timezone>
+        <project.language>en</project.language>
+        <project.region>US</project.region>
+        <!--
+            Moving this from plugin config to global config, because of GH-5122.
+            This seems to play well with NetBeans 8.2, IDEA 2018.1 and mvn including compatibility with JaCoCo.
+        -->
+        <argLine>-Duser.timezone=${project.timezone} -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=${project.language} -Duser.region=${project.region}</argLine>
+    
+        <!-- Major system components and dependencies -->
+        <payara.version>6.2025.3</payara.version>
+        <postgresql.version>42.7.7</postgresql.version>
+        <solr.version>9.8.0</solr.version>
+        <aws.version>2.33.0</aws.version>
+        <google.library.version>26.30.0</google.library.version>
+    
+        <!-- Basic libs, logging -->
+        <slf4j.version>1.7.35</slf4j.version>
+        <commons.io.version>2.19.0</commons.io.version>
+        <commons.logging.version>1.2</commons.logging.version>
+        <commons.lang3.version>3.18.0</commons.lang3.version>
+        <commons.compress.version>1.26.0</commons.compress.version>
+        <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.14</apache.httpcomponents.core.version>
+        
+        <!-- NEW gdcc XOAI library implementation -->
+        <!--gdcc.xoai.version>5.2.0</gdcc.xoai.version -->
+        <gdcc.xoai.version>5.3.2.1-local</gdcc.xoai.version>
+    
+        <!-- Testing dependencies -->
+        <testcontainers.version>1.19.7</testcontainers.version>
+        <smallrye-mpconfig.version>3.7.1</smallrye-mpconfig.version>
+        <junit.jupiter.version>5.10.2</junit.jupiter.version>
+        <mockito.version>5.11.0</mockito.version>
+        <maven-jacoco-plugin.version>0.8.11</maven-jacoco-plugin.version>
+        
+        <checkstyle.version>9.3</checkstyle.version>
+        
+        <!-- Official Maven Plugins -->
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+        <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
+        <maven-install-plugin.version>3.1.1</maven-install-plugin.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
+        <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+        <maven-release-plugin.version>3.0.0-M7</maven-release-plugin.version>
+        <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
+        <maven-site-plugin.version>4.0.0-M4</maven-site-plugin.version>
+        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
+        <maven-flatten-plugin.version>1.3.0</maven-flatten-plugin.version>
+        <maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version>
+        
+        <maven-checkstyle-plugin.version>3.2.2</maven-checkstyle-plugin.version>
+        <nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version>
+        <pomchecker-maven-plugin.version>1.7.0</pomchecker-maven-plugin.version>
+        
+        <!-- Container related -->
+        <fabric8-dmp.version>0.46.0</fabric8-dmp.version>
+    </properties>
+    
+    <pluginRepositories>
+        <pluginRepository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+    
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven-jar-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven-war-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>${maven-dependency-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>${maven-install-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>${maven-failsafe-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>${maven-resources-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>${maven-enforcer-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>${maven-checkstyle-plugin.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>com.puppycrawl.tools</groupId>
+                            <artifactId>checkstyle</artifactId>
+                            <version>${checkstyle.version}</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>${maven-jacoco-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>docker-maven-plugin</artifactId>
+                    <version>${fabric8-dmp.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>${maven-site-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>${maven-source-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${maven-javadoc-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>${maven-gpg-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>flatten-maven-plugin</artifactId>
+                    <version>${maven-flatten-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.kordamp.maven</groupId>
+                    <artifactId>pomchecker-maven-plugin</artifactId>
+                    <version>${pomchecker-maven-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.sonatype.plugins</groupId>
+                    <artifactId>nexus-staging-maven-plugin</artifactId>
+                    <version>${nexus-staging-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>${maven-release-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>no-junit4</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>junit:junit:*:*:test</exclude>
+                                        <exclude>org.junit:junit:*:*:test</exclude>
+                                        <exclude>org.junit.vintage:*:*:*:test</exclude>
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>general-reqs</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <rules>
+                                <banDuplicatePomDependencyVersions/>
+                                <requireJavaVersion>
+                                    <version>[${target.java.version}.0,)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <!--Maven checks for dependencies from these repos in the order shown in the pom.xml
+        This isn't well documented and seems to change between maven versions -MAD 4.9.4 -->
+    <repositories>
+	<!-- this is TEMPORARY, adding local repository, in order to build with a custom version of xoai -->
+	<repository>
+            <id>dvn.private</id>
+            <name>Local repository for hosting jars not available from network repositories.</name>
+            <url>file://${project.basedir}/local_lib</url>
+        </repository>
+        <repository>
+            <id>payara-nexus-artifacts</id>
+            <name>Payara Nexus Artifacts</name>
+            <url>https://nexus.payara.fish/repository/payara-artifacts</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>central-repo</id>
+            <name>Central Repository</name>
+            <url>https://repo1.maven.org/maven2</url>
+            <layout>default</layout>
+        </repository>
+        <repository>
+            <id>prime-repo</id>
+            <name>PrimeFaces Maven Repository</name>
+            <url>https://repository.primefaces.org</url>
+            <layout>default</layout>
+        </repository>
+        <repository>
+            <id>dataone.org</id>
+            <url>https://maven.dataone.org</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>unidata-all</id>
+            <name>Unidata All</name>
+            <url>https://artifacts.unidata.ucar.edu/repository/unidata-all/</url>
+        </repository>
+        <!-- Uncomment when using snapshot releases from Maven Central -->
+        <!--
+        <repository>
+            <id>oss-sonatype</id>
+            <name>oss-sonatype</name>
+            <url>
+                https://oss.sonatype.org/content/repositories/snapshots/
+            </url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>s01-oss-sonatype</id>
+            <name>s01-oss-sonatype</name>
+            <url>
+                https://s01.oss.sonatype.org/content/repositories/snapshots/
+            </url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        -->
+    </repositories>
+    
+    <profiles>
+        <profile>
+            <id>ct</id>
+            <properties>
+                <!-- NOTE:
+                    When cutting a release by changing the revision property above, set this to "${revision}".
+                    Once the release has been made (tag created), change this back to "${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}"
+                    (These properties are provided by the build-helper plugin below.)
+                -->
+                <base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>
+                <!--<base.image.version>${revision}</base.image.version>-->
+                <!-- This is used by the maintenance CI jobs, no need to adapt during releases. -->
+                <app.image.version>${base.image.version}</app.image.version>
+            </properties>
+    
+            <build>
+                <plugins>
+                    <!-- This will get the current commit id to include in image tags of container builds as Maven properties -->
+                    <plugin>
+                        <groupId>io.github.git-commit-id</groupId>
+                        <artifactId>git-commit-id-maven-plugin</artifactId>
+                        <version>5.0.0</version>
+                        <executions>
+                            <execution>
+                                <id>retrieve-git-details</id>
+                                <goals>
+                                    <goal>revision</goal>
+                                </goals>
+                                <phase>initialize</phase>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <dotGitDirectory>${project.basedir}/../../.git</dotGitDirectory>
+                            <dateFormatTimeZone>UTC</dateFormatTimeZone>
+                            <abbrevLength>8</abbrevLength>
+                            <verbose>false</verbose>
+                        </configuration>
+                    </plugin>
+                    <!-- Make incremented versions available as properties -->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>3.6.0</version>
+                        <executions>
+                            <execution>
+                                <id>parse-version</id>
+                                <goals>
+                                    <goal>parse-version</goal>
+                                </goals>
+                                <phase>initialize</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            
+        </profile>
+    </profiles>
+    
+</project>
diff --git a/modules/dataverse-spi/.gitignore b/modules/dataverse-spi/.gitignore
new file mode 100644
index 00000000000..d75620abf70
--- /dev/null
+++ b/modules/dataverse-spi/.gitignore
@@ -0,0 +1 @@
+.flattened-pom.xml
diff --git a/modules/dataverse-spi/pom.xml b/modules/dataverse-spi/pom.xml
new file mode 100644
index 00000000000..b00053fe5e0
--- /dev/null
+++ b/modules/dataverse-spi/pom.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>edu.harvard.iq</groupId>
+        <artifactId>dataverse-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../dataverse-parent</relativePath>
+    </parent>
+    
+    <groupId>io.gdcc</groupId>
+    <artifactId>dataverse-spi</artifactId>
+    <version>2.0.0${project.version.suffix}</version>
+    <packaging>jar</packaging>
+    
+    <name>Dataverse SPI Plugin API</name>
+    <url>https://dataverse.org</url>
+    <description>
+        A package to create out-of-tree Java code for Dataverse Software. Plugin projects can use this package
+        as an API dependency just like Jakarta EE APIs if they want to create external plugins. These will be loaded
+        at runtime of a Dataverse installation using SPI. See also https://guides.dataverse.org/en/latest/developers
+        for more information.
+    </description>
+    
+    <licenses>
+        <license>
+            <name>Apache-2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    
+    <developers>
+        <developer>
+            <name>Dataverse Core Team</name>
+            <email>support@dataverse.org</email>
+        </developer>
+    </developers>
+    
+    <issueManagement>
+        <url>https://github.com/IQSS/dataverse/issues</url>
+        <system>GitHub Issues</system>
+    </issueManagement>
+    
+    <scm>
+        <connection>scm:git:git@github.com:IQSS/dataverse.git</connection>
+        <developerConnection>scm:git:git@github.com:IQSS/dataverse.git</developerConnection>
+        <url>git@github.com:IQSS/dataverse.git</url>
+        <tag>HEAD</tag>
+    </scm>
+    
+    <ciManagement>
+        <url>https://github.com/IQSS/dataverse/actions</url>
+        <system>github</system>
+        <notifiers>
+            <notifier>
+                <address>dataversebot@gdcc.io</address>
+            </notifier>
+        </notifiers>
+    </ciManagement>
+    
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+    
+    <properties>
+        <!-- This property may be used to append a string to the version number from command line -->
+        <project.version.suffix></project.version.suffix>
+        <javadoc.lint>none</javadoc.lint>
+        <skipDeploy>false</skipDeploy>
+    </properties>
+    
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <scope>provided</scope>
+            <!-- no version here as managed by parent -->
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>provided</scope>
+            <!-- no version here as managed by parent -->
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <release>${target.java.version}</release>
+                </configuration>
+            </plugin>
+            
+            <!-- RELEASING -->
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://s01.oss.sonatype.org</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <useReleaseProfile>false</useReleaseProfile>
+                    <releaseProfiles>release</releaseProfiles>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <goals>deploy</goals>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>oss</flattenMode>
+                    <pomElements>
+                        <distributionManagement>remove</distributionManagement>
+                        <repositories>remove</repositories>
+                    </pomElements>
+                </configuration>
+                <executions>
+                    <!-- enable flattening -->
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <!-- ensure proper cleanup -->
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>${skipDeploy}</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.kordamp.maven</groupId>
+                        <artifactId>pomchecker-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>check-maven-central</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                         
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <source>${target.java.version}</source>
+                            <detectJavaApiLink>false</detectJavaApiLink>
+                            <doclint>${javadoc.lint}</doclint>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>ct</id>
+            <properties>
+                <skipDeploy>true</skipDeploy>
+            </properties>
+        </profile>
+    </profiles>
+</project>
diff --git a/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/ExportDataProvider.java b/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/ExportDataProvider.java
new file mode 100644
index 00000000000..d039ac39e8f
--- /dev/null
+++ b/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/ExportDataProvider.java
@@ -0,0 +1,96 @@
+package io.gdcc.spi.export;
+
+import java.io.InputStream;
+import java.util.Optional;
+
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+
+/**
+ * Provides all the metadata Dataverse has about a given dataset that can then
+ * be used by an @see Exporter to create a new metadata export format.
+ * 
+ */
+public interface ExportDataProvider {
+
+    /**
+     * @return - dataset metadata in the standard Dataverse JSON format used in the
+     *         API and available as the JSON metadata export via the user interface.
+     * @apiNote - there is no JSON schema defining this output, but the format is
+     *          well documented in the Dataverse online guides. This, and the
+     *          OAI_ORE export are the only two that provide 'complete'
+     *          dataset-level metadata along with basic file metadata for each file
+     *          in the dataset.
+     */
+    JsonObject getDatasetJson();
+
+    /**
+     * 
+     * @return - dataset metadata in the JSON-LD based OAI_ORE format used in
+     *         Dataverse's archival bag export mechanism and as available in the
+     *         user interface and by API.
+     * @apiNote - THis, and the JSON format are the only two that provide complete
+     *          dataset-level metadata along with basic file metadata for each file
+     *          in the dataset.
+     */
+    JsonObject getDatasetORE();
+
+    /**
+     * Dataverse is capable of extracting DDI-centric metadata from tabular
+     * datafiles. This detailed metadata, which is only available for successfully
+     * "ingested" tabular files, is not included in the output of any other methods
+     * in this interface.
+     * 
+     * @return - a JSONArray with one entry per ingested tabular dataset file.
+     * @apiNote - there is no JSON schema available for this output and the format
+     *          is not well documented. Implementers may wish to expore the @see
+     *          edu.harvard.iq.dataverse.export.DDIExporter and the @see
+     *          edu.harvard.iq.dataverse.util.json.JSONPrinter classes where this
+     *          output is used/generated (respectively).
+     */
+    JsonArray getDatasetFileDetails();
+
+    /**
+     * 
+     * @return - the subset of metadata conforming to the schema.org standard as
+     *         available in the user interface and as included as header metadata in
+     *         dataset pages (for use by search engines)
+     * @apiNote - as this metadata export is not complete, it should only be used as
+     *          a starting point for an Exporter if it simplifies your exporter
+     *          relative to using the JSON or OAI_ORE exports.
+     */
+    JsonObject getDatasetSchemaDotOrg();
+
+    /**
+     * 
+     * @return - the subset of metadata conforming to the DataCite standard as
+     *         available in the Dataverse user interface and as sent to DataCite when DataCite DOIs are used.
+     * @apiNote - as this metadata export is not complete, it should only be used as
+     *          a starting point for an Exporter if it simplifies your exporter
+     *          relative to using the JSON or OAI_ORE exports.
+     */
+    String getDataCiteXml();
+
+    /**
+     * If an Exporter has specified a prerequisite format name via the
+     * getPrerequisiteFormatName() method, it can call this method to retrieve
+     * metadata in that format.
+     * 
+     * @return - metadata in the specified prerequisite format (if available from
+     *         another internal or added Exporter) as an Optional<InputStream>
+     * @apiNote - This functionality is intended as way to easily generate alternate
+     *          formats of the ~same metadata, e.g. to support download as XML,
+     *          HTML, PDF for a specific metadata standard (e.g. DDI). It can be
+     *          particularly useful, reative to starting from the output of one of
+     *          the getDataset* methods above, if there are existing libraries that
+     *          can convert between these formats. Note that, since Exporters can be
+     *          replaced, relying on this method could cause your Exporter to
+     *          malfunction, e.g. if you depend on format "ddi" and a third party
+     *          Exporter is configured to replace the internal ddi Exporter in
+     *          Dataverse.
+     */
+    default Optional<InputStream> getPrerequisiteInputStream() {
+        return Optional.empty();
+    }
+
+}
diff --git a/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/ExportException.java b/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/ExportException.java
new file mode 100644
index 00000000000..c816a605860
--- /dev/null
+++ b/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/ExportException.java
@@ -0,0 +1,13 @@
+package io.gdcc.spi.export;
+
+import java.io.IOException;
+
+public class ExportException extends IOException {
+    public ExportException(String message) {
+        super(message);
+    }
+
+    public ExportException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/Exporter.java b/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/Exporter.java
new file mode 100644
index 00000000000..1338a3c9734
--- /dev/null
+++ b/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/Exporter.java
@@ -0,0 +1,110 @@
+package io.gdcc.spi.export;
+
+import java.io.OutputStream;
+import java.util.Locale;
+import java.util.Optional;
+
+
+/**
+ * Dataverse allows new metadata export formats to be dynamically added a running instance. This is done by
+ * deploying new classes that implement this Exporter interface.
+ */
+
+public interface Exporter {
+
+
+    /**
+     * When this method is called, the Exporter should write the metadata to the given OutputStream.
+     * 
+     * @apiNote When implementing exportDataset, when done writing content, please make sure
+     * to flush() the outputStream, but NOT close() it! This way an exporter can be
+     * used to insert the produced metadata into the body of an HTTP response, etc.
+     * (for example, to insert it into the body of an OAI response, where more XML
+     * needs to be written, for the outer OAI-PMH record). -- L.A. 4.5
+     * 
+     * @param dataProvider - the @see ExportDataProvider interface includes several methods that can be used to retrieve the dataset metadata in different formats. An Exporter should use one or more of these to obtain the values needed to generate metadata in the format it supports. 
+     * @param outputStream - the OutputStream to write the metadata to
+     * @throws ExportException - if there is an error writing the metadata
+     */
+    void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream) throws ExportException;
+
+    /**
+     * This method should return the name of the metadata format this Exporter
+     * provides.
+     * 
+     * @apiNote Format names are unique identifiers for the formats supported in
+     *          Dataverse. Reusing the same format name as another Exporter will
+     *          result only one implementation being available. Exporters packaged
+     *          as an external Jar file have precedence over the default
+     *          implementations in Dataverse. Hence re-using one of the existing
+     *          format names will result in the Exporter replacing the internal one
+     *          with the same name. The precedence between two external Exporters
+     *          using the same format name is not defined.
+     *          Current format names used internally by Dataverse are:
+     *          Datacite
+     *          dcterms
+     *          ddi
+     *          oai_dc
+     *          html
+     *          dataverse_json
+     *          oai_ddi
+     *          OAI_ORE
+     *          oai_datacite
+     *          schema.org
+     *          
+     * @return - the unique name of the metadata format this Exporter
+     */
+    String getFormatName();
+
+    /**
+     * This method should return the display name of the metadata format this
+     * Exporter provides. Display names are used in the UI, specifically in the menu
+     * of avaiable Metadata Exports on the dataset page/metadata tab to identify the
+     * format.
+     */
+    String getDisplayName(Locale locale);
+
+    /**
+     * Exporters can specify that they require, as input, the output of another
+     * exporter. This is done by providing the name of that format in response to a
+     * call to this method.
+     * 
+     * @implNote The one current example where this is done is with the html(display
+     *           name "DDI html codebook") exporter which starts from the XML-based
+     *           ddi format produced by that exporter.
+     * @apiNote - The Exporter can expect that the metadata produced by its
+     *          prerequisite exporter (as defined with this method) will be
+     *          available via the ExportDataProvider.getPrerequisiteInputStream()
+     *          method. The default implementation of this method returns an empty
+     *          value which means the getPrerequisiteInputStream() method of the
+     *          ExportDataProvider sent in the exportDataset method will return an
+     *          empty Optional<InputStream>.
+     * 
+     */
+    default Optional<String> getPrerequisiteFormatName() {
+        return Optional.empty();
+    }
+
+
+    /**
+     * Harvestable Exporters will be available as options in Dataverse's Harvesting mechanism.
+     * @return true to make this exporter available as a harvesting option.
+     */
+    Boolean isHarvestable();
+
+    /**
+     * If an Exporter is available to users, its format will be generated for every
+     * published dataset and made available via the dataset page/metadata
+     * tab/Metadata Exports menu item and via the API.
+     * @return true to make this exporter available to users.
+     */
+    Boolean isAvailableToUsers();
+
+    /**
+     * To support effective downloads of metadata in this Exporter's format, the Exporter should specify an appropriate mime type.
+     * @apiNote - It is recommended to used the @see javax.ws.rs.core.MediaType enum to specify the mime type.
+     * @return The mime type, e.g. "application/json", "text/plain", etc.
+     */
+    String getMediaType();
+
+}
diff --git a/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/XMLExporter.java b/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/XMLExporter.java
new file mode 100644
index 00000000000..3c3fa35c69d
--- /dev/null
+++ b/modules/dataverse-spi/src/main/java/io/gdcc/spi/export/XMLExporter.java
@@ -0,0 +1,37 @@
+package io.gdcc.spi.export;
+
+import jakarta.ws.rs.core.MediaType;
+
+/**
+ * XML Exporter is an extension of the base Exporter interface that adds the
+ * additional methods needed for generating XML metadata export formats.
+ */
+public interface XMLExporter extends Exporter {
+
+    /**
+     * @implNote for the ddi exporter, this method returns "ddi:codebook:2_5"
+     * @return - the name space of the XML schema
+     */
+    String getXMLNameSpace();
+
+    /**
+     * @apiNote According to the XML specification, the value must be a URI
+     * @implNote for the ddi exporter, this method returns
+     *           "https://ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd"
+     * @return - the location of the XML schema as a String (must be a valid URI)
+     */
+    String getXMLSchemaLocation();
+
+    /**
+     * @implNote for the ddi exporter, this method returns "2.5"
+     * @return - the version of the XML schema
+     */
+    String getXMLSchemaVersion();
+
+    /**
+     * @return - should always be MediaType.APPLICATION_XML
+     */
+    public default String getMediaType() {
+        return MediaType.APPLICATION_XML;
+    };
+}
diff --git a/pom.xml b/pom.xml
index 95e0e88c7d3..c8971fb6587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,313 +1,377 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;">
     <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>edu.harvard.iq</groupId>
+        <artifactId>dataverse-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>modules/dataverse-parent</relativePath>
+    </parent>
+    
     <!--
     If you are doing more than bumping the version number, please read
     doc/sphinx-guides/source/developers/dependencies.rst
     -->
-    <groupId>edu.harvard.iq</groupId>
     <artifactId>dataverse</artifactId>
-    <version>4.17</version>
-    <packaging>war</packaging>
+    <packaging>${packaging.type}</packaging>
     <name>dataverse</name>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <additionalparam>-Xdoclint:none</additionalparam>
-        <!-- Needed to avoid IDEA IDE compilation failures. See commits in GH #5059 -->
-        <compilerArgument></compilerArgument>
-        <project.timezone>UTC</project.timezone>
-        <project.language>en</project.language>
-        <project.region>US</project.region>
-        <!--
-            Moving this from plugin config to global config, because of GH-5122.
-            This seems to play well with NetBeans 8.2, IDEA 2018.1 and mvn including compatibility with JaCoCo.
-        -->
-        <argLine>-Duser.timezone=${project.timezone} -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=${project.language} -Duser.region=${project.region}</argLine>
-        <aws.version>1.11.172</aws.version>
-        <jackson.version>2.9.6</jackson.version>
-        <commons.logging.version>1.2</commons.logging.version>
-        <httpcomponents.client.version>4.5.5</httpcomponents.client.version>
-        <junit.version>4.12</junit.version>
-        <junit.jupiter.version>5.3.1</junit.jupiter.version>
-        <junit.vintage.version>5.3.1</junit.vintage.version>
-        <junit.platform.version>1.3.1</junit.platform.version>
-        <mockito.version>2.28.2</mockito.version>
-        <flyway.version>5.2.4</flyway.version>
+        <skipUnitTests>false</skipUnitTests>
+        <skipIntegrationTests>false</skipIntegrationTests>
+        <it.groups>integration</it.groups>
+        
+        <!-- By default, this module will produce a WAR file. -->
+        <!-- This will be switched within the container profile! -->
+        <packaging.type>war</packaging.type>
+        
+        <reload4j.version>1.2.18.4</reload4j.version>
+        <flyway.version>10.19.0</flyway.version>
+        <auto-service.version>1.1.1</auto-service.version>
         <jhove.version>1.20.1</jhove.version>
-        <!--
-        Jacoco 0.8.2 seems to break Netbeans code coverage integration so we'll use 0.8.1 instead.
-        See https://github.com/jacoco/jacoco/issues/772 for discussion of how the XML changed.
-        -->
-        <jacoco.version>0.8.1</jacoco.version>
+        <poi.version>5.4.0</poi.version>
+        <tika.version>2.9.2</tika.version>
+        <netcdf.version>5.5.3</netcdf.version>
+        
+        <openapi.infoTitle>Dataverse API</openapi.infoTitle>
+        <openapi.infoVersion>${project.version}</openapi.infoVersion>
+        <openapi.infoDescription>Open source research data repository software.</openapi.infoDescription>
+        <!-- https://download.eclipse.org/microprofile/microprofile-open-api-3.1.1/microprofile-openapi-spec-3.1.1.html#_location_and_formats -->
+        <openapi.outputDirectory>${project.build.outputDirectory}/META-INF</openapi.outputDirectory>
     </properties>
-    <!--Maven checks for dependendies from these repos in the order shown in the pom.xml
-        This isn't well documented and seems to change between maven versions -MAD 4.9.4 -->
-    <repositories>
-        <repository>
-            <id>central-repo</id>
-            <name>Central Repository</name>
-            <url>http://repo1.maven.org/maven2</url>
-            <layout>default</layout>
-        </repository>
-        <repository>
-            <id>prime-repo</id>
-            <name>PrimeFaces Maven Repository</name>
-            <url>http://repository.primefaces.org</url>
-            <layout>default</layout>
-        </repository>
-        <repository>
-            <id>dataone.org</id>
-            <url>http://maven.dataone.org</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>dvn.private</id>
-            <name>Local repository for hosting jars not available from network repositories.</name>
-            <url>file://${project.basedir}/local_lib</url>
-        </repository>
-    </repositories>
-    <!-- Transitive dependencies, bigger library "bill of materials" (BOM) and
-         versions of dependencies used both directly and transitive are managed here. -->
+    
+    <!-- Versions of dependencies used both directly and transitive are managed here.
+         REMEMBER: only manage things here that are going to be used ONLY for this module.
+                   Anything else should go into the parent POM!
+    -->
     <dependencyManagement>
         <dependencies>
+            <!-- Dependency of sword2-server and used in our codebase -->
             <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-bom</artifactId>
-                <version>${aws.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
+                <groupId>org.apache.abdera</groupId>
+                <artifactId>abdera-core</artifactId>
+                <version>1.1.3</version>
+                <exclusions>
+                  <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.apache.james</groupId>
+                    <artifactId>apache-mime4j-core</artifactId>
+                </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
-                <groupId>com.fasterxml.jackson</groupId>
-                <artifactId>jackson-bom</artifactId>
-                <version>${jackson.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
+                <groupId>org.apache.abdera</groupId>
+                <artifactId>abdera-i18n</artifactId>
+                <version>1.1.3</version>
             </dependency>
             <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>${commons.logging.version}</version>
+                <groupId>org.apache.abdera</groupId>
+                <artifactId>abdera-parser</artifactId>
+                <version>1.1.3</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-javamail_1.4_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.codehaus.woodstox</groupId>
+                        <artifactId>wstx-asl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.codehaus.woodstox</groupId>
+                        <artifactId>woodstox-core-asl</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
+            <!-- Dependency for Apache Abdera and Apache Tika. Tika needs newer version. -->
             <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${httpcomponents.client.version}</version>
+                <groupId>org.apache.james</groupId>
+                <artifactId>apache-mime4j-core</artifactId>
+                <version>0.8.10</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>apache-mime4j-dom</artifactId>
+                <version>0.8.7</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
     <!-- Declare any DIRECT dependencies here.
-         In case the depency is both transitive and direct (e. g. some common lib for logging),
+         In case the dependency is both transitive and direct (e. g. some common lib for logging),
          manage the version above and add the direct dependency here WITHOUT version tag, too.
     -->
-    <!-- TODO: Housekeeping is utterly needed. -->
+    <!-- TODO: Housekeeping is utterly needed! -->
     <dependencies>
+
+        <!-- This dependency ensures the lib is on the classpath. That way, anything coming from
+             SLF4J should flow through our usual ways of using java.util.logging.
+             (Which makes it also configurable using those mechanisms.) No direct use intended. -->
         <dependency>
-            <groupId>org.passay</groupId>
-            <artifactId>passay</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit.jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <version>${junit.jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit.vintage.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <version>1.0.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>runtime</scope>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.4.9</version>
-        </dependency>
+            <groupId>org.passay</groupId>
+            <artifactId>passay</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+        
+        <!-- TECHNICAL DEBT
+             For a very long time, in a lots of places people used org.apache.commons.httpclient to access
+             HTTP resources, wrap responses in exceptions etc.
+             
+             This library had been used via an transitive dependency of sword2-server. During its recent updates,
+             the dependency was dropped, went missing, eventually breaking our code. Re-adding this 2007 goodie here
+             as a direct dependency.
+             
+             There is a lot of technical debt in the codebase regarding HTTP client calls. Sometimes
+             java.net.HttpUrlConnection is used, sometimes Apache, sometimes Unirest and what not.
+             A big pile of historically grown mess. Some poor dev should take a Kleenex and call for "payback time". -->
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
+        </dependency>
+    
         <!-- BEGIN Data Deposit API v1 (SWORD v2) -->
         <dependency>
-            <groupId>org.swordapp</groupId>
+            <groupId>io.gdcc</groupId>
             <artifactId>sword2-server</artifactId>
-            <version>1.0</version>
-            <type>jar</type>
-            <classifier>classes</classifier>
+            <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <!-- Dependency to use sword2-server in our codebase -->
         <dependency>
-            <groupId>org.swordapp</groupId>
-            <artifactId>sword2-server</artifactId>
-            <!--
-            Built from https://github.com/IQSS/swordv2-java-server-library
-            to return a proper SWORD error message rather than a Glassfish
-            Exception per https://github.com/IQSS/dataverse/issues/893
-            If the fix is merged upstream at
-            https://github.com/swordapp/JavaServer2.0/issues/6
-            we can switch back to the official SWORD library.
-            -->
-            <version>1.1-SNAPSHOT</version>
-            <type>war</type>
+            <groupId>org.apache.abdera</groupId>
+            <artifactId>abdera-core</artifactId>
+            <!-- no version here as managed in <dependencyManagement> above for convergence! -->
             <exclusions>
                 <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- Dependency to use sword2-server in our codebase -->
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <!-- Once on Eclipse Glassfish 5.1 or Payara 5.x, this should be changed to aws-java-sdk-s3,
-                 rendering the WAR much lighter. The version tag needs to be removed then, too. -->
-            <artifactId>aws-java-sdk-bundle</artifactId>
-            <version>${aws.version}</version>
+            <groupId>org.apache.abdera</groupId>
+            <artifactId>abdera-i18n</artifactId>
+            <!-- no version here as managed in <dependencyManagement> above for convergence! -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <!-- required by org.swordapp.server.sword2-server -->
-            <groupId>org.apache.abdera</groupId>
-            <artifactId>abdera-core</artifactId>
-            <version>1.1.3</version>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <!-- no version here as managed by BOM above! -->
         </dependency>
         <dependency>
-            <!-- required by org.swordapp.server.sword2-server -->
-            <groupId>org.apache.abdera</groupId>
-            <artifactId>abdera-parser</artifactId>
-            <version>1.1.3</version>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3-transfer-manager</artifactId>
+            <!-- no version here as managed by BOM above! -->
         </dependency>
+        <!--dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache-client</artifactId-->
+            <!-- no version here as managed by BOM above! -->
+        <!--/dependency-->
         <dependency>
-            <!-- required by org.swordapp.server.sword2-server -->
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.3.3</version>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>netty-nio-client</artifactId>
+            <!-- no version here as managed by BOM above! -->
         </dependency>
         <dependency>
-            <!-- a dependency of commons-fileupload, but newer version required by tika -->
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+          <groupId>com.apicatalog</groupId>
+          <artifactId>titanium-json-ld</artifactId>
+          <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.2.4</version>
             <scope>compile</scope>
         </dependency>
-        <!-- Should be refactored and removed once on Java EE 8 -->
+        <!-- Should be refactored and moved to transitive section above once on Java EE 8 (makes WAR smaller) -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
+            <scope>provided</scope>
         </dependency>
-        <!-- Should be refactored and removed once on Java EE 8 -->
+        <!-- Should be refactored and moved to transitive section above once on Java EE 8 (makes WAR smaller) -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <!-- required by org.swordapp.server.sword2-server -->
-            <groupId>com.io7m.xom</groupId>
-            <artifactId>xom</artifactId>
-            <version>1.2.10</version>
-        </dependency>
-        <!-- END Data Deposit API v1 (SWORD v2) -->
-        <dependency>
-            <!-- There are later versions of this lib available at jitpack.io,
-                 but it seemed better to not add another repo. -->
-            <groupId>org.everit.json</groupId>
-            <artifactId>org.everit.json.schema</artifactId>
-            <version>1.5.1</version>
+            <groupId>com.github.erosb</groupId>
+            <artifactId>everit-json-schema</artifactId>
+            <version>1.14.1</version>
         </dependency>
         <dependency>
             <groupId>org.mindrot</groupId>
             <artifactId>jbcrypt</artifactId>
-            <version>0.3m</version>
+            <version>0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
             <version>${flyway.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-database-postgresql</artifactId>
+            <version>${flyway.version}</version>
+        </dependency>
+        <!-- Enable resolution of the JPA provider in persistence.xml -->
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>org.eclipse.persistence.jpa</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>16.0.1</version>
+            <version>32.1.2-jre</version>
             <type>jar</type>
         </dependency>
+        
+        <!-- Jakarta EE & Eclipse MicroProfile base dependencies -->
+        <dependency>
+            <groupId>org.eclipse.microprofile.config</groupId>
+            <artifactId>microprofile-config-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.metrics</groupId>
+            <artifactId>microprofile-metrics-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.openapi</groupId>
+            <artifactId>microprofile-openapi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- Jakarta Activation, MIME support etc -->
+        <!-- Runtime implementation here only, as necessary for testing. -->
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-activation</artifactId>
+            <scope>provided</scope>
+            <!-- no version here as managed by Payara BOM above! -->
+        </dependency>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <groupId>fish.payara.api</groupId>
+            <artifactId>payara-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- JSON-P -->
+        <!-- Runtime implementation here only, as necessary for testing. -->
+        <dependency>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>jakarta.json</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
+        <!-- JSON-B -->
+        <dependency>
+            <groupId>jakarta.json.bind</groupId>
+            <artifactId>jakarta.json.bind-api</artifactId>
+        </dependency>
+        <!-- Rope in an implementation for unit tests - is provided at runtime by appserver -->
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-web-api</artifactId>
-            <version>7.0</version>
+            <groupId>org.eclipse</groupId>
+            <artifactId>yasson</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
+        <!-- Jakarta Faces & related -->
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.faces</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.primefaces</groupId>
             <artifactId>primefaces</artifactId>
-            <version>7.0</version>
+            <version>11.0.0</version>
+            <classifier>jakarta</classifier>
         </dependency>
         <dependency>
             <groupId>org.primefaces.themes</groupId>
             <artifactId>all-themes</artifactId>
             <version>1.0.10</version>
         </dependency>
-        <dependency>
-            <groupId>org.atmosphere</groupId>
-            <artifactId>atmosphere-runtime</artifactId>
-            <version>2.4.2</version>
-        </dependency>
         <dependency>
             <groupId>org.omnifaces</groupId>
             <artifactId>omnifaces</artifactId>
-            <version>1.7</version> <!-- Or 1.8-SNAPSHOT -->
+            <version>4.0-M13</version>
+        </dependency>
+        
+        <!-- Jakarta Validation API & runtime -->
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>5.0.3.Final</version>
+            <scope>provided</scope>
         </dependency>
+    
+        <!-- Jakarta Expression Language -->
+        <!-- Runtime implementation here only, as necessary for testing. -->
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
+            <groupId>org.glassfish.expressly</groupId>
+            <artifactId>expressly</artifactId>
+            <scope>provided</scope>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-solrj</artifactId>
-            <version>7.3.1</version>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <!-- no version here as managed in <dependencyManagement> of parent for convergence! -->
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <!-- no version here as managed in <dependencyManagement> of parent for convergence! -->
+        </dependency>
+        <!-- Some utils from commons.lang have been moved to commons-text (especially escapeHtml()) -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -317,29 +381,29 @@
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
-            <version>1.6</version>
+            <version>1.7</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <version>9.8.0</version>
         </dependency>
         <dependency>
             <groupId>colt</groupId>
             <artifactId>colt</artifactId>
             <version>1.2.0</version>
         </dependency>
-        <!-- fits.jar, not available from network repos, supplied in local_lib -->
+        <!-- FITS -->
         <dependency>
-            <groupId>nom.tam.fits</groupId>
-            <artifactId>fits</artifactId>
-            <version>2012-10-25-generated</version>
+            <groupId>gov.nasa.gsfc.heasarc</groupId>
+            <artifactId>nom-tam-fits</artifactId>
+            <version>1.12.0</version>
         </dependency>
         <dependency>
             <groupId>net.handle</groupId>
-            <artifactId>handle</artifactId>
-            <version>8.1.1</version>
-        </dependency>
-        <!-- UNF v5 (buggy), (temporarily) added for testing ingest against DVN v3  - L.A. -->
-        <dependency>
-            <groupId>edu.harvard.iq.dvn</groupId>
-            <artifactId>unf5</artifactId>
-            <version>5.0</version>
+            <artifactId>handle-client</artifactId>
+            <version>9.3.1</version>
         </dependency>
         <!-- (new) UNF v6: -->
         <dependency>
@@ -363,17 +427,17 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>4.0.0</version>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>4.0.0</version>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
-            <artifactId>poi-examples</artifactId>
-            <version>4.0.0</version>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openpreservation.jhove</groupId>
@@ -394,71 +458,34 @@
         <dependency>
             <groupId>com.github.jai-imageio</groupId>
             <artifactId>jai-imageio-core</artifactId>
-            <version>1.3.1</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.ocpsoft.rewrite</groupId>
             <artifactId>rewrite-servlet</artifactId>
-            <version>3.4.2.Final</version>
+            <version>10.0.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.ocpsoft.rewrite</groupId>
             <artifactId>rewrite-config-prettyfaces</artifactId>
-            <version>3.4.2.Final</version>
+            <version>10.0.0.Final</version>
         </dependency>
         <dependency>
             <groupId>edu.ucsb.nceas</groupId>
             <artifactId>ezid</artifactId>
             <version>1.0.0</version>
             <type>jar</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.11.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.restassured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <version>2.4.0</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- Added specific versionf of SLF4J jars; otherwise we end up with
-        conflicting versions of slf4j-api and slf4j-log4j12, loaded as
-        dependencies for different packages; which was causing some incompatibility
-        issues -L.A. 4.3 -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-junit-jupiter</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- Added for DataCite -->
-        <!--dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.1</version>
-        </dependency -->
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis</artifactId>
-            <version>1.4</version>
+            <version>1.15.3</version>
         </dependency>
         <dependency>
             <groupId>io.searchbox</groupId>
@@ -468,7 +495,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.9</version>
+            <version>1.15</version>
         </dependency>
         <!-- JavaSwift/JOSS: for accessing OpenStack cloud storage -->
         <dependency>
@@ -481,62 +508,63 @@
             <artifactId>commons-csv</artifactId>
             <version>1.2</version>
         </dependency>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>2.10.1</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
         <!-- OAuth2 authentication. -->
         <dependency>
             <groupId>com.github.scribejava</groupId>
             <artifactId>scribejava-apis</artifactId>
             <version>6.9.0</version>
         </dependency>
-        <!-- EXPERIMENTAL: -->
-        <!-- lyncode xoai OAI-PMH implementation: -->
-        <!-- unfortunately, their 4.10 version -->
-        <!-- is still buggy. As an experiment, I'm using -->
-        <!-- a patched version I built locally. -->
-        <!-- (pull requests pending - L.A. -->
+        <!-- OpenID Connect authentication -->
         <dependency>
-            <groupId>com.lyncode</groupId>
-            <artifactId>xoai-common</artifactId>
-            <version>4.1.0-header-patch</version>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>oauth2-oidc-sdk</artifactId>
+            <version>11.22.1</version>
         </dependency>
+        <!-- Caching library, current main use case is for OIDC authentication -->
         <dependency>
-            <groupId>com.lyncode</groupId>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>3.1.8</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.stream</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        
+        <!-- New and Improved GDCC XOAI library! -->
+        <dependency>
+            <groupId>io.gdcc</groupId>
             <artifactId>xoai-data-provider</artifactId>
-            <version>4.1.0-header-patch</version>
+            <version>${gdcc.xoai.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.lyncode</groupId>
+            <groupId>io.gdcc</groupId>
             <artifactId>xoai-service-provider</artifactId>
-            <version>4.1.0-header-patch</version>
+            <version>${gdcc.xoai.version}</version>
         </dependency>
         <!-- Added for AutoService -->
         <dependency>
             <groupId>com.google.auto.service</groupId>
             <artifactId>auto-service</artifactId>
-            <version>1.0-rc2</version>
+            <version>${auto-service.version}</version>
             <optional>true</optional>
             <type>jar</type>
         </dependency>
         <!-- For API File Upload: 1 of 2 -->
         <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-servlet</artifactId>
-            <version>2.23.2</version>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
         </dependency>
         <!-- For API File Upload: 2 of 2 -->
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-multipart</artifactId>
-            <version>2.23.2</version>
         </dependency>
         <dependency>
             <groupId>com.mashape.unirest</groupId>
@@ -547,12 +575,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.19</version>
+            <!-- no version here as managed by <dependencyManagement> above! -->
         </dependency>
         <dependency>
             <groupId>org.duracloud</groupId>
             <artifactId>common</artifactId>
-            <version>4.4.6</version>
+            <version>8.0.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -567,7 +595,7 @@
         <dependency>
             <groupId>org.duracloud</groupId>
             <artifactId>storeclient</artifactId>
-            <version>4.4.6</version>
+            <version>8.0.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -583,16 +611,22 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!--  Full text indexing -->
         <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.2</version>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>${tika.version}</version>
         </dependency>
-        <!--  Full text indexing -->
         <dependency>
             <groupId>org.apache.tika</groupId>
-            <artifactId>tika-parsers</artifactId>
-            <version>1.22</version>
+            <artifactId>tika-parsers-standard-package</artifactId>
+            <version>${tika.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Named Entity Recognition -->
         <dependency>
@@ -600,24 +634,191 @@
             <artifactId>opennlp-tools</artifactId>
             <version>1.9.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <version>2.10.0</version>
+        </dependency>
+        <dependency>
+          <groupId>com.google.cloud</groupId>
+          <artifactId>google-cloud-storage</artifactId>
+          <!-- no version here as managed in <dependencyManagement> of parent for convergence! -->
+        </dependency>
+        <!-- JWT support, currently in DRSSubmitToArchiveCommand-->
+        <!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
+        <dependency>
+          <groupId>com.auth0</groupId>
+          <artifactId>java-jwt</artifactId>
+          <version>3.19.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/io.github.erdtman/java-json-canonicalization -->
+        <dependency>
+          <groupId>io.github.erdtman</groupId>
+          <artifactId>java-json-canonicalization</artifactId>
+          <version>1.1</version>
+        </dependency>
+        <!-- Sitemap generation -->
+        <dependency>
+            <groupId>io.gdcc</groupId>
+            <artifactId>sitemapgen4j</artifactId>
+            <version>2.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.ucar</groupId>
+            <artifactId>cdm-core</artifactId>
+            <version>${netcdf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.gdcc</groupId>
+            <artifactId>dataverse-spi</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.cache</groupId>
+            <artifactId>cache-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.undercouch</groupId>
+            <artifactId>citeproc-java</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.citationstyles</groupId>
+            <artifactId>styles</artifactId>
+            <version>24.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.citationstyles</groupId>
+            <artifactId>locales</artifactId>
+            <version>24.3</version>
+        </dependency>
+        <!-- TESTING DEPENDENCIES -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>2.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.20.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-assertj3</artifactId>
+            <version>2.10.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <version>5.3.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>1.5.0</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.dasniko</groupId>
+            <artifactId>testcontainers-keycloak</artifactId>
+            <version>3.6.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>localstack</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!--
+            Brute force solution until we are on Jakarta EE 10.
+            Otherwise, we get very cryptic errors about missing bundle files on test runs.
+            See also https://github.com/jakartaee/jakartaee-api/issues/61
+        -->
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>4.0.4</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.smallrye.config</groupId>
+            <artifactId>smallrye-config</artifactId>
+            <version>${smallrye-mpconfig.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>3.9.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.hazelcast</groupId>
+            <artifactId>hazelcast</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
-        <!--        <testResources>
-            <testResource>
-                <directory>${project.basedir}/src/main/resources</directory>
-            </testResource>
-        </testResources>-->
-        <!--        <testResources>
+        <testResources>
             <testResource>
-              <directory>${project.basedir}/src/test/java</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-              </excludes>
+                <directory>${project.basedir}/src/test/resources</directory>
             </testResource>
             <testResource>
-              <directory>${project.basedir}/src/test/resources</directory>
+                <directory>${project.basedir}/conf/keycloak</directory>
+                <targetPath>keycloak</targetPath>
             </testResource>
-          </testResources>-->
+        </testResources>
         <resources>
             <resource>
                 <directory>src/main/java</directory>
@@ -635,6 +836,16 @@
                     <include>**/*.xml</include>
                     <include>**/firstNames/*.*</include>
                     <include>**/*.xsl</include>
+                    <include>**/services/*</include>
+                    <include>**/*.map</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <!-- Filter files matching here for Maven properties and replace -->
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.properties</include>
                 </includes>
             </resource>
         </resources>
@@ -642,18 +853,23 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>${target.java.version}</release>
                     <!-- for use with `mvn -DcompilerArgument=-Xlint:unchecked compile` -->
                     <compilerArgument>${compilerArgument}</compilerArgument>
+                    <!-- Ensure the annotation processor for @AutoService is picked up. Especially important as of JDK 23 -->
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>com.google.auto.service</groupId>
+                            <artifactId>auto-service</artifactId>
+                            <version>${auto-service.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -666,23 +882,25 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.3</version>
                 <configuration>
                     <attachClasses>true</attachClasses>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>
                     <archive>
                         <manifest>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                             <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                         </manifest>
                     </archive>
+                    <!-- Keep these excludes in sync with the ones in src/main/docker/assembly.xml. -->
+                    <packagingExcludes>
+                        WEB-INF/classes/edu/harvard/iq/dataverse/search/GetExternalSearchServiceBean.class,
+                        WEB-INF/classes/edu/harvard/iq/dataverse/search/PostExternalSearchServiceBean.class,
+                        WEB-INF/classes/edu/harvard/iq/dataverse/search/GoldenOldiesSearchServiceBean.class,
+                        WEB-INF/classes/edu/harvard/iq/dataverse/search/OddlyEnoughSearchServiceBean.class
+                    </packagingExcludes>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.1</version>
-            </plugin>
             <plugin>
                 <groupId>de.qaware.maven</groupId>
                 <artifactId>go-offline-maven-plugin</artifactId>
@@ -695,91 +913,177 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <configuration>
-                    <destfile>${basedir}/target/coverage-reports/jacoco-unit.exec</destfile>
-                    <datafile>${basedir}/target/coverage-reports/jacoco-unit.exec</datafile>
-                </configuration>
                 <executions>
                     <execution>
                         <id>jacoco-initialize</id>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-unit.exec</destFile>
+                            <propertyName>surefire.jacoco.args</propertyName>
+                            <skip>${skipUnitTests}</skip>
+                            <includes>
+                                <include>edu/harvard/iq/dataverse/*</include>
+                                <include>io/gdcc/*</include>
+                                <include>org/dataverse/*</include>
+                            </includes>
+                        </configuration>
                     </execution>
                     <execution>
-                        <id>jacoco-site</id>
-                        <phase>package</phase>
+                        <id>jacoco-after-unit</id>
+                        <phase>test</phase>
                         <goals>
                             <goal>report</goal>
                         </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/coverage-reports/jacoco-unit.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-unit-test-coverage-report</outputDirectory>
+                            <skip>${skipUnitTests}</skip>
+                        </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-                <version>4.0.0</version>
-            </plugin>
-            <!-- v4.8: The truezip-maven-plugin below deletes two copies of a file that the AWS SDK bundle
-            includes called javamail.providers which breaks system emails. - bsilverstein 8/8/2017 -->
-            <!-- Once on Eclipse Glassfish 5.1 or Payara 5.x and changing to aws-java-sdk-s3, this can be deleted. -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>truezip-maven-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
                     <execution>
-                        <id>remove-javamail-providers-from-exploded</id>
+                        <id>jacoco-initialize-it</id>
+                        <phase>pre-integration-test</phase>
                         <goals>
-                            <goal>remove</goal>
+                            <goal>prepare-agent</goal>
                         </goals>
-                        <phase>package</phase>
                         <configuration>
-                            <fileset>
-                                <directory>target/dataverse-${project.version}/WEB-INF/lib/aws-java-sdk-bundle-${aws.version}.jar/META-INF</directory>
-                                <includes>
-                                    <include>javamail.providers</include>
-                                </includes>
-                            </fileset>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-integration.exec</destFile>
+                            <propertyName>failsafe.jacoco.args</propertyName>
+                            <skip>${skipIntegrationTests}</skip>
+                            <includes>
+                                <include>edu/harvard/iq/dataverse/*</include>
+                                <include>io/gdcc/*</include>
+                                <include>org/dataverse/*</include>
+                            </includes>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>remove-javamail-providers-from-war</id>
+                        <id>jacoco-after-it</id>
+                        <phase>post-integration-test</phase>
                         <goals>
-                            <goal>remove</goal>
+                            <goal>report</goal>
                         </goals>
-                        <phase>package</phase>
                         <configuration>
-                            <fileset>
-                                <directory>target/dataverse-${project.version}.war/WEB-INF/lib/aws-java-sdk-bundle-${aws.version}.jar/META-INF</directory>
-                                <includes>
-                                    <include>javamail.providers</include>
-                                </includes>
-                            </fileset>
+                            <dataFile>${project.build.directory}/coverage-reports/jacoco-integration.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-integration-test-coverage-report</outputDirectory>
+                            <skip>${skipIntegrationTests}</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>jacoco-merge-unit-and-it</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>merge</goal>
+                        </goals>
+                        <configuration>
+                            <fileSets>
+                                <fileSet>
+                                    <directory>${project.build.directory}/coverage-reports/</directory>
+                                    <includes>
+                                        <include>*.exec</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                            <destFile>${project.build.directory}/coverage-reports/merged.exec</destFile>
+                            <skip>${skipIntegrationTests}</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>jacoco-report</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/coverage-reports/merged.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-merged-test-coverage-report</outputDirectory>
+                            <skip>${skipIntegrationTests}</skip>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
-                <!-- https://stackoverflow.com/questions/46177921/how-to-run-unit-tests-in-excludedgroups-in-maven -->
+                <groupId>org.eluder.coveralls</groupId>
+                <artifactId>coveralls-maven-plugin</artifactId>
+                <version>4.3.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>2.3.1</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <jacocoReports>${project.reporting.outputDirectory}/jacoco-merged-test-coverage-report/jacoco.xml</jacocoReports>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
                 <configuration>
+                    <!-- https://stackoverflow.com/questions/46177921/how-to-run-unit-tests-in-excludedgroups-in-maven -->
                     <!-- testsToExclude come from the profile-->
                     <excludedGroups>${testsToExclude}</excludedGroups>
+                    <skip>${skipUnitTests}</skip>
+                    <argLine>${surefire.jacoco.args} ${argLine}</argLine>
+                    <excludes>
+                        <exclude>**/builtin-users-spi/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <!-- Run mvn verify to execute these Testcontainers based integration tests. Needs Docker! -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <groups>${it.groups}</groups>
+                    <argLine>${failsafe.jacoco.args} ${argLine}</argLine>
+                    <skip>${skipIntegrationTests}</skip>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.0.0</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                     <encoding>UTF-8</encoding>
                     <consoleOutput>true</consoleOutput>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>io.smallrye</groupId>
+                <artifactId>smallrye-open-api-maven-plugin</artifactId>
+                <version>3.10.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-schema</goal>
+                        </goals>
+                        <!-- Plugin scans class files, not sources. Execute after compile phase but before package -->
+                        <phase>process-classes</phase>
+                        <configuration>
+                            <outputDirectory>${openapi.outputDirectory}</outputDirectory>
+                            <schemaFilename>openapi</schemaFilename>
+                            <infoTitle>${openapi.infoTitle}</infoTitle>
+                            <infoVersion>${openapi.infoVersion}</infoVersion>
+                            <infoDescription>${openapi.infoDescription}</infoDescription>
+                            <operationIdStrategy>CLASS_METHOD</operationIdStrategy>
+                            <scanPackages>edu.harvard.iq.dataverse</scanPackages>
+                            <scanDependenciesDisable>true</scanDependenciesDisable>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -791,12 +1095,251 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <testsToExclude>edu.harvard.iq.dataverse.NonEssentialTests</testsToExclude>
+                <testsToExclude>not-essential-unittests</testsToExclude>
             </properties>
         </profile>
         <profile>
             <id>all-unit-tests</id>
         </profile>
         <!-- TODO: Add a profile to run API tests (integration tests that end in IT.java. See conf/docker-aio/run-test-suite.sh -->
-    </profiles>
+        <profile>
+            <id>ct</id>
+            <properties>
+                <!-- Let's go FAST here - building the image should be quick to do by default. -->
+                <skipUnitTests>true</skipUnitTests>
+                <skipIntegrationTests>true</skipIntegrationTests>
+                <!-- Once we truly run tests with Testcontainers, this should be switch to "docker", activating ITs -->
+                <packaging.type>docker-build</packaging.type>
+                <postgresql.server.version>17</postgresql.server.version>
+            
+                <app.image>gdcc/dataverse:${app.image.tag}</app.image>
+                <!--
+                    Note: We are still using the unstable tag here, as we need it most for development purposes.
+                          It will be overridden by the maintenance CI for released app versions.
+                    Note: During maintenance we will use the app.image.version setting from the DV parent POM.
+                 -->
+                <app.image.tag>unstable</app.image.tag>
+                <app.skipBuild>false</app.skipBuild>
+                <app.skipDeploy>false</app.skipDeploy>
+                
+                <base.image>gdcc/base:${base.image.tag}</base.image>
+                <!-- Flavor is a release from a Linux distro, such as Ubuntu -->
+                <base.image.flavor>noble</base.image.flavor>
+                <!-- base.image.version is coming from parent module via build-helper plugin -->
+                <base.image.tag>${base.image.version}-${base.image.flavor}${base.image.tag.suffix}</base.image.tag>
+                <!-- Suffix is defaulting to use the image with a specific Payara and Java version for development purpose -->
+                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
+                
+                <conf.image>gdcc/configbaker:${conf.image.tag}</conf.image>
+                <!-- By default, we use the same tag as the app image for development purposes. Same rules as for app.image.tag apply! -->
+                <conf.image.tag>${app.image.tag}</conf.image.tag>
+                <conf.image.flavor>noble</conf.image.flavor>
+                <conf.image.base>ubuntu:${conf.image.flavor}</conf.image.base>
+                <conf.skipBuild>false</conf.skipBuild>
+    
+                <docker.platforms></docker.platforms>
+            
+                <!-- Variables as used in docker-compose.yml -->
+                <APP_IMAGE>${app.image}</APP_IMAGE>
+                <POSTGRES_VERSION>${postgresql.server.version}</POSTGRES_VERSION>
+                <SOLR_VERSION>${solr.version}</SOLR_VERSION>
+                <DATAVERSE_DB_USER>dataverse</DATAVERSE_DB_USER>
+                <SKIP_DEPLOY>${app.skipDeploy}</SKIP_DEPLOY>
+            </properties>
+        
+            <build>
+                <plugins>
+                    <!-- Build the exploded WAR target directory -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>exploded</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                        </configuration>
+                    </plugin>
+                
+                    <!-- Build image via Docker Maven Plugin -->
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <images>
+                                <!-- Dataverse Application image -->
+                                <image>
+                                    <alias>dev_dataverse</alias>
+                                    <name>${app.image}</name>
+                                    <build>
+                                        <skip>${app.skipBuild}</skip>
+                                        <skipPush>${app.skipBuild}</skipPush>
+                                        <skipTag>${app.skipBuild}</skipTag>
+                                        <buildx>
+                                            <platforms>
+                                                <platform>${docker.platforms}</platform>
+                                            </platforms>
+                                        </buildx>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <args>
+                                            <BASE_IMAGE>${base.image}</BASE_IMAGE>
+                                            <!-- Workaround for fabric8io/docker-maven-plugin#1865 -->
+                                            <APP_IMAGE_VERSION>${app.image.version}</APP_IMAGE_VERSION>
+                                        </args>
+                                        <filter>@</filter>
+                                        <assembly>
+                                            <descriptor>assembly.xml</descriptor>
+                                        </assembly>
+                                    </build>
+                                    
+                                    <run>
+                                    </run>
+                                    
+                                    <external>
+                                        <type>compose</type>
+                                        <basedir>${project.basedir}</basedir>
+                                        <composeFile>docker-compose-dev.yml</composeFile>
+                                    </external>
+                                </image>
+                                
+                                <image>
+                                    <alias>dev_bootstrap</alias>
+                                    <name>${conf.image}</name>
+                                    <build>
+                                        <skip>${conf.skipBuild}</skip>
+                                        <skipPush>${conf.skipBuild}</skipPush>
+                                        <skipTag>${conf.skipBuild}</skipTag>
+                                        <buildx>
+                                            <platforms>
+                                                <platform>${docker.platforms}</platform>
+                                            </platforms>
+                                        </buildx>
+                                        <dockerFile>${project.basedir}/modules/container-configbaker/Dockerfile</dockerFile>
+                                        <args>
+                                            <BASE_IMAGE>${conf.image.base}</BASE_IMAGE>
+                                            <SOLR_VERSION>${SOLR_VERSION}</SOLR_VERSION>
+                                            <!-- Workaround for fabric8io/docker-maven-plugin#1865 -->
+                                            <APP_IMAGE_VERSION>${app.image.version}</APP_IMAGE_VERSION>
+                                        </args>
+                                        <filter>@</filter>
+                                        <assembly>
+                                            <descriptor>${project.basedir}/modules/container-configbaker/assembly.xml</descriptor>
+                                        </assembly>
+                                    </build>
+                                    
+                                    <!--
+                                        We skip the run here as it is already included in the external run config
+                                        above for the main image via the docker-compose file. Even if using
+                                        -Ddocker.filter=dev_bootstrap, the run config from above is still enforced.
+                                    -->
+                                    <run>
+                                        <skip>true</skip>
+                                    </run>
+                                </image>
+                            </images>
+                            <autoCreateCustomNetworks>true</autoCreateCustomNetworks>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${maven-failsafe-plugin.version}</version>
+                        <configuration>
+                            <groups>end2end</groups>
+                            <systemPropertyVariables>
+                                <postgresql.server.version>${postgresql.server.version}</postgresql.server.version>
+                            </systemPropertyVariables>
+                            <skip>${skipIntegrationTests}</skip>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>external-search-get</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>external-search-get-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/assembly/external-search-get.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>external-search-post</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>external-search-post-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/assembly/external-search-post.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>trivial-search-examples</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>trivial-search-examples-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/assembly/trivial-search-examples.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+  </profiles>
 </project>
diff --git a/renovate.json5 b/renovate.json5
new file mode 100644
index 00000000000..c7bc73cef49
--- /dev/null
+++ b/renovate.json5
@@ -0,0 +1,61 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    // We don't use this for now, as we want to avoid the noise - we'll only selectively activate updates
+    // "extends": [
+    //    "config:recommended",
+    // ]
+
+    // We want a nice overview of dependencies under renovate's supervision
+    dependencyDashboard: true,
+    // See .github/CODEOWNERS
+    assigneesFromCodeOwners: true,
+    // Do not separate patch and minor upgrades into separate PRs for the same dependency
+    separateMinorPatch: false,
+    // Use nicer semantic commits style for messages
+    semanticCommits: "enabled",
+
+    // Don't jump the gun in case something goes awry in upstream releases
+    minimumReleaseAge: "3 days",
+    // Only have this number of PRs open at any time. We will further limit this by using grouping for packages
+    prConcurrentLimit: 5,
+    // By default, create PRs only on Sundays to avoid noise during the week (sufficient for scheduled maintenance)
+    schedule: ["* * * * 0"],
+
+    // Only include certain paths we actually want Renovate to take care of.
+    includePaths: [
+        "modules/container-*/**",
+    ],
+
+    packageRules: [
+        {
+            description: "Disable Maven Manager",
+            matchManagers: "maven",
+            enabled: false
+        },
+        {
+            description: "Disable Dockerfile Manager",
+            matchManagers: "dockerfile",
+            enabled: false
+        },
+        {
+            description: "Group package updates for the Config Baker Container Image",
+            matchFileNames: ["modules/container-configbaker/**/*[dD]ockerfile"],
+            groupName: "Config Baker Container Packages"
+        },
+    ],
+
+    customManagers: [
+        {
+            customType: "regex",
+            description: "Update _VERSION variables in Dockerfiles",
+            managerFilePatterns: [
+                "/(^|/|\\.)Dockerfile$/",
+                "/(^|/)Dockerfile\\.[^/]*$/"
+            ],
+            matchStrings: [
+                "# renovate: datasource=(?<datasource>[a-zA-Z0-9-._]+?) depName=(?<depName>[^\\s]+?)(?: (lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?(?: registryUrl=(?<registryUrl>[^\\s]+?))?\\s(?:ENV|ARG)\\s+[A-Za-z0-9_]+?_VERSION[ =][\"']?(?<currentValue>.+?)[\"']?\\s"
+            ],
+            versioningTemplate: '{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}'
+        }
+    ]
+}
\ No newline at end of file
diff --git a/scripts/api/data/bannerMessageError.json b/scripts/api/data/bannerMessageError.json
new file mode 100644
index 00000000000..9c9abfe3c27
--- /dev/null
+++ b/scripts/api/data/bannerMessageError.json
@@ -0,0 +1,9 @@
+{
+  "dismissible": "false",
+  "messageTexts": [
+  {
+    "lang": "en",
+    "text": "Invalid json"
+  }
+  ]
+}
diff --git a/scripts/api/data/bannerMessageSample.json b/scripts/api/data/bannerMessageSample.json
new file mode 100644
index 00000000000..7b2c7cc39e2
--- /dev/null
+++ b/scripts/api/data/bannerMessageSample.json
@@ -0,0 +1,13 @@
+{
+  "dismissibleByUser": "false",
+  "messageTexts": [
+  {
+    "lang": "en",
+    "message": "Banner Message added via API"
+  },
+  {
+    "lang": "fr",
+    "message": "Message de bannière ajoutÊ via l'API"
+  }
+  ]
+}
diff --git a/scripts/api/data/bannerMessageTest.json b/scripts/api/data/bannerMessageTest.json
new file mode 100644
index 00000000000..e089aead5f3
--- /dev/null
+++ b/scripts/api/data/bannerMessageTest.json
@@ -0,0 +1,13 @@
+{
+  "dismissibleByUser": "false",
+  "messageTexts": [
+  {
+    "lang": "en",
+    "message": "Banner Message For Deletion"
+  },
+  {
+    "lang": "fr",
+    "message": "Banner Message For Deletion"
+  }
+  ]
+}
\ No newline at end of file
diff --git a/scripts/api/data/dataset-create-new-additional-default-fields.json b/scripts/api/data/dataset-create-new-additional-default-fields.json
new file mode 100644
index 00000000000..30d6bde4355
--- /dev/null
+++ b/scripts/api/data/dataset-create-new-additional-default-fields.json
@@ -0,0 +1,1533 @@
+{
+  "datasetVersion": {
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
+    "metadataBlocks": {
+      "citation": {
+        "displayName": "Citation Metadata",
+        "fields": [
+          {
+            "typeName": "title",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Replication Data for: Title"
+          },
+          {
+            "typeName": "subtitle",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Subtitle"
+          },
+          {
+            "typeName": "alternativeTitle",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": ["Alternative Title"]
+          },
+          {
+            "typeName": "alternativeURL",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "http://AlternativeURL.org"
+          },
+          {
+            "typeName": "otherId",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "otherIdAgency": {
+                  "typeName": "otherIdAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDAgency1"
+                },
+                "otherIdValue": {
+                  "typeName": "otherIdValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDIdentifier1"
+                }
+              },
+              {
+                "otherIdAgency": {
+                  "typeName": "otherIdAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDAgency2"
+                },
+                "otherIdValue": {
+                  "typeName": "otherIdValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDIdentifier2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "author",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "authorName": {
+                  "typeName": "authorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastAuthor1, FirstAuthor1"
+                },
+                "authorAffiliation": {
+                  "typeName": "authorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "AuthorAffiliation1"
+                },
+                "authorIdentifierScheme": {
+                  "typeName": "authorIdentifierScheme",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "ORCID"
+                },
+                "authorIdentifier": {
+                  "typeName": "authorIdentifier",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "AuthorIdentifier1"
+                }
+              },
+              {
+                "authorName": {
+                  "typeName": "authorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastAuthor2, FirstAuthor2"
+                },
+                "authorAffiliation": {
+                  "typeName": "authorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "AuthorAffiliation2"
+                },
+                "authorIdentifierScheme": {
+                  "typeName": "authorIdentifierScheme",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "ISNI"
+                },
+                "authorIdentifier": {
+                  "typeName": "authorIdentifier",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "AuthorIdentifier2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "datasetContact",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "datasetContactName": {
+                  "typeName": "datasetContactName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContact1, FirstContact1"
+                },
+                "datasetContactAffiliation": {
+                  "typeName": "datasetContactAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactAffiliation1"
+                },
+                "datasetContactEmail": {
+                  "typeName": "datasetContactEmail",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactEmail1@mailinator.com"
+                }
+              },
+              {
+                "datasetContactName": {
+                  "typeName": "datasetContactName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContact2, FirstContact2"
+                },
+                "datasetContactAffiliation": {
+                  "typeName": "datasetContactAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactAffiliation2"
+                },
+                "datasetContactEmail": {
+                  "typeName": "datasetContactEmail",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactEmail2@mailinator.com"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "dsDescription",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "dsDescriptionValue": {
+                  "typeName": "dsDescriptionValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DescriptionText1"
+                },
+                "dsDescriptionDate": {
+                  "typeName": "dsDescriptionDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1000-01-01"
+                }
+              },
+              {
+                "dsDescriptionValue": {
+                  "typeName": "dsDescriptionValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DescriptionText2"
+                },
+                "dsDescriptionDate": {
+                  "typeName": "dsDescriptionDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1000-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "subject",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Agricultural Sciences",
+              "Business and Management",
+              "Engineering",
+              "Law"
+            ]
+          },
+          {
+            "typeName": "keyword",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordTerm1"
+                },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordVocabulary1"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://KeywordVocabularyURL1.org"
+                }
+              },
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordTerm2"
+                },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI2.org"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordVocabulary2"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://KeywordVocabularyURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "topicClassification",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "topicClassValue": {
+                  "typeName": "topicClassValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Topic Classification Term1"
+                },
+                "topicClassVocab": {
+                  "typeName": "topicClassVocab",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Topic Classification Vocab1"
+                },
+                "topicClassVocabURI": {
+                  "typeName": "topicClassVocabURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "https://TopicClassificationURL1.com"
+                }
+              },
+              {
+                "topicClassValue": {
+                  "typeName": "topicClassValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Topic Classification Term2"
+                },
+                "topicClassVocab": {
+                  "typeName": "topicClassVocab",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Topic Classification Vocab2"
+                },
+                "topicClassVocabURI": {
+                  "typeName": "topicClassVocabURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "https://TopicClassificationURL2.com"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "publication",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "publicationRelationType" : {
+                  "typeName" : "publicationRelationType",
+                  "multiple" : false,
+                  "typeClass" : "controlledVocabulary",
+                  "value" : "IsSupplementTo"
+                },
+                "publicationCitation": {
+                  "typeName": "publicationCitation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationCitation1"
+                },
+                "publicationIDType": {
+                  "typeName": "publicationIDType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "ark"
+                },
+                "publicationIDNumber": {
+                  "typeName": "publicationIDNumber",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationIDNumber1"
+                },
+                "publicationURL": {
+                  "typeName": "publicationURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://RelatedPublicationURL1.org"
+                }
+              },
+              {
+                "publicationCitation": {
+                  "typeName": "publicationCitation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationCitation2"
+                },
+                "publicationIDType": {
+                  "typeName": "publicationIDType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "arXiv"
+                },
+                "publicationIDNumber": {
+                  "typeName": "publicationIDNumber",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationIDNumber2"
+                },
+                "publicationURL": {
+                  "typeName": "publicationURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://RelatedPublicationURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "notesText",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Notes1"
+          },
+          {
+            "typeName": "language",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Abkhaz",
+              "Afar"
+            ]
+          },
+          {
+            "typeName": "producer",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "producerName": {
+                  "typeName": "producerName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastProducer1, FirstProducer1"
+                },
+                "producerAffiliation": {
+                  "typeName": "producerAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAffiliation1"
+                },
+                "producerAbbreviation": {
+                  "typeName": "producerAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAbbreviation1"
+                },
+                "producerURL": {
+                  "typeName": "producerURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerURL1.org"
+                },
+                "producerLogoURL": {
+                  "typeName": "producerLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerLogoURL1.org"
+                }
+              },
+              {
+                "producerName": {
+                  "typeName": "producerName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastProducer2, FirstProducer2"
+                },
+                "producerAffiliation": {
+                  "typeName": "producerAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAffiliation2"
+                },
+                "producerAbbreviation": {
+                  "typeName": "producerAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAbbreviation2"
+                },
+                "producerURL": {
+                  "typeName": "producerURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerURL2.org"
+                },
+                "producerLogoURL": {
+                  "typeName": "producerLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerLogoURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "productionDate",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "1003-01-01"
+          },
+          {
+            "typeName": "productionPlace",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": ["ProductionPlace","Second ProductionPlace"]
+          },
+          {
+            "typeName": "contributor",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Data Collector"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContributor1, FirstContributor1"
+                }
+              },
+              {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Data Curator"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContributor2, FirstContributor2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "grantNumber",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "grantNumberAgency": {
+                  "typeName": "grantNumberAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantAgency1"
+                },
+                "grantNumberValue": {
+                  "typeName": "grantNumberValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantNumber1"
+                }
+              },
+              {
+                "grantNumberAgency": {
+                  "typeName": "grantNumberAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantAgency2"
+                },
+                "grantNumberValue": {
+                  "typeName": "grantNumberValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantNumber2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "distributor",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "distributorName": {
+                  "typeName": "distributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastDistributor1, FirstDistributor1"
+                },
+                "distributorAffiliation": {
+                  "typeName": "distributorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAffiliation1"
+                },
+                "distributorAbbreviation": {
+                  "typeName": "distributorAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAbbreviation1"
+                },
+                "distributorURL": {
+                  "typeName": "distributorURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorURL1.org"
+                },
+                "distributorLogoURL": {
+                  "typeName": "distributorLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorLogoURL1.org"
+                }
+              },
+              {
+                "distributorName": {
+                  "typeName": "distributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastDistributor2, FirstDistributor2"
+                },
+                "distributorAffiliation": {
+                  "typeName": "distributorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAffiliation2"
+                },
+                "distributorAbbreviation": {
+                  "typeName": "distributorAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAbbreviation2"
+                },
+                "distributorURL": {
+                  "typeName": "distributorURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorURL2.org"
+                },
+                "distributorLogoURL": {
+                  "typeName": "distributorLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorLogoURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "distributionDate",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "1004-01-01"
+          },
+          {
+            "typeName": "depositor",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "LastDepositor, FirstDepositor"
+          },
+          {
+            "typeName": "dateOfDeposit",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "1002-01-01"
+          },
+          {
+            "typeName": "timePeriodCovered",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "timePeriodCoveredStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-01-01"
+                },
+                "timePeriodCoveredEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-01-02"
+                }
+              },
+              {
+                "timePeriodCoveredStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-02-01"
+                },
+                "timePeriodCoveredEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "dateOfCollection",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "dateOfCollectionStart": {
+                  "typeName": "dateOfCollectionStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-01-01"
+                },
+                "dateOfCollectionEnd": {
+                  "typeName": "dateOfCollectionEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-01-01"
+                }
+              },
+              {
+                "dateOfCollectionStart": {
+                  "typeName": "dateOfCollectionStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-02-01"
+                },
+                "dateOfCollectionEnd": {
+                  "typeName": "dateOfCollectionEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "kindOfData",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "KindOfData1",
+              "KindOfData2"
+            ]
+          },
+          {
+            "typeName": "series",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [{
+              "seriesName": {
+                "typeName": "seriesName",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "SeriesName"
+              },
+              "seriesInformation": {
+                "typeName": "seriesInformation",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "SeriesInformation"
+              }
+            }]
+          },
+          {
+            "typeName": "software",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "softwareName": {
+                  "typeName": "softwareName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareName1"
+                },
+                "softwareVersion": {
+                  "typeName": "softwareVersion",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareVersion1"
+                }
+              },
+              {
+                "softwareName": {
+                  "typeName": "softwareName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareName2"
+                },
+                "softwareVersion": {
+                  "typeName": "softwareVersion",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareVersion2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "relatedMaterial",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "RelatedMaterial1",
+              "RelatedMaterial2"
+            ]
+          },
+          {
+            "typeName": "relatedDatasets",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "RelatedDatasets1",
+              "RelatedDatasets2"
+            ]
+          },
+          {
+            "typeName": "otherReferences",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "OtherReferences1",
+              "OtherReferences2"
+            ]
+          },
+          {
+            "typeName": "dataSources",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "DataSources1",
+              "DataSources2"
+            ]
+          },
+          {
+            "typeName": "originOfSources",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "OriginOfSources"
+          },
+          {
+            "typeName": "characteristicOfSources",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CharacteristicOfSourcesNoted"
+          },
+          {
+            "typeName": "accessToSources",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "DocumentationAndAccessToSources"
+          }
+        ]
+      },
+      "geospatial": {
+        "displayName": "Geospatial Metadata",
+        "fields": [
+          {
+            "typeName": "geographicCoverage",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Afghanistan"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageStateProvince1"
+                },
+                "city": {
+                  "typeName": "city",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageCity1"
+                },
+                "otherGeographicCoverage": {
+                  "typeName": "otherGeographicCoverage",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageOther1"
+                }
+              },
+              {
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Albania"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageStateProvince2"
+                },
+                "city": {
+                  "typeName": "city",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageCity2"
+                },
+                "otherGeographicCoverage": {
+                  "typeName": "otherGeographicCoverage",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageOther2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "geographicUnit",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "GeographicUnit1",
+              "GeographicUnit2"
+            ]
+          },
+          {
+            "typeName": "geographicBoundingBox",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "westLongitude": {
+                  "typeName": "westLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "-72"
+                },
+                "eastLongitude": {
+                  "typeName": "eastLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "-70"
+                },
+                "northLatitude": {
+                  "typeName": "northLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "43"
+                },
+                "southLatitude": {
+                  "typeName": "southLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "42"
+                }
+              },
+              {
+                "westLongitude": {
+                  "typeName": "westLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "-18"
+                },
+                "eastLongitude": {
+                  "typeName": "eastLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "-13"
+                },
+                "northLatitude": {
+                  "typeName": "northLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "29"
+                },
+                "southLatitude": {
+                  "typeName": "southLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "28"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "socialscience": {
+        "displayName": "Social Science and Humanities Metadata",
+        "fields": [
+          {
+            "typeName": "unitOfAnalysis",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "UnitOfAnalysis1",
+              "UnitOfAnalysis2"
+            ]
+          },
+          {
+            "typeName": "universe",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Universe1",
+              "Universe2"
+            ]
+          },
+          {
+            "typeName": "timeMethod",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "TimeMethod"
+          },
+          {
+            "typeName": "dataCollector",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "LastDataCollector1, FirstDataCollector1"
+          },
+          {
+            "typeName": "collectorTraining",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CollectorTraining"
+          },
+          {
+            "typeName": "frequencyOfDataCollection",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Frequency"
+          },
+          {
+            "typeName": "samplingProcedure",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "SamplingProcedure"
+          },
+          {
+            "typeName": "targetSampleSize",
+            "multiple": false,
+            "typeClass": "compound",
+            "value": {
+              "targetSampleActualSize": {
+                "typeName": "targetSampleActualSize",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "100"
+              },
+              "targetSampleSizeFormula": {
+                "typeName": "targetSampleSizeFormula",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "TargetSampleSizeFormula"
+              }
+            }
+          },
+          {
+            "typeName": "deviationsFromSampleDesign",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "MajorDeviationsForSampleDesign"
+          },
+          {
+            "typeName": "collectionMode",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": ["CollectionMode"]
+          },
+          {
+            "typeName": "researchInstrument",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "TypeOfResearchInstrument"
+          },
+          {
+            "typeName": "dataCollectionSituation",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CharacteristicsOfDataCollectionSituation"
+          },
+          {
+            "typeName": "actionsToMinimizeLoss",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "ActionsToMinimizeLosses"
+          },
+          {
+            "typeName": "controlOperations",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "ControlOperations"
+          },
+          {
+            "typeName": "weighting",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Weighting"
+          },
+          {
+            "typeName": "cleaningOperations",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CleaningOperations"
+          },
+          {
+            "typeName": "datasetLevelErrorNotes",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "StudyLevelErrorNotes"
+          },
+          {
+            "typeName": "responseRate",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "ResponseRate"
+          },
+          {
+            "typeName": "samplingErrorEstimates",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "EstimatesOfSamplingError"
+          },
+          {
+            "typeName": "otherDataAppraisal",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "OtherFormsOfDataAppraisal"
+          },
+          {
+            "typeName": "socialScienceNotes",
+            "multiple": false,
+            "typeClass": "compound",
+            "value": {
+              "socialScienceNotesType": {
+                "typeName": "socialScienceNotesType",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "NotesType"
+              },
+              "socialScienceNotesSubject": {
+                "typeName": "socialScienceNotesSubject",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "NotesSubject"
+              },
+              "socialScienceNotesText": {
+                "typeName": "socialScienceNotesText",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "NotesText"
+              }
+            }
+          }
+        ]
+      },
+      "astrophysics": {
+        "displayName": "Astronomy and Astrophysics Metadata",
+        "fields": [
+          {
+            "typeName": "astroType",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Image",
+              "Mosaic",
+              "EventList",
+              "Cube"
+            ]
+          },
+          {
+            "typeName": "astroFacility",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Facility1",
+              "Facility2"
+            ]
+          },
+          {
+            "typeName": "astroInstrument",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Instrument1",
+              "Instrument2"
+            ]
+          },
+          {
+            "typeName": "astroObject",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Object1",
+              "Object2"
+            ]
+          },
+          {
+            "typeName": "resolution.Spatial",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "SpatialResolution"
+          },
+          {
+            "typeName": "resolution.Spectral",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "SpectralResolution"
+          },
+          {
+            "typeName": "resolution.Temporal",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "TimeResolution"
+          },
+          {
+            "typeName": "coverage.Spectral.Bandpass",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Bandpass1",
+              "Bandpass2"
+            ]
+          },
+          {
+            "typeName": "coverage.Spectral.CentralWavelength",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "3001",
+              "3002"
+            ]
+          },
+          {
+            "typeName": "coverage.Spectral.Wavelength",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "coverage.Spectral.MinimumWavelength": {
+                  "typeName": "coverage.Spectral.MinimumWavelength",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "4001"
+                },
+                "coverage.Spectral.MaximumWavelength": {
+                  "typeName": "coverage.Spectral.MaximumWavelength",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "4002"
+                }
+              },
+              {
+                "coverage.Spectral.MinimumWavelength": {
+                  "typeName": "coverage.Spectral.MinimumWavelength",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "4003"
+                },
+                "coverage.Spectral.MaximumWavelength": {
+                  "typeName": "coverage.Spectral.MaximumWavelength",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "4004"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "coverage.Temporal",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "coverage.Temporal.StartTime": {
+                  "typeName": "coverage.Temporal.StartTime",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1007-01-01"
+                },
+                "coverage.Temporal.StopTime": {
+                  "typeName": "coverage.Temporal.StopTime",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1007-01-02"
+                }
+              },
+              {
+                "coverage.Temporal.StartTime": {
+                  "typeName": "coverage.Temporal.StartTime",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1007-02-01"
+                },
+                "coverage.Temporal.StopTime": {
+                  "typeName": "coverage.Temporal.StopTime",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1007-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "coverage.Spatial",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "SkyCoverage1",
+              "SkyCoverage2"
+            ]
+          },
+          {
+            "typeName": "coverage.Depth",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "200"
+          },
+          {
+            "typeName": "coverage.ObjectDensity",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "300"
+          },
+          {
+            "typeName": "coverage.ObjectCount",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "400"
+          },
+          {
+            "typeName": "coverage.SkyFraction",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "500"
+          },
+          {
+            "typeName": "coverage.Polarization",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Polarization"
+          },
+          {
+            "typeName": "redshiftType",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "RedshiftType"
+          },
+          {
+            "typeName": "resolution.Redshift",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "600"
+          },
+          {
+            "typeName": "coverage.RedshiftValue",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "coverage.Redshift.MinimumValue": {
+                  "typeName": "coverage.Redshift.MinimumValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "701"
+                },
+                "coverage.Redshift.MaximumValue": {
+                  "typeName": "coverage.Redshift.MaximumValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "702"
+                }
+              },
+              {
+                "coverage.Redshift.MinimumValue": {
+                  "typeName": "coverage.Redshift.MinimumValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "703"
+                },
+                "coverage.Redshift.MaximumValue": {
+                  "typeName": "coverage.Redshift.MaximumValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "704"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "biomedical": {
+        "displayName": "Life Sciences Metadata",
+        "fields": [
+          {
+            "typeName": "studyDesignType",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Case Control",
+              "Cross Sectional",
+              "Cohort Study",
+              "Not Specified"
+            ]
+          },
+          {
+            "typeName": "studyFactorType",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Age",
+              "Biomarkers",
+              "Cell Surface Markers",
+              "Developmental Stage"
+            ]
+          },
+          {
+            "typeName": "studyAssayOrganism",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Arabidopsis thaliana",
+              "Bos taurus",
+              "Caenorhabditis elegans",
+              "Danio rerio (zebrafish)"
+            ]
+          },
+          {
+            "typeName": "studyAssayOtherOrganism",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "OtherOrganism1",
+              "OtherOrganism2"
+            ]
+          },
+          {
+            "typeName": "studyAssayMeasurementType",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "genome sequencing",
+              "cell sorting",
+              "clinical chemistry analysis",
+              "DNA methylation profiling"
+            ]
+          },
+          {
+            "typeName": "studyAssayOtherMeasurmentType",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "OtherMeasurementType1",
+              "OtherMeasurementType2"
+            ]
+          },
+          {
+            "typeName": "studyAssayTechnologyType",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "culture based drug susceptibility testing, single concentration",
+              "culture based drug susceptibility testing, two concentrations",
+              "culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)",
+              "flow cytometry"
+            ]
+          },
+          {
+            "typeName": "studyAssayPlatform",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "210-MS GC Ion Trap (Varian)",
+              "220-MS GC Ion Trap (Varian)",
+              "225-MS GC Ion Trap (Varian)",
+              "300-MS quadrupole GC/MS (Varian)"
+            ]
+          },
+          {
+            "typeName": "studyAssayCellType",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "CellType1",
+              "CellType2"
+            ]
+          }
+        ]
+      },
+      "journal": {
+        "displayName": "Journal Metadata",
+        "fields": [
+          {
+            "typeName": "journalVolumeIssue",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "journalVolume": {
+                  "typeName": "journalVolume",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "JournalVolume1"
+                },
+                "journalIssue": {
+                  "typeName": "journalIssue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "JournalIssue1"
+                },
+                "journalPubDate": {
+                  "typeName": "journalPubDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1008-01-01"
+                }
+              },
+              {
+                "journalVolume": {
+                  "typeName": "journalVolume",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "JournalVolume2"
+                },
+                "journalIssue": {
+                  "typeName": "journalIssue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "JournalIssue2"
+                },
+                "journalPubDate": {
+                  "typeName": "journalPubDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1008-02-01"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "journalArticleType",
+            "multiple": false,
+            "typeClass": "controlledVocabulary",
+            "value": "abstract"
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/scripts/api/data/dataset-create-new-all-default-fields.json b/scripts/api/data/dataset-create-new-all-default-fields.json
index ba801b9bae8..151c4732ad7 100644
--- a/scripts/api/data/dataset-create-new-all-default-fields.json
+++ b/scripts/api/data/dataset-create-new-all-default-fields.json
@@ -1,7 +1,9 @@
 {
   "datasetVersion": {
-    "license": "CC0",
-    "termsOfUse": "CC0 Waiver",
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
     "metadataBlocks": {
       "citation": {
         "displayName": "Citation Metadata",
@@ -20,9 +22,9 @@
           },
           {
             "typeName": "alternativeTitle",
-            "multiple": false,
+            "multiple": true,
             "typeClass": "primitive",
-            "value": "Alternative Title"
+            "value": ["Alternative Title"]
           },
           {
             "typeName": "alternativeURL",
@@ -181,7 +183,7 @@
                   "typeName": "dsDescriptionValue",
                   "multiple": false,
                   "typeClass": "primitive",
-                  "value": "DescriptionText 1"
+                  "value": "DescriptionText1"
                 },
                 "dsDescriptionDate": {
                   "typeName": "dsDescriptionDate",
@@ -229,6 +231,12 @@
                   "typeClass": "primitive",
                   "value": "KeywordTerm1"
                 },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
                 "keywordVocabulary": {
                   "typeName": "keywordVocabulary",
                   "multiple": false,
@@ -249,6 +257,12 @@
                   "typeClass": "primitive",
                   "value": "KeywordTerm2"
                 },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI2.org"
+                },
                 "keywordVocabulary": {
                   "typeName": "keywordVocabulary",
                   "multiple": false,
@@ -264,12 +278,65 @@
               }
             ]
           },
+          {
+            "typeName": "topicClassification",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "topicClassValue": {
+                  "typeName": "topicClassValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Topic Classification Term1"
+                },
+                "topicClassVocab": {
+                  "typeName": "topicClassVocab",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Topic Classification Vocab1"
+                },
+                "topicClassVocabURI": {
+                  "typeName": "topicClassVocabURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "https://TopicClassificationURL1.com"
+                }
+              },
+              {
+                "topicClassValue": {
+                  "typeName": "topicClassValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Topic Classification Term2"
+                },
+                "topicClassVocab": {
+                  "typeName": "topicClassVocab",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Topic Classification Vocab2"
+                },
+                "topicClassVocabURI": {
+                  "typeName": "topicClassVocabURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "https://TopicClassificationURL2.com"
+                }
+              }
+            ]
+          },
           {
             "typeName": "publication",
             "multiple": true,
             "typeClass": "compound",
             "value": [
               {
+                "publicationRelationType" : {
+                  "typeName" : "publicationRelationType",
+                  "multiple" : false,
+                  "typeClass" : "controlledVocabulary",
+                  "value" : "IsSupplementTo"
+                },
                 "publicationCitation": {
                   "typeName": "publicationCitation",
                   "multiple": false,
@@ -329,6 +396,15 @@
             "typeClass": "primitive",
             "value": "Notes1"
           },
+          {
+            "typeName": "language",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Abkhaz",
+              "Afar"
+            ]
+          },
           {
             "typeName": "producer",
             "multiple": true,
@@ -408,9 +484,9 @@
           },
           {
             "typeName": "productionPlace",
-            "multiple": false,
+            "multiple": true,
             "typeClass": "primitive",
-            "value": "ProductionPlace"
+            "value": ["ProductionPlace"]
           },
           {
             "typeName": "contributor",
@@ -652,9 +728,9 @@
           },
           {
             "typeName": "series",
-            "multiple": false,
+            "multiple": true,
             "typeClass": "compound",
-            "value": {
+            "value": [{
               "seriesName": {
                 "typeName": "seriesName",
                 "multiple": false,
@@ -667,7 +743,7 @@
                 "typeClass": "primitive",
                 "value": "SeriesInformation"
               }
-            }
+            }]
           },
           {
             "typeName": "software",
@@ -841,25 +917,25 @@
                   "typeName": "westLongitude",
                   "multiple": false,
                   "typeClass": "primitive",
-                  "value": "10"
+                  "value": "-72"
                 },
                 "eastLongitude": {
                   "typeName": "eastLongitude",
                   "multiple": false,
                   "typeClass": "primitive",
-                  "value": "20"
+                  "value": "-70"
                 },
-                "northLongitude": {
-                  "typeName": "northLongitude",
+                "northLatitude": {
+                  "typeName": "northLatitude",
                   "multiple": false,
                   "typeClass": "primitive",
-                  "value": "30"
+                  "value": "43"
                 },
-                "southLongitude": {
-                  "typeName": "southLongitude",
+                "southLatitude": {
+                  "typeName": "southLatitude",
                   "multiple": false,
                   "typeClass": "primitive",
-                  "value": "40"
+                  "value": "42"
                 }
               },
               {
@@ -867,25 +943,25 @@
                   "typeName": "westLongitude",
                   "multiple": false,
                   "typeClass": "primitive",
-                  "value": "50"
+                  "value": "-18"
                 },
                 "eastLongitude": {
                   "typeName": "eastLongitude",
                   "multiple": false,
                   "typeClass": "primitive",
-                  "value": "60"
+                  "value": "-13"
                 },
-                "northLongitude": {
-                  "typeName": "northLongitude",
+                "northLatitude": {
+                  "typeName": "northLatitude",
                   "multiple": false,
                   "typeClass": "primitive",
-                  "value": "70"
+                  "value": "29"
                 },
-                "southLongitude": {
-                  "typeName": "southLongitude",
+                "southLatitude": {
+                  "typeName": "southLatitude",
                   "multiple": false,
                   "typeClass": "primitive",
-                  "value": "80"
+                  "value": "28"
                 }
               }
             ]
@@ -970,9 +1046,9 @@
           },
           {
             "typeName": "collectionMode",
-            "multiple": false,
+            "multiple": true,
             "typeClass": "primitive",
-            "value": "CollectionMode"
+            "value": ["CollectionMode"]
           },
           {
             "typeName": "researchInstrument",
@@ -1346,7 +1422,7 @@
             "multiple": true,
             "typeClass": "controlledVocabulary",
             "value": [
-              "cell counting",
+              "genome sequencing",
               "cell sorting",
               "clinical chemistry analysis",
               "DNA methylation profiling"
diff --git a/scripts/api/data/dataset-create-new-with-type.json b/scripts/api/data/dataset-create-new-with-type.json
new file mode 100644
index 00000000000..5369151eea4
--- /dev/null
+++ b/scripts/api/data/dataset-create-new-with-type.json
@@ -0,0 +1,82 @@
+{
+  "datasetType": "testDatasetType",
+  "datasetVersion": {
+    "license": {
+      "name": "CC BY 4.0",
+      "uri": "https://creativecommons.org/licenses/by/4.0/"
+    },
+    "metadataBlocks": {
+      "citation": {
+        "fields": [
+          {
+            "value": "pyDataverse",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "title"
+          },
+          {
+            "value": [
+              {
+                "authorName": {
+                  "value": "Range, Dan",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorName"
+                },
+                "authorAffiliation": {
+                  "value": "University of Stuttgart",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorAffiliation"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "author"
+          },
+          {
+            "value": [ 
+                { "datasetContactEmail" : {
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "datasetContactEmail",
+                    "value" : "jan@mailinator.com"
+                },
+                "datasetContactName" : {
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "datasetContactName",
+                    "value": "Range, Jan"
+                }
+            }],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "datasetContact"
+          },
+          {
+            "value": [ {
+               "dsDescriptionValue":{
+                "value": "A Python module for Dataverse.",
+                "multiple":false,
+               "typeClass": "primitive",
+               "typeName": "dsDescriptionValue"
+            }}],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "dsDescription"
+          },
+          {
+            "value": [
+              "Computer and Information Science"
+            ],
+            "typeClass": "controlledVocabulary",
+            "multiple": true,
+            "typeName": "subject"
+          }
+        ],
+        "displayName": "Citation Metadata"
+      }
+    }
+  }
+}
diff --git a/scripts/api/data/dataset-create-new.json b/scripts/api/data/dataset-create-new.json
index 0017da15974..5831e0b17e6 100644
--- a/scripts/api/data/dataset-create-new.json
+++ b/scripts/api/data/dataset-create-new.json
@@ -4,6 +4,10 @@
   "persistentUrl": "http://dx.doi.org/10.5072/FK2/9",
   "protocol": "chadham-house-rule",
   "datasetVersion": {
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
     "metadataBlocks": {
       "citation": {
         "displayName": "Citation Metadata",
@@ -121,4 +125,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/scripts/api/data/dataset-finch1_fr.json b/scripts/api/data/dataset-finch1_fr.json
new file mode 100644
index 00000000000..848e5e3587e
--- /dev/null
+++ b/scripts/api/data/dataset-finch1_fr.json
@@ -0,0 +1,82 @@
+{
+  "metadataLanguage": "fr",
+  "datasetVersion": {
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
+    "metadataBlocks": {
+      "citation": {
+        "fields": [
+          {
+            "value": "Darwin's Finches",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "title"
+          },
+          {
+            "value": [
+              {
+                "authorName": {
+                  "value": "Finch, Fiona",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorName"
+                },
+                "authorAffiliation": {
+                  "value": "Birds Inc.",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorAffiliation"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "author"
+          },
+          {
+            "value": [ 
+                { "datasetContactEmail" : {
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "datasetContactEmail",
+                    "value" : "finch@mailinator.com"
+                },
+                "datasetContactName" : {
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "datasetContactName",
+                    "value": "Finch, Fiona"
+                }
+            }],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "datasetContact"
+          },
+          {
+            "value": [ {
+               "dsDescriptionValue":{
+                "value":   "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.",
+                "multiple":false,
+               "typeClass": "primitive",
+               "typeName": "dsDescriptionValue"
+            }}],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "dsDescription"
+          },
+          {
+            "value": [
+              "Medicine, Health and Life Sciences"
+            ],
+            "typeClass": "controlledVocabulary",
+            "multiple": true,
+            "typeName": "subject"
+          }
+        ],
+        "displayName": "Citation Metadata"
+      }
+    }
+  }
+}
diff --git a/scripts/api/data/dataset-package-files.json b/scripts/api/data/dataset-package-files.json
index 5d322e23501..ce89f83c307 100644
--- a/scripts/api/data/dataset-package-files.json
+++ b/scripts/api/data/dataset-package-files.json
@@ -1,7 +1,9 @@
 {
   "datasetVersion": {
-    "termsOfUse": "CC0 Waiver",
-    "license": "CC0",
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
     "protocol":"doi",
     "authority":"10.502",
     "identifier":"ZZ7/MOSEISLEYDB94",
diff --git a/scripts/api/data/licenses/licenseApache-2.0.json b/scripts/api/data/licenses/licenseApache-2.0.json
new file mode 100644
index 00000000000..9b9bb0cc025
--- /dev/null
+++ b/scripts/api/data/licenses/licenseApache-2.0.json
@@ -0,0 +1,11 @@
+{
+  "name": "Apache-2.0",
+  "uri": "http://www.apache.org/licenses/LICENSE-2.0",
+  "shortDescription": "Apache License 2.0",
+  "active": true,
+  "sortOrder": 9,
+  "rightsIdentifier": "Apache-2.0",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
\ No newline at end of file
diff --git a/scripts/api/data/licenses/licenseCC-BY-4.0.json b/scripts/api/data/licenses/licenseCC-BY-4.0.json
new file mode 100644
index 00000000000..3c723e80123
--- /dev/null
+++ b/scripts/api/data/licenses/licenseCC-BY-4.0.json
@@ -0,0 +1,12 @@
+{
+  "name": "CC BY 4.0",
+  "uri": "http://creativecommons.org/licenses/by/4.0",
+  "shortDescription": "Creative Commons Attribution 4.0 International License.",
+  "iconUrl": "https://licensebuttons.net/l/by/4.0/88x31.png",
+  "active": true,
+  "sortOrder": 2,
+  "rightsIdentifier": "CC-BY-4.0",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
\ No newline at end of file
diff --git a/scripts/api/data/licenses/licenseCC-BY-NC-4.0.json b/scripts/api/data/licenses/licenseCC-BY-NC-4.0.json
new file mode 100644
index 00000000000..8c0d5f18fe3
--- /dev/null
+++ b/scripts/api/data/licenses/licenseCC-BY-NC-4.0.json
@@ -0,0 +1,12 @@
+{
+  "name": "CC BY-NC 4.0",
+  "uri": "http://creativecommons.org/licenses/by-nc/4.0",
+  "shortDescription": "Creative Commons Attribution-NonCommercial 4.0 International License.",
+  "iconUrl": "https://licensebuttons.net/l/by-nc/4.0/88x31.png",
+  "active": true,
+  "sortOrder": 4,
+  "rightsIdentifier": "CC-BY-NC-4.0",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
diff --git a/scripts/api/data/licenses/licenseCC-BY-NC-ND-4.0.json b/scripts/api/data/licenses/licenseCC-BY-NC-ND-4.0.json
new file mode 100644
index 00000000000..a9963919eae
--- /dev/null
+++ b/scripts/api/data/licenses/licenseCC-BY-NC-ND-4.0.json
@@ -0,0 +1,12 @@
+{
+  "name": "CC BY-NC-ND 4.0",
+  "uri": "http://creativecommons.org/licenses/by-nc-nd/4.0",
+  "shortDescription": "Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.",
+  "iconUrl": "https://licensebuttons.net/l/by-nc-nd/4.0/88x31.png",
+  "active": true,
+  "sortOrder": 7,
+  "rightsIdentifier": "CC-BY-NC-ND-4.0",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
diff --git a/scripts/api/data/licenses/licenseCC-BY-NC-SA-4.0.json b/scripts/api/data/licenses/licenseCC-BY-NC-SA-4.0.json
new file mode 100644
index 00000000000..02cf9812a67
--- /dev/null
+++ b/scripts/api/data/licenses/licenseCC-BY-NC-SA-4.0.json
@@ -0,0 +1,12 @@
+{
+  "name": "CC BY-NC-SA 4.0",
+  "uri": "http://creativecommons.org/licenses/by-nc-sa/4.0",
+  "shortDescription": "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.",
+  "iconUrl": "https://licensebuttons.net/l/by-nc-sa/4.0/88x31.png",
+  "active": true,
+  "sortOrder": 3,
+  "rightsIdentifier": "CC-BY-NC-SA-4.0",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
diff --git a/scripts/api/data/licenses/licenseCC-BY-ND-4.0.json b/scripts/api/data/licenses/licenseCC-BY-ND-4.0.json
new file mode 100644
index 00000000000..260efbe19a5
--- /dev/null
+++ b/scripts/api/data/licenses/licenseCC-BY-ND-4.0.json
@@ -0,0 +1,12 @@
+{
+  "name": "CC BY-ND 4.0",
+  "uri": "http://creativecommons.org/licenses/by-nd/4.0",
+  "shortDescription": "Creative Commons Attribution-NoDerivatives 4.0 International License.",
+  "iconUrl": "https://licensebuttons.net/l/by-nd/4.0/88x31.png",
+  "active": true,
+  "sortOrder": 6,
+  "rightsIdentifier": "CC-BY-ND-4.0",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
diff --git a/scripts/api/data/licenses/licenseCC-BY-SA-4.0.json b/scripts/api/data/licenses/licenseCC-BY-SA-4.0.json
new file mode 100644
index 00000000000..ed7511ded17
--- /dev/null
+++ b/scripts/api/data/licenses/licenseCC-BY-SA-4.0.json
@@ -0,0 +1,12 @@
+{
+  "name": "CC BY-SA 4.0",
+  "uri": "http://creativecommons.org/licenses/by-sa/4.0",
+  "shortDescription": "Creative Commons Attribution-ShareAlike 4.0 International License.",
+  "iconUrl": "https://licensebuttons.net/l/by-sa/4.0/88x31.png",
+  "active": true,
+  "sortOrder": 5,
+  "rightsIdentifier": "CC-BY-SA-4.0",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
diff --git a/scripts/api/data/licenses/licenseCC0-1.0.json b/scripts/api/data/licenses/licenseCC0-1.0.json
new file mode 100644
index 00000000000..7f21b81eea5
--- /dev/null
+++ b/scripts/api/data/licenses/licenseCC0-1.0.json
@@ -0,0 +1,12 @@
+{
+  "name": "CC0 1.0",
+  "uri": "http://creativecommons.org/publicdomain/zero/1.0",
+  "shortDescription": "Creative Commons CC0 1.0 Universal Public Domain Dedication.",
+  "iconUrl": "https://licensebuttons.net/p/zero/1.0/88x31.png",
+  "active": true,
+  "sortOrder": 1,
+  "rightsIdentifier": "CC0-1.0",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
diff --git a/scripts/api/data/licenses/licenseEtalab-2.0.json b/scripts/api/data/licenses/licenseEtalab-2.0.json
new file mode 100644
index 00000000000..42ec90a7540
--- /dev/null
+++ b/scripts/api/data/licenses/licenseEtalab-2.0.json
@@ -0,0 +1,12 @@
+{
+  "name": "etalab 2.0",
+  "uri": "https://spdx.org/licenses/etalab-2.0",
+  "shortDescription": "Etalab Open License 2.0, compatible CC-BY 2.0",
+  "iconUrl": "https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/Logo-licence-ouverte2.svg/25px-Logo-licence-ouverte2.svg.png",
+  "active": true,
+  "sortOrder": 10,
+  "rightsIdentifier": "etalab-2.0",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "fr"
+}
diff --git a/scripts/api/data/licenses/licenseMIT.json b/scripts/api/data/licenses/licenseMIT.json
new file mode 100644
index 00000000000..32d4351ed91
--- /dev/null
+++ b/scripts/api/data/licenses/licenseMIT.json
@@ -0,0 +1,11 @@
+{
+  "name": "MIT",
+  "uri": "https://opensource.org/licenses/MIT",
+  "shortDescription": "MIT License",
+  "active": true,
+  "sortOrder": 8,
+  "rightsIdentifier": "MIT",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
diff --git a/scripts/api/data/metadatablocks/3d_objects.tsv b/scripts/api/data/metadatablocks/3d_objects.tsv
new file mode 100644
index 00000000000..e753e4dfbed
--- /dev/null
+++ b/scripts/api/data/metadatablocks/3d_objects.tsv
@@ -0,0 +1,45 @@
+#metadataBlock	name	dataverseAlias	displayName
+	3dobjects		3D Objects Metadata
+#datasetField	name	title	description	watermark	 fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id	termURI
+	3d3DTechnique	3D Technique	The technique used for capturing the 3D data		text	0	#VALUE	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE		3dobjects
+	3dEquipment	Equipment	The equipment used for capturing the 3D data		text	1	#VALUE	TRUE	FALSE	FALSE	FALSE	FALSE	FALSE		3dobjects
+	3dLightingSetup	Lighting Setup	The lighting used while capturing the 3D data		text	2	#VALUE	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE		3dobjects
+	3dMasterFilePolygonCount	Master File Polygon Count	The high-resolution polygon count		text	3	#VALUE	TRUE	FALSE	FALSE	FALSE	FALSE	FALSE		3dobjects
+	3dExportedFilePolygonCount	Exported File Polygon Count	The exported mesh polygon count		text	4	#VALUE	TRUE	FALSE	TRUE	FALSE	FALSE	FALSE		3dobjects
+	3dExportedFileFormat	Exported File Format	The format of the exported mesh		text	5	#VALUE	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE		3dobjects
+	3dAltText	Alt-Text	A physical description of the object modeled		textbox	6	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		3dobjects
+	3dMaterialComposition	Material Composition	The material used to create the object, e.g. stone		text	7	#VALUE	TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		3dobjects
+	3dObjectDimensions	Object Dimensions	The general measurements of the physical object		none	8	;	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		3dobjects
+	3dLength	Length	The rough length of the object		text	9	Length: #VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	3dObjectDimensions	3dobjects
+	3dWidth	Width	The rough width of the object		text	10	Width: #VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	3dObjectDimensions	3dobjects
+	3dHeight	Height	The rough height of the object		text	11	Height: #VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	3dObjectDimensions	3dobjects
+	3dWeight	Weight	The rough weight of the object		text	12	Weight:#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	3dObjectDimensions	3dobjects
+	3dUnit	Unit	The unit of measurement used for the object dimensions		text	13	Unit: #VALUE	FALSE	TRUE	FALSE	TRUE	FALSE	FALSE	3dObjectDimensions	3dobjects
+	3dHandling	Instructions	Safety and special handling instructions for the object		textbox	14	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		3dobjects
+#controlledVocabulary	DatasetField	Value	identifier	displayOrder												
+	3d3DTechnique	IR Scanner		0												
+	3d3DTechnique	Laser		1												
+	3d3DTechnique	Modelled		2												
+	3d3DTechnique	Photogrammetry		3												
+	3d3DTechnique	RTI		4												
+	3d3DTechnique	Structured Light		5												
+	3d3DTechnique	Tomographic		6												
+	3d3DTechnique	Other		7												
+	3dLightingSetup	Natural Light		8												
+	3dLightingSetup	Lightbox		9												
+	3dLightingSetup	LED		10												
+	3dLightingSetup	Fluorescent		11												
+	3dLightingSetup	Other		12												
+	3dUnit	cm		13												
+	3dUnit	m		14												
+	3dUnit	in		15												
+	3dUnit	ft		16												
+	3dUnit	lbs		17												
+	3dExportedFileFormat	.fbx		18												
+	3dExportedFileFormat	.glb		19												
+	3dExportedFileFormat	.gltf		20												
+	3dExportedFileFormat	.obj		21
+	3dExportedFileFormat	.stl		22												
+	3dExportedFileFormat	.usdz		23												
+	3dExportedFileFormat	.x3d		24												
+	3dExportedFileFormat	other		25												
diff --git a/scripts/api/data/metadatablocks/archival.tsv b/scripts/api/data/metadatablocks/archival.tsv
new file mode 100644
index 00000000000..89ef5466a44
--- /dev/null
+++ b/scripts/api/data/metadatablocks/archival.tsv
@@ -0,0 +1,12 @@
+#metadataBlock	name	dataverseAlias	displayName	blockURI												
+	archival		Archival Metadata													
+#datasetField	name	title	description	watermark	fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id	termURI
+	submitToArchivalAppraisal	Submit to Archival Appraisal	Your assessment whether the dataset should be submitted for archival appraisal		text	0	#VALUE	TRUE	TRUE	FALSE	FALSE	TRUE	FALSE		archival	
+	archivedFrom	Archived from	A date (YYYY-MM-DD) from which the dataset is archived	YYYY-MM-DD	date	1	#VALUE	TRUE	FALSE	FALSE	FALSE	FALSE	FALSE		archival	
+	holdingArchive	Holding Archive	Information on the holding archive where the dataset is archived		none	3		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		archival	
+	holdingArchiveName	Archived at Holding Archive	The name of the holding archive		text	4	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	holdingArchive	archival	https://schema.org/holdingArchive
+	archivedAt	Archived at URL	URL to holding archive	URL	url	5	"<a href=""#VALUE"" target=""_blank"">#VALUE</a>"	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	holdingArchive	archival	https://schema.org/archivedAt
+#controlledVocabulary	DatasetField	Value	identifier	displayOrder												
+	submitToArchivalAppraisal	True		0
+	submitToArchivalAppraisal	False		1
+	submitToArchivalAppraisal	Unknown		2
diff --git a/scripts/api/data/metadatablocks/astrophysics.tsv b/scripts/api/data/metadatablocks/astrophysics.tsv
index d6266d239b2..1de2d0278f2 100644
--- a/scripts/api/data/metadatablocks/astrophysics.tsv
+++ b/scripts/api/data/metadatablocks/astrophysics.tsv
@@ -2,13 +2,13 @@
 	astrophysics		Astronomy and Astrophysics Metadata													
 #datasetField	name	title	description	watermark	 fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id
 	astroType	Type	The nature or genre of the content of the files in the dataset.		text	0		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
-	astroFacility	Facility	The observatory or facility where the data was obtained. 		text	1		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
-	astroInstrument	Instrument	The instrument used to collect the data.		text	2		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
+	astroFacility	Facility	The observatory or facility where the data was obtained. 		text	1		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		astrophysics
+	astroInstrument	Instrument	The instrument used to collect the data.		text	2		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		astrophysics
 	astroObject	Object	Astronomical Objects represented in the data (Given as SIMBAD recognizable names preferred).		text	3		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		astrophysics
 	resolution.Spatial	Spatial Resolution	The spatial (angular) resolution that is typical of the observations, in decimal degrees.		text	4		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		astrophysics
-	resolution.Spectral	Spectral Resolution	The spectral resolution that is typical of the observations, given as the ratio Îģ/ΔÎģ.		text	5		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		astrophysics
+	resolution.Spectral	Spectral Resolution	The spectral resolution that is typical of the observations, given as the ratio \u03bb/\u0394\u03bb.		text	5		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		astrophysics
 	resolution.Temporal	Time Resolution	The temporal resolution that is typical of the observations, given in seconds.		text	6		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	coverage.Spectral.Bandpass	Bandpass	Conventional bandpass name		text	7		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
+	coverage.Spectral.Bandpass	Bandpass	Conventional bandpass name		text	7		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		astrophysics
 	coverage.Spectral.CentralWavelength	Central Wavelength (m)	The central wavelength of the spectral bandpass, in meters.	Enter a floating-point number.	float	8		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		astrophysics
 	coverage.Spectral.Wavelength	Wavelength Range	The minimum and maximum wavelength of the spectral bandpass.	Enter a floating-point number.	none	9		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		astrophysics
 	coverage.Spectral.MinimumWavelength	Minimum (m)	The minimum wavelength of the spectral bandpass, in meters.	Enter a floating-point number.	float	10		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage.Spectral.Wavelength	astrophysics
@@ -24,7 +24,7 @@
 	coverage.Polarization	Polarization	The polarization coverage		text	20		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
 	redshiftType	RedshiftType	RedshiftType string C "Redshift"; or "Optical" or "Radio" definitions of Doppler velocity used in the data object.		text	21		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
 	resolution.Redshift	Redshift Resolution	The resolution in redshift (unitless) or Doppler velocity (km/s) in the data object.	Enter a floating-point number.	float	22		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	coverage.RedshiftValue	Redshift Value	The value of the redshift (unitless) or Doppler velocity (km/s in the data object.	Enter a floating-point number.	float	23		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		astrophysics
+	coverage.RedshiftValue	Redshift Value	The value of the redshift (unitless) or Doppler velocity (km/s in the data object.	Enter a floating-point number.	none	23		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		astrophysics
 	coverage.Redshift.MinimumValue	Minimum	The minimum value of the redshift (unitless) or Doppler velocity (km/s in the data object.	Enter a floating-point number.	float	24		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage.RedshiftValue	astrophysics
 	coverage.Redshift.MaximumValue	Maximum	The maximum value of the redshift (unitless) or Doppler velocity (km/s in the data object.	Enter a floating-point number.	float	25		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage.RedshiftValue	astrophysics
 #controlledVocabulary	DatasetField	Value	identifier	displayOrder											
@@ -51,4 +51,4 @@
 	astroType	Object		20											
 	astroType	Value		21											
 	astroType	ValuePair		22											
-	astroType	Survey		23											
\ No newline at end of file
+	astroType	Survey		23											
diff --git a/scripts/api/data/metadatablocks/biomedical.tsv b/scripts/api/data/metadatablocks/biomedical.tsv
index f45c5849845..06f1ebec1b4 100644
--- a/scripts/api/data/metadatablocks/biomedical.tsv
+++ b/scripts/api/data/metadatablocks/biomedical.tsv
@@ -1,295 +1,300 @@
-#metadataBlock	name	dataverseAlias	displayName												
-	biomedical		Life Sciences Metadata												
-#datasetField	name	title	description	watermark	 fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id
-	studyDesignType	Design Type	Design types that are based on the overall experimental design.		text	0		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyFactorType	Factor Type	Factors used in the Dataset. 		text	1		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyAssayOrganism	Organism	The taxonomic name of the organism used in the Dataset or from which the  starting biological material derives.		text	2		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyAssayOtherOrganism	Other Organism	If Other was selected in Organism, list any other organisms that were used in this Dataset. Terms from the NCBI Taxonomy are recommended.		text	3		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyAssayMeasurementType	Measurement Type	A term to qualify the endpoint, or what is being measured (e.g. gene expression profiling; protein identification). 		text	4		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyAssayOtherMeasurmentType	Other Measurement Type	If Other was selected in Measurement Type, list any other measurement types that were used. Terms from NCBO Bioportal are recommended.		text	5		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyAssayTechnologyType	Technology Type	A term to identify the technology used to perform the measurement (e.g. DNA microarray; mass spectrometry).		text	6		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyAssayPlatform	Technology Platform	The manufacturer and name of the technology platform used in the assay (e.g. Bruker AVANCE).		text	7		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyAssayCellType	Cell Type	The name of the cell line from which the source or sample derives.		text	8		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
-#controlledVocabulary	DatasetField	Value	identifier	displayOrder											
-	studyDesignType	Case Control	EFO_0001427	0											
-	studyDesignType	Cross Sectional	EFO_0001428	1											
-	studyDesignType	Cohort Study	OCRE100078	2											
-	studyDesignType	Nested Case Control Design	NCI_C48202	3											
-	studyDesignType	Not Specified	OTHER_DESIGN	4											
-	studyDesignType	Parallel Group Design	OBI_0500006	5											
-	studyDesignType	Perturbation Design	OBI_0001033	6											
-	studyDesignType	Randomized Controlled Trial	MESH_D016449	7											
-	studyDesignType	Technological Design	TECH_DESIGN	8											
-	studyFactorType	Age	EFO_0000246	0											
-	studyFactorType	Biomarkers	BIOMARKERS	1											
-	studyFactorType	Cell Surface Markers	CELL_SURFACE_M	2											
-	studyFactorType	Cell Type/Cell Line	EFO_0000324;EFO_0000322	3											
-	studyFactorType	Developmental Stage	EFO_0000399	4											
-	studyFactorType	Disease State	OBI_0001293	5											
-	studyFactorType	Drug Susceptibility	IDO_0000469	6											
-	studyFactorType	Extract Molecule	FBcv_0010001	7											
-	studyFactorType	Genetic Characteristics	OBI_0001404	8											
-	studyFactorType	Immunoprecipitation Antibody	OBI_0000690	9											
-	studyFactorType	Organism	OBI_0100026	10											
-	studyFactorType	Other	OTHER_FACTOR	11											
-	studyFactorType	Passages	PASSAGES_FACTOR	12											
-	studyFactorType	Platform	OBI_0000050	13											
-	studyFactorType	Sex	EFO_0000695	14											
-	studyFactorType	Strain	EFO_0005135	15											
-	studyFactorType	Time Point	EFO_0000724	16											
-	studyFactorType	Tissue Type	BTO_0001384	17											
-	studyFactorType	Treatment Compound	EFO_0000369	18											
-	studyFactorType	Treatment Type	EFO_0000727	19											
-	studyAssayMeasurementType	cell counting	ERO_0001899	0											
-	studyAssayMeasurementType	cell sorting	CHMO_0001085	1											
-	studyAssayMeasurementType	clinical chemistry analysis	OBI_0000520	2											
-	studyAssayMeasurementType	copy number variation profiling	OBI_0000537	3											
-	studyAssayMeasurementType	DNA methylation profiling	OBI_0000634	4											
-	studyAssayMeasurementType	DNA methylation profiling (Bisulfite-Seq)	OBI_0000748	5											
-	studyAssayMeasurementType	DNA methylation profiling (MeDIP-Seq)	_OBI_0000634	6											
-	studyAssayMeasurementType	drug susceptibility	_IDO_0000469	7											
-	studyAssayMeasurementType	environmental gene survey	ENV_GENE_SURVEY	8											
-	studyAssayMeasurementType	genome sequencing	ERO_0001183	9											
-	studyAssayMeasurementType	hematology	OBI_0000630	10											
-	studyAssayMeasurementType	histology	OBI_0600020	11											
-	studyAssayMeasurementType	Histone Modification (ChIP-Seq)	OBI_0002017	12											
-	studyAssayMeasurementType	loss of heterozygosity profiling	SO_0001786	13											
-	studyAssayMeasurementType	metabolite profiling	OBI_0000366	14											
-	studyAssayMeasurementType	metagenome sequencing	METAGENOME_SEQ	15											
-	studyAssayMeasurementType	protein expression profiling	OBI_0000615	16											
-	studyAssayMeasurementType	protein identification	ERO_0000346	17											
-	studyAssayMeasurementType	protein-DNA binding site identification	PROTEIN_DNA_BINDING	18											
-	studyAssayMeasurementType	protein-protein interaction detection	OBI_0000288	19											
-	studyAssayMeasurementType	protein-RNA binding (RIP-Seq)	PROTEIN_RNA_BINDING	20											
-	studyAssayMeasurementType	SNP analysis	OBI_0000435	21											
-	studyAssayMeasurementType	targeted sequencing	TARGETED_SEQ	22											
-	studyAssayMeasurementType	transcription factor binding (ChIP-Seq)	OBI_0002018	23											
-	studyAssayMeasurementType	transcription factor binding site identification	OBI_0000291	24											
-	studyAssayMeasurementType	transcription profiling	OBI_0000424	25											
-	studyAssayMeasurementType	transcription profiling	EFO_0001032	26											
-	studyAssayMeasurementType	transcription profiling (Microarray)	TRANSCRIPTION_PROF	27											
-	studyAssayMeasurementType	transcription profiling (RNA-Seq)	OBI_0001271	28											
-	studyAssayMeasurementType	TRAP translational profiling	TRAP_TRANS_PROF	29											
-	studyAssayMeasurementType	Other	OTHER_MEASUREMENT	30											
-	studyAssayOrganism	Arabidopsis thaliana	NCBITaxon_3702	0											
-	studyAssayOrganism	Bos taurus	NCBITaxon_9913	1											
-	studyAssayOrganism	Caenorhabditis elegans	NCBITaxon_6239	2											
-	studyAssayOrganism	Chlamydomonas reinhardtii	NCBITaxon_3055	3											
-	studyAssayOrganism	Danio rerio (zebrafish)	NCBITaxon_7955	4											
-	studyAssayOrganism	Dictyostelium discoideum	NCBITaxon_44689	5											
-	studyAssayOrganism	Drosophila melanogaster	NCBITaxon_7227	6											
-	studyAssayOrganism	Escherichia coli	NCBITaxon_562	7											
-	studyAssayOrganism	Hepatitis C virus	NCBITaxon_11103	8											
-	studyAssayOrganism	Homo sapiens	NCBITaxon_9606	9											
-	studyAssayOrganism	Mus musculus	NCBITaxon_10090	10											
-	studyAssayOrganism	Mycobacterium africanum	NCBITaxon_33894	11											
-	studyAssayOrganism	Mycobacterium canetti	NCBITaxon_78331	12											
-	studyAssayOrganism	Mycobacterium tuberculosis	NCBITaxon_1773	13											
-	studyAssayOrganism	Mycoplasma pneumoniae	NCBITaxon_2104	14											
-	studyAssayOrganism	Oryza sativa	NCBITaxon_4530	15											
-	studyAssayOrganism	Plasmodium falciparum	NCBITaxon_5833	16											
-	studyAssayOrganism	Pneumocystis carinii	NCBITaxon_4754	17											
-	studyAssayOrganism	Rattus norvegicus	NCBITaxon_10116	18											
-	studyAssayOrganism	Saccharomyces cerevisiae (brewer's yeast)	NCBITaxon_4932	19											
-	studyAssayOrganism	Schizosaccharomyces pombe	NCBITaxon_4896	20											
-	studyAssayOrganism	Takifugu rubripes	NCBITaxon_31033	21											
-	studyAssayOrganism	Xenopus laevis	NCBITaxon_8355	22											
-	studyAssayOrganism	Zea mays	NCBITaxon_4577	23											
-	studyAssayOrganism	Other	OTHER_TAXONOMY	24											
-	studyAssayTechnologyType	culture based drug susceptibility testing, single concentration	CULTURE_DRUG_TEST_SINGLE	0											
-	studyAssayTechnologyType	culture based drug susceptibility testing, two concentrations	CULTURE_DRUG_TEST_TWO	1											
-	studyAssayTechnologyType	culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)	CULTURE_DRUG_TEST_THREE	2											
-	studyAssayTechnologyType	DNA microarray	OBI_0400148	3											
-	studyAssayTechnologyType	flow cytometry	OBI_0000916	4											
-	studyAssayTechnologyType	gel electrophoresis	OBI_0600053	5											
-	studyAssayTechnologyType	mass spectrometry	OBI_0000470	6											
-	studyAssayTechnologyType	NMR spectroscopy	OBI_0000623	7											
-	studyAssayTechnologyType	nucleotide sequencing	OBI_0000626	8											
-	studyAssayTechnologyType	protein microarray	OBI_0400149	9											
-	studyAssayTechnologyType	real time PCR	OBI_0000893	10											
-	studyAssayTechnologyType	no technology required	NO_TECHNOLOGY	11											
-	studyAssayTechnologyType	Other	OTHER_TECHNOLOGY	12											
-	studyAssayPlatform	210-MS GC Ion Trap (Varian)	210_MS_GC	0											
-	studyAssayPlatform	220-MS GC Ion Trap (Varian)	220_MS_GC	1											
-	studyAssayPlatform	225-MS GC Ion Trap (Varian)	225_MS_GC	2											
-	studyAssayPlatform	240-MS GC Ion Trap (Varian)	240_MS_GC	3											
-	studyAssayPlatform	300-MS quadrupole GC/MS (Varian)	300_MS_GCMS	4											
-	studyAssayPlatform	320-MS LC/MS (Varian)	320_MS_LCMS	5											
-	studyAssayPlatform	325-MS LC/MS (Varian)	325_MS_LCMS	6											
-	studyAssayPlatform	320-MS GC/MS (Varian)	500_MS_GCMS	7											
-	studyAssayPlatform	500-MS LC/MS (Varian)	500_MS_LCMS	8											
-	studyAssayPlatform	800D (Jeol)	800D	9											
-	studyAssayPlatform	910-MS TQ-FT (Varian)	910_MS_TQFT	10											
-	studyAssayPlatform	920-MS TQ-FT (Varian)	920_MS_TQFT	11											
-	studyAssayPlatform	3100 Mass Detector (Waters)	3100_MASS_D	12											
-	studyAssayPlatform	6110 Quadrupole LC/MS (Agilent)	6110_QUAD_LCMS	13											
-	studyAssayPlatform	6120 Quadrupole LC/MS (Agilent)	6120_QUAD_LCMS	14											
-	studyAssayPlatform	6130 Quadrupole LC/MS (Agilent)	6130_QUAD_LCMS	15											
-	studyAssayPlatform	6140 Quadrupole LC/MS (Agilent)	6140_QUAD_LCMS	16											
-	studyAssayPlatform	6310 Ion Trap LC/MS (Agilent)	6310_ION_LCMS	17											
-	studyAssayPlatform	6320 Ion Trap LC/MS (Agilent)	6320_ION_LCMS	18											
-	studyAssayPlatform	6330 Ion Trap LC/MS (Agilent)	6330_ION_LCMS	19											
-	studyAssayPlatform	6340 Ion Trap LC/MS (Agilent)	6340_ION_LCMS	20											
-	studyAssayPlatform	6410 Triple Quadrupole LC/MS (Agilent)	6410_TRIPLE_LCMS	21											
-	studyAssayPlatform	6430 Triple Quadrupole LC/MS (Agilent)	6430_TRIPLE_LCMS	22											
-	studyAssayPlatform	6460 Triple Quadrupole LC/MS (Agilent)	6460_TRIPLE_LCMS	23											
-	studyAssayPlatform	6490 Triple Quadrupole LC/MS (Agilent)	6490_TRIPLE_LCMS	24											
-	studyAssayPlatform	6530 Q-TOF LC/MS (Agilent)	6530_Q_TOF_LCMS	25											
-	studyAssayPlatform	6540 Q-TOF LC/MS (Agilent)	6540_Q_TOF_LCMS	26											
-	studyAssayPlatform	6210 TOF LC/MS (Agilent)	6210_Q_TOF_LCMS	27											
-	studyAssayPlatform	6220 TOF LC/MS (Agilent)	6220_Q_TOF_LCMS	28											
-	studyAssayPlatform	6230 TOF LC/MS (Agilent)	6230_Q_TOF_LCMS	29											
-	studyAssayPlatform	7000B Triple Quadrupole GC/MS (Agilent)	700B_TRIPLE_GCMS	30											
-	studyAssayPlatform	AccuTO DART (Jeol)	ACCUTO_DART	31											
-	studyAssayPlatform	AccuTOF GC (Jeol)	ACCUTOF_GC	32											
-	studyAssayPlatform	AccuTOF LC (Jeol)	ACCUTOF_LC	33											
-	studyAssayPlatform	ACQUITY SQD (Waters)	ACQUITY_SQD	34											
-	studyAssayPlatform	ACQUITY TQD (Waters)	ACQUITY_TQD	35											
-	studyAssayPlatform	Agilent	AGILENT	36											
-	studyAssayPlatform	Agilent 5975E GC/MSD (Agilent)	AGILENT_ 5975E_GCMSD	37											
-	studyAssayPlatform	Agilent 5975T LTM GC/MSD (Agilent)	AGILENT_5975T_LTM_GCMSD	38											
-	studyAssayPlatform	5975C Series GC/MSD (Agilent)	5975C_GCMSD	39											
-	studyAssayPlatform	Affymetrix	AFFYMETRIX	40											
-	studyAssayPlatform	amaZon ETD ESI Ion Trap (Bruker)	AMAZON_ETD_ESI	41											
-	studyAssayPlatform	amaZon X ESI Ion Trap (Bruker)	AMAZON_X_ESI	42											
-	studyAssayPlatform	apex-ultra hybrid Qq-FTMS (Bruker)	APEX_ULTRA_QQ_FTMS	43											
-	studyAssayPlatform	API 2000 (AB Sciex)	API_2000	44											
-	studyAssayPlatform	API 3200 (AB Sciex)	API_3200	45											
-	studyAssayPlatform	API 3200 QTRAP (AB Sciex)	API_3200_QTRAP	46											
-	studyAssayPlatform	API 4000 (AB Sciex)	API_4000	47											
-	studyAssayPlatform	API 4000 QTRAP (AB Sciex)	API_4000_QTRAP	48											
-	studyAssayPlatform	API 5000 (AB Sciex)	API_5000	49											
-	studyAssayPlatform	API 5500 (AB Sciex)	API_5500	50											
-	studyAssayPlatform	API 5500 QTRAP (AB Sciex)	API_5500_QTRAP	51											
-	studyAssayPlatform	Applied Biosystems Group (ABI)	APPLIED_BIOSYSTEMS	52											
-	studyAssayPlatform	AQI Biosciences	AQI_BIOSCIENCES	53											
-	studyAssayPlatform	Atmospheric Pressure GC (Waters)	ATMOS_GC	54											
-	studyAssayPlatform	autoflex III MALDI-TOF MS (Bruker)	AUTOFLEX_III_MALDI_TOF_MS	55											
-	studyAssayPlatform	autoflex speed(Bruker)	AUTOFLEX_SPEED	56											
-	studyAssayPlatform	AutoSpec Premier (Waters)	AUTOSPEC_PREMIER	57											
-	studyAssayPlatform	AXIMA Mega TOF (Shimadzu)	AXIMA_MEGA_TOF	58											
-	studyAssayPlatform	AXIMA Performance MALDI TOF/TOF (Shimadzu)	AXIMA_PERF_MALDI_TOF	59											
-	studyAssayPlatform	A-10 Analyzer (Apogee)	A_10_ANALYZER	60											
-	studyAssayPlatform	A-40-MiniFCM (Apogee)	A_40_MINIFCM	61											
-	studyAssayPlatform	Bactiflow (Chemunex SA)	BACTIFLOW	62											
-	studyAssayPlatform	Base4innovation	BASE4INNOVATION	63											
-	studyAssayPlatform	BD BACTEC MGIT 320	BD_BACTEC_MGIT_320	64											
-	studyAssayPlatform	BD BACTEC MGIT 960	BD_BACTEC_MGIT_960	65											
-	studyAssayPlatform	BD Radiometric BACTEC 460TB	BD_RADIO_BACTEC_460TB	66											
-	studyAssayPlatform	BioNanomatrix	BIONANOMATRIX	67											
-	studyAssayPlatform	Cell Lab Quanta SC (Becman Coulter)	CELL_LAB_QUANTA_SC	68											
-	studyAssayPlatform	Clarus 560 D GC/MS (PerkinElmer)	CLARUS_560_D_GCMS	69											
-	studyAssayPlatform	Clarus 560 S GC/MS (PerkinElmer)	CLARUS_560_S_GCMS	70											
-	studyAssayPlatform	Clarus 600 GC/MS (PerkinElmer)	CLARUS_600_GCMS	71											
-	studyAssayPlatform	Complete Genomics	COMPLETE_GENOMICS	72											
-	studyAssayPlatform	Cyan (Dako Cytomation)	CYAN	73											
-	studyAssayPlatform	CyFlow ML (Partec)	CYFLOW_ML	74											
-	studyAssayPlatform	Cyow SL (Partec)	CYFLOW_SL	75											
-	studyAssayPlatform	CyFlow SL3 (Partec)	CYFLOW_SL3	76											
-	studyAssayPlatform	CytoBuoy (Cyto Buoy Inc)	CYTOBUOY	77											
-	studyAssayPlatform	CytoSence (Cyto Buoy Inc)	CYTOSENCE	78											
-	studyAssayPlatform	CytoSub (Cyto Buoy Inc)	CYTOSUB	79											
-	studyAssayPlatform	Danaher	DANAHER	80											
-	studyAssayPlatform	DFS (Thermo Scientific)	DFS	81											
-	studyAssayPlatform	Exactive(Thermo Scientific)	EXACTIVE	82											
-	studyAssayPlatform	FACS Canto (Becton Dickinson)	FACS_CANTO	83											
-	studyAssayPlatform	FACS Canto2 (Becton Dickinson)	FACS_CANTO2	84											
-	studyAssayPlatform	FACS Scan (Becton Dickinson)	FACS_SCAN	85											
-	studyAssayPlatform	FC 500 (Becman Coulter)	FC_500	86											
-	studyAssayPlatform	GCmate II GC/MS (Jeol)	GCMATE_II	87											
-	studyAssayPlatform	GCMS-QP2010 Plus (Shimadzu)	GCMS_QP2010_PLUS	88											
-	studyAssayPlatform	GCMS-QP2010S Plus (Shimadzu)	GCMS_QP2010S_PLUS	89											
-	studyAssayPlatform	GCT Premier (Waters)	GCT_PREMIER	90											
-	studyAssayPlatform	GENEQ	GENEQ	91											
-	studyAssayPlatform	Genome Corp.	GENOME_CORP	92											
-	studyAssayPlatform	GenoVoxx	GENOVOXX	93											
-	studyAssayPlatform	GnuBio	GNUBIO	94											
-	studyAssayPlatform	Guava EasyCyte Mini (Millipore)	GUAVA_EASYCYTE_MINI	95											
-	studyAssayPlatform	Guava EasyCyte Plus (Millipore)	GUAVA_EASYCYTE_PLUS	96											
-	studyAssayPlatform	Guava Personal Cell Analysis (Millipore)	GUAVA_PERSONAL_CELL	97											
-	studyAssayPlatform	Guava Personal Cell Analysis-96 (Millipore)	GUAVA_PERSONAL_CELL_96	98											
-	studyAssayPlatform	Helicos BioSciences	HELICOS_BIO	99											
-	studyAssayPlatform	Illumina	ILLUMINA	100											
-	studyAssayPlatform	Indirect proportion method on LJ medium	INDIRECT_LJ_MEDIUM	101											
-	studyAssayPlatform	Indirect proportion method on Middlebrook Agar 7H9	INDIRECT_AGAR_7H9	102											
-	studyAssayPlatform	Indirect proportion method on Middlebrook Agar 7H10	INDIRECT_AGAR_7H10	103											
-	studyAssayPlatform	Indirect proportion method on Middlebrook Agar 7H11	INDIRECT_AGAR_7H11	104											
-	studyAssayPlatform	inFlux Analyzer (Cytopeia)	INFLUX_ANALYZER	105											
-	studyAssayPlatform	Intelligent Bio-Systems	INTELLIGENT_BIOSYSTEMS	106											
-	studyAssayPlatform	ITQ 700 (Thermo Scientific)	ITQ_700	107											
-	studyAssayPlatform	ITQ 900 (Thermo Scientific)	ITQ_900	108											
-	studyAssayPlatform	ITQ 1100 (Thermo Scientific)	ITQ_1100	109											
-	studyAssayPlatform	JMS-53000 SpiralTOF (Jeol)	JMS_53000_SPIRAL	110											
-	studyAssayPlatform	LaserGen	LASERGEN	111											
-	studyAssayPlatform	LCMS-2020 (Shimadzu)	LCMS_2020	112											
-	studyAssayPlatform	LCMS-2010EV (Shimadzu)	LCMS_2010EV	113											
-	studyAssayPlatform	LCMS-IT-TOF (Shimadzu)	LCMS_IT_TOF	114											
-	studyAssayPlatform	Li-Cor	LI_COR	115											
-	studyAssayPlatform	Life Tech	LIFE_TECH	116											
-	studyAssayPlatform	LightSpeed Genomics	LIGHTSPEED_GENOMICS	117											
-	studyAssayPlatform	LCT Premier XE (Waters)	LCT_PREMIER_XE	118											
-	studyAssayPlatform	LCQ Deca XP MAX (Thermo Scientific)	LCQ_DECA_XP_MAX	119											
-	studyAssayPlatform	LCQ Fleet (Thermo Scientific)	LCQ_FLEET	120											
-	studyAssayPlatform	LXQ (Thermo Scientific)	LXQ_THERMO	121											
-	studyAssayPlatform	LTQ Classic (Thermo Scientific)	LTQ_CLASSIC	122											
-	studyAssayPlatform	LTQ XL (Thermo Scientific)	LTQ_XL	123											
-	studyAssayPlatform	LTQ Velos (Thermo Scientific)	LTQ_VELOS	124											
-	studyAssayPlatform	LTQ Orbitrap Classic (Thermo Scientific)	LTQ_ORBITRAP_CLASSIC	125											
-	studyAssayPlatform	LTQ Orbitrap XL (Thermo Scientific)	LTQ_ORBITRAP_XL	126											
-	studyAssayPlatform	LTQ Orbitrap Discovery (Thermo Scientific)	LTQ_ORBITRAP_DISCOVERY	127											
-	studyAssayPlatform	LTQ Orbitrap Velos (Thermo Scientific)	LTQ_ORBITRAP_VELOS	128											
-	studyAssayPlatform	Luminex 100 (Luminex)	LUMINEX_100	129											
-	studyAssayPlatform	Luminex 200 (Luminex)	LUMINEX_200	130											
-	studyAssayPlatform	MACS Quant (Miltenyi)	MACS_QUANT	131											
-	studyAssayPlatform	MALDI SYNAPT G2 HDMS (Waters)	MALDI_SYNAPT_G2_HDMS	132											
-	studyAssayPlatform	MALDI SYNAPT G2 MS (Waters)	MALDI_SYNAPT_G2_MS	133											
-	studyAssayPlatform	MALDI SYNAPT HDMS (Waters)	MALDI_SYNAPT_HDMS	134											
-	studyAssayPlatform	MALDI SYNAPT MS (Waters)	MALDI_SYNAPT_MS	135											
-	studyAssayPlatform	MALDI micro MX (Waters)	MALDI_MICROMX	136											
-	studyAssayPlatform	maXis (Bruker)	MAXIS	137											
-	studyAssayPlatform	maXis G4 (Bruker)	MAXISG4	138											
-	studyAssayPlatform	microflex LT MALDI-TOF MS (Bruker)	MICROFLEX_LT_MALDI_TOF_MS	139											
-	studyAssayPlatform	microflex LRF MALDI-TOF MS (Bruker)	MICROFLEX_LRF_MALDI_TOF_MS	140											
-	studyAssayPlatform	microflex III MALDI-TOF MS (Bruker)	MICROFLEX_III_TOF_MS	141											
-	studyAssayPlatform	micrOTOF II ESI TOF (Bruker)	MICROTOF_II_ESI_TOF	142											
-	studyAssayPlatform	micrOTOF-Q II ESI-Qq-TOF (Bruker)	MICROTOF_Q_II_ESI_QQ_TOF	143											
-	studyAssayPlatform	microplate Alamar Blue (resazurin) colorimetric method	MICROPLATE_ALAMAR_BLUE_COLORIMETRIC	144											
-	studyAssayPlatform	Mstation (Jeol)	MSTATION	145											
-	studyAssayPlatform	MSQ Plus (Thermo Scientific)	MSQ_PLUS	146											
-	studyAssayPlatform	NABsys	NABSYS	147											
-	studyAssayPlatform	Nanophotonics Biosciences	NANOPHOTONICS_BIOSCIENCES	148											
-	studyAssayPlatform	Network Biosystems	NETWORK_BIOSYSTEMS	149											
-	studyAssayPlatform	Nimblegen	NIMBLEGEN	150											
-	studyAssayPlatform	Oxford Nanopore Technologies	OXFORD_NANOPORE_TECHNOLOGIES	151											
-	studyAssayPlatform	Pacific Biosciences	PACIFIC_BIOSCIENCES	152											
-	studyAssayPlatform	Population Genetics Technologies	POPULATION_GENETICS_TECHNOLOGIES	153											
-	studyAssayPlatform	Q1000GC UltraQuad (Jeol)	Q1000GC_ULTRAQUAD	154											
-	studyAssayPlatform	Quattro micro API (Waters)	QUATTRO_MICRO_API	155											
-	studyAssayPlatform	Quattro micro GC (Waters)	QUATTRO_MICRO_GC	156											
-	studyAssayPlatform	Quattro Premier XE (Waters)	QUATTRO_PREMIER_XE	157											
-	studyAssayPlatform	QSTAR (AB Sciex)	QSTAR	158											
-	studyAssayPlatform	Reveo	REVEO	159											
-	studyAssayPlatform	Roche	ROCHE	160											
-	studyAssayPlatform	Seirad	SEIRAD	161											
-	studyAssayPlatform	solariX hybrid Qq-FTMS (Bruker)	SOLARIX_HYBRID_QQ_FTMS	162											
-	studyAssayPlatform	Somacount (Bently Instruments)	SOMACOUNT	163											
-	studyAssayPlatform	SomaScope (Bently Instruments)	SOMASCOPE	164											
-	studyAssayPlatform	SYNAPT G2 HDMS (Waters)	SYNAPT_G2_HDMS	165											
-	studyAssayPlatform	SYNAPT G2 MS (Waters)	SYNAPT_G2_MS	166											
-	studyAssayPlatform	SYNAPT HDMS (Waters)	SYNAPT_HDMS	167											
-	studyAssayPlatform	SYNAPT MS (Waters)	SYNAPT_MS	168											
-	studyAssayPlatform	TripleTOF 5600 (AB Sciex)	TRIPLETOF_5600	169											
-	studyAssayPlatform	TSQ Quantum Ultra (Thermo Scientific)	TSQ_QUANTUM_ULTRA	170											
-	studyAssayPlatform	TSQ Quantum Access (Thermo Scientific)	TSQ_QUANTUM_ACCESS	171											
-	studyAssayPlatform	TSQ Quantum Access MAX (Thermo Scientific)	TSQ_QUANTUM_ACCESS_MAX	172											
-	studyAssayPlatform	TSQ Quantum Discovery MAX (Thermo Scientific)	TSQ_QUANTUM_DISCOVERY_MAX	173											
-	studyAssayPlatform	TSQ Quantum GC (Thermo Scientific)	TSQ_QUANTUM_GC	174											
-	studyAssayPlatform	TSQ Quantum XLS (Thermo Scientific)	TSQ_QUANTUM_XLS	175											
-	studyAssayPlatform	TSQ Vantage (Thermo Scientific)	TSQ_VANTAGE	176											
-	studyAssayPlatform	ultrafleXtreme MALDI-TOF MS (Bruker)	ULTRAFLEXTREME_MALDI_TOF_MS	177											
-	studyAssayPlatform	VisiGen Biotechnologies	VISIGEN_BIO	178											
-	studyAssayPlatform	Xevo G2 QTOF (Waters)	XEVO_G2_QTOF	179											
-	studyAssayPlatform	Xevo QTof MS (Waters)	XEVO_QTOF_MS	180											
-	studyAssayPlatform	Xevo TQ MS (Waters)	XEVO_TQ_MS	181											
-	studyAssayPlatform	Xevo TQ-S (Waters)	XEVO_TQ_S	182											
+#metadataBlock	name	dataverseAlias	displayName												
+	biomedical		Life Sciences Metadata												
+#datasetField	name	title	description	watermark	fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id
+	studyDesignType	Design Type	Design types that are based on the overall experimental design.		text	0		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyOtherDesignType	Other Design Type	If Other was selected in Design Type, list any other design types that were used in this Dataset.		text	1		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyFactorType	Factor Type	Factors used in the Dataset.		text	2		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyOtherFactorType	Other Factor Type	If Other was selected in Factor Type, list any other factor types that were used in this Dataset.		text	3		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayOrganism	Organism	The taxonomic name of the organism used in the Dataset or from which the  starting biological material derives.		text	4		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayOtherOrganism	Other Organism	If Other was selected in Organism, list any other organisms that were used in this Dataset. Terms from the NCBI Taxonomy are recommended.		text	5		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayMeasurementType	Measurement Type	A term to qualify the endpoint, or what is being measured (e.g. gene expression profiling; protein identification).		text	6		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayOtherMeasurmentType	Other Measurement Type	If Other was selected in Measurement Type, list any other measurement types that were used. Terms from NCBO Bioportal are recommended.		text	7		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayTechnologyType	Technology Type	A term to identify the technology used to perform the measurement (e.g. DNA microarray; mass spectrometry).		text	8		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayOtherTechnologyType	Other Technology Type	If Other was selected in Technology Type, list any other technology types that were used in this Dataset.		text	9		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayPlatform	Technology Platform	The manufacturer and name of the technology platform used in the assay (e.g. Bruker AVANCE).		text	10		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayOtherPlatform	Other Technology Platform	If Other was selected in Technology Platform, list any other technology platforms that were used in this Dataset.		text	11		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayCellType	Cell Type	The name of the cell line from which the source or sample derives.		text	12		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		biomedical
+#controlledVocabulary	DatasetField	Value	identifier	displayOrder											
+	studyDesignType	Case Control	EFO_0001427	0											
+	studyDesignType	Cross Sectional	EFO_0001428	1											
+	studyDesignType	Cohort Study	OCRE100078	2											
+	studyDesignType	Nested Case Control Design	NCI_C48202	3											
+	studyDesignType	Not Specified	NOT_SPECIFIED	4											
+	studyDesignType	Parallel Group Design	OBI_0500006	5											
+	studyDesignType	Perturbation Design	OBI_0001033	6											
+	studyDesignType	Randomized Controlled Trial	MESH_D016449	7											
+	studyDesignType	Technological Design	TECH_DESIGN	8											
+	studyDesignType	Other	OTHER_DESIGN	9											
+	studyFactorType	Age	EFO_0000246	0											
+	studyFactorType	Biomarkers	BIOMARKERS	1											
+	studyFactorType	Cell Surface Markers	CELL_SURFACE_M	2											
+	studyFactorType	Cell Type/Cell Line	EFO_0000324;EFO_0000322	3											
+	studyFactorType	Developmental Stage	EFO_0000399	4											
+	studyFactorType	Disease State	OBI_0001293	5											
+	studyFactorType	Drug Susceptibility	IDO_0000469	6											
+	studyFactorType	Extract Molecule	FBcv_0010001	7											
+	studyFactorType	Genetic Characteristics	OBI_0001404	8											
+	studyFactorType	Immunoprecipitation Antibody	OBI_0000690	9											
+	studyFactorType	Organism	OBI_0100026	10											
+	studyFactorType	Passages	PASSAGES_FACTOR	11											
+	studyFactorType	Platform	OBI_0000050	12											
+	studyFactorType	Sex	EFO_0000695	13											
+	studyFactorType	Strain	EFO_0005135	14											
+	studyFactorType	Time Point	EFO_0000724	15											
+	studyFactorType	Tissue Type	BTO_0001384	16											
+	studyFactorType	Treatment Compound	EFO_0000369	17											
+	studyFactorType	Treatment Type	EFO_0000727	18											
+	studyFactorType	Other	OTHER_FACTOR	19											
+	studyAssayMeasurementType	cell counting	ERO_0001899	0											
+	studyAssayMeasurementType	cell sorting	CHMO_0001085	1											
+	studyAssayMeasurementType	clinical chemistry analysis	OBI_0000520	2											
+	studyAssayMeasurementType	copy number variation profiling	OBI_0000537	3											
+	studyAssayMeasurementType	DNA methylation profiling	OBI_0000634	4											
+	studyAssayMeasurementType	DNA methylation profiling (Bisulfite-Seq)	OBI_0000748	5											
+	studyAssayMeasurementType	DNA methylation profiling (MeDIP-Seq)	_OBI_0000634	6											
+	studyAssayMeasurementType	drug susceptibility	_IDO_0000469	7											
+	studyAssayMeasurementType	environmental gene survey	ENV_GENE_SURVEY	8											
+	studyAssayMeasurementType	genome sequencing	ERO_0001183	9											
+	studyAssayMeasurementType	hematology	OBI_0000630	10											
+	studyAssayMeasurementType	histology	OBI_0600020	11											
+	studyAssayMeasurementType	Histone Modification (ChIP-Seq)	OBI_0002017	12											
+	studyAssayMeasurementType	loss of heterozygosity profiling	SO_0001786	13											
+	studyAssayMeasurementType	metabolite profiling	OBI_0000366	14											
+	studyAssayMeasurementType	metagenome sequencing	METAGENOME_SEQ	15											
+	studyAssayMeasurementType	protein expression profiling	OBI_0000615	16											
+	studyAssayMeasurementType	protein identification	ERO_0000346	17											
+	studyAssayMeasurementType	protein-DNA binding site identification	PROTEIN_DNA_BINDING	18											
+	studyAssayMeasurementType	protein-protein interaction detection	OBI_0000288	19											
+	studyAssayMeasurementType	protein-RNA binding (RIP-Seq)	PROTEIN_RNA_BINDING	20											
+	studyAssayMeasurementType	SNP analysis	OBI_0000435	21											
+	studyAssayMeasurementType	targeted sequencing	TARGETED_SEQ	22											
+	studyAssayMeasurementType	transcription factor binding (ChIP-Seq)	OBI_0002018	23											
+	studyAssayMeasurementType	transcription factor binding site identification	OBI_0000291	24											
+	studyAssayMeasurementType	transcription profiling	OBI_0000424	25											
+	studyAssayMeasurementType	transcription profiling	EFO_0001032	26											
+	studyAssayMeasurementType	transcription profiling (Microarray)	TRANSCRIPTION_PROF	27											
+	studyAssayMeasurementType	transcription profiling (RNA-Seq)	OBI_0001271	28											
+	studyAssayMeasurementType	TRAP translational profiling	TRAP_TRANS_PROF	29											
+	studyAssayMeasurementType	Other	OTHER_MEASUREMENT	30											
+	studyAssayOrganism	Arabidopsis thaliana	NCBITaxon_3702	0											
+	studyAssayOrganism	Bos taurus	NCBITaxon_9913	1											
+	studyAssayOrganism	Caenorhabditis elegans	NCBITaxon_6239	2											
+	studyAssayOrganism	Chlamydomonas reinhardtii	NCBITaxon_3055	3											
+	studyAssayOrganism	Danio rerio (zebrafish)	NCBITaxon_7955	4											
+	studyAssayOrganism	Dictyostelium discoideum	NCBITaxon_44689	5											
+	studyAssayOrganism	Drosophila melanogaster	NCBITaxon_7227	6											
+	studyAssayOrganism	Escherichia coli	NCBITaxon_562	7											
+	studyAssayOrganism	Hepatitis C virus	NCBITaxon_11103	8											
+	studyAssayOrganism	Homo sapiens	NCBITaxon_9606	9											
+	studyAssayOrganism	Mus musculus	NCBITaxon_10090	10											
+	studyAssayOrganism	Mycobacterium africanum	NCBITaxon_33894	11											
+	studyAssayOrganism	Mycobacterium canetti	NCBITaxon_78331	12											
+	studyAssayOrganism	Mycobacterium tuberculosis	NCBITaxon_1773	13											
+	studyAssayOrganism	Mycoplasma pneumoniae	NCBITaxon_2104	14											
+	studyAssayOrganism	Oryza sativa	NCBITaxon_4530	15											
+	studyAssayOrganism	Plasmodium falciparum	NCBITaxon_5833	16											
+	studyAssayOrganism	Pneumocystis carinii	NCBITaxon_4754	17											
+	studyAssayOrganism	Rattus norvegicus	NCBITaxon_10116	18											
+	studyAssayOrganism	Saccharomyces cerevisiae (brewer's yeast)	NCBITaxon_4932	19											
+	studyAssayOrganism	Schizosaccharomyces pombe	NCBITaxon_4896	20											
+	studyAssayOrganism	Takifugu rubripes	NCBITaxon_31033	21											
+	studyAssayOrganism	Xenopus laevis	NCBITaxon_8355	22											
+	studyAssayOrganism	Zea mays	NCBITaxon_4577	23											
+	studyAssayOrganism	Other	OTHER_TAXONOMY	24											
+	studyAssayTechnologyType	culture based drug susceptibility testing, single concentration	CULTURE_DRUG_TEST_SINGLE	0											
+	studyAssayTechnologyType	culture based drug susceptibility testing, two concentrations	CULTURE_DRUG_TEST_TWO	1											
+	studyAssayTechnologyType	culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)	CULTURE_DRUG_TEST_THREE	2											
+	studyAssayTechnologyType	DNA microarray	OBI_0400148	3											
+	studyAssayTechnologyType	flow cytometry	OBI_0000916	4											
+	studyAssayTechnologyType	gel electrophoresis	OBI_0600053	5											
+	studyAssayTechnologyType	mass spectrometry	OBI_0000470	6											
+	studyAssayTechnologyType	NMR spectroscopy	OBI_0000623	7											
+	studyAssayTechnologyType	nucleotide sequencing	OBI_0000626	8											
+	studyAssayTechnologyType	protein microarray	OBI_0400149	9											
+	studyAssayTechnologyType	real time PCR	OBI_0000893	10											
+	studyAssayTechnologyType	no technology required	NO_TECHNOLOGY	11											
+	studyAssayTechnologyType	Other	OTHER_TECHNOLOGY	12											
+	studyAssayPlatform	210-MS GC Ion Trap (Varian)	210_MS_GC	0											
+	studyAssayPlatform	220-MS GC Ion Trap (Varian)	220_MS_GC	1											
+	studyAssayPlatform	225-MS GC Ion Trap (Varian)	225_MS_GC	2											
+	studyAssayPlatform	240-MS GC Ion Trap (Varian)	240_MS_GC	3											
+	studyAssayPlatform	300-MS quadrupole GC/MS (Varian)	300_MS_GCMS	4											
+	studyAssayPlatform	320-MS LC/MS (Varian)	320_MS_LCMS	5											
+	studyAssayPlatform	325-MS LC/MS (Varian)	325_MS_LCMS	6											
+	studyAssayPlatform	320-MS GC/MS (Varian)	500_MS_GCMS	7											
+	studyAssayPlatform	500-MS LC/MS (Varian)	500_MS_LCMS	8											
+	studyAssayPlatform	800D (Jeol)	800D	9											
+	studyAssayPlatform	910-MS TQ-FT (Varian)	910_MS_TQFT	10											
+	studyAssayPlatform	920-MS TQ-FT (Varian)	920_MS_TQFT	11											
+	studyAssayPlatform	3100 Mass Detector (Waters)	3100_MASS_D	12											
+	studyAssayPlatform	6110 Quadrupole LC/MS (Agilent)	6110_QUAD_LCMS	13											
+	studyAssayPlatform	6120 Quadrupole LC/MS (Agilent)	6120_QUAD_LCMS	14											
+	studyAssayPlatform	6130 Quadrupole LC/MS (Agilent)	6130_QUAD_LCMS	15											
+	studyAssayPlatform	6140 Quadrupole LC/MS (Agilent)	6140_QUAD_LCMS	16											
+	studyAssayPlatform	6310 Ion Trap LC/MS (Agilent)	6310_ION_LCMS	17											
+	studyAssayPlatform	6320 Ion Trap LC/MS (Agilent)	6320_ION_LCMS	18											
+	studyAssayPlatform	6330 Ion Trap LC/MS (Agilent)	6330_ION_LCMS	19											
+	studyAssayPlatform	6340 Ion Trap LC/MS (Agilent)	6340_ION_LCMS	20											
+	studyAssayPlatform	6410 Triple Quadrupole LC/MS (Agilent)	6410_TRIPLE_LCMS	21											
+	studyAssayPlatform	6430 Triple Quadrupole LC/MS (Agilent)	6430_TRIPLE_LCMS	22											
+	studyAssayPlatform	6460 Triple Quadrupole LC/MS (Agilent)	6460_TRIPLE_LCMS	23											
+	studyAssayPlatform	6490 Triple Quadrupole LC/MS (Agilent)	6490_TRIPLE_LCMS	24											
+	studyAssayPlatform	6530 Q-TOF LC/MS (Agilent)	6530_Q_TOF_LCMS	25											
+	studyAssayPlatform	6540 Q-TOF LC/MS (Agilent)	6540_Q_TOF_LCMS	26											
+	studyAssayPlatform	6210 TOF LC/MS (Agilent)	6210_Q_TOF_LCMS	27											
+	studyAssayPlatform	6220 TOF LC/MS (Agilent)	6220_Q_TOF_LCMS	28											
+	studyAssayPlatform	6230 TOF LC/MS (Agilent)	6230_Q_TOF_LCMS	29											
+	studyAssayPlatform	7000B Triple Quadrupole GC/MS (Agilent)	700B_TRIPLE_GCMS	30											
+	studyAssayPlatform	AccuTO DART (Jeol)	ACCUTO_DART	31											
+	studyAssayPlatform	AccuTOF GC (Jeol)	ACCUTOF_GC	32											
+	studyAssayPlatform	AccuTOF LC (Jeol)	ACCUTOF_LC	33											
+	studyAssayPlatform	ACQUITY SQD (Waters)	ACQUITY_SQD	34											
+	studyAssayPlatform	ACQUITY TQD (Waters)	ACQUITY_TQD	35											
+	studyAssayPlatform	Agilent	AGILENT	36											
+	studyAssayPlatform	Agilent 5975E GC/MSD (Agilent)	AGILENT_ 5975E_GCMSD	37											
+	studyAssayPlatform	Agilent 5975T LTM GC/MSD (Agilent)	AGILENT_5975T_LTM_GCMSD	38											
+	studyAssayPlatform	5975C Series GC/MSD (Agilent)	5975C_GCMSD	39											
+	studyAssayPlatform	Affymetrix	AFFYMETRIX	40											
+	studyAssayPlatform	amaZon ETD ESI Ion Trap (Bruker)	AMAZON_ETD_ESI	41											
+	studyAssayPlatform	amaZon X ESI Ion Trap (Bruker)	AMAZON_X_ESI	42											
+	studyAssayPlatform	apex-ultra hybrid Qq-FTMS (Bruker)	APEX_ULTRA_QQ_FTMS	43											
+	studyAssayPlatform	API 2000 (AB Sciex)	API_2000	44											
+	studyAssayPlatform	API 3200 (AB Sciex)	API_3200	45											
+	studyAssayPlatform	API 3200 QTRAP (AB Sciex)	API_3200_QTRAP	46											
+	studyAssayPlatform	API 4000 (AB Sciex)	API_4000	47											
+	studyAssayPlatform	API 4000 QTRAP (AB Sciex)	API_4000_QTRAP	48											
+	studyAssayPlatform	API 5000 (AB Sciex)	API_5000	49											
+	studyAssayPlatform	API 5500 (AB Sciex)	API_5500	50											
+	studyAssayPlatform	API 5500 QTRAP (AB Sciex)	API_5500_QTRAP	51											
+	studyAssayPlatform	Applied Biosystems Group (ABI)	APPLIED_BIOSYSTEMS	52											
+	studyAssayPlatform	AQI Biosciences	AQI_BIOSCIENCES	53											
+	studyAssayPlatform	Atmospheric Pressure GC (Waters)	ATMOS_GC	54											
+	studyAssayPlatform	autoflex III MALDI-TOF MS (Bruker)	AUTOFLEX_III_MALDI_TOF_MS	55											
+	studyAssayPlatform	autoflex speed(Bruker)	AUTOFLEX_SPEED	56											
+	studyAssayPlatform	AutoSpec Premier (Waters)	AUTOSPEC_PREMIER	57											
+	studyAssayPlatform	AXIMA Mega TOF (Shimadzu)	AXIMA_MEGA_TOF	58											
+	studyAssayPlatform	AXIMA Performance MALDI TOF/TOF (Shimadzu)	AXIMA_PERF_MALDI_TOF	59											
+	studyAssayPlatform	A-10 Analyzer (Apogee)	A_10_ANALYZER	60											
+	studyAssayPlatform	A-40-MiniFCM (Apogee)	A_40_MINIFCM	61											
+	studyAssayPlatform	Bactiflow (Chemunex SA)	BACTIFLOW	62											
+	studyAssayPlatform	Base4innovation	BASE4INNOVATION	63											
+	studyAssayPlatform	BD BACTEC MGIT 320	BD_BACTEC_MGIT_320	64											
+	studyAssayPlatform	BD BACTEC MGIT 960	BD_BACTEC_MGIT_960	65											
+	studyAssayPlatform	BD Radiometric BACTEC 460TB	BD_RADIO_BACTEC_460TB	66											
+	studyAssayPlatform	BioNanomatrix	BIONANOMATRIX	67											
+	studyAssayPlatform	Cell Lab Quanta SC (Becman Coulter)	CELL_LAB_QUANTA_SC	68											
+	studyAssayPlatform	Clarus 560 D GC/MS (PerkinElmer)	CLARUS_560_D_GCMS	69											
+	studyAssayPlatform	Clarus 560 S GC/MS (PerkinElmer)	CLARUS_560_S_GCMS	70											
+	studyAssayPlatform	Clarus 600 GC/MS (PerkinElmer)	CLARUS_600_GCMS	71											
+	studyAssayPlatform	Complete Genomics	COMPLETE_GENOMICS	72											
+	studyAssayPlatform	Cyan (Dako Cytomation)	CYAN	73											
+	studyAssayPlatform	CyFlow ML (Partec)	CYFLOW_ML	74											
+	studyAssayPlatform	Cyow SL (Partec)	CYFLOW_SL	75											
+	studyAssayPlatform	CyFlow SL3 (Partec)	CYFLOW_SL3	76											
+	studyAssayPlatform	CytoBuoy (Cyto Buoy Inc)	CYTOBUOY	77											
+	studyAssayPlatform	CytoSence (Cyto Buoy Inc)	CYTOSENCE	78											
+	studyAssayPlatform	CytoSub (Cyto Buoy Inc)	CYTOSUB	79											
+	studyAssayPlatform	Danaher	DANAHER	80											
+	studyAssayPlatform	DFS (Thermo Scientific)	DFS	81											
+	studyAssayPlatform	Exactive(Thermo Scientific)	EXACTIVE	82											
+	studyAssayPlatform	FACS Canto (Becton Dickinson)	FACS_CANTO	83											
+	studyAssayPlatform	FACS Canto2 (Becton Dickinson)	FACS_CANTO2	84											
+	studyAssayPlatform	FACS Scan (Becton Dickinson)	FACS_SCAN	85											
+	studyAssayPlatform	FC 500 (Becman Coulter)	FC_500	86											
+	studyAssayPlatform	GCmate II GC/MS (Jeol)	GCMATE_II	87											
+	studyAssayPlatform	GCMS-QP2010 Plus (Shimadzu)	GCMS_QP2010_PLUS	88											
+	studyAssayPlatform	GCMS-QP2010S Plus (Shimadzu)	GCMS_QP2010S_PLUS	89											
+	studyAssayPlatform	GCT Premier (Waters)	GCT_PREMIER	90											
+	studyAssayPlatform	GENEQ	GENEQ	91											
+	studyAssayPlatform	Genome Corp.	GENOME_CORP	92											
+	studyAssayPlatform	GenoVoxx	GENOVOXX	93											
+	studyAssayPlatform	GnuBio	GNUBIO	94											
+	studyAssayPlatform	Guava EasyCyte Mini (Millipore)	GUAVA_EASYCYTE_MINI	95											
+	studyAssayPlatform	Guava EasyCyte Plus (Millipore)	GUAVA_EASYCYTE_PLUS	96											
+	studyAssayPlatform	Guava Personal Cell Analysis (Millipore)	GUAVA_PERSONAL_CELL	97											
+	studyAssayPlatform	Guava Personal Cell Analysis-96 (Millipore)	GUAVA_PERSONAL_CELL_96	98											
+	studyAssayPlatform	Helicos BioSciences	HELICOS_BIO	99											
+	studyAssayPlatform	Illumina	ILLUMINA	100											
+	studyAssayPlatform	Indirect proportion method on LJ medium	INDIRECT_LJ_MEDIUM	101											
+	studyAssayPlatform	Indirect proportion method on Middlebrook Agar 7H9	INDIRECT_AGAR_7H9	102											
+	studyAssayPlatform	Indirect proportion method on Middlebrook Agar 7H10	INDIRECT_AGAR_7H10	103											
+	studyAssayPlatform	Indirect proportion method on Middlebrook Agar 7H11	INDIRECT_AGAR_7H11	104											
+	studyAssayPlatform	inFlux Analyzer (Cytopeia)	INFLUX_ANALYZER	105											
+	studyAssayPlatform	Intelligent Bio-Systems	INTELLIGENT_BIOSYSTEMS	106											
+	studyAssayPlatform	ITQ 700 (Thermo Scientific)	ITQ_700	107											
+	studyAssayPlatform	ITQ 900 (Thermo Scientific)	ITQ_900	108											
+	studyAssayPlatform	ITQ 1100 (Thermo Scientific)	ITQ_1100	109											
+	studyAssayPlatform	JMS-53000 SpiralTOF (Jeol)	JMS_53000_SPIRAL	110											
+	studyAssayPlatform	LaserGen	LASERGEN	111											
+	studyAssayPlatform	LCMS-2020 (Shimadzu)	LCMS_2020	112											
+	studyAssayPlatform	LCMS-2010EV (Shimadzu)	LCMS_2010EV	113											
+	studyAssayPlatform	LCMS-IT-TOF (Shimadzu)	LCMS_IT_TOF	114											
+	studyAssayPlatform	Li-Cor	LI_COR	115											
+	studyAssayPlatform	Life Tech	LIFE_TECH	116											
+	studyAssayPlatform	LightSpeed Genomics	LIGHTSPEED_GENOMICS	117											
+	studyAssayPlatform	LCT Premier XE (Waters)	LCT_PREMIER_XE	118											
+	studyAssayPlatform	LCQ Deca XP MAX (Thermo Scientific)	LCQ_DECA_XP_MAX	119											
+	studyAssayPlatform	LCQ Fleet (Thermo Scientific)	LCQ_FLEET	120											
+	studyAssayPlatform	LXQ (Thermo Scientific)	LXQ_THERMO	121											
+	studyAssayPlatform	LTQ Classic (Thermo Scientific)	LTQ_CLASSIC	122											
+	studyAssayPlatform	LTQ XL (Thermo Scientific)	LTQ_XL	123											
+	studyAssayPlatform	LTQ Velos (Thermo Scientific)	LTQ_VELOS	124											
+	studyAssayPlatform	LTQ Orbitrap Classic (Thermo Scientific)	LTQ_ORBITRAP_CLASSIC	125											
+	studyAssayPlatform	LTQ Orbitrap XL (Thermo Scientific)	LTQ_ORBITRAP_XL	126											
+	studyAssayPlatform	LTQ Orbitrap Discovery (Thermo Scientific)	LTQ_ORBITRAP_DISCOVERY	127											
+	studyAssayPlatform	LTQ Orbitrap Velos (Thermo Scientific)	LTQ_ORBITRAP_VELOS	128											
+	studyAssayPlatform	Luminex 100 (Luminex)	LUMINEX_100	129											
+	studyAssayPlatform	Luminex 200 (Luminex)	LUMINEX_200	130											
+	studyAssayPlatform	MACS Quant (Miltenyi)	MACS_QUANT	131											
+	studyAssayPlatform	MALDI SYNAPT G2 HDMS (Waters)	MALDI_SYNAPT_G2_HDMS	132											
+	studyAssayPlatform	MALDI SYNAPT G2 MS (Waters)	MALDI_SYNAPT_G2_MS	133											
+	studyAssayPlatform	MALDI SYNAPT HDMS (Waters)	MALDI_SYNAPT_HDMS	134											
+	studyAssayPlatform	MALDI SYNAPT MS (Waters)	MALDI_SYNAPT_MS	135											
+	studyAssayPlatform	MALDI micro MX (Waters)	MALDI_MICROMX	136											
+	studyAssayPlatform	maXis (Bruker)	MAXIS	137											
+	studyAssayPlatform	maXis G4 (Bruker)	MAXISG4	138											
+	studyAssayPlatform	microflex LT MALDI-TOF MS (Bruker)	MICROFLEX_LT_MALDI_TOF_MS	139											
+	studyAssayPlatform	microflex LRF MALDI-TOF MS (Bruker)	MICROFLEX_LRF_MALDI_TOF_MS	140											
+	studyAssayPlatform	microflex III MALDI-TOF MS (Bruker)	MICROFLEX_III_TOF_MS	141											
+	studyAssayPlatform	micrOTOF II ESI TOF (Bruker)	MICROTOF_II_ESI_TOF	142											
+	studyAssayPlatform	micrOTOF-Q II ESI-Qq-TOF (Bruker)	MICROTOF_Q_II_ESI_QQ_TOF	143											
+	studyAssayPlatform	microplate Alamar Blue (resazurin) colorimetric method	MICROPLATE_ALAMAR_BLUE_COLORIMETRIC	144											
+	studyAssayPlatform	Mstation (Jeol)	MSTATION	145											
+	studyAssayPlatform	MSQ Plus (Thermo Scientific)	MSQ_PLUS	146											
+	studyAssayPlatform	NABsys	NABSYS	147											
+	studyAssayPlatform	Nanophotonics Biosciences	NANOPHOTONICS_BIOSCIENCES	148											
+	studyAssayPlatform	Network Biosystems	NETWORK_BIOSYSTEMS	149											
+	studyAssayPlatform	Nimblegen	NIMBLEGEN	150											
+	studyAssayPlatform	Oxford Nanopore Technologies	OXFORD_NANOPORE_TECHNOLOGIES	151											
+	studyAssayPlatform	Pacific Biosciences	PACIFIC_BIOSCIENCES	152											
+	studyAssayPlatform	Population Genetics Technologies	POPULATION_GENETICS_TECHNOLOGIES	153											
+	studyAssayPlatform	Q1000GC UltraQuad (Jeol)	Q1000GC_ULTRAQUAD	154											
+	studyAssayPlatform	Quattro micro API (Waters)	QUATTRO_MICRO_API	155											
+	studyAssayPlatform	Quattro micro GC (Waters)	QUATTRO_MICRO_GC	156											
+	studyAssayPlatform	Quattro Premier XE (Waters)	QUATTRO_PREMIER_XE	157											
+	studyAssayPlatform	QSTAR (AB Sciex)	QSTAR	158											
+	studyAssayPlatform	Reveo	REVEO	159											
+	studyAssayPlatform	Roche	ROCHE	160											
+	studyAssayPlatform	Seirad	SEIRAD	161											
+	studyAssayPlatform	solariX hybrid Qq-FTMS (Bruker)	SOLARIX_HYBRID_QQ_FTMS	162											
+	studyAssayPlatform	Somacount (Bently Instruments)	SOMACOUNT	163											
+	studyAssayPlatform	SomaScope (Bently Instruments)	SOMASCOPE	164											
+	studyAssayPlatform	SYNAPT G2 HDMS (Waters)	SYNAPT_G2_HDMS	165											
+	studyAssayPlatform	SYNAPT G2 MS (Waters)	SYNAPT_G2_MS	166											
+	studyAssayPlatform	SYNAPT HDMS (Waters)	SYNAPT_HDMS	167											
+	studyAssayPlatform	SYNAPT MS (Waters)	SYNAPT_MS	168											
+	studyAssayPlatform	TripleTOF 5600 (AB Sciex)	TRIPLETOF_5600	169											
+	studyAssayPlatform	TSQ Quantum Ultra (Thermo Scientific)	TSQ_QUANTUM_ULTRA	170											
+	studyAssayPlatform	TSQ Quantum Access (Thermo Scientific)	TSQ_QUANTUM_ACCESS	171											
+	studyAssayPlatform	TSQ Quantum Access MAX (Thermo Scientific)	TSQ_QUANTUM_ACCESS_MAX	172											
+	studyAssayPlatform	TSQ Quantum Discovery MAX (Thermo Scientific)	TSQ_QUANTUM_DISCOVERY_MAX	173											
+	studyAssayPlatform	TSQ Quantum GC (Thermo Scientific)	TSQ_QUANTUM_GC	174											
+	studyAssayPlatform	TSQ Quantum XLS (Thermo Scientific)	TSQ_QUANTUM_XLS	175											
+	studyAssayPlatform	TSQ Vantage (Thermo Scientific)	TSQ_VANTAGE	176											
+	studyAssayPlatform	ultrafleXtreme MALDI-TOF MS (Bruker)	ULTRAFLEXTREME_MALDI_TOF_MS	177											
+	studyAssayPlatform	VisiGen Biotechnologies	VISIGEN_BIO	178											
+	studyAssayPlatform	Xevo G2 QTOF (Waters)	XEVO_G2_QTOF	179											
+	studyAssayPlatform	Xevo QTof MS (Waters)	XEVO_QTOF_MS	180											
+	studyAssayPlatform	Xevo TQ MS (Waters)	XEVO_TQ_MS	181											
+	studyAssayPlatform	Xevo TQ-S (Waters)	XEVO_TQ_S	182											
 	studyAssayPlatform	Other	OTHER_PLATFORM	183											
\ No newline at end of file
diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv
index b65ba6108f6..b6bed2b9c5b 100644
--- a/scripts/api/data/metadatablocks/citation.tsv
+++ b/scripts/api/data/metadatablocks/citation.tsv
@@ -1,84 +1,86 @@
-#metadataBlock	name	dataverseAlias	displayName	blockURI											
-	citation		Citation Metadata	https://dataverse.org/schema/citation/											
+#metadataBlock	name	dataverseAlias	displayName	blockURI												
+	citation		Citation Metadata	https://dataverse.org/schema/citation/												
 #datasetField	name	title	description	watermark	 fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id	termURI
-	title	Title	Full title by which the Dataset is known.	Enter title...	text	0		TRUE	FALSE	FALSE	FALSE	TRUE	TRUE		citation	http://purl.org/dc/terms/title
-	subtitle	Subtitle	A secondary title used to amplify or state certain limitations on the main title.		text	1		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	alternativeTitle	Alternative Title	A title by which the work is commonly referred, or an abbreviation of the title.		text	2		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/alternative
-	alternativeURL	Alternative URL	A URL where the dataset can be viewed, such as a personal or project website.  	Enter full URL, starting with http://	url	3	<a href="#VALUE" target="_blank">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation	https://schema.org/distribution
-	otherId	Other ID	Another unique identifier that identifies this Dataset (e.g., producer's or another repository's number).		none	4	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
-	otherIdAgency	Agency	Name of agency which generated this identifier.		text	5	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	otherId	citation
-	otherIdValue	Identifier	Other identifier that corresponds to this Dataset.		text	6	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	otherId	citation
-	author	Author	The person(s), corporate body(ies), or agency(ies) responsible for creating the work.		none	7		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation	http://purl.org/dc/terms/creator
-	authorName	Name	The author's Family Name, Given Name or the name of the organization responsible for this Dataset.	FamilyName, GivenName or Organization	text	8	#VALUE	TRUE	FALSE	FALSE	TRUE	TRUE	TRUE	author	citation
-	authorAffiliation	Affiliation	The organization with which the author is affiliated.		text	9	(#VALUE)	TRUE	FALSE	FALSE	TRUE	TRUE	FALSE	author	citation
-	authorIdentifierScheme	Identifier Scheme	Name of the identifier scheme (ORCID, ISNI).		text	10	- #VALUE:	FALSE	TRUE	FALSE	FALSE	TRUE	FALSE	author	citation	http://purl.org/spar/datacite/AgentIdentifierScheme
-	authorIdentifier	Identifier	Uniquely identifies an individual author or organization, according to various schemes.		text	11	#VALUE	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	author	citation	http://purl.org/spar/datacite/AgentIdentifier
-	datasetContact	Contact	The contact(s) for this Dataset.		none	12		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation
-	datasetContactName	Name	The contact's Family Name, Given Name or the name of the organization.	FamilyName, GivenName or Organization	text	13	#VALUE	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	datasetContact	citation
-	datasetContactAffiliation	Affiliation	The organization with which the contact is affiliated.		text	14	(#VALUE)	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	datasetContact	citation
-	datasetContactEmail	E-mail	The e-mail address(es) of the contact(s) for the Dataset. This will not be displayed.		email	15	#EMAIL	FALSE	FALSE	FALSE	FALSE	TRUE	TRUE	datasetContact	citation
-	dsDescription	Description	A summary describing the purpose, nature, and scope of the Dataset.		none	16		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation	
-	dsDescriptionValue	Text	A summary describing the purpose, nature, and scope of the Dataset.		textbox	17	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	TRUE	dsDescription	citation
-	dsDescriptionDate	Date	In cases where a Dataset contains more than one description (for example, one might be supplied by the data producer and another prepared by the data repository where the data are deposited), the date attribute is used to distinguish between the two descriptions. The date attribute follows the ISO convention of YYYY-MM-DD.	YYYY-MM-DD	date	18	(#VALUE)	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	dsDescription	citation
-	subject	Subject	Domain-specific Subject Categories that are topically relevant to the Dataset.		text	19		TRUE	TRUE	TRUE	TRUE	TRUE	TRUE		citation	http://purl.org/dc/terms/subject
-	keyword	Keyword	Key terms that describe important aspects of the Dataset.		none	20		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation
-	keywordValue	Term	Key terms that describe important aspects of the Dataset. Can be used for building keyword indexes and for classification and retrieval purposes. A controlled vocabulary can be employed. The vocab attribute is provided for specification of the controlled vocabulary in use, such as LCSH, MeSH, or others. The vocabURI attribute specifies the location for the full controlled vocabulary.		text	21	#VALUE	TRUE	FALSE	FALSE	TRUE	TRUE	FALSE	keyword	citation
-	keywordVocabulary	Vocabulary	For the specification of the keyword controlled vocabulary in use, such as LCSH, MeSH, or others.		text	22	(#VALUE)	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	keyword	citation
-	keywordVocabularyURI	Vocabulary URL	Keyword vocabulary URL points to the web presence that describes the keyword vocabulary, if appropriate. Enter an absolute URL where the keyword vocabulary web site is found, such as http://www.my.org.	Enter full URL, starting with http://	url	23	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	keyword	citation
-	topicClassification	Topic Classification	The classification field indicates the broad important topic(s) and subjects that the data cover. Library of Congress subject terms may be used here.  		none	24		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
-	topicClassValue	Term	Topic or Subject term that is relevant to this Dataset.		text	25	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	topicClassification	citation
-	topicClassVocab	Vocabulary	Provided for specification of the controlled vocabulary in use, e.g., LCSH, MeSH, etc.		text	26	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	topicClassification	citation
-	topicClassVocabURI	Vocabulary URL	Specifies the URL location for the full controlled vocabulary.	Enter full URL, starting with http://	url	27	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	topicClassification	citation
-	publication	Related Publication	Publications that use the data from this Dataset.		none	28		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation	http://purl.org/dc/terms/isReferencedBy
-	publicationCitation	Citation	The full bibliographic citation for this related publication.		textbox	29	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	FALSE	publication	citation	http://purl.org/dc/terms/bibliographicCitation
-	publicationIDType	ID Type	The type of digital identifier used for this publication (e.g., Digital Object Identifier (DOI)).		text	30	#VALUE: 	TRUE	TRUE	FALSE	FALSE	TRUE	FALSE	publication	citation	http://purl.org/spar/datacite/ResourceIdentifierScheme
-	publicationIDNumber	ID Number	The identifier for the selected ID type.		text	31	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	FALSE	publication	citation	http://purl.org/spar/datacite/ResourceIdentifier
-	publicationURL	URL	Link to the publication web page (e.g., journal article page, archive record page, or other).	Enter full URL, starting with http://	url	32	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	publication	citation	https://schema.org/distribution
-	notesText	Notes	Additional important information about the Dataset.		textbox	33		FALSE	FALSE	FALSE	FALSE	TRUE	FALSE		citation
-	language	Language	Language of the Dataset		text	34		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		citation	http://purl.org/dc/terms/language
-	producer	Producer	Person or organization with the financial or administrative responsibility over this Dataset		none	35		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
-	producerName	Name	Producer name	FamilyName, GivenName or Organization	text	36	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	producer	citation
-	producerAffiliation	Affiliation	The organization with which the producer is affiliated.		text	37	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	producer	citation
-	producerAbbreviation	Abbreviation	The abbreviation by which the producer is commonly known. (ex. IQSS, ICPSR)		text	38	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	producer	citation
-	producerURL	URL	Producer URL points to the producer's web presence, if appropriate. Enter an absolute URL where the producer's web site is found, such as http://www.my.org.  	Enter full URL, starting with http://	url	39	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	producer	citation
-	producerLogoURL	Logo URL	URL for the producer's logo, which points to this  producer's web-accessible logo image. Enter an absolute URL where the producer's logo image is found, such as http://www.my.org/images/logo.gif.	Enter full URL for image, starting with http://	url	40	<img src="#VALUE" alt="#NAME" class="metadata-logo"/><br/>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	producer	citation
-	productionDate	Production Date	Date when the data collection or other materials were produced (not distributed, published or archived).	YYYY-MM-DD	date	41		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		citation
-	productionPlace	Production Place	The location where the data collection and any other related materials were produced.		text	42		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	contributor	Contributor	The organization or person responsible for either collecting, managing, or otherwise contributing in some form to the development of the resource.		none	43	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/contributor
-	contributorType	Type	The type of contributor of the  resource.  		text	44	#VALUE 	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE	contributor	citation
-	contributorName	Name	The Family Name, Given Name or organization name of the contributor.	FamilyName, GivenName or Organization	text	45	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	contributor	citation
-	grantNumber	Grant Information	Grant Information		none	46	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://schema.org/sponsor
-	grantNumberAgency	Grant Agency	Grant Number Agency		text	47	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	grantNumber	citation
-	grantNumberValue	Grant Number	The grant or contract number of the project that  sponsored the effort.		text	48	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	grantNumber	citation
-	distributor	Distributor	The organization designated by the author or producer to generate copies of the particular work including any necessary editions or revisions.		none	49		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
-	distributorName	Name	Distributor name	FamilyName, GivenName or Organization	text	50	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	distributor	citation
-	distributorAffiliation	Affiliation	The organization with which the distributor contact is affiliated.		text	51	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	distributor	citation
-	distributorAbbreviation	Abbreviation	The abbreviation by which this distributor is commonly known (e.g., IQSS, ICPSR).		text	52	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	distributor	citation
-	distributorURL	URL	Distributor URL points to the distributor's web presence, if appropriate. Enter an absolute URL where the distributor's web site is found, such as http://www.my.org.	Enter full URL, starting with http://	url	53	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	distributor	citation
-	distributorLogoURL	Logo URL	URL of the distributor's logo, which points to this  distributor's web-accessible logo image. Enter an absolute URL where the distributor's logo image is found, such as http://www.my.org/images/logo.gif.	Enter full URL for image, starting with http://	url	54	<img src="#VALUE" alt="#NAME" class="metadata-logo"/><br/>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	distributor	citation
-	distributionDate	Distribution Date	Date that the work was made available for distribution/presentation.	YYYY-MM-DD	date	55		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		citation
-	depositor	Depositor	The person (Family Name, Given Name) or the name of the organization that deposited this Dataset to the repository.		text	56		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	dateOfDeposit	Deposit Date	Date that the Dataset was deposited into the repository.	YYYY-MM-DD	date	57		FALSE	FALSE	FALSE	TRUE	FALSE	FALSE		citation	http://purl.org/dc/terms/dateSubmitted
-	timePeriodCovered	Time Period Covered	Time period to which the data refer. This item reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected. Also known as span.		none	58	;	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://schema.org/temporalCoverage
-	timePeriodCoveredStart	Start	Start date which reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected.	YYYY-MM-DD	date	59	#NAME: #VALUE 	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	timePeriodCovered	citation
-	timePeriodCoveredEnd	End	End date which reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected.	YYYY-MM-DD	date	60	#NAME: #VALUE 	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	timePeriodCovered	citation
-	dateOfCollection	Date of Collection	Contains the date(s) when the data were collected.		none	61	;	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
-	dateOfCollectionStart	Start	Date when the data collection started.	YYYY-MM-DD	date	62	#NAME: #VALUE 	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	dateOfCollection	citation
-	dateOfCollectionEnd	End	Date when the data collection ended.	YYYY-MM-DD	date	63	#NAME: #VALUE 	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	dateOfCollection	citation
-	kindOfData	Kind of Data	Type of data included in the file: survey data, census/enumeration data, aggregate data, clinical data, event/transaction data, program source code, machine-readable text, administrative records data, experimental data, psychological test, textual data, coded textual, coded documents, time budget diaries, observation data/ratings, process-produced data, or other.		text	64		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		citation	http://rdf-vocabulary.ddialliance.org/discovery#kindOfData
-	series	Series	Information about the Dataset series.		none	65	:	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	seriesName	Name	Name of the dataset series to which the Dataset belongs.		text	66	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	series	citation
-	seriesInformation	Information	History of the series and summary of those features that apply to the series as a whole.		textbox	67	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	series	citation
-	software	Software	Information about the software used to generate the Dataset.		none	68	,	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://www.w3.org/TR/prov-o/#wasGeneratedBy
-	softwareName	Name	Name of software used to generate the Dataset.		text	69	#VALUE	FALSE	TRUE	FALSE	FALSE	FALSE	FALSE	software	citation
-	softwareVersion	Version	Version of the software used to generate the Dataset.		text	70	#NAME: #VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	software	citation
-	relatedMaterial	Related Material	Any material related to this Dataset.		textbox	71		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
-	relatedDatasets	Related Datasets	Any Datasets that are related to this Dataset, such as previous research on this subject.		textbox	72		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/relation
-	otherReferences	Other References	Any references that would serve as background or supporting material to this Dataset.		text	73		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/references
-	dataSources	Data Sources	List of books, articles, serials, or machine-readable data files that served as the sources of the data collection.		textbox	74		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://www.w3.org/TR/prov-o/#wasDerivedFrom	
-	originOfSources	Origin of Sources	For historical materials, information about the origin of the sources and the rules followed in establishing the sources should be specified.		textbox	75		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	characteristicOfSources	Characteristic of Sources Noted	Assessment of characteristics and source material.		textbox	76		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	accessToSources	Documentation and Access to Sources	Level of documentation of the original sources.		textbox	77		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
+	title	Title	The main title of the Dataset		text	0		TRUE	FALSE	FALSE	FALSE	TRUE	TRUE		citation	http://purl.org/dc/terms/title
+	subtitle	Subtitle	A secondary title that amplifies or states certain limitations on the main title		text	1		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation	
+	alternativeTitle	Alternative Title	Either 1) a title commonly used to refer to the Dataset or 2) an abbreviation of the main title		text	2		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/alternative
+	alternativeURL	Alternative URL	Another URL where one can view or access the data in the Dataset, e.g. a project or personal webpage	https://	url	3	<a href="#VALUE" target="_blank">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation	https://schema.org/distribution
+	otherId	Other Identifier	Another unique identifier for the Dataset (e.g. producer's or another repository's identifier)		none	4	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	
+	otherIdAgency	Agency	The name of the agency that generated the other identifier		text	5	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	otherId	citation	
+	otherIdValue	Identifier	Another identifier uniquely identifies the Dataset		text	6	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	otherId	citation	
+	author	Author	The entity, e.g. a person or organization, that created the Dataset		none	7		FALSE	FALSE	TRUE	FALSE	TRUE	TRUE		citation	http://purl.org/dc/terms/creator
+	authorName	Name	The name of the author, such as the person's name or the name of an organization	1) Family Name, Given Name or 2) Organization XYZ	text	8	#VALUE	TRUE	FALSE	FALSE	TRUE	TRUE	TRUE	author	citation	
+	authorAffiliation	Affiliation	The name of the entity affiliated with the author, e.g. an organization's name	Organization XYZ	text	9	(#VALUE)	TRUE	FALSE	FALSE	TRUE	TRUE	FALSE	author	citation	
+	authorIdentifierScheme	Identifier Type	The type of identifier that uniquely identifies the author (e.g. ORCID, ISNI)		text	10	- #VALUE:	FALSE	TRUE	FALSE	FALSE	TRUE	FALSE	author	citation	http://purl.org/spar/datacite/AgentIdentifierScheme
+	authorIdentifier	Identifier	Uniquely identifies the author when paired with an identifier type		text	11	#VALUE	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	author	citation	http://purl.org/spar/datacite/AgentIdentifier
+	datasetContact	Point of Contact	The entity, e.g. a person or organization, that users of the Dataset can contact with questions		none	12		FALSE	FALSE	TRUE	FALSE	TRUE	TRUE		citation	
+	datasetContactName	Name	The name of the point of contact, e.g. the person's name or the name of an organization	1) FamilyName, GivenName or 2) Organization	text	13	#VALUE	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	datasetContact	citation	
+	datasetContactAffiliation	Affiliation	The name of the entity affiliated with the point of contact, e.g. an organization's name	Organization XYZ	text	14	(#VALUE)	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	datasetContact	citation	
+	datasetContactEmail	E-mail	The point of contact's email address	name@email.xyz	email	15	#EMAIL	FALSE	FALSE	FALSE	FALSE	TRUE	TRUE	datasetContact	citation	
+	dsDescription	Description	A summary describing the purpose, nature, and scope of the Dataset		none	16		FALSE	FALSE	TRUE	FALSE	TRUE	TRUE		citation	
+	dsDescriptionValue	Text	A summary describing the purpose, nature, and scope of the Dataset		textbox	17	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	TRUE	dsDescription	citation	
+	dsDescriptionDate	Date	The date when the description was added to the Dataset. If the Dataset contains more than one description, e.g. the data producer supplied one description and the data repository supplied another, this date is used to distinguish between the descriptions	YYYY-MM-DD	date	18	(#VALUE)	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	dsDescription	citation	
+	subject	Subject	The area of study relevant to the Dataset		text	19		TRUE	TRUE	TRUE	TRUE	TRUE	TRUE		citation	http://purl.org/dc/terms/subject
+	keyword	Keyword	A key term that describes an important aspect of the Dataset and information about any controlled vocabulary used		none	20		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation	
+	keywordValue	Term	A key term that describes important aspects of the Dataset		text	21	#VALUE	TRUE	FALSE	FALSE	TRUE	TRUE	FALSE	keyword	citation	
+	keywordTermURI	Term URI	A URI that points to the web presence of the Keyword Term	https://	url	22	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	keyword	citation	
+	keywordVocabulary	Controlled Vocabulary Name	The controlled vocabulary used for the keyword term (e.g. LCSH, MeSH)		text	23	(#VALUE)	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	keyword	citation	
+	keywordVocabularyURI	Controlled Vocabulary URL	The URL where one can access information about the term's controlled vocabulary	https://	url	24	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	keyword	citation
+	topicClassification	Topic Classification	Indicates a broad, important topic or subject that the Dataset covers and information about any controlled vocabulary used		none	25		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	
+	topicClassValue	Term	A topic or subject term		text	26	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	topicClassification	citation	
+	topicClassVocab	Controlled Vocabulary Name	The controlled vocabulary used for the keyword term (e.g. LCSH, MeSH)		text	27	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	topicClassification	citation	
+	topicClassVocabURI	Controlled Vocabulary URL	The URL where one can access information about the term's controlled vocabulary	https://	url	28	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	topicClassification	citation	
+	publication	Related Publication	The article or report that uses the data in the Dataset. The full list of related publications will be displayed on the metadata tab		none	29		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation	http://purl.org/dc/terms/isReferencedBy
+	publicationRelationType	Relation Type	The nature of the relationship between this Dataset and the related publication		text	30	#VALUE:	TRUE	TRUE	FALSE	FALSE	TRUE	FALSE	publication	citation	http://datacite.org/schema/kernel-4/simpleTypes#relationType
+	publicationCitation	Citation	The full bibliographic citation for the related publication		textbox	31	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	FALSE	publication	citation	http://purl.org/dc/terms/bibliographicCitation
+	publicationIDType	Identifier Type	The type of identifier that uniquely identifies a related publication		text	32	#VALUE: 	TRUE	TRUE	FALSE	FALSE	TRUE	FALSE	publication	citation	http://purl.org/spar/datacite/ResourceIdentifierScheme
+	publicationIDNumber	Identifier	The identifier for a related publication		text	33	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	FALSE	publication	citation	http://purl.org/spar/datacite/ResourceIdentifier
+	publicationURL	URL	The URL form of the identifier entered in the Identifier field, e.g. the DOI URL if a DOI was entered in the Identifier field. Used to display what was entered in the ID Type and ID Number fields as a link. If what was entered in the Identifier field has no URL form, the URL of the publication webpage is used, e.g. a journal article webpage	https://	url	34	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	publication	citation	https://schema.org/distribution
+	notesText	Notes	Additional information about the Dataset		textbox	35		FALSE	FALSE	FALSE	FALSE	TRUE	FALSE		citation	
+	language	Language	A language that the Dataset's files is written in		text	36		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		citation	http://purl.org/dc/terms/language
+	producer	Producer	The entity, such a person or organization, managing the finances or other administrative processes involved in the creation of the Dataset		none	37		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	
+	producerName	Name	The name of the entity, e.g. the person's name or the name of an organization	1) FamilyName, GivenName or 2) Organization	text	38	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	TRUE	producer	citation	
+	producerAffiliation	Affiliation	The name of the entity affiliated with the producer, e.g. an organization's name	Organization XYZ	text	39	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	producer	citation	
+	producerAbbreviation	Abbreviated Name	The producer's abbreviated name (e.g. IQSS, ICPSR)		text	40	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	producer	citation	
+	producerURL	URL	The URL of the producer's website	https://	url	41	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	producer	citation	
+	producerLogoURL	Logo URL	The URL of the producer's logo	https://	url	42	<img src="#VALUE" alt="#NAME" class="metadata-logo"/><br/>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	producer	citation	
+	productionDate	Production Date	The date when the data were produced (not distributed, published, or archived)	YYYY-MM-DD	date	43		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		citation	
+	productionPlace	Production Location	The location where the data and any related materials were produced or collected		text	44		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		citation	
+	contributor	Contributor	The entity, such as a person or organization, responsible for collecting, managing, or otherwise contributing to the development of the Dataset		none	45	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/contributor
+	contributorType	Type	Indicates the type of contribution made to the dataset		text	46	#VALUE 	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE	contributor	citation	
+	contributorName	Name	The name of the contributor, e.g. the person's name or the name of an organization	1) FamilyName, GivenName or 2) Organization	text	47	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	contributor	citation	
+	grantNumber	Funding Information	Information about the Dataset's financial support		none	48	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://schema.org/sponsor
+	grantNumberAgency	Agency	The agency that provided financial support for the Dataset	Organization XYZ	text	49	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	grantNumber	citation	
+	grantNumberValue	Identifier	The grant identifier or contract identifier of the agency that provided financial support for the Dataset		text	50	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	grantNumber	citation	
+	distributor	Distributor	The entity, such as a person or organization, designated to generate copies of the Dataset, including any editions or revisions		none	51		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	
+	distributorName	Name	The name of the entity, e.g. the person's name or the name of an organization	1) FamilyName, GivenName or 2) Organization	text	52	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	distributor	citation	
+	distributorAffiliation	Affiliation	The name of the entity affiliated with the distributor, e.g. an organization's name	Organization XYZ	text	53	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	distributor	citation	
+	distributorAbbreviation	Abbreviated Name	The distributor's abbreviated name (e.g. IQSS, ICPSR)		text	54	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	distributor	citation	
+	distributorURL	URL	The URL of the distributor's webpage	https://	url	55	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	distributor	citation	
+	distributorLogoURL	Logo URL	The URL of the distributor's logo image, used to show the image on the Dataset's page	https://	url	56	<img src="#VALUE" alt="#NAME" class="metadata-logo"/><br/>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	distributor	citation	
+	distributionDate	Distribution Date	The date when the Dataset was made available for distribution/presentation	YYYY-MM-DD	date	57		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		citation	
+	depositor	Depositor	The entity, such as a person or organization, that deposited the Dataset in the repository	1) FamilyName, GivenName or 2) Organization	text	58		FALSE	FALSE	FALSE	FALSE	TRUE	FALSE		citation
+	dateOfDeposit	Deposit Date	The date when the Dataset was deposited into the repository	YYYY-MM-DD	date	59		FALSE	FALSE	FALSE	TRUE	TRUE	FALSE		citation	http://purl.org/dc/terms/dateSubmitted
+	timePeriodCovered	Time Period	The time period that the data refer to. Also known as span. This is the time period covered by the data, not the dates of coding, collecting data, or making documents machine-readable		none	60	;	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://schema.org/temporalCoverage
+	timePeriodCoveredStart	Start Date	The start date of the time period that the data refer to	YYYY-MM-DD	date	61	#NAME: #VALUE 	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	timePeriodCovered	citation	
+	timePeriodCoveredEnd	End Date	The end date of the time period that the data refer to	YYYY-MM-DD	date	62	#NAME: #VALUE 	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	timePeriodCovered	citation	
+	dateOfCollection	Date of Collection	The dates when the data were collected or generated		none	63	;	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	
+	dateOfCollectionStart	Start Date	The date when the data collection started	YYYY-MM-DD	date	64	#NAME: #VALUE 	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	dateOfCollection	citation	
+	dateOfCollectionEnd	End Date	The date when the data collection ended	YYYY-MM-DD	date	65	#NAME: #VALUE 	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	dateOfCollection	citation	
+	kindOfData	Data Type	The type of data included in the files (e.g. survey data, clinical data, or machine-readable text)		text	66		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		citation	http://rdf-vocabulary.ddialliance.org/discovery#kindOfData
+	series	Series	Information about the dataset series to which the Dataset belong		none	67	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	
+	seriesName	Name	The name of the dataset series		text	68	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	series	citation	
+	seriesInformation	Information	Can include 1) a history of the series and 2) a summary of features that apply to the series		textbox	69	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	series	citation	
+	software	Software	Information about the software used to generate the Dataset		none	70	,	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://www.w3.org/TR/prov-o/#wasGeneratedBy
+	softwareName	Name	The name of software used to generate the Dataset		text	71	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	software	citation
+	softwareVersion	Version	The version of the software used to generate the Dataset, e.g. 4.11		text	72	#NAME: #VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	software	citation	
+	relatedMaterial	Related Material	Information, such as a persistent ID or citation, about the material related to the Dataset, such as appendices or sampling information available outside of the Dataset		textbox	73		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	
+	relatedDatasets	Related Dataset	Information, such as a persistent ID or citation, about a related dataset, such as previous research on the Dataset's subject		textbox	74		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/relation
+	otherReferences	Other Reference	Information, such as a persistent ID or citation, about another type of resource that provides background or supporting material to the Dataset		text	75		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/references
+	dataSources	Data Source	Information, such as a persistent ID or citation, about sources of the Dataset (e.g. a book, article, serial, or machine-readable data file)		textbox	76		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://www.w3.org/TR/prov-o/#wasDerivedFrom
+	originOfSources	Origin of Historical Sources	For historical sources, the origin and any rules followed in establishing them as sources		textbox	77		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation	
+	characteristicOfSources	Characteristic of Sources	Characteristics not already noted elsewhere		textbox	78		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation	
+	accessToSources	Documentation and Access to Sources	1) Methods or procedures for accessing data sources and 2) any special permissions needed for access		textbox	79		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation	
 #controlledVocabulary	DatasetField	Value	identifier	displayOrder											
 	subject	Agricultural Sciences	D01	0											
 	subject	Arts and Humanities	D0	1											
@@ -96,21 +98,23 @@
 	subject	Other	D12	13											
 	publicationIDType	ark		0											
 	publicationIDType	arXiv		1											
-	publicationIDType	bibcode		2											
-	publicationIDType	doi		3											
-	publicationIDType	ean13		4											
-	publicationIDType	eissn		5											
-	publicationIDType	handle		6											
-	publicationIDType	isbn		7											
-	publicationIDType	issn		8											
-	publicationIDType	istc		9											
-	publicationIDType	lissn		10											
-	publicationIDType	lsid		11											
-	publicationIDType	pmid		12											
-	publicationIDType	purl		13											
-	publicationIDType	upc		14											
-	publicationIDType	url		15											
-	publicationIDType	urn		16											
+	publicationIDType	bibcode		2								
+	publicationIDType	cstr		3											
+	publicationIDType	doi		4											
+	publicationIDType	ean13		5											
+	publicationIDType	eissn		6											
+	publicationIDType	handle		7											
+	publicationIDType	isbn		8											
+	publicationIDType	issn		9											
+	publicationIDType	istc		10											
+	publicationIDType	lissn		11											
+	publicationIDType	lsid		12											
+	publicationIDType	pmid		13											
+	publicationIDType	purl		14											
+	publicationIDType	upc		15											
+	publicationIDType	url		16	
+	publicationIDType	urn		17											
+	publicationIDType	DASH-NRS		18		
 	contributorType	Data Collector		0											
 	contributorType	Data Curator		1											
 	contributorType	Data Manager		2											
@@ -129,193 +133,7933 @@
 	contributorType	Work Package Leader		15											
 	contributorType	Other		16											
 	authorIdentifierScheme	ORCID		0											
-	authorIdentifierScheme	ISNI		1											
-	authorIdentifierScheme	LCNA		2											
-	authorIdentifierScheme	VIAF		3											
-	authorIdentifierScheme	GND		4											
-	language	Abkhaz		0											
-	language	Afar		1											
-	language	Afrikaans		2											
-	language	Akan		3											
-	language	Albanian		4											
-	language	Amharic		5											
-	language	Arabic		6											
-	language	Aragonese		7											
-	language	Armenian		8											
-	language	Assamese		9											
-	language	Avaric		10											
-	language	Avestan		11											
-	language	Aymara		12											
-	language	Azerbaijani		13											
-	language	Bambara		14											
-	language	Bashkir		15											
-	language	Basque		16											
-	language	Belarusian		17											
-	language	Bengali, Bangla		18											
-	language	Bihari		19											
-	language	Bislama		20											
-	language	Bosnian		21											
-	language	Breton		22											
-	language	Bulgarian		23											
-	language	Burmese		24											
-	language	Catalan,Valencian		25											
-	language	Chamorro		26											
-	language	Chechen		27											
-	language	Chichewa, Chewa, Nyanja		28											
-	language	Chinese		29											
-	language	Chuvash		30											
-	language	Cornish		31											
-	language	Corsican		32											
-	language	Cree		33											
-	language	Croatian		34											
-	language	Czech		35											
-	language	Danish		36											
-	language	Divehi, Dhivehi, Maldivian		37											
-	language	Dutch		38											
-	language	Dzongkha		39											
-	language	English		40											
-	language	Esperanto		41											
-	language	Estonian		42											
-	language	Ewe		43											
-	language	Faroese		44											
-	language	Fijian		45											
-	language	Finnish		46											
-	language	French		47											
-	language	Fula, Fulah, Pulaar, Pular		48											
-	language	Galician		49											
-	language	Georgian		50											
-	language	German		51											
-	language	Greek (modern)		52											
-	language	Guaraní		53											
-	language	Gujarati		54											
-	language	Haitian, Haitian Creole		55											
-	language	Hausa		56											
-	language	Hebrew (modern)		57											
-	language	Herero		58											
-	language	Hindi		59											
-	language	Hiri Motu		60											
-	language	Hungarian		61											
-	language	Interlingua		62											
-	language	Indonesian		63											
-	language	Interlingue		64											
-	language	Irish		65											
-	language	Igbo		66											
-	language	Inupiaq		67											
-	language	Ido		68											
-	language	Icelandic		69											
-	language	Italian		70											
-	language	Inuktitut		71											
-	language	Japanese		72											
-	language	Javanese		73											
-	language	Kalaallisut, Greenlandic		74											
-	language	Kannada		75											
-	language	Kanuri		76											
-	language	Kashmiri		77											
-	language	Kazakh		78											
-	language	Khmer		79											
-	language	Kikuyu, Gikuyu		80											
-	language	Kinyarwanda		81											
-	language	Kyrgyz		82											
-	language	Komi		83											
-	language	Kongo		84											
-	language	Korean		85											
-	language	Kurdish		86											
-	language	Kwanyama, Kuanyama		87											
-	language	Latin		88											
-	language	Luxembourgish, Letzeburgesch		89											
-	language	Ganda		90											
-	language	Limburgish, Limburgan, Limburger		91											
-	language	Lingala		92											
-	language	Lao		93											
-	language	Lithuanian		94											
-	language	Luba-Katanga		95											
-	language	Latvian		96											
-	language	Manx		97											
-	language	Macedonian		98											
-	language	Malagasy		99											
-	language	Malay		100											
-	language	Malayalam		101											
-	language	Maltese		102											
-	language	Māori		103											
-	language	Marathi (MarāᚭhÄĢ)		104											
-	language	Marshallese		105											
-	language	Mixtepec Mixtec		106									
-	language	Mongolian		107										
-	language	Nauru		108											
-	language	Navajo, Navaho		109											
-	language	Northern Ndebele		110											
-	language	Nepali		111											
-	language	Ndonga		112											
-	language	Norwegian BokmÃĨl		113											
-	language	Norwegian Nynorsk		114											
-	language	Norwegian		115											
-	language	Nuosu		116											
-	language	Southern Ndebele		117											
-	language	Occitan		118											
-	language	Ojibwe, Ojibwa		119											
-	language	Old Church Slavonic,Church Slavonic,Old Bulgarian		120											
-	language	Oromo		121											
-	language	Oriya		122											
-	language	Ossetian, Ossetic		123											
-	language	Panjabi, Punjabi		124											
-	language	Pāli		125											
-	language	Persian (Farsi)		126											
-	language	Polish		127											
-	language	Pashto, Pushto		128											
-	language	Portuguese		129											
-	language	Quechua		130											
-	language	Romansh		131											
-	language	Kirundi		132											
-	language	Romanian		133											
-	language	Russian		134											
-	language	Sanskrit (Saṁskṛta)		135											
-	language	Sardinian		136											
-	language	Sindhi		137											
-	language	Northern Sami		138											
-	language	Samoan		139											
-	language	Sango		140											
-	language	Serbian		141											
-	language	Scottish Gaelic, Gaelic		142											
-	language	Shona		143											
-	language	Sinhala, Sinhalese		144											
-	language	Slovak		145											
-	language	Slovene		146											
-	language	Somali		147											
-	language	Southern Sotho		148											
-	language	Spanish, Castilian		149											
-	language	Sundanese		150											
-	language	Swahili		151											
-	language	Swati		152											
-	language	Swedish		153											
-	language	Tamil		154											
-	language	Telugu		155											
-	language	Tajik		156											
-	language	Thai		157											
-	language	Tigrinya		158											
-	language	Tibetan Standard, Tibetan, Central		159											
-	language	Turkmen		160											
-	language	Tagalog		161											
-	language	Tswana		162											
-	language	Tonga (Tonga Islands)		163											
-	language	Turkish		164											
-	language	Tsonga		165											
-	language	Tatar		166											
-	language	Twi		167											
-	language	Tahitian		168											
-	language	Uyghur, Uighur		169											
-	language	Ukrainian		170											
-	language	Urdu		171											
-	language	Uzbek		172											
-	language	Venda		173											
-	language	Vietnamese		174											
-	language	VolapÃŧk		175											
-	language	Walloon		176											
-	language	Welsh		177											
-	language	Wolof		178											
-	language	Western Frisian		179											
-	language	Xhosa		180											
-	language	Yiddish		181											
-	language	Yoruba		182											
-	language	Zhuang, Chuang		183											
-	language	Zulu		184											
-	language	Not applicable		185											
+	authorIdentifierScheme	ROR		1											
+	authorIdentifierScheme	ISNI		2											
+	authorIdentifierScheme	LCNA		3											
+	authorIdentifierScheme	VIAF		4											
+	authorIdentifierScheme	GND		5											
+	authorIdentifierScheme	DAI		6
+	authorIdentifierScheme	ResearcherID		7
+	authorIdentifierScheme	ScopusID		8
+	language	'Are'are	alu	0	alu
+	language	'Auhelawa	kud	1	kud
+	language	A'ou	aou	2	aou
+	language	A-Pucikwar	apq	3	apq
+	language	Aari	aiw	4	aiw
+	language	AasÃĄx	aas	5	aas
+	language	Abadi	kbt	6	kbt
+	language	Abaga	abg	7	abg
+	language	Abai Sungai	abf	8	abf
+	language	Abanyom	abm	9	abm
+	language	Abar	mij	10	mij
+	language	Abau	aau	11	aau
+	language	Abaza	abq	12	abq
+	language	Abellen Ayta	abp	13	abp
+	language	Abidji	abi	14	abi
+	language	Abinomn	bsa	15	bsa
+	language	Abipon	axb	16	axb
+	language	Abishira	ash	17	ash
+	language	Abkhaz	abk	18	abk	ab	Abkhaz	Abkhazian
+	language	Abom	aob	19	aob
+	language	Abon	abo	20	abo
+	language	Abron	abr	21	abr
+	language	Abu	ado	22	ado
+	language	Abu' Arapesh	aah	23	aah
+	language	Abua	abn	24	abn
+	language	Abui	abz	25	abz
+	language	Abun	kgr	26	kgr
+	language	Abure	abu	27	abu
+	language	Abureni	mgj	28	mgj
+	language	AbÊ	aba	29	aba
+	language	Acatepec Me'phaa	tpx	30	tpx
+	language	Achagua	aca	31	aca
+	language	Achang	acn	32	acn
+	language	Ache	yif	33	yif guq AchÊ
+	language	Acheron	acz	34	acz
+	language	Achi	acr	35	acr
+	language	Achinese	ace	36	ace
+	language	Achterhoeks	act	37	act
+	language	Achuar-Shiwiar	acu	38	acu
+	language	Achumawi	acv	39	acv
+	language	Acoli	ach	41	ach
+	language	AcroÃĄ	acs	42	acs
+	language	Adai	xad	43	xad
+	language	Adamawa Fulfulde	fub	44	fub
+	language	Adamorobe Sign Language	ads	45	ads
+	language	Adang	adn	46	adn
+	language	Adangbe	adq	47	adq
+	language	Adangme	ada	48	ada
+	language	Adara	kad	49	kad
+	language	Adasen	tiu	50	tiu
+	language	Adele	ade	51	ade
+	language	Adhola	adh	52	adh
+	language	Adi	adi	53	adi
+	language	Adilabad Gondi	wsg	54	wsg
+	language	Adioukrou	adj	55	adj
+	language	Adithinngithigh	dth	56	dth
+	language	Adivasi Oriya	ort	57	ort
+	language	Adiwasi Garasia	gas	58	gas
+	language	Adnyamathanha	adt	59	adt
+	language	Adonara	adr	60	adr
+	language	Aduge	adu	61	adu
+	language	Adyghe	ady	62	ady
+	language	Adzera	adz	63	adz
+	language	Aeka	aez	64	aez
+	language	Aekyom	awi	65	awi
+	language	Aequian	xae	66	xae
+	language	Aer	aeq	67	aeq
+	language	Afade	aal	68	aal
+	language	Afar	aar	69	aar	aa
+	language	Afghan Sign Language	afg	70	afg
+	language	Afitti	aft	71	aft
+	language	Afrihili	afh	72	afh
+	language	Afrikaans	afr	73	afr	af
+	language	Afro-Seminole Creole	afs	74	afs
+	language	Agarabi	agd	75	agd
+	language	Agariya	agi	76	agi
+	language	Agatu	agc	77	agc
+	language	Agavotaguerra	avo	78	avo
+	language	Aghem	agq	79	agq
+	language	Aghu	ahh	80	ahh
+	language	Aghu-Tharnggala	gtu	81	gtu
+	language	Aghul	agx	82	agx
+	language	Aghwan	xag	83	xag
+	language	Agi	aif	84	aif
+	language	Agob	kit	85	kit
+	language	Agoi	ibm	86	ibm
+	language	Aguacateco	agu	87	agu
+	language	Aguano	aga	88	aga
+	language	Aguaruna	agr	89	agr
+	language	Aguna	aug	90	aug
+	language	Agusan Manobo	msm	91	msm
+	language	Agutaynen	agn	92	agn
+	language	Agwagwune	yay	93	yay
+	language	Ahanta	aha	94	aha
+	language	Aheri Gondi	esg	95	esg
+	language	Aheu	thm	96	thm
+	language	Ahirani	ahr	97	ahr
+	language	Ahom	aho	98	aho
+	language	Ahtena	aht	99	aht
+	language	Ahwai	nfd	100	nfd
+	language	Ai-Cham	aih	101	aih
+	language	Aighon	aix	102	aix
+	language	AikanÃŖ	tba	103	tba
+	language	Aiklep	mwg	104	mwg
+	language	Aimaq	aiq	105	aiq
+	language	Aimele	ail	106	ail
+	language	Aimol	aim	107	aim
+	language	Ainbai	aic	108	aic
+	language	Ainu (China)	aib	109	aib
+	language	Ainu (Japan)	ain	110	ain
+	language	Aiome	aki	111	aki
+	language	Airoran	air	112	air
+	language	Aiton	aio	113	aio
+	language	Aja (Benin)	ajg	114	ajg
+	language	Aja (South Sudan)	aja	115	aja
+	language	Ajawa	ajw	116	ajw
+	language	AjiÃĢ	aji	117	aji
+	language	Ajumbu	muc	118	muc
+	language	Ajyíninka Apurucayali	cpc	119	cpc
+	language	Ak	akq	120	akq
+	language	Aka	soh	121	soh
+	language	Aka-Bea	abj	122	abj
+	language	Aka-Bo	akm	123	akm
+	language	Aka-Cari	aci	124	aci
+	language	Aka-Jeru	akj	125	akj
+	language	Aka-Kede	akx	126	akx
+	language	Aka-Kol	aky	127	aky
+	language	Aka-Kora	ack	128	ack
+	language	Akan	aka	129	aka	ak
+	language	Akar-Bale	acl	130	acl
+	language	Akaselem	aks	131	aks
+	language	Akawaio	ake	132	ake
+	language	Ake	aik	133	aik
+	language	Akebu	keu	134	keu
+	language	Akei	tsr	135	tsr
+	language	Akeu	aeu	136	aeu
+	language	Akha	ahk	137	ahk
+	language	Akhvakh	akv	138	akv
+	language	Akkadian	akk	139	akk
+	language	Akkala Sami	sia	140	sia
+	language	Aklanon	akl	141	akl
+	language	Akolet	akt	142	akt
+	language	Akoose	bss	143	bss
+	language	Akoye	miw	144	miw
+	language	Akpa	akf	145	akf
+	language	Akpes	ibe	146	ibe
+	language	Akrukay	afi	147	afi
+	language	Akukem	spm	148	spm
+	language	Akuku	ayk	149	ayk
+	language	Akum	aku	150	aku
+	language	Akuntsu	aqz	151	aqz
+	language	Akurio	ako	152	ako
+	language	Akwa	akw	153	akw
+	language	Akyaung Ari Naga	nqy	154	nqy
+	language	Al-Sayyid Bedouin Sign Language	syy	155	syy
+	language	Alaba-K'abeena	alw	156	alw
+	language	Alabama	akz	157	akz
+	language	Alabat Island Agta	dul	158	dul
+	language	Alacatlatzala Mixtec	mim	159	mim
+	language	Alago	ala	160	ala
+	language	Alagwa	wbj	161	wbj
+	language	Alak	alk	162	alk
+	language	Alamblak	amp	163	amp
+	language	Alangan	alj	164	alj
+	language	Alanic	xln	165	xln
+	language	Alapmunte	apv	166	apv
+	language	Alawa	alh	167	alh
+	language	Albanian	sqi	168	sqi	alb	sq
+	language	Albanian Sign Language	sqk	169	sqk
+	language	Albarradas Sign Language	lsc	170	lsc
+	language	Alcozauca Mixtec	xta	171	xta
+	language	Alege	alf	172	alf
+	language	Alekano	gah	173	gah
+	language	Aleut	ale	174	ale
+	language	Algerian Arabic	arq	175	arq
+	language	Algerian Jewish Sign Language	ajs	176	ajs
+	language	Algerian Saharan Arabic	aao	177	aao
+	language	Algerian Sign Language	asp	178	asp
+	language	Algonquin	alq	179	alq
+	language	Ali	aiy	180	aiy
+	language	Alladian	ald	181	ald
+	language	Allar	all	182	all
+	language	Alngith	aid	183	aid
+	language	Alo Phola	ypo	184	ypo
+	language	Alor	aol	185	aol
+	language	AloÃĄpam Zapotec	zaq	186	zaq
+	language	Alsea	aes	187	aes
+	language	Alu Kurumba	xua	188	xua
+	language	Alugu	aub	189	aub
+	language	Alumu-Tesu	aab	190	aab
+	language	Alune	alp	191	alp
+	language	Aluo	yna	192	yna
+	language	Alur	alz	193	alz
+	language	Alutor	alr	194	alr
+	language	Alviri-Vidari	avd	195	avd
+	language	Alyawarr	aly	196	aly
+	language	Ama (Papua New Guinea)	amm	197	amm
+	language	Ama (Sudan)	nyi	198	nyi
+	language	Amahai	amq	199	amq
+	language	Amahuaca	amc	200	amc
+	language	Amaimon	ali	201	ali
+	language	Amal	aad	202	aad
+	language	Amami Koniya Sign Language	jks	203	jks
+	language	Amanab	amn	204	amn
+	language	AmanayÊ	ama	205	ama
+	language	Amara	aie	206	aie
+	language	Amarakaeri	amr	207	amr
+	language	Amarasi	aaz	208	aaz
+	language	AmatlÃĄn Zapotec	zpo	209	zpo
+	language	Amba (Solomon Islands)	utp	210	utp
+	language	Amba (Uganda)	rwm	211	rwm
+	language	Ambai	amk	212	amk
+	language	Ambakich	aew	213	aew
+	language	Ambala Ayta	abc	214	abc
+	language	Ambelau	amv	215	amv
+	language	Ambele	ael	216	ael
+	language	Amblong	alm	217	alm
+	language	Ambo	amb	218	amb
+	language	Ambo-Pasco Quechua	qva	219	qva
+	language	Ambonese Malay	abs	220	abs
+	language	Ambrak	aag	221	aag
+	language	Ambul	apo	222	apo
+	language	Ambulas	abt	223	abt
+	language	Amdang	amj	224	amj
+	language	Amdo Tibetan	adx	225	adx
+	language	Amele	aey	226	aey
+	language	American Sign Language	ase	227	ase
+	language	Amganad Ifugao	ifa	228	ifa
+	language	Amharic	amh	229	amh	am
+	language	Ami	amy	230	amy
+	language	Amis	ami	231	ami
+	language	Amo	amo	232	amo
+	language	Amol	alx	233	alx
+	language	Amoltepec Mixtec	mbz	234	mbz
+	language	Ampanang	apg	235	apg
+	language	Ampari Dogon	aqd	236	aqd
+	language	Amri Karbi	ajz	237	ajz
+	language	Amto	amt	238	amt
+	language	Amundava	adw	239	adw
+	language	Amurdak	amg	240	amg
+	language	Ana Tinga Dogon	dti	241	dti
+	language	Anaang	anw	242	anw
+	language	Anakalangu	akg	243	akg
+	language	Anal	anm	244	anm
+	language	Anam	pda	245	pda
+	language	AnambÊ	aan	246	aan
+	language	Anamgura	imi	247	imi
+	language	Anasi	bpo	248	bpo
+	language	Ancient Greek (to 1453)	grc	249	grc
+	language	Ancient Hebrew	hbo	250	hbo
+	language	Ancient Macedonian	xmk	251	xmk
+	language	Ancient North Arabian	xna	252	xna
+	language	Ancient Zapotec	xzp	253	xzp
+	language	Andaandi	dgl	254	dgl
+	language	Andai	afd	255	afd
+	language	Andajin	ajn	256	ajn
+	language	Andalusian Arabic	xaa	257	xaa
+	language	Andaman Creole Hindi	hca	258	hca
+	language	Andaqui	ana	259	ana
+	language	Andarum	aod	260	aod
+	language	Andegerebinha	adg	261	adg
+	language	Andh	anr	262	anr
+	language	Andi	ani	263	ani
+	language	Andio	bzb	264	bzb
+	language	Andoa	anb	265	anb
+	language	Andoque	ano	266	ano
+	language	Andra-Hus	anx	267	anx
+	language	Aneityum	aty	268	aty
+	language	Anem	anz	269	anz
+	language	Aneme Wake	aby	270	aby
+	language	Anfillo	myo	271	myo
+	language	Angaataha	agm	272	agm
+	language	AngaitÊ	aqt	273	aqt
+	language	Angal	age	274	age
+	language	Angal Enen	aoe	275	aoe
+	language	Angal Heneng	akh	276	akh
+	language	Angami Naga	njm	277	njm
+	language	Angguruk Yali	yli	278	yli
+	language	Angika	anp	279	anp
+	language	Angkamuthi	avm	280	avm
+	language	Anglo-Norman	xno	281	xno
+	language	Angloromani	rme	282	rme
+	language	Angolar	aoa	283	aoa
+	language	Angor	agg	284	agg
+	language	Angoram	aog	285	aog
+	language	Angosturas Tunebo	tnd	286	tnd
+	language	Anguthimri	awg	287	awg
+	language	Ani Phowa	ypn	288	ypn
+	language	Anii	blo	289	blo
+	language	Animere	anf	290	anf
+	language	Anindilyakwa	aoi	291	aoi
+	language	Aninka	aqk	292	aqk
+	language	Anjam	boj	293	boj
+	language	Ankave	aak	294	aak
+	language	Anmatyerre	amx	295	amx
+	language	Anong	nun	296	nun
+	language	Anor	anj	297	anj
+	language	Anserma	ans	298	ans
+	language	Ansus	and	299	and
+	language	Antakarinya	ant	300	ant
+	language	Antankarana Malagasy	xmv	301	xmv
+	language	Antigua and Barbuda Creole English	aig	302	aig
+	language	Anu-Hkongso Chin	anl	303	anl
+	language	Anuak	anu	304	anu
+	language	Anufo	cko	305	cko
+	language	Anuki	aui	306	aui
+	language	Anus	auq	307	auq
+	language	Anuta	aud	308	aud
+	language	Anyin	any	309	any
+	language	Anyin Morofo	mtb	310	mtb
+	language	Ao Naga	njo	311	njo
+	language	Aoheng	pni	312	pni
+	language	Aore	aor	313	aor
+	language	Ap Ma	kbx	314	kbx
+	language	Apalachee	xap	315	xap
+	language	Apalaí	apy	316	apy
+	language	Apali	ena	317	ena
+	language	Apasco-Apoala Mixtec	mip	318	mip
+	language	Apatani	apt	319	apt
+	language	ApiakÃĄ	api	320	api
+	language	ApinayÊ	apn	321	apn
+	language	Apma	app	322	app
+	language	Aproumu Aizi	ahp	323	ahp
+	language	ApurinÃŖ	apu	324	apu
+	language	Aputai	apx	325	apx
+	language	Aquitanian	xaq	326	xaq
+	language	Arabana	ard	327	ard
+	language	Arabela	arl	328	arl
+	language	Arabic	ara	329	ara	ar
+	language	Aragonese	arg	330	arg	an
+	language	Araki	akr	331	akr
+	language	Arakwal	rkw	332	rkw
+	language	Aralle-Tabulahan	atq	333	atq
+	language	Arammba	stk	334	stk
+	language	Aranadan	aaf	335	aaf
+	language	Aranama-Tamique	xrt	336	xrt
+	language	Arandai	jbj	337	jbj
+	language	Araona	aro	338	aro
+	language	Arapaho	arp	339	arp
+	language	Arapaso	arj	340	arj
+	language	ArarandewÃĄra	xaj	341	xaj
+	language	Arawak	arw	342	arw
+	language	ArawetÊ	awt	343	awt
+	language	Arawum	awm	344	awm
+	language	Arbore	arv	345	arv
+	language	ArbÃĢreshÃĢ Albanian	aae	346	aae
+	language	Archi	aqc	347	aqc
+	language	ArdhamāgadhÄĢ Prākrit	pka	348	pka
+	language	Are	mwc	349	mwc
+	language	Areba	aea	350	aea
+	language	Arem	aem	351	aem
+	language	Arequipa-La UniÃŗn Quechua	qxu	352	qxu
+	language	Argentine Sign Language	aed	353	aed
+	language	Argobba	agj	354	agj
+	language	Arguni	agf	355	agf
+	language	Arhuaco	arh	356	arh
+	language	ArhÃĸ	aqr	357	aqr
+	language	ArhÃļ	aok	358	aok
+	language	Ari	aac	359	aac
+	language	Aribwatsa	laz	360	laz
+	language	Aribwaung	ylu	361	ylu
+	language	Arifama-Miniafia	aai	362	aai
+	language	Arigidi	aqg	363	aqg
+	language	ArikapÃē	ark	364	ark
+	language	Arikara	ari	365	ari
+	language	Arikem	ait	366	ait
+	language	Arin	xrn	367	xrn
+	language	Aringa	luc	368	luc
+	language	Armazic	xrm	369	xrm
+	language	Armenian	hye	370	hye	hy	arm
+	language	Armenian Sign Language	aen	371	aen
+	language	Arop-Lokep	apr	372	apr
+	language	Arop-Sissano	aps	373	aps
+	language	Arosi	aia	374	aia
+	language	Arpitan	frp	375	frp
+	language	Arritinngithigh	rrt	376	rrt
+	language	Arta	atz	377	atz
+	language	Aruamu	msy	378	msy
+	language	Aruek	aur	379	aur
+	language	Aruop	lsr	380	lsr
+	language	Arutani	atx	381	atx
+	language	AruÃĄ (Amazonas State)	aru	382	aru
+	language	AruÃĄ (Rodonia State)	arx	383	arx
+	language	Arvanitika Albanian	aat	384	aat
+	language	As	asz	385	asz
+	language	Asaro'o	mtv	386	mtv
+	language	Ashe	ahs	387	ahs
+	language	Ashkun	ask	388	ask
+	language	Asho Chin	csh	389	csh
+	language	Ashtiani	atn	390	atn
+	language	AshÃĄninka	cni	391	cni
+	language	AshÊninka Pajonal	cjo	392	cjo
+	language	AshÊninka PerenÊ	prq	393	prq
+	language	Asilulu	asl	394	asl
+	language	Askopan	eiv	395	eiv
+	language	Asoa	asv	396	asv
+	language	Assamese	asm	397	asm	as
+	language	Assangori	sjg	398	sjg
+	language	Assiniboine	asb	399	asb
+	language	Assyrian Neo-Aramaic	aii	400	aii
+	language	Asturian	ast	401	ast
+	language	Asu (Nigeria)	aum	402	aum
+	language	Asu (Tanzania)	asa	403	asa
+	language	Asue Awyu	psa	404	psa
+	language	Asumboa	aua	405	aua
+	language	AsunciÃŗn Mixtepec Zapotec	zoo	406	zoo
+	language	Asuri	asr	407	asr
+	language	Ata	atm	408	atm
+	language	Ata Manobo	atd	409	atd
+	language	Atakapa	aqp	410	aqp
+	language	Atampaya	amz	411	amz
+	language	AtatlÃĄhuca Mixtec	mib	412	mib
+	language	Atauran	adb	413	adb
+	language	Atayal	tay	414	tay
+	language	Atemble	ate	415	ate
+	language	Athpariya	aph	416	aph
+	language	Ati	atk	417	atk
+	language	Atikamekw	atj	418	atj
+	language	Atohwaim	aqm	419	aqm
+	language	Atong (Cameroon)	ato	420	ato
+	language	Atong (India)	aot	421	aot
+	language	Atorada	aox	422	aox
+	language	Atsahuaca	atc	423	atc
+	language	Atsam	cch	424	cch
+	language	Atsugewi	atw	425	atw
+	language	Attapady Kurumba	pkr	426	pkr
+	language	AttiÊ	ati	427	ati
+	language	Atzingo Matlatzinca	ocu	428	ocu
+	language	Au	avt	429	avt
+	language	Aulua	aul	430	aul
+	language	AurÃĄ	aux	431	aux
+	language	Aushi	auh	432	auh
+	language	Aushiri	avs	433	avs
+	language	Auslan	asf	434	asf
+	language	Austral	aut	435	aut
+	language	Australian Aborigines Sign Language	asw	436	asw
+	language	Austrian Sign Language	asq	437	asq
+	language	Auwe	smf	438	smf
+	language	Auye	auu	439	auu
+	language	Auyokawa	auo	440	auo
+	language	Avaric	ava	441	ava	av
+	language	Avatime	avn	442	avn
+	language	Avau	avb	443	avb
+	language	Avestan	ave	444	ave	ae
+	language	Avikam	avi	445	avi
+	language	Avokaya	avu	446	avu
+	language	AvÃĄ-Canoeiro	avv	447	avv
+	language	Awa (China)	vwa	448	vwa
+	language	Awa (Papua New Guinea)	awb	449	awb
+	language	Awa-Cuaiquer	kwi	450	kwi
+	language	Awabakal	awk	451	awk
+	language	Awad Bing	bcu	452	bcu
+	language	Awadhi	awa	453	awa
+	language	Awak	awo	454	awo
+	language	Awar	aya	455	aya
+	language	Awara	awx	456	awx
+	language	Awbono	awh	457	awh
+	language	Aweer	bob	458	bob
+	language	Awera	awr	459	awr
+	language	Awetí	awe	460	awe
+	language	Awing	azo	461	azo
+	language	Awiyaana	auy	462	auy
+	language	Awjilah	auj	463	auj
+	language	Awngi	awn	464	awn
+	language	Awngthim	gwm	465	gwm
+	language	Awtuw	kmn	466	kmn
+	language	Awu	yiu	467	yiu
+	language	Awun	aww	468	aww
+	language	Awutu	afu	469	afu
+	language	Awyi	auw	470	auw
+	language	Axamb	ahb	471	ahb
+	language	Axi Yi	yix	472	yix
+	language	Ayabadhu	ayd	473	ayd
+	language	Ayacucho Quechua	quy	474	quy
+	language	Ayautla Mazatec	vmy	475	vmy
+	language	Ayere	aye	476	aye
+	language	Ayerrerenge	axe	477	axe
+	language	Ayi (Papua New Guinea)	ayq	478	ayq
+	language	Ayiwo	nfl	479	nfl
+	language	Ayizi	yyz	480	yyz
+	language	Ayizo Gbe	ayb	481	ayb
+	language	Aymara	aym	482	aym	ay
+	language	Ayoquesco Zapotec	zaf	483	zaf
+	language	Ayoreo	ayo	484	ayo
+	language	Ayu	ayu	485	ayu
+	language	Ayutla Mixtec	miy	486	miy
+	language	Azerbaijani	aze	487	aze	az
+	language	Azha	aza	488	aza
+	language	Azhe	yiz	489	yiz
+	language	AzoyÃē Me'phaa	tpc	490	tpc
+	language	Baan	bvj	491	bvj
+	language	Baangi	bqx	492	bqx
+	language	Baatonum	bba	493	bba
+	language	Baba	bbw	494	bbw
+	language	Baba Malay	mbf	495	mbf
+	language	Babango	bbm	496	bbm
+	language	Babanki	bbk	497	bbk
+	language	Babatana	baa	498	baa
+	language	Babine	bcr	499	bcr
+	language	Babuza	bzg	500	bzg
+	language	Bacama	bcy	501	bcy
+	language	Bacanese Malay	btj	502	btj
+	language	Bactrian	xbc	503	xbc
+	language	Bada (Indonesia)	bhz	504	bhz
+	language	Bada (Nigeria)	bau	505	bau
+	language	Badaga	bfq	506	bfq
+	language	Bade	bde	507	bde
+	language	Badeshi	bdz	508	bdz
+	language	Badimaya	bia	509	bia
+	language	Badjiri	jbi	510	jbi
+	language	Badui	bac	511	bac
+	language	Badyara	pbp	512	pbp
+	language	Baeggu	bvd	513	bvd
+	language	Baelelea	bvc	514	bvc
+	language	Baetora	btr	515	btr
+	language	Bafanji	bfj	516	bfj
+	language	Bafaw-Balong	bwt	517	bwt
+	language	Bafia	ksf	518	ksf
+	language	Bafut	bfd	519	bfd
+	language	Baga Kaloum	bqf	520	bqf
+	language	Baga Koga	bgo	521	bgo
+	language	Baga Manduri	bmd	522	bmd
+	language	Baga Pokur	bcg	523	bcg
+	language	Baga Sitemu	bsp	524	bsp
+	language	Baga SobanÊ	bsv	525	bsv
+	language	Bagheli	bfy	526	bfy
+	language	Bagirmi	bmi	527	bmi
+	language	Bagirmi Fulfulde	fui	528	fui
+	language	Bago-Kusuntu	bqg	529	bqg
+	language	Bagri	bgq	530	bgq
+	language	Bagupi	bpi	531	bpi
+	language	Bagusa	bqb	532	bqb
+	language	Bagvalal	kva	533	kva
+	language	Baha Buyang	yha	534	yha
+	language	Baham	bdw	535	bdw
+	language	Bahamas Creole English	bah	536	bah
+	language	Baharna Arabic	abv	537	abv
+	language	Bahau	bhv	538	bhv
+	language	Bahinemo	bjh	539	bjh
+	language	Bahing	bhj	540	bhj
+	language	Bahnar	bdq	541	bdq
+	language	Bahonsuai	bsu	542	bsu
+	language	Bai (South Sudan)	bdj	543	bdj
+	language	Baibai	bbf	544	bbf
+	language	Baikeno	bkx	545	bkx
+	language	Baima	bqh	546	bqh
+	language	Baimak	bmx	547	bmx
+	language	Bainouk-Gunyaamolo	bcz	548	bcz
+	language	Bainouk-GunyuÃąo	bab	549	bab
+	language	Bainouk-Samik	bcb	550	bcb
+	language	Baiso	bsw	551	bsw
+	language	Baissa Fali	fah	552	fah
+	language	Bajan	bjs	553	bjs
+	language	Bajelani	bjm	554	bjm
+	language	Bajjika	vjk	555	vjk
+	language	Baka (Cameroon)	bkc	556	bkc
+	language	Baka (South Sudan)	bdh	557	bdh
+	language	Bakairí	bkq	558	bkq
+	language	Bakaka	bqz	559	bqz
+	language	Bakhtiari	bqi	560	bqi
+	language	Baki	bki	561	bki
+	language	Bakoko	bkh	562	bkh
+	language	Bakole	kme	563	kme
+	language	Bakpinka	bbs	564	bbs
+	language	Bakumpai	bkr	565	bkr
+	language	BakwÊ	bjw	566	bjw
+	language	Balaesang	bls	567	bls
+	language	Balaibalan	zba	568	zba
+	language	Balangao	blw	569	blw
+	language	Balangingi	sse	570	sse
+	language	Balanta-Ganja	bjt	571	bjt
+	language	Balanta-Kentohe	ble	572	ble
+	language	Balantak	blz	573	blz
+	language	Baldemu	bdn	574	bdn
+	language	Bali (Democratic Republic of Congo)	bcp	575	bcp
+	language	Bali (Nigeria)	bcn	576	bcn
+	language	Balinese	ban	577	ban
+	language	Balinese Malay	mhp	578	mhp
+	language	Balkan Gagauz Turkish	bgx	579	bgx
+	language	Balkan Romani	rmn	580	rmn
+	language	Balo	bqo	581	bqo
+	language	Baloi	biz	582	biz
+	language	Balti	bft	583	bft
+	language	Baltic Romani	rml	584	rml
+	language	Baluan-Pam	blq	585	blq
+	language	Baluchi	bal	586	bal
+	language	Bamako Sign Language	bog	587	bog
+	language	Bamali	bbq	588	bbq
+	language	Bambalang	bmo	589	bmo
+	language	Bambam	ptu	590	ptu
+	language	Bambara	bam	591	bam	bm
+	language	Bambassi	myf	592	myf
+	language	Bambili-Bambui	baw	593	baw
+	language	Bamenyam	bce	594	bce
+	language	Bamu	bcf	595	bcf
+	language	Bamukumbit	bqt	596	bqt
+	language	Bamun	bax	597	bax
+	language	Bamunka	bvm	598	bvm
+	language	Bamwe	bmg	599	bmg
+	language	Ban Khor Sign Language	bfk	600	bfk
+	language	Bana	bcw	601	bcw
+	language	Banao Itneg	bjx	602	bjx
+	language	Banaro	byz	603	byz
+	language	Banda (Indonesia)	bnd	604	bnd
+	language	Banda Malay	bpq	605	bpq
+	language	Banda-Bambari	liy	606	liy
+	language	Banda-Banda	bpd	607	bpd
+	language	Banda-Mbrès	bqk	608	bqk
+	language	Banda-NdÊlÊ	bfl	609	bfl
+	language	Banda-Yangere	yaj	610	yaj
+	language	Bandi	bza	611	bza
+	language	Bandial	bqj	612	bqj
+	language	Bandjalang	bdy	613	bdy
+	language	Bangala	bxg	614	bxg
+	language	Bangandu	bgf	615	bgf
+	language	Bangba	bbe	616	bbe
+	language	Banggai	bgz	617	bgz
+	language	Banggarla	bjb	618	bjb
+	language	Bangi	bni	619	bni
+	language	Bangime	dba	620	dba
+	language	Bangka	mfb	621	mfb
+	language	Bangolan	bgj	622	bgj
+	language	Bangubangu	bnx	623	bnx
+	language	Bangwinji	bsj	624	bsj
+	language	Baniva	bvv	625	bvv
+	language	Baniwa	bwi	626	bwi
+	language	Banjar	bjn	627	bjn
+	language	Bankagooma	bxw	628	bxw
+	language	Bankal	jjr	629	jjr
+	language	Bankan Tey Dogon	dbw	630	dbw
+	language	Bankon	abb	631	abb
+	language	Bannoni	bcm	632	bcm
+	language	Bantawa	bap	633	bap
+	language	Bantayanon	bfx	634	bfx
+	language	Bantik	bnq	635	bnq
+	language	Bantoanon	bno	636	bno
+	language	Banyjima	pnw	637	pnw
+	language	BaoulÊ	bci	638	bci
+	language	Bara Malagasy	bhr	639	bhr
+	language	Baraamu	brd	640	brd
+	language	Barababaraba	rbp	641	rbp
+	language	Barai	bbb	642	bbb
+	language	Barakai	baj	643	baj
+	language	Baram Kayan	kys	644	kys
+	language	Barama	bbg	645	bbg
+	language	Barambu	brm	646	brm
+	language	Baramu	bmz	647	bmz
+	language	Barapasi	brp	648	brp
+	language	Baras	brs	649	brs
+	language	Barasana-Eduria	bsn	650	bsn
+	language	Barbaram	vmb	651	vmb
+	language	BarbareÃąo	boi	652	boi
+	language	Barclayville Grebo	gry	653	gry
+	language	Bardi	bcj	654	bcj
+	language	Barein	bva	655	bva
+	language	Bargam	mlp	656	mlp
+	language	Bari	bfa	657	bfa mot Barí
+	language	Bariai	bch	658	bch
+	language	Bariji	bjc	659	bjc
+	language	Barikanchi	bxo	660	bxo
+	language	Barikewa	jbk	661	jbk
+	language	Barok	bjk	662	bjk
+	language	Barombi	bbi	663	bbi
+	language	Barro Negro Tunebo	tbn	664	tbn
+	language	Barrow Point	bpt	665	bpt
+	language	Baruga	bjz	666	bjz
+	language	Baruya	byr	667	byr
+	language	Barwe	bwg	668	bwg
+	language	Barzani Jewish Neo-Aramaic	bjf	669	bjf
+	language	BarÊ	bae	670	bae
+	language	Basa (Cameroon)	bas	672	bas
+	language	Basa (Nigeria)	bzw	673	bzw
+	language	Basa-Gumna	bsl	674	bsl
+	language	Basa-Gurmana	buj	675	buj
+	language	Basap	bdb	676	bdb
+	language	Basay	byq	677	byq
+	language	Bashkardi	bsg	678	bsg
+	language	Bashkir	bak	679	bak	ba
+	language	Basketo	bst	680	bst
+	language	Basque	eus	681	eus	eu	baq
+	language	Bassa	bsq	682	bsq
+	language	Bassa-Kontagora	bsr	683	bsr
+	language	Bassari	bsc	684	bsc
+	language	Bassossi	bsi	685	bsi
+	language	Bata	bta	686	bta
+	language	Batad Ifugao	ifb	687	ifb
+	language	Batak	bya	688	bya
+	language	Batak Alas-Kluet	btz	689	btz
+	language	Batak Angkola	akb	690	akb
+	language	Batak Dairi	btd	691	btd
+	language	Batak Karo	btx	692	btx
+	language	Batak Mandailing	btm	693	btm
+	language	Batak Simalungun	bts	694	bts
+	language	Batak Toba	bbc	695	bbc
+	language	Batanga	bnm	696	bnm
+	language	Batek	btq	697	btq
+	language	Bateri	btv	698	btv
+	language	Bathari	bhm	699	bhm
+	language	Bati (Cameroon)	btc	700	btc
+	language	Bati (Indonesia)	bvt	701	bvt
+	language	Batjala	xby	702	xby
+	language	Bats	bbl	703	bbl
+	language	Batu	btu	704	btu
+	language	Batui	zbt	705	zbt
+	language	Batuley	bay	706	bay
+	language	Bau	bbd	707	bbd
+	language	Bau Bidayuh	sne	708	sne
+	language	Bauchi	bsf	709	bsf
+	language	Bauni	bpe	710	bpe
+	language	Baure	brg	711	brg
+	language	Bauria	bge	712	bge
+	language	Bauwaki	bwk	713	bwk
+	language	Bauzi	bvz	714	bvz
+	language	Bavarian	bar	715	bar
+	language	Bawm Chin	bgr	716	bgr
+	language	Bay Miwok	mkq	717	mkq
+	language	Bayali	bjy	718	bjy
+	language	Baybayanon	bvy	719	bvy
+	language	Baygo	byg	720	byg
+	language	Bayono	byl	721	byl
+	language	Bayot	bda	722	bda
+	language	Bayungu	bxj	723	bxj
+	language	Bazigar	bfr	724	bfr
+	language	Beami	beo	725	beo
+	language	Beaver	bea	726	bea
+	language	Beba	bfp	727	bfp
+	language	Bebele	beb	728	beb
+	language	Bebeli	bek	729	bek
+	language	Bebil	bxp	730	bxp
+	language	Bedjond	bjv	731	bjv
+	language	Bedoanas	bed	732	bed
+	language	Beeke	bkf	733	bkf
+	language	Beele	bxq	734	bxq
+	language	Beembe	beq	735	beq
+	language	Beezen	bnz	736	bnz
+	language	Befang	bby	737	bby
+	language	Beginci	ebc	738	ebc
+	language	Beja	bej	739	bej
+	language	Bekati'	bei	740	bei
+	language	Bekwarra	bkv	741	bkv
+	language	Bekwel	bkw	742	bkw
+	language	Belait	beg	743	beg
+	language	Belanda Bor	bxb	744	bxb
+	language	Belanda Viri	bvi	745	bvi
+	language	Belarusian	bel	746	bel	be
+	language	Belhariya	byw	747	byw
+	language	Beli (Papua New Guinea)	bey	748	bey
+	language	Beli (South Sudan)	blm	749	blm
+	language	Belize Kriol English	bzj	750	bzj
+	language	Bella Coola	blc	751	blc
+	language	Bellari	brw	752	brw
+	language	Belning	glb	753	glb
+	language	Bemba (Zambia)	bem	754	bem
+	language	Bembe	bmb	755	bmb
+	language	Ben Tey Dogon	dbt	756	dbt
+	language	Bena (Nigeria)	yun	757	yun
+	language	Bena (Tanzania)	bez	758	bez
+	language	Benabena	bef	759	bef
+	language	Benamanga	egm	760	egm
+	language	Bench	bcq	761	bcq
+	language	Bende	bdp	762	bdp
+	language	Bendi	bct	763	bct
+	language	Beng	nhb	764	nhb
+	language	Benga	bng	765	bng
+	language	Bengali, Bangla	ben	766	ben	Bengali	Bangla	bn
+	language	Benggoi	bgy	767	bgy
+	language	Bengkala Sign Language	bqy	768	bqy
+	language	Bentong	bnu	769	bnu
+	language	Benyadu'	byd	770	byd
+	language	Beothuk	bue	771	bue
+	language	Bepour	bie	772	bie
+	language	Berakou	bxv	773	bxv
+	language	Berau Malay	bve	774	bve
+	language	Berbice Creole Dutch	brc	775	brc
+	language	Berik	bkl	776	bkl
+	language	Berinomo	bit	777	bit
+	language	Berom	bom	778	bom
+	language	Berta	wti	779	wti
+	language	Berti	byt	780	byt
+	language	Besisi	mhe	781	mhe
+	language	Besme	bes	782	bes
+	language	Besoa	bep	783	bep
+	language	Betaf	bfe	784	bfe
+	language	Betawi	bew	785	bew
+	language	Bete	byf	786	byf
+	language	Bete-Bendi	btt	787	btt
+	language	Beti (Côte d'Ivoire)	eot	788	eot
+	language	Betta Kurumba	xub	789	xub
+	language	Bezhta	kap	790	kap
+	language	Bhadrawahi	bhd	791	bhd
+	language	Bhalay	bhx	792	bhx
+	language	Bharia	bha	793	bha
+	language	Bhatri	bgw	794	bgw
+	language	Bhattiyali	bht	795	bht
+	language	Bhaya	bhe	796	bhe
+	language	Bhele	bhy	797	bhy
+	language	Bhilali	bhi	798	bhi
+	language	Bhili	bhb	799	bhb
+	language	Bhojpuri	bho	800	bho
+	language	Bhoti Kinnauri	nes	801	nes
+	language	Bhujel	byh	802	byh
+	language	Bhunjia	bhu	803	bhu
+	language	Biafada	bif	804	bif
+	language	Biage	bdf	805	bdf
+	language	Biak	bhw	806	bhw
+	language	Biali	beh	807	beh
+	language	Bian Marind	bpv	808	bpv
+	language	Biangai	big	809	big
+	language	Biao	byk	810	byk
+	language	Biao Mon	bmt	811	bmt
+	language	Biao-Jiao Mien	bje	812	bje
+	language	Biatah Bidayuh	bth	813	bth
+	language	Bibbulman	xbp	814	xbp
+	language	Bidhawal	ihw	815	ihw
+	language	Bidiyo	bid	816	bid
+	language	Bidjara	bym	817	bym
+	language	Bidyogo	bjg	818	bjg
+	language	Biem	bmc	819	bmc
+	language	Bierebo	bnk	820	bnk
+	language	Bieria	brj	821	brj
+	language	Biete	biu	822	biu
+	language	Big Nambas	nmb	823	nmb
+	language	Biga	bhc	824	bhc
+	language	Bigambal	xbe	825	xbe
+	language	Bih	ibh	826	ibh
+	language	Bihari	bih	827	bih	bh
+	language	Bijim	jbm	828	jbm
+	language	Bijori	bix	829	bix
+	language	Bikol	bik	830	bik
+	language	Bikya	byb	831	byb
+	language	Bila	bip	832	bip
+	language	Bilakura	bql	833	bql
+	language	Bilaspuri	kfs	834	kfs
+	language	Bilba	bpz	835	bpz
+	language	Bilbil	brz	836	brz
+	language	Bile	bil	837	bil
+	language	Bilin	byn	838	byn
+	language	Bilma Kanuri	bms	839	bms
+	language	Biloxi	bll	840	bll
+	language	Bilua	blb	841	blb
+	language	Bilur	bxf	842	bxf
+	language	Bima	bhp	843	bhp
+	language	Bimin	bhl	844	bhl
+	language	Bimoba	bim	845	bim
+	language	Bina (Nigeria)	byj	846	byj
+	language	Bina (Papua New Guinea)	bmn	847	bmn
+	language	Binahari	bxz	848	bxz
+	language	Binandere	bhg	849	bhg
+	language	Bindal	xbd	850	xbd
+	language	Bine	bon	851	bon
+	language	Bini	bin	852	bin
+	language	Binji	bpj	853	bpj
+	language	Binongan Itneg	itb	854	itb
+	language	Bintauna	bne	855	bne
+	language	Bintulu	bny	856	bny
+	language	Binukid	bkd	857	bkd
+	language	Binumarien	bjr	858	bjr
+	language	Bipi	biq	859	biq
+	language	Bira	brf	860	brf
+	language	Birale	bxe	861	bxe
+	language	Birao	brr	862	brr
+	language	Birgit	btf	863	btf
+	language	Birhor	biy	864	biy
+	language	Biri	bzr	865	bzr
+	language	Biritai	bqq	866	bqq
+	language	Birked	brk	867	brk
+	language	Birri	bvq	868	bvq
+	language	Birrpayi	xbj	869	xbj
+	language	Birwa	brl	870	brl
+	language	Biseni	ije	871	ije
+	language	Bishnupriya	bpy	872	bpy
+	language	Bishuo	bwh	873	bwh
+	language	Bisis	bnw	874	bnw
+	language	Bislama	bis	875	bis	bi
+	language	Bisorio	bir	876	bir
+	language	Bissa	bib	877	bib
+	language	Bisu	bzi	878	bzi
+	language	Bit	bgk	879	bgk
+	language	Bitare	brt	880	brt
+	language	Bitur	mcc	881	mcc
+	language	Biwat	bwm	882	bwm
+	language	Biyo	byo	883	byo
+	language	Biyom	bpm	884	bpm
+	language	Blablanga	blp	885	blp
+	language	Blafe	bfh	886	bfh
+	language	Blagar	beu	887	beu
+	language	Blang	blr	888	blr
+	language	Blissymbols	zbl	889	zbl
+	language	Bo (Laos)	bgl	890	bgl
+	language	Bo (Papua New Guinea)	bpw	891	bpw
+	language	Bo-Rukul	mae	892	mae
+	language	Bo-Ung	mux	893	mux
+	language	Boano (Maluku)	bzn	894	bzn
+	language	Boano (Sulawesi)	bzl	895	bzl
+	language	Bobongko	bgb	896	bgb
+	language	Bobot	bty	897	bty
+	language	Bodo (Central African Republic)	boy	898	boy
+	language	Bodo (India)	brx	899	brx
+	language	Bodo Gadaba	gbj	900	gbj
+	language	Bodo Parja	bdv	901	bdv
+	language	Bofi	bff	902	bff
+	language	Boga	bvw	903	bvw
+	language	Bogaya	boq	904	boq
+	language	Boghom	bux	905	bux
+	language	Boguru	bqu	906	bqu
+	language	Bohtan Neo-Aramaic	bhn	907	bhn
+	language	Boikin	bzf	908	bzf
+	language	Bokha	ybk	909	ybk
+	language	Boko (Benin)	bqc	910	bqc
+	language	Boko (Democratic Republic of Congo)	bkp	911	bkp
+	language	Bokobaru	bus	912	bus
+	language	Bokoto	bdt	913	bdt
+	language	Bokyi	bky	914	bky
+	language	Bola	bnp	915	bnp
+	language	Bolango	bld	916	bld
+	language	Bole	bol	917	bol
+	language	Bolgarian	xbo	918	xbo
+	language	Bolgo	bvo	919	bvo
+	language	Bolia	bli	920	bli
+	language	Bolinao	smk	921	smk
+	language	Bolivian Sign Language	bvl	922	bvl
+	language	Boloki	bkt	923	bkt
+	language	Bolon	bof	924	bof
+	language	Bolondo	bzm	925	bzm
+	language	Bolongan	blj	926	blj
+	language	Bolyu	ply	927	ply
+	language	Bom-Kim	bmf	928	bmf
+	language	Boma	boh	929	boh
+	language	Bomboli	bml	930	bml
+	language	Bomboma	bws	931	bws
+	language	Bomitaba	zmx	932	zmx
+	language	Bomu	bmq	933	bmq
+	language	Bomwali	bmw	934	bmw
+	language	Bon Gula	glc	935	glc
+	language	Bonan	peh	936	peh
+	language	Bondei	bou	937	bou
+	language	Bondo	bfw	938	bfw
+	language	Bondoukou Kulango	kzc	939	kzc
+	language	Bondum Dom Dogon	dbu	940	dbu
+	language	Bonerate	bna	941	bna
+	language	Bonerif	bnv	942	bnv
+	language	Bonggi	bdg	943	bdg
+	language	Bonggo	bpg	944	bpg
+	language	Bongili	bui	945	bui
+	language	Bongo	bot	946	bot
+	language	Bongu	bpu	947	bpu
+	language	Bonjo	bok	948	bok
+	language	Bonkeng	bvg	949	bvg
+	language	Bonkiman	bop	950	bop
+	language	Bontok	bnc	951	bnc
+	language	Bookan	bnb	952	bnb
+	language	Boon	bnl	953	bnl
+	language	Boor	bvf	954	bvf
+	language	Bora	boa	955	boa
+	language	Borana-Arsi-Guji Oromo	gax	956	gax
+	language	Border Kuna	kvn	957	kvn
+	language	Borei	gai	958	gai
+	language	Borgu Fulfulde	fue	959	fue
+	language	Boro (Ethiopia)	bwo	960	bwo
+	language	Boro (Ghana)	xxb	961	xxb
+	language	Borong	ksr	962	ksr
+	language	Boruca	brn	963	brn
+	language	Borôro	bor	964	bor
+	language	Boselewa	bwf	965	bwf
+	language	Bosngun	bqs	966	bqs
+	language	Bosnian	bos	967	bos	bs
+	language	Bote-Majhi	bmj	968	bmj
+	language	Botlikh	bph	969	bph
+	language	Botolan Sambal	sbl	970	sbl
+	language	Bouna Kulango	nku	971	nku
+	language	Bouni	suo	972	suo
+	language	Bouyei	pcc	973	pcc
+	language	Bozaba	bzo	974	bzo
+	language	Bragat	aof	975	aof
+	language	Brahui	brh	976	brh
+	language	Braj	bra	977	bra
+	language	Brao	brb	978	brb
+	language	Brazilian Sign Language	bzs	979	bzs
+	language	Brem	buq	980	buq
+	language	Breri	brq	981	brq
+	language	Breton	bre	982	bre	br
+	language	Bribri	bzd	983	bzd
+	language	Bribri Sign Language	rib	984	rib
+	language	Brithenig	bzt	985	bzt
+	language	British Sign Language	bfi	986	bfi
+	language	Brokkat	bro	987	bro
+	language	Brokpake	sgt	988	sgt
+	language	Brokskat	bkk	989	bkk
+	language	Brooke's Point Palawano	plw	990	plw
+	language	Broome Pearling Lugger Pidgin	bpl	991	bpl
+	language	Brunca Sign Language	rnb	992	rnb
+	language	Brunei	kxd	993	kxd
+	language	Brunei Bisaya	bsb	994	bsb
+	language	Bruny Island Tasmanian	xpz	995	xpz
+	language	Bu (Bauchi State)	zbu	996	zbu
+	language	Bu (Kaduna State)	jid	997	jid
+	language	Bu-Nao Bunu	bwx	998	bwx
+	language	Bua	bub	999	bub
+	language	Bualkhaw Chin	cbl	1000	cbl
+	language	Buamu	box	1001	box
+	language	Bube	bvb	1002	bvb
+	language	Bubi	buw	1003	buw
+	language	Bubia	bbx	1004	bbx
+	language	Budeh Stieng	stt	1005	stt
+	language	Budibud	btp	1006	btp
+	language	Budong-Budong	bdx	1007	bdx
+	language	Budu	buu	1008	buu
+	language	Budukh	bdk	1009	bdk
+	language	Buduma	bdm	1010	bdm
+	language	Budza	bja	1011	bja
+	language	Bugan	bbh	1012	bbh
+	language	Bugawac	buk	1013	buk
+	language	Bughotu	bgt	1014	bgt
+	language	Buginese	bug	1015	bug
+	language	Buglere	sab	1016	sab
+	language	Bugun	bgg	1017	bgg
+	language	Buhi'non Bikol	ubl	1018	ubl
+	language	Buhid	bku	1019	bku
+	language	Buhutu	bxh	1020	bxh
+	language	Bukar-Sadung Bidayuh	sdo	1021	sdo
+	language	Bukat	bvk	1022	bvk
+	language	Bukharic	bhh	1023	bhh
+	language	Bukit Malay	bvu	1024	bvu
+	language	Bukitan	bkn	1025	bkn
+	language	Bukiyip	ape	1026	ape
+	language	Buksa	tkb	1027	tkb
+	language	Bukusu	bxk	1028	bxk
+	language	Bukwen	buz	1029	buz
+	language	Bulgarian	bul	1030	bul	bg
+	language	Bulgarian Sign Language	bqn	1031	bqn
+	language	Bulgebi	bmp	1032	bmp
+	language	Buli	uly	1033	uly
+	language	Buli (Ghana)	bwu	1034	bwu
+	language	Buli (Indonesia)	bzq	1035	bzq
+	language	Bullom So	buy	1036	buy
+	language	Bulo Stieng	sti	1037	sti
+	language	Bulu (Cameroon)	bum	1038	bum
+	language	Bulu (Papua New Guinea)	bjl	1039	bjl
+	language	Bum	bmv	1040	bmv
+	language	Bumaji	byp	1041	byp
+	language	Bumang	bvp	1042	bvp
+	language	Bumbita Arapesh	aon	1043	aon
+	language	Bumthangkha	kjz	1044	kjz
+	language	Bun	buv	1045	buv
+	language	Buna	bvn	1046	bvn
+	language	Bunak	bfn	1047	bfn
+	language	Bunama	bdd	1048	bdd
+	language	Bundeli	bns	1049	bns
+	language	Bung	bqd	1050	bqd
+	language	Bungain	but	1051	but
+	language	Bunganditj	xbg	1052	xbg
+	language	Bungku	bkz	1053	bkz
+	language	Bungu	wun	1054	wun
+	language	Bunoge Dogon	dgb	1055	dgb
+	language	Bunuba	bck	1056	bck
+	language	Bunun	bnn	1057	bnn
+	language	Buol	blf	1058	blf
+	language	Bura-Pabir	bwr	1059	bwr
+	language	Burak	bys	1060	bys
+	language	Buraka	bkg	1061	bkg
+	language	Burarra	bvr	1062	bvr
+	language	Burate	bti	1063	bti
+	language	Burduna	bxn	1064	bxn
+	language	Bure	bvh	1065	bvh
+	language	Buriat	bua	1066	bua
+	language	Burji	bji	1067	bji
+	language	Burmbar	vrt	1068	vrt
+	language	Burmese	mya	1069	mya	my	bur
+	language	Burmeso	bzu	1070	bzu
+	language	Buru (Indonesia)	mhs	1071	mhs
+	language	Buru (Nigeria)	bqw	1072	bqw
+	language	Burui	bry	1073	bry
+	language	Burumakok	aip	1074	aip
+	language	Burun	bdi	1075	bdi
+	language	Burundian Sign Language	lsb	1076	lsb
+	language	Burunge	bds	1077	bds
+	language	Burushaski	bsk	1078	bsk
+	language	Burusu	bqr	1079	bqr
+	language	Buruwai	asi	1080	asi
+	language	Busa	bqp	1081	bqp
+	language	Busam	bxs	1082	bxs
+	language	Busami	bsm	1083	bsm
+	language	Busang Kayan	bfg	1084	bfg
+	language	Bushi	buc	1085	buc
+	language	Bushoong	buf	1086	buf
+	language	Buso	bso	1087	bso
+	language	Busoa	bup	1088	bup
+	language	Bussa	dox	1089	dox
+	language	Busuu	bju	1090	bju
+	language	Butbut Kalinga	kyb	1091	kyb
+	language	Butmas-Tur	bnr	1092	bnr
+	language	Butuanon	btw	1093	btw
+	language	Buwal	bhs	1094	bhs
+	language	Buyu	byi	1095	byi
+	language	Buyuan Jinuo	jiy	1096	jiy
+	language	Bwa	bww	1097	bww
+	language	Bwaidoka	bwd	1098	bwd
+	language	Bwanabwana	tte	1099	tte
+	language	Bwatoo	bwa	1100	bwa
+	language	Bwe Karen	bwe	1101	bwe
+	language	Bwela	bwl	1102	bwl
+	language	Bwile	bwc	1103	bwc
+	language	Bwisi	bwz	1104	bwz
+	language	Byangsi	bee	1105	bee
+	language	Byep	mkk	1106	mkk
+	language	Bädi Kanum	khd	1107	khd
+	language	C'Lela	dri	1108	dri
+	language	Caac	msq	1109	msq
+	language	Cabiyarí	cbb	1110	cbb
+	language	CabÊcar	cjp	1111	cjp
+	language	Cacaloxtepec Mixtec	miu	1112	miu
+	language	Cacaopera	ccr	1113	ccr
+	language	Cacgia Roglai	roc	1114	roc
+	language	Cacua	cbv	1115	cbv
+	language	Caddo	cad	1116	cad
+	language	Cafundo Creole	ccd	1117	ccd
+	language	Cahuarano	cah	1118	cah
+	language	Cahuilla	chl	1119	chl
+	language	Cajamarca Quechua	qvc	1120	qvc
+	language	Cajatambo North Lima Quechua	qvl	1121	qvl
+	language	Cajonos Zapotec	zad	1122	zad
+	language	Cajun French	frc	1123	frc
+	language	Caka	ckx	1124	ckx
+	language	Cakchiquel-QuichÊ Mixed Language	ckz	1125	ckz
+	language	Cakfem-Mushere	cky	1126	cky
+	language	Calamian Tagbanwa	tbk	1127	tbk
+	language	CalderÃŗn Highland Quichua	qud	1128	qud
+	language	Callawalla	caw	1129	caw
+	language	Caluyanun	clu	1130	clu
+	language	CalÃŗ	rmq	1131	rmq
+	language	Cambodian Sign Language	csx	1132	csx
+	language	Cameroon Mambila	mcu	1133	mcu
+	language	Cameroon Pidgin	wes	1134	wes
+	language	Camling	rab	1135	rab
+	language	Campalagian	cml	1136	cml
+	language	Campidanese Sardinian	sro	1137	sro
+	language	CamsÃĄ	kbh	1138	kbh
+	language	Camtho	cmt	1139	cmt
+	language	Camunic	xcc	1140	xcc
+	language	Candoshi-Shapra	cbu	1141	cbu
+	language	Canela	ram	1142	ram
+	language	Canichana	caz	1143	caz
+	language	Cao Lan	mlc	1144	mlc
+	language	Cao Miao	cov	1145	cov
+	language	Capanahua	kaq	1146	kaq
+	language	Capiznon	cps	1147	cps
+	language	Cappadocian Greek	cpg	1148	cpg
+	language	Caquinte	cot	1149	cot
+	language	Car Nicobarese	caq	1150	caq
+	language	Cara	cfd	1151	cfd
+	language	Carabayo	cby	1152	cby
+	language	Caramanta	crf	1153	crf
+	language	Carapana	cbc	1154	cbc
+	language	Carian	xcr	1155	xcr
+	language	Caribbean Hindustani	hns	1156	hns
+	language	Caribbean Javanese	jvn	1157	jvn
+	language	Carijona	cbd	1158	cbd
+	language	Carolina Algonquian	crr	1159	crr
+	language	Carolinian	cal	1160	cal
+	language	Carpathian Romani	rmc	1161	rmc
+	language	Carrier	crx	1162	crx
+	language	Cashibo-Cacataibo	cbr	1163	cbr
+	language	Cashinahua	cbs	1164	cbs
+	language	Casiguran Dumagat Agta	dgc	1165	dgc
+	language	Casuarina Coast Asmat	asc	1166	asc
+	language	Catalan Sign Language	csc	1167	csc
+	language	Catalan, Valencian	cat	1168	cat	Catalan	Valencian	ca
+	language	Catawba	chc	1169	chc
+	language	CavineÃąa	cav	1170	cav
+	language	Cayubaba	cyb	1171	cyb
+	language	Cayuga	cay	1172	cay
+	language	Cayuse	xcy	1173	xcy
+	language	CaÃąar Highland Quichua	qxr	1174	qxr
+	language	CaĖąhungwaĖąryaĖą	nat	1175	nat
+	language	Cebaara Senoufo	sef	1176	sef
+	language	Cebuano	ceb	1177	ceb
+	language	Celtiberian	xce	1178	xce
+	language	CemuhÃŽ	cam	1179	cam
+	language	Cen	cen	1180	cen
+	language	Central Asmat	cns	1181	cns
+	language	Central Atlas Tamazight	tzm	1182	tzm
+	language	Central Awyu	awu	1183	awu
+	language	Central Aymara	ayr	1184	ayr
+	language	Central Bai	bca	1185	bca
+	language	Central Berawan	zbc	1186	zbc
+	language	Central Bikol	bcl	1187	bcl
+	language	Central Bontok	lbk	1188	lbk
+	language	Central Cagayan Agta	agt	1189	agt
+	language	Central Grebo	grv	1190	grv
+	language	Central Hongshuihe Zhuang	zch	1191	zch
+	language	Central Huasteca Nahuatl	nch	1192	nch
+	language	Central Huishui Hmong	hmc	1193	hmc
+	language	Central Kanuri	knc	1194	knc
+	language	Central Kurdish	ckb	1195	ckb
+	language	Central Maewo	mwo	1196	mwo
+	language	Central Malay	pse	1197	pse
+	language	Central Masela	mxz	1198	mxz
+	language	Central Mashan Hmong	hmm	1199	hmm
+	language	Central Mazahua	maz	1200	maz
+	language	Central Melanau	mel	1201	mel
+	language	Central Mnong	cmo	1202	cmo
+	language	Central Nahuatl	nhn	1203	nhn
+	language	Central Nicobarese	ncb	1204	ncb
+	language	Central Ojibwa	ojc	1205	ojc
+	language	Central Okinawan	ryu	1206	ryu
+	language	Central Palawano	plc	1207	plc
+	language	Central Pame	pbs	1208	pbs
+	language	Central Pashto	pst	1209	pst
+	language	Central Pomo	poo	1210	poo
+	language	Central Puebla Nahuatl	ncx	1211	ncx
+	language	Central Sama	sml	1212	sml
+	language	Central Siberian Yupik	ess	1213	ess
+	language	Central Sierra Miwok	csm	1214	csm
+	language	Central Subanen	syb	1215	syb
+	language	Central Tagbanwa	tgt	1216	tgt
+	language	Central Tarahumara	tar	1217	tar
+	language	Central Tunebo	tuf	1218	tuf
+	language	Central Yupik	esu	1219	esu
+	language	Central-Eastern Niger Fulfulde	fuq	1220	fuq
+	language	CentÃēÃēm	cet	1221	cet
+	language	Cerma	cme	1222	cme
+	language	Cha'ari	cxh	1223	cxh
+	language	Chabu	sbf	1224	sbf
+	language	Chachapoyas Quechua	quk	1225	quk
+	language	Chachi	cbi	1226	cbi
+	language	Chadian Arabic	shu	1227	shu
+	language	Chadian Sign Language	cds	1228	cds
+	language	Chadong	cdy	1229	cdy
+	language	Chagatai	chg	1230	chg
+	language	Chaima	ciy	1231	ciy
+	language	Chak	ckh	1232	ckh
+	language	Chakali	cli	1233	cli
+	language	Chakavian	ckm	1234	ckm
+	language	Chakma	ccp	1235	ccp
+	language	Chala	cll	1236	cll
+	language	Chaldean Neo-Aramaic	cld	1237	cld
+	language	Chalikha	tgf	1238	tgf
+	language	Chamacoco	ceg	1239	ceg
+	language	Chamalal	cji	1240	cji
+	language	Chambeali	cdh	1241	cdh
+	language	Chambri	can	1242	can
+	language	Chamicuro	ccc	1243	ccc
+	language	Chamorro	cha	1244	cha	ch
+	language	Chang Naga	nbc	1245	nbc
+	language	Changriwa	cga	1246	cga
+	language	Changthang	cna	1247	cna
+	language	Chantyal	chx	1248	chx
+	language	ChanÊ	caj	1249	caj
+	language	Chara	cra	1250	cra
+	language	Chaudangsi	cdn	1251	cdn
+	language	Chaura	crv	1252	crv
+	language	Chavacano	cbk	1253	cbk
+	language	Chayahuita	cbt	1254	cbt
+	language	Chayuco Mixtec	mih	1255	mih
+	language	Chazumba Mixtec	xtb	1256	xtb
+	language	Che	ruk	1257	ruk
+	language	Chechen	che	1258	che	ce
+	language	Cheke Holo	mrn	1259	mrn
+	language	Chemakum	xch	1260	xch
+	language	Chenapian	cjn	1261	cjn
+	language	Chenchu	cde	1262	cde
+	language	Chenoua	cnu	1263	cnu
+	language	Chepang	cdm	1264	cdm
+	language	Chepya	ycp	1265	ycp
+	language	Cherepon	cpn	1266	cpn
+	language	Cherokee	chr	1267	chr
+	language	Chesu	ych	1268	ych
+	language	Chetco	ctc	1269	ctc
+	language	Chewong	cwg	1270	cwg
+	language	Cheyenne	chy	1271	chy
+	language	Chhattisgarhi	hne	1272	hne
+	language	Chhintange	ctn	1273	ctn
+	language	Chhulung	cur	1274	cur
+	language	Chiangmai Sign Language	csd	1275	csd
+	language	Chiapanec	cip	1276	cip
+	language	Chibcha	chb	1277	chb
+	language	Chicahuaxtla Triqui	trs	1278	trs
+	language	Chichewa, Chewa, Nyanja	nya	1279	nya	Chichewa	Chewa	ny	Nyanja
+	language	Chichicapan Zapotec	zpv	1280	zpv
+	language	Chichimeca-Jonaz	pei	1281	pei
+	language	Chickasaw	cic	1282	cic
+	language	Chicomuceltec	cob	1283	cob
+	language	Chiga	cgg	1284	cgg
+	language	ChigmecatitlÃĄn Mixtec	mii	1285	mii
+	language	Chilcotin	clc	1286	clc
+	language	Chilean Sign Language	csg	1287	csg
+	language	Chilisso	clh	1288	clh
+	language	Chiltepec Chinantec	csa	1289	csa
+	language	Chimalapa Zoque	zoh	1290	zoh
+	language	Chimariko	cid	1291	cid
+	language	Chimborazo Highland Quichua	qug	1292	qug
+	language	Chimila	cbg	1293	cbg
+	language	China Buriat	bxu	1294	bxu
+	language	Chinali	cih	1295	cih
+	language	Chinbon Chin	cnb	1296	cnb
+	language	Chincha Quechua	qxc	1297	qxc
+	language	Chinese	zho	1298	zho	chi	zh
+	language	Chinese Pidgin English	cpi	1299	cpi
+	language	Chinese Sign Language	csl	1300	csl
+	language	Chinook	chh	1301	chh
+	language	Chinook jargon	chn	1302	chn
+	language	Chipaya	cap	1303	cap
+	language	Chipewyan	chp	1304	chp
+	language	Chippewa	ciw	1305	ciw
+	language	ChiquihuitlÃĄn Mazatec	maq	1306	maq
+	language	Chiquitano	cax	1307	cax
+	language	ChiquiÃĄn Ancash Quechua	qxa	1308	qxa
+	language	ChiripÃĄ	nhd	1309	nhd
+	language	Chiru	cdf	1310	cdf
+	language	Chitimacha	ctm	1311	ctm
+	language	Chitkuli Kinnauri	cik	1312	cik
+	language	Chittagonian	ctg	1313	ctg
+	language	Chitwania Tharu	the	1314	the
+	language	Choapan Zapotec	zpc	1315	zpc
+	language	Chocangacakha	cgk	1316	cgk
+	language	Chochotec	coz	1317	coz
+	language	Choctaw	cho	1318	cho
+	language	Chodri	cdi	1319	cdi
+	language	Chokri Naga	nri	1320	nri
+	language	Chokwe	cjk	1321	cjk
+	language	Chol	ctu	1322	ctu
+	language	CholÃŗn	cht	1323	cht
+	language	Chong	cog	1324	cog
+	language	Choni	cda	1325	cda
+	language	Chonyi-Dzihana-Kauma	coh	1326	coh
+	language	Chopi	cce	1327	cce
+	language	Chorasmian	xco	1328	xco
+	language	Chortí	caa	1329	caa
+	language	Chothe Naga	nct	1330	nct
+	language	Chrau	crw	1331	crw
+	language	Chru	cje	1332	cje
+	language	Chuanqiandian Cluster Miao	cqd	1333	cqd
+	language	Chuave	cjv	1334	cjv
+	language	Chug	cvg	1335	cvg
+	language	Chuj	cac	1336	cac
+	language	Chuka	cuh	1337	cuh
+	language	Chukot	ckt	1338	ckt
+	language	Chukwa	cuw	1339	cuw
+	language	Chulym	clw	1340	clw
+	language	Chumburung	ncu	1341	ncu
+	language	Chung	cnq	1342	cnq
+	language	Churahi	cdj	1343	cdj
+	language	Chut	scb	1344	scb
+	language	Chuukese	chk	1345	chk
+	language	Chuvantsy	xcv	1346	xcv
+	language	Chuvash	chv	1347	chv	cv
+	language	Chuwabu	chw	1348	chw
+	language	ChÃĄcobo	cao	1349	cao
+	language	Ci Gbe	cib	1350	cib
+	language	Cia-Cia	cia	1351	cia
+	language	Cibak	ckl	1352	ckl
+	language	Cicipu	awc	1353	awc
+	language	Cimbrian	cim	1354	cim
+	language	Cinda-Regi-Tiyal	cdr	1355	cdr
+	language	Cineni	cie	1356	cie
+	language	Cinta Larga	cin	1357	cin
+	language	Cisalpine Gaulish	xcg	1358	xcg
+	language	Cishingini	asg	1359	asg
+	language	Citak	txt	1360	txt
+	language	Ciwogai	tgd	1361	tgd
+	language	Clallam	clm	1362	clm
+	language	Classical Armenian	xcl	1363	xcl
+	language	Classical Mandaic	myz	1364	myz
+	language	Classical Mongolian	cmg	1365	cmg
+	language	Classical Nahuatl	nci	1366	nci
+	language	Classical Newari	nwc	1367	nwc
+	language	Classical Quechua	qwc	1368	qwc
+	language	Classical Sanskrit	cls	1369	cls
+	language	Classical Syriac	syc	1370	syc
+	language	Classical Tibetan	xct	1371	xct
+	language	Coahuilteco	xcw	1372	xcw
+	language	Coast Miwok	csi	1373	csi
+	language	Coastal Konjo	kjc	1374	kjc
+	language	Coatecas Altas Zapotec	zca	1375	zca
+	language	Coatepec Nahuatl	naz	1376	naz
+	language	CoatlÃĄn Mixe	mco	1377	mco
+	language	CoatlÃĄn Zapotec	zps	1378	zps
+	language	Coatzospan Mixtec	miz	1379	miz
+	language	Cocama-Cocamilla	cod	1380	cod
+	language	Cochimi	coj	1381	coj
+	language	Cocopa	coc	1382	coc
+	language	Cocos Islands Malay	coa	1383	coa
+	language	Coeur d'Alene	crd	1384	crd
+	language	CofÃĄn	con	1385	con
+	language	Cogui	kog	1386	kog
+	language	Col	liw	1387	liw
+	language	Colombian Sign Language	csn	1388	csn
+	language	Colonia Tovar German	gct	1389	gct
+	language	Colorado	cof	1390	cof
+	language	Columbia-Wenatchi	col	1391	col
+	language	Comaltepec Chinantec	cco	1392	cco
+	language	Comanche	com	1393	com
+	language	Comecrudo	xcm	1394	xcm
+	language	Como Karim	cfg	1395	cfg
+	language	Comox	coo	1396	coo
+	language	Con	cno	1397	cno
+	language	Congo Swahili	swc	1398	swc
+	language	Coos	csz	1399	csz
+	language	CopainalÃĄ Zoque	zoc	1400	zoc
+	language	Copala Triqui	trc	1401	trc
+	language	Coptic	cop	1402	cop
+	language	Coquille	coq	1403	coq
+	language	Cori	cry	1404	cry
+	language	Cornish	cor	1405	cor	kw
+	language	Corongo Ancash Quechua	qwa	1406	qwa
+	language	Corsican	cos	1407	cos	co
+	language	Costa Rican Sign Language	csr	1408	csr
+	language	Cotabato Manobo	mta	1409	mta
+	language	Cotoname	xcn	1410	xcn
+	language	Cowlitz	cow	1411	cow
+	language	Coyotepec Popoloca	pbf	1412	pbf
+	language	Coyutla Totonac	toc	1413	toc
+	language	Cree	cre	1414	cre	cr
+	language	Creek	mus	1415	mus
+	language	Crimean Tatar	crh	1416	crh
+	language	Croatia Sign Language	csq	1417	csq
+	language	Croatian	hrv	1418	hrv	Logudorese Sardinian	src	hr	Croatian
+	language	Cross River Mbembe	mfn	1419	mfn
+	language	Crow	cro	1420	cro
+	language	CruzeÃąo	crz	1421	crz
+	language	Cua	cua	1422	cua
+	language	Cuba Sign Language	csf	1423	csf
+	language	Cubeo	cub	1424	cub
+	language	Cuiba	cui	1425	cui
+	language	Cuitlatec	cuy	1426	cuy
+	language	Culina	cul	1427	cul
+	language	Cumanagoto	cuo	1428	cuo
+	language	Cumbric	xcb	1429	xcb
+	language	Cun	cuq	1430	cuq
+	language	Cuneiform Luwian	xlu	1431	xlu
+	language	CupeÃąo	cup	1432	cup
+	language	Curonian	xcu	1433	xcu
+	language	Curripaco	kpc	1434	kpc
+	language	Cusco Quechua	quz	1435	quz
+	language	Cutchi-Swahili	ccl	1436	ccl
+	language	Cuvok	cuv	1437	cuv
+	language	Cuyamecalco Mixtec	xtu	1438	xtu
+	language	Cuyonon	cyo	1439	cyo
+	language	Cwi Bwamu	bwy	1440	bwy
+	language	Cypriot Arabic	acy	1441	acy
+	language	Czech	ces	1442	ces	cs	cze
+	language	Czech Sign Language	cse	1443	cse
+	language	Côông	cnc	1444	cnc
+	language	Da'a Kaili	kzf	1445	kzf
+	language	Daai Chin	dao	1446	dao
+	language	Daakaka	bpa	1447	bpa
+	language	Daantanai'	lni	1448	lni
+	language	Daasanach	dsh	1449	dsh
+	language	DaatsĘŧiĖin	dtn	1450	dtn
+	language	Daba	dbq	1451	dbq
+	language	Dabarre	dbr	1452	dbr
+	language	Dabe	dbe	1453	dbe
+	language	Dacian	xdc	1454	xdc
+	language	Dadi Dadi	dda	1455	dda
+	language	Dadibi	mps	1456	mps
+	language	Dadiya	dbd	1457	dbd
+	language	Daga	dgz	1458	dgz
+	language	Dagaari Dioula	dgd	1459	dgd
+	language	Dagba	dgk	1460	dgk
+	language	Dagbani	dag	1461	dag
+	language	Dagik	dec	1462	dec
+	language	Dagoman	dgn	1463	dgn
+	language	Dahalik	dlk	1464	dlk
+	language	Dahalo	dal	1465	dal
+	language	Daho-Doo	das	1466	das
+	language	Dai	dij	1467	dij
+	language	Dai Zhuang	zhd	1468	zhd
+	language	Dair	drb	1469	drb
+	language	Dakka	dkk	1470	dkk
+	language	Dakota	dak	1471	dak
+	language	Dakpakha	dka	1472	dka
+	language	Dalabon	ngk	1473	ngk
+	language	Dalmatian	dlm	1474	dlm
+	language	Daloa BÊtÊ	bev	1475	bev
+	language	Dama	dmm	1476	dmm
+	language	Damakawa	dam	1477	dam
+	language	Damal	uhn	1478	uhn
+	language	Dambi	dac	1479	dac
+	language	Dameli	dml	1480	dml
+	language	Dampelas	dms	1481	dms
+	language	Dan	dnj	1482	dnj
+	language	Danaru	dnr	1483	dnr
+	language	Danau	dnu	1484	dnu
+	language	Dandami Maria	daq	1485	daq
+	language	DangalÊat	daa	1486	daa
+	language	Dangaura Tharu	thl	1487	thl
+	language	Danish	dan	1488	dan	da
+	language	Danish Sign Language	dsl	1489	dsl
+	language	Dano	aso	1490	aso
+	language	Danu	dnv	1491	dnv
+	language	Dao	daz	1492	daz
+	language	Daonda	dnd	1493	dnd
+	language	Dar Daju Daju	djc	1494	djc
+	language	Dar Fur Daju	daj	1495	daj
+	language	Dar Sila Daju	dau	1496	dau
+	language	Darai	dry	1497	dry
+	language	Dargwa	dar	1498	dar
+	language	Dari	prs	1499	prs
+	language	Darkinyung	xda	1500	xda
+	language	Darlong	dln	1501	dln
+	language	Darmiya	drd	1502	drd
+	language	Daro-Matu Melanau	dro	1503	dro
+	language	Dass	dot	1504	dot
+	language	Datooga	tcc	1505	tcc
+	language	Daungwurrung	dgw	1506	dgw
+	language	Daur	dta	1507	dta
+	language	Davawenyo	daw	1508	daw
+	language	Dawawa	dww	1509	dww
+	language	Dawera-Daweloor	ddw	1510	ddw
+	language	Dawik Kui	dwk	1511	dwk
+	language	Dawro	dwr	1512	dwr
+	language	Day	dai	1513	dai
+	language	Dayi	dax	1514	dax
+	language	Daza	dzd	1515	dzd
+	language	Dazaga	dzg	1516	dzg
+	language	Deccan	dcc	1517	dcc
+	language	Dedua	ded	1518	ded
+	language	Defaka	afn	1519	afn
+	language	Defi Gbe	gbh	1520	gbh
+	language	Deg	mzw	1521	mzw
+	language	Degema	deg	1522	deg
+	language	Degenan	dge	1523	dge
+	language	Degexit'an	ing	1524	ing
+	language	Dehu	dhv	1525	dhv
+	language	Dehwari	deh	1526	deh
+	language	Dek	dek	1527	dek
+	language	Dela-Oenale	row	1528	row
+	language	Delaware	del	1529	del
+	language	Delo	ntr	1530	ntr
+	language	Dem	dem	1531	dem
+	language	Dema	dmx	1532	dmx
+	language	Demisa	dei	1533	dei
+	language	Demta	dmy	1534	dmy
+	language	Dendi (Benin)	ddn	1535	ddn
+	language	Dendi (Central African Republic)	deq	1536	deq
+	language	Dengese	dez	1537	dez
+	language	Dengka	dnk	1538	dnk
+	language	Deno	dbb	1539	dbb
+	language	Denya	anv	1540	anv
+	language	Dení	dny	1541	dny
+	language	Deori	der	1542	der
+	language	Dera (Indonesia)	kbv	1543	kbv
+	language	Dera (Nigeria)	kna	1544	kna
+	language	Desano	des	1545	des
+	language	Desiya	dso	1546	dso
+	language	Dewas Rai	dwz	1547	dwz
+	language	Dewoin	dee	1548	dee
+	language	Dezfuli	def	1549	def
+	language	Dghwede	dgh	1550	dgh
+	language	Dhaiso	dhs	1551	dhs
+	language	Dhalandji	dhl	1552	dhl
+	language	Dhangu-Djangu	dhg	1553	dhg
+	language	Dhanki	dhn	1554	dhn
+	language	Dhanwar (Nepal)	dhw	1555	dhw
+	language	Dhao	nfa	1556	nfa
+	language	Dharawal	tbh	1557	tbh
+	language	Dhargari	dhr	1558	dhr
+	language	Dharuk	xdk	1559	xdk
+	language	Dharumbal	xgm	1560	xgm
+	language	Dhatki	mki	1561	mki
+	language	Dhimal	dhi	1562	dhi
+	language	Dhodia	dho	1563	dho
+	language	Dhofari Arabic	adf	1564	adf
+	language	Dhudhuroa	ddr	1565	ddr
+	language	Dhundari	dhd	1566	dhd
+	language	Dhungaloo	dhx	1567	dhx
+	language	Dhurga	dhu	1568	dhu
+	language	Dhuwal	dwu	1569	dwu
+	language	Dhuwaya	dwy	1570	dwy
+	language	Dia	dia	1571	dia
+	language	Dibabawon Manobo	mbd	1572	mbd
+	language	Dibiyaso	dby	1573	dby
+	language	Dibo	dio	1574	dio
+	language	Dibole	bvx	1575	bvx
+	language	Dicamay Agta	duy	1576	duy
+	language	Didinga	did	1577	did
+	language	Dido	ddo	1578	ddo
+	language	Dieri	dif	1579	dif
+	language	Digaro-Mishmi	mhu	1580	mhu
+	language	Digo	dig	1581	dig
+	language	Dii	dur	1582	dur
+	language	Dijim-Bwilim	cfa	1583	cfa
+	language	Dilling	dil	1584	dil
+	language	Dima	jma	1585	jma
+	language	Dimasa	dis	1586	dis
+	language	Dimbong	dii	1587	dii
+	language	Dime	dim	1588	dim
+	language	Dimli (individual language)	diq	1589	diq
+	language	Ding	diz	1590	diz
+	language	Dinka	din	1591	din
+	language	Dir-Nyamzak-Mbarimi	nzr	1592	nzr
+	language	Dirasha	gdl	1593	gdl
+	language	Diri	dwa	1594	dwa
+	language	Diriku	diu	1595	diu
+	language	Dirim	dir	1596	dir
+	language	Disa	dsi	1597	dsi
+	language	Ditammari	tbz	1598	tbz
+	language	Ditidaht	dtd	1599	dtd
+	language	Diuwe	diy	1600	diy
+	language	Diuxi-Tilantongo Mixtec	xtd	1601	xtd
+	language	Dixon Reef	dix	1602	dix
+	language	Dizin	mdx	1603	mdx
+	language	Djabugay	dyy	1604	dyy
+	language	Djabwurrung	tjw	1605	tjw
+	language	Djadjawurrung	dja	1606	dja
+	language	Djambarrpuyngu	djr	1607	djr
+	language	Djamindjung	djd	1608	djd
+	language	Djangun	djf	1609	djf
+	language	Djawi	djw	1610	djw
+	language	Djeebbana	djj	1611	djj
+	language	Djimini Senoufo	dyi	1612	dyi
+	language	Djinang	dji	1613	dji
+	language	Djinba	djb	1614	djb
+	language	Djiwarli	dze	1615	dze
+	language	Dobel	kvo	1616	kvo
+	language	Dobu	dob	1617	dob
+	language	Doe	doe	1618	doe
+	language	Doga	dgg	1619	dgg
+	language	Doghoro	dgx	1620	dgx
+	language	Dogoso	dgs	1621	dgs
+	language	DogosÊ	dos	1622	dos
+	language	Dogri (individual language)	dgo	1623	dgo
+	language	Dogri (macrolanguage)	doi	1624	doi
+	language	Dogul Dom Dogon	dbg	1625	dbg
+	language	Doka	dbi	1626	dbi
+	language	Doko-Uyanga	uya	1627	uya
+	language	Dokshi	dsk	1628	dsk
+	language	Dolgan	dlg	1629	dlg
+	language	Dolpo	dre	1630	dre
+	language	Dom	doa	1631	doa
+	language	Domaaki	dmk	1632	dmk
+	language	Domari	rmt	1633	rmt
+	language	Dombe	dov	1634	dov
+	language	Dominican Sign Language	doq	1635	doq
+	language	Dompo	doy	1636	doy
+	language	Domu	dof	1637	dof
+	language	Domung	dev	1638	dev
+	language	Dondo	dok	1639	dok
+	language	Dong	doh	1640	doh
+	language	Dongo	doo	1641	doo
+	language	Dongotono	ddd	1642	ddd
+	language	Dongshanba Lalo	yik	1643	yik
+	language	Dongxiang	sce	1644	sce
+	language	Donno So Dogon	dds	1645	dds
+	language	Doondo	dde	1646	dde
+	language	Dori'o	dor	1647	dor
+	language	Doromu-Koki	kqc	1648	kqc
+	language	Dorze	doz	1649	doz
+	language	Doso	dol	1650	dol
+	language	Dotyali	dty	1651	dty
+	language	Doutai	tds	1652	tds
+	language	Doyayo	dow	1653	dow
+	language	Drents	drt	1654	drt
+	language	Drung	duu	1655	duu
+	language	Duala	dua	1656	dua
+	language	Duano	dup	1657	dup
+	language	Duau	dva	1658	dva
+	language	Dubli	dub	1659	dub
+	language	Dubu	dmu	1660	dmu
+	language	Dugun	ndu	1661	ndu
+	language	Duguri	dbm	1662	dbm
+	language	Dugwor	dme	1663	dme
+	language	Duhwa	kbz	1664	kbz
+	language	Duke	nke	1665	nke
+	language	Dulbu	dbo	1666	dbo
+	language	Duli-Gey	duz	1667	duz
+	language	Duma	dma	1668	dma
+	language	Dumbea	duf	1669	duf
+	language	Dumi	dus	1670	dus
+	language	Dumpas	dmv	1671	dmv
+	language	Dumun	dui	1672	dui
+	language	Duna	duc	1673	duc
+	language	Dungan	dng	1674	dng
+	language	Dungmali	raa	1675	raa
+	language	Dungra Bhil	duh	1676	duh
+	language	Dungu	dbv	1677	dbv
+	language	Dupaninan Agta	duo	1678	duo
+	language	Dura	drq	1679	drq
+	language	Duri	mvp	1680	mvp
+	language	Duriankere	dbn	1681	dbn
+	language	Durop	krp	1682	krp
+	language	Duruma	dug	1683	dug
+	language	Duruwa	pci	1684	pci
+	language	Dusner	dsn	1685	dsn
+	language	Dusun Deyah	dun	1686	dun
+	language	Dusun Malang	duq	1687	duq
+	language	Dusun Witu	duw	1688	duw
+	language	Dutch	nld	1689	nld	dut	nl
+	language	Dutch Sign Language	dse	1690	dse
+	language	Dutton World Speedwords	dws	1691	dws
+	language	Duungooma	dux	1692	dux
+	language	Duupa	dae	1693	dae
+	language	Duvle	duv	1694	duv
+	language	Duwai	dbp	1695	dbp
+	language	Duwet	gve	1696	gve
+	language	DuĖƒya	ldb	1697	ldb
+	language	Dwang	nnu	1698	nnu
+	language	Dyaberdyaber	dyb	1699	dyb
+	language	Dyan	dya	1700	dya
+	language	Dyangadi	dyn	1701	dyn
+	language	Dyarim	dyr	1702	dyr
+	language	Dyirbal	dbl	1703	dbl
+	language	Dyugun	dyd	1704	dyd
+	language	Dyula	dyu	1705	dyu
+	language	Dza	jen	1706	jen
+	language	Dzalakha	dzl	1707	dzl
+	language	Dzando	dzn	1708	dzn
+	language	Dzao Min	bpn	1709	bpn
+	language	Dzongkha	dzo	1710	dzo	dz
+	language	DzÚÚngoo	dnn	1711	dnn
+	language	DÃĸw	kwa	1712	kwa
+	language	E	eee	1713	eee
+	language	E'ma Buyang	yzg	1714	yzg
+	language	E'Ãąapa Woromaipu	pbh	1715	pbh
+	language	Early Tripuri	xtr	1716	xtr
+	language	East Ambae	omb	1717	omb
+	language	East Berawan	zbe	1718	zbe
+	language	East Damar	dmr	1719	dmr
+	language	East Futuna	fud	1720	fud
+	language	East Kewa	kjs	1721	kjs
+	language	East Limba	lma	1722	lma
+	language	East Makian	mky	1723	mky
+	language	East Masela	vme	1724	vme
+	language	East Nyala	nle	1725	nle
+	language	East Tarangan	tre	1726	tre
+	language	East Yugur	yuy	1727	yuy
+	language	Eastern Abnaki	aaq	1728	aaq
+	language	Eastern Acipa	acp	1729	acp
+	language	Eastern Apurímac Quechua	qve	1730	qve
+	language	Eastern Arrernte	aer	1731	aer
+	language	Eastern Balochi	bgp	1732	bgp
+	language	Eastern Bolivian Guaraní	gui	1733	gui
+	language	Eastern Bontok	ebk	1734	ebk
+	language	Eastern Bru	bru	1735	bru
+	language	Eastern Canadian Inuktitut	ike	1736	ike
+	language	Eastern Cham	cjm	1737	cjm
+	language	Eastern Durango Nahuatl	azd	1738	azd
+	language	Eastern Egyptian Bedawi Arabic	avl	1739	avl
+	language	Eastern Frisian	frs	1740	frs
+	language	Eastern Gorkha Tamang	tge	1741	tge
+	language	Eastern Highland Chatino	cly	1742	cly
+	language	Eastern Highland Otomi	otm	1743	otm
+	language	Eastern Hongshuihe Zhuang	zeh	1744	zeh
+	language	Eastern Huasteca Nahuatl	nhe	1745	nhe
+	language	Eastern Huishui Hmong	hme	1746	hme
+	language	Eastern Karaboro	xrb	1747	xrb
+	language	Eastern Katu	ktv	1748	ktv
+	language	Eastern Kayah	eky	1749	eky
+	language	Eastern Keres	kee	1750	kee
+	language	Eastern Khumi Chin	cek	1751	cek
+	language	Eastern Krahn	kqo	1752	kqo
+	language	Eastern Lalu	yit	1753	yit
+	language	Eastern Lawa	lwl	1754	lwl
+	language	Eastern Magar	mgp	1755	mgp
+	language	Eastern Maninkakan	emk	1756	emk
+	language	Eastern Mari	mhr	1757	mhr
+	language	Eastern Maroon Creole	djk	1758	djk
+	language	Eastern Meohang	emg	1759	emg
+	language	Eastern Minyag	emq	1760	emq
+	language	Eastern Mnong	mng	1761	mng
+	language	Eastern Muria	emu	1762	emu
+	language	Eastern Ngad'a	nea	1763	nea
+	language	Eastern Nisu	nos	1764	nos
+	language	Eastern Ojibwa	ojg	1765	ojg
+	language	Eastern Oromo	hae	1766	hae
+	language	Eastern Parbate Kham	kif	1767	kif
+	language	Eastern Penan	pez	1768	pez
+	language	Eastern Pomo	peb	1769	peb
+	language	Eastern Qiandong Miao	hmq	1770	hmq
+	language	Eastern Subanen	sfe	1771	sfe
+	language	Eastern Tamang	taj	1772	taj
+	language	Eastern Tawbuid	bnj	1773	bnj
+	language	Eastern Xiangxi Miao	muq	1774	muq
+	language	Eastern Xwla Gbe	gbx	1775	gbx
+	language	Eastern Yiddish	ydd	1776	ydd
+	language	Ebira	igb	1777	igb
+	language	Eblan	xeb	1778	xeb
+	language	EbriÊ	ebr	1779	ebr
+	language	Ebughu	ebg	1780	ebg
+	language	Ecuadorian Sign Language	ecs	1781	ecs
+	language	Ede Cabe	cbj	1782	cbj
+	language	Ede Ica	ica	1783	ica
+	language	Ede Idaca	idd	1784	idd
+	language	Ede Ije	ijj	1785	ijj
+	language	Edera Awyu	awy	1786	awy
+	language	Edolo	etr	1787	etr
+	language	Edomite	xdm	1788	xdm
+	language	Edopi	dbf	1789	dbf
+	language	Efai	efa	1790	efa
+	language	Efe	efe	1791	efe
+	language	Efik	efi	1792	efi
+	language	Efutop	ofu	1793	ofu
+	language	Ega	ega	1794	ega
+	language	Eggon	ego	1795	ego
+	language	Egypt Sign Language	esl	1796	esl
+	language	Egyptian (Ancient)	egy	1797	egy
+	language	Egyptian Arabic	arz	1798	arz
+	language	Ehueun	ehu	1799	ehu
+	language	Eipomek	eip	1800	eip
+	language	Eitiep	eit	1801	eit
+	language	Ejagham	etu	1802	etu
+	language	Ejamat	eja	1803	eja
+	language	Ekai Chin	cey	1804	cey
+	language	Ekajuk	eka	1805	eka
+	language	Ekari	ekg	1806	ekg
+	language	Eki	eki	1807	eki
+	language	Ekit	eke	1808	eke
+	language	Ekpeye	ekp	1809	ekp
+	language	El Alto Zapotec	zpp	1810	zpp
+	language	El Hugeirat	elh	1811	elh
+	language	El Molo	elo	1812	elo
+	language	El Nayar Cora	crn	1813	crn
+	language	Elamite	elx	1814	elx
+	language	Eleme	elm	1815	elm
+	language	Elepi	ele	1816	ele
+	language	Elfdalian	ovd	1817	ovd
+	language	Elip	ekm	1818	ekm
+	language	Elkei	elk	1819	elk
+	language	Elotepec Zapotec	zte	1820	zte
+	language	Eloyi	afo	1821	afo
+	language	Elseng	mrf	1822	mrf
+	language	Elu	elu	1823	elu
+	language	Elymian	xly	1824	xly
+	language	Emae	mmw	1825	mmw
+	language	Emai-Iuleha-Ora	ema	1826	ema
+	language	Eman	emn	1827	emn
+	language	Embaloh	emb	1828	emb
+	language	EmberÃĄ-BaudÃŗ	bdc	1829	bdc
+	language	EmberÃĄ-Catío	cto	1830	cto
+	language	EmberÃĄ-Chamí	cmi	1831	cmi
+	language	EmberÃĄ-TadÃŗ	tdc	1832	tdc
+	language	Embu	ebu	1833	ebu
+	language	Emerillon	eme	1834	eme
+	language	Emilian	egl	1835	egl
+	language	Emplawas	emw	1836	emw
+	language	Emumu	enr	1837	enr
+	language	En	enc	1838	enc
+	language	EnawenÊ-NawÊ	unk	1839	unk
+	language	Ende	end	1840	end
+	language	Enga	enq	1841	enq
+	language	Engdewu	ngr	1842	ngr
+	language	Engenni	enn	1843	enn
+	language	Enggano	eno	1844	eno
+	language	English	eng	1845	eng	en
+	language	Enlhet	enl	1846	enl
+	language	Enrekang	ptt	1847	ptt
+	language	Enu	enu	1848	enu
+	language	Enwan (Akwa Ibom State)	enw	1849	enw
+	language	Enwan (Edo State)	env	1850	env
+	language	Enxet	enx	1851	enx
+	language	Enya	gey	1852	gey
+	language	Epena	sja	1853	sja
+	language	Epi-Olmec	xep	1854	xep
+	language	Epie	epi	1855	epi
+	language	Epigraphic Mayan	emy	1856	emy
+	language	Eravallan	era	1857	era
+	language	Erave	kjy	1858	kjy
+	language	Ere	twp	1859	twp
+	language	Eritai	ert	1860	ert
+	language	Erokwanas	erw	1861	erw
+	language	Erre	err	1862	err
+	language	Erromintxela	emx	1863	emx
+	language	Ersu	ers	1864	ers
+	language	Eruwa	erh	1865	erh
+	language	Erzya	myv	1866	myv
+	language	Esan	ish	1867	ish
+	language	Ese	mcq	1868	mcq
+	language	Ese Ejja	ese	1869	ese
+	language	Eshtehardi	esh	1870	esh
+	language	Esimbi	ags	1871	ags
+	language	Eskayan	esy	1872	esy
+	language	Esperanto	epo	1873	epo	eo
+	language	Esselen	esq	1874	esq
+	language	Estado de MÊxico Otomi	ots	1875	ots
+	language	Estonian	est	1876	est	et
+	language	Estonian Sign Language	eso	1877	eso
+	language	Esuma	esm	1878	esm
+	language	Etchemin	etc	1879	etc
+	language	Etebi	etb	1880	etb
+	language	Eten	etx	1881	etx
+	language	Eteocretan	ecr	1882	ecr
+	language	Eteocypriot	ecy	1883	ecy
+	language	Ethiopian Sign Language	eth	1884	eth
+	language	Etkywan	ich	1885	ich
+	language	Eton (Cameroon)	eto	1886	eto
+	language	Eton (Vanuatu)	etn	1887	etn
+	language	Etruscan	ett	1888	ett
+	language	Etulo	utr	1889	utr
+	language	Eudeve	eud	1890	eud
+	language	Evant	bzz	1891	bzz
+	language	Even	eve	1892	eve
+	language	Evenki	evn	1893	evn
+	language	Eviya	gev	1894	gev
+	language	Ewage-Notu	nou	1895	nou
+	language	Ewe	ewe	1896	ewe	ee
+	language	Ewondo	ewo	1897	ewo
+	language	Extremaduran	ext	1898	ext
+	language	Eyak	eya	1899	eya
+	language	Ezaa	eza	1900	eza
+	language	Fa d'Ambu	fab	1901	fab
+	language	Fagani	faf	1902	faf
+	language	Faifi	fif	1903	fif
+	language	Faire Atta	azt	1904	azt
+	language	Faita	faj	1905	faj
+	language	Faiwol	fai	1906	fai
+	language	Fala	fax	1907	fax
+	language	Falam Chin	cfm	1908	cfm
+	language	Fali	fli	1909	fli
+	language	Faliscan	xfa	1910	xfa
+	language	Fam	fam	1911	fam
+	language	Fanagalo	fng	1912	fng
+	language	Fanamaket	bjp	1913	bjp
+	language	Fanbak	fnb	1914	fnb
+	language	Fang (Cameroon)	fak	1915	fak
+	language	Fang (Equatorial Guinea)	fan	1916	fan
+	language	Fania	fni	1917	fni
+	language	Fanti	fat	1918	fat
+	language	Far Western Muria	fmu	1919	fmu
+	language	Farefare	gur	1920	gur
+	language	Faroese	fao	1921	fao	fo
+	language	Fas	fqs	1922	fqs
+	language	Fasu	faa	1923	faa
+	language	Fataleka	far	1924	far
+	language	Fataluku	ddg	1925	ddg
+	language	Fayu	fau	1926	fau
+	language	Fe'fe'	fmp	1927	fmp
+	language	Fembe	agl	1928	agl
+	language	Fernando Po Creole English	fpe	1929	fpe
+	language	Feroge	fer	1930	fer
+	language	Fiji Hindi	hif	1931	hif
+	language	Fijian	fij	1932	fij	fj
+	language	Filipino	fil	1933	fil
+	language	Filomena Mata-CoahuitlÃĄn Totonac	tlp	1934	tlp
+	language	Finland-Swedish Sign Language	fss	1935	fss
+	language	Finnish	fin	1936	fin	fi
+	language	Finnish Sign Language	fse	1937	fse
+	language	Finongan	fag	1938	fag
+	language	Fipa	fip	1939	fip
+	language	Firan	fir	1940	fir
+	language	Fiwaga	fiw	1941	fiw
+	language	Flaaitaal	fly	1942	fly
+	language	Flinders Island	fln	1943	fln
+	language	Foau	flh	1944	flh
+	language	Foi	foi	1945	foi
+	language	Foia Foia	ffi	1946	ffi
+	language	Folopa	ppo	1947	ppo
+	language	Foma	fom	1948	fom
+	language	Fon	fon	1949	fon
+	language	Fongoro	fgr	1950	fgr
+	language	Foodo	fod	1951	fod
+	language	Forak	frq	1952	frq
+	language	Fordata	frd	1953	frd
+	language	Fore	for	1954	for
+	language	Forest Enets	enf	1955	enf
+	language	Fortsenal	frt	1956	frt
+	language	Francisco LeÃŗn Zoque	zos	1957	zos
+	language	Frankish	frk	1958	frk
+	language	French	fra	1959	fra	fre	fr
+	language	French Sign Language	fsl	1960	fsl
+	language	Friulian	fur	1961	fur
+	language	Fula, Fulah	ful	1962	ful	ff	Fula	Fulah
+	language	Fuliiru	flr	1963	flr
+	language	Fulniô	fun	1964	fun
+	language	Fum	fum	1965	fum
+	language	Fungwa	ula	1966	ula
+	language	Fur	fvr	1967	fvr
+	language	Furu	fuu	1968	fuu
+	language	Futuna-Aniwa	fut	1969	fut
+	language	Fuyug	fuy	1970	fuy
+	language	Fwe	fwe	1971	fwe
+	language	FwÃĸi	fwa	1972	fwa
+	language	Fyam	pym	1973	pym
+	language	Fyer	fie	1974	fie
+	language	Ga	gaa	1975	gaa
+	language	Ga'anda	gqa	1976	gqa
+	language	Ga'dang	gdg	1977	gdg
+	language	Gaa	ttb	1978	ttb
+	language	Gaam	tbi	1979	tbi
+	language	Gabi-Gabi	gbw	1980	gbw
+	language	Gabri	gab	1981	gab
+	language	Gabrielino-FernandeÃąo	xgf	1982	xgf
+	language	Gadang	gdk	1983	gdk
+	language	Gaddang	gad	1984	gad
+	language	Gaddi	gbk	1985	gbk
+	language	Gade	ged	1986	ged
+	language	Gade Lohar	gda	1987	gda
+	language	Gadjerawang	gdh	1988	gdh
+	language	Gadsup	gaj	1989	gaj
+	language	Gaelic, Scottish Gaelic	gla	1990	gla	Gaelic	Scottish Gaelic	gd
+	language	Gafat	gft	1991	gft
+	language	Gagadu	gbu	1992	gbu
+	language	Gagauz	gag	1993	gag
+	language	Gagnoa BÊtÊ	btg	1994	btg
+	language	Gagu	ggu	1995	ggu
+	language	Gahri	bfu	1996	bfu
+	language	Gaikundi	gbf	1997	gbf
+	language	Gail	gic	1998	gic
+	language	Gaina	gcn	1999	gcn
+	language	Gal	gap	2000	gap
+	language	Galambu	glo	2001	glo
+	language	Galatian	xga	2002	xga
+	language	Galela	gbi	2003	gbi
+	language	Galeya	gar	2004	gar
+	language	Galibi Carib	car	2005	car
+	language	Galice	gce	2006	gce
+	language	Galician	glg	2007	glg	gl
+	language	Galindan	xgl	2008	xgl
+	language	Gallurese Sardinian	sdn	2009	sdn
+	language	Galo	adl	2010	adl
+	language	Galolen	gal	2011	gal
+	language	Gamale Kham	kgj	2012	kgj
+	language	Gambera	gma	2013	gma
+	language	Gambian Wolof	wof	2014	wof
+	language	Gamilaraay	kld	2015	kld
+	language	Gamit	gbl	2016	gbl
+	language	Gamkonora	gak	2017	gak
+	language	Gamo	gmv	2018	gmv
+	language	Gamo-Ningi	bte	2019	bte
+	language	Gan Chinese	gan	2020	gan
+	language	Gana	gnq	2021	gnq
+	language	Ganang	gne	2022	gne
+	language	Ganda	lug	2023	lug	lg
+	language	Gane	gzn	2024	gzn
+	language	Ganggalida	gcd	2025	gcd
+	language	Ganglau	ggl	2026	ggl
+	language	Gangte	gnb	2027	gnb
+	language	Gangulu	gnl	2028	gnl
+	language	Gants	gao	2029	gao
+	language	Ganza	gza	2030	gza
+	language	Ganzi	gnz	2031	gnz
+	language	Gao	gga	2032	gga
+	language	Gapapaiwa	pwg	2033	pwg
+	language	Garhwali	gbm	2034	gbm
+	language	Garifuna	cab	2035	cab
+	language	Garig-Ilgar	ilg	2036	ilg
+	language	Garingbal	xgi	2037	xgi
+	language	Garlali	gll	2038	gll
+	language	Garo	grt	2039	grt
+	language	Garre	gex	2040	gex
+	language	Garrwa	wrk	2041	wrk
+	language	Garus	gyb	2042	gyb
+	language	Garza	xgr	2043	xgr
+	language	Gata'	gaq	2044	gaq
+	language	Gavak	dmc	2045	dmc
+	language	Gavar	gou	2046	gou
+	language	GaviÃŖo Do JiparanÃĄ	gvo	2047	gvo
+	language	Gawar-Bati	gwt	2048	gwt
+	language	Gawri	gwc	2049	gwc
+	language	Gawwada	gwd	2050	gwd
+	language	Gayil	gyl	2051	gyl
+	language	Gayo	gay	2052	gay
+	language	Gazi	gzi	2053	gzi
+	language	Gaɓogbo	gie	2054	gie
+	language	Gbagyi	gbr	2055	gbr
+	language	Gbanu	gbv	2056	gbv
+	language	Gbanziri	gbg	2057	gbg
+	language	Gbari	gby	2058	gby
+	language	Gbaya (Central African Republic)	gba	2059	gba
+	language	Gbaya (Sudan)	krs	2060	krs
+	language	Gbaya-Bossangoa	gbp	2061	gbp
+	language	Gbaya-Bozoum	gbq	2062	gbq
+	language	Gbaya-Mbodomo	gmm	2063	gmm
+	language	Gbayi	gyg	2064	gyg
+	language	Gbesi Gbe	gbs	2065	gbs
+	language	Gbii	ggb	2066	ggb
+	language	Gbin	xgb	2067	xgb
+	language	Gbiri-Niragu	grh	2068	grh
+	language	Gboloo Grebo	gec	2069	gec
+	language	Ge	hmj	2070	hmj
+	language	Geba Karen	kvq	2071	kvq
+	language	Gebe	gei	2072	gei
+	language	Gedaged	gdd	2073	gdd
+	language	Gedeo	drs	2074	drs
+	language	Geez	gez	2075	gez
+	language	Geji	gyz	2076	gyz
+	language	Geko Karen	ghk	2077	ghk
+	language	Gela	nlg	2078	nlg
+	language	Geme	geq	2079	geq
+	language	Gen	gej	2080	gej
+	language	Gende	gaf	2081	gaf
+	language	Gengle	geg	2082	geg
+	language	Georgian	kat	2083	kat	geo	ka
+	language	Gepo	ygp	2084	ygp
+	language	Gera	gew	2085	gew
+	language	Gerai	gef	2086	gef
+	language	German	deu	2087	deu	de	ger
+	language	German Sign Language	gsg	2088	gsg
+	language	Geruma	gea	2089	gea
+	language	Geser-Gorom	ges	2090	ges
+	language	Ghadamès	gha	2091	gha
+	language	Ghanaian Pidgin English	gpe	2092	gpe
+	language	Ghanaian Sign Language	gse	2093	gse
+	language	Ghandruk Sign Language	gds	2094	gds
+	language	Ghanongga	ghn	2095	ghn
+	language	Ghari	gri	2096	gri
+	language	Ghayavi	bmk	2097	bmk
+	language	Gheg Albanian	aln	2098	aln
+	language	Ghera	ghr	2099	ghr
+	language	Ghodoberi	gdo	2100	gdo
+	language	Ghomara	gho	2101	gho
+	language	GhomÃĄlÃĄ'	bbj	2102	bbj
+	language	Ghotuo	aaa	2103	aaa
+	language	Ghulfan	ghl	2104	ghl
+	language	Giangan	bgi	2105	bgi
+	language	Gibanawa	gib	2106	gib
+	language	Gidar	gid	2107	gid
+	language	Giiwo	kks	2108	kks
+	language	Gikyode	acd	2109	acd
+	language	Gilaki	glk	2110	glk
+	language	Gilbertese	gil	2111	gil
+	language	Gilima	gix	2112	gix
+	language	Gilyak	niv	2113	niv
+	language	Gimi (Eastern Highlands)	gim	2114	gim
+	language	Gimi (West New Britain)	gip	2115	gip
+	language	Gimme	kmp	2116	kmp
+	language	Gimnime	gmn	2117	gmn
+	language	Ginuman	gnm	2118	gnm
+	language	Ginyanga	ayg	2119	ayg
+	language	Girawa	bbr	2120	bbr
+	language	Girirra	gii	2121	gii
+	language	Giryama	nyf	2122	nyf
+	language	Githabul	gih	2123	gih
+	language	Gitonga	toh	2124	toh
+	language	Gitua	ggt	2125	ggt
+	language	Gitxsan	git	2126	git
+	language	Giyug	giy	2127	giy
+	language	Gizrra	tof	2128	tof
+	language	Glaro-Twabo	glr	2129	glr
+	language	Glavda	glw	2130	glw
+	language	Glio-Oubi	oub	2131	oub
+	language	Gnau	gnu	2132	gnu
+	language	Goan Konkani	gom	2133	gom
+	language	Goaria	gig	2134	gig
+	language	Gobasi	goi	2135	goi
+	language	Gobu	gox	2136	gox
+	language	GodiÊ	god	2137	god
+	language	Godwari	gdx	2138	gdx
+	language	Goemai	ank	2139	ank
+	language	Gofa	gof	2140	gof
+	language	Gogo	gog	2141	gog
+	language	Gogodala	ggw	2142	ggw
+	language	Gokana	gkn	2143	gkn
+	language	Gola	gol	2144	gol
+	language	Golin	gvf	2145	gvf
+	language	Golpa	lja	2146	lja
+	language	Gondi	gon	2147	gon
+	language	Gone Dau	goo	2148	goo
+	language	Gongduk	goe	2149	goe
+	language	Gonja	gjn	2150	gjn
+	language	Goo	gov	2151	gov
+	language	Gooniyandi	gni	2152	gni
+	language	Gor	gqr	2153	gqr
+	language	Gorakor	goc	2154	goc
+	language	Gorap	goq	2155	goq
+	language	Goreng	xgg	2156	xgg
+	language	Gorontalo	gor	2157	gor
+	language	Gorovu	grq	2158	grq
+	language	Gorowa	gow	2159	gow
+	language	Gothic	got	2160	got
+	language	Goundo	goy	2161	goy
+	language	GourmanchÊma	gux	2162	gux
+	language	Gowlan	goj	2163	goj
+	language	Gowli	gok	2164	gok
+	language	Gowro	gwf	2165	gwf
+	language	Gozarkhani	goz	2166	goz
+	language	Grangali	nli	2167	nli
+	language	Grass Koiari	kbk	2168	kbk
+	language	Grebo	grb	2169	grb
+	language	Greek (modern)	ell	2170	ell	Modern Greek (1453-)	el	gre	Greek
+	language	Greek Sign Language	gss	2171	gss
+	language	Green Gelao	giq	2172	giq
+	language	Greenlandic, Kalaallisut	kal	2173	kal	kl	Greenlandic	Kalaallisut
+	language	Grenadian Creole English	gcl	2174	gcl
+	language	Gresi	grs	2175	grs
+	language	Groma	gro	2176	gro
+	language	Gronings	gos	2177	gos
+	language	Gros Ventre	ats	2178	ats
+	language	Gua	gwx	2179	gwx
+	language	Guadeloupean Creole French	gcf	2180	gcf
+	language	Guahibo	guh	2181	guh
+	language	GuajajÃĄra	gub	2182	gub
+	language	GuajÃĄ	gvj	2183	gvj
+	language	Guambiano	gum	2184	gum
+	language	Guana (Brazil)	gqn	2185	gqn
+	language	Guana (Paraguay)	gva	2186	gva
+	language	Guanano	gvc	2187	gvc
+	language	Guanche	gnc	2188	gnc
+	language	Guanyinqiao	jiq	2189	jiq
+	language	Guaraní	grn	2190	grn	Guarani	gn
+	language	Guarayu	gyr	2191	gyr
+	language	Guarequena	gae	2192	gae
+	language	Guatemalan Sign Language	gsm	2193	gsm
+	language	GuatÃŗ	gta	2194	gta
+	language	Guayabero	guo	2195	guo
+	language	Gudang	xgd	2196	xgd
+	language	Gudanji	nji	2197	nji
+	language	Gude	gde	2198	gde
+	language	Gudu	gdu	2199	gdu
+	language	Guduf-Gava	gdf	2200	gdf
+	language	Guerrero Amuzgo	amu	2201	amu
+	language	Guerrero Nahuatl	ngu	2202	ngu
+	language	Guevea De Humboldt Zapotec	zpg	2203	zpg
+	language	Gugadj	ggd	2204	ggd
+	language	Gugu Badhun	gdc	2205	gdc
+	language	Gugu Warra	wrw	2206	wrw
+	language	Gugubera	kkp	2207	kkp
+	language	Guhu-Samane	ghs	2208	ghs
+	language	Guianese Creole French	gcr	2209	gcr
+	language	Guibei Zhuang	zgb	2210	zgb
+	language	Guiberoua BÊte	bet	2211	bet
+	language	Guibian Zhuang	zgn	2212	zgn
+	language	Guinea Kpelle	gkp	2213	gkp
+	language	Guinea-Bissau Sign Language	lgs	2214	lgs
+	language	Guinean Sign Language	gus	2215	gus
+	language	Guiqiong	gqi	2216	gqi
+	language	Gujarati	guj	2217	guj	gu
+	language	Gujari	gju	2218	gju
+	language	Gula (Central African Republic)	kcm	2219	kcm
+	language	Gula (Chad)	glu	2220	glu
+	language	Gula Iro	glj	2221	glj
+	language	Gula'alaa	gmb	2222	gmb
+	language	Gulay	gvl	2223	gvl
+	language	Gule	gly	2224	gly
+	language	Gulf Arabic	afb	2225	afb
+	language	Gumalu	gmu	2226	gmu
+	language	Gumatj	gnn	2227	gnn
+	language	Gumawana	gvs	2228	gvs
+	language	Gumuz	guk	2229	guk
+	language	Gun	guw	2230	guw
+	language	Gundi	gdi	2231	gdi
+	language	Gunditjmara	gjm	2232	gjm
+	language	Gundungurra	xrd	2233	xrd
+	language	Gungabula	gyf	2234	gyf
+	language	Gungu	rub	2235	rub
+	language	Guntai	gnt	2236	gnt
+	language	Gunwinggu	gup	2237	gup
+	language	Gunya	gyy	2238	gyy
+	language	Gupa-Abawa	gpa	2239	gpa
+	language	Gupapuyngu	guf	2240	guf
+	language	Guramalum	grz	2241	grz
+	language	Gurani	hac	2242	hac
+	language	Gurdjar	gdj	2243	gdj
+	language	Gureng Gureng	gnr	2244	gnr
+	language	Gurgula	ggg	2245	ggg
+	language	Guriaso	grx	2246	grx
+	language	Gurindji	gue	2247	gue
+	language	Gurindji Kriol	gjr	2248	gjr
+	language	Gurmana	gvm	2249	gvm
+	language	Guro	goa	2250	goa
+	language	Gurr-goni	gge	2251	gge
+	language	Gurung	gvr	2252	gvr
+	language	Guruntum-Mbaaru	grd	2253	grd
+	language	Gusii	guz	2254	guz
+	language	Gusilay	gsl	2255	gsl
+	language	Guugu Yimidhirr	kky	2256	kky
+	language	Guwa	xgw	2257	xgw
+	language	Guwamu	gwu	2258	gwu
+	language	Guya	gka	2259	gka
+	language	Guyanese Creole English	gyn	2260	gyn
+	language	Guyani	gvy	2261	gvy
+	language	Gvoko	ngs	2262	ngs
+	language	Gwa	gwb	2263	gwb
+	language	Gwahatike	dah	2264	dah
+	language	Gwak	jgk	2265	jgk
+	language	Gwamhi-Wuri	bga	2266	bga
+	language	Gwandara	gwn	2267	gwn
+	language	Gweda	grw	2268	grw
+	language	Gweno	gwe	2269	gwe
+	language	Gwere	gwr	2270	gwr
+	language	Gwich'in	gwi	2271	gwi
+	language	Gyalsumdo	gyo	2272	gyo
+	language	Gyele	gyi	2273	gyi
+	language	Gyem	gye	2274	gye
+	language	GÃŧilÃĄ Zapotec	ztu	2275	ztu
+	language	GāndhārÄĢ	pgd	2276	pgd
+	language	Ha	haq	2277	haq
+	language	Habu	hbu	2278	hbu
+	language	Hadiyya	hdy	2279	hdy
+	language	Hadothi	hoj	2280	hoj
+	language	Hadrami	xhd	2281	xhd
+	language	Hadrami Arabic	ayh	2282	ayh
+	language	Hadza	hts	2283	hts
+	language	Haeke	aek	2284	aek
+	language	Hahon	hah	2285	hah
+	language	Haida	hai	2286	hai
+	language	Haigwai	hgw	2287	hgw
+	language	Haiphong Sign Language	haf	2288	haf
+	language	Haisla	has	2289	has
+	language	Haitian Creole, Haitian	hat	2290	hat	Haitian Creole	Haitian	ht
+	language	Haitian Vodoun Culture Language	hvc	2291	hvc
+	language	HaiĮom	hgm	2292	hgm
+	language	Haji	hji	2293	hji
+	language	Hajong	haj	2294	haj
+	language	Hakha Chin	cnh	2295	cnh
+	language	Hakka Chinese	hak	2296	hak
+	language	HakÃļ	hao	2297	hao
+	language	Halang	hal	2298	hal
+	language	Halang Doan	hld	2299	hld
+	language	Halbi	hlb	2300	hlb
+	language	Halh Mongolian	khk	2301	khk
+	language	Halia	hla	2302	hla
+	language	Halkomelem	hur	2303	hur
+	language	Hamap	hmu	2304	hmu
+	language	Hamba	hba	2305	hba
+	language	Hamer-Banna	amf	2306	amf
+	language	Hamtai	hmt	2307	hmt
+	language	Han	haa	2308	haa
+	language	Hanga	hag	2309	hag
+	language	Hanga Hundi	wos	2310	wos
+	language	Hangaza	han	2311	han
+	language	Hani	hni	2312	hni
+	language	Hano	lml	2313	lml
+	language	Hanoi Sign Language	hab	2314	hab
+	language	Hanunoo	hnn	2315	hnn
+	language	Harami	xha	2316	xha
+	language	Harari	har	2317	har
+	language	Harijan Kinnauri	kjo	2318	kjo
+	language	Haroi	hro	2319	hro
+	language	Harsusi	hss	2320	hss
+	language	Haruai	tmd	2321	tmd
+	language	Haruku	hrk	2322	hrk
+	language	Haryanvi	bgc	2323	bgc
+	language	Harzani	hrz	2324	hrz
+	language	Hasha	ybj	2325	ybj
+	language	Hassaniyya	mey	2326	mey
+	language	Hatam	had	2327	had
+	language	Hattic	xht	2328	xht
+	language	Hausa	hau	2329	hau	ha
+	language	Hausa Sign Language	hsl	2330	hsl
+	language	Havasupai-Walapai-Yavapai	yuf	2331	yuf
+	language	Haveke	hvk	2332	hvk
+	language	Havu	hav	2333	hav
+	language	Hawai'i Creole English	hwc	2334	hwc
+	language	Hawai'i Sign Language (HSL)	hps	2335	hps
+	language	Hawaiian	haw	2336	haw
+	language	Haya	hay	2337	hay
+	language	Hazaragi	haz	2338	haz
+	language	Hdi	xed	2339	xed
+	language	Hebrew (modern)	heb	2340	heb	Hebrew	he
+	language	Hehe	heh	2341	heh
+	language	Heiban	hbn	2342	hbn
+	language	Heiltsuk	hei	2343	hei
+	language	Helong	heg	2344	heg
+	language	Hema	nix	2345	nix
+	language	Hemba	hem	2346	hem
+	language	HerdÊ	hed	2347	hed
+	language	Herero	her	2348	her	hz
+	language	Hermit	llf	2349	llf
+	language	Hernican	xhr	2350	xhr
+	language	Hewa	ham	2351	ham
+	language	Heyo	auk	2352	auk
+	language	Hiberno-Scottish Gaelic	ghc	2353	ghc
+	language	Hibito	hib	2354	hib
+	language	Hidatsa	hid	2355	hid
+	language	Hieroglyphic Luwian	hlu	2356	hlu
+	language	Higaonon	mba	2357	mba
+	language	Highland Konjo	kjk	2358	kjk
+	language	Highland Oaxaca Chontal	chd	2359	chd
+	language	Highland Popoluca	poi	2360	poi
+	language	Highland Puebla Nahuatl	azz	2361	azz
+	language	Highland Totonac	tos	2362	tos
+	language	Hijazi Arabic	acw	2363	acw
+	language	Hijuk	hij	2364	hij
+	language	Hiligaynon	hil	2365	hil
+	language	HimarimÃŖ	hir	2366	hir
+	language	Hindi	hin	2367	hin	hi
+	language	Hinduri	hii	2368	hii
+	language	Hinukh	gin	2369	gin
+	language	Hiri Motu	hmo	2370	hmo	ho
+	language	Hittite	hit	2371	hit
+	language	Hitu	htu	2372	htu
+	language	Hiw	hiw	2373	hiw
+	language	HixkaryÃĄna	hix	2374	hix
+	language	Hlai	lic	2375	lic
+	language	Hlepho Phowa	yhl	2376	yhl
+	language	Hlersu	hle	2377	hle
+	language	Hmar	hmr	2378	hmr
+	language	Hmong	hmn	2379	hmn
+	language	Hmong Daw	mww	2380	mww
+	language	Hmong Don	hmf	2381	hmf
+	language	Hmong Dô	hmv	2382	hmv
+	language	Hmong Njua	hnj	2383	hnj
+	language	Hmong Shua	hmz	2384	hmz
+	language	Hmwaveke	mrk	2385	mrk
+	language	Ho	hoc	2386	hoc
+	language	Ho Chi Minh City Sign Language	hos	2387	hos
+	language	Ho-Chunk	win	2388	win
+	language	Hoava	hoa	2389	hoa
+	language	HobyÃŗt	hoh	2390	hoh
+	language	Hoia Hoia	hhi	2391	hhi
+	language	Holikachuk	hoi	2392	hoi
+	language	Holiya	hoy	2393	hoy
+	language	Holma	hod	2394	hod
+	language	Holoholo	hoo	2395	hoo
+	language	Holu	hol	2396	hol
+	language	Homa	hom	2397	hom
+	language	Honduras Sign Language	hds	2398	hds
+	language	Hong Kong Sign Language	hks	2399	hks
+	language	Honi	how	2400	how
+	language	Hopi	hop	2401	hop
+	language	Horned Miao	hrm	2402	hrm
+	language	Horo	hor	2403	hor
+	language	Horom	hoe	2404	hoe
+	language	Horpa	ero	2405	ero
+	language	Hote	hot	2406	hot
+	language	Hoti	hti	2407	hti
+	language	Hovongan	hov	2408	hov
+	language	Hoyahoya	hhy	2409	hhy
+	language	Hozo	hoz	2410	hoz
+	language	Hpon	hpo	2411	hpo
+	language	Hrangkhol	hra	2412	hra
+	language	Hre	hre	2413	hre
+	language	Hruso	hru	2414	hru
+	language	Hu	huo	2415	huo
+	language	Huachipaeri	hug	2416	hug
+	language	Huallaga HuÃĄnuco Quechua	qub	2417	qub
+	language	Huamalíes-Dos de Mayo HuÃĄnuco Quechua	qvh	2418	qvh
+	language	Huambisa	hub	2419	hub
+	language	Huarijio	var	2420	var
+	language	Huastec	hus	2421	hus
+	language	Huaulu	hud	2422	hud
+	language	Huautla Mazatec	mau	2423	mau
+	language	Huaxcaleca Nahuatl	nhq	2424	nhq
+	language	Huaylas Ancash Quechua	qwh	2425	qwh
+	language	Huaylla Wanca Quechua	qvw	2426	qvw
+	language	Huba	hbb	2427	hbb
+	language	Huehuetla Tepehua	tee	2428	tee
+	language	Huichol	hch	2429	hch
+	language	Huilliche	huh	2430	huh
+	language	Huitepec Mixtec	mxs	2431	mxs
+	language	Huizhou Chinese	czh	2432	czh
+	language	Hukumina	huw	2433	huw
+	language	Hula	hul	2434	hul
+	language	HulaulÃĄ	huy	2435	huy
+	language	Huli	hui	2436	hui
+	language	Hulung	huk	2437	huk
+	language	Humburi Senni Songhay	hmb	2438	hmb
+	language	Humene	huf	2439	huf
+	language	Humla	hut	2440	hut
+	language	Hunde	hke	2441	hke
+	language	Hung	hnu	2442	hnu
+	language	Hungana	hum	2443	hum
+	language	Hungarian	hun	2444	hun	hu
+	language	Hungarian Sign Language	hsh	2445	hsh
+	language	Hungu	hng	2446	hng
+	language	Hunjara-Kaina Ke	hkk	2447	hkk
+	language	Hunnic	xhc	2448	xhc
+	language	Hunsrik	hrx	2449	hrx
+	language	Hunzib	huz	2450	huz
+	language	Hupa	hup	2451	hup
+	language	HupdÃĢ	jup	2452	jup
+	language	Hupla	hap	2453	hap
+	language	Hurrian	xhu	2454	xhu
+	language	Hutterite German	geh	2455	geh
+	language	Hwana	hwo	2456	hwo
+	language	Hya	hya	2457	hya
+	language	Hyam	jab	2458	jab
+	language	Hyolmo	scp	2459	scp
+	language	HÊrtevin	hrt	2460	hrt
+	language	HÃĩne	juh	2461	juh
+	language	I-Wak	iwk	2462	iwk
+	language	Iaai	iai	2463	iai
+	language	Iamalele	yml	2464	yml
+	language	Iatmul	ian	2465	ian
+	language	Iau	tmu	2466	tmu
+	language	Ibali Teke	tek	2467	tek
+	language	Ibaloi	ibl	2468	ibl
+	language	Iban	iba	2469	iba
+	language	Ibanag	ibg	2470	ibg
+	language	Ibani	iby	2471	iby
+	language	Ibatan	ivb	2472	ivb
+	language	Iberian	xib	2473	xib
+	language	Ibibio	ibb	2474	ibb
+	language	Ibino	ibn	2475	ibn
+	language	Ibu	ibu	2476	ibu
+	language	Ibuoro	ibr	2477	ibr
+	language	Icelandic	isl	2478	isl	ice	is
+	language	Icelandic Sign Language	icl	2479	icl
+	language	Iceve-Maci	bec	2480	bec
+	language	Ida'an	dbj	2481	dbj
+	language	Idakho-Isukha-Tiriki	ida	2482	ida
+	language	IdatÊ	idt	2483	idt
+	language	Idere	ide	2484	ide
+	language	Idesa	ids	2485	ids
+	language	Idi	idi	2486	idi
+	language	Ido	ido	2487	ido	io
+	language	Idoma	idu	2488	idu
+	language	Idon	idc	2489	idc
+	language	Idu-Mishmi	clk	2490	clk
+	language	Iduna	viv	2491	viv
+	language	Ifo	iff	2492	iff
+	language	Ifè	ife	2493	ife
+	language	Igala	igl	2494	igl
+	language	Igana	igg	2495	igg
+	language	Igbo	ibo	2496	ibo	ig
+	language	Igede	ige	2497	ige
+	language	Ignaciano	ign	2498	ign
+	language	Igo	ahl	2499	ahl
+	language	Iguta	nar	2500	nar
+	language	Igwe	igw	2501	igw
+	language	Iha	ihp	2502	ihp
+	language	Iha Based Pidgin	ihb	2503	ihb
+	language	Ihievbe	ihi	2504	ihi
+	language	Ik	ikx	2505	ikx
+	language	Ika	ikk	2506	ikk
+	language	Ikaranggal	ikr	2507	ikr
+	language	Ikhin-Arokho	ikh	2508	ikh
+	language	Ikizu	ikz	2509	ikz
+	language	Iko	iki	2510	iki
+	language	Ikobi	meb	2511	meb
+	language	Ikoma-Nata-Isenye	ntk	2512	ntk
+	language	Ikpeng	txi	2513	txi
+	language	Ikpeshi	ikp	2514	ikp
+	language	Ikposo	kpo	2515	kpo
+	language	Iku-Gora-Ankwa	ikv	2516	ikv
+	language	Ikulu	ikl	2517	ikl
+	language	Ikwere	ikw	2518	ikw
+	language	Ikwo	iqw	2519	iqw
+	language	Ila	ilb	2520	ilb
+	language	Ile Ape	ila	2521	ila
+	language	Ili Turki	ili	2522	ili
+	language	Ili'uun	ilu	2523	ilu
+	language	Ilianen Manobo	mbi	2524	mbi
+	language	Illyrian	xil	2525	xil
+	language	Iloko	ilo	2526	ilo
+	language	Ilongot	ilk	2527	ilk
+	language	Ilue	ilv	2528	ilv
+	language	Ilwana	mlk	2529	mlk
+	language	Imbabura Highland Quichua	qvi	2530	qvi
+	language	Imbongu	imo	2531	imo
+	language	Imonda	imn	2532	imn
+	language	Imotong	imt	2533	imt
+	language	Imroing	imr	2534	imr
+	language	Inabaknon	abx	2535	abx
+	language	Inapang	mzu	2536	mzu
+	language	Inari Sami	smn	2537	smn
+	language	Indian Sign Language	ins	2538	ins
+	language	Indo-Portuguese	idb	2539	idb
+	language	Indonesian	ind	2540	ind	id
+	language	Indonesian Bajau	bdl	2541	bdl
+	language	Indonesian Sign Language	inl	2542	inl
+	language	Indri	idr	2543	idr
+	language	Indus Kohistani	mvy	2544	mvy
+	language	Indus Valley Language	xiv	2545	xiv
+	language	Inebu One	oin	2546	oin
+	language	IneseÃąo	inz	2547	inz
+	language	Inga	inb	2548	inb
+	language	Ingrian	izh	2549	izh
+	language	Ingush	inh	2550	inh
+	language	Inlaod Itneg	iti	2551	iti
+	language	Innu	moe	2552	moe
+	language	Inoke-Yate	ino	2553	ino
+	language	Inonhan	loc	2554	loc
+	language	Inor	ior	2555	ior
+	language	Inpui Naga	nkf	2556	nkf
+	language	Interglossa	igs	2557	igs
+	language	Interlingua	ina	2558	ina	Interlingua	ia	Interlingua (International Auxiliary Language Association)
+	language	Interlingue	ile	2559	ile	ie
+	language	International Sign	ils	2560	ils
+	language	Interslavic	isv	2561	isv
+	language	Intha	int	2562	int
+	language	Inuinnaqtun	ikt	2563	ikt
+	language	Inuit Sign Language	iks	2564	iks
+	language	Inuktitut	iku	2565	iku	iu
+	language	Inupiaq	ipk	2566	ipk	ik
+	language	Iowa-Oto	iow	2567	iow
+	language	Ipalapa Amuzgo	azm	2568	azm
+	language	Ipiko	ipo	2569	ipo
+	language	Ipili	ipi	2570	ipi
+	language	Ipulo	ass	2571	ass
+	language	Iquito	iqu	2572	iqu
+	language	Ir	irr	2573	irr
+	language	Iranian Persian	pes	2574	pes
+	language	Iranian Sign Language	psc	2575	psc
+	language	Iranun (Malaysia)	ilm	2576	ilm
+	language	Iranun (Philippines)	ilp	2577	ilp
+	language	Iraqw	irk	2578	irk
+	language	Irarutu	irh	2579	irh
+	language	Iraya	iry	2580	iry
+	language	Iresim	ire	2581	ire
+	language	Irish	gle	2582	gle	ga
+	language	Irish Sign Language	isg	2583	isg
+	language	Irula	iru	2584	iru
+	language	IrÃĄntxe	irn	2585	irn
+	language	Isabi	isa	2586	isa
+	language	Isanzu	isn	2587	isn
+	language	Isarog Agta	agk	2588	agk
+	language	Isconahua	isc	2589	isc
+	language	Isebe	igo	2590	igo
+	language	Isekiri	its	2591	its
+	language	Ishkashimi	isk	2592	isk
+	language	Isinai	inn	2593	inn
+	language	Isirawa	srl	2594	srl
+	language	Island Carib	crb	2595	crb
+	language	Islander Creole English	icr	2596	icr
+	language	Isnag	isd	2597	isd
+	language	Isoko	iso	2598	iso
+	language	Israeli Sign Language	isr	2599	isr
+	language	Isthmus Mixe	mir	2600	mir
+	language	Isthmus Zapotec	zai	2601	zai
+	language	Isthmus-Cosoleacaque Nahuatl	nhk	2602	nhk
+	language	Isthmus-Mecayapan Nahuatl	nhx	2603	nhx
+	language	Isthmus-Pajapan Nahuatl	nhp	2604	nhp
+	language	Istriot	ist	2605	ist
+	language	Istro Romanian	ruo	2606	ruo
+	language	Isu (Fako Division)	szv	2607	szv
+	language	Isu (Menchum Division)	isu	2608	isu
+	language	Italian	ita	2609	ita	it
+	language	Italian Sign Language	ise	2610	ise
+	language	Itawit	itv	2611	itv
+	language	Itelmen	itl	2612	itl
+	language	Itene	ite	2613	ite
+	language	Iteri	itr	2614	itr
+	language	Itik	itx	2615	itx
+	language	Ito	itw	2616	itw
+	language	Itonama	ito	2617	ito
+	language	Itu Mbon Uzo	itm	2618	itm
+	language	Itundujia Mixtec	mce	2619	mce
+	language	ItzÃĄ	itz	2620	itz
+	language	Iu Mien	ium	2621	ium
+	language	Ivatan	ivv	2622	ivv
+	language	Ivbie North-Okpela-Arhe	atg	2623	atg
+	language	Iwaidja	ibd	2624	ibd
+	language	Iwal	kbm	2625	kbm
+	language	Iwam	iwm	2626	iwm
+	language	Iwur	iwo	2627	iwo
+	language	Ixcatec	ixc	2628	ixc
+	language	IxcatlÃĄn Mazatec	mzi	2629	mzi
+	language	Ixil	ixl	2630	ixl
+	language	Ixtayutla Mixtec	vmj	2631	vmj
+	language	Ixtenco Otomi	otz	2632	otz
+	language	Iyayu	iya	2633	iya
+	language	Iyive	uiv	2634	uiv
+	language	Iyo	nca	2635	nca
+	language	Iyo'wujwa Chorote	crq	2636	crq
+	language	Iyojwa'ja Chorote	crt	2637	crt
+	language	Izere	izr	2638	izr
+	language	Izii	izz	2639	izz
+	language	Izon	ijc	2640	ijc
+	language	Izora	cbo	2641	cbo
+	language	IÃąapari	inp	2642	inp
+	language	Jabutí	jbt	2643	jbt
+	language	Jad	jda	2644	jda
+	language	Jadgali	jdg	2645	jdg
+	language	Jah Hut	jah	2646	jah
+	language	Jahanka	jad	2647	jad
+	language	Jair Awyu	awv	2648	awv
+	language	Jaitmatang	xjt	2649	xjt
+	language	Jakati	jat	2650	jat
+	language	Jakattoe	jrt	2651	jrt
+	language	Jakun	jak	2652	jak
+	language	Jalapa De Díaz Mazatec	maj	2653	maj
+	language	Jalkunan	bxl	2654	bxl
+	language	Jamaican Country Sign Language	jcs	2655	jcs
+	language	Jamaican Creole English	jam	2656	jam
+	language	Jamaican Sign Language	jls	2657	jls
+	language	Jamamadí	jaa	2658	jaa
+	language	Jambi Malay	jax	2659	jax
+	language	Jamiltepec Mixtec	mxt	2660	mxt
+	language	Jamsay Dogon	djm	2661	djm
+	language	Jandai	jan	2662	jan
+	language	Jandavra	jnd	2663	jnd
+	language	Jangkang	djo	2664	djo
+	language	Jangshung	jna	2665	jna
+	language	Janji	jni	2666	jni
+	language	Japanese	jpn	2667	jpn	ja
+	language	Japanese Sign Language	jsl	2668	jsl
+	language	Japrería	jru	2669	jru
+	language	Jaqaru	jqr	2670	jqr
+	language	Jara	jaf	2671	jaf
+	language	Jarai	jra	2672	jra
+	language	Jarawa (India)	anq	2673	anq
+	language	Jaru	ddj	2674	ddj
+	language	Jauja Wanca Quechua	qxw	2675	qxw
+	language	Jaunsari	jns	2676	jns
+	language	Javanese	jav	2677	jav	jv
+	language	Javindo	jvd	2678	jvd
+	language	Jawe	jaz	2679	jaz
+	language	Jawoyn	djn	2680	djn
+	language	Jaya	jyy	2681	jyy
+	language	Jebero	jeb	2682	jeb
+	language	Jeh	jeh	2683	jeh
+	language	Jehai	jhi	2684	jhi
+	language	Jejara Naga	pzn	2685	pzn
+	language	Jejueo	jje	2686	jje
+	language	Jemez	tow	2687	tow
+	language	Jenaama Bozo	bze	2688	bze
+	language	Jennu Kurumba	xuj	2689	xuj
+	language	Jere	jer	2690	jer
+	language	Jeri Kuo	jek	2691	jek
+	language	Jerung	jee	2692	jee
+	language	Jewish Babylonian Aramaic (ca. 200-1200 CE)	tmr	2693	tmr
+	language	Jewish Palestinian Aramaic	jpa	2694	jpa
+	language	Jhankot Sign Language	jhs	2695	jhs
+	language	Jiamao	jio	2696	jio
+	language	Jiarong	jya	2697	jya
+	language	Jiba	juo	2698	juo
+	language	Jibu	jib	2699	jib
+	language	Jicarilla Apache	apj	2700	apj
+	language	Jiiddu	jii	2701	jii
+	language	Jilbe	jie	2702	jie
+	language	Jilim	jil	2703	jil
+	language	Jimi (Cameroon)	jim	2704	jim
+	language	Jimi (Nigeria)	jmi	2705	jmi
+	language	Jina	jia	2706	jia
+	language	Jingulu	jig	2707	jig
+	language	Jinyu Chinese	cjy	2708	cjy
+	language	Jiongnai Bunu	pnu	2709	pnu
+	language	Jirel	jul	2710	jul
+	language	Jiru	jrr	2711	jrr
+	language	Jita	jit	2712	jit
+	language	Jju	kaj	2713	kaj
+	language	Joba	job	2714	job
+	language	Jofotek-Bromnya	jbr	2715	jbr
+	language	Jogi	jog	2716	jog
+	language	Jola-Fonyi	dyo	2717	dyo
+	language	Jola-Kasa	csk	2718	csk
+	language	Jonkor Bourmataguil	jeu	2719	jeu
+	language	Jordanian Sign Language	jos	2720	jos
+	language	JorÃĄ	jor	2721	jor
+	language	Jowulu	jow	2722	jow
+	language	Ju	juu	2723	juu
+	language	Juang	jun	2724	jun
+	language	Judeo-Arabic	jrb	2725	jrb
+	language	Judeo-Berber	jbe	2726	jbe
+	language	Judeo-Georgian	jge	2727	jge
+	language	Judeo-Iraqi Arabic	yhd	2728	yhd
+	language	Judeo-Italian	itk	2729	itk
+	language	Judeo-Moroccan Arabic	aju	2730	aju
+	language	Judeo-Persian	jpr	2731	jpr
+	language	Judeo-Tat	jdt	2732	jdt
+	language	Judeo-Tripolitanian Arabic	yud	2733	yud
+	language	Judeo-Yemeni Arabic	jye	2734	jye
+	language	Jukun Takum	jbu	2735	jbu
+	language	Jumjum	jum	2736	jum
+	language	Jumla Sign Language	jus	2737	jus
+	language	Jumli	jml	2738	jml
+	language	Jungle Inga	inj	2739	inj
+	language	Juquila Mixe	mxq	2740	mxq
+	language	Jur Modo	bex	2741	bex
+	language	Juray	juy	2742	juy
+	language	Jurchen	juc	2743	juc
+	language	JurÃēna	jur	2744	jur
+	language	Jutish	jut	2745	jut
+	language	Juwal	mwb	2746	mwb
+	language	Juxtlahuaca Mixtec	vmc	2747	vmc
+	language	JuĮ€'hoan	ktz	2748	ktz
+	language	Jwira-Pepesa	jwi	2749	jwi
+	language	Jèrriais	nrf	2750	nrf
+	language	JÃēma	jua	2751	jua
+	language	K'iche'	quc	2752	quc
+	language	Kaamba	xku	2753	xku
+	language	Kaan	ldl	2754	ldl
+	language	Kaang Chin	ckn	2755	ckn
+	language	Kaansa	gna	2756	gna
+	language	Kaba	ksp	2757	ksp
+	language	Kabalai	kvf	2758	kvf
+	language	Kabardian	kbd	2759	kbd
+	language	Kabatei	xkp	2760	xkp
+	language	Kabiyè	kbp	2761	kbp
+	language	Kabola	klz	2762	klz
+	language	Kabore One	onk	2763	onk
+	language	Kabras	lkb	2764	lkb
+	language	Kaburi	uka	2765	uka
+	language	Kabutra	kbu	2766	kbu
+	language	Kabuverdianu	kea	2767	kea
+	language	Kabwa	cwa	2768	cwa
+	language	Kabwari	kcw	2769	kcw
+	language	Kabyle	kab	2770	kab
+	language	Kachama-Ganjule	kcx	2771	kcx
+	language	Kachari	xac	2772	xac
+	language	Kachhi	kfr	2773	kfr
+	language	Kachi Koli	gjk	2774	gjk
+	language	Kachin	kac	2775	kac
+	language	Kachok	xkk	2776	xkk
+	language	Kacipo-Bale Suri	koe	2777	koe
+	language	Kadai	kzd	2778	kzd
+	language	Kadar	kej	2779	kej
+	language	Kadaru	kdu	2780	kdu
+	language	Kadazan Dusun	dtp	2781	dtp
+	language	KadiwÊu	kbc	2782	kbc
+	language	Kadu	zkd	2783	zkd
+	language	Kadung	dkg	2784	dkg
+	language	Kaduo	ktp	2785	ktp
+	language	Kaeku	kkq	2786	kkq
+	language	Kaera	jka	2787	jka
+	language	Kafa	kbr	2788	kbr
+	language	Kafoa	kpu	2789	kpu
+	language	Kagan Kalagan	kll	2790	kll
+	language	Kagate	syw	2791	syw
+	language	Kagayanen	cgc	2792	cgc
+	language	Kagoma	kdm	2793	kdm
+	language	Kagoro	xkg	2794	xkg
+	language	Kagulu	kki	2795	kki
+	language	Kahe	hka	2796	hka
+	language	Kahua	agw	2797	agw
+	language	Kaian	kct	2798	kct
+	language	Kaibobo	kzb	2799	kzb
+	language	Kaidipang	kzp	2800	kzp
+	language	Kaiep	kbw	2801	kbw
+	language	Kaikadi	kep	2802	kep
+	language	Kaikavian Literary Language	kjv	2803	kjv
+	language	Kaike	kzq	2804	kzq
+	language	Kaimbulawa	zka	2805	zka
+	language	KaimbÊ	xai	2806	xai
+	language	Kaingang	kgp	2807	kgp
+	language	Kairak	ckr	2808	ckr
+	language	Kairiru	kxa	2809	kxa
+	language	Kairui-Midiki	krd	2810	krd
+	language	Kais	kzm	2811	kzm
+	language	Kaitag	xdq	2812	xdq
+	language	Kaivi	kce	2813	kce
+	language	KaiwÃĄ	kgk	2814	kgk
+	language	Kaiy	tcq	2815	tcq
+	language	Kajakse	ckq	2816	ckq
+	language	Kajali	xkj	2817	xkj
+	language	Kajaman	kag	2818	kag
+	language	Kakabai	kqf	2819	kqf
+	language	Kakabe	kke	2820	kke
+	language	Kakanda	kka	2821	kka
+	language	Kaki Ae	tbd	2822	tbd
+	language	Kako	kkj	2823	kkj
+	language	Kakwa	keo	2824	keo
+	language	Kala Lagaw Ya	mwp	2825	mwp
+	language	Kalaamaya	lkm	2826	lkm
+	language	Kalabakan	kve	2827	kve
+	language	Kalabari	ijn	2828	ijn
+	language	Kalabra	kzz	2829	kzz
+	language	Kalagan	kqe	2830	kqe
+	language	Kalaktang Monpa	kkf	2831	kkf
+	language	Kalam	kmh	2832	kmh
+	language	KalamsÊ	knz	2833	knz
+	language	Kalanadi	wkl	2834	wkl
+	language	Kalanga	kck	2835	kck
+	language	Kalanguya	kak	2836	kak
+	language	Kalao	kly	2837	kly
+	language	Kalapuya	kyl	2838	kyl
+	language	Kalarko	kba	2839	kba
+	language	Kalasha	kls	2840	kls
+	language	Kalenjin	kln	2841	kln
+	language	Kalispel-Pend d'Oreille	fla	2842	fla
+	language	Kalkoti	xka	2843	xka
+	language	Kalkutung	ktg	2844	ktg
+	language	Kalmyk	xal	2845	xal
+	language	Kalo Finnish Romani	rmf	2846	rmf
+	language	Kalou	ywa	2847	ywa
+	language	Kaluli	bco	2848	bco
+	language	Kalumpang	kli	2849	kli
+	language	Kam	kdx	2850	kdx
+	language	Kamakan	vkm	2851	vkm
+	language	Kamang	woi	2852	woi
+	language	Kamano	kbq	2853	kbq
+	language	Kamantan	kci	2854	kci
+	language	Kamar	keq	2855	keq
+	language	Kamara	jmr	2856	jmr
+	language	Kamarian	kzx	2857	kzx
+	language	Kamaru	kgx	2858	kgx
+	language	Kamas	xas	2859	xas
+	language	Kamasa	klp	2860	klp
+	language	Kamasau	kms	2861	kms
+	language	Kamayo	kyk	2862	kyk
+	language	KamayurÃĄ	kay	2863	kay
+	language	Kamba (Kenya)	kam	2864	kam
+	language	Kambaata	ktb	2865	ktb
+	language	Kambaira	kyy	2866	kyy
+	language	Kambera	xbr	2867	xbr
+	language	Kamberau	irx	2868	irx
+	language	KambiwÃĄ	xbw	2869	xbw
+	language	Kami (Nigeria)	kmi	2870	kmi
+	language	Kami (Tanzania)	kcu	2871	kcu
+	language	Kamo	kcq	2872	kcq
+	language	Kamoro	kgq	2873	kgq
+	language	Kamu	xmu	2874	xmu
+	language	Kamula	xla	2875	xla
+	language	Kamviri	xvi	2876	xvi
+	language	Kamwe	hig	2877	hig
+	language	Kanakanabu	xnb	2878	xnb
+	language	Kanamarí	knm	2879	knm
+	language	Kanan	zkn	2880	zkn
+	language	Kanashi	xns	2881	xns
+	language	Kanasi	soq	2882	soq
+	language	Kanauji	bjj	2883	bjj
+	language	Kandas	kqw	2884	kqw
+	language	Kandawo	gam	2885	gam
+	language	Kande	kbs	2886	kbs
+	language	Kanembu	kbl	2887	kbl
+	language	Kang	kyp	2888	kyp
+	language	Kanga	kcp	2889	kcp
+	language	Kangean	kkv	2890	kkv
+	language	Kanggape	igm	2891	igm
+	language	Kangjia	kxs	2892	kxs
+	language	Kango (Bas-UÊlÊ District)	kty	2893	kty
+	language	Kango (Tshopo District)	kzy	2894	kzy
+	language	Kangri	xnr	2895	xnr
+	language	Kaniet	ktk	2896	ktk
+	language	Kanikkaran	kev	2897	kev
+	language	Kaningdon-Nindem	kdp	2898	kdp
+	language	Kaningi	kzo	2899	kzo
+	language	Kaningra	knr	2900	knr
+	language	Kaninuwa	wat	2901	wat
+	language	Kanite	kmu	2902	kmu
+	language	Kanjari	kft	2903	kft
+	language	Kanju	kbe	2904	kbe
+	language	Kankanaey	kne	2905	kne
+	language	Kannada	kan	2906	kan	kn
+	language	Kannada Kurumba	kfi	2907	kfi
+	language	Kanowit-Tanjong Melanau	kxn	2908	kxn
+	language	KanoÊ	kxo	2909	kxo
+	language	Kansa	ksk	2910	ksk
+	language	Kantosi	xkt	2911	xkt
+	language	Kanu	khx	2912	khx
+	language	Kanufi	kni	2913	kni
+	language	Kanuri	kau	2914	kau	kr
+	language	Kanyok	kny	2915	kny
+	language	Kao	kax	2916	kax
+	language	Kaonde	kqn	2917	kqn
+	language	Kap	ykm	2918	ykm
+	language	Kapin	tbx	2919	tbx
+	language	KapinawÃĄ	xpn	2920	xpn
+	language	Kapingamarangi	kpg	2921	kpg
+	language	Kapori	khp	2922	khp
+	language	Kapriman	dju	2923	dju
+	language	Kaptiau	kbi	2924	kbi
+	language	Kapya	klo	2925	klo
+	language	Kaqchikel	cak	2926	cak
+	language	Kara (Central African Republic)	kah	2927	kah
+	language	Kara (Korea)	zra	2928	zra
+	language	Kara (Papua New Guinea)	leu	2929	leu
+	language	Kara (Tanzania)	reg	2930	reg
+	language	Kara-Kalpak	kaa	2931	kaa
+	language	Karachay-Balkar	krc	2932	krc
+	language	Karagas	kim	2933	kim
+	language	Karaim	kdr	2934	kdr
+	language	Karajarri	gbd	2935	gbd
+	language	KarajÃĄ	kpj	2936	kpj
+	language	Karakhanid	xqa	2937	xqa
+	language	Karami	xar	2938	xar
+	language	Karamojong	kdj	2939	kdj
+	language	Karang	kzr	2940	kzr
+	language	Karanga	kth	2941	kth
+	language	Karankawa	zkk	2942	zkk
+	language	Karao	kyj	2943	kyj
+	language	Karas	kgv	2944	kgv
+	language	Karata	kpt	2945	kpt
+	language	Karawa	xrw	2946	xrw
+	language	Karbi	mjw	2947	mjw
+	language	Kare (Central African Republic)	kbn	2948	kbn
+	language	Kare (Papua New Guinea)	kmf	2949	kmf
+	language	Karekare	kai	2950	kai
+	language	Karelian	krl	2951	krl
+	language	Karenggapa	eaa	2952	eaa
+	language	Karey	kyd	2953	kyd
+	language	Kari	kbj	2954	kbj
+	language	Karingani	kgn	2955	kgn
+	language	Karipuna	kuq	2956	kuq
+	language	KaripÃēna Creole French	kmv	2957	kmv
+	language	Karirí-XocÃŗ	kzw	2958	kzw
+	language	KaritiÃĸna	ktn	2959	ktn
+	language	Kariya	kil	2960	kil
+	language	Kariyarra	vka	2961	vka
+	language	Karkar-Yuri	yuj	2962	yuj
+	language	Karkin	krb	2963	krb
+	language	Karko	kko	2964	kko
+	language	Karnai	bbv	2965	bbv
+	language	Karo (Brazil)	arr	2966	arr
+	language	Karo (Ethiopia)	kxh	2967	kxh
+	language	Karok	kyh	2968	kyh
+	language	Karon	krx	2969	krx
+	language	Karon Dori	kgw	2970	kgw
+	language	Karore	xkx	2971	xkx
+	language	Karuwali	rxw	2972	rxw
+	language	Kasanga	ccj	2973	ccj
+	language	Kasem	xsm	2974	xsm
+	language	Kashaya	kju	2975	kju
+	language	Kashmiri	kas	2976	kas	ks
+	language	Kashubian	csb	2977	csb
+	language	Kasiguranin	ksn	2978	ksn
+	language	Kaska	kkz	2979	kkz
+	language	Kaskean	zsk	2980	zsk
+	language	Kasua	khs	2981	khs
+	language	Katabaga	ktq	2982	ktq
+	language	Katawixi	xat	2983	xat
+	language	Katbol	tmb	2984	tmb
+	language	Katcha-Kadugli-Miri	xtc	2985	xtc
+	language	Kathoriya Tharu	tkt	2986	tkt
+	language	Kathu	ykt	2987	ykt
+	language	Kati	bsh	2988	bsh
+	language	Katkari	kfu	2989	kfu
+	language	Katla	kcr	2990	kcr
+	language	Kato	ktw	2991	ktw
+	language	Katso	kaf	2992	kaf
+	language	Katua	kta	2993	kta
+	language	Katukína	kav	2994	kav
+	language	Kaulong	pss	2995	pss
+	language	Kaur	vkk	2996	vkk
+	language	Kaure	bpp	2997	bpp
+	language	Kaurna	zku	2998	zku
+	language	Kauwera	xau	2999	xau
+	language	Kavalan	ckv	3000	ckv
+	language	Kavet	krv	3001	krv
+	language	Kawacha	kcb	3002	kcb
+	language	Kawaiisu	xaw	3003	xaw
+	language	Kawe	kgb	3004	kgb
+	language	Kawi	kaw	3005	kaw
+	language	Kaxararí	ktx	3006	ktx
+	language	KaxuiÃĸna	kbb	3007	kbb
+	language	Kayabí	kyz	3008	kyz
+	language	Kayagar	kyt	3009	kyt
+	language	Kayan	pdu	3010	pdu
+	language	Kayan Mahakam	xay	3011	xay
+	language	Kayan River Kayan	xkn	3012	xkn
+	language	KayapÃŗ	txu	3013	txu
+	language	Kayardild	gyd	3014	gyd
+	language	Kayaw	kvl	3015	kvl
+	language	Kayeli	kzl	3016	kzl
+	language	Kayong	kxy	3017	kxy
+	language	Kayort	kyv	3018	kyv
+	language	Kaytetye	gbb	3019	gbb
+	language	Kayupulau	kzu	3020	kzu
+	language	Kazakh	kaz	3021	kaz	kk
+	language	Kazukuru	kzk	3022	kzk
+	language	Ke'o	xxk	3023	xxk
+	language	Keak	keh	3024	keh
+	language	Keapara	khz	3025	khz
+	language	Kedah Malay	meo	3026	meo
+	language	Kedang	ksx	3027	ksx
+	language	Keder	kdy	3028	kdy
+	language	Keerray-Woorroong	wkr	3029	wkr
+	language	Kehu	khh	3030	khh
+	language	Kei	kei	3031	kei
+	language	Keiga	kec	3032	kec
+	language	Kein	bmh	3033	bmh
+	language	Keiyo	eyo	3034	eyo
+	language	Kekchí	kek	3035	kek
+	language	Kela (Democratic Republic of Congo)	kel	3036	kel
+	language	Kela (Papua New Guinea)	kcl	3037	kcl
+	language	Kelabit	kzi	3038	kzi
+	language	Kele (Democratic Republic of Congo)	khy	3039	khy
+	language	Kele (Papua New Guinea)	sbc	3040	sbc
+	language	Keley-I Kallahan	ify	3041	ify
+	language	Keliko	kbo	3042	kbo
+	language	Kelo	xel	3043	xel
+	language	Kelon	kyo	3044	kyo
+	language	Kemak	kem	3045	kem
+	language	Kembayan	xem	3046	xem
+	language	Kemberano	bzp	3047	bzp
+	language	Kembra	xkw	3048	xkw
+	language	Kemedzung	dmo	3049	dmo
+	language	Kemi Sami	sjk	3050	sjk
+	language	Kemiehua	kfj	3051	kfj
+	language	Kemtuik	kmt	3052	kmt
+	language	Kenaboi	xbn	3053	xbn
+	language	Kenati	gat	3054	gat
+	language	Kendayan	knx	3055	knx
+	language	Kendeje	klf	3056	klf
+	language	Kendem	kvm	3057	kvm
+	language	Kenga	kyq	3058	kyq
+	language	Keningau Murut	kxi	3059	kxi
+	language	Keninjal	knl	3060	knl
+	language	Kensiu	kns	3061	kns
+	language	Kenswei Nsei	ndb	3062	ndb
+	language	Kenyan Sign Language	xki	3063	xki
+	language	Kenyang	ken	3064	ken
+	language	Kenyi	lke	3065	lke
+	language	Kenzi	xnz	3066	xnz
+	language	Keoru-Ahia	xeu	3067	xeu
+	language	KepkiriwÃĄt	kpn	3068	kpn
+	language	Kepo'	kuk	3069	kuk
+	language	Kera	ker	3070	ker
+	language	Kerak	hhr	3071	hhr
+	language	Kereho	xke	3072	xke
+	language	Kerek	krk	3073	krk
+	language	Kerewe	ked	3074	ked
+	language	Kerewo	kxz	3075	kxz
+	language	Kerinci	kvr	3076	kvr
+	language	Kesawai	xes	3077	xes
+	language	Ket	ket	3078	ket
+	language	Ketangalan	kae	3079	kae
+	language	Kete	kcv	3080	kcv
+	language	Ketengban	xte	3081	xte
+	language	Ketum	ktt	3082	ktt
+	language	Keyagana	kyg	3083	kyg
+	language	Kgalagadi	xkv	3084	xkv
+	language	Khah	hkh	3085	hkh
+	language	Khakas	kjh	3086	kjh
+	language	Khalaj	klj	3087	klj
+	language	Khaling	klr	3088	klr
+	language	Khamba	kbg	3089	kbg
+	language	Khamnigan Mongol	ykh	3090	ykh
+	language	Khams Tibetan	khg	3091	khg
+	language	Khamti	kht	3092	kht
+	language	Khamyang	ksu	3093	ksu
+	language	Khana	ogo	3094	ogo
+	language	Khandesi	khn	3095	khn
+	language	Khanty	kca	3096	kca
+	language	Khao	xao	3097	xao
+	language	Kharam Naga	kfw	3098	kfw
+	language	Kharia	khr	3099	khr
+	language	Kharia Thar	ksy	3100	ksy
+	language	Khasi	kha	3101	kha
+	language	Khayo	lko	3102	lko
+	language	Khazar	zkz	3103	zkz
+	language	Khe	kqg	3104	kqg
+	language	Khehek	tlx	3105	tlx
+	language	Khengkha	xkf	3106	xkf
+	language	Khetrani	xhe	3107	xhe
+	language	Khezha Naga	nkh	3108	nkh
+	language	Khiamniungan Naga	kix	3109	kix
+	language	Khinalugh	kjj	3110	kjj
+	language	Khirwar	kwx	3111	kwx
+	language	Khisa	kqm	3112	kqm
+	language	Khlula	ykl	3113	ykl
+	language	Khmer	khm	3114	khm	km
+	language	Khmu	kjg	3115	kjg
+	language	Kho'ini	xkc	3116	xkc
+	language	Khoekhoe	naq	3117	naq
+	language	Khoibu Naga	nkb	3118	nkb
+	language	Kholok	ktc	3119	ktc
+	language	Khorasani Turkish	kmz	3120	kmz
+	language	Khorezmian	zkh	3121	zkh
+	language	Khotanese	kho	3122	kho
+	language	Khowar	khw	3123	khw
+	language	Khua	xhv	3124	xhv
+	language	Khuen	khf	3125	khf
+	language	Khumi Chin	cnk	3126	cnk
+	language	Khunsari	kfm	3127	kfm
+	language	Khvarshi	khv	3128	khv
+	language	KhÃĄng	kjm	3129	kjm
+	language	KhÃŧn	kkh	3130	kkh
+	language	Kibala	blv	3131	blv
+	language	Kibet	kie	3132	kie
+	language	Kibiri	prm	3133	prm
+	language	Kickapoo	kic	3134	kic
+	language	Kija	gia	3135	gia
+	language	Kikai	kzg	3136	kzg
+	language	Kikuyu, Gikuyu	kik	3137	kik	Kikuyu	Gikuyu	ki
+	language	Kildin Sami	sjd	3138	sjd
+	language	Kilivila	kij	3139	kij
+	language	Kiliwa	klb	3140	klb
+	language	Kilmeri	kih	3141	kih
+	language	Kim	kia	3142	kia
+	language	Kim Mun	mji	3143	mji
+	language	Kimaama	kig	3144	kig
+	language	Kimaragang	kqr	3145	kqr
+	language	Kimbu	kiv	3146	kiv
+	language	Kimbundu	kmb	3147	kmb
+	language	Kimki	sbt	3148	sbt
+	language	KimrÊ	kqp	3149	kqp
+	language	Kinabalian	cbw	3150	cbw
+	language	Kinalakna	kco	3151	kco
+	language	Kinamiging Manobo	mkx	3152	mkx
+	language	Kinaray-A	krj	3153	krj
+	language	Kinga	zga	3154	zga
+	language	Kinnauri	kfk	3155	kfk
+	language	Kintaq	knq	3156	knq
+	language	Kinuku	kkd	3157	kkd
+	language	Kinyarwanda	kin	3158	kin	rw
+	language	Kioko	ues	3159	ues
+	language	Kiong	kkm	3160	kkm
+	language	Kiorr	xko	3161	xko
+	language	Kiowa	kio	3162	kio
+	language	Kiowa Apache	apk	3163	apk
+	language	Kipsigis	sgc	3164	sgc
+	language	Kiput	kyi	3165	kyi
+	language	Kir-Balar	kkr	3166	kkr
+	language	Kire	geb	3167	geb
+	language	Kirghiz	kir	3168	kir	Kyrgyz	ky
+	language	Kirike	okr	3169	okr
+	language	Kirikiri	kiy	3170	kiy
+	language	Kirmanjki (individual language)	kiu	3171	kiu
+	language	Kirundi	run	3172	run	Rundi	rn
+	language	Kirya-Konzəl	fkk	3173	fkk
+	language	Kis	kis	3174	kis
+	language	Kisa	lks	3175	lks
+	language	Kisan	xis	3176	xis
+	language	Kisankasa	kqh	3177	kqh
+	language	Kisar	kje	3178	kje
+	language	Kisi	kiz	3179	kiz
+	language	Kistane	gru	3180	gru
+	language	Kita Maninkakan	mwk	3181	mwk
+	language	Kitan	zkt	3182	zkt
+	language	Kitsai	kii	3183	kii
+	language	Kituba (Congo)	mkw	3184	mkw
+	language	Kituba (Democratic Republic of Congo)	ktu	3185	ktu
+	language	Kiunum	wei	3186	wei
+	language	Kizamani	izm	3187	izm
+	language	Kla-Dan	lda	3188	lda
+	language	Klamath-Modoc	kla	3189	kla
+	language	Klao	klu	3190	klu
+	language	Klias River Kadazan	kqt	3191	kqt
+	language	Klingon	tlh	3192	tlh
+	language	Knaanic	czk	3193	czk
+	language	Ko	fuj	3194	fuj
+	language	Koalib	kib	3195	kib
+	language	Koasati	cku	3196	cku
+	language	Koba	kpd	3197	kpd
+	language	Kobiana	kcj	3198	kcj
+	language	Kobo	okc	3199	okc
+	language	Kobol	kgu	3200	kgu
+	language	Kobon	kpw	3201	kpw
+	language	Koch	kdq	3202	kdq
+	language	Kochila Tharu	thq	3203	thq
+	language	Koda	cdz	3204	cdz
+	language	Kodaku	ksz	3205	ksz
+	language	Kodava	kfa	3206	kfa
+	language	Kodeoha	vko	3207	vko
+	language	Kodi	kod	3208	kod
+	language	Kodia	kwp	3209	kwp
+	language	Koenoem	kcs	3210	kcs
+	language	Kofa	kso	3211	kso
+	language	Kofei	kpi	3212	kpi
+	language	Kofyar	kwl	3213	kwl
+	language	Koguryo	zkg	3214	zkg
+	language	Kohin	kkx	3215	kkx
+	language	Kohistani Shina	plk	3216	plk
+	language	Koho	kpm	3217	kpm
+	language	Kohumono	bcs	3218	bcs
+	language	Koi	kkt	3219	kkt
+	language	Koireng	nkd	3220	nkd
+	language	Koitabu	kqi	3221	kqi
+	language	Koiwat	kxt	3222	kxt
+	language	Kok Borok	trp	3223	trp
+	language	Kok-Nar	gko	3224	gko
+	language	Kokata	ktd	3225	ktd
+	language	Koke	kou	3226	kou
+	language	Koki Naga	nxk	3227	nxk
+	language	Koko Babangk	okg	3228	okg
+	language	Kokoda	xod	3229	xod
+	language	Kokola	kzn	3230	kzn
+	language	Kokota	kkk	3231	kkk
+	language	Kol (Bangladesh)	ekl	3232	ekl
+	language	Kol (Cameroon)	biw	3233	biw
+	language	Kol (Papua New Guinea)	kol	3234	kol
+	language	Kola	kvv	3235	kvv
+	language	Kolbila	klc	3236	klc
+	language	Kolibugan Subanon	skn	3237	skn
+	language	Koluwawa	klx	3238	klx
+	language	Kom (Cameroon)	bkm	3239	bkm
+	language	Kom (India)	kmm	3240	kmm
+	language	Koma	kmy	3241	kmy
+	language	Komba	kpf	3242	kpf
+	language	Kombai	tyn	3243	tyn
+	language	Kombio	xbi	3244	xbi
+	language	Komering	kge	3245	kge
+	language	Komi	kom	3246	kom	kv
+	language	Komi-Permyak	koi	3247	koi
+	language	Komi-Zyrian	kpv	3248	kpv
+	language	Kominimung	xoi	3249	xoi
+	language	Komo (Democratic Republic of Congo)	kmw	3250	kmw
+	language	Komo (Sudan)	xom	3251	xom
+	language	Komodo	kvh	3252	kvh
+	language	Kompane	kvp	3253	kvp
+	language	Komyandaret	kzv	3254	kzv
+	language	Kon Keu	kkn	3255	kkn
+	language	Konai	kxw	3256	kxw
+	language	Konda	knd	3257	knd
+	language	Konda-Dora	kfc	3258	kfc
+	language	Koneraw	kdw	3259	kdw
+	language	Kongo	kon	3260	kon	kg
+	language	Konkani (individual language)	knn	3261	knn
+	language	Konkani (macrolanguage)	kok	3262	kok
+	language	Konkomba	xon	3263	xon
+	language	Konni	kma	3264	kma
+	language	Kono (Guinea)	knu	3265	knu
+	language	Kono (Nigeria)	klk	3266	klk
+	language	Kono (Sierra Leone)	kno	3267	kno
+	language	Konomala	koa	3268	koa
+	language	Konongo	kcz	3269	kcz
+	language	Konso	kxc	3270	kxc
+	language	Konyak Naga	nbe	3271	nbe
+	language	Konyanka Maninka	mku	3272	mku
+	language	Konzo	koo	3273	koo
+	language	Koongo	kng	3274	kng
+	language	Koonzime	ozm	3275	ozm
+	language	Koorete	kqy	3276	kqy
+	language	Kopar	xop	3277	xop
+	language	Kopkaka	opk	3278	opk
+	language	Korafe-Yegha	kpr	3279	kpr
+	language	Korak	koz	3280	koz
+	language	Korana	kqz	3281	kqz
+	language	Korandje	kcy	3282	kcy
+	language	Korean	kor	3283	kor	ko
+	language	Korean Sign Language	kvk	3284	kvk
+	language	Koreguaje	coe	3285	coe
+	language	Koresh-e Rostam	okh	3286	okh
+	language	Korku	kfq	3287	kfq
+	language	Korlai Creole Portuguese	vkp	3288	vkp
+	language	Koro (Côte d'Ivoire)	kfo	3289	kfo
+	language	Koro (India)	jkr	3290	jkr
+	language	Koro (Papua New Guinea)	kxr	3291	kxr
+	language	Koro (Vanuatu)	krf	3292	krf
+	language	Koro Nulu	vkn	3293	vkn
+	language	Koro Wachi	bqv	3294	bqv
+	language	Koro Zuba	vkz	3295	vkz
+	language	KoromfÊ	kfz	3296	kfz
+	language	Koromira	kqj	3297	kqj
+	language	Koronadal Blaan	bpr	3298	bpr
+	language	Koroni	xkq	3299	xkq
+	language	KoropÃŗ	xxr	3300	xxr
+	language	Koroshi	ktl	3301	ktl
+	language	Korowai	khe	3302	khe
+	language	Korra Koraga	kfd	3303	kfd
+	language	Korubo	xor	3304	xor
+	language	Korupun-Sela	kpq	3305	kpq
+	language	Korwa	kfp	3306	kfp
+	language	Koryak	kpy	3307	kpy
+	language	Kosadle	kiq	3308	kiq
+	language	Kosarek Yale	kkl	3309	kkl
+	language	Kosena	kze	3310	kze
+	language	Koshin	kid	3311	kid
+	language	Kosraean	kos	3312	kos
+	language	Kota (Gabon)	koq	3313	koq
+	language	Kota (India)	kfe	3314	kfe
+	language	Kota Bangun Kutai Malay	mqg	3315	mqg
+	language	Kota Marudu Talantang	grm	3316	grm
+	language	Kotafon Gbe	kqk	3317	kqk
+	language	Kotava	avk	3318	avk
+	language	Koti	eko	3319	eko
+	language	Kott	zko	3320	zko
+	language	Kou	snz	3321	snz
+	language	Kouya	kyf	3322	kyf
+	language	Kovai	kqb	3323	kqb
+	language	Kove	kvc	3324	kvc
+	language	Kowaki	xow	3325	xow
+	language	Kowiai	kwh	3326	kwh
+	language	Koy Sanjaq Surat	kqd	3327	kqd
+	language	Koya	kff	3328	kff
+	language	Koyaga	kga	3329	kga
+	language	Koyo	koh	3330	koh
+	language	Koyra Chiini Songhay	khq	3331	khq
+	language	Koyraboro Senni Songhai	ses	3332	ses
+	language	Koyukon	koy	3333	koy
+	language	Kpagua	kuw	3334	kuw
+	language	Kpala	kpl	3335	kpl
+	language	Kpan	kpk	3336	kpk
+	language	Kpasam	pbn	3337	pbn
+	language	Kpati	koc	3338	koc
+	language	Kpatili	kym	3339	kym
+	language	Kpeego	cpo	3340	cpo
+	language	Kpelle	kpe	3341	kpe
+	language	Kpessi	kef	3342	kef
+	language	Kplang	kph	3343	kph
+	language	Krache	kye	3344	kye
+	language	Krahô	xra	3345	xra
+	language	Kraol	rka	3346	rka
+	language	Krenak	kqq	3347	kqq
+	language	Krevinian	zkv	3348	zkv
+	language	Kreye	xre	3349	xre
+	language	Kriang	ngt	3350	ngt
+	language	Krikati-Timbira	xri	3351	xri
+	language	Krio	kri	3352	kri
+	language	Kriol	rop	3353	rop
+	language	Krisa	ksi	3354	ksi
+	language	Krobu	kxb	3355	kxb
+	language	Krongo	kgo	3356	kgo
+	language	Krung	krr	3357	krr
+	language	Krymchak	jct	3358	jct
+	language	Kryts	kry	3359	kry
+	language	Kua	tyu	3360	tyu
+	language	Kua-nsi	ykn	3361	ykn
+	language	Kuamasi	yku	3362	yku
+	language	Kuan	uan	3363	uan
+	language	Kuanhua	xnh	3364	xnh
+	language	Kuanua	ksd	3365	ksd
+	language	Kuanyama, Kwanyama	kua	3366	kua	Kuanyama	kj	Kwanyama
+	language	Kubachi	ugh	3367	ugh
+	language	Kube	kgf	3368	kgf
+	language	Kubi	kof	3369	kof
+	language	Kubo	jko	3370	jko
+	language	Kubu	kvb	3371	kvb
+	language	Kucong	lkc	3372	lkc
+	language	Kudiya	kfg	3373	kfg
+	language	Kudmali	kyw	3374	kyw
+	language	Kudu-Camo	kov	3375	kov
+	language	Kufr Qassem Sign Language (KQSL)	sqx	3376	sqx
+	language	Kugama	kow	3377	kow
+	language	Kugbo	kes	3378	kes
+	language	Kugu-Muminh	xmh	3379	xmh
+	language	Kui (India)	uki	3380	uki
+	language	Kui (Indonesia)	kvd	3381	kvd
+	language	Kuijau	dkr	3382	dkr
+	language	KuikÃēro-KalapÃĄlo	kui	3383	kui
+	language	Kujarge	vkj	3384	vkj
+	language	Kuk	kfn	3385	kfn
+	language	Kukatja	kux	3386	kux
+	language	Kuke	ght	3387	ght
+	language	Kukele	kez	3388	kez
+	language	Kukna	kex	3389	kex
+	language	Kuku	ukv	3390	ukv
+	language	Kuku-Mangk	xmq	3391	xmq
+	language	Kuku-Mu'inh	xmp	3392	xmp
+	language	Kuku-Ugbanh	ugb	3393	ugb
+	language	Kuku-Uwanh	uwa	3394	uwa
+	language	Kuku-Yalanji	gvn	3395	gvn
+	language	Kula	tpg	3396	tpg
+	language	Kulere	kul	3397	kul
+	language	Kulfa	kxj	3398	kxj
+	language	Kulina Pano	xpk	3399	xpk
+	language	Kulisusu	vkl	3400	vkl
+	language	Kullu Pahari	kfx	3401	kfx
+	language	Kulon	uon	3402	uon
+	language	Kulung (Nepal)	kle	3403	kle
+	language	Kulung (Nigeria)	bbu	3404	bbu
+	language	Kumalu	ksl	3405	ksl
+	language	Kumam	kdi	3406	kdi
+	language	Kuman (Papua New Guinea)	kue	3407	kue
+	language	Kuman (Russia)	qwm	3408	qwm
+	language	Kumaoni	kfy	3409	kfy
+	language	Kumarbhag Paharia	kmj	3410	kmj
+	language	Kumba	ksm	3411	ksm
+	language	Kumbainggar	kgs	3412	kgs
+	language	Kumbaran	wkb	3413	wkb
+	language	Kumbewaha	xks	3414	xks
+	language	Kumhali	kra	3415	kra
+	language	Kumiai	dih	3416	dih
+	language	Kumukio	kuo	3417	kuo
+	language	Kumyk	kum	3418	kum
+	language	Kumzari	zum	3419	zum
+	language	Kunama	kun	3420	kun
+	language	Kunbarlang	wlg	3421	wlg
+	language	Kunda	kdn	3422	kdn
+	language	Kundal Shahi	shd	3423	shd
+	language	Kunduvadi	wku	3424	wku
+	language	Kung	kfl	3425	kfl
+	language	Kung-Ekoka	knw	3426	knw
+	language	Kungarakany	ggk	3427	ggk
+	language	Kungardutyi	gdt	3428	gdt
+	language	Kunggari	kgl	3429	kgl
+	language	Kungkari	lku	3430	lku
+	language	Kuni	kse	3431	kse
+	language	Kuni-Boazi	kvg	3432	kvg
+	language	Kunigami	xug	3433	xug
+	language	Kunimaipa	kup	3434	kup
+	language	Kunja	pep	3435	pep
+	language	Kunjen	kjn	3436	kjn
+	language	Kunyi	njx	3437	njx
+	language	Kunza	kuz	3438	kuz
+	language	Kuo	xuo	3439	xuo
+	language	Kuot	kto	3440	kto
+	language	Kupa	kug	3441	kug
+	language	Kupang Malay	mkn	3442	mkn
+	language	Kupia	key	3443	key
+	language	Kupsabiny	kpz	3444	kpz
+	language	Kur	kuv	3445	kuv
+	language	Kura Ede Nago	nqk	3446	nqk
+	language	Kurama	krh	3447	krh
+	language	Kuranko	knk	3448	knk
+	language	Kurdish	kur	3449	kur	ku
+	language	Kuri	nbn	3450	nbn
+	language	Kuria	kuj	3451	kuj
+	language	Kurichiya	kfh	3452	kfh
+	language	Kurmukar	kfv	3453	kfv
+	language	Kurnai	unn	3454	unn
+	language	Kurrama	vku	3455	vku
+	language	Kurti	ktm	3456	ktm
+	language	Kurtokha	xkz	3457	xkz
+	language	Kurudu	kjr	3458	kjr
+	language	Kurukh	kru	3459	kru
+	language	KuruÃĄya	kyr	3460	kyr
+	language	Kusaal	kus	3461	kus
+	language	Kusaghe	ksg	3462	ksg
+	language	Kushi	kuh	3463	kuh
+	language	Kusu	ksv	3464	ksv
+	language	Kusunda	kgg	3465	kgg
+	language	Kutenai	kut	3466	kut
+	language	Kutep	kub	3467	kub
+	language	Kuthant	xut	3468	xut
+	language	Kutong	skm	3469	skm
+	language	Kutto	kpa	3470	kpa
+	language	Kutu	kdc	3471	kdc
+	language	Kuturmi	khj	3472	khj
+	language	Kuuk Thaayorre	thd	3473	thd
+	language	Kuuk-Yak	uky	3474	uky
+	language	Kuuku-Ya'u	kuy	3475	kuy
+	language	Kuvale	olu	3476	olu
+	language	Kuvi	kxv	3477	kxv
+	language	Kuwaa	blh	3478	blh
+	language	Kuwaataay	cwt	3479	cwt
+	language	Kuwema	woa	3480	woa
+	language	Kuy	kdt	3481	kdt
+	language	Kven Finnish	fkv	3482	fkv
+	language	Kw'adza	wka	3483	wka
+	language	Kwa	kwb	3484	kwb
+	language	Kwa'	bko	3485	bko
+	language	Kwaami	ksq	3486	ksq
+	language	Kwadi	kwz	3487	kwz
+	language	Kwaio	kwd	3488	kwd
+	language	Kwaja	kdz	3489	kdz
+	language	Kwakiutl	kwk	3490	kwk
+	language	Kwakum	kwu	3491	kwu
+	language	Kwalhioqua-Tlatskanai	qwt	3492	qwt
+	language	Kwama	kmq	3493	kmq
+	language	Kwambi	kwm	3494	kwm
+	language	Kwamera	tnk	3495	tnk
+	language	Kwami	ktf	3496	ktf
+	language	Kwamtim One	okk	3497	okk
+	language	Kwandu	xdo	3498	xdo
+	language	Kwang	kvi	3499	kvi
+	language	Kwanga	kwj	3500	kwj
+	language	Kwangali	kwn	3501	kwn
+	language	Kwanja	knp	3502	knp
+	language	Kwara'ae	kwf	3503	kwf
+	language	Kwasio	nmg	3504	nmg
+	language	Kwaya	kya	3505	kya
+	language	Kwaza	xwa	3506	xwa
+	language	Kwegu	xwg	3507	xwg
+	language	Kwer	kwr	3508	kwr
+	language	Kwerba	kwe	3509	kwe
+	language	Kwerba Mamberamo	xwr	3510	xwr
+	language	Kwere	cwe	3511	cwe
+	language	Kwerisa	kkb	3512	kkb
+	language	Kwese	kws	3513	kws
+	language	Kwesten	kwt	3514	kwt
+	language	Kwini	gww	3515	gww
+	language	Kwinsu	kuc	3516	kuc
+	language	Kwinti	kww	3517	kww
+	language	Kwoma	kmo	3518	kmo
+	language	Kwomtari	kwo	3519	kwo
+	language	Kxoe	xuu	3520	xuu
+	language	Kyak	bka	3521	bka
+	language	Kyaka	kyc	3522	kyc
+	language	Kyan-Karyaw Naga	nqq	3523	nqq
+	language	Kyanga	tye	3524	tye
+	language	Kyenele	kql	3525	kql
+	language	Kyerung	kgy	3526	kgy
+	language	KÃĸte	kmg	3527	kmg
+	language	KÊlÊ	keb	3528	keb
+	language	KÃļlsch	ksh	3529	ksh
+	language	Kɛlɛngaxo Bozo	bzx	3530	bzx
+	language	La'bi	lbi	3531	lbi
+	language	Laal	gdm	3532	gdm
+	language	Laari	ldi	3533	ldi
+	language	Laarim	loh	3534	loh
+	language	Laba	lau	3535	lau
+	language	Label	lbb	3536	lbb
+	language	Labir	jku	3537	jku
+	language	Labo	mwi	3538	mwi
+	language	Labo Phowa	ypb	3539	ypb
+	language	Labu	lbu	3540	lbu
+	language	Labuk-Kinabatangan Kadazan	dtb	3541	dtb
+	language	Lacandon	lac	3542	lac
+	language	Lachi	lbt	3543	lbt
+	language	Lachiguiri Zapotec	zpa	3544	zpa
+	language	Lachixío Zapotec	zpl	3545	zpl
+	language	Ladakhi	lbj	3546	lbj
+	language	Ladin	lld	3547	lld
+	language	Ladino	lad	3548	lad
+	language	Ladji Ladji	llj	3549	llj
+	language	Laeko-Libuat	lkl	3550	lkl
+	language	Lafofa	laf	3551	laf
+	language	Laghu	lgb	3552	lgb
+	language	Laghuu	lgh	3553	lgh
+	language	Lagwan	kot	3554	kot
+	language	Laha (Indonesia)	lhh	3555	lhh
+	language	Laha (Viet Nam)	lha	3556	lha
+	language	Lahanan	lhn	3557	lhn
+	language	Lahnda	lah	3558	lah
+	language	Lahta Karen	kvt	3559	kvt
+	language	Lahu	lhu	3560	lhu
+	language	Lahu Shi	lhi	3561	lhi
+	language	Lahul Lohar	lhl	3562	lhl
+	language	Laimbue	lmx	3563	lmx
+	language	Laitu Chin	clj	3564	clj
+	language	Laiyolo	lji	3565	lji
+	language	Lak	lbe	3566	lbe
+	language	Laka (Chad)	lap	3567	lap
+	language	Lakalei	lka	3568	lka
+	language	Lake Miwok	lmw	3569	lmw
+	language	Lakha	lkh	3570	lkh
+	language	Laki	lki	3571	lki
+	language	Lakkia	lbc	3572	lbc
+	language	Lakon	lkn	3573	lkn
+	language	LakondÃĒ	lkd	3574	lkd
+	language	Lakota	lkt	3575	lkt
+	language	Lakota Dida	dic	3576	dic
+	language	Lakurumau	lxm	3577	lxm
+	language	Lala	nrz	3578	nrz
+	language	Lala-Bisa	leb	3579	leb
+	language	Lala-Roba	lla	3580	lla
+	language	Lalana Chinantec	cnl	3581	cnl
+	language	Lalia	lal	3582	lal
+	language	Lama (Togo)	las	3583	las
+	language	Lama Bai	lay	3584	lay
+	language	Lamaholot	slp	3585	slp
+	language	Lamalama	lby	3586	lby
+	language	Lamalera	lmr	3587	lmr
+	language	Lamang	hia	3588	hia
+	language	Lamatuka	lmq	3589	lmq
+	language	Lamba	lam	3590	lam
+	language	Lambadi	lmn	3591	lmn
+	language	Lambayeque Quechua	quf	3592	quf
+	language	Lambichhong	lmh	3593	lmh
+	language	Lamboya	lmy	3594	lmy
+	language	Lambya	lai	3595	lai
+	language	Lame	bma	3596	bma
+	language	Lamenu	lmu	3597	lmu
+	language	Lamja-Dengsa-Tola	ldh	3598	ldh
+	language	Lamkang	lmk	3599	lmk
+	language	Lamma	lev	3600	lev
+	language	Lamnso'	lns	3601	lns
+	language	Lamogai	lmg	3602	lmg
+	language	Lampung Api	ljp	3603	ljp
+	language	Lampung Nyo	abl	3604	abl
+	language	Lamu	llh	3605	llh
+	language	Lanas Lobu	ruu	3606	ruu
+	language	Landoma	ldm	3607	ldm
+	language	Lang'e	yne	3608	yne
+	language	Langam	lnm	3609	lnm
+	language	Langbashe	lna	3610	lna
+	language	Langnian Buyang	yln	3611	yln
+	language	Lango (South Sudan)	lgo	3612	lgo
+	language	Lango (Uganda)	laj	3613	laj
+	language	Langobardic	lng	3614	lng
+	language	Langue des signes de Belgique Francophone	sfb	3615	sfb
+	language	Lanima	lnw	3616	lnw
+	language	Lanoh	lnh	3617	lnh
+	language	Lao	lao	3618	lao	lo
+	language	Lao Naga	nlq	3619	nlq
+	language	Laomian	lwm	3620	lwm
+	language	Laopang	lbg	3621	lbg
+	language	Laos Sign Language	lso	3622	lso
+	language	Lapaguía-Guivini Zapotec	ztl	3623	ztl
+	language	Laragia	lrg	3624	lrg
+	language	Larantuka Malay	lrt	3625	lrt
+	language	Lardil	lbz	3626	lbz
+	language	Larevat	lrv	3627	lrv
+	language	Large Flowery Miao	hmd	3628	hmd
+	language	Lari	lrl	3629	lrl
+	language	Larike-Wakasihu	alo	3630	alo
+	language	Laro	lro	3631	lro
+	language	Larteh	lar	3632	lar
+	language	Laru	lan	3633	lan
+	language	Las Delicias Zapotec	zcd	3634	zcd
+	language	Lasalimu	llm	3635	llm
+	language	Lasgerdi	lsa	3636	lsa
+	language	Lashi	lsi	3637	lsi
+	language	Lasi	lss	3638	lss
+	language	Late Middle Chinese	ltc	3639	ltc
+	language	Latgalian	ltg	3640	ltg
+	language	Latin	lat	3641	lat	la
+	language	Latu	ltu	3642	ltu
+	language	LatundÃĒ	ltn	3643	ltn
+	language	Latvian	lav	3644	lav	lv
+	language	Latvian Sign Language	lsl	3645	lsl
+	language	Lau	llu	3646	llu
+	language	Laua	luf	3647	luf
+	language	Lauan	llx	3648	llx
+	language	Lauje	law	3649	law
+	language	Laura	lur	3650	lur
+	language	Laurentian	lre	3651	lre
+	language	Lautu Chin	clt	3652	clt
+	language	Lavatbura-Lamusong	lbv	3653	lbv
+	language	Laven	lbo	3654	lbo
+	language	Lavi	lvi	3655	lvi
+	language	Lavukaleve	lvk	3656	lvk
+	language	Lawangan	lbx	3657	lbx
+	language	Lawu	lwu	3658	lwu
+	language	Lawunuia	tgi	3659	tgi
+	language	Layakha	lya	3660	lya
+	language	Laz	lzz	3661	lzz
+	language	Lealao Chinantec	cle	3662	cle
+	language	Leco	lec	3663	lec
+	language	Ledo Kaili	lew	3664	lew
+	language	Leelau	ldk	3665	ldk
+	language	Lefa	lfa	3666	lfa
+	language	Lega-Mwenga	lgm	3667	lgm
+	language	Lega-Shabunda	lea	3668	lea
+	language	Legbo	agb	3669	agb
+	language	Legenyem	lcc	3670	lcc
+	language	Lehali	tql	3671	tql
+	language	Lehalurup	urr	3672	urr
+	language	Lehar	cae	3673	cae
+	language	Leinong Naga	lzn	3674	lzn
+	language	Leipon	lek	3675	lek
+	language	Lelak	llk	3676	llk
+	language	Lele (Chad)	lln	3677	lln
+	language	Lele (Democratic Republic of Congo)	lel	3678	lel
+	language	Lele (Guinea)	llc	3679	llc
+	language	Lele (Papua New Guinea)	lle	3680	lle
+	language	Lelemi	lef	3681	lef
+	language	Lelepa	lpa	3682	lpa
+	language	Lembena	leq	3683	leq
+	language	Lemerig	lrz	3684	lrz
+	language	Lemio	lei	3685	lei
+	language	Lemnian	xle	3686	xle
+	language	Lemolang	ley	3687	ley
+	language	Lemoro	ldj	3688	ldj
+	language	Lenakel	tnl	3689	tnl
+	language	Lenca	len	3690	len
+	language	Lendu	led	3691	led
+	language	Lengilu	lgi	3692	lgi
+	language	Lengo	lgr	3693	lgr
+	language	Lengola	lej	3694	lej
+	language	Leningitij	lnj	3695	lnj
+	language	Lenje	leh	3696	leh
+	language	Lenkau	ler	3697	ler
+	language	Lenyima	ldg	3698	ldg
+	language	Lepcha	lep	3699	lep
+	language	Lepki	lpe	3700	lpe
+	language	Lepontic	xlp	3701	xlp
+	language	Lere	gnh	3702	gnh
+	language	Lese	les	3703	les
+	language	Lesing-Gelimi	let	3704	let
+	language	Letemboi	nms	3705	nms
+	language	Leti (Cameroon)	leo	3706	leo
+	language	Leti (Indonesia)	lti	3707	lti
+	language	Levantine Arabic	apc	3708	apc
+	language	Levuka	lvu	3709	lvu
+	language	Lewo	lww	3710	lww
+	language	Lewo Eleng	lwe	3711	lwe
+	language	Lewotobi	lwt	3712	lwt
+	language	Leyigha	ayi	3713	ayi
+	language	Lezghian	lez	3714	lez
+	language	Lhokpu	lhp	3715	lhp
+	language	Lhomi	lhm	3716	lhm
+	language	Li'o	ljl	3717	ljl
+	language	Liabuku	lix	3718	lix
+	language	Liana-Seti	ste	3719	ste
+	language	Liangmai Naga	njn	3720	njn
+	language	Lianshan Zhuang	zln	3721	zln
+	language	Liberia Kpelle	xpe	3722	xpe
+	language	Liberian English	lir	3723	lir
+	language	Libido	liq	3724	liq
+	language	Libinza	liz	3725	liz
+	language	Libon Bikol	lbl	3726	lbl
+	language	Liburnian	xli	3727	xli
+	language	Libyan Arabic	ayl	3728	ayl
+	language	Libyan Sign Language	lbs	3729	lbs
+	language	Lidzonka	add	3730	add
+	language	Ligbi	lig	3731	lig
+	language	Ligenza	lgz	3732	lgz
+	language	Ligurian	lij	3733	lij
+	language	Ligurian (Ancient)	xlg	3734	xlg
+	language	Lihir	lih	3735	lih
+	language	Lijili	mgi	3736	mgi
+	language	Lika	lik	3737	lik
+	language	Liki	lio	3738	lio
+	language	Likila	lie	3739	lie
+	language	Likuba	kxx	3740	kxx
+	language	Likum	lib	3741	lib
+	language	Likwala	kwc	3742	kwc
+	language	Lilau	lll	3743	lll
+	language	Lillooet	lil	3744	lil
+	language	Limassa	bme	3745	bme
+	language	Limbu	lif	3746	lif
+	language	Limbum	lmp	3747	lmp
+	language	Limburgan, Limburger, Limburgish	lim	3748	lim	Limburgan	Limburger	Limburgish	li
+	language	Limi	ylm	3749	ylm
+	language	Limilngan	lmc	3750	lmc
+	language	Limos Kalinga	kmk	3751	kmk
+	language	Linear A	lab	3752	lab
+	language	Lingala	lin	3753	lin	ln
+	language	Lingao	onb	3754	onb
+	language	Lingarak	lgk	3755	lgk
+	language	Lingua Franca	pml	3756	pml
+	language	Lingua Franca Nova	lfn	3757	lfn
+	language	Lipan Apache	apl	3758	apl
+	language	Lipo	lpo	3759	lpo
+	language	Lisabata-Nuniali	lcs	3760	lcs
+	language	Lisela	lcl	3761	lcl
+	language	Lish	lsh	3762	lsh
+	language	Lishana Deni	lsd	3763	lsd
+	language	Lishanid Noshan	aij	3764	aij
+	language	LishÃĄn DidÃĄn	trg	3765	trg
+	language	Lisu	lis	3766	lis
+	language	Literary Chinese	lzh	3767	lzh
+	language	Lithuanian	lit	3768	lit	lt
+	language	Lithuanian Sign Language	lls	3769	lls
+	language	Litzlitz	lzl	3770	lzl
+	language	Liujiang Zhuang	zlj	3771	zlj
+	language	Liuqian Zhuang	zlq	3772	zlq
+	language	Liv	liv	3773	liv
+	language	Livvi	olo	3774	olo
+	language	Lo-Toga	lht	3775	lht
+	language	Loarki	lrk	3776	lrk
+	language	Lobala	loq	3777	loq
+	language	Lobi	lob	3778	lob
+	language	Lodhi	lbm	3779	lbm
+	language	Logba	lgq	3780	lgq
+	language	Logir	lqr	3781	lqr
+	language	Logo	log	3782	log
+	language	Logol	lof	3783	lof
+	language	Logooli	rag	3784	rag
+	language	Logorik	liu	3785	liu
+	language	Lohorung	lbr	3786	lbr
+	language	Loja Highland Quichua	qvj	3787	qvj
+	language	Lojban	jbo	3788	jbo
+	language	Lokaa	yaz	3789	yaz
+	language	Loke	loy	3790	loy
+	language	Loko	lok	3791	lok
+	language	Lokoya	lky	3792	lky
+	language	Lola	lcd	3793	lcd
+	language	Lolak	llq	3794	llq
+	language	Lole	llg	3795	llg
+	language	Lolo	llb	3796	llb
+	language	Loloda	loa	3797	loa
+	language	Lolopo	ycl	3798	ycl
+	language	Loma (Côte d'Ivoire)	loi	3799	loi
+	language	Loma (Liberia)	lom	3800	lom
+	language	Lomaiviti	lmv	3801	lmv
+	language	Lomavren	rmi	3802	rmi
+	language	Lombard	lmo	3803	lmo
+	language	Lombi	lmi	3804	lmi
+	language	Lombo	loo	3805	loo
+	language	Lomwe	ngl	3806	ngl
+	language	Loncong	lce	3807	lce
+	language	Long Phuri Naga	lpn	3808	lpn
+	language	Long Wat	ttw	3809	ttw
+	language	Longgu	lgu	3810	lgu
+	language	Longto	wok	3811	wok
+	language	Longuda	lnu	3812	lnu
+	language	Loniu	los	3813	los
+	language	Lonwolwol	crc	3814	crc
+	language	Lonzo	lnz	3815	lnz
+	language	Loo	ldo	3816	ldo
+	language	Lopa	lop	3817	lop
+	language	Lopi	lov	3818	lov
+	language	Lopit	lpx	3819	lpx
+	language	Lorang	lrn	3820	lrn
+	language	Lorediakarkar	lnn	3821	lnn
+	language	Loreto-Ucayali Spanish	spq	3822	spq
+	language	Lote	uvl	3823	uvl
+	language	Lotha Naga	njh	3824	njh
+	language	Lotud	dtr	3825	dtr
+	language	Lou	loj	3826	loj
+	language	Louisiana Creole	lou	3827	lou
+	language	Loun	lox	3828	lox
+	language	Loup A	xlo	3829	xlo
+	language	Loup B	xlb	3830	xlb
+	language	Low German	nds	3831	nds
+	language	Lower Burdekin	xbb	3832	xbb
+	language	Lower Chehalis	cea	3833	cea
+	language	Lower Grand Valley Dani	dni	3834	dni
+	language	Lower Nossob	nsb	3835	nsb
+	language	Lower Silesian	sli	3836	sli
+	language	Lower Sorbian	dsb	3837	dsb
+	language	Lower Southern Aranda	axl	3838	axl
+	language	Lower Ta'oih	tto	3839	tto
+	language	Lower Tanana	taa	3840	taa
+	language	Lowland Oaxaca Chontal	clo	3841	clo
+	language	Lowland Tarahumara	tac	3842	tac
+	language	Loxicha Zapotec	ztp	3843	ztp
+	language	Lozi	loz	3844	loz
+	language	Luang	lex	3845	lex
+	language	Luba-Katanga	lub	3846	lub	lu
+	language	Luba-Lulua	lua	3847	lua
+	language	Lubila	kcc	3848	kcc
+	language	Lubu	lcf	3849	lcf
+	language	Lubuagan Kalinga	knb	3850	knb
+	language	Luchazi	lch	3851	lch
+	language	Lucumi	luq	3852	luq
+	language	Ludian	lud	3853	lud
+	language	Lufu	ldq	3854	ldq
+	language	Lugbara	lgg	3855	lgg
+	language	Luguru	ruf	3856	ruf
+	language	Luhu	lcq	3857	lcq
+	language	Luimbi	lum	3858	lum
+	language	Luiseno	lui	3859	lui
+	language	Lukpa	dop	3860	dop
+	language	Lule	ule	3861	ule
+	language	Lule Sami	smj	3862	smj
+	language	Lumba-Yakkha	luu	3863	luu
+	language	Lumbu	lup	3864	lup
+	language	Lumun	lmd	3865	lmd
+	language	Luna	luj	3866	luj
+	language	Lunanakha	luk	3867	luk
+	language	Lunda	lun	3868	lun
+	language	Lundayeh	lnd	3869	lnd
+	language	Lungalunga	vmg	3870	vmg
+	language	Lungga	lga	3871	lga
+	language	Luo (Cameroon)	luw	3872	luw
+	language	Luo (Kenya and Tanzania)	luo	3873	luo
+	language	Luopohe Hmong	hml	3874	hml
+	language	Luri	ldd	3875	ldd
+	language	Lusengo	lse	3876	lse
+	language	Lushai	lus	3877	lus
+	language	Lushootseed	lut	3878	lut
+	language	Lusi	khl	3879	khl
+	language	Lusitanian	xls	3880	xls
+	language	Lutos	ndy	3881	ndy
+	language	Luvale	lue	3882	lue
+	language	Luwati	luv	3883	luv
+	language	Luwo	lwo	3884	lwo
+	language	Luxembourgish, Letzeburgesch	ltz	3885	ltz	Luxembourgish	lb	Letzeburgesch
+	language	Luyana	lyn	3886	lyn
+	language	Luyia	luy	3887	luy
+	language	Lwalu	lwa	3888	lwa
+	language	Lwel	lvl	3889	lvl
+	language	Lycian	xlc	3890	xlc
+	language	Lydian	xld	3891	xld
+	language	Lyngngam	lyg	3892	lyg
+	language	LyÊlÊ	lee	3893	lee
+	language	LÃĄadan	ldn	3894	ldn
+	language	LÃĄÃĄ LÃĄÃĄ Bwamu	bwj	3895	bwj
+	language	LÃŧ	khb	3896	khb
+	language	Ma (Democratic Republic of Congo)	msj	3897	msj
+	language	Ma (Papua New Guinea)	mjn	3898	mjn
+	language	Ma Manda	skc	3899	skc
+	language	Ma'anyan	mhy	3900	mhy
+	language	Ma'di	mhi	3901	mhi
+	language	Ma'ya	slz	3902	slz
+	language	Maa	cma	3903	cma
+	language	Maaka	mew	3904	mew
+	language	Maasina Fulfulde	ffm	3905	ffm
+	language	Maay	ymm	3906	ymm
+	language	Maba (Chad)	mde	3907	mde
+	language	Maba (Indonesia)	mqa	3908	mqa
+	language	Mabaale	mmz	3909	mmz
+	language	Mabaan	mfz	3910	mfz
+	language	Mabaka Valley Kalinga	kkg	3911	kkg
+	language	Mabire	muj	3912	muj
+	language	Maca	mca	3913	mca
+	language	Macaguaje	mcl	3914	mcl
+	language	MacaguÃĄn	mbn	3915	mbn
+	language	Macanese	mzs	3916	mzs
+	language	Macedo-Romanian	rup	3917	rup
+	language	Macedonian	mkd	3918	mkd	mac	mk
+	language	Machame	jmc	3919	jmc
+	language	Machiguenga	mcb	3920	mcb
+	language	Machinere	mpd	3921	mpd
+	language	Machinga	mvw	3922	mvw
+	language	Maco	wpc	3923	wpc
+	language	Macuna	myy	3924	myy
+	language	Macushi	mbc	3925	mbc
+	language	Mada (Cameroon)	mxu	3926	mxu
+	language	Mada (Nigeria)	mda	3927	mda
+	language	Madagascar Sign Language	mzc	3928	mzc
+	language	Madak	mmx	3929	mmx
+	language	Madhi Madhi	dmd	3930	dmd
+	language	Madi	grg	3931	grg
+	language	Madurese	mad	3932	mad
+	language	Mae	mme	3933	mme
+	language	Maek	hmk	3934	hmk
+	language	Maeng Itneg	itt	3935	itt
+	language	Mafa	maf	3936	maf
+	language	Mafea	mkv	3937	mkv
+	language	Mag-Indi Ayta	blx	3938	blx
+	language	Mag-antsi Ayta	sgb	3939	sgb
+	language	Magahi	mag	3940	mag
+	language	Magbukun Ayta	ayt	3941	ayt
+	language	Magdalena PeÃąasco Mixtec	xtm	3942	xtm
+	language	Magoma	gmx	3943	gmx
+	language	Magori	zgr	3944	zgr
+	language	Maguindanaon	mdh	3945	mdh
+	language	Magi (Madang Province)	gkd	3946	gkd
+	language	Magiyi	gmg	3947	gmg
+	language	Mahali	mjx	3948	mjx
+	language	Mahasu Pahari	bfz	3949	bfz
+	language	Mahican	mjy	3950	mjy
+	language	Mahongwe	mhb	3951	mhb
+	language	Mahou	mxx	3952	mxx
+	language	Mai Brat	ayz	3953	ayz
+	language	Maia	sks	3954	sks
+	language	Maiadomu	mzz	3955	mzz
+	language	Maiani	tnh	3956	tnh
+	language	Maii	mmm	3957	mmm
+	language	Mailu	mgu	3958	mgu
+	language	Maindo	cwb	3959	cwb
+	language	Mainfränkisch	vmf	3960	vmf
+	language	Mainstream Kenyah	xkl	3961	xkl
+	language	Mairasi	zrs	3962	zrs
+	language	Maisin	mbq	3963	mbq
+	language	Maithili	mai	3964	mai
+	language	Maiwa (Indonesia)	wmm	3965	wmm
+	language	Maiwa (Papua New Guinea)	mti	3966	mti
+	language	Maiwala	mum	3967	mum
+	language	Majang	mpe	3968	mpe
+	language	Majera	xmj	3969	xmj
+	language	Majhi	mjz	3970	mjz
+	language	Majhwar	mmj	3971	mmj
+	language	Majukayang Kalinga	kmd	3972	kmd
+	language	Mak (China)	mkg	3973	mkg
+	language	Mak (Nigeria)	pbl	3974	pbl
+	language	Makaa	mcp	3975	mcp
+	language	Makah	myh	3976	myh
+	language	Makalero	mjb	3977	mjb
+	language	Makasae	mkz	3978	mkz
+	language	Makasar	mak	3979	mak
+	language	Makassar Malay	mfp	3980	mfp
+	language	Makayam	aup	3981	aup
+	language	Makhuwa	vmw	3982	vmw
+	language	Makhuwa-Marrevone	xmc	3983	xmc
+	language	Makhuwa-Meetto	mgh	3984	mgh
+	language	Makhuwa-Moniga	mhm	3985	mhm
+	language	Makhuwa-Saka	xsq	3986	xsq
+	language	Makhuwa-Shirima	vmk	3987	vmk
+	language	Maklew	mgf	3988	mgf
+	language	Makolkol	zmh	3989	zmh
+	language	Makonde	kde	3990	kde
+	language	Maku'a	lva	3991	lva
+	language	Makuri Naga	jmn	3992	jmn
+	language	MakurÃĄp	mpu	3993	mpu
+	language	Makwe	ymk	3994	ymk
+	language	Makyan Naga	umn	3995	umn
+	language	Mal	mlf	3996	mlf
+	language	Mal Paharia	mkb	3997	mkb
+	language	Mala (Nigeria)	ruy	3998	ruy
+	language	Mala (Papua New Guinea)	ped	3999	ped
+	language	Mala Malasar	ima	4000	ima
+	language	Malaccan Creole Malay	ccm	4001	ccm
+	language	Malaccan Creole Portuguese	mcm	4002	mcm
+	language	Malagasy	mlg	4003	mlg	mg
+	language	Malak Malak	mpb	4004	mpb
+	language	Malalamai	mmt	4005	mmt
+	language	Malango	mln	4006	mln
+	language	Malankuravan	mjo	4007	mjo
+	language	Malapandaram	mjp	4008	mjp
+	language	Malaryan	mjq	4009	mjq
+	language	Malas	mkr	4010	mkr
+	language	Malasar	ymr	4011	ymr
+	language	Malavedan	mjr	4012	mjr
+	language	Malawi Lomwe	lon	4013	lon
+	language	Malawi Sena	swk	4014	swk
+	language	Malawian Sign Language	lws	4015	lws
+	language	Malay	msa	4016	msa	may	ms	Malay	Malay (macrolanguage)
+	language	Malay (individual language)	zlm	4017	zlm
+	language	Malayalam	mal	4018	mal	ml
+	language	Malayic Dayak	xdy	4019	xdy
+	language	Malaynon	mlz	4020	mlz
+	language	Malayo	mbp	4021	mbp
+	language	Malaysian Sign Language	xml	4022	xml
+	language	Malba Birifor	bfo	4023	bfo
+	language	Maldivian, Dhivehi, Divehi	div	4024	div	dv	Maldivian	Dhivehi	Divehi
+	language	Male (Ethiopia)	mdy	4025	mdy
+	language	Male (Papua New Guinea)	mdc	4026	mdc
+	language	Malecite-Passamaquoddy	pqm	4027	pqm
+	language	Maleng	pkt	4028	pkt
+	language	Maleu-Kilenge	mgl	4029	mgl
+	language	Malfaxal	mlx	4030	mlx
+	language	Malgana	vml	4031	vml
+	language	Malgbe	mxf	4032	mxf
+	language	Mali	gcc	4033	gcc
+	language	Malila	mgq	4034	mgq
+	language	Malimba	mzd	4035	mzd
+	language	Malimpung	mli	4036	mli
+	language	Malinaltepec Me'phaa	tcf	4037	tcf
+	language	Malo	mla	4038	mla
+	language	Malol	mbk	4039	mbk
+	language	Maltese	mlt	4040	mlt	mt
+	language	Maltese Sign Language	mdl	4041	mdl
+	language	Malua Bay	mll	4042	mll
+	language	Malvi	mup	4043	mup
+	language	Malyangapa	yga	4044	yga
+	language	MalÊku Jaíka	gut	4045	gut
+	language	Mam	mam	4046	mam
+	language	Mama	mma	4047	mma
+	language	Mamaa	mhf	4048	mhf
+	language	MamaindÊ	wmd	4049	wmd
+	language	Mamanwa	mmn	4050	mmn
+	language	Mamara Senoufo	myk	4051	myk
+	language	Mamasa	mqj	4052	mqj
+	language	Mambae	mgm	4053	mgm
+	language	Mambai	mcs	4054	mcs
+	language	Mamboru	mvd	4055	mvd
+	language	Mambwe-Lungu	mgr	4056	mgr
+	language	Mampruli	maw	4057	maw
+	language	Mamuju	mqx	4058	mqx
+	language	Mamulique	emm	4059	emm
+	language	Mamusi	kdf	4060	kdf
+	language	Mamvu	mdi	4061	mdi
+	language	Man Met	mml	4062	mml
+	language	Manado Malay	xmm	4063	xmm
+	language	Manam	mva	4064	mva
+	language	Manambu	mle	4065	mle
+	language	Manangba	nmm	4066	nmm
+	language	Manangkari	znk	4067	znk
+	language	Manchu	mnc	4068	mnc
+	language	Manda (Australia)	zma	4069	zma
+	language	Manda (India)	mha	4070	mha
+	language	Manda (Tanzania)	mgs	4071	mgs
+	language	Mandahuaca	mht	4072	mht
+	language	Mandaic	mid	4073	mid
+	language	Mandan	mhq	4074	mhq
+	language	Mandandanyi	zmk	4075	zmk
+	language	Mandar	mdr	4076	mdr
+	language	Mandara	tbf	4077	tbf
+	language	Mandari	mqu	4078	mqu
+	language	Mandarin Chinese	cmn	4079	cmn
+	language	Mandaya	mry	4080	mry
+	language	Mandeali	mjl	4081	mjl
+	language	Mander	mqr	4082	mqr
+	language	Mandingo	man	4083	man
+	language	Mandinka	mnk	4084	mnk
+	language	Mandjak	mfv	4085	mfv
+	language	Mandobo Atas	aax	4086	aax
+	language	Mandobo Bawah	bwp	4087	bwp
+	language	Manem	jet	4088	jet
+	language	Mang	zng	4089	zng
+	language	Manga Kanuri	kby	4090	kby
+	language	Mangala	mem	4091	mem
+	language	Mangareva	mrv	4092	mrv
+	language	Mangarrayi	mpc	4093	mpc
+	language	Mangas	zns	4094	zns
+	language	Mangayat	myj	4095	myj
+	language	Mangbetu	mdj	4096	mdj
+	language	Mangbutu	mdk	4097	mdk
+	language	Mangerr	zme	4098	zme
+	language	Mangga Buang	mmo	4099	mmo
+	language	Manggarai	mqy	4100	mqy
+	language	Mango	mge	4101	mge
+	language	Mangole	mqc	4102	mqc
+	language	Mangseng	mbh	4103	mbh
+	language	Mangue	mom	4104	mom
+	language	Manichaean Middle Persian	xmn	4105	xmn
+	language	Manide	abd	4106	abd
+	language	Manikion	mnx	4107	mnx
+	language	Manipa	mqp	4108	mqp
+	language	Manipuri	mni	4109	mni
+	language	Mankanya	knf	4110	knf
+	language	Mankiyali	nlm	4111	nlm
+	language	Manna-Dora	mju	4112	mju
+	language	Mannan	mjv	4113	mjv
+	language	Mano	mev	4114	mev
+	language	Manombai	woo	4115	woo
+	language	Mansaka	msk	4116	msk
+	language	Mansi	mns	4117	mns
+	language	Mansoanka	msw	4118	msw
+	language	Manta	myg	4119	myg
+	language	Mantsi	nty	4120	nty
+	language	Manumanaw Karen	kxf	4121	kxf
+	language	Manx	glv	4122	glv	gv
+	language	Manya	mzj	4123	mzj
+	language	Manyawa	mny	4124	mny
+	language	Manyika	mxc	4125	mxc
+	language	Manza	mzv	4126	mzv
+	language	Mao Naga	nbi	4127	nbi
+	language	Maonan	mmd	4128	mmd
+	language	Maore Comorian	swb	4129	swb
+	language	Mape	mlh	4130	mlh
+	language	Mapena	mnm	4131	mnm
+	language	Mapia	mpy	4132	mpy
+	language	Mapidian	mpw	4133	mpw
+	language	Mapos Buang	bzh	4134	bzh
+	language	Mapoyo	mcg	4135	mcg
+	language	Mapudungun	arn	4136	arn
+	language	Mapun	sjm	4137	sjm
+	language	Maquiritari	mch	4138	mch
+	language	Mara Chin	mrh	4139	mrh
+	language	Marachi	lri	4140	lri
+	language	Maraghei	vmh	4141	vmh
+	language	Maragus	mrs	4142	mrs
+	language	Maram Naga	nma	4143	nma
+	language	Marama	lrm	4144	lrm
+	language	Maranao	mrw	4145	mrw
+	language	Maranunggu	zmr	4146	zmr
+	language	Mararit	mgb	4147	mgb
+	language	Marathi (MarāᚭhÄĢ)	mar	4148	mar	mr	Marathi	MarāᚭhÄĢ
+	language	Marau	mvr	4149	mvr
+	language	Marba	mpg	4150	mpg
+	language	Mardin Sign Language	dsz	4151	dsz
+	language	Maremgi	mrx	4152	mrx
+	language	Marenje	vmr	4153	vmr
+	language	Marfa	mvu	4154	mvu
+	language	Margany	zmc	4155	zmc
+	language	Marghi Central	mrt	4156	mrt
+	language	Marghi South	mfm	4157	mfm
+	language	Margos-Yarowilca-Lauricocha Quechua	qvm	4158	qvm
+	language	Margu	mhg	4159	mhg
+	language	Mari (East Sepik Province)	mbx	4160	mbx
+	language	Mari (Madang Province)	hob	4161	hob
+	language	Mari (Russia)	chm	4162	chm
+	language	Maria (India)	mrr	4163	mrr
+	language	Maria (Papua New Guinea)	mds	4164	mds
+	language	Maricopa	mrc	4165	mrc
+	language	Maridan	zmd	4166	zmd
+	language	Maridjabin	zmj	4167	zmj
+	language	Marik	dad	4168	dad
+	language	Marimanindji	zmm	4169	zmm
+	language	Marind	mrz	4170	mrz
+	language	Maring	mbw	4171	mbw
+	language	Maring Naga	nng	4172	nng
+	language	Maringarr	zmt	4173	zmt
+	language	Marino	mrb	4174	mrb
+	language	Mariri	mqi	4175	mqi
+	language	Maritime Sign Language	nsr	4176	nsr
+	language	MaritsauÃĄ	msp	4177	msp
+	language	Mariyedi	zmy	4178	zmy
+	language	Marka	rkm	4179	rkm
+	language	Markweeta	enb	4180	enb
+	language	Marma	rmz	4181	rmz
+	language	Marovo	mvo	4182	mvo
+	language	Marra	mec	4183	mec
+	language	Marriammu	xru	4184	xru
+	language	Marrithiyel	mfr	4185	mfr
+	language	Marrucinian	umc	4186	umc
+	language	Marshallese	mah	4187	mah	mh
+	language	Marsian	ims	4188	ims
+	language	Martha's Vineyard Sign Language	mre	4189	mre
+	language	Marti Ke	zmg	4190	zmg
+	language	Martu Wangka	mpj	4191	mpj
+	language	Martuyhunira	vma	4192	vma
+	language	Maru	mhx	4193	mhx
+	language	Marwari	mwr	4194	mwr
+	language	Marwari (India)	rwr	4195	rwr
+	language	Marwari (Pakistan)	mve	4196	mve
+	language	MarÃēbo	mzr	4197	mzr
+	language	Masaaba	myx	4198	myx
+	language	Masadiit Itneg	tis	4199	tis
+	language	Masai	mas	4200	mas
+	language	Masalit	mls	4201	mls
+	language	Masana	mcn	4202	mcn
+	language	Masbatenyo	msb	4203	msb
+	language	Mashco Piro	cuj	4204	cuj
+	language	Mashi (Nigeria)	jms	4205	jms
+	language	Mashi (Zambia)	mho	4206	mho
+	language	Masikoro Malagasy	msh	4207	msh
+	language	Masimasi	ism	4208	ism
+	language	Masiwang	bnf	4209	bnf
+	language	Maskelynes	klv	4210	klv
+	language	Maslam	msv	4211	msv
+	language	Masmaje	mes	4212	mes
+	language	Massalat	mdg	4213	mdg
+	language	Massep	mvs	4214	mvs
+	language	Matagalpa	mtn	4215	mtn
+	language	Matal	mfh	4216	mfh
+	language	Matambwe	wtb	4217	wtb
+	language	Matbat	xmt	4218	xmt
+	language	Matengo	mgv	4219	mgv
+	language	Matepi	mqe	4220	mqe
+	language	Matigsalug Manobo	mbt	4221	mbt
+	language	Matipuhy	mzo	4222	mzo
+	language	Matngala	zml	4223	zml
+	language	Mato	met	4224	met
+	language	Mato Grosso ArÃĄra	axg	4225	axg
+	language	Mator	mtm	4226	mtm
+	language	MatsÊs	mcf	4227	mcf
+	language	Mattole	mvb	4228	mvb
+	language	Matu Chin	hlt	4229	hlt
+	language	Matukar	mjk	4230	mjk
+	language	Matumbi	mgw	4231	mgw
+	language	Matya Samo	stj	4232	stj
+	language	Matís	mpq	4233	mpq
+	language	Maung	mph	4234	mph
+	language	Mauritian Sign Language	lsy	4235	lsy
+	language	Mauwake	mhl	4236	mhl
+	language	Mawa (Chad)	mcw	4237	mcw
+	language	Mawa (Nigeria)	wma	4238	wma
+	language	Mawak	mjj	4239	mjj
+	language	Mawan	mcz	4240	mcz
+	language	Mawayana	mzx	4241	mzx
+	language	Mawchi	mke	4242	mke
+	language	Mawes	mgk	4243	mgk
+	language	Maxakalí	mbl	4244	mbl
+	language	Maxi Gbe	mxl	4245	mxl
+	language	Maya Samo	sym	4246	sym
+	language	Mayaguduna	xmy	4247	xmy
+	language	Mayangna	yan	4248	yan
+	language	Mayawali	yxa	4249	yxa
+	language	Mayeka	myc	4250	myc
+	language	Mayi-Kulan	xyk	4251	xyk
+	language	Mayi-Thakurti	xyt	4252	xyt
+	language	Mayi-Yapi	xyj	4253	xyj
+	language	Mayo	mfy	4254	mfy
+	language	Mayogo	mdm	4255	mdm
+	language	Mayoyao Ifugao	ifu	4256	ifu
+	language	Mazagway	dkx	4257	dkx
+	language	Mazaltepec Zapotec	zpy	4258	zpy
+	language	Mazanderani	mzn	4259	mzn
+	language	MazatlÃĄn Mazatec	vmz	4260	vmz
+	language	MazatlÃĄn Mixe	mzl	4261	mzl
+	language	Mba	mfc	4262	mfc
+	language	Mbala	mdp	4263	mdp
+	language	Mbalanhu	lnb	4264	lnb
+	language	Mbandja	zmz	4265	zmz
+	language	Mbangala	mxg	4266	mxg
+	language	Mbangi	mgn	4267	mgn
+	language	Mbangwe	zmn	4268	zmn
+	language	Mbara (Australia)	mvl	4269	mvl
+	language	Mbara (Chad)	mpk	4270	mpk
+	language	Mbariman-Gudhinma	zmv	4271	zmv
+	language	Mbati	mdn	4272	mdn
+	language	Mbato	gwa	4273	gwa
+	language	Mbay	myb	4274	myb
+	language	Mbe	mfo	4275	mfo
+	language	Mbe'	mtk	4276	mtk
+	language	Mbelime	mql	4277	mql
+	language	Mbere	mdt	4278	mdt
+	language	Mbesa	zms	4279	zms
+	language	Mbessa	emz	4280	emz
+	language	Mbo (Cameroon)	mbo	4281	mbo
+	language	Mbo (Democratic Republic of Congo)	zmw	4282	zmw
+	language	Mboi	moi	4283	moi
+	language	Mboko	mdu	4284	mdu
+	language	Mbole	mdq	4285	mdq
+	language	Mbonga	xmb	4286	xmb
+	language	Mbongno	bgu	4287	bgu
+	language	Mbosi	mdw	4288	mdw
+	language	Mbowe	mxo	4289	mxo
+	language	Mbre	mka	4290	mka
+	language	Mbudum	xmd	4291	xmd
+	language	Mbugu	mhd	4292	mhd
+	language	Mbugwe	mgz	4293	mgz
+	language	Mbuk	bpc	4294	bpc
+	language	Mbuko	mqb	4295	mqb
+	language	Mbukushu	mhw	4296	mhw
+	language	Mbula	mna	4297	mna
+	language	Mbula-Bwazza	mbu	4298	mbu
+	language	Mbule	mlb	4299	mlb
+	language	Mbulungish	mbv	4300	mbv
+	language	Mbum	mdd	4301	mdd
+	language	Mbunda	mck	4302	mck
+	language	Mbunga	mgy	4303	mgy
+	language	Mburku	bbt	4304	bbt
+	language	Mbwela	mfu	4305	mfu
+	language	MbyÃĄ Guaraní	gun	4306	gun
+	language	Me'en	mym	4307	mym
+	language	Medebur	mjm	4308	mjm
+	language	Medefaidrin	dmf	4309	dmf
+	language	Media Lengua	mue	4310	mue
+	language	Median	xme	4311	xme
+	language	Mednyj Aleut	mud	4312	mud
+	language	Medumba	byv	4313	byv
+	language	Mefele	mfj	4314	mfj
+	language	Megam	mef	4315	mef
+	language	Megleno Romanian	ruq	4316	ruq
+	language	Mehek	nux	4317	nux
+	language	MehinÃĄku	mmh	4318	mmh
+	language	Mehri	gdq	4319	gdq
+	language	Mekeo	mek	4320	mek
+	language	Mekmek	mvk	4321	mvk
+	language	Mekwei	msf	4322	msf
+	language	Mel-Khaonh	hkn	4323	hkn
+	language	Mele-Fila	mxe	4324	mxe
+	language	Melo	mfx	4325	mfx
+	language	Melpa	med	4326	med
+	language	Memoni	mby	4327	mby
+	language	Mendalam Kayan	xkd	4328	xkd
+	language	Mendankwe-Nkwen	mfd	4329	mfd
+	language	Mende (Papua New Guinea)	sim	4330	sim
+	language	Mende (Sierra Leone)	men	4331	men
+	language	Mengaka	xmg	4332	xmg
+	language	Mengen	mee	4333	mee
+	language	Mengisa	mct	4334	mct
+	language	Menka	mea	4335	mea
+	language	Menominee	mez	4336	mez
+	language	Mentawai	mwv	4337	mwv
+	language	Menya	mcr	4338	mcr
+	language	Meoswar	mvx	4339	mvx
+	language	Mer	mnu	4340	mnu
+	language	Meramera	mxm	4341	mxm
+	language	Merei	lmb	4342	lmb
+	language	Merey	meq	4343	meq
+	language	Meriam Mir	ulk	4344	ulk
+	language	Merlav	mrm	4345	mrm
+	language	Meroitic	xmr	4346	xmr
+	language	Meru	mer	4347	mer
+	language	Merwari	wry	4348	wry
+	language	Mesaka	iyo	4349	iyo
+	language	Mescalero-Chiricahua Apache	apm	4350	apm
+	language	Mese	mci	4351	mci
+	language	Meskwaki	sac	4352	sac
+	language	Mesme	zim	4353	zim
+	language	Mesmes	mys	4354	mys
+	language	Mesopotamian Arabic	acm	4355	acm
+	language	Mesqan	mvz	4356	mvz
+	language	Messapic	cms	4357	cms
+	language	Meta'	mgo	4358	mgo
+	language	MetlatÃŗnoc Mixtec	mxv	4359	mxv
+	language	Mewari	mtr	4360	mtr
+	language	Mewati	wtm	4361	wtm
+	language	Mexican Sign Language	mfs	4362	mfs
+	language	Meyah	mej	4363	mej
+	language	Mezontla Popoloca	pbe	4364	pbe
+	language	Mezquital Otomi	ote	4365	ote
+	language	Mfinu	zmf	4366	zmf
+	language	Mfumte	nfu	4367	nfu
+	language	Mgbolizhia	gmz	4368	gmz
+	language	Mi'kmaq	mic	4369	mic
+	language	MiahuatlÃĄn Zapotec	zam	4370	zam
+	language	Miami	mia	4371	mia
+	language	Mian	mpt	4372	mpt
+	language	Miani	pla	4373	pla
+	language	Michif	crg	4374	crg
+	language	Michigamea	cmm	4375	cmm
+	language	MichoacÃĄn Mazahua	mmc	4376	mmc
+	language	MichoacÃĄn Nahuatl	ncl	4377	ncl
+	language	Mid Grand Valley Dani	dnt	4378	dnt
+	language	Mid-Southern Banda	bjo	4379	bjo
+	language	Middle Armenian	axm	4380	axm
+	language	Middle Breton	xbm	4381	xbm
+	language	Middle Cornish	cnx	4382	cnx
+	language	Middle Dutch (ca. 1050-1350)	dum	4383	dum
+	language	Middle English (1100-1500)	enm	4384	enm
+	language	Middle French (ca. 1400-1600)	frm	4385	frm
+	language	Middle High German (ca. 1050-1500)	gmh	4386	gmh
+	language	Middle Hittite	htx	4387	htx
+	language	Middle Irish (900-1200)	mga	4388	mga
+	language	Middle Khmer (1400 to 1850 CE)	xhm	4389	xhm
+	language	Middle Korean (10th-16th cent.)	okm	4390	okm
+	language	Middle Low German	gml	4391	gml
+	language	Middle Mongolian	xng	4392	xng
+	language	Middle Newar	nwx	4393	nwx
+	language	Middle Watut	mpl	4394	mpl
+	language	Middle Welsh	wlm	4395	wlm
+	language	Midob	mei	4396	mei
+	language	Migaama	mmy	4397	mmy
+	language	Migabac	mpp	4398	mpp
+	language	Migum	klm	4399	klm
+	language	Miju-Mishmi	mxj	4400	mxj
+	language	Mikasuki	mik	4401	mik
+	language	Mili	ymh	4402	ymh
+	language	Miltu	mlj	4403	mlj
+	language	Miluk	iml	4404	iml
+	language	Milyan	imy	4405	imy
+	language	Min Bei Chinese	mnp	4406	mnp
+	language	Min Dong Chinese	cdo	4407	cdo
+	language	Min Nan Chinese	nan	4408	nan
+	language	Min Zhong Chinese	czo	4409	czo
+	language	Mina (Cameroon)	hna	4410	hna
+	language	Minaean	inm	4411	inm
+	language	Minang	xrg	4412	xrg
+	language	Minangkabau	min	4413	min
+	language	Minanibai	mcv	4414	mcv
+	language	Minaveha	mvn	4415	mvn
+	language	Minderico	drc	4416	drc
+	language	Mindiri	mpn	4417	mpn
+	language	Mingang Doso	mko	4418	mko
+	language	Mingrelian	xmf	4419	xmf
+	language	Minica Huitoto	hto	4420	hto
+	language	Minidien	wii	4421	wii
+	language	Minjungbal	xjb	4422	xjb
+	language	Minkin	xxm	4423	xxm
+	language	Minoan	omn	4424	omn
+	language	Minokok	mqq	4425	mqq
+	language	Minriq	mnq	4426	mnq
+	language	Mintil	mzt	4427	mzt
+	language	Minz Zhuang	zgm	4428	zgm
+	language	Miqie	yiq	4429	yiq
+	language	Mirandese	mwl	4430	mwl
+	language	Miraya Bikol	rbl	4431	rbl
+	language	Mirgan	zrg	4432	zrg
+	language	Miriti	mmv	4433	mmv
+	language	Miriwoong	mep	4434	mep
+	language	Miriwoong Sign Language	rsm	4435	rsm
+	language	Mirning	gmr	4436	gmr
+	language	Miship	mjs	4437	mjs
+	language	Misima-Panaeati	mpx	4438	mpx
+	language	Mising	mrg	4439	mrg
+	language	Mitla Zapotec	zaw	4440	zaw
+	language	Mitlatongo Mixtec	vmm	4441	vmm
+	language	Mittu	mwu	4442	mwu
+	language	Mituku	zmq	4443	zmq
+	language	Miu	mpo	4444	mpo
+	language	Miwa	vmi	4445	vmi
+	language	Mixed Great Andamanese	gac	4446	gac
+	language	Mixtepec Mixtec	mix	4447	mix
+	language	Mixtepec Zapotec	zpm	4448	zpm
+	language	Miya	mkf	4449	mkf
+	language	Miyako	mvi	4450	mvi
+	language	Miyakubo Sign Language	ehs	4451	ehs
+	language	Miyobe	soy	4452	soy
+	language	Mlabri	mra	4453	mra
+	language	MlahsÃļ	lhs	4454	lhs
+	language	Mlap	kja	4455	kja
+	language	Mlomp	mlo	4456	mlo
+	language	Mmaala	mmu	4457	mmu
+	language	Mmen	bfm	4458	bfm
+	language	Mo'da	gbn	4459	gbn
+	language	Moabite	obm	4460	obm
+	language	Moba	mfq	4461	mfq
+	language	Mobilian	mod	4462	mod
+	language	Mobumrin Aizi	ahm	4463	ahm
+	language	Mobwa Karen	jkm	4464	jkm
+	language	Mochi	old	4465	old
+	language	Mochica	omc	4466	omc
+	language	Mocho	mhc	4467	mhc
+	language	Mocoví	moc	4468	moc
+	language	Modang	mxd	4469	mxd
+	language	Modole	mqo	4470	mqo
+	language	Moere	mvq	4471	mvq
+	language	Mofu-Gudur	mif	4472	mif
+	language	Mogholi	mhj	4473	mhj
+	language	Mogofin	mfg	4474	mfg
+	language	Mogum	mou	4475	mou
+	language	Mohave	mov	4476	mov
+	language	Mohawk	moh	4477	moh
+	language	Mohegan-Pequot	xpq	4478	xpq
+	language	Moi (Congo)	mow	4479	mow
+	language	Moi (Indonesia)	mxn	4480	mxn
+	language	Moikodi	mkp	4481	mkp
+	language	Moingi	mwz	4482	mwz
+	language	Moji	ymi	4483	ymi
+	language	Mok	mqt	4484	mqt
+	language	Mokati	wnb	4485	wnb
+	language	Moken	mwt	4486	mwt
+	language	Mokerang	mft	4487	mft
+	language	Mokilese	mkj	4488	mkj
+	language	Moklen	mkm	4489	mkm
+	language	Mokole	mkl	4490	mkl
+	language	Mokpwe	bri	4491	bri
+	language	Moksela	vms	4492	vms
+	language	Moksha	mdf	4493	mdf
+	language	Molale	mbe	4494	mbe
+	language	Molbog	pwm	4495	pwm
+	language	Moldova Sign Language	vsi	4496	vsi
+	language	Molengue	bxc	4497	bxc
+	language	Molima	mox	4498	mox
+	language	Molmo One	aun	4499	aun
+	language	Molo	zmo	4500	zmo
+	language	Molof	msl	4501	msl
+	language	Moloko	mlw	4502	mlw
+	language	Mom Jango	ver	4503	ver
+	language	Moma	myl	4504	myl
+	language	Momare	msz	4505	msz
+	language	Mombo Dogon	dmb	4506	dmb
+	language	Mombum	mso	4507	mso
+	language	Momina	mmb	4508	mmb
+	language	Momuna	mqf	4509	mqf
+	language	Mon	mnw	4510	mnw
+	language	Monastic Sign Language	mzg	4511	mzg
+	language	Mondropolon	npn	4512	npn
+	language	MondÊ	mnd	4513	mnd
+	language	Mongo	lol	4514	lol
+	language	Mongol	mgt	4515	mgt
+	language	Mongolia Buriat	bxm	4516	bxm
+	language	Mongolian	mon	4517	mon	mn
+	language	Mongolian Sign Language	msr	4518	msr
+	language	Mongondow	mog	4519	mog
+	language	Moni	mnz	4520	mnz
+	language	Mono (Cameroon)	mru	4521	mru
+	language	Mono (Democratic Republic of Congo)	mnh	4522	mnh
+	language	Mono (Solomon Islands)	mte	4523	mte
+	language	Mono (USA)	mnr	4524	mnr
+	language	Monom	moo	4525	moo
+	language	Monsang Naga	nmh	4526	nmh
+	language	Montenegrin	cnr	4527	cnr
+	language	Montol	mtl	4528	mtl
+	language	Monumbo	mxk	4529	mxk
+	language	Monzombo	moj	4530	moj
+	language	Moo	gwg	4531	gwg
+	language	Moose Cree	crm	4532	crm
+	language	MopÃĄn Maya	mop	4533	mop
+	language	Mor (Bomberai Peninsula)	moq	4534	moq
+	language	Mor (Mor Islands)	mhz	4535	mhz
+	language	Moraid	msg	4536	msg
+	language	Morawa	mze	4537	mze
+	language	Morelos Nahuatl	nhm	4538	nhm
+	language	Morerebi	xmo	4539	xmo
+	language	Moresada	msx	4540	msx
+	language	Mori Atas	mzq	4541	mzq
+	language	Mori Bawah	xmz	4542	xmz
+	language	Morigi	mdb	4543	mdb
+	language	Moriori	rrm	4544	rrm
+	language	Morisyen	mfe	4545	mfe
+	language	Moro	mor	4546	mor
+	language	Moroccan Arabic	ary	4547	ary
+	language	Moroccan Sign Language	xms	4548	xms
+	language	Morokodo	mgc	4549	mgc
+	language	Morom	bdo	4550	bdo
+	language	Moronene	mqn	4551	mqn
+	language	Morori	mok	4552	mok
+	language	Morouas	mrp	4553	mrp
+	language	Morrobalama	umg	4554	umg
+	language	Mortlockese	mrl	4555	mrl
+	language	Moru	mgd	4556	mgd
+	language	Mosimo	mqv	4557	mqv
+	language	Moskona	mtj	4558	mtj
+	language	Mossi	mos	4559	mos
+	language	Mota	mtt	4560	mtt
+	language	Motlav	mlv	4561	mlv
+	language	Motu	meu	4562	meu
+	language	Mouk-Aria	mwh	4563	mwh
+	language	Moundadan Chetty	cty	4564	cty
+	language	Mountain Koiali	kpx	4565	kpx
+	language	Mouwase	jmw	4566	jmw
+	language	Movima	mzp	4567	mzp
+	language	Moyadan Itneg	ity	4568	ity
+	language	Moyon Naga	nmo	4569	nmo
+	language	Mozambican Sign Language	mzy	4570	mzy
+	language	Mozarabic	mxi	4571	mxi
+	language	Mpade	mpi	4572	mpi
+	language	Mpalitjanh	xpj	4573	xpj
+	language	Mpi	mpz	4574	mpz
+	language	Mpiemo	mcx	4575	mcx
+	language	Mpinda	pnd	4576	pnd
+	language	Mpoto	mpa	4577	mpa
+	language	Mpotovoro	mvt	4578	mvt
+	language	Mpumpong	mgg	4579	mgg
+	language	Mpuono	zmp	4580	zmp
+	language	Mpur	akc	4581	akc
+	language	Mro-Khimi Chin	cmr	4582	cmr
+	language	Mru	mro	4583	mro
+	language	Mser	kqx	4584	kqx
+	language	Mt. Iraya Agta	atl	4585	atl
+	language	Mt. Iriga Agta	agz	4586	agz
+	language	Muak Sa-aak	ukk	4587	ukk
+	language	Mualang	mtd	4588	mtd
+	language	Mubami	tsx	4589	tsx
+	language	Mubi	mub	4590	mub
+	language	Muda	ymd	4591	ymd
+	language	Mudburra	dmw	4592	dmw
+	language	Mudhili Gadaba	gau	4593	gau
+	language	Mudu Koraga	vmd	4594	vmd
+	language	Muduga	udg	4595	udg
+	language	Mufian	aoj	4596	aoj
+	language	Mugom	muk	4597	muk
+	language	Muinane	bmr	4598	bmr
+	language	Mukha-Dora	mmk	4599	mmk
+	language	Mukulu	moz	4600	moz
+	language	Mulaha	mfw	4601	mfw
+	language	Mulam	mlm	4602	mlm
+	language	Mulao	giu	4603	giu
+	language	Mulgi	mvh	4604	mvh
+	language	Mullu Kurumba	kpb	4605	kpb
+	language	Multiple languages	mul	4606	mul
+	language	Muluridyi	vmu	4607	vmu
+	language	Mum	kqa	4608	kqa
+	language	Mumuye	mzm	4609	mzm
+	language	Muna	mnb	4610	mnb
+	language	Munda	unx	4611	unx
+	language	Mundabli	boe	4612	boe
+	language	Mundang	mua	4613	mua
+	language	Mundani	mnf	4614	mnf
+	language	Mundari	unr	4615	unr
+	language	Mundat	mmf	4616	mmf
+	language	MundurukÃē	myu	4617	myu
+	language	Mungaka	mhk	4618	mhk
+	language	Munggui	mth	4619	mth
+	language	Mungkip	mpv	4620	mpv
+	language	Muniche	myr	4621	myr
+	language	Munit	mtc	4622	mtc
+	language	Munji	mnj	4623	mnj
+	language	Munsee	umu	4624	umu
+	language	Muong	mtq	4625	mtq
+	language	Mur Pano	tkv	4626	tkv
+	language	Muratayak	asx	4627	asx
+	language	Murik (Malaysia)	mxr	4628	mxr
+	language	Murik (Papua New Guinea)	mtf	4629	mtf
+	language	Murkim	rmh	4630	rmh
+	language	Murle	mur	4631	mur
+	language	Murrinh-Patha	mwf	4632	mwf
+	language	Mursi	muz	4633	muz
+	language	Murui Huitoto	huu	4634	huu
+	language	Murupi	mqw	4635	mqw
+	language	Muruwari	zmu	4636	zmu
+	language	Musak	mmq	4637	mmq
+	language	Musar	mmi	4638	mmi
+	language	Musasa	smm	4639	smm
+	language	Musey	mse	4640	mse
+	language	Musgu	mug	4641	mug
+	language	Mushungulu	xma	4642	xma
+	language	Musi	mui	4643	mui
+	language	Muskum	mje	4644	mje
+	language	Muslim Tat	ttt	4645	ttt
+	language	Musom	msu	4646	msu
+	language	Mussau-Emira	emi	4647	emi
+	language	Muthuvan	muv	4648	muv
+	language	Mutu	tuc	4649	tuc
+	language	Muyang	muy	4650	muy
+	language	Muyuw	myw	4651	myw
+	language	Muzi	ymz	4652	ymz
+	language	Mvanip	mcj	4653	mcj
+	language	Mvuba	mxh	4654	mxh
+	language	Mwaghavul	sur	4655	sur
+	language	Mwali Comorian	wlc	4656	wlc
+	language	Mwan	moa	4657	moa
+	language	Mwani	wmw	4658	wmw
+	language	Mwatebu	mwa	4659	mwa
+	language	Mwera (Chimwera)	mwe	4660	mwe
+	language	Mwera (Nyasa)	mjh	4661	mjh
+	language	Mwimbi-Muthambi	mws	4662	mws
+	language	Myanmar Sign Language	ysm	4663	ysm
+	language	Mycenaean Greek	gmy	4664	gmy
+	language	Myene	mye	4665	mye
+	language	Mysian	yms	4666	yms
+	language	Mzieme Naga	nme	4667	nme
+	language	MÃĄghdÃŦ	gmd	4668	gmd
+	language	MÃĄku	xak	4669	xak
+	language	MÊnik	tnr	4670	tnr
+	language	Mískito	miq	4671	miq
+	language	MÃŗcheno	mhn	4672	mhn
+	language	MÃŧn Chin	mwq	4673	mwq
+	language	MÃŧndÃŧ	muh	4674	muh
+	language	MāhārāášŖáš­ri Prākrit	pmh	4675	pmh
+	language	Māori	mri	4676	mri	Māori	Maori	mao	mi
+	language	N'Ko	nqo	4677	nqo
+	language	Na	nbt	4678	nbt
+	language	Na-kara	nck	4679	nck
+	language	Naaba	nao	4680	nao
+	language	Naami	bzv	4681	bzv
+	language	Naasioi	nas	4682	nas
+	language	Naba	mne	4683	mne
+	language	Nabak	naf	4684	naf
+	language	Nabi	mty	4685	mty
+	language	Nachering	ncd	4686	ncd
+	language	Nadruvian	ndf	4687	ndf
+	language	NadÃĢb	mbj	4688	mbj
+	language	Nafaanra	nfr	4689	nfr
+	language	Nafi	srf	4690	srf
+	language	Nafri	nxx	4691	nxx
+	language	Nafusi	jbn	4692	jbn
+	language	Naga Pidgin	nag	4693	nag
+	language	Nagarchal	nbg	4694	nbg
+	language	Nage	nxe	4695	nxe
+	language	Nagumi	ngv	4696	ngv
+	language	Nahali	nlx	4697	nlx
+	language	Nahari	nhh	4698	nhh
+	language	Nai	bio	4699	bio
+	language	Najdi Arabic	ars	4700	ars
+	language	Naka'ela	nae	4701	nae
+	language	Nakai	nkj	4702	nkj
+	language	Nakame	nib	4703	nib
+	language	Nakanai	nak	4704	nak
+	language	Nake	nbk	4705	nbk
+	language	Naki	mff	4706	mff
+	language	Nakwi	nax	4707	nax
+	language	Nalca	nlc	4708	nlc
+	language	Nali	nss	4709	nss
+	language	Nalik	nal	4710	nal
+	language	Nalu	naj	4711	naj
+	language	Naluo Yi	ylo	4712	ylo
+	language	NalÃļgo	nlz	4713	nlz
+	language	Nama (Papua New Guinea)	nmx	4714	nmx
+	language	Namakura	nmk	4715	nmk
+	language	Namat	nkm	4716	nkm
+	language	Nambo	ncm	4717	ncm
+	language	Nambya	nmq	4718	nmq
+	language	Namia	nnm	4719	nnm
+	language	Namiae	nvm	4720	nvm
+	language	Namibian Sign Language	nbs	4721	nbs
+	language	Namla	naa	4722	naa
+	language	Namo	mxw	4723	mxw
+	language	Namonuito	nmt	4724	nmt
+	language	Namosi-Naitasiri-Serua	bwb	4725	bwb
+	language	Namuyi	nmy	4726	nmy
+	language	Nanai	gld	4727	gld
+	language	Nancere	nnc	4728	nnc
+	language	Nande	nnb	4729	nnb
+	language	Nandi	niq	4730	niq
+	language	NanerigÊ SÊnoufo	sen	4731	sen
+	language	Nanga Dama Dogon	nzz	4732	nzz
+	language	Nankina	nnk	4733	nnk
+	language	Nanti	cox	4734	cox
+	language	Nanticoke	nnt	4735	nnt
+	language	Nanubae	afk	4736	afk
+	language	Napo Lowland Quechua	qvo	4737	qvo
+	language	Napu	npy	4738	npy
+	language	Nar Phu	npa	4739	npa
+	language	Nara	nrb	4740	nrb
+	language	Narak	nac	4741	nac
+	language	Narango	nrg	4742	nrg
+	language	Nari Nari	rnr	4743	rnr
+	language	Naro	nhr	4744	nhr
+	language	Narom	nrm	4745	nrm
+	language	Narragansett	xnt	4746	xnt
+	language	Narua	nru	4747	nru
+	language	Narungga	nnr	4748	nnr
+	language	Nasal	nsy	4749	nsy
+	language	Nasarian	nvh	4750	nvh
+	language	Naskapi	nsk	4751	nsk
+	language	Natanzi	ntz	4752	ntz
+	language	Natchez	ncz	4753	ncz
+	language	Nateni	ntm	4754	ntm
+	language	Nathembo	nte	4755	nte
+	language	Natioro	nti	4756	nti
+	language	NatÃŧgu	ntu	4757	ntu
+	language	Nauete	nxa	4758	nxa
+	language	Naukan Yupik	ynk	4759	ynk
+	language	Nauna	ncn	4760	ncn
+	language	Nauo	nwo	4761	nwo
+	language	Nauru	nau	4762	nau	na
+	language	Navajo, Navaho	nav	4763	nav	nv	Navajo	Navaho
+	language	Navut	nsw	4764	nsw
+	language	Nawaru	nwr	4765	nwr
+	language	Nawathinehena	nwa	4766	nwa
+	language	Nawdm	nmz	4767	nmz
+	language	Nawuri	naw	4768	naw
+	language	Naxi	nxq	4769	nxq
+	language	Nayi	noz	4770	noz
+	language	Nayini	nyq	4771	nyq
+	language	Ncane	ncr	4772	ncr
+	language	Nchumbulu	nlu	4773	nlu
+	language	Nda'nda'	nnz	4774	nnz
+	language	Ndai	gke	4775	gke
+	language	Ndaka	ndk	4776	ndk
+	language	Ndali	ndh	4777	ndh
+	language	Ndam	ndm	4778	ndm
+	language	Ndamba	ndj	4779	ndj
+	language	Ndambomo	nxo	4780	nxo
+	language	Ndasa	nda	4781	nda
+	language	Ndau	ndc	4782	ndc
+	language	Nde-Gbite	ned	4783	ned
+	language	Nde-Nsele-Nta	ndd	4784	ndd
+	language	Ndemli	nml	4785	nml
+	language	Ndendeule	dne	4786	dne
+	language	Ndengereko	ndg	4787	ndg
+	language	Nding	eli	4788	eli
+	language	Ndo	ndp	4789	ndp
+	language	Ndobo	ndw	4790	ndw
+	language	Ndoe	nbb	4791	nbb
+	language	Ndogo	ndz	4792	ndz
+	language	Ndolo	ndl	4793	ndl
+	language	Ndom	nqm	4794	nqm
+	language	Ndombe	ndq	4795	ndq
+	language	Ndonde Hamba	njd	4796	njd
+	language	Ndonga	ndo	4797	ndo	ng
+	language	Ndoola	ndr	4798	ndr
+	language	Ndra'ngith	dgt	4799	dgt
+	language	Ndrulo	dno	4800	dno
+	language	Nduga	ndx	4801	ndx
+	language	Ndumu	nmd	4802	nmd
+	language	Ndunda	nuh	4803	nuh
+	language	Ndunga	ndt	4804	ndt
+	language	Ndut	ndv	4805	ndv
+	language	Ndwewe	nww	4806	nww
+	language	Ndyuka-Trio Pidgin	njt	4807	njt
+	language	Ndzwani Comorian	wni	4808	wni
+	language	Neapolitan	nap	4809	nap
+	language	Nedebang	nec	4810	nec
+	language	Nefamese	nef	4811	nef
+	language	Negerhollands	dcr	4812	dcr
+	language	Negeri Sembilan Malay	zmi	4813	zmi
+	language	Negidal	neg	4814	neg
+	language	Nehan	nsn	4815	nsn
+	language	Nek	nif	4816	nif
+	language	Nekgini	nkg	4817	nkg
+	language	Neko	nej	4818	nej
+	language	Neku	nek	4819	nek
+	language	Nema	gsn	4820	gsn
+	language	Neme	nex	4821	nex
+	language	Nemi	nem	4822	nem
+	language	Nen	nqn	4823	nqn
+	language	Nend	anh	4824	anh
+	language	Nenets	yrk	4825	yrk
+	language	Nengone	nen	4826	nen
+	language	Neo	neu	4827	neu
+	language	Neo-Hittite	nei	4828	nei
+	language	Nepalese Sign Language	nsp	4829	nsp
+	language	Nepali	nep	4830	nep	Nepali (macrolanguage)	ne
+	language	Nepali (individual language)	npi	4831	npi
+	language	Nete	net	4832	net
+	language	New Caledonian Javanese	jas	4833	jas
+	language	New Zealand Sign Language	nzs	4834	nzs
+	language	Newari	new	4835	new
+	language	Neyo	ney	4836	ney
+	language	Nez Perce	nez	4837	nez
+	language	Ngaanyatjarra	ntj	4838	ntj
+	language	Ngad'a	nxg	4839	nxg
+	language	Ngadjunmaya	nju	4840	nju
+	language	Ngadjuri	jui	4841	jui
+	language	Ngaing	nnf	4842	nnf
+	language	Ngaju	nij	4843	nij
+	language	Ngala	nud	4844	nud
+	language	Ngalakgan	nig	4845	nig
+	language	Ngalum	szb	4846	szb
+	language	Ngam	nmc	4847	nmc
+	language	Ngamambo	nbv	4848	nbv
+	language	Ngambay	sba	4849	sba
+	language	Ngamini	nmv	4850	nmv
+	language	Ngamo	nbh	4851	nbh
+	language	Ngan'gityemerri	nam	4852	nam
+	language	Nganakarti	xnk	4853	xnk
+	language	Nganasan	nio	4854	nio
+	language	Ngandi	nid	4855	nid
+	language	Ngando (Central African Republic)	ngd	4856	ngd
+	language	Ngando (Democratic Republic of Congo)	nxd	4857	nxd
+	language	Ngandyera	nne	4858	nne
+	language	Ngangam	gng	4859	gng
+	language	Ngantangarra	ntg	4860	ntg
+	language	Nganyaywana	nyx	4861	nyx
+	language	Ngardi	rxd	4862	rxd
+	language	Ngarigu	xni	4863	xni
+	language	Ngarinyin	ung	4864	ung
+	language	Ngarinyman	nbj	4865	nbj
+	language	Ngarla	nrk	4866	nrk
+	language	Ngarluma	nrl	4867	nrl
+	language	Ngarrindjeri	nay	4868	nay
+	language	Ngas	anc	4869	anc
+	language	Ngasa	nsg	4870	nsg
+	language	Ngatik Men's Creole	ngm	4871	ngm
+	language	Ngawn Chin	cnw	4872	cnw
+	language	Ngawun	nxn	4873	nxn
+	language	Ngayawung	nwg	4874	nwg
+	language	Ngazidja Comorian	zdj	4875	zdj
+	language	Ngbaka	nga	4876	nga
+	language	Ngbaka Ma'bo	nbm	4877	nbm
+	language	Ngbaka Manza	ngg	4878	ngg
+	language	Ngbee	jgb	4879	jgb
+	language	Ngbinda	nbd	4880	nbd
+	language	Ngbundu	nuu	4881	nuu
+	language	Ngelima	agh	4882	agh
+	language	Ngemba	nge	4883	nge
+	language	Ngen	gnj	4884	gnj
+	language	Ngendelengo	nql	4885	nql
+	language	Ngete	nnn	4886	nnn
+	language	Nggem	nbq	4887	nbq
+	language	Nggwahyi	ngx	4888	ngx
+	language	Ngie	ngj	4889	ngj
+	language	Ngiemboon	nnh	4890	nnh
+	language	Ngile	jle	4891	jle
+	language	Ngindo	nnq	4892	nnq
+	language	Ngiti	niy	4893	niy
+	language	Ngizim	ngi	4894	ngi
+	language	NgkÃĸlmpw Kanum	kcd	4895	kcd
+	language	Ngom	nra	4896	nra
+	language	Ngomba	jgo	4897	jgo
+	language	Ngombale	nla	4898	nla
+	language	Ngombe (Central African Republic)	nmj	4899	nmj
+	language	Ngombe (Democratic Republic of Congo)	ngc	4900	ngc
+	language	Ngongo	noq	4901	noq
+	language	Ngoni (Mozambique)	xnq	4902	xnq
+	language	Ngoni (Tanzania)	xnj	4903	xnj
+	language	Ngoshie	nsh	4904	nsh
+	language	Ngul	nlo	4905	nlo
+	language	Ngulu	ngp	4906	ngp
+	language	Nguluwan	nuw	4907	nuw
+	language	Ngumbarl	xnm	4908	xnm
+	language	Ngumbi	nui	4909	nui
+	language	Ngunawal	xul	4910	xul
+	language	Ngundi	ndn	4911	ndn
+	language	Ngundu	nue	4912	nue
+	language	Ngungwel	ngz	4913	ngz
+	language	Ngurimi	ngq	4914	ngq
+	language	Ngurmbur	nrx	4915	nrx
+	language	Nguôn	nuo	4916	nuo
+	language	Ngwaba	ngw	4917	ngw
+	language	Ngwe	nwe	4918	nwe
+	language	Ngwo	ngn	4919	ngn
+	language	Ngäbere	gym	4920	gym
+	language	Nhanda	nha	4921	nha
+	language	Nhengatu	yrl	4922	yrl
+	language	Nhirrpi	hrp	4923	hrp
+	language	Nhuwala	nhf	4924	nhf
+	language	Nias	nia	4925	nia
+	language	Nicaragua Creole English	bzk	4926	bzk
+	language	Nicaraguan Sign Language	ncs	4927	ncs
+	language	Niellim	nie	4928	nie
+	language	Nigeria Mambila	mzk	4929	mzk
+	language	Nigerian Fulfulde	fuv	4930	fuv
+	language	Nigerian Pidgin	pcm	4931	pcm
+	language	Nigerian Sign Language	nsi	4932	nsi
+	language	Nihali	nll	4933	nll
+	language	Nii	nii	4934	nii
+	language	Niksek	gbe	4935	gbe
+	language	Nila	nil	4936	nil
+	language	Nilamba	nim	4937	nim
+	language	Nimadi	noe	4938	noe
+	language	Nimanbur	nmp	4939	nmp
+	language	Nimbari	nmr	4940	nmr
+	language	Nimboran	nir	4941	nir
+	language	Nimi	nis	4942	nis
+	language	Nimo	niw	4943	niw
+	language	Nimoa	nmw	4944	nmw
+	language	Ninam	shb	4945	shb
+	language	Nindi	nxi	4946	nxi
+	language	Ningera	nby	4947	nby
+	language	Ninggerum	nxr	4948	nxr
+	language	Ningil	niz	4949	niz
+	language	Ninia Yali	nlk	4950	nlk
+	language	Ninzo	nin	4951	nin
+	language	Nipsan	nps	4952	nps
+	language	Nisa	njs	4953	njs
+	language	Nisenan	nsz	4954	nsz
+	language	Nisga'a	ncg	4955	ncg
+	language	Nisi (China)	yso	4956	yso
+	language	Niuafo'ou	num	4957	num
+	language	Niuatoputapu	nkp	4958	nkp
+	language	Niuean	niu	4959	niu
+	language	NivaclÊ	cag	4960	cag
+	language	Niwer Mil	hrc	4961	hrc
+	language	Njalgulgule	njl	4962	njl
+	language	Njebi	nzb	4963	nzb
+	language	Njen	njj	4964	njj
+	language	Njerep	njr	4965	njr
+	language	Njyem	njy	4966	njy
+	language	Nkami	nkq	4967	nkq
+	language	Nkangala	nkn	4968	nkn
+	language	Nkari	nkz	4969	nkz
+	language	Nkem-Nkum	isi	4970	isi
+	language	Nkhumbi	khu	4971	khu
+	language	Nkongho	nkc	4972	nkc
+	language	Nkonya	nko	4973	nko
+	language	Nkoroo	nkx	4974	nkx
+	language	Nkoya	nka	4975	nka
+	language	Nkukoli	nbo	4976	nbo
+	language	Nkutu	nkw	4977	nkw
+	language	Nnam	nbp	4978	nbp
+	language	No linguistic content	zxx	4979	zxx
+	language	Nobiin	fia	4980	fia
+	language	Nobonob	gaw	4981	gaw
+	language	Nocte Naga	njb	4982	njb
+	language	Nogai	nog	4983	nog
+	language	Noipx	npx	4984	npx
+	language	Noiri	noi	4985	noi
+	language	Nokuku	nkk	4986	nkk
+	language	Nomaande	lem	4987	lem
+	language	Nomane	nof	4988	nof
+	language	Nomatsiguenga	not	4989	not
+	language	Nomlaki	nol	4990	nol
+	language	Nomu	noh	4991	noh
+	language	Nong Zhuang	zhn	4992	zhn
+	language	Nonuya	noj	4993	noj
+	language	Nooksack	nok	4994	nok
+	language	Noon	snf	4995	snf
+	language	Noone	nhu	4996	nhu
+	language	Nopala Chatino	cya	4997	cya
+	language	Noric	nrc	4998	nrc
+	language	Norn	nrn	4999	nrn
+	language	Norra	nrr	5000	nrr
+	language	North Alaskan Inupiatun	esi	5001	esi
+	language	North Ambrym	mmg	5002	mmg
+	language	North Asmat	nks	5003	nks
+	language	North Awyu	yir	5004	yir
+	language	North Azerbaijani	azj	5005	azj
+	language	North Babar	bcd	5006	bcd
+	language	North Bolivian Quechua	qul	5007	qul
+	language	North Central Mixe	neq	5008	neq
+	language	North Efate	llp	5009	llp
+	language	North Fali	fll	5010	fll
+	language	North Giziga	gis	5011	gis
+	language	North Junín Quechua	qvn	5012	qvn
+	language	North Marquesan	mrq	5013	mrq
+	language	North Mesopotamian Arabic	ayp	5014	ayp
+	language	North Midlands Tasmanian	xph	5015	xph
+	language	North Mofu	mfk	5016	mfk
+	language	North Moluccan Malay	max	5017	max
+	language	North Muyu	kti	5018	kti
+	language	North Nuaulu	nni	5019	nni
+	language	North Picene	nrp	5020	nrp
+	language	North Slavey	scs	5021	scs
+	language	North Tairora	tbg	5022	tbg
+	language	North Tanna	tnn	5023	tnn
+	language	North Wahgi	whg	5024	whg
+	language	North Watut	una	5025	una
+	language	Northeast Kiwai	kiw	5026	kiw
+	language	Northeast Maidu	nmu	5027	nmu
+	language	Northeast Pashai	aee	5028	aee
+	language	Northeastern Dinka	dip	5029	dip
+	language	Northeastern Pomo	pef	5030	pef
+	language	Northeastern Tasmanian	xpb	5031	xpb
+	language	Northeastern Thai	tts	5032	tts
+	language	Northern Alta	aqn	5033	aqn
+	language	Northern Altai	atv	5034	atv
+	language	Northern Amami-Oshima	ryn	5035	ryn
+	language	Northern Betsimisaraka Malagasy	bmm	5036	bmm
+	language	Northern Binukidnon	kyn	5037	kyn
+	language	Northern Bobo MadarÊ	bbo	5038	bbo
+	language	Northern Bontok	rbk	5039	rbk
+	language	Northern Catanduanes Bikol	cts	5040	cts
+	language	Northern Conchucos Ancash Quechua	qxn	5041	qxn
+	language	Northern Dagara	dgi	5042	dgi
+	language	Northern Dong	doc	5043	doc
+	language	Northern East Cree	crl	5044	crl
+	language	Northern EmberÃĄ	emp	5045	emp
+	language	Northern Frisian	frr	5046	frr
+	language	Northern Ghale	ghh	5047	ghh
+	language	Northern Gondi	gno	5048	gno
+	language	Northern Grebo	gbo	5049	gbo
+	language	Northern Guiyang Hmong	huj	5050	huj
+	language	Northern Haida	hdn	5051	hdn
+	language	Northern Hindko	hno	5052	hno
+	language	Northern Huishui Hmong	hmi	5053	hmi
+	language	Northern Kalapuya	nrt	5054	nrt
+	language	Northern Kankanay	xnn	5055	xnn
+	language	Northern Katang	ncq	5056	ncq
+	language	Northern Khmer	kxm	5057	kxm
+	language	Northern Kissi	kqs	5058	kqs
+	language	Northern Kurdish	kmr	5059	kmr
+	language	Northern Luri	lrc	5060	lrc
+	language	Northern Mashan Hmong	hmp	5061	hmp
+	language	Northern Muji	ymx	5062	ymx
+	language	Northern Nago	xkb	5063	xkb
+	language	Northern Ndebele	nde	5064	nde	nd	North Ndebele
+	language	Northern Ngbandi	ngb	5065	ngb
+	language	Northern Nisu	yiv	5066	yiv
+	language	Northern Nuni	nuv	5067	nuv
+	language	Northern Oaxaca Nahuatl	nhy	5068	nhy
+	language	Northern Ohlone	cst	5069	cst
+	language	Northern One	onr	5070	onr
+	language	Northern Paiute	pao	5071	pao
+	language	Northern Pame	pmq	5072	pmq
+	language	Northern Pashto	pbu	5073	pbu
+	language	Northern Pastaza Quichua	qvz	5074	qvz
+	language	Northern Ping Chinese	cnp	5075	cnp
+	language	Northern Pomo	pej	5076	pej
+	language	Northern Puebla Nahuatl	ncj	5077	ncj
+	language	Northern Pumi	pmi	5078	pmi
+	language	Northern Qiandong Miao	hea	5079	hea
+	language	Northern Qiang	cng	5080	cng
+	language	Northern Rengma Naga	nnl	5081	nnl
+	language	Northern Roglai	rog	5082	rog
+	language	Northern Sami	sme	5083	sme	se
+	language	Northern Sierra Miwok	nsq	5084	nsq
+	language	Northern Sorsoganon	bks	5085	bks
+	language	Northern Subanen	stb	5086	stb
+	language	Northern Tarahumara	thh	5087	thh
+	language	Northern Tasmanian	xpv	5088	xpv
+	language	Northern Tepehuan	ntp	5089	ntp
+	language	Northern Thai	nod	5090	nod
+	language	Northern Tidung	ntd	5091	ntd
+	language	Northern Tiwa	twf	5092	twf
+	language	Northern Tlaxiaco Mixtec	xtn	5093	xtn
+	language	Northern Toussian	tsp	5094	tsp
+	language	Northern Tujia	tji	5095	tji
+	language	Northern Tutchone	ttm	5096	ttm
+	language	Northern Uzbek	uzn	5097	uzn
+	language	Northern Yukaghir	ykg	5098	ykg
+	language	Northwest Alaska Inupiatun	esk	5099	esk
+	language	Northwest Gbaya	gya	5100	gya
+	language	Northwest Maidu	mjd	5101	mjd
+	language	Northwest Oaxaca Mixtec	mxa	5102	mxa
+	language	Northwest Pashai	glh	5103	glh
+	language	Northwestern Dinka	diw	5104	diw
+	language	Northwestern Fars	faz	5105	faz
+	language	Northwestern Kolami	kfb	5106	kfb
+	language	Northwestern Nisu	nsf	5107	nsf
+	language	Northwestern Ojibwa	ojb	5108	ojb
+	language	Northwestern Tasmanian	xpw	5109	xpw
+	language	Norwegian	nor	5110	nor	no
+	language	Norwegian BokmÃĨl	nob	5111	nob	nb
+	language	Norwegian Nynorsk	nno	5112	nno	nn
+	language	Norwegian Sign Language	nsl	5113	nsl
+	language	Notre	bly	5114	bly
+	language	Notsi	ncf	5115	ncf
+	language	Nottoway	ntw	5116	ntw
+	language	Nottoway-Meherrin	nwy	5117	nwy
+	language	Novial	nov	5118	nov
+	language	Noy	noy	5119	noy
+	language	Nsenga	nse	5120	nse
+	language	Nshi	nsc	5121	nsc
+	language	Nsongo	nsx	5122	nsx
+	language	Ntcham	bud	5123	bud
+	language	Nteng	nqt	5124	nqt
+	language	Ntomba	nto	5125	nto
+	language	Nubaca	baf	5126	baf
+	language	Nubi	kcn	5127	kcn
+	language	Nubri	kte	5128	kte
+	language	Nuer	nus	5129	nus
+	language	Nugunu (Australia)	nnv	5130	nnv
+	language	Nugunu (Cameroon)	yas	5131	yas
+	language	Nuk	noc	5132	noc
+	language	Nukak MakÃē	mbr	5133	mbr
+	language	Nukna	klt	5134	klt
+	language	Nukuini	nuc	5135	nuc
+	language	Nukumanu	nuq	5136	nuq
+	language	Nukunul	xnu	5137	xnu
+	language	Nukuoro	nkr	5138	nkr
+	language	Nukuria	nur	5139	nur
+	language	Numana	nbr	5140	nbr
+	language	Numanggang	nop	5141	nop
+	language	Numbami	sij	5142	sij
+	language	Nume	tgs	5143	tgs
+	language	Numidian	nxm	5144	nxm
+	language	Numèè	kdk	5145	kdk
+	language	Nung (Viet Nam)	nut	5146	nut
+	language	Nungali	nug	5147	nug
+	language	Nunggubuyu	nuy	5148	nuy
+	language	Nungu	rin	5149	rin
+	language	Nuosu	iii	5150	iii	ii	Sichuan Yi
+	language	Nupbikha	npb	5151	npb
+	language	Nupe-Nupe-Tako	nup	5152	nup
+	language	Nusa Laut	nul	5153	nul
+	language	Nusu	nuf	5154	nuf
+	language	Nuu-chah-nulth	nuk	5155	nuk
+	language	Nyabwa	nwb	5156	nwb
+	language	Nyaheun	nev	5157	nev
+	language	Nyahkur	cbn	5158	cbn
+	language	Nyakyusa-Ngonde	nyy	5159	nyy
+	language	Nyali	nlj	5160	nlj
+	language	Nyam	nmi	5161	nmi
+	language	Nyamal	nly	5162	nly
+	language	Nyambo	now	5163	now
+	language	Nyamusa-Molo	nwm	5164	nwm
+	language	Nyamwanga	mwn	5165	mwn
+	language	Nyamwezi	nym	5166	nym
+	language	Nyaneka	nyk	5167	nyk
+	language	Nyang'i	nyp	5168	nyp
+	language	Nyanga	nyj	5169	nyj
+	language	Nyanga-li	nyc	5170	nyc
+	language	Nyangatom	nnj	5171	nnj
+	language	Nyangbo	nyb	5172	nyb
+	language	Nyangga	nny	5173	nny
+	language	Nyangumarta	nna	5174	nna
+	language	Nyankole	nyn	5175	nyn
+	language	Nyankpa	yes	5176	yes
+	language	Nyarafolo Senoufo	sev	5177	sev
+	language	Nyaturu	rim	5178	rim
+	language	Nyaw	nyw	5179	nyw
+	language	Nyawaygi	nyt	5180	nyt
+	language	Nyemba	nba	5181	nba
+	language	Nyengo	nye	5182	nye
+	language	Nyenkha	neh	5183	neh
+	language	Nyeu	nyl	5184	nyl
+	language	Nyiha (Malawi)	nyr	5185	nyr
+	language	Nyiha (Tanzania)	nih	5186	nih
+	language	Nyika (Malawi and Zambia)	nkv	5187	nkv
+	language	Nyika (Tanzania)	nkt	5188	nkt
+	language	Nyikina	nyh	5189	nyh
+	language	Nyindrou	lid	5190	lid
+	language	Nyindu	nyg	5191	nyg
+	language	Nyishi	njz	5192	njz
+	language	Nyiyaparli	xny	5193	xny
+	language	Nyokon	nvo	5194	nvo
+	language	Nyole	nuj	5195	nuj
+	language	Nyong	muo	5196	muo
+	language	Nyore	nyd	5197	nyd
+	language	Nyoro	nyo	5198	nyo
+	language	Nyulnyul	nyv	5199	nyv
+	language	Nyungar	nys	5200	nys
+	language	Nyungwe	nyu	5201	nyu
+	language	NyÃĸlayu	yly	5202	yly
+	language	Nzadi	nzd	5203	nzd
+	language	Nzakambay	nzy	5204	nzy
+	language	Nzakara	nzk	5205	nzk
+	language	Nzanyi	nja	5206	nja
+	language	Nzima	nzi	5207	nzi
+	language	NÃĄ-Meo	neo	5208	neo
+	language	NÃĒlÃĒmwa-Nixumwak	nee	5209	nee
+	language	NÃŧpode Huitoto	hux	5210	hux
+	language	NĮng	ngh	5211	ngh
+	language	O'chi'chi'	xoc	5212	xoc
+	language	O'du	tyh	5213	tyh
+	language	Obanliku	bzy	5214	bzy
+	language	ObispeÃąo	obi	5215	obi
+	language	Oblo	obl	5216	obl
+	language	Obo Manobo	obo	5217	obo
+	language	Obokuitai	afz	5218	afz
+	language	Obolo	ann	5219	ann
+	language	Obulom	obu	5220	obu
+	language	Ocaina	oca	5221	oca
+	language	Occitan	oci	5222	oci	Occitan (post 1500)	oc
+	language	Ocotepec Mixtec	mie	5223	mie
+	language	OcotlÃĄn Zapotec	zac	5224	zac
+	language	Od	odk	5225	odk
+	language	Odia	ory	5226	ory
+	language	Odiai	bhf	5227	bhf
+	language	Odoodee	kkc	5228	kkc
+	language	Odual	odu	5229	odu
+	language	Odut	oda	5230	oda
+	language	OfayÊ	opy	5231	opy
+	language	Official Aramaic (700-300 BCE)	arc	5232	arc
+	language	Ofo	ofo	5233	ofo
+	language	Ogbah	ogc	5234	ogc
+	language	Ogbia	ogb	5235	ogb
+	language	Ogbogolo	ogg	5236	ogg
+	language	Ogbronuagum	ogu	5237	ogu
+	language	Ogea	eri	5238	eri
+	language	Oirata	oia	5239	oia
+	language	Ojibwe, Ojibwa	oji	5240	oji	Ojibwe	oj	Ojibwa
+	language	OjitlÃĄn Chinantec	chj	5241	chj
+	language	Okanagan	oka	5242	oka
+	language	Oki-No-Erabu	okn	5243	okn
+	language	Okiek	oki	5244	oki
+	language	Oko-Eni-Osayen	oks	5245	oks
+	language	Oko-Juwoi	okj	5246	okj
+	language	Okobo	okb	5247	okb
+	language	Okodia	okd	5248	okd
+	language	Okolie	oie	5249	oie
+	language	Okolod	kqv	5250	kqv
+	language	Okpamheri	opa	5251	opa
+	language	Okpe (Northwestern Edo)	okx	5252	okx
+	language	Okpe (Southwestern Edo)	oke	5253	oke
+	language	Oksapmin	opm	5254	opm
+	language	Oku	oku	5255	oku
+	language	Old Aramaic (up to 700 BCE)	oar	5256	oar
+	language	Old Avar	oav	5257	oav
+	language	Old Breton	obt	5258	obt
+	language	Old Burmese	obr	5259	obr
+	language	Old Cham	ocm	5260	ocm
+	language	Old Chinese	och	5261	och
+	language	Old Church Slavonic	chu	5262	chu	cu	Church Slavonic	Church Slavic	Old Church Slavonic	Old Bulgarian
+	language	Old Cornish	oco	5263	oco
+	language	Old Dutch	odt	5264	odt
+	language	Old English (ca. 450-1100)	ang	5265	ang
+	language	Old French (842-ca. 1400)	fro	5266	fro
+	language	Old Frisian	ofs	5267	ofs
+	language	Old Georgian	oge	5268	oge
+	language	Old High German (ca. 750-1050)	goh	5269	goh
+	language	Old Hittite	oht	5270	oht
+	language	Old Hungarian	ohu	5271	ohu
+	language	Old Irish (to 900)	sga	5272	sga
+	language	Old Japanese	ojp	5273	ojp
+	language	Old Kentish Sign Language	okl	5274	okl
+	language	Old Khmer	okz	5275	okz
+	language	Old Korean (3rd-9th cent.)	oko	5276	oko
+	language	Old Lithuanian	olt	5277	olt
+	language	Old Malay	omy	5278	omy
+	language	Old Manipuri	omp	5279	omp
+	language	Old Marathi	omr	5280	omr
+	language	Old Mon	omx	5281	omx
+	language	Old Norse	non	5282	non
+	language	Old Nubian	onw	5283	onw
+	language	Old Ossetic	oos	5284	oos
+	language	Old Persian (ca. 600-400 B.C.)	peo	5285	peo
+	language	Old Provençal (to 1500)	pro	5286	pro
+	language	Old Russian	orv	5287	orv
+	language	Old Saxon	osx	5288	osx
+	language	Old Spanish	osp	5289	osp
+	language	Old Sundanese	osn	5290	osn
+	language	Old Tamil	oty	5291	oty
+	language	Old Tibetan	otb	5292	otb
+	language	Old Turkish	otk	5293	otk
+	language	Old Uighur	oui	5294	oui
+	language	Old Welsh	owl	5295	owl
+	language	Olekha	ole	5296	ole
+	language	Olkol	olk	5297	olk
+	language	Olo	ong	5298	ong
+	language	Oloma	olm	5299	olm
+	language	Olrat	olr	5300	olr
+	language	Olu'bo	lul	5301	lul
+	language	Olulumo-Ikom	iko	5302	iko
+	language	Oluta Popoluca	plo	5303	plo
+	language	Omagua	omg	5304	omg
+	language	Omaha-Ponca	oma	5305	oma
+	language	Omani Arabic	acx	5306	acx
+	language	Ombamba	mbm	5307	mbm
+	language	Ombo	oml	5308	oml
+	language	Ometepec Nahuatl	nht	5309	nht
+	language	Omi	omi	5310	omi
+	language	Omok	omk	5311	omk
+	language	Omotik	omt	5312	omt
+	language	Omurano	omu	5313	omu
+	language	Ona	ona	5314	ona
+	language	Oneida	one	5315	one
+	language	Ong	oog	5316	oog
+	language	Onin	oni	5317	oni
+	language	Onin Based Pidgin	onx	5318	onx
+	language	Onjob	onj	5319	onj
+	language	Ono	ons	5320	ons
+	language	Onobasulu	onn	5321	onn
+	language	Onondaga	ono	5322	ono
+	language	Ontenu	ont	5323	ont
+	language	Ontong Java	ojv	5324	ojv
+	language	Oorlams	oor	5325	oor
+	language	Opao	opo	5326	opo
+	language	Opata	opt	5327	opt
+	language	Orang Kanaq	orn	5328	orn
+	language	Orang Seletar	ors	5329	ors
+	language	Oraon Sadri	sdr	5330	sdr
+	language	OrejÃŗn	ore	5331	ore
+	language	Oring	org	5332	org
+	language	Oriya	ori	5333	ori	or	Oriya (macrolanguage)
+	language	Orizaba Nahuatl	nlv	5334	nlv
+	language	Orma	orc	5335	orc
+	language	Ormu	orz	5336	orz
+	language	Ormuri	oru	5337	oru
+	language	Oro	orx	5338	orx
+	language	Oro Win	orw	5339	orw
+	language	Oroch	oac	5340	oac
+	language	Oroha	ora	5341	ora
+	language	Orok	oaa	5342	oaa
+	language	Orokaiva	okv	5343	okv
+	language	Oroko	bdu	5344	bdu
+	language	Orokolo	oro	5345	oro
+	language	Oromo	orm	5346	orm	om
+	language	Oroqen	orh	5347	orh
+	language	Orowe	bpk	5348	bpk
+	language	Oruma	orr	5349	orr
+	language	Orya	ury	5350	ury
+	language	Osage	osa	5351	osa
+	language	Osatu	ost	5352	ost
+	language	Oscan	osc	5353	osc
+	language	Osing	osi	5354	osi
+	language	Ososo	oso	5355	oso
+	language	Ossetian, Ossetic	oss	5356	oss	os	Ossetian	Ossetic
+	language	Ot Danum	otd	5357	otd
+	language	Otank	uta	5358	uta
+	language	Oti	oti	5359	oti
+	language	Otoro	otr	5360	otr
+	language	Ottawa	otw	5361	otw
+	language	Ottoman Turkish (1500-1928)	ota	5362	ota
+	language	Otuho	lot	5363	lot
+	language	Otuke	otu	5364	otu
+	language	Ouma	oum	5365	oum
+	language	Oune	oue	5366	oue
+	language	Owa	stn	5367	stn
+	language	Owenia	wsr	5368	wsr
+	language	Owiniga	owi	5369	owi
+	language	Oy	oyb	5370	oyb
+	language	Oya'oya	oyy	5371	oyy
+	language	Oyda	oyd	5372	oyd
+	language	Oyster Bay Tasmanian	xpd	5373	xpd
+	language	Ozolotepec Zapotec	zao	5374	zao
+	language	Ozumacín Chinantec	chz	5375	chz
+	language	Pa Di	pdi	5376	pdi
+	language	Pa'a	pqa	5377	pqa
+	language	Pa'o Karen	blk	5378	blk
+	language	Pa-Hng	pha	5379	pha
+	language	Paakantyi	drl	5380	drl
+	language	Paama	pma	5381	pma
+	language	Paasaal	sig	5382	sig
+	language	Pacahuara	pcp	5383	pcp
+	language	Pacaraos Quechua	qvp	5384	qvp
+	language	Pacific Gulf Yupik	ems	5385	ems
+	language	Pacoh	pac	5386	pac
+	language	Padoe	pdo	5387	pdo
+	language	Paekche	pkc	5388	pkc
+	language	Paelignian	pgn	5389	pgn
+	language	Pagi	pgi	5390	pgi
+	language	Pagibete	pae	5391	pae
+	language	Pagu	pgu	5392	pgu
+	language	Pahanan Agta	apf	5393	apf
+	language	Pahari	phj	5394	phj
+	language	Pahari-Potwari	phr	5395	phr
+	language	Pahi	lgt	5396	lgt
+	language	Pahlavani	phv	5397	phv
+	language	Pahlavi	pal	5398	pal
+	language	Pai Tavytera	pta	5399	pta
+	language	PaicÃŽ	pri	5400	pri
+	language	Paipai	ppi	5401	ppi
+	language	Paite Chin	pck	5402	pck
+	language	Paiwan	pwn	5403	pwn
+	language	Pak-Tong	pkg	5404	pkg
+	language	Pakanha	pkn	5405	pkn
+	language	PakaÃĄsnovos	pav	5406	pav
+	language	Pakistan Sign Language	pks	5407	pks
+	language	Paku	pku	5408	pku
+	language	Paku Karen	jkp	5409	jkp
+	language	Pal	abw	5410	abw
+	language	Palaic	plq	5411	plq
+	language	Palaka Senoufo	plr	5412	plr
+	language	Palantla Chinantec	cpa	5413	cpa
+	language	Palauan	pau	5414	pau
+	language	Paleni	pnl	5415	pnl
+	language	Palenquero	pln	5416	pln
+	language	PalikÃēr	plu	5417	plu
+	language	Paliyan	pcf	5418	pcf
+	language	Pallanganmiddang	pmd	5419	pmd
+	language	Paloor	fap	5420	fap
+	language	Palu'e	ple	5421	ple
+	language	Paluan	plz	5422	plz
+	language	Palya Bareli	bpx	5423	bpx
+	language	Pam	pmn	5424	pmn
+	language	Pambia	pmb	5425	pmb
+	language	Pamona	pmf	5426	pmf
+	language	Pamosu	hih	5427	hih
+	language	Pampanga	pam	5428	pam
+	language	Pamplona Atta	att	5429	att
+	language	Pana (Burkina Faso)	pnq	5430	pnq
+	language	Pana (Central African Republic)	pnz	5431	pnz
+	language	Panamanian Sign Language	lsp	5432	lsp
+	language	Panamint	par	5433	par
+	language	Panao HuÃĄnuco Quechua	qxh	5434	qxh
+	language	PanarÃĄ	kre	5435	kre
+	language	Panasuan	psn	5436	psn
+	language	Panawa	pwb	5437	pwb
+	language	Pancana	pnp	5438	pnp
+	language	Panchpargania	tdb	5439	tdb
+	language	Pande	bkj	5440	bkj
+	language	Pangasinan	pag	5441	pag
+	language	Pangseng	pgs	5442	pgs
+	language	Pangu	png	5443	png
+	language	Pangutaran Sama	slm	5444	slm
+	language	Pangwa	pbr	5445	pbr
+	language	Pangwali	pgg	5446	pgg
+	language	Panim	pnr	5447	pnr
+	language	Paniya	pcg	5448	pcg
+	language	Panjabi, Punjabi	pan	5449	pan	pa	Panjabi	Punjabi
+	language	PankararÊ	pax	5450	pax
+	language	PankararÃē	paz	5451	paz
+	language	Pankhu	pkh	5452	pkh
+	language	Pannei	pnc	5453	pnc
+	language	Pano	mqz	5454	mqz
+	language	Panoan Katukína	knt	5455	knt
+	language	Panobo	pno	5456	pno
+	language	Panyi Bai	bfc	5457	bfc
+	language	Papantla Totonac	top	5458	top
+	language	Papapana	ppn	5459	ppn
+	language	Papar	dpp	5460	dpp
+	language	Papasena	pas	5461	pas
+	language	Papel	pbo	5462	pbo
+	language	Papi	ppe	5463	ppe
+	language	Papiamento	pap	5464	pap
+	language	Papora	ppu	5465	ppu
+	language	Papua New Guinean Sign Language	pgz	5466	pgz
+	language	Papuan Malay	pmy	5467	pmy
+	language	Papuma	ppm	5468	ppm
+	language	Parachi	prc	5469	prc
+	language	Paraguayan Guaraní	gug	5470	gug
+	language	Paraguayan Sign Language	pys	5471	pys
+	language	ParakanÃŖ	pak	5472	pak
+	language	Paranan	prf	5473	prf
+	language	ParanawÃĄt	paf	5474	paf
+	language	Paraujano	pbg	5475	pbg
+	language	Parauk	prk	5476	prk
+	language	Parawen	prw	5477	prw
+	language	Pardhan	pch	5478	pch
+	language	Pardhi	pcl	5479	pcl
+	language	Pare	ppt	5480	ppt
+	language	Parecís	pab	5481	pab
+	language	Parenga	pcj	5482	pcj
+	language	Parkari Koli	kvx	5483	kvx
+	language	Parkwa	pbi	5484	pbi
+	language	Parsi-Dari	prd	5485	prd
+	language	Parthian	xpr	5486	xpr
+	language	Parya	paq	5487	paq
+	language	ParÃĄ ArÃĄra	aap	5488	aap
+	language	ParÃĄ GaviÃŖo	gvp	5489	gvp
+	language	Pashto, Pushto	pus	5490	pus	Pashto	ps	Pushto
+	language	Pasi	psq	5491	psq
+	language	Pass Valley Yali	yac	5492	yac
+	language	Patamona	pbc	5493	pbc
+	language	Patani	ptn	5494	ptn
+	language	PataxÃŗ HÃŖ-Ha-HÃŖe	pth	5495	pth
+	language	Patep	ptp	5496	ptp
+	language	Pathiya	pty	5497	pty
+	language	Patpatar	gfk	5498	gfk
+	language	Pattani	lae	5499	lae
+	language	Pattani Malay	mfa	5500	mfa
+	language	Pattapu	ptq	5501	ptq
+	language	Patwin	pwi	5502	pwi
+	language	Paulohi	plh	5503	plh
+	language	Paumarí	pad	5504	pad
+	language	Paunaka	pnk	5505	pnk
+	language	Pauri Bareli	bfb	5506	bfb
+	language	Pauserna	psm	5507	psm
+	language	Pawaia	pwa	5508	pwa
+	language	Pawnee	paw	5509	paw
+	language	Paynamar	pmr	5510	pmr
+	language	Pazeh	pzh	5511	pzh
+	language	Pe	pai	5512	pai
+	language	Pear	pcb	5513	pcb
+	language	Pech	pay	5514	pay
+	language	Pecheneg	xpc	5515	xpc
+	language	Pedi	nso	5516	nso
+	language	Pei	ppq	5517	ppq
+	language	Pekal	pel	5518	pel
+	language	Pela	bxd	5519	bxd
+	language	Pele-Ata	ata	5520	ata
+	language	Pelende	ppp	5521	ppp
+	language	Pemon	aoc	5522	aoc
+	language	Penang Sign Language	psg	5523	psg
+	language	Penchal	pek	5524	pek
+	language	Pendau	ums	5525	ums
+	language	Pengo	peg	5526	peg
+	language	Pennsylvania German	pdc	5527	pdc
+	language	Penrhyn	pnh	5528	pnh
+	language	Pentlatch	ptw	5529	ptw
+	language	Perai	wet	5530	wet
+	language	Peranakan Indonesian	pea	5531	pea
+	language	Pere	pfe	5532	pfe
+	language	Peripheral Mongolian	mvf	5533	mvf
+	language	Pero	pip	5534	pip
+	language	Persian (Farsi)	fas	5535	fas	Persian	fa	Farsi	per
+	language	Peruvian Sign Language	prl	5536	prl
+	language	Pesse	pze	5537	pze
+	language	Petapa Zapotec	zpe	5538	zpe
+	language	Petats	pex	5539	pex
+	language	Petjo	pey	5540	pey
+	language	PeÃąoles Mixtec	mil	5541	mil
+	language	Pfaelzisch	pfl	5542	pfl
+	language	Phai	prt	5543	prt
+	language	Phake	phk	5544	phk
+	language	Phala	ypa	5545	ypa
+	language	Phalura	phl	5546	phl
+	language	Phana'	phq	5547	phq
+	language	Phangduwali	phw	5548	phw
+	language	Phende	pem	5549	pem
+	language	Philippine Sign Language	psp	5550	psp
+	language	Phimbi	phm	5551	phm
+	language	Phoenician	phn	5552	phn
+	language	Phola	ypg	5553	ypg
+	language	Pholo	yip	5554	yip
+	language	Phom Naga	nph	5555	nph
+	language	Phong-Kniang	pnx	5556	pnx
+	language	Phrae Pwo Karen	kjt	5557	kjt
+	language	Phrygian	xpg	5558	xpg
+	language	Phu Thai	pht	5559	pht
+	language	Phuan	phu	5560	phu
+	language	Phudagi	phd	5561	phd
+	language	Phuie	pug	5562	pug
+	language	Phukha	phh	5563	phh
+	language	Phuma	ypm	5564	ypm
+	language	Phunoi	pho	5565	pho
+	language	Phuong	phg	5566	phg
+	language	Phupa	ypp	5567	ypp
+	language	Phupha	yph	5568	yph
+	language	Phuza	ypz	5569	ypz
+	language	Piamatsina	ptr	5570	ptr
+	language	Piame	pin	5571	pin
+	language	Piapoco	pio	5572	pio
+	language	Piaroa	pid	5573	pid
+	language	Picard	pcd	5574	pcd
+	language	Pichis AshÊninka	cpu	5575	cpu
+	language	Pictish	xpi	5576	xpi
+	language	Pidgin Delaware	dep	5577	dep
+	language	Piemontese	pms	5578	pms
+	language	Pijao	pij	5579	pij
+	language	Pije	piz	5580	piz
+	language	Pijin	pis	5581	pis
+	language	PilagÃĄ	plg	5582	plg
+	language	Pileni	piv	5583	piv
+	language	Pima Bajo	pia	5584	pia
+	language	Pimbwe	piw	5585	piw
+	language	Pinai-Hagahai	pnn	5586	pnn
+	language	Pindiini	pti	5587	pti
+	language	Pingelapese	pif	5588	pif
+	language	Pinigura	pnv	5589	pnv
+	language	Pinjarup	pnj	5590	pnj
+	language	Pinji	pic	5591	pic
+	language	Pinotepa Nacional Mixtec	mio	5592	mio
+	language	Pintupi-Luritja	piu	5593	piu
+	language	Pinyin	pny	5594	pny
+	language	Pipil	ppl	5595	ppl
+	language	PirahÃŖ	myp	5596	myp
+	language	Piratapuyo	pir	5597	pir
+	language	Pirlatapa	bxi	5598	bxi
+	language	Piro	pie	5599	pie
+	language	Pirriya	xpa	5600	xpa
+	language	Pisabo	pig	5601	pig
+	language	Pisaflores Tepehua	tpp	5602	tpp
+	language	Piscataway	psy	5603	psy
+	language	Pisidian	xps	5604	xps
+	language	Pitcairn-Norfolk	pih	5605	pih
+	language	Pite Sami	sje	5606	sje
+	language	Piti	pcn	5607	pcn
+	language	Pitjantjatjara	pjt	5608	pjt
+	language	Pitta Pitta	pit	5609	pit
+	language	Piu	pix	5610	pix
+	language	Piya-Kwonci	piy	5611	piy
+	language	Plains Cree	crk	5612	crk
+	language	Plains Indian Sign Language	psd	5613	psd
+	language	Plains Miwok	pmw	5614	pmw
+	language	Plapo Krumen	ktj	5615	ktj
+	language	Plateau Malagasy	plt	5616	plt
+	language	Plautdietsch	pdt	5617	pdt
+	language	Playero	gob	5618	gob
+	language	Pnar	pbv	5619	pbv
+	language	Pochuri Naga	npo	5620	npo
+	language	Pochutec	xpo	5621	xpo
+	language	Podena	pdn	5622	pdn
+	language	Pogolo	poy	5623	poy
+	language	Pohnpeian	pon	5624	pon
+	language	PokangÃĄ	pok	5625	pok
+	language	Poke	pof	5626	pof
+	language	Pokomo	pkb	5627	pkb
+	language	Polabian	pox	5628	pox
+	language	Polari	pld	5629	pld
+	language	Polish	pol	5630	pol	pl
+	language	Polish Sign Language	pso	5631	pso
+	language	Polonombauk	plb	5632	plb
+	language	Pom	pmo	5633	pmo
+	language	Pomo	pmm	5634	pmm
+	language	Ponam	ncc	5635	ncc
+	language	Ponosakan	pns	5636	pns
+	language	Pontic	pnt	5637	pnt
+	language	Ponyo-Gongwang Naga	npg	5638	npg
+	language	Popti'	jac	5639	jac
+	language	Poqomam	poc	5640	poc
+	language	Poqomchi'	poh	5641	poh
+	language	Porohanon	prh	5642	prh
+	language	Port Sandwich	psw	5643	psw
+	language	Port Sorell Tasmanian	xpl	5644	xpl
+	language	Port Vato	ptv	5645	ptv
+	language	Portuguese	por	5646	por	pt
+	language	Portuguese Sign Language	psr	5647	psr
+	language	Potawatomi	pot	5648	pot
+	language	PotiguÃĄra	pog	5649	pog
+	language	Pottangi Ollar Gadaba	gdb	5650	gdb
+	language	Poumei Naga	pmx	5651	pmx
+	language	Pouye	bye	5652	bye
+	language	Powari	pwr	5653	pwr
+	language	Powhatan	pim	5654	pim
+	language	PoyanÃĄwa	pyn	5655	pyn
+	language	Prasuni	prn	5656	prn
+	language	Primitive Irish	pgl	5657	pgl
+	language	Principense	pre	5658	pre
+	language	Providencia Sign Language	prz	5659	prz
+	language	Prussian	prg	5660	prg
+	language	Psikye	kvj	5661	kvj
+	language	Pu-Xian Chinese	cpx	5662	cpx
+	language	Puare	pux	5663	pux
+	language	Pudtol Atta	atp	5664	atp
+	language	Puebla Mazatec	pbm	5665	pbm
+	language	Puelche	pue	5666	pue
+	language	Puerto Rican Sign Language	psl	5667	psl
+	language	Puimei Naga	npu	5668	npu
+	language	Puinave	pui	5669	pui
+	language	Pukapuka	pkp	5670	pkp
+	language	Pulaar	fuc	5671	fuc
+	language	Pulabu	pup	5672	pup
+	language	Pular	fuf	5673	fuf
+	language	Puluwatese	puw	5674	puw
+	language	Puma	pum	5675	pum
+	language	Pumpokol	xpm	5676	xpm
+	language	PumÊ	yae	5677	yae
+	language	Punan Aput	pud	5678	pud
+	language	Punan Bah-Biau	pna	5679	pna
+	language	Punan Batu 1	pnm	5680	pnm
+	language	Punan Merah	puf	5681	puf
+	language	Punan Merap	puc	5682	puc
+	language	Punan Tubu	puj	5683	puj
+	language	Punic	xpu	5684	xpu
+	language	Puno Quechua	qxp	5685	qxp
+	language	Punthamara	xpt	5686	xpt
+	language	Punu	puu	5687	puu
+	language	Puoc	puo	5688	puo
+	language	Puquina	puq	5689	puq
+	language	Puragi	pru	5690	pru
+	language	Purari	iar	5691	iar
+	language	Purepecha	tsz	5692	tsz
+	language	Puri	prr	5693	prr
+	language	Purik	prx	5694	prx
+	language	PurisimeÃąo	puy	5695	puy
+	language	Puroik	suv	5696	suv
+	language	PuruborÃĄ	pur	5697	pur
+	language	Purum	pub	5698	pub
+	language	Putai	mfl	5699	mfl
+	language	Putoh	put	5700	put
+	language	Putukwam	afe	5701	afe
+	language	Puyo	xpy	5702	xpy
+	language	Puyo-Paekche	xpp	5703	xpp
+	language	Puyuma	pyu	5704	pyu
+	language	Pwaamei	pme	5705	pme
+	language	PwapwÃĸ	pop	5706	pop
+	language	Pwo Eastern Karen	kjp	5707	kjp
+	language	Pwo Northern Karen	pww	5708	pww
+	language	Pwo Western Karen	pwo	5709	pwo
+	language	Pyapun	pcw	5710	pcw
+	language	Pye Krumen	pye	5711	pye
+	language	Pyen	pyy	5712	pyy
+	language	Pyu (Myanmar)	pyx	5713	pyx
+	language	Pyu (Papua New Guinea)	pby	5714	pby
+	language	PÃĄez	pbb	5715	pbb
+	language	PÃĄÃĄfang	pfa	5716	pfa
+	language	Päri	lkr	5717	lkr
+	language	PÊmono	pev	5718	pev
+	language	PÊvÊ	lme	5719	lme
+	language	PÃļkoot	pko	5720	pko
+	language	Pāli	pli	5721	pli	pi	Pali
+	language	Q'anjob'al	kjb	5722	kjb
+	language	Qabiao	laq	5723	laq
+	language	Qaqet	byx	5724	byx
+	language	Qashqa'i	qxq	5725	qxq
+	language	Qatabanian	xqt	5726	xqt
+	language	Qau	gqu	5727	gqu
+	language	Qawasqar	alc	5728	alc
+	language	Qila Muji	ymq	5729	ymq
+	language	Qimant	ahg	5730	ahg
+	language	Qiubei Zhuang	zqe	5731	zqe
+	language	Quapaw	qua	5732	qua
+	language	Quebec Sign Language	fcs	5733	fcs
+	language	Quechan	yum	5734	yum
+	language	Quechua	que	5735	que	qu
+	language	Quenya	qya	5736	qya
+	language	QuerÊtaro Otomi	otq	5737	otq
+	language	Quetzaltepec Mixe	pxm	5738	pxm
+	language	Queyu	qvy	5739	qvy
+	language	Quiavicuzas Zapotec	zpj	5740	zpj
+	language	Quileute	qui	5741	qui
+	language	Quinault	qun	5742	qun
+	language	Quinqui	quq	5743	quq
+	language	Quioquitani-Quierí Zapotec	ztq	5744	ztq
+	language	Quiotepec Chinantec	chq	5745	chq
+	language	Quiripi	qyp	5746	qyp
+	language	Rabha	rah	5747	rah
+	language	Rade	rad	5748	rad
+	language	Raetic	xrr	5749	xrr
+	language	Rahambuu	raz	5750	raz
+	language	Rajah Kabunsuwan Manobo	mqk	5751	mqk
+	language	Rajasthani	raj	5752	raj
+	language	Rajbanshi	rjs	5753	rjs
+	language	Raji	rji	5754	rji
+	language	Rajong	rjg	5755	rjg
+	language	Rajput Garasia	gra	5756	gra
+	language	Rakahanga-Manihiki	rkh	5757	rkh
+	language	Rakhine	rki	5758	rki
+	language	Ralte	ral	5759	ral
+	language	Rama	rma	5760	rma
+	language	Ramoaaina	rai	5761	rai
+	language	Ramopa	kjx	5762	kjx
+	language	Rampi	lje	5763	lje
+	language	Rana Tharu	thr	5764	thr
+	language	Rang	rax	5765	rax
+	language	Rangi	lag	5766	lag
+	language	Rangkas	rgk	5767	rgk
+	language	Ranglong	rnl	5768	rnl
+	language	Rangpuri	rkt	5769	rkt
+	language	Rao	rao	5770	rao
+	language	Rapa	ray	5771	ray
+	language	Rapanui	rap	5772	rap
+	language	Rapoisi	kyx	5773	kyx
+	language	Rapting	rpt	5774	rpt
+	language	Rara Bakati'	lra	5775	lra
+	language	Rarotongan	rar	5776	rar
+	language	Rasawa	rac	5777	rac
+	language	Ratagnon	btn	5778	btn
+	language	Ratahan	rth	5779	rth
+	language	Rathawi	rtw	5780	rtw
+	language	Rathwi Bareli	bgd	5781	bgd
+	language	Raute	rau	5782	rau
+	language	Ravula	yea	5783	yea
+	language	Rawa	rwo	5784	rwo
+	language	Rawang	raw	5785	raw
+	language	Rawat	jnl	5786	jnl
+	language	Rawngtu Chin	weu	5787	weu
+	language	Rawo	rwa	5788	rwa
+	language	RayÃŗn Zoque	zor	5789	zor
+	language	Razajerdi	rat	5790	rat
+	language	Red Gelao	gir	5791	gir
+	language	Reel	atu	5792	atu
+	language	Rejang	rej	5793	rej
+	language	Rejang Kayan	ree	5794	ree
+	language	Reli	rei	5795	rei
+	language	Rema	bow	5796	bow
+	language	Rembarrnga	rmb	5797	rmb
+	language	Rembong	reb	5798	reb
+	language	Remo	rem	5799	rem
+	language	Remontado Dumagat	agv	5800	agv
+	language	Rempi	rmp	5801	rmp
+	language	Remun	lkj	5802	lkj
+	language	Rendille	rel	5803	rel
+	language	Rengao	ren	5804	ren
+	language	Rennell-Bellona	mnv	5805	mnv
+	language	Repanbitip	rpn	5806	rpn
+	language	Rer Bare	rer	5807	rer
+	language	Rerau	rea	5808	rea
+	language	Rerep	pgk	5809	pgk
+	language	Reshe	res	5810	res
+	language	Resígaro	rgr	5811	rgr
+	language	Retta	ret	5812	ret
+	language	Reyesano	rey	5813	rey
+	language	Riang (India)	ria	5814	ria
+	language	Riang Lai	yin	5815	yin
+	language	Riang Lang	ril	5816	ril
+	language	Riantana	ran	5817	ran
+	language	Ribun	rir	5818	rir
+	language	Rigwe	iri	5819	iri
+	language	Rikbaktsa	rkb	5820	rkb
+	language	Rinconada Bikol	bto	5821	bto
+	language	RincÃŗn Zapotec	zar	5822	zar
+	language	Ringgou	rgu	5823	rgu
+	language	Ririo	rri	5824	rri
+	language	Rishiwa	rsw	5825	rsw
+	language	Ritharrngu	rit	5826	rit
+	language	Riung	riu	5827	riu
+	language	Riverain Sango	snj	5828	snj
+	language	Rmeet	lbn	5829	lbn
+	language	Rogo	rod	5830	rod
+	language	Rohingya	rhg	5831	rhg
+	language	Roma	rmm	5832	rmm
+	language	Romagnol	rgn	5833	rgn
+	language	Romam	rmx	5834	rmx
+	language	Romanian	ron	5835	ron	rum	ro
+	language	Romanian Sign Language	rms	5836	rms
+	language	Romano-Greek	rge	5837	rge
+	language	Romano-Serbian	rsb	5838	rsb
+	language	Romanova	rmv	5839	rmv
+	language	Romansh	roh	5840	roh	rm
+	language	Romany	rom	5841	rom
+	language	Romblomanon	rol	5842	rol
+	language	Rombo	rof	5843	rof
+	language	Romkun	rmk	5844	rmk
+	language	Ron	cla	5845	cla
+	language	Ronga	rng	5846	rng
+	language	Rongga	ror	5847	ror
+	language	Rongmei Naga	nbu	5848	nbu
+	language	Rongpo	rnp	5849	rnp
+	language	Ronji	roe	5850	roe
+	language	Roon	rnn	5851	rnn
+	language	Roria	rga	5852	rga
+	language	Rotokas	roo	5853	roo
+	language	Rotuman	rtm	5854	rtm
+	language	Roviana	rug	5855	rug
+	language	Ruching Palaung	pce	5856	pce
+	language	Rudbari	rdb	5857	rdb
+	language	Rufiji	rui	5858	rui
+	language	Ruga	ruh	5859	ruh
+	language	Rukai	dru	5860	dru
+	language	Ruma	ruz	5861	ruz
+	language	Rumai Palaung	rbb	5862	rbb
+	language	Rumu	klq	5863	klq
+	language	Runga	rou	5864	rou
+	language	Rungtu Chin	rtc	5865	rtc
+	language	Rungus	drg	5866	drg
+	language	Rungwa	rnw	5867	rnw
+	language	Russia Buriat	bxr	5868	bxr
+	language	Russian	rus	5869	rus	ru
+	language	Russian Sign Language	rsl	5870	rsl
+	language	Rusyn	rue	5871	rue
+	language	Ruthenian	rsk	5872	rsk
+	language	Rutul	rut	5873	rut
+	language	Ruuli	ruc	5874	ruc
+	language	Ruund	rnd	5875	rnd
+	language	Ruwila	rwl	5876	rwl
+	language	Rwa	rwk	5877	rwk
+	language	Rwandan Sign Language	rsn	5878	rsn
+	language	RÊunion Creole French	rcf	5879	rcf
+	language	Rāziá¸ĨÄĢ	rzh	5880	rzh
+	language	S'gaw Karen	ksw	5881	ksw
+	language	Sa	sax	5882	sax
+	language	Sa'a	apb	5883	apb
+	language	Sa'ban	snv	5884	snv
+	language	Sa'och	scq	5885	scq
+	language	Saafi-Saafi	sav	5886	sav
+	language	Saam	raq	5887	raq
+	language	Saamia	lsm	5888	lsm
+	language	Saaroa	sxr	5889	sxr
+	language	Saba	saa	5890	saa
+	language	Sabaean	xsa	5891	xsa
+	language	Sabah Bisaya	bsy	5892	bsy
+	language	Sabah Malay	msi	5893	msi
+	language	SabanÃĒ	sae	5894	sae
+	language	Sabaot	spy	5895	spy
+	language	Sabine	sbv	5896	sbv
+	language	Sabu	hvn	5897	hvn
+	language	SabÃŧm	sbo	5898	sbo
+	language	Sacapulteco	quv	5899	quv
+	language	Sadri	sck	5900	sck
+	language	Saek	skb	5901	skb
+	language	Saep	spd	5902	spd
+	language	Safaliba	saf	5903	saf
+	language	Safeyoka	apz	5904	apz
+	language	Safwa	sbk	5905	sbk
+	language	Sagala	sbm	5906	sbm
+	language	Sagalla	tga	5907	tga
+	language	Saho	ssy	5908	ssy
+	language	Sahu	saj	5909	saj
+	language	Saidi Arabic	aec	5910	aec
+	language	Saint Lucian Creole French	acf	5911	acf
+	language	Saisiyat	xsy	5912	xsy
+	language	Sajalong	sjl	5913	sjl
+	language	Sajau Basap	sjb	5914	sjb
+	language	Sakachep	sch	5915	sch
+	language	Sakalava Malagasy	skg	5916	skg
+	language	Sakao	sku	5917	sku
+	language	Sakata	skt	5918	skt
+	language	Sake	sak	5919	sak
+	language	SakirabiÃĄ	skf	5920	skf
+	language	Sakizaya	szy	5921	szy
+	language	Sala	shq	5922	shq
+	language	Salampasu	slx	5923	slx
+	language	Salar	slr	5924	slr
+	language	Salas	sgu	5925	sgu
+	language	Salasaca Highland Quichua	qxl	5926	qxl
+	language	Salawati	xmx	5927	xmx
+	language	Saleman	sau	5928	sau
+	language	Saliba	sbe	5929	sbe slc SÃĄliba
+	language	Salinan	sln	5930	sln
+	language	Sallands	sdz	5931	sdz
+	language	Salt-Yui	sll	5932	sll
+	language	Saluan	loe	5933	loe
+	language	SalumÃĄ	slj	5934	slj
+	language	Salvadoran Sign Language	esn	5935	esn
+	language	Sam	snx	5936	snx
+	language	Samaritan	smp	5937	smp
+	language	Samaritan Aramaic	sam	5938	sam
+	language	Samarokena	tmj	5939	tmj
+	language	Samatao	ysd	5940	ysd
+	language	Samay	syx	5941	syx
+	language	Samba	smx	5942	smx
+	language	Samba Daka	ccg	5943	ccg
+	language	Samba Leko	ndi	5944	ndi
+	language	Sambal	xsb	5945	xsb
+	language	Sambalpuri	spv	5946	spv
+	language	Sambe	xab	5947	xab
+	language	Samberigi	ssx	5948	ssx
+	language	Samburu	saq	5949	saq
+	language	Samei	smh	5950	smh
+	language	Samo	smq	5951	smq
+	language	Samoan	smo	5952	smo	sm
+	language	Samogitian	sgs	5953	sgs
+	language	Samosa	swm	5954	swm
+	language	Sampang	rav	5955	rav
+	language	Samre	sxm	5956	sxm
+	language	Samtao	stu	5957	stu
+	language	Samvedi	smv	5958	smv
+	language	San Agustín Mixtepec Zapotec	ztm	5959	ztm
+	language	San Baltazar Loxicha Zapotec	zpx	5960	zpx
+	language	San Blas Kuna	cuk	5961	cuk
+	language	San Dionisio Del Mar Huave	hve	5962	hve
+	language	San Felipe Otlaltepec Popoloca	pow	5963	pow
+	language	San Francisco Del Mar Huave	hue	5964	hue
+	language	San Francisco Matlatzinca	mat	5965	mat
+	language	San JerÃŗnimo TecÃŗatl Mazatec	maa	5966	maa
+	language	San Juan Atzingo Popoloca	poe	5967	poe
+	language	San Juan Colorado Mixtec	mjc	5968	mjc
+	language	San Juan Teita Mixtec	xtj	5969	xtj
+	language	San Luís Temalacayuca Popoloca	pps	5970	pps
+	language	San Marcos Tlacoyalco Popoloca	pls	5971	pls
+	language	San Martín Itunyoso Triqui	trq	5972	trq
+	language	San Martín Quechua	qvs	5973	qvs
+	language	San Mateo Del Mar Huave	huv	5974	huv
+	language	San Miguel Creole French	scf	5975	scf
+	language	San Miguel El Grande Mixtec	mig	5976	mig
+	language	San Miguel Piedras Mixtec	xtp	5977	xtp
+	language	San Pedro Amuzgos Amuzgo	azg	5978	azg
+	language	San Pedro Quiatoni Zapotec	zpf	5979	zpf
+	language	San Salvador Kongo	kwy	5980	kwy
+	language	San Vicente CoatlÃĄn Zapotec	zpt	5981	zpt
+	language	Sanaani Arabic	ayn	5982	ayn
+	language	SanapanÃĄ	spn	5983	spn
+	language	Sandawe	sad	5984	sad
+	language	Sanga (Democratic Republic of Congo)	sng	5985	sng
+	language	Sanga (Nigeria)	xsn	5986	xsn
+	language	Sanggau	scg	5987	scg
+	language	Sangil	snl	5988	snl
+	language	Sangir	sxn	5989	sxn
+	language	Sangisari	sgr	5990	sgr
+	language	Sangkong	sgk	5991	sgk
+	language	Sanglechi	sgy	5992	sgy
+	language	Sango	sag	5993	sag	sg
+	language	Sangtam Naga	nsa	5994	nsa
+	language	Sangu (Gabon)	snq	5995	snq
+	language	Sangu (Tanzania)	sbp	5996	sbp
+	language	Sani	ysn	5997	ysn
+	language	Sanie	ysy	5998	ysy
+	language	Saniyo-Hiyewe	sny	5999	sny
+	language	Sankaran Maninka	msc	6000	msc
+	language	Sansi	ssi	6001	ssi
+	language	Sanskrit (Saṁskṛta)	san	6002	san	Saṁskṛta	sa	Sanskrit
+	language	Santa Ana de Tusi Pasco Quechua	qxt	6003	qxt
+	language	Santa Catarina Albarradas Zapotec	ztn	6004	ztn
+	language	Santa InÊs Ahuatempan Popoloca	pca	6005	pca
+	language	Santa InÊs Yatzechi Zapotec	zpn	6006	zpn
+	language	Santa Lucía Monteverde Mixtec	mdv	6007	mdv
+	language	Santa María Del Mar Huave	hvv	6008	hvv
+	language	Santa María La Alta Nahuatl	nhz	6009	nhz
+	language	Santa María Quiegolani Zapotec	zpi	6010	zpi
+	language	Santa María Zacatepec Mixtec	mza	6011	mza
+	language	Santa Teresa Cora	cok	6012	cok
+	language	Santali	sat	6013	sat
+	language	Santiago Xanica Zapotec	zpr	6014	zpr
+	language	Santiago del Estero Quichua	qus	6015	qus
+	language	Santo Domingo Albarradas Zapotec	zas	6016	zas
+	language	SanumÃĄ	xsu	6017	xsu
+	language	Saparua	spr	6018	spr
+	language	Sapo	krn	6019	krn
+	language	Saponi	spi	6020	spi
+	language	Saposa	sps	6021	sps
+	language	Sapuan	spu	6022	spu
+	language	SapÊ	spc	6023	spc
+	language	Sar	mwm	6024	mwm
+	language	Sara	sre	6025	sre
+	language	Sara Kaba	sbz	6026	sbz
+	language	Sara Kaba Deme	kwg	6027	kwg
+	language	Sara Kaba NÃĄÃ 	kwv	6028	kwv
+	language	Saraiki	skr	6029	skr
+	language	Saramaccan	srm	6030	srm
+	language	Sarangani Blaan	bps	6031	bps
+	language	Sarangani Manobo	mbs	6032	mbs
+	language	Sarasira	zsa	6033	zsa
+	language	Saraveca	sar	6034	sar
+	language	Sardinian	srd	6035	srd	sc
+	language	Sari	asj	6036	asj
+	language	Sarikoli	srh	6037	srh
+	language	Sarli	sdf	6038	sdf
+	language	Sarsi	srs	6039	srs
+	language	Sartang	onp	6040	onp
+	language	Sarua	swy	6041	swy
+	language	Sarudu	sdu	6042	sdu
+	language	Saruga	sra	6043	sra
+	language	Sasak	sas	6044	sas
+	language	Sasaru	sxs	6045	sxs
+	language	Sassarese Sardinian	sdc	6046	sdc
+	language	Satawalese	stw	6047	stw
+	language	Saterfriesisch	stq	6048	stq
+	language	SaterÊ-MawÊ	mav	6049	mav
+	language	Saudi Arabian Sign Language	sdl	6050	sdl
+	language	Sauraseni Prākrit	psu	6051	psu
+	language	Saurashtra	saz	6052	saz
+	language	Sauri	srt	6053	srt
+	language	Sauria Paharia	mjt	6054	mjt
+	language	Sause	sao	6055	sao
+	language	Sausi	ssj	6056	ssj
+	language	Savi	sdg	6057	sdg
+	language	Savosavo	svs	6058	svs
+	language	Sawai	szw	6059	szw
+	language	Saweru	swr	6060	swr
+	language	Sawi	saw	6061	saw
+	language	Sawila	swt	6062	swt
+	language	Sawknah	swn	6063	swn
+	language	Saxwe Gbe	sxw	6064	sxw
+	language	Saya	say	6065	say
+	language	Sayula Popoluca	pos	6066	pos
+	language	Scots	sco	6067	sco
+	language	Scythian	xsc	6068	xsc
+	language	Sea Island Creole English	gul	6069	gul
+	language	Seba	kdg	6070	kdg
+	language	Sebat Bet Gurage	sgw	6071	sgw
+	language	Seberuang	sbx	6072	sbx
+	language	Sebop	sib	6073	sib
+	language	Sechelt	sec	6074	sec
+	language	Secoya	sey	6075	sey
+	language	Sedang	sed	6076	sed
+	language	Sediq	trv	6077	trv
+	language	Sedoa	tvw	6078	tvw
+	language	Seeku	sos	6079	sos
+	language	Segai	sge	6080	sge
+	language	Segeju	seg	6081	seg
+	language	Seget	sbg	6082	sbg
+	language	Sehwi	sfw	6083	sfw
+	language	Seimat	ssg	6084	ssg
+	language	Seit-Kaitetu	hik	6085	hik
+	language	Sekani	sek	6086	sek
+	language	Sekapan	skp	6087	skp
+	language	Sekar	skz	6088	skz
+	language	Seke (Nepal)	skj	6089	skj
+	language	Seke (Vanuatu)	ske	6090	ske
+	language	Sekele	vaj	6091	vaj
+	language	Seki	syi	6092	syi
+	language	Seko Padang	skx	6093	skx
+	language	Seko Tengah	sko	6094	sko
+	language	Sekpele	lip	6095	lip
+	language	Selangor Sign Language	kgi	6096	kgi
+	language	Selaru	slu	6097	slu
+	language	Selayar	sly	6098	sly
+	language	Selee	snw	6099	snw
+	language	Selepet	spl	6100	spl
+	language	Selian	sxl	6101	sxl
+	language	Selkup	sel	6102	sel
+	language	Selungai Murut	slg	6103	slg
+	language	Seluwasan	sws	6104	sws
+	language	Semai	sea	6105	sea
+	language	Semandang	sdq	6106	sdq
+	language	Semaq Beri	szc	6107	szc
+	language	Sembakung Murut	sbr	6108	sbr
+	language	Semelai	sza	6109	sza
+	language	Semimi	etz	6110	etz
+	language	Semnam	ssm	6111	ssm
+	language	Semnani	smy	6112	smy
+	language	Sempan	xse	6113	xse
+	language	Sena	seh	6114	seh
+	language	Senara SÊnoufo	seq	6115	seq
+	language	Senaya	syn	6116	syn
+	language	Sene	sej	6117	sej
+	language	Seneca	see	6118	see
+	language	Sened	sds	6119	sds
+	language	Sengele	szg	6120	szg
+	language	Senggi	snu	6121	snu
+	language	Sengo	spk	6122	spk
+	language	Sengseng	ssz	6123	ssz
+	language	Senhaja De Srair	sjs	6124	sjs
+	language	Sensi	sni	6125	sni
+	language	Sentani	set	6126	set
+	language	Senthang Chin	sez	6127	sez
+	language	Sentinel	std	6128	std
+	language	Sepa (Indonesia)	spb	6129	spb
+	language	Sepa (Papua New Guinea)	spe	6130	spe
+	language	Sepik Iwam	iws	6131	iws
+	language	Sera	sry	6132	sry
+	language	Serbian	srp	6133	srp	scc	sr
+	language	Serbo-Croatian	hbs	6134	hbs
+	language	Sere	swf	6135	swf
+	language	Serer	srr	6136	srr
+	language	Seri	sei	6137	sei
+	language	Serili	sve	6138	sve
+	language	Seroa	kqu	6139	kqu
+	language	Serrano	ser	6140	ser
+	language	Serua	srw	6141	srw
+	language	Serudung Murut	srk	6142	srk
+	language	Serui-Laut	seu	6143	seu
+	language	Seselwa Creole French	crs	6144	crs
+	language	Seta	stf	6145	stf
+	language	Setaman	stm	6146	stm
+	language	Seti	sbi	6147	sbi
+	language	Settla	sta	6148	sta
+	language	Severn Ojibwa	ojs	6149	ojs
+	language	Sewa Bay	sew	6150	sew
+	language	Seychelles Sign Language	lsw	6151	lsw
+	language	Seze	sze	6152	sze
+	language	Sha	scw	6153	scw
+	language	Shabak	sdb	6154	sdb
+	language	Shahmirzadi	srz	6155	srz
+	language	Shahrudi	shm	6156	shm
+	language	Shall-Zwall	sha	6157	sha
+	language	Shama-Sambuga	sqa	6158	sqa
+	language	Shamang	xsh	6159	xsh
+	language	Shambala	ksb	6160	ksb
+	language	Shan	shn	6161	shn
+	language	Shanenawa	swo	6162	swo
+	language	Shanga	sho	6163	sho
+	language	Sharanahua	mcd	6164	mcd
+	language	Shark Bay	ssv	6165	ssv
+	language	Sharwa	swq	6166	swq
+	language	Shasta	sht	6167	sht
+	language	Shatt	shj	6168	shj
+	language	Shau	sqh	6169	sqh
+	language	Shawnee	sjw	6170	sjw
+	language	She	shx	6171	shx
+	language	Shehri	shv	6172	shv
+	language	Shekhawati	swv	6173	swv
+	language	Shekkacho	moy	6174	moy
+	language	Sheko	she	6175	she
+	language	Shelta	sth	6176	sth
+	language	Shempire Senoufo	seb	6177	seb
+	language	Shendu	shl	6178	shl
+	language	Sheni	scv	6179	scv
+	language	Sherbro	bun	6180	bun
+	language	Sherdukpen	sdp	6181	sdp
+	language	Sherpa	xsr	6182	xsr
+	language	Sheshi Kham	kip	6183	kip
+	language	Shi	shr	6184	shr
+	language	Shihhi Arabic	ssh	6185	ssh
+	language	Shiki	gua	6186	gua
+	language	Shilluk	shk	6187	shk
+	language	Shina	scl	6188	scl
+	language	Shipibo-Conibo	shp	6189	shp
+	language	Sholaga	sle	6190	sle
+	language	Shom Peng	sii	6191	sii
+	language	Shona	sna	6192	sna	sn
+	language	Shoo-Minda-Nye	bcv	6193	bcv
+	language	Shor	cjs	6194	cjs
+	language	Shoshoni	shh	6195	shh
+	language	Shua	shg	6196	shg
+	language	Shuadit	sdt	6197	sdt
+	language	Shuar	jiv	6198	jiv
+	language	Shubi	suj	6199	suj
+	language	Shughni	sgh	6200	sgh
+	language	Shuhi	sxg	6201	sxg
+	language	Shumashti	sts	6202	sts
+	language	Shumcho	scu	6203	scu
+	language	Shuswap	shs	6204	shs
+	language	Shwai	shw	6205	shw
+	language	Shwe Palaung	pll	6206	pll
+	language	Sialum	slw	6207	slw
+	language	Siamou	sif	6208	sif
+	language	Sian	spg	6209	spg
+	language	Siane	snp	6210	snp
+	language	Siang	sya	6211	sya
+	language	Siar-Lak	sjr	6212	sjr
+	language	Siawi	mmp	6213	mmp
+	language	Sibe	nco	6214	nco
+	language	Siberian Tatar	sty	6215	sty
+	language	Sibu Melanau	sdx	6216	sdx
+	language	Sicanian	sxc	6217	sxc
+	language	Sicel	scx	6218	scx
+	language	Sicilian	scn	6219	scn
+	language	Siculo Arabic	sqr	6220	sqr
+	language	Sidamo	sid	6221	sid
+	language	Sidetic	xsd	6222	xsd
+	language	Sie	erg	6223	erg
+	language	Sierra Leone Sign Language	sgx	6224	sgx
+	language	Sierra Negra Nahuatl	nsu	6225	nsu
+	language	Sierra de JuÃĄrez Zapotec	zaa	6226	zaa
+	language	Sighu	sxe	6227	sxe
+	language	Sihan	snr	6228	snr
+	language	Sihuas Ancash Quechua	qws	6229	qws
+	language	Sika	ski	6230	ski
+	language	Sikaiana	sky	6231	sky
+	language	Sikaritai	tty	6232	tty
+	language	Sikiana	sik	6233	sik
+	language	Sikkimese	sip	6234	sip
+	language	Siksika	bla	6235	bla
+	language	Sikule	skh	6236	skh
+	language	Sila	slt	6237	slt
+	language	Silacayoapan Mixtec	mks	6238	mks
+	language	Sileibi	sbq	6239	sbq
+	language	Silesian	szl	6240	szl
+	language	Silimo	wul	6241	wul
+	language	Siliput	mkc	6242	mkc
+	language	Silopi	xsp	6243	xsp
+	language	Silt'e	stv	6244	stv
+	language	Simaa	sie	6245	sie
+	language	Simba	sbw	6246	sbw
+	language	Simbali	smg	6247	smg
+	language	Simbari	smb	6248	smb
+	language	Simbo	sbb	6249	sbb
+	language	Simeku	smz	6250	smz
+	language	Simeulue	smr	6251	smr
+	language	Simte	smt	6252	smt
+	language	Sinagen	siu	6253	siu
+	language	Sinasina	sst	6254	sst
+	language	Sinaugoro	snc	6255	snc
+	language	Sindarin	sjn	6256	sjn
+	language	Sindhi	snd	6257	snd	sd
+	language	Sindhi Bhil	sbn	6258	sbn
+	language	Sindihui Mixtec	xts	6259	xts
+	language	Singa	sgm	6260	sgm
+	language	Singapore Sign Language	sls	6261	sls
+	language	Singpho	sgp	6262	sgp
+	language	Sinhala, Sinhalese	sin	6263	sin	si	Sinhala	Sinhalese
+	language	Sinicahua Mixtec	xti	6264	xti
+	language	Sininkere	skq	6265	skq
+	language	Sinte Romani	rmo	6266	rmo
+	language	Sinyar	sys	6267	sys
+	language	Sio	xsi	6268	xsi
+	language	Siona	snn	6269	snn
+	language	Sipacapense	qum	6270	qum
+	language	Sira	swj	6271	swj
+	language	Siraya	fos	6272	fos
+	language	Sirenik Yupik	ysr	6273	ysr
+	language	Siri	sir	6274	sir
+	language	Siriano	sri	6275	sri
+	language	SirionÃŗ	srq	6276	srq
+	language	Sirmauri	srx	6277	srx
+	language	Siroi	ssd	6278	ssd
+	language	Sissala	sld	6279	sld
+	language	Sissano	sso	6280	sso
+	language	Siuslaw	sis	6281	sis
+	language	Sivandi	siy	6282	siy
+	language	Sivia Sign Language	lsv	6283	lsv
+	language	Siwai	siw	6284	siw
+	language	Siwi	siz	6285	siz
+	language	Siwu	akp	6286	akp
+	language	Siyin Chin	csy	6287	csy
+	language	Skagit	ska	6288	ska
+	language	Skalvian	svx	6289	svx
+	language	Skepi Creole Dutch	skw	6290	skw
+	language	Skolt Sami	sms	6291	sms
+	language	Skou	skv	6292	skv
+	language	Slave (Athapascan)	den	6293	den
+	language	Slavomolisano	svm	6294	svm
+	language	Slovak	slk	6295	slk	slo	sk
+	language	Slovakian Sign Language	svk	6296	svk
+	language	Slovenian	slv	6297	slv	sl	Slovenian	Slovene
+	language	Small Flowery Miao	sfm	6298	sfm
+	language	Smärky Kanum	kxq	6299	kxq
+	language	Snohomish	sno	6300	sno
+	language	So (Democratic Republic of Congo)	soc	6301	soc
+	language	So'a	ssq	6302	ssq
+	language	Sobei	sob	6303	sob
+	language	Sochiapam Chinantec	cso	6304	cso
+	language	Soga	xog	6305	xog
+	language	Sogdian	sog	6306	sog
+	language	Soi	soj	6307	soj
+	language	Sokoro	sok	6308	sok
+	language	Solano	xso	6309	xso
+	language	Soli	sby	6310	sby
+	language	Solomon Islands Sign Language	szs	6311	szs
+	language	Solong	aaw	6312	aaw
+	language	Solos	sol	6313	sol
+	language	Som	smc	6314	smc
+	language	Somali	som	6315	som	so
+	language	Somba-Siawari	bmu	6316	bmu
+	language	Somrai	sor	6317	sor
+	language	Somray	smu	6318	smu
+	language	Somyev	kgt	6319	kgt
+	language	Sonaga	ysg	6320	ysg
+	language	Sonde	shc	6321	shc
+	language	Songe	sop	6322	sop
+	language	Songlai Chin	csj	6323	csj
+	language	Songo	soo	6324	soo
+	language	Songomeno	soe	6325	soe
+	language	Songoora	sod	6326	sod
+	language	Sonha	soi	6327	soi
+	language	Sonia	siq	6328	siq
+	language	Soninke	snk	6329	snk
+	language	Sonsorol	sov	6330	sov
+	language	Soo	teu	6331	teu
+	language	Sop	urw	6332	urw
+	language	Soqotri	sqt	6333	sqt
+	language	Sora	srb	6334	srb
+	language	Sori-Harengan	sbh	6335	sbh
+	language	Sorkhei	sqo	6336	sqo
+	language	Sorothaptic	sxo	6337	sxo
+	language	Sorsogon Ayta	ays	6338	ays
+	language	Sos Kundi	sdk	6339	sdk
+	language	Sota Kanum	krz	6340	krz
+	language	Sou	sqq	6341	sqq
+	language	Sou Nama	tlt	6342	tlt
+	language	Sou Upaa	wha	6343	wha
+	language	South African Sign Language	sfs	6344	sfs
+	language	South Awyu	aws	6345	aws
+	language	South Azerbaijani	azb	6346	azb
+	language	South Bolivian Quechua	quh	6347	quh
+	language	South Central Banda	lnl	6348	lnl
+	language	South Central Dinka	dib	6349	dib
+	language	South Efate	erk	6350	erk
+	language	South Fali	fal	6351	fal
+	language	South Giziga	giz	6352	giz
+	language	South Lembata	lmf	6353	lmf
+	language	South Marquesan	mqm	6354	mqm
+	language	South Muyu	kts	6355	kts
+	language	South Nuaulu	nxl	6356	nxl
+	language	South Picene	spx	6357	spx
+	language	South Slavey	xsl	6358	xsl
+	language	South Tairora	omw	6359	omw
+	language	South Ucayali AshÊninka	cpy	6360	cpy
+	language	South Watut	mcy	6361	mcy
+	language	South West Bay	sns	6362	sns
+	language	Southeast Ambrym	tvk	6363	tvk
+	language	Southeast Babar	vbb	6364	vbb
+	language	Southeast Ijo	ijs	6365	ijs
+	language	Southeast Pashai	psi	6366	psi
+	language	Southeast Tasmanian	xpf	6367	xpf
+	language	Southeastern Dinka	dks	6368	dks
+	language	Southeastern IxtlÃĄn Zapotec	zpd	6369	zpd
+	language	Southeastern Kolami	nit	6370	nit
+	language	Southeastern NochixtlÃĄn Mixtec	mxy	6371	mxy
+	language	Southeastern Pomo	pom	6372	pom
+	language	Southeastern Puebla Nahuatl	npl	6373	npl
+	language	Southeastern Tarahumara	tcu	6374	tcu
+	language	Southeastern Tepehuan	stp	6375	stp
+	language	Southern Alta	agy	6376	agy
+	language	Southern Altai	alt	6377	alt
+	language	Southern Amami-Oshima	ams	6378	ams
+	language	Southern Aymara	ayc	6379	ayc
+	language	Southern Bai	bfs	6380	bfs
+	language	Southern Balochi	bcc	6381	bcc
+	language	Southern Betsimisaraka Malagasy	bzc	6382	bzc
+	language	Southern Binukidnon	mtw	6383	mtw
+	language	Southern Birifor	biv	6384	biv
+	language	Southern Bobo MadarÊ	bwq	6385	bwq
+	language	Southern Bontok	obk	6386	obk
+	language	Southern Carrier	caf	6387	caf
+	language	Southern Catanduanes Bikol	bln	6388	bln
+	language	Southern Conchucos Ancash Quechua	qxo	6389	qxo
+	language	Southern Dagaare	dga	6390	dga
+	language	Southern Dong	kmc	6391	kmc
+	language	Southern East Cree	crj	6392	crj
+	language	Southern Ghale	ghe	6393	ghe
+	language	Southern Grebo	grj	6394	grj
+	language	Southern Guiyang Hmong	hmy	6395	hmy
+	language	Southern Haida	hax	6396	hax
+	language	Southern Hindko	hnd	6397	hnd
+	language	Southern Kalapuya	sxk	6398	sxk
+	language	Southern Kalinga	ksc	6399	ksc
+	language	Southern Katang	sct	6400	sct
+	language	Southern Kisi	kss	6401	kss
+	language	Southern Kiwai	kjd	6402	kjd
+	language	Southern Kurdish	sdh	6403	sdh
+	language	Southern Lolopo	ysp	6404	ysp
+	language	Southern Luri	luz	6405	luz
+	language	Southern Ma'di	snm	6406	snm
+	language	Southern Mashan Hmong	hma	6407	hma
+	language	Southern Mnong	mnn	6408	mnn
+	language	Southern Muji	ymc	6409	ymc
+	language	Southern Nago	nqg	6410	nqg
+	language	Southern NambikuÃĄra	nab	6411	nab
+	language	Southern Ndebele	nbl	6412	nbl	South Ndebele	nr
+	language	Southern Ngbandi	nbw	6413	nbw
+	language	Southern Nicobarese	nik	6414	nik
+	language	Southern Nisu	nsd	6415	nsd
+	language	Southern Nuni	nnw	6416	nnw
+	language	Southern Ohlone	css	6417	css
+	language	Southern One	osu	6418	osu
+	language	Southern Pame	pmz	6419	pmz
+	language	Southern Pashto	pbt	6420	pbt
+	language	Southern Pastaza Quechua	qup	6421	qup
+	language	Southern Ping Chinese	csp	6422	csp
+	language	Southern Pomo	peq	6423	peq
+	language	Southern Puebla Mixtec	mit	6424	mit
+	language	Southern Puget Sound Salish	slh	6425	slh
+	language	Southern Pumi	pmj	6426	pmj
+	language	Southern Qiandong Miao	hms	6427	hms
+	language	Southern Qiang	qxs	6428	qxs
+	language	Southern Rengma Naga	nre	6429	nre
+	language	Southern Rincon Zapotec	zsr	6430	zsr
+	language	Southern Roglai	rgs	6431	rgs
+	language	Southern Sama	ssb	6432	ssb
+	language	Southern Sami	sma	6433	sma
+	language	Southern Samo	sbd	6434	sbd
+	language	Southern Sierra Miwok	skd	6435	skd
+	language	Southern Sorsoganon	srv	6436	srv
+	language	Southern Sotho	sot	6437	sot	st
+	language	Southern Subanen	laa	6438	laa
+	language	Southern Thai	sou	6439	sou
+	language	Southern Tidung	itd	6440	itd
+	language	Southern Tiwa	tix	6441	tix
+	language	Southern Toussian	wib	6442	wib
+	language	Southern Tujia	tjs	6443	tjs
+	language	Southern Tutchone	tce	6444	tce
+	language	Southern Uzbek	uzs	6445	uzs
+	language	Southern Yamphu	lrr	6446	lrr
+	language	Southern Yukaghir	yux	6447	yux
+	language	Southwest Gbaya	gso	6448	gso
+	language	Southwest Palawano	plv	6449	plv
+	language	Southwest Pashai	psh	6450	psh
+	language	Southwest Tanna	nwi	6451	nwi
+	language	Southwestern Bontok	vbk	6452	vbk
+	language	Southwestern Dinka	dik	6453	dik
+	language	Southwestern Fars	fay	6454	fay
+	language	Southwestern Guiyang Hmong	hmg	6455	hmg
+	language	Southwestern Huishui Hmong	hmh	6456	hmh
+	language	Southwestern Nisu	nsv	6457	nsv
+	language	Southwestern Tarahumara	twr	6458	twr
+	language	Southwestern Tasmanian	xpx	6459	xpx
+	language	Southwestern Tepehuan	tla	6460	tla
+	language	Southwestern Tlaxiaco Mixtec	meh	6461	meh
+	language	Sowa	sww	6462	sww
+	language	Sowanda	sow	6463	sow
+	language	Soyaltepec Mazatec	vmp	6464	vmp
+	language	Soyaltepec Mixtec	vmq	6465	vmq
+	language	Spanish Sign Language	ssp	6466	ssp
+	language	Spanish, Castilian	spa	6467	spa	Castilian	Spanish	es
+	language	Spiti Bhoti	spt	6468	spt
+	language	Spokane	spo	6469	spo
+	language	Squamish	squ	6470	squ
+	language	Sranan Tongo	srn	6471	srn
+	language	Sri Lankan Creole Malay	sci	6472	sci
+	language	Sri Lankan Sign Language	sqs	6473	sqs
+	language	Standard Arabic	arb	6474	arb
+	language	Standard Estonian	ekk	6475	ekk
+	language	Standard Latvian	lvs	6476	lvs
+	language	Standard Malay	zsm	6477	zsm
+	language	Standard Moroccan Tamazight	zgh	6478	zgh
+	language	Stellingwerfs	stl	6479	stl
+	language	Stod Bhoti	sbu	6480	sbu
+	language	Stoney	sto	6481	sto
+	language	Straits Salish	str	6482	str
+	language	Suabo	szp	6483	szp
+	language	Suarmin	seo	6484	seo
+	language	Suau	swp	6485	swp
+	language	Suba	sxb	6486	sxb
+	language	Suba-Simbiti	ssc	6487	ssc
+	language	Subi	xsj	6488	xsj
+	language	Subiya	sbs	6489	sbs
+	language	Subtiaba	sut	6490	sut
+	language	Sudanese Arabic	apd	6491	apd
+	language	Sudanese Creole Arabic	pga	6492	pga
+	language	Sudest	tgo	6493	tgo
+	language	Sudovian	xsv	6494	xsv
+	language	Suena	sue	6495	sue
+	language	Suga	sgi	6496	sgi
+	language	Suganga	sug	6497	sug
+	language	Sugut Dusun	kzs	6498	kzs
+	language	Sui	swi	6499	swi
+	language	Suki	sui	6500	sui
+	language	Suku	sub	6501	sub
+	language	Sukuma	suk	6502	suk
+	language	Sukur	syk	6503	syk
+	language	Sukurum	zsu	6504	zsu
+	language	Sula	szn	6505	szn
+	language	Sulka	sua	6506	sua
+	language	Sulod	srg	6507	srg
+	language	Suma	sqm	6508	sqm
+	language	Sumariup	siv	6509	siv
+	language	Sumau	six	6510	six
+	language	Sumbawa	smw	6511	smw
+	language	Sumbwa	suw	6512	suw
+	language	Sumerian	sux	6513	sux
+	language	Sumi Naga	nsm	6514	nsm
+	language	Sumtu Chin	csv	6515	csv
+	language	Sunam	ssk	6516	ssk
+	language	Sundanese	sun	6517	sun	su
+	language	Sunwar	suz	6518	suz
+	language	Suoy	syo	6519	syo
+	language	Supyire Senoufo	spp	6520	spp
+	language	Sur	tdl	6521	tdl
+	language	Surbakhal	sbj	6522	sbj
+	language	Surgujia	sgj	6523	sgj
+	language	Surigaonon	sgd	6524	sgd
+	language	Surjapuri	sjp	6525	sjp
+	language	Sursurunga	sgz	6526	sgz
+	language	SuruahÃĄ	swx	6527	swx
+	language	Surubu	sde	6528	sde
+	language	Suruí	sru	6529	sru
+	language	Suruí Do ParÃĄ	mdz	6530	mdz
+	language	Susquehannock	sqn	6531	sqn
+	language	Susu	sus	6532	sus
+	language	Susuami	ssu	6533	ssu
+	language	Suundi	sdj	6534	sdj
+	language	Suwawa	swu	6535	swu
+	language	SuyÃĄ	suy	6536	suy
+	language	Svan	sva	6537	sva
+	language	Swabian	swg	6538	swg
+	language	Swahili	swa	6539	swa	sw	Swahili (macrolanguage)
+	language	Swahili (individual language)	swh	6540	swh
+	language	Swampy Cree	csw	6541	csw
+	language	Swati	ssw	6542	ssw	ss
+	language	Swedish	swe	6543	swe	sv
+	language	Swedish Sign Language	swl	6544	swl
+	language	Swiss German	gsw	6545	gsw
+	language	Swiss-French Sign Language	ssr	6546	ssr
+	language	Swiss-German Sign Language	sgg	6547	sgg
+	language	Swiss-Italian Sign Language	slf	6548	slf
+	language	Swo	sox	6549	sox
+	language	Syenara Senoufo	shz	6550	shz
+	language	Sylheti	syl	6551	syl
+	language	Syriac	syr	6552	syr
+	language	SÃŖo Paulo KaingÃĄng	zkp	6554	zkp
+	language	SÃŖotomense	cri	6555	cri
+	language	SÃŦcÃŦtÊ SÊnoufo	sep	6556	sep
+	language	Sô	sss	6557	sss
+	language	T'apo	lgn	6558	lgn
+	language	T'en	tct	6559	tct
+	language	Ta'izzi-Adeni Arabic	acq	6560	acq
+	language	Taabwa	tap	6561	tap
+	language	Tabaa Zapotec	zat	6562	zat
+	language	Tabaru	tby	6563	tby
+	language	Tabasco Chontal	chf	6564	chf
+	language	Tabasco Nahuatl	nhc	6565	nhc
+	language	Tabasco Zoque	zoq	6566	zoq
+	language	Tabassaran	tab	6567	tab
+	language	Tabla	tnm	6568	tnm
+	language	Tabo	knv	6569	knv
+	language	Tabriak	tzx	6570	tzx
+	language	Tacahua Mixtec	xtt	6571	xtt
+	language	Tacana	tna	6572	tna
+	language	Tachawit	shy	6573	shy
+	language	Tachelhit	shi	6574	shi
+	language	Tachoni	lts	6575	lts
+	language	Tadaksahak	dsq	6576	dsq
+	language	Tado	klw	6577	klw
+	language	Tadyawan	tdy	6578	tdy
+	language	Tae'	rob	6579	rob
+	language	Tafi	tcd	6580	tcd
+	language	Tagabawa	bgs	6581	bgs
+	language	Tagakaulo	klg	6582	klg
+	language	Tagal Murut	mvv	6583	mvv
+	language	Tagalaka	tgz	6584	tgz
+	language	Tagalog	tgl	6585	tgl	tl
+	language	Tagargrent	oua	6586	oua
+	language	Tagbanwa	tbw	6587	tbw
+	language	Tagbu	tbm	6588	tbm
+	language	Tagdal	tda	6589	tda
+	language	Tagin	tgj	6590	tgj
+	language	Tagish	tgx	6591	tgx
+	language	Tagoi	tag	6592	tag
+	language	Tagwana Senoufo	tgw	6593	tgw
+	language	Tahaggart Tamahaq	thv	6594	thv
+	language	Tahitian	tah	6595	tah	ty
+	language	Tahltan	tht	6596	tht
+	language	Tai	taw	6597	taw
+	language	Tai Daeng	tyr	6598	tyr
+	language	Tai Dam	blt	6599	blt
+	language	Tai Do	tyj	6600	tyj
+	language	Tai DÃŗn	twh	6601	twh
+	language	Tai Hongjin	tiz	6602	tiz
+	language	Tai Laing	tjl	6603	tjl
+	language	Tai Loi	tlq	6604	tlq
+	language	Tai Long	thi	6605	thi
+	language	Tai NÃŧa	tdd	6606	tdd
+	language	Tai Pao	tpo	6607	tpo
+	language	Tai Thanh	tmm	6608	tmm
+	language	Tai Ya	cuu	6609	cuu
+	language	Taiap	gpn	6610	gpn
+	language	Taikat	aos	6611	aos
+	language	Tainae	ago	6612	ago
+	language	Taino	tnq	6613	tnq
+	language	Tairaha	bxa	6614	bxa
+	language	Tairuma	uar	6615	uar
+	language	Taita	dav	6616	dav
+	language	Taivoan	tvx	6617	tvx
+	language	Taiwan Sign Language	tss	6618	tss
+	language	Taje	pee	6619	pee
+	language	Tajik	tgk	6620	tgk	tg
+	language	Tajiki Arabic	abh	6621	abh
+	language	Tajio	tdj	6622	tdj
+	language	Tajuasohn	tja	6623	tja
+	language	Takelma	tkm	6624	tkm
+	language	Takestani	tks	6625	tks
+	language	Takia	tbc	6626	tbc
+	language	Takua	tkz	6627	tkz
+	language	Takuu	nho	6628	nho
+	language	Takwane	tke	6629	tke
+	language	Tal	tal	6630	tal
+	language	Tala	tak	6631	tak
+	language	Talaud	tld	6632	tld
+	language	Taliabu	tlv	6633	tlv
+	language	Talieng	tdf	6634	tdf
+	language	Talinga-Bwisi	tlj	6635	tlj
+	language	Talise	tlr	6636	tlr
+	language	Talodi	tlo	6637	tlo
+	language	Taloki	tlk	6638	tlk
+	language	Talondo'	tln	6639	tln
+	language	Talossan	tzl	6640	tzl
+	language	Talu	yta	6641	yta
+	language	Talysh	tly	6642	tly
+	language	Tama (Chad)	tma	6643	tma
+	language	Tama (Colombia)	ten	6644	ten
+	language	Tamagario	tcg	6645	tcg
+	language	Taman (Indonesia)	tmn	6646	tmn
+	language	Taman (Myanmar)	tcl	6647	tcl
+	language	Tamanaku	tmz	6648	tmz
+	language	Tamashek	tmh	6649	tmh
+	language	Tamasheq	taq	6650	taq
+	language	Tamazola Mixtec	vmx	6651	vmx
+	language	Tambas	tdk	6652	tdk
+	language	Tambora	xxt	6653	xxt
+	language	Tambotalo	tls	6654	tls
+	language	Tami	tmy	6655	tmy
+	language	Tamil	tam	6656	tam	ta
+	language	Tamki	tax	6657	tax
+	language	Tamnim Citak	tml	6658	tml
+	language	Tampias Lobu	low	6659	low
+	language	Tampuan	tpu	6660	tpu
+	language	Tampulma	tpm	6661	tpm
+	language	Tanacross	tcb	6662	tcb
+	language	Tanahmerah	tcm	6663	tcm
+	language	Tanaina	tfn	6664	tfn
+	language	Tanapag	tpv	6665	tpv
+	language	Tandaganon	tgn	6666	tgn
+	language	Tandia	tni	6667	tni
+	language	Tandroy-Mahafaly Malagasy	tdx	6668	tdx
+	language	Tanema	tnx	6669	tnx
+	language	Tangale	tan	6670	tan
+	language	Tangchangya	tnv	6671	tnv
+	language	Tanggu	tgu	6672	tgu
+	language	Tangkhul Naga (India)	nmf	6673	nmf
+	language	Tangkhul Naga (Myanmar)	ntx	6674	ntx
+	language	Tangko	tkx	6675	tkx
+	language	Tanglang	ytl	6676	ytl
+	language	Tangoa	tgp	6677	tgp
+	language	Tanguat	tbs	6678	tbs
+	language	Tangut	txg	6679	txg
+	language	Tanimbili	tbe	6680	tbe
+	language	Tanimuca-RetuarÃŖ	tnc	6681	tnc
+	language	Tanjijili	uji	6682	uji
+	language	Tanosy Malagasy	txy	6683	txy
+	language	Tanudan Kalinga	kml	6684	kml
+	language	Tanzanian Sign Language	tza	6685	tza
+	language	Tapei	afp	6686	afp
+	language	TapietÊ	tpj	6687	tpj
+	language	TapirapÊ	taf	6688	taf
+	language	Tarao Naga	tro	6689	tro
+	language	Tareng	tgr	6690	tgr
+	language	Tariana	tae	6691	tae
+	language	Tarifit	rif	6692	rif
+	language	Tarjumo	txj	6693	txj
+	language	Tarok	yer	6694	yer
+	language	Tarpia	tpf	6695	tpf
+	language	Tartessian	txr	6696	txr
+	language	Taruma	tdm	6697	tdm
+	language	Tasawaq	twq	6698	twq
+	language	Tase Naga	nst	6699	nst
+	language	Tasmate	tmt	6700	tmt
+	language	Tataltepec Chatino	cta	6701	cta
+	language	Tatana	txx	6702	txx
+	language	Tatar	tat	6703	tat	tt
+	language	Tatuyo	tav	6704	tav
+	language	Tauade	ttd	6705	ttd
+	language	Taulil	tuh	6706	tuh
+	language	Taungyo	tco	6707	tco
+	language	Taupota	tpa	6708	tpa
+	language	Tause	tad	6709	tad
+	language	Taushiro	trr	6710	trr
+	language	Tausug	tsg	6711	tsg
+	language	Tauya	tya	6712	tya
+	language	Taveta	tvs	6713	tvs
+	language	Tavoyan	tvn	6714	tvn
+	language	Tavringer Romani	rmu	6715	rmu
+	language	Tawala	tbo	6716	tbo
+	language	Tawallammat Tamajaq	ttq	6717	ttq
+	language	TawandÃĒ	xtw	6718	xtw
+	language	Tawang Monpa	twm	6719	twm
+	language	Tawara	twl	6720	twl
+	language	Taworta	tbp	6721	tbp
+	language	Tawoyan	twy	6722	twy
+	language	Tawr Chin	tcp	6723	tcp
+	language	Tay Boi	tas	6724	tas
+	language	Tay Khang	tnu	6725	tnu
+	language	Tayart Tamajeq	thz	6726	thz
+	language	Tayo	cks	6727	cks
+	language	Taznatit	grr	6728	grr
+	language	Tboli	tbl	6729	tbl
+	language	Tchitchege	tck	6730	tck
+	language	Tchumbuli	bqa	6731	bqa
+	language	Te'un	tve	6732	tve
+	language	Teanu	tkw	6733	tkw
+	language	Tebul Sign Language	tsy	6734	tsy
+	language	Tebul Ure Dogon	dtu	6735	dtu
+	language	TecpatlÃĄn Totonac	tcw	6736	tcw
+	language	Tedaga	tuq	6737	tuq
+	language	Tedim Chin	ctd	6738	ctd
+	language	Tee	tkq	6739	tkq
+	language	Tefaro	tfo	6740	tfo
+	language	Tegali	ras	6741	ras
+	language	Tehit	kps	6742	kps
+	language	Tehuelche	teh	6743	teh
+	language	Tejalapan Zapotec	ztt	6744	ztt
+	language	Teke-Ebo	ebo	6745	ebo
+	language	Teke-Fuumu	ifm	6746	ifm
+	language	Teke-Kukuya	kkw	6747	kkw
+	language	Teke-Laali	lli	6748	lli
+	language	Teke-Nzikou	nzu	6749	nzu
+	language	Teke-Tege	teg	6750	teg
+	language	Teke-Tsaayi	tyi	6751	tyi
+	language	Teke-Tyee	tyx	6752	tyx
+	language	Tektiteko	ttc	6753	ttc
+	language	Tela-Masbuar	tvm	6754	tvm
+	language	Telefol	tlf	6755	tlf
+	language	Telugu	tel	6756	tel	te
+	language	Tem	kdh	6757	kdh
+	language	Temacine Tamazight	tjo	6758	tjo
+	language	Temascaltepec Nahuatl	nhv	6759	nhv
+	language	Tembo (Kitembo)	tbt	6760	tbt
+	language	Tembo (Motembo)	tmv	6761	tmv
+	language	TembÊ	tqb	6762	tqb
+	language	Teme	tdo	6763	tdo
+	language	Temein	teq	6764	teq
+	language	Temi	soz	6765	soz
+	language	Temiar	tea	6766	tea
+	language	Temoaya Otomi	ott	6767	ott
+	language	Temoq	tmo	6768	tmo
+	language	Temuan	tmw	6769	tmw
+	language	Ten'edn	tnz	6770	tnz
+	language	Tena Lowland Quichua	quw	6771	quw
+	language	Tenango Otomi	otn	6772	otn
+	language	Tene Kan Dogon	dtk	6773	dtk
+	language	Tenggarong Kutai Malay	vkt	6774	vkt
+	language	Tengger	tes	6775	tes
+	language	Tenharim	pah	6776	pah
+	language	Tenino	tqn	6777	tqn
+	language	Tenis	tns	6778	tns
+	language	Tennet	tex	6779	tex
+	language	Teop	tio	6780	tio
+	language	Teor	tev	6781	tev
+	language	Tepecano	tep	6782	tep
+	language	Tepetotutla Chinantec	cnt	6783	cnt
+	language	Tepeuxila Cuicatec	cux	6784	cux
+	language	Tepinapa Chinantec	cte	6785	cte
+	language	Tepo Krumen	ted	6786	ted
+	language	Ter Sami	sjt	6787	sjt
+	language	Tera	ttr	6788	ttr
+	language	Terebu	trb	6789	trb
+	language	Terei	buo	6790	buo
+	language	Tereno	ter	6791	ter
+	language	Teressa	tef	6792	tef
+	language	Tereweng	twg	6793	twg
+	language	Teribe	tfr	6794	tfr
+	language	Terik	tec	6795	tec
+	language	Termanu	twu	6796	twu
+	language	Ternate	tft	6797	tft
+	language	TernateÃąo	tmg	6798	tmg
+	language	Tesaka Malagasy	tkg	6799	tkg
+	language	Tese	keg	6800	keg
+	language	Teshenawa	twc	6801	twc
+	language	Teso	teo	6802	teo
+	language	Tetela	tll	6803	tll
+	language	Tetelcingo Nahuatl	nhg	6804	nhg
+	language	Tetete	teb	6805	teb
+	language	Tetserret	tez	6806	tez
+	language	Tetum	tet	6807	tet
+	language	Tetun Dili	tdt	6808	tdt
+	language	Teutila Cuicatec	cut	6809	cut
+	language	Tewa (Indonesia)	twe	6810	twe
+	language	Tewa (USA)	tew	6811	tew
+	language	Tewe	twx	6812	twx
+	language	Texcatepec Otomi	otx	6813	otx
+	language	Texistepec Popoluca	poq	6814	poq
+	language	Texmelucan Zapotec	zpz	6815	zpz
+	language	TezoatlÃĄn Mixtec	mxb	6816	mxb
+	language	Tha	thy	6817	thy
+	language	Thachanadan	thn	6818	thn
+	language	Thado Chin	tcz	6819	tcz
+	language	Thai	tha	6820	tha	th
+	language	Thai Sign Language	tsq	6821	tsq
+	language	Thai Song	soa	6822	soa
+	language	Thaiphum Chin	cth	6823	cth
+	language	Thakali	ths	6824	ths
+	language	Thangal Naga	nki	6825	nki
+	language	Thangmi	thf	6826	thf
+	language	Thao	ssf	6827	ssf
+	language	Tharaka	thk	6828	thk
+	language	Thawa	xtv	6829	xtv
+	language	Thaypan	typ	6830	typ
+	language	Thiin	iin	6831	iin
+	language	Tho	tou	6832	tou
+	language	Thompson	thp	6833	thp
+	language	Thopho	ytp	6834	ytp
+	language	Thracian	txh	6835	txh
+	language	Thu Lao	tyl	6836	tyl
+	language	Thulung	tdh	6837	tdh
+	language	Thur	lth	6838	lth
+	language	Thuri	thu	6839	thu
+	language	Tiagbamrin Aizi	ahi	6840	ahi
+	language	Tiale	mnl	6841	mnl
+	language	Tiang	tbj	6842	tbj
+	language	Tibea	ngy	6843	ngy
+	language	Tibetan Sign Language	lsn	6844	lsn
+	language	Tibetan, Tibetan Standard, Central	bod	6845	bod	Tibetan	Tibetan Central	Tibetan Standard	tib	bo
+	language	Tichurong	tcn	6846	tcn
+	language	Ticuna	tca	6847	tca
+	language	TidaÃĄ Mixtec	mtx	6848	mtx
+	language	Tidikelt Tamazight	tia	6849	tia
+	language	Tidore	tvo	6850	tvo
+	language	Tiemacèwè Bozo	boo	6851	boo
+	language	Tiene	tii	6852	tii
+	language	Tifal	tif	6853	tif
+	language	Tigak	tgc	6854	tgc
+	language	Tigon Mbembe	nza	6855	nza
+	language	Tigre	tig	6856	tig
+	language	Tigrinya	tir	6857	tir	ti
+	language	Tii	txq	6858	txq
+	language	Tijaltepec Mixtec	xtl	6859	xtl
+	language	Tikar	tik	6860	tik
+	language	Tikopia	tkp	6861	tkp
+	language	Tilapa Otomi	otl	6862	otl
+	language	Tillamook	til	6863	til
+	language	Tilquiapan Zapotec	zts	6864	zts
+	language	Tilung	tij	6865	tij
+	language	Tima	tms	6866	tms
+	language	Timbe	tim	6867	tim
+	language	Timne	tem	6868	tem
+	language	Timor Pidgin	tvy	6869	tvy
+	language	Timucua	tjm	6870	tjm
+	language	Timugon Murut	tih	6871	tih
+	language	Tinani	lbf	6872	lbf
+	language	Tindi	tin	6873	tin
+	language	Tingui-Boto	tgv	6874	tgv
+	language	Tinigua	tit	6875	tit
+	language	Tinputz	tpz	6876	tpz
+	language	Tippera	tpe	6877	tpe
+	language	Tira	tic	6878	tic
+	language	Tirahi	tra	6879	tra
+	language	Tiranige Diga Dogon	tde	6880	tde
+	language	Tiri	cir	6881	cir
+	language	Tirmaga-Chai Suri	suq	6882	suq
+	language	Tiruray	tiy	6883	tiy
+	language	Tita	tdq	6884	tdq
+	language	Titan	ttv	6885	ttv
+	language	Tiv	tiv	6886	tiv
+	language	Tiwa	lax	6887	lax
+	language	Tiwi	tiw	6888	tiw
+	language	Tiyaa	tyy	6889	tyy
+	language	TiÊfo	tiq	6890	tiq
+	language	TiÊyaxo Bozo	boz	6891	boz
+	language	Tjungundji	tjj	6892	tjj
+	language	Tjupany	tjp	6893	tjp
+	language	Tjurruru	tju	6894	tju
+	language	Tlachichilco Tepehua	tpt	6895	tpt
+	language	Tlacoapa Me'phaa	tpl	6896	tpl
+	language	Tlacoatzintepec Chinantec	ctl	6897	ctl
+	language	Tlacolulita Zapotec	zpk	6898	zpk
+	language	Tlahuitoltepec Mixe	mxp	6899	mxp
+	language	Tlamacazapa Nahuatl	nuz	6900	nuz
+	language	Tlazoyaltepec Mixtec	mqh	6901	mqh
+	language	Tlicho	dgr	6902	dgr
+	language	Tlingit	tli	6903	tli
+	language	To	toz	6904	toz
+	language	To'abaita	mlu	6905	mlu
+	language	Toaripi	tqo	6906	tqo
+	language	Toba	tob	6907	tob
+	language	Toba-Maskoy	tmf	6908	tmf
+	language	Tobagonian Creole English	tgh	6909	tgh
+	language	Tobanga	tng	6910	tng
+	language	Tobati	tti	6911	tti
+	language	Tobelo	tlb	6912	tlb
+	language	Tobian	tox	6913	tox
+	language	Tobilung	tgb	6914	tgb
+	language	Tobo	tbv	6915	tbv
+	language	Tocantins Asurini	asu	6916	asu
+	language	Tocho	taz	6917	taz
+	language	Toda	tcx	6918	tcx
+	language	Todrah	tdr	6919	tdr
+	language	Tofanma	tlg	6920	tlg
+	language	Tofin Gbe	tfi	6921	tfi
+	language	Togbo-Vara Banda	tor	6922	tor
+	language	Togoyo	tgy	6923	tgy
+	language	Tohono O'odham	ood	6924	ood
+	language	Tojolabal	toj	6925	toj
+	language	Tok Pisin	tpi	6926	tpi
+	language	Tokano	zuh	6927	zuh
+	language	Tokelau	tkl	6928	tkl
+	language	Tokharian A	xto	6929	xto
+	language	Tokharian B	txb	6930	txb
+	language	Toki Pona	tok	6931	tok
+	language	Toku-No-Shima	tkn	6932	tkn
+	language	Tol	jic	6933	jic
+	language	Tolaki	lbw	6934	lbw
+	language	Tolomako	tlm	6935	tlm
+	language	Tolowa	tol	6936	tol
+	language	Toma	tod	6937	tod
+	language	Tomadino	tdi	6938	tdi
+	language	Tombelala	ttp	6939	ttp
+	language	Tombonuo	txa	6940	txa
+	language	Tombulu	tom	6941	tom
+	language	Tomini	txm	6942	txm
+	language	Tommo So Dogon	dto	6943	dto
+	language	Tomo Kan Dogon	dtm	6944	dtm
+	language	Tomoip	tqp	6945	tqp
+	language	Tondano	tdn	6946	tdn
+	language	Tondi Songway Kiini	tst	6947	tst
+	language	Tonga (Nyasa)	tog	6948	tog
+	language	Tonga (Tonga Islands)	ton	6949	ton	to	Tonga
+	language	Tonga (Zambia)	toi	6950	toi
+	language	Tongwe	tny	6951	tny
+	language	Tonjon	tjn	6952	tjn
+	language	Tonkawa	tqw	6953	tqw
+	language	Tonsawang	tnw	6954	tnw
+	language	Tonsea	txs	6955	txs
+	language	Tontemboan	tnt	6956	tnt
+	language	Tooro	ttj	6957	ttj
+	language	Topoiyo	toy	6958	toy
+	language	Toposa	toq	6959	toq
+	language	Toraja-Sa'dan	sda	6960	sda
+	language	Toram	trj	6961	trj
+	language	Torau	ttu	6962	ttu
+	language	Tornedalen Finnish	fit	6963	fit
+	language	Toro	tdv	6964	tdv
+	language	Toro So Dogon	dts	6965	dts
+	language	Toro Tegu Dogon	dtt	6966	dtt
+	language	Toromono	tno	6967	tno
+	language	Torona	tqr	6968	tqr
+	language	Torres Strait Creole	tcs	6969	tcs
+	language	Torricelli	tei	6970	tei
+	language	Torwali	trw	6971	trw
+	language	TorÃĄ	trz	6972	trz
+	language	Tosk Albanian	als	6973	als
+	language	Totela	ttl	6974	ttl
+	language	Toto	txo	6975	txo
+	language	Totoli	txe	6976	txe
+	language	Totomachapan Zapotec	zph	6977	zph
+	language	Totontepec Mixe	mto	6978	mto
+	language	Totoro	ttk	6979	ttk
+	language	Touo	tqu	6980	tqu
+	language	Toura (Côte d'Ivoire)	neb	6981	neb
+	language	Toura (Papua New Guinea)	don	6982	don
+	language	Towei	ttn	6983	ttn
+	language	Transalpine Gaulish	xtg	6984	xtg
+	language	Traveller Danish	rmd	6985	rmd
+	language	Traveller Norwegian	rmg	6986	rmg
+	language	Traveller Scottish	trl	6987	trl
+	language	Tregami	trm	6988	trm
+	language	TremembÊ	tme	6989	tme
+	language	Trieng	stg	6990	stg
+	language	Trimuris	tip	6991	tip
+	language	Tring	tgq	6992	tgq
+	language	Tringgus-Sembaan Bidayuh	trx	6993	trx
+	language	Trinidad and Tobago Sign Language	lst	6994	lst
+	language	Trinidadian Creole English	trf	6995	trf
+	language	Trinitario	trn	6996	trn
+	language	TriÃŗ	tri	6997	tri
+	language	TrukÃĄ	tka	6998	tka
+	language	Trumai	tpy	6999	tpy
+	language	Ts'Ãŧn-Lao	tsl	7000	tsl
+	language	Tsaangi	tsa	7001	tsa
+	language	Tsakhur	tkr	7002	tkr
+	language	Tsakonian	tsd	7003	tsd
+	language	Tsakwambo	kvz	7004	kvz
+	language	Tsamai	tsb	7005	tsb
+	language	Tsat	huq	7006	huq
+	language	Tseku	tsk	7007	tsk
+	language	Tsetsaut	txc	7008	txc
+	language	Tshangla	tsj	7009	tsj
+	language	Tsikimba	kdl	7010	kdl
+	language	TsimanÊ	cas	7011	cas
+	language	Tsimihety Malagasy	xmw	7012	xmw
+	language	Tsimshian	tsi	7013	tsi
+	language	Tsishingini	tsw	7014	tsw
+	language	Tso	ldp	7015	ldp
+	language	Tsoa	hio	7016	hio
+	language	Tsogo	tsv	7017	tsv
+	language	Tsonga	tso	7018	tso	ts
+	language	Tsotso	lto	7019	lto
+	language	Tsou	tsu	7020	tsu
+	language	Tsucuba	cbq	7021	cbq
+	language	Tsum	ttz	7022	ttz
+	language	Tsuvadi	tvd	7023	tvd
+	language	Tsuvan	tsh	7024	tsh
+	language	Tswa	tsc	7025	tsc
+	language	Tswana	tsn	7026	tsn	tn
+	language	Tswapong	two	7027	two
+	language	Tu	mjg	7028	mjg
+	language	Tuamotuan	pmt	7029	pmt
+	language	Tubar	tbu	7030	tbu
+	language	Tucano	tuo	7031	tuo
+	language	Tugen	tuy	7032	tuy
+	language	Tugun	tzn	7033	tzn
+	language	Tugutil	tuj	7034	tuj
+	language	Tukang Besi North	khc	7035	khc
+	language	Tukang Besi South	bhq	7036	bhq
+	language	Tuki	bag	7037	bag
+	language	Tukpa	tpq	7038	tpq
+	language	Tukudede	tkd	7039	tkd
+	language	TukumanfÊd	tkf	7040	tkf
+	language	Tula	tul	7041	tul
+	language	Tulai	tvi	7042	tvi
+	language	Tulehu	tlu	7043	tlu
+	language	Tulishi	tey	7044	tey
+	language	Tulu	tcy	7045	tcy
+	language	Tulu-Bohuai	rak	7046	rak
+	language	Tuma-Irumu	iou	7047	iou
+	language	Tumak	tmc	7048	tmc
+	language	Tumari Kanuri	krt	7049	krt
+	language	Tumbuka	tum	7050	tum
+	language	Tumi	kku	7051	kku
+	language	Tumleo	tmq	7052	tmq
+	language	Tumshuqese	xtq	7053	xtq
+	language	Tumtum	tbr	7054	tbr
+	language	Tumulung Sisaala	sil	7055	sil
+	language	Tumzabt	mzb	7056	mzb
+	language	Tundra Enets	enh	7057	enh
+	language	Tunen	tvu	7058	tvu
+	language	Tungag	lcm	7059	lcm
+	language	Tunggare	trt	7060	trt
+	language	Tunia	tug	7061	tug
+	language	Tunica	tun	7062	tun
+	language	Tunisian Arabic	aeb	7063	aeb
+	language	Tunisian Sign Language	tse	7064	tse
+	language	Tunjung	tjg	7065	tjg
+	language	Tunni	tqq	7066	tqq
+	language	Tunzu	dza	7067	dza
+	language	Tuotomb	ttf	7068	ttf
+	language	Tuparí	tpr	7069	tpr
+	language	TupinambÃĄ	tpn	7070	tpn
+	language	Tupinikin	tpk	7071	tpk
+	language	Tupuri	tui	7072	tui
+	language	Turaka	trh	7073	trh
+	language	Turi	trd	7074	trd
+	language	TuriwÃĄra	twt	7075	twt
+	language	Turka	tuz	7076	tuz
+	language	Turkana	tuv	7077	tuv
+	language	Turkish	tur	7078	tur	tr
+	language	Turkish Sign Language	tsm	7079	tsm
+	language	Turkmen	tuk	7080	tuk	tk
+	language	Turks And Caicos Creole English	tch	7081	tch
+	language	Turoyo	tru	7082	tru
+	language	Turumsa	tqm	7083	tqm
+	language	Turung	try	7084	try
+	language	Tuscarora	tus	7085	tus
+	language	Tutelo	tta	7086	tta
+	language	Tutong	ttg	7087	ttg
+	language	Tutsa Naga	tvt	7088	tvt
+	language	Tutuba	tmi	7089	tmi
+	language	Tututepec Mixtec	mtu	7090	mtu
+	language	Tututni	tuu	7091	tuu
+	language	Tuvalu	tvl	7092	tvl
+	language	Tuvinian	tyv	7093	tyv
+	language	Tuwali Ifugao	ifk	7094	ifk
+	language	Tuwari	tww	7095	tww
+	language	Tuwuli	bov	7096	bov
+	language	TuxinÃĄwa	tux	7097	tux
+	language	TuxÃĄ	tud	7098	tud
+	language	Tuyuca	tue	7099	tue
+	language	Twana	twa	7100	twa
+	language	Twendi	twn	7101	twn
+	language	Twents	twd	7102	twd
+	language	Twi	twi	7103	twi	tw
+	language	Tyap	kcg	7104	kcg
+	language	Tz'utujil	tzj	7105	tzj
+	language	Tzeltal	tzh	7106	tzh
+	language	Tzotzil	tzo	7107	tzo
+	language	Tày	tyz	7108	tyz
+	language	Tày Sa Pa	tys	7109	tys
+	language	Tày Tac	tyt	7110	tyt
+	language	TÊÊn	lor	7111	lor
+	language	TÃŧbatulabal	tub	7112	tub
+	language	U	uuu	7113	uuu
+	language	Uab Meto	aoz	7114	aoz
+	language	UamuÊ	uam	7115	uam
+	language	Uare	ksj	7116	ksj
+	language	Ubaghara	byc	7117	byc
+	language	Ubang	uba	7118	uba
+	language	Ubi	ubi	7119	ubi
+	language	Ubir	ubr	7120	ubr
+	language	Ubykh	uby	7121	uby
+	language	Ucayali-YurÃēa AshÊninka	cpb	7122	cpb
+	language	Uda	uda	7123	uda
+	language	Udi	udi	7124	udi
+	language	Udihe	ude	7125	ude
+	language	Udmurt	udm	7126	udm
+	language	Uduk	udu	7127	udu
+	language	Ufim	ufi	7128	ufi
+	language	Ugandan Sign Language	ugn	7129	ugn
+	language	Ugaritic	uga	7130	uga
+	language	Ughele	uge	7131	uge
+	language	Ugong	ugo	7132	ugo
+	language	Uhami	uha	7133	uha
+	language	Uighur, Uyghur	uig	7134	uig	Uighur	ug	Uyghur
+	language	Uisai	uis	7135	uis
+	language	Ujir	udj	7136	udj
+	language	Ukaan	kcf	7137	kcf
+	language	Ukhwejo	ukh	7138	ukh
+	language	Ukit	umi	7139	umi
+	language	Ukpe-Bayobiri	ukp	7140	ukp
+	language	Ukpet-Ehom	akd	7141	akd
+	language	Ukrainian	ukr	7142	ukr	uk
+	language	Ukrainian Sign Language	ukl	7143	ukl
+	language	Ukue	uku	7144	uku
+	language	Ukuriguma	ukg	7145	ukg
+	language	Ukwa	ukq	7146	ukq
+	language	Ukwuani-Aboh-Ndoni	ukw	7147	ukw
+	language	Ulau-Suain	svb	7148	svb
+	language	Ulch	ulc	7149	ulc
+	language	Ulithian	uli	7150	uli
+	language	Ullatan	ull	7151	ull
+	language	Ulukwumi	ulb	7152	ulb
+	language	Ulumanda'	ulm	7153	ulm
+	language	Ulwa	ulw	7154	ulw
+	language	Uma	ppk	7155	ppk
+	language	Uma' Lasan	xky	7156	xky
+	language	Uma' Lung	ulu	7157	ulu
+	language	Umanakaina	gdn	7158	gdn
+	language	Umatilla	uma	7159	uma
+	language	Umbindhamu	umd	7160	umd
+	language	Umbrian	xum	7161	xum
+	language	Umbu-Ungu	ubu	7162	ubu
+	language	Umbugarla	umr	7163	umr
+	language	Umbundu	umb	7164	umb
+	language	Ume Sami	sju	7165	sju
+	language	Umeda	upi	7166	upi
+	language	Umiida	xud	7167	xud
+	language	Umiray Dumaget Agta	due	7168	due
+	language	Umon	umm	7169	umm
+	language	Umotína	umo	7170	umo
+	language	Umpila	ump	7171	ump
+	language	Una	mtg	7172	mtg
+	language	Unami	unm	7173	unm
+	language	Uncoded languages	mis	7174	mis
+	language	Unde Kaili	unz	7175	unz
+	language	Undetermined	und	7176	und
+	language	Uneapa	bbn	7177	bbn
+	language	Uneme	une	7178	une
+	language	Unggaranggu	xun	7179	xun
+	language	Unggumi	xgu	7180	xgu
+	language	Uni	uni	7181	uni
+	language	Unserdeutsch	uln	7182	uln
+	language	Unua	onu	7183	onu
+	language	Unubahe	unu	7184	unu
+	language	Upper Chehalis	cjh	7185	cjh
+	language	Upper Grand Valley Dani	dna	7186	dna
+	language	Upper Guinea Crioulo	pov	7187	pov
+	language	Upper Kinabatangan	dmg	7188	dmg
+	language	Upper Kuskokwim	kuu	7189	kuu
+	language	Upper Necaxa Totonac	tku	7190	tku
+	language	Upper Saxon	sxu	7191	sxu
+	language	Upper Sorbian	hsb	7192	hsb
+	language	Upper Ta'oih	tth	7193	tth
+	language	Upper Tanana	tau	7194	tau
+	language	Upper Taromi	tov	7195	tov
+	language	Upper Umpqua	xup	7196	xup
+	language	Ura (Papua New Guinea)	uro	7197	uro
+	language	Ura (Vanuatu)	uur	7198	uur
+	language	Uradhi	urf	7199	urf
+	language	Urak Lawoi'	urk	7200	urk
+	language	Urali	url	7201	url
+	language	Urapmin	urm	7202	urm
+	language	Urarina	ura	7203	ura
+	language	Urartian	xur	7204	xur
+	language	Urat	urt	7205	urt
+	language	Urdu	urd	7206	urd	ur
+	language	Urhobo	urh	7207	urh
+	language	Uri	uvh	7208	uvh
+	language	Urigina	urg	7209	urg
+	language	Urim	uri	7210	uri
+	language	Urimo	urx	7211	urx
+	language	Uripiv-Wala-Rano-Atchin	upv	7212	upv
+	language	Urningangg	urc	7213	urc
+	language	Uru	ure	7214	ure
+	language	Uru-Eu-Wau-Wau	urz	7215	urz
+	language	Uru-Pa-In	urp	7216	urp
+	language	Uruangnirin	urn	7217	urn
+	language	Uruava	urv	7218	urv
+	language	UrubÃē-Kaapor	urb	7219	urb
+	language	UrubÃē-Kaapor Sign Language	uks	7220	uks
+	language	Uruguayan Sign Language	ugy	7221	ugy
+	language	Urum	uum	7222	uum
+	language	Urumi	uru	7223	uru
+	language	Usaghade	usk	7224	usk
+	language	Usan	wnu	7225	wnu
+	language	Usarufa	usa	7226	usa
+	language	Ushojo	ush	7227	ush
+	language	Usila Chinantec	cuc	7228	cuc
+	language	Usku	ulf	7229	ulf
+	language	Uspanteco	usp	7230	usp
+	language	Usui	usi	7231	usi
+	language	Utarmbung	omo	7232	omo
+	language	Ute-Southern Paiute	ute	7233	ute
+	language	Utu	utu	7234	utu
+	language	Uvbie	evh	7235	evh
+	language	Uya	usu	7236	usu
+	language	Uyajitaya	duk	7237	duk
+	language	Uzbek	uzb	7238	uzb	uz
+	language	Uzbeki Arabic	auz	7239	auz
+	language	Uzekwe	eze	7240	eze
+	language	Vaagri Booli	vaa	7241	vaa
+	language	Vafsi	vaf	7242	vaf
+	language	Vaghri	vgr	7243	vgr
+	language	Vaghua	tva	7244	tva
+	language	Vagla	vag	7245	vag
+	language	Vai	vai	7246	vai
+	language	Vaiphei	vap	7247	vap
+	language	Vale	vae	7248	vae
+	language	Valencian Sign Language	vsv	7249	vsv
+	language	Valle Nacional Chinantec	cvn	7250	cvn
+	language	Valley Maidu	vmv	7251	vmv
+	language	Valman	van	7252	van
+	language	Valpei	vlp	7253	vlp
+	language	Vamale	mkt	7254	mkt
+	language	Vame	mlr	7255	mlr
+	language	Vandalic	xvn	7256	xvn
+	language	Vangunu	mpr	7257	mpr
+	language	Vanimo	vam	7258	vam
+	language	Vano	vnk	7259	vnk
+	language	Vanuma	vau	7260	vau
+	language	Vao	vao	7261	vao
+	language	Varhadi-Nagpuri	vah	7262	vah
+	language	Varisi	vrs	7263	vrs
+	language	Varli	vav	7264	vav
+	language	Vasavi	vas	7265	vas
+	language	Veddah	ved	7266	ved
+	language	Vedic Sanskrit	vsn	7267	vsn
+	language	Vehes	val	7268	val
+	language	Veluws	vel	7269	vel
+	language	Vemgo-Mabas	vem	7270	vem
+	language	Venda	ven	7271	ven	ve
+	language	Venetian	vec	7272	vec
+	language	Venetic	xve	7273	xve
+	language	Venezuelan Sign Language	vsl	7274	vsl
+	language	Vengo	bav	7275	bav
+	language	VentureÃąo	veo	7276	veo
+	language	Veps	vep	7277	vep
+	language	Vera'a	vra	7278	vra
+	language	Vestinian	xvs	7279	xvs
+	language	Vidunda	vid	7280	vid
+	language	Viemo	vig	7281	vig
+	language	Vietnamese	vie	7282	vie	vi
+	language	Vilela	vil	7283	vil
+	language	Vili	vif	7284	vif
+	language	Villa Viciosa Agta	dyg	7285	dyg
+	language	Vincentian Creole English	svc	7286	svc
+	language	Vinmavis	vnm	7287	vnm
+	language	Vinza	vin	7288	vin
+	language	Virgin Islands Creole English	vic	7289	vic
+	language	Vishavan	vis	7290	vis
+	language	Viti	vit	7291	vit
+	language	Vitou	vto	7292	vto
+	language	Vitu	wiv	7293	wiv
+	language	Vlaams	vls	7294	vls
+	language	Vlaamse Gebarentaal	vgt	7295	vgt
+	language	Vlax Romani	rmy	7296	rmy
+	language	VolapÃŧk	vol	7297	vol	vo
+	language	Volscian	xvo	7298	xvo
+	language	Vono	kch	7299	kch
+	language	Voro	vor	7300	vor vro VÃĩro
+	language	Votic	vot	7301	vot
+	language	Vumbu	vum	7302	vum
+	language	Vunapu	vnp	7303	vnp
+	language	Vunjo	vun	7304	vun
+	language	VurÃĢs	msn	7305	msn
+	language	Vute	vut	7306	vut
+	language	Vwanji	wbi	7307	wbi
+	language	Wa	wbm	7309	wbm
+	language	Wa'ema	wag	7310	wag
+	language	Waama	wwa	7311	wwa
+	language	Waamwang	wmn	7312	wmn
+	language	Waata	ssn	7313	ssn
+	language	Wab	wab	7314	wab
+	language	Wabo	wbb	7315	wbb
+	language	Waboda	kmx	7316	kmx
+	language	Waci Gbe	wci	7317	wci
+	language	Wadaginam	wdg	7318	wdg
+	language	Waddar	wbq	7319	wbq
+	language	Wadi Wadi	xwd	7320	xwd
+	language	Wadikali	wdk	7321	wdk
+	language	Wadiyara Koli	kxp	7322	kxp
+	language	Wadjabangayi	wdy	7323	wdy
+	language	Wadjiginy	wdj	7324	wdj
+	language	Wadjigu	wdu	7325	wdu
+	language	Wae Rana	wrx	7326	wrx
+	language	Waffa	waj	7327	waj
+	language	Wagawaga	wgb	7328	wgb
+	language	Wagaya	wga	7329	wga
+	language	Wagdi	wbr	7330	wbr
+	language	Wagi	fad	7331	fad
+	language	Wagiman	waq	7332	waq
+	language	Wahau Kayan	whu	7333	whu
+	language	Wahau Kenyah	whk	7334	whk
+	language	Wahgi	wgi	7335	wgi
+	language	Waigali	wbk	7336	wbk
+	language	Waigeo	wgo	7337	wgo
+	language	Wailaki	wlk	7338	wlk
+	language	Wailapa	wlr	7339	wlr
+	language	Waima	rro	7340	rro
+	language	Waima'a	wmh	7341	wmh
+	language	Waimaha	bao	7342	bao
+	language	Waimiri-Atroari	atr	7343	atr
+	language	Waioli	wli	7344	wli
+	language	Waiwai	waw	7345	waw
+	language	Waja	wja	7346	wja
+	language	Wajarri	wbv	7347	wbv
+	language	Wajuk	xwj	7348	xwj
+	language	Waka	wav	7349	wav
+	language	Wakabunga	wwb	7350	wwb
+	language	Wakawaka	wkw	7351	wkw
+	language	Wakde	wkd	7352	wkd
+	language	Wakhi	wbl	7353	wbl
+	language	WakonÃĄ	waf	7354	waf
+	language	Wala	lgl	7355	lgl
+	language	Walak	wlw	7356	wlw
+	language	Walangama	nlw	7357	nlw
+	language	Wali (Ghana)	wlx	7358	wlx
+	language	Wali (Sudan)	wll	7359	wll
+	language	Waling	wly	7360	wly
+	language	Walio	wla	7361	wla
+	language	Walla Walla	waa	7362	waa
+	language	Wallisian	wls	7363	wls
+	language	Walloon	wln	7364	wln	wa
+	language	Walmajarri	wmt	7365	wmt
+	language	Walser	wae	7366	wae
+	language	Walungge	ola	7367	ola
+	language	Waluwarra	wrb	7368	wrb
+	language	Wamas	wmc	7369	wmc
+	language	Wambaya	wmb	7370	wmb
+	language	Wambon	wms	7371	wms
+	language	Wambule	wme	7372	wme
+	language	Wamesa	wad	7373	wad
+	language	Wamey	cou	7374	cou
+	language	Wamin	wmi	7375	wmi
+	language	Wampanoag	wam	7376	wam
+	language	Wampar	lbq	7377	lbq
+	language	Wampur	waz	7378	waz
+	language	Wan	wan	7379	wan
+	language	Wanap	wnp	7380	wnp
+	language	Wancho Naga	nnp	7381	nnp
+	language	Wanda	wbh	7382	wbh
+	language	Wandala	mfi	7383	mfi
+	language	Wandarang	wnd	7384	wnd
+	language	Wandji	wdd	7385	wdd
+	language	Waneci	wne	7386	wne
+	language	Wanga	lwg	7387	lwg
+	language	Wangaaybuwan-Ngiyambaa	wyb	7388	wyb
+	language	Wanggamala	wnm	7389	wnm
+	language	Wanggom	wng	7390	wng
+	language	Wangkangurru	wgg	7391	wgg
+	language	Wangkayutyuru	wky	7392	wky
+	language	Wangkumara	xwk	7393	xwk
+	language	Wannu	jub	7394	jub
+	language	Wano	wno	7395	wno
+	language	Wantoat	wnc	7396	wnc
+	language	Wanukaka	wnk	7397	wnk
+	language	Wanyi	wny	7398	wny
+	language	WanÊ	hwa	7399	hwa
+	language	Waorani	auc	7400	auc
+	language	Wapan	juk	7401	juk
+	language	Wapishana	wap	7402	wap
+	language	Wappo	wao	7403	wao
+	language	War-Jaintia	aml	7404	aml
+	language	Wara	wbf	7405	wbf tci WÃĄra
+	language	Warao	wba	7406	wba
+	language	Waray (Australia)	wrz	7407	wrz
+	language	Waray (Philippines)	war	7408	war
+	language	Wardaman	wrr	7409	wrr
+	language	Wardandi	wxw	7410	wxw
+	language	Warembori	wsa	7411	wsa
+	language	Wares	wai	7412	wai
+	language	Waris	wrs	7413	wrs
+	language	Waritai	wbe	7414	wbe
+	language	Wariyangga	wri	7415	wri
+	language	Warji	wji	7416	wji
+	language	Warkay-Bipim	bgv	7417	bgv
+	language	Warlmanpa	wrl	7418	wrl
+	language	Warlpiri	wbp	7419	wbp
+	language	Warnang	wrn	7420	wrn
+	language	Warnman	wbt	7421	wbt
+	language	Waropen	wrp	7422	wrp
+	language	Warrgamay	wgy	7423	wgy
+	language	Warrwa	wwr	7424	wwr
+	language	Waru	wru	7425	wru
+	language	Warumungu	wrm	7426	wrm
+	language	Waruna	wrv	7427	wrv
+	language	Warungu	wrg	7428	wrg
+	language	Warwar Feni	hrw	7429	hrw
+	language	Wasa	wss	7430	wss
+	language	Wasco-Wishram	wac	7431	wac
+	language	Wasembo	gsp	7432	gsp
+	language	Washo	was	7433	was
+	language	Waskia	wsk	7434	wsk
+	language	Wasu	wsu	7435	wsu
+	language	Watakataui	wtk	7436	wtk
+	language	Watam	wax	7437	wax
+	language	Wathawurrung	wth	7438	wth
+	language	Watiwa	wtf	7439	wtf
+	language	Watubela	wah	7440	wah
+	language	Waube	kop	7441	kop
+	language	WaurÃĄ	wau	7442	wau
+	language	Wauyai	wuy	7443	wuy
+	language	Wawa	www	7444	www
+	language	Wawonii	wow	7445	wow
+	language	Waxianghua	wxa	7446	wxa
+	language	Wayampi	oym	7447	oym
+	language	Wayana	way	7448	way
+	language	Wayanad Chetti	ctt	7449	ctt
+	language	WayorÃŗ	wyr	7450	wyr
+	language	Wayu	vay	7451	vay
+	language	Wayuu	guc	7452	guc
+	language	Wedau	wed	7453	wed
+	language	Weh	weh	7454	weh
+	language	Wejewa	wew	7455	wew
+	language	Welaun	wlh	7456	wlh
+	language	Weliki	klh	7457	klh
+	language	Welsh	cym	7458	cym	cy	wel
+	language	Welsh Romani	rmw	7459	rmw
+	language	Wemale	weo	7460	weo
+	language	Wemba Wemba	xww	7461	xww
+	language	Weme Gbe	wem	7462	wem
+	language	Wendat	wdt	7463	wdt
+	language	Wergaia	weg	7464	weg
+	language	Weri	wer	7465	wer
+	language	Wersing	kvw	7466	kvw
+	language	West Albay Bikol	fbl	7467	fbl
+	language	West Ambae	nnd	7468	nnd
+	language	West Bengal Sign Language	wbs	7469	wbs
+	language	West Berawan	zbw	7470	zbw
+	language	West Central Banda	bbp	7471	bbp
+	language	West Central Oromo	gaz	7472	gaz
+	language	West Coast Bajau	bdr	7473	bdr
+	language	West Damar	drn	7474	drn
+	language	West Goodenough	ddi	7475	ddi
+	language	West Kewa	kew	7476	kew
+	language	West Lembata	lmj	7477	lmj
+	language	West Makian	mqs	7478	mqs
+	language	West Masela	mss	7479	mss
+	language	West Tarangan	txn	7480	txn
+	language	West Uvean	uve	7481	uve
+	language	West Yugur	ybe	7482	ybe
+	language	West-Central Limba	lia	7483	lia
+	language	Western Abnaki	abe	7484	abe
+	language	Western Apache	apw	7485	apw
+	language	Western Armenian	hyw	7486	hyw
+	language	Western Arrarnta	are	7487	are
+	language	Western Balochi	bgn	7488	bgn
+	language	Western Bolivian Guaraní	gnw	7489	gnw
+	language	Western Bru	brv	7490	brv
+	language	Western Bukidnon Manobo	mbb	7491	mbb
+	language	Western Cham	cja	7492	cja
+	language	Western Dani	dnw	7493	dnw
+	language	Western Durango Nahuatl	azn	7494	azn
+	language	Western Fijian	wyy	7495	wyy
+	language	Western Frisian	fry	7496	fry	fy
+	language	Western Highland Chatino	ctp	7497	ctp
+	language	Western Highland Purepecha	pua	7498	pua
+	language	Western Huasteca Nahuatl	nhw	7499	nhw
+	language	Western Juxtlahuaca Mixtec	jmx	7500	jmx
+	language	Western Kanjobal	knj	7501	knj
+	language	Western Karaboro	kza	7502	kza
+	language	Western Katu	kuf	7503	kuf
+	language	Western Kayah	kyu	7504	kyu
+	language	Western Keres	kjq	7505	kjq
+	language	Western Krahn	krw	7506	krw
+	language	Western Lalu	ywl	7507	ywl
+	language	Western Lawa	lcp	7508	lcp
+	language	Western Magar	mrd	7509	mrd
+	language	Western Maninkakan	mlq	7510	mlq
+	language	Western Mari	mrj	7511	mrj
+	language	Western Mashan Hmong	hmw	7512	hmw
+	language	Western Meohang	raf	7513	raf
+	language	Western Minyag	wmg	7514	wmg
+	language	Western Muria	mut	7515	mut
+	language	Western Neo-Aramaic	amw	7516	amw
+	language	Western Niger Fulfulde	fuh	7517	fuh
+	language	Western Ojibwa	ojw	7518	ojw
+	language	Western Panjabi	pnb	7519	pnb
+	language	Western Parbate Kham	kjl	7520	kjl
+	language	Western Penan	pne	7521	pne
+	language	Western Sisaala	ssl	7522	ssl
+	language	Western Subanon	suc	7523	suc
+	language	Western Tamang	tdg	7524	tdg
+	language	Western Tawbuid	twb	7525	twb
+	language	Western Tlacolula Valley Zapotec	zab	7526	zab
+	language	Western Totonac	tqt	7527	tqt
+	language	Western Tunebo	tnb	7528	tnb
+	language	Western Xiangxi Miao	mmr	7529	mmr
+	language	Western Xwla Gbe	xwl	7530	xwl
+	language	Western Yiddish	yih	7531	yih
+	language	Westphalien	wep	7532	wep
+	language	Wetamut	wwo	7533	wwo
+	language	Wewaw	wea	7534	wea
+	language	Weyto	woy	7535	woy
+	language	White Gelao	giw	7536	giw
+	language	White Lachi	lwh	7537	lwh
+	language	Whitesands	tnp	7538	tnp
+	language	Wiarumus	tua	7539	tua
+	language	Wichita	wic	7540	wic
+	language	Wichí LhamtÊs GÃŧisnay	mzh	7541	mzh
+	language	Wichí LhamtÊs Nocten	mtp	7542	mtp
+	language	Wichí LhamtÊs Vejoz	wlv	7543	wlv
+	language	Wik Ngathan	wig	7544	wig
+	language	Wik-Epa	wie	7545	wie
+	language	Wik-Iiyanh	wij	7546	wij
+	language	Wik-Keyangan	wif	7547	wif
+	language	Wik-Me'anha	wih	7548	wih
+	language	Wik-Mungkan	wim	7549	wim
+	language	Wikalkan	wik	7550	wik
+	language	Wikngenchera	wua	7551	wua
+	language	Wilawila	wil	7552	wil
+	language	Wintu	wnw	7553	wnw
+	language	WinyÊ	kst	7554	kst
+	language	Wipi	gdr	7555	gdr
+	language	Wiradjuri	wrh	7556	wrh
+	language	WirafÊd	wir	7557	wir
+	language	Wirangu	wgu	7558	wgu
+	language	Wiru	wiu	7559	wiu
+	language	Wiyot	wiy	7560	wiy
+	language	Woccon	xwc	7561	xwc
+	language	Wogamusin	wog	7562	wog
+	language	Wogeo	woc	7563	woc
+	language	Woi	wbw	7564	wbw
+	language	Woiwurrung	wyi	7565	wyi
+	language	Wojenaka	jod	7566	jod
+	language	Wolane	wle	7567	wle
+	language	Wolani	wod	7568	wod
+	language	Wolaytta	wal	7569	wal
+	language	Woleaian	woe	7570	woe
+	language	Wolio	wlo	7571	wlo
+	language	Wolof	wol	7572	wol	wo
+	language	Wom (Nigeria)	wom	7573	wom
+	language	Wom (Papua New Guinea)	wmo	7574	wmo
+	language	Womo	wmx	7575	wmx
+	language	Wongo	won	7576	won
+	language	Woods Cree	cwd	7577	cwd
+	language	Woria	wor	7578	wor
+	language	Worimi	kda	7579	kda
+	language	Worodougou	jud	7580	jud
+	language	Worrorra	wro	7581	wro
+	language	Wotapuri-Katarqalai	wsv	7582	wsv
+	language	Wotjobaluk	xwt	7583	xwt
+	language	Wotu	wtw	7584	wtw
+	language	Woun Meu	noa	7585	noa
+	language	Written Oirat	xwo	7586	xwo
+	language	Wu Chinese	wuu	7587	wuu
+	language	Wuding-Luquan Yi	ywq	7588	ywq
+	language	Wudu	wud	7589	wud
+	language	Wuliwuli	wlu	7590	wlu
+	language	Wulna	wux	7591	wux
+	language	Wumboko	bqm	7592	bqm
+	language	Wumbvu	wum	7593	wum
+	language	Wumeng Nasu	ywu	7594	ywu
+	language	Wunai Bunu	bwn	7595	bwn
+	language	Wunambal	wub	7596	wub
+	language	Wunumara	wnn	7597	wnn
+	language	Wurrugu	wur	7598	wur
+	language	Wusa Nasu	yig	7599	yig
+	language	Wushi	bse	7600	bse
+	language	Wusi	wsi	7601	wsi
+	language	Wutung	wut	7602	wut
+	language	Wutunhua	wuh	7603	wuh
+	language	Wuvulu-Aua	wuv	7604	wuv
+	language	Wuzlam	udl	7605	udl
+	language	Wyandot	wyn	7606	wyn
+	language	Wymysorys	wym	7607	wym
+	language	WÃŖpha	juw	7609	juw
+	language	Wè Northern	wob	7610	wob
+	language	Wè Southern	gxx	7611	gxx
+	language	Wè Western	wec	7612	wec
+	language	Xaasongaxango	kao	7613	kao
+	language	Xadani Zapotec	zax	7614	zax
+	language	XakriabÃĄ	xkr	7615	xkr
+	language	Xamtanga	xan	7616	xan
+	language	Xanaguía Zapotec	ztg	7617	ztg
+	language	XavÃĄnte	xav	7618	xav
+	language	XerÊnte	xer	7619	xer
+	language	XetÃĄ	xet	7620	xet
+	language	Xhosa	xho	7621	xho	xh
+	language	Xiang Chinese	hsn	7622	hsn
+	language	Xibe	sjo	7623	sjo
+	language	Xicotepec De JuÃĄrez Totonac	too	7624	too
+	language	Xinca	xin	7625	xin
+	language	XingÃē Asuriní	asn	7626	asn
+	language	Xipaya	xiy	7627	xiy
+	language	Xiri	xii	7628	xii
+	language	XiriÃĸna	xir	7629	xir
+	language	Xishanba Lalo	ywt	7630	ywt
+	language	Xokleng	xok	7631	xok
+	language	XukurÃē	xoo	7632	xoo
+	language	Xwela Gbe	xwe	7633	xwe
+	language	XÃĸrÃĸcÚÚ	ane	7634	ane
+	language	XÃĸrÃĸgurè	axx	7635	axx
+	language	Yaaku	muu	7636	muu
+	language	Yabarana	yar	7637	yar
+	language	YabaÃĸna	ybn	7638	ybn
+	language	Yabem	jae	7639	jae
+	language	Yaben	ybm	7640	ybm
+	language	Yabong	ybo	7641	ybo
+	language	Yabula Yabula	yxy	7642	yxy
+	language	Yace	ekr	7643	ekr
+	language	Yaeyama	rys	7644	rys
+	language	Yafi	wfg	7645	wfg
+	language	Yagara	yxg	7646	yxg
+	language	Yagaria	ygr	7647	ygr
+	language	Yagnobi	yai	7648	yai
+	language	Yagomi	ygm	7649	ygm
+	language	Yagua	yad	7650	yad
+	language	Yagwoia	ygw	7651	ygw
+	language	Yahadian	ner	7652	ner
+	language	Yahang	rhp	7653	rhp
+	language	Yahuna	ynu	7654	ynu
+	language	Yaka (Central African Republic)	axk	7655	axk
+	language	Yaka (Congo)	iyx	7656	iyx
+	language	Yaka (Democratic Republic of Congo)	yaf	7657	yaf
+	language	Yakaikeke	ykk	7658	ykk
+	language	Yakama	yak	7659	yak
+	language	Yakan	yka	7660	yka
+	language	Yakha	ybh	7661	ybh
+	language	Yakoma	yky	7662	yky
+	language	Yakut	sah	7663	sah
+	language	Yala	yba	7664	yba
+	language	Yalahatan	jal	7665	jal
+	language	Yalakalore	xyl	7666	xyl
+	language	Yalarnnga	ylr	7667	ylr
+	language	Yale	nce	7668	nce
+	language	Yaleba	ylb	7669	ylb
+	language	Yalunka	yal	7670	yal
+	language	YalÃĄlag Zapotec	zpu	7671	zpu
+	language	Yamap	ymp	7672	ymp
+	language	Yamba	yam	7673	yam
+	language	Yambes	ymb	7674	ymb
+	language	Yambeta	yat	7675	yat
+	language	Yamdena	jmd	7676	jmd
+	language	Yameo	yme	7677	yme
+	language	Yami	tao	7678	tao
+	language	Yaminahua	yaa	7679	yaa
+	language	Yamna	ymn	7680	ymn
+	language	Yamongeri	ymg	7681	ymg
+	language	Yamphu	ybi	7682	ybi
+	language	Yan-nhangu	jay	7683	jay
+	language	Yan-nhaŋu Sign Language	yhs	7684	yhs
+	language	Yana	ynn	7685	ynn
+	language	Yanahuanca Pasco Quechua	qur	7686	qur
+	language	Yanda	yda	7687	yda
+	language	Yanda Dom Dogon	dym	7688	dym
+	language	Yandjibara	xyb	7689	xyb
+	language	Yandruwandha	ynd	7690	ynd
+	language	Yanesha'	ame	7691	ame
+	language	Yang Zhuang	zyg	7692	zyg
+	language	Yangben	yav	7693	yav
+	language	Yangkam	bsx	7694	bsx
+	language	Yangman	jng	7695	jng
+	language	Yango	yng	7696	yng
+	language	Yangulam	ynl	7697	ynl
+	language	Yangum Dey	yde	7698	yde
+	language	Yangum Gel	ygl	7699	ygl
+	language	Yangum Mon	ymo	7700	ymo
+	language	Yankunytjatjara	kdd	7701	kdd
+	language	YanomamÃļ	guu	7702	guu
+	language	YanomÃĄmi	wca	7703	wca
+	language	Yansi	yns	7704	yns
+	language	Yanyuwa	jao	7705	jao
+	language	Yao	yao	7706	yao
+	language	Yaosakor Asmat	asy	7707	asy
+	language	YaourÊ	yre	7708	yre
+	language	Yapese	yap	7709	yap
+	language	Yapunda	yev	7710	yev
+	language	Yaqay	jaq	7711	jaq
+	language	Yaqui	yaq	7712	yaq
+	language	Yarawata	yrw	7713	yrw
+	language	Yardliyawarra	yxl	7714	yxl
+	language	Yareba	yrb	7715	yrb
+	language	Yareni Zapotec	zae	7716	zae
+	language	Yarluyandi	yry	7717	yry
+	language	YaroamÃĢ	yro	7718	yro
+	language	Yarsun	yrs	7719	yrs
+	language	Yasa	yko	7720	yko
+	language	Yassic	ysc	7721	ysc
+	language	Yatay	yty	7722	yty
+	language	Yatee Zapotec	zty	7723	zty
+	language	Yatzachi Zapotec	zav	7724	zav
+	language	Yau (Morobe Province)	yuw	7725	yuw
+	language	Yau (Sandaun Province)	yyu	7726	yyu
+	language	Yaul	yla	7727	yla
+	language	Yauma	yax	7728	yax
+	language	Yaur	jau	7729	jau
+	language	Yautepec Zapotec	zpb	7730	zpb
+	language	Yauyos Quechua	qux	7731	qux
+	language	Yavitero	yvt	7732	yvt
+	language	Yawa	yva	7733	yva
+	language	Yawalapití	yaw	7734	yaw
+	language	Yawanawa	ywn	7735	ywn
+	language	Yawarawarga	yww	7736	yww
+	language	Yaweyuha	yby	7737	yby
+	language	Yawijibaya	jbw	7738	jbw
+	language	Yawiyo	ybx	7739	ybx
+	language	Yawuru	ywr	7740	ywr
+	language	Yaygir	xya	7741	xya
+	language	Yazgulyam	yah	7742	yah
+	language	Yecuatla Totonac	tlc	7743	tlc
+	language	Yei	jei	7744	jei
+	language	Yekhee	ets	7745	ets
+	language	Yekora	ykr	7746	ykr
+	language	Yela	yel	7747	yel
+	language	Yele	yle	7748	yle
+	language	Yelmek	jel	7749	jel
+	language	Yelogu	ylg	7750	ylg
+	language	Yemba	ybb	7751	ybb
+	language	Yemsa	jnj	7752	jnj
+	language	Yendang	ynq	7753	ynq
+	language	Yeni	yei	7754	yei
+	language	Yeniche	yec	7755	yec
+	language	Yerakai	yra	7756	yra
+	language	Yeretuar	gop	7757	gop
+	language	Yerong	yrn	7758	yrn
+	language	Yerukula	yeu	7759	yeu
+	language	Yessan-Mayo	yss	7760	yss
+	language	Yetfa	yet	7761	yet
+	language	Yevanic	yej	7762	yej
+	language	Yeyi	yey	7763	yey
+	language	Yiddish	yid	7764	yid	yi
+	language	Yidgha	ydg	7765	ydg
+	language	Yidiny	yii	7766	yii
+	language	Yil	yll	7767	yll
+	language	Yilan Creole	ycr	7768	ycr
+	language	Yimas	yee	7769	yee
+	language	Yimchungru Naga	yim	7770	yim
+	language	Yinbaw Karen	kvu	7771	kvu
+	language	Yindjibarndi	yij	7772	yij
+	language	Yindjilandji	yil	7773	yil
+	language	Yine	pib	7774	pib
+	language	Yinggarda	yia	7775	yia
+	language	Yinhawangka	ywg	7776	ywg
+	language	Yiningayi	ygi	7777	ygi
+	language	Yintale Karen	kvy	7778	kvy
+	language	Yinwum	yxm	7779	yxm
+	language	Yir Yoront	yyr	7780	yyr
+	language	Yirandali	ljw	7781	ljw
+	language	Yirrk-Mel	yrm	7782	yrm
+	language	Yis	yis	7783	yis
+	language	Yitha Yitha	xth	7784	xth
+	language	Yoba	yob	7785	yob
+	language	YocobouÊ Dida	gud	7786	gud
+	language	Yogad	yog	7787	yog
+	language	Yoidik	ydk	7788	ydk
+	language	Yoke	yki	7789	yki
+	language	Yokuts	yok	7790	yok
+	language	Yola	yol	7791	yol
+	language	Yoloxochitl Mixtec	xty	7792	xty
+	language	Yolŋu Sign Language	ygs	7793	ygs
+	language	Yom	pil	7794	pil
+	language	Yombe	yom	7795	yom
+	language	Yonaguni	yoi	7796	yoi
+	language	Yong	yno	7797	yno
+	language	Yongbei Zhuang	zyb	7798	zyb
+	language	Yongkom	yon	7799	yon
+	language	Yongnan Zhuang	zyn	7800	zyn
+	language	Yopno	yut	7801	yut
+	language	Yora	mts	7802	mts
+	language	Yoron	yox	7803	yox
+	language	Yorta Yorta	xyy	7804	xyy
+	language	Yoruba	yor	7805	yor	yo
+	language	YosondÃēa Mixtec	mpm	7806	mpm
+	language	Yotti	yot	7807	yot
+	language	Youjiang Zhuang	zyj	7808	zyj
+	language	Youle Jinuo	jiu	7809	jiu
+	language	Younuo Bunu	buh	7810	buh
+	language	Yout Wam	ytw	7811	ytw
+	language	Yoy	yoy	7812	yoy
+	language	Yuanga	nua	7813	nua
+	language	Yucatec Maya Sign Language	msd	7814	msd
+	language	Yucateco	yua	7815	yua
+	language	Yuchi	yuc	7816	yuc
+	language	YucuaÃąe Mixtec	mvg	7817	mvg
+	language	Yucuna	ycn	7818	ycn
+	language	Yue Chinese	yue	7819	yue
+	language	Yug	yug	7820	yug
+	language	Yugambal	yub	7821	yub
+	language	Yugoslavian Sign Language	ysl	7822	ysl
+	language	Yugul	ygu	7823	ygu
+	language	Yuhup	yab	7824	yab
+	language	Yuki	yuk	7825	yuk
+	language	Yukpa	yup	7826	yup
+	language	Yukuben	ybl	7827	ybl
+	language	Yulu	yul	7828	yul
+	language	Yuqui	yuq	7829	yuq
+	language	Yuracare	yuz	7830	yuz
+	language	Yurats	rts	7831	rts
+	language	Yurok	yur	7832	yur
+	language	Yuru	ljx	7833	ljx
+	language	Yurutí	yui	7834	yui
+	language	Yutanduchi Mixtec	mab	7835	mab
+	language	Yuwana	yau	7836	yau
+	language	Yuyu	yxu	7837	yxu
+	language	Ywom	gek	7838	gek
+	language	YÃĄmana	yag	7839	yag
+	language	Zaachila Zapotec	ztx	7840	ztx
+	language	Zabana	kji	7841	kji
+	language	Zacatepec Chatino	ctz	7842	ctz
+	language	ZacatlÃĄn-AhuacatlÃĄn-Tepetzintla Nahuatl	nhi	7843	nhi
+	language	Zaghawa	zag	7844	zag
+	language	Zaiwa	atb	7845	atb
+	language	Zakhring	zkr	7846	zkr
+	language	Zambian Sign Language	zsl	7847	zsl
+	language	Zan Gula	zna	7848	zna
+	language	Zanaki	zak	7849	zak
+	language	Zande (individual language)	zne	7850	zne
+	language	Zangskari	zau	7851	zau
+	language	Zangwal	zah	7852	zah
+	language	Zaniza Zapotec	zpw	7853	zpw
+	language	Zapotec	zap	7854	zap
+	language	Zaramo	zaj	7855	zaj
+	language	Zari	zaz	7856	zaz
+	language	Zarma	dje	7857	dje
+	language	Zarphatic	zrp	7858	zrp
+	language	Zauzou	zal	7859	zal
+	language	Zay	zwa	7860	zwa
+	language	Zayein Karen	kxk	7861	kxk
+	language	Zayse-Zergulla	zay	7862	zay
+	language	Zaza	zza	7863	zza
+	language	Zazao	jaj	7864	jaj
+	language	Zeem	zem	7865	zem
+	language	Zeeuws	zea	7866	zea
+	language	Zemba	dhm	7867	dhm
+	language	Zeme Naga	nzm	7868	nzm
+	language	Zemgalian	xzm	7869	xzm
+	language	Zenag	zeg	7870	zeg
+	language	Zenaga	zen	7871	zen
+	language	Zenzontepec Chatino	czn	7872	czn
+	language	Zerenkel	zrn	7873	zrn
+	language	Zhaba	zhb	7874	zhb
+	language	Zhang-Zhung	xzh	7875	xzh
+	language	Zhire	zhi	7876	zhi
+	language	Zhoa	zhw	7877	zhw
+	language	Zhuang, Chuang	zha	7878	zha	za	Zhuang	Chuang
+	language	Zia	zia	7879	zia
+	language	Zialo	zil	7880	zil
+	language	Zigula	ziw	7881	ziw
+	language	Zimakani	zik	7882	zik
+	language	Zimba	zmb	7883	zmb
+	language	Zimbabwe Sign Language	zib	7884	zib
+	language	Zinza	zin	7885	zin
+	language	Zire	sih	7886	sih
+	language	Zizilivakan	ziz	7887	ziz
+	language	Zo'Ê	pto	7888	pto
+	language	Zokhuo	yzk	7889	yzk
+	language	Zoogocho Zapotec	zpq	7890	zpq
+	language	Zoroastrian Dari	gbz	7891	gbz
+	language	Zotung Chin	czt	7892	czt
+	language	Zou	zom	7893	zom
+	language	Zul	zlu	7894	zlu
+	language	Zula	zla	7895	zla
+	language	Zulgo-Gemzek	gnd	7896	gnd
+	language	Zulu	zul	7897	zul	zu
+	language	Zumaya	zuy	7898	zuy
+	language	Zumbun	jmb	7899	jmb
+	language	Zuni	zun	7900	zun
+	language	Zuojiang Zhuang	zzj	7901	zzj
+	language	Zyphe Chin	zyp	7902	zyp
+	language	ZÃĄparo	zro	7903	zro
+	language	sTodsde	jih	7904	jih
+	language	us-Saare	uss	7905	uss
+	language	ut-Hun	uth	7906	uth
+	language	ut-Ma'in	gel	7907	gel
+	language	Àhàn	ahn	7908	ahn
+	language	ÁncÃĄ	acb	7909	acb
+	language	Ömie	aom	7910	aom
+	language	Önge	oon	7911	oon
+	language	Į€Gwi	gwj	7912	gwj
+	language	Į€Xam	xam	7913	xam
+	language	ĮAni	hnh	7914	hnh
+	language	ĮGana	gnk	7915	gnk
+	language	ĮXegwi	xeg	7916	xeg
+	language	Į‚Hua	huc	7917	huc
+	language	Į‚Ungkue	gku	7918	gku
+	language	ĮƒXÃŗÃĩ	nmn	7919	nmn
+	language	Not applicable		7920
+	publicationRelationType	IsCitedBy	RT1	1											
+	publicationRelationType	Cites	RT2	2											
+	publicationRelationType	IsSupplementTo	RT3	3											
+	publicationRelationType	IsSupplementedBy	RT4	4											
+	publicationRelationType	IsReferencedBy	RT5	5											
+	publicationRelationType	References	RT6	6											
diff --git a/scripts/api/data/metadatablocks/codemeta.tsv b/scripts/api/data/metadatablocks/codemeta.tsv
new file mode 100644
index 00000000000..a5c50368b75
--- /dev/null
+++ b/scripts/api/data/metadatablocks/codemeta.tsv
@@ -0,0 +1,37 @@
+#metadataBlock	name	dataverseAlias	displayName	blockURI												
+	codeMeta20		Software Metadata (CodeMeta v2.0)	https://codemeta.github.io/terms/
+#datasetField	name	title	description	watermark	fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id	termURI
+	codeVersion	Software Version	Version of the software instance, usually following some convention like SemVer etc.	e.g. 0.2.1 or 1.3 or 2021.1 etc	text	0	#VALUE	TRUE	FALSE	FALSE	TRUE	TRUE	FALSE		codeMeta20	https://schema.org/softwareVersion
+	developmentStatus	Development Status	Description of development status, e.g. work in progress (wip), active, etc. See repostatus.org for more information.		text	1	<a href='https://www.repostatus.org/##VALUE'><img src='https://www.repostatus.org/badges/latest/#VALUE.svg' alt='#VALUE '/></a>	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE		codeMeta20	https://www.repostatus.org
+	codeRepository	Code Repository	Link to the repository where the un-compiled, human-readable code and related code is located (SVN, GitHub, CodePlex, institutional GitLab instance, Gitea, etc.).	e.g. https://github.com/user/project	url	2	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	TRUE	FALSE	TRUE	FALSE	TRUE	FALSE		codeMeta20	https://schema.org/codeRepository
+	applicationCategory	Application Category	Type of software application, e.g. Simulation, Analysis, Visualisation.		text	3	#VALUE	TRUE	FALSE	TRUE	TRUE	TRUE	FALSE		codeMeta20	https://schema.org/applicationCategory
+	applicationSubCategory	Application Subcategory	Subcategory of the application, e.g. Arcade Game.		text	4	#VALUE	TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		codeMeta20	https://schema.org/applicationSubCategory
+	programmingLanguage	Programming Language	The programming language(s) used to implement the software (e.g. Python, C++, Matlab, Fortran, Java, Julia,...)		text	5	#VALUE	TRUE	FALSE	TRUE	TRUE	TRUE	FALSE		codeMeta20	https://schema.org/programmingLanguage
+	runtimePlatform	Runtime Platform	Runtime platform or script interpreter dependencies (e.g. Java 11, Python 3.10 or .Net Framework 4.8).	e.g. Python 3.10	text	6	#VALUE	TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		codeMeta20	https://schema.org/runtimePlatform
+	operatingSystem	Operating Systems	Operating systems supported (e.g. Windows 10, OSX 11.3, Android 11).		text	7	#VALUE	TRUE	FALSE	TRUE	TRUE	TRUE	FALSE		codeMeta20	https://schema.org/operatingSystem
+	targetProduct	Target Product	Target Operating System / Product to which the code applies. If applies to several versions, just the product name can be used.		text	8	#VALUE	TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		codeMeta20	https://schema.org/targetProduct
+	buildInstructions	Build Instructions	Link to installation instructions/documentation	e.g. https://github.com/user/project/blob/main/BUILD.md	url	9	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		codeMeta20	https://codemeta.github.io/terms/buildInstructions
+	softwareRequirementsItem	Software Requirements	Required software dependencies		none	10		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		codeMeta20
+	softwareRequirements	Name & Version	Name and version of the required software/library dependency	e.g. Pandas 1.4.3	text	0	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	FALSE	softwareRequirementsItem	codeMeta20	https://schema.org/softwareRequirements
+	softwareRequirementsInfoUrl	Info URL	Link to required software/library homepage or documentation (ideally also versioned)	e.g. https://pandas.pydata.org/pandas-docs/version/1.4.3	url	1	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	softwareRequirementsItem	codeMeta20	https://dataverse.org/schema/codeMeta20/softwareRequirementsInfoUrl
+	softwareSuggestionsItem	Software Suggestions	Optional dependencies, e.g. for optional features, code development, etc.		none	11		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		codeMeta20
+	softwareSuggestions	Name & Version	Name and version of the optional software/library dependency	e.g. Sphinx 5.0.2	text	0	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	softwareSuggestionsItem	codeMeta20	https://codemeta.github.io/terms/softwareSuggestions
+	softwareSuggestionsInfoUrl	Info URL	Link to optional software/library homepage or documentation (ideally also versioned)	e.g. https://www.sphinx-doc.org	url	1	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	softwareSuggestionsItem	codeMeta20	https://dataverse.org/schema/codeMeta20/softwareSuggestionsInfoUrl
+	memoryRequirements	Memory Requirements	Minimum memory requirements.		text	12	#VALUE	TRUE	FALSE	FALSE	FALSE	FALSE	FALSE		codeMeta20	https://schema.org/memoryRequirements
+	processorRequirements	Processor Requirements	Processor architecture or other CPU requirements to run the application (e.g. IA64).		text	13	#VALUE	TRUE	FALSE	TRUE	FALSE	FALSE	FALSE		codeMeta20	https://schema.org/processorRequirements
+	storageRequirements	Storage Requirements	Minimum storage requirements (e.g. free space required).		text	14	#VALUE	TRUE	FALSE	FALSE	FALSE	FALSE	FALSE		codeMeta20	https://schema.org/storageRequirements
+	permissions	Permissions	Permission(s) required to run the code (for example, a mobile app may require full internet access or may run only on wifi).		text	15	#VALUE	TRUE	FALSE	TRUE	FALSE	FALSE	FALSE		codeMeta20	https://schema.org/permissions
+	softwareHelp	Software Help/Documentation	Link to help texts or documentation	e.g. https://user.github.io/project/docs	url	16	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		codeMeta20	https://schema.org/softwareHelp
+	readme	Readme	Link to the README of the project	e.g. https://github.com/user/project/blob/main/README.md	url	17	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		codeMeta20	https://codemeta.github.io/terms/readme
+	releaseNotes	Release Notes	Link to release notes	e.g. https://github.com/user/project/blob/main/docs/release-0.1.md	url	18	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		codeMeta20	https://schema.org/releaseNotes
+	contIntegration	Continuous Integration	Link to continuous integration service	e.g. https://github.com/user/project/actions	url	19	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		codeMeta20	https://codemeta.github.io/terms/contIntegration
+	issueTracker	Issue Tracker	Link to software bug reporting or issue tracking system	e.g. https://github.com/user/project/issues	url	20	<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		codeMeta20	https://codemeta.github.io/terms/issueTracker
+#controlledVocabulary	DatasetField	Value	identifier	displayOrder												
+	developmentStatus	Concept	concept	0												
+	developmentStatus	WIP	wip	1												
+	developmentStatus	Active	active	2												
+	developmentStatus	Inactive	inactive	3												
+	developmentStatus	Unsupported	unsupported	4												
+	developmentStatus	Moved	moved	5												
+	developmentStatus	Suspended	suspended	6												
+	developmentStatus	Abandoned	abandoned	7
diff --git a/scripts/api/data/metadatablocks/computational_workflow.tsv b/scripts/api/data/metadatablocks/computational_workflow.tsv
new file mode 100644
index 00000000000..3cd0c26a464
--- /dev/null
+++ b/scripts/api/data/metadatablocks/computational_workflow.tsv
@@ -0,0 +1,21 @@
+#metadataBlock	name	dataverseAlias   displayName
+	computationalworkflow		Computational Workflow Metadata
+#datasetField	name	title	description	watermark	 fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id	termURI
+	workflowType	Computational Workflow Type	The kind of Computational Workflow, which is designed to compose and execute a series of computational or data manipulation steps in a scientific application		text	0		TRUE	TRUE	TRUE	TRUE	TRUE	FALSE		computationalworkflow
+	workflowCodeRepository	External Code Repository URL	A link to the repository where the un-compiled, human readable code and related code is located (e.g. GitHub, GitLab, SVN)	https://...	url	1	<a href="#VALUE" target="_blank">#VALUE</a>	FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		computationalworkflow
+	workflowDocumentation	Documentation	A link (URL) to the documentation or text describing the Computational Workflow and its use		textbox	2		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		computationalworkflow
+#controlledVocabulary	DatasetField	Value	identifier	displayOrder
+	workflowType	Common Workflow Language (CWL)	workflowtype_cwl	1
+	workflowType	Workflow Description Language (WDL)	workflowtype_wdl	2
+	workflowType	Nextflow	workflowtype_nextflow	3
+	workflowType	Snakemake	workflowtype_snakemake	4
+	workflowType	Ruffus	workflowtype_ruffus	5
+	workflowType	DAGMan	workflowtype_dagman	6
+	workflowType	Jupyter Notebook	workflowtype_jupyter	7
+	workflowType	R Notebook	workflowtype_rstudio	8
+	workflowType	MATLAB Script	workflowtype_matlab	9
+	workflowType	Bash Script	workflowtype_bash	10
+	workflowType	Makefile	workflowtype_makefile	11
+	workflowType	Other Python-based workflow	workflowtype_otherpython	12
+	workflowType	Other R-based workflow	workflowtype_otherrbased	13
+	workflowType	Other	workflowtype_other	100
diff --git a/scripts/api/data/metadatablocks/geospatial.tsv b/scripts/api/data/metadatablocks/geospatial.tsv
index 7464d51dc94..11408317410 100644
--- a/scripts/api/data/metadatablocks/geospatial.tsv
+++ b/scripts/api/data/metadatablocks/geospatial.tsv
@@ -1,17 +1,17 @@
-#metadataBlock	name	dataverseAlias   displayName													
-	geospatial		Geospatial Metadata													
+#metadataBlock	name	dataverseAlias	displayName												
+	geospatial		Geospatial Metadata												
 #datasetField	name	title	description	watermark	 fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id
 	geographicCoverage	Geographic Coverage	Information on the geographic coverage of the data. Includes the total geographic scope of the data.		none	0		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		geospatial
-	country	Country / Nation	The country or nation that the Dataset is about.		text	1		TRUE	TRUE	FALSE	TRUE	FALSE	FALSE	geographicCoverage	geospatial
-	state	State / Province	The state or province that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations.		text	2		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	geographicCoverage	geospatial
-	city	City	The name of the city that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations.		text	3		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	geographicCoverage	geospatial
-	otherGeographicCoverage	Other	Other information on the geographic coverage of the data.		text	4		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	geographicCoverage	geospatial
+	country	Country / Nation	The country or nation that the Dataset is about.		text	1	#VALUE, 	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE	geographicCoverage	geospatial
+	state	State / Province	The state or province that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations.		text	2	#VALUE, 	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	geographicCoverage	geospatial
+	city	City	The name of the city that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations.		text	3	#VALUE, 	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	geographicCoverage	geospatial
+	otherGeographicCoverage	Other	Other information on the geographic coverage of the data.		text	4	#VALUE, 	FALSE	FALSE	FALSE	TRUE	FALSE	FALSE	geographicCoverage	geospatial
 	geographicUnit	Geographic Unit	Lowest level of geographic aggregation covered by the Dataset, e.g., village, county, region.		text	5		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		geospatial
 	geographicBoundingBox	Geographic Bounding Box	The fundamental geometric description for any Dataset that models geography is the geographic bounding box. It describes the minimum box, defined by west and east longitudes and north and south latitudes, which includes the largest geographic extent of the  Dataset's geographic coverage. This element is used in the first pass of a coordinate-based search. Inclusion of this element in the codebook is recommended, but is required if the bound polygon box is included. 		none	6		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		geospatial
-	westLongitude	West Longitude	Westernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180,0 <= West  Bounding Longitude Value <= 180,0.		text	7		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	geographicBoundingBox	geospatial
-	eastLongitude	East Longitude	Easternmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180,0 <= East Bounding Longitude Value <= 180,0.		text	8		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	geographicBoundingBox	geospatial
-	northLongitude	North Latitude	Northernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90,0 <= North Bounding Latitude Value <= 90,0.		text	9		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	geographicBoundingBox	geospatial
-	southLongitude	South Latitude	Southernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90,0 <= South Bounding Latitude Value <= 90,0.		text	10		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	geographicBoundingBox	geospatial
+	westLongitude	Westernmost (Left) Longitude	Westernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180.0 <= West  Bounding Longitude Value <= 180.0.		text	7		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	geographicBoundingBox	geospatial
+	eastLongitude	Easternmost (Right) Longitude	Easternmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180.0 <= East Bounding Longitude Value <= 180.0.		text	8		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	geographicBoundingBox	geospatial
+	northLatitude	Northernmost (Top) Latitude	Northernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90.0 <= North Bounding Latitude Value <= 90.0.		text	9		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	geographicBoundingBox	geospatial
+	southLatitude	Southernmost (Bottom) Latitude	Southernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90.0 <= South Bounding Latitude Value <= 90.0.		text	10		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	geographicBoundingBox	geospatial
 #controlledVocabulary	DatasetField	Value	identifier	displayOrder											
 	country	Afghanistan		0											
 	country	Albania		1											
@@ -261,4 +261,4 @@
 	country	Yemen		245	YEMEN										
 	country	Zambia		246											
 	country	Zimbabwe		247											
-	country	Åland Islands		248											
\ No newline at end of file
+	country	Åland Islands		248											
diff --git a/scripts/api/data/metadatablocks/social_science.tsv b/scripts/api/data/metadatablocks/social_science.tsv
index 7ef714c0599..57ff0c7843a 100644
--- a/scripts/api/data/metadatablocks/social_science.tsv
+++ b/scripts/api/data/metadatablocks/social_science.tsv
@@ -12,7 +12,7 @@
 	targetSampleActualSize	Actual	Actual sample size.	Enter an integer...	int	8		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	targetSampleSize	socialscience
 	targetSampleSizeFormula	Formula	Formula used to determine target sample size.		text	9		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	targetSampleSize	socialscience
 	deviationsFromSampleDesign	Major Deviations for Sample Design	Show correspondence as well as discrepancies between the sampled units (obtained) and available statistics for the population (age, sex-ratio, marital status, etc.) as a whole.		text	10		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		socialscience
-	collectionMode	Collection Mode	Method used to collect the data; instrumentation characteristics (e.g., telephone interview, mail questionnaire, or other).		textbox	11		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		socialscience
+	collectionMode	Collection Mode	Method used to collect the data; instrumentation characteristics (e.g., telephone interview, mail questionnaire, or other).		textbox	11		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		socialscience
 	researchInstrument	Type of Research Instrument	Type of data collection instrument used. Structured indicates an instrument in which all respondents are asked the same questions/tests, possibly with precoded answers. If a small portion of such a questionnaire includes open-ended questions, provide appropriate comments. Semi-structured indicates that the research instrument contains mainly open-ended questions. Unstructured indicates that in-depth interviews were conducted.		text	12		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		socialscience
 	dataCollectionSituation	Characteristics of Data Collection Situation	Description of noteworthy aspects of the data collection situation. Includes information on factors such as cooperativeness of respondents, duration of interviews, number of call backs, or similar.		textbox	13		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		socialscience
 	actionsToMinimizeLoss	Actions to Minimize Losses	Summary of actions taken to minimize data loss. Include information on actions such as follow-up visits, supervisory checks, historical matching, estimation, and so on.		text	14		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		socialscience
diff --git a/scripts/api/data/role-curator.json b/scripts/api/data/role-curator.json
index 2de5b2aefd1..86f18b2ea6a 100644
--- a/scripts/api/data/role-curator.json
+++ b/scripts/api/data/role-curator.json
@@ -1,14 +1,16 @@
 {
     "alias":"curator",
     "name":"Curator",
-    "description":"For datasets, a person who can edit License + Terms, edit Permissions, and publish datasets.",
+    "description":"For datasets, a person who can edit License + Terms, edit Permissions, and publish and link datasets.",
     "permissions":[
         "ViewUnpublishedDataset",
         "EditDataset",
         "DownloadFile",
         "DeleteDatasetDraft",
         "PublishDataset",
+        "LinkDataset",
         "ManageDatasetPermissions",
+        "ManageFilePermissions",
         "AddDataverse",
         "AddDataset",
         "ViewUnpublishedDataverse" 
diff --git a/scripts/api/data/role-editor.json b/scripts/api/data/role-editor.json
index 98c08acfa56..69dd8c8c6ce 100644
--- a/scripts/api/data/role-editor.json
+++ b/scripts/api/data/role-editor.json
@@ -1,5 +1,5 @@
 {
-    "alias":"editor",
+    "alias":"contributor",
     "name":"Contributor",
     "description":"For datasets, a person who can edit License + Terms, and then submit them for review.",
     "permissions":[
diff --git a/scripts/api/data/role-test-addRole.json b/scripts/api/data/role-test-addRole.json
new file mode 100644
index 00000000000..7923eed916b
--- /dev/null
+++ b/scripts/api/data/role-test-addRole.json
@@ -0,0 +1,10 @@
+{
+    "alias":"testRole",
+    "name":"Test Role",
+    "description":"Test Role for adding/deleting.",
+    "permissions":[
+        "ViewUnpublishedDataset",
+        "ViewUnpublishedDataverse",
+         "DownloadFile"
+    ]
+}
diff --git a/scripts/api/data/storageSites/add-storage-site.json b/scripts/api/data/storageSites/add-storage-site.json
deleted file mode 100644
index d13ec2f165d..00000000000
--- a/scripts/api/data/storageSites/add-storage-site.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "hostname": "dataverse.librascholar.edu",
-  "name": "LibraScholar, USA",
-  "primaryStorage": true,
-  "transferProtocols": "rsync,posix,globus"
-}
diff --git a/scripts/api/data/workflows/internal-ldnannounce-workflow.json b/scripts/api/data/workflows/internal-ldnannounce-workflow.json
new file mode 100644
index 00000000000..9cf058b68a1
--- /dev/null
+++ b/scripts/api/data/workflows/internal-ldnannounce-workflow.json
@@ -0,0 +1,16 @@
+{
+  "name": "LDN Announce workflow",
+  "steps": [
+    {
+      "provider":":internal",
+      "stepType":"ldnannounce",
+      "parameters": {
+        "stepName":"LDN Announce"
+      },
+      "requiredSettings": {
+        ":LDNAnnounceRequiredFields": "string",
+        ":LDNTarget": "string"
+      }
+    }
+  ]
+}
diff --git a/scripts/api/setup-all.sh b/scripts/api/setup-all.sh
index d5a175f12e9..b7f962209e4 100755
--- a/scripts/api/setup-all.sh
+++ b/scripts/api/setup-all.sh
@@ -3,7 +3,14 @@
 SECURESETUP=1
 DV_SU_PASSWORD="admin"
 
-for opt in $*
+DATAVERSE_URL=${DATAVERSE_URL:-"http://localhost:8080"}
+# Make sure scripts we call from this one also get this env var!
+export DATAVERSE_URL
+
+# scripts/api when called from the root of the source tree
+SCRIPT_PATH="$(dirname "$0")"
+
+for opt in "$@"
 do
   case $opt in
       "--insecure")
@@ -24,13 +31,9 @@ do
   esac
 done
 
+# shellcheck disable=SC2016
 command -v jq >/dev/null 2>&1 || { echo >&2 '`jq` ("sed for JSON") is required, but not installed. Download the binary for your platform from http://stedolan.github.io/jq/ and make sure it is in your $PATH (/usr/bin/jq is fine) and executable with `sudo chmod +x /usr/bin/jq`. On Mac, you can install it with `brew install jq` if you use homebrew: http://brew.sh . Aborting.'; exit 1; }
 
-echo "deleting all data from Solr"
-curl http://localhost:8983/solr/collection1/update/json?commit=true -H "Content-type: application/json" -X POST -d "{\"delete\": { \"query\":\"*:*\"}}"
-
-SERVER=http://localhost:8080/api
-
 # Everything + the kitchen sink, in a single script
 # - Setup the metadata blocks and controlled vocabulary
 # - Setup the builtin roles
@@ -41,54 +44,55 @@ SERVER=http://localhost:8080/api
 
 
 echo "Setup the metadata blocks"
-./setup-datasetfields.sh
+"$SCRIPT_PATH"/setup-datasetfields.sh
 
 echo "Setup the builtin roles"
-./setup-builtin-roles.sh
+"$SCRIPT_PATH"/setup-builtin-roles.sh
 
 echo "Setup the authentication providers"
-./setup-identity-providers.sh
+"$SCRIPT_PATH"/setup-identity-providers.sh
 
 echo "Setting up the settings"
 echo  "- Allow internal signup"
-curl -X PUT -d yes "$SERVER/admin/settings/:AllowSignUp"
-curl -X PUT -d /dataverseuser.xhtml?editMode=CREATE "$SERVER/admin/settings/:SignUpUrl"
-
-curl -X PUT -d doi "$SERVER/admin/settings/:Protocol"
-curl -X PUT -d 10.5072 "$SERVER/admin/settings/:Authority"
-curl -X PUT -d "FK2/" "$SERVER/admin/settings/:Shoulder"
-curl -X PUT -d DataCite "$SERVER/admin/settings/:DoiProvider"
-curl -X PUT -d burrito $SERVER/admin/settings/BuiltinUsers.KEY
-curl -X PUT -d localhost-only $SERVER/admin/settings/:BlockedApiPolicy
-curl -X PUT -d 'native/http' $SERVER/admin/settings/:UploadMethods
+curl -X PUT -d yes "${DATAVERSE_URL}/api/admin/settings/:AllowSignUp"
+curl -X PUT -d "/dataverseuser.xhtml?editMode=CREATE" "${DATAVERSE_URL}/api/admin/settings/:SignUpUrl"
+
+curl -X PUT -d burrito "${DATAVERSE_URL}/api/admin/settings/BuiltinUsers.KEY"
+curl -X PUT -d localhost-only "${DATAVERSE_URL}/api/admin/settings/:BlockedApiPolicy"
+curl -X PUT -d 'native/http' "${DATAVERSE_URL}/api/admin/settings/:UploadMethods"
 echo
 
 echo "Setting up the admin user (and as superuser)"
-adminResp=$(curl -s -H "Content-type:application/json" -X POST -d @data/user-admin.json "$SERVER/builtin-users?password=$DV_SU_PASSWORD&key=burrito")
-echo $adminResp
-curl -X POST "$SERVER/admin/superuser/dataverseAdmin"
+adminResp=$(curl -s -H "Content-type:application/json" -X POST -d @"$SCRIPT_PATH"/data/user-admin.json "${DATAVERSE_URL}/api/builtin-users?password=$DV_SU_PASSWORD&key=burrito")
+echo "$adminResp"
+curl -X PUT "${DATAVERSE_URL}/api/admin/superuser/dataverseAdmin" -d "true"
 echo
 
 echo "Setting up the root dataverse"
-adminKey=$(echo $adminResp | jq .data.apiToken | tr -d \")
-curl -s -H "Content-type:application/json" -X POST -d @data/dv-root.json "$SERVER/dataverses/?key=$adminKey"
+adminKey=$(echo "$adminResp" | jq .data.apiToken | tr -d \")
+curl -s -H "Content-type:application/json" -X POST -d @"$SCRIPT_PATH"/data/dv-root.json "${DATAVERSE_URL}/api/dataverses/?key=$adminKey"
 echo
 echo "Set the metadata block for Root"
-curl -s -X POST -H "Content-type:application/json" -d "[\"citation\"]" $SERVER/dataverses/:root/metadatablocks/?key=$adminKey
+curl -s -X POST -H "Content-type:application/json" -d "[\"citation\"]" "${DATAVERSE_URL}/api/dataverses/:root/metadatablocks/?key=$adminKey"
 echo
 echo "Set the default facets for Root"
-curl -s -X POST -H "Content-type:application/json" -d "[\"authorName\",\"subject\",\"keywordValue\",\"dateOfDeposit\"]" $SERVER/dataverses/:root/facets/?key=$adminKey
+curl -s -X POST -H "Content-type:application/json" -d "[\"authorName\",\"subject\",\"keywordValue\",\"dateOfDeposit\"]" "${DATAVERSE_URL}/api/dataverses/:root/facets/?key=$adminKey"
 echo
 
+echo "Set up licenses"
+# Note: CC0 has been added and set as the default license through
+# Flyway script V5.9.0.1__7440-configurable-license-list.sql
+curl -X POST -H 'Content-Type: application/json' -H "X-Dataverse-key:$adminKey" "${DATAVERSE_URL}/api/licenses" --upload-file "$SCRIPT_PATH"/data/licenses/licenseCC-BY-4.0.json
+
 # OPTIONAL USERS AND DATAVERSES
 #./setup-optional.sh
 
 if [ $SECURESETUP = 1 ]
 then
     # Revoke the "burrito" super-key; 
-    # Block the sensitive API endpoints;
-    curl -X DELETE $SERVER/admin/settings/BuiltinUsers.KEY
-    curl -X PUT -d admin,test $SERVER/admin/settings/:BlockedApiEndpoints
+    # Block sensitive API endpoints;
+    curl -X DELETE "${DATAVERSE_URL}/api/admin/settings/BuiltinUsers.KEY"
+    curl -X PUT -d 'admin,builtin-users' "${DATAVERSE_URL}/api/admin/settings/:BlockedApiEndpoints"
     echo "Access to the /api/admin and /api/test is now disabled, except for connections from localhost."
 else 
     echo "IMPORTANT!!!"
diff --git a/scripts/api/setup-builtin-roles.sh b/scripts/api/setup-builtin-roles.sh
index 0f3c1c150cd..f1f268debbc 100755
--- a/scripts/api/setup-builtin-roles.sh
+++ b/scripts/api/setup-builtin-roles.sh
@@ -1,34 +1,37 @@
-SERVER=http://localhost:8080/api
+#!/bin/bash
+
+DATAVERSE_URL=${DATAVERSE_URL:-"http://localhost:8080"}
+SCRIPT_PATH="$(dirname "$0")"
 
 # Setup the builtin roles
 echo "Setting up admin role"
-curl -H "Content-type:application/json" -d @data/role-admin.json http://localhost:8080/api/admin/roles/
+curl -H "Content-type:application/json" -d @"$SCRIPT_PATH"/data/role-admin.json "${DATAVERSE_URL}/api/admin/roles/"
 echo
 
 echo "Setting up file downloader role"
-curl -H "Content-type:application/json" -d @data/role-filedownloader.json http://localhost:8080/api/admin/roles/
+curl -H "Content-type:application/json" -d @"$SCRIPT_PATH"/data/role-filedownloader.json "${DATAVERSE_URL}/api/admin/roles/"
 echo
 
 echo "Setting up full contributor role"
-curl -H "Content-type:application/json" -d @data/role-fullContributor.json http://localhost:8080/api/admin/roles/
+curl -H "Content-type:application/json" -d @"$SCRIPT_PATH"/data/role-fullContributor.json "${DATAVERSE_URL}/api/admin/roles/"
 echo
 
 echo "Setting up dv contributor role"
-curl -H "Content-type:application/json" -d @data/role-dvContributor.json http://localhost:8080/api/admin/roles/
+curl -H "Content-type:application/json" -d @"$SCRIPT_PATH"/data/role-dvContributor.json "${DATAVERSE_URL}/api/admin/roles/"
 echo
 
 echo "Setting up ds contributor role"
-curl -H "Content-type:application/json" -d @data/role-dsContributor.json http://localhost:8080/api/admin/roles/
+curl -H "Content-type:application/json" -d @"$SCRIPT_PATH"/data/role-dsContributor.json "${DATAVERSE_URL}/api/admin/roles/"
 echo
 
 echo "Setting up editor role"
-curl -H "Content-type:application/json" -d @data/role-editor.json http://localhost:8080/api/admin/roles/
+curl -H "Content-type:application/json" -d @"$SCRIPT_PATH"/data/role-editor.json "${DATAVERSE_URL}/api/admin/roles/"
 echo
 
 echo "Setting up curator role"
-curl -H "Content-type:application/json" -d @data/role-curator.json http://localhost:8080/api/admin/roles/
+curl -H "Content-type:application/json" -d @"$SCRIPT_PATH"/data/role-curator.json "${DATAVERSE_URL}/api/admin/roles/"
 echo
 
 echo "Setting up member role"
-curl -H "Content-type:application/json" -d @data/role-member.json http://localhost:8080/api/admin/roles/
+curl -H "Content-type:application/json" -d @"$SCRIPT_PATH"/data/role-member.json "${DATAVERSE_URL}/api/admin/roles/"
 echo
diff --git a/scripts/api/setup-datasetfields.sh b/scripts/api/setup-datasetfields.sh
index 0d2d60b9538..908988f8acb 100755
--- a/scripts/api/setup-datasetfields.sh
+++ b/scripts/api/setup-datasetfields.sh
@@ -1,9 +1,14 @@
-#!/bin/sh
-curl http://localhost:8080/api/admin/datasetfield/loadNAControlledVocabularyValue
+#!/bin/bash
+
+DATAVERSE_URL=${DATAVERSE_URL:-"http://localhost:8080"}
+SCRIPT_PATH="$(dirname "$0")"
+
+curl "${DATAVERSE_URL}/api/admin/datasetfield/loadNAControlledVocabularyValue"
 # TODO: The "@" is confusing. Consider switching to --upload-file citation.tsv
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/citation.tsv -H "Content-type: text/tab-separated-values"
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/geospatial.tsv -H "Content-type: text/tab-separated-values"
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/social_science.tsv -H "Content-type: text/tab-separated-values"
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/astrophysics.tsv -H "Content-type: text/tab-separated-values"
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/biomedical.tsv -H "Content-type: text/tab-separated-values"
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/journals.tsv -H "Content-type: text/tab-separated-values"
+curl "${DATAVERSE_URL}/api/admin/datasetfield/load" -X POST --data-binary @"$SCRIPT_PATH"/data/metadatablocks/citation.tsv -H "Content-type: text/tab-separated-values"
+curl "${DATAVERSE_URL}/api/admin/datasetfield/load" -X POST --data-binary @"$SCRIPT_PATH"/data/metadatablocks/geospatial.tsv -H "Content-type: text/tab-separated-values"
+curl "${DATAVERSE_URL}/api/admin/datasetfield/load" -X POST --data-binary @"$SCRIPT_PATH"/data/metadatablocks/social_science.tsv -H "Content-type: text/tab-separated-values"
+curl "${DATAVERSE_URL}/api/admin/datasetfield/load" -X POST --data-binary @"$SCRIPT_PATH"/data/metadatablocks/astrophysics.tsv -H "Content-type: text/tab-separated-values"
+curl "${DATAVERSE_URL}/api/admin/datasetfield/load" -X POST --data-binary @"$SCRIPT_PATH"/data/metadatablocks/biomedical.tsv -H "Content-type: text/tab-separated-values"
+curl "${DATAVERSE_URL}/api/admin/datasetfield/load" -X POST --data-binary @"$SCRIPT_PATH"/data/metadatablocks/journals.tsv -H "Content-type: text/tab-separated-values"
+curl "${DATAVERSE_URL}/api/admin/datasetfield/load" -X POST --data-binary @"$SCRIPT_PATH"/data/metadatablocks/3d_objects.tsv -H "Content-type: text/tab-separated-values"
diff --git a/scripts/api/setup-identity-providers.sh b/scripts/api/setup-identity-providers.sh
index 89ac59de32f..e877f71c6b0 100755
--- a/scripts/api/setup-identity-providers.sh
+++ b/scripts/api/setup-identity-providers.sh
@@ -1,8 +1,11 @@
-SERVER=http://localhost:8080/api
+#!/bin/bash
+
+DATAVERSE_URL=${DATAVERSE_URL:-"http://localhost:8080"}
+SCRIPT_PATH="$(dirname "$0")"
 
 # Setup the authentication providers
 echo "Setting up internal user provider"
-curl -H "Content-type:application/json" -d @data/authentication-providers/builtin.json http://localhost:8080/api/admin/authenticationProviders/
+curl -H "Content-type:application/json" -d @"$SCRIPT_PATH"/data/authentication-providers/builtin.json "${DATAVERSE_URL}/api/admin/authenticationProviders/"
 
 #echo "Setting up Echo providers"
 #curl -H "Content-type:application/json" -d @data/authentication-providers/echo.json http://localhost:8080/api/admin/authenticationProviders/
diff --git a/scripts/api/setup-optional-harvard.sh b/scripts/api/setup-optional-harvard.sh
index 39ccbb310b6..1311464e8ff 100755
--- a/scripts/api/setup-optional-harvard.sh
+++ b/scripts/api/setup-optional-harvard.sh
@@ -3,6 +3,7 @@ SERVER=http://localhost:8080/api
 
 echo "Setting up Harvard-specific settings"
 # :Authority and :Shoulder are commented out so this script can be used on test servers
+# Should now use the new multipid JVM options instead of these settings
 #curl -X PUT -d 10.7910 "$SERVER/admin/settings/:Authority"
 #curl -X PUT -d "DVN/" "$SERVER/admin/settings/:Shoulder"
 echo "- Application Status header"
@@ -33,11 +34,6 @@ echo  "- Google Analytics setting"
 curl -X PUT -d true "$SERVER/admin/settings/:ScrubMigrationData"
 echo  "- Enabling Shibboleth"
 curl -X POST -H "Content-type: application/json" http://localhost:8080/api/admin/authenticationProviders --upload-file ../../doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibAuthProvider.json
-echo  "- Enabling TwoRavens"
-curl -X POST -H 'Content-type: application/json' --upload-file ../../doc/sphinx-guides/source/_static/installation/files/root/external-tools/twoRavens.json http://localhost:8080/api/admin/externalTools
-echo  "- Enabling Geoconnect"
-curl -s -X PUT -d true "$SERVER/admin/settings/:GeoconnectCreateEditMaps"
-curl -s -X PUT -d true "$SERVER/admin/settings/:GeoconnectViewMaps"
 echo  "- Setting system email"
 curl -X PUT -d "Harvard Dataverse Support <support@dataverse.harvard.edu>" http://localhost:8080/api/admin/settings/:SystemEmail
 curl -X PUT -d ", The President &#38; Fellows of Harvard College" http://localhost:8080/api/admin/settings/:FooterCopyright
@@ -55,5 +51,5 @@ curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @da
 curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/customCHIA.tsv -H "Content-type: text/tab-separated-values"
 curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/customDigaai.tsv -H "Content-type: text/tab-separated-values"
 curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/custom_hbgdki.tsv -H "Content-type: text/tab-separated-values"
-echo "Because you have loaded custom metadata blocks, you need to update the include files pulled in by Solr's schema.xml. On the Solr server, you can try running the updateSchemaMDB.sh script mentioned in the Metadata Customization section of the Admin Guide or follow the manual steps listed there."
+echo "Because you have loaded custom metadata blocks, you need to update the include files pulled in by Solr's schema.xml. On the Solr server, you can try running the update-fields.sh script mentioned in the Metadata Customization section of the Admin Guide or follow the manual steps listed there."
 echo
diff --git a/scripts/api/update-datasetfields.sh b/scripts/api/update-datasetfields.sh
deleted file mode 100644
index ae099f8dcfd..00000000000
--- a/scripts/api/update-datasetfields.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/citation.tsv -H "Content-type: text/tab-separated-values"
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/geospatial.tsv -H "Content-type: text/tab-separated-values"
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/social_science.tsv -H "Content-type: text/tab-separated-values"
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/astrophysics.tsv -H "Content-type: text/tab-separated-values"
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/biomedical.tsv -H "Content-type: text/tab-separated-values"
-curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/journals.tsv -H "Content-type: text/tab-separated-values"
\ No newline at end of file
diff --git a/scripts/database/homebrew/devinstall b/scripts/database/homebrew/devinstall
index 89284b50979..28f682685ff 100755
--- a/scripts/database/homebrew/devinstall
+++ b/scripts/database/homebrew/devinstall
@@ -15,6 +15,5 @@ export FILES_DIR=$HOME/dataverse/files
 export MEM_HEAP_SIZE=2048
 export GLASSFISH_DOMAIN=domain1
 export GLASSFISH_ROOT=/Applications/NetBeans/glassfish4
-cp pgdriver/postgresql-9.1-902.jdbc4.jar $GLASSFISH_ROOT/glassfish/lib
 cp ../../conf/jhove/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
 ./glassfish-setup.sh
diff --git a/scripts/database/querycount/README.txt b/scripts/database/querycount/README.txt
index be67fd8d6b6..4952ebd641b 100644
--- a/scripts/database/querycount/README.txt
+++ b/scripts/database/querycount/README.txt
@@ -20,7 +20,9 @@ For example:
 
 cp scripts/database/querycount/*.pl  /var/lib/pgsql/9.3/data/pg_log/
 
-Then run the count script as follows: 
+Then run the count script as follows.
+
+1. The default, interactive mode:
 
 cd /var/lib/pgsql/9.3/data/pg_log/
 ./count.pl <NAME OF THE LOG FILE>
@@ -29,7 +31,7 @@ you will see something like this:
 
 # ./count.pl postgresql-Mon.log 
 Current size: 3090929 bytes.
-Press any key when ready.
+Execute the application task that you are testing/measuring (an API call, a page load, etc.), then press any key. The script will then attempt to parse the increment portion of the PostgresQL log.
 
 Now go to your Dataverse and do whatever it is that you are
 testing. Then press any key to tell the script that it's done. It will
@@ -42,7 +44,7 @@ Parsed and counted the queries. Total number:
 
 Queries, counted and sorted: 
 
-   6248 SELECT ID, ASSIGNEEIDENTIFIER, PRIVATEURLTOKEN, DEFINITIONPOINT_ID, ROLE_ID FROM ROLEASSIGNMENT
+   6248 SELECT ID, ASSIGNEEIDENTIFIER, PRIVATEURLANONYMIZEDACCESS, PRIVATEURLTOKEN, DEFINITIONPOINT_ID, ROLE_ID FROM ROLEASSIGNMENT
    6158 SELECT t1.ID, t1.DESCRIPTION, t1.DISPLAYNAME, t1.GROUPALIAS, t1.GROUPALIASINOWNER, t1.OWNER_ID FROM EXPLICITGROUP t0, explicitgroup_explicitgroup t2, EXPLICITGROUP t1
    4934 SELECT t0.ID, t0.DESCRIPTION, t0.DISPLAYNAME, t0.GROUPALIAS, t0.GROUPALIASINOWNER, t0.OWNER_ID FROM EXPLICITGROUP t0, ExplicitGroup_CONTAINEDROLEASSIGNEES t1
    2462 SELECT t1.ID, t1.DESCRIPTION, t1.DISPLAYNAME, t1.GROUPALIAS, t1.GROUPALIASINOWNER, t1.OWNER_ID FROM AUTHENTICATEDUSER t0, EXPLICITGROUP_AUTHENTICATEDUSER t2, EXPLICITGROUP t1
@@ -50,7 +52,44 @@ Queries, counted and sorted:
 
    ... etc. 
 
-(the output is also saved in the file "tail.counted" in the pg_log directory)
+The output above is also saved in the file "tail.counted" in the
+pg_log directory. This of course only shows the queries counted by
+type. I.e. the above shows that there were 6248 "SELECT ... FROM
+ROLEASSIGNMENT" queries, but not which specific objects the
+application was looking up. I.e., the queries are truncated at the
+"WHERE" (or "SET" or "VALUES") part in order to give a compact, sorted
+summary.
+
+If you want to look at these details, they are saved in the file
+called "tail.parsed". There you will find fully extended queries, for
+example:
+
+SELECT ID, ASSIGNEEIDENTIFIER, PRIVATEURLANONYMIZEDACCESS, PRIVATEURLTOKEN, DEFINITIONPOINT_ID, ROLE_ID FROM ROLEASSIGNMENT WHERE ((ASSIGNEEIDENTIFIER IN (':authenticated-users')) AND (DEFINITIONPOINT_ID IN ('1')))
+
+This file is unsorted, the queries appear in the same order in which
+they were executed.
+
+Finally, there is the raw, unprocessed/unparsed saved portion of the
+log file, in the file simply called "tail". It contains some extra
+information (for example, the actual time when each query was
+executed), but is much harder to read. For example, the entries for
+the query above will appear as follows:
+
+2021-11-01 22:41:38.198 UTC [5043] LOG:  execute S_25: SELECT ID, ASSIGNEEIDENTIFIER, PRIVATEURLANONYMIZEDACCESS, PRIVATEURLTOKEN, DEFINITIONPOINT_ID, ROLE_ID FROM ROLEASSIGNMENT WHERE ((ASSIGNEEIDENTIFIER IN ($1)) AND (DEFINITIONPOINT_ID IN ($2)))
+2021-11-01 22:41:38.198 UTC [5043] DETAIL:  parameters: $1 = ':authenticated-users', $2 = '1'
+
+If you want to keep any of the files above, save them somewhere before
+running the script again, otherwise they will be overwritten.
+
+2. Non-interactive mode:
+
+cd /var/lib/pgsql/9.3/data/pg_log/
+./count.pl --non-interactive <NAME OF THE LOG FILE>
+
+Same as above, but will not wait for the keystroke from the user, and will attempt to parse the entire log file. This can be useful when executed from other scripts. The output will be saved in the files tail.counted and tail.parsed, as above. But there will be no file named "tail", since the entire log file is the increment being measured.
+
+
+
 
 
  
diff --git a/scripts/database/querycount/count.pl b/scripts/database/querycount/count.pl
index 6ca178bd8e5..886eae145d2 100755
--- a/scripts/database/querycount/count.pl
+++ b/scripts/database/querycount/count.pl
@@ -1,34 +1,72 @@
 #!/usr/bin/perl
 
-my $pglogfile = shift @ARGV;
+my $cmdarg = shift @ARGV;
+my $interactive = 1; 
+
+if ( $cmdarg =~/^\-\-(.*)$/ )
+{
+    if ( $1 eq "non-interactive" )
+    {
+	$interactive = 0;
+    }
+    else
+    {
+	print STDERR "unknown option: " . $cmdarg . "\n";
+	die "usage: ./count.pl [--non-interactive] <PGLOGFILE>\n";
+    }
+
+    $cmdarg = shift @ARGV; 
+}
+
+my $pglogfile = $cmdarg;
 
 unless ( -f $pglogfile )
 {
-    die "usage: ./count.pl <PGLOGFILE>\n";
+    die "usage: ./count.pl [--non-interactive] <PGLOGFILE>\n";
 }
 
 my $pglogfilesize = (stat($pglogfile))[7];
-print "Current size: ".$pglogfilesize." bytes.\n";
-print "Press any key when ready.\n";
 
-system "stty cbreak </dev/tty >/dev/tty 2>&1";
-my $key = getc(STDIN);
-system "stty -cbreak </dev/tty >/dev/tty 2>&1";
-print "\n";
+if ( $interactive )
+{
+    print "Running in INTERACTIVE MODE!\n";
+    print "Current log size: ".$pglogfilesize." bytes.\n";
 
-my $newsize = (stat($pglogfile))[7];
-my $diff = $newsize - $pglogfilesize;
+    print "Execute the application task that you are testing/measuring (an API call, a page load, etc.), then press any key. The script will then attempt to parse the increment portion of the PostgresQL log.\n";
 
-system "tail -c ".$diff." < ".$pglogfile." > tail";
+    system "stty cbreak </dev/tty >/dev/tty 2>&1";
+    my $key = getc(STDIN);
+    system "stty -cbreak </dev/tty >/dev/tty 2>&1";
+    print "\n";
 
-print "Increment: ".$diff." bytes.\n";
+    my $newsize = (stat($pglogfile))[7];
+    my $diff = $newsize - $pglogfilesize;
 
-system "./parse.pl < tail > tail.parsed";
+    system "tail -c ".$diff." < ".$pglogfile." > tail";
 
-system "cat tail.parsed | sed 's/ where.*//' | sed 's/ WHERE.*//' | sort | uniq -c | sort -nr -k 1,2 > tail.counted";
+    print "Increment: ".$diff." bytes.\n";
 
+    system "./parse.pl < tail > tail.parsed";
+}
+else
+{
+    # non-interactive mode; parsing the entire log file.
+    system "./parse.pl < $pglogfile > tail.parsed";
+}
+
+my $parse_errors = $?;
 
-print "Parsed and counted the queries. Total number:\n";
+system "cat tail.parsed | sed 's/ where.*//' | sed 's/ WHERE.*//' | sed 's/ SET .*//' | sed 's/ VALUES .*//' | sort | uniq -c | sort -nr -k 1,2 > tail.counted";
+
+if ( $parse_errors )
+{
+    print "Parser encountered errors and may have exited prematurely.\n";
+    print "The total number of queries, and the specific query numbers below MAY BE INCOMPLETE!\n";
+}
+else
+{
+    print "Parsed and counted the queries. Total number:\n";
+}
 
 system "awk '{a+=\$1}END{print a}' < tail.counted";
 
diff --git a/scripts/database/querycount/parse.pl b/scripts/database/querycount/parse.pl
index b0fb9ed303a..422f1791232 100755
--- a/scripts/database/querycount/parse.pl
+++ b/scripts/database/querycount/parse.pl
@@ -1,35 +1,53 @@
 #!/usr/bin/perl 
+$count = 0;  # total count of queries encountered
+$parsed = 0; # count of queries parsed
 
 while (<>) 
 {
-    chop; 
-    if ( /execute <unnamed>: (select .*)$/i || /execute <unnamed>: (insert .*)$/i || /execute <unnamed>: (update .*)$/i)
+    chop;
+
+    # a freaky multi-line notation for "SELECT EXISTS" (very rare; something administrative?)
+    if ( /execute [^:]*: (select exists.*)$/i )
+    {
+	$query_multiline = $1;
+	$count++;
+    }
+    elsif ( /execute [^:]*: (select .*)$/i || /execute [^:]*: (insert .*)$/i || /execute [^:]*: (update .*)$/i || /execute [^:]*: (delete .*)$/i )
     {
-	$select_q = $1; 
+	$query = $1; 
+	$count++; 
 
-	if ($select_q =~/\$1/)
+	if ($query =~/\$1/)
 	{
 	    # saving the query, will substitute parameters
-	    #print STDERR "saving query: " . $select_q . "\n";
+	    #print STDERR "saving query: " . $query . "\n";
 
 	}
 	else 
 	{
-	    print $select_q . "\n";
-	    $select_q = "";
+	    print $query . "\n";
+	    $parsed++;
+	    $query = "";
 	}
     }
-    elsif (/^.*[A-Z][A-Z][A-Z] >DETAIL:  parameters: (.*)$/i)
+    elsif (/^.*[A-Z][A-Z][A-Z]\s.*DETAIL:  parameters: (.*)$/i)
     {
-#	print STDERR "EDT detail line encountered.\n";
-	unless ($select_q)
+	#print STDERR "detail line encountered.\n";
+
+	if ( $query_multiline )
+	{
+	    $query = $query_multiline;
+	    $query_multiline = "";
+	}
+	
+	unless ($query)
 	{
-	    die "EDT DETAIL encountered (" . $_ . ", no select_q\n";
+	    die "DETAIL statement encountered (" . $_ . ", no query\n";
 	}
 
 	$params = $1; 
 
-	@params_ = split (",", $params); 
+	@params_ = split (', \$', $params); 
 
 	for $p (@params_)
 	{
@@ -40,17 +58,22 @@
 
 #	    print STDERR $p . "\n";
 
-	    ($name,$value) = split ("=", $p); 
+	    ($name, $value) = split ("=", $p, 2); 
 
 	    $name =~s/^\$//g; 
+	    $value=~s/[()]+//g; 
 
-#	    print STDERR "name: $name, value: $value\n";
-
-
-	    $select_q =~s/\$$name/$value/ge;
+	    $query =~s/\$$name/$value/ge;
 	}
 
-	print $select_q . "\n"; 
-	$select_q = "";
+	print $query . "\n"; 
+	$parsed++; 
+	$query = "";
+    }
+    elsif ( $query_multiline )
+    {
+	$query_multiline .= $_; 
     }
 }
+print STDERR "total queries encountered: $count\n";
+print STDERR "total queries parsed: $parsed\n";
diff --git a/scripts/database/reference_data.sql b/scripts/database/reference_data.sql
deleted file mode 100644
index 41370a22013..00000000000
--- a/scripts/database/reference_data.sql
+++ /dev/null
@@ -1,52 +0,0 @@
--- using http://dublincore.org/schemas/xmls/qdc/dcterms.xsd because at http://dublincore.org/schemas/xmls/ it's the schema location for http://purl.org/dc/terms/ which is referenced in http://swordapp.github.io/SWORDv2-Profile/SWORDProfile.html
-INSERT INTO foreignmetadataformatmapping(id, name, startelement, displayName, schemalocation) VALUES (1, 'http://purl.org/dc/terms/', 'entry', 'dcterms: DCMI Metadata Terms', 'http://dublincore.org/schemas/xmls/qdc/dcterms.xsd');
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (1, ':title', 'title', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (2, ':identifier', 'otherIdValue', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (3, ':creator', 'authorName', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (4, ':date', 'productionDate', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (5, ':subject', 'keywordValue', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (6, ':description', 'dsDescriptionValue', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (7, ':relation', 'relatedMaterial', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (8, ':isReferencedBy', 'publicationCitation', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (9, 'holdingsURI', 'publicationURL', TRUE, 8, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (10, 'agency', 'publicationIDType', TRUE, 8, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (11, 'IDNo', 'publicationIDNumber', TRUE, 8, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (12, ':coverage', 'otherGeographicCoverage', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (13, ':type', 'kindOfData', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (14, ':source', 'dataSources', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (15, 'affiliation', 'authorAffiliation', TRUE, 3, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (16, ':contributor', 'contributorName', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (17, 'type', 'contributorType', TRUE, 16, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (18, ':publisher', 'producerName', FALSE, NULL, 1 );
-INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id) VALUES (19, ':language', 'language', FALSE, NULL, 1 );
-
-INSERT INTO guestbook(
-             emailrequired, enabled, institutionrequired, createtime,
-            "name", namerequired, positionrequired,  dataverse_id)
-    VALUES (  false, true, false, now(),
-            'Default', false, false, null);
-
--- TODO: Remove if http://stackoverflow.com/questions/25743191/how-to-add-a-case-insensitive-jpa-unique-constraint
--- gets an answer. See also https://github.com/IQSS/dataverse/issues/2598#issuecomment-158219334
-CREATE UNIQUE INDEX dataverse_alias_unique_idx on dataverse (LOWER(alias));
-CREATE UNIQUE INDEX index_authenticateduser_lower_email ON authenticateduser (lower(email));
-CREATE UNIQUE INDEX index_authenticateduser_lower_useridentifier ON authenticateduser (lower(useridentifier));
--- this field has been removed from builtinuser; CREATE UNIQUE INDEX index_builtinuser_lower_email ON builtinuser (lower(email));
-
---Edit Dataset: Investigate and correct multiple draft issue: https://github.com/IQSS/dataverse/issues/2132
---This unique index will prevent the multiple draft issue
-CREATE UNIQUE INDEX one_draft_version_per_dataset ON datasetversion
-(dataset_id) WHERE versionstate='DRAFT';
-
-
-INSERT INTO worldmapauth_tokentype
-(   name,
-    created,
-    contactemail, hostname, ipaddress, 
-    mapitlink, md5,
-    modified, timelimitminutes)
-    VALUES ( 'GEOCONNECT', current_timestamp, 
-        'support@dataverse.org',  'geoconnect.datascience.iq.harvard.edu', '140.247.115.127', 
-	'http://geoconnect.datascience.iq.harvard.edu/shapefile/map-it',
-	'38c0a931b2d582a5c43fc79405b30c22',
-            current_timestamp, 30);
diff --git a/scripts/deploy/phoenix.dataverse.org/cert.md b/scripts/deploy/phoenix.dataverse.org/cert.md
deleted file mode 100644
index d68910fa15c..00000000000
--- a/scripts/deploy/phoenix.dataverse.org/cert.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Note that `-sha256` is used but the important thing is making sure SHA-1 is not selected when uploading the CSR to https://cert-manager.com/customer/InCommon
-
-    openssl genrsa -out phoenix.dataverse.org.key 2048
-
-    openssl req -new -sha256 -key phoenix.dataverse.org.key -out phoenix.dataverse.org.csr
-
-    Country Name (2 letter code) [XX]:US
-    State or Province Name (full name) []:Massachusetts
-    Locality Name (eg, city) [Default City]:Cambridge
-    Organization Name (eg, company) [Default Company Ltd]:Harvard College
-    Organizational Unit Name (eg, section) []:IQSS
-    Common Name (eg, your name or your server's hostname) []:phoenix.dataverse.org
-    Email Address []:support@dataverse.org
diff --git a/scripts/deploy/phoenix.dataverse.org/deploy b/scripts/deploy/phoenix.dataverse.org/deploy
deleted file mode 100755
index f45d7d65041..00000000000
--- a/scripts/deploy/phoenix.dataverse.org/deploy
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-scripts/deploy/phoenix.dataverse.org/prep
-sudo /home/jenkins/dataverse/scripts/deploy/phoenix.dataverse.org/rebuild
-scripts/deploy/phoenix.dataverse.org/post
diff --git a/scripts/deploy/phoenix.dataverse.org/dv-root.json b/scripts/deploy/phoenix.dataverse.org/dv-root.json
deleted file mode 100644
index 20fa8905da5..00000000000
--- a/scripts/deploy/phoenix.dataverse.org/dv-root.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "alias": "root",
-  "name": "Root",
-  "permissionRoot": false,
-  "facetRoot": true,
-  "description": "Welcome! phoenix.dataverse.org is so named because data here is deleted on every build of the latest Dataverse code: <a href=\"http://guides.dataverse.org/en/latest/developers\">http://guides.dataverse.org/en/latest/developers</a>",
-  "dataverseSubjects": [
-      "Other"
-  ],
-  "dataverseContacts": [
-    {
-      "contactEmail": "root@mailinator.com"
-}
-  ]
-}
diff --git a/scripts/deploy/phoenix.dataverse.org/install b/scripts/deploy/phoenix.dataverse.org/install
deleted file mode 100755
index f3df88a3fd2..00000000000
--- a/scripts/deploy/phoenix.dataverse.org/install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-export HOST_ADDRESS=phoenix.dataverse.org
-export GLASSFISH_ROOT=/usr/local/glassfish4
-export FILES_DIR=/usr/local/glassfish4/glassfish/domains/domain1/files
-export DB_NAME=dvndb
-export DB_PORT=5432
-export DB_HOST=localhost
-export DB_USER=dvnapp
-export DB_PASS=secret
-export RSERVE_HOST=localhost
-export RSERVE_PORT=6311
-export RSERVE_USER=rserve
-export RSERVE_PASS=rserve
-export SMTP_SERVER=localhost
-export MEM_HEAP_SIZE=2048
-export GLASSFISH_DOMAIN=domain1
-cd scripts/installer
-cp pgdriver/postgresql-8.4-703.jdbc4.jar $GLASSFISH_ROOT/glassfish/lib
-cp ../../conf/jhove/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
-./glassfish-setup.sh
diff --git a/scripts/deploy/phoenix.dataverse.org/post b/scripts/deploy/phoenix.dataverse.org/post
deleted file mode 100755
index 48aff3d8f16..00000000000
--- a/scripts/deploy/phoenix.dataverse.org/post
+++ /dev/null
@@ -1,15 +0,0 @@
-#/bin/sh
-cd scripts/api
-./setup-all.sh --insecure -p=admin1 | tee /tmp/setup-all.sh.out
-cd ../..
-psql -U dvnapp dvndb -f scripts/database/reference_data.sql
-psql -U dvnapp dvndb -f doc/sphinx-guides/source/_static/util/createsequence.sql
-curl http://localhost:8080/api/admin/settings/:DoiProvider -X PUT -d FAKE
-scripts/search/tests/publish-dataverse-root
-git checkout scripts/api/data/dv-root.json
-scripts/search/tests/grant-authusers-add-on-root
-scripts/search/populate-users
-scripts/search/create-users
-scripts/search/tests/create-all-and-test
-scripts/search/tests/publish-spruce1-and-test
-java -jar downloads/schemaSpy_5.0.0.jar -t pgsql -host localhost -db dvndb -u postgres -p secret -s public -dp scripts/installer/pgdriver/postgresql-42.2.2.jar -o /var/www/html/schemaspy/latest
diff --git a/scripts/deploy/phoenix.dataverse.org/prep b/scripts/deploy/phoenix.dataverse.org/prep
deleted file mode 100755
index 46601258dd9..00000000000
--- a/scripts/deploy/phoenix.dataverse.org/prep
+++ /dev/null
@@ -1,2 +0,0 @@
-#/bin/bash -x
-cp scripts/deploy/phoenix.dataverse.org/dv-root.json scripts/api/data/dv-root.json
diff --git a/scripts/deploy/phoenix.dataverse.org/rebuild b/scripts/deploy/phoenix.dataverse.org/rebuild
deleted file mode 100755
index 55c2f26619c..00000000000
--- a/scripts/deploy/phoenix.dataverse.org/rebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-LIST_APP=$(/usr/local/glassfish4/glassfish/bin/asadmin list-applications -t)
-echo "deployed: $LIST_APP"
-OLD_WAR=$(echo $LIST_APP | awk '{print $1}')
-NEW_WAR=/tmp/dataverse.war
-/usr/local/glassfish4/glassfish/bin/asadmin undeploy $OLD_WAR
-/usr/local/glassfish4/glassfish/bin/asadmin stop-domain
-# blow away "generated" directory to avoid EJB Timer Service is not available" https://github.com/IQSS/dataverse/issues/3336
-rm -rf /usr/local/glassfish4/glassfish/domains/domain1/generated
-rm -rf /usr/local/glassfish4/glassfish/domains/domain1/files
-#psql -U postgres -c "CREATE ROLE dvnapp UNENCRYPTED PASSWORD 'secret' SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN" template1
-psql -U dvnapp -c 'DROP DATABASE "dvndb"' template1
-echo $?
-curl http://localhost:8983/solr/collection1/update/json?commit=true -H "Content-type: application/json" -X POST -d "{\"delete\": { \"query\":\"*:*\"}}"
-psql -U dvnapp -c 'CREATE DATABASE "dvndb" WITH OWNER = "dvnapp"' template1
-echo $?
-/usr/local/glassfish4/glassfish/bin/asadmin start-domain
-/usr/local/glassfish4/glassfish/bin/asadmin deploy $NEW_WAR
diff --git a/scripts/dev/dev-rebuild.sh b/scripts/dev/dev-rebuild.sh
new file mode 100755
index 00000000000..898212b4664
--- /dev/null
+++ b/scripts/dev/dev-rebuild.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+PAYARA_DIR=/usr/local/payara6
+ASADMIN=$PAYARA_DIR/glassfish/bin/asadmin
+DB_NAME=dvndb
+DB_USER=dvnapp
+export PGPASSWORD=secret
+
+echo "Checking if there is a war file to undeploy..."
+LIST_APP=$($ASADMIN list-applications -t)
+OLD_WAR=$(echo $LIST_APP | awk '{print $1}')
+NEW_WAR=target/dataverse*.war
+if [ ! -z $OLD_WAR ]; then
+  $ASADMIN undeploy $OLD_WAR
+fi
+
+echo "Stopping app server..."
+$ASADMIN stop-domain
+
+echo "Deleting \"generated\" directory..."
+rm -rf $PAYARA_DIR/glassfish/domains/domain1/generated
+
+echo "Deleting ALL DATA FILES uploaded to Dataverse..." 
+# TODO: Make this configurable.
+rm -rf $PAYARA_DIR/glassfish/domains/domain1/files
+
+echo "Terminating database sessions so we can drop the database..."
+psql -h localhost -U postgres -c "
+SELECT pg_terminate_backend(pg_stat_activity.pid)
+FROM pg_stat_activity
+WHERE pg_stat_activity.datname = '$DB_NAME'
+  AND pid <> pg_backend_pid();
+" template1
+
+echo "Dropping the database..."
+psql -h localhost -U $DB_USER -c "DROP DATABASE \"$DB_NAME\"" template1
+echo $?
+
+echo "Clearing out data from Solr..."
+curl "http://localhost:8983/solr/collection1/update/json?commit=true" -H "Content-type: application/json" -X POST -d "{\"delete\": { \"query\":\"*:*\"}}"
+
+echo "Creating a new database..."
+psql -h localhost -U $DB_USER -c "CREATE DATABASE \"$DB_NAME\" WITH OWNER = \"$DB_USER\"" template1
+echo $?
+
+echo "Starting app server..."
+$PAYARA_DIR/glassfish/bin/asadmin start-domain
+
+echo "Deploying war file..."
+$PAYARA_DIR/glassfish/bin/asadmin deploy $NEW_WAR
+
+echo "Running setup-all.sh (INSECURE MODE)..."
+cd scripts/api
+./setup-all.sh --insecure -p=admin1 | tee /tmp/setup-all.sh.out
+cd ../..
+
+echo "Creating SQL sequence..."
+psql -h localhost -U $DB_USER $DB_NAME -f doc/sphinx-guides/source/_static/util/createsequence.sql
+
+echo "Allowing GUI edits to be visible without redeploy..."
+$PAYARA_DIR/glassfish/bin/asadmin create-system-properties "dataverse.jsf.refresh-period=1"
+
+export API_TOKEN=`cat /tmp/setup-all.sh.out | grep apiToken| jq .data.apiToken | tr -d \"`
+
+echo "Publishing root dataverse..."
+curl -H X-Dataverse-key:$API_TOKEN -X POST http://localhost:8080/api/dataverses/:root/actions/:publish
+
+echo "Allowing users to create dataverses and datasets in root..."
+curl -H X-Dataverse-key:$API_TOKEN -X POST -H "Content-type:application/json" -d "{\"assignee\": \":authenticated-users\",\"role\": \"fullContributor\"}" "http://localhost:8080/api/dataverses/:root/assignments"
+
+echo "Checking Dataverse version..."
+curl http://localhost:8080/api/info/version
diff --git a/scripts/dev/docker-final-setup.sh b/scripts/dev/docker-final-setup.sh
new file mode 100755
index 00000000000..e20ce7ad6b6
--- /dev/null
+++ b/scripts/dev/docker-final-setup.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -euo pipefail
+
+echo "Running setup-all.sh (INSECURE MODE)..."
+cd scripts/api || exit
+./setup-all.sh --insecure -p=admin1 | tee /tmp/setup-all.sh.out
+cd ../..
+
+echo "Setting system mail address..."
+curl -X PUT -d "dataverse@localhost" "http://localhost:8080/api/admin/settings/:SystemEmail"
+
+API_TOKEN=$(grep apiToken "/tmp/setup-all.sh.out" | jq ".data.apiToken" | tr -d \")
+export API_TOKEN
+
+echo "Publishing root dataverse..."
+curl -H "X-Dataverse-key:$API_TOKEN" -X POST "http://localhost:8080/api/dataverses/:root/actions/:publish"
+
+echo "Allowing users to create dataverses and datasets in root..."
+curl -H "X-Dataverse-key:$API_TOKEN" -X POST -H "Content-type:application/json" -d "{\"assignee\": \":authenticated-users\",\"role\": \"fullContributor\"}" "http://localhost:8080/api/dataverses/:root/assignments"
+
+echo "Checking Dataverse version..."
+curl "http://localhost:8080/api/info/version"
\ No newline at end of file
diff --git a/scripts/icons/.gitignore b/scripts/icons/.gitignore
new file mode 100644
index 00000000000..26a34e81bd9
--- /dev/null
+++ b/scripts/icons/.gitignore
@@ -0,0 +1,2 @@
+.fontcustom-manifest.json
+preview
diff --git a/scripts/icons/README.md b/scripts/icons/README.md
new file mode 100644
index 00000000000..61d5b49ca5d
--- /dev/null
+++ b/scripts/icons/README.md
@@ -0,0 +1 @@
+See https://guides.dataverse.org/en/latest/developers/fontcustom.html
diff --git a/scripts/icons/app.sh b/scripts/icons/app.sh
new file mode 100755
index 00000000000..51883b06cb6
--- /dev/null
+++ b/scripts/icons/app.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Filenames change each time so remove the old ones.
+rm ../../src/main/webapp/resources/fontcustom/*
+# Generate new files (see config file for paths).
+fontcustom compile -c fontcustom-app.yml
+# We want a fresh run each time since we have two scripts.
+rm .fontcustom-manifest.json
+# Use absolute src url path to "/resources..." 
+# We've always done it this way.
+# The sed command is extra verbose for precision and clarity.
+sed -i -e 's/url("\.\./url("\/resources/' ../../src/main/webapp/resources/css/fontcustom.css
+echo "Done! If all went well, you can see the icons at preview/fontcustom-preview.html"
diff --git a/scripts/icons/docs.sh b/scripts/icons/docs.sh
new file mode 100755
index 00000000000..4ef2e0e0193
--- /dev/null
+++ b/scripts/icons/docs.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Filenames change each time so remove the old ones.
+rm ../../doc/sphinx-guides/source/_static/fontcustom/*
+# Generate new files (see config file for paths).
+fontcustom compile -c fontcustom-docs.yml
+# We want a fresh run each time since we have two scripts.
+rm .fontcustom-manifest.json
diff --git a/scripts/icons/fontcustom-app.yml b/scripts/icons/fontcustom-app.yml
new file mode 100644
index 00000000000..0ccf0343c90
--- /dev/null
+++ b/scripts/icons/fontcustom-app.yml
@@ -0,0 +1,99 @@
+# =============================================================================
+# Font Custom Configuration
+#   This file should live in the directory where you run `fontcustom compile`.
+#   For more info, visit <https://github.com/FontCustom/fontcustom>.
+# =============================================================================
+
+
+# -----------------------------------------------------------------------------
+# Project Info
+# -----------------------------------------------------------------------------
+
+# The font's name. Also determines the file names of generated templates.
+#font_name: icons
+
+# Format of CSS selectors. {{glyph}} is substituted for the glyph name.
+#css_selector: .i-{{glyph}}
+
+# Generate fonts without asset-busting hashes.
+#no_hash: true
+
+# Encode WOFF fonts into the generated CSS.
+#base64: true
+
+# Forces compilation, even if inputs have not changed
+force: true
+
+# Display (possibly useful) debugging messages.
+#debug: true
+
+# Hide status messages.
+#quiet: true
+
+# Copyright information.
+#copyright: 
+
+
+# -----------------------------------------------------------------------------
+# Input / Output Locations
+#   You can save generated fonts, CSS, and other files to different locations
+#   here. Font Custom can also read input vectors and templates from different
+#   places.
+#
+#   NOTE:
+#   - Be sure to preserve the whitespace in these YAML hashes.
+#   - INPUT[:vectors] and OUTPUT[:fonts] are required. Everything else is
+#     optional.
+#   - Specify output locations for custom templates by including their file
+#     names as the key.
+# -----------------------------------------------------------------------------
+
+input:
+  vectors: svg
+#  templates: my/templates
+
+output:
+  fonts: ../../src/main/webapp/resources/fontcustom
+  css: ../../src/main/webapp/resources/css
+  preview: preview
+#  my-custom-template.yml: path/to/template/output
+
+
+# -----------------------------------------------------------------------------
+# Templates
+#   A YAML array of templates and files to generate alongside fonts. Custom
+#   templates should be saved in the INPUT[:templates] directory and referenced
+#   by their base file name.
+#
+#   For Rails and Compass templates, set `preprocessor_path` as the relative
+#   path from OUTPUT[:css] to OUTPUT[:fonts]. By default, these are the same
+#   directory.
+#
+#   Included in Font Custom: preview, css, scss, scss-rails
+#   Default: css, preview
+# -----------------------------------------------------------------------------
+
+#templates:
+#- scss-rails
+#- preview
+#- my-custom-template.yml
+
+#preprocessor_path: ../fonts/
+
+
+# -----------------------------------------------------------------------------
+# Font Settings (defaults shown)
+# -----------------------------------------------------------------------------
+
+# Size (in pica points) for which your font is designed.
+#font_design_size: 16
+
+# The em size. Setting this will scale the entire font to the given size.
+#font_em: 512
+
+# The font's ascent and descent. Used to calculate the baseline.
+#font_ascent: 448
+#font_descent: 64
+
+# Horizontally fit glyphs to their individual vector widths.
+#autowidth: false
diff --git a/scripts/icons/fontcustom-docs.yml b/scripts/icons/fontcustom-docs.yml
new file mode 100644
index 00000000000..dfc66081d9c
--- /dev/null
+++ b/scripts/icons/fontcustom-docs.yml
@@ -0,0 +1,100 @@
+# =============================================================================
+# Font Custom Configuration
+#   This file should live in the directory where you run `fontcustom compile`.
+#   For more info, visit <https://github.com/FontCustom/fontcustom>.
+# =============================================================================
+
+
+# -----------------------------------------------------------------------------
+# Project Info
+# -----------------------------------------------------------------------------
+
+# The font's name. Also determines the file names of generated templates.
+#font_name: icons
+
+# Format of CSS selectors. {{glyph}} is substituted for the glyph name.
+#css_selector: .i-{{glyph}}
+
+# Generate fonts without asset-busting hashes.
+#no_hash: true
+
+# Encode WOFF fonts into the generated CSS.
+#base64: true
+
+# Forces compilation, even if inputs have not changed
+force: true
+
+# Display (possibly useful) debugging messages.
+#debug: true
+
+# Hide status messages.
+#quiet: true
+
+# Copyright information.
+#copyright: 
+
+
+# -----------------------------------------------------------------------------
+# Input / Output Locations
+#   You can save generated fonts, CSS, and other files to different locations
+#   here. Font Custom can also read input vectors and templates from different
+#   places.
+#
+#   NOTE:
+#   - Be sure to preserve the whitespace in these YAML hashes.
+#   - INPUT[:vectors] and OUTPUT[:fonts] are required. Everything else is
+#     optional.
+#   - Specify output locations for custom templates by including their file
+#     names as the key.
+# -----------------------------------------------------------------------------
+
+input:
+  vectors: svg
+#  templates: my/templates
+
+output:
+  fonts: ../../doc/sphinx-guides/source/_static/fontcustom
+  css: ../../doc/sphinx-guides/source/_static
+
+  preview: ../../doc/sphinx-guides/source/_static
+#  my-custom-template.yml: path/to/template/output
+
+
+# -----------------------------------------------------------------------------
+# Templates
+#   A YAML array of templates and files to generate alongside fonts. Custom
+#   templates should be saved in the INPUT[:templates] directory and referenced
+#   by their base file name.
+#
+#   For Rails and Compass templates, set `preprocessor_path` as the relative
+#   path from OUTPUT[:css] to OUTPUT[:fonts]. By default, these are the same
+#   directory.
+#
+#   Included in Font Custom: preview, css, scss, scss-rails
+#   Default: css, preview
+# -----------------------------------------------------------------------------
+
+#templates:
+#- scss-rails
+#- preview
+#- my-custom-template.yml
+
+#preprocessor_path: ../fonts/
+
+
+# -----------------------------------------------------------------------------
+# Font Settings (defaults shown)
+# -----------------------------------------------------------------------------
+
+# Size (in pica points) for which your font is designed.
+#font_design_size: 16
+
+# The em size. Setting this will scale the entire font to the given size.
+#font_em: 512
+
+# The font's ascent and descent. Used to calculate the baseline.
+#font_ascent: 448
+#font_descent: 64
+
+# Horizontally fit glyphs to their individual vector widths.
+#autowidth: false
diff --git a/scripts/icons/svg/astro.svg b/scripts/icons/svg/astro.svg
new file mode 100644
index 00000000000..9104a106c64
--- /dev/null
+++ b/scripts/icons/svg/astro.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M324 0l118 116v377q0 8 -5.5 13.5t-13.5 5.5h-334q-8 0 -13.5 -5.5t-5.5 -13.5v-474q0 -8 5.5 -13.5t13.5 -5.5h235zM319 26v93h96zM91 491h330v-351h-123v-119h-207v470zM391 186q17 17 -15 69q-9 13 -20 28q7 17 7 36q0 29 -14.5 53t-38.5 38t-53 14q-18 0 -36 -6
+q-15 11 -28 20q-18 11 -31 16t-23 5t-16 -6q-7 -7 -5 -20q1 -10 7 -24q11 -23 34 -53q-7 -18 -7 -37q0 -44 31 -74.5t74 -30.5q20 0 37 6q31 -23 54 -33q13 -6 23 -7q13 -2 20 6zM183 421q9 -5 19 -12q-21 -13 -34 -34q-17 24 -25 41q-10 20 -6 24q2 2 12 -1q14 -5 34 -18z
+M347 264q7 -10 12 -18q13 -21 17 -34q4 -11 2 -13q-4 -3 -23 5q-18 9 -42 26q21 13 34 34z" />
+</svg>
diff --git a/scripts/icons/svg/audio.svg b/scripts/icons/svg/audio.svg
new file mode 100644
index 00000000000..d50b18508bb
--- /dev/null
+++ b/scripts/icons/svg/audio.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M324 0l118 116v377q0 8 -5.5 13.5t-13.5 5.5h-334q-8 0 -13.5 -5.5t-5.5 -13.5v-474q0 -8 5.5 -13.5t13.5 -5.5h235zM319 26v93h96zM91 491h330v-351h-123v-119h-207v470zM371 183v190q-1 11 -8 20t-18.5 14.5t-25.5 5.5q-21 0 -36 -12t-15 -29t15 -29t36 -12q15 0 28 6
+v-100l-111 26v148q1 2 1 4q0 17 -15.5 29t-36.5 12t-36.5 -12t-15.5 -29t15.5 -29t36.5 -12q15 0 27 6v-158z" />
+</svg>
diff --git a/scripts/icons/svg/code.svg b/scripts/icons/svg/code.svg
new file mode 100644
index 00000000000..fc1d3bdfd52
--- /dev/null
+++ b/scripts/icons/svg/code.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 522 512" style="enable-background:new 0 0 522 512;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#231F20;}
+</style>
+<path d="M334,0l118,116v377c0,5.3-1.8,9.8-5.5,13.5s-8.2,5.5-13.5,5.5H99c-5.3,0-9.8-1.8-13.5-5.5S80,498.3,80,493V19
+	c0-5.3,1.8-9.8,5.5-13.5S93.7,0,99,0H334z M329,26v93h96L329,26z M101,491h330V140H308V21H101V491z"/>
+<g>
+	<path class="st0" d="M218.1,357.8c0,2.6-0.1,4.7-0.3,6.1c-0.2,1.5-0.5,2.5-1,3.2c-0.5,0.6-1,0.9-1.7,0.8c-0.7-0.1-1.5-0.4-2.6-0.8
+		l-81.2-40.5c-1-0.6-1.7-1.7-2.2-3.5c-0.5-1.8-0.7-4.5-0.7-8.1c0-1.8,0.1-3.4,0.2-4.8c0.1-1.4,0.3-2.5,0.5-3.4
+		c0.2-0.9,0.5-1.6,0.9-2.1c0.4-0.5,0.8-0.9,1.3-1.2l81.1-40.2c2-1,3.5-0.8,4.3,0.6c0.8,1.4,1.3,4.2,1.3,8.4c0,2.9-0.1,5.2-0.2,6.9
+		c-0.1,1.7-0.3,3-0.6,4c-0.3,1-0.7,1.7-1.2,2.1c-0.5,0.4-1.2,0.8-2,1.3l-61,28.6l59.8,27.8c1.1,0.5,1.9,1,2.6,1.5
+		c0.7,0.5,1.2,1.3,1.5,2.3c0.4,1,0.6,2.4,0.7,4.1C218,352.5,218.1,354.8,218.1,357.8z"/>
+	<path class="st0" d="M247.2,403.6c-0.4,0.9-0.8,1.7-1.4,2.2c-0.6,0.6-1.4,1-2.4,1.4c-1,0.4-2.3,0.6-3.8,0.8
+		c-1.5,0.2-3.4,0.3-5.8,0.3c-2.9,0-5.3-0.1-7.1-0.4c-1.8-0.3-3.2-0.7-4.2-1.3c-1-0.6-1.5-1.3-1.6-2.2c-0.1-0.9,0-1.9,0.4-3.1
+		l63.3-177.8c0.3-0.9,0.7-1.7,1.3-2.3c0.6-0.6,1.3-1.1,2.3-1.4c1-0.4,2.3-0.6,3.9-0.8c1.6-0.2,3.5-0.3,5.8-0.3c3,0,5.3,0.1,7.1,0.4
+		c1.8,0.3,3.2,0.7,4.1,1.3c0.9,0.6,1.4,1.3,1.6,2.2c0.1,0.9,0,1.9-0.3,3.1L247.2,403.6z"/>
+	<path class="st0" d="M405.7,315.3c0,1.8-0.1,3.4-0.2,4.8c-0.1,1.3-0.3,2.5-0.6,3.4c-0.2,0.9-0.6,1.6-1,2.2
+		c-0.4,0.5-0.8,0.9-1.3,1.1L321.3,367c-1,0.5-1.8,0.7-2.5,0.6c-0.7-0.1-1.3-0.5-1.7-1.2c-0.5-0.7-0.8-1.7-1-3.1
+		c-0.2-1.4-0.3-3.1-0.3-5.2c0-2.9,0.1-5.2,0.2-6.9c0.1-1.7,0.3-3,0.6-4c0.3-1,0.7-1.7,1.2-2.2c0.5-0.5,1.2-0.9,2-1.2l61-28.6
+		l-59.8-27.8c-1.1-0.5-2-1-2.7-1.5c-0.7-0.5-1.2-1.3-1.5-2.3c-0.4-1-0.6-2.4-0.7-4.1c-0.1-1.7-0.2-4.1-0.2-7c0-2.6,0.1-4.7,0.3-6.1
+		c0.2-1.5,0.5-2.5,1-3.2c0.5-0.6,1-0.9,1.7-0.8c0.7,0.1,1.6,0.4,2.5,0.8l81.3,40.6c0.9,0.4,1.6,1.6,2.2,3.4
+		C405.4,309,405.7,311.7,405.7,315.3z"/>
+</g>
+</svg>
diff --git a/scripts/icons/svg/dataset.svg b/scripts/icons/svg/dataset.svg
new file mode 100644
index 00000000000..f1ac63397c9
--- /dev/null
+++ b/scripts/icons/svg/dataset.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 522 512" style="enable-background:new 0 0 522 512;" xml:space="preserve">
+<g>
+	<g>
+		<path d="M207.6,81.8c0.9,0.4,1.8,0.6,2.9,0.6H303h12.6c3.9,0,7-3.1,7-7v-3.1c0-3.9-3.1-7-7-6H210.5c-3.9-1-7,2.1-7,6v3.1
+			C203.5,78.3,205.2,80.7,207.6,81.8z M405.4,190.5l-194.9,1c-3.9-1-7,2.1-7,6v2.4c0,3.9,3.1,7,7,7h194.8h0.1c3.9,0,7-3.1,7-7v-2.4
+			C412.4,193.6,409.3,190.5,405.4,190.5z M405.4,308.2l-194.9,1c-3.9-1-7,2.1-7,6v3.1c0,3.9,3.1,7.1,7,7h194.8h0.1c3.9,0,7-3.1,7-7
+			v-3.1C412.4,311.3,409.3,308.2,405.4,308.2z M362.2,0.2H183.4c-4.1,0-7.5,1.4-10.3,4.2c-2.8,2.8-4.2,6.3-4.2,10.3v26.9h-15.6
+			c-4.1,0-7.5,1.4-10.3,4.2s-4.2,6.3-4.2,10.3v25.7h-15.1c-4.1,0-7.5,1.4-10.3,4.2c-2.8,2.8-4.2,6.3-4.2,10.3V122H94.5
+			c-4.1,0-7.5,1.4-10.3,4.2s-4.2,6.3-4.2,10.3v360.8c0,4.1,1.4,7.5,4.2,10.3s6.3,4.2,10.3,4.2h254.2c4.1,0,7.5-1.4,10.3-4.2
+			s4.2-6.3,4.2-10.3v-25.7h14.6c4.1,0,7.5-1.4,10.3-4.2c2.8-2.8,4.2-6.3,4.2-10.3v-25.7h15.1c4.1,0,7.5-1.4,10.3-4.2
+			c2.8-2.8,4.2-6.3,4.2-10.3v-27h15.6c4.1,0,7.5-1.4,10.3-4.2s4.2-6.3,4.2-10.3V88.5L362.2,0.2z M358.1,19.1l74,73.3l-74.5-0.5
+			L358.1,19.1z M346.5,495.7H95.4V138.1h13.8v319c0,4.1,1.4,7.5,4.2,10.3c2.8,2.8,6.3,4.2,10.3,4.2h222.8V495.7z M375.7,455.5H124.5
+			V97.9h14.3v319c0,4.1,1.4,7.5,4.2,10.3c2.8,2.8,6.3,4.2,10.3,4.2h222.4V455.5z M405.3,415.3H154.1V57.7h14.8v317.7
+			c0,4.1,1.4,7.5,4.2,10.3c2.8,2.8,6.3,4.2,10.3,4.2h221.9V415.3z M435.3,373.8H184.2V16.2h157.5v90.5h93.6V373.8z M203.5,158.1v2.4
+			c0,3.9,3.1,7,7,7h194.8h0.1c3.9,0,7-3.1,7-7v-2.4c0-3.9-3.1-7-7-7l-194.9,1C206.6,151.1,203.5,154.2,203.5,158.1z M405.4,268.6
+			l-194.9,1c-3.9-1-7,2.1-7,6v3.1c0,3.9,3.1,7.1,7,7h194.8h0.1c3.9,0,7-3.1,7-7v-3.1C412.4,271.7,409.3,268.6,405.4,268.6z
+			 M405.4,229.2h-0.1H210.5c-3.9,0-7,3.1-7,7v2.4c0,3.8,3.1,7,7,8l194.9-1c3.9,0,7-3.1,7-7v-2.4
+			C412.4,232.3,409.3,229.2,405.4,229.2z"/>
+	</g>
+</g>
+</svg>
diff --git a/scripts/icons/svg/dataverse.svg b/scripts/icons/svg/dataverse.svg
new file mode 100644
index 00000000000..981f16db17a
--- /dev/null
+++ b/scripts/icons/svg/dataverse.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M267 512q-54 0 -88 -36q-36 -39 -36 -88q0 -51 36 -87q23 -22 53 -31l-22 -99h-1h-2q-35 0 -60.5 -25t-25.5 -60.5t25.5 -60.5t61 -25t60.5 25t25 60.5t-25 60.5q-10 10 -24 17l23 102q51 0 87.5 36t36.5 87t-36.5 87.5t-87.5 36.5zM147 85.5q0 24.5 17.5 42t42.5 17.5
+t42.5 -17.5t17.5 -42t-17.5 -42t-42.5 -17.5t-42.5 17.5t-17.5 42zM330 451q26 -26 26 -62.5t-26 -62.5t-63 -26t-63 26t-26 62.5t26 62.5t63 26t63 -26z" />
+</svg>
diff --git a/scripts/icons/svg/document.svg b/scripts/icons/svg/document.svg
new file mode 100644
index 00000000000..53ae21d8fd8
--- /dev/null
+++ b/scripts/icons/svg/document.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 522 512" style="enable-background:new 0 0 522 512;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+</g>
+<path d="M334,0l118,116v377c0,5.3-1.8,9.8-5.5,13.5s-8.2,5.5-13.5,5.5H99c-5.3,0-9.8-1.8-13.5-5.5S80,498.3,80,493V19
+	c0-5.3,1.8-9.8,5.5-13.5S93.7,0,99,0H334z"/>
+<polyline class="st0" points="307.1,140 307.1,21 100.1,21 100.1,491 430.1,491 430.1,140 "/>
+<polygon class="st0" points="328.7,24.8 425.8,121.1 327.9,120.6 "/>
+<g>
+	<path d="M125.4,100.1V96c0-5.1,4.1-9.2,9.2-9.2h138.1c5.1,0,9.2,4.1,9.2,9.2v4.1c0,5.1-4.1,9.2-9.2,9.2H134.6
+		C129.5,109.4,125.4,105.2,125.4,100.1z M125.4,212v-3.1c0-5.1,4.1-9.2,9.2-9.2h256.2c5.1,0,9.2,4.1,9.2,9.2v3.1
+		c0,5.1-4.1,9.2-9.2,9.2H134.6C129.5,221.2,125.4,217.1,125.4,212z M125.4,263.7v-3.1c0-5.1,4.1-9.2,9.2-9.2h256.2
+		c5.1,0,9.2,4.1,9.2,9.2v3.1c0,5.1-4.1,9.2-9.2,9.2H134.6C129.5,273,125.4,268.8,125.4,263.7z M125.4,314.6v-3.1
+		c0-5.1,4.1-9.2,9.2-9.2h256.2c5.1,0,9.2,4.1,9.2,9.2v3.1c0,5.1-4.1,9.2-9.2,9.2H134.6C129.5,323.8,125.4,319.7,125.4,314.6z
+		 M125.4,367.3v-4.1c0-5.1,4.1-9.2,9.2-9.2h256.2c5.1,0,9.2,4.1,9.2,9.2v4.1c0,5.1-4.1,9.2-9.2,9.2H134.6
+		C129.5,376.6,125.4,372.4,125.4,367.3z M125.4,419.4v-4.1c0-5.1,4.1-9.2,9.2-9.2h256.2c5.1,0,9.2,4.1,9.2,9.2v4.1
+		c0,5.1-4.1,9.2-9.2,9.2H134.6C129.5,428.6,125.4,424.5,125.4,419.4z"/>
+</g>
+</svg>
diff --git a/scripts/icons/svg/file.svg b/scripts/icons/svg/file.svg
new file mode 100644
index 00000000000..fcd32098dce
--- /dev/null
+++ b/scripts/icons/svg/file.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M324 0l118 116v377q0 8 -5.5 13.5t-13.5 5.5h-334q-8 0 -13.5 -5.5t-5.5 -13.5v-474q0 -8 5.5 -13.5t13.5 -5.5h235zM319 26v93h96zM91 491h330v-351h-123v-119h-207v470zM116 218h281v200h-281v-200zM218 291h76v-36h-76v36zM294 308h-76v41h76v-41zM132 255v36h69v-36
+h-69zM132 308v41h69v-41h-69zM132 401h69v-36h-69v36zM218 401h76v-36h-76v36zM380 401v-36h-69v36h69zM380 349v-41h-69v41h69zM311 291h69v-36h-69v36z" />
+</svg>
diff --git a/scripts/icons/svg/geodata.svg b/scripts/icons/svg/geodata.svg
new file mode 100644
index 00000000000..7a1032a00be
--- /dev/null
+++ b/scripts/icons/svg/geodata.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M324 0l118 116v377q0 8 -5.5 13.5t-13.5 5.5h-334q-8 0 -13.5 -5.5t-5.5 -13.5v-474q0 -8 5.5 -13.5t13.5 -5.5h235zM319 26v93h96zM91 491h330v-351h-123v-119h-207v470zM255.5 459q-56.5 0 -97 -40.5t-40.5 -97t40.5 -97t97 -40.5t97 40.5t40.5 97t-40.5 97t-97 40.5z
+M264 442q45 -3 77 -35t35 -77h-23v-17h23q-3 -45 -35 -77t-77 -35v23h-17v-23q-45 3 -77 35t-35 77h23v17h-23q3 45 35 77t77 35v-17h17v17zM255.5 185q-56.5 0 -96.5 40t-40 96.5t40 96.5t96.5 40t96.5 -40t40 -96.5t-40 -96.5t-96.5 -40zM263 223v-22v-1h1q45 4 77 36
+t36 77v1h-1h-22v15h22h1v1q-4 45 -36 77t-77 36h-1v-1v-16h-15v16v1h-1q-45 -4 -77 -36t-36 -77v-1h1h22v-15h-22h-1v-1q4 -45 36 -77t77 -36h1v1v22h15zM255.5 184q57.5 0 97.5 40t40 97.5t-40 97.5t-97.5 40t-97.5 -40t-40 -97.5t40 -97.5t97.5 -40zM247 224v-23
+q-45 4 -76.5 35.5t-35.5 76.5h23v17h-23q4 45 35.5 76.5t76.5 35.5v-17h17v17q45 -4 76.5 -35.5t35.5 -76.5h-23v-17h23q-4 -45 -35.5 -76.5t-76.5 -35.5v23h-17zM223 289l114 -49l-49 114l-114 49zM201 376l61 -27l-34 -34zM336 241l-112 49l-49 112l112 -49zM200 377l2 -3
+l25 -59l1 -1l1 1l33 33l1 1l-1 1l-59 26zM338 239l-50 115l-115 50l50 -115zM202 375l60 -26l-34 -34z" />
+</svg>
diff --git a/scripts/icons/svg/image.svg b/scripts/icons/svg/image.svg
new file mode 100644
index 00000000000..c7df826129e
--- /dev/null
+++ b/scripts/icons/svg/image.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M324 0l118 116v377q0 8 -5.5 13.5t-13.5 5.5h-334q-8 0 -13.5 -5.5t-5.5 -13.5v-474q0 -8 5.5 -13.5t13.5 -5.5h235zM319 26v93h96zM91 491h330v-351h-123v-119h-207v470zM155 229q0 -18 13 -31t31.5 -13t31.5 13t13 31t-13 31t-31.5 13t-31.5 -13t-13 -31zM337 219
+l60 105v119v7h-281v-98l14 -12l33 -27l56 55l59 -110zM204 390l5 -12l-47 -45l-32 27l2 24l14 -17l24 29l24 -17zM360 355l15 -28l-45 -81l-46 31l-25 49l25 -11l34 34l28 -38z" />
+</svg>
diff --git a/scripts/icons/svg/network.svg b/scripts/icons/svg/network.svg
new file mode 100644
index 00000000000..f4d012a1fe4
--- /dev/null
+++ b/scripts/icons/svg/network.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M324 0l118 116v377q0 8 -5.5 13.5t-13.5 5.5h-334q-8 0 -13.5 -5.5t-5.5 -13.5v-474q0 -8 5.5 -13.5t13.5 -5.5h235zM319 26v93h96zM91 491h330v-351h-123v-119h-207v470zM114 250.5q0 -21.5 15 -36.5t36.5 -15t36.5 15t15 36.5t-15 36.5t-36.5 15t-36.5 -15t-15 -36.5z
+M155 406.5q0 -21.5 15 -37t36.5 -15.5t37 15.5t15.5 37t-15.5 36.5t-37 15t-36.5 -15t-15 -36.5zM270 234q0 -22 15 -37t36.5 -15t36.5 15t15 36.5t-15 37t-36 15.5q-9 0 -17 -3t-14 -7.5t-11 -11t-7.5 -14.5t-2.5 -16zM296 369.5q0 -21.5 15 -36.5t36.5 -15t36.5 15
+t15 36.5t-15 37t-36.5 15.5t-36.5 -15.5t-15 -37zM223 404q-1 1 -2 1.5t-3 0.5h-4t-6 -1t-6.5 -2t-3.5 -2.5t-1 -2.5t1 -3l107 -156q0 -1 1 -1.5t2.5 -0.5h4t6.5 1t6.5 2t3.5 2.5t1 2.5t-1 3zM154 254q-2 -1 -2.5 -2.5t-0.5 -3v-4t2 -5.5q1 -4 2.5 -6.5t3 -3.5t3 -0.5
+t3.5 1.5l184 131q2 0 2.5 1.5t0.5 3t-0.5 4t-1.5 5.5q-1 4 -2.5 6.5t-3 3.5t-3 0.5t-3.5 -1.5zM227 420v3t-1 2.5t-2.5 3t-4.5 3.5q-3 3 -5.5 4t-4.5 1.5t-3 -0.5t-1 -3l-55 -180q-1 -2 -1 -3t1 -2.5t3 -3t4 -3.5q4 -3 6.5 -4t4 -1t2.5 0.5t2 2.5zM361 356q1 1 0.5 2
+t-1.5 2.5t-2.5 3l-3.5 3.5l-6 4.5t-3.5 2t-2.5 0t-1 -1.5l-36 -139v-2t1 -2.5t2.5 -3t4.5 -3.5q3 -3 5.5 -4.5t3.5 -2t2 0t1 1.5z" />
+</svg>
diff --git a/scripts/icons/svg/other.svg b/scripts/icons/svg/other.svg
new file mode 100644
index 00000000000..82fc3892389
--- /dev/null
+++ b/scripts/icons/svg/other.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M324 0l118 116v377q0 8 -5.5 13.5t-13.5 5.5h-334q-8 0 -13.5 -5.5t-5.5 -13.5v-474q0 -8 5.5 -13.5t13.5 -5.5h235zM319 26v93h96zM91 491h330v-351h-123v-119h-207v470z" />
+</svg>
diff --git a/scripts/icons/svg/package.svg b/scripts/icons/svg/package.svg
new file mode 100644
index 00000000000..d465c0a9997
--- /dev/null
+++ b/scripts/icons/svg/package.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M324 0l118 116v377q0 8 -5.5 13.5t-13.5 5.5h-334q-8 0 -13.5 -5.5t-5.5 -13.5v-474q0 -8 5.5 -13.5t13.5 -5.5h235zM319 26v93h96zM91 491h330v-351h-123v-119h-207v470zM392 231v178q0 7 -6 8l-129 38v0h-1v0h-1.5h-0.5v0h-1v0l-129 -38q-7 -1 -7 -8v-178v0v-1l1 -1v0
+v-1v0v-1v0l1 -1v0v-1h1v0v-1h1v0v0l1 -1v0h1v0h1v-1l132 -35h5l125 36h1v0h1v0q1 0 1 1v0h1v1v0h1v1v0l1 1v0v1v0v1v0v1v1zM246 435v-161l-111 -32v161zM255 259l40 -12l58 -16l-95 -27l-100 27l64 19zM375 403v-161l-111 32v161z" />
+</svg>
diff --git a/scripts/icons/svg/tabular.svg b/scripts/icons/svg/tabular.svg
new file mode 100644
index 00000000000..fcd32098dce
--- /dev/null
+++ b/scripts/icons/svg/tabular.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M324 0l118 116v377q0 8 -5.5 13.5t-13.5 5.5h-334q-8 0 -13.5 -5.5t-5.5 -13.5v-474q0 -8 5.5 -13.5t13.5 -5.5h235zM319 26v93h96zM91 491h330v-351h-123v-119h-207v470zM116 218h281v200h-281v-200zM218 291h76v-36h-76v36zM294 308h-76v41h76v-41zM132 255v36h69v-36
+h-69zM132 308v41h69v-41h-69zM132 401h69v-36h-69v36zM218 401h76v-36h-76v36zM380 401v-36h-69v36h69zM380 349v-41h-69v41h69zM311 291h69v-36h-69v36z" />
+</svg>
diff --git a/scripts/icons/svg/unlock.svg b/scripts/icons/svg/unlock.svg
new file mode 100644
index 00000000000..80f6de53190
--- /dev/null
+++ b/scripts/icons/svg/unlock.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M476 474q0 16 -11 27t-27 11h-362q-15 0 -26.5 -11t-11.5 -27v-242q0 -16 11.5 -27.5t26.5 -11.5h362q16 0 27 11.5t11 27.5v242zM366 51l20 52l-73 29l-13 -34q-3 -8 -11 -11.5t-17 -0.5l-72 29q-9 3 -12.5 11t0.5 16l62 159l-74 30l-70 -178q-12 -31 1.5 -61.5
+t44.5 -42.5l109 -43q31 -13 61.5 0.5t43.5 44.5z" />
+</svg>
diff --git a/scripts/icons/svg/video.svg b/scripts/icons/svg/video.svg
new file mode 100644
index 00000000000..238e275c4a9
--- /dev/null
+++ b/scripts/icons/svg/video.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="-10 0 522 512">
+   <path fill="currentColor"
+d="M324 0l118 116v377q0 8 -5.5 13.5t-13.5 5.5h-334q-8 0 -13.5 -5.5t-5.5 -13.5v-474q0 -8 5.5 -13.5t13.5 -5.5h235zM319 26v93h96zM91 491h330v-351h-123v-119h-207v470zM393 293v136l-80 -46v54h-194v-141h25q-27 -13 -27 -43q0 -20 14.5 -34t34.5 -14t34 14t14 34
+q0 30 -26 43h57q-26 -13 -26 -43q0 -20 14 -34t34 -14t34.5 14t14.5 34q0 30 -27 43h24v43z" />
+</svg>
diff --git a/scripts/installer/Makefile b/scripts/installer/Makefile
index fda5c7cf3a6..8ea95534986 100644
--- a/scripts/installer/Makefile
+++ b/scripts/installer/Makefile
@@ -1,35 +1,34 @@
 INSTALLER_ZIP_DIR=dvinstall
 DISTRIBUTION_WAR_FILE=${INSTALLER_ZIP_DIR}/dataverse.war
-GLASSFISH_SETUP_SCRIPT=${INSTALLER_ZIP_DIR}/glassfish-setup.sh
-POSTGRES_DRIVERS=${INSTALLER_ZIP_DIR}/pgdriver
+GLASSFISH_SETUP_SCRIPT=${INSTALLER_ZIP_DIR}/as-setup.sh
 API_SCRIPTS=${INSTALLER_ZIP_DIR}/setup-datasetfields.sh ${INSTALLER_ZIP_DIR}/setup-users.sh ${INSTALLER_ZIP_DIR}/setup-builtin-roles.sh ${INSTALLER_ZIP_DIR}/setup-dvs.sh ${INSTALLER_ZIP_DIR}/data ${INSTALLER_ZIP_DIR}/setup-identity-providers.sh  ${INSTALLER_ZIP_DIR}/setup-all.sh ${INSTALLER_ZIP_DIR}/post-install-api-block.sh
-DB_SCRIPT=${INSTALLER_ZIP_DIR}/reference_data.sql
 JHOVE_CONFIG=${INSTALLER_ZIP_DIR}/jhove.conf
 JHOVE_SCHEMA=${INSTALLER_ZIP_DIR}/jhoveConfig.xsd
-SOLR_SCHEMA=${INSTALLER_ZIP_DIR}/schema.xml ${INSTALLER_ZIP_DIR}/schema_dv_mdb_fields.xml ${INSTALLER_ZIP_DIR}/schema_dv_mdb_copies.xml ${INSTALLER_ZIP_DIR}/updateSchemaMDB.sh
+SOLR_SCHEMA=${INSTALLER_ZIP_DIR}/schema.xml ${INSTALLER_ZIP_DIR}/update-fields.sh
 SOLR_CONFIG=${INSTALLER_ZIP_DIR}/solrconfig.xml
-INSTALL_SCRIPT=${INSTALLER_ZIP_DIR}/install
+PYTHON_FILES=${INSTALLER_ZIP_DIR}/README_python.txt ${INSTALLER_ZIP_DIR}/installConfig.py ${INSTALLER_ZIP_DIR}/installUtils.py ${INSTALLER_ZIP_DIR}/install.py ${INSTALLER_ZIP_DIR}/installAppServer.py ${INSTALLER_ZIP_DIR}/requirements.txt ${INSTALLER_ZIP_DIR}/default.config ${INSTALLER_ZIP_DIR}/interactive.config
 
 installer:	dvinstall.zip
 
 clean: 
 	/bin/rm -rf ${INSTALLER_ZIP_DIR} dvinstall.zip
 
-dvinstall.zip:	${GLASSFISH_SETUP_SCRIPT} ${POSTGRES_DRIVERS} ${DISTRIBUTION_WAR_FILE} ${API_SCRIPTS} ${DB_SCRIPT} ${JHOVE_CONFIG} ${JHOVE_SCHEMA} ${SOLR_SCHEMA} ${SOLR_CONFIG} ${INSTALL_SCRIPT}
+dvinstall.zip:	${GLASSFISH_SETUP_SCRIPT} ${JSF_PATCH_DIR} ${DISTRIBUTION_WAR_FILE} ${API_SCRIPTS} ${JHOVE_CONFIG} ${JHOVE_SCHEMA} ${SOLR_SCHEMA} ${SOLR_CONFIG} ${PYTHON_FILES} ${INSTALL_SCRIPT}
 	@echo making installer...
-	zip -r dvinstall.zip ${GLASSFISH_SETUP_SCRIPT} ${POSTGRES_DRIVERS} ${DISTRIBUTION_WAR_FILE} ${API_SCRIPTS} ${DB_SCRIPT} ${JHOVE_CONFIG} ${JHOVE_SCHEMA} ${SOLR_SCHEMA} ${SOLR_CONFIG} ${INSTALL_SCRIPT}
+	zip -r dvinstall.zip ${GLASSFISH_SETUP_SCRIPT} ${JSF_PATCH_DIR} ${DISTRIBUTION_WAR_FILE} ${API_SCRIPTS} ${JHOVE_CONFIG} ${JHOVE_SCHEMA} ${SOLR_SCHEMA} ${SOLR_CONFIG} ${PYTHON_FILES} ${INSTALL_SCRIPT}
 	@echo 
 	@echo "Done!"
 
-${INSTALL_SCRIPT}: install
-	@echo copying the installer script
+${INSTALLER_ZIP_DIR}:
 	mkdir -p ${INSTALLER_ZIP_DIR}
+
+${INSTALL_SCRIPT}: install ${INSTALLER_ZIP_DIR}
+	@echo copying the installer script
 	/bin/cp install ${INSTALLER_ZIP_DIR}
 
 ${DISTRIBUTION_WAR_FILE}: 
 	@echo copying war file...
-	@mkdir -p ${INSTALLER_ZIP_DIR}
-	@VERSION_NUMBER=`grep -m1 '<version>' ../../pom.xml | sed 's/ *<\/*version>//g'`; export VERSION_NUMBER; \
+	@VERSION_NUMBER=`grep -m1 '<revision>' ../../modules/dataverse-parent/pom.xml | sed 's/ *<\/*revision>//g'`; export VERSION_NUMBER; \
 	BUILT_WAR_FILE=../../target/dataverse-$$VERSION_NUMBER.war; export BUILT_WAR_FILE; \
 	if [ -f $$BUILT_WAR_FILE ]; \
 	then \
@@ -40,42 +39,30 @@ ${DISTRIBUTION_WAR_FILE}:
 		exit 1; \
 	fi
 
-${GLASSFISH_SETUP_SCRIPT}:	glassfish-setup.sh
+${GLASSFISH_SETUP_SCRIPT}:	as-setup.sh ${INSTALLER_ZIP_DIR}
 	@echo copying glassfish setup
-	mkdir -p ${INSTALLER_ZIP_DIR}
-	/bin/cp glassfish-setup.sh ${INSTALLER_ZIP_DIR}
+	/bin/cp as-setup.sh ${INSTALLER_ZIP_DIR}
 
-${POSTGRES_DRIVERS}:	 pgdriver/postgresql-42.2.2.jar
-	@echo copying postgres driver
-	@mkdir -p ${POSTGRES_DRIVERS}
-	/bin/cp pgdriver/postgresql-42.2.2.jar ${INSTALLER_ZIP_DIR}/pgdriver
-
-${API_SCRIPTS}:	../api/setup-datasetfields.sh ../api/setup-users.sh ../api/setup-dvs.sh ../api/setup-identity-providers.sh ../api/setup-all.sh ../api/post-install-api-block.sh ../api/setup-builtin-roles.sh ../api/data
+${API_SCRIPTS}:	../api/setup-datasetfields.sh ../api/setup-users.sh ../api/setup-dvs.sh ../api/setup-identity-providers.sh ../api/setup-all.sh ../api/post-install-api-block.sh ../api/setup-builtin-roles.sh ../api/data ${INSTALLER_ZIP_DIR}
 	@echo copying api scripts
-	@mkdir -p ${INSTALLER_ZIP_DIR}
 	/bin/cp -R ../api/setup-datasetfields.sh ../api/setup-users.sh ../api/setup-dvs.sh ../api/setup-identity-providers.sh ../api/setup-all.sh ../api/post-install-api-block.sh ../api/setup-builtin-roles.sh ../api/data ${INSTALLER_ZIP_DIR}
 
-${DB_SCRIPT}:	../database/reference_data.sql
-	@echo copying reference data sql script
-	@mkdir -p ${INSTALLER_ZIP_DIR}
-	/bin/cp ../database/reference_data.sql ${INSTALLER_ZIP_DIR}
-
-${JHOVE_CONFIG}:	../../conf/jhove/jhove.conf
+${JHOVE_CONFIG}:	../../conf/jhove/jhove.conf ${INSTALLER_ZIP_DIR}
 	@echo copying jhove config file
-	@mkdir -p ${INSTALLER_ZIP_DIR}
 	/bin/cp ../../conf/jhove/jhove.conf ${INSTALLER_ZIP_DIR}
 
-${JHOVE_SCHEMA}:	../../conf/jhove/jhoveConfig.xsd
+${JHOVE_SCHEMA}:	../../conf/jhove/jhoveConfig.xsd ${INSTALLER_ZIP_DIR}
 	@echo copying jhove schema file
-	@mkdir -p ${INSTALLER_ZIP_DIR}
 	/bin/cp ../../conf/jhove/jhoveConfig.xsd ${INSTALLER_ZIP_DIR}
 
-${SOLR_SCHEMA}:		../../conf/solr/7.3.1/schema.xml ../../conf/solr/7.3.1/schema_dv_mdb_fields.xml ../../conf/solr/7.3.1/schema_dv_mdb_copies.xml ../../conf/solr/7.3.1/updateSchemaMDB.sh
+${SOLR_SCHEMA}:		../../conf/solr/schema.xml ../../conf/solr/update-fields.sh ${INSTALLER_ZIP_DIR}
 	@echo copying Solr schema file
-	@mkdir -p ${INSTALLER_ZIP_DIR}
-	/bin/cp ../../conf/solr/7.3.1/schema*.xml ../../conf/solr/7.3.1/updateSchemaMDB.sh ${INSTALLER_ZIP_DIR}
+	/bin/cp ../../conf/solr/schema.xml ../../conf/solr/update-fields.sh ${INSTALLER_ZIP_DIR}
 
-${SOLR_CONFIG}:		../../conf/solr/7.3.1/solrconfig.xml
+${SOLR_CONFIG}:		../../conf/solr/solrconfig.xml ${INSTALLER_ZIP_DIR}
 	@echo copying Solr config file
-	@mkdir -p ${INSTALLER_ZIP_DIR}
-	/bin/cp ../../conf/solr/7.3.1/solrconfig.xml ${INSTALLER_ZIP_DIR}
+	/bin/cp ../../conf/solr/solrconfig.xml ${INSTALLER_ZIP_DIR}
+
+${PYTHON_FILES}: README_python.txt install.py installConfig.py installAppServer.py installUtils.py requirements.txt default.config interactive.config ${INSTALLER_ZIP_DIR}
+	@echo copying Python installer files
+	/bin/cp README_python.txt install.py installConfig.py installAppServer.py installUtils.py requirements.txt default.config interactive.config ${INSTALLER_ZIP_DIR}
diff --git a/scripts/installer/README.txt b/scripts/installer/README.txt
index 4407f179be0..c3ed8211082 100644
--- a/scripts/installer/README.txt
+++ b/scripts/installer/README.txt
@@ -1,48 +1 @@
-The installer script (install) can be run either by a developer (inside the source tree), or by an end-user installing the Dataverse. The latter will obtain the script as part of the distribution bundle; and they will be running it inside the unzipped bundle directory. 
-
-In the former (developer) case, the installer will be looking for the files it needs in the other directories in the source tree. 
-For example, the war file (once built) can be found in ../../target/. The name of the war file will be dataverse-{VERSION}.war, where
-{VERSION} is the version number of the Dataverse, obtained from the pom file (../../pom.xml). For example, as of writing this README.txt (July 2015) the war file is ../../target/dataverse-4.1.war/
-
-When building a distribution archive, the Makefile will pile all the files that the installer needs in one directory (./dvinstall here) and then zip it up. We upload the resulting zip bundle on github as the actual software release. This way the end user only gets the files they actually need to install the Dataverse app. So they can do so without pulling the entire source tree. 
-
-
-The installer script itself (the perl script ./install) knows to look for all these files in 2 places (for example, it will look for the war file in ../../target/; if it's not there, it'll assume this is a distribution bundle and look for it as ./dataverse.war)
-
-Here's the list of the files that the installer needs: 
-
-the war file:
-target/dataverse-{VERSION}.war
-
-and also:
-
-from scripts/installer (this directory):
-
-install
-glassfish-setup.sh
-pgdriver (the entire directory with all its contents)
-
-from scripts/api:
-
-setup-all.sh
-setup-builtin-roles.sh
-setup-datasetfields.sh
-setup-dvs.sh
-setup-identity-providers.sh
-setup-users.sh
-data (the entire directory with all its contents)
-
-from scripts/database:
-
-reference_data.sql
-
-from conf/jhove:
-
-jhove.conf
-
-SOLR schema and config files, from conf/solr/7.3.1: 
-
-schema.xml
-schema_dv_cmb_copies.xml
-schema_dv_cmb_fields.xml
-solrconfig.xml
+See README_python.txt
diff --git a/scripts/installer/README_python.txt b/scripts/installer/README_python.txt
new file mode 100644
index 00000000000..13abfeb1941
--- /dev/null
+++ b/scripts/installer/README_python.txt
@@ -0,0 +1,77 @@
+Introduction
+============
+
+The new installer script written in Python is intended to replace the
+old installer, written in Perl.  It has been implemented to work
+exactly as the old one, supporting all the same options, etc.
+
+Requirements
+============
+
+The script should work with both Python v. 2 and 3. It was tested with
+v. 2.7.16 and v. 3.7.16.  Version 3.7 or newer is strongly
+recommended, since the version 2 has been officially EOL-ed as of
+Jan. 1 2020. If you have to use Python 2, we intend to maintain
+backward compatibility, for now, but please use version 2.7 or newer.
+
+
+The extra module psycopg2 (PostgreSQL client) is required. The
+installer has been tested with psycopg2 version 2.8.4. 
+
+We recommend that you try installing the "binary", pre-built version of the package:
+
+pip install psycopg2-binary
+
+(or "pip3 install psycopg2-binary" if you intend to use python3 and it's
+installed separately on your system)
+
+If for whatever reason the binary psycopg2 package doesn't run
+properly on your system, you can try the more complex process of
+making pip build it from sources:
+
+pip3 install psycopg2
+
+This will require compilers to be properly installed on your system.
+(On MacOS, you'll need XCode installed). 
+In order to link with the PostgresQL libraries, pip will need to
+execute pg_config, PostgreSQL configuration utility. Make sure it is
+in your PATH. If you have multiple versions of PostgresQL installed,
+make sure the version that you will be using with Dataverse is the
+first on your PATH. For example,
+
+   PATH=/usr/pgsql-16/bin:$PATH; export PATH
+
+Certain libraries and source include files, both for PostgresQL and
+Python, are also needed to compile the module. On
+RedHat/CentOS/etc. you may need to install the -devel packages, *for
+the specific versions* of PostgreSQL and Python you will be using. For
+example:
+
+	yum install postgresql16-devel
+	yum install python37-devel
+	etc. 
+
+On MacOS, all the needed libraries and source files appear to be
+included by default with standard distributions of PostgreSQL and
+Python.
+
+
+Howto
+=====
+
+Run the new installer script as 
+
+python install.py
+
+or 
+
+python3 install.py
+(if python3 is installed separately from the default version 2)
+
+If you run into any problems, or have any suggestions, please let us
+know. Once again, this is still a beta/experimental version.
+
+And if getting it to work on your system ends up being too much
+trouble, there's always an option of going back to the old, default
+installer.
+
diff --git a/scripts/installer/as-setup.sh b/scripts/installer/as-setup.sh
new file mode 100755
index 00000000000..68a53270114
--- /dev/null
+++ b/scripts/installer/as-setup.sh
@@ -0,0 +1,334 @@
+#!/bin/bash
+# YOU (THE HUMAN USER) SHOULD NEVER RUN THIS SCRIPT DIRECTLY!
+# It should be run by higher-level installers. 
+# The following arguments should be passed to it 
+# as environmental variables: 
+# (no defaults for these values are provided here!)
+#
+# app. server (payara) configuration: 
+# the variables used by this script still has the word "glassfish" in them.
+# this is kept as legacy, just to avoid unncessary changes.
+# GLASSFISH_ROOT
+# GLASSFISH_DOMAIN
+# ASADMIN_OPTS
+# MEM_HEAP_SIZE
+# GLASSFISH_REQUEST_TIMEOUT
+#
+# database configuration: 
+# DB_PORT
+# DB_HOST
+# DB_NAME
+# DB_USER
+# DB_PASS
+#
+# Rserve configuration: 
+# RSERVE_HOST
+# RSERVE_PORT
+# RSERVE_USER
+# RSERVE_PASS
+#
+# DOI configuration:
+# DOI_USERNAME
+# DOI_PASSWORD
+# DOI_BASEURL
+#
+# Base URL the DataCite REST API (Make Data Count, /pids API): 
+# DOI_DATACITERESTAPIURL
+#
+# other local configuration:
+# HOST_ADDRESS
+# SMTP_SERVER
+# FILES_DIR
+
+# The script is going to fail and exit if any of the
+# parameters aren't supplied. It is the job of the 
+# parent script to set all these env. variables, 
+# providing default values, if none are supplied by 
+# the user, etc. 
+
+# This script has two big functions: preliminary_setup and final_setup
+# In the use of a container, only final_setup is called
+function preliminary_setup()
+{
+    # undeploy the app, if running: 
+
+  ./asadmin $ASADMIN_OPTS undeploy dataverse
+
+  # avoid OutOfMemoryError: PermGen per http://eugenedvorkin.com/java-lang-outofmemoryerror-permgen-space-error-during-deployment-to-glassfish/
+  #./asadmin $ASADMIN_OPTS list-jvm-options
+  # Note that these JVM options are different for Payara and Glassfish4:
+  # old Glassfish4 options: (commented out)
+  #./asadmin $ASADMIN_OPTS delete-jvm-options "-XX\:MaxPermSize=192m"
+  #./asadmin $ASADMIN_OPTS create-jvm-options "-XX\:MaxPermSize=512m"
+  #./asadmin $ASADMIN_OPTS create-jvm-options "-XX\:PermSize=256m"
+  # Payara ships with the "-server" option already in domain.xml, so no need:
+  #./asadmin $ASADMIN_OPTS delete-jvm-options -client
+
+  # new Payara options: (thanks to donsizemore@unc.edu)
+  ./asadmin $ASADMIN_OPTS create-jvm-options "-XX\:MaxMetaspaceSize=512m"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "-XX\:MetaspaceSize=256m"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "-Dfish.payara.classloading.delegate=false"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "-XX\:+UseG1GC"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "-XX\:+UseStringDeduplication"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "-XX\:+DisableExplicitGC"
+
+  # alias passwords
+  for alias in "rserve_password_alias ${RSERVE_PASS}" "doi_password_alias ${DOI_PASSWORD}" "dataverse.db.password ${DB_PASS}"
+  do
+      set -- $alias
+      echo "AS_ADMIN_ALIASPASSWORD=$2" > /tmp/$1.txt
+      ./asadmin $ASADMIN_OPTS create-password-alias --passwordfile /tmp/$1.txt $1
+      rm /tmp/$1.txt
+  done
+
+  ###
+  # Add the Dataverse-specific JVM options: 
+  # 
+  # location of the datafiles temp directory: 
+  # (defaults to dataverse/files in the users home directory, ${FILES_DIR}/temp if this is set)
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.directory=${FILES_DIR}"
+  # Backward compatible file store configuration
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.file.type=file"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.file.label=file"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.file.directory=${FILES_DIR}"
+  # Rserve-related JVM options: 
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.rserve.host=${RSERVE_HOST}"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.rserve.port=${RSERVE_PORT}"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.rserve.user=${RSERVE_USER}"
+  ./asadmin $ASADMIN_OPTS create-jvm-options '\-Ddataverse.rserve.password=${ALIAS=rserve_password_alias}'
+  # The host and url addresses this Dataverse will be using:
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.fqdn=${HOST_ADDRESS}"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.siteUrl=http\://\${dataverse.fqdn}\:8080"
+  # password reset token timeout in minutes
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.auth.password-reset-timeout-in-minutes=60"
+
+  # Fake DOI Settings
+  # (we can no longer offer EZID with their shared test account)
+  # jvm-options use colons as separators, escape as literal
+  DOI_BASEURL_ESC=`echo $DOI_BASEURL | sed -e 's/:/\\\:/'`
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.providers=fake"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.fake.type=FAKE"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.fake.label=Fake DOI Provider"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.fake.authority=10.5072"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.fake.shoulder=FK2/"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.default-provider=fake"
+  # jvm-options use colons as separators, escape as literal
+  #DOI_DATACITERESTAPIURL_ESC=`echo $DOI_DATACITERESTAPIURL | sed -e 's/:/\\\:/'`
+  #./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.testDC.datacite.rest-api-url=$DOI_DATACITERESTAPIURL_ESC"
+
+  ./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.timerServer=true"
+
+  # enable comet support
+  ./asadmin $ASADMIN_OPTS set server-config.network-config.protocols.protocol.http-listener-1.http.comet-support-enabled="true"
+
+  # bump the http-listener timeout from 900 to 3600
+  ./asadmin $ASADMIN_OPTS set server-config.network-config.protocols.protocol.http-listener-1.http.request-timeout-seconds="${GLASSFISH_REQUEST_TIMEOUT}"
+
+  # Set SameSite cookie value: https://docs.payara.fish/community/docs/6.2024.6/Technical%20Documentation/Payara%20Server%20Documentation/General%20Administration/Administering%20HTTP%20Connectivity.html
+  ./asadmin $ASADMIN_OPTS set server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-value="Lax"
+  ./asadmin $ASADMIN_OPTS set server-config.network-config.protocols.protocol.http-listener-1.http.cookie-same-site-enabled="true"
+
+  # so we can front with apache httpd ( ProxyPass / ajp://localhost:8009/ )
+  ./asadmin $ASADMIN_OPTS create-network-listener --protocol http-listener-1 --listenerport 8009 --jkenabled true jk-connector
+}
+
+function final_setup(){
+        ./asadmin $ASADMIN_OPTS delete-jvm-options -Xmx512m
+        ./asadmin $ASADMIN_OPTS create-jvm-options "-Xmx${MEM_HEAP_SIZE}m"
+
+         # Set up the database connection properties
+        ./asadmin $ASADMIN_OPTS create-system-properties "dataverse.db.user=${DB_USER}"
+        ./asadmin $ASADMIN_OPTS create-system-properties "dataverse.db.host=${DB_HOST}"
+        ./asadmin $ASADMIN_OPTS create-system-properties "dataverse.db.port=${DB_PORT}"
+        ./asadmin $ASADMIN_OPTS create-system-properties "dataverse.db.name=${DB_NAME}"
+
+        ./asadmin $ASADMIN_OPTS create-jvm-options "\-Djavax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl"
+
+	### 
+	# Mail server setup: 
+	# delete any existing mail/notifyMailSession; configure port, if provided:
+
+	./asadmin delete-javamail-resource mail/notifyMailSession
+	./asadmin $ASADMIN_OPTS create-system-properties "dataverse.mail.system-email='${ADMIN_EMAIL}'"
+  ./asadmin $ASADMIN_OPTS create-system-properties "dataverse.mail.mta.host='${SMTP_SERVER}'"
+	if [ "x${SMTP_SERVER_PORT}" != "x" ]; then
+    ./asadmin $ASADMIN_OPTS create-system-properties "dataverse.mail.mta.port='${SMTP_SERVER_PORT}'"
+	fi
+
+}
+
+if [ "$DOCKER_BUILD" = "true" ]
+  then
+    FILES_DIR="/usr/local/payara6/glassfish/domains/domain1/files"
+    RSERVE_HOST="localhost"
+    RSERVE_PORT="6311"
+    RSERVE_USER="rserve"
+    RSERVE_PASS="rserve"
+    HOST_ADDRESS="localhost\:8080"
+    pushd /usr/local/payara6/glassfish/bin/
+    ./asadmin start-domain domain1
+    preliminary_setup
+    chmod -R 777 /usr/local/payara6/
+    rm -rf /usr/local/payara6/glassfish/domains/domain1/generated
+    rm -rf /usr/local/payara6/glassfish/domains/domain1/applications
+    popd
+    exit 0
+fi
+
+
+if [ -z "$DB_NAME" ]
+ then
+  echo "You must specify database name (DB_NAME)."
+  echo "PLEASE NOTE THAT YOU (THE HUMAN USER) SHOULD NEVER RUN THIS SCRIPT DIRECTLY!"
+  echo "IT SHOULD ONLY BE RUN BY OTHER SCRIPTS."
+  exit 1
+fi
+
+if [ -z "$DB_PORT" ]
+ then
+  echo "You must specify database port (DB_PORT)."
+  exit 1
+fi
+
+if [ -z "$DB_HOST" ]
+ then
+  echo "You must specify database host (DB_HOST)."
+  exit 1
+fi
+
+if [ -z "$DB_USER" ]
+ then
+  echo "You must specify database user (DB_USER)."
+  exit 1
+fi
+
+if [ -z "$DB_PASS" ]
+ then
+  echo "You must specify database password (DB_PASS)."
+  exit 1
+fi
+
+if [ -z "$RSERVE_HOST" ]
+ then
+  echo "You must specify Rserve host (RSERVE_HOST)."
+  exit 1
+fi
+
+if [ -z "$RSERVE_PORT" ]
+ then
+  echo "You must specify Rserve port (RSERVE_PORT)."
+  exit 1
+fi
+
+if [ -z "$RSERVE_USER" ]
+ then
+  echo "You must specify Rserve user (RSERVE_USER)."
+  exit 1
+fi
+
+if [ -z "$RSERVE_PASS" ]
+ then
+  echo "You must specify Rserve password (RSERVE_PASS)."
+  exit 1
+fi
+
+if [ -z "$SMTP_SERVER" ]
+ then
+  echo "You must specify smtp server (SMTP_SERVER)."
+  exit 1
+fi
+
+if [ -z "$HOST_ADDRESS" ]
+ then
+  echo "You must specify host address (HOST_ADDRESS)."
+  exit 1
+fi
+
+if [ -z "$FILES_DIR" ]
+ then
+  echo "You must specify files directory (FILES_DIR)."
+  exit 1
+fi
+
+if [ -z "$MEM_HEAP_SIZE" ]
+ then
+  echo "You must specify the memory heap size for glassfish (MEM_HEAP_SIZE)."
+  exit 1
+fi
+
+if [ -z "$GLASSFISH_DOMAIN" ]
+ then
+  echo "You must specify glassfish domain (GLASSFISH_DOMAIN)."
+  exit 1
+fi
+
+echo "checking glassfish root:"${GLASSFISH_ROOT}
+
+if [ ! -d "$GLASSFISH_ROOT" ]
+  then
+    echo Glassfish root '$GLASSFISH_ROOT' does not exist
+    exit 1
+fi
+GLASSFISH_BIN_DIR=$GLASSFISH_ROOT/bin
+
+echo "checking glassfish domain:"${GLASSFISH_ROOT}/glassfish/domains/$GLASSFISH_DOMAIN
+
+DOMAIN_DIR=$GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN
+if [ ! -d "$DOMAIN_DIR" ]
+  then
+    echo Domain directory '$DOMAIN_DIR' does not exist
+    exit 2
+fi
+
+if [ -z "$ADMIN_EMAIL" ]
+ then
+  echo "You must specify the system admin email address (ADMIN_EMAIL)."
+  exit 1
+fi
+
+echo "Setting up your app. server (Payara) to support Dataverse"
+echo "Payara directory: "$GLASSFISH_ROOT
+echo "Domain directory:    "$DOMAIN_DIR
+
+# Move to the payara dir
+pushd $GLASSFISH_BIN_DIR
+
+###
+# take the domain up, if needed.
+DOMAIN_DOWN=$(./asadmin list-domains | grep "$DOMAIN " | grep "not running")
+if [  $(echo $DOMAIN_DOWN|wc -c) -ne 1  ];
+  then
+    echo Trying to start domain $GLASSFISH_DOMAIN up...
+    ./asadmin $ASADMIN_OPTS start-domain $GLASSFISH_DOMAIN
+  else
+    echo domain running
+fi
+
+
+if [ -z "$MY_POD_NAME" ]
+ then
+    preliminary_setup
+    final_setup
+ else
+    echo $MY_POD_NAME
+    if [ $MY_POD_NAME == "dataverse-glassfish-0" ]
+      then
+        echo "I am in a container so I am doing much less"
+            final_setup
+    fi
+fi
+
+###
+# Restart
+echo Updates done. Restarting...
+# encountered cases where `restart-domain` timed out, but `stop` -> `start` didn't.
+./asadmin $ASADMIN_OPTS stop-domain $GLASSFISH_DOMAIN
+./asadmin $ASADMIN_OPTS start-domain $GLASSFISH_DOMAIN
+
+###
+# Clean up
+popd
+
+echo "Payara setup complete"
+date
+
diff --git a/scripts/installer/default.config b/scripts/installer/default.config
new file mode 100644
index 00000000000..8647cd02416
--- /dev/null
+++ b/scripts/installer/default.config
@@ -0,0 +1,34 @@
+[glassfish]
+HOST_DNS_ADDRESS = localhost
+GLASSFISH_USER = dataverse
+GLASSFISH_DIRECTORY = /usr/local/payara6
+GLASSFISH_ADMIN_USER = admin
+GLASSFISH_ADMIN_PASSWORD = secret
+GLASSFISH_HEAP = 2048
+GLASSFISH_REQUEST_TIMEOUT = 1800
+
+[database]
+POSTGRES_ONLY = false
+POSTGRES_SERVER = localhost
+POSTGRES_PORT = 5432
+POSTGRES_DATABASE = dvndb
+POSTGRES_USER = dvnapp
+POSTGRES_PASSWORD = secret
+POSTGRES_ADMIN_PASSWORD = secret
+
+[system]
+ADMIN_EMAIL = 
+MAIL_SERVER = localhost
+SOLR_LOCATION = LOCAL
+
+[rserve]
+RSERVE_HOST = localhost
+RSERVE_PORT = 6311
+RSERVE_USER = rserve
+RSERVE_PASSWORD = rserve
+
+[doi]
+DOI_USERNAME = dataciteuser
+DOI_PASSWORD = datacitepassword
+DOI_BASEURL = https://mds.test.datacite.org
+DOI_DATACITERESTAPIURL = https://api.test.datacite.org
diff --git a/scripts/installer/ec2-create-instance.sh b/scripts/installer/ec2-create-instance.sh
index 63e9ac21bc6..fb8e122b99e 100755
--- a/scripts/installer/ec2-create-instance.sh
+++ b/scripts/installer/ec2-create-instance.sh
@@ -1,149 +1,4 @@
-#!/bin/bash -e
+#!/bin/sh
 
-# For docs, see the "Deployment" page in the Dev Guide.
-
-# repo and branch defaults
-REPO_URL='https://github.com/IQSS/dataverse.git'
-BRANCH='develop'
-PEM_DEFAULT=${HOME}
-
-usage() {
-  echo "Usage: $0 -b <branch> -r <repo> -p <pem_dir> -g <group_vars>" 1>&2
-  echo "default branch is develop"
-  echo "default repo is https://github.com/IQSS/dataverse"
-  echo "default .pem location is ${HOME}"
-  echo "example group_vars may be retrieved from https://raw.githubusercontent.com/IQSS/dataverse-ansible/master/defaults/main.yml"
-  exit 1
-}
-
-while getopts ":r:b:g:p:" o; do
-  case "${o}" in
-  r)
-    REPO_URL=${OPTARG}
-    ;;
-  b)
-    BRANCH=${OPTARG}
-    ;;
-  g)
-    GRPVRS=${OPTARG}
-    ;;
-  p)
-    PEM_DIR=${OPTARG}
-    ;;
-  *)
-    usage
-    ;;
-  esac
-done
-
-# test for user-supplied conf files
-if [ ! -z "$GRPVRS" ]; then
-   GVFILE=$(basename "$GRPVRS")
-   GVARG="-e @$GVFILE"
-   echo "using $GRPVRS for extra vars"
-fi
-
-if [ ! -z "$REPO_URL" ]; then
-   GVARG+=" -e dataverse_repo=$REPO_URL"
-   echo "using $REPO_URL"
-fi
-
-if [ ! -z "$BRANCH" ]; then
-   GVARG+=" -e dataverse_branch=$BRANCH"
-   echo "building $BRANCH"
-fi
-
-if [ -z "$PEM_DIR" ]; then
-   PEM_DIR="$PEM_DEFAULT"
-   echo "using $PEM_DIR"
-fi
-
-AWS_CLI_VERSION=$(aws --version)
-if [[ "$?" -ne 0 ]]; then
-  echo 'The "aws" program could not be executed. Is it in your $PATH?'
-  exit 1
-fi
-
-if [[ $(git ls-remote --heads $REPO_URL $BRANCH | wc -l) -eq 0 ]]; then
-  echo "Branch \"$BRANCH\" does not exist at $REPO_URL"
-  usage
-  exit 1
-fi
-
-SECURITY_GROUP='dataverse-sg'
-GROUP_CHECK=$(aws ec2 describe-security-groups --group-name $SECURITY_GROUP)
-if [[ "$?" -ne 0 ]]; then
-  echo "Creating security group \"$SECURITY_GROUP\"."
-  aws ec2 create-security-group --group-name $SECURITY_GROUP --description "security group for Dataverse"
-  aws ec2 authorize-security-group-ingress --group-name $SECURITY_GROUP --protocol tcp --port 22 --cidr 0.0.0.0/0
-  aws ec2 authorize-security-group-ingress --group-name $SECURITY_GROUP --protocol tcp --port 80 --cidr 0.0.0.0/0
-  aws ec2 authorize-security-group-ingress --group-name $SECURITY_GROUP --protocol tcp --port 443 --cidr 0.0.0.0/0
-  aws ec2 authorize-security-group-ingress --group-name $SECURITY_GROUP --protocol tcp --port 8080 --cidr 0.0.0.0/0
-fi
-
-RANDOM_STRING="$(uuidgen | cut -c-8)"
-KEY_NAME="key-$USER-$RANDOM_STRING"
-
-PRIVATE_KEY=$(aws ec2 create-key-pair --key-name $PEM_DIR/$KEY_NAME --query 'KeyMaterial' --output text)
-if [[ $PRIVATE_KEY == '-----BEGIN RSA PRIVATE KEY-----'* ]]; then
-  PEM_FILE="$PEM_DIR/$KEY_NAME.pem"
-  printf -- "$PRIVATE_KEY" >$PEM_FILE
-  chmod 400 $PEM_FILE
-  echo "Your newly created private key file is \"$PEM_FILE\". Keep it secret. Keep it safe."
-else
-  echo "Could not create key pair. Exiting."
-  exit 1
-fi
-
-# The AMI ID may change in the future and the way to look it up is with the
-# following command, which takes a long time to run:
-#
-# aws ec2 describe-images  --owners 'aws-marketplace' --filters 'Name=product-code,Values=aw0evgkw8e5c1q413zgy5pjce' --query 'sort_by(Images, &CreationDate)[-1].[ImageId]' --output 'text'
-#
-# To use this AMI, we subscribed to it from the AWS GUI.
-# AMI IDs are specific to the region.
-AMI_ID='ami-9887c6e7'
-# Smaller than medium lead to Maven and Solr problems.
-SIZE='t2.medium'
-echo "Creating EC2 instance"
-# TODO: Add some error checking for "ec2 run-instances".
-INSTANCE_ID=$(aws ec2 run-instances --image-id $AMI_ID --security-groups $SECURITY_GROUP --count 1 --instance-type $SIZE --key-name $PEM_DIR/$KEY_NAME --query 'Instances[0].InstanceId' --block-device-mappings '[ { "DeviceName": "/dev/sda1", "Ebs": { "DeleteOnTermination": true } } ]' | tr -d \")
-echo "Instance ID: "$INSTANCE_ID
-echo "giving instance 30 seconds to wake up..."
-sleep 30
-echo "End creating EC2 instance"
-
-PUBLIC_DNS=$(aws ec2 describe-instances --instance-ids $INSTANCE_ID --query "Reservations[*].Instances[*].[PublicDnsName]" --output text)
-PUBLIC_IP=$(aws ec2 describe-instances --instance-ids $INSTANCE_ID --query "Reservations[*].Instances[*].[PublicIpAddress]" --output text)
-
-USER_AT_HOST="centos@${PUBLIC_DNS}"
-echo "New instance created with ID \"$INSTANCE_ID\". To ssh into it:"
-echo "ssh -i $PEM_FILE $USER_AT_HOST"
-
-echo "Please wait at least 15 minutes while the branch \"$BRANCH\" from $REPO_URL is being deployed."
-
-if [ ! -z "$GRPVRS" ]; then
-   scp -i $PEM_FILE -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile=/dev/null' -o 'ConnectTimeout=300' $GRPVRS $USER_AT_HOST:$GVFILE
-fi
-
-# epel-release is installed first to ensure the latest ansible is installed after
-# TODO: Add some error checking for this ssh command.
-ssh -T -i $PEM_FILE -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile=/dev/null' -o 'ConnectTimeout=300' $USER_AT_HOST <<EOF
-sudo yum -y install epel-release
-sudo yum -y install https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.7.9-1.el7.ans.noarch.rpm
-sudo yum -y install git nano
-git clone https://github.com/IQSS/dataverse-ansible.git dataverse
-export ANSIBLE_ROLES_PATH=.
-echo $extra_vars
-ansible-playbook -v -i dataverse/inventory dataverse/dataverse.pb --connection=local $GVARG
-EOF
-
-# Port 8080 has been added because Ansible puts a redirect in place
-# from HTTP to HTTPS and the cert is invalid (self-signed), forcing
-# the user to click through browser warnings.
-CLICKABLE_LINK="http://${PUBLIC_DNS}:8080"
-echo "To ssh into the new instance:"
-echo "ssh -i $PEM_FILE $USER_AT_HOST"
-echo "Branch \"$BRANCH\" from $REPO_URL has been deployed to $CLICKABLE_LINK"
-echo "When you are done, please terminate your instance with:"
-echo "aws ec2 terminate-instances --instance-ids $INSTANCE_ID"
+echo "The current copy of this script has been moved to https://github.com/GlobalDataverseCommunityConsortium/dataverse-ansible/tree/master/ec2"
+echo "You may call it directly: https://raw.githubusercontent.com/GlobalDataverseCommunityConsortium/dataverse-ansible/master/ec2/ec2-create-instance.sh"
diff --git a/scripts/installer/glassfish-setup.sh b/scripts/installer/glassfish-setup.sh
deleted file mode 100755
index 7ab2473d622..00000000000
--- a/scripts/installer/glassfish-setup.sh
+++ /dev/null
@@ -1,330 +0,0 @@
-#!/bin/bash
-# YOU (THE HUMAN USER) SHOULD NEVER RUN THIS SCRIPT DIRECTLY!
-# It should be run by higher-level installers. 
-# The following arguments should be passed to it 
-# as environmental variables: 
-# (no defaults for these values are provided here!)
-#
-# glassfish configuration: 
-# GLASSFISH_ROOT
-# GLASSFISH_DOMAIN
-# ASADMIN_OPTS
-# MEM_HEAP_SIZE
-#
-# database configuration: 
-# DB_PORT
-# DB_HOST
-# DB_NAME
-# DB_USER
-# DB_PASS
-#
-# Rserve configuration: 
-# RSERVE_HOST
-# RSERVE_PORT
-# RSERVE_USER
-# RSERVE_PASS
-#
-# DOI configuration:
-# DOI_USERNAME
-# DOI_PASSWORD
-# DOI_BASEURL
-# DOI_MDCBASEURL
-#
-# other local configuration:
-# HOST_ADDRESS
-# SMTP_SERVER
-# FILES_DIR
-
-# The script is going to fail and exit if any of the
-# parameters aren't supplied. It is the job of the 
-# parent script to set all these env. variables, 
-# providing default values, if none are supplied by 
-# the user, etc. 
-
-# This script has two big functions: preliminary_setup and final_setup
-# In the use of a container, only final_setup is called
-function preliminary_setup()
-{
-    # undeploy the app, if running: 
-
-  ./asadmin $ASADMIN_OPTS undeploy dataverse-4.0
-
-  # avoid OutOfMemoryError: PermGen per http://eugenedvorkin.com/java-lang-outofmemoryerror-permgen-space-error-during-deployment-to-glassfish/
-  #./asadmin $ASADMIN_OPTS list-jvm-options
-  ./asadmin $ASADMIN_OPTS delete-jvm-options "-XX\:MaxPermSize=192m"
-  ./asadmin $ASADMIN_OPTS create-jvm-options "-XX\:MaxPermSize=512m"
-  ./asadmin $ASADMIN_OPTS create-jvm-options "-XX\:PermSize=256m"
-  ./asadmin $ASADMIN_OPTS delete-jvm-options -client
-
-  # alias passwords
-  for alias in "rserve_password_alias ${RSERVE_PASS}" "doi_password_alias ${DOI_PASSWORD}" "db_password_alias ${DB_PASS}"
-  do
-      set -- $alias
-      echo "AS_ADMIN_ALIASPASSWORD=$2" > /tmp/$1.txt
-      ./asadmin $ASADMIN_OPTS create-password-alias --passwordfile /tmp/$1.txt $1
-      rm /tmp/$1.txt
-  done
-
-    ###
-  # Add the necessary JVM options: 
-  # 
-  # location of the datafiles directory: 
-  # (defaults to dataverse/files in the users home directory)
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.directory=${FILES_DIR}"
-  # Rserve-related JVM options: 
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.rserve.host=${RSERVE_HOST}"
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.rserve.port=${RSERVE_PORT}"
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.rserve.user=${RSERVE_USER}"
-  ./asadmin $ASADMIN_OPTS create-jvm-options '\-Ddataverse.rserve.password=${ALIAS=rserve_password_alias}'
-  # Data Deposit API options
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.fqdn=${HOST_ADDRESS}"
-  # password reset token timeout in minutes
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.auth.password-reset-timeout-in-minutes=60"
-
-  # DataCite DOI Settings
-  # (we can no longer offer EZID with their shared test account)
-  # jvm-options use colons as separators, escape as literal
-  DOI_BASEURL_ESC=`echo $DOI_BASEURL | sed -e 's/:/\\\:/'`
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.username=${DOI_USERNAME}"
-  ./asadmin $ASADMIN_OPTS create-jvm-options '\-Ddoi.password=${ALIAS=doi_password_alias}'
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.baseurlstring=$DOI_BASEURL_ESC"
-
-  # jvm-options use colons as separators, escape as literal
-  DOI_MDCBASEURL_ESC=`echo $DOI_MDCBASEURL | sed -e 's/:/\\\:/'`
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.mdcbaseurlstring=$DOI_MDCBASEURL_ESC"
-
-  ./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.timerServer=true"
-  # enable comet support
-  ./asadmin $ASADMIN_OPTS set server-config.network-config.protocols.protocol.http-listener-1.http.comet-support-enabled="true"
-
-  ./asadmin $ASADMIN_OPTS delete-connector-connection-pool --cascade=true jms/__defaultConnectionFactory-Connection-Pool 
-
-  # no need to explicitly delete the connector resource for the connection pool deleted in the step 
-  # above - the cascade delete takes care of it.
-  #./asadmin $ASADMIN_OPTS delete-connector-resource jms/__defaultConnectionFactory-Connection-Pool
-
-  # http://docs.oracle.com/cd/E19798-01/821-1751/gioce/index.html
-  ./asadmin $ASADMIN_OPTS create-connector-connection-pool --steadypoolsize 1 --maxpoolsize 250 --poolresize 2 --maxwait 60000 --raname jmsra --connectiondefinition javax.jms.QueueConnectionFactory jms/IngestQueueConnectionFactoryPool
-
-  # http://docs.oracle.com/cd/E18930_01/html/821-2416/abllx.html#giogt
-  ./asadmin $ASADMIN_OPTS create-connector-resource --poolname jms/IngestQueueConnectionFactoryPool --description "ingest connector resource" jms/IngestQueueConnectionFactory
-
-  # http://docs.oracle.com/cd/E18930_01/html/821-2416/ablmc.html#giolr
-  ./asadmin $ASADMIN_OPTS create-admin-object --restype javax.jms.Queue --raname jmsra --description "sample administered object" --property Name=DataverseIngest jms/DataverseIngest
-
-  # no need to explicitly create the resource reference for the connection factory created above -
-  # the "create-connector-resource" creates the reference automatically.
-  #./asadmin $ASADMIN_OPTS create-resource-ref --target Cluster1 jms/IngestQueueConnectionFactory
-
-
-  # so we can front with apache httpd ( ProxyPass / ajp://localhost:8009/ )
-  ./asadmin $ASADMIN_OPTS create-network-listener --protocol http-listener-1 --listenerport 8009 --jkenabled true jk-connector
-}
-
-function final_setup(){
-        ./asadmin $ASADMIN_OPTS delete-jvm-options -Xmx512m
-        ./asadmin $ASADMIN_OPTS create-jvm-options "-Xmx${MEM_HEAP_SIZE}m"
-
-
-        ./asadmin $ASADMIN_OPTS create-jdbc-connection-pool --restype javax.sql.DataSource \
-                                        --datasourceclassname org.postgresql.ds.PGPoolingDataSource \
-                                        --property create=true:User=$DB_USER:PortNumber=$DB_PORT:databaseName=$DB_NAME:ServerName=$DB_HOST \
-                                        dvnDbPool
-
-       ./asadmin $ASADMIN_OPTS set resources.jdbc-connection-pool.dvnDbPool.property.password='${ALIAS=db_password_alias}'
-
-        ###
-        # Create data sources
-        ./asadmin $ASADMIN_OPTS create-jdbc-resource --connectionpoolid dvnDbPool jdbc/VDCNetDS
-
-        ###
-        # Set up the data source for the timers
-
-        ./asadmin $ASADMIN_OPTS set configs.config.server-config.ejb-container.ejb-timer-service.timer-datasource=jdbc/VDCNetDS
-
-        ./asadmin $ASADMIN_OPTS create-jvm-options "\-Djavax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl"
-
-	### 
-	# Mail server setup: 
-	# delete any existing mail/notifyMailSession; configure port, if provided:
-
-	./asadmin delete-javamail-resource mail/notifyMailSession
-
-	if [ $SMTP_SERVER_PORT"x" != "x" ]
-	then
-            ./asadmin $ASADMIN_OPTS create-javamail-resource --mailhost "$SMTP_SERVER" --mailuser "dataversenotify" --fromaddress "do-not-reply@${HOST_ADDRESS}" --property mail.smtp.port="${SMTP_SERVER_PORT}" mail/notifyMailSession
-	else
-	    ./asadmin $ASADMIN_OPTS create-javamail-resource --mailhost "$SMTP_SERVER" --mailuser "dataversenotify" --fromaddress "do-not-reply@${HOST_ADDRESS}" mail/notifyMailSession
-	fi
-
-}
-
-if [ "$DOCKER_BUILD" = "true" ]
-  then
-    FILES_DIR="/usr/local/glassfish4/glassfish/domains/domain1/files"
-    RSERVE_HOST="localhost"
-    RSERVE_PORT="6311"
-    RSERVE_USER="rserve"
-    RSERVE_PASS="rserve"
-    HOST_ADDRESS="localhost\:8080"
-    pushd /usr/local/glassfish4/glassfish/bin/
-    ./asadmin start-domain domain1
-    preliminary_setup
-    chmod -R 777 /usr/local/glassfish4/
-    rm -rf /usr/local/glassfish4/glassfish/domains/domain1/generated 
-    rm -rf /usr/local/glassfish4/glassfish/domains/domain1/applications
-    popd
-    exit 0
-fi
-
-
-if [ -z "$DB_NAME" ]
- then
-  echo "You must specify database name (DB_NAME)."
-  echo "PLEASE NOTE THAT YOU (THE HUMAN USER) SHOULD NEVER RUN THIS SCRIPT DIRECTLY!"
-  echo "IT SHOULD ONLY BE RUN BY OTHER SCRIPTS."
-  exit 1
-fi
-
-if [ -z "$DB_PORT" ]
- then
-  echo "You must specify database port (DB_PORT)."
-  exit 1
-fi
-
-if [ -z "$DB_HOST" ]
- then
-  echo "You must specify database host (DB_HOST)."
-  exit 1
-fi
-
-if [ -z "$DB_USER" ]
- then
-  echo "You must specify database user (DB_USER)."
-  exit 1
-fi
-
-if [ -z "$DB_PASS" ]
- then
-  echo "You must specify database password (DB_PASS)."
-  exit 1
-fi
-
-if [ -z "$RSERVE_HOST" ]
- then
-  echo "You must specify Rserve host (RSERVE_HOST)."
-  exit 1
-fi
-
-if [ -z "$RSERVE_PORT" ]
- then
-  echo "You must specify Rserve port (RSERVE_PORT)."
-  exit 1
-fi
-
-if [ -z "$RSERVE_USER" ]
- then
-  echo "You must specify Rserve user (RSERVE_USER)."
-  exit 1
-fi
-
-if [ -z "$RSERVE_PASS" ]
- then
-  echo "You must specify Rserve password (RSERVE_PASS)."
-  exit 1
-fi
-
-if [ -z "$SMTP_SERVER" ]
- then
-  echo "You must specify smtp server (SMTP_SERVER)."
-  exit 1
-fi
-
-if [ -z "$HOST_ADDRESS" ]
- then
-  echo "You must specify host address (HOST_ADDRESS)."
-  exit 1
-fi
-
-if [ -z "$FILES_DIR" ]
- then
-  echo "You must specify files directory (FILES_DIR)."
-  exit 1
-fi
-
-if [ -z "$MEM_HEAP_SIZE" ]
- then
-  echo "You must specify the memory heap size for glassfish (MEM_HEAP_SIZE)."
-  exit 1
-fi
-
-if [ -z "$GLASSFISH_DOMAIN" ]
- then
-  echo "You must specify glassfish domain (GLASSFISH_DOMAIN)."
-  exit 1
-fi
-
-echo "checking glassfish root:"${GLASSFISH_ROOT}
-
-if [ ! -d "$GLASSFISH_ROOT" ]
-  then
-    echo Glassfish root '$GLASSFISH_ROOT' does not exist
-    exit 1
-fi
-GLASSFISH_BIN_DIR=$GLASSFISH_ROOT/bin
-
-echo "checking glassfish domain:"${GLASSFISH_ROOT}/glassfish/domains/$GLASSFISH_DOMAIN
-
-DOMAIN_DIR=$GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN
-if [ ! -d "$DOMAIN_DIR" ]
-  then
-    echo Domain directory '$DOMAIN_DIR' does not exist
-    exit 2
-fi
-
-echo "Setting up your glassfish4 to support Dataverse"
-echo "Glassfish directory: "$GLASSFISH_ROOT
-echo "Domain directory:    "$DOMAIN_DIR
-
-# Move to the glassfish dir
-pushd $GLASSFISH_BIN_DIR
-
-###
-# take the domain up, if needed.
-DOMAIN_DOWN=$(./asadmin list-domains | grep "$DOMAIN " | grep "not running")
-if [  $(echo $DOMAIN_DOWN|wc -c) -ne 1  ];
-  then
-    echo Trying to start domain $GLASSFISH_DOMAIN up...
-    ./asadmin $ASADMIN_OPTS start-domain $GLASSFISH_DOMAIN
-  else
-    echo domain running
-fi
-
-
-if [ -z "$MY_POD_NAME" ]
- then
-    preliminary_setup
-    final_setup
- else
-    echo $MY_POD_NAME
-    if [ $MY_POD_NAME == "dataverse-glassfish-0" ]
-      then
-        echo "I am in a container so I am doing much less"
-            final_setup
-    fi
-fi
-
-###
-# Restart
-echo Updates done. Restarting...
-# encountered cases where `restart-domain` timed out, but `stop` -> `start` didn't.
-./asadmin $ASADMIN_OPTS stop-domain $GLASSFISH_DOMAIN
-./asadmin $ASADMIN_OPTS start-domain $GLASSFISH_DOMAIN
-
-###
-# Clean up
-popd
-
-echo "Glassfish setup complete"
-date
-
diff --git a/scripts/installer/install b/scripts/installer/install
deleted file mode 100755
index faac3452eba..00000000000
--- a/scripts/installer/install
+++ /dev/null
@@ -1,1602 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use Getopt::Long;
-use Socket;
-use File::Copy;
-
-# command line options:
-
-my $verbose;
-my $postgresonly;
-my $hostname;
-my $gfuser;
-my $gfdir;
-my $mailserver;
-my $noninteractive;
-my $skipdatabasesetup;
-my $force;
-my $nogfpasswd;
-my $admin_email;
-
-my ($rez) = GetOptions(
-    #"length=i" => \$length,    # numeric
-    #"file=s"   => \$data,      # string
-    "verbose"      => \$verbose,
-    "pg_only"      => \$postgresonly,
-    "skip_db_setup" => \$skipdatabasesetup,
-    "hostname=s"   => \$hostname,
-    "gfuser=s"     => \$gfuser,
-    "gfdir=s"      => \$gfdir,
-    "mailserver=s" => \$mailserver,
-    "y|yes"        => \$noninteractive,
-    "f|force"      => \$force,
-    "nogfpasswd"   => \$nogfpasswd,
-    "admin_email=s" => \$admin_email,
-);
-
-# openshift/docker-specific - name of the "pod" executing the installer:
-my $pod_name = "";
-if (exists($ENV{'MY_POD_NAME'}))
-{
-    $pod_name = $ENV{'MY_POD_NAME'};
-}
-
-my $jq_exec_path = "";
-my $psql_exec_path = "";
-my $cwd;
-my $WARFILE_LOCATION = "dataverse.war"; 
-my $REFERENCE_DATA_SQL = "../database/reference_data.sql";
-
-
-my @CONFIG_VARIABLES;
-
-if ($postgresonly) 
-{
-    @CONFIG_VARIABLES =
-      ( 'POSTGRES_SERVER', 'POSTGRES_PORT', 'POSTGRES_DATABASE', 'POSTGRES_USER', 'POSTGRES_PASSWORD', 'POSTGRES_ADMIN_PASSWORD' );
-
-} 
-else 
-{
-
-    @CONFIG_VARIABLES = (
-	'HOST_DNS_ADDRESS',
-	'GLASSFISH_USER',
-	'GLASSFISH_DIRECTORY',
-	'ADMIN_EMAIL',
-	'MAIL_SERVER',
-
-	'POSTGRES_SERVER',
-	'POSTGRES_PORT',
-	'POSTGRES_ADMIN_PASSWORD',
-	'POSTGRES_DATABASE',
-	'POSTGRES_USER',
-	'POSTGRES_PASSWORD',
-
-	'SOLR_LOCATION', 
-	
-	'RSERVE_HOST',
-	'RSERVE_PORT',
-	'RSERVE_USER',
-	'RSERVE_PASSWORD',
-
-	'DOI_USERNAME',
-	'DOI_PASSWORD',
-	'DOI_BASEURL',
-	'DOI_MDCBASEURL'
-
-	);
-}
-
-my %CONFIG_DEFAULTS = (
-    'HOST_DNS_ADDRESS',    'localhost',
-    'GLASSFISH_USER',	   '',
-    'GLASSFISH_DIRECTORY', '/usr/local/glassfish4',
-    'GLASSFISH_USER',	   '',
-    'ADMIN_EMAIL',         '',
-    'MAIL_SERVER',         'mail.hmdc.harvard.edu:25',
-
-    'POSTGRES_ADMIN_PASSWORD', 'secret',
-    'POSTGRES_SERVER',   '127.0.0.1',
-    'POSTGRES_PORT',     5432,
-    'POSTGRES_DATABASE', 'dvndb',
-    'POSTGRES_USER',     'dvnapp',
-    'POSTGRES_PASSWORD', 'secret',
-
-    'SOLR_LOCATION',     'LOCAL',
-
-    'RSERVE_HOST',     'localhost',
-    'RSERVE_PORT',     6311,
-    'RSERVE_USER',     'rserve',
-    'RSERVE_PASSWORD', 'rserve',
-
-    'DOI_USERNAME',    'dataciteuser',
-    'DOI_PASSWORD',    'datacitepassword',
-    'DOI_BASEURL',     'https://mds.test.datacite.org',
-    'DOI_MDCBASEURL',  'https://api.test.datacite.org',
-
-);
-
-my %CONFIG_PROMPTS = (
-    'HOST_DNS_ADDRESS',    'Fully Qualified Domain Name of your host',
-    'GLASSFISH_USER',	   'Glassfish service account username',
-    'GLASSFISH_DIRECTORY', 'Glassfish Directory',
-    'ADMIN_EMAIL',         'Administrator email address for this Dataverse',
-    'MAIL_SERVER',         'SMTP (mail) server (and port) to relay notification messages',
-
-    'POSTGRES_SERVER',   'Postgres Server Address',
-    'POSTGRES_PORT',     'Postgres Server Port',
-    'POSTGRES_ADMIN_PASSWORD', 'Postgres ADMIN password',
-    'POSTGRES_DATABASE', 'Name of the Postgres Database',
-    'POSTGRES_USER',     'Name of the Postgres User',
-    'POSTGRES_PASSWORD', 'Postgres user password',
-
-    'SOLR_LOCATION',     'Remote SOLR indexing service',
-
-    'RSERVE_HOST',     'Rserve Server',
-    'RSERVE_PORT',     'Rserve Server Port',
-    'RSERVE_USER',     'Rserve User Name',
-    'RSERVE_PASSWORD', 'Rserve User Password',
-
-    'DOI_USERNAME',    'Datacite username',
-    'DOI_PASSWORD',    'Datacite password',
-    'DOI_BASEURL',    'Datacite URL',
-    'DOI_MDCBASEURL', 'Datacite MakeDataCount URL'
-
-);
-
-
-my %CONFIG_COMMENTS = (
-    'HOST_DNS_ADDRESS',    ":\n(enter numeric IP address, if FQDN is unavailable) ",
-    'GLASSFISH_USER',      ":\nThis user will be running Glassfish service on your system.\n - If this is a dev. environment, this should be your own username; \n - In production, we suggest \"glassfish\" or another unprivileged user\n: ",
-    'GLASSFISH_DIRECTORY', '',
-    'ADMIN_EMAIL',         ":\n(please enter a valid email address!) ",
-    'MAIL_SERVER',         '',
-
-    'POSTGRES_SERVER',   '',
-    'POSTGRES_PORT',     '',
-    'POSTGRES_ADMIN_PASSWORD', ":\n - We will need this to create the user and database that the Dataverse application will be using.\n (Hit RETURN if access control is set to \"trust\" for this connection in pg_hba.conf)\n: ",
-    'POSTGRES_USER',     ":\n - This is the Postgres user that the Dataverse app will be using to talk to the database\n: ",
-    'POSTGRES_DATABASE', '',
-    'POSTGRES_PASSWORD', '',
-
-    'SOLR_LOCATION',     "? \n - Leave this set to \"LOCAL\" if the SOLR will be running on the same (this) server.\n Otherwise, please enter the host AND THE PORT NUMBER of the remote SOLR service, colon-separated\n (for example: foo.edu:8983)\n: ",
-
-    'RSERVE_HOST',     '',
-    'RSERVE_PORT',     '',
-    'RSERVE_USER',     '',
-    'RSERVE_PASSWORD', '',
-
-    'DOI_USERNAME',    'DataCite or EZID username. Only necessary for publishing / minting DOIs.',
-    'DOI_PASSWORD',    'DataCite or EZID account password.',
-    'DOI_BASEURL',    'DataCite or EZID URL. Probably https://mds.datacite.org',
-    'DOI_MDCBASEURL',    'DataCite Make Data Count API base URL. Probably https://api.datacite.org'
-
-);
-
-
-my $API_URL = "http://localhost:8080/api";
-
-# jodbc.postgresql.org recommends 4.2 for Java 8.
-# updated drivers may be obtained from
-#  https://jdbc.postgresql.org/download.html
-my $postgres_jdbc = "postgresql-42.2.2.jar";
-
-# 0. A few preliminary checks:
-
-# 0a. OS:
-
-my $uname_out = `uname -a`;
-
-my @uname_tokens = split( " ", $uname_out );
-
-my $WORKING_OS;
-if ( $uname_tokens[0] eq "Darwin" ) {
-    print "\nThis appears to be a MacOS X system; good.\n";
-    # TODO: check the OS version
-
-    $WORKING_OS = "MacOSX";
-}
-elsif ( $uname_tokens[0] eq "Linux" ) {
-    if ( -f "/etc/redhat-release" ) {
-        print "\nThis appears to be a RedHat system; good.\n";
-        $WORKING_OS = "RedHat";
-        # TODO: check the distro version
-    }
-    else {
-        print "\nThis appears to be a non-RedHat Linux system;\n";
-        print "this installation *may* succeed; but we're not making any promises!\n";
-        $WORKING_OS = "Linux";
-    }
-} else {
-    print "\nWARNING: This appears to be neither a Linux or MacOS X system!\n";
-    print "This installer script will most likely fail. Please refer to the\n";
-    print "DVN Installers Guide for more information.\n\n";
-
-    $WORKING_OS = "Unknown";
-
-    my $yesnocont;
-
-    unless ($noninteractive) {
-        exit 0;
-    }
-
-    print "(Normally we would stop right there; but since the \"--yes\" option was specified, we'll attempt to continue)\n\n";
-
-}
-
-
-# 0b. host name:
-
-if ($hostname) {
-    $CONFIG_DEFAULTS{'HOST_DNS_ADDRESS'} = $hostname;
-} else {
-    my $hostname_from_cmdline = `hostname`;
-    chop $hostname_from_cmdline;
-
-    $CONFIG_DEFAULTS{'HOST_DNS_ADDRESS'} = $hostname_from_cmdline;
-}
-
-# 0c. check if there is the default.config file with the pre-set configuration values: 
-
-#  read default configuration values from tab separated file "default.config" if it exists
-#  moved after the $hostname_from_cmdline section to avoid excessively complicating the logic
-#  of command line argument, automatic selection, or config file.
-#
-#  NOTE: if the file contain any Postgres configuration (for example: "POSTGRES_USER   dvnApp")
-#  but an environmental variable with the same name exists - THE ENV. VAR WILL WIN! (don't ask)
-#  (actually this is to accommodate the openshift docker deployment scenario)
-
-sub trim { my $s = shift; $s =~ s/^\s+|\s+$//g; return $s };
-
-my $config_default_file = "default.config";
-
-if ( -e $config_default_file )
-{
-	print("loading default configuration values from $config_default_file\n");
-	open( my $inp_cfg, $config_default_file );
-	while( my $ln = <$inp_cfg> )
-	{
-		my @xs = split('\t', $ln );
-		if ( 2 == @xs )
-		{
-			my $k = $xs[0];
-                        my $v = trim($xs[1]);
-#                        if (defined $ENV{$k} && ($k eq "POSTGRES_USER" || $k eq "POSTGRES_PASSWORD")) {
-#                            $v = $ENV{$k};
-#                        }
-#                        if (defined $ENV{'POSTGRESQL_ADMIN_PASSWORD'} && $k eq "POSTGRES_ADMIN_PASSWORD")   {
-#                            $v = $ENV{'POSTGRESQL_ADMIN_PASSWORD'};
-#                        }
-                        $CONFIG_DEFAULTS{$k}=$v;
-		}
-	}
-}
-else
-{
-	print("using hard-coded default configuration values (no $config_default_file available)\n");
-}
-
-# 0d. current OS user. (the first one we find wins)
-
-my $current_user = $ENV{LOGNAME} || $ENV{USER} || getpwuid($<);
-
-# if the username was specified on the command-line, it takes precendence:
-if ($gfuser) {
-    print "Using CLI-specified user $gfuser.\n";
-    $CONFIG_DEFAULTS{'GLASSFISH_USER'} = $gfuser;
-}
-
-
-if (!$CONFIG_DEFAULTS{'GLASSFISH_USER'}) {
-   $CONFIG_DEFAULTS{'GLASSFISH_USER'} = $current_user;
-   print "No pre-configured user found; using $current_user.\n";
-}
-
-
-# prefer that we not install as root.
-unless ( $< != 0 ) {
-print "####################################################################\n";
-print "     It is recommended that this script not be run as root.\n";
-print " Consider creating a glassfish service account, giving it ownership\n";
-print "  on the glassfish/domains/domain1/ and glassfish/lib/ directories,\n";
-print "    along with the JVM-specified files.dir location, and running\n";
-print "       this installer as the user who will launch Glassfish.\n";
-print "####################################################################\n";
-}
-
-# ensure $gfuser exists or bail
-my $gfidcmd="id $CONFIG_DEFAULTS{'GLASSFISH_USER'} > /dev/null";
-my $gfreturncode=system($gfidcmd);
-if ($gfreturncode != 0) {
-   die "Couldn't find user $gfuser. Please ensure the account exists and is readable by the user running this installer.\n";
-}
-
-# 0e. the following 2 options can also be specified on the command line, and 
-# also take precedence over the default values that are hard-coded and/or 
-# provided in the default.config file:
-
-if ($mailserver) {
-    $CONFIG_DEFAULTS{'MAIL_SERVER'} = $mailserver;
-}
-
-if ($gfdir) {
-    $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} = $gfdir;
-}
-
-# 1. CHECK FOR SOME MANDATORY COMPONENTS (WAR FILE, ETC.)
-# since we can't do anything without these things in place, better check for 
-# them before we go into the interactive config mode. 
-# (skip if this is a database-only setup)
-
-unless ($postgresonly) 
-{
-# 1a. war file: 
-    print "\nChecking if the application .war file is available... ";
-
-# if this installer section is running out of the installer zip bundle directory,
-# the war file will be sitting right here, named "dataverse.war": 
-
-    $WARFILE_LOCATION = "dataverse.war"; 
-
-# but if it's not here, this is probably a personal development 
-# setup, so their build should be up in their source tree:
-
-    unless ( -f $WARFILE_LOCATION ) {
-	my $DATAVERSE_VERSION = "";
-	my $DATAVERSE_POM_FILE = "../../pom.xml";
-	if ( -f $DATAVERSE_POM_FILE ) 
-	{
-	    open DPF, $DATAVERSE_POM_FILE; 
-	    my $pom_line;
-	    while ($pom_line=<DPF>)
-	    {
-		chop $pom_line;
-		if ($pom_line =~/^[ \t]*<version>([0-9\.]+)<\/version>/)
-		{
-		    $DATAVERSE_VERSION=$1;
-		    last;
-		}	    
-	    }
-	    close DPF;
-	    
-	    if ($DATAVERSE_VERSION ne "") {
-		$WARFILE_LOCATION = "../../target/dataverse-" . $DATAVERSE_VERSION . ".war";
-	    }
-	}
-    }
-
-# But, if the war file cannot be found in either of the 2
-# places - we'll just have to give up:
-
-    unless ( -f $WARFILE_LOCATION ) {
-	print "\nWARNING: Can't find the project .war file!\n";
-	print "\tAre you running the installer in the right directory?\n";
-	print "\tHave you built the war file?\n";
-	print "\t(if not, build the project and run the installer again)\n";
-	
-	exit 0;
-    }
-    print " Yes, it is!\n";
-
-
-# 1b. check and remember the working dir:
-    chomp( $cwd = `pwd` );
-
-# 1c. check if the reference data SQL file is there:
-
-    $REFERENCE_DATA_SQL = "../database/reference_data.sql";
-
-    unless ( -f $REFERENCE_DATA_SQL ) {
-	# if it's not in ../database, then we're probably running out of the 
-	# unzipped installer bundle, so it should be right here in the current directory:
-	$REFERENCE_DATA_SQL = "reference_data.sql";
-    }
-
-    unless ( -f $REFERENCE_DATA_SQL ) {
-	print "\nWARNING: Can't find .sql data template!\n";
-	print "(are you running the installer in the right directory?)\n";
-	
-	exit 0;
-    }
-
-# 1d. jq executable: 
-
-    my $sys_path = $ENV{'PATH'};
-    my @sys_path_dirs = split( ":", $sys_path );
-
-    if ( $pod_name ne "start-glassfish") # Why is that again? 
-    {
-	for my $sys_path_dir (@sys_path_dirs) {
-	    if ( -x $sys_path_dir . "/jq" ) {
-		$jq_exec_path = $sys_path_dir;
-		last;
-	    }
-	}
-	if ( $jq_exec_path eq "" ) {
-	    print STDERR "\nERROR: I haven't been able to find the jq command in your PATH! Please install it from http://stedolan.github.io/jq/\n";
-	    exit 1;
-
-	}
-    }
-
-}
-
-
-# 2. INTERACTIVE CONFIG SECTION: 
-
-print "\nWelcome to the Dataverse installer.\n";
-unless ($postgresonly) {
-    print "You will be guided through the process of setting up a NEW\n";
-    print "instance of the dataverse application\n";
-}
-else {
-    print "You will be guided through the process of configuring your\n";
-    print "PostgreSQL database for use by the Dataverse application.\n";
-}
-
-ENTERCONFIG:
-
-print "\n";
-print "Please enter the following configuration values:\n";
-print "(hit [RETURN] to accept the default value)\n";
-print "\n";
-
-for my $ENTRY (@CONFIG_VARIABLES) 
-{
-    my $config_prompt = $CONFIG_PROMPTS{$ENTRY};
-    my $config_comment = $CONFIG_COMMENTS{$ENTRY};
-
-    if ( $config_comment eq '' ) 
-    {
-	print $config_prompt . ": ";
-	print "[" . $CONFIG_DEFAULTS{$ENTRY} . "] ";
-    }
-    else 
-    {
-	print $config_prompt . $config_comment;
-	print "[" . $CONFIG_DEFAULTS{$ENTRY} . "] ";
-    }
-
-    my $user_entry = "";
-
-    # ($noninteractive means the installer is being run in the non-interactive mode; it will use 
-    # the default values specified so far, without prompting the user for alternative values)\
-    unless ($noninteractive) 
-    {
-        $user_entry = <>;
-        chop $user_entry;
-
-	if ( $user_entry ne "" ) {
-	    $CONFIG_DEFAULTS{$ENTRY} = $user_entry;
-	}
-
-	# for some values, we'll try to do some validation right here, in real time:
-    
-	if ($ENTRY eq 'ADMIN_EMAIL') 
-	{
-	    $user_entry = $CONFIG_DEFAULTS{$ENTRY};
-	    my $attempts = 0; 
-	    while ($user_entry !~/[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}/) 
-	    {
-		$attempts++;
-		print "Please enter a valid email address: ";
-		$user_entry = <>;
-		chop $user_entry;
-	    }
-
-	    if ($attempts) 
-	    {
-		print "OK, looks legit.\n";
-		$CONFIG_DEFAULTS{$ENTRY} = $user_entry;
-	    }
-	}
-	elsif ($ENTRY eq 'GLASSFISH_DIRECTORY') 
-	{
-            # CHECK IF GLASSFISH DIR LOOKS OK:
-	    print "\nChecking your Glassfish installation...";
-
-	    my $g_dir = $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'};
-
-
-	    unless ( -d $g_dir . "/glassfish/domains/domain1" ) 
-	    {
-		while ( !( -d $g_dir . "/glassfish/domains/domain1" ) ) 
-		{
-		    print "\nInvalid Glassfish directory " . $g_dir . "!\n";
-		    print "Enter the root directory of your Glassfish installation:\n";
-		    print "(Or ctrl-C to exit the installer): ";
-
-		    $g_dir = <>;
-		    chop $g_dir;
-		}
-	    }
-
-	    # verify that we can write in the Glassfish directory 
-	    # (now that we are no longer requiring to run the installer as root)
-
-	    my @g_testdirs = ( "/glassfish/domains/domain1",
-			       "/glassfish/domains/domain1/config",
-			       "/glassfish/lib");
-
-	    for my $test_dir (@g_testdirs)
-	    {
-		if (!(-w ($g_dir . $test_dir))) 
-		{
-		    print "\n";
-		    die("ERROR: " . $g_dir . $test_dir . " not writable to the user running the installer! Check permissions on the glassfish hierarchy.\n");
-		}
-	    }
-
-
-
-	    print "$g_dir looks OK!\n";
-	    $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} = $g_dir; 
-
-	}
-	elsif ($ENTRY eq 'MAIL_SERVER')
-	{
-	    my $smtp_server = "";
-	    while (! &validate_smtp_server() )
-	    {
-		print "Enter a valid SMTP (mail) server:\n";
-		print "(Or ctrl-C to exit the installer): ";
-
-		$smtp_server = <>;
-		chop $smtp_server;
-
-		$CONFIG_DEFAULTS{'MAIL_SERVER'} = $smtp_server unless $smtp_server eq ''; 
-	    }
-
-	    print "\nOK, we were able to establish connection to the SMTP server you have specified.\n";
-	    print "Please note that you *may* need to configure some extra settings before your \n";
-	    print "Dataverse can send email. Please consult the \"Mail Host Configuration & Authentication\"\n";
-	    print "section of the installation guide (http://guides.dataverse.org/en/latest/installation/installation-main.html)\n";
-	    print "for more information.\n";
-	}
-    }
-
-    print "\n";
-}
-
-# 2b. CONFIRM VALUES ENTERED:
-
-print "\nOK, please confirm what you've entered:\n\n";
-
-for my $ENTRY (@CONFIG_VARIABLES) {
-    print $CONFIG_PROMPTS{$ENTRY} . ": " . $CONFIG_DEFAULTS{$ENTRY} . "\n";
-}
-
-my $yesno;
-if ($noninteractive) {
-    $yesno = "y";
-}
-else {
-    print "\nIs this correct? [y/n] ";
-    $yesno = <>;
-    chop $yesno;
-}
-
-while ( $yesno ne "y" && $yesno ne "n" ) {
-    print "Please enter 'y' or 'n'!\n";
-    print "(or ctrl-C to exit the installer)\n";
-    $yesno = <>;
-    chop $yesno;
-}
-
-if ( $yesno eq "n" ) {
-    goto ENTERCONFIG;
-}
-
-# 3. SET UP POSTGRES USER AND DATABASE
-
-unless($pod_name eq "start-glassfish" || $pod_name eq "dataverse-glassfish-0" || $skipdatabasesetup) {
-    &setup_postgres(); 
-# (there's no return code - if anything goes wrong, the method will exit the script, with some diagnostic messages for the user)
-    print "\nOK, done.\n";
-
-    if ($postgresonly) 
-    {
-	exit 0;
-    }
-}
-
-# 5. CONFIGURE GLASSFISH
-
-my $glassfish_dir = $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'};
-
-my $done = &setup_glassfish();
-
-# 7. POPULATE THE DATABASE WITH REFERENCE DATA
-# TODO: move this further down
-# (in this step some pre-supplied content is inserted into the database that we have just created;
-# it is not *necessary* for the application to run in the very basic mode; but some features - certain 
-# types of metadata imports, for example - will be unavailable if it's not done. 
-
-&import_reference_data();
-
-
-# Check if the App is running: 
-
-unless ((
-     my $exit_code =
-     system( $glassfish_dir . "/bin/asadmin list-applications | grep -q '^dataverse'" )
-	) == 0 )
-{
-    # If the "asadmin list-applications" has failed, it may only mean that an earlier
-    # "asadmin login" had failed, and asadmin is now failing to run without the user
-    # supplying the username and password. (And the fact that we are trying to pile the  
-    # output to grep prevents it from providing the prompts). 
-    # So before we give up, we'll try an alternative: 
-
-    unless ((
-	my $exit_code_2 =
-	system( "curl http://localhost:8080/robots.txt | grep -q '^User-agent'" )
-	    ) == 0 )
-    {
-	print STDERR "It appears that the Dataverse application is not running...\n";
-	print STDERR "Even though the \"asadmin deploy\" command had succeeded earlier.\n\n";
-	print STDERR "Aborting - sorry...\n\n";
-
-	exit 1; 
-    }
-}
-
-
-print "\nOK, the Dataverse application appears to be running...\n\n";
-
-# Run the additional setup scripts, that populate the metadata block field values, create users
-# and dataverses, etc.
-
-unless ( -d "data" && -f "setup-datasetfields.sh" && -f "setup-users.sh" && -f "setup-dvs.sh" && -f "setup-all.sh" ) {
-    chdir("../api");
-}
-
-unless ( -d "data" && -f "setup-datasetfields.sh" && -f "setup-users.sh" && -f "setup-dvs.sh" && -f "setup-builtin-roles.sh" && -f "setup-all.sh" ) {
-    print "\nERROR: Can't find the metadata and user/dataverse setup scripts!\n";
-    print "\tAre you running the installer in the right directory?\n";
-    exit 1;
-}
-
-# if there's an admin_email set from arguments, replace the value in `dv-root.json` (called by `setup-all.sh`)
-if ($admin_email)
-{
-	print "setting contact email for root dataverse to: $admin_email\n";
-	set_root_contact_email( $admin_email );
-}
-else
-{
-	print "using default contact email for root dataverse\n";
-}
-
-for my $script ( "setup-all.sh" ) {
-    # (there's only 1 setup script to run now - it runs all the other required scripts)
-    print "Executing post-deployment setup script " . $script . "... ";
-
-    my $my_hostname = $CONFIG_DEFAULTS{'HOST_DNS_ADDRESS'};
-
-    # We used to filter the supplied scripts, replacing "localhost" and the port, in 
-    # case they are running Dataverse on a different port... Now we are simply requiring
-    # that the port 8080 is still configured in domain.xml when they are running the 
-    # installer:
-    my $run_script;
-    #if ( $my_hostname ne "localhost" ) {
-    #    system( "sed 's/localhost:8080/$my_hostname/g' < " . $script . " > tmpscript.sh; chmod +x tmpscript.sh" );
-    #    $run_script = "tmpscript.sh";
-    #}
-    #else {
-    $run_script = $script;
-    #}
-
-    unless ( my $exit_code = system( "./" . $run_script . " > $run_script.$$.log 2>&1") == 0 ) 
-    {
-        print "\nERROR executing script " . $script . "!\n";
-        exit 1;
-    }
-    print "done!\n";
-}
-
-# SOME ADDITIONAL SETTINGS THAT ARE NOT TAKEN CARE OF BY THE setup-all SCRIPT 
-# NEED TO BE CONFIGURED HERE:
-
-print "Making additional configuration changes...\n\n";
-
-
-# a. Configure the Admin email in the Dataverse settings:
-
-print "Executing " . "curl -X PUT -d " . $CONFIG_DEFAULTS{'ADMIN_EMAIL'} . " " . $API_URL . "/admin/settings/:SystemEmail" . "\n";
-
-my $exit_code = system("curl -X PUT -d " . $CONFIG_DEFAULTS{'ADMIN_EMAIL'} . " " . $API_URL . "/admin/settings/:SystemEmail"); 
-if ( $exit_code )       
-{
-    print "WARNING: failed to configure the admin email in the Dataverse settings!\n\n";
-} 
-else 
-{
-    print "OK.\n\n";
-}
-    
-# b. If this installation is going to be using a remote SOLR search engine service, configure its location in the settings:
-
-if ($CONFIG_DEFAULTS{'SOLR_LOCATION'} ne 'LOCAL')
-{
-    print "Executing " . "curl -X PUT -d " . $CONFIG_DEFAULTS{'SOLR_LOCATION'} . " " . $API_URL . "/admin/settings/:SolrHostColonPort" . "\n";
-    my $exit_code = system("curl -X PUT -d " . $CONFIG_DEFAULTS{'SOLR_LOCATION'} . " " . $API_URL . "/admin/settings/:SolrHostColonPort"); 
-    if ( $exit_code )       
-    {
-	print "WARNING: failed to configure the location of the remote SOLR service!\n\n";
-    }
-    else 
-    {
-	print "OK.\n\n";
-    }
-}
-
-
-
-chdir($cwd);
-
-print "\n\nYou should now have a running Dataverse instance at\n";
-print "  http://" . $CONFIG_DEFAULTS{'HOST_DNS_ADDRESS'} . ":8080\n\n\n";
-
-if ($WARFILE_LOCATION =~/([0-9]\.[0-9]\.[0-9])\.war$/) 
-{
-    my $version = $1;
-    print "If this is a personal development installation, we recommend that you undeploy the currently-running copy \n"; 
-    print "of the application, with the following asadmin command:\n\n";
-    print "\t" . $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} . '/bin/asadmin undeploy dataverse-' . $version . "\n\n";
-    print "before attempting to deploy from your development environment in NetBeans.\n\n";
-}
-    
-
-print "\nYour Dataverse has been configured to use DataCite, to register DOI global identifiers in the \n";
-print "test name space \"10.5072\" with the \"shoulder\" \"FK2\"\n";
-print "However, you have to contact DataCite (support\@datacite.org) and request a test account, before you \n";
-print "can publish datasets. Once you receive the account name and password, add them to your domain.xml,\n";
-print "as the following two JVM options:\n";
-print "\t<jvm-options>-Ddoi.username=...</jvm-options>\n";
-print "\t<jvm-options>-Ddoi.password=...</jvm-options>\n";
-print "and restart glassfish\n";
-print "If this is a production Dataverse and you are planning to register datasets as \n";
-print "\"real\", non-test DOIs or Handles, consult the \"Persistent Identifiers and Publishing Datasets\"\n";
-print "section of the Installataion guide, on how to configure your Dataverse with the proper registration\n";
-print "credentials.\n\n";
-
-
-
-# (going to skip the Rserve check; it's no longer a required, or even a recommended component)
-
-exit 0;
-
-# 9. FINALLY, CHECK IF RSERVE IS RUNNING:
-print "\n\nFinally, checking if Rserve is running and accessible...\n";
-
-unless ( $CONFIG_DEFAULTS{'RSERVE_PORT'} =~ /^[0-9][0-9]*$/ ) {
-    print $CONFIG_DEFAULTS{'RSERVE_HOST'} . " does not look like a valid port number,\n";
-    print "defaulting to 6311.\n\n";
-
-    $CONFIG_DEFAULTS{'RSERVE_PORT'} = 6311;
-}
-
-my ( $rserve_iaddr, $rserve_paddr, $rserve_proto );
-
-unless ( $rserve_iaddr = inet_aton( $CONFIG_DEFAULTS{'RSERVE_HOST'} ) ) {
-    print STDERR "Could not look up $CONFIG_DEFAULTS{'RSERVE_HOST'},\n";
-    print STDERR "the host you specified as your R server.\n";
-    print STDERR "\nDVN can function without a working R server, but\n";
-    print STDERR "much of the functionality concerning running statistics\n";
-    print STDERR "and analysis on quantitative data will not be available.\n";
-    print STDERR "Please consult the Installers guide for more info.\n";
-
-    exit 0;
-}
-
-$rserve_paddr = sockaddr_in( $CONFIG_DEFAULTS{'RSERVE_PORT'}, $rserve_iaddr );
-$rserve_proto = getprotobyname('tcp');
-
-unless ( socket( SOCK, PF_INET, SOCK_STREAM, $rserve_proto )
-    && connect( SOCK, $rserve_paddr ) )
-{
-    print STDERR "Could not establish connection to $CONFIG_DEFAULTS{'RSERVE_HOST'}\n";
-    print STDERR "on port $CONFIG_DEFAULTS{'RSERVE_PORT'}, the address you provided\n";
-    print STDERR "for your R server.\n";
-    print STDERR "DVN can function without a working R server, but\n";
-    print STDERR "much of the functionality concerning running statistics\n";
-    print STDERR "and analysis on quantitative data will not be available.\n";
-    print STDERR "Please consult the \"Installing R\" section in the Installers guide\n";
-    print STDERR "for more info.\n";
-
-    exit 0;
-
-}
-
-close(SOCK);
-print "\nOK!\n";
-
-# 5. CONFIGURE GLASSFISH
-sub setup_glassfish {
-    my $success = 1;
-    my $failure = 0;
-
-    my $glassfish_dir = $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'};
-
-    print "\nProceeding with the Glassfish setup.\n";
-
-# 5a. DETERMINE HOW MUCH MEMORY TO GIVE TO GLASSFISH AS HEAP:
-
-    my $gf_heap_default = "2048m";
-    my $sys_mem_total   = 0;
-
-    if ( -e "/proc/meminfo" && open MEMINFO, "/proc/meminfo" ) {
-	# Linux
-
-	while ( my $mline = <MEMINFO> ) {
-	    if ( $mline =~ /MemTotal:[ \t]*([0-9]*) kB/ ) {
-		$sys_mem_total = $1;
-	    }
-	}
-	
-	close MEMINFO;
-
-# TODO: Figure out how to determine the amount of memory when running in Docker
-# because we're wondering if Dataverse can run in the free OpenShift Online
-# offering that only gives you 1 GB of memory. Obviously, if this is someone's
-# first impression of Dataverse, we want to to run well! What if you try to
-# ingest a large file or perform other memory-intensive operations? For more
-# context, see https://github.com/IQSS/dataverse/issues/4040#issuecomment-331282286
-	if ( -e "/sys/fs/cgroup/memory/memory.limit_in_bytes" && open CGROUPMEM, "/sys/fs/cgroup/memory/memory.limit_in_bytes" ) {
-	    print "INFO: This system has the CGROUP file /sys/fs/cgroup/memory/memory.limit_in_bytes\n";
-	    while ( my $limitline = <CGROUPMEM> ) {
-		### TODO: NO, WE ARE NOT NECESSARILY IN DOCKER!
-		###print "We must be running in Docker! Fancy!\n";
-		# The goal of this cgroup check is for
-		# "Setting the heap limit for Glassfish to 750MB"
-		# to change to some other value, based on memory available.
-		print "INFO: /sys/fs/cgroup/memory/memory.limit_in_bytes: $limitline\n";
-		my $limit_in_kb = $limitline / 1024;
-		print "INFO: CGROUP limit_in_kb =  $limit_in_kb [ignoring]\n";
-		# In openshift.json, notice how PostgreSQL and Solr have
-		# resources.limits.memory set to "256Mi".
-		# If you try to give the Dataverse/Glassfish container twice
-		# as much memory (512 MB) and allow $sys_mem_total to
-		# be set below, you should see the following:
-		# "Setting the heap limit for Glassfish to 192MB."
-		# FIXME: dataverse.war will not deploy with only 512 MB of memory.
-		# Again, the goal is 1 GB total (512MB + 256MB + 256MB) for
-		# Glassfish, PostgreSQL, and Solr to fit in the free OpenShift tier.
-		#print "setting sys_mem_total to: $limit_in_kb\n";
-		#$sys_mem_total = $limit_in_kb;
-	    }
-	    close CGROUPMEM;
-	}
-    }
-    elsif ( -x "/usr/sbin/sysctl" ) 
-    {
-	# MacOS X, probably...
-
-	$sys_mem_total = `/usr/sbin/sysctl -n hw.memsize`;
-	chop $sys_mem_total;
-	if ( $sys_mem_total > 0 ) {
-	    $sys_mem_total = int( $sys_mem_total / 1024 );
-	    # size in kb
-	}
-    }
-
-    if ( $sys_mem_total > 0 ) {
-	# setting the default heap size limit to 3/8 of the available
-	# amount of memory:
-	$gf_heap_default = ( int( $sys_mem_total / ( 8 / 3 * 1024 ) ) );
-
-	print "\nSetting the heap limit for Glassfish to " . $gf_heap_default . "MB. \n";
-	print "You may need to adjust this setting to better suit \n";
-	print "your system.\n\n";
-
-	#$gf_heap_default .= "m";
-
-    }
-    else 
-    {
-	print "\nCould not determine the amount of memory on your system.\n";
-	print "Setting the heap limit for Glassfish to 2GB. You may need \n";
-	print "to  adjust the value to better suit your system.\n\n";
-    }
-
-    push @CONFIG_VARIABLES, "DEF_MEM_SIZE";
-    $CONFIG_DEFAULTS{"DEF_MEM_SIZE"} = $gf_heap_default;
-
-# TODO:
-# if the system has more than 4GB of memory (I believe), glassfish must
-# be run with the 64 bit flag set explicitly (at least that was the case
-# with the MacOS glassfish build...). Verify, and if still the case,
-# add a check.
-
-    print "\nInstalling the Glassfish PostgresQL driver... ";
-#    system( "/bin/cp", "pgdriver/" . $postgres_jdbc, $glassfish_dir . "/glassfish/lib" );
-    my $pgdriver_success = copy("pgdriver/" . $postgres_jdbc, $glassfish_dir . "/glassfish/lib" );
-
-    unless ($pgdriver_success) 
-    {
-	print "\n*********************\n";
-	print "ERROR! Failed to copy the postgres driver into " . $glassfish_dir . "/glassfish/lib - check the directory permissions!\n";
-	exit 1;
-    }
-
-# more diagnostics needed?
-
-    print "done!\n";
-    
-    print "\n*********************\n";
-    print "PLEASE NOTE, SOME OF THE ASADMIN COMMANDS ARE GOING TO FAIL,\n";
-    print "FOR EXAMPLE, IF A CONFIGURATION SETTING THAT WE ARE TRYING\n";
-    print "TO CREATE ALREADY EXISTS; OR IF A JVM OPTION THAT WE ARE\n";
-    print "DELETING DOESN'T. THESE \"FAILURES\" ARE NORMAL!\n";
-    print "*********************\n\n";
-    print "When/if asadmin asks you to \"Enter admin user name\",\n";
-    print "it should be safe to hit return and accept the default\n";
-    print "(which is \"admin\").\n";
-
-    print "\nPress any key to continue...\n\n";
-    
-    unless ($noninteractive)
-    {
-	system "stty cbreak </dev/tty >/dev/tty 2>&1";
-	unless ($noninteractive) {
-	    my $key = getc(STDIN);
-	}
-	system "stty -cbreak </dev/tty >/dev/tty 2>&1";
-    }
-	
-    print "\n";
-
-# 5b. start domain, if not running:
-    
-    my $javacheck = `java -version`;
-    my $exitcode  = $?;
-    unless ( $exitcode == 0 ) {
-	print STDERR "$javacheck\n" if $javacheck;
-	print STDERR "Do you have java installed?\n";
-	exit 1;
-    }
-    my $DOMAIN = "domain1";
-    my $DOMAIN_DOWN =
-	`$CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'}/bin/asadmin list-domains | grep "$DOMAIN " | grep "not running"`;
-    print STDERR $DOMAIN_DOWN . "\n";
-    if ($DOMAIN_DOWN) {
-	print "Trying to start domain up...\n";
-	if ( $current_user eq $CONFIG_DEFAULTS{'GLASSFISH_USER'} ){
-		system( $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} . "/bin/asadmin start-domain domain1" );
-	}
-	else
-	{
-		system( "sudo -u $CONFIG_DEFAULTS{'GLASSFISH_USER'} " . $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} . "/bin/asadmin start-domain domain1" );
-	}
-	# TODO: (?) - retest that the domain is running now? 
-    }
-    else
-    {
-	print "domain appears to be up...\n";
-    }
-
-# 5c. create asadmin login, so that the user doesn't have to enter
-# the username and password for every asadmin command, if
-# access to :4848 is password-protected:
-
-    system( $glassfish_dir. "/bin/asadmin login" );
-    
-# 5d. configure glassfish using ASADMIN commands:
-  
-    $success = &run_asadmin_script();
-
-# CHECK EXIT STATUS, BARF IF SETUP SCRIPT FAILED:
-
-    unless ($success) {
-	print "\nERROR! Failed to configure Glassfish domain!\n";
-	print "(see the error messages above - if any)\n";
-	print "Aborting...\n";
-	
-	exit 1;
-    }
-    
-# 5e. Additional config files:
-    
-    my $JHOVE_CONFIG = "jhove.conf";
-    my $JHOVE_CONF_SCHEMA = "jhoveConfig.xsd";
-    
-
-    my $JHOVE_CONFIG_DIST = $JHOVE_CONFIG; 
-    my $JHOVE_CONF_SCHEMA_DIST = $JHOVE_CONF_SCHEMA; 
-    
-# (if the installer is being run NOT as part of a distribution zipped bundle, but
-# from inside the source tree - adjust the locations of the jhove config files:
-
-    unless ( -f $JHOVE_CONFIG ) {
-	$JHOVE_CONFIG_DIST = "../../conf/jhove/jhove.conf";
-	$JHOVE_CONF_SCHEMA_DIST = "../../conf/jhove/jhoveConfig.xsd";
-    }
-
-# but if we can't find the files in either location, it must mean
-# that they are not running the script in the correct directory - so 
-# nothing else left for us to do but give up:
-
-    unless ( -f $JHOVE_CONFIG_DIST && -f $JHOVE_CONF_SCHEMA_DIST ) {
-	print "\nERROR! JHOVE configuration files not found in the config dir!\n";
-	print "(are you running the installer in the right directory?\n";
-	print "Aborting...\n";
-	exit 1;
-    }
-
-    print "\nCopying additional configuration files... ";
-
-    #system( "/bin/cp -f " . $JHOVE_CONF_SCHEMA_DIST . " " . $glassfish_dir . "/glassfish/domains/domain1/config" );
-    my $jhove_success = copy ($JHOVE_CONF_SCHEMA_DIST, $glassfish_dir . "/glassfish/domains/domain1/config");
-    unless ($jhove_success) 
-    {
-	print "\n*********************\n";
-	print "ERROR: failed to copy jhove config file into " . $glassfish_dir . "/glassfish/domains/domain1/config - do you have write permission in that directory?";
-	exit 1;
-    }
-
-# The JHOVE conf file has an absolute PATH of the JHOVE config schema file (uh, yeah...)
-# - so it may need to be readjusted here: 
-
-    if ( $glassfish_dir ne "/usr/local/glassfish4" )
-    {
-	system( "sed 's:/usr/local/glassfish4:$glassfish_dir:g' < " . $JHOVE_CONFIG_DIST . " > " . $glassfish_dir . "/glassfish/domains/domain1/config/" . $JHOVE_CONFIG);
-    }
-    else 
-    {
-	system( "/bin/cp -f " . $JHOVE_CONFIG_DIST . " " . $glassfish_dir . "/glassfish/domains/domain1/config" );
-    }
-
-    print "done!\n";
-    
-# 5f. check if glassfish is running:
-# TODO.
-    
-# 5g. DEPLOY THE APPLICATION:
-
-    print "\nAttempting to deploy the application.\n";
-    print "Command line: " . $glassfish_dir . "/bin/asadmin deploy " . $WARFILE_LOCATION . "\n";
-    unless ((
-	my $exit_code =
-	system( $glassfish_dir . "/bin/asadmin deploy " . $WARFILE_LOCATION )
-	    ) == 0 )
-    {
-	print STDERR "Failed to deploy the application! WAR file: " . $WARFILE_LOCATION . ".\n";
-	print STDERR "(exit code: " . $exit_code . ")\n";
-	print STDERR "Aborting.\n";
-	exit 1;
-    }
-
-
-    print "Finished configuring Glassfish and deploying the dataverse application.  \n";
-
-
-    return $success;
-}
-
-sub run_asadmin_script {
-    my $success = 1;
-    my $failure = 0;
-
-    # We are going to run a standalone shell script with a bunch of asadmin
-    # commands to set up all the glassfish components for the application.
-    # All the parameters must be passed to that script as environmental
-    # variables:
-
-    $ENV{'GLASSFISH_ROOT'}   = $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'};
-    $ENV{'GLASSFISH_DOMAIN'} = "domain1";
-    $ENV{'ASADMIN_OPTS'}     = "";
-    $ENV{'MEM_HEAP_SIZE'}    = $CONFIG_DEFAULTS{'DEF_MEM_SIZE'};
-
-    $ENV{'DB_PORT'} = $CONFIG_DEFAULTS{'POSTGRES_PORT'};
-    $ENV{'DB_HOST'} = $CONFIG_DEFAULTS{'POSTGRES_SERVER'};
-    $ENV{'DB_NAME'} = $CONFIG_DEFAULTS{'POSTGRES_DATABASE'};
-    $ENV{'DB_USER'} = $CONFIG_DEFAULTS{'POSTGRES_USER'};
-    $ENV{'DB_PASS'} = $CONFIG_DEFAULTS{'POSTGRES_PASSWORD'};
-
-    $ENV{'RSERVE_HOST'} = $CONFIG_DEFAULTS{'RSERVE_HOST'};
-    $ENV{'RSERVE_PORT'} = $CONFIG_DEFAULTS{'RSERVE_PORT'};
-    $ENV{'RSERVE_USER'} = $CONFIG_DEFAULTS{'RSERVE_USER'};
-    $ENV{'RSERVE_PASS'} = $CONFIG_DEFAULTS{'RSERVE_PASSWORD'};
-    $ENV{'DOI_BASEURL'} = $CONFIG_DEFAULTS{'DOI_BASEURL'};
-    $ENV{'DOI_MDCBASEURL'} = $CONFIG_DEFAULTS{'DOI_MDCBASEURL'};
-    
-    $ENV{'HOST_ADDRESS'} = $CONFIG_DEFAULTS{'HOST_DNS_ADDRESS'};
-
-    my ($mail_server_host, $mail_server_port) = split (":", $CONFIG_DEFAULTS{'MAIL_SERVER'});
-
-    $ENV{'SMTP_SERVER'}  = $mail_server_host;
-
-    if ($mail_server_port) 
-    {
-	$ENV{'SMTP_SERVER_PORT'} = $mail_server_port; 
-    }
-
-    $ENV{'FILES_DIR'} =
-      $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} . "/glassfish/domains/" . $ENV{'GLASSFISH_DOMAIN'} . "/files";
-    
-    system("./glassfish-setup.sh");
-
-    if ($?) {
-        return $failure;
-    }
-    return $success;
-}
-
-sub create_pg_hash {
-    my $pg_username = shift @_;
-    my $pg_password = shift @_;
-
-    my $encode_line = $pg_password . $pg_username;
-
-    # for Redhat:
-
-    ##print STDERR "executing /bin/echo -n $encode_line | md5sum\n";
-
-    my $hash;
-    if ( $WORKING_OS eq "MacOSX" ) {
-        $hash = `/bin/echo -n $encode_line | md5`;
-    }
-    else {
-        $hash = `/bin/echo -n $encode_line | md5sum`;
-    }
-
-    chop $hash;
-
-    $hash =~ s/  \-$//;
-
-    if ( ( length($hash) != 32 ) || ( $hash !~ /^[0-9a-f]*$/ ) ) {
-        print STDERR "Failed to generate a MD5-encrypted password hash for the Postgres database.\n";
-        exit 1;
-    }
-
-    return $hash;
-}
-
-sub validate_smtp_server {
-    my ( $mail_server_iaddr, $mail_server__paddr, $mail_server_proto, $mail_server_status );
-
-    $mail_server_status = 1;
-
-    my $userentry = $CONFIG_DEFAULTS{'MAIL_SERVER'};
-    my ($testserver, $testport) = split (":", $userentry);
-
-    unless ( $mail_server_iaddr = inet_aton( $testserver ) ) {
-	print STDERR "Could not look up $testserver,\n";
-	print STDERR "the host you specified as your mail server\n";
-	$mail_server_status = 0;
-    }
-
-    if ($mail_server_status) {
-	$testport = 25 unless $testport; 
-	my $mail_server_paddr = sockaddr_in( $testport, $mail_server_iaddr );
-	$mail_server_proto = getprotobyname('tcp');
-
-       unless ( socket( SOCK, PF_INET, SOCK_STREAM, $mail_server_proto )
-		 && connect( SOCK, $mail_server_paddr ) )
-	{
-	    print STDERR "Could not establish connection to $CONFIG_DEFAULTS{'MAIL_SERVER'},\n";
-	    print STDERR "the address you provided for your Mail server.\n";
-	    print STDERR "Please select a valid mail server, and try again.\n\n";
-
-	    $mail_server_status = 0;
-	}
-
-	close(SOCK);
-    }
-
-    return $mail_server_status; 
-}
-
-# support function for set_root_contact_email
-sub search_replace_file
-{
-        my ($infile, $pattern, $replacement, $outfile) = @_;
-        open (my $inp, $infile);
-        local $/ = undef;
-        my $txt = <$inp>;
-        close $inp;
-        $txt =~s/$pattern/$replacement/g;
-        open (my $opf, '>:encoding(UTF-8)', $outfile);
-        print $opf $txt;
-        close $opf;
-        return;
-}
-# set the email address for the default `dataverseAdmin` account
-sub set_root_contact_email
-{
-        my ($contact_email) = @_;
-        my $config_json = "data/user-admin.json";
-        search_replace_file($config_json,"\"email\":\"dataverse\@mailinator.com\"","\"email\":\"$contact_email\"",$config_json);
-        return;
-}
-
-
-sub setup_postgres {
-    my $pg_local_connection = 0;
-    my $pg_major_version = 0;
-    my $pg_minor_version = 0;
-
-
-# We'll need to do a few things as the Postgres admin user; 
-# We'll assume the name of the admin user is "postgres". 
-    my $POSTGRES_ADMIN_USER = "postgres";
-
-
-
-##Handling container env
-
-    if ($pod_name eq "start-glassfish")
-    {
-	# When we are in this openshift "start-glassfish" pod, we get all the 
-	# Postgres configuration from the environmental variables. 
-	print "Init container starting \n";
-	$CONFIG_DEFAULTS{'POSTGRES_SERVER'} = $ENV{"POSTGRES_SERVER"} . "." .  $ENV{"POSTGRES_SERVICE_HOST"};
-	$CONFIG_DEFAULTS{'POSTGRES_DATABASE'} = $ENV{"POSTGRES_DATABASE"};
-	$CONFIG_DEFAULTS{'POSTGRES_USER'} = $ENV{"POSTGRES_USER"};
-	$CONFIG_DEFAULTS{'POSTGRES_ADMIN_PASSWORD'} = $ENV{"POSTGRES_ADMIN_PASSWORD"};
-	# there was a weird case of the postgres admin password option spelled differently in openshift.json 
-	# - as "POSTGRESQL_ADMIN_PASSWORD"; I'm going to change it in openshift.json - but I'm leaving this
-	# next line here, just in case: (L.A. -- Sept. 2018)
-	$CONFIG_DEFAULTS{'POSTGRES_ADMIN_PASSWORD'} = $ENV{'POSTGRESQL_ADMIN_PASSWORD'};
-	$CONFIG_DEFAULTS{'POSTGRES_PASSWORD'} = $ENV{"POSTGRES_PASSWORD"};
-    }
-
-    if ( $CONFIG_DEFAULTS{'POSTGRES_SERVER'} eq 'localhost' || $CONFIG_DEFAULTS{'POSTGRES_SERVER'} eq '127.0.0.1' ) 
-    {
-	$pg_local_connection = 1;
-    } 
-#    elsif ($postgresonly) 
-#    {
-#	print "In the --pg_only mode the script can only be run LOCALLY,\n";
-#	print "i.e., on the server where PostgresQL is running, with the\n";
-#	print "Postgres server address as localhost - \"127.0.0.1\".\n";
-#	exit 1;
-#    }
-
-#If it is executing in a container, proceed easy with this all-in-one block
-
-
-
-
-# 3b. LOCATE THE psql EXECUTABLE:
-
-    if ( $pod_name eq "start-glassfish"){
-        $psql_exec_path = "/usr/bin"    
-    } 
-    else 
-    {
-	my $sys_path = $ENV{'PATH'};
-	my @sys_path_dirs = split( ":", $sys_path );
-
-	for my $sys_path_dir (@sys_path_dirs) {
-	    
-	    if ( -x $sys_path_dir . "/psql" ) {
-		$psql_exec_path = $sys_path_dir;
-
-		last;
-	    }
-	}
-    }
-
-    my $psql_major_version = 0;
-    my $psql_minor_version = 0;
-
-# 3c. IF PSQL WAS FOUND IN THE PATH, CHECK ITS VERSION:
-
-    unless ( $psql_exec_path eq "" ) {
-	open( PSQLOUT, $psql_exec_path . "/psql --version|" );
-
-	my $psql_version_line = <PSQLOUT>;
-	chop $psql_version_line;
-	close PSQLOUT;
-    
-	my ( $postgresName, $postgresNameLong, $postgresVersion ) = split( " ", $psql_version_line );
-
-	unless ( $postgresName eq "psql" && $postgresVersion =~ /^[0-9][0-9\.]*$/ ) {
-	    print STDERR "\nWARNING: Unexpected output from psql command!\n";
-	}
-	else 
-	{
-	    my (@psql_version_tokens) = split( '\.', $postgresVersion );
-
-	    print "\n\nFound Postgres psql command, version $postgresVersion.\n\n";
-
-	    $psql_major_version = $psql_version_tokens[0];
-	    $psql_minor_version = $psql_version_tokens[1];
-
-	    $pg_major_version = $psql_major_version;
-	    $pg_minor_version = $psql_minor_version;
-
-	}
-    }
-
-# a frequent problem with MacOSX is that the copy of psql found in the PATH
-# belongs to the older version of PostgresQL supplied with the OS, which happens
-# to be incompatible with the newer builds from the Postgres project; which are
-# recommended to be used with Dataverse. So if this is a MacOSX box, we'll
-# check what other versions of PG are available, and select the highest version
-# we can find:
-
-    if ( $WORKING_OS eq "MacOSX" ) {
-	my $macos_pg_major_version = 0;
-	my $macos_pg_minor_version = 0;
-	
-	for $macos_pg_minor_version ( "9", "8", "7", "6", "5", "4", "3", "2", "1", "0" ) {
-	    if ( -x "/Library/PostgreSQL/9." . $macos_pg_minor_version . "/bin/psql" ) {
-		$macos_pg_major_version = 9;
-		if (   ( $macos_pg_major_version > $psql_major_version )
-		       || ( $macos_pg_minor_version >= $psql_minor_version ) )
-		{
-		    $psql_exec_path        = "/Library/PostgreSQL/9." . $macos_pg_minor_version . "/bin";
-		    $pg_major_version = $macos_pg_major_version;
-		    $pg_minor_version = $macos_pg_minor_version;
-		}
-		last;
-	    }
-	}
-    }
-
-    my $psql_admin_exec = "";
-
-    if ( $psql_exec_path eq "" ) 
-    { 
-	if ( $pg_local_connection || $noninteractive) 
-	{
-	    print STDERR "\nERROR: I haven't been able to find the psql command in your PATH!\n";
-	    print STDERR "Please make sure PostgresQL is properly installed; if necessary, add\n";
-	    print STDERR "the location of psql to the PATH, then try again.\n\n";
-	    
-	    exit 1;
-	}
-	else 
-	{
-	    print "WARNING: I haven't been able to find the psql command in your PATH!\n";
-	    print "But since we are configuring a Dataverse instance to use a remote Postgres server,\n";
-	    print "we can still set up the database by running a setup script on that remote server\n";
-	    print "(see below for instructions).\n";
-	    
-	}
-    } else {
-
-	print "(Using psql version " . $pg_major_version . "." . $pg_minor_version . ": " . $psql_exec_path . "/psql)\n";
-
-
-	$psql_admin_exec = "PGPASSWORD=" . $CONFIG_DEFAULTS{'POSTGRES_ADMIN_PASSWORD'} . "; export PGPASSWORD; " . $psql_exec_path; 
-	$psql_exec_path = "PGPASSWORD=" . $CONFIG_DEFAULTS{'POSTGRES_PASSWORD'} . "; export PGPASSWORD; " . $psql_exec_path; 
-
-	print "Checking if we can talk to Postgres as the admin user...\n";
-    }
-    
-# 3d. CHECK IF WE CAN TALK TO POSTGRES AS THE ADMIN:
-
-    if ($psql_exec_path eq "" || system( $psql_admin_exec . "/psql -h " . $CONFIG_DEFAULTS{'POSTGRES_SERVER'} . " -p " . $CONFIG_DEFAULTS{'POSTGRES_PORT'} . " -U " . $POSTGRES_ADMIN_USER . " -d postgres -c 'SELECT * FROM pg_roles' > /dev/null 2>&1" ) ) 
-    {
-	# No, we can't. :(
-	if ($pg_local_connection || $noninteractive) 
-	{
-	    # If Postgres is running locally, this is a fatal condition. 
-	    # We'll give them some (potentially) helpful pointers and exit.
-
-	    print "(Tried executing: " . $psql_admin_exec . "/psql -h " . $CONFIG_DEFAULTS{'POSTGRES_SERVER'} . " -p " . $CONFIG_DEFAULTS{'POSTGRES_PORT'} . " -U " . $POSTGRES_ADMIN_USER . " -d postgres -c 'SELECT * FROM pg_roles' > /dev/null 2>&1) \n";
-	    print "Nope, I haven't been able to connect to the local instance of PostgresQL as the admin user.\n";
-	    print "\nIs postgresql running? \n";
-	    print "   On a RedHat-like system, you can check the status of the daemon with\n\n";
-	    print "      service postgresql start\n\n";
-	    print "   On MacOSX, use Applications -> PostgresQL -> Start Server.\n";
-	    print "   (or, if there's no \"Start Server\" item in your PostgresQL folder, \n";
-	    print "   simply restart your MacOSX system!)\n";
-	    print "\nAlso, please make sure that the daemon is listening to network connections!\n";
-	    print "   - at least on the localhost interface. (See \"Installing Postgres\" section\n";
-	    print "   of the installation manual).\n";
-	    print "\nFinally, did you supply the correct admin password?\n";
-	    print "   Don't know the admin password for your Postgres installation?\n";
-	    print "   - then simply set the access level to \"trust\" temporarily (for localhost only!)\n";
-	    print "   in your pg_hba.conf file. Again, please consult the \n";
-	    print "   installation manual).\n";
-	    exit 1;
-	}
-	else 
-	{
-	    # If we are configuring the Dataverse instance to use a Postgres server 
-	    # running on a remote host, it is possible to configure the database
-	    # without opening remote access for the admin user. They will simply 
-	    # have to run this script in the "postgres-only" mode on that server, locally, 
-	    # then resume the installation here: 
-	    print "(Tried executing: " . $psql_admin_exec . "/psql -h " . $CONFIG_DEFAULTS{'POSTGRES_SERVER'} . " -p " . $CONFIG_DEFAULTS{'POSTGRES_PORT'} . " -U " . $POSTGRES_ADMIN_USER . " -d postgres -c 'SELECT * FROM pg_roles' > /dev/null 2>&1)\n\n";
-	    print "Haven't been able to connect to the remote Postgres server as the admin user.\n";
-	    print "(Or you simply don't have psql installed on this server)\n";
-	    print "It IS possible to configure a database for your Dataverse on a remote server,\n";
-	    print "without having admin access to that remote Postgres installation.\n\n";
-	    print "In order to do that, please copy the installer (the entire package) to the server\n";
-	    print "where PostgresQL is running and run the installer with the \"--pg_only\" option:\n\n";
-	    print "   ./install --pg_only\n\n";
-
-	    print "Press any key to continue the installation process once that has been\n";
-	    print "done. Or press ctrl-C to exit the installer.\n\n";
-	    
-	    system "stty cbreak </dev/tty >/dev/tty 2>&1";
-	    my $key = getc(STDIN);
-	    system "stty -cbreak </dev/tty >/dev/tty 2>&1";
-	    print "\n";
-	}
-    }
-    else 
-    {
-	print "Yes, we can!\n";
-
-	# ok, we can proceed with configuring things...
-
-	print "\nConfiguring Postgres Database:\n";
-
-	# 4c. CHECK IF THIS DB ALREADY EXISTS:
-    
-	my $psql_command_dbcheck =
-	    $psql_admin_exec . "/psql -h " . $CONFIG_DEFAULTS{'POSTGRES_SERVER'} . " -p " . $CONFIG_DEFAULTS{'POSTGRES_PORT'} . " -U " . $POSTGRES_ADMIN_USER . " -c '' -d " . $CONFIG_DEFAULTS{'POSTGRES_DATABASE'} . ">/dev/null 2>&1";
-
-	if ( ( my $exitcode = system($psql_command_dbcheck) ) == 0 ) 
-	{    
-	    if ($force) 
-	    {
-		print "WARNING! Database "
-		    . $CONFIG_DEFAULTS{'POSTGRES_DATABASE'}
-		. " already exists but --force given... continuing.\n";
-	    } 
-	    else 
-	    {
-		print "WARNING! Database " . $CONFIG_DEFAULTS{'POSTGRES_DATABASE'} . " already exists!\n";
-
-		if ($noninteractive)
-		{
-		    exit 1;
-		}
-		else
-		{
-		    print "\nPress any key to continue, or ctrl-C to exit the installer...\n\n";
-        
-		    system "stty cbreak </dev/tty >/dev/tty 2>&1";
-		    my $key = getc(STDIN);
-		    system "stty -cbreak </dev/tty >/dev/tty 2>&1";
-		    print "\n";
-
-		}
-	    }
-	}
-
-	# 3e. CHECK IF THIS USER ALREADY EXISTS:
-    
-	my $psql_command_rolecheck =
-	    $psql_exec_path . "/psql -h " . $CONFIG_DEFAULTS{'POSTGRES_SERVER'} . " -c '' -d postgres " . $CONFIG_DEFAULTS{'POSTGRES_USER'} . " >/dev/null 2>&1";
-	my $exitcode; 
-
-	if ( ( $exitcode = system($psql_command_rolecheck) ) == 0 ) 
-	{
-	    print "User (role) " . $CONFIG_DEFAULTS{'POSTGRES_USER'} . " already exists;\n";
-	    print "Proceeding.";
-	}
-	else 
-	{
-	    # 3f. CREATE DVN DB USER:
-	    
-	    print "\nCreating Postgres user (role) for the DVN:\n";
-    
-	    open TMPCMD, ">/tmp/pgcmd.$$.tmp";
-
-	    # with md5-encrypted password:
-	    my $pg_password_md5 =
-		&create_pg_hash( $CONFIG_DEFAULTS{'POSTGRES_USER'}, $CONFIG_DEFAULTS{'POSTGRES_PASSWORD'} );
-	    my $sql_command =
-		"CREATE ROLE \""
-		. $CONFIG_DEFAULTS{'POSTGRES_USER'}
-	    . "\" PASSWORD 'md5"
-		. $pg_password_md5
-		. "' NOSUPERUSER CREATEDB CREATEROLE INHERIT LOGIN";
-
-	    print TMPCMD $sql_command;
-	    close TMPCMD;
-        
-	    my $psql_commandline = $psql_admin_exec . "/psql -h " . $CONFIG_DEFAULTS{'POSTGRES_SERVER'} . " -p " . $CONFIG_DEFAULTS{'POSTGRES_PORT'} . " -U " . $POSTGRES_ADMIN_USER . " -d postgres -f /tmp/pgcmd.$$.tmp >/dev/null 2>&1";
-
-	    my $out      = qx($psql_commandline 2>&1);
-	    $exitcode = $?;
-	    unless ( $exitcode == 0 ) 
-	    {
-		print STDERR "Could not create the DVN Postgres user role!\n";
-		print STDERR "(SQL: " . $sql_command . ")\n";
-		print STDERR "(psql exit code: " . $exitcode . ")\n";
-		print STDERR "(STDERR and STDOUT was: " . $out . ")\n";
-		exit 1;
-	    }
-
-	    unlink "/tmp/pgcmd.$$.tmp";
-	    print "done.\n";
-	}
-    
-	# 3g. CREATE DVN DB:
-    
-	print "\nCreating Postgres database:\n";
-    
-	my $psql_command =
-	    $psql_exec_path
-	    . "/createdb -h " . $CONFIG_DEFAULTS{'POSTGRES_SERVER'} . " -p " . $CONFIG_DEFAULTS{'POSTGRES_PORT'} . " -U $CONFIG_DEFAULTS{'POSTGRES_USER'} "
-	    . $CONFIG_DEFAULTS{'POSTGRES_DATABASE'} . " --owner="
-	    . $CONFIG_DEFAULTS{'POSTGRES_USER'};
-
-	my $out = qx($psql_command 2>&1);
-        $exitcode = $?;
-	unless ( $exitcode == 0 ) 
-	{
-	    print STDERR "Could not create Postgres database for the Dataverse app!\n";
-	    print STDERR "(command: " . $psql_command . ")\n";
-	    print STDERR "(psql exit code: " . $exitcode . ")\n";
-	    print STDERR "(STDOUT and STDERR: " . $out . ")\n";
-	    if ($force) 
-	    {
-		print STDERR "\ncalled with --force, continuing\n";
-	    }
-	    else 
-	    {
-		print STDERR "\naborting the installation (sorry!)\n\n";
-		exit 1;
-	    }
-	}
-    }
-
-# Whether the user and the database were created locally or remotely, we'll now 
-# verify that we can talk to that database, with the credentials of the database
-# user that we want the Dataverse application to be using: 
-
-    if ( $psql_exec_path ne "" && system( $psql_exec_path . "/psql -h " . $CONFIG_DEFAULTS{'POSTGRES_SERVER'} . " -p " . $CONFIG_DEFAULTS{'POSTGRES_PORT'} . " -U " . $CONFIG_DEFAULTS{'POSTGRES_USER'} . " -d " . $CONFIG_DEFAULTS{'POSTGRES_DATABASE'} . " -c 'SELECT * FROM pg_roles' > /dev/null 2>&1" ) ) 
-    {
-	print STDERR "Oops, haven't been able to connect to the database " . $CONFIG_DEFAULTS{'POSTGRES_DATABASE'} . ",\n";
-	print STDERR "running on " . $CONFIG_DEFAULTS{'POSTGRES_SERVER'} . ", as user " . $CONFIG_DEFAULTS{'POSTGRES_USER'} . ".\n\n";
-	print STDERR "Aborting the installation (sorry!)\n";
-	exit 1; 
-    }
-}
-
-sub import_reference_data {
-    print "\npopulating the database with reference data:\n\n";
-
-    # (we have already verified that the referenceData.sql file exists)
-
-    my $psql_command = $psql_exec_path . "/psql -h " . $CONFIG_DEFAULTS{'POSTGRES_SERVER'}
-        . " -p " . $CONFIG_DEFAULTS{'POSTGRES_PORT'}
-        . " -U " . $CONFIG_DEFAULTS{'POSTGRES_USER'}
-        . " -d " . $CONFIG_DEFAULTS{'POSTGRES_DATABASE'} . " -f " . $REFERENCE_DATA_SQL;
-
-    print "EXECUTING PSQL COMMAND: $psql_command\n";
-    unless ( ( my $exitcode = system("$psql_command") ) == 0 )
-    {
-        print "WARNING: Could not pre-populate Postgres database for the Dataverse application!\n";
-        print "(command: " . $psql_command . ")\n";
-        print "(psql exit code: " . $exitcode . ")\n";
-        print "\nYou must populate the database in order for all the features of your \n";
-        print "new Dataverse to be available. \n";
-        print "\n";
-        print "You can try this again, by executing the following on the command line:\n";
-        print "   psql -U $CONFIG_DEFAULTS{'POSTGRES_USER'} -d $CONFIG_DEFAULTS{'POSTGRES_DATABASE'} -f $REFERENCE_DATA_SQL\n";
-        print "then re-start glassfish  \n\n";
-        print "\n";
-        print "If it's still failing, please consult the installation manual and/or\n";
-        print "seek support from the Dataverse team.\n\n";
-        
-        print "Press any key to continue... ";
-        
-	unless ($noninteractive) 
-	{
-	    system "stty cbreak </dev/tty >/dev/tty 2>&1";
-	    my $key = getc(STDIN);
-	    system "stty -cbreak </dev/tty >/dev/tty 2>&1";
-	    print "\n";
-	}
-    }
-    else
-    {
-        print "\nOK, done!\n";
-    }
-}
-
diff --git a/scripts/installer/install.py b/scripts/installer/install.py
new file mode 100644
index 00000000000..005fbad46e0
--- /dev/null
+++ b/scripts/installer/install.py
@@ -0,0 +1,614 @@
+#!/usr/bin/python
+
+import os.path
+from os import fdopen
+from os import environ
+from os import getuid
+import psycopg2
+from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
+import re
+from shutil import copy2, move
+import subprocess 
+import getopt
+import sys
+import pwd
+from tempfile import mkstemp
+import xml.etree.cElementTree as ET
+from installUtils import (check_user, read_user_input, linux_ram, macos_ram, test_smtp_server, test_appserver_directory, validate_admin_email)
+from installAppServer import runAsadminScript
+from installConfig import read_config_file
+
+# process command line arguments: 
+# (all the options supported by the old installer replicated verbatim!)
+shortOptions = "vyf"
+longOptions = ["verbose", 
+               "yes", 
+               "force",
+               "noninteractive", 
+               "pg_only", 
+               "skip_db_setup", 
+               "nogfpasswd", 
+               "hostname=", 
+               "gfuser=", 
+               "gfdir=", 
+               "mailserver=", 
+               "admin_email=",
+               "config_file="]
+
+# default values of the command line options:
+nonInteractive=False
+verbose=False
+force=False
+pgOnly=False
+skipDatabaseSetup=False
+noGlassfishPassword=False
+hostName=""
+gfUser=""
+gfDir=""
+mailServer=""
+adminEmail=""
+configFile="default.config"
+
+cmdLineArguments = sys.argv
+
+try:
+   parsedArguments, values = getopt.getopt(cmdLineArguments[1:], shortOptions, longOptions)
+except getopt.error as err:
+   print (str(err))
+   sys.exit(2)
+
+for currentArgument, currentValue in parsedArguments:
+   if currentArgument in ("-v", "--verbose"):
+      print ("enabling verbose mode")
+      verbose=True
+   elif currentArgument in ("-y", "--noninteractive", "--yes"):
+      print ("enabling non-interactive mode")
+      nonInteractive=True
+   elif currentArgument in ("--force"):
+      print ("enabling \"force\" mode - will continue even if the database specified already exists!")
+      force=True
+   elif currentArgument in ("--pg_only"):
+      pgOnly=True
+   elif currentArgument in ("--skip_db_setup"):
+      skipDatabaseSetup=True
+   elif currentArgument in ("--nogfpasswd"):
+      noGlassfishPassword=True
+   elif currentArgument in ("--hostname"):
+      hostName=currentValue
+   elif currentArgument in ("--gfuser"):
+      gfUser=currentValue
+   elif currentArgument in ("--gfdir"):
+      gfDir=currentValue
+   elif currentArgument in ("--mailserver"):
+      mailServer=currentValue
+   elif currentArgument in ("--admin_email"):
+      adminEmail=currentValue
+   elif currentArgument in ("--config_file"):
+      configFile=currentValue
+
+# "podName" is specified as an env. variable and used in Docker scripts;
+# (@todo: is it really needed though? can we use the existing option "skipDatabaseSetup" instead?)
+# (ok, there may be some custom code that relies on this MY_POD_NAME being set to a cetain value)
+podName = os.environ.get('MY_POD_NAME')
+
+# ----- configuration ----- #
+
+if pgOnly: 
+   configSections = ["database"]
+else:
+   configSections = ["glassfish",
+                     "database",
+                     "rserve",
+                     "system",
+                     "doi"]
+
+
+# read pre-defined defaults:
+if not os.path.exists(configFile):
+   sys.exit("Configuration file "+configFile+" not found.")
+config=read_config_file(configFile)
+
+# expected dataverse defaults
+apiUrl = "http://localhost:8080/api"
+
+# 0. A few preliminary checks:                                                                                   
+# 0a. OS flavor:
+ 
+try:
+   unameOutput = subprocess.check_output(["uname", "-a"])
+   unameToken = unameOutput.decode().split()[0]
+except:
+   sys.exit("Warning! Failed to execute \"uname -a\"; aborting")
+
+if unameToken == "Darwin":
+   print("\nThis appears to be a MacOS X system; good.")
+   myOS = "MacOSX"
+elif unameToken == "Linux":
+   if os.path.exists("/etc/redhat-release"):
+      print("\nThis appears to be a RedHat system; good.")
+      myOS = "RedHat"
+   else:
+      print("\nThis appears to be a non-RedHat Linux system;")
+      print("this installation *may* succeed; but we're not making any promises!")
+      myOS = "Linux"
+else:
+   print("\nERROR: The installer only works on a RedHat Linux or MacOS X system!")
+   print("This appears to be neither. Aborting")
+   sys.exit(1)
+
+# 0b. host name:
+# the name entered on the command line as --hostname overrides other methods:
+if hostName != "":
+   config.set('glassfish', 'HOST_DNS_ADDRESS', hostName)
+else:
+   # (@todo? skip this if in --noninteractive mode? i.e., just use what's in default.config?)
+   try:
+      hostNameFromCommand = subprocess.check_output(["hostname"]).decode().rstrip()
+      config.set('glassfish', 'HOST_DNS_ADDRESS', hostNameFromCommand)
+   except:
+      print("Warning! Failed to execute \"hostname\"; assuming \"" + config.get('glassfish', 'HOST_DNS_ADDRESS') + "\"")
+
+# 0c. current OS user. 
+# try to get the current username from the environment; the first one we find wins:
+currentUser = os.environ.get('LOGNAME')
+if currentUser is None or currentUser == "":
+   currentUser = os.environ.get('USER')
+if currentUser is None or currentUser == "":
+   currentUser = pwd.getpwuid(os.getuid())[0]
+# we may need this username later (when we decide if we need to sudo to run asadmin?) 
+
+# if the username was specified on the command line, it takes precedence:
+if gfUser != "":
+   config.set('glassfish', 'GLASSFISH_USER', gfUser)
+   # check if the app. server user specified actually exists
+#   ret = subprocess.call("id "+gfUser+" > /dev/null 2>&1", shell=True)
+#   if ret != 0:
+   if not checkUser(gfUser):
+      sys.exit("Couldn't find user "+gfUser+". Please ensure the account exists.")
+else:
+   # use the username from the environment that we just found, above: 
+   # (@todo? skip this if in --noninteractive mode? i.e., just use what's in default.config?)
+   if currentUser is not None and currentUser != "":
+      config.set('glassfish', 'GLASSFISH_USER', currentUser)
+
+# warn the user that runnning the installer as root is not recommended, if that's what they are doing
+if not nonInteractive:
+   if os.getuid() == 0:
+      print("\n####################################################################")
+      print("     It is recommended that this script not be run as root.")
+      print(" Consider creating the service account \"dataverse\", giving it ownership")
+      print("  on the glassfish/domains/domain1/ and glassfish/lib/ directories,")
+      print("    along with the JVM-specified files.dir location, and designate")
+      print("    that account to launch and run the Application Server (Payara),")
+      print("           AND use that user account to run this installer.")
+      print("####################################################################\n")
+      ret = read_user_input("hit return to continue (or ctrl-C to exit the installer)")
+
+# 0d. the following 3 options can also be specified on the command line, and
+# also take precedence over the default values that are hard-coded and/or
+# provided in the default.config file:
+
+if adminEmail != "":
+   print("testing "+adminEmail+"...")
+   if validate_admin_email(adminEmail):
+      print("ok")
+      config.set('system', 'ADMIN_EMAIL', adminEmail)
+   else:
+      sys.exit("Invalid email address: "+adminEmail+". Please specify a valid email address for the admin.")
+
+if mailServer != "":
+   print("testing "+mailServer+"...")
+   if test_smtp_server(mailServer):
+      print("ok")
+      config.set('system', 'MAIL_SERVER', mailServer)
+   else:
+      sys.exit("Could not establish connection to "+mailServer+". Please specify a valid smtp server.")
+
+if gfDir != "":
+   print("testing "+gfDir+"...")
+   if test_appserver_directory(gfDir):
+      print("ok")
+      config.set('glassfish', 'GLASSFISH_DIRECTORY', gfDir)
+   else:
+      sys.exit("Invalid Payara directory: "+gfDir+". Please specify a valid Payara directory.")
+
+# 0e. current working directory:
+# @todo - do we need it still?
+
+# 1. CHECK FOR SOME MANDATORY COMPONENTS (war file, etc.)                                                         
+# since we can't do anything without these things in place, better check for                                      
+# them before we go into the interactive config mode.                                                             
+# (skip if this is a database-only setup)
+
+if not pgOnly:
+   print("Checking for required components...")
+   # 1a. check to see if warfile is available
+   warfile = "dataverse.war"
+   warfileVersion = ""
+   if not os.path.isfile(warfile):
+      # get dataverse version from pom.xml
+      tree = ET.ElementTree(file='../../modules/dataverse-parent/pom.xml')
+      for elem in tree.iter("*"):
+         if elem.tag == '{http://maven.apache.org/POM/4.0.0}revision':
+            warfileVersion = elem.text
+         # only want the first, the rest are dependencies
+            break
+      # now check for version-ed warfile, or bail
+      warfile = '../../target/dataverse-' + warfileVersion + '.war'
+      if not os.path.isfile(warfile):
+         sys.exit("Sorry, I can't seem to find an appropriate warfile.\nAre you running the installer from the right directory?")
+   print(warfile+" available to deploy. Good.")
+
+   # 1c. check if jq is available
+   # (but we're only doing it if it's not that weird "pod name" mode)
+   if podName != "start-glassfish":
+      print("Checking if jq is available...")
+      try:
+         subprocess.call(["jq", "--version"])
+         print("good!")
+      except:
+         sys.exit("Can't find the jq utility in my path. Is it installed?")
+
+   # 1d. check java version
+   java_version = subprocess.check_output(["java", "-version"], stderr=subprocess.STDOUT).decode()
+   print("Found java version "+java_version)
+   if not re.search('(17)', java_version):
+      sys.exit("Dataverse requires OpenJDK 17. Please make sure it's in your PATH, and try again.")
+
+   # 1e. check if the setup scripts - setup-all.sh, are available as well, maybe?
+   # @todo (?)
+
+# 2. INTERACTIVE CONFIG SECTION
+
+# 2a. read the input prompts and help messages for the interactive mode:
+interactiveConfig = read_config_file("interactive.config")
+
+# 2b. run the interactive dialog:
+if nonInteractive:
+   print("non-interactive mode - skipping the config dialog")
+else:
+   print("\nWelcome to the Dataverse installer.\n")
+
+   if pgOnly:
+      print("You will be guided through the process of configuring your")
+      print("PostgreSQL database for use by the Dataverse application.")
+   else:
+      print("You will be guided through the process of setting up a NEW")
+      print("instance of the dataverse application")
+
+   print
+   print("Please enter the following configuration values:")
+   print("(hit [RETURN] to accept the default value)")
+   print
+
+   dialogDone = False
+
+   while not dialogDone:
+      for section in configSections:
+         for option in config.options(section):
+            configPrompt = interactiveConfig.get('prompts', option)
+
+            # empty config prompt means 
+            # this option is not part of the interactive config:
+            if configPrompt != "":
+               configHelp = interactiveConfig.get('comments', option)
+               configHelp = re.sub('\\\\n', "\n", configHelp)
+               if configHelp == "":
+                  promptLine = configPrompt + ": [" + config.get(section, option) + "] "
+               else:
+                  promptLine = configPrompt + configHelp + "[" + config.get(section, option) + "] "
+                  
+               userInput = read_user_input(promptLine)
+            
+               if userInput != "":
+                  config.set(section, option, userInput)
+
+               # for the following specific options, we want to do validation in real time:
+               if option == "admin_email":
+                  adminEmail = config.get('system', 'ADMIN_EMAIL')
+                  while not validate_admin_email(adminEmail):
+                     print("\nInvalid email address: "+adminEmail+"!")
+                     adminEmail = read_user_input("Enter a valid email address for the admin:\n(Or ctrl-C to exit the installer): ")
+                  config.set('system', 'ADMIN_EMAIL', adminEmail)
+               elif option == "glassfish_directory":
+                  gfDir = config.get('glassfish', 'GLASSFISH_DIRECTORY')
+                  while not test_appserver_directory(gfDir):
+                     print("\nInvalid Payara directory!")
+                     gfDir = read_user_input("Enter the root directory of your Payara installation:\n(Or ctrl-C to exit the installer): ")
+                  config.set('glassfish', 'GLASSFISH_DIRECTORY', gfDir)
+               elif option == "mail_server":
+                  mailServer = config.get('system', 'MAIL_SERVER')
+                  while not test_smtp_server(mailServer):
+                     mailServer = read_user_input("Enter a valid SMTP (mail) server:\n(Or ctrl-C to exit the installer): ")
+                  config.set('system', 'MAIL_SERVER', mailServer)
+                                              
+
+               print
+
+      # 2b. Verify that they are happy with what they have entered:
+      print("\nOK, please confirm what you've entered:\n")
+      for section in configSections:
+         for option in config.options(section):
+            if interactiveConfig.get('prompts', option) != "":
+               print(interactiveConfig.get('prompts', option) + ": " + config.get(section, option))
+
+      yesno = read_user_input("\nIs this correct? [y/n] ")
+
+      while ( yesno != 'y' and yesno != 'n' ):
+         yesnoPrompt = "Please enter 'y' or 'n'!\n(or ctrl-C to exit the installer)\n"
+         yesno = read_user_input(yesnoPrompt)
+
+      if yesno == 'y':
+         dialogDone = True
+      
+# 2c. initialize configuration variables from what we've gathered in the config dict: (for convenience)
+
+# database settings/credentials:
+pgAdminPassword = config.get('database', 'POSTGRES_ADMIN_PASSWORD')
+pgDb = config.get('database', 'POSTGRES_DATABASE')
+pgHost = config.get('database', 'POSTGRES_SERVER')
+pgPassword = config.get('database', 'POSTGRES_PASSWORD')
+pgUser = config.get('database', 'POSTGRES_USER')
+# app. server (payara) settings:
+hostName = config.get('glassfish', 'HOST_DNS_ADDRESS')
+gfDir = config.get('glassfish', 'GLASSFISH_DIRECTORY')
+gfUser = config.get('glassfish', 'GLASSFISH_USER')
+gfConfig = gfDir+"/glassfish/domains/domain1/config/domain.xml"
+gfConfigDir = gfDir+"/glassfish/domains/domain1/config"
+gfHeap = config.get('glassfish', 'GLASSFISH_HEAP')
+gfAdminUser = config.get('glassfish', 'GLASSFISH_ADMIN_USER')
+gfAdminPassword = config.get('glassfish', 'GLASSFISH_ADMIN_PASSWORD')
+gfDomain = "domain1"
+gfJarPath = gfDir+"/glassfish/lib"
+gfModulePath = gfDir+"/glassfish/modules"
+# system settings:
+adminEmail = config.get('system', 'ADMIN_EMAIL')
+solrLocation = config.get('system', 'SOLR_LOCATION')
+
+# 3. SET UP POSTGRES USER AND DATABASE
+
+if podName != "start-glassfish" and podName != "dataverse-glassfish-0" and not skipDatabaseSetup:
+   print("performing database setup")
+
+   # 3a. can we connect as the postgres admin user?
+   admin_conn_string = "dbname='postgres' user='postgres' password='"+pgAdminPassword+"' host='"+pgHost+"'"
+
+   try:
+      conn = psycopg2.connect(admin_conn_string)
+      print("Admin database connectivity succeeds.")
+   except:
+      print("Can't connect to PostgresQL as the admin user.\n")
+      sys.exit("Is the server running, have you adjusted pg_hba.conf, etc?")
+
+   # 3b. get the Postgres version for new permissions model in versions 15+
+   try:
+      pg_full_version = str(conn.server_version)
+      pg_major_version = pg_full_version[0:2]
+      print("PostgreSQL version: "+pg_major_version)
+   except:
+      print("Warning: Couldn't determine PostgreSQL version.")
+   conn.close()
+
+   # 3c. create role:
+
+   conn_cmd = "CREATE ROLE "+pgUser+" PASSWORD '"+pgPassword+"' NOSUPERUSER CREATEDB CREATEROLE INHERIT LOGIN;"
+   conn = psycopg2.connect(admin_conn_string)
+   conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
+   cur = conn.cursor()
+   try:
+      cur.execute(conn_cmd)
+   except:
+      print("Looks like the user already exists. Continuing.")
+
+   # 3d. create database:
+
+   conn_cmd = "CREATE DATABASE "+pgDb+" OWNER "+pgUser+";"
+   try:
+      cur.execute(conn_cmd)
+   except:
+      if force:
+         print("WARNING: failed to create the database - continuing, since the --force option was specified")
+      else:
+         sys.exit("Couldn't create database or database already exists.\n")
+
+   # 3e. set permissions:
+
+   conn_cmd = "GRANT ALL PRIVILEGES on DATABASE "+pgDb+" to "+pgUser+";"
+   try:
+      cur.execute(conn_cmd)
+   except:
+      sys.exit("Couldn't grant privileges on "+pgDb+" to "+pgUser)
+   cur.close()
+   conn.close()
+
+   if int(pg_major_version) >= 15:
+      admin_conn_string = "dbname='"+pgDb+"' user='postgres' password='"+pgAdminPassword+"' host='"+pgHost+"'"
+      conn = psycopg2.connect(admin_conn_string)
+      conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
+      cur = conn.cursor()
+      conn_cmd = "GRANT CREATE ON SCHEMA public TO "+pgUser+";"
+      try:
+         print("PostgreSQL 15 or higher detected. Running " + conn_cmd)
+         cur.execute(conn_cmd)
+      except:
+         if force:
+            print("WARNING: failed to grant permissions on schema public - continuing, since the --force option was specified")
+         else:
+            sys.exit("Couldn't grant privileges on schema public to "+pgUser)
+      cur.close()
+      conn.close()
+
+   print("Database and role created!")
+   if pgOnly:
+      print("postgres-only setup complete.")
+      sys.exit()
+
+# 4. CONFIGURE PAYARA
+
+# 4a. App. server heap size - let's make it 1/2 of system memory
+# @todo: should we skip doing this in the non-interactive mode? (and just use the value from the config file?)
+if myOS == "MacOSX":
+   gfHeap = int(macos_ram() / 2)
+else:
+   # linux
+   gfHeap = int(linux_ram() / 2)
+print("Setting App. Server heap size (Xmx) to "+str(gfHeap)+" Megabytes")
+config.set('glassfish','GLASSFISH_HEAP', str(gfHeap))
+
+# 4c. create payara admin credentials file
+
+userHomeDir = pwd.getpwuid(os.getuid())[5]
+gfClientDir = userHomeDir+"/.gfclient"
+gfClientFile = gfClientDir+"/pass"
+
+print("using payara/glassfish client file: " + gfClientFile)
+
+# mkdir gfClientDir
+if not os.path.isdir(gfClientDir):
+   try:
+      os.mkdir(gfClientDir,0o700)
+   except:
+      print("Couldn't create "+gfClientDir+", please check permissions.")
+ 
+# write credentials
+credstring = "asadmin://"+gfAdminUser+"@localhost:4848"
+
+f = open(gfClientFile, 'w')
+try:
+   f.write(credstring)
+   print("Payara admin credentials written to "+gfClientFile+".")
+except:
+   print("Unable to write Payara admin credentials. Subsequent commands will likely fail.")
+f.close
+
+# 4d. check if Payara is running, attempt to start if necessary
+asadmincmd = gfDir +"/bin/asadmin"
+domain_status = subprocess.check_output([asadmincmd, "list-domains"], stderr=subprocess.STDOUT).decode()
+if re.match(gfDomain+" not running", domain_status):
+   print("Looks like Payara isn't running. Attempting to start it...")
+   subprocess.call([asadmincmd, "start-domain"], stderr=subprocess.STDOUT)
+   # now check again or bail
+   print("Checking to be sure "+gfDomain+" is running.")
+   domain_status = subprocess.check_output([asadmincmd, "list-domains"], stderr=subprocess.STDOUT).decode()
+   if not re.match(gfDomain+" running", domain_status):
+      sys.exit("There was a problem starting Payara. Please ensure that it's running, or that the installer can launch it.")
+
+# 4e. check if asadmin login works
+#gf_adminpass_status = subprocess.check_output([asadmincmd, "login", "--user="+gfAdminUser, "--passwordfile "+gfClientFile])
+
+if not nonInteractive:
+   gfAdminLoginStatus = subprocess.call([asadmincmd, "login", "--user="+gfAdminUser])
+
+# 4f. configure glassfish by running the standalone shell script that executes the asadmin commands as needed.
+
+print("Note: some asadmin commands will fail, and that's ok. Existing settings can't be created; new settings can't be cleared beforehand.")
+
+if not runAsadminScript(config):
+   sys.exit("Payara configuration script failed to execute properly; aborting.")
+
+# 4g. Additional config files:
+
+jhoveConfig = "jhove.conf"
+jhoveConfigSchema = "jhoveConfig.xsd"
+
+jhoveConfigDist = jhoveConfig
+jhoveConfigSchemaDist = jhoveConfigSchema
+
+# (if the installer is being run NOT as part of a distribution zipped bundle, but
+# from inside the source tree - adjust the locations of the jhove config files:
+
+if not os.path.exists(jhoveConfigDist):
+   jhoveConfigDist = "../../conf/jhove/" + jhoveConfig
+   jhoveConfigSchemaDist = "../../conf/jhove/" + jhoveConfigSchema
+
+# but if we can't find the files in either location, it must mean
+# that they are not running the script in the correct directory - so
+# nothing else left for us to do but give up:
+if not os.path.exists(jhoveConfigDist) or not os.path.exists(jhoveConfigSchemaDist):
+   sys.exit("Jhove config files not found; aborting. (are you running the installer in the right directory?)")
+
+print("\nInstalling additional configuration files (Jhove)... ")
+try: 
+   copy2(jhoveConfigSchemaDist, gfConfigDir)
+   # The JHOVE conf file has an absolute PATH of the JHOVE config schema file (uh, yeah...)
+   # and may need to be adjusted, if Payara is installed anywhere other than /usr/local/payara6:
+   if gfDir == "/usr/local/payara6":
+      copy2(jhoveConfigDist, gfConfigDir)
+   else:
+      # use sed to replace /usr/local/payara6 in the distribution copy with the real gfDir:
+      sedCommand = "sed 's:/usr/local/payara6:"+gfDir+":g' < " + jhoveConfigDist + " > " + gfConfigDir + "/" + jhoveConfig
+      subprocess.call(sedCommand, shell=True)
+
+   print("done.")
+except: 
+   sys.exit("Failed to copy Jhove config files into the domain config dir. (check permissions?)")
+
+# 5. Deploy the application: 
+
+print("Deploying the application ("+warfile+")")
+returnCode = subprocess.call([asadmincmd, "deploy", warfile])
+if returnCode != 0:
+   sys.exit("Failed to deploy the application!")
+# @todo: restart/try to deploy again if it failed?
+# @todo: if asadmin deploy says it was successful, verify that the application is running... if not - repeat the above?
+
+# 7. RUN SETUP SCRIPTS AND CONFIGURE EXTRA SETTINGS
+# (note that we may need to change directories, depending on whether this is a dev., or release installer)
+# 7a. run setup scripts
+print("Running post-deployment setup script (setup-all.sh)")
+if not os.path.exists("setup-all.sh") or not os.path.isdir("data"):
+   os.chdir("../api")
+
+# try again:
+if not os.path.exists("setup-all.sh") or not os.path.isdir("data"):
+   sys.exit("Can't find the api setup scripts; aborting. (are you running the installer in the right directory?)")
+
+try:
+   subprocess.call("./setup-all.sh > setup-all.$$.log 2>&1", shell=True)
+except:
+   sys.exit("Failure to execute setup-all.sh! aborting.")
+
+# 8c. configure remote Solr location, if specified
+if solrLocation != "LOCAL":
+   print("configuring remote Solr location... ("+solrLocation+")")
+   returnCode = subprocess.call(["curl", "-X", "PUT", "-d", solrLocation, apiUrl+"/admin/settings/:SolrHostColonPort"])
+   if returnCode != 0:
+      print("\nWARNING: failed to configure the remote Solr location in the Dataverse settings!")
+   else:
+      print("\ndone.")
+
+# 9. DECLARE VICTORY
+# ... and give some additional information to the user
+
+print("\n\nYou should now have a running Dataverse instance at")
+print("  http://" + hostName + ":8080\n\n")
+
+# PID instructions: 
+
+print("\nYour Dataverse has been configured to use a Fake DOI Provider, registering (non-resolvable) DOI global identifiers in the ")
+print("test name space \"10.5072\" with the \"shoulder\" \"FK2\"")
+print("You can reconfigure to use additional/alternative providers.")
+print("If you intend to use DOIs, you should contact DataCite (support\@datacite.org) or GDCC (see https://www.gdcc.io/about.html) and request a test account.")
+print("Once you receive the account information (name, password, authority, shoulder), add them to your configuration ")
+print("as described in the Dataverse Guides (see https://guides.dataverse.org/en/latest/installation/config.html#persistent-identifiers-and-publishing-datasets),")
+print("and restart payara")
+print("If this is a production Dataverse and you are planning to register datasets as ")
+print("\"real\", non-test DOIs or Handles, consult the \"Persistent Identifiers and Publishing Datasets\"")
+print("section of the Installataion guide, on how to configure your Dataverse with the proper registration")
+print("credentials.\n")
+
+# Warning for the developers about deployment: 
+
+if warfileVersion is not None:
+   print("IMPORTANT!")
+   print("If this is a personal development installation, we recommend that you undeploy the currently-running copy")
+   print("of the application, with the following asadmin command:\n")
+   print("\t" + gfDir + '/bin/asadmin undeploy dataverse-' + warfileVersion + "\n")
+   print("before attempting to deploy from your development environment in NetBeans.\n")
+
+sys.exit()
+
+# 10. (OPTIONALLY?) CHECK THE RSERVE SETUP
+# @todo
+# (it's disabled in the current version of the old installer)
+
diff --git a/scripts/installer/installAppServer.py b/scripts/installer/installAppServer.py
new file mode 100644
index 00000000000..7636490c583
--- /dev/null
+++ b/scripts/installer/installAppServer.py
@@ -0,0 +1,55 @@
+import os
+import subprocess
+
+def runAsadminScript(config):
+   # We are going to run a standalone shell script with a bunch of asadmin                                      
+   # commands to set up all the app. server (payara6) components for the application.
+   # All the parameters must be passed to that script as environmental                                          
+   # variables:
+   os.environ['GLASSFISH_DOMAIN'] = "domain1"
+   os.environ['ASADMIN_OPTS'] = ""
+   os.environ['ADMIN_EMAIL'] = config.get('system','ADMIN_EMAIL')
+
+   os.environ['HOST_ADDRESS'] = config.get('glassfish','HOST_DNS_ADDRESS')
+   os.environ['GLASSFISH_ROOT'] = config.get('glassfish','GLASSFISH_DIRECTORY')
+   os.environ['MEM_HEAP_SIZE'] = config.get('glassfish','GLASSFISH_HEAP')
+   os.environ['GLASSFISH_REQUEST_TIMEOUT'] = config.get('glassfish','GLASSFISH_REQUEST_TIMEOUT')
+	
+   os.environ['DB_PORT'] = config.get('database','POSTGRES_PORT')
+   os.environ['DB_HOST'] = config.get('database','POSTGRES_SERVER')
+   os.environ['DB_NAME'] = config.get('database','POSTGRES_DATABASE')
+   os.environ['DB_USER'] = config.get('database','POSTGRES_USER')
+   os.environ['DB_PASS'] = config.get('database','POSTGRES_PASSWORD')
+   
+   os.environ['RSERVE_HOST'] = config.get('rserve','RSERVE_HOST')
+   os.environ['RSERVE_PORT'] = config.get('rserve','RSERVE_PORT')
+   os.environ['RSERVE_USER'] = config.get('rserve','RSERVE_USER')
+   os.environ['RSERVE_PASS'] = config.get('rserve','RSERVE_PASSWORD')
+
+   os.environ['DOI_BASEURL'] = config.get('doi','DOI_BASEURL')
+   os.environ['DOI_USERNAME'] = config.get('doi','DOI_USERNAME')
+   os.environ['DOI_PASSWORD'] = config.get('doi','DOI_PASSWORD')
+   os.environ['DOI_DATACITERESTAPIURL'] = config.get('doi','DOI_DATACITERESTAPIURL')
+
+   mailServerEntry = config.get('system','MAIL_SERVER')
+
+   try:
+      mailServerHost, mailServerPort = config.get('system','MAIL_SERVER').split(":",1)
+      os.environ['SMTP_SERVER'] = mailServerHost
+      os.environ['SMTP_SERVER_PORT'] = mailServerPort
+   except:
+      mailServerHost = config.get('system','MAIL_SERVER')
+      os.environ['SMTP_SERVER'] = mailServerHost
+
+   os.environ['FILES_DIR'] = config.get('glassfish','GLASSFISH_DIRECTORY') + "/glassfish/domains/domain1/files"
+
+   # run app. server setup script:
+
+   print("running app. server configuration script (as-setup.sh)")
+   returncode = subprocess.call(["./as-setup.sh"])
+   if returncode != 0:
+      return False
+
+   return True
+
+
diff --git a/scripts/installer/installConfig.py b/scripts/installer/installConfig.py
new file mode 100644
index 00000000000..50090ce4c7c
--- /dev/null
+++ b/scripts/installer/installConfig.py
@@ -0,0 +1,15 @@
+from installUtils import is_python_3
+if is_python_3():
+    from configparser import ConfigParser
+else:
+    from ConfigParser import SafeConfigParser
+
+def read_config_file(configFile):
+    if is_python_3():
+        config = ConfigParser()
+    else:
+        config = SafeConfigParser()
+    config.read(configFile)
+    return config
+
+
diff --git a/scripts/installer/installUtils.py b/scripts/installer/installUtils.py
new file mode 100644
index 00000000000..ff5e6eb708d
--- /dev/null
+++ b/scripts/installer/installUtils.py
@@ -0,0 +1,95 @@
+import subprocess
+from os import popen
+import os.path
+import socket
+import re
+
+def check_user(userName):
+    ret = subprocess.call("id "+userName+" > /dev/null 2>&1", shell=True)
+    if ret != 0:
+        return False
+
+    return True
+
+def is_python_3():
+    python_version = int(str(range(3))[-2])
+    if python_version == 3:
+        return True
+    return False
+
+def read_user_input(prompt):
+    if is_python_3(): 
+        user_input = input(prompt)
+    else:
+        user_input = raw_input(prompt)        
+    return user_input
+
+
+def linux_ram():
+    totalMemory = os.popen("free -m").readlines()[1].split()[1]
+    return int(totalMemory)
+
+def macos_ram():
+    totalMemory = subprocess.check_output(["/usr/sbin/sysctl", "-n", "hw.memsize"]).rstrip()
+    return int(int(totalMemory) / (1024 * 1024)) # megabytes
+
+def validate_admin_email(emailAddress):
+    if re.match("[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}", emailAddress) is not None:
+        return True
+    return False
+
+def test_appserver_directory(directory):
+    if os.path.isdir(directory+"/glassfish/domains/domain1"):
+        major_version = 0
+        minor_version = 0
+        try:
+            with open(directory+"/glassfish/config/branding/glassfish-version.properties") as f:
+                for line in f:
+                    if "=" in line:            
+                        name, value = line.rstrip().split("=", 1)
+                
+                        if name == "major_version":
+                            major_version = int(value)
+                        elif name == "minor_version":
+                            minor_version = int(value)
+        except:
+            return False
+
+        #print("version: major: "+str(major_version)+", minor: "+str(minor_version))
+
+        if major_version != 6 or minor_version < 2023:
+            return False
+        return True
+
+    return False
+
+def test_smtp_server(address):
+    try:
+        smtpHost, smtpPort = address.split(":",1)
+    except:
+        smtpHost = address
+        smtpPort = "25"
+
+    try:
+        ip = socket.gethostbyname(smtpHost)
+    except:
+        print("Failed to look up the ip address of "+smtpHost)
+        return False
+
+    try: 
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) 
+    except socket.error as err: 
+        print("failed to create socket, error %s" %(err))
+        return False
+      
+    # connecting to the server 
+    try:
+        s.connect((smtpHost, int(smtpPort))) 
+    except socket.error as err:
+        print("failed to connect, error %s" %(err))
+        return False
+  
+    return True
+    
+    
+
diff --git a/scripts/installer/interactive.config b/scripts/installer/interactive.config
new file mode 100644
index 00000000000..ef8110c554f
--- /dev/null
+++ b/scripts/installer/interactive.config
@@ -0,0 +1,48 @@
+[prompts]
+ADMIN_EMAIL = Administrator email address for this Dataverse
+GLASSFISH_ADMIN_USER =
+GLASSFISH_ADMIN_PASSWORD =
+GLASSFISH_DIRECTORY = App. Server (Payara) Directory
+GLASSFISH_HEAP =
+GLASSFISH_USER = Payara service account username
+GLASSFISH_REQUEST_TIMEOUT = Payara download timeout
+POSTGRES_ONLY =
+POSTGRES_ADMIN_PASSWORD = Postgres ADMIN password
+POSTGRES_SERVER = Postgres Server Address
+POSTGRES_PORT = Postgres Server Port
+POSTGRES_DATABASE = Name of the Postgres Database
+POSTGRES_USER = Name of the Postgres User
+POSTGRES_PASSWORD = Postgres user password
+RSERVE_HOST = Rserve Server
+RSERVE_PORT = Rserve Server Port
+RSERVE_USER = Rserve User Name
+RSERVE_PASSWORD = Rserve User Password
+HOST_DNS_ADDRESS = Fully Qualified Domain Name of your host
+MAIL_SERVER = SMTP (mail) server (and port) to relay notification messages
+SOLR_LOCATION = Remote SOLR indexing service
+DOI_USERNAME = Datacite username
+DOI_PASSWORD = Datacite password
+DOI_BASEURL = Datacite URL
+DOI_DATACITERESTAPIURL = Datacite REST API URL
+[comments]
+HOST_DNS_ADDRESS = :(enter numeric IP address, if FQDN is unavailable)
+GLASSFISH_USER = :This user will be running the App. Server (Payara) service on your system.\n - If this is a dev. environment, this should be your own username; \n - In production, we suggest you create the account "dataverse", or use any other unprivileged user account\n:
+GLASSFISH_DIRECTORY = 
+GLASSFISH_REQUEST_TIMEOUT = :\n Defaults to 1800 seconds (30 minutes)
+ADMIN_EMAIL = :\n(please enter a valid email address!) 
+MAIL_SERVER = 
+POSTGRES_SERVER = 
+POSTGRES_PORT = 
+POSTGRES_ADMIN_PASSWORD = :\n - We will need this to create the user and database that the Dataverse application will be using.\n (Hit RETURN if access control is set to "trust" for this connection in pg_hba.conf)\n:
+POSTGRES_USER = :\n - This is the Postgres user that the Dataverse app will be using to talk to the database\n:
+POSTGRES_DATABASE = 
+POSTGRES_PASSWORD = 
+SOLR_LOCATION = ? \n - Leave this set to "LOCAL" if the SOLR will be running on the same (this) server.\n Otherwise, please enter the host AND THE PORT NUMBER of the remote SOLR service, colon-separated\n (for example: foo.edu:8983)\n: 
+RSERVE_HOST = 
+RSERVE_PORT = 
+RSERVE_USER = 
+RSERVE_PASSWORD = 
+DOI_USERNAME = DataCite or EZID username. Only necessary for publishing / minting DOIs.
+DOI_PASSWORD = DataCite or EZID account password.
+DOI_BASEURL = DataCite or EZID URL. Probably https://mds.datacite.org
+DOI_DATACITERESTAPIURL = DataCite REST API URL (Make Data Count, /pids API). Probably https://api.datacite.org
diff --git a/scripts/installer/pgdriver/postgresql-42.2.2.jar b/scripts/installer/pgdriver/postgresql-42.2.2.jar
deleted file mode 100644
index 530af83f733..00000000000
Binary files a/scripts/installer/pgdriver/postgresql-42.2.2.jar and /dev/null differ
diff --git a/scripts/installer/requirements.txt b/scripts/installer/requirements.txt
new file mode 100644
index 00000000000..d4a51620ea2
--- /dev/null
+++ b/scripts/installer/requirements.txt
@@ -0,0 +1,2 @@
+# python requirements
+psycopg2-binary==2.8.4
diff --git a/scripts/issues/11429/add-featured-items.sh b/scripts/issues/11429/add-featured-items.sh
new file mode 100755
index 00000000000..6b73d76562f
--- /dev/null
+++ b/scripts/issues/11429/add-featured-items.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+export API_TOKEN=e62ac03b-3bc8-4194-bcd6-d0381fe84e39
+export SERVER_URL=http://localhost:8080
+export ID=:root
+export FILENAME='Ī€.png'
+export CONTENT='test1'
+export DISPLAY_ORDER=0
+
+curl -H "X-Dataverse-key:$API_TOKEN" \
+     -X POST \
+     -F "id=0" \
+     -F "content=$CONTENT" \
+     -F "displayOrder=$DISPLAY_ORDER" \
+     -F "fileName=$FILENAME" \
+     -F "keepFile=false" \
+     -F "file=@$FILENAME" \
+     "$SERVER_URL/api/dataverses/$ID/featuredItems"
diff --git a/scripts/issues/11429/update-featured-item.sh b/scripts/issues/11429/update-featured-item.sh
new file mode 100755
index 00000000000..f60a806e906
--- /dev/null
+++ b/scripts/issues/11429/update-featured-item.sh
@@ -0,0 +1,17 @@
+#!/bin/bash -x
+export API_TOKEN=e62ac03b-3bc8-4194-bcd6-d0381fe84e39
+export SERVER_URL=http://localhost:8080
+export ID=78
+export FILENAME='Ī€.png'
+export CONTENT='test1'
+export DISPLAY_ORDER=0
+
+curl -H "X-Dataverse-key:$API_TOKEN" \
+     -X PUT \
+     -F "id=0" \
+     -F "content=$CONTENT" \
+     -F "displayOrder=$DISPLAY_ORDER" \
+     -F "fileName=$FILENAME" \
+     -F "keepFile=false" \
+     -F "file=@$FILENAME" \
+     "$SERVER_URL/api/dataverseFeaturedItems/$ID"
diff --git a/scripts/issues/11429/update-featured-items.sh b/scripts/issues/11429/update-featured-items.sh
new file mode 100755
index 00000000000..8415da1a9ce
--- /dev/null
+++ b/scripts/issues/11429/update-featured-items.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+export API_TOKEN=e62ac03b-3bc8-4194-bcd6-d0381fe84e39
+export SERVER_URL=http://localhost:8080
+export ID=:root
+export FILENAME='Ī€.png'
+export CONTENT='test1'
+export DISPLAY_ORDER=0
+
+curl -H "X-Dataverse-key:$API_TOKEN" \
+     -X PUT \
+     -F "id=0" \
+     -F "content=$CONTENT" \
+     -F "displayOrder=$DISPLAY_ORDER" \
+     -F "fileName=$FILENAME" \
+     -F "keepFile=false" \
+     -F "file=@$FILENAME" \
+     "$SERVER_URL/api/dataverses/$ID/featuredItems"
diff --git "a/scripts/issues/11429/\317\200.png" "b/scripts/issues/11429/\317\200.png"
new file mode 100644
index 00000000000..a4c599a9357
Binary files /dev/null and "b/scripts/issues/11429/\317\200.png" differ
diff --git a/scripts/issues/6510/PRE-RELEASE-INFO.txt b/scripts/issues/6510/PRE-RELEASE-INFO.txt
new file mode 100644
index 00000000000..7b71581eb8f
--- /dev/null
+++ b/scripts/issues/6510/PRE-RELEASE-INFO.txt
@@ -0,0 +1,22 @@
+We recently discovered a *potential* data integrity issue in
+Dataverse databases.  One manifests itself as duplicate DataFile
+objects created for the same uploaded file (https://github.com/IQSS/dataverse/issues/6522); the other as duplicate
+DataTable (tabular metadata) objects linked to the same
+DataFile (https://github.com/IQSS/dataverse/issues/6510). This issue impacted approximately .03% of datasets in Harvard's Dataverse.  
+
+To see if any datasets in your installation have been impacted by this data integrity issue, we've provided a diagnostic script here:
+
+https://github.com/IQSS/dataverse/raw/develop/scripts/issues/6510/check_datafiles_6522_6510.sh
+
+The script relies on the PostgreSQL utility psql to access the
+database. You will need to edit the credentials at the top of the script
+to match your database configuration.
+
+If neither of the two issues is present in your database, you will see
+a message "... no duplicate DataFile objects in your database" and "no
+tabular files affected by this issue in your database".
+
+If either, or both kinds of duplicates are detected, the script will
+provide further instructions. We will need you to send us the produced
+output to support@dataverse.org and we will assist you in resolving the issues in your
+database.
diff --git a/scripts/issues/6510/check_datafiles_6522_6510.sh b/scripts/issues/6510/check_datafiles_6522_6510.sh
new file mode 100755
index 00000000000..15bc7e80b5a
--- /dev/null
+++ b/scripts/issues/6510/check_datafiles_6522_6510.sh
@@ -0,0 +1,131 @@
+#!/bin/bash
+
+# begin config
+# PostgresQL credentials:
+# edit the following lines so that psql can talk to your database
+pg_host=localhost
+pg_port=5432
+pg_user=dvnapp
+pg_db=dvndb
+# you can leave the password blank, if Postgres is configured 
+# to accept connections without auth:
+pg_pass=
+# psql executable - add full path, if necessary:
+PSQL_EXEC=psql
+
+# end config
+
+# first issue, duplicate datafiles: (#6522)
+
+PG_QUERY_0="SELECT COUNT(DISTINCT o.id) FROM datafile f, dataset s, dvobject p, dvobject o WHERE s.id = p.id AND o.id = f.id AND o.owner_id = s.id AND s.harvestingclient_id IS null AND o.storageidentifier IS NOT null"
+
+PG_QUERY_1="SELECT s.id, o.storageidentifier FROM datafile f, dataset s, dvobject o WHERE o.id = f.id AND o.owner_id = s.id AND s.harvestingclient_id IS null AND o.storageidentifier IS NOT null ORDER by o.storageidentifier"
+
+PG_QUERY_2="SELECT p.authority, p.identifier, o.storageidentifier, o.id, o.createdate, f.contenttype FROM datafile f, dvobject p, dvobject o WHERE o.id = f.id AND o.owner_id = p.id AND o.storageidentifier='%s' ORDER by o.id"
+
+PGPASSWORD=$pg_pass; export PGPASSWORD
+
+echo "Checking the number of non-harvested datafiles in the database..."
+
+NUM_DATAFILES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_0}"`
+if [ $? != 0 ]
+then
+    echo "FAILED to execute psql! Check the credentials and try again?"
+    echo "exiting..."
+    echo 
+    echo "the command line that failed:"
+    echo "${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c \"${PG_QUERY_0}\""
+    exit 1
+fi
+
+echo $NUM_DATAFILES total.
+echo 
+
+echo "Let's check if any storage identifiers are referenced more than once within the same dataset:" 
+
+${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_1}" |
+uniq -c | 
+awk '{if ($1 > 1) print $NF}' > /tmp/storageidentifiers.tmp
+
+NUM_CONFIRMED=`cat /tmp/storageidentifiers.tmp | wc -l`
+
+if [ $NUM_CONFIRMED == 0 ]
+then
+    echo 
+    echo "Good news - it appears that there are NO duplicate DataFile objects in your database."
+    echo "Your installation is ready to be upgraded to Dataverse 4.20."
+    echo 
+else
+
+    echo "The following storage identifiers appear to be referenced from multiple DvObjects:"
+    cat /tmp/storageidentifiers.tmp
+    echo "(output saved in /tmp/storageidentifiers.tmp)"
+
+    echo "Looking up details for the affected datafiles:"
+
+    cat /tmp/storageidentifiers.tmp | while read si
+    do
+	PG_QUERY_SI=`printf "${PG_QUERY_2}" $si`
+	${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_SI}"
+    done | tee /tmp/duplicates_info.tmp
+
+    echo "(output saved in /tmp/duplicates_info.tmp)"
+
+    echo 
+    echo "Please send the output above to Dataverse support at support@dataverse.org." 
+    echo "We will assist you in the process of cleaning up the affected files above."
+    echo "We apologize for any inconvenience."
+    echo 
+fi
+
+# second issue, repeated ingests: (issue #6510)
+
+PG_QUERY_3="SELECT COUNT(DISTINCT o.id) FROM datafile f, dataset s, dvobject o, datatable t WHERE o.id = f.id AND o.owner_id = s.id AND t.datafile_id = f.id AND s.harvestingclient_id IS null AND o.storageidentifier IS NOT null"
+
+PG_QUERY_4="SELECT t.id, f.id FROM datafile f, dataset s, dvobject o, datatable t WHERE o.id = f.id AND o.owner_id = s.id AND t.datafile_id = f.id AND s.harvestingclient_id IS null AND o.storageidentifier IS NOT null ORDER by f.id, t.id"
+
+PG_QUERY_5="SELECT p.authority, p.identifier, o.storageidentifier, o.id, t.id, o.createdate, f.contenttype, t.originalfileformat FROM datafile f, dvobject p, dvobject o, datatable t WHERE o.id = f.id AND t.datafile_id = f.id AND o.owner_id = p.id AND o.id='%s' ORDER by t.id"
+
+echo
+echo "Checking the number of ingested (\"tabular\") datafiles in the database..."
+
+NUM_DATAFILES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_3}"`
+
+echo $NUM_DATAFILES total.
+echo 
+
+echo "Let's check if any of these ingested files have MORE THAN ONE linked datatable objects:" 
+
+${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_4}" |
+uniq -c -f 1 | 
+awk '{if ($1 > 1) print $NF}' > /tmp/datafileids.tmp
+
+NUM_CONFIRMED=`cat /tmp/datafileids.tmp | wc -l`
+
+if [ $NUM_CONFIRMED == 0 ]
+then
+    echo 
+    echo "Good news - it appears that there are no tabular files affected by this issue in your database."
+    echo 
+    exit 0
+fi
+
+echo "The following "${NUM_CONFIRMED}" DataFile ids appear to be referenced from multiple DataTables:"
+cat /tmp/datafileids.tmp
+echo "(output saved in /tmp/datafileids.tmp)"
+
+echo "Looking up details for the affected tabular files:"
+
+cat /tmp/datafileids.tmp | while read si
+do
+    PG_QUERY_SI=`printf "${PG_QUERY_5}" $si`
+    ${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_SI}"
+done | tee /tmp/multiple_ingests_info.tmp
+
+echo "(output saved in /tmp/multiple_ingests_info.tmp)"
+
+echo 
+echo "Please send the output above to Dataverse support at support@dataverse.org." 
+echo "We will assist you in fixing this issue in your Dataverse database."
+echo "We apologize for any inconvenience."
+echo 
diff --git a/scripts/issues/6522/PRE-RELEASE-INFO.txt b/scripts/issues/6522/PRE-RELEASE-INFO.txt
new file mode 100644
index 00000000000..43adc7f3f12
--- /dev/null
+++ b/scripts/issues/6522/PRE-RELEASE-INFO.txt
@@ -0,0 +1,23 @@
+In the next Dataverse release, we are adding a database constraint to
+prevent duplicate DataFile objects pointing to the same physical file
+from being created.
+
+Before the next release can be deployed, your database must be checked
+for any such duplicates that may already exist. If present,
+the duplicates will need to be deleted, and the integrity of the 
+stored physical files verified.
+
+Please run the diagnostic script provided at
+https://github.com/IQSS/dataverse/raw/develop/scripts/issues/6522/find_duplicates.sh.
+The script relies on the PostgreSQL utility psql to access the
+database. You will need to edit the credentials at the top of the script
+to match your database configuration.
+
+If this issue is not present in your database, you will see a message
+"... no duplicate dvObjects in your database. Your installation is
+ready to be upgraded to Dataverse 4.20"
+
+If duplicates are detected, it will provide further instructions. We
+will need you to send us the produced output. We will then assist you
+in resolving this problem in your database.
+
diff --git a/scripts/issues/6522/find_duplicates.sh b/scripts/issues/6522/find_duplicates.sh
new file mode 100755
index 00000000000..3ed0a0851e6
--- /dev/null
+++ b/scripts/issues/6522/find_duplicates.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# begin config
+# PostgresQL credentials:
+# edit the following lines so that psql can talk to your database
+pg_host=localhost
+pg_port=5432
+pg_user=dvnapp
+pg_db=dvndb
+# you can leave the password blank, if Postgres is configured 
+# to accept connections without auth:
+pg_pass=
+# psql executable, add full path if necessary:
+PSQL_EXEC=psql
+
+# end config
+
+PG_QUERY_0="SELECT COUNT(DISTINCT o.id) FROM datafile f, dataset s, dvobject p, dvobject o WHERE s.id = p.id AND o.id = f.id AND o.owner_id = s.id AND s.harvestingclient_id IS null AND o.storageidentifier IS NOT null"
+
+PG_QUERY_1="SELECT s.id, o.storageidentifier FROM datafile f, dataset s, dvobject o WHERE o.id = f.id AND o.owner_id = s.id AND s.harvestingclient_id IS null AND o.storageidentifier IS NOT null ORDER by o.storageidentifier"
+
+PG_QUERY_2="SELECT p.authority, p.identifier, o.storageidentifier, o.id, o.createdate, f.contenttype FROM datafile f, dvobject p, dvobject o WHERE o.id = f.id AND o.owner_id = p.id AND o.storageidentifier='%s' ORDER by o.id"
+
+PGPASSWORD=$pg_pass; export PGPASSWORD
+
+echo "Checking the number of non-harvested datafiles in the database..."
+
+NUM_DATAFILES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_0}"`
+if [ $? != 0 ]
+then
+    echo "FAILED to execute psql! Check the credentials and try again?"
+    echo "exiting..."
+    echo 
+    echo "the command line that failed:"
+    echo "${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c \"${PG_QUERY_0}\""
+    exit 1
+fi
+
+echo $NUM_DATAFILES total.
+
+echo "Let's check if any storage identifiers are referenced more than once within the same dataset:" 
+
+${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_1}" |
+uniq -c | 
+awk '{if ($1 > 1) print $NF}' > /tmp/storageidentifiers.tmp
+
+NUM_CONFIRMED=`cat /tmp/storageidentifiers.tmp | wc -l`
+
+if [ $NUM_CONFIRMED == 0 ]
+then
+    echo 
+    echo "Good news - it appears that there are NO duplicate dvObjects in your database."
+    echo "Your installation is ready to be upgraded to Dataverse 4.20."
+    echo 
+    exit 0
+fi
+
+echo "The following storage identifiers appear to be referenced from multiple DvObjects:"
+cat /tmp/storageidentifiers.tmp
+echo "(output saved in /tmp/storageidentifiers.tmp)"
+
+echo "Looking up details for the affected datafiles:"
+
+cat /tmp/storageidentifiers.tmp | while read si
+do
+    PG_QUERY_SI=`printf "${PG_QUERY_2}" $si`
+    ${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_SI}"
+done | tee /tmp/duplicates_info.tmp
+
+echo "(output saved in /tmp/duplicates_info.tmp)"
+
+echo 
+echo "Please send the output above to Dataverse support." 
+echo "We will assist you in the database cleanup that needs to happen "
+echo "before your installation can be upgraded to Dataverse 4.20."
+echo "We apologize for any inconvenience."
+echo 
diff --git a/scripts/issues/7398/delete_dld.txt b/scripts/issues/7398/delete_dld.txt
new file mode 100644
index 00000000000..30edf42774b
--- /dev/null
+++ b/scripts/issues/7398/delete_dld.txt
@@ -0,0 +1,21 @@
+-- these queries will delete linked objects identified using the query in dld_for_deletion
+
+begin;
+
+delete from datasetlinkingdataverse where id in (
+select dld.id
+from datasetlinkingdataverse dld, dvobject dvo, dataverselinkingdataverse dvld
+where dld.dataset_id = dvo.id
+and dld.linkingdataverse_id = dvld.linkingdataverse_id
+and dvo.owner_id = dvld.dataverse_id
+);
+
+delete from dataverselinkingdataverse where id in (
+select dld.id
+from dataverselinkingdataverse dld, dvobject dvo, dataverselinkingdataverse dvld
+where dld.dataverse_id = dvo.id
+and dld.linkingdataverse_id = dvld.linkingdataverse_id
+and dvo.owner_id = dvld.dataverse_id
+);
+
+commit;
\ No newline at end of file
diff --git a/scripts/issues/7398/delete_ss.txt b/scripts/issues/7398/delete_ss.txt
new file mode 100644
index 00000000000..3cf053ce5af
--- /dev/null
+++ b/scripts/issues/7398/delete_ss.txt
@@ -0,0 +1,18 @@
+-- these queries will delete the saved searches identified using the ss_for_deletion query
+
+begin;
+
+create temporary table delete_ss on commit drop as (
+Select ss.id
+from savedsearch ss, savedsearchfilterquery ssfq, dataverselinkingdataverse dld
+where ss.id = ssfq.savedsearch_id
+and ss.definitionpoint_id = dld.linkingdataverse_id
+and dld.dataverse_id = rtrim(reverse(split_part(reverse(ssfq.filterquery),'/',1)),'"')::integer
+and ss.query='*'
+and ssfq.filterquery like 'subtreePaths%'
+);
+
+delete from savedsearchfilterquery where savedsearch_id in (select id from delete_ss);
+delete from savedsearch where id in (select id from delete_ss);
+
+commit;
diff --git a/scripts/issues/7398/dld_for_deletion.txt b/scripts/issues/7398/dld_for_deletion.txt
new file mode 100644
index 00000000000..51aa9ce1458
--- /dev/null
+++ b/scripts/issues/7398/dld_for_deletion.txt
@@ -0,0 +1,19 @@
+-- these queries will show you the linked objects that will get deleted
+
+-- datasets
+select dld.dataset_id, dvo.owner_id, dld.linkingdataverse_id, 
+dvld.dataverse_id, dvld.linkingdataverse_id  
+from datasetlinkingdataverse dld, dvobject dvo, dataverselinkingdataverse dvld
+where dld.dataset_id = dvo.id
+and dld.linkingdataverse_id = dvld.linkingdataverse_id
+and dvo.owner_id = dvld.dataverse_id
+order by dld.linkingdataverse_id;
+
+-- dataverses
+select dld.dataverse_id, dvo.owner_id, dld.linkingdataverse_id, 
+dvld.dataverse_id, dvld.linkingdataverse_id  
+from dataverselinkingdataverse dld, dvobject dvo, dataverselinkingdataverse dvld
+where dld.dataverse_id = dvo.id
+and dld.linkingdataverse_id = dvld.linkingdataverse_id
+and dvo.owner_id = dvld.dataverse_id
+order by dld.linkingdataverse_id;
diff --git a/scripts/issues/7398/ss_for_deletion.txt b/scripts/issues/7398/ss_for_deletion.txt
new file mode 100644
index 00000000000..11ad8bbc49a
--- /dev/null
+++ b/scripts/issues/7398/ss_for_deletion.txt
@@ -0,0 +1,10 @@
+-- this query will show you the saved searches that will get deleted
+
+select ss.id, ss.definitionpoint_id, dld.dataverse_id, ssfq.filterquery
+from savedsearch ss, savedsearchfilterquery ssfq, dataverselinkingdataverse dld
+where ss.id = ssfq.savedsearch_id
+and ss.definitionpoint_id = dld.linkingdataverse_id
+and dld.dataverse_id = rtrim(reverse(split_part(reverse(ssfq.filterquery),'/',1)),'"')::integer
+and ss.query='*'
+and ssfq.filterquery like 'subtreePaths%'
+order by ss.definitionpoint_id;
\ No newline at end of file
diff --git a/scripts/issues/7451/PRE-RELEASE-INFO.txt b/scripts/issues/7451/PRE-RELEASE-INFO.txt
new file mode 100644
index 00000000000..c14c25aa93f
--- /dev/null
+++ b/scripts/issues/7451/PRE-RELEASE-INFO.txt
@@ -0,0 +1,39 @@
+In the next release another constraint is being added to existing
+databases, to prevent any possibility of creating datafile objects
+referencing the same file. This was originally planned for v4.20, but
+in that release the constraint was only added to newly created
+databases, and was not forced on the databases that had already
+existed. If your current database was originally created by version
+4.20 or newer, you don't need to do anything.
+
+If you do have an older database, it MUST BE RE-CHECKED for any
+existing duplicates before the next release (5.6, presumably) can be
+deployed. Hopefully there are no such inconsistencies in your
+database, but if there are any, they will need to be resolved, or the
+next version of the application WILL FAIL TO DEPLOY, with an error
+message from FlyWay. Please run the following script:
+
+https://github.com/IQSS/dataverse/raw/develop/scripts/issues/7451/check_datafiles_7451.sh
+
+The script relies on the PostgreSQL utility psql to access the
+database. You will need to edit the credentials at the top of the script
+to match your database configuration.
+
+The script will check your database for any duplicated storage
+identifiers that would violate the new constraint. 
+
+For harvested files,  it will directly resolve any conflicts.
+
+For local files, rather than attempt to make any changes right away 
+(this being an issue of data integrity with a potential to affect your 
+users) it will instruct you to send the produced diagnostic 
+information to support@dataverse.org so that we can assist you 
+in resolving the issues in your database. 
+
+If no inconsistencies are found, the script will report that the database 
+is ready to be upgraded to the next release.
+
+(Please note that there's a very good chance that your database does
+not have any conflicts of this nature. But we want to do this to be
+absolutely sure. We apologize for any inconvenience.)
+
diff --git a/scripts/issues/7451/check_datafiles_7451.sh b/scripts/issues/7451/check_datafiles_7451.sh
new file mode 100755
index 00000000000..1e4c95c69f4
--- /dev/null
+++ b/scripts/issues/7451/check_datafiles_7451.sh
@@ -0,0 +1,161 @@
+#!/bin/bash
+
+# begin config
+# PostgresQL credentials:
+# edit the following lines so that psql can talk to your database
+pg_host=localhost
+pg_port=5432
+pg_user=dvnapp
+pg_db=dvndb
+# you can leave the password blank, if Postgres is configured 
+# to accept connections without auth:
+pg_pass=
+# psql executable - add full path, if necessary:
+PSQL_EXEC=psql
+
+# end config
+
+# check for duplicate storageidentifiers in harvested datafiles: 
+
+PG_QUERY_0="SELECT COUNT(DISTINCT o.id) FROM datafile f, dataset s, dvobject p, dvobject o WHERE s.id = p.id AND o.id = f.id AND o.owner_id = s.id AND s.harvestingclient_id IS NOT null AND o.storageidentifier IS NOT null"
+
+PG_QUERY_1="SELECT s.id, o.storageidentifier FROM datafile f, dataset s, dvobject o WHERE o.id = f.id AND o.owner_id = s.id AND s.harvestingclient_id IS NOT null AND o.storageidentifier IS NOT null ORDER by s.id, o.storageidentifier"
+
+PG_QUERY_FIX_0="UPDATE dvobject SET storageidentifier=NULL WHERE dtype='DataFile' AND (storageidentifier='file://' OR storageidentifier='http://' OR storageidentifier='s3://')"
+
+PG_QUERY_FIX_1="UPDATE dvobject SET storageidentifier=CONCAT(storageidentifier, ' ', id) WHERE owner_id = %d AND storageidentifier='%s'"
+
+PGPASSWORD=$pg_pass; export PGPASSWORD
+
+echo "Checking the total number of storageidentifiers in harvested datafiles..."
+
+NUM_DATAFILES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_0}"`
+if [ $? != 0 ]
+then
+    echo "FAILED to execute psql! Check the credentials and try again?"
+    echo "exiting..."
+    echo 
+    echo "the command line that failed:"
+    echo "${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c \"${PG_QUERY_0}\""
+    exit 1
+fi
+
+echo $NUM_DATAFILES total.
+echo 
+
+# Before we do anything else, reset the storageidentifiers of the datafiles (harvested and otherwise) that 
+# may have ended up set to invalid, prefix-only values like "file://" back to NULL:
+
+${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -q -c "${PG_QUERY_FIX_0}" 
+
+
+echo "Let's check if any harvested storage identifiers are referenced more than once within the same dataset:" 
+
+${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_1}" |
+uniq -c | 
+awk '{if ($1 > 1) print $0}' | sort -u > /tmp/harvestedidentifiers.tmp
+
+NUM_CONFIRMED=`cat /tmp/harvestedidentifiers.tmp | wc -l`
+
+if [ $NUM_CONFIRMED == 0 ]
+then
+    echo 
+    echo "Good news - it appears that there are NO duplicate storageidentifiers in your harvested datafiles;"
+    echo "nothing to fix."
+    echo 
+else
+
+    echo "Found ${NUM_CONFIRMED} harvested files with identical storageidentifiers; fixing in place..."
+
+    cat /tmp/harvestedidentifiers.tmp | sed 's:\\:\\\\:g' | while read howmany dataset storageidentifier
+    do
+	# Harvard prod. db had a few harvested storage identifiers consisting of a single space (" "),
+	# which would confuse the shell. Extremely unlikely to be found in any other installation.
+	if [[ "x${storageidentifier}" = "x" ]]
+	then
+		storageidentifier=" "
+	fi
+
+	PG_QUERY_SI=`printf "${PG_QUERY_FIX_1}" $dataset "$storageidentifier"`
+	${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_SI}"
+    done 
+
+    echo "... done."
+    echo
+
+    echo -n "Let's confirm that all these dupes have been fixed... "
+    ${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_1}" |
+	uniq -c | 
+	awk '{if ($1 > 1) print $0}' | sort -u > /tmp/harvestedidentifiers.tmp
+
+    NUM_CONFIRMED=`cat /tmp/harvestedidentifiers.tmp | wc -l`
+
+    if [ $NUM_CONFIRMED == 0 ]
+    then
+	echo "Looks good."
+	echo 
+    else
+	echo "Oops!"
+	echo "Unfortunately, the script failed to fix some of the harvested duplicates."
+	echo "Please send the contents of the file /tmp/harvestedidentifiers.tmp"
+	echo "to Dataverse support at support@dataverse.org."
+	echo "Apologies for the extra trouble..."
+	echo
+	exit 1
+    fi    
+
+fi
+
+
+# now, check for duplicate storageidentifiers in local datafiles: 
+
+PG_QUERY_3="SELECT COUNT(DISTINCT o.id) FROM datafile f, dataset s, dvobject p, dvobject o WHERE s.id = p.id AND o.id = f.id AND o.owner_id = s.id AND s.harvestingclient_id IS null AND o.storageidentifier IS NOT null"
+
+PG_QUERY_4="SELECT s.id, o.storageidentifier FROM datafile f, dataset s, dvobject o WHERE o.id = f.id AND o.owner_id = s.id AND s.harvestingclient_id IS null AND o.storageidentifier IS NOT null ORDER by s.id, o.storageidentifier"
+
+PG_QUERY_5="SELECT p.authority, p.identifier, o.storageidentifier, o.id, o.createdate, f.contenttype FROM datafile f, dvobject p, dvobject o WHERE o.id = f.id AND o.owner_id = p.id AND p.id = %d AND o.storageidentifier='%s' ORDER by o.id"
+
+echo "Checking the number of non-harvested datafiles in the database..."
+
+NUM_DATAFILES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_3}"`
+echo $NUM_DATAFILES total.
+echo 
+
+echo "Let's check if any storage identifiers are referenced more than once within the same dataset:" 
+
+${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_4}" |
+uniq -c | 
+awk '{if ($1 > 1) print $0}' > /tmp/storageidentifiers.tmp
+
+NUM_CONFIRMED=`cat /tmp/storageidentifiers.tmp | wc -l`
+
+if [ $NUM_CONFIRMED == 0 ]
+then
+    echo 
+    echo "Good news - it appears that there are NO duplicate DataFile objects in your database."
+    echo "Your installation is ready to be upgraded to Dataverse 5.5"
+    echo 
+else
+
+    echo "The following storage identifiers appear to be referenced from multiple non-harvested DvObjects:"
+    cat /tmp/storageidentifiers.tmp
+    echo "(output saved in /tmp/storageidentifiers.tmp)"
+
+    echo "Looking up details for the affected datafiles:"
+
+    cat /tmp/storageidentifiers.tmp | while read howmany dataset storageidentifier
+    do
+	PG_QUERY_SI=`printf "${PG_QUERY_5}" $dataset "$storageidentifier"`
+	${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_SI}"
+    done | tee /tmp/duplicates_info.tmp
+
+    echo "(output saved in /tmp/duplicates_info.tmp)"
+
+    echo 
+    echo "Please send the output above to Dataverse support at support@dataverse.org." 
+    echo "We will assist you in the process of cleaning up the affected files above."
+    echo "We apologize for any inconvenience."
+    echo 
+fi
+
+
diff --git a/scripts/issues/7687/file_access_flag_update_bug.txt b/scripts/issues/7687/file_access_flag_update_bug.txt
new file mode 100644
index 00000000000..a96b9dfab1b
--- /dev/null
+++ b/scripts/issues/7687/file_access_flag_update_bug.txt
@@ -0,0 +1,11 @@
+-- this query will identify datasets where a superuser has run the Curate command and the update included a change to the fileaccessrequest flag, resulting in the file access request updates not being reflected in the published version
+
+select da.id, dv.id, ta.id, da.fileaccessrequest, ta.fileaccessrequest, dv.releasetime 
+from datasetversion dv, termsofuseandaccess ta, dataset da 
+where dv.dataset_id=da.id 
+and dv.termsofuseandaccess_id=ta.id 
+and ta.fileaccessrequest != da.fileaccessrequest 
+and dv.versionstate='RELEASED' 
+and dv.releasetime in (select max(releasetime) 
+from datasetversion 
+where dataset_id=da.id);
\ No newline at end of file
diff --git a/scripts/issues/8191/datasets_without_toa_or_request_access b/scripts/issues/8191/datasets_without_toa_or_request_access
new file mode 100644
index 00000000000..c66722d5c8c
--- /dev/null
+++ b/scripts/issues/8191/datasets_without_toa_or_request_access
@@ -0,0 +1,28 @@
+-- this query will identify datasets where at least one file does not have either terms of access or request access enabled, and will include owner information for those datasets
+
+select au.email, 
+concat(au.firstname, ' ', au.lastname),
+concat('$SERVERNAME/dataset.xhtml?persistentId=doi:' , dvo.authority , '/' ,  dvo.identifier)
+from roleassignment ra, dataverserole dvr,
+authenticateduser au, dvobject dvo
+where
+au.useridentifier = rtrim(substring(ra.assigneeidentifier, 2, 100))
+and dvo.id = ra.definitionpoint_id
+and
+ra.role_id = dvr.id and
+dvr.alias in (
+	'fullContributor',
+'dsContributor',
+'contributor',
+'admin',
+'curator'
+) and
+ra.definitionpoint_id in (
+	select dvo.id  from datasetversion v
+join termsofuseandaccess ua on ua.id = v.termsofuseandaccess_id
+join filemetadata fm on v.id = fm.datasetversion_id
+join datafile f on f.id = fm.datafile_id
+join dvobject dvo on v.dataset_id = dvo.id
+where ua.fileaccessrequest = false and ua.termsofaccess isnull
+and f.restricted = true
+)
\ No newline at end of file
diff --git a/scripts/issues/8578/citation_languages_10762.tsv b/scripts/issues/8578/citation_languages_10762.tsv
new file mode 100644
index 00000000000..bd68edaee72
--- /dev/null
+++ b/scripts/issues/8578/citation_languages_10762.tsv
@@ -0,0 +1,7921 @@
+	language	'Are'are	alu	0	alu
+	language	'Auhelawa	kud	1	kud
+	language	A'ou	aou	2	aou
+	language	A-Pucikwar	apq	3	apq
+	language	Aari	aiw	4	aiw
+	language	AasÃĄx	aas	5	aas
+	language	Abadi	kbt	6	kbt
+	language	Abaga	abg	7	abg
+	language	Abai Sungai	abf	8	abf
+	language	Abanyom	abm	9	abm
+	language	Abar	mij	10	mij
+	language	Abau	aau	11	aau
+	language	Abaza	abq	12	abq
+	language	Abellen Ayta	abp	13	abp
+	language	Abidji	abi	14	abi
+	language	Abinomn	bsa	15	bsa
+	language	Abipon	axb	16	axb
+	language	Abishira	ash	17	ash
+	language	Abkhaz, Abkhazian	abk	18	abk	ab	Abkhaz	Abkhazian
+	language	Abom	aob	19	aob
+	language	Abon	abo	20	abo
+	language	Abron	abr	21	abr
+	language	Abu	ado	22	ado
+	language	Abu' Arapesh	aah	23	aah
+	language	Abua	abn	24	abn
+	language	Abui	abz	25	abz
+	language	Abun	kgr	26	kgr
+	language	Abure	abu	27	abu
+	language	Abureni	mgj	28	mgj
+	language	AbÊ	aba	29	aba
+	language	Acatepec Me'phaa	tpx	30	tpx
+	language	Achagua	aca	31	aca
+	language	Achang	acn	32	acn
+	language	Ache	yif	33	yif
+	language	Acheron	acz	34	acz
+	language	Achi	acr	35	acr
+	language	Achinese	ace	36	ace
+	language	Achterhoeks	act	37	act
+	language	Achuar-Shiwiar	acu	38	acu
+	language	Achumawi	acv	39	acv
+	language	AchÊ	guq	40	guq
+	language	Acoli	ach	41	ach
+	language	AcroÃĄ	acs	42	acs
+	language	Adai	xad	43	xad
+	language	Adamawa Fulfulde	fub	44	fub
+	language	Adamorobe Sign Language	ads	45	ads
+	language	Adang	adn	46	adn
+	language	Adangbe	adq	47	adq
+	language	Adangme	ada	48	ada
+	language	Adara	kad	49	kad
+	language	Adasen	tiu	50	tiu
+	language	Adele	ade	51	ade
+	language	Adhola	adh	52	adh
+	language	Adi	adi	53	adi
+	language	Adilabad Gondi	wsg	54	wsg
+	language	Adioukrou	adj	55	adj
+	language	Adithinngithigh	dth	56	dth
+	language	Adivasi Oriya	ort	57	ort
+	language	Adiwasi Garasia	gas	58	gas
+	language	Adnyamathanha	adt	59	adt
+	language	Adonara	adr	60	adr
+	language	Aduge	adu	61	adu
+	language	Adyghe	ady	62	ady
+	language	Adzera	adz	63	adz
+	language	Aeka	aez	64	aez
+	language	Aekyom	awi	65	awi
+	language	Aequian	xae	66	xae
+	language	Aer	aeq	67	aeq
+	language	Afade	aal	68	aal
+	language	Afar	aar	69	aar	aa
+	language	Afghan Sign Language	afg	70	afg
+	language	Afitti	aft	71	aft
+	language	Afrihili	afh	72	afh
+	language	Afrikaans	afr	73	afr	af
+	language	Afro-Seminole Creole	afs	74	afs
+	language	Agarabi	agd	75	agd
+	language	Agariya	agi	76	agi
+	language	Agatu	agc	77	agc
+	language	Agavotaguerra	avo	78	avo
+	language	Aghem	agq	79	agq
+	language	Aghu	ahh	80	ahh
+	language	Aghu-Tharnggala	gtu	81	gtu
+	language	Aghul	agx	82	agx
+	language	Aghwan	xag	83	xag
+	language	Agi	aif	84	aif
+	language	Agob	kit	85	kit
+	language	Agoi	ibm	86	ibm
+	language	Aguacateco	agu	87	agu
+	language	Aguano	aga	88	aga
+	language	Aguaruna	agr	89	agr
+	language	Aguna	aug	90	aug
+	language	Agusan Manobo	msm	91	msm
+	language	Agutaynen	agn	92	agn
+	language	Agwagwune	yay	93	yay
+	language	Ahanta	aha	94	aha
+	language	Aheri Gondi	esg	95	esg
+	language	Aheu	thm	96	thm
+	language	Ahirani	ahr	97	ahr
+	language	Ahom	aho	98	aho
+	language	Ahtena	aht	99	aht
+	language	Ahwai	nfd	100	nfd
+	language	Ai-Cham	aih	101	aih
+	language	Aighon	aix	102	aix
+	language	AikanÃŖ	tba	103	tba
+	language	Aiklep	mwg	104	mwg
+	language	Aimaq	aiq	105	aiq
+	language	Aimele	ail	106	ail
+	language	Aimol	aim	107	aim
+	language	Ainbai	aic	108	aic
+	language	Ainu (China)	aib	109	aib
+	language	Ainu (Japan)	ain	110	ain
+	language	Aiome	aki	111	aki
+	language	Airoran	air	112	air
+	language	Aiton	aio	113	aio
+	language	Aja (Benin)	ajg	114	ajg
+	language	Aja (South Sudan)	aja	115	aja
+	language	Ajawa	ajw	116	ajw
+	language	AjiÃĢ	aji	117	aji
+	language	Ajumbu	muc	118	muc
+	language	Ajyíninka Apurucayali	cpc	119	cpc
+	language	Ak	akq	120	akq
+	language	Aka	soh	121	soh
+	language	Aka-Bea	abj	122	abj
+	language	Aka-Bo	akm	123	akm
+	language	Aka-Cari	aci	124	aci
+	language	Aka-Jeru	akj	125	akj
+	language	Aka-Kede	akx	126	akx
+	language	Aka-Kol	aky	127	aky
+	language	Aka-Kora	ack	128	ack
+	language	Akan	aka	129	aka	ak
+	language	Akar-Bale	acl	130	acl
+	language	Akaselem	aks	131	aks
+	language	Akawaio	ake	132	ake
+	language	Ake	aik	133	aik
+	language	Akebu	keu	134	keu
+	language	Akei	tsr	135	tsr
+	language	Akeu	aeu	136	aeu
+	language	Akha	ahk	137	ahk
+	language	Akhvakh	akv	138	akv
+	language	Akkadian	akk	139	akk
+	language	Akkala Sami	sia	140	sia
+	language	Aklanon	akl	141	akl
+	language	Akolet	akt	142	akt
+	language	Akoose	bss	143	bss
+	language	Akoye	miw	144	miw
+	language	Akpa	akf	145	akf
+	language	Akpes	ibe	146	ibe
+	language	Akrukay	afi	147	afi
+	language	Akukem	spm	148	spm
+	language	Akuku	ayk	149	ayk
+	language	Akum	aku	150	aku
+	language	Akuntsu	aqz	151	aqz
+	language	Akurio	ako	152	ako
+	language	Akwa	akw	153	akw
+	language	Akyaung Ari Naga	nqy	154	nqy
+	language	Al-Sayyid Bedouin Sign Language	syy	155	syy
+	language	Alaba-K’abeena	alw	156	alw
+	language	Alabama	akz	157	akz
+	language	Alabat Island Agta	dul	158	dul
+	language	Alacatlatzala Mixtec	mim	159	mim
+	language	Alago	ala	160	ala
+	language	Alagwa	wbj	161	wbj
+	language	Alak	alk	162	alk
+	language	Alamblak	amp	163	amp
+	language	Alangan	alj	164	alj
+	language	Alanic	xln	165	xln
+	language	Alapmunte	apv	166	apv
+	language	Alawa	alh	167	alh
+	language	Albanian	sqi	168	sqi	alb	sq
+	language	Albanian Sign Language	sqk	169	sqk
+	language	Albarradas Sign Language	lsc	170	lsc
+	language	Alcozauca Mixtec	xta	171	xta
+	language	Alege	alf	172	alf
+	language	Alekano	gah	173	gah
+	language	Aleut	ale	174	ale
+	language	Algerian Arabic	arq	175	arq
+	language	Algerian Jewish Sign Language	ajs	176	ajs
+	language	Algerian Saharan Arabic	aao	177	aao
+	language	Algerian Sign Language	asp	178	asp
+	language	Algonquin	alq	179	alq
+	language	Ali	aiy	180	aiy
+	language	Alladian	ald	181	ald
+	language	Allar	all	182	all
+	language	Alngith	aid	183	aid
+	language	Alo Phola	ypo	184	ypo
+	language	Alor	aol	185	aol
+	language	AloÃĄpam Zapotec	zaq	186	zaq
+	language	Alsea	aes	187	aes
+	language	Alu Kurumba	xua	188	xua
+	language	Alugu	aub	189	aub
+	language	Alumu-Tesu	aab	190	aab
+	language	Alune	alp	191	alp
+	language	Aluo	yna	192	yna
+	language	Alur	alz	193	alz
+	language	Alutor	alr	194	alr
+	language	Alviri-Vidari	avd	195	avd
+	language	Alyawarr	aly	196	aly
+	language	Ama (Papua New Guinea)	amm	197	amm
+	language	Ama (Sudan)	nyi	198	nyi
+	language	Amahai	amq	199	amq
+	language	Amahuaca	amc	200	amc
+	language	Amaimon	ali	201	ali
+	language	Amal	aad	202	aad
+	language	Amami Koniya Sign Language	jks	203	jks
+	language	Amanab	amn	204	amn
+	language	AmanayÊ	ama	205	ama
+	language	Amara	aie	206	aie
+	language	Amarakaeri	amr	207	amr
+	language	Amarasi	aaz	208	aaz
+	language	AmatlÃĄn Zapotec	zpo	209	zpo
+	language	Amba (Solomon Islands)	utp	210	utp
+	language	Amba (Uganda)	rwm	211	rwm
+	language	Ambai	amk	212	amk
+	language	Ambakich	aew	213	aew
+	language	Ambala Ayta	abc	214	abc
+	language	Ambelau	amv	215	amv
+	language	Ambele	ael	216	ael
+	language	Amblong	alm	217	alm
+	language	Ambo	amb	218	amb
+	language	Ambo-Pasco Quechua	qva	219	qva
+	language	Ambonese Malay	abs	220	abs
+	language	Ambrak	aag	221	aag
+	language	Ambul	apo	222	apo
+	language	Ambulas	abt	223	abt
+	language	Amdang	amj	224	amj
+	language	Amdo Tibetan	adx	225	adx
+	language	Amele	aey	226	aey
+	language	American Sign Language	ase	227	ase
+	language	Amganad Ifugao	ifa	228	ifa
+	language	Amharic	amh	229	amh	am
+	language	Ami	amy	230	amy
+	language	Amis	ami	231	ami
+	language	Amo	amo	232	amo
+	language	Amol	alx	233	alx
+	language	Amoltepec Mixtec	mbz	234	mbz
+	language	Ampanang	apg	235	apg
+	language	Ampari Dogon	aqd	236	aqd
+	language	Amri Karbi	ajz	237	ajz
+	language	Amto	amt	238	amt
+	language	Amundava	adw	239	adw
+	language	Amurdak	amg	240	amg
+	language	Ana Tinga Dogon	dti	241	dti
+	language	Anaang	anw	242	anw
+	language	Anakalangu	akg	243	akg
+	language	Anal	anm	244	anm
+	language	Anam	pda	245	pda
+	language	AnambÊ	aan	246	aan
+	language	Anamgura	imi	247	imi
+	language	Anasi	bpo	248	bpo
+	language	Ancient Greek (to 1453)	grc	249	grc
+	language	Ancient Hebrew	hbo	250	hbo
+	language	Ancient Macedonian	xmk	251	xmk
+	language	Ancient North Arabian	xna	252	xna
+	language	Ancient Zapotec	xzp	253	xzp
+	language	Andaandi	dgl	254	dgl
+	language	Andai	afd	255	afd
+	language	Andajin	ajn	256	ajn
+	language	Andalusian Arabic	xaa	257	xaa
+	language	Andaman Creole Hindi	hca	258	hca
+	language	Andaqui	ana	259	ana
+	language	Andarum	aod	260	aod
+	language	Andegerebinha	adg	261	adg
+	language	Andh	anr	262	anr
+	language	Andi	ani	263	ani
+	language	Andio	bzb	264	bzb
+	language	Andoa	anb	265	anb
+	language	Andoque	ano	266	ano
+	language	Andra-Hus	anx	267	anx
+	language	Aneityum	aty	268	aty
+	language	Anem	anz	269	anz
+	language	Aneme Wake	aby	270	aby
+	language	Anfillo	myo	271	myo
+	language	Angaataha	agm	272	agm
+	language	AngaitÊ	aqt	273	aqt
+	language	Angal	age	274	age
+	language	Angal Enen	aoe	275	aoe
+	language	Angal Heneng	akh	276	akh
+	language	Angami Naga	njm	277	njm
+	language	Angguruk Yali	yli	278	yli
+	language	Angika	anp	279	anp
+	language	Angkamuthi	avm	280	avm
+	language	Anglo-Norman	xno	281	xno
+	language	Angloromani	rme	282	rme
+	language	Angolar	aoa	283	aoa
+	language	Angor	agg	284	agg
+	language	Angoram	aog	285	aog
+	language	Angosturas Tunebo	tnd	286	tnd
+	language	Anguthimri	awg	287	awg
+	language	Ani Phowa	ypn	288	ypn
+	language	Anii	blo	289	blo
+	language	Animere	anf	290	anf
+	language	Anindilyakwa	aoi	291	aoi
+	language	Aninka	aqk	292	aqk
+	language	Anjam	boj	293	boj
+	language	Ankave	aak	294	aak
+	language	Anmatyerre	amx	295	amx
+	language	Anong	nun	296	nun
+	language	Anor	anj	297	anj
+	language	Anserma	ans	298	ans
+	language	Ansus	and	299	and
+	language	Antakarinya	ant	300	ant
+	language	Antankarana Malagasy	xmv	301	xmv
+	language	Antigua and Barbuda Creole English	aig	302	aig
+	language	Anu-Hkongso Chin	anl	303	anl
+	language	Anuak	anu	304	anu
+	language	Anufo	cko	305	cko
+	language	Anuki	aui	306	aui
+	language	Anus	auq	307	auq
+	language	Anuta	aud	308	aud
+	language	Anyin	any	309	any
+	language	Anyin Morofo	mtb	310	mtb
+	language	Ao Naga	njo	311	njo
+	language	Aoheng	pni	312	pni
+	language	Aore	aor	313	aor
+	language	Ap Ma	kbx	314	kbx
+	language	Apalachee	xap	315	xap
+	language	Apalaí	apy	316	apy
+	language	Apali	ena	317	ena
+	language	Apasco-Apoala Mixtec	mip	318	mip
+	language	Apatani	apt	319	apt
+	language	ApiakÃĄ	api	320	api
+	language	ApinayÊ	apn	321	apn
+	language	Apma	app	322	app
+	language	Aproumu Aizi	ahp	323	ahp
+	language	ApurinÃŖ	apu	324	apu
+	language	Aputai	apx	325	apx
+	language	Aquitanian	xaq	326	xaq
+	language	Arabana	ard	327	ard
+	language	Arabela	arl	328	arl
+	language	Arabic	ara	329	ara	ar
+	language	Aragonese	arg	330	arg	an
+	language	Araki	akr	331	akr
+	language	Arakwal	rkw	332	rkw
+	language	Aralle-Tabulahan	atq	333	atq
+	language	Arammba	stk	334	stk
+	language	Aranadan	aaf	335	aaf
+	language	Aranama-Tamique	xrt	336	xrt
+	language	Arandai	jbj	337	jbj
+	language	Araona	aro	338	aro
+	language	Arapaho	arp	339	arp
+	language	Arapaso	arj	340	arj
+	language	ArarandewÃĄra	xaj	341	xaj
+	language	Arawak	arw	342	arw
+	language	ArawetÊ	awt	343	awt
+	language	Arawum	awm	344	awm
+	language	Arbore	arv	345	arv
+	language	ArbÃĢreshÃĢ Albanian	aae	346	aae
+	language	Archi	aqc	347	aqc
+	language	ArdhamāgadhÄĢ Prākrit	pka	348	pka
+	language	Are	mwc	349	mwc
+	language	Areba	aea	350	aea
+	language	Arem	aem	351	aem
+	language	Arequipa-La UniÃŗn Quechua	qxu	352	qxu
+	language	Argentine Sign Language	aed	353	aed
+	language	Argobba	agj	354	agj
+	language	Arguni	agf	355	agf
+	language	Arhuaco	arh	356	arh
+	language	ArhÃĸ	aqr	357	aqr
+	language	ArhÃļ	aok	358	aok
+	language	Ari	aac	359	aac
+	language	Aribwatsa	laz	360	laz
+	language	Aribwaung	ylu	361	ylu
+	language	Arifama-Miniafia	aai	362	aai
+	language	Arigidi	aqg	363	aqg
+	language	ArikapÃē	ark	364	ark
+	language	Arikara	ari	365	ari
+	language	Arikem	ait	366	ait
+	language	Arin	xrn	367	xrn
+	language	Aringa	luc	368	luc
+	language	Armazic	xrm	369	xrm
+	language	Armenian	hye	370	hye	hy	arm
+	language	Armenian Sign Language	aen	371	aen
+	language	Arop-Lokep	apr	372	apr
+	language	Arop-Sissano	aps	373	aps
+	language	Arosi	aia	374	aia
+	language	Arpitan	frp	375	frp
+	language	Arritinngithigh	rrt	376	rrt
+	language	Arta	atz	377	atz
+	language	Aruamu	msy	378	msy
+	language	Aruek	aur	379	aur
+	language	Aruop	lsr	380	lsr
+	language	Arutani	atx	381	atx
+	language	AruÃĄ (Amazonas State)	aru	382	aru
+	language	AruÃĄ (Rodonia State)	arx	383	arx
+	language	Arvanitika Albanian	aat	384	aat
+	language	As	asz	385	asz
+	language	Asaro'o	mtv	386	mtv
+	language	Ashe	ahs	387	ahs
+	language	Ashkun	ask	388	ask
+	language	Asho Chin	csh	389	csh
+	language	Ashtiani	atn	390	atn
+	language	AshÃĄninka	cni	391	cni
+	language	AshÊninka Pajonal	cjo	392	cjo
+	language	AshÊninka PerenÊ	prq	393	prq
+	language	Asilulu	asl	394	asl
+	language	Askopan	eiv	395	eiv
+	language	Asoa	asv	396	asv
+	language	Assamese	asm	397	asm	as
+	language	Assangori	sjg	398	sjg
+	language	Assiniboine	asb	399	asb
+	language	Assyrian Neo-Aramaic	aii	400	aii
+	language	Asturian	ast	401	ast
+	language	Asu (Nigeria)	aum	402	aum
+	language	Asu (Tanzania)	asa	403	asa
+	language	Asue Awyu	psa	404	psa
+	language	Asumboa	aua	405	aua
+	language	AsunciÃŗn Mixtepec Zapotec	zoo	406	zoo
+	language	Asuri	asr	407	asr
+	language	Ata	atm	408	atm
+	language	Ata Manobo	atd	409	atd
+	language	Atakapa	aqp	410	aqp
+	language	Atampaya	amz	411	amz
+	language	AtatlÃĄhuca Mixtec	mib	412	mib
+	language	Atauran	adb	413	adb
+	language	Atayal	tay	414	tay
+	language	Atemble	ate	415	ate
+	language	Athpariya	aph	416	aph
+	language	Ati	atk	417	atk
+	language	Atikamekw	atj	418	atj
+	language	Atohwaim	aqm	419	aqm
+	language	Atong (Cameroon)	ato	420	ato
+	language	Atong (India)	aot	421	aot
+	language	Atorada	aox	422	aox
+	language	Atsahuaca	atc	423	atc
+	language	Atsam	cch	424	cch
+	language	Atsugewi	atw	425	atw
+	language	Attapady Kurumba	pkr	426	pkr
+	language	AttiÊ	ati	427	ati
+	language	Atzingo Matlatzinca	ocu	428	ocu
+	language	Au	avt	429	avt
+	language	Aulua	aul	430	aul
+	language	AurÃĄ	aux	431	aux
+	language	Aushi	auh	432	auh
+	language	Aushiri	avs	433	avs
+	language	Auslan	asf	434	asf
+	language	Austral	aut	435	aut
+	language	Australian Aborigines Sign Language	asw	436	asw
+	language	Austrian Sign Language	asq	437	asq
+	language	Auwe	smf	438	smf
+	language	Auye	auu	439	auu
+	language	Auyokawa	auo	440	auo
+	language	Avaric	ava	441	ava	av
+	language	Avatime	avn	442	avn
+	language	Avau	avb	443	avb
+	language	Avestan	ave	444	ave	ae
+	language	Avikam	avi	445	avi
+	language	Avokaya	avu	446	avu
+	language	AvÃĄ-Canoeiro	avv	447	avv
+	language	Awa (China)	vwa	448	vwa
+	language	Awa (Papua New Guinea)	awb	449	awb
+	language	Awa-Cuaiquer	kwi	450	kwi
+	language	Awabakal	awk	451	awk
+	language	Awad Bing	bcu	452	bcu
+	language	Awadhi	awa	453	awa
+	language	Awak	awo	454	awo
+	language	Awar	aya	455	aya
+	language	Awara	awx	456	awx
+	language	Awbono	awh	457	awh
+	language	Aweer	bob	458	bob
+	language	Awera	awr	459	awr
+	language	Awetí	awe	460	awe
+	language	Awing	azo	461	azo
+	language	Awiyaana	auy	462	auy
+	language	Awjilah	auj	463	auj
+	language	Awngi	awn	464	awn
+	language	Awngthim	gwm	465	gwm
+	language	Awtuw	kmn	466	kmn
+	language	Awu	yiu	467	yiu
+	language	Awun	aww	468	aww
+	language	Awutu	afu	469	afu
+	language	Awyi	auw	470	auw
+	language	Axamb	ahb	471	ahb
+	language	Axi Yi	yix	472	yix
+	language	Ayabadhu	ayd	473	ayd
+	language	Ayacucho Quechua	quy	474	quy
+	language	Ayautla Mazatec	vmy	475	vmy
+	language	Ayere	aye	476	aye
+	language	Ayerrerenge	axe	477	axe
+	language	Ayi (Papua New Guinea)	ayq	478	ayq
+	language	Ayiwo	nfl	479	nfl
+	language	Ayizi	yyz	480	yyz
+	language	Ayizo Gbe	ayb	481	ayb
+	language	Aymara	aym	482	aym	ay
+	language	Ayoquesco Zapotec	zaf	483	zaf
+	language	Ayoreo	ayo	484	ayo
+	language	Ayu	ayu	485	ayu
+	language	Ayutla Mixtec	miy	486	miy
+	language	Azerbaijani	aze	487	aze	az
+	language	Azha	aza	488	aza
+	language	Azhe	yiz	489	yiz
+	language	AzoyÃē Me'phaa	tpc	490	tpc
+	language	Baan	bvj	491	bvj
+	language	Baangi	bqx	492	bqx
+	language	Baatonum	bba	493	bba
+	language	Baba	bbw	494	bbw
+	language	Baba Malay	mbf	495	mbf
+	language	Babango	bbm	496	bbm
+	language	Babanki	bbk	497	bbk
+	language	Babatana	baa	498	baa
+	language	Babine	bcr	499	bcr
+	language	Babuza	bzg	500	bzg
+	language	Bacama	bcy	501	bcy
+	language	Bacanese Malay	btj	502	btj
+	language	Bactrian	xbc	503	xbc
+	language	Bada (Indonesia)	bhz	504	bhz
+	language	Bada (Nigeria)	bau	505	bau
+	language	Badaga	bfq	506	bfq
+	language	Bade	bde	507	bde
+	language	Badeshi	bdz	508	bdz
+	language	Badimaya	bia	509	bia
+	language	Badjiri	jbi	510	jbi
+	language	Badui	bac	511	bac
+	language	Badyara	pbp	512	pbp
+	language	Baeggu	bvd	513	bvd
+	language	Baelelea	bvc	514	bvc
+	language	Baetora	btr	515	btr
+	language	Bafanji	bfj	516	bfj
+	language	Bafaw-Balong	bwt	517	bwt
+	language	Bafia	ksf	518	ksf
+	language	Bafut	bfd	519	bfd
+	language	Baga Kaloum	bqf	520	bqf
+	language	Baga Koga	bgo	521	bgo
+	language	Baga Manduri	bmd	522	bmd
+	language	Baga Pokur	bcg	523	bcg
+	language	Baga Sitemu	bsp	524	bsp
+	language	Baga SobanÊ	bsv	525	bsv
+	language	Bagheli	bfy	526	bfy
+	language	Bagirmi	bmi	527	bmi
+	language	Bagirmi Fulfulde	fui	528	fui
+	language	Bago-Kusuntu	bqg	529	bqg
+	language	Bagri	bgq	530	bgq
+	language	Bagupi	bpi	531	bpi
+	language	Bagusa	bqb	532	bqb
+	language	Bagvalal	kva	533	kva
+	language	Baha Buyang	yha	534	yha
+	language	Baham	bdw	535	bdw
+	language	Bahamas Creole English	bah	536	bah
+	language	Baharna Arabic	abv	537	abv
+	language	Bahau	bhv	538	bhv
+	language	Bahinemo	bjh	539	bjh
+	language	Bahing	bhj	540	bhj
+	language	Bahnar	bdq	541	bdq
+	language	Bahonsuai	bsu	542	bsu
+	language	Bai (South Sudan)	bdj	543	bdj
+	language	Baibai	bbf	544	bbf
+	language	Baikeno	bkx	545	bkx
+	language	Baima	bqh	546	bqh
+	language	Baimak	bmx	547	bmx
+	language	Bainouk-Gunyaamolo	bcz	548	bcz
+	language	Bainouk-GunyuÃąo	bab	549	bab
+	language	Bainouk-Samik	bcb	550	bcb
+	language	Baiso	bsw	551	bsw
+	language	Baissa Fali	fah	552	fah
+	language	Bajan	bjs	553	bjs
+	language	Bajelani	bjm	554	bjm
+	language	Bajjika	vjk	555	vjk
+	language	Baka (Cameroon)	bkc	556	bkc
+	language	Baka (South Sudan)	bdh	557	bdh
+	language	Bakairí	bkq	558	bkq
+	language	Bakaka	bqz	559	bqz
+	language	Bakhtiari	bqi	560	bqi
+	language	Baki	bki	561	bki
+	language	Bakoko	bkh	562	bkh
+	language	Bakole	kme	563	kme
+	language	Bakpinka	bbs	564	bbs
+	language	Bakumpai	bkr	565	bkr
+	language	BakwÊ	bjw	566	bjw
+	language	Balaesang	bls	567	bls
+	language	Balaibalan	zba	568	zba
+	language	Balangao	blw	569	blw
+	language	Balangingi	sse	570	sse
+	language	Balanta-Ganja	bjt	571	bjt
+	language	Balanta-Kentohe	ble	572	ble
+	language	Balantak	blz	573	blz
+	language	Baldemu	bdn	574	bdn
+	language	Bali (Democratic Republic of Congo)	bcp	575	bcp
+	language	Bali (Nigeria)	bcn	576	bcn
+	language	Balinese	ban	577	ban
+	language	Balinese Malay	mhp	578	mhp
+	language	Balkan Gagauz Turkish	bgx	579	bgx
+	language	Balkan Romani	rmn	580	rmn
+	language	Balo	bqo	581	bqo
+	language	Baloi	biz	582	biz
+	language	Balti	bft	583	bft
+	language	Baltic Romani	rml	584	rml
+	language	Baluan-Pam	blq	585	blq
+	language	Baluchi	bal	586	bal
+	language	Bamako Sign Language	bog	587	bog
+	language	Bamali	bbq	588	bbq
+	language	Bambalang	bmo	589	bmo
+	language	Bambam	ptu	590	ptu
+	language	Bambara	bam	591	bam	bm
+	language	Bambassi	myf	592	myf
+	language	Bambili-Bambui	baw	593	baw
+	language	Bamenyam	bce	594	bce
+	language	Bamu	bcf	595	bcf
+	language	Bamukumbit	bqt	596	bqt
+	language	Bamun	bax	597	bax
+	language	Bamunka	bvm	598	bvm
+	language	Bamwe	bmg	599	bmg
+	language	Ban Khor Sign Language	bfk	600	bfk
+	language	Bana	bcw	601	bcw
+	language	Banao Itneg	bjx	602	bjx
+	language	Banaro	byz	603	byz
+	language	Banda (Indonesia)	bnd	604	bnd
+	language	Banda Malay	bpq	605	bpq
+	language	Banda-Bambari	liy	606	liy
+	language	Banda-Banda	bpd	607	bpd
+	language	Banda-Mbrès	bqk	608	bqk
+	language	Banda-NdÊlÊ	bfl	609	bfl
+	language	Banda-Yangere	yaj	610	yaj
+	language	Bandi	bza	611	bza
+	language	Bandial	bqj	612	bqj
+	language	Bandjalang	bdy	613	bdy
+	language	Bangala	bxg	614	bxg
+	language	Bangandu	bgf	615	bgf
+	language	Bangba	bbe	616	bbe
+	language	Banggai	bgz	617	bgz
+	language	Banggarla	bjb	618	bjb
+	language	Bangi	bni	619	bni
+	language	Bangime	dba	620	dba
+	language	Bangka	mfb	621	mfb
+	language	Bangolan	bgj	622	bgj
+	language	Bangubangu	bnx	623	bnx
+	language	Bangwinji	bsj	624	bsj
+	language	Baniva	bvv	625	bvv
+	language	Baniwa	bwi	626	bwi
+	language	Banjar	bjn	627	bjn
+	language	Bankagooma	bxw	628	bxw
+	language	Bankal	jjr	629	jjr
+	language	Bankan Tey Dogon	dbw	630	dbw
+	language	Bankon	abb	631	abb
+	language	Bannoni	bcm	632	bcm
+	language	Bantawa	bap	633	bap
+	language	Bantayanon	bfx	634	bfx
+	language	Bantik	bnq	635	bnq
+	language	Bantoanon	bno	636	bno
+	language	Banyjima	pnw	637	pnw
+	language	BaoulÊ	bci	638	bci
+	language	Bara Malagasy	bhr	639	bhr
+	language	Baraamu	brd	640	brd
+	language	Barababaraba	rbp	641	rbp
+	language	Barai	bbb	642	bbb
+	language	Barakai	baj	643	baj
+	language	Baram Kayan	kys	644	kys
+	language	Barama	bbg	645	bbg
+	language	Barambu	brm	646	brm
+	language	Baramu	bmz	647	bmz
+	language	Barapasi	brp	648	brp
+	language	Baras	brs	649	brs
+	language	Barasana-Eduria	bsn	650	bsn
+	language	Barbaram	vmb	651	vmb
+	language	BarbareÃąo	boi	652	boi
+	language	Barclayville Grebo	gry	653	gry
+	language	Bardi	bcj	654	bcj
+	language	Barein	bva	655	bva
+	language	Bargam	mlp	656	mlp
+	language	Bari	bfa	657	bfa
+	language	Bariai	bch	658	bch
+	language	Bariji	bjc	659	bjc
+	language	Barikanchi	bxo	660	bxo
+	language	Barikewa	jbk	661	jbk
+	language	Barok	bjk	662	bjk
+	language	Barombi	bbi	663	bbi
+	language	Barro Negro Tunebo	tbn	664	tbn
+	language	Barrow Point	bpt	665	bpt
+	language	Baruga	bjz	666	bjz
+	language	Baruya	byr	667	byr
+	language	Barwe	bwg	668	bwg
+	language	Barzani Jewish Neo-Aramaic	bjf	669	bjf
+	language	BarÊ	bae	670	bae
+	language	Barí	mot	671	mot
+	language	Basa (Cameroon)	bas	672	bas
+	language	Basa (Nigeria)	bzw	673	bzw
+	language	Basa-Gumna	bsl	674	bsl
+	language	Basa-Gurmana	buj	675	buj
+	language	Basap	bdb	676	bdb
+	language	Basay	byq	677	byq
+	language	Bashkardi	bsg	678	bsg
+	language	Bashkir	bak	679	bak	ba
+	language	Basketo	bst	680	bst
+	language	Basque	eus	681	eus	eu	baq
+	language	Bassa	bsq	682	bsq
+	language	Bassa-Kontagora	bsr	683	bsr
+	language	Bassari	bsc	684	bsc
+	language	Bassossi	bsi	685	bsi
+	language	Bata	bta	686	bta
+	language	Batad Ifugao	ifb	687	ifb
+	language	Batak	bya	688	bya
+	language	Batak Alas-Kluet	btz	689	btz
+	language	Batak Angkola	akb	690	akb
+	language	Batak Dairi	btd	691	btd
+	language	Batak Karo	btx	692	btx
+	language	Batak Mandailing	btm	693	btm
+	language	Batak Simalungun	bts	694	bts
+	language	Batak Toba	bbc	695	bbc
+	language	Batanga	bnm	696	bnm
+	language	Batek	btq	697	btq
+	language	Bateri	btv	698	btv
+	language	Bathari	bhm	699	bhm
+	language	Bati (Cameroon)	btc	700	btc
+	language	Bati (Indonesia)	bvt	701	bvt
+	language	Batjala	xby	702	xby
+	language	Bats	bbl	703	bbl
+	language	Batu	btu	704	btu
+	language	Batui	zbt	705	zbt
+	language	Batuley	bay	706	bay
+	language	Bau	bbd	707	bbd
+	language	Bau Bidayuh	sne	708	sne
+	language	Bauchi	bsf	709	bsf
+	language	Bauni	bpe	710	bpe
+	language	Baure	brg	711	brg
+	language	Bauria	bge	712	bge
+	language	Bauwaki	bwk	713	bwk
+	language	Bauzi	bvz	714	bvz
+	language	Bavarian	bar	715	bar
+	language	Bawm Chin	bgr	716	bgr
+	language	Bay Miwok	mkq	717	mkq
+	language	Bayali	bjy	718	bjy
+	language	Baybayanon	bvy	719	bvy
+	language	Baygo	byg	720	byg
+	language	Bayono	byl	721	byl
+	language	Bayot	bda	722	bda
+	language	Bayungu	bxj	723	bxj
+	language	Bazigar	bfr	724	bfr
+	language	Beami	beo	725	beo
+	language	Beaver	bea	726	bea
+	language	Beba	bfp	727	bfp
+	language	Bebele	beb	728	beb
+	language	Bebeli	bek	729	bek
+	language	Bebil	bxp	730	bxp
+	language	Bedjond	bjv	731	bjv
+	language	Bedoanas	bed	732	bed
+	language	Beeke	bkf	733	bkf
+	language	Beele	bxq	734	bxq
+	language	Beembe	beq	735	beq
+	language	Beezen	bnz	736	bnz
+	language	Befang	bby	737	bby
+	language	Beginci	ebc	738	ebc
+	language	Beja	bej	739	bej
+	language	Bekati'	bei	740	bei
+	language	Bekwarra	bkv	741	bkv
+	language	Bekwel	bkw	742	bkw
+	language	Belait	beg	743	beg
+	language	Belanda Bor	bxb	744	bxb
+	language	Belanda Viri	bvi	745	bvi
+	language	Belarusian	bel	746	bel	be
+	language	Belhariya	byw	747	byw
+	language	Beli (Papua New Guinea)	bey	748	bey
+	language	Beli (South Sudan)	blm	749	blm
+	language	Belize Kriol English	bzj	750	bzj
+	language	Bella Coola	blc	751	blc
+	language	Bellari	brw	752	brw
+	language	Belning	glb	753	glb
+	language	Bemba (Zambia)	bem	754	bem
+	language	Bembe	bmb	755	bmb
+	language	Ben Tey Dogon	dbt	756	dbt
+	language	Bena (Nigeria)	yun	757	yun
+	language	Bena (Tanzania)	bez	758	bez
+	language	Benabena	bef	759	bef
+	language	Benamanga	egm	760	egm
+	language	Bench	bcq	761	bcq
+	language	Bende	bdp	762	bdp
+	language	Bendi	bct	763	bct
+	language	Beng	nhb	764	nhb
+	language	Benga	bng	765	bng
+	language	Bengali, Bangla	ben	766	ben	Bengali	Bangla	bn
+	language	Benggoi	bgy	767	bgy
+	language	Bengkala Sign Language	bqy	768	bqy
+	language	Bentong	bnu	769	bnu
+	language	Benyadu'	byd	770	byd
+	language	Beothuk	bue	771	bue
+	language	Bepour	bie	772	bie
+	language	Berakou	bxv	773	bxv
+	language	Berau Malay	bve	774	bve
+	language	Berbice Creole Dutch	brc	775	brc
+	language	Berik	bkl	776	bkl
+	language	Berinomo	bit	777	bit
+	language	Berom	bom	778	bom
+	language	Berta	wti	779	wti
+	language	Berti	byt	780	byt
+	language	Besisi	mhe	781	mhe
+	language	Besme	bes	782	bes
+	language	Besoa	bep	783	bep
+	language	Betaf	bfe	784	bfe
+	language	Betawi	bew	785	bew
+	language	Bete	byf	786	byf
+	language	Bete-Bendi	btt	787	btt
+	language	Beti (Côte d'Ivoire)	eot	788	eot
+	language	Betta Kurumba	xub	789	xub
+	language	Bezhta	kap	790	kap
+	language	Bhadrawahi	bhd	791	bhd
+	language	Bhalay	bhx	792	bhx
+	language	Bharia	bha	793	bha
+	language	Bhatri	bgw	794	bgw
+	language	Bhattiyali	bht	795	bht
+	language	Bhaya	bhe	796	bhe
+	language	Bhele	bhy	797	bhy
+	language	Bhilali	bhi	798	bhi
+	language	Bhili	bhb	799	bhb
+	language	Bhojpuri	bho	800	bho
+	language	Bhoti Kinnauri	nes	801	nes
+	language	Bhujel	byh	802	byh
+	language	Bhunjia	bhu	803	bhu
+	language	Biafada	bif	804	bif
+	language	Biage	bdf	805	bdf
+	language	Biak	bhw	806	bhw
+	language	Biali	beh	807	beh
+	language	Bian Marind	bpv	808	bpv
+	language	Biangai	big	809	big
+	language	Biao	byk	810	byk
+	language	Biao Mon	bmt	811	bmt
+	language	Biao-Jiao Mien	bje	812	bje
+	language	Biatah Bidayuh	bth	813	bth
+	language	Bibbulman	xbp	814	xbp
+	language	Bidhawal	ihw	815	ihw
+	language	Bidiyo	bid	816	bid
+	language	Bidjara	bym	817	bym
+	language	Bidyogo	bjg	818	bjg
+	language	Biem	bmc	819	bmc
+	language	Bierebo	bnk	820	bnk
+	language	Bieria	brj	821	brj
+	language	Biete	biu	822	biu
+	language	Big Nambas	nmb	823	nmb
+	language	Biga	bhc	824	bhc
+	language	Bigambal	xbe	825	xbe
+	language	Bih	ibh	826	ibh
+	language	Bihari	bih	827	bih	bh
+	language	Bijim	jbm	828	jbm
+	language	Bijori	bix	829	bix
+	language	Bikol	bik	830	bik
+	language	Bikya	byb	831	byb
+	language	Bila	bip	832	bip
+	language	Bilakura	bql	833	bql
+	language	Bilaspuri	kfs	834	kfs
+	language	Bilba	bpz	835	bpz
+	language	Bilbil	brz	836	brz
+	language	Bile	bil	837	bil
+	language	Bilin	byn	838	byn
+	language	Bilma Kanuri	bms	839	bms
+	language	Biloxi	bll	840	bll
+	language	Bilua	blb	841	blb
+	language	Bilur	bxf	842	bxf
+	language	Bima	bhp	843	bhp
+	language	Bimin	bhl	844	bhl
+	language	Bimoba	bim	845	bim
+	language	Bina (Nigeria)	byj	846	byj
+	language	Bina (Papua New Guinea)	bmn	847	bmn
+	language	Binahari	bxz	848	bxz
+	language	Binandere	bhg	849	bhg
+	language	Bindal	xbd	850	xbd
+	language	Bine	bon	851	bon
+	language	Bini	bin	852	bin
+	language	Binji	bpj	853	bpj
+	language	Binongan Itneg	itb	854	itb
+	language	Bintauna	bne	855	bne
+	language	Bintulu	bny	856	bny
+	language	Binukid	bkd	857	bkd
+	language	Binumarien	bjr	858	bjr
+	language	Bipi	biq	859	biq
+	language	Bira	brf	860	brf
+	language	Birale	bxe	861	bxe
+	language	Birao	brr	862	brr
+	language	Birgit	btf	863	btf
+	language	Birhor	biy	864	biy
+	language	Biri	bzr	865	bzr
+	language	Biritai	bqq	866	bqq
+	language	Birked	brk	867	brk
+	language	Birri	bvq	868	bvq
+	language	Birrpayi	xbj	869	xbj
+	language	Birwa	brl	870	brl
+	language	Biseni	ije	871	ije
+	language	Bishnupriya	bpy	872	bpy
+	language	Bishuo	bwh	873	bwh
+	language	Bisis	bnw	874	bnw
+	language	Bislama	bis	875	bis	bi
+	language	Bisorio	bir	876	bir
+	language	Bissa	bib	877	bib
+	language	Bisu	bzi	878	bzi
+	language	Bit	bgk	879	bgk
+	language	Bitare	brt	880	brt
+	language	Bitur	mcc	881	mcc
+	language	Biwat	bwm	882	bwm
+	language	Biyo	byo	883	byo
+	language	Biyom	bpm	884	bpm
+	language	Blablanga	blp	885	blp
+	language	Blafe	bfh	886	bfh
+	language	Blagar	beu	887	beu
+	language	Blang	blr	888	blr
+	language	Blissymbols	zbl	889	zbl
+	language	Bo (Laos)	bgl	890	bgl
+	language	Bo (Papua New Guinea)	bpw	891	bpw
+	language	Bo-Rukul	mae	892	mae
+	language	Bo-Ung	mux	893	mux
+	language	Boano (Maluku)	bzn	894	bzn
+	language	Boano (Sulawesi)	bzl	895	bzl
+	language	Bobongko	bgb	896	bgb
+	language	Bobot	bty	897	bty
+	language	Bodo (Central African Republic)	boy	898	boy
+	language	Bodo (India)	brx	899	brx
+	language	Bodo Gadaba	gbj	900	gbj
+	language	Bodo Parja	bdv	901	bdv
+	language	Bofi	bff	902	bff
+	language	Boga	bvw	903	bvw
+	language	Bogaya	boq	904	boq
+	language	Boghom	bux	905	bux
+	language	Boguru	bqu	906	bqu
+	language	Bohtan Neo-Aramaic	bhn	907	bhn
+	language	Boikin	bzf	908	bzf
+	language	Bokha	ybk	909	ybk
+	language	Boko (Benin)	bqc	910	bqc
+	language	Boko (Democratic Republic of Congo)	bkp	911	bkp
+	language	Bokobaru	bus	912	bus
+	language	Bokoto	bdt	913	bdt
+	language	Bokyi	bky	914	bky
+	language	Bola	bnp	915	bnp
+	language	Bolango	bld	916	bld
+	language	Bole	bol	917	bol
+	language	Bolgarian	xbo	918	xbo
+	language	Bolgo	bvo	919	bvo
+	language	Bolia	bli	920	bli
+	language	Bolinao	smk	921	smk
+	language	Bolivian Sign Language	bvl	922	bvl
+	language	Boloki	bkt	923	bkt
+	language	Bolon	bof	924	bof
+	language	Bolondo	bzm	925	bzm
+	language	Bolongan	blj	926	blj
+	language	Bolyu	ply	927	ply
+	language	Bom-Kim	bmf	928	bmf
+	language	Boma	boh	929	boh
+	language	Bomboli	bml	930	bml
+	language	Bomboma	bws	931	bws
+	language	Bomitaba	zmx	932	zmx
+	language	Bomu	bmq	933	bmq
+	language	Bomwali	bmw	934	bmw
+	language	Bon Gula	glc	935	glc
+	language	Bonan	peh	936	peh
+	language	Bondei	bou	937	bou
+	language	Bondo	bfw	938	bfw
+	language	Bondoukou Kulango	kzc	939	kzc
+	language	Bondum Dom Dogon	dbu	940	dbu
+	language	Bonerate	bna	941	bna
+	language	Bonerif	bnv	942	bnv
+	language	Bonggi	bdg	943	bdg
+	language	Bonggo	bpg	944	bpg
+	language	Bongili	bui	945	bui
+	language	Bongo	bot	946	bot
+	language	Bongu	bpu	947	bpu
+	language	Bonjo	bok	948	bok
+	language	Bonkeng	bvg	949	bvg
+	language	Bonkiman	bop	950	bop
+	language	Bontok	bnc	951	bnc
+	language	Bookan	bnb	952	bnb
+	language	Boon	bnl	953	bnl
+	language	Boor	bvf	954	bvf
+	language	Bora	boa	955	boa
+	language	Borana-Arsi-Guji Oromo	gax	956	gax
+	language	Border Kuna	kvn	957	kvn
+	language	Borei	gai	958	gai
+	language	Borgu Fulfulde	fue	959	fue
+	language	Boro (Ethiopia)	bwo	960	bwo
+	language	Boro (Ghana)	xxb	961	xxb
+	language	Borong	ksr	962	ksr
+	language	Boruca	brn	963	brn
+	language	Borôro	bor	964	bor
+	language	Boselewa	bwf	965	bwf
+	language	Bosngun	bqs	966	bqs
+	language	Bosnian	bos	967	bos	bs
+	language	Bote-Majhi	bmj	968	bmj
+	language	Botlikh	bph	969	bph
+	language	Botolan Sambal	sbl	970	sbl
+	language	Bouna Kulango	nku	971	nku
+	language	Bouni	suo	972	suo
+	language	Bouyei	pcc	973	pcc
+	language	Bozaba	bzo	974	bzo
+	language	Bragat	aof	975	aof
+	language	Brahui	brh	976	brh
+	language	Braj	bra	977	bra
+	language	Brao	brb	978	brb
+	language	Brazilian Sign Language	bzs	979	bzs
+	language	Brem	buq	980	buq
+	language	Breri	brq	981	brq
+	language	Breton	bre	982	bre	br
+	language	Bribri	bzd	983	bzd
+	language	Bribri Sign Language	rib	984	rib
+	language	Brithenig	bzt	985	bzt
+	language	British Sign Language	bfi	986	bfi
+	language	Brokkat	bro	987	bro
+	language	Brokpake	sgt	988	sgt
+	language	Brokskat	bkk	989	bkk
+	language	Brooke's Point Palawano	plw	990	plw
+	language	Broome Pearling Lugger Pidgin	bpl	991	bpl
+	language	Brunca Sign Language	rnb	992	rnb
+	language	Brunei	kxd	993	kxd
+	language	Brunei Bisaya	bsb	994	bsb
+	language	Bruny Island Tasmanian	xpz	995	xpz
+	language	Bu (Bauchi State)	zbu	996	zbu
+	language	Bu (Kaduna State)	jid	997	jid
+	language	Bu-Nao Bunu	bwx	998	bwx
+	language	Bua	bub	999	bub
+	language	Bualkhaw Chin	cbl	1000	cbl
+	language	Buamu	box	1001	box
+	language	Bube	bvb	1002	bvb
+	language	Bubi	buw	1003	buw
+	language	Bubia	bbx	1004	bbx
+	language	Budeh Stieng	stt	1005	stt
+	language	Budibud	btp	1006	btp
+	language	Budong-Budong	bdx	1007	bdx
+	language	Budu	buu	1008	buu
+	language	Budukh	bdk	1009	bdk
+	language	Buduma	bdm	1010	bdm
+	language	Budza	bja	1011	bja
+	language	Bugan	bbh	1012	bbh
+	language	Bugawac	buk	1013	buk
+	language	Bughotu	bgt	1014	bgt
+	language	Buginese	bug	1015	bug
+	language	Buglere	sab	1016	sab
+	language	Bugun	bgg	1017	bgg
+	language	Buhi'non Bikol	ubl	1018	ubl
+	language	Buhid	bku	1019	bku
+	language	Buhutu	bxh	1020	bxh
+	language	Bukar-Sadung Bidayuh	sdo	1021	sdo
+	language	Bukat	bvk	1022	bvk
+	language	Bukharic	bhh	1023	bhh
+	language	Bukit Malay	bvu	1024	bvu
+	language	Bukitan	bkn	1025	bkn
+	language	Bukiyip	ape	1026	ape
+	language	Buksa	tkb	1027	tkb
+	language	Bukusu	bxk	1028	bxk
+	language	Bukwen	buz	1029	buz
+	language	Bulgarian	bul	1030	bul	bg
+	language	Bulgarian Sign Language	bqn	1031	bqn
+	language	Bulgebi	bmp	1032	bmp
+	language	Buli	uly	1033	uly
+	language	Buli (Ghana)	bwu	1034	bwu
+	language	Buli (Indonesia)	bzq	1035	bzq
+	language	Bullom So	buy	1036	buy
+	language	Bulo Stieng	sti	1037	sti
+	language	Bulu (Cameroon)	bum	1038	bum
+	language	Bulu (Papua New Guinea)	bjl	1039	bjl
+	language	Bum	bmv	1040	bmv
+	language	Bumaji	byp	1041	byp
+	language	Bumang	bvp	1042	bvp
+	language	Bumbita Arapesh	aon	1043	aon
+	language	Bumthangkha	kjz	1044	kjz
+	language	Bun	buv	1045	buv
+	language	Buna	bvn	1046	bvn
+	language	Bunak	bfn	1047	bfn
+	language	Bunama	bdd	1048	bdd
+	language	Bundeli	bns	1049	bns
+	language	Bung	bqd	1050	bqd
+	language	Bungain	but	1051	but
+	language	Bunganditj	xbg	1052	xbg
+	language	Bungku	bkz	1053	bkz
+	language	Bungu	wun	1054	wun
+	language	Bunoge Dogon	dgb	1055	dgb
+	language	Bunuba	bck	1056	bck
+	language	Bunun	bnn	1057	bnn
+	language	Buol	blf	1058	blf
+	language	Bura-Pabir	bwr	1059	bwr
+	language	Burak	bys	1060	bys
+	language	Buraka	bkg	1061	bkg
+	language	Burarra	bvr	1062	bvr
+	language	Burate	bti	1063	bti
+	language	Burduna	bxn	1064	bxn
+	language	Bure	bvh	1065	bvh
+	language	Buriat	bua	1066	bua
+	language	Burji	bji	1067	bji
+	language	Burmbar	vrt	1068	vrt
+	language	Burmese	mya	1069	mya	my	bur
+	language	Burmeso	bzu	1070	bzu
+	language	Buru (Indonesia)	mhs	1071	mhs
+	language	Buru (Nigeria)	bqw	1072	bqw
+	language	Burui	bry	1073	bry
+	language	Burumakok	aip	1074	aip
+	language	Burun	bdi	1075	bdi
+	language	Burundian Sign Language	lsb	1076	lsb
+	language	Burunge	bds	1077	bds
+	language	Burushaski	bsk	1078	bsk
+	language	Burusu	bqr	1079	bqr
+	language	Buruwai	asi	1080	asi
+	language	Busa	bqp	1081	bqp
+	language	Busam	bxs	1082	bxs
+	language	Busami	bsm	1083	bsm
+	language	Busang Kayan	bfg	1084	bfg
+	language	Bushi	buc	1085	buc
+	language	Bushoong	buf	1086	buf
+	language	Buso	bso	1087	bso
+	language	Busoa	bup	1088	bup
+	language	Bussa	dox	1089	dox
+	language	Busuu	bju	1090	bju
+	language	Butbut Kalinga	kyb	1091	kyb
+	language	Butmas-Tur	bnr	1092	bnr
+	language	Butuanon	btw	1093	btw
+	language	Buwal	bhs	1094	bhs
+	language	Buyu	byi	1095	byi
+	language	Buyuan Jinuo	jiy	1096	jiy
+	language	Bwa	bww	1097	bww
+	language	Bwaidoka	bwd	1098	bwd
+	language	Bwanabwana	tte	1099	tte
+	language	Bwatoo	bwa	1100	bwa
+	language	Bwe Karen	bwe	1101	bwe
+	language	Bwela	bwl	1102	bwl
+	language	Bwile	bwc	1103	bwc
+	language	Bwisi	bwz	1104	bwz
+	language	Byangsi	bee	1105	bee
+	language	Byep	mkk	1106	mkk
+	language	Bädi Kanum	khd	1107	khd
+	language	C'Lela	dri	1108	dri
+	language	Caac	msq	1109	msq
+	language	Cabiyarí	cbb	1110	cbb
+	language	CabÊcar	cjp	1111	cjp
+	language	Cacaloxtepec Mixtec	miu	1112	miu
+	language	Cacaopera	ccr	1113	ccr
+	language	Cacgia Roglai	roc	1114	roc
+	language	Cacua	cbv	1115	cbv
+	language	Caddo	cad	1116	cad
+	language	Cafundo Creole	ccd	1117	ccd
+	language	Cahuarano	cah	1118	cah
+	language	Cahuilla	chl	1119	chl
+	language	Cajamarca Quechua	qvc	1120	qvc
+	language	Cajatambo North Lima Quechua	qvl	1121	qvl
+	language	Cajonos Zapotec	zad	1122	zad
+	language	Cajun French	frc	1123	frc
+	language	Caka	ckx	1124	ckx
+	language	Cakchiquel-QuichÊ Mixed Language	ckz	1125	ckz
+	language	Cakfem-Mushere	cky	1126	cky
+	language	Calamian Tagbanwa	tbk	1127	tbk
+	language	CalderÃŗn Highland Quichua	qud	1128	qud
+	language	Callawalla	caw	1129	caw
+	language	Caluyanun	clu	1130	clu
+	language	CalÃŗ	rmq	1131	rmq
+	language	Cambodian Sign Language	csx	1132	csx
+	language	Cameroon Mambila	mcu	1133	mcu
+	language	Cameroon Pidgin	wes	1134	wes
+	language	Camling	rab	1135	rab
+	language	Campalagian	cml	1136	cml
+	language	Campidanese Sardinian	sro	1137	sro
+	language	CamsÃĄ	kbh	1138	kbh
+	language	Camtho	cmt	1139	cmt
+	language	Camunic	xcc	1140	xcc
+	language	Candoshi-Shapra	cbu	1141	cbu
+	language	Canela	ram	1142	ram
+	language	Canichana	caz	1143	caz
+	language	Cao Lan	mlc	1144	mlc
+	language	Cao Miao	cov	1145	cov
+	language	Capanahua	kaq	1146	kaq
+	language	Capiznon	cps	1147	cps
+	language	Cappadocian Greek	cpg	1148	cpg
+	language	Caquinte	cot	1149	cot
+	language	Car Nicobarese	caq	1150	caq
+	language	Cara	cfd	1151	cfd
+	language	Carabayo	cby	1152	cby
+	language	Caramanta	crf	1153	crf
+	language	Carapana	cbc	1154	cbc
+	language	Carian	xcr	1155	xcr
+	language	Caribbean Hindustani	hns	1156	hns
+	language	Caribbean Javanese	jvn	1157	jvn
+	language	Carijona	cbd	1158	cbd
+	language	Carolina Algonquian	crr	1159	crr
+	language	Carolinian	cal	1160	cal
+	language	Carpathian Romani	rmc	1161	rmc
+	language	Carrier	crx	1162	crx
+	language	Cashibo-Cacataibo	cbr	1163	cbr
+	language	Cashinahua	cbs	1164	cbs
+	language	Casiguran Dumagat Agta	dgc	1165	dgc
+	language	Castilian, Spanish	spa	1166	spa	Castilian	Spanish	es
+	language	Casuarina Coast Asmat	asc	1167	asc
+	language	Catalan Sign Language	csc	1168	csc
+	language	Catalan, Valencian	cat	1169	cat	Catalan	Valencian	ca
+	language	Catawba	chc	1170	chc
+	language	CavineÃąa	cav	1171	cav
+	language	Cayubaba	cyb	1172	cyb
+	language	Cayuga	cay	1173	cay
+	language	Cayuse	xcy	1174	xcy
+	language	CaÃąar Highland Quichua	qxr	1175	qxr
+	language	CaĖąhungwaĖąryaĖą	nat	1176	nat
+	language	Cebaara Senoufo	sef	1177	sef
+	language	Cebuano	ceb	1178	ceb
+	language	Celtiberian	xce	1179	xce
+	language	CemuhÃŽ	cam	1180	cam
+	language	Cen	cen	1181	cen
+	language	Central Asmat	cns	1182	cns
+	language	Central Atlas Tamazight	tzm	1183	tzm
+	language	Central Awyu	awu	1184	awu
+	language	Central Aymara	ayr	1185	ayr
+	language	Central Bai	bca	1186	bca
+	language	Central Berawan	zbc	1187	zbc
+	language	Central Bikol	bcl	1188	bcl
+	language	Central Bontok	lbk	1189	lbk
+	language	Central Cagayan Agta	agt	1190	agt
+	language	Central Grebo	grv	1191	grv
+	language	Central Hongshuihe Zhuang	zch	1192	zch
+	language	Central Huasteca Nahuatl	nch	1193	nch
+	language	Central Huishui Hmong	hmc	1194	hmc
+	language	Central Kanuri	knc	1195	knc
+	language	Central Kurdish	ckb	1196	ckb
+	language	Central Maewo	mwo	1197	mwo
+	language	Central Malay	pse	1198	pse
+	language	Central Masela	mxz	1199	mxz
+	language	Central Mashan Hmong	hmm	1200	hmm
+	language	Central Mazahua	maz	1201	maz
+	language	Central Melanau	mel	1202	mel
+	language	Central Mnong	cmo	1203	cmo
+	language	Central Nahuatl	nhn	1204	nhn
+	language	Central Nicobarese	ncb	1205	ncb
+	language	Central Ojibwa	ojc	1206	ojc
+	language	Central Okinawan	ryu	1207	ryu
+	language	Central Palawano	plc	1208	plc
+	language	Central Pame	pbs	1209	pbs
+	language	Central Pashto	pst	1210	pst
+	language	Central Pomo	poo	1211	poo
+	language	Central Puebla Nahuatl	ncx	1212	ncx
+	language	Central Sama	sml	1213	sml
+	language	Central Siberian Yupik	ess	1214	ess
+	language	Central Sierra Miwok	csm	1215	csm
+	language	Central Subanen	syb	1216	syb
+	language	Central Tagbanwa	tgt	1217	tgt
+	language	Central Tarahumara	tar	1218	tar
+	language	Central Tunebo	tuf	1219	tuf
+	language	Central Yupik	esu	1220	esu
+	language	Central-Eastern Niger Fulfulde	fuq	1221	fuq
+	language	CentÃēÃēm	cet	1222	cet
+	language	Cerma	cme	1223	cme
+	language	Cha'ari	cxh	1224	cxh
+	language	Chabu	sbf	1225	sbf
+	language	Chachapoyas Quechua	quk	1226	quk
+	language	Chachi	cbi	1227	cbi
+	language	Chadian Arabic	shu	1228	shu
+	language	Chadian Sign Language	cds	1229	cds
+	language	Chadong	cdy	1230	cdy
+	language	Chagatai	chg	1231	chg
+	language	Chaima	ciy	1232	ciy
+	language	Chak	ckh	1233	ckh
+	language	Chakali	cli	1234	cli
+	language	Chakavian	ckm	1235	ckm
+	language	Chakma	ccp	1236	ccp
+	language	Chala	cll	1237	cll
+	language	Chaldean Neo-Aramaic	cld	1238	cld
+	language	Chalikha	tgf	1239	tgf
+	language	Chamacoco	ceg	1240	ceg
+	language	Chamalal	cji	1241	cji
+	language	Chambeali	cdh	1242	cdh
+	language	Chambri	can	1243	can
+	language	Chamicuro	ccc	1244	ccc
+	language	Chamorro	cha	1245	cha	ch
+	language	Chang Naga	nbc	1246	nbc
+	language	Changriwa	cga	1247	cga
+	language	Changthang	cna	1248	cna
+	language	Chantyal	chx	1249	chx
+	language	ChanÊ	caj	1250	caj
+	language	Chara	cra	1251	cra
+	language	Chaudangsi	cdn	1252	cdn
+	language	Chaura	crv	1253	crv
+	language	Chavacano	cbk	1254	cbk
+	language	Chayahuita	cbt	1255	cbt
+	language	Chayuco Mixtec	mih	1256	mih
+	language	Chazumba Mixtec	xtb	1257	xtb
+	language	Che	ruk	1258	ruk
+	language	Chechen	che	1259	che	ce
+	language	Cheke Holo	mrn	1260	mrn
+	language	Chemakum	xch	1261	xch
+	language	Chenapian	cjn	1262	cjn
+	language	Chenchu	cde	1263	cde
+	language	Chenoua	cnu	1264	cnu
+	language	Chepang	cdm	1265	cdm
+	language	Chepya	ycp	1266	ycp
+	language	Cherepon	cpn	1267	cpn
+	language	Cherokee	chr	1268	chr
+	language	Chesu	ych	1269	ych
+	language	Chetco	ctc	1270	ctc
+	language	Chewong	cwg	1271	cwg
+	language	Cheyenne	chy	1272	chy
+	language	Chhattisgarhi	hne	1273	hne
+	language	Chhintange	ctn	1274	ctn
+	language	Chhulung	cur	1275	cur
+	language	Chiangmai Sign Language	csd	1276	csd
+	language	Chiapanec	cip	1277	cip
+	language	Chibcha	chb	1278	chb
+	language	Chicahuaxtla Triqui	trs	1279	trs
+	language	Chichewa, Chewa, Nyanja	nya	1280	nya	Chichewa	Chewa	ny	Nyanja
+	language	Chichicapan Zapotec	zpv	1281	zpv
+	language	Chichimeca-Jonaz	pei	1282	pei
+	language	Chickasaw	cic	1283	cic
+	language	Chicomuceltec	cob	1284	cob
+	language	Chiga	cgg	1285	cgg
+	language	ChigmecatitlÃĄn Mixtec	mii	1286	mii
+	language	Chilcotin	clc	1287	clc
+	language	Chilean Sign Language	csg	1288	csg
+	language	Chilisso	clh	1289	clh
+	language	Chiltepec Chinantec	csa	1290	csa
+	language	Chimalapa Zoque	zoh	1291	zoh
+	language	Chimariko	cid	1292	cid
+	language	Chimborazo Highland Quichua	qug	1293	qug
+	language	Chimila	cbg	1294	cbg
+	language	China Buriat	bxu	1295	bxu
+	language	Chinali	cih	1296	cih
+	language	Chinbon Chin	cnb	1297	cnb
+	language	Chincha Quechua	qxc	1298	qxc
+	language	Chinese	zho	1299	zho	chi	zh
+	language	Chinese Pidgin English	cpi	1300	cpi
+	language	Chinese Sign Language	csl	1301	csl
+	language	Chinook	chh	1302	chh
+	language	Chinook jargon	chn	1303	chn
+	language	Chipaya	cap	1304	cap
+	language	Chipewyan	chp	1305	chp
+	language	Chippewa	ciw	1306	ciw
+	language	ChiquihuitlÃĄn Mazatec	maq	1307	maq
+	language	Chiquitano	cax	1308	cax
+	language	ChiquiÃĄn Ancash Quechua	qxa	1309	qxa
+	language	ChiripÃĄ	nhd	1310	nhd
+	language	Chiru	cdf	1311	cdf
+	language	Chitimacha	ctm	1312	ctm
+	language	Chitkuli Kinnauri	cik	1313	cik
+	language	Chittagonian	ctg	1314	ctg
+	language	Chitwania Tharu	the	1315	the
+	language	Choapan Zapotec	zpc	1316	zpc
+	language	Chocangacakha	cgk	1317	cgk
+	language	Chochotec	coz	1318	coz
+	language	Choctaw	cho	1319	cho
+	language	Chodri	cdi	1320	cdi
+	language	Chokri Naga	nri	1321	nri
+	language	Chokwe	cjk	1322	cjk
+	language	Chol	ctu	1323	ctu
+	language	CholÃŗn	cht	1324	cht
+	language	Chong	cog	1325	cog
+	language	Choni	cda	1326	cda
+	language	Chonyi-Dzihana-Kauma	coh	1327	coh
+	language	Chopi	cce	1328	cce
+	language	Chorasmian	xco	1329	xco
+	language	Chortí	caa	1330	caa
+	language	Chothe Naga	nct	1331	nct
+	language	Chrau	crw	1332	crw
+	language	Chru	cje	1333	cje
+	language	Chuanqiandian Cluster Miao	cqd	1334	cqd
+	language	Chuave	cjv	1335	cjv
+	language	Chug	cvg	1336	cvg
+	language	Chuj	cac	1337	cac
+	language	Chuka	cuh	1338	cuh
+	language	Chukot	ckt	1339	ckt
+	language	Chukwa	cuw	1340	cuw
+	language	Chulym	clw	1341	clw
+	language	Chumburung	ncu	1342	ncu
+	language	Chung	cnq	1343	cnq
+	language	Churahi	cdj	1344	cdj
+	language	Church Slavonic, Church Slavic, Old Church Slavonic, Old Bulgarian	chu	1345	chu	cu	Church Slavonic	Church Slavic	Old Church Slavonic	Old Bulgarian
+	language	Chut	scb	1346	scb
+	language	Chuukese	chk	1347	chk
+	language	Chuvantsy	xcv	1348	xcv
+	language	Chuvash	chv	1349	chv	cv
+	language	Chuwabu	chw	1350	chw
+	language	ChÃĄcobo	cao	1351	cao
+	language	Ci Gbe	cib	1352	cib
+	language	Cia-Cia	cia	1353	cia
+	language	Cibak	ckl	1354	ckl
+	language	Cicipu	awc	1355	awc
+	language	Cimbrian	cim	1356	cim
+	language	Cinda-Regi-Tiyal	cdr	1357	cdr
+	language	Cineni	cie	1358	cie
+	language	Cinta Larga	cin	1359	cin
+	language	Cisalpine Gaulish	xcg	1360	xcg
+	language	Cishingini	asg	1361	asg
+	language	Citak	txt	1362	txt
+	language	Ciwogai	tgd	1363	tgd
+	language	Clallam	clm	1364	clm
+	language	Classical Armenian	xcl	1365	xcl
+	language	Classical Mandaic	myz	1366	myz
+	language	Classical Mongolian	cmg	1367	cmg
+	language	Classical Nahuatl	nci	1368	nci
+	language	Classical Newari	nwc	1369	nwc
+	language	Classical Quechua	qwc	1370	qwc
+	language	Classical Sanskrit	cls	1371	cls
+	language	Classical Syriac	syc	1372	syc
+	language	Classical Tibetan	xct	1373	xct
+	language	Coahuilteco	xcw	1374	xcw
+	language	Coast Miwok	csi	1375	csi
+	language	Coastal Konjo	kjc	1376	kjc
+	language	Coatecas Altas Zapotec	zca	1377	zca
+	language	Coatepec Nahuatl	naz	1378	naz
+	language	CoatlÃĄn Mixe	mco	1379	mco
+	language	CoatlÃĄn Zapotec	zps	1380	zps
+	language	Coatzospan Mixtec	miz	1381	miz
+	language	Cocama-Cocamilla	cod	1382	cod
+	language	Cochimi	coj	1383	coj
+	language	Cocopa	coc	1384	coc
+	language	Cocos Islands Malay	coa	1385	coa
+	language	Coeur d'Alene	crd	1386	crd
+	language	CofÃĄn	con	1387	con
+	language	Cogui	kog	1388	kog
+	language	Col	liw	1389	liw
+	language	Colombian Sign Language	csn	1390	csn
+	language	Colonia Tovar German	gct	1391	gct
+	language	Colorado	cof	1392	cof
+	language	Columbia-Wenatchi	col	1393	col
+	language	Comaltepec Chinantec	cco	1394	cco
+	language	Comanche	com	1395	com
+	language	Comecrudo	xcm	1396	xcm
+	language	Como Karim	cfg	1397	cfg
+	language	Comox	coo	1398	coo
+	language	Con	cno	1399	cno
+	language	Congo Swahili	swc	1400	swc
+	language	Coos	csz	1401	csz
+	language	CopainalÃĄ Zoque	zoc	1402	zoc
+	language	Copala Triqui	trc	1403	trc
+	language	Coptic	cop	1404	cop
+	language	Coquille	coq	1405	coq
+	language	Cori	cry	1406	cry
+	language	Cornish	cor	1407	cor	kw
+	language	Corongo Ancash Quechua	qwa	1408	qwa
+	language	Corsican	cos	1409	cos	co
+	language	Costa Rican Sign Language	csr	1410	csr
+	language	Cotabato Manobo	mta	1411	mta
+	language	Cotoname	xcn	1412	xcn
+	language	Cowlitz	cow	1413	cow
+	language	Coyotepec Popoloca	pbf	1414	pbf
+	language	Coyutla Totonac	toc	1415	toc
+	language	Cree	cre	1416	cre	cr
+	language	Creek	mus	1417	mus
+	language	Crimean Tatar	crh	1418	crh
+	language	Croatia Sign Language	csq	1419	csq
+	language	Cross River Mbembe	mfn	1420	mfn
+	language	Crow	cro	1421	cro
+	language	CruzeÃąo	crz	1422	crz
+	language	Cua	cua	1423	cua
+	language	Cuba Sign Language	csf	1424	csf
+	language	Cubeo	cub	1425	cub
+	language	Cuiba	cui	1426	cui
+	language	Cuitlatec	cuy	1427	cuy
+	language	Culina	cul	1428	cul
+	language	Cumanagoto	cuo	1429	cuo
+	language	Cumbric	xcb	1430	xcb
+	language	Cun	cuq	1431	cuq
+	language	Cuneiform Luwian	xlu	1432	xlu
+	language	CupeÃąo	cup	1433	cup
+	language	Curonian	xcu	1434	xcu
+	language	Curripaco	kpc	1435	kpc
+	language	Cusco Quechua	quz	1436	quz
+	language	Cutchi-Swahili	ccl	1437	ccl
+	language	Cuvok	cuv	1438	cuv
+	language	Cuyamecalco Mixtec	xtu	1439	xtu
+	language	Cuyonon	cyo	1440	cyo
+	language	Cwi Bwamu	bwy	1441	bwy
+	language	Cypriot Arabic	acy	1442	acy
+	language	Czech	ces	1443	ces	cs	cze
+	language	Czech Sign Language	cse	1444	cse
+	language	Côông	cnc	1445	cnc
+	language	Da'a Kaili	kzf	1446	kzf
+	language	Daai Chin	dao	1447	dao
+	language	Daakaka	bpa	1448	bpa
+	language	Daantanai'	lni	1449	lni
+	language	Daasanach	dsh	1450	dsh
+	language	DaatsĘŧiĖin	dtn	1451	dtn
+	language	Daba	dbq	1452	dbq
+	language	Dabarre	dbr	1453	dbr
+	language	Dabe	dbe	1454	dbe
+	language	Dacian	xdc	1455	xdc
+	language	Dadi Dadi	dda	1456	dda
+	language	Dadibi	mps	1457	mps
+	language	Dadiya	dbd	1458	dbd
+	language	Daga	dgz	1459	dgz
+	language	Dagaari Dioula	dgd	1460	dgd
+	language	Dagba	dgk	1461	dgk
+	language	Dagbani	dag	1462	dag
+	language	Dagik	dec	1463	dec
+	language	Dagoman	dgn	1464	dgn
+	language	Dahalik	dlk	1465	dlk
+	language	Dahalo	dal	1466	dal
+	language	Daho-Doo	das	1467	das
+	language	Dai	dij	1468	dij
+	language	Dai Zhuang	zhd	1469	zhd
+	language	Dair	drb	1470	drb
+	language	Dakka	dkk	1471	dkk
+	language	Dakota	dak	1472	dak
+	language	Dakpakha	dka	1473	dka
+	language	Dalabon	ngk	1474	ngk
+	language	Dalmatian	dlm	1475	dlm
+	language	Daloa BÊtÊ	bev	1476	bev
+	language	Dama	dmm	1477	dmm
+	language	Damakawa	dam	1478	dam
+	language	Damal	uhn	1479	uhn
+	language	Dambi	dac	1480	dac
+	language	Dameli	dml	1481	dml
+	language	Dampelas	dms	1482	dms
+	language	Dan	dnj	1483	dnj
+	language	Danaru	dnr	1484	dnr
+	language	Danau	dnu	1485	dnu
+	language	Dandami Maria	daq	1486	daq
+	language	DangalÊat	daa	1487	daa
+	language	Dangaura Tharu	thl	1488	thl
+	language	Danish	dan	1489	dan	da
+	language	Danish Sign Language	dsl	1490	dsl
+	language	Dano	aso	1491	aso
+	language	Danu	dnv	1492	dnv
+	language	Dao	daz	1493	daz
+	language	Daonda	dnd	1494	dnd
+	language	Dar Daju Daju	djc	1495	djc
+	language	Dar Fur Daju	daj	1496	daj
+	language	Dar Sila Daju	dau	1497	dau
+	language	Darai	dry	1498	dry
+	language	Dargwa	dar	1499	dar
+	language	Dari	prs	1500	prs
+	language	Darkinyung	xda	1501	xda
+	language	Darlong	dln	1502	dln
+	language	Darmiya	drd	1503	drd
+	language	Daro-Matu Melanau	dro	1504	dro
+	language	Dass	dot	1505	dot
+	language	Datooga	tcc	1506	tcc
+	language	Daungwurrung	dgw	1507	dgw
+	language	Daur	dta	1508	dta
+	language	Davawenyo	daw	1509	daw
+	language	Dawawa	dww	1510	dww
+	language	Dawera-Daweloor	ddw	1511	ddw
+	language	Dawik Kui	dwk	1512	dwk
+	language	Dawro	dwr	1513	dwr
+	language	Day	dai	1514	dai
+	language	Dayi	dax	1515	dax
+	language	Daza	dzd	1516	dzd
+	language	Dazaga	dzg	1517	dzg
+	language	Deccan	dcc	1518	dcc
+	language	Dedua	ded	1519	ded
+	language	Defaka	afn	1520	afn
+	language	Defi Gbe	gbh	1521	gbh
+	language	Deg	mzw	1522	mzw
+	language	Degema	deg	1523	deg
+	language	Degenan	dge	1524	dge
+	language	Degexit'an	ing	1525	ing
+	language	Dehu	dhv	1526	dhv
+	language	Dehwari	deh	1527	deh
+	language	Dek	dek	1528	dek
+	language	Dela-Oenale	row	1529	row
+	language	Delaware	del	1530	del
+	language	Delo	ntr	1531	ntr
+	language	Dem	dem	1532	dem
+	language	Dema	dmx	1533	dmx
+	language	Demisa	dei	1534	dei
+	language	Demta	dmy	1535	dmy
+	language	Dendi (Benin)	ddn	1536	ddn
+	language	Dendi (Central African Republic)	deq	1537	deq
+	language	Dengese	dez	1538	dez
+	language	Dengka	dnk	1539	dnk
+	language	Deno	dbb	1540	dbb
+	language	Denya	anv	1541	anv
+	language	Dení	dny	1542	dny
+	language	Deori	der	1543	der
+	language	Dera (Indonesia)	kbv	1544	kbv
+	language	Dera (Nigeria)	kna	1545	kna
+	language	Desano	des	1546	des
+	language	Desiya	dso	1547	dso
+	language	Dewas Rai	dwz	1548	dwz
+	language	Dewoin	dee	1549	dee
+	language	Dezfuli	def	1550	def
+	language	Dghwede	dgh	1551	dgh
+	language	Dhaiso	dhs	1552	dhs
+	language	Dhalandji	dhl	1553	dhl
+	language	Dhangu-Djangu	dhg	1554	dhg
+	language	Dhanki	dhn	1555	dhn
+	language	Dhanwar (Nepal)	dhw	1556	dhw
+	language	Dhao	nfa	1557	nfa
+	language	Dharawal	tbh	1558	tbh
+	language	Dhargari	dhr	1559	dhr
+	language	Dharuk	xdk	1560	xdk
+	language	Dharumbal	xgm	1561	xgm
+	language	Dhatki	mki	1562	mki
+	language	Dhimal	dhi	1563	dhi
+	language	Dhodia	dho	1564	dho
+	language	Dhofari Arabic	adf	1565	adf
+	language	Dhudhuroa	ddr	1566	ddr
+	language	Dhundari	dhd	1567	dhd
+	language	Dhungaloo	dhx	1568	dhx
+	language	Dhurga	dhu	1569	dhu
+	language	Dhuwal	dwu	1570	dwu
+	language	Dhuwaya	dwy	1571	dwy
+	language	Dia	dia	1572	dia
+	language	Dibabawon Manobo	mbd	1573	mbd
+	language	Dibiyaso	dby	1574	dby
+	language	Dibo	dio	1575	dio
+	language	Dibole	bvx	1576	bvx
+	language	Dicamay Agta	duy	1577	duy
+	language	Didinga	did	1578	did
+	language	Dido	ddo	1579	ddo
+	language	Dieri	dif	1580	dif
+	language	Digaro-Mishmi	mhu	1581	mhu
+	language	Digo	dig	1582	dig
+	language	Dii	dur	1583	dur
+	language	Dijim-Bwilim	cfa	1584	cfa
+	language	Dilling	dil	1585	dil
+	language	Dima	jma	1586	jma
+	language	Dimasa	dis	1587	dis
+	language	Dimbong	dii	1588	dii
+	language	Dime	dim	1589	dim
+	language	Dimli (individual language)	diq	1590	diq
+	language	Ding	diz	1591	diz
+	language	Dinka	din	1592	din
+	language	Dir-Nyamzak-Mbarimi	nzr	1593	nzr
+	language	Dirasha	gdl	1594	gdl
+	language	Diri	dwa	1595	dwa
+	language	Diriku	diu	1596	diu
+	language	Dirim	dir	1597	dir
+	language	Disa	dsi	1598	dsi
+	language	Ditammari	tbz	1599	tbz
+	language	Ditidaht	dtd	1600	dtd
+	language	Diuwe	diy	1601	diy
+	language	Diuxi-Tilantongo Mixtec	xtd	1602	xtd
+	language	Dixon Reef	dix	1603	dix
+	language	Dizin	mdx	1604	mdx
+	language	Djabugay	dyy	1605	dyy
+	language	Djabwurrung	tjw	1606	tjw
+	language	Djadjawurrung	dja	1607	dja
+	language	Djambarrpuyngu	djr	1608	djr
+	language	Djamindjung	djd	1609	djd
+	language	Djangun	djf	1610	djf
+	language	Djawi	djw	1611	djw
+	language	Djeebbana	djj	1612	djj
+	language	Djimini Senoufo	dyi	1613	dyi
+	language	Djinang	dji	1614	dji
+	language	Djinba	djb	1615	djb
+	language	Djiwarli	dze	1616	dze
+	language	Dobel	kvo	1617	kvo
+	language	Dobu	dob	1618	dob
+	language	Doe	doe	1619	doe
+	language	Doga	dgg	1620	dgg
+	language	Doghoro	dgx	1621	dgx
+	language	Dogoso	dgs	1622	dgs
+	language	DogosÊ	dos	1623	dos
+	language	Dogri (individual language)	dgo	1624	dgo
+	language	Dogri (macrolanguage)	doi	1625	doi
+	language	Dogul Dom Dogon	dbg	1626	dbg
+	language	Doka	dbi	1627	dbi
+	language	Doko-Uyanga	uya	1628	uya
+	language	Dokshi	dsk	1629	dsk
+	language	Dolgan	dlg	1630	dlg
+	language	Dolpo	dre	1631	dre
+	language	Dom	doa	1632	doa
+	language	Domaaki	dmk	1633	dmk
+	language	Domari	rmt	1634	rmt
+	language	Dombe	dov	1635	dov
+	language	Dominican Sign Language	doq	1636	doq
+	language	Dompo	doy	1637	doy
+	language	Domu	dof	1638	dof
+	language	Domung	dev	1639	dev
+	language	Dondo	dok	1640	dok
+	language	Dong	doh	1641	doh
+	language	Dongo	doo	1642	doo
+	language	Dongotono	ddd	1643	ddd
+	language	Dongshanba Lalo	yik	1644	yik
+	language	Dongxiang	sce	1645	sce
+	language	Donno So Dogon	dds	1646	dds
+	language	Doondo	dde	1647	dde
+	language	Dori'o	dor	1648	dor
+	language	Doromu-Koki	kqc	1649	kqc
+	language	Dorze	doz	1650	doz
+	language	Doso	dol	1651	dol
+	language	Dotyali	dty	1652	dty
+	language	Doutai	tds	1653	tds
+	language	Doyayo	dow	1654	dow
+	language	Drents	drt	1655	drt
+	language	Drung	duu	1656	duu
+	language	Duala	dua	1657	dua
+	language	Duano	dup	1658	dup
+	language	Duau	dva	1659	dva
+	language	Dubli	dub	1660	dub
+	language	Dubu	dmu	1661	dmu
+	language	Dugun	ndu	1662	ndu
+	language	Duguri	dbm	1663	dbm
+	language	Dugwor	dme	1664	dme
+	language	Duhwa	kbz	1665	kbz
+	language	Duke	nke	1666	nke
+	language	Dulbu	dbo	1667	dbo
+	language	Duli-Gey	duz	1668	duz
+	language	Duma	dma	1669	dma
+	language	Dumbea	duf	1670	duf
+	language	Dumi	dus	1671	dus
+	language	Dumpas	dmv	1672	dmv
+	language	Dumun	dui	1673	dui
+	language	Duna	duc	1674	duc
+	language	Dungan	dng	1675	dng
+	language	Dungmali	raa	1676	raa
+	language	Dungra Bhil	duh	1677	duh
+	language	Dungu	dbv	1678	dbv
+	language	Dupaninan Agta	duo	1679	duo
+	language	Dura	drq	1680	drq
+	language	Duri	mvp	1681	mvp
+	language	Duriankere	dbn	1682	dbn
+	language	Durop	krp	1683	krp
+	language	Duruma	dug	1684	dug
+	language	Duruwa	pci	1685	pci
+	language	Dusner	dsn	1686	dsn
+	language	Dusun Deyah	dun	1687	dun
+	language	Dusun Malang	duq	1688	duq
+	language	Dusun Witu	duw	1689	duw
+	language	Dutch	nld	1690	nld	dut	nl
+	language	Dutch Sign Language	dse	1691	dse
+	language	Dutton World Speedwords	dws	1692	dws
+	language	Duungooma	dux	1693	dux
+	language	Duupa	dae	1694	dae
+	language	Duvle	duv	1695	duv
+	language	Duwai	dbp	1696	dbp
+	language	Duwet	gve	1697	gve
+	language	DuĖƒya	ldb	1698	ldb
+	language	Dwang	nnu	1699	nnu
+	language	Dyaberdyaber	dyb	1700	dyb
+	language	Dyan	dya	1701	dya
+	language	Dyangadi	dyn	1702	dyn
+	language	Dyarim	dyr	1703	dyr
+	language	Dyirbal	dbl	1704	dbl
+	language	Dyugun	dyd	1705	dyd
+	language	Dyula	dyu	1706	dyu
+	language	Dza	jen	1707	jen
+	language	Dzalakha	dzl	1708	dzl
+	language	Dzando	dzn	1709	dzn
+	language	Dzao Min	bpn	1710	bpn
+	language	Dzongkha	dzo	1711	dzo	dz
+	language	DzÚÚngoo	dnn	1712	dnn
+	language	DÃĸw	kwa	1713	kwa
+	language	E	eee	1714	eee
+	language	E'ma Buyang	yzg	1715	yzg
+	language	E'Ãąapa Woromaipu	pbh	1716	pbh
+	language	Early Tripuri	xtr	1717	xtr
+	language	East Ambae	omb	1718	omb
+	language	East Berawan	zbe	1719	zbe
+	language	East Damar	dmr	1720	dmr
+	language	East Futuna	fud	1721	fud
+	language	East Kewa	kjs	1722	kjs
+	language	East Limba	lma	1723	lma
+	language	East Makian	mky	1724	mky
+	language	East Masela	vme	1725	vme
+	language	East Nyala	nle	1726	nle
+	language	East Tarangan	tre	1727	tre
+	language	East Yugur	yuy	1728	yuy
+	language	Eastern Abnaki	aaq	1729	aaq
+	language	Eastern Acipa	acp	1730	acp
+	language	Eastern Apurímac Quechua	qve	1731	qve
+	language	Eastern Arrernte	aer	1732	aer
+	language	Eastern Balochi	bgp	1733	bgp
+	language	Eastern Bolivian Guaraní	gui	1734	gui
+	language	Eastern Bontok	ebk	1735	ebk
+	language	Eastern Bru	bru	1736	bru
+	language	Eastern Canadian Inuktitut	ike	1737	ike
+	language	Eastern Cham	cjm	1738	cjm
+	language	Eastern Durango Nahuatl	azd	1739	azd
+	language	Eastern Egyptian Bedawi Arabic	avl	1740	avl
+	language	Eastern Frisian	frs	1741	frs
+	language	Eastern Gorkha Tamang	tge	1742	tge
+	language	Eastern Highland Chatino	cly	1743	cly
+	language	Eastern Highland Otomi	otm	1744	otm
+	language	Eastern Hongshuihe Zhuang	zeh	1745	zeh
+	language	Eastern Huasteca Nahuatl	nhe	1746	nhe
+	language	Eastern Huishui Hmong	hme	1747	hme
+	language	Eastern Karaboro	xrb	1748	xrb
+	language	Eastern Katu	ktv	1749	ktv
+	language	Eastern Kayah	eky	1750	eky
+	language	Eastern Keres	kee	1751	kee
+	language	Eastern Khumi Chin	cek	1752	cek
+	language	Eastern Krahn	kqo	1753	kqo
+	language	Eastern Lalu	yit	1754	yit
+	language	Eastern Lawa	lwl	1755	lwl
+	language	Eastern Magar	mgp	1756	mgp
+	language	Eastern Maninkakan	emk	1757	emk
+	language	Eastern Mari	mhr	1758	mhr
+	language	Eastern Maroon Creole	djk	1759	djk
+	language	Eastern Meohang	emg	1760	emg
+	language	Eastern Minyag	emq	1761	emq
+	language	Eastern Mnong	mng	1762	mng
+	language	Eastern Muria	emu	1763	emu
+	language	Eastern Ngad'a	nea	1764	nea
+	language	Eastern Nisu	nos	1765	nos
+	language	Eastern Ojibwa	ojg	1766	ojg
+	language	Eastern Oromo	hae	1767	hae
+	language	Eastern Parbate Kham	kif	1768	kif
+	language	Eastern Penan	pez	1769	pez
+	language	Eastern Pomo	peb	1770	peb
+	language	Eastern Qiandong Miao	hmq	1771	hmq
+	language	Eastern Subanen	sfe	1772	sfe
+	language	Eastern Tamang	taj	1773	taj
+	language	Eastern Tawbuid	bnj	1774	bnj
+	language	Eastern Xiangxi Miao	muq	1775	muq
+	language	Eastern Xwla Gbe	gbx	1776	gbx
+	language	Eastern Yiddish	ydd	1777	ydd
+	language	Ebira	igb	1778	igb
+	language	Eblan	xeb	1779	xeb
+	language	EbriÊ	ebr	1780	ebr
+	language	Ebughu	ebg	1781	ebg
+	language	Ecuadorian Sign Language	ecs	1782	ecs
+	language	Ede Cabe	cbj	1783	cbj
+	language	Ede Ica	ica	1784	ica
+	language	Ede Idaca	idd	1785	idd
+	language	Ede Ije	ijj	1786	ijj
+	language	Edera Awyu	awy	1787	awy
+	language	Edolo	etr	1788	etr
+	language	Edomite	xdm	1789	xdm
+	language	Edopi	dbf	1790	dbf
+	language	Efai	efa	1791	efa
+	language	Efe	efe	1792	efe
+	language	Efik	efi	1793	efi
+	language	Efutop	ofu	1794	ofu
+	language	Ega	ega	1795	ega
+	language	Eggon	ego	1796	ego
+	language	Egypt Sign Language	esl	1797	esl
+	language	Egyptian (Ancient)	egy	1798	egy
+	language	Egyptian Arabic	arz	1799	arz
+	language	Ehueun	ehu	1800	ehu
+	language	Eipomek	eip	1801	eip
+	language	Eitiep	eit	1802	eit
+	language	Ejagham	etu	1803	etu
+	language	Ejamat	eja	1804	eja
+	language	Ekai Chin	cey	1805	cey
+	language	Ekajuk	eka	1806	eka
+	language	Ekari	ekg	1807	ekg
+	language	Eki	eki	1808	eki
+	language	Ekit	eke	1809	eke
+	language	Ekpeye	ekp	1810	ekp
+	language	El Alto Zapotec	zpp	1811	zpp
+	language	El Hugeirat	elh	1812	elh
+	language	El Molo	elo	1813	elo
+	language	El Nayar Cora	crn	1814	crn
+	language	Elamite	elx	1815	elx
+	language	Eleme	elm	1816	elm
+	language	Elepi	ele	1817	ele
+	language	Elfdalian	ovd	1818	ovd
+	language	Elip	ekm	1819	ekm
+	language	Elkei	elk	1820	elk
+	language	Elotepec Zapotec	zte	1821	zte
+	language	Eloyi	afo	1822	afo
+	language	Elseng	mrf	1823	mrf
+	language	Elu	elu	1824	elu
+	language	Elymian	xly	1825	xly
+	language	Emae	mmw	1826	mmw
+	language	Emai-Iuleha-Ora	ema	1827	ema
+	language	Eman	emn	1828	emn
+	language	Embaloh	emb	1829	emb
+	language	EmberÃĄ-BaudÃŗ	bdc	1830	bdc
+	language	EmberÃĄ-Catío	cto	1831	cto
+	language	EmberÃĄ-Chamí	cmi	1832	cmi
+	language	EmberÃĄ-TadÃŗ	tdc	1833	tdc
+	language	Embu	ebu	1834	ebu
+	language	Emerillon	eme	1835	eme
+	language	Emilian	egl	1836	egl
+	language	Emplawas	emw	1837	emw
+	language	Emumu	enr	1838	enr
+	language	En	enc	1839	enc
+	language	EnawenÊ-NawÊ	unk	1840	unk
+	language	Ende	end	1841	end
+	language	Enga	enq	1842	enq
+	language	Engdewu	ngr	1843	ngr
+	language	Engenni	enn	1844	enn
+	language	Enggano	eno	1845	eno
+	language	English	eng	1846	eng	en
+	language	Enlhet	enl	1847	enl
+	language	Enrekang	ptt	1848	ptt
+	language	Enu	enu	1849	enu
+	language	Enwan (Akwa Ibom State)	enw	1850	enw
+	language	Enwan (Edo State)	env	1851	env
+	language	Enxet	enx	1852	enx
+	language	Enya	gey	1853	gey
+	language	Epena	sja	1854	sja
+	language	Epi-Olmec	xep	1855	xep
+	language	Epie	epi	1856	epi
+	language	Epigraphic Mayan	emy	1857	emy
+	language	Eravallan	era	1858	era
+	language	Erave	kjy	1859	kjy
+	language	Ere	twp	1860	twp
+	language	Eritai	ert	1861	ert
+	language	Erokwanas	erw	1862	erw
+	language	Erre	err	1863	err
+	language	Erromintxela	emx	1864	emx
+	language	Ersu	ers	1865	ers
+	language	Eruwa	erh	1866	erh
+	language	Erzya	myv	1867	myv
+	language	Esan	ish	1868	ish
+	language	Ese	mcq	1869	mcq
+	language	Ese Ejja	ese	1870	ese
+	language	Eshtehardi	esh	1871	esh
+	language	Esimbi	ags	1872	ags
+	language	Eskayan	esy	1873	esy
+	language	Esperanto	epo	1874	epo	eo
+	language	Esselen	esq	1875	esq
+	language	Estado de MÊxico Otomi	ots	1876	ots
+	language	Estonian	est	1877	est	et
+	language	Estonian Sign Language	eso	1878	eso
+	language	Esuma	esm	1879	esm
+	language	Etchemin	etc	1880	etc
+	language	Etebi	etb	1881	etb
+	language	Eten	etx	1882	etx
+	language	Eteocretan	ecr	1883	ecr
+	language	Eteocypriot	ecy	1884	ecy
+	language	Ethiopian Sign Language	eth	1885	eth
+	language	Etkywan	ich	1886	ich
+	language	Eton (Cameroon)	eto	1887	eto
+	language	Eton (Vanuatu)	etn	1888	etn
+	language	Etruscan	ett	1889	ett
+	language	Etulo	utr	1890	utr
+	language	Eudeve	eud	1891	eud
+	language	Evant	bzz	1892	bzz
+	language	Even	eve	1893	eve
+	language	Evenki	evn	1894	evn
+	language	Eviya	gev	1895	gev
+	language	Ewage-Notu	nou	1896	nou
+	language	Ewe	ewe	1897	ewe	ee
+	language	Ewondo	ewo	1898	ewo
+	language	Extremaduran	ext	1899	ext
+	language	Eyak	eya	1900	eya
+	language	Ezaa	eza	1901	eza
+	language	Fa d'Ambu	fab	1902	fab
+	language	Fagani	faf	1903	faf
+	language	Faifi	fif	1904	fif
+	language	Faire Atta	azt	1905	azt
+	language	Faita	faj	1906	faj
+	language	Faiwol	fai	1907	fai
+	language	Fala	fax	1908	fax
+	language	Falam Chin	cfm	1909	cfm
+	language	Fali	fli	1910	fli
+	language	Faliscan	xfa	1911	xfa
+	language	Fam	fam	1912	fam
+	language	Fanagalo	fng	1913	fng
+	language	Fanamaket	bjp	1914	bjp
+	language	Fanbak	fnb	1915	fnb
+	language	Fang (Cameroon)	fak	1916	fak
+	language	Fang (Equatorial Guinea)	fan	1917	fan
+	language	Fania	fni	1918	fni
+	language	Fanti	fat	1919	fat
+	language	Far Western Muria	fmu	1920	fmu
+	language	Farefare	gur	1921	gur
+	language	Faroese	fao	1922	fao	fo
+	language	Fas	fqs	1923	fqs
+	language	Fasu	faa	1924	faa
+	language	Fataleka	far	1925	far
+	language	Fataluku	ddg	1926	ddg
+	language	Fayu	fau	1927	fau
+	language	Fe'fe'	fmp	1928	fmp
+	language	Fembe	agl	1929	agl
+	language	Fernando Po Creole English	fpe	1930	fpe
+	language	Feroge	fer	1931	fer
+	language	Fiji Hindi	hif	1932	hif
+	language	Fijian	fij	1933	fij	fj
+	language	Filipino	fil	1934	fil
+	language	Filomena Mata-CoahuitlÃĄn Totonac	tlp	1935	tlp
+	language	Finland-Swedish Sign Language	fss	1936	fss
+	language	Finnish	fin	1937	fin	fi
+	language	Finnish Sign Language	fse	1938	fse
+	language	Finongan	fag	1939	fag
+	language	Fipa	fip	1940	fip
+	language	Firan	fir	1941	fir
+	language	Fiwaga	fiw	1942	fiw
+	language	Flaaitaal	fly	1943	fly
+	language	Flinders Island	fln	1944	fln
+	language	Foau	flh	1945	flh
+	language	Foi	foi	1946	foi
+	language	Foia Foia	ffi	1947	ffi
+	language	Folopa	ppo	1948	ppo
+	language	Foma	fom	1949	fom
+	language	Fon	fon	1950	fon
+	language	Fongoro	fgr	1951	fgr
+	language	Foodo	fod	1952	fod
+	language	Forak	frq	1953	frq
+	language	Fordata	frd	1954	frd
+	language	Fore	for	1955	for
+	language	Forest Enets	enf	1956	enf
+	language	Fortsenal	frt	1957	frt
+	language	Francisco LeÃŗn Zoque	zos	1958	zos
+	language	Frankish	frk	1959	frk
+	language	French	fra	1960	fra	fre	fr
+	language	French Sign Language	fsl	1961	fsl
+	language	Friulian	fur	1962	fur
+	language	Fula, Fulah	ful	1963	ful	ff	Fula	Fulah
+	language	Fuliiru	flr	1964	flr
+	language	Fulniô	fun	1965	fun
+	language	Fum	fum	1966	fum
+	language	Fungwa	ula	1967	ula
+	language	Fur	fvr	1968	fvr
+	language	Furu	fuu	1969	fuu
+	language	Futuna-Aniwa	fut	1970	fut
+	language	Fuyug	fuy	1971	fuy
+	language	Fwe	fwe	1972	fwe
+	language	FwÃĸi	fwa	1973	fwa
+	language	Fyam	pym	1974	pym
+	language	Fyer	fie	1975	fie
+	language	Ga	gaa	1976	gaa
+	language	Ga'anda	gqa	1977	gqa
+	language	Ga'dang	gdg	1978	gdg
+	language	Gaa	ttb	1979	ttb
+	language	Gaam	tbi	1980	tbi
+	language	Gabi-Gabi	gbw	1981	gbw
+	language	Gabri	gab	1982	gab
+	language	Gabrielino-FernandeÃąo	xgf	1983	xgf
+	language	Gadang	gdk	1984	gdk
+	language	Gaddang	gad	1985	gad
+	language	Gaddi	gbk	1986	gbk
+	language	Gade	ged	1987	ged
+	language	Gade Lohar	gda	1988	gda
+	language	Gadjerawang	gdh	1989	gdh
+	language	Gadsup	gaj	1990	gaj
+	language	Gaelic, Scottish Gaelic	gla	1991	gla	Gaelic	Scottish Gaelic	gd
+	language	Gafat	gft	1992	gft
+	language	Gagadu	gbu	1993	gbu
+	language	Gagauz	gag	1994	gag
+	language	Gagnoa BÊtÊ	btg	1995	btg
+	language	Gagu	ggu	1996	ggu
+	language	Gahri	bfu	1997	bfu
+	language	Gaikundi	gbf	1998	gbf
+	language	Gail	gic	1999	gic
+	language	Gaina	gcn	2000	gcn
+	language	Gal	gap	2001	gap
+	language	Galambu	glo	2002	glo
+	language	Galatian	xga	2003	xga
+	language	Galela	gbi	2004	gbi
+	language	Galeya	gar	2005	gar
+	language	Galibi Carib	car	2006	car
+	language	Galice	gce	2007	gce
+	language	Galician	glg	2008	glg	gl
+	language	Galindan	xgl	2009	xgl
+	language	Gallurese Sardinian	sdn	2010	sdn
+	language	Galo	adl	2011	adl
+	language	Galolen	gal	2012	gal
+	language	Gamale Kham	kgj	2013	kgj
+	language	Gambera	gma	2014	gma
+	language	Gambian Wolof	wof	2015	wof
+	language	Gamilaraay	kld	2016	kld
+	language	Gamit	gbl	2017	gbl
+	language	Gamkonora	gak	2018	gak
+	language	Gamo	gmv	2019	gmv
+	language	Gamo-Ningi	bte	2020	bte
+	language	Gan Chinese	gan	2021	gan
+	language	Gana	gnq	2022	gnq
+	language	Ganang	gne	2023	gne
+	language	Ganda	lug	2024	lug	lg
+	language	Gane	gzn	2025	gzn
+	language	Ganggalida	gcd	2026	gcd
+	language	Ganglau	ggl	2027	ggl
+	language	Gangte	gnb	2028	gnb
+	language	Gangulu	gnl	2029	gnl
+	language	Gants	gao	2030	gao
+	language	Ganza	gza	2031	gza
+	language	Ganzi	gnz	2032	gnz
+	language	Gao	gga	2033	gga
+	language	Gapapaiwa	pwg	2034	pwg
+	language	Garhwali	gbm	2035	gbm
+	language	Garifuna	cab	2036	cab
+	language	Garig-Ilgar	ilg	2037	ilg
+	language	Garingbal	xgi	2038	xgi
+	language	Garlali	gll	2039	gll
+	language	Garo	grt	2040	grt
+	language	Garre	gex	2041	gex
+	language	Garrwa	wrk	2042	wrk
+	language	Garus	gyb	2043	gyb
+	language	Garza	xgr	2044	xgr
+	language	Gata'	gaq	2045	gaq
+	language	Gavak	dmc	2046	dmc
+	language	Gavar	gou	2047	gou
+	language	GaviÃŖo Do JiparanÃĄ	gvo	2048	gvo
+	language	Gawar-Bati	gwt	2049	gwt
+	language	Gawri	gwc	2050	gwc
+	language	Gawwada	gwd	2051	gwd
+	language	Gayil	gyl	2052	gyl
+	language	Gayo	gay	2053	gay
+	language	Gazi	gzi	2054	gzi
+	language	Gaɓogbo	gie	2055	gie
+	language	Gbagyi	gbr	2056	gbr
+	language	Gbanu	gbv	2057	gbv
+	language	Gbanziri	gbg	2058	gbg
+	language	Gbari	gby	2059	gby
+	language	Gbaya (Central African Republic)	gba	2060	gba
+	language	Gbaya (Sudan)	krs	2061	krs
+	language	Gbaya-Bossangoa	gbp	2062	gbp
+	language	Gbaya-Bozoum	gbq	2063	gbq
+	language	Gbaya-Mbodomo	gmm	2064	gmm
+	language	Gbayi	gyg	2065	gyg
+	language	Gbesi Gbe	gbs	2066	gbs
+	language	Gbii	ggb	2067	ggb
+	language	Gbin	xgb	2068	xgb
+	language	Gbiri-Niragu	grh	2069	grh
+	language	Gboloo Grebo	gec	2070	gec
+	language	Ge	hmj	2071	hmj
+	language	Geba Karen	kvq	2072	kvq
+	language	Gebe	gei	2073	gei
+	language	Gedaged	gdd	2074	gdd
+	language	Gedeo	drs	2075	drs
+	language	Geez	gez	2076	gez
+	language	Geji	gyz	2077	gyz
+	language	Geko Karen	ghk	2078	ghk
+	language	Gela	nlg	2079	nlg
+	language	Geme	geq	2080	geq
+	language	Gen	gej	2081	gej
+	language	Gende	gaf	2082	gaf
+	language	Gengle	geg	2083	geg
+	language	Georgian	kat	2084	kat	geo	ka
+	language	Gepo	ygp	2085	ygp
+	language	Gera	gew	2086	gew
+	language	Gerai	gef	2087	gef
+	language	German	deu	2088	deu	de	ger
+	language	German Sign Language	gsg	2089	gsg
+	language	Geruma	gea	2090	gea
+	language	Geser-Gorom	ges	2091	ges
+	language	Ghadamès	gha	2092	gha
+	language	Ghanaian Pidgin English	gpe	2093	gpe
+	language	Ghanaian Sign Language	gse	2094	gse
+	language	Ghandruk Sign Language	gds	2095	gds
+	language	Ghanongga	ghn	2096	ghn
+	language	Ghari	gri	2097	gri
+	language	Ghayavi	bmk	2098	bmk
+	language	Gheg Albanian	aln	2099	aln
+	language	Ghera	ghr	2100	ghr
+	language	Ghodoberi	gdo	2101	gdo
+	language	Ghomara	gho	2102	gho
+	language	GhomÃĄlÃĄ'	bbj	2103	bbj
+	language	Ghotuo	aaa	2104	aaa
+	language	Ghulfan	ghl	2105	ghl
+	language	Giangan	bgi	2106	bgi
+	language	Gibanawa	gib	2107	gib
+	language	Gidar	gid	2108	gid
+	language	Giiwo	kks	2109	kks
+	language	Gikyode	acd	2110	acd
+	language	Gilaki	glk	2111	glk
+	language	Gilbertese	gil	2112	gil
+	language	Gilima	gix	2113	gix
+	language	Gilyak	niv	2114	niv
+	language	Gimi (Eastern Highlands)	gim	2115	gim
+	language	Gimi (West New Britain)	gip	2116	gip
+	language	Gimme	kmp	2117	kmp
+	language	Gimnime	gmn	2118	gmn
+	language	Ginuman	gnm	2119	gnm
+	language	Ginyanga	ayg	2120	ayg
+	language	Girawa	bbr	2121	bbr
+	language	Girirra	gii	2122	gii
+	language	Giryama	nyf	2123	nyf
+	language	Githabul	gih	2124	gih
+	language	Gitonga	toh	2125	toh
+	language	Gitua	ggt	2126	ggt
+	language	Gitxsan	git	2127	git
+	language	Giyug	giy	2128	giy
+	language	Gizrra	tof	2129	tof
+	language	Glaro-Twabo	glr	2130	glr
+	language	Glavda	glw	2131	glw
+	language	Glio-Oubi	oub	2132	oub
+	language	Gnau	gnu	2133	gnu
+	language	Goan Konkani	gom	2134	gom
+	language	Goaria	gig	2135	gig
+	language	Gobasi	goi	2136	goi
+	language	Gobu	gox	2137	gox
+	language	GodiÊ	god	2138	god
+	language	Godwari	gdx	2139	gdx
+	language	Goemai	ank	2140	ank
+	language	Gofa	gof	2141	gof
+	language	Gogo	gog	2142	gog
+	language	Gogodala	ggw	2143	ggw
+	language	Gokana	gkn	2144	gkn
+	language	Gola	gol	2145	gol
+	language	Golin	gvf	2146	gvf
+	language	Golpa	lja	2147	lja
+	language	Gondi	gon	2148	gon
+	language	Gone Dau	goo	2149	goo
+	language	Gongduk	goe	2150	goe
+	language	Gonja	gjn	2151	gjn
+	language	Goo	gov	2152	gov
+	language	Gooniyandi	gni	2153	gni
+	language	Gor	gqr	2154	gqr
+	language	Gorakor	goc	2155	goc
+	language	Gorap	goq	2156	goq
+	language	Goreng	xgg	2157	xgg
+	language	Gorontalo	gor	2158	gor
+	language	Gorovu	grq	2159	grq
+	language	Gorowa	gow	2160	gow
+	language	Gothic	got	2161	got
+	language	Goundo	goy	2162	goy
+	language	GourmanchÊma	gux	2163	gux
+	language	Gowlan	goj	2164	goj
+	language	Gowli	gok	2165	gok
+	language	Gowro	gwf	2166	gwf
+	language	Gozarkhani	goz	2167	goz
+	language	Grangali	nli	2168	nli
+	language	Grass Koiari	kbk	2169	kbk
+	language	Grebo	grb	2170	grb
+	language	Greek Sign Language	gss	2171	gss
+	language	Green Gelao	giq	2172	giq
+	language	Greenlandic, Kalaallisut	kal	2173	kal	kl	Greenlandic	Kalaallisut
+	language	Grenadian Creole English	gcl	2174	gcl
+	language	Gresi	grs	2175	grs
+	language	Groma	gro	2176	gro
+	language	Gronings	gos	2177	gos
+	language	Gros Ventre	ats	2178	ats
+	language	Gua	gwx	2179	gwx
+	language	Guadeloupean Creole French	gcf	2180	gcf
+	language	Guahibo	guh	2181	guh
+	language	GuajajÃĄra	gub	2182	gub
+	language	GuajÃĄ	gvj	2183	gvj
+	language	Guambiano	gum	2184	gum
+	language	Guana (Brazil)	gqn	2185	gqn
+	language	Guana (Paraguay)	gva	2186	gva
+	language	Guanano	gvc	2187	gvc
+	language	Guanche	gnc	2188	gnc
+	language	Guanyinqiao	jiq	2189	jiq
+	language	Guarani, Guaraní	grn	2190	grn	Guarani	gn	Guaraní
+	language	Guarayu	gyr	2191	gyr
+	language	Guarequena	gae	2192	gae
+	language	Guatemalan Sign Language	gsm	2193	gsm
+	language	GuatÃŗ	gta	2194	gta
+	language	Guayabero	guo	2195	guo
+	language	Gudang	xgd	2196	xgd
+	language	Gudanji	nji	2197	nji
+	language	Gude	gde	2198	gde
+	language	Gudu	gdu	2199	gdu
+	language	Guduf-Gava	gdf	2200	gdf
+	language	Guerrero Amuzgo	amu	2201	amu
+	language	Guerrero Nahuatl	ngu	2202	ngu
+	language	Guevea De Humboldt Zapotec	zpg	2203	zpg
+	language	Gugadj	ggd	2204	ggd
+	language	Gugu Badhun	gdc	2205	gdc
+	language	Gugu Warra	wrw	2206	wrw
+	language	Gugubera	kkp	2207	kkp
+	language	Guhu-Samane	ghs	2208	ghs
+	language	Guianese Creole French	gcr	2209	gcr
+	language	Guibei Zhuang	zgb	2210	zgb
+	language	Guiberoua BÊte	bet	2211	bet
+	language	Guibian Zhuang	zgn	2212	zgn
+	language	Guinea Kpelle	gkp	2213	gkp
+	language	Guinea-Bissau Sign Language	lgs	2214	lgs
+	language	Guinean Sign Language	gus	2215	gus
+	language	Guiqiong	gqi	2216	gqi
+	language	Gujarati	guj	2217	guj	gu
+	language	Gujari	gju	2218	gju
+	language	Gula (Central African Republic)	kcm	2219	kcm
+	language	Gula (Chad)	glu	2220	glu
+	language	Gula Iro	glj	2221	glj
+	language	Gula'alaa	gmb	2222	gmb
+	language	Gulay	gvl	2223	gvl
+	language	Gule	gly	2224	gly
+	language	Gulf Arabic	afb	2225	afb
+	language	Gumalu	gmu	2226	gmu
+	language	Gumatj	gnn	2227	gnn
+	language	Gumawana	gvs	2228	gvs
+	language	Gumuz	guk	2229	guk
+	language	Gun	guw	2230	guw
+	language	Gundi	gdi	2231	gdi
+	language	Gunditjmara	gjm	2232	gjm
+	language	Gundungurra	xrd	2233	xrd
+	language	Gungabula	gyf	2234	gyf
+	language	Gungu	rub	2235	rub
+	language	Guntai	gnt	2236	gnt
+	language	Gunwinggu	gup	2237	gup
+	language	Gunya	gyy	2238	gyy
+	language	Gupa-Abawa	gpa	2239	gpa
+	language	Gupapuyngu	guf	2240	guf
+	language	Guramalum	grz	2241	grz
+	language	Gurani	hac	2242	hac
+	language	Gurdjar	gdj	2243	gdj
+	language	Gureng Gureng	gnr	2244	gnr
+	language	Gurgula	ggg	2245	ggg
+	language	Guriaso	grx	2246	grx
+	language	Gurindji	gue	2247	gue
+	language	Gurindji Kriol	gjr	2248	gjr
+	language	Gurmana	gvm	2249	gvm
+	language	Guro	goa	2250	goa
+	language	Gurr-goni	gge	2251	gge
+	language	Gurung	gvr	2252	gvr
+	language	Guruntum-Mbaaru	grd	2253	grd
+	language	Gusii	guz	2254	guz
+	language	Gusilay	gsl	2255	gsl
+	language	Guugu Yimidhirr	kky	2256	kky
+	language	Guwa	xgw	2257	xgw
+	language	Guwamu	gwu	2258	gwu
+	language	Guya	gka	2259	gka
+	language	Guyanese Creole English	gyn	2260	gyn
+	language	Guyani	gvy	2261	gvy
+	language	Gvoko	ngs	2262	ngs
+	language	Gwa	gwb	2263	gwb
+	language	Gwahatike	dah	2264	dah
+	language	Gwak	jgk	2265	jgk
+	language	Gwamhi-Wuri	bga	2266	bga
+	language	Gwandara	gwn	2267	gwn
+	language	Gweda	grw	2268	grw
+	language	Gweno	gwe	2269	gwe
+	language	Gwere	gwr	2270	gwr
+	language	GwichĘŧin	gwi	2271	gwi
+	language	Gyalsumdo	gyo	2272	gyo
+	language	Gyele	gyi	2273	gyi
+	language	Gyem	gye	2274	gye
+	language	GÃŧilÃĄ Zapotec	ztu	2275	ztu
+	language	GāndhārÄĢ	pgd	2276	pgd
+	language	Ha	haq	2277	haq
+	language	Habu	hbu	2278	hbu
+	language	Hadiyya	hdy	2279	hdy
+	language	Hadothi	hoj	2280	hoj
+	language	Hadrami	xhd	2281	xhd
+	language	Hadrami Arabic	ayh	2282	ayh
+	language	Hadza	hts	2283	hts
+	language	Haeke	aek	2284	aek
+	language	Hahon	hah	2285	hah
+	language	Haida	hai	2286	hai
+	language	Haigwai	hgw	2287	hgw
+	language	Haiphong Sign Language	haf	2288	haf
+	language	Haisla	has	2289	has
+	language	Haitian Creole, Haitian	hat	2290	hat	Haitian Creole	Haitian	ht
+	language	Haitian Vodoun Culture Language	hvc	2291	hvc
+	language	HaiĮom	hgm	2292	hgm
+	language	Haji	hji	2293	hji
+	language	Hajong	haj	2294	haj
+	language	Hakha Chin	cnh	2295	cnh
+	language	Hakka Chinese	hak	2296	hak
+	language	HakÃļ	hao	2297	hao
+	language	Halang	hal	2298	hal
+	language	Halang Doan	hld	2299	hld
+	language	Halbi	hlb	2300	hlb
+	language	Halh Mongolian	khk	2301	khk
+	language	Halia	hla	2302	hla
+	language	Halkomelem	hur	2303	hur
+	language	Hamap	hmu	2304	hmu
+	language	Hamba	hba	2305	hba
+	language	Hamer-Banna	amf	2306	amf
+	language	Hamtai	hmt	2307	hmt
+	language	Han	haa	2308	haa
+	language	Hanga	hag	2309	hag
+	language	Hanga Hundi	wos	2310	wos
+	language	Hangaza	han	2311	han
+	language	Hani	hni	2312	hni
+	language	Hano	lml	2313	lml
+	language	Hanoi Sign Language	hab	2314	hab
+	language	Hanunoo	hnn	2315	hnn
+	language	Harami	xha	2316	xha
+	language	Harari	har	2317	har
+	language	Harijan Kinnauri	kjo	2318	kjo
+	language	Haroi	hro	2319	hro
+	language	Harsusi	hss	2320	hss
+	language	Haruai	tmd	2321	tmd
+	language	Haruku	hrk	2322	hrk
+	language	Haryanvi	bgc	2323	bgc
+	language	Harzani	hrz	2324	hrz
+	language	Hasha	ybj	2325	ybj
+	language	Hassaniyya	mey	2326	mey
+	language	Hatam	had	2327	had
+	language	Hattic	xht	2328	xht
+	language	Hausa	hau	2329	hau	ha
+	language	Hausa Sign Language	hsl	2330	hsl
+	language	Havasupai-Walapai-Yavapai	yuf	2331	yuf
+	language	Haveke	hvk	2332	hvk
+	language	Havu	hav	2333	hav
+	language	Hawai'i Creole English	hwc	2334	hwc
+	language	Hawai'i Sign Language (HSL)	hps	2335	hps
+	language	Hawaiian	haw	2336	haw
+	language	Haya	hay	2337	hay
+	language	Hazaragi	haz	2338	haz
+	language	Hdi	xed	2339	xed
+	language	Hebrew (modern), Hebrew	heb	2340	heb	Hebrew (modern)	Hebrew	he
+	language	Hehe	heh	2341	heh
+	language	Heiban	hbn	2342	hbn
+	language	Heiltsuk	hei	2343	hei
+	language	Helong	heg	2344	heg
+	language	Hema	nix	2345	nix
+	language	Hemba	hem	2346	hem
+	language	HerdÊ	hed	2347	hed
+	language	Herero	her	2348	her	hz
+	language	Hermit	llf	2349	llf
+	language	Hernican	xhr	2350	xhr
+	language	Hewa	ham	2351	ham
+	language	Heyo	auk	2352	auk
+	language	Hiberno-Scottish Gaelic	ghc	2353	ghc
+	language	Hibito	hib	2354	hib
+	language	Hidatsa	hid	2355	hid
+	language	Hieroglyphic Luwian	hlu	2356	hlu
+	language	Higaonon	mba	2357	mba
+	language	Highland Konjo	kjk	2358	kjk
+	language	Highland Oaxaca Chontal	chd	2359	chd
+	language	Highland Popoluca	poi	2360	poi
+	language	Highland Puebla Nahuatl	azz	2361	azz
+	language	Highland Totonac	tos	2362	tos
+	language	Hijazi Arabic	acw	2363	acw
+	language	Hijuk	hij	2364	hij
+	language	Hiligaynon	hil	2365	hil
+	language	HimarimÃŖ	hir	2366	hir
+	language	Hindi	hin	2367	hin	hi
+	language	Hinduri	hii	2368	hii
+	language	Hinukh	gin	2369	gin
+	language	Hiri Motu	hmo	2370	hmo	ho
+	language	Hittite	hit	2371	hit
+	language	Hitu	htu	2372	htu
+	language	Hiw	hiw	2373	hiw
+	language	HixkaryÃĄna	hix	2374	hix
+	language	Hlai	lic	2375	lic
+	language	Hlepho Phowa	yhl	2376	yhl
+	language	Hlersu	hle	2377	hle
+	language	Hmar	hmr	2378	hmr
+	language	Hmong	hmn	2379	hmn
+	language	Hmong Daw	mww	2380	mww
+	language	Hmong Don	hmf	2381	hmf
+	language	Hmong Dô	hmv	2382	hmv
+	language	Hmong Njua	hnj	2383	hnj
+	language	Hmong Shua	hmz	2384	hmz
+	language	Hmwaveke	mrk	2385	mrk
+	language	Ho	hoc	2386	hoc
+	language	Ho Chi Minh City Sign Language	hos	2387	hos
+	language	Ho-Chunk	win	2388	win
+	language	Hoava	hoa	2389	hoa
+	language	HobyÃŗt	hoh	2390	hoh
+	language	Hoia Hoia	hhi	2391	hhi
+	language	Holikachuk	hoi	2392	hoi
+	language	Holiya	hoy	2393	hoy
+	language	Holma	hod	2394	hod
+	language	Holoholo	hoo	2395	hoo
+	language	Holu	hol	2396	hol
+	language	Homa	hom	2397	hom
+	language	Honduras Sign Language	hds	2398	hds
+	language	Hong Kong Sign Language	hks	2399	hks
+	language	Honi	how	2400	how
+	language	Hopi	hop	2401	hop
+	language	Horned Miao	hrm	2402	hrm
+	language	Horo	hor	2403	hor
+	language	Horom	hoe	2404	hoe
+	language	Horpa	ero	2405	ero
+	language	Hote	hot	2406	hot
+	language	Hoti	hti	2407	hti
+	language	Hovongan	hov	2408	hov
+	language	Hoyahoya	hhy	2409	hhy
+	language	Hozo	hoz	2410	hoz
+	language	Hpon	hpo	2411	hpo
+	language	Hrangkhol	hra	2412	hra
+	language	Hre	hre	2413	hre
+	language	Hruso	hru	2414	hru
+	language	Hu	huo	2415	huo
+	language	Huachipaeri	hug	2416	hug
+	language	Huallaga HuÃĄnuco Quechua	qub	2417	qub
+	language	Huamalíes-Dos de Mayo HuÃĄnuco Quechua	qvh	2418	qvh
+	language	Huambisa	hub	2419	hub
+	language	Huarijio	var	2420	var
+	language	Huastec	hus	2421	hus
+	language	Huaulu	hud	2422	hud
+	language	Huautla Mazatec	mau	2423	mau
+	language	Huaxcaleca Nahuatl	nhq	2424	nhq
+	language	Huaylas Ancash Quechua	qwh	2425	qwh
+	language	Huaylla Wanca Quechua	qvw	2426	qvw
+	language	Huba	hbb	2427	hbb
+	language	Huehuetla Tepehua	tee	2428	tee
+	language	Huichol	hch	2429	hch
+	language	Huilliche	huh	2430	huh
+	language	Huitepec Mixtec	mxs	2431	mxs
+	language	Huizhou Chinese	czh	2432	czh
+	language	Hukumina	huw	2433	huw
+	language	Hula	hul	2434	hul
+	language	HulaulÃĄ	huy	2435	huy
+	language	Huli	hui	2436	hui
+	language	Hulung	huk	2437	huk
+	language	Humburi Senni Songhay	hmb	2438	hmb
+	language	Humene	huf	2439	huf
+	language	Humla	hut	2440	hut
+	language	Hunde	hke	2441	hke
+	language	Hung	hnu	2442	hnu
+	language	Hungana	hum	2443	hum
+	language	Hungarian	hun	2444	hun	hu
+	language	Hungarian Sign Language	hsh	2445	hsh
+	language	Hungu	hng	2446	hng
+	language	Hunjara-Kaina Ke	hkk	2447	hkk
+	language	Hunnic	xhc	2448	xhc
+	language	Hunsrik	hrx	2449	hrx
+	language	Hunzib	huz	2450	huz
+	language	Hupa	hup	2451	hup
+	language	HupdÃĢ	jup	2452	jup
+	language	Hupla	hap	2453	hap
+	language	Hurrian	xhu	2454	xhu
+	language	Hutterite German	geh	2455	geh
+	language	Hwana	hwo	2456	hwo
+	language	Hya	hya	2457	hya
+	language	Hyam	jab	2458	jab
+	language	Hyolmo	scp	2459	scp
+	language	HÊrtevin	hrt	2460	hrt
+	language	HÃĩne	juh	2461	juh
+	language	I-Wak	iwk	2462	iwk
+	language	Iaai	iai	2463	iai
+	language	Iamalele	yml	2464	yml
+	language	Iatmul	ian	2465	ian
+	language	Iau	tmu	2466	tmu
+	language	Ibali Teke	tek	2467	tek
+	language	Ibaloi	ibl	2468	ibl
+	language	Iban	iba	2469	iba
+	language	Ibanag	ibg	2470	ibg
+	language	Ibani	iby	2471	iby
+	language	Ibatan	ivb	2472	ivb
+	language	Iberian	xib	2473	xib
+	language	Ibibio	ibb	2474	ibb
+	language	Ibino	ibn	2475	ibn
+	language	Ibu	ibu	2476	ibu
+	language	Ibuoro	ibr	2477	ibr
+	language	Icelandic	isl	2478	isl	ice	is
+	language	Icelandic Sign Language	icl	2479	icl
+	language	Iceve-Maci	bec	2480	bec
+	language	Ida'an	dbj	2481	dbj
+	language	Idakho-Isukha-Tiriki	ida	2482	ida
+	language	IdatÊ	idt	2483	idt
+	language	Idere	ide	2484	ide
+	language	Idesa	ids	2485	ids
+	language	Idi	idi	2486	idi
+	language	Ido	ido	2487	ido	io
+	language	Idoma	idu	2488	idu
+	language	Idon	idc	2489	idc
+	language	Idu-Mishmi	clk	2490	clk
+	language	Iduna	viv	2491	viv
+	language	Ifo	iff	2492	iff
+	language	Ifè	ife	2493	ife
+	language	Igala	igl	2494	igl
+	language	Igana	igg	2495	igg
+	language	Igbo	ibo	2496	ibo	ig
+	language	Igede	ige	2497	ige
+	language	Ignaciano	ign	2498	ign
+	language	Igo	ahl	2499	ahl
+	language	Iguta	nar	2500	nar
+	language	Igwe	igw	2501	igw
+	language	Iha	ihp	2502	ihp
+	language	Iha Based Pidgin	ihb	2503	ihb
+	language	Ihievbe	ihi	2504	ihi
+	language	Ik	ikx	2505	ikx
+	language	Ika	ikk	2506	ikk
+	language	Ikaranggal	ikr	2507	ikr
+	language	Ikhin-Arokho	ikh	2508	ikh
+	language	Ikizu	ikz	2509	ikz
+	language	Iko	iki	2510	iki
+	language	Ikobi	meb	2511	meb
+	language	Ikoma-Nata-Isenye	ntk	2512	ntk
+	language	Ikpeng	txi	2513	txi
+	language	Ikpeshi	ikp	2514	ikp
+	language	Ikposo	kpo	2515	kpo
+	language	Iku-Gora-Ankwa	ikv	2516	ikv
+	language	Ikulu	ikl	2517	ikl
+	language	Ikwere	ikw	2518	ikw
+	language	Ikwo	iqw	2519	iqw
+	language	Ila	ilb	2520	ilb
+	language	Ile Ape	ila	2521	ila
+	language	Ili Turki	ili	2522	ili
+	language	Ili'uun	ilu	2523	ilu
+	language	Ilianen Manobo	mbi	2524	mbi
+	language	Illyrian	xil	2525	xil
+	language	Iloko	ilo	2526	ilo
+	language	Ilongot	ilk	2527	ilk
+	language	Ilue	ilv	2528	ilv
+	language	Ilwana	mlk	2529	mlk
+	language	Imbabura Highland Quichua	qvi	2530	qvi
+	language	Imbongu	imo	2531	imo
+	language	Imonda	imn	2532	imn
+	language	Imotong	imt	2533	imt
+	language	Imroing	imr	2534	imr
+	language	Inabaknon	abx	2535	abx
+	language	Inapang	mzu	2536	mzu
+	language	Inari Sami	smn	2537	smn
+	language	Indian Sign Language	ins	2538	ins
+	language	Indo-Portuguese	idb	2539	idb
+	language	Indonesian	ind	2540	ind	id
+	language	Indonesian Bajau	bdl	2541	bdl
+	language	Indonesian Sign Language	inl	2542	inl
+	language	Indri	idr	2543	idr
+	language	Indus Kohistani	mvy	2544	mvy
+	language	Indus Valley Language	xiv	2545	xiv
+	language	Inebu One	oin	2546	oin
+	language	IneseÃąo	inz	2547	inz
+	language	Inga	inb	2548	inb
+	language	Ingrian	izh	2549	izh
+	language	Ingush	inh	2550	inh
+	language	Inlaod Itneg	iti	2551	iti
+	language	Innu	moe	2552	moe
+	language	Inoke-Yate	ino	2553	ino
+	language	Inonhan	loc	2554	loc
+	language	Inor	ior	2555	ior
+	language	Inpui Naga	nkf	2556	nkf
+	language	Interglossa	igs	2557	igs
+	language	Interlingua, Interlingua (International Auxiliary Language Association)	ina	2558	ina	Interlingua	ia	Interlingua (International Auxiliary Language Association)
+	language	Interlingue	ile	2559	ile	ie
+	language	International Sign	ils	2560	ils
+	language	Interslavic	isv	2561	isv
+	language	Intha	int	2562	int
+	language	Inuinnaqtun	ikt	2563	ikt
+	language	Inuit Sign Language	iks	2564	iks
+	language	Inuktitut	iku	2565	iku	iu
+	language	Inupiaq	ipk	2566	ipk	ik
+	language	Iowa-Oto	iow	2567	iow
+	language	Ipalapa Amuzgo	azm	2568	azm
+	language	Ipiko	ipo	2569	ipo
+	language	Ipili	ipi	2570	ipi
+	language	Ipulo	ass	2571	ass
+	language	Iquito	iqu	2572	iqu
+	language	Ir	irr	2573	irr
+	language	Iranian Persian	pes	2574	pes
+	language	Iranian Sign Language	psc	2575	psc
+	language	Iranun (Malaysia)	ilm	2576	ilm
+	language	Iranun (Philippines)	ilp	2577	ilp
+	language	Iraqw	irk	2578	irk
+	language	Irarutu	irh	2579	irh
+	language	Iraya	iry	2580	iry
+	language	Iresim	ire	2581	ire
+	language	Irish	gle	2582	gle	ga
+	language	Irish Sign Language	isg	2583	isg
+	language	Irula	iru	2584	iru
+	language	IrÃĄntxe	irn	2585	irn
+	language	Isabi	isa	2586	isa
+	language	Isanzu	isn	2587	isn
+	language	Isarog Agta	agk	2588	agk
+	language	Isconahua	isc	2589	isc
+	language	Isebe	igo	2590	igo
+	language	Isekiri	its	2591	its
+	language	Ishkashimi	isk	2592	isk
+	language	Isinai	inn	2593	inn
+	language	Isirawa	srl	2594	srl
+	language	Island Carib	crb	2595	crb
+	language	Islander Creole English	icr	2596	icr
+	language	Isnag	isd	2597	isd
+	language	Isoko	iso	2598	iso
+	language	Israeli Sign Language	isr	2599	isr
+	language	Isthmus Mixe	mir	2600	mir
+	language	Isthmus Zapotec	zai	2601	zai
+	language	Isthmus-Cosoleacaque Nahuatl	nhk	2602	nhk
+	language	Isthmus-Mecayapan Nahuatl	nhx	2603	nhx
+	language	Isthmus-Pajapan Nahuatl	nhp	2604	nhp
+	language	Istriot	ist	2605	ist
+	language	Istro Romanian	ruo	2606	ruo
+	language	Isu (Fako Division)	szv	2607	szv
+	language	Isu (Menchum Division)	isu	2608	isu
+	language	Italian	ita	2609	ita	it
+	language	Italian Sign Language	ise	2610	ise
+	language	Itawit	itv	2611	itv
+	language	Itelmen	itl	2612	itl
+	language	Itene	ite	2613	ite
+	language	Iteri	itr	2614	itr
+	language	Itik	itx	2615	itx
+	language	Ito	itw	2616	itw
+	language	Itonama	ito	2617	ito
+	language	Itu Mbon Uzo	itm	2618	itm
+	language	Itundujia Mixtec	mce	2619	mce
+	language	ItzÃĄ	itz	2620	itz
+	language	Iu Mien	ium	2621	ium
+	language	Ivatan	ivv	2622	ivv
+	language	Ivbie North-Okpela-Arhe	atg	2623	atg
+	language	Iwaidja	ibd	2624	ibd
+	language	Iwal	kbm	2625	kbm
+	language	Iwam	iwm	2626	iwm
+	language	Iwur	iwo	2627	iwo
+	language	Ixcatec	ixc	2628	ixc
+	language	IxcatlÃĄn Mazatec	mzi	2629	mzi
+	language	Ixil	ixl	2630	ixl
+	language	Ixtayutla Mixtec	vmj	2631	vmj
+	language	Ixtenco Otomi	otz	2632	otz
+	language	Iyayu	iya	2633	iya
+	language	Iyive	uiv	2634	uiv
+	language	Iyo	nca	2635	nca
+	language	Iyo'wujwa Chorote	crq	2636	crq
+	language	Iyojwa'ja Chorote	crt	2637	crt
+	language	Izere	izr	2638	izr
+	language	Izii	izz	2639	izz
+	language	Izon	ijc	2640	ijc
+	language	Izora	cbo	2641	cbo
+	language	IÃąapari	inp	2642	inp
+	language	Jabutí	jbt	2643	jbt
+	language	Jad	jda	2644	jda
+	language	Jadgali	jdg	2645	jdg
+	language	Jah Hut	jah	2646	jah
+	language	Jahanka	jad	2647	jad
+	language	Jair Awyu	awv	2648	awv
+	language	Jaitmatang	xjt	2649	xjt
+	language	Jakati	jat	2650	jat
+	language	Jakattoe	jrt	2651	jrt
+	language	Jakun	jak	2652	jak
+	language	Jalapa De Díaz Mazatec	maj	2653	maj
+	language	Jalkunan	bxl	2654	bxl
+	language	Jamaican Country Sign Language	jcs	2655	jcs
+	language	Jamaican Creole English	jam	2656	jam
+	language	Jamaican Sign Language	jls	2657	jls
+	language	Jamamadí	jaa	2658	jaa
+	language	Jambi Malay	jax	2659	jax
+	language	Jamiltepec Mixtec	mxt	2660	mxt
+	language	Jamsay Dogon	djm	2661	djm
+	language	Jandai	jan	2662	jan
+	language	Jandavra	jnd	2663	jnd
+	language	Jangkang	djo	2664	djo
+	language	Jangshung	jna	2665	jna
+	language	Janji	jni	2666	jni
+	language	Japanese	jpn	2667	jpn	ja
+	language	Japanese Sign Language	jsl	2668	jsl
+	language	Japrería	jru	2669	jru
+	language	Jaqaru	jqr	2670	jqr
+	language	Jara	jaf	2671	jaf
+	language	Jarai	jra	2672	jra
+	language	Jarawa (India)	anq	2673	anq
+	language	Jaru	ddj	2674	ddj
+	language	Jauja Wanca Quechua	qxw	2675	qxw
+	language	Jaunsari	jns	2676	jns
+	language	Javanese	jav	2677	jav	jv
+	language	Javindo	jvd	2678	jvd
+	language	Jawe	jaz	2679	jaz
+	language	Jawoyn	djn	2680	djn
+	language	Jaya	jyy	2681	jyy
+	language	Jebero	jeb	2682	jeb
+	language	Jeh	jeh	2683	jeh
+	language	Jehai	jhi	2684	jhi
+	language	Jejara Naga	pzn	2685	pzn
+	language	Jejueo	jje	2686	jje
+	language	Jemez	tow	2687	tow
+	language	Jenaama Bozo	bze	2688	bze
+	language	Jennu Kurumba	xuj	2689	xuj
+	language	Jere	jer	2690	jer
+	language	Jeri Kuo	jek	2691	jek
+	language	Jerung	jee	2692	jee
+	language	Jewish Babylonian Aramaic (ca. 200-1200 CE)	tmr	2693	tmr
+	language	Jewish Palestinian Aramaic	jpa	2694	jpa
+	language	Jhankot Sign Language	jhs	2695	jhs
+	language	Jiamao	jio	2696	jio
+	language	Jiarong	jya	2697	jya
+	language	Jiba	juo	2698	juo
+	language	Jibu	jib	2699	jib
+	language	Jicarilla Apache	apj	2700	apj
+	language	Jiiddu	jii	2701	jii
+	language	Jilbe	jie	2702	jie
+	language	Jilim	jil	2703	jil
+	language	Jimi (Cameroon)	jim	2704	jim
+	language	Jimi (Nigeria)	jmi	2705	jmi
+	language	Jina	jia	2706	jia
+	language	Jingulu	jig	2707	jig
+	language	Jinyu Chinese	cjy	2708	cjy
+	language	Jiongnai Bunu	pnu	2709	pnu
+	language	Jirel	jul	2710	jul
+	language	Jiru	jrr	2711	jrr
+	language	Jita	jit	2712	jit
+	language	Jju	kaj	2713	kaj
+	language	Joba	job	2714	job
+	language	Jofotek-Bromnya	jbr	2715	jbr
+	language	Jogi	jog	2716	jog
+	language	Jola-Fonyi	dyo	2717	dyo
+	language	Jola-Kasa	csk	2718	csk
+	language	Jonkor Bourmataguil	jeu	2719	jeu
+	language	Jordanian Sign Language	jos	2720	jos
+	language	JorÃĄ	jor	2721	jor
+	language	Jowulu	jow	2722	jow
+	language	Ju	juu	2723	juu
+	language	Juang	jun	2724	jun
+	language	Judeo-Arabic	jrb	2725	jrb
+	language	Judeo-Berber	jbe	2726	jbe
+	language	Judeo-Georgian	jge	2727	jge
+	language	Judeo-Iraqi Arabic	yhd	2728	yhd
+	language	Judeo-Italian	itk	2729	itk
+	language	Judeo-Moroccan Arabic	aju	2730	aju
+	language	Judeo-Persian	jpr	2731	jpr
+	language	Judeo-Tat	jdt	2732	jdt
+	language	Judeo-Tripolitanian Arabic	yud	2733	yud
+	language	Judeo-Yemeni Arabic	jye	2734	jye
+	language	Jukun Takum	jbu	2735	jbu
+	language	Jumjum	jum	2736	jum
+	language	Jumla Sign Language	jus	2737	jus
+	language	Jumli	jml	2738	jml
+	language	Jungle Inga	inj	2739	inj
+	language	Juquila Mixe	mxq	2740	mxq
+	language	Jur Modo	bex	2741	bex
+	language	Juray	juy	2742	juy
+	language	Jurchen	juc	2743	juc
+	language	JurÃēna	jur	2744	jur
+	language	Jutish	jut	2745	jut
+	language	Juwal	mwb	2746	mwb
+	language	Juxtlahuaca Mixtec	vmc	2747	vmc
+	language	JuĮ€Ęŧhoan	ktz	2748	ktz
+	language	Jwira-Pepesa	jwi	2749	jwi
+	language	Jèrriais	nrf	2750	nrf
+	language	JÃēma	jua	2751	jua
+	language	K'iche'	quc	2752	quc
+	language	Kaamba	xku	2753	xku
+	language	Kaan	ldl	2754	ldl
+	language	Kaang Chin	ckn	2755	ckn
+	language	Kaansa	gna	2756	gna
+	language	Kaba	ksp	2757	ksp
+	language	Kabalai	kvf	2758	kvf
+	language	Kabardian	kbd	2759	kbd
+	language	Kabatei	xkp	2760	xkp
+	language	Kabiyè	kbp	2761	kbp
+	language	Kabola	klz	2762	klz
+	language	Kabore One	onk	2763	onk
+	language	Kabras	lkb	2764	lkb
+	language	Kaburi	uka	2765	uka
+	language	Kabutra	kbu	2766	kbu
+	language	Kabuverdianu	kea	2767	kea
+	language	Kabwa	cwa	2768	cwa
+	language	Kabwari	kcw	2769	kcw
+	language	Kabyle	kab	2770	kab
+	language	Kachama-Ganjule	kcx	2771	kcx
+	language	Kachari	xac	2772	xac
+	language	Kachhi	kfr	2773	kfr
+	language	Kachi Koli	gjk	2774	gjk
+	language	Kachin	kac	2775	kac
+	language	Kachok	xkk	2776	xkk
+	language	Kacipo-Bale Suri	koe	2777	koe
+	language	Kadai	kzd	2778	kzd
+	language	Kadar	kej	2779	kej
+	language	Kadaru	kdu	2780	kdu
+	language	Kadazan Dusun	dtp	2781	dtp
+	language	KadiwÊu	kbc	2782	kbc
+	language	Kadu	zkd	2783	zkd
+	language	Kadung	dkg	2784	dkg
+	language	Kaduo	ktp	2785	ktp
+	language	Kaeku	kkq	2786	kkq
+	language	Kaera	jka	2787	jka
+	language	Kafa	kbr	2788	kbr
+	language	Kafoa	kpu	2789	kpu
+	language	Kagan Kalagan	kll	2790	kll
+	language	Kagate	syw	2791	syw
+	language	Kagayanen	cgc	2792	cgc
+	language	Kagoma	kdm	2793	kdm
+	language	Kagoro	xkg	2794	xkg
+	language	Kagulu	kki	2795	kki
+	language	Kahe	hka	2796	hka
+	language	Kahua	agw	2797	agw
+	language	Kaian	kct	2798	kct
+	language	Kaibobo	kzb	2799	kzb
+	language	Kaidipang	kzp	2800	kzp
+	language	Kaiep	kbw	2801	kbw
+	language	Kaikadi	kep	2802	kep
+	language	Kaikavian Literary Language	kjv	2803	kjv
+	language	Kaike	kzq	2804	kzq
+	language	Kaimbulawa	zka	2805	zka
+	language	KaimbÊ	xai	2806	xai
+	language	Kaingang	kgp	2807	kgp
+	language	Kairak	ckr	2808	ckr
+	language	Kairiru	kxa	2809	kxa
+	language	Kairui-Midiki	krd	2810	krd
+	language	Kais	kzm	2811	kzm
+	language	Kaitag	xdq	2812	xdq
+	language	Kaivi	kce	2813	kce
+	language	KaiwÃĄ	kgk	2814	kgk
+	language	Kaiy	tcq	2815	tcq
+	language	Kajakse	ckq	2816	ckq
+	language	Kajali	xkj	2817	xkj
+	language	Kajaman	kag	2818	kag
+	language	Kakabai	kqf	2819	kqf
+	language	Kakabe	kke	2820	kke
+	language	Kakanda	kka	2821	kka
+	language	Kaki Ae	tbd	2822	tbd
+	language	Kako	kkj	2823	kkj
+	language	Kakwa	keo	2824	keo
+	language	Kala Lagaw Ya	mwp	2825	mwp
+	language	Kalaamaya	lkm	2826	lkm
+	language	Kalabakan	kve	2827	kve
+	language	Kalabari	ijn	2828	ijn
+	language	Kalabra	kzz	2829	kzz
+	language	Kalagan	kqe	2830	kqe
+	language	Kalaktang Monpa	kkf	2831	kkf
+	language	Kalam	kmh	2832	kmh
+	language	KalamsÊ	knz	2833	knz
+	language	Kalanadi	wkl	2834	wkl
+	language	Kalanga	kck	2835	kck
+	language	Kalanguya	kak	2836	kak
+	language	Kalao	kly	2837	kly
+	language	Kalapuya	kyl	2838	kyl
+	language	Kalarko	kba	2839	kba
+	language	Kalasha	kls	2840	kls
+	language	Kalenjin	kln	2841	kln
+	language	Kalispel-Pend d'Oreille	fla	2842	fla
+	language	Kalkoti	xka	2843	xka
+	language	Kalkutung	ktg	2844	ktg
+	language	Kalmyk	xal	2845	xal
+	language	Kalo Finnish Romani	rmf	2846	rmf
+	language	Kalou	ywa	2847	ywa
+	language	Kaluli	bco	2848	bco
+	language	Kalumpang	kli	2849	kli
+	language	Kam	kdx	2850	kdx
+	language	Kamakan	vkm	2851	vkm
+	language	Kamang	woi	2852	woi
+	language	Kamano	kbq	2853	kbq
+	language	Kamantan	kci	2854	kci
+	language	Kamar	keq	2855	keq
+	language	Kamara	jmr	2856	jmr
+	language	Kamarian	kzx	2857	kzx
+	language	Kamaru	kgx	2858	kgx
+	language	Kamas	xas	2859	xas
+	language	Kamasa	klp	2860	klp
+	language	Kamasau	kms	2861	kms
+	language	Kamayo	kyk	2862	kyk
+	language	KamayurÃĄ	kay	2863	kay
+	language	Kamba (Kenya)	kam	2864	kam
+	language	Kambaata	ktb	2865	ktb
+	language	Kambaira	kyy	2866	kyy
+	language	Kambera	xbr	2867	xbr
+	language	Kamberau	irx	2868	irx
+	language	KambiwÃĄ	xbw	2869	xbw
+	language	Kami (Nigeria)	kmi	2870	kmi
+	language	Kami (Tanzania)	kcu	2871	kcu
+	language	Kamo	kcq	2872	kcq
+	language	Kamoro	kgq	2873	kgq
+	language	Kamu	xmu	2874	xmu
+	language	Kamula	xla	2875	xla
+	language	Kamviri	xvi	2876	xvi
+	language	Kamwe	hig	2877	hig
+	language	Kanakanabu	xnb	2878	xnb
+	language	Kanamarí	knm	2879	knm
+	language	Kanan	zkn	2880	zkn
+	language	Kanashi	xns	2881	xns
+	language	Kanasi	soq	2882	soq
+	language	Kanauji	bjj	2883	bjj
+	language	Kandas	kqw	2884	kqw
+	language	Kandawo	gam	2885	gam
+	language	Kande	kbs	2886	kbs
+	language	Kanembu	kbl	2887	kbl
+	language	Kang	kyp	2888	kyp
+	language	Kanga	kcp	2889	kcp
+	language	Kangean	kkv	2890	kkv
+	language	Kanggape	igm	2891	igm
+	language	Kangjia	kxs	2892	kxs
+	language	Kango (Bas-UÊlÊ District)	kty	2893	kty
+	language	Kango (Tshopo District)	kzy	2894	kzy
+	language	Kangri	xnr	2895	xnr
+	language	Kaniet	ktk	2896	ktk
+	language	Kanikkaran	kev	2897	kev
+	language	Kaningdon-Nindem	kdp	2898	kdp
+	language	Kaningi	kzo	2899	kzo
+	language	Kaningra	knr	2900	knr
+	language	Kaninuwa	wat	2901	wat
+	language	Kanite	kmu	2902	kmu
+	language	Kanjari	kft	2903	kft
+	language	Kanju	kbe	2904	kbe
+	language	Kankanaey	kne	2905	kne
+	language	Kannada	kan	2906	kan	kn
+	language	Kannada Kurumba	kfi	2907	kfi
+	language	Kanowit-Tanjong Melanau	kxn	2908	kxn
+	language	KanoÊ	kxo	2909	kxo
+	language	Kansa	ksk	2910	ksk
+	language	Kantosi	xkt	2911	xkt
+	language	Kanu	khx	2912	khx
+	language	Kanufi	kni	2913	kni
+	language	Kanuri	kau	2914	kau	kr
+	language	Kanyok	kny	2915	kny
+	language	Kao	kax	2916	kax
+	language	Kaonde	kqn	2917	kqn
+	language	Kap	ykm	2918	ykm
+	language	Kapin	tbx	2919	tbx
+	language	KapinawÃĄ	xpn	2920	xpn
+	language	Kapingamarangi	kpg	2921	kpg
+	language	Kapori	khp	2922	khp
+	language	Kapriman	dju	2923	dju
+	language	Kaptiau	kbi	2924	kbi
+	language	Kapya	klo	2925	klo
+	language	Kaqchikel	cak	2926	cak
+	language	Kara (Central African Republic)	kah	2927	kah
+	language	Kara (Korea)	zra	2928	zra
+	language	Kara (Papua New Guinea)	leu	2929	leu
+	language	Kara (Tanzania)	reg	2930	reg
+	language	Kara-Kalpak	kaa	2931	kaa
+	language	Karachay-Balkar	krc	2932	krc
+	language	Karagas	kim	2933	kim
+	language	Karaim	kdr	2934	kdr
+	language	Karajarri	gbd	2935	gbd
+	language	KarajÃĄ	kpj	2936	kpj
+	language	Karakhanid	xqa	2937	xqa
+	language	Karami	xar	2938	xar
+	language	Karamojong	kdj	2939	kdj
+	language	Karang	kzr	2940	kzr
+	language	Karanga	kth	2941	kth
+	language	Karankawa	zkk	2942	zkk
+	language	Karao	kyj	2943	kyj
+	language	Karas	kgv	2944	kgv
+	language	Karata	kpt	2945	kpt
+	language	Karawa	xrw	2946	xrw
+	language	Karbi	mjw	2947	mjw
+	language	Kare (Central African Republic)	kbn	2948	kbn
+	language	Kare (Papua New Guinea)	kmf	2949	kmf
+	language	Karekare	kai	2950	kai
+	language	Karelian	krl	2951	krl
+	language	Karenggapa	eaa	2952	eaa
+	language	Karey	kyd	2953	kyd
+	language	Kari	kbj	2954	kbj
+	language	Karingani	kgn	2955	kgn
+	language	Karipuna	kuq	2956	kuq
+	language	KaripÃēna Creole French	kmv	2957	kmv
+	language	Karirí-XocÃŗ	kzw	2958	kzw
+	language	KaritiÃĸna	ktn	2959	ktn
+	language	Kariya	kil	2960	kil
+	language	Kariyarra	vka	2961	vka
+	language	Karkar-Yuri	yuj	2962	yuj
+	language	Karkin	krb	2963	krb
+	language	Karko	kko	2964	kko
+	language	Karnai	bbv	2965	bbv
+	language	Karo (Brazil)	arr	2966	arr
+	language	Karo (Ethiopia)	kxh	2967	kxh
+	language	Karok	kyh	2968	kyh
+	language	Karon	krx	2969	krx
+	language	Karon Dori	kgw	2970	kgw
+	language	Karore	xkx	2971	xkx
+	language	Karuwali	rxw	2972	rxw
+	language	Kasanga	ccj	2973	ccj
+	language	Kasem	xsm	2974	xsm
+	language	Kashaya	kju	2975	kju
+	language	Kashmiri	kas	2976	kas	ks
+	language	Kashubian	csb	2977	csb
+	language	Kasiguranin	ksn	2978	ksn
+	language	Kaska	kkz	2979	kkz
+	language	Kaskean	zsk	2980	zsk
+	language	Kasua	khs	2981	khs
+	language	Katabaga	ktq	2982	ktq
+	language	Katawixi	xat	2983	xat
+	language	Katbol	tmb	2984	tmb
+	language	Katcha-Kadugli-Miri	xtc	2985	xtc
+	language	Kathoriya Tharu	tkt	2986	tkt
+	language	Kathu	ykt	2987	ykt
+	language	Kati	bsh	2988	bsh
+	language	Katkari	kfu	2989	kfu
+	language	Katla	kcr	2990	kcr
+	language	Kato	ktw	2991	ktw
+	language	Katso	kaf	2992	kaf
+	language	Katua	kta	2993	kta
+	language	Katukína	kav	2994	kav
+	language	Kaulong	pss	2995	pss
+	language	Kaur	vkk	2996	vkk
+	language	Kaure	bpp	2997	bpp
+	language	Kaurna	zku	2998	zku
+	language	Kauwera	xau	2999	xau
+	language	Kavalan	ckv	3000	ckv
+	language	Kavet	krv	3001	krv
+	language	Kawacha	kcb	3002	kcb
+	language	Kawaiisu	xaw	3003	xaw
+	language	Kawe	kgb	3004	kgb
+	language	Kawi	kaw	3005	kaw
+	language	Kaxararí	ktx	3006	ktx
+	language	KaxuiÃĸna	kbb	3007	kbb
+	language	Kayabí	kyz	3008	kyz
+	language	Kayagar	kyt	3009	kyt
+	language	Kayan	pdu	3010	pdu
+	language	Kayan Mahakam	xay	3011	xay
+	language	Kayan River Kayan	xkn	3012	xkn
+	language	KayapÃŗ	txu	3013	txu
+	language	Kayardild	gyd	3014	gyd
+	language	Kayaw	kvl	3015	kvl
+	language	Kayeli	kzl	3016	kzl
+	language	Kayong	kxy	3017	kxy
+	language	Kayort	kyv	3018	kyv
+	language	Kaytetye	gbb	3019	gbb
+	language	Kayupulau	kzu	3020	kzu
+	language	Kazakh	kaz	3021	kaz	kk
+	language	Kazukuru	kzk	3022	kzk
+	language	Ke'o	xxk	3023	xxk
+	language	Keak	keh	3024	keh
+	language	Keapara	khz	3025	khz
+	language	Kedah Malay	meo	3026	meo
+	language	Kedang	ksx	3027	ksx
+	language	Keder	kdy	3028	kdy
+	language	Keerray-Woorroong	wkr	3029	wkr
+	language	Kehu	khh	3030	khh
+	language	Kei	kei	3031	kei
+	language	Keiga	kec	3032	kec
+	language	Kein	bmh	3033	bmh
+	language	Keiyo	eyo	3034	eyo
+	language	Kekchí	kek	3035	kek
+	language	Kela (Democratic Republic of Congo)	kel	3036	kel
+	language	Kela (Papua New Guinea)	kcl	3037	kcl
+	language	Kelabit	kzi	3038	kzi
+	language	Kele (Democratic Republic of Congo)	khy	3039	khy
+	language	Kele (Papua New Guinea)	sbc	3040	sbc
+	language	Keley-I Kallahan	ify	3041	ify
+	language	Keliko	kbo	3042	kbo
+	language	Kelo	xel	3043	xel
+	language	Kelon	kyo	3044	kyo
+	language	Kemak	kem	3045	kem
+	language	Kembayan	xem	3046	xem
+	language	Kemberano	bzp	3047	bzp
+	language	Kembra	xkw	3048	xkw
+	language	Kemedzung	dmo	3049	dmo
+	language	Kemi Sami	sjk	3050	sjk
+	language	Kemiehua	kfj	3051	kfj
+	language	Kemtuik	kmt	3052	kmt
+	language	Kenaboi	xbn	3053	xbn
+	language	Kenati	gat	3054	gat
+	language	Kendayan	knx	3055	knx
+	language	Kendeje	klf	3056	klf
+	language	Kendem	kvm	3057	kvm
+	language	Kenga	kyq	3058	kyq
+	language	Keningau Murut	kxi	3059	kxi
+	language	Keninjal	knl	3060	knl
+	language	Kensiu	kns	3061	kns
+	language	Kenswei Nsei	ndb	3062	ndb
+	language	Kenyan Sign Language	xki	3063	xki
+	language	Kenyang	ken	3064	ken
+	language	Kenyi	lke	3065	lke
+	language	Kenzi	xnz	3066	xnz
+	language	Keoru-Ahia	xeu	3067	xeu
+	language	KepkiriwÃĄt	kpn	3068	kpn
+	language	Kepo'	kuk	3069	kuk
+	language	Kera	ker	3070	ker
+	language	Kerak	hhr	3071	hhr
+	language	Kereho	xke	3072	xke
+	language	Kerek	krk	3073	krk
+	language	Kerewe	ked	3074	ked
+	language	Kerewo	kxz	3075	kxz
+	language	Kerinci	kvr	3076	kvr
+	language	Kesawai	xes	3077	xes
+	language	Ket	ket	3078	ket
+	language	Ketangalan	kae	3079	kae
+	language	Kete	kcv	3080	kcv
+	language	Ketengban	xte	3081	xte
+	language	Ketum	ktt	3082	ktt
+	language	Keyagana	kyg	3083	kyg
+	language	Kgalagadi	xkv	3084	xkv
+	language	Khah	hkh	3085	hkh
+	language	Khakas	kjh	3086	kjh
+	language	Khalaj	klj	3087	klj
+	language	Khaling	klr	3088	klr
+	language	Khamba	kbg	3089	kbg
+	language	Khamnigan Mongol	ykh	3090	ykh
+	language	Khams Tibetan	khg	3091	khg
+	language	Khamti	kht	3092	kht
+	language	Khamyang	ksu	3093	ksu
+	language	Khana	ogo	3094	ogo
+	language	Khandesi	khn	3095	khn
+	language	Khanty	kca	3096	kca
+	language	Khao	xao	3097	xao
+	language	Kharam Naga	kfw	3098	kfw
+	language	Kharia	khr	3099	khr
+	language	Kharia Thar	ksy	3100	ksy
+	language	Khasi	kha	3101	kha
+	language	Khayo	lko	3102	lko
+	language	Khazar	zkz	3103	zkz
+	language	Khe	kqg	3104	kqg
+	language	Khehek	tlx	3105	tlx
+	language	Khengkha	xkf	3106	xkf
+	language	Khetrani	xhe	3107	xhe
+	language	Khezha Naga	nkh	3108	nkh
+	language	Khiamniungan Naga	kix	3109	kix
+	language	Khinalugh	kjj	3110	kjj
+	language	Khirwar	kwx	3111	kwx
+	language	Khisa	kqm	3112	kqm
+	language	Khlula	ykl	3113	ykl
+	language	Khmer	khm	3114	khm	km
+	language	Khmu	kjg	3115	kjg
+	language	Kho'ini	xkc	3116	xkc
+	language	Khoekhoe	naq	3117	naq
+	language	Khoibu Naga	nkb	3118	nkb
+	language	Kholok	ktc	3119	ktc
+	language	Khorasani Turkish	kmz	3120	kmz
+	language	Khorezmian	zkh	3121	zkh
+	language	Khotanese	kho	3122	kho
+	language	Khowar	khw	3123	khw
+	language	Khua	xhv	3124	xhv
+	language	Khuen	khf	3125	khf
+	language	Khumi Chin	cnk	3126	cnk
+	language	Khunsari	kfm	3127	kfm
+	language	Khvarshi	khv	3128	khv
+	language	KhÃĄng	kjm	3129	kjm
+	language	KhÃŧn	kkh	3130	kkh
+	language	Kibala	blv	3131	blv
+	language	Kibet	kie	3132	kie
+	language	Kibiri	prm	3133	prm
+	language	Kickapoo	kic	3134	kic
+	language	Kija	gia	3135	gia
+	language	Kikai	kzg	3136	kzg
+	language	Kikuyu, Gikuyu	kik	3137	kik	Kikuyu	Gikuyu	ki
+	language	Kildin Sami	sjd	3138	sjd
+	language	Kilivila	kij	3139	kij
+	language	Kiliwa	klb	3140	klb
+	language	Kilmeri	kih	3141	kih
+	language	Kim	kia	3142	kia
+	language	Kim Mun	mji	3143	mji
+	language	Kimaama	kig	3144	kig
+	language	Kimaragang	kqr	3145	kqr
+	language	Kimbu	kiv	3146	kiv
+	language	Kimbundu	kmb	3147	kmb
+	language	Kimki	sbt	3148	sbt
+	language	KimrÊ	kqp	3149	kqp
+	language	Kinabalian	cbw	3150	cbw
+	language	Kinalakna	kco	3151	kco
+	language	Kinamiging Manobo	mkx	3152	mkx
+	language	Kinaray-A	krj	3153	krj
+	language	Kinga	zga	3154	zga
+	language	Kinnauri	kfk	3155	kfk
+	language	Kintaq	knq	3156	knq
+	language	Kinuku	kkd	3157	kkd
+	language	Kinyarwanda	kin	3158	kin	rw
+	language	Kioko	ues	3159	ues
+	language	Kiong	kkm	3160	kkm
+	language	Kiorr	xko	3161	xko
+	language	Kiowa	kio	3162	kio
+	language	Kiowa Apache	apk	3163	apk
+	language	Kipsigis	sgc	3164	sgc
+	language	Kiput	kyi	3165	kyi
+	language	Kir-Balar	kkr	3166	kkr
+	language	Kire	geb	3167	geb
+	language	Kirghiz, Kyrgyz	kir	3168	kir	Kirghiz	Kyrgyz	ky
+	language	Kirike	okr	3169	okr
+	language	Kirikiri	kiy	3170	kiy
+	language	Kirmanjki (individual language)	kiu	3171	kiu
+	language	Kirya-Konzəl	fkk	3172	fkk
+	language	Kis	kis	3173	kis
+	language	Kisa	lks	3174	lks
+	language	Kisan	xis	3175	xis
+	language	Kisankasa	kqh	3176	kqh
+	language	Kisar	kje	3177	kje
+	language	Kisi	kiz	3178	kiz
+	language	Kistane	gru	3179	gru
+	language	Kita Maninkakan	mwk	3180	mwk
+	language	Kitan	zkt	3181	zkt
+	language	Kitsai	kii	3182	kii
+	language	Kituba (Congo)	mkw	3183	mkw
+	language	Kituba (Democratic Republic of Congo)	ktu	3184	ktu
+	language	Kiunum	wei	3185	wei
+	language	Kizamani	izm	3186	izm
+	language	Kla-Dan	lda	3187	lda
+	language	Klamath-Modoc	kla	3188	kla
+	language	Klao	klu	3189	klu
+	language	Klias River Kadazan	kqt	3190	kqt
+	language	Klingon	tlh	3191	tlh
+	language	Knaanic	czk	3192	czk
+	language	Ko	fuj	3193	fuj
+	language	Koalib	kib	3194	kib
+	language	Koasati	cku	3195	cku
+	language	Koba	kpd	3196	kpd
+	language	Kobiana	kcj	3197	kcj
+	language	Kobo	okc	3198	okc
+	language	Kobol	kgu	3199	kgu
+	language	Kobon	kpw	3200	kpw
+	language	Koch	kdq	3201	kdq
+	language	Kochila Tharu	thq	3202	thq
+	language	Koda	cdz	3203	cdz
+	language	Kodaku	ksz	3204	ksz
+	language	Kodava	kfa	3205	kfa
+	language	Kodeoha	vko	3206	vko
+	language	Kodi	kod	3207	kod
+	language	Kodia	kwp	3208	kwp
+	language	Koenoem	kcs	3209	kcs
+	language	Kofa	kso	3210	kso
+	language	Kofei	kpi	3211	kpi
+	language	Kofyar	kwl	3212	kwl
+	language	Koguryo	zkg	3213	zkg
+	language	Kohin	kkx	3214	kkx
+	language	Kohistani Shina	plk	3215	plk
+	language	Koho	kpm	3216	kpm
+	language	Kohumono	bcs	3217	bcs
+	language	Koi	kkt	3218	kkt
+	language	Koireng	nkd	3219	nkd
+	language	Koitabu	kqi	3220	kqi
+	language	Koiwat	kxt	3221	kxt
+	language	Kok Borok	trp	3222	trp
+	language	Kok-Nar	gko	3223	gko
+	language	Kokata	ktd	3224	ktd
+	language	Koke	kou	3225	kou
+	language	Koki Naga	nxk	3226	nxk
+	language	Koko Babangk	okg	3227	okg
+	language	Kokoda	xod	3228	xod
+	language	Kokola	kzn	3229	kzn
+	language	Kokota	kkk	3230	kkk
+	language	Kol (Bangladesh)	ekl	3231	ekl
+	language	Kol (Cameroon)	biw	3232	biw
+	language	Kol (Papua New Guinea)	kol	3233	kol
+	language	Kola	kvv	3234	kvv
+	language	Kolbila	klc	3235	klc
+	language	Kolibugan Subanon	skn	3236	skn
+	language	Koluwawa	klx	3237	klx
+	language	Kom (Cameroon)	bkm	3238	bkm
+	language	Kom (India)	kmm	3239	kmm
+	language	Koma	kmy	3240	kmy
+	language	Komba	kpf	3241	kpf
+	language	Kombai	tyn	3242	tyn
+	language	Kombio	xbi	3243	xbi
+	language	Komering	kge	3244	kge
+	language	Komi	kom	3245	kom	kv
+	language	Komi-Permyak	koi	3246	koi
+	language	Komi-Zyrian	kpv	3247	kpv
+	language	Kominimung	xoi	3248	xoi
+	language	Komo (Democratic Republic of Congo)	kmw	3249	kmw
+	language	Komo (Sudan)	xom	3250	xom
+	language	Komodo	kvh	3251	kvh
+	language	Kompane	kvp	3252	kvp
+	language	Komyandaret	kzv	3253	kzv
+	language	Kon Keu	kkn	3254	kkn
+	language	Konai	kxw	3255	kxw
+	language	Konda	knd	3256	knd
+	language	Konda-Dora	kfc	3257	kfc
+	language	Koneraw	kdw	3258	kdw
+	language	Kongo	kon	3259	kon	kg
+	language	Konkani (individual language)	knn	3260	knn
+	language	Konkani (macrolanguage)	kok	3261	kok
+	language	Konkomba	xon	3262	xon
+	language	Konni	kma	3263	kma
+	language	Kono (Guinea)	knu	3264	knu
+	language	Kono (Nigeria)	klk	3265	klk
+	language	Kono (Sierra Leone)	kno	3266	kno
+	language	Konomala	koa	3267	koa
+	language	Konongo	kcz	3268	kcz
+	language	Konso	kxc	3269	kxc
+	language	Konyak Naga	nbe	3270	nbe
+	language	Konyanka Maninka	mku	3271	mku
+	language	Konzo	koo	3272	koo
+	language	Koongo	kng	3273	kng
+	language	Koonzime	ozm	3274	ozm
+	language	Koorete	kqy	3275	kqy
+	language	Kopar	xop	3276	xop
+	language	Kopkaka	opk	3277	opk
+	language	Korafe-Yegha	kpr	3278	kpr
+	language	Korak	koz	3279	koz
+	language	Korana	kqz	3280	kqz
+	language	Korandje	kcy	3281	kcy
+	language	Korean	kor	3282	kor	ko
+	language	Korean Sign Language	kvk	3283	kvk
+	language	Koreguaje	coe	3284	coe
+	language	Koresh-e Rostam	okh	3285	okh
+	language	Korku	kfq	3286	kfq
+	language	Korlai Creole Portuguese	vkp	3287	vkp
+	language	Koro (Côte d'Ivoire)	kfo	3288	kfo
+	language	Koro (India)	jkr	3289	jkr
+	language	Koro (Papua New Guinea)	kxr	3290	kxr
+	language	Koro (Vanuatu)	krf	3291	krf
+	language	Koro Nulu	vkn	3292	vkn
+	language	Koro Wachi	bqv	3293	bqv
+	language	Koro Zuba	vkz	3294	vkz
+	language	KoromfÊ	kfz	3295	kfz
+	language	Koromira	kqj	3296	kqj
+	language	Koronadal Blaan	bpr	3297	bpr
+	language	Koroni	xkq	3298	xkq
+	language	KoropÃŗ	xxr	3299	xxr
+	language	Koroshi	ktl	3300	ktl
+	language	Korowai	khe	3301	khe
+	language	Korra Koraga	kfd	3302	kfd
+	language	Korubo	xor	3303	xor
+	language	Korupun-Sela	kpq	3304	kpq
+	language	Korwa	kfp	3305	kfp
+	language	Koryak	kpy	3306	kpy
+	language	Kosadle	kiq	3307	kiq
+	language	Kosarek Yale	kkl	3308	kkl
+	language	Kosena	kze	3309	kze
+	language	Koshin	kid	3310	kid
+	language	Kosraean	kos	3311	kos
+	language	Kota (Gabon)	koq	3312	koq
+	language	Kota (India)	kfe	3313	kfe
+	language	Kota Bangun Kutai Malay	mqg	3314	mqg
+	language	Kota Marudu Talantang	grm	3315	grm
+	language	Kotafon Gbe	kqk	3316	kqk
+	language	Kotava	avk	3317	avk
+	language	Koti	eko	3318	eko
+	language	Kott	zko	3319	zko
+	language	Kou	snz	3320	snz
+	language	Kouya	kyf	3321	kyf
+	language	Kovai	kqb	3322	kqb
+	language	Kove	kvc	3323	kvc
+	language	Kowaki	xow	3324	xow
+	language	Kowiai	kwh	3325	kwh
+	language	Koy Sanjaq Surat	kqd	3326	kqd
+	language	Koya	kff	3327	kff
+	language	Koyaga	kga	3328	kga
+	language	Koyo	koh	3329	koh
+	language	Koyra Chiini Songhay	khq	3330	khq
+	language	Koyraboro Senni Songhai	ses	3331	ses
+	language	Koyukon	koy	3332	koy
+	language	Kpagua	kuw	3333	kuw
+	language	Kpala	kpl	3334	kpl
+	language	Kpan	kpk	3335	kpk
+	language	Kpasam	pbn	3336	pbn
+	language	Kpati	koc	3337	koc
+	language	Kpatili	kym	3338	kym
+	language	Kpeego	cpo	3339	cpo
+	language	Kpelle	kpe	3340	kpe
+	language	Kpessi	kef	3341	kef
+	language	Kplang	kph	3342	kph
+	language	Krache	kye	3343	kye
+	language	Krahô	xra	3344	xra
+	language	Kraol	rka	3345	rka
+	language	Krenak	kqq	3346	kqq
+	language	Krevinian	zkv	3347	zkv
+	language	Kreye	xre	3348	xre
+	language	Kriang	ngt	3349	ngt
+	language	Krikati-Timbira	xri	3350	xri
+	language	Krio	kri	3351	kri
+	language	Kriol	rop	3352	rop
+	language	Krisa	ksi	3353	ksi
+	language	Krobu	kxb	3354	kxb
+	language	Krongo	kgo	3355	kgo
+	language	Krung	krr	3356	krr
+	language	Krymchak	jct	3357	jct
+	language	Kryts	kry	3358	kry
+	language	Kua	tyu	3359	tyu
+	language	Kua-nsi	ykn	3360	ykn
+	language	Kuamasi	yku	3361	yku
+	language	Kuan	uan	3362	uan
+	language	Kuanhua	xnh	3363	xnh
+	language	Kuanua	ksd	3364	ksd
+	language	Kuanyama, Kwanyama	kua	3365	kua	Kuanyama	kj	Kwanyama
+	language	Kubachi	ugh	3366	ugh
+	language	Kube	kgf	3367	kgf
+	language	Kubi	kof	3368	kof
+	language	Kubo	jko	3369	jko
+	language	Kubu	kvb	3370	kvb
+	language	Kucong	lkc	3371	lkc
+	language	Kudiya	kfg	3372	kfg
+	language	Kudmali	kyw	3373	kyw
+	language	Kudu-Camo	kov	3374	kov
+	language	Kufr Qassem Sign Language (KQSL)	sqx	3375	sqx
+	language	Kugama	kow	3376	kow
+	language	Kugbo	kes	3377	kes
+	language	Kugu-Muminh	xmh	3378	xmh
+	language	Kui (India)	uki	3379	uki
+	language	Kui (Indonesia)	kvd	3380	kvd
+	language	Kuijau	dkr	3381	dkr
+	language	KuikÃēro-KalapÃĄlo	kui	3382	kui
+	language	Kujarge	vkj	3383	vkj
+	language	Kuk	kfn	3384	kfn
+	language	Kukatja	kux	3385	kux
+	language	Kuke	ght	3386	ght
+	language	Kukele	kez	3387	kez
+	language	Kukna	kex	3388	kex
+	language	Kuku	ukv	3389	ukv
+	language	Kuku-Mangk	xmq	3390	xmq
+	language	Kuku-Mu'inh	xmp	3391	xmp
+	language	Kuku-Ugbanh	ugb	3392	ugb
+	language	Kuku-Uwanh	uwa	3393	uwa
+	language	Kuku-Yalanji	gvn	3394	gvn
+	language	Kula	tpg	3395	tpg
+	language	Kulere	kul	3396	kul
+	language	Kulfa	kxj	3397	kxj
+	language	Kulina Pano	xpk	3398	xpk
+	language	Kulisusu	vkl	3399	vkl
+	language	Kullu Pahari	kfx	3400	kfx
+	language	Kulon	uon	3401	uon
+	language	Kulung (Nepal)	kle	3402	kle
+	language	Kulung (Nigeria)	bbu	3403	bbu
+	language	Kumalu	ksl	3404	ksl
+	language	Kumam	kdi	3405	kdi
+	language	Kuman (Papua New Guinea)	kue	3406	kue
+	language	Kuman (Russia)	qwm	3407	qwm
+	language	Kumaoni	kfy	3408	kfy
+	language	Kumarbhag Paharia	kmj	3409	kmj
+	language	Kumba	ksm	3410	ksm
+	language	Kumbainggar	kgs	3411	kgs
+	language	Kumbaran	wkb	3412	wkb
+	language	Kumbewaha	xks	3413	xks
+	language	Kumhali	kra	3414	kra
+	language	Kumiai	dih	3415	dih
+	language	Kumukio	kuo	3416	kuo
+	language	Kumyk	kum	3417	kum
+	language	Kumzari	zum	3418	zum
+	language	Kunama	kun	3419	kun
+	language	Kunbarlang	wlg	3420	wlg
+	language	Kunda	kdn	3421	kdn
+	language	Kundal Shahi	shd	3422	shd
+	language	Kunduvadi	wku	3423	wku
+	language	Kung	kfl	3424	kfl
+	language	Kung-Ekoka	knw	3425	knw
+	language	Kungarakany	ggk	3426	ggk
+	language	Kungardutyi	gdt	3427	gdt
+	language	Kunggari	kgl	3428	kgl
+	language	Kungkari	lku	3429	lku
+	language	Kuni	kse	3430	kse
+	language	Kuni-Boazi	kvg	3431	kvg
+	language	Kunigami	xug	3432	xug
+	language	Kunimaipa	kup	3433	kup
+	language	Kunja	pep	3434	pep
+	language	Kunjen	kjn	3435	kjn
+	language	Kunyi	njx	3436	njx
+	language	Kunza	kuz	3437	kuz
+	language	Kuo	xuo	3438	xuo
+	language	Kuot	kto	3439	kto
+	language	Kupa	kug	3440	kug
+	language	Kupang Malay	mkn	3441	mkn
+	language	Kupia	key	3442	key
+	language	Kupsabiny	kpz	3443	kpz
+	language	Kur	kuv	3444	kuv
+	language	Kura Ede Nago	nqk	3445	nqk
+	language	Kurama	krh	3446	krh
+	language	Kuranko	knk	3447	knk
+	language	Kurdish	kur	3448	kur	ku
+	language	Kuri	nbn	3449	nbn
+	language	Kuria	kuj	3450	kuj
+	language	Kurichiya	kfh	3451	kfh
+	language	Kurmukar	kfv	3452	kfv
+	language	Kurnai	unn	3453	unn
+	language	Kurrama	vku	3454	vku
+	language	Kurti	ktm	3455	ktm
+	language	Kurtokha	xkz	3456	xkz
+	language	Kurudu	kjr	3457	kjr
+	language	Kurukh	kru	3458	kru
+	language	KuruÃĄya	kyr	3459	kyr
+	language	Kusaal	kus	3460	kus
+	language	Kusaghe	ksg	3461	ksg
+	language	Kushi	kuh	3462	kuh
+	language	Kusu	ksv	3463	ksv
+	language	Kusunda	kgg	3464	kgg
+	language	Kutenai	kut	3465	kut
+	language	Kutep	kub	3466	kub
+	language	Kuthant	xut	3467	xut
+	language	Kutong	skm	3468	skm
+	language	Kutto	kpa	3469	kpa
+	language	Kutu	kdc	3470	kdc
+	language	Kuturmi	khj	3471	khj
+	language	Kuuk Thaayorre	thd	3472	thd
+	language	Kuuk-Yak	uky	3473	uky
+	language	Kuuku-Ya'u	kuy	3474	kuy
+	language	Kuvale	olu	3475	olu
+	language	Kuvi	kxv	3476	kxv
+	language	Kuwaa	blh	3477	blh
+	language	Kuwaataay	cwt	3478	cwt
+	language	Kuwema	woa	3479	woa
+	language	Kuy	kdt	3480	kdt
+	language	Kven Finnish	fkv	3481	fkv
+	language	Kw'adza	wka	3482	wka
+	language	Kwa	kwb	3483	kwb
+	language	Kwa'	bko	3484	bko
+	language	Kwaami	ksq	3485	ksq
+	language	Kwadi	kwz	3486	kwz
+	language	Kwaio	kwd	3487	kwd
+	language	Kwaja	kdz	3488	kdz
+	language	Kwakiutl	kwk	3489	kwk
+	language	Kwakum	kwu	3490	kwu
+	language	Kwalhioqua-Tlatskanai	qwt	3491	qwt
+	language	Kwama	kmq	3492	kmq
+	language	Kwambi	kwm	3493	kwm
+	language	Kwamera	tnk	3494	tnk
+	language	Kwami	ktf	3495	ktf
+	language	Kwamtim One	okk	3496	okk
+	language	Kwandu	xdo	3497	xdo
+	language	Kwang	kvi	3498	kvi
+	language	Kwanga	kwj	3499	kwj
+	language	Kwangali	kwn	3500	kwn
+	language	Kwanja	knp	3501	knp
+	language	Kwara'ae	kwf	3502	kwf
+	language	Kwasio	nmg	3503	nmg
+	language	Kwaya	kya	3504	kya
+	language	Kwaza	xwa	3505	xwa
+	language	Kwegu	xwg	3506	xwg
+	language	Kwer	kwr	3507	kwr
+	language	Kwerba	kwe	3508	kwe
+	language	Kwerba Mamberamo	xwr	3509	xwr
+	language	Kwere	cwe	3510	cwe
+	language	Kwerisa	kkb	3511	kkb
+	language	Kwese	kws	3512	kws
+	language	Kwesten	kwt	3513	kwt
+	language	Kwini	gww	3514	gww
+	language	Kwinsu	kuc	3515	kuc
+	language	Kwinti	kww	3516	kww
+	language	Kwoma	kmo	3517	kmo
+	language	Kwomtari	kwo	3518	kwo
+	language	Kxoe	xuu	3519	xuu
+	language	Kyak	bka	3520	bka
+	language	Kyaka	kyc	3521	kyc
+	language	Kyan-Karyaw Naga	nqq	3522	nqq
+	language	Kyanga	tye	3523	tye
+	language	Kyenele	kql	3524	kql
+	language	Kyerung	kgy	3525	kgy
+	language	KÃĸte	kmg	3526	kmg
+	language	KÊlÊ	keb	3527	keb
+	language	KÃļlsch	ksh	3528	ksh
+	language	Kɛlɛngaxo Bozo	bzx	3529	bzx
+	language	La'bi	lbi	3530	lbi
+	language	Laal	gdm	3531	gdm
+	language	Laari	ldi	3532	ldi
+	language	Laarim	loh	3533	loh
+	language	Laba	lau	3534	lau
+	language	Label	lbb	3535	lbb
+	language	Labir	jku	3536	jku
+	language	Labo	mwi	3537	mwi
+	language	Labo Phowa	ypb	3538	ypb
+	language	Labu	lbu	3539	lbu
+	language	Labuk-Kinabatangan Kadazan	dtb	3540	dtb
+	language	Lacandon	lac	3541	lac
+	language	Lachi	lbt	3542	lbt
+	language	Lachiguiri Zapotec	zpa	3543	zpa
+	language	Lachixío Zapotec	zpl	3544	zpl
+	language	Ladakhi	lbj	3545	lbj
+	language	Ladin	lld	3546	lld
+	language	Ladino	lad	3547	lad
+	language	Ladji Ladji	llj	3548	llj
+	language	Laeko-Libuat	lkl	3549	lkl
+	language	Lafofa	laf	3550	laf
+	language	Laghu	lgb	3551	lgb
+	language	Laghuu	lgh	3552	lgh
+	language	Lagwan	kot	3553	kot
+	language	Laha (Indonesia)	lhh	3554	lhh
+	language	Laha (Viet Nam)	lha	3555	lha
+	language	Lahanan	lhn	3556	lhn
+	language	Lahnda	lah	3557	lah
+	language	Lahta Karen	kvt	3558	kvt
+	language	Lahu	lhu	3559	lhu
+	language	Lahu Shi	lhi	3560	lhi
+	language	Lahul Lohar	lhl	3561	lhl
+	language	Laimbue	lmx	3562	lmx
+	language	Laitu Chin	clj	3563	clj
+	language	Laiyolo	lji	3564	lji
+	language	Lak	lbe	3565	lbe
+	language	Laka (Chad)	lap	3566	lap
+	language	Lakalei	lka	3567	lka
+	language	Lake Miwok	lmw	3568	lmw
+	language	Lakha	lkh	3569	lkh
+	language	Laki	lki	3570	lki
+	language	Lakkia	lbc	3571	lbc
+	language	Lakon	lkn	3572	lkn
+	language	LakondÃĒ	lkd	3573	lkd
+	language	Lakota	lkt	3574	lkt
+	language	Lakota Dida	dic	3575	dic
+	language	Lakurumau	lxm	3576	lxm
+	language	Lala	nrz	3577	nrz
+	language	Lala-Bisa	leb	3578	leb
+	language	Lala-Roba	lla	3579	lla
+	language	Lalana Chinantec	cnl	3580	cnl
+	language	Lalia	lal	3581	lal
+	language	Lama (Togo)	las	3582	las
+	language	Lama Bai	lay	3583	lay
+	language	Lamaholot	slp	3584	slp
+	language	Lamalama	lby	3585	lby
+	language	Lamalera	lmr	3586	lmr
+	language	Lamang	hia	3587	hia
+	language	Lamatuka	lmq	3588	lmq
+	language	Lamba	lam	3589	lam
+	language	Lambadi	lmn	3590	lmn
+	language	Lambayeque Quechua	quf	3591	quf
+	language	Lambichhong	lmh	3592	lmh
+	language	Lamboya	lmy	3593	lmy
+	language	Lambya	lai	3594	lai
+	language	Lame	bma	3595	bma
+	language	Lamenu	lmu	3596	lmu
+	language	Lamja-Dengsa-Tola	ldh	3597	ldh
+	language	Lamkang	lmk	3598	lmk
+	language	Lamma	lev	3599	lev
+	language	Lamnso'	lns	3600	lns
+	language	Lamogai	lmg	3601	lmg
+	language	Lampung Api	ljp	3602	ljp
+	language	Lampung Nyo	abl	3603	abl
+	language	Lamu	llh	3604	llh
+	language	Lanas Lobu	ruu	3605	ruu
+	language	Landoma	ldm	3606	ldm
+	language	Lang'e	yne	3607	yne
+	language	Langam	lnm	3608	lnm
+	language	Langbashe	lna	3609	lna
+	language	Langnian Buyang	yln	3610	yln
+	language	Lango (South Sudan)	lgo	3611	lgo
+	language	Lango (Uganda)	laj	3612	laj
+	language	Langobardic	lng	3613	lng
+	language	Langue des signes de Belgique Francophone	sfb	3614	sfb
+	language	Lanima	lnw	3615	lnw
+	language	Lanoh	lnh	3616	lnh
+	language	Lao	lao	3617	lao	lo
+	language	Lao Naga	nlq	3618	nlq
+	language	Laomian	lwm	3619	lwm
+	language	Laopang	lbg	3620	lbg
+	language	Laos Sign Language	lso	3621	lso
+	language	Lapaguía-Guivini Zapotec	ztl	3622	ztl
+	language	Laragia	lrg	3623	lrg
+	language	Larantuka Malay	lrt	3624	lrt
+	language	Lardil	lbz	3625	lbz
+	language	Larevat	lrv	3626	lrv
+	language	Large Flowery Miao	hmd	3627	hmd
+	language	Lari	lrl	3628	lrl
+	language	Larike-Wakasihu	alo	3629	alo
+	language	Laro	lro	3630	lro
+	language	Larteh	lar	3631	lar
+	language	Laru	lan	3632	lan
+	language	Las Delicias Zapotec	zcd	3633	zcd
+	language	Lasalimu	llm	3634	llm
+	language	Lasgerdi	lsa	3635	lsa
+	language	Lashi	lsi	3636	lsi
+	language	Lasi	lss	3637	lss
+	language	Late Middle Chinese	ltc	3638	ltc
+	language	Latgalian	ltg	3639	ltg
+	language	Latin	lat	3640	lat	la
+	language	Latu	ltu	3641	ltu
+	language	LatundÃĒ	ltn	3642	ltn
+	language	Latvian	lav	3643	lav	lv
+	language	Latvian Sign Language	lsl	3644	lsl
+	language	Lau	llu	3645	llu
+	language	Laua	luf	3646	luf
+	language	Lauan	llx	3647	llx
+	language	Lauje	law	3648	law
+	language	Laura	lur	3649	lur
+	language	Laurentian	lre	3650	lre
+	language	Lautu Chin	clt	3651	clt
+	language	Lavatbura-Lamusong	lbv	3652	lbv
+	language	Laven	lbo	3653	lbo
+	language	Lavi	lvi	3654	lvi
+	language	Lavukaleve	lvk	3655	lvk
+	language	Lawangan	lbx	3656	lbx
+	language	Lawu	lwu	3657	lwu
+	language	Lawunuia	tgi	3658	tgi
+	language	Layakha	lya	3659	lya
+	language	Laz	lzz	3660	lzz
+	language	Lealao Chinantec	cle	3661	cle
+	language	Leco	lec	3662	lec
+	language	Ledo Kaili	lew	3663	lew
+	language	Leelau	ldk	3664	ldk
+	language	Lefa	lfa	3665	lfa
+	language	Lega-Mwenga	lgm	3666	lgm
+	language	Lega-Shabunda	lea	3667	lea
+	language	Legbo	agb	3668	agb
+	language	Legenyem	lcc	3669	lcc
+	language	Lehali	tql	3670	tql
+	language	Lehalurup	urr	3671	urr
+	language	Lehar	cae	3672	cae
+	language	Leinong Naga	lzn	3673	lzn
+	language	Leipon	lek	3674	lek
+	language	Lelak	llk	3675	llk
+	language	Lele (Chad)	lln	3676	lln
+	language	Lele (Democratic Republic of Congo)	lel	3677	lel
+	language	Lele (Guinea)	llc	3678	llc
+	language	Lele (Papua New Guinea)	lle	3679	lle
+	language	Lelemi	lef	3680	lef
+	language	Lelepa	lpa	3681	lpa
+	language	Lembena	leq	3682	leq
+	language	Lemerig	lrz	3683	lrz
+	language	Lemio	lei	3684	lei
+	language	Lemnian	xle	3685	xle
+	language	Lemolang	ley	3686	ley
+	language	Lemoro	ldj	3687	ldj
+	language	Lenakel	tnl	3688	tnl
+	language	Lenca	len	3689	len
+	language	Lendu	led	3690	led
+	language	Lengilu	lgi	3691	lgi
+	language	Lengo	lgr	3692	lgr
+	language	Lengola	lej	3693	lej
+	language	Leningitij	lnj	3694	lnj
+	language	Lenje	leh	3695	leh
+	language	Lenkau	ler	3696	ler
+	language	Lenyima	ldg	3697	ldg
+	language	Lepcha	lep	3698	lep
+	language	Lepki	lpe	3699	lpe
+	language	Lepontic	xlp	3700	xlp
+	language	Lere	gnh	3701	gnh
+	language	Lese	les	3702	les
+	language	Lesing-Gelimi	let	3703	let
+	language	Letemboi	nms	3704	nms
+	language	Leti (Cameroon)	leo	3705	leo
+	language	Leti (Indonesia)	lti	3706	lti
+	language	Levantine Arabic	apc	3707	apc
+	language	Levuka	lvu	3708	lvu
+	language	Lewo	lww	3709	lww
+	language	Lewo Eleng	lwe	3710	lwe
+	language	Lewotobi	lwt	3711	lwt
+	language	Leyigha	ayi	3712	ayi
+	language	Lezghian	lez	3713	lez
+	language	Lhokpu	lhp	3714	lhp
+	language	Lhomi	lhm	3715	lhm
+	language	Li'o	ljl	3716	ljl
+	language	Liabuku	lix	3717	lix
+	language	Liana-Seti	ste	3718	ste
+	language	Liangmai Naga	njn	3719	njn
+	language	Lianshan Zhuang	zln	3720	zln
+	language	Liberia Kpelle	xpe	3721	xpe
+	language	Liberian English	lir	3722	lir
+	language	Libido	liq	3723	liq
+	language	Libinza	liz	3724	liz
+	language	Libon Bikol	lbl	3725	lbl
+	language	Liburnian	xli	3726	xli
+	language	Libyan Arabic	ayl	3727	ayl
+	language	Libyan Sign Language	lbs	3728	lbs
+	language	Lidzonka	add	3729	add
+	language	Ligbi	lig	3730	lig
+	language	Ligenza	lgz	3731	lgz
+	language	Ligurian	lij	3732	lij
+	language	Ligurian (Ancient)	xlg	3733	xlg
+	language	Lihir	lih	3734	lih
+	language	Lijili	mgi	3735	mgi
+	language	Lika	lik	3736	lik
+	language	Liki	lio	3737	lio
+	language	Likila	lie	3738	lie
+	language	Likuba	kxx	3739	kxx
+	language	Likum	lib	3740	lib
+	language	Likwala	kwc	3741	kwc
+	language	Lilau	lll	3742	lll
+	language	Lillooet	lil	3743	lil
+	language	Limassa	bme	3744	bme
+	language	Limbu	lif	3745	lif
+	language	Limbum	lmp	3746	lmp
+	language	Limburgan, Limburger, Limburgish	lim	3747	lim	Limburgan	Limburger	Limburgish	li
+	language	Limi	ylm	3748	ylm
+	language	Limilngan	lmc	3749	lmc
+	language	Limos Kalinga	kmk	3750	kmk
+	language	Linear A	lab	3751	lab
+	language	Lingala	lin	3752	lin	ln
+	language	Lingao	onb	3753	onb
+	language	Lingarak	lgk	3754	lgk
+	language	Lingua Franca	pml	3755	pml
+	language	Lingua Franca Nova	lfn	3756	lfn
+	language	Lipan Apache	apl	3757	apl
+	language	Lipo	lpo	3758	lpo
+	language	Lisabata-Nuniali	lcs	3759	lcs
+	language	Lisela	lcl	3760	lcl
+	language	Lish	lsh	3761	lsh
+	language	Lishana Deni	lsd	3762	lsd
+	language	Lishanid Noshan	aij	3763	aij
+	language	LishÃĄn DidÃĄn	trg	3764	trg
+	language	Lisu	lis	3765	lis
+	language	Literary Chinese	lzh	3766	lzh
+	language	Lithuanian	lit	3767	lit	lt
+	language	Lithuanian Sign Language	lls	3768	lls
+	language	Litzlitz	lzl	3769	lzl
+	language	Liujiang Zhuang	zlj	3770	zlj
+	language	Liuqian Zhuang	zlq	3771	zlq
+	language	Liv	liv	3772	liv
+	language	Livvi	olo	3773	olo
+	language	Lo-Toga	lht	3774	lht
+	language	Loarki	lrk	3775	lrk
+	language	Lobala	loq	3776	loq
+	language	Lobi	lob	3777	lob
+	language	Lodhi	lbm	3778	lbm
+	language	Logba	lgq	3779	lgq
+	language	Logir	lqr	3780	lqr
+	language	Logo	log	3781	log
+	language	Logol	lof	3782	lof
+	language	Logooli	rag	3783	rag
+	language	Logorik	liu	3784	liu
+	language	Logudorese Sardinian, Croatian	hrv	3785	hrv	Logudorese Sardinian	src	hr	Croatian
+	language	Lohorung	lbr	3786	lbr
+	language	Loja Highland Quichua	qvj	3787	qvj
+	language	Lojban	jbo	3788	jbo
+	language	Lokaa	yaz	3789	yaz
+	language	Loke	loy	3790	loy
+	language	Loko	lok	3791	lok
+	language	Lokoya	lky	3792	lky
+	language	Lola	lcd	3793	lcd
+	language	Lolak	llq	3794	llq
+	language	Lole	llg	3795	llg
+	language	Lolo	llb	3796	llb
+	language	Loloda	loa	3797	loa
+	language	Lolopo	ycl	3798	ycl
+	language	Loma (Côte d'Ivoire)	loi	3799	loi
+	language	Loma (Liberia)	lom	3800	lom
+	language	Lomaiviti	lmv	3801	lmv
+	language	Lomavren	rmi	3802	rmi
+	language	Lombard	lmo	3803	lmo
+	language	Lombi	lmi	3804	lmi
+	language	Lombo	loo	3805	loo
+	language	Lomwe	ngl	3806	ngl
+	language	Loncong	lce	3807	lce
+	language	Long Phuri Naga	lpn	3808	lpn
+	language	Long Wat	ttw	3809	ttw
+	language	Longgu	lgu	3810	lgu
+	language	Longto	wok	3811	wok
+	language	Longuda	lnu	3812	lnu
+	language	Loniu	los	3813	los
+	language	Lonwolwol	crc	3814	crc
+	language	Lonzo	lnz	3815	lnz
+	language	Loo	ldo	3816	ldo
+	language	Lopa	lop	3817	lop
+	language	Lopi	lov	3818	lov
+	language	Lopit	lpx	3819	lpx
+	language	Lorang	lrn	3820	lrn
+	language	Lorediakarkar	lnn	3821	lnn
+	language	Loreto-Ucayali Spanish	spq	3822	spq
+	language	Lote	uvl	3823	uvl
+	language	Lotha Naga	njh	3824	njh
+	language	Lotud	dtr	3825	dtr
+	language	Lou	loj	3826	loj
+	language	Louisiana Creole	lou	3827	lou
+	language	Loun	lox	3828	lox
+	language	Loup A	xlo	3829	xlo
+	language	Loup B	xlb	3830	xlb
+	language	Low German	nds	3831	nds
+	language	Lower Burdekin	xbb	3832	xbb
+	language	Lower Chehalis	cea	3833	cea
+	language	Lower Grand Valley Dani	dni	3834	dni
+	language	Lower Nossob	nsb	3835	nsb
+	language	Lower Silesian	sli	3836	sli
+	language	Lower Sorbian	dsb	3837	dsb
+	language	Lower Southern Aranda	axl	3838	axl
+	language	Lower Ta'oih	tto	3839	tto
+	language	Lower Tanana	taa	3840	taa
+	language	Lowland Oaxaca Chontal	clo	3841	clo
+	language	Lowland Tarahumara	tac	3842	tac
+	language	Loxicha Zapotec	ztp	3843	ztp
+	language	Lozi	loz	3844	loz
+	language	Luang	lex	3845	lex
+	language	Luba-Katanga	lub	3846	lub	lu
+	language	Luba-Lulua	lua	3847	lua
+	language	Lubila	kcc	3848	kcc
+	language	Lubu	lcf	3849	lcf
+	language	Lubuagan Kalinga	knb	3850	knb
+	language	Luchazi	lch	3851	lch
+	language	Lucumi	luq	3852	luq
+	language	Ludian	lud	3853	lud
+	language	Lufu	ldq	3854	ldq
+	language	Lugbara	lgg	3855	lgg
+	language	Luguru	ruf	3856	ruf
+	language	Luhu	lcq	3857	lcq
+	language	Luimbi	lum	3858	lum
+	language	Luiseno	lui	3859	lui
+	language	Lukpa	dop	3860	dop
+	language	Lule	ule	3861	ule
+	language	Lule Sami	smj	3862	smj
+	language	Lumba-Yakkha	luu	3863	luu
+	language	Lumbu	lup	3864	lup
+	language	Lumun	lmd	3865	lmd
+	language	Luna	luj	3866	luj
+	language	Lunanakha	luk	3867	luk
+	language	Lunda	lun	3868	lun
+	language	Lundayeh	lnd	3869	lnd
+	language	Lungalunga	vmg	3870	vmg
+	language	Lungga	lga	3871	lga
+	language	Luo (Cameroon)	luw	3872	luw
+	language	Luo (Kenya and Tanzania)	luo	3873	luo
+	language	Luopohe Hmong	hml	3874	hml
+	language	Luri	ldd	3875	ldd
+	language	Lusengo	lse	3876	lse
+	language	Lushai	lus	3877	lus
+	language	Lushootseed	lut	3878	lut
+	language	Lusi	khl	3879	khl
+	language	Lusitanian	xls	3880	xls
+	language	Lutos	ndy	3881	ndy
+	language	Luvale	lue	3882	lue
+	language	Luwati	luv	3883	luv
+	language	Luwo	lwo	3884	lwo
+	language	Luxembourgish, Letzeburgesch	ltz	3885	ltz	Luxembourgish	lb	Letzeburgesch
+	language	Luyana	lyn	3886	lyn
+	language	Luyia	luy	3887	luy
+	language	Lwalu	lwa	3888	lwa
+	language	Lwel	lvl	3889	lvl
+	language	Lycian	xlc	3890	xlc
+	language	Lydian	xld	3891	xld
+	language	Lyngngam	lyg	3892	lyg
+	language	LyÊlÊ	lee	3893	lee
+	language	LÃĄadan	ldn	3894	ldn
+	language	LÃĄÃĄ LÃĄÃĄ Bwamu	bwj	3895	bwj
+	language	LÃŧ	khb	3896	khb
+	language	Ma (Democratic Republic of Congo)	msj	3897	msj
+	language	Ma (Papua New Guinea)	mjn	3898	mjn
+	language	Ma Manda	skc	3899	skc
+	language	Ma'anyan	mhy	3900	mhy
+	language	Ma'di	mhi	3901	mhi
+	language	Ma'ya	slz	3902	slz
+	language	Maa	cma	3903	cma
+	language	Maaka	mew	3904	mew
+	language	Maasina Fulfulde	ffm	3905	ffm
+	language	Maay	ymm	3906	ymm
+	language	Maba (Chad)	mde	3907	mde
+	language	Maba (Indonesia)	mqa	3908	mqa
+	language	Mabaale	mmz	3909	mmz
+	language	Mabaan	mfz	3910	mfz
+	language	Mabaka Valley Kalinga	kkg	3911	kkg
+	language	Mabire	muj	3912	muj
+	language	Maca	mca	3913	mca
+	language	Macaguaje	mcl	3914	mcl
+	language	MacaguÃĄn	mbn	3915	mbn
+	language	Macanese	mzs	3916	mzs
+	language	Macedo-Romanian	rup	3917	rup
+	language	Macedonian	mkd	3918	mkd	mac	mk
+	language	Machame	jmc	3919	jmc
+	language	Machiguenga	mcb	3920	mcb
+	language	Machinere	mpd	3921	mpd
+	language	Machinga	mvw	3922	mvw
+	language	Maco	wpc	3923	wpc
+	language	Macuna	myy	3924	myy
+	language	Macushi	mbc	3925	mbc
+	language	Mada (Cameroon)	mxu	3926	mxu
+	language	Mada (Nigeria)	mda	3927	mda
+	language	Madagascar Sign Language	mzc	3928	mzc
+	language	Madak	mmx	3929	mmx
+	language	Madhi Madhi	dmd	3930	dmd
+	language	Madi	grg	3931	grg
+	language	Madurese	mad	3932	mad
+	language	Mae	mme	3933	mme
+	language	Maek	hmk	3934	hmk
+	language	Maeng Itneg	itt	3935	itt
+	language	Mafa	maf	3936	maf
+	language	Mafea	mkv	3937	mkv
+	language	Mag-Indi Ayta	blx	3938	blx
+	language	Mag-antsi Ayta	sgb	3939	sgb
+	language	Magahi	mag	3940	mag
+	language	Magbukun Ayta	ayt	3941	ayt
+	language	Magdalena PeÃąasco Mixtec	xtm	3942	xtm
+	language	Magoma	gmx	3943	gmx
+	language	Magori	zgr	3944	zgr
+	language	Maguindanaon	mdh	3945	mdh
+	language	Magɨ (Madang Province)	gkd	3946	gkd
+	language	Magɨyi	gmg	3947	gmg
+	language	Mahali	mjx	3948	mjx
+	language	Mahasu Pahari	bfz	3949	bfz
+	language	Mahican	mjy	3950	mjy
+	language	Mahongwe	mhb	3951	mhb
+	language	Mahou	mxx	3952	mxx
+	language	Mai Brat	ayz	3953	ayz
+	language	Maia	sks	3954	sks
+	language	Maiadomu	mzz	3955	mzz
+	language	Maiani	tnh	3956	tnh
+	language	Maii	mmm	3957	mmm
+	language	Mailu	mgu	3958	mgu
+	language	Maindo	cwb	3959	cwb
+	language	Mainfränkisch	vmf	3960	vmf
+	language	Mainstream Kenyah	xkl	3961	xkl
+	language	Mairasi	zrs	3962	zrs
+	language	Maisin	mbq	3963	mbq
+	language	Maithili	mai	3964	mai
+	language	Maiwa (Indonesia)	wmm	3965	wmm
+	language	Maiwa (Papua New Guinea)	mti	3966	mti
+	language	Maiwala	mum	3967	mum
+	language	Majang	mpe	3968	mpe
+	language	Majera	xmj	3969	xmj
+	language	Majhi	mjz	3970	mjz
+	language	Majhwar	mmj	3971	mmj
+	language	Majukayang Kalinga	kmd	3972	kmd
+	language	Mak (China)	mkg	3973	mkg
+	language	Mak (Nigeria)	pbl	3974	pbl
+	language	Makaa	mcp	3975	mcp
+	language	Makah	myh	3976	myh
+	language	Makalero	mjb	3977	mjb
+	language	Makasae	mkz	3978	mkz
+	language	Makasar	mak	3979	mak
+	language	Makassar Malay	mfp	3980	mfp
+	language	Makayam	aup	3981	aup
+	language	Makhuwa	vmw	3982	vmw
+	language	Makhuwa-Marrevone	xmc	3983	xmc
+	language	Makhuwa-Meetto	mgh	3984	mgh
+	language	Makhuwa-Moniga	mhm	3985	mhm
+	language	Makhuwa-Saka	xsq	3986	xsq
+	language	Makhuwa-Shirima	vmk	3987	vmk
+	language	Maklew	mgf	3988	mgf
+	language	Makolkol	zmh	3989	zmh
+	language	Makonde	kde	3990	kde
+	language	Maku'a	lva	3991	lva
+	language	Makuri Naga	jmn	3992	jmn
+	language	MakurÃĄp	mpu	3993	mpu
+	language	Makwe	ymk	3994	ymk
+	language	Makyan Naga	umn	3995	umn
+	language	Mal	mlf	3996	mlf
+	language	Mal Paharia	mkb	3997	mkb
+	language	Mala (Nigeria)	ruy	3998	ruy
+	language	Mala (Papua New Guinea)	ped	3999	ped
+	language	Mala Malasar	ima	4000	ima
+	language	Malaccan Creole Malay	ccm	4001	ccm
+	language	Malaccan Creole Portuguese	mcm	4002	mcm
+	language	Malagasy	mlg	4003	mlg	mg
+	language	Malak Malak	mpb	4004	mpb
+	language	Malalamai	mmt	4005	mmt
+	language	Malango	mln	4006	mln
+	language	Malankuravan	mjo	4007	mjo
+	language	Malapandaram	mjp	4008	mjp
+	language	Malaryan	mjq	4009	mjq
+	language	Malas	mkr	4010	mkr
+	language	Malasar	ymr	4011	ymr
+	language	Malavedan	mjr	4012	mjr
+	language	Malawi Lomwe	lon	4013	lon
+	language	Malawi Sena	swk	4014	swk
+	language	Malawian Sign Language	lws	4015	lws
+	language	Malay (individual language)	zlm	4016	zlm
+	language	Malay, Malay (macrolanguage)	msa	4017	msa	may	ms	Malay	Malay (macrolanguage)
+	language	Malayalam	mal	4018	mal	ml
+	language	Malayic Dayak	xdy	4019	xdy
+	language	Malaynon	mlz	4020	mlz
+	language	Malayo	mbp	4021	mbp
+	language	Malaysian Sign Language	xml	4022	xml
+	language	Malba Birifor	bfo	4023	bfo
+	language	Maldivian, Dhivehi, Divehi	div	4024	div	dv	Maldivian	Dhivehi	Divehi
+	language	Male (Ethiopia)	mdy	4025	mdy
+	language	Male (Papua New Guinea)	mdc	4026	mdc
+	language	Malecite-Passamaquoddy	pqm	4027	pqm
+	language	Maleng	pkt	4028	pkt
+	language	Maleu-Kilenge	mgl	4029	mgl
+	language	Malfaxal	mlx	4030	mlx
+	language	Malgana	vml	4031	vml
+	language	Malgbe	mxf	4032	mxf
+	language	Mali	gcc	4033	gcc
+	language	Malila	mgq	4034	mgq
+	language	Malimba	mzd	4035	mzd
+	language	Malimpung	mli	4036	mli
+	language	Malinaltepec Me'phaa	tcf	4037	tcf
+	language	Malo	mla	4038	mla
+	language	Malol	mbk	4039	mbk
+	language	Maltese	mlt	4040	mlt	mt
+	language	Maltese Sign Language	mdl	4041	mdl
+	language	Malua Bay	mll	4042	mll
+	language	Malvi	mup	4043	mup
+	language	Malyangapa	yga	4044	yga
+	language	MalÊku Jaíka	gut	4045	gut
+	language	Mam	mam	4046	mam
+	language	Mama	mma	4047	mma
+	language	Mamaa	mhf	4048	mhf
+	language	MamaindÊ	wmd	4049	wmd
+	language	Mamanwa	mmn	4050	mmn
+	language	Mamara Senoufo	myk	4051	myk
+	language	Mamasa	mqj	4052	mqj
+	language	Mambae	mgm	4053	mgm
+	language	Mambai	mcs	4054	mcs
+	language	Mamboru	mvd	4055	mvd
+	language	Mambwe-Lungu	mgr	4056	mgr
+	language	Mampruli	maw	4057	maw
+	language	Mamuju	mqx	4058	mqx
+	language	Mamulique	emm	4059	emm
+	language	Mamusi	kdf	4060	kdf
+	language	Mamvu	mdi	4061	mdi
+	language	Man Met	mml	4062	mml
+	language	Manado Malay	xmm	4063	xmm
+	language	Manam	mva	4064	mva
+	language	Manambu	mle	4065	mle
+	language	Manangba	nmm	4066	nmm
+	language	Manangkari	znk	4067	znk
+	language	Manchu	mnc	4068	mnc
+	language	Manda (Australia)	zma	4069	zma
+	language	Manda (India)	mha	4070	mha
+	language	Manda (Tanzania)	mgs	4071	mgs
+	language	Mandahuaca	mht	4072	mht
+	language	Mandaic	mid	4073	mid
+	language	Mandan	mhq	4074	mhq
+	language	Mandandanyi	zmk	4075	zmk
+	language	Mandar	mdr	4076	mdr
+	language	Mandara	tbf	4077	tbf
+	language	Mandari	mqu	4078	mqu
+	language	Mandarin Chinese	cmn	4079	cmn
+	language	Mandaya	mry	4080	mry
+	language	Mandeali	mjl	4081	mjl
+	language	Mander	mqr	4082	mqr
+	language	Mandingo	man	4083	man
+	language	Mandinka	mnk	4084	mnk
+	language	Mandjak	mfv	4085	mfv
+	language	Mandobo Atas	aax	4086	aax
+	language	Mandobo Bawah	bwp	4087	bwp
+	language	Manem	jet	4088	jet
+	language	Mang	zng	4089	zng
+	language	Manga Kanuri	kby	4090	kby
+	language	Mangala	mem	4091	mem
+	language	Mangareva	mrv	4092	mrv
+	language	Mangarrayi	mpc	4093	mpc
+	language	Mangas	zns	4094	zns
+	language	Mangayat	myj	4095	myj
+	language	Mangbetu	mdj	4096	mdj
+	language	Mangbutu	mdk	4097	mdk
+	language	Mangerr	zme	4098	zme
+	language	Mangga Buang	mmo	4099	mmo
+	language	Manggarai	mqy	4100	mqy
+	language	Mango	mge	4101	mge
+	language	Mangole	mqc	4102	mqc
+	language	Mangseng	mbh	4103	mbh
+	language	Mangue	mom	4104	mom
+	language	Manichaean Middle Persian	xmn	4105	xmn
+	language	Manide	abd	4106	abd
+	language	Manikion	mnx	4107	mnx
+	language	Manipa	mqp	4108	mqp
+	language	Manipuri	mni	4109	mni
+	language	Mankanya	knf	4110	knf
+	language	Mankiyali	nlm	4111	nlm
+	language	Manna-Dora	mju	4112	mju
+	language	Mannan	mjv	4113	mjv
+	language	Mano	mev	4114	mev
+	language	Manombai	woo	4115	woo
+	language	Mansaka	msk	4116	msk
+	language	Mansi	mns	4117	mns
+	language	Mansoanka	msw	4118	msw
+	language	Manta	myg	4119	myg
+	language	Mantsi	nty	4120	nty
+	language	Manumanaw Karen	kxf	4121	kxf
+	language	Manx	glv	4122	glv	gv
+	language	Manya	mzj	4123	mzj
+	language	Manyawa	mny	4124	mny
+	language	Manyika	mxc	4125	mxc
+	language	Manza	mzv	4126	mzv
+	language	Mao Naga	nbi	4127	nbi
+	language	Maonan	mmd	4128	mmd
+	language	Maore Comorian	swb	4129	swb
+	language	Mape	mlh	4130	mlh
+	language	Mapena	mnm	4131	mnm
+	language	Mapia	mpy	4132	mpy
+	language	Mapidian	mpw	4133	mpw
+	language	Mapos Buang	bzh	4134	bzh
+	language	Mapoyo	mcg	4135	mcg
+	language	Mapudungun	arn	4136	arn
+	language	Mapun	sjm	4137	sjm
+	language	Maquiritari	mch	4138	mch
+	language	Mara Chin	mrh	4139	mrh
+	language	Marachi	lri	4140	lri
+	language	Maraghei	vmh	4141	vmh
+	language	Maragus	mrs	4142	mrs
+	language	Maram Naga	nma	4143	nma
+	language	Marama	lrm	4144	lrm
+	language	Maranao	mrw	4145	mrw
+	language	Maranunggu	zmr	4146	zmr
+	language	Mararit	mgb	4147	mgb
+	language	Marathi, Marathi (MarāᚭhÄĢ)	mar	4148	mar	mr	Marathi	Marathi (MarāᚭhÄĢ)
+	language	Marau	mvr	4149	mvr
+	language	Marba	mpg	4150	mpg
+	language	Mardin Sign Language	dsz	4151	dsz
+	language	Maremgi	mrx	4152	mrx
+	language	Marenje	vmr	4153	vmr
+	language	Marfa	mvu	4154	mvu
+	language	Margany	zmc	4155	zmc
+	language	Marghi Central	mrt	4156	mrt
+	language	Marghi South	mfm	4157	mfm
+	language	Margos-Yarowilca-Lauricocha Quechua	qvm	4158	qvm
+	language	Margu	mhg	4159	mhg
+	language	Mari (East Sepik Province)	mbx	4160	mbx
+	language	Mari (Madang Province)	hob	4161	hob
+	language	Mari (Russia)	chm	4162	chm
+	language	Maria (India)	mrr	4163	mrr
+	language	Maria (Papua New Guinea)	mds	4164	mds
+	language	Maricopa	mrc	4165	mrc
+	language	Maridan	zmd	4166	zmd
+	language	Maridjabin	zmj	4167	zmj
+	language	Marik	dad	4168	dad
+	language	Marimanindji	zmm	4169	zmm
+	language	Marind	mrz	4170	mrz
+	language	Maring	mbw	4171	mbw
+	language	Maring Naga	nng	4172	nng
+	language	Maringarr	zmt	4173	zmt
+	language	Marino	mrb	4174	mrb
+	language	Mariri	mqi	4175	mqi
+	language	Maritime Sign Language	nsr	4176	nsr
+	language	MaritsauÃĄ	msp	4177	msp
+	language	Mariyedi	zmy	4178	zmy
+	language	Marka	rkm	4179	rkm
+	language	Markweeta	enb	4180	enb
+	language	Marma	rmz	4181	rmz
+	language	Marovo	mvo	4182	mvo
+	language	Marra	mec	4183	mec
+	language	Marriammu	xru	4184	xru
+	language	Marrithiyel	mfr	4185	mfr
+	language	Marrucinian	umc	4186	umc
+	language	Marshallese	mah	4187	mah	mh
+	language	Marsian	ims	4188	ims
+	language	Martha's Vineyard Sign Language	mre	4189	mre
+	language	Marti Ke	zmg	4190	zmg
+	language	Martu Wangka	mpj	4191	mpj
+	language	Martuyhunira	vma	4192	vma
+	language	Maru	mhx	4193	mhx
+	language	Marwari	mwr	4194	mwr
+	language	Marwari (India)	rwr	4195	rwr
+	language	Marwari (Pakistan)	mve	4196	mve
+	language	MarÃēbo	mzr	4197	mzr
+	language	Masaaba	myx	4198	myx
+	language	Masadiit Itneg	tis	4199	tis
+	language	Masai	mas	4200	mas
+	language	Masalit	mls	4201	mls
+	language	Masana	mcn	4202	mcn
+	language	Masbatenyo	msb	4203	msb
+	language	Mashco Piro	cuj	4204	cuj
+	language	Mashi (Nigeria)	jms	4205	jms
+	language	Mashi (Zambia)	mho	4206	mho
+	language	Masikoro Malagasy	msh	4207	msh
+	language	Masimasi	ism	4208	ism
+	language	Masiwang	bnf	4209	bnf
+	language	Maskelynes	klv	4210	klv
+	language	Maslam	msv	4211	msv
+	language	Masmaje	mes	4212	mes
+	language	Massalat	mdg	4213	mdg
+	language	Massep	mvs	4214	mvs
+	language	Matagalpa	mtn	4215	mtn
+	language	Matal	mfh	4216	mfh
+	language	Matambwe	wtb	4217	wtb
+	language	Matbat	xmt	4218	xmt
+	language	Matengo	mgv	4219	mgv
+	language	Matepi	mqe	4220	mqe
+	language	Matigsalug Manobo	mbt	4221	mbt
+	language	Matipuhy	mzo	4222	mzo
+	language	Matngala	zml	4223	zml
+	language	Mato	met	4224	met
+	language	Mato Grosso ArÃĄra	axg	4225	axg
+	language	Mator	mtm	4226	mtm
+	language	MatsÊs	mcf	4227	mcf
+	language	Mattole	mvb	4228	mvb
+	language	Matu Chin	hlt	4229	hlt
+	language	Matukar	mjk	4230	mjk
+	language	Matumbi	mgw	4231	mgw
+	language	Matya Samo	stj	4232	stj
+	language	Matís	mpq	4233	mpq
+	language	Maung	mph	4234	mph
+	language	Mauritian Sign Language	lsy	4235	lsy
+	language	Mauwake	mhl	4236	mhl
+	language	Mawa (Chad)	mcw	4237	mcw
+	language	Mawa (Nigeria)	wma	4238	wma
+	language	Mawak	mjj	4239	mjj
+	language	Mawan	mcz	4240	mcz
+	language	Mawayana	mzx	4241	mzx
+	language	Mawchi	mke	4242	mke
+	language	Mawes	mgk	4243	mgk
+	language	Maxakalí	mbl	4244	mbl
+	language	Maxi Gbe	mxl	4245	mxl
+	language	Maya Samo	sym	4246	sym
+	language	Mayaguduna	xmy	4247	xmy
+	language	Mayangna	yan	4248	yan
+	language	Mayawali	yxa	4249	yxa
+	language	Mayeka	myc	4250	myc
+	language	Mayi-Kulan	xyk	4251	xyk
+	language	Mayi-Thakurti	xyt	4252	xyt
+	language	Mayi-Yapi	xyj	4253	xyj
+	language	Mayo	mfy	4254	mfy
+	language	Mayogo	mdm	4255	mdm
+	language	Mayoyao Ifugao	ifu	4256	ifu
+	language	Mazagway	dkx	4257	dkx
+	language	Mazaltepec Zapotec	zpy	4258	zpy
+	language	Mazanderani	mzn	4259	mzn
+	language	MazatlÃĄn Mazatec	vmz	4260	vmz
+	language	MazatlÃĄn Mixe	mzl	4261	mzl
+	language	Mba	mfc	4262	mfc
+	language	Mbala	mdp	4263	mdp
+	language	Mbalanhu	lnb	4264	lnb
+	language	Mbandja	zmz	4265	zmz
+	language	Mbangala	mxg	4266	mxg
+	language	Mbangi	mgn	4267	mgn
+	language	Mbangwe	zmn	4268	zmn
+	language	Mbara (Australia)	mvl	4269	mvl
+	language	Mbara (Chad)	mpk	4270	mpk
+	language	Mbariman-Gudhinma	zmv	4271	zmv
+	language	Mbati	mdn	4272	mdn
+	language	Mbato	gwa	4273	gwa
+	language	Mbay	myb	4274	myb
+	language	Mbe	mfo	4275	mfo
+	language	Mbe'	mtk	4276	mtk
+	language	Mbelime	mql	4277	mql
+	language	Mbere	mdt	4278	mdt
+	language	Mbesa	zms	4279	zms
+	language	Mbessa	emz	4280	emz
+	language	Mbo (Cameroon)	mbo	4281	mbo
+	language	Mbo (Democratic Republic of Congo)	zmw	4282	zmw
+	language	Mboi	moi	4283	moi
+	language	Mboko	mdu	4284	mdu
+	language	Mbole	mdq	4285	mdq
+	language	Mbonga	xmb	4286	xmb
+	language	Mbongno	bgu	4287	bgu
+	language	Mbosi	mdw	4288	mdw
+	language	Mbowe	mxo	4289	mxo
+	language	Mbre	mka	4290	mka
+	language	Mbudum	xmd	4291	xmd
+	language	Mbugu	mhd	4292	mhd
+	language	Mbugwe	mgz	4293	mgz
+	language	Mbuk	bpc	4294	bpc
+	language	Mbuko	mqb	4295	mqb
+	language	Mbukushu	mhw	4296	mhw
+	language	Mbula	mna	4297	mna
+	language	Mbula-Bwazza	mbu	4298	mbu
+	language	Mbule	mlb	4299	mlb
+	language	Mbulungish	mbv	4300	mbv
+	language	Mbum	mdd	4301	mdd
+	language	Mbunda	mck	4302	mck
+	language	Mbunga	mgy	4303	mgy
+	language	Mburku	bbt	4304	bbt
+	language	Mbwela	mfu	4305	mfu
+	language	MbyÃĄ Guaraní	gun	4306	gun
+	language	Me'en	mym	4307	mym
+	language	Medebur	mjm	4308	mjm
+	language	Medefaidrin	dmf	4309	dmf
+	language	Media Lengua	mue	4310	mue
+	language	Median	xme	4311	xme
+	language	Mednyj Aleut	mud	4312	mud
+	language	Medumba	byv	4313	byv
+	language	Mefele	mfj	4314	mfj
+	language	Megam	mef	4315	mef
+	language	Megleno Romanian	ruq	4316	ruq
+	language	Mehek	nux	4317	nux
+	language	MehinÃĄku	mmh	4318	mmh
+	language	Mehri	gdq	4319	gdq
+	language	Mekeo	mek	4320	mek
+	language	Mekmek	mvk	4321	mvk
+	language	Mekwei	msf	4322	msf
+	language	Mel-Khaonh	hkn	4323	hkn
+	language	Mele-Fila	mxe	4324	mxe
+	language	Melo	mfx	4325	mfx
+	language	Melpa	med	4326	med
+	language	Memoni	mby	4327	mby
+	language	Mendalam Kayan	xkd	4328	xkd
+	language	Mendankwe-Nkwen	mfd	4329	mfd
+	language	Mende (Papua New Guinea)	sim	4330	sim
+	language	Mende (Sierra Leone)	men	4331	men
+	language	Mengaka	xmg	4332	xmg
+	language	Mengen	mee	4333	mee
+	language	Mengisa	mct	4334	mct
+	language	Menka	mea	4335	mea
+	language	Menominee	mez	4336	mez
+	language	Mentawai	mwv	4337	mwv
+	language	Menya	mcr	4338	mcr
+	language	Meoswar	mvx	4339	mvx
+	language	Mer	mnu	4340	mnu
+	language	Meramera	mxm	4341	mxm
+	language	Merei	lmb	4342	lmb
+	language	Merey	meq	4343	meq
+	language	Meriam Mir	ulk	4344	ulk
+	language	Merlav	mrm	4345	mrm
+	language	Meroitic	xmr	4346	xmr
+	language	Meru	mer	4347	mer
+	language	Merwari	wry	4348	wry
+	language	Mesaka	iyo	4349	iyo
+	language	Mescalero-Chiricahua Apache	apm	4350	apm
+	language	Mese	mci	4351	mci
+	language	Meskwaki	sac	4352	sac
+	language	Mesme	zim	4353	zim
+	language	Mesmes	mys	4354	mys
+	language	Mesopotamian Arabic	acm	4355	acm
+	language	Mesqan	mvz	4356	mvz
+	language	Messapic	cms	4357	cms
+	language	Meta'	mgo	4358	mgo
+	language	MetlatÃŗnoc Mixtec	mxv	4359	mxv
+	language	Mewari	mtr	4360	mtr
+	language	Mewati	wtm	4361	wtm
+	language	Mexican Sign Language	mfs	4362	mfs
+	language	Meyah	mej	4363	mej
+	language	Mezontla Popoloca	pbe	4364	pbe
+	language	Mezquital Otomi	ote	4365	ote
+	language	Mfinu	zmf	4366	zmf
+	language	Mfumte	nfu	4367	nfu
+	language	Mgbolizhia	gmz	4368	gmz
+	language	Mi'kmaq	mic	4369	mic
+	language	MiahuatlÃĄn Zapotec	zam	4370	zam
+	language	Miami	mia	4371	mia
+	language	Mian	mpt	4372	mpt
+	language	Miani	pla	4373	pla
+	language	Michif	crg	4374	crg
+	language	Michigamea	cmm	4375	cmm
+	language	MichoacÃĄn Mazahua	mmc	4376	mmc
+	language	MichoacÃĄn Nahuatl	ncl	4377	ncl
+	language	Mid Grand Valley Dani	dnt	4378	dnt
+	language	Mid-Southern Banda	bjo	4379	bjo
+	language	Middle Armenian	axm	4380	axm
+	language	Middle Breton	xbm	4381	xbm
+	language	Middle Cornish	cnx	4382	cnx
+	language	Middle Dutch (ca. 1050-1350)	dum	4383	dum
+	language	Middle English (1100-1500)	enm	4384	enm
+	language	Middle French (ca. 1400-1600)	frm	4385	frm
+	language	Middle High German (ca. 1050-1500)	gmh	4386	gmh
+	language	Middle Hittite	htx	4387	htx
+	language	Middle Irish (900-1200)	mga	4388	mga
+	language	Middle Khmer (1400 to 1850 CE)	xhm	4389	xhm
+	language	Middle Korean (10th-16th cent.)	okm	4390	okm
+	language	Middle Low German	gml	4391	gml
+	language	Middle Mongolian	xng	4392	xng
+	language	Middle Newar	nwx	4393	nwx
+	language	Middle Watut	mpl	4394	mpl
+	language	Middle Welsh	wlm	4395	wlm
+	language	Midob	mei	4396	mei
+	language	Migaama	mmy	4397	mmy
+	language	Migabac	mpp	4398	mpp
+	language	Migum	klm	4399	klm
+	language	Miju-Mishmi	mxj	4400	mxj
+	language	Mikasuki	mik	4401	mik
+	language	Mili	ymh	4402	ymh
+	language	Miltu	mlj	4403	mlj
+	language	Miluk	iml	4404	iml
+	language	Milyan	imy	4405	imy
+	language	Min Bei Chinese	mnp	4406	mnp
+	language	Min Dong Chinese	cdo	4407	cdo
+	language	Min Nan Chinese	nan	4408	nan
+	language	Min Zhong Chinese	czo	4409	czo
+	language	Mina (Cameroon)	hna	4410	hna
+	language	Minaean	inm	4411	inm
+	language	Minang	xrg	4412	xrg
+	language	Minangkabau	min	4413	min
+	language	Minanibai	mcv	4414	mcv
+	language	Minaveha	mvn	4415	mvn
+	language	Minderico	drc	4416	drc
+	language	Mindiri	mpn	4417	mpn
+	language	Mingang Doso	mko	4418	mko
+	language	Mingrelian	xmf	4419	xmf
+	language	Minica Huitoto	hto	4420	hto
+	language	Minidien	wii	4421	wii
+	language	Minjungbal	xjb	4422	xjb
+	language	Minkin	xxm	4423	xxm
+	language	Minoan	omn	4424	omn
+	language	Minokok	mqq	4425	mqq
+	language	Minriq	mnq	4426	mnq
+	language	Mintil	mzt	4427	mzt
+	language	Minz Zhuang	zgm	4428	zgm
+	language	Miqie	yiq	4429	yiq
+	language	Mirandese	mwl	4430	mwl
+	language	Miraya Bikol	rbl	4431	rbl
+	language	Mirgan	zrg	4432	zrg
+	language	Miriti	mmv	4433	mmv
+	language	Miriwoong	mep	4434	mep
+	language	Miriwoong Sign Language	rsm	4435	rsm
+	language	Mirning	gmr	4436	gmr
+	language	Miship	mjs	4437	mjs
+	language	Misima-Panaeati	mpx	4438	mpx
+	language	Mising	mrg	4439	mrg
+	language	Mitla Zapotec	zaw	4440	zaw
+	language	Mitlatongo Mixtec	vmm	4441	vmm
+	language	Mittu	mwu	4442	mwu
+	language	Mituku	zmq	4443	zmq
+	language	Miu	mpo	4444	mpo
+	language	Miwa	vmi	4445	vmi
+	language	Mixed Great Andamanese	gac	4446	gac
+	language	Mixtepec Mixtec	mix	4447	mix
+	language	Mixtepec Zapotec	zpm	4448	zpm
+	language	Miya	mkf	4449	mkf
+	language	Miyako	mvi	4450	mvi
+	language	Miyakubo Sign Language	ehs	4451	ehs
+	language	Miyobe	soy	4452	soy
+	language	Mlabri	mra	4453	mra
+	language	MlahsÃļ	lhs	4454	lhs
+	language	Mlap	kja	4455	kja
+	language	Mlomp	mlo	4456	mlo
+	language	Mmaala	mmu	4457	mmu
+	language	Mmen	bfm	4458	bfm
+	language	Mo'da	gbn	4459	gbn
+	language	Moabite	obm	4460	obm
+	language	Moba	mfq	4461	mfq
+	language	Mobilian	mod	4462	mod
+	language	Mobumrin Aizi	ahm	4463	ahm
+	language	Mobwa Karen	jkm	4464	jkm
+	language	Mochi	old	4465	old
+	language	Mochica	omc	4466	omc
+	language	Mocho	mhc	4467	mhc
+	language	Mocoví	moc	4468	moc
+	language	Modang	mxd	4469	mxd
+	language	Modern Greek (1453-), Greek (modern)	ell	4470	ell	Modern Greek (1453-)	el	gre	Greek	Greek (modern)
+	language	Modole	mqo	4471	mqo
+	language	Moere	mvq	4472	mvq
+	language	Mofu-Gudur	mif	4473	mif
+	language	Mogholi	mhj	4474	mhj
+	language	Mogofin	mfg	4475	mfg
+	language	Mogum	mou	4476	mou
+	language	Mohave	mov	4477	mov
+	language	Mohawk	moh	4478	moh
+	language	Mohegan-Pequot	xpq	4479	xpq
+	language	Moi (Congo)	mow	4480	mow
+	language	Moi (Indonesia)	mxn	4481	mxn
+	language	Moikodi	mkp	4482	mkp
+	language	Moingi	mwz	4483	mwz
+	language	Moji	ymi	4484	ymi
+	language	Mok	mqt	4485	mqt
+	language	Mokati	wnb	4486	wnb
+	language	Moken	mwt	4487	mwt
+	language	Mokerang	mft	4488	mft
+	language	Mokilese	mkj	4489	mkj
+	language	Moklen	mkm	4490	mkm
+	language	Mokole	mkl	4491	mkl
+	language	Mokpwe	bri	4492	bri
+	language	Moksela	vms	4493	vms
+	language	Moksha	mdf	4494	mdf
+	language	Molale	mbe	4495	mbe
+	language	Molbog	pwm	4496	pwm
+	language	Moldova Sign Language	vsi	4497	vsi
+	language	Molengue	bxc	4498	bxc
+	language	Molima	mox	4499	mox
+	language	Molmo One	aun	4500	aun
+	language	Molo	zmo	4501	zmo
+	language	Molof	msl	4502	msl
+	language	Moloko	mlw	4503	mlw
+	language	Mom Jango	ver	4504	ver
+	language	Moma	myl	4505	myl
+	language	Momare	msz	4506	msz
+	language	Mombo Dogon	dmb	4507	dmb
+	language	Mombum	mso	4508	mso
+	language	Momina	mmb	4509	mmb
+	language	Momuna	mqf	4510	mqf
+	language	Mon	mnw	4511	mnw
+	language	Monastic Sign Language	mzg	4512	mzg
+	language	Mondropolon	npn	4513	npn
+	language	MondÊ	mnd	4514	mnd
+	language	Mongo	lol	4515	lol
+	language	Mongol	mgt	4516	mgt
+	language	Mongolia Buriat	bxm	4517	bxm
+	language	Mongolian	mon	4518	mon	mn
+	language	Mongolian Sign Language	msr	4519	msr
+	language	Mongondow	mog	4520	mog
+	language	Moni	mnz	4521	mnz
+	language	Mono (Cameroon)	mru	4522	mru
+	language	Mono (Democratic Republic of Congo)	mnh	4523	mnh
+	language	Mono (Solomon Islands)	mte	4524	mte
+	language	Mono (USA)	mnr	4525	mnr
+	language	Monom	moo	4526	moo
+	language	Monsang Naga	nmh	4527	nmh
+	language	Montenegrin	cnr	4528	cnr
+	language	Montol	mtl	4529	mtl
+	language	Monumbo	mxk	4530	mxk
+	language	Monzombo	moj	4531	moj
+	language	Moo	gwg	4532	gwg
+	language	Moose Cree	crm	4533	crm
+	language	MopÃĄn Maya	mop	4534	mop
+	language	Mor (Bomberai Peninsula)	moq	4535	moq
+	language	Mor (Mor Islands)	mhz	4536	mhz
+	language	Moraid	msg	4537	msg
+	language	Morawa	mze	4538	mze
+	language	Morelos Nahuatl	nhm	4539	nhm
+	language	Morerebi	xmo	4540	xmo
+	language	Moresada	msx	4541	msx
+	language	Mori Atas	mzq	4542	mzq
+	language	Mori Bawah	xmz	4543	xmz
+	language	Morigi	mdb	4544	mdb
+	language	Moriori	rrm	4545	rrm
+	language	Morisyen	mfe	4546	mfe
+	language	Moro	mor	4547	mor
+	language	Moroccan Arabic	ary	4548	ary
+	language	Moroccan Sign Language	xms	4549	xms
+	language	Morokodo	mgc	4550	mgc
+	language	Morom	bdo	4551	bdo
+	language	Moronene	mqn	4552	mqn
+	language	Morori	mok	4553	mok
+	language	Morouas	mrp	4554	mrp
+	language	Morrobalama	umg	4555	umg
+	language	Mortlockese	mrl	4556	mrl
+	language	Moru	mgd	4557	mgd
+	language	Mosimo	mqv	4558	mqv
+	language	Moskona	mtj	4559	mtj
+	language	Mossi	mos	4560	mos
+	language	Mota	mtt	4561	mtt
+	language	Motlav	mlv	4562	mlv
+	language	Motu	meu	4563	meu
+	language	Mouk-Aria	mwh	4564	mwh
+	language	Moundadan Chetty	cty	4565	cty
+	language	Mountain Koiali	kpx	4566	kpx
+	language	Mouwase	jmw	4567	jmw
+	language	Movima	mzp	4568	mzp
+	language	Moyadan Itneg	ity	4569	ity
+	language	Moyon Naga	nmo	4570	nmo
+	language	Mozambican Sign Language	mzy	4571	mzy
+	language	Mozarabic	mxi	4572	mxi
+	language	Mpade	mpi	4573	mpi
+	language	Mpalitjanh	xpj	4574	xpj
+	language	Mpi	mpz	4575	mpz
+	language	Mpiemo	mcx	4576	mcx
+	language	Mpinda	pnd	4577	pnd
+	language	Mpoto	mpa	4578	mpa
+	language	Mpotovoro	mvt	4579	mvt
+	language	Mpumpong	mgg	4580	mgg
+	language	Mpuono	zmp	4581	zmp
+	language	Mpur	akc	4582	akc
+	language	Mro-Khimi Chin	cmr	4583	cmr
+	language	Mru	mro	4584	mro
+	language	Mser	kqx	4585	kqx
+	language	Mt. Iraya Agta	atl	4586	atl
+	language	Mt. Iriga Agta	agz	4587	agz
+	language	Muak Sa-aak	ukk	4588	ukk
+	language	Mualang	mtd	4589	mtd
+	language	Mubami	tsx	4590	tsx
+	language	Mubi	mub	4591	mub
+	language	Muda	ymd	4592	ymd
+	language	Mudburra	dmw	4593	dmw
+	language	Mudhili Gadaba	gau	4594	gau
+	language	Mudu Koraga	vmd	4595	vmd
+	language	Muduga	udg	4596	udg
+	language	Mufian	aoj	4597	aoj
+	language	Mugom	muk	4598	muk
+	language	Muinane	bmr	4599	bmr
+	language	Mukha-Dora	mmk	4600	mmk
+	language	Mukulu	moz	4601	moz
+	language	Mulaha	mfw	4602	mfw
+	language	Mulam	mlm	4603	mlm
+	language	Mulao	giu	4604	giu
+	language	Mulgi	mvh	4605	mvh
+	language	Mullu Kurumba	kpb	4606	kpb
+	language	Multiple languages	mul	4607	mul
+	language	Muluridyi	vmu	4608	vmu
+	language	Mum	kqa	4609	kqa
+	language	Mumuye	mzm	4610	mzm
+	language	Muna	mnb	4611	mnb
+	language	Munda	unx	4612	unx
+	language	Mundabli	boe	4613	boe
+	language	Mundang	mua	4614	mua
+	language	Mundani	mnf	4615	mnf
+	language	Mundari	unr	4616	unr
+	language	Mundat	mmf	4617	mmf
+	language	MundurukÃē	myu	4618	myu
+	language	Mungaka	mhk	4619	mhk
+	language	Munggui	mth	4620	mth
+	language	Mungkip	mpv	4621	mpv
+	language	Muniche	myr	4622	myr
+	language	Munit	mtc	4623	mtc
+	language	Munji	mnj	4624	mnj
+	language	Munsee	umu	4625	umu
+	language	Muong	mtq	4626	mtq
+	language	Mur Pano	tkv	4627	tkv
+	language	Muratayak	asx	4628	asx
+	language	Murik (Malaysia)	mxr	4629	mxr
+	language	Murik (Papua New Guinea)	mtf	4630	mtf
+	language	Murkim	rmh	4631	rmh
+	language	Murle	mur	4632	mur
+	language	Murrinh-Patha	mwf	4633	mwf
+	language	Mursi	muz	4634	muz
+	language	Murui Huitoto	huu	4635	huu
+	language	Murupi	mqw	4636	mqw
+	language	Muruwari	zmu	4637	zmu
+	language	Musak	mmq	4638	mmq
+	language	Musar	mmi	4639	mmi
+	language	Musasa	smm	4640	smm
+	language	Musey	mse	4641	mse
+	language	Musgu	mug	4642	mug
+	language	Mushungulu	xma	4643	xma
+	language	Musi	mui	4644	mui
+	language	Muskum	mje	4645	mje
+	language	Muslim Tat	ttt	4646	ttt
+	language	Musom	msu	4647	msu
+	language	Mussau-Emira	emi	4648	emi
+	language	Muthuvan	muv	4649	muv
+	language	Mutu	tuc	4650	tuc
+	language	Muyang	muy	4651	muy
+	language	Muyuw	myw	4652	myw
+	language	Muzi	ymz	4653	ymz
+	language	Mvanip	mcj	4654	mcj
+	language	Mvuba	mxh	4655	mxh
+	language	Mwaghavul	sur	4656	sur
+	language	Mwali Comorian	wlc	4657	wlc
+	language	Mwan	moa	4658	moa
+	language	Mwani	wmw	4659	wmw
+	language	Mwatebu	mwa	4660	mwa
+	language	Mwera (Chimwera)	mwe	4661	mwe
+	language	Mwera (Nyasa)	mjh	4662	mjh
+	language	Mwimbi-Muthambi	mws	4663	mws
+	language	Myanmar Sign Language	ysm	4664	ysm
+	language	Mycenaean Greek	gmy	4665	gmy
+	language	Myene	mye	4666	mye
+	language	Mysian	yms	4667	yms
+	language	Mzieme Naga	nme	4668	nme
+	language	MÃĄghdÃŦ	gmd	4669	gmd
+	language	MÃĄku	xak	4670	xak
+	language	MÊnik	tnr	4671	tnr
+	language	Mískito	miq	4672	miq
+	language	MÃŗcheno	mhn	4673	mhn
+	language	MÃŧn Chin	mwq	4674	mwq
+	language	MÃŧndÃŧ	muh	4675	muh
+	language	MāhārāášŖáš­ri Prākrit	pmh	4676	pmh
+	language	Māori, Maori	mri	4677	mri	Māori	Maori	mao	mi
+	language	N'Ko	nqo	4678	nqo
+	language	Na	nbt	4679	nbt
+	language	Na-kara	nck	4680	nck
+	language	Naaba	nao	4681	nao
+	language	Naami	bzv	4682	bzv
+	language	Naasioi	nas	4683	nas
+	language	Naba	mne	4684	mne
+	language	Nabak	naf	4685	naf
+	language	Nabi	mty	4686	mty
+	language	Nachering	ncd	4687	ncd
+	language	Nadruvian	ndf	4688	ndf
+	language	NadÃĢb	mbj	4689	mbj
+	language	Nafaanra	nfr	4690	nfr
+	language	Nafi	srf	4691	srf
+	language	Nafri	nxx	4692	nxx
+	language	Nafusi	jbn	4693	jbn
+	language	Naga Pidgin	nag	4694	nag
+	language	Nagarchal	nbg	4695	nbg
+	language	Nage	nxe	4696	nxe
+	language	Nagumi	ngv	4697	ngv
+	language	Nahali	nlx	4698	nlx
+	language	Nahari	nhh	4699	nhh
+	language	Nai	bio	4700	bio
+	language	Najdi Arabic	ars	4701	ars
+	language	Naka'ela	nae	4702	nae
+	language	Nakai	nkj	4703	nkj
+	language	Nakame	nib	4704	nib
+	language	Nakanai	nak	4705	nak
+	language	Nake	nbk	4706	nbk
+	language	Naki	mff	4707	mff
+	language	Nakwi	nax	4708	nax
+	language	Nalca	nlc	4709	nlc
+	language	Nali	nss	4710	nss
+	language	Nalik	nal	4711	nal
+	language	Nalu	naj	4712	naj
+	language	Naluo Yi	ylo	4713	ylo
+	language	NalÃļgo	nlz	4714	nlz
+	language	Nama (Papua New Guinea)	nmx	4715	nmx
+	language	Namakura	nmk	4716	nmk
+	language	Namat	nkm	4717	nkm
+	language	Nambo	ncm	4718	ncm
+	language	Nambya	nmq	4719	nmq
+	language	Namia	nnm	4720	nnm
+	language	Namiae	nvm	4721	nvm
+	language	Namibian Sign Language	nbs	4722	nbs
+	language	Namla	naa	4723	naa
+	language	Namo	mxw	4724	mxw
+	language	Namonuito	nmt	4725	nmt
+	language	Namosi-Naitasiri-Serua	bwb	4726	bwb
+	language	Namuyi	nmy	4727	nmy
+	language	Nanai	gld	4728	gld
+	language	Nancere	nnc	4729	nnc
+	language	Nande	nnb	4730	nnb
+	language	Nandi	niq	4731	niq
+	language	NanerigÊ SÊnoufo	sen	4732	sen
+	language	Nanga Dama Dogon	nzz	4733	nzz
+	language	Nankina	nnk	4734	nnk
+	language	Nanti	cox	4735	cox
+	language	Nanticoke	nnt	4736	nnt
+	language	Nanubae	afk	4737	afk
+	language	Napo Lowland Quechua	qvo	4738	qvo
+	language	Napu	npy	4739	npy
+	language	Nar Phu	npa	4740	npa
+	language	Nara	nrb	4741	nrb
+	language	Narak	nac	4742	nac
+	language	Narango	nrg	4743	nrg
+	language	Nari Nari	rnr	4744	rnr
+	language	Naro	nhr	4745	nhr
+	language	Narom	nrm	4746	nrm
+	language	Narragansett	xnt	4747	xnt
+	language	Narua	nru	4748	nru
+	language	Narungga	nnr	4749	nnr
+	language	Nasal	nsy	4750	nsy
+	language	Nasarian	nvh	4751	nvh
+	language	Naskapi	nsk	4752	nsk
+	language	Natanzi	ntz	4753	ntz
+	language	Natchez	ncz	4754	ncz
+	language	Nateni	ntm	4755	ntm
+	language	Nathembo	nte	4756	nte
+	language	Natioro	nti	4757	nti
+	language	NatÃŧgu	ntu	4758	ntu
+	language	Nauete	nxa	4759	nxa
+	language	Naukan Yupik	ynk	4760	ynk
+	language	Nauna	ncn	4761	ncn
+	language	Nauo	nwo	4762	nwo
+	language	Nauru	nau	4763	nau	na
+	language	Navajo, Navaho	nav	4764	nav	nv	Navajo	Navaho
+	language	Navut	nsw	4765	nsw
+	language	Nawaru	nwr	4766	nwr
+	language	Nawathinehena	nwa	4767	nwa
+	language	Nawdm	nmz	4768	nmz
+	language	Nawuri	naw	4769	naw
+	language	Naxi	nxq	4770	nxq
+	language	Nayi	noz	4771	noz
+	language	Nayini	nyq	4772	nyq
+	language	Ncane	ncr	4773	ncr
+	language	Nchumbulu	nlu	4774	nlu
+	language	Nda'nda'	nnz	4775	nnz
+	language	Ndai	gke	4776	gke
+	language	Ndaka	ndk	4777	ndk
+	language	Ndali	ndh	4778	ndh
+	language	Ndam	ndm	4779	ndm
+	language	Ndamba	ndj	4780	ndj
+	language	Ndambomo	nxo	4781	nxo
+	language	Ndasa	nda	4782	nda
+	language	Ndau	ndc	4783	ndc
+	language	Nde-Gbite	ned	4784	ned
+	language	Nde-Nsele-Nta	ndd	4785	ndd
+	language	Ndemli	nml	4786	nml
+	language	Ndendeule	dne	4787	dne
+	language	Ndengereko	ndg	4788	ndg
+	language	Nding	eli	4789	eli
+	language	Ndo	ndp	4790	ndp
+	language	Ndobo	ndw	4791	ndw
+	language	Ndoe	nbb	4792	nbb
+	language	Ndogo	ndz	4793	ndz
+	language	Ndolo	ndl	4794	ndl
+	language	Ndom	nqm	4795	nqm
+	language	Ndombe	ndq	4796	ndq
+	language	Ndonde Hamba	njd	4797	njd
+	language	Ndonga	ndo	4798	ndo	ng
+	language	Ndoola	ndr	4799	ndr
+	language	Ndra'ngith	dgt	4800	dgt
+	language	Ndrulo	dno	4801	dno
+	language	Nduga	ndx	4802	ndx
+	language	Ndumu	nmd	4803	nmd
+	language	Ndunda	nuh	4804	nuh
+	language	Ndunga	ndt	4805	ndt
+	language	Ndut	ndv	4806	ndv
+	language	Ndwewe	nww	4807	nww
+	language	Ndyuka-Trio Pidgin	njt	4808	njt
+	language	Ndzwani Comorian	wni	4809	wni
+	language	Neapolitan	nap	4810	nap
+	language	Nedebang	nec	4811	nec
+	language	Nefamese	nef	4812	nef
+	language	Negerhollands	dcr	4813	dcr
+	language	Negeri Sembilan Malay	zmi	4814	zmi
+	language	Negidal	neg	4815	neg
+	language	Nehan	nsn	4816	nsn
+	language	Nek	nif	4817	nif
+	language	Nekgini	nkg	4818	nkg
+	language	Neko	nej	4819	nej
+	language	Neku	nek	4820	nek
+	language	Nema	gsn	4821	gsn
+	language	Neme	nex	4822	nex
+	language	Nemi	nem	4823	nem
+	language	Nen	nqn	4824	nqn
+	language	Nend	anh	4825	anh
+	language	Nenets	yrk	4826	yrk
+	language	Nengone	nen	4827	nen
+	language	Neo	neu	4828	neu
+	language	Neo-Hittite	nei	4829	nei
+	language	Nepalese Sign Language	nsp	4830	nsp
+	language	Nepali (individual language)	npi	4831	npi
+	language	Nepali (macrolanguage), Nepali	nep	4832	nep	Nepali (macrolanguage)	ne	Nepali
+	language	Nete	net	4833	net
+	language	New Caledonian Javanese	jas	4834	jas
+	language	New Zealand Sign Language	nzs	4835	nzs
+	language	Newari	new	4836	new
+	language	Neyo	ney	4837	ney
+	language	Nez Perce	nez	4838	nez
+	language	Ngaanyatjarra	ntj	4839	ntj
+	language	Ngad'a	nxg	4840	nxg
+	language	Ngadjunmaya	nju	4841	nju
+	language	Ngadjuri	jui	4842	jui
+	language	Ngaing	nnf	4843	nnf
+	language	Ngaju	nij	4844	nij
+	language	Ngala	nud	4845	nud
+	language	Ngalakgan	nig	4846	nig
+	language	Ngalum	szb	4847	szb
+	language	Ngam	nmc	4848	nmc
+	language	Ngamambo	nbv	4849	nbv
+	language	Ngambay	sba	4850	sba
+	language	Ngamini	nmv	4851	nmv
+	language	Ngamo	nbh	4852	nbh
+	language	Ngan'gityemerri	nam	4853	nam
+	language	Nganakarti	xnk	4854	xnk
+	language	Nganasan	nio	4855	nio
+	language	Ngandi	nid	4856	nid
+	language	Ngando (Central African Republic)	ngd	4857	ngd
+	language	Ngando (Democratic Republic of Congo)	nxd	4858	nxd
+	language	Ngandyera	nne	4859	nne
+	language	Ngangam	gng	4860	gng
+	language	Ngantangarra	ntg	4861	ntg
+	language	Nganyaywana	nyx	4862	nyx
+	language	Ngardi	rxd	4863	rxd
+	language	Ngarigu	xni	4864	xni
+	language	Ngarinyin	ung	4865	ung
+	language	Ngarinyman	nbj	4866	nbj
+	language	Ngarla	nrk	4867	nrk
+	language	Ngarluma	nrl	4868	nrl
+	language	Ngarrindjeri	nay	4869	nay
+	language	Ngas	anc	4870	anc
+	language	Ngasa	nsg	4871	nsg
+	language	Ngatik Men's Creole	ngm	4872	ngm
+	language	Ngawn Chin	cnw	4873	cnw
+	language	Ngawun	nxn	4874	nxn
+	language	Ngayawung	nwg	4875	nwg
+	language	Ngazidja Comorian	zdj	4876	zdj
+	language	Ngbaka	nga	4877	nga
+	language	Ngbaka Ma'bo	nbm	4878	nbm
+	language	Ngbaka Manza	ngg	4879	ngg
+	language	Ngbee	jgb	4880	jgb
+	language	Ngbinda	nbd	4881	nbd
+	language	Ngbundu	nuu	4882	nuu
+	language	Ngelima	agh	4883	agh
+	language	Ngemba	nge	4884	nge
+	language	Ngen	gnj	4885	gnj
+	language	Ngendelengo	nql	4886	nql
+	language	Ngete	nnn	4887	nnn
+	language	Nggem	nbq	4888	nbq
+	language	Nggwahyi	ngx	4889	ngx
+	language	Ngie	ngj	4890	ngj
+	language	Ngiemboon	nnh	4891	nnh
+	language	Ngile	jle	4892	jle
+	language	Ngindo	nnq	4893	nnq
+	language	Ngiti	niy	4894	niy
+	language	Ngizim	ngi	4895	ngi
+	language	NgkÃĸlmpw Kanum	kcd	4896	kcd
+	language	Ngom	nra	4897	nra
+	language	Ngomba	jgo	4898	jgo
+	language	Ngombale	nla	4899	nla
+	language	Ngombe (Central African Republic)	nmj	4900	nmj
+	language	Ngombe (Democratic Republic of Congo)	ngc	4901	ngc
+	language	Ngongo	noq	4902	noq
+	language	Ngoni (Mozambique)	xnq	4903	xnq
+	language	Ngoni (Tanzania)	xnj	4904	xnj
+	language	Ngoshie	nsh	4905	nsh
+	language	Ngul	nlo	4906	nlo
+	language	Ngulu	ngp	4907	ngp
+	language	Nguluwan	nuw	4908	nuw
+	language	Ngumbarl	xnm	4909	xnm
+	language	Ngumbi	nui	4910	nui
+	language	Ngunawal	xul	4911	xul
+	language	Ngundi	ndn	4912	ndn
+	language	Ngundu	nue	4913	nue
+	language	Ngungwel	ngz	4914	ngz
+	language	Ngurimi	ngq	4915	ngq
+	language	Ngurmbur	nrx	4916	nrx
+	language	Nguôn	nuo	4917	nuo
+	language	Ngwaba	ngw	4918	ngw
+	language	Ngwe	nwe	4919	nwe
+	language	Ngwo	ngn	4920	ngn
+	language	Ngäbere	gym	4921	gym
+	language	Nhanda	nha	4922	nha
+	language	Nhengatu	yrl	4923	yrl
+	language	Nhirrpi	hrp	4924	hrp
+	language	Nhuwala	nhf	4925	nhf
+	language	Nias	nia	4926	nia
+	language	Nicaragua Creole English	bzk	4927	bzk
+	language	Nicaraguan Sign Language	ncs	4928	ncs
+	language	Niellim	nie	4929	nie
+	language	Nigeria Mambila	mzk	4930	mzk
+	language	Nigerian Fulfulde	fuv	4931	fuv
+	language	Nigerian Pidgin	pcm	4932	pcm
+	language	Nigerian Sign Language	nsi	4933	nsi
+	language	Nihali	nll	4934	nll
+	language	Nii	nii	4935	nii
+	language	Niksek	gbe	4936	gbe
+	language	Nila	nil	4937	nil
+	language	Nilamba	nim	4938	nim
+	language	Nimadi	noe	4939	noe
+	language	Nimanbur	nmp	4940	nmp
+	language	Nimbari	nmr	4941	nmr
+	language	Nimboran	nir	4942	nir
+	language	Nimi	nis	4943	nis
+	language	Nimo	niw	4944	niw
+	language	Nimoa	nmw	4945	nmw
+	language	Ninam	shb	4946	shb
+	language	Nindi	nxi	4947	nxi
+	language	Ningera	nby	4948	nby
+	language	Ninggerum	nxr	4949	nxr
+	language	Ningil	niz	4950	niz
+	language	Ninia Yali	nlk	4951	nlk
+	language	Ninzo	nin	4952	nin
+	language	Nipsan	nps	4953	nps
+	language	Nisa	njs	4954	njs
+	language	Nisenan	nsz	4955	nsz
+	language	Nisga'a	ncg	4956	ncg
+	language	Nisi (China)	yso	4957	yso
+	language	Niuafo'ou	num	4958	num
+	language	Niuatoputapu	nkp	4959	nkp
+	language	Niuean	niu	4960	niu
+	language	NivaclÊ	cag	4961	cag
+	language	Niwer Mil	hrc	4962	hrc
+	language	Njalgulgule	njl	4963	njl
+	language	Njebi	nzb	4964	nzb
+	language	Njen	njj	4965	njj
+	language	Njerep	njr	4966	njr
+	language	Njyem	njy	4967	njy
+	language	Nkami	nkq	4968	nkq
+	language	Nkangala	nkn	4969	nkn
+	language	Nkari	nkz	4970	nkz
+	language	Nkem-Nkum	isi	4971	isi
+	language	Nkhumbi	khu	4972	khu
+	language	Nkongho	nkc	4973	nkc
+	language	Nkonya	nko	4974	nko
+	language	Nkoroo	nkx	4975	nkx
+	language	Nkoya	nka	4976	nka
+	language	Nkukoli	nbo	4977	nbo
+	language	Nkutu	nkw	4978	nkw
+	language	Nnam	nbp	4979	nbp
+	language	No linguistic content	zxx	4980	zxx
+	language	Nobiin	fia	4981	fia
+	language	Nobonob	gaw	4982	gaw
+	language	Nocte Naga	njb	4983	njb
+	language	Nogai	nog	4984	nog
+	language	Noipx	npx	4985	npx
+	language	Noiri	noi	4986	noi
+	language	Nokuku	nkk	4987	nkk
+	language	Nomaande	lem	4988	lem
+	language	Nomane	nof	4989	nof
+	language	Nomatsiguenga	not	4990	not
+	language	Nomlaki	nol	4991	nol
+	language	Nomu	noh	4992	noh
+	language	Nong Zhuang	zhn	4993	zhn
+	language	Nonuya	noj	4994	noj
+	language	Nooksack	nok	4995	nok
+	language	Noon	snf	4996	snf
+	language	Noone	nhu	4997	nhu
+	language	Nopala Chatino	cya	4998	cya
+	language	Noric	nrc	4999	nrc
+	language	Norn	nrn	5000	nrn
+	language	Norra	nrr	5001	nrr
+	language	North Alaskan Inupiatun	esi	5002	esi
+	language	North Ambrym	mmg	5003	mmg
+	language	North Asmat	nks	5004	nks
+	language	North Awyu	yir	5005	yir
+	language	North Azerbaijani	azj	5006	azj
+	language	North Babar	bcd	5007	bcd
+	language	North Bolivian Quechua	qul	5008	qul
+	language	North Central Mixe	neq	5009	neq
+	language	North Efate	llp	5010	llp
+	language	North Fali	fll	5011	fll
+	language	North Giziga	gis	5012	gis
+	language	North Junín Quechua	qvn	5013	qvn
+	language	North Marquesan	mrq	5014	mrq
+	language	North Mesopotamian Arabic	ayp	5015	ayp
+	language	North Midlands Tasmanian	xph	5016	xph
+	language	North Mofu	mfk	5017	mfk
+	language	North Moluccan Malay	max	5018	max
+	language	North Muyu	kti	5019	kti
+	language	North Nuaulu	nni	5020	nni
+	language	North Picene	nrp	5021	nrp
+	language	North Slavey	scs	5022	scs
+	language	North Tairora	tbg	5023	tbg
+	language	North Tanna	tnn	5024	tnn
+	language	North Wahgi	whg	5025	whg
+	language	North Watut	una	5026	una
+	language	Northeast Kiwai	kiw	5027	kiw
+	language	Northeast Maidu	nmu	5028	nmu
+	language	Northeast Pashai	aee	5029	aee
+	language	Northeastern Dinka	dip	5030	dip
+	language	Northeastern Pomo	pef	5031	pef
+	language	Northeastern Tasmanian	xpb	5032	xpb
+	language	Northeastern Thai	tts	5033	tts
+	language	Northern Alta	aqn	5034	aqn
+	language	Northern Altai	atv	5035	atv
+	language	Northern Amami-Oshima	ryn	5036	ryn
+	language	Northern Betsimisaraka Malagasy	bmm	5037	bmm
+	language	Northern Binukidnon	kyn	5038	kyn
+	language	Northern Bobo MadarÊ	bbo	5039	bbo
+	language	Northern Bontok	rbk	5040	rbk
+	language	Northern Catanduanes Bikol	cts	5041	cts
+	language	Northern Conchucos Ancash Quechua	qxn	5042	qxn
+	language	Northern Dagara	dgi	5043	dgi
+	language	Northern Dong	doc	5044	doc
+	language	Northern East Cree	crl	5045	crl
+	language	Northern EmberÃĄ	emp	5046	emp
+	language	Northern Frisian	frr	5047	frr
+	language	Northern Ghale	ghh	5048	ghh
+	language	Northern Gondi	gno	5049	gno
+	language	Northern Grebo	gbo	5050	gbo
+	language	Northern Guiyang Hmong	huj	5051	huj
+	language	Northern Haida	hdn	5052	hdn
+	language	Northern Hindko	hno	5053	hno
+	language	Northern Huishui Hmong	hmi	5054	hmi
+	language	Northern Kalapuya	nrt	5055	nrt
+	language	Northern Kankanay	xnn	5056	xnn
+	language	Northern Katang	ncq	5057	ncq
+	language	Northern Khmer	kxm	5058	kxm
+	language	Northern Kissi	kqs	5059	kqs
+	language	Northern Kurdish	kmr	5060	kmr
+	language	Northern Luri	lrc	5061	lrc
+	language	Northern Mashan Hmong	hmp	5062	hmp
+	language	Northern Muji	ymx	5063	ymx
+	language	Northern Nago	xkb	5064	xkb
+	language	Northern Ndebele, North Ndebele	nde	5065	nde	Northern Ndebele	nd	North Ndebele
+	language	Northern Ngbandi	ngb	5066	ngb
+	language	Northern Nisu	yiv	5067	yiv
+	language	Northern Nuni	nuv	5068	nuv
+	language	Northern Oaxaca Nahuatl	nhy	5069	nhy
+	language	Northern Ohlone	cst	5070	cst
+	language	Northern One	onr	5071	onr
+	language	Northern Paiute	pao	5072	pao
+	language	Northern Pame	pmq	5073	pmq
+	language	Northern Pashto	pbu	5074	pbu
+	language	Northern Pastaza Quichua	qvz	5075	qvz
+	language	Northern Ping Chinese	cnp	5076	cnp
+	language	Northern Pomo	pej	5077	pej
+	language	Northern Puebla Nahuatl	ncj	5078	ncj
+	language	Northern Pumi	pmi	5079	pmi
+	language	Northern Qiandong Miao	hea	5080	hea
+	language	Northern Qiang	cng	5081	cng
+	language	Northern Rengma Naga	nnl	5082	nnl
+	language	Northern Roglai	rog	5083	rog
+	language	Northern Sami	sme	5084	sme	se
+	language	Northern Sierra Miwok	nsq	5085	nsq
+	language	Northern Sorsoganon	bks	5086	bks
+	language	Northern Subanen	stb	5087	stb
+	language	Northern Tarahumara	thh	5088	thh
+	language	Northern Tasmanian	xpv	5089	xpv
+	language	Northern Tepehuan	ntp	5090	ntp
+	language	Northern Thai	nod	5091	nod
+	language	Northern Tidung	ntd	5092	ntd
+	language	Northern Tiwa	twf	5093	twf
+	language	Northern Tlaxiaco Mixtec	xtn	5094	xtn
+	language	Northern Toussian	tsp	5095	tsp
+	language	Northern Tujia	tji	5096	tji
+	language	Northern Tutchone	ttm	5097	ttm
+	language	Northern Uzbek	uzn	5098	uzn
+	language	Northern Yukaghir	ykg	5099	ykg
+	language	Northwest Alaska Inupiatun	esk	5100	esk
+	language	Northwest Gbaya	gya	5101	gya
+	language	Northwest Maidu	mjd	5102	mjd
+	language	Northwest Oaxaca Mixtec	mxa	5103	mxa
+	language	Northwest Pashai	glh	5104	glh
+	language	Northwestern Dinka	diw	5105	diw
+	language	Northwestern Fars	faz	5106	faz
+	language	Northwestern Kolami	kfb	5107	kfb
+	language	Northwestern Nisu	nsf	5108	nsf
+	language	Northwestern Ojibwa	ojb	5109	ojb
+	language	Northwestern Tasmanian	xpw	5110	xpw
+	language	Norwegian	nor	5111	nor	no
+	language	Norwegian BokmÃĨl	nob	5112	nob	nb
+	language	Norwegian Nynorsk	nno	5113	nno	nn
+	language	Norwegian Sign Language	nsl	5114	nsl
+	language	Notre	bly	5115	bly
+	language	Notsi	ncf	5116	ncf
+	language	Nottoway	ntw	5117	ntw
+	language	Nottoway-Meherrin	nwy	5118	nwy
+	language	Novial	nov	5119	nov
+	language	Noy	noy	5120	noy
+	language	Nsenga	nse	5121	nse
+	language	Nshi	nsc	5122	nsc
+	language	Nsongo	nsx	5123	nsx
+	language	Ntcham	bud	5124	bud
+	language	Nteng	nqt	5125	nqt
+	language	Ntomba	nto	5126	nto
+	language	Nubaca	baf	5127	baf
+	language	Nubi	kcn	5128	kcn
+	language	Nubri	kte	5129	kte
+	language	Nuer	nus	5130	nus
+	language	Nugunu (Australia)	nnv	5131	nnv
+	language	Nugunu (Cameroon)	yas	5132	yas
+	language	Nuk	noc	5133	noc
+	language	Nukak MakÃē	mbr	5134	mbr
+	language	Nukna	klt	5135	klt
+	language	Nukuini	nuc	5136	nuc
+	language	Nukumanu	nuq	5137	nuq
+	language	Nukunul	xnu	5138	xnu
+	language	Nukuoro	nkr	5139	nkr
+	language	Nukuria	nur	5140	nur
+	language	Numana	nbr	5141	nbr
+	language	Numanggang	nop	5142	nop
+	language	Numbami	sij	5143	sij
+	language	Nume	tgs	5144	tgs
+	language	Numidian	nxm	5145	nxm
+	language	Numèè	kdk	5146	kdk
+	language	Nung (Viet Nam)	nut	5147	nut
+	language	Nungali	nug	5148	nug
+	language	Nunggubuyu	nuy	5149	nuy
+	language	Nungu	rin	5150	rin
+	language	Nupbikha	npb	5151	npb
+	language	Nupe-Nupe-Tako	nup	5152	nup
+	language	Nusa Laut	nul	5153	nul
+	language	Nusu	nuf	5154	nuf
+	language	Nuu-chah-nulth	nuk	5155	nuk
+	language	Nyabwa	nwb	5156	nwb
+	language	Nyaheun	nev	5157	nev
+	language	Nyahkur	cbn	5158	cbn
+	language	Nyakyusa-Ngonde	nyy	5159	nyy
+	language	Nyali	nlj	5160	nlj
+	language	Nyam	nmi	5161	nmi
+	language	Nyamal	nly	5162	nly
+	language	Nyambo	now	5163	now
+	language	Nyamusa-Molo	nwm	5164	nwm
+	language	Nyamwanga	mwn	5165	mwn
+	language	Nyamwezi	nym	5166	nym
+	language	Nyaneka	nyk	5167	nyk
+	language	Nyang'i	nyp	5168	nyp
+	language	Nyanga	nyj	5169	nyj
+	language	Nyanga-li	nyc	5170	nyc
+	language	Nyangatom	nnj	5171	nnj
+	language	Nyangbo	nyb	5172	nyb
+	language	Nyangga	nny	5173	nny
+	language	Nyangumarta	nna	5174	nna
+	language	Nyankole	nyn	5175	nyn
+	language	Nyankpa	yes	5176	yes
+	language	Nyarafolo Senoufo	sev	5177	sev
+	language	Nyaturu	rim	5178	rim
+	language	Nyaw	nyw	5179	nyw
+	language	Nyawaygi	nyt	5180	nyt
+	language	Nyemba	nba	5181	nba
+	language	Nyengo	nye	5182	nye
+	language	Nyenkha	neh	5183	neh
+	language	Nyeu	nyl	5184	nyl
+	language	Nyiha (Malawi)	nyr	5185	nyr
+	language	Nyiha (Tanzania)	nih	5186	nih
+	language	Nyika (Malawi and Zambia)	nkv	5187	nkv
+	language	Nyika (Tanzania)	nkt	5188	nkt
+	language	Nyikina	nyh	5189	nyh
+	language	Nyindrou	lid	5190	lid
+	language	Nyindu	nyg	5191	nyg
+	language	Nyishi	njz	5192	njz
+	language	Nyiyaparli	xny	5193	xny
+	language	Nyokon	nvo	5194	nvo
+	language	Nyole	nuj	5195	nuj
+	language	Nyong	muo	5196	muo
+	language	Nyore	nyd	5197	nyd
+	language	Nyoro	nyo	5198	nyo
+	language	Nyulnyul	nyv	5199	nyv
+	language	Nyungar	nys	5200	nys
+	language	Nyungwe	nyu	5201	nyu
+	language	NyÃĸlayu	yly	5202	yly
+	language	Nzadi	nzd	5203	nzd
+	language	Nzakambay	nzy	5204	nzy
+	language	Nzakara	nzk	5205	nzk
+	language	Nzanyi	nja	5206	nja
+	language	Nzima	nzi	5207	nzi
+	language	NÃĄ-Meo	neo	5208	neo
+	language	NÃĒlÃĒmwa-Nixumwak	nee	5209	nee
+	language	NÃŧpode Huitoto	hux	5210	hux
+	language	NĮng	ngh	5211	ngh
+	language	O'chi'chi'	xoc	5212	xoc
+	language	O'du	tyh	5213	tyh
+	language	Obanliku	bzy	5214	bzy
+	language	ObispeÃąo	obi	5215	obi
+	language	Oblo	obl	5216	obl
+	language	Obo Manobo	obo	5217	obo
+	language	Obokuitai	afz	5218	afz
+	language	Obolo	ann	5219	ann
+	language	Obulom	obu	5220	obu
+	language	Ocaina	oca	5221	oca
+	language	Occitan (post 1500), Occitan	oci	5222	oci	Occitan (post 1500)	oc	Occitan
+	language	Ocotepec Mixtec	mie	5223	mie
+	language	OcotlÃĄn Zapotec	zac	5224	zac
+	language	Od	odk	5225	odk
+	language	Odia	ory	5226	ory
+	language	Odiai	bhf	5227	bhf
+	language	Odoodee	kkc	5228	kkc
+	language	Odual	odu	5229	odu
+	language	Odut	oda	5230	oda
+	language	OfayÊ	opy	5231	opy
+	language	Official Aramaic (700-300 BCE)	arc	5232	arc
+	language	Ofo	ofo	5233	ofo
+	language	Ogbah	ogc	5234	ogc
+	language	Ogbia	ogb	5235	ogb
+	language	Ogbogolo	ogg	5236	ogg
+	language	Ogbronuagum	ogu	5237	ogu
+	language	Ogea	eri	5238	eri
+	language	Oirata	oia	5239	oia
+	language	Ojibwe, Ojibwa	oji	5240	oji	Ojibwe	oj	Ojibwa
+	language	OjitlÃĄn Chinantec	chj	5241	chj
+	language	Okanagan	oka	5242	oka
+	language	Oki-No-Erabu	okn	5243	okn
+	language	Okiek	oki	5244	oki
+	language	Oko-Eni-Osayen	oks	5245	oks
+	language	Oko-Juwoi	okj	5246	okj
+	language	Okobo	okb	5247	okb
+	language	Okodia	okd	5248	okd
+	language	Okolie	oie	5249	oie
+	language	Okolod	kqv	5250	kqv
+	language	Okpamheri	opa	5251	opa
+	language	Okpe (Northwestern Edo)	okx	5252	okx
+	language	Okpe (Southwestern Edo)	oke	5253	oke
+	language	Oksapmin	opm	5254	opm
+	language	Oku	oku	5255	oku
+	language	Old Aramaic (up to 700 BCE)	oar	5256	oar
+	language	Old Avar	oav	5257	oav
+	language	Old Breton	obt	5258	obt
+	language	Old Burmese	obr	5259	obr
+	language	Old Cham	ocm	5260	ocm
+	language	Old Chinese	och	5261	och
+	language	Old Cornish	oco	5262	oco
+	language	Old Dutch	odt	5263	odt
+	language	Old English (ca. 450-1100)	ang	5264	ang
+	language	Old French (842-ca. 1400)	fro	5265	fro
+	language	Old Frisian	ofs	5266	ofs
+	language	Old Georgian	oge	5267	oge
+	language	Old High German (ca. 750-1050)	goh	5268	goh
+	language	Old Hittite	oht	5269	oht
+	language	Old Hungarian	ohu	5270	ohu
+	language	Old Irish (to 900)	sga	5271	sga
+	language	Old Japanese	ojp	5272	ojp
+	language	Old Kentish Sign Language	okl	5273	okl
+	language	Old Khmer	okz	5274	okz
+	language	Old Korean (3rd-9th cent.)	oko	5275	oko
+	language	Old Lithuanian	olt	5276	olt
+	language	Old Malay	omy	5277	omy
+	language	Old Manipuri	omp	5278	omp
+	language	Old Marathi	omr	5279	omr
+	language	Old Mon	omx	5280	omx
+	language	Old Norse	non	5281	non
+	language	Old Nubian	onw	5282	onw
+	language	Old Ossetic	oos	5283	oos
+	language	Old Persian (ca. 600-400 B.C.)	peo	5284	peo
+	language	Old Provençal (to 1500)	pro	5285	pro
+	language	Old Russian	orv	5286	orv
+	language	Old Saxon	osx	5287	osx
+	language	Old Spanish	osp	5288	osp
+	language	Old Sundanese	osn	5289	osn
+	language	Old Tamil	oty	5290	oty
+	language	Old Tibetan	otb	5291	otb
+	language	Old Turkish	otk	5292	otk
+	language	Old Uighur	oui	5293	oui
+	language	Old Welsh	owl	5294	owl
+	language	Olekha	ole	5295	ole
+	language	Olkol	olk	5296	olk
+	language	Olo	ong	5297	ong
+	language	Oloma	olm	5298	olm
+	language	Olrat	olr	5299	olr
+	language	Olu'bo	lul	5300	lul
+	language	Olulumo-Ikom	iko	5301	iko
+	language	Oluta Popoluca	plo	5302	plo
+	language	Omagua	omg	5303	omg
+	language	Omaha-Ponca	oma	5304	oma
+	language	Omani Arabic	acx	5305	acx
+	language	Ombamba	mbm	5306	mbm
+	language	Ombo	oml	5307	oml
+	language	Ometepec Nahuatl	nht	5308	nht
+	language	Omi	omi	5309	omi
+	language	Omok	omk	5310	omk
+	language	Omotik	omt	5311	omt
+	language	Omurano	omu	5312	omu
+	language	Ona	ona	5313	ona
+	language	Oneida	one	5314	one
+	language	Ong	oog	5315	oog
+	language	Onin	oni	5316	oni
+	language	Onin Based Pidgin	onx	5317	onx
+	language	Onjob	onj	5318	onj
+	language	Ono	ons	5319	ons
+	language	Onobasulu	onn	5320	onn
+	language	Onondaga	ono	5321	ono
+	language	Ontenu	ont	5322	ont
+	language	Ontong Java	ojv	5323	ojv
+	language	Oorlams	oor	5324	oor
+	language	Opao	opo	5325	opo
+	language	Opata	opt	5326	opt
+	language	Orang Kanaq	orn	5327	orn
+	language	Orang Seletar	ors	5328	ors
+	language	Oraon Sadri	sdr	5329	sdr
+	language	OrejÃŗn	ore	5330	ore
+	language	Oring	org	5331	org
+	language	Oriya, Oriya (macrolanguage)	ori	5332	ori	Oriya	or	Oriya (macrolanguage)
+	language	Orizaba Nahuatl	nlv	5333	nlv
+	language	Orma	orc	5334	orc
+	language	Ormu	orz	5335	orz
+	language	Ormuri	oru	5336	oru
+	language	Oro	orx	5337	orx
+	language	Oro Win	orw	5338	orw
+	language	Oroch	oac	5339	oac
+	language	Oroha	ora	5340	ora
+	language	Orok	oaa	5341	oaa
+	language	Orokaiva	okv	5342	okv
+	language	Oroko	bdu	5343	bdu
+	language	Orokolo	oro	5344	oro
+	language	Oromo	orm	5345	orm	om
+	language	Oroqen	orh	5346	orh
+	language	Orowe	bpk	5347	bpk
+	language	Oruma	orr	5348	orr
+	language	Orya	ury	5349	ury
+	language	Osage	osa	5350	osa
+	language	Osatu	ost	5351	ost
+	language	Oscan	osc	5352	osc
+	language	Osing	osi	5353	osi
+	language	Ososo	oso	5354	oso
+	language	Ossetian, Ossetic	oss	5355	oss	os	Ossetian	Ossetic
+	language	Ot Danum	otd	5356	otd
+	language	Otank	uta	5357	uta
+	language	Oti	oti	5358	oti
+	language	Otoro	otr	5359	otr
+	language	Ottawa	otw	5360	otw
+	language	Ottoman Turkish (1500-1928)	ota	5361	ota
+	language	Otuho	lot	5362	lot
+	language	Otuke	otu	5363	otu
+	language	Ouma	oum	5364	oum
+	language	Oune	oue	5365	oue
+	language	Owa	stn	5366	stn
+	language	Owenia	wsr	5367	wsr
+	language	Owiniga	owi	5368	owi
+	language	Oy	oyb	5369	oyb
+	language	Oya'oya	oyy	5370	oyy
+	language	Oyda	oyd	5371	oyd
+	language	Oyster Bay Tasmanian	xpd	5372	xpd
+	language	Ozolotepec Zapotec	zao	5373	zao
+	language	Ozumacín Chinantec	chz	5374	chz
+	language	Pa Di	pdi	5375	pdi
+	language	Pa'a	pqa	5376	pqa
+	language	Pa'o Karen	blk	5377	blk
+	language	Pa-Hng	pha	5378	pha
+	language	Paakantyi	drl	5379	drl
+	language	Paama	pma	5380	pma
+	language	Paasaal	sig	5381	sig
+	language	Pacahuara	pcp	5382	pcp
+	language	Pacaraos Quechua	qvp	5383	qvp
+	language	Pacific Gulf Yupik	ems	5384	ems
+	language	Pacoh	pac	5385	pac
+	language	Padoe	pdo	5386	pdo
+	language	Paekche	pkc	5387	pkc
+	language	Paelignian	pgn	5388	pgn
+	language	Pagi	pgi	5389	pgi
+	language	Pagibete	pae	5390	pae
+	language	Pagu	pgu	5391	pgu
+	language	Pahanan Agta	apf	5392	apf
+	language	Pahari	phj	5393	phj
+	language	Pahari-Potwari	phr	5394	phr
+	language	Pahi	lgt	5395	lgt
+	language	Pahlavani	phv	5396	phv
+	language	Pahlavi	pal	5397	pal
+	language	Pai Tavytera	pta	5398	pta
+	language	PaicÃŽ	pri	5399	pri
+	language	Paipai	ppi	5400	ppi
+	language	Paite Chin	pck	5401	pck
+	language	Paiwan	pwn	5402	pwn
+	language	Pak-Tong	pkg	5403	pkg
+	language	Pakanha	pkn	5404	pkn
+	language	PakaÃĄsnovos	pav	5405	pav
+	language	Pakistan Sign Language	pks	5406	pks
+	language	Paku	pku	5407	pku
+	language	Paku Karen	jkp	5408	jkp
+	language	Pal	abw	5409	abw
+	language	Palaic	plq	5410	plq
+	language	Palaka Senoufo	plr	5411	plr
+	language	Palantla Chinantec	cpa	5412	cpa
+	language	Palauan	pau	5413	pau
+	language	Paleni	pnl	5414	pnl
+	language	Palenquero	pln	5415	pln
+	language	PalikÃēr	plu	5416	plu
+	language	Paliyan	pcf	5417	pcf
+	language	Pallanganmiddang	pmd	5418	pmd
+	language	Paloor	fap	5419	fap
+	language	Palu'e	ple	5420	ple
+	language	Paluan	plz	5421	plz
+	language	Palya Bareli	bpx	5422	bpx
+	language	Pam	pmn	5423	pmn
+	language	Pambia	pmb	5424	pmb
+	language	Pamona	pmf	5425	pmf
+	language	Pamosu	hih	5426	hih
+	language	Pampanga	pam	5427	pam
+	language	Pamplona Atta	att	5428	att
+	language	Pana (Burkina Faso)	pnq	5429	pnq
+	language	Pana (Central African Republic)	pnz	5430	pnz
+	language	Panamanian Sign Language	lsp	5431	lsp
+	language	Panamint	par	5432	par
+	language	Panao HuÃĄnuco Quechua	qxh	5433	qxh
+	language	PanarÃĄ	kre	5434	kre
+	language	Panasuan	psn	5435	psn
+	language	Panawa	pwb	5436	pwb
+	language	Pancana	pnp	5437	pnp
+	language	Panchpargania	tdb	5438	tdb
+	language	Pande	bkj	5439	bkj
+	language	Pangasinan	pag	5440	pag
+	language	Pangseng	pgs	5441	pgs
+	language	Pangu	png	5442	png
+	language	Pangutaran Sama	slm	5443	slm
+	language	Pangwa	pbr	5444	pbr
+	language	Pangwali	pgg	5445	pgg
+	language	Panim	pnr	5446	pnr
+	language	Paniya	pcg	5447	pcg
+	language	Panjabi, Punjabi	pan	5448	pan	pa	Panjabi	Punjabi
+	language	PankararÊ	pax	5449	pax
+	language	PankararÃē	paz	5450	paz
+	language	Pankhu	pkh	5451	pkh
+	language	Pannei	pnc	5452	pnc
+	language	Pano	mqz	5453	mqz
+	language	Panoan Katukína	knt	5454	knt
+	language	Panobo	pno	5455	pno
+	language	Panyi Bai	bfc	5456	bfc
+	language	Papantla Totonac	top	5457	top
+	language	Papapana	ppn	5458	ppn
+	language	Papar	dpp	5459	dpp
+	language	Papasena	pas	5460	pas
+	language	Papel	pbo	5461	pbo
+	language	Papi	ppe	5462	ppe
+	language	Papiamento	pap	5463	pap
+	language	Papora	ppu	5464	ppu
+	language	Papua New Guinean Sign Language	pgz	5465	pgz
+	language	Papuan Malay	pmy	5466	pmy
+	language	Papuma	ppm	5467	ppm
+	language	Parachi	prc	5468	prc
+	language	Paraguayan Guaraní	gug	5469	gug
+	language	Paraguayan Sign Language	pys	5470	pys
+	language	ParakanÃŖ	pak	5471	pak
+	language	Paranan	prf	5472	prf
+	language	ParanawÃĄt	paf	5473	paf
+	language	Paraujano	pbg	5474	pbg
+	language	Parauk	prk	5475	prk
+	language	Parawen	prw	5476	prw
+	language	Pardhan	pch	5477	pch
+	language	Pardhi	pcl	5478	pcl
+	language	Pare	ppt	5479	ppt
+	language	Parecís	pab	5480	pab
+	language	Parenga	pcj	5481	pcj
+	language	Parkari Koli	kvx	5482	kvx
+	language	Parkwa	pbi	5483	pbi
+	language	Parsi-Dari	prd	5484	prd
+	language	Parthian	xpr	5485	xpr
+	language	Parya	paq	5486	paq
+	language	ParÃĄ ArÃĄra	aap	5487	aap
+	language	ParÃĄ GaviÃŖo	gvp	5488	gvp
+	language	Pashto, Pushto	pus	5489	pus	Pashto	ps	Pushto
+	language	Pasi	psq	5490	psq
+	language	Pass Valley Yali	yac	5491	yac
+	language	Patamona	pbc	5492	pbc
+	language	Patani	ptn	5493	ptn
+	language	PataxÃŗ HÃŖ-Ha-HÃŖe	pth	5494	pth
+	language	Patep	ptp	5495	ptp
+	language	Pathiya	pty	5496	pty
+	language	Patpatar	gfk	5497	gfk
+	language	Pattani	lae	5498	lae
+	language	Pattani Malay	mfa	5499	mfa
+	language	Pattapu	ptq	5500	ptq
+	language	Patwin	pwi	5501	pwi
+	language	Paulohi	plh	5502	plh
+	language	Paumarí	pad	5503	pad
+	language	Paunaka	pnk	5504	pnk
+	language	Pauri Bareli	bfb	5505	bfb
+	language	Pauserna	psm	5506	psm
+	language	Pawaia	pwa	5507	pwa
+	language	Pawnee	paw	5508	paw
+	language	Paynamar	pmr	5509	pmr
+	language	Pazeh	pzh	5510	pzh
+	language	Pe	pai	5511	pai
+	language	Pear	pcb	5512	pcb
+	language	Pech	pay	5513	pay
+	language	Pecheneg	xpc	5514	xpc
+	language	Pedi	nso	5515	nso
+	language	Pei	ppq	5516	ppq
+	language	Pekal	pel	5517	pel
+	language	Pela	bxd	5518	bxd
+	language	Pele-Ata	ata	5519	ata
+	language	Pelende	ppp	5520	ppp
+	language	Pemon	aoc	5521	aoc
+	language	Penang Sign Language	psg	5522	psg
+	language	Penchal	pek	5523	pek
+	language	Pendau	ums	5524	ums
+	language	Pengo	peg	5525	peg
+	language	Pennsylvania German	pdc	5526	pdc
+	language	Penrhyn	pnh	5527	pnh
+	language	Pentlatch	ptw	5528	ptw
+	language	Perai	wet	5529	wet
+	language	Peranakan Indonesian	pea	5530	pea
+	language	Pere	pfe	5531	pfe
+	language	Peripheral Mongolian	mvf	5532	mvf
+	language	Pero	pip	5533	pip
+	language	Persian, Persian (Farsi)	fas	5534	fas	Persian	fa	Persian (Farsi)	per
+	language	Peruvian Sign Language	prl	5535	prl
+	language	Pesse	pze	5536	pze
+	language	Petapa Zapotec	zpe	5537	zpe
+	language	Petats	pex	5538	pex
+	language	Petjo	pey	5539	pey
+	language	PeÃąoles Mixtec	mil	5540	mil
+	language	Pfaelzisch	pfl	5541	pfl
+	language	Phai	prt	5542	prt
+	language	Phake	phk	5543	phk
+	language	Phala	ypa	5544	ypa
+	language	Phalura	phl	5545	phl
+	language	Phana'	phq	5546	phq
+	language	Phangduwali	phw	5547	phw
+	language	Phende	pem	5548	pem
+	language	Philippine Sign Language	psp	5549	psp
+	language	Phimbi	phm	5550	phm
+	language	Phoenician	phn	5551	phn
+	language	Phola	ypg	5552	ypg
+	language	Pholo	yip	5553	yip
+	language	Phom Naga	nph	5554	nph
+	language	Phong-Kniang	pnx	5555	pnx
+	language	Phrae Pwo Karen	kjt	5556	kjt
+	language	Phrygian	xpg	5557	xpg
+	language	Phu Thai	pht	5558	pht
+	language	Phuan	phu	5559	phu
+	language	Phudagi	phd	5560	phd
+	language	Phuie	pug	5561	pug
+	language	Phukha	phh	5562	phh
+	language	Phuma	ypm	5563	ypm
+	language	Phunoi	pho	5564	pho
+	language	Phuong	phg	5565	phg
+	language	Phupa	ypp	5566	ypp
+	language	Phupha	yph	5567	yph
+	language	Phuza	ypz	5568	ypz
+	language	Piamatsina	ptr	5569	ptr
+	language	Piame	pin	5570	pin
+	language	Piapoco	pio	5571	pio
+	language	Piaroa	pid	5572	pid
+	language	Picard	pcd	5573	pcd
+	language	Pichis AshÊninka	cpu	5574	cpu
+	language	Pictish	xpi	5575	xpi
+	language	Pidgin Delaware	dep	5576	dep
+	language	Piemontese	pms	5577	pms
+	language	Pijao	pij	5578	pij
+	language	Pije	piz	5579	piz
+	language	Pijin	pis	5580	pis
+	language	PilagÃĄ	plg	5581	plg
+	language	Pileni	piv	5582	piv
+	language	Pima Bajo	pia	5583	pia
+	language	Pimbwe	piw	5584	piw
+	language	Pinai-Hagahai	pnn	5585	pnn
+	language	Pindiini	pti	5586	pti
+	language	Pingelapese	pif	5587	pif
+	language	Pinigura	pnv	5588	pnv
+	language	Pinjarup	pnj	5589	pnj
+	language	Pinji	pic	5590	pic
+	language	Pinotepa Nacional Mixtec	mio	5591	mio
+	language	Pintupi-Luritja	piu	5592	piu
+	language	Pinyin	pny	5593	pny
+	language	Pipil	ppl	5594	ppl
+	language	PirahÃŖ	myp	5595	myp
+	language	Piratapuyo	pir	5596	pir
+	language	Pirlatapa	bxi	5597	bxi
+	language	Piro	pie	5598	pie
+	language	Pirriya	xpa	5599	xpa
+	language	Pisabo	pig	5600	pig
+	language	Pisaflores Tepehua	tpp	5601	tpp
+	language	Piscataway	psy	5602	psy
+	language	Pisidian	xps	5603	xps
+	language	Pitcairn-Norfolk	pih	5604	pih
+	language	Pite Sami	sje	5605	sje
+	language	Piti	pcn	5606	pcn
+	language	Pitjantjatjara	pjt	5607	pjt
+	language	Pitta Pitta	pit	5608	pit
+	language	Piu	pix	5609	pix
+	language	Piya-Kwonci	piy	5610	piy
+	language	Plains Cree	crk	5611	crk
+	language	Plains Indian Sign Language	psd	5612	psd
+	language	Plains Miwok	pmw	5613	pmw
+	language	Plapo Krumen	ktj	5614	ktj
+	language	Plateau Malagasy	plt	5615	plt
+	language	Plautdietsch	pdt	5616	pdt
+	language	Playero	gob	5617	gob
+	language	Pnar	pbv	5618	pbv
+	language	Pochuri Naga	npo	5619	npo
+	language	Pochutec	xpo	5620	xpo
+	language	Podena	pdn	5621	pdn
+	language	Pogolo	poy	5622	poy
+	language	Pohnpeian	pon	5623	pon
+	language	PokangÃĄ	pok	5624	pok
+	language	Poke	pof	5625	pof
+	language	Pokomo	pkb	5626	pkb
+	language	Polabian	pox	5627	pox
+	language	Polari	pld	5628	pld
+	language	Polish	pol	5629	pol	pl
+	language	Polish Sign Language	pso	5630	pso
+	language	Polonombauk	plb	5631	plb
+	language	Pom	pmo	5632	pmo
+	language	Pomo	pmm	5633	pmm
+	language	Ponam	ncc	5634	ncc
+	language	Ponosakan	pns	5635	pns
+	language	Pontic	pnt	5636	pnt
+	language	Ponyo-Gongwang Naga	npg	5637	npg
+	language	Popti'	jac	5638	jac
+	language	Poqomam	poc	5639	poc
+	language	Poqomchi'	poh	5640	poh
+	language	Porohanon	prh	5641	prh
+	language	Port Sandwich	psw	5642	psw
+	language	Port Sorell Tasmanian	xpl	5643	xpl
+	language	Port Vato	ptv	5644	ptv
+	language	Portuguese	por	5645	por	pt
+	language	Portuguese Sign Language	psr	5646	psr
+	language	Potawatomi	pot	5647	pot
+	language	PotiguÃĄra	pog	5648	pog
+	language	Pottangi Ollar Gadaba	gdb	5649	gdb
+	language	Poumei Naga	pmx	5650	pmx
+	language	Pouye	bye	5651	bye
+	language	Powari	pwr	5652	pwr
+	language	Powhatan	pim	5653	pim
+	language	PoyanÃĄwa	pyn	5654	pyn
+	language	Prasuni	prn	5655	prn
+	language	Primitive Irish	pgl	5656	pgl
+	language	Principense	pre	5657	pre
+	language	Providencia Sign Language	prz	5658	prz
+	language	Prussian	prg	5659	prg
+	language	Psikye	kvj	5660	kvj
+	language	Pu-Xian Chinese	cpx	5661	cpx
+	language	Puare	pux	5662	pux
+	language	Pudtol Atta	atp	5663	atp
+	language	Puebla Mazatec	pbm	5664	pbm
+	language	Puelche	pue	5665	pue
+	language	Puerto Rican Sign Language	psl	5666	psl
+	language	Puimei Naga	npu	5667	npu
+	language	Puinave	pui	5668	pui
+	language	Pukapuka	pkp	5669	pkp
+	language	Pulaar	fuc	5670	fuc
+	language	Pulabu	pup	5671	pup
+	language	Pular	fuf	5672	fuf
+	language	Puluwatese	puw	5673	puw
+	language	Puma	pum	5674	pum
+	language	Pumpokol	xpm	5675	xpm
+	language	PumÊ	yae	5676	yae
+	language	Punan Aput	pud	5677	pud
+	language	Punan Bah-Biau	pna	5678	pna
+	language	Punan Batu 1	pnm	5679	pnm
+	language	Punan Merah	puf	5680	puf
+	language	Punan Merap	puc	5681	puc
+	language	Punan Tubu	puj	5682	puj
+	language	Punic	xpu	5683	xpu
+	language	Puno Quechua	qxp	5684	qxp
+	language	Punthamara	xpt	5685	xpt
+	language	Punu	puu	5686	puu
+	language	Puoc	puo	5687	puo
+	language	Puquina	puq	5688	puq
+	language	Puragi	pru	5689	pru
+	language	Purari	iar	5690	iar
+	language	Purepecha	tsz	5691	tsz
+	language	Puri	prr	5692	prr
+	language	Purik	prx	5693	prx
+	language	PurisimeÃąo	puy	5694	puy
+	language	Puroik	suv	5695	suv
+	language	PuruborÃĄ	pur	5696	pur
+	language	Purum	pub	5697	pub
+	language	Putai	mfl	5698	mfl
+	language	Putoh	put	5699	put
+	language	Putukwam	afe	5700	afe
+	language	Puyo	xpy	5701	xpy
+	language	Puyo-Paekche	xpp	5702	xpp
+	language	Puyuma	pyu	5703	pyu
+	language	Pwaamei	pme	5704	pme
+	language	PwapwÃĸ	pop	5705	pop
+	language	Pwo Eastern Karen	kjp	5706	kjp
+	language	Pwo Northern Karen	pww	5707	pww
+	language	Pwo Western Karen	pwo	5708	pwo
+	language	Pyapun	pcw	5709	pcw
+	language	Pye Krumen	pye	5710	pye
+	language	Pyen	pyy	5711	pyy
+	language	Pyu (Myanmar)	pyx	5712	pyx
+	language	Pyu (Papua New Guinea)	pby	5713	pby
+	language	PÃĄez	pbb	5714	pbb
+	language	PÃĄÃĄfang	pfa	5715	pfa
+	language	Päri	lkr	5716	lkr
+	language	PÊmono	pev	5717	pev
+	language	PÊvÊ	lme	5718	lme
+	language	PÃļkoot	pko	5719	pko
+	language	Pāli, Pali	pli	5720	pli	Pāli	pi	Pali
+	language	Q'anjob'al	kjb	5721	kjb
+	language	Qabiao	laq	5722	laq
+	language	Qaqet	byx	5723	byx
+	language	Qashqa'i	qxq	5724	qxq
+	language	Qatabanian	xqt	5725	xqt
+	language	Qau	gqu	5726	gqu
+	language	Qawasqar	alc	5727	alc
+	language	Qila Muji	ymq	5728	ymq
+	language	Qimant	ahg	5729	ahg
+	language	Qiubei Zhuang	zqe	5730	zqe
+	language	Quapaw	qua	5731	qua
+	language	Quebec Sign Language	fcs	5732	fcs
+	language	Quechan	yum	5733	yum
+	language	Quechua	que	5734	que	qu
+	language	Quenya	qya	5735	qya
+	language	QuerÊtaro Otomi	otq	5736	otq
+	language	Quetzaltepec Mixe	pxm	5737	pxm
+	language	Queyu	qvy	5738	qvy
+	language	Quiavicuzas Zapotec	zpj	5739	zpj
+	language	Quileute	qui	5740	qui
+	language	Quinault	qun	5741	qun
+	language	Quinqui	quq	5742	quq
+	language	Quioquitani-Quierí Zapotec	ztq	5743	ztq
+	language	Quiotepec Chinantec	chq	5744	chq
+	language	Quiripi	qyp	5745	qyp
+	language	Rabha	rah	5746	rah
+	language	Rade	rad	5747	rad
+	language	Raetic	xrr	5748	xrr
+	language	Rahambuu	raz	5749	raz
+	language	Rajah Kabunsuwan Manobo	mqk	5750	mqk
+	language	Rajasthani	raj	5751	raj
+	language	Rajbanshi	rjs	5752	rjs
+	language	Raji	rji	5753	rji
+	language	Rajong	rjg	5754	rjg
+	language	Rajput Garasia	gra	5755	gra
+	language	Rakahanga-Manihiki	rkh	5756	rkh
+	language	Rakhine	rki	5757	rki
+	language	Ralte	ral	5758	ral
+	language	Rama	rma	5759	rma
+	language	Ramoaaina	rai	5760	rai
+	language	Ramopa	kjx	5761	kjx
+	language	Rampi	lje	5762	lje
+	language	Rana Tharu	thr	5763	thr
+	language	Rang	rax	5764	rax
+	language	Rangi	lag	5765	lag
+	language	Rangkas	rgk	5766	rgk
+	language	Ranglong	rnl	5767	rnl
+	language	Rangpuri	rkt	5768	rkt
+	language	Rao	rao	5769	rao
+	language	Rapa	ray	5770	ray
+	language	Rapanui	rap	5771	rap
+	language	Rapoisi	kyx	5772	kyx
+	language	Rapting	rpt	5773	rpt
+	language	Rara Bakati'	lra	5774	lra
+	language	Rarotongan	rar	5775	rar
+	language	Rasawa	rac	5776	rac
+	language	Ratagnon	btn	5777	btn
+	language	Ratahan	rth	5778	rth
+	language	Rathawi	rtw	5779	rtw
+	language	Rathwi Bareli	bgd	5780	bgd
+	language	Raute	rau	5781	rau
+	language	Ravula	yea	5782	yea
+	language	Rawa	rwo	5783	rwo
+	language	Rawang	raw	5784	raw
+	language	Rawat	jnl	5785	jnl
+	language	Rawngtu Chin	weu	5786	weu
+	language	Rawo	rwa	5787	rwa
+	language	RayÃŗn Zoque	zor	5788	zor
+	language	Razajerdi	rat	5789	rat
+	language	Red Gelao	gir	5790	gir
+	language	Reel	atu	5791	atu
+	language	Rejang	rej	5792	rej
+	language	Rejang Kayan	ree	5793	ree
+	language	Reli	rei	5794	rei
+	language	Rema	bow	5795	bow
+	language	Rembarrnga	rmb	5796	rmb
+	language	Rembong	reb	5797	reb
+	language	Remo	rem	5798	rem
+	language	Remontado Dumagat	agv	5799	agv
+	language	Rempi	rmp	5800	rmp
+	language	Remun	lkj	5801	lkj
+	language	Rendille	rel	5802	rel
+	language	Rengao	ren	5803	ren
+	language	Rennell-Bellona	mnv	5804	mnv
+	language	Repanbitip	rpn	5805	rpn
+	language	Rer Bare	rer	5806	rer
+	language	Rerau	rea	5807	rea
+	language	Rerep	pgk	5808	pgk
+	language	Reshe	res	5809	res
+	language	Resígaro	rgr	5810	rgr
+	language	Retta	ret	5811	ret
+	language	Reyesano	rey	5812	rey
+	language	Riang (India)	ria	5813	ria
+	language	Riang Lai	yin	5814	yin
+	language	Riang Lang	ril	5815	ril
+	language	Riantana	ran	5816	ran
+	language	Ribun	rir	5817	rir
+	language	Rigwe	iri	5818	iri
+	language	Rikbaktsa	rkb	5819	rkb
+	language	Rinconada Bikol	bto	5820	bto
+	language	RincÃŗn Zapotec	zar	5821	zar
+	language	Ringgou	rgu	5822	rgu
+	language	Ririo	rri	5823	rri
+	language	Rishiwa	rsw	5824	rsw
+	language	Ritharrngu	rit	5825	rit
+	language	Riung	riu	5826	riu
+	language	Riverain Sango	snj	5827	snj
+	language	Rmeet	lbn	5828	lbn
+	language	Rogo	rod	5829	rod
+	language	Rohingya	rhg	5830	rhg
+	language	Roma	rmm	5831	rmm
+	language	Romagnol	rgn	5832	rgn
+	language	Romam	rmx	5833	rmx
+	language	Romanian	ron	5834	ron	rum	ro
+	language	Romanian Sign Language	rms	5835	rms
+	language	Romano-Greek	rge	5836	rge
+	language	Romano-Serbian	rsb	5837	rsb
+	language	Romanova	rmv	5838	rmv
+	language	Romansh	roh	5839	roh	rm
+	language	Romany	rom	5840	rom
+	language	Romblomanon	rol	5841	rol
+	language	Rombo	rof	5842	rof
+	language	Romkun	rmk	5843	rmk
+	language	Ron	cla	5844	cla
+	language	Ronga	rng	5845	rng
+	language	Rongga	ror	5846	ror
+	language	Rongmei Naga	nbu	5847	nbu
+	language	Rongpo	rnp	5848	rnp
+	language	Ronji	roe	5849	roe
+	language	Roon	rnn	5850	rnn
+	language	Roria	rga	5851	rga
+	language	Rotokas	roo	5852	roo
+	language	Rotuman	rtm	5853	rtm
+	language	Roviana	rug	5854	rug
+	language	Ruching Palaung	pce	5855	pce
+	language	Rudbari	rdb	5856	rdb
+	language	Rufiji	rui	5857	rui
+	language	Ruga	ruh	5858	ruh
+	language	Rukai	dru	5859	dru
+	language	Ruma	ruz	5860	ruz
+	language	Rumai Palaung	rbb	5861	rbb
+	language	Rumu	klq	5862	klq
+	language	Rundi, Kirundi	run	5863	run	Rundi	rn	Kirundi
+	language	Runga	rou	5864	rou
+	language	Rungtu Chin	rtc	5865	rtc
+	language	Rungus	drg	5866	drg
+	language	Rungwa	rnw	5867	rnw
+	language	Russia Buriat	bxr	5868	bxr
+	language	Russian	rus	5869	rus	ru
+	language	Russian Sign Language	rsl	5870	rsl
+	language	Rusyn	rue	5871	rue
+	language	Ruthenian	rsk	5872	rsk
+	language	Rutul	rut	5873	rut
+	language	Ruuli	ruc	5874	ruc
+	language	Ruund	rnd	5875	rnd
+	language	Ruwila	rwl	5876	rwl
+	language	Rwa	rwk	5877	rwk
+	language	Rwandan Sign Language	rsn	5878	rsn
+	language	RÊunion Creole French	rcf	5879	rcf
+	language	Rāziá¸ĨÄĢ	rzh	5880	rzh
+	language	S'gaw Karen	ksw	5881	ksw
+	language	Sa	sax	5882	sax
+	language	Sa'a	apb	5883	apb
+	language	Sa'ban	snv	5884	snv
+	language	Sa'och	scq	5885	scq
+	language	Saafi-Saafi	sav	5886	sav
+	language	Saam	raq	5887	raq
+	language	Saamia	lsm	5888	lsm
+	language	Saaroa	sxr	5889	sxr
+	language	Saba	saa	5890	saa
+	language	Sabaean	xsa	5891	xsa
+	language	Sabah Bisaya	bsy	5892	bsy
+	language	Sabah Malay	msi	5893	msi
+	language	SabanÃĒ	sae	5894	sae
+	language	Sabaot	spy	5895	spy
+	language	Sabine	sbv	5896	sbv
+	language	Sabu	hvn	5897	hvn
+	language	SabÃŧm	sbo	5898	sbo
+	language	Sacapulteco	quv	5899	quv
+	language	Sadri	sck	5900	sck
+	language	Saek	skb	5901	skb
+	language	Saep	spd	5902	spd
+	language	Safaliba	saf	5903	saf
+	language	Safeyoka	apz	5904	apz
+	language	Safwa	sbk	5905	sbk
+	language	Sagala	sbm	5906	sbm
+	language	Sagalla	tga	5907	tga
+	language	Saho	ssy	5908	ssy
+	language	Sahu	saj	5909	saj
+	language	Saidi Arabic	aec	5910	aec
+	language	Saint Lucian Creole French	acf	5911	acf
+	language	Saisiyat	xsy	5912	xsy
+	language	Sajalong	sjl	5913	sjl
+	language	Sajau Basap	sjb	5914	sjb
+	language	Sakachep	sch	5915	sch
+	language	Sakalava Malagasy	skg	5916	skg
+	language	Sakao	sku	5917	sku
+	language	Sakata	skt	5918	skt
+	language	Sake	sak	5919	sak
+	language	SakirabiÃĄ	skf	5920	skf
+	language	Sakizaya	szy	5921	szy
+	language	Sala	shq	5922	shq
+	language	Salampasu	slx	5923	slx
+	language	Salar	slr	5924	slr
+	language	Salas	sgu	5925	sgu
+	language	Salasaca Highland Quichua	qxl	5926	qxl
+	language	Salawati	xmx	5927	xmx
+	language	Saleman	sau	5928	sau
+	language	Saliba	sbe	5929	sbe
+	language	Salinan	sln	5930	sln
+	language	Sallands	sdz	5931	sdz
+	language	Salt-Yui	sll	5932	sll
+	language	Saluan	loe	5933	loe
+	language	SalumÃĄ	slj	5934	slj
+	language	Salvadoran Sign Language	esn	5935	esn
+	language	Sam	snx	5936	snx
+	language	Samaritan	smp	5937	smp
+	language	Samaritan Aramaic	sam	5938	sam
+	language	Samarokena	tmj	5939	tmj
+	language	Samatao	ysd	5940	ysd
+	language	Samay	syx	5941	syx
+	language	Samba	smx	5942	smx
+	language	Samba Daka	ccg	5943	ccg
+	language	Samba Leko	ndi	5944	ndi
+	language	Sambal	xsb	5945	xsb
+	language	Sambalpuri	spv	5946	spv
+	language	Sambe	xab	5947	xab
+	language	Samberigi	ssx	5948	ssx
+	language	Samburu	saq	5949	saq
+	language	Samei	smh	5950	smh
+	language	Samo	smq	5951	smq
+	language	Samoan	smo	5952	smo	sm
+	language	Samogitian	sgs	5953	sgs
+	language	Samosa	swm	5954	swm
+	language	Sampang	rav	5955	rav
+	language	Samre	sxm	5956	sxm
+	language	Samtao	stu	5957	stu
+	language	Samvedi	smv	5958	smv
+	language	San Agustín Mixtepec Zapotec	ztm	5959	ztm
+	language	San Baltazar Loxicha Zapotec	zpx	5960	zpx
+	language	San Blas Kuna	cuk	5961	cuk
+	language	San Dionisio Del Mar Huave	hve	5962	hve
+	language	San Felipe Otlaltepec Popoloca	pow	5963	pow
+	language	San Francisco Del Mar Huave	hue	5964	hue
+	language	San Francisco Matlatzinca	mat	5965	mat
+	language	San JerÃŗnimo TecÃŗatl Mazatec	maa	5966	maa
+	language	San Juan Atzingo Popoloca	poe	5967	poe
+	language	San Juan Colorado Mixtec	mjc	5968	mjc
+	language	San Juan Teita Mixtec	xtj	5969	xtj
+	language	San Luís Temalacayuca Popoloca	pps	5970	pps
+	language	San Marcos Tlacoyalco Popoloca	pls	5971	pls
+	language	San Martín Itunyoso Triqui	trq	5972	trq
+	language	San Martín Quechua	qvs	5973	qvs
+	language	San Mateo Del Mar Huave	huv	5974	huv
+	language	San Miguel Creole French	scf	5975	scf
+	language	San Miguel El Grande Mixtec	mig	5976	mig
+	language	San Miguel Piedras Mixtec	xtp	5977	xtp
+	language	San Pedro Amuzgos Amuzgo	azg	5978	azg
+	language	San Pedro Quiatoni Zapotec	zpf	5979	zpf
+	language	San Salvador Kongo	kwy	5980	kwy
+	language	San Vicente CoatlÃĄn Zapotec	zpt	5981	zpt
+	language	Sanaani Arabic	ayn	5982	ayn
+	language	SanapanÃĄ	spn	5983	spn
+	language	Sandawe	sad	5984	sad
+	language	Sanga (Democratic Republic of Congo)	sng	5985	sng
+	language	Sanga (Nigeria)	xsn	5986	xsn
+	language	Sanggau	scg	5987	scg
+	language	Sangil	snl	5988	snl
+	language	Sangir	sxn	5989	sxn
+	language	Sangisari	sgr	5990	sgr
+	language	Sangkong	sgk	5991	sgk
+	language	Sanglechi	sgy	5992	sgy
+	language	Sango	sag	5993	sag	sg
+	language	Sangtam Naga	nsa	5994	nsa
+	language	Sangu (Gabon)	snq	5995	snq
+	language	Sangu (Tanzania)	sbp	5996	sbp
+	language	Sani	ysn	5997	ysn
+	language	Sanie	ysy	5998	ysy
+	language	Saniyo-Hiyewe	sny	5999	sny
+	language	Sankaran Maninka	msc	6000	msc
+	language	Sansi	ssi	6001	ssi
+	language	Sanskrit (Saṁskṛta), Sanskrit	san	6002	san	Sanskrit (Saṁskṛta)	sa	Sanskrit
+	language	Santa Ana de Tusi Pasco Quechua	qxt	6003	qxt
+	language	Santa Catarina Albarradas Zapotec	ztn	6004	ztn
+	language	Santa InÊs Ahuatempan Popoloca	pca	6005	pca
+	language	Santa InÊs Yatzechi Zapotec	zpn	6006	zpn
+	language	Santa Lucía Monteverde Mixtec	mdv	6007	mdv
+	language	Santa María Del Mar Huave	hvv	6008	hvv
+	language	Santa María La Alta Nahuatl	nhz	6009	nhz
+	language	Santa María Quiegolani Zapotec	zpi	6010	zpi
+	language	Santa María Zacatepec Mixtec	mza	6011	mza
+	language	Santa Teresa Cora	cok	6012	cok
+	language	Santali	sat	6013	sat
+	language	Santiago Xanica Zapotec	zpr	6014	zpr
+	language	Santiago del Estero Quichua	qus	6015	qus
+	language	Santo Domingo Albarradas Zapotec	zas	6016	zas
+	language	SanumÃĄ	xsu	6017	xsu
+	language	Saparua	spr	6018	spr
+	language	Sapo	krn	6019	krn
+	language	Saponi	spi	6020	spi
+	language	Saposa	sps	6021	sps
+	language	Sapuan	spu	6022	spu
+	language	SapÊ	spc	6023	spc
+	language	Sar	mwm	6024	mwm
+	language	Sara	sre	6025	sre
+	language	Sara Kaba	sbz	6026	sbz
+	language	Sara Kaba Deme	kwg	6027	kwg
+	language	Sara Kaba NÃĄÃ 	kwv	6028	kwv
+	language	Saraiki	skr	6029	skr
+	language	Saramaccan	srm	6030	srm
+	language	Sarangani Blaan	bps	6031	bps
+	language	Sarangani Manobo	mbs	6032	mbs
+	language	Sarasira	zsa	6033	zsa
+	language	Saraveca	sar	6034	sar
+	language	Sardinian	srd	6035	srd	sc
+	language	Sari	asj	6036	asj
+	language	Sarikoli	srh	6037	srh
+	language	Sarli	sdf	6038	sdf
+	language	Sarsi	srs	6039	srs
+	language	Sartang	onp	6040	onp
+	language	Sarua	swy	6041	swy
+	language	Sarudu	sdu	6042	sdu
+	language	Saruga	sra	6043	sra
+	language	Sasak	sas	6044	sas
+	language	Sasaru	sxs	6045	sxs
+	language	Sassarese Sardinian	sdc	6046	sdc
+	language	Satawalese	stw	6047	stw
+	language	Saterfriesisch	stq	6048	stq
+	language	SaterÊ-MawÊ	mav	6049	mav
+	language	Saudi Arabian Sign Language	sdl	6050	sdl
+	language	Sauraseni Prākrit	psu	6051	psu
+	language	Saurashtra	saz	6052	saz
+	language	Sauri	srt	6053	srt
+	language	Sauria Paharia	mjt	6054	mjt
+	language	Sause	sao	6055	sao
+	language	Sausi	ssj	6056	ssj
+	language	Savi	sdg	6057	sdg
+	language	Savosavo	svs	6058	svs
+	language	Sawai	szw	6059	szw
+	language	Saweru	swr	6060	swr
+	language	Sawi	saw	6061	saw
+	language	Sawila	swt	6062	swt
+	language	Sawknah	swn	6063	swn
+	language	Saxwe Gbe	sxw	6064	sxw
+	language	Saya	say	6065	say
+	language	Sayula Popoluca	pos	6066	pos
+	language	Scots	sco	6067	sco
+	language	Scythian	xsc	6068	xsc
+	language	Sea Island Creole English	gul	6069	gul
+	language	Seba	kdg	6070	kdg
+	language	Sebat Bet Gurage	sgw	6071	sgw
+	language	Seberuang	sbx	6072	sbx
+	language	Sebop	sib	6073	sib
+	language	Sechelt	sec	6074	sec
+	language	Secoya	sey	6075	sey
+	language	Sedang	sed	6076	sed
+	language	Sediq	trv	6077	trv
+	language	Sedoa	tvw	6078	tvw
+	language	Seeku	sos	6079	sos
+	language	Segai	sge	6080	sge
+	language	Segeju	seg	6081	seg
+	language	Seget	sbg	6082	sbg
+	language	Sehwi	sfw	6083	sfw
+	language	Seimat	ssg	6084	ssg
+	language	Seit-Kaitetu	hik	6085	hik
+	language	Sekani	sek	6086	sek
+	language	Sekapan	skp	6087	skp
+	language	Sekar	skz	6088	skz
+	language	Seke (Nepal)	skj	6089	skj
+	language	Seke (Vanuatu)	ske	6090	ske
+	language	Sekele	vaj	6091	vaj
+	language	Seki	syi	6092	syi
+	language	Seko Padang	skx	6093	skx
+	language	Seko Tengah	sko	6094	sko
+	language	Sekpele	lip	6095	lip
+	language	Selangor Sign Language	kgi	6096	kgi
+	language	Selaru	slu	6097	slu
+	language	Selayar	sly	6098	sly
+	language	Selee	snw	6099	snw
+	language	Selepet	spl	6100	spl
+	language	Selian	sxl	6101	sxl
+	language	Selkup	sel	6102	sel
+	language	Selungai Murut	slg	6103	slg
+	language	Seluwasan	sws	6104	sws
+	language	Semai	sea	6105	sea
+	language	Semandang	sdq	6106	sdq
+	language	Semaq Beri	szc	6107	szc
+	language	Sembakung Murut	sbr	6108	sbr
+	language	Semelai	sza	6109	sza
+	language	Semimi	etz	6110	etz
+	language	Semnam	ssm	6111	ssm
+	language	Semnani	smy	6112	smy
+	language	Sempan	xse	6113	xse
+	language	Sena	seh	6114	seh
+	language	Senara SÊnoufo	seq	6115	seq
+	language	Senaya	syn	6116	syn
+	language	Sene	sej	6117	sej
+	language	Seneca	see	6118	see
+	language	Sened	sds	6119	sds
+	language	Sengele	szg	6120	szg
+	language	Senggi	snu	6121	snu
+	language	Sengo	spk	6122	spk
+	language	Sengseng	ssz	6123	ssz
+	language	Senhaja De Srair	sjs	6124	sjs
+	language	Sensi	sni	6125	sni
+	language	Sentani	set	6126	set
+	language	Senthang Chin	sez	6127	sez
+	language	Sentinel	std	6128	std
+	language	Sepa (Indonesia)	spb	6129	spb
+	language	Sepa (Papua New Guinea)	spe	6130	spe
+	language	Sepik Iwam	iws	6131	iws
+	language	Sera	sry	6132	sry
+	language	Serbian	srp	6133	srp	scc	sr
+	language	Serbo-Croatian	hbs	6134	hbs
+	language	Sere	swf	6135	swf
+	language	Serer	srr	6136	srr
+	language	Seri	sei	6137	sei
+	language	Serili	sve	6138	sve
+	language	Seroa	kqu	6139	kqu
+	language	Serrano	ser	6140	ser
+	language	Serua	srw	6141	srw
+	language	Serudung Murut	srk	6142	srk
+	language	Serui-Laut	seu	6143	seu
+	language	Seselwa Creole French	crs	6144	crs
+	language	Seta	stf	6145	stf
+	language	Setaman	stm	6146	stm
+	language	Seti	sbi	6147	sbi
+	language	Settla	sta	6148	sta
+	language	Severn Ojibwa	ojs	6149	ojs
+	language	Sewa Bay	sew	6150	sew
+	language	Seychelles Sign Language	lsw	6151	lsw
+	language	Seze	sze	6152	sze
+	language	Sha	scw	6153	scw
+	language	Shabak	sdb	6154	sdb
+	language	Shahmirzadi	srz	6155	srz
+	language	Shahrudi	shm	6156	shm
+	language	Shall-Zwall	sha	6157	sha
+	language	Shama-Sambuga	sqa	6158	sqa
+	language	Shamang	xsh	6159	xsh
+	language	Shambala	ksb	6160	ksb
+	language	Shan	shn	6161	shn
+	language	Shanenawa	swo	6162	swo
+	language	Shanga	sho	6163	sho
+	language	Sharanahua	mcd	6164	mcd
+	language	Shark Bay	ssv	6165	ssv
+	language	Sharwa	swq	6166	swq
+	language	Shasta	sht	6167	sht
+	language	Shatt	shj	6168	shj
+	language	Shau	sqh	6169	sqh
+	language	Shawnee	sjw	6170	sjw
+	language	She	shx	6171	shx
+	language	Shehri	shv	6172	shv
+	language	Shekhawati	swv	6173	swv
+	language	Shekkacho	moy	6174	moy
+	language	Sheko	she	6175	she
+	language	Shelta	sth	6176	sth
+	language	Shempire Senoufo	seb	6177	seb
+	language	Shendu	shl	6178	shl
+	language	Sheni	scv	6179	scv
+	language	Sherbro	bun	6180	bun
+	language	Sherdukpen	sdp	6181	sdp
+	language	Sherpa	xsr	6182	xsr
+	language	Sheshi Kham	kip	6183	kip
+	language	Shi	shr	6184	shr
+	language	Shihhi Arabic	ssh	6185	ssh
+	language	Shiki	gua	6186	gua
+	language	Shilluk	shk	6187	shk
+	language	Shina	scl	6188	scl
+	language	Shipibo-Conibo	shp	6189	shp
+	language	Sholaga	sle	6190	sle
+	language	Shom Peng	sii	6191	sii
+	language	Shona	sna	6192	sna	sn
+	language	Shoo-Minda-Nye	bcv	6193	bcv
+	language	Shor	cjs	6194	cjs
+	language	Shoshoni	shh	6195	shh
+	language	Shua	shg	6196	shg
+	language	Shuadit	sdt	6197	sdt
+	language	Shuar	jiv	6198	jiv
+	language	Shubi	suj	6199	suj
+	language	Shughni	sgh	6200	sgh
+	language	Shuhi	sxg	6201	sxg
+	language	Shumashti	sts	6202	sts
+	language	Shumcho	scu	6203	scu
+	language	Shuswap	shs	6204	shs
+	language	Shwai	shw	6205	shw
+	language	Shwe Palaung	pll	6206	pll
+	language	Sialum	slw	6207	slw
+	language	Siamou	sif	6208	sif
+	language	Sian	spg	6209	spg
+	language	Siane	snp	6210	snp
+	language	Siang	sya	6211	sya
+	language	Siar-Lak	sjr	6212	sjr
+	language	Siawi	mmp	6213	mmp
+	language	Sibe	nco	6214	nco
+	language	Siberian Tatar	sty	6215	sty
+	language	Sibu Melanau	sdx	6216	sdx
+	language	Sicanian	sxc	6217	sxc
+	language	Sicel	scx	6218	scx
+	language	Sichuan Yi, Nuosu	iii	6219	iii	ii	Sichuan Yi	Nuosu
+	language	Sicilian	scn	6220	scn
+	language	Siculo Arabic	sqr	6221	sqr
+	language	Sidamo	sid	6222	sid
+	language	Sidetic	xsd	6223	xsd
+	language	Sie	erg	6224	erg
+	language	Sierra Leone Sign Language	sgx	6225	sgx
+	language	Sierra Negra Nahuatl	nsu	6226	nsu
+	language	Sierra de JuÃĄrez Zapotec	zaa	6227	zaa
+	language	Sighu	sxe	6228	sxe
+	language	Sihan	snr	6229	snr
+	language	Sihuas Ancash Quechua	qws	6230	qws
+	language	Sika	ski	6231	ski
+	language	Sikaiana	sky	6232	sky
+	language	Sikaritai	tty	6233	tty
+	language	Sikiana	sik	6234	sik
+	language	Sikkimese	sip	6235	sip
+	language	Siksika	bla	6236	bla
+	language	Sikule	skh	6237	skh
+	language	Sila	slt	6238	slt
+	language	Silacayoapan Mixtec	mks	6239	mks
+	language	Sileibi	sbq	6240	sbq
+	language	Silesian	szl	6241	szl
+	language	Silimo	wul	6242	wul
+	language	Siliput	mkc	6243	mkc
+	language	Silopi	xsp	6244	xsp
+	language	Silt'e	stv	6245	stv
+	language	Simaa	sie	6246	sie
+	language	Simba	sbw	6247	sbw
+	language	Simbali	smg	6248	smg
+	language	Simbari	smb	6249	smb
+	language	Simbo	sbb	6250	sbb
+	language	Simeku	smz	6251	smz
+	language	Simeulue	smr	6252	smr
+	language	Simte	smt	6253	smt
+	language	Sinagen	siu	6254	siu
+	language	Sinasina	sst	6255	sst
+	language	Sinaugoro	snc	6256	snc
+	language	Sindarin	sjn	6257	sjn
+	language	Sindhi	snd	6258	snd	sd
+	language	Sindhi Bhil	sbn	6259	sbn
+	language	Sindihui Mixtec	xts	6260	xts
+	language	Singa	sgm	6261	sgm
+	language	Singapore Sign Language	sls	6262	sls
+	language	Singpho	sgp	6263	sgp
+	language	Sinhala, Sinhalese	sin	6264	sin	si	Sinhala	Sinhalese
+	language	Sinicahua Mixtec	xti	6265	xti
+	language	Sininkere	skq	6266	skq
+	language	Sinte Romani	rmo	6267	rmo
+	language	Sinyar	sys	6268	sys
+	language	Sio	xsi	6269	xsi
+	language	Siona	snn	6270	snn
+	language	Sipacapense	qum	6271	qum
+	language	Sira	swj	6272	swj
+	language	Siraya	fos	6273	fos
+	language	Sirenik Yupik	ysr	6274	ysr
+	language	Siri	sir	6275	sir
+	language	Siriano	sri	6276	sri
+	language	SirionÃŗ	srq	6277	srq
+	language	Sirmauri	srx	6278	srx
+	language	Siroi	ssd	6279	ssd
+	language	Sissala	sld	6280	sld
+	language	Sissano	sso	6281	sso
+	language	Siuslaw	sis	6282	sis
+	language	Sivandi	siy	6283	siy
+	language	Sivia Sign Language	lsv	6284	lsv
+	language	Siwai	siw	6285	siw
+	language	Siwi	siz	6286	siz
+	language	Siwu	akp	6287	akp
+	language	Siyin Chin	csy	6288	csy
+	language	Skagit	ska	6289	ska
+	language	Skalvian	svx	6290	svx
+	language	Skepi Creole Dutch	skw	6291	skw
+	language	Skolt Sami	sms	6292	sms
+	language	Skou	skv	6293	skv
+	language	Slave (Athapascan)	den	6294	den
+	language	Slavomolisano	svm	6295	svm
+	language	Slovak	slk	6296	slk	slo	sk
+	language	Slovakian Sign Language	svk	6297	svk
+	language	Slovenian, Slovene	slv	6298	slv	sl	Slovenian	Slovene
+	language	Small Flowery Miao	sfm	6299	sfm
+	language	Smärky Kanum	kxq	6300	kxq
+	language	Snohomish	sno	6301	sno
+	language	So (Democratic Republic of Congo)	soc	6302	soc
+	language	So'a	ssq	6303	ssq
+	language	Sobei	sob	6304	sob
+	language	Sochiapam Chinantec	cso	6305	cso
+	language	Soga	xog	6306	xog
+	language	Sogdian	sog	6307	sog
+	language	Soi	soj	6308	soj
+	language	Sokoro	sok	6309	sok
+	language	Solano	xso	6310	xso
+	language	Soli	sby	6311	sby
+	language	Solomon Islands Sign Language	szs	6312	szs
+	language	Solong	aaw	6313	aaw
+	language	Solos	sol	6314	sol
+	language	Som	smc	6315	smc
+	language	Somali	som	6316	som	so
+	language	Somba-Siawari	bmu	6317	bmu
+	language	Somrai	sor	6318	sor
+	language	Somray	smu	6319	smu
+	language	Somyev	kgt	6320	kgt
+	language	Sonaga	ysg	6321	ysg
+	language	Sonde	shc	6322	shc
+	language	Songe	sop	6323	sop
+	language	Songlai Chin	csj	6324	csj
+	language	Songo	soo	6325	soo
+	language	Songomeno	soe	6326	soe
+	language	Songoora	sod	6327	sod
+	language	Sonha	soi	6328	soi
+	language	Sonia	siq	6329	siq
+	language	Soninke	snk	6330	snk
+	language	Sonsorol	sov	6331	sov
+	language	Soo	teu	6332	teu
+	language	Sop	urw	6333	urw
+	language	Soqotri	sqt	6334	sqt
+	language	Sora	srb	6335	srb
+	language	Sori-Harengan	sbh	6336	sbh
+	language	Sorkhei	sqo	6337	sqo
+	language	Sorothaptic	sxo	6338	sxo
+	language	Sorsogon Ayta	ays	6339	ays
+	language	Sos Kundi	sdk	6340	sdk
+	language	Sota Kanum	krz	6341	krz
+	language	Sou	sqq	6342	sqq
+	language	Sou Nama	tlt	6343	tlt
+	language	Sou Upaa	wha	6344	wha
+	language	South African Sign Language	sfs	6345	sfs
+	language	South Awyu	aws	6346	aws
+	language	South Azerbaijani	azb	6347	azb
+	language	South Bolivian Quechua	quh	6348	quh
+	language	South Central Banda	lnl	6349	lnl
+	language	South Central Dinka	dib	6350	dib
+	language	South Efate	erk	6351	erk
+	language	South Fali	fal	6352	fal
+	language	South Giziga	giz	6353	giz
+	language	South Lembata	lmf	6354	lmf
+	language	South Marquesan	mqm	6355	mqm
+	language	South Muyu	kts	6356	kts
+	language	South Ndebele, Southern Ndebele	nbl	6357	nbl	South Ndebele	nr	Southern Ndebele
+	language	South Nuaulu	nxl	6358	nxl
+	language	South Picene	spx	6359	spx
+	language	South Slavey	xsl	6360	xsl
+	language	South Tairora	omw	6361	omw
+	language	South Ucayali AshÊninka	cpy	6362	cpy
+	language	South Watut	mcy	6363	mcy
+	language	South West Bay	sns	6364	sns
+	language	Southeast Ambrym	tvk	6365	tvk
+	language	Southeast Babar	vbb	6366	vbb
+	language	Southeast Ijo	ijs	6367	ijs
+	language	Southeast Pashai	psi	6368	psi
+	language	Southeast Tasmanian	xpf	6369	xpf
+	language	Southeastern Dinka	dks	6370	dks
+	language	Southeastern IxtlÃĄn Zapotec	zpd	6371	zpd
+	language	Southeastern Kolami	nit	6372	nit
+	language	Southeastern NochixtlÃĄn Mixtec	mxy	6373	mxy
+	language	Southeastern Pomo	pom	6374	pom
+	language	Southeastern Puebla Nahuatl	npl	6375	npl
+	language	Southeastern Tarahumara	tcu	6376	tcu
+	language	Southeastern Tepehuan	stp	6377	stp
+	language	Southern Alta	agy	6378	agy
+	language	Southern Altai	alt	6379	alt
+	language	Southern Amami-Oshima	ams	6380	ams
+	language	Southern Aymara	ayc	6381	ayc
+	language	Southern Bai	bfs	6382	bfs
+	language	Southern Balochi	bcc	6383	bcc
+	language	Southern Betsimisaraka Malagasy	bzc	6384	bzc
+	language	Southern Binukidnon	mtw	6385	mtw
+	language	Southern Birifor	biv	6386	biv
+	language	Southern Bobo MadarÊ	bwq	6387	bwq
+	language	Southern Bontok	obk	6388	obk
+	language	Southern Carrier	caf	6389	caf
+	language	Southern Catanduanes Bikol	bln	6390	bln
+	language	Southern Conchucos Ancash Quechua	qxo	6391	qxo
+	language	Southern Dagaare	dga	6392	dga
+	language	Southern Dong	kmc	6393	kmc
+	language	Southern East Cree	crj	6394	crj
+	language	Southern Ghale	ghe	6395	ghe
+	language	Southern Grebo	grj	6396	grj
+	language	Southern Guiyang Hmong	hmy	6397	hmy
+	language	Southern Haida	hax	6398	hax
+	language	Southern Hindko	hnd	6399	hnd
+	language	Southern Kalapuya	sxk	6400	sxk
+	language	Southern Kalinga	ksc	6401	ksc
+	language	Southern Katang	sct	6402	sct
+	language	Southern Kisi	kss	6403	kss
+	language	Southern Kiwai	kjd	6404	kjd
+	language	Southern Kurdish	sdh	6405	sdh
+	language	Southern Lolopo	ysp	6406	ysp
+	language	Southern Luri	luz	6407	luz
+	language	Southern Ma'di	snm	6408	snm
+	language	Southern Mashan Hmong	hma	6409	hma
+	language	Southern Mnong	mnn	6410	mnn
+	language	Southern Muji	ymc	6411	ymc
+	language	Southern Nago	nqg	6412	nqg
+	language	Southern NambikuÃĄra	nab	6413	nab
+	language	Southern Ngbandi	nbw	6414	nbw
+	language	Southern Nicobarese	nik	6415	nik
+	language	Southern Nisu	nsd	6416	nsd
+	language	Southern Nuni	nnw	6417	nnw
+	language	Southern Ohlone	css	6418	css
+	language	Southern One	osu	6419	osu
+	language	Southern Pame	pmz	6420	pmz
+	language	Southern Pashto	pbt	6421	pbt
+	language	Southern Pastaza Quechua	qup	6422	qup
+	language	Southern Ping Chinese	csp	6423	csp
+	language	Southern Pomo	peq	6424	peq
+	language	Southern Puebla Mixtec	mit	6425	mit
+	language	Southern Puget Sound Salish	slh	6426	slh
+	language	Southern Pumi	pmj	6427	pmj
+	language	Southern Qiandong Miao	hms	6428	hms
+	language	Southern Qiang	qxs	6429	qxs
+	language	Southern Rengma Naga	nre	6430	nre
+	language	Southern Rincon Zapotec	zsr	6431	zsr
+	language	Southern Roglai	rgs	6432	rgs
+	language	Southern Sama	ssb	6433	ssb
+	language	Southern Sami	sma	6434	sma
+	language	Southern Samo	sbd	6435	sbd
+	language	Southern Sierra Miwok	skd	6436	skd
+	language	Southern Sorsoganon	srv	6437	srv
+	language	Southern Sotho	sot	6438	sot	st
+	language	Southern Subanen	laa	6439	laa
+	language	Southern Thai	sou	6440	sou
+	language	Southern Tidung	itd	6441	itd
+	language	Southern Tiwa	tix	6442	tix
+	language	Southern Toussian	wib	6443	wib
+	language	Southern Tujia	tjs	6444	tjs
+	language	Southern Tutchone	tce	6445	tce
+	language	Southern Uzbek	uzs	6446	uzs
+	language	Southern Yamphu	lrr	6447	lrr
+	language	Southern Yukaghir	yux	6448	yux
+	language	Southwest Gbaya	gso	6449	gso
+	language	Southwest Palawano	plv	6450	plv
+	language	Southwest Pashai	psh	6451	psh
+	language	Southwest Tanna	nwi	6452	nwi
+	language	Southwestern Bontok	vbk	6453	vbk
+	language	Southwestern Dinka	dik	6454	dik
+	language	Southwestern Fars	fay	6455	fay
+	language	Southwestern Guiyang Hmong	hmg	6456	hmg
+	language	Southwestern Huishui Hmong	hmh	6457	hmh
+	language	Southwestern Nisu	nsv	6458	nsv
+	language	Southwestern Tarahumara	twr	6459	twr
+	language	Southwestern Tasmanian	xpx	6460	xpx
+	language	Southwestern Tepehuan	tla	6461	tla
+	language	Southwestern Tlaxiaco Mixtec	meh	6462	meh
+	language	Sowa	sww	6463	sww
+	language	Sowanda	sow	6464	sow
+	language	Soyaltepec Mazatec	vmp	6465	vmp
+	language	Soyaltepec Mixtec	vmq	6466	vmq
+	language	Spanish Sign Language	ssp	6467	ssp
+	language	Spiti Bhoti	spt	6468	spt
+	language	Spokane	spo	6469	spo
+	language	Squamish	squ	6470	squ
+	language	Sranan Tongo	srn	6471	srn
+	language	Sri Lankan Creole Malay	sci	6472	sci
+	language	Sri Lankan Sign Language	sqs	6473	sqs
+	language	Standard Arabic	arb	6474	arb
+	language	Standard Estonian	ekk	6475	ekk
+	language	Standard Latvian	lvs	6476	lvs
+	language	Standard Malay	zsm	6477	zsm
+	language	Standard Moroccan Tamazight	zgh	6478	zgh
+	language	Stellingwerfs	stl	6479	stl
+	language	Stod Bhoti	sbu	6480	sbu
+	language	Stoney	sto	6481	sto
+	language	Straits Salish	str	6482	str
+	language	Suabo	szp	6483	szp
+	language	Suarmin	seo	6484	seo
+	language	Suau	swp	6485	swp
+	language	Suba	sxb	6486	sxb
+	language	Suba-Simbiti	ssc	6487	ssc
+	language	Subi	xsj	6488	xsj
+	language	Subiya	sbs	6489	sbs
+	language	Subtiaba	sut	6490	sut
+	language	Sudanese Arabic	apd	6491	apd
+	language	Sudanese Creole Arabic	pga	6492	pga
+	language	Sudest	tgo	6493	tgo
+	language	Sudovian	xsv	6494	xsv
+	language	Suena	sue	6495	sue
+	language	Suga	sgi	6496	sgi
+	language	Suganga	sug	6497	sug
+	language	Sugut Dusun	kzs	6498	kzs
+	language	Sui	swi	6499	swi
+	language	Suki	sui	6500	sui
+	language	Suku	sub	6501	sub
+	language	Sukuma	suk	6502	suk
+	language	Sukur	syk	6503	syk
+	language	Sukurum	zsu	6504	zsu
+	language	Sula	szn	6505	szn
+	language	Sulka	sua	6506	sua
+	language	Sulod	srg	6507	srg
+	language	Suma	sqm	6508	sqm
+	language	Sumariup	siv	6509	siv
+	language	Sumau	six	6510	six
+	language	Sumbawa	smw	6511	smw
+	language	Sumbwa	suw	6512	suw
+	language	Sumerian	sux	6513	sux
+	language	Sumi Naga	nsm	6514	nsm
+	language	Sumtu Chin	csv	6515	csv
+	language	Sunam	ssk	6516	ssk
+	language	Sundanese	sun	6517	sun	su
+	language	Sunwar	suz	6518	suz
+	language	Suoy	syo	6519	syo
+	language	Supyire Senoufo	spp	6520	spp
+	language	Sur	tdl	6521	tdl
+	language	Surbakhal	sbj	6522	sbj
+	language	Surgujia	sgj	6523	sgj
+	language	Surigaonon	sgd	6524	sgd
+	language	Surjapuri	sjp	6525	sjp
+	language	Sursurunga	sgz	6526	sgz
+	language	SuruahÃĄ	swx	6527	swx
+	language	Surubu	sde	6528	sde
+	language	Suruí	sru	6529	sru
+	language	Suruí Do ParÃĄ	mdz	6530	mdz
+	language	Susquehannock	sqn	6531	sqn
+	language	Susu	sus	6532	sus
+	language	Susuami	ssu	6533	ssu
+	language	Suundi	sdj	6534	sdj
+	language	Suwawa	swu	6535	swu
+	language	SuyÃĄ	suy	6536	suy
+	language	Svan	sva	6537	sva
+	language	Swabian	swg	6538	swg
+	language	Swahili (individual language)	swh	6539	swh
+	language	Swahili, Swahili (macrolanguage)	swa	6540	swa	sw	Swahili	Swahili (macrolanguage)
+	language	Swampy Cree	csw	6541	csw
+	language	Swati	ssw	6542	ssw	ss
+	language	Swedish	swe	6543	swe	sv
+	language	Swedish Sign Language	swl	6544	swl
+	language	Swiss German	gsw	6545	gsw
+	language	Swiss-French Sign Language	ssr	6546	ssr
+	language	Swiss-German Sign Language	sgg	6547	sgg
+	language	Swiss-Italian Sign Language	slf	6548	slf
+	language	Swo	sox	6549	sox
+	language	Syenara Senoufo	shz	6550	shz
+	language	Sylheti	syl	6551	syl
+	language	Syriac	syr	6552	syr
+	language	SÃĄliba	slc	6553	slc
+	language	SÃŖo Paulo KaingÃĄng	zkp	6554	zkp
+	language	SÃŖotomense	cri	6555	cri
+	language	SÃŦcÃŦtÊ SÊnoufo	sep	6556	sep
+	language	Sô	sss	6557	sss
+	language	T'apo	lgn	6558	lgn
+	language	T'en	tct	6559	tct
+	language	Ta'izzi-Adeni Arabic	acq	6560	acq
+	language	Taabwa	tap	6561	tap
+	language	Tabaa Zapotec	zat	6562	zat
+	language	Tabaru	tby	6563	tby
+	language	Tabasco Chontal	chf	6564	chf
+	language	Tabasco Nahuatl	nhc	6565	nhc
+	language	Tabasco Zoque	zoq	6566	zoq
+	language	Tabassaran	tab	6567	tab
+	language	Tabla	tnm	6568	tnm
+	language	Tabo	knv	6569	knv
+	language	Tabriak	tzx	6570	tzx
+	language	Tacahua Mixtec	xtt	6571	xtt
+	language	Tacana	tna	6572	tna
+	language	Tachawit	shy	6573	shy
+	language	Tachelhit	shi	6574	shi
+	language	Tachoni	lts	6575	lts
+	language	Tadaksahak	dsq	6576	dsq
+	language	Tado	klw	6577	klw
+	language	Tadyawan	tdy	6578	tdy
+	language	Tae'	rob	6579	rob
+	language	Tafi	tcd	6580	tcd
+	language	Tagabawa	bgs	6581	bgs
+	language	Tagakaulo	klg	6582	klg
+	language	Tagal Murut	mvv	6583	mvv
+	language	Tagalaka	tgz	6584	tgz
+	language	Tagalog	tgl	6585	tgl	tl
+	language	Tagargrent	oua	6586	oua
+	language	Tagbanwa	tbw	6587	tbw
+	language	Tagbu	tbm	6588	tbm
+	language	Tagdal	tda	6589	tda
+	language	Tagin	tgj	6590	tgj
+	language	Tagish	tgx	6591	tgx
+	language	Tagoi	tag	6592	tag
+	language	Tagwana Senoufo	tgw	6593	tgw
+	language	Tahaggart Tamahaq	thv	6594	thv
+	language	Tahitian	tah	6595	tah	ty
+	language	Tahltan	tht	6596	tht
+	language	Tai	taw	6597	taw
+	language	Tai Daeng	tyr	6598	tyr
+	language	Tai Dam	blt	6599	blt
+	language	Tai Do	tyj	6600	tyj
+	language	Tai DÃŗn	twh	6601	twh
+	language	Tai Hongjin	tiz	6602	tiz
+	language	Tai Laing	tjl	6603	tjl
+	language	Tai Loi	tlq	6604	tlq
+	language	Tai Long	thi	6605	thi
+	language	Tai NÃŧa	tdd	6606	tdd
+	language	Tai Pao	tpo	6607	tpo
+	language	Tai Thanh	tmm	6608	tmm
+	language	Tai Ya	cuu	6609	cuu
+	language	Taiap	gpn	6610	gpn
+	language	Taikat	aos	6611	aos
+	language	Tainae	ago	6612	ago
+	language	Taino	tnq	6613	tnq
+	language	Tairaha	bxa	6614	bxa
+	language	Tairuma	uar	6615	uar
+	language	Taita	dav	6616	dav
+	language	Taivoan	tvx	6617	tvx
+	language	Taiwan Sign Language	tss	6618	tss
+	language	Taje	pee	6619	pee
+	language	Tajik	tgk	6620	tgk	tg
+	language	Tajiki Arabic	abh	6621	abh
+	language	Tajio	tdj	6622	tdj
+	language	Tajuasohn	tja	6623	tja
+	language	Takelma	tkm	6624	tkm
+	language	Takestani	tks	6625	tks
+	language	Takia	tbc	6626	tbc
+	language	Takua	tkz	6627	tkz
+	language	Takuu	nho	6628	nho
+	language	Takwane	tke	6629	tke
+	language	Tal	tal	6630	tal
+	language	Tala	tak	6631	tak
+	language	Talaud	tld	6632	tld
+	language	Taliabu	tlv	6633	tlv
+	language	Talieng	tdf	6634	tdf
+	language	Talinga-Bwisi	tlj	6635	tlj
+	language	Talise	tlr	6636	tlr
+	language	Talodi	tlo	6637	tlo
+	language	Taloki	tlk	6638	tlk
+	language	Talondo'	tln	6639	tln
+	language	Talossan	tzl	6640	tzl
+	language	Talu	yta	6641	yta
+	language	Talysh	tly	6642	tly
+	language	Tama (Chad)	tma	6643	tma
+	language	Tama (Colombia)	ten	6644	ten
+	language	Tamagario	tcg	6645	tcg
+	language	Taman (Indonesia)	tmn	6646	tmn
+	language	Taman (Myanmar)	tcl	6647	tcl
+	language	Tamanaku	tmz	6648	tmz
+	language	Tamashek	tmh	6649	tmh
+	language	Tamasheq	taq	6650	taq
+	language	Tamazola Mixtec	vmx	6651	vmx
+	language	Tambas	tdk	6652	tdk
+	language	Tambora	xxt	6653	xxt
+	language	Tambotalo	tls	6654	tls
+	language	Tami	tmy	6655	tmy
+	language	Tamil	tam	6656	tam	ta
+	language	Tamki	tax	6657	tax
+	language	Tamnim Citak	tml	6658	tml
+	language	Tampias Lobu	low	6659	low
+	language	Tampuan	tpu	6660	tpu
+	language	Tampulma	tpm	6661	tpm
+	language	Tanacross	tcb	6662	tcb
+	language	Tanahmerah	tcm	6663	tcm
+	language	Tanaina	tfn	6664	tfn
+	language	Tanapag	tpv	6665	tpv
+	language	Tandaganon	tgn	6666	tgn
+	language	Tandia	tni	6667	tni
+	language	Tandroy-Mahafaly Malagasy	tdx	6668	tdx
+	language	Tanema	tnx	6669	tnx
+	language	Tangale	tan	6670	tan
+	language	Tangchangya	tnv	6671	tnv
+	language	Tanggu	tgu	6672	tgu
+	language	Tangkhul Naga (India)	nmf	6673	nmf
+	language	Tangkhul Naga (Myanmar)	ntx	6674	ntx
+	language	Tangko	tkx	6675	tkx
+	language	Tanglang	ytl	6676	ytl
+	language	Tangoa	tgp	6677	tgp
+	language	Tanguat	tbs	6678	tbs
+	language	Tangut	txg	6679	txg
+	language	Tanimbili	tbe	6680	tbe
+	language	Tanimuca-RetuarÃŖ	tnc	6681	tnc
+	language	Tanjijili	uji	6682	uji
+	language	Tanosy Malagasy	txy	6683	txy
+	language	Tanudan Kalinga	kml	6684	kml
+	language	Tanzanian Sign Language	tza	6685	tza
+	language	Tapei	afp	6686	afp
+	language	TapietÊ	tpj	6687	tpj
+	language	TapirapÊ	taf	6688	taf
+	language	Tarao Naga	tro	6689	tro
+	language	Tareng	tgr	6690	tgr
+	language	Tariana	tae	6691	tae
+	language	Tarifit	rif	6692	rif
+	language	Tarjumo	txj	6693	txj
+	language	Tarok	yer	6694	yer
+	language	Tarpia	tpf	6695	tpf
+	language	Tartessian	txr	6696	txr
+	language	Taruma	tdm	6697	tdm
+	language	Tasawaq	twq	6698	twq
+	language	Tase Naga	nst	6699	nst
+	language	Tasmate	tmt	6700	tmt
+	language	Tataltepec Chatino	cta	6701	cta
+	language	Tatana	txx	6702	txx
+	language	Tatar	tat	6703	tat	tt
+	language	Tatuyo	tav	6704	tav
+	language	Tauade	ttd	6705	ttd
+	language	Taulil	tuh	6706	tuh
+	language	Taungyo	tco	6707	tco
+	language	Taupota	tpa	6708	tpa
+	language	Tause	tad	6709	tad
+	language	Taushiro	trr	6710	trr
+	language	Tausug	tsg	6711	tsg
+	language	Tauya	tya	6712	tya
+	language	Taveta	tvs	6713	tvs
+	language	Tavoyan	tvn	6714	tvn
+	language	Tavringer Romani	rmu	6715	rmu
+	language	Tawala	tbo	6716	tbo
+	language	Tawallammat Tamajaq	ttq	6717	ttq
+	language	TawandÃĒ	xtw	6718	xtw
+	language	Tawang Monpa	twm	6719	twm
+	language	Tawara	twl	6720	twl
+	language	Taworta	tbp	6721	tbp
+	language	Tawoyan	twy	6722	twy
+	language	Tawr Chin	tcp	6723	tcp
+	language	Tay Boi	tas	6724	tas
+	language	Tay Khang	tnu	6725	tnu
+	language	Tayart Tamajeq	thz	6726	thz
+	language	Tayo	cks	6727	cks
+	language	Taznatit	grr	6728	grr
+	language	Tboli	tbl	6729	tbl
+	language	Tchitchege	tck	6730	tck
+	language	Tchumbuli	bqa	6731	bqa
+	language	Te'un	tve	6732	tve
+	language	Teanu	tkw	6733	tkw
+	language	Tebul Sign Language	tsy	6734	tsy
+	language	Tebul Ure Dogon	dtu	6735	dtu
+	language	TecpatlÃĄn Totonac	tcw	6736	tcw
+	language	Tedaga	tuq	6737	tuq
+	language	Tedim Chin	ctd	6738	ctd
+	language	Tee	tkq	6739	tkq
+	language	Tefaro	tfo	6740	tfo
+	language	Tegali	ras	6741	ras
+	language	Tehit	kps	6742	kps
+	language	Tehuelche	teh	6743	teh
+	language	Tejalapan Zapotec	ztt	6744	ztt
+	language	Teke-Ebo	ebo	6745	ebo
+	language	Teke-Fuumu	ifm	6746	ifm
+	language	Teke-Kukuya	kkw	6747	kkw
+	language	Teke-Laali	lli	6748	lli
+	language	Teke-Nzikou	nzu	6749	nzu
+	language	Teke-Tege	teg	6750	teg
+	language	Teke-Tsaayi	tyi	6751	tyi
+	language	Teke-Tyee	tyx	6752	tyx
+	language	Tektiteko	ttc	6753	ttc
+	language	Tela-Masbuar	tvm	6754	tvm
+	language	Telefol	tlf	6755	tlf
+	language	Telugu	tel	6756	tel	te
+	language	Tem	kdh	6757	kdh
+	language	Temacine Tamazight	tjo	6758	tjo
+	language	Temascaltepec Nahuatl	nhv	6759	nhv
+	language	Tembo (Kitembo)	tbt	6760	tbt
+	language	Tembo (Motembo)	tmv	6761	tmv
+	language	TembÊ	tqb	6762	tqb
+	language	Teme	tdo	6763	tdo
+	language	Temein	teq	6764	teq
+	language	Temi	soz	6765	soz
+	language	Temiar	tea	6766	tea
+	language	Temoaya Otomi	ott	6767	ott
+	language	Temoq	tmo	6768	tmo
+	language	Temuan	tmw	6769	tmw
+	language	Ten'edn	tnz	6770	tnz
+	language	Tena Lowland Quichua	quw	6771	quw
+	language	Tenango Otomi	otn	6772	otn
+	language	Tene Kan Dogon	dtk	6773	dtk
+	language	Tenggarong Kutai Malay	vkt	6774	vkt
+	language	Tengger	tes	6775	tes
+	language	Tenharim	pah	6776	pah
+	language	Tenino	tqn	6777	tqn
+	language	Tenis	tns	6778	tns
+	language	Tennet	tex	6779	tex
+	language	Teop	tio	6780	tio
+	language	Teor	tev	6781	tev
+	language	Tepecano	tep	6782	tep
+	language	Tepetotutla Chinantec	cnt	6783	cnt
+	language	Tepeuxila Cuicatec	cux	6784	cux
+	language	Tepinapa Chinantec	cte	6785	cte
+	language	Tepo Krumen	ted	6786	ted
+	language	Ter Sami	sjt	6787	sjt
+	language	Tera	ttr	6788	ttr
+	language	Terebu	trb	6789	trb
+	language	Terei	buo	6790	buo
+	language	Tereno	ter	6791	ter
+	language	Teressa	tef	6792	tef
+	language	Tereweng	twg	6793	twg
+	language	Teribe	tfr	6794	tfr
+	language	Terik	tec	6795	tec
+	language	Termanu	twu	6796	twu
+	language	Ternate	tft	6797	tft
+	language	TernateÃąo	tmg	6798	tmg
+	language	Tesaka Malagasy	tkg	6799	tkg
+	language	Tese	keg	6800	keg
+	language	Teshenawa	twc	6801	twc
+	language	Teso	teo	6802	teo
+	language	Tetela	tll	6803	tll
+	language	Tetelcingo Nahuatl	nhg	6804	nhg
+	language	Tetete	teb	6805	teb
+	language	Tetserret	tez	6806	tez
+	language	Tetum	tet	6807	tet
+	language	Tetun Dili	tdt	6808	tdt
+	language	Teutila Cuicatec	cut	6809	cut
+	language	Tewa (Indonesia)	twe	6810	twe
+	language	Tewa (USA)	tew	6811	tew
+	language	Tewe	twx	6812	twx
+	language	Texcatepec Otomi	otx	6813	otx
+	language	Texistepec Popoluca	poq	6814	poq
+	language	Texmelucan Zapotec	zpz	6815	zpz
+	language	TezoatlÃĄn Mixtec	mxb	6816	mxb
+	language	Tha	thy	6817	thy
+	language	Thachanadan	thn	6818	thn
+	language	Thado Chin	tcz	6819	tcz
+	language	Thai	tha	6820	tha	th
+	language	Thai Sign Language	tsq	6821	tsq
+	language	Thai Song	soa	6822	soa
+	language	Thaiphum Chin	cth	6823	cth
+	language	Thakali	ths	6824	ths
+	language	Thangal Naga	nki	6825	nki
+	language	Thangmi	thf	6826	thf
+	language	Thao	ssf	6827	ssf
+	language	Tharaka	thk	6828	thk
+	language	Thawa	xtv	6829	xtv
+	language	Thaypan	typ	6830	typ
+	language	Thiin	iin	6831	iin
+	language	Tho	tou	6832	tou
+	language	Thompson	thp	6833	thp
+	language	Thopho	ytp	6834	ytp
+	language	Thracian	txh	6835	txh
+	language	Thu Lao	tyl	6836	tyl
+	language	Thulung	tdh	6837	tdh
+	language	Thur	lth	6838	lth
+	language	Thuri	thu	6839	thu
+	language	Tiagbamrin Aizi	ahi	6840	ahi
+	language	Tiale	mnl	6841	mnl
+	language	Tiang	tbj	6842	tbj
+	language	Tibea	ngy	6843	ngy
+	language	Tibetan Sign Language	lsn	6844	lsn
+	language	Tibetan, Tibetan Standard, Central	bod	6845	bod	Tibetan	Tibetan Central	Tibetan Standard	Central	tib	bo
+	language	Tichurong	tcn	6846	tcn
+	language	Ticuna	tca	6847	tca
+	language	TidaÃĄ Mixtec	mtx	6848	mtx
+	language	Tidikelt Tamazight	tia	6849	tia
+	language	Tidore	tvo	6850	tvo
+	language	Tiemacèwè Bozo	boo	6851	boo
+	language	Tiene	tii	6852	tii
+	language	Tifal	tif	6853	tif
+	language	Tigak	tgc	6854	tgc
+	language	Tigon Mbembe	nza	6855	nza
+	language	Tigre	tig	6856	tig
+	language	Tigrinya	tir	6857	tir	ti
+	language	Tii	txq	6858	txq
+	language	Tijaltepec Mixtec	xtl	6859	xtl
+	language	Tikar	tik	6860	tik
+	language	Tikopia	tkp	6861	tkp
+	language	Tilapa Otomi	otl	6862	otl
+	language	Tillamook	til	6863	til
+	language	Tilquiapan Zapotec	zts	6864	zts
+	language	Tilung	tij	6865	tij
+	language	Tima	tms	6866	tms
+	language	Timbe	tim	6867	tim
+	language	Timne	tem	6868	tem
+	language	Timor Pidgin	tvy	6869	tvy
+	language	Timucua	tjm	6870	tjm
+	language	Timugon Murut	tih	6871	tih
+	language	Tinani	lbf	6872	lbf
+	language	Tindi	tin	6873	tin
+	language	Tingui-Boto	tgv	6874	tgv
+	language	Tinigua	tit	6875	tit
+	language	Tinputz	tpz	6876	tpz
+	language	Tippera	tpe	6877	tpe
+	language	Tira	tic	6878	tic
+	language	Tirahi	tra	6879	tra
+	language	Tiranige Diga Dogon	tde	6880	tde
+	language	Tiri	cir	6881	cir
+	language	Tirmaga-Chai Suri	suq	6882	suq
+	language	Tiruray	tiy	6883	tiy
+	language	Tita	tdq	6884	tdq
+	language	Titan	ttv	6885	ttv
+	language	Tiv	tiv	6886	tiv
+	language	Tiwa	lax	6887	lax
+	language	Tiwi	tiw	6888	tiw
+	language	Tiyaa	tyy	6889	tyy
+	language	TiÊfo	tiq	6890	tiq
+	language	TiÊyaxo Bozo	boz	6891	boz
+	language	Tjungundji	tjj	6892	tjj
+	language	Tjupany	tjp	6893	tjp
+	language	Tjurruru	tju	6894	tju
+	language	Tlachichilco Tepehua	tpt	6895	tpt
+	language	Tlacoapa Me'phaa	tpl	6896	tpl
+	language	Tlacoatzintepec Chinantec	ctl	6897	ctl
+	language	Tlacolulita Zapotec	zpk	6898	zpk
+	language	Tlahuitoltepec Mixe	mxp	6899	mxp
+	language	Tlamacazapa Nahuatl	nuz	6900	nuz
+	language	Tlazoyaltepec Mixtec	mqh	6901	mqh
+	language	Tlicho	dgr	6902	dgr
+	language	Tlingit	tli	6903	tli
+	language	To	toz	6904	toz
+	language	To'abaita	mlu	6905	mlu
+	language	Toaripi	tqo	6906	tqo
+	language	Toba	tob	6907	tob
+	language	Toba-Maskoy	tmf	6908	tmf
+	language	Tobagonian Creole English	tgh	6909	tgh
+	language	Tobanga	tng	6910	tng
+	language	Tobati	tti	6911	tti
+	language	Tobelo	tlb	6912	tlb
+	language	Tobian	tox	6913	tox
+	language	Tobilung	tgb	6914	tgb
+	language	Tobo	tbv	6915	tbv
+	language	Tocantins Asurini	asu	6916	asu
+	language	Tocho	taz	6917	taz
+	language	Toda	tcx	6918	tcx
+	language	Todrah	tdr	6919	tdr
+	language	Tofanma	tlg	6920	tlg
+	language	Tofin Gbe	tfi	6921	tfi
+	language	Togbo-Vara Banda	tor	6922	tor
+	language	Togoyo	tgy	6923	tgy
+	language	Tohono O'odham	ood	6924	ood
+	language	Tojolabal	toj	6925	toj
+	language	Tok Pisin	tpi	6926	tpi
+	language	Tokano	zuh	6927	zuh
+	language	Tokelau	tkl	6928	tkl
+	language	Tokharian A	xto	6929	xto
+	language	Tokharian B	txb	6930	txb
+	language	Toki Pona	tok	6931	tok
+	language	Toku-No-Shima	tkn	6932	tkn
+	language	Tol	jic	6933	jic
+	language	Tolaki	lbw	6934	lbw
+	language	Tolomako	tlm	6935	tlm
+	language	Tolowa	tol	6936	tol
+	language	Toma	tod	6937	tod
+	language	Tomadino	tdi	6938	tdi
+	language	Tombelala	ttp	6939	ttp
+	language	Tombonuo	txa	6940	txa
+	language	Tombulu	tom	6941	tom
+	language	Tomini	txm	6942	txm
+	language	Tommo So Dogon	dto	6943	dto
+	language	Tomo Kan Dogon	dtm	6944	dtm
+	language	Tomoip	tqp	6945	tqp
+	language	Tondano	tdn	6946	tdn
+	language	Tondi Songway Kiini	tst	6947	tst
+	language	Tonga (Nyasa)	tog	6948	tog
+	language	Tonga (Tonga Islands)	ton	6949	ton	to	Tonga
+	language	Tonga (Zambia)	toi	6950	toi
+	language	Tongwe	tny	6951	tny
+	language	Tonjon	tjn	6952	tjn
+	language	Tonkawa	tqw	6953	tqw
+	language	Tonsawang	tnw	6954	tnw
+	language	Tonsea	txs	6955	txs
+	language	Tontemboan	tnt	6956	tnt
+	language	Tooro	ttj	6957	ttj
+	language	Topoiyo	toy	6958	toy
+	language	Toposa	toq	6959	toq
+	language	Toraja-Sa'dan	sda	6960	sda
+	language	Toram	trj	6961	trj
+	language	Torau	ttu	6962	ttu
+	language	Tornedalen Finnish	fit	6963	fit
+	language	Toro	tdv	6964	tdv
+	language	Toro So Dogon	dts	6965	dts
+	language	Toro Tegu Dogon	dtt	6966	dtt
+	language	Toromono	tno	6967	tno
+	language	Torona	tqr	6968	tqr
+	language	Torres Strait Creole	tcs	6969	tcs
+	language	Torricelli	tei	6970	tei
+	language	Torwali	trw	6971	trw
+	language	TorÃĄ	trz	6972	trz
+	language	Tosk Albanian	als	6973	als
+	language	Totela	ttl	6974	ttl
+	language	Toto	txo	6975	txo
+	language	Totoli	txe	6976	txe
+	language	Totomachapan Zapotec	zph	6977	zph
+	language	Totontepec Mixe	mto	6978	mto
+	language	Totoro	ttk	6979	ttk
+	language	Touo	tqu	6980	tqu
+	language	Toura (Côte d'Ivoire)	neb	6981	neb
+	language	Toura (Papua New Guinea)	don	6982	don
+	language	Towei	ttn	6983	ttn
+	language	Transalpine Gaulish	xtg	6984	xtg
+	language	Traveller Danish	rmd	6985	rmd
+	language	Traveller Norwegian	rmg	6986	rmg
+	language	Traveller Scottish	trl	6987	trl
+	language	Tregami	trm	6988	trm
+	language	TremembÊ	tme	6989	tme
+	language	Trieng	stg	6990	stg
+	language	Trimuris	tip	6991	tip
+	language	Tring	tgq	6992	tgq
+	language	Tringgus-Sembaan Bidayuh	trx	6993	trx
+	language	Trinidad and Tobago Sign Language	lst	6994	lst
+	language	Trinidadian Creole English	trf	6995	trf
+	language	Trinitario	trn	6996	trn
+	language	TriÃŗ	tri	6997	tri
+	language	TrukÃĄ	tka	6998	tka
+	language	Trumai	tpy	6999	tpy
+	language	Ts'Ãŧn-Lao	tsl	7000	tsl
+	language	Tsaangi	tsa	7001	tsa
+	language	Tsakhur	tkr	7002	tkr
+	language	Tsakonian	tsd	7003	tsd
+	language	Tsakwambo	kvz	7004	kvz
+	language	Tsamai	tsb	7005	tsb
+	language	Tsat	huq	7006	huq
+	language	Tseku	tsk	7007	tsk
+	language	Tsetsaut	txc	7008	txc
+	language	Tshangla	tsj	7009	tsj
+	language	Tsikimba	kdl	7010	kdl
+	language	TsimanÊ	cas	7011	cas
+	language	Tsimihety Malagasy	xmw	7012	xmw
+	language	Tsimshian	tsi	7013	tsi
+	language	Tsishingini	tsw	7014	tsw
+	language	Tso	ldp	7015	ldp
+	language	Tsoa	hio	7016	hio
+	language	Tsogo	tsv	7017	tsv
+	language	Tsonga	tso	7018	tso	ts
+	language	Tsotso	lto	7019	lto
+	language	Tsou	tsu	7020	tsu
+	language	Tsucuba	cbq	7021	cbq
+	language	Tsum	ttz	7022	ttz
+	language	Tsuvadi	tvd	7023	tvd
+	language	Tsuvan	tsh	7024	tsh
+	language	Tswa	tsc	7025	tsc
+	language	Tswana	tsn	7026	tsn	tn
+	language	Tswapong	two	7027	two
+	language	Tu	mjg	7028	mjg
+	language	Tuamotuan	pmt	7029	pmt
+	language	Tubar	tbu	7030	tbu
+	language	Tucano	tuo	7031	tuo
+	language	Tugen	tuy	7032	tuy
+	language	Tugun	tzn	7033	tzn
+	language	Tugutil	tuj	7034	tuj
+	language	Tukang Besi North	khc	7035	khc
+	language	Tukang Besi South	bhq	7036	bhq
+	language	Tuki	bag	7037	bag
+	language	Tukpa	tpq	7038	tpq
+	language	Tukudede	tkd	7039	tkd
+	language	TukumanfÊd	tkf	7040	tkf
+	language	Tula	tul	7041	tul
+	language	Tulai	tvi	7042	tvi
+	language	Tulehu	tlu	7043	tlu
+	language	Tulishi	tey	7044	tey
+	language	Tulu	tcy	7045	tcy
+	language	Tulu-Bohuai	rak	7046	rak
+	language	Tuma-Irumu	iou	7047	iou
+	language	Tumak	tmc	7048	tmc
+	language	Tumari Kanuri	krt	7049	krt
+	language	Tumbuka	tum	7050	tum
+	language	Tumi	kku	7051	kku
+	language	Tumleo	tmq	7052	tmq
+	language	Tumshuqese	xtq	7053	xtq
+	language	Tumtum	tbr	7054	tbr
+	language	Tumulung Sisaala	sil	7055	sil
+	language	Tumzabt	mzb	7056	mzb
+	language	Tundra Enets	enh	7057	enh
+	language	Tunen	tvu	7058	tvu
+	language	Tungag	lcm	7059	lcm
+	language	Tunggare	trt	7060	trt
+	language	Tunia	tug	7061	tug
+	language	Tunica	tun	7062	tun
+	language	Tunisian Arabic	aeb	7063	aeb
+	language	Tunisian Sign Language	tse	7064	tse
+	language	Tunjung	tjg	7065	tjg
+	language	Tunni	tqq	7066	tqq
+	language	Tunzu	dza	7067	dza
+	language	Tuotomb	ttf	7068	ttf
+	language	Tuparí	tpr	7069	tpr
+	language	TupinambÃĄ	tpn	7070	tpn
+	language	Tupinikin	tpk	7071	tpk
+	language	Tupuri	tui	7072	tui
+	language	Turaka	trh	7073	trh
+	language	Turi	trd	7074	trd
+	language	TuriwÃĄra	twt	7075	twt
+	language	Turka	tuz	7076	tuz
+	language	Turkana	tuv	7077	tuv
+	language	Turkish	tur	7078	tur	tr
+	language	Turkish Sign Language	tsm	7079	tsm
+	language	Turkmen	tuk	7080	tuk	tk
+	language	Turks And Caicos Creole English	tch	7081	tch
+	language	Turoyo	tru	7082	tru
+	language	Turumsa	tqm	7083	tqm
+	language	Turung	try	7084	try
+	language	Tuscarora	tus	7085	tus
+	language	Tutelo	tta	7086	tta
+	language	Tutong	ttg	7087	ttg
+	language	Tutsa Naga	tvt	7088	tvt
+	language	Tutuba	tmi	7089	tmi
+	language	Tututepec Mixtec	mtu	7090	mtu
+	language	Tututni	tuu	7091	tuu
+	language	Tuvalu	tvl	7092	tvl
+	language	Tuvinian	tyv	7093	tyv
+	language	Tuwali Ifugao	ifk	7094	ifk
+	language	Tuwari	tww	7095	tww
+	language	Tuwuli	bov	7096	bov
+	language	TuxinÃĄwa	tux	7097	tux
+	language	TuxÃĄ	tud	7098	tud
+	language	Tuyuca	tue	7099	tue
+	language	Twana	twa	7100	twa
+	language	Twendi	twn	7101	twn
+	language	Twents	twd	7102	twd
+	language	Twi	twi	7103	twi	tw
+	language	Tyap	kcg	7104	kcg
+	language	Tz'utujil	tzj	7105	tzj
+	language	Tzeltal	tzh	7106	tzh
+	language	Tzotzil	tzo	7107	tzo
+	language	Tày	tyz	7108	tyz
+	language	Tày Sa Pa	tys	7109	tys
+	language	Tày Tac	tyt	7110	tyt
+	language	TÊÊn	lor	7111	lor
+	language	TÃŧbatulabal	tub	7112	tub
+	language	U	uuu	7113	uuu
+	language	Uab Meto	aoz	7114	aoz
+	language	UamuÊ	uam	7115	uam
+	language	Uare	ksj	7116	ksj
+	language	Ubaghara	byc	7117	byc
+	language	Ubang	uba	7118	uba
+	language	Ubi	ubi	7119	ubi
+	language	Ubir	ubr	7120	ubr
+	language	Ubykh	uby	7121	uby
+	language	Ucayali-YurÃēa AshÊninka	cpb	7122	cpb
+	language	Uda	uda	7123	uda
+	language	Udi	udi	7124	udi
+	language	Udihe	ude	7125	ude
+	language	Udmurt	udm	7126	udm
+	language	Uduk	udu	7127	udu
+	language	Ufim	ufi	7128	ufi
+	language	Ugandan Sign Language	ugn	7129	ugn
+	language	Ugaritic	uga	7130	uga
+	language	Ughele	uge	7131	uge
+	language	Ugong	ugo	7132	ugo
+	language	Uhami	uha	7133	uha
+	language	Uighur, Uyghur	uig	7134	uig	Uighur	ug	Uyghur
+	language	Uisai	uis	7135	uis
+	language	Ujir	udj	7136	udj
+	language	Ukaan	kcf	7137	kcf
+	language	Ukhwejo	ukh	7138	ukh
+	language	Ukit	umi	7139	umi
+	language	Ukpe-Bayobiri	ukp	7140	ukp
+	language	Ukpet-Ehom	akd	7141	akd
+	language	Ukrainian	ukr	7142	ukr	uk
+	language	Ukrainian Sign Language	ukl	7143	ukl
+	language	Ukue	uku	7144	uku
+	language	Ukuriguma	ukg	7145	ukg
+	language	Ukwa	ukq	7146	ukq
+	language	Ukwuani-Aboh-Ndoni	ukw	7147	ukw
+	language	Ulau-Suain	svb	7148	svb
+	language	Ulch	ulc	7149	ulc
+	language	Ulithian	uli	7150	uli
+	language	Ullatan	ull	7151	ull
+	language	Ulukwumi	ulb	7152	ulb
+	language	Ulumanda'	ulm	7153	ulm
+	language	Ulwa	ulw	7154	ulw
+	language	Uma	ppk	7155	ppk
+	language	Uma' Lasan	xky	7156	xky
+	language	Uma' Lung	ulu	7157	ulu
+	language	Umanakaina	gdn	7158	gdn
+	language	Umatilla	uma	7159	uma
+	language	Umbindhamu	umd	7160	umd
+	language	Umbrian	xum	7161	xum
+	language	Umbu-Ungu	ubu	7162	ubu
+	language	Umbugarla	umr	7163	umr
+	language	Umbundu	umb	7164	umb
+	language	Ume Sami	sju	7165	sju
+	language	Umeda	upi	7166	upi
+	language	Umiida	xud	7167	xud
+	language	Umiray Dumaget Agta	due	7168	due
+	language	Umon	umm	7169	umm
+	language	Umotína	umo	7170	umo
+	language	Umpila	ump	7171	ump
+	language	Una	mtg	7172	mtg
+	language	Unami	unm	7173	unm
+	language	Uncoded languages	mis	7174	mis
+	language	Unde Kaili	unz	7175	unz
+	language	Undetermined	und	7176	und
+	language	Uneapa	bbn	7177	bbn
+	language	Uneme	une	7178	une
+	language	Unggaranggu	xun	7179	xun
+	language	Unggumi	xgu	7180	xgu
+	language	Uni	uni	7181	uni
+	language	Unserdeutsch	uln	7182	uln
+	language	Unua	onu	7183	onu
+	language	Unubahe	unu	7184	unu
+	language	Upper Chehalis	cjh	7185	cjh
+	language	Upper Grand Valley Dani	dna	7186	dna
+	language	Upper Guinea Crioulo	pov	7187	pov
+	language	Upper Kinabatangan	dmg	7188	dmg
+	language	Upper Kuskokwim	kuu	7189	kuu
+	language	Upper Necaxa Totonac	tku	7190	tku
+	language	Upper Saxon	sxu	7191	sxu
+	language	Upper Sorbian	hsb	7192	hsb
+	language	Upper Ta'oih	tth	7193	tth
+	language	Upper Tanana	tau	7194	tau
+	language	Upper Taromi	tov	7195	tov
+	language	Upper Umpqua	xup	7196	xup
+	language	Ura (Papua New Guinea)	uro	7197	uro
+	language	Ura (Vanuatu)	uur	7198	uur
+	language	Uradhi	urf	7199	urf
+	language	Urak Lawoi'	urk	7200	urk
+	language	Urali	url	7201	url
+	language	Urapmin	urm	7202	urm
+	language	Urarina	ura	7203	ura
+	language	Urartian	xur	7204	xur
+	language	Urat	urt	7205	urt
+	language	Urdu	urd	7206	urd	ur
+	language	Urhobo	urh	7207	urh
+	language	Uri	uvh	7208	uvh
+	language	Urigina	urg	7209	urg
+	language	Urim	uri	7210	uri
+	language	Urimo	urx	7211	urx
+	language	Uripiv-Wala-Rano-Atchin	upv	7212	upv
+	language	Urningangg	urc	7213	urc
+	language	Uru	ure	7214	ure
+	language	Uru-Eu-Wau-Wau	urz	7215	urz
+	language	Uru-Pa-In	urp	7216	urp
+	language	Uruangnirin	urn	7217	urn
+	language	Uruava	urv	7218	urv
+	language	UrubÃē-Kaapor	urb	7219	urb
+	language	UrubÃē-Kaapor Sign Language	uks	7220	uks
+	language	Uruguayan Sign Language	ugy	7221	ugy
+	language	Urum	uum	7222	uum
+	language	Urumi	uru	7223	uru
+	language	Usaghade	usk	7224	usk
+	language	Usan	wnu	7225	wnu
+	language	Usarufa	usa	7226	usa
+	language	Ushojo	ush	7227	ush
+	language	Usila Chinantec	cuc	7228	cuc
+	language	Usku	ulf	7229	ulf
+	language	Uspanteco	usp	7230	usp
+	language	Usui	usi	7231	usi
+	language	Utarmbung	omo	7232	omo
+	language	Ute-Southern Paiute	ute	7233	ute
+	language	Utu	utu	7234	utu
+	language	Uvbie	evh	7235	evh
+	language	Uya	usu	7236	usu
+	language	Uyajitaya	duk	7237	duk
+	language	Uzbek	uzb	7238	uzb	uz
+	language	Uzbeki Arabic	auz	7239	auz
+	language	Uzekwe	eze	7240	eze
+	language	Vaagri Booli	vaa	7241	vaa
+	language	Vafsi	vaf	7242	vaf
+	language	Vaghri	vgr	7243	vgr
+	language	Vaghua	tva	7244	tva
+	language	Vagla	vag	7245	vag
+	language	Vai	vai	7246	vai
+	language	Vaiphei	vap	7247	vap
+	language	Vale	vae	7248	vae
+	language	Valencian Sign Language	vsv	7249	vsv
+	language	Valle Nacional Chinantec	cvn	7250	cvn
+	language	Valley Maidu	vmv	7251	vmv
+	language	Valman	van	7252	van
+	language	Valpei	vlp	7253	vlp
+	language	Vamale	mkt	7254	mkt
+	language	Vame	mlr	7255	mlr
+	language	Vandalic	xvn	7256	xvn
+	language	Vangunu	mpr	7257	mpr
+	language	Vanimo	vam	7258	vam
+	language	Vano	vnk	7259	vnk
+	language	Vanuma	vau	7260	vau
+	language	Vao	vao	7261	vao
+	language	Varhadi-Nagpuri	vah	7262	vah
+	language	Varisi	vrs	7263	vrs
+	language	Varli	vav	7264	vav
+	language	Vasavi	vas	7265	vas
+	language	Veddah	ved	7266	ved
+	language	Vedic Sanskrit	vsn	7267	vsn
+	language	Vehes	val	7268	val
+	language	Veluws	vel	7269	vel
+	language	Vemgo-Mabas	vem	7270	vem
+	language	Venda	ven	7271	ven	ve
+	language	Venetian	vec	7272	vec
+	language	Venetic	xve	7273	xve
+	language	Venezuelan Sign Language	vsl	7274	vsl
+	language	Vengo	bav	7275	bav
+	language	VentureÃąo	veo	7276	veo
+	language	Veps	vep	7277	vep
+	language	Vera'a	vra	7278	vra
+	language	Vestinian	xvs	7279	xvs
+	language	Vidunda	vid	7280	vid
+	language	Viemo	vig	7281	vig
+	language	Vietnamese	vie	7282	vie	vi
+	language	Vilela	vil	7283	vil
+	language	Vili	vif	7284	vif
+	language	Villa Viciosa Agta	dyg	7285	dyg
+	language	Vincentian Creole English	svc	7286	svc
+	language	Vinmavis	vnm	7287	vnm
+	language	Vinza	vin	7288	vin
+	language	Virgin Islands Creole English	vic	7289	vic
+	language	Vishavan	vis	7290	vis
+	language	Viti	vit	7291	vit
+	language	Vitou	vto	7292	vto
+	language	Vitu	wiv	7293	wiv
+	language	Vlaams	vls	7294	vls
+	language	Vlaamse Gebarentaal	vgt	7295	vgt
+	language	Vlax Romani	rmy	7296	rmy
+	language	VolapÃŧk	vol	7297	vol	vo
+	language	Volscian	xvo	7298	xvo
+	language	Vono	kch	7299	kch
+	language	Voro	vor	7300	vor
+	language	Votic	vot	7301	vot
+	language	Vumbu	vum	7302	vum
+	language	Vunapu	vnp	7303	vnp
+	language	Vunjo	vun	7304	vun
+	language	VurÃĢs	msn	7305	msn
+	language	Vute	vut	7306	vut
+	language	Vwanji	wbi	7307	wbi
+	language	VÃĩro	vro	7308	vro
+	language	Wa	wbm	7309	wbm
+	language	Wa'ema	wag	7310	wag
+	language	Waama	wwa	7311	wwa
+	language	Waamwang	wmn	7312	wmn
+	language	Waata	ssn	7313	ssn
+	language	Wab	wab	7314	wab
+	language	Wabo	wbb	7315	wbb
+	language	Waboda	kmx	7316	kmx
+	language	Waci Gbe	wci	7317	wci
+	language	Wadaginam	wdg	7318	wdg
+	language	Waddar	wbq	7319	wbq
+	language	Wadi Wadi	xwd	7320	xwd
+	language	Wadikali	wdk	7321	wdk
+	language	Wadiyara Koli	kxp	7322	kxp
+	language	Wadjabangayi	wdy	7323	wdy
+	language	Wadjiginy	wdj	7324	wdj
+	language	Wadjigu	wdu	7325	wdu
+	language	Wae Rana	wrx	7326	wrx
+	language	Waffa	waj	7327	waj
+	language	Wagawaga	wgb	7328	wgb
+	language	Wagaya	wga	7329	wga
+	language	Wagdi	wbr	7330	wbr
+	language	Wagi	fad	7331	fad
+	language	Wagiman	waq	7332	waq
+	language	Wahau Kayan	whu	7333	whu
+	language	Wahau Kenyah	whk	7334	whk
+	language	Wahgi	wgi	7335	wgi
+	language	Waigali	wbk	7336	wbk
+	language	Waigeo	wgo	7337	wgo
+	language	Wailaki	wlk	7338	wlk
+	language	Wailapa	wlr	7339	wlr
+	language	Waima	rro	7340	rro
+	language	Waima'a	wmh	7341	wmh
+	language	Waimaha	bao	7342	bao
+	language	Waimiri-Atroari	atr	7343	atr
+	language	Waioli	wli	7344	wli
+	language	Waiwai	waw	7345	waw
+	language	Waja	wja	7346	wja
+	language	Wajarri	wbv	7347	wbv
+	language	Wajuk	xwj	7348	xwj
+	language	Waka	wav	7349	wav
+	language	Wakabunga	wwb	7350	wwb
+	language	Wakawaka	wkw	7351	wkw
+	language	Wakde	wkd	7352	wkd
+	language	Wakhi	wbl	7353	wbl
+	language	WakonÃĄ	waf	7354	waf
+	language	Wala	lgl	7355	lgl
+	language	Walak	wlw	7356	wlw
+	language	Walangama	nlw	7357	nlw
+	language	Wali (Ghana)	wlx	7358	wlx
+	language	Wali (Sudan)	wll	7359	wll
+	language	Waling	wly	7360	wly
+	language	Walio	wla	7361	wla
+	language	Walla Walla	waa	7362	waa
+	language	Wallisian	wls	7363	wls
+	language	Walloon	wln	7364	wln	wa
+	language	Walmajarri	wmt	7365	wmt
+	language	Walser	wae	7366	wae
+	language	Walungge	ola	7367	ola
+	language	Waluwarra	wrb	7368	wrb
+	language	Wamas	wmc	7369	wmc
+	language	Wambaya	wmb	7370	wmb
+	language	Wambon	wms	7371	wms
+	language	Wambule	wme	7372	wme
+	language	Wamesa	wad	7373	wad
+	language	Wamey	cou	7374	cou
+	language	Wamin	wmi	7375	wmi
+	language	Wampanoag	wam	7376	wam
+	language	Wampar	lbq	7377	lbq
+	language	Wampur	waz	7378	waz
+	language	Wan	wan	7379	wan
+	language	Wanap	wnp	7380	wnp
+	language	Wancho Naga	nnp	7381	nnp
+	language	Wanda	wbh	7382	wbh
+	language	Wandala	mfi	7383	mfi
+	language	Wandarang	wnd	7384	wnd
+	language	Wandji	wdd	7385	wdd
+	language	Waneci	wne	7386	wne
+	language	Wanga	lwg	7387	lwg
+	language	Wangaaybuwan-Ngiyambaa	wyb	7388	wyb
+	language	Wanggamala	wnm	7389	wnm
+	language	Wanggom	wng	7390	wng
+	language	Wangkangurru	wgg	7391	wgg
+	language	Wangkayutyuru	wky	7392	wky
+	language	Wangkumara	xwk	7393	xwk
+	language	Wannu	jub	7394	jub
+	language	Wano	wno	7395	wno
+	language	Wantoat	wnc	7396	wnc
+	language	Wanukaka	wnk	7397	wnk
+	language	Wanyi	wny	7398	wny
+	language	WanÊ	hwa	7399	hwa
+	language	Waorani	auc	7400	auc
+	language	Wapan	juk	7401	juk
+	language	Wapishana	wap	7402	wap
+	language	Wappo	wao	7403	wao
+	language	War-Jaintia	aml	7404	aml
+	language	Wara	wbf	7405	wbf
+	language	Warao	wba	7406	wba
+	language	Waray (Australia)	wrz	7407	wrz
+	language	Waray (Philippines)	war	7408	war
+	language	Wardaman	wrr	7409	wrr
+	language	Wardandi	wxw	7410	wxw
+	language	Warembori	wsa	7411	wsa
+	language	Wares	wai	7412	wai
+	language	Waris	wrs	7413	wrs
+	language	Waritai	wbe	7414	wbe
+	language	Wariyangga	wri	7415	wri
+	language	Warji	wji	7416	wji
+	language	Warkay-Bipim	bgv	7417	bgv
+	language	Warlmanpa	wrl	7418	wrl
+	language	Warlpiri	wbp	7419	wbp
+	language	Warnang	wrn	7420	wrn
+	language	Warnman	wbt	7421	wbt
+	language	Waropen	wrp	7422	wrp
+	language	Warrgamay	wgy	7423	wgy
+	language	Warrwa	wwr	7424	wwr
+	language	Waru	wru	7425	wru
+	language	Warumungu	wrm	7426	wrm
+	language	Waruna	wrv	7427	wrv
+	language	Warungu	wrg	7428	wrg
+	language	Warwar Feni	hrw	7429	hrw
+	language	Wasa	wss	7430	wss
+	language	Wasco-Wishram	wac	7431	wac
+	language	Wasembo	gsp	7432	gsp
+	language	Washo	was	7433	was
+	language	Waskia	wsk	7434	wsk
+	language	Wasu	wsu	7435	wsu
+	language	Watakataui	wtk	7436	wtk
+	language	Watam	wax	7437	wax
+	language	Wathawurrung	wth	7438	wth
+	language	Watiwa	wtf	7439	wtf
+	language	Watubela	wah	7440	wah
+	language	Waube	kop	7441	kop
+	language	WaurÃĄ	wau	7442	wau
+	language	Wauyai	wuy	7443	wuy
+	language	Wawa	www	7444	www
+	language	Wawonii	wow	7445	wow
+	language	Waxianghua	wxa	7446	wxa
+	language	Wayampi	oym	7447	oym
+	language	Wayana	way	7448	way
+	language	Wayanad Chetti	ctt	7449	ctt
+	language	WayorÃŗ	wyr	7450	wyr
+	language	Wayu	vay	7451	vay
+	language	Wayuu	guc	7452	guc
+	language	Wedau	wed	7453	wed
+	language	Weh	weh	7454	weh
+	language	Wejewa	wew	7455	wew
+	language	Welaun	wlh	7456	wlh
+	language	Weliki	klh	7457	klh
+	language	Welsh	cym	7458	cym	cy	wel
+	language	Welsh Romani	rmw	7459	rmw
+	language	Wemale	weo	7460	weo
+	language	Wemba Wemba	xww	7461	xww
+	language	Weme Gbe	wem	7462	wem
+	language	Wendat	wdt	7463	wdt
+	language	Wergaia	weg	7464	weg
+	language	Weri	wer	7465	wer
+	language	Wersing	kvw	7466	kvw
+	language	West Albay Bikol	fbl	7467	fbl
+	language	West Ambae	nnd	7468	nnd
+	language	West Bengal Sign Language	wbs	7469	wbs
+	language	West Berawan	zbw	7470	zbw
+	language	West Central Banda	bbp	7471	bbp
+	language	West Central Oromo	gaz	7472	gaz
+	language	West Coast Bajau	bdr	7473	bdr
+	language	West Damar	drn	7474	drn
+	language	West Goodenough	ddi	7475	ddi
+	language	West Kewa	kew	7476	kew
+	language	West Lembata	lmj	7477	lmj
+	language	West Makian	mqs	7478	mqs
+	language	West Masela	mss	7479	mss
+	language	West Tarangan	txn	7480	txn
+	language	West Uvean	uve	7481	uve
+	language	West Yugur	ybe	7482	ybe
+	language	West-Central Limba	lia	7483	lia
+	language	Western Abnaki	abe	7484	abe
+	language	Western Apache	apw	7485	apw
+	language	Western Armenian	hyw	7486	hyw
+	language	Western Arrarnta	are	7487	are
+	language	Western Balochi	bgn	7488	bgn
+	language	Western Bolivian Guaraní	gnw	7489	gnw
+	language	Western Bru	brv	7490	brv
+	language	Western Bukidnon Manobo	mbb	7491	mbb
+	language	Western Cham	cja	7492	cja
+	language	Western Dani	dnw	7493	dnw
+	language	Western Durango Nahuatl	azn	7494	azn
+	language	Western Fijian	wyy	7495	wyy
+	language	Western Frisian	fry	7496	fry	fy
+	language	Western Highland Chatino	ctp	7497	ctp
+	language	Western Highland Purepecha	pua	7498	pua
+	language	Western Huasteca Nahuatl	nhw	7499	nhw
+	language	Western Juxtlahuaca Mixtec	jmx	7500	jmx
+	language	Western Kanjobal	knj	7501	knj
+	language	Western Karaboro	kza	7502	kza
+	language	Western Katu	kuf	7503	kuf
+	language	Western Kayah	kyu	7504	kyu
+	language	Western Keres	kjq	7505	kjq
+	language	Western Krahn	krw	7506	krw
+	language	Western Lalu	ywl	7507	ywl
+	language	Western Lawa	lcp	7508	lcp
+	language	Western Magar	mrd	7509	mrd
+	language	Western Maninkakan	mlq	7510	mlq
+	language	Western Mari	mrj	7511	mrj
+	language	Western Mashan Hmong	hmw	7512	hmw
+	language	Western Meohang	raf	7513	raf
+	language	Western Minyag	wmg	7514	wmg
+	language	Western Muria	mut	7515	mut
+	language	Western Neo-Aramaic	amw	7516	amw
+	language	Western Niger Fulfulde	fuh	7517	fuh
+	language	Western Ojibwa	ojw	7518	ojw
+	language	Western Panjabi	pnb	7519	pnb
+	language	Western Parbate Kham	kjl	7520	kjl
+	language	Western Penan	pne	7521	pne
+	language	Western Sisaala	ssl	7522	ssl
+	language	Western Subanon	suc	7523	suc
+	language	Western Tamang	tdg	7524	tdg
+	language	Western Tawbuid	twb	7525	twb
+	language	Western Tlacolula Valley Zapotec	zab	7526	zab
+	language	Western Totonac	tqt	7527	tqt
+	language	Western Tunebo	tnb	7528	tnb
+	language	Western Xiangxi Miao	mmr	7529	mmr
+	language	Western Xwla Gbe	xwl	7530	xwl
+	language	Western Yiddish	yih	7531	yih
+	language	Westphalien	wep	7532	wep
+	language	Wetamut	wwo	7533	wwo
+	language	Wewaw	wea	7534	wea
+	language	Weyto	woy	7535	woy
+	language	White Gelao	giw	7536	giw
+	language	White Lachi	lwh	7537	lwh
+	language	Whitesands	tnp	7538	tnp
+	language	Wiarumus	tua	7539	tua
+	language	Wichita	wic	7540	wic
+	language	Wichí LhamtÊs GÃŧisnay	mzh	7541	mzh
+	language	Wichí LhamtÊs Nocten	mtp	7542	mtp
+	language	Wichí LhamtÊs Vejoz	wlv	7543	wlv
+	language	Wik Ngathan	wig	7544	wig
+	language	Wik-Epa	wie	7545	wie
+	language	Wik-Iiyanh	wij	7546	wij
+	language	Wik-Keyangan	wif	7547	wif
+	language	Wik-Me'anha	wih	7548	wih
+	language	Wik-Mungkan	wim	7549	wim
+	language	Wikalkan	wik	7550	wik
+	language	Wikngenchera	wua	7551	wua
+	language	Wilawila	wil	7552	wil
+	language	Wintu	wnw	7553	wnw
+	language	WinyÊ	kst	7554	kst
+	language	Wipi	gdr	7555	gdr
+	language	Wiradjuri	wrh	7556	wrh
+	language	WirafÊd	wir	7557	wir
+	language	Wirangu	wgu	7558	wgu
+	language	Wiru	wiu	7559	wiu
+	language	Wiyot	wiy	7560	wiy
+	language	Woccon	xwc	7561	xwc
+	language	Wogamusin	wog	7562	wog
+	language	Wogeo	woc	7563	woc
+	language	Woi	wbw	7564	wbw
+	language	Woiwurrung	wyi	7565	wyi
+	language	Wojenaka	jod	7566	jod
+	language	Wolane	wle	7567	wle
+	language	Wolani	wod	7568	wod
+	language	Wolaytta	wal	7569	wal
+	language	Woleaian	woe	7570	woe
+	language	Wolio	wlo	7571	wlo
+	language	Wolof	wol	7572	wol	wo
+	language	Wom (Nigeria)	wom	7573	wom
+	language	Wom (Papua New Guinea)	wmo	7574	wmo
+	language	Womo	wmx	7575	wmx
+	language	Wongo	won	7576	won
+	language	Woods Cree	cwd	7577	cwd
+	language	Woria	wor	7578	wor
+	language	Worimi	kda	7579	kda
+	language	Worodougou	jud	7580	jud
+	language	Worrorra	wro	7581	wro
+	language	Wotapuri-Katarqalai	wsv	7582	wsv
+	language	Wotjobaluk	xwt	7583	xwt
+	language	Wotu	wtw	7584	wtw
+	language	Woun Meu	noa	7585	noa
+	language	Written Oirat	xwo	7586	xwo
+	language	Wu Chinese	wuu	7587	wuu
+	language	Wuding-Luquan Yi	ywq	7588	ywq
+	language	Wudu	wud	7589	wud
+	language	Wuliwuli	wlu	7590	wlu
+	language	Wulna	wux	7591	wux
+	language	Wumboko	bqm	7592	bqm
+	language	Wumbvu	wum	7593	wum
+	language	Wumeng Nasu	ywu	7594	ywu
+	language	Wunai Bunu	bwn	7595	bwn
+	language	Wunambal	wub	7596	wub
+	language	Wunumara	wnn	7597	wnn
+	language	Wurrugu	wur	7598	wur
+	language	Wusa Nasu	yig	7599	yig
+	language	Wushi	bse	7600	bse
+	language	Wusi	wsi	7601	wsi
+	language	Wutung	wut	7602	wut
+	language	Wutunhua	wuh	7603	wuh
+	language	Wuvulu-Aua	wuv	7604	wuv
+	language	Wuzlam	udl	7605	udl
+	language	Wyandot	wyn	7606	wyn
+	language	Wymysorys	wym	7607	wym
+	language	WÃĄra	tci	7608	tci
+	language	WÃŖpha	juw	7609	juw
+	language	Wè Northern	wob	7610	wob
+	language	Wè Southern	gxx	7611	gxx
+	language	Wè Western	wec	7612	wec
+	language	Xaasongaxango	kao	7613	kao
+	language	Xadani Zapotec	zax	7614	zax
+	language	XakriabÃĄ	xkr	7615	xkr
+	language	Xamtanga	xan	7616	xan
+	language	Xanaguía Zapotec	ztg	7617	ztg
+	language	XavÃĄnte	xav	7618	xav
+	language	XerÊnte	xer	7619	xer
+	language	XetÃĄ	xet	7620	xet
+	language	Xhosa	xho	7621	xho	xh
+	language	Xiang Chinese	hsn	7622	hsn
+	language	Xibe	sjo	7623	sjo
+	language	Xicotepec De JuÃĄrez Totonac	too	7624	too
+	language	Xinca	xin	7625	xin
+	language	XingÃē Asuriní	asn	7626	asn
+	language	Xipaya	xiy	7627	xiy
+	language	Xiri	xii	7628	xii
+	language	XiriÃĸna	xir	7629	xir
+	language	Xishanba Lalo	ywt	7630	ywt
+	language	Xokleng	xok	7631	xok
+	language	XukurÃē	xoo	7632	xoo
+	language	Xwela Gbe	xwe	7633	xwe
+	language	XÃĸrÃĸcÚÚ	ane	7634	ane
+	language	XÃĸrÃĸgurè	axx	7635	axx
+	language	Yaaku	muu	7636	muu
+	language	Yabarana	yar	7637	yar
+	language	YabaÃĸna	ybn	7638	ybn
+	language	Yabem	jae	7639	jae
+	language	Yaben	ybm	7640	ybm
+	language	Yabong	ybo	7641	ybo
+	language	Yabula Yabula	yxy	7642	yxy
+	language	Yace	ekr	7643	ekr
+	language	Yaeyama	rys	7644	rys
+	language	Yafi	wfg	7645	wfg
+	language	Yagara	yxg	7646	yxg
+	language	Yagaria	ygr	7647	ygr
+	language	Yagnobi	yai	7648	yai
+	language	Yagomi	ygm	7649	ygm
+	language	Yagua	yad	7650	yad
+	language	Yagwoia	ygw	7651	ygw
+	language	Yahadian	ner	7652	ner
+	language	Yahang	rhp	7653	rhp
+	language	Yahuna	ynu	7654	ynu
+	language	Yaka (Central African Republic)	axk	7655	axk
+	language	Yaka (Congo)	iyx	7656	iyx
+	language	Yaka (Democratic Republic of Congo)	yaf	7657	yaf
+	language	Yakaikeke	ykk	7658	ykk
+	language	Yakama	yak	7659	yak
+	language	Yakan	yka	7660	yka
+	language	Yakha	ybh	7661	ybh
+	language	Yakoma	yky	7662	yky
+	language	Yakut	sah	7663	sah
+	language	Yala	yba	7664	yba
+	language	Yalahatan	jal	7665	jal
+	language	Yalakalore	xyl	7666	xyl
+	language	Yalarnnga	ylr	7667	ylr
+	language	Yale	nce	7668	nce
+	language	Yaleba	ylb	7669	ylb
+	language	Yalunka	yal	7670	yal
+	language	YalÃĄlag Zapotec	zpu	7671	zpu
+	language	Yamap	ymp	7672	ymp
+	language	Yamba	yam	7673	yam
+	language	Yambes	ymb	7674	ymb
+	language	Yambeta	yat	7675	yat
+	language	Yamdena	jmd	7676	jmd
+	language	Yameo	yme	7677	yme
+	language	Yami	tao	7678	tao
+	language	Yaminahua	yaa	7679	yaa
+	language	Yamna	ymn	7680	ymn
+	language	Yamongeri	ymg	7681	ymg
+	language	Yamphu	ybi	7682	ybi
+	language	Yan-nhangu	jay	7683	jay
+	language	Yan-nhaŋu Sign Language	yhs	7684	yhs
+	language	Yana	ynn	7685	ynn
+	language	Yanahuanca Pasco Quechua	qur	7686	qur
+	language	Yanda	yda	7687	yda
+	language	Yanda Dom Dogon	dym	7688	dym
+	language	Yandjibara	xyb	7689	xyb
+	language	Yandruwandha	ynd	7690	ynd
+	language	Yanesha'	ame	7691	ame
+	language	Yang Zhuang	zyg	7692	zyg
+	language	Yangben	yav	7693	yav
+	language	Yangkam	bsx	7694	bsx
+	language	Yangman	jng	7695	jng
+	language	Yango	yng	7696	yng
+	language	Yangulam	ynl	7697	ynl
+	language	Yangum Dey	yde	7698	yde
+	language	Yangum Gel	ygl	7699	ygl
+	language	Yangum Mon	ymo	7700	ymo
+	language	Yankunytjatjara	kdd	7701	kdd
+	language	YanomamÃļ	guu	7702	guu
+	language	YanomÃĄmi	wca	7703	wca
+	language	Yansi	yns	7704	yns
+	language	Yanyuwa	jao	7705	jao
+	language	Yao	yao	7706	yao
+	language	Yaosakor Asmat	asy	7707	asy
+	language	YaourÊ	yre	7708	yre
+	language	Yapese	yap	7709	yap
+	language	Yapunda	yev	7710	yev
+	language	Yaqay	jaq	7711	jaq
+	language	Yaqui	yaq	7712	yaq
+	language	Yarawata	yrw	7713	yrw
+	language	Yardliyawarra	yxl	7714	yxl
+	language	Yareba	yrb	7715	yrb
+	language	Yareni Zapotec	zae	7716	zae
+	language	Yarluyandi	yry	7717	yry
+	language	YaroamÃĢ	yro	7718	yro
+	language	Yarsun	yrs	7719	yrs
+	language	Yasa	yko	7720	yko
+	language	Yassic	ysc	7721	ysc
+	language	Yatay	yty	7722	yty
+	language	Yatee Zapotec	zty	7723	zty
+	language	Yatzachi Zapotec	zav	7724	zav
+	language	Yau (Morobe Province)	yuw	7725	yuw
+	language	Yau (Sandaun Province)	yyu	7726	yyu
+	language	Yaul	yla	7727	yla
+	language	Yauma	yax	7728	yax
+	language	Yaur	jau	7729	jau
+	language	Yautepec Zapotec	zpb	7730	zpb
+	language	Yauyos Quechua	qux	7731	qux
+	language	Yavitero	yvt	7732	yvt
+	language	Yawa	yva	7733	yva
+	language	Yawalapití	yaw	7734	yaw
+	language	Yawanawa	ywn	7735	ywn
+	language	Yawarawarga	yww	7736	yww
+	language	Yaweyuha	yby	7737	yby
+	language	Yawijibaya	jbw	7738	jbw
+	language	Yawiyo	ybx	7739	ybx
+	language	Yawuru	ywr	7740	ywr
+	language	Yaygir	xya	7741	xya
+	language	Yazgulyam	yah	7742	yah
+	language	Yecuatla Totonac	tlc	7743	tlc
+	language	Yei	jei	7744	jei
+	language	Yekhee	ets	7745	ets
+	language	Yekora	ykr	7746	ykr
+	language	Yela	yel	7747	yel
+	language	Yele	yle	7748	yle
+	language	Yelmek	jel	7749	jel
+	language	Yelogu	ylg	7750	ylg
+	language	Yemba	ybb	7751	ybb
+	language	Yemsa	jnj	7752	jnj
+	language	Yendang	ynq	7753	ynq
+	language	Yeni	yei	7754	yei
+	language	Yeniche	yec	7755	yec
+	language	Yerakai	yra	7756	yra
+	language	Yeretuar	gop	7757	gop
+	language	Yerong	yrn	7758	yrn
+	language	Yerukula	yeu	7759	yeu
+	language	Yessan-Mayo	yss	7760	yss
+	language	Yetfa	yet	7761	yet
+	language	Yevanic	yej	7762	yej
+	language	Yeyi	yey	7763	yey
+	language	Yiddish	yid	7764	yid	yi
+	language	Yidgha	ydg	7765	ydg
+	language	Yidiny	yii	7766	yii
+	language	Yil	yll	7767	yll
+	language	Yilan Creole	ycr	7768	ycr
+	language	Yimas	yee	7769	yee
+	language	Yimchungru Naga	yim	7770	yim
+	language	Yinbaw Karen	kvu	7771	kvu
+	language	Yindjibarndi	yij	7772	yij
+	language	Yindjilandji	yil	7773	yil
+	language	Yine	pib	7774	pib
+	language	Yinggarda	yia	7775	yia
+	language	Yinhawangka	ywg	7776	ywg
+	language	Yiningayi	ygi	7777	ygi
+	language	Yintale Karen	kvy	7778	kvy
+	language	Yinwum	yxm	7779	yxm
+	language	Yir Yoront	yyr	7780	yyr
+	language	Yirandali	ljw	7781	ljw
+	language	Yirrk-Mel	yrm	7782	yrm
+	language	Yis	yis	7783	yis
+	language	Yitha Yitha	xth	7784	xth
+	language	Yoba	yob	7785	yob
+	language	YocobouÊ Dida	gud	7786	gud
+	language	Yogad	yog	7787	yog
+	language	Yoidik	ydk	7788	ydk
+	language	Yoke	yki	7789	yki
+	language	Yokuts	yok	7790	yok
+	language	Yola	yol	7791	yol
+	language	Yoloxochitl Mixtec	xty	7792	xty
+	language	Yolŋu Sign Language	ygs	7793	ygs
+	language	Yom	pil	7794	pil
+	language	Yombe	yom	7795	yom
+	language	Yonaguni	yoi	7796	yoi
+	language	Yong	yno	7797	yno
+	language	Yongbei Zhuang	zyb	7798	zyb
+	language	Yongkom	yon	7799	yon
+	language	Yongnan Zhuang	zyn	7800	zyn
+	language	Yopno	yut	7801	yut
+	language	Yora	mts	7802	mts
+	language	Yoron	yox	7803	yox
+	language	Yorta Yorta	xyy	7804	xyy
+	language	Yoruba	yor	7805	yor	yo
+	language	YosondÃēa Mixtec	mpm	7806	mpm
+	language	Yotti	yot	7807	yot
+	language	Youjiang Zhuang	zyj	7808	zyj
+	language	Youle Jinuo	jiu	7809	jiu
+	language	Younuo Bunu	buh	7810	buh
+	language	Yout Wam	ytw	7811	ytw
+	language	Yoy	yoy	7812	yoy
+	language	Yuanga	nua	7813	nua
+	language	Yucatec Maya Sign Language	msd	7814	msd
+	language	Yucateco	yua	7815	yua
+	language	Yuchi	yuc	7816	yuc
+	language	YucuaÃąe Mixtec	mvg	7817	mvg
+	language	Yucuna	ycn	7818	ycn
+	language	Yue Chinese	yue	7819	yue
+	language	Yug	yug	7820	yug
+	language	Yugambal	yub	7821	yub
+	language	Yugoslavian Sign Language	ysl	7822	ysl
+	language	Yugul	ygu	7823	ygu
+	language	Yuhup	yab	7824	yab
+	language	Yuki	yuk	7825	yuk
+	language	Yukpa	yup	7826	yup
+	language	Yukuben	ybl	7827	ybl
+	language	Yulu	yul	7828	yul
+	language	Yuqui	yuq	7829	yuq
+	language	Yuracare	yuz	7830	yuz
+	language	Yurats	rts	7831	rts
+	language	Yurok	yur	7832	yur
+	language	Yuru	ljx	7833	ljx
+	language	Yurutí	yui	7834	yui
+	language	Yutanduchi Mixtec	mab	7835	mab
+	language	Yuwana	yau	7836	yau
+	language	Yuyu	yxu	7837	yxu
+	language	Ywom	gek	7838	gek
+	language	YÃĄmana	yag	7839	yag
+	language	Zaachila Zapotec	ztx	7840	ztx
+	language	Zabana	kji	7841	kji
+	language	Zacatepec Chatino	ctz	7842	ctz
+	language	ZacatlÃĄn-AhuacatlÃĄn-Tepetzintla Nahuatl	nhi	7843	nhi
+	language	Zaghawa	zag	7844	zag
+	language	Zaiwa	atb	7845	atb
+	language	Zakhring	zkr	7846	zkr
+	language	Zambian Sign Language	zsl	7847	zsl
+	language	Zan Gula	zna	7848	zna
+	language	Zanaki	zak	7849	zak
+	language	Zande (individual language)	zne	7850	zne
+	language	Zangskari	zau	7851	zau
+	language	Zangwal	zah	7852	zah
+	language	Zaniza Zapotec	zpw	7853	zpw
+	language	Zapotec	zap	7854	zap
+	language	Zaramo	zaj	7855	zaj
+	language	Zari	zaz	7856	zaz
+	language	Zarma	dje	7857	dje
+	language	Zarphatic	zrp	7858	zrp
+	language	Zauzou	zal	7859	zal
+	language	Zay	zwa	7860	zwa
+	language	Zayein Karen	kxk	7861	kxk
+	language	Zayse-Zergulla	zay	7862	zay
+	language	Zaza	zza	7863	zza
+	language	Zazao	jaj	7864	jaj
+	language	Zeem	zem	7865	zem
+	language	Zeeuws	zea	7866	zea
+	language	Zemba	dhm	7867	dhm
+	language	Zeme Naga	nzm	7868	nzm
+	language	Zemgalian	xzm	7869	xzm
+	language	Zenag	zeg	7870	zeg
+	language	Zenaga	zen	7871	zen
+	language	Zenzontepec Chatino	czn	7872	czn
+	language	Zerenkel	zrn	7873	zrn
+	language	Zhaba	zhb	7874	zhb
+	language	Zhang-Zhung	xzh	7875	xzh
+	language	Zhire	zhi	7876	zhi
+	language	Zhoa	zhw	7877	zhw
+	language	Zhuang, Chuang	zha	7878	zha	za	Zhuang	Chuang
+	language	Zia	zia	7879	zia
+	language	Zialo	zil	7880	zil
+	language	Zigula	ziw	7881	ziw
+	language	Zimakani	zik	7882	zik
+	language	Zimba	zmb	7883	zmb
+	language	Zimbabwe Sign Language	zib	7884	zib
+	language	Zinza	zin	7885	zin
+	language	Zire	sih	7886	sih
+	language	Zizilivakan	ziz	7887	ziz
+	language	Zo'Ê	pto	7888	pto
+	language	Zokhuo	yzk	7889	yzk
+	language	Zoogocho Zapotec	zpq	7890	zpq
+	language	Zoroastrian Dari	gbz	7891	gbz
+	language	Zotung Chin	czt	7892	czt
+	language	Zou	zom	7893	zom
+	language	Zul	zlu	7894	zlu
+	language	Zula	zla	7895	zla
+	language	Zulgo-Gemzek	gnd	7896	gnd
+	language	Zulu	zul	7897	zul	zu
+	language	Zumaya	zuy	7898	zuy
+	language	Zumbun	jmb	7899	jmb
+	language	Zuni	zun	7900	zun
+	language	Zuojiang Zhuang	zzj	7901	zzj
+	language	Zyphe Chin	zyp	7902	zyp
+	language	ZÃĄparo	zro	7903	zro
+	language	sTodsde	jih	7904	jih
+	language	us-Saare	uss	7905	uss
+	language	ut-Hun	uth	7906	uth
+	language	ut-Ma'in	gel	7907	gel
+	language	Àhàn	ahn	7908	ahn
+	language	ÁncÃĄ	acb	7909	acb
+	language	Ömie	aom	7910	aom
+	language	Önge	oon	7911	oon
+	language	Į€Gwi	gwj	7912	gwj
+	language	Į€Xam	xam	7913	xam
+	language	ĮAni	hnh	7914	hnh
+	language	ĮGana	gnk	7915	gnk
+	language	ĮXegwi	xeg	7916	xeg
+	language	Į‚Hua	huc	7917	huc
+	language	Į‚Ungkue	gku	7918	gku
+	language	ĮƒXÃŗÃĩ	nmn	7919	nmn
+	language	Not applicable		7920
diff --git a/scripts/issues/8578/citation_languages_develop.tsv b/scripts/issues/8578/citation_languages_develop.tsv
new file mode 100644
index 00000000000..7ce40b389f8
--- /dev/null
+++ b/scripts/issues/8578/citation_languages_develop.tsv
@@ -0,0 +1,186 @@
+	language	Abkhaz	abk	0	abk	ab
+	language	Afar	aar	1	aar	aa
+	language	Afrikaans	afr	2	afr	af
+	language	Akan	aka	3	aka	ak
+	language	Albanian	sqi	4	sqi	alb	sq
+	language	Amharic	amh	5	amh	am
+	language	Arabic	ara	6	ara	ar
+	language	Aragonese	arg	7	arg	an
+	language	Armenian	hye	8	hye	arm	hy
+	language	Assamese	asm	9	asm	as
+	language	Avaric	ava	10	ava	av
+	language	Avestan	ave	11	ave	ae
+	language	Aymara	aym	12	aym	ay
+	language	Azerbaijani	aze	13	aze	az
+	language	Bambara	bam	14	bam	bm
+	language	Bashkir	bak	15	bak	ba
+	language	Basque	eus	16	eus	baq	eu
+	language	Belarusian	bel	17	bel	be
+	language	Bengali, Bangla	ben	18	ben	bn	Bengali	Bangla
+	language	Bihari	bih	19	bih	bh
+	language	Bislama	bis	20	bis	bi
+	language	Bosnian	bos	21	bos	bs
+	language	Breton	bre	22	bre	br
+	language	Bulgarian	bul	23	bul	bg
+	language	Burmese	mya	24	mya	bur	my
+	language	Catalan,Valencian	cat	25	cat	ca	Catalan	Valencian
+	language	Chamorro	cha	26	cha	ch
+	language	Chechen	che	27	che	ce
+	language	Chichewa, Chewa, Nyanja	nya	28	nya	ny	Chichewa	Chewa	Nyanja
+	language	Chinese	zho	29	zho	chi	zh
+	language	Chuvash	chv	30	chv	cv
+	language	Cornish	cor	31	cor	kw
+	language	Corsican	cos	32	cos	co
+	language	Cree	cre	33	cre	cr
+	language	Croatian	hrv	34	hrv	src	hr
+	language	Czech	ces	35	ces	cze	cs
+	language	Danish	dan	36	dan	da
+	language	Divehi, Dhivehi, Maldivian	div	37	div	dv	Divehi	Dhivehi	Maldivian
+	language	Dutch	nld	38	nld	dut	nl
+	language	Dzongkha	dzo	39	dzo	dz
+	language	English	eng	40	eng	en
+	language	Esperanto	epo	41	epo	eo
+	language	Estonian	est	42	est	et
+	language	Ewe	ewe	43	ewe	ee
+	language	Faroese	fao	44	fao	fo
+	language	Fijian	fij	45	fij	fj
+	language	Finnish	fin	46	fin	fi
+	language	French	fra	47	fra	fre	fr
+	language	Fula, Fulah, Pulaar, Pular	ful	48	ful	ff	Fula	Fulah	Pulaar	Pular
+	language	Galician	glg	49	glg	gl
+	language	Georgian	kat	50	kat	geo	ka
+	language	German	deu	51	deu	ger	de
+	language	Greek (modern)	ell	52	ell	gre	el	Greek
+	language	Guaraní	grn	53	grn	gn
+	language	Gujarati	guj	54	guj	gu
+	language	Haitian, Haitian Creole	hat	55	hat	ht	Haitian	Haitian Creole
+	language	Hausa	hau	56	hau	ha
+	language	Hebrew (modern)	heb	57	heb	he
+	language	Herero	her	58	her	hz
+	language	Hindi	hin	59	hin	hi
+	language	Hiri Motu	hmo	60	hmo	ho
+	language	Hungarian	hun	61	hun	hu
+	language	Interlingua	ina	62	ina	ia
+	language	Indonesian	ind	63	ind	id
+	language	Interlingue	ile	64	ile	ie
+	language	Irish	gle	65	gle	ga
+	language	Igbo	ibo	66	ibo	ig
+	language	Inupiaq	ipk	67	ipk	ik
+	language	Ido	ido	68	ido	io
+	language	Icelandic	isl	69	isl	ice	is
+	language	Italian	ita	70	ita	it
+	language	Inuktitut	iku	71	iku	iu
+	language	Japanese	jpn	72	jpn	ja
+	language	Javanese	jav	73	jav	jv
+	language	Kalaallisut, Greenlandic	kal	74	kal	kl	Kalaallisut	Greenlandic
+	language	Kannada	kan	75	kan	kn
+	language	Kanuri	kau	76	kau	kr
+	language	Kashmiri	kas	77	kas	ks
+	language	Kazakh	kaz	78	kaz	kk
+	language	Khmer	khm	79	khm	km
+	language	Kikuyu, Gikuyu	kik	80	kik	ki	Kikuyu	Gikuyu
+	language	Kinyarwanda	kin	81	kin	rw
+	language	Kyrgyz	kir	82	kir	ky	Kirghiz
+	language	Komi	kom	83	kom	kv
+	language	Kongo	kon	84	kon	kg
+	language	Korean	kor	85	kor	ko
+	language	Kurdish	kur	86	kur	ku
+	language	Kwanyama, Kuanyama	kua	87	kua	kj	Kwanyama	Kuanyama
+	language	Latin	lat	88	lat	la
+	language	Luxembourgish, Letzeburgesch	ltz	89	ltz	lb	Luxembourgish	Letzeburgesch
+	language	Ganda	lug	90	lug	lg
+	language	Limburgish, Limburgan, Limburger	lim	91	lim	li	Limburgish	Limburgan	Limburger
+	language	Lingala	lin	92	lin	ln
+	language	Lao	lao	93	lao	lo
+	language	Lithuanian	lit	94	lit	lt
+	language	Luba-Katanga	lub	95	lub	lu
+	language	Latvian	lav	96	lav	lv
+	language	Manx	glv	97	glv	gv
+	language	Macedonian	mkd	98	mkd	mac	mk
+	language	Malagasy	mlg	99	mlg	mg
+	language	Malay	msa	100	msa	may	ms
+	language	Malayalam	mal	101	mal	ml
+	language	Maltese	mlt	102	mlt	mt
+	language	Māori	mri	103	mri	mao	mi	Maori
+	language	Marathi (MarāᚭhÄĢ)	mar	104	mar	mr
+	language	Marshallese	mah	105	mah	mh
+	language	Mixtepec Mixtec	mix	106	mix
+	language	Mongolian	mon	107	mon	mn
+	language	Nauru	nau	108	nau	na
+	language	Navajo, Navaho	nav	109	nav	nv	Navajo	Navaho
+	language	Northern Ndebele	nde	110	nde	nd
+	language	Nepali	nep	111	nep	ne
+	language	Ndonga	ndo	112	ndo	ng
+	language	Norwegian BokmÃĨl	nob	113	nob	nb
+	language	Norwegian Nynorsk	nno	114	nno	nn
+	language	Norwegian	nor	115	nor	no
+	language	Nuosu	iii	116	iii	ii	Sichuan Yi
+	language	Southern Ndebele	nbl	117	nbl	nr
+	language	Occitan	oci	118	oci	oc
+	language	Ojibwe, Ojibwa	oji	119	oji	oj	Ojibwe	Ojibwa
+	language	Old Church Slavonic,Church Slavonic,Old Bulgarian	chu	120	chu	cu
+	language	Oromo	orm	121	orm	om
+	language	Oriya	ori	122	ori	or
+	language	Ossetian, Ossetic	oss	123	oss	os	Ossetian	Ossetic
+	language	Panjabi, Punjabi	pan	124	pan	pa	Panjabi		Punjabi
+	language	Pāli	pli	125	pli	pi
+	language	Persian (Farsi)	fas	126	fas	per	fa
+	language	Polish	pol	127	pol	pl
+	language	Pashto, Pushto	pus	128	pus	ps	Pashto	Pushto
+	language	Portuguese	por	129	por	pt
+	language	Quechua	que	130	que	qu
+	language	Romansh	roh	131	roh	rm
+	language	Kirundi	run	132	run	rn
+	language	Romanian	ron	133	ron	rum	ro
+	language	Russian	rus	134	rus	ru
+	language	Sanskrit (Saṁskṛta)	san	135	san	sa
+	language	Sardinian	srd	136	srd	sc
+	language	Sindhi	snd	137	snd	sd
+	language	Northern Sami	sme	138	sme	se
+	language	Samoan	smo	139	smo	sm
+	language	Sango	sag	140	sag	sg
+	language	Serbian	srp	141	srp	scc	sr
+	language	Scottish Gaelic, Gaelic	gla	142	gla	gd	Scottish Gaelic	Gaelic
+	language	Shona	sna	143	sna	sn
+	language	Sinhala, Sinhalese	sin	144	sin	si	Sinhala	Sinhalese
+	language	Slovak	slk	145	slk	slo	sk
+	language	Slovene	slv	146	slv	sl	Slovenian
+	language	Somali	som	147	som	so
+	language	Southern Sotho	sot	148	sot	st
+	language	Spanish, Castilian	spa	149	spa	es	Spanish	Castilian
+	language	Sundanese	sun	150	sun	su
+	language	Swahili	swa	151	swa	sw
+	language	Swati	ssw	152	ssw	ss
+	language	Swedish	swe	153	swe	sv
+	language	Tamil	tam	154	tam	ta
+	language	Telugu	tel	155	tel	te
+	language	Tajik	tgk	156	tgk	tg
+	language	Thai	tha	157	tha	th
+	language	Tigrinya	tir	158	tir	ti
+	language	Tibetan Standard, Tibetan, Central	bod	159	bod	tib	bo	Tibetan Standard	Tibetan Central
+	language	Turkmen	tuk	160	tuk	tk
+	language	Tagalog	tgl	161	tgl	tl
+	language	Tswana	tsn	162	tsn	tn
+	language	Tonga (Tonga Islands)	ton	163	ton	to	Tonga
+	language	Turkish	tur	164	tur	tr
+	language	Tsonga	tso	165	tso	ts
+	language	Tatar	tat	166	tat	tt
+	language	Twi	twi	167	twi	tw
+	language	Tahitian	tah	168	tah	ty
+	language	Uyghur, Uighur	uig	169	uig	ug	Uyghur	Uighur
+	language	Ukrainian	ukr	170	ukr	uk
+	language	Urdu	urd	171	urd	ur
+	language	Uzbek	uzb	172	uzb	uz
+	language	Venda	ven	173	ven	ve
+	language	Vietnamese	vie	174	vie	vi
+	language	VolapÃŧk	vol	175	vol	vo
+	language	Walloon	wln	176	wln	wa
+	language	Welsh	cym	177	cym	wel	cy
+	language	Wolof	wol	178	wol	wo
+	language	Western Frisian	fry	179	fry	fy
+	language	Xhosa	xho	180	xho	xh
+	language	Yiddish	yid	181	yid	yi
+	language	Yoruba	yor	182	yor	yo
+	language	Zhuang, Chuang	zha	183	zha	za	Zhuang	Chuang
+	language	Zulu	zul	184	zul	zu
+	language	Not applicable		185											
diff --git a/scripts/issues/8578/script_check_languages.pl b/scripts/issues/8578/script_check_languages.pl
new file mode 100755
index 00000000000..fb85fe9cd3a
--- /dev/null
+++ b/scripts/issues/8578/script_check_languages.pl
@@ -0,0 +1,189 @@
+#!/usr/bin/perl
+use utf8;
+
+
+$USAGE = "usage: <this_script.pl> -check[codes|names] citation_languages_10762.tsv citation_languages_develop.tsv\n";
+
+$mode = shift @ARGV;
+$citation_languages_file_new = shift @ARGV;
+$citation_languages_file_develop = shift @ARGV;
+
+unless ( $mode eq "-checkcodes" || $mode eq "-checknames" )
+{
+    print STDERR $USAGE;
+    exit 1;
+}
+    
+
+unless ( $citation_languages_file_new
+	 && $citation_languages_file_develop
+	 && -f $citation_languages_file_new
+	 && -f $citation_languages_file_develop )
+{
+    print STDERR $USAGE; 
+    exit 1; 
+}
+
+print "Parsing the new languages list...\n";
+
+open FINP, $citation_languages_file_new; 
+
+while ( $_ = <FINP>)
+{
+    chop;
+    
+    @_ = split ("\t", $_);
+
+    if ($_[1] ne "language")
+    {
+	die "illegal entry: $_\n";
+    }
+
+    $mainname = $_[2];
+    if ( $mainname !~/^[\p{L}\p{M}].*[\p{L}\p{M} \)']$/ )
+    {
+	#print STDERR "warning: (potentially?) illegal language name (main): " . $mainname . "\n";
+    }
+
+    if ( $mainname ne "Not applicable" && $_[3] !~/^[a-z][a-z][a-z]$/ )
+    {
+	die "Error: Illegal entry: no 3-letter identifier code in the 3rd column: " . $_ . "\n";
+    }
+    else
+    {
+	$identifier = $_[3];
+	$LANGUAGE_NAMES{$identifier} = $mainname;
+    }
+    
+    unless ($_[4] >= 0)
+    {
+	die "Error: illegal entry: (no CVV ref. number) " . $_ . "\n";
+    }
+
+    $threelettercode = $_[5];
+
+    unless ( $mainname eq "Not applicable" || $threelettercode =~/^[a-z][a-z][a-z]$/ )
+    {
+        die "Error: No 3-letter code in the 5th column: " . join ("***", @_) . "\n";
+    }
+    else
+    {
+	$hash = {};
+	$hash->{$threelettercode} = 1; 
+    
+    }
+
+    if ( $identifier ne $threelettercode )
+    {
+	print STDERR "warning: the identifier in the 3rd column is different from the first \"alternate\" in the 5th: " . $_ . "\n";
+    }
+    
+
+    for ( $c = 6; $c <= $#_; $c++ )
+    {
+	$alternate = $_[$c];
+	$hash->{$alternate} = 1 if $alternate ne "";
+    }
+
+    $LANGUAGE_ALTERNATES{$identifier} = $hash; 
+    $num_new++;
+}
+
+close FINP;
+print $num_new . " language entries processed. All entries well-formed.\n";
+
+
+## Now let's go through the previously supported languages and compare how they are treated in the new CVV:
+
+print "Processing the previously supported list:\n";
+
+open FINP, $citation_languages_file_develop;
+
+while ($_ = <FINP>)
+{
+    chop;
+    
+    @_ = split ("\t", $_);
+
+    if ($_[1] ne "language")
+    {
+	die "illegal entry: $_\n";
+    }
+
+    $mainname = $_[2];
+
+    if ($mainname ne "Not applicable")
+    {
+	if ($_[3] !~/^[a-z][a-z][a-z]$/) 
+	{
+	    die "Error: Illegal entry: no 3-letter identifier code in the 3rd column: " . $_ . "\n";
+	}
+	else
+	{
+	    $identifier = $_[3];
+
+	    unless ($LANGUAGE_NAMES{$identifier})
+	    {
+		die "Previously supported language " . $identifier . " (" . $mainname . ") is no longer on the list.\n";
+	    }
+
+	    if ( $mode eq "-checknames" )
+	    {
+		if ($mainname ne $LANGUAGE_NAMES{$identifier})
+		{
+		    print "Language name different for id " . $identifier . ": old: " . $mainname . ", new: " . $LANGUAGE_NAMES{$identifier} . "\n";
+		}
+	    }
+	}
+    }
+    
+    unless ($_[4] >= 0)
+    {
+	die "Error: illegal entry: (no CVV ref. number) " . $_ . "\n";
+    }
+
+    $threelettercode = $_[5];
+
+    if ( $mainname ne "Not applicable" )
+    {
+	unless ( $threelettercode =~/^[a-z][a-z][a-z]$/ )
+	{
+	    die "Error: No 3-letter code in the 5th column: " . join ("***", @_) . "\n";
+	}
+	else
+	{
+	    if ( $mode eq "-checkcodes" )
+	    {
+		unless ($LANGUAGE_ALTERNATES{$identifier}->{$threelettercode})
+		{
+		    print "identifier: " . $identifier . ", main 3-letter code \"" . $threelettercode . "\" is not found in the new list!\n";
+		}
+	    }
+	}
+    }
+
+    if ( $mainname ne "Not applicable" && $identifier ne $threelettercode )
+    {
+	die "warning: the identifier in the 3rd column is different from the first \"alternate\" in the 5th: " . $_ . "\n";
+    }
+    
+    if ( $mode eq "-checkcodes" )
+    {
+	for ( $c = 6; $c <= $#_; $c++ )
+	{
+	    $alternate = $_[$c];
+
+	    if ( $alternate ne "" )
+	    {
+		unless ($LANGUAGE_ALTERNATES{$identifier}->{$alternate})
+		{
+		    print "identifier: " . $identifier . ", alternate value " . $alternate . " is missing in the new list!\n";
+		}	    
+	    }
+	}
+    }
+
+    $num_develop++; 
+}
+
+print $num_develop . " develop branch entries processed.\n";
diff --git a/scripts/issues/8600/delete_orphan_templates_8600.sh b/scripts/issues/8600/delete_orphan_templates_8600.sh
new file mode 100755
index 00000000000..0ee3fa6dbd7
--- /dev/null
+++ b/scripts/issues/8600/delete_orphan_templates_8600.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+# begin config
+# PostgresQL credentials:
+# edit the following lines so that psql can talk to your database
+pg_host=localhost
+pg_port=5432
+pg_user=dvnapp
+pg_db=dvndb
+#edit this line with the server for the api call to delete orphan templates
+SERVER=http://localhost:8080/api
+# you can leave the password blank, if Postgres is configured 
+# to accept connections without auth:
+pg_pass=
+# psql executable - add full path, if necessary:
+PSQL_EXEC=psql
+
+# end config
+
+# check for orphan template : 
+
+PG_QUERY_0="SELECT count(t.id) FROM template t WHERE dataverse_id is null;"
+PG_QUERY_1="SELECT t.id, ',' FROM template t WHERE dataverse_id is null;"
+
+PGPASSWORD=$pg_pass; export PGPASSWORD
+
+echo "Checking the total number of orphan templates in database..."
+
+NUM_TEMPLATES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_0}"`
+if [ $? != 0 ]
+then
+    echo "FAILED to execute psql! Check the credentials and try again?"
+    echo "exiting..."
+    echo 
+    echo "the command line that failed:"
+    echo "${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c \"${PG_QUERY_0}\""
+    exit 1
+fi
+
+echo $NUM_TEMPLATES total.
+echo 
+
+
+TEMPLATE_ID=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_1}"`
+
+echo $TEMPLATE_ID  to remove.
+
+
+${PSQL_EXEC}  -h ${pg_host} -U ${pg_user} -d ${pg_db} -t -c "${PG_QUERY_1}" \
+    -t \
+    --field-separator ' ' \
+    --quiet \
+| while read -a Record ; do
+    id=${Record[0]}
+
+	if [[ "x${id}" = "x" ]]
+	then
+		echo "nothing to do here"
+        else
+            curl -X DELETE $SERVER/admin/template/${id}
+            echo "template ${id} deleted "	
+        fi
+
+done
+
+NUM_TEMPLATES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_0}"`
+
+echo $NUM_TEMPLATES orphan templates remaining.
+
+
diff --git a/scripts/r/rserve/rserve-setup.sh b/scripts/r/rserve/rserve-setup.sh
index 2ed0dae2700..48ee747499a 100755
--- a/scripts/r/rserve/rserve-setup.sh
+++ b/scripts/r/rserve/rserve-setup.sh
@@ -47,7 +47,7 @@ then
     echo "You can start Rserve daemon by executing"
     echo "  service rserve start"
     echo 
-    echo "If this is a RedHat/CentOS 7 system, you may want to use the systemctl file rserve.service instead (provided in this directory)"
+    echo "If this is a RedHat/CentOS 7/8 system, you may want to use the systemctl file rserve.service instead (provided in this directory)"
 else 
     echo "Rserve startup file already in place."
 fi
diff --git a/scripts/rapache/build.sh b/scripts/rapache/build.sh
deleted file mode 100755
index fc4823775d5..00000000000
--- a/scripts/rapache/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-mkdir -p ~/rpmbuild/SOURCES
-mkdir -p ~/rpmbuild/SPECS
-wget https://github.com/jeffreyhorner/rapache/archive/v1.2.7.tar.gz -O rapache-1.2.7.tar.gz
-tar xzvf rapache-1.2.7.tar.gz rapache-1.2.7/rpm/rapache.spec --strip-components 2
-# Move to build dirs
-cp -f rapache-1.2.7.tar.gz ~/rpmbuild/SOURCES/
-cp -f rapache.spec ~/rpmbuild/SPECS/
-cd ~
-rpmbuild -ba ~/rpmbuild/SPECS/rapache.spec
diff --git a/scripts/search/data/shape/shapefile.zip b/scripts/search/data/shape/shapefile.zip
new file mode 100644
index 00000000000..c4da60f0b80
Binary files /dev/null and b/scripts/search/data/shape/shapefile.zip differ
diff --git a/scripts/search/tests/data/dataset-finch1-fileLimit.json b/scripts/search/tests/data/dataset-finch1-fileLimit.json
new file mode 100644
index 00000000000..d223ace47e5
--- /dev/null
+++ b/scripts/search/tests/data/dataset-finch1-fileLimit.json
@@ -0,0 +1,82 @@
+{
+  "datasetVersion": {
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
+    "metadataBlocks": {
+      "citation": {
+        "fields": [
+          {
+            "value": "Darwin's Finches",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "title"
+          },
+          {
+            "value": [
+              {
+                "authorName": {
+                  "value": "Finch, Fiona",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorName"
+                },
+                "authorAffiliation": {
+                  "value": "Birds Inc.",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorAffiliation"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "author"
+          },
+          {
+            "value": [ 
+                { "datasetContactEmail" : {
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "datasetContactEmail",
+                    "value" : "finch@mailinator.com"
+                },
+                "datasetContactName" : {
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "datasetContactName",
+                    "value": "Finch, Fiona"
+                }
+            }],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "datasetContact"
+          },
+          {
+            "value": [ {
+               "dsDescriptionValue":{
+                "value":   "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.",
+                "multiple":false,
+               "typeClass": "primitive",
+               "typeName": "dsDescriptionValue"
+            }}],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "dsDescription"
+          },
+          {
+            "value": [
+              "Medicine, Health and Life Sciences"
+            ],
+            "typeClass": "controlledVocabulary",
+            "multiple": true,
+            "typeName": "subject"
+          }
+        ],
+        "displayName": "Citation Metadata"
+      }
+    }
+  },
+  "datasetFileCountLimit": 100
+}
diff --git a/scripts/search/tests/data/dataset-finch1-nolicense.json b/scripts/search/tests/data/dataset-finch1-nolicense.json
new file mode 100644
index 00000000000..ec0856a2aa3
--- /dev/null
+++ b/scripts/search/tests/data/dataset-finch1-nolicense.json
@@ -0,0 +1,77 @@
+{
+  "datasetVersion": {
+    "metadataBlocks": {
+      "citation": {
+        "fields": [
+          {
+            "value": "Darwin's Finches",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "title"
+          },
+          {
+            "value": [
+              {
+                "authorName": {
+                  "value": "Finch, Fiona",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorName"
+                },
+                "authorAffiliation": {
+                  "value": "Birds Inc.",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorAffiliation"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "author"
+          },
+          {
+            "value": [ 
+                { "datasetContactEmail" : {
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "datasetContactEmail",
+                    "value" : "finch@mailinator.com"
+                },
+                "datasetContactName" : {
+                    "typeClass": "primitive",
+                    "multiple": false,
+                    "typeName": "datasetContactName",
+                    "value": "Finch, Fiona"
+                }
+            }],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "datasetContact"
+          },
+          {
+            "value": [ {
+               "dsDescriptionValue":{
+                "value":   "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.",
+                "multiple":false,
+               "typeClass": "primitive",
+               "typeName": "dsDescriptionValue"
+            }}],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "dsDescription"
+          },
+          {
+            "value": [
+              "Medicine, Health and Life Sciences"
+            ],
+            "typeClass": "controlledVocabulary",
+            "multiple": true,
+            "typeName": "subject"
+          }
+        ],
+        "displayName": "Citation Metadata"
+      }
+    }
+  }
+}
diff --git a/scripts/search/tests/data/dataset-finch1.json b/scripts/search/tests/data/dataset-finch1.json
index ec0856a2aa3..433ea758711 100644
--- a/scripts/search/tests/data/dataset-finch1.json
+++ b/scripts/search/tests/data/dataset-finch1.json
@@ -1,5 +1,9 @@
 {
   "datasetVersion": {
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
     "metadataBlocks": {
       "citation": {
         "fields": [
diff --git a/scripts/search/tests/data/dataset-finch1.jsonld b/scripts/search/tests/data/dataset-finch1.jsonld
new file mode 100644
index 00000000000..9e4b10033e9
--- /dev/null
+++ b/scripts/search/tests/data/dataset-finch1.jsonld
@@ -0,0 +1,26 @@
+
+{
+  "http://purl.org/dc/terms/title": "Darwin's Finches",
+  "http://purl.org/dc/terms/subject": "Medicine, Health and Life Sciences",
+  "http://purl.org/dc/terms/creator": {
+      "https://dataverse.org/schema/citation/authorName": "Finch, Fiona",
+      "https://dataverse.org/schema/citation/authorAffiliation": "Birds Inc."
+  },
+  "https://dataverse.org/schema/citation/datasetContact": {
+    "https://dataverse.org/schema/citation/datasetContactEmail": "finch@mailinator.com",
+    "https://dataverse.org/schema/citation/datasetContactName": "Finch, Fiona"
+  },
+  "https://dataverse.org/schema/citation/dsDescription": {
+    "https://dataverse.org/schema/citation/dsDescriptionValue": "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds."
+  },
+  "@type": [
+    "http://www.openarchives.org/ore/terms/Aggregation",
+    "http://schema.org/Dataset"
+  ],
+  "http://schema.org/version": "DRAFT",
+  "http://schema.org/name": "Darwin's Finches",
+    "https://dataverse.org/schema/core#fileTermsOfAccess": {
+        "https://dataverse.org/schema/core#fileRequestAccess": true
+    },
+    "http://schema.org/includedInDataCatalog": "Root"
+}
\ No newline at end of file
diff --git a/scripts/search/tests/data/dataset-finch2.json b/scripts/search/tests/data/dataset-finch2.json
index d20f835b629..446df54676a 100644
--- a/scripts/search/tests/data/dataset-finch2.json
+++ b/scripts/search/tests/data/dataset-finch2.json
@@ -1,5 +1,9 @@
 {
   "datasetVersion": {
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
     "metadataBlocks": {
       "citation": {
         "fields": [
diff --git a/scripts/search/tests/data/dataset-finch3.json b/scripts/search/tests/data/dataset-finch3.json
new file mode 100644
index 00000000000..903b0aa124d
--- /dev/null
+++ b/scripts/search/tests/data/dataset-finch3.json
@@ -0,0 +1,102 @@
+{
+  "datasetVersion": {
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
+    "metadataBlocks": {
+      "citation": {
+        "fields": [
+          {
+            "value": "HTML & More",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "title"
+          },
+          {
+            "value": [
+              {
+                "authorName": {
+                  "value": "Markup, Marty",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorName"
+                },
+                "authorAffiliation": {
+                  "value": "W4C",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorAffiliation"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "author"
+          },
+          {
+            "value": [
+              {
+                "datasetContactEmail": {
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "datasetContactEmail",
+                  "value": "markup@mailinator.com"
+                },
+                "datasetContactName": {
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "datasetContactName",
+                  "value": "Markup, Marty"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "datasetContact"
+          },
+          {
+            "value": [
+              {
+                "dsDescriptionValue": {
+                  "value": "BEGIN<br></br>END",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "typeName": "dsDescriptionValue"
+                },
+                "dsDescriptionDate": {
+                  "typeName": "dsDescriptionDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "2021-07-13"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "dsDescription"
+          },
+          {
+            "value": [
+              "Medicine, Health and Life Sciences"
+            ],
+            "typeClass": "controlledVocabulary",
+            "multiple": true,
+            "typeName": "subject"
+          },
+          {
+            "typeName": "language",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "English",
+              "Afar",
+              "aar"
+            ]
+          }
+        ],
+        "displayName": "Citation Metadata"
+      }
+    }
+  }
+}
diff --git a/scripts/search/tests/data/datasetMissingReqFields.json b/scripts/search/tests/data/datasetMissingReqFields.json
new file mode 100644
index 00000000000..6a3975e18bb
--- /dev/null
+++ b/scripts/search/tests/data/datasetMissingReqFields.json
@@ -0,0 +1,16 @@
+{
+    "datasetVersion": {
+        "metadataBlocks": {
+            "citation": {
+                "fields": [
+                    {
+                        "value": "Only A Title",
+                        "typeClass": "primitive",
+                        "multiple": false,
+                        "typeName": "title"
+                    }
+                ]
+            }
+        }
+    }
+}
diff --git a/scripts/search/tests/data/emptyDataset.json b/scripts/search/tests/data/emptyDataset.json
new file mode 100644
index 00000000000..b1117513fbd
--- /dev/null
+++ b/scripts/search/tests/data/emptyDataset.json
@@ -0,0 +1,10 @@
+{
+    "datasetVersion": {
+        "metadataBlocks": {
+            "citation": {
+                "fields": [
+                ]
+            }
+        }
+    }
+}
diff --git a/scripts/setup/asadmin-setup.sh b/scripts/setup/asadmin-setup.sh
deleted file mode 100755
index 8b50d2f2366..00000000000
--- a/scripts/setup/asadmin-setup.sh
+++ /dev/null
@@ -1,212 +0,0 @@
-#!/bin/bash
-# STOP!
-# DO NOT ADD MORE ASADMIN COMMANDS TO THIS SCRIPT!
-# IF YOU NEED TO ADD MORE GLASSFISH CONFIG SETTINGS, ADD THEM 
-# TO THE ../installer/glassfish-setup.sh SCRIPT. 
-# I'M ASSUMING THAT WE'LL WANT TO CONTINUE MAINTAINING THIS SCRIPT, 
-# (FOR VAGRANT SETUPS, etc.?); IT SHOULD STILL BE WORKING, BY 
-# CALLING THE NEW SCRIPT ABOVE - SO NO NEED TO DUPLICATE THE ASADMIN 
-# COMMANDS HERE. 
-# FROM NOW ON, ONLY NON-ASADMIN CONFIGURATION SHOULD GO INTO THIS 
-# SCRIPT. (which makes the name especially misleading - but I didn't 
-# want to change it, in case other scripts are calling it by name!)
-#     -Leonid 4.0 beta
-
-# This is a setup script for setting up Glassfish 4 to run Dataverse
-# The script was tested on Mac OS X.9
-# ASSUMPTIONS
-# * Script has to run locally (i.e. on the machine that hosts the server)
-# * Internet connectivity is assumed, in order to get the postgresql driver.
-
-##
-# Default values - Change to suit your machine.
-DEFAULT_GLASSFISH_ROOT=/Applications/NetBeans/glassfish-4.0
-DEFAULT_DOMAIN=domain1
-DEFAULT_ASADMIN_OPTS=" "
-
-###
-# Database values. Update as needed.
-# Note: DB_USER "dvnApp" is case-sensitive and later used in "scripts/database/reference_data.sql"
-#
-DB_PORT=5432; export DB_PORT
-DB_HOST=localhost; export DB_HOST
-DB_NAME=dvndb; export DB_NAME
-DB_USER=dvnApp; export DB_USER
-DB_PASS=dvnAppPass; export DB_PASS
-
-###
-# Rserve configuration: 
-RSERVE_HOST=localhost; export RSERVE_HOST
-RSERVE_PORT=6311; export RSERVE_PORT
-RSERVE_USER=rserve; export RSERVE_USER
-RSERVE_PASS=rserve; export RSERVE_PASS
-
-###
-# Other configuration values: 
-MEM_HEAP_SIZE=1024; export MEM_HEAP_SIZE
-HOST_ADDRESS=localhost; export HOST_ADDRESS
-SMTP_SERVER=mail.hmdc.harvard.edu; export SMTP_SERVER
-FILES_DIR=${HOME}/dataverse/files; export FILES_DIR
-
-### End of default configuration values.
-
-# "${VAR+xxx}" for unset vs. empty per http://stackoverflow.com/questions/228544/how-to-tell-if-a-string-is-not-defined-in-a-bash-shell-script/230593#230593
-
-if [ "${DB_NAME_CUSTOM+xxx}" ]
- then
-  echo "Default DB_NAME ($DB_NAME) overridden: $DB_NAME_CUSTOM"
-  DB_NAME=$DB_NAME_CUSTOM
-fi
-
-if [ "${DB_USER_CUSTOM+xxx}" ]
- then
-  echo "Default DB_USER ($DB_USER) overridden: $DB_USER_CUSTOM"
-  DB_USER=$DB_USER_CUSTOM
-fi
-
-if [ "${DB_PASS_CUSTOM+xxx}" ]
- then
-  echo "Default DB_PASS ($DB_PASS) overridden: $DB_PASS_CUSTOM"
-  DB_PASS=$DB_PASS_CUSTOM
-fi
-
-#echo "end"
-#exit
-
-## 
-# External dependencies
-PGSQL_DRIVER_URL=http://jdbc.postgresql.org/download/postgresql-9.3-1100.jdbc41.jar
-
-if [ "$SUDO_USER" = "vagrant" ]
-  then
-  echo "We are running in a Vagrant environment."
-  cat /etc/redhat-release
-  # Choosing all lower case indentifiers for DB_NAME and DB_USER for this reason:
-  #
-  # Quoting an identifier also makes it case-sensitive, whereas unquoted names
-  # are always folded to lower case. For example, the identifiers FOO, foo, and
-  # "foo" are considered the same by PostgreSQL, but "Foo" and "FOO" are
-  # different from these three and each other. (The folding of unquoted names
-  # to lower case in PostgreSQL is incompatible with the SQL standard, which
-  # says that unquoted names should be folded to upper case. Thus, foo should
-  # be equivalent to "FOO" not "foo" according to the standard. If you want to
-  # write portable applications you are advised to always quote a particular
-  # name or never quote it.) --
-  # http://www.postgresql.org/docs/9.3/static/sql-syntax-lexical.html
-  DB_NAME=dataverse_db
-  DB_USER=dataverse_app
-  DB_PASS=secret
-  echo "Configuring EPEL Maven repo "
-  cd /etc/yum.repos.d
-  wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo
-  cd
-  echo "Installing dependencies via yum"
-  yum install -y -q java-1.7.0-openjdk-devel postgresql-server apache-maven httpd mod_ssl
-  rpm -q postgresql-server
-  echo "Starting PostgreSQL"
-  chkconfig postgresql on
-  /sbin/service postgresql initdb
-  cp -a /var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/data/pg_hba.conf.orig
-  sed -i -e 's/ident$/trust/' /var/lib/pgsql/data/pg_hba.conf
-  /sbin/service postgresql start
-  POSTGRES_USER=postgres
-  echo "Creating database user $DB_USER"
-  su $POSTGRES_USER -s /bin/sh -c "psql -c \"CREATE ROLE \"$DB_USER\" UNENCRYPTED PASSWORD '$DB_PASS' NOSUPERUSER CREATEDB CREATEROLE NOINHERIT LOGIN\""
-  #su $POSTGRES_USER -s /bin/sh -c "psql -c '\du'"
-  echo "Creating database $DB_NAME"
-  su $POSTGRES_USER -s /bin/sh -c "psql -c 'CREATE DATABASE \"$DB_NAME\" WITH OWNER = \"$DB_USER\"'"
-  GLASSFISH_USER=glassfish
-  echo "Ensuring Unix user '$GLASSFISH_USER' exists"
-  useradd $GLASSFISH_USER || :
-  GLASSFISH_ZIP=`ls /downloads/glassfish*zip`
-  GLASSFISH_USER_HOME=~glassfish
-  echo "Copying $GLASSFISH_ZIP to $GLASSFISH_USER_HOME and unzipping"
-  su $GLASSFISH_USER -s /bin/sh -c "cp $GLASSFISH_ZIP $GLASSFISH_USER_HOME"
-  su $GLASSFISH_USER -s /bin/sh -c "cd $GLASSFISH_USER_HOME && unzip -q $GLASSFISH_ZIP"
-  DEFAULT_GLASSFISH_ROOT=$GLASSFISH_USER_HOME/glassfish4
-  su $GLASSFISH_USER -s /bin/sh -c "/scripts/installer/glassfish-setup.sh"
-fi
-
-
-# Set the scripts parameters (if needed)
-if [ -z "${GLASSFISH_ROOT+xxx}" ]
- then
-  echo setting GLASSFISH_ROOT to $DEFAULT_GLASSFISH_ROOT
-  GLASSFISH_ROOT=$DEFAULT_GLASSFISH_ROOT; export GLASSFISH_ROOT
-fi
-if [ ! -d "$GLASSFISH_ROOT" ]
-  then
-    echo Glassfish root '$GLASSFISH_ROOT' does not exist
-    exit 1
-fi
-GLASSFISH_BIN_DIR=$GLASSFISH_ROOT/bin
-
-if [ -z "${DOMAIN+xxx}" ]
-  then
-    echo setting DOMAIN to $DEFAULT_DOMAIN
-    DOMAIN=$DEFAULT_DOMAIN
-    # setting the environmental variable GLASSFISH_DOMAIN, 
-    # for the ../installer/glassfish-setup.sh script, that runs 
-    # all the required asadmin comands
-    GLASSFISH_DOMAIN=$DOMAIN; export GLASSFISH_DOMAIN
-fi
-DOMAIN_DIR=$GLASSFISH_ROOT/glassfish/domains/$DOMAIN
-if [ ! -d "$DOMAIN_DIR" ]
-  then
-    echo Domain directory '$DOMAIN_DIR' does not exist
-    exit 2
-fi
-if [ -z "$ASADMIN_OPTS" ]
- then
-  ASADMIN_OPTS=$DEFAULT_ASADMIN_OPTS; export ASADMIN_OPTS
-fi
-
-echo "Setting up your glassfish4 to support Dataverse"
-echo "Glassfish directory: "$GLASSFISH_ROOT
-echo "Domain directory:    "$DOMAIN_DIR
-
-###
-# getting the postgres driver
-DOMAIN_LIB=$DOMAIN_DIR/lib
-if ! grep -qs postgres $DOMAIN_LIB/*
-  then
-    DRIVER_NAME=$(echo $PGSQL_DRIVER_URL | tr / \\n | tail -n1)
-    echo Downloading postgresql driver '$DRIVER_NAME'
-    wget $PGSQL_DRIVER_URL -O $DOMAIN_LIB/$DRIVER_NAME
-  else
-    echo postgresql driver already installed.
-fi
-
-if [ "$SUDO_USER" = "vagrant" ]
-  then
-  /scripts/installer/glassfish-setup.sh
-  echo "Done configuring Vagrant environment"
-  exit 0
-fi
-
-###
-# Move to the glassfish dir
-pushd $GLASSFISH_BIN_DIR
-
-###
-# take the domain up, if needed.
-DOMAIN_DOWN=$(./asadmin list-domains | grep "$DOMAIN " | grep "not running")
-if [  $(echo $DOMAIN_DOWN|wc -c) -ne 1  ];
-  then
-    echo Trying to start domain $DOMAIN up...
-    ./asadmin $ASADMIN_OPTS start-domain $DOMAIN
-  else
-    echo domain running
-fi
-
-# ONCE AGAIN, ASADMIN COMMANDS BELOW HAVE ALL BEEN MOVED INTO scripts/installer/glassfish-setup.sh
-
-# TODO: diagnostics
-
-###
-# Clean up
-popd
-
-echo "Glassfish setup complete"
-date
-
diff --git a/scripts/tests/ec2-memory-benchmark/README.md b/scripts/tests/ec2-memory-benchmark/README.md
index 4d9a61cbeb0..a7c394002d5 100644
--- a/scripts/tests/ec2-memory-benchmark/README.md
+++ b/scripts/tests/ec2-memory-benchmark/README.md
@@ -9,10 +9,12 @@ In order to run the benchmark test you will need the following:
 * Have your AWS credentials configured, so that you can spin up EC2 instances. 
 
 All the other pieces will be downloaded automatically (from the
-`IQSS/dataverse-ansible` and `IQSS/dataverse-sample-data` GitHub repos),
+`GlobalDataverseCommunityConsortium/dataverse-ansible` and `IQSS/dataverse-sample-data` GitHub repos),
 either locally, where you're running the script, or on the newly
 created instance.
 
+The main reason a dedicated Ansible config file is used is to enable "sampledata".
+
 Run the script as follows: 
 
 ```
diff --git a/scripts/tests/ec2-memory-benchmark/ec2-memory-benchmark-remote.sh b/scripts/tests/ec2-memory-benchmark/ec2-memory-benchmark-remote.sh
index d5a647ac071..367aa214563 100755
--- a/scripts/tests/ec2-memory-benchmark/ec2-memory-benchmark-remote.sh
+++ b/scripts/tests/ec2-memory-benchmark/ec2-memory-benchmark-remote.sh
@@ -5,23 +5,25 @@ then
     EC2_HTTP_LOCATION="<EC2 INSTANCE HTTP ADDRESS>"
 fi
 
-DATAVERSE_APP_DIR=/usr/local/glassfish4/glassfish/domains/domain1/applications/dataverse; export DATAVERSE_APP_DIR
+DATAVERSE_APP_DIR=/usr/local/payara6/glassfish/domains/domain1/applications/dataverse; export DATAVERSE_APP_DIR
 
-# restart glassfish: 
+# restart app server
 
-echo "Restarting Glassfish..."
+echo "Restarting app server..."
+
+# still "glassfish" until Ansible is updated
 
 systemctl restart glassfish
 
 echo "done."
 
-# obtain the pid of the running glassfish process:
+# obtain the pid of the running app server process:
 
-GLASSFISH_PID=`ps awux | grep ^glassfi | awk '{print $2}' `; export GLASSFISH_PID 
+APP_SERVER_PID=`ps awux | grep ^dataver | awk '{print $2}' `; export APP_SERVER_PID
 
-if [ ${GLASSFISH_PID}"x" = "x" ]
+if [ ${APP_SERVER_PID}"x" = "x" ]
 then
-    echo "Failed to obtain the process id of the running Glassfish process!"
+    echo "Failed to obtain the process id of the running app server process!"
     exit 1;
 fi
 
@@ -34,7 +36,7 @@ yum -y install gnuplot >/dev/null
 
 GPLOT=gplot-1.11/gplot.pl; export GPLOT
 GPLOTDIST=https://pilotfiber.dl.sourceforge.net/project/gplot/gplot/gplot-1.11.tar.gz; export GPLOTDIST
-(cd /tmp; curl --insecure ${GPLOTDIST} 2>/dev/null | tar xzf - ${GPLOT} >/dev/null)
+(cd /tmp; curl -L --insecure ${GPLOTDIST} 2>/dev/null | tar xzf - ${GPLOT} >/dev/null)
 
 
 # Bombard the application with some GET requests. 
@@ -97,7 +99,7 @@ do
 
         # after every {repeat_outer} number of GETs, run jmap and save the output in a temp file:
 
-	sudo -u glassfish jmap -histo ${GLASSFISH_PID} > /tmp/jmap.histo.out
+	sudo -u dataverse jmap -histo ${APP_SERVER_PID} > /tmp/jmap.histo.out
 	
         # select the dataverse classes from the histo output: 
 	#grep '  edu\.harvard\.iq\.dataverse' /tmp/jmap.histo.out
@@ -119,7 +121,7 @@ do
 	echo 
 
         # run jstat to check on GC: 
-	sudo -u glassfish jstat -gcutil ${GLASSFISH_PID} 1000 1 2>/dev/null
+	sudo -u dataverse jstat -gcutil ${APP_SERVER_PID} 1000 1 2>/dev/null
 
 	echo 
 
diff --git a/scripts/tests/ec2-memory-benchmark/ec2-memory-benchmark.sh b/scripts/tests/ec2-memory-benchmark/ec2-memory-benchmark.sh
index 0f49d848c95..1694cdd4a19 100755
--- a/scripts/tests/ec2-memory-benchmark/ec2-memory-benchmark.sh
+++ b/scripts/tests/ec2-memory-benchmark/ec2-memory-benchmark.sh
@@ -8,14 +8,14 @@ then
 fi
 
 # download the ec2-create-instance script:
-curl -O https://raw.githubusercontent.com/IQSS/dataverse-ansible/master/ec2/ec2-create-instance.sh
+curl -O https://raw.githubusercontent.com/GlobalDataverseCommunityConsortium/dataverse-ansible/master/ec2/ec2-create-instance.sh
 chmod 755 ec2-create-instance.sh
 
 # download the sample data ec2 config: 
-curl -O https://raw.githubusercontent.com/IQSS/dataverse-sample-data/memory-monitoring-experiments/ec2config_memory_test.yaml
+curl -O https://raw.githubusercontent.com/GlobalDataverseCommunityConsortium/dataverse-ansible/master/tests/group_vars/memorytests.yml
 
 # run the script: 
-./ec2-create-instance.sh -a ec2-memory-benchmark -b ${dataverse_branch} -r https://github.com/IQSS/dataverse.git -g ec2config_memory_test.yaml 2>&1 | tee create-instance.log
+./ec2-create-instance.sh -b ${dataverse_branch} -r https://github.com/IQSS/dataverse.git -g memorytests.yml 2>&1 | tee create-instance.log
 
 # obtain the address of the new instance, and the ssh key: 
 
@@ -91,4 +91,4 @@ echo
 echo "Please do not forget to TERMINATE THE INSTANCE once you have downloaded all the results above,"
 echo "with the following command:"
 echo "aws ec2 terminate-instances --instance-ids ${EC2_INSTANCE_ID}"
-echo
\ No newline at end of file
+echo
diff --git a/scripts/vagrant/install-dataverse.sh b/scripts/vagrant/install-dataverse.sh
deleted file mode 100644
index ac482171539..00000000000
--- a/scripts/vagrant/install-dataverse.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-if [ ! -z "$1" ]; then
-  MAILSERVER=$1
-  MAILSERVER_ARG="--mailserver $MAILSERVER"
-fi
-WAR=/dataverse/target/dataverse*.war
-if [ ! -f $WAR ]; then
-  echo "no war file found... building"
-  echo "Installing nss on CentOS 6 to avoid java.security.KeyException while building war file: https://github.com/IQSS/dataverse/issues/2744"
-  yum install -y nss
-  su $SUDO_USER -s /bin/sh -c "cd /dataverse && mvn package"
-fi
-cd /dataverse/scripts/installer
-
-# move any pre-existing `default.config` file out of the way to avoid overwriting
-pid=$$
-if [ -e default.config ]; then
-	mv default.config tmp-${pid}-default.config
-fi
-
-echo "HOST_DNS_ADDRESS	localhost" > default.config
-echo "GLASSFISH_DIRECTORY	/home/glassfish/glassfish4" >> default.config
-
-if [ ! -z "$MAILSERVER" ]; then
-	echo "MAIL_SERVER	$MAILSERVER" >> default.config
-fi
-
-./install -y -f
-
-if [ -e tmp-${pid}-default.config ]; then # if we moved it out, move it back
-	mv -f tmp-${pid}-default.config default.config
-fi
-
-echo "If "vagrant up" was successful (check output above) Dataverse is running on port 8080 of the Linux machine running within Vagrant, but this port has been forwarded to port 8888 of the computer you ran "vagrant up" on. For this reason you should go to http://localhost:8888 to see the Dataverse app running."
diff --git a/scripts/vagrant/install-tworavens.sh b/scripts/vagrant/install-tworavens.sh
deleted file mode 100755
index f6957afc58a..00000000000
--- a/scripts/vagrant/install-tworavens.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-echo "This script is highly experimental and makes many assumptions about how Dataverse is running in Vagrant. Please consult the TwoRavens section of the Dataverse Installation Guide instead."
-exit 1
-cd /root
-yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-yum install -y R R-devel
-# FIXME: /dataverse is mounted in Vagrant but not other places
-yum install -y /dataverse/doc/sphinx-guides/source/_static/installation/files/home/rpmbuild/rpmbuild/RPMS/x86_64/rapache-1.2.6-rpm0.x86_64.rpm
-yum install -y gcc-gfortran # to build R packages
-COMMIT=a6869eb28693d6df529e7cb3888c40de5f302b66
-UNZIPPED=TwoRavens-$COMMIT
-if [ ! -f $COMMIT ]; then
-  wget https://github.com/IQSS/TwoRavens/archive/$COMMIT.zip
-  unzip $COMMIT
-  cd $UNZIPPED/r-setup
-  ./r-setup.sh # This is expected to take a while. Look for lines like "Package Zelig successfully installed" and "Successfully installed Dataverse R framework".
-fi
-# FIXME: copy preprocess.R into Glassfish while running and overwrite it
-# FIXME: enable TwoRavens by POSTing twoRavens.json. See note below about port 8888 vs 8080.
-# TODO: programatically edit twoRavens.json to change "toolUrl" to "http://localhost:8888/dataexplore/gui.html"
-curl -X POST -H 'Content-type: application/json' --upload-file /dataverse/doc/sphinx-guides/source/_static/installation/files/root/external-tools/twoRavens.json http://localhost:8080/api/admin/externalTools
-# Port 8888 because we're running in Vagrant. On the dev1 server we use https://dev1.dataverse.org/dataexplore/gui.html
-cd /root
-DIR=/var/www/html/dataexplore
-if [ ! -d $DIR ]; then
-  cp -r $UNZIPPED $DIR
-fi
-cd $DIR
-# The plan is to remove this hack of dropping preprocess.R into a deployed war file directory. See https://github.com/IQSS/dataverse/issues/3372
-# FIXME: don't assume version 4.6.1
-#diff /var/www/html/dataexplore/rook/preprocess/preprocess.R /usr/local/glassfish4/glassfish/domains/domain1/applications/dataverse-4.6.1/WEB-INF/classes/edu/harvard/iq/dataverse/rserve/scripts/preprocess.R
-# FIXME: If `diff` shows a difference, which is likely, copy the version from TwoRavens to the Glassfish directory.
-#cp /var/www/html/dataexplore/rook/preprocess/preprocess.R /usr/local/glassfish4/glassfish/domains/domain1/applications/dataverse-4.6.1/WEB-INF/classes/edu/harvard/iq/dataverse/rserve/scripts/preprocess.R
-# FIXME: restart Glassfish if you had to update preprocess.R above.
-# FIXME: Vagrant with it's weird 8888 port forwarding isn't working. On the dev1 server, TwoRavens works fine if you supply "https://dev1.dataverse.org" for both URLs.
-echo "Next, run ./install.pl after you cd to $DIR"
diff --git a/scripts/vagrant/rpmbuild.sh b/scripts/vagrant/rpmbuild.sh
deleted file mode 100755
index f10830afb5b..00000000000
--- a/scripts/vagrant/rpmbuild.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-7.noarch.rpm
-yum install -y rpm-build httpd-devel libapreq2-devel R-devel
diff --git a/scripts/vagrant/setup-counter-processor.sh b/scripts/vagrant/setup-counter-processor.sh
deleted file mode 100755
index 29d860208e5..00000000000
--- a/scripts/vagrant/setup-counter-processor.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-echo "Setting up counter-processor"
-echo "Installing dependencies"
-yum -y install unzip vim-enhanced
-yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-# EPEL provides Python 3.6.6, new enough (3.6.4 in .python-version)
-yum -y install python36 jq
-# "ensurepip" tip from https://stackoverflow.com/questions/50408941/recommended-way-to-install-pip3-on-centos7/52518512#52518512
-python3.6 -m ensurepip
-# FIXME: actually use this dedicated "counter" user.
-COUNTER_USER=counter
-echo "Ensuring Unix user '$COUNTER_USER' exists"
-useradd $COUNTER_USER || :
-COMMIT='a73dbced06f0ac2f0d85231e4d9dd4f21bee8487'
-UNZIPPED_DIR="counter-processor-$COMMIT"
-if [ ! -e $UNZIPPED_DIR ]; then
-  ZIP_FILE="${COMMIT}.zip"
-  echo "Downloading and unzipping $ZIP_FILE"
-  wget https://github.com/CDLUC3/counter-processor/archive/$ZIP_FILE
-  unzip $ZIP_FILE
-fi
-cd $UNZIPPED_DIR
-GEOIP_DIR='maxmind_geoip'
-GEOIP_FILE='GeoLite2-Country.mmdb'
-GEOIP_PATH_TO_FILE="$GEOIP_DIR/$GEOIP_FILE"
-if [ ! -e $GEOIP_PATH_TO_FILE ]; then
-  echo "let's do this thing"
-  TARBALL='GeoLite2-Country.tar.gz'
-  wget https://geolite.maxmind.com/download/geoip/database/$TARBALL
-  tar xfz GeoLite2-Country.tar.gz
-  # Glob (*) below because of directories like "GeoLite2-Country_20181204".
-  GEOIP_UNTARRED_DIR='GeoLite2-Country_*'
-  mv $GEOIP_UNTARRED_DIR/$GEOIP_FILE $GEOIP_PATH_TO_FILE
-  rm -rf $TARBALL $GEOIP_UNTARRED_DIR
-fi
-pip3 install -r requirements.txt
-# For now, parsing sample_logs/counter_2018-05-08.log
-for i in `echo {00..31}`; do
-  # avoid errors like: No such file or directory: 'sample_logs/counter_2018-05-01.log'
-  touch sample_logs/counter_2018-05-$i.log
-done
-#LOG_GLOB="sample_logs/counter_2018-05-*.log"
-#START_DATE="2018-05-08"
-#END_DATE="2018-05-09"
-CONFIG_FILE=/dataverse/scripts/vagrant/counter-processor-config.yaml python3.6 main.py
diff --git a/scripts/vagrant/setup-solr.sh b/scripts/vagrant/setup-solr.sh
deleted file mode 100755
index a97924412f9..00000000000
--- a/scripts/vagrant/setup-solr.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-echo "Setting up Solr"
-SOLR_USER=solr
-SOLR_HOME=/usr/local/solr
-mkdir $SOLR_HOME
-chown $SOLR_USER:$SOLR_USER $SOLR_HOME
-su $SOLR_USER -s /bin/sh -c "cp /downloads/solr-7.3.1.tgz $SOLR_HOME"
-su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME && tar xfz solr-7.3.1.tgz"
-su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-7.3.1/server/solr && cp -r configsets/_default . && mv _default collection1"
-su $SOLR_USER -s /bin/sh -c "cp /conf/solr/7.3.1/schema*.xml $SOLR_HOME/solr-7.3.1/server/solr/collection1/conf/"
-su $SOLR_USER -s /bin/sh -c "cp /conf/solr/7.3.1/solrconfig.xml $SOLR_HOME/solr-7.3.1/server/solr/collection1/conf/solrconfig.xml"
-su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-7.3.1 && bin/solr start && bin/solr create_core -c collection1 -d server/solr/collection1/conf/"
-cp /dataverse/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr /etc/init.d/solr
-chmod 755 /etc/init.d/solr
-/etc/init.d/solr stop
-/etc/init.d/solr start
-chkconfig solr on
diff --git a/scripts/vagrant/setup.sh b/scripts/vagrant/setup.sh
deleted file mode 100644
index 108ebefd529..00000000000
--- a/scripts/vagrant/setup.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-echo "Installing dependencies for Dataverse"
-
-# Add JQ
-echo "Installing jq for the setup scripts"
-wget http://stedolan.github.io/jq/download/linux64/jq
-chmod +x jq
-# this is where EPEL puts it
-sudo mv jq /usr/bin/jq
-
-echo "Adding Shibboleth yum repo"
-cp /dataverse/conf/vagrant/etc/yum.repos.d/shibboleth.repo /etc/yum.repos.d
-cp /dataverse/conf/vagrant/etc/yum.repos.d/epel-apache-maven.repo /etc/yum.repos.d
-# Uncomment this (and other shib stuff below) if you want
-# to use Vagrant (and maybe PageKite) to test Shibboleth.
-#yum install -y shibboleth shibboleth-embedded-ds
-
-# java configuration et al
-yum install -y java-1.8.0-openjdk-devel apache-maven httpd mod_ssl unzip
-alternatives --set java /usr/lib/jvm/jre-1.8.0-openjdk.x86_64/bin/java
-alternatives --set javac /usr/lib/jvm/java-1.8.0-openjdk.x86_64/bin/javac
-java -version
-javac -version
-
-# switching to postgresql-9.6 per #4709
-yum install -y https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
-yum makecache fast
-yum install -y postgresql96-server
-/usr/pgsql-9.6/bin/postgresql96-setup initdb
-/usr/bin/systemctl stop postgresql-9.6
-cp /dataverse/conf/vagrant/var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/9.6/data/pg_hba.conf
-/usr/bin/systemctl start postgresql-9.6
-/usr/bin/systemctl enable postgresql-9.6
-
-GLASSFISH_USER=glassfish
-echo "Ensuring Unix user '$GLASSFISH_USER' exists"
-useradd $GLASSFISH_USER || :
-SOLR_USER=solr
-echo "Ensuring Unix user '$SOLR_USER' exists"
-useradd $SOLR_USER || :
-DOWNLOAD_DIR='/dataverse/downloads'
-GLASSFISH_ZIP="$DOWNLOAD_DIR/glassfish-4.1.zip"
-SOLR_TGZ="$DOWNLOAD_DIR/solr-7.3.1.tgz"
-WELD_PATCH="$DOWNLOAD_DIR/weld-osgi-bundle-2.2.10.Final-glassfish4.jar"
-# The CA certificate bundle files from CentOS are ok. Glassfish's are expired.
-GOOD_CACERTS='/etc/pki/ca-trust/extracted/java/cacerts'
-if [ ! -f $GLASSFISH_ZIP ] || [ ! -f $SOLR_TGZ ]; then
-    echo "Couldn't find $GLASSFISH_ZIP or $SOLR_TGZ! Running download script...."
-    cd $DOWNLOAD_DIR && ./download.sh && cd
-    echo "Done running download script."
-fi
-GLASSFISH_USER_HOME=~glassfish
-GLASSFISH_ROOT=$GLASSFISH_USER_HOME/glassfish4
-if [ ! -d $GLASSFISH_ROOT ]; then
-  echo "Copying $GLASSFISH_ZIP to $GLASSFISH_USER_HOME and unzipping"
-  su $GLASSFISH_USER -s /bin/sh -c "cp $GLASSFISH_ZIP $GLASSFISH_USER_HOME"
-  su $GLASSFISH_USER -s /bin/sh -c "cd $GLASSFISH_USER_HOME && unzip -q $GLASSFISH_ZIP"
-  su $GLASSFISH_USER -s /bin/sh -c "mv $GLASSFISH_ROOT/glassfish/modules/weld-osgi-bundle.jar /tmp"
-  su $GLASSFISH_USER -s /bin/sh -c "cp $WELD_PATCH $GLASSFISH_ROOT/glassfish/modules"
-  su $GLASSFISH_USER -s /bin/sh -c "cp $GOOD_CACERTS $GLASSFISH_ROOT/glassfish/domains/domain1/config/cacerts.jks"
-else
-  echo "$GLASSFISH_ROOT already exists"
-fi
-#service shibd start
-service httpd stop
-cp /dataverse/conf/httpd/conf.d/dataverse.conf /etc/httpd/conf.d/dataverse.conf
-mkdir -p /var/www/dataverse/error-documents
-cp /dataverse/conf/vagrant/var/www/dataverse/error-documents/503.html /var/www/dataverse/error-documents
-service httpd start
-#curl -k --sslv3 https://pdurbin.pagekite.me/Shibboleth.sso/Metadata > /tmp/pdurbin.pagekite.me
-#cp -a /etc/shibboleth/shibboleth2.xml /etc/shibboleth/shibboleth2.xml.orig
-#cp -a /etc/shibboleth/attribute-map.xml /etc/shibboleth/attribute-map.xml.orig
-# need more attributes, such as sn, givenName, mail
-#cp /dataverse/conf/vagrant/etc/shibboleth/attribute-map.xml /etc/shibboleth/attribute-map.xml
-# FIXME: automate this?
-#curl 'https://www.testshib.org/cgi-bin/sp2config.cgi?dist=Others&hostname=pdurbin.pagekite.me' > /etc/shibboleth/shibboleth2.xml
-#cp /dataverse/conf/vagrant/etc/shibboleth/shibboleth2.xml /etc/shibboleth/shibboleth2.xml
-#service shibd restart
-#curl -k --sslv3 https://pdurbin.pagekite.me/Shibboleth.sso/Metadata > /downloads/pdurbin.pagekite.me
-#service httpd restart
-echo "#########################################################################################"
-echo "# This is a Vagrant test box, so we're disabling firewalld. 			      #
-echo "# Re-enable it with $ sudo systemctl enable firewalld && sudo systemctl start firewalld #"
-echo "#########################################################################################"
-systemctl disable firewalld
-systemctl stop firewalld
diff --git a/scripts/vagrant/test.sh b/scripts/vagrant/test.sh
deleted file mode 100755
index 3c5b835cb79..00000000000
--- a/scripts/vagrant/test.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-echo "running tests..."
-echo "running search tests..."
-cd /
-scripts/search/tests/permissions
-echo "done running tests. no output is good. silence is golden"
diff --git a/scripts/zipdownload/README.md b/scripts/zipdownload/README.md
new file mode 100644
index 00000000000..74431094782
--- /dev/null
+++ b/scripts/zipdownload/README.md
@@ -0,0 +1,104 @@
+Work in progress!
+
+to build: 
+
+cd scripts/zipdownload
+mvn clean compile assembly:single
+
+to install: 
+
+install cgi-bin/zipdownload and ZipDownloadService-v1.0.0.jar in your cgi-bin directory (/var/www/cgi-bin standard). 
+
+Edit the config lines in the shell script (zipdownload) as needed. 
+
+You may need to make extra Apache configuration changes to make sure /cgi-bin/zipdownload is accessible from the outside. 
+For example, if this is the same Apache that's in front of your Dataverse Payara instance, you'll need to add another pass through statement to your configuration: 
+
+``ProxyPassMatch ^/cgi-bin/zipdownload !``
+
+(see the "Advanced" section of the Installation Guide for some extra troubleshooting tips)
+
+To activate in Dataverse: 
+
+curl -X PUT -d '/cgi-bin/zipdownload' http://localhost:8080/api/admin/settings/:CustomZipDownloadServiceUrl
+
+How it works:
+=============
+
+(This is an ongoing design discussion - other developers are welcome to contribute)
+
+The goal: to move this potentially long-running task out of the
+Application Server. This is the sole focus of this implementation. It
+does not attempt to make it faster.
+
+The rationale here is a zipped download of a large enough number of
+large enough files will always be slow. Zipping (compressing) itself
+is a fairly CPU-intensive task. This will most frequently be the
+bottleneck of the service. Although with a slow storage location (S3
+or Swift, with a slow link to the share) it may be the speed at which
+the application accesses the raw bytes. The exact location of the
+bottleneck is in a sense irrelevant. On a very fast system, with the
+files stored on a very fast local RAID, the bottleneck for most users
+will likely shift to the speed of their internet connection to the
+server. The bottom line is, downloading this multi-file compressed
+stream will take a long time no matter how you slice it. So this hack
+addresses it by moving the task outside Payara, where it's not going
+to hog any threads. 
+
+A quick, somewhat unrelated note: attempting to download a multi-GB
+stream over http will always have its own inherent risks. If the
+download has to take hours or days to complete, it is very likely that
+it'll break down somewhere in the middle. Do note that for a zipped
+download our users will not be able to utilize `wget --continue`, or
+any similar "resume" functionality - because it's impossible to resume
+generating a zipped stream from a certain offset.
+
+The implementation is a hack. It relies on direct access to everything - storage locations (filesystem or S3) and the database.
+
+There are no network calls between the application (Dataverse) and the zipper (an
+implementation relying on such a call was discussed early
+on). Dataverse issues a "job key" and sends the user's browser to the
+zipper (to, for ex., /cgi-bin/zipdownload?<job key>) instead of
+/api/access/datafiles/<file ids>). To authorize the zipdownload for
+the "job key", and inform the zipper on which files to zip and where
+to find them, the application relies on a database table, that the
+zipper also has access to. In other words, there is a saved state
+information associated with each zipped download request. Zipper may
+be given a limited database access - for example, via a user
+authorized to access that one table only. After serving the files, the
+zipper removes the database entries. Job records in the database have
+time stamps, so on the application side, as an added level of cleanup,
+it automatically deletes any records older than 5 minutes (can be
+further reduced) every time the service adds new records; as an added
+level of cleanup for any records that got stuck in the db because the
+corresponding zipper jobs never completed. A paranoid admin may choose
+to give the zipper read-only access to the database, and rely on a
+cleanup solely on the application side.
+
+I have explored ways to avoid maintaining this state information. A
+potential implementation we discussed early on, where the application
+would make a network call to the zipper before redirecting the user
+there, would NOT solve that problem - the state would need to somehow
+be maintained on the zipper side. The only truly stateless
+implementation would rely on including all the file information WITH
+the redirect itself, with some pre-signed URL mechanism to make it
+secure. Mechanisms for pre-signing requests are readily available and
+simple to implement. We could go with something similar to how S3
+presigns their access URLs. Jim Myers has already speced out how this
+could be done for Dataverse access urls in a design document
+(https://docs.google.com/document/d/1J8GW6zi-vSRKZdtFjLpmYJ2SUIcIkAEwHkP4q1fxL-s/edit#). (Basically,
+you hash the product of your request parameters, the issue timestamp
+AND some "secret" - like the user's API key - and send the resulting
+hash along with the request. Tampering with any of the parameters, or
+trying to extend the life span of the request, becomes impossible,
+because it would invalidate the hash). What stopped me from trying
+something like that was the sheer size of information that would need
+to be included with a request, for a potentially long list of files
+that need to be zipped. When serving a zipped download from a page
+that would be doable - we could javascript together a POST call that
+the browser could make to send all that info to the zipper. But if we
+want to implement something similar in the API, I felt like I really
+wanted to be able to simply issue a quick redirect to a manageable url
+- which with the implementation above is simply
+/cgi-bin/zipdownload?<job key>, with the <job key> being just a 16
+character hex string in the current implementation.
diff --git a/scripts/zipdownload/cgi-bin/zipdownload b/scripts/zipdownload/cgi-bin/zipdownload
new file mode 100644
index 00000000000..ff9d6a53a24
--- /dev/null
+++ b/scripts/zipdownload/cgi-bin/zipdownload
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+CLASSPATH=/var/www/cgi-bin; export CLASSPATH
+
+PGHOST="localhost"; export PGHOST
+PGPORT=5432; 	    export PGPORT
+PGUSER="dvnapp";    export PGUSER
+PGDB="dvndb"; 	    export PGDB
+PGPW="xxxxx"; 	    export PGPW
+
+java -Ddb.serverName=$PGHOST -Ddb.portNumber=$PGPORT -Ddb.user=$PGUSER -Ddb.databaseName=$PGDB -Ddb.password=$PGPW -jar zipdownloader-0.0.1.jar
\ No newline at end of file
diff --git a/scripts/zipdownload/pom.xml b/scripts/zipdownload/pom.xml
new file mode 100644
index 00000000000..5df2bc92cbf
--- /dev/null
+++ b/scripts/zipdownload/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>edu.harvard.iq</groupId>
+        <artifactId>dataverse-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../../modules/dataverse-parent</relativePath>
+    </parent>
+    
+    <artifactId>zipdownloader</artifactId>
+    <version>0.0.1</version>
+    <packaging>jar</packaging>
+    
+    <properties>
+    </properties>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <!-- no version here as managed by BOM above! -->
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <release>${target.java.version}</release>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.6.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <!--<classifier>spring-boot</classifier>-->
+                            <mainClass>
+                                edu.harvard.iq.dataverse.custom.service.download.ZipDownloadService
+                            </mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/download/ChunkingOutputStream.java b/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/download/ChunkingOutputStream.java
new file mode 100644
index 00000000000..9ef0279b52d
--- /dev/null
+++ b/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/download/ChunkingOutputStream.java
@@ -0,0 +1,108 @@
+/*
+   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   Dataverse Network - A web application to share, preserve and analyze research data.
+   Developed at the Institute for Quantitative Social Science, Harvard University.
+   Version 3.0.
+*/
+package edu.harvard.iq.dataverse.custom.service.download;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Simple implementation of HTTP "chunking encoding"
+ * 
+ * @author Leonid Andreev
+ */
+public class ChunkingOutputStream extends FilterOutputStream {
+    private static final int BUFFER_SIZE = 8192;
+    private static final byte[] CHUNK_CLOSE = "\r\n".getBytes();
+    private static final String CHUNK_SIZE_FORMAT = "%x\r\n";
+    
+    private byte[] buffer = new byte[BUFFER_SIZE];
+    private int position = 0; 
+    
+    public ChunkingOutputStream(OutputStream out) {
+        super(out);
+    }
+    
+    @Override
+    public void write(byte[] data) throws IOException {
+        this.write(data, 0, data.length);
+    }
+    
+    @Override
+    public void write(byte[] data, int offset, int length) throws IOException {
+        
+        // is this going to fill the buffer?
+        if (position + length > BUFFER_SIZE) {
+            System.arraycopy(data, offset, buffer, position, BUFFER_SIZE - position);
+            offset += (BUFFER_SIZE - position);
+            length -= (BUFFER_SIZE - position);
+            dumpChunk(buffer, 0, BUFFER_SIZE);
+            position = 0; 
+        }
+        
+        // are there still multiple buffer-worths of bytes? 
+        while (length > BUFFER_SIZE) {
+            dumpChunk(data, offset, BUFFER_SIZE);
+            offset += BUFFER_SIZE;
+            length -= BUFFER_SIZE;
+        }
+        
+        // finally, buffer the leftover bytes:
+        System.arraycopy(data, offset, buffer, position, length);
+        position+=length;
+        
+    }
+    
+    @Override
+    public void write(int i) throws IOException {
+        // Hopefully ZipOutputStream never writes single bytes into the stream?
+        // Uh, actually it does, *a lot* - at the beginning of the archive, and 
+        // when it closes it. 
+        
+        if (position == BUFFER_SIZE) {
+            dumpChunk(buffer, 0, position);
+            position = 0;
+        }
+        buffer[position++] = (byte)i;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (position > 0) {
+            dumpChunk(buffer, 0, position);
+        }
+        
+        // ... and the final, "zero chunk": 
+        super.out.write('0');
+        super.out.write(CHUNK_CLOSE);
+        super.out.write(CHUNK_CLOSE);
+        
+        super.out.close();
+    }
+    
+    
+    private void dumpChunk(byte[] data, int offset, int length) throws IOException {
+        String chunkSizeLine = String.format(CHUNK_SIZE_FORMAT, length);
+        super.out.write(chunkSizeLine.getBytes());
+        super.out.write(data, offset, length);
+        // don't forget to close the chunk(!):
+        super.out.write(CHUNK_CLOSE);
+    }
+}
diff --git a/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/download/ZipDownloadService.java b/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/download/ZipDownloadService.java
new file mode 100644
index 00000000000..db7eb7b8428
--- /dev/null
+++ b/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/download/ZipDownloadService.java
@@ -0,0 +1,265 @@
+/*
+   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   Dataverse Network - A web application to share, preserve and analyze research data.
+   Developed at the Institute for Quantitative Social Science, Harvard University.
+   Version 3.0.
+*/
+package edu.harvard.iq.dataverse.custom.service.download;
+
+import edu.harvard.iq.dataverse.custom.service.util.DirectAccessUtil;
+import static edu.harvard.iq.dataverse.custom.service.util.DatabaseAccessUtil.lookupZipJob;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * Custom (standalone) download service for Dataverse
+ * 
+ * @author Leonid Andreev
+ */
+public class ZipDownloadService { 
+    
+    private static String jobKey = null;
+    private List<String[]> jobFiles = null;
+    private boolean zipOnly = false; 
+    
+    private DirectAccessUtil directAccessUtil = null; 
+    private ZipOutputStream zipOutputStream = null;
+
+    public static void main(String args[]) throws Exception {
+        
+        ZipDownloadService zipperService = new ZipDownloadService();
+        
+        if (!zipperService.parseArgs(args)) {
+            zipperService.usage();
+            return; 
+        }
+        
+        zipperService.parseCgiQueryParameters();
+               
+        zipperService.execute(jobKey);
+    }
+
+    private static void usage() {
+        System.out.println("\nUsage:");
+        System.out.println("  java -jar ZipDownloadService-1.0.0.jar [-ziponly]>\n");
+
+        System.out.println("  supported options:");
+        System.out.println("   -ziponly = output zip only, no http header/no chunking");
+        System.out.println("");
+
+    }
+
+    // The only option supported at the moment is "zip only" - output just the
+    // compressed stream, skip the HTTP header and chunking.
+    public boolean parseArgs(String[] args) {
+
+        if (args == null || args.length == 0) {
+            return true; 
+        } else if (args.length == 1) {
+            if (args[0].equals("-ziponly")) {
+                this.zipOnly = true;
+                return true;
+            }
+        }
+        
+        return false; 
+    }
+    
+    // Does not support any parameters, except the job-identifying token key, 
+    // supplied as the entire query string. 
+    public void parseCgiQueryParameters() {
+        String queryString = System.getenv().get("QUERY_STRING");
+        if (queryString != null) {
+            jobKey = queryString; 
+        }
+    }
+    
+    public void print404() {
+        System.out.println("Status: 404 Not Found\r");
+        System.out.println("Content-Type: text/html\r");
+        System.out.println("\r");
+
+        System.out.println("<h1>404 No such download job!</h1>");
+    }
+    
+    public void printZipHeader() {
+        System.out.println("Content-disposition: attachment; filename=\"dataverse_files.zip\"\r");
+        System.out.println("Content-Type: application/zip; name=\"dataverse_files.zip\"\r");
+        System.out.println("Transfer-Encoding: chunked\r");
+        System.out.println("\r");
+        System.out.flush();
+    }
+    
+    public void execute(String key) {
+        
+        jobFiles = lookupZipJob(key); 
+        
+        if (jobFiles == null || jobFiles.size() == 0) {
+            this.print404();
+            System.exit(0);
+        }
+        
+        this.processFiles();
+    }
+    
+    public void processFiles() {
+        
+        if (!this.zipOnly) {
+            this.printZipHeader();
+        }
+        
+        Set<String> zippedFolders = new HashSet<>();
+        Set<String> fileNamesList = new HashSet<>();
+       
+        for (String [] fileEntry : jobFiles) {
+            String storageLocation = fileEntry[0];
+            String fileName = fileEntry[1];
+            
+            //System.out.println(storageLocation + ":" + fileName);
+            
+            if (this.zipOutputStream == null) {
+                openZipStream();
+            }
+            
+            if (this.directAccessUtil == null) {
+                this.directAccessUtil = new DirectAccessUtil();
+            }
+            
+            InputStream inputStream = this.directAccessUtil.openDirectAccess(storageLocation);
+                
+            String zipEntryName = checkZipEntryName(fileName, fileNamesList);
+            // this may not be needed anymore - some extra sanitizing of the file 
+            // name we used to have to do - since all the values in a current Dataverse 
+            // database may already be santized enough.
+            // (Edit: Yes, we still need this - there are still datasets with multiple
+            // files with duplicate names; this method takes care of that)
+            if (inputStream != null && this.zipOutputStream != null) {
+                
+                ZipEntry entry = new ZipEntry(zipEntryName);
+
+                byte[] bytes = new byte[2 * 8192];
+                int read = 0;
+                long readSize = 0L;
+
+                try {
+                    // Does this file have a folder name? 
+                    if (hasFolder(zipEntryName)) {
+                        addFolderToZipStream(getFolderName(zipEntryName), zippedFolders);
+                    }
+
+                    this.zipOutputStream.putNextEntry(entry);
+
+                    while ((read = inputStream.read(bytes)) != -1) {
+                        this.zipOutputStream.write(bytes, 0, read);
+                        readSize += read;
+                    }
+                    this.zipOutputStream.closeEntry();
+
+                    /*if (fileSize == readSize) {
+                        //System.out.println("Read "+readSize+" bytes;");
+                    } else {
+                        throw new IOException("Byte size mismatch: expected " + fileSize + ", read: " + readSize);
+                    }*/
+                } catch (IOException ioex) {
+                    System.err.println("Failed to compress "+storageLocation);
+                } finally {
+                    try {
+                        inputStream.close();
+                    } catch (IOException ioexIgnore) {
+                        System.err.println("Warning: IO exception trying to close input stream - "+storageLocation);
+                    }
+                }
+            } else {
+                System.err.println("Failed to access "+storageLocation);
+            }
+                
+        }
+        try {
+            this.zipOutputStream.flush();
+            this.zipOutputStream.close();
+
+            System.out.flush();
+            System.out.close();
+        } catch (Exception e) {
+        }
+    }
+    
+    public void openZipStream() {
+        if (this.zipOutputStream == null) {
+            if (this.zipOnly) {
+                this.zipOutputStream = new ZipOutputStream(System.out);
+            } else {
+                this.zipOutputStream = new ZipOutputStream(new ChunkingOutputStream(System.out));
+            }
+        }
+    }
+    
+    private boolean hasFolder(String fileName) {
+        if (fileName == null) {
+            return false;
+        }
+        return fileName.indexOf('/') >= 0;
+    }
+    
+    private String getFolderName(String fileName) {
+        if (fileName == null) {
+            return "";
+        }
+        String folderName = fileName.substring(0, fileName.lastIndexOf('/'));
+        // If any of the saved folder names start with with slashes,            
+        // we want to remove them:                                              
+        // (i.e., ///foo/bar will become foo/bar)                               
+        while (folderName.startsWith("/")) {
+            folderName = folderName.substring(1);
+        }
+        return folderName;
+    }
+    
+    private void addFolderToZipStream(String folderName, Set<String> zippedFolders) throws IOException {
+        // We don't want to create folders in the output Zip file that have 
+        // already been added:
+        if (!"".equals(folderName)) {
+            if (!zippedFolders.contains(folderName)) {
+                ZipEntry d = new ZipEntry(folderName + "/");
+                zipOutputStream.putNextEntry(d);
+                zipOutputStream.closeEntry();
+                zippedFolders.add(folderName);
+            }
+        }
+    }
+    
+    // check for and process duplicates:
+    private String checkZipEntryName(String originalName, Set<String> fileNames) {
+        String name = originalName;
+        int fileSuffix = 1;
+        int extensionIndex = originalName.lastIndexOf(".");
+
+        while (fileNames.contains(name)) {
+            if (extensionIndex != -1) {
+                name = originalName.substring(0, extensionIndex) + "_" + fileSuffix++ + originalName.substring(extensionIndex);
+            } else {
+                name = originalName + "_" + fileSuffix++;
+            }
+        }
+        fileNames.add(name);
+        return name;
+    }
+}
diff --git a/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/util/DatabaseAccessUtil.java b/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/util/DatabaseAccessUtil.java
new file mode 100644
index 00000000000..8f9c34fe0a1
--- /dev/null
+++ b/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/util/DatabaseAccessUtil.java
@@ -0,0 +1,164 @@
+/*
+   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   Dataverse Network - A web application to share, preserve and analyze research data.
+   Developed at the Institute for Quantitative Social Science, Harvard University.
+   Version 3.0.
+*/
+
+package edu.harvard.iq.dataverse.custom.service.util;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utility methods for directly accessing the Dataverse database to extract 
+ * the file locations and parameters for the zipping jobs. 
+ * 
+ * @author Leonid Andreev
+ */
+public class DatabaseAccessUtil implements java.io.Serializable  {
+
+    // The zipper needs to make one database call to initiate each job.
+    // So the database connection can be closed immediately.
+    
+    private static final int JOB_TOKEN_LENGTH = 16;
+    // A legitimate token is 16 characters long, and is made up of 
+    // hex digits and one dash. THERE ARE prettier ways to spell out 
+    // this regular expression - I just wanted it to be clear what it does:
+    private static final String JOB_TOKEN_REGEX = "^[0-9a-f][0-9a-f]*\\-[0-9a-f][0-9a-f]*$";
+    private static final String JOB_LOOKUP_QUERY = "SELECT * FROM CustomZipServiceRequest WHERE key=?";
+    private static final String JOB_DELETE_QUERY = "DELETE FROM CustomZipServiceRequest WHERE key=?";
+
+    public static List<String []> lookupZipJob(String jobKey) {
+        // Before we do anything, it is super important to sanitize the 
+        // supplied token - we don't want to insert anything sketchy into 
+        // the db query below (an "injection attack"). 
+        // java.sql PreparedStatement.setString() that we are using below 
+        // should also be checking against an attemp to insert a sub-query. 
+        // But better safe than sorry. 
+        if (!validateTokenFormat(jobKey)) {
+            return null; // This will result in a "no such job" response.
+        }
+        
+        Connection c = connectToDatabase();
+        
+        if (c == null) {
+            // no connection - no data, return null queitly
+            return null; 
+        }
+        
+        PreparedStatement stmt; 
+        ResultSet rs; 
+        
+        List<String[]> ret = new ArrayList<>();
+        
+        try {
+            c.setAutoCommit(false);
+
+            stmt = c.prepareStatement(JOB_LOOKUP_QUERY);
+            stmt.setString(1, jobKey);
+            rs = stmt.executeQuery();
+            
+            while ( rs.next() ) {
+                String storageLocation = rs.getString("storageLocation");
+                String  fileName = rs.getString("fileName");
+                
+                //System.out.println( "storageLocation = " + storageLocation );
+                //System.out.println( "fileName = " + fileName );
+                
+                String[] entry = new String[2];
+                entry[0] = storageLocation;
+                entry[1] = fileName;
+                
+                ret.add(entry);
+            }
+            rs.close();
+            stmt.close();            
+        } catch (Exception e) {
+            System.err.println( "Database error: " + e.getClass().getName()+" "+ e.getMessage() );
+            // return null (but close the connection first):
+            try {
+                c.close();
+            } catch (Exception ex) {}
+            return null;
+        }
+        
+        // Delete all the entries associated with the job, now that we are done
+        // with it. 
+        
+        try {
+            stmt = c.prepareStatement(JOB_DELETE_QUERY);
+            stmt.setString(1, jobKey);
+            stmt.executeUpdate();
+            c.commit();
+        } catch (Exception e) {
+            // Not much we can or want to do, but complain in the Apache logs:
+            // (not even sure about printing any log messages either; the reason
+            // this delete failed may be because the admin chose to only give 
+            // the zipper read-only access to the db - in which case this will 
+            // be happening every time a job is processed. which in turn is 
+            // ok - there is a backup cleanup mechanism for deleting older jobs
+            // on the application side as well).
+            //System.err.println("Failed to delete the job from the db");
+        }
+        
+        try {
+            c.close();
+        } catch (Exception e) {}
+
+        return ret;
+    }
+    
+    // Opens the connection to the database. 
+    // Uses the credentials supplied via JVM options
+    private static Connection connectToDatabase() {
+        Connection c = null;
+
+        String host = System.getProperty("db.serverName") != null ? System.getProperty("db.serverName") : "localhost";
+        String port = System.getProperty("db.portNumber") != null ? System.getProperty("db.portNumber") : "5432";
+        String database = System.getProperty("db.databaseName") != null ? System.getProperty("db.databaseName") : "dvndb";
+        String pguser = System.getProperty("db.user") != null ? System.getProperty("db.user") : "dvnapp";
+        String pgpasswd = System.getProperty("db.password") != null ? System.getProperty("db.password") : "secret";
+
+        try {
+            Class.forName("org.postgresql.Driver");
+            c = DriverManager
+                    .getConnection("jdbc:postgresql://" + host + ":" + port + "/" + database,
+                            pguser,
+                            pgpasswd);
+        } catch (Exception e) {
+            return null;
+        }
+        return c;
+    }
+    
+    private static boolean validateTokenFormat(String jobKey) {
+        // A legitimate token is 16 characters long, and is made up of 
+        // hex digits and one dash. 
+        if (jobKey == null 
+                || jobKey.length() != JOB_TOKEN_LENGTH 
+                || !jobKey.matches(JOB_TOKEN_REGEX)) {
+            return false;
+        }
+        
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/util/DirectAccessUtil.java b/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/util/DirectAccessUtil.java
new file mode 100644
index 00000000000..369725b389a
--- /dev/null
+++ b/scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/util/DirectAccessUtil.java
@@ -0,0 +1,98 @@
+/*
+   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   Dataverse Network - A web application to share, preserve and analyze research data.
+   Developed at the Institute for Quantitative Social Science, Harvard University.
+   Version 3.0.
+*/
+
+package edu.harvard.iq.dataverse.custom.service.util;
+
+import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Utility methods for directly accessing storage locations
+ * Supports file system and S3. 
+ * (S3 has only been tested with AWS; non-standard auth may not be supported yet)
+ * 
+ * @author Leonid Andreev
+ */
+public class DirectAccessUtil implements java.io.Serializable {
+
+    private S3Client s3 = null;
+    
+    public InputStream openDirectAccess(String storageLocation) {
+        InputStream inputStream = null;
+
+        if (storageLocation.startsWith("s3://")) {
+            createOrReuseAwsClient();
+            
+            if (this.s3 == null) {
+                return null; 
+            }
+            
+            storageLocation = storageLocation.substring(5);
+
+            String bucket = storageLocation.substring(0, storageLocation.indexOf('/'));
+            String key = storageLocation.substring(storageLocation.indexOf('/') + 1);
+
+            try {
+                ResponseInputStream<GetObjectResponse> s3Object = s3.getObject(GetObjectRequest.builder()
+                        .bucket(bucket)
+                        .key(key)
+                        .build());
+                inputStream = s3Object;
+            } catch (S3Exception se) {
+                System.err.println("Cannot get S3 object " + key + " from bucket " + bucket);
+            }
+            
+        } else if (storageLocation.startsWith("file://")) {
+            storageLocation = storageLocation.substring(7);
+            
+            try {
+                inputStream = new FileInputStream(new File(storageLocation));
+            } catch (IOException ioex) {
+                System.err.println("Cannot open file " + storageLocation);
+            }
+        }
+        
+        // Unsupported storage location - return null
+        return inputStream;
+    }
+    
+    private void createOrReuseAwsClient() {
+        if (this.s3 == null) {
+            try {
+                this.s3 = S3Client.builder()
+                        .region(Region.US_EAST_1) // You may want to make this configurable
+                        .credentialsProvider(ProfileCredentialsProvider.create("default"))
+                        .build();
+            } catch (Exception e) {
+                System.err.println("Cannot instantiate an S3 client: " + e.getMessage());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/assembly/external-search-get.xml b/src/assembly/external-search-get.xml
new file mode 100644
index 00000000000..a827ae1332c
--- /dev/null
+++ b/src/assembly/external-search-get.xml
@@ -0,0 +1,26 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>external-search-get</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.outputDirectory}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>edu/harvard/iq/dataverse/search/AbstractExternalSearchServiceBean.class</include>
+                <include>edu/harvard/iq/dataverse/search/GetExternalSearchServiceBean.class</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/resources/META-INF/ext-search-get</directory>
+            <outputDirectory>META-INF/services</outputDirectory>
+            <includes>
+                <include>edu.harvard.iq.dataverse.search.SearchService</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/assembly/external-search-post.xml b/src/assembly/external-search-post.xml
new file mode 100644
index 00000000000..f7f25b9e443
--- /dev/null
+++ b/src/assembly/external-search-post.xml
@@ -0,0 +1,26 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>external-search-post</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.outputDirectory}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>edu/harvard/iq/dataverse/search/AbstractExternalSearchServiceBean.class</include>
+                <include>edu/harvard/iq/dataverse/search/PostExternalSearchServiceBean.class</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/resources/META-INF/ext-search-post</directory>
+            <outputDirectory>META-INF/services</outputDirectory>
+            <includes>
+                <include>edu.harvard.iq.dataverse.search.SearchService</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/assembly/trivial-search-examples.xml b/src/assembly/trivial-search-examples.xml
new file mode 100644
index 00000000000..1bf04498798
--- /dev/null
+++ b/src/assembly/trivial-search-examples.xml
@@ -0,0 +1,26 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>trivial-search-examples</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.outputDirectory}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>edu/harvard/iq/dataverse/search/GoldenOldiesSearchServiceBean.class</include>
+                <include>edu/harvard/iq/dataverse/search/OddlyEnoughSearchServiceBean.class</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/resources/META-INF/trivial-search</directory>
+            <outputDirectory>META-INF/services</outputDirectory>
+            <includes>
+                <include>edu.harvard.iq.dataverse.search.SearchService</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/backports/README.md b/src/backports/README.md
new file mode 100644
index 00000000000..420e1dbd466
--- /dev/null
+++ b/src/backports/README.md
@@ -0,0 +1,81 @@
+# Backports Directory
+
+This directory contains patch files for backporting changes across different Dataverse releases.
+These changes can be features, build enhancements, security patches, and more.
+
+## Directory Structure
+
+The backports directory is organized by "release version" (or "release tag") folders.
+Each folder name corresponds to a [Dataverse release](https://github.com/IQSS/dataverse/releases) and [its associated Git tag](https://github.com/IQSS/dataverse/tags):
+
+```
+src/backports/
+├── v6.4/ # Patches for Dataverse 6.4
+├── v6.5/ # Patches for Dataverse 6.5 
+├── v6.6/ # Patches for Dataverse 6.6
+└── ...
+```
+
+Each version folder contains numbered patch files that modify specific components.
+
+For example:
+- `001-parent-pom.xml.patch` -> Modifications to the parent POM configuration
+- `002-pom.xml.patch` -> Changes to the main POM file
+- Additional patches as needed.
+
+## Intended Usage
+
+The patch files in each release folder are designed to be applied in numerical order.
+
+Currently, they are primarily used by the container maintenance workflows (see `.github/workflows/container_maintenance.yml`) to ensure maintenance script compatibility across different Dataverse versions.
+See also the "three releases back" support promise at https://guides.dataverse.org/en/latest/container/app-image.html#tags-for-production-use.
+
+*Note: The backport patches mechanism is by no means limited to usage in a container context.*
+*They can be applied manually or from some other automated release process to backports changes to older releases.*
+
+## Creating Patch Files
+
+To create a new patch file using `git diff`, follow these steps:
+
+### Example: Creating a POM patch
+
+1. **Make your changes** to the target file(s) on the appropriate branch (usually your feature branch).
+2. **Head to the root** of the Git repository.
+3. **Generate the patch** using `git diff`:
+   ```bash
+   # Create a patch for changes to pom.xml, comparing with the pom.xml contained in the v6.5 tag:
+   git --no-pager diff v6.5 pom.xml > src/backports/v6.5/002-pom.xml.patch
+   
+   # Or create a patch for multiple files:
+   git --no-pager diff v6.5 modules/dataverse-parent/pom.xml pom.xml > src/backports/v6.5/003-multi-pom.patch
+   
+   # Create a patch from staged changes
+   git diff --cached > src/backports/v6.5/004-staged-changes.patch
+   ```
+
+4. **Review the patch** to ensure it contains only the intended changes:
+   ```bash
+   cat src/backports/v6.5/002-pom.xml.patch
+   ```
+   
+5. **Repeat for other tags** as necessary.
+
+### Patch Naming Convention
+
+Use the following naming pattern:
+- `001-` prefix with three-digit numbering for ordering
+- Descriptive name indicating what is being patched
+- `.patch` file extension
+
+Examples:
+- `001-parent-pom.xml.patch`
+- `002-pom.xml.patch`
+- `003-dockerfile-updates.patch`
+
+## Integration with CI/CD
+
+These patches are automatically applied during the container maintenance workflows to ensure that older release versions can be built with updated dependencies and configurations while maintaining compatibility.
+The patches support the multi-version container image strategy that builds and maintains Docker images for the current development branch plus the last three released versions.
+See also the "three releases back" support promise at https://guides.dataverse.org/en/latest/container/app-image.html#tags-for-production-use.
+
+In the future, other automations may pick up the patches to release updated WAR files or similar.
\ No newline at end of file
diff --git a/src/backports/v6.4/001-parent-pom.xml.patch b/src/backports/v6.4/001-parent-pom.xml.patch
new file mode 100644
index 00000000000..b862eae0fe5
--- /dev/null
+++ b/src/backports/v6.4/001-parent-pom.xml.patch
@@ -0,0 +1,10 @@
+--- a/modules/dataverse-parent/pom.xml
++++ b/modules/dataverse-parent/pom.xml
+@@ -448,6 +448,7 @@
+                 -->
+                 <!--<base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>-->
+                 <base.image.version>${revision}</base.image.version>
++                <app.image.version>${base.image.version}</app.image.version>
+             </properties>
+
+             <bu
diff --git a/src/backports/v6.4/002-pom.xml.patch b/src/backports/v6.4/002-pom.xml.patch
new file mode 100644
index 00000000000..9d1edeba1c7
--- /dev/null
+++ b/src/backports/v6.4/002-pom.xml.patch
@@ -0,0 +1,42 @@
+--- a/pom.xml	(revision 906f874f9fd56241c41e6c2c2f6989c4406f5909)
++++ b/pom.xml	(date 1746655334773)
+@@ -997,14 +997,18 @@
+             
+                 <app.image>gdcc/dataverse:${app.image.tag}</app.image>
+                 <app.image.tag>unstable</app.image.tag>
++                <app.skipBuild>false</app.skipBuild>
+                 <app.skipDeploy>false</app.skipDeploy>
+                 <base.image>gdcc/base:${base.image.tag}</base.image>
+                 <!-- Flavor is a release from a Linux distro, such as Ubuntu -->
+                 <base.image.flavor>noble</base.image.flavor>
+                 <!-- base.image.version is coming from parent module via build-helper plugin -->
+-                <base.image.tag>${base.image.version}-${base.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
++                <base.image.tag>${base.image.version}-${base.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <!-- Suffix is defaulting to use the image with a specific Payara and Java version for development purpose -->
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
+                 <conf.image>gdcc/configbaker:${conf.image.tag}</conf.image>
+                 <conf.image.tag>${app.image.tag}</conf.image.tag>
++                <conf.skipBuild>false</conf.skipBuild>
+     
+                 <docker.platforms></docker.platforms>
+             
+@@ -1046,6 +1050,9 @@
+                                     <alias>dev_dataverse</alias>
+                                     <name>${app.image}</name>
+                                     <build>
++                                        <skip>${app.skipBuild}</skip>
++                                        <skipPush>${app.skipBuild}</skipPush>
++                                        <skipTag>${app.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
+@@ -1075,6 +1082,9 @@
+                                     <alias>dev_bootstrap</alias>
+                                     <name>${conf.image}</name>
+                                     <build>
++                                        <skip>${conf.skipBuild}</skip>
++                                        <skipPush>${conf.skipBuild}</skipPush>
++                                        <skipTag>${conf.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
diff --git a/src/backports/v6.5/001-parent-pom.xml.patch b/src/backports/v6.5/001-parent-pom.xml.patch
new file mode 100644
index 00000000000..b862eae0fe5
--- /dev/null
+++ b/src/backports/v6.5/001-parent-pom.xml.patch
@@ -0,0 +1,10 @@
+--- a/modules/dataverse-parent/pom.xml
++++ b/modules/dataverse-parent/pom.xml
+@@ -448,6 +448,7 @@
+                 -->
+                 <!--<base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>-->
+                 <base.image.version>${revision}</base.image.version>
++                <app.image.version>${base.image.version}</app.image.version>
+             </properties>
+
+             <bu
diff --git a/src/backports/v6.5/002-pom.xml.patch b/src/backports/v6.5/002-pom.xml.patch
new file mode 100644
index 00000000000..9d1edeba1c7
--- /dev/null
+++ b/src/backports/v6.5/002-pom.xml.patch
@@ -0,0 +1,42 @@
+--- a/pom.xml	(revision 906f874f9fd56241c41e6c2c2f6989c4406f5909)
++++ b/pom.xml	(date 1746655334773)
+@@ -997,14 +997,18 @@
+             
+                 <app.image>gdcc/dataverse:${app.image.tag}</app.image>
+                 <app.image.tag>unstable</app.image.tag>
++                <app.skipBuild>false</app.skipBuild>
+                 <app.skipDeploy>false</app.skipDeploy>
+                 <base.image>gdcc/base:${base.image.tag}</base.image>
+                 <!-- Flavor is a release from a Linux distro, such as Ubuntu -->
+                 <base.image.flavor>noble</base.image.flavor>
+                 <!-- base.image.version is coming from parent module via build-helper plugin -->
+-                <base.image.tag>${base.image.version}-${base.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
++                <base.image.tag>${base.image.version}-${base.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <!-- Suffix is defaulting to use the image with a specific Payara and Java version for development purpose -->
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
+                 <conf.image>gdcc/configbaker:${conf.image.tag}</conf.image>
+                 <conf.image.tag>${app.image.tag}</conf.image.tag>
++                <conf.skipBuild>false</conf.skipBuild>
+     
+                 <docker.platforms></docker.platforms>
+             
+@@ -1046,6 +1050,9 @@
+                                     <alias>dev_dataverse</alias>
+                                     <name>${app.image}</name>
+                                     <build>
++                                        <skip>${app.skipBuild}</skip>
++                                        <skipPush>${app.skipBuild}</skipPush>
++                                        <skipTag>${app.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
+@@ -1075,6 +1082,9 @@
+                                     <alias>dev_bootstrap</alias>
+                                     <name>${conf.image}</name>
+                                     <build>
++                                        <skip>${conf.skipBuild}</skip>
++                                        <skipPush>${conf.skipBuild}</skipPush>
++                                        <skipTag>${conf.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
diff --git a/src/backports/v6.6/001-parent-pom.xml.patch b/src/backports/v6.6/001-parent-pom.xml.patch
new file mode 100644
index 00000000000..9b2b9dd4b5c
--- /dev/null
+++ b/src/backports/v6.6/001-parent-pom.xml.patch
@@ -0,0 +1,10 @@
+--- a/modules/dataverse-parent/pom.xml
++++ b/modules/dataverse-parent/pom.xml
+@@ -455,6 +455,7 @@
+                 -->
+                 <!--<base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>-->
+                 <base.image.version>${revision}</base.image.version>
++                <app.image.version>${base.image.version}</app.image.version>
+             </properties>
+
+             <bu
diff --git a/src/backports/v6.6/002-pom.xml.patch b/src/backports/v6.6/002-pom.xml.patch
new file mode 100644
index 00000000000..9d1edeba1c7
--- /dev/null
+++ b/src/backports/v6.6/002-pom.xml.patch
@@ -0,0 +1,42 @@
+--- a/pom.xml	(revision 906f874f9fd56241c41e6c2c2f6989c4406f5909)
++++ b/pom.xml	(date 1746655334773)
+@@ -997,14 +997,18 @@
+             
+                 <app.image>gdcc/dataverse:${app.image.tag}</app.image>
+                 <app.image.tag>unstable</app.image.tag>
++                <app.skipBuild>false</app.skipBuild>
+                 <app.skipDeploy>false</app.skipDeploy>
+                 <base.image>gdcc/base:${base.image.tag}</base.image>
+                 <!-- Flavor is a release from a Linux distro, such as Ubuntu -->
+                 <base.image.flavor>noble</base.image.flavor>
+                 <!-- base.image.version is coming from parent module via build-helper plugin -->
+-                <base.image.tag>${base.image.version}-${base.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
++                <base.image.tag>${base.image.version}-${base.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <!-- Suffix is defaulting to use the image with a specific Payara and Java version for development purpose -->
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
+                 <conf.image>gdcc/configbaker:${conf.image.tag}</conf.image>
+                 <conf.image.tag>${app.image.tag}</conf.image.tag>
++                <conf.skipBuild>false</conf.skipBuild>
+     
+                 <docker.platforms></docker.platforms>
+             
+@@ -1046,6 +1050,9 @@
+                                     <alias>dev_dataverse</alias>
+                                     <name>${app.image}</name>
+                                     <build>
++                                        <skip>${app.skipBuild}</skip>
++                                        <skipPush>${app.skipBuild}</skipPush>
++                                        <skipTag>${app.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
+@@ -1075,6 +1082,9 @@
+                                     <alias>dev_bootstrap</alias>
+                                     <name>${conf.image}</name>
+                                     <build>
++                                        <skip>${conf.skipBuild}</skip>
++                                        <skipPush>${conf.skipBuild}</skipPush>
++                                        <skipTag>${conf.skipBuild}</skipTag>
+                                         <buildx>
+                                             <platforms>
+                                                 <platform>${docker.platforms}</platform>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
new file mode 100644
index 00000000000..beb1de53cd5
--- /dev/null
+++ b/src/main/docker/Dockerfile
@@ -0,0 +1,64 @@
+# Copyright 2023 Forschungszentrum JÃŧlich GmbH
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+################################################################################################################
+#
+# THIS FILE IS TO BE USED WITH MAVEN DOCKER BUILD:
+# mvn -Pct clean package
+#
+################################################################################################################
+#
+# Some commands used are inspired by https://github.com/payara/Payara/tree/master/appserver/extras/docker-images.
+# Most parts origin from older versions of https://github.com/gdcc/dataverse-kubernetes.
+#
+# We are not using upstream Payara images because:
+#  - Their image is less optimised for production usage and Dataverse by design choices
+#  - We provide multi-arch images
+#  - We provide some tweaks for development and monitoring
+#
+
+# Make the Java base image and version configurable (useful for trying newer Java versions and flavors)
+ARG BASE_IMAGE="gdcc/base:unstable"
+FROM $BASE_IMAGE
+
+# Make Payara use the "ct" profile for MicroProfile Config. Will switch various defaults for the application
+# setup in META-INF/microprofile-config.properties.
+# See also https://download.eclipse.org/microprofile/microprofile-config-3.0/microprofile-config-spec-3.0.html#configprofile
+ENV MP_CONFIG_PROFILE=ct
+
+# Workaround to configure upload directories by default to useful place until we can have variable lookups in
+# defaults for glassfish-web.xml and other places.
+ENV DATAVERSE_FILES_UPLOADS="${STORAGE_DIR}/uploads"
+ENV DATAVERSE_FILES_DOCROOT="${STORAGE_DIR}/docroot"
+
+# Copy app and deps from assembly in proper layers
+COPY --chown=payara:payara maven/deps ${DEPLOY_DIR}/dataverse/WEB-INF/lib/
+COPY --chown=payara:payara maven/app ${DEPLOY_DIR}/dataverse/
+COPY --chown=payara:payara maven/supplements ${DEPLOY_DIR}/dataverse/supplements/
+COPY --chown=payara:payara maven/scripts ${SCRIPT_DIR}/
+RUN chmod +x "${SCRIPT_DIR}"/*
+
+# Create symlinks for jHove
+RUN ln -s "${DEPLOY_DIR}/dataverse/supplements/jhove.conf" "${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}/config/jhove.conf" && \
+    ln -s "${DEPLOY_DIR}/dataverse/supplements/jhoveConfig.xsd" "${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}/config/jhoveConfig.xsd" && \
+    sed -i "${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}/config/jhove.conf" -e "s:/usr/local/payara./glassfish/domains/domain1:${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}:g"
+
+# Workaround for fabric8io/docker-maven-plugin#1865
+ARG APP_IMAGE_VERSION
+LABEL org.opencontainers.image.created="@git.build.time@" \
+      org.opencontainers.image.authors="Research Data Management at FZJ <forschungsdaten@fz-juelich.de>" \
+      org.opencontainers.image.url="https://guides.dataverse.org/en/latest/container/" \
+      org.opencontainers.image.documentation="https://guides.dataverse.org/en/latest/container/" \
+      org.opencontainers.image.source="https://github.com/IQSS/dataverse" \
+      org.opencontainers.image.version="$APP_IMAGE_VERSION" \
+      org.opencontainers.image.revision="@git.commit.id.abbrev@" \
+      org.opencontainers.image.vendor="Global Dataverse Community Consortium" \
+      org.opencontainers.image.licenses="Apache-2.0" \
+      org.opencontainers.image.title="Dataverse Application Image" \
+      org.opencontainers.image.description="This container image provides the research data repository software Dataverse in a box." \
+      org.opencontainers.image.base.name="$BASE_IMAGE" \
+      org.dataverse.deps.postgresql.version="@postgresql.server.version@" \
+      org.dataverse.deps.solr.version="@solr.version@"
\ No newline at end of file
diff --git a/src/main/docker/README.md b/src/main/docker/README.md
new file mode 100644
index 00000000000..48416c196ca
--- /dev/null
+++ b/src/main/docker/README.md
@@ -0,0 +1,67 @@
+# Dataverse Application Container Image
+
+The "application image" offers you a deployment-ready Dataverse application running on the underlying
+application server, which is provided by the [base image](https://hub.docker.com/r/gdcc/base). 
+Its sole purpose is to bundle the application and any additional material necessary to successfully jumpstart
+the application.
+
+Note: Until all :ref:`jvm-options` are *MicroProfile Config* enabled, it also adds the necessary scripting glue to
+configure the applications domain during booting the application server. See :ref:`app-tunables`.
+
+## Quick Reference
+
+**Maintained by:**
+
+This image is created, maintained and supported by the Dataverse community on a best-effort basis.
+
+**Where to find documentation:**
+
+The [Dataverse Container Guide - Application Image](https://guides.dataverse.org/en/latest/container/app-image.html)
+provides in-depth information about content, building, tuning and so on for this image. You should also consult
+the [Dataverse Container Guide - Base Image](https://guides.dataverse.org/en/latest/container/base-image.html) page
+for more details on tunable settings, locations, etc.
+
+**Where to get help and ask questions:**
+
+IQSS will not offer support on how to deploy or run it. Please reach out to the community for help on using it.
+You can join the Community Chat on Matrix at https://chat.dataverse.org and https://groups.google.com/g/dataverse-community
+to ask for help and guidance.
+
+## Supported Image Tags
+
+This image is sourced within the main upstream code [repository of the Dataverse software](https://github.com/IQSS/dataverse).
+Development and maintenance of the [image's code](https://github.com/IQSS/dataverse/tree/develop/src/main/docker) happens there (again, by the community).
+
+Our tagging is inspired by [Bitnami](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html).
+For more detailed information about our tagging policy, please read about our [application image tags](https://guides.dataverse.org/en/latest/container/app-image.html#supported-image-tags) in the Dataverse Containers Guide.
+
+For ease of use, here is a list of images that are currently maintained.
+
+<!-- TAG BLOCK HERE -->
+
+All of them are rolling tags, except those ending with `-r<number>`, which are the most recent immutable tags.
+The `unstable` tags are the current development branch snapshot.
+We strongly recommend using only immutable tags for production use cases.
+
+Within the main repository, you may find the application image files at `<git root>/src/main/docker`.
+This Maven module uses the [Maven Docker Plugin](https://dmp.fabric8.io) to build and ship the image.
+You may use, extend, or alter this image to your liking and/or host in some different registry if you want to.
+
+**Supported architectures:** This image is created as a "multi-arch image", supporting the most common architectures
+Dataverse usually runs on: AMD64 (Windows/Linux/...) and ARM64 (Apple M1/M2).
+
+## License
+
+Image content created by the community is licensed under [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0),
+like the [main Dataverse project](https://github.com/IQSS/dataverse/blob/develop/LICENSE.md).
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.
+
+As with all Docker images, all images likely also contain other software which may be under other licenses (such as
+[Payara Server](https://github.com/payara/Payara/blob/master/LICENSE.txt), Bash, etc., from the base
+distribution, along with any direct or indirect (Java) dependencies contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
diff --git a/src/main/docker/assembly.xml b/src/main/docker/assembly.xml
new file mode 100644
index 00000000000..819e480666d
--- /dev/null
+++ b/src/main/docker/assembly.xml
@@ -0,0 +1,33 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <fileSets>
+        <!-- Get our app, but exclude deps -->
+        <fileSet>
+            <directory>target/${project.artifactId}</directory>
+            <outputDirectory>app</outputDirectory>
+            <excludes>
+                <exclude>WEB-INF/lib/**/*</exclude>
+                <!-- Keep these excludes in sync with packagingExcludes in the main pom.xml. -->
+                <exclude>WEB-INF/classes/edu/harvard/iq/dataverse/search/GetExternalSearchServiceBean.class</exclude>
+                <exclude>WEB-INF/classes/edu/harvard/iq/dataverse/search/PostExternalSearchServiceBean.class</exclude>
+                <exclude>WEB-INF/classes/edu/harvard/iq/dataverse/search/GoldenOldiesSearchServiceBean.class</exclude>
+                <exclude>WEB-INF/classes/edu/harvard/iq/dataverse/search/OddlyEnoughSearchServiceBean.class</exclude>
+            </excludes>
+        </fileSet>
+        <!-- Get our dependencies in a seperate folder (image layer cache!) -->
+        <fileSet>
+            <directory>target/${project.artifactId}/WEB-INF/lib</directory>
+            <outputDirectory>deps</outputDirectory>
+        </fileSet>
+        <!-- Supplemental data (configs, metadata, ...) -->
+        <fileSet>
+            <directory>conf/jhove</directory>
+            <outputDirectory>supplements</outputDirectory>
+        </fileSet>
+        <!-- Init scripts and usage scripts (bootstrapping, configuration, ...) -->
+        <fileSet>
+            <directory>src/main/docker/scripts</directory>
+            <outputDirectory>scripts</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/main/docker/scripts/init_2_configure.sh b/src/main/docker/scripts/init_2_configure.sh
new file mode 100755
index 00000000000..5c1075f01f3
--- /dev/null
+++ b/src/main/docker/scripts/init_2_configure.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+################################################################################
+# Configure Payara
+#
+# BEWARE: As this is done for Kubernetes, we will ALWAYS start with a fresh container!
+#         When moving to Payara 5+ the option commands are idempotent.
+#         The resources are to be created by the application on deployment,
+#         once Dataverse has proper refactoring, etc.
+################################################################################
+
+# Fail on any error
+set -euo pipefail
+
+# Include some sane defaults (which are currently not settable via MicroProfile Config).
+# This is an ugly hack and shall be removed once #7000 is resolved.
+export dataverse_auth_password__reset__timeout__in__minutes="${dataverse_auth_password__reset__timeout__in__minutes:-60}"
+export dataverse_timerServer="${dataverse_timerServer:-true}"
+export dataverse_files_storage__driver__id="${dataverse_files_storage__driver__id:-local}"
+if [ "${dataverse_files_storage__driver__id}" = "local" ]; then
+  export dataverse_files_local_type="${dataverse_files_local_type:-file}"
+  export dataverse_files_local_label="${dataverse_files_local_label:-Local}"
+  export dataverse_files_local_directory="${dataverse_files_local_directory:-${STORAGE_DIR}/store}"
+fi
+
+# If reload is enable via ENABLE_RELOAD=1, set according Jakarta Faces options
+ENABLE_RELOAD=${ENABLE_RELOAD:-0}
+if [ "${ENABLE_RELOAD}" = "1" ]; then
+  export DATAVERSE_JSF_PROJECT_STAGE=${DATAVERSE_JSF_PROJECT_STAGE:-"Development"}
+  export DATAVERSE_JSF_REFRESH_PERIOD=${DATAVERSE_JSF_REFRESH_PERIOD:-"0"}
+fi
+
+# Check prerequisites for commands handling
+if [ -z "$POSTBOOT_COMMANDS_FILE" ]; then echo "Variable POSTBOOT_COMMANDS_FILE is not set."; exit 1; fi
+# Test if postboot file is writeable for us, exit otherwise
+touch "$POSTBOOT_COMMANDS_FILE" || exit 1
+# Copy and split the postboot contents to manipulate them
+EXISTING_DEPLOY_COMMANDS=$(mktemp)
+NEW_POSTBOOT_COMMANDS=$(mktemp)
+grep -e "^deploy " "$POSTBOOT_COMMANDS_FILE" > "$EXISTING_DEPLOY_COMMANDS" || true
+grep -v -e "^deploy" "$POSTBOOT_COMMANDS_FILE" > "$NEW_POSTBOOT_COMMANDS" || true
+
+function inject() {
+  if [ -z "$1" ]; then echo "No line specified"; exit 1; fi
+  # If the line is not yet in the file, try to add it
+  if ! grep -q "$1" "$NEW_POSTBOOT_COMMANDS"; then
+    # Check if the line is still not in the file when splitting at the first =
+    if ! grep -q "$(echo "$1" | cut -f1 -d"=")" "$NEW_POSTBOOT_COMMANDS"; then
+      echo "$1" >> "$NEW_POSTBOOT_COMMANDS"
+    fi
+  fi
+}
+
+# Domain based configuration options - set from Dataverse environment variables
+echo "INFO: Defining system properties for Dataverse configuration options."
+#env | grep -Ee "^(dataverse|doi)_" | sort -fd
+env -0 | grep -z -Ee "^(dataverse|doi)_" | while IFS='=' read -r -d '' k v; do
+    # transform __ to -
+    # shellcheck disable=SC2001
+    KEY=$(echo "${k}" | sed -e "s#__#-#g")
+    # transform remaining single _ to .
+    KEY=$(echo "${KEY}" | tr '_' '.')
+
+    # escape colons in values
+    # shellcheck disable=SC2001
+    v=$(echo "${v}" | sed -e 's/:/\\\:/g')
+
+    echo "DEBUG: Handling ${KEY}=${v}."
+    inject "create-system-properties ${KEY}=${v}"
+done
+
+# 4. Add the commands to the existing postboot file, but insert BEFORE deployment
+cat "$NEW_POSTBOOT_COMMANDS" "$EXISTING_DEPLOY_COMMANDS" > "${POSTBOOT_COMMANDS_FILE}"
+echo "DEBUG: postboot contains the following commands:"
+echo "--------------------------------------------------"
+cat "${POSTBOOT_COMMANDS_FILE}"
+echo "--------------------------------------------------"
diff --git a/src/main/docker/scripts/init_3_wait_dataverse_db_host.sh b/src/main/docker/scripts/init_3_wait_dataverse_db_host.sh
new file mode 100644
index 00000000000..06b41d60507
--- /dev/null
+++ b/src/main/docker/scripts/init_3_wait_dataverse_db_host.sh
@@ -0,0 +1,4 @@
+#It was reported on 9949 that on the first launch of the containers Dataverse would not be deployed on payara
+#this was caused by a race condition due postgress not being ready. A solion for docker compose was prepared
+#but didn't work due a compatibility issue on the Maven pluggin [https://github.com/fabric8io/docker-maven-plugin/issues/888]
+wait4x tcp "${DATAVERSE_DB_HOST:-postgres}:${DATAVERSE_DB_PORT:-5432}" -t 120s
diff --git a/src/main/java/META-INF/mime.types b/src/main/java/META-INF/mime.types
index c9a18ae2d06..7e11a630e78 100644
--- a/src/main/java/META-INF/mime.types
+++ b/src/main/java/META-INF/mime.types
@@ -7,7 +7,7 @@ text/comma-separated-values csv CSV
 text/plain txt TXT
 text/xml xml XML
 # Common statistical data formats
-text/tab-separated-values tab TAB tsv TSV
+text/tsv tab TAB tsv TSV
 text/x-fixed-field dat DAT asc ASC
 application/x-rlang-transport Rdata RData rdata RDATA
 type/x-r-syntax r R
diff --git a/src/main/java/ValidationMessages.properties b/src/main/java/ValidationMessages.properties
index 9c4f69252cf..7245c0841c7 100644
--- a/src/main/java/ValidationMessages.properties
+++ b/src/main/java/ValidationMessages.properties
@@ -2,7 +2,7 @@ user.firstName=Please enter your first name.
 user.lastName=Please enter your last name.
 user.invalidEmail=Please enter a valid email address.
 user.enterUsername=Please enter a username.
-user.usernameLength=Username must be between 2 and 60 characters.
+user.usernameLength=Username must be between {min} and {max} characters.
 user.illegalCharacters=Found an illegal character(s). Valid characters are a-Z, 0-9, '_', '-', and '.'.
 
 user.enterNickname=Please enter a nickname.
@@ -18,6 +18,7 @@ dataverse.aliasLength=Alias must be at most 60 characters.
 dataverse.aliasNotnumber=Alias should not be a number
 dataverse.nameIllegalCharacters=Found an illegal character(s). Valid characters are a-Z, 0-9, '_', and '-'.
 dataverse.category=Please select a category for your dataverse.
+dataverse.contact=Please enter a valid email address.
 contenttype.slash=Content-Type must contain a slash
 setspec.notNumber=Setspec should not be a number
 setspec.maxLength=Setspec must be at most 30 characters.
@@ -33,13 +34,6 @@ filename.illegalCharacters=File Name cannot contain any of the following charact
 directoryname.illegalCharacters=Directory Name cannot contain invalid characters. Valid characters are a-Z, 0-9, '_', '-', '.', '\\', '/' and ' ' (white space).
 filename.blank=Please specify a file name.
 
-
-map.layername=Please specify a layer name. 
-map.layerlink=Please specify a layer link. 
-map.link=Please specify am embedded map link.
-map.imagelink=Please specify a map image link.
-map.username=Please specify a WorldMap username.
-
 oauth.username=Please enter your username.
 
 password.retype=The new password is blank: re-type it again.
@@ -47,3 +41,7 @@ password.current=Please enter your current password.
 password.validate=Password reset page default email message.
 
 guestbook.name=Enter a name for the guestbook
+guestbook.response.nameLength=Please limit response to 255 characters
+
+email.invalid=is not a valid email address.
+url.invalid=is not a valid URL.
diff --git a/src/main/java/ValidationMessages_fr.properties b/src/main/java/ValidationMessages_fr.properties
deleted file mode 100644
index 40c43b00969..00000000000
--- a/src/main/java/ValidationMessages_fr.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-user.firstName=Veuillez entrer votre prénom.
-user.lastName=Veuillez entrer votre nom de famille. 
-user.invalidEmail=Veuillez entrer une adresse courriel valide.
-user.enterUsername=Veuillez entrer un nom d'utilisateur.
-user.usernameLength=Le nom d'utilisateur doit comporter entre 2 et 60 caractčres.
-user.illegalCharacters=Caractčre(s) non valide(s) utilisé(s). Les caractčres valides sont a-Z, 0-9, '_', '-' et '.'.
-
-user.enterNickname=Veuillez entrer un pseudonyme.
-user.nicknameLength=Le pseudonyme ne peut excéder 30 caractčres.
-user.nicknameNotnumber=Le pseudonyme ne devrait pas ętre un nombre
-
-dataset.templatename=Veuillez ajouter un nom pour le modčle d'ensemble de données.
-dataset.nameLength=Le nom ne peut excéder 255 caractčres.
-
-dataverse.name=Veuillez entrer un nom.
-dataverse.alias=Veuillez entrer un alias.
-dataverse.aliasLength=L'alias ne peut excéder 60 caractčres.
-dataverse.aliasNotnumber=L'alias ne devrait pas ętre un nombre.
-dataverse.nameIllegalCharacters=Caractčre(s) non valide(s) utilisé(s). Les caractčres valides sont a-Z, 0-9, '_', '-'.
-dataverse.category=Veuillez sélectionner une catégorie pour votre dataverse.
-contenttype.slash=Le type de contenu doit contenir une barre oblique.
-setspec.notNumber=Le nom (Setspec) ne devrait pas ętre un nombre.
-setspec.maxLength=Le nom (Setspec) ne peut excéder 30 caractčres.
-
-role.name=Un rôle doit avoir un nom.
-desc.maxLength=Le description ne peut excéder 255 caractčres.
-alias.maxLength=L'alias ne peut excéder 26 caractčres.
-alias.illegalCharacters=L'alias ne peut ętre vide. Les caractčres valides sont a-Z, 0-9, '_', '-'.
-
-custom.response=Veuillez entrer la réponse.
-custom.questiontext=Veuillez entrer le texte de la question.
-filename.illegalCharacters=Le nom du fichier ne peut contenir aucun des caractčres suivants\u00A0: \ / : * ? " < > | ; # .
-directoryname.illegalCharacters=Le nom du répertoire ne peut pas ętre suivi ni précédé d'un caractčre séparateur de fichiers.
-filename.blank=Veuillez spécifier un nom de fichier.
-
-
-map.layername=Veuillez spécifier un nom de couche cartographique. 
-map.layerlink=Veuillez spécifier un lien de couche cartographique. 
-map.link=Veuillez spécifier un lien de carte intégrée.
-map.imagelink=Veuillez spécifier un lien d'image de carte.
-map.username=Veuillez spécifier un nom d'utilisateur WorldMap.
-
-oauth.username=Veuillez entrer votre nom d'utilisateur.
-
-password.retype=Le nouveau mot de passe est vide\u00A0: veuillez le retaper ā nouveau.
-password.current=Veuillez entrer votre mot de passe actuel.
-password.validate=Page de réinitialisation du mot de passe par défaut.
-
-guestbook.name=Saisir un nom pour le registre de visiteurs.
diff --git a/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
deleted file mode 100644
index 6305b871cc0..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
+++ /dev/null
@@ -1,452 +0,0 @@
-package edu.harvard.iq.dataverse;
-
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import edu.harvard.iq.dataverse.util.SystemConfig;
-import java.io.InputStream;
-
-import javax.ejb.EJB;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-
-public abstract class AbstractGlobalIdServiceBean implements GlobalIdServiceBean {
-
-    private static final Logger logger = Logger.getLogger(AbstractGlobalIdServiceBean.class.getCanonicalName());
-
-    @EJB
-    DataverseServiceBean dataverseService;
-    @EJB
-    SettingsServiceBean settingsService;
-    @EJB
-    EjbDataverseEngine commandEngine;
-    @EJB
-    DatasetServiceBean datasetService;
-    @EJB
-    DataFileServiceBean datafileService;
-    @EJB
-    SystemConfig systemConfig;
-    
-    public static String UNAVAILABLE = ":unav";
-
-    @Override
-    public String getIdentifierForLookup(String protocol, String authority, String identifier) {
-        logger.log(Level.FINE,"getIdentifierForLookup");
-        return protocol + ":" + authority + "/" + identifier;
-    }
-
-    @Override
-    public Map<String, String> getMetadataForCreateIndicator(DvObject dvObjectIn) {
-        logger.log(Level.FINE,"getMetadataForCreateIndicator(DvObject)");
-        Map<String, String> metadata = new HashMap<>();
-        metadata = addBasicMetadata(dvObjectIn, metadata);
-        metadata.put("datacite.publicationyear", generateYear(dvObjectIn));
-        metadata.put("_target", getTargetUrl(dvObjectIn));
-        return metadata;
-    }
-
-    protected Map<String, String> getUpdateMetadata(DvObject dvObjectIn) {
-        logger.log(Level.FINE,"getUpdateMetadataFromDataset");
-        Map<String, String> metadata = new HashMap<>();
-        metadata = addBasicMetadata(dvObjectIn, metadata);
-        return metadata;
-    }
-    
-    protected Map<String, String> addBasicMetadata(DvObject dvObjectIn, Map<String, String> metadata) {
-
-        String authorString = dvObjectIn.getAuthorString();
-        if (authorString.isEmpty() || authorString.contains(DatasetField.NA_VALUE)) {
-            authorString = UNAVAILABLE;
-        }
-
-        String producerString = dataverseService.findRootDataverse().getName();
-
-        if (producerString.isEmpty() || producerString.equals(DatasetField.NA_VALUE)) {
-            producerString = UNAVAILABLE;
-        }
-
-        String titleString = dvObjectIn.getCurrentName();
-
-        if (titleString.isEmpty() || titleString.equals(DatasetField.NA_VALUE)) {
-            titleString = UNAVAILABLE;
-        }
-
-        metadata.put("datacite.creator", authorString);
-        metadata.put("datacite.title", titleString);
-        metadata.put("datacite.publisher", producerString);
-        metadata.put("datacite.publicationyear", generateYear(dvObjectIn));
-        return metadata;
-    } 
-    
-    protected Map<String, String> addDOIMetadataForDestroyedDataset(DvObject dvObjectIn) {
-        Map<String, String> metadata = new HashMap<>();
-        String authorString = UNAVAILABLE;
-        String producerString = UNAVAILABLE;
-        String titleString = "This item has been removed from publication";
-
-        metadata.put("datacite.creator", authorString);
-        metadata.put("datacite.title", titleString);
-        metadata.put("datacite.publisher", producerString);
-        metadata.put("datacite.publicationyear", "9999");
-        return metadata;
-    } 
-
-    protected String getTargetUrl(DvObject dvObjectIn) {
-        logger.log(Level.FINE,"getTargetUrl");
-        return systemConfig.getDataverseSiteUrl() + dvObjectIn.getTargetUrl() + dvObjectIn.getGlobalId().asString();
-    }
-    
-    @Override
-    public String getIdentifier(DvObject dvObject) {
-        return dvObject.getGlobalId().asString();
-    }
-
-    protected String getTargetUrl(Dataset datasetIn) {
-        logger.log(Level.FINE,"getTargetUrl");
-        return systemConfig.getDataverseSiteUrl() + Dataset.TARGET_URL + datasetIn.getGlobalIdString();
-    }
-    
-    protected String generateYear (DvObject dvObjectIn){
-        return dvObjectIn.getYearPublishedCreated(); 
-    }
-    
-    public Map<String, String> getMetadataForTargetURL(DvObject dvObject) {
-        logger.log(Level.FINE,"getMetadataForTargetURL");
-        HashMap<String, String> metadata = new HashMap<>();
-        metadata.put("_target", getTargetUrl(dvObject));
-        return metadata;
-    }
-    
-    @Override
-    public DvObject generateIdentifier(DvObject dvObject) {
-
-        String protocol = dvObject.getProtocol() == null ? settingsService.getValueForKey(SettingsServiceBean.Key.Protocol) : dvObject.getProtocol();
-        String authority = dvObject.getAuthority() == null ? settingsService.getValueForKey(SettingsServiceBean.Key.Authority) : dvObject.getAuthority();
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(protocol, commandEngine.getContext());
-        if (dvObject.isInstanceofDataset()) {
-            dvObject.setIdentifier(datasetService.generateDatasetIdentifier((Dataset) dvObject, idServiceBean));
-        } else {
-            dvObject.setIdentifier(datafileService.generateDataFileIdentifier((DataFile) dvObject, idServiceBean));
-        }
-        if (dvObject.getProtocol() == null) {
-            dvObject.setProtocol(protocol);
-        }
-        if (dvObject.getAuthority() == null) {
-            dvObject.setAuthority(authority);
-        }
-        return dvObject;
-    }
-    
-    class GlobalIdMetadataTemplate {
-
-
-    private   String template;
-
-    public GlobalIdMetadataTemplate(){
-        try (InputStream in = GlobalIdMetadataTemplate.class.getResourceAsStream("datacite_metadata_template.xml")) {
-            template = Util.readAndClose(in, "utf-8");
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "datacite metadata template load error");
-            logger.log(Level.SEVERE, "String " + e.toString());
-            logger.log(Level.SEVERE, "localized message " + e.getLocalizedMessage());
-            logger.log(Level.SEVERE, "cause " + e.getCause());
-            logger.log(Level.SEVERE, "message " + e.getMessage());
-        }
-    }
-
-    private String xmlMetadata;
-    private String identifier;
-    private String datasetIdentifier;
-    private List<String> datafileIdentifiers;
-    private List<String> creators;
-    private String title;
-    private String publisher;
-    private String publisherYear;
-    private List<DatasetAuthor> authors;
-    private String description;
-    private List<String[]> contacts;
-    private List<String[]> producers;
-
-    public List<String[]> getProducers() {
-        return producers;
-    }
-
-    public void setProducers(List<String[]> producers) {
-        this.producers = producers;
-    }
-
-    public List<String[]> getContacts() {
-        return contacts;
-    }
-
-    public void setContacts(List<String[]> contacts) {
-        this.contacts = contacts;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public List<DatasetAuthor> getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(List<DatasetAuthor> authors) {
-        this.authors = authors;
-    }
-
-
-    public List<String> getDatafileIdentifiers() {
-        return datafileIdentifiers;
-    }
-
-    public void setDatafileIdentifiers(List<String> datafileIdentifiers) {
-        this.datafileIdentifiers = datafileIdentifiers;
-    }
-
-    public GlobalIdMetadataTemplate(String xmlMetaData) {
-        this.xmlMetadata = xmlMetaData;
-        Document doc = Jsoup.parseBodyFragment(xmlMetaData);
-        Elements identifierElements = doc.select("identifier");
-        if (identifierElements.size() > 0) {
-            identifier = identifierElements.get(0).html();
-        }
-        Elements creatorElements = doc.select("creatorName");
-        creators = new ArrayList<>();
-        for (Element creatorElement : creatorElements) {
-            creators.add(creatorElement.html());
-        }
-        Elements titleElements = doc.select("title");
-        if (titleElements.size() > 0) {
-            title = titleElements.get(0).html();
-        }
-        Elements publisherElements = doc.select("publisher");
-        if (publisherElements.size() > 0) {
-            publisher = publisherElements.get(0).html();
-        }
-        Elements publisherYearElements = doc.select("publicationYear");
-        if (publisherYearElements.size() > 0) {
-            publisherYear = publisherYearElements.get(0).html();
-        }
-    }
-
-    public String generateXML(DvObject dvObject) {
-        // Can't use "UNKNOWN" here because DataCite will respond with "[facet 'pattern'] the value 'unknown' is not accepted by the pattern '[\d]{4}'"
-        String publisherYearFinal = "9999";
-        // FIXME: Investigate why this.publisherYear is sometimes null now that pull request #4606 has been merged.
-        if (this.publisherYear != null) {
-            // Added to prevent a NullPointerException when trying to destroy datasets when using DataCite rather than EZID.
-            publisherYearFinal = this.publisherYear;
-        }
-        xmlMetadata = template.replace("${identifier}", this.identifier.trim())
-                .replace("${title}", this.title)
-                .replace("${publisher}", this.publisher)
-                .replace("${publisherYear}", publisherYearFinal)
-                .replace("${description}", this.description);
-        StringBuilder creatorsElement = new StringBuilder();
-        for (DatasetAuthor author : authors) {
-            creatorsElement.append("<creator><creatorName>");
-            creatorsElement.append(author.getName().getDisplayValue());
-            creatorsElement.append("</creatorName>");
-
-            if (author.getIdType() != null && author.getIdValue() != null && !author.getIdType().isEmpty() && !author.getIdValue().isEmpty() && author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) {
-
-                if (author.getIdType().equals("ORCID")) {
-                    creatorsElement.append("<nameIdentifier schemeURI=\"https://orcid.org/\" nameIdentifierScheme=\"ORCID\">" + author.getIdValue() + "</nameIdentifier>");
-                }
-                if (author.getIdType().equals("ISNI")) {
-                    creatorsElement.append("<nameIdentifier schemeURI=\"http://isni.org/isni/\" nameIdentifierScheme=\"ISNI\">" + author.getIdValue() + "</nameIdentifier>");
-                }
-                if (author.getIdType().equals("LCNA")) {
-                    creatorsElement.append("<nameIdentifier schemeURI=\"http://id.loc.gov/authorities/names/\" nameIdentifierScheme=\"LCNA\">" + author.getIdValue() + "</nameIdentifier>");
-                }
-            }
-            if (author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) {
-                creatorsElement.append("<affiliation>" + author.getAffiliation().getDisplayValue() + "</affiliation>");
-            }
-            creatorsElement.append("</creator>");
-        }
-        xmlMetadata = xmlMetadata.replace("${creators}", creatorsElement.toString());
-
-        StringBuilder contributorsElement = new StringBuilder();
-        for (String[] contact : this.getContacts()) {
-            if (!contact[0].isEmpty()) {
-                contributorsElement.append("<contributor contributorType=\"ContactPerson\"><contributorName>" + contact[0] + "</contributorName>");
-                if (!contact[1].isEmpty()) {
-                    contributorsElement.append("<affiliation>" + contact[1] + "</affiliation>");
-                }
-                contributorsElement.append("</contributor>");
-            }
-        }
-        for (String[] producer : this.getProducers()) {
-            contributorsElement.append("<contributor contributorType=\"Producer\"><contributorName>" + producer[0] + "</contributorName>");
-            if (!producer[1].isEmpty()) {
-                contributorsElement.append("<affiliation>" + producer[1] + "</affiliation>");
-            }
-            contributorsElement.append("</contributor>");
-        }
-
-        String relIdentifiers = generateRelatedIdentifiers(dvObject);
-
-        xmlMetadata = xmlMetadata.replace("${relatedIdentifiers}", relIdentifiers);
-
-        xmlMetadata = xmlMetadata.replace("{$contributors}", contributorsElement.toString());
-        return xmlMetadata;
-    }
-
-    private String generateRelatedIdentifiers(DvObject dvObject) {
-
-        StringBuilder sb = new StringBuilder();
-        if (dvObject.isInstanceofDataset()) {
-            Dataset dataset = (Dataset) dvObject;
-            if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) {
-
-                datafileIdentifiers = new ArrayList<>();
-                for (DataFile dataFile : dataset.getFiles()) {
-                    if (!dataFile.getGlobalId().asString().isEmpty()) {
-                        if (sb.toString().isEmpty()) {
-                            sb.append("<relatedIdentifiers>");
-                        }
-                        sb.append("<relatedIdentifier relatedIdentifierType=\"DOI\" relationType=\"HasPart\">" + dataFile.getGlobalId() + "</relatedIdentifier>");
-                    }
-                }
-
-                if (!sb.toString().isEmpty()) {
-                    sb.append("</relatedIdentifiers>");
-                }
-            }
-        } else if (dvObject.isInstanceofDataFile()) {
-            DataFile df = (DataFile) dvObject;
-            sb.append("<relatedIdentifiers>");
-            sb.append("<relatedIdentifier relatedIdentifierType=\"DOI\" relationType=\"IsPartOf\""
-                    + ">" + df.getOwner().getGlobalId() + "</relatedIdentifier>");
-            sb.append("</relatedIdentifiers>");
-        }
-        return sb.toString();
-    }
-
-    public void generateFileIdentifiers(DvObject dvObject) {
-
-        if (dvObject.isInstanceofDataset()) {
-            Dataset dataset = (Dataset) dvObject;
-
-            if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) {
-
-                datafileIdentifiers = new ArrayList<>();
-                for (DataFile dataFile : dataset.getFiles()) {
-                    datafileIdentifiers.add(dataFile.getIdentifier());
-                    int x = xmlMetadata.indexOf("</relatedIdentifiers>") - 1;
-                    xmlMetadata = xmlMetadata.replace("{relatedIdentifier}", dataFile.getIdentifier());
-                    xmlMetadata = xmlMetadata.substring(0, x) + "<relatedIdentifier relatedIdentifierType=\"hasPart\" "
-                            + "relationType=\"doi\">${relatedIdentifier}</relatedIdentifier>" + template.substring(x, template.length() - 1);
-
-                }
-
-            } else {
-                xmlMetadata = xmlMetadata.replace("<relatedIdentifier relatedIdentifierType=\"hasPart\" relationType=\"doi\">${relatedIdentifier}</relatedIdentifier>", "");
-            }
-        }
-    }
-
-    public  String getTemplate() {
-        return template;
-    }
-
-    public  void setTemplate(String templateIn) {
-        template = templateIn;
-    }
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-    }
-
-    public void setDatasetIdentifier(String datasetIdentifier) {
-        this.datasetIdentifier = datasetIdentifier;
-    }
-
-    public List<String> getCreators() {
-        return creators;
-    }
-
-    public void setCreators(List<String> creators) {
-        this.creators = creators;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getPublisher() {
-        return publisher;
-    }
-
-    public void setPublisher(String publisher) {
-        this.publisher = publisher;
-    }
-
-    public String getPublisherYear() {
-        return publisherYear;
-    }
-
-    public void setPublisherYear(String publisherYear) {
-        this.publisherYear = publisherYear;
-    }
-}
-    public String getMetadataFromDvObject(String identifier, Map<String, String> metadata, DvObject dvObject) {
-
-        Dataset dataset = null;
-
-        if (dvObject instanceof Dataset) {
-            dataset = (Dataset) dvObject;
-        } else {
-            dataset = (Dataset) dvObject.getOwner();
-        }
-
-        GlobalIdMetadataTemplate metadataTemplate = new GlobalIdMetadataTemplate();
-        metadataTemplate.setIdentifier(identifier.substring(identifier.indexOf(':') + 1));
-        metadataTemplate.setCreators(Util.getListFromStr(metadata.get("datacite.creator")));
-        metadataTemplate.setAuthors(dataset.getLatestVersion().getDatasetAuthors());
-        if (dvObject.isInstanceofDataset()) {
-            metadataTemplate.setDescription(dataset.getLatestVersion().getDescriptionPlainText());
-        }
-        if (dvObject.isInstanceofDataFile()) {
-            DataFile df = (DataFile) dvObject;
-            String fileDescription = df.getDescription();
-            metadataTemplate.setDescription(fileDescription == null ? "" : fileDescription);
-            String datasetPid = df.getOwner().getGlobalId().asString();
-            metadataTemplate.setDatasetIdentifier(datasetPid);
-        } else {
-            metadataTemplate.setDatasetIdentifier("");
-        }
-
-        metadataTemplate.setContacts(dataset.getLatestVersion().getDatasetContacts());
-        metadataTemplate.setProducers(dataset.getLatestVersion().getDatasetProducers());
-        metadataTemplate.setTitle(dvObject.getCurrentName());
-        String producerString = dataverseService.findRootDataverse().getName();
-        if (producerString.isEmpty()  || producerString.equals(DatasetField.NA_VALUE) ) {
-            producerString = UNAVAILABLE;
-        }
-        metadataTemplate.setPublisher(producerString);
-        metadataTemplate.setPublisherYear(metadata.get("datacite.publicationyear"));
-
-        String xmlMetadata = metadataTemplate.generateXML(dvObject);
-        logger.log(Level.FINE, "XML to send to DataCite: {0}", xmlMetadata);
-        return xmlMetadata;
-    }
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/AlternativePersistentIdentifier.java b/src/main/java/edu/harvard/iq/dataverse/AlternativePersistentIdentifier.java
index 6fc7262925a..246cd681323 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AlternativePersistentIdentifier.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AlternativePersistentIdentifier.java
@@ -3,19 +3,18 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+
+import jakarta.persistence.*;
 
 /**
  *
  * @author skraffmi
  */
+@NamedQueries({
+        @NamedQuery(name = "AlternativePersistentIdentifier.findByProtocolIdentifierAuthority",
+                query = "SELECT o.id FROM AlternativePersistentIdentifier o WHERE o.identifier=:identifier and o.authority=:authority and o.protocol=:protocol")
+}
+)
 @Entity
 public class AlternativePersistentIdentifier implements Serializable {
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/ApiTokenPage.java b/src/main/java/edu/harvard/iq/dataverse/ApiTokenPage.java
index 05923b9e13a..16ff4d266d8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ApiTokenPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ApiTokenPage.java
@@ -4,15 +4,15 @@
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import java.sql.Timestamp;
+import edu.harvard.iq.dataverse.api.Util;
+
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 /**
  * @todo Rename this to ApiTokenFragment? The separate page is being taken out
@@ -75,4 +75,33 @@ public void generate() {
             
         }
     }
+    
+    public String getApiTokenExpiration() {
+        if (session.getUser().isAuthenticated()) {
+            AuthenticatedUser au = (AuthenticatedUser) session.getUser();
+            apiToken = authSvc.findApiTokenByUser(au);
+            if (apiToken != null) {
+                return Util.getDateFormat().format(apiToken.getExpireTime());
+            } else {
+                return "";
+            }
+        } else {
+            // It should be impossible to get here from the UI.
+            return "";
+        }
+    }
+    
+    public Boolean tokenIsExpired(){
+        return apiToken.isExpired();
+    }
+    
+    public void revoke() {
+        if (session.getUser().isAuthenticated()) {
+            AuthenticatedUser au = (AuthenticatedUser) session.getUser();
+            apiToken = authSvc.findApiTokenByUser(au);
+            if (apiToken != null) {
+                authSvc.removeApiToken(au);
+            }
+        }
+    }   
 }
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
new file mode 100644
index 00000000000..d03ebbc6f7b
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFile.java
@@ -0,0 +1,166 @@
+
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import java.io.Serializable;
+import java.util.MissingResourceException;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedNativeQueries;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+
+/**
+ *
+ * @author ekraffmiller 
+ * Represents a generic file that is associated with a dataFile.
+ * This is a data representation of a physical file in StorageIO
+ */
+@NamedQueries({
+    @NamedQuery(name = "AuxiliaryFile.lookupAuxiliaryFile",
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.formatTag = :formatTag and o.formatVersion = :formatVersion"),
+    @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFiles",
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId"),
+    @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFilesByType",
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type = :type"),
+    @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFilesWithoutType",
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.type is null"),
+    @NamedQuery(name = "AuxiliaryFile.findAuxiliaryFilesByOrigin",
+            query = "select object(o) from AuxiliaryFile as o where o.dataFile.id = :dataFileId and o.origin = :origin"),
+})
+@NamedNativeQueries({
+    @NamedNativeQuery(name = "AuxiliaryFile.findAuxiliaryFileTypes",
+            query = "select distinct type from auxiliaryfile where datafile_id = ?1")
+})
+@Entity
+public class AuxiliaryFile implements Serializable {
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    
+     /**
+     * The data file that this AuxiliaryFile belongs to
+     * a data file may have many auxiliaryFiles
+     */
+    @ManyToOne
+    @JoinColumn(nullable=false)
+    private DataFile dataFile;
+  
+    private String formatTag;
+    
+    private String formatVersion;
+
+    /**
+     * The application/entity that created the auxiliary file.
+     */
+    private String origin;
+    
+    private boolean isPublic;
+    
+    private String contentType; 
+    
+    private Long fileSize; 
+    
+    private String checksum;
+
+    /**
+     * A way of grouping similar auxiliary files together. The type could be
+     * "DP" for "Differentially Private Statistics", for example.
+     */
+    private String type;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public DataFile getDataFile() {
+        return dataFile;
+    }
+
+    public void setDataFile(DataFile dataFile) {
+        this.dataFile = dataFile;
+    }
+
+    public String getFormatTag() {
+        return formatTag;
+    }
+
+    public void setFormatTag(String formatTag) {
+        this.formatTag = formatTag;
+    }
+
+    public String getFormatVersion() {
+        return formatVersion;
+    }
+
+    public void setFormatVersion(String formatVersion) {
+        this.formatVersion = formatVersion;
+    }
+
+    public String getOrigin() {
+        return origin;
+    }
+
+    public void setOrigin(String origin) {
+        this.origin = origin;
+    }
+
+    public boolean getIsPublic() {
+        return isPublic;
+    }
+
+    public void setIsPublic(boolean isPublic) {
+        this.isPublic = isPublic;
+    }
+    
+    public String getContentType() {
+        return this.contentType;
+    }
+
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+    
+    public Long getFileSize() {
+            return fileSize; 
+    }
+    
+    public void setFileSize(long fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public String getChecksum() {
+        return checksum;
+    }
+
+    public void setChecksum(String checksum) {
+        this.checksum = checksum;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getTypeFriendly() {
+        try {
+            return BundleUtil.getStringFromPropertyFile("file.auxfiles.types." + type, "Bundle");
+        } catch (MissingResourceException ex) {
+            return null;
+        }
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
new file mode 100644
index 00000000000..363622ba3bf
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBean.java
@@ -0,0 +1,281 @@
+
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
+import edu.harvard.iq.dataverse.storageuse.StorageUseServiceBean;
+import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.ws.rs.ClientErrorException;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.ServerErrorException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+import org.apache.tika.Tika;
+
+/**
+ *
+ * @author ekraffmiller
+ *  Methods related to the AuxiliaryFile Entity.
+ */
+@Stateless
+@Named
+public class AuxiliaryFileServiceBean implements java.io.Serializable {
+   private static final Logger logger = Logger.getLogger(AuxiliaryFileServiceBean.class.getCanonicalName());
+
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    protected EntityManager em;
+    
+    @EJB
+    private SystemConfig systemConfig;
+    
+    @EJB
+    StorageUseServiceBean storageUseService; 
+
+    public AuxiliaryFile find(Object pk) {
+        return em.find(AuxiliaryFile.class, pk);
+    }
+
+    public AuxiliaryFile save(AuxiliaryFile auxiliaryFile) {
+        AuxiliaryFile savedFile = em.merge(auxiliaryFile);
+        return savedFile;
+
+    }
+    
+    /**
+     * Save the physical file to storageIO, and save the AuxiliaryFile entity
+     * to the database.  This should be an all or nothing transaction - if either
+     * process fails, than nothing will be saved
+     * @param fileInputStream - auxiliary file data to be saved
+     * @param dataFile  - the dataFile entity this will be added to
+     * @param formatTag - type of file being saved
+     * @param formatVersion - to distinguish between multiple versions of a file
+     * @param origin - name of the tool/system that created the file
+     * @param isPublic boolean - is this file available to any user?
+     * @param type how to group the files such as "DP" for "Differentially
+     * @param mediaType user supplied content type (MIME type)
+     * Private Statistics".
+     * @param save boolean - true to save immediately, false to let the cascade
+     * do persist to the database.
+     * @return an AuxiliaryFile with an id when save=true (assuming no
+     * exceptions) or an AuxiliaryFile without an id that will be persisted
+     * later through the cascade.
+     */
+    public AuxiliaryFile processAuxiliaryFile(InputStream fileInputStream, DataFile dataFile, String formatTag, String formatVersion, String origin, boolean isPublic, String type, MediaType mediaType, boolean save) {
+
+        StorageIO<DataFile> storageIO = null;
+        AuxiliaryFile auxFile = new AuxiliaryFile();
+        String auxExtension = formatTag + "_" + formatVersion;
+        try {
+            // Save to storage first.
+            // If that is successful (does not throw exception),
+            // then save to db.
+            // If the db fails for any reason, then rollback
+            // by removing the auxfile from storage.
+            storageIO = dataFile.getStorageIO();
+            if (storageIO.isAuxObjectCached(auxExtension)) {
+                throw new ClientErrorException("Auxiliary file already exists", Response.Status.CONFLICT);
+            }
+            MessageDigest md;
+            try {
+                md = MessageDigest.getInstance(systemConfig.getFileFixityChecksumAlgorithm().toString());
+            } catch (NoSuchAlgorithmException e) {
+                logger.severe("NoSuchAlgorithmException for system fixity algorithm: " + systemConfig.getFileFixityChecksumAlgorithm().toString());
+                throw new InternalServerErrorException();
+            }
+            DigestInputStream di = new DigestInputStream(fileInputStream, md);
+
+            storageIO.saveInputStreamAsAux(di, auxExtension);
+            auxFile.setChecksum(FileUtil.checksumDigestToString(di.getMessageDigest().digest()));
+
+            // The null check prevents an NPE but we expect mediaType to be non-null
+            // and to default to "application/octet-stream".
+            if (mediaType != null && (!mediaType.toString().equals("application/octet-stream"))) {
+                auxFile.setContentType(mediaType.toString());
+            } else {
+                Tika tika = new Tika();
+                auxFile.setContentType(tika.detect(storageIO.getAuxFileAsInputStream(auxExtension)));
+            }
+            auxFile.setFormatTag(formatTag);
+            auxFile.setFormatVersion(formatVersion);
+            auxFile.setOrigin(origin);
+            auxFile.setIsPublic(isPublic);
+            auxFile.setType(type);
+            auxFile.setDataFile(dataFile);
+            auxFile.setFileSize(storageIO.getAuxObjectSize(auxExtension));
+            if (save) {
+                auxFile = save(auxFile);
+            } else {
+                if (dataFile.getAuxiliaryFiles() == null) {
+                    dataFile.setAuxiliaryFiles(new ArrayList<>());
+                }
+                dataFile.getAuxiliaryFiles().add(auxFile);
+            }
+            // We've just added this file to storage; increment the StorageUse
+            // record if needed. 
+            if (auxFile.getFileSize() != null 
+                    && auxFile.getFileSize() > 0 
+                    && dataFile.getOwner() != null ) {
+                storageUseService.incrementStorageSizeRecursively(dataFile.getOwner().getId(), auxFile.getFileSize());
+            }
+        } catch (IOException ioex) {
+            logger.severe("IO Exception trying to save auxiliary file: " + ioex.getMessage());
+            throw new InternalServerErrorException();
+        } catch (ServerErrorException e) {
+            // If anything fails during database insert, remove file from storage
+            try {
+                storageIO.deleteAuxObject(auxExtension);
+            } catch (IOException ioex) {
+                logger.warning("IO Exception trying remove auxiliary file in exception handler: " + ioex.getMessage());
+            }
+            throw e;
+        }
+        return auxFile;
+    }
+
+    public AuxiliaryFile processAuxiliaryFile(InputStream fileInputStream, DataFile dataFile, String formatTag, String formatVersion, String origin, boolean isPublic, String type, MediaType mediaType) {
+        return processAuxiliaryFile(fileInputStream, dataFile, formatTag, formatVersion, origin, isPublic, type, mediaType, true);
+    }
+
+    public AuxiliaryFile lookupAuxiliaryFile(DataFile dataFile, String formatTag, String formatVersion) {
+        
+        Query query = em.createNamedQuery("AuxiliaryFile.lookupAuxiliaryFile");
+                
+        query.setParameter("dataFileId", dataFile.getId());
+        query.setParameter("formatTag", formatTag);
+        query.setParameter("formatVersion", formatVersion);
+        try {
+            AuxiliaryFile retVal = (AuxiliaryFile)query.getSingleResult();
+            return retVal;
+        } catch(NoResultException nr) {
+            return null;
+        }
+    }
+    
+
+    public List<AuxiliaryFile> findAuxiliaryFiles(DataFile dataFile, String origin) {
+        
+        TypedQuery<AuxiliaryFile> query;
+        if (origin == null) {
+            query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFiles", AuxiliaryFile.class);
+        } else {
+            query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFilesByOrigin", AuxiliaryFile.class);
+            query.setParameter("origin", origin);
+        }
+        query.setParameter("dataFileId", dataFile.getId());
+        
+        List<AuxiliaryFile> retVal = query.getResultList();
+        return retVal;
+    }
+
+    public void deleteAuxiliaryFile(DataFile dataFile, String formatTag, String formatVersion) throws IOException {
+        AuxiliaryFile af = lookupAuxiliaryFile(dataFile, formatTag, formatVersion);
+        if (af == null) {
+            throw new FileNotFoundException();
+        }
+        Long auxFileSize = af.getFileSize();
+        em.remove(af);
+        StorageIO<?> storageIO;
+        storageIO = dataFile.getStorageIO();
+        String auxExtension = formatTag + "_" + formatVersion;
+        if (storageIO.isAuxObjectCached(auxExtension)) {
+            storageIO.deleteAuxObject(auxExtension);
+        }
+        // We've just deleted this file from storage; update the StorageUse
+        // record if needed. 
+        if (auxFileSize != null
+                && auxFileSize > 0
+                && dataFile.getOwner() != null) {
+            storageUseService.incrementStorageSizeRecursively(dataFile.getOwner().getId(), (0L - auxFileSize));
+        }
+        
+    }
+
+    public List<AuxiliaryFile> findAuxiliaryFiles(DataFile dataFile) {
+        TypedQuery<AuxiliaryFile> query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFiles", AuxiliaryFile.class);
+        query.setParameter("dataFileId", dataFile.getId());
+        return query.getResultList();
+    }
+
+    /**
+     * @param inBundle If true, only return types that are in the bundle. If
+     * false, only return types that are not in the bundle.
+     */
+    public List<String> findAuxiliaryFileTypes(DataFile dataFile, boolean inBundle) {
+        List<String> allTypes = findAuxiliaryFileTypes(dataFile);
+        List<String> typesInBundle = new ArrayList<>();
+        List<String> typeNotInBundle = new ArrayList<>();
+        for (String type : allTypes) {
+            // Check if type is in the bundle.
+            String friendlyType = getFriendlyNameForType(type);
+            if (friendlyType != null) {
+                typesInBundle.add(type);
+            } else {
+                typeNotInBundle.add(type);
+            }
+        }
+        if (inBundle) {
+            return typesInBundle;
+        } else {
+            return typeNotInBundle;
+        }
+    }
+
+    public List<String> findAuxiliaryFileTypes(DataFile dataFile) {
+        TypedQuery<String> query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFileTypes", String.class);
+        query.setParameter(1, dataFile.getId());
+        return query.getResultList();
+    }
+
+    public List<AuxiliaryFile> findAuxiliaryFilesByType(DataFile dataFile, String typeString) {
+        TypedQuery<AuxiliaryFile> query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFilesByType", AuxiliaryFile.class);
+        query.setParameter("dataFileId", dataFile.getId());
+        query.setParameter("type", typeString);
+        return query.getResultList();
+    }
+
+    public List<AuxiliaryFile> findOtherAuxiliaryFiles(DataFile dataFile) {
+        List<AuxiliaryFile> otherAuxFiles = new ArrayList<>();
+        List<String> otherTypes = findAuxiliaryFileTypes(dataFile, false);
+        for (String typeString : otherTypes) {
+            TypedQuery<AuxiliaryFile> query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFilesByType", AuxiliaryFile.class);
+            query.setParameter("dataFileId", dataFile.getId());
+            query.setParameter("type", typeString);
+            List<AuxiliaryFile> auxFiles = query.getResultList();
+            otherAuxFiles.addAll(auxFiles);
+        }
+        otherAuxFiles.addAll(findAuxiliaryFilesWithoutType(dataFile));
+        return otherAuxFiles;
+    }
+
+    public List<AuxiliaryFile> findAuxiliaryFilesWithoutType(DataFile dataFile) {
+        TypedQuery<AuxiliaryFile> query = em.createNamedQuery("AuxiliaryFile.findAuxiliaryFilesWithoutType", AuxiliaryFile.class);
+        query.setParameter("dataFileId", dataFile.getId());
+        return query.getResultList();
+    }
+
+    public String getFriendlyNameForType(String type) {
+        AuxiliaryFile auxFile = new AuxiliaryFile();
+        auxFile.setType(type);
+        return auxFile.getTypeFriendly();
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/BannerMessage.java b/src/main/java/edu/harvard/iq/dataverse/BannerMessage.java
new file mode 100644
index 00000000000..003d1057972
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/BannerMessage.java
@@ -0,0 +1,107 @@
+
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import java.io.Serializable;
+import java.util.Collection;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+
+
+/**
+ *
+ * @author skraffmi
+ */
+@Entity
+public class BannerMessage implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column
+    private boolean dismissibleByUser;
+    
+    @Column
+    private boolean active;
+
+    @OneToMany(mappedBy = "bannerMessage", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
+    private Collection<BannerMessageText> bannerMessageTexts;
+    
+    @OneToMany(mappedBy = "bannerMessage", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
+    private Collection<UserBannerMessage> userBannerMessages;
+
+    public Collection<BannerMessageText> getBannerMessageTexts() {
+        return this.bannerMessageTexts;
+    }
+
+    public void setBannerMessageTexts(Collection<BannerMessageText> bannerMessageTexts) {
+        this.bannerMessageTexts = bannerMessageTexts;
+    }
+    
+    
+    public String getDisplayValue(){        
+        String retVal = null;
+        for (BannerMessageText msgTxt : this.getBannerMessageTexts()) {
+            if (msgTxt.getLang().equals(BundleUtil.getCurrentLocale().getLanguage())) {
+                retVal = msgTxt.getMessage();
+            }
+        }
+        return retVal;               
+    }
+
+    public boolean isDismissibleByUser() {
+        return dismissibleByUser;
+    }
+
+    public void setDismissibleByUser(boolean dismissibleByUser) {
+        this.dismissibleByUser = dismissibleByUser;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof BannerMessage)) {
+            return false;
+        }
+        BannerMessage other = (BannerMessage) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "edu.harvard.iq.dataverse.BannerMessage[ id=" + id + " ]";
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/BannerMessageServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/BannerMessageServiceBean.java
new file mode 100644
index 00000000000..3961bd064db
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/BannerMessageServiceBean.java
@@ -0,0 +1,81 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.List;
+import java.util.logging.Logger;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+
+/**
+ *
+ * @author skraffmi
+ */
+@Stateless
+@Named
+public class BannerMessageServiceBean implements java.io.Serializable {
+    private static final Logger logger = Logger.getLogger(BannerMessageServiceBean.class.getCanonicalName());
+
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    private EntityManager em;
+    
+    public List<BannerMessage> findBannerMessages() {
+        return em.createQuery("select object(o) from BannerMessage as o where o.active = 'true' and o.dismissibleByUser = 'false'", BannerMessage.class)
+                .getResultList();
+    }
+    
+    public List<BannerMessage> findBannerMessages(Long auId) {
+        return em.createQuery("select object(o) from BannerMessage as o where (o.active = 'true' and  o.dismissibleByUser = 'false') "
+                + " or (o.active = 'true' and o.dismissibleByUser = 'true' and o.id not in (select ubm.bannerMessage.id from UserBannerMessage as ubm where ubm.user.id  =:authenticatedUserId))", BannerMessage.class)
+                .setParameter("authenticatedUserId", auId)
+                .getResultList();
+    }
+    
+    public List<BannerMessage> findAllBannerMessages() {
+        return em.createQuery("select o from BannerMessage o where o.active = 'true' ")
+                .getResultList();
+    }
+    
+    public void save( BannerMessage message ) {
+        em.persist(message);
+        em.flush();
+    }
+    
+    
+    public void deleteBannerMessage(Object pk) {
+        BannerMessage message = em.find(BannerMessage.class, pk);
+
+        if (message != null) { 
+            em.remove(message);
+        }
+    }
+            
+    public void deactivateBannerMessage(Object pk) {
+        BannerMessage message = em.find(BannerMessage.class, pk);
+
+        if (message != null) { 
+            message.setActive(false);
+            em.merge(message);
+        }
+    }
+    
+    public void dismissMessageByUser(BannerMessage message, AuthenticatedUser user) {
+
+        UserBannerMessage ubm = new UserBannerMessage();
+        ubm.setUser(user);
+        ubm.setBannerMessage(message);
+        ubm.setBannerDismissalTime(new Timestamp(new Date().getTime()));
+        em.persist(ubm);
+        em.flush();
+
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/BannerMessageText.java b/src/main/java/edu/harvard/iq/dataverse/BannerMessageText.java
new file mode 100644
index 00000000000..ea2dd1b41fc
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/BannerMessageText.java
@@ -0,0 +1,94 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse;
+
+import java.io.Serializable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+
+/**
+ *
+ * @author skraffmi
+ */
+@Entity
+public class BannerMessageText implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(columnDefinition = "TEXT")
+    private String message;
+
+    @Column(columnDefinition = "TEXT")
+    private String lang;
+    
+    @ManyToOne
+    @JoinColumn( nullable = false )
+    private BannerMessage bannerMessage;
+    
+    public BannerMessage getBannerMessage() {
+        return bannerMessage;
+    }
+    public void setBannerMessage(BannerMessage bannerMessage) {
+        this.bannerMessage = bannerMessage;
+    }
+    
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getLang() {
+        return lang;
+    }
+
+    public void setLang(String lang) {
+        this.lang = lang;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof BannerMessageText)) {
+            return false;
+        }
+        BannerMessageText other = (BannerMessageText) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "edu.harvard.iq.dataverse.BannerMessageText[ id=" + id + " ]";
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/CitationServlet.java b/src/main/java/edu/harvard/iq/dataverse/CitationServlet.java
index 2b342b09610..68c8d49ad7e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/CitationServlet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/CitationServlet.java
@@ -5,14 +5,15 @@
  */
 package edu.harvard.iq.dataverse;
 
-import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+
 import java.io.IOException;
-import java.io.PrintWriter;
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import jakarta.ejb.EJB;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  *
@@ -21,7 +22,7 @@
 public class CitationServlet extends HttpServlet {
 
     @EJB
-    DatasetServiceBean datasetService;    
+    DvObjectServiceBean dvObjectService;
     
     /**
      * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
@@ -37,10 +38,14 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
         
         String persistentId = request.getParameter("persistentId");
         if (persistentId != null) {
-            Dataset ds = datasetService.findByGlobalId(persistentId);        
-            if (ds != null) {
-                response.sendRedirect("dataset.xhtml?persistentId=" + persistentId);
-                return;        
+            DvObject dob = dvObjectService.findByGlobalId(PidUtil.parseAsGlobalID(persistentId));
+            if (dob != null) {
+                if (dob instanceof Dataset) {
+                    response.sendRedirect("dataset.xhtml?persistentId=" + persistentId);
+                } else if (dob instanceof DataFile) {
+                    response.sendRedirect("file.xhtml?persistentId=" + persistentId);
+                }
+                return;
             }
         }
         response.sendError(HttpServletResponse.SC_NOT_FOUND);
diff --git a/src/main/java/edu/harvard/iq/dataverse/ConfigureFragmentBean.java b/src/main/java/edu/harvard/iq/dataverse/ConfigureFragmentBean.java
index c8bc7439725..bf509c33995 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ConfigureFragmentBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ConfigureFragmentBean.java
@@ -16,10 +16,10 @@
 
 import java.sql.Timestamp;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.util.Date;
 
 
@@ -107,7 +107,8 @@ public void  generateApiToken() {
         User user = session.getUser();
         if (user instanceof AuthenticatedUser) {
             apiToken = authService.findApiTokenByUser((AuthenticatedUser) user);
-            if ((apiToken == null) || (apiToken.getExpireTime().before(new Date()))) {
+            if (apiToken == null) {
+                //No un-expired token
                 apiToken = authService.generateApiTokenForUser(( AuthenticatedUser) user);
                 toolHandler.setApiToken(apiToken);
                 toolHandler.getToolUrlWithQueryParams();
diff --git a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabAlternate.java b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabAlternate.java
index 5d5d9597746..9542cfe3f71 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabAlternate.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabAlternate.java
@@ -7,15 +7,15 @@
 
 import java.io.Serializable;
 import java.util.Objects;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java
index 00c264afeb7..19eccb43613 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java
@@ -8,24 +8,27 @@
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.persistence.logging.LogLevel;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.Locale;
 import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.MissingResourceException;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 /**
  *
@@ -35,6 +38,8 @@
 @Table(indexes = {@Index(columnList="datasetfieldtype_id"), @Index(columnList="displayorder")})
 public class ControlledVocabularyValue implements Serializable  {
     
+    private static final Logger logger = Logger.getLogger(ControlledVocabularyValue.class.getCanonicalName());
+    
     public static final Comparator<ControlledVocabularyValue> DisplayOrder = new Comparator<ControlledVocabularyValue>() {
         @Override
         public int compare(ControlledVocabularyValue o1, ControlledVocabularyValue o2) {
@@ -100,7 +105,7 @@ public void setDatasetFieldType(DatasetFieldType datasetFieldType) {
         this.datasetFieldType = datasetFieldType;
     }
   
-    @OneToMany(mappedBy = "controlledVocabularyValue", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
+    @OneToMany(mappedBy = "controlledVocabularyValue", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST}, orphanRemoval=true)
     private Collection<ControlledVocabAlternate> controlledVocabAlternates = new ArrayList<>();
 
     public Collection<ControlledVocabAlternate> getControlledVocabAlternates() {
@@ -111,14 +116,46 @@ public void setControlledVocabAlternates(Collection<ControlledVocabAlternate> co
         this.controlledVocabAlternates = controlledVocabAlternates;
     }
 
-    public String getLocaleStrValue()
-    {
-        String key = strValue.toLowerCase().replace(" " , "_");
+    public String getLocaleStrValue() {
+        return getLocaleStrValue(null);
+    }
+    
+    public String getLocaleStrValue(String language) {
+        
+        if(language !=null && language.isBlank()) {
+            //null picks up current UI lang
+            language=null;
+        }
+        //Sword input uses a special controlled vacab value ("N/A" that does not have a datasetFieldType / is not part of any metadata block, so handle it specially
+        if(strValue.equals(DatasetField.NA_VALUE) && this.datasetFieldType == null) {
+            return strValue;
+        }
+        if(this.datasetFieldType == null) {
+            logger.warning("Null datasetFieldType for value: " + strValue);
+        }
+        return getLocaleStrValue(strValue, this.datasetFieldType.getName(),getDatasetFieldType().getMetadataBlock().getName(),language == null ? null : new Locale(language), true);
+    }
+    
+    public static String getLocaleStrValue(String strValue, String fieldTypeName, String metadataBlockName,
+            Locale locale, boolean sendDefault) {
+        String key = strValue.toLowerCase().replace(" ", "_");
         key = StringUtils.stripAccents(key);
         try {
-            return BundleUtil.getStringFromPropertyFile("controlledvocabulary." + this.datasetFieldType.getName() + "." + key, getDatasetFieldType().getMetadataBlock().getName());
-        } catch (MissingResourceException e) {
-            return strValue;
+            String val = BundleUtil.getStringFromPropertyFile("controlledvocabulary." + fieldTypeName + "." + key,
+                    metadataBlockName, locale);
+            if (!val.isBlank()) {
+                logger.fine("Found : " + val);
+                return val;
+            } else {
+                return sendDefault ? strValue : null;
+            }
+        } catch (MissingResourceException | NullPointerException e) {
+            //If we're using the default local and can return the default value, this shouldn't be a warning
+            if (locale != null && !locale.equals(Locale.getDefault()) && sendDefault) {
+                logger.log(((locale != null && !locale.equals(Locale.getDefault()) && ! sendDefault) ? Level.WARNING:Level.FINE),"Error finding " + "controlledvocabulary." + fieldTypeName + "." + key + " in "
+                        + ((locale == null) ? "defaultLang" : locale.getLanguage()) + " : " + e.getLocalizedMessage());
+            }
+            return sendDefault ? strValue : null;
         }
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValueConverter.java b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValueConverter.java
index 6be05d1024c..eadc13721b3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValueConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValueConverter.java
@@ -5,12 +5,13 @@
  */
 package edu.harvard.iq.dataverse;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.inject.spi.CDI;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
 
 /**
  *
@@ -19,8 +20,8 @@
 @FacesConverter("controlledVocabularyValueConverter")
 public class ControlledVocabularyValueConverter implements Converter {
 
-    @EJB
-    DatasetFieldServiceBean datasetFieldService;
+    //@EJB
+    DatasetFieldServiceBean datasetFieldService = CDI.current().select(DatasetFieldServiceBean.class).get();
 
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
         if (submittedValue == null || submittedValue.equals("")) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValueServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValueServiceBean.java
index 0e9501414d0..4255c3b2dbc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValueServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValueServiceBean.java
@@ -6,11 +6,11 @@
 package edu.harvard.iq.dataverse;
 
 import java.util.List;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/CurationStatus.java b/src/main/java/edu/harvard/iq/dataverse/CurationStatus.java
new file mode 100644
index 00000000000..b5a113a03d6
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/CurationStatus.java
@@ -0,0 +1,91 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import jakarta.persistence.*;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "curationstatus", indexes = {
+        @Index(name = "index_curationstatus_datasetversion", columnList = "datasetversion_id")
+    })
+public class CurationStatus implements Serializable {
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = true)
+    private String label;
+
+    @ManyToOne
+    @JoinColumn(name = "datasetversion_id", nullable = false)
+    private DatasetVersion datasetVersion;
+
+    @ManyToOne
+    @JoinColumn(name = "authenticateduser_id", nullable = true)
+    private AuthenticatedUser authenticatedUser;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(nullable = true)
+    private Date createTime;
+
+    // Constructors, getters, and setters
+
+    public CurationStatus() {
+    }
+
+    public CurationStatus(String label, DatasetVersion datasetVersion, AuthenticatedUser authenticatedUser) {
+        this.label = label;
+        this.datasetVersion = datasetVersion;
+        this.authenticatedUser = authenticatedUser;
+        this.createTime = new Date();
+    }
+
+    // Getters and setters for all fields
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public DatasetVersion getDatasetVersion() {
+        return datasetVersion;
+    }
+
+    public void setDatasetVersion(DatasetVersion datasetVersion) {
+        this.datasetVersion = datasetVersion;
+    }
+
+    public AuthenticatedUser getAuthenticatedUser() {
+        return authenticatedUser;
+    }
+
+    public void setAuthenticatedUser(AuthenticatedUser authenticatedUser) {
+        this.authenticatedUser = authenticatedUser;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    
+    public boolean isNoStatus() {
+        return label == null || label.trim().isEmpty();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/CustomQuestion.java b/src/main/java/edu/harvard/iq/dataverse/CustomQuestion.java
index 64723fff79a..d880da5b4a8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/CustomQuestion.java
+++ b/src/main/java/edu/harvard/iq/dataverse/CustomQuestion.java
@@ -1,8 +1,8 @@
 package edu.harvard.iq.dataverse;
 import java.io.Serializable;
 import java.util.List;
-import javax.persistence.*;
-import org.hibernate.validator.constraints.NotBlank;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  *
@@ -41,7 +41,7 @@ public void setId(Long id) {
     private String questionType;
     
     @NotBlank(message = "{custom.questiontext}")
-    @Column( nullable = false )
+    @Column( nullable = false, columnDefinition = "TEXT")
     private String questionString;
     private boolean required;
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/CustomQuestionResponse.java b/src/main/java/edu/harvard/iq/dataverse/CustomQuestionResponse.java
index 68129e37502..f19ee3c3fc7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/CustomQuestionResponse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/CustomQuestionResponse.java
@@ -7,8 +7,8 @@
 
 import java.io.Serializable;
 import java.util.List;
-import javax.faces.model.SelectItem;
-import javax.persistence.*;
+import jakarta.faces.model.SelectItem;
+import jakarta.persistence.*;
 
 /**
  *
@@ -103,17 +103,6 @@ public boolean equals(Object object) {
     public String toString() {
         return "edu.harvard.iq.dvn.core.vdc.CustomQuestionResponse[ id=" + id + " ]";
     }
-    
-    @Transient private String validationMessage;
-
-    public String getValidationMessage() {
-        return validationMessage;
-    }
 
-    public void setValidationMessage(String validationMessage) {
-        this.validationMessage = validationMessage;
-    }
-    
-    
 }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/CustomQuestionValue.java b/src/main/java/edu/harvard/iq/dataverse/CustomQuestionValue.java
index a5329c8b96d..f3a6b83b53f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/CustomQuestionValue.java
+++ b/src/main/java/edu/harvard/iq/dataverse/CustomQuestionValue.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse;
 
 import java.io.Serializable;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import org.hibernate.validator.constraints.NotBlank;
 
 /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/CustomizationFilesServlet.java b/src/main/java/edu/harvard/iq/dataverse/CustomizationFilesServlet.java
index 713d365ba0f..cd0534f4c77 100644
--- a/src/main/java/edu/harvard/iq/dataverse/CustomizationFilesServlet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/CustomizationFilesServlet.java
@@ -14,14 +14,17 @@
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.logging.Logger;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import org.apache.commons.io.IOUtils;
+import org.apache.tika.Tika;
 
 /**
  *
@@ -29,7 +32,8 @@
  */
 @WebServlet(name = "CustomizationFilesServlet", urlPatterns = {"/CustomizationFilesServlet"})
 public class CustomizationFilesServlet extends HttpServlet {
-    
+    private static final Logger logger = Logger.getLogger(CustomizationFilesServlet.class.getCanonicalName());
+
     @EJB
     SettingsServiceBean settingsService;
             
@@ -45,7 +49,7 @@ public class CustomizationFilesServlet extends HttpServlet {
      */
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");               
+        response.setContentType(request.getContentType());
 
         String customFileType = request.getParameter("customFileType");
         String filePath = getFilePath(customFileType);
@@ -56,6 +60,13 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
         try {
             File fileIn = physicalPath.toFile();
             if (fileIn != null) {
+                Tika tika = new Tika();
+                try {
+                    String mimeType = tika.detect(fileIn);
+                    response.setContentType(mimeType);
+                } catch (Exception e) {
+                    logger.info("Error getting MIME Type for " + filePath + " : " + e.getMessage());
+                }
                 inputStream = new FileInputStream(fileIn);
 
                 in = new BufferedReader(new InputStreamReader(inputStream));
diff --git a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterCache.java b/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterCache.java
deleted file mode 100644
index 7ccd4adb78f..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterCache.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-
-import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import org.hibernate.validator.constraints.NotBlank;
-
-/**
- *
- * @author luopc
- */
-@NamedQueries(
-        @NamedQuery( name="DOIDataCiteRegisterCache.findByDoi",
-                     query="SELECT d FROM DOIDataCiteRegisterCache d WHERE d.doi=:doi")
-)
-@Entity
-public class DOIDataCiteRegisterCache implements Serializable{
-
-    private static final long serialVersionUID = 8030143094734315681L;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    
-    @NotBlank
-    @Column(unique=true)
-    private String doi;
-    
-    @NotBlank
-    private String url;
-    
-    @NotBlank
-    private String status;
-    
-    @NotBlank
-    @Lob
-    private String xml;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getDoi() {
-        return doi;
-    }
-
-    public void setDoi(String doi) {
-        this.doi = doi;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getXml() {
-        return xml;
-    }
-
-    public void setXml(String xml) {
-        this.xml = xml;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
deleted file mode 100644
index 1eae797fa32..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
+++ /dev/null
@@ -1,667 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-import edu.harvard.iq.dataverse.AbstractGlobalIdServiceBean.GlobalIdMetadataTemplate;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-
-/**
- *
- * @author luopc
- */
-@Stateless
-public class DOIDataCiteRegisterService {
-
-    private static final Logger logger = Logger.getLogger(DOIDataCiteRegisterService.class.getCanonicalName());
-
-    @PersistenceContext(unitName = "VDCNet-ejbPU")
-    private EntityManager em;
-
-    @EJB
-    DataverseServiceBean dataverseService;
-
-    @EJB
-    DOIDataCiteServiceBean doiDataCiteServiceBean;
-    
-        
-    //A singleton since it, and the httpClient in it can be reused.
-    private DataCiteRESTfullClient client=null;
-    
-    private DataCiteRESTfullClient getClient() throws IOException {
-        if (client == null) {
-            client = new DataCiteRESTfullClient(System.getProperty("doi.baseurlstring"), System.getProperty("doi.username"), System.getProperty("doi.password"));
-        }
-        return client;
-    }
-
-    public String createIdentifierLocal(String identifier, Map<String, String> metadata, DvObject dvObject) {
-
-        String xmlMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
-        String status = metadata.get("_status").trim();
-        String target = metadata.get("_target");
-        String retString = "";
-        DOIDataCiteRegisterCache rc = findByDOI(identifier);
-        if (rc == null) {
-            rc = new DOIDataCiteRegisterCache();
-            rc.setDoi(identifier);
-            rc.setXml(xmlMetadata);
-            rc.setStatus("reserved");
-            rc.setUrl(target);
-            em.persist(rc);
-        } else {
-            rc.setDoi(identifier);
-            rc.setXml(xmlMetadata);
-            rc.setStatus("reserved");
-            rc.setUrl(target);
-        }
-        retString = "success to reserved " + identifier;
-
-        return retString;
-    }
-
-    public String registerIdentifier(String identifier, Map<String, String> metadata, DvObject dvObject) throws IOException {
-        String retString = "";
-        String xmlMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
-        DOIDataCiteRegisterCache rc = findByDOI(identifier);
-        String target = metadata.get("_target");
-        if (rc != null) {
-            rc.setDoi(identifier);
-            rc.setXml(xmlMetadata);
-            rc.setStatus("public");
-            if (target == null || target.trim().length() == 0) {
-                target = rc.getUrl();
-            } else {
-                rc.setUrl(target);
-            }
-            try {
-                DataCiteRESTfullClient client = getClient();
-                retString = client.postMetadata(xmlMetadata);
-                client.postUrl(identifier.substring(identifier.indexOf(":") + 1), target);
-            } catch (UnsupportedEncodingException ex) {
-                Logger.getLogger(DOIDataCiteRegisterService.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        } else {
-            try {
-                DataCiteRESTfullClient client = getClient();
-                retString = client.postMetadata(xmlMetadata);
-                client.postUrl(identifier.substring(identifier.indexOf(":") + 1), target);
-            } catch (UnsupportedEncodingException ex) {
-                Logger.getLogger(DOIDataCiteRegisterService.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-        return retString;
-    }
-
-    public String deactivateIdentifier(String identifier, Map<String, String> metadata, DvObject dvObject) {
-        String retString = "";
-
-            String metadataString = getMetadataForDeactivateIdentifier(identifier, metadata, dvObject);
-            retString = client.postMetadata(metadataString);
-            retString = client.inactiveDataset(identifier.substring(identifier.indexOf(":") + 1));
-
-        return retString;
-    }
-    
-        public static String getMetadataFromDvObject(String identifier, Map<String, String> metadata, DvObject dvObject) {
-
-        Dataset dataset = null;
-
-        if (dvObject instanceof Dataset) {
-            dataset = (Dataset) dvObject;
-        } else {
-            dataset = (Dataset) dvObject.getOwner();
-        }
-
-        DataCiteMetadataTemplate metadataTemplate = new DataCiteMetadataTemplate();
-        metadataTemplate.setIdentifier(identifier.substring(identifier.indexOf(':') + 1));
-        metadataTemplate.setCreators(Util.getListFromStr(metadata.get("datacite.creator")));
-        metadataTemplate.setAuthors(dataset.getLatestVersion().getDatasetAuthors());
-        if (dvObject.isInstanceofDataset()) {
-            String description = dataset.getLatestVersion().getDescriptionPlainText();
-            if (description.isEmpty() || description.equals(DatasetField.NA_VALUE)) {
-                description = AbstractGlobalIdServiceBean.UNAVAILABLE;
-            }
-            metadataTemplate.setDescription(description);
-        }
-        if (dvObject.isInstanceofDataFile()) {
-            DataFile df = (DataFile) dvObject;
-            //Note: File metadata is not escaped like dataset metadata is, so adding an xml escape here.
-            //This could/should be removed if the datafile methods add escaping
-            String fileDescription = StringEscapeUtils.escapeXml(df.getDescription());
-            metadataTemplate.setDescription(fileDescription == null ? AbstractGlobalIdServiceBean.UNAVAILABLE : fileDescription);
-            String datasetPid = df.getOwner().getGlobalId().asString();
-            metadataTemplate.setDatasetIdentifier(datasetPid);
-        } else {
-            metadataTemplate.setDatasetIdentifier("");
-        }
-
-        metadataTemplate.setContacts(dataset.getLatestVersion().getDatasetContacts());
-        metadataTemplate.setProducers(dataset.getLatestVersion().getDatasetProducers());
-        String title = dvObject.getCurrentName();
-        if(dvObject.isInstanceofDataFile()) {
-            //Note file title is not currently escaped the way the dataset title is, so adding it here.
-            title = StringEscapeUtils.escapeXml(title);
-        }
-        
-        if (title.isEmpty() || title.equals(DatasetField.NA_VALUE)) {
-            title = AbstractGlobalIdServiceBean.UNAVAILABLE;
-        }
-        
-        metadataTemplate.setTitle(title);
-        String producerString = dataset.getLatestVersion().getRootDataverseNameforCitation();
-        if (producerString.isEmpty() || producerString.equals(DatasetField.NA_VALUE)) {
-            producerString = AbstractGlobalIdServiceBean.UNAVAILABLE;
-        }
-        metadataTemplate.setPublisher(producerString);
-        metadataTemplate.setPublisherYear(metadata.get("datacite.publicationyear"));
-
-        String xmlMetadata = metadataTemplate.generateXML(dvObject);
-        logger.log(Level.FINE, "XML to send to DataCite: {0}", xmlMetadata);
-        return xmlMetadata;
-    }
-
-    public static String getMetadataForDeactivateIdentifier(String identifier, Map<String, String> metadata, DvObject dvObject) {
-
-        DataCiteMetadataTemplate metadataTemplate = new DataCiteMetadataTemplate();
-        metadataTemplate.setIdentifier(identifier.substring(identifier.indexOf(':') + 1));
-        metadataTemplate.setCreators(Util.getListFromStr(metadata.get("datacite.creator")));
-
-        metadataTemplate.setDescription(AbstractGlobalIdServiceBean.UNAVAILABLE);
-
-        String title =metadata.get("datacite.title");
-        
-        System.out.print("Map metadata title: "+ metadata.get("datacite.title"));
-        
-        metadataTemplate.setAuthors(null);
-        
-        metadataTemplate.setTitle(title);
-        String producerString = AbstractGlobalIdServiceBean.UNAVAILABLE;
-
-        metadataTemplate.setPublisher(producerString);
-        metadataTemplate.setPublisherYear(metadata.get("datacite.publicationyear"));
-
-        String xmlMetadata = metadataTemplate.generateXML(dvObject);
-        logger.log(Level.FINE, "XML to send to DataCite: {0}", xmlMetadata);
-        return xmlMetadata;
-    }
-
-    public String modifyIdentifier(String identifier, HashMap<String, String> metadata, DvObject dvObject) throws IOException {
-
-        String xmlMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
-
-        logger.fine("XML to send to DataCite: " + xmlMetadata);
-
-        String status = metadata.get("_status").trim();
-        String target = metadata.get("_target");
-        String retString = "";
-        if (status.equals("reserved")) {
-            DOIDataCiteRegisterCache rc = findByDOI(identifier);
-            if (rc == null) {
-                rc = new DOIDataCiteRegisterCache();
-                rc.setDoi(identifier);
-                rc.setXml(xmlMetadata);
-                rc.setStatus("reserved");
-                rc.setUrl(target);
-                em.persist(rc);
-            } else {
-                rc.setDoi(identifier);
-                rc.setXml(xmlMetadata);
-                rc.setStatus("reserved");
-                rc.setUrl(target);
-            }
-            retString = "success to reserved " + identifier;
-        } else if (status.equals("public")) {
-            DOIDataCiteRegisterCache rc = findByDOI(identifier);
-            if (rc != null) {
-                rc.setDoi(identifier);
-                rc.setXml(xmlMetadata);
-                rc.setStatus("public");
-                if (target == null || target.trim().length() == 0) {
-                    target = rc.getUrl();
-                } else {
-                    rc.setUrl(target);
-                }
-                try {
-                    DataCiteRESTfullClient client = getClient();
-                    retString = client.postMetadata(xmlMetadata);
-                    client.postUrl(identifier.substring(identifier.indexOf(":") + 1), target);
-
-                } catch (UnsupportedEncodingException ex) {
-                    logger.log(Level.SEVERE, null, ex);
-
-                } catch (RuntimeException rte) {
-                    logger.log(Level.SEVERE, "Error creating DOI at DataCite: {0}", rte.getMessage());
-                    logger.log(Level.SEVERE, "Exception", rte);
-
-                }
-            }
-        } else if (status.equals("unavailable")) {
-            DOIDataCiteRegisterCache rc = findByDOI(identifier);
-            try {
-                DataCiteRESTfullClient client = getClient();
-                if (rc != null) {
-                    rc.setStatus("unavailable");
-                    retString = client.inactiveDataset(identifier.substring(identifier.indexOf(":") + 1));
-                }
-            } catch (IOException io) {
-
-            }
-        }
-        return retString;
-    }
-
-    public boolean testDOIExists(String identifier) {
-        boolean doiExists;
-        try {
-            DataCiteRESTfullClient client = getClient();
-            doiExists = client.testDOIExists(identifier.substring(identifier.indexOf(":") + 1));
-        } catch (Exception e) {
-            logger.log(Level.INFO, identifier, e);
-            return false;
-        }
-        return doiExists;
-    }
-
-    public HashMap<String, String> getMetadata(String identifier) throws IOException {
-        HashMap<String, String> metadata = new HashMap<>();
-        try {
-            DataCiteRESTfullClient client = getClient();
-            String xmlMetadata = client.getMetadata(identifier.substring(identifier.indexOf(":") + 1));
-            DOIDataCiteServiceBean.GlobalIdMetadataTemplate template = doiDataCiteServiceBean.new GlobalIdMetadataTemplate(xmlMetadata);
-            metadata.put("datacite.creator", Util.getStrFromList(template.getCreators()));
-            metadata.put("datacite.title", template.getTitle());
-            metadata.put("datacite.publisher", template.getPublisher());
-            metadata.put("datacite.publicationyear", template.getPublisherYear());
-            DOIDataCiteRegisterCache rc = findByDOI(identifier);
-            if (rc != null) {
-                metadata.put("_status", rc.getStatus());
-            } else {
-                metadata.put("_status", "public");
-            }
-        } catch (RuntimeException e) {
-            logger.log(Level.INFO, identifier, e);
-        }
-        return metadata;
-    }
-
-    public DOIDataCiteRegisterCache findByDOI(String doi) {
-        TypedQuery<DOIDataCiteRegisterCache> query = em.createNamedQuery("DOIDataCiteRegisterCache.findByDoi",
-                DOIDataCiteRegisterCache.class);
-        query.setParameter("doi", doi);
-        List<DOIDataCiteRegisterCache> rc = query.getResultList();
-        if (rc.size() == 1) {
-            return rc.get(0);
-        }
-        return null;
-    }
-
-    public void deleteIdentifier(String identifier) {
-        DOIDataCiteRegisterCache rc = findByDOI(identifier);
-        if (rc != null) {
-            em.remove(rc);
-        }
-    }
-
-}
-
-class DataCiteMetadataTemplate {
-
-    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.DataCiteMetadataTemplate");
-    private static String template;
-
-    static {
-        try (InputStream in = DataCiteMetadataTemplate.class.getResourceAsStream("datacite_metadata_template.xml")) {
-            template = Util.readAndClose(in, "utf-8");
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "datacite metadata template load error");
-            logger.log(Level.SEVERE, "String " + e.toString());
-            logger.log(Level.SEVERE, "localized message " + e.getLocalizedMessage());
-            logger.log(Level.SEVERE, "cause " + e.getCause());
-            logger.log(Level.SEVERE, "message " + e.getMessage());
-        }
-    }
-
-    private String xmlMetadata;
-    private String identifier;
-    private String datasetIdentifier;
-    private List<String> datafileIdentifiers;
-    private List<String> creators;
-    private String title;
-    private String publisher;
-    private String publisherYear;
-    private List<DatasetAuthor> authors;
-    private String description;
-    private List<String[]> contacts;
-    private List<String[]> producers;
-
-    public List<String[]> getProducers() {
-        return producers;
-    }
-
-    public void setProducers(List<String[]> producers) {
-        this.producers = producers;
-    }
-
-    public List<String[]> getContacts() {
-        return contacts;
-    }
-
-    public void setContacts(List<String[]> contacts) {
-        this.contacts = contacts;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public List<DatasetAuthor> getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(List<DatasetAuthor> authors) {
-        this.authors = authors;
-    }
-
-    public DataCiteMetadataTemplate() {
-    }
-
-    public List<String> getDatafileIdentifiers() {
-        return datafileIdentifiers;
-    }
-
-    public void setDatafileIdentifiers(List<String> datafileIdentifiers) {
-        this.datafileIdentifiers = datafileIdentifiers;
-    }
-
-    public DataCiteMetadataTemplate(String xmlMetaData) {
-        this.xmlMetadata = xmlMetaData;
-        Document doc = Jsoup.parseBodyFragment(xmlMetaData);
-        Elements identifierElements = doc.select("identifier");
-        if (identifierElements.size() > 0) {
-            identifier = identifierElements.get(0).html();
-        }
-        Elements creatorElements = doc.select("creatorName");
-        creators = new ArrayList<>();
-        for (Element creatorElement : creatorElements) {
-            creators.add(creatorElement.html());
-        }
-        Elements titleElements = doc.select("title");
-        if (titleElements.size() > 0) {
-            title = titleElements.get(0).html();
-        }
-        Elements publisherElements = doc.select("publisher");
-        if (publisherElements.size() > 0) {
-            publisher = publisherElements.get(0).html();
-        }
-        Elements publisherYearElements = doc.select("publicationYear");
-        if (publisherYearElements.size() > 0) {
-            publisherYear = publisherYearElements.get(0).html();
-        }
-    }
-
-    public String generateXML(DvObject dvObject) {
-        // Can't use "UNKNOWN" here because DataCite will respond with "[facet 'pattern'] the value 'unknown' is not accepted by the pattern '[\d]{4}'"
-        String publisherYearFinal = "9999";
-        // FIXME: Investigate why this.publisherYear is sometimes null now that pull request #4606 has been merged.
-        if (this.publisherYear != null) {
-            // Added to prevent a NullPointerException when trying to destroy datasets when using DataCite rather than EZID.
-            publisherYearFinal = this.publisherYear;
-        }
-        xmlMetadata = template.replace("${identifier}", this.identifier.trim())
-                .replace("${title}", this.title)
-                .replace("${publisher}", this.publisher)
-                .replace("${publisherYear}", publisherYearFinal)
-                .replace("${description}", this.description);
-        
-        StringBuilder creatorsElement = new StringBuilder();
-        if (authors!= null && !authors.isEmpty()) {
-            for (DatasetAuthor author : authors) {
-                creatorsElement.append("<creator><creatorName>");
-                creatorsElement.append(author.getName().getDisplayValue());
-                creatorsElement.append("</creatorName>");
-
-                if (author.getIdType() != null && author.getIdValue() != null && !author.getIdType().isEmpty() && !author.getIdValue().isEmpty() && author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) {
-
-                    if (author.getIdType().equals("ORCID")) {
-                        creatorsElement.append("<nameIdentifier schemeURI=\"https://orcid.org/\" nameIdentifierScheme=\"ORCID\">" + author.getIdValue() + "</nameIdentifier>");
-                    }
-                    if (author.getIdType().equals("ISNI")) {
-                        creatorsElement.append("<nameIdentifier schemeURI=\"http://isni.org/isni/\" nameIdentifierScheme=\"ISNI\">" + author.getIdValue() + "</nameIdentifier>");
-                    }
-                    if (author.getIdType().equals("LCNA")) {
-                        creatorsElement.append("<nameIdentifier schemeURI=\"http://id.loc.gov/authorities/names/\" nameIdentifierScheme=\"LCNA\">" + author.getIdValue() + "</nameIdentifier>");
-                    }
-                }
-                if (author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) {
-                    creatorsElement.append("<affiliation>" + author.getAffiliation().getDisplayValue() + "</affiliation>");
-                }
-                creatorsElement.append("</creator>");
-            }
-
-        } else {
-            creatorsElement.append("<creator><creatorName>").append(AbstractGlobalIdServiceBean.UNAVAILABLE).append("</creatorName></creator>");
-        }
-
-        xmlMetadata = xmlMetadata.replace("${creators}", creatorsElement.toString());
-
-        StringBuilder contributorsElement = new StringBuilder();
-        if (this.getContacts() != null) {
-            for (String[] contact : this.getContacts()) {
-                if (!contact[0].isEmpty()) {
-                    contributorsElement.append("<contributor contributorType=\"ContactPerson\"><contributorName>" + contact[0] + "</contributorName>");
-                    if (!contact[1].isEmpty()) {
-                        contributorsElement.append("<affiliation>" + contact[1] + "</affiliation>");
-                    }
-                    contributorsElement.append("</contributor>");
-                }
-            }
-        }
-
-        if (this.getProducers() != null) {
-            for (String[] producer : this.getProducers()) {
-                contributorsElement.append("<contributor contributorType=\"Producer\"><contributorName>" + producer[0] + "</contributorName>");
-                if (!producer[1].isEmpty()) {
-                    contributorsElement.append("<affiliation>" + producer[1] + "</affiliation>");
-                }
-                contributorsElement.append("</contributor>");
-            }
-        }
-
-        String relIdentifiers = generateRelatedIdentifiers(dvObject);
-
-        xmlMetadata = xmlMetadata.replace("${relatedIdentifiers}", relIdentifiers);
-
-        xmlMetadata = xmlMetadata.replace("{$contributors}", contributorsElement.toString());
-        return xmlMetadata;
-    }
-
-    private String generateRelatedIdentifiers(DvObject dvObject) {
-
-        StringBuilder sb = new StringBuilder();
-        if (dvObject.isInstanceofDataset()) {
-            Dataset dataset = (Dataset) dvObject;
-            if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) {
-
-                datafileIdentifiers = new ArrayList<>();
-                for (DataFile dataFile : dataset.getFiles()) {
-                    if (!dataFile.getGlobalId().asString().isEmpty()) {
-                        if (sb.toString().isEmpty()) {
-                            sb.append("<relatedIdentifiers>");
-                        }
-                        sb.append("<relatedIdentifier relatedIdentifierType=\"DOI\" relationType=\"HasPart\">" + dataFile.getGlobalId() + "</relatedIdentifier>");
-                    }
-                }
-
-                if (!sb.toString().isEmpty()) {
-                    sb.append("</relatedIdentifiers>");
-                }
-            }
-        } else if (dvObject.isInstanceofDataFile()) {
-            DataFile df = (DataFile) dvObject;
-            sb.append("<relatedIdentifiers>");
-            sb.append("<relatedIdentifier relatedIdentifierType=\"DOI\" relationType=\"IsPartOf\""
-                    + ">" + df.getOwner().getGlobalId() + "</relatedIdentifier>");
-            sb.append("</relatedIdentifiers>");
-        }
-        return sb.toString();
-    }
-
-    public void generateFileIdentifiers(DvObject dvObject) {
-
-        if (dvObject.isInstanceofDataset()) {
-            Dataset dataset = (Dataset) dvObject;
-
-            if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) {
-
-                datafileIdentifiers = new ArrayList<>();
-                for (DataFile dataFile : dataset.getFiles()) {
-                    datafileIdentifiers.add(dataFile.getIdentifier());
-                    int x = xmlMetadata.indexOf("</relatedIdentifiers>") - 1;
-                    xmlMetadata = xmlMetadata.replace("{relatedIdentifier}", dataFile.getIdentifier());
-                    xmlMetadata = xmlMetadata.substring(0, x) + "<relatedIdentifier relatedIdentifierType=\"hasPart\" "
-                            + "relationType=\"doi\">${relatedIdentifier}</relatedIdentifier>" + template.substring(x, template.length() - 1);
-
-                }
-
-            } else {
-                xmlMetadata = xmlMetadata.replace("<relatedIdentifier relatedIdentifierType=\"hasPart\" relationType=\"doi\">${relatedIdentifier}</relatedIdentifier>", "");
-            }
-        }
-    }
-
-    public static String getTemplate() {
-        return template;
-    }
-
-    public static void setTemplate(String template) {
-        DataCiteMetadataTemplate.template = template;
-    }
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-    }
-
-    public void setDatasetIdentifier(String datasetIdentifier) {
-        this.datasetIdentifier = datasetIdentifier;
-    }
-
-    public List<String> getCreators() {
-        return creators;
-    }
-
-    public void setCreators(List<String> creators) {
-        this.creators = creators;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getPublisher() {
-        return publisher;
-    }
-
-    public void setPublisher(String publisher) {
-        this.publisher = publisher;
-    }
-
-    public String getPublisherYear() {
-        return publisherYear;
-    }
-
-    public void setPublisherYear(String publisherYear) {
-        this.publisherYear = publisherYear;
-    }
-}
-
-class Util {
-
-    public static void close(InputStream in) {
-        if (in != null) {
-            try {
-                in.close();
-            } catch (IOException e) {
-                throw new RuntimeException("Fail to close InputStream");
-            }
-        }
-    }
-
-    public static String readAndClose(InputStream inStream, String encoding) {
-        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-        byte[] buf = new byte[128];
-        String data;
-        try {
-            int cnt;
-            while ((cnt = inStream.read(buf)) >= 0) {
-                outStream.write(buf, 0, cnt);
-            }
-            data = outStream.toString(encoding);
-        } catch (IOException ioe) {
-            throw new RuntimeException("IOException");
-        } finally {
-            close(inStream);
-        }
-        return data;
-    }
-
-    public static List<String> getListFromStr(String str) {
-        return Arrays.asList(str.split("; "));
-//        List<String> authors = new ArrayList();
-//        int preIdx = 0;
-//        for(int i=0;i<str.length();i++){
-//            if(str.charAt(i)==';'){
-//                authors.add(str.substring(preIdx,i).trim());
-//                preIdx = i+1;
-//            }
-//        }
-//        return authors;
-    }
-
-    public static String getStrFromList(List<String> authors) {
-        StringBuilder str = new StringBuilder();
-        for (String author : authors) {
-            if (str.length() > 0) {
-                str.append("; ");
-            }
-            str.append(author);
-        }
-        return str.toString();
-    }
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteServiceBean.java
deleted file mode 100644
index 9a3fcfad134..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteServiceBean.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package edu.harvard.iq.dataverse;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-
-/**
- *
- * @author luopc
- */
-@Stateless
-public class DOIDataCiteServiceBean extends AbstractGlobalIdServiceBean {
-
-    private static final Logger logger = Logger.getLogger(DOIDataCiteServiceBean.class.getCanonicalName());
-    
-    private static final String PUBLIC = "public";
-    private static final String FINDABLE = "findable";
-    private static final String RESERVED = "reserved";
-    private static final String DRAFT = "draft";
-
-    @EJB
-    DOIDataCiteRegisterService doiDataCiteRegisterService;
-
-    public DOIDataCiteServiceBean() {
-    }
-
-    @Override
-    public boolean registerWhenPublished() {
-        return true;
-    }
-
-    @Override
-    public boolean alreadyExists(DvObject dvObject) {
-        if(dvObject==null) {
-            logger.severe("Null DvObject sent to alreadyExists().");
-            return false;
-        }
-        return alreadyExists(dvObject.getGlobalId());
-    }
-
-    @Override
-    public boolean alreadyExists(GlobalId pid) {
-        logger.log(Level.FINE,"alreadyExists");
-        if(pid==null || pid.asString().isEmpty()) {
-            logger.fine("No identifier sent.");
-            return false;
-        }
-        boolean alreadyExists;
-        String identifier = pid.asString();
-        try{
-            alreadyExists = doiDataCiteRegisterService.testDOIExists(identifier); 
-        } catch (Exception e){
-            logger.log(Level.WARNING, "alreadyExists failed");
-            return false;
-        }
-        return  alreadyExists;
-    }
-    
-
-    @Override
-    public String createIdentifier(DvObject dvObject) throws Exception {
-        logger.log(Level.FINE,"createIdentifier");
-        if(dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty() ){
-            dvObject = generateIdentifier(dvObject);
-        }
-        String identifier = getIdentifier(dvObject);
-        Map<String, String> metadata = getMetadataForCreateIndicator(dvObject);
-        metadata.put("_status", "reserved");
-        try {
-            String retString = doiDataCiteRegisterService.createIdentifierLocal(identifier, metadata, dvObject);
-            logger.log(Level.FINE, "create DOI identifier retString : " + retString);
-            return retString;
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "Identifier not created: create failed", e);
-            throw e;
-        }
-    }
-
-    @Override
-    public HashMap getIdentifierMetadata(DvObject dvObject) {
-        logger.log(Level.FINE,"getIdentifierMetadata");
-        String identifier = getIdentifier(dvObject);
-        HashMap<String, String> metadata = new HashMap<>();
-        try {
-            metadata = doiDataCiteRegisterService.getMetadata(identifier);
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "getIdentifierMetadata failed", e);
-        }
-        return metadata;
-    }
-    
-
-    /**
-     * Looks up the metadata for a Global Identifier
-     * @param protocol the identifier system, e.g. "doi"
-     * @param authority the namespace that the authority manages in the identifier system
-     * @param identifier the local identifier part
-     * @return a Map of metadata. It is empty when the lookup failed, e.g. when
-     * the identifier does not exist.
-     */
-    @Override
-    public HashMap<String, String> lookupMetadataFromIdentifier(String protocol, String authority, String identifier) {
-        logger.log(Level.FINE,"lookupMetadataFromIdentifier");
-        String identifierOut = getIdentifierForLookup(protocol, authority, identifier);
-        HashMap<String, String> metadata = new HashMap<>();
-        try {
-            metadata = doiDataCiteRegisterService.getMetadata(identifierOut);
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "None existing so we can use this identifier");
-            logger.log(Level.WARNING, "identifier: {0}", identifierOut);
-        }
-        return metadata;
-    }
-
-
-    /**
-     * Modifies the DOI metadata for a Dataset
-     * @param dvObject the dvObject whose metadata needs to be modified
-     * @return the Dataset identifier, or null if the modification failed
-     * @throws java.lang.Exception
-     */
-    @Override
-    public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception {
-        logger.log(Level.FINE,"modifyIdentifier");
-        String identifier = getIdentifier(dvObject);
-        try {
-           HashMap<String, String> metadata = doiDataCiteRegisterService.getMetadata(identifier);
-            doiDataCiteRegisterService.modifyIdentifier(identifier, metadata, dvObject);
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "modifyMetadata failed", e);
-            throw e;
-        }
-        return identifier;
-    }
-    
-    public void deleteRecordFromCache(Dataset datasetIn){
-        logger.log(Level.FINE,"deleteRecordFromCache");
-        String identifier = getIdentifier(datasetIn);
-        HashMap doiMetadata = new HashMap();
-        try {
-            doiMetadata = doiDataCiteRegisterService.getMetadata(identifier);
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "get matadata failed cannot delete");
-            logger.log(Level.WARNING, "String {0}", e.toString());
-            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
-            logger.log(Level.WARNING, "cause", e.getCause());
-            logger.log(Level.WARNING, "message {0}", e.getMessage());
-        }
-
-        String idStatus = (String) doiMetadata.get("_status");
-
-        if (idStatus == null || idStatus.equals("reserved")) {
-            logger.log(Level.WARNING, "Delete status is reserved..");
-            try {
-                doiDataCiteRegisterService.deleteIdentifier(identifier);
-            } catch (Exception e) {
-                logger.log(Level.WARNING, "delete failed");
-                logger.log(Level.WARNING, "String {0}", e.toString());
-                logger.log(Level.WARNING, "localized message {0}",  e.getLocalizedMessage());
-                logger.log(Level.WARNING, "cause", e.getCause());
-                logger.log(Level.WARNING, "message {0}", e.getMessage());
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    @Override
-    public void deleteIdentifier(DvObject dvObject) throws Exception {
-        logger.log(Level.FINE,"deleteIdentifier");
-        String identifier = getIdentifier(dvObject);
-        Map<String, String> doiMetadata = new HashMap<>();
-        try {
-            doiMetadata = doiDataCiteRegisterService.getMetadata(identifier);
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "deleteIdentifier: get matadata failed. " + e.getMessage(), e);
-        }
-
-        String idStatus = doiMetadata.get("_status");
-        if ( idStatus != null ) {
-            switch ( idStatus ) {
-                case RESERVED:
-                case DRAFT:    
-                    logger.log(Level.INFO, "Delete status is reserved..");
-                    try {
-                        doiDataCiteRegisterService.deleteIdentifier(identifier);
-                    } catch (Exception e) {
-                        logger.log(Level.WARNING, "delete failed: " + e.getMessage(), e);
-                    }
-                    break;
-                       
-                case PUBLIC:
-                case FINDABLE:
-                    //if public then it has been released set to unavailable and reset target to n2t url
-                    Map<String, String> metadata = addDOIMetadataForDestroyedDataset(dvObject);
-                    metadata.put("_status", "registered");
-                    metadata.put("_target", getTargetUrl(dvObject));                   
-                    doiDataCiteRegisterService.deactivateIdentifier(identifier, metadata, dvObject);
-                    break;
-            }
-        }
-    }
-
-    private boolean updateIdentifierStatus(DvObject dvObject, String statusIn) {
-        logger.log(Level.FINE,"updateIdentifierStatus");
-        String identifier = getIdentifier(dvObject);
-        Map<String, String> metadata = getUpdateMetadata(dvObject);
-        metadata.put("_status", statusIn);
-        metadata.put("_target", getTargetUrl(dvObject));
-        try {
-            doiDataCiteRegisterService.registerIdentifier(identifier, metadata, dvObject);
-            return true;
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "modifyMetadata failed: " + e.getMessage(), e);
-            return false;
-        }
-    }
-
-    @Override
-    public boolean publicizeIdentifier(DvObject dvObject) {
-        logger.log(Level.FINE,"updateIdentifierStatus");
-        if(dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty() ){
-            dvObject = generateIdentifier(dvObject);
-        }
-        String identifier = getIdentifier(dvObject);
-        Map<String, String> metadata = getUpdateMetadata(dvObject);
-        metadata.put("_status", PUBLIC);
-        metadata.put("datacite.publicationyear", generateYear(dvObject));
-        metadata.put("_target", getTargetUrl(dvObject));
-        try {
-            doiDataCiteRegisterService.registerIdentifier(identifier, metadata, dvObject);
-            return true;
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "modifyMetadata failed: " + e.getMessage(), e);
-            return false;
-        }
-    }
-
-    
-    @Override
-    public List<String> getProviderInformation(){
-        ArrayList <String> providerInfo = new ArrayList<>();
-        String providerName = "DataCite";
-        String providerLink = "http://status.datacite.org";
-        providerInfo.add(providerName);
-        providerInfo.add(providerLink);
-        return providerInfo;
-    }
-
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/DOIEZIdServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DOIEZIdServiceBean.java
deleted file mode 100644
index d21caf32411..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/DOIEZIdServiceBean.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package edu.harvard.iq.dataverse;
-
-import edu.ucsb.nceas.ezid.EZIDException;
-import edu.ucsb.nceas.ezid.EZIDService;
-import edu.ucsb.nceas.ezid.EZIDServiceRequest;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.Stateless;
-
-/**
- *
- * @author skraffmiller
- */
-@Stateless
-public class DOIEZIdServiceBean extends AbstractGlobalIdServiceBean {
-
-    EZIDService ezidService;
-    EZIDServiceRequest ezidServiceRequest;
-    String baseURLString = "https://ezid.cdlib.org";
-    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dvn.core.index.DOIEZIdServiceBean");
-
-    // get username and password from system properties
-    private String USERNAME = "";
-    private String PASSWORD = "";
-
-    public DOIEZIdServiceBean() {
-        logger.log(Level.FINE,"Constructor");
-        baseURLString = System.getProperty("doi.baseurlstring");
-        ezidService = new EZIDService(baseURLString);
-        USERNAME = System.getProperty("doi.username");
-        PASSWORD = System.getProperty("doi.password");
-        logger.log(Level.FINE, "Using baseURLString {0}", baseURLString);
-        try {
-            ezidService.login(USERNAME, PASSWORD);
-        } catch (EZIDException e) {
-            logger.log(Level.WARNING, "login failed ");
-            logger.log(Level.WARNING, "Exception String: {0}", e.toString());
-            logger.log(Level.WARNING, "localized message: {0}", e.getLocalizedMessage());
-            logger.log(Level.WARNING, "cause: ", e.getCause());
-            logger.log(Level.WARNING, "message {0}", e.getMessage());
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Other Error on ezidService.login(USERNAME, PASSWORD) - not EZIDException ", e.getMessage());
-        }
-    }
-
-    @Override
-    public boolean registerWhenPublished() {
-        return false;
-    }
-
-    @Override
-    public boolean alreadyExists(DvObject dvObject) throws Exception {
-        if(dvObject==null) {
-            logger.severe("Null DvObject sent to alreadyExists().");
-            return false;
-        }
-        return alreadyExists(dvObject.getGlobalId());
-    }
-    
-    @Override
-    public boolean alreadyExists(GlobalId pid) throws Exception {
-        logger.log(Level.FINE,"alreadyExists");
-        try {
-            HashMap<String, String> result = ezidService.getMetadata(pid.asString());            
-            return result != null && !result.isEmpty();
-            // TODO just check for HTTP status code 200/404, sadly the status code is swept under the carpet
-        } catch (EZIDException e ){
-            //No such identifier is treated as an exception
-            //but if that is the case then we want to just return false
-            if(pid.getIdentifier() == null){
-                return false;
-            }
-            if (e.getLocalizedMessage().contains("no such identifier")){
-                return false;
-            }
-            logger.log(Level.WARNING, "alreadyExists failed");
-            logger.log(Level.WARNING, "getIdentifier(dvObject) {0}", pid.asString());
-            logger.log(Level.WARNING, "String {0}", e.toString());
-            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
-            logger.log(Level.WARNING, "cause", e.getCause());
-            logger.log(Level.WARNING, "message {0}", e.getMessage());
-            throw e;
-        }
-    }
-
-    @Override
-    public Map<String, String> getIdentifierMetadata(DvObject dvObject) {
-        logger.log(Level.FINE,"getIdentifierMetadata");
-        String identifier = getIdentifier(dvObject);
-        Map<String, String> metadata = new HashMap<>();
-        try {
-            metadata = ezidService.getMetadata(identifier);
-        } catch (EZIDException e) {
-            logger.log(Level.WARNING, "getIdentifierMetadata failed");
-            logger.log(Level.WARNING, "String {0}", e.toString());
-            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
-            logger.log(Level.WARNING, "cause", e.getCause());
-            logger.log(Level.WARNING, "message {0}", e.getMessage());
-            return metadata;
-        }
-        return metadata;
-    }
-
-    /**
-     * Looks up the metadata for a Global Identifier
-     *
-     * @param protocol the identifier system, e.g. "doi"
-     * @param authority the namespace that the authority manages in the
-     * identifier system
-     * identifier part
-     * @param identifier the local identifier part
-     * @return a Map of metadata. It is empty when the lookup failed, e.g. when
-     * the identifier does not exist.
-     */
-    @Override
-    public HashMap<String, String> lookupMetadataFromIdentifier(String protocol, String authority, String identifier) {
-        logger.log(Level.FINE,"lookupMetadataFromIdentifier");
-        String identifierOut = getIdentifierForLookup(protocol, authority, identifier);
-        HashMap<String, String> metadata = new HashMap<>();
-        try {
-            metadata = ezidService.getMetadata(identifierOut);
-        } catch (EZIDException e) {
-            logger.log(Level.FINE, "None existing so we can use this identifier");
-            logger.log(Level.FINE, "identifier: {0}", identifierOut);
-            return metadata;
-        }
-        return metadata;
-    }
-
-    /**
-     * Modifies the EZID metadata for a Dataset
-     *
-     * @param dvObject the Dataset whose metadata needs to be modified
-     * @return the Dataset identifier, or null if the modification failed
-     * @throws java.lang.Exception
-     */
-    @Override
-    public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception {
-        String identifier = getIdentifier(dvObject);
-        HashMap<String, String> metadata = new HashMap<>();
-        metadata.put("_target", getTargetUrl(dvObject));
-        try {
-            ezidService.setMetadata(identifier,metadata);
-            return identifier;
-        } catch (EZIDException e) {
-            logger.log(Level.WARNING, "modifyMetadata failed");
-            logger.log(Level.WARNING, "String {0}", e.toString());
-            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
-            logger.log(Level.WARNING, "cause", e.getCause());
-            logger.log(Level.WARNING, "message {0}", e.getMessage());
-            throw e;
-        }
-    }
-        
-    @Override
-    public void deleteIdentifier(DvObject dvObject) throws Exception {
-                logger.log(Level.FINE,"deleteIdentifier");
-        String identifier = getIdentifier(dvObject);
-        HashMap<String, String> doiMetadata;
-        try {
-            doiMetadata = ezidService.getMetadata(identifier);
-        } catch (EZIDException e) {
-            logger.log(Level.WARNING, "get matadata failed cannot delete");
-            logger.log(Level.WARNING, "String {0}", e.toString());
-            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
-            logger.log(Level.WARNING, "cause ", e.getCause());
-            logger.log(Level.WARNING, "message {0}", e.getMessage());
-            return;
-        }
-
-        String idStatus = doiMetadata.get("_status");
-
-        if (idStatus.equals("reserved")) {
-            logger.log(Level.INFO, "Delete status is reserved..");
-            try {
-                ezidService.deleteIdentifier(identifier);
-            } catch (EZIDException e) {
-                logger.log(Level.WARNING, "delete failed");
-                logger.log(Level.WARNING, "String {0}", e.toString());
-                logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
-                logger.log(Level.WARNING, "cause", e.getCause());
-                logger.log(Level.WARNING, "message {0}", e.getMessage());
-            }
-            return;
-        }
-        if (idStatus.equals("public")) {
-            //if public then it has been released set to unavaialble and reset target to n2t url
-            updateIdentifierStatus(dvObject, "unavailable | withdrawn by author");
-            Map<String, String> metadata = new HashMap<>();
-            metadata.put("_target", "http://ezid.cdlib.org/id/" + dvObject.getProtocol() + ":" + dvObject.getAuthority()
-                    + "/" + dvObject.getIdentifier());
-            try {
-                modifyIdentifierTargetURL(dvObject);
-                if (dvObject instanceof Dataset) {
-                    Dataset dataset = (Dataset) dvObject;
-                    for (DataFile df : dataset.getFiles()) {
-                        metadata = new HashMap<>();
-                        metadata.put("_target", "http://ezid.cdlib.org/id/" + df.getProtocol() + ":" + df.getAuthority()
-                                + "/" + df.getIdentifier());
-                                        modifyIdentifierTargetURL(df);
-                    }
-                }
-
-            } catch (Exception e) {
-                // TODO already logged, how to react here?
-            }
-        }
-    }
-    
-    @Override
-    public boolean publicizeIdentifier(DvObject dvObject) {
-        logger.log(Level.FINE,"publicizeIdentifier - dvObject");
-        if(!dvObject.isIdentifierRegistered()){
-            try {
-                createIdentifier(dvObject);
-            } catch (Throwable e){
-                return false; 
-            }
-        }
-        return updateIdentifierStatus(dvObject, "public");
-    }
-
-    private boolean updateIdentifierStatus(DvObject dvObject, String statusIn) {
-        logger.log(Level.FINE, "updateIdentifierStatus");
-        String identifier = getIdentifier(dvObject);
-        Map<String, String> metadata = getUpdateMetadata(dvObject);
-        String objMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
-        Map<String, String> dcMetadata;
-        dcMetadata = new HashMap<>();
-        dcMetadata.put("datacite", objMetadata);
-        dcMetadata.put("_status", statusIn);
-        dcMetadata.put("_target", getTargetUrl(dvObject));
-
-        try {
-            // ezID API requires HashMap, not just any map.            
-            ezidService.setMetadata(identifier, asHashMap(dcMetadata));
-            return true;
-
-        } catch (EZIDException e) {
-            logger.log(Level.WARNING, "modifyMetadata failed");
-            logger.log(Level.WARNING, "String {0}", e.toString());
-            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
-            logger.log(Level.WARNING, "cause", e.getCause());
-            logger.log(Level.WARNING, "message {0}", e.getMessage());
-            return false;
-        }
-    }
-    
-    @Override
-    public List<String> getProviderInformation(){
-        ArrayList <String> providerInfo = new ArrayList<>();
-        String providerName = "EZID";
-        String providerLink = baseURLString;
-        providerInfo.add(providerName);
-        providerInfo.add(providerLink);
-        return providerInfo;
-    }
-
-    @Override
-    public String createIdentifier(DvObject dvObject) throws Throwable {
-        logger.log(Level.FINE, "createIdentifier");
-        if(dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty() ){
-            dvObject = generateIdentifier(dvObject);
-        }
-        String identifier = getIdentifier(dvObject);
-        Map<String, String> metadata = getMetadataForCreateIndicator(dvObject);
-        String objMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
-        Map<String, String> dcMetadata;
-        dcMetadata = new HashMap<>();
-        dcMetadata.put("datacite", objMetadata);
-        dcMetadata.put("datacite.resourcetype", "Dataset");
-        dcMetadata.put("_status", "reserved");
-
-        try {
-            String retString = ezidService.createIdentifier(identifier, asHashMap(dcMetadata));
-            logger.log(Level.FINE, "create DOI identifier retString : {0}", retString);
-            return retString;
-        } catch (EZIDException e) {
-            logger.log(Level.WARNING, "Identifier not created: create failed");
-            logger.log(Level.WARNING, "String {0}", e.toString());
-            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
-            logger.log(Level.WARNING, "cause", e.getCause());
-            logger.log(Level.WARNING, "message {0}", e.getMessage());
-            logger.log(Level.WARNING, "identifier: ", identifier);
-            throw e;
-        }
-    }
-    
-     /**
-     * Returns a HashMap with the same values as {@code map}. This can be either
-     * {@code map} itself, or a new instance with the same values.
-     * 
-     * This is needed as some of the internal APIs here require HashMap, but we
-     * don't want the external APIs to use an implementation class.
-     * @param <T>
-     * @param map
-     * @return A HashMap with the same values as {@code map}
-     */
-    private <T> HashMap<T,T> asHashMap(Map<T,T> map) {
-        return (map instanceof HashMap) ? (HashMap)map : new HashMap<>(map);
-    }
-
-}
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java b/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java
index 5b6cdd23775..c37c3f52bc7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java
@@ -5,23 +5,21 @@
  */
 package edu.harvard.iq.dataverse;
 
-import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClientServiceBean;
 import edu.harvard.iq.dataverse.harvest.server.OAISet;
 import edu.harvard.iq.dataverse.harvest.server.OAISetServiceBean;
-import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 /**
  *
@@ -97,12 +95,8 @@ public int getNumberOfConfiguredHarvestClients() {
     }
     
     public long getNumberOfHarvestedDatasets() {
-        List<HarvestingClient> configuredHarvestingClients = harvestingClientService.getAllHarvestingClients();
-        if (configuredHarvestingClients == null || configuredHarvestingClients.isEmpty()) {
-            return 0L;
-        }
         
-        Long numOfDatasets = harvestingClientService.getNumberOfHarvestedDatasetByClients(configuredHarvestingClients);
+        Long numOfDatasets = harvestingClientService.getNumberOfHarvestedDatasetsByAllClients();
         
         if (numOfDatasets != null && numOfDatasets > 0L) {
             return numOfDatasets;
@@ -142,7 +136,7 @@ public String getHarvestClientsInfoLabel() {
             infoLabel = configuredHarvestingClients.size() + " harvesting clients configured; ";
         }        
         
-        Long numOfDatasets = harvestingClientService.getNumberOfHarvestedDatasetByClients(configuredHarvestingClients);
+        Long numOfDatasets = harvestingClientService.getNumberOfHarvestedDatasetsByAllClients();
         
         if (numOfDatasets != null && numOfDatasets > 0L) {
             return infoLabel + numOfDatasets + " harvested datasets";
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataCitation.java b/src/main/java/edu/harvard/iq/dataverse/DataCitation.java
index 051055efb42..30d9928f59a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataCitation.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataCitation.java
@@ -5,7 +5,10 @@
  */
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
+import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
@@ -13,7 +16,7 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.text.ParseException;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -26,14 +29,34 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.core.MediaType;
+
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import edu.harvard.iq.dataverse.util.DateUtil;
+import edu.harvard.iq.dataverse.util.PersonOrOrgUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
+import org.apache.commons.text.StringEscapeUtils;
+
+import de.undercouch.citeproc.csl.CSLItemDataBuilder;
+import de.undercouch.citeproc.csl.CSLName;
+import de.undercouch.citeproc.csl.CSLNameBuilder;
+import de.undercouch.citeproc.csl.CSLType;
+import de.undercouch.citeproc.helper.json.JsonBuilder;
+import de.undercouch.citeproc.helper.json.StringJsonBuilderFactory;
+
+import org.apache.commons.lang3.StringUtils;
+
+import static edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider.DOI_PROTOCOL;
+import static edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider.HDL_PROTOCOL;
+import static edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider.PERMA_PROTOCOL;
 
 /**
  *
@@ -44,6 +67,7 @@ public class DataCitation {
     private static final Logger logger = Logger.getLogger(DataCitation.class.getCanonicalName());
 
     private List<String> authors = new ArrayList<String>();
+    private List<CSLName> cslAuthors = new ArrayList<CSLName>();
     private List<String> producers = new ArrayList<String>();
     private String title;
     private String fileTitle = null;
@@ -55,7 +79,7 @@ public class DataCitation {
     private String publisher;
     private boolean direct;
     private List<String> funders;
-    private String seriesTitle;
+    private List<String> seriesTitles;
     private String description;
     private List<String> datesOfCollection;
     private List<String> keywords;
@@ -64,8 +88,18 @@ public class DataCitation {
     private List<String> spatialCoverages;
 
     private List<DatasetField> optionalValues = new ArrayList<>();
-    private int optionalURLcount = 0; 
+    private int optionalURLcount = 0;
+
+    private DatasetType type; 
 
+    public enum Format {
+        Internal,
+        EndNote,
+        RIS,
+        BibTeX,
+        CSL
+    }
+    
     public DataCitation(DatasetVersion dsv) {
         this(dsv, false);
     }
@@ -133,14 +167,20 @@ private void getCommonValuesFrom(DatasetVersion dsv) {
 
         datesOfCollection = dsv.getDatesOfCollection();
         title = dsv.getTitle();
-        seriesTitle = dsv.getSeriesTitle();
+        seriesTitles = dsv.getSeriesTitles();
         keywords = dsv.getKeywords();
         languages = dsv.getLanguages();
         spatialCoverages = dsv.getSpatialCoverages();
         publisher = getPublisherFrom(dsv);
         version = getVersionFrom(dsv);
+        type = getTypeFrom(dsv);
     }
 
+    private DatasetType getTypeFrom(DatasetVersion dsv) {
+        return dsv.getDataset().getDatasetType();
+    }
+
+
     public String getAuthorsString() {
         return String.join("; ", authors);
     }
@@ -184,21 +224,66 @@ public String toString() {
     }
 
     public String toString(boolean html) {
-        // first add comma separated parts        
+        return toString(html, false);
+    }
+    
+    public String toString(boolean html, boolean anonymized) {
+        return toString(Format.Internal, html, anonymized);
+    }
+    
+    public String toString(Format format, boolean html, boolean anonymized) {
+        if(anonymized && (format != Format.Internal)) {
+            //Only Internal format supports anonymization
+            return null;
+        }
+        switch (format) {
+        case BibTeX:
+            return toBibtexString();
+        case CSL:
+            return JsonUtil.prettyPrint(getCSLJsonFormat());
+        case EndNote:
+            return toEndNoteString();
+        case Internal:
+            return formatInternalCitation(html, anonymized);
+        case RIS:
+            return toRISString();
+        }
+        return null;
+    }
+    
+    public static String getCitationFormatMediaType(Format format, boolean isHtml) {
+        switch (format) {
+        
+        case CSL:
+            return MediaType.APPLICATION_JSON;
+        case EndNote:
+            return MediaType.TEXT_XML;
+        case Internal:
+            return isHtml ? MediaType.TEXT_HTML : MediaType.TEXT_PLAIN;
+        }
+        return MediaType.TEXT_PLAIN;
+    }
+        
+    private String formatInternalCitation(boolean html, boolean anonymized) {
+        // first add comma separated parts
         String separator = ", ";
         List<String> citationList = new ArrayList<>();
-        citationList.add(formatString(getAuthorsString(), html));
+        if(anonymized) {
+            citationList.add(BundleUtil.getStringFromBundle("file.anonymized.authorsWithheld"));
+        } else {
+            citationList.add(formatString(getAuthorsString(), html));
+        }
         citationList.add(year);
         if ((fileTitle != null) && isDirect()) {
             citationList.add(formatString(fileTitle, html, "\""));
-            citationList.add(formatString(title, html, "<i>", "</i>"));
+            citationList.add(formatString(title, html, "<em>", "</em>"));
         } else {
         citationList.add(formatString(title, html, "\""));
         }
 
         if (persistentId != null) {
         	// always show url format
-            citationList.add(formatURL(persistentId.toURL().toString(), persistentId.toURL().toString(), html)); 
+            citationList.add(formatURL(persistentId.asURL(), persistentId.asURL(), html)); 
         }
         citationList.add(formatString(publisher, html));
         citationList.add(version);
@@ -244,7 +329,7 @@ public String toBibtexString() {
     
     public void writeAsBibtexCitation(OutputStream os) throws IOException {
         // Use UTF-8
-        Writer out = new BufferedWriter(new OutputStreamWriter(os, "utf-8"));
+        Writer out = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8));
         if(getFileTitle() !=null && isDirect()) {
             out.write("@incollection{");
         } else {
@@ -265,12 +350,12 @@ public void writeAsBibtexCitation(OutputStream os) throws IOException {
             out.write(title);
             out.write("},\r\n");
         } else {
-            out.write("title = \"{");
+            out.write("title = {{");
             String doubleQ = "\"";
             String doubleTick = "``";
             String doubleAp = "''";
             out.write(title.replaceFirst(doubleQ, doubleTick).replaceFirst(doubleQ, doubleAp));
-            out.write("}\",\r\n");
+            out.write("}},\r\n");
         }
         if(UNF != null){
             out.write("UNF = {");
@@ -283,13 +368,15 @@ public void writeAsBibtexCitation(OutputStream os) throws IOException {
         out.write("version = {");
         out.write(version);
         out.write("},\r\n");
-        out.write("doi = {");
-        out.write(persistentId.getAuthority());
-        out.write("/");
-        out.write(persistentId.getIdentifier());
-        out.write("},\r\n");
+        if("doi".equals(persistentId.getProtocol())) {
+            out.write("doi = {");
+            out.write(persistentId.getAuthority());
+            out.write("/");
+            out.write(persistentId.getIdentifier());
+            out.write("},\r\n");
+        }
         out.write("url = {");
-        out.write(persistentId.toURL().toString());
+        out.write(persistentId.asURL());
         out.write("}\r\n");
         out.write("}\r\n");
         out.flush();
@@ -308,7 +395,7 @@ public String toRISString() {
 
     public void writeAsRISCitation(OutputStream os) throws IOException {
         // Use UTF-8
-        Writer out = new BufferedWriter(new OutputStreamWriter(os, "utf-8"));
+        Writer out = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8));
         out.write("Provider: " + publisher + "\r\n");
         out.write("Content: text/plain; charset=\"utf-8\"" + "\r\n");
         // Using type "DATA" - see https://github.com/IQSS/dataverse/issues/4816
@@ -321,8 +408,10 @@ public void writeAsRISCitation(OutputStream os) throws IOException {
             out.write("TY  - DATA" + "\r\n");
             out.write("T1  - " + getTitle() + "\r\n");
         }
-        if (seriesTitle != null) {
-            out.write("T3  - " + seriesTitle + "\r\n");
+        if (seriesTitles != null) {
+            for (String seriesTitle : seriesTitles) {
+                out.write("T3  - " + seriesTitle + "\r\n");
+            }
         }
         /* Removing abstract/description per Request from G. King in #3759
         if(description!=null) {
@@ -378,7 +467,7 @@ public void writeAsRISCitation(OutputStream os) throws IOException {
         
         out.write("SE  - " + date + "\r\n");
 
-        out.write("UR  - " + persistentId.toURL().toString() + "\r\n");
+        out.write("UR  - " + persistentId.asURL() + "\r\n");
         out.write("PB  - " + publisher + "\r\n");
 
         // a DataFile citation also includes filename und UNF, if applicable:
@@ -496,12 +585,22 @@ private void createEndNoteXML(XMLStreamWriter xmlw) throws XMLStreamException {
         xmlw.writeCharacters(title);
         xmlw.writeEndElement(); // title
         }
-        
-        if (seriesTitle != null) {
-            xmlw.writeStartElement("tertiary-title");
-            xmlw.writeCharacters(seriesTitle);
+
+        /*
+        If I say just !"isEmpty" for series titles I get a failure 
+        on testToEndNoteString_withoutTitleAndAuthor
+        with a null pointer on build -SEK 3/31/23
+        */
+        if (seriesTitles != null && !seriesTitles.isEmpty() ) {
+            xmlw.writeStartElement("tertiary-titles");
+            for (String seriesTitle : seriesTitles){
+                xmlw.writeStartElement("tertiary-title");
+                xmlw.writeCharacters(seriesTitle);
+                xmlw.writeEndElement(); // tertiary-title
+            }
             xmlw.writeEndElement(); // tertiary-title
         }
+        
         xmlw.writeEndElement(); // titles
 
         xmlw.writeStartElement("section");
@@ -573,11 +672,21 @@ private void createEndNoteXML(XMLStreamWriter xmlw) throws XMLStreamException {
         }
 
         xmlw.writeStartElement("urls");
-        xmlw.writeStartElement("related-urls");
-        xmlw.writeStartElement("url");
-        xmlw.writeCharacters(getPersistentId().toURL().toString());
-        xmlw.writeEndElement(); // url
-        xmlw.writeEndElement(); // related-urls
+        if (persistentId != null) {
+            if (PERMA_PROTOCOL.equals(persistentId.getProtocol()) || HDL_PROTOCOL.equals(persistentId.getProtocol())) {
+                xmlw.writeStartElement("web-urls");
+                xmlw.writeStartElement("url");
+                xmlw.writeCharacters(getPersistentId().asURL());
+                xmlw.writeEndElement(); // url
+                xmlw.writeEndElement(); // web-urls
+            } else if (DOI_PROTOCOL.equals(persistentId.getProtocol())) {
+                xmlw.writeStartElement("related-urls");
+                xmlw.writeStartElement("url");
+                xmlw.writeCharacters(getPersistentId().asURL());
+                xmlw.writeEndElement(); // url
+                xmlw.writeEndElement(); // related-urls
+            }
+        }
         xmlw.writeEndElement(); // urls
         
         // a DataFile citation also includes the filename and (for Tabular
@@ -595,10 +704,9 @@ private void createEndNoteXML(XMLStreamWriter xmlw) throws XMLStreamException {
                     xmlw.writeEndElement(); // custom2
             }
         }
-        if (persistentId != null) {
+        if (persistentId != null && "doi".equals(persistentId.getProtocol())) {
             xmlw.writeStartElement("electronic-resource-num");
-            String electResourceNum = persistentId.getProtocol() + "/" + persistentId.getAuthority() + "/"
-                    + persistentId.getIdentifier();
+            String electResourceNum = persistentId.asRawIdentifier();
             xmlw.writeCharacters(electResourceNum);
             xmlw.writeEndElement();
         }
@@ -615,12 +723,12 @@ public Map<String, String> getDataCiteMetadata() {
         String authorString = getAuthorsString();
 
         if (authorString.isEmpty()) {
-            authorString = AbstractGlobalIdServiceBean.UNAVAILABLE;
+            authorString = AbstractPidProvider.UNAVAILABLE;
     }
         String producerString = getPublisher();
 
         if (producerString.isEmpty()) {
-            producerString =  AbstractGlobalIdServiceBean.UNAVAILABLE;
+            producerString =  AbstractPidProvider.UNAVAILABLE;
         }
 
         metadata.put("datacite.creator", authorString);
@@ -628,9 +736,30 @@ public Map<String, String> getDataCiteMetadata() {
         metadata.put("datacite.publisher", producerString);
         metadata.put("datacite.publicationyear", getYear());
         return metadata;
-	}
+    }
+
+    public JsonObject getCSLJsonFormat() {
+        CSLItemDataBuilder itemBuilder = new CSLItemDataBuilder();
+        if (type.equals(DatasetType.DATASET_TYPE_SOFTWARE)) {
+            itemBuilder.type(CSLType.SOFTWARE);
+        } else {
+            itemBuilder.type(CSLType.DATASET);
+        }
+        itemBuilder.title(formatString(title,true)).author((CSLName[]) cslAuthors.toArray(new CSLName[0])).issued(Integer.parseInt(year));
+        if (seriesTitles != null) {
+            itemBuilder.containerTitle(formatString(seriesTitles.get(0), true));
+        }
+        itemBuilder.version(version).DOI(persistentId.asRawIdentifier());
+        if (keywords != null) {
+            itemBuilder
+                    .categories(keywords.stream().map(keyword -> formatString(keyword, true)).toArray(String[]::new));
+        }
+        itemBuilder.abstrct(formatString(description, true)).publisher(formatString(publisher, true))
+                .URL(SystemConfig.getDataverseSiteUrlStatic() + "/citation?persistentId=" + persistentId.asString());
+        JsonBuilder b = (new StringJsonBuilderFactory()).createJsonBuilder();
+        return JsonUtil.getJsonObject((String) itemBuilder.build().toJson(b));
+    }
 
-	
     // helper methods   
     private String formatString(String value, boolean escapeHtml) {
         return formatString(value, escapeHtml, "");
@@ -642,7 +771,7 @@ private String formatString(String value, boolean escapeHtml, String wrapperFron
 
     private String formatString(String value, boolean escapeHtml, String wrapperStart, String wrapperEnd) {
         if (!StringUtils.isEmpty(value)) {
-            return new StringBuilder(wrapperStart).append(escapeHtml ? StringEscapeUtils.escapeHtml(value) : value)
+            return new StringBuilder(wrapperStart).append(escapeHtml ? StringEscapeUtils.escapeHtml4(value) : value)
                     .append(wrapperEnd).toString();
         }
         return null;
@@ -654,7 +783,7 @@ private String formatURL(String text, String url, boolean html) {
         }
 
         if (html && url != null) {
-            return "<a href=\"" + url + "\" target=\"_blank\">" + StringEscapeUtils.escapeHtml(text) + "</a>";
+            return "<a href=\"" + url + "\" target=\"_blank\">" + StringEscapeUtils.escapeHtml4(text) + "</a>";
         } else {
             return text;
         }
@@ -705,25 +834,24 @@ private String flattenHtml(String html) {
 
     private Date getDateFrom(DatasetVersion dsv) {
         Date citationDate = null;
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
-        if (!dsv.getDataset().isHarvested()) {
-            citationDate = dsv.getCitationDate();
+
+        if (dsv.getDataset().isHarvested()) {
+            citationDate = DateUtil.parseDate(dsv.getProductionDate());
             if (citationDate == null) {
-                if (dsv.getDataset().getPublicationDate() != null) {
-                    citationDate = dsv.getDataset().getPublicationDate();
-                } else { // for drafts
-                    citationDate = dsv.getLastUpdateTime();
-                }
+                citationDate = DateUtil.parseDate(dsv.getDistributionDate());
             }
-        } else {
-            try {
-                citationDate= sdf.parse(dsv.getDistributionDate());
-            } catch (ParseException ex) {
-                // ignore
-            } catch (Exception ex) {
-                // ignore
+        }
+
+        if (citationDate == null) {
+            if (dsv.getCitationDate() != null) {
+                citationDate = dsv.getCitationDate();
+            } else if (dsv.getDataset().getCitationDate() != null) {
+                citationDate = dsv.getDataset().getCitationDate();
+            } else { // for drafts
+                citationDate = dsv.getLastUpdateTime();
             }
         }
+
         if (citationDate == null) {
             //As a last resort, pick the current date
             logger.warning("Unable to find citation date for datasetversion: " + dsv.getId());
@@ -738,6 +866,20 @@ private void getAuthorsAndProducersFrom(DatasetVersion dsv) {
             if (!author.isEmpty()) {
                 String an = author.getName().getDisplayValue().trim();
                 authors.add(an);
+                boolean isOrg = "ROR".equals(author.getIdType());
+                JsonObject authorJson = PersonOrOrgUtil.getPersonOrOrganization(an, false, !isOrg);
+                if (!authorJson.getBoolean("isPerson")) {
+                    cslAuthors.add(new CSLNameBuilder().literal(formatString(authorJson.getString("fullName"), true)).isInstitution(true).build());
+                } else {
+                    if (authorJson.containsKey("givenName") && authorJson.containsKey("familyName")) {
+                        String givenName = formatString(authorJson.getString("givenName"),true);
+                        String familyName = formatString(authorJson.getString("familyName"), true);
+                        cslAuthors.add(new CSLNameBuilder().given(givenName).family(familyName).isInstitution(false).build());
+                    } else {
+                        cslAuthors.add(
+                                new CSLNameBuilder().literal(formatString(authorJson.getString("fullName"), true)).isInstitution(false).build());
+                    }
+                }
             }
         });
         producers = dsv.getDatasetProducerNames();
@@ -745,7 +887,7 @@ private void getAuthorsAndProducersFrom(DatasetVersion dsv) {
 
     private String getPublisherFrom(DatasetVersion dsv) {
         if (!dsv.getDataset().isHarvested()) {
-            return dsv.getRootDataverseNameforCitation();
+            return BrandingUtil.getInstallationBrandName();
         } else {
             return dsv.getDistributorName();
             // remove += [distributor] SEK 8-18-2016
@@ -771,20 +913,16 @@ private GlobalId getPIDFrom(DatasetVersion dsv, DvObject dv) {
         if (!dsv.getDataset().isHarvested()
                 || HarvestingClient.HARVEST_STYLE_VDC.equals(dsv.getDataset().getHarvestedFrom().getHarvestStyle())
                 || HarvestingClient.HARVEST_STYLE_ICPSR.equals(dsv.getDataset().getHarvestedFrom().getHarvestStyle())
+                || HarvestingClient.HARVEST_STYLE_DEFAULT.equals(dsv.getDataset().getHarvestedFrom().getHarvestStyle())
                 || HarvestingClient.HARVEST_STYLE_DATAVERSE
                         .equals(dsv.getDataset().getHarvestedFrom().getHarvestStyle())) {
-                // creating a global id like this:
-                // persistentId = new GlobalId(dv.getGlobalId());
-                // you end up doing new GlobalId((New GlobalId(dv)).toString())
-                // - doing an extra formatting-and-parsing-again
-                // This achieves the same thing:
                 if(!isDirect()) {
                 if (!StringUtils.isEmpty(dsv.getDataset().getIdentifier())) {
-                    return new GlobalId(dsv.getDataset());
+                    return dsv.getDataset().getGlobalId();
                 }
                 } else {
                 if (!StringUtils.isEmpty(dv.getIdentifier())) {
-                    return new GlobalId(dv);
+                    return dv.getGlobalId();
                 }
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataCiteRESTfullClient.java b/src/main/java/edu/harvard/iq/dataverse/DataCiteRESTfullClient.java
deleted file mode 100644
index ad7e021e1ea..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/DataCiteRESTfullClient.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-
-import java.io.Closeable;
-import java.io.IOException;
-
-import java.io.UnsupportedEncodingException;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-
-
-
-import org.apache.http.util.EntityUtils;
-
-/**
- * DataCiteRESTfullClient
- *
- * @author luopc
- *
- */
-public class DataCiteRESTfullClient implements Closeable {
-    
-    private static final Logger logger = Logger.getLogger(DataCiteRESTfullClient.class.getCanonicalName());
-
-    private String url;
-    private CloseableHttpClient httpClient;
-    private HttpClientContext context;
-    private String encoding = "utf-8";
-    
-    public DataCiteRESTfullClient(String url, String username, String password) throws IOException {
-        this.url = url;
-        try {
-            context = HttpClientContext.create();
-            CredentialsProvider credsProvider = new BasicCredentialsProvider();
-            credsProvider.setCredentials(new AuthScope(null, -1),
-                    new UsernamePasswordCredentials(username, password));
-            context.setCredentialsProvider(credsProvider);
-            
-            httpClient = HttpClients.createDefault();
-        } catch (Exception ioe) {
-            close();
-            logger.log(Level.SEVERE,"Fail to init Client",ioe);
-            throw new RuntimeException("Fail to init Client", ioe);
-        }
-    }
-
-    public void close() {
-        if (this.httpClient != null) {
-            try {
-           httpClient.close();
-            } catch (IOException io) {
-               logger.warning("IOException closing hhtpClient: " + io.getMessage());
-           }
-        }
-    }
-
-    /**
-     * getUrl
-     *
-     * @param doi
-     * @return
-     */
-    public String getUrl(String doi) {
-        HttpGet httpGet = new HttpGet(this.url + "/doi/" + doi);
-        try {
-            HttpResponse response = httpClient.execute(httpGet,context);
-            String data = EntityUtils.toString(response.getEntity(), encoding);
-            if (response.getStatusLine().getStatusCode() != 200) {
-                throw new RuntimeException("Response code: " + response.getStatusLine().getStatusCode() + ", " + data);
-            }
-            return data;
-        } catch (IOException ioe) {
-            logger.log(Level.SEVERE,"IOException when get url",ioe);
-            throw new RuntimeException("IOException when get url", ioe);
-        }
-    }
-
-    /**
-     * postUrl
-     *
-     * @param doi
-     * @param url
-     * @return
-     */
-    public String postUrl(String doi, String url) throws UnsupportedEncodingException {
-        HttpPost httpPost = new HttpPost(this.url + "/doi");
-        httpPost.setHeader("Content-Type", "text/plain;charset=UTF-8");
-        httpPost.setEntity(new StringEntity("doi=" + doi + "\nurl=" + url, "utf-8"));
-
-        try {
-            HttpResponse response = httpClient.execute(httpPost,context);
-            String data = EntityUtils.toString(response.getEntity(), encoding);
-            if (response.getStatusLine().getStatusCode() != 201) {
-                String errMsg = "Response code: " + response.getStatusLine().getStatusCode() + ", " + data;
-                logger.log(Level.SEVERE,errMsg);
-                throw new RuntimeException(errMsg);
-            }
-            return data;
-        } catch (IOException ioe) {
-            logger.log(Level.SEVERE,"IOException when post url");
-            throw new RuntimeException("IOException when post url", ioe);
-        }
-    }
-
-    /**
-     * getMetadata
-     *
-     * @param doi
-     * @return
-     */
-    public String getMetadata(String doi) {
-        HttpGet httpGet = new HttpGet(this.url + "/metadata/" + doi);
-        httpGet.setHeader("Accept", "application/xml");
-        try {
-            HttpResponse response = httpClient.execute(httpGet,context);
-            String data = EntityUtils.toString(response.getEntity(), encoding);
-            if (response.getStatusLine().getStatusCode() != 200) {
-                String errMsg = "Response code: " + response.getStatusLine().getStatusCode() + ", " + data;
-                logger.log(Level.SEVERE, errMsg);
-                throw new RuntimeException(errMsg);
-            }
-            return data;
-        } catch (IOException ioe) {
-            logger.log(Level.SEVERE, "IOException when get metadata");
-            throw new RuntimeException("IOException when get metadata", ioe);
-        }
-    }
-    
-    /**
-     * testDOIExists
-     *
-     * @param doi
-     * @return boolean true if identifier already exists on DataCite site
-     */
-    public boolean testDOIExists(String doi) {
-        HttpGet httpGet = new HttpGet(this.url + "/metadata/" + doi);      
-        httpGet.setHeader("Accept", "application/xml");        
-        try {
-            HttpResponse response = httpClient.execute(httpGet,context);
-            if (response.getStatusLine().getStatusCode() != 200) {
-                EntityUtils.consumeQuietly(response.getEntity());
-                return false;
-            }
-            EntityUtils.consumeQuietly(response.getEntity());
-            return true;
-        } catch (IOException ioe) {
-            logger.log(Level.SEVERE, "IOException when get metadata");
-            throw new RuntimeException("IOException when get metadata", ioe);
-        } 
-    }
-
-    /**
-     * postMetadata
-     *
-     * @param metadata
-     * @return
-     */
-    public String postMetadata(String metadata) {
-        
-        HttpPost httpPost = new HttpPost(this.url + "/metadata");
-        httpPost.setHeader("Content-Type", "application/xml;charset=UTF-8");
-        try {
-            httpPost.setEntity(new StringEntity(metadata, "utf-8"));
-            HttpResponse response = httpClient.execute(httpPost,context);
-            
-            String data = EntityUtils.toString(response.getEntity(), encoding);
-            if (response.getStatusLine().getStatusCode() != 201) {
-                String errMsg = "Response code: " + response.getStatusLine().getStatusCode() + ", " + data;
-                logger.log(Level.SEVERE, errMsg);
-                throw new RuntimeException(errMsg);
-            }
-            return data;
-            
-        } catch (IOException ioe) {
-            logger.log(Level.SEVERE, "IOException when post metadata");
-            throw new RuntimeException("IOException when post metadata", ioe);
-        }
-    }
-
-    /**
-     * inactiveDataset
-     *
-     * @param doi
-     * @return
-     */
-    public String inactiveDataset(String doi) {
-        HttpDelete httpDelete = new HttpDelete(this.url + "/metadata/" + doi);
-        try {
-            HttpResponse response = httpClient.execute(httpDelete,context);
-            String data = EntityUtils.toString(response.getEntity(), encoding);
-            if (response.getStatusLine().getStatusCode() != 200) {
-                String errMsg = "Response code: " + response.getStatusLine().getStatusCode() + ", " + data;
-                logger.log(Level.SEVERE, errMsg);
-                throw new RuntimeException(errMsg);
-            }
-            return data;
-        } catch (IOException ioe) {
-            logger.log(Level.SEVERE, "IOException when inactive dataset");
-            throw new RuntimeException("IOException when inactive dataset", ioe);
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        String doi = "10.5072/DVN/274533";
-        DataCiteRESTfullClient client = new DataCiteRESTfullClient("https://mds.test.datacite.org", "DATACITE_TEST_USERNAME", "DATACITE_TEST_PASSWORD");
-//		System.out.println(client.getUrl(doi));
-//		System.out.println(client.getMetadata(doi));
-//        System.out.println(client.postMetadata(readAndClose("C:/Users/luopc/Desktop/datacite.xml", "utf-8")));
-//        System.out.println(client.postUrl("10.5072/000000001", "http://opendata.pku.edu.cn/dvn/dv/DAIM/faces/study/StudyPage.xhtml?globalId=hdl:TEST/10027&studyListingIndex=1_1acc4e9f23fa10b3cc0500d9eb5e"));
-//        client.close();
-//		String doi2 = "10.1/1.0003";
-//		SimpleRESTfullClient client2 = new SimpleRESTfullClient("https://162.105.140.119:8443/mds", "PKULIB.IR", "luopengcheng","localhost.keystore");
-//		System.out.println(client2.getUrl("10.1/1.0002"));
-//		System.out.println(client2.getUrl("10.1/1.0002"));
-//		System.out.println(client2.getMetadata(doi2));
-//		client2.postUrl("10.1/1.0003", "http://ir.pku.edu.cn");
-//		System.out.println(client2.postUrl("10.1/1.0008", "http://ir.pku.edu.cn"));
-//		System.out.println(client2.postMetadata(FileUtil.loadAsString(new File("C:/Users/luopc/Desktop/test/datacite-example-ResourceTypeGeneral_Collection-v3.0.xml"), "utf-8")));
-//		System.out.println(client2.getMetadata("10.1/1.0007"));
-//		System.out.println(client2.inactiveDataSet("10.1/1.0007"));
-//		client2.close();
-}
-
-    
-//    private static String readAndClose(String file, String encoding) throws IOException{
-//        BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),encoding));
-//        StringBuilder str = new StringBuilder();
-//        String line;
-//        while((line = in.readLine()) != null){
-//            str.append(line);
-//        }
-//        in.close();
-//        return str.toString();
-//    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java
index 0c1fbe88112..45604a5472b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java
@@ -5,49 +5,36 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
 import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
-import edu.harvard.iq.dataverse.api.WorldMapRelatedData;
+import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
-import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.datasetutility.FileSizeChecker;
 import edu.harvard.iq.dataverse.ingest.IngestReport;
 import edu.harvard.iq.dataverse.ingest.IngestRequest;
+import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.ShapefileHandler;
+import edu.harvard.iq.dataverse.util.StringUtil;
 import java.io.IOException;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Objects;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.validation.constraints.Pattern;
-import org.hibernate.validator.constraints.NotBlank;
+import java.util.stream.Collectors;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  *
@@ -56,16 +43,40 @@
 @NamedQueries({
 	@NamedQuery( name="DataFile.removeFromDatasetVersion",
 		query="DELETE FROM FileMetadata f WHERE f.datasetVersion.id=:versionId and f.dataFile.id=:fileId"),
-        @NamedQuery(name="DataFile.findDataFileByIdProtocolAuth", 
+        @NamedQuery(name = "DataFile.findByCreatorId",
+                query = "SELECT o FROM DataFile o WHERE o.creator.id=:creatorId"),
+        @NamedQuery(name = "DataFile.findByReleaseUserId",
+                query = "SELECT o FROM DataFile o WHERE o.releaseUser.id=:releaseUserId"),
+        @NamedQuery(name="DataFile.findDataFileByIdProtocolAuth",
                 query="SELECT s FROM DataFile s WHERE s.identifier=:identifier AND s.protocol=:protocol AND s.authority=:authority"),
-        @NamedQuery(name="DataFile.findDataFileThatReplacedId", 
+        @NamedQuery(name="DataFile.findDataFileThatReplacedId",
                 query="SELECT s.id FROM DataFile s WHERE s.previousDataFileId=:identifier")
 })
+@NamedNativeQuery(
+        name = "DataFile.getDataFileInfoForPermissionIndexing",
+        query = "SELECT fm.label, df.id, dvo.publicationDate " +
+                "FROM filemetadata fm " +
+                "JOIN datafile df ON fm.datafile_id = df.id " +
+                "JOIN dvobject dvo ON df.id = dvo.id " +
+                "WHERE fm.datasetversion_id = ?",
+        resultSetMapping = "DataFileInfoMapping"
+    )
+    @SqlResultSetMapping(
+        name = "DataFileInfoMapping",
+        classes = @ConstructorResult(
+            targetClass = SolrIndexServiceBean.DataFileProxy.class,
+            columns = {
+                @ColumnResult(name = "label", type = String.class),
+                @ColumnResult(name = "id", type = Long.class),
+                @ColumnResult(name = "publicationDate", type = Date.class)
+            }
+        )
+    )
 @Entity
 @Table(indexes = {@Index(columnList="ingeststatus")
-		, @Index(columnList="checksumvalue")
-		, @Index(columnList="contenttype")
-		, @Index(columnList="restricted")})
+        , @Index(columnList="checksumvalue")
+        , @Index(columnList="contenttype")
+        , @Index(columnList="restricted")})
 public class DataFile extends DvObject implements Comparable {
     private static final Logger logger = Logger.getLogger(DatasetPage.class.getCanonicalName());
     private static final long serialVersionUID = 1L;
@@ -82,7 +93,6 @@ public class DataFile extends DvObject implements Comparable {
     @Column( nullable = false )
     @Pattern(regexp = "^.*/.*$", message = "{contenttype.slash}")
     private String contentType;
-    
 
 //    @Expose    
 //    @SerializedName("storageIdentifier")
@@ -189,6 +199,9 @@ public String toString() {
     @OneToMany(mappedBy = "dataFile", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     private List<DataTable> dataTables;
     
+    @OneToMany(mappedBy = "dataFile", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
+    private List<AuxiliaryFile> auxiliaryFiles;
+   
     @OneToMany(mappedBy = "dataFile", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     private List<IngestReport> ingestReports;
     
@@ -204,6 +217,28 @@ public String toString() {
     @OneToMany(mappedBy="dataFile", cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     private List<GuestbookResponse> guestbookResponses;
 
+    @OneToMany(mappedBy="dataFile",fetch = FetchType.LAZY,cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
+    private List<FileAccessRequest> fileAccessRequests;
+
+    @ManyToMany
+    @JoinTable(name = "fileaccessrequests",
+    joinColumns = @JoinColumn(name = "datafile_id"),
+    inverseJoinColumns = @JoinColumn(name = "authenticated_user_id"))
+    private List<AuthenticatedUser> fileAccessRequesters;
+
+    
+    public List<FileAccessRequest> getFileAccessRequests(){
+        return fileAccessRequests;
+    }
+    
+    public List<FileAccessRequest> getFileAccessRequests(FileAccessRequest.RequestState state){
+        return fileAccessRequests.stream().filter(far -> far.getState() == state).collect(Collectors.toList());
+    }
+
+    public void setFileAccessRequests(List<FileAccessRequest> fARs){
+        this.fileAccessRequests = fARs;
+    }
+    
     public List<GuestbookResponse> getGuestbookResponses() {
         return guestbookResponses;
     }
@@ -211,12 +246,36 @@ public List<GuestbookResponse> getGuestbookResponses() {
     public void setGuestbookResponses(List<GuestbookResponse> guestbookResponses) {
         this.guestbookResponses = guestbookResponses;
     }
-    
+
     private char ingestStatus = INGEST_STATUS_NONE; 
     
     @OneToOne(mappedBy = "thumbnailFile")
     private Dataset thumbnailForDataset;
 
+    @ManyToOne
+    @JoinColumn(name="embargo_id")
+    private Embargo embargo;
+
+    public Embargo getEmbargo() {
+        return embargo;
+    }
+
+    public void setEmbargo(Embargo embargo) {
+        this.embargo = embargo;
+    }
+
+    @ManyToOne
+    @JoinColumn(name="retention_id")
+    private Retention retention;
+
+    public Retention getRetention() {
+        return retention;
+    }
+
+    public void setRetention(Retention retention) {
+        this.retention = retention;
+    }
+
     public DataFile() {
         this.fileMetadatas = new ArrayList<>();
         initFileReplaceAttributes();
@@ -227,8 +286,63 @@ public DataFile(String contentType) {
         this.fileMetadatas = new ArrayList<>();
         initFileReplaceAttributes();
     }
+
+    /*
+    Used in manage file permissions UI 
+    to easily display those files that have been deleted in the current draft 
+    or previous version which may have roles assigned or pending requests for access
+    */
+   
+    @Transient
+    private Boolean deleted;
+
+    public Boolean getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Boolean deleted) {
+        this.deleted = deleted;
+    }
     
+    /*
+    For use during file upload so that the user may delete 
+    files that have already been uploaded to the current dataset version
+    */
+    
+    @Transient
+    private boolean markedAsDuplicate;
+
+    public boolean isMarkedAsDuplicate() {
+        return markedAsDuplicate;
+    }
+
+    public void setMarkedAsDuplicate(boolean markedAsDuplicate) {
+        this.markedAsDuplicate = markedAsDuplicate;
+    }
     
+    @Transient
+    private String duplicateFilename;
+
+    public String getDuplicateFilename() {
+        return duplicateFilename;
+    }
+
+    public void setDuplicateFilename(String duplicateFilename) {
+        this.duplicateFilename = duplicateFilename;
+    }
+
+    public List<AuxiliaryFile> getAuxiliaryFiles() {
+        return auxiliaryFiles;
+    }
+
+    public void setAuxiliaryFiles(List<AuxiliaryFile> auxiliaryFiles) {
+        this.auxiliaryFiles = auxiliaryFiles;
+    }
+    
+    
+    
+    
+       
     /**
      * All constructors should use this method
      * to initialize this file replace attributes
@@ -306,7 +420,17 @@ public JsonArrayBuilder getTagLabelsAsJsonArrayBuilder(){
     public void setTags(List<DataFileTag> dataFileTags) {
         this.dataFileTags = dataFileTags;
     }
-    
+
+    public void addUniqueTagByLabel(String tagLabel) throws IllegalArgumentException {
+        if (tagExists(tagLabel)) {
+            return;
+        }
+        DataFileTag tag = new DataFileTag();
+        tag.setTypeByLabel(tagLabel);
+        tag.setDataFile(this);
+        addTag(tag);
+    }
+
     public void addTag(DataFileTag tag) {
         if (dataFileTags == null) {
             dataFileTags = new ArrayList<>();
@@ -355,7 +479,7 @@ public String getIngestReportMessage() {
                 return ingestReports.get(0).getReport();
             }
         }
-        return "Ingest failed. No further information is available.";
+        return BundleUtil.getStringFromBundle("file.ingestFailed");
     }
     
     public boolean isTabularData() {
@@ -381,6 +505,30 @@ public Long getOriginalFileSize() {
         }
         return null;
     }
+    
+    public String getOriginalFileName() {
+        if (isTabularData()) {
+            DataTable dataTable = getDataTable();
+            if (dataTable != null) {
+                return dataTable.getOriginalFileName() != null ? dataTable.getOriginalFileName()
+                        : getDerivedOriginalFileName();
+            }
+        }
+        return null;
+    }
+
+    
+    private String getDerivedOriginalFileName() {
+        FileMetadata fm = getFileMetadata();
+        String filename = fm.getLabel();
+        String originalExtension = FileUtil.generateOriginalExtension(getOriginalFileFormat());
+        String extensionToRemove = StringUtil.substringIncludingLast(filename, ".");
+        if (StringUtil.nonEmpty(extensionToRemove)) {
+            return filename.replaceAll(extensionToRemove + "$", originalExtension);
+        } else{
+            return filename + originalExtension ;
+        }        
+    }
 
     @Override
     public boolean isAncestorOf( DvObject other ) {
@@ -431,61 +579,61 @@ public void setDescription(String description) {
             fmd.setDescription(description);
         }
     }
+
+    public FileMetadata getDraftFileMetadata() {
+        FileMetadata latestFileMetadata = getLatestFileMetadata();
+        if (latestFileMetadata.getDatasetVersion().isDraft()) {
+            return latestFileMetadata;
+        }
+        return null;
+    }
     
     public FileMetadata getFileMetadata() {
         return getLatestFileMetadata();
     }
-    
+
     public FileMetadata getLatestFileMetadata() {
-        FileMetadata fmd = null;
+        FileMetadata resultFileMetadata = null;
 
-        // for newly added or harvested, just return the one fmd
         if (fileMetadatas.size() == 1) {
             return fileMetadatas.get(0);
         }
-        
+
         for (FileMetadata fileMetadata : fileMetadatas) {
-            // if it finds a draft, return it
             if (fileMetadata.getDatasetVersion().getVersionState().equals(VersionState.DRAFT)) {
                 return fileMetadata;
-            }            
-            
-            // otherwise return the one with the latest version number
-            // duplicate logic in getLatestPublishedFileMetadata()
-            if (fmd == null || fileMetadata.getDatasetVersion().getVersionNumber().compareTo( fmd.getDatasetVersion().getVersionNumber() ) > 0 ) {
-                fmd = fileMetadata;
-            } else if ((fileMetadata.getDatasetVersion().getVersionNumber().compareTo( fmd.getDatasetVersion().getVersionNumber())==0 )&& 
-                   ( fileMetadata.getDatasetVersion().getMinorVersionNumber().compareTo( fmd.getDatasetVersion().getMinorVersionNumber()) > 0 )   ) {
-                fmd = fileMetadata;
             }
+            resultFileMetadata = getTheNewerFileMetadata(resultFileMetadata, fileMetadata);
         }
-        return fmd;
+
+        return resultFileMetadata;
     }
-    
-//    //Returns null if no published version
+
     public FileMetadata getLatestPublishedFileMetadata() throws UnsupportedOperationException {
-        FileMetadata fmd = null;
-        
-        for (FileMetadata fileMetadata : fileMetadatas) {
-            // if it finds a draft, skip
-            if (fileMetadata.getDatasetVersion().getVersionState().equals(VersionState.DRAFT)) {
-                continue;
-            }            
-            
-            // otherwise return the one with the latest version number
-            // duplicate logic in getLatestFileMetadata()
-            if (fmd == null || fileMetadata.getDatasetVersion().getVersionNumber().compareTo( fmd.getDatasetVersion().getVersionNumber() ) > 0 ) {
-                fmd = fileMetadata;
-            } else if ((fileMetadata.getDatasetVersion().getVersionNumber().compareTo( fmd.getDatasetVersion().getVersionNumber())==0 )&& 
-                   ( fileMetadata.getDatasetVersion().getMinorVersionNumber().compareTo( fmd.getDatasetVersion().getMinorVersionNumber()) > 0 )   ) {
-                fmd = fileMetadata;
-            }
-        }
-        if(fmd == null) {
+        FileMetadata resultFileMetadata = fileMetadatas.stream()
+                .filter(metadata -> !metadata.getDatasetVersion().getVersionState().equals(VersionState.DRAFT))
+                .reduce(null, DataFile::getTheNewerFileMetadata);
+
+        if (resultFileMetadata == null) {
             throw new UnsupportedOperationException("No published metadata version for DataFile " + this.getId());
         }
-        
-        return fmd;
+
+        return resultFileMetadata;
+    }
+
+    public static FileMetadata getTheNewerFileMetadata(FileMetadata current, FileMetadata candidate) {
+        if (current == null) {
+            return candidate;
+        }
+
+        DatasetVersion currentVersion = current.getDatasetVersion();
+        DatasetVersion candidateVersion = candidate.getDatasetVersion();
+
+        if (DatasetVersion.compareByVersion.compare(candidateVersion, currentVersion) > 0) {
+            return candidate;
+        }
+
+        return current;
     }
 
     /**
@@ -496,7 +644,7 @@ public long getFilesize() {
         if (this.filesize == null) {
             // -1 means "unknown"
             return -1;
-        } 
+        }
         return this.filesize;
     }
 
@@ -520,9 +668,13 @@ public void setFilesize(long filesize) {
      * @return 
      */
     public String getFriendlySize() {
-        return FileSizeChecker.bytesToHumanReadable(filesize);
+        if (filesize != null) {
+            return FileSizeChecker.bytesToHumanReadable(filesize);
+        } else {
+            return BundleUtil.getStringFromBundle("file.sizeNotAvailable");
+        }
     }
-
+    
     public boolean isRestricted() {
         return restricted;
     }
@@ -633,21 +785,7 @@ public Dataset getThumbnailForDataset() {
     public void setAsThumbnailForDataset(Dataset dataset) {
         thumbnailForDataset = dataset;
     }
-    
-    /**
-     * URL to use with the WorldMapRelatedData API
-     * Used within dataset.xhtml
-     * 
-     * @param dataverseUserID
-     * @return URL for "Map It" functionality
-     */
-    public String getMapItURL(Long dataverseUserID){
-        if (dataverseUserID==null){
-            return null;
-        }
-        return WorldMapRelatedData.getMapItURL(this.getId(), dataverseUserID);
-    }
-        
+
     /*
         8/10/2014 - Using the current "open access" url
     */
@@ -672,13 +810,6 @@ public String getUnf() {
         }
         return null; 
     }
-    
-
-    @ManyToMany
-    @JoinTable(name = "fileaccessrequests",
-    joinColumns = @JoinColumn(name = "datafile_id"),
-    inverseJoinColumns = @JoinColumn(name = "authenticated_user_id"))
-    private List<AuthenticatedUser> fileAccessRequesters;
 
     public List<AuthenticatedUser> getFileAccessRequesters() {
         return fileAccessRequesters;
@@ -687,14 +818,52 @@ public List<AuthenticatedUser> getFileAccessRequesters() {
     public void setFileAccessRequesters(List<AuthenticatedUser> fileAccessRequesters) {
         this.fileAccessRequesters = fileAccessRequesters;
     }
-    
-    public boolean isHarvested() {
-        
-        // (storageIdentifier is not nullable - so no need to check for null
-        // pointers below):
-        if (this.getStorageIdentifier().startsWith("http://") || this.getStorageIdentifier().startsWith("https://")) {
+
+
+    public void addFileAccessRequest(FileAccessRequest request) {
+        if (this.fileAccessRequests == null) {
+            this.fileAccessRequests = new ArrayList<>();
+        }
+
+        this.fileAccessRequests.add(request);
+    }
+
+    public FileAccessRequest getAccessRequestForAssignee(RoleAssignee roleAssignee) {
+        if (this.fileAccessRequests == null) {
+            return null;
+        }
+
+        return this.fileAccessRequests.stream()
+                .filter(fileAccessRequest -> fileAccessRequest.getRequester().equals(roleAssignee) && fileAccessRequest.isStateCreated()).findFirst()
+                .orElse(null);
+    }
+
+    public boolean removeFileAccessRequest(FileAccessRequest request) {
+        if (this.fileAccessRequests == null) {
+            return false;
+        }
+
+        if (request != null) {
+            this.fileAccessRequests.remove(request);
             return true;
         }
+
+        return false;
+    }
+
+    public boolean containsActiveFileAccessRequestFromUser(RoleAssignee roleAssignee) {
+        if (this.fileAccessRequests == null) {
+            return false;
+        }
+
+        Set<AuthenticatedUser> existingUsers = getFileAccessRequests(FileAccessRequest.RequestState.CREATED).stream()
+            .map(FileAccessRequest::getRequester)
+            .collect(Collectors.toSet());
+
+        return existingUsers.contains(roleAssignee);
+    }
+
+    public boolean isHarvested() {
         
         Dataset ownerDataset = this.getOwner();
         if (ownerDataset != null) {
@@ -751,6 +920,10 @@ public String getDisplayName() {
        return getLatestFileMetadata().getLabel(); 
     }
     
+    public String getDirectoryLabel() {
+       return getLatestFileMetadata().getDirectoryLabel();
+    }
+    
     @Override 
     public String getCurrentName(){
         return getLatestFileMetadata().getLabel();
@@ -758,8 +931,18 @@ public String getCurrentName(){
     
     @Override
     public int compareTo(Object o) {
+        /*
+         * The primary intent here is to provide ordering by displayName. However, the
+         * secondary comparison by id is needed to insure that two DataFiles with the
+         * same displayName aren't considered equal, e.g. in structures that require
+         * unique keys. See Issues #4287 and #6401.
+         */
         DataFile other = (DataFile) o;
-        return this.getDisplayName().toUpperCase().compareTo(other.getDisplayName().toUpperCase());
+        int comparison = this.getDisplayName().toUpperCase().compareTo(other.getDisplayName().toUpperCase());
+        if (comparison == 0) {
+            comparison = this.getId().compareTo(other.getId());
+        }
+        return comparison;
     }
     
     /**
@@ -841,8 +1024,6 @@ public String toJSON(){
     
     public JsonObject asGsonObject(boolean prettyPrint){
         
-        String overarchingKey = "data";
-        
         GsonBuilder builder;
         if (prettyPrint){  // Add pretty printing
             builder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setPrettyPrinting();
@@ -873,7 +1054,7 @@ public JsonObject asGsonObject(boolean prettyPrint){
         // https://github.com/IQSS/dataverse/issues/761, https://github.com/IQSS/dataverse/issues/2110, https://github.com/IQSS/dataverse/issues/3191
         //
         datasetMap.put("title", thisFileMetadata.getDatasetVersion().getTitle());
-        datasetMap.put("persistentId", getOwner().getGlobalIdString());
+        datasetMap.put("persistentId", getOwner().getGlobalId().asString());
         datasetMap.put("url", getOwner().getPersistentURL());
         datasetMap.put("version", thisFileMetadata.getDatasetVersion().getSemanticVersion());
         datasetMap.put("id", getOwner().getId());
@@ -951,9 +1132,44 @@ public String getCreateDateFormattedYYYYMMDD() {
         return null;
     }
     
+    @Override
+    public String getTargetUrl() {
+        return DataFile.TARGET_URL;
+    }
 
-} // end of class
-    
-
+    private boolean tagExists(String tagLabel) {
+        for (DataFileTag dataFileTag : dataFileTags) {
+            if (dataFileTag.getTypeLabel().equals(tagLabel)) {
+                return true;
+            }
+        }
+        return false;
+    }
     
-
+    public boolean isDeaccessioned() {
+        // return true, if all published versions were deaccessioned
+        boolean inDeaccessionedVersions = false;
+        for (FileMetadata fmd : getFileMetadatas()) {
+            DatasetVersion testDsv = fmd.getDatasetVersion();
+            if (testDsv.isReleased()) {
+                return false;
+            }
+            // Also check for draft version
+            if (testDsv.isDraft()) {
+                return false;
+            }
+            if (testDsv.isDeaccessioned()) {
+                inDeaccessionedVersions = true;
+            }
+        }
+        return inDeaccessionedVersions; // since any published version would have already returned
+    }
+    public boolean isInDatasetVersion(DatasetVersion version) {
+        for (FileMetadata fmd : getFileMetadatas()) {
+            if (fmd.getDatasetVersion().equals(version)) {
+                return true;
+            }
+        }
+        return false;
+    }
+} // end of class
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileCategory.java b/src/main/java/edu/harvard/iq/dataverse/DataFileCategory.java
index f569a69b13a..f5abe9ac78a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataFileCategory.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataFileCategory.java
@@ -10,16 +10,16 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileCategoryServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataFileCategoryServiceBean.java
new file mode 100644
index 00000000000..29dcb22c3ec
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/DataFileCategoryServiceBean.java
@@ -0,0 +1,87 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Service to manage the default values for Dataset file categories and allow
+ * to be overridden with a :FileCategories Settings configuration.
+ *
+ * @author adaybujeda
+ */
+@Stateless
+public class DataFileCategoryServiceBean {
+
+    public static final String FILE_CATEGORIES_KEY = ":FileCategories";
+
+    @EJB
+    private SettingsServiceBean settingsService;
+
+    public List<String> mergeDatasetFileCategories(List<DataFileCategory> datasetFileCategories) {
+        List<DataFileCategory> fileCategories = Optional.ofNullable(datasetFileCategories).orElse(Collections.emptyList());
+        List<String> defaultFileCategories = getFileCategories();
+
+        //avoid resizing
+        List<String> mergedFileCategories = new ArrayList<>(defaultFileCategories.size() + fileCategories.size());
+
+        for(DataFileCategory category: fileCategories) {
+            mergedFileCategories.add(category.getName());
+        }
+
+        for(String defaultCategory: defaultFileCategories) {
+            if (!mergedFileCategories.contains(defaultCategory)) {
+                mergedFileCategories.add(defaultCategory);
+            }
+        }
+
+        return mergedFileCategories;
+    }
+
+    public List<String> getFileCategories() {
+        List<String> fileCategoriesOverride = getFileCategoriesOverride();
+        return fileCategoriesOverride.isEmpty() ? getFileCategoriesDefault() : fileCategoriesOverride;
+    }
+
+    private List<String> getFileCategoriesDefault() {
+        // "Documentation", "Data" and "Code" are the 3 default categories that we
+        // present by default
+        return Arrays.asList(
+                BundleUtil.getStringFromBundle("dataset.category.documentation"),
+                BundleUtil.getStringFromBundle("dataset.category.data"),
+                BundleUtil.getStringFromBundle("dataset.category.code")
+        );
+    }
+
+    private List<String> getFileCategoriesOverride() {
+        String applicationLanguage = BundleUtil.getCurrentLocale().getLanguage();
+        Optional<String> fileCategoriesOverride = Optional.ofNullable(settingsService.get(FILE_CATEGORIES_KEY));
+
+        if (fileCategoriesOverride.isPresent()) {
+            // There is an override, check if there is language specific value
+            String overrideValue = settingsService.get(FILE_CATEGORIES_KEY, applicationLanguage, fileCategoriesOverride.get());
+
+            return parseCategoriesString(overrideValue);
+        }
+
+        return Collections.emptyList();
+    }
+
+    private List<String> parseCategoriesString(String categoriesString) {
+        if (categoriesString == null) {
+            return Collections.emptyList();
+        }
+
+        String[] categories = categoriesString.split(",");
+        return Arrays.stream(categories).map(item -> item.trim()).filter(item -> !item.isBlank()).collect(Collectors.toUnmodifiableList());
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileConverter.java b/src/main/java/edu/harvard/iq/dataverse/DataFileConverter.java
index feb4fa62651..701e826f12e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataFileConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataFileConverter.java
@@ -1,20 +1,21 @@
 package edu.harvard.iq.dataverse;
 
 import java.util.logging.Logger;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.inject.spi.CDI;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
 
 @FacesConverter("dataFileConverter")
 public class DataFileConverter implements Converter {
 
     private static final Logger logger = Logger.getLogger(DataFileConverter.class.getCanonicalName());
 
-    @EJB
-    DataFileServiceBean dataFileService;
+    //@EJB
+    DataFileServiceBean dataFileService = CDI.current().select(DataFileServiceBean.class).get();
 
     @Override
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java
index a35bfb0df15..937f5693511 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java
@@ -1,6 +1,6 @@
 package edu.harvard.iq.dataverse;
 
-import edu.harvard.iq.dataverse.authorization.AccessRequest;
+import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
@@ -9,6 +9,9 @@
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
 import edu.harvard.iq.dataverse.search.SolrSearchResult;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.storageuse.StorageQuota;
+import edu.harvard.iq.dataverse.storageuse.StorageUseServiceBean;
+import edu.harvard.iq.dataverse.storageuse.UploadSessionQuotaLimit;
 import edu.harvard.iq.dataverse.util.FileSortFieldAndOrder;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
@@ -27,23 +30,21 @@
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.StoredProcedureQuery;
-import javax.persistence.TypedQuery;
-import org.apache.commons.lang.RandomStringUtils;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
  * @author Leonid Andreev
  * 
- * Basic skeleton of the new DataFile service for DVN 4.0
- * 
  */
 
 @Stateless
@@ -62,6 +63,13 @@ public class DataFileServiceBean implements java.io.Serializable {
     
     @EJB 
     IngestServiceBean ingestService;
+
+    @EJB EmbargoServiceBean embargoService;
+    
+    @EJB SystemConfig systemConfig;
+    
+    @EJB
+    StorageUseServiceBean storageUseService; 
     
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
@@ -69,7 +77,7 @@ public class DataFileServiceBean implements java.io.Serializable {
     // Assorted useful mime types:
     
     // 3rd-party and/or proprietary tabular data formasts that we know
-    // how to ingest: 
+    // how to ingest:
     
     private static final String MIME_TYPE_STATA = "application/x-stata";
     private static final String MIME_TYPE_STATA13 = "application/x-stata-13";
@@ -150,10 +158,39 @@ public DataFile find(Object pk) {
         
     }*/
     
-    public DataFile findByGlobalId(String globalId) {
-            return (DataFile) dvObjectService.findByGlobalId(globalId, DataFile.DATAFILE_DTYPE_STRING);
+    public List<DataFile> findAll(List<Long> fileIds){
+        List<DataFile> dataFiles = new ArrayList<>();
+
+         for (Long fileId : fileIds){
+             dataFiles.add(find(fileId));
+         }
+
+        return dataFiles;
+    }
+
+    public List<DataFile> findAll(String fileIdsAsString){
+        ArrayList<Long> dataFileIds = new ArrayList<>();
+
+        String[] fileIds = fileIdsAsString.split(",");
+        for (String fId : fileIds){
+            dataFileIds.add(Long.parseLong(fId));
+        }
+
+        return findAll(dataFileIds);
     }
     
+    public DataFile findByGlobalId(String globalId) {
+            return (DataFile) dvObjectService.findByGlobalId(globalId, DvObject.DType.DataFile);
+    }
+
+    public List<DataFile> findByCreatorId(Long creatorId) {
+        return em.createNamedQuery("DataFile.findByCreatorId").setParameter("creatorId", creatorId).getResultList();
+    }
+
+    public List<DataFile> findByReleaseUserId(Long releaseUserId) {
+        return em.createNamedQuery("DataFile.findByReleaseUserId").setParameter("releaseUserId", releaseUserId).getResultList();
+    }
+
     public DataFile findReplacementFile(Long previousFileId){
         Query query = em.createQuery("select object(o) from DataFile as o where o.previousDataFileId = :previousFileId");
         query.setParameter("previousFileId", previousFileId);
@@ -187,6 +224,18 @@ public List<DataFile> findByDatasetId(Long studyId) {
                 .setParameter("studyId", studyId).getResultList();
     }
     
+    /**
+     * 
+     * @param collectionId numeric id of the parent collection ("dataverse")
+     * @return list of files in the datasets that are *direct* children of the collection specified
+     * (i.e., no datafiles in sub-collections of this collection will be included)
+     */
+    public List<DataFile> findByDirectCollectionOwner(Long collectionId) {
+        String queryString = "select f from DataFile f, Dataset d where f.owner.id = d.id and d.owner.id = :collectionId order by f.id";
+        return em.createQuery(queryString, DataFile.class)
+                .setParameter("collectionId", collectionId).getResultList();
+    }
+    
     public List<DataFile> findAllRelatedByRootDatafileId(Long datafileId) {
         /* 
          Get all files with the same root datafile id
@@ -335,9 +384,22 @@ public FileMetadata findMostRecentVersionFileIsIn(DataFile file) {
         if (fileMetadatas == null || fileMetadatas.isEmpty()) {
             return null;
         } else {
-            return fileMetadatas.get(0);
+            // This assumes the order of filemetadatas is from first to most recent, which is true as of v6.3 
+            return fileMetadatas.get(fileMetadatas.size() - 1);
         }
     }
+    
+    public List<DataFile> findAllCheapAndEasy(String fileIdsAsString){ 
+        //assumption is that the fileIds are separated by ','
+        ArrayList <DataFile> dataFilesFound = new ArrayList<>();
+        String[] fileIds = fileIdsAsString.split(",");
+        DataFile df = this.findCheapAndEasy(Long.parseLong(fileIds[0]));
+        if(df != null){
+            dataFilesFound.add(df);
+        }
+
+        return dataFilesFound;
+    }
 
     public DataFile findCheapAndEasy(Long id) {
         DataFile dataFile;
@@ -345,7 +407,7 @@ public DataFile findCheapAndEasy(Long id) {
         Object[] result;
 
         try {
-            result = (Object[]) em.createNativeQuery("SELECT t0.ID, t0.CREATEDATE, t0.INDEXTIME, t0.MODIFICATIONTIME, t0.PERMISSIONINDEXTIME, t0.PERMISSIONMODIFICATIONTIME, t0.PUBLICATIONDATE, t0.CREATOR_ID, t0.RELEASEUSER_ID, t0.PREVIEWIMAGEAVAILABLE, t1.CONTENTTYPE, t0.STORAGEIDENTIFIER, t1.FILESIZE, t1.INGESTSTATUS, t1.CHECKSUMVALUE, t1.RESTRICTED, t3.ID, t2.AUTHORITY, t2.IDENTIFIER, t1.CHECKSUMTYPE, t1.PREVIOUSDATAFILEID, t1.ROOTDATAFILEID, t0.AUTHORITY, T0.PROTOCOL, T0.IDENTIFIER FROM DVOBJECT t0, DATAFILE t1, DVOBJECT t2, DATASET t3 WHERE ((t0.ID = " + id + ") AND (t0.OWNER_ID = t2.ID) AND (t2.ID = t3.ID) AND (t1.ID = t0.ID))").getSingleResult();
+            result = (Object[]) em.createNativeQuery("SELECT t0.ID, t0.CREATEDATE, t0.INDEXTIME, t0.MODIFICATIONTIME, t0.PERMISSIONINDEXTIME, t0.PERMISSIONMODIFICATIONTIME, t0.PUBLICATIONDATE, t0.CREATOR_ID, t0.RELEASEUSER_ID, t0.PREVIEWIMAGEAVAILABLE, t1.CONTENTTYPE, t0.STORAGEIDENTIFIER, t1.FILESIZE, t1.INGESTSTATUS, t1.CHECKSUMVALUE, t1.RESTRICTED, t3.ID, t2.AUTHORITY, t2.IDENTIFIER, t1.CHECKSUMTYPE, t1.PREVIOUSDATAFILEID, t1.ROOTDATAFILEID, t0.AUTHORITY, T0.PROTOCOL, T0.IDENTIFIER, t2.PROTOCOL FROM DVOBJECT t0, DATAFILE t1, DVOBJECT t2, DATASET t3 WHERE ((t0.ID = " + id + ") AND (t0.OWNER_ID = t2.ID) AND (t2.ID = t3.ID) AND (t1.ID = t0.ID))").getSingleResult();
         } catch (Exception ex) {
             return null;
         }
@@ -489,13 +551,15 @@ public DataFile findCheapAndEasy(Long id) {
         if (identifier != null) {
             dataFile.setIdentifier(identifier);
         }
-                
+        
+        owner.setProtocol((String) result[25]);
+        
         dataFile.setOwner(owner);
 
         // If content type indicates it's tabular data, spend 2 extra queries 
         // looking up the data table and tabular tags objects:
         
-        if (MIME_TYPE_TSV.equalsIgnoreCase(contentType)) {
+        if (MIME_TYPE_TSV.equalsIgnoreCase(contentType) || MIME_TYPE_TSV_ALT.equalsIgnoreCase(contentType)) {
             Object[] dtResult;
             try {
                 dtResult = (Object[]) em.createNativeQuery("SELECT ID, UNF, CASEQUANTITY, VARQUANTITY, ORIGINALFILEFORMAT, ORIGINALFILESIZE FROM dataTable WHERE DATAFILE_ID = " + id).getSingleResult();
@@ -547,261 +611,24 @@ public DataFile findCheapAndEasy(Long id) {
         
         return dataFile;
     }
-    /* 
-     * This is an experimental method for populating the versions of 
-     * the datafile with the filemetadatas, optimized for making as few db 
-     * queries as possible. 
-     * It should only be used to retrieve filemetadata for the DatasetPage!
-     * It is not guaranteed to adequately perform anywhere else. 
-    */
-    public void findFileMetadataOptimizedExperimental(Dataset owner) {
-        findFileMetadataOptimizedExperimental(owner, null);
-    }
-    public void findFileMetadataOptimizedExperimental(Dataset owner, DatasetVersion requestedVersion) {
-        List<DataFile> dataFiles = new ArrayList<>();
-        List<DataTable> dataTables = new ArrayList<>();
-        //List<FileMetadata> retList = new ArrayList<>(); 
-        
-        // TODO: 
-        //  replace these maps with simple lists and run binary search on them. -- 4.2.1
-        
-        Map<Long, AuthenticatedUser> userMap = new HashMap<>(); 
-        Map<Long, Integer> filesMap = new HashMap<>();
-        Map<Long, Integer> datatableMap = new HashMap<>();
-        Map<Long, Integer> categoryMap = new HashMap<>();
-        Map<Long, Set<Integer>> fileTagMap = new HashMap<>();
-        
-        List<String> fileTagLabels = DataFileTag.listTags();
-        
-        
-        int i = 0; 
-        
-        List<Object[]> dataTableResults = em.createNativeQuery("SELECT t0.ID, t0.DATAFILE_ID, t0.UNF, t0.CASEQUANTITY, t0.VARQUANTITY, t0.ORIGINALFILEFORMAT, t0.ORIGINALFILESIZE FROM dataTable t0, dataFile t1, dvObject t2 WHERE ((t0.DATAFILE_ID = t1.ID) AND (t1.ID = t2.ID) AND (t2.OWNER_ID = " + owner.getId() + ")) ORDER BY t0.ID").getResultList();
-        
-        for (Object[] result : dataTableResults) {
-            DataTable dataTable = new DataTable(); 
-            long fileId = ((Number) result[1]).longValue();
-
-            dataTable.setId(((Number) result[1]).longValue());
-            
-            dataTable.setUnf((String)result[2]);
-            
-            dataTable.setCaseQuantity((Long)result[3]);
-            
-            dataTable.setVarQuantity((Long)result[4]);
-            
-            dataTable.setOriginalFileFormat((String)result[5]);
-            
-            dataTable.setOriginalFileSize((Long)result[6]);
-            
-            dataTables.add(dataTable);
-            datatableMap.put(fileId, i++);
-            
-        }
-        
-        logger.fine("Retrieved "+dataTables.size()+" DataTable objects.");
-        
-        i = 0; 
-        List<Object[]> dataTagsResults = em.createNativeQuery("SELECT t0.DATAFILE_ID, t0.TYPE FROM DataFileTag t0, dvObject t1 WHERE (t1.ID = t0.DATAFILE_ID) AND (t1.OWNER_ID="+ owner.getId() + ")").getResultList();
-        for (Object[] result : dataTagsResults) {
-            Long datafile_id = (Long) result[0];
-            Integer tagtype_id = (Integer) result[1];
-            if (fileTagMap.get(datafile_id) == null) {
-                fileTagMap.put(datafile_id, new HashSet<>());
-            }
-            fileTagMap.get(datafile_id).add(tagtype_id);
-            i++; 
-        }
-        dataTagsResults = null;
-        
-        logger.fine("Retrieved "+i+" data tags.");
-        
-        i = 0; 
-        
-        List<Object[]> fileResults = em.createNativeQuery("SELECT t0.ID, t0.CREATEDATE, t0.INDEXTIME, t0.MODIFICATIONTIME, t0.PERMISSIONINDEXTIME, t0.PERMISSIONMODIFICATIONTIME, t0.PUBLICATIONDATE, t0.CREATOR_ID, t0.RELEASEUSER_ID, t1.CONTENTTYPE, t0.STORAGEIDENTIFIER, t1.FILESIZE, t1.INGESTSTATUS, t1.CHECKSUMVALUE, t1.RESTRICTED, t1.CHECKSUMTYPE, t1.PREVIOUSDATAFILEID, t1.ROOTDATAFILEID, t0.PROTOCOL, t0.AUTHORITY, t0.IDENTIFIER FROM DVOBJECT t0, DATAFILE t1 WHERE ((t0.OWNER_ID = " + owner.getId() + ") AND ((t1.ID = t0.ID) AND (t0.DTYPE = 'DataFile'))) ORDER BY t0.ID").getResultList(); 
-    
-        for (Object[] result : fileResults) {
-            Integer file_id = (Integer) result[0];
-            
-            DataFile dataFile = new DataFile();
-            dataFile.setMergeable(false);
-            
-            dataFile.setId(file_id.longValue());
-            
-            Timestamp createDate = (Timestamp) result[1];
-            Timestamp indexTime = (Timestamp) result[2];
-            Timestamp modificationTime = (Timestamp) result[3];
-            Timestamp permissionIndexTime = (Timestamp) result[4];
-            Timestamp permissionModificationTime = (Timestamp) result[5];
-            Timestamp publicationDate = (Timestamp) result[6];
-            
-            dataFile.setCreateDate(createDate);
-            dataFile.setIndexTime(indexTime);
-            dataFile.setModificationTime(modificationTime);
-            dataFile.setPermissionIndexTime(permissionIndexTime);
-            dataFile.setPermissionModificationTime(permissionModificationTime);
-            dataFile.setPublicationDate(publicationDate);
-            
-            Long creatorId = (Long) result[7]; 
-            if (creatorId != null) {
-                AuthenticatedUser creator = userMap.get(creatorId);
-                if (creator == null) {
-                    creator = userService.find(creatorId);
-                    if (creator != null) {
-                        userMap.put(creatorId, creator);
-                    }
-                }
-                if (creator != null) {
-                    dataFile.setCreator(creator);
-                }
-            }
-            
-            dataFile.setOwner(owner);
-            
-            Long releaseUserId = (Long) result[8]; 
-            if (releaseUserId != null) {
-                AuthenticatedUser releaseUser = userMap.get(releaseUserId);
-                if (releaseUser == null) {
-                    releaseUser = userService.find(releaseUserId);
-                    if (releaseUser != null) {
-                        userMap.put(releaseUserId, releaseUser);
-                    }
-                }
-                if (releaseUser != null) {
-                    dataFile.setReleaseUser(releaseUser);
-                }
-            }
-            
-            String contentType = (String) result[9]; 
-            
-            if (contentType != null) {
-                dataFile.setContentType(contentType);
-            }
-            
-            String storageIdentifier = (String) result[10];
-            
-            if (storageIdentifier != null) {
-                dataFile.setStorageIdentifier(storageIdentifier);
-            }
-            
-            Long fileSize = (Long) result[11];
-            
-            if (fileSize != null) {
-                dataFile.setFilesize(fileSize);
-            }
-            
-            if (result[12] != null) {
-                String ingestStatusString = (String) result[12];
-                dataFile.setIngestStatus(ingestStatusString.charAt(0));
-            }
-            
-            String md5 = (String) result[13]; 
-            
-            if (md5 != null) {
-                dataFile.setChecksumValue(md5);
-            }
-            
-            Boolean restricted = (Boolean) result[14];
-            if (restricted != null) {
-                dataFile.setRestricted(restricted);
-            }
-
-            String checksumType = (String) result[15];
-            if (checksumType != null) {
-                try {
-                    // In the database we store "SHA1" rather than "SHA-1".
-                    DataFile.ChecksumType typeFromStringInDatabase = DataFile.ChecksumType.valueOf(checksumType);
-                    dataFile.setChecksumType(typeFromStringInDatabase);
-                } catch (IllegalArgumentException ex) {
-                    logger.info("Exception trying to convert " + checksumType + " to enum: " + ex);
-                }
-            }
-
-            Long previousDataFileId = (Long) result[16];
-            if (previousDataFileId != null) {
-                dataFile.setPreviousDataFileId(previousDataFileId);
-            }
-            
-            Long rootDataFileId = (Long) result[17];
-            if (rootDataFileId != null) {
-                dataFile.setRootDataFileId(rootDataFileId);
-            }
-            
-            String protocol = (String) result[18];
-            if (protocol != null) {
-                dataFile.setProtocol(protocol);
-            }
-            
-            String authority = (String) result[19];
-            if (authority != null) {
-                dataFile.setAuthority(authority);
-            }
-            
-            String identifier = (String) result[20];
-            if (identifier != null) {
-                dataFile.setIdentifier(identifier);
-            }
-            
-            // TODO: 
-            // - if ingest status is "bad", look up the ingest report; 
-            // - is it a dedicated thumbnail for the dataset? (do we ever need that info?? - not on the dataset page, I don't think...)
-            
-            // Is this a tabular file? 
-            
-            if (datatableMap.get(dataFile.getId()) != null) {
-                dataTables.get(datatableMap.get(dataFile.getId())).setDataFile(dataFile);
-                dataFile.setDataTable(dataTables.get(datatableMap.get(dataFile.getId())));
-                
-            }            
-
-            if (fileTagMap.get(dataFile.getId()) != null) {
-                for (Integer tag_id : fileTagMap.get(dataFile.getId())) {
-                    DataFileTag tag = new DataFileTag();
-                    tag.setTypeByLabel(fileTagLabels.get(tag_id));
-                    tag.setDataFile(dataFile);
-                    dataFile.addTag(tag);
-                }
-            }            
-            dataFile.setFileAccessRequesters(retrieveFileAccessRequesters(dataFile));              
-            dataFiles.add(dataFile);
-            filesMap.put(dataFile.getId(), i++);
-        }
-        fileResults = null;
-        
-        logger.fine("Retrieved and cached "+i+" datafiles.");
-
-        i = 0; 
-        for (DataFileCategory fileCategory : owner.getCategories()) {
-            //logger.fine("category: id="+fileCategory.getId());
-            categoryMap.put(fileCategory.getId(), i++);
-        }
-        
-        logger.fine("Retrieved "+i+" file categories attached to the dataset.");
-        
-        if (requestedVersion != null) {
-            requestedVersion.setFileMetadatas(retrieveFileMetadataForVersion(owner, requestedVersion, dataFiles, filesMap, categoryMap));
-        } else {
-            for (DatasetVersion version : owner.getVersions()) {
-                version.setFileMetadatas(retrieveFileMetadataForVersion(owner, version, dataFiles, filesMap, categoryMap));
-                logger.fine("Retrieved "+version.getFileMetadatas().size()+" filemetadatas for the version "+version.getId());
-            }
-        }
-        owner.setFiles(dataFiles);
-    }
     
-     private List<AuthenticatedUser> retrieveFileAccessRequesters(DataFile fileIn){
+    private List<AuthenticatedUser> retrieveFileAccessRequesters(DataFile fileIn) {
         List<AuthenticatedUser> retList = new ArrayList<>();
-        
-        List<Object> requesters  = em.createNativeQuery("select authenticated_user_id from fileaccessrequests where datafile_id = "+fileIn.getId()).getResultList();
-        
-        for (Object userIdObj : requesters){
-            Long userId = (Long) userIdObj;
+
+        // List<Object> requesters = em.createNativeQuery("select authenticated_user_id
+        // from fileaccessrequests where datafile_id =
+        // "+fileIn.getId()).getResultList();
+        TypedQuery<Long> typedQuery = em.createQuery("select f.user.id from FileAccessRequest f where f.dataFile.id = :file_id and f.requestState= :requestState", Long.class);
+        typedQuery.setParameter("file_id", fileIn.getId());
+        typedQuery.setParameter("requestState", FileAccessRequest.RequestState.CREATED);
+        List<Long> requesters = typedQuery.getResultList();
+        for (Long userId : requesters) {
             AuthenticatedUser user = userService.find(userId);
-            if (user != null){
+            if (user != null) {
                 retList.add(user);
             }
         }
-        
+
         return retList;
     }
     
@@ -854,8 +681,10 @@ private List<FileMetadata> retrieveFileMetadataForVersion(Dataset dataset, Datas
 
             fileMetadata.setDatasetVersion(version);
             
-            //fileMetadata.setDataFile(dataset.getFiles().get(file_list_id));
+            // Link the FileMetadata object to the DataFile:
             fileMetadata.setDataFile(dataFiles.get(file_list_id));
+            // ... and the DataFile back to the FileMetadata:
+            fileMetadata.getDataFile().getFileMetadatas().add(fileMetadata);
             
             String description = (String) result[2]; 
             
@@ -932,6 +761,13 @@ public List<DataFile> findAll() {
         return em.createQuery("select object(o) from DataFile as o order by o.id", DataFile.class).getResultList();
     }
     
+    public List<VersionState> findVersionStates(Long fileId) {
+        Query query = em.createQuery(
+                "select distinct dv.versionState from DatasetVersion dv where dv.id in (select fm.datasetVersion.id from FileMetadata fm where fm.dataFile.id=:fileId)");
+        query.setParameter("fileId", fileId);
+        return query.getResultList();
+    }
+    
     public DataFile save(DataFile dataFile) {
 
         if (dataFile.isMergeable()) {   
@@ -942,6 +778,17 @@ public DataFile save(DataFile dataFile) {
         } 
     }
     
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public DataFile saveInTransaction(DataFile dataFile) {
+
+        if (dataFile.isMergeable()) {   
+            DataFile savedDataFile = em.merge(dataFile);
+            return savedDataFile;
+        } else {
+            throw new IllegalArgumentException("This DataFile object has been set to NOT MERGEABLE; please ensure a MERGEABLE object is passed to the save method.");
+        } 
+    }
+    
     private void msg(String m){
         System.out.println(m);
     }
@@ -1098,7 +945,7 @@ public boolean isThumbnailAvailable (DataFile file) {
         }
         
         // If thumbnails are not even supported for this class of files, 
-        // there's notthing to talk about:      
+        // there's nothing to talk about:      
         if (!FileUtil.isThumbnailSupported(file)) {
             return false;
         }
@@ -1113,16 +960,17 @@ public boolean isThumbnailAvailable (DataFile file) {
          is more important... 
         
         */
-                
         
-       if (ImageThumbConverter.isThumbnailAvailable(file)) {
-           file = this.find(file.getId());
-           file.setPreviewImageAvailable(true);
-           this.save(file); 
-           return true;
-       }
-
-       return false;
+        file = this.find(file.getId());
+        if (ImageThumbConverter.isThumbnailAvailable(file)) {
+            file.setPreviewImageAvailable(true);
+            this.save(file);
+            return true;
+        }
+        file.setPreviewImageFail(true);
+        file.setPreviewImageAvailable(false);
+        this.save(file);
+        return false;
     }
 
     
@@ -1346,55 +1194,6 @@ public boolean isFileClassPackage (DataFile file) {
     public void populateFileSearchCard(SolrSearchResult solrSearchResult) {
         solrSearchResult.setEntity(this.findCheapAndEasy(solrSearchResult.getEntityId()));
     }
-        
-    
-    /**
-     * Does this file have a replacement.  
-     * Any file should have AT MOST 1 replacement
-     * 
-     * @param df
-     * @return 
-     * @throws java.lang.Exception if a DataFile has more than 1 replacement
-     *         or is unpublished and has a replacement.
-     */
-    public boolean hasReplacement(DataFile df) throws Exception{
-        
-        if (df.getId() == null){
-            // An unsaved file cannot have a replacment
-            return false;
-        }
-       
-        
-        List<DataFile> dataFiles = em.createQuery("select o from DataFile o" +
-                    " WHERE o.previousDataFileId = :dataFileId", DataFile.class)
-                    .setParameter("dataFileId", df.getId())
-                    .getResultList();
-        
-        if (dataFiles.isEmpty()){
-            return false;
-        }
-        
-         if (!df.isReleased()){
-            // An unpublished SHOULD NOT have a replacment
-            String errMsg = "DataFile with id: [" + df.getId() + "] is UNPUBLISHED with a REPLACEMENT.  This should NOT happen.";
-            logger.severe(errMsg);
-            
-            throw new Exception(errMsg);
-        }
-
-        
-        
-        else if (dataFiles.size() == 1){
-            return true;
-        }else{
-        
-            String errMsg = "DataFile with id: [" + df.getId() + "] has more than one replacment!";
-            logger.severe(errMsg);
-
-            throw new Exception(errMsg);
-        }
-        
-    }
     
     public boolean hasBeenDeleted(DataFile df){
         Dataset dataset = df.getOwner();
@@ -1448,124 +1247,18 @@ public List<Long> selectFilesWithMissingOriginalSizes() {
         }
     }
     
-    public String generateDataFileIdentifier(DataFile datafile, GlobalIdServiceBean idServiceBean) {
-        String doiIdentifierType = settingsService.getValueForKey(SettingsServiceBean.Key.IdentifierGenerationStyle, "randomString");
-        String doiDataFileFormat = settingsService.getValueForKey(SettingsServiceBean.Key.DataFilePIDFormat, "DEPENDENT");
 
-        String prepend = "";
-        if (doiDataFileFormat.equals(SystemConfig.DataFilePIDFormat.DEPENDENT.toString())){
-            //If format is dependent then pre-pend the dataset identifier 
-            prepend = datafile.getOwner().getIdentifier() + "/";
-        } else {
-            //If there's a shoulder prepend independent identifiers with it
-        	prepend = settingsService.getValueForKey(SettingsServiceBean.Key.Shoulder, "");
-        }
- 
-        switch (doiIdentifierType) {
-            case "randomString":               
-                return generateIdentifierAsRandomString(datafile, idServiceBean, prepend);
-            case "sequentialNumber":
-                if (doiDataFileFormat.equals(SystemConfig.DataFilePIDFormat.INDEPENDENT.toString())){ 
-                    return generateIdentifierAsIndependentSequentialNumber(datafile, idServiceBean, prepend);
-                } else {
-                    return generateIdentifierAsDependentSequentialNumber(datafile, idServiceBean, prepend);
-                }
-            default:
-                /* Should we throw an exception instead?? -- L.A. 4.6.2 */
-                return generateIdentifierAsRandomString(datafile, idServiceBean, prepend);
-        }
-    }
-    
-    private String generateIdentifierAsRandomString(DataFile datafile, GlobalIdServiceBean idServiceBean, String prepend) {
-        String identifier = null;
-        do {
-            identifier = prepend + RandomStringUtils.randomAlphanumeric(6).toUpperCase();  
-        } while (!isGlobalIdUnique(identifier, datafile, idServiceBean));
-
-        return identifier;
-    }
-
-
-    private String generateIdentifierAsIndependentSequentialNumber(DataFile datafile, GlobalIdServiceBean idServiceBean, String prepend) {
-        String identifier; 
-        do {
-            StoredProcedureQuery query = this.em.createNamedStoredProcedureQuery("Dataset.generateIdentifierAsSequentialNumber");
-            query.execute();
-            Integer identifierNumeric = (Integer) query.getOutputParameterValue(1); 
-            // some diagnostics here maybe - is it possible to determine that it's failing 
-            // because the stored procedure hasn't been created in the database?
-            if (identifierNumeric == null) {
-                return null; 
-            }
-            identifier = prepend + identifierNumeric.toString();
-        } while (!isGlobalIdUnique(identifier, datafile, idServiceBean));
-        
-        return identifier;
-    }
-    
-    private String generateIdentifierAsDependentSequentialNumber(DataFile datafile, GlobalIdServiceBean idServiceBean, String prepend) {
-        String identifier;
-        Long retVal;
-
-        retVal = new Long(0);
-
-        do {
-            retVal++;
-            identifier = prepend + retVal.toString();
-
-        } while (!isGlobalIdUnique(identifier, datafile, idServiceBean));
-
-        return identifier;
-    }
-
-    /**
-     * Check that a identifier entered by the user is unique (not currently used
-     * for any other study in this Dataverse Network). Also check for duplicate
-     * in the remote PID service if needed
-     * @param userIdentifier
-     * @param datafile
-     * @param idServiceBean
-     * @return  {@code true} iff the global identifier is unique.
-     */
-    public boolean isGlobalIdUnique(String userIdentifier, DataFile datafile, GlobalIdServiceBean idServiceBean) {
-        String testProtocol = "";
-        String testAuthority = "";
-        if (datafile.getAuthority() != null){
-            testAuthority = datafile.getAuthority();
-        } else {
-            testAuthority = settingsService.getValueForKey(SettingsServiceBean.Key.Authority);
-        }
-        if (datafile.getProtocol() != null){
-            testProtocol = datafile.getProtocol();
-        } else {
-            testProtocol = settingsService.getValueForKey(SettingsServiceBean.Key.Protocol);
-        }
-        
-        boolean u = em.createNamedQuery("DvObject.findByProtocolIdentifierAuthority")
-            .setParameter("protocol", testProtocol)
-            .setParameter("authority", testAuthority)
-            .setParameter("identifier",userIdentifier)
-            .getResultList().isEmpty();
-            
-        try{
-            if (idServiceBean.alreadyExists(new GlobalId(testProtocol, testAuthority, userIdentifier))) {
-                u = false;
-            }
-        } catch (Exception e){
-            //we can live with failure - means identifier not found remotely
-        }
-
-       
-        return u;
-    }
-    
     public void finalizeFileDelete(Long dataFileId, String storageLocation) throws IOException {
         // Verify that the DataFile no longer exists: 
         if (find(dataFileId) != null) {
             throw new IOException("Attempted to permanently delete a physical file still associated with an existing DvObject "
                     + "(id: " + dataFileId + ", location: " + storageLocation);
         }
-        StorageIO directStorageAccess = DataAccess.getDirectStorageIO(storageLocation);
+        if(storageLocation == null || storageLocation.isBlank()) {
+            throw new IOException("Attempted to delete a physical file with no location "
+                    + "(id: " + dataFileId + ", location: " + storageLocation);
+        }
+        StorageIO<DvObject> directStorageAccess = DataAccess.getDirectStorageIO(storageLocation);
         directStorageAccess.delete();
     }
     
@@ -1665,4 +1358,62 @@ public boolean isFoldersMetadataPresentInVersion(DatasetVersion datasetVersion)
             return false;
         }
     }
+    
+    public boolean isActivelyEmbargoed(FileMetadata fm) {
+        return FileUtil.isActivelyEmbargoed(fm);
+    }
+
+    public Embargo findEmbargo(Long id) {
+        DataFile d = find(id);
+        return d.getEmbargo();
+    }
+
+    public boolean isRetentionExpired(FileMetadata fm) {
+        return FileUtil.isRetentionExpired(fm);
+    }
+    /**
+     * Checks if the supplied DvObjectContainer (Dataset or Collection; although
+     * only collection-level storage quotas are officially supported as of now)
+     * has a quota configured, and if not, keeps checking if any of the direct
+     * ancestor Collections further up have a configured quota. If it finds one, 
+     * it will retrieve the current total content size for that specific ancestor 
+     * dvObjectContainer and use it to define the quota limit for the upload
+     * session in progress. 
+     * 
+     * @param parent - DvObjectContainer, Dataset or Collection
+     * @return upload session size limit spec, or null if quota not defined on 
+     * any of the ancestor DvObjectContainers
+     */
+    public UploadSessionQuotaLimit getUploadSessionQuotaLimit(DvObjectContainer parent) {
+        DvObjectContainer testDvContainer = parent; 
+        StorageQuota quota = testDvContainer.getStorageQuota();
+        while (quota == null && testDvContainer.getOwner() != null) {
+            testDvContainer = testDvContainer.getOwner();
+            quota = testDvContainer.getStorageQuota();
+            if (quota != null) {
+                break;
+            }
+        }    
+        if (quota == null || quota.getAllocation() == null) {
+            return null; 
+        }
+        
+        // Note that we are checking the recorded storage use not on the 
+        // immediate parent necessarily, but on the specific ancestor 
+        // DvObjectContainer on which the storage quota is defined:
+        Long currentSize = storageUseService.findStorageSizeByDvContainerId(testDvContainer.getId()); 
+        
+        return new UploadSessionQuotaLimit(quota.getAllocation(), currentSize);
+    }
+
+    public boolean isInReleasedVersion(Long id) {
+        Query query = em.createNativeQuery("SELECT fm.id FROM filemetadata fm WHERE fm.datasetversion_id=(SELECT dv.id FROM datasetversion dv, dvobject dvo WHERE dv.dataset_id=dvo.owner_id AND dv.versionState='RELEASED' and dvo.id=" + id + " ORDER BY dv.versionNumber DESC, dv.minorVersionNumber DESC LIMIT 1) AND fm.datafile_id=" + id);
+        
+        try {
+            query.getSingleResult();
+            return true;
+        } catch (Exception ex) {
+            return false;
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileTag.java b/src/main/java/edu/harvard/iq/dataverse/DataFileTag.java
index 02d3da128f1..351c4032939 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataFileTag.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataFileTag.java
@@ -11,16 +11,16 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import org.apache.commons.lang.StringUtils;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -58,7 +58,7 @@ public enum TagType {Survey, TimeSeries, Panel, Event, Genomics, Network, Geospa
     
     private static final Map<TagType, String> TagTypeToLabels = new HashMap<>();
     
-    private static final Map<String, TagType> TagLabelToTypes = new HashMap<>();
+    public static final Map<String, TagType> TagLabelToTypes = new HashMap<>();
     
     
     static {
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataTable.java b/src/main/java/edu/harvard/iq/dataverse/DataTable.java
index 60562caa6df..95f3aed0f40 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataTable.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataTable.java
@@ -7,26 +7,23 @@
 package edu.harvard.iq.dataverse;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.validation.constraints.Size;
-import javax.persistence.OrderBy;
-import org.hibernate.validator.constraints.NotBlank;
-import org.hibernate.validator.constraints.URL;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.validation.constraints.Size;
+import jakarta.persistence.OrderBy;
 
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import java.util.Objects;
-import javax.persistence.Column;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Index;
+import jakarta.persistence.Table;
 
 /**
  *
@@ -109,6 +106,22 @@ public DataTable() {
     
     private Long originalFileSize; 
     
+    /**
+     * originalFileName: the file name upon upload/ingest
+     */
+    @Column( nullable = true )
+    private String originalFileName;
+    
+    
+    /**
+     * The physical tab-delimited file is in storage with the list of variable
+     * names saved as the 1st line. This means that we do not need to generate 
+     * this line on the fly. (Also means that direct download mechanism can be
+     * used for this file!)
+     */
+    @Column(nullable = false)
+    private boolean storedWithVariableHeader = false;  
+    
     /*
      * Getter and Setter methods:
      */
@@ -194,6 +207,22 @@ public String getOriginalFormatVersion() {
     public void setOriginalFormatVersion(String originalFormatVersion) {
         this.originalFormatVersion = originalFormatVersion;
     }
+       
+    public String getOriginalFileName() {
+        return originalFileName;
+    }
+
+    public void setOriginalFileName(String originalFileName) {
+        this.originalFileName = originalFileName;
+    }
+    
+    public boolean isStoredWithVariableHeader() {
+        return storedWithVariableHeader;
+    }
+    
+    public void setStoredWithVariableHeader(boolean storedWithVariableHeader) {
+        this.storedWithVariableHeader = storedWithVariableHeader;
+    }
     
     /* 
      * Custom overrides for hashCode(), equals() and toString() methods:
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataTagsAPITestingBean.java b/src/main/java/edu/harvard/iq/dataverse/DataTagsAPITestingBean.java
index 121a1bd79d6..713c86190fc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataTagsAPITestingBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataTagsAPITestingBean.java
@@ -5,11 +5,11 @@
 import java.io.Serializable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.bean.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import javax.json.JsonObject;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
+import jakarta.json.JsonObject;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataTagsContainer.java b/src/main/java/edu/harvard/iq/dataverse/DataTagsContainer.java
index 5cf9c623bde..eeda70c1f17 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataTagsContainer.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataTagsContainer.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse;
 
-import javax.ejb.Stateless;
-import javax.json.JsonObject;
+import jakarta.ejb.Stateless;
+import jakarta.json.JsonObject;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataset.java b/src/main/java/edu/harvard/iq/dataverse/Dataset.java
index 659eecdec18..e7e5903482c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataset.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataset.java
@@ -1,12 +1,16 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
 import edu.harvard.iq.dataverse.dataset.DatasetUtil;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
+import edu.harvard.iq.dataverse.license.License;
 import edu.harvard.iq.dataverse.makedatacount.DatasetExternalCitations;
 import edu.harvard.iq.dataverse.makedatacount.DatasetMetrics;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -15,29 +19,44 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.NamedStoredProcedureQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.ParameterMode;
-import javax.persistence.StoredProcedureParameter;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.ColumnResult;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.NamedStoredProcedureQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.ParameterMode;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.persistence.StoredProcedureParameter;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.storageuse.StorageUse;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
 
 /**
  *
  * @author skraffmiller
  */
 @NamedQueries({
+    // Dataset.findById should only be used if you're going to iterate over files (otherwise, lazy loading in DatasetService.find() is better).
+    // If you are going to iterate over files, preferably call the DatasetService.findDeep() method i.s.o. using this query directly.
+    @NamedQuery(name = "Dataset.findById", 
+                query = "SELECT o FROM Dataset o LEFT JOIN FETCH o.files WHERE o.id=:id"),
+    @NamedQuery(name = "Dataset.findIdStale",
+               query = "SELECT d.id FROM Dataset d WHERE d.indexTime is NULL OR d.indexTime < d.modificationTime"),
+    @NamedQuery(name = "Dataset.findIdStalePermission",
+               query = "SELECT d.id FROM Dataset d WHERE d.permissionIndexTime is NULL OR d.permissionIndexTime < d.permissionModificationTime"),
     @NamedQuery(name = "Dataset.findByIdentifier",
                query = "SELECT d FROM Dataset d WHERE d.identifier=:identifier"),
     @NamedQuery(name = "Dataset.findByIdentifierAuthorityProtocol",
@@ -48,32 +67,50 @@
                 query = "SELECT o.id FROM Dataset o WHERE o.owner.id=:ownerId"),
     @NamedQuery(name = "Dataset.findByOwnerId", 
                 query = "SELECT o FROM Dataset o WHERE o.owner.id=:ownerId"),
+    @NamedQuery(name = "Dataset.findByCreatorId",
+                query = "SELECT o FROM Dataset o WHERE o.creator.id=:creatorId"),
+    @NamedQuery(name = "Dataset.findByReleaseUserId",
+                query = "SELECT o FROM Dataset o WHERE o.releaseUser.id=:releaseUserId"),
+    @NamedQuery(name = "Dataset.countAll",
+                query = "SELECT COUNT(ds) FROM Dataset ds"),
+    @NamedQuery(name = "Dataset.countFilesByOwnerId",
+                query = "SELECT COUNT(dvo) FROM DvObject dvo WHERE dvo.owner.id=:ownerId AND dvo.dtype='DataFile'")
 })
+@NamedNativeQuery(
+        name = "Dataset.findAllOrSubsetOrderByFilesOwned",
+        query = "SELECT DISTINCT CAST(o.id AS BIGINT) as id, COUNT(f.id) as numFiles " +
+                "FROM dvobject o " +
+                "LEFT JOIN dvobject f ON f.owner_id = o.id " +
+                "WHERE o.dtype = 'Dataset' " +
+                "AND (? = false OR o.indexTime IS NULL) " +
+                "GROUP BY o.id " +
+                "ORDER BY numfiles ASC, id",
+        resultSetMapping = "DatasetIdMapping"
+    )
+@SqlResultSetMapping(
+    name = "DatasetIdMapping",
+    columns = {
+        @ColumnResult(name = "id", type = Long.class)
+    }
+)
 
 /*
-    Below is the stored procedure for getting a numeric value from a database 
-    sequence. Used when the Dataverse is (optionally) configured to use 
-    incremental numeric values for dataset ids, instead of the default 
+    Below is the database stored procedure for getting a string dataset id.
+    Used when the Dataverse is (optionally) configured to use
+    procedurally generated values for dataset ids, instead of the default
     random strings. 
 
-    Unfortunately, there's no standard EJB way of handling sequences. So in the 
-    past we would simply use a NativeQuery to call a proprietary Postgres
-    sequence query. A better way of handling this however is to define any 
-    proprietary SQL functionality outside of the application, in the database, 
-    and call it using the standard JPA @StoredProcedureQuery. 
-
-    The identifier sequence and the stored procedure for accessing it are currently 
-    implemented with PostgresQL "CREATE SEQUENCE ..." and "CREATE FUNCTION ..."; 
-    (we explain how to create these in the installation documentation and supply 
-    a script). If necessary, it can be implemented using other SQL flavors -
+    The use of a stored procedure to create an identifier is explained in the
+    installation documentation (where an example script is supplied).
+    The stored procedure can be implemented using other SQL flavors -
     without having to modify the application code. 
-            -- L.A. 4.6.2
+            -- L.A. 4.6.2 (modified by C.S. for version 5.4.1+)
 */ 
 @NamedStoredProcedureQuery(
-        name = "Dataset.generateIdentifierAsSequentialNumber",
-        procedureName = "generateIdentifierAsSequentialNumber",
+        name = "Dataset.generateIdentifierFromStoredProcedure",
+        procedureName = "generateIdentifierFromStoredProcedure",
         parameters = {
-            @StoredProcedureParameter(mode = ParameterMode.OUT, type = Integer.class, name = "identifier")
+            @StoredProcedureParameter(mode = ParameterMode.OUT, type = String.class)
         }
 )
 @Entity
@@ -117,6 +154,10 @@ public class Dataset extends DvObjectContainer {
      */
     private boolean useGenericThumbnail;
 
+    @ManyToOne
+    @JoinColumn(name="datasettype_id", nullable = false)
+    private DatasetType datasetType;
+
     @OneToOne(cascade = {CascadeType.MERGE, CascadeType.PERSIST})
     @JoinColumn(name = "guestbook_id", unique = false, nullable = true, insertable = true, updatable = true)
     private Guestbook guestbook;
@@ -148,7 +189,41 @@ public void setCitationDateDatasetFieldType(DatasetFieldType citationDateDataset
         this.citationDateDatasetFieldType = citationDateDatasetFieldType;
     }    
 
+    // Per DataCite best practices, the citation date of a dataset may need 
+    // to be adjusted to reflect the latest embargo availability date of any 
+    // file within the first published version. 
+    // If any files are embargoed in the first version, this date will be
+    // calculated and cached here upon its publication, in the 
+    // FinalizeDatasetPublicationCommand. 
+    private Timestamp embargoCitationDate;
+    
+    public Timestamp getEmbargoCitationDate() {
+        return embargoCitationDate;
+    }
+
+    public void setEmbargoCitationDate(Timestamp embargoCitationDate) {
+        this.embargoCitationDate = embargoCitationDate;
+    }
+    
+    
+    
+    @ManyToOne
+    @JoinColumn(name="template_id",nullable = true)
+    private Template template;
+    
+    public Template getTemplate() {
+        return template;
+    }
+
+    public void setTemplate(Template template) {
+        this.template = template;
+    }
+
     public Dataset() {
+        this(false);
+    }
+    
+    public Dataset(boolean isHarvested) {
         DatasetVersion datasetVersion = new DatasetVersion();
         datasetVersion.setDataset(this);
         datasetVersion.setVersionState(DatasetVersion.VersionState.DRAFT);
@@ -156,6 +231,15 @@ public Dataset() {
         datasetVersion.setVersionNumber((long) 1);
         datasetVersion.setMinorVersionNumber((long) 0);
         versions.add(datasetVersion);
+        
+        if (!isHarvested) {
+            StorageUse storageUse = new StorageUse(this); 
+            this.setStorageUse(storageUse);
+        }
+        
+        if (FeatureFlags.DISABLE_DATASET_THUMBNAIL_AUTOSELECT.enabled()) {
+            this.setUseGenericThumbnail(true);
+        }
     }
     
     /**
@@ -239,7 +323,7 @@ public void setFileAccessRequest(boolean fileAccessRequest) {
     }
 
     public String getPersistentURL() {
-        return new GlobalId(this).toURL().toString();
+        return this.getGlobalId().asURL();
     }
     
     public List<DataFile> getFiles() {
@@ -267,20 +351,26 @@ public boolean isDeaccessioned() {
         }
         return hasDeaccessionedVersions; // since any published version would have already returned
     }
+    
 
     public DatasetVersion getLatestVersion() {
         return getVersions().get(0);
     }
 
-    public DatasetVersion getLatestVersionForCopy() {
+    public DatasetVersion getLatestVersionForCopy(boolean includeDeaccessioned) {
         for (DatasetVersion testDsv : getVersions()) {
-            if (testDsv.isReleased() || testDsv.isArchived()) {
+            if (testDsv.isReleased() || testDsv.isArchived() 
+                || (testDsv.isDeaccessioned() && includeDeaccessioned)) {
                 return testDsv;
             }
         }
         return getVersions().get(0);
     }
 
+    public DatasetVersion getLatestVersionForCopy(){
+        return getLatestVersionForCopy(false);
+    }
+
     public List<DatasetVersion> getVersions() {
         return versions;
     }
@@ -290,6 +380,7 @@ public void setVersions(List<DatasetVersion> versions) {
     }
 
     private DatasetVersion createNewDatasetVersion(Template template, FileMetadata fmVarMet) {
+        
         DatasetVersion dsv = new DatasetVersion();
         dsv.setVersionState(DatasetVersion.VersionState.DRAFT);
         dsv.setFileMetadatas(new ArrayList<>());
@@ -298,7 +389,7 @@ private DatasetVersion createNewDatasetVersion(Template template, FileMetadata f
         //if the latest version has values get them copied over
         if (template != null) {
             dsv.updateDefaultValuesFromTemplate(template);
-            setVersions(new ArrayList());
+            setVersions(new ArrayList<>());
         } else {
             latestVersion = getLatestVersionForCopy();
             
@@ -309,16 +400,11 @@ private DatasetVersion createNewDatasetVersion(Template template, FileMetadata f
             if (latestVersion.getDatasetFields() != null && !latestVersion.getDatasetFields().isEmpty()) {
                 dsv.setDatasetFields(dsv.copyDatasetFields(latestVersion.getDatasetFields()));
             }
-            
-            if (latestVersion.getTermsOfUseAndAccess()!= null){
-                dsv.setTermsOfUseAndAccess(latestVersion.getTermsOfUseAndAccess().copyTermsOfUseAndAccess());
-            } else {
-                TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
-                terms.setDatasetVersion(dsv);
-                terms.setLicense(TermsOfUseAndAccess.License.CC0);
-                dsv.setTermsOfUseAndAccess(terms);
-            }
-
+            /*
+            adding file metadatas here and updating terms
+            because the terms need to know about the files
+            in a pre-save validation SEK 12/6/2021
+            */
             for (FileMetadata fm : latestVersion.getFileMetadatas()) {
                 FileMetadata newFm = new FileMetadata();
                 // TODO: 
@@ -335,6 +421,7 @@ private DatasetVersion createNewDatasetVersion(Template template, FileMetadata f
                 newFm.setDataFile(fm.getDataFile());
                 newFm.setDatasetVersion(dsv);
                 newFm.setProvFreeForm(fm.getProvFreeForm());
+                newFm.setInPriorVersion(true);
 
                 //fmVarMet would be updated in DCT
                 if ((fmVarMet != null && !fmVarMet.getId().equals(fm.getId())) || (fmVarMet == null))  {
@@ -348,6 +435,18 @@ private DatasetVersion createNewDatasetVersion(Template template, FileMetadata f
                 
                 dsv.getFileMetadatas().add(newFm);
             }
+            
+            if (latestVersion.getTermsOfUseAndAccess()!= null){
+                TermsOfUseAndAccess terms = latestVersion.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
+                terms.setDatasetVersion(dsv);
+                dsv.setTermsOfUseAndAccess(terms);
+            } else {
+                TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+                terms.setDatasetVersion(dsv);
+                terms.setLicense(null);
+                terms.setFileAccessRequest(true);
+                dsv.setTermsOfUseAndAccess(terms);
+            }
         }
 
         // I'm adding the version to the list so it will be persisted when
@@ -365,19 +464,21 @@ private DatasetVersion createNewDatasetVersion(Template template, FileMetadata f
 
     /**
      * The "edit version" is the most recent *draft* of a dataset, and if the
-     * latest version of a dataset is published, a new draft will be created.
-     * 
+     * latest version of a dataset is published, a new draft will be created. If
+     * you don't want to create a new version, you should be using
+     * getLatestVersion.
+     *
      * @return The edit version {@code this}.
      */
-    public DatasetVersion getEditVersion() {
-        return getEditVersion(null, null);
+    public DatasetVersion getOrCreateEditVersion() {
+        return getOrCreateEditVersion(null, null);
     }
 
-    public DatasetVersion getEditVersion(FileMetadata fm) {
-        return getEditVersion(null, fm);
+    public DatasetVersion getOrCreateEditVersion(FileMetadata fm) {
+        return getOrCreateEditVersion(null, fm);
     }
 
-    public DatasetVersion getEditVersion(Template template, FileMetadata fm) {
+    public DatasetVersion getOrCreateEditVersion(Template template, FileMetadata fm) {
         DatasetVersion latestVersion = this.getLatestVersion();
         if (!latestVersion.isWorkingCopy() || template != null) {
             // if the latest version is released or archived, create a new version for editing
@@ -392,11 +493,11 @@ public DatasetVersion getEditVersion(Template template, FileMetadata fm) {
      * @todo Investigate if this method should be deprecated in favor of
      * createNewDatasetVersion.
      */
-    public DatasetVersion getCreateVersion() {
+    public DatasetVersion getCreateVersion(License license) {
         DatasetVersion dsv = new DatasetVersion();
         dsv.setVersionState(DatasetVersion.VersionState.DRAFT);
         dsv.setDataset(this);
-        dsv.initDefaultValues();
+        dsv.initDefaultValues(license);
         this.setVersions(new ArrayList<>());
         getVersions().add(0, dsv);
         return dsv;
@@ -406,8 +507,17 @@ public Date getMostRecentMajorVersionReleaseDate() {
         if (this.isHarvested()) {
             return getVersions().get(0).getReleaseTime();
         } else {
+            Long majorVersion = null;
             for (DatasetVersion version : this.getVersions()) {
-                if (version.isReleased() && version.getMinorVersionNumber().equals((long) 0)) {
+                if (version.isReleased()) {
+                    if (version.getMinorVersionNumber().equals((long) 0)) {
+                        return version.getReleaseTime();
+                    } else if (majorVersion == null) {
+                        majorVersion = version.getVersionNumber();
+                    }
+                } else if (version.isDeaccessioned() && majorVersion != null
+                        && majorVersion.longValue() == version.getVersionNumber().longValue()
+                        && version.getMinorVersionNumber().equals((long) 0)) {
                     return version.getReleaseTime();
                 }
             }
@@ -423,6 +533,15 @@ public DatasetVersion getReleasedVersion() {
         }
         return null;
     }
+    
+    public DatasetVersion getVersionFromId(Long datasetVersionId) {
+        for (DatasetVersion version : this.getVersions()) {
+            if (datasetVersionId == version.getId().longValue()) {
+                return version;
+            }
+        }
+        return null;
+    }
 
     public List<DataFileCategory> getCategories() {
         return dataFileCategories;
@@ -439,24 +558,6 @@ public void addFileCategory(DataFileCategory category) {
         dataFileCategories.add(category);
     }
 
-    public Collection<String> getCategoriesByName() {
-        Collection<String> ret = getCategoryNames();
-
-        // "Documentation", "Data" and "Code" are the 3 default categories that we 
-        // present by default:
-        if (!ret.contains(BundleUtil.getStringFromBundle("dataset.category.documentation"))) {
-            ret.add(BundleUtil.getStringFromBundle("dataset.category.documentation"));
-        }
-        if (!ret.contains(BundleUtil.getStringFromBundle("dataset.category.data"))) {
-            ret.add(BundleUtil.getStringFromBundle("dataset.category.data"));
-        }
-        if (!ret.contains(BundleUtil.getStringFromBundle("dataset.category.code"))) {
-            ret.add(BundleUtil.getStringFromBundle("dataset.category.code"));
-        }
-
-        return ret;
-    }
-
     public void setCategoriesByName(List<String> newCategoryNames) {
         if (newCategoryNames != null) {
             Collection<String> oldCategoryNames = getCategoryNames();
@@ -504,13 +605,15 @@ private Collection<String> getCategoryNames() {
         }
     }
 
+    /* Only used with packageFiles after the implementation of multi-store in #6488
+     * DO NOT USE THIS METHOD FOR ANY OTHER PURPOSES - it's @Deprecated for a reason.
+     * 
+     */
+    @Deprecated 
     public Path getFileSystemDirectory() {
         Path studyDir = null;
-
-        String filesRootDirectory = System.getProperty("dataverse.files.directory");
-        if (filesRootDirectory == null || filesRootDirectory.equals("")) {
-            filesRootDirectory = "/tmp/files";
-        }
+        
+        String filesRootDirectory = JvmSettings.FILES_DIRECTORY.lookup();
         
         if (this.getAlternativePersistentIndentifiers() != null && !this.getAlternativePersistentIndentifiers().isEmpty()) {
             for (AlternativePersistentIdentifier api : this.getAlternativePersistentIndentifiers()) {
@@ -542,30 +645,36 @@ public String getAlternativePersistentIdentifier(){
     }
     
     public String getProtocolForFileStorage(){
-         String retVal = getProtocol();            
+        String retVal = getProtocol();            
         if (this.getAlternativePersistentIndentifiers() != null && !this.getAlternativePersistentIndentifiers().isEmpty()) {
-            for (AlternativePersistentIdentifier api : this.getAlternativePersistentIndentifiers()) {
-                retVal = api.getProtocol();
+            for (AlternativePersistentIdentifier altpid : this.getAlternativePersistentIndentifiers()) {
+                if (altpid.isStorageLocationDesignator()) {
+                    retVal = altpid.getProtocol();
+                }
             }
         }
         return retVal;         
     }
     
     public String getAuthorityForFileStorage(){
-         String retVal = getAuthority();            
+        String retVal = getAuthority();            
         if (this.getAlternativePersistentIndentifiers() != null && !this.getAlternativePersistentIndentifiers().isEmpty()) {
-            for (AlternativePersistentIdentifier api : this.getAlternativePersistentIndentifiers()) {
-                retVal = api.getAuthority();
+            for (AlternativePersistentIdentifier altpid : this.getAlternativePersistentIndentifiers()) {
+                if (altpid.isStorageLocationDesignator()) {
+                    retVal = altpid.getAuthority();
+                }
             }
         }
         return retVal;         
     }
     
     public String getIdentifierForFileStorage(){
-         String retVal = getIdentifier();            
+        String retVal = getIdentifier();            
         if (this.getAlternativePersistentIndentifiers() != null && !this.getAlternativePersistentIndentifiers().isEmpty()) {
-            for (AlternativePersistentIdentifier api : this.getAlternativePersistentIndentifiers()) {
-                retVal = api.getIdentifier();
+            for (AlternativePersistentIdentifier altpid : this.getAlternativePersistentIndentifiers()) {
+                if (altpid.isStorageLocationDesignator()) {
+                    retVal = altpid.getIdentifier();
+                }
             }
         }
         return retVal;         
@@ -625,7 +734,11 @@ public String getCitation(DatasetVersion version) {
     }
 
     public String getCitation(boolean isOnlineVersion, DatasetVersion version) {
-        return version.getCitation(isOnlineVersion);
+        return getCitation(isOnlineVersion, version, false);
+    }
+    
+    public String getCitation(boolean isOnlineVersion, DatasetVersion version, boolean anonymized) {
+        return version.getCitation(isOnlineVersion, anonymized);
     }
 
     public String getPublicationDateFormattedYYYYMMDD() {
@@ -634,6 +747,27 @@ public String getPublicationDateFormattedYYYYMMDD() {
         }
         return null;
     }
+    
+    public Timestamp getCitationDate() {
+        Timestamp citationDate = null;
+        //Only calculate if this dataset doesn't use an alternate date field for publication date
+        if (citationDateDatasetFieldType == null) {
+            citationDate = super.getPublicationDate();
+            if (embargoCitationDate != null) {
+                if (citationDate.compareTo(embargoCitationDate) < 0) {
+                    return embargoCitationDate;
+                }
+            }
+        }
+        return citationDate;
+    }
+    
+    public String getCitationDateFormattedYYYYMMDD() {
+        if (getCitationDate() != null){
+                   return new SimpleDateFormat("yyyy-MM-dd").format(getCitationDate()); 
+        }
+        return null;
+    }
 
     public DataFile getThumbnailFile() {
         return thumbnailFile;
@@ -650,7 +784,15 @@ public boolean isUseGenericThumbnail() {
     public void setUseGenericThumbnail(boolean useGenericThumbnail) {
         this.useGenericThumbnail = useGenericThumbnail;
     }
-    
+
+    public DatasetType getDatasetType() {
+        return datasetType;
+    }
+
+    public void setDatasetType(DatasetType datasetType) {
+        this.datasetType = datasetType;
+    }
+
     public List<DatasetMetrics> getDatasetMetrics() {
         return datasetMetrics;
     }
@@ -693,16 +835,21 @@ public void setHarvestIdentifier(String harvestIdentifier) {
         this.harvestIdentifier = harvestIdentifier;
     }
 
+    public String getLocalURL() {
+        //Assumes GlobalId != null
+        return  SystemConfig.getDataverseSiteUrlStatic() + "/dataset.xhtml?persistentId=" + this.getGlobalId().asString();
+    }
+    
     public String getRemoteArchiveURL() {
         if (isHarvested()) {
             if (HarvestingClient.HARVEST_STYLE_DATAVERSE.equals(this.getHarvestedFrom().getHarvestStyle())) {
-                return this.getHarvestedFrom().getArchiveUrl() + "/dataset.xhtml?persistentId=" + getGlobalIdString();
+                return this.getHarvestedFrom().getArchiveUrl() + "/dataset.xhtml?persistentId=" + getGlobalId().asString();
             } else if (HarvestingClient.HARVEST_STYLE_VDC.equals(this.getHarvestedFrom().getHarvestStyle())) {
                 String rootArchiveUrl = this.getHarvestedFrom().getHarvestingUrl();
                 int c = rootArchiveUrl.indexOf("/OAIHandler");
                 if (c > 0) {
                     rootArchiveUrl = rootArchiveUrl.substring(0, c);
-                    return rootArchiveUrl + "/faces/study/StudyPage.xhtml?globalId=" + getGlobalIdString();
+                    return rootArchiveUrl + "/faces/study/StudyPage.xhtml?globalId=" + getGlobalId().asString();
                 }
             } else if (HarvestingClient.HARVEST_STYLE_ICPSR.equals(this.getHarvestedFrom().getHarvestStyle())) {
                 // For the ICPSR, it turns out that the best thing to do is to 
@@ -748,7 +895,49 @@ public String getRemoteArchiveURL() {
                     }
                 }
                 return this.getHarvestedFrom().getArchiveUrl();
+            } else if (HarvestingClient.HARVEST_STYLE_DEFAULT.equals(this.getHarvestedFrom().getHarvestStyle())) {
+                // This is a generic OAI archive. 
+                // The metadata we harvested for this dataset is most likely a 
+                // simple DC record that does not contain a URL pointing back at 
+                // the specific location on the source archive. But, it probably
+                // has a global identifier, a DOI or a Handle - so we should be 
+                // able to redirect to the proper global resolver. 
+                // But since this is a harvested dataset, we will assume that 
+                // there is a possibility tha this object does NOT have all the 
+                // valid persistent identifier components.
+                
+                if (StringUtil.nonEmpty(this.getProtocol()) 
+                        && StringUtil.nonEmpty(this.getAuthority())
+                        && StringUtil.nonEmpty(this.getIdentifier())) {
+                    
+                    // If there is a custom archival url for this Harvesting 
+                    // Source, we'll use that
+                    String harvestingUrl = this.getHarvestedFrom().getHarvestingUrl();
+                    String archivalUrl = this.getHarvestedFrom().getArchiveUrl();
+                    if (!harvestingUrl.contains(archivalUrl)) {
+                        // When a Harvesting Client is created, the “archive url” is set to 
+                        // just the host part of the OAI url automatically. 
+                        // For example, if the OAI url was "https://remote.edu/oai", 
+                        // the archive url will default to "https://remote.edu/". 
+                        // If this is no longer true, we know it means the admin 
+                        // went to the trouble of setting it to something else - 
+                        // so we should use this url for the redirects back to source, 
+                        // instead of the global id resolver.
+                        return archivalUrl + this.getAuthority() + "/" + this.getIdentifier();
+                    }
+                    // ... if not, we'll redirect to the resolver for the global id: 
+                    return this.getPersistentURL();    
+                }
+                
+                // All we can do is redirect them to the top-level URL we have 
+                // on file for this remote archive:
+                return this.getHarvestedFrom().getArchiveUrl();
             } else {
+                // This is really not supposed to happen - this is a harvested
+                // dataset for which we don't have ANY information on the nature
+                // of the archive we got it from. So all we can do is redirect 
+                // the user to the top-level URL we have on file for this remote 
+                // archive:
                 return this.getHarvestedFrom().getArchiveUrl();
             }
         }
@@ -764,6 +953,12 @@ public String getHarvestingDescription() {
         return null;
     }
 
+    public boolean hasEnabledGuestbook(){
+        Guestbook gb = this.getGuestbook();
+
+        return ( gb != null && gb.isEnabled());
+    }
+    
     @Override
     public boolean equals(Object object) {
         // TODO: Warning - this method won't work in the case the id fields are not set
@@ -787,7 +982,12 @@ public <T> T accept(Visitor<T> v) {
     @Override
     public String getDisplayName() {
         DatasetVersion dsv = getReleasedVersion();
-        return dsv != null ? dsv.getTitle() : getLatestVersion().getTitle();
+        String result = dsv != null ? dsv.getTitle() : getLatestVersion().getTitle();
+        boolean resultIsEmpty = result == null || "".equals(result);
+        if (resultIsEmpty && getGlobalId() != null) {
+            return getGlobalId().asString();
+        }
+        return result;
     }
     
     @Override
@@ -805,8 +1005,8 @@ public boolean isAncestorOf( DvObject other ) {
         return equals(other) || equals(other.getOwner());
     }
 
-    public DatasetThumbnail getDatasetThumbnail() {
-        return DatasetUtil.getThumbnail(this);
+    public DatasetThumbnail getDatasetThumbnail(int size) {
+        return DatasetUtil.getThumbnail(this, size);
     }
     
     /** 
@@ -817,8 +1017,12 @@ public DatasetThumbnail getDatasetThumbnail() {
      * @param datasetVersion
      * @return A thumbnail of the dataset (may be {@code null}).
      */
-    public DatasetThumbnail getDatasetThumbnail(DatasetVersion datasetVersion) {
-        return DatasetUtil.getThumbnail(this, datasetVersion);
+    public DatasetThumbnail getDatasetThumbnail(DatasetVersion datasetVersion, int size) {
+        return DatasetUtil.getThumbnail(this, datasetVersion, size);
     }
 
+    @Override
+    public String getTargetUrl() {
+        return Dataset.TARGET_URL;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetAuthor.java b/src/main/java/edu/harvard/iq/dataverse/DatasetAuthor.java
index ce8405a0164..bc85ab22e77 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetAuthor.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetAuthor.java
@@ -7,14 +7,13 @@
 package edu.harvard.iq.dataverse;
 
 import java.util.Comparator;
-import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
  * @author skraffmiller
  */
-
 public class DatasetAuthor {
        
     public static Comparator<DatasetAuthor> DisplayOrder = new Comparator<DatasetAuthor>(){
@@ -84,64 +83,33 @@ public void setIdValue(String idValue) {
     }
 
     public boolean isEmpty() {
-        return ( (affiliation==null || affiliation.getValue().trim().equals(""))
-            && (name==null || name.getValue().trim().equals(""))
+        return ( (affiliation==null || StringUtils.isBlank(affiliation.getValue()))
+            && (name==null || StringUtils.isBlank(name.getValue()))
            );
     }
 
-    /**
-     * https://support.orcid.org/hc/en-us/articles/360006897674-Structure-of-the-ORCID-Identifier
-     */
-    final public static String REGEX_ORCID = "^\\d{4}-\\d{4}-\\d{4}-(\\d{4}|\\d{3}X)$";
-    final public static String REGEX_ISNI = "^\\d*$";
-    final public static String REGEX_LCNA = "^[a-z]+\\d+$";
-    final public static String REGEX_VIAF = "^\\d*$";
-    /**
-     * GND regex from https://www.wikidata.org/wiki/Property:P227
-     */
-    final public static String REGEX_GND = "^1[01]?\\d{7}[0-9X]|[47]\\d{6}-\\d|[1-9]\\d{0,7}-[0-9X]|3\\d{7}[0-9X]$";
-
-    /**
-     * Each author identification type has its own valid pattern/syntax.
-     */
-    public static Pattern getValidPattern(String regex) {
-        return Pattern.compile(regex);
+    public String getIdentifierAsUrl() {
+        if (idType != null && !idType.isEmpty() && idValue != null && !idValue.isEmpty()) {
+            return getIdentifierAsUrl(idType, idValue);
+        }
+        return null;
     }
 
-    public String getIdentifierAsUrl() {
+    public static String getIdentifierAsUrl(String idType, String idValue) {
         if (idType != null && !idType.isEmpty() && idValue != null && !idValue.isEmpty()) {
-            DatasetFieldValueValidator datasetFieldValueValidator = new DatasetFieldValueValidator();
-            switch (idType) {
-                case "ORCID":
-                    if (datasetFieldValueValidator.isValidAuthorIdentifier(idValue, getValidPattern(REGEX_ORCID))) {
-                        return "https://orcid.org/" + idValue;
-                    }
-                    break;
-                case "ISNI":
-                    if (datasetFieldValueValidator.isValidAuthorIdentifier(idValue, getValidPattern(REGEX_ISNI))) {
-                        return "http://www.isni.org/isni/" + idValue;
-                    }
-                    break;
-                case "LCNA":
-                    if (datasetFieldValueValidator.isValidAuthorIdentifier(idValue, getValidPattern(REGEX_LCNA))) {
-                        return "http://id.loc.gov/authorities/names/" + idValue;
-                    }
-                    break;
-                case "VIAF":
-                    if (datasetFieldValueValidator.isValidAuthorIdentifier(idValue, getValidPattern(REGEX_VIAF))) {
-                        return "https://viaf.org/viaf/" + idValue;
-                    }
-                    break;
-                case "GND":
-                    if (datasetFieldValueValidator.isValidAuthorIdentifier(idValue, getValidPattern(REGEX_GND))) {
-                        return "https://d-nb.info/gnd/" + idValue;
-                    }
-                    break;
-                default:
-                    break;
+            try {
+              ExternalIdentifier externalIdentifier = ExternalIdentifier.valueOf(idType);
+              if (externalIdentifier.isValidIdentifier(idValue)) {
+                  String uri = externalIdentifier.format(idValue);
+                  //The DAI identifier is a URI starting with "info" - we don't want to return it as a URL (we assume non-null URLs should be links in the display)
+                  if(uri.startsWith("http")) {
+                      return uri;
+                  }
+              }
+            } catch (Exception e) {
+                // non registered identifier
             }
         }
         return null;
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetConverter.java b/src/main/java/edu/harvard/iq/dataverse/DatasetConverter.java
index 71d1a48ace3..b779e084250 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetConverter.java
@@ -6,17 +6,18 @@
 
 package edu.harvard.iq.dataverse;
 
-import javax.ejb.EJB;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
 
 @FacesConverter("datasetConverter")
 public class DatasetConverter implements Converter {
 
-    @EJB
-    DatasetServiceBean datasetService;
+    //@EJB
+    DatasetServiceBean datasetService = CDI.current().select(DatasetServiceBean.class).get();
 
     @Override
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetDeaccessionNoteValidator.java b/src/main/java/edu/harvard/iq/dataverse/DatasetDeaccessionNoteValidator.java
new file mode 100644
index 00000000000..7c6263fe9b9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetDeaccessionNoteValidator.java
@@ -0,0 +1,47 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+/**
+ *
+ * @author skraffmi
+ */
+public class DatasetDeaccessionNoteValidator implements ConstraintValidator<ValidateDeaccessionNote, DatasetVersion> {
+    
+    private String versionState;
+    private String deaccessionNote;
+
+    @Override
+    public void initialize(ValidateDeaccessionNote constraintAnnotation) {
+        versionState = constraintAnnotation.versionState();
+        deaccessionNote = constraintAnnotation.deaccessionNote();
+    }
+
+
+    @Override
+    public boolean isValid(DatasetVersion value, ConstraintValidatorContext context) {
+        
+        if (versionState.equals(DatasetVersion.VersionState.DEACCESSIONED) && deaccessionNote.isEmpty()){
+            if (context != null) {
+                context.buildConstraintViolationWithTemplate(value + "  " + BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.textForReason.error")).addConstraintViolation();
+            }
+            return false;
+        }
+        if (versionState.equals(DatasetVersion.VersionState.DEACCESSIONED) && deaccessionNote.length() > DatasetVersion.VERSION_NOTE_MAX_LENGTH){
+            if (context != null) {
+                context.buildConstraintViolationWithTemplate(value + "  " + BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.limitChar.error")).addConstraintViolation();
+            }
+            return false;
+        }
+        return true;
+        
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetDistributor.java b/src/main/java/edu/harvard/iq/dataverse/DatasetDistributor.java
index 00936b9365a..3252b7f0367 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetDistributor.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetDistributor.java
@@ -7,7 +7,7 @@
 package edu.harvard.iq.dataverse;
 
 import java.util.Comparator;
-import javax.persistence.Version;
+import jakarta.persistence.Version;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java
index 6d4b56cf6cf..a117536cbce 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java
@@ -19,21 +19,21 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import org.apache.commons.lang.StringUtils;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import org.apache.commons.lang3.StringUtils;
 
 @Entity
 @ValidateDatasetFieldType
@@ -54,15 +54,18 @@ public int compare(DatasetField o1, DatasetField o2) {
                                     o2.getDatasetFieldType().getDisplayOrder() );
     }};
 
-    public static DatasetField createNewEmptyDatasetField(DatasetFieldType dsfType, Object dsv) {
+    public static DatasetField createNewEmptyDatasetField(DatasetFieldType dsfType, DatasetVersion dsv) {
         
         DatasetField dsfv = createNewEmptyDatasetField(dsfType);
-        //TODO - a better way to handle this?
-        if (dsv.getClass().getName().equals("edu.harvard.iq.dataverse.DatasetVersion")){
-                   dsfv.setDatasetVersion((DatasetVersion)dsv); 
-        } else {
-            dsfv.setTemplate((Template)dsv);
-        }
+        dsfv.setDatasetVersion(dsv);
+
+        return dsfv;
+    }
+
+    public static DatasetField createNewEmptyDatasetField(DatasetFieldType dsfType, Template dsv) {
+        
+        DatasetField dsfv = createNewEmptyDatasetField(dsfType);
+        dsfv.setTemplate(dsv);
 
         return dsfv;
     }
@@ -241,15 +244,23 @@ public String getValue() {
             return datasetFieldValues.get(0).getValue();
         } else if (controlledVocabularyValues != null && !controlledVocabularyValues.isEmpty()) {
             if (controlledVocabularyValues.get(0) != null){
-                return controlledVocabularyValues.get(0).getStrValue();                
+                return controlledVocabularyValues.get(0).getLocaleStrValue();                
             }
         }
         return null;
     }
 
     public String getDisplayValue() {
+        return getDisplayValue(null);
+    }
+    
+    public String getDisplayValue(String lang) {
+        if(lang!=null && lang.isBlank()) {
+            //null will cause the current UI lang to be picked up
+            lang=null;
+        }
         String returnString = "";
-        for (String value : getValues()) {
+        for (String value : getValues(lang)) {
             if(value == null) {
                 value="";
             }
@@ -301,6 +312,14 @@ public String getCompoundRawValue() {
      * despite the name, this returns a list of display values; not a list of values
      */
     public List<String> getValues() {
+        return getValues(null);
+    }
+
+    public List<String> getValues(String langCode) {
+        if(langCode!=null && langCode.isBlank()) {
+            //null picks up current UI lang
+            langCode=null;
+        }
         List<String> returnList = new ArrayList<>();
         if (!datasetFieldValues.isEmpty()) {
             for (DatasetFieldValue dsfv : datasetFieldValues) {
@@ -308,8 +327,8 @@ public List<String> getValues() {
             }
         } else {
             for (ControlledVocabularyValue cvv : controlledVocabularyValues) {
-                if (cvv != null && cvv.getStrValue() != null) {
-                    returnList.add(cvv.getStrValue());
+                if (cvv != null && cvv.getLocaleStrValue(langCode) != null) {
+                    returnList.add(cvv.getLocaleStrValue(langCode));
                 }
             }
         }
@@ -407,52 +426,95 @@ public void setValidationMessage(String validationMessage) {
         this.validationMessage = validationMessage;
     }
     
+    
+    // these two booleans are used to wrap around the field type isRequired and isHasChildren methods to also check
+    // if the dataverse has overriden the default values
     @Transient 
     private Boolean required;
-       
+    @Transient 
+    private Boolean hasRequiredChildren;
+
     public boolean isRequired() {
         if (required == null) {
-            required = false;
-            if (this.datasetFieldType.isPrimitive() && this.datasetFieldType.isRequired()) {
-                required = true;
-            }
-
-            if (this.datasetFieldType.isHasRequiredChildren()) {
+            required = false;            
+            if (this.datasetFieldType.isRequired()) {
                 required = true;
-            }
-
-            Dataverse dv = getDataverse();
-            while (!dv.isMetadataBlockRoot()) {
-                if (dv.getOwner() == null) {
-                    break; // we are at the root; which by defintion is metadata blcok root, regarldess of the value
+            } else {
+                // otherwise check if overridden at the dataverse level
+                Dataverse dv = getDataverse();
+                while (!dv.isMetadataBlockRoot()) {
+                    if (dv.getOwner() == null) {
+                        break; // we are at the root; which by defintion is metadata blcok root, regarldess of the value
+                    }
+                    dv = dv.getOwner();
                 }
-                dv = dv.getOwner();
-            }
 
-            List<DataverseFieldTypeInputLevel> dftilListFirst = dv.getDataverseFieldTypeInputLevels();
-            if (!getDatasetFieldType().isHasChildren()) {
+                List<DataverseFieldTypeInputLevel> dftilListFirst = dv.getDataverseFieldTypeInputLevels();
                 for (DataverseFieldTypeInputLevel dsftil : dftilListFirst) {
                     if (dsftil.getDatasetFieldType().equals(this.datasetFieldType)) {
                         required = dsftil.isRequired();
                     }
                 }
             }
+            
+            // since we don't currently support the use case where the parent is required
+            // but no specific children are (the "true/false" case), we override this as false
+            if (required && this.datasetFieldType.isCompound() && !isHasRequiredChildren())
+            {
+                required = false;
+            }
+            
+            //this is needed to enforce required children validation and display on create #11421
+            //set the parent to required only if a child is set to required at the DV level
+            if (this.datasetFieldType.isCompound() && isHasRequiredChildrenDV()) {
+                required = true;
+            }
+           
+        }
+        
+        return required;
+    }
+    
+    public boolean isHasRequiredChildren() {
+        if (hasRequiredChildren == null) {
+            hasRequiredChildren = this.datasetFieldType.isHasRequiredChildren() || checkRequiredChildren(false);
+        }
+        return hasRequiredChildren;
+    }
 
-            if (getDatasetFieldType().isHasChildren() && (!dftilListFirst.isEmpty())) {
-                for (DatasetFieldType child : getDatasetFieldType().getChildDatasetFieldTypes()) {
-                    for (DataverseFieldTypeInputLevel dftilTest : dftilListFirst) {
-                        if (child.equals(dftilTest.getDatasetFieldType())) {
-                            if (dftilTest.isRequired()) {
-                                required = true;
+    public boolean isHasRequiredChildrenDV() {
+        return isHasRequiredChildren() && checkRequiredChildren(true);
+    }
+    
+    private boolean checkRequiredChildren(boolean checkDVOnly) {
+        Dataverse dv = getDataverse();
+        while (!dv.isMetadataBlockRoot()) {
+            if (dv.getOwner() == null) {
+                break; // we are at the root; which by defintion is metadata block root, regardless of the value
+            }
+            dv = dv.getOwner();
+        }
+
+        List<DataverseFieldTypeInputLevel> dftilListFirst = dv.getDataverseFieldTypeInputLevels();
+
+        if (getDatasetFieldType().isHasChildren() && (!dftilListFirst.isEmpty())) {
+            for (DatasetFieldType child : getDatasetFieldType().getChildDatasetFieldTypes()) {
+                for (DataverseFieldTypeInputLevel dftilTest : dftilListFirst) {
+                    if (child.equals(dftilTest.getDatasetFieldType())) {
+                        if (dftilTest.isRequired()) {
+                            if (checkDVOnly) {
+                                if (!child.isRequired()) {
+                                    return true;
+                                }
+                            } else {
+                                return true;
                             }
                         }
                     }
                 }
             }
-
         }
-        // logger.fine("at return  " + this.datasetFieldType.getDisplayName() + " " + required);
-        return required;
+        return false;
     }
     
     public Dataverse getDataverse() {
@@ -501,9 +563,12 @@ public String toString() {
         return "edu.harvard.iq.dataverse.DatasetField[ id=" + id + " ]";
     }
 
-    public DatasetField copy(Object version) {
+    public DatasetField copy(DatasetVersion version) {
         return copy(version, null);
     }
+    public DatasetField copy(Template template) {
+        return copy(template, null);
+    }
     
     // originally this was an overloaded method, but we renamed it to get around an issue with Bean Validation
     // (that looked t overloaded methods, when it meant to look at overriden methods
@@ -511,15 +576,15 @@ public DatasetField copyChild(DatasetFieldCompoundValue parent) {
         return copy(null, parent);
     }
 
-    private DatasetField copy(Object version, DatasetFieldCompoundValue parent) {
+    private DatasetField copy(Object versionOrTemplate, DatasetFieldCompoundValue parent) {
         DatasetField dsf = new DatasetField();
         dsf.setDatasetFieldType(datasetFieldType);
         
-        if (version != null) {
-            if (version.getClass().getName().equals("edu.harvard.iq.dataverse.DatasetVersion")) {
-                dsf.setDatasetVersion((DatasetVersion) version);               
+        if (versionOrTemplate != null) {
+            if (versionOrTemplate instanceof DatasetVersion) {
+                dsf.setDatasetVersion((DatasetVersion) versionOrTemplate);               
             } else {
-                dsf.setTemplate((Template) version);
+                dsf.setTemplate((Template) versionOrTemplate);
             }
         }
         
@@ -551,7 +616,8 @@ public boolean removeBlankDatasetFieldValues() {
                     return true;
                 }
             } else { // controlled vocab
-                if (this.getControlledVocabularyValues().isEmpty()) {
+                // during harvesting some CVV are put in getDatasetFieldValues. we don't want to remove those
+                if (this.getControlledVocabularyValues().isEmpty() && this.getDatasetFieldValues().isEmpty()) {
                     return true;
                 }                 
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldCompoundValue.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldCompoundValue.java
index 86bb270bcae..c03baec73af 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldCompoundValue.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldCompoundValue.java
@@ -10,21 +10,25 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import org.apache.commons.lang.StringUtils;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
 
 /**
  *
@@ -67,6 +71,19 @@ public static DatasetFieldCompoundValue createNewEmptyDatasetFieldCompoundValue(
     @OrderBy("datasetFieldType ASC")
     private List<DatasetField> childDatasetFields = new ArrayList<>();
 
+    // configurations for link creation
+    private static final Map<String, Pair<String, String>> linkComponents = Map.of(
+      "author", new ImmutablePair<>("authorIdentifierScheme", "authorIdentifier")
+    );
+
+    // field for handling links. Annotation '@Transient' prevents these fields to be saved in DB
+    @Transient
+    private Map<DatasetField, Boolean> linkMap = new LinkedHashMap<>();
+    @Transient
+    private String linkScheme = null;
+    @Transient
+    private String linkValue = null;
+
     public Long getId() {
         return id;
     }
@@ -132,14 +149,29 @@ public DatasetFieldCompoundValue copy(DatasetField parent) {
         return compoundValue;
     }
 
-    public Map<DatasetField,String> getDisplayValueMap() {
+    public Map<DatasetField, String> getDisplayValueMap() {
         // todo - this currently only supports child datasetfields with single values
         // need to determine how we would want to handle multiple
         Map<DatasetField, String> fieldMap = new LinkedHashMap<>();
-
+        linkMap.clear();
+        boolean fixTrailingComma = false;
+        Pair<String, String> linkComponents = getLinkComponents();
+        linkScheme = null;
+        linkValue = null;
         for (DatasetField childDatasetField : childDatasetFields) {
+            fixTrailingComma = false;
             // skip the value if it is empty or N/A
             if (!StringUtils.isBlank(childDatasetField.getValue()) && !DatasetField.NA_VALUE.equals(childDatasetField.getValue())) {
+                if (linkComponents != null) {
+                    if (fieldNameEquals(childDatasetField, linkComponents.getKey())) {
+                        linkScheme = childDatasetField.getValue();
+                    } else if (fieldNameEquals(childDatasetField, linkComponents.getValue())) {
+                        linkValue = childDatasetField.getValue();
+                        if (StringUtils.isNotBlank(linkScheme) && StringUtils.isNotBlank(linkValue))
+                            linkMap.put(childDatasetField, true);
+                    }
+                }
+
                 String format = childDatasetField.getDatasetFieldType().getDisplayFormat();
                 if (StringUtils.isBlank(format)) {
                     format = "#VALUE";
@@ -148,19 +180,78 @@ public Map<DatasetField,String> getDisplayValueMap() {
                 if (!childDatasetField.getDatasetFieldType().isSanitizeHtml() && childDatasetField.getDatasetFieldType().isEscapeOutputText()){
                     sanitizedValue = MarkupChecker.stripAllTags(sanitizedValue);
                 }
+                //if a series of child values is comma delimited we want to strip off the final entry's comma
+                if (format.equals("#VALUE, ")) fixTrailingComma = true;
+                
                 // replace the special values in the format (note: we replace #VALUE last since we don't
                 // want any issues if the value itself has #NAME in it)
+
                 String displayValue = format
                         .replace("#NAME", childDatasetField.getDatasetFieldType().getTitle())
                         //todo: this should be handled in more generic way for any other text that can then be internationalized
                         // if we need to use replaceAll for regexp, then make sure to use: java.util.regex.Matcher.quoteReplacement(<target string>)
                         .replace("#EMAIL", BundleUtil.getStringFromBundle("dataset.email.hiddenMessage"))
-                        .replace("#VALUE",  sanitizedValue );
-
-                fieldMap.put(childDatasetField,displayValue);
+                        .replace("#VALUE",  sanitizedValue);
+                fieldMap.put(childDatasetField, displayValue);
             }
         }
+        
+        if (fixTrailingComma) {
+            return (removeLastComma(fieldMap));
+        }
 
         return fieldMap;
     }
+
+    public String getLink() {
+        return DatasetAuthor.getIdentifierAsUrl(linkScheme, linkValue);
+    }
+
+    public boolean isLink(DatasetField datasetField) {
+        return linkMap.containsKey(datasetField) && linkMap.get(datasetField) == true && getLink() != null;
+    }
+
+    private boolean fieldNameEquals(DatasetField datasetField, String linkTypeComponent) {
+        return datasetField.getDatasetFieldType().getName().equals(linkTypeComponent);
+    }
+
+    public boolean isLinkableField() {
+        return linkComponents.containsKey(parentDatasetField.getDatasetFieldType().getName());
+    }
+
+    public Pair<String, String> getLinkComponents() {
+        if (!isLinkableField())
+            return null;
+        return linkComponents.get(parentDatasetField.getDatasetFieldType().getName());
+    }
+
+    public boolean hasChildOfType(String name) {
+        for (DatasetField child : childDatasetFields) {
+            if (child.getDatasetFieldType().getName().equals(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private Map<DatasetField, String> removeLastComma(Map<DatasetField, String> mapIn) {
+
+        Iterator<Map.Entry<DatasetField, String>> itr = mapIn.entrySet().iterator();
+        Map.Entry<DatasetField, String> entry = null;
+        DatasetField keyVal = null;
+        String oldValue = null;
+
+        while (itr.hasNext()) {
+            entry = itr.next();
+            keyVal = entry.getKey();
+            oldValue = entry.getValue();
+        }
+
+        if (keyVal != null && oldValue != null && oldValue.length() >= 2) {
+            String newValue = oldValue.substring(0, oldValue.length() - 2);
+            mapIn.replace(keyVal, oldValue, newValue);
+        }
+
+        return mapIn;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java
index 69de63c5fa6..71e339a6fca 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java
@@ -6,8 +6,8 @@
 
 package edu.harvard.iq.dataverse;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Named;
 
 /**
  *
@@ -16,161 +16,164 @@
 @Named("dfc")
 @Dependent
 public class DatasetFieldConstant implements java.io.Serializable  {
-    
-    public final static String publication = "publication";
-    public final static String otherId = "otherId";
-    public final static String author =  "author";
-    public final static String authorFirstName =  "authorFirstName";
-    public final static String authorLastName =  "authorLastName";
-    public final static String producer = "producer";
-    public final static String software = "software";
-    public final static String grantNumber = "grantNumber";
-    public final static String distributor = "distributor";
-    public final static String datasetContact = "datasetContact";
-    public final static String datasetContactEmail = "datasetContactEmail";
-    public final static String datasetContactName = "datasetContactName";
-    public final static String datasetContactAffiliation = "datasetContactAffiliation";
-    public final static String series = "series";
-    public final static String datasetVersion = "datasetVersion";
-    
-    public final static String description = "dsDescription";
-    public final static String keyword = "keyword";
-    public final static String topicClassification = "topicClassification";
-    public final static String geographicBoundingBox = "geographicBoundingBox";
-    
-    public final static String note = "note";
-    
-    public final static String publicationCitation = "publicationCitation";
-    public final static String publicationIDType = "publicationIDType";
-    public final static String publicationIDNumber = "publicationIDNumber";
-    public final static String publicationURL = "publicationURL";
-    public final static String publicationReplicationData = "publicationReplicationData";
-    
-    
-    public final static String title = "title";
-    public final static String subTitle="subtitle"; //SEK 6-7-2016 to match what is in DB
-    public final static String alternativeTitle="alternativeTitle"; //missing from class
-    public final static String datasetId = "datasetId";
-    public final static String authorName ="authorName";
-    public final static String authorAffiliation = "authorAffiliation";
-    public final static String authorIdType = "authorIdentifierScheme";
-    public final static String authorIdValue = "authorIdentifier";
-    public final static String otherIdValue="otherIdValue";
-    public final static String otherIdAgency= "otherIdAgency";
-    
-    public final static String producerName="producerName";
-    public final static String producerURL="producerURL";
-    public final static String producerLogo="producerLogoURL";
-    public final static String producerAffiliation="producerAffiliation";
-    public final static String producerAbbreviation= "producerAbbreviation";
-    public final static String productionDate="productionDate";
-    public final static String productionPlace="productionPlace";
-    public final static String softwareName="softwareName";
-    public final static String softwareVersion="softwareVersion";
-    public final static String fundingAgency="fundingAgency";
-    public final static String grantNumberValue="grantNumberValue";
-    public final static String grantNumberAgency="grantNumberAgency";
-    public final static String distributorName="distributorName";
-    public final static String distributorURL="distributorURL";
-    public final static String distributorLogo="distributorLogoURL";
-    public final static String distributionDate="distributionDate";
-    public final static String distributorContactName="distributorContactName";
-    public final static String distributorContactAffiliation="distributorContactAffiliation";
-    public final static String distributorContactEmail="distributorContactEmail";
-    public final static String distributorAffiliation="distributorAffiliation";
-    public final static String distributorAbbreviation="distributorAbbreviation";
-
-    public final static String contributor="contributor"; //SEK added for Dublin Core 6/22
-    public final static String contributorType="contributorType";
-    public final static String contributorName="contributorName";
-
-    public final static String depositor="depositor";
-    public final static String dateOfDeposit="dateOfDeposit";
-    public final static String seriesName="seriesName";
-    public final static String seriesInformation="seriesInformation";
-    public final static String datasetVersionValue="datasetVersionValue";
-    public final static String versionDate="versionDate";
-    public final static String keywordValue="keywordValue";
-    public final static String keywordVocab="keywordVocabulary"; //SEK 6/10/2016 to match what is in the db
-    public final static String keywordVocabURI="keywordVocabularyURI"; //SEK 6/10/2016 to match what is in the db
-    public final static String topicClassValue="topicClassValue";
-    public final static String topicClassVocab="topicClassVocab";
-    public final static String topicClassVocabURI="topicClassVocabURI";
-    public final static String descriptionText="dsDescriptionValue";
-    public final static String descriptionDate="descriptionDate";
-    public final static String timePeriodCovered="timePeriodCovered"; // SEK added 6/13/2016
-    public final static String timePeriodCoveredStart="timePeriodCoveredStart";
-    public final static String timePeriodCoveredEnd="timePeriodCoveredEnd";
-    public final static String dateOfCollection="dateOfCollection"; // SEK added 6/13/2016
-    public final static String dateOfCollectionStart="dateOfCollectionStart";
-    public final static String dateOfCollectionEnd="dateOfCollectionEnd";
-    public final static String country="country";
-    public final static String geographicCoverage="geographicCoverage";
-    public final static String otherGeographicCoverage="otherGeographicCoverage";
-    public final static String city="city";  // SEK added 6/13/2016
-    public final static String state="state";  // SEK added 6/13/2016
-    public final static String geographicUnit="geographicUnit";
-    public final static String westLongitude="westLongitude";
-    public final static String eastLongitude="eastLongitude";
-    public final static String northLatitude="northLongitude"; //Changed to match DB - incorrectly entered into DB
-    public final static String southLatitude="southLongitude"; //Incorrect in DB
-    public final static String unitOfAnalysis="unitOfAnalysis";
-    public final static String universe="universe";
-    public final static String kindOfData="kindOfData";
-    public final static String timeMethod="timeMethod";
-    public final static String dataCollector="dataCollector";
-    public final static String collectorTraining="collectorTraining";
-    public final static String frequencyOfDataCollection="frequencyOfDataCollection";
-    public final static String samplingProcedure="samplingProcedure";
-    public final static String targetSampleSize = "targetSampleSize";
-    public final static String targetSampleActualSize = "targetSampleActualSize";
-    public final static String targetSampleSizeFormula = "targetSampleSizeFormula";
-    public final static String deviationsFromSampleDesign="deviationsFromSampleDesign";
-    public final static String collectionMode="collectionMode";
-    public final static String researchInstrument="researchInstrument";
-    public final static String dataSources="dataSources";
-    public final static String originOfSources="originOfSources";
-    public final static String characteristicOfSources="characteristicOfSources";
-    public final static String accessToSources="accessToSources";
-    public final static String dataCollectionSituation="dataCollectionSituation";
-    public final static String actionsToMinimizeLoss="actionsToMinimizeLoss";
-    public final static String controlOperations="controlOperations";
-    public final static String weighting="weighting";
-    public final static String cleaningOperations="cleaningOperations";
-    public final static String datasetLevelErrorNotes="datasetLevelErrorNotes";
-    public final static String responseRate="responseRate";
-    public final static String samplingErrorEstimates="samplingErrorEstimates";
-    
-    public final static String socialScienceNotes = "socialScienceNotes";
-    public final static String socialScienceNotesType = "socialScienceNotesType";
-    public final static String socialScienceNotesSubject = "socialScienceNotesSubject";
-    public final static String socialScienceNotesText = "socialScienceNotesText";
-
-    public final static String otherDataAppraisal="otherDataAppraisal";
-    public final static String placeOfAccess="placeOfAccess";
-    public final static String originalArchive="originalArchive";
-    public final static String availabilityStatus="availabilityStatus";
-    public final static String collectionSize="collectionSize";
-    public final static String datasetCompletion="datasetCompletion";
-    public final static String numberOfFiles="numberOfFiles";
-    public final static String confidentialityDeclaration="confidentialityDeclaration";
-    public final static String specialPermissions="specialPermissions";
-    public final static String restrictions="restrictions";
-    public final static String contact="contact";
-    public final static String citationRequirements="citationRequirements";
-    public final static String depositorRequirements="depositorRequirements";
-    public final static String conditions="conditions";
-    public final static String disclaimer="disclaimer";
-    public final static String relatedMaterial="relatedMaterial";
-    //public final static String replicationFor="replicationFor";
-    //public final static String relatedPublications="relatedPublications";
-    public final static String relatedDatasets="relatedDatasets";
-    public final static String otherReferences="otherReferences";
-    public final static String notesText="notesText";
-    public final static String language="language";
-    public final static String noteInformationType="noteInformationType";
-    public final static String notesInformationSubject="notesInformationSubject";
-    public final static String subject="subject";
+
+    public static final String publication = "publication";
+    public static final String otherId = "otherId";
+    public static final String author =  "author";
+    public static final String authorFirstName =  "authorFirstName";
+    public static final String authorLastName =  "authorLastName";
+    public static final String producer = "producer";
+    public static final String software = "software";
+    public static final String grantNumber = "grantNumber";
+    public static final String distributor = "distributor";
+    public static final String datasetContact = "datasetContact";
+    public static final String datasetContactEmail = "datasetContactEmail";
+    public static final String datasetContactName = "datasetContactName";
+    public static final String datasetContactAffiliation = "datasetContactAffiliation";
+    public static final String series = "series";
+    public static final String datasetVersion = "datasetVersion";
+
+    public static final String description = "dsDescription";
+    public static final String keyword = "keyword";
+    public static final String topicClassification = "topicClassification";
+    public static final String geographicBoundingBox = "geographicBoundingBox";
+
+    public static final String note = "note";
+
+    public static final String publicationRelationType = "publicationRelationType";
+    public static final String publicationCitation = "publicationCitation";
+    public static final String publicationIDType = "publicationIDType";
+    public static final String publicationIDNumber = "publicationIDNumber";
+    public static final String publicationURL = "publicationURL";
+    public static final String publicationReplicationData = "publicationReplicationData";
+
+    public static final String title = "title";
+    public static final String subTitle="subtitle"; //SEK 6-7-2016 to match what is in DB
+    public static final String alternativeTitle="alternativeTitle"; //missing from class
+    public static final String datasetId = "datasetId";
+    public static final String authorName ="authorName";
+    public static final String authorAffiliation = "authorAffiliation";
+    public static final String authorIdType = "authorIdentifierScheme";
+    public static final String authorIdValue = "authorIdentifier";
+    public static final String otherIdValue="otherIdValue";
+    public static final String otherIdAgency= "otherIdAgency";
+
+    public static final String producerName="producerName";
+    public static final String producerURL="producerURL";
+    public static final String producerLogo="producerLogoURL";
+    public static final String producerAffiliation="producerAffiliation";
+    public static final String producerAbbreviation= "producerAbbreviation";
+    public static final String productionDate="productionDate";
+    public static final String productionPlace="productionPlace";
+    public static final String softwareName="softwareName";
+    public static final String softwareVersion="softwareVersion";
+    public static final String fundingAgency="fundingAgency";
+    public static final String grantNumberValue="grantNumberValue";
+    public static final String grantNumberAgency="grantNumberAgency";
+    public static final String distributorName="distributorName";
+    public static final String distributorURL="distributorURL";
+    public static final String distributorLogo="distributorLogoURL";
+    public static final String distributionDate="distributionDate";
+    public static final String distributorContactName="distributorContactName";
+    public static final String distributorContactAffiliation="distributorContactAffiliation";
+    public static final String distributorContactEmail="distributorContactEmail";
+    public static final String distributorAffiliation="distributorAffiliation";
+    public static final String distributorAbbreviation="distributorAbbreviation";
+
+    public static final String contributor="contributor"; //SEK added for Dublin Core 6/22
+    public static final String contributorType="contributorType";
+    public static final String contributorName="contributorName";
+
+    public static final String depositor="depositor";
+    public static final String dateOfDeposit="dateOfDeposit";
+    public static final String seriesName="seriesName";
+    public static final String seriesInformation="seriesInformation";
+    public static final String datasetVersionValue="datasetVersionValue";
+    public static final String versionDate="versionDate";
+    public static final String keywordValue="keywordValue";
+    public static final String keywordTermURI="keywordTermURI";
+    public static final String keywordVocab="keywordVocabulary";
+    public static final String keywordVocabURI="keywordVocabularyURI";
+    public static final String topicClassValue="topicClassValue";
+    public static final String topicClassVocab="topicClassVocab";
+    public static final String topicClassVocabURI="topicClassVocabURI";
+    public static final String descriptionText="dsDescriptionValue";
+    public static final String descriptionDate="dsDescriptionDate";
+    public static final String timePeriodCovered="timePeriodCovered"; // SEK added 6/13/2016
+    public static final String timePeriodCoveredStart="timePeriodCoveredStart";
+    public static final String timePeriodCoveredEnd="timePeriodCoveredEnd";
+    public static final String dateOfCollection="dateOfCollection"; // SEK added 6/13/2016
+    public static final String dateOfCollectionStart="dateOfCollectionStart";
+    public static final String dateOfCollectionEnd="dateOfCollectionEnd";
+    public static final String country="country";
+    public static final String geographicCoverage="geographicCoverage";
+    public static final String otherGeographicCoverage="otherGeographicCoverage";
+    public static final String city="city";  // SEK added 6/13/2016
+    public static final String state="state";  // SEK added 6/13/2016
+    public static final String geographicUnit="geographicUnit";
+    public static final String westLongitude="westLongitude";
+    public static final String eastLongitude="eastLongitude";
+    public static final String northLatitude="northLatitude";
+    public static final String southLatitude="southLatitude";
+    public static final String unitOfAnalysis="unitOfAnalysis";
+    public static final String universe="universe";
+    public static final String kindOfData="kindOfData";
+    public static final String timeMethod="timeMethod";
+    public static final String dataCollector="dataCollector";
+    public static final String collectorTraining="collectorTraining";
+    public static final String frequencyOfDataCollection="frequencyOfDataCollection";
+    public static final String samplingProcedure="samplingProcedure";
+    public static final String targetSampleSize = "targetSampleSize";
+    public static final String targetSampleActualSize = "targetSampleActualSize";
+    public static final String targetSampleSizeFormula = "targetSampleSizeFormula";
+    public static final String deviationsFromSampleDesign="deviationsFromSampleDesign";
+    public static final String collectionMode="collectionMode";
+    public static final String researchInstrument="researchInstrument";
+    public static final String dataSources="dataSources";
+    public static final String originOfSources="originOfSources";
+    public static final String characteristicOfSources="characteristicOfSources";
+    public static final String accessToSources="accessToSources";
+    public static final String dataCollectionSituation="dataCollectionSituation";
+    public static final String actionsToMinimizeLoss="actionsToMinimizeLoss";
+    public static final String controlOperations="controlOperations";
+    public static final String weighting="weighting";
+    public static final String cleaningOperations="cleaningOperations";
+    public static final String datasetLevelErrorNotes="datasetLevelErrorNotes";
+    public static final String responseRate="responseRate";
+    public static final String samplingErrorEstimates="samplingErrorEstimates";
+
+    public static final String socialScienceNotes = "socialScienceNotes";
+    public static final String socialScienceNotesType = "socialScienceNotesType";
+    public static final String socialScienceNotesSubject = "socialScienceNotesSubject";
+    public static final String socialScienceNotesText = "socialScienceNotesText";
+
+    public static final String otherDataAppraisal="otherDataAppraisal";
+    public static final String placeOfAccess="placeOfAccess";
+    public static final String originalArchive="originalArchive";
+    public static final String availabilityStatus="availabilityStatus";
+    public static final String collectionSize="collectionSize";
+    public static final String datasetCompletion="datasetCompletion";
+    public static final String numberOfFiles="numberOfFiles";
+    public static final String confidentialityDeclaration="confidentialityDeclaration";
+    public static final String specialPermissions="specialPermissions";
+    public static final String restrictions="restrictions";
+    @Deprecated
+    //Doesn't appear to be used and is not datasetContact
+    public static final String contact="contact";
+    public static final String citationRequirements="citationRequirements";
+    public static final String depositorRequirements="depositorRequirements";
+    public static final String conditions="conditions";
+    public static final String disclaimer="disclaimer";
+    public static final String relatedMaterial="relatedMaterial";
+    //public static final String replicationFor="replicationFor";
+    //public static final String relatedPublications="relatedPublications";
+    public static final String relatedDatasets="relatedDatasets";
+    public static final String otherReferences="otherReferences";
+    public static final String notesText="notesText";
+    public static final String language="language";
+    public static final String noteInformationType="noteInformationType";
+    public static final String notesInformationSubject="notesInformationSubject";
+    public static final String subject="subject";
     /*
      * The following getters are needed so we can use them as properties in JSP 
      */
@@ -486,6 +489,8 @@ public String getRestrictions() {
         return restrictions;
     }
     
+    @Deprecated
+    //Appears to not be used
     public String getContact() {
         return contact;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValue.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValue.java
index bad482dbca9..8ac98500890 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValue.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValue.java
@@ -8,18 +8,18 @@
 
 import java.io.Serializable;
 import java.util.Collection;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
 
 /**
  *
@@ -113,7 +113,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object object) {
-        if (!(object instanceof DatasetField)) {
+        if (!(object instanceof DatasetFieldDefaultValue)) {
             return false;
         }
         DatasetFieldDefaultValue other = (DatasetFieldDefaultValue) object;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldServiceBean.java
index 03e677a1d74..0b6b74e6a73 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldServiceBean.java
@@ -1,13 +1,57 @@
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidParameterException;
+import java.sql.Timestamp;
+import java.text.MessageFormat;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonValue.ValueType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.TypedQuery;
+
+import jakarta.persistence.criteria.*;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpResponseInterceptor;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.EntityUtils;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 
 /**
  *
@@ -20,15 +64,40 @@ public class DatasetFieldServiceBean implements java.io.Serializable {
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
 
+    private static final Logger logger = Logger.getLogger(DatasetFieldServiceBean.class.getCanonicalName());
+
+    @EJB
+    SettingsServiceBean settingsService;
+
     private static final String NAME_QUERY = "SELECT dsfType from DatasetFieldType dsfType where dsfType.name= :fieldName";
 
+    /*
+     * External vocabulary support: These fields cache information from the CVocConf
+     * setting which controls how Dataverse connects specific metadata block fields
+     * to third-party Javascripts and external vocabulary services to allow users to
+     * input values from a vocabulary(ies) those services manage.
+     */
+
+    //Configuration json keyed by the id of the 'parent' DatasetFieldType
+    Map <Long, JsonObject> cvocMap = null;
+
+    //Configuration json keyed by the id of the child DatasetFieldType specified as the 'term-uri-field'
+    //Note that for primitive fields, the prent and term-uri-field are the same and these maps have the same entry
+    Map <Long, JsonObject> cvocMapByTermUri = null;
+
+    //Flat list of cvoc term-uri and managed fields by Id
+    Set<Long> cvocFieldSet = null;
+
+    //The hash of the existing CVocConf setting. Used to determine when the setting has changed and it needs to be re-parsed to recreate the cvocMaps
+    String oldHash = null;
+
     public List<DatasetFieldType> findAllAdvancedSearchFieldTypes() {
-        return em.createQuery("select object(o) from DatasetFieldType as o where o.advancedSearchFieldType = true and o.title != '' order by o.id", DatasetFieldType.class).getResultList();
+        return em.createQuery("select object(o) from DatasetFieldType as o where o.advancedSearchFieldType = true and o.title != '' order by o.displayOrder,o.id", DatasetFieldType.class).getResultList();
     }
 
     public List<DatasetFieldType> findAllFacetableFieldTypes() {
          return em.createNamedQuery("DatasetFieldType.findAllFacetable", DatasetFieldType.class)
-                .getResultList();   
+                .getResultList();
     }
 
     public List<DatasetFieldType> findFacetableFieldTypesByMetadataBlock(Long metadataBlockId) {
@@ -59,7 +128,7 @@ public DatasetFieldType findByName(String name) {
         } catch (NoResultException e) {
             return null;
         }
-       
+
     }
 
     /**
@@ -80,11 +149,11 @@ public DatasetFieldType findByNameOpt(String name) {
         }
     }
 
-    /* 
+    /*
      * Similar method for looking up foreign metadata field mappings, for metadata
-     * imports. for these the uniquness of names isn't guaranteed (i.e., there 
-     * can be a field "author" in many different formats that we want to support), 
-     * so these have to be looked up by both the field name and the name of the 
+     * imports. for these the uniquness of names isn't guaranteed (i.e., there
+     * can be a field "author" in many different formats that we want to support),
+     * so these have to be looked up by both the field name and the name of the
      * foreign format.
      */
     public ForeignMetadataFieldMapping findFieldMapping(String formatName, String pathName) {
@@ -96,14 +165,13 @@ public ForeignMetadataFieldMapping findFieldMapping(String formatName, String pa
         } catch (NoResultException nre) {
             return null;
         }
-
         // TODO: cache looked up results.
     }
 
     public ControlledVocabularyValue findControlledVocabularyValue(Object pk) {
         return em.find(ControlledVocabularyValue.class, pk);
     }
-   
+
     /**
      * @param dsft The DatasetFieldType in which to look up a
      * ControlledVocabularyValue.
@@ -114,31 +182,26 @@ public ControlledVocabularyValue findControlledVocabularyValue(Object pk) {
      * @return The ControlledVocabularyValue found or null.
      */
     public ControlledVocabularyValue findControlledVocabularyValueByDatasetFieldTypeAndStrValue(DatasetFieldType dsft, String strValue, boolean lenient) {
-        TypedQuery<ControlledVocabularyValue> typedQuery = em.createQuery("SELECT OBJECT(o) FROM ControlledVocabularyValue AS o WHERE o.strValue = :strvalue AND o.datasetFieldType = :dsft", ControlledVocabularyValue.class);       
+        TypedQuery<ControlledVocabularyValue> typedQuery = em.createQuery("SELECT OBJECT(o) FROM ControlledVocabularyValue AS o WHERE o.strValue = :strvalue AND o.datasetFieldType = :dsft", ControlledVocabularyValue.class);
         typedQuery.setParameter("strvalue", strValue);
         typedQuery.setParameter("dsft", dsft);
         try {
             ControlledVocabularyValue cvv = typedQuery.getSingleResult();
             return cvv;
         } catch (NoResultException | NonUniqueResultException ex) {
-            if (lenient) {
-                // if the value isn't found, check in the list of alternate values for this datasetFieldType
-                TypedQuery<ControlledVocabAlternate> alternateQuery = em.createQuery("SELECT OBJECT(o) FROM ControlledVocabAlternate as o WHERE o.strValue = :strvalue AND o.datasetFieldType = :dsft", ControlledVocabAlternate.class);
-                alternateQuery.setParameter("strvalue", strValue);
-                alternateQuery.setParameter("dsft", dsft);
-                try {
-                    ControlledVocabAlternate alternateValue = alternateQuery.getSingleResult();
-                    return alternateValue.getControlledVocabularyValue();
-                } catch (NoResultException | NonUniqueResultException ex2) {
-                    return null;
-                }
-
-            } else {
+            // if the value isn't found, check in the list of alternate values for this datasetFieldType
+            TypedQuery<ControlledVocabAlternate> alternateQuery = em.createQuery("SELECT OBJECT(o) FROM ControlledVocabAlternate as o WHERE o.strValue = :strvalue AND o.datasetFieldType = :dsft", ControlledVocabAlternate.class);
+            alternateQuery.setParameter("strvalue", strValue);
+            alternateQuery.setParameter("dsft", dsft);
+            try {
+                ControlledVocabAlternate alternateValue = alternateQuery.getSingleResult();
+                return alternateValue.getControlledVocabularyValue();
+            } catch (NoResultException | NonUniqueResultException ex2) {
                 return null;
             }
         }
     }
-    
+
     public ControlledVocabAlternate findControlledVocabAlternateByControlledVocabularyValueAndStrValue(ControlledVocabularyValue cvv, String strValue){
         TypedQuery<ControlledVocabAlternate> typedQuery = em.createQuery("SELECT OBJECT(o) FROM ControlledVocabAlternate AS o WHERE o.strValue = :strvalue AND o.controlledVocabularyValue = :cvv", ControlledVocabAlternate.class);
         typedQuery.setParameter("strvalue", strValue);
@@ -153,7 +216,7 @@ public ControlledVocabAlternate findControlledVocabAlternateByControlledVocabula
            return (ControlledVocabAlternate) results.get(0);
         }
     }
-    
+
     /**
      * @param dsft The DatasetFieldType in which to look up a
      * ControlledVocabularyValue.
@@ -163,7 +226,7 @@ public ControlledVocabAlternate findControlledVocabAlternateByControlledVocabula
      * @return The ControlledVocabularyValue found or null.
      */
     public ControlledVocabularyValue findControlledVocabularyValueByDatasetFieldTypeAndIdentifier (DatasetFieldType dsft, String identifier)  {
-        TypedQuery<ControlledVocabularyValue> typedQuery = em.createQuery("SELECT OBJECT(o) FROM ControlledVocabularyValue AS o WHERE o.identifier = :identifier AND o.datasetFieldType = :dsft", ControlledVocabularyValue.class);       
+        TypedQuery<ControlledVocabularyValue> typedQuery = em.createQuery("SELECT OBJECT(o) FROM ControlledVocabularyValue AS o WHERE o.identifier = :identifier AND o.datasetFieldType = :dsft", ControlledVocabularyValue.class);
         typedQuery.setParameter("identifier", identifier);
         typedQuery.setParameter("dsft", dsft);
         try {
@@ -192,9 +255,874 @@ public MetadataBlock save(MetadataBlock mdb) {
     public ControlledVocabularyValue save(ControlledVocabularyValue cvv) {
         return em.merge(cvv);
     }
-    
+
     public ControlledVocabAlternate save(ControlledVocabAlternate alt) {
         return em.merge(alt);
-    } 
+    }
+
+
+    /**
+     * This method returns a Map relating DatasetFieldTypes with any external
+     * vocabulary configuration information associated with them via the CVocConf
+     * setting. THe mapping is keyed by the DatasetFieldType id for primitive fields
+     * and, for a compound field, by the id of either the 'parent' DatasetFieldType
+     * id or of the child field specified as the 'term-uri-field' (the field where
+     * the URI of the term is stored (and not one of the child fields where the term
+     * name, vocabulary URI, vocabulary Name or other managed information may go.)
+     *
+     * The map only contains values for DatasetFieldTypes that are configured to use external vocabulary services.
+     *
+     * @param byTermUriField - false: the id of the parent DatasetFieldType is the key, true: the 'term-uri-field' DatasetFieldType id is used as the key
+     * @return - a map of JsonObjects containing configuration information keyed by the DatasetFieldType id (Long)
+     */
+    public Map<Long, JsonObject> getCVocConf(boolean byTermUriField){
+
+        //ToDo - change to an API call to be able to provide feedback if the json is invalid?
+        String cvocSetting = settingsService.getValueForKey(SettingsServiceBean.Key.CVocConf);
+        if (cvocSetting == null || cvocSetting.isEmpty()) {
+            oldHash=null;
+            //Release old maps
+            cvocMap=null;
+            cvocMapByTermUri=null;
+            cvocFieldSet = null;
+            return new HashMap<>();
+        }
+        String newHash = DigestUtils.md5Hex(cvocSetting);
+        if (newHash.equals(oldHash)) {
+            return byTermUriField ? cvocMapByTermUri : cvocMap;
+        }
+        oldHash=newHash;
+        cvocMap=new HashMap<>();
+        cvocMapByTermUri=new HashMap<>();
+        cvocFieldSet = new HashSet<>();
+
+        try (JsonReader jsonReader = Json.createReader(new StringReader(settingsService.getValueForKey(SettingsServiceBean.Key.CVocConf)))) {
+            JsonArray cvocConfJsonArray = jsonReader.readArray();
+            for (JsonObject jo : cvocConfJsonArray.getValuesAs(JsonObject.class)) {
+                DatasetFieldType dft = findByNameOpt(jo.getString("field-name"));
+                if (dft == null) {
+                    logger.warning("Ignoring External Vocabulary setting for non-existent field: "
+                      + jo.getString("field-name"));
+                } else {
+                    cvocMap.put(dft.getId(), jo);
+                    if (jo.containsKey("term-uri-field")) {
+                        String termUriField = jo.getString("term-uri-field");
+                        if (!dft.isHasChildren()) {
+                            if (termUriField.equals(dft.getName())) {
+                                logger.fine("Found primitive field for term uri : " + dft.getName() + ": " + dft.getId());
+                                cvocMapByTermUri.put(dft.getId(), jo);
+                                cvocFieldSet.add(dft.getId());
+                            }
+                        } else {
+                            DatasetFieldType childdft = findByNameOpt(jo.getString("term-uri-field"));
+                            logger.fine("Found term child field: " + childdft.getName()+ ": " + childdft.getId());
+                            cvocMapByTermUri.put(childdft.getId(), jo);
+                            cvocFieldSet.add(childdft.getId());
+                            if (childdft.getParentDatasetFieldType() != dft) {
+                                logger.warning("Term URI field (" + childdft.getDisplayName() + ") not a child of parent: "
+                                  + dft.getDisplayName());
+                            }
+                        }
+                        if (dft == null) {
+                            logger.warning("Ignoring External Vocabulary setting for non-existent child field: "
+                              + jo.getString("term-uri-field"));
+                        }
+                    }
+                    if (jo.containsKey("managed-fields")) {
+                        JsonObject managedFields = jo.getJsonObject("managed-fields");
+                        for (String s : managedFields.keySet()) {
+                            dft = findByNameOpt(managedFields.getString(s));
+                            if (dft == null) {
+                                logger.warning("Ignoring External Vocabulary setting for non-existent child field: "
+                                        + managedFields.getString(s));
+                            } else {
+                                logger.fine("Found: " + dft.getName());
+                                cvocFieldSet.add(dft.getId());
+                            }
+                        }
+                    }
+                }
+            }
+            } catch(JsonException e) {
+                logger.warning("Ignoring External Vocabulary setting due to parsing error: " + e.getLocalizedMessage());
+            }
+        return byTermUriField ? cvocMapByTermUri : cvocMap;
+    }
+
+    public Set<Long> getCvocFieldSet() {
+        return cvocFieldSet;
+    }
+
+    /**
+     * Adds information about the external vocabulary term being used in this DatasetField to the ExternalVocabularyValue table if it doesn't already exist.
+     * @param df - the primitive/parent compound field containing a newly saved value
+     */
+    public void registerExternalVocabValues(DatasetField df) {
+        DatasetFieldType dft = df.getDatasetFieldType();
+        logger.fine("Registering for field: " + dft.getName());
+        JsonObject cvocEntry = getCVocConf(true).get(dft.getId());
+        if (dft.isPrimitive()) {
+            List<DatasetField> siblingsDatasetFields = new ArrayList<>();
+            if(dft.getParentDatasetFieldType()!=null) {
+                siblingsDatasetFields = df.getParentDatasetFieldCompoundValue().getChildDatasetFields();
+            }
+            for (DatasetFieldValue dfv : df.getDatasetFieldValues()) {
+                registerExternalTerm(cvocEntry, dfv.getValue(), siblingsDatasetFields);
+            }
+        } else {
+            if (df.getDatasetFieldType().isCompound()) {
+                DatasetFieldType termdft = findByNameOpt(cvocEntry.getString("term-uri-field"));
+                for (DatasetFieldCompoundValue cv : df.getDatasetFieldCompoundValues()) {
+                    for (DatasetField cdf : cv.getChildDatasetFields()) {
+                        logger.fine("Found term uri field type id: " + cdf.getDatasetFieldType().getId());
+                        if (cdf.getDatasetFieldType().equals(termdft)) {
+                            registerExternalTerm(cvocEntry, cdf.getValue(), cv.getChildDatasetFields());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Retrieves indexable strings from a cached externalvocabularyvalue entry filtered through retrieval-filtering configuration.
+     * <p>
+     * This method assumes externalvocabularyvalue entries have been filtered and that they contain a single JsonObject.
+     * Cases Handled : A String, an Array of Strings, an Array of Objects with "value" or "content" keys, an Object with one or more entries that have String values or Array values with a set of String values.
+     * The string(s), or the "value/content"s for each language are added to the set.
+     * Retrieved string values are indexed in the term-uri-field (parameter defined in CVOC configuration) by default, or in the field specified by an optional "indexIn" parameter in the retrieval-filtering defined in the CVOC configuration.
+     * <p>
+     * Any parsing error results in no entries (there can be unfiltered entries with
+     * unknown structure - getting some strings from such an entry could give fairly
+     * random info that would be bad to addd for searches, etc.)
+     *
+     * @param termUri unique identifier to search in database
+     * @param cvocEntry related cvoc configuration
+     * @param indexingField name of solr field that will be filled with getStringsFor while indexing
+     * @return - a set of indexable strings
+     */
+    public Set<String> getIndexableStringsByTermUri(String termUri, JsonObject cvocEntry, String indexingField) {
+        Set<String> strings = new HashSet<>();
+        JsonObject jo = getExternalVocabularyValue(termUri);
+        JsonObject filtering = cvocEntry.getJsonObject("retrieval-filtering");
+        String termUriField = cvocEntry.getJsonString("term-uri-field").getString();
+
+        if (jo != null) {
+            try {
+                for (String key : jo.keySet()) {
+                    String indexIn = filtering.getJsonObject(key).getString("indexIn", null);
+                    // Either we are in mapping mode so indexingField (solr field) equals indexIn (cvoc config)
+                    // Or we are in default mode indexingField is termUriField, indexIn is not defined then only termName and personName keys are used
+                    if (indexingField.equals(indexIn) ||
+                            (indexIn == null && termUriField.equals(indexingField) && (key.equals("termName")) || key.equals("personName"))) {
+                        JsonValue jv = jo.get(key);
+                        if (jv.getValueType().equals(JsonValue.ValueType.STRING)) {
+                            logger.fine("adding " + jo.getString(key) + " for " + termUri);
+                            strings.add(jo.getString(key));
+                        } else if (jv.getValueType().equals(JsonValue.ValueType.ARRAY)) {
+                            JsonArray jarr = jv.asJsonArray();
+                            for (int i = 0; i < jarr.size(); i++) {
+                                if (jarr.get(i).getValueType().equals(JsonValue.ValueType.STRING)) {
+                                    strings.add(jarr.getString(i));
+                                } else if (jarr.get(i).getValueType().equals(ValueType.OBJECT)) { // This condition handles SKOSMOS format like [{"lang": "en","value": "non-apis bee"},{"lang": "fr","value": "abeille non apis"}]
+                                    JsonObject entry = jarr.getJsonObject(i);
+                                    if (entry.containsKey("value")) {
+                                        logger.fine("adding " + entry.getString("value") + " for " + termUri);
+                                        strings.add(entry.getString("value"));
+                                    } else if (entry.containsKey("content")) {
+                                        logger.fine("adding " + entry.getString("content") + " for " + termUri);
+                                        strings.add(entry.getString("content"));
+
+                                    }
+                                }
+                            }
+                        } else if (jv.getValueType().equals(JsonValue.ValueType.OBJECT)) {
+                            JsonObject joo = jv.asJsonObject();
+                            for (Map.Entry<String, JsonValue> entry : joo.entrySet()) {
+                                if (entry.getValue().getValueType().equals(JsonValue.ValueType.STRING)) { // This condition handles format like { "fr": "association de quartier", "en": "neighborhood associations"}
+                                    logger.fine("adding " + joo.getString(entry.getKey()) + " for " + termUri);
+                                    strings.add(joo.getString(entry.getKey()));
+                                } else if (entry.getValue().getValueType().equals(ValueType.ARRAY)) { // This condition handles format like {"en": ["neighbourhood societies"]}
+                                    JsonArray jarr = entry.getValue().asJsonArray();
+                                    for (int i = 0; i < jarr.size(); i++) {
+                                        if (jarr.get(i).getValueType().equals(JsonValue.ValueType.STRING)) {
+                                            logger.fine("adding " + jarr.getString(i) + " for " + termUri);
+                                            strings.add(jarr.getString(i));
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                logger.warning(
+                        "Problem interpreting external vocab value for uri: " + termUri + " : " + e.getMessage());
+                return new HashSet<String>();
+            }
+        }
+        logger.fine("Returning " + String.join(",", strings) + " for " + termUri);
+        return strings;
+    }
+
+    /**
+     * Perform a query to retrieve a cached value from the externalvocabularvalue table
+     * @param termUri
+     * @return - the entry's value as a JsonObject
+     */
+    public JsonObject getExternalVocabularyValue(String termUri) {
+        try {
+            ExternalVocabularyValue evv = em
+                    .createQuery("select object(o) from ExternalVocabularyValue as o where o.uri=:uri",
+                            ExternalVocabularyValue.class)
+                    .setParameter("uri", termUri).getSingleResult();
+            String valString = evv.getValue();
+            try (JsonReader jr = Json.createReader(new StringReader(valString))) {
+                return jr.readObject();
+            } catch (Exception e) {
+                logger.warning("Problem parsing external vocab value for uri: " + termUri + " : " + e.getMessage());
+            }
+        } catch (NoResultException nre) {
+            //Could just be a plain text value
+            logger.fine("No external vocab value for uri: " + termUri);
+        }
+        return null;
+    }
+
+    /**
+     * Perform a call to the external service to retrieve information about the term URI
+     *
+     * @param cvocEntry             - the configuration for the DatasetFieldType associated with this term
+     * @param term                  - the term uri as a string
+     * @param relatedDatasetFields  - siblings or childs of the term
+     */
+    public void registerExternalTerm(JsonObject cvocEntry, String term, List<DatasetField> relatedDatasetFields) {
+        String retrievalUri = cvocEntry.getString("retrieval-uri");
+        String termUriFieldName = cvocEntry.getString("term-uri-field");
+        String prefix = cvocEntry.getString("prefix", null);
+        if(StringUtils.isBlank(term)) {
+            logger.fine("Ignoring blank term");
+            return;
+        }
+
+        boolean isExternal = false;
+        JsonObject vocabs = cvocEntry.getJsonObject("vocabs");
+        for (String key: vocabs.keySet()) {
+            JsonObject vocab = vocabs.getJsonObject(key);
+            if (vocab.containsKey("uriSpace")) {
+                if (term.startsWith(vocab.getString("uriSpace"))) {
+                    isExternal = true;
+                    break;
+                }
+            }
+        }
+        if (!isExternal) {
+            logger.fine("Ignoring free text entry: " + term);
+            return;
+        }
+        logger.fine("Registering term: " + term);
+        try {
+            //Assure the term is in URI form - should be if the uriSpace entry was correct
+            new URI(term);
+            ExternalVocabularyValue evv = null;
+            try {
+                evv = em.createQuery("select object(o) from ExternalVocabularyValue as o where o.uri=:uri",
+                        ExternalVocabularyValue.class).setParameter("uri", term).getSingleResult();
+            } catch (NoResultException nre) {
+                evv = new ExternalVocabularyValue(term, null);
+            }
+            if (evv.getValue() == null) {
+                String adjustedTerm = (prefix==null)? term: term.replace(prefix, "");
+
+                try {
+                    retrievalUri = tryToReplaceRetrievalUriParam(retrievalUri, "0", adjustedTerm);
+                    retrievalUri = tryToReplaceRetrievalUriParam(retrievalUri, termUriFieldName, adjustedTerm);
+                    for (DatasetField f : relatedDatasetFields) {
+                        retrievalUri = tryToReplaceRetrievalUriParam(retrievalUri, f.getDatasetFieldType().getName(), f.getValue());
+                    }
+                } catch (InvalidParameterException e) {
+                    logger.warning("InvalidParameterException in tryReplaceRetrievalUriParam : " + e.getMessage());
+                    return;
+                }
+                if (retrievalUri.contains("{")) {
+                    logger.severe("Retrieval URI still contains unreplaced parameter :" + retrievalUri);
+                    return;
+                }
+
+                logger.fine("Didn't find " + term + ", calling " + retrievalUri);
+                try (CloseableHttpClient httpClient = HttpClients.custom()
+                        .addInterceptorLast(new HttpResponseInterceptor() {
+                            @Override
+                            public void process(HttpResponse response, HttpContext context) throws IOException {
+                                int statusCode = response.getStatusLine().getStatusCode();
+                                if (statusCode == 504) {
+                                    //Throwing an exception triggers the retry handler
+                                    throw new IOException("Retry due to 504 response");
+                                }
+                            }
+                        })
+                        //The retry handler will also do retries for network errors/other things that cause an IOException
+                        .setRetryHandler(new DefaultHttpRequestRetryHandler(3, false))
+                        .build()) {
+                    HttpGet httpGet = new HttpGet(retrievalUri);
+                    //application/json+ld is for backward compatibility
+                    httpGet.addHeader("Accept", "application/ld+json, application/json+ld, application/json");
+                    //Adding others custom HTTP request headers if exists
+                    final JsonObject headers = cvocEntry.getJsonObject("headers");
+                    if (headers != null) {
+                        final Set<String> headerKeys = headers.keySet();
+                        for (final String hKey: headerKeys) {
+                            httpGet.addHeader(hKey, headers.getString(hKey));
+                        }
+                    }
+                    HttpResponse response = httpClient.execute(httpGet);
+                    String data = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+                    int statusCode = response.getStatusLine().getStatusCode();
+                    if (statusCode == 200) {
+                        logger.fine("Returned data: " + data);
+                        try (JsonReader jsonReader = Json.createReader(new StringReader(data))) {
+                            String dataObj = filterResponse(cvocEntry, jsonReader.readObject(), term).toString();
+                            evv.setValue(dataObj);
+                            evv.setLastUpdateDate(Timestamp.from(Instant.now()));
+                            logger.fine("JsonObject: " + dataObj);
+                            em.merge(evv);
+                            em.flush();
+                            logger.fine("Wrote value for term: " + term);
+                        } catch (JsonException je) {
+                            logger.severe("Error retrieving: " + retrievalUri + " : " + je.getMessage());
+                        } catch (PersistenceException e) {
+                            logger.fine("Problem persisting: " + retrievalUri + " : " + e.getMessage());
+                        }
+                    } else {
+                        logger.severe("Received response code : " + statusCode + " when retrieving " + retrievalUri
+                                + " : " + data);
+                    }
+                } catch (IOException ioe) {
+                    logger.severe("IOException when retrieving url: " + retrievalUri + " : " + ioe.getMessage());
+                }
+            }
+        } catch (URISyntaxException e) {
+            logger.fine("Term is not a URI: " + term);
+        }
+    }
+
+    private String tryToReplaceRetrievalUriParam(String retrievalUri, String paramName, String value) throws InvalidParameterException {
+
+        if(StringUtils.isBlank(paramName)) {
+            throw new InvalidParameterException("Empty or null paramName is not allowed while replacing retrieval uri parameter");
+        }
+
+        if(retrievalUri.contains(paramName)) {
+            logger.fine("Parameter {" + paramName + "} found in retrievalUri");
+
+            if(StringUtils.isBlank(value)) {
+                throw new InvalidParameterException("Empty or null value is not allowed while replacing retrieval uri parameter");
+            }
+
+            if(retrievalUri.contains("encodeUrl:" + paramName)) {
+                retrievalUri = retrievalUri.replace("{encodeUrl:"+paramName+"}", URLEncoder.encode(value, StandardCharsets.UTF_8));
+            } else {
+                retrievalUri = retrievalUri.replace("{"+paramName+"}", value);
+            }
+        } else {
+            logger.fine("Parameter {" + paramName + "} not found in retrievalUri");
+        }
+
+        return retrievalUri;
+    }
 
+    /**
+     * Parse the raw value returned by an external service for a give term uri and
+     * filter it according to the 'retrieval-filtering' configuration for this
+     * DatasetFieldType, creating a Json value with the specified structure
+     *
+     * @param cvocEntry - the config for this DatasetFieldType
+     * @param readObject - the raw response from the service
+     * @param termUri - the term uri
+     * @return - a JsonObject with the structure defined by the filtering configuration
+     */
+    private JsonObject filterResponse(JsonObject cvocEntry, JsonObject readObject, String termUri) {
+
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        JsonObject filtering = cvocEntry.getJsonObject("retrieval-filtering");
+        logger.fine("RF: " + filtering.toString());
+        JsonObject managedFields = cvocEntry.getJsonObject("managed-fields");
+        logger.fine("MF: " + managedFields.toString());
+        int nrOfNotFound = 0;
+        for (String filterKey : filtering.keySet()) {
+            if (!filterKey.equals("@context")) {
+                try {
+                    JsonObject filter = filtering.getJsonObject(filterKey);
+                    logger.fine("F: " + filter.toString());
+                    JsonArray params = filter.getJsonArray("params");
+                    if (params == null) {
+                        params = Json.createArrayBuilder().build();
+                    }
+                    logger.fine("Params: " + params.toString());
+                    List<Object> vals = new ArrayList<Object>();
+                    for (int i = 0; i < params.size(); i++) {
+                        String param = params.getString(i);
+                        if (param.startsWith("/")) {
+                            // Remove leading /
+                            param = param.substring(1);
+                            String[] pathParts = param.split("/");
+                            logger.fine("PP: " + String.join(", ", pathParts));
+                            var foundPart = processPathSegment(0, pathParts, readObject, termUri);
+                            if (foundPart == null) {
+                                nrOfNotFound ++ ;
+                                logger.warning("External Vocabulary: no value found for %s - %s".formatted(filterKey, param));
+                            } else {
+                                vals.add(i, foundPart);
+                                logger.fine("Added param value: " + i + ": " + vals.get(i));
+                            }
+                        } else {
+                            logger.fine("Param is: " + param);
+                            // param is not a path - either a reference to the term URI
+                            if (param.equals("@id")) {
+                                logger.fine("Adding id param: " + termUri);
+                                vals.add(i, termUri);
+                            } else {
+                                // or a hardcoded value
+                                logger.fine("Adding hardcoded param: " + param);
+                                vals.add(i, param);
+                            }
+                        }
+                    }
+                    // Shortcut: nominally using a pattern of {0} and a param that is @id or
+                    // hardcoded value allows the same options as letting the pattern itself be @id
+                    // or a hardcoded value
+                    String pattern = filter.getString("pattern");
+                    logger.fine("Pattern: " + pattern);
+                    if (pattern.equals("@id")) {
+                        logger.fine("Added #id pattern: " + filterKey + ": " + termUri);
+                        job.add(filterKey, termUri);
+                    } else if (pattern.contains("{")) {
+                        if (vals.isEmpty()) {
+                            if (nrOfNotFound == 0) {
+                                logger.warning("External Vocabulary: " + termUri + " - No value found for " + filterKey);
+                            }
+                        }
+                        else {
+                            if (pattern.equals("{0}")) {
+                                if (vals.get(0) instanceof JsonArray) {
+                                    job.add(filterKey, (JsonArray) vals.get(0));
+                                }
+                                else if (vals.get(0) instanceof JsonObject) {
+                                    job.add(filterKey, (JsonObject) vals.get(0));
+                                }
+                                else {
+                                    job.add(filterKey, (String) vals.get(0));
+                                }
+                            }
+                            else {
+                                String result = MessageFormat.format(pattern, vals.toArray());
+                                logger.fine("Result: " + result);
+                                job.add(filterKey, result);
+                                logger.fine("Added : " + filterKey + ": " + result);
+                            }
+                        }
+                    } else {
+                        logger.fine("Added hardcoded pattern: " + filterKey + ": " + pattern);
+                        job.add(filterKey, pattern);
+                    }
+                } catch (Exception e) {
+                    logger.warning("External Vocabulary: " + termUri + " - Failed to find value for " + filterKey + ": "
+                            + e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+        }
+        if(nrOfNotFound>0) {
+            logger.warning("External Vocabulary: " + termUri + " - Failed to find value(s) reported above in " +readObject);
+        }
+        JsonObject filteredResponse = job.build();
+        if(filteredResponse.isEmpty()) {
+            logger.severe("Unable to filter response for term: " + termUri + ",  received: " + readObject.toString());
+            //Better to store nothing in this case so unknown values don't propagate to exported metadata (we'll just send the termUri itself in those cases).
+            return null;
+        } else {
+            return filteredResponse;
+        }
+    }
+
+    Object processPathSegment(int index, String[] pathParts, JsonValue curPath, String termUri) {
+        if (index < pathParts.length - 1) {
+            if (pathParts[index].contains("=")) {
+                JsonArray arr = ((JsonArray) curPath);
+                String[] keyVal = pathParts[index].split("=");
+                logger.fine("Looking for object where " + keyVal[0] + " is " + keyVal[1]);
+                String expected = keyVal[1];
+
+                if (!expected.equals("*")) {
+                    if (expected.equals("@id")) {
+                        expected = termUri;
+                    }
+                    if (arr != null) {
+                        for (int k = 0; k < arr.size(); k++) {
+                            JsonObject jo = arr.getJsonObject(k);
+                            if (jo!=null) {
+                                JsonValue val = jo.get(keyVal[0]);
+                                if (val != null) {
+                                    if (val.getValueType().equals(ValueType.STRING)) {
+                                        if (((JsonString) val).getString().equals(expected)) {
+                                            logger.fine("Found: " + jo);
+                                            curPath = jo;
+                                            return processPathSegment(index + 1, pathParts, curPath, termUri);
+                                        }
+                                    } else {
+                                        logger.warning("Expected a string value for " + keyVal[0] + " but found: " + val.getValueType());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    JsonArrayBuilder parts = Json.createArrayBuilder();
+                    for (JsonValue subPath : arr) {
+                        if (subPath instanceof JsonObject) {
+                            JsonValue nextValue = ((JsonObject) subPath).get(keyVal[0]);
+                            Object obj = processPathSegment(index + 1, pathParts, nextValue, termUri);
+                            if (obj instanceof String) {
+                                parts.add((String) obj);
+                            } else {
+                                parts.add((JsonValue) obj);
+                            }
+                        }
+                    }
+                    return parts.build();
+                }
+
+            } else {
+                curPath = ((JsonObject) curPath).get(pathParts[index]);
+                logger.fine("Found next Path object " + curPath);
+                return processPathSegment(index + 1, pathParts, curPath, termUri);
+            }
+        } else {
+            logger.fine("Last segment: " + curPath.toString());
+            logger.fine("Looking for : " + pathParts[index]);
+            JsonValue jv = ((JsonObject) curPath).get(pathParts[index]);
+            if (jv != null) {
+                ValueType type = jv.getValueType();
+                if (type.equals(ValueType.STRING)) {
+                    return ((JsonString) jv).getString();
+                }
+                else if (jv.getValueType().equals(ValueType.ARRAY)) {
+                    return jv;
+                }
+                else if (jv.getValueType().equals(ValueType.OBJECT)) {
+                    return jv;
+                }
+            }
+        }
+
+        return null;
+
+    }
+
+    /**
+     * Supports validation of externally controlled values. If the value is a URI it
+     * must be in the namespace (start with) one of the uriSpace values of an
+     * allowed vocabulary. If free text entries are allowed for this field (per the
+     * configuration), non-uri entries are also assumed valid.
+     *
+     * @param dft
+     * @param value
+     * @return - true: valid
+     */
+    public boolean isValidCVocValue(DatasetFieldType dft, String value) {
+        JsonObject jo = getCVocConf(true).get(dft.getId());
+        JsonObject vocabs = jo.getJsonObject("vocabs");
+        boolean valid = false;
+        boolean couldBeFreeText = true;
+        boolean freeTextAllowed = jo.getBoolean("allow-free-text", false);
+        for (String vocabName : vocabs.keySet()) {
+            JsonObject vocab = vocabs.getJsonObject(vocabName);
+            String baseUri = vocab.getString("uriSpace");
+            if (value.startsWith(baseUri)) {
+                valid = true;
+                break;
+            } else {
+                String protocol = baseUri.substring(baseUri.indexOf("://") + 3);
+                if (value.startsWith(protocol)) {
+                    couldBeFreeText = false;
+                    // No break because we need to check for conflicts with all vocabs
+                }
+            }
+        }
+        if (!valid) {
+            if (freeTextAllowed && couldBeFreeText) {
+                valid = true;
+            }
+        }
+        return valid;
+    }
+
+    public List<String> getVocabScripts( Map<Long, JsonObject> cvocConf) {
+        //ToDo - only return scripts that are needed (those fields are set on display pages, those blocks/fields are allowed in the Dataverse collection for create/edit)?
+        Set<String> scripts = new HashSet<String>();
+        for (JsonObject jo : cvocConf.values()) {
+            // Allow either a single script (a string) or an array of scripts (used, for
+            // example, to allow use of the common cvocutils.js script along with a main
+            // script for the field.)
+            JsonValue scriptValue = jo.get("js-url");
+            ValueType scriptType = scriptValue.getValueType();
+            if (scriptType.equals(ValueType.STRING)) {
+                scripts.add(((JsonString) scriptValue).getString());
+            } else if (scriptType.equals(ValueType.ARRAY)) {
+                JsonArray scriptArray = ((JsonArray) scriptValue);
+                for (int i = 0; i < scriptArray.size(); i++) {
+                    scripts.add(scriptArray.getString(i));
+                }
+            }
+        }
+        String customScript = settingsService.getValueForKey(SettingsServiceBean.Key.ControlledVocabularyCustomJavaScript);
+        if (customScript != null && !customScript.isEmpty()) {
+            scripts.add(customScript);
+        }
+        return Arrays.asList(scripts.toArray(new String[0]));
+    }
+
+    public String getFieldLanguage(String languages, String localeCode) {
+        // If the fields list of supported languages contains the current locale (e.g.
+        // the lang of the UI, or the current metadata input/display lang (tbd)), use
+        // that. Otherwise, return the first in the list
+        String[] langStrings = languages.split("\\s*,\\s*");
+        if (langStrings.length > 0) {
+            if (Arrays.asList(langStrings).contains(localeCode)) {
+                return localeCode;
+            } else {
+                return langStrings[0];
+            }
+        }
+        return null;
+    }
+
+    public List<DatasetFieldType> findAllDisplayedOnCreateInMetadataBlock(MetadataBlock metadataBlock) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<DatasetFieldType> criteriaQuery = criteriaBuilder.createQuery(DatasetFieldType.class);
+
+        Root<MetadataBlock> metadataBlockRoot = criteriaQuery.from(MetadataBlock.class);
+        Root<DatasetFieldType> datasetFieldTypeRoot = criteriaQuery.from(DatasetFieldType.class);
+
+        Predicate fieldRequiredInTheInstallation = buildFieldRequiredInTheInstallationPredicate(criteriaBuilder, datasetFieldTypeRoot);
+
+        criteriaQuery.where(
+                criteriaBuilder.and(
+                        criteriaBuilder.equal(metadataBlockRoot.get("id"), metadataBlock.getId()),
+                        datasetFieldTypeRoot.in(metadataBlockRoot.get("datasetFieldTypes")),
+                        criteriaBuilder.or(
+                                criteriaBuilder.isTrue(datasetFieldTypeRoot.get("displayOnCreate")),
+                                fieldRequiredInTheInstallation
+                        )
+                )
+        );
+
+        criteriaQuery.select(datasetFieldTypeRoot).distinct(true);
+
+        TypedQuery<DatasetFieldType> typedQuery = em.createQuery(criteriaQuery);
+        return typedQuery.getResultList();
+    }
+
+    public List<DatasetFieldType> findAllInMetadataBlockAndDataverse(MetadataBlock metadataBlock, Dataverse dataverse, boolean onlyDisplayedOnCreate, DatasetType datasetType) {
+        if (!dataverse.isMetadataBlockRoot() && dataverse.getOwner() != null) {
+            return findAllInMetadataBlockAndDataverse(metadataBlock, dataverse.getOwner(), onlyDisplayedOnCreate, datasetType);
+        }
+
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<DatasetFieldType> criteriaQuery = criteriaBuilder.createQuery(DatasetFieldType.class);
+
+        Root<MetadataBlock> metadataBlockRoot = criteriaQuery.from(MetadataBlock.class);
+        Root<DatasetFieldType> datasetFieldTypeRoot = criteriaQuery.from(DatasetFieldType.class);
+
+        // Build the main predicate to include fields that belong to the specified dataverse and metadataBlock and match the onlyDisplayedOnCreate value.
+        Predicate fieldPresentInDataverse = buildFieldPresentInDataversePredicate(dataverse, onlyDisplayedOnCreate, criteriaQuery, criteriaBuilder, datasetFieldTypeRoot, metadataBlockRoot);
+
+        // Build an additional predicate to include fields from the datasetType, if the datasetType is specified and contains the given metadataBlock.
+        Predicate fieldPresentInDatasetType = buildFieldPresentInDatasetTypePredicate(datasetType, criteriaQuery, criteriaBuilder, datasetFieldTypeRoot, metadataBlockRoot, onlyDisplayedOnCreate);
+
+        // Build the final WHERE clause by combining all the predicates.
+        criteriaQuery.where(
+                criteriaBuilder.equal(metadataBlockRoot.get("id"), metadataBlock.getId()), // Match the MetadataBlock ID.
+                datasetFieldTypeRoot.in(metadataBlockRoot.get("datasetFieldTypes")), // Ensure the DatasetFieldType is part of the MetadataBlock.
+                criteriaBuilder.or(
+                        fieldPresentInDataverse,
+                        fieldPresentInDatasetType
+                )
+        );
+
+        criteriaQuery.select(datasetFieldTypeRoot);
+
+        return em.createQuery(criteriaQuery).getResultList();
+    }
+
+    public boolean isFieldRequiredInDataverse(DatasetFieldType datasetFieldType, Dataverse dataverse) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
+
+        Root<Dataverse> dataverseRoot = criteriaQuery.from(Dataverse.class);
+        Root<DatasetFieldType> datasetFieldTypeRoot = criteriaQuery.from(DatasetFieldType.class);
+
+        // Join Dataverse with DataverseFieldTypeInputLevel on the "dataverseFieldTypeInputLevels" attribute, using a LEFT JOIN.
+        Join<Dataverse, DataverseFieldTypeInputLevel> datasetFieldTypeInputLevelJoin = dataverseRoot.join("dataverseFieldTypeInputLevels", JoinType.LEFT);
+
+        // Define a predicate to include DatasetFieldTypes that are marked as required in the input level.
+        Predicate requiredAsInputLevelPredicate = criteriaBuilder.and(
+                criteriaBuilder.equal(datasetFieldTypeRoot, datasetFieldTypeInputLevelJoin.get("datasetFieldType")),
+                criteriaBuilder.isTrue(datasetFieldTypeInputLevelJoin.get("required"))
+        );
+
+        // Define a predicate to include the required fields in the installation.
+        Predicate requiredInTheInstallationPredicate = buildFieldRequiredInTheInstallationPredicate(criteriaBuilder, datasetFieldTypeRoot);
+
+        // Build the final WHERE clause by combining all the predicates.
+        criteriaQuery.where(
+                criteriaBuilder.equal(dataverseRoot.get("id"), dataverse.getId()),
+                criteriaBuilder.equal(datasetFieldTypeRoot.get("id"), datasetFieldType.getId()),
+                criteriaBuilder.or(
+                        requiredAsInputLevelPredicate,
+                        requiredInTheInstallationPredicate
+                )
+        );
+
+        criteriaQuery.select(criteriaBuilder.count(datasetFieldTypeRoot));
+
+        Long count = em.createQuery(criteriaQuery).getSingleResult();
+
+        return count != null && count > 0;
+    }
+
+    private Predicate buildFieldPresentInDataversePredicate(Dataverse dataverse, boolean onlyDisplayedOnCreate, CriteriaQuery<DatasetFieldType> criteriaQuery, CriteriaBuilder criteriaBuilder, Root<DatasetFieldType> datasetFieldTypeRoot, Root<MetadataBlock> metadataBlockRoot) {
+        Root<Dataverse> dataverseRoot = criteriaQuery.from(Dataverse.class);
+
+        // Join Dataverse with DataverseFieldTypeInputLevel on the "dataverseFieldTypeInputLevels" attribute, using a LEFT JOIN.
+        Join<Dataverse, DataverseFieldTypeInputLevel> datasetFieldTypeInputLevelJoin = dataverseRoot.join("dataverseFieldTypeInputLevels", JoinType.LEFT);
+
+        // Define a predicate to include DatasetFieldTypes that are marked as included in the input level.
+        Predicate includedAsInputLevelPredicate = criteriaBuilder.and(
+                criteriaBuilder.equal(datasetFieldTypeRoot, datasetFieldTypeInputLevelJoin.get("datasetFieldType")),
+                criteriaBuilder.isTrue(datasetFieldTypeInputLevelJoin.get("include"))
+        );
+
+        // Define a predicate to include DatasetFieldTypes that are marked as required in the input level.
+        Predicate requiredAsInputLevelPredicate = criteriaBuilder.and(
+                criteriaBuilder.equal(datasetFieldTypeRoot, datasetFieldTypeInputLevelJoin.get("datasetFieldType")),
+                criteriaBuilder.isTrue(datasetFieldTypeInputLevelJoin.get("required"))
+        );
+
+        // Predicate for displayOnCreate in input level
+        Predicate displayOnCreateInputLevelPredicate = criteriaBuilder.and(
+            criteriaBuilder.equal(datasetFieldTypeRoot, datasetFieldTypeInputLevelJoin.get("datasetFieldType")),
+            criteriaBuilder.equal(datasetFieldTypeInputLevelJoin.get("displayOnCreate"), Boolean.TRUE)
+        );
+
+        // Create a subquery to check for the absence of a specific DataverseFieldTypeInputLevel.
+        Subquery<Long> subquery = criteriaQuery.subquery(Long.class);
+        Root<DataverseFieldTypeInputLevel> subqueryRoot = subquery.from(DataverseFieldTypeInputLevel.class);
+        subquery.select(criteriaBuilder.literal(1L))
+                .where(
+                        criteriaBuilder.equal(subqueryRoot.get("dataverse"), dataverseRoot),
+                        criteriaBuilder.equal(subqueryRoot.get("datasetFieldType"), datasetFieldTypeRoot),
+                        criteriaBuilder.isNotNull(subqueryRoot.get("displayOnCreate"))
+                );
+
+        // Define a predicate to exclude DatasetFieldTypes that have no associated input level (i.e., the subquery does not return a result).
+        Predicate hasNoInputLevelPredicate = criteriaBuilder.not(criteriaBuilder.exists(subquery));
+
+        // Define a predicate to include the required fields in the installation.
+        Predicate fieldRequiredInTheInstallation = buildFieldRequiredInTheInstallationPredicate(criteriaBuilder, datasetFieldTypeRoot);
+
+        // Define a predicate for displaying DatasetFieldTypes on create.
+        // If onlyDisplayedOnCreate is true, include fields that:
+        // - Are either marked as displayed on create OR marked as required, OR
+        // - Are required according to the input level.
+        // Otherwise, use an always-true predicate (conjunction).
+        Predicate displayedOnCreatePredicate = onlyDisplayedOnCreate
+                ? criteriaBuilder.or(
+                // 1. Field marked as displayOnCreate in input level
+                displayOnCreateInputLevelPredicate,
+                
+                // 2. Field without input level that is marked as displayOnCreate or required
+                criteriaBuilder.and(
+                    hasNoInputLevelPredicate,
+                    criteriaBuilder.or(
+                        criteriaBuilder.isTrue(datasetFieldTypeRoot.get("displayOnCreate")),
+                        fieldRequiredInTheInstallation
+                    )
+                ),
+                
+                // 3. Field required by input level
+                requiredAsInputLevelPredicate
+        )
+                : criteriaBuilder.conjunction();
+
+        // Combine all the predicates.
+        return criteriaBuilder.and(
+                criteriaBuilder.equal(dataverseRoot.get("id"), dataverse.getId()), // Match the Dataverse ID.
+                metadataBlockRoot.in(dataverseRoot.get("metadataBlocks")), // Ensure the MetadataBlock is part of the Dataverse.
+                criteriaBuilder.or(includedAsInputLevelPredicate, hasNoInputLevelPredicate), // Include DatasetFieldTypes based on the input level predicates.
+                displayedOnCreatePredicate // Apply the display-on-create filter if necessary.
+        );
+    }
+
+    private Predicate buildFieldPresentInDatasetTypePredicate(DatasetType datasetType,
+                                                              CriteriaQuery<DatasetFieldType> criteriaQuery,
+                                                              CriteriaBuilder criteriaBuilder,
+                                                              Root<DatasetFieldType> datasetFieldTypeRoot,
+                                                              Root<MetadataBlock> metadataBlockRoot,
+                                                              boolean onlyDisplayedOnCreate) {
+        Predicate datasetTypePredicate = criteriaBuilder.isFalse(criteriaBuilder.literal(true)); // Initialize datasetTypePredicate to always false by default
+        if (datasetType != null) {
+            // Create a subquery to check for the presence of the specified metadataBlock within the datasetType
+            Subquery<Long> datasetTypeSubquery = criteriaQuery.subquery(Long.class);
+            Root<DatasetType> datasetTypeRoot = criteriaQuery.from(DatasetType.class);
+
+            // Define a predicate for displaying DatasetFieldTypes on create.
+            // If onlyDisplayedOnCreate is true, include fields that are either marked as displayed on create OR marked as required.
+            // Otherwise, use an always-true predicate (conjunction).
+            Predicate displayedOnCreatePredicate = onlyDisplayedOnCreate ?
+                    criteriaBuilder.or(
+                            criteriaBuilder.isTrue(datasetFieldTypeRoot.get("displayOnCreate")),
+                            buildFieldRequiredInTheInstallationPredicate(criteriaBuilder, datasetFieldTypeRoot)
+                    )
+                    : criteriaBuilder.conjunction();
+
+            datasetTypeSubquery.select(criteriaBuilder.literal(1L))
+                    .where(
+                            criteriaBuilder.equal(datasetTypeRoot.get("id"), datasetType.getId()), // Match the DatasetType ID.
+                            metadataBlockRoot.in(datasetTypeRoot.get("metadataBlocks")), // Ensure the metadataBlock is included in the datasetType's list of metadata blocks.
+                            displayedOnCreatePredicate
+                    );
+
+            // Now set the datasetTypePredicate to true if the subquery finds a matching metadataBlock
+            datasetTypePredicate = criteriaBuilder.exists(datasetTypeSubquery);
+        }
+        return datasetTypePredicate;
+    }
+
+    private Predicate buildFieldRequiredInTheInstallationPredicate(CriteriaBuilder criteriaBuilder, Root<DatasetFieldType> datasetFieldTypeRoot) {
+        // Predicate to check if the current DatasetFieldType is required.
+        Predicate isRequired = criteriaBuilder.isTrue(datasetFieldTypeRoot.get("required"));
+
+        // Subquery to check if the parentDatasetFieldType is required or null.
+        // We need this check to avoid including conditionally required fields.
+        Subquery<Boolean> subquery = criteriaBuilder.createQuery(Boolean.class).subquery(Boolean.class);
+        Root<DatasetFieldType> parentRoot = subquery.from(DatasetFieldType.class);
+
+        subquery.select(criteriaBuilder.literal(true))
+                .where(
+                        criteriaBuilder.equal(parentRoot, datasetFieldTypeRoot.get("parentDatasetFieldType")),
+                        criteriaBuilder.or(
+                                criteriaBuilder.isNull(parentRoot.get("required")),
+                                criteriaBuilder.isTrue(parentRoot.get("required"))
+                        )
+                );
+
+        // Predicate to check that either the parentDatasetFieldType meets the condition or doesn't exist (is null).
+        Predicate parentCondition = criteriaBuilder.or(
+                criteriaBuilder.exists(subquery),
+                criteriaBuilder.isNull(datasetFieldTypeRoot.get("parentDatasetFieldType"))
+        );
+
+        return criteriaBuilder.and(isRequired, parentCondition);
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
index 04901264455..0191b178795 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
@@ -2,6 +2,7 @@
 
 import edu.harvard.iq.dataverse.search.SolrField;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.json.JsonLDTerm;
 
 import java.util.Collection;
 
@@ -12,8 +13,8 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.MissingResourceException;
-import javax.faces.model.SelectItem;
-import javax.persistence.*;
+import jakarta.faces.model.SelectItem;
+import jakarta.persistence.*;
 
 /**
  * Defines the meaning and constraints of a metadata field and its values.
@@ -35,8 +36,8 @@ public class DatasetFieldType implements Serializable, Comparable<DatasetFieldTy
      * The set of possible metatypes of the field. Used for validation and layout.
      */
     public enum FieldType {
-        TEXT, TEXTBOX, DATE, EMAIL, URL, FLOAT, INT, NONE
-    };    
+        TEXT, TEXTBOX, STRING, DATE, EMAIL, URL, FLOAT, INT, NONE
+    };
     
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -54,7 +55,7 @@ public void setId(Long id) {
     /**
      * The internal, DDI-like name, no spaces, etc.
      */
-    @Column(name = "name", columnDefinition = "TEXT", nullable = false)
+    @Column(name = "name", columnDefinition = "TEXT", nullable = false, unique=true)
     private String name;
 
     /**
@@ -140,8 +141,11 @@ public void setOptionSelectItems(List<SelectItem> optionSelectItems) {
     
     public DatasetFieldType() {}
 
+    //For use in tests
     public DatasetFieldType(String name, FieldType fieldType, boolean allowMultiples) {
+        // use the name for both default name and title
         this.name = name;
+        this.title = name;
         this.fieldType = fieldType;
         this.allowMultiples = allowMultiples;
         childDatasetFieldTypes = new LinkedList<>();
@@ -278,9 +282,28 @@ public boolean isDisplayOnCreate() {
     public void setDisplayOnCreate(boolean displayOnCreate) {
         this.displayOnCreate = displayOnCreate;
     }
+
+    /**
+     * Determines whether this field type is displayed in the form when creating
+     * the Dataset (or only later when editing after the initial creation).
+     */
+    @Transient
+    private Boolean localDisplayOnCreate;
+
+    public Boolean getLocalDisplayOnCreate() {
+        return localDisplayOnCreate;
+    }
+
+    public void setLocalDisplayOnCreate(Boolean localDisplayOnCreate) {
+        this.localDisplayOnCreate = localDisplayOnCreate;
+    }
     
+    public boolean shouldDisplayOnCreate() {
+        return (localDisplayOnCreate == null) ? displayOnCreate : localDisplayOnCreate;
+    }
+        
     public boolean isControlledVocabulary() {
-        return controlledVocabularyValues != null && !controlledVocabularyValues.isEmpty();
+        return allowControlledVocabulary;
     }
 
     /**
@@ -306,6 +329,14 @@ public void setMetadataBlock(MetadataBlock metadataBlock) {
     public String getUri() {
     	return uri;
     }
+    
+    public JsonLDTerm getJsonLDTerm() {
+        if(uri!=null) {
+        return new JsonLDTerm(name,uri);
+        } else {
+            return new JsonLDTerm(metadataBlock.getJsonLDNamespace(), name);
+        }
+    }
 
     public void setUri(String uri) {
     	this.uri=uri;
@@ -519,28 +550,38 @@ public String getDisplayName() {
     public SolrField getSolrField() {
         SolrField.SolrType solrType = SolrField.SolrType.TEXT_EN;
         if (fieldType != null) {
-
-            /**
-             * @todo made more decisions based on fieldType: index as dates,
-             * integers, and floats so we can do range queries etc.
-             */
             if (fieldType.equals(FieldType.DATE)) {
                 solrType = SolrField.SolrType.DATE;
             } else if (fieldType.equals(FieldType.EMAIL)) {
                 solrType = SolrField.SolrType.EMAIL;
+            } else if (fieldType.equals(FieldType.INT)) {
+                solrType = SolrField.SolrType.INTEGER;
+            } else if (fieldType.equals(FieldType.FLOAT)) {
+                solrType = SolrField.SolrType.FLOAT;
+            } else if (fieldType.equals(FieldType.STRING)) {
+                solrType = SolrField.SolrType.STRING;
             }
 
-            Boolean parentAllowsMultiplesBoolean = false;
-            if (isHasParent()) {
-                if (getParentDatasetFieldType() != null) {
-                    DatasetFieldType parent = getParentDatasetFieldType();
-                    parentAllowsMultiplesBoolean = parent.isAllowMultiples();
+            Boolean anyParentAllowsMultiplesBoolean = false;
+            DatasetFieldType currentDatasetFieldType = this;
+            // Traverse up through all parents of dataset field type
+            // If any one of them allows multiples, this child's Solr field must be multi-valued
+            while (currentDatasetFieldType.isHasParent()) {
+                if (currentDatasetFieldType.getParentDatasetFieldType() != null) {
+                    DatasetFieldType parent = currentDatasetFieldType.getParentDatasetFieldType();
+                    if (parent.isAllowMultiples()) {
+                        anyParentAllowsMultiplesBoolean = true;
+                        break; // no need to keep traversing
+                    }
+                    currentDatasetFieldType = parent;
+                } else {
+                    break;
                 }
             }
             
             boolean makeSolrFieldMultivalued;
             // http://stackoverflow.com/questions/5800762/what-is-the-use-of-multivalued-field-type-in-solr
-            if (allowMultiples || parentAllowsMultiplesBoolean) {
+            if (allowMultiples || anyParentAllowsMultiplesBoolean || isControlledVocabulary()) {
                 makeSolrFieldMultivalued = true;
             } else {
                 makeSolrFieldMultivalued = false;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValidator.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValidator.java
index 425ed0b22ef..6d3fda2812d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValidator.java
@@ -5,11 +5,15 @@
  */
 package edu.harvard.iq.dataverse;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import org.apache.commons.lang.StringUtils;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**
@@ -26,21 +30,59 @@ public void initialize(ValidateDatasetFieldType constraintAnnotation) {
     public boolean isValid(DatasetField value, ConstraintValidatorContext context) {
         context.disableDefaultConstraintViolation(); // we do this so we can have different messages depending on the different issue
 
+        // If invalid characters are found, mutate the value by removing them.
+        if (value != null && value.getValue() != null) {
+            String invalidCharacters = "[\f\u0002\ufffe]";
+            Pattern p = Pattern.compile(invalidCharacters);
+            Matcher m = p.matcher(value.getValue());
+            boolean invalidCharactersFound = m.find();
+            if (invalidCharactersFound) {
+                List<DatasetFieldValue> datasetFieldValues = value.getDatasetFieldValues();
+                List<ControlledVocabularyValue> controlledVocabularyValues = value.getControlledVocabularyValues();
+                if (!datasetFieldValues.isEmpty()) {
+                    datasetFieldValues.get(0).setValue(value.getValue().replaceAll(invalidCharacters, ""));
+                } else if (controlledVocabularyValues != null && !controlledVocabularyValues.isEmpty()) {
+                    // This controlledVocabularyValues logic comes from value.getValue().
+                    // Controlled vocabularies shouldn't have invalid characters in them
+                    // but they do, we can add a "replace" here. Some untested, commented code below.
+                    // if (controlledVocabularyValues.get(0) != null) {
+                    //    controlledVocabularyValues.get(0).setStrValue(value.getValue().replaceAll(invalidCharacters, ""));
+                    // }
+                }
+            }
+        }
+
         DatasetFieldType dsfType = value.getDatasetFieldType();
         //SEK Additional logic turns off validation for templates
         if (isTemplateDatasetField(value)){
             return true;
         }
-        if (((dsfType.isPrimitive() && dsfType.isRequired())  || (dsfType.isPrimitive() && value.isRequired())) 
-                && StringUtils.isBlank(value.getValue())) {
-            try{
-                context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + BundleUtil.getStringFromBundle("isrequired")).addConstraintViolation();
-            } catch (NullPointerException npe){
-                //if there's no context for the error we can't put it anywhere....
+
+        // if value is not primitive or not empty
+        if (!dsfType.isPrimitive() || !StringUtils.isBlank(value.getValue())) {
+            return true;
+        }
+       
+        if (value.isRequired()) { 
+            String errorMessage = null;
+            DatasetFieldCompoundValue parent = value.getParentDatasetFieldCompoundValue();
+            if (parent == null || parent.getParentDatasetField().isRequired()) {
+                errorMessage = BundleUtil.getStringFromBundle("isrequired", List.of(dsfType.getDisplayName()));
+            } else if (areSiblingsPopulated(value)) {
+                errorMessage = BundleUtil.getStringFromBundle("isrequired.conditional", List.of(dsfType.getDisplayName(),parent.getParentDatasetField().getDatasetFieldType().getDisplayName()));
             }
 
-            return false;
+            if (errorMessage != null) {
+                try {
+                    context.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();
+                } catch (NullPointerException npe){
+                    //if there's no context for the error we can't put it anywhere....
+                }
+                
+                return false;
+            }
         }
+               
         return true;
     }
     
@@ -51,4 +93,17 @@ private boolean isTemplateDatasetField(DatasetField dsf) {
             return dsf.getTemplate() != null;
         }
     }
+    
+    private boolean areSiblingsPopulated(DatasetField dsf) {
+        if (dsf.getParentDatasetFieldCompoundValue() != null) {
+            DatasetFieldCompoundValue compound = dsf.getParentDatasetFieldCompoundValue();
+            for (DatasetField sibling : compound.getChildDatasetFields()) {
+                if (!StringUtils.isBlank(sibling.getValue())) {
+                    return true;
+                }
+            }      
+        }
+
+        return false;
+    } 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValue.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValue.java
index 27929dd3a39..1064187ccd6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValue.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValue.java
@@ -10,18 +10,18 @@
 import edu.harvard.iq.dataverse.util.MarkupChecker;
 import java.io.Serializable;
 import java.util.Comparator;
-import java.util.ResourceBundle;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import org.apache.commons.lang.StringUtils;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java
index e571fd89627..74d3cbf73f0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java
@@ -6,19 +6,18 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
+import java.util.*;
 import java.util.logging.Logger;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import org.apache.commons.lang.StringUtils;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.validation.EMailValidator;
+import edu.harvard.iq.dataverse.validation.URLValidator;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -33,7 +32,6 @@ public void initialize(ValidateDatasetFieldType constraintAnnotation) {
     }
 
     public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext context) {
-
         context.disableDefaultConstraintViolation(); // we do this so we can have different messages depending on the different issue
 
         boolean lengthOnly = false;
@@ -54,11 +52,43 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte
             return true;
         }
 
+        // verify no junk in individual fields and values are within range
+        if (dsfType.getName() != null && (dsfType.getName().equals(DatasetFieldConstant.northLatitude) || dsfType.getName().equals(DatasetFieldConstant.southLatitude) ||
+                dsfType.getName().equals(DatasetFieldConstant.westLongitude) || dsfType.getName().equals(DatasetFieldConstant.eastLongitude))) {
+            try {
+                verifyBoundingBoxCoordinatesWithinRange(dsfType.getName(), value.getValue());
+            } catch (IllegalArgumentException iae) {
+                    try {
+                        context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + "  " + BundleUtil.getStringFromBundle("dataset.metadata.invalidEntry")).addConstraintViolation();
+                    } catch (NullPointerException e) {
+                    }
+                    return false;
+            }
+        }
+
+        // validate fields that are siblings and depend on each others values
+        if (value.getDatasetField().getParentDatasetFieldCompoundValue() != null &&
+                value.getDatasetField().getParentDatasetFieldCompoundValue().getParentDatasetField().getValidationMessage() == null) {
+            Optional<String> failureMessage = validateChildConstraints(value.getDatasetField());
+            if (failureMessage.isPresent()) {
+                try {
+                    context.buildConstraintViolationWithTemplate(dsfType.getParentDatasetFieldType().getDisplayName() +  "  " +
+                            BundleUtil.getStringFromBundle(failureMessage.get()) ).addConstraintViolation();
+
+                    // save the failure message in the parent so we don't keep validating the children
+                    value.getDatasetField().getParentDatasetFieldCompoundValue().getParentDatasetField().setValidationMessage(failureMessage.get());
+
+                } catch (NullPointerException npe) {
+                }
+                return false;
+            }
+        }
+
         if (fieldType.equals(FieldType.TEXT) && !lengthOnly && value.getDatasetField().getDatasetFieldType().getValidationFormat() != null) {
             boolean valid = value.getValue().matches(value.getDatasetField().getDatasetFieldType().getValidationFormat());
             if (!valid) {
                 try {
-                    context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " is not a valid entry.").addConstraintViolation();
+                    context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + "  " + BundleUtil.getStringFromBundle("dataset.metadata.invalidEntry")).addConstraintViolation();
                 } catch (NullPointerException e) {
                     return false;
                 }
@@ -127,7 +157,7 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte
             }
             if (!valid) {
                 try {
-                    context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " is not a valid date. \"" + YYYYformat + "\" is a supported format.").addConstraintViolation();
+                    context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() +  "  " + BundleUtil.getStringFromBundle("dataset.metadata.invalidDate")  ).addConstraintViolation();
                 } catch (NullPointerException npe) {
 
                 }
@@ -142,7 +172,7 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte
             } catch (Exception e) {
                 logger.fine("Float value failed validation: " + value.getValue() + " (" + dsfType.getDisplayName() + ")");
                 try {
-                    context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " is not a valid number.").addConstraintViolation();
+                    context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() +  "  " + BundleUtil.getStringFromBundle("dataset.metadata.invalidNumber") ).addConstraintViolation();
                 } catch (NullPointerException npe) {
 
                 }
@@ -156,7 +186,7 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte
                 Integer.parseInt(value.getValue());
             } catch (Exception e) {
                 try {
-                    context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " is not a valid integer.").addConstraintViolation();
+                    context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() +  "  " + BundleUtil.getStringFromBundle("dataset.metadata.invalidInteger")  ).addConstraintViolation();
                 } catch (NullPointerException npe) {
 
                 }
@@ -167,26 +197,19 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte
         // Note, length validation for FieldType.TEXT was removed to accommodate migrated data that is greater than 255 chars.
 
         if (fieldType.equals(FieldType.URL) && !lengthOnly) {
-            try {
-                URL url = new URL(value.getValue());
-            } catch (MalformedURLException e) {
-                try {
-                    context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + value.getValue() + "  is not a valid URL.").addConstraintViolation();
-                } catch (NullPointerException npe) {
-
-                }
-
+            boolean isValidUrl = URLValidator.isURLValid(value.getValue());
+            if (!isValidUrl) {
+                context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + value.getValue() +  "  " + BundleUtil.getStringFromBundle("dataset.metadata.invalidURL")).addConstraintViolation();
                 return false;
             }
         }
 
         if (fieldType.equals(FieldType.EMAIL) && !lengthOnly) {
-            if(value.getDatasetField().isRequired() && value.getValue()==null){
+            boolean isValidMail = EMailValidator.isEmailValid(value.getValue());
+            if (!isValidMail) {
+                context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + value.getValue() +  "  " + BundleUtil.getStringFromBundle("dataset.metadata.invalidEmail")).addConstraintViolation();
                 return false;
             }
-            
-            return EMailValidator.isEmailValid(value.getValue(), context);
-
         }
 
         return true;
@@ -218,8 +241,60 @@ private boolean isValidDate(String dateString, String pattern) {
         return valid;
     }
 
-    public boolean isValidAuthorIdentifier(String userInput, Pattern pattern) {
-        return pattern.matcher(userInput).matches();
+    // Validate child fields against each other and return failure message or Optional.empty() if success
+    public Optional<String> validateChildConstraints(DatasetField dsf) {
+        final String fieldName = dsf.getDatasetFieldType().getName() != null ? dsf.getDatasetFieldType().getName() : "";
+        Optional<String> returnFailureMessage = Optional.empty();
+
+        // Validate Child Constraint for Geospatial Bounding Box
+        // validate the four points of the box to insure proper layout
+        if (fieldName.equals(DatasetFieldConstant.northLatitude) || fieldName.equals(DatasetFieldConstant.westLongitude)
+                || fieldName.equals(DatasetFieldConstant.eastLongitude) || fieldName.equals(DatasetFieldConstant.southLatitude)) {
+            final String failureMessage = "dataset.metadata.invalidGeospatialCoordinates";
+
+            try {
+                final Map<String, String> coords = new HashMap<>();
+                dsf.getParentDatasetFieldCompoundValue().getChildDatasetFields().forEach(f -> {
+                        coords.put(f.getDatasetFieldType().getName(), f.getValue());
+                });
+                if (!validateBoundingBox(coords.get(DatasetFieldConstant.westLongitude),
+                        coords.get(DatasetFieldConstant.eastLongitude),
+                        coords.get(DatasetFieldConstant.northLatitude),
+                        coords.get(DatasetFieldConstant.southLatitude))) {
+                    returnFailureMessage = Optional.of(failureMessage);
+                }
+            } catch (IllegalArgumentException e) { // IllegalArgumentException NumberFormatException
+                returnFailureMessage = Optional.of(failureMessage);
+            }
+        }
+
+        return returnFailureMessage;
+    }
+
+    public static boolean validateBoundingBox(final String westLon, final String eastLon, final String northLat, final String southLat) {
+        boolean returnVal = false;
+
+        try {
+            Float west = verifyBoundingBoxCoordinatesWithinRange(DatasetFieldConstant.westLongitude, westLon);
+            Float east = verifyBoundingBoxCoordinatesWithinRange(DatasetFieldConstant.eastLongitude, eastLon);
+            Float north = verifyBoundingBoxCoordinatesWithinRange(DatasetFieldConstant.northLatitude, northLat);
+            Float south = verifyBoundingBoxCoordinatesWithinRange(DatasetFieldConstant.southLatitude, southLat);
+            returnVal = west <= east && south <= north;
+        } catch (IllegalArgumentException e) {
+            returnVal = false;
+        }
+
+        return returnVal;
     }
 
+    private static Float verifyBoundingBoxCoordinatesWithinRange(final String name, final String value) throws IllegalArgumentException {
+        int max = name.equals(DatasetFieldConstant.westLongitude) || name.equals(DatasetFieldConstant.eastLongitude) ? 180 : 90;
+        int min = max * -1;
+
+        final Float returnVal = value != null ? Float.parseFloat(value) : Float.NaN;
+        if (returnVal.isNaN() || returnVal < min || returnVal > max) {
+            throw new IllegalArgumentException(String.format("Value (%s) not in range (%s-%s)", returnVal.isNaN() ? "missing" : returnVal, min, max));
+        }
+        return returnVal;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetKeyword.java b/src/main/java/edu/harvard/iq/dataverse/DatasetKeyword.java
deleted file mode 100644
index 747e3c068f1..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetKeyword.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package edu.harvard.iq.dataverse;
-
-/**
- *
- * @author skraffmiller
- */
-
-public class DatasetKeyword  {
-
-    private int displayOrder;
-    public int getDisplayOrder() {
-        return this.displayOrder;
-    }
-    public void setDisplayOrder(int displayOrder) {
-        this.displayOrder = displayOrder;
-    }
-
-    private DatasetField value;
-    public DatasetField getValue() {
-        return this.value;
-    }
-    public void setValue(DatasetField value) {
-        this.value = value;
-    }
-    
-    private DatasetVersion datasetVersion;
-    public DatasetVersion getDatasetVersion() {
-        return datasetVersion;
-    }
-    public void setDatasetVersion(DatasetVersion metadata) {
-        this.datasetVersion = metadata;
-    }
-    /*
-    @Version
-    private Long version;
-    public Long getVersion() {
-        return this.version;
-    }
-    public void setVersion(Long version) {
-        this.version = version;
-    }  */  
-
-    private DatasetField vocab;
-    public DatasetField getVocab() {
-        return this.vocab;
-    }
-    public void setVocab(DatasetField vocab) {
-        this.vocab = vocab;
-    }
-
-    private DatasetField vocabURI;
-    public DatasetField getVocabURI() {
-        return this.vocabURI;
-    }
-    public void setVocabURI(DatasetField vocabURI) {
-        this.vocabURI = vocabURI;
-    }
-
-
-     public boolean isEmpty() {
-        /*return ((value==null || value.getValue().trim().equals(""))
-            && (vocab==null || vocab.getValue().trim().equals(""))
-            && (vocabURI==null || vocabURI.getValue().trim().equals("")));*/
-         return false;
-    }
-     
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingDataverse.java b/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingDataverse.java
index f6e7759bf1d..dec07a09643 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingDataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingDataverse.java
@@ -2,17 +2,19 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 /**
  *
@@ -23,6 +25,16 @@
         @Index(columnList = "dataset_id"),
     @Index(columnList = "linkingDataverse_id")
 })
+@NamedQueries({
+    @NamedQuery(name = "DatasetLinkingDataverse.findByDatasetId",
+               query = "select object(o) from DatasetLinkingDataverse as o where o.dataset.id =:datasetId order by o.id"),
+    @NamedQuery(name = "DatasetLinkingDataverse.findByLinkingDataverseId",
+               query = "SELECT OBJECT(o) FROM DatasetLinkingDataverse AS o WHERE o.linkingDataverse.id = :linkingDataverseId order by o.id"),    
+    @NamedQuery(name = "DatasetLinkingDataverse.findByDatasetIdAndLinkingDataverseId",
+               query = "SELECT OBJECT(o) FROM DatasetLinkingDataverse AS o WHERE o.linkingDataverse.id = :linkingDataverseId AND o.dataset.id = :datasetId"),
+    @NamedQuery(name = "DatasetLinkingDataverse.findIdsByLinkingDataverseId",
+               query = "SELECT o.dataset.id FROM DatasetLinkingDataverse AS o WHERE o.linkingDataverse.id = :linkingDataverseId")
+})
 public class DatasetLinkingDataverse implements Serializable {
     private static final long serialVersionUID = 1L;
     @Id
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingServiceBean.java
index a73fd6f0911..39c82bfa3f1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingServiceBean.java
@@ -8,12 +8,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
@@ -27,32 +28,13 @@ public class DatasetLinkingServiceBean implements java.io.Serializable {
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
     
-    /**
-     * @param linkingDataverseId
-     * @return 
-     * @todo Should this method simply be deleted? It isn't used anywhere and is
-     * throwing exceptions: Syntax error parsing [select object(o.dataverse.id)
-     * from DatasetLinkingDataverse as o where o.linkingDataverse.id
-     * =:linkingDataverseId order by o.id]
-     */
-    @Deprecated
-    public List<Dataset> findLinkedDataverses(Long linkingDataverseId) {
-        List<Dataset> retList = new ArrayList<>();
-        Query query = em.createQuery("select object(o.dataverse.id) from DatasetLinkingDataverse as o where o.linkingDataverse.id =:linkingDataverseId order by o.id");
-        query.setParameter("linkingDataverseId", linkingDataverseId);
-        for (Object o : query.getResultList()) {
-            DatasetLinkingDataverse convterted = (DatasetLinkingDataverse) o;
-            retList.add(convterted.getDataset());
-        }
-        return retList;
-    }
 
-    public List<Dataset> findDatasetsThisDataverseIdHasLinkedTo(Long dataverseId) {
+
+    public List<Dataset> findLinkedDatasets(Long dataverseId) {
         List<Dataset> datasets = new ArrayList<>();
-        TypedQuery<DatasetLinkingDataverse> typedQuery = em.createQuery("SELECT OBJECT(o) FROM DatasetLinkingDataverse AS o WHERE o.linkingDataverse.id = :dataverseId", DatasetLinkingDataverse.class);
-        typedQuery.setParameter("dataverseId", dataverseId);
-        List<DatasetLinkingDataverse> datasetLinkingDataverses = typedQuery.getResultList();
-        for (DatasetLinkingDataverse datasetLinkingDataverse : datasetLinkingDataverses) {
+        TypedQuery<DatasetLinkingDataverse> typedQuery = em.createNamedQuery("DatasetLinkingDataverse.findByLinkingDataverseId", DatasetLinkingDataverse.class)
+            .setParameter("linkingDataverseId", dataverseId);
+        for (DatasetLinkingDataverse datasetLinkingDataverse : typedQuery.getResultList()) {
             datasets.add(datasetLinkingDataverse.getDataset());
         }
         return datasets;
@@ -60,31 +42,14 @@ public List<Dataset> findDatasetsThisDataverseIdHasLinkedTo(Long dataverseId) {
 
     public List<Dataverse> findLinkingDataverses(Long datasetId) {
         List<Dataverse> retList = new ArrayList<>();
-        for (DatasetLinkingDataverse dld : findDatasetLinkingDataverses(datasetId)) {
-            retList.add(dld.getLinkingDataverse());
+        TypedQuery<DatasetLinkingDataverse> typedQuery = em.createNamedQuery("DatasetLinkingDataverse.findByDatasetId", DatasetLinkingDataverse.class)
+            .setParameter("datasetId", datasetId);
+        for (DatasetLinkingDataverse datasetLinkingDataverse : typedQuery.getResultList()) {
+            retList.add(datasetLinkingDataverse.getLinkingDataverse());
         }
         return retList;
     }
     
-    public DatasetLinkingDataverse findDatasetLinkingDataverse(Long datasetId, Long linkingDataverseId) {
-        DatasetLinkingDataverse foundDatasetLinkingDataverse = null;
-        try {
-            foundDatasetLinkingDataverse = em.createQuery("SELECT OBJECT(o) FROM DatasetLinkingDataverse AS o WHERE o.linkingDataverse.id = :dataverseId AND o.dataset.id = :datasetId", DatasetLinkingDataverse.class)
-                    .setParameter("datasetId", datasetId)
-                    .setParameter("dataverseId", linkingDataverseId)
-                    .getSingleResult();
-        } catch (javax.persistence.NoResultException e) {
-            logger.fine("no datasetLinkingDataverse found for datasetId " + datasetId + " and linkingDataverseId " + linkingDataverseId);        
-        }
-        return foundDatasetLinkingDataverse;
-    }
-
-    public List<DatasetLinkingDataverse> findDatasetLinkingDataverses(Long datasetId) {
-        return em.createQuery("select object(o) from DatasetLinkingDataverse as o where o.dataset.id =:datasetId order by o.id", DatasetLinkingDataverse.class)
-                .setParameter("datasetId", datasetId)
-                .getResultList();
-    }
-
     public void save(DatasetLinkingDataverse datasetLinkingDataverse) {
         if (datasetLinkingDataverse.getId() == null) {
             em.persist(datasetLinkingDataverse);
@@ -93,11 +58,21 @@ public void save(DatasetLinkingDataverse datasetLinkingDataverse) {
         }
     }
     
+    public DatasetLinkingDataverse findDatasetLinkingDataverse(Long datasetId, Long linkingDataverseId) {
+        try {
+            return em.createNamedQuery("DatasetLinkingDataverse.findByDatasetIdAndLinkingDataverseId",DatasetLinkingDataverse.class)
+                .setParameter("datasetId", datasetId)
+                .setParameter("linkingDataverseId", linkingDataverseId)
+                .getSingleResult();            
+        } catch (NoResultException e) {
+            logger.fine("no datasetLinkingDataverse found for datasetId " + datasetId + " and linkingDataverseId " + linkingDataverseId);        
+            return null;
+        }
+    }
+    
+    
     public boolean alreadyLinked(Dataverse dataverse, Dataset dataset) {
-        TypedQuery<DatasetLinkingDataverse> typedQuery = em.createQuery("SELECT OBJECT(o) FROM DatasetLinkingDataverse AS o WHERE o.linkingDataverse.id = :dataverseId AND o.dataset.id = :datasetId", DatasetLinkingDataverse.class);
-        typedQuery.setParameter("dataverseId", dataverse.getId());
-        typedQuery.setParameter("datasetId", dataset.getId());
-        return !typedQuery.getResultList().isEmpty();
+        return findDatasetLinkingDataverse(dataset.getId(), dataverse.getId()) != null;        
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetLock.java b/src/main/java/edu/harvard/iq/dataverse/DatasetLock.java
index 5d18d5a130c..cc0078ecbc5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetLock.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetLock.java
@@ -20,25 +20,24 @@
 
 package edu.harvard.iq.dataverse;
 
-import static edu.harvard.iq.dataverse.DatasetLock.Reason.Workflow;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import java.util.Date;
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
 
 /**
  *
@@ -51,16 +50,22 @@
 @Entity
 @Table(indexes = {@Index(columnList="user_id"), @Index(columnList="dataset_id")})
 @NamedQueries({
+    @NamedQuery(name = "DatasetLock.findAll",
+            query="SELECT lock FROM DatasetLock lock ORDER BY lock.id"),
     @NamedQuery(name = "DatasetLock.getLocksByDatasetId",
             query = "SELECT lock FROM DatasetLock lock WHERE lock.dataset.id=:datasetId"),
-            @NamedQuery(name = "DatasetLock.getLocksByAuthenticatedUserId",
-            query = "SELECT lock FROM DatasetLock lock WHERE lock.user.id=:authenticatedUserId")
+    @NamedQuery(name = "DatasetLock.getLocksByType",
+            query = "SELECT lock FROM DatasetLock lock WHERE lock.reason=:lockType ORDER BY lock.id"),
+    @NamedQuery(name = "DatasetLock.getLocksByAuthenticatedUserId",
+            query = "SELECT lock FROM DatasetLock lock WHERE lock.user.id=:authenticatedUserId  ORDER BY lock.id"),
+    @NamedQuery(name = "DatasetLock.getLocksByTypeAndAuthenticatedUserId",
+            query = "SELECT lock FROM DatasetLock lock WHERE lock.reason=:lockType AND lock.user.id=:authenticatedUserId  ORDER BY lock.id")
 }
 )
 public class DatasetLock implements Serializable {
     
     public enum Reason {
-        /** Data being ingested */
+        /** Data being ingested *//** Data being ingested */
         Ingest,
         
         /** Waits for a {@link Workflow} to end */
@@ -71,12 +76,20 @@ public enum Reason {
         
         /** DCM (rsync) upload in progress */
         DcmUpload,
-        
-        //** Registering PIDs for DS and DFs
-        pidRegister,
+
+        /** Globus upload in progress */
+        GlobusUpload,
+
+        /** Tasks handled by FinalizeDatasetPublicationCommand:
+         Registering PIDs for DS and DFs and/or file validation */
+        finalizePublication,
         
         /*Another edit is in progress*/
-        EditInProgress
+        EditInProgress,
+        
+        /* Some files in the dataset failed validation */
+        FileValidationFailed
+        
     }
     
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 704a499d469..a09d42477fc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1,7 +1,6 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.provenance.ProvPopupFragmentBean;
-import edu.harvard.iq.dataverse.PackagePopupFragmentBean;
 import edu.harvard.iq.dataverse.api.AbstractApiBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.Permission;
@@ -9,18 +8,24 @@
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.GlobusAccessibleStore;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
 import edu.harvard.iq.dataverse.dataaccess.SwiftAccessIO;
 import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleUtil;
 import edu.harvard.iq.dataverse.datacapturemodule.ScriptRequestResponse;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.dataset.DatasetUtil;
+import edu.harvard.iq.dataverse.datasetutility.FileSizeChecker;
 import edu.harvard.iq.dataverse.datavariable.VariableServiceBean;
 import edu.harvard.iq.dataverse.engine.command.Command;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.impl.CheckRateLimitForDatasetPageCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreatePrivateUrlCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CuratePublishedDatasetVersionCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.DeaccessionDatasetVersionCommand;
@@ -32,12 +37,18 @@
 import edu.harvard.iq.dataverse.engine.command.impl.PublishDatasetCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.PublishDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
-import edu.harvard.iq.dataverse.export.ExportException;
 import edu.harvard.iq.dataverse.export.ExportService;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import edu.harvard.iq.dataverse.util.cache.CacheFactoryBean;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
 import edu.harvard.iq.dataverse.ingest.IngestRequest;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.metadataimport.ForeignMetadataImportServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlUtil;
@@ -46,94 +57,112 @@
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.ArchiverUtil;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.CSLUtil;
+import edu.harvard.iq.dataverse.util.DataFileComparator;
 import edu.harvard.iq.dataverse.util.FileSortFieldAndOrder;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
+import static edu.harvard.iq.dataverse.util.StringUtil.isEmpty;
+
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.WebloaderUtil;
+import edu.harvard.iq.dataverse.validation.URLValidator;
+import edu.harvard.iq.dataverse.workflows.WorkflowComment;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Collection;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ValueChangeEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
+import java.util.stream.Collectors;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.ValueChangeEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.OptimisticLockException;
+
+import org.apache.commons.lang3.StringUtils;
 import org.primefaces.event.FileUploadEvent;
-import org.primefaces.model.UploadedFile;
-import javax.validation.ConstraintViolation;
-import org.apache.commons.httpclient.HttpClient;
-//import org.primefaces.context.RequestContext;
+import org.primefaces.model.file.UploadedFile;
+
+import jakarta.validation.ConstraintViolation;
 import java.util.Arrays;
 import java.util.HashSet;
-import javax.faces.model.SelectItem;
+import jakarta.faces.model.SelectItem;
+import jakarta.faces.validator.ValidatorException;
+
 import java.util.logging.Level;
-import edu.harvard.iq.dataverse.datasetutility.WorldMapPermissionHelper;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.AbstractSubmitToArchiveCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteDataFileCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.DeleteDatasetLinkingDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.GetLatestPublishedDatasetVersionCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RequestRsyncScriptCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.PublishDatasetResult;
 import edu.harvard.iq.dataverse.engine.command.impl.RestrictFileCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.ReturnDatasetToAuthorCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.SetCurationStatusCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.SubmitDatasetForReviewCommand;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool;
 import edu.harvard.iq.dataverse.externaltools.ExternalToolServiceBean;
+import edu.harvard.iq.dataverse.globus.GlobusServiceBean;
 import edu.harvard.iq.dataverse.export.SchemaDotOrgExporter;
 import edu.harvard.iq.dataverse.externaltools.ExternalToolHandler;
+import edu.harvard.iq.dataverse.license.License;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean.MakeDataCountEntry;
 import java.util.Collections;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
 
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
+import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.io.IOUtils;
-
+import org.primefaces.component.selectonemenu.SelectOneMenu;
 import org.primefaces.component.tabview.TabView;
 import org.primefaces.event.CloseEvent;
 import org.primefaces.event.TabChangeEvent;
 import org.primefaces.event.data.PageEvent;
 
-import edu.harvard.iq.dataverse.makedatacount.MakeDataCountUtil;
-import edu.harvard.iq.dataverse.search.FacetCategory;
 import edu.harvard.iq.dataverse.search.FacetLabel;
 import edu.harvard.iq.dataverse.search.SearchConstants;
 import edu.harvard.iq.dataverse.search.SearchFields;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
 import edu.harvard.iq.dataverse.search.SearchUtil;
 import edu.harvard.iq.dataverse.search.SolrClientService;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SignpostingResources;
+import edu.harvard.iq.dataverse.util.FileMetadataUtil;
 import java.util.Comparator;
-import java.util.TimeZone;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.impl.BaseHttpSolrClient.RemoteSolrException;
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocument;
@@ -154,14 +183,14 @@ public class DatasetPage implements java.io.Serializable {
 
     public enum EditMode {
 
-        CREATE, INFO, FILE, METADATA, LICENSE
+        CREATE, INFO, FILE, METADATA, LICENSE, VERSIONNOTE
     };
 
     public enum DisplayMode {
 
         INIT, SAVE
     };
-    
+
 
     @EJB
     DatasetServiceBean datasetService;
@@ -188,16 +217,12 @@ public enum DisplayMode {
     @EJB
     UserNotificationServiceBean userNotificationService;
     @EJB
-    MapLayerMetadataServiceBean mapLayerMetadataService;
-    @EJB
     BuiltinUserServiceBean builtinUserService;
     @EJB
     DataverseFieldTypeInputLevelServiceBean dataverseFieldTypeInputLevelService;
     @EJB
     SettingsServiceBean settingsService;
     @EJB
-    SearchServiceBean searchService;
-    @EJB
     AuthenticationServiceBean authService;
     @EJB
     SystemConfig systemConfig;
@@ -219,33 +244,55 @@ public enum DisplayMode {
     ExternalToolServiceBean externalToolService;
     @EJB
     SolrClientService solrClientService;
+    @EJB
+    DvObjectServiceBean dvObjectService;
+    @EJB
+    CacheFactoryBean cacheFactory;
     @Inject
     DataverseRequestServiceBean dvRequestService;
     @Inject
     DatasetVersionUI datasetVersionUI;
     @Inject
     PermissionsWrapper permissionsWrapper;
+    @Inject 
+    NavigationWrapper navigationWrapper;
     @Inject
     FileDownloadHelper fileDownloadHelper;
     @Inject
-    WorldMapPermissionHelper worldMapPermissionHelper;
-    @Inject
     ThumbnailServiceWrapper thumbnailServiceWrapper;
     @Inject
-    SettingsWrapper settingsWrapper; 
-    @Inject 
+    SettingsWrapper settingsWrapper;
+    @Inject
     ProvPopupFragmentBean provPopupFragmentBean;
     @Inject
     MakeDataCountLoggingServiceBean mdcLogService;
+    @Inject
+    DataverseHeaderFragment dataverseHeaderFragment;
+    @Inject
+    EmbargoServiceBean embargoService;
+    @Inject
+    RetentionServiceBean retentionService;
+    @Inject
+    LicenseServiceBean licenseServiceBean;
+    @Inject
+    DataFileCategoryServiceBean dataFileCategoryService;
+    @Inject
+    GlobusServiceBean globusService;
 
     private Dataset dataset = new Dataset();
+
+    private Long id = null;
     private EditMode editMode;
     private boolean bulkFileDeleteInProgress = false;
 
     private Long ownerId;
     private Long versionId;
     private int selectedTabIndex;
+    private String selectTab = "";
     private List<DataFile> newFiles = new ArrayList<>();
+    private List<DataFile> uploadedFiles = new ArrayList<>();
+    private MutableBoolean uploadInProgress = new MutableBoolean(false);
+
     private DatasetVersion workingVersion;
     private DatasetVersion clone;
     private int releaseRadio = 1;
@@ -277,36 +324,66 @@ public enum DisplayMode {
     private boolean noDVsAtAll = false;
 
     private boolean noDVsRemaining = false;
-    
+
     private boolean stateChanged = false;
 
     private Long linkingDataverseId;
     private List<SelectItem> linkingDVSelectItems;
     private Dataverse linkingDataverse;
-    
+    private Dataverse selectedHostDataverse;
+
+    public Dataverse getSelectedHostDataverse() {
+        return selectedHostDataverse;
+    }
+
+    public void setSelectedHostDataverse(Dataverse selectedHostDataverse) {
+        this.selectedHostDataverse = selectedHostDataverse;
+    }
+
     // Version tab lists
     private List<DatasetVersion> versionTabList = new ArrayList<>();
     private List<DatasetVersion> versionTabListForPostLoad = new ArrayList<>();
 
-    
+
     // Used to store results of permissions checks
     private final Map<String, Boolean> datasetPermissionMap = new HashMap<>(); // { Permission human_name : Boolean }
-    
 
-    
+
+
     private DataFile selectedDownloadFile;
 
     private Long maxFileUploadSizeInBytes = null;
-    
-    private String dataverseSiteUrl = ""; 
-    
+
+    private String dataverseSiteUrl = "";
+
     private boolean removeUnusedTags;
-    
+
     private Boolean hasRsyncScript = false;
-    
-    private Boolean hasTabular = false;
-    
+
+    /*private Boolean hasTabular = false;*/
+
+
+    /**
+     * If the dataset version has at least one tabular file. The "hasTabular"
+     * boolean is for the dataset level ("has ever had a tabular file") but
+     * sometimes you want to know about the current version ("no tabular files
+     * currently"). Like all files, tabular files can be deleted.
+     */
+    /**
+     * There doesn't seem to be an actual real life case where we need to know 
+     * if this dataset "has ever had a tabular file" - for all practical purposes
+     * only the versionHasTabular appears to be in use. I'm going to remove the  
+     * other boolean. 
+     */
+    private boolean versionHasTabular = false;
+    private boolean versionHasGlobus = false;
+    private boolean globusTransferRequested = false;
+
     private boolean showIngestSuccess;
+    
+    private Boolean archivable = null;
+    private Boolean versionArchivable = null;
+    private Boolean someVersionArchived = null;
 
     public boolean isShowIngestSuccess() {
         return showIngestSuccess;
@@ -315,7 +392,20 @@ public boolean isShowIngestSuccess() {
     public void setShowIngestSuccess(boolean showIngestSuccess) {
         this.showIngestSuccess = showIngestSuccess;
     }
-        
+
+    private String termsGuestbookPopupAction = "";
+
+    public void setTermsGuestbookPopupAction(String popupAction){
+        if(popupAction != null && popupAction.length() > 0){
+            this.termsGuestbookPopupAction = popupAction;
+        }
+
+    }
+
+    public String getTermsGuestbookPopupAction(){
+        return termsGuestbookPopupAction;
+    }
+    
     // TODO: Consider renaming "configureTools" to "fileConfigureTools".
     List<ExternalTool> configureTools = new ArrayList<>();
     // TODO: Consider renaming "exploreTools" to "fileExploreTools".
@@ -324,8 +414,17 @@ public void setShowIngestSuccess(boolean showIngestSuccess) {
     Map<Long, List<ExternalTool>> configureToolsByFileId = new HashMap<>();
     // TODO: Consider renaming "exploreToolsByFileId" to "fileExploreToolsByFileId".
     Map<Long, List<ExternalTool>> exploreToolsByFileId = new HashMap<>();
+    // TODO: Consider renaming "previewToolsByFileId" to "file:PreviewToolsByFileId".
+    Map<Long, List<ExternalTool>> previewToolsByFileId = new HashMap<>();
+    // TODO: Consider renaming "previewTools" to "filePreviewTools".
+    List<ExternalTool> previewTools = new ArrayList<>();
+    Map<Long, List<ExternalTool>> fileQueryToolsByFileId = new HashMap<>();
+    List<ExternalTool> fileQueryTools = new ArrayList<>();
     private List<ExternalTool> datasetExploreTools;
-    
+    private List<ExternalTool> datasetConfigureTools;
+    // The selected dataset-level configure tool
+    private ExternalTool datasetConfigureTool;
+
     public Boolean isHasRsyncScript() {
         return hasRsyncScript;
     }
@@ -333,7 +432,7 @@ public Boolean isHasRsyncScript() {
     public void setHasRsyncScript(Boolean hasRsyncScript) {
         this.hasRsyncScript = hasRsyncScript;
     }
-    
+
     /**
      * The contents of the script.
      */
@@ -352,26 +451,63 @@ public void setRsyncScript(String rsyncScript) {
     public String getRsyncScriptFilename() {
         return rsyncScriptFilename;
     }
+    
+    private Boolean hasValidTermsOfAccess = null;
+    
+    public Boolean isHasValidTermsOfAccess() {
+        //cache in page to limit processing
+        if (hasValidTermsOfAccess != null){
+            return hasValidTermsOfAccess;
+        } else {
+            if (!isHasRestrictedFiles()){
+               hasValidTermsOfAccess = true;
+               return hasValidTermsOfAccess;
+            } else {
+                hasValidTermsOfAccess = TermsOfUseAndAccessValidator.isTOUAValid(dataset.getLatestVersion().getTermsOfUseAndAccess(), null);
+                return hasValidTermsOfAccess;
+            }
+        }    
+    }
+    
+    private Boolean hasRestrictedFiles = null;
+    
+    public boolean isHasRestrictedFiles(){
+        //cache in page to limit processing
+        if (hasRestrictedFiles != null){
+            return hasRestrictedFiles;
+        } else {
+            hasRestrictedFiles = workingVersion.isHasRestrictedFile();
+            return hasRestrictedFiles;
+        }
+    }
+    
+    public boolean getHasValidTermsOfAccess(){
+        return isHasValidTermsOfAccess(); //HasValidTermsOfAccess
+    }
+    
+    public void setHasValidTermsOfAccess(boolean value){
+        //dummy for ui
+    }
 
-    private String thumbnailString = null; 
+    private String thumbnailString = null;
 
-    // This is the Dataset-level thumbnail; 
-    // it's either the thumbnail of the designated datafile, 
+    // This is the Dataset-level thumbnail;
+    // it's either the thumbnail of the designated datafile,
     // or scaled down uploaded "logo" file, or randomly selected
-    // image datafile from this dataset. 
+    // image datafile from this dataset.
     public String getThumbnailString() {
         // This method gets called 30 (!) times, just to load the page!
-        // - so let's cache that string the first time it's called. 
-            
+        // - so let's cache that string the first time it's called.
+
         if (thumbnailString != null) {
             if ("".equals(thumbnailString)) {
                 return null;
-            } 
+            }
             return thumbnailString;
         }
 
         if (!readOnly) {
-            DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail();
+            DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
             if (datasetThumbnail == null) {
                 thumbnailString = "";
                 return null;
@@ -387,13 +523,16 @@ public String getThumbnailString() {
 
             thumbnailString = datasetThumbnail.getBase64image();
         } else {
-            thumbnailString = thumbnailServiceWrapper.getDatasetCardImageAsBase64Url(dataset, workingVersion.getId(),!workingVersion.isDraft());
+            thumbnailString = thumbnailServiceWrapper.getDatasetCardImageAsUrl(dataset,
+                    workingVersion.getId(),
+                    !workingVersion.isDraft(),
+                    ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
             if (thumbnailString == null) {
                 thumbnailString = "";
                 return null;
             }
-            
-            
+
+
         }
         return thumbnailString;
     }
@@ -410,27 +549,26 @@ public void setRemoveUnusedTags(boolean removeUnusedTags) {
         this.removeUnusedTags = removeUnusedTags;
     }
 
-    private List<FileMetadata> fileMetadatas;
     private String fileSortField;
     private String fileSortOrder;
+    private boolean tagPresort = true;
+    private boolean folderPresort = true;
+    // Due to what may be a bug in PrimeFaces, the call to select a new page of
+    // files appears to reset the two presort booleans to false. The following
+    // values are a flag and duplicate booleans to remember what the new values were
+    // so that they can be set only in real checkbox changes. Further comments where
+    // these are used.
+    boolean isPageFlip = false;
+    private boolean newTagPresort = true;
+    private boolean newFolderPresort = true;
 
-    private LazyFileMetadataDataModel lazyModel;
-
-    public LazyFileMetadataDataModel getLazyModel() {
-        return lazyModel;
-    }
-
-    public void setLazyModel(LazyFileMetadataDataModel lazyModel) {
-        this.lazyModel = lazyModel;
-    }
-    
     public List<Entry<String,String>> getCartList() {
         if (session.getUser() instanceof AuthenticatedUser) {
             return ((AuthenticatedUser) session.getUser()).getCart().getContents();
         }
         return null;
     }
-    
+
     public boolean checkCartForItem(String title, String persistentId) {
         if (session.getUser() instanceof AuthenticatedUser) {
             return ((AuthenticatedUser) session.getUser()).getCart().checkCartForItem(title, persistentId);
@@ -451,7 +589,7 @@ public void addItemtoCart(String title, String persistentId) throws Exception{
             }
         }
     }
-    
+
     public void removeCartItem(String title, String persistentId) throws Exception {
         if (session.getUser() instanceof AuthenticatedUser) {
             AuthenticatedUser authUser = (AuthenticatedUser) session.getUser();
@@ -463,7 +601,7 @@ public void removeCartItem(String title, String persistentId) throws Exception {
             }
         }
     }
-    
+
     public void clearCart() throws Exception {
         if (session.getUser() instanceof AuthenticatedUser) {
             AuthenticatedUser authUser = (AuthenticatedUser) session.getUser();
@@ -475,7 +613,7 @@ public void clearCart() throws Exception {
             }
         }
     }
-    
+
     public boolean isCartEmpty() {
         if (session.getUser() instanceof AuthenticatedUser) {
             AuthenticatedUser authUser = (AuthenticatedUser) session.getUser();
@@ -483,8 +621,8 @@ public boolean isCartEmpty() {
         }
         return true;
     }
-    
-        
+
+
     public String getCartComputeUrl() {
         if (session.getUser() instanceof AuthenticatedUser) {
             AuthenticatedUser authUser = (AuthenticatedUser) session.getUser();
@@ -517,9 +655,9 @@ public void setFileLabelSearchTerm(String fileLabelSearchTerm) {
             this.fileLabelSearchTerm="";
         }
     }
-    
-    private String fileTypeFacet; 
-    
+
+    private String fileTypeFacet;
+
     public String getFileTypeFacet() {
         return fileTypeFacet;
     }
@@ -527,11 +665,11 @@ public String getFileTypeFacet() {
     public void setFileTypeFacet(String fileTypeFacet) {
         if (fileTypeFacet != null) {
             this.fileTypeFacet = fileTypeFacet.trim();
-        } 
+        }
     }
-    
-    private String fileAccessFacet; 
-    
+
+    private String fileAccessFacet;
+
     public String getFileAccessFacet() {
         return fileAccessFacet;
     }
@@ -539,11 +677,11 @@ public String getFileAccessFacet() {
     public void setFileAccessFacet(String fileAccessFacet) {
         if (fileAccessFacet != null) {
             this.fileAccessFacet = fileAccessFacet.trim();
-        } 
+        }
     }
-    
-    private String fileTagsFacet; 
-    
+
+    private String fileTagsFacet;
+
     public String getFileTagsFacet() {
         return fileTagsFacet;
     }
@@ -551,25 +689,25 @@ public String getFileTagsFacet() {
     public void setFileTagsFacet(String fileTagsFacet) {
         if (fileTagsFacet != null) {
             this.fileTagsFacet = fileTagsFacet.trim();
-        } 
+        }
     }
-    
+
     private List<FileMetadata> fileMetadatasSearch;
-    
+
     public List<FileMetadata> getFileMetadatasSearch() {
         return fileMetadatasSearch;
     }
-    
+
     public void setFileMetadatasSearch(List<FileMetadata> fileMetadatasSearch) {
         this.fileMetadatasSearch = fileMetadatasSearch;
     }
-    
-    public void updateFileSearch(){  
+
+    public void updateFileSearch(){
         logger.fine("updating file search list");
         this.fileMetadatasSearch = selectFileMetadatasForDisplay();
-        
+
     }
-    
+
         private Long numberOfFilesToShow = (long) 25;
 
     public Long getNumberOfFilesToShow() {
@@ -579,175 +717,208 @@ public Long getNumberOfFilesToShow() {
     public void setNumberOfFilesToShow(Long numberOfFilesToShow) {
         this.numberOfFilesToShow = numberOfFilesToShow;
     }
-    
+
+    private String returnReason = "";
+
+    public String getReturnReason() {
+        return returnReason;
+    }
+
+    public void setReturnReason(String returnReason) {
+        this.returnReason = returnReason;
+    }
+
     public void showAll(){
         setNumberOfFilesToShow(new Long(fileMetadatasSearch.size()));
     }
-    
-    private List<FileMetadata> selectFileMetadatasForDisplay() {
-        Set<Long> searchResultsIdSet = null;
 
-        if (isIndexedVersion()) {
-            // We run the search even if no search term and/or facets are 
+    private List<FileMetadata> selectFileMetadatasForDisplay() {
+        final Set<Long> searchResultsIdSet;
+        if (isIndexedVersion() && StringUtil.isEmpty(fileLabelSearchTerm) && StringUtil.isEmpty(fileTypeFacet) && StringUtil.isEmpty(fileAccessFacet) && StringUtil.isEmpty(fileTagsFacet)) {
+            // Indexed version: we need facets, they are set as a side effect of getFileIdsInVersionFromSolr method.
+            // But, no search terms were specified, we will return the full
+            // list of the files in the version: we discard the result from getFileIdsInVersionFromSolr.
+            getFileIdsInVersionFromSolr(workingVersion.getId(), this.fileLabelSearchTerm);
+            // Since the search results should include the full set of fmds if all the
+            // terms/facets are empty, setting them to null should just be
+            // an optimization to skip the loop below
+            searchResultsIdSet = null;
+        } else if (isIndexedVersion()) {
+            // We run the search even if no search term and/or facets are
             // specified - to generate the facet labels list:
             searchResultsIdSet = getFileIdsInVersionFromSolr(workingVersion.getId(), this.fileLabelSearchTerm);
-            // But, if no search terms were specified, we can immediately return the full 
-            // list of the files in the version: 
-            if (StringUtil.isEmpty(fileLabelSearchTerm)
-                    && StringUtil.isEmpty(fileTypeFacet)
-                    && StringUtil.isEmpty(fileAccessFacet)
-                    && StringUtil.isEmpty(fileTagsFacet)) {
-                if ((StringUtil.isEmpty(fileSortField) || fileSortField.equals("name")) && StringUtil.isEmpty(fileSortOrder)) {
-                    return workingVersion.getFileMetadatasSorted();
-                } else {
-                    searchResultsIdSet = null; 
-                }
-            }
-
-        } else {
-            // No, this is not an indexed version. 
+        } else if (!StringUtil.isEmpty(this.fileLabelSearchTerm)) {
+            // No, this is not an indexed version.
             // If the search term was specified, we'll run a search in the db;
-            // if not - return the full list of files in the version. 
+            // if not - return the full list of files in the version.
             // (no facets without solr!)
-            if (StringUtil.isEmpty(this.fileLabelSearchTerm)) {
-                if ((StringUtil.isEmpty(fileSortField) || fileSortField.equals("name")) && StringUtil.isEmpty(fileSortOrder)) {
-                    return workingVersion.getFileMetadatasSorted();
-                }
-            } else {
-                searchResultsIdSet = getFileIdsInVersionFromDb(workingVersion.getId(), this.fileLabelSearchTerm);
-            }
+            searchResultsIdSet = getFileIdsInVersionFromDb(workingVersion.getId(), this.fileLabelSearchTerm);
+        } else {
+            searchResultsIdSet = null;
         }
 
-        List<FileMetadata> retList = new ArrayList<>();
-
-        for (FileMetadata fileMetadata : workingVersion.getFileMetadatasSorted()) {
-            if (searchResultsIdSet == null || searchResultsIdSet.contains(fileMetadata.getDataFile().getId())) {
-                retList.add(fileMetadata);
-            }
+        final List<FileMetadata> md = workingVersion.getFileMetadatas();
+        final List<FileMetadata> retList;
+        if (searchResultsIdSet == null) {
+            retList = new ArrayList<>(md);
+        } else {
+            retList = md.stream().filter(x -> searchResultsIdSet.contains(x.getDataFile().getId())).collect(Collectors.toList());
         }
+        sortFileMetadatas(retList);
+        return retList;
+    }
 
-        if ((StringUtil.isEmpty(fileSortOrder) && !("name".equals(fileSortField))) 
-                || ("desc".equals(fileSortOrder) || !("name".equals(fileSortField)))) {
-            sortFileMetadatas(retList);
-            
-        }
+    private void sortFileMetadatas(final List<FileMetadata> fileList) {
         
-        return retList;     
-    }
-    
-    private void sortFileMetadatas(List<FileMetadata> fileList) {
-        if ("name".equals(fileSortField) && "desc".equals(fileSortOrder)) {
-            Collections.sort(fileList, compareByLabelZtoA);
-        } else if ("date".equals(fileSortField)) {
-            if ("desc".equals(fileSortOrder)) {
-                Collections.sort(fileList, compareByOldest);
-            } else {
-                Collections.sort(fileList, compareByNewest);
-            }
-        } else if ("type".equals(fileSortField)) {
-            Collections.sort(fileList, compareByType);
-        } else if ("size".equals(fileSortField)) {
-            Collections.sort(fileList, compareBySize);
-        }
+        final DataFileComparator dfc = new DataFileComparator();
+        final Comparator<FileMetadata> comp = dfc.compareBy(folderPresort, tagPresort, fileSortField, !"desc".equals(fileSortOrder));
+        Collections.sort(fileList, comp);
     }
-    
-    private Boolean isIndexedVersion = null; 
-    
+
+    private Boolean isIndexedVersion = null;
+
     public boolean isIndexedVersion() {
         if (isIndexedVersion != null) {
             return isIndexedVersion;
         }
-        // The version is SUPPOSED to be indexed if it's the latest published version, or a 
-        // draft. So if none of the above is true, we return false right away:
         
+        // Just like on the collection page, facets on the Dataset page can be
+        // disabled instance-wide by an admin:
+        if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.DisableSolrFacets, false)) {
+            return isIndexedVersion = false;
+        }
+        
+        // plus we have mechanisms for disabling the facets selectively, just for 
+        // the guests, or anonymous users:
+        if (session.getUser() instanceof GuestUser) {
+            if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.DisableSolrFacetsForGuestUsers, false)) {
+                return isIndexedVersion = false; 
+            }
+            
+            // An even lower grade of user than Guest is a truly anonymous user -
+            // a guest user who came without the session cookie:
+            Map<String, Object> cookies = FacesContext.getCurrentInstance().getExternalContext().getRequestCookieMap();
+            if (!(cookies != null && cookies.containsKey("JSESSIONID"))) {
+                if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.DisableSolrFacetsWithoutJsession, false)) {
+                    return isIndexedVersion = false; 
+                }
+            }
+            
+        }
+        
+        
+        // The version is SUPPOSED to be indexed if it's the latest published version, or a
+        // draft. So if none of the above is true, we can return false right away. 
         if (!(workingVersion.isDraft() || isThisLatestReleasedVersion())) {
-            return isIndexedVersion = false; 
+            return isIndexedVersion = false;
+        }
+        // If this is the latest published version, we want to confirm that this 
+        // version was successfully indexed after the last publication
+        if (isThisLatestReleasedVersion()) {
+            if (workingVersion.getDataset().getIndexTime() == null) {
+                return isIndexedVersion = false;
+            }
+            // We add 3 hours to the indexed time to prevent false negatives
+            // when indexed time gets overwritten in finalizing the publication step
+            // by a value before the release time
+            final long duration = 3 * 60 * 60 * 1000;
+            final Timestamp movedIndexTime = new Timestamp(workingVersion.getDataset().getIndexTime().getTime() + duration);
+            return isIndexedVersion = movedIndexTime.after(workingVersion.getReleaseTime());
         }
         
-        // ... but if it is the latest published version or a draft, we want to test 
-        // and confirm that this version *has* actually been indexed and is searchable   
-        // (and that solr is actually up and running!), by running a quick solr search:
-        return isIndexedVersion = isThisVersionSearchable();
+        // Drafts don't have the indextime stamps set/incremented when indexed, 
+        // so we'll just assume it is indexed, and will then hope for the best.
+        return isIndexedVersion = true;
     }
-    
+
     /**
      * Finds the list of numeric datafile ids in the Version specified, by running
      * a database query.
-     * 
+     *
      * @param datasetVersionId numeric version id
      * @param pattern string keyword
      * @return set of numeric ids
-     * 
+     *
      */
-    
+
     public Set<Long> getFileIdsInVersionFromDb(Long datasetVersionId, String pattern) {
         logger.fine("searching for file ids, in the database");
         List<Long> searchResultsIdList = datafileService.findDataFileIdsByDatasetVersionIdLabelSearchTerm(datasetVersionId, pattern, "", "");
-        
+
         Set<Long> ret = new HashSet<>();
         for (Long id : searchResultsIdList) {
             ret.add(id);
         }
-        
+
         return ret;
     }
-    
-    
-    private Map<String, List<FacetLabel>> facetLabelsMap; 
-    
+
+
+    private Map<String, List<FacetLabel>> facetLabelsMap;
+
     public Map<String, List<FacetLabel>> getFacetLabelsMap() {
         return facetLabelsMap;
     }
-    
+
     public List<FacetLabel> getFileTypeFacetLabels() {
         if (facetLabelsMap != null) {
             return facetLabelsMap.get("fileTypeGroupFacet");
         }
         return null;
     }
-    
+
     public List<FacetLabel> getFileAccessFacetLabels() {
         if (facetLabelsMap != null) {
             return facetLabelsMap.get("fileAccess");
         }
         return null;
     }
-    
+
     public List<FacetLabel> getFileTagsFacetLabels() {
         if (facetLabelsMap != null) {
             return facetLabelsMap.get("fileTag");
         }
         return null;
     }
-    
+
     /**
      * Verifies that solr is running and that the version is indexed and searchable
      * @return boolean
-     */
+     * Commenting out this method for now, since we have decided it was not 
+     * necessary, to query solr just to figure out if we can query solr. We will
+     * rely solely on the latest-relesed status and the indexed timestamp from 
+     * the database for that. - L.A.
+     *
     public boolean isThisVersionSearchable() {
-        SolrQuery solrQuery = new SolrQuery();
+        // Just like on the collection page, facets on the Dataset page can be
+        // disabled instance-wide by an admin:
+        if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.DisableSolrFacets, false)) {
+            return false;
+        }
         
+        SolrQuery solrQuery = new SolrQuery();
+
         solrQuery.setQuery(SearchUtil.constructQuery(SearchFields.ENTITY_ID, workingVersion.getDataset().getId().toString()));
-        
+
         solrQuery.addFilterQuery(SearchUtil.constructQuery(SearchFields.TYPE, SearchConstants.DATASETS));
         solrQuery.addFilterQuery(SearchUtil.constructQuery(SearchFields.DATASET_VERSION_ID, workingVersion.getId().toString()));
-        
+
         logger.fine("Solr query (testing if searchable): " + solrQuery);
-                
+
         QueryResponse queryResponse = null;
-        
+
         try {
             queryResponse = solrClientService.getSolrClient().query(solrQuery);
         } catch (Exception ex) {
             logger.fine("Solr exception: " + ex.getLocalizedMessage());
-            // solr maybe down/some error may have occurred... 
-            return false; 
+            // solr maybe down/some error may have occurred...
+            return false;
         }
-        
+
         SolrDocumentList docs = queryResponse.getResults();
         Iterator<SolrDocument> iter = docs.iterator();
-        
-        // there should be only 1 result, really... 
+
+        // there should be only 1 result, really...
         while (iter.hasNext()) {
             SolrDocument solrDocument = iter.next();
             Long entityid = (Long) solrDocument.getFieldValue(SearchFields.ENTITY_ID);
@@ -756,114 +927,137 @@ public boolean isThisVersionSearchable() {
                 return true;
             }
         }
-        
+
         return false;
     }
-    
+    */
+
     /**
      * Finds the list of numeric datafile ids in the Version specified, by running
      * a direct solr search query.
-     * 
+     *
      * @param datasetVersionId numeric version id
      * @param pattern string keyword
      * @return set of numeric ids
-     * 
+     *
      */
     public Set<Long> getFileIdsInVersionFromSolr(Long datasetVersionId, String pattern) {
         logger.fine("searching for file ids, in solr");
-        
+
         SolrQuery solrQuery = new SolrQuery();
-        
+
         List<String> queryStrings = new ArrayList<>();
-        
-        // Main query: 
+
+        // Main query:
         if (!StringUtil.isEmpty(pattern)) {
             // searching on the file name ("label") and description:
             queryStrings.add(SearchUtil.constructQuery(SearchFields.FILE_NAME, pattern + "*"));
             queryStrings.add(SearchUtil.constructQuery(SearchFields.FILE_DESCRIPTION, pattern + "*"));
+            queryStrings.add(SearchUtil.constructQuery(SearchFields.FILE_TAG_SEARCHABLE, pattern + "*"));
 
             solrQuery.setQuery(SearchUtil.constructQuery(queryStrings, false));
         } else {
-            // ... or "everything", if no search pattern is supplied: 
+            // ... or "everything", if no search pattern is supplied:
             // (presumably, one or more facet fields is supplied, below)
             solrQuery.setQuery("*");
         }
-        
-        
-        // ask for facets: 
-        
+
+
+        // ask for facets:
+
         solrQuery.setParam("facet", "true");
         /**
          * @todo: do we need facet.query?
          */
         solrQuery.setParam("facet.query", "*");
-        
+
         solrQuery.addFacetField(SearchFields.FILE_TYPE);
         solrQuery.addFacetField(SearchFields.ACCESS);
         solrQuery.addFacetField(SearchFields.FILE_TAG);
-        
-        
-        // Extra filter queries from the facets, if specified: 
-        
+
+
+        // Extra filter queries from the facets, if specified:
+
         if (!StringUtil.isEmpty(fileTypeFacet)) {
             solrQuery.addFilterQuery(SearchFields.FILE_TYPE + ":" + fileTypeFacet);
-        } 
-        
+        }
+
         if (!StringUtil.isEmpty(fileAccessFacet)) {
             solrQuery.addFilterQuery(SearchFields.ACCESS + ":" + fileAccessFacet);
         }
-        
+
         if (!StringUtil.isEmpty(fileTagsFacet)) {
             solrQuery.addFilterQuery(SearchFields.FILE_TAG + ":" + fileTagsFacet);
-        }        
-        
+        }
+
         // Additional filter queries, to restrict the results to files in this version only:
-        
+
         solrQuery.addFilterQuery(SearchFields.TYPE + ":" + SearchConstants.FILES);
         if (!workingVersion.isDraft()) {
             solrQuery.addFilterQuery(SearchFields.DATASET_VERSION_ID + ":" + datasetVersionId);
         } else {
             // To avoid indexing duplicate solr documents, we don't index ALL of the files
             // in a draft version - only the new files added to the draft and/or the
-            // files for which the metadata have been changed. 
-            // So, in order to find all the files in the draft version, we can't just 
-            // run a query with the dataset version id, like with the published version, 
-            // above. Instead we are searching for all the indexed files in the dataset, 
-            // except the ones indexed with the "fileDeleted" flag - that indicates that 
+            // files for which the metadata have been changed.
+            // So, in order to find all the files in the draft version, we can't just
+            // run a query with the dataset version id, like with the published version,
+            // above. Instead we are searching for all the indexed files in the dataset,
+            // except the ones indexed with the "fileDeleted" flag - that indicates that
             // they are no longer in the draft:
             solrQuery.addFilterQuery(SearchFields.PARENT_ID + ":" + workingVersion.getDataset().getId());
-            // Note that we don't want to use the query "fileDeleted: false" - that 
-            // would only find the documents in which the fileDeleted boolean field 
-            // is actually present, AND set to false. Instead we are searching with 
-            // "!(fileDeleted: true)" - that will find ALL the records, except for 
+            // Note that we don't want to use the query "fileDeleted: false" - that
+            // would only find the documents in which the fileDeleted boolean field
+            // is actually present, AND set to false. Instead we are searching with
+            // "!(fileDeleted: true)" - that will find ALL the records, except for
             // the ones where the value is explicitly set to true.
             solrQuery.addFilterQuery("!(" + SearchFields.FILE_DELETED + ":" + true + ")");
-            
+            /*
+             * With a draft version, there may be multiple hits per file: dataverse will
+             * index the file as shown in the draft version if the metadata or restricted
+             * status has changed. Without the filter below, the file will count twice in
+             * the facet counts. The collapse filter here will limit the results to one hit
+             * for value of the specified field (identifier in this case - unique to the
+             * file) and will order the hits by the max field, i.e. it will pick the entry
+             * with the greatest datasetVersionId, which, given our numbering scheme, will
+             * be the draft version.
+             * https://solr.apache.org/guide/6_6/collapse-and-expand-results.html
+             */
+            solrQuery.addFilterQuery("{!collapse field=" + SearchFields.IDENTIFIER + " max=" + SearchFields.DATASET_VERSION_ID + "}");
+
         }
 
-        // Unlimited number of search results: 
+        // Unlimited number of search results:
         // (but we are searching within one dataset(version), so it should be manageable)
         solrQuery.setRows(Integer.MAX_VALUE);
 
         logger.fine("Solr query (file search): " + solrQuery);
-                
+
         QueryResponse queryResponse = null;
-        boolean fileDeletedFlagNotIndexed = false; 
+        boolean fileDeletedFlagNotIndexed = false;
         Set<Long> resultIds = new HashSet<>();
-        
+
         try {
             queryResponse = solrClientService.getSolrClient().query(solrQuery);
-        } catch (HttpSolrClient.RemoteSolrException ex) {
+        } catch (RemoteSolrException ex) {
             logger.fine("Remote Solr Exception: " + ex.getLocalizedMessage());
-            String msg = ex.getLocalizedMessage(); 
+            String msg = ex.getLocalizedMessage();
             if (msg.contains(SearchFields.FILE_DELETED)) {
-                fileDeletedFlagNotIndexed = true; 
+                // This is a backward compatibility hook put in place many versions
+                // ago, to accommodate instances running Solr with schemas that 
+                // don't include this flag yet. Running Solr with an up-to-date
+                // schema has been a hard requirement for a while now; should we 
+                // remove it at this point? - L.A. 
+                fileDeletedFlagNotIndexed = true;
+            } else {
+                isIndexedVersion = false;
+                return resultIds;
             }
         } catch (Exception ex) {
             logger.warning("Solr exception: " + ex.getLocalizedMessage());
-            return resultIds; 
+            isIndexedVersion = false; 
+            return resultIds;
         }
-        
+
         if (fileDeletedFlagNotIndexed) {
             // try again, without the flag:
             solrQuery.removeFilterQuery("!(" + SearchFields.FILE_DELETED + ":" + true + ")");
@@ -873,19 +1067,20 @@ public Set<Long> getFileIdsInVersionFromSolr(Long datasetVersionId, String patte
                 queryResponse = solrClientService.getSolrClient().query(solrQuery);
             } catch (Exception ex) {
                 logger.warning("Caught a Solr exception (again!): " + ex.getLocalizedMessage());
+                isIndexedVersion = false; 
                 return resultIds;
             }
         }
-        
-        // Process the facets: 
-        
+
+        // Process the facets:
+
         facetLabelsMap = new HashMap<>();
-        
+
         for (FacetField facetField : queryResponse.getFacetFields()) {
             List<FacetLabel> facetLabelList = new ArrayList<>();
 
             int count = 0;
-            
+
             for (FacetField.Count facetFieldCount : facetField.getValues()) {
                 logger.fine("facet field value: " + facetField.getName() + " " + facetFieldCount.getName() + " (" + facetFieldCount.getCount() + ")");
                 if (facetFieldCount.getCount() > 0) {
@@ -896,36 +1091,36 @@ public Set<Long> getFileIdsInVersionFromSolr(Long datasetVersionId, String patte
                     count += facetFieldCount.getCount();
                 }
             }
-            
+
             if (count > 0) {
                 facetLabelsMap.put(facetField.getName(), facetLabelList);
-            }            
+            }
         }
-        
+
         SolrDocumentList docs = queryResponse.getResults();
         Iterator<SolrDocument> iter = docs.iterator();
-        
+
         while (iter.hasNext()) {
             SolrDocument solrDocument = iter.next();
             Long entityid = (Long) solrDocument.getFieldValue(SearchFields.ENTITY_ID);
             logger.fine("solr result id: "+entityid);
             resultIds.add(entityid);
         }
-        
+
         return resultIds;
     }
-    
+
     /*
         Save the setting locally so db isn't hit repeatedly
-    
+
         This may be "null", signifying unlimited download size
     */
     public Long getMaxFileUploadSizeInBytes(){
         return this.maxFileUploadSizeInBytes;
     }
-    
+
     public boolean isUnlimitedUploadFileSize(){
-        
+
         if (this.maxFileUploadSizeInBytes == null){
             return true;
         }
@@ -935,18 +1130,18 @@ public boolean isUnlimitedUploadFileSize(){
     public String getDataverseSiteUrl() {
         return this.dataverseSiteUrl;
     }
-    
+
     public void setDataverseSiteUrl(String dataverseSiteUrl) {
         this.dataverseSiteUrl = dataverseSiteUrl;
     }
-    
+
     public DataFile getInitialDataFile() {
         if (workingVersion.getFileMetadatas() != null && workingVersion.getFileMetadatas().size() > 0) {
             return workingVersion.getFileMetadatas().get(0).getDataFile();
         }
         return null;
     }
-    
+
     public SwiftAccessIO getSwiftObject() {
         try {
             StorageIO<DataFile> storageIO = getInitialDataFile() == null ? null : getInitialDataFile().getStorageIO();
@@ -954,7 +1149,7 @@ public SwiftAccessIO getSwiftObject() {
                 return (SwiftAccessIO)storageIO;
             } else {
                 logger.fine("DatasetPage: Failed to cast storageIO as SwiftAccessIO (most likely because storageIO is a FileAccessIO)");
-            } 
+            }
         } catch (IOException e) {
             logger.fine("DatasetPage: Failed to get storageIO");
 
@@ -970,13 +1165,13 @@ public String getSwiftContainerName() throws IOException {
         } catch (Exception e){
             logger.info("DatasetPage: Failed to open swift object");
         }
-        
+
         return "";
-        
+
     }
-    
+
     public void setSwiftContainerName(String name){
-        
+
     }
     //This function applies to an entire dataset
     private boolean isSwiftStorage() {
@@ -991,7 +1186,7 @@ private boolean isSwiftStorage() {
         }
         return false;
     }
-    
+
     //This function applies to a single datafile
     private boolean isSwiftStorage(FileMetadata metadata){
         if (metadata.getDataFile().getStorageIdentifier().startsWith("swift://")) {
@@ -999,15 +1194,15 @@ private boolean isSwiftStorage(FileMetadata metadata){
         }
         return false;
     }
-    
-    
+
+
     private Boolean showComputeButtonForDataset = null;
     //This function applies to an entire dataset
     public boolean showComputeButton() {
         if (showComputeButtonForDataset != null) {
             return showComputeButtonForDataset;
         }
-        
+
         if (isSwiftStorage() && (settingsService.getValueForKey(SettingsServiceBean.Key.ComputeBaseUrl) != null)) {
             showComputeButtonForDataset = true;
         } else {
@@ -1015,23 +1210,23 @@ public boolean showComputeButton() {
         }
         return showComputeButtonForDataset;
     }
-    
+
     private Map<Long, Boolean> showComputeButtonForFile = new HashMap<>();
     //this function applies to a single datafile
     public boolean showComputeButton(FileMetadata metadata) {
         Long fileId = metadata.getDataFile().getId();
-        
+
         if (fileId == null) {
             return false;
         }
-        
+
         if (showComputeButtonForFile.containsKey(fileId)) {
             return showComputeButtonForFile.get(fileId);
         }
-        
-        boolean result = isSwiftStorage(metadata) 
+
+        boolean result = isSwiftStorage(metadata)
                 && settingsService.getValueForKey(SettingsServiceBean.Key.ComputeBaseUrl) != null;
-        
+
         showComputeButtonForFile.put(fileId, result);
         return result;
     }
@@ -1053,14 +1248,40 @@ public boolean canComputeAllFiles(boolean isCartCompute){
         }
         return true;
     }
+    
+    Boolean canDownloadFiles = null;
+
+    //caching can download files to limit trips to File Download Helper
+    public boolean canDownloadFiles() {
+        if (canDownloadFiles == null) {
+            canDownloadFiles = false;
+            for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+                if (fileDownloadHelper.canDownloadFile(fmd)) {
+                    if (isVersionHasGlobus()) {
+                        String driverId = DataAccess
+                                .getStorageDriverFromIdentifier(fmd.getDataFile().getStorageIdentifier());
+                        if (StorageIO.isDataverseAccessible(driverId)) {
+                            canDownloadFiles = true;
+                            break;
+                        }
+                    } else {
+                        canDownloadFiles = true;
+                        break;
+                    }
+                }
+            }
+        }
+        return canDownloadFiles;
+    }
+
     /*
-    in getComputeUrl(), we are sending the container/dataset name and the exipiry and signature 
-    for the temporary url of only ONE datafile within the dataset. This is because in the 
-    ceph version of swift, we are only able to generate the temporary url for a single object 
+    in getComputeUrl(), we are sending the container/dataset name and the exipiry and signature
+    for the temporary url of only ONE datafile within the dataset. This is because in the
+    ceph version of swift, we are only able to generate the temporary url for a single object
     within a container.
     Ideally, we want a temporary url for an entire container/dataset, so perhaps this could instead
-    be handled on the compute environment end. 
-    Additionally, we have to think about the implications this could have with dataset versioning, 
+    be handled on the compute environment end.
+    Additionally, we have to think about the implications this could have with dataset versioning,
     since we currently store all files (even from old versions) in the same container.
     --SF
     */
@@ -1070,9 +1291,9 @@ public String getComputeUrl() throws IOException {
             //WHEN we are able to get a temp url for a dataset
             //return settingsWrapper.getValueForKey(SettingsServiceBean.Key.ComputeBaseUrl) + "?containerName=" + swiftObject.getSwiftContainerName() + "&temp_url_sig=" + swiftObject.getTempUrlSignature() + "&temp_url_expires=" + swiftObject.getTempUrlExpiry();
 
-        
+
     }
-    
+
     //For a single file
     public String getComputeUrl(FileMetadata metadata) {
         SwiftAccessIO swiftObject = null;
@@ -1086,18 +1307,18 @@ public String getComputeUrl(FileMetadata metadata) {
         } catch (IOException e) {
             logger.info("DatasetPage: Failed to get storageIO");
         }
-        if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.PublicInstall, false)) {
+        if (isHasPublicStore()) {
             return settingsWrapper.getValueForKey(SettingsServiceBean.Key.ComputeBaseUrl) + "?" + this.getPersistentId() + "=" + swiftObject.getSwiftFileName();
         }
-        
+
         return settingsWrapper.getValueForKey(SettingsServiceBean.Key.ComputeBaseUrl) + "?" + this.getPersistentId() + "=" + swiftObject.getSwiftFileName() + "&temp_url_sig=" + swiftObject.getTempUrlSignature() + "&temp_url_expires=" + swiftObject.getTempUrlExpiry();
 
     }
-    
+
     public String getCloudEnvironmentName() {
         return settingsWrapper.getValueForKey(SettingsServiceBean.Key.CloudEnvironmentName);
     }
-    
+
     public DataFile getSelectedDownloadFile() {
         return selectedDownloadFile;
     }
@@ -1105,15 +1326,31 @@ public DataFile getSelectedDownloadFile() {
     public void setSelectedDownloadFile(DataFile selectedDownloadFile) {
         this.selectedDownloadFile = selectedDownloadFile;
     }
-    
+
     public List<DataFile> getNewFiles() {
         return newFiles;
     }
-    
+
     public void setNewFiles(List<DataFile> newFiles) {
         this.newFiles = newFiles;
     }
-    
+
+    public List<DataFile> getUploadedFiles() {
+        return uploadedFiles;
+    }
+
+    public void setUploadedFiles(List<DataFile> uploadedFiles) {
+        this.uploadedFiles = uploadedFiles;
+    }
+
+    public MutableBoolean getUploadInProgress() {
+        return uploadInProgress;
+    }
+
+    public void setUploadInProgress(MutableBoolean inProgress) {
+        this.uploadInProgress = inProgress;
+    }
+
     public Dataverse getLinkingDataverse() {
         return linkingDataverse;
     }
@@ -1138,19 +1375,17 @@ public void setLinkingDataverseId(Long linkingDataverseId) {
         this.linkingDataverseId = linkingDataverseId;
     }
 
-
-    
     public void updateReleasedVersions(){
-        
+
         setReleasedVersionTabList(resetReleasedVersionTabList());
-        
+
     }
-    
+
     public void clickDeaccessionDataset(){
         setReleasedVersionTabList(resetReleasedVersionTabList());
         setRenderDeaccessionPopup(true);
     }
-    
+
     private boolean renderDeaccessionPopup = false;
 
     public boolean isRenderDeaccessionPopup() {
@@ -1160,7 +1395,7 @@ public boolean isRenderDeaccessionPopup() {
     public void setRenderDeaccessionPopup(boolean renderDeaccessionPopup) {
         this.renderDeaccessionPopup = renderDeaccessionPopup;
     }
-    
+
     public void updateSelectedLinkingDV(ValueChangeEvent event) {
         linkingDataverseId = (Long) event.getNewValue();
     }
@@ -1176,54 +1411,54 @@ public void setNoDVsAtAll(boolean noDVsAtAll) {
     public boolean isNoDVsRemaining() {
         return noDVsRemaining;
     }
-    
+
 
     private Map<Long, String> datafileThumbnailsMap = new HashMap<>();
 
     public boolean isThumbnailAvailable(FileMetadata fileMetadata) {
-        
-        // new and optimized logic: 
+
+        // new and optimized logic:
         // - check download permission here (should be cached - so it's free!)
         // - only then check if the thumbnail is available/exists.
         // then cache the results!
-        
+
         Long dataFileId = fileMetadata.getDataFile().getId();
-        
+
         if (datafileThumbnailsMap.containsKey(dataFileId)) {
             return !"".equals(datafileThumbnailsMap.get(dataFileId));
         }
-        
+
         if (!FileUtil.isThumbnailSupported(fileMetadata.getDataFile())) {
             datafileThumbnailsMap.put(dataFileId, "");
             return false;
         }
-        
+
         if (!this.fileDownloadHelper.canDownloadFile(fileMetadata)) {
             datafileThumbnailsMap.put(dataFileId, "");
             return false;
         }
-     
-        
-        
+
+
+
         String thumbnailAsBase64 = ImageThumbConverter.getImageThumbnailAsBase64(fileMetadata.getDataFile(), ImageThumbConverter.DEFAULT_THUMBNAIL_SIZE);
-        
-        
+
+
         //if (datafileService.isThumbnailAvailable(fileMetadata.getDataFile())) {
         if (!StringUtil.isEmpty(thumbnailAsBase64)) {
             datafileThumbnailsMap.put(dataFileId, thumbnailAsBase64);
             return true;
-        } 
-        
+        }
+
         datafileThumbnailsMap.put(dataFileId, "");
         return false;
-        
+
     }
-    
+
     public String getDataFileThumbnailAsBase64(FileMetadata fileMetadata) {
         return datafileThumbnailsMap.get(fileMetadata.getDataFile().getId());
     }
-    
-    // Another convenience method - to cache Update Permission on the dataset: 
+
+    // Another convenience method - to cache Update Permission on the dataset:
     public boolean canUpdateDataset() {
         return permissionsWrapper.canUpdateDataset(dvRequestService.getDataverseRequest(), this.dataset);
     }
@@ -1231,81 +1466,83 @@ public boolean canPublishDataverse() {
         return permissionsWrapper.canIssuePublishDataverseCommand(dataset.getOwner());
     }
 
+    public boolean canPublishDataset(){
+        return permissionsWrapper.canIssuePublishDatasetCommand(dataset);
+    }
+
     public boolean canViewUnpublishedDataset() {
         return permissionsWrapper.canViewUnpublishedDataset( dvRequestService.getDataverseRequest(), dataset);
     }
-        
-    /* 
-     * 4.2.1 optimization. 
-     * HOWEVER, this doesn't appear to be saving us anything! 
-     * i.e., it's just as cheap to use session.getUser().isAuthenticated() 
-     * every time; it doesn't do any new db lookups. 
+
+    public boolean canSeeCurationStatus() {
+        boolean creatorsCanSeeStatus = JvmSettings.UI_SHOW_CURATION_STATUS_TO_ALL.lookupOptional(Boolean.class).orElse(false);
+        if (creatorsCanSeeStatus) {
+            return canViewUnpublishedDataset();
+        } else {
+            return canPublishDataset();
+        }
+    }
+
+    /*
+     * 4.2.1 optimization.
+     * HOWEVER, this doesn't appear to be saving us anything!
+     * i.e., it's just as cheap to use session.getUser().isAuthenticated()
+     * every time; it doesn't do any new db lookups.
     */
     public boolean isSessionUserAuthenticated() {
         return session.getUser().isAuthenticated();
     }
-    
+
     /**
      * For use in the Dataset page
-     * @return 
+     * @return
      */
     public boolean isSuperUser(){
-        
+
         if (!this.isSessionUserAuthenticated()){
             return false;
         }
-        
+
         if (this.session.getUser().isSuperuser()){
             return true;
         }
         return false;
     }
-    /* 
-       TODO/OPTIMIZATION: This is still costing us N SELECT FROM GuestbookResponse queries, 
-       where N is the number of files. This could of course be replaced by a query that'll 
-       look up all N at once... Not sure if it's worth it; especially now that N
-       will always be 10, for the initial page load. -- L.A. 4.2.1
-     */
-    public Long getGuestbookResponseCount(FileMetadata fileMetadata) {
-        return guestbookResponseService.getCountGuestbookResponsesByDataFileId(fileMetadata.getDataFile().getId());
-    }
     /**
      * Check Dataset related permissions
-     * 
+     *
      * @param permissionToCheck
-     * @return 
+     * @return
      */
     public boolean doesSessionUserHaveDataSetPermission(Permission permissionToCheck){
         if (permissionToCheck == null){
             return false;
         }
-               
+
         String permName = permissionToCheck.getHumanName();
-       
-        // Has this check already been done? 
-        // 
+
+        // Has this check already been done?
+        //
         if (this.datasetPermissionMap.containsKey(permName)){
             // Yes, return previous answer
             return this.datasetPermissionMap.get(permName);
         }
-        
+
         // Check the permission
         //
         boolean hasPermission = this.permissionService.userOn(this.session.getUser(), this.dataset).has(permissionToCheck);
 
         // Save the permission
         this.datasetPermissionMap.put(permName, hasPermission);
-        
+
         // return true/false
         return hasPermission;
     }
-    
+
     public void setNoDVsRemaining(boolean noDVsRemaining) {
         this.noDVsRemaining = noDVsRemaining;
     }
 
-    private final Map<Long, MapLayerMetadata> mapLayerMetadataLookup = new HashMap<>();
-
     private GuestbookResponse guestbookResponse;
     private Guestbook selectedGuestbook;
 
@@ -1340,8 +1577,8 @@ public int getFilePaginatorPage() {
     public void setFilePaginatorPage(int filePaginatorPage) {
         this.filePaginatorPage = filePaginatorPage;
     }
-    
-    
+
+
     public int getRowsPerPage() {
         return rowsPerPage;
     }
@@ -1353,7 +1590,7 @@ public void setRowsPerPage(int rowsPerPage) {
     public String getGlobalId() {
         return persistentId;
     }
-        
+
     public String getPersistentId() {
         return persistentId;
     }
@@ -1367,7 +1604,7 @@ public String getVersion() {
 
     public void setVersion(String version) {
         this.version = version;
-    }    
+    }
 
     public String getShowVersionList() {
         return showVersionList;
@@ -1417,7 +1654,7 @@ public String getDropBoxSelection() {
     }
 
     public String getDropBoxKey() {
-        // Site-specific DropBox application registration key is configured 
+        // Site-specific DropBox application registration key is configured
         // via a JVM option under glassfish.
         //if (true)return "some-test-key";  // for debugging
 
@@ -1444,6 +1681,9 @@ public DatasetVersion getWorkingVersion() {
         return workingVersion;
     }
 
+    public Long getId() { return this.id; }
+    public void setId(Long id) { this.id = id; }
+
     public EditMode getEditMode() {
         return editMode;
     }
@@ -1472,6 +1712,14 @@ public int getSelectedTabIndex() {
         return selectedTabIndex;
     }
 
+    public String getSelectTab() {
+        return selectTab;
+    }
+
+    public void setSelectTab(String selectTab) {
+        this.selectTab = selectTab;
+    }
+
     public void setSelectedTabIndex(int selectedTabIndex) {
         this.selectedTabIndex = selectedTabIndex;
     }
@@ -1539,19 +1787,11 @@ public Template getSelectedTemplate() {
     public void setSelectedTemplate(Template selectedTemplate) {
         this.selectedTemplate = selectedTemplate;
     }
-    
+
     public void updateSelectedTemplate(ValueChangeEvent event) {
-        
+
         selectedTemplate = (Template) event.getNewValue();
-        if (selectedTemplate != null) {
-            //then create new working version from the selected template
-            workingVersion.updateDefaultValuesFromTemplate(selectedTemplate); 
-            updateDatasetFieldInputLevels();
-        } else { 
-            workingVersion.initDefaultValues();
-            updateDatasetFieldInputLevels();
-        }
-        resetVersionUI();
+
     }
 
     /*
@@ -1576,57 +1816,61 @@ private void updateDatasetFieldInputLevels() {
      *
      * Note: Updated to retrieve DataverseFieldTypeInputLevel objects in single query
      *
-     */    
+     */
      private void updateDatasetFieldInputLevels() {
          Long dvIdForInputLevel = ownerId;
-        
-         // OPTIMIZATION (?): replaced "dataverseService.find(ownerId)" with 
+
+         // OPTIMIZATION (?): replaced "dataverseService.find(ownerId)" with
          // simply dataset.getOwner()... saves us a few lookups.
-         // TODO: could there possibly be any reason we want to look this 
+         // TODO: could there possibly be any reason we want to look this
          // dataverse up by the id here?? -- L.A. 4.2.1
          if (!dataset.getOwner().isMetadataBlockRoot()) {
              dvIdForInputLevel = dataset.getOwner().getMetadataRootId();
-         }        
-        
+         }
+
         /* ---------------------------------------------------------
-            Map to hold DatasetFields  
+            Map to hold DatasetFields
             Format:  {  DatasetFieldType.id : DatasetField }
          --------------------------------------------------------- */
         // Initialize Map
-        Map<Long, DatasetField> mapDatasetFields = new HashMap<>();   
+        Map<Long, DatasetField> mapDatasetFields = new HashMap<>();
 
         // Populate Map
          for (DatasetField dsf : workingVersion.getFlatDatasetFields()) {
             if (dsf.getDatasetFieldType().getId() != null){
                 mapDatasetFields.put(dsf.getDatasetFieldType().getId(), dsf);
             }
-        }      
-        
+        }
+
         /* ---------------------------------------------------------
             Retrieve List of DataverseFieldTypeInputLevel objects
             Use the DatasetFieldType id's which are the Map's keys
          --------------------------------------------------------- */
         List<Long> idList = new ArrayList<>(mapDatasetFields.keySet());
         List<DataverseFieldTypeInputLevel> dsFieldTypeInputLevels = dataverseFieldTypeInputLevelService.findByDataverseIdAndDatasetFieldTypeIdList(dvIdForInputLevel, idList);
-        
+
         /* ---------------------------------------------------------
             Iterate through List of DataverseFieldTypeInputLevel objects
             Call "setInclude" on its related DatasetField object
          --------------------------------------------------------- */
         for (DataverseFieldTypeInputLevel oneDSFieldTypeInputLevel : dsFieldTypeInputLevels){
-            
+
             if (oneDSFieldTypeInputLevel != null) {
                 // Is the DatasetField in the hash?    hash format: {  DatasetFieldType.id : DatasetField }
-                DatasetField dsf = mapDatasetFields.get(oneDSFieldTypeInputLevel.getDatasetFieldType().getId());  
+                DatasetField dsf = mapDatasetFields.get(oneDSFieldTypeInputLevel.getDatasetFieldType().getId());
                 if (dsf != null){
                     // Yes, call "setInclude"
                     dsf.setInclude(oneDSFieldTypeInputLevel.isInclude());
-                    // remove from hash                
-                    mapDatasetFields.remove(oneDSFieldTypeInputLevel.getDatasetFieldType().getId());    
+                    Boolean displayOnCreate = oneDSFieldTypeInputLevel.getDisplayOnCreate();
+                    if (displayOnCreate!= null) {
+                        dsf.getDatasetFieldType().setLocalDisplayOnCreate(displayOnCreate);
+                    }
+                    // remove from hash
+                    mapDatasetFields.remove(oneDSFieldTypeInputLevel.getDatasetFieldType().getId());
                 }
             }
         }  // end: updateDatasetFieldInputLevels
-        
+
         /* ---------------------------------------------------------
             Iterate through any DatasetField objects remaining in the hash
             Call "setInclude(true) on each one
@@ -1645,6 +1889,22 @@ public void handleChange() {
 
     public void handleChangeButton() {
 
+        if (selectedTemplate != null) {
+            //then create new working version from the selected template
+            workingVersion.updateDefaultValuesFromTemplate(selectedTemplate);
+            updateDatasetFieldInputLevels();
+        } else {
+            workingVersion.initDefaultValues(licenseServiceBean.getDefault());
+            updateDatasetFieldInputLevels();
+        }
+        dataset.setTemplate(selectedTemplate);
+        /*
+        Issue 8646: necessary for the access popup which is shared by the dataset page and the file page
+        */
+        setFileAccessRequest(workingVersion.getTermsOfUseAndAccess().isFileAccessRequest());
+        setTermsOfAccess(workingVersion.getTermsOfUseAndAccess().getTermsOfAccess());
+        
+        resetVersionUI();
     }
 
     public boolean isShapefileType(FileMetadata fm) {
@@ -1658,78 +1918,10 @@ public boolean isShapefileType(FileMetadata fm) {
         return fm.getDataFile().isShapefileType();
     }
 
-    /*
-     Check if the FileMetadata.dataFile has an associated MapLayerMetadata object
-    
-     The MapLayerMetadata objects have been fetched at page inception by "loadMapLayerMetadataLookup()" 
-     */
-    public boolean hasMapLayerMetadata(FileMetadata fm) {
-        if (fm == null) {
-            return false;
-        }
-        if (fm.getDataFile() == null) {
-            return false;
-        }
-        return doesDataFileHaveMapLayerMetadata(fm.getDataFile());
+    private void msg(String s){
+        // System.out.println(s);
     }
 
-    /**
-     * Check if a DataFile has an associated MapLayerMetadata object
-     *
-     * The MapLayerMetadata objects have been fetched at page inception by
-     * "loadMapLayerMetadataLookup()"
-     */
-    private boolean doesDataFileHaveMapLayerMetadata(DataFile df) {
-        if (df == null) {
-            return false;
-        }
-        if (df.getId() == null) {
-            return false;
-        }
-        return this.mapLayerMetadataLookup.containsKey(df.getId());
-    }
-
-    /**
-     * Using a DataFile id, retrieve an associated MapLayerMetadata object
-     *
-     * The MapLayerMetadata objects have been fetched at page inception by
-     * "loadMapLayerMetadataLookup()"
-     */
-    public MapLayerMetadata getMapLayerMetadata(DataFile df) {
-        if (df == null) {
-            return null;
-        }
-        return this.mapLayerMetadataLookup.get(df.getId());
-    }
-
-    private void msg(String s){
-        // System.out.println(s);
-    }
-
-    /**
-     * Create a hashmap consisting of { DataFile.id : MapLayerMetadata object}
-     *
-     * Very few DataFiles will have associated MapLayerMetadata objects so only
-     * use 1 query to get them
-     */
-    private void loadMapLayerMetadataLookup() {
-        if (this.dataset == null) {
-        }
-        if (this.dataset.getId() == null) {
-            return;
-        }
-        List<MapLayerMetadata> mapLayerMetadataList = mapLayerMetadataService.getMapLayerMetadataForDataset(this.dataset);
-        if (mapLayerMetadataList == null) {
-            return;
-        }
-        for (MapLayerMetadata layer_metadata : mapLayerMetadataList) {
-            mapLayerMetadataLookup.put(layer_metadata.getDataFile().getId(), layer_metadata);
-        }
-
-    }// A DataFile may have a related MapLayerMetadata object
-
-    
-    
     private List<FileMetadata> displayFileMetadata;
 
     public List<FileMetadata> getDisplayFileMetadata() {
@@ -1739,86 +1931,157 @@ public List<FileMetadata> getDisplayFileMetadata() {
     public void setDisplayFileMetadata(List<FileMetadata> displayFileMetadata) {
         this.displayFileMetadata = displayFileMetadata;
     }
-    
-    private boolean readOnly = true; 
-    
+
+    private boolean readOnly = true;
+
     public String init() {
         return init(true);
     }
-    
+
     public String initCitation() {
         return init(false);
-    }     
+    }
+
+    public void updateOwnerDataverse() {
+        if (selectedHostDataverse != null && selectedHostDataverse.getId() != null) {
+            ownerId = selectedHostDataverse.getId();
+            dataset.setOwner(selectedHostDataverse);
+            logger.info("New host dataverse id: " + ownerId);
+            // discard the dataset already created
+            //If a global ID was already assigned, as is true for direct upload, keep it (if files were already uploaded, they are at the path corresponding to the existing global id)
+            GlobalId gid = dataset.getGlobalId();
+            dataset = new Dataset();
+            if (gid != null) {
+                dataset.setGlobalId(gid);
+            }
+
+            // initiate from scratch: (isolate the creation of a new dataset in its own method?)
+            init(true);
+            // rebuild the bread crumbs display:
+            dataverseHeaderFragment.initBreadcrumbs(dataset);
+        }
+    }
+
+    public boolean rsyncUploadSupported() {
+
+        return settingsWrapper.isRsyncUpload() && DatasetUtil.isRsyncAppropriateStorageDriver(dataset);
+    }
     
+    public boolean globusUploadSupported() {
+        return settingsWrapper.isGlobusUpload() && settingsWrapper.isGlobusEnabledStorageDriver(dataset.getEffectiveStorageDriverId());
+    }
+    
+    public boolean webloaderUploadSupported() {
+        return settingsWrapper.isWebloaderUpload() && StorageIO.isDirectUploadEnabled(dataset.getEffectiveStorageDriverId());
+    }
+
+    private void setIdByPersistentId() {
+        GlobalId gid = PidUtil.parseAsGlobalID(persistentId);
+        Long id = dvObjectService.findIdByGlobalId(gid, DvObject.DType.Dataset);
+        if (id == null) {
+            id = dvObjectService.findIdByAltGlobalId(gid, DvObject.DType.Dataset);
+        }
+        if (id != null) {
+            this.setId(id);
+        }
+    }
+
     private String init(boolean initFull) {
-  
+        // Check for rate limit exceeded. Must be done before anything else to prevent unnecessary processing.
+        if (!cacheFactory.checkRate(session.getUser(), new CheckRateLimitForDatasetPageCommand(null,null))) {
+            return navigationWrapper.tooManyRequests();
+        }
         //System.out.println("_YE_OLDE_QUERY_COUNTER_");  // for debug purposes
-        this.maxFileUploadSizeInBytes = systemConfig.getMaxFileUploadSize();
         setDataverseSiteUrl(systemConfig.getDataverseSiteUrl());
 
         guestbookResponse = new GuestbookResponse();
+        anonymizedAccess = null;
+
+        String sortOrder = getSortOrder();
+        if(sortOrder != null) {
+            FileMetadata.setCategorySortOrder(sortOrder);
+        }
         
-        String nonNullDefaultIfKeyNotFound = "";
-        protocol = settingsWrapper.getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound);
-        authority = settingsWrapper.getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound);
-        if (dataset.getId() != null || versionId != null || persistentId != null) { // view mode for a dataset
+        if (dataset.getId() != null || versionId != null || persistentId != null) { // view mode for a dataset     
 
             DatasetVersionServiceBean.RetrieveDatasetVersionResponse retrieveDatasetVersionResponse = null;
 
             // ---------------------------------------
             // Set the workingVersion and Dataset
-            // ---------------------------------------           
+            // ---------------------------------------
             if (persistentId != null) {
-                logger.fine("initializing DatasetPage with persistent ID " + persistentId);
-                // Set Working Version and Dataset by PersistentID
-                dataset = datasetService.findByGlobalId(persistentId);
-                if (dataset == null) {
-                    logger.warning("No such dataset: "+persistentId);
-                    return permissionsWrapper.notFound();
-                }
-                logger.fine("retrieved dataset, id="+dataset.getId());
-                
-                retrieveDatasetVersionResponse = datasetVersionService.selectRequestedVersion(dataset.getVersions(), version);
-                //retrieveDatasetVersionResponse = datasetVersionService.retrieveDatasetVersionByPersistentId(persistentId, version);
-                this.workingVersion = retrieveDatasetVersionResponse.getDatasetVersion();
-                logger.fine("retrieved version: id: " + workingVersion.getId() + ", state: " + this.workingVersion.getVersionState());
-
-            } else if (dataset.getId() != null) {
+                setIdByPersistentId();
+            }
+            
+            if (this.getId() != null) {
                 // Set Working Version and Dataset by Datasaet Id and Version
-                dataset = datasetService.find(dataset.getId());
+                
+                // We are only performing these lookups to obtain the database id
+                // of the version that we are displaying, and then we will use it
+                // to perform a .findDeep(versionId); see below. 
+                
+                // TODO: replace the code block below, the combination of 
+                // datasetService.find(id) and datasetVersionService.selectRequestedVersion()
+                // with some optimized, direct query-based way of obtaining 
+                // the numeric id of the requested DatasetVersion (and that's 
+                // all we need, we are not using any of the entities produced 
+                // below. 
+                
+                dataset = datasetService.find(this.getId());
+                
                 if (dataset == null) {
                     logger.warning("No such dataset: "+dataset);
                     return permissionsWrapper.notFound();
                 }
                 //retrieveDatasetVersionResponse = datasetVersionService.retrieveDatasetVersionById(dataset.getId(), version);
                 retrieveDatasetVersionResponse = datasetVersionService.selectRequestedVersion(dataset.getVersions(), version);
+                if (retrieveDatasetVersionResponse == null) {
+                    return permissionsWrapper.notFound();
+                }
                 this.workingVersion = retrieveDatasetVersionResponse.getDatasetVersion();
-                logger.info("retreived version: id: " + workingVersion.getId() + ", state: " + this.workingVersion.getVersionState());
+                logger.fine("retrieved version: id: " + workingVersion.getId() + ", state: " + this.workingVersion.getVersionState());
+                
+                versionId = workingVersion.getId();
 
-            } else if (versionId != null) {
-                // TODO: 4.2.1 - this method is broken as of now!
-                // Set Working Version and Dataset by DatasaetVersion Id
-                //retrieveDatasetVersionResponse = datasetVersionService.retrieveDatasetVersionByVersionId(versionId);
+                this.workingVersion = null;
+                this.dataset = null;
 
             } 
-
-            if (retrieveDatasetVersionResponse == null) {
+            
+            // ... And now the "real" working version lookup: 
+            
+            if (versionId != null) {
+                this.workingVersion = datasetVersionService.findDeep(versionId);
+                dataset = workingVersion.getDataset();
+            }
+            
+            if (workingVersion == null) {
+                logger.warning("Failed to retrieve version");
                 return permissionsWrapper.notFound();
             }
+            
+            this.maxFileUploadSizeInBytes = systemConfig.getMaxFileUploadSizeForStore(dataset.getEffectiveStorageDriverId());
+
 
             
-            //this.dataset = this.workingVersion.getDataset();
 
-            // end: Set the workingVersion and Dataset
-            // ---------------------------------------
-            // Is the DatasetVersion or Dataset null?
-            //
-            if (workingVersion == null || this.dataset == null) {
-                return permissionsWrapper.notFound();
+            switch (selectTab){
+                case "dataFilesTab":
+                    selectedTabIndex = 0;
+                    break;
+                case "metadataMapTab":
+                    selectedTabIndex = 1;
+                    break;
+                case "termsTab":
+                    selectedTabIndex = 2;
+                    break;
+                case "versionsTab":
+                    selectedTabIndex = 3;
+                    break;
             }
 
             // Is the Dataset harvested?
-            
+
             if (dataset.isHarvested()) {
                 // if so, we'll simply forward to the remote URL for the original
                 // source of this harvested dataset:
@@ -1833,49 +2096,48 @@ private String init(boolean initFull) {
                         // to the local 404 page, below.
                         logger.warning("failed to issue a redirect to "+originalSourceURL);
                     }
-                    return originalSourceURL;
+                    return null;
                 }
 
                 return permissionsWrapper.notFound();
             }
-              
-            // Check permisisons           
+
+            // Check permisisons
             if (!(workingVersion.isReleased() || workingVersion.isDeaccessioned()) && !this.canViewUnpublishedDataset()) {
                 return permissionsWrapper.notAuthorized();
             }
 
-            if (!retrieveDatasetVersionResponse.wasRequestedVersionRetrieved()) {
+            if (retrieveDatasetVersionResponse != null && !retrieveDatasetVersionResponse.wasRequestedVersionRetrieved()) {
                 //msg("checkit " + retrieveDatasetVersionResponse.getDifferentVersionMessage());
                 JsfHelper.addWarningMessage(retrieveDatasetVersionResponse.getDifferentVersionMessage());//BundleUtil.getStringFromBundle("dataset.message.metadataSuccess"));
             }
-            
+
             // init the citation
-            displayCitation = dataset.getCitation(true, workingVersion);
-            
+            displayCitation = dataset.getCitation(true, workingVersion, isAnonymizedAccess());
+            logger.fine("Citation: " + displayCitation);
+
             if(workingVersion.isPublished()) {
                 MakeDataCountEntry entry = new MakeDataCountEntry(FacesContext.getCurrentInstance(), dvRequestService, workingVersion);
                 mdcLogService.logEntry(entry);
             }
+            displayWorkflowComments();
+
 
             if (initFull) {
+
                 // init the list of FileMetadatas
                 if (workingVersion.isDraft() && canUpdateDataset()) {
                     readOnly = false;
-                } else {
-                    // an attempt to retreive both the filemetadatas and datafiles early on, so that 
-                    // we don't have to do so later (possibly, many more times than necessary):
-                    datafileService.findFileMetadataOptimizedExperimental(dataset);
                 }
-                
+                publishDialogVersionNote = workingVersion.getVersionNote();
                 // This will default to all the files in the version, if the search term
                 // parameter hasn't been specified yet:
                 fileMetadatasSearch = selectFileMetadatasForDisplay();
-
                 ownerId = dataset.getOwner().getId();
                 datasetNextMajorVersion = this.dataset.getNextMajorVersionString();
                 datasetNextMinorVersion = this.dataset.getNextMinorVersionString();
-                datasetVersionUI = datasetVersionUI.initDatasetVersionUI(workingVersion, false);
                 updateDatasetFieldInputLevels();
+                datasetVersionUI = datasetVersionUI.initDatasetVersionUI(workingVersion, false);
 
                 setExistReleasedVersion(resetExistRealeaseVersion());
                 //moving setVersionTabList to tab change event
@@ -1883,13 +2145,11 @@ private String init(boolean initFull) {
                 //setReleasedVersionTabList(resetReleasedVersionTabList());
                 //SEK - lazymodel may be needed for datascroller in future release
                 // lazyModel = new LazyFileMetadataDataModel(workingVersion.getId(), datafileService );
-                // populate MapLayerMetadata
-                this.loadMapLayerMetadataLookup();  // A DataFile may have a related MapLayerMetadata object
                 this.guestbookResponse = guestbookResponseService.initGuestbookResponseForFragment(workingVersion, null, session);
-                this.getFileDownloadHelper().setGuestbookResponse(guestbookResponse);
                 logger.fine("Checking if rsync support is enabled.");
                 if (DataCaptureModuleUtil.rsyncSupportEnabled(settingsWrapper.getValueForKey(SettingsServiceBean.Key.UploadMethods))
-                        && dataset.getFiles().isEmpty()) { //only check for rsync if no files exist
+                        && dataset.getFiles().isEmpty()  && this.canUpdateDataset() ) { //only check for rsync if no files exist
+                                                                                        //and user can update dataset
                     try {
                         ScriptRequestResponse scriptRequestResponse = commandEngine.submit(new RequestRsyncScriptCommand(dvRequestService.getDataverseRequest(), dataset));
                         logger.fine("script: " + scriptRequestResponse.getScript());
@@ -1902,31 +2162,44 @@ private String init(boolean initFull) {
                             setHasRsyncScript(false);
                         }
                     } catch (RuntimeException ex) {
-                        logger.warning("Problem getting rsync script: " + ex.getLocalizedMessage());
+                        logger.warning("Problem getting rsync script(RuntimeException): " + ex.getLocalizedMessage());
+                        FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Problem getting rsync script:",  ex.getLocalizedMessage()));
                     } catch (CommandException cex) {
                         logger.warning("Problem getting rsync script (Command Exception): " + cex.getLocalizedMessage());
+                           FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Problem getting rsync script:",  cex.getLocalizedMessage()));
                     }
                 }
 
-            }                       
+                tooLargeToDownload = getSizeOfDatasetNumeric() > settingsWrapper.getZipDownloadLimit();
+                tooLargeToDownloadOriginal = getSizeOfDatasetOrigNumeric() > settingsWrapper.getZipDownloadLimit();
+                tooLargeToDownloadArchival = getSizeOfDatasetArchivalNumeric() > settingsWrapper.getZipDownloadLimit();
+            }
         } else if (ownerId != null) {
             // create mode for a new child dataset
-            readOnly = false; 
+            readOnly = false;
             editMode = EditMode.CREATE;
-            dataset.setOwner(dataverseService.find(ownerId));
-            dataset.setProtocol(protocol);
-            dataset.setAuthority(authority);
-            //Wait until the create command before actually getting an identifier  
+            selectedHostDataverse = dataverseService.find(ownerId);
+            dataset.setOwner(selectedHostDataverse);
 
             if (dataset.getOwner() == null) {
                 return permissionsWrapper.notFound();
             } else if (!permissionService.on(dataset.getOwner()).has(Permission.AddDataset)) {
-                return permissionsWrapper.notAuthorized(); 
+                return permissionsWrapper.notAuthorized();
+            }
+            //Wait until the create command before actually getting an identifier, except if we're using directUpload
+        	//Need to assign an identifier prior to calls to requestDirectUploadUrl if direct upload is used.
+            if ( isEmpty(dataset.getIdentifier()) && systemConfig.directUploadEnabled(dataset) ) {
+                CommandContext ctxt = commandEngine.getContext();
+                PidProvider pidProvider = ctxt.dvObjects().getEffectivePidGenerator(dataset);
+                pidProvider.generatePid(dataset);
             }
-            
             dataverseTemplates.addAll(dataverseService.find(ownerId).getTemplates());
             if (!dataverseService.find(ownerId).isTemplateRoot()) {
-                dataverseTemplates.addAll(dataverseService.find(ownerId).getParentTemplates());
+                for (Template templateTest: dataverseService.find(ownerId).getParentTemplates()){
+                   if(!dataverseTemplates.contains(templateTest)){
+                       dataverseTemplates.add(templateTest);
+                   }
+                }
             }
             Collections.sort(dataverseTemplates, (Template t1, Template t2) -> t1.getName().compareToIgnoreCase(t2.getName()));
 
@@ -1938,18 +2211,21 @@ private String init(boolean initFull) {
                         selectedTemplate = testT;
                     }
                 }
-                workingVersion = dataset.getEditVersion(selectedTemplate, null);
+                //Initalize with the default if there is one 
+                dataset.setTemplate(selectedTemplate);
+                workingVersion = dataset.getOrCreateEditVersion(selectedTemplate, null);
                 updateDatasetFieldInputLevels();
             } else {
-                workingVersion = dataset.getCreateVersion();
+                workingVersion = dataset.getCreateVersion(licenseServiceBean.getDefault());
                 updateDatasetFieldInputLevels();
             }
-            
-            if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.PublicInstall, false)){
-                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.message.label.fileAccess"), 
+
+            if (isHasPublicStore()){
+                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.message.label.fileAccess"),
                         BundleUtil.getStringFromBundle("dataset.message.publicInstall"));
             }
-
+            setFileAccessRequest(workingVersion.getTermsOfUseAndAccess().isFileAccessRequest());
+            setTermsOfAccess(workingVersion.getTermsOfUseAndAccess().getTermsOfAccess());
             resetVersionUI();
 
             // FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Add New Dataset", " - Enter metadata to create the dataset's citation. You can add more metadata about this dataset after it's created."));
@@ -1959,20 +2235,126 @@ private String init(boolean initFull) {
         try {
             privateUrl = commandEngine.submit(new GetPrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset));
             if (privateUrl != null) {
-                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.header"), 
+                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.header"),
                         BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
             }
         } catch (CommandException ex) {
             // No big deal. The user simply doesn't have access to create or delete a Private URL.
         }
+        logger.fine("PrivateUser: " + (session.getUser() instanceof PrivateUrlUser));
         if (session.getUser() instanceof PrivateUrlUser) {
             PrivateUrlUser privateUrlUser = (PrivateUrlUser) session.getUser();
+            logger.fine("Anon: " + privateUrlUser.hasAnonymizedAccess());
             if (dataset != null && dataset.getId().equals(privateUrlUser.getDatasetId())) {
-                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.privateurl.header"), 
+                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.privateurl.header"),
                         BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageReviewer"));
             }
         }
-                
+
+        LocalDate minRetentiondate = settingsWrapper.getMinRetentionDate();
+        if (minRetentiondate != null){
+            selectionRetention.setDateUnavailable(minRetentiondate.plusDays(1L));
+        }
+
+        displayLockInfo(dataset);
+        displayPublishMessage();
+
+        // TODO: replace this loop, and the loop in the method that calculates 
+        // the total "originals" size of the dataset with direct custom queries; 
+        // then we'll be able to drop the lookup hint for DataTable from the 
+        // findDeep() method for the version and further speed up the lookup 
+        // a little bit.
+        boolean globusDownloadEnabled = systemConfig.isGlobusDownload();
+        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+            DataFile df = fmd.getDataFile();
+            if (df.isTabularData()) {
+                versionHasTabular = true;
+            }
+            if(globusDownloadEnabled) {
+                if(GlobusAccessibleStore.isGlobusAccessible(DataAccess.getStorageDriverFromIdentifier(df.getStorageIdentifier()))) {
+                    versionHasGlobus= true;
+                }
+            }
+            if(versionHasTabular &&(!globusDownloadEnabled || versionHasGlobus)) {
+                break;
+            }
+        }
+        
+        //Show ingest success message if refresh forces a page reload after ingest success
+        //This is needed to display the explore buttons (the fileDownloadHelper needs to be reloaded via page
+        if (showIngestSuccess) {
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.unlocked.ingest.message"));
+        }
+
+        configureTools = externalToolService.findFileToolsByType(ExternalTool.Type.CONFIGURE);
+        exploreTools = externalToolService.findFileToolsByType(ExternalTool.Type.EXPLORE);
+        previewTools = externalToolService.findFileToolsByType(ExternalTool.Type.PREVIEW);
+        fileQueryTools = externalToolService.findFileToolsByType(ExternalTool.Type.QUERY);
+        datasetExploreTools = externalToolService.findDatasetToolsByType(ExternalTool.Type.EXPLORE);
+        datasetConfigureTools = externalToolService.findDatasetToolsByType(ExternalTool.Type.CONFIGURE);
+        rowsPerPage = 10;
+        if (dataset.getId() != null && canUpdateDataset()) {
+            hasRestrictedFiles = workingVersion.isHasRestrictedFile();
+            hasValidTermsOfAccess = isHasValidTermsOfAccess();
+            if (!hasValidTermsOfAccess) {
+                String message = BundleUtil.getStringFromBundle("dataset.message.editMetadata.invalid.TOUA.message");               
+                JsfHelper.addWarningMessage(message);
+            }            
+        }
+        if(isAnonymizedAccess()){
+            dataverseHeaderFragment.setBreadcrumbs(new ArrayList<>());
+        }
+        return null;
+    }
+    
+    public void viewActionInitBreadcrumbs(){
+        if(!isAnonymizedAccess()){
+            dataverseHeaderFragment.initBreadcrumbs(dataset);
+        }
+    }
+
+    private void displayWorkflowComments() {
+        List<WorkflowComment> comments = workingVersion.getWorkflowComments();
+        for (WorkflowComment wfc : comments) {
+            if (wfc.isToBeShown() && wfc.getDatasetVersion().equals(workingVersion)
+                    && wfc.getAuthenticatedUser().equals(session.getUser())) {
+                if (wfc.getType() == WorkflowComment.Type.WORKFLOW_SUCCESS) {
+                    JsfHelper.addSuccessMessage(wfc.getMessage());
+
+                } else if (wfc.getType() == WorkflowComment.Type.WORKFLOW_FAILURE) {
+                    JsfHelper.addWarningMessage(wfc.getMessage());
+                }
+                datasetService.markWorkflowCommentAsRead(wfc);
+            }
+        }
+    }
+    
+    private void displayPublishMessage(){
+        if (workingVersion.isDraft() && workingVersion.getId() != null && canUpdateDataset() 
+                && !dataset.isLockedFor(DatasetLock.Reason.finalizePublication)
+              &&   (canPublishDataset() || !dataset.isLockedFor(DatasetLock.Reason.InReview) )){
+            JsfHelper.addWarningMessage(datasetService.getReminderString(dataset, canPublishDataset(), false, isValid()));
+        }               
+    }
+
+    Boolean valid = null;
+
+    public boolean isValid() {
+        if (valid == null) {
+            if (workingVersion.isDraft() || (canUpdateDataset() && JvmSettings.UI_SHOW_VALIDITY_LABEL_WHEN_PUBLISHED.lookupOptional(Boolean.class).orElse(true))) {
+                valid = workingVersion.isValid();
+            } else {
+                valid = true;
+            }
+        }
+        return valid;
+    }
+
+    public boolean isValidOrCanReviewIncomplete() {
+        return isValid() || JvmSettings.UI_ALLOW_REVIEW_INCOMPLETE.lookupOptional(Boolean.class).orElse(false);
+    }
+
+    private void displayLockInfo(Dataset dataset) {
         // Various info messages, when the dataset is locked (for various reasons):
         if (dataset.isLocked() && canUpdateDataset()) {
             if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
@@ -1988,124 +2370,141 @@ private String init(boolean initFull) {
                         BundleUtil.getStringFromBundle("file.rsyncUpload.inProgressMessage.details"));
                 lockedDueToDcmUpload = true;
             }
-            //This is a hack to remove dataset locks for File PID registration if 
-                //the dataset is released
-                //in testing we had cases where datasets with 1000 files were remaining locked after being published successfully
-                /*if(dataset.getLatestVersion().isReleased() && dataset.isLockedFor(DatasetLock.Reason.pidRegister)){
-                    datasetService.removeDatasetLocks(dataset.getId(), DatasetLock.Reason.pidRegister);
-                }*/
-            if (dataset.isLockedFor(DatasetLock.Reason.pidRegister)) {
+            if (dataset.isLockedFor(DatasetLock.Reason.GlobusUpload)) {
+                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("file.globusUpload.inProgressMessage.summary"),
+                        BundleUtil.getStringFromBundle("file.globusUpload.inProgressMessage.details"));
+            }
+            //This is a hack to remove dataset locks for File PID registration if
+            //the dataset is released
+            //in testing we had cases where datasets with 1000 files were remaining locked after being published successfully
+            /*if(dataset.getLatestVersion().isReleased() && dataset.isLockedFor(DatasetLock.Reason.finalizePublication)){
+                datasetService.removeDatasetLocks(dataset.getId(), DatasetLock.Reason.finalizePublication);
+            }*/
+            if (dataset.isLockedFor(DatasetLock.Reason.finalizePublication)) {
+                // "finalizePublication" lock is used to lock the dataset while
+                // the FinalizeDatasetPublicationCommand is running asynchronously.
+                // the tasks currently performed by the command are the  pid registration
+                // for files and (or) physical file validation (either or both
+                // of these two can be disabled via database settings). More
+                // such asynchronous processing tasks may be added in the future.
                 JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.publish.workflow.message"),
                         BundleUtil.getStringFromBundle("dataset.pidRegister.workflow.inprogress"));
             }
+            if (dataset.isLockedFor(DatasetLock.Reason.FileValidationFailed)) {
+                // the dataset is locked, because one or more datafiles in it
+                // failed validation during an attempt to publish it.
+                JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.publish.file.validation.error.message"),
+                        BundleUtil.getStringFromBundle("dataset.publish.file.validation.error.contactSupport"));
+            }
             if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress)) {
-                String rootDataverseName = dataverseService.findRootDataverse().getName();
                 JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.editInProgress.message"),
-                        BundleUtil.getStringFromBundle("dataset.locked.editInProgress.message.details", Arrays.asList(BrandingUtil.getSupportTeamName(null, rootDataverseName))));
+                        BundleUtil.getStringFromBundle("dataset.locked.editInProgress.message.details", Arrays.asList(BrandingUtil.getSupportTeamName(null))));
             }
         }
-        
-            if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
-                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.message"),
-                        BundleUtil.getStringFromBundle("dataset.locked.ingest.message"));
-                lockedDueToIngestVar = true;
-            }
-            
-        for(DataFile f : dataset.getFiles()) {
-            if(f.isTabularData()) {
-                hasTabular = true;
-                break;
-            }
+
+        if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
+            JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.message"),
+                    BundleUtil.getStringFromBundle("dataset.locked.ingest.message"));
+            lockedDueToIngestVar = true;
         }
-        //Show ingest success message if refresh forces a page reload after ingest success
-        //This is needed to display the explore buttons (the fileDownloadHelper needs to be reloaded via page 
-        if (showIngestSuccess) {
-            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.unlocked.ingest.message"));
+
+        if (dataset.getGlobalIdCreateTime() == null && editMode != EditMode.CREATE) {
+            // With DataCite, we try to reserve the DOI when the dataset is created. Sometimes this
+            // fails because DataCite is down. We show the message below to set expectations that the
+            // "Publish" button won't work until the DOI has been reserved using the "Reserve PID" API.
+            PidProvider pidProvider = PidUtil.getPidProvider(dataset.getGlobalId().getProviderId());
+            if (DataCiteDOIProvider.TYPE.equals(pidProvider.getProviderType())) {
+                JH.addMessage(FacesMessage.SEVERITY_WARN,
+                        BundleUtil.getStringFromBundle("dataset.locked.pidNotReserved.message"),
+                        BundleUtil.getStringFromBundle("dataset.locked.pidNotReserved.message.details"));
+            }
         }
+        //if necessary refresh publish message also
         
-        configureTools = externalToolService.findFileToolsByType(ExternalTool.Type.CONFIGURE);
-        exploreTools = externalToolService.findFileToolsByType(ExternalTool.Type.EXPLORE);
-        datasetExploreTools = externalToolService.findDatasetToolsByType(ExternalTool.Type.EXPLORE);
-        rowsPerPage = 10;
-      
-        
-        
-        return null;
+        displayPublishMessage();
+
+    }
+
+    public String getSortOrder() {
+        return settingsWrapper.getValueForKey(SettingsServiceBean.Key.CategoryOrder, null);
     }
     
-    private Boolean fileTreeViewRequired = null; 
+    public boolean orderByFolder() {
+        return settingsWrapper.isTrueForKey(SettingsServiceBean.Key.OrderByFolder, true);
+    }
     
+    public boolean allowUserManagementOfOrder() {
+        return settingsWrapper.isTrueForKey(SettingsServiceBean.Key.AllowUserManagementOfOrder, false);
+    }
+
+
+    private Boolean fileTreeViewRequired = null;
+
     public boolean isFileTreeViewRequired() {
         if (fileTreeViewRequired == null) {
-            fileTreeViewRequired = workingVersion.getFileMetadatas().size() > 1 
+            fileTreeViewRequired = workingVersion.getFileMetadatas().size() > 1
                     && datafileService.isFoldersMetadataPresentInVersion(workingVersion);
         }
-        return fileTreeViewRequired; 
+        return fileTreeViewRequired;
     }
-    
+
     public enum FileDisplayStyle {
 
         TABLE, TREE
     };
-    
-    private FileDisplayStyle fileDisplayMode = FileDisplayStyle.TABLE; 
-    
+
+    private FileDisplayStyle fileDisplayMode = FileDisplayStyle.TABLE;
+
     public String getFileDisplayMode() {
         return fileDisplayMode.equals(FileDisplayStyle.TABLE) ? "Table" : "Tree";
     }
-    
+
     public void setFileDisplayMode(String fileDisplayMode) {
+        isPageFlip = true;
         if ("Table".equals(fileDisplayMode)) {
             this.fileDisplayMode = FileDisplayStyle.TABLE;
         } else {
             this.fileDisplayMode = FileDisplayStyle.TREE;
-        } 
+        }
     }
-    
+
     public boolean isFileDisplayTable() {
         return fileDisplayMode == FileDisplayStyle.TABLE;
     }
-    
-    public void toggleFileDisplayMode() {
-        if (fileDisplayMode == FileDisplayStyle.TABLE) {
-            fileDisplayMode = FileDisplayStyle.TREE;
-        } else {
-            fileDisplayMode = FileDisplayStyle.TABLE;
-        }
-    }
+
     public boolean isFileDisplayTree() {
         return fileDisplayMode == FileDisplayStyle.TREE;
     }
-    
-    private TreeNode filesTreeRoot = null; 
-    
+
+    private TreeNode filesTreeRoot = null;
+
     public TreeNode getFilesTreeRoot() {
         if (filesTreeRoot == null) {
             initFilesTree();
         }
         return filesTreeRoot;
     }
-    
+
     private void initFilesTree() {
         filesTreeRoot = createFolderTreeNode("root", null);
         TreeNode currentNode = filesTreeRoot;
-        // this is a temporary map, that we keep while we are building 
+        // this is a temporary map, that we keep while we are building
         // the tree - in order to have direct access to the ancestor tree
         // nodes that have already been created:
         Map<String, TreeNode> folderMap = new HashMap<>();
-        boolean expandFolders = true; 
-        
+        boolean expandFolders = true;
+
         for ( FileMetadata fileMetadata :workingVersion.getFileMetadatasSortedByLabelAndFolder()) {
             String folder = fileMetadata.getDirectoryLabel();
-            
+
             logger.fine("current folder: "+folder+"; current label: "+fileMetadata.getLabel());
-            
+
             if (StringUtil.isEmpty(folder)) {
                 filesTreeRoot.getChildren().add(createFileTreeNode(fileMetadata, filesTreeRoot));
             } else {
                 if (folderMap.containsKey(folder)) {
-                    // We have already created this node; and since all the FileMetadatas 
-                    // are sorted by folder-then-label, it is safe to assume this is 
+                    // We have already created this node; and since all the FileMetadatas
+                    // are sorted by folder-then-label, it is safe to assume this is
                     // still the "current node":
                     currentNode.getChildren().add(createFileTreeNode(fileMetadata, currentNode));
                 } else {
@@ -2128,7 +2527,7 @@ private void initFilesTree() {
                             // create a new folder node:
                             currentNode = createFolderTreeNode(subfolders[level], currentNode);
                             folderMap.put(folderPath, currentNode);
-                            // all the folders, except for the top-level root node 
+                            // all the folders, except for the top-level root node
                             // are collapsed by default:
                             currentNode.setExpanded(expandFolders);
 
@@ -2139,60 +2538,67 @@ private void initFilesTree() {
                     // As soon as we reach the first folder containing files, we want
                     // to have all the other folders collapsed by default:
                     if (expandFolders) {
-                        expandFolders = false; 
+                        expandFolders = false;
                     }
                 }
             }
         }
-        
-        folderMap = null; 
+
+        folderMap = null;
 
     }
-    
+
     private DefaultTreeNode createFolderTreeNode(String name, TreeNode parent) {
-        // For a tree node representing a folder, we use its name, as a String, 
+        // For a tree node representing a folder, we use its name, as a String,
         // as the node data payload. (meaning, in the xhtml the folder name can
-        // be shown as simply "#{node}". 
-        // If we ever want to have more information shown for folders in the 
+        // be shown as simply "#{node}".
+        // If we ever want to have more information shown for folders in the
         // tree view (for example, we could show the number of files and sub-folders
-        // in each folder next to the name), we will have to define a custom class 
+        // in each folder next to the name), we will have to define a custom class
         // and use it instead of the string in the DefaultTreeNode constructor
         // below:
         DefaultTreeNode folderNode = new DefaultTreeNode(name, parent);
-        return folderNode; 
+        return folderNode;
     }
-    
+
     private DefaultTreeNode createFileTreeNode(FileMetadata fileMetadata, TreeNode parent) {
-        // For a tree node representing a DataFile, we pack the entire FileMetadata 
-        // object into the node, as its "data" payload. 
-        // Note that we are using a custom node type ("customFileNode"), defined 
+        // For a tree node representing a DataFile, we pack the entire FileMetadata
+        // object into the node, as its "data" payload.
+        // Note that we are using a custom node type ("customFileNode"), defined
         // in the page xhtml.
-        // If we ever want to have customized nodes that display different types 
-        // of information for different types of files (tab. files would be a 
+        // If we ever want to have customized nodes that display different types
+        // of information for different types of files (tab. files would be a
         // natural case), more custom nodes could be defined.
-        
-        DefaultTreeNode fileNode = new DefaultTreeNode("customFileNode", fileMetadata, parent);         
-        
-        return fileNode; 
+
+        DefaultTreeNode fileNode = new DefaultTreeNode("customFileNode", fileMetadata, parent);
+
+        return fileNode;
     }
-    
-    public boolean isHasTabular() {
+
+    /*public boolean isHasTabular() {
         return hasTabular;
+    }*/
+
+    public boolean isVersionHasTabular() {
+        return versionHasTabular;
     }
     
-    
+    public boolean isVersionHasGlobus() {
+        return versionHasGlobus;
+    }
+
     public boolean isReadOnly() {
-        return readOnly; 
+        return readOnly;
     }
 
     private void resetVersionUI() {
-        
+
         datasetVersionUI = datasetVersionUI.initDatasetVersionUI(workingVersion, true);
         if (isSessionUserAuthenticated()) {
             AuthenticatedUser au = (AuthenticatedUser) session.getUser();
 
             //On create set pre-populated fields
-            for (DatasetField dsf : dataset.getEditVersion().getDatasetFields()) {
+            for (DatasetField dsf : dataset.getOrCreateEditVersion().getDatasetFields()) {
                 if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.depositor) && dsf.isEmpty()) {
                     dsf.getDatasetFieldValues().get(0).setValue(au.getLastName() + ", " + au.getFirstName());
                 }
@@ -2216,7 +2622,7 @@ private void resetVersionUI() {
                     }
                 }
 
-                String creatorOrcidId = au.getOrcidId();
+                String creatorOrcidId = au.getAuthenticatedOrcid();
                 if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.author) && dsf.isEmpty()) {
                     for (DatasetFieldCompoundValue authorValue : dsf.getDatasetFieldCompoundValues()) {
                         for (DatasetField subField : authorValue.getChildDatasetFields()) {
@@ -2230,10 +2636,10 @@ private void resetVersionUI() {
                                 if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.authorIdValue)) {
                                     subField.getDatasetFieldValues().get(0).setValue(creatorOrcidId);
                                 }
-                                if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.authorIdType)) {  
+                                if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.authorIdType)) {
                                    DatasetFieldType authorIdTypeDatasetField = fieldService.findByName(DatasetFieldConstant.authorIdType);
                                    subField.setSingleControlledVocabularyValue(fieldService.findControlledVocabularyValueByDatasetFieldTypeAndStrValue(authorIdTypeDatasetField, "ORCID", true));
-                                }                                
+                                }
                             }
                         }
                     }
@@ -2241,56 +2647,33 @@ private void resetVersionUI() {
             }
         }
     }
-    
-    private boolean bulkUpdateCheckVersion(){
-        return workingVersion.isReleased();
-    }
-    
-    private void refreshSelectedFiles(){
+
+
+    private void refreshSelectedFiles(List<FileMetadata> filesToRefresh){
         if (readOnly) {
             dataset = datasetService.find(dataset.getId());
         }
         String termsOfAccess = workingVersion.getTermsOfUseAndAccess().getTermsOfAccess();
         boolean requestAccess = workingVersion.getTermsOfUseAndAccess().isFileAccessRequest();
-        workingVersion = dataset.getEditVersion();
+        workingVersion = dataset.getOrCreateEditVersion();
         workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(termsOfAccess);
         workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(requestAccess);
         List <FileMetadata> newSelectedFiles = new ArrayList<>();
-        for (FileMetadata fmd : selectedFiles){
+        for (FileMetadata fmd : filesToRefresh){
             for (FileMetadata fmdn: workingVersion.getFileMetadatas()){
                 if (fmd.getDataFile().equals(fmdn.getDataFile())){
                     newSelectedFiles.add(fmdn);
                 }
             }
         }
-        
-        selectedFiles.clear();
+
+        filesToRefresh.clear();
         for (FileMetadata fmdn : newSelectedFiles ){
-            selectedFiles.add(fmdn);
+            filesToRefresh.add(fmdn);
         }
         readOnly = false;
     }
-    
-    public void testSelectedFilesForMapData(){
-        setSelectedFilesHasMapLayer(false); 
-        for (FileMetadata fmd : selectedFiles){
-            if(worldMapPermissionHelper.hasMapLayerMetadata(fmd)){
-                setSelectedFilesHasMapLayer(true);
-                return; //only need one for warning message
-            }
-        }
-    }
-    
-    private boolean selectedFilesHasMapLayer;
-
-    public boolean isSelectedFilesHasMapLayer() {
-        return selectedFilesHasMapLayer;
-    }
 
-    public void setSelectedFilesHasMapLayer(boolean selectedFilesHasMapLayer) {
-        this.selectedFilesHasMapLayer = selectedFilesHasMapLayer;
-    }
-    
     private Integer chunkSize = 25;
 
     public Integer getChunkSize() {
@@ -2300,11 +2683,11 @@ public Integer getChunkSize() {
     public void setChunkSize(Integer chunkSize) {
         this.chunkSize = chunkSize;
     }
-    
+
     public void viewAllButtonPress(){
         setChunkSize(fileMetadatasSearch.size());
     }
-    
+
      private int activeTabIndex;
 
     public int getActiveTabIndex() {
@@ -2314,7 +2697,7 @@ public int getActiveTabIndex() {
     public void setActiveTabIndex(int activeTabIndex) {
         this.activeTabIndex = activeTabIndex;
     }
-    
+
     public void tabChanged(TabChangeEvent event) {
         TabView tv = (TabView) event.getComponent();
         this.activeTabIndex = tv.getActiveIndex();
@@ -2326,7 +2709,7 @@ public void tabChanged(TabChangeEvent event) {
             versionTabList = new ArrayList<>();
             if(this.activeTabIndex == 0) {
                  init();
-            }          
+            }
         }
     }
 
@@ -2335,45 +2718,26 @@ public void edit(EditMode editMode) {
         if (this.readOnly) {
             dataset = datasetService.find(dataset.getId());
         }
-        workingVersion = dataset.getEditVersion();
+        workingVersion = dataset.getOrCreateEditVersion();
         clone = workingVersion.cloneDatasetVersion();
-        if (editMode == EditMode.INFO) {
-            // ?
-        } else if (editMode == EditMode.FILE) {
-            // JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editFiles"));
-            // FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Upload + Edit Dataset Files", " - You can drag and drop your files from your desktop, directly into the upload widget."));
-        } else if (editMode.equals(EditMode.METADATA)) {
+        if (editMode.equals(EditMode.METADATA)) {
             datasetVersionUI = datasetVersionUI.initDatasetVersionUI(workingVersion, true);
             updateDatasetFieldInputLevels();
             JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editMetadata.label"), BundleUtil.getStringFromBundle("dataset.message.editMetadata.message"));
             //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Edit Dataset Metadata", " - Add more metadata about your dataset to help others easily find it."));
         } else if (editMode.equals(EditMode.LICENSE)){
+            if(!isHasValidTermsOfAccess()){
+                workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(true);
+            }
             JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editTerms.label"), BundleUtil.getStringFromBundle("dataset.message.editTerms.message"));
             //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Edit Dataset License and Terms", " - Update your dataset's license and terms of use."));
         }
         this.readOnly = false;
     }
 
-    public String releaseDraft() {
-        if (releaseRadio == 1) {
-            return releaseDataset(true);
-        } else if(releaseRadio ==2) {
-            return releaseDataset(false);
-        } else if(releaseRadio ==3) {
-            return updateCurrentVersion();
-        } else {
-            return "Invalid Choice";
-        }
-    }
-
-    public String releaseMajor() {
-        return releaseDataset(false);
-    }
-
     public String sendBackToContributor() {
         try {
-            //FIXME - Get Return Comment from sendBackToContributor popup
-            Command<Dataset> cmd = new ReturnDatasetToAuthorCommand(dvRequestService.getDataverseRequest(), dataset, "");
+            Command<Dataset> cmd = new ReturnDatasetToAuthorCommand(dvRequestService.getDataverseRequest(), dataset, returnReason);
             dataset = commandEngine.submit(cmd);
             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.reject.success"));
         } catch (CommandException ex) {
@@ -2381,17 +2745,17 @@ public String sendBackToContributor() {
             logger.log(Level.SEVERE, "sendBackToContributor: {0}", message);
             JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.reject.failure", Collections.singletonList(message)));
         }
-        
-        /* 
+
+        /*
          The notifications below are redundant, since the ReturnDatasetToAuthorCommand
          sends them already. - L.A. Sep. 7 2017
-         
+
         List<AuthenticatedUser> authUsers = permissionService.getUsersWithPermissionOn(Permission.PublishDataset, dataset);
         List<AuthenticatedUser> editUsers = permissionService.getUsersWithPermissionOn(Permission.EditDataset, dataset);
 
         editUsers.removeAll(authUsers);
-        new HashSet<>(editUsers).forEach( au -> 
-            userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), 
+        new HashSet<>(editUsers).forEach( au ->
+            userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()),
                                                      UserNotification.Type.RETURNEDDS, dataset.getLatestVersion().getId())
         );
         */
@@ -2413,16 +2777,32 @@ public String submitDataset() {
         }
         return returnToLatestVersion();
     }
-    
+
     public String releaseParentDVAndDataset(){
         releaseParentDV();
         return releaseDataset(false);
     }
 
     public String releaseDataset() {
-        return releaseDataset(false);
+        if(!dataset.getOwner().isReleased()){
+            releaseParentDV();
+        }
+        workingVersion.setVersionNote(publishDialogVersionNote);
+        if(publishDatasetPopup()|| publishBothPopup() || !dataset.getLatestVersion().isMinorUpdate()){
+            return releaseDataset(false);
+        }
+        switch (releaseRadio) {
+            case 1:
+                return releaseDataset(true);
+            case 2:
+                return releaseDataset(false);
+            case 3:
+                return updateCurrentVersion();
+            default:
+                return "Invalid Choice";
+        }
     }
-    
+
     private void releaseParentDV(){
         if (session.getUser() instanceof AuthenticatedUser) {
             PublishDataverseCommand cmd = new PublishDataverseCommand(dvRequestService.getDataverseRequest(), dataset.getOwner());
@@ -2439,7 +2819,7 @@ private void releaseParentDV(){
             FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataverse.notreleased")  ,BundleUtil.getStringFromBundle( "dataverse.release.authenticatedUsersOnly"));
             FacesContext.getCurrentInstance().addMessage(null, message);
         }
-        
+
     }
 
     public String deaccessionVersions() {
@@ -2474,48 +2854,36 @@ private DatasetVersion setDatasetVersionDeaccessionReasonAndURL(DatasetVersion d
         String deacessionReasonDetail = getDeaccessionReasonText() != null ? ( getDeaccessionReasonText()).trim() : "";
         switch (deaccessionReasonCode) {
             case 1:
-                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.identifiable") );
+                dvIn.setDeaccessionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.identifiable") );
                 break;
             case 2:
-                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.beRetracted") );
+                dvIn.setDeaccessionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.beRetracted") );
                 break;
             case 3:
-                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.beTransferred") );
+                dvIn.setDeaccessionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.beTransferred") );
                 break;
             case 4:
-                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.IRB"));
+                dvIn.setDeaccessionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.IRB"));
                 break;
             case 5:
-                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.legalIssue"));
+                dvIn.setDeaccessionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.legalIssue"));
                 break;
             case 6:
-                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.notValid"));
+                dvIn.setDeaccessionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.notValid"));
                 break;
             case 7:
                 break;
         }
         if (!deacessionReasonDetail.isEmpty()){
-            if (!StringUtil.isEmpty(dvIn.getVersionNote())){
-                dvIn.setVersionNote(dvIn.getVersionNote() + " " + deacessionReasonDetail);
+            if (!StringUtil.isEmpty(dvIn.getDeaccessionNote())){
+                dvIn.setDeaccessionNote(dvIn.getDeaccessionNote() + " " + deacessionReasonDetail);
             } else {
-                dvIn.setVersionNote(deacessionReasonDetail);
+                dvIn.setDeaccessionNote(deacessionReasonDetail);
             }
         }
-        
-        dvIn.setArchiveNote(getDeaccessionForwardURLFor());
-        return dvIn;
-    }
-    
-    public boolean isMapLayerToBeDeletedOnPublish(){
 
-        for (FileMetadata fmd : workingVersion.getFileMetadatas()){
-             if (worldMapPermissionHelper.hasMapLayerMetadata(fmd)){
-                 if (fmd.isRestricted() || fmd.isRestrictedUI()){
-                        return true;
-                 }
-             }
-        }      
-        return false;
+        dvIn.setDeaccessionLink(getDeaccessionForwardURLFor());
+        return dvIn;
     }
 
     private String releaseDataset(boolean minor) {
@@ -2525,33 +2893,42 @@ private String releaseDataset(boolean minor) {
                     new PublishDatasetCommand(dataset, dvRequestService.getDataverseRequest(), minor)
                 );
                 dataset = result.getDataset();
-                // Sucessfully executing PublishDatasetCommand does not guarantee that the dataset 
-                // has been published. If a publishing workflow is configured, this may have sent the 
-                // dataset into a workflow limbo, potentially waiting for a third party system to complete 
-                // the process. So it may be premature to show the "success" message at this point. 
-                
+                // Sucessfully executing PublishDatasetCommand does not guarantee that the dataset
+                // has been published. If a publishing workflow is configured, this may have sent the
+                // dataset into a workflow limbo, potentially waiting for a third party system to complete
+                // the process. So it may be premature to show the "success" message at this point.
+
                 if ( result.isCompleted() ) {
                     JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.publishSuccess"));
                 } else {
                     JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.message"), BundleUtil.getStringFromBundle("dataset.locked.message.details"));
                 }
-                
+
             } catch (CommandException ex) {
-                JsfHelper.addErrorMessage(ex.getLocalizedMessage());
+                Dataset testDs = datasetService.find(dataset.getId());
+                if (testDs != null && !testDs.isLockedFor(DatasetLock.Reason.FileValidationFailed)) {
+                    // If the dataset could not be published because it has failed
+                    // physical file validation, the messaging will be handled via
+                    // the lock info system.
+                    JsfHelper.addErrorMessage(ex.getLocalizedMessage());
+                }
+                if(ex.getCause()!=null && ex.getCause() instanceof OptimisticLockException) {
+                    JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.parallelPublishError"));
+                }
                 logger.severe(ex.getMessage());
             }
-            
+
         } else {
             JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.only.authenticatedUsers"));
         }
-        return returnToDatasetOnly();
+        return returnToDraftVersion();
     }
 
     @Deprecated
     public String registerDataset() {
         try {
             UpdateDatasetVersionCommand cmd = new UpdateDatasetVersionCommand(dataset, dvRequestService.getDataverseRequest());
-            cmd.setValidateLenient(true); 
+            cmd.setValidateLenient(true);
             dataset = commandEngine.submit(cmd);
         } catch (CommandException ex) {
             FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_WARN,BundleUtil.getStringFromBundle( "dataset.registration.failed"), " - " + ex.toString()));
@@ -2561,7 +2938,7 @@ public String registerDataset() {
         FacesContext.getCurrentInstance().addMessage(null, message);
         return returnToDatasetOnly();
     }
-    
+
     public String updateCurrentVersion() {
         /*
          * Note: The code here mirrors that in the
@@ -2593,7 +2970,7 @@ public String updateCurrentVersion() {
                      */
                     try {
                         updateVersion = commandEngine.submit(archiveCommand);
-                        if (updateVersion.getArchivalCopyLocation() != null) {
+                        if (!updateVersion.getArchivalCopyLocationStatus().equals(DatasetVersion.ARCHIVAL_STATUS_FAILURE)) {
                             successMsg = BundleUtil.getStringFromBundle("datasetversion.update.archive.success");
                         } else {
                             errorMsg = BundleUtil.getStringFromBundle("datasetversion.update.archive.failure");
@@ -2620,55 +2997,59 @@ public String updateCurrentVersion() {
     public void refresh(ActionEvent e) {
         refresh();
     }
-        
+
+
+    public void sort() {
+        // This is called as the presort checkboxes' listener when the user is actually
+        // clicking in the checkbox. It does appear to happen after the setTagPresort
+        // and setFolderPresort calls.
+        // So -we know this isn't a pageflip and at this point can update to use the new
+        // values.
+        isPageFlip = false;
+        if (!newTagPresort == tagPresort) {
+            tagPresort = newTagPresort;
+        }
+        if (!newFolderPresort == folderPresort) {
+            folderPresort = newFolderPresort;
+        }
+        sortFileMetadatas(fileMetadatasSearch);
+        JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("file.results.presort.change.success"));
+    }
+
     public String refresh() {
         logger.fine("refreshing");
 
+        //In v5.14, versionId was null here. In 6.0, it appears not to be.
+        //This check is to handle the null if it reappears/occurs under other circumstances
+        if(versionId==null) {
+            logger.warning("versionId was null in refresh");
+            versionId = workingVersion.getId();
+        }
         //dataset = datasetService.find(dataset.getId());
         dataset = null;
+        workingVersion = null; 
 
         logger.fine("refreshing working version");
 
         DatasetVersionServiceBean.RetrieveDatasetVersionResponse retrieveDatasetVersionResponse = null;
 
-        if (persistentId != null) {
-            //retrieveDatasetVersionResponse = datasetVersionService.retrieveDatasetVersionByPersistentId(persistentId, version);
-            dataset = datasetService.findByGlobalId(persistentId);
-            retrieveDatasetVersionResponse = datasetVersionService.selectRequestedVersion(dataset.getVersions(), version);
-        } else if (versionId != null) {
-            retrieveDatasetVersionResponse = datasetVersionService.retrieveDatasetVersionByVersionId(versionId);
-        } else if (dataset.getId() != null) {
-            //retrieveDatasetVersionResponse = datasetVersionService.retrieveDatasetVersionById(dataset.getId(), version);
-            dataset = datasetService.find(dataset.getId());
-            retrieveDatasetVersionResponse = datasetVersionService.selectRequestedVersion(dataset.getVersions(), version);
-        }
-
-        if (retrieveDatasetVersionResponse == null) {
-            // TODO: 
-            // should probably redirect to the 404 page, if we can't find 
-            // this version anymore. 
-            // -- L.A. 4.2.3 
-            return "";
-        }
-        this.workingVersion = retrieveDatasetVersionResponse.getDatasetVersion();
+        if (versionId != null) {
+            // versionId must have been set by now (see null check above), in the init()
+            // method, regardless of how the page was originally called - by the dataset
+            // database id, by the persistent identifier, or by the db id of the version.
+            this.workingVersion = datasetVersionService.findDeep(versionId);
+            dataset = workingVersion.getDataset();
+        } 
+        
 
         if (this.workingVersion == null) {
-            // TODO: 
-            // same as the above
-
+            // TODO:
+            // should probably redirect to the 404 page, if we can't find
+            // this version anymore.
+            // -- L.A. 4.2.3
             return "";
         }
 
-        if (dataset == null) {
-            // this would be the case if we were retrieving the version by 
-            // the versionId, above.
-            this.dataset = this.workingVersion.getDataset();
-        }
-
-        if (readOnly) {
-            datafileService.findFileMetadataOptimizedExperimental(dataset);
-        }
-        
         fileMetadatasSearch = selectFileMetadatasForDisplay();
 
         displayCitation = dataset.getCitation(true, workingVersion);
@@ -2677,24 +3058,31 @@ public String refresh() {
         if (lockedDueToIngestVar != null && lockedDueToIngestVar) {
             //we need to add a redirect here to disply the explore buttons as needed
             //as well as the ingest success message
+            //SEK 12/20/2019 - since we are ingesting a file we know that there is a current draft version
             lockedDueToIngestVar = null;
-            return "/dataset.xhtml?persistentId=" + dataset.getGlobalIdString() + "&showIngestSuccess=true&faces-redirect=true";
+            if (canViewUnpublishedDataset()) {
+                return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&showIngestSuccess=true&version=DRAFT&faces-redirect=true";
+            } else {
+                return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&showIngestSuccess=true&faces-redirect=true";
+            }
         }
 
+        displayWorkflowComments();
+
         return "";
     }
-    
+
     public String deleteDataset() {
 
         DestroyDatasetCommand cmd;
         boolean deleteCommandSuccess = false;
-        Map<Long,String> deleteStorageLocations = datafileService.getPhysicalFilesToDelete(dataset); 
-        
+        Map<Long,String> deleteStorageLocations = datafileService.getPhysicalFilesToDelete(dataset);
+
         try {
             cmd = new DestroyDatasetCommand(dataset, dvRequestService.getDataverseRequest());
             commandEngine.submit(cmd);
             deleteCommandSuccess = true;
-            /* - need to figure out what to do 
+            /* - need to figure out what to do
              Update notification in Delete Dataset Method
              for (UserNotification und : userNotificationService.findByDvObject(dataset.getId())){
              userNotificationService.delete(und);
@@ -2703,39 +3091,47 @@ public String deleteDataset() {
             JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.message.deleteFailure"));
             logger.severe(ex.getMessage());
         }
-        
+
         if (deleteCommandSuccess) {
             datafileService.finalizeFileDeletes(deleteStorageLocations);
             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.deleteSuccess"));
         }
-        
+
         return "/dataverse.xhtml?alias=" + dataset.getOwner().getAlias() + "&faces-redirect=true";
     }
-    
+
     public String editFileMetadata(){
-        // If there are no files selected, return an empty string - which 
-        // means, do nothing, don't redirect anywhere, stay on this page. 
-        // The dialogue telling the user to select at least one file will 
-        // be shown to them by an onclick javascript method attached to the 
+        // If there are no files selected, return an empty string - which
+        // means, do nothing, don't redirect anywhere, stay on this page.
+        // The dialogue telling the user to select at least one file will
+        // be shown to them by an onclick javascript method attached to the
         // filemetadata edit button on the page.
         // -- L.A. 4.2.1
         if (this.selectedFiles == null || this.selectedFiles.size() < 1) {
             return "";
-        } 
+        }
         return "/editdatafiles.xhtml?selectedFileIds=" + getSelectedFilesIdsString() + "&datasetId=" + dataset.getId() +"&faces-redirect=true";
     }
 
     public String deleteDatasetVersion() {
         DeleteDatasetVersionCommand cmd;
+
+        Map<Long, String> deleteStorageLocations = datafileService.getPhysicalFilesToDelete(dataset.getLatestVersion());
+        boolean deleteCommandSuccess = false;
         try {
             cmd = new DeleteDatasetVersionCommand(dvRequestService.getDataverseRequest(), dataset);
             commandEngine.submit(cmd);
             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("datasetVersion.message.deleteSuccess"));
+            deleteCommandSuccess = true;
         } catch (CommandException ex) {
             JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.message.deleteFailure"));
             logger.severe(ex.getMessage());
         }
 
+        if (deleteCommandSuccess && !deleteStorageLocations.isEmpty()) {
+            datafileService.finalizeFileDeletes(deleteStorageLocations);
+        }
+
         return returnToDatasetOnly();
     }
 
@@ -2748,7 +3144,7 @@ public List<FileMetadata> getSelectedFiles() {
     public void setSelectedFiles(List<FileMetadata> selectedFiles) {
         this.selectedFiles = selectedFiles;
     }
-    
+
     private Dataverse selectedDataverseForLinking;
 
     public Dataverse getSelectedDataverseForLinking() {
@@ -2758,7 +3154,7 @@ public Dataverse getSelectedDataverseForLinking() {
     public void setSelectedDataverseForLinking(Dataverse sdvfl) {
         this.selectedDataverseForLinking = sdvfl;
     }
-    
+
     private List<FileMetadata> selectedRestrictedFiles; // = new ArrayList<>();
 
     public List<FileMetadata> getSelectedRestrictedFiles() {
@@ -2768,7 +3164,7 @@ public List<FileMetadata> getSelectedRestrictedFiles() {
     public void setSelectedRestrictedFiles(List<FileMetadata> selectedRestrictedFiles) {
         this.selectedRestrictedFiles = selectedRestrictedFiles;
     }
-    
+
     private List<FileMetadata> selectedUnrestrictedFiles; // = new ArrayList<>();
 
     public List<FileMetadata> getSelectedUnrestrictedFiles() {
@@ -2778,7 +3174,7 @@ public List<FileMetadata> getSelectedUnrestrictedFiles() {
     public void setSelectedUnrestrictedFiles(List<FileMetadata> selectedUnrestrictedFiles) {
         this.selectedUnrestrictedFiles = selectedUnrestrictedFiles;
     }
-    
+
     private List<FileMetadata> selectedDownloadableFiles;
 
     public List<FileMetadata> getSelectedDownloadableFiles() {
@@ -2788,7 +3184,7 @@ public List<FileMetadata> getSelectedDownloadableFiles() {
     public void setSelectedDownloadableFiles(List<FileMetadata> selectedDownloadableFiles) {
         this.selectedDownloadableFiles = selectedDownloadableFiles;
     }
-    
+
     private List<FileMetadata> selectedNonDownloadableFiles;
 
     public List<FileMetadata> getSelectedNonDownloadableFiles() {
@@ -2798,2436 +3194,3647 @@ public List<FileMetadata> getSelectedNonDownloadableFiles() {
     public void setSelectedNonDownloadableFiles(List<FileMetadata> selectedNonDownloadableFiles) {
         this.selectedNonDownloadableFiles = selectedNonDownloadableFiles;
     }
+
+    private List<FileMetadata> selectedGlobusTransferableFiles;
+
+    public List<FileMetadata> getSelectedGlobusTransferableFiles() {
+        return selectedGlobusTransferableFiles;
+    }
+
+    public void setSelectedGlobusTransferableFiles(List<FileMetadata> selectedGlobusTransferableFiles) {
+        this.selectedGlobusTransferableFiles = selectedGlobusTransferableFiles;
+    }
     
-            
-    public void validateFilesForDownload(boolean guestbookRequired, boolean downloadOriginal){
-        setSelectedDownloadableFiles(new ArrayList<>());
-        setSelectedNonDownloadableFiles(new ArrayList<>());
-        
-        if (this.selectedFiles.isEmpty()) {
-            //RequestContext requestContext = RequestContext.getCurrentInstance();
-            PrimeFaces.current().executeScript("PF('selectFilesForDownload').show()");
-            return;
-        }
-        for (FileMetadata fmd : this.selectedFiles){
-            if(this.fileDownloadHelper.canDownloadFile(fmd)){
-                getSelectedDownloadableFiles().add(fmd);
-            } else {
-                getSelectedNonDownloadableFiles().add(fmd);
-            }
-        }
-        
-        // If some of the files were restricted and we had to drop them off the 
-        // list, and NONE of the files are left on the downloadable list
-        // - we show them a "you're out of luck" popup: 
-        if(getSelectedDownloadableFiles().isEmpty() && !getSelectedNonDownloadableFiles().isEmpty()){
-            //RequestContext requestContext = RequestContext.getCurrentInstance();
-            PrimeFaces.current().executeScript("PF('downloadInvalid').show()");
-            return;
-        }
-        
-        // Note that the GuestbookResponse object may still have information from 
-        // the last download action performed by the user. For example, it may 
-        // still have the non-null Datafile in it, if the user has just downloaded
-        // a single file; or it may still have the format set to "original" - 
-        // even if that's not what they are trying to do now. 
-        // So make sure to reset these values:
-        guestbookResponse.setDataFile(null);
-        guestbookResponse.setSelectedFileIds(getSelectedDownloadableFilesIdsString());
-        if (downloadOriginal) {
-            guestbookResponse.setFileFormat("original");
-        } else {
-            guestbookResponse.setFileFormat("");
-        }
-        guestbookResponse.setDownloadtype("Download");
-        
-        // If we have a bunch of files that we can download, AND there were no files 
-        // that we had to take off the list, because of permissions - we can 
-        // either send the user directly to the download API (if no guestbook/terms
-        // popup is required), or send them to the download popup:
-        if(!getSelectedDownloadableFiles().isEmpty() && getSelectedNonDownloadableFiles().isEmpty()){
-            if (guestbookRequired){
-                openDownloadPopupForMultipleFileDownload();
-            } else {
-                startMultipleFileDownload();
-            }
-            return;
-        } 
-        
-        // ... and if some files were restricted, but some are downloadable, 
-        // we are showing them this "you are somewhat in luck" popup; that will 
-        // then direct them to the download, or popup, as needed:
-        if(!getSelectedDownloadableFiles().isEmpty() && !getSelectedNonDownloadableFiles().isEmpty()){
-            //RequestContext requestContext = RequestContext.getCurrentInstance();
-            PrimeFaces.current().executeScript("PF('downloadMixed').show()");
-        }       
+    private List<FileMetadata> selectedNonGlobusTransferableFiles;
+
+    public List<FileMetadata> getSelectedNonGlobusTransferableFiles() {
+        return selectedNonGlobusTransferableFiles;
+    }
 
+    public void setSelectedNonGlobusTransferableFiles(List<FileMetadata> selectedNonGlobusTransferableFiles) {
+        this.selectedNonGlobusTransferableFiles = selectedNonGlobusTransferableFiles;
     }
     
-    private boolean selectAllFiles;
+    public String getSizeOfDataset() {
+        return DatasetUtil.getDownloadSize(workingVersion, false);
+    }
 
-    public boolean isSelectAllFiles() {
-        return selectAllFiles;
+    private boolean tooLargeToDownload;
+    private boolean tooLargeToDownloadArchival;
+    private boolean tooLargeToDownloadOriginal;
+
+    public boolean isTooLargeToDownloadOriginal() {
+        return tooLargeToDownloadOriginal;
     }
 
-    public void setSelectAllFiles(boolean selectAllFiles) {
-        this.selectAllFiles = selectAllFiles;
+    public void setTooLargeToDownloadOriginal(boolean tooLargeToDownloadOriginal) {
+        this.tooLargeToDownloadOriginal = tooLargeToDownloadOriginal;
     }
 
-    public void toggleAllSelected(){
-        //This is here so that if the user selects all on the dataset page
-        // s/he will get all files on download
-        this.selectAllFiles = !this.selectAllFiles;
+    public boolean isTooLargeToDownloadArchival() {
+        return tooLargeToDownloadArchival;
     }
-    
 
-    // helper Method
-    public String getSelectedFilesIdsString() {        
-        String downloadIdString = "";
-        for (FileMetadata fmd : this.selectedFiles){
-            if (!StringUtil.isEmpty(downloadIdString)) {
-                downloadIdString += ",";
-            }
-            downloadIdString += fmd.getDataFile().getId();
-        }
-        return downloadIdString;     
+    public void setTooLargeToDownloadArchival(boolean tooLargeToDownloadArchival) {
+        this.tooLargeToDownloadArchival = tooLargeToDownloadArchival;
     }
-    
-    // helper Method
-    public String getSelectedDownloadableFilesIdsString() {        
-        String downloadIdString = "";
-        for (FileMetadata fmd : this.selectedDownloadableFiles){
-            if (!StringUtil.isEmpty(downloadIdString)) {
-                downloadIdString += ",";
-            }
-            downloadIdString += fmd.getDataFile().getId();
-        }
-        return downloadIdString;     
+
+    public boolean isTooLargeToDownload() {
+        return tooLargeToDownload;
+    }
+
+    public void setTooLargeToDownload(boolean tooLargeToDownload) {
+        this.tooLargeToDownload = tooLargeToDownload;
     }
+
+    private Long sizeOfDatasetArchival = null; 
+    private Long sizeOfDatasetOriginal = null; 
     
     
-    public void updateFileCounts(){
-        setSelectedUnrestrictedFiles(new ArrayList<>());
-        setSelectedRestrictedFiles(new ArrayList<>());
-        setTabularDataSelected(false);
-        for (FileMetadata fmd : this.selectedFiles){
-            if(fmd.isRestricted()){
-                getSelectedRestrictedFiles().add(fmd);
-            } else {
-                getSelectedUnrestrictedFiles().add(fmd);
-            }
-            if(fmd.getDataFile().isTabularData()){
-                setTabularDataSelected(true);
-            }
+    public Long getSizeOfDatasetNumeric() {
+        if (this.versionHasTabular){
+            return Math.min(getSizeOfDatasetOrigNumeric(), getSizeOfDatasetArchivalNumeric());
         }
+        return getSizeOfDatasetOrigNumeric();
     }
-    
 
-    private List<String> getSuccessMessageArguments() {
-        List<String> arguments = new ArrayList<>();
-        String dataverseString = "";
-        arguments.add(StringEscapeUtils.escapeHtml(dataset.getDisplayName()));
-        dataverseString += " <a href=\"/dataverse/" + selectedDataverseForLinking.getAlias() + "\">" + StringEscapeUtils.escapeHtml(selectedDataverseForLinking.getDisplayName()) + "</a>";
-        arguments.add(dataverseString);
-        return arguments;
+    public Long getSizeOfDatasetOrigNumeric() {
+        if (versionHasTabular) {
+            if (sizeOfDatasetOriginal == null) {
+                sizeOfDatasetOriginal = DatasetUtil.getDownloadSizeNumeric(workingVersion, true);
+            }
+            return sizeOfDatasetOriginal;
+        }
+        return getSizeOfDatasetArchivalNumeric();
     }
-    
-        
-    public void saveLinkingDataverses(ActionEvent evt) {
 
-        if (saveLink(selectedDataverseForLinking)) {
-            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.linkSuccess", getSuccessMessageArguments()));
-        } else {
-            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.notlinked"), linkingDataverseErrorMessage);
-            FacesContext.getCurrentInstance().addMessage(null, message);
+    public Long getSizeOfDatasetArchivalNumeric() {
+        if (sizeOfDatasetArchival == null) {
+            sizeOfDatasetArchival = DatasetUtil.getDownloadSizeNumeric(workingVersion, false);
         }
-
+        return sizeOfDatasetArchival; 
     }
-    
-    private String linkingDataverseErrorMessage = "";
 
+    public String getSizeOfSelectedAsString(){
+        return FileSizeChecker.bytesToHumanReadable(getSizeOfSelectedOrigNumeric());
+    }
 
-    public String getLinkingDataverseErrorMessage() {
-        return linkingDataverseErrorMessage;
+    public String getSizeOfSelectedMaxAsString(){
+        return FileSizeChecker.bytesToHumanReadable(Math.max(getSizeOfSelectedOrigNumeric(), getSizeOfSelectedArchivalNumeric()) );
     }
 
-    public void setLinkingDataverseErrorMessage(String linkingDataverseErrorMessage) {
-        this.linkingDataverseErrorMessage = linkingDataverseErrorMessage;
+    public String getZipDownloadLimitAsString(){
+        return FileSizeChecker.bytesToHumanReadable(settingsWrapper.getZipDownloadLimit());
     }
-    
-    UIInput selectedLinkingDataverseMenu;
-    
-    public UIInput getSelectedDataverseMenu() {
-        return selectedLinkingDataverseMenu;
+
+    public Long getSizeOfSelectedOrigNumeric(){
+        return DatasetUtil.getDownloadSizeNumericBySelectedFiles(selectedFiles, true);
     }
 
-    public void setSelectedDataverseMenu(UIInput selectedDataverseMenu) {
-        this.selectedLinkingDataverseMenu = selectedDataverseMenu;
+    public Long getSizeOfSelectedArchivalNumeric(){
+        return DatasetUtil.getDownloadSizeNumericBySelectedFiles(selectedFiles, false);
     }
-    
-    
-    private Boolean saveLink(Dataverse dataverse){
-        boolean retVal = true;
-        if (readOnly) {
-            // Pass a "real", non-readonly dataset the the LinkDatasetCommand: 
-            dataset = datasetService.find(dataset.getId());
-        }
-        LinkDatasetCommand cmd = new LinkDatasetCommand(dvRequestService.getDataverseRequest(), dataverse, dataset);
-        linkingDataverse = dataverse;
-        try {
-            commandEngine.submit(cmd);           
-        } catch (CommandException ex) {
-            String msg = "There was a problem linking this dataset to yours: " + ex;
-            logger.severe(msg);
-            msg = BundleUtil.getStringFromBundle("dataset.notlinked.msg") + ex;
-            /**
-             * @todo how do we get this message to show up in the GUI?
-             */
-            linkingDataverseErrorMessage = msg;
-            retVal = false;
-        }
-        return retVal;
+
+    public Long getSizeOfSelectedMaxNumeric(){
+       return Math.max(getSizeOfSelectedOrigNumeric(), getSizeOfSelectedArchivalNumeric()) ;
     }
 
-    
-    public List<Dataverse> completeLinkingDataverse(String query) {
-        dataset = datasetService.find(dataset.getId());
-        if (session.getUser().isAuthenticated()) {
-            return dataverseService.filterDataversesForLinking(query, dvRequestService.getDataverseRequest(), dataset);
-        } else {
-            return null;
-        }
+    public String getSizeOfDatasetOrig() {
+        return DatasetUtil.getDownloadSize(workingVersion, true);
     }
 
-    List<FileMetadata> previouslyRestrictedFiles = null;
-    
-    public boolean isShowAccessPopup() {
-        
-        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
 
-            if (fmd.isRestricted()) {
-            
-                if (editMode == EditMode.CREATE) {
-                    // if this is a brand new file, it's definitely not 
-                    // of a previously restricted kind!
-                    return true; 
-                }
-            
-                if (previouslyRestrictedFiles != null) {
-                    // We've already checked whether we are in the CREATE mode, 
-                    // above; and that means we can safely assume this filemetadata
-                    // has an existing db id. So it is safe to use the .contains()
-                    // method below:
-                    if (!previouslyRestrictedFiles.contains(fmd)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        
-        return false;
+    public void startDownloadAllArchival() {
+        this.setSelectedFiles(workingVersion.getFileMetadatas());
+        startDownload(false);
     }
-    
-    public void setShowAccessPopup(boolean showAccessPopup) {} // dummy set method
-    
-    public String testSelectedFilesForRestrict(){
-        //RequestContext requestContext = RequestContext.getCurrentInstance();
-        if (selectedFiles.isEmpty()) {
-                PrimeFaces.current().executeScript("PF('selectFilesForRestrict').show()");           
-            return "";
-        } else {           
-            boolean validSelection = true;
-            for (FileMetadata fmd : selectedFiles) {
-                if (fmd.isRestricted() == true) {
-                    validSelection = false;
-                    break;
-                }
-            }
-            if (!validSelection) {
-                PrimeFaces.current().executeScript("PF('selectFilesForRestrict').show()");
-                return "";
-            }                       
-            testSelectedFilesForMapData();
-            PrimeFaces.current().executeScript("PF('accessPopup').show()");
-            return "";
-        }        
+
+    public void startDownloadAllOriginal(){
+        this.setSelectedFiles(workingVersion.getFileMetadatas());
+        startDownload(true);
     }
-    
-        
-    public String restrictSelectedFiles(boolean restricted) throws CommandException{
-        
-        //RequestContext requestContext = RequestContext.getCurrentInstance();
-        if (selectedFiles.isEmpty()) {
-            if (restricted) {
-                PrimeFaces.current().executeScript("PF('selectFilesForRestrict').show()");
-            } else {
-                PrimeFaces.current().executeScript("PF('selectFilesForUnRestrict').show()");
+
+    public void startDownloadSelectedArchival() {
+        startDownload(false);
+    }
+
+    public void startDownloadSelectedOriginal() {
+        startDownload(true);
+    }
+
+    private void startDownload(boolean downloadOriginal){
+        boolean guestbookRequired = isDownloadPopupRequired();
+        boolean validate = validateFilesForDownload(downloadOriginal, false);
+        if (validate) {
+            updateGuestbookResponse(guestbookRequired, downloadOriginal, false);
+            if(!guestbookRequired && !getValidateFilesOutcome().equals("Mixed")){
+                startMultipleFileDownload();
             }
-            return "";
+        }
+    }
+
+    //A string that is used to determine step(s) taken after files are requested for download
+    /*
+    Values of "Pass"; "FailSize"; "FailEmpty"; "FailRestricted"; "Mixed"; "GuestbookRequired"
+    */
+    private String validateFilesOutcome;
+
+    public String getValidateFilesOutcome() {
+        return validateFilesOutcome;
+    }
+
+    public void setValidateFilesOutcome(String validateFilesOutcome) {
+        this.validateFilesOutcome = validateFilesOutcome;
+    }
+
+    public boolean validateFilesForDownload(boolean downloadOriginal, boolean isGlobusTransfer){ 
+        if (this.selectedFiles.isEmpty()) {
+            PrimeFaces.current().executeScript("PF('selectFilesForDownload').show()");
+            return false;
         } else {
-            boolean validSelection = true;
-            for (FileMetadata fmd : selectedFiles) {
-                if (fmd.isRestricted() == restricted) {
-                    validSelection = false;
-                    break;
-                }
-            }
-            if (!validSelection) {
-                if (restricted) {
-                    PrimeFaces.current().executeScript("PF('selectFilesForRestrict').show()");
-                }
-                if (!restricted) {
-                    PrimeFaces.current().executeScript("PF('selectFilesForUnRestrict').show()");
-                }
-                return "";
-            }
+            this.filterSelectedFiles();
         }
         
-        if (editMode != EditMode.CREATE) {
-            if (bulkUpdateCheckVersion()) {
-                refreshSelectedFiles();
-            }
-            restrictFiles(restricted);
+        //assume Pass unless something bad happens
+        setValidateFilesOutcome("Pass");
+        Long bytes = (long) 0;
+
+        if (this.selectedFiles.isEmpty()) {
+            setValidateFilesOutcome("FailEmpty");
+            return false;
         }
-        
-        save();
-        
-        return  returnToDraftVersion();
-    }
 
-    private void restrictFiles(boolean restricted) throws CommandException {
-        Command<Void> cmd;
-        previouslyRestrictedFiles = new ArrayList<>();
-        for (FileMetadata fmd : this.getSelectedFiles()) {
-            if(fmd.isRestricted()) {
-                previouslyRestrictedFiles.add(fmd);
+        if (!isGlobusTransfer) {
+            for (FileMetadata fmd : getSelectedDownloadableFiles()) {
+                DataFile dataFile = fmd.getDataFile();
+                if (downloadOriginal && dataFile.isTabularData()) {
+                    bytes += dataFile.getOriginalFileSize() == null ? 0 : dataFile.getOriginalFileSize();
+                } else {
+                    bytes += dataFile.getFilesize();
+                }
             }
-            if (restricted  != fmd.isRestricted()) {
-                cmd = new RestrictFileCommand(fmd.getDataFile(), dvRequestService.getDataverseRequest(), restricted);
-                commandEngine.submit(cmd);
+
+            // if there are two or more files, with a total size
+            // over the zip limit, post a "too large" popup
+            if (bytes > settingsWrapper.getZipDownloadLimit() && selectedDownloadableFiles.size() > 1) {
+                setValidateFilesOutcome("FailSize");
+                return false;
             }
         }
-    }
+        
+        // If some of the files were restricted and we had to drop them off the
+        // list, and NONE of the files are left on the downloadable list
+        // - we show them a "you're out of luck" popup
+        // Same for globus transfer
+        if ((!isGlobusTransfer
+                && (getSelectedDownloadableFiles().isEmpty() && !getSelectedNonDownloadableFiles().isEmpty()))
+                || (isGlobusTransfer && (getSelectedGlobusTransferableFiles().isEmpty()
+                        && !getSelectedNonGlobusTransferableFiles().isEmpty()))) {
+            setValidateFilesOutcome("FailRestricted");
+            return false;
+        }
 
-    public int getRestrictedFileCount() {
-        if (workingVersion == null){
-            return 0;
+        //For download or transfer, there are some that can be downloaded/transferred and some that can't
+        if ((!isGlobusTransfer && (!getSelectedNonDownloadableFiles().isEmpty() && !getSelectedDownloadableFiles().isEmpty())) ||
+                (isGlobusTransfer && (!getSelectedNonGlobusTransferableFiles().isEmpty() && !getSelectedGlobusTransferableFiles().isEmpty()))) {
+            setValidateFilesOutcome("Mixed");
+            return true;
         }
-        int restrictedFileCount = 0;
-        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
-            if (fmd.isRestricted()) {
-                restrictedFileCount++;
-            }
+        //ToDo - should Mixed not trigger this?
+        if (isTermsPopupRequired() || isGuestbookPopupRequiredAtDownload()) {
+            setValidateFilesOutcome("GuestbookRequired");
         }
+        return true;
 
-        return restrictedFileCount;
     }
 
-    private List<FileMetadata> filesToBeDeleted = new ArrayList<>();
-    
-    public String  deleteFilesAndSave(){
-        bulkFileDeleteInProgress = true;
-        if (bulkUpdateCheckVersion()){
-           refreshSelectedFiles(); 
+    private void updateGuestbookResponse (boolean guestbookRequired, boolean downloadOriginal, boolean isGlobusTransfer) {
+        // Note that the GuestbookResponse object may still have information from
+        // the last download action performed by the user. For example, it may
+        // still have the non-null Datafile in it, if the user has just downloaded
+        // a single file; or it may still have the format set to "original" -
+        // even if that's not what they are trying to do now.
+        // So make sure to reset these values:
+        if(fileMetadataForAction == null) {
+            guestbookResponse.setDataFile(null);
+        } else {
+            guestbookResponse.setDataFile(fileMetadataForAction.getDataFile());
+        }
+        if(isGlobusTransfer) {
+            guestbookResponse.setSelectedFileIds(getFilesIdsString(getSelectedGlobusTransferableFiles()));
+        } else {
+            guestbookResponse.setSelectedFileIds(getSelectedDownloadableFilesIdsString());
+        }
+        if (downloadOriginal) {
+            guestbookResponse.setFileFormat("original");
+        } else {
+            guestbookResponse.setFileFormat("");
         }
-        deleteFiles();
-        return save();       
+        guestbookResponse.setEventType(GuestbookResponse.DOWNLOAD);
     }
-    
-    public void deleteFiles() {
 
-        for (FileMetadata markedForDelete : selectedFiles) {
+    /*helper function to filter the selected files into <selected downloadable>, 
+    and <selected, non downloadable> and <selected restricted> for reuse*/
+
+    /*helper function to filter the selected files into <selected downloadable>, 
+    and <selected, non downloadable> and <selected restricted> for reuse*/
+
+    private boolean filterSelectedFiles(){
+        setSelectedDownloadableFiles(new ArrayList<>());
+        setSelectedNonDownloadableFiles(new ArrayList<>());
+        setSelectedRestrictedFiles(new ArrayList<>());
+        setSelectedUnrestrictedFiles(new ArrayList<>());
+        setSelectedGlobusTransferableFiles(new ArrayList<>());
+        setSelectedNonGlobusTransferableFiles(new ArrayList<>());
+
+        boolean someFiles = false;
+        boolean globusDownloadEnabled = settingsWrapper.isGlobusDownload();
+        for (FileMetadata fmd : this.selectedFiles){
+            boolean downloadable=this.fileDownloadHelper.canDownloadFile(fmd);
             
-            if (markedForDelete.getId() != null) {
-                // This FileMetadata has an id, i.e., it exists in the database. 
-                // We are going to remove this filemetadata from the version: 
-                dataset.getEditVersion().getFileMetadatas().remove(markedForDelete);
-                // But the actual delete will be handled inside the UpdateDatasetCommand
-                // (called later on). The list "filesToBeDeleted" is passed to the 
-                // command as a parameter:
-                filesToBeDeleted.add(markedForDelete);
+            boolean globusTransferable = false;
+            if(globusDownloadEnabled) {
+                String driverId = DataAccess.getStorageDriverFromIdentifier(fmd.getDataFile().getStorageIdentifier());
+                globusTransferable = GlobusAccessibleStore.isGlobusAccessible(driverId);
+                downloadable = downloadable && StorageIO.isDataverseAccessible(driverId); 
+            }
+            if(downloadable){
+                getSelectedDownloadableFiles().add(fmd);
+                someFiles=true;
             } else {
-                // This FileMetadata does not have an id, meaning it has just been 
-                // created, and not yet saved in the database. This in turn means this is 
-                // a freshly created DRAFT version; specifically created because 
-                // the user is trying to delete a file from an existing published 
-                // version. This means we are not really *deleting* the file - 
-                // we are going to keep it in the published version; we are simply 
-                // going to save a new DRAFT version that does not contain this file. 
-                // So below we are deleting the metadata from the version; we are 
-                // NOT adding the file to the filesToBeDeleted list that will be 
-                // passed to the UpdateDatasetCommand. -- L.A. Aug 2017
-                Iterator<FileMetadata> fmit = dataset.getEditVersion().getFileMetadatas().iterator();
-                while (fmit.hasNext()) {
-                    FileMetadata fmd = fmit.next();
-                    if (markedForDelete.getDataFile().getStorageIdentifier().equals(fmd.getDataFile().getStorageIdentifier())) {
-                        // And if this is an image file that happens to be assigned 
-                        // as the dataset thumbnail, let's null the assignment here:
-                        
-                        if (fmd.getDataFile().equals(dataset.getThumbnailFile())) {
-                            dataset.setThumbnailFile(null);
-                        }
-                        /* It should not be possible to get here if this file 
-                           is not in fact released! - so the code block below 
-                           is not needed.
-                        //if not published then delete identifier
-                        if (!fmd.getDataFile().isReleased()){
-                            try{
-                                commandEngine.submit(new DeleteDataFileCommand(fmd.getDataFile(), dvRequestService.getDataverseRequest()));
-                            } catch (CommandException e){
-                                 //this command is here to delete the identifier of unreleased files
-                                 //if it fails then a reserved identifier may still be present on the remote provider
-                            }                           
-                        } */
-                        fmit.remove();
-                        break;
-                    }
-                }
+                getSelectedNonDownloadableFiles().add(fmd);
+            }
+            if(globusTransferable) {
+                getSelectedGlobusTransferableFiles().add(fmd);
+                someFiles=true;
+            } else {
+                getSelectedNonGlobusTransferableFiles().add(fmd);
             }
+            if(fmd.isRestricted()){
+                getSelectedRestrictedFiles().add(fmd); //might be downloadable to user or not
+                someFiles=true;
+            } else {
+                getSelectedUnrestrictedFiles().add(fmd);
+                someFiles=true;
+            }
+
         }
+        return someFiles;
+    }
 
-        /* 
-           Do note that if we are deleting any files that have UNFs (i.e., 
-           tabular files), we DO NEED TO RECALCULATE the UNF of the version!
-           - but we will do this inside the UpdateDatasetCommand.
-        */
+    public void validateFilesForRequestAccess(){
+        this.filterSelectedFiles();
+
+        if(!dataset.isFileAccessRequest()){ //is this needed? wouldn't be able to click Request Access if this !isFileAccessRequest()
+            return;
+        }
+
+        if(!this.selectedRestrictedFiles.isEmpty()){
+            ArrayList<FileMetadata> nonDownloadableRestrictedFiles = new ArrayList<>();
+
+            List<DataFile> userRequestedDataFiles = ((AuthenticatedUser) session.getUser()).getRequestedDataFiles();
+
+            for(FileMetadata fmd : this.selectedRestrictedFiles){
+                if(!this.fileDownloadHelper.canDownloadFile(fmd) && !userRequestedDataFiles.contains(fmd.getDataFile())){
+                    nonDownloadableRestrictedFiles.add(fmd);
+                }
+            }
+
+            if(!nonDownloadableRestrictedFiles.isEmpty()){
+                guestbookResponse.setDataFile(null);
+                guestbookResponse.setSelectedFileIds(this.getFilesIdsString(nonDownloadableRestrictedFiles));
+                this.requestAccessMultipleFiles();
+            } else {
+                //popup select data files
+            }
+        }
     }
-    
-    private String enteredTermsOfAccess;
 
-    public String getEnteredTermsOfAccess() {
-        return enteredTermsOfAccess;
+    private boolean selectAllFiles;
+
+    public boolean isSelectAllFiles() {
+        return selectAllFiles;
     }
 
-    public void setEnteredTermsOfAccess(String enteredTermsOfAccess) {
-        this.enteredTermsOfAccess = enteredTermsOfAccess;
+    public void setSelectAllFiles(boolean selectAllFiles) {
+        this.selectAllFiles = selectAllFiles;
+        //Reset param in page see #8180
+        setValidateFilesOutcome(null);
     }
-    
-    private Boolean enteredFileAccessRequest;
 
-    public Boolean getEnteredFileAccessRequest() {
-        return enteredFileAccessRequest;
+    public void toggleAllSelected(){
+        //This is here so that if the user selects all on the dataset page
+        // s/he will get all files on download
+        this.selectAllFiles = !this.selectAllFiles;
+        //Reset param in page see #8180
+        setValidateFilesOutcome(null);
+
     }
 
-    public void setEnteredFileAccessRequest(Boolean fileAccessRequest) {
-        this.enteredFileAccessRequest = fileAccessRequest;
+
+    // helper Method
+    public String getSelectedFilesIdsString() {
+        return this.getFilesIdsString(this.selectedFiles);
     }
     
+    // helper Method
+    public String getSelectedDownloadableFilesIdsString() {
+        return this.getFilesIdsString(this.selectedDownloadableFiles);
+    }
     
-     public String saveWithTermsOfUse() {
-        workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(enteredTermsOfAccess);
-        workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(enteredFileAccessRequest);
-        return save();
+    public String getFilesIdsString(List<FileMetadata> fileMetadatas){ //for reuse
+        String idString = "";
+        for (FileMetadata fmd : fileMetadatas){
+            if (!StringUtil.isEmpty(idString)) {
+                idString += ",";
+            }
+            idString += fmd.getDataFile().getId();
+        }
+        return idString;
     }
 
-    public void validateDeaccessionReason(FacesContext context, UIComponent toValidate, Object value) {
-
-        UIInput reasonRadio = (UIInput) toValidate.getAttributes().get("reasonRadio");
-        Object reasonRadioValue = reasonRadio.getValue();
-        Integer radioVal = new Integer(reasonRadioValue.toString());
-
-        if (radioVal == 7 && (value == null || value.toString().isEmpty())) {
-            ((UIInput) toValidate).setValid(false);
-            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.textForReason.error"));
-            context.addMessage(toValidate.getClientId(context), message);
 
-        } else {
-            if (value == null || value.toString().length() <= DatasetVersion.VERSION_NOTE_MAX_LENGTH) {
-                ((UIInput) toValidate).setValid(true);
+    public void updateFileCounts(){
+        setSelectedUnrestrictedFiles(new ArrayList<>());
+        setSelectedRestrictedFiles(new ArrayList<>());
+        setTabularDataSelected(false);
+        for (FileMetadata fmd : this.selectedFiles){
+            if(fmd.isRestricted()){
+                getSelectedRestrictedFiles().add(fmd);
             } else {
-                ((UIInput) toValidate).setValid(false);
-                Integer lenghtInt = DatasetVersion.VERSION_NOTE_MAX_LENGTH;
-              String lengthString =   lenghtInt.toString();
-               String userMsg = BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.limitChar.error", Arrays.asList(lengthString));
-                FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "", userMsg);
-                context.addMessage(toValidate.getClientId(context), message);
+                getSelectedUnrestrictedFiles().add(fmd);
+            }
+            if(fmd.getDataFile().isTabularData()){
+                setTabularDataSelected(true);
             }
         }
     }
 
-    public void validateForwardURL(FacesContext context, UIComponent toValidate, Object value) {
+    private List<String> getSuccessMessageArguments() {
+        List<String> arguments = new ArrayList<>();
+        String dataverseString = "";
+        arguments.add(StringEscapeUtils.escapeHtml4(dataset.getDisplayName()));
+        dataverseString += " <a href=\"/dataverse/" + selectedDataverseForLinking.getAlias() + "\">" + StringEscapeUtils.escapeHtml4(selectedDataverseForLinking.getDisplayName()) + "</a>";
+        arguments.add(dataverseString);
+        return arguments;
+    }
 
-        if ((value == null || value.toString().isEmpty())) {
-            ((UIInput) toValidate).setValid(true);
-            return;
-        }
 
-        String testVal = value.toString();
+    public void saveLinkingDataverses(ActionEvent evt) {
 
-        if (!URLValidator.isURLValid(testVal)) {
-            ((UIInput) toValidate).setValid(false);
-            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.url.error"), BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.url.error"));
-            context.addMessage(toValidate.getClientId(context), message);
-            return;
-        }
-        
-        if (value.toString().length() <= DatasetVersion.ARCHIVE_NOTE_MAX_LENGTH) {
-            ((UIInput) toValidate).setValid(true);
+        if (saveLink(selectedDataverseForLinking)) {
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.linkSuccess", getSuccessMessageArguments()));
         } else {
-            ((UIInput) toValidate).setValid(false);
-            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.url.error"), BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.url.error"));
-            context.addMessage(toValidate.getClientId(context), message);
+            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.notlinked"), linkingDataverseErrorMessage);
+            FacesContext.getCurrentInstance().addMessage(null, message);
+        }
+        alreadyLinkedDataverses = null; //force update to list of linked dataverses
+    }
+    public void deleteLinkingDataverses(ActionEvent evt) {
 
+        if (deleteLink(selectedDataverseForLinking)) {
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.unlinkSuccess", getSuccessMessageArguments()));
+        } else {
+            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.notlinked"), linkingDataverseErrorMessage);
+            FacesContext.getCurrentInstance().addMessage(null, message);
         }
+        alreadyLinkedDataverses = null; //force update to list of linked dataverses
+    }
+
+    private String linkingDataverseErrorMessage = "";
 
+
+    public String getLinkingDataverseErrorMessage() {
+        return linkingDataverseErrorMessage;
     }
-     
-     public String save() {
-         //Before dataset saved, write cached prov freeform to version
-        if(systemConfig.isProvCollectionEnabled()) {
-            provPopupFragmentBean.saveStageProvFreeformToLatestVersion();
-        }
-        
-        // Validate
-        Set<ConstraintViolation> constraintViolations = workingVersion.validate();
-        if (!constraintViolations.isEmpty()) {
-            FacesContext.getCurrentInstance().validationFailed();
-            return "";
+
+    public void setLinkingDataverseErrorMessage(String linkingDataverseErrorMessage) {
+        this.linkingDataverseErrorMessage = linkingDataverseErrorMessage;
+    }
+
+    private Boolean saveLink(Dataverse dataverse){
+        boolean retVal = true;
+        if (readOnly) {
+            // Pass a "real", non-readonly dataset the the LinkDatasetCommand:
+            dataset = datasetService.find(dataset.getId());
         }
+        LinkDatasetCommand cmd = new LinkDatasetCommand(dvRequestService.getDataverseRequest(), dataverse, dataset);
+        linkingDataverse = dataverse;
+        try {
+            commandEngine.submit(cmd);
+        } catch (CommandException ex) {
+            String msg = "There was a problem linking this dataset to yours: " + ex;
+            logger.severe(msg);
+            msg = BundleUtil.getStringFromBundle("dataset.notlinked.msg") + ex;
+            /**
+             * @todo how do we get this message to show up in the GUI?
+             */
+            linkingDataverseErrorMessage = msg;
+            retVal = false;
+        }
+        return retVal;
+    }
+    private Boolean deleteLink(Dataverse dataverse){
+        boolean retVal = true;
+        linkingDataverse = dataverse;
+        try {
+            DatasetLinkingDataverse dsld = dsLinkingService.findDatasetLinkingDataverse(dataset.getId(), linkingDataverse.getId());
+            DeleteDatasetLinkingDataverseCommand cmd = new DeleteDatasetLinkingDataverseCommand(dvRequestService.getDataverseRequest(), dataset, dsld, true);
+            commandEngine.submit(cmd);
+        } catch (CommandException ex) {
+            String msg = "There was a problem removing the link between this dataset to yours: " + ex;
+            logger.severe(msg);
+            msg = BundleUtil.getStringFromBundle("dataset.notlinked.msg") + ex;
+            /**
+             * @todo how do we get this message to show up in the GUI?
+             */
+            linkingDataverseErrorMessage = msg;
+            retVal = false;
+        }
+        return retVal;
+    }
         
-        // Use the Create or Update command to save the dataset: 
-        Command<Dataset> cmd;
-        Map<Long, String> deleteStorageLocations = null;
-        
-        try { 
-            if (editMode == EditMode.CREATE) {                
-                if ( selectedTemplate != null ) {
-                    if ( isSessionUserAuthenticated() ) {
-                        cmd = new CreateNewDatasetCommand(dataset, dvRequestService.getDataverseRequest(), false, selectedTemplate); 
-                    } else {
-                        JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.create.authenticatedUsersOnly"));
-                        return null;
-                    }
-                } else {
-                   cmd = new CreateNewDatasetCommand(dataset, dvRequestService.getDataverseRequest());
-                }
-                
+    private String alreadyLinkedDataverses = null;
+    
+    public String getAlreadyLinkedDataverses(){
+        if (alreadyLinkedDataverses != null) {           
+            return alreadyLinkedDataverses;
+        }
+        List<Dataverse> dataverseList = dataverseService.findDataversesThatLinkToThisDatasetId(dataset.getId());
+        for (Dataverse dv: dataverseList){
+            if (alreadyLinkedDataverses == null){
+                alreadyLinkedDataverses = dv.getCurrentName();
             } else {
-                //Precheck - also checking db copy of dataset to catch edits in progress that would cause update command transaction to fail
-                if (dataset.getId() != null) {
-                    Dataset lockTest = datasetService.find(dataset.getId());
-                    if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress) || lockTest.isLockedFor(DatasetLock.Reason.EditInProgress)) {
-                        logger.log(Level.INFO, "Couldn''t save dataset: {0}", "It is locked."
-                                + "");
-                        String rootDataverseName = dataverseService.findRootDataverse().getName();
-                        JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.locked.editInProgress.message"),BundleUtil.getStringFromBundle("dataset.locked.editInProgress.message.details", Arrays.asList(BrandingUtil.getSupportTeamName(null, rootDataverseName))));
-                        return returnToDraftVersion();
-                    }
-                }
-                if (!filesToBeDeleted.isEmpty()) {
-                    deleteStorageLocations = datafileService.getPhysicalFilesToDelete(filesToBeDeleted);
-                }
-                cmd = new UpdateDatasetVersionCommand(dataset, dvRequestService.getDataverseRequest(), filesToBeDeleted, clone );
-                ((UpdateDatasetVersionCommand) cmd).setValidateLenient(true);  
+                alreadyLinkedDataverses = alreadyLinkedDataverses + ", " + dv.getCurrentName();
             }
-            dataset = commandEngine.submit(cmd);
-            if (editMode == EditMode.CREATE) {
-                if (session.getUser() instanceof AuthenticatedUser) {
-                    userNotificationService.sendNotification((AuthenticatedUser) session.getUser(), dataset.getCreateDate(), UserNotification.Type.CREATEDS, dataset.getLatestVersion().getId());
-                }
+        }
+        return alreadyLinkedDataverses;
+    }
+
+    public List<Dataverse> completeLinkingDataverse(String query) {
+        dataset = datasetService.find(dataset.getId());
+        if (session.getUser().isAuthenticated()) {
+            return dataverseService.filterDataversesForLinking(query, dvRequestService.getDataverseRequest(), dataset);
+        } else {
+            return null;
+        }
+    }
+    public List<Dataverse> completeUnLinkingDataverse(String query) {
+        dataset = datasetService.find(dataset.getId());
+        if (session.getUser().isAuthenticated()) {
+            return dataverseService.filterDataversesForUnLinking(query, dvRequestService.getDataverseRequest(), dataset);
+        } else {
+            return null;
+        }
+    }
+
+    public List<Dataverse> completeHostDataverseMenuList(String query) {
+        if (session.getUser().isAuthenticated()) {
+            return dataverseService.filterDataversesForHosting(query, dvRequestService.getDataverseRequest());
+        } else {
+            return null;
+        }
+    }
+
+    public String restrictFiles(boolean restricted) throws CommandException {
+        List filesToRestrict = new ArrayList();
+        if (fileMetadataForAction != null) {
+            filesToRestrict.add(fileMetadataForAction);
+        } else {
+            filesToRestrict = this.getSelectedFiles();
+        }
+        restrictFiles(filesToRestrict, restricted);
+        if (editMode == EditMode.CREATE) {
+            return "";
+        } else {
+            return save();
+        }
+    }
+
+    private void restrictFiles(List<FileMetadata> filesToRestrict, boolean restricted) throws CommandException {
+
+        // todo: this seems to be have been added to get around an optmistic lock; it may be worth investigating
+        // if there's a better way to handle
+        if (workingVersion.isReleased()) {
+            refreshSelectedFiles(filesToRestrict);
+        }
+
+        if (restricted) { // get values from access popup
+            workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(termsOfAccess);
+            workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(fileAccessRequest);
+        }
+
+
+        Command<Void> cmd;
+        for (FileMetadata fmd : filesToRestrict) {
+            if (restricted  != fmd.isRestricted()) {
+                cmd = new RestrictFileCommand(fmd.getDataFile(), dvRequestService.getDataverseRequest(), restricted);
+                commandEngine.submit(cmd);
             }
-            logger.fine("Successfully executed SaveDatasetCommand.");
-        } catch (EJBException ex) {
-            StringBuilder error = new StringBuilder();
-            error.append(ex).append(" ");
-            error.append(ex.getMessage()).append(" ");
-            Throwable cause = ex;
-            while (cause.getCause()!= null) {
-                cause = cause.getCause();
-                error.append(cause).append(" ");
-                error.append(cause.getMessage()).append(" ");
+        }
+    }
+
+    public boolean hasRestrictedFile() {
+        if (workingVersion == null) {
+            return false;
+        }
+        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+            if (fmd.isRestricted()) {
+                return true;
             }
-            logger.log(Level.FINE, "Couldn''t save dataset: {0}", error.toString());
-            populateDatasetUpdateFailureMessage();
-            return returnToDraftVersion();
-        } catch (CommandException ex) {
-            //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Dataset Save Failed", " - " + ex.toString()));
-            logger.log(Level.SEVERE, "CommandException, when attempting to update the dataset: " + ex.getMessage(), ex);
-            populateDatasetUpdateFailureMessage();
-            return returnToDraftVersion();
         }
-        
-        // Have we just deleted some draft datafiles (successfully)? 
-        // finalize the physical file deletes:
-        // (DataFileService will double-check that the datafiles no 
-        // longer exist in the database, before attempting to delete 
-        // the physical files)
-        
-        if (deleteStorageLocations != null) {
-            datafileService.finalizeFileDeletes(deleteStorageLocations);
+        return false;
+    }
+
+    public int getRestrictedFileCount() {
+        if (workingVersion == null){
+            return 0;
         }
-        
-        if (editMode != null) {
-            if (editMode.equals(EditMode.CREATE)) {
-                // We allow users to upload files on Create: 
-                int nNewFiles = newFiles.size();
-                logger.fine("NEW FILES: "+nNewFiles);
-                
-                if (nNewFiles > 0) {
-                    // Save the NEW files permanently and add the to the dataset: 
-                    
-                    // But first, fully refresh the newly created dataset (with a 
-                    // datasetService.find().
-                    // We have reasons to believe that the CreateDatasetCommand 
-                    // returns the dataset that doesn't have all the  
-                    // RoleAssignments properly linked to it - even though they
-                    // have been created in the dataset. 
-                    dataset = datasetService.find(dataset.getId());
-                    
-                    List<DataFile> filesAdded = ingestService.saveAndAddFilesToDataset(dataset.getEditVersion(), newFiles);
-                    newFiles.clear();
-                    
-                    // and another update command: 
-                    boolean addFilesSuccess = false;
-                    cmd = new UpdateDatasetVersionCommand(dataset, dvRequestService.getDataverseRequest());
-                    try {
-                        dataset = commandEngine.submit(cmd);
-                        addFilesSuccess = true; 
-                    } catch (Exception ex) {
-                        addFilesSuccess = false;
-                    }
-                    if (addFilesSuccess && dataset.getFiles().size() > 0) {
-                        if (nNewFiles == dataset.getFiles().size()) {
-                            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess"));
-                        } else {
-                            String partialSuccessMessage = BundleUtil.getStringFromBundle("dataset.message.createSuccess.partialSuccessSavingFiles");
-                            partialSuccessMessage = partialSuccessMessage.replace("{0}", "" + dataset.getFiles().size() + "");
-                            partialSuccessMessage = partialSuccessMessage.replace("{1}", "" + nNewFiles + "");
-                            JsfHelper.addWarningMessage(partialSuccessMessage);
+        int restrictedFileCount = 0;
+        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+            if (fmd.isRestricted()) {
+                restrictedFileCount++;
+            }
+        }
+
+        return restrictedFileCount;
+    }
+
+    private List<FileMetadata> filesToBeDeleted = new ArrayList<>();
+
+    public String deleteFiles() throws CommandException{
+        List filesToDelete = new ArrayList();
+
+        if (fileMetadataForAction != null) {
+            filesToDelete.add(fileMetadataForAction);
+        } else {
+            bulkFileDeleteInProgress = true;
+            filesToDelete = this.getSelectedFiles();
+        }
+
+        //Remove embargoes that are no longer referenced
+        //Identify which ones are involved here
+        List<Embargo> orphanedEmbargoes = new ArrayList<Embargo>();
+        if (selectedFiles != null && selectedFiles.size() > 0) {
+            for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+                for (FileMetadata fm : selectedFiles) {
+                    if (fm.getDataFile().equals(fmd.getDataFile()) && !fmd.getDataFile().isReleased()) {
+                        Embargo emb = fmd.getDataFile().getEmbargo();
+                        if (emb != null) {
+                            emb.getDataFiles().remove(fmd.getDataFile());
+                            if (emb.getDataFiles().isEmpty()) {
+                                orphanedEmbargoes.add(emb);
+                            }
                         }
-                    } else {
-                        JsfHelper.addWarningMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess.failedToSaveFiles"));
                     }
-                } else {
-                    JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess"));
                 }
             }
-            if (editMode.equals(EditMode.METADATA)) {
-                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.metadataSuccess"));
-            }
-            if (editMode.equals(EditMode.LICENSE)) {
-                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.termsSuccess"));
-            }
-            if (editMode.equals(EditMode.FILE)) {
-                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.filesSuccess"));
+        }
+
+        //Remove retentions that are no longer referenced
+        //Identify which ones are involved here
+        List<Retention> orphanedRetentions = new ArrayList<Retention>();
+        if (selectedFiles != null && selectedFiles.size() > 0) {
+            for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+                for (FileMetadata fm : selectedFiles) {
+                    if (fm.getDataFile().equals(fmd.getDataFile()) && !fmd.getDataFile().isReleased()) {
+                        Retention ret = fmd.getDataFile().getRetention();
+                        if (ret != null) {
+                            ret.getDataFiles().remove(fmd.getDataFile());
+                            if (ret.getDataFiles().isEmpty()) {
+                                orphanedRetentions.add(ret);
+                            }
+                        }
+                    }
+                }
             }
+        }
 
+        deleteFiles(filesToDelete);
+        String retVal;
+        
+        if (editMode == EditMode.CREATE) {
+            workingVersion.setFileMetadatas(new ArrayList<>());
+            retVal = "";
         } else {
-            // must have been a bulk file update or delete:
-            if (bulkFileDeleteInProgress) {
-                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileDeleteSuccess"));
+            retVal = save();
+        }
+
+        // And delete them only after the dataset is updated
+        for(Embargo emb: orphanedEmbargoes) {
+            embargoService.deleteById(emb.getId(), ((AuthenticatedUser)session.getUser()).getUserIdentifier());
+        }
+        for(Retention ret: orphanedRetentions) {
+            retentionService.delete(ret, ((AuthenticatedUser)session.getUser()).getUserIdentifier());
+        }
+        return retVal;
+
+    }
+
+    private void deleteFiles(List<FileMetadata> filesToDelete) {
+        if (workingVersion.isReleased()) {
+            refreshSelectedFiles(filesToDelete);
+        }
+
+        if (dataset.getThumbnailFile() != null) {
+            for (FileMetadata fmd : filesToDelete) {
+                if (fmd.getDataFile().equals(dataset.getThumbnailFile())) {
+                    dataset.setThumbnailFile(null);
+                    break;
+                }
+            }
+        }
+        
+        for (FileMetadata markedForDelete : filesToDelete) {
+
+            if (markedForDelete.getId() != null) {
+                // This FileMetadata has an id, i.e., it exists in the database.
+                // We are going to remove this filemetadata from the version:
+                dataset.getOrCreateEditVersion().getFileMetadatas().remove(markedForDelete);
+                // But the actual delete will be handled inside the UpdateDatasetCommand
+                // (called later on). The list "filesToBeDeleted" is passed to the
+                // command as a parameter:
+                filesToBeDeleted.add(markedForDelete);
             } else {
-                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileUpdateSuccess"));
+                // This FileMetadata does not have an id, meaning it has just been
+                // created, and not yet saved in the database. This in turn means this is
+                // a freshly created DRAFT version; specifically created because
+                // the user is trying to delete a file from an existing published
+                // version. This means we are not really *deleting* the file -
+                // we are going to keep it in the published version; we are simply
+                // going to save a new DRAFT version that does not contain this file.
+                // So below we are deleting the metadata from the version; we are
+                // NOT adding the file to the filesToBeDeleted list that will be
+                // passed to the UpdateDatasetCommand. -- L.A. Aug 2017
+                
+                FileMetadataUtil.removeFileMetadataFromList(workingVersion.getFileMetadatas(), markedForDelete);
+                FileMetadataUtil.removeDataFileFromList(newFiles, markedForDelete.getDataFile());
+
             }
         }
 
-        editMode = null;
-        bulkFileDeleteInProgress = false;
+        /*
+           Do note that if we are deleting any files that have UNFs (i.e.,
+           tabular files), we DO NEED TO RECALCULATE the UNF of the version!
+           - but we will do this inside the UpdateDatasetCommand.
+        */
+    }
+
+    private String enteredTermsOfAccess;
+
+    public String getEnteredTermsOfAccess() {
+        return enteredTermsOfAccess;
+    }
+
+    public void setEnteredTermsOfAccess(String enteredTermsOfAccess) {
+        this.enteredTermsOfAccess = enteredTermsOfAccess;
+    }
+
+    private Boolean enteredFileAccessRequest;
+
+    public Boolean getEnteredFileAccessRequest() {
+        return enteredFileAccessRequest;
+    }
+
+    public void setEnteredFileAccessRequest(Boolean fileAccessRequest) {
+        this.enteredFileAccessRequest = fileAccessRequest;
+    }
+
+
+     public String saveWithTermsOfUse() {
+        workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(enteredTermsOfAccess);
+        workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(enteredFileAccessRequest);
+        return save();
+    }
+
+    public void validateDeaccessionReason(FacesContext context, UIComponent toValidate, Object value) {
+
+        UIInput reasonRadio = (UIInput) toValidate.getAttributes().get("reasonRadio");
+        Object reasonRadioValue = reasonRadio.getValue();
+        Integer radioVal = new Integer(reasonRadioValue.toString());
+
+        if (radioVal == 7 && (value == null || value.toString().isEmpty())) {
+            ((UIInput) toValidate).setValid(false);
+            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.textForReason.error"));
+            context.addMessage(toValidate.getClientId(context), message);
+
+        } else {
+            if (value == null || value.toString().length() <= DatasetVersion.VERSION_NOTE_MAX_LENGTH) {
+                ((UIInput) toValidate).setValid(true);
+            } else {
+                ((UIInput) toValidate).setValid(false);
+                Integer lenghtInt = DatasetVersion.VERSION_NOTE_MAX_LENGTH;
+              String lengthString =   lenghtInt.toString();
+               String userMsg = BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.limitChar.error", Arrays.asList(lengthString));
+                FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "", userMsg);
+                context.addMessage(toValidate.getClientId(context), message);
+            }
+        }
+    }
+
+    public void validateForwardURL(FacesContext context, UIComponent toValidate, Object value) {
+
+        if ((value == null || value.toString().isEmpty())) {
+            ((UIInput) toValidate).setValid(true);
+            return;
+        }
+
+        String testVal = value.toString();
+
+        if (!URLValidator.isURLValid(testVal)) {
+            ((UIInput) toValidate).setValid(false);
+            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.url.error"), BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.url.error"));
+            context.addMessage(toValidate.getClientId(context), message);
+            return;
+        }
+
+        if (value.toString().length() <= DatasetVersion.DEACCESSION_NOTE_MAX_LENGTH) {
+            ((UIInput) toValidate).setValid(true);
+        } else {
+            ((UIInput) toValidate).setValid(false);
+            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.url.error"), BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.url.error"));
+            context.addMessage(toValidate.getClientId(context), message);
+
+        }
+
+    }
+
+    public String save() {
+        //Before dataset saved, write cached prov freeform to version
+        if (systemConfig.isProvCollectionEnabled()) {
+            provPopupFragmentBean.saveStageProvFreeformToLatestVersion();
+        }
+
+        // Before validating, ensure that the dataset has an owner:
+        if (dataset.getOwner() == null || dataset.getOwner().getId() == null) {
+            dataset.setOwner(ownerId != null ? dataverseService.find(ownerId) : null);
+        }
+        // Validate
+        Set<ConstraintViolation> constraintViolations = workingVersion.validate();
+        if (!constraintViolations.isEmpty()) {
+            FacesContext.getCurrentInstance().validationFailed();
+            return "";
+        }
+
+
+
+        // Use the Create or Update command to save the dataset:
+        Command<Dataset> cmd;
+        Map<Long, String> deleteStorageLocations = null;
+
+        try {
+            if (editMode == EditMode.CREATE) {
+                //Lock the metadataLanguage once created
+                dataset.setMetadataLanguage(getEffectiveMetadataLanguage());
+                //ToDo - could drop use of selectedTemplate and just use the persistent dataset.getTemplate() 
+                if ( selectedTemplate != null ) {
+                    if ( isSessionUserAuthenticated() ) {
+                        cmd = new CreateNewDatasetCommand(dataset, dvRequestService.getDataverseRequest(), selectedTemplate);
+                    } else {
+                        JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.create.authenticatedUsersOnly"));
+                        return null;
+                    }
+                } else {
+                   cmd = new CreateNewDatasetCommand(dataset, dvRequestService.getDataverseRequest());
+                }
+
+            } else {
+                //Precheck - also checking db copy of dataset to catch edits in progress that would cause update command transaction to fail
+                if (dataset.getId() != null) {
+                    Dataset lockTest = datasetService.find(dataset.getId());
+                    if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress) || lockTest.isLockedFor(DatasetLock.Reason.EditInProgress)) {
+                        logger.log(Level.INFO, "Couldn''t save dataset: {0}", "It is locked."
+                                + "");
+                        JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.locked.editInProgress.message"),BundleUtil.getStringFromBundle("dataset.locked.editInProgress.message.details", Arrays.asList(BrandingUtil.getSupportTeamName(null))));
+                        return returnToDraftVersion();
+                    }
+                }
+                if (!filesToBeDeleted.isEmpty()) {
+                    deleteStorageLocations = datafileService.getPhysicalFilesToDelete(filesToBeDeleted);
+                }
+                cmd = new UpdateDatasetVersionCommand(dataset, dvRequestService.getDataverseRequest(), filesToBeDeleted, clone );
+                ((UpdateDatasetVersionCommand) cmd).setValidateLenient(true);
+            }
+            dataset = commandEngine.submit(cmd);
+            if (editMode == EditMode.CREATE) {
+                if (session.getUser() instanceof AuthenticatedUser) {
+                    userNotificationService.sendNotification((AuthenticatedUser) session.getUser(), dataset.getCreateDate(), UserNotification.Type.CREATEDS, dataset.getLatestVersion().getId());
+                }
+            }
+            logger.fine("Successfully executed SaveDatasetCommand.");
+        } catch (EJBException ex) {
+            StringBuilder error = new StringBuilder();
+            error.append(ex).append(" ");
+            error.append(ex.getMessage()).append(" ");
+            Throwable cause = ex;
+            while (cause.getCause()!= null) {
+                cause = cause.getCause();
+                if (cause != null && cause instanceof OptimisticLockException) {
+                    JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.parallelUpdateError"));
+                    return null;
+                }
+                error.append(cause).append(" ");
+                error.append(cause.getMessage()).append(" ");
+            }
+            logger.log(Level.FINE, "Couldn''t save dataset: {0}", error.toString());
+            populateDatasetUpdateFailureMessage();
+            return returnToDraftVersion();
+        } catch (CommandException ex) {
+            //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Dataset Save Failed", " - " + ex.toString()));
+            logger.log(Level.SEVERE, "CommandException, when attempting to update the dataset: " + ex.getMessage(), ex);
+            Throwable cause = ex;
+            while (cause.getCause()!= null) {
+                cause = cause.getCause();
+                logger.info("Cause is: " + cause.getClass().getName() + ", Message: " + cause.getMessage());
+                if (cause != null && cause instanceof OptimisticLockException) {
+                    JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.parallelUpdateError"));
+                    return null;
+                }
+            }
+            populateDatasetUpdateFailureMessage();
+            return returnToDraftVersion();
+        }
+
+        // Have we just deleted some draft datafiles (successfully)?
+        // finalize the physical file deletes:
+        // (DataFileService will double-check that the datafiles no
+        // longer exist in the database, before attempting to delete
+        // the physical files)
+
+        if (deleteStorageLocations != null) {
+            datafileService.finalizeFileDeletes(deleteStorageLocations);
+        }
+
+        if (editMode != null) {
+            if (editMode.equals(EditMode.CREATE)) {
+                
+                // We allow users to upload files on Create:
+                int nNewFiles = newFiles.size();
+                logger.fine("NEW FILES: "+nNewFiles);
+
+                if (nNewFiles > 0) {
+                    // Save the NEW files permanently and add the to the dataset:
+
+                    // But first, fully refresh the newly created dataset (with a
+                    // datasetService.find().
+                    // We have reasons to believe that the CreateDatasetCommand
+                    // returns the dataset that doesn't have all the
+                    // RoleAssignments properly linked to it - even though they
+                    // have been created in the dataset.
+                    dataset = datasetService.find(dataset.getId());
+
+                    boolean ignoreUploadFileLimits = this.session.getUser() != null ? this.session.getUser().isSuperuser() : false;
+                    List<DataFile> filesAdded = ingestService.saveAndAddFilesToDataset(dataset.getOrCreateEditVersion(), newFiles, null, true, ignoreUploadFileLimits);
+                    if (filesAdded.size() < nNewFiles) {
+                        // Not all files were saved
+                        Integer limit = dataset.getEffectiveDatasetFileCountLimit();
+                        if (limit != null) {
+                            String msg = BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", List.of(limit.toString()));
+                            JsfHelper.addInfoMessage(msg);
+                        }
+                    }
+                    newFiles.clear();
+
+                    // and another update command:
+                    boolean addFilesSuccess = false;
+                    cmd = new UpdateDatasetVersionCommand(dataset, dvRequestService.getDataverseRequest());
+                    try {
+                        dataset = commandEngine.submit(cmd);
+                        addFilesSuccess = true;
+                    } catch (Exception ex) {
+                        addFilesSuccess = false;
+                    }
+                    if (addFilesSuccess && dataset.getFiles().size() > 0) {
+                        if (nNewFiles == dataset.getFiles().size()) {
+                            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess"));
+                        } else {
+                            String partialSuccessMessage = BundleUtil.getStringFromBundle("dataset.message.createSuccess.partialSuccessSavingFiles");
+                            partialSuccessMessage = partialSuccessMessage.replace("{0}", "" + dataset.getFiles().size() + "");
+                            partialSuccessMessage = partialSuccessMessage.replace("{1}", "" + nNewFiles + "");
+                            JsfHelper.addWarningMessage(partialSuccessMessage);
+                        }
+                    } else {
+                        JsfHelper.addWarningMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess.failedToSaveFiles"));
+                    }
+                } else {
+                    JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess"));
+                }
+            }
+            if (editMode.equals(EditMode.METADATA)) {
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.metadataSuccess"));
+            }
+            if (editMode.equals(EditMode.LICENSE)) {
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.termsSuccess"));
+            }
+            if (editMode.equals(EditMode.FILE)) {
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.filesSuccess"));
+            } if (editMode.equals(EditMode.VERSIONNOTE)) {
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.versionNoteSuccess"));
+            }
+        } else {
+            // must have been a bulk file update or delete:
+            if (bulkFileDeleteInProgress) {
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileDeleteSuccess"));
+            } else {
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.filesSuccess"));
+            }
+        }
+
+        editMode = null;
+        bulkFileDeleteInProgress = false;
+
+
+
+        // Call Ingest Service one more time, to
+        // queue the data ingest jobs for asynchronous execution:
+        ingestService.startIngestJobsForDataset(dataset, (AuthenticatedUser) session.getUser());
+
+        //After dataset saved, then persist prov json data
+        if(systemConfig.isProvCollectionEnabled()) {
+            try {
+                provPopupFragmentBean.saveStagedProvJson(false, dataset.getLatestVersion().getFileMetadatas());
+            } catch (AbstractApiBean.WrappedResponse ex) {
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("file.metadataTab.provenance.error"));
+                Logger.getLogger(DatasetPage.class.getName()).log(Level.SEVERE, null, ex);
+            }
+        }
+
+        logger.fine("Redirecting to the Dataset page.");
+
+        return returnToDraftVersion();
+    }
+
+    private void populateDatasetUpdateFailureMessage(){
+        if (editMode == null) {
+            // that must have been a bulk file update or delete:
+            if (bulkFileDeleteInProgress) {
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileDeleteFailure"));
+
+            } else {
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.filesFailure"));
+            }
+        } else {
+
+            if (editMode.equals(EditMode.CREATE)) {
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.createFailure"));
+            }
+            if (editMode.equals(EditMode.METADATA)) {
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.metadataFailure"));
+            }
+            if (editMode.equals(EditMode.LICENSE)) {
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.termsFailure"));
+            }
+            if (editMode.equals(EditMode.FILE)) {
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.filesFailure"));
+            }
+        }
+
+        bulkFileDeleteInProgress = false;
+    }
+
+    private String returnToLatestVersion(){
+         dataset = datasetService.find(dataset.getId());
+         workingVersion = dataset.getLatestVersion();
+         if (workingVersion.isDeaccessioned() && dataset.getReleasedVersion() != null) {
+         workingVersion = dataset.getReleasedVersion();
+         }
+         setVersionTabList(resetVersionTabList());
+         setReleasedVersionTabList(resetReleasedVersionTabList());
+         newFiles.clear();
+         editMode = null;
+         return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&version="+ workingVersion.getFriendlyVersionNumber() +  "&faces-redirect=true";
+    }
+
+    private String returnToDatasetOnly(){
+         dataset = datasetService.find(dataset.getId());
+         editMode = null;
+         return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() +  "&faces-redirect=true";
+    }
+
+    private String returnToDraftVersion(){
+         return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&version=DRAFT" + "&faces-redirect=true";
+    }
+
+    public String cancel() {
+        return  returnToLatestVersion();
+    }
+
+    public void cancelCreate() {
+    	//Stop any uploads in progress (so that uploadedFiles doesn't change)
+    	uploadInProgress.setValue(false);
+
+    	logger.fine("Cancelling: " + newFiles.size() + " : " + uploadedFiles.size());
+
+    	//Files that have been finished and are now in the lower list on the page
+    	for (DataFile newFile : newFiles.toArray(new DataFile[0])) {
+    		FileUtil.deleteTempFile(newFile, dataset, ingestService);
+    	}
+    	logger.fine("Deleted newFiles");
+
+    	//Files in the upload process but not yet finished
+    	//ToDo - if files are added to uploadFiles after we access it, those files are not being deleted. With uploadInProgress being set false above, this should be a fairly rare race condition.
+    	for (DataFile newFile : uploadedFiles.toArray(new DataFile[0])) {
+    		FileUtil.deleteTempFile(newFile, dataset, ingestService);
+    	}
+    	logger.fine("Deleted uploadedFiles");
+
+    	try {
+    		String alias = dataset.getOwner().getAlias();
+    		logger.info("alias: " + alias);
+    		FacesContext.getCurrentInstance().getExternalContext().redirect("/dataverse.xhtml?alias=" + alias);
+    	} catch (IOException ex) {
+    		logger.info("Failed to issue a redirect to file download url.");
+    	}
+    }
+
+    public void refreshLock() {
+        //RequestContext requestContext = RequestContext.getCurrentInstance();
+        logger.fine("checking lock");
+        if (isStillLocked()) {
+            logger.fine("(still locked)");
+        } else {
+            // OK, the dataset is no longer locked.
+            // let's tell the page to refresh:
+            logger.fine("no longer locked!");
+            stateChanged = true;
+            lockedFromEditsVar = null;
+            lockedFromDownloadVar = null;
+            //requestContext.execute("refreshPage();");
+        }
+    }
+
+    public void refreshIngestLock() {
+        //RequestContext requestContext = RequestContext.getCurrentInstance();
+        logger.fine("checking ingest lock");
+        if (isStillLockedForIngest()) {
+            logger.fine("(still locked)");
+        } else {
+            // OK, the dataset is no longer locked.
+            // let's tell the page to refresh:
+            logger.fine("no longer locked!");
+            stateChanged = true;
+            lockedFromEditsVar = null;
+            lockedFromDownloadVar = null;
+            //requestContext.execute("refreshPage();");
+        }
+    }
+
+    public void refreshAllLocks() {
+        //RequestContext requestContext = RequestContext.getCurrentInstance();
+        logger.fine("checking all locks");
+        if (isStillLockedForAnyReason()) {
+            logger.fine("(still locked)");
+        } else {
+            // OK, the dataset is no longer locked.
+            // let's tell the page to refresh:
+            logger.fine("no longer locked!");
+            stateChanged = true;
+            lockedFromEditsVar = null;
+            lockedFromDownloadVar = null;
+            //requestContext.execute("refreshPage();");
+        }
+    }
+
+    /*
+
+    public boolean isLockedInProgress() {
+        if (dataset != null) {
+            logger.log(Level.FINE, "checking lock status of dataset {0}", dataset.getId());
+            if (dataset.isLocked()) {
+                return true;
+            }
+        }
+        return false;
+    }*/
+
+    public boolean isDatasetLockedInWorkflow() {
+        return (dataset != null)
+                ? dataset.isLockedFor(DatasetLock.Reason.Workflow)
+                : false;
+    }
+
+    public boolean isStillLocked() {
+
+        if (dataset != null && dataset.getId() != null) {
+            logger.log(Level.FINE, "checking lock status of dataset {0}", dataset.getId());
+            if(dataset.getLocks().size() == 1 && dataset.getLockFor(DatasetLock.Reason.InReview) != null){
+                return false;
+            }
+            if (datasetService.checkDatasetLock(dataset.getId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    public boolean isStillLockedForIngest() {
+        if (dataset.getId() != null) {
+            Dataset testDataset = datasetService.find(dataset.getId());
+            if (testDataset != null && testDataset.getId() != null) {
+                logger.log(Level.FINE, "checking lock status of dataset {0}", dataset.getId());
+
+                if (testDataset.getLockFor(DatasetLock.Reason.Ingest) != null) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public boolean isStillLockedForAnyReason() {
+        if (dataset.getId() != null) {
+            Dataset testDataset = datasetService.find(dataset.getId());
+            if (testDataset != null && testDataset.getId() != null) {
+                if (testDataset.getLocks().size() > 0) {
+                    // Refresh the info messages, in case the dataset has been
+                    // re-locked with a different lock type:
+                    displayLockInfo(testDataset);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public boolean isLocked() {
+        if (stateChanged) {
+            return false;
+        }
+
+        if (dataset != null) {
+            if (dataset.isLocked()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isLockedForIngest() {
+        if (dataset.getId() != null) {
+            Dataset testDataset = datasetService.find(dataset.getId());
+            if (stateChanged) {
+                return false;
+            }
+
+            if (testDataset != null) {
+                if (testDataset.getLockFor(DatasetLock.Reason.Ingest) != null) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public boolean isLockedForAnyReason() {
+        if (dataset.getId() != null) {
+            Dataset testDataset = datasetService.find(dataset.getId());
+            if (stateChanged) {
+                return false;
+            }
+
+            if (testDataset != null) {
+                if (testDataset.getLocks().size() > 0) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public void processPublishButton() {
+        if (dataset.isReleased()) {
+            PrimeFaces.current().executeScript("PF('publishDataset').show()");
+        }
+
+        if (!dataset.isReleased()) {
+            if (dataset.getOwner().isReleased()) {
+                PrimeFaces.current().executeScript("PF('publishDataset').show()");
+                return;
+            }
+            if (!dataset.getOwner().isReleased()) {
+                if (canPublishDataverse()) {
+                    if (dataset.getOwner().getOwner() == null
+                            || (dataset.getOwner().getOwner() != null && dataset.getOwner().getOwner().isReleased())) {
+                        PrimeFaces.current().executeScript("PF('publishDataset').show()");
+                        return;
+                    }
+                    if ((dataset.getOwner().getOwner() != null && !dataset.getOwner().getOwner().isReleased())) {
+                        PrimeFaces.current().executeScript("PF('maynotPublishParent').show()");
+                    }
+
+                } else {
+                    PrimeFaces.current().executeScript("PF('mayNotRelease').show()");
+                }
+            }
+        }
+    }
+
+    public boolean releaseDraftPopup(){
+        return dataset.isReleased();
+    }
+
+    public boolean publishDatasetPopup(){
+        if (!dataset.isReleased()) {
+            return dataset.getOwner().isReleased();
+        }
+       return false;
+    }
+
+    public boolean publishBothPopup() {
+        if (!dataset.getOwner().isReleased()) {
+            if (canPublishDataverse()) {
+                if (dataset.getOwner().getOwner() == null
+                        || (dataset.getOwner().getOwner() != null && dataset.getOwner().getOwner().isReleased())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public String getPublishButtonLabel(){
+        if(publishDatasetPopup() || releaseDraftPopup()){
+            BundleUtil.getStringFromBundle("continue");
+        }
+        if(publishBothPopup()){
+            BundleUtil.getStringFromBundle("dataset.mayNotBePublished.both.button");
+        }
+        return "";
+    }
+
+    private Boolean lockedFromEditsVar;
+    private Boolean lockedFromDownloadVar;
+    private boolean lockedDueToDcmUpload;
+    private Boolean lockedDueToIngestVar;
+    private Boolean lockedFromPublishingVar;
+
+    /**
+     * Authors are not allowed to publish but curators are allowed - when Dataset is inReview
+     * For all other locks edit should be locked for all editors.
+     */
+    public boolean isLockedFromPublishing() {
+        if (null == lockedFromPublishingVar || stateChanged) {
+            try {
+                permissionService.checkPublishDatasetLock(dataset, dvRequestService.getDataverseRequest(), new PublishDatasetCommand(dataset, dvRequestService.getDataverseRequest(), true));
+                lockedFromPublishingVar = false;
+            } catch (IllegalCommandException ex) {
+                lockedFromPublishingVar = true;
+            }
+        }
+        return lockedFromPublishingVar;
+    }
+    /**
+     * Authors are not allowed to edit but curators are allowed - when Dataset is inReview
+     * For all other locks edit should be locked for all editors.
+     */
+    public boolean isLockedFromEdits() {
+        if (null == lockedFromEditsVar || stateChanged) {
+            try {
+                permissionService.checkEditDatasetLock(dataset, dvRequestService.getDataverseRequest(), new UpdateDatasetVersionCommand(dataset, dvRequestService.getDataverseRequest()));
+                lockedFromEditsVar = false;
+            } catch (IllegalCommandException ex) {
+                lockedFromEditsVar = true;
+            }
+        }
+        return lockedFromEditsVar;
+
+    }
+
+    /**
+    Need to save ingest lock state to display success later.
+     */
+    public boolean isLockedDueToIngest() {
+        if(null == lockedDueToIngestVar || stateChanged) {
+               lockedDueToIngestVar = isLockedForIngest();
+        }
+        return lockedFromEditsVar;
+    }
+
+
+    // TODO: investigate why this method was needed in the first place?
+    // It appears that it was written under the assumption that downloads
+    // should not be allowed when a dataset is locked... (why?)
+    // There are calls to the method throghout the file-download-buttons fragment;
+    // except the way it's done there, it's actually disregarded (??) - so the
+    // download buttons ARE always enabled. The only place where this method is
+    // honored is on the batch (mutliple file) download buttons in filesFragment.xhtml.
+    // As I'm working on #4000, I've been asked to re-enable the batch download
+    // buttons there as well, even when the dataset is locked. I'm doing that - but
+    // I feel we should probably figure out why we went to the trouble of creating
+    // this code in the first place... is there some reason we are forgetting now,
+    // why we do actually want to disable downloads on locked datasets???
+    // -- L.A. Aug. 2018
+    public boolean isLockedFromDownload(){
+        if(null == lockedFromDownloadVar || stateChanged) {
+            try {
+                permissionService.checkDownloadFileLock(dataset, dvRequestService.getDataverseRequest(), new CreateNewDatasetCommand(dataset, dvRequestService.getDataverseRequest()));
+                lockedFromDownloadVar = false;
+            } catch (IllegalCommandException ex) {
+                lockedFromDownloadVar = true;
+                return true;
+            }
+        }
+        return lockedFromDownloadVar;
+    }
+
+    public boolean isLockedDueToDcmUpload() {
+        return lockedDueToDcmUpload;
+    }
+
+    public void setLocked(boolean locked) {
+        // empty method, so that we can use DatasetPage.locked in a hidden
+        // input on the page.
+    }
+
+    public void setLockedForIngest(boolean locked) {
+        // empty method, so that we can use DatasetPage.locked in a hidden
+        // input on the page.
+    }
+
+    public void setLockedForAnyReason(boolean locked) {
+        // empty method, so that we can use DatasetPage.locked in a hidden
+        // input on the page.
+    }
+
+    public boolean isStateChanged() {
+        return stateChanged;
+    }
+
+    public void setStateChanged(boolean stateChanged) {
+        // empty method, so that we can use DatasetPage.stateChanged in a hidden
+        // input on the page.
+    }
+
+    public DatasetVersionUI getDatasetVersionUI() {
+        return datasetVersionUI;
+    }
+
+
+    public List<DatasetVersion> getVersionTabList() {
+        return versionTabList;
+    }
+
+    public List<DatasetVersion> getVersionTabListForPostLoad(){
+        return this.versionTabListForPostLoad;
+    }
+
+    public void setVersionTabListForPostLoad(List<DatasetVersion> versionTabListForPostLoad) {
+
+        this.versionTabListForPostLoad = versionTabListForPostLoad;
+    }
+
+    public Integer getCompareVersionsCount() {
+        Integer retVal = 0;
+        for (DatasetVersion dvTest : dataset.getVersions()) {
+            if (!dvTest.isDeaccessioned()) {
+                retVal++;
+            }
+        }
+        return retVal;
+    }
+
+    /**
+     * To improve performance, Version Differences
+     * are retrieved/calculated after the page load
+     *
+     * See: dataset-versions.xhtml, remoteCommand 'postLoadVersionTablList'
+    */
+    public void postLoadSetVersionTabList(){
+
+        if (this.getVersionTabList().isEmpty() && workingVersion.isDeaccessioned()){
+            setVersionTabList(resetVersionTabList());
+        }
+
+        this.setVersionTabListForPostLoad(this.getVersionTabList());
+
+
+        //this.versionTabList = this.resetVersionTabList();
+    }
+
+    /**
+     *
+     *
+     * @param versionTabList
+     */
+    public void setVersionTabList(List<DatasetVersion> versionTabList) {
+
+        this.versionTabList = versionTabList;
+    }
+
+    private List<DatasetVersion> releasedVersionTabList = new ArrayList<>();
+
+    public List<DatasetVersion> getReleasedVersionTabList() {
+        return releasedVersionTabList;
+    }
+
+    public void setReleasedVersionTabList(List<DatasetVersion> releasedVersionTabList) {
+        this.releasedVersionTabList = releasedVersionTabList;
+    }
+
+    private List<DatasetVersion> selectedVersions;
+
+    public List<DatasetVersion> getSelectedVersions() {
+        return selectedVersions;
+    }
+
+    public void setSelectedVersions(List<DatasetVersion> selectedVersions) {
+        this.selectedVersions = selectedVersions;
+    }
+
+    private List<DatasetVersion> selectedDeaccessionVersions;
+
+    public List<DatasetVersion> getSelectedDeaccessionVersions() {
+        return selectedDeaccessionVersions;
+    }
+
+    public void setSelectedDeaccessionVersions(List<DatasetVersion> selectedDeaccessionVersions) {
+        this.selectedDeaccessionVersions = selectedDeaccessionVersions;
+    }
+
+    public DatasetVersionDifference getDatasetVersionDifference() {
+        return datasetVersionDifference;
+    }
+
+    public void setDatasetVersionDifference(DatasetVersionDifference datasetVersionDifference) {
+        this.datasetVersionDifference = datasetVersionDifference;
+    }
+
+    public void startMultipleFileDownload (){
+
+        boolean doNotSaveGuestbookResponse = workingVersion.isDraft();
+        // There's a chance that this is not really a batch download - i.e.,
+        // there may only be one file on the downloadable list. But the fileDownloadService
+        // method below will check for that, and will redirect to the single download, if
+        // that's the case. -- L.A.
+        fileDownloadService.writeGuestbookAndStartBatchDownload(guestbookResponse, doNotSaveGuestbookResponse);
+    }
+
+    private String downloadType = "";
+
+    public String getDownloadType() {
+        return downloadType;
+    }
+
+    public void setDownloadType(String downloadType) {
+        this.downloadType = downloadType;
+    }
+
+    public void initGuestbookMultipleResponse(String selectedFileIds){
+         initGuestbookResponse(null, "download", selectedFileIds);
+    }
+
+    public void initGuestbookResponse(FileMetadata fileMetadata, String downloadFormat, String selectedFileIds) {
+
+        this.guestbookResponse = guestbookResponseService.initGuestbookResponse(fileMetadata, downloadFormat, selectedFileIds, session);
+    }
+
+
+
+    public void compareVersionDifferences() {
+        //RequestContext requestContext = RequestContext.getCurrentInstance();
+        if (this.selectedVersions.size() != 2) {
+            PrimeFaces.current().executeScript("openCompareTwo();");
+        } else {
+            //order depends on order of selection - needs to be chronological order
+            if (this.selectedVersions.get(0).getId().intValue() > this.selectedVersions.get(1).getId().intValue()) {
+                updateVersionDifferences(this.selectedVersions.get(0), this.selectedVersions.get(1));
+            } else {
+                updateVersionDifferences(this.selectedVersions.get(1), this.selectedVersions.get(0));
+            }
+        }
+    }
+
+    public void updateVersionDifferences(DatasetVersion newVersion, DatasetVersion originalVersion) {
+        if (originalVersion == null) {
+            setDatasetVersionDifference(newVersion.getDefaultVersionDifference());
+        } else {
+            setDatasetVersionDifference(new DatasetVersionDifference(newVersion, originalVersion));
+        }
+    }
+
+
+
+
+    private List<DatasetVersion> resetVersionTabList() {
+        //if (true)return null;
+        List<DatasetVersion> retList = new ArrayList<>();
+
+        if (permissionService.on(dataset).has(Permission.ViewUnpublishedDataset)) {
+            for (DatasetVersion version : dataset.getVersions()) {
+                Collection<FileMetadata> fml = version.getFileMetadatas();
+                for (FileMetadata fm : fml) {
+                    fm.setVariableMetadatas(variableService.findVarMetByFileMetaId(fm.getId()));
+                    fm.setVarGroups(variableService.findAllGroupsByFileMetadata(fm.getId()));
+                }
+                version.setContributorNames(datasetVersionService.getContributorsNames(version));
+                retList.add(version);
+            }
+
+        } else {
+            for (DatasetVersion version : dataset.getVersions()) {
+                if (version.isReleased() || version.isDeaccessioned()) {
+                    version.setContributorNames(datasetVersionService.getContributorsNames(version));
+                    retList.add(version);
+                }
+            }
+        }
+        return retList;
+    }
+
 
 
-        
-        // Call Ingest Service one more time, to 
-        // queue the data ingest jobs for asynchronous execution: 
-        ingestService.startIngestJobsForDataset(dataset, (AuthenticatedUser) session.getUser());
+    private boolean existReleasedVersion;
 
-        //After dataset saved, then persist prov json data
-        if(systemConfig.isProvCollectionEnabled()) {
-            try {
-                provPopupFragmentBean.saveStagedProvJson(false, dataset.getLatestVersion().getFileMetadatas());
-            } catch (AbstractApiBean.WrappedResponse ex) {
-                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("file.metadataTab.provenance.error"));
-                Logger.getLogger(DatasetPage.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-        
-        logger.fine("Redirecting to the Dataset page.");
-        
-        return returnToDraftVersion();
+    public boolean isExistReleasedVersion() {
+        return existReleasedVersion;
     }
-    
-    private void populateDatasetUpdateFailureMessage(){
-        if (editMode == null) {
-            // that must have been a bulk file update or delete:
-            if (bulkFileDeleteInProgress) {
-                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileDeleteFailure"));
 
-            } else {
-                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.filesFailure"));
-            }
-        } else {
+    public void setExistReleasedVersion(boolean existReleasedVersion) {
+        this.existReleasedVersion = existReleasedVersion;
+    }
 
-            if (editMode.equals(EditMode.CREATE)) {
-                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.createFailure"));
-            }
-            if (editMode.equals(EditMode.METADATA)) {
-                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.metadataFailure"));
-            }
-            if (editMode.equals(EditMode.LICENSE)) {
-                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.termsFailure"));
+    private boolean resetExistRealeaseVersion(){
+
+        for (DatasetVersion version : dataset.getVersions()) {
+            if (version.isReleased() || version.isArchived()) {
+                return true;
             }
-            if (editMode.equals(EditMode.FILE)) {
-                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.filesFailure"));
+        }
+        return false;
+
+    }
+
+    private List<DatasetVersion> resetReleasedVersionTabList() {
+        List<DatasetVersion> retList = new ArrayList<>();
+        for (DatasetVersion version : dataset.getVersions()) {
+            if (version.isReleased() || version.isArchived()) {
+                retList.add(version);
             }
         }
-        
-        bulkFileDeleteInProgress = false;
+        return retList;
     }
-    
-    private String returnToLatestVersion(){
-         dataset = datasetService.find(dataset.getId());
-         workingVersion = dataset.getLatestVersion();
-         if (workingVersion.isDeaccessioned() && dataset.getReleasedVersion() != null) {
-         workingVersion = dataset.getReleasedVersion();
-         }
-         setVersionTabList(resetVersionTabList()); 
-         setReleasedVersionTabList(resetReleasedVersionTabList());
-         newFiles.clear();
-         editMode = null;         
-         return "/dataset.xhtml?persistentId=" + dataset.getGlobalIdString() + "&version="+ workingVersion.getFriendlyVersionNumber() +  "&faces-redirect=true";       
+
+    public boolean isDisplayPublishPopupCustomText() {
+        if (dataset.isReleased()) {
+            return isDatasetPublishPopupCustomTextOnAllVersions() && !getDatasetPublishCustomText().isEmpty();
+        }
+        return !getDatasetPublishCustomText().isEmpty();
     }
-    
-    private String returnToDatasetOnly(){
-         dataset = datasetService.find(dataset.getId());
-         editMode = null;         
-         return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() +  "&faces-redirect=true";    
+
+    public String getDatasetPublishCustomText(){
+        String datasetPublishCustomText = settingsWrapper.getValueForKey(SettingsServiceBean.Key.DatasetPublishPopupCustomText);
+        if( datasetPublishCustomText!= null && !datasetPublishCustomText.isEmpty()){
+            return datasetPublishCustomText;
+        }
+        return "";
     }
-    
-    private String returnToDraftVersion(){      
-         return "/dataset.xhtml?persistentId=" + dataset.getGlobalIdString() + "&version=DRAFT" + "&faces-redirect=true";    
+
+    public Boolean isDatasetPublishPopupCustomTextOnAllVersions(){
+        return  settingsWrapper.isTrueForKey(SettingsServiceBean.Key.DatasetPublishPopupCustomTextOnAllVersions, false);
     }
 
-    public String cancel() {
-        return  returnToLatestVersion();
+    public String getVariableMetadataURL(Long fileid) {
+        String myHostURL = getDataverseSiteUrl();
+        String metaURL = myHostURL + "/api/meta/datafile/" + fileid;
+
+        return metaURL;
     }
 
-    private HttpClient getClient() {
-        // TODO: 
-        // cache the http client? -- L.A. 4.0 alpha
-        return new HttpClient();
+    public String getTabularDataFileURL(Long fileid) {
+        String myHostURL = getDataverseSiteUrl();
+        String dataURL = myHostURL + "/api/access/datafile/" + fileid;
+
+        return dataURL;
     }
 
-    public void refreshLock() {
-        //RequestContext requestContext = RequestContext.getCurrentInstance();
-        logger.fine("checking lock");
-        if (isStillLocked()) {
-            logger.fine("(still locked)");
-        } else {
-            // OK, the dataset is no longer locked. 
-            // let's tell the page to refresh:
-            logger.fine("no longer locked!");
-            stateChanged = true;
-            lockedFromEditsVar = null;
-            lockedFromDownloadVar = null;
-            //requestContext.execute("refreshPage();");
+    public List< String[]> getExporters(){
+        List<String[]> retList = new ArrayList<>();
+        String myHostURL = getDataverseSiteUrl();
+        for (String [] provider : ExportService.getInstance().getExportersLabels() ){
+            String formatName = provider[1];
+            String formatDisplayName = provider[0];
+
+            Exporter exporter = null;
+            try {
+                exporter = ExportService.getInstance().getExporter(formatName);
+            } catch (ExportException ex) {
+                logger.warning("Failed to get : " + formatName);
+                logger.warning(ex.getLocalizedMessage());
+                exporter = null;
+            }
+            if (exporter != null && exporter.isAvailableToUsers()) {
+                // Not all metadata exports should be presented to the web users!
+                // Some are only for harvesting clients.
+
+                String[] temp = new String[2];
+                temp[0] = formatDisplayName;
+                temp[1] = myHostURL + "/api/datasets/export?exporter=" + formatName + "&persistentId=" + dataset.getGlobalId().asString();
+                retList.add(temp);
+            }
         }
+        return retList;
     }
-    
-    public void refreshIngestLock() {
-        //RequestContext requestContext = RequestContext.getCurrentInstance();
-        logger.fine("checking ingest lock");
-        if (isStillLockedForIngest()) {
-            logger.fine("(still locked)");
-        } else {
-            // OK, the dataset is no longer locked. 
-            // let's tell the page to refresh:
-            logger.fine("no longer locked!");
-            stateChanged = true;
-            lockedFromEditsVar = null;
-            lockedFromDownloadVar = null;
-            //requestContext.execute("refreshPage();");
+
+
+    private FileMetadata fileMetadataSelected = null;
+
+    public void  setFileMetadataSelected(FileMetadata fm){
+       setFileMetadataSelected(fm, null);
+    }
+
+    public void setFileMetadataSelected(FileMetadata fm, String guestbook) {
+        if (guestbook != null) {
+            if (guestbook.equals("create")) {
+                //
+                /*
+                FIX ME guestbook entry for subsetting
+                */
+
+
+
+
+               // guestbookResponseService.createSilentGuestbookEntry(fm, "Subset");
+            } else {
+                initGuestbookResponse(fm, "Subset", null);
+            }
         }
+
+        fileMetadataSelected = fm;
+        logger.fine("set the file for the advanced options popup (" + fileMetadataSelected.getLabel() + ")");
     }
-        
-    public void refreshAllLocks() {
-        //RequestContext requestContext = RequestContext.getCurrentInstance();
-        logger.fine("checking all locks");
-        if (isStillLockedForAnyReason()) {
-            logger.fine("(still locked)");
+
+    public FileMetadata getFileMetadataSelected() {
+        if (fileMetadataSelected != null) {
+            logger.fine("returning file metadata for the advanced options popup (" + fileMetadataSelected.getLabel() + ")");
         } else {
-            // OK, the dataset is no longer locked. 
-            // let's tell the page to refresh:
-            logger.fine("no longer locked!");
-            stateChanged = true;
-            lockedFromEditsVar = null;
-            lockedFromDownloadVar = null;
-            //requestContext.execute("refreshPage();");
+            logger.fine("file metadata for the advanced options popup is null.");
         }
+        return fileMetadataSelected;
     }
 
-    /* 
+    public void clearFileMetadataSelected() {
+        fileMetadataSelected = null;
+    }
 
-    public boolean isLockedInProgress() {
-        if (dataset != null) {
-            logger.log(Level.FINE, "checking lock status of dataset {0}", dataset.getId());
-            if (dataset.isLocked()) {
-                return true;
+    public boolean isDesignatedDatasetThumbnail (FileMetadata fileMetadata) {
+        if (fileMetadata != null) {
+            if (fileMetadata.getDataFile() != null) {
+                if (fileMetadata.getDataFile().getId() != null) {
+                    if (fileMetadata.getDataFile().getOwner() != null) {
+                        if (fileMetadata.getDataFile().equals(fileMetadata.getDataFile().getOwner().getThumbnailFile())) {
+                            return true;
+                        }
+                    }
+                }
             }
         }
         return false;
-    }*/
-    
-    public boolean isDatasetLockedInWorkflow() {
-        return (dataset != null) 
-                ? dataset.isLockedFor(DatasetLock.Reason.Workflow) 
-                : false;
     }
-    
-    public boolean isStillLocked() {
-        
-        if (dataset != null && dataset.getId() != null) {
-            logger.log(Level.FINE, "checking lock status of dataset {0}", dataset.getId());
-            if(dataset.getLocks().size() == 1 && dataset.getLockFor(DatasetLock.Reason.InReview) != null){
-                return false;
-            }
-            if (datasetService.checkDatasetLock(dataset.getId())) {
-                return true;
-            }
-        }
-        return false;
+
+    /*
+     * Items for the "Designated this image as the Dataset thumbnail:
+     */
+
+    private FileMetadata fileMetadataSelectedForThumbnailPopup = null;
+
+    public void  setFileMetadataSelectedForThumbnailPopup(FileMetadata fm){
+       fileMetadataSelectedForThumbnailPopup = fm;
+       alreadyDesignatedAsDatasetThumbnail = getUseAsDatasetThumbnail();
+
     }
-    
-    
-    public boolean isStillLockedForIngest() {
-        if (dataset.getId() != null) {
-            Dataset testDataset = datasetService.find(dataset.getId());
-            if (testDataset != null && testDataset.getId() != null) {
-                logger.log(Level.FINE, "checking lock status of dataset {0}", dataset.getId());
 
-                if (testDataset.getLockFor(DatasetLock.Reason.Ingest) != null) {
-                    return true;
+    public FileMetadata getFileMetadataSelectedForThumbnailPopup() {
+        return fileMetadataSelectedForThumbnailPopup;
+    }
+
+    public void clearFileMetadataSelectedForThumbnailPopup() {
+        fileMetadataSelectedForThumbnailPopup = null;
+    }
+
+    private boolean alreadyDesignatedAsDatasetThumbnail = false;
+
+    public boolean getUseAsDatasetThumbnail() {
+
+        if (fileMetadataSelectedForThumbnailPopup != null) {
+            if (fileMetadataSelectedForThumbnailPopup.getDataFile() != null) {
+                if (fileMetadataSelectedForThumbnailPopup.getDataFile().getId() != null) {
+                    if (fileMetadataSelectedForThumbnailPopup.getDataFile().getOwner() != null) {
+                        if (fileMetadataSelectedForThumbnailPopup.getDataFile().equals(fileMetadataSelectedForThumbnailPopup.getDataFile().getOwner().getThumbnailFile())) {
+                            return true;
+                        }
+                    }
                 }
             }
         }
         return false;
     }
-    
-    public boolean isStillLockedForAnyReason() {
-        if (dataset.getId() != null) {
-            Dataset testDataset = datasetService.find(dataset.getId());
-            if (testDataset != null && testDataset.getId() != null) {
-                logger.log(Level.FINE, "checking lock status of dataset {0}", dataset.getId());
-                if (testDataset.getLocks().size() > 0) {
-                    return true;
+
+
+
+    public void setUseAsDatasetThumbnail(boolean useAsThumbnail) {
+        if (fileMetadataSelectedForThumbnailPopup != null) {
+            if (fileMetadataSelectedForThumbnailPopup.getDataFile() != null) {
+                if (fileMetadataSelectedForThumbnailPopup.getDataFile().getId() != null) { // ?
+                    if (fileMetadataSelectedForThumbnailPopup.getDataFile().getOwner() != null) {
+                        if (useAsThumbnail) {
+                            fileMetadataSelectedForThumbnailPopup.getDataFile().getOwner().setThumbnailFile(fileMetadataSelectedForThumbnailPopup.getDataFile());
+                        } else if (getUseAsDatasetThumbnail()) {
+                            fileMetadataSelectedForThumbnailPopup.getDataFile().getOwner().setThumbnailFile(null);
+                        }
+                    }
                 }
             }
         }
-        return false;
     }
-    
-    public boolean isLocked() {
-        if (stateChanged) {
-            return false; 
+
+    public void saveAsDesignatedThumbnail() {
+        // We don't need to do anything specific to save this setting, because
+        // the setUseAsDatasetThumbnail() method, above, has already updated the
+        // file object appropriately.
+        // However, once the "save" button is pressed, we want to show a success message, if this is
+        // a new image has been designated as such:
+        if (getUseAsDatasetThumbnail() && !alreadyDesignatedAsDatasetThumbnail) {
+            String successMessage = BundleUtil.getStringFromBundle("file.assignedDataverseImage.success");
+            logger.fine(successMessage);
+            successMessage = successMessage.replace("{0}", fileMetadataSelectedForThumbnailPopup.getLabel());
+            JsfHelper.addFlashMessage(successMessage);
         }
-        
-        if (dataset != null) {
-            if (dataset.isLocked()) {
-                return true;
-            }
+
+        // And reset the selected fileMetadata:
+
+        fileMetadataSelectedForThumbnailPopup = null;
+    }
+
+    /*
+     * Items for the "Tags (Categories)" popup.
+     *
+     */
+    private FileMetadata fileMetadataSelectedForTagsPopup = null;
+
+    public void  setFileMetadataSelectedForTagsPopup(){
+
+    }
+
+    public void  setFileMetadataSelectedForTagsPopup(FileMetadata fm){
+       fileMetadataSelectedForTagsPopup = fm;
+    }
+
+    public FileMetadata getFileMetadataSelectedForTagsPopup() {
+        return fileMetadataSelectedForTagsPopup;
+    }
+
+    public void clearFileMetadataSelectedForTagsPopup() {
+        fileMetadataSelectedForTagsPopup = null;
+    }
+
+    public List <FileMetadata> getListFileMetadataSelectedForTagsPopup(){
+        List<FileMetadata> retList = new ArrayList<>();
+        for (FileMetadata fm : selectedFiles){
+            retList.add(fm);
         }
-        return false;
+        return retList;
     }
-    
-    public boolean isLockedForIngest() {
-        if (dataset.getId() != null) {
-            Dataset testDataset = datasetService.find(dataset.getId());
-            if (stateChanged) {
-                return false;
-            }
 
-            if (testDataset != null) {
-                if (testDataset.getLockFor(DatasetLock.Reason.Ingest) != null) {
-                    return true;
-                }
-            }
+    private List<String> categoriesByName;
+
+    public void setCategoriesByName(List<String>  dummy){
+        categoriesByName = dummy;
+    }
+
+    public void refreshTagsPopUp(){
+        if(!isHasValidTermsOfAccess()){
+                this.editMode = EditMode.LICENSE;
+                PrimeFaces.current().executeScript("PF('blockDatasetForm').show()");
+                PrimeFaces.current().executeScript("PF('accessPopup').show()");
+                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editTerms.label"), BundleUtil.getStringFromBundle("dataset.message.editTerms.message"));
+                this.readOnly = false;
+                return; 
         }
-        return false;
+        
+        if (workingVersion.isReleased()) {
+            refreshSelectedFiles(selectedFiles);
+        }
+        updateFileCounts();
+        refreshCategoriesByName();        
+        
+        refreshTabFileTagsByName();
+        PrimeFaces.current().executeScript("PF('fileTagsPopup').show()");
     }
-    
-    public boolean isLockedForAnyReason() {
-        if (dataset.getId() != null) {
-            Dataset testDataset = datasetService.find(dataset.getId());
-            if (stateChanged) {
-                return false;
-            }
 
-            if (testDataset != null) {
-                if (testDataset.getLocks().size() > 0) {
-                    return true;
-                }
-            }
+    private List<String> tabFileTagsByName;
+
+    public List<String> getTabFileTagsByName() {
+        return tabFileTagsByName;
+    }
+
+    public void setTabFileTagsByName(List<String> tabFileTagsByName) {
+        this.tabFileTagsByName = tabFileTagsByName;
+    }
+
+    private void refreshCategoriesByName(){
+        categoriesByName= new ArrayList<>();
+        List<String> datasetFileCategories = dataFileCategoryService.mergeDatasetFileCategories(dataset.getCategories());
+        for (String category: datasetFileCategories ){
+            categoriesByName.add(category);
         }
-        return false;
+        refreshSelectedTags();
     }
 
-    private Boolean lockedFromEditsVar;
-    private Boolean lockedFromDownloadVar;    
-    private boolean lockedDueToDcmUpload;
-    private Boolean lockedDueToIngestVar;
-    /**
-     * Authors are not allowed to edit but curators are allowed - when Dataset is inReview
-     * For all other locks edit should be locked for all editors.
+
+
+
+    public List<String> getCategoriesByName() {
+            return categoriesByName;
+    }
+
+    /*
+     * 1. Tabular File Tags:
      */
-    public boolean isLockedFromEdits() {
-        if(null == lockedFromEditsVar || stateChanged) {
-            try {
-                permissionService.checkEditDatasetLock(dataset, dvRequestService.getDataverseRequest(), new UpdateDatasetVersionCommand(dataset, dvRequestService.getDataverseRequest()));
-                lockedFromEditsVar = false;
-            } catch (IllegalCommandException ex) {
-                lockedFromEditsVar = true;
-            }
+
+    private List<String> tabFileTags = null;
+
+    public List<String> getTabFileTags() {
+        if (tabFileTags == null) {
+            tabFileTags = DataFileTag.listTags();
         }
-        return lockedFromEditsVar;
+        return tabFileTags;
     }
-    
-    /**
-    Need to save ingest lock state to display success later.
-     */
-    public boolean isLockedDueToIngest() {
-        if(null == lockedDueToIngestVar || stateChanged) {
-               lockedDueToIngestVar = isLockedForIngest();
+
+    public void setTabFileTags(List<String> tabFileTags) {
+        this.tabFileTags = tabFileTags;
+    }
+
+    private String[] selectedTabFileTags = {};
+
+    public String[] getSelectedTabFileTags() {
+        return selectedTabFileTags;
+    }
+
+    public void setSelectedTabFileTags(String[] selectedTabFileTags) {
+        this.selectedTabFileTags = selectedTabFileTags;
+    }
+
+    private String[] selectedTags = {};
+
+    public void handleSelection(final AjaxBehaviorEvent event) {
+        if (selectedTags != null) {
+            selectedTags = selectedTags.clone();
         }
-        return lockedFromEditsVar;
     }
-    
-    
-    // TODO: investigate why this method was needed in the first place?
-    // It appears that it was written under the assumption that downloads 
-    // should not be allowed when a dataset is locked... (why?)
-    // There are calls to the method throghout the file-download-buttons fragment; 
-    // except the way it's done there, it's actually disregarded (??) - so the 
-    // download buttons ARE always enabled. The only place where this method is 
-    // honored is on the batch (mutliple file) download buttons in filesFragment.xhtml. 
-    // As I'm working on #4000, I've been asked to re-enable the batch download 
-    // buttons there as well, even when the dataset is locked. I'm doing that - but 
-    // I feel we should probably figure out why we went to the trouble of creating 
-    // this code in the first place... is there some reason we are forgetting now, 
-    // why we do actually want to disable downloads on locked datasets??? 
-    // -- L.A. Aug. 2018
-    public boolean isLockedFromDownload(){
-        if(null == lockedFromDownloadVar || stateChanged) {
-            try {
-                permissionService.checkDownloadFileLock(dataset, dvRequestService.getDataverseRequest(), new CreateNewDatasetCommand(dataset, dvRequestService.getDataverseRequest()));
-                lockedFromDownloadVar = false;
-            } catch (IllegalCommandException ex) {
-                lockedFromDownloadVar = true;
-                return true;
+
+    public void handleCVVSelection(final AjaxBehaviorEvent event) {
+        //Dummy method for AJAX update of items selected
+    }
+
+
+    private void refreshTabFileTagsByName(){
+
+        tabFileTagsByName= new ArrayList<>();
+        for (FileMetadata fm : selectedFiles) {
+            if (fm.getDataFile().getTags() != null) {
+                for (int i = 0; i < fm.getDataFile().getTags().size(); i++) {
+                    if (!tabFileTagsByName.contains(fm.getDataFile().getTags().get(i).getTypeLabel())) {
+                        tabFileTagsByName.add(fm.getDataFile().getTags().get(i).getTypeLabel());
+                    }
+                }
             }
         }
-        return lockedFromDownloadVar;
+        refreshSelectedTabFileTags();
     }
 
-    public boolean isLockedDueToDcmUpload() {
-        return lockedDueToDcmUpload;
+    private void refreshSelectedTabFileTags() {
+        selectedTabFileTags = null;
+        selectedTabFileTags = new String[0];
+        if (tabFileTagsByName.size() > 0) {
+            selectedTabFileTags = new String[tabFileTagsByName.size()];
+            for (int i = 0; i < tabFileTagsByName.size(); i++) {
+                selectedTabFileTags[i] = tabFileTagsByName.get(i);
+            }
+        }
+        Arrays.sort(selectedTabFileTags);
     }
 
-    public void setLocked(boolean locked) {
-        // empty method, so that we can use DatasetPage.locked in a hidden 
-        // input on the page. 
-    }
-    
-    public void setLockedForIngest(boolean locked) {
-        // empty method, so that we can use DatasetPage.locked in a hidden 
-        // input on the page. 
+    private boolean tabularDataSelected = false;
+
+    public boolean isTabularDataSelected() {
+        return tabularDataSelected;
     }
-    
-    public void setLockedForAnyReason(boolean locked) {
-        // empty method, so that we can use DatasetPage.locked in a hidden 
-        // input on the page. 
+
+    public void setTabularDataSelected(boolean tabularDataSelected) {
+        this.tabularDataSelected = tabularDataSelected;
     }
-    
-    public boolean isStateChanged() {
-        return stateChanged;
+
+    public String[] getSelectedTags() {
+
+        return selectedTags;
     }
-    
-    public void setStateChanged(boolean stateChanged) {
-        // empty method, so that we can use DatasetPage.stateChanged in a hidden 
-        // input on the page. 
+
+    public void setSelectedTags(String[] selectedTags) {
+        this.selectedTags = selectedTags;
     }
 
-    public DatasetVersionUI getDatasetVersionUI() {
-        return datasetVersionUI;
+    /*
+     * "File Tags" (aka "File Categories"):
+    */
+
+    private String newCategoryName = null;
+
+    public String getNewCategoryName() {
+        return newCategoryName;
     }
 
-    
-    public List<DatasetVersion> getVersionTabList() {
-        return versionTabList;
+    public void setNewCategoryName(String newCategoryName) {
+        this.newCategoryName = newCategoryName;
     }
-    
-    public List<DatasetVersion> getVersionTabListForPostLoad(){
-        return this.versionTabListForPostLoad;
+
+    public String saveNewCategory() {
+        if (newCategoryName != null && !newCategoryName.isEmpty()) {
+            categoriesByName.add(newCategoryName);
+        }
+        //Now increase size of selectedTags and add new category
+        String[] temp = new String[selectedTags.length + 1];
+        System.arraycopy(selectedTags, 0, temp, 0, selectedTags.length);
+        selectedTags = temp;
+        selectedTags[selectedTags.length - 1] = newCategoryName;
+        //Blank out added category
+        newCategoryName = "";
+        return "";
     }
 
-    public void setVersionTabListForPostLoad(List<DatasetVersion> versionTabListForPostLoad) {
+    private void refreshSelectedTags() {
+        selectedTags = null;
+        selectedTags = new String[0];
+
+        List<String> selectedCategoriesByName= new ArrayList<>();
+        for (FileMetadata fm : selectedFiles) {
+            if (fm.getCategories() != null) {
+                for (int i = 0; i < fm.getCategories().size(); i++) {
+                    if (!selectedCategoriesByName.contains(fm.getCategories().get(i).getName())) {
+                    selectedCategoriesByName.add(fm.getCategories().get(i).getName());
+                    }
+
+                }
 
-        this.versionTabListForPostLoad = versionTabListForPostLoad;
-    }
-    
-    public Integer getCompareVersionsCount() {
-        Integer retVal = 0;
-        for (DatasetVersion dvTest : dataset.getVersions()) {
-            if (!dvTest.isDeaccessioned()) {
-                retVal++;
             }
         }
-        return retVal;
+
+        if (selectedCategoriesByName.size() > 0) {
+            selectedTags = new String[selectedCategoriesByName.size()];
+            for (int i = 0; i < selectedCategoriesByName.size(); i++) {
+                selectedTags[i] = selectedCategoriesByName.get(i);
+            }
+        }
+        Arrays.sort(selectedTags);
     }
-    
-    /**
-     * To improve performance, Version Differences
-     * are retrieved/calculated after the page load
-     * 
-     * See: dataset-versions.xhtml, remoteCommand 'postLoadVersionTablList'
-    */
-    public void postLoadSetVersionTabList(){
 
-        if (this.getVersionTabList().isEmpty() && workingVersion.isDeaccessioned()){
-            setVersionTabList(resetVersionTabList());
+    /* This method handles saving both "tabular file tags" and
+     * "file categories" (which are also considered "tags" in 4.0)
+    */
+    public String saveFileTagsAndCategories() {
+        // 1. New Category name:
+        // With we don't need to do anything for the file categories that the user
+        // selected from the pull down list; that was done directly from the
+        // page with the FileMetadata.setCategoriesByName() method.
+        // So here we only need to take care of the new, custom category
+        // name, if entered:
+        if (workingVersion.isReleased()) {
+            refreshSelectedFiles(selectedFiles);
         }
-        
-        this.setVersionTabListForPostLoad(this.getVersionTabList());
-        
+        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+            if (selectedFiles != null && selectedFiles.size() > 0) {
+                for (FileMetadata fm : selectedFiles) {
+                    if (fm.getDataFile().equals(fmd.getDataFile())) {
+                        fmd.setCategories(new ArrayList<>());
+                        if (newCategoryName != null) {
+                            fmd.addCategoryByName(newCategoryName);
+                        }
+                        // 2. Tabular DataFile Tags:
+                        if (selectedTags != null) {
+                            for (String selectedTag : selectedTags) {
+                                fmd.addCategoryByName(selectedTag);
+                            }
+                        }
+                        if (fmd.getDataFile().isTabularData()) {
+                            fmd.getDataFile().setTags(null);
+                            for (String selectedTabFileTag : selectedTabFileTags) {
+                                DataFileTag tag = new DataFileTag();
+                                try {
+                                    tag.setTypeByLabel(selectedTabFileTag);
+                                    tag.setDataFile(fmd.getDataFile());
+                                    fmd.getDataFile().addTag(tag);
+                                }catch (IllegalArgumentException iax) {
+                                    // ignore
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+               // success message:
+                String successMessage = BundleUtil.getStringFromBundle("file.assignedTabFileTags.success");
+                logger.fine(successMessage);
+                successMessage = successMessage.replace("{0}", "Selected Files");
+                JsfHelper.addFlashMessage(successMessage);
+         selectedTags = null;
 
-        //this.versionTabList = this.resetVersionTabList();        
-    }
+        logger.fine("New category name: " + newCategoryName);
 
-    /**
-     * 
-     * 
-     * @param versionTabList 
-     */
-    public void setVersionTabList(List<DatasetVersion> versionTabList) {
-        
-        this.versionTabList = versionTabList;
+        newCategoryName = null;
+
+        if (removeUnusedTags){
+            removeUnusedFileTagsFromDataset();
+        }
+        save();
+        return  returnToDraftVersion();
     }
 
-    private List<DatasetVersion> releasedVersionTabList = new ArrayList<>();
+    /*
+    Remove unused file tags
+    When updating datafile tags see if any custom tags are not in use.
+    Remove them
 
-    public List<DatasetVersion> getReleasedVersionTabList() {
-        return releasedVersionTabList;
-    }
+    */
+    private void removeUnusedFileTagsFromDataset() {
+        categoriesByName = new ArrayList<>();
+        for (FileMetadata fm : workingVersion.getFileMetadatas()) {
+            if (fm.getCategories() != null) {
+                for (int i = 0; i < fm.getCategories().size(); i++) {
+                    if (!categoriesByName.contains(fm.getCategories().get(i).getName())) {
+                        categoriesByName.add(fm.getCategories().get(i).getName());
+                    }
+                }
+            }
+        }
+        List<DataFileCategory> datasetFileCategoriesToRemove = new ArrayList<>();
 
-    public void setReleasedVersionTabList(List<DatasetVersion> releasedVersionTabList) {
-        this.releasedVersionTabList = releasedVersionTabList;
-    }
+        for (DataFileCategory test : dataset.getCategories()) {
+            boolean remove = true;
+            for (String catByName : categoriesByName) {
+                if (catByName.equals(test.getName())) {
+                    remove = false;
+                    break;
+                }
+            }
+            if (remove) {
+                datasetFileCategoriesToRemove.add(test);
+            }
+        }
 
-    private List<DatasetVersion> selectedVersions;
+        if (!datasetFileCategoriesToRemove.isEmpty()) {
+            for (DataFileCategory remove : datasetFileCategoriesToRemove) {
+                dataset.getCategories().remove(remove);
+            }
 
-    public List<DatasetVersion> getSelectedVersions() {
-        return selectedVersions;
-    }
+        }
 
-    public void setSelectedVersions(List<DatasetVersion> selectedVersions) {
-        this.selectedVersions = selectedVersions;
     }
 
-    private List<DatasetVersion> selectedDeaccessionVersions;
 
-    public List<DatasetVersion> getSelectedDeaccessionVersions() {
-        return selectedDeaccessionVersions;
-    }
+    /*
+     * Items for the "Advanced (Ingest) Options" popup.
+     *
+     */
+    private FileMetadata fileMetadataSelectedForIngestOptionsPopup = null;
 
-    public void setSelectedDeaccessionVersions(List<DatasetVersion> selectedDeaccessionVersions) {
-        this.selectedDeaccessionVersions = selectedDeaccessionVersions;
+    public void  setFileMetadataSelectedForIngestOptionsPopup(FileMetadata fm){
+       fileMetadataSelectedForIngestOptionsPopup = fm;
     }
 
-    public DatasetVersionDifference getDatasetVersionDifference() {
-        return datasetVersionDifference;
+    public FileMetadata getFileMetadataSelectedForIngestOptionsPopup() {
+        return fileMetadataSelectedForIngestOptionsPopup;
     }
 
-    public void setDatasetVersionDifference(DatasetVersionDifference datasetVersionDifference) {
-        this.datasetVersionDifference = datasetVersionDifference;
-    }
-        
-    public void startMultipleFileDownload (){
-        
-        boolean doNotSaveGuestbookResponse = workingVersion.isDraft();
-        // There's a chance that this is not really a batch download - i.e., 
-        // there may only be one file on the downloadable list. But the fileDownloadService 
-        // method below will check for that, and will redirect to the single download, if
-        // that's the case. -- L.A.
-        fileDownloadService.writeGuestbookAndStartBatchDownload(guestbookResponse, doNotSaveGuestbookResponse);
+    public void clearFileMetadataSelectedForIngestOptionsPopup() {
+        fileMetadataSelectedForIngestOptionsPopup = null;
     }
- 
-    private String downloadType = "";
 
-    public String getDownloadType() {
-        return downloadType;
-    }
+    private String ingestLanguageEncoding = null;
 
-    public void setDownloadType(String downloadType) {
-        this.downloadType = downloadType;
-    }
-    
-    
-    public void openDownloadPopupForMultipleFileDownload() {
-        if (this.selectedFiles.isEmpty()) {
-            //RequestContext requestContext = RequestContext.getCurrentInstance();
-            PrimeFaces.current().executeScript("PF('selectFilesForDownload').show()");
-            return;
+    public String getIngestLanguageEncoding() {
+        if (ingestLanguageEncoding == null) {
+            return "UTF8 (default)";
         }
-        
-        // There's a chance that this is not really a batch download - i.e., 
-        // there may only be one file on the downloadable list. But the fileDownloadService 
-        // method below will check for that, and will redirect to the single download, if
-        // that's the case. -- L.A.
-        
-        this.guestbookResponse.setDownloadtype("Download");
-        //RequestContext requestContext = RequestContext.getCurrentInstance();
-        PrimeFaces.current().executeScript("PF('downloadPopup').show();handleResizeDialog('downloadPopup');");
+        return ingestLanguageEncoding;
     }
-    
-    public void initGuestbookMultipleResponse(String selectedFileIds){
-         initGuestbookResponse(null, "download", selectedFileIds);
+
+    public void setIngestLanguageEncoding(String ingestLanguageEncoding) {
+        this.ingestLanguageEncoding = ingestLanguageEncoding;
     }
 
-    public void initGuestbookResponse(FileMetadata fileMetadata, String downloadFormat, String selectedFileIds) {
-        
-        this.guestbookResponse = guestbookResponseService.initGuestbookResponse(fileMetadata, downloadFormat, selectedFileIds, session);
+    public void setIngestEncoding(String ingestEncoding) {
+        ingestLanguageEncoding = ingestEncoding;
     }
 
+    private String savedLabelsTempFile = null;
 
+    public void handleLabelsFileUpload(FileUploadEvent event) {
+        logger.fine("entering handleUpload method.");
+        UploadedFile file = event.getFile();
 
-    public void compareVersionDifferences() {
-        //RequestContext requestContext = RequestContext.getCurrentInstance();
-        if (this.selectedVersions.size() != 2) {
-            PrimeFaces.current().executeScript("openCompareTwo();");
-        } else {
-            //order depends on order of selection - needs to be chronological order
-            if (this.selectedVersions.get(0).getId().intValue() > this.selectedVersions.get(1).getId().intValue()) {
-                updateVersionDifferences(this.selectedVersions.get(0), this.selectedVersions.get(1));
-            } else {
-                updateVersionDifferences(this.selectedVersions.get(1), this.selectedVersions.get(0));
+        if (file != null) {
+
+            InputStream uploadStream = null;
+            try {
+                uploadStream = file.getInputStream();
+            } catch (IOException ioex) {
+                logger.log(Level.WARNING, ioex, ()->"the file "+file.getFileName()+" failed to upload!");
+                List<String> args = Arrays.asList(file.getFileName());
+                String msg = BundleUtil.getStringFromBundle("dataset.file.uploadFailure.detailmsg", args);
+                FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.file.uploadFailure"), msg);
+                FacesContext.getCurrentInstance().addMessage(null, message);
+                return;
             }
+
+            savedLabelsTempFile = saveTempFile(uploadStream);
+
+            logger.fine(()->file.getFileName() + " is successfully uploaded.");
+            List<String> args = Arrays.asList(file.getFileName());
+            FacesMessage message = new FacesMessage(BundleUtil.getStringFromBundle("dataset.file.upload", args));
+            FacesContext.getCurrentInstance().addMessage(null, message);
         }
+
+        // process file (i.e., just save it in a temp location; for now):
     }
 
-    public void updateVersionDifferences(DatasetVersion newVersion, DatasetVersion originalVersion) {
-        if (originalVersion == null) {
-            setDatasetVersionDifference(newVersion.getDefaultVersionDifference());
-        } else {
-            setDatasetVersionDifference(new DatasetVersionDifference(newVersion, originalVersion));
+    private String saveTempFile(InputStream input) {
+        if (input == null) {
+            return null;
+        }
+        byte[] buffer = new byte[8192];
+        int bytesRead = 0;
+        File labelsFile = null;
+        FileOutputStream output = null;
+        try {
+            labelsFile = File.createTempFile("tempIngestLabels.", ".txt");
+            output = new FileOutputStream(labelsFile);
+            while ((bytesRead = input.read(buffer)) > -1) {
+                output.write(buffer, 0, bytesRead);
+            }
+        } catch (IOException ioex) {
+            return null;//leaving this purely in the spirit of minimizing changes.
+        } finally {
+            IOUtils.closeQuietly(input);
+            IOUtils.closeQuietly(output);
+        }
+        if (labelsFile != null) {
+            return labelsFile.getAbsolutePath();
         }
+        return null;
     }
-    
-    
-    
 
-    private List<DatasetVersion> resetVersionTabList() {
-        //if (true)return null;
-        List<DatasetVersion> retList = new ArrayList<>();
+    public void saveAdvancedOptions() {
+
+        // Language encoding for SPSS SAV (and, possibly, other tabular ingests:)
+        if (ingestLanguageEncoding != null) {
+            if (fileMetadataSelectedForIngestOptionsPopup != null && fileMetadataSelectedForIngestOptionsPopup.getDataFile() != null) {
+                if (fileMetadataSelectedForIngestOptionsPopup.getDataFile().getIngestRequest() == null) {
+                    IngestRequest ingestRequest = new IngestRequest();
+                    ingestRequest.setDataFile(fileMetadataSelectedForIngestOptionsPopup.getDataFile());
+                    fileMetadataSelectedForIngestOptionsPopup.getDataFile().setIngestRequest(ingestRequest);
 
-        if (permissionService.on(dataset).has(Permission.ViewUnpublishedDataset)) {
-            for (DatasetVersion version : dataset.getVersions()) {
-                Collection<FileMetadata> fml = version.getFileMetadatas();
-                for (FileMetadata fm : fml) {
-                    fm.setVariableMetadatas(variableService.findVarMetByFileMetaId(fm.getId()));
-                    fm.setVarGroups(variableService.findAllGroupsByFileMetadata(fm.getId()));
                 }
-                version.setContributorNames(datasetVersionService.getContributorsNames(version));
-                retList.add(version);
+                fileMetadataSelectedForIngestOptionsPopup.getDataFile().getIngestRequest().setTextEncoding(ingestLanguageEncoding);
             }
+        }
+        ingestLanguageEncoding = null;
 
-        } else {
-            for (DatasetVersion version : dataset.getVersions()) {
-                if (version.isReleased() || version.isDeaccessioned()) {
-                    version.setContributorNames(datasetVersionService.getContributorsNames(version));
-                    retList.add(version);
+        // Extra labels for SPSS POR (and, possibly, other tabular ingests:)
+        // (we are adding this parameter to the IngestRequest now, instead of back
+        // when it was uploaded. This is because we want the user to be able to
+        // hit cancel and bail out, until they actually click 'save' in the
+        // "advanced options" popup) -- L.A. 4.0 beta 11
+        if (savedLabelsTempFile != null) {
+            if (fileMetadataSelectedForIngestOptionsPopup != null && fileMetadataSelectedForIngestOptionsPopup.getDataFile() != null) {
+                if (fileMetadataSelectedForIngestOptionsPopup.getDataFile().getIngestRequest() == null) {
+                    IngestRequest ingestRequest = new IngestRequest();
+                    ingestRequest.setDataFile(fileMetadataSelectedForIngestOptionsPopup.getDataFile());
+                    fileMetadataSelectedForIngestOptionsPopup.getDataFile().setIngestRequest(ingestRequest);
                 }
+                fileMetadataSelectedForIngestOptionsPopup.getDataFile().getIngestRequest().setLabelsFile(savedLabelsTempFile);
             }
         }
-        return retList;
+        savedLabelsTempFile = null;
+
+        fileMetadataSelectedForIngestOptionsPopup = null;
     }
 
+    private Boolean downloadButtonAvailable = null;
 
-    
-    private boolean existReleasedVersion;
+    public boolean isDownloadButtonAvailable(){
 
-    public boolean isExistReleasedVersion() {
-        return existReleasedVersion;
-    }
+        if (downloadButtonAvailable != null) {
+            return downloadButtonAvailable;
+        }
 
-    public void setExistReleasedVersion(boolean existReleasedVersion) {
-        this.existReleasedVersion = existReleasedVersion;
+        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+            if (this.fileDownloadHelper.canDownloadFile(fmd)) {
+                downloadButtonAvailable = true;
+                return true;
+            }
+        }
+        downloadButtonAvailable = false;
+        return false;
     }
-    
-    private boolean resetExistRealeaseVersion(){
 
-        for (DatasetVersion version : dataset.getVersions()) {
-            if (version.isReleased() || version.isArchived()) {
+    public boolean isFileAccessRequestMultiButtonRequired(){
+        if (!isSessionUserAuthenticated() || !dataset.isFileAccessRequest()){
+            return false;
+        }
+        if (workingVersion == null) {
+            return false;
+        }
+        if (!workingVersion.getTermsOfUseAndAccess().isFileAccessRequest()){
+           // return false;
+        }
+        for (FileMetadata fmd : workingVersion.getFileMetadatas()){
+            AuthenticatedUser authenticatedUser = (AuthenticatedUser) session.getUser();
+            //Change here so that if all restricted files have pending requests there's no Request Button
+            if ((!this.fileDownloadHelper.canDownloadFile(fmd) && !fmd.getDataFile().containsActiveFileAccessRequestFromUser(authenticatedUser))) {
                 return true;
             }
         }
         return false;
-        
     }
 
-    private List<DatasetVersion> resetReleasedVersionTabList() {
-        List<DatasetVersion> retList = new ArrayList<>();
-        for (DatasetVersion version : dataset.getVersions()) {
-            if (version.isReleased() || version.isArchived()) {
-                retList.add(version);
+    public boolean isFileAccessRequestMultiButtonEnabled(){
+        if (!isSessionUserAuthenticated() || !dataset.isFileAccessRequest()){
+            return false;
+        }
+        //populate file lists
+        filterSelectedFiles();
+        
+        if( this.selectedRestrictedFiles == null || this.selectedRestrictedFiles.isEmpty() ){
+            return false;
+        }
+        for (FileMetadata fmd : this.selectedRestrictedFiles){
+            if (!this.fileDownloadHelper.canDownloadFile(fmd)){
+                return true;
             }
         }
-        return retList;
+        return false;
     }
 
-    public String getDatasetPublishCustomText(){
-        String datasetPublishCustomText = settingsWrapper.getValueForKey(SettingsServiceBean.Key.DatasetPublishPopupCustomText);
-        if( datasetPublishCustomText!= null && !datasetPublishCustomText.isEmpty()){
-            return datasetPublishCustomText;
-            
+    public boolean isFileAccessRequestMultiSignUpButtonRequired(){
+        if (isSessionUserAuthenticated()){
+            return false;
         }
-        return "";
-    }
-    
-    public Boolean isDatasetPublishPopupCustomTextOnAllVersions(){
-        return  settingsWrapper.isTrueForKey(SettingsServiceBean.Key.DatasetPublishPopupCustomTextOnAllVersions, false);
+        // only show button if dataset allows an access request
+        if (!dataset.isFileAccessRequest()){
+            return false;
+        }
+        for (FileMetadata fmd : workingVersion.getFileMetadatas()){
+            if (!this.fileDownloadHelper.canDownloadFile(fmd) && !FileUtil.isActivelyEmbargoed(fmd)){
+                return true;
+            }
+        }
+        return false;
     }
 
-    public String getVariableMetadataURL(Long fileid) {
-        String myHostURL = getDataverseSiteUrl();
-        String metaURL = myHostURL + "/api/meta/datafile/" + fileid;
+    public boolean isFileAccessRequestMultiSignUpButtonEnabled(){
+        if (isSessionUserAuthenticated()){
+            return false;
+        }
+        if( this.selectedRestrictedFiles == null || this.selectedRestrictedFiles.isEmpty() ){
+            return false;
+        }
+        // only show button if dataset allows an access request
+        if (!dataset.isFileAccessRequest()){
+            return false;
+        }
+        for (FileMetadata fmd : this.selectedRestrictedFiles){
+            if (!this.fileDownloadHelper.canDownloadFile(fmd) && !FileUtil.isActivelyEmbargoed(fmd)){
+                return true;
+            }
+        }
+        return false;
+    }
 
-        return metaURL;
+    public boolean isDownloadPopupRequired() {
+        return FileUtil.isDownloadPopupRequired(workingVersion);
     }
 
-    public String getTabularDataFileURL(Long fileid) {
-        String myHostURL = getDataverseSiteUrl();
-        String dataURL = myHostURL + "/api/access/datafile/" + fileid;
+    public boolean isRequestAccessPopupRequired() {
+        return FileUtil.isRequestAccessPopupRequired(workingVersion);
+    }
+    
+    public boolean isGuestbookAndTermsPopupRequired() {  
+        return FileUtil.isGuestbookAndTermsPopupRequired(workingVersion);
+    }
 
-        return dataURL;
+    public boolean isGuestbookPopupRequired(){
+        return FileUtil.isGuestbookPopupRequired(workingVersion);
     }
+    
+    public boolean isTermsPopupRequired(){
+        return FileUtil.isTermsPopupRequired(workingVersion);
+    }
+    
+    public boolean isGuestbookPopupRequiredAtDownload(){
+        // Only show guestbookAtDownload if guestbook at request is disabled (legacy behavior)
+        return isGuestbookPopupRequired() && !workingVersion.getDataset().getEffectiveGuestbookEntryAtRequest();
+    }
+    
+    public String requestAccessMultipleFiles() {
 
-    public List< String[]> getExporters(){
-        List<String[]> retList = new ArrayList<>();
-        String myHostURL = getDataverseSiteUrl();
-        for (String [] provider : ExportService.getInstance(settingsService).getExportersLabels() ){
-            String formatName = provider[1];
-            String formatDisplayName = provider[0];
-            
-            Exporter exporter = null; 
-            try {
-                exporter = ExportService.getInstance(settingsService).getExporter(formatName);
-            } catch (ExportException ex) {
-                exporter = null;
+        if (selectedFiles.isEmpty()) {
+            //RequestContext requestContext = RequestContext.getCurrentInstance();
+            PrimeFaces.current().executeScript("PF('selectFilesForRequestAccess').show()");
+            return "";
+        } else if (containsOnlyActivelyEmbargoedFiles(selectedFiles)){
+            PrimeFaces.current().executeScript("PF('selectEmbargoedFilesForRequestAccess').show()");
+            return "";
+        } else {
+            fileDownloadHelper.clearRequestAccessFiles();
+            for (FileMetadata fmd : selectedFiles){
+                 fileDownloadHelper.addMultipleFilesForRequestAccess(fmd.getDataFile());
             }
-            if (exporter != null && exporter.isAvailableToUsers()) {
-                // Not all metadata exports should be presented to the web users!
-                // Some are only for harvesting clients.
-                
-                String[] temp = new String[2];            
-                temp[0] = formatDisplayName;
-                temp[1] = myHostURL + "/api/datasets/export?exporter=" + formatName + "&persistentId=" + dataset.getGlobalIdString();
-                retList.add(temp);
+            if (isGuestbookAndTermsPopupRequired()) {
+                //RequestContext requestContext = RequestContext.getCurrentInstance();
+                PrimeFaces.current().executeScript("PF('guestbookAndTermsPopup').show()"); //the popup will call writeGuestbookAndRequestAccess();
+                return "";
+            }else {
+                //No popup required
+                fileDownloadHelper.requestAccessIndirect();
+                return "";
             }
         }
-        return retList;  
     }
-    
 
-    private FileMetadata fileMetadataSelected = null;
+    public boolean isSortButtonEnabled() {
+        /**
+         * @todo The "Sort" Button seems to stop responding to mouse clicks
+         * after a while so it can't be shipped in 4.2 and will be deferred, to
+         * be picked up in https://github.com/IQSS/dataverse/issues/2506
+         */
+        return false;
+    }
 
-    public void  setFileMetadataSelected(FileMetadata fm){
-       setFileMetadataSelected(fm, null); 
+    /*public void updateFileListing(String fileSortField, String fileSortOrder) {
+        this.fileSortField = fileSortField;
+        this.fileSortOrder = fileSortOrder;
+        fileMetadatas = populateFileMetadatas();
     }
-    
-    public void setFileMetadataSelected(FileMetadata fm, String guestbook) {
-        if (guestbook != null) {
-            if (guestbook.equals("create")) {
-                //
-                /*
-                FIX ME guestbook entry for subsetting
-                */
-                
-                
-                
-                
-               // guestbookResponseService.createSilentGuestbookEntry(fm, "Subset");
-            } else {
-                initGuestbookResponse(fm, "Subset", null);
+
+    private List<FileMetadata> populateFileMetadatas() {
+        if (isSortButtonEnabled()) {
+            List<FileMetadata> fileMetadatasToSet = new ArrayList<>();
+            Long datasetVersion = workingVersion.getId();
+            if (datasetVersion != null) {
+                int unlimited = 0;
+                int maxResults = unlimited;
+                List<FileMetadata> dataFilesNew = datafileService.findFileMetadataByDatasetVersionId(datasetVersion, maxResults, fileSortField, fileSortOrder);
+                fileMetadatasToSet.addAll(dataFilesNew);
             }
+            return fileMetadatasToSet;
+        } else {
+            return new ArrayList<>();
         }
+    }*/
 
-        fileMetadataSelected = fm;
-        logger.fine("set the file for the advanced options popup (" + fileMetadataSelected.getLabel() + ")");
+    public String getFileSortField() {
+        return fileSortField;
     }
 
-    public FileMetadata getFileMetadataSelected() {
-        if (fileMetadataSelected != null) {
-            logger.fine("returning file metadata for the advanced options popup (" + fileMetadataSelected.getLabel() + ")");
-        } else {
-            logger.fine("file metadata for the advanced options popup is null.");
-        }
-        return fileMetadataSelected;
+    public void setFileSortField(String fileSortField) {
+        this.fileSortField = fileSortField;
     }
 
-    public void clearFileMetadataSelected() {
-        fileMetadataSelected = null;
-    }
-    
-    public boolean isDesignatedDatasetThumbnail (FileMetadata fileMetadata) {
-        if (fileMetadata != null) {
-            if (fileMetadata.getDataFile() != null) {
-                if (fileMetadata.getDataFile().getId() != null) {
-                    if (fileMetadata.getDataFile().getOwner() != null) {
-                        if (fileMetadata.getDataFile().equals(fileMetadata.getDataFile().getOwner().getThumbnailFile())) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-        return false;
+    public String getFileSortOrder() {
+        return fileSortOrder;
     }
-    
-    /* 
-     * Items for the "Designated this image as the Dataset thumbnail: 
-     */
-    
-    private FileMetadata fileMetadataSelectedForThumbnailPopup = null; 
-
-    public void  setFileMetadataSelectedForThumbnailPopup(FileMetadata fm){
-       fileMetadataSelectedForThumbnailPopup = fm; 
-       alreadyDesignatedAsDatasetThumbnail = getUseAsDatasetThumbnail();
 
+    public void setFileSortOrder(String fileSortOrder) {
+        this.fileSortOrder = fileSortOrder;
     }
-    
-    public FileMetadata getFileMetadataSelectedForThumbnailPopup() {
-        return fileMetadataSelectedForThumbnailPopup;
-    }
-    
-    public void clearFileMetadataSelectedForThumbnailPopup() {
-        fileMetadataSelectedForThumbnailPopup = null;
+
+    public String getFileSortFieldName() {
+        return FileSortFieldAndOrder.label;
     }
-    
-    private boolean alreadyDesignatedAsDatasetThumbnail = false; 
-    
-    public boolean getUseAsDatasetThumbnail() {
 
-        if (fileMetadataSelectedForThumbnailPopup != null) {
-            if (fileMetadataSelectedForThumbnailPopup.getDataFile() != null) {
-                if (fileMetadataSelectedForThumbnailPopup.getDataFile().getId() != null) {
-                    if (fileMetadataSelectedForThumbnailPopup.getDataFile().getOwner() != null) {
-                        if (fileMetadataSelectedForThumbnailPopup.getDataFile().equals(fileMetadataSelectedForThumbnailPopup.getDataFile().getOwner().getThumbnailFile())) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-        return false;
+    public String getFileSortFieldDate() {
+        return FileSortFieldAndOrder.createDate;
     }
 
-    
-    
-    public void setUseAsDatasetThumbnail(boolean useAsThumbnail) {
-        if (fileMetadataSelectedForThumbnailPopup != null) {
-            if (fileMetadataSelectedForThumbnailPopup.getDataFile() != null) {
-                if (fileMetadataSelectedForThumbnailPopup.getDataFile().getId() != null) { // ?
-                    if (fileMetadataSelectedForThumbnailPopup.getDataFile().getOwner() != null) {
-                        if (useAsThumbnail) {
-                            fileMetadataSelectedForThumbnailPopup.getDataFile().getOwner().setThumbnailFile(fileMetadataSelectedForThumbnailPopup.getDataFile());
-                        } else if (getUseAsDatasetThumbnail()) {
-                            fileMetadataSelectedForThumbnailPopup.getDataFile().getOwner().setThumbnailFile(null);
-                        }
-                    }
-                }
-            }
-        }
+    public String getFileSortFieldSize() {
+        return FileSortFieldAndOrder.size;
     }
 
-    public void saveAsDesignatedThumbnail() {
-        // We don't need to do anything specific to save this setting, because
-        // the setUseAsDatasetThumbnail() method, above, has already updated the
-        // file object appropriately. 
-        // However, once the "save" button is pressed, we want to show a success message, if this is 
-        // a new image has been designated as such:
-        if (getUseAsDatasetThumbnail() && !alreadyDesignatedAsDatasetThumbnail) {
-            String successMessage = BundleUtil.getStringFromBundle("file.assignedDataverseImage.success");
-            logger.fine(successMessage);
-            successMessage = successMessage.replace("{0}", fileMetadataSelectedForThumbnailPopup.getLabel());
-            JsfHelper.addFlashMessage(successMessage);
-        }
-        
-        // And reset the selected fileMetadata:
-        
-        fileMetadataSelectedForThumbnailPopup = null;
+    public String getFileSortFieldType() {
+        return FileSortFieldAndOrder.type;
     }
-    
-    /* 
-     * Items for the "Tags (Categories)" popup.
-     *
-     */
-    private FileMetadata fileMetadataSelectedForTagsPopup = null; 
-    
-    public void  setFileMetadataSelectedForTagsPopup(){
 
+    public String getSortByAscending() {
+        return SortBy.ASCENDING;
     }
 
-    public void  setFileMetadataSelectedForTagsPopup(FileMetadata fm){
-       fileMetadataSelectedForTagsPopup = fm; 
+    public String getSortByDescending() {
+        return SortBy.DESCENDING;
     }
-    
-    public FileMetadata getFileMetadataSelectedForTagsPopup() {
-        return fileMetadataSelectedForTagsPopup;
+
+    PrivateUrl privateUrl;
+
+    public PrivateUrl getPrivateUrl() {
+        return privateUrl;
     }
-    
-    public void clearFileMetadataSelectedForTagsPopup() {
-        fileMetadataSelectedForTagsPopup = null;
+
+    public void setPrivateUrl(PrivateUrl privateUrl) {
+        this.privateUrl = privateUrl;
     }
-    
-    public List <FileMetadata> getListFileMetadataSelectedForTagsPopup(){
-        List<FileMetadata> retList = new ArrayList<>();
-        for (FileMetadata fm : selectedFiles){
-            retList.add(fm);
+
+    public void initPrivateUrlPopUp() {
+        if (privateUrl != null) {
+            setPrivateUrlJustCreatedToFalse();
         }
-        return retList;       
-    }
-    
-    private List<String> categoriesByName;
-    
-    public void setCategoriesByName(List<String>  dummy){
-        categoriesByName = dummy;
     }
-    
-    public void refreshTagsPopUp(){
-        if (bulkUpdateCheckVersion()){
-           refreshSelectedFiles();           
-        }  
-        updateFileCounts();
-        refreshCategoriesByName();
-        refreshTabFileTagsByName();
+
+    boolean privateUrlWasJustCreated;
+
+    public boolean isPrivateUrlWasJustCreated() {
+        return privateUrlWasJustCreated;
     }
-    
-    private List<String> tabFileTagsByName;
 
-    public List<String> getTabFileTagsByName() {
-        return tabFileTagsByName;
+    public void setPrivateUrlJustCreatedToFalse() {
+        privateUrlWasJustCreated = false;
     }
 
-    public void setTabFileTagsByName(List<String> tabFileTagsByName) {
-        this.tabFileTagsByName = tabFileTagsByName;
+    public boolean isShowLinkingPopup() {
+        return showLinkingPopup;
     }
-    
-    private void refreshCategoriesByName(){
-        categoriesByName= new ArrayList<>();
-        for (String category: dataset.getCategoriesByName() ){
-            categoriesByName.add(category);
-        }
-        refreshSelectedTags();
+    public boolean isShowUnLinkingPopup() {
+        return showUnLinkingPopup;
     }
-    
-    
-    
-    
-    public List<String> getCategoriesByName() {
-            return categoriesByName;
+
+    public void setShowLinkingPopup(boolean showLinkingPopup) {
+        this.showLinkingPopup = showLinkingPopup;
+    }
+    public void setShowUnLinkingPopup(boolean showUnLinkingPopup) {
+        this.showUnLinkingPopup = showUnLinkingPopup;
     }
-    
-    /*
-     * 1. Tabular File Tags: 
-     */
-    
-    private List<String> tabFileTags = null;
 
-    public List<String> getTabFileTags() {
-        if (tabFileTags == null) {
-            tabFileTags = DataFileTag.listTags();
+    private boolean showLinkingPopup = false;
+    private boolean showUnLinkingPopup = false;
+    private Boolean anonymizedAccess = null;
+
+    //
+
+    public void createPrivateUrl(boolean anonymizedAccess) {
+        try {
+            PrivateUrl createdPrivateUrl = commandEngine.submit(new CreatePrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset, anonymizedAccess));
+            privateUrl = createdPrivateUrl;
+            JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.header"),
+                    BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
+            privateUrlWasJustCreated = true;
+        } catch (CommandException ex) {
+            String msg = BundleUtil.getStringFromBundle("dataset.privateurl.noPermToCreate", PrivateUrlUtil.getRequiredPermissions(ex));
+            logger.warning("Unable to create a Private URL for dataset id " + dataset.getId() + ". Message to user: " + msg + " Exception: " + ex);
+            JH.addErrorMessage(msg);
         }
-        return tabFileTags;
     }
 
-    public void setTabFileTags(List<String> tabFileTags) {
-        this.tabFileTags = tabFileTags;
+    public void disablePrivateUrl() {
+        try {
+            commandEngine.submit(new DeletePrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset));
+            privateUrl = null;
+            JH.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.privateurl.disabledSuccess"));
+        } catch (CommandException ex) {
+            logger.info("CommandException caught calling DeletePrivateUrlCommand: " + ex);
+        }
     }
-    
-    private String[] selectedTabFileTags = {};
 
-    public String[] getSelectedTabFileTags() {
-        return selectedTabFileTags;
+    public boolean isUserCanCreatePrivateURL() {
+        return dataset.getLatestVersion().isDraft();
     }
 
-    public void setSelectedTabFileTags(String[] selectedTabFileTags) {
-        this.selectedTabFileTags = selectedTabFileTags;
+    public String getPrivateUrlLink(PrivateUrl privateUrl) {
+        return privateUrl.getLink();
     }
 
-    private String[] selectedTags = {};
-    
-    public void handleSelection(final AjaxBehaviorEvent event) {
-        if (selectedTags != null) {
-            selectedTags = selectedTags.clone();
+    public boolean isAnonymizedAccess() {
+        if (anonymizedAccess == null) {
+            if (session.getUser() instanceof PrivateUrlUser && workingVersion.isDraft()) {
+                anonymizedAccess = ((PrivateUrlUser) session.getUser()).hasAnonymizedAccess();
+            } else {
+                anonymizedAccess = false;
+            }
         }
+        return anonymizedAccess;
     }
-        
 
-    
-    private void refreshTabFileTagsByName(){
-        
-        tabFileTagsByName= new ArrayList<>();
-        for (FileMetadata fm : selectedFiles) {
-            if (fm.getDataFile().getTags() != null) {
-                for (int i = 0; i < fm.getDataFile().getTags().size(); i++) {
-                    if (!tabFileTagsByName.contains(fm.getDataFile().getTags().get(i).getTypeLabel())) {
-                        tabFileTagsByName.add(fm.getDataFile().getTags().get(i).getTypeLabel());
-                    }
-                }
-            }
+    public boolean isAnonymizedPrivateUrl() {
+        if(privateUrl != null) {
+            return privateUrl.isAnonymizedAccess();
+        } else {
+            return false;
         }
-        refreshSelectedTabFileTags();
     }
-    
-    private void refreshSelectedTabFileTags() {
-        selectedTabFileTags = null;
-        selectedTabFileTags = new String[0];
-        if (tabFileTagsByName.size() > 0) {
-            selectedTabFileTags = new String[tabFileTagsByName.size()];
-            for (int i = 0; i < tabFileTagsByName.size(); i++) {
-                selectedTabFileTags[i] = tabFileTagsByName.get(i);
-            }
+
+    public boolean isAnonymizedAccessEnabled() {
+        if (settingsWrapper.getValueForKey(SettingsServiceBean.Key.AnonymizedFieldTypeNames) != null) {
+            return true;
+        } else {
+            return false;
         }
-        Arrays.sort(selectedTabFileTags);
     }
     
-    private boolean tabularDataSelected = false;
+    String anonymizedFieldTypeNames = null;
+    
+    public String getAnonymizedFieldTypeNames() {
+        if (anonymizedFieldTypeNames != null) {
+            return anonymizedFieldTypeNames;
+        }
+        if (settingsWrapper.getValueForKey(SettingsServiceBean.Key.AnonymizedFieldTypeNames) != null) {
+            anonymizedFieldTypeNames = settingsWrapper.getValueForKey(SettingsServiceBean.Key.AnonymizedFieldTypeNames);
 
-    public boolean isTabularDataSelected() {
-        return tabularDataSelected;
+        } else {
+            anonymizedFieldTypeNames = "";
+
+        }
+        return anonymizedFieldTypeNames;
     }
 
-    public void setTabularDataSelected(boolean tabularDataSelected) {
-        this.tabularDataSelected = tabularDataSelected;
+    // todo: we should be able to remove - this is passed in the html pages to other fragments, but they could just access this service bean directly.
+    public FileDownloadServiceBean getFileDownloadService() {
+        return fileDownloadService;
     }
 
-    public String[] getSelectedTags() {    
+    public void setFileDownloadService(FileDownloadServiceBean fileDownloadService) {
+        this.fileDownloadService = fileDownloadService;
+    }
+    
+    public FileDownloadHelper getFileDownloadHelper() {
+        return fileDownloadHelper;
+    }
 
-        return selectedTags;
+    public void setFileDownloadHelper(FileDownloadHelper fileDownloadHelper) {
+        this.fileDownloadHelper = fileDownloadHelper;
     }
 
-    public void setSelectedTags(String[] selectedTags) {
-        this.selectedTags = selectedTags;
+
+    public GuestbookResponseServiceBean getGuestbookResponseService() {
+        return guestbookResponseService;
     }
 
-    /*
-     * "File Tags" (aka "File Categories"): 
-    */
-    
-    private String newCategoryName = null;
+    public void setGuestbookResponseService(GuestbookResponseServiceBean guestbookResponseService) {
+        this.guestbookResponseService = guestbookResponseService;
+    }
 
-    public String getNewCategoryName() {
-        return newCategoryName;
+    /**
+     * dataset title
+     * @return title of workingVersion
+     */
+    public String getTitle() {
+        assert (null != workingVersion);
+        return workingVersion.getTitle();
     }
 
-    public void setNewCategoryName(String newCategoryName) {
-        this.newCategoryName = newCategoryName;
+    /**
+     * dataset description
+     *
+     * @return description of workingVersion
+     */
+    public String getDescription() {
+        return workingVersion.getDescriptionPlainText();
     }
 
-    public String saveNewCategory() {
-        if (newCategoryName != null && !newCategoryName.isEmpty()) {
-            categoriesByName.add(newCategoryName);
-        }
-        //Now increase size of selectedTags and add new category
-        String[] temp = new String[selectedTags.length + 1];
-        System.arraycopy(selectedTags, 0, temp, 0, selectedTags.length);
-        selectedTags = temp;
-        selectedTags[selectedTags.length - 1] = newCategoryName;
-        //Blank out added category
-        newCategoryName = "";
-        return "";
+    /**
+     * dataset authors
+     *
+     * @return list of author names
+     */
+    public List<String> getDatasetAuthors() {
+        assert (workingVersion != null);
+        return workingVersion.getDatasetAuthorNames();
     }
-    
-    private void refreshSelectedTags() {
-        selectedTags = null;
-        selectedTags = new String[0];
-        
-        List<String> selectedCategoriesByName= new ArrayList<>();
-        for (FileMetadata fm : selectedFiles) {
-            if (fm.getCategories() != null) {
-                for (int i = 0; i < fm.getCategories().size(); i++) {
-                    if (!selectedCategoriesByName.contains(fm.getCategories().get(i).getName())) {
-                    selectedCategoriesByName.add(fm.getCategories().get(i).getName());
-                    }
 
-                }
+    /**
+     * publisher (aka - name of root dataverse)
+     *
+     * @return the publisher of the version
+     */
+    public String getPublisher() {
+        return dataverseService.getRootDataverseName();
+    }
 
-            }
+    public void downloadRsyncScript() {
+
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
+        response.setContentType("application/download");
+
+        String contentDispositionString;
+
+        contentDispositionString = "attachment;filename=" + rsyncScriptFilename;
+        response.setHeader("Content-Disposition", contentDispositionString);
+
+        try {
+            ServletOutputStream out = response.getOutputStream();
+            out.write(getRsyncScript().getBytes());
+            out.flush();
+            ctx.responseComplete();
+        } catch (IOException e) {
+            String error = "Problem getting bytes from rsync script: " + e;
+            logger.warning(error);
+            return;
         }
 
-        if (selectedCategoriesByName.size() > 0) {
-            selectedTags = new String[selectedCategoriesByName.size()];
-            for (int i = 0; i < selectedCategoriesByName.size(); i++) {
-                selectedTags[i] = selectedCategoriesByName.get(i);
-            }
+        // If the script has been successfully downloaded, lock the dataset:
+        String lockInfoMessage = "script downloaded";
+        DatasetLock lock = datasetService.addDatasetLock(dataset.getId(), DatasetLock.Reason.DcmUpload, session.getUser() != null ? ((AuthenticatedUser)session.getUser()).getId() : null, lockInfoMessage);
+        if (lock != null) {
+            dataset.addLock(lock);
+        } else {
+            logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId());
         }
-        Arrays.sort(selectedTags);
+
     }
-        
-    /* This method handles saving both "tabular file tags" and 
-     * "file categories" (which are also considered "tags" in 4.0)
-    */
-    public String saveFileTagsAndCategories() {
-        // 1. New Category name:
-        // With we don't need to do anything for the file categories that the user
-        // selected from the pull down list; that was done directly from the 
-        // page with the FileMetadata.setCategoriesByName() method. 
-        // So here we only need to take care of the new, custom category
-        // name, if entered: 
-        if (bulkUpdateCheckVersion()) {
-            refreshSelectedFiles();
-        }
-        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
-            if (selectedFiles != null && selectedFiles.size() > 0) {
-                for (FileMetadata fm : selectedFiles) {
-                    if (fm.getDataFile().equals(fmd.getDataFile())) {
-                        fmd.setCategories(new ArrayList<>());
-                        if (newCategoryName != null) {
-                            fmd.addCategoryByName(newCategoryName);
-                        }
-                        // 2. Tabular DataFile Tags: 
-                        if (selectedTags != null) {
-                            for (String selectedTag : selectedTags) {
-                                fmd.addCategoryByName(selectedTag);
-                            }
-                        }
-                        if (fmd.getDataFile().isTabularData()) {
-                            fmd.getDataFile().setTags(null);
-                            for (String selectedTabFileTag : selectedTabFileTags) {
-                                DataFileTag tag = new DataFileTag();
-                                try {
-                                    tag.setTypeByLabel(selectedTabFileTag);
-                                    tag.setDataFile(fmd.getDataFile());
-                                    fmd.getDataFile().addTag(tag);
-                                }catch (IllegalArgumentException iax) {
-                                    // ignore 
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-               // success message: 
-                String successMessage = BundleUtil.getStringFromBundle("file.assignedTabFileTags.success");
-                logger.fine(successMessage);
-                successMessage = successMessage.replace("{0}", "Selected Files");
-                JsfHelper.addFlashMessage(successMessage);
-         selectedTags = null;
 
-        logger.fine("New category name: " + newCategoryName);
+    public void closeRsyncScriptPopup(CloseEvent event) {
+        finishRsyncScriptAction();
+    }
 
-        newCategoryName = null;
-        
-        if (removeUnusedTags){
-            removeUnusedFileTagsFromDataset();
+    public String finishRsyncScriptAction() {
+        // This method is called when the user clicks on "Close" in the "Rsync Upload"
+        // popup. If they have successfully downloaded the rsync script, the
+        // dataset should now be locked; which means we should put up the
+        // "dcm upload in progress" message - that will be shown on the page
+        // until the rsync upload is completed and the dataset is unlocked.
+        if (isLocked()) {
+            JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("file.rsyncUpload.inProgressMessage.summary"), BundleUtil.getStringFromBundle("file.rsyncUpload.inProgressMessage.details"));
         }
-        save();
-        return  returnToDraftVersion();
+        return "";
     }
-    
-    /*
-    Remove unused file tags
-    When updating datafile tags see if any custom tags are not in use.
-    Remove them
-    
-    */
-    private void removeUnusedFileTagsFromDataset() {
-        categoriesByName = new ArrayList<>();
-        for (FileMetadata fm : workingVersion.getFileMetadatas()) {
-            if (fm.getCategories() != null) {
-                for (int i = 0; i < fm.getCategories().size(); i++) {
-                    if (!categoriesByName.contains(fm.getCategories().get(i).getName())) {
-                        categoriesByName.add(fm.getCategories().get(i).getName());
-                    }
-                }
-            }
-        }
-        List<DataFileCategory> datasetFileCategoriesToRemove = new ArrayList<>();
 
-        for (DataFileCategory test : dataset.getCategories()) {
-            boolean remove = true;
-            for (String catByName : categoriesByName) {
-                if (catByName.equals(test.getName())) {
-                    remove = false;
-                    break;
-                }
-            }
-            if (remove) {
-                datasetFileCategoriesToRemove.add(test);
-            }
-        }
+    /**
+     * this method returns the dataset fields to be shown in the dataset summary
+     * on the dataset page.
+     * It returns the default summary fields( subject, description, keywords, related publications and notes)
+     * if the custom summary datafields has not been set, otherwise will set the custom fields set by the sysadmins
+     *
+     * @return the dataset fields to be shown in the dataset summary
+     */
+    public List<DatasetField> getDatasetSummaryFields() {
+       customFields  = settingsWrapper.getValueForKey(SettingsServiceBean.Key.CustomDatasetSummaryFields);
 
-        if (!datasetFileCategoriesToRemove.isEmpty()) {
-            for (DataFileCategory remove : datasetFileCategoriesToRemove) {
-                dataset.getCategories().remove(remove);
-            }
+        return DatasetUtil.getDatasetSummaryFields(workingVersion, customFields);
+    }
 
-        }
+    public boolean isShowPreviewButton(DataFile dataFile) {
+        List<ExternalTool> previewTools = getPreviewToolsForDataFile(dataFile);
+        return previewTools.size() > 0;
+    }
+    
+    public boolean isShowQueryButton(DataFile dataFile) { 
 
+        if(dataFile.isRestricted()
+                || !dataFile.isReleased()
+                || FileUtil.isActivelyEmbargoed(dataFile)
+                || FileUtil.isRetentionExpired(dataFile)){
+            return false;
+        }
+        
+        List<ExternalTool> fileQueryTools = getQueryToolsForDataFile(dataFile);
+        return fileQueryTools.size() > 0;
     }
 
-    
-    /* 
-     * Items for the "Advanced (Ingest) Options" popup. 
-     * 
-     */
-    private FileMetadata fileMetadataSelectedForIngestOptionsPopup = null; 
+    public List<ExternalTool> getPreviewToolsForDataFile(DataFile dataFile) {
+        return getCachedToolsForDataFile(dataFile, ExternalTool.Type.PREVIEW);
+    }
 
-    public void  setFileMetadataSelectedForIngestOptionsPopup(FileMetadata fm){
-       fileMetadataSelectedForIngestOptionsPopup = fm; 
+    public List<ExternalTool> getQueryToolsForDataFile(DataFile dataFile) {
+        return getCachedToolsForDataFile(dataFile, ExternalTool.Type.QUERY);
     }
     
-    public FileMetadata getFileMetadataSelectedForIngestOptionsPopup() {
-        return fileMetadataSelectedForIngestOptionsPopup;
+    public List<ExternalTool> getConfigureToolsForDataFile(DataFile dataFile) {
+        return getCachedToolsForDataFile(dataFile, ExternalTool.Type.CONFIGURE);
     }
-    
-    public void clearFileMetadataSelectedForIngestOptionsPopup() {
-        fileMetadataSelectedForIngestOptionsPopup = null;
+
+    public List<ExternalTool> getExploreToolsForDataFile(DataFile dataFile) {
+        return getCachedToolsForDataFile(dataFile, ExternalTool.Type.EXPLORE);
     }
-    
-    private String ingestLanguageEncoding = null;
 
-    public String getIngestLanguageEncoding() {
-        if (ingestLanguageEncoding == null) {
-            return "UTF8 (default)";
+    public List<ExternalTool> getCachedToolsForDataFile(DataFile dataFile, ExternalTool.Type type) {
+        Long fileId = dataFile.getId();
+        Map<Long, List<ExternalTool>> cachedToolsByFileId = new HashMap<>();
+        List<ExternalTool> externalTools = new ArrayList<>();
+        switch (type) {
+            case EXPLORE:
+                cachedToolsByFileId = exploreToolsByFileId;
+                externalTools = exploreTools;
+                break;
+            case CONFIGURE:
+                cachedToolsByFileId = configureToolsByFileId;
+                externalTools = configureTools;
+                break;
+            case PREVIEW:
+                cachedToolsByFileId = previewToolsByFileId;
+                externalTools = previewTools;
+                break;
+            case QUERY:
+                cachedToolsByFileId = fileQueryToolsByFileId;
+                externalTools = fileQueryTools;
+                break;    
+            default:
+                break;
         }
-        return ingestLanguageEncoding;
+        List<ExternalTool> cachedTools = cachedToolsByFileId.get(fileId);
+        if (cachedTools != null) { //if already queried before and added to list
+            return cachedTools;
+        }
+        cachedTools = externalToolService.findExternalToolsByFile(externalTools, dataFile);
+        cachedToolsByFileId.put(fileId, cachedTools); //add to map so we don't have to do the lifting again
+        return cachedTools;
     }
 
-    public void setIngestLanguageEncoding(String ingestLanguageEncoding) {
-        this.ingestLanguageEncoding = ingestLanguageEncoding;
+    public List<ExternalTool> getDatasetExploreTools() {
+        return datasetExploreTools;
     }
 
-    public void setIngestEncoding(String ingestEncoding) {
-        ingestLanguageEncoding = ingestEncoding;
+    public List<ExternalTool> getDatasetConfigureTools() {
+        return datasetConfigureTools;
     }
 
-    private String savedLabelsTempFile = null;
-
-    public void handleLabelsFileUpload(FileUploadEvent event) {
-        logger.fine("entering handleUpload method.");
-        UploadedFile file = event.getFile();
-
-        if (file != null) {
+    public ExternalTool getDatasetConfigureTool() {
+        return datasetConfigureTool;
+    }
 
-            InputStream uploadStream = null;
-            try {
-                uploadStream = file.getInputstream();
-            } catch (IOException ioex) {
-                logger.log(Level.WARNING, ioex, ()->"the file "+file.getFileName()+" failed to upload!");
-                List<String> args = Arrays.asList(file.getFileName());
-                String msg = BundleUtil.getStringFromBundle("dataset.file.uploadFailure.detailmsg", args);
-                FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.file.uploadFailure"), msg);
-                FacesContext.getCurrentInstance().addMessage(null, message);
-                return;
-            }
+    public void setDatasetConfigureTool(ExternalTool datasetConfigureTool) {
+        this.datasetConfigureTool = datasetConfigureTool;
+    }
 
-            savedLabelsTempFile = saveTempFile(uploadStream);
+    Boolean thisLatestReleasedVersion = null;
 
-            logger.fine(()->file.getFileName() + " is successfully uploaded.");
-            List<String> args = Arrays.asList(file.getFileName());
-            FacesMessage message = new FacesMessage(BundleUtil.getStringFromBundle("dataset.file.upload", args));
-            FacesContext.getCurrentInstance().addMessage(null, message);
+    public boolean isThisLatestReleasedVersion() {
+        if (thisLatestReleasedVersion != null) {
+            return thisLatestReleasedVersion;
         }
 
-        // process file (i.e., just save it in a temp location; for now):
-    }
-
-    private String saveTempFile(InputStream input) {
-        if (input == null) {
-            return null;
+        if (!workingVersion.isPublished()) {
+            thisLatestReleasedVersion = false;
+            return false;
         }
-        byte[] buffer = new byte[8192];
-        int bytesRead = 0;
-        File labelsFile = null;
-        FileOutputStream output = null;
+
+        DatasetVersion latestPublishedVersion = null;
+        Command<DatasetVersion> cmd = new GetLatestPublishedDatasetVersionCommand(dvRequestService.getDataverseRequest(), dataset);
         try {
-            labelsFile = File.createTempFile("tempIngestLabels.", ".txt");
-            output = new FileOutputStream(labelsFile);
-            while ((bytesRead = input.read(buffer)) > -1) {
-                output.write(buffer, 0, bytesRead);
-            }
-        } catch (IOException ioex) {
-            return null;//leaving this purely in the spirit of minimizing changes.
-        } finally {
-            IOUtils.closeQuietly(input);
-            IOUtils.closeQuietly(output);
-        }
-        if (labelsFile != null) {
-            return labelsFile.getAbsolutePath();
+            latestPublishedVersion = commandEngine.submit(cmd);
+        } catch (Exception ex) {
+            // whatever...
         }
-        return null;
-    }
-
-    public void saveAdvancedOptions() {
-        
-        // Language encoding for SPSS SAV (and, possibly, other tabular ingests:) 
-        if (ingestLanguageEncoding != null) {
-            if (fileMetadataSelectedForIngestOptionsPopup != null && fileMetadataSelectedForIngestOptionsPopup.getDataFile() != null) {
-                if (fileMetadataSelectedForIngestOptionsPopup.getDataFile().getIngestRequest() == null) {
-                    IngestRequest ingestRequest = new IngestRequest();
-                    ingestRequest.setDataFile(fileMetadataSelectedForIngestOptionsPopup.getDataFile());
-                    fileMetadataSelectedForIngestOptionsPopup.getDataFile().setIngestRequest(ingestRequest);
 
-                }
-                fileMetadataSelectedForIngestOptionsPopup.getDataFile().getIngestRequest().setTextEncoding(ingestLanguageEncoding);
-            }
-        }
-        ingestLanguageEncoding = null;
+        thisLatestReleasedVersion = workingVersion.equals(latestPublishedVersion);
 
-        // Extra labels for SPSS POR (and, possibly, other tabular ingests:)
-        // (we are adding this parameter to the IngestRequest now, instead of back
-        // when it was uploaded. This is because we want the user to be able to 
-        // hit cancel and bail out, until they actually click 'save' in the 
-        // "advanced options" popup) -- L.A. 4.0 beta 11
-        if (savedLabelsTempFile != null) {
-            if (fileMetadataSelectedForIngestOptionsPopup != null && fileMetadataSelectedForIngestOptionsPopup.getDataFile() != null) {
-                if (fileMetadataSelectedForIngestOptionsPopup.getDataFile().getIngestRequest() == null) {
-                    IngestRequest ingestRequest = new IngestRequest();
-                    ingestRequest.setDataFile(fileMetadataSelectedForIngestOptionsPopup.getDataFile());
-                    fileMetadataSelectedForIngestOptionsPopup.getDataFile().setIngestRequest(ingestRequest);
-                }
-                fileMetadataSelectedForIngestOptionsPopup.getDataFile().getIngestRequest().setLabelsFile(savedLabelsTempFile);
-            }
-        }
-        savedLabelsTempFile = null;
+        return thisLatestReleasedVersion;
 
-        fileMetadataSelectedForIngestOptionsPopup = null;
     }
 
-    private Boolean downloadButtonAvailable = null; 
-    
-    public boolean isDownloadButtonAvailable(){
-        
-        if (downloadButtonAvailable != null) {
-            return downloadButtonAvailable;
-        }
-
-        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
-            if (this.fileDownloadHelper.canDownloadFile(fmd)) {
-                downloadButtonAvailable = true;
-                return true;
-            }
+    public String getCroissant() {
+        if (isThisLatestReleasedVersion()) {
+            final String CROISSANT_SCHEMA_NAME = "croissant";
+            ExportService instance = ExportService.getInstance();
+            String croissant = instance.getLatestPublishedAsString(dataset, CROISSANT_SCHEMA_NAME);
+            if (croissant != null && !croissant.isEmpty()) {
+                logger.fine("Returning cached CROISSANT.");
+                return croissant;
+            } 
         }
-        downloadButtonAvailable = false;
-        return false;
+        return null;
     }
     
-    public boolean isFileAccessRequestMultiButtonRequired(){
-        if (!isSessionUserAuthenticated() || !dataset.isFileAccessRequest()){
-            return false;
-        }
-        if (workingVersion == null) {
-            return false;
-        }
-        if (!workingVersion.getTermsOfUseAndAccess().isFileAccessRequest()){
-           // return false;
+    public List<License> getAvailableLicenses(){
+        if(!workingVersion.getDataset().getDatasetType().getLicenses().isEmpty()){
+            return workingVersion.getDataset().getDatasetType().getLicenses();
         }
-        for (FileMetadata fmd : workingVersion.getFileMetadatas()){
-            if (!this.fileDownloadHelper.canDownloadFile(fmd)){
-                return true;               
-            }
-        }
-        return false;
+        return licenseServiceBean.listAllActive();
     }
 
-    public boolean isFileAccessRequestMultiButtonEnabled(){
-        if (!isSessionUserAuthenticated() || !dataset.isFileAccessRequest()){
-            return false;
-        }
-        if( this.selectedRestrictedFiles == null || this.selectedRestrictedFiles.isEmpty() ){
-            return false;
-        }
-        for (FileMetadata fmd : this.selectedRestrictedFiles){
-            if (!this.fileDownloadHelper.canDownloadFile(fmd)){
-                return true;               
+    public String getJsonLd() {
+        if (isThisLatestReleasedVersion()) {
+            ExportService instance = ExportService.getInstance();
+            String jsonLd = instance.getLatestPublishedAsString(dataset, SchemaDotOrgExporter.NAME);
+            if (jsonLd != null) {
+                logger.fine("Returning cached schema.org JSON-LD.");
+                return jsonLd;
+            } else {
+                logger.fine("No cached schema.org JSON-LD available. Going to the database.");
+                String jsonLdProduced = workingVersion.getJsonLd();
+                return  jsonLdProduced != null ? jsonLdProduced : "";
             }
         }
-        return false;
-    } 
-    
-    private Boolean downloadButtonAllEnabled = null;
+        return "";
+    }
 
-    public boolean isDownloadAllButtonEnabled() {
+    public void selectAllFiles() {
+        logger.fine("selectAllFiles called");
+        selectedFiles = workingVersion.getFileMetadatas();
+    }
 
-        if (downloadButtonAllEnabled == null) {
-            for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
-                if (!this.fileDownloadHelper.canDownloadFile(fmd)) {
-                    downloadButtonAllEnabled = false;
-                    break;
-                }
-            }
-            downloadButtonAllEnabled = true;
-        }
-        return downloadButtonAllEnabled;
+    public void clearSelection() {
+        logger.info("clearSelection called");
+        selectedFiles = Collections.emptyList();
     }
 
-    public boolean isDownloadSelectedButtonEnabled(){
+    public void fileListingPaginatorListener(PageEvent event) {
+        // Changing to a new page of files - set this so we can ignore changes to the
+        // presort checkboxes. (This gets called before the set calls for the presorts
+        // get called.)
+        isPageFlip=true;
+        setFilePaginatorPage(event.getPage());
+    }
+
+    public void refreshPaginator() {
+        FacesContext facesContext = FacesContext.getCurrentInstance();
+        org.primefaces.component.datatable.DataTable dt = (org.primefaces.component.datatable.DataTable) facesContext.getViewRoot().findComponent("datasetForm:tabView:filesTable");
+        setFilePaginatorPage(dt.getPage());
+        setRowsPerPage(dt.getRowsToRender());
+    }
+
+    /**
+     * This method can be called from *.xhtml files to allow archiving of a dataset
+     * version from the user interface. It is not currently (11/18) used in the IQSS/develop
+     * branch, but is used by QDR and is kept here in anticipation of including a
+     * GUI option to archive (already published) versions after other dataset page
+     * changes have been completed.
+     *
+     * @param id - the id of the datasetversion to archive.
+     */
+    public void archiveVersion(Long id) {
+        if (session.getUser() instanceof AuthenticatedUser) {
+            DatasetVersion dv = datasetVersionService.retrieveDatasetVersionByVersionId(id).getDatasetVersion();
+            String className = settingsWrapper.getValueForKey(SettingsServiceBean.Key.ArchiverClassName, null);
+            AbstractSubmitToArchiveCommand cmd = ArchiverUtil.createSubmitToArchiveCommand(className, dvRequestService.getDataverseRequest(), dv);
+            if (cmd != null) {
+                try {
+                    DatasetVersion version = commandEngine.submit(cmd);
+                    if (!version.getArchivalCopyLocationStatus().equals(DatasetVersion.ARCHIVAL_STATUS_FAILURE)) {
+                        logger.info(
+                                "DatasetVersion id=" + version.getId() + " submitted to Archive, status: " + dv.getArchivalCopyLocationStatus());
+                    } else {
+                        logger.severe("Error submitting version " + version.getId() + " due to conflict/error at Archive");
+                    }
+                    if (version.getArchivalCopyLocation() != null) {
+                        setVersionTabList(resetVersionTabList());
+                        this.setVersionTabListForPostLoad(getVersionTabList());
+                        JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("datasetversion.archive.success"));
+                    } else {
+                        JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("datasetversion.archive.failure"));
+                    }
+                } catch (CommandException ex) {
+                    logger.log(Level.SEVERE, "Unexpected Exception calling  submit archive command", ex);
+                    JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("datasetversion.archive.failure"));
+                }
+            } else {
+                logger.log(Level.SEVERE, "Could not find Archiver class: " + className);
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("datasetversion.archive.failure"));
 
-        if( this.selectedFiles == null || this.selectedFiles.isEmpty() ){
-            return false;
-        }
-        for (FileMetadata fmd : this.selectedFiles){
-            if (this.fileDownloadHelper.canDownloadFile(fmd)){
-                return true;               
             }
         }
-        return false;
-    } 
+    }
     
-    public boolean isFileAccessRequestMultiSignUpButtonRequired(){
-        if (isSessionUserAuthenticated()){
-            return false;
-        }
-        // only show button if dataset allows an access request
-        if (!dataset.isFileAccessRequest()){
-            return false;
-        }
-        for (FileMetadata fmd : workingVersion.getFileMetadatas()){
-            if (!this.fileDownloadHelper.canDownloadFile(fmd)){
-                return true;               
+    public boolean isArchivable() {
+        if (archivable == null) {
+            archivable = false;
+            String className = settingsWrapper.getValueForKey(SettingsServiceBean.Key.ArchiverClassName, null);
+            if (className != null) {
+                try {
+                    Class<?> clazz = Class.forName(className);
+                    Method m = clazz.getMethod("isArchivable", Dataset.class, SettingsWrapper.class);
+                    Object[] params = { dataset, settingsWrapper };
+                    archivable = ((Boolean) m.invoke(null, params) == true);
+                } catch (ClassNotFoundException | IllegalAccessException | IllegalArgumentException
+                        | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+                    logger.warning("Failed to call isArchivable on configured archiver class: " + className);
+                    e.printStackTrace();
+                }
             }
         }
-        return false;
+        return archivable;
     }
 
-    public boolean isFileAccessRequestMultiSignUpButtonEnabled(){
-        if (isSessionUserAuthenticated()){
-            return false;
-        }
-        if( this.selectedRestrictedFiles == null || this.selectedRestrictedFiles.isEmpty() ){
-            return false;
-        }
-        // only show button if dataset allows an access request
-        if (!dataset.isFileAccessRequest()){
-            return false;
-        }
-        for (FileMetadata fmd : this.selectedRestrictedFiles){
-            if (!this.fileDownloadHelper.canDownloadFile(fmd)){
-                return true;               
+    public boolean isVersionArchivable() {
+        if (versionArchivable == null) {
+            // If this dataset isn't in an archivable collection return false
+            versionArchivable = false;
+            if (isArchivable()) {
+                boolean checkForArchivalCopy = false;
+                // Otherwise, we need to know if the archiver is single-version-only
+                // If it is, we have to check for an existing archived version to answer the
+                // question
+                String className = settingsWrapper.getValueForKey(SettingsServiceBean.Key.ArchiverClassName, null);
+                if (className != null) {
+                    try {
+                        Class<?> clazz = Class.forName(className);
+                        Method m = clazz.getMethod("isSingleVersion", SettingsWrapper.class);
+                        Object[] params = { settingsWrapper };
+                        checkForArchivalCopy = (Boolean) m.invoke(null, params);
+
+                        if (checkForArchivalCopy) {
+                            // If we have to check (single version archiving), we can't allow archiving if
+                            // one version is already archived (or attempted - any non-null status)
+                            versionArchivable = !isSomeVersionArchived();
+                        } else {
+                            // If we allow multiple versions or didn't find one that has had archiving run
+                            // on it, we can archive, so return true
+                            versionArchivable = true;
+                        }
+                    } catch (ClassNotFoundException | IllegalAccessException | IllegalArgumentException
+                            | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+                        logger.warning("Failed to call isSingleVersion on configured archiver class: " + className);
+                        e.printStackTrace();
+                    }
+                }
             }
         }
-        return false;
+        return versionArchivable;
     }
 
-    public boolean isDownloadPopupRequired() {
-        return FileUtil.isDownloadPopupRequired(workingVersion);
-    }
-    
-    public boolean isRequestAccessPopupRequired() {  
-        return FileUtil.isRequestAccessPopupRequired(workingVersion);
+    public boolean isSomeVersionArchived() {
+        if (someVersionArchived == null) {
+            someVersionArchived = ArchiverUtil.isSomeVersionArchived(dataset);
+        }
+        return someVersionArchived;
     }
-    
-    public String requestAccessMultipleFiles() {
 
-        if (selectedFiles.isEmpty()) {
-            //RequestContext requestContext = RequestContext.getCurrentInstance();
-            PrimeFaces.current().executeScript("PF('selectFilesForRequestAccess').show()");
-            return "";
-        } else {
-            fileDownloadHelper.clearRequestAccessFiles();
-            for (FileMetadata fmd : selectedFiles){
-                 fileDownloadHelper.addMultipleFilesForRequestAccess(fmd.getDataFile());
+    public boolean isTagPresort() {
+       return this.tagPresort;
+        }
+
+        public void setTagPresort(boolean tagPresort) {
+            // Record the new value
+            newTagPresort = tagPresort && (null != getSortOrder());
+            // If this is not a page flip, it should be a real change to the presort
+            // boolean that we should use.
+            if (!isPageFlip) {
+                this.tagPresort = tagPresort && (null != getSortOrder());
             }
-            if (isRequestAccessPopupRequired()) {
-                //RequestContext requestContext = RequestContext.getCurrentInstance();                
-                PrimeFaces.current().executeScript("PF('requestAccessPopup').show()");               
-                return "";
-            } else {
-                //No popup required
-                fileDownloadHelper.requestAccessIndirect();
-                return "";
+        }
+
+    public boolean isFolderPresort() {
+        return this.folderPresort;
+        }
+
+        public void setFolderPresort(boolean folderPresort) {
+            //Record the new value
+            newFolderPresort = folderPresort && orderByFolder();
+            // If this is not a page flip, it should be a real change to the presort
+            // boolean that we should use.
+            if (!isPageFlip) {
+                this.folderPresort = folderPresort && orderByFolder();
             }
         }
+
+
+    public void explore(ExternalTool externalTool) {
+        ApiToken apiToken = null;
+        User user = session.getUser();
+        apiToken = authService.getValidApiTokenForUser(user);
+        ExternalToolHandler externalToolHandler = new ExternalToolHandler(externalTool, dataset, apiToken, session.getLocaleCode());
+        PrimeFaces.current().executeScript(externalToolHandler.getExploreScript());
     }
 
-    public boolean isSortButtonEnabled() {
-        /**
-         * @todo The "Sort" Button seems to stop responding to mouse clicks
-         * after a while so it can't be shipped in 4.2 and will be deferred, to
-         * be picked up in https://github.com/IQSS/dataverse/issues/2506
-         */
-        return false;
+    public void configure(ExternalTool externalTool) {
+        ApiToken apiToken = null;
+        User user = session.getUser();
+        //Not enabled for PrivateUrlUsers (who wouldn't have write permissions anyway)
+        if (user instanceof AuthenticatedUser) {
+            apiToken = authService.getValidApiTokenForAuthenticatedUser((AuthenticatedUser) user);
+        }
+        ExternalToolHandler externalToolHandler = new ExternalToolHandler(externalTool, dataset, apiToken, session.getLocaleCode());
+        PrimeFaces.current().executeScript(externalToolHandler.getConfigureScript());
     }
 
-    /*public void updateFileListing(String fileSortField, String fileSortOrder) {
-        this.fileSortField = fileSortField;
-        this.fileSortOrder = fileSortOrder;
-        fileMetadatas = populateFileMetadatas();
+    private FileMetadata fileMetadataForAction;
+
+    public FileMetadata getFileMetadataForAction() {
+        return fileMetadataForAction;
     }
 
-    private List<FileMetadata> populateFileMetadatas() {
-        if (isSortButtonEnabled()) {
-            List<FileMetadata> fileMetadatasToSet = new ArrayList<>();
-            Long datasetVersion = workingVersion.getId();
-            if (datasetVersion != null) {
-                int unlimited = 0;
-                int maxResults = unlimited;
-                List<FileMetadata> dataFilesNew = datafileService.findFileMetadataByDatasetVersionId(datasetVersion, maxResults, fileSortField, fileSortOrder);
-                fileMetadatasToSet.addAll(dataFilesNew);
-            }
-            return fileMetadatasToSet;
-        } else {
-            return new ArrayList<>();
-        }
-    }*/
+    public void setFileMetadataForAction(FileMetadata fileMetadataForAction) {
+        this.fileMetadataForAction = fileMetadataForAction;
+    }
 
-    public String getFileSortField() {
-        return fileSortField;
+    private String termsOfAccess;
+    private boolean fileAccessRequest;
+
+    public String getTermsOfAccess() {
+        return termsOfAccess;
     }
 
-    public void setFileSortField(String fileSortField) {
-        this.fileSortField = fileSortField;
+    public void setTermsOfAccess(String termsOfAccess) {
+        this.termsOfAccess = termsOfAccess;
     }
 
-    public String getFileSortOrder() {
-        return fileSortOrder;
+    public boolean isFileAccessRequest() {
+        return fileAccessRequest;
     }
 
-    public void setFileSortOrder(String fileSortOrder) {
-        this.fileSortOrder = fileSortOrder;
+    public void setFileAccessRequest(boolean fileAccessRequest) {
+        this.fileAccessRequest = fileAccessRequest;
     }
 
-    public List<FileMetadata> getFileMetadatas() {
-        if (isSortButtonEnabled()) {
-            return fileMetadatas;
-        } else {
-            return new ArrayList<>();
+    // wrapper method to see if the file has been deleted (or replaced) in the current version
+    public boolean isFileDeleted (DataFile dataFile) {
+        if (dataFile.getDeleted() == null) {
+            dataFile.setDeleted(datafileService.hasBeenDeleted(dataFile));
         }
-    }
 
-    public String getFileSortFieldName() {
-        return FileSortFieldAndOrder.label;
+        return dataFile.getDeleted();
     }
 
-    public String getFileSortFieldDate() {
-        return FileSortFieldAndOrder.createDate;
+    public String getEffectiveMetadataLanguage() {
+        return getEffectiveMetadataLanguage(false);
+    }
+    public String getEffectiveMetadataLanguage(boolean ofParent) {
+        String mdLang = ofParent ? dataset.getOwner().getEffectiveMetadataLanguage() : dataset.getEffectiveMetadataLanguage();
+        if (mdLang.equals(DvObjectContainer.UNDEFINED_CODE)) {
+            mdLang = settingsWrapper.getDefaultMetadataLanguage();
+        }
+        return mdLang;
     }
 
-    public String getFileSortFieldSize() {
-        return FileSortFieldAndOrder.size;
+    public String getLocaleDisplayName(String code) {
+        String displayName = settingsWrapper.getBaseMetadataLanguageMap(false).get(code);
+        if(displayName==null && code!=null && !code.equals(DvObjectContainer.UNDEFINED_CODE)) {
+            //Default (for cases such as :when a Dataset has a metadatalanguage code but :MetadataLanguages is no longer defined).
+            displayName = new Locale(code).getDisplayName();
+        }
+        return displayName;
     }
 
-    public String getFileSortFieldType() {
-        return FileSortFieldAndOrder.type;
+    public Set<Entry<String, String>> getMetadataLanguages() {
+        return settingsWrapper.getBaseMetadataLanguageMap(false).entrySet();
+    }
+    
+    public List<String> getVocabScripts() {
+        return fieldService.getVocabScripts(settingsWrapper.getCVocConf(false));
     }
 
-    public String getSortByAscending() {
-        return SortBy.ASCENDING;
+    public String getFieldLanguage(String languages) {
+        //Prevent NPE in Payara 6-2024-12 with CVoc
+        logger.fine("Languages: " + languages);
+        if(languages==null) {
+            languages="";
+        }
+        return fieldService.getFieldLanguage(languages,session.getLocaleCode());
     }
 
-    public String getSortByDescending() {
-        return SortBy.DESCENDING;
+    public void setCurationStatus(String status) {
+        try {
+            dataset = commandEngine.submit(new SetCurationStatusCommand(dvRequestService.getDataverseRequest(), dataset, status));
+            workingVersion=dataset.getLatestVersion();
+            if (Strings.isBlank(status)) {
+                JsfHelper.addInfoMessage(BundleUtil.getStringFromBundle("dataset.curationstatus.removed"));
+            } else {
+                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.curationstatus.header"),
+                        BundleUtil.getStringFromBundle("dataset.curationstatus.info",
+                                Arrays.asList(DatasetUtil.getLocaleCurationStatusLabelFromString(status))
+                        ));
+            }
+
+        } catch (CommandException ex) {
+            String msg = BundleUtil.getStringFromBundle("dataset.curationstatus.cantchange");
+            logger.warning("Unable to change external status to " + status + " for dataset id " + dataset.getId() + ". Message to user: " + msg + " Exception: " + ex);
+            JsfHelper.addErrorMessage(msg);
+        }
     }
 
-    PrivateUrl privateUrl;
+    public List<String> getAllowedCurationStatuses() {
+        return settingsWrapper.getAllowedCurationStatuses(dataset);
+    }
 
-    public PrivateUrl getPrivateUrl() {
-        return privateUrl;
+    public Embargo getSelectionEmbargo() {
+        return selectionEmbargo;
     }
 
-    public void setPrivateUrl(PrivateUrl privateUrl) {
-        this.privateUrl = privateUrl;
+    public void setSelectionEmbargo(Embargo selectionEmbargo) {
+        this.selectionEmbargo = selectionEmbargo;
     }
 
-    public void initPrivateUrlPopUp() {
-        if (privateUrl != null) {
-            setPrivateUrlJustCreatedToFalse();
+
+    private Embargo selectionEmbargo = new Embargo();
+
+    public boolean isValidEmbargoSelection() {
+        //If fileMetadataForAction is set, someone is using the kebab/single file menu
+        if (fileMetadataForAction != null) {
+            if (!fileMetadataForAction.getDataFile().isReleased()) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        //Otherwise we check the selected files
+        for (FileMetadata fmd : selectedFiles) {
+            if (!fmd.getDataFile().isReleased()) {
+                return true;
+            }
         }
+        return false;
     }
 
-    boolean privateUrlWasJustCreated;
+    /*
+     * This method checks to see if the selected file/files have an embargo that could be removed. It doesn't return true of a released file has an embargo.
+     */
+    public boolean isExistingEmbargo() {
+        if (fileMetadataForAction != null) {
+            if (!fileMetadataForAction.getDataFile().isReleased()
+                    && (fileMetadataForAction.getDataFile().getEmbargo() != null)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        for (FileMetadata fmd : selectedFiles) {
+            if (!fmd.getDataFile().isReleased() && (fmd.getDataFile().getEmbargo() != null)) {
+                return true;
+            }
+        }
 
-    public boolean isPrivateUrlWasJustCreated() {
-        return privateUrlWasJustCreated;
+        return false;
     }
 
-    public void setPrivateUrlJustCreatedToFalse() {
-        privateUrlWasJustCreated = false;
+    public boolean isActivelyEmbargoed(List<FileMetadata> fmdList) {
+        return FileUtil.isActivelyEmbargoed(fmdList);
     }
 
-    public boolean isShowLinkingPopup() {
-        return showLinkingPopup;
+    public boolean isEmbargoForWholeSelection() {
+        for (FileMetadata fmd : selectedFiles) {
+            if (fmd.getDataFile().isReleased()) {
+                return false;
+            }
+        }
+        return true;
     }
 
-    public void setShowLinkingPopup(boolean showLinkingPopup) {
-        this.showLinkingPopup = showLinkingPopup;
-    }    
-    
-    private boolean showLinkingPopup = false;
-    
-    //
-    
-    /*
-        public void setSelectedGroup(ExplicitGroup selectedGroup) {
-        setShowDeletePopup(true);
-        this.selectedGroup = selectedGroup;
+    private boolean removeEmbargo=false;
+
+    public boolean isRemoveEmbargo() {
+        return removeEmbargo;
     }
-    */
 
-    public void createPrivateUrl() {
-        try {
-            PrivateUrl createdPrivateUrl = commandEngine.submit(new CreatePrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset));
-            privateUrl = createdPrivateUrl;
-            JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.header"),
-                    BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
-            privateUrlWasJustCreated = true;
-        } catch (CommandException ex) {
-            String msg = BundleUtil.getStringFromBundle("dataset.privateurl.noPermToCreate", PrivateUrlUtil.getRequiredPermissions(ex));
-            logger.info("Unable to create a Private URL for dataset id " + dataset.getId() + ". Message to user: " + msg + " Exception: " + ex);
-            JH.addErrorMessage(msg);
+    public void setRemoveEmbargo(boolean removeEmbargo) {
+        boolean existing = this.removeEmbargo;
+        this.removeEmbargo = removeEmbargo;
+        //If we flipped the state, update the selectedEmbargo. Otherwise (e.g. when save is hit) don't make changes
+        if(existing != this.removeEmbargo) {
+            logger.fine("State flip");
+            selectionEmbargo= new Embargo();
+        if(removeEmbargo) {
+            logger.fine("Setting empty embargo");
+            selectionEmbargo= new Embargo(null, null);
+        }
+        PrimeFaces.current().resetInputs("datasetForm:embargoInputs");
         }
     }
 
-    public void disablePrivateUrl() {
-        try {
-            commandEngine.submit(new DeletePrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset));
-            privateUrl = null;
-            JH.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.privateurl.disabledSuccess"));
-        } catch (CommandException ex) {
-            logger.info("CommandException caught calling DeletePrivateUrlCommand: " + ex);
+    public String saveEmbargo() {
+        if (workingVersion.isReleased()) {
+            refreshSelectedFiles(selectedFiles);
         }
-    }
 
-    public boolean isUserCanCreatePrivateURL() {
-        return dataset.getLatestVersion().isDraft();
+        if(isRemoveEmbargo() || (selectionEmbargo.getDateAvailable()==null && selectionEmbargo.getReason()==null)) {
+            selectionEmbargo=null;
+        }
+
+        if(!(selectionEmbargo==null || (selectionEmbargo!=null && settingsWrapper.isValidEmbargoDate(selectionEmbargo)))) {
+            logger.fine("Validation error: " + selectionEmbargo.getFormattedDateAvailable());
+            FacesContext.getCurrentInstance().validationFailed();
+            return "";
+        }
+        List<Embargo> orphanedEmbargoes = new ArrayList<Embargo>();
+        List<FileMetadata> embargoFMs = null;
+        if (fileMetadataForAction != null) {
+            embargoFMs = new ArrayList<FileMetadata>();
+            embargoFMs.add(fileMetadataForAction);
+        } else if (selectedFiles != null && selectedFiles.size() > 0) {
+            embargoFMs = selectedFiles;
+        }
+
+        if(embargoFMs!=null && !embargoFMs.isEmpty()) {
+            if(selectionEmbargo!=null) {
+                selectionEmbargo = embargoService.merge(selectionEmbargo);
+            }
+            for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+                for (FileMetadata fm : embargoFMs) {
+                    if (fm.getDataFile().equals(fmd.getDataFile()) && (isSuperUser()||!fmd.getDataFile().isReleased())) {
+                        Embargo emb = fmd.getDataFile().getEmbargo();
+                        if (emb != null) {
+                            logger.fine("Before: " + emb.getDataFiles().size());
+                            emb.getDataFiles().remove(fmd.getDataFile());
+                            if (emb.getDataFiles().isEmpty()) {
+                                orphanedEmbargoes.add(emb);
+                            }
+                            logger.fine("After: " + emb.getDataFiles().size());
+                        }
+                        fmd.getDataFile().setEmbargo(selectionEmbargo);
+                    }
+                }
+            }
+        }
+        if (selectionEmbargo != null) {
+            embargoService.save(selectionEmbargo, ((AuthenticatedUser) session.getUser()).getIdentifier());
+        }
+        // success message:
+        String successMessage = BundleUtil.getStringFromBundle("file.assignedEmbargo.success");
+        logger.fine(successMessage);
+        successMessage = successMessage.replace("{0}", "Selected Files");
+        JsfHelper.addFlashMessage(successMessage);
+        selectionEmbargo = new Embargo();
+
+        save();
+        for(Embargo emb: orphanedEmbargoes) {
+            embargoService.deleteById(emb.getId(), ((AuthenticatedUser)session.getUser()).getUserIdentifier());
+        }
+        return returnToDraftVersion();
     }
 
-    public String getPrivateUrlLink(PrivateUrl privateUrl) {
-        return privateUrl.getLink();
+    public void clearEmbargoPopup() {
+        logger.fine("clearEmbargoPopup called");
+        selectionEmbargo= new Embargo();
+        setRemoveEmbargo(false);
+        PrimeFaces.current().resetInputs("datasetForm:embargoInputs");
     }
-    
-    
-    public FileDownloadHelper getFileDownloadHelper() {
-        return fileDownloadHelper;
+
+    public void clearSelectionEmbargo() {
+        logger.fine("clearSelectionEmbargo called");
+        selectionEmbargo= new Embargo();
+        PrimeFaces.current().resetInputs("datasetForm:embargoInputs");
     }
 
-    public void setFileDownloadHelper(FileDownloadHelper fileDownloadHelper) {
-        this.fileDownloadHelper = fileDownloadHelper;
+    public boolean isCantDownloadDueToEmbargoOrDVAccess() {
+        if (getSelectedNonDownloadableFiles() != null) {
+            for (FileMetadata fmd : getSelectedNonDownloadableFiles()) {
+                if (FileUtil.isActivelyEmbargoed(fmd)) {
+                    return true;
+                }
+                if (isVersionHasGlobus()) {
+                    if (StorageIO.isDataverseAccessible(
+                            DataAccess.getStorageDriverFromIdentifier(fmd.getDataFile().getStorageIdentifier()))) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
     }
-    
-    
-    public FileDownloadServiceBean getFileDownloadService() {
-        return fileDownloadService;
+
+    public boolean isCantRequestDueToEmbargo() {
+        if (fileDownloadHelper.getFilesForRequestAccess() != null) {
+            for (DataFile df : fileDownloadHelper.getFilesForRequestAccess()) {
+                if (FileUtil.isActivelyEmbargoed(df)) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 
-    public void setFileDownloadService(FileDownloadServiceBean fileDownloadService) {
-        this.fileDownloadService = fileDownloadService;
+    private boolean containsOnlyActivelyEmbargoedFiles(List<FileMetadata> selectedFiles) {
+        for (FileMetadata fmd : selectedFiles) {
+            if (!FileUtil.isActivelyEmbargoed(fmd)) {
+                return false;
+            }
+        }
+        return true;
     }
-    
-    
-    public GuestbookResponseServiceBean getGuestbookResponseService() {
-        return guestbookResponseService;
+
+    public Retention getSelectionRetention() {
+        return selectionRetention;
     }
 
-    public void setGuestbookResponseService(GuestbookResponseServiceBean guestbookResponseService) {
-        this.guestbookResponseService = guestbookResponseService;
+    public void setSelectionRetention(Retention selectionRetention) {
+        this.selectionRetention = selectionRetention;
     }
-    
-       
-    public WorldMapPermissionHelper getWorldMapPermissionHelper() {
-        return worldMapPermissionHelper;
+
+
+    private Retention selectionRetention = new Retention();
+
+    public boolean isValidRetentionSelection() {
+        //If fileMetadataForAction is set, someone is using the kebab/single file menu
+        if (fileMetadataForAction != null) {
+            if (!fileMetadataForAction.getDataFile().isReleased()) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        //Otherwise we check the selected files
+        for (FileMetadata fmd : selectedFiles) {
+            if (!fmd.getDataFile().isReleased()) {
+                return true;
+            }
+        }
+        return false;
     }
 
-    public void setWorldMapPermissionHelper(WorldMapPermissionHelper worldMapPermissionHelper) {
-        this.worldMapPermissionHelper = worldMapPermissionHelper;
+    /*
+     * This method checks to see if the selected file/files have a retention that could be removed. It doesn't return true of a released file has a retention.
+     */
+    public boolean isExistingRetention() {
+        if (fileMetadataForAction != null) {
+            if (!fileMetadataForAction.getDataFile().isReleased()
+                    && (fileMetadataForAction.getDataFile().getRetention() != null)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        for (FileMetadata fmd : selectedFiles) {
+            if (!fmd.getDataFile().isReleased() && (fmd.getDataFile().getRetention() != null)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
-    /**
-     * dataset title
-     * @return title of workingVersion
-     */
-    public String getTitle() {
-        assert (null != workingVersion);
-        return workingVersion.getTitle();
+    public boolean isRetentionExpired(List<FileMetadata> fmdList) {
+        return FileUtil.isRetentionExpired(fmdList);
     }
 
-    /**
-     * dataset description
-     *
-     * @return description of workingVersion
-     */
-    public String getDescription() {
-        return workingVersion.getDescriptionPlainText();
+    public boolean isRetentionForWholeSelection() {
+        for (FileMetadata fmd : selectedFiles) {
+            if (fmd.getDataFile().isReleased()) {
+                return false;
+            }
+        }
+        return true;
     }
 
-    /**
-     * dataset authors
-     *
-     * @return list of author names
-     */
-    public List<String> getDatasetAuthors() {
-        assert (workingVersion != null);
-        return workingVersion.getDatasetAuthorNames();
+    private boolean removeRetention=false;
+
+    public boolean isRemoveRetention() {
+        return removeRetention;
     }
 
-    /**
-     * publisher (aka - name of root dataverse)
-     *
-     * @return the publisher of the version
-     */
-    public String getPublisher() {
-        assert (null != workingVersion);
-        return workingVersion.getRootDataverseNameforCitation();
+    public void setRemoveRetention(boolean removeRetention) {
+        boolean existing = this.removeRetention;
+        this.removeRetention = removeRetention;
+        //If we flipped the state, update the selectedRetention. Otherwise (e.g. when save is hit) don't make changes
+        if(existing != this.removeRetention) {
+            logger.fine("State flip");
+            selectionRetention= new Retention();
+            if(removeRetention) {
+                logger.fine("Setting empty retention");
+                selectionRetention= new Retention(null, null);
+            }
+            PrimeFaces.current().resetInputs("datasetForm:retentionInputs");
+        }
     }
-    
-    public void downloadRsyncScript() {
 
-        FacesContext ctx = FacesContext.getCurrentInstance();
-        HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
-        response.setContentType("application/download");
+    public String saveRetention() {
+        if (workingVersion.isReleased()) {
+            refreshSelectedFiles(selectedFiles);
+        }
 
-        String contentDispositionString;
+        if(isRemoveRetention() || (selectionRetention.getDateUnavailable()==null && selectionRetention.getReason()==null)) {
+            selectionRetention=null;
+        }
 
-        contentDispositionString = "attachment;filename=" + rsyncScriptFilename;
-        response.setHeader("Content-Disposition", contentDispositionString);
+        if(!(selectionRetention==null || (selectionRetention!=null && settingsWrapper.isValidRetentionDate(selectionRetention)))) {
+            logger.fine("Validation error: " + selectionRetention.getFormattedDateUnavailable());
+            FacesContext.getCurrentInstance().validationFailed();
+            return "";
+        }
+        List<Retention> orphanedRetentions = new ArrayList<Retention>();
+        List<FileMetadata> retentionFMs = null;
+        if (fileMetadataForAction != null) {
+            retentionFMs = new ArrayList<FileMetadata>();
+            retentionFMs.add(fileMetadataForAction);
+        } else if (selectedFiles != null && selectedFiles.size() > 0) {
+            retentionFMs = selectedFiles;
+        }
 
-        try {
-            ServletOutputStream out = response.getOutputStream();
-            out.write(getRsyncScript().getBytes());
-            out.flush();
-            ctx.responseComplete();
-        } catch (IOException e) {
-            String error = "Problem getting bytes from rsync script: " + e;
-            logger.warning(error);
-            return; 
+        if(retentionFMs!=null && !retentionFMs.isEmpty()) {
+            if(selectionRetention!=null) {
+                selectionRetention = retentionService.merge(selectionRetention);
+            }
+            for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+                for (FileMetadata fm : retentionFMs) {
+                    if (fm.getDataFile().equals(fmd.getDataFile()) && (isSuperUser()||!fmd.getDataFile().isReleased())) {
+                        Retention ret = fmd.getDataFile().getRetention();
+                        if (ret != null) {
+                            logger.fine("Before: " + ret.getDataFiles().size());
+                            ret.getDataFiles().remove(fmd.getDataFile());
+                            if (ret.getDataFiles().isEmpty()) {
+                                orphanedRetentions.add(ret);
+                            }
+                            logger.fine("After: " + ret.getDataFiles().size());
+                        }
+                        fmd.getDataFile().setRetention(selectionRetention);
+                    }
+                }
+            }
         }
-        
-        // If the script has been successfully downloaded, lock the dataset:
-        String lockInfoMessage = "script downloaded";
-        DatasetLock lock = datasetService.addDatasetLock(dataset.getId(), DatasetLock.Reason.DcmUpload, session.getUser() != null ? ((AuthenticatedUser)session.getUser()).getId() : null, lockInfoMessage);
-        if (lock != null) {
-            dataset.addLock(lock);
-        } else {
-            logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId());
+        if (selectionRetention != null) {
+            retentionService.save(selectionRetention, ((AuthenticatedUser) session.getUser()).getIdentifier());
         }
-        
-    }
-    
-    public void closeRsyncScriptPopup(CloseEvent event) {
-        finishRsyncScriptAction();
-    }
-    
-    public String finishRsyncScriptAction() { 
-        // This method is called when the user clicks on "Close" in the "Rsync Upload" 
-        // popup. If they have successfully downloaded the rsync script, the 
-        // dataset should now be locked; which means we should put up the 
-        // "dcm upload in progress" message - that will be shown on the page 
-        // until the rsync upload is completed and the dataset is unlocked. 
-        if (isLocked()) {
-            JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("file.rsyncUpload.inProgressMessage.summary"), BundleUtil.getStringFromBundle("file.rsyncUpload.inProgressMessage.details"));
-        } 
-        return "";
-    }
+        // success message:
+        String successMessage = BundleUtil.getStringFromBundle("file.assignedRetention.success");
+        logger.fine(successMessage);
+        successMessage = successMessage.replace("{0}", "Selected Files");
+        JsfHelper.addFlashMessage(successMessage);
+        selectionRetention = new Retention();
 
-    /**
-     * this method returns the dataset fields to be shown in the dataset summary 
-     * on the dataset page.
-     * It returns the default summary fields( subject, description, keywords, related publications and notes)
-     * if the custom summary datafields has not been set, otherwise will set the custom fields set by the sysadmins
-     * 
-     * @return the dataset fields to be shown in the dataset summary
-     */
-    public List<DatasetField> getDatasetSummaryFields() {
-       customFields  = settingsWrapper.getValueForKey(SettingsServiceBean.Key.CustomDatasetSummaryFields);
-       
-        return DatasetUtil.getDatasetSummaryFields(workingVersion, customFields);
+        save();
+        for(Retention ret: orphanedRetentions) {
+            retentionService.delete(ret, ((AuthenticatedUser)session.getUser()).getUserIdentifier());
+        }
+        return returnToDraftVersion();
     }
 
-    public List<ExternalTool> getConfigureToolsForDataFile(Long fileId) {
-        return getCachedToolsForDataFile(fileId, ExternalTool.Type.CONFIGURE);
+    public void clearRetentionPopup() {
+        logger.fine("clearRetentionPopup called");
+        selectionRetention= new Retention();
+        setRemoveRetention(false);
+        PrimeFaces.current().resetInputs("datasetForm:retentionInputs");
     }
 
-    public List<ExternalTool> getExploreToolsForDataFile(Long fileId) {
-        return getCachedToolsForDataFile(fileId, ExternalTool.Type.EXPLORE);
+    public void clearSelectionRetention() {
+        logger.fine("clearSelectionRetention called");
+        selectionRetention= new Retention();
+        PrimeFaces.current().resetInputs("datasetForm:retentionInputs");
     }
 
-    public List<ExternalTool> getCachedToolsForDataFile(Long fileId, ExternalTool.Type type) {
-        Map<Long, List<ExternalTool>> cachedToolsByFileId = new HashMap<>();
-        List<ExternalTool> externalTools = new ArrayList<>();
-        switch (type) {
-            case EXPLORE:
-                cachedToolsByFileId = exploreToolsByFileId;
-                externalTools = exploreTools;
-                break;
-            case CONFIGURE:
-                cachedToolsByFileId = configureToolsByFileId;
-                externalTools = configureTools;
-                break;
-            default:
-                break;
-        }
-        List<ExternalTool> cachedTools = cachedToolsByFileId.get(fileId);
-        if (cachedTools != null) { //if already queried before and added to list
-            return cachedTools;
+    public boolean isCantDownloadDueToRetention() {
+        if (getSelectedNonDownloadableFiles() != null) {
+            for (FileMetadata fmd : getSelectedNonDownloadableFiles()) {
+                if (FileUtil.isRetentionExpired(fmd)) {
+                    return true;
+                }
+            }
         }
-        DataFile dataFile = datafileService.find(fileId);
-        cachedTools = ExternalToolServiceBean.findExternalToolsByFile(externalTools, dataFile);
-        cachedToolsByFileId.put(fileId, cachedTools); //add to map so we don't have to do the lifting again
-        return cachedTools;
+        return false;
     }
 
-    public List<ExternalTool> getDatasetExploreTools() {
-        return datasetExploreTools;
+    public boolean isCantRequestDueToRetention() {
+        if (fileDownloadHelper.getFilesForRequestAccess() != null) {
+            for (DataFile df : fileDownloadHelper.getFilesForRequestAccess()) {
+                if (FileUtil.isRetentionExpired(df)) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 
-    Boolean thisLatestReleasedVersion = null;
-    
-    public boolean isThisLatestReleasedVersion() {
-        if (thisLatestReleasedVersion != null) {
-            return thisLatestReleasedVersion;
-        }
-        
-        if (!workingVersion.isPublished()) {
-            thisLatestReleasedVersion = false;
-            return false;
-        }
-        
-        DatasetVersion latestPublishedVersion = null;
-        Command<DatasetVersion> cmd = new GetLatestPublishedDatasetVersionCommand(dvRequestService.getDataverseRequest(), dataset);
-        try {
-            latestPublishedVersion = commandEngine.submit(cmd);
-        } catch (Exception ex) {
-            // whatever...
+    private boolean containsOnlyRetentionExpiredFiles(List<FileMetadata> selectedFiles) {
+        for (FileMetadata fmd : selectedFiles) {
+            if (!FileUtil.isRetentionExpired(fmd)) {
+                return false;
+            }
         }
-        
-        thisLatestReleasedVersion = workingVersion.equals(latestPublishedVersion);
-        
-        return thisLatestReleasedVersion;
-        
+        return true;
     }
-    
-    public String getJsonLd() {
-        if (isThisLatestReleasedVersion()) {
-            ExportService instance = ExportService.getInstance(settingsService);
-            String jsonLd = instance.getExportAsString(dataset, SchemaDotOrgExporter.NAME);
-            if (jsonLd != null) {
-                logger.fine("Returning cached schema.org JSON-LD.");
-                return jsonLd;
-            } else {
-                logger.fine("No cached schema.org JSON-LD available. Going to the database.");
-                String jsonLdProduced = workingVersion.getJsonLd(); 
-                return  jsonLdProduced != null ? jsonLdProduced : "";
+
+    public String getIngestMessage() {
+        return BundleUtil.getStringFromBundle("file.ingestFailed.message", Arrays.asList(settingsWrapper.getGuidesBaseUrl(), settingsWrapper.getGuidesVersion()));
+    }
+
+    public void validateTerms(FacesContext context, UIComponent component, Object value) throws ValidatorException {
+        UIComponent lic = component.findComponent("licenses");
+        SelectOneMenu som = (SelectOneMenu) lic;
+        logger.fine("license in form is " + som.getValue());
+        if (som.getValue() == null) {
+            if (StringUtils.isBlank((String) value)) {
+                FacesMessage msg = new FacesMessage(BundleUtil.getStringFromBundle("dataset.license.custom.blankterms"));
+                msg.setSeverity(FacesMessage.SEVERITY_ERROR);
+
+                throw new ValidatorException(msg);
             }
         }
-        return "";
     }
 
-    public void selectAllFiles() {
-        logger.fine("selectAllFiles called");
-        selectedFiles = workingVersion.getFileMetadatas();
+    public boolean downloadingRestrictedFiles() {
+        if (fileMetadataForAction != null) {
+            return fileMetadataForAction.isRestricted();
+        }
+        for (FileMetadata fmd : this.selectedFiles) {
+            if (fmd.isRestricted()) {
+                return true;
+            }
+        }
+        return false;
     }
 
-    public void clearSelection() {
-        logger.info("clearSelection called");
-        selectedFiles = Collections.emptyList();
+    //Determines whether this Dataset uses a public store and therefore doesn't support embargoed or restricted files
+    public boolean isHasPublicStore() {
+        return settingsWrapper.isTrueForKey(SettingsServiceBean.Key.PublicInstall, StorageIO.isPublicStore(dataset.getEffectiveStorageDriverId()));
     }
     
-    public void fileListingPaginatorListener(PageEvent event) {       
-        setFilePaginatorPage(event.getPage());      
+    public boolean isGlobusTransferRequested() {
+        return globusTransferRequested;
     }
     
-    public void refreshPaginator() {
-        FacesContext facesContext = FacesContext.getCurrentInstance();
-        org.primefaces.component.datatable.DataTable dt = (org.primefaces.component.datatable.DataTable) facesContext.getViewRoot().findComponent("datasetForm:tabView:filesTable");
-        setFilePaginatorPage(dt.getPage());      
-        setRowsPerPage(dt.getRowsToRender());
-    }  
-    
     /**
-     * This method can be called from *.xhtml files to allow archiving of a dataset
-     * version from the user interface. It is not currently (11/18) used in the IQSS/develop
-     * branch, but is used by QDR and is kept here in anticipation of including a
-     * GUI option to archive (already published) versions after other dataset page
-     * changes have been completed.
+     * Analagous with the startDownload method, this method is called when the user
+     * tries to start a Globus transfer out (~download). The
+     * validateFilesForDownload call checks to see if there are some files that can
+     * be Globus transfered and, if so and there are no files that can't be
+     * transferre, this method will launch the globus transfer app. If there is a
+     * mix of files or if the guestbook popup is required, the method passes back to
+     * the UI so those popup(s) can be shown. Once they are, this method is called
+     * with the popupShown param true and the app will be shown.
      * 
-     * @param id - the id of the datasetversion to archive. 
+     * @param transferAll - when called from the dataset Access menu, this should be
+     *                    true so that all files are included in the processing.
+     *                    When it is called from the file table, the current
+     *                    selection is used and the param should be false.
+     * @param popupShown  - This method is called twice if the the mixed files or
+     *                    guestbook popups are needed. On the first call, popupShown
+     *                    is false so that the transfer is not started and those
+     *                    popups can be shown. On the second call, popupShown is
+     *                    true and processing will occur as long as there are some
+     *                    valid files to transfer.
      */
-    public void archiveVersion(Long id) {
-        if (session.getUser() instanceof AuthenticatedUser) {
-            AuthenticatedUser au = ((AuthenticatedUser) session.getUser());
-
-            DatasetVersion dv = datasetVersionService.retrieveDatasetVersionByVersionId(id).getDatasetVersion();
-            String className = settingsService.getValueForKey(SettingsServiceBean.Key.ArchiverClassName);
-            AbstractSubmitToArchiveCommand cmd = ArchiverUtil.createSubmitToArchiveCommand(className, dvRequestService.getDataverseRequest(), dv);
-            if (cmd != null) {
-                try {
-                    DatasetVersion version = commandEngine.submit(cmd);
-                    logger.info("Archived to " + version.getArchivalCopyLocation());
-                    if (version.getArchivalCopyLocation() != null) {
-                        resetVersionTabList();
-                        this.setVersionTabListForPostLoad(getVersionTabList());
-                        JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("datasetversion.archive.success"));
-                    } else {
-                        JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("datasetversion.archive.failure"));
-                    }
-                } catch (CommandException ex) {
-                    logger.log(Level.SEVERE, "Unexpected Exception calling  submit archive command", ex);
-                    JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("datasetversion.archive.failure"));
-                }
-            } else {
-                logger.log(Level.SEVERE, "Could not find Archiver class: " + className);
-                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("datasetversion.archive.failure"));
-
+    public void startGlobusTransfer(boolean transferAll, boolean popupShown) {
+        logger.fine("inside startGlobusTransfer; "+(transferAll ? "transferAll" : "NOTtransferAll") + " " + (popupShown ? "popupShown" : "NOTpopupShown"));
+        if (transferAll) {
+            this.setSelectedFiles(workingVersion.getFileMetadatas());
+        }
+        boolean guestbookRequired = isDownloadPopupRequired();
+        
+        boolean validated = validateFilesForDownload(true, true);
+        
+        if (validated) {
+            globusTransferRequested = true;
+            boolean mixed = "Mixed".equals(getValidateFilesOutcome());
+            // transfer is
+            updateGuestbookResponse(guestbookRequired, true, true);
+            if ((!guestbookRequired && !mixed) || popupShown) {
+                boolean doNotSaveGuestbookResponse = workingVersion.isDraft();
+                globusService.writeGuestbookAndStartTransfer(guestbookResponse, doNotSaveGuestbookResponse);
+                globusTransferRequested = false;
             }
         }
     }
 
-    private static Date getFileDateToCompare(FileMetadata fileMetadata) {
-        DataFile datafile = fileMetadata.getDataFile();
-
-        if (datafile.isReleased()) {
-            return datafile.getPublicationDate();
+    public String getWebloaderUrlForDataset(Dataset d) {
+        String localeCode = session.getLocaleCode();
+        User user = session.getUser();
+        if (user instanceof AuthenticatedUser) {
+            ApiToken apiToken = authService.getValidApiTokenForUser((AuthenticatedUser) user);
+            return WebloaderUtil.getWebloaderUrl(d, apiToken, localeCode,
+                    settingsService.getValueForKey(SettingsServiceBean.Key.WebloaderUrl));
+        } else {
+            // Shouldn't normally happen (seesion timeout? bug?)
+            logger.warning("getWebloaderUrlForDataset called for non-Authenticated user");
+            return null;
         }
-
-        return datafile.getCreateDate();
     }
     
-    private static final Comparator<FileMetadata> compareByLabelZtoA = new Comparator<FileMetadata>() {
-        @Override
-        public int compare(FileMetadata o1, FileMetadata o2) {
-            return o2.getLabel().toUpperCase().compareTo(o1.getLabel().toUpperCase());
+    /**
+     * Add Signposting
+     * 
+     * @return String
+     */
+
+    String signpostingLinkHeader = null;
+
+    public String getSignpostingLinkHeader() {
+        if ((workingVersion==null) || (!workingVersion.isReleased())) {
+            if(workingVersion==null) {
+                logger.warning("workingVersion was null in getSignpostingLinkHeader");
+            }
+            return null;
         }
-    };
-    
-    private static final Comparator<FileMetadata> compareByNewest = new Comparator<FileMetadata>() {
-        @Override
-        public int compare(FileMetadata o1, FileMetadata o2) {
-            return getFileDateToCompare(o2).compareTo(getFileDateToCompare(o1));
+        if (signpostingLinkHeader == null) {
+            SignpostingResources sr = new SignpostingResources(systemConfig, workingVersion,
+                    JvmSettings.SIGNPOSTING_LEVEL1_AUTHOR_LIMIT.lookupOptional().orElse(""),
+                    JvmSettings.SIGNPOSTING_LEVEL1_ITEM_LIMIT.lookupOptional().orElse(""));
+            signpostingLinkHeader = sr.getLinks();
         }
-    };
+        return signpostingLinkHeader;
+    }
     
-    private static final Comparator<FileMetadata> compareByOldest = new Comparator<FileMetadata>() {
-        @Override
-        public int compare(FileMetadata o1, FileMetadata o2) {
-            return getFileDateToCompare(o1).compareTo(getFileDateToCompare(o2));
-        }
-    };
+    public boolean isDOI() {
+        return AbstractDOIProvider.DOI_PROTOCOL.equals(dataset.getGlobalId().getProtocol());
+    }
     
-    private static final Comparator<FileMetadata> compareBySize = new Comparator<FileMetadata>() {
-        @Override
-        public int compare(FileMetadata o1, FileMetadata o2) {
-            return (new Long(o1.getDataFile().getFilesize())).compareTo(new Long(o2.getDataFile().getFilesize()));
-        }
-    };
+    public String saveVersionNote() {
+        this.editMode=EditMode.VERSIONNOTE;
+        publishDialogVersionNote = workingVersion.getVersionNote();
+        return save();
+    }
+    String publishDialogVersionNote = null;
     
-    private static final Comparator<FileMetadata> compareByType = new Comparator<FileMetadata>() {
-        @Override
-        public int compare(FileMetadata o1, FileMetadata o2) {
-            String type1 = StringUtil.isEmpty(o1.getDataFile().getFriendlyType()) ? "" : o1.getDataFile().getContentType();
-            String type2 = StringUtil.isEmpty(o2.getDataFile().getFriendlyType()) ? "" : o2.getDataFile().getContentType();
-            return type1.compareTo(type2);
-        }
-    };
+    // Make separate property for versionNote - can't have two p:dialogs changing the same property
+    public String getPublishDialogVersionNote() {
+        return publishDialogVersionNote;
+    }
+    
+    public void setPublishDialogVersionNote(String note) {
+        publishDialogVersionNote =note;
+    }
 
-    public void explore(ExternalTool externalTool) {
-        ApiToken apiToken = null;
-        User user = session.getUser();
-        if (user instanceof AuthenticatedUser) {
-            apiToken = authService.findApiTokenByUser((AuthenticatedUser) user);
-        }
-        ExternalToolHandler externalToolHandler = new ExternalToolHandler(externalTool, dataset, apiToken, session.getLocaleCode());
-        String toolUrl = externalToolHandler.getToolUrlWithQueryParams();
-        logger.fine("Exploring with " + toolUrl);
-        PrimeFaces.current().executeScript("window.open('"+toolUrl + "', target='_blank');");
+    String requestedCSL = CSLUtil.getDefaultStyle();
+
+    public String getRequestedCSL() {
+        return requestedCSL;
+    }
+
+    public void setRequestedCSL(String requestedCSL) {
+        this.requestedCSL = requestedCSL;
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetRelMaterial.java b/src/main/java/edu/harvard/iq/dataverse/DatasetRelMaterial.java
index f432e4f5bbf..53ea62f566a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetRelMaterial.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetRelMaterial.java
@@ -6,14 +6,14 @@
 
 package edu.harvard.iq.dataverse;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Version;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java b/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java
index 7680ebc16db..a0696ab38d9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java
@@ -6,7 +6,6 @@
 
 package edu.harvard.iq.dataverse;
 
-
 /**
  *
  * @author skraffmiller
@@ -25,10 +24,12 @@ public class DatasetRelPublication {
     private String description;
     private boolean replicationData;
     private int displayOrder;
+    private String relationType;
 
     public int getDisplayOrder() {
         return displayOrder;
     }
+
     public void setDisplayOrder(int displayOrder) {
         this.displayOrder = displayOrder;
     }
@@ -64,8 +65,7 @@ public String getUrl() {
     public void setUrl(String url) {
         this.url = url;
     }
-    
-    
+
     public String getTitle() {
         return title;
     }
@@ -82,12 +82,21 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-     public boolean isEmpty() {
-        return ((text==null || text.trim().equals(""))
-            && (!replicationData)
-            && (idType==null || idType.trim().equals(""))
-            && (idNumber==null || idNumber.trim().equals(""))                
-            && (url==null || url.trim().equals("")));
-    }        
+    public void setRelationType(String type) {
+        relationType = type;
+
+    }
+
+    public String getRelationType() {
+        return relationType;
+    }
+
+    public boolean isEmpty() {
+        return ((text == null || text.trim().equals(""))
+                && (!replicationData)
+                && (idType == null || idType.trim().equals(""))
+                && (idNumber == null || idNumber.trim().equals(""))
+                && (url == null || url.trim().equals("")));
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
index 530c703ef97..f52163192f7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
@@ -1,5 +1,6 @@
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
@@ -14,41 +15,36 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.DestroyDatasetCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.FinalizeDatasetPublicationCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.GetDatasetStorageSizeCommand;
 import edu.harvard.iq.dataverse.export.ExportService;
+import edu.harvard.iq.dataverse.globus.GlobusServiceBean;
 import edu.harvard.iq.dataverse.harvest.server.OAIRecordServiceBean;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.workflows.WorkflowComment;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+
+import java.io.*;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.Asynchronous;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.StoredProcedureQuery;
-import javax.persistence.TypedQuery;
-import org.apache.commons.lang.RandomStringUtils;
-import org.ocpsoft.common.util.Strings;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -64,52 +60,93 @@ public class DatasetServiceBean implements java.io.Serializable {
     @EJB
     IndexServiceBean indexService;
 
-    @EJB
-    DOIEZIdServiceBean doiEZIdServiceBean;
-
     @EJB
     SettingsServiceBean settingsService;
-    
+
     @EJB
     DatasetVersionServiceBean versionService;
-    
+
     @EJB
     DvObjectServiceBean dvObjectService;
-    
+
     @EJB
     AuthenticationServiceBean authentication;
-    
+
     @EJB
-    DataFileServiceBean fileService; 
-    
+    DataFileServiceBean fileService;
+
     @EJB
     PermissionServiceBean permissionService;
-    
+
     @EJB
     OAIRecordServiceBean recordService;
-    
+
     @EJB
     EjbDataverseEngine commandEngine;
-    
+
     @EJB
     SystemConfig systemConfig;
 
+    @EJB
+    GlobusServiceBean globusServiceBean;
+
+    @EJB
+    UserNotificationServiceBean userNotificationService;
+
     private static final SimpleDateFormat logFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss");
-    
+
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     protected EntityManager em;
 
     public Dataset find(Object pk) {
         return em.find(Dataset.class, pk);
     }
+
+    /**
+     * Retrieve a dataset with the deep underlying structure in one query execution.
+     * This is a more optimal choice when accessing files of a dataset.
+     * In a contrast, the find() method does not pre-fetch the file objects and results in point queries when accessing these objects.
+     * Since the files have a deep structure, many queries can be prevented by using the findDeep() method, especially for large datasets
+     * containing many files, and when iterating over all the files.
+     * When you are not going to access the file objects, the default find() method is better because of the lazy loading.
+     * @return a dataset with pre-fetched file objects
+     */
+    public Dataset findDeep(Object pk) {
+        try {
+            return (Dataset) em.createNamedQuery("Dataset.findById")
+                    .setParameter("id", pk)
+                    // Optimization hints: retrieve all data in one query; this prevents point queries when iterating over the files
+                    .setHint("eclipselink.left-join-fetch", "o.files.ingestRequest")
+                    .setHint("eclipselink.left-join-fetch", "o.files.thumbnailForDataset")
+                    .setHint("eclipselink.left-join-fetch", "o.files.dataTables")
+                    .setHint("eclipselink.left-join-fetch", "o.files.auxiliaryFiles")
+                    .setHint("eclipselink.left-join-fetch", "o.files.ingestReports")
+                    .setHint("eclipselink.left-join-fetch", "o.files.dataFileTags")
+                    .setHint("eclipselink.left-join-fetch", "o.files.fileMetadatas")
+                    .setHint("eclipselink.left-join-fetch", "o.files.fileMetadatas.fileCategories")
+                    .setHint("eclipselink.left-join-fetch", "o.files.fileMetadatas.varGroups")
+                    //.setHint("eclipselink.left-join-fetch", "o.files.guestbookResponses
+                    .setHint("eclipselink.left-join-fetch", "o.files.embargo")
+                    .setHint("eclipselink.left-join-fetch", "o.files.retention")
+                    .setHint("eclipselink.left-join-fetch", "o.files.fileAccessRequests")
+                    .setHint("eclipselink.left-join-fetch", "o.files.owner")
+                    .setHint("eclipselink.left-join-fetch", "o.files.releaseUser")
+                    .setHint("eclipselink.left-join-fetch", "o.files.creator")
+                    .setHint("eclipselink.left-join-fetch", "o.files.alternativePersistentIndentifiers")
+                    .setHint("eclipselink.left-join-fetch", "o.files.roleAssignments")
+                    .getSingleResult();
+        } catch (NoResultException | NonUniqueResultException ex) {
+            return null;
+        }
+    }
     
     public List<Dataset> findByOwnerId(Long ownerId) {
         return findByOwnerId(ownerId, false);
     }
-    
+
     public List<Dataset> findPublishedByOwnerId(Long ownerId) {
         return findByOwnerId(ownerId, true);
-    }    
+    }
 
     private List<Dataset> findByOwnerId(Long ownerId, boolean onlyPublished) {
         List<Dataset> retList = new ArrayList<>();
@@ -126,14 +163,14 @@ private List<Dataset> findByOwnerId(Long ownerId, boolean onlyPublished) {
             return retList;
         }
     }
-    
+
     public List<Long> findIdsByOwnerId(Long ownerId) {
-        return findIdsByOwnerId(ownerId, false);
+        return findIdsByOwnerId(ownerId, false, false);
     }
-    
-    private List<Long> findIdsByOwnerId(Long ownerId, boolean onlyPublished) {
+
+    public List<Long> findIdsByOwnerId(Long ownerId, boolean onlyPublished, boolean includeHarvested) {
         List<Long> retList = new ArrayList<>();
-        if (!onlyPublished) {
+        if (!onlyPublished && includeHarvested) {
             return em.createNamedQuery("Dataset.findIdByOwnerId")
                     .setParameter("ownerId", ownerId)
                     .getResultList();
@@ -141,21 +178,39 @@ private List<Long> findIdsByOwnerId(Long ownerId, boolean onlyPublished) {
             List<Dataset> results = em.createNamedQuery("Dataset.findByOwnerId")
                     .setParameter("ownerId", ownerId).getResultList();
             for (Dataset ds : results) {
-                if (ds.isReleased() && !ds.isDeaccessioned()) {
-                    retList.add(ds.getId());
+                // For harvested datasets, only add them if includeHarvested is true
+                if (ds.isHarvested()) {
+                    if (includeHarvested) {
+                        retList.add(ds.getId());
+                    }
+                // For non-harvested datasets, either
+                // - add them all (if onlyPublished is false) OR
+                // - only add them if they are released and not deaccessioned (if onlyPublished is true)
+                } else {
+                    if (!onlyPublished || (ds.isReleased() && !ds.isDeaccessioned())) {
+                        retList.add(ds.getId());
+                    }
                 }
             }
             return retList;
         }
     }
 
+    public List<Dataset> findByCreatorId(Long creatorId) {
+        return em.createNamedQuery("Dataset.findByCreatorId").setParameter("creatorId", creatorId).getResultList();
+    }
+
+    public List<Dataset> findByReleaseUserId(Long releaseUserId) {
+        return em.createNamedQuery("Dataset.findByReleaseUserId").setParameter("releaseUserId", releaseUserId).getResultList();
+    }
+
     public List<Dataset> filterByPidQuery(String filterQuery) {
         // finds only exact matches
         Dataset ds = findByGlobalId(filterQuery);
         List<Dataset> ret = new ArrayList<>();
         if (ds != null) ret.add(ds);
 
-        
+
         /*
         List<Dataset> ret = em.createNamedQuery("Dataset.filterByPid", Dataset.class)
             .setParameter("affiliation", "%" + filterQuery.toLowerCase() + "%").getResultList();
@@ -167,20 +222,34 @@ public List<Dataset> filterByPidQuery(String filterQuery) {
         }
         return ret;
     }
-    
+
     public List<Dataset> findAll() {
         return em.createQuery("select object(o) from Dataset as o order by o.id", Dataset.class).getResultList();
     }
-    
-    
+
+    public List<Long> findIdStale() {
+        return em.createNamedQuery("Dataset.findIdStale").getResultList();
+    }
+
+     public List<Long> findIdStalePermission() {
+        return em.createNamedQuery("Dataset.findIdStalePermission").getResultList();
+    }
+
     public List<Long> findAllLocalDatasetIds() {
         return em.createQuery("SELECT o.id FROM Dataset o WHERE o.harvestedFrom IS null ORDER BY o.id", Long.class).getResultList();
     }
-    
+
     public List<Long> findAllUnindexed() {
         return em.createQuery("SELECT o.id FROM Dataset o WHERE o.indexTime IS null ORDER BY o.id DESC", Long.class).getResultList();
     }
 
+    //Used in datasets listcurationstatus API
+    public List<Dataset> findAllWithDraftVersion() {
+        TypedQuery<Dataset> query = em.createQuery("SELECT object(d) FROM Dataset d, DatasetVersion v WHERE d.id=v.dataset.id and v.versionState=:state ORDER BY d.id ASC", Dataset.class);
+        query.setParameter("state", VersionState.DRAFT);
+        return query.getResultList();
+    }
+
     /**
      * For docs, see the equivalent method on the DataverseServiceBean.
      * @param numPartitions
@@ -188,7 +257,7 @@ public List<Long> findAllUnindexed() {
      * @param skipIndexed
      * @return a list of datasets
      * @see DataverseServiceBean#findAllOrSubset(long, long, boolean)
-     */     
+     */
     public List<Long> findAllOrSubset(long numPartitions, long partitionId, boolean skipIndexed) {
         if (numPartitions < 1) {
             long saneNumPartitions = 1;
@@ -202,7 +271,29 @@ public List<Long> findAllOrSubset(long numPartitions, long partitionId, boolean
         typedQuery.setParameter("partitionId", partitionId);
         return typedQuery.getResultList();
     }
-    
+
+        /**
+     * For docs, see the equivalent method on the DataverseServiceBean.
+     * @param numPartitions
+     * @param partitionId
+     * @param skipIndexed
+     * @return a list of datasets
+     * @see DataverseServiceBean#findAllOrSubset(long, long, boolean)
+     */
+    public List<Long> findAllOrSubsetOrderByFilesOwned(boolean skipIndexed) {
+        /*
+        Disregards deleted or replaced files when determining 'size' of dataset.
+        Could possibly make more efficient by getting file metadata counts
+        of latest published/draft version.
+        Also disregards partitioning which is no longer supported.
+        SEK - 11/09/2021
+        */
+
+        return em.createNamedQuery("Dataset.findAllOrSubsetOrderByFilesOwned", Long.class)
+                .setParameter(1, skipIndexed)
+                .getResultList();
+    }
+
     /**
      * Merges the passed dataset to the persistence context.
      * @param ds the dataset whose new state we want to persist.
@@ -211,26 +302,26 @@ public List<Long> findAllOrSubset(long numPartitions, long partitionId, boolean
     public Dataset merge( Dataset ds ) {
         return em.merge(ds);
     }
-    
+
     public Dataset findByGlobalId(String globalId) {
-        Dataset retVal = (Dataset) dvObjectService.findByGlobalId(globalId, "Dataset");
+        Dataset retVal = (Dataset) dvObjectService.findByGlobalId(globalId, DvObject.DType.Dataset);
         if (retVal != null){
             return retVal;
         } else {
             //try to find with alternative PID
-            return (Dataset) dvObjectService.findByGlobalId(globalId, "Dataset", true);
-        }        
+            return (Dataset) dvObjectService.findByAltGlobalId(globalId, DvObject.DType.Dataset);
+        }
     }
-    
+
     /**
      * Instantiate dataset, and its components (DatasetVersions and FileMetadatas)
      * this method is used for object validation; if there are any invalid values
      * in the dataset components, a ConstraintViolationException will be thrown,
      * which can be further parsed to detect the specific offending values.
      * @param id the id of the dataset
-     * @throws javax.validation.ConstraintViolationException 
+     * @throws ConstraintViolationException
      */
-    
+
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     public void instantiateDatasetInNewTransaction(Long id, boolean includeVariables) {
         Dataset dataset = find(id);
@@ -249,85 +340,11 @@ public void instantiateDatasetInNewTransaction(Long id, boolean includeVariables
         }
     }
 
-    public String generateDatasetIdentifier(Dataset dataset, GlobalIdServiceBean idServiceBean) {
-        String identifierType = settingsService.getValueForKey(SettingsServiceBean.Key.IdentifierGenerationStyle, "randomString");
-        String shoulder = settingsService.getValueForKey(SettingsServiceBean.Key.Shoulder, "");
-       
-        switch (identifierType) {
-            case "randomString":
-                return generateIdentifierAsRandomString(dataset, idServiceBean, shoulder);
-            case "sequentialNumber":
-                return generateIdentifierAsSequentialNumber(dataset, idServiceBean, shoulder);
-            default:
-                /* Should we throw an exception instead?? -- L.A. 4.6.2 */
-                return generateIdentifierAsRandomString(dataset, idServiceBean, shoulder);
-        }
-    }
-    
-    private String generateIdentifierAsRandomString(Dataset dataset, GlobalIdServiceBean idServiceBean, String shoulder) {
-        String identifier = null;
-        do {
-            identifier = shoulder + RandomStringUtils.randomAlphanumeric(6).toUpperCase();  
-        } while (!isIdentifierLocallyUnique(identifier, dataset));
-        
-        return identifier;
-    }
 
-    private String generateIdentifierAsSequentialNumber(Dataset dataset, GlobalIdServiceBean idServiceBean, String shoulder) {
-        
-        String identifier; 
-        do {
-            StoredProcedureQuery query = this.em.createNamedStoredProcedureQuery("Dataset.generateIdentifierAsSequentialNumber");
-            query.execute();
-            Integer identifierNumeric = (Integer) query.getOutputParameterValue(1); 
-            // some diagnostics here maybe - is it possible to determine that it's failing 
-            // because the stored procedure hasn't been created in the database?
-            if (identifierNumeric == null) {
-                return null; 
-            }
-            identifier = shoulder + identifierNumeric.toString();
-        } while (!isIdentifierLocallyUnique(identifier, dataset));
-        
-        return identifier;
-    }
 
-    /**
-     * Check that a identifier entered by the user is unique (not currently used
-     * for any other study in this Dataverse Network) also check for duplicate
-     * in EZID if needed
-     * @param userIdentifier
-     * @param dataset
-     * @param persistentIdSvc
-     * @return {@code true} if the identifier is unique, {@code false} otherwise.
-     */
-    public boolean isIdentifierUnique(String userIdentifier, Dataset dataset, GlobalIdServiceBean persistentIdSvc) {
-        if ( ! isIdentifierLocallyUnique(userIdentifier, dataset) ) return false; // duplication found in local database
-        
-        // not in local DB, look in the persistent identifier service
-        try {
-            return ! persistentIdSvc.alreadyExists(dataset);
-        } catch (Exception e){
-            //we can live with failure - means identifier not found remotely
-        }
-
-        return true;
-    }
-    
-    public boolean isIdentifierLocallyUnique(Dataset dataset) {
-        return isIdentifierLocallyUnique(dataset.getIdentifier(), dataset);
-    }
-    
-    public boolean isIdentifierLocallyUnique(String identifier, Dataset dataset) {
-        return em.createNamedQuery("Dataset.findByIdentifierAuthorityProtocol")
-            .setParameter("identifier", identifier)
-            .setParameter("authority", dataset.getAuthority())
-            .setParameter("protocol", dataset.getProtocol())
-            .getResultList().isEmpty();
-    }
-    
     public Long getMaximumExistingDatafileIdentifier(Dataset dataset) {
         //Cannot rely on the largest table id having the greatest identifier counter
-        long zeroFiles = new Long(0);
+        long zeroFiles = 0L;
         Long retVal = zeroFiles;
         Long testVal;
         List<Object> idResults;
@@ -344,10 +361,10 @@ public Long getMaximumExistingDatafileIdentifier(Dataset dataset) {
                 for (Object raw: idResults){
                     String identifier = (String) raw;
                     identifier =  identifier.substring(identifier.lastIndexOf("/") + 1);
-                    testVal = new Long(identifier) ;
+                    testVal = Long.valueOf(identifier) ;
                     if (testVal > retVal){
                         retVal = testVal;
-                    }               
+                    }
                 }
             }
         }
@@ -358,7 +375,7 @@ public DatasetVersion storeVersion( DatasetVersion dsv ) {
         em.persist(dsv);
         return dsv;
     }
-      
+
 
     public DatasetVersionUser getDatasetVersionUser(DatasetVersion version, User user) {
 
@@ -370,7 +387,7 @@ public DatasetVersionUser getDatasetVersionUser(DatasetVersion version, User use
         query.setParameter("userId", au.getId());
         try {
             return query.getSingleResult();
-        } catch (javax.persistence.NoResultException e) {
+        } catch (NoResultException e) {
             return null;
         }
     }
@@ -383,27 +400,29 @@ public boolean checkDatasetLock(Long datasetId) {
         return lock.size()>0;
     }
     
+    public List<DatasetLock> getLocksByDatasetId(Long datasetId) {
+        TypedQuery<DatasetLock> locksQuery = em.createNamedQuery("DatasetLock.getLocksByDatasetId", DatasetLock.class);
+        locksQuery.setParameter("datasetId", datasetId);
+        return locksQuery.getResultList();
+    }
+ 
     public List<DatasetLock> getDatasetLocksByUser( AuthenticatedUser user) {
 
-        TypedQuery<DatasetLock> query = em.createNamedQuery("DatasetLock.getLocksByAuthenticatedUserId", DatasetLock.class);
-        query.setParameter("authenticatedUserId", user.getId());
-        try {
-            return query.getResultList();
-        } catch (javax.persistence.NoResultException e) {
-            return null;
-        }
+        return listLocks(null, user);
     }
-    
+
+    // @todo: we'll be better off getting rid of this method and using the other 
+    // version of addDatasetLock() (that uses datasetId instead of Dataset). 
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     public DatasetLock addDatasetLock(Dataset dataset, DatasetLock lock) {
         lock.setDataset(dataset);
         dataset.addLock(lock);
         lock.setStartTime( new Date() );
         em.persist(lock);
-        em.merge(dataset); 
+        //em.merge(dataset);
         return lock;
     }
-    
+
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) /*?*/
     public DatasetLock addDatasetLock(Long datasetId, DatasetLock.Reason reason, Long userId, String info) {
 
@@ -416,11 +435,11 @@ public DatasetLock addDatasetLock(Long datasetId, DatasetLock.Reason reason, Lon
 
         // Check if the dataset is already locked for this reason:
         // (to prevent multiple, duplicate locks on the dataset!)
-        DatasetLock lock = dataset.getLockFor(reason); 
+        DatasetLock lock = dataset.getLockFor(reason);
         if (lock != null) {
             return lock;
         }
-        
+
         // Create new:
         lock = new DatasetLock(reason, user);
         lock.setDataset(dataset);
@@ -443,6 +462,7 @@ public DatasetLock addDatasetLock(Long datasetId, DatasetLock.Reason reason, Lon
      * is {@code aReason}.
      * @param dataset the dataset whose locks (for {@code aReason}) will be removed.
      * @param aReason The reason of the locks that will be removed.
+     * @todo this should probably take dataset_id, not a dataset
      */
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     public void removeDatasetLocks(Dataset dataset, DatasetLock.Reason aReason) {
@@ -460,21 +480,56 @@ public void removeDatasetLocks(Dataset dataset, DatasetLock.Reason aReason) {
                     });
         }
     }
-    
+
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public void updateDatasetLock(DatasetLock datasetLock) {
+        em.merge(datasetLock);
+    }
+
+    /*
+     * Lists all dataset locks, optionally filtered by lock type or user, or both
+     * @param lockType
+     * @param user
+     * @return a list of DatasetLocks
+    */
+    public List<DatasetLock> listLocks(DatasetLock.Reason lockType, AuthenticatedUser user) {
+
+        TypedQuery<DatasetLock> query;
+
+        if (lockType == null && user == null) {
+            query = em.createNamedQuery("DatasetLock.findAll", DatasetLock.class);
+        } else if (user == null) {
+            query = em.createNamedQuery("DatasetLock.getLocksByType", DatasetLock.class);
+            query.setParameter("lockType", lockType);
+        } else if (lockType == null) {
+            query = em.createNamedQuery("DatasetLock.getLocksByAuthenticatedUserId", DatasetLock.class);
+            query.setParameter("authenticatedUserId", user.getId());
+        } else {
+            query = em.createNamedQuery("DatasetLock.getLocksByTypeAndAuthenticatedUserId", DatasetLock.class);
+            query.setParameter("lockType", lockType);
+            query.setParameter("authenticatedUserId", user.getId());
+        }
+        try {
+            return query.getResultList();
+        } catch (NoResultException e) {
+            return null;
+        }
+    }
+
     /*
     getTitleFromLatestVersion methods use native query to return a dataset title
-    
+
         There are two versions:
      1) The version with datasetId param only will return the title regardless of version state
      2)The version with the param 'includeDraft' boolean  will return the most recently published title if the param is set to false
     If no Title found return empty string - protects against calling with
     include draft = false with no published version
     */
-    
+
     public String getTitleFromLatestVersion(Long datasetId){
         return getTitleFromLatestVersion(datasetId, true);
     }
-    
+
     public String getTitleFromLatestVersion(Long datasetId, boolean includeDraft){
 
         String whereDraft = "";
@@ -482,7 +537,7 @@ public String getTitleFromLatestVersion(Long datasetId, boolean includeDraft){
         if (!includeDraft) {
             whereDraft = " and v.versionstate !='DRAFT' ";
         }
-        
+
         try {
             return (String) em.createNativeQuery("select dfv.value  from dataset d "
                 + " join datasetversion v on d.id = v.dataset_id "
@@ -500,7 +555,7 @@ public String getTitleFromLatestVersion(Long datasetId, boolean includeDraft){
         }
 
     }
-    
+
     public Dataset getDatasetByHarvestInfo(Dataverse dataverse, String harvestIdentifier) {
         String queryStr = "SELECT d FROM Dataset d, DvObject o WHERE d.id = o.id AND o.owner.id = " + dataverse.getId() + " and d.harvestIdentifier = '" + harvestIdentifier + "'";
         Query query = em.createQuery(queryStr);
@@ -515,45 +570,45 @@ public Dataset getDatasetByHarvestInfo(Dataverse dataverse, String harvestIdenti
         return dataset;
 
     }
-    
+
     public Long getDatasetVersionCardImage(Long versionId, User user) {
         if (versionId == null) {
             return null;
         }
-        
-        
-        
+
+
+
         return null;
     }
-    
+
     /**
      * Used to identify and properly display Harvested objects on the dataverse page.
-     * 
+     *
      * @param datasetIds
-     * @return 
+     * @return
      */
     public Map<Long, String> getArchiveDescriptionsForHarvestedDatasets(Set<Long> datasetIds){
         if (datasetIds == null || datasetIds.size() < 1) {
             return null;
         }
-        
-        String datasetIdStr = Strings.join(datasetIds, ", ");
-        
+
+        String datasetIdStr = StringUtils.join(datasetIds, ", ");
+
         String qstr = "SELECT d.id, h.archiveDescription FROM harvestingClient h, dataset d WHERE d.harvestingClient_id = h.id AND d.id IN (" + datasetIdStr + ")";
         List<Object[]> searchResults;
-        
+
         try {
             searchResults = em.createNativeQuery(qstr).getResultList();
         } catch (Exception ex) {
             searchResults = null;
         }
-        
+
         if (searchResults == null) {
             return null;
         }
-        
+
         Map<Long, String> ret = new HashMap<>();
-        
+
         for (Object[] result : searchResults) {
             Long dsId;
             if (result[0] != null) {
@@ -565,85 +620,85 @@ public Map<Long, String> getArchiveDescriptionsForHarvestedDatasets(Set<Long> da
                 if (dsId == null) {
                     continue;
                 }
-                
+
                 ret.put(dsId, (String)result[1]);
             }
         }
-        
-        return ret;        
+
+        return ret;
     }
-    
-    
-    
-    public boolean isDatasetCardImageAvailable(DatasetVersion datasetVersion, User user) {        
+
+
+
+    public boolean isDatasetCardImageAvailable(DatasetVersion datasetVersion, User user) {
         if (datasetVersion == null) {
-            return false; 
+            return false;
         }
-                
-        // First, check if this dataset has a designated thumbnail image: 
-        
+
+        // First, check if this dataset has a designated thumbnail image:
+
         if (datasetVersion.getDataset() != null) {
             DataFile dataFile = datasetVersion.getDataset().getThumbnailFile();
             if (dataFile != null) {
                 return ImageThumbConverter.isThumbnailAvailable(dataFile, 48);
             }
         }
-        
+
         // If not, we'll try to use one of the files in this dataset version:
         // (the first file with an available thumbnail, really)
-        
+
         List<FileMetadata> fileMetadatas = datasetVersion.getFileMetadatas();
 
         for (FileMetadata fileMetadata : fileMetadatas) {
             DataFile dataFile = fileMetadata.getDataFile();
-            
-            // TODO: use permissionsWrapper here - ? 
-            // (we are looking up these download permissions on individual files, 
-            // true, and those are unique... but the wrapper may be able to save 
+
+            // TODO: use permissionsWrapper here - ?
+            // (we are looking up these download permissions on individual files,
+            // true, and those are unique... but the wrapper may be able to save
             // us some queries when it determines the download permission on the
             // dataset as a whole? -- L.A. 4.2.1
-            
+
             if (fileService.isThumbnailAvailable(dataFile) && permissionService.userOn(user, dataFile).has(Permission.DownloadFile)) { //, user)) {
                 return true;
             }
- 
+
         }
-        
+
         return false;
     }
-    
-    
-    // reExportAll *forces* a reexport on all published datasets; whether they 
-    // have the "last export" time stamp set or not. 
-    @Asynchronous 
+
+
+    // reExportAll *forces* a reexport on all published datasets; whether they
+    // have the "last export" time stamp set or not.
+    @Asynchronous
     public void reExportAllAsync() {
         exportAllDatasets(true);
     }
-    
+
     public void reExportAll() {
         exportAllDatasets(true);
     }
-    
-    
+
+
     // exportAll() will try to export the yet unexported datasets (it will honor
     // and trust the "last export" time stamp).
-    
+
     @Asynchronous
     public void exportAllAsync() {
         exportAllDatasets(false);
     }
-    
+
     public void exportAll() {
         exportAllDatasets(false);
     }
-    
+
     public void exportAllDatasets(boolean forceReExport) {
         Integer countAll = 0;
         Integer countSuccess = 0;
         Integer countError = 0;
         String logTimestamp = logFormatter.format(new Date());
         Logger exportLogger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.client.DatasetServiceBean." + "ExportAll" + logTimestamp);
-        String logFileName = "../logs" + File.separator + "export_" + logTimestamp + ".log";
+        String logFileName = System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "export_" + logTimestamp + ".log";
         FileHandler fileHandler;
         boolean fileHandlerSuceeded;
         try {
@@ -664,20 +719,20 @@ public void exportAllDatasets(boolean forceReExport) {
         exportLogger.info("Starting an export all job");
 
         for (Long datasetId : findAllLocalDatasetIds()) {
-            // Potentially, there's a godzillion datasets in this Dataverse. 
-            // This is why we go through the list of ids here, and instantiate 
-            // only one dataset at a time. 
+            // Potentially, there's a godzillion datasets in this Dataverse.
+            // This is why we go through the list of ids here, and instantiate
+            // only one dataset at a time.
             Dataset dataset = this.find(datasetId);
             if (dataset != null) {
                 // Accurate "is published?" test - ?
-                // Answer: Yes, it is! We can't trust dataset.isReleased() alone; because it is a dvobject method 
+                // Answer: Yes, it is! We can't trust dataset.isReleased() alone; because it is a dvobject method
                 // that returns (publicationDate != null). And "publicationDate" is essentially
-                // "the first publication date"; that stays the same as versions get 
-                // published and/or deaccessioned. But in combination with !isDeaccessioned() 
+                // "the first publication date"; that stays the same as versions get
+                // published and/or deaccessioned. But in combination with !isDeaccessioned()
                 // it is indeed an accurate test.
                 if (dataset.isReleased() && dataset.getReleasedVersion() != null && !dataset.isDeaccessioned()) {
 
-                    // can't trust dataset.getPublicationDate(), no. 
+                    // can't trust dataset.getPublicationDate(), no.
                     Date publicationDate = dataset.getReleasedVersion().getReleaseTime(); // we know this dataset has a non-null released version! Maybe not - SEK 8/19 (We do now! :)
                     if (forceReExport || (publicationDate != null
                             && (dataset.getLastExportTime() == null
@@ -685,10 +740,10 @@ public void exportAllDatasets(boolean forceReExport) {
                         countAll++;
                         try {
                             recordService.exportAllFormatsInNewTransaction(dataset);
-                            exportLogger.info("Success exporting dataset: " + dataset.getDisplayName() + " " + dataset.getGlobalIdString());
+                            exportLogger.info("Success exporting dataset: " + dataset.getDisplayName() + " " + dataset.getGlobalId().asString());
                             countSuccess++;
                         } catch (Exception ex) {
-                            exportLogger.info("Error exporting dataset: " + dataset.getDisplayName() + " " + dataset.getGlobalIdString() + "; " + ex.getMessage());
+                            exportLogger.log(Level.INFO, "Error exporting dataset: " + dataset.getDisplayName() + " " + dataset.getGlobalId().asString() + "; " + ex.getMessage(), ex);
                             countError++;
                         }
                     }
@@ -699,16 +754,86 @@ public void exportAllDatasets(boolean forceReExport) {
         exportLogger.info("Datasets exported successfully: " + countSuccess.toString());
         exportLogger.info("Datasets failures: " + countError.toString());
         exportLogger.info("Finished export-all job.");
-        
+
         if (fileHandlerSuceeded) {
             fileHandler.close();
         }
 
     }
-    
-    public void updateLastExportTimeStamp(Long datasetId) {
-        Date now = new Date();
-        em.createNativeQuery("UPDATE Dataset SET lastExportTime='"+now.toString()+"' WHERE id="+datasetId).executeUpdate();
+
+    @Asynchronous
+    public void reExportDatasetAsync(Dataset dataset) {
+        exportDataset(dataset, true);
+    }
+
+    public void exportDataset(Dataset dataset, boolean forceReExport) {
+        if (dataset != null) {
+            // Note that the logic for handling a dataset is similar to what is implemented in exportAllDatasets,
+            // but when only one dataset is exported we do not log in a separate export logging file
+            if (dataset.isReleased() && dataset.getReleasedVersion() != null && !dataset.isDeaccessioned()) {
+
+                // can't trust dataset.getPublicationDate(), no.
+                Date publicationDate = dataset.getReleasedVersion().getReleaseTime(); // we know this dataset has a non-null released version! Maybe not - SEK 8/19 (We do now! :)
+                if (forceReExport || (publicationDate != null
+                        && (dataset.getLastExportTime() == null
+                        || dataset.getLastExportTime().before(publicationDate)))) {
+                    try {
+                        recordService.exportAllFormatsInNewTransaction(dataset);
+                        logger.info("Success exporting dataset: " + dataset.getDisplayName() + " " + dataset.getGlobalId().asString());
+                    } catch (Exception ex) {
+                        logger.log(Level.INFO, "Error exporting dataset: " + dataset.getDisplayName() + " " + dataset.getGlobalId().asString() + "; " + ex.getMessage(), ex);
+                    }
+                }
+            }
+        }
+
+    }
+
+    //get a string to add to save success message
+    //depends on page (dataset/file) and user privleges
+    public String getReminderString(Dataset dataset, boolean canPublishDataset, boolean filePage, boolean isValid) {
+
+        String reminderString;
+
+        if (canPublishDataset) {
+            reminderString = BundleUtil.getStringFromBundle("dataset.message.publish.warning");
+        } else {
+            reminderString = BundleUtil.getStringFromBundle("dataset.message.submit.warning");
+        }
+
+        if (canPublishDataset) {
+            if (!filePage) {
+                reminderString = reminderString + " " + BundleUtil.getStringFromBundle("dataset.message.publish.remind.draft");
+            } else {
+                reminderString = reminderString + " " + BundleUtil.getStringFromBundle("dataset.message.publish.remind.draft.filePage");
+                reminderString = reminderString.replace("{0}", "" + (dataset.getGlobalId().asString().concat("&version=DRAFT")));
+            }
+        } else {
+            if (!filePage) {
+                reminderString = reminderString + " " + BundleUtil.getStringFromBundle("dataset.message.submit.remind.draft");
+            } else {
+                reminderString = reminderString + " " + BundleUtil.getStringFromBundle("dataset.message.submit.remind.draft.filePage");
+                reminderString = reminderString.replace("{0}", "" + (dataset.getGlobalId().asString().concat("&version=DRAFT")));
+            }
+        }
+
+        if (!isValid) {
+            reminderString = reminderString + "<br/><b style=\"color:red;\"> " + BundleUtil.getStringFromBundle("dataset.message.incomplete.warning") + "</b>";
+        }
+
+        if (reminderString != null) {
+            return reminderString;
+        } else {
+            logger.warning("Unable to get reminder string from bundle. Returning empty string.");
+            return "";
+        }
+    }
+
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public int clearAllExportTimes() {
+        Query clearExportTimes = em.createQuery("UPDATE Dataset SET lastExportTime = NULL");
+        int numRowsUpdated = clearExportTimes.executeUpdate();
+        return numRowsUpdated;
     }
 
     public Dataset setNonDatasetFileAsThumbnail(Dataset dataset, InputStream inputStream) {
@@ -720,8 +845,9 @@ public Dataset setNonDatasetFileAsThumbnail(Dataset dataset, InputStream inputSt
             logger.fine("In setNonDatasetFileAsThumbnail but inputStream is null! Returning null.");
             return null;
         }
-        dataset = DatasetUtil.persistDatasetLogoToStorageAndCreateThumbnail(dataset, inputStream);
+        dataset = DatasetUtil.persistDatasetLogoToStorageAndCreateThumbnails(dataset, inputStream);
         dataset.setThumbnailFile(null);
+        dataset.setUseGenericThumbnail(false);
         return merge(dataset);
     }
 
@@ -734,38 +860,53 @@ public Dataset setDatasetFileAsThumbnail(Dataset dataset, DataFile datasetFileTh
             logger.fine("In setDatasetFileAsThumbnail but dataset is null! Returning null.");
             return null;
         }
+        // Just in case the previously designated thumbnail for the dataset was 
+        // a "custom" kind, i.e. an uploaded "dataset_logo" file, the following method 
+        // will try to delete it, and all the associated caches here (because there 
+        // are no other uses for the file). This method is apparently called in all 
+        // cases, without trying to check if the dataset was in fact using a custom 
+        // logo; probably under the assumption that it can't hurt.
         DatasetUtil.deleteDatasetLogo(dataset);
         dataset.setThumbnailFile(datasetFileThumbnailToSwitchTo);
         dataset.setUseGenericThumbnail(false);
         return merge(dataset);
     }
 
-    public Dataset removeDatasetThumbnail(Dataset dataset) {
+    public Dataset clearDatasetLevelThumbnail(Dataset dataset) {
         if (dataset == null) {
-            logger.fine("In removeDatasetThumbnail but dataset is null! Returning null.");
+            logger.fine("In clearDatasetLevelThumbnail but dataset is null! Returning null.");
             return null;
         }
+        
+        // Just in case the thumbnail that was designated for the dataset was 
+        // a "custom logo" kind, i.e. an uploaded "dataset_logo" file, the following method 
+        // will try to delete it, and all the associated caches here (because there 
+        // are no other uses for the file). This method is apparently called in all 
+        // cases, without trying to check if the dataset was in fact using a custom 
+        // logo; probably under the assumption that it can't hurt.
         DatasetUtil.deleteDatasetLogo(dataset);
+        
+        // Clear any designated thumbnails for the dataset:
         dataset.setThumbnailFile(null);
         dataset.setUseGenericThumbnail(true);
         return merge(dataset);
     }
-    
+
     // persist assigned thumbnail in a single one-field-update query:
     // (the point is to avoid doing an em.merge() on an entire dataset object...)
     public void assignDatasetThumbnailByNativeQuery(Long datasetId, Long dataFileId) {
         try {
             em.createNativeQuery("UPDATE dataset SET thumbnailfile_id=" + dataFileId + " WHERE id=" + datasetId).executeUpdate();
         } catch (Exception ex) {
-            // it's ok to just ignore... 
+            // it's ok to just ignore...
         }
     }
-    
+
     public void assignDatasetThumbnailByNativeQuery(Dataset dataset, DataFile dataFile) {
         try {
             em.createNativeQuery("UPDATE dataset SET thumbnailfile_id=" + dataFile.getId() + " WHERE id=" + dataset.getId()).executeUpdate();
         } catch (Exception ex) {
-            // it's ok to just ignore... 
+            // it's ok to just ignore...
         }
     }
 
@@ -773,146 +914,116 @@ public WorkflowComment addWorkflowComment(WorkflowComment workflowComment) {
         em.persist(workflowComment);
         return workflowComment;
     }
-    
+
+    public void markWorkflowCommentAsRead(WorkflowComment workflowComment) {
+        workflowComment.setToBeShown(false);
+        em.merge(workflowComment);
+    }
+
+
+    /**
+     * This method used to throw CommandException, which was pretty pointless
+     * seeing how it's called asynchronously. As of v5.0 any CommanExceptiom
+     * thrown by the FinalizeDatasetPublicationCommand below will be caught
+     * and we'll log it as a warning - which is the best we can do at this point.
+     * Any failure notifications to users should be sent from inside the command.
+     */
     @Asynchronous
-    public void callFinalizePublishCommandAsynchronously(Long datasetId, CommandContext ctxt, DataverseRequest request, boolean isPidPrePublished) throws CommandException {
+    @TransactionAttribute(TransactionAttributeType.SUPPORTS)
+    public void callFinalizePublishCommandAsynchronously(Long datasetId, CommandContext ctxt, DataverseRequest request, boolean isPidPrePublished) {
 
-        // Since we are calling the next command asynchronously anyway - sleep here 
-        // for a few seconds, just in case, to make sure the database update of 
-        // the dataset initiated by the PublishDatasetCommand has finished, 
-        // to avoid any concurrency/optimistic lock issues. 
+        // Since we are calling the next command asynchronously anyway - sleep here
+        // for a few seconds, just in case, to make sure the database update of
+        // the dataset initiated by the PublishDatasetCommand has finished,
+        // to avoid any concurrency/optimistic lock issues.
+        // Aug. 2020/v5.0: It MAY be working consistently without any
+        // sleep here, after the call the method has been moved to the onSuccess()
+        // portion of the PublishDatasetCommand. I'm going to leave the 1 second
+        // sleep below, for just in case reasons: -- L.A.
         try {
-            Thread.sleep(15000);
+            Thread.sleep(1000);
         } catch (Exception ex) {
-            logger.warning("Failed to sleep for 15 seconds.");
+            logger.warning("Failed to sleep for one second.");
         }
         logger.fine("Running FinalizeDatasetPublicationCommand, asynchronously");
         Dataset theDataset = find(datasetId);
-        commandEngine.submit(new FinalizeDatasetPublicationCommand(theDataset, request, isPidPrePublished));
-    }
-    
-    /*
-     Experimental asynchronous method for requesting persistent identifiers for 
-     datafiles. We decided not to run this method on upload/create (so files 
-     will not have persistent ids while in draft; when the draft is published, 
-     we will force obtaining persistent ids for all the files in the version. 
-     
-     If we go back to trying to register global ids on create, care will need to 
-     be taken to make sure the asynchronous changes below are not conflicting with 
-     the changes from file ingest (which may be happening in parallel, also 
-     asynchronously). We would also need to lock the dataset (similarly to how 
-     tabular ingest logs the dataset), to prevent the user from publishing the
-     version before all the identifiers get assigned - otherwise more conflicts 
-     are likely. (It sounds like it would make sense to treat these two tasks -
-     persistent identifiers for files and ingest - as one post-upload job, so that 
-     they can be run in sequence). -- L.A. Mar. 2018
-    */
-    @Asynchronous
-    public void obtainPersistentIdentifiersForDatafiles(Dataset dataset) {
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(dataset.getProtocol(), commandEngine.getContext());
-
-        //If the Id type is sequential and Dependent then write file idenitifiers outside the command
-        String datasetIdentifier = dataset.getIdentifier();
-        Long maxIdentifier = null;
-
-        if (systemConfig.isDataFilePIDSequentialDependent()) {
-            maxIdentifier = getMaximumExistingDatafileIdentifier(dataset);
+        try {
+            commandEngine.submit(new FinalizeDatasetPublicationCommand(theDataset, request, isPidPrePublished));
+        } catch (CommandException cex) {
+            logger.warning("CommandException caught when executing the asynchronous portion of the Dataset Publication Command.");
         }
+    }
 
-        for (DataFile datafile : dataset.getFiles()) {
-            logger.info("Obtaining persistent id for datafile id=" + datafile.getId());
-
-            if (datafile.getIdentifier() == null || datafile.getIdentifier().isEmpty()) {
-
-                logger.info("Obtaining persistent id for datafile id=" + datafile.getId());
-
-                if (maxIdentifier != null) {
-                    maxIdentifier++;
-                    datafile.setIdentifier(datasetIdentifier + "/" + maxIdentifier.toString());
-                } else {
-                    datafile.setIdentifier(fileService.generateDataFileIdentifier(datafile, idServiceBean));
-                }
-
-                if (datafile.getProtocol() == null) {
-                    datafile.setProtocol(settingsService.getValueForKey(SettingsServiceBean.Key.Protocol, ""));
-                }
-                if (datafile.getAuthority() == null) {
-                    datafile.setAuthority(settingsService.getValueForKey(SettingsServiceBean.Key.Authority, ""));
-                }
-
-                logger.info("identifier: " + datafile.getIdentifier());
-
-                String doiRetString;
-
-                try {
-                    logger.log(Level.FINE, "creating identifier");
-                    doiRetString = idServiceBean.createIdentifier(datafile);
-                } catch (Throwable e) {
-                    logger.log(Level.WARNING, "Exception while creating Identifier: " + e.getMessage(), e);
-                    doiRetString = "";
-                }
+    public long findStorageSize(Dataset dataset) throws IOException {
+        return findStorageSize(dataset, false, GetDatasetStorageSizeCommand.Mode.STORAGE, null);
+    }
 
-                // Check return value to make sure registration succeeded
-                if (!idServiceBean.registerWhenPublished() && doiRetString.contains(datafile.getIdentifier())) {
-                    datafile.setIdentifierRegistered(true);
-                    datafile.setGlobalIdCreateTime(new Date());
-                }
-                
-                DataFile merged = em.merge(datafile);
-                merged = null; 
-            }
 
-        }
-    }
-    
-    public long findStorageSize(Dataset dataset) throws IOException {
-        return findStorageSize(dataset, false);
+    public long findStorageSize(Dataset dataset, boolean countCachedExtras) throws IOException {
+        return findStorageSize(dataset, countCachedExtras, GetDatasetStorageSizeCommand.Mode.STORAGE, null);
     }
-    
+
     /**
-     * Returns the total byte size of the files in this dataset 
-     * 
+     * Returns the total byte size of the files in this dataset
+     *
      * @param dataset
      * @param countCachedExtras boolean indicating if the cached disposable extras should also be counted
-     * @return total size 
-     * @throws IOException if it can't access the objects via StorageIO 
-     * (in practice, this can only happen when called with countCachedExtras=true; when run in the 
-     * default mode, the method doesn't need to access the storage system, as the 
+     * @param mode String indicating whether we are getting the result for storage (entire dataset) or download version based
+     * @param version optional param for dataset version
+     * @return total size
+     * @throws IOException if it can't access the objects via StorageIO
+     * (in practice, this can only happen when called with countCachedExtras=true; when run in the
+     * default mode, the method doesn't need to access the storage system, as the
      * sizes of the main files are recorded in the database)
      */
-    public long findStorageSize(Dataset dataset, boolean countCachedExtras) throws IOException {
-        long total = 0L; 
-        
+    public long findStorageSize(Dataset dataset, boolean countCachedExtras, GetDatasetStorageSizeCommand.Mode mode, DatasetVersion version) throws IOException {
+        long total = 0L;
+
         if (dataset.isHarvested()) {
             return 0L;
         }
-        
-        for (DataFile datafile : dataset.getFiles()) {
-            total += datafile.getFilesize(); 
-            
-            if (!countCachedExtras) {
-                if (datafile.isTabularData()) {
-                    // count the size of the stored original, in addition to the main tab-delimited file:
-                    Long originalFileSize = datafile.getDataTable().getOriginalFileSize();
-                    if (originalFileSize != null) { 
-                        total += originalFileSize;
+
+        List<DataFile> filesToTally = new ArrayList();
+
+        if (version == null || (mode != null &&  mode.equals("storage"))){
+            filesToTally = dataset.getFiles();
+        } else {
+            List <FileMetadata>  fmds = version.getFileMetadatas();
+            for (FileMetadata fmd : fmds){
+                    filesToTally.add(fmd.getDataFile());
+            }
+        }
+
+
+        //CACHED EXTRAS FOR DOWNLOAD?
+
+
+        for (DataFile datafile : filesToTally) {
+                total += datafile.getFilesize();
+
+                if (!countCachedExtras) {
+                    if (datafile.isTabularData()) {
+                        // count the size of the stored original, in addition to the main tab-delimited file:
+                        Long originalFileSize = datafile.getDataTable().getOriginalFileSize();
+                        if (originalFileSize != null) {
+                            total += originalFileSize;
+                        }
+                    }
+                } else {
+                    StorageIO<DataFile> storageIO = datafile.getStorageIO();
+                    for (String cachedFileTag : storageIO.listAuxObjects()) {
+                        total += storageIO.getAuxObjectSize(cachedFileTag);
                     }
                 }
-            } else {
-                StorageIO<DataFile> storageIO = datafile.getStorageIO();
-                for (String cachedFileTag : storageIO.listAuxObjects()) {
-                    total += storageIO.getAuxObjectSize(cachedFileTag);
-                }                
             }
-        }
-        
+
         // and finally,
         if (countCachedExtras) {
             // count the sizes of the files cached for the dataset itself
             // (i.e., the metadata exports):
             StorageIO<Dataset> datasetSIO = DataAccess.getStorageIO(dataset);
-            
-            for (String[] exportProvider : ExportService.getInstance(settingsService).getExportersLabels()) {
+
+            for (String[] exportProvider : ExportService.getInstance().getExportersLabels()) {
                 String exportLabel = "export_" + exportProvider[1] + ".cached";
                 try {
                     total += datasetSIO.getAuxObjectSize(exportLabel);
@@ -921,31 +1032,31 @@ public long findStorageSize(Dataset dataset, boolean countCachedExtras) throws I
                 }
             }
         }
-        
-        return total; 
+
+        return total;
     }
-    
+
     /**
-     * An optimized method for deleting a harvested dataset. 
-     * 
+     * An optimized method for deleting a harvested dataset.
+     *
      * @param dataset
      * @param request DataverseRequest (for initializing the DestroyDatasetCommand)
      * @param hdLogger logger object (in practice, this will be a separate log file created for a specific harvesting job)
      */
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     public void deleteHarvestedDataset(Dataset dataset, DataverseRequest request, Logger hdLogger) {
-        // Purge all the SOLR documents associated with this client from the 
-        // index server: 
+        // Purge all the SOLR documents associated with this client from the
+        // index server:
         indexService.deleteHarvestedDocuments(dataset);
-        
+
         try {
-            // files from harvested datasets are removed unceremoniously, 
-            // directly in the database. no need to bother calling the 
+            // files from harvested datasets are removed unceremoniously,
+            // directly in the database. no need to bother calling the
             // DeleteFileCommand on them.
             for (DataFile harvestedFile : dataset.getFiles()) {
                 DataFile merged = em.merge(harvestedFile);
                 em.remove(merged);
-                harvestedFile = null; 
+                harvestedFile = null;
             }
             dataset.setFiles(null);
             Dataset merged = em.merge(dataset);
@@ -953,6 +1064,37 @@ public void deleteHarvestedDataset(Dataset dataset, DataverseRequest request, Lo
             hdLogger.info("Successfully destroyed the dataset");
         } catch (Exception ex) {
             hdLogger.warning("Failed to destroy the dataset");
-        } 
+        }
     }
+    
+    public List<String> getVersionStates(long id) {
+        try {
+            Query query = em.createNativeQuery("SELECT dv.versionState FROM datasetversion dv WHERE dataset_id=? ORDER BY id");
+            query.setParameter(1, id);
+            return (List<String>) query.getResultList();
+
+        } catch (Exception ex) {
+            logger.log(Level.WARNING, "exception trying to get versionstates of dataset " + id + ": {0}", ex);
+            return null;
+        }
+    }
+
+    /**
+     * Returns the total number of Datasets.
+     * @return the number of datasets in the database
+     */
+    public long getDatasetCount() {
+        return em.createNamedQuery("Dataset.countAll", Long.class).getSingleResult();
+    }
+
+    /**
+     *
+     * @param id - owner id
+     * @return Total number of datafiles for this dataset/owner
+     */
+    public int getDataFileCountByOwner(long id) {
+        Long c = em.createNamedQuery("Dataset.countFilesByOwnerId", Long.class).setParameter("ownerId", id).getSingleResult();
+        return c.intValue(); // ignoring the truncation since the number should never be too large
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetTopicClass.java b/src/main/java/edu/harvard/iq/dataverse/DatasetTopicClass.java
index f253e1810a1..91a4ff3cf5a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetTopicClass.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetTopicClass.java
@@ -6,8 +6,8 @@
 
 package edu.harvard.iq.dataverse;
 
-import javax.persistence.Column;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Version;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
index 48479872c63..14ddf65a833 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -1,18 +1,26 @@
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.util.MarkupChecker;
+import edu.harvard.iq.dataverse.util.PersonOrOrgUtil;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.DataFileComparator;
 import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
+import edu.harvard.iq.dataverse.license.License;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.util.DateUtil;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 import edu.harvard.iq.dataverse.workflows.WorkflowComment;
 import java.io.Serializable;
-import java.net.URL;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.sql.Timestamp;
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -20,48 +28,66 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
-import javax.persistence.Version;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang.StringUtils;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Transient;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.persistence.Version;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.constraints.Size;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
  * @author skraffmiller
  */
+
+@NamedQueries({
+    @NamedQuery(name = "DatasetVersion.findUnarchivedReleasedVersion",
+               query = "SELECT OBJECT(o) FROM DatasetVersion AS o WHERE o.dataset.harvestedFrom IS NULL and o.releaseTime IS NOT NULL and o.archivalCopyLocation IS NULL"
+    ), 
+    @NamedQuery(name = "DatasetVersion.findById", 
+                query = "SELECT o FROM DatasetVersion o LEFT JOIN FETCH o.fileMetadatas WHERE o.id=:id"), 
+    @NamedQuery(name = "DatasetVersion.findByDataset",
+                query = "SELECT o FROM DatasetVersion o WHERE o.dataset.id=:datasetId ORDER BY o.versionNumber DESC, o.minorVersionNumber DESC"), 
+    @NamedQuery(name = "DatasetVersion.findReleasedByDataset",
+                query = "SELECT o FROM DatasetVersion o WHERE o.dataset.id=:datasetId AND o.versionState=edu.harvard.iq.dataverse.DatasetVersion.VersionState.RELEASED ORDER BY o.versionNumber DESC, o.minorVersionNumber DESC")/*,
+    @NamedQuery(name = "DatasetVersion.findVersionElements",
+                query = "SELECT o.id, o.versionState, o.versionNumber, o.minorVersionNumber FROM DatasetVersion o WHERE o.dataset.id=:datasetId ORDER BY o.versionNumber DESC, o.minorVersionNumber DESC")*/})
+    
+    
 @Entity
 @Table(indexes = {@Index(columnList="dataset_id")},
         uniqueConstraints = @UniqueConstraint(columnNames = {"dataset_id,versionnumber,minorversionnumber"}))
-@ValidateVersionNote(versionNote = "versionNote", versionState = "versionState")
+@ValidateDeaccessionNote(deaccessionNote = "deaccessionNote", versionState = "versionState")
 public class DatasetVersion implements Serializable {
 
     private static final Logger logger = Logger.getLogger(DatasetVersion.class.getCanonicalName());
+    private static final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
 
     /**
      * Convenience comparator to compare dataset versions by their version number.
@@ -79,21 +105,30 @@ public int compare(DatasetVersion o1, DatasetVersion o2) {
             }
         }
     };
+    public static final JsonObjectBuilder compareVersions(DatasetVersion originalVersion, DatasetVersion newVersion) {
+        DatasetVersionDifference diff = new DatasetVersionDifference(newVersion, originalVersion);
+        return diff.compareVersionsAsJson();
+    }
 
     // TODO: Determine the UI implications of various version states
     //IMPORTANT: If you add a new value to this enum, you will also have to modify the
     // StudyVersionsFragment.xhtml in order to display the correct value from a Resource Bundle
     public enum VersionState {
         DRAFT, RELEASED, ARCHIVED, DEACCESSIONED
-    };
-
-    public enum License {
-        NONE, CC0
     }
 
-    public static final int ARCHIVE_NOTE_MAX_LENGTH = 1000;
+    public static final int DEACCESSION_NOTE_MAX_LENGTH = 1000;
+    public static final int DEACCESSION_LINK_MAX_LENGTH = 1260; //Long enough to cover the case where a legacy deaccessionLink(256 char) and archiveNote (1000) are combined (with a space)
     public static final int VERSION_NOTE_MAX_LENGTH = 1000;
     
+    //Archival copies: Status message required components
+    public static final String ARCHIVAL_STATUS = "status";
+    public static final String ARCHIVAL_STATUS_MESSAGE = "message";
+    //Archival Copies: Allowed Statuses
+    public static final String ARCHIVAL_STATUS_PENDING = "pending";
+    public static final String ARCHIVAL_STATUS_SUCCESS = "success";
+    public static final String ARCHIVAL_STATUS_FAILURE = "failure";
+    
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -106,10 +141,16 @@ public enum License {
     private Long versionNumber;
     private Long minorVersionNumber;
     
+    //This is used for the deaccession reason
+    @Size(min=0, max=DEACCESSION_NOTE_MAX_LENGTH)
+    @Column(length = DEACCESSION_NOTE_MAX_LENGTH)
+    private String deaccessionNote;
+    
+    //This is a plain text, optional reason for the version's creation
     @Size(min=0, max=VERSION_NOTE_MAX_LENGTH)
     @Column(length = VERSION_NOTE_MAX_LENGTH)
     private String versionNote;
-    
+
     /*
      * @todo versionState should never be null so when we are ready, uncomment
      * the `nullable = false` below.
@@ -146,21 +187,25 @@ public enum License {
     @Temporal(value = TemporalType.TIMESTAMP)
     private Date archiveTime;
     
-    @Size(min=0, max=ARCHIVE_NOTE_MAX_LENGTH)
-    @Column(length = ARCHIVE_NOTE_MAX_LENGTH)
-    //@ValidateURL() - this validation rule was making a bunch of older legacy datasets invalid;
-    // removed pending further investigation (v4.13)
-    private String archiveNote;
-    
+    // Originally a simple string indicating the location of the archival copy. As
+    // of v5.12, repurposed to provide a more general json archival status (failure,
+    // pending, success) and message (serialized as a string). The archival copy
+    // location is now expected as the contents of the message for the status
+    // 'success'. See the /api/datasets/{id}/{version}/archivalStatus API calls for more details
     @Column(nullable=true, columnDefinition = "TEXT")
     private String archivalCopyLocation;
     
-    
+    //This is used for the deaccession reason
+    @Size(min=0, max=DEACCESSION_LINK_MAX_LENGTH)
+    @Column(length = DEACCESSION_LINK_MAX_LENGTH)
     private String deaccessionLink;
 
     @Transient
     private String contributorNames;
-    
+
+    @Transient
+    private final String dataverseSiteUrl = SystemConfig.getDataverseSiteUrlStatic();
+
     @Transient 
     private String jsonLd;
 
@@ -171,6 +216,19 @@ public enum License {
     @OneToMany(mappedBy = "datasetVersion", cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     private List<WorkflowComment> workflowComments;
 
+    /*
+     * As of v6.7, the NULLS LAST part of the annotation below appears to not be working. Explicit sorting has been added in the getCurationStatuses() method. The annotation is kept since, if it does work
+     * in the future, it is presumably more efficient that sorting in our code.
+     */
+    @OneToMany(mappedBy = "datasetVersion", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OrderBy("createTime DESC NULLS LAST")
+    private List<CurationStatus> curationStatuses = new ArrayList<>();
+
+    @Transient
+    private DatasetVersionDifference dvd;
+    
+    @Transient 
+    private JsonObject archivalStatus;
     
     public Long getId() {
         return this.id;
@@ -198,22 +256,73 @@ public Long getVersion() {
 
     public void setVersion(Long version) {
     }
-    
+
+    public String getDataverseSiteUrl() {
+        return dataverseSiteUrl;
+    }
+
     public List<FileMetadata> getFileMetadatas() {
         return fileMetadatas;
     }
     
     public List<FileMetadata> getFileMetadatasSorted() {
-        Collections.sort(fileMetadatas, FileMetadata.compareByLabel);
+ 
+        /*
+         * fileMetadatas can sometimes be an
+         * org.eclipse.persistence.indirection.IndirectList When that happens, the
+         * comparator in the Collections.sort below is not called, possibly due to
+         * https://bugs.eclipse.org/bugs/show_bug.cgi?id=446236 which is Java 1.8+
+         * specific Converting to an ArrayList solves the problem, but the longer term
+         * solution may be in avoiding the IndirectList or moving to a new version of
+         * the jar it is in.
+         */
+        if(!(fileMetadatas instanceof ArrayList)) {
+            List<FileMetadata> newFMDs = new ArrayList<FileMetadata>();
+            for(FileMetadata fmd: fileMetadatas) {
+                newFMDs.add(fmd);
+            }
+            setFileMetadatas(newFMDs);
+        }
+        
+        DataFileComparator dfc = new DataFileComparator();
+        Collections.sort(fileMetadatas, dfc.compareBy(true, null!=FileMetadata.getCategorySortOrder(), "name", true));
         return fileMetadatas;
     }
     
     public List<FileMetadata> getFileMetadatasSortedByLabelAndFolder() {
         ArrayList<FileMetadata> fileMetadatasCopy = new ArrayList<>();
         fileMetadatasCopy.addAll(fileMetadatas);
-        Collections.sort(fileMetadatasCopy, FileMetadata.compareByLabelAndFolder);
+        DataFileComparator dfc = new DataFileComparator();
+        Collections.sort(fileMetadatasCopy, dfc.compareBy(true, null!=FileMetadata.getCategorySortOrder(), "name", true));
         return fileMetadatasCopy;
     }
+    
+    public List<FileMetadata> getFileMetadatasFolderListing(String folderName) {
+        ArrayList<FileMetadata> fileMetadatasCopy = new ArrayList<>();
+        HashSet<String> subFolders = new HashSet<>();
+
+        for (FileMetadata fileMetadata : fileMetadatas) {
+            String thisFolder = fileMetadata.getDirectoryLabel() == null ? "" : fileMetadata.getDirectoryLabel(); 
+            
+            if (folderName.equals(thisFolder)) {
+                fileMetadatasCopy.add(fileMetadata);
+            } else if (thisFolder.startsWith(folderName)) {
+                String subFolder = "".equals(folderName) ? thisFolder : thisFolder.substring(folderName.length() + 1);
+                if (subFolder.indexOf('/') > 0) {
+                    subFolder = subFolder.substring(0, subFolder.indexOf('/'));
+                }
+                
+                if (!subFolders.contains(subFolder)) {
+                    fileMetadatasCopy.add(fileMetadata);
+                    subFolders.add(subFolder);
+                }
+                
+            }
+        }
+        Collections.sort(fileMetadatasCopy, FileMetadata.compareByFullPath);
+                
+        return fileMetadatasCopy; 
+    }
 
     public void setFileMetadatas(List<FileMetadata> fileMetadatas) {
         this.fileMetadatas = fileMetadatas;
@@ -263,25 +372,42 @@ public void setArchiveTime(Date archiveTime) {
         this.archiveTime = archiveTime;
     }
 
-    public String getArchiveNote() {
-        return archiveNote;
+    public String getArchivalCopyLocation() {
+        return archivalCopyLocation;
     }
-
-    public void setArchiveNote(String note) {
-        // @todo should this be using bean validation for trsting note length?
-        if (note != null && note.length() > ARCHIVE_NOTE_MAX_LENGTH) {
-            throw new IllegalArgumentException("Error setting archiveNote: String length is greater than maximum (" + ARCHIVE_NOTE_MAX_LENGTH + ")."
-                    + "  StudyVersion id=" + id + ", archiveNote=" + note);
-        }
-        this.archiveNote = note;
+    
+    public String getArchivalCopyLocationStatus() {
+        populateArchivalStatus(false);
+        
+        if(archivalStatus!=null) {
+            return archivalStatus.getString(ARCHIVAL_STATUS);
+        } 
+        return null;
+    }
+    public String getArchivalCopyLocationMessage() {
+        populateArchivalStatus(false);
+        if(archivalStatus!=null) {
+            return archivalStatus.getString(ARCHIVAL_STATUS_MESSAGE);
+        } 
+        return null;
     }
     
-    public String getArchivalCopyLocation() {
-        return archivalCopyLocation;
+    private void populateArchivalStatus(boolean force) {
+        if(archivalStatus ==null || force) {
+            if(archivalCopyLocation!=null) {
+                try {
+            archivalStatus = JsonUtil.getJsonObject(archivalCopyLocation);
+                } catch(Exception e) {
+                    logger.warning("DatasetVersion id: " + id + "has a non-JsonObject value, parsing error: " + e.getMessage());
+                    logger.fine(archivalCopyLocation);
+                }
+            }
+        }
     }
 
     public void setArchivalCopyLocation(String location) {
         this.archivalCopyLocation = location;
+        populateArchivalStatus(true);
     }
 
     public String getDeaccessionLink() {
@@ -289,11 +415,21 @@ public String getDeaccessionLink() {
     }
 
     public void setDeaccessionLink(String deaccessionLink) {
+        if (deaccessionLink != null && deaccessionLink.length() > DEACCESSION_LINK_MAX_LENGTH) {
+            throw new IllegalArgumentException("Error setting deaccessionLink: String length is greater than maximum (" + DEACCESSION_LINK_MAX_LENGTH + ")."
+                    + "  StudyVersion id=" + id + ", deaccessionLink=" + deaccessionLink);
+        }
         this.deaccessionLink = deaccessionLink;
     }
 
-    public GlobalId getDeaccessionLinkAsGlobalId() {
-        return new GlobalId(deaccessionLink);
+    public String getDeaccessionLinkAsURLString() {
+        String dLink = null;
+        try {
+            dLink = new URI(deaccessionLink).toURL().toExternalForm();
+        } catch (URISyntaxException | MalformedURLException e) {
+            logger.fine("Invalid deaccessionLink - not a URL: " + deaccessionLink);
+        }
+        return dLink;
     }
 
     public Date getCreateTime() {
@@ -362,11 +498,15 @@ public void setContributorNames(String contributorNames) {
     }
 
  
-    public String getVersionNote() {
-        return versionNote;
+    public String getDeaccessionNote() {
+        return deaccessionNote;
     }
 
     public DatasetVersionDifference getDefaultVersionDifference() {
+        //Cache to avoid recalculating the difference many many times in the dataset-versions.xhtml page
+        if(dvd!=null) {
+            return dvd;
+        }
         // if version is deaccessioned ignore it for differences purposes
         int index = 0;
         int size = this.getDataset().getVersions().size();
@@ -378,7 +518,7 @@ public DatasetVersionDifference getDefaultVersionDifference() {
                 if ((index + 1) <= (size - 1)) {
                     for (DatasetVersion dvTest : this.getDataset().getVersions().subList(index + 1, size)) {
                         if (!dvTest.isDeaccessioned()) {
-                            DatasetVersionDifference dvd = new DatasetVersionDifference(this, dvTest);
+                            dvd = new DatasetVersionDifference(this, dvTest);
                             return dvd;
                         }
                     }
@@ -409,12 +549,12 @@ public VersionState getPriorVersionState() {
         return null;
     }
 
-    public void setVersionNote(String note) {
-        if (note != null && note.length() > VERSION_NOTE_MAX_LENGTH) {
-            throw new IllegalArgumentException("Error setting versionNote: String length is greater than maximum (" + VERSION_NOTE_MAX_LENGTH + ")."
-                    + "  StudyVersion id=" + id + ", versionNote=" + note);
+    public void setDeaccessionNote(String note) {
+        if (note != null && note.length() > DEACCESSION_NOTE_MAX_LENGTH) {
+            throw new IllegalArgumentException("Error setting deaccessionNote: String length is greater than maximum (" + DEACCESSION_NOTE_MAX_LENGTH + ")."
+                    + "  StudyVersion id=" + id + ", deaccessionNote=" + note);
         }
-        this.versionNote = note;
+        this.deaccessionNote = note;
     }
    
     public Long getVersionNumber() {
@@ -523,6 +663,13 @@ public boolean isHasNonPackageFile(){
         // The presence of any non-package file means that HTTP Upload was used (no mixing allowed) so we just check the first file.
         return !this.fileMetadatas.get(0).getDataFile().getContentType().equals(DataFileServiceBean.MIME_TYPE_PACKAGE_FILE);
     }
+    
+    public boolean isHasRestrictedFile(){
+        if (this.fileMetadatas == null || this.fileMetadatas.isEmpty()){
+            return false;
+        }
+        return this.fileMetadatas.stream().anyMatch(fm -> (fm.isRestricted()));
+    }
 
     public void updateDefaultValuesFromTemplate(Template template) {
         if (!template.getDatasetFields().isEmpty()) {
@@ -532,12 +679,6 @@ public void updateDefaultValuesFromTemplate(Template template) {
             TermsOfUseAndAccess terms = template.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
             terms.setDatasetVersion(this);
             this.setTermsOfUseAndAccess(terms);
-        } else {
-            TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
-            terms.setDatasetVersion(this);
-            terms.setLicense(TermsOfUseAndAccess.License.CC0);
-            terms.setDatasetVersion(this);
-            this.setTermsOfUseAndAccess(terms);
         }
     }
     
@@ -554,15 +695,12 @@ public DatasetVersion cloneDatasetVersion(){
                 dsv.setDatasetFields(dsv.copyDatasetFields(this.getDatasetFields()));
             }
             
-            if (this.getTermsOfUseAndAccess()!= null){
-                dsv.setTermsOfUseAndAccess(this.getTermsOfUseAndAccess().copyTermsOfUseAndAccess());
-            } else {
-                TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
-                terms.setDatasetVersion(dsv);
-                terms.setLicense(TermsOfUseAndAccess.License.CC0);
-                dsv.setTermsOfUseAndAccess(terms);
-            }
-
+            /*
+            adding file metadatas here and updating terms
+            because the terms need to know about the files
+            in a pre-save validation SEK 12/6/2021
+            */
+            
             for (FileMetadata fm : this.getFileMetadatas()) {
                 FileMetadata newFm = new FileMetadata();
                 // TODO: 
@@ -582,23 +720,31 @@ public DatasetVersion cloneDatasetVersion(){
                 
                 dsv.getFileMetadatas().add(newFm);
             }
-
-
-
+            
+            if (this.getTermsOfUseAndAccess()!= null){
+                TermsOfUseAndAccess terms = this.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
+                terms.setDatasetVersion(dsv);
+                dsv.setTermsOfUseAndAccess(terms);
+            } else {
+                TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+                terms.setDatasetVersion(dsv);
+               // terms.setLicense(TermsOfUseAndAccess.License.CC0);
+                dsv.setTermsOfUseAndAccess(terms);
+            }
 
         dsv.setDataset(this.getDataset());
         return dsv;
-        
     }
 
-    public void initDefaultValues() {
+    public void initDefaultValues(License license) {
         //first clear then initialize - in case values were present 
         // from template or user entry
         this.setDatasetFields(new ArrayList<>());
         this.setDatasetFields(this.initDatasetFields());
         TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
         terms.setDatasetVersion(this);
-        terms.setLicense(TermsOfUseAndAccess.License.CC0);
+        terms.setLicense(license);
+        terms.setFileAccessRequest(true);
         this.setTermsOfUseAndAccess(terms);
 
     }
@@ -675,8 +821,13 @@ public String getTitle() {
     }
 
     public String getProductionDate() {
-        //todo get "Production Date" from datasetfieldvalue table
-        return "Production Date";
+        String retVal = null;
+        for (DatasetField dsfv : this.getDatasetFields()) {
+            if (dsfv.getDatasetFieldType().getName().equals(DatasetFieldConstant.productionDate)) {
+                retVal = dsfv.getDisplayValue();
+            }
+        }
+        return retVal;
     }
 
     /**
@@ -732,12 +883,26 @@ public String getDescriptionPlainText() {
         return MarkupChecker.stripAllTags(getDescription());
     }
 
-    public List<String> getDescriptionsPlainText() {
-        List<String> plainTextDescriptions = new ArrayList<>();
+    /* This method is (only) used in creating schema.org json-jd where Google requires a text description <5000 chars.
+     * 
+     * @returns - a single string composed of all descriptions (joined with \n if more than one) truncated with a trailing '...' if >=5000 chars
+     */
+    public String getDescriptionsPlainTextTruncated() {
+        List<String> plainTextDescriptions = new ArrayList<String>();
+        
         for (String htmlDescription : getDescriptions()) {
             plainTextDescriptions.add(MarkupChecker.stripAllTags(htmlDescription));
         }
-        return plainTextDescriptions;
+        String description = String.join("\n", plainTextDescriptions);
+        if (description.length() >= 5000) {
+            int endIndex = description.substring(0, 4997).lastIndexOf(" ");
+            if (endIndex == -1) {
+                //There are no spaces so just break anyway
+                endIndex = 4997;
+            }
+            description = description.substring(0, endIndex) + "...";
+        }
+        return description;
     }
 
     /**
@@ -749,7 +914,16 @@ public String getDescriptionHtmlEscaped() {
         return MarkupChecker.escapeHtml(getDescription());
     }
 
-    public List<String[]> getDatasetContacts(){
+    public List<String[]> getDatasetContacts() {
+        boolean getDisplayValues = true;
+        return getDatasetContacts(getDisplayValues);
+    }
+
+    /**
+     * @param getDisplayValues Instead of the retrieving pristine value in the
+     * database, run the value through special formatting.
+     */
+    public List<String[]> getDatasetContacts(boolean getDisplayValues) {
         List <String[]> retList = new ArrayList<>();
         for (DatasetField dsf : this.getDatasetFields()) {
             Boolean addContributor = true;
@@ -762,10 +936,11 @@ public List<String[]> getDatasetContacts(){
                             if (subField.isEmptyForDisplay()) {
                                 addContributor = false;
                             }
+                            // There is no use case yet for getting the non-display value for contributorName.
                             contributorName = subField.getDisplayValue();
                         }
                         if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.datasetContactAffiliation)) {
-                            contributorAffiliation = subField.getDisplayValue();
+                            contributorAffiliation = getDisplayValues ? subField.getDisplayValue() : subField.getValue();
                         }
 
                     }
@@ -778,7 +953,7 @@ public List<String[]> getDatasetContacts(){
         }       
         return retList;        
     }
-    
+
     public List<String[]> getDatasetProducers(){
         List <String[]> retList = new ArrayList<>();
         for (DatasetField dsf : this.getDatasetFields()) {
@@ -828,7 +1003,7 @@ public List<DatasetAuthor> getDatasetAuthors() {
                             datasetAuthor.setAffiliation(subField);
                         }
                         if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.authorIdType)){
-                             datasetAuthor.setIdType(subField.getDisplayValue());
+                             datasetAuthor.setIdType(subField.getRawValue());
                         }
                         if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.authorIdValue)){
                             datasetAuthor.setIdValue(subField.getDisplayValue());
@@ -856,7 +1031,7 @@ public List<String> getFunders() {
                             contributorName = subField.getDisplayValue();
                         }
                         if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.contributorType)) {
-                            contributorType = subField.getDisplayValue();
+                            contributorType = subField.getRawValue();
                         }
                     }
                     //SEK 02/12/2019 move outside loop to prevent contrib type to carry over to next contributor
@@ -1130,6 +1305,62 @@ public List<String> getKeywords() {
         return getCompoundChildFieldValues(DatasetFieldConstant.keyword, DatasetFieldConstant.keywordValue);
     }
     
+    public List<String> getRelatedMaterial() {
+        List<String> relMaterial = new ArrayList<>();
+        for (DatasetField dsf : this.getDatasetFields()) {
+            if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.relatedMaterial)) {
+                relMaterial.addAll(dsf.getValues());
+            }
+        }
+        return relMaterial;
+    } 
+    
+    public List<String> getDataSource() {
+        List<String> dataSources = new ArrayList<>();
+        for (DatasetField dsf : this.getDatasetFields()) {
+            if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.dataSources)) {
+                dataSources.addAll(dsf.getValues());
+            }
+        }
+        return dataSources;
+    }
+    
+    public List<String[]> getGeographicCoverage() {
+        List<String[]> geoCoverages = new ArrayList<>();
+
+        for (DatasetField dsf : this.getDatasetFields()) {
+            if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.geographicCoverage)) {
+                for (DatasetFieldCompoundValue geoCoverage : dsf.getDatasetFieldCompoundValues()) {
+                    String country = null;
+                    String state = null;
+                    String city = null;
+                    String other = null;
+                    String[] coverageItem = null;
+                    for (DatasetField subField : geoCoverage.getChildDatasetFields()) {
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.country)) {
+                            country = subField.getDisplayValue();
+                        }
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.state)) {
+                            state = subField.getDisplayValue();
+                        }
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.city)) {
+                            city = subField.getDisplayValue();
+                        }
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.otherGeographicCoverage)) {
+                            other = subField.getDisplayValue();
+                        }
+
+                        coverageItem = new String[]{country, state, city, other};
+                    }
+                    geoCoverages.add(coverageItem);
+                }
+                break;
+            }
+        }
+        return geoCoverages;
+    }
+
+    
     public List<DatasetRelPublication> getRelatedPublications() {
         List<DatasetRelPublication> relatedPublications = new ArrayList<>();
         for (DatasetField dsf : this.getDatasetFields()) {
@@ -1137,22 +1368,45 @@ public List<DatasetRelPublication> getRelatedPublications() {
                 for (DatasetFieldCompoundValue publication : dsf.getDatasetFieldCompoundValues()) {
                     DatasetRelPublication relatedPublication = new DatasetRelPublication();
                     for (DatasetField subField : publication.getChildDatasetFields()) {
-                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationCitation)) {
-                            String citation = subField.getDisplayValue();
-                            relatedPublication.setText(citation);
-                        }
-                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationURL)) {
-                            // We have to avoid using subField.getDisplayValue() here - because the DisplayFormatType 
-                            // for this url metadata field is likely set up so that the display value is automatically 
-                            // turned into a clickable HTML HREF block, which we don't want to end in our Schema.org JSON-LD output.
-                            // So we want to use the raw value of the field instead, with 
-                            // minimal HTML sanitation, just in case (this would be done on all URLs in getDisplayValue()).
-                            String url = subField.getValue();
-                            if (StringUtils.isBlank(url) || DatasetField.NA_VALUE.equals(url)) {
-                                relatedPublication.setUrl("");
-                            } else {
-                                relatedPublication.setUrl(MarkupChecker.sanitizeBasicHTML(url));
-                            }
+                        switch (subField.getDatasetFieldType().getName()) {
+                            case DatasetFieldConstant.publicationCitation:
+                                relatedPublication.setText(subField.getDisplayValue());
+                                break;
+                            case DatasetFieldConstant.publicationURL:
+                                // We have to avoid using subField.getDisplayValue() here - because the
+                                // DisplayFormatType
+                                // for this url metadata field is likely set up so that the display value is
+                                // automatically
+                                // turned into a clickable HTML HREF block, which we don't want to end in our
+                                // Schema.org
+                                // JSON-LD output. So we want to use the raw value of the field instead, with
+                                // minimal HTML
+                                // sanitation, just in case (this would be done on all URLs in
+                                // getDisplayValue()).
+                                String url = subField.getValue();
+                                if (StringUtils.isBlank(url) || DatasetField.NA_VALUE.equals(url)) {
+                                    relatedPublication.setUrl("");
+                                } else {
+                                    relatedPublication.setUrl(MarkupChecker.sanitizeBasicHTML(url));
+                                }
+                                break;
+                            case DatasetFieldConstant.publicationIDType:
+                                // QDR idType has a trailing : now (Aug 2021)
+                                // Get value without any display modifications
+                                subField.getDatasetFieldType().setDisplayFormat("#VALUE");
+                                relatedPublication.setIdType(subField.getDisplayValue());
+                                break;
+                            case DatasetFieldConstant.publicationIDNumber:
+                                // Get sanitized value without any display modifications
+                                subField.getDatasetFieldType().setDisplayFormat("#VALUE");
+                                relatedPublication.setIdNumber(subField.getDisplayValue());
+                                break;
+                            case DatasetFieldConstant.publicationRelationType:
+                                List<String> values = subField.getValues_nondisplay();
+                                if (!values.isEmpty()) {
+                                    relatedPublication.setRelationType(values.get(0)); //only one value allowed
+                                }
+                                break;
                         }
                     }
                     relatedPublications.add(relatedPublication);
@@ -1174,17 +1428,14 @@ public List<String> getUniqueGrantAgencyValues() {
     }
 
     /**
-     * @return String containing the version's series title
+     * @return List of Strings containing the version's series title(s)
      */
-    public String getSeriesTitle() {
+    public List<String>  getSeriesTitles() {
 
         List<String> seriesNames = getCompoundChildFieldValues(DatasetFieldConstant.series,
                 DatasetFieldConstant.seriesName);
-        if (seriesNames.size() > 1) {
-            logger.warning("More than one series title found for datasetVersion: " + this.id);
-        }
         if (!seriesNames.isEmpty()) {
-            return seriesNames.get(0);
+            return seriesNames;
         } else {
             return null;
         }
@@ -1240,7 +1491,14 @@ public String getCitation() {
     }
 
     public String getCitation(boolean html) {
-        return new DataCitation(this).toString(html);
+        return getCitation(DataCitation.Format.Internal, html, false);
+    }
+    public String getCitation(boolean html, boolean anonymized) {
+        return getCitation(DataCitation.Format.Internal, html, anonymized);
+    }
+    
+    public String getCitation(DataCitation.Format format, boolean html, boolean anonymized) {
+        return new DataCitation(this).toString(format, html, anonymized);
     }
     
     public Date getCitationDate() {
@@ -1291,21 +1549,6 @@ public String getDistributorName() {
         }
         return null;
     }
-    
-    // TODO: Consider renaming this method since it's also used for getting the "provider" for Schema.org JSON-LD.
-    public String getRootDataverseNameforCitation(){
-                    //Get root dataverse name for Citation
-        Dataverse root = this.getDataset().getOwner();
-        while (root.getOwner() != null) {
-            root = root.getOwner();
-        }
-        String rootDataverseName = root.getName();
-        if (!StringUtil.isEmpty(rootDataverseName)) {
-            return rootDataverseName;
-        } else {
-            return "";
-        }
-    }
 
     public List<DatasetDistributor> getDatasetDistributors() {
         //todo get distributors from DatasetfieldValues
@@ -1437,16 +1680,7 @@ public String getReturnToDatasetURL(String serverName, Dataset dset) {
         }
         return serverName + "/dataset.xhtml?id=" + dset.getId() + "&versionId=" + this.getId();
     } 
-    
-    /*
-    Per #3511 we  are returning all users to the File Landing page
-    If we in the future we are going to return them to the referring page we will need the 
-    getReturnToDatasetURL method and add something to the call to the api to
-    pass the referring page and some kind of decision point in  the getWorldMapDatafileInfo method in 
-    WorldMapRelatedData
-    SEK 3/24/2017
-    */
-    
+
     public String getReturnToFilePageURL (String serverName, Dataset dset, DataFile dataFile){
         if (serverName == null || dataFile == null) {
             return null;
@@ -1516,8 +1750,6 @@ public String getSemanticVersion() {
 
     public List<ConstraintViolation<DatasetField>> validateRequired() {
         List<ConstraintViolation<DatasetField>> returnListreturnList = new ArrayList<>();
-        ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
-        Validator validator = factory.getValidator();
         for (DatasetField dsf : this.getFlatDatasetFields()) {
             dsf.setValidationMessage(null); // clear out any existing validation message
             Set<ConstraintViolation<DatasetField>> constraintViolations = validator.validate(dsf);
@@ -1531,11 +1763,43 @@ public List<ConstraintViolation<DatasetField>> validateRequired() {
         return returnListreturnList;
     }
     
+    public boolean isValid() {
+        // first clone to leave the original untouched
+        final DatasetVersion newVersion = this.cloneDatasetVersion();
+        // initDatasetFields
+        newVersion.setDatasetFields(newVersion.initDatasetFields());
+        // remove special "N/A" values and empty values
+        newVersion.removeEmptyValues();
+        // check validity of present fields and detect missing mandatory fields
+        return newVersion.validate().isEmpty();
+    }
+
+    private void removeEmptyValues() {
+        if (this.getDatasetFields() != null) {
+            for (DatasetField dsf : this.getDatasetFields()) {
+                removeEmptyValues(dsf);
+            }
+        }
+    }
+
+    private void removeEmptyValues(DatasetField dsf) {
+        if (dsf.getDatasetFieldType().isPrimitive()) { // primitive
+            final Iterator<DatasetFieldValue> i = dsf.getDatasetFieldValues().iterator();
+            while (i.hasNext()) {
+                final String v = i.next().getValue();
+                if (StringUtils.isBlank(v) || DatasetField.NA_VALUE.equals(v)) {
+                    i.remove();
+                }
+            }
+        } else {
+            dsf.getDatasetFieldCompoundValues().forEach(cv -> cv.getChildDatasetFields().forEach(v -> removeEmptyValues(v)));
+        }
+    }
+
     public Set<ConstraintViolation> validate() {
         Set<ConstraintViolation> returnSet = new HashSet<>();
 
-        ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
-        Validator validator = factory.getValidator();
+
         for (DatasetField dsf : this.getFlatDatasetFields()) {
             dsf.setValidationMessage(null); // clear out any existing validation message
             Set<ConstraintViolation<DatasetField>> constraintViolations = validator.validate(dsf);
@@ -1575,6 +1839,21 @@ public Set<ConstraintViolation> validate() {
             }
         }
         
+        
+        TermsOfUseAndAccess toua = this.termsOfUseAndAccess;
+        //Only need to test Terms of Use and Access if there are restricted files  
+        if (toua != null && this.isHasRestrictedFile()) {
+            Set<ConstraintViolation<TermsOfUseAndAccess>> constraintViolations = validator.validate(toua);
+            if (constraintViolations.size() > 0) {
+                ConstraintViolation<TermsOfUseAndAccess> violation = constraintViolations.iterator().next();
+                String message = BundleUtil.getStringFromBundle("dataset.message.toua.invalid");
+                logger.info(message);
+                this.termsOfUseAndAccess.setValidationMessage(message);
+                returnSet.add(violation);
+            }
+        }
+
+        
         return returnSet;
     }
     
@@ -1603,17 +1882,14 @@ public String getPublicationDateAsString() {
     // one metadata export in a given format per dataset (it uses the current 
     // released (published) version. This JSON fragment is generated for a 
     // specific released version - and we can have multiple released versions. 
+    // (A JSON fragment is generated for drafts as well. -- P.D.)
     // So something will need to be modified to accommodate this. -- L.A.  
     /**
      * We call the export format "Schema.org JSON-LD" and extensive Javadoc can
-     * be found in {@link SchemaDotOrgExporter}.
+     * be found in {@link edu.harvard.iq.dataverse.export.SchemaDotOrgExporter}.
      */
     public String getJsonLd() {
         // We show published datasets only for "datePublished" field below.
-        if (!this.isPublished()) {
-            return "";
-        }
-        
         if (jsonLd != null) {
             return jsonLd;
         }
@@ -1627,28 +1903,47 @@ public String getJsonLd() {
         JsonArrayBuilder authors = Json.createArrayBuilder();
         for (DatasetAuthor datasetAuthor : this.getDatasetAuthors()) {
             JsonObjectBuilder author = Json.createObjectBuilder();
-            String name = datasetAuthor.getName().getValue();
+            String name = datasetAuthor.getName().getDisplayValue();
+            String identifierAsUrl = datasetAuthor.getIdentifierAsUrl();
             DatasetField authorAffiliation = datasetAuthor.getAffiliation();
             String affiliation = null;
             if (authorAffiliation != null) {
                 affiliation = datasetAuthor.getAffiliation().getValue();
             }
-            // We are aware of "givenName" and "familyName" but instead of a person it might be an organization such as "Gallup Organization".
-            //author.add("@type", "Person");
-            author.add("name", name);
-            // We are aware that the following error is thrown by https://search.google.com/structured-data/testing-tool
-            // "The property affiliation is not recognized by Google for an object of type Thing."
-            // Someone at Google has said this is ok.
-            // This logic could be moved into the `if (authorAffiliation != null)` block above.
-            if (!StringUtil.isEmpty(affiliation)) {
-                author.add("affiliation", affiliation);
-            }
-            String identifierAsUrl = datasetAuthor.getIdentifierAsUrl();
-            if (identifierAsUrl != null) {
-                // It would be valid to provide an array of identifiers for authors but we have decided to only provide one.
-                author.add("@id", identifierAsUrl);
-                author.add("identifier", identifierAsUrl);
+            JsonObject entity = PersonOrOrgUtil.getPersonOrOrganization(name, false, (identifierAsUrl!=null));
+            String givenName= entity.containsKey("givenName") ? entity.getString("givenName"):null;
+            String familyName= entity.containsKey("familyName") ? entity.getString("familyName"):null;
+            
+            if (entity.getBoolean("isPerson")) {
+                // Person
+                author.add("@type", "Person");
+                if (givenName != null) {
+                    author.add("givenName", givenName);
+                }
+                if (familyName != null) {
+                    author.add("familyName", familyName);
+                }
+                if (!StringUtil.isEmpty(affiliation)) {
+                    author.add("affiliation", Json.createObjectBuilder().add("@type", "Organization").add("name", affiliation));
+                }
+                //Currently all possible identifier URLs are for people not Organizations
+                if(identifierAsUrl != null) {
+                    author.add("sameAs", identifierAsUrl);
+                    //Legacy - not sure if these are still useful
+                    author.add("@id", identifierAsUrl);
+                    author.add("identifier", identifierAsUrl);
+
+                }
+            } else {
+                // Organization
+                author.add("@type", "Organization");
+                if (!StringUtil.isEmpty(affiliation)) {
+                    author.add("parentOrganization", Json.createObjectBuilder().add("@type", "Organization").add("name", affiliation));
+                }
             }
+            // Both cases
+            author.add("name", entity.getString("fullName"));
+            //And add to the array
             authors.add(author);
         }
         JsonArray authorsArray = authors.build();
@@ -1683,18 +1978,15 @@ public String getJsonLd() {
          * was modified within a DataFeed."
          */
         job.add("dateModified", this.getPublicationDateAsString());
-        job.add("version", this.getVersionNumber().toString());
-
-        JsonArrayBuilder descriptionsArray = Json.createArrayBuilder();
-        List<String> descriptions = this.getDescriptionsPlainText();
-        for (String description : descriptions) {
-            descriptionsArray.add(description);
+        if (this.isPublished()) {
+            job.add("version", this.getVersionNumber().toString());
+        } else {
+            // This will show "DRAFT" for drafts.
+            job.add("version", this.getFriendlyVersionNumber());
         }
-        /**
-         * In Dataverse 4.8.4 "description" was a single string but now it's an
-         * array.
-         */
-        job.add("description", descriptionsArray);
+
+        String description = this.getDescriptionsPlainTextTruncated();
+        job.add("description", description);
 
         /**
          * "keywords" - contains subject(s), datasetkeyword(s) and topicclassification(s)
@@ -1718,11 +2010,16 @@ public String getJsonLd() {
         job.add("keywords", keywords);
         
         /**
-         * citation: (multiple) related publication citation and URLs, if
-         * present.
+         * citation: (multiple) related publication citation and URLs, if present.
          *
-         * In Dataverse 4.8.4 "citation" was an array of strings but now it's an
-         * array of objects.
+         * Schema.org allows text or a CreativeWork object. Google recommends text with
+         * either the full citation or the PID URL. This code adds an object if we have
+         * the citation text for the work and/or an entry in the URL field (i.e.
+         * https://doi.org/...) The URL is reported as the 'url' field while the
+         * citation text (which would normally include the name) is reported as 'name'
+         * since there doesn't appear to be a better field ('text', which was used
+         * previously, is the actual text of the creative work).
+         * 
          */
         List<DatasetRelPublication> relatedPublications = getRelatedPublications();
         if (!relatedPublications.isEmpty()) {
@@ -1737,11 +2034,12 @@ public String getJsonLd() {
                 JsonObjectBuilder citationEntry = Json.createObjectBuilder();
                 citationEntry.add("@type", "CreativeWork");
                 if (pubCitation != null) {
-                    citationEntry.add("text", pubCitation);
+                    citationEntry.add("name", pubCitation);
                 }
                 if (pubUrl != null) {
                     citationEntry.add("@id", pubUrl);
                     citationEntry.add("identifier", pubUrl);
+                    citationEntry.add("url", pubUrl);
                 }
                 if (addToArray) {
                     jsonArrayBuilder.add(citationEntry);
@@ -1780,28 +2078,17 @@ public String getJsonLd() {
          */
         TermsOfUseAndAccess terms = this.getTermsOfUseAndAccess();
         if (terms != null) {
-            JsonObjectBuilder license = Json.createObjectBuilder().add("@type", "Dataset");
-            
-            if (TermsOfUseAndAccess.License.CC0.equals(terms.getLicense())) {
-                license.add("text", "CC0").add("url", "https://creativecommons.org/publicdomain/zero/1.0/");
-            } else {
-                String termsOfUse = terms.getTermsOfUse();
-                // Terms of use can be null if you create the dataset with JSON.
-                if (termsOfUse != null) {
-                    license.add("text", termsOfUse);
-                }
-            }
-            
-            job.add("license",license);
+            job.add("license",DatasetUtil.getLicenseURI(this));
         }
         
+        String installationBrandName = BrandingUtil.getInstallationBrandName();
+        
         job.add("includedInDataCatalog", Json.createObjectBuilder()
                 .add("@type", "DataCatalog")
-                .add("name", this.getRootDataverseNameforCitation())
+                .add("name", installationBrandName)
                 .add("url", SystemConfig.getDataverseSiteUrlStatic())
         );
-
-        String installationBrandName = BrandingUtil.getInstallationBrandName(getRootDataverseNameforCitation());
+        
         /**
          * Both "publisher" and "provider" are included but they have the same
          * values. Some services seem to prefer one over the other.
@@ -1844,36 +2131,99 @@ public String getJsonLd() {
             for (FileMetadata fileMetadata : fileMetadatasSorted) {
                 JsonObjectBuilder fileObject = NullSafeJsonBuilder.jsonObjectBuilder();
                 String filePidUrlAsString = null;
-                URL filePidUrl = fileMetadata.getDataFile().getGlobalId().toURL();
-                if (filePidUrl != null) {
-                    filePidUrlAsString = filePidUrl.toString();
-                }
+                GlobalId gid = fileMetadata.getDataFile().getGlobalId();
+                filePidUrlAsString = gid != null ? gid.asURL() : null;
                 fileObject.add("@type", "DataDownload");
                 fileObject.add("name", fileMetadata.getLabel());
-                fileObject.add("fileFormat", fileMetadata.getDataFile().getContentType());
+                fileObject.add("encodingFormat", fileMetadata.getDataFile().getContentType());
                 fileObject.add("contentSize", fileMetadata.getDataFile().getFilesize());
-                fileObject.add("description", fileMetadata.getDescription());
+                fileObject.add("description", MarkupChecker.stripAllTags(fileMetadata.getDescription()));
                 fileObject.add("@id", filePidUrlAsString);
                 fileObject.add("identifier", filePidUrlAsString);
-                String hideFilesBoolean = System.getProperty(SystemConfig.FILES_HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS);
-                if (hideFilesBoolean != null && hideFilesBoolean.equals("true")) {
-                    // no-op
-                } else {
-                    if (FileUtil.isPubliclyDownloadable(fileMetadata)) {
-                        String nullDownloadType = null;
-                        fileObject.add("contentUrl", dataverseSiteUrl + FileUtil.getFileDownloadUrlPath(nullDownloadType, fileMetadata.getDataFile().getId(), false, fileMetadata.getId()));
-                    }
+                boolean hideFilesBoolean = JvmSettings.HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS.lookupOptional(Boolean.class).orElse(false);
+                if (!hideFilesBoolean) {
+                    String nullDownloadType = null;
+                    fileObject.add("contentUrl", dataverseSiteUrl + FileUtil.getFileDownloadUrlPath(nullDownloadType, fileMetadata.getDataFile().getId(), false, fileMetadata.getId()));
                 }
                 fileArray.add(fileObject);
             }
             job.add("distribution", fileArray);
         }
         jsonLd = job.build().toString();
+
+        //Most fields above should be stripped/sanitized but, since this is output in the dataset page as header metadata, do a final sanitize step to make sure
+        jsonLd = MarkupChecker.stripAllTags(jsonLd);
+
         return jsonLd;
     }
 
     public String getLocaleLastUpdateTime() {
         return DateUtil.formatDate(new Timestamp(lastUpdateTime.getTime()));
     }
+    
+    // Add methods to manage curationLabels
+    public List<CurationStatus> getCurationStatuses() {
+        // Sort the list to ensure null createTime values appear last
+        /*
+         * Note that the ORDER DESC NULLS LAST annotation on this list should sort this way,
+         * but, as of v6.7, the NULLS LAST aspect is not working.
+         * The code here assured both the DESC order and NULLS LAST.
+         */
+        if (curationStatuses != null) {
+            curationStatuses.sort(Comparator.comparing(
+                CurationStatus::getCreateTime,
+                Comparator.nullsLast(Comparator.reverseOrder())
+            ));
+        }
+        return curationStatuses;
+    }
 
+    protected void setCurationStatuses(List<CurationStatus> curationStatuses) {
+        this.curationStatuses = curationStatuses;
+    }
+
+    public CurationStatus getCurrentCurationStatus() {
+        return !getCurationStatuses().isEmpty() ? getCurationStatuses().get(0) : null;
+    }
+
+    
+    public void addCurationStatus(CurationStatus status) {
+        status.setDatasetVersion(this);
+        curationStatuses.add(0, status); // Add the new status at the beginning of the list
+    }
+
+    public void removeCurationStatus(CurationStatus curationStatus) {
+        curationStatuses.remove(curationStatus);
+        curationStatus.setDatasetVersion(null);
+    }
+
+    public CurationStatus getCurationStatusAsOfDate(Date date) {
+        if (curationStatuses == null || curationStatuses.isEmpty()) {
+            return null;
+        }
+
+        // Find the first status whose createTime is before or equal to the given date
+        for (CurationStatus status : curationStatuses) {
+            if (status.getCreateTime().compareTo(date) <= 0) {
+                return status;
+            }
+        }
+
+        // If no status is found before the given date, return null
+        return null;
+    }
+
+    public String getVersionNote() {
+        return versionNote;
+    }
+
+    public void setVersionNote(String note) {
+        if (note != null && note.length() > VERSION_NOTE_MAX_LENGTH) {
+            throw new IllegalArgumentException("Error setting versionNote: String length is greater than maximum (" + VERSION_NOTE_MAX_LENGTH + ")."
+                    + "  StudyVersion id=" + id + ", versionNote=" + note);
+        }
+
+        this.versionNote = note;
+    }
 }
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionConverter.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionConverter.java
index 79a801fbb55..b670fb18afc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionConverter.java
@@ -5,11 +5,12 @@
  */
 package edu.harvard.iq.dataverse;
 
-import javax.ejb.EJB;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
 
 /**
  *
@@ -18,15 +19,15 @@
 @FacesConverter("datasetVersionConverter")
 public class DatasetVersionConverter implements Converter {
     
-    @EJB
-    DatasetVersionServiceBean datasetVersionService;
+    //@EJB
+    DatasetVersionServiceBean datasetVersionService = CDI.current().select(DatasetVersionServiceBean.class).get();
     
     
     @Override
     public Object getAsObject(FacesContext context, UIComponent component, String value) {
                 if (value == null || value.equals("")) {
             return "";
-        } else {
+        } else {                  
             return datasetVersionService.find(new Long(value));
         }
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
index 0fef20026b7..81d4fdf81f2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
@@ -2,26 +2,37 @@
 
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.datavariable.VarGroup;
-import edu.harvard.iq.dataverse.datavariable.VariableMetadata;
 import edu.harvard.iq.dataverse.datavariable.VariableMetadataUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
+import java.util.logging.Logger;
 
-import org.apache.commons.lang.StringUtils;
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import org.apache.commons.lang3.StringUtils;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 /**
  *
  * @author skraffmiller
  */
 public final class DatasetVersionDifference {
+    private static final Logger logger = Logger.getLogger(DatasetVersionDifference.class.getCanonicalName());
 
     private DatasetVersion newVersion;
     private DatasetVersion originalVersion;
@@ -31,15 +42,13 @@ public final class DatasetVersionDifference {
     private List<FileMetadata> addedFiles = new ArrayList<>();
     private List<FileMetadata> removedFiles = new ArrayList<>();
     private List<FileMetadata> changedFileMetadata = new ArrayList<>();
+    private Map<FileMetadata, Map<String,List<String>>> changedFileMetadataDiff = new HashMap<>();
     private List<FileMetadata> changedVariableMetadata = new ArrayList<>();
     private List<FileMetadata[]> replacedFiles = new ArrayList<>();
     private List<String[]> changedTermsAccess = new ArrayList<>();
-    private List<Object[]> summaryDataForNote = new ArrayList<>();
-    private List<Object[]> blockDataForNote = new ArrayList<>();
-    String noFileDifferencesFoundLabel = "";
+    private List<SummaryNote> summaryDataForNote = new ArrayList<>();
+    private List<SummaryNote> blockDataForNote = new ArrayList<>();
 
-    private VariableMetadataUtil variableMetadataUtil;
-    
     private List<DifferenceSummaryGroup> differenceSummaryGroups = new ArrayList<>();
 
     public List<DifferenceSummaryGroup> getDifferenceSummaryGroups() {
@@ -104,55 +113,73 @@ public DatasetVersionDifference(DatasetVersion newVersion, DatasetVersion origin
                 addToSummary(null, dsfn);
             }
         }
-
-        
-        // TODO: ? 
-        // It looks like we are going through the filemetadatas in both versions, 
-        // *sequentially* (i.e. at the cost of O(N*M)), to select the lists of 
-        // changed, deleted and added files between the 2 versions... But why 
-        // are we doing it, if we are doing virtually the same thing inside 
-        // the initDatasetFilesDifferenceList(), below - but in a more efficient 
-        // way (sorting both lists, then goint through them in parallel, at the 
-        // cost of (N+M) max.? 
-        // -- 4.6 Nov. 2016
-        
+        long startTime = System.currentTimeMillis();
+        Map<Long, FileMetadata> originalFileMetadataMap = new HashMap<>();
+        Map<Long, FileMetadata> previousIDtoFileMetadataMap = new HashMap<>();
         for (FileMetadata fmdo : originalVersion.getFileMetadatas()) {
-            boolean deleted = true;
-            for (FileMetadata fmdn : newVersion.getFileMetadatas()) {
-                if (fmdo.getDataFile().equals(fmdn.getDataFile())) {
-                    deleted = false;
-                    if (!compareFileMetadatas(fmdo, fmdn)) {
-                        changedFileMetadata.add(fmdo);
-                        changedFileMetadata.add(fmdn);
-                    }
-                    if (!compareVariableMetadata(fmdo,fmdn) || !compareVarGroup(fmdo, fmdn)) {
-                        changedVariableMetadata.add(fmdo);
-                        changedVariableMetadata.add(fmdn);
-                    }
-                    break;
-                }
-            }
-            if (deleted) {
-                removedFiles.add(fmdo);
-            }
+            originalFileMetadataMap.put(fmdo.getDataFile().getId(), fmdo);
         }
+
         for (FileMetadata fmdn : newVersion.getFileMetadatas()) {
-            boolean added = true;
-            for (FileMetadata fmdo : originalVersion.getFileMetadatas()) {
-                if (fmdo.getDataFile().equals(fmdn.getDataFile())) {
-                    added = false;
-                    break;
+            DataFile ndf = fmdn.getDataFile();
+            Long id = ndf.getId();
+            FileMetadata fmdo = originalFileMetadataMap.get(id);
+            //If this file was in the original version
+            if(fmdo!= null) {
+                //Check for differences
+                Map<String, List<String>> fileMetadataDiff = compareFileMetadatas(fmdo, fmdn);
+                if (!fileMetadataDiff.isEmpty()) {
+                    changedFileMetadata.add(fmdo);
+                    changedFileMetadata.add(fmdn);
+                    // TODO: find a better key for the map. needs to be something that doesn't change
+                    changedFileMetadataDiff.put(fmdo, fileMetadataDiff);
+                }
+                if (!VariableMetadataUtil.compareVariableMetadata(fmdo,fmdn) || !compareVarGroup(fmdo, fmdn)) {
+                    changedVariableMetadata.add(fmdo);
+                    changedVariableMetadata.add(fmdn);
+                }
+                // And drop it from the list since it can't be a deleted file
+                originalFileMetadataMap.remove(id);
+            } else {
+                //It wasn't in the original version
+                Long prevID = ndf.getPreviousDataFileId();
+                //It might be a replacement file or an added file
+                if(prevID != null) {
+                    //Add it to a map so we can check later to see if it's a replacement
+                    previousIDtoFileMetadataMap.put(prevID, fmdn);
+                } else {
+                    //Otherwise make it an added file now
+                    addedFiles.add(fmdn);
                 }
             }
-            if (added) {
-                addedFiles.add(fmdn);
+        }
+        //Finally check any remaining files from the original version that weren't in the new version'
+        for (Long removedId : originalFileMetadataMap.keySet()) {
+            //See if it has been replaced
+            FileMetadata replacingFmd = previousIDtoFileMetadataMap.get(removedId);
+            FileMetadata fmdRemoved = originalFileMetadataMap.get(removedId);
+            if (replacingFmd != null) {
+                //This is a replacement
+                replacedFiles.add(new FileMetadata[] { fmdRemoved, replacingFmd });
+                //Drop if from the map 
+                previousIDtoFileMetadataMap.remove(removedId);
+            } else {
+                //This is a removed file
+                removedFiles.add(fmdRemoved);
             }
-        }        
-        getReplacedFiles();
+        }
+        // Any fms left are not updating existing files and aren't replacing a file, but
+        // they are claiming a previous file id. That shouldn't be possible, but this will
+        // make sure they get listed in the difference if they do
+        for (Entry<Long, FileMetadata> entry : previousIDtoFileMetadataMap.entrySet()) {
+            logger.warning("Previous file id claimed for a new file: fmd id: " + entry.getValue() + ", previous file id: " + entry.getKey());
+            addedFiles.add(entry.getValue());
+        }
+        
+        logger.fine("Main difference loop execution time: " + (System.currentTimeMillis() - startTime) + " ms");
         initDatasetFilesDifferencesList();
 
-        //Sort within blocks by datasetfieldtype dispaly order then....
-        //sort via metadatablock order - citation first...
+        //Sort within blocks by datasetfieldtype display order
         for (List<DatasetField[]> blockList : detailDataByBlock) {
             Collections.sort(blockList, (DatasetField[] l1, DatasetField[] l2) -> {
                     DatasetField dsfa = l1[0];  //(DatasetField[]) l1.get(0);
@@ -162,6 +189,17 @@ public DatasetVersionDifference(DatasetVersion newVersion, DatasetVersion origin
                 return Integer.valueOf(a).compareTo(b);
             });
         }
+        //Sort existing compoundValues by datasetfieldtype display order
+        for (List<DatasetField[]> blockList : detailDataByBlock) {
+            for (DatasetField[] dfarr : blockList) {
+                for (DatasetField df : dfarr) {
+                    for (DatasetFieldCompoundValue dfcv : df.getDatasetFieldCompoundValues()) {
+                        Collections.sort(dfcv.getChildDatasetFields(), DatasetField.DisplayOrder);
+                    }
+                }
+            }
+        }
+        //Sort via metadatablock order
         Collections.sort(detailDataByBlock, (List l1, List l2) -> {
                 DatasetField dsfa[] = (DatasetField[]) l1.get(0);
                 DatasetField dsfb[] = (DatasetField[]) l2.get(0);
@@ -172,294 +210,62 @@ public DatasetVersionDifference(DatasetVersion newVersion, DatasetVersion origin
         getTermsDifferences();
     }
     
-    private void getReplacedFiles() {
-        if (addedFiles.isEmpty() || removedFiles.isEmpty()) {
-            return;
-        }
-        List<FileMetadata> addedToReplaced = new ArrayList<>();
-        List<FileMetadata> removedToReplaced = new ArrayList<>();
-        for (FileMetadata added : addedFiles) {
-            DataFile addedDF = added.getDataFile();
-            Long replacedId = addedDF.getPreviousDataFileId();
-            if (added.getDataFile().getPreviousDataFileId() != null){
-            }
-            for (FileMetadata removed : removedFiles) {
-                DataFile test = removed.getDataFile();
-                if (test.getId().equals(replacedId)) {                  
-                    addedToReplaced.add(added);
-                    removedToReplaced.add(removed);
-                    FileMetadata[] replacedArray = new FileMetadata[2];
-                    replacedArray[0] = removed;
-                    replacedArray[1] = added;
-                    replacedFiles.add(replacedArray);
-                }
-            }
-        }
-        if(addedToReplaced.isEmpty()){
-        } else{
-            addedToReplaced.stream().forEach((delete) -> {
-                addedFiles.remove(delete);
-            });
-            removedToReplaced.stream().forEach((delete) -> {
-                removedFiles.remove(delete);
-            });
-        }
-    }
+
        
     private void getTermsDifferences() {
 
-        changedTermsAccess = new ArrayList<>();
-        if (newVersion.getTermsOfUseAndAccess() != null && originalVersion.getTermsOfUseAndAccess() != null) {
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfUse()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfUse()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.header");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfUse()), StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfUse()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSpecialPermissions()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSpecialPermissions()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSpecialPermissions()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSpecialPermissions()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getRestrictions()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getRestrictions()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getRestrictions()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getRestrictions()));
-
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getCitationRequirements()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getCitationRequirements()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getCitationRequirements()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getCitationRequirements()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDepositorRequirements()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDepositorRequirements()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDepositorRequirements()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDepositorRequirements()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConditions()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConditions()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConditions()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConditions()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDisclaimer()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDisclaimer()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDisclaimer()), StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDisclaimer()));
-            }
-
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfAccess()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfAccess()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfAccess()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfAccess()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDataAccessPlace()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDataAccessPlace()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDataAccessPlace()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDataAccessPlace()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getOriginalArchive()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getOriginalArchive()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getOriginalArchive()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getOriginalArchive()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getAvailabilityStatus()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getAvailabilityStatus()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getAvailabilityStatus()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getAvailabilityStatus()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getContactForAccess()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getContactForAccess()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getContactForAccess()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getContactForAccess()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSizeOfCollection()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSizeOfCollection()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSizeOfCollection()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSizeOfCollection()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getStudyCompletion()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getStudyCompletion()))) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getStudyCompletion()),
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getStudyCompletion()));
-            }
+        TermsOfUseAndAccess originalTerms = originalVersion.getTermsOfUseAndAccess();
+        if(originalTerms == null) {
+            originalTerms = new TermsOfUseAndAccess();
+        }
+        // newTerms should never be null
+        TermsOfUseAndAccess newTerms = newVersion.getTermsOfUseAndAccess();
+        if(newTerms == null) {
+            logger.warning("New version does not have TermsOfUseAndAccess");
+            newTerms = new TermsOfUseAndAccess();
         }
-
-        if (newVersion.getTermsOfUseAndAccess() != null && originalVersion.getTermsOfUseAndAccess() == null) {
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfUse()).isEmpty()) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.header");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "", StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfUse()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSpecialPermissions()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSpecialPermissions()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getRestrictions()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getRestrictions()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getCitationRequirements()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getCitationRequirements()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDepositorRequirements()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDepositorRequirements()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConditions()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConditions()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDisclaimer()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "", StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDisclaimer()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfAccess()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfAccess()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDataAccessPlace()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDataAccessPlace()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getOriginalArchive()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getOriginalArchive()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getAvailabilityStatus()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getAvailabilityStatus()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getContactForAccess()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getContactForAccess()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSizeOfCollection()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSizeOfCollection()));
-            }
-            if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getStudyCompletion()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
-                        StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getStudyCompletion()));
-            }            
-        }        
-
-        if (newVersion.getTermsOfUseAndAccess() == null && originalVersion.getTermsOfUseAndAccess() != null) {
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfUse()).isEmpty()) {
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.header");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfUse()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel,
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSpecialPermissions()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel,
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSpecialPermissions()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getRestrictions()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getRestrictions()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getCitationRequirements()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getCitationRequirements()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDepositorRequirements()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDepositorRequirements()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConditions()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConditions()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDisclaimer()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel,  StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDisclaimer()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfAccess()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfAccess()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDataAccessPlace()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDataAccessPlace()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getOriginalArchive()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getOriginalArchive()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getAvailabilityStatus()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getAvailabilityStatus()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getContactForAccess()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getContactForAccess()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSizeOfCollection()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSizeOfCollection()), "");
-            }
-            if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getStudyCompletion()).isEmpty()){
-                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion");
-                changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
-                        StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getStudyCompletion()), "");
-            }            
-        }               
-    }
-    
-    private DifferenceSummaryItem createSummaryItem(){
-        return null;
-    }
-    
-    private List addToSummaryGroup(String displayName, DifferenceSummaryItem differenceSummaryItem){
         
-        return null;
+        checkAndAddToChangeList(originalTerms.getTermsOfUse(), newTerms.getTermsOfUse(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.header"));
+        checkAndAddToChangeList(originalTerms.getConfidentialityDeclaration(), newTerms.getConfidentialityDeclaration(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration"));
+        checkAndAddToChangeList(originalTerms.getSpecialPermissions(), newTerms.getSpecialPermissions(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions"));
+        checkAndAddToChangeList(originalTerms.getRestrictions(), newTerms.getRestrictions(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions"));
+        checkAndAddToChangeList(originalTerms.getCitationRequirements(), newTerms.getCitationRequirements(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements"));
+        checkAndAddToChangeList(originalTerms.getDepositorRequirements(), newTerms.getDepositorRequirements(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements"));
+        checkAndAddToChangeList(originalTerms.getConditions(), newTerms.getConditions(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions"));
+        checkAndAddToChangeList(originalTerms.getDisclaimer(), newTerms.getDisclaimer(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer"));
+        checkAndAddToChangeList(originalTerms.getTermsOfAccess(), newTerms.getTermsOfAccess(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess"));
+        checkAndAddToChangeList(originalTerms.getDataAccessPlace(), newTerms.getDataAccessPlace(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace"));
+        checkAndAddToChangeList(originalTerms.getOriginalArchive(), newTerms.getOriginalArchive(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive"));
+        checkAndAddToChangeList(originalTerms.getAvailabilityStatus(), newTerms.getAvailabilityStatus(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus"));
+        checkAndAddToChangeList(originalTerms.getContactForAccess(), newTerms.getContactForAccess(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess"));
+        checkAndAddToChangeList(originalTerms.getSizeOfCollection(), newTerms.getSizeOfCollection(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection"));
+        checkAndAddToChangeList(originalTerms.getStudyCompletion(), newTerms.getStudyCompletion(),
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion"));
     }
-
-    private List<String[]> addToTermsChangedList(List<String[]> listIn, String label, String origVal, String newVal) {
-        String[] diffArray;
-        diffArray = new String[3];
-        diffArray[0] = label;
-        diffArray[1] = origVal;
-        diffArray[2] = newVal;
-        listIn.add(diffArray);
-        return listIn;
+    
+    private void checkAndAddToChangeList(String originalTerm, String newTerm,
+            String termLabel) {
+        originalTerm = StringUtil.nullToEmpty(originalTerm);
+        newTerm = StringUtil.nullToEmpty(newTerm);
+        if(!originalTerm.equals(newTerm)) {
+            changedTermsAccess.add(new String[]{termLabel, originalTerm, newTerm});
+        }
     }
 
-
     private void addToList(List<DatasetField[]> listIn, DatasetField dsfo, DatasetField dsfn) {
         DatasetField[] dsfArray;
         dsfArray = new DatasetField[2];
@@ -493,65 +299,37 @@ private void addToSummary(DatasetField dsfo, DatasetField dsfn) {
     }
 
     private void updateBlockSummary(DatasetField dsf, int added, int deleted, int changed) {
-        
         boolean addedToAll = false;
-        for (Object[] blockList : blockDataForNote) {
-            DatasetField dsft = (DatasetField) blockList[0];
+        for (SummaryNote blockList : blockDataForNote) {
+            
+            DatasetField dsft = blockList.dsfo;
             if (dsft.getDatasetFieldType().getMetadataBlock().equals(dsf.getDatasetFieldType().getMetadataBlock())) {
-                blockList[1] = (Integer) blockList[1] + added;
-                blockList[2] = (Integer) blockList[2] + deleted;
-                blockList[3] = (Integer) blockList[3] + changed;
+                blockList.added = blockList.added + added;
+                blockList.deleted = blockList.deleted + deleted;
+                blockList.changed = blockList.changed + changed;
                 addedToAll = true;
             }
         }
         if (!addedToAll) {
-            Object[] newArray = new Object[4];
-            newArray[0] = dsf;
-            newArray[1] = added;
-            newArray[2] = deleted;
-            newArray[3] = changed;
-            blockDataForNote.add(newArray);
+            SummaryNote newNote = new SummaryNote();
+            newNote.dsfo = dsf;
+            newNote.added = added;
+            newNote.deleted = deleted;
+            newNote.changed = changed;
+            blockDataForNote.add(newNote);
         }
-
     }
 
-    private void addToNoteSummary(DatasetField dsfo, int added, int deleted, int changed) {
-        Object[] noteArray = new Object[4];
-        noteArray[0] = dsfo;
-        noteArray[1] = added;
-        noteArray[2] = deleted;
-        noteArray[3] = changed;
-        summaryDataForNote.add(noteArray);
+    private void addToNoteSummary(DatasetField dsfo, Integer added, Integer deleted, Integer changed) {
+        SummaryNote summaryNote = new SummaryNote();
+        summaryNote.dsfo = dsfo;
+        summaryNote.added = added;
+        summaryNote.deleted = deleted;
+        summaryNote.changed = changed;
+        summaryDataForNote.add(summaryNote);
     }
 
-    private boolean compareVariableMetadata(FileMetadata fmdo, FileMetadata fmdn) {
-        Collection<VariableMetadata> vmlo = fmdo.getVariableMetadatas();
-        Collection<VariableMetadata> vmln = fmdn.getVariableMetadatas();
-
-        int count = 0;
-        if (vmlo.size() != vmln.size()) {
-            return false;
-        } else {
-            for (VariableMetadata vmo : vmlo) {
-                for (VariableMetadata vmn : vmln) {
-                    if (vmo.getDataVariable().getId().equals(vmn.getDataVariable().getId())) {
-                        count++;
-                        if (!variableMetadataUtil.compareVarMetadata(vmo, vmn)) {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-        if (count == vmlo.size()) {
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-    private boolean compareVarGroup(FileMetadata fmdo, FileMetadata fmdn) {
+    static boolean compareVarGroup(FileMetadata fmdo, FileMetadata fmdn) {
         List<VarGroup> vglo = fmdo.getVarGroups();
         List<VarGroup> vgln = fmdn.getVarGroups();
 
@@ -561,7 +339,7 @@ private boolean compareVarGroup(FileMetadata fmdo, FileMetadata fmdn) {
         int count = 0;
         for (VarGroup vgo : vglo) {
             for (VarGroup vgn : vgln) {
-                if (!variableMetadataUtil.checkDiff(vgo.getLabel(), vgn.getLabel())) {
+                if (!VariableMetadataUtil.checkDiff(vgo.getLabel(), vgn.getLabel())) {
                     Set<DataVariable> dvo = vgo.getVarsInGroup();
                     Set<DataVariable> dvn = vgn.getVarsInGroup();
                     if (dvo.equals(dvn)) {
@@ -579,27 +357,39 @@ private boolean compareVarGroup(FileMetadata fmdo, FileMetadata fmdn) {
         }
     }
 
+    public static Map<String,List<String>> compareFileMetadatas(FileMetadata fmdo, FileMetadata fmdn) {
+        Map<String,List<String>> fileMetadataChanged = new HashMap<>();
+        if (!StringUtils.equals(StringUtil.nullToEmpty(fmdo.getDescription()), StringUtil.nullToEmpty(fmdn.getDescription()))) {
+            fileMetadataChanged.put("Description",
+                    List.of(StringUtil.nullToEmpty(fmdo.getDescription()), StringUtil.nullToEmpty(fmdn.getDescription())));
+        }
 
-
-    private boolean compareFileMetadatas(FileMetadata fmdo, FileMetadata fmdn) {
-
-        if (!StringUtils.equals(fmdo.getDescription(), fmdn.getDescription())) {
-            return false;
+        if (!StringUtils.equals(StringUtil.nullToEmpty(fmdo.getCategoriesByName().toString()), StringUtil.nullToEmpty(fmdn.getCategoriesByName().toString()))) {
+            fileMetadataChanged.put("Categories",
+                    List.of(fmdo.getCategoriesByName().toString(), fmdn.getCategoriesByName().toString()));
         }
         
-        if (!StringUtils.equals(fmdo.getCategoriesByName().toString(), fmdn.getCategoriesByName().toString())) {
-            return false;
+        if (!StringUtils.equals(StringUtil.nullToEmpty(fmdo.getLabel()), StringUtil.nullToEmpty(fmdn.getLabel()))) {
+            fileMetadataChanged.put("Label",
+                    List.of(StringUtil.nullToEmpty(fmdo.getLabel()), StringUtil.nullToEmpty(fmdn.getLabel())));
         }
         
-        if (!StringUtils.equals(fmdo.getLabel(), fmdn.getLabel())) {
-            return false;
+        if (!StringUtils.equals(StringUtil.nullToEmpty(fmdo.getDirectoryLabel()), StringUtil.nullToEmpty(fmdn.getDirectoryLabel()))) {
+            fileMetadataChanged.put("File Path",
+                    List.of(StringUtil.nullToEmpty(fmdo.getDirectoryLabel()), StringUtil.nullToEmpty(fmdn.getDirectoryLabel())));
         }
         
-        if (!StringUtils.equals(fmdo.getProvFreeForm(), fmdn.getProvFreeForm())) {
-            return false;
+        if (!StringUtils.equals(StringUtil.nullToEmpty(fmdo.getProvFreeForm()), StringUtil.nullToEmpty(fmdn.getProvFreeForm()))) {
+            fileMetadataChanged.put("ProvFreeForm",
+                    List.of(StringUtil.nullToEmpty(fmdo.getProvFreeForm()), StringUtil.nullToEmpty(fmdn.getProvFreeForm())));
         }
-        
-        return fmdo.isRestricted() == fmdn.isRestricted();
+
+        if (fmdo.isRestricted() != fmdn.isRestricted()) {
+            fileMetadataChanged.put("isRestricted",
+                    List.of(String.valueOf(fmdo.isRestricted()), String.valueOf(fmdn.isRestricted())));
+        }
+
+        return fileMetadataChanged;
     }
     
     private void compareValues(DatasetField originalField, DatasetField newField, boolean compound) {
@@ -680,6 +470,8 @@ private void compareValues(DatasetField originalField, DatasetField newField, bo
             }
         }
     }
+    
+    
 
     public String getFileNote() {
         String retString = "";
@@ -784,19 +576,19 @@ public void setChangedFileMetadata(List<FileMetadata> changedFileMetadata) {
         this.changedFileMetadata = changedFileMetadata;
     }
 
-    public List<Object[]> getSummaryDataForNote() {
+    public List<SummaryNote> getSummaryDataForNote() {
         return summaryDataForNote;
     }
 
-    public List<Object[]> getBlockDataForNote() {
+    public List<SummaryNote> getBlockDataForNote() {
         return blockDataForNote;
     }
 
-    public void setSummaryDataForNote(List<Object[]> summaryDataForNote) {
+    public void setSummaryDataForNote(List<SummaryNote> summaryDataForNote) {
         this.summaryDataForNote = summaryDataForNote;
     }
 
-    public void setBlockDataForNote(List<Object[]> blockDataForNote) {
+    public void setBlockDataForNote(List<SummaryNote> blockDataForNote) {
         this.blockDataForNote = blockDataForNote;
     }
     
@@ -813,7 +605,6 @@ private void initDatasetFilesDifferencesList() {
         datasetFilesDiffList = new ArrayList<>();
         datasetFilesReplacementList = new ArrayList <>();
         
-
         // Study Files themselves are version-less;
         // In other words, 2 different versions can have different sets of
         // study files, but the files themselves don't have versions.
@@ -825,13 +616,6 @@ private void initDatasetFilesDifferencesList() {
         // same study file, the file metadatas ARE version-specific, so some of
         // the fields there (filename, etc.) may be different. If this is the
         // case, we want to display these differences as well.
-        
-        if (originalVersion.getFileMetadatas().isEmpty() && newVersion.getFileMetadatas().isEmpty()) {
-            noFileDifferencesFoundLabel = "No data files in either version of the study";
-            return;
-        }
-
-                        
 
         int i = 0;
         int j = 0;
@@ -852,7 +636,6 @@ private void initDatasetFilesDifferencesList() {
         
         if (!replacedFiles.isEmpty()) {
             
-            
             replacedFiles.stream().map((replacedPair) -> {
                 FileMetadata replacedFile = replacedPair[0];
                 FileMetadata newFile = replacedPair[1];
@@ -878,7 +661,6 @@ private void initDatasetFilesDifferencesList() {
 
         }
 
-
         Collections.sort(fileMetadatasOriginal, (FileMetadata l1, FileMetadata l2) -> {
             FileMetadata fm3 = l1; //(DatasetField[]) l1.get(0);
             FileMetadata fm4 = l2;
@@ -898,7 +680,6 @@ private void initDatasetFilesDifferencesList() {
         // added file. Since we are only doing this for the purposes of generating
         // version differences, this should be OK. 
         //   -- L.A. Aug. 2014
-        
 
         Collections.sort(fileMetadatasNew, (FileMetadata l1, FileMetadata l2) -> {
             FileMetadata fm3 = l1; //(DatasetField[]) l1.get(0);
@@ -991,14 +772,6 @@ private void initDatasetFilesDifferencesList() {
 
             j++;
         }
-        
-        
-        
-        
-
-        if (datasetFilesDiffList.isEmpty()) {
-            noFileDifferencesFoundLabel = "These study versions have identical sets of data files";
-        }
     }
 
     private boolean fileMetadataIsDifferent(FileMetadata fm1, FileMetadata fm2) {
@@ -1107,12 +880,8 @@ private boolean fileMetadataIsDifferent(FileMetadata fm1, FileMetadata fm2) {
             return true;
         }
         
-        //File restrictions
-        
-        value1 = fm1.isRestricted() ? "Restricted" : "Not Restricted";
-        value2 = fm2.isRestricted() ? "Restricted" : "Not Restricted";
-        
-        return !value1.equals(value2);
+        // File restrictions
+        return fm1.isRestricted() != fm2.isRestricted();
     }
 
     private datasetFileDifferenceItem selectFileMetadataDiffs(FileMetadata fm1, FileMetadata fm2) {
@@ -1136,7 +905,7 @@ private datasetFileDifferenceItem selectFileMetadataDiffs(FileMetadata fm1, File
             }
 
             fdi.setFileProvFree1(fm1.getProvFreeForm());
-            fdi.setFileRest1(fm1.isRestricted() ? "Restricted" : "Not Restricted");
+            fdi.setFileRest1(BundleUtil.getStringFromBundle(getAccessLabel(fm1)));
             fdi.setFile2Empty(true);
 
         } else if (fm1 == null) {
@@ -1152,7 +921,7 @@ private datasetFileDifferenceItem selectFileMetadataDiffs(FileMetadata fm1, File
                 fdi.setFileCat2(fm2.getCategoriesByName().toString());
             }
             fdi.setFileProvFree2(fm2.getProvFreeForm());
-            fdi.setFileRest2(fm2.isRestricted() ? "Restricted" : "Not Restricted");
+            fdi.setFileRest2(BundleUtil.getStringFromBundle(getAccessLabel(fm2)));
         } else {
             // Both are non-null metadata objects.
             // We simply go through the 5 metadata fields, if any are
@@ -1233,16 +1002,23 @@ private datasetFileDifferenceItem selectFileMetadataDiffs(FileMetadata fm1, File
             }
             
             // file restricted:
-            value1 = fm1.isRestricted() ? "Restricted" : "Not Restricted";
-            value2 = fm2.isRestricted() ? "Restricted" : "Not Restricted";
-            if (!value1.equals(value2)) {
-                fdi.setFileRest1(value1);
-                fdi.setFileRest2(value2);
+            if (fm1.isRestricted() != fm2.isRestricted() || fm1.getDataFile().getEmbargo() != fm2.getDataFile().getEmbargo()) {
+                fdi.setFileRest1(BundleUtil.getStringFromBundle(getAccessLabel(fm1)));
+                fdi.setFileRest2(BundleUtil.getStringFromBundle(getAccessLabel(fm2)));
             }
         }
         return fdi;
     }
     
+    private String getAccessLabel(FileMetadata fm) {
+        boolean embargoed = fm.getDataFile().getEmbargo()!=null;
+        boolean restricted = fm.isRestricted();
+        if (embargoed && restricted) return "embargoedandrestricted";
+        if(embargoed) return "embargoed";
+        if(restricted) return "restricted";
+        return "public";
+    }
+
     public String getEditSummaryForLog() {
         
         String retVal = "";        
@@ -1341,7 +1117,7 @@ public String getEditSummaryForLog() {
                 }
                 
                 if (item.fileRest1 != null || item.fileRest2 != null) {
-                    itemDiff += System.lineSeparator() + " " + BundleUtil.getStringFromBundle("file.viewDiffDialog.restricted") + ": ";
+                    itemDiff += System.lineSeparator() + " " + BundleUtil.getStringFromBundle("file.viewDiffDialog.fileAccess") + ": ";
                     itemDiff += item.fileRest1 != null ? item.fileRest1 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable");
                     itemDiff += " : ";
                     itemDiff += item.fileRest2 != null ? item.fileRest2 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable") + " ";
@@ -1383,7 +1159,7 @@ public String getEditSummaryForLog() {
                 itemDiff += item.fdi.fileProvFree1 != null ? item.fdi.fileProvFree1 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable");
                 itemDiff += " : ";
                 itemDiff += item.fdi.fileProvFree2 != null ? item.fdi.fileProvFree2 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable") + " ";
-                itemDiff += System.lineSeparator() + " " + BundleUtil.getStringFromBundle("file.viewDiffDialog.restricted") + ": ";
+                itemDiff += System.lineSeparator() + " " + BundleUtil.getStringFromBundle("file.viewDiffDialog.fileAccess") + ": ";
                 itemDiff += item.fdi.fileRest1 != null ? item.fdi.fileRest1 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable");
                 itemDiff += " : ";
                 itemDiff += item.fdi.fileRest2 != null ? item.fdi.fileRest2 : BundleUtil.getStringFromBundle("file.viewDiffDialog.notAvailable") + " ";
@@ -1404,12 +1180,11 @@ public String getEditSummaryForLog() {
             retVal +=termsOfUseDiff;
         }
         
-        
         return retVal;
     }
     
     
-    public class DifferenceSummaryGroup{
+    public class DifferenceSummaryGroup {
         
         private String displayName;
         private String type;
@@ -1438,8 +1213,47 @@ public List<DifferenceSummaryItem> getDifferenceSummaryItems() {
         public void setDifferenceSummaryItems(List<DifferenceSummaryItem> differenceSummaryItems) {
             this.differenceSummaryItems = differenceSummaryItems;
         }
-
+    }
+    
+        public class SummaryNote  {
+         DatasetField dsfo;
+         Integer added;
+         Integer deleted; 
+         Integer changed; 
+         
+         public void setDatasetField(DatasetField dsfIn){
+             dsfo = dsfIn;
+         }
+         
+         public DatasetField getDatasetField (){
+             return dsfo;
+         }
+         
+         public void setAdded(Integer addin){
+             added = addin;
+         }
+         
+         public Integer getAdded(){
+             return added;
+         }
+         
+        public void setDeleted(Integer delin){
+             deleted = delin;
+         }
+         
+         public Integer getDeleted(){
+             return deleted;
+        }
         
+        public void setChanged(Integer changedin){
+             changed = changedin;
+         }
+         
+         public Integer getChanged(){
+             return changed;
+        } 
+         
+         
     }
     
     public class DifferenceSummaryItem {
@@ -1497,9 +1311,6 @@ public boolean isMultiple() {
         public void setMultiple(boolean multiple) {
             this.multiple = multiple;
         }
-
-        
-        
     }
     
     public class datasetReplaceFileItem {
@@ -1619,8 +1430,7 @@ public void setFileProvFree2(String fileProvFree2) {
         }
         
         public String getFileRest1() {
-            String localeFileRest1 = BundleUtil.getStringFromBundle(fileRest1.toLowerCase().replace(" ", "_"));
-            return localeFileRest1;
+            return fileRest1;
         }
 
         public void setFileRest1(String fileRest1) {
@@ -1628,8 +1438,7 @@ public void setFileRest1(String fileRest1) {
         }
 
         public String getFileRest2() {
-            String localeFileRest2 = BundleUtil.getStringFromBundle(fileRest2.toLowerCase().replace(" ", "_"));
-            return localeFileRest2;
+            return fileRest2;
         }
 
         public void setFileRest2(String fileRest2) {
@@ -1758,7 +1567,6 @@ public String getFileChecksumValue() {
         public void setFileChecksumValue(String fileChecksumValue) {
             this.fileChecksumValue = fileChecksumValue;
         }
-
     }
 
     public List<datasetFileDifferenceItem> getDatasetFilesDiffList() {
@@ -1769,11 +1577,334 @@ public void setDatasetFilesDiffList(List<datasetFileDifferenceItem> datasetFiles
         this.datasetFilesDiffList = datasetFilesDiffList;
     }
 
-    public String getNoFileDifferencesFoundLabel() {
-        return noFileDifferencesFoundLabel;
+    /*
+     * Static methods to compute which blocks have changes between the two
+     * DatasetVersions. Currently used to assess whether 'system metadatablocks'
+     * (protected by a separate key) have changed. (Simplified from the methods
+     * above that track all the individual changes)
+     * 
+     */
+    public static Set<MetadataBlock> getBlocksWithChanges(DatasetVersion newVersion, DatasetVersion originalVersion) {
+        Set<MetadataBlock> changedBlockSet = new HashSet<MetadataBlock>();
+
+        // Compare Data
+        List<DatasetField> newDatasetFields = new LinkedList<DatasetField>(newVersion.getDatasetFields());
+        if (originalVersion == null) {
+            // Every field is new, just list blocks used
+            Iterator<DatasetField> dsfnIter = newDatasetFields.listIterator();
+            while (dsfnIter.hasNext()) {
+                DatasetField dsfn = dsfnIter.next();
+                if (!changedBlockSet.contains(dsfn.getDatasetFieldType().getMetadataBlock())) {
+                    changedBlockSet.add(dsfn.getDatasetFieldType().getMetadataBlock());
+                }
+            }
+
+        } else {
+            List<DatasetField> originalDatasetFields = new LinkedList<DatasetField>(originalVersion.getDatasetFields());
+            Iterator<DatasetField> dsfoIter = originalDatasetFields.listIterator();
+            while (dsfoIter.hasNext()) {
+                DatasetField dsfo = dsfoIter.next();
+                boolean deleted = true;
+                Iterator<DatasetField> dsfnIter = newDatasetFields.listIterator();
+
+                while (dsfnIter.hasNext()) {
+                    DatasetField dsfn = dsfnIter.next();
+                    if (dsfo.getDatasetFieldType().equals(dsfn.getDatasetFieldType())) {
+                        deleted = false;
+                        if (!changedBlockSet.contains(dsfo.getDatasetFieldType().getMetadataBlock())) {
+                            logger.fine("Checking " + dsfo.getDatasetFieldType().getName());
+                            if (dsfo.getDatasetFieldType().isPrimitive()) {
+                                if (fieldsAreDifferent(dsfo, dsfn, false)) {
+                                    logger.fine("Adding block for " + dsfo.getDatasetFieldType().getName());
+                                    changedBlockSet.add(dsfo.getDatasetFieldType().getMetadataBlock());
+                                }
+                            } else {
+                                if (fieldsAreDifferent(dsfo, dsfn, true)) {
+                                    logger.fine("Adding block for " + dsfo.getDatasetFieldType().getName());
+                                    changedBlockSet.add(dsfo.getDatasetFieldType().getMetadataBlock());
+                                }
+                            }
+                        }
+                        dsfnIter.remove();
+                        break; // if found go to next dataset field
+                    }
+                }
+
+                if (deleted) {
+                    logger.fine("Adding block for deleted " + dsfo.getDatasetFieldType().getName());
+                    changedBlockSet.add(dsfo.getDatasetFieldType().getMetadataBlock());
+                }
+                dsfoIter.remove();
+            }
+            // Only fields left are non-matching ones but they may be empty
+            for (DatasetField dsfn : newDatasetFields) {
+                if (!dsfn.isEmpty()) {
+                    logger.fine("Adding block for added " + dsfn.getDatasetFieldType().getName());
+                    changedBlockSet.add(dsfn.getDatasetFieldType().getMetadataBlock());
+                }
+            }
+        }
+        return changedBlockSet;
+    }
+
+    private static boolean fieldsAreDifferent(DatasetField originalField, DatasetField newField, boolean compound) {
+        String originalValue = "";
+        String newValue = "";
+
+        if (compound) {
+            for (DatasetFieldCompoundValue datasetFieldCompoundValueOriginal : originalField
+                    .getDatasetFieldCompoundValues()) {
+                int loopIndex = 0;
+                if (newField.getDatasetFieldCompoundValues().size() >= loopIndex + 1) {
+                    for (DatasetField dsfo : datasetFieldCompoundValueOriginal.getChildDatasetFields()) {
+                        if (!dsfo.getDisplayValue().isEmpty()) {
+                            originalValue += dsfo.getDisplayValue() + ", ";
+                        }
+                    }
+                    for (DatasetField dsfn : newField.getDatasetFieldCompoundValues().get(loopIndex)
+                            .getChildDatasetFields()) {
+                        if (!dsfn.getDisplayValue().isEmpty()) {
+                            newValue += dsfn.getDisplayValue() + ", ";
+                        }
+                    }
+                    if (!originalValue.trim().equals(newValue.trim())) {
+                        return true;
+                    }
+                }
+                loopIndex++;
+            }
+        } else {
+            originalValue = originalField.getDisplayValue();
+            newValue = newField.getDisplayValue();
+            if (!originalValue.equalsIgnoreCase(newValue)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    List<FileMetadata> getChangedVariableMetadata() {
+        return changedVariableMetadata;
+    }
+
+    List<FileMetadata[]> getReplacedFiles() {
+        return replacedFiles;
     }
+    
+    public JsonObjectBuilder getSummaryDifferenceAsJson(){
+
+        JsonObjectBuilder jobVersion = new NullSafeJsonBuilder();
 
-    public void setNoFileDifferencesFoundLabel(String noFileDifferencesFoundLabel) {
-        this.noFileDifferencesFoundLabel = noFileDifferencesFoundLabel;
+        JsonObjectBuilder jobDsfOnCreate = new NullSafeJsonBuilder();
+        
+        
+        for (SummaryNote sn : this.summaryDataForNote) {
+            jobDsfOnCreate.add( sn.getDatasetField().getDatasetFieldType().getDisplayName(), getSummaryNoteAsJson(sn));
+        }
+        
+        if (!this.summaryDataForNote.isEmpty()){
+            
+            jobVersion.add("Citation Metadata", jobDsfOnCreate);
+            
+        }
+        
+        for (SummaryNote sn : this.getBlockDataForNote()){
+             String mdbDisplayName = sn.getDatasetField().getDatasetFieldType().getMetadataBlock().getDisplayName();
+             if (mdbDisplayName.equals("Citation Metadata")){
+                 mdbDisplayName = "Additional Citation Metadata";
+             }
+             jobVersion.add( mdbDisplayName, getSummaryNoteAsJson(sn));    
+        }   
+        
+        jobVersion.add("files", getFileSummaryAsJson());
+        
+        if (!this.changedTermsAccess.isEmpty()) {
+            jobVersion.add("termsAccessChanged", true);
+        } else{
+            jobVersion.add("termsAccessChanged", false);
+        }      
+                
+        return jobVersion;
+    }
+    
+    private JsonObjectBuilder getSummaryNoteAsJson(SummaryNote sn){
+        JsonObjectBuilder job = new NullSafeJsonBuilder();
+        //job.add("datasetFieldType", sn.getDatasetField().getDatasetFieldType().getDisplayName());
+        job.add("added", sn.added);
+        job.add("deleted", sn.deleted);
+        job.add("changed", sn.changed);
+        return job;
+    }
+    
+    private JsonObjectBuilder getFileSummaryAsJson(){
+        JsonObjectBuilder job = new NullSafeJsonBuilder();
+        
+        if (!addedFiles.isEmpty()) {
+            job.add("added", addedFiles.size());
+           
+        } else{
+            job.add("added", 0);
+        }
+        
+        if (!removedFiles.isEmpty()) {
+            job.add("removed", removedFiles.size());
+           
+        } else{
+            job.add("removed", 0);
+        }
+        
+        if (!replacedFiles.isEmpty()) {
+            job.add("replaced", replacedFiles.size());
+           
+        } else{
+            job.add("replaced", 0);
+        }
+        
+        if (!changedFileMetadata.isEmpty()) {
+            job.add("changedFileMetaData", changedFileMetadata.size());
+           
+        } else{
+            job.add("changedFileMetaData", 0);
+        }
+        
+        if (!changedVariableMetadata.isEmpty()) {
+            job.add("changedVariableMetadata", changedVariableMetadata.size());
+           
+        } else{
+            job.add("changedVariableMetadata", 0);
+        }
+
+        return job;
+    }
+       
+    public JsonObjectBuilder compareVersionsAsJson() {
+        JsonObjectBuilder job = new NullSafeJsonBuilder();
+        JsonObjectBuilder jobVersion = new NullSafeJsonBuilder();
+        jobVersion.add("versionNumber", originalVersion.getFriendlyVersionNumber());
+        jobVersion.add("versionState", originalVersion.getVersionState().name());
+        jobVersion.add("versionNote", originalVersion.getVersionNote());
+        jobVersion.add("lastUpdatedDate", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(originalVersion.getLastUpdateTime()));
+        job.add("oldVersion", jobVersion);
+        jobVersion = new NullSafeJsonBuilder();
+        jobVersion.add("versionNumber", newVersion.getFriendlyVersionNumber());
+        jobVersion.add("versionState", newVersion.getVersionState().name());
+        jobVersion.add("versionNote", newVersion.getVersionNote());
+        jobVersion.add("lastUpdatedDate", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(newVersion.getLastUpdateTime()));
+        job.add("newVersion", jobVersion);
+
+        if (!this.detailDataByBlock.isEmpty()) {
+            JsonArrayBuilder jabMetadata = Json.createArrayBuilder();
+            for (List<DatasetField[]> blocks : detailDataByBlock) {
+                JsonObjectBuilder jobMetadata = new NullSafeJsonBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                String blockDisplay = blocks.get(0)[0].getDatasetFieldType().getMetadataBlock().getDisplayName();
+                for (DatasetField[] dsfArray : blocks) {
+                    JsonObjectBuilder jb = new NullSafeJsonBuilder();
+                    jb.add("fieldName", dsfArray[0].getDatasetFieldType().getTitle());
+                    if (dsfArray[0].getDatasetFieldType().isPrimitive()) {
+                        jb.add("oldValue", dsfArray[0].getRawValue());
+                    } else {
+                        jb.add("oldValue", dsfArray[0].getCompoundRawValue());
+                    }
+                    if (dsfArray[1].getDatasetFieldType().isPrimitive()) {
+                        jb.add("newValue", dsfArray[1].getRawValue());
+                    } else {
+                        jb.add("newValue", dsfArray[1].getCompoundRawValue());
+                    }
+                    jab.add(jb);
+                }
+                jobMetadata.add("blockName", blockDisplay);
+                jobMetadata.add("changed", jab);
+                jabMetadata.add(jobMetadata);
+            }
+            job.add("metadataChanges", jabMetadata);
+        }
+
+        // Format added, removed, and modified files
+        JsonArrayBuilder jabDiffFiles = Json.createArrayBuilder();
+        if (!addedFiles.isEmpty()) {
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+            addedFiles.forEach(f -> {
+                jab.add(filesDiffJson(f));
+            });
+            job.add("filesAdded", jab);
+        }
+        if (!removedFiles.isEmpty()) {
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+            removedFiles.forEach(f -> {
+                jab.add(filesDiffJson(f));
+            });
+            job.add("filesRemoved", jab);
+        }
+        if (!replacedFiles.isEmpty()) {
+            JsonArrayBuilder jabReplaced = Json.createArrayBuilder();
+            replacedFiles.forEach(fm -> {
+                if (fm.length == 2) {
+                    JsonObjectBuilder jobReplaced = new NullSafeJsonBuilder();
+                    jobReplaced.add("oldFile", filesDiffJson(fm[0]));
+                    jobReplaced.add("newFile", filesDiffJson(fm[1]));
+                    jabReplaced.add(jobReplaced);
+                }
+            });
+            job.add("filesReplaced", jabReplaced);
+        }
+        if (!changedFileMetadata.isEmpty()) {
+            changedFileMetadataDiff.entrySet().forEach(entry -> {
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                JsonObjectBuilder jobChanged = new NullSafeJsonBuilder();
+                jobChanged.add("fileName", entry.getKey().getDataFile().getDisplayName());
+                jobChanged.add(entry.getKey().getDataFile().getChecksumType().name(), entry.getKey().getDataFile().getChecksumValue());
+                jobChanged.add("fileId", entry.getKey().getDataFile().getId());
+                entry.getValue().entrySet().forEach(e -> {
+                    JsonObjectBuilder jobDiffField = new NullSafeJsonBuilder();
+                    jobDiffField.add("fieldName",e.getKey());
+                    jobDiffField.add("oldValue",e.getValue().get(0));
+                    jobDiffField.add("newValue",e.getValue().get(1));
+                    jab.add(jobDiffField);
+                });
+                jobChanged.add("changed", jab);
+                jabDiffFiles.add(jobChanged);
+            });
+            job.add("fileChanges", jabDiffFiles);
+        }
+
+        // Format Terms Of Access changes
+        if (!changedTermsAccess.isEmpty()) {
+            JsonObjectBuilder jobTOA = new NullSafeJsonBuilder();
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+            changedTermsAccess.forEach(toa -> {
+                JsonObjectBuilder jobValue = new NullSafeJsonBuilder();
+                jobValue.add("fieldName",toa[0]);
+                jobValue.add("oldValue",toa[1]);
+                jobValue.add("newValue",toa[2]);
+                jab.add(jobValue);
+            });
+            jobTOA.add("changed", jab);
+            job.add("TermsOfAccess", jobTOA);
+        }
+
+        return job;
+    }
+    private JsonObjectBuilder filesDiffJson(FileMetadata fileMetadata) {
+        NullSafeJsonBuilder job = new NullSafeJsonBuilder();
+        DataFile df = fileMetadata.getDataFile();
+        job.add("fileName", df.getDisplayName())
+                .add("filePath", fileMetadata.getDirectoryLabel())
+                .add(df.getChecksumType().name(), df.getChecksumValue())
+                .add("type",df.getContentType())
+                .add("fileId", df.getId())
+                .add("description", fileMetadata.getDescription())
+                .add("isRestricted", df.isRestricted());
+        if (fileMetadata.getCategories() != null && !fileMetadata.getCategories().isEmpty()) {
+            JsonArrayBuilder jabCategories = Json.createArrayBuilder();
+            fileMetadata.getCategories().forEach(c -> jabCategories.add(c.getName()));
+            job.add("categories", jabCategories);
+        }
+        if (df.getTags() != null && !df.getTags().isEmpty()) {
+            JsonArrayBuilder jabTags = Json.createArrayBuilder();
+            df.getTags().forEach(t -> jabTags.add(t.getTypeLabel()));
+            job.add("tags", jabTags);
+        }
+        return job;
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionFilesServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionFilesServiceBean.java
new file mode 100644
index 00000000000..27c91e8b312
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionFilesServiceBean.java
@@ -0,0 +1,366 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.FileSearchCriteria.FileAccessStatus;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.*;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.*;
+
+import static edu.harvard.iq.dataverse.DataFileTag.TagLabelToTypes;
+
+@Stateless
+@Named
+public class DatasetVersionFilesServiceBean implements Serializable {
+
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    private EntityManager em;
+
+    /**
+     * Different criteria to sort the results of FileMetadata queries used in {@link DatasetVersionFilesServiceBean#getFileMetadatas}
+     */
+    public enum FileOrderCriteria {
+        NameAZ, NameZA, Newest, Oldest, Size, Type
+    }
+
+    /**
+     * Mode to base the search in {@link DatasetVersionFilesServiceBean#getFilesDownloadSize(DatasetVersion, FileSearchCriteria, FileDownloadSizeMode)}
+     * <p>
+     * All: Includes both archival and original sizes for tabular files
+     * Archival: Includes only the archival size for tabular files
+     * Original: Includes only the original size for tabular files
+     * <p>
+     * All the modes include archival sizes for non-tabular files
+     */
+    public enum FileDownloadSizeMode {
+        All, Original, Archival
+    }
+
+    /**
+     * Given a DatasetVersion, returns its total file metadata count
+     *
+     * @param datasetVersion the DatasetVersion to access
+     * @return long value of total file metadata count
+     */
+    public long getFileMetadataCount(DatasetVersion datasetVersion) {
+        return getFileMetadataCount(datasetVersion, new FileSearchCriteria(null, null, null, null, null));
+    }
+
+    /**
+     * Given a DatasetVersion, returns its total file metadata count
+     *
+     * @param datasetVersion the DatasetVersion to access
+     * @param searchCriteria for counting only files matching this criteria
+     * @return long value of total file metadata count
+     */
+    public long getFileMetadataCount(DatasetVersion datasetVersion, FileSearchCriteria searchCriteria) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        criteriaQuery
+                .select(criteriaBuilder.count(fileMetadataRoot))
+                .where(createSearchCriteriaPredicate(datasetVersion, searchCriteria, criteriaBuilder, criteriaQuery, fileMetadataRoot));
+        return em.createQuery(criteriaQuery).getSingleResult();
+    }
+
+    /**
+     * Given a DatasetVersion, returns its file metadata count per content type
+     *
+     * @param datasetVersion the DatasetVersion to access
+     * @param searchCriteria for counting only files matching this criteria
+     * @return Map<String, Long> of file metadata counts per content type
+     */
+    public Map<String, Long> getFileMetadataCountPerContentType(DatasetVersion datasetVersion, FileSearchCriteria searchCriteria) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Tuple> criteriaQuery = criteriaBuilder.createTupleQuery();
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        Path<String> contentType = fileMetadataRoot.get("dataFile").get("contentType");
+        criteriaQuery
+                .multiselect(contentType, criteriaBuilder.count(contentType))
+                .where(createSearchCriteriaPredicate(datasetVersion, searchCriteria, criteriaBuilder, criteriaQuery, fileMetadataRoot))
+                .groupBy(contentType);
+        return getStringLongMapResultFromQuery(criteriaQuery);
+    }
+
+    /**
+     * Given a DatasetVersion, returns its file metadata count per category name
+     *
+     * @param datasetVersion the DatasetVersion to access
+     * @param searchCriteria for counting only files matching this criteria
+     * @return Map<String, Long> of file metadata counts per category name
+     */
+    public Map<String, Long> getFileMetadataCountPerCategoryName(DatasetVersion datasetVersion, FileSearchCriteria searchCriteria) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Tuple> criteriaQuery = criteriaBuilder.createTupleQuery();
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        Root<DataFileCategory> dataFileCategoryRoot = criteriaQuery.from(DataFileCategory.class);
+        Path<String> categoryName = dataFileCategoryRoot.get("name");
+        criteriaQuery
+                .multiselect(categoryName, criteriaBuilder.count(fileMetadataRoot))
+                .where(criteriaBuilder.and(
+                        createSearchCriteriaPredicate(datasetVersion, searchCriteria, criteriaBuilder, criteriaQuery, fileMetadataRoot),
+                        dataFileCategoryRoot.in(fileMetadataRoot.get("fileCategories"))))
+                .groupBy(categoryName);
+        return getStringLongMapResultFromQuery(criteriaQuery);
+    }
+
+    /**
+     * Given a DatasetVersion, returns its file metadata count per DataFileTag.TagType
+     *
+     * @param datasetVersion the DatasetVersion to access
+     * @param searchCriteria for counting only files matching this criteria
+     * @return Map<DataFileTag.TagType, Long> of file metadata counts per DataFileTag.TagType
+     */
+    public Map<DataFileTag.TagType, Long> getFileMetadataCountPerTabularTagName(DatasetVersion datasetVersion, FileSearchCriteria searchCriteria) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Tuple> criteriaQuery = criteriaBuilder.createTupleQuery();
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        Root<DataFileTag> dataFileTagRoot = criteriaQuery.from(DataFileTag.class);
+        Path<DataFileTag.TagType> dataFileTagType = dataFileTagRoot.get("type");
+        criteriaQuery
+                .multiselect(dataFileTagType, criteriaBuilder.count(fileMetadataRoot))
+                .where(criteriaBuilder.and(
+                        createSearchCriteriaPredicate(datasetVersion, searchCriteria, criteriaBuilder, criteriaQuery, fileMetadataRoot),
+                        dataFileTagRoot.in(fileMetadataRoot.get("dataFile").get("dataFileTags"))))
+                .groupBy(dataFileTagType);
+        List<Tuple> tagNameOccurrences = em.createQuery(criteriaQuery).getResultList();
+        Map<DataFileTag.TagType, Long> result = new HashMap<>();
+        for (Tuple occurrence : tagNameOccurrences) {
+            result.put(occurrence.get(0, DataFileTag.TagType.class), occurrence.get(1, Long.class));
+        }
+        return result;
+    }
+
+    /**
+     * Given a DatasetVersion, returns its file metadata count per FileAccessStatus
+     *
+     * @param datasetVersion the DatasetVersion to access
+     * @param searchCriteria for counting only files matching this criteria
+     * @return Map<FileAccessStatus, Long> of file metadata counts per FileAccessStatus
+     */
+    public Map<FileAccessStatus, Long> getFileMetadataCountPerAccessStatus(DatasetVersion datasetVersion, FileSearchCriteria searchCriteria) {
+        Map<FileAccessStatus, Long> allCounts = new HashMap<>();
+        addAccessStatusCountToTotal(datasetVersion, allCounts, FileAccessStatus.Public, searchCriteria);
+        addAccessStatusCountToTotal(datasetVersion, allCounts, FileAccessStatus.Restricted, searchCriteria);
+        addAccessStatusCountToTotal(datasetVersion, allCounts, FileAccessStatus.EmbargoedThenPublic, searchCriteria);
+        addAccessStatusCountToTotal(datasetVersion, allCounts, FileAccessStatus.EmbargoedThenRestricted, searchCriteria);
+        return allCounts;
+    }
+
+    /**
+     * Returns a FileMetadata list of files in the specified DatasetVersion
+     *
+     * @param datasetVersion the DatasetVersion to access
+     * @param limit          for pagination, can be null
+     * @param offset         for pagination, can be null
+     * @param searchCriteria for retrieving only files matching this criteria
+     * @param orderCriteria  a FileOrderCriteria to order the results
+     * @return a FileMetadata list from the specified DatasetVersion
+     */
+    public List<FileMetadata> getFileMetadatas(DatasetVersion datasetVersion, Integer limit, Integer offset, FileSearchCriteria searchCriteria, FileOrderCriteria orderCriteria) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<FileMetadata> criteriaQuery = criteriaBuilder.createQuery(FileMetadata.class);
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        criteriaQuery
+                .select(fileMetadataRoot)
+                .where(createSearchCriteriaPredicate(datasetVersion, searchCriteria, criteriaBuilder, criteriaQuery, fileMetadataRoot))
+                .orderBy(createGetFileMetadatasOrder(criteriaBuilder, orderCriteria, fileMetadataRoot));
+        TypedQuery<FileMetadata> typedQuery = em.createQuery(criteriaQuery);
+        if (limit != null) {
+            typedQuery.setMaxResults(limit);
+        }
+        if (offset != null) {
+            typedQuery.setFirstResult(offset);
+        }
+        return typedQuery.getResultList();
+    }
+
+    /**
+     * Returns the total download size of all files for a particular DatasetVersion
+     *
+     * @param datasetVersion the DatasetVersion to access
+     * @param searchCriteria for retrieving only files matching this criteria
+     * @param mode           a FileDownloadSizeMode to base the search on
+     * @return long value of total file download size
+     */
+    public long getFilesDownloadSize(DatasetVersion datasetVersion, FileSearchCriteria searchCriteria, FileDownloadSizeMode mode) {
+        return switch (mode) {
+            case All ->
+                    Long.sum(getOriginalTabularFilesSize(datasetVersion, searchCriteria), getArchivalFilesSize(datasetVersion, false, searchCriteria));
+            case Original ->
+                    Long.sum(getOriginalTabularFilesSize(datasetVersion, searchCriteria), getArchivalFilesSize(datasetVersion, true, searchCriteria));
+            case Archival -> getArchivalFilesSize(datasetVersion, false, searchCriteria);
+        };
+    }
+
+    /**
+     * Determines whether or not a DataFile is present in a DatasetVersion
+     *
+     * @param datasetVersion the DatasetVersion to check
+     * @param dataFile the DataFile to check
+     * @return boolean value
+     */
+    public boolean isDataFilePresentInDatasetVersion(DatasetVersion datasetVersion, DataFile dataFile) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
+        Root<DataFile> dataFileRoot = criteriaQuery.from(DataFile.class);
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        Root<DatasetVersion> datasetVersionRoot = criteriaQuery.from(DatasetVersion.class);
+        criteriaQuery
+                .select(criteriaBuilder.count(dataFileRoot))
+                .where(criteriaBuilder.and(
+                        criteriaBuilder.equal(dataFileRoot.get("id"), dataFile.getId()),
+                        criteriaBuilder.equal(datasetVersionRoot.get("id"), datasetVersion.getId()),
+                        fileMetadataRoot.in(dataFileRoot.get("fileMetadatas")),
+                        fileMetadataRoot.in(datasetVersionRoot.get("fileMetadatas"))
+                        )
+                );
+        Long count = em.createQuery(criteriaQuery).getSingleResult();
+        return count != null && count > 0;
+    }
+
+    private void addAccessStatusCountToTotal(DatasetVersion datasetVersion, Map<FileAccessStatus, Long> totalCounts, FileAccessStatus dataFileAccessStatus, FileSearchCriteria searchCriteria) {
+        long fileMetadataCount = getFileMetadataCountByAccessStatus(datasetVersion, dataFileAccessStatus, searchCriteria);
+        if (fileMetadataCount > 0) {
+            totalCounts.put(dataFileAccessStatus, fileMetadataCount);
+        }
+    }
+
+    private long getFileMetadataCountByAccessStatus(DatasetVersion datasetVersion, FileAccessStatus accessStatus, FileSearchCriteria searchCriteria) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        criteriaQuery
+                .select(criteriaBuilder.count(fileMetadataRoot))
+                .where(criteriaBuilder.and(
+                        createSearchCriteriaAccessStatusPredicate(accessStatus, criteriaBuilder, fileMetadataRoot),
+                        createSearchCriteriaPredicate(datasetVersion, searchCriteria, criteriaBuilder, criteriaQuery, fileMetadataRoot)));
+        return em.createQuery(criteriaQuery).getSingleResult();
+    }
+
+    private Predicate createSearchCriteriaAccessStatusPredicate(FileAccessStatus accessStatus, CriteriaBuilder criteriaBuilder, Root<FileMetadata> fileMetadataRoot) {
+        Path<Object> dataFile = fileMetadataRoot.get("dataFile");
+        Path<Object> retention = dataFile.get("retention");
+        Predicate retentionExpiredPredicate = criteriaBuilder.lessThan(retention.<Date>get("dateUnavailable"), criteriaBuilder.currentDate());
+        Path<Object> embargo = dataFile.get("embargo");
+        Predicate activelyEmbargoedPredicate = criteriaBuilder.greaterThanOrEqualTo(embargo.<Date>get("dateAvailable"), criteriaBuilder.currentDate());
+        Predicate inactivelyEmbargoedPredicate = criteriaBuilder.isNull(embargo);
+        Path<Boolean> isRestricted = dataFile.get("restricted");
+        Predicate isRestrictedPredicate = criteriaBuilder.isTrue(isRestricted);
+        Predicate isUnrestrictedPredicate = criteriaBuilder.isFalse(isRestricted);
+        return switch (accessStatus) {
+            case RetentionPeriodExpired -> criteriaBuilder.and(retentionExpiredPredicate);
+            case EmbargoedThenRestricted -> criteriaBuilder.and(activelyEmbargoedPredicate, isRestrictedPredicate);
+            case EmbargoedThenPublic -> criteriaBuilder.and(activelyEmbargoedPredicate, isUnrestrictedPredicate);
+            case Restricted -> criteriaBuilder.and(inactivelyEmbargoedPredicate, isRestrictedPredicate);
+            case Public -> criteriaBuilder.and(inactivelyEmbargoedPredicate, isUnrestrictedPredicate);
+        };
+    }
+
+    private Predicate createSearchCriteriaPredicate(DatasetVersion datasetVersion,
+                                                    FileSearchCriteria searchCriteria,
+                                                    CriteriaBuilder criteriaBuilder,
+                                                    CriteriaQuery<?> criteriaQuery,
+                                                    Root<FileMetadata> fileMetadataRoot) {
+        List<Predicate> predicates = new ArrayList<>();
+        Predicate basePredicate = criteriaBuilder.equal(fileMetadataRoot.get("datasetVersion").<String>get("id"), datasetVersion.getId());
+        predicates.add(basePredicate);
+        String contentType = searchCriteria.getContentType();
+        if (contentType != null) {
+            predicates.add(criteriaBuilder.equal(fileMetadataRoot.get("dataFile").<String>get("contentType"), contentType));
+        }
+        FileAccessStatus accessStatus = searchCriteria.getAccessStatus();
+        if (accessStatus != null) {
+            predicates.add(createSearchCriteriaAccessStatusPredicate(accessStatus, criteriaBuilder, fileMetadataRoot));
+        }
+        String categoryName = searchCriteria.getCategoryName();
+        if (categoryName != null) {
+            Root<DataFileCategory> dataFileCategoryRoot = criteriaQuery.from(DataFileCategory.class);
+            predicates.add(criteriaBuilder.equal(dataFileCategoryRoot.get("name"), categoryName));
+            predicates.add(dataFileCategoryRoot.in(fileMetadataRoot.get("fileCategories")));
+        }
+        String tabularTagName = searchCriteria.getTabularTagName();
+        if (tabularTagName != null) {
+            Root<DataFileTag> dataFileTagRoot = criteriaQuery.from(DataFileTag.class);
+            predicates.add(criteriaBuilder.equal(dataFileTagRoot.get("type"), TagLabelToTypes.get(tabularTagName)));
+            predicates.add(dataFileTagRoot.in(fileMetadataRoot.get("dataFile").get("dataFileTags")));
+        }
+        String searchText = searchCriteria.getSearchText();
+        if (searchText != null && !searchText.isEmpty()) {
+            searchText = searchText.trim().toLowerCase();
+            predicates.add(criteriaBuilder.or(criteriaBuilder.like(criteriaBuilder.lower(fileMetadataRoot.get("label")), "%" + searchText + "%"),
+                    criteriaBuilder.like(criteriaBuilder.lower(fileMetadataRoot.get("description")), "%" + searchText + "%")));
+        }
+        return criteriaBuilder.and(predicates.toArray(new Predicate[]{}));
+    }
+
+    private List<Order> createGetFileMetadatasOrder(CriteriaBuilder criteriaBuilder,
+                                                    FileOrderCriteria orderCriteria,
+                                                    Root<FileMetadata> fileMetadataRoot) {
+        Path<Object> label = fileMetadataRoot.get("label");
+        Path<Object> dataFile = fileMetadataRoot.get("dataFile");
+        Path<Timestamp> publicationDate = dataFile.get("publicationDate");
+        Path<Timestamp> createDate = dataFile.get("createDate");
+        Expression<Object> orderByLifetimeExpression = criteriaBuilder.selectCase().when(publicationDate.isNotNull(), publicationDate).otherwise(createDate);
+        List<Order> orderList = new ArrayList<>();
+        switch (orderCriteria) {
+            case NameZA -> orderList.add(criteriaBuilder.desc(label));
+            case Newest -> orderList.add(criteriaBuilder.desc(orderByLifetimeExpression));
+            case Oldest -> orderList.add(criteriaBuilder.asc(orderByLifetimeExpression));
+            case Size -> orderList.add(criteriaBuilder.asc(dataFile.get("filesize")));
+            case Type -> {
+                orderList.add(criteriaBuilder.asc(dataFile.get("contentType")));
+                orderList.add(criteriaBuilder.asc(label));
+            }
+            default -> orderList.add(criteriaBuilder.asc(label));
+        }
+        return orderList;
+    }
+
+    private long getOriginalTabularFilesSize(DatasetVersion datasetVersion, FileSearchCriteria searchCriteria) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        Root<DataTable> dataTableRoot = criteriaQuery.from(DataTable.class);
+        criteriaQuery
+                .select(criteriaBuilder.sum(dataTableRoot.get("originalFileSize")))
+                .where(criteriaBuilder.and(
+                        criteriaBuilder.equal(dataTableRoot.get("dataFile"), fileMetadataRoot.get("dataFile")),
+                        createSearchCriteriaPredicate(datasetVersion, searchCriteria, criteriaBuilder, criteriaQuery, fileMetadataRoot)));
+        Long result = em.createQuery(criteriaQuery).getSingleResult();
+        return (result == null) ? 0 : result;
+    }
+
+    private long getArchivalFilesSize(DatasetVersion datasetVersion, boolean ignoreTabular, FileSearchCriteria searchCriteria) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        Predicate searchCriteriaPredicate = createSearchCriteriaPredicate(datasetVersion, searchCriteria, criteriaBuilder, criteriaQuery, fileMetadataRoot);
+        Predicate wherePredicate;
+        if (ignoreTabular) {
+            wherePredicate = criteriaBuilder.and(searchCriteriaPredicate, criteriaBuilder.isEmpty(fileMetadataRoot.get("dataFile").get("dataTables")));
+        } else {
+            wherePredicate = searchCriteriaPredicate;
+        }
+        criteriaQuery
+                .select(criteriaBuilder.sum(fileMetadataRoot.get("dataFile").get("filesize")))
+                .where(wherePredicate);
+        Long result = em.createQuery(criteriaQuery).getSingleResult();
+        return (result == null) ? 0 : result;
+    }
+
+    private Map<String, Long> getStringLongMapResultFromQuery(CriteriaQuery<Tuple> criteriaQuery) {
+        List<Tuple> categoryNameOccurrences = em.createQuery(criteriaQuery).getResultList();
+        Map<String, Long> result = new HashMap<>();
+        for (Tuple occurrence : categoryNameOccurrences) {
+            result.put(occurrence.get(0, String.class), occurrence.get(1, Long.class));
+        }
+        return result;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionNoteValidator.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionNoteValidator.java
deleted file mode 100644
index c086fed3b10..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionNoteValidator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-import edu.harvard.iq.dataverse.util.BundleUtil;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-/**
- *
- * @author skraffmi
- */
-public class DatasetVersionNoteValidator implements ConstraintValidator<ValidateVersionNote, DatasetVersion> {
-    
-    private String versionState;
-    private String versionNote;
-
-    @Override
-    public void initialize(ValidateVersionNote constraintAnnotation) {
-        versionState = constraintAnnotation.versionState();
-        versionNote = constraintAnnotation.versionNote();      
-    }
-
-
-    @Override
-    public boolean isValid(DatasetVersion value, ConstraintValidatorContext context) {
-        
-        if (versionState.equals(DatasetVersion.VersionState.DEACCESSIONED) && versionNote.isEmpty()){
-            if (context != null) {
-                context.buildConstraintViolationWithTemplate(value + "  " + BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.textForReason.error")).addConstraintViolation();
-            }
-            return false;
-        }
-        if (versionState.equals(DatasetVersion.VersionState.DEACCESSIONED) && versionNote.length() > DatasetVersion.VERSION_NOTE_MAX_LENGTH){
-            if (context != null) {
-                context.buildConstraintViolationWithTemplate(value + "  " + BundleUtil.getStringFromBundle("file.deaccessionDialog.dialog.limitChar.error")).addConstraintViolation();
-            }
-            return false;
-        }
-        return true;
-        
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java
index e4eb6aac88e..7e9b778c6f3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java
@@ -2,17 +2,19 @@
 
 import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
 import edu.harvard.iq.dataverse.ingest.IngestUtil;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import static edu.harvard.iq.dataverse.batch.jobs.importer.filesystem.FileRecordJobListener.SEP;
 import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
 import edu.harvard.iq.dataverse.search.SolrSearchResult;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.MarkupChecker;
 import edu.harvard.iq.dataverse.util.SystemConfig;
-import java.io.IOException;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -21,22 +23,21 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import org.apache.commons.lang.StringUtils;
-import org.apache.solr.client.solrj.SolrServerException;
-    
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import org.apache.commons.lang3.StringUtils;
+
 /**
  *
  * @author skraffmiller
@@ -48,7 +49,7 @@ public class DatasetVersionServiceBean implements java.io.Serializable {
     private static final Logger logger = Logger.getLogger(DatasetVersionServiceBean.class.getCanonicalName());
 
     private static final SimpleDateFormat logFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss");
-    
+
     @EJB
     DatasetServiceBean datasetService;
     
@@ -149,11 +150,62 @@ public DatasetVersion getDatasetVersion(){
             return this.datasetVersionForResponse;
         }                
     } // end RetrieveDatasetVersionResponse
-    
+
     public DatasetVersion find(Object pk) {
         return em.find(DatasetVersion.class, pk);
     }
-
+    
+    public DatasetVersion findDeep(Object pk) {
+        return (DatasetVersion) em.createNamedQuery("DatasetVersion.findById")
+            .setParameter("id", pk)
+            // Optimization hints: retrieve all data in one query; this prevents point queries when iterating over the files 
+            .setHint("eclipselink.left-join-fetch", "o.fileMetadatas.dataFile.ingestRequest")
+            .setHint("eclipselink.left-join-fetch", "o.fileMetadatas.dataFile.thumbnailForDataset")
+            .setHint("eclipselink.left-join-fetch", "o.fileMetadatas.dataFile.dataTables")
+            .setHint("eclipselink.left-join-fetch", "o.fileMetadatas.fileCategories")
+            .setHint("eclipselink.left-join-fetch", "o.fileMetadatas.dataFile.embargo")
+            .setHint("eclipselink.left-join-fetch", "o.fileMetadatas.dataFile.retention")
+            .setHint("eclipselink.left-join-fetch", "o.fileMetadatas.datasetVersion")
+            .setHint("eclipselink.left-join-fetch", "o.fileMetadatas.dataFile.releaseUser")
+            .setHint("eclipselink.left-join-fetch", "o.fileMetadatas.dataFile.creator")
+            .setHint("eclipselink.left-join-fetch", "o.fileMetadatas.dataFile.dataFileTags")
+            .getSingleResult();
+    }
+    
+    /**
+     * Performs the same database lookup as the one behind Dataset.getVersions().
+     * Additionally, provides the arguments for selecting a partial list of 
+     * (length-offset) versions for pagination, plus the ability to pre-select 
+     * only the publicly-viewable versions. 
+     * It is recommended that individual software components utilize the 
+     * ListVersionsCommand, instead of calling this service method directly.
+     * @param datasetId
+     * @param offset for pagination through long lists of versions
+     * @param length for pagination through long lists of versions
+     * @param includeUnpublished retrieves all the versions, including drafts and deaccessioned. 
+     * @return (partial) list of versions
+     */
+    public List<DatasetVersion> findVersions(Long datasetId, Integer offset, Integer length, boolean includeUnpublished) {
+        TypedQuery<DatasetVersion> query;  
+        if (includeUnpublished) {
+            query = em.createNamedQuery("DatasetVersion.findByDataset", DatasetVersion.class);
+        } else {
+            query = em.createNamedQuery("DatasetVersion.findReleasedByDataset", DatasetVersion.class)
+                    .setParameter("datasetId", datasetId);
+        }
+        
+        query.setParameter("datasetId", datasetId);
+        
+        if (offset != null) {
+            query.setFirstResult(offset);
+        }
+        if (length != null) {
+            query.setMaxResults(length);
+        }
+        
+        return query.getResultList();
+    }
+    
     public DatasetVersion findByFriendlyVersionNumber(Long datasetId, String friendlyVersionNumber) {
         Long majorVersionNumber = null;
         Long minorVersionNumber = null;
@@ -180,7 +232,7 @@ public DatasetVersion findByFriendlyVersionNumber(Long datasetId, String friendl
                 query.setParameter("majorVersionNumber", majorVersionNumber);
                 query.setParameter("minorVersionNumber", minorVersionNumber);
                 foundDatasetVersion = (DatasetVersion) query.getSingleResult();
-            } catch (javax.persistence.NoResultException e) {
+            } catch (NoResultException e) {
                 logger.warning("no ds version found: " + datasetId + " " + friendlyVersionNumber);
                 // DO nothing, just return null.
             }
@@ -208,7 +260,7 @@ public DatasetVersion findByFriendlyVersionNumber(Long datasetId, String friendl
                     }
                 }
                 return retVal;
-            } catch (javax.persistence.NoResultException e) {
+            } catch (NoResultException e) {
                 logger.warning("no ds version found: " + datasetId + " " + friendlyVersionNumber);
                 // DO nothing, just return null.
             }
@@ -264,6 +316,23 @@ private void msg(String s){
         //logger.fine(s);
     }
     
+    public boolean isVersionDefaultCustomTerms(DatasetVersion datasetVersion) {
+        //SEK - belt and suspenders here, but this is where the bug 10719 first manifested
+        if (datasetVersion != null && datasetVersion.getId() != null) {
+            try {
+                TermsOfUseAndAccess toua = (TermsOfUseAndAccess) em.createNamedQuery("TermsOfUseAndAccess.findByDatasetVersionIdAndDefaultTerms")
+                        .setParameter("id", datasetVersion.getId()).setParameter("defaultTerms", TermsOfUseAndAccess.DEFAULT_NOTERMS).getSingleResult();
+                if (toua != null && datasetVersion.getTermsOfUseAndAccess().getLicense() == null) {
+                    return true;
+                }
+
+            } catch (NoResultException e) {
+                return false;
+            }
+        }
+        return false;
+    }
+    
     /**
      * Does the version identifier in the URL ask for a "DRAFT"?
      * 
@@ -435,7 +504,7 @@ private DatasetVersion getDatasetVersionByQuery(String queryString){
             msg("Found: " + ds);
             return ds;
             
-        } catch (javax.persistence.NoResultException e) {
+        } catch (NoResultException e) {
             msg("DatasetVersion not found: " + queryString);
             logger.log(Level.FINE, "DatasetVersion not found: {0}", queryString);
             return null;
@@ -445,10 +514,24 @@ private DatasetVersion getDatasetVersionByQuery(String queryString){
          }
     } // end getDatasetVersionByQuery
     
-    
-    
-    
-    public DatasetVersion retrieveDatasetVersionByIdentiferClause(String identifierClause, String version){
+    /**
+     * @deprecated because of a typo; use {@link #retrieveDatasetVersionByIdentifierClause(String, String) retrieveDatasetVersionByIdentifierClause} instead
+     * @see #retrieveDatasetVersionByIdentifierClause(String, String)
+     * @param identifierClause
+     * @param version
+     * @return a DatasetVersion if found, or {@code null} otherwise
+     */
+    @Deprecated
+    public DatasetVersion retrieveDatasetVersionByIdentiferClause(String identifierClause, String version) {
+        return retrieveDatasetVersionByIdentifierClause(identifierClause, version);
+    }
+
+    /**
+     * @param identifierClause
+     * @param version
+     * @return a DatasetVersion if found, or {@code null} otherwise
+     */
+    public DatasetVersion retrieveDatasetVersionByIdentifierClause(String identifierClause, String version) {
         
         if (identifierClause == null){
             return null;
@@ -559,7 +642,7 @@ public RetrieveDatasetVersionResponse retrieveDatasetVersionByPersistentId(Strin
         */
         GlobalId parsedId;
         try{
-            parsedId = new GlobalId(persistentId);   // [ protocol, authority, identifier]
+            parsedId = PidUtil.parseAsGlobalID(persistentId);   // [ protocol, authority, identifier]
         } catch (IllegalArgumentException e){
             logger.log(Level.WARNING, "Failed to parse persistentID: {0}", persistentId);
             return null;
@@ -570,7 +653,7 @@ public RetrieveDatasetVersionResponse retrieveDatasetVersionByPersistentId(Strin
         identifierClause += " AND ds.identifier = '" + parsedId.getIdentifier() + "'"; 
         
 
-        DatasetVersion ds = retrieveDatasetVersionByIdentiferClause(identifierClause, version);
+        DatasetVersion ds = retrieveDatasetVersionByIdentifierClause(identifierClause, version);
         
         if (ds != null){
             msg("retrieved dataset: " + ds.getId() + " semantic: " + ds.getSemanticVersion());
@@ -648,13 +731,8 @@ public RetrieveDatasetVersionResponse selectRequestedVersion(List<DatasetVersion
      */
     public RetrieveDatasetVersionResponse retrieveDatasetVersionById(Long datasetId, String version){
         msg("retrieveDatasetVersionById: " + datasetId + " " + version);
-        if (datasetId==null){
-            return null;
-        }        
         
-        String identifierClause = " AND ds.id = " + datasetId;
-
-        DatasetVersion ds = retrieveDatasetVersionByIdentiferClause(identifierClause, version);
+        DatasetVersion ds = getDatasetVersionById(datasetId, version);
         
         if (ds != null){
             return new RetrieveDatasetVersionResponse(ds, version);
@@ -665,6 +743,30 @@ public RetrieveDatasetVersionResponse retrieveDatasetVersionById(Long datasetId,
           
     } // end: retrieveDatasetVersionById
     
+    public DatasetVersion getDatasetVersionById(Long datasetId, String version){
+        msg("retrieveDatasetVersionById: " + datasetId + " " + version);
+        if (datasetId==null){
+            return null;
+        }        
+        
+        String identifierClause = this.getIdClause(datasetId);
+
+        DatasetVersion ds = retrieveDatasetVersionByIdentifierClause(identifierClause, version);
+        
+        return ds;
+
+          
+    } // end: getDatasetVersionById
+    
+    public DatasetVersion getLatestReleasedVersionFast(Long datasetId) {
+        String identifierClause = this.getIdClause(datasetId);
+        String latestVersionQuery = this.getLatestReleasedDatasetVersionQuery(identifierClause);
+        return this.getDatasetVersionByQuery(latestVersionQuery);
+    }
+    
+    private String getIdClause(Long datasetId) {
+        return " AND ds.id = " + datasetId;
+    }
     
      /**
      * Find a DatasetVersion using the dataset versionId
@@ -688,7 +790,7 @@ public RetrieveDatasetVersionResponse retrieveDatasetVersionByVersionId(Long ver
         }
         return null;          
     } // end: retrieveDatasetVersionByVersionId
-
+    
     // This is an optimized, native query-based method for picking an image 
     // that can be used as the thumbnail for a given dataset/version. 
     // It is primarily designed to be used when thumbnails are requested
@@ -706,34 +808,11 @@ public Long getThumbnailByVersionId(Long versionId) {
             return null;
         }
 
-        Long thumbnailFileId;
-
-        // First, let's see if there are thumbnails that have already been 
-        // generated:
-        try {
-            thumbnailFileId = (Long) em.createNativeQuery("SELECT df.id "
-                    + "FROM datafile df, filemetadata fm, datasetversion dv, dvobject o "
-                    + "WHERE dv.id = " + versionId + " "
-                    + "AND df.id = o.id "
-                    + "AND fm.datasetversion_id = dv.id "
-                    + "AND fm.datafile_id = df.id "
-                    + "AND df.restricted = false "
-                    + "AND o.previewImageAvailable = true "
-                    + "ORDER BY df.id LIMIT 1;").getSingleResult();
-        } catch (Exception ex) {
-            thumbnailFileId = null;
-        }
-
-        if (thumbnailFileId != null) {
-            logger.fine("DatasetVersionService,getThumbnailByVersionid(): found already generated thumbnail for version " + versionId + ": " + thumbnailFileId);
-            assignDatasetThumbnailByNativeQuery(versionId, thumbnailFileId);
-            return thumbnailFileId;
-        }
-
-        if (!systemConfig.isThumbnailGenerationDisabledForImages()) {
-            // OK, let's try and generate an image thumbnail!
-            long imageThumbnailSizeLimit = systemConfig.getThumbnailSizeLimitImage();
+        if (!FeatureFlags.DISABLE_DATASET_THUMBNAIL_AUTOSELECT.enabled()) {
+            Long thumbnailFileId;
 
+            // First, let's see if there are thumbnails that have already been 
+            // generated:
             try {
                 thumbnailFileId = (Long) em.createNativeQuery("SELECT df.id "
                         + "FROM datafile df, filemetadata fm, datasetversion dv, dvobject o "
@@ -741,59 +820,89 @@ public Long getThumbnailByVersionId(Long versionId) {
                         + "AND df.id = o.id "
                         + "AND fm.datasetversion_id = dv.id "
                         + "AND fm.datafile_id = df.id "
-                        // + "AND o.previewImageAvailable = false "
                         + "AND df.restricted = false "
-                        + "AND df.contenttype LIKE 'image/%' "
-                        + "AND NOT df.contenttype = 'image/fits' "
-                        + "AND df.filesize < " + imageThumbnailSizeLimit + " "
-                        + "ORDER BY df.filesize ASC LIMIT 1;").getSingleResult();
+                        + "AND df.embargo_id is null "
+                        + "AND df.retention_id is null "
+                        + "AND o.previewImageAvailable = true "
+                        + "ORDER BY df.id LIMIT 1;").getSingleResult();
             } catch (Exception ex) {
                 thumbnailFileId = null;
             }
 
             if (thumbnailFileId != null) {
-                logger.fine("obtained file id: " + thumbnailFileId);
-                DataFile thumbnailFile = datafileService.find(thumbnailFileId);
-                if (thumbnailFile != null) {
-                    if (datafileService.isThumbnailAvailable(thumbnailFile)) {
-                        assignDatasetThumbnailByNativeQuery(versionId, thumbnailFileId);
-                        return thumbnailFileId;
+                logger.fine("DatasetVersionService,getThumbnailByVersionid(): found already generated thumbnail for version " + versionId + ": " + thumbnailFileId);
+                assignDatasetThumbnailByNativeQuery(versionId, thumbnailFileId);
+                return thumbnailFileId;
+            }
+
+            if (!systemConfig.isThumbnailGenerationDisabledForImages()) {
+                // OK, let's try and generate an image thumbnail!
+                long imageThumbnailSizeLimit = systemConfig.getThumbnailSizeLimitImage();
+
+                try {
+                    thumbnailFileId = (Long) em.createNativeQuery("SELECT df.id "
+                            + "FROM datafile df, filemetadata fm, datasetversion dv, dvobject o "
+                            + "WHERE dv.id = " + versionId + " "
+                            + "AND df.id = o.id "
+                            + "AND fm.datasetversion_id = dv.id "
+                            + "AND fm.datafile_id = df.id "
+                            + "AND o.previewimagefail = false "
+                            + "AND df.restricted = false "
+                            + "AND df.embargo_id is null "
+                            + "AND df.retention_id is null "
+                            + "AND df.contenttype LIKE 'image/%' "
+                            + "AND NOT df.contenttype = 'image/fits' "
+                            + "AND df.filesize < " + imageThumbnailSizeLimit + " "
+                            + "ORDER BY df.filesize ASC LIMIT 1;").getSingleResult();
+                } catch (Exception ex) {
+                    thumbnailFileId = null;
+                }
+
+                if (thumbnailFileId != null) {
+                    logger.fine("obtained file id: " + thumbnailFileId);
+                    DataFile thumbnailFile = datafileService.find(thumbnailFileId);
+                    if (thumbnailFile != null) {
+                        if (datafileService.isThumbnailAvailable(thumbnailFile)) {
+                            assignDatasetThumbnailByNativeQuery(versionId, thumbnailFileId);
+                            return thumbnailFileId;
+                        }
                     }
                 }
             }
-        }
 
-        // And if that didn't work, try the same thing for PDFs:
-        if (!systemConfig.isThumbnailGenerationDisabledForPDF()) {
-            // OK, let's try and generate an image thumbnail!
-            long imageThumbnailSizeLimit = systemConfig.getThumbnailSizeLimitPDF();
-            try {
-                thumbnailFileId = (Long) em.createNativeQuery("SELECT df.id "
-                        + "FROM datafile df, filemetadata fm, datasetversion dv, dvobject o "
-                        + "WHERE dv.id = " + versionId + " "
-                        + "AND df.id = o.id "
-                        + "AND fm.datasetversion_id = dv.id "
-                        + "AND fm.datafile_id = df.id "
-                        // + "AND o.previewImageAvailable = false "
-                        + "AND df.restricted = false "
-                        + "AND df.contenttype = 'application/pdf' "
-                        + "AND df.filesize < " + imageThumbnailSizeLimit + " "
-                        + "ORDER BY df.filesize ASC LIMIT 1;").getSingleResult();
-            } catch (Exception ex) {
-                thumbnailFileId = null;
-            }
+            // And if that didn't work, try the same thing for PDFs:
+            if (!systemConfig.isThumbnailGenerationDisabledForPDF()) {
+                // OK, let's try and generate an image thumbnail!
+                long imageThumbnailSizeLimit = systemConfig.getThumbnailSizeLimitPDF();
+                try {
+                    thumbnailFileId = (Long) em.createNativeQuery("SELECT df.id "
+                            + "FROM datafile df, filemetadata fm, datasetversion dv, dvobject o "
+                            + "WHERE dv.id = " + versionId + " "
+                            + "AND df.id = o.id "
+                            + "AND fm.datasetversion_id = dv.id "
+                            + "AND fm.datafile_id = df.id "
+                            + "AND o.previewimagefail = false "
+                            + "AND df.restricted = false "
+                            + "AND df.embargo_id is null "
+                            + "AND df.retention_id is null "
+                            + "AND df.contenttype = 'application/pdf' "
+                            + "AND df.filesize < " + imageThumbnailSizeLimit + " "
+                            + "ORDER BY df.filesize ASC LIMIT 1;").getSingleResult();
+                } catch (Exception ex) {
+                    thumbnailFileId = null;
+                }
 
-            if (thumbnailFileId != null) {
-                DataFile thumbnailFile = datafileService.find(thumbnailFileId);
-                if (thumbnailFile != null) {
-                    if (datafileService.isThumbnailAvailable(thumbnailFile)) {
-                        assignDatasetThumbnailByNativeQuery(versionId, thumbnailFileId);
-                        return thumbnailFileId;
+                if (thumbnailFileId != null) {
+                    DataFile thumbnailFile = datafileService.find(thumbnailFileId);
+                    if (thumbnailFile != null) {
+                        if (datafileService.isThumbnailAvailable(thumbnailFile)) {
+                            assignDatasetThumbnailByNativeQuery(versionId, thumbnailFileId);
+                            return thumbnailFileId;
+                        }
                     }
                 }
             }
         }
-
         return null;
     }
     
@@ -870,7 +979,7 @@ public void populateDatasetSearchCard(SolrSearchResult solrSearchResult) {
         if (searchResult.length == 5) {
             Dataset datasetEntity = new Dataset();
             String globalIdentifier = solrSearchResult.getIdentifier();
-            GlobalId globalId = new GlobalId(globalIdentifier);
+            GlobalId globalId = PidUtil.parseAsGlobalID(globalIdentifier);
 
             datasetEntity.setProtocol(globalId.getProtocol());
             datasetEntity.setAuthority(globalId.getAuthority());
@@ -951,42 +1060,6 @@ public boolean doesChecksumExistInDatasetVersion(DatasetVersion datasetVersion,
     }
         
     
-    public List<HashMap<String, Object>> getBasicDatasetVersionInfo(Dataset dataset){
-        
-        if (dataset == null){
-            throw new NullPointerException("dataset cannot be null");
-        }
-        
-        String query = "SELECT id, dataset_id, releasetime, versionnumber,"
-                    + " minorversionnumber, versionstate, versionnote" 
-                    + " FROM datasetversion"
-                    + " WHERE dataset_id = " + dataset.getId()
-                    + " ORDER BY versionnumber DESC,"
-                    + " minorversionnumber DESC," 
-                    + " versionstate;";
-        msg("query: " + query);
-        Query nativeQuery = em.createNativeQuery(query);
-        List<Object[]> datasetVersionInfoList = nativeQuery.getResultList();
-
-        List<HashMap<String, Object>> hashList = new ArrayList<>();
-        
-        HashMap<String, Object> mMap = new HashMap<>();
-        for (Object[] dvInfo : datasetVersionInfoList) {
-            mMap = new HashMap<>();
-            mMap.put("datasetVersionId", dvInfo[0]);
-            mMap.put("datasetId", dvInfo[1]);
-            mMap.put("releaseTime", dvInfo[2]);
-            mMap.put("versionnumber", dvInfo[3]);
-            mMap.put("minorversionnumber", dvInfo[4]);
-            mMap.put("versionstate", dvInfo[5]);
-            mMap.put("versionnote", dvInfo[6]);
-            hashList.add(mMap);
-        }
-        return hashList;
-    } // end getBasicDatasetVersionInfo
-    
-    
-    
     public HashMap getFileMetadataHistory(DataFile df){
         
         if (df == null){
@@ -1095,13 +1168,7 @@ public JsonObjectBuilder fixMissingUnf(String datasetVersionId, boolean forceRec
 
         // reindexing the dataset, to make sure the new UNF is in SOLR:
         boolean doNormalSolrDocCleanUp = true;
-        try {
-            Future<String> indexingResult = indexService.indexDataset(datasetVersion.getDataset(), doNormalSolrDocCleanUp);
-        } catch (IOException | SolrServerException e) {    
-            String failureLogText = "Post UNF update indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + datasetVersion.getDataset().getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(null, failureLogText,  datasetVersion.getDataset());
-        }
+        indexService.asyncIndexDataset(datasetVersion.getDataset(), doNormalSolrDocCleanUp);
         return info;
     }
     
@@ -1165,4 +1232,32 @@ private DatasetVersion getPreviousVersionWithUnf(DatasetVersion datasetVersion)
         return null;
     }
     
+    /**
+     * Merges the passed datasetversion to the persistence context.
+     * @param ver the DatasetVersion whose new state we want to persist.
+     * @return The managed entity representing {@code ver}.
+     */
+    public DatasetVersion merge( DatasetVersion ver ) {
+        return em.merge(ver);
+    }
+    
+    /**
+     * Execute a query to return DatasetVersion
+     * 
+     * @param queryString
+     * @return 
+     */
+    public List<DatasetVersion> getUnarchivedDatasetVersions(){
+        
+        try {
+            List<DatasetVersion> dsl = em.createNamedQuery("DatasetVersion.findUnarchivedReleasedVersion", DatasetVersion.class).getResultList();
+            return dsl;
+        } catch (NoResultException e) {
+            logger.log(Level.FINE, "No unarchived DatasetVersions found: {0}");
+            return null;
+        } catch (EJBException e) {
+            logger.log(Level.WARNING, "EJBException exception: {0}", e.getMessage());
+            return null;
+        }
+    } // end getUnarchivedDatasetVersions
 } // end class
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java
index 14524ca9007..f579fc9a6d1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java
@@ -6,23 +6,23 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.util.MarkupChecker;
-import edu.harvard.iq.dataverse.util.StringUtil;
+
 import java.io.Serializable;
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.StringUtils;
+
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 /**
  *
@@ -33,42 +33,45 @@ public class DatasetVersionUI implements Serializable {
 
     @EJB
     DataverseServiceBean dataverseService;
+    @Inject
+    SettingsWrapper settingsWrapper;
+    
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;   
     
     public DatasetVersionUI() {
     }
 
-    private Map<MetadataBlock, List<DatasetField>> metadataBlocksForView = new HashMap<>();
-    private Map<MetadataBlock, List<DatasetField>> metadataBlocksForEdit = new HashMap<>();
+    private TreeMap<MetadataBlock, List<DatasetField>> metadataBlocksForView = new TreeMap<>();
+    private TreeMap<MetadataBlock, List<DatasetField>> metadataBlocksForEdit = new TreeMap<>();
 
-    public Map<MetadataBlock, List<DatasetField>> getMetadataBlocksForView() {
+    public TreeMap<MetadataBlock, List<DatasetField>> getMetadataBlocksForView() {
         return metadataBlocksForView;
     }
 
-    public void setMetadataBlocksForView(Map<MetadataBlock, List<DatasetField>> metadataBlocksForView) {
+    public void setMetadataBlocksForView(TreeMap<MetadataBlock, List<DatasetField>> metadataBlocksForView) {
         this.metadataBlocksForView = metadataBlocksForView;
     }
 
-    public Map<MetadataBlock, List<DatasetField>> getMetadataBlocksForEdit() {
+    public TreeMap<MetadataBlock, List<DatasetField>> getMetadataBlocksForEdit() {
         return metadataBlocksForEdit;
     }
 
-    public void setMetadataBlocksForEdit(Map<MetadataBlock, List<DatasetField>> metadataBlocksForEdit) {
+    public void setMetadataBlocksForEdit(TreeMap<MetadataBlock, List<DatasetField>> metadataBlocksForEdit) {
         this.metadataBlocksForEdit = metadataBlocksForEdit;
     }
     
     public DatasetVersionUI  initDatasetVersionUI(DatasetVersion datasetVersion, boolean createBlanks) {
         /*takes in the values of a dataset version 
          and apportions them into lists for 
-         viewing and editng in the dataset page.
+         viewing and editing in the dataset page.
          */
         
         setDatasetVersion(datasetVersion);
         //this.setDatasetAuthors(new ArrayList());
         this.setDatasetRelPublications(new ArrayList<>());
 
-        // loop through vaues to get fields for view mode
+        // loop through values to get fields for view mode
         for (DatasetField dsf : datasetVersion.getDatasetFields()) {
             //Special Handling for various fields displayed above tabs in dataset page view.
             if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.title)) {
@@ -110,20 +113,26 @@ public DatasetVersionUI  initDatasetVersionUI(DatasetVersion datasetVersion, boo
                 if (this.datasetRelPublications.isEmpty()) {
                     for (DatasetFieldCompoundValue relPubVal : dsf.getDatasetFieldCompoundValues()) {
                         DatasetRelPublication datasetRelPublication = new DatasetRelPublication();
-                        datasetRelPublication.setTitle(dsf.getDatasetFieldType().getTitle());
-                        datasetRelPublication.setDescription(dsf.getDatasetFieldType().getDescription());
+                        datasetRelPublication.setTitle(dsf.getDatasetFieldType().getLocaleTitle());
+                        datasetRelPublication.setDescription(dsf.getDatasetFieldType().getLocaleDescription());
                         for (DatasetField subField : relPubVal.getChildDatasetFields()) {
-                            if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationCitation)) {
-                                datasetRelPublication.setText(subField.getValue());
-                            }
-                            if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationIDNumber)) {
-                                datasetRelPublication.setIdNumber(subField.getValue());
-                            }
-                            if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationIDType)) {
-                                datasetRelPublication.setIdType(subField.getValue());
-                            }
-                            if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationURL)) {
-                                datasetRelPublication.setUrl(subField.getValue());
+                            String value = subField.getValue();
+                            switch (subField.getDatasetFieldType().getName()) {
+                                case DatasetFieldConstant.publicationCitation:
+                                    datasetRelPublication.setText(subField.getValue());
+                                    break;
+                                case DatasetFieldConstant.publicationIDNumber:
+                                    datasetRelPublication.setIdNumber(subField.getValue());
+                                    break;
+                                case DatasetFieldConstant.publicationIDType:
+                                    datasetRelPublication.setIdType(subField.getValue());
+                                    break;
+                                case DatasetFieldConstant.publicationURL:
+                                    datasetRelPublication.setUrl(subField.getValue());
+                                    break;
+                                case DatasetFieldConstant.publicationRelationType:
+                                    datasetRelPublication.setRelationType(subField.getValue());
+                                    break;
                             }
                         }
                         this.getDatasetRelPublications().add(datasetRelPublication);
@@ -262,6 +271,18 @@ public String getRelPublicationUrl() {
         }
     }
 
+    public String getRelPublicationRelationType() {
+        if (!this.datasetRelPublications.isEmpty()) {
+            //Add ': ' formatting if relationType exists
+            String relationType = this.getDatasetRelPublications().get(0).getRelationType();
+            if (!StringUtils.isBlank(relationType)) {
+                return relationType + ": ";
+            }
+        }
+        return "";
+
+    }
+
     public String getUNF() {
         //todo get UNF to calculate and display here.
         return "";
@@ -398,6 +419,9 @@ public void setMetadataValueBlocks(DatasetVersion datasetVersion) {
         //TODO: A lot of clean up on the logic of this method
         metadataBlocksForView.clear();
         metadataBlocksForEdit.clear();
+        
+        List<MetadataBlock> systemMDBlocks = settingsWrapper.getSystemMetadataBlocks();
+        
         Long dvIdForInputLevel = datasetVersion.getDataset().getOwner().getId();
         
         if (!dataverseService.find(dvIdForInputLevel).isMetadataBlockRoot()){
@@ -417,7 +441,7 @@ public void setMetadataValueBlocks(DatasetVersion datasetVersion) {
                     actualMDB.add(mdbTest);
                 }
             }
-        }       
+        }
         
         for (MetadataBlock mdb : actualMDB) {
             mdb.setEmpty(true);
@@ -434,13 +458,18 @@ public void setMetadataValueBlocks(DatasetVersion datasetVersion) {
                         mdb.setEmpty(false);
                         datasetFieldsForView.add(dsf);
                     }
+                    // Setting Local Display on Create on mdb when there are any set at dataverse
+                    // level
+                    if (dsf.getDatasetFieldType().shouldDisplayOnCreate()) {
+                        mdb.setLocalDisplayOnCreate(true);
+                    }
                 }
             }
 
             if (!datasetFieldsForView.isEmpty()) {
                 metadataBlocksForView.put(mdb, datasetFieldsForView);
             }
-            if (!datasetFieldsForEdit.isEmpty()) {
+            if (!datasetFieldsForEdit.isEmpty() && !systemMDBlocks.contains(mdb)) {
                 metadataBlocksForEdit.put(mdb, datasetFieldsForEdit);
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUser.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUser.java
index eda62a080f8..e56fad71253 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUser.java
@@ -4,20 +4,20 @@
 import edu.harvard.iq.dataverse.authorization.users.User;
 import java.io.Serializable;
 import java.sql.Timestamp;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
 
-import javax.persistence.Id;
-import javax.persistence.Index;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
 
-import javax.persistence.JoinColumn;
+import jakarta.persistence.JoinColumn;
 
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  * Records the last time a {@link User} handled a {@link DatasetVersion}.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetWidgetsPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetWidgetsPage.java
index 353c7e8739b..1dd42903118 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetWidgetsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetWidgetsPage.java
@@ -14,12 +14,12 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.primefaces.event.FileUploadEvent;
-import org.primefaces.model.UploadedFile;
+import org.primefaces.model.file.UploadedFile;
 
 @ViewScoped
 @Named("DatasetWidgetsPage")
@@ -67,8 +67,8 @@ public String init() {
         if (!permissionsWrapper.canIssueCommand(dataset, UpdateDatasetVersionCommand.class)) {
             return permissionsWrapper.notAuthorized();
         }
-        datasetThumbnails = DatasetUtil.getThumbnailCandidates(dataset, considerDatasetLogoAsCandidate);
-        datasetThumbnail = dataset.getDatasetThumbnail();
+        datasetThumbnails = DatasetUtil.getThumbnailCandidates(dataset, considerDatasetLogoAsCandidate, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
+        datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
         if (datasetThumbnail != null) {
             DataFile dataFile = datasetThumbnail.getDataFile();
             if (dataFile != null) {
@@ -117,7 +117,7 @@ public void setDatasetFileThumbnailToSwitchTo(DataFile datasetFileThumbnailToSwi
     public void setDataFileAsThumbnail() {
         logger.fine("setDataFileAsThumbnail clicked");
         updateDatasetThumbnailCommand = new UpdateDatasetThumbnailCommand(dvRequestService.getDataverseRequest(), dataset, UpdateDatasetThumbnailCommand.UserIntent.setDatasetFileAsThumbnail, datasetFileThumbnailToSwitchTo.getId(), null);
-        String base64image = ImageThumbConverter.getImageThumbnailAsBase64(datasetFileThumbnailToSwitchTo, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+        String base64image = ImageThumbConverter.getImageThumbnailAsBase64(datasetFileThumbnailToSwitchTo, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
         datasetThumbnail = new DatasetThumbnail(base64image, datasetFileThumbnailToSwitchTo);
     }
 
@@ -132,7 +132,7 @@ public void handleImageFileUpload(FileUploadEvent event) {
         logger.fine("handleImageFileUpload clicked");
         UploadedFile uploadedFile = event.getFile();
         try {
-            updateDatasetThumbnailCommand = new UpdateDatasetThumbnailCommand(dvRequestService.getDataverseRequest(), dataset, UpdateDatasetThumbnailCommand.UserIntent.setNonDatasetFileAsThumbnail, null, uploadedFile.getInputstream());
+            updateDatasetThumbnailCommand = new UpdateDatasetThumbnailCommand(dvRequestService.getDataverseRequest(), dataset, UpdateDatasetThumbnailCommand.UserIntent.setNonDatasetFileAsThumbnail, null, uploadedFile.getInputStream());
         } catch (IOException ex) {
             String error = "Unexpected error while uploading file.";
             logger.warning("Problem uploading dataset thumbnail to dataset id " + dataset.getId() + ". " + error + " . Exception: " + ex);
@@ -141,12 +141,12 @@ public void handleImageFileUpload(FileUploadEvent event) {
         }
         File file = null;
         try {
-            file = FileUtil.inputStreamToFile(uploadedFile.getInputstream());
+            file = FileUtil.inputStreamToFile(uploadedFile.getInputStream());
         } catch (IOException ex) {
             Logger.getLogger(DatasetWidgetsPage.class.getName()).log(Level.SEVERE, null, ex);
             return;
         }
-        String base64image = ImageThumbConverter.generateImageThumbnailFromFileAsBase64(file, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+        String base64image = ImageThumbConverter.generateImageThumbnailFromFileAsBase64(file, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
         if (base64image != null) {
             datasetThumbnail = new DatasetThumbnail(base64image, datasetFileThumbnailToSwitchTo);
         } else {
@@ -164,7 +164,7 @@ public String save() {
         try {
             DatasetThumbnail datasetThumbnailFromCommand = commandEngine.submit(updateDatasetThumbnailCommand);
             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.thumbnailsAndWidget.success"));
-            return "/dataset.xhtml?persistentId=" + dataset.getGlobalIdString() + "&faces-redirect=true";
+            return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&faces-redirect=true";
         } catch (CommandException ex) {
             String error = ex.getLocalizedMessage();
             /**
@@ -179,7 +179,7 @@ public String save() {
 
     public String cancel() {
         logger.fine("cancel clicked");
-        return "/dataset.xhtml?persistentId=" + dataset.getGlobalIdString() + "&faces-redirect=true";
+        return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&faces-redirect=true";
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
index 024281b0b96..98f52b705a8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -1,36 +1,40 @@
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearch;
+import edu.harvard.iq.dataverse.storageuse.StorageUse;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
 import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -40,14 +44,25 @@
  * @author mbarsinai
  */
 @NamedQueries({
+    @NamedQuery(name = "Dataverse.findIdStale",query = "SELECT d.id FROM Dataverse d WHERE d.indexTime is NULL OR d.indexTime < d.modificationTime"),
+    @NamedQuery(name = "Dataverse.findIdStalePermission",query = "SELECT d.id FROM Dataverse d WHERE d.permissionIndexTime is NULL OR d.permissionIndexTime < d.permissionModificationTime"),
     @NamedQuery(name = "Dataverse.ownedObjectsById", query = "SELECT COUNT(obj) FROM DvObject obj WHERE obj.owner.id=:id"),
     @NamedQuery(name = "Dataverse.findAll", query = "SELECT d FROM Dataverse d order by d.name"),
     @NamedQuery(name = "Dataverse.findRoot", query = "SELECT d FROM Dataverse d where d.owner.id=null"),
     @NamedQuery(name = "Dataverse.findByAlias", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.alias)=:alias"),
     @NamedQuery(name = "Dataverse.findByOwnerId", query="select object(o) from Dataverse as o where o.owner.id =:ownerId order by o.name"),
+    @NamedQuery(name = "Dataverse.findByCreatorId", query="select object(o) from Dataverse as o where o.creator.id =:creatorId order by o.name"),
+    @NamedQuery(name = "Dataverse.findByReleaseUserId", query="select object(o) from Dataverse as o where o.releaseUser.id =:releaseUserId order by o.name"),
     @NamedQuery(name = "Dataverse.filterByAlias", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.alias) LIKE :alias order by dv.alias"),
     @NamedQuery(name = "Dataverse.filterByAliasNameAffiliation", query="SELECT dv FROM Dataverse dv WHERE (LOWER(dv.alias) LIKE :alias) OR (LOWER(dv.name) LIKE :name) OR (LOWER(dv.affiliation) LIKE :affiliation) order by dv.alias"),
-    @NamedQuery(name = "Dataverse.filterByName", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.name) LIKE :name  order by dv.alias")
+    @NamedQuery(name = "Dataverse.filterByName", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.name) LIKE :name  order by dv.alias"),
+    @NamedQuery(name = "Dataverse.countAll", query = "SELECT COUNT(dv) FROM Dataverse dv"),
+    @NamedQuery(name = "Dataverse.getDatasetCount",
+                query = "SELECT " +
+                        "(SELECT COUNT(DISTINCT d) FROM Dataset d JOIN d.versions v WHERE d.owner.id IN :ids AND v.versionState = :datasetState) + " +
+                        "(SELECT COUNT(DISTINCT l.dataset) FROM DatasetLinkingDataverse l JOIN l.dataset.versions v WHERE l.linkingDataverse.id IN :ids AND v.versionState = :datasetState) " +
+                        // The WHERE statement is a hacky way of ensuring the count is returned in a single result row
+                        "FROM Dataverse d WHERE d.id = (SELECT MIN(d2.id) FROM Dataverse d2)")
 })
 @Entity
 @Table(indexes = {@Index(columnList="defaultcontributorrole_id")
@@ -96,7 +111,11 @@ public enum DataverseType {
      * dataverses.
      */
     protected boolean permissionRoot;
-
+    
+    public Dataverse() {
+        StorageUse storageUse = new StorageUse(this); 
+        this.setStorageUse(storageUse);
+    }
     
     public DataverseType getDataverseType() {
         return dataverseType;
@@ -147,6 +166,8 @@ public String getIndexableCategoryName() {
     }
 
     private String affiliation;
+    
+    ///private String storageDriver=null;
 
 	// Note: We can't have "Remove" here, as there are role assignments that refer
     //       to this role. So, adding it would mean violating a forign key contstraint.
@@ -313,8 +334,31 @@ public boolean isHarvested() {
         return harvestingClient != null; 
     }
     */
-    
-    
+    private boolean metadataBlockFacetRoot;
+
+    public boolean isMetadataBlockFacetRoot() {
+        return metadataBlockFacetRoot;
+    }
+
+    public void setMetadataBlockFacetRoot(boolean metadataBlockFacetRoot) {
+        this.metadataBlockFacetRoot = metadataBlockFacetRoot;
+    }
+
+    @OneToMany(mappedBy = "dataverse",cascade={ CascadeType.REMOVE, CascadeType.MERGE,CascadeType.PERSIST }, orphanRemoval=true)
+    private List<DataverseMetadataBlockFacet> metadataBlockFacets = new ArrayList<>();
+
+    public List<DataverseMetadataBlockFacet> getMetadataBlockFacets() {
+        if (isMetadataBlockFacetRoot() || getOwner() == null) {
+            return metadataBlockFacets;
+        } else {
+            return getOwner().getMetadataBlockFacets();
+        }
+    }
+
+    public void setMetadataBlockFacets(List<DataverseMetadataBlockFacet> metadataBlockFacets) {
+        this.metadataBlockFacets = metadataBlockFacets;
+    }
+
     public List<Guestbook> getParentGuestbooks() {
         List<Guestbook> retList = new ArrayList<>();
         Dataverse testDV = this;
@@ -374,6 +418,33 @@ public List<DataverseFieldTypeInputLevel> getDataverseFieldTypeInputLevels() {
         return dataverseFieldTypeInputLevels;
     }
 
+    public boolean isDatasetFieldTypeRequiredAsInputLevel(Long datasetFieldTypeId) {
+        return dataverseFieldTypeInputLevels.stream()
+                .anyMatch(inputLevel -> inputLevel.getDatasetFieldType().getId().equals(datasetFieldTypeId) && inputLevel.isRequired());
+    }
+
+    public boolean isDatasetFieldTypeIncludedAsInputLevel(Long datasetFieldTypeId) {
+        return dataverseFieldTypeInputLevels.stream()
+                .anyMatch(inputLevel -> inputLevel.getDatasetFieldType().getId().equals(datasetFieldTypeId) && inputLevel.isInclude());
+    }
+
+    public boolean isDatasetFieldTypeInInputLevels(Long datasetFieldTypeId) {
+        return dataverseFieldTypeInputLevels.stream()
+                .anyMatch(inputLevel -> inputLevel.getDatasetFieldType().getId().equals(datasetFieldTypeId));
+    }
+
+    public DataverseFieldTypeInputLevel getDatasetFieldTypeInInputLevels(Long datasetFieldTypeId) {
+        return dataverseFieldTypeInputLevels.stream()
+                .filter(inputLevel -> inputLevel.getDatasetFieldType().getId().equals(datasetFieldTypeId))
+                .findFirst()
+                .orElse(null);
+    }
+    
+    public boolean isDatasetFieldTypeDisplayOnCreateAsInputLevel(Long datasetFieldTypeId) {
+        return dataverseFieldTypeInputLevels.stream()
+                .anyMatch(inputLevel -> inputLevel.getDatasetFieldType().getId().equals(datasetFieldTypeId) 
+                         && Boolean.TRUE.equals(inputLevel.getDisplayOnCreate()));
+    }
 
     public Template getDefaultTemplate() {
         return defaultTemplate;
@@ -429,9 +500,6 @@ public void setTemplateRoot(boolean templateRoot) {
         this.templateRoot = templateRoot;
     }
 
-   
-
-
     public List<MetadataBlock> getMetadataBlocks() {
         return getMetadataBlocks(false);
     }
@@ -545,7 +613,11 @@ public void setDataverseTheme(DataverseTheme dataverseTheme) {
     }
 
     public void setMetadataBlocks(List<MetadataBlock> metadataBlocks) {
-        this.metadataBlocks = metadataBlocks;
+        this.metadataBlocks = new ArrayList<>(metadataBlocks);
+    }
+
+    public void clearMetadataBlocks() {
+        this.metadataBlocks.clear();
     }
 
     public List<DatasetFieldType> getCitationDatasetFieldTypes() {
@@ -555,9 +627,53 @@ public List<DatasetFieldType> getCitationDatasetFieldTypes() {
     public void setCitationDatasetFieldTypes(List<DatasetFieldType> citationDatasetFieldTypes) {
         this.citationDatasetFieldTypes = citationDatasetFieldTypes;
     }
+
+    @Column(nullable = true)
+    private Boolean requireFilesToPublishDataset;
+    /**
+     * Specifies whether the existance of files in a dataset is required when publishing
+     * @return {@code Boolean.TRUE} if explicitly enabled, {@code Boolean.FALSE} if explicitly disabled.
+     * {@code null} indicates that the behavior is not explicitly defined, in which
+     * case the behavior should follow the explicit configuration of the first
+     * direct ancestor collection.
+     * @Note: If present, this configuration therefore by default applies to all
+     * the sub-collections, unless explicitly overwritten there.
+     */
+    public Boolean getRequireFilesToPublishDataset() {
+        return requireFilesToPublishDataset;
+    }
+    public void setRequireFilesToPublishDataset(boolean requireFilesToPublishDataset) {
+        this.requireFilesToPublishDataset = requireFilesToPublishDataset;
+    }
+
+    /**
+     * @Note: this setting is Nullable, with {@code null} indicating that the 
+     * desired behavior is not explicitly configured for this specific collection. 
+     * See the comment below. 
+     */
+    @Column(nullable = true)
+    private Boolean filePIDsEnabled;
+
+    /**
+     * Specifies whether the PIDs for Datafiles should be registered when publishing 
+     * datasets in this Collection, if the behavior is explicitly configured.
+     * @return {@code Boolean.TRUE} if explicitly enabled, {@code Boolean.FALSE} if explicitly disabled. 
+     * {@code null} indicates that the behavior is not explicitly defined, in which 
+     * case the behavior should follow the explicit configuration of the first 
+     * direct ancestor collection, or the instance-wide configuration, if none 
+     * present. 
+     * @Note: If present, this configuration therefore by default applies to all 
+     * the sub-collections, unless explicitly overwritten there.
+     * @author landreev
+     */
+    public Boolean getFilePIDsEnabled() {
+        return filePIDsEnabled;
+    }
     
+    public void setFilePIDsEnabled(boolean filePIDsEnabled) {
+        this.filePIDsEnabled = filePIDsEnabled;
+    }
     
-
     public List<DataverseFacet> getDataverseFacets() {
         return getDataverseFacets(false);
     }
@@ -700,6 +816,17 @@ public List<Dataverse> getOwners() {
         return owners;
     }
 
+    public boolean getEffectiveRequiresFilesToPublishDataset() {
+        Dataverse dv = this;
+        while (dv != null) {
+            if (dv.getRequireFilesToPublishDataset() != null) {
+                return dv.getRequireFilesToPublishDataset();
+            }
+            dv = dv.getOwner();
+        }
+        return false;
+    }
+
     @Override
     public boolean equals(Object object) {
         // TODO: Warning - this method won't work in the case the id fields are not set
@@ -756,4 +883,21 @@ public boolean isAncestorOf( DvObject other ) {
         }
         return false;
     }
+    
+    public String getLocalURL() {
+        return  SystemConfig.getDataverseSiteUrlStatic() + "/dataverse/" + this.getAlias();
+    }
+
+    public void addInputLevelsMetadataBlocksIfNotPresent(List<DataverseFieldTypeInputLevel> inputLevels) {
+        for (DataverseFieldTypeInputLevel inputLevel : inputLevels) {
+            MetadataBlock inputLevelMetadataBlock = inputLevel.getDatasetFieldType().getMetadataBlock();
+            if (!hasMetadataBlock(inputLevelMetadataBlock)) {
+                metadataBlocks.add(inputLevelMetadataBlock);
+            }
+        }
+    }
+
+    private boolean hasMetadataBlock(MetadataBlock metadataBlock) {
+        return metadataBlocks.stream().anyMatch(block -> block.getId().equals(metadataBlock.getId()));
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseContact.java b/src/main/java/edu/harvard/iq/dataverse/DataverseContact.java
index d19f20d5ebd..9f86a03639a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseContact.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseContact.java
@@ -7,16 +7,17 @@
 
 import java.io.Serializable;
 import java.util.Objects;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import org.hibernate.validator.constraints.Email;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+import edu.harvard.iq.dataverse.validation.ValidateEmail;
 import org.hibernate.validator.constraints.NotBlank;
 
 /**
@@ -98,7 +99,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object object) {
-        if (!(object instanceof DatasetFieldType)) {
+        if (!(object instanceof DataverseContact)) {
             return false;
         }
         DataverseContact other = (DataverseContact) object;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
index 685ec8132b3..2b40894a595 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseConverter.java
@@ -6,11 +6,12 @@
 
 package edu.harvard.iq.dataverse;
 
-import javax.ejb.EJB;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
 
 /**
  *
@@ -18,10 +19,9 @@
  */
 @FacesConverter("dataverseConverter")
 public class DataverseConverter implements Converter {
-
     
-    @EJB
-    DataverseServiceBean dataverseService;
+    //@EJB
+    DataverseServiceBean dataverseService = CDI.current().select(DataverseServiceBean.class).get();
 
     @Override
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFacet.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFacet.java
index bfd465b8f54..83a2d8fdb8f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseFacet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseFacet.java
@@ -8,16 +8,16 @@
 
 import java.io.Serializable;
 import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  *
@@ -93,7 +93,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object object) {
-        if (!(object instanceof DatasetFieldType)) {
+        if (!(object instanceof DataverseFacet)) {
             return false;
         }
         DataverseFacet other = (DataverseFacet) object;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java
index 67bf6a820e2..56f522fa816 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java
@@ -2,11 +2,11 @@
 
 import edu.harvard.iq.dataverse.util.LruCache;
 import java.util.List;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 /**
  *
@@ -42,23 +42,24 @@ public void delete(DataverseFacet dataverseFacet) {
         cache.invalidate();
     }
     
-	public void deleteFacetsFor( Dataverse d ) {
-		em.createNamedQuery("DataverseFacet.removeByOwnerId")
-			.setParameter("ownerId", d.getId())
-				.executeUpdate();
+    public void deleteFacetsFor(Dataverse d) {
+        em.createNamedQuery("DataverseFacet.removeByOwnerId")
+                .setParameter("ownerId", d.getId())
+                .executeUpdate();
         cache.invalidate(d.getId());
-        
-	}
-	
+
+    }
+
     public DataverseFacet create(int displayOrder, DatasetFieldType fieldType, Dataverse ownerDv) {
         DataverseFacet dataverseFacet = new DataverseFacet();
-        
+
         dataverseFacet.setDisplayOrder(displayOrder);
         dataverseFacet.setDatasetFieldType(fieldType);
         dataverseFacet.setDataverse(ownerDv);
-        
         ownerDv.getDataverseFacets().add(dataverseFacet);
         em.persist(dataverseFacet);
+
+        cache.invalidate(ownerDv.getId());
         return dataverseFacet;
     }
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFeaturedDataverse.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFeaturedDataverse.java
index 662ee74c3bf..d30d94cd034 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseFeaturedDataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseFeaturedDataverse.java
@@ -2,16 +2,16 @@
 
 import java.io.Serializable;
 import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  *
@@ -85,7 +85,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object object) {
-        if (!(object instanceof DatasetFieldType)) {
+        if (!(object instanceof DataverseFeaturedDataverse)) {
             return false;
         }
         DataverseFeaturedDataverse other = (DataverseFeaturedDataverse) object;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevel.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevel.java
index 18414f642e0..973a98d246f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevel.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevel.java
@@ -6,17 +6,19 @@
 package edu.harvard.iq.dataverse;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 
 /**
  *
@@ -30,15 +32,17 @@
     @NamedQuery(name = "DataverseFieldTypeInputLevel.findByDataverseIdDatasetFieldTypeId",
             query = "select f from DataverseFieldTypeInputLevel f where f.dataverse.id = :dataverseId and f.datasetFieldType.id = :datasetFieldTypeId"),
     @NamedQuery(name = "DataverseFieldTypeInputLevel.findByDataverseIdAndDatasetFieldTypeIdList",
-            query = "select f from DataverseFieldTypeInputLevel f where f.dataverse.id = :dataverseId and f.datasetFieldType.id in :datasetFieldIdList")
- 
+            query = "select f from DataverseFieldTypeInputLevel f where f.dataverse.id = :dataverseId and f.datasetFieldType.id in :datasetFieldIdList"),
+    @NamedQuery(name = "DataverseFieldTypeInputLevel.findRequiredByDataverseId",
+            query = "select f from DataverseFieldTypeInputLevel f where f.dataverse.id = :dataverseId and f.required = 'true' ")
 })
 @Table(name="DataverseFieldTypeInputLevel"
         ,  uniqueConstraints={
             @UniqueConstraint(columnNames={"dataverse_id", "datasetfieldtype_id"})}
         , indexes = {@Index(columnList="dataverse_id")
-		, @Index(columnList="datasetfieldtype_id")
-		, @Index(columnList="required")}
+        , @Index(columnList="datasetfieldtype_id")
+        , @Index(columnList="required")
+        , @Index(columnList="displayOnCreate")}
 )
 @Entity
 public class DataverseFieldTypeInputLevel implements Serializable {
@@ -57,6 +61,20 @@ public class DataverseFieldTypeInputLevel implements Serializable {
     private DatasetFieldType datasetFieldType;
     private boolean include;
     private boolean required;
+    
+   
+    @Column(nullable = true)
+    private Boolean displayOnCreate;
+    
+    public DataverseFieldTypeInputLevel () {}
+  
+    public DataverseFieldTypeInputLevel (DatasetFieldType fieldType, Dataverse dataverse, boolean required, boolean include, Boolean displayOnCreate) {
+        this.datasetFieldType = fieldType;
+        this.dataverse = dataverse;
+        this.required = required;
+        this.include = include;
+        this.displayOnCreate = displayOnCreate;
+    }    
 
     public Long getId() {
         return id;
@@ -105,6 +123,14 @@ public void setRequired(boolean required) {
         this.required = required;
     }
 
+    public Boolean getDisplayOnCreate() {
+        return displayOnCreate;
+    }
+
+    public void setDisplayOnCreate(Boolean displayOnCreate) {
+        this.displayOnCreate = displayOnCreate;
+    }
+
     @Override
     public boolean equals(Object object) {
         // TODO: Warning - this method won't work in the case the id fields are not set
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevelServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevelServiceBean.java
index ce9b44f734b..3b4601d173b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevelServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevelServiceBean.java
@@ -7,13 +7,13 @@
 
 import edu.harvard.iq.dataverse.util.LruCache;
 import java.util.List;
-import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 
 /**
  *
@@ -77,11 +77,7 @@ public List<DataverseFieldTypeInputLevel> findByDataverseIdAndDatasetFieldTypeId
             return null;
         }    
     }
-            //     
-    
-    //    Query query = em.createQuery("select object(o) from MapLayerMetadata as o where o.dataset=:dataset");// order by o.name");
-    //    query.setParameter("dataset", dataset);
-    
+
     public DataverseFieldTypeInputLevel findByDataverseIdDatasetFieldTypeId(Long dataverseId, Long datasetFieldTypeId) {
         Query query = em.createNamedQuery("DataverseFieldTypeInputLevel.findByDataverseIdDatasetFieldTypeId", DataverseFieldTypeInputLevel.class);
         query.setParameter("dataverseId", dataverseId);
@@ -92,13 +88,23 @@ public DataverseFieldTypeInputLevel findByDataverseIdDatasetFieldTypeId(Long dat
             return null;
         }         
     }
+    
+    public List<DataverseFieldTypeInputLevel> findRequiredByDataverseId(Long dataverseId) {
+        Query query = em.createNamedQuery("DataverseFieldTypeInputLevel.findRequiredByDataverseId", DataverseFieldTypeInputLevel.class);
+        query.setParameter("dataverseId", dataverseId);
+        try{
+            return query.getResultList();
+        } catch ( NoResultException nre ) {
+            return null;
+        }         
+    }
 
     public void delete(DataverseFieldTypeInputLevel dataverseFieldTypeInputLevel) {
         em.remove(em.merge(dataverseFieldTypeInputLevel));
         cache.invalidate();
     }
 
-    public void deleteFacetsFor(Dataverse d) {
+    public void deleteDataverseFieldTypeInputLevelFor(Dataverse d) {
         em.createNamedQuery("DataverseFieldTypeInputLevel.removeByOwnerId")
                 .setParameter("ownerId", d.getId())
                 .executeUpdate();
@@ -111,4 +117,13 @@ public void create(DataverseFieldTypeInputLevel dataverseFieldTypeInputLevel) {
         em.persist(dataverseFieldTypeInputLevel);
     }
 
+    public DataverseFieldTypeInputLevel save(DataverseFieldTypeInputLevel inputLevel) {
+        if (inputLevel.getId() == null) {
+            em.persist(inputLevel);
+            return inputLevel;
+        } else {
+            return em.merge(inputLevel);
+        }
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
index 25c564e777d..389b85c19d9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
@@ -6,23 +6,25 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -37,15 +39,9 @@ public class DataverseHeaderFragment implements java.io.Serializable {
     @EJB
     DataverseServiceBean dataverseService;
 
-    @EJB
-    SettingsServiceBean settingsService;
-
     @EJB
     GroupServiceBean groupService;
 
-    @EJB
-    PermissionServiceBean permissionService;
-
     @EJB
     SystemConfig systemConfig;
     
@@ -54,6 +50,9 @@ public class DataverseHeaderFragment implements java.io.Serializable {
     
     @EJB
     DataFileServiceBean datafileService;
+    
+    @EJB
+    BannerMessageServiceBean bannerMessageService;
 
     @Inject
     DataverseSession dataverseSession;
@@ -68,6 +67,8 @@ public class DataverseHeaderFragment implements java.io.Serializable {
     UserNotificationServiceBean userNotificationService;
     
     List<Breadcrumb> breadcrumbs = new ArrayList<>();
+    
+    private List<BannerMessage> bannerMessages = null; 
 
     private Long unreadNotificationCount = null;
     
@@ -153,7 +154,7 @@ public Long getUnreadNotificationCount(Long userId){
             this.unreadNotificationCount = userNotificationService.getUnreadNotificationCountByUser(userId);
         }catch (Exception e){
             logger.warning("Error trying to retrieve unread notification count for user." + e.getMessage());
-            this.unreadNotificationCount = new Long("0");
+            this.unreadNotificationCount = 0L; 
         }
         return this.unreadNotificationCount;
     }
@@ -253,7 +254,7 @@ public String logout() {
     private Boolean signupAllowed = null;
     
     private String redirectToRoot(){
-        return "dataverse.xhtml?alias=" + dataverseService.findRootDataverse().getAlias();
+        return "dataverse.xhtml?alias=" + settingsWrapper.getRootDataverse().getAlias();
     }
     
     public boolean isSignupAllowed() {
@@ -276,6 +277,43 @@ public boolean isRootDataverseThemeDisabled(Dataverse dataverse) {
             return false;
         }
     }
+    
+    
+    public List<BannerMessage> getBannerMessages() {
+        if (bannerMessages == null) {
+            bannerMessages = new ArrayList<>();
+            
+            User user = dataverseSession.getUser();
+            AuthenticatedUser au = null;
+            if (user.isAuthenticated()) {
+                au = (AuthenticatedUser) user;
+            }           
+        
+            if  (au == null)    {
+                bannerMessages = bannerMessageService.findBannerMessages();
+            } else  {
+                bannerMessages = bannerMessageService.findBannerMessages(au.getId());
+            } 
+        
+            if (!dataverseSession.getDismissedMessages().isEmpty()) {           
+                for (BannerMessage dismissed : dataverseSession.getDismissedMessages()) {
+                    Iterator<BannerMessage> itr = bannerMessages.iterator();
+                    while (itr.hasNext()) {
+                        BannerMessage test = itr.next();
+                        if (test.equals(dismissed)) {
+                            itr.remove();
+                        }
+                    }
+                }            
+            }
+        }
+        
+        return bannerMessages;
+    }
+
+    public void setBannerMessages(List<BannerMessage> bannerMessages) {
+        this.bannerMessages = bannerMessages;
+    }
 
     public String getSignupUrl(String loginRedirect) {
         String nonNullDefaultIfKeyNotFound = "";
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingDataverse.java b/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingDataverse.java
index 3d44173cf4c..3030922ea5e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingDataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingDataverse.java
@@ -7,16 +7,18 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 /**
  *
@@ -27,6 +29,16 @@
         @Index(columnList = "dataverse_id"),
     @Index(columnList = "linkingDataverse_id")
 })
+@NamedQueries({
+    @NamedQuery(name = "DataverseLinkingDataverse.findByDataverseId",
+               query = "select object(o) from DataverseLinkingDataverse as o where o.dataverse.id =:dataverseId order by o.id"),
+    @NamedQuery(name = "DataverseLinkingDataverse.findByLinkingDataverseId",
+               query = "select object(o) from DataverseLinkingDataverse as o where o.linkingDataverse.id =:linkingDataverseId order by o.id"),      
+    @NamedQuery(name = "DataverseLinkingDataverse.findByDataverseIdAndLinkingDataverseId",
+               query = "SELECT OBJECT(o) FROM DataverseLinkingDataverse AS o WHERE o.linkingDataverse.id = :linkingDataverseId AND o.dataverse.id = :dataverseId"),
+    @NamedQuery(name = "DataverseLinkingDataverse.findIdsByLinkingDataverseId",
+               query = "SELECT o.dataverse.id FROM DataverseLinkingDataverse AS o WHERE o.linkingDataverse.id = :linkingDataverseId")
+})
 public class DataverseLinkingDataverse implements Serializable {
     private static final long serialVersionUID = 1L;
     @Id
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingServiceBean.java
index e106272e4ec..834ff96e392 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingServiceBean.java
@@ -8,13 +8,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
@@ -34,22 +34,20 @@ public class DataverseLinkingServiceBean implements java.io.Serializable {
     
     public List<Dataverse> findLinkedDataverses(Long linkingDataverseId) {
         List<Dataverse> retList = new ArrayList<>();
-        Query query = em.createQuery("select object(o) from DataverseLinkingDataverse as o where o.linkingDataverse.id =:linkingDataverseId order by o.id");
-        query.setParameter("linkingDataverseId", linkingDataverseId);
-        for (Object o : query.getResultList()) {
-            DataverseLinkingDataverse convterted = (DataverseLinkingDataverse) o;
-            retList.add(convterted.getDataverse());
+        TypedQuery<DataverseLinkingDataverse> typedQuery = em.createNamedQuery("DataverseLinkingDataverse.findByLinkingDataverseId", DataverseLinkingDataverse.class)
+            .setParameter("linkingDataverseId", linkingDataverseId);
+        for (DataverseLinkingDataverse dataverseLinkingDataverse : typedQuery.getResultList()) {
+            retList.add(dataverseLinkingDataverse.getDataverse());
         }
         return retList;
     }
 
     public List<Dataverse> findLinkingDataverses(Long dataverseId) {
         List<Dataverse> retList = new ArrayList<>();
-        Query query = em.createQuery("select object(o) from DataverseLinkingDataverse as o where o.dataverse.id =:dataverseId order by o.id");
-        query.setParameter("dataverseId", dataverseId);
-        for (Object o : query.getResultList()) {
-            DataverseLinkingDataverse convterted = (DataverseLinkingDataverse) o;
-            retList.add(convterted.getLinkingDataverse());
+        TypedQuery<DataverseLinkingDataverse> typedQuery = em.createNamedQuery("DataverseLinkingDataverse.findByDataverseId", DataverseLinkingDataverse.class)
+            .setParameter("dataverseId", dataverseId);
+        for (DataverseLinkingDataverse dataverseLinkingDataverse : typedQuery.getResultList()) {
+            retList.add(dataverseLinkingDataverse.getLinkingDataverse());
         }
         return retList;
     }
@@ -63,22 +61,18 @@ public void save(DataverseLinkingDataverse dataverseLinkingDataverse) {
     }
     
     public DataverseLinkingDataverse findDataverseLinkingDataverse(Long dataverseId, Long linkingDataverseId) {
-        DataverseLinkingDataverse foundDataverseLinkingDataverse = null;
         try {
-            foundDataverseLinkingDataverse = em.createQuery("SELECT OBJECT(o) FROM DataverseLinkingDataverse AS o WHERE o.linkingDataverse.id = :linkingDataverseId AND o.dataverse.id = :dataverseId", DataverseLinkingDataverse.class)
-                    .setParameter("dataverseId", dataverseId)
-                    .setParameter("linkingDataverseId", linkingDataverseId)
-                    .getSingleResult();
-        } catch (javax.persistence.NoResultException e) {
+            return em.createNamedQuery("DataverseLinkingDataverse.findByDataverseIdAndLinkingDataverseId", DataverseLinkingDataverse.class)
+                .setParameter("dataverseId", dataverseId)
+                .setParameter("linkingDataverseId", linkingDataverseId)
+                .getSingleResult();
+        } catch (jakarta.persistence.NoResultException e) {
             logger.fine("No DataverseLinkingDataverse found for dataverseId " + dataverseId + " and linkedDataverseId " + linkingDataverseId);        
+            return null;
         }
-        return foundDataverseLinkingDataverse;
     }
 
     public boolean alreadyLinked(Dataverse definitionPoint, Dataverse dataverseToLinkTo) {
-        TypedQuery<DataverseLinkingDataverse> typedQuery = em.createQuery("SELECT OBJECT(o) FROM DataverseLinkingDataverse AS o WHERE o.linkingDataverse.id = :dataverseId AND o.dataverse.id = :dataverseToLinkTo", DataverseLinkingDataverse.class);
-        typedQuery.setParameter("dataverseId", definitionPoint.getId());
-        typedQuery.setParameter("dataverseToLinkTo", dataverseToLinkTo.getId());
-        return !typedQuery.getResultList().isEmpty();
+        return findDataverseLinkingDataverse(dataverseToLinkTo.getId(), definitionPoint.getId()) != null;
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseMetadataBlockFacet.java b/src/main/java/edu/harvard/iq/dataverse/DataverseMetadataBlockFacet.java
new file mode 100644
index 00000000000..c93144b2e97
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseMetadataBlockFacet.java
@@ -0,0 +1,82 @@
+package edu.harvard.iq.dataverse;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ *
+ * @author adaybujeda
+ */
+@Entity
+@Table(indexes = {@Index(columnList="dataverse_id")
+        , @Index(columnList="metadatablock_id")})
+public class DataverseMetadataBlockFacet implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "dataverse_id")
+    private Dataverse dataverse;
+
+    @ManyToOne
+    @JoinColumn(name = "metadatablock_id")
+    private MetadataBlock metadataBlock;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Dataverse getDataverse() {
+        return dataverse;
+    }
+
+    public void setDataverse(Dataverse dataverse) {
+        this.dataverse = dataverse;
+    }
+
+    public MetadataBlock getMetadataBlock() {
+        return metadataBlock;
+    }
+
+    public void setMetadataBlock(MetadataBlock metadataBlock) {
+        this.metadataBlock = metadataBlock;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (this.id != null ? this.id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        if (!(object instanceof DataverseMetadataBlockFacet)) {
+            return false;
+        }
+        DataverseMetadataBlockFacet other = (DataverseMetadataBlockFacet) object;
+        return !(!Objects.equals(this.id, other.id) && (this.id == null || !this.id.equals(other.id)));
+    }
+
+    @Override
+    public String toString() {
+        return String.format("edu.harvard.iq.dataverse.DataverseMetadataBlockFacet[ id=%s ]", id);
+    }
+    
+}
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
index 7f8a12c8753..70a1d7b14bb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -4,22 +4,25 @@
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
 import edu.harvard.iq.dataverse.dataverse.DataverseUtil;
 import edu.harvard.iq.dataverse.engine.command.Command;
-import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.impl.CheckRateLimitForCollectionPageCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateSavedSearchCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.DeleteDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.LinkDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.PublishDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseCommand;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.search.FacetCategory;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
-import edu.harvard.iq.dataverse.search.SearchException;
 import edu.harvard.iq.dataverse.search.SearchFields;
 import edu.harvard.iq.dataverse.search.SearchIncludeFragment;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearch;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearchFilterQuery;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearchServiceBean;
@@ -28,27 +31,33 @@
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.List;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+
+import edu.harvard.iq.dataverse.util.cache.CacheFactoryBean;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
 import org.primefaces.model.DualListModel;
-import javax.ejb.EJBException;
-import javax.faces.event.ValueChangeEvent;
-import javax.faces.model.SelectItem;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJBException;
+import jakarta.faces.event.ValueChangeEvent;
+import jakarta.faces.model.SelectItem;
+import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.primefaces.PrimeFaces;
 import org.primefaces.event.TransferEvent;
 
@@ -79,8 +88,6 @@ public enum LinkMode {
     @EJB
     EjbDataverseEngine commandEngine;
     @EJB
-    SearchServiceBean searchService;
-    @EJB
     DatasetFieldServiceBean datasetFieldService;
     @EJB
     DataverseFacetServiceBean dataverseFacetService;
@@ -108,12 +115,25 @@ public enum LinkMode {
     @EJB
     DataverseLinkingServiceBean linkingService;
     @Inject PermissionsWrapper permissionsWrapper;
+    @Inject 
+    NavigationWrapper navigationWrapper;
+    @Inject DataverseHeaderFragment dataverseHeaderFragment;
+    @EJB
+    PidProviderFactoryBean pidProviderFactoryBean;
+    @EJB
+    CacheFactoryBean cacheFactory;
+
+    private Dataverse dataverse = new Dataverse();  
 
-    private Dataverse dataverse = new Dataverse();
+    /**
+     * View parameters
+     */
+    private Long id = null;
+    private String alias = null;
+    private Long ownerId = null;    
     private EditMode editMode;
     private LinkMode linkMode;
 
-    private Long ownerId;
     private DualListModel<DatasetFieldType> facets = new DualListModel<>(new ArrayList<>(), new ArrayList<>());
     private DualListModel<Dataverse> featuredDataverses = new DualListModel<>(new ArrayList<>(), new ArrayList<>());
     private List<Dataverse> dataversesForLinking;
@@ -186,6 +206,21 @@ public void setLinkMode(LinkMode linkMode) {
         this.linkMode = linkMode;
     }
     
+    public boolean showLinkingPopup() {
+        String testquery = "";
+        if (session.getUser() == null) {
+            return false;
+        }
+        if (dataverse == null) {
+            return false;
+        }
+        if (query != null) {
+            testquery = query;
+        }
+
+        return (session.getUser().isSuperuser() && (dataverse.getOwner() != null || !testquery.isEmpty()));
+    }
+    
     public void setupLinkingPopup (String popupSetting){
         if (popupSetting.equals("link")){
             setLinkMode(LinkMode.LINKDATAVERSE);           
@@ -250,6 +285,12 @@ public Dataverse getDataverse() {
     public void setDataverse(Dataverse dataverse) {
         this.dataverse = dataverse;
     }
+    
+    public Long getId() { return this.id; }
+    public void setId(Long id) { this.id = id; }
+
+    public String getAlias() { return this.alias; }
+    public void setAlias(String alias) { this.alias = alias; }    
 
     public EditMode getEditMode() {
         return editMode;
@@ -267,17 +308,32 @@ public void setOwnerId(Long ownerId) {
         this.ownerId = ownerId;
     }
 
+    public void updateOwnerDataverse() {
+        if (dataverse.getOwner() != null && dataverse.getOwner().getId() != null) {
+            ownerId = dataverse.getOwner().getId();
+            logger.info("New host dataverse id: " + ownerId);
+            // discard the dataverse already created:
+            dataverse = new Dataverse();
+            // initialize a new new dataverse:
+            init();
+            dataverseHeaderFragment.initBreadcrumbs(dataverse);
+        }
+    }
+    
     public String init() {
         //System.out.println("_YE_OLDE_QUERY_COUNTER_");  // for debug purposes
-
-        if (dataverse.getAlias() != null || dataverse.getId() != null || ownerId == null) {// view mode for a dataverse
-            if (dataverse.getAlias() != null) {
-                dataverse = dataverseService.findByAlias(dataverse.getAlias());
-            } else if (dataverse.getId() != null) {
-                dataverse = dataverseService.find(dataverse.getId());
+        // Check for rate limit exceeded. Must be done before anything else to prevent unnecessary processing.
+        if (!cacheFactory.checkRate(session.getUser(), new CheckRateLimitForCollectionPageCommand(null,null))) {
+            return navigationWrapper.tooManyRequests();
+        }
+        if (this.getAlias() != null || this.getId() != null || this.getOwnerId() == null) {// view mode for a dataverse
+            if (this.getAlias() != null) {
+                dataverse = dataverseService.findByAlias(this.getAlias());
+            } else if (this.getId() != null) {
+                dataverse = dataverseService.find(this.getId());
             } else {
                 try {
-                    dataverse = dataverseService.findRootDataverse();
+                    dataverse = settingsWrapper.getRootDataverse();
                 } catch (EJBException e) {
                     // @todo handle case with no root dataverse (a fresh installation) with message about using API to create the root 
                     dataverse = null;
@@ -289,16 +345,18 @@ public String init() {
                 return permissionsWrapper.notFound();
             }
             if (!dataverse.isReleased() && !permissionService.on(dataverse).has(Permission.ViewUnpublishedDataverse)) {
+                // the permission lookup above should probably be moved into the permissionsWrapper -- L.A. 5.7
                 return permissionsWrapper.notAuthorized();
             }
 
             ownerId = dataverse.getOwner() != null ? dataverse.getOwner().getId() : null;
         } else { // ownerId != null; create mode for a new child dataverse
             editMode = EditMode.CREATE;
-            dataverse.setOwner(dataverseService.find(ownerId));
+            dataverse.setOwner(dataverseService.find( this.getOwnerId()));
             if (dataverse.getOwner() == null) {
                 return  permissionsWrapper.notFound();
             } else if (!permissionService.on(dataverse.getOwner()).has(Permission.AddDataverse)) {
+                // the permission lookup above should probably be moved into the permissionsWrapper -- L.A. 5.7
                 return permissionsWrapper.notAuthorized();            
             }
 
@@ -319,7 +377,7 @@ public void initFeaturedDataverses() {
         List<Dataverse> featuredSource = new ArrayList<>();
         List<Dataverse> featuredTarget = new ArrayList<>();
         featuredSource.addAll(dataverseService.findAllPublishedByOwnerId(dataverse.getId()));
-        featuredSource.addAll(linkingService.findLinkingDataverses(dataverse.getId()));
+        featuredSource.addAll(linkingService.findLinkedDataverses(dataverse.getId()));
         List<DataverseFeaturedDataverse> featuredList = featuredDataverseService.findByDataverseId(dataverse.getId());
         for (DataverseFeaturedDataverse dfd : featuredList) {
             Dataverse fd = dfd.getFeaturedDataverse();
@@ -466,18 +524,6 @@ public void hideDatasetFieldTypes(Long mdbId) {
         }
         setEditInputLevel(false);
     }
-    
-    public void toggleInputLevel( Long mdbId, long dsftId){
-        for (MetadataBlock mdb : allMetadataBlocks) {
-            if (mdb.getId().equals(mdbId)) {
-                for (DatasetFieldType dsftTest : mdb.getDatasetFieldTypes()) {
-                    if (dsftTest.getId().equals(dsftId)) {
-                            dsftTest.setRequiredDV(!dsftTest.isRequiredDV());                           
-                    }
-                }
-            }
-        }        
-    }
 
     public void updateInclude(Long mdbId, long dsftId) {
         List<DatasetFieldType> childDSFT = new ArrayList<>();
@@ -516,14 +562,19 @@ public void updateInclude(Long mdbId, long dsftId) {
     public List<SelectItem> resetSelectItems(DatasetFieldType typeIn) {
         List<SelectItem> retList = new ArrayList<>();
         if ((typeIn.isHasParent() && typeIn.getParentDatasetFieldType().isInclude()) || (!typeIn.isHasParent() && typeIn.isInclude())) {
-            SelectItem requiredItem = new SelectItem();
-            requiredItem.setLabel(BundleUtil.getStringFromBundle("dataverse.item.required"));
-            requiredItem.setValue(true);
-            retList.add(requiredItem);
-            SelectItem optional = new SelectItem();
-            optional.setLabel(BundleUtil.getStringFromBundle("dataverse.item.optional"));
-            optional.setValue(false);
-            retList.add(optional);
+                SelectItem requiredItem = new SelectItem();
+                requiredItem.setLabel(BundleUtil.getStringFromBundle("dataverse.item.required"));
+                requiredItem.setValue(true);
+                retList.add(requiredItem);
+                SelectItem optional = new SelectItem();
+                // When parent field is not required and child is; default level is "Conditionally Required"
+                if (typeIn.isRequired() && typeIn.isHasParent() && !typeIn.getParentDatasetFieldType().isRequired()) {
+                    optional.setLabel(BundleUtil.getStringFromBundle("dataverse.item.required.conditional"));
+                } else {
+                    optional.setLabel(BundleUtil.getStringFromBundle("dataverse.item.optional"));                    
+                }
+                optional.setValue(false);
+                retList.add(optional);
         } else {
             SelectItem hidden = new SelectItem();
             hidden.setLabel(BundleUtil.getStringFromBundle("dataverse.item.hidden"));
@@ -573,24 +624,16 @@ public String save() {
                 if (dataverse.isMetadataBlockRoot() && (mdb.isSelected() || mdb.isRequired())) {
                     selectedBlocks.add(mdb);
                     for (DatasetFieldType dsft : mdb.getDatasetFieldTypes()) {
-                        if (dsft.isRequiredDV() && !dsft.isRequired()
-                                && ((!dsft.isHasParent() && dsft.isInclude())
-                                || (dsft.isHasParent() && dsft.getParentDatasetFieldType().isInclude()))) {
-                            DataverseFieldTypeInputLevel dftil = new DataverseFieldTypeInputLevel();
-                            dftil.setDatasetFieldType(dsft);
-                            dftil.setDataverse(dataverse);
-                            dftil.setRequired(true);
-                            dftil.setInclude(true);
-                            listDFTIL.add(dftil);
-                        }
-                        if ((!dsft.isHasParent() && !dsft.isInclude())
-                                || (dsft.isHasParent() && !dsft.getParentDatasetFieldType().isInclude())) {
-                            DataverseFieldTypeInputLevel dftil = new DataverseFieldTypeInputLevel();
-                            dftil.setDatasetFieldType(dsft);
-                            dftil.setDataverse(dataverse);
-                            dftil.setRequired(false);
-                            dftil.setInclude(false);
-                            listDFTIL.add(dftil);
+                        if (!dsft.isChild()) {
+                            // Save input level for parent field
+                            saveInputLevels(listDFTIL, dsft, dataverse);
+                            
+                            // Handle child fields
+                            if (dsft.isHasChildren()) {
+                                for (DatasetFieldType child : dsft.getChildDatasetFieldTypes()) {
+                                    saveInputLevels(listDFTIL, child, dataverse);
+                                }
+                            }
                         }
                     }
                 }
@@ -611,7 +654,9 @@ public String save() {
         Boolean create;
         if (dataverse.getId() == null) {
             if (session.getUser().isAuthenticated()) {
-                dataverse.setOwner(ownerId != null ? dataverseService.find(ownerId) : null);
+                if (dataverse.getOwner() == null || dataverse.getOwner().getId() == null) {
+                    dataverse.setOwner(ownerId != null ? dataverseService.find(ownerId) : null);
+                }
                 create = Boolean.TRUE;
                 cmd = new CreateDataverseCommand(dataverse, dvRequestService.getDataverseRequest(), facets.getTarget(), listDFTIL);
             } else {
@@ -639,7 +684,7 @@ public String save() {
             if (editMode != null && editMode.equals(EditMode.FEATURED)) {
                 message = BundleUtil.getStringFromBundle("dataverse.feature.update");
             } else {
-                message = (create) ? BundleUtil.getStringFromBundle("dataverse.create.success", Arrays.asList(settingsWrapper.getGuidesBaseUrl(), systemConfig.getGuidesVersion())) : BundleUtil.getStringFromBundle("dataverse.update.success");
+                message = (create) ? BundleUtil.getStringFromBundle("dataverse.create.success", Arrays.asList(settingsWrapper.getGuidesBaseUrl(), settingsWrapper.getGuidesVersion())) : BundleUtil.getStringFromBundle("dataverse.update.success");
             }
             JsfHelper.addSuccessMessage(message);
             
@@ -647,19 +692,24 @@ public String save() {
             return returnRedirect();            
             
 
-        } catch (CommandException ex) {
+        } /*catch (CommandException ex) {
             logger.log(Level.SEVERE, "Unexpected Exception calling dataverse command", ex);
             String errMsg = create ? BundleUtil.getStringFromBundle("dataverse.create.failure") : BundleUtil.getStringFromBundle("dataverse.update.failure");
             JH.addMessage(FacesMessage.SEVERITY_FATAL, errMsg);
             return null;
-        } catch (Exception e) {
+        }*/ catch (Exception e) {
             logger.log(Level.SEVERE, "Unexpected Exception calling dataverse command", e);
             String errMsg = create ? BundleUtil.getStringFromBundle("dataverse.create.failure") : BundleUtil.getStringFromBundle("dataverse.update.failure");
-            JH.addMessage(FacesMessage.SEVERITY_FATAL, errMsg);
+            
+            String failureMessage = e.getMessage() == null 
+                        ? errMsg
+                        : e.getMessage();
+            JsfHelper.addErrorMessage(failureMessage);
+            
             return null;
         }
     }
-
+    
     public String cancel() {
         // reset values
         dataverse = dataverseService.find(dataverse.getId());
@@ -668,7 +718,7 @@ public String cancel() {
         return "/dataverse.xhtml?alias=" + dataverse.getAlias() + "&faces-redirect=true";
     }
 
-    public boolean isRootDataverse() {
+    public boolean isRootDataverse() {        
         return dataverse.getOwner() == null;
     }
 
@@ -701,13 +751,8 @@ public void editMetadataBlocks(boolean checkVal) {
     public String resetToInherit() {
 
         setInheritMetadataBlockFromParent(true);
-        if (editMode.equals(DataversePage.EditMode.CREATE)) {;
-            refreshAllMetadataBlocks();
-            return null;
-        } else {
-            String retVal = save();
-            return retVal;
-        }
+        refreshAllMetadataBlocks();
+        return null;
     }
 
     public void cancelMetadataBlocks() {
@@ -745,18 +790,9 @@ public String saveLinkedDataverse() {
             return "";
         }
 
-        AuthenticatedUser savedSearchCreator = getAuthenticatedUser();
-        if (savedSearchCreator == null) {
-            String msg = BundleUtil.getStringFromBundle("dataverse.link.user");
-            logger.severe(msg);
-            JsfHelper.addErrorMessage(msg);
-            return returnRedirect();
-        }
-
         linkingDataverse = dataverseService.find(linkingDataverseId);
 
         LinkDataverseCommand cmd = new LinkDataverseCommand(dvRequestService.getDataverseRequest(), linkingDataverse, dataverse);
-        //LinkDvObjectCommand cmd = new LinkDvObjectCommand (session.getUser(), linkingDataverse, dataverse);
         try {
             commandEngine.submit(cmd);
         } catch (CommandException ex) {
@@ -766,38 +802,15 @@ public String saveLinkedDataverse() {
             JsfHelper.addErrorMessage(msg);
             return returnRedirect();
         }
-
-        SavedSearch savedSearchOfChildren = createSavedSearchForChildren(savedSearchCreator);
-
-        boolean createLinksAndIndexRightNow = false;
-        if (createLinksAndIndexRightNow) {
-            try {
-                // create links (does indexing) right now (might be expensive)
-                boolean debug = false;
-                DataverseRequest dataverseRequest = new DataverseRequest(savedSearchCreator, SavedSearchServiceBean.getHttpServletRequest());
-                savedSearchService.makeLinksForSingleSavedSearch(dataverseRequest, savedSearchOfChildren, debug);              
-                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataverse.linked.success", getSuccessMessageArguments()));                   
-                return returnRedirect();
-            } catch (SearchException | CommandException ex) {
-                // error: solr is down, etc. can't link children right now
-                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataverse.linked.internalerror", getSuccessMessageArguments()));
-                String msg = dataverse.getDisplayName() + " has been successfully linked to " + linkingDataverse.getDisplayName() + " but contents will not appear until an internal error has been fixed.";
-                logger.log(Level.SEVERE, "{0} {1}", new Object[]{msg, ex});
-                //JsfHelper.addErrorMessage(msg);
-                return returnRedirect();
-            }
-        } else {
-            // defer: please wait for the next timer/cron job
-            //JsfHelper.addSuccessMessage(dataverse.getDisplayName() + " has been successfully linked to " + linkingDataverse.getDisplayName() + ". Please wait for its contents to appear.");
-            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataverse.linked.success.wait", getSuccessMessageArguments()));
-            return returnRedirect();
-        }
+        
+        JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataverse.linked.success.wait", getSuccessMessageArguments()));
+        return returnRedirect();        
     }
     
     private List<String> getSuccessMessageArguments() {
         List<String> arguments = new ArrayList<>();
-        arguments.add(StringEscapeUtils.escapeHtml(dataverse.getDisplayName()));
-        String linkString = "<a href=\"/dataverse/" + linkingDataverse.getAlias() + "\">" + StringEscapeUtils.escapeHtml(linkingDataverse.getDisplayName()) + "</a>";
+        arguments.add(StringEscapeUtils.escapeHtml4(dataverse.getDisplayName()));
+        String linkString = "<a href=\"/dataverse/" + linkingDataverse.getAlias() + "\">" + StringEscapeUtils.escapeHtml4(linkingDataverse.getDisplayName()) + "</a>";
         arguments.add(linkString);
         return arguments;
     }
@@ -841,9 +854,9 @@ public String saveSavedSearch() {
             return returnRedirect();
         }
 
-        SavedSearch savedSearch = new SavedSearch(searchIncludeFragment.getQuery(), linkingDataverse, savedSearchCreator);
+        SavedSearch savedSearch = new SavedSearch(query, linkingDataverse, savedSearchCreator);
         savedSearch.setSavedSearchFilterQueries(new ArrayList<>());
-        for (String filterQuery : searchIncludeFragment.getFilterQueriesDebug()) {
+        for (String filterQuery : filterQueries) {
             /**
              * @todo Why are there null's here anyway? Turn on debug and figure
              * this out.
@@ -858,7 +871,7 @@ public String saveSavedSearch() {
             commandEngine.submit(cmd);
 
             List<String> arguments = new ArrayList<>();           
-            String linkString = "<a href=\"/dataverse/" + linkingDataverse.getAlias() + "\">" + StringEscapeUtils.escapeHtml(linkingDataverse.getDisplayName()) + "</a>";
+            String linkString = "<a href=\"/dataverse/" + linkingDataverse.getAlias() + "\">" + StringEscapeUtils.escapeHtml4(linkingDataverse.getDisplayName()) + "</a>";
             arguments.add(linkString);
             String successMessageString = BundleUtil.getStringFromBundle("dataverse.saved.search.success", arguments);
             JsfHelper.addSuccessMessage(successMessageString);
@@ -889,11 +902,14 @@ public String releaseDataverse() {
 
             } catch (Exception ex) {
                 logger.log(Level.SEVERE, "Unexpected Exception calling  publish dataverse command", ex);
-                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataverse.publish.failure"));
+                String failureMessage = ex.getMessage() == null 
+                        ? BundleUtil.getStringFromBundle("dataverse.publish.failure")
+                        : ex.getMessage();
+                JsfHelper.addErrorMessage(failureMessage);
 
             }
         } else {
-            JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataverse.publish.not.authorized"));            
+            JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataverse.release.authenticatedUsersOnly"));
         }
         return returnRedirect();
 
@@ -984,25 +1000,11 @@ private void refreshAllMetadataBlocks() {
 
             for (DatasetFieldType dsft : mdb.getDatasetFieldTypes()) {
                 if (!dsft.isChild()) {
-                    DataverseFieldTypeInputLevel dsfIl = dataverseFieldTypeInputLevelService.findByDataverseIdDatasetFieldTypeId(dataverseIdForInputLevel, dsft.getId());
-                    if (dsfIl != null) {
-                        dsft.setRequiredDV(dsfIl.isRequired());
-                        dsft.setInclude(dsfIl.isInclude());
-                    } else {
-                        dsft.setRequiredDV(dsft.isRequired());
-                        dsft.setInclude(true);
-                    }
+                    loadInputLevels(dsft, dataverseIdForInputLevel);
                     dsft.setOptionSelectItems(resetSelectItems(dsft));
                     if (dsft.isHasChildren()) {
                         for (DatasetFieldType child : dsft.getChildDatasetFieldTypes()) {
-                            DataverseFieldTypeInputLevel dsfIlChild = dataverseFieldTypeInputLevelService.findByDataverseIdDatasetFieldTypeId(dataverseIdForInputLevel, child.getId());
-                            if (dsfIlChild != null) {
-                                child.setRequiredDV(dsfIlChild.isRequired());
-                                child.setInclude(dsfIlChild.isInclude());
-                            } else {
-                                child.setRequiredDV(child.isRequired());
-                                child.setInclude(true);
-                            }
+                            loadInputLevels(child, dataverseIdForInputLevel);
                             child.setOptionSelectItems(resetSelectItems(child));
                         }
                     }
@@ -1013,6 +1015,21 @@ private void refreshAllMetadataBlocks() {
         setAllMetadataBlocks(retList);
     }
 
+    private void loadInputLevels(DatasetFieldType dsft, Long dataverseIdForInputLevel) {
+        DataverseFieldTypeInputLevel dsfIl = dataverseFieldTypeInputLevelService
+            .findByDataverseIdDatasetFieldTypeId(dataverseIdForInputLevel, dsft.getId());
+        
+        if (dsfIl != null) {
+            dsft.setRequiredDV(dsfIl.isRequired());
+            dsft.setInclude(dsfIl.isInclude());
+            dsft.setLocalDisplayOnCreate(dsfIl.getDisplayOnCreate());
+        } else {
+            // If there is no input level, use the default values
+            dsft.setRequiredDV(dsft.isRequired());
+            dsft.setInclude(true);
+        }
+    }
+
     public void validateAlias(FacesContext context, UIComponent toValidate, Object value) {
         if (!StringUtils.isEmpty((String) value)) {
             String alias = (String) value;
@@ -1159,4 +1176,187 @@ public String getSearchFieldSubtree() {
     public void setSearchFieldSubtree(String searchFieldSubtree) {
         this.searchFieldSubtree = searchFieldSubtree;
     }
+    
+    public List<Dataverse> completeHostDataverseMenuList(String query) {
+        if (session.getUser().isAuthenticated()) {
+            return dataverseService.filterDataversesForHosting(query, dvRequestService.getDataverseRequest());
+        } else {
+            return null;
+        }
+    }
+    
+    public Set<Entry<String, String>> getStorageDriverOptions() {
+    	HashMap<String, String> drivers =new HashMap<String, String>();
+    	drivers.putAll(DataAccess.getStorageDriverLabels());
+    	//Add an entry for the default (inherited from an ancestor or the system default)
+    	drivers.put(getDefaultStorageDriverLabel(), DataAccess.UNDEFINED_STORAGE_DRIVER_IDENTIFIER);
+    	return drivers.entrySet();
+    }
+    
+    public String getDefaultStorageDriverLabel() {
+    	String storageDriverId = DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER;
+    	Dataverse parent = dataverse.getOwner();
+    	boolean fromAncestor=false;
+    	if(parent != null) {
+    		storageDriverId = parent.getEffectiveStorageDriverId();
+    		//recurse dataverse chain to root and if any have a storagedriver set, fromAncestor is true
+    	    while(parent!=null) {
+    	    	if(!parent.getStorageDriverId().equals(DataAccess.UNDEFINED_STORAGE_DRIVER_IDENTIFIER)) {
+    	    		fromAncestor=true;
+    	    		break;
+    	    	}
+    	    	parent=parent.getOwner();
+    	    }
+    	}
+   		String label = DataAccess.getStorageDriverLabelFor(storageDriverId);
+   		if(fromAncestor) {
+   			label = label + " " + BundleUtil.getStringFromBundle("dataverse.inherited");
+   		} else {
+   			label = label + " " + BundleUtil.getStringFromBundle("dataverse.default");
+   		}
+   		return label;
+    }
+    
+    public Set<Entry<String, String>> getMetadataLanguages() {
+        return settingsWrapper.getMetadataLanguages(this.dataverse).entrySet();
+    }
+    
+    private Set<Entry<String, String>> curationLabelSetOptions = null; 
+    
+    public Set<Entry<String, String>> getCurationLabelSetOptions() {
+        if (curationLabelSetOptions == null) {
+            HashMap<String, String> setNames = new HashMap<String, String>();
+            Set<String> allowedSetNames = systemConfig.getCurationLabels().keySet();
+            if (allowedSetNames.size() > 0) {
+                // Add an entry for the default (inherited from an ancestor or the system
+                // default)
+                String inheritedLabelSet = getCurationLabelSetNameLabel();
+                if (!StringUtils.isBlank(inheritedLabelSet)) {
+                    setNames.put(inheritedLabelSet, SystemConfig.DEFAULTCURATIONLABELSET);
+                }
+                // Add an entry for disabled
+                setNames.put(BundleUtil.getStringFromBundle("dataverse.curationLabels.disabled"), SystemConfig.CURATIONLABELSDISABLED);
+
+                allowedSetNames.forEach(name -> {
+                    String localizedName = DatasetUtil.getLocaleCurationStatusLabelFromString(name) ;
+                    setNames.put(localizedName,name);
+                });
+            }
+            curationLabelSetOptions = setNames.entrySet();
+        }
+        return curationLabelSetOptions;
+    }
+
+    public String getCurationLabelSetNameLabel() {
+        Dataverse parent = dataverse.getOwner();
+        String setName = null;
+        boolean fromAncestor = false;
+        if (parent != null) {
+            setName = parent.getEffectiveCurationLabelSetName();
+            // recurse dataverse chain to root and if any have a curation label set name set,
+            // fromAncestor is true
+            while (parent != null) {
+                if (!parent.getCurationLabelSetName().equals(SystemConfig.DEFAULTCURATIONLABELSET)) {
+                    fromAncestor = true;
+                    break;
+                }
+                parent = parent.getOwner();
+            }
+        }
+        if (setName != null) {
+            if (fromAncestor) {
+                setName = setName + " " + BundleUtil.getStringFromBundle("dataverse.inherited");
+            } else {
+                setName = setName + " " + BundleUtil.getStringFromBundle("dataverse.default");
+            }
+        }
+        return setName;
+    }
+
+    public Set<Entry<String, String>> getGuestbookEntryOptions() {
+        return settingsWrapper.getGuestbookEntryOptions(this.dataverse).entrySet();
+    }
+
+    public Set<Entry<String, String>> getPidProviderOptions() {
+        PidProvider defaultPidProvider = pidProviderFactoryBean.getDefaultPidGenerator();
+        Set<String> providerIds = PidUtil.getManagedProviderIds();
+        Set<Entry<String, String>> options = new HashSet<Entry<String, String>>();
+        if (providerIds.size() > 1) {
+
+            String label = null;
+            if (this.dataverse.getOwner() != null && this.dataverse.getOwner().getEffectivePidGenerator()!= null) {
+                PidProvider inheritedPidProvider = this.dataverse.getOwner().getEffectivePidGenerator();
+                label = inheritedPidProvider.getLabel() + " " + BundleUtil.getStringFromBundle("dataverse.inherited") + ": "
+                        + inheritedPidProvider.getProtocol() + ":" + inheritedPidProvider.getAuthority()
+                        + inheritedPidProvider.getSeparator() + inheritedPidProvider.getShoulder();
+            } else {
+                label = defaultPidProvider.getLabel() +  " " + BundleUtil.getStringFromBundle("dataverse.default") + ": "
+                        + defaultPidProvider.getProtocol() + ":" + defaultPidProvider.getAuthority()
+                        + defaultPidProvider.getSeparator() + defaultPidProvider.getShoulder();
+            }
+            Entry<String, String> option = new AbstractMap.SimpleEntry<String, String>("default", label);
+            options.add(option);
+        }
+        for (String providerId : providerIds) {
+            PidProvider pidProvider = PidUtil.getPidProvider(providerId);
+            String label = pidProvider.getLabel() + ": " + pidProvider.getProtocol() + ":" + pidProvider.getAuthority()
+                    + pidProvider.getSeparator() + pidProvider.getShoulder();
+            Entry<String, String> option = new AbstractMap.SimpleEntry<String, String>(providerId, label);
+            options.add(option);
+        }
+        return options;
+    }
+
+    public void updateDisplayOnCreate(Long mdbId, Long dsftId, boolean currentValue) {
+        for (MetadataBlock mdb : allMetadataBlocks) {
+            if (mdb.getId().equals(mdbId)) {
+                for (DatasetFieldType dsft : mdb.getDatasetFieldTypes()) {
+                    if (dsft.getId().equals(dsftId)) {
+                        // Update value in memory
+                        dsft.setLocalDisplayOnCreate(!currentValue);
+                        
+                        // Update or create input level
+                        DataverseFieldTypeInputLevel existingLevel = dataverseFieldTypeInputLevelService
+                            .findByDataverseIdDatasetFieldTypeId(dataverse.getId(), dsftId);
+                        
+                        if (existingLevel != null) {
+                            existingLevel.setDisplayOnCreate(!currentValue);
+                            dataverseFieldTypeInputLevelService.save(existingLevel);
+                        } else {
+                            DataverseFieldTypeInputLevel newLevel = new DataverseFieldTypeInputLevel(
+                                dsft, 
+                                dataverse, 
+                                dsft.isRequiredDV(),
+                                true,  // default include
+                                !currentValue  // new value of displayOnCreate
+                            );
+                            dataverseFieldTypeInputLevelService.save(newLevel);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private void saveInputLevels(List<DataverseFieldTypeInputLevel> listDFTIL, DatasetFieldType dsft, Dataverse dataverse) {
+        // If the field already has an input level, update it
+        DataverseFieldTypeInputLevel existingLevel = dataverseFieldTypeInputLevelService
+            .findByDataverseIdDatasetFieldTypeId(dataverse.getId(), dsft.getId());
+        
+        if (existingLevel != null) {
+            existingLevel.setDisplayOnCreate(dsft.getLocalDisplayOnCreate());
+            existingLevel.setInclude(dsft.isInclude());
+            existingLevel.setRequired(dsft.isRequiredDV());
+            listDFTIL.add(existingLevel);
+        } else if (dsft.isInclude() || (dsft.getLocalDisplayOnCreate()!=null) || dsft.isRequiredDV()) {
+            // Only create new input level if there is any specific configuration
+            listDFTIL.add(new DataverseFieldTypeInputLevel(
+                dsft, 
+                dataverse, 
+                dsft.isRequiredDV(), 
+                dsft.isInclude(), 
+                dsft.getLocalDisplayOnCreate()
+            ));
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseRequestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseRequestServiceBean.java
index e193b535412..58a3837dbf9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseRequestServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseRequestServiceBean.java
@@ -1,11 +1,11 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * The service bean to go to when one needs the current {@link DataverseRequest}.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseRoleServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseRoleServiceBean.java
index 9d09d0580e2..c6be74af678 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseRoleServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseRoleServiceBean.java
@@ -17,13 +17,12 @@
 import java.util.Set;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-//import javax.validation.constraints.NotNull;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
@@ -40,6 +39,9 @@ public class DataverseRoleServiceBean implements java.io.Serializable {
 
     @EJB
     RoleAssigneeServiceBean roleAssigneeService;
+
+    @EJB
+    DataverseServiceBean dataverseService;
     @EJB
     IndexServiceBean indexService;
     @EJB
@@ -48,22 +50,23 @@ public class DataverseRoleServiceBean implements java.io.Serializable {
     IndexAsync indexAsync;
 
     public DataverseRole save(DataverseRole aRole) {
-        if (aRole.getId() == null) {
+        if (aRole.getId() == null) { // persist a new Role
             em.persist(aRole);
-            /**
-             * @todo Why would getId be null? Should we call
-             * indexDefinitionPoint here too? A: it's null for new roles.
-             */
-            return aRole;
-        } else {
-            DataverseRole merged = em.merge(aRole);
-            /**
-             * @todo update permissionModificationTime here.
-             */
-            IndexResponse indexDefinitionPountResult = indexDefinitionPoint(merged.getOwner());
-            logger.info("aRole getId was not null. Indexing result: " + indexDefinitionPountResult);
-            return merged;
+        } else { // update an existing Role
+            aRole = em.merge(aRole);
+        }
+
+        DvObject owner = aRole.getOwner();
+        if(owner == null) { // Builtin Role
+            owner = dataverseService.findByAlias("root");
         }
+
+        if(owner != null) { // owner may be null if a role is created before the root collection as in setup-all.sh
+            IndexResponse indexDefinitionPointResult = indexDefinitionPoint(owner);
+            logger.info("Indexing result: " + indexDefinitionPointResult);
+        }
+
+        return aRole;
     }
 
     public RoleAssignment save(RoleAssignment assignment) {
@@ -242,10 +245,10 @@ public Set<RoleAssignment> rolesAssignments(DvObject dv) {
      */
     //public List<RoleAssignment> directRoleAssignments(@NotNull RoleAssignee roas, @NotNull DvObject dvo) {
     public List<RoleAssignment> directRoleAssignments(RoleAssignee roas, DvObject dvo) {
-        List<RoleAssignment> unfiltered = em.createNamedQuery("RoleAssignment.listByAssigneeIdentifier", RoleAssignment.class).
-                            setParameter("assigneeIdentifier", roas.getIdentifier())
-                            .getResultList();
-        return unfiltered.stream().filter(roleAssignment -> Objects.equals(roleAssignment.getDefinitionPoint().getId(), dvo.getId())).collect(Collectors.toList());
+        return em.createNamedQuery("RoleAssignment.listByAssigneeIdentifier_DefinitionPointId", RoleAssignment.class)
+            .setParameter("assigneeIdentifier", roas.getIdentifier())
+            .setParameter("definitionPointId", dvo.getId())
+            .getResultList();
     }
     
     /**
@@ -303,7 +306,7 @@ public Set<DataverseRole> availableRoles(Long dvId) {
         Set<DataverseRole> roles = dv.getRoles();
         roles.addAll(findBuiltinRoles());
 
-        while (!dv.isEffectivelyPermissionRoot()) {
+        while (dv.getOwner() != null) {
             dv = dv.getOwner();
             roles.addAll(dv.getRoles());
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index 8dc85cb2d28..c14711060af 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -14,36 +14,43 @@
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
+import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
+import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
 import edu.harvard.iq.dataverse.search.SolrSearchResult;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.storageuse.StorageQuota;
+import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+
 import java.io.File;
 import java.io.IOException;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Logger;
-import java.util.Properties;
-import java.util.concurrent.Future;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import javax.ws.rs.core.Response;
+
+import edu.harvard.iq.dataverse.validation.JSONDataValidation;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.everit.json.schema.Schema;
+import org.everit.json.schema.ValidationException;
+import org.everit.json.schema.loader.SchemaLoader;
+import org.json.JSONObject;
+import org.json.JSONTokener;
 
 /**
  *
@@ -56,6 +63,9 @@ public class DataverseServiceBean implements java.io.Serializable {
     private static final Logger logger = Logger.getLogger(DataverseServiceBean.class.getCanonicalName());
     @EJB
     IndexServiceBean indexService;
+    
+    @EJB
+    SolrIndexServiceBean solrIndexService; 
 
     @EJB
     AuthenticationServiceBean authService;
@@ -78,6 +88,9 @@ public class DataverseServiceBean implements java.io.Serializable {
     @EJB
     PermissionServiceBean permissionService;
     
+    @EJB
+    DataverseFieldTypeInputLevelServiceBean dataverseFieldTypeInputLevelService;
+    
     @EJB
     SystemConfig systemConfig;
 
@@ -87,25 +100,43 @@ public class DataverseServiceBean implements java.io.Serializable {
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
 
+    private static final String BASE_QUERY_DATASET_TITLES_WITHIN_DV = "select v.value, o.id\n" 
+                + "from datasetfieldvalue v, dvobject o "
+                + "where " 
+                + "v.datasetfield_id = (select id from datasetfield f where datasetfieldtype_id = 1 " 
+                + "and datasetversion_id = (select max(id) from datasetversion where dataset_id = o.id))";
+
     public Dataverse save(Dataverse dataverse) {
        
         dataverse.setModificationTime(new Timestamp(new Date().getTime()));
         Dataverse savedDataverse = em.merge(dataverse);
+        return savedDataverse;
+    }
+    
+    public boolean index(Dataverse dataverse) {
+        return index(dataverse, false);
+
+    }
+        
+    public boolean index(Dataverse dataverse, boolean indexPermissions) {    
         /**
          * @todo check the result to see if indexing was successful or not
          * added logging of exceptions 
          */
         try {
-            Future<String> indexingResult = indexService.indexDataverse(savedDataverse);
+            indexService.indexDataverse(dataverse);
+            if (indexPermissions) {
+                solrIndexService.indexPermissionsOnSelfAndChildren(dataverse);
+            }
         } catch (IOException | SolrServerException e) {
-            String failureLogText = "Post-save indexing failed. You can kickoff a re-index of this dataverse with: \r\n curl http://localhost:8080/api/admin/index/dataverses/" + savedDataverse.getId().toString();
+            String failureLogText = "Post-save indexing failed. You can kickoff a re-index of this dataverse with: \r\n curl http://localhost:8080/api/admin/index/dataverses/" + dataverse.getId().toString();
             failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, savedDataverse);
+            LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, dataverse);
+            return false;
         }
 
-//        logger.log(Level.INFO, "during dataverse save, indexing result was: {0}", indexingResult);
-        return savedDataverse;
-    }
+        return true;
+    }    
 
     public Dataverse find(Object pk) {
         return em.find(Dataverse.class, pk);
@@ -114,6 +145,13 @@ public Dataverse find(Object pk) {
     public List<Dataverse> findAll() {
         return em.createNamedQuery("Dataverse.findAll").getResultList();
     }
+    
+    public List<Long> findIdStale() {
+        return em.createNamedQuery("Dataverse.findIdStale").getResultList();
+    }
+    public List<Long> findIdStalePermission() {
+        return em.createNamedQuery("Dataverse.findIdStalePermission").getResultList();
+    }
 
     /**
      * @param numPartitions The number of partitions you intend to split the
@@ -152,6 +190,14 @@ public List<Long> findDataverseIdsForIndexing(boolean skipIndexed) {
         
     }
 
+    public List<Dataverse> findByCreatorId(Long creatorId) {
+        return em.createNamedQuery("Dataverse.findByCreatorId").setParameter("creatorId", creatorId).getResultList();
+    }
+
+    public List<Dataverse> findByReleaseUserId(Long releaseUserId) {
+        return em.createNamedQuery("Dataverse.findByReleaseUserId").setParameter("releaseUserId", releaseUserId).getResultList();
+    }
+
     public List<Dataverse> findByOwnerId(Long ownerId) {
         return em.createNamedQuery("Dataverse.findByOwnerId").setParameter("ownerId", ownerId).getResultList();
     }
@@ -175,6 +221,15 @@ public Dataverse findRootDataverse() {
         return em.createNamedQuery("Dataverse.findRoot", Dataverse.class).getSingleResult();
     }
     
+    
+    //Similarly - if the above throws that exception, do we need to catch it here?
+    //ToDo - consider caching?
+    public String getRootDataverseName() {
+        Dataverse root = findRootDataverse();
+        String rootDataverseName=root.getName();
+        return StringUtil.isEmpty(rootDataverseName) ? "" : rootDataverseName; 
+    }
+    
     public List<Dataverse> findAllPublishedByOwnerId(Long ownerId) {
         List<Dataverse> retVal = new ArrayList<>();       
         List<Dataverse> previousLevel = findPublishedByOwnerId(ownerId);
@@ -199,23 +254,27 @@ public List<Dataverse> findAllPublishedByOwnerId(Long ownerId) {
     public Dataverse findByAlias(String anAlias) {
         try {
             return (anAlias.toLowerCase().equals(":root"))
-				? findRootDataverse()
-				: em.createNamedQuery("Dataverse.findByAlias", Dataverse.class)
-					.setParameter("alias", anAlias.toLowerCase())
-					.getSingleResult();
+              ? findRootDataverse()
+              : em.createNamedQuery("Dataverse.findByAlias", Dataverse.class)
+                  .setParameter("alias", anAlias.toLowerCase())
+                  .getSingleResult();
         } catch ( NoResultException|NonUniqueResultException ex ) {
-            logger.fine("Unable to find a single dataverse using alias \"" + anAlias + "\": " + ex);
+            logger.warning("Unable to find a single dataverse using alias \"" + anAlias + "\": " + ex);
             return null;
         }
     }
-    
-	public boolean hasData( Dataverse dv ) {
-		TypedQuery<Long> amountQry = em.createNamedQuery("Dataverse.ownedObjectsById", Long.class)
-								.setParameter("id", dv.getId());
-		
-		return (amountQry.getSingleResult()>0);
-	}
-	
+
+    public boolean hasData(Dataverse dataverse) {
+        return (getChildCount(dataverse) > 0);
+    }
+
+    public Long getChildCount(Dataverse dataverse) {
+        TypedQuery<Long> amountQry = em.createNamedQuery("Dataverse.ownedObjectsById", Long.class)
+                .setParameter("id", dataverse.getId());
+
+        return amountQry.getSingleResult();
+    }
+
     public boolean isRootDataverseExists() {
         long count = em.createQuery("SELECT count(dv) FROM Dataverse dv WHERE dv.owner.id=null", Long.class).getSingleResult();
         return (count == 1);
@@ -302,52 +361,15 @@ public String getDataverseLogoThumbnailAsBase64ById(Long dvId) {
         } 
         return null;
     }
-    
-    /*
-    public boolean isDataverseLogoThumbnailAvailable(Dataverse dataverse, User user) {    
-        if (dataverse == null) {
-            return false; 
+
+    public String getDataverseLogoThumbnailAsUrl(Long dvId) {
+        File dataverseLogoFile = getLogoById(dvId);
+        if (dataverseLogoFile != null && dataverseLogoFile.exists()) {
+            return SystemConfig.getDataverseSiteUrlStatic() + "/api/access/dvCardImage/" + dvId;
         }
-                
-        // First, check if the dataverse has a defined logo: 
-        
-        //if (dataverse.getDataverseTheme() != null && dataverse.getDataverseTheme().getLogo() != null && !dataverse.getDataverseTheme().getLogo().equals("")) {
-            File dataverseLogoFile = getLogo(dataverse);
-            if (dataverseLogoFile != null) {
-                String logoThumbNailPath = null;
+        return null;
+    }
 
-                if (dataverseLogoFile.exists()) {
-                    logoThumbNailPath = ImageThumbConverter.generateImageThumbnailFromFile(dataverseLogoFile.getAbsolutePath(), 48);
-                    if (logoThumbNailPath != null) {
-                        return true;
-                    }
-                }
-            }
-        //}
-        */
-        // If there's no uploaded logo for this dataverse, go through its 
-        // [released] datasets and see if any of them have card images:
-        // 
-        // TODO:
-        // Discuss/Decide if we really want to do this - i.e., go through every
-        // file in every dataset below... 
-        // -- L.A. 4.0 beta14
-        /*
-        for (Dataset dataset : datasetService.findPublishedByOwnerId(dataverse.getId())) {
-            if (dataset != null) {
-                DatasetVersion releasedVersion = dataset.getReleasedVersion();
-                
-                if (releasedVersion != null) {
-                    if (datasetService.isDatasetCardImageAvailable(releasedVersion, user)) {
-                        return true;
-                    }
-                }
-            }
-        }   */     
-        /*
-        return false; 
-    } */
-        
     private File getLogo(Dataverse dataverse) {
         if (dataverse.getId() == null) {
             return null; 
@@ -355,16 +377,7 @@ private File getLogo(Dataverse dataverse) {
         
         DataverseTheme theme = dataverse.getDataverseTheme(); 
         if (theme != null && theme.getLogo() != null && !theme.getLogo().isEmpty()) {
-            Properties p = System.getProperties();
-            String domainRoot = p.getProperty("com.sun.aas.instanceRoot");
-  
-            if (domainRoot != null && !"".equals(domainRoot)) {
-                return new File (domainRoot + File.separator + 
-                    "docroot" + File.separator + 
-                    "logos" + File.separator + 
-                    dataverse.getLogoOwnerId() + File.separator + 
-                    theme.getLogo());
-            }
+            return ThemeWidgetFragment.getLogoDir(dataverse.getLogoOwnerId()).resolve(theme.getLogo()).toFile();
         }
             
         return null;         
@@ -408,7 +421,7 @@ public DataverseTheme findDataverseThemeByIdQuick(Long id) {
         Object[] result;
         
         try {
-                result = (Object[]) em.createNativeQuery("SELECT logo, logoFormat FROM dataversetheme WHERE dataverse_id = " + id).getSingleResult();
+            result = (Object[]) em.createNativeQuery("SELECT logo, logoFormat, logothumbnail FROM dataversetheme WHERE dataverse_id = " + id).getSingleResult();
             
         } catch (Exception ex) {
             return null;
@@ -435,6 +448,10 @@ public DataverseTheme findDataverseThemeByIdQuick(Long id) {
                     break;
             }
         }
+
+        if (result[2] != null) {
+            theme.setLogoThumbnail((String) result[2]);
+        }
         
         return theme;
     }
@@ -447,8 +464,26 @@ public List<Dataverse> findDataversesThatLinkToThisDvId(long dataverseId) {
         return dataverseLinkingService.findLinkingDataverses(dataverseId);
     }
 
+    public List<Dataset> findDatasetsThisIdHasLinkedTo(long dataverseId, boolean onlyPublished) {
+        List<Dataset> linkedDatasets = datasetLinkingService.findLinkedDatasets(dataverseId);
+
+        if (!onlyPublished) {
+            return linkedDatasets;
+        }
+
+        List<Dataset> retList = new ArrayList();
+
+        for (Dataset ds : linkedDatasets) {
+            if (ds.isReleased() && !ds.isDeaccessioned()) {
+                retList.add(ds);
+            }
+        }
+
+        return retList;
+    }
+
     public List<Dataset> findDatasetsThisIdHasLinkedTo(long dataverseId) {
-        return datasetLinkingService.findDatasetsThisDataverseIdHasLinkedTo(dataverseId);
+        return this.findDatasetsThisIdHasLinkedTo(dataverseId, false);
     }
 
     public List<Dataverse> findDataversesThatLinkToThisDatasetId(long datasetId) {
@@ -474,9 +509,11 @@ public List<Dataverse> filterDataversesForLinking(String query, DataverseRequest
 
         List<Dataverse> dataverseList = new ArrayList<>();
 
-        List<Dataverse> results = em.createNamedQuery("Dataverse.filterByName", Dataverse.class)
-                .setParameter("name", "%" + query.toLowerCase() + "%")
-                .getResultList();
+        List<Dataverse> results = filterDataversesByNamePattern(query);
+        
+        if (results == null || results.size() == 0) {
+            return null; 
+        }
 
         List<Object> alreadyLinkeddv_ids = em.createNativeQuery("SELECT linkingdataverse_id   FROM datasetlinkingdataverse WHERE dataset_id = " + dataset.getId()).getResultList();
         List<Dataverse> remove = new ArrayList<>();
@@ -489,7 +526,7 @@ public List<Dataverse> filterDataversesForLinking(String query, DataverseRequest
         
         for (Dataverse res : results) {
             if (!remove.contains(res)) {
-                if (this.permissionService.requestOn(req, res).has(Permission.PublishDataset)) {
+                if (this.permissionService.requestOn(req, res).has(Permission.LinkDataset)) {
                     dataverseList.add(res);
                 }
             }
@@ -497,6 +534,101 @@ public List<Dataverse> filterDataversesForLinking(String query, DataverseRequest
 
         return dataverseList;
     }
+    public List<Dataverse> filterDataversesForUnLinking(String query, DataverseRequest req, Dataset dataset) {
+        List<Object> alreadyLinkeddv_ids = em.createNativeQuery("SELECT linkingdataverse_id FROM datasetlinkingdataverse WHERE dataset_id = " + dataset.getId()).getResultList();
+        List<Dataverse> dataverseList = new ArrayList<>();
+        if (alreadyLinkeddv_ids != null && !alreadyLinkeddv_ids.isEmpty()) {
+            alreadyLinkeddv_ids.stream().map((testDVId) -> this.find(testDVId)).forEachOrdered((dataverse) -> {
+                if (this.permissionService.requestOn(req, dataverse).has(Permission.LinkDataset)) {
+                    dataverseList.add(dataverse);
+                }
+            });
+        }
+        return dataverseList;
+    }
+
+    public List<Dataverse> filterDataversesForHosting(String pattern, DataverseRequest req) {
+
+        // Find the dataverses matching the search parameters: 
+        
+        List<Dataverse> searchResults = filterDataversesByNamePattern(pattern);
+        
+        if (searchResults == null || searchResults.size() == 0) {
+            return null; 
+        }
+        
+        logger.fine("search query found " + searchResults.size() + " results");
+        
+        // Filter the results and drop the dataverses where the user is not allowed to 
+        // add datasets:
+        
+        if (req.getAuthenticatedUser().isSuperuser()) {
+            logger.fine("will skip permission check...");
+            return searchResults;
+        }
+        
+        List<Dataverse> finalResults = new ArrayList<>();
+        
+        for (Dataverse res : searchResults) {
+            if (this.permissionService.requestOn(req, res).has(Permission.AddDataset)) {
+                finalResults.add(res);
+            }
+        }
+        
+        logger.fine("returning " + finalResults.size() + " final results");
+
+        return finalResults;
+    }
+    
+    
+    /* 
+        This method takes a search parameter and expands it into a list of 
+        Dataverses with matching names. 
+        The search is performed on the name with the trailing word "dataverse"
+        stripped (if present). This way the search on "data" (or on "da" pr 
+        "dat") does NOT return almost every dataverse in the database - since
+        most of them have names that end in "... Dataverse". 
+        The query isn't pretty, but it works, and it's still EJB QL (and NOT a 
+        native query). 
+    */
+    public List<Dataverse> filterDataversesByNamePattern(String pattern) {
+
+        pattern = pattern.toLowerCase();
+        
+        String pattern1 = pattern + "%";
+        String pattern2 = "% " + pattern + "%";
+
+        // Adjust the queries for very short, 1 and 2-character patterns:
+        if (pattern.length() == 1) {
+            pattern1 = pattern;
+            pattern2 = pattern + " %";
+        } 
+        /*if (pattern.length() == 2) {
+            pattern2 = pattern + "%";
+        }*/
+        
+        
+        String qstr = "select dv from Dataverse dv "
+                + "where (LOWER(dv.name) LIKE :dataverse and ((SUBSTRING(LOWER(dv.name),0,(LENGTH(dv.name)-9)) LIKE :pattern1) "
+                + "     or (SUBSTRING(LOWER(dv.name),0,(LENGTH(dv.name)-9)) LIKE :pattern2))) "
+                + "or (LOWER(dv.name) NOT LIKE :dataverse and ((LOWER(dv.name) LIKE :pattern1) "
+                + "     or (LOWER(dv.name) LIKE :pattern2))) "
+                + "order by dv.alias";
+                
+        List<Dataverse> searchResults = null;
+        
+        try {
+            searchResults = em.createQuery(qstr, Dataverse.class)
+                    .setParameter("dataverse", "%dataverse")
+                    .setParameter("pattern1", pattern1)
+                    .setParameter("pattern2", pattern2)
+                    .getResultList();
+        } catch (Exception ex) {
+            searchResults = null;
+        }
+        
+        return searchResults;
+    }
     
     /**
      * Used to identify and properly display Harvested objects on the dataverse page.
@@ -636,21 +768,25 @@ public List<Long> findAllDataverseDataverseChildren(Long dvId) {
     
     // function to recursively find ids of all children of a dataverse that are 
     // of type dataset
-    public List<Long> findAllDataverseDatasetChildren(Long dvId) {
+    public List<Long> findAllDataverseDatasetChildren(Long dvId, boolean onlyPublished, boolean includeHarvested) {
         // get list of Dataverse children
         List<Long> dataverseChildren = findIdsByOwnerId(dvId);
         // get list of Dataset children
-        List<Long> datasetChildren = datasetService.findIdsByOwnerId(dvId);
+        List<Long> datasetChildren = datasetService.findIdsByOwnerId(dvId, onlyPublished, includeHarvested);
         
         if (dataverseChildren == null) {
             return datasetChildren;
         } else {
             for (Long childDvId : dataverseChildren) {
-                datasetChildren.addAll(findAllDataverseDatasetChildren(childDvId));
+                datasetChildren.addAll(findAllDataverseDatasetChildren(childDvId, onlyPublished, includeHarvested));
             }
             return datasetChildren;
         }
     }
+
+    public List<Long> findAllDataverseDatasetChildren(Long dvId) {
+        return findAllDataverseDatasetChildren(dvId, false, false);
+    }
     
     public String addRoleAssignmentsToChildren(Dataverse owner, ArrayList<String> rolesToInherit,
             boolean inheritAllRoles) {
@@ -789,4 +925,386 @@ public String addRoleAssignmentsToChildren(Dataverse owner, ArrayList<String> ro
         logger.info(result);
         return (result);
     }
+    
+    // A quick custom query that finds all the (direct children) dataset titles 
+    // with a dataverse and returns a list of (dataset_id, title) pairs. 
+    public List<Object[]> getDatasetTitlesWithinDataverse(Long dataverseId) {
+        String cqString = BASE_QUERY_DATASET_TITLES_WITHIN_DV
+                + "and o.owner_id = " + dataverseId;
+
+        return em.createNativeQuery(cqString).getResultList();
+    }
+
+    public  String getCollectionDatasetSchema(String dataverseAlias) {
+        return getCollectionDatasetSchema(dataverseAlias, null);
+    }
+    public  String getCollectionDatasetSchema(String dataverseAlias, Map<String, Map<String,List<String>>> schemaChildMap) {
+        
+        Dataverse testDV = this.findByAlias(dataverseAlias);
+        
+        while (!testDV.isMetadataBlockRoot()) {
+            if (testDV.getOwner() == null) {
+                break; // we are at the root; which by definition is metadata block root, regardless of the value
+            }
+            testDV = testDV.getOwner();
+        }
+        
+        /* Couldn't get the 'return base if no extra required fields to work with the path provided
+        leaving it as 'out of scope' for now SEK 11/27/2023
+
+        List<DataverseFieldTypeInputLevel> required = new ArrayList<>();
+
+        required = dataverseFieldTypeInputLevelService.findRequiredByDataverseId(testDV.getId());
+        
+        if (required == null || required.isEmpty()){
+            String pathToJsonFile = "src/main/resources/edu/harvas/iq/dataverse/baseDatasetSchema.json";
+            String baseSchema = getBaseSchemaStringFromFile(pathToJsonFile);
+            if (baseSchema != null && !baseSchema.isEmpty()){
+                return baseSchema;
+            }
+        }
+        
+        */
+        List<MetadataBlock> selectedBlocks = new ArrayList<>();
+        List<DatasetFieldType> requiredDSFT = new ArrayList<>();
+        
+        selectedBlocks.addAll(testDV.getMetadataBlocks());
+
+        // Process all fields in all metadata blocks
+        for (MetadataBlock mdb : selectedBlocks) {
+            for (DatasetFieldType dsft : mdb.getDatasetFieldTypes()) {
+                if (!dsft.isChild()) {
+                    // Get or set the input level settings for the parent field
+                    DataverseFieldTypeInputLevel dsfIl = dataverseFieldTypeInputLevelService.findByDataverseIdDatasetFieldTypeId(testDV.getId(), dsft.getId());
+                    if (dsfIl != null) {
+                        dsft.setRequiredDV(dsfIl.isRequired());
+                        dsft.setInclude(dsfIl.isInclude());
+                        dsft.setLocalDisplayOnCreate(dsfIl.getDisplayOnCreate());
+                    } else {
+                        dsft.setRequiredDV(dsft.isRequired());
+                        dsft.setInclude(true);
+                        // Default displayOnCreate to true for required fields
+                        dsft.setLocalDisplayOnCreate(dsft.isRequired());
+                    }
+                    List<String> childrenRequired = new ArrayList<>();
+                    List<String> childrenAllowed = new ArrayList<>();
+                    if (dsft.isHasChildren()) {
+                        for (DatasetFieldType child : dsft.getChildDatasetFieldTypes()) {
+                            DataverseFieldTypeInputLevel dsfIlChild = dataverseFieldTypeInputLevelService.findByDataverseIdDatasetFieldTypeId(testDV.getId(), child.getId());
+                            if (dsfIlChild != null) {
+                                child.setRequiredDV(dsfIlChild.isRequired());
+                                child.setInclude(dsfIlChild.isInclude());
+                                child.setLocalDisplayOnCreate(dsfIlChild.getDisplayOnCreate());
+                            } else {
+                                child.setRequiredDV(child.isRequired() && dsft.isRequired());
+                                child.setInclude(true);
+                                // Default displayOnCreate to true for required child fields
+                                child.setLocalDisplayOnCreate(child.isRequired());
+                            }
+                            if (child.isRequired()) {
+                                childrenRequired.add(child.getName());
+                            }
+                            childrenAllowed.add(child.getName());
+                        }
+                    }
+                    
+                    if (schemaChildMap != null) {
+                        Map<String, List<String>> map = new HashMap<>();
+                        map.put("required", childrenRequired);
+                        map.put("allowed", childrenAllowed);
+                        schemaChildMap.put(dsft.getName(), map);
+                    }
+                    
+                    if(dsft.isRequiredDV()){
+                        requiredDSFT.add(dsft);
+                    }
+                }
+            }            
+        }
+        
+        String reqMDBNames = "";
+        List<MetadataBlock> hasReqFields = new ArrayList<>();
+        String retval = datasetSchemaPreface;
+        
+        // Build list of metadata blocks with required fields
+        for (MetadataBlock mdb : selectedBlocks) {
+            for (DatasetFieldType dsft : requiredDSFT) {
+                if (dsft.getMetadataBlock().equals(mdb)) {
+                    hasReqFields.add(mdb);
+                    if (!reqMDBNames.isEmpty()) reqMDBNames += ",";
+                    reqMDBNames += "\"" + mdb.getName() + "\"";
+                    break;
+                }
+            }
+        }
+        
+        // Generate schema for each metadata block
+        int countMDB = 0;
+        for (MetadataBlock mdb : hasReqFields) {
+            if (countMDB > 0) {
+                retval += ",";
+            }
+            retval += getCustomMDBSchema(mdb, requiredDSFT);
+            countMDB++;            
+        }
+        
+        retval += "\n                     }";
+        retval += endOfjson.replace("blockNames", reqMDBNames);
+
+        return retval;
+    }
+    
+    private String getCustomMDBSchema (MetadataBlock mdb, List<DatasetFieldType> requiredDSFT){
+        String retval = "";
+        boolean mdbHasReqField = false;
+        int numReq = 0;
+        List<DatasetFieldType> requiredThisMDB = new ArrayList<>();
+        List<DatasetFieldType> allFieldsThisMDB = new ArrayList<>(mdb.getDatasetFieldTypes());
+        
+        // First collect all required fields for this metadata block
+        for (DatasetFieldType dsft : requiredDSFT) {
+            if(dsft.getMetadataBlock().equals(mdb)){
+                numReq++;
+                mdbHasReqField = true;
+                requiredThisMDB.add(dsft);
+            }
+        }
+
+        // Start building the schema for this metadata block
+        retval += startOfMDB.replace("blockName", mdb.getName());
+        
+        // Add minItems constraint only if there are required fields
+        if (mdbHasReqField) {
+            retval += minItemsTemplate.replace("numMinItems", Integer.toString(requiredThisMDB.size()));
+            
+            // Add contains validation for each required field
+            int count = 0;
+            for (DatasetFieldType dsft : requiredThisMDB) {
+                count++;
+                String reqValImp = reqValTemplate.replace("reqFieldTypeName", dsft.getName());
+                if (count < requiredThisMDB.size()) {
+                    retval += reqValImp + "\n";
+                } else {
+                    reqValImp = StringUtils.substring(reqValImp, 0, reqValImp.length() - 1);
+                    retval += reqValImp + "\n";
+                    retval += endOfReqVal;
+                }
+            }
+        } else {
+            // If no required fields, just close the items definition
+            retval += "\n                                    \"items\": {\n" +
+                     "                                        \"$ref\": \"#/$defs/field\"\n" +
+                     "                                    }\n" +
+                     "                                }\n" +
+                     "                            },\n" +
+                     "                            \"required\": [\"fields\"]\n" +
+                     "                        }";
+        }
+        
+        return retval;
+    }
+    
+    public String isDatasetJsonValid(String dataverseAlias, String jsonInput) {
+        Map<String, Map<String,List<String>>> schemaChildMap = new HashMap<>();
+        JSONObject rawSchema = new JSONObject(new JSONTokener(getCollectionDatasetSchema(dataverseAlias, schemaChildMap)));
+        
+        try {
+            Schema schema = SchemaLoader.load(rawSchema);
+            schema.validate(new JSONObject(jsonInput)); // throws a ValidationException if this object is invalid
+            JSONDataValidation.validate(schema, schemaChildMap, jsonInput); // throws a ValidationException if any objects are invalid
+        } catch (ValidationException vx) {
+            logger.info(BundleUtil.getStringFromBundle("dataverses.api.validate.json.failed") + " " + vx.getErrorMessage()); 
+            String accumulatedexceptions = "";
+            for (ValidationException va : vx.getCausingExceptions()){
+                accumulatedexceptions = accumulatedexceptions + va;
+                accumulatedexceptions = accumulatedexceptions.replace("org.everit.json.schema.ValidationException:", " ");
+            }
+            if (!accumulatedexceptions.isEmpty()){
+                return BundleUtil.getStringFromBundle("dataverses.api.validate.json.failed") + " "  + accumulatedexceptions;
+            } else {
+                return BundleUtil.getStringFromBundle("dataverses.api.validate.json.failed") + " "  + vx.getErrorMessage();
+            }
+            
+        } catch (Exception ex) {            
+            logger.info(BundleUtil.getStringFromBundle("dataverses.api.validate.json.exception") + ex.getLocalizedMessage());
+            return BundleUtil.getStringFromBundle("dataverses.api.validate.json.exception") + ex.getLocalizedMessage();
+        } 
+
+        return BundleUtil.getStringFromBundle("dataverses.api.validate.json.succeeded");
+    }
+    
+    static String getBaseSchemaStringFromFile(String pathToJsonFile) {
+        File datasetSchemaJson = new File(pathToJsonFile);
+        try {
+            String datasetSchemaAsJson = new String(Files.readAllBytes(Paths.get(datasetSchemaJson.getAbsolutePath())));
+            return datasetSchemaAsJson;
+        } catch (IOException ex) {
+            logger.info("IO - failed to get schema file  - will build on fly " +ex.getMessage());
+            return null;
+        } catch (Exception e){
+            logger.info("Other exception - failed to get schema file  - will build on fly. " + e.getMessage());
+            return null;
+        }
+    }
+    
+    private  String datasetSchemaPreface = 
+    "{\n" +
+    "    \"$schema\": \"http://json-schema.org/draft-04/schema#\",\n" +
+    "    \"$defs\": {\n" +
+    "    \"field\": {\n" + 
+    "        \"type\": \"object\",\n" +
+    "        \"required\": [\"typeClass\", \"multiple\", \"typeName\"],\n" +
+    "        \"properties\": {\n" + 
+    "            \"value\": {\n" +
+    "                \"anyOf\": [\n" +
+    "                    {\n" +
+    "                        \"type\": \"array\"\n" +
+    "                    },\n" +
+    "                    {\n" + 
+    "                        \"type\": \"string\"\n" +
+    "                    },\n" +
+    "                    {\n" +
+    "                        \"$ref\": \"#/$defs/field\"\n" +
+    "                    }\n" + 
+    "                ]\n" + 
+    "            },\n" + 
+    "            \"typeClass\": {\n" +
+    "                \"type\": \"string\"\n" +
+    "            },\n" +
+    "            \"multiple\": {\n" +
+    "                \"type\": \"boolean\"\n" +
+    "            },\n" +
+    "            \"typeName\": {\n" + 
+    "                \"type\": \"string\"\n" +
+    "            },\n" +
+    "            \"displayOnCreate\": {\n" +
+    "                \"type\": \"boolean\"\n" +
+    "            }\n" +
+    "        }\n" +
+    "    }\n" + 
+    "},\n" + 
+    "\"type\": \"object\",\n" +
+    "\"properties\": {\n" + 
+    "    \"datasetVersion\": {\n" + 
+    "        \"type\": \"object\",\n" +
+    "        \"properties\": {\n" + 
+    "           \"license\": {\n" + 
+    "                \"type\": \"object\",\n" + 
+    "                \"properties\": {\n" + 
+    "                    \"name\": {\n" +
+    "                        \"type\": \"string\"\n" + 
+    "                    },\n" + 
+    "                    \"uri\": {\n" + 
+    "                        \"type\": \"string\",\n" + 
+    "                        \"format\": \"uri\"\n" + 
+    "                   }\n" + 
+    "                },\n" + 
+    "                \"required\": [\"name\", \"uri\"]\n" + 
+    "            },\n" + 
+    "            \"metadataBlocks\": {\n" + 
+    "                \"type\": \"object\",\n" + 
+    "               \"properties\": {\n" +
+    ""  ;
+    
+    private String startOfMDB = "" +
+"                           \"blockName\": {\n" +
+"                            \"type\": \"object\",\n" +
+"                            \"properties\": {\n" +
+"                                \"fields\": {\n" +
+"                                    \"type\": \"array\",\n" +
+"                                    \"items\": {\n" +
+"                                        \"$ref\": \"#/$defs/field\"\n" +
+"                                    },";
+    
+    private String reqValTemplate = "                                        {\n" +
+"                                            \"contains\": {\n" +
+"                                                \"properties\": {\n" +
+"                                                    \"typeName\": {\n" +
+"                                                        \"const\": \"reqFieldTypeName\"\n" +
+"                                                    }\n" +
+"                                                }\n" +
+"                                            }\n" +
+"                                        },";
+    
+    private String minItemsTemplate = "\n                                    \"minItems\": numMinItems,\n" +
+"                                    \"allOf\": [\n";
+    private String endOfReqVal = "                                    ]\n" +
+"                                }\n" +
+"                            },\n" +
+"                            \"required\": [\"fields\"]\n" +
+"                        }";
+    
+    private String endOfjson = ",\n" +
+"                    \"required\": [blockNames]\n" +
+"                }\n" +
+"            },\n" +
+"            \"required\": [\"metadataBlocks\"]\n" +
+"        }\n" +
+"    },\n" +
+"    \"required\": [\"datasetVersion\"]\n" +
+"}\n";
+    
+    public void saveStorageQuota(Dataverse target, Long allocation) {
+        StorageQuota storageQuota = target.getStorageQuota();
+        
+        if (storageQuota != null) {
+            storageQuota.setAllocation(allocation);
+            em.merge(storageQuota);
+        } else {
+            storageQuota = new StorageQuota(); 
+            storageQuota.setDefinitionPoint(target);
+            storageQuota.setAllocation(allocation);
+            target.setStorageQuota(storageQuota);
+            em.persist(storageQuota);
+        }
+        em.flush();
+    }
+    
+    public void disableStorageQuota(StorageQuota storageQuota) {
+        if (storageQuota != null && storageQuota.getAllocation() != null) {
+            storageQuota.setAllocation(null);
+            em.merge(storageQuota);
+            em.flush();
+        }
+    }
+
+    /**
+     * Returns the total number of Dataverses
+     * @return the number of dataverse in the database
+     */
+    public long getDataverseCount() {
+        return em.createNamedQuery("Dataverse.countAll", Long.class).getSingleResult();
+    }
+
+    /**
+     * Returns the total number of published datasets within a Dataverse collection. The number includes harvested and
+     * linked datasets. Datasets in subcollections are also counted.
+     * @param dvId ID of a Dataverse collection
+     * @return the total number of published datasets within that Dataverse collection
+     */
+    public long getDatasetCount(Long dvId) {
+        Set<Long> dvIds = new HashSet<>();
+        Deque<Long> stack = new ArrayDeque<>();
+        dvIds.add(dvId);
+        stack.push(dvId);
+
+        // Collect IDs of all subdataverses
+        while (!stack.isEmpty()) {
+            Long currentId = stack.pop();
+            List<Long> children = em.createQuery("SELECT d.id FROM Dataverse d WHERE d.owner.id = :parentId", Long.class)
+                                    .setParameter("parentId", currentId)
+                                    .getResultList();
+
+            for (Long childId : children) {
+                if (dvIds.add(childId)) {
+                    stack.push(childId);
+                }
+            }
+        }
+
+        return em.createNamedQuery("Dataverse.getDatasetCount", Long.class)
+                 .setParameter("ids", dvIds)
+                 .setParameter("datasetState", VersionState.RELEASED)
+                 .getSingleResult();
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java b/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java
index 27ee982653a..607bc9d5a47 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java
@@ -4,20 +4,27 @@
 import edu.harvard.iq.dataverse.PermissionServiceBean.StaticPermissionQuery;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.JsfHelper;
+import edu.harvard.iq.dataverse.util.SessionUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 /**
  *
@@ -42,26 +49,112 @@ public class DataverseSession implements Serializable{
     @Inject
     SettingsWrapper settingsWrapper;
     
+    @Inject
+    DataverseHeaderFragment headerFragment;
+    
     @EJB
     SystemConfig systemConfig;
     
+    @EJB
+    BannerMessageServiceBean bannerMessageService;
+
+    @EJB
+    AuthenticationServiceBean authenticationService;
+
     private static final Logger logger = Logger.getLogger(DataverseSession.class.getCanonicalName());
     
     private boolean statusDismissed = false;
     
+    private List<BannerMessage> dismissedMessages = new ArrayList<>();
+
+    public List<BannerMessage> getDismissedMessages() {
+        return dismissedMessages;
+    }
+
+    public void setDismissedMessages(List<BannerMessage> dismissedMessages) {
+        this.dismissedMessages = dismissedMessages;
+    }
+
+    /**
+     * If debug is set to true, some pages show extra debugging information to
+     * superusers.
+     *
+     * The way to set the Boolean to true is to pass debug=true as a query
+     * parameter. The Boolean will remain true (even if nothing is passed to it)
+     * until debug=false is passed.
+     *
+     * Because a boolean is false by default when it comes from a viewParam we
+     * use a Boolean instead. That way, if the debug viewParam is null, we can
+     * leave the state alone (see setDebug()).
+     */
+    private Boolean debug;
+    
     public User getUser() {
+        return getUser(false);
+    }
+
+    /**
+     * For performance reasons, we only lookup the authenticated user again (to
+     * check if it has been deleted or deactivated, for example) when we have
+     * to.
+     *
+     * @param lookupAuthenticatedUserAgain A boolean to indicate if we should go
+     * to the database again to lookup the user to get the latest values that
+     * may have been updated outside the session.
+     */
+    public User getUser(boolean lookupAuthenticatedUserAgain) {
         if ( user == null ) {
             user = GuestUser.get();
         }
- 
+        if (lookupAuthenticatedUserAgain && user instanceof AuthenticatedUser) {
+            AuthenticatedUser auFromSession = (AuthenticatedUser) user;
+            AuthenticatedUser auFreshLookup = authenticationService.findByID(auFromSession.getId());
+            if (auFreshLookup == null) {
+                logger.fine("getUser found user no longer exists (was deleted). Returning GuestUser.");
+                user = GuestUser.get();
+            } else {
+                if (auFreshLookup.isDeactivated()) {
+                    logger.fine("getUser found user is deactivated. Returning GuestUser.");
+                    user = GuestUser.get();
+                }
+            }
+        }
         return user;
     }
 
+    /**
+     * Sets the user and configures the session timeout.
+     */
     public void setUser(User aUser) {
-        logSvc.log( 
-                new ActionLogRecord(ActionLogRecord.ActionType.SessionManagement,(aUser==null) ? "logout" : "login")
-                    .setUserIdentifier((aUser!=null) ? aUser.getIdentifier() : (user!=null ? user.getIdentifier() : "") ));
-        
+        // We check for deactivated status here in "setUser" to ensure a common user
+        // experience across Builtin, Shib, OAuth, and OIDC users.
+        // If we want a different user experience for Builtin users, we can
+        // modify getUpdateAuthenticatedUser in AuthenticationServiceBean
+        // (and probably other places).
+        if (aUser instanceof AuthenticatedUser && aUser.isDeactivated()) {
+            logger.info("Login attempt by deactivated user " + aUser.getIdentifier() + ".");
+            JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("deactivated.error"));
+            return;
+        }
+        FacesContext context = FacesContext.getCurrentInstance();
+		// Log the login/logout and Change the session id if we're using the UI and have
+		// a session, versus an API call with no session - (i.e. /admin/submitToArchive()
+		// which sets the user in the session to pass it through to the underlying command)
+        // TODO: reformat to remove tabs etc.
+		if(context != null) {
+          logSvc.log( 
+                      new ActionLogRecord(ActionLogRecord.ActionType.SessionManagement,(aUser==null) ? "logout" : "login")
+                          .setUserIdentifier((aUser!=null) ? aUser.getIdentifier() : (user!=null ? user.getIdentifier() : "") ));
+
+          //#3254 - change session id when user changes
+          SessionUtil.changeSessionId((HttpServletRequest) context.getExternalContext().getRequest());
+            HttpSession httpSession = (HttpSession) context.getExternalContext().getSession(false);
+            if (httpSession != null) {
+                // Configure session timeout.
+                logger.fine("jsession: " + httpSession.getId() + " setting the lifespan of the session to " + systemConfig.getLoginSessionTimeout() + " minutes");
+                httpSession.setMaxInactiveInterval(systemConfig.getLoginSessionTimeout() * 60); // session timeout, in seconds
+            }
+        }
         this.user = aUser;
     }
 
@@ -72,7 +165,22 @@ public boolean isStatusDismissed() {
     public void setStatusDismissed(boolean status) {
         statusDismissed = status; //MAD: Set to true to enable code!
     }
-    
+
+    public Boolean getDebug() {
+        // Only superusers get extra debugging information.
+        if (!getUser().isSuperuser()) {
+            return false;
+        }
+        return debug;
+    }
+
+    public void setDebug(Boolean debug) {
+        // Leave the debug state alone if nothing is passed.
+        if (debug != null) {
+            this.debug = debug;
+        }
+    }
+
     public StaticPermissionQuery on( Dataverse d ) {
             return permissionsService.userOn(user, d);
     }
@@ -101,19 +209,17 @@ public String getLocaleTitle() {
     
     public void initLocale() {
         
-        if(FacesContext.getCurrentInstance() == null) {
-            localeCode = "en";
-        }
-        else if (FacesContext.getCurrentInstance().getViewRoot() == null ) {
-            localeCode = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale().getLanguage();
-        }
-        else if (FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage().equals("en_US")) {
-            localeCode = "en";
-        }
-        else {
-            localeCode = FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage();
+
+        localeCode = "en";
+        if (FacesContext.getCurrentInstance() != null) {
+            if (FacesContext.getCurrentInstance().getViewRoot() == null) {
+                localeCode = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale().getLanguage();
+            } else if (FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage().equals("en_US")) {
+                localeCode = "en";
+            } else {
+                localeCode = FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage();
+            }
         }
-        
         logger.fine("init: locale set to "+localeCode);
     }
 
@@ -138,12 +244,15 @@ public void updateLocaleInViewRoot() {
         } 
     }
     
-    public void configureSessionTimeout() {
-        HttpSession httpSession = (HttpSession) FacesContext.getCurrentInstance().getExternalContext().getSession(false);
-        
-        if (httpSession != null) {
-            logger.fine("jsession: "+httpSession.getId()+" setting the lifespan of the session to " + systemConfig.getLoginSessionTimeout() + " minutes");
-            httpSession.setMaxInactiveInterval(systemConfig.getLoginSessionTimeout() * 60); // session timeout, in seconds
+    public void dismissMessage(BannerMessage message){
+               
+        if (message.isDismissibleByUser()){
+            if (user.isAuthenticated()){
+                bannerMessageService.dismissMessageByUser(message, (AuthenticatedUser) user);
+            }
+
+        } else {
+            dismissedMessages.add(message);
         }
         
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseTheme.java b/src/main/java/edu/harvard/iq/dataverse/DataverseTheme.java
index 0c6341db485..850a75071fb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseTheme.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseTheme.java
@@ -8,16 +8,16 @@
 
 import java.io.Serializable;
 import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 /**
  *
@@ -52,6 +52,7 @@ public enum Alignment {
     private Alignment logoAlignment;
     private String logoBackgroundColor;
     private String logo;
+    private String logoThumbnail;
     private Alignment logoFooterAlignment;
     private String logoFooterBackgroundColor;
     private String logoFooter;
@@ -97,6 +98,14 @@ public void setLogo(String logo) {
         this.logo = logo;
     }
 
+    public String getLogoThumbnail() {
+        return this.logoThumbnail;
+    }
+
+    public void setLogoThumbnail(String logoThumbnail) {
+        this.logoThumbnail = logoThumbnail;
+    }
+
     public Alignment getLogoFooterAlignment() {
         return logoFooterAlignment;
     }
@@ -181,7 +190,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object object) {
-        if (!(object instanceof DatasetFieldType)) {
+        if (!(object instanceof DataverseTheme)) {
             return false;
         }
         DataverseTheme other = (DataverseTheme) object;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DefaultValueSet.java b/src/main/java/edu/harvard/iq/dataverse/DefaultValueSet.java
index ad48f15fc54..a2dc785c470 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DefaultValueSet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DefaultValueSet.java
@@ -8,13 +8,13 @@
 
 import java.io.Serializable;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObject.java b/src/main/java/edu/harvard/iq/dataverse/DvObject.java
index e56d9df3394..68ff739a77f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DvObject.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DvObject.java
@@ -1,14 +1,16 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.storageuse.StorageQuota;
+
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import javax.persistence.*;
+import java.util.*;
+import java.util.logging.Logger;
+
+import jakarta.persistence.*;
 
 /**
  * Base of the object hierarchy for "anything that can be inside a dataverse".
@@ -23,15 +25,19 @@
     @NamedQuery(name = "DvObject.ownedObjectsById",
 			query="SELECT COUNT(obj) FROM DvObject obj WHERE obj.owner.id=:id"),
     @NamedQuery(name = "DvObject.findByGlobalId",
-            query = "SELECT o FROM DvObject o WHERE o.identifier=:identifier and o.authority=:authority and o.protocol=:protocol and o.dtype=:dtype"),
+            query = "SELECT o FROM DvObject o WHERE UPPER(o.identifier)=UPPER(:identifier) and o.authority=:authority and o.protocol=:protocol and o.dtype=:dtype"),
+    @NamedQuery(name = "DvObject.findIdByGlobalId",
+            query = "SELECT o.id FROM DvObject o WHERE UPPER(o.identifier)=UPPER(:identifier) and o.authority=:authority and o.protocol=:protocol and o.dtype=:dtype"),
 
     @NamedQuery(name = "DvObject.findByAlternativeGlobalId",
             query = "SELECT o FROM DvObject o, AlternativePersistentIdentifier a  WHERE o.id = a.dvObject.id and a.identifier=:identifier and a.authority=:authority and a.protocol=:protocol and o.dtype=:dtype"),
+    @NamedQuery(name = "DvObject.findIdByAlternativeGlobalId",
+            query = "SELECT o.id FROM DvObject o, AlternativePersistentIdentifier a  WHERE o.id = a.dvObject.id and a.identifier=:identifier and a.authority=:authority and a.protocol=:protocol and o.dtype=:dtype"),
 
     @NamedQuery(name = "DvObject.findByProtocolIdentifierAuthority",
-            query = "SELECT o FROM DvObject o WHERE o.identifier=:identifier and o.authority=:authority and o.protocol=:protocol"),
+            query = "SELECT o FROM DvObject o WHERE UPPER(o.identifier)=UPPER(:identifier) and o.authority=:authority and o.protocol=:protocol"),
     @NamedQuery(name = "DvObject.findByOwnerId", 
-                query = "SELECT o FROM DvObject o WHERE o.owner.id=:ownerId"),
+                query = "SELECT o FROM DvObject o WHERE o.owner.id=:ownerId  order by o.dtype desc, o.id"),
     @NamedQuery(name = "DvObject.findByAuthenticatedUserId", 
                 query = "SELECT o FROM DvObject o WHERE o.creator.id=:ownerId or o.releaseUser.id=:releaseUserId")
 })
@@ -45,14 +51,24 @@
 @Table(indexes = {@Index(columnList="dtype")
 		, @Index(columnList="owner_id")
 		, @Index(columnList="creator_id")
-		, @Index(columnList="releaseuser_id")},
-		uniqueConstraints = @UniqueConstraint(columnNames = {"authority,protocol,identifier"}))
+		, @Index(columnList="releaseuser_id")
+        , @Index(columnList="authority,protocol, UPPER(identifier)", name="INDEX_DVOBJECT_authority_protocol_upper_identifier")},
+		uniqueConstraints = {@UniqueConstraint(columnNames = {"authority,protocol,identifier"}),@UniqueConstraint(columnNames = {"owner_id,storageidentifier"})})
 public abstract class DvObject extends DataverseEntity implements java.io.Serializable {
     
-    public static final String DATAVERSE_DTYPE_STRING = "Dataverse";
-    public static final String DATASET_DTYPE_STRING = "Dataset";
-    public static final String DATAFILE_DTYPE_STRING = "DataFile";
-    public static final List<String> DTYPE_LIST = Arrays.asList(DATAVERSE_DTYPE_STRING, DATASET_DTYPE_STRING, DATAFILE_DTYPE_STRING);
+    private static final Logger logger = Logger.getLogger(DvObject.class.getCanonicalName());
+    
+    public enum DType {
+        Dataverse("Dataverse"), Dataset("Dataset"),DataFile("DataFile");
+       
+        String dtype;
+        DType(String dt) {
+           dtype = dt;
+        }
+        public String getDType() {
+           return dtype;
+        } 
+     }
     
     public static final Visitor<String> NamePrinter = new Visitor<String>(){
 
@@ -123,20 +139,34 @@ public String visit(DataFile df) {
     private String storageIdentifier;
     
     @Column(insertable = false, updatable = false) private String dtype;
-    
+
+    @OneToMany(mappedBy="dvobject",fetch = FetchType.LAZY,cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
+    private List<DataverseFeaturedItem> dataverseFeaturedItems;
+
+    public List<DataverseFeaturedItem> getDataverseFeaturedItems() {
+        return this.dataverseFeaturedItems;
+    }
+    public void setDataverseFeaturedItems(List<DataverseFeaturedItem> dataverseFeaturedItems) {
+        this.dataverseFeaturedItems = dataverseFeaturedItems;
+    }
+
     /*
-    * Add DOI related fields
+    * Add PID related fields
     */
    
     private String protocol;
     private String authority;
 
+    private String separator;
+
     @Temporal(value = TemporalType.TIMESTAMP)
     private Date globalIdCreateTime;
 
     private String identifier;
     
     private boolean identifierRegistered;
+        
+    private transient GlobalId globalId = null;
     
     @OneToMany(mappedBy = "dvObject", cascade = CascadeType.ALL, orphanRemoval = true)
     private Set<AlternativePersistentIdentifier> alternativePersistentIndentifiers;
@@ -157,6 +187,9 @@ public void setAlternativePersistentIndentifiers(Set<AlternativePersistentIdenti
      */
     private boolean previewImageAvailable;
     
+    @OneToOne(mappedBy = "definitionPoint",cascade={ CascadeType.REMOVE, CascadeType.MERGE,CascadeType.PERSIST}, orphanRemoval=true)
+    private StorageQuota storageQuota;
+    
     public boolean isPreviewImageAvailable() {
         return previewImageAvailable;
     }
@@ -164,7 +197,23 @@ public boolean isPreviewImageAvailable() {
     public void setPreviewImageAvailable(boolean status) {
         this.previewImageAvailable = status;
     }
+    
+    /**
+     * Indicates whether a previous attempt to generate a preview image has failed,
+     * regardless of size. This could be due to the file not being accessible, or a
+     * real failure in generating the thumbnail. In both cases, we won't want to try
+     * again every time the preview/thumbnail is requested for a view.
+     */
+    private boolean previewImageFail;
 
+    public boolean isPreviewImageFail() {
+        return previewImageFail;
+    }
+
+    public void setPreviewImageFail(boolean previewImageFail) {
+        this.previewImageFail = previewImageFail;
+    }
+    
     public Timestamp getModificationTime() {
         return modificationTime;
     }
@@ -270,6 +319,8 @@ public String getProtocol() {
 
     public void setProtocol(String protocol) {
         this.protocol = protocol;
+        //Remove cached value
+        globalId=null;
     }
 
     public String getAuthority() {
@@ -278,6 +329,18 @@ public String getAuthority() {
 
     public void setAuthority(String authority) {
         this.authority = authority;
+        //Remove cached value
+        globalId=null;
+    }
+
+    public String getSeparator() {
+        return separator;
+    }
+
+    public void setSeparator(String separator) {
+        this.separator = separator;
+        //Remove cached value
+        globalId=null;
     }
 
     public Date getGlobalIdCreateTime() {
@@ -294,6 +357,8 @@ public String getIdentifier() {
 
     public void setIdentifier(String identifier) {
         this.identifier = identifier;
+        //Remove cached value
+        globalId=null;
     }
 
     public boolean isIdentifierRegistered() {
@@ -304,33 +369,27 @@ public void setIdentifierRegistered(boolean identifierRegistered) {
         this.identifierRegistered = identifierRegistered;
     }  
     
-    /**
-     * 
-     * @return This object's global id in a string form.
-     * @deprecated use {@code dvobj.getGlobalId().asString()}.
-     */
-    public String getGlobalIdString() {       
-        final GlobalId globalId = getGlobalId();
-        return globalId != null ? globalId.asString() : null;
-    }
-    
     public void setGlobalId( GlobalId pid ) {
         if ( pid == null ) {
             setProtocol(null);
             setAuthority(null);
+            setSeparator(null);
             setIdentifier(null);
         } else {
+            //These reset globalId=null
             setProtocol(pid.getProtocol());
             setAuthority(pid.getAuthority());
+            setSeparator(pid.getSeparator());
             setIdentifier(pid.getIdentifier());
         }
     }
     
     public GlobalId getGlobalId() {
-        // FIXME should return NULL when the fields are null. Currenntly, 
-        //       a lot of code depends call this method, so this fix can't be 
-        //       a part of the current PR.
-        return new GlobalId(getProtocol(), getAuthority(), getIdentifier());
+        // Cache this
+        if ((globalId == null) && !(getProtocol() == null || getAuthority() == null || getIdentifier() == null)) {
+            globalId = PidUtil.parseAsGlobalID(getProtocol(), getAuthority(), getIdentifier());
+        }
+        return globalId;
     }
     
     public abstract <T> T accept(Visitor<T> v);
@@ -418,17 +477,7 @@ public String getAuthorString(){
     }
     
     public String getTargetUrl(){
-        if (this instanceof Dataverse){
-            throw new UnsupportedOperationException("Not supported yet.");
-        }
-        if (this instanceof Dataset){
-            return Dataset.TARGET_URL;
-        }
-        if (this instanceof DataFile){
-            return DataFile.TARGET_URL;
-        }
         throw new UnsupportedOperationException("Not supported yet. New DVObject Instance?");
-        
     }
     
     public String getYearPublishedCreated(){
@@ -450,13 +499,21 @@ public void setStorageIdentifier(String storageIdentifier) {
         this.storageIdentifier = storageIdentifier;
     }
     
+    public StorageQuota getStorageQuota() {
+        return storageQuota;
+    }
+    
+    public void setStorageQuota(StorageQuota storageQuota) {
+        this.storageQuota = storageQuota;
+    }
     /**
      * 
      * @param other 
      * @return {@code true} iff {@code other} is {@code this} or below {@code this} in the containment hierarchy.
      */
     public abstract boolean isAncestorOf( DvObject other );
-    
+
     @OneToMany(mappedBy = "definitionPoint",cascade={ CascadeType.REMOVE, CascadeType.MERGE,CascadeType.PERSIST}, orphanRemoval=true)
     List<RoleAssignment> roleAssignments;
+    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObjectContainer.java b/src/main/java/edu/harvard/iq/dataverse/DvObjectContainer.java
index e40eb1c2a3a..0fc43d391ce 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DvObjectContainer.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DvObjectContainer.java
@@ -1,6 +1,19 @@
 package edu.harvard.iq.dataverse;
 
-import javax.persistence.MappedSuperclass;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.storageuse.StorageUse;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.*;
+
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * A {@link DvObject} that can contain other {@link DvObject}s.
@@ -9,7 +22,9 @@
  */
 @MappedSuperclass
 public abstract class DvObjectContainer extends DvObject {
-	
+    
+    public static final String UNDEFINED_CODE = "undefined"; //Used in dataverse.xhtml as a non-null selection option value (indicating inheriting the default)
+    
     public void setOwner(Dataverse owner) {
         super.setOwner(owner);
     }
@@ -26,4 +41,243 @@ public boolean isEffectivelyPermissionRoot() {
         return isPermissionRoot() || (getOwner() == null);
     }
 
+    private String storageDriver=null;
+    
+    private String metadataLanguage=null;
+    
+    private Boolean guestbookAtRequest = null;
+    
+    private String pidGeneratorSpecs = null;
+    
+    @Transient
+    private PidProvider pidGenerator = null;
+   
+    @OneToOne(mappedBy = "dvObjectContainer",cascade={ CascadeType.REMOVE, CascadeType.PERSIST}, orphanRemoval=true)
+    private StorageUse storageUse;
+
+    @Column( nullable = true )
+    private Integer datasetFileCountLimit;
+    
+    public String getEffectiveStorageDriverId() {
+        String id = storageDriver;
+        if (StringUtils.isBlank(id)) {
+            if (this.getOwner() != null) {
+                id = this.getOwner().getEffectiveStorageDriverId();
+            } else {
+                id = DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER;
+            }
+        }
+        return id;
+    }
+    
+    public String getStorageDriverId() {
+        if (storageDriver == null) {
+            return DataAccess.UNDEFINED_STORAGE_DRIVER_IDENTIFIER;
+        }
+        return storageDriver;
+    }
+
+    public void setStorageDriverId(String storageDriver) {
+        if (storageDriver != null && storageDriver.equals(DataAccess.UNDEFINED_STORAGE_DRIVER_IDENTIFIER)) {
+            this.storageDriver = null;
+        } else {
+            this.storageDriver = storageDriver;
+        }
+    }
+    
+    public String getEffectiveMetadataLanguage() {
+        String ml = metadataLanguage;
+        if (StringUtils.isBlank(ml)) {
+            if (this.getOwner() != null) {
+                ml = this.getOwner().getEffectiveMetadataLanguage();
+            } else {
+                ml = UNDEFINED_CODE;
+            }
+        }
+        return ml;
+    }
+    
+    public String getMetadataLanguage() {
+        if (metadataLanguage == null) {
+            return UNDEFINED_CODE;
+        }
+        return metadataLanguage;
+    }
+
+    public void setMetadataLanguage(String ml) {
+        if (ml != null && ml.equals(UNDEFINED_CODE)) {
+            this.metadataLanguage = null;
+        } else {
+            this.metadataLanguage = ml;
+        }
+    }
+    
+    public static boolean isMetadataLanguageSet(String mdLang) {
+        return mdLang!=null && !mdLang.equals(UNDEFINED_CODE);
+    }
+    
+    public boolean getEffectiveGuestbookEntryAtRequest() {
+        boolean gbAtRequest = false;
+        if (guestbookAtRequest==null) {
+            if (this.getOwner() != null) {
+                gbAtRequest = this.getOwner().getEffectiveGuestbookEntryAtRequest();
+            } else {
+                Optional<Boolean> opt = JvmSettings.GUESTBOOK_AT_REQUEST.lookupOptional(Boolean.class);
+                if (opt.isPresent()) {
+                gbAtRequest = opt.get();
+                }
+            }
+        } else {
+            gbAtRequest = guestbookAtRequest;
+        }
+        return gbAtRequest;
+    }
+    
+    public String getGuestbookEntryAtRequest() {
+        if(guestbookAtRequest==null) {
+            return UNDEFINED_CODE;
+        }
+        return Boolean.valueOf(guestbookAtRequest).toString();
+    }
+
+    public void setGuestbookEntryAtRequest(String gbAtRequest) {
+        if (gbAtRequest == null || gbAtRequest.equals(UNDEFINED_CODE)) {
+            this.guestbookAtRequest = null;
+        } else {
+            //Force to true or false
+            this.guestbookAtRequest = Boolean.valueOf(Boolean.parseBoolean(gbAtRequest));
+        }
+    }
+    
+
+    /* Dataverse collections can be configured to allow use of Curation labels and have this inheritable value to decide which set of labels to use.
+     * This mechanism is similar to that for the storageDriver except that there is an addition option to disable use of labels. 
+     */
+    private String externalLabelSetName = null;
+
+    public String getEffectiveCurationLabelSetName() {
+        String setName = externalLabelSetName;
+        if (StringUtils.isBlank(setName) || setName.equals(SystemConfig.DEFAULTCURATIONLABELSET)) {
+            if (this.getOwner() != null) {
+                setName = this.getOwner().getEffectiveCurationLabelSetName();
+            } else {
+                setName = SystemConfig.CURATIONLABELSDISABLED;
+            }
+        }
+        return setName;
+    }
+
+    public String getCurationLabelSetName() {
+        if (externalLabelSetName == null) {
+            return SystemConfig.DEFAULTCURATIONLABELSET;
+        }
+        return externalLabelSetName;
+    }
+
+    public void setCurationLabelSetName(String setName) {
+        this.externalLabelSetName = setName;
+    }
+    
+    /**
+     * Should only be used in constructors for DvObjectContainers (Datasets and 
+     * Collections), to make sure new entries are created and persisted in the 
+     * database StorageUse table for every DvObject container we create.
+     * @param storageUse 
+     */
+    public void setStorageUse(StorageUse storageUse) {
+        this.storageUse = storageUse;
+    }
+
+    
+    /* Dataverse collections and dataset can be configured to use different PidProviders as PID generators for contained objects (datasets or data files). 
+     * This mechanism is similar to others except that the stored value is a JSON object defining the protocol, authority, shoulder, and, optionally, the separator for the PidProvider. 
+     */
+        
+    public String getPidGeneratorSpecs() {
+        return pidGeneratorSpecs;
+    }
+
+    public void setPidGeneratorSpecs(String pidGeneratorSpecs) {
+        this.pidGeneratorSpecs = pidGeneratorSpecs;
+    }
+
+    // Used in JSF when selecting the PidGenerator
+    // It only returns an id if this dvObjectContainer has PidGenerator specs set on it, otherwise it returns "default" 
+    public String getPidGeneratorId() {
+        if (StringUtils.isBlank(getPidGeneratorSpecs())) {
+            return "default";
+        } else {
+            return getEffectivePidGenerator().getId();
+        }
+    }
+   
+    //Used in JSF when setting the PidGenerator
+    public void setPidGeneratorId(String pidGeneratorId) {
+        // Note that the "default" provider will not be found so will result in
+        // setPidGenerator(null), which unsets the pidGenerator/Specs as desired
+        setPidGenerator(PidUtil.getPidProvider(pidGeneratorId));
+    }
+
+    public void setPidGenerator(PidProvider pidGenerator) {
+        this.pidGenerator = pidGenerator;
+        if (pidGenerator != null) {
+            JsonObjectBuilder job = jakarta.json.Json.createObjectBuilder();
+            this.pidGeneratorSpecs = job.add("protocol", pidGenerator.getProtocol())
+                    .add("authority", pidGenerator.getAuthority()).add("shoulder", pidGenerator.getShoulder())
+                    .add("separator", pidGenerator.getSeparator()).build().toString();
+        } else {
+            this.pidGeneratorSpecs = null;
+        }
+    }
+
+    public PidProvider getEffectivePidGenerator() {
+        if (pidGenerator == null) {
+            String specs = getPidGeneratorSpecs();
+            if (StringUtils.isBlank(specs)) {
+                GlobalId pid = getGlobalId();
+                if ((pid != null) && PidUtil.getPidProvider(pid.getProviderId()).canCreatePidsLike(pid)) {
+                    pidGenerator = PidUtil.getPidProvider(pid.getProviderId());
+                } else {
+                    if (getOwner() != null) {
+                        pidGenerator = getOwner().getEffectivePidGenerator();
+                    }
+                }
+            } else {
+                JsonObject providerSpecs = JsonUtil.getJsonObject(specs);
+                if (providerSpecs.containsKey("separator")) {
+                    pidGenerator = PidUtil.getPidProvider(providerSpecs.getString("protocol"),
+                            providerSpecs.getString("authority"), providerSpecs.getString("shoulder"),
+                            providerSpecs.getString("separator"));
+                } else {
+                    pidGenerator = PidUtil.getPidProvider(providerSpecs.getString("protocol"),
+                            providerSpecs.getString("authority"), providerSpecs.getString("shoulder"));
+                }
+            }
+            if(pidGenerator!=null && pidGenerator.canManagePID()) {
+                setPidGenerator(pidGenerator);
+            } else {
+                setPidGenerator(null);
+            }
+        }
+        return pidGenerator;
+    }
+    public Integer getDatasetFileCountLimit() {
+        return datasetFileCountLimit;
+    }
+    public void setDatasetFileCountLimit(Integer datasetFileCountLimit) {
+        this.datasetFileCountLimit = datasetFileCountLimit != null && datasetFileCountLimit < 0 ? null : datasetFileCountLimit;
+    }
+
+    public Integer getEffectiveDatasetFileCountLimit() {
+        if (!isDatasetFileCountLimitSet(getDatasetFileCountLimit()) && getOwner() != null) {
+            return getOwner().getEffectiveDatasetFileCountLimit();
+        } else if (!isDatasetFileCountLimitSet(getDatasetFileCountLimit())) {
+                Optional<Integer> opt = JvmSettings.DEFAULT_DATASET_FILE_COUNT_LIMIT.lookupOptional(Integer.class);
+                return (opt.isPresent()) ? opt.get() : null;
+        }
+        return getDatasetFileCountLimit();
+    }
+    public boolean isDatasetFileCountLimitSet(Integer datasetFileCountLimit) {
+        return datasetFileCountLimit != null && datasetFileCountLimit >= 0;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java
index 25f1d10f13f..91c507774e9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java
@@ -1,6 +1,9 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
@@ -10,17 +13,20 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import org.apache.commons.lang.StringUtils;
-import org.ocpsoft.common.util.Strings;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import static jakarta.ejb.TransactionAttributeType.REQUIRES_NEW;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.StoredProcedureQuery;
+
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Your goto bean for everything {@link DvObject}, that's not tied to any
@@ -35,6 +41,9 @@ public class DvObjectServiceBean implements java.io.Serializable {
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
     
+    @EJB
+    PidProviderFactoryBean pidProviderFactoryBean;
+    
     private static final Logger logger = Logger.getLogger(DvObjectServiceBean.class.getCanonicalName());
     /**
      * @param dvoc The object we check
@@ -72,49 +81,129 @@ public List<DvObject> findByAuthenticatedUserId(AuthenticatedUser user) {
         query.setParameter("releaseUserId", user.getId());
         return query.getResultList();
     }
+    
+    public String getDtype(Long id) {
+        Query query = em.createNativeQuery("SELECT dvo.dtype FROM dvobject dvo WHERE dvo.id=?");
+        query.setParameter(1, id);
+        try {
+            return (String) query.getSingleResult();
+        } catch (NoResultException e) {
+            return null;
+        }
+    }
+
+    public DvObject findByGlobalId(String globalIdString, DvObject.DType dtype) {
+        try {
+            GlobalId gid = PidUtil.parseAsGlobalID(globalIdString);
+            return findByGlobalId(gid, dtype);
+        } catch (IllegalArgumentException iae) {
+            logger.fine("Invalid identifier: " + globalIdString);
+            return null;
+        }
 
-    // FIXME This type-by-string has to go, in favor of passing a class parameter.
-    public DvObject findByGlobalId(String globalIdString, String typeString) {
-        return findByGlobalId(globalIdString, typeString, false);
     }
     
-        // FIXME This type-by-string has to go, in favor of passing a class parameter.
-    public DvObject findByGlobalId(String globalIdString, String typeString, Boolean altId) {
-
+    public DvObject findByAltGlobalId(String globalIdString, DvObject.DType dtype) {
         try {
-            GlobalId gid = new GlobalId(globalIdString);
+            GlobalId gid = PidUtil.parseAsGlobalID(globalIdString);
+            return findByAltGlobalId(gid, dtype);
+        } catch (IllegalArgumentException iae) {
+            logger.fine("Invalid alternate identifier: " + globalIdString);
+            return null;
+        }
 
-            DvObject foundDvObject = null;
-            try {
-                Query query;                                
-                if (altId) {
-                   query = em.createNamedQuery("DvObject.findByAlternativeGlobalId"); 
-                } else{
-                   query = em.createNamedQuery("DvObject.findByGlobalId");
-                }
-                query.setParameter("identifier", gid.getIdentifier());
-                query.setParameter("protocol", gid.getProtocol());
-                query.setParameter("authority", gid.getAuthority());
-                query.setParameter("dtype", typeString);
-                foundDvObject = (DvObject) query.getSingleResult();
-            } catch (javax.persistence.NoResultException e) {
-                // (set to .info, this can fill the log file with thousands of
-                // these messages during a large harvest run)
-                logger.fine("no dvObject found: " + globalIdString);
-                // DO nothing, just return null.
-                return null;
-            } catch (Exception ex) {
-                logger.info("Exception caught in findByGlobalId: " + ex.getLocalizedMessage());
-                return null;
-            }
-            return foundDvObject;
+    }
 
-        } catch (IllegalArgumentException iae) {
-            logger.info("Invalid identifier: " + globalIdString);
+    public DvObject findByGlobalId(GlobalId globalId, DvObject.DType dtype) {
+        Query query = em.createNamedQuery("DvObject.findByGlobalId");
+        return runFindByGlobalId(query, globalId, dtype);
+    }
+
+    public DvObject findByAltGlobalId(GlobalId globalId, DvObject.DType dtype) {
+        Query query = em.createNamedQuery("DvObject.findByAlternativeGlobalId");
+        return runFindByGlobalId(query, globalId, dtype);
+    }
+
+    public Long findIdByGlobalId(GlobalId globalId, DvObject.DType dtype) {
+        Query query = em.createNamedQuery("DvObject.findIdByGlobalId");
+        return runFindIdByGlobalId(query, globalId, dtype);
+    }
+
+    public Long findIdByAltGlobalId(GlobalId globalId, DvObject.DType dtype) {
+        Query query = em.createNamedQuery("DvObject.findIdByAlternativeGlobalId");
+        return runFindIdByGlobalId(query, globalId, dtype);
+    }
+
+    private DvObject runFindByGlobalId(Query query, GlobalId gid, DvObject.DType dtype) {
+        DvObject foundDvObject = null;
+        try {
+            query.setParameter("identifier", gid.getIdentifier());
+            query.setParameter("protocol", gid.getProtocol());
+            query.setParameter("authority", gid.getAuthority());
+            query.setParameter("dtype", dtype.getDType());
+            foundDvObject = (DvObject) query.getSingleResult();
+        } catch (NoResultException e) {
+            // (set to .info, this can fill the log file with thousands of
+            // these messages during a large harvest run)
+            logger.fine("no dvObject found: " + gid.asString());
+            // DO nothing, just return null.
+            return null;
+        } catch (Exception ex) {
+            logger.info("Exception caught in findByGlobalId: " + ex.getLocalizedMessage());
             return null;
         }
+        return foundDvObject;
     }
 
+    private Long runFindIdByGlobalId(Query query, GlobalId gid, DvObject.DType dtype) {
+        Long foundDvObject = null;
+        try {
+            query.setParameter("identifier", gid.getIdentifier());
+            query.setParameter("protocol", gid.getProtocol());
+            query.setParameter("authority", gid.getAuthority());
+            query.setParameter("dtype", dtype.getDType());
+            foundDvObject = (Long) query.getSingleResult();
+        } catch (NoResultException e) {
+            // (set to .info, this can fill the log file with thousands of
+            // these messages during a large harvest run)
+            logger.fine("no dvObject found: " + gid.asString());
+            // DO nothing, just return null.
+            return null;
+        } catch (Exception ex) {
+            logger.info("Exception caught in findByGlobalId: " + ex.getLocalizedMessage());
+            return null;
+        }
+        return foundDvObject;
+    }
+    
+    public DvObject findByGlobalId(GlobalId globalId) {
+        try {
+            return (DvObject) em.createNamedQuery("DvObject.findByProtocolIdentifierAuthority")
+                    .setParameter("identifier", globalId.getIdentifier())
+                    .setParameter("authority", globalId.getAuthority()).setParameter("protocol", globalId.getProtocol())
+                    .getSingleResult();
+        } catch (NoResultException nre) {
+            return null;
+        }
+    }
+    
+    public boolean isGlobalIdLocallyUnique(GlobalId globalId) {
+        return em.createNamedQuery("DvObject.findByProtocolIdentifierAuthority")
+            .setParameter("identifier", globalId.getIdentifier())
+            .setParameter("authority", globalId.getAuthority())
+            .setParameter("protocol", globalId.getProtocol())
+            .getResultList().isEmpty();
+    }
+
+    public boolean isGlobalIdLocallyUniqueAlternativeIds(GlobalId globalId) {
+        return em.createNamedQuery("AlternativePersistentIdentifier.findByProtocolIdentifierAuthority")
+                .setParameter("identifier", globalId.getIdentifier())
+                .setParameter("authority", globalId.getAuthority())
+                .setParameter("protocol", globalId.getProtocol())
+                .getResultList().isEmpty();
+    }
+
+
     public DvObject updateContentIndexTime(DvObject dvObject) {
         /**
          * @todo to avoid a possible OptimisticLockException, should we merge
@@ -251,7 +340,7 @@ public Map<Long, String> getObjectPathsByIds(Set<Long> objectIds){
             return null;
         }
         
-        String datasetIdStr = Strings.join(objectIds, ", ");
+        String datasetIdStr = StringUtils.join(objectIds, ", ");
         
         String qstr = "WITH RECURSIVE path_elements AS ((" +
             " SELECT id, owner_id FROM dvobject WHERE id in (" + datasetIdStr + "))" +
@@ -311,4 +400,26 @@ public Map<Long, String> getObjectPathsByIds(Set<Long> objectIds){
         }
         return ret;        
     }
+    
+    public String generateNewIdentifierByStoredProcedure() {
+        StoredProcedureQuery query = this.em.createNamedStoredProcedureQuery("Dataset.generateIdentifierFromStoredProcedure");
+        query.execute();
+        return (String) query.getOutputParameterValue(1);
+    }
+    
+    /** @deprecated Backward-compatibility method to get the effective pid generator for a DvObjectContainer.
+     * If the dvObjectContainer method fails, this method will check for the old global default settings.
+     * If/when those are no longer supported, this method can be removed and replaced with calls directly 
+     * to dvObjectContainer.getEffectivePidGenerator();
+     * 
+     */
+    @Deprecated(forRemoval = true, since = "2024-02-09")
+    public PidProvider getEffectivePidGenerator(DvObjectContainer dvObjectContainer) {
+        PidProvider pidGenerator = dvObjectContainer.getEffectivePidGenerator();
+        if (pidGenerator == null) {
+            pidGenerator = pidProviderFactoryBean.getDefaultPidGenerator();
+        }
+        return pidGenerator;
+    }
+    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/EMailValidator.java b/src/main/java/edu/harvard/iq/dataverse/EMailValidator.java
deleted file mode 100644
index 4091c9dfee9..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/EMailValidator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-import edu.harvard.iq.dataverse.util.BundleUtil;
-import org.apache.commons.validator.routines.EmailValidator;
-
-/**
- *
- * @author skraffmi
- */
-public class EMailValidator implements ConstraintValidator<ValidateEmail, String> {
-
-    @Override
-    public void initialize(ValidateEmail constraintAnnotation) {
-
-    }
-
-    @Override
-    public boolean isValid(String value, ConstraintValidatorContext context) {
-        
-        return isEmailValid(value, context);
-
-        
-    }
-    
-    public static boolean isEmailValid(String value, ConstraintValidatorContext context) {
-        //this null check is not needed any more as the null check is done in datasetfieldvaluevalidator
-//        if (value == null) {
-//            //A null email id is not valid, as email is a required field.
-//            return false;
-//        }
-        boolean isValid = EmailValidator.getInstance().isValid(value);
-        if (!isValid) {
-            if (context != null) {
-                context.buildConstraintViolationWithTemplate(value + "  " + BundleUtil.getStringFromBundle("email.invalid")).addConstraintViolation();
-            }
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDataFilesPageHelper.java b/src/main/java/edu/harvard/iq/dataverse/EditDataFilesPageHelper.java
new file mode 100644
index 00000000000..883baeedef4
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/EditDataFilesPageHelper.java
@@ -0,0 +1,50 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.file.CreateDataFileResult;
+import org.apache.commons.text.StringEscapeUtils;
+
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * @author adaybujeda
+ */
+@Stateless
+public class EditDataFilesPageHelper {
+
+    public static final String MAX_ERRORS_TO_DISPLAY_SETTING = ":CreateDataFilesMaxErrorsToDisplay";
+    public static final Integer MAX_ERRORS_TO_DISPLAY = 5;
+
+    @Inject
+    private SettingsWrapper settingsWrapper;
+
+    public String consolidateHtmlErrorMessages(List<String> errorMessages) {
+        if(errorMessages == null || errorMessages.isEmpty()) {
+            return null;
+        }
+
+        return String.join("</br>", errorMessages);
+    }
+
+    public String getHtmlErrorMessage(CreateDataFileResult createDataFileResult) {
+        List<String> errors = createDataFileResult.getErrors();
+        if(errors == null || errors.isEmpty()) {
+            return null;
+        }
+
+        Integer maxErrorsToShow = settingsWrapper.getInteger(EditDataFilesPageHelper.MAX_ERRORS_TO_DISPLAY_SETTING, EditDataFilesPageHelper.MAX_ERRORS_TO_DISPLAY);
+        if(maxErrorsToShow < 1) {
+            return null;
+        }
+
+        String typeMessage = Optional.ofNullable(BundleUtil.getStringFromBundle(createDataFileResult.getBundleKey(), Arrays.asList(createDataFileResult.getFilename()))).orElse("Error processing file");
+        String errorsMessage = errors.stream().limit(maxErrorsToShow).map(text -> String.format("<li>%s</li>", StringEscapeUtils.escapeHtml4(text))).collect(Collectors.joining());
+        return String.format("%s<br /><ul>%s</ul>", typeMessage, errorsMessage);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
index 8a104d1ddd0..3fa1c8b2c10 100644
--- a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
@@ -1,91 +1,98 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.provenance.ProvPopupFragmentBean;
+import edu.harvard.iq.dataverse.DataFile.ChecksumType;
 import edu.harvard.iq.dataverse.api.AbstractApiBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
 import edu.harvard.iq.dataverse.datasetutility.AddReplaceFileHelper;
+import edu.harvard.iq.dataverse.datasetutility.FileSizeChecker;
 import edu.harvard.iq.dataverse.datasetutility.FileReplaceException;
 import edu.harvard.iq.dataverse.datasetutility.FileReplacePageHelper;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.DataAccessOption;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
+import edu.harvard.iq.dataverse.dataaccess.S3AccessIO;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleUtil;
 import edu.harvard.iq.dataverse.datacapturemodule.ScriptRequestResponse;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteDataFileCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RequestRsyncScriptCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetThumbnailCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDataFilesCommand;
 import edu.harvard.iq.dataverse.ingest.IngestRequest;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
 import edu.harvard.iq.dataverse.ingest.IngestUtil;
-import edu.harvard.iq.dataverse.search.FileView;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.Setting;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.storageuse.UploadSessionQuotaLimit;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.WebloaderUtil;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.EjbUtil;
+import edu.harvard.iq.dataverse.util.FileMetadataUtil;
+
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
+import edu.harvard.iq.dataverse.util.file.CreateDataFileResult;
 import org.primefaces.event.FileUploadEvent;
-import org.primefaces.model.UploadedFile;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonArray;
-import javax.json.JsonReader;
-import org.apache.commons.httpclient.HttpClient;
+import org.primefaces.model.file.UploadedFile;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonReader;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.httpclient.methods.GetMethod;
-import java.text.DateFormat;
 import java.util.Arrays;
-import java.util.HashSet;
-import java.util.ResourceBundle;
+import java.util.Collection;
 import java.util.Set;
 import java.util.logging.Level;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.ValueChangeEvent;
-import javax.faces.validator.ValidatorException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import org.apache.commons.lang.StringUtils;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.faces.event.FacesEvent;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.mutable.MutableBoolean;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.HttpEntity;
 import org.primefaces.PrimeFaces;
-//import org.primefaces.context.RequestContext;
 
 /**
  *
@@ -96,14 +103,16 @@
 public class EditDatafilesPage implements java.io.Serializable {
 
     private static final Logger logger = Logger.getLogger(EditDatafilesPage.class.getCanonicalName());
-    private FileView fileView;
-    private boolean uploadWarningMessageIsNotAnError;
 
     public enum FileEditMode {
 
-        EDIT, UPLOAD, CREATE, SINGLE, SINGLE_REPLACE
+        EDIT, UPLOAD, CREATE, REPLACE
     };
-    
+
+    public enum Referrer {
+        DATASET, FILE
+    };
+
     @EJB
     DatasetServiceBean datasetService;
     @EJB
@@ -134,50 +143,76 @@ public enum FileEditMode {
     IndexServiceBean indexService;
     @Inject
     DataverseRequestServiceBean dvRequestService;
-    @Inject PermissionsWrapper permissionsWrapper;
-    @Inject FileDownloadHelper fileDownloadHelper;
-    @Inject ProvPopupFragmentBean provPopupFragmentBean;
+    @Inject
+    PermissionsWrapper permissionsWrapper;
+    @Inject
+    FileDownloadHelper fileDownloadHelper;
+    @Inject
+    ProvPopupFragmentBean provPopupFragmentBean;
     @Inject
     SettingsWrapper settingsWrapper;
-    private final DateFormat displayDateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM);
+    @Inject
+    LicenseServiceBean licenseServiceBean;
+    @Inject
+    DataFileCategoryServiceBean dataFileCategoryService;
+    @Inject
+    EditDataFilesPageHelper editDataFilesPageHelper;
 
     private Dataset dataset = new Dataset();
-    
-    private FileReplacePageHelper fileReplacePageHelper;
 
+    private FileReplacePageHelper fileReplacePageHelper;
 
-    private String selectedFileIdsString = null; 
-    private FileEditMode mode = FileEditMode.EDIT; 
-    private List<Long> selectedFileIdsList = new ArrayList<>(); 
-    private List<FileMetadata> fileMetadatas = new ArrayList<>();;
+    private String selectedFileIdsString = null;
+    private FileEditMode mode;
+    private Referrer referrer = Referrer.DATASET;
+    private List<Long> selectedFileIdsList = new ArrayList<>();
+    private List<FileMetadata> fileMetadatas = new ArrayList<>();
+    ;
 
     
     private Long ownerId;
     private Long versionId;
     private List<DataFile> newFiles = new ArrayList<>();
     private List<DataFile> uploadedFiles = new ArrayList<>();
+    private List<DataFile> uploadedInThisProcess = new ArrayList<>();
+
     private DatasetVersion workingVersion;
     private DatasetVersion clone;
     private String dropBoxSelection = "";
     private String displayCitation;
-    private boolean tabularDataTagsUpdated = false; 
-    
+    private boolean tabularDataTagsUpdated = false;
+
     private String persistentId;
-    
+
     private String versionString = "";
-            
-    
-    private boolean saveEnabled = false; 
+
+    private boolean saveEnabled = false;
 
     // Used to store results of permissions checks
     private final Map<String, Boolean> datasetPermissionMap = new HashMap<>(); // { Permission human_name : Boolean }
 
+    // Size limit of an individual file: (set for the storage volume used)
     private Long maxFileUploadSizeInBytes = null;
-    private Integer multipleUploadFilesLimit = null; 
-    
+    // Total amount of data that the user should be allowed to upload.
+    // Will be calculated in real time based on various level quotas - 
+    // for this user and/or this collection/dataset, etc. We should 
+    // assume that it may change during the user session.
+    private Long maxTotalUploadSizeInBytes = null;
+    private Long maxIngestSizeInBytes = null;
+    // CSV: 4.8 MB, DTA: 976.6 KB, XLSX: 5.7 MB, etc.
+    private String humanPerFormatTabularLimits = null;
+    private Integer multipleUploadFilesLimit = null;
+    // Maximum number of files per dataset allowed ot be uploaded
+    private Integer maxFileUploadCount = null;
+    private Integer fileUploadsAvailable = null;
+    
+    //MutableBoolean so it can be passed from DatasetPage, supporting DatasetPage.cancelCreate()
+    private MutableBoolean uploadInProgress = null;
+
     private final int NUMBER_OF_SCROLL_ROWS = 25;
-    
+
     private DataFile singleFile = null;
+    private UploadSessionQuotaLimit uploadSessionQuota = null; 
 
     public DataFile getSingleFile() {
         return singleFile;
@@ -186,51 +221,59 @@ public DataFile getSingleFile() {
     public void setSingleFile(DataFile singleFile) {
         this.singleFile = singleFile;
     }
-    
+
     public String getSelectedFileIds() {
         return selectedFileIdsString;
     }
-    
-    public DataFile getFileToReplace(){
-        if (!this.isFileReplaceOperation()){
+
+    public DataFile getFileToReplace() {
+        if (!this.isFileReplaceOperation()) {
             return null;
         }
-        if (this.fileReplacePageHelper == null){
+        if (this.fileReplacePageHelper == null) {
             return null;
         }
         return this.fileReplacePageHelper.getFileToReplace();
     }
-    
+
     public void setSelectedFileIds(String selectedFileIds) {
         selectedFileIdsString = selectedFileIds;
     }
-    
+
     public FileEditMode getMode() {
         return mode;
     }
-    
+
     public void setMode(FileEditMode mode) {
         this.mode = mode;
     }
-    
+
+    public Referrer getReferrer() {
+        return referrer;
+    }
+
+    public void setReferrer(Referrer referrer) {
+        this.referrer = referrer;
+    }
+
     public List<FileMetadata> getFileMetadatas() {
-        
+
         // -------------------------------------
         // Handle a Replace operation
         //  - The List<FileMetadata> comes from a different source
         // -------------------------------------
-        if (isFileReplaceOperation()){
-            if (fileReplacePageHelper.wasPhase1Successful()){
+        if (isFileReplaceOperation()) {
+            if (fileReplacePageHelper.wasPhase1Successful()) {
                 logger.fine("Replace: File metadatas 'list' of 1 from the fileReplacePageHelper.");
                 return fileReplacePageHelper.getNewFileMetadatasBeforeSave();
             } else {
                 logger.fine("Replace: replacement file not yet uploaded.");
                 return null;
-            }            
+            }
         }
-        
+
         if (fileMetadatas != null) {
-            logger.fine("Returning a list of "+fileMetadatas.size()+" file metadatas.");
+            logger.fine("Returning a list of " + fileMetadatas.size() + " file metadatas.");
         } else {
             logger.fine("File metadatas list hasn't been initialized yet.");
         }
@@ -242,14 +285,14 @@ public List<FileMetadata> getFileMetadatas() {
         //if (uploadInProgress) {
         //    return null; 
         //}
-        
+
         return fileMetadatas;
     }
-  
+
     public void setFileMetadatas(List<FileMetadata> fileMetadatas) {
         this.fileMetadatas = fileMetadatas;
     }
-    
+
     /* 
         The 2 methods below are for setting up the PrimeFaces:dataTabe component
         used to display the uploaded files, or the files selected for editing. 
@@ -270,86 +313,133 @@ When we have more than NUMBER_OF_SCROLL_ROWS worth of files (currently
           table fixed as the size of the list grows! (the "scrollRows" attribute
           of the p:dataTable component only applies when "liveScroll=true" is being
           used). 
-    */
-    
+     */
     public boolean isScrollable() {
         return !(fileMetadatas == null || fileMetadatas.size() <= NUMBER_OF_SCROLL_ROWS + 1);
     }
-    
+
     public String getScrollHeightPercentage() {
-        int perc; 
+        int perc;
         if (fileMetadatas == null || fileMetadatas.size() < NUMBER_OF_SCROLL_ROWS) {
             perc = 100;
         } else {
             perc = NUMBER_OF_SCROLL_ROWS * 100 / fileMetadatas.size();
         }
-        
+
         if (perc == 0) {
             perc = 1;
         } else if (perc > 100) {
             perc = 100;
         }
-        
-        logger.fine("scroll height percentage: "+perc);
+
+        logger.fine("scroll height percentage: " + perc);
         return perc + "%";
     }
-    
+
     /*
         Any settings, such as the upload size limits, should be saved locally - 
         so that the db doesn't get hit repeatedly. (this setting is initialized 
         in the init() method)
     
         This may be "null", signifying unlimited download size.
-    */
-    
+     */
     public Long getMaxFileUploadSizeInBytes() {
         return this.maxFileUploadSizeInBytes;
     }
-    
+
+    public String getHumanMaxFileUploadSizeInBytes() {
+        return FileSizeChecker.bytesToHumanReadable(this.maxFileUploadSizeInBytes);
+    }
+
     public boolean isUnlimitedUploadFileSize() {
-        
+
         return this.maxFileUploadSizeInBytes == null;
     }
     
+    public Long getMaxTotalUploadSizeInBytes() {
+        return maxTotalUploadSizeInBytes;
+    }
+    
+    public String getHumanMaxTotalUploadSizeInBytes() {
+        return FileSizeChecker.bytesToHumanReadable(maxTotalUploadSizeInBytes);
+    }
+    
+    public boolean isStorageQuotaEnforced() {
+        return uploadSessionQuota != null; 
+    }
+
+    public Long getMaxIngestSizeInBytes() {
+        return maxIngestSizeInBytes;
+    }
+
+    public String getHumanMaxIngestSizeInBytes() {
+        return FileSizeChecker.bytesToHumanReadable(this.maxIngestSizeInBytes);
+    }
+
+    public String getHumanPerFormatTabularLimits() {
+        return humanPerFormatTabularLimits;
+    }
+
+    public String populateHumanPerFormatTabularLimits() {
+        String keyPrefix = ":TabularIngestSizeLimit:";
+        List<String> formatLimits = new ArrayList<>();
+        for (Setting setting : settingsService.listAll()) {
+            String name = setting.getName();
+            if (!name.startsWith(keyPrefix)) {
+                continue;
+            }
+            String tabularName = setting.getName().substring(keyPrefix.length());
+            String bytes = setting.getContent();
+            String humanReadableSize = FileSizeChecker.bytesToHumanReadable(Long.valueOf(bytes));
+            formatLimits.add(tabularName + ": " + humanReadableSize);
+        }
+        return String.join(", ", formatLimits);
+    }
+
+    public Integer getFileUploadsAvailable() {
+        return fileUploadsAvailable != null ? fileUploadsAvailable : -1;
+    }
+
     /*
         The number of files the GUI user is allowed to upload in one batch, 
         via drag-and-drop, or through the file select dialog. Now configurable 
         in the Settings table. 
-    */
+     */
     public Integer getMaxNumberOfFiles() {
         return this.multipleUploadFilesLimit;
     }
+
     /**
      * Check Dataset related permissions
-     * 
+     *
      * @param permissionToCheck
-     * @return 
+     * @return
      */
-    public boolean doesSessionUserHaveDataSetPermission(Permission permissionToCheck){
-        if (permissionToCheck == null){
+    public boolean doesSessionUserHaveDataSetPermission(Permission permissionToCheck) {
+        if (permissionToCheck == null) {
             return false;
         }
-               
+
         String permName = permissionToCheck.getHumanName();
-       
+
         // Has this check already been done? 
         // 
-        if (this.datasetPermissionMap.containsKey(permName)){
+        if (this.datasetPermissionMap.containsKey(permName)) {
             // Yes, return previous answer
             return this.datasetPermissionMap.get(permName);
         }
-        
+
         // Check the permission
         //
         boolean hasPermission = this.permissionService.userOn(this.session.getUser(), this.dataset).has(permissionToCheck);
 
         // Save the permission
         this.datasetPermissionMap.put(permName, hasPermission);
-        
+
         // return true/false
         return hasPermission;
     }
-    
+
     public void reset() {
         // ?
     }
@@ -357,7 +447,7 @@ public void reset() {
     public String getGlobalId() {
         return persistentId;
     }
-        
+
     public String getPersistentId() {
         return persistentId;
     }
@@ -423,49 +513,77 @@ public void setVersionId(Long versionId) {
         this.versionId = versionId;
     }
 
-    public String initCreateMode(String modeToken, DatasetVersion version, List<DataFile> newFilesList, List<FileMetadata> selectedFileMetadatasList) {
+    public String initCreateMode(String modeToken, DatasetVersion version, MutableBoolean inProgress, List<DataFile> newFilesList, List<DataFile> uploadedFilesList, List<FileMetadata> selectedFileMetadatasList) {
         if (modeToken == null) {
             logger.fine("Request to initialize Edit Files page with null token (aborting).");
             return null;
         }
-        
+
         if (!modeToken.equals("CREATE")) {
             logger.fine("Request to initialize Edit Files page with token " + modeToken + " (aborting).");
-            return null; 
+            return null;
         }
-        
+
         logger.fine("Initializing Edit Files page in CREATE mode;");
-        
+
         if (version == null) {
             return permissionsWrapper.notFound();
         }
-        
-        this.maxFileUploadSizeInBytes = systemConfig.getMaxFileUploadSize();
-        this.multipleUploadFilesLimit = systemConfig.getMultipleUploadFilesLimit();
-        
-        workingVersion = version; 
+
+        workingVersion = version;
         dataset = version.getDataset();
         mode = FileEditMode.CREATE;
+        uploadInProgress = inProgress;
         newFiles = newFilesList;
-        uploadedFiles = new ArrayList<>();
+        uploadedFiles = uploadedFilesList;
         selectedFiles = selectedFileMetadatasList;
-        
+
+        this.maxFileUploadSizeInBytes = systemConfig.getMaxFileUploadSizeForStore(dataset.getEffectiveStorageDriverId());
+        if (systemConfig.isStorageQuotasEnforced()) {
+            this.uploadSessionQuota = datafileService.getUploadSessionQuotaLimit(dataset);
+            if (this.uploadSessionQuota != null) {
+                this.maxTotalUploadSizeInBytes = uploadSessionQuota.getRemainingQuotaInBytes();
+            }
+        } else {
+            this.maxTotalUploadSizeInBytes = null; 
+        }
+        this.maxIngestSizeInBytes = systemConfig.getTabularIngestSizeLimit();
+        this.humanPerFormatTabularLimits = populateHumanPerFormatTabularLimits();
+        this.multipleUploadFilesLimit = systemConfig.getMultipleUploadFilesLimit();
+        setFileUploadCountLimits(0);
         logger.fine("done");
-        
+
         saveEnabled = true;
-        return null; 
+        
+        return null;
+    }
+    private void setFileUploadCountLimits(int preLoaded) {
+        this.maxFileUploadCount = this.maxFileUploadCount == null ? dataset.getEffectiveDatasetFileCountLimit() : this.maxFileUploadCount;
+        Long id = dataset.getId() != null ? dataset.getId() : dataset.getOwner() != null ? dataset.getOwner().getId() : null;
+        this.fileUploadsAvailable = this.maxFileUploadCount != null && id != null ?
+                Math.max(0, this.maxFileUploadCount - datasetService.getDataFileCountByOwner(id) - preLoaded) :
+                -1;
     }
     
+    public boolean isQuotaExceeded() {
+        return systemConfig.isStorageQuotasEnforced() && uploadSessionQuota != null && uploadSessionQuota.getRemainingQuotaInBytes() == 0;
+    }
+    public boolean isFileUploadCountExceeded() {
+        boolean ignoreLimit = this.session.getUser().isSuperuser();
+        return !ignoreLimit && !isFileReplaceOperation() && fileUploadsAvailable != null && fileUploadsAvailable == 0;
+    }
 
     public String init() {
-        
+        // default mode should be EDIT
+        if (mode == null) {
+            mode = FileEditMode.EDIT;
+        }
+
         newFiles = new ArrayList<>();
-        uploadedFiles = new ArrayList<>(); 
-        
-        this.maxFileUploadSizeInBytes = systemConfig.getMaxFileUploadSize();
-        this.multipleUploadFilesLimit = systemConfig.getMultipleUploadFilesLimit();
-        
-        if (dataset.getId() != null){
+        uploadedFiles = new ArrayList<>();
+        uploadInProgress = new MutableBoolean(false);
+
+        if (dataset.getId() != null) {
             // Set Working Version and Dataset by Datasaet Id and Version
             //retrieveDatasetVersionResponse = datasetVersionService.retrieveDatasetVersionById(dataset.getId(), null);
             dataset = datasetService.find(dataset.getId());
@@ -479,32 +597,52 @@ public String init() {
             // that the dataset id is mandatory... But 404 will do for now.
             return permissionsWrapper.notFound();
         }
-                
-        workingVersion = dataset.getEditVersion();
-        clone = workingVersion.cloneDatasetVersion();
+
+        workingVersion = dataset.getOrCreateEditVersion();
+
+        //TODO: review if we we need this check; 
+        // as getEditVersion should either return the exisiting draft or create a new one      
         if (workingVersion == null || !workingVersion.isDraft()) {
             // Sorry, we couldn't find/obtain a draft version for this dataset!
             return permissionsWrapper.notFound();
         }
-        
+
         // Check if they have permission to modify this dataset: 
-        
         if (!permissionService.on(dataset).has(Permission.EditDataset)) {
             return permissionsWrapper.notAuthorized();
         }
-
+        
+        clone = workingVersion.cloneDatasetVersion();
+        this.maxFileUploadSizeInBytes = systemConfig.getMaxFileUploadSizeForStore(dataset.getEffectiveStorageDriverId());
+        if (systemConfig.isStorageQuotasEnforced()) {
+            this.uploadSessionQuota = datafileService.getUploadSessionQuotaLimit(dataset);
+            if (this.uploadSessionQuota != null) {
+                this.maxTotalUploadSizeInBytes = uploadSessionQuota.getRemainingQuotaInBytes();
+            }
+        }
+        this.maxIngestSizeInBytes = systemConfig.getTabularIngestSizeLimit();
+        this.humanPerFormatTabularLimits = populateHumanPerFormatTabularLimits();
+        this.multipleUploadFilesLimit = systemConfig.getMultipleUploadFilesLimit();
+        setFileUploadCountLimits(0);
+        hasValidTermsOfAccess = isHasValidTermsOfAccess();
+        if (!hasValidTermsOfAccess) {
+            PrimeFaces.current().executeScript("PF('blockDatasetForm').show()");
+            PrimeFaces.current().executeScript("PF('accessPopup').show()");
+            JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editTerms.label"), BundleUtil.getStringFromBundle("dataset.message.editTerms.message"));
+            return "";
+        }
         // -------------------------------------------
         //  Is this a file replacement operation?
         // -------------------------------------------
-        if (mode == FileEditMode.SINGLE_REPLACE){
+        if (mode == FileEditMode.REPLACE) {
             /*
-            http://localhost:8080/editdatafiles.xhtml?mode=SINGLE_REPLACE&datasetId=26&fid=726
-            */        
+            http://localhost:8080/editdatafiles.xhtml?mode=REPLACE&datasetId=26&fid=726
+             */
             DataFile fileToReplace = loadFileToReplace();
-            if (fileToReplace == null){
+            if (fileToReplace == null) {
                 return permissionsWrapper.notFound();
             }
-            
+
             //DataverseRequest dvRequest2 = createDataverseRequest(authUser);
             AddReplaceFileHelper addReplaceFileHelper = new AddReplaceFileHelper(dvRequestService.getDataverseRequest(),
                                                 ingestService,
@@ -515,12 +653,12 @@ public String init() {
                                                 systemConfig);
                         
             fileReplacePageHelper = new FileReplacePageHelper(addReplaceFileHelper,
-                                                dataset, 
-                                                fileToReplace);
+                    dataset,
+                    fileToReplace);
 
             populateFileMetadatas();
             singleFile = getFileToReplace();
-        }else if (mode == FileEditMode.EDIT || mode == FileEditMode.SINGLE) {
+        } else if (mode == FileEditMode.EDIT) {
 
             if (selectedFileIdsString != null) {
                 String[] ids = selectedFileIdsString.split(",");
@@ -534,7 +672,7 @@ public String init() {
                         test = null;
                     }
                     if (test != null) {
-                        if (mode == FileEditMode.SINGLE) {
+                        if (FileEditMode.EDIT == mode && Referrer.FILE == referrer) {
                             singleFile = datafileService.find(test);
                         }
                         selectedFileIdsList.add(test);
@@ -561,62 +699,52 @@ public String init() {
             if (fileMetadatas.size() < 1) {
                 return permissionsWrapper.notFound();
             }
-            
-            if (FileEditMode.SINGLE == mode){
-                if (fileMetadatas.get(0).getDatasetVersion().getId() != null){
+
+            if (FileEditMode.EDIT == mode && Referrer.FILE == referrer) {
+                if (fileMetadatas.get(0).getDatasetVersion().getId() != null) {
                     versionString = "DRAFT";
                 }
-            }           
-                       
+            }
+
         }
-        
-        saveEnabled = true; 
-        if (mode == FileEditMode.UPLOAD && workingVersion.getFileMetadatas().isEmpty() && settingsWrapper.isRsyncUpload())  {
+
+        saveEnabled = true;
+        if (mode == FileEditMode.UPLOAD && workingVersion.getFileMetadatas().isEmpty() && rsyncUploadSupported()) {
             setUpRsync();
         }
 
-        if (mode == FileEditMode.UPLOAD) {
-            if (settingsWrapper.getUploadMethodsCount() == 1){
-                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.uploadFiles.label"), BundleUtil.getStringFromBundle("dataset.message.uploadFilesSingle.message", Arrays.asList(systemConfig.getGuidesBaseUrl(), systemConfig.getGuidesVersion())));
-            } else if (settingsWrapper.getUploadMethodsCount() > 1) {
-                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.uploadFiles.label"), BundleUtil.getStringFromBundle("dataset.message.uploadFilesMultiple.message", Arrays.asList(systemConfig.getGuidesBaseUrl(), systemConfig.getGuidesVersion())));
-            }
-            
+        if (isHasPublicStore()){
+            JH.addMessage(FacesMessage.SEVERITY_WARN, getBundleString("dataset.message.label.fileAccess"), getBundleString("dataset.message.publicInstall"));
         }
-        
-        if (settingsService.isTrueForKey(SettingsServiceBean.Key.PublicInstall, false)){
-            JH.addMessage(FacesMessage.SEVERITY_WARN, getBundleString("dataset.message.publicInstall"));
-        }   
-        
+       
         return null;
     }
-    
-    
-    private void msg(String s){
+
+    private void msg(String s) {
         System.out.println(s);
     }
-    
+
     /**
      * For single file replacement, load the file to replace
-     * 
-     * @return 
+     *
+     * @return
      */
-    private DataFile loadFileToReplace(){
-        
-        Map<String, String> params =FacesContext.getCurrentInstance().
-                                getExternalContext().getRequestParameterMap();
-        
-        if (params.containsKey("fid")){
+    private DataFile loadFileToReplace() {
+
+        Map<String, String> params = FacesContext.getCurrentInstance().
+                getExternalContext().getRequestParameterMap();
+
+        if (params.containsKey("fid")) {
             String fid = params.get("fid");
-            if ((!fid.isEmpty()) && (StringUtils.isNumeric(fid))){
+            if ((!fid.isEmpty()) && (StringUtils.isNumeric(fid))) {
                 selectedFileIdsList.add(Long.parseLong(fid));
                 return datafileService.find(Long.parseLong(fid));
             }
         }
         return null;
-        
+
     } // loadFileToReplace
-    
+
     private List<FileMetadata> selectedFiles; // = new ArrayList<>();
 
     public List<FileMetadata> getSelectedFiles() {
@@ -626,7 +754,7 @@ public List<FileMetadata> getSelectedFiles() {
     public void setSelectedFiles(List<FileMetadata> selectedFiles) {
         this.selectedFiles = selectedFiles;
     }
-    
+
     private boolean selectAllFiles;
 
     public boolean isSelectAllFiles() {
@@ -636,7 +764,7 @@ public boolean isSelectAllFiles() {
     public void setSelectAllFiles(boolean selectAllFiles) {
         this.selectAllFiles = selectAllFiles;
     }
-    
+
     public String getVersionString() {
         return versionString;
     }
@@ -644,103 +772,16 @@ public String getVersionString() {
     public void setVersionString(String versionString) {
         this.versionString = versionString;
     }
-    
-    /*
-    public void toggleSelectedFiles(){
-        this.selectedFiles = new ArrayList<>();
-        if(this.selectAllFiles){
-            if (mode == FileEditMode.CREATE) {
-                for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
-                    this.selectedFiles.add(fmd);
-                }
-            } else {
-                for (FileMetadata fmd : fileMetadatas) {
-                    this.selectedFiles.add(fmd);
-                }
-            }
-        }
-    }
-    */
-    /*
-    public String getSelectedFilesIdsString() {        
-        String downloadIdString = "";
-        for (FileMetadata fmd : this.selectedFiles){
-            if (!StringUtil.isEmpty(downloadIdString)) {
-                downloadIdString += ",";
-            }
-            downloadIdString += fmd.getDataFile().getId();
-        }
-        return downloadIdString;
-      
-    }
-*/
-    /*
-    public void updateFileCounts(){
-        
-        setSelectedUnrestrictedFiles(new ArrayList<FileMetadata>());
-        setSelectedRestrictedFiles(new ArrayList<FileMetadata>());
-        for (FileMetadata fmd : this.selectedFiles){
-            if(fmd.isRestricted()){
-                getSelectedRestrictedFiles().add(fmd);
-            } else {
-                getSelectedUnrestrictedFiles().add(fmd);
-            }
-        }
-    }*/
-    
-    List<FileMetadata> previouslyRestrictedFiles = null;
-    
-    public boolean isShowAccessPopup() {
-        for (FileMetadata fmd : this.fileMetadatas) {
-            if (fmd.isRestricted()) {
-            
-                if (fmd.getDataFile().getId() == null) {
-                    // if this is a brand new file, it's definitely not 
-                    // of a previously restricted kind!
-                    return true; 
-                }
-            
-                if (previouslyRestrictedFiles != null) {
-                    boolean contains = false;
-                    for (FileMetadata fmp : previouslyRestrictedFiles) {
-                        // OK, we've already checked if it's a brand new file - 
-                        // above. So we can safely assume that this datafile
-                        // has a valid db id... so it is safe to use the 
-                        // equals() method:
-                        if (fmp.getDataFile().equals(fmd.getDataFile())) {
-                            contains = true;
-                            break;
-                        }
-                    }
-                    if (!contains) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-    
-    public void setShowAccessPopup(boolean showAccessPopup) {} // dummy set method
-     
-    //This function was reverted to its pre-commands state as the current command
-    //requires editDataset privlidges. If a non-admin user with only createDataset privlidges
-    //attempts to restrict a datafile before the dataset is created, the operation
-    //fails silently. This is because they are only granted editDataset permissions
-    //for that scope after the creation is completed.  -Matthew 4.7.1
-    public void restrictFiles(boolean restricted) throws UnsupportedOperationException{
-
-        // since we are restricted files, first set the previously restricted file list, so we can compare for
-        // determining whether to show the access popup
-        previouslyRestrictedFiles = new ArrayList<>();
-        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
-            if (fmd.isRestricted()) {
-                previouslyRestrictedFiles.add(fmd);
-            }
+
+    public void restrictFiles(boolean restricted) throws UnsupportedOperationException {
+
+        if (restricted) { // get values from access popup
+            workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(termsOfAccess);
+            workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(fileAccessRequest);
         }
-        
+
         String fileNames = null;
-        
+
         for (FileMetadata fmd : this.getSelectedFiles()) {
             if (restricted && !fmd.isRestricted()) {
                 // collect the names of the newly-restrticted files, 
@@ -752,64 +793,22 @@ public void restrictFiles(boolean restricted) throws UnsupportedOperationExcepti
                 }
             }
             fmd.setRestricted(restricted);
-            
-//            Command cmd;
-//            cmd = new RestrictFileCommand(fmd.getDataFile(), dvRequestService.getDataverseRequest(), restricted);
-//            commandEngine.submit(cmd);
-            
-                                  
+
             if (workingVersion.isDraft() && !fmd.getDataFile().isReleased()) {
                 // We do not really need to check that the working version is 
                 // a draft here - it must be a draft, if we've gotten this
                 // far. But just in case. -- L.A. 4.2.1
-                  fmd.getDataFile().setRestricted(restricted);              
-            }
-        }
-        if (fileNames != null) {
-            String successMessage = getBundleString("file.restricted.success");
-            logger.fine(successMessage);
-            successMessage = successMessage.replace("{0}", fileNames);
-            JsfHelper.addFlashMessage(successMessage);    
-        }
-    } 
-
-    public void restrictFilesDP(boolean restricted) {
-        // since we are restricted files, first set the previously restricted file list, so we can compare for
-        // determinin whether to show the access popup
-        if (previouslyRestrictedFiles == null) {
-            previouslyRestrictedFiles = new ArrayList<>();
-            for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
-                if (fmd.isRestricted()) {
-                    previouslyRestrictedFiles.add(fmd);
-                }
-            }
-        }        
-        
-        String fileNames = null;       
-        for (FileMetadata fmw : workingVersion.getFileMetadatas()) {
-            for (FileMetadata fmd : this.getSelectedFiles()) {
-                if (restricted && !fmw.isRestricted()) {
-                // collect the names of the newly-restrticted files, 
-                    // to show in the success message:
-                    if (fileNames == null) {
-                        fileNames = fmd.getLabel();
-                    } else {
-                        fileNames = fileNames.concat(", " + fmd.getLabel());
-                    }
-                }
-                if (fmd.getDataFile().equals(fmw.getDataFile())) {
-                    fmw.setRestricted(restricted);
-                }
+                fmd.getDataFile().setRestricted(restricted);
             }
         }
         if (fileNames != null) {
             String successMessage = getBundleString("file.restricted.success");
             logger.fine(successMessage);
             successMessage = successMessage.replace("{0}", fileNames);
-            JsfHelper.addFlashMessage(successMessage);    
+            JsfHelper.addSuccessMessage(successMessage);
         }
-    } 
-    
+    }
+
     public int getRestrictedFileCount() {
         int restrictedFileCount = 0;
         for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
@@ -823,45 +822,92 @@ public int getRestrictedFileCount() {
 
     private List<FileMetadata> filesToBeDeleted = new ArrayList<>();
 
-    
-    public void deleteReplacementFile() throws FileReplaceException{
-        if (!isFileReplaceOperation()){
-            throw new FileReplaceException("Only use this for File Replace Operations");            
+    public void deleteReplacementFile() throws FileReplaceException {
+        if (!isFileReplaceOperation()) {
+            throw new FileReplaceException("Only use this for File Replace Operations");
         }
 
-        if (!fileReplacePageHelper.wasPhase1Successful()){
-            throw new FileReplaceException("Should only be called if Phase 1 was successful");                        
+        if (!fileReplacePageHelper.wasPhase1Successful()) {
+            throw new FileReplaceException("Should only be called if Phase 1 was successful");
         }
-        
-        fileReplacePageHelper.resetReplaceFileHelper();
 
+        fileReplacePageHelper.resetReplaceFileHelper();
 
-        
         String successMessage = getBundleString("file.deleted.replacement.success");
         logger.fine(successMessage);
         JsfHelper.addFlashMessage(successMessage);
-        
+
+    }
+
+    private Boolean hasValidTermsOfAccess = null;
+
+    public Boolean isHasValidTermsOfAccess() {
+        //cache in page to limit processing
+        if (hasValidTermsOfAccess != null) {
+            return hasValidTermsOfAccess;
+        } else {
+            if (!isHasRestrictedFiles()) {
+                hasValidTermsOfAccess = true;
+                return hasValidTermsOfAccess;
+            } else {
+                hasValidTermsOfAccess = TermsOfUseAndAccessValidator.isTOUAValid(workingVersion.getTermsOfUseAndAccess(), null);
+                return hasValidTermsOfAccess;
+            }
+        }
     }
     
+    public boolean getHasValidTermsOfAccess(){
+        return isHasValidTermsOfAccess(); //HasValidTermsOfAccess
+    }
     
+    public void setHasValidTermsOfAccess(boolean value){
+        //dummy for ui
+    }
+
+    private Boolean hasRestrictedFiles = null;
+
+    public Boolean isHasRestrictedFiles() {
+        //cache in page to limit processing
+        if (hasRestrictedFiles != null) {
+            return hasRestrictedFiles;
+        } else {
+            hasRestrictedFiles = workingVersion.isHasRestrictedFile();
+            return hasRestrictedFiles;
+        }
+    }
+
     /**
-     * 
+     *
      * @param msgName - from the bundle e.g. "file.deleted.success"
-     * @return 
+     * @return
      */
-    private String getBundleString(String msgName){
-        
-       return BundleUtil.getStringFromBundle(msgName);
+    private String getBundleString(String msgName) {
+
+        return BundleUtil.getStringFromBundle(msgName);
     }
-    
+
     // This deleteFilesCompleted method is used in editFilesFragment.xhtml
-    public void deleteFilesCompleted(){
-        
+    public void deleteFilesCompleted() {
+
     }
-        
+
     public void deleteFiles() {
+        deleteFiles(this.selectedFiles);
+    }
+
+    public void deleteDuplicateFiles() {
+        List<FileMetadata> filesForDelete = new ArrayList();
+        for (DataFile df : newFiles) {
+            if (df.isMarkedAsDuplicate()) {
+                filesForDelete.add(df.getFileMetadata());
+            }
+        }
+        deleteFiles(filesForDelete);
+    }
+
+    private void deleteFiles(List<FileMetadata> filesForDelete) {
         logger.fine("entering bulk file delete (EditDataFilesPage)");
-        if (isFileReplaceOperation()){
+        if (isFileReplaceOperation()) {
             try {
                 deleteReplacementFile();
             } catch (FileReplaceException ex) {
@@ -869,10 +915,16 @@ public void deleteFiles() {
             }
             return;
         }
-        
+
+        /*
+        If selected files are empty it means that we are dealing 
+        with a duplicate files delete situation
+        so we are adding the marked as dup files as selected
+        and moving on accordingly.
+         */
         String fileNames = null;
-        for (FileMetadata fmd : this.getSelectedFiles()) {
-                // collect the names of the files, 
+        for (FileMetadata fmd : filesForDelete) {
+            // collect the names of the files, 
             // to show in the success message:
             if (fileNames == null) {
                 fileNames = fmd.getLabel();
@@ -881,29 +933,33 @@ public void deleteFiles() {
             }
         }
 
-        for (FileMetadata markedForDelete : this.getSelectedFiles()) {
-            logger.fine("delete requested on file "+markedForDelete.getLabel());
-            logger.fine("file metadata id: "+markedForDelete.getId());
-            logger.fine("datafile id: "+markedForDelete.getDataFile().getId());
-            logger.fine("page is in edit mode "+mode.name());
-            
-                // has this filemetadata been saved already? (or is it a brand new
-                // filemetadata, created as part of a brand new version, created when 
-                // the user clicked 'delete', that hasn't been saved in the db yet?)
-                if (markedForDelete.getId() != null) {
-                    logger.fine("this is a filemetadata from an existing draft version");
+        for (FileMetadata markedForDelete : filesForDelete) {
+            logger.fine("delete requested on file " + markedForDelete.getLabel());
+            logger.fine("file metadata id: " + markedForDelete.getId());
+            logger.fine("datafile id: " + markedForDelete.getDataFile().getId());
+            logger.fine("page is in edit mode " + mode.name());
+
+            // has this filemetadata been saved already? (or is it a brand new
+            // filemetadata, created as part of a brand new version, created when 
+            // the user clicked 'delete', that hasn't been saved in the db yet?)
+            if (markedForDelete.getId() != null) {
+                logger.fine("this is a filemetadata from an existing draft version");
                 // so all we remove is the file from the fileMetadatas (from the
                 // file metadatas attached to the editVersion, and from the
                 // display list of file metadatas that are being edited)
                 // and let the delete be handled in the command (by adding it to the
                 // filesToBeDeleted list):
 
-                    dataset.getEditVersion().getFileMetadatas().remove(markedForDelete);
-                    fileMetadatas.remove(markedForDelete);
-                    filesToBeDeleted.add(markedForDelete);
-                } else {
-                    logger.fine("this is a brand-new (unsaved) filemetadata");
-                    // ok, this is a brand-new DRAFT version. 
+                // ToDo - FileMetadataUtil.removeFileMetadataFromList should handle these two
+                // removes so they could be put after this if clause and the else clause could
+                // be removed.
+                dataset.getOrCreateEditVersion().getFileMetadatas().remove(markedForDelete);
+                fileMetadatas.remove(markedForDelete);
+
+                filesToBeDeleted.add(markedForDelete);
+            } else {
+                logger.fine("this is a brand-new (unsaved) filemetadata");
+                // ok, this is a brand-new DRAFT version. 
 
                 // if (mode != FileEditMode.CREATE) {
                 // If the bean is in the 'CREATE' mode, the page is using
@@ -911,113 +967,59 @@ public void deleteFiles() {
                 // so there's no need to delete this meta from the local
                 // fileMetadatas list. (but doing both just adds a no-op and won't cause an
                 // error)
-
-                    // 1. delete the filemetadata from the local display list: 
-                removeFileMetadataFromList(fileMetadatas, markedForDelete);
-                    // 2. delete the filemetadata from the version: 
-                removeFileMetadataFromList(dataset.getEditVersion().getFileMetadatas(), markedForDelete);
-                        }
-
+                // 1. delete the filemetadata from the local display list: 
+                FileMetadataUtil.removeFileMetadataFromList(fileMetadatas, markedForDelete);
+                // 2. delete the filemetadata from the version: 
+                FileMetadataUtil.removeFileMetadataFromList(dataset.getOrCreateEditVersion().getFileMetadatas(), markedForDelete);
+            }
 
             if (markedForDelete.getDataFile().getId() == null) {
                 logger.fine("this is a brand new file.");
                 // the file was just added during this step, so in addition to 
                 // removing it from the fileMetadatas lists (above), we also remove it from
                 // the newFiles list and the dataset's files, so it never gets saved.
-                
-                removeDataFileFromList(dataset.getFiles(), markedForDelete.getDataFile());
-                removeDataFileFromList(newFiles, markedForDelete.getDataFile());
-                deleteTempFile(markedForDelete.getDataFile());
+
+                FileMetadataUtil.removeDataFileFromList(dataset.getFiles(), markedForDelete.getDataFile());
+                FileMetadataUtil.removeDataFileFromList(newFiles, markedForDelete.getDataFile());
+                FileUtil.deleteTempFile(markedForDelete.getDataFile(), dataset, ingestService);
                 // Also remove checksum from the list of newly uploaded checksums (perhaps odd
                 // to delete and then try uploading the same file again, but it seems like it
                 // should be allowed/the checksum list is part of the state to clean-up
-                checksumMapNew.remove(markedForDelete.getDataFile().getChecksumValue());
-                    
-                        }
-                    }
-        if (fileNames != null) {
-            String successMessage = getBundleString("file.deleted.success");
-            logger.fine(successMessage);
-            successMessage = successMessage.replace("{0}", fileNames);
-            JsfHelper.addFlashMessage(successMessage);
-                    }
-                }
-                
-    private void deleteTempFile(DataFile dataFile) {
-                        // Before we remove the file from the list and forget about 
-                        // it:
-                        // The physical uploaded file is still sitting in the temporary
-                        // directory. If it were saved, it would be moved into its 
-                        // permanent location. But since the user chose not to save it,
-                        // we have to delete the temp file too. 
-                        // 
-                        // Eventually, we will likely add a dedicated mechanism
-                        // for managing temp files, similar to (or part of) the storage 
-                        // access framework, that would allow us to handle specialized
-                        // configurations - highly sensitive/private data, that 
-                        // has to be kept encrypted even in temp files, and such. 
-                        // But for now, we just delete the file directly on the 
-                        // local filesystem: 
-
-                        try {
-            List<Path> generatedTempFiles = ingestService.listGeneratedTempFiles(
-                    Paths.get(FileUtil.getFilesTempDirectory()), dataFile.getStorageIdentifier());
-            if (generatedTempFiles != null) {
-                for (Path generated : generatedTempFiles) {
-                    logger.fine("(Deleting generated thumbnail file " + generated.toString() + ")");
-                    try {
-                        Files.delete(generated);
-                    } catch (IOException ioex) {
-                        logger.warning("Failed to delete generated file " + generated.toString());
-                    }
+                if (checksumMapNew != null && markedForDelete.getDataFile().getChecksumValue() != null) {
+                    checksumMapNew.remove(markedForDelete.getDataFile().getChecksumValue());
                 }
+
             }
-            Files.delete(Paths.get(FileUtil.getFilesTempDirectory() + "/" + dataFile.getStorageIdentifier()));
-                        } catch (IOException ioEx) {
-                            // safe to ignore - it's just a temp file. 
-            logger.warning("Failed to delete temporary file " + FileUtil.getFilesTempDirectory() + "/"
-                    + dataFile.getStorageIdentifier());
         }
-                        }
-                        
-    private void removeFileMetadataFromList(List<FileMetadata> fmds, FileMetadata fmToDelete) {
-        Iterator<FileMetadata> fmit = fmds.iterator();
-        while (fmit.hasNext()) {
-            FileMetadata fmd = fmit.next();
-            if (fmToDelete.getDataFile().getStorageIdentifier().equals(fmd.getDataFile().getStorageIdentifier())) {
-                fmit.remove();
-                break;
-                    }
+
+        if (fileNames != null) {
+            String successMessage;
+            if (mode == FileEditMode.UPLOAD) {
+                if (fileNames.contains(", ")) {
+                    successMessage = getBundleString("file.deleted.upload.success.multiple");
+                } else {
+                    successMessage = getBundleString("file.deleted.upload.success.single");
                 }
-                }                
-                
-    private void removeDataFileFromList(List<DataFile> dfs, DataFile dfToDelete) {
-        Iterator<DataFile> dfit = dfs.iterator();
-        while (dfit.hasNext()) {
-            DataFile df = dfit.next();
-            if (dfToDelete.getStorageIdentifier().equals(df.getStorageIdentifier())) {
-                dfit.remove();
-                break;
+            } else {
+                successMessage = getBundleString("file.deleted.success");
+                successMessage = successMessage.replace("{0}", fileNames);
             }
+            logger.fine(successMessage);
+            JsfHelper.addFlashMessage(successMessage);
         }
     }
 
-    public String saveWithTermsOfUse() {
-        logger.fine("saving terms of use, and the dataset version");
-        return save();
-    }
-    
-    
     /**
      * Save for File Replace operations
+     *
      * @return
-     * @throws FileReplaceException 
+     * @throws FileReplaceException
      */
-    public String saveReplacementFile() throws FileReplaceException{
-        
+    public String saveReplacementFile() throws FileReplaceException {
+
         // Ahh, make sure it's a file replace operation
         //
-        if (!isFileReplaceOperation()){
+        if (!isFileReplaceOperation()) {
             throw new FileReplaceException("Only use this for File Replace Operations");
         }
 
@@ -1029,35 +1031,45 @@ public String saveReplacementFile() throws FileReplaceException{
         }
         // Sanity check 1
         //
-        if (fileReplacePageHelper == null){
+        if (fileReplacePageHelper == null) {
             throw new NullPointerException("fileReplacePageHelper cannot be null");
         }
-        
+
         // Make sure phase 1 ran -- button shouldn't be visible if it did not
         //
-        if (!fileReplacePageHelper.wasPhase1Successful()){
+        if (!fileReplacePageHelper.wasPhase1Successful()) {
             throw new FileReplaceException("Save should only be called when a replacement file has been chosen.  (Phase 1 has to have completed)");
-            
+
         }
 
         // Run save!!
         //
-        if (fileReplacePageHelper.runSaveReplacementFile_Phase2()){
+        if (fileReplacePageHelper.runSaveReplacementFile_Phase2()) {
             JsfHelper.addSuccessMessage(getBundleString("file.message.replaceSuccess"));
             // It worked!!!  Go to page of new file!!
-            return returnToFileLandingPageAfterReplace(fileReplacePageHelper.getFirstNewlyAddedFile());
-        }else{
+            if (Referrer.FILE == referrer) {
+                return returnToFileLandingPageAfterReplace(fileReplacePageHelper.getFirstNewlyAddedFile());
+            } else {
+                return returnToDraftVersion();
+            }
+        } else {
             // Uh oh.
             String errMsg = fileReplacePageHelper.getErrorMessages();
-            
+
             FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, getBundleString("dataset.save.fail"), errMsg));
             logger.severe("Dataset save failed for replace operation: " + errMsg);
             return null;
         }
-        
-    }    
-        
+
+    }
+
     public String save() {
+
+        Collection<String> duplicates = IngestUtil.findDuplicateFilenames(workingVersion, newFiles);
+        if (!duplicates.isEmpty()) {
+            JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.filesFailure"), BundleUtil.getStringFromBundle("dataset.message.editMetadata.duplicateFilenames", new ArrayList<>(duplicates)));
+            return null;
+        }
         if (!saveEnabled) {
             return "";
         }
@@ -1068,13 +1080,12 @@ public String save() {
             if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress) || lockTest.isLockedFor(DatasetLock.Reason.EditInProgress)) {
                 logger.log(Level.INFO, "Couldn''t save dataset: {0}", "It is locked."
                         + "");
-                String rootDataverseName = dataverseService.findRootDataverse().getName();
-                JH.addMessage(FacesMessage.SEVERITY_FATAL, getBundleString("dataset.locked.editInProgress.message"),BundleUtil.getStringFromBundle("dataset.locked.editInProgress.message.details", Arrays.asList(BrandingUtil.getSupportTeamName(null, rootDataverseName))));
+                JH.addMessage(FacesMessage.SEVERITY_FATAL, getBundleString("dataset.locked.editInProgress.message"), BundleUtil.getStringFromBundle("dataset.locked.editInProgress.message.details", Arrays.asList(BrandingUtil.getSupportTeamName(null))));
                 return null;
             }
         }
 
-        if (isFileReplaceOperation()){
+        if (isFileReplaceOperation()) {
             try {
                 return saveReplacementFile();
             } catch (FileReplaceException ex) {
@@ -1082,14 +1093,13 @@ public String save() {
                 FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, getBundleString("dataset.save.fail"), errMsg));
                 logger.log(Level.SEVERE, "Dataset save failed for replace operation: {0}", errMsg);
                 return null;
-            }            
+            }
         }
 
-                
         int nOldFiles = workingVersion.getFileMetadatas().size();
         int nNewFiles = newFiles.size();
-        int nExpectedFilesTotal = nOldFiles + nNewFiles; 
-        
+        int nExpectedFilesTotal = nOldFiles + nNewFiles;
+
         if (nNewFiles > 0) {
             //SEK 10/15/2018 only apply the following tests if dataset has already been saved.
             if (dataset.getId() != null) {
@@ -1111,9 +1121,17 @@ public String save() {
                     }
                 }
             }
-                                
+            boolean ignoreUploadFileLimits = this.session.getUser() != null ? this.session.getUser().isSuperuser() : false;
             // Try to save the NEW files permanently: 
-            List<DataFile> filesAdded = ingestService.saveAndAddFilesToDataset(workingVersion, newFiles);
+            List<DataFile> filesAdded = ingestService.saveAndAddFilesToDataset(workingVersion, newFiles, null, true, ignoreUploadFileLimits);
+            if (filesAdded.size() < nNewFiles) {
+                // Not all files were saved
+                Integer limit = dataset.getEffectiveDatasetFileCountLimit();
+                if (limit != null) {
+                    String msg = BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", List.of(limit.toString()));
+                    JsfHelper.addInfoMessage(msg);
+                }
+            }
             
             // reset the working list of fileMetadatas, as to only include the ones
             // that have been added to the version successfully: 
@@ -1121,13 +1139,13 @@ public String save() {
             for (DataFile addedFile : filesAdded) {
                 fileMetadatas.add(addedFile.getFileMetadata());
             }
-            filesAdded = null; 
+            filesAdded = null;
         }
         //boolean newDraftVersion = false;    
 
         Boolean provJsonChanges = false;
-        
-        if(systemConfig.isProvCollectionEnabled()) {
+
+        if (systemConfig.isProvCollectionEnabled()) {
             Boolean provFreeChanges = provPopupFragmentBean.updatePageMetadatasWithProvFreeform(fileMetadatas);
 
             try {
@@ -1184,7 +1202,6 @@ public String save() {
         // to update the tags in the database (issue #2798).
         // TODO: Is the above still true/is this still necessary?
         // (and why?...)
-
         if (tabularDataTagsUpdated) {
             for (int i = 0; i < dataset.getFiles().size(); i++) {
                 for (FileMetadata fileMetadata : fileMetadatas) {
@@ -1249,18 +1266,15 @@ public String save() {
              - We decided not to bother obtaining persistent ids for new files 
              as they are uploaded and created. The identifiers will be assigned 
              later, when the version is published. 
-             
-            logger.info("starting async job for obtaining persistent ids for files.");
-            datasetService.obtainPersistentIdentifiersForDatafiles(dataset);
-            */
+             */
         }
-                
-        workingVersion = dataset.getEditVersion();
-        logger.fine("working version id: "+workingVersion.getId());
-       
-        if (mode == FileEditMode.SINGLE){
+
+        workingVersion = dataset.getOrCreateEditVersion();
+        logger.fine("working version id: " + workingVersion.getId());
+
+        if (FileEditMode.EDIT == mode && Referrer.FILE == referrer) {
             JsfHelper.addSuccessMessage(getBundleString("file.message.editSuccess"));
-            
+
         } else {
             int nFilesTotal = workingVersion.getFileMetadatas().size();
             if (nNewFiles == 0 || nFilesTotal == nExpectedFilesTotal) {
@@ -1281,7 +1295,7 @@ public String save() {
             ingestService.startIngestJobsForDataset(dataset, (AuthenticatedUser) session.getUser());
         }
 
-        if (mode == FileEditMode.SINGLE && fileMetadatas.size() > 0) {
+        if (FileEditMode.EDIT == mode && Referrer.FILE == referrer && fileMetadatas.size() > 0) {
             // If this was a "single file edit", i.e. an edit request sent from 
             // the individual File Landing page, we want to redirect back to 
             // the landing page. BUT ONLY if the file still exists - i.e., if 
@@ -1289,59 +1303,61 @@ public String save() {
             versionString = "DRAFT";
             return returnToFileLandingPage();
         }
-        
+
         logger.fine("Redirecting to the dataset page, from the edit/upload page.");
         return returnToDraftVersion();
     }
-    
-    private void populateDatasetUpdateFailureMessage(){
-            
+
+    public boolean canPublishDataset() {
+        return permissionsWrapper.canIssuePublishDatasetCommand(dataset);
+    }
+
+    private void populateDatasetUpdateFailureMessage() {
+
         JH.addMessage(FacesMessage.SEVERITY_FATAL, getBundleString("dataset.message.filesFailure"));
     }
-    
-    
-    
-    private String returnToDraftVersion(){      
-         return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&version=DRAFT&faces-redirect=true";    
+
+    private String returnToDraftVersion() {
+        return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&version=DRAFT&faces-redirect=true";
     }
-    
-    private String returnToDatasetOnly(){
-         dataset = datasetService.find(dataset.getId());
-         return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString()  +  "&faces-redirect=true";       
+
+    private String returnToDatasetOnly() {
+        dataset = datasetService.find(dataset.getId());
+        return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&faces-redirect=true";
     }
-    
+
     private String returnToFileLandingPage() {
-        Long fileId = fileMetadatas.get(0).getDataFile().getId();   
-        if (versionString != null && versionString.equals("DRAFT")){
-            return  "/file.xhtml?fileId=" + fileId  +  "&version=DRAFT&faces-redirect=true";
+        Long fileId = fileMetadatas.get(0).getDataFile().getId();
+        if (versionString != null && versionString.equals("DRAFT")) {
+            return "/file.xhtml?fileId=" + fileId + "&version=DRAFT&faces-redirect=true";
         }
-        return  "/file.xhtml?fileId=" + fileId  +  "&faces-redirect=true";
+        return "/file.xhtml?fileId=" + fileId + "&faces-redirect=true";
 
     }
 
     private String returnToFileLandingPageAfterReplace(DataFile newFile) {
-        
-        if (newFile == null){
+
+        if (newFile == null) {
             throw new NullPointerException("newFile cannot be null!");
         }
         //Long datasetVersionId = newFile.getOwner().getLatestVersion().getId();
-        return "/file.xhtml?fileId=" + newFile.getId()  + "&version=DRAFT&faces-redirect=true";
+        return "/file.xhtml?fileId=" + newFile.getId() + "&version=DRAFT&faces-redirect=true";
     }
 
-    
     public String cancel() {
-        uploadInProgress = false;
-        if (mode == FileEditMode.SINGLE || mode == FileEditMode.SINGLE_REPLACE ) {
-            return returnToFileLandingPage();
-        }
+        uploadInProgress.setValue(false);
         //Files that have been finished and are now in the lower list on the page
         for (DataFile newFile : newFiles) {
-            deleteTempFile(newFile);
+            FileUtil.deleteTempFile(newFile, dataset, ingestService);
         }
 
         //Files in the upload process but not yet finished
         for (DataFile newFile : uploadedFiles) {
-            deleteTempFile(newFile);
+            FileUtil.deleteTempFile(newFile, dataset, ingestService);
+        }
+
+        if (Referrer.FILE == referrer) {
+            return returnToFileLandingPage();
         }
         if (workingVersion.getId() != null) {
             return returnToDraftVersion();
@@ -1349,128 +1365,88 @@ public String cancel() {
         return returnToDatasetOnly();
     }
 
-    
-    /* deprecated; super inefficient, when called repeatedly on a long list 
-       of files! 
-       leaving the code here, commented out, for illustration purposes. -- 4.6
-    public boolean isDuplicate(FileMetadata fileMetadata) {
-
-        Map<String, Integer> MD5Map = new HashMap<String, Integer>();
-
-        // TODO: 
-        // think of a way to do this that doesn't involve populating this 
-        // map for every file on the page? 
-        // may not be that much of a problem, if we paginate and never display 
-        // more than a certain number of files... Still, needs to be revisited
-        // before the final 4.0. 
-        // -- L.A. 4.0
-
-        // make a "defensive copy" to avoid java.util.ConcurrentModificationException from being thrown
-        // when uploading 100+ files
-        List<FileMetadata> wvCopy = new ArrayList<>(workingVersion.getFileMetadatas());
-        Iterator<FileMetadata> fmIt = wvCopy.iterator();
-
-        while (fmIt.hasNext()) {
-            FileMetadata fm = fmIt.next();
-            String md5 = fm.getDataFile().getChecksumValue();
-            if (md5 != null) {
-                if (MD5Map.get(md5) != null) {
-                    MD5Map.put(md5, MD5Map.get(md5).intValue() + 1);
-                } else {
-                    MD5Map.put(md5, 1);
-                }
-            }
-        }
-
-        return MD5Map.get(thisMd5) != null && MD5Map.get(thisMd5).intValue() > 1;
-    }*/
-   
-    private HttpClient getClient() {
-        // TODO: 
-        // cache the http client? -- L.A. 4.0 alpha
-        return new HttpClient();
-    }
-
     /**
      * Is this page in File Replace mode
-     * 
-     * @return 
+     *
+     * @return
      */
-    public boolean isFileReplaceOperation(){
-        return (mode == FileEditMode.SINGLE_REPLACE)&&(fileReplacePageHelper!= null);
+    public boolean isFileReplaceOperation() {
+        return (mode == FileEditMode.REPLACE) && (fileReplacePageHelper != null);
     }
-    
-    public boolean allowMultipleFileUpload(){
-        
+
+    public boolean allowMultipleFileUpload() {
+
         return !isFileReplaceOperation();
     }
-    
-    public boolean showFileUploadFragment(){
-        return mode == FileEditMode.UPLOAD || mode == FileEditMode.CREATE || mode == FileEditMode.SINGLE_REPLACE;
+
+    public boolean showFileUploadFragment() {
+        return mode == FileEditMode.UPLOAD || mode == FileEditMode.CREATE || mode == FileEditMode.REPLACE;
     }
-    
-    
-    public boolean showFileUploadComponent(){
+
+    public boolean showFileUploadComponent() {
         if (mode == FileEditMode.UPLOAD || mode == FileEditMode.CREATE) {
-           return true;
+            return true;
         }
-        
-        if (isFileReplaceOperation()){
+
+        if (isFileReplaceOperation()) {
             //msg("fileReplacePageHelper.showFileUploadComponent(): "+ fileReplacePageHelper.showFileUploadComponent());
             return fileReplacePageHelper.showFileUploadComponent();
-            }
+        }
 
         return false;
         //return false;
     }
-    
 
     /**
      * Download a file from drop box
-     * 
+     *
      * @param fileLink
-     * @return 
+     * @return
      */
-    private InputStream getDropBoxInputStream(String fileLink, GetMethod dropBoxMethod){
-        
-        if (fileLink == null){
+    private InputStream getDropBoxInputStream(String fileLink) {
+        if (fileLink == null) {
             return null;
         }
-        
-        // -----------------------------------------------------------
-        // Make http call, download the file: 
-        // -----------------------------------------------------------
-        int status = 0;
-        //InputStream dropBoxStream = null;
 
         try {
-            status = getClient().executeMethod(dropBoxMethod);
+            CloseableHttpClient httpClient = HttpClients.createDefault();
+            HttpGet httpGet = new HttpGet(fileLink);
+            
+            // Use the non-deprecated execute method with ClassicHttpResponse
+            ClassicHttpResponse response = httpClient.executeOpen(null, httpGet, null);
+            
+            int status = response.getCode();
+            
             if (status == 200) {
-                return dropBoxMethod.getResponseBodyAsStream();
+                HttpEntity entity = response.getEntity();
+                if (entity != null) {
+                    // Return the content as a stream directly
+                    return entity.getContent();
+                }
             }
+            
+            logger.log(Level.WARNING, "Failed to get DropBox InputStream for file: {0}. Status code: {1}", new Object[]{fileLink, status});
+            response.close();
+            return null;
         } catch (IOException ex) {
             logger.log(Level.WARNING, "Failed to access DropBox url: {0}!", fileLink);
             return null;
-        } 
-
-        logger.log(Level.WARNING, "Failed to get DropBox InputStream for file: {0}", fileLink);
-        return null;
+        }
     } // end: getDropBoxInputStream
-                  
-    
+
     /**
      * Using information from the DropBox choose, ingest the chosen files
-     *  https://www.dropbox.com/developers/dropins/chooser/js
-     * 
+     * https://www.dropbox.com/developers/dropins/chooser/js
+     *
      * @param event
      */
     public void handleDropBoxUpload(ActionEvent event) {
-        if (!uploadInProgress) {
-            uploadInProgress = true;
+        if (uploadInProgress.isFalse()) {
+            uploadInProgress.setValue(true);
         }
         logger.fine("handleDropBoxUpload");
         uploadComponentId = event.getComponent().getClientId();
-        
+
         // -----------------------------------------------------------
         // Read JSON object from the output of the DropBox Chooser: 
         // -----------------------------------------------------------
@@ -1482,8 +1458,7 @@ public void handleDropBoxUpload(ActionEvent event) {
         // Iterate through the Dropbox file information (JSON)
         // -----------------------------------------------------------
         DataFile dFile = null;
-        GetMethod dropBoxMethod = null;
-        String localWarningMessage = null; 
+        String localWarningMessage = null;
         for (int i = 0; i < dbArray.size(); i++) {
             JsonObject dbObject = dbArray.getJsonObject(i);
 
@@ -1514,32 +1489,29 @@ public void handleDropBoxUpload(ActionEvent event) {
                 continue; // skip to next file, and add error mesage
             }
 
-            
             dFile = null;
-            dropBoxMethod = new GetMethod(fileLink);
 
             // -----------------------------------------------------------
             // Download the file
             // -----------------------------------------------------------
-            InputStream dropBoxStream = this.getDropBoxInputStream(fileLink, dropBoxMethod);
-            if (dropBoxStream==null){
-                logger.severe("Could not retrieve dropgox input stream for: " + fileLink);
+            InputStream dropBoxStream = this.getDropBoxInputStream(fileLink);
+            if (dropBoxStream == null) {
+                logger.severe("Could not retrieve dropbox input stream for: " + fileLink);
                 continue;  // Error skip this file
             }
-            
+
             // -----------------------------------------------------------
             // Is this a FileReplaceOperation?  If so, then diverge!
             // -----------------------------------------------------------
-            if (this.isFileReplaceOperation()){
-              this.handleReplaceFileUpload(event, dropBoxStream, fileName, FileUtil.MIME_TYPE_UNDETERMINED_DEFAULT, null, event);
-              this.setFileMetadataSelectedForTagsPopup(fileReplacePageHelper.getNewFileMetadatasBeforeSave().get(0));
-              return;
-             }
+            if (this.isFileReplaceOperation()) {
+                this.handleReplaceFileUpload(event, dropBoxStream, fileName, FileUtil.MIME_TYPE_UNDETERMINED_DEFAULT, null, event);
+                this.setFileMetadataSelectedForTagsPopup(fileReplacePageHelper.getNewFileMetadatasBeforeSave().get(0));
+                return;
+            }
             // -----------------------------------------------------------
 
-            
-            List<DataFile> datafiles = new ArrayList<>(); 
-            
+            List<DataFile> datafiles = new ArrayList<>();
+
             // -----------------------------------------------------------
             // Send it through the ingest service
             // -----------------------------------------------------------
@@ -1549,23 +1521,19 @@ public void handleDropBoxUpload(ActionEvent event) {
                 // for example, multiple files can be extracted from an uncompressed
                 // zip file.
                 //datafiles = ingestService.createDataFiles(workingVersion, dropBoxStream, fileName, "application/octet-stream");
-                datafiles = FileUtil.createDataFiles(workingVersion, dropBoxStream, fileName, "application/octet-stream", systemConfig);
-                
-            } catch (IOException ex) {
+                //CreateDataFileResult createDataFilesResult = FileUtil.createDataFiles(workingVersion, dropBoxStream, fileName, "application/octet-stream", null, null, systemConfig);
+                Command<CreateDataFileResult> cmd = new CreateNewDataFilesCommand(dvRequestService.getDataverseRequest(), workingVersion, dropBoxStream, fileName, "application/octet-stream", null, uploadSessionQuota, null);
+                CreateDataFileResult createDataFilesResult = commandEngine.submit(cmd);
+                datafiles = createDataFilesResult.getDataFiles();
+                Optional.ofNullable(editDataFilesPageHelper.getHtmlErrorMessage(createDataFilesResult)).ifPresent(errorMessage -> errorMessages.add(errorMessage));
+
+            } catch (CommandException ex) {
                 this.logger.log(Level.SEVERE, "Error during ingest of DropBox file {0} from link {1}", new Object[]{fileName, fileLink});
                 continue;
-            }/*catch (FileExceedsMaxSizeException ex){
+            } /*catch (FileExceedsMaxSizeException ex){
                 this.logger.log(Level.SEVERE, "Error during ingest of DropBox file {0} from link {1}: {2}", new Object[]{fileName, fileLink, ex.getMessage()});
                 continue;
             }*/ finally {
-                // -----------------------------------------------------------
-                // release connection for dropBoxMethod
-                // -----------------------------------------------------------
-                
-                if (dropBoxMethod != null) {
-                    dropBoxMethod.releaseConnection();
-                }
-                
                 // -----------------------------------------------------------
                 // close the  dropBoxStream
                 // -----------------------------------------------------------
@@ -1575,11 +1543,11 @@ public void handleDropBoxUpload(ActionEvent event) {
                     logger.log(Level.WARNING, "Failed to close the dropBoxStream for file: {0}", fileLink);
                 }
             }
-            
-            if (datafiles == null){
+
+            if (datafiles == null) {
                 this.logger.log(Level.SEVERE, "Failed to create DataFile for DropBox file {0} from link {1}", new Object[]{fileName, fileLink});
                 continue;
-            }else{    
+            } else {
                 // -----------------------------------------------------------
                 // Check if there are duplicate files or ingest warnings
                 // -----------------------------------------------------------
@@ -1595,14 +1563,14 @@ public void handleDropBoxUpload(ActionEvent event) {
                      }
                 }*/
             }
-            if(!uploadInProgress) {
+            if (uploadInProgress.isFalse()) {
                 logger.warning("Upload in progress cancelled");
                 for (DataFile newFile : datafiles) {
-                    deleteTempFile(newFile);
+                    FileUtil.deleteTempFile(newFile, dataset, ingestService);
                 }
             }
         }
-        
+
         if (localWarningMessage != null) {
             if (uploadWarningMessage == null) {
                 uploadWarningMessage = localWarningMessage;
@@ -1611,18 +1579,18 @@ public void handleDropBoxUpload(ActionEvent event) {
             }
         }
     }
-    
+
     public void uploadStarted() {
         // uploadStarted() is triggered by PrimeFaces <p:upload onStart=... when an upload is 
         // started. It will be called *once*, even if it is a multiple file upload 
         // (either through drag-and-drop or select menu). 
         logger.fine("upload started");
-        
-        uploadInProgress = true;        
+
+        uploadInProgress.setValue(true);
     }
-    
-    
+
     private Boolean hasRsyncScript = false;
+
     public Boolean isHasRsyncScript() {
         return hasRsyncScript;
     }
@@ -1631,7 +1599,7 @@ public void setHasRsyncScript(Boolean hasRsyncScript) {
         this.hasRsyncScript = hasRsyncScript;
     }
 
-    private  void setUpRsync() {
+    private void setUpRsync() {
         logger.fine("setUpRsync called...");
         if (DataCaptureModuleUtil.rsyncSupportEnabled(settingsWrapper.getValueForKey(SettingsServiceBean.Key.UploadMethods))
                 && dataset.getFiles().isEmpty()) { //only check for rsync if no files exist
@@ -1647,14 +1615,26 @@ private  void setUpRsync() {
                 }
             } catch (EJBException ex) {
                 logger.warning("Problem getting rsync script (EJBException): " + EjbUtil.ejbExceptionToString(ex));
+                FacesContext.getCurrentInstance().addMessage(uploadComponentId,
+                        new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                                "Problem getting rsync script (EJBException): " + EjbUtil.ejbExceptionToString(ex),
+                                "Problem getting rsync script (EJBException):"));
             } catch (RuntimeException ex) {
                 logger.warning("Problem getting rsync script (RuntimeException): " + ex.getLocalizedMessage());
+                FacesContext.getCurrentInstance().addMessage(uploadComponentId,
+                        new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                                "Problem getting rsync script (RuntimeException): " + ex.getMessage(),
+                                "Problem getting rsync script (RuntimeException):"));
             } catch (CommandException cex) {
                 logger.warning("Problem getting rsync script (Command Exception): " + cex.getLocalizedMessage());
+                FacesContext.getCurrentInstance().addMessage(uploadComponentId,
+                        new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                                "Problem getting rsync script (Command Exception): " + cex.getMessage(),
+                                "Problem getting rsync script (Command Exception):"));
             }
         }
     }
-    
+
     public void downloadRsyncScript() {
 
         FacesContext ctx = FacesContext.getCurrentInstance();
@@ -1674,21 +1654,21 @@ public void downloadRsyncScript() {
         } catch (IOException e) {
             String error = "Problem getting bytes from rsync script: " + e;
             logger.warning(error);
-            return; 
+            return;
         }
-        
+
         // If the script has been successfully downloaded, lock the dataset:
         String lockInfoMessage = "script downloaded";
-        DatasetLock lock = datasetService.addDatasetLock(dataset.getId(), DatasetLock.Reason.DcmUpload, session.getUser() != null ? ((AuthenticatedUser)session.getUser()).getId() : null, lockInfoMessage);
+        DatasetLock lock = datasetService.addDatasetLock(dataset.getId(), DatasetLock.Reason.DcmUpload, session.getUser() != null ? ((AuthenticatedUser) session.getUser()).getId() : null, lockInfoMessage);
         if (lock != null) {
             dataset.addLock(lock);
         } else {
             logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId());
         }
-        
+
     }
-    
-        /**
+
+    /**
      * The contents of the script.
      */
     private String rsyncScript = "";
@@ -1707,7 +1687,38 @@ public String getRsyncScriptFilename() {
         return rsyncScriptFilename;
     }
 
-    
+    public void requestDirectUploadUrls() {
+
+        Map<String, String> paramMap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
+
+        String sizeString = paramMap.get("fileSize");
+        long fileSize = Long.parseLong(sizeString);
+
+        S3AccessIO<?> s3io = FileUtil.getS3AccessForDirectUpload(dataset);
+        if (s3io == null) {
+            FacesContext.getCurrentInstance().addMessage(uploadComponentId,
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                            BundleUtil.getStringFromBundle("dataset.file.uploadWarning"),
+                            "Direct upload not supported for this dataset"));
+        }
+        JsonObjectBuilder urls = null;
+        String storageIdentifier = null;
+        try {
+            storageIdentifier = FileUtil.getStorageIdentifierFromLocation(s3io.getStorageLocation());
+            urls = s3io.generateTemporaryS3UploadUrls(dataset.getGlobalId().asString(), storageIdentifier, fileSize);
+
+        } catch (IOException io) {
+            logger.warning(io.getMessage());
+            FacesContext.getCurrentInstance().addMessage(uploadComponentId,
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                            BundleUtil.getStringFromBundle("dataset.file.uploadWarning"),
+                            "Issue in connecting to S3 store for direct upload"));
+        }
+
+        PrimeFaces.current().executeScript(
+                "uploadFileDirectly('" + urls.build().toString() + "','" + storageIdentifier + "','" + fileSize + "')");
+    }
+
     public void uploadFinished() {
         // This method is triggered from the page, by the <p:upload ... onComplete=...
         // attribute. 
@@ -1731,85 +1742,149 @@ public void uploadFinished() {
         // Add the file(s) added during this last upload event, single or multiple, 
         // to the full list of new files, and the list of filemetadatas 
         // used to render the page:
-        
         for (DataFile dataFile : uploadedFiles) {
             fileMetadatas.add(dataFile.getFileMetadata());
             newFiles.add(dataFile);
         }
-        
-       
-        if(uploadInProgress) {
-            uploadedFiles = new ArrayList<>();
-            uploadInProgress = false;
+
+        if (uploadInProgress.isTrue()) {
+            uploadedFiles.clear();
+            uploadInProgress.setValue(false);
         }
+
         // refresh the warning message below the upload component, if exists:
         if (uploadComponentId != null) {
+            if(!errorMessages.isEmpty()) {
+                FacesContext.getCurrentInstance().addMessage(uploadComponentId, new FacesMessage(FacesMessage.SEVERITY_ERROR,  BundleUtil.getStringFromBundle("dataset.file.uploadFailure"), editDataFilesPageHelper.consolidateHtmlErrorMessages(errorMessages)));
+            }
+
             if (uploadWarningMessage != null) {
-                if (uploadWarningMessageIsNotAnError) {
-                    FacesContext.getCurrentInstance().addMessage(uploadComponentId, new FacesMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.file.uploadWarning"), uploadWarningMessage));
+                if (existingFilesWithDupeContent != null || newlyUploadedFilesWithDupeContent != null) {
+                    setWarningMessageForAlreadyExistsPopUp(uploadWarningMessage);
+                    setHeaderForAlreadyExistsPopUp();
+                    setLabelForDeleteFilesPopup();
+                    PrimeFaces.current().ajax().update("datasetForm:fileAlreadyExistsPopup");
+                    PrimeFaces.current().executeScript("PF('fileAlreadyExistsPopup').show();");
                 } else {
-                    FacesContext.getCurrentInstance().addMessage(uploadComponentId, new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.file.uploadWarning"), uploadWarningMessage));
+                    //adding back warnings in non-replace situations
+                    FacesContext.getCurrentInstance().addMessage(uploadComponentId, new FacesMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.file.uploadWarning"), uploadWarningMessage));
                 }
+
             } else if (uploadSuccessMessage != null) {
                 FacesContext.getCurrentInstance().addMessage(uploadComponentId, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.file.uploadWorked"), uploadSuccessMessage));
             }
         }
 
-        if(isFileReplaceOperation() && fileReplacePageHelper.hasContentTypeWarning()){
-                    //RequestContext context = RequestContext.getCurrentInstance();
-                    //RequestContext.getCurrentInstance().update("datasetForm:fileTypeDifferentPopup");
-                    PrimeFaces.current().ajax().update("datasetForm:fileTypeDifferentPopup");
-                    //context.execute("PF('fileTypeDifferentPopup').show();");
-                    PrimeFaces.current().executeScript("PF('fileTypeDifferentPopup').show();");
+        if (isFileReplaceOperation() && fileReplacePageHelper.wasPhase1Successful() && fileReplacePageHelper.hasContentTypeWarning()) {
+            //RequestContext context = RequestContext.getCurrentInstance();
+            //RequestContext.getCurrentInstance().update("datasetForm:fileTypeDifferentPopup");
+            PrimeFaces.current().ajax().update("datasetForm:fileTypeDifferentPopup");
+            //context.execute("PF('fileTypeDifferentPopup').show();");
+            PrimeFaces.current().executeScript("PF('fileTypeDifferentPopup').show();");
         }
 
+        if (isFileReplaceOperation() && fileReplacePageHelper.getAddReplaceFileHelper().isDuplicateFileErrorFound()) {
+            FacesContext.getCurrentInstance().addMessage(uploadComponentId, new FacesMessage(FacesMessage.SEVERITY_ERROR, fileReplacePageHelper.getAddReplaceFileHelper().getDuplicateFileErrorString(), fileReplacePageHelper.getAddReplaceFileHelper().getDuplicateFileErrorString()));
+        }
+
+        if (isFileReplaceOperation() && !fileReplacePageHelper.getAddReplaceFileHelper().isDuplicateFileErrorFound() && fileReplacePageHelper.getAddReplaceFileHelper().isDuplicateFileWarningFound()) {
+            setWarningMessageForAlreadyExistsPopUp(fileReplacePageHelper.getAddReplaceFileHelper().getDuplicateFileWarningString());
+            setHeaderForAlreadyExistsPopUp();
+            setLabelForDeleteFilesPopup();
+            PrimeFaces.current().ajax().update("datasetForm:fileAlreadyExistsPopup");
+            PrimeFaces.current().executeScript("PF('fileAlreadyExistsPopup').show();");
+        }
         // We clear the following duplicate warning labels, because we want to 
         // only inform the user of the duplicates dropped in the current upload 
         // attempt - for ex., one batch of drag-and-dropped files, or a single 
         // file uploaded through the file chooser. 
-        dupeFileNamesExisting = null; 
-        dupeFileNamesNew = null;
+        newlyUploadedFilesWithDupeContent = null;
+        existingFilesWithDupeContent = null;
         multipleDupesExisting = false;
-        multipleDupesNew = false; 
+        multipleDupesNew = false;
         uploadWarningMessage = null;
-        uploadSuccessMessage = null; 
+        uploadSuccessMessage = null;
+        errorMessages = new ArrayList<>();
+    }
+
+    private String warningMessageForFileTypeDifferentPopUp;
+
+    public String getWarningMessageForFileTypeDifferentPopUp() {
+        return warningMessageForFileTypeDifferentPopUp;
+    }
+
+    public void setWarningMessageForFileTypeDifferentPopUp(String warningMessageForPopUp) {
+        this.warningMessageForFileTypeDifferentPopUp = warningMessageForPopUp;
+    }
+
+    private String warningMessageForAlreadyExistsPopUp;
+
+    public String getWarningMessageForAlreadyExistsPopUp() {
+        return warningMessageForAlreadyExistsPopUp;
     }
-    
-    private String warningMessageForPopUp;
 
-    public String getWarningMessageForPopUp() {
-        return warningMessageForPopUp;
+    public void setWarningMessageForAlreadyExistsPopUp(String warningMessageForAlreadyExistsPopUp) {
+        this.warningMessageForAlreadyExistsPopUp = warningMessageForAlreadyExistsPopUp;
     }
 
-    public void setWarningMessageForPopUp(String warningMessageForPopUp) {
-        this.warningMessageForPopUp = warningMessageForPopUp;
+    private String headerForAlreadyExistsPopUp;
+
+    public String getHeaderForAlreadyExistsPopUp() {
+        return headerForAlreadyExistsPopUp;
+    }
+
+    public void setHeaderForAlreadyExistsPopUp(String headerForAlreadyExistsPopUp) {
+        this.headerForAlreadyExistsPopUp = headerForAlreadyExistsPopUp;
+    }
+
+    private String labelForDeleteFilesPopup;
+
+    public String getLabelForDeleteFilesPopup() {
+        return labelForDeleteFilesPopup;
+    }
+
+    public void setLabelForDeleteFilesPopup(String labelForDeleteFilesPopup) {
+        this.labelForDeleteFilesPopup = labelForDeleteFilesPopup;
+    }
+
+    public void setLabelForDeleteFilesPopup() {
+        this.labelForDeleteFilesPopup = ((multipleDupesExisting || multipleDupesNew) ? BundleUtil.getStringFromBundle("file.delete.duplicate.multiple")
+                : BundleUtil.getStringFromBundle("file.delete.duplicate.single"));
+    }
+
+    //((multipleDupesExisting|| multipleDupesNew) ? BundleUtil.getStringFromBundle("file.addreplace.already_exists.header.multiple"):  BundleUtil.getStringFromBundle("file.addreplace.already_exists.header"));
+    public void setHeaderForAlreadyExistsPopUp() {
+
+        this.headerForAlreadyExistsPopUp = ((multipleDupesExisting || multipleDupesNew) ? BundleUtil.getStringFromBundle("file.addreplace.already_exists.header.multiple") : BundleUtil.getStringFromBundle("file.addreplace.already_exists.header"));
     }
 
-    private void handleReplaceFileUpload(FacesEvent event, InputStream inputStream, 
-                        String fileName, 
-                        String contentType,
-                        FileUploadEvent nativeUploadEvent,
-                        ActionEvent dropboxUploadEvent
-    ){
+    private void handleReplaceFileUpload(FacesEvent event, InputStream inputStream,
+            String fileName,
+            String contentType,
+            FileUploadEvent nativeUploadEvent,
+            ActionEvent dropboxUploadEvent
+    ) {
 
         fileReplacePageHelper.resetReplaceFileHelper();
 
         saveEnabled = false;
-        
+
         uploadComponentId = event.getComponent().getClientId();
-        
-        if (fileReplacePageHelper.handleNativeFileUpload(inputStream,
-                                    fileName,
-                                    contentType
-                                )){
+
+        if (fileReplacePageHelper.handleNativeFileUpload(inputStream, null,
+                fileName,
+                contentType,
+                null,
+                null
+        )) {
             saveEnabled = true;
 
             /**
              * If the file content type changed, let the user know
              */
-            if (fileReplacePageHelper.hasContentTypeWarning()){
+            if (fileReplacePageHelper.hasContentTypeWarning()) {
                 //Add warning to popup instead of page for Content Type Difference
-                setWarningMessageForPopUp(fileReplacePageHelper.getContentTypeWarning());
+                setWarningMessageForFileTypeDifferentPopUp(fileReplacePageHelper.getContentTypeWarning());
                 /* 
                     Note on the info messages - upload errors, warnings and success messages:
                     Instead of trying to display the message here (commented out code below),
@@ -1823,13 +1898,13 @@ the uploadFinished() method, triggered next, after the upload event
                     there is always only one... but we have to use this scheme for 
                     consistency. -- L.A. 4.6.1
                    
-                */
+                 */
                 //FacesContext.getCurrentInstance().addMessage(
                 //        uploadComponentId,                         
                 //        new FacesMessage(FacesMessage.SEVERITY_ERROR, "upload warning", uploadWarningMessage));
             }
             // See the comment above, on how upload messages are displayed.
-            
+
             // Commented out the success message below - since we probably don't
             // need it - the state of the page will indicate the success fairly 
             // unambiguously: the primefaces upload and the dropbox upload components
@@ -1837,18 +1912,16 @@ the uploadFinished() method, triggered next, after the upload event
             // But feel free to un-comment it, if you feel it could be useful. 
             // -- L.A. 4.6.1
             //uploadSuccessMessage = "Hey! It worked!";
-                
         } else {
             // See the comment above, on how upload messages are displayed.
             uploadWarningMessage = fileReplacePageHelper.getErrorMessages();
 //            uploadWarningMessage += " ******* ";
-            
-            
-            if (nativeUploadEvent != null){
+
+            if (nativeUploadEvent != null) {
 //                uploadWarningMessage += " nativeUploadEvent ";
-                
+
             }
-            if (dropboxUploadEvent != null){
+            if (dropboxUploadEvent != null) {
 //                uploadWarningMessage += " dropboxUploadEvent ";
             }
             //FacesContext.getCurrentInstance().addMessage(
@@ -1857,117 +1930,368 @@ the uploadFinished() method, triggered next, after the upload event
         }
     }
 
-    private String uploadWarningMessage = null; 
-    private String uploadSuccessMessage = null; 
-    private String uploadComponentId = null; 
-    
-    
-    
+    private void handleReplaceFileUpload(String fullStorageLocation,
+            String fileName,
+            String contentType,
+            String checkSumValue,
+            ChecksumType checkSumType) {
+
+        fileReplacePageHelper.resetReplaceFileHelper();
+        saveEnabled = false;
+        String storageIdentifier = DataAccess.getStorageIdFromLocation(fullStorageLocation);
+        if (fileReplacePageHelper.handleNativeFileUpload(null, storageIdentifier, fileName, contentType, checkSumValue, checkSumType)) {
+            saveEnabled = true;
+
+            /**
+             * If the file content type changed, let the user know
+             */
+            if (fileReplacePageHelper.hasContentTypeWarning()) {
+                //Add warning to popup instead of page for Content Type Difference
+                setWarningMessageForFileTypeDifferentPopUp(fileReplacePageHelper.getContentTypeWarning());
+            }
+        } else {
+            uploadWarningMessage = fileReplacePageHelper.getErrorMessages();
+        }
+    }
+
+    private String uploadWarningMessage = null;
+    private List<String> errorMessages = new ArrayList<>();
+    private String uploadSuccessMessage = null;
+    private String uploadComponentId = null;
+
     /**
      * Handle native file replace
-     * @param event 
-     * @throws java.io.IOException 
+     *
+     * @param event
+     * @throws java.io.IOException
      */
     public void handleFileUpload(FileUploadEvent event) throws IOException {
-        
-        if (!uploadInProgress) {
-            uploadInProgress = true;
+
+        if (uploadInProgress.isFalse()) {
+            uploadInProgress.setValue(true);
         }
-        
-        if (event == null){
+
+        //resetting marked as dup in case there are multiple uploads 
+        //we only want to delete as dupes those that we uploaded in this 
+        //session
+        newFiles.forEach((df) -> {
+            df.setMarkedAsDuplicate(false);
+        });
+
+        if (event == null) {
             throw new NullPointerException("event cannot be null");
         }
-        
+
         UploadedFile uFile = event.getFile();
-        if (uFile == null){
+        if (uFile == null) {
             throw new NullPointerException("uFile cannot be null");
         }
 
-
         /**
          * For File Replace, take a different code path
          */
-        if (isFileReplaceOperation()){
-
-            handleReplaceFileUpload(event, uFile.getInputstream(),
-                                    uFile.getFileName(),
-                                    uFile.getContentType(),
-                                    event,
-                                    null);
-            if(fileReplacePageHelper.hasContentTypeWarning()){
+        if (isFileReplaceOperation()) {
+
+            handleReplaceFileUpload(event, uFile.getInputStream(),
+                    uFile.getFileName(),
+                    uFile.getContentType(),
+                    event,
+                    null);
+            if (fileReplacePageHelper.wasPhase1Successful() && fileReplacePageHelper.hasContentTypeWarning()) {
+                //RequestContext context = RequestContext.getCurrentInstance();
+                //RequestContext.getCurrentInstance().update("datasetForm:fileTypeDifferentPopup");
+                //context.execute("PF('fileTypeDifferentPopup').show();");
+                PrimeFaces.current().ajax().update("datasetForm:fileTypeDifferentPopup");
+                PrimeFaces.current().executeScript("PF('fileTypeDifferentPopup').show();");
+            }
+            /*
+            
+
+            if(fileReplacePageHelper.){
                     //RequestContext context = RequestContext.getCurrentInstance();
                     //RequestContext.getCurrentInstance().update("datasetForm:fileTypeDifferentPopup");
                     //context.execute("PF('fileTypeDifferentPopup').show();");
                     PrimeFaces.current().ajax().update("datasetForm:fileTypeDifferentPopup");
                     PrimeFaces.current().executeScript("PF('fileTypeDifferentPopup').show();");
             }
+             */
             return;
-               
+
         }
 
-   
         List<DataFile> dFileList = null;
-        
+
         try {
             // Note: A single uploaded file may produce multiple datafiles - 
             // for example, multiple files can be extracted from an uncompressed
-            // zip file. 
-            dFileList = FileUtil.createDataFiles(workingVersion, uFile.getInputstream(), uFile.getFileName(), uFile.getContentType(), systemConfig);
+            // zip file.
+            ///CreateDataFileResult createDataFilesResult = FileUtil.createDataFiles(workingVersion, uFile.getInputStream(), uFile.getFileName(), uFile.getContentType(), null, null, systemConfig);
             
+            Command<CreateDataFileResult> cmd;
+            if (mode == FileEditMode.CREATE) {
+                // This is a file upload in the context of creating a brand new
+                // dataset that does not yet exist in the database. We must 
+                // use the version of the Create New Files constructor that takes
+                // the parent Dataverse as the extra argument:
+                cmd = new CreateNewDataFilesCommand(dvRequestService.getDataverseRequest(), workingVersion, uFile.getInputStream(), uFile.getFileName(), uFile.getContentType(), null, uploadSessionQuota, null, null, null, workingVersion.getDataset().getOwner());
+            } else {
+                cmd = new CreateNewDataFilesCommand(dvRequestService.getDataverseRequest(), workingVersion, uFile.getInputStream(), uFile.getFileName(), uFile.getContentType(), null, uploadSessionQuota, null);
+            }
+            CreateDataFileResult createDataFilesResult = commandEngine.submit(cmd);
+
+        
+            dFileList = createDataFilesResult.getDataFiles();
+            String createDataFilesError = editDataFilesPageHelper.getHtmlErrorMessage(createDataFilesResult);
+            if(createDataFilesError != null) {
+                errorMessages.add(createDataFilesError);
+                uploadComponentId = event.getComponent().getClientId();
+            }
+
         } catch (IOException ioex) {
+            // shouldn't we try and communicate to the user what happened?
             logger.warning("Failed to process and/or save the file " + uFile.getFileName() + "; " + ioex.getMessage());
             return;
-        } /*catch (FileExceedsMaxSizeException ex) {
+        } catch (CommandException cex) {
+            // shouldn't we try and communicate to the user what happened?
+            errorMessages.add(cex.getMessage());
+            uploadComponentId = event.getComponent().getClientId();
+            return;
+        } finally {
+            try {
+                uFile.delete();
+            } catch (IOException ioex) {
+                logger.warning("Failed to delete temp file uploaded via PrimeFaces " + uFile.getFileName());
+            }
+        }
+        /*catch (FileExceedsMaxSizeException ex) {
             logger.warning("Failed to process and/or save the file " + uFile.getFileName() + "; " + ex.getMessage());
             return;
         }*/
 
-        // -----------------------------------------------------------
-        // These raw datafiles are then post-processed, in order to drop any files 
-        // already in the dataset/already uploaded, and to correct duplicate file names, etc. 
-        // -----------------------------------------------------------
-        String warningMessage = processUploadedFileList(dFileList);
-        
-        if (warningMessage != null){
-            uploadWarningMessage = warningMessage;
-            FacesContext.getCurrentInstance().addMessage(event.getComponent().getClientId(), new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.file.uploadWarning"), warningMessage));
-            // save the component id of the p:upload widget, so that we could 
-            // send an info message there, from elsewhere in the code:
-            uploadComponentId = event.getComponent().getClientId();
+        // -----------------------------------------------------------
+        // These raw datafiles are then post-processed, in order to drop any files 
+        // already in the dataset/already uploaded, and to correct duplicate file names, etc. 
+        // -----------------------------------------------------------
+        String warningMessage = processUploadedFileList(dFileList);
+
+        if (warningMessage != null) {
+            uploadWarningMessage = warningMessage;
+            FacesContext.getCurrentInstance().addMessage(event.getComponent().getClientId(), new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.file.uploadWarning"), warningMessage));
+            // save the component id of the p:upload widget, so that we could 
+            // send an info message there, from elsewhere in the code:
+            uploadComponentId = event.getComponent().getClientId();
+        }
+
+        if (uploadInProgress.isFalse()) {
+            logger.warning("Upload in progress cancelled");
+            for (DataFile newFile : dFileList) {
+                FileUtil.deleteTempFile(newFile, dataset, ingestService);
+            }
+        }
+    }
+
+    /**
+     * External, aka "Direct" Upload. 
+     * The file(s) have been uploaded to physical storage (such as S3) directly,
+     * this call is to create and add the DataFiles to the Dataset on the Dataverse 
+     * side. The method does NOT finalize saving the datafiles in the database -
+     * that will happen when the user clicks 'Save', similar to how the "normal"
+     * uploads are handled. 
+     *
+     * @param event
+     */
+    public void handleExternalUpload() {
+        Map<String, String> paramMap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
+
+        this.uploadComponentId = paramMap.get("uploadComponentId");
+        String fullStorageIdentifier = paramMap.get("fullStorageIdentifier");
+        String fileName = paramMap.get("fileName");
+        String contentType = paramMap.get("contentType");
+        String checksumTypeString = paramMap.get("checksumType");
+        String checksumValue = paramMap.get("checksumValue");
+        ChecksumType checksumType = null;
+        if (!checksumTypeString.isBlank()) {
+            checksumType = ChecksumType.fromString(checksumTypeString);
+        }
+
+        //Should only be one colon with curent design
+        int lastColon = fullStorageIdentifier.lastIndexOf(':');
+        String storageLocation = fullStorageIdentifier.substring(0,lastColon) + "/" + dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage() + "/" + fullStorageIdentifier.substring(lastColon+1);
+        storageLocation = DataAccess.expandStorageIdentifierIfNeeded(storageLocation);
+
+        if (uploadInProgress.isFalse()) {
+            uploadInProgress.setValue(true);
+        }
+        logger.fine("handleExternalUpload");
+
+        StorageIO<DvObject> sio;
+        String localWarningMessage = null;
+        try {
+            sio = DataAccess.getDirectStorageIO(storageLocation);
+
+            //Populate metadata
+            sio.open(DataAccessOption.READ_ACCESS);
+            //get file size
+            long fileSize = sio.getSize();
+
+            if (StringUtils.isEmpty(contentType)) {
+                contentType = FileUtil.MIME_TYPE_UNDETERMINED_DEFAULT;
+            }
+
+            /* ----------------------------
+                Check file size
+                - Max size NOT specified in db: default is unlimited
+                - Max size specified in db: check too make sure file is within limits
+            // ---------------------------- */
+            /**
+             * @todo: this file size limit check is now redundant here, since the new
+             * CreateNewFilesCommand is going to perform it (and the quota 
+             * checks too, if enabled
+             */
+            if ((!this.isUnlimitedUploadFileSize()) && (fileSize > this.getMaxFileUploadSizeInBytes())) {
+                String warningMessage = "Uploaded file \"" + fileName + "\" exceeded the limit of " + fileSize + " bytes and was not uploaded.";
+                sio.delete();
+                localWarningMessage = warningMessage;
+            } else {
+                // -----------------------------------------------------------
+                // Is this a FileReplaceOperation?  If so, then diverge!
+                // -----------------------------------------------------------
+                if (this.isFileReplaceOperation()) {
+                    this.handleReplaceFileUpload(storageLocation, fileName, contentType, checksumValue, checksumType);
+                    if (fileReplacePageHelper.getNewFileMetadatasBeforeSave() != null) {
+                        this.setFileMetadataSelectedForTagsPopup(fileReplacePageHelper.getNewFileMetadatasBeforeSave().get(0));
+                    }
+                    return;
+                }
+                // -----------------------------------------------------------
+                List<DataFile> datafiles = new ArrayList<>();
+
+                // -----------------------------------------------------------
+                // Execute the CreateNewDataFiles command:
+                // -----------------------------------------------------------
+                
+                Dataverse parent = null; 
+                
+                if (mode == FileEditMode.CREATE) {
+                    // This is a file upload in the context of creating a brand new
+                    // dataset that does not yet exist in the database. We must 
+                    // pass the parent Dataverse to the CreateNewFiles command
+                    // constructor. The RequiredPermission on the command in this 
+                    // scenario = Permission.AddDataset on the parent dataverse.
+                    parent = workingVersion.getDataset().getOwner();
+                }
+                
+                try {
+  
+                    Command<CreateDataFileResult> cmd = new CreateNewDataFilesCommand(dvRequestService.getDataverseRequest(), workingVersion, null, fileName, contentType, fullStorageIdentifier, uploadSessionQuota, checksumValue, checksumType, fileSize, parent);
+                    CreateDataFileResult createDataFilesResult = commandEngine.submit(cmd);
+                    datafiles = createDataFilesResult.getDataFiles();
+                    Optional.ofNullable(editDataFilesPageHelper.getHtmlErrorMessage(createDataFilesResult)).ifPresent(errorMessage -> errorMessages.add(errorMessage));
+                } catch (CommandException ex) {
+                    logger.log(Level.SEVERE, "Error during ingest of file {0}", new Object[]{fileName});
+                }
+
+                if (datafiles == null) {
+                    logger.log(Level.SEVERE, "Failed to create DataFile for file {0}", new Object[]{fileName});
+                } else {
+                    // -----------------------------------------------------------
+                    // Check if there are duplicate files or ingest warnings
+                    // -----------------------------------------------------------
+                    uploadWarningMessage = processUploadedFileList(datafiles);
+                }
+                if (uploadInProgress.isFalse()) {
+                    logger.warning("Upload in progress cancelled");
+                    for (DataFile newFile : datafiles) {
+                        FileUtil.deleteTempFile(newFile, dataset, ingestService);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            logger.log(Level.SEVERE, "Failed to create DataFile for file {0}: {1}", new Object[]{fileName, e.getMessage()});
         }
-        
-        if(!uploadInProgress) {
-            logger.warning("Upload in progress cancelled");
-            for (DataFile newFile : dFileList) {
-                deleteTempFile(newFile);
+        if (localWarningMessage != null) {
+            if (uploadWarningMessage == null) {
+                uploadWarningMessage = localWarningMessage;
+            } else {
+                uploadWarningMessage = localWarningMessage.concat("; " + uploadWarningMessage);
             }
         }
     }
 
     /**
-     *  After uploading via the site or Dropbox, 
-     *  check the list of DataFile objects
-     * @param dFileList 
+     * After uploading via the site or Dropbox, check the list of DataFile
+     * objects
+     *
+     * @param dFileList
      */
-    
-    private String dupeFileNamesExisting = null; 
-    private String dupeFileNamesNew = null;
+    private String existingFilesWithDupeContent = null;
+    private String uploadedFilesWithDupeContentToExisting = null;
+    private String uploadedFilesWithDupeContentToNewlyUploaded = null;
+    private String newlyUploadedFilesWithDupeContent = null;
+
     private boolean multipleDupesExisting = false;
     private boolean multipleDupesNew = false;
-    private boolean uploadInProgress = false;
-    
+
+    public String getExistingFilesWithDupeContent() {
+        return existingFilesWithDupeContent;
+    }
+
+    public void setExistingFilesWithDupeContent(String existingFilesWithDupeContent) {
+        this.existingFilesWithDupeContent = existingFilesWithDupeContent;
+    }
+
+    public String getUploadedFilesWithDupeContentToExisting() {
+        return uploadedFilesWithDupeContentToExisting;
+    }
+
+    public void setUploadedFilesWithDupeContentToExisting(String uploadedFilesWithDupeContentToExisting) {
+        this.uploadedFilesWithDupeContentToExisting = uploadedFilesWithDupeContentToExisting;
+    }
+
+    public String getUploadedFilesWithDupeContentToNewlyUploaded() {
+        return uploadedFilesWithDupeContentToNewlyUploaded;
+    }
+
+    public void setUploadedFilesWithDupeContentToNewlyUploaded(String uploadedFilesWithDupeContentToNewlyUploaded) {
+        this.uploadedFilesWithDupeContentToNewlyUploaded = uploadedFilesWithDupeContentToNewlyUploaded;
+    }
+
+    public String getNewlyUploadedFilesWithDupeContent() {
+        return newlyUploadedFilesWithDupeContent;
+    }
+
+    public void setNewlyUploadedFilesWithDupeContent(String newlyUploadedFilesWithDupeContent) {
+        this.newlyUploadedFilesWithDupeContent = newlyUploadedFilesWithDupeContent;
+    }
+
+    public boolean isMultipleDupesExisting() {
+        return multipleDupesExisting;
+    }
+
+    public void setMultipleDupesExisting(boolean multipleDupesExisting) {
+        this.multipleDupesExisting = multipleDupesExisting;
+    }
+
+    public boolean isMultipleDupesNew() {
+        return multipleDupesNew;
+    }
+
+    public void setMultipleDupesNew(boolean multipleDupesNew) {
+        this.multipleDupesNew = multipleDupesNew;
+    }
+
     private String processUploadedFileList(List<DataFile> dFileList) {
-        
         if (dFileList == null) {
             return null;
         }
 
+        uploadedInThisProcess = new ArrayList();
+
         DataFile dataFile;
         String warningMessage = null;
 
         // NOTE: for native file uploads, the dFileList will only 
         // contain 1 file--method is called for every file even if the UI shows "simultaneous uploads"
-        
         // -----------------------------------------------------------
         // Iterate through list of DataFile objects
         // -----------------------------------------------------------
@@ -1993,38 +2317,69 @@ private String processUploadedFileList(List<DataFile> dFileList) {
             // uploaded.
             // -----------------------------------------------------------
             if (isFileAlreadyInDataset(dataFile)) {
-                if (dupeFileNamesExisting == null) {
-                    dupeFileNamesExisting = dataFile.getFileMetadata().getLabel();
+                DataFile existingFile = fileAlreadyExists.get(dataFile);
+
+                // String alreadyExists = dataFile.getFileMetadata().getLabel() + " at " + existingFile.getDirectoryLabel() != null ? existingFile.getDirectoryLabel() + "/" + existingFile.getDisplayName() : existingFile.getDisplayName();
+                String uploadedDuplicateFileName = dataFile.getFileMetadata().getLabel();
+                String existingFileName = existingFile.getDisplayName();
+                List<String> args = Arrays.asList(existingFileName);
+                String inLineMessage = BundleUtil.getStringFromBundle("dataset.file.inline.message", args);
+
+                if (existingFilesWithDupeContent == null) {
+                    existingFilesWithDupeContent = existingFileName;
+                    uploadedFilesWithDupeContentToExisting = uploadedDuplicateFileName;
                 } else {
-                    dupeFileNamesExisting = dupeFileNamesExisting.concat(", " + dataFile.getFileMetadata().getLabel());
+                    existingFilesWithDupeContent = existingFilesWithDupeContent.concat(", " + existingFileName);
+                    uploadedFilesWithDupeContentToExisting = uploadedFilesWithDupeContentToExisting.concat(", " + uploadedDuplicateFileName);
                     multipleDupesExisting = true;
                 }
-                // remove temp file
-                deleteTempFile(dataFile);
+                //now we are marking as duplicate and
+                //allowing the user to decide whether to delete
+                //   deleteTempFile(dataFile);
+                dataFile.setMarkedAsDuplicate(true);
+                dataFile.setDuplicateFilename(inLineMessage);
+
             } else if (isFileAlreadyUploaded(dataFile)) {
-                if (dupeFileNamesNew == null) {
-                    dupeFileNamesNew = dataFile.getFileMetadata().getLabel();
+                DataFile existingFile = checksumMapNew.get(dataFile.getChecksumValue());
+                String alreadyUploadedWithSame = existingFile.getDisplayName();
+                String newlyUploadedDupe = dataFile.getFileMetadata().getLabel();
+                if (newlyUploadedFilesWithDupeContent == null) {
+                    newlyUploadedFilesWithDupeContent = newlyUploadedDupe;
+                    uploadedFilesWithDupeContentToNewlyUploaded = alreadyUploadedWithSame;
                 } else {
-                    dupeFileNamesNew = dupeFileNamesNew.concat(", " + dataFile.getFileMetadata().getLabel());
+                    newlyUploadedFilesWithDupeContent = newlyUploadedFilesWithDupeContent.concat(", " + newlyUploadedDupe);
+                    uploadedFilesWithDupeContentToNewlyUploaded = uploadedFilesWithDupeContentToNewlyUploaded.concat(", " + alreadyUploadedWithSame);
                     multipleDupesNew = true;
                 }
-                // remove temp file
-                deleteTempFile(dataFile);
+                //now we are marking as duplicate and
+                //allowing the user to decide whether to delete
+                dataFile.setMarkedAsDuplicate(true);
+                List<String> args = Arrays.asList(existingFile.getDisplayName());
+                String inLineMessage = BundleUtil.getStringFromBundle("dataset.file.inline.message", args);
+                dataFile.setDuplicateFilename(inLineMessage);
             } else {
                 // OK, this one is not a duplicate, we want it. 
                 // But let's check if its filename is a duplicate of another 
                 // file already uploaded, or already in the dataset:
+                /*
                 dataFile.getFileMetadata().setLabel(duplicateFilenameCheck(dataFile.getFileMetadata()));
                 if (isTemporaryPreviewAvailable(dataFile.getStorageIdentifier(), dataFile.getContentType())) {
                     dataFile.setPreviewImageAvailable(true);
                 }
                 uploadedFiles.add(dataFile);
+                 */
                 // We are NOT adding the fileMetadata to the list that is being used
                 // to render the page; we'll do that once we know that all the individual uploads
                 // in this batch (as in, a bunch of drag-and-dropped files) have finished. 
                 //fileMetadatas.add(dataFile.getFileMetadata());
             }
 
+            dataFile.getFileMetadata().setLabel(duplicateFilenameCheck(dataFile.getFileMetadata()));
+            if (isTemporaryPreviewAvailable(dataFile.getStorageIdentifier(), dataFile.getContentType())) {
+                dataFile.setPreviewImageAvailable(true);
+            }
+            uploadedFiles.add(dataFile);
+            uploadedInThisProcess.add(dataFile);
             /*
              preserved old, pre 4.6 code - mainly as an illustration of how we used to do this. 
             
@@ -2061,38 +2416,41 @@ private String processUploadedFileList(List<DataFile> dFileList) {
                 }
             } */
         }
-        
+
         // -----------------------------------------------------------
         // Format error message for duplicate files
         // (note the separate messages for the files already in the dataset, 
         // and the newly uploaded ones)
         // -----------------------------------------------------------
-        if (dupeFileNamesExisting != null) {
+        if (existingFilesWithDupeContent != null) {
             String duplicateFilesErrorMessage = null;
+            List<String> args = Arrays.asList(uploadedFilesWithDupeContentToExisting, existingFilesWithDupeContent);
+
             if (multipleDupesExisting) {
-                duplicateFilesErrorMessage =  getBundleString("dataset.files.exist") + dupeFileNamesExisting + getBundleString("dataset.file.skip");
+                duplicateFilesErrorMessage = BundleUtil.getStringFromBundle("dataset.files.exist", args);
             } else {
-            	duplicateFilesErrorMessage = getBundleString("dataset.file.exist") + dupeFileNamesExisting;
+                duplicateFilesErrorMessage = BundleUtil.getStringFromBundle("dataset.file.exist", args);
             }
             if (warningMessage == null) {
                 warningMessage = duplicateFilesErrorMessage;
             } else {
-                warningMessage = warningMessage.concat("; " + duplicateFilesErrorMessage);
+                warningMessage = warningMessage.concat(" " + duplicateFilesErrorMessage);
             }
         }
 
-        if (dupeFileNamesNew != null) {
+        if (newlyUploadedFilesWithDupeContent != null) {
             String duplicateFilesErrorMessage = null;
+            List<String> args = Arrays.asList(newlyUploadedFilesWithDupeContent, uploadedFilesWithDupeContentToNewlyUploaded);
+
             if (multipleDupesNew) {
-            	duplicateFilesErrorMessage = getBundleString("dataset.files.duplicate") + dupeFileNamesNew + getBundleString("dataset.file.skip");
+                duplicateFilesErrorMessage = BundleUtil.getStringFromBundle("dataset.files.duplicate", args);
             } else {
-            	duplicateFilesErrorMessage = getBundleString("dataset.file.duplicate") + dupeFileNamesNew + getBundleString("dataset.file.skip");
+                duplicateFilesErrorMessage = BundleUtil.getStringFromBundle("dataset.file.duplicate", args);
             }
-
             if (warningMessage == null) {
                 warningMessage = duplicateFilesErrorMessage;
             } else {
-                warningMessage = warningMessage.concat("; " + duplicateFilesErrorMessage);
+                warningMessage = warningMessage.concat(" " + duplicateFilesErrorMessage);
             }
         }
 
@@ -2103,39 +2461,37 @@ private String processUploadedFileList(List<DataFile> dFileList) {
 
         return null;
     }
-    
+
     private Map<String, String> temporaryThumbnailsMap = new HashMap<>();
-    
+
     public boolean isTemporaryPreviewAvailable(String fileSystemId, String mimeType) {
         if (temporaryThumbnailsMap.get(fileSystemId) != null && !temporaryThumbnailsMap.get(fileSystemId).isEmpty()) {
             return true;
         }
-        
+
         if ("".equals(temporaryThumbnailsMap.get(fileSystemId))) {
             // we've already looked once - and there's no thumbnail.
             return false;
         }
-        
-        String filesRootDirectory = System.getProperty("dataverse.files.directory");
-        if (filesRootDirectory == null || filesRootDirectory.isEmpty()) {
-            filesRootDirectory = "/tmp/files";
-        }
+
+        // Retrieve via MPCONFIG. Has sane default /tmp/dataverse from META-INF/microprofile-config.properties
+        String filesRootDirectory = JvmSettings.FILES_DIRECTORY.lookup();
 
         String fileSystemName = filesRootDirectory + "/temp/" + fileSystemId;
-        
+
         String imageThumbFileName = null;
-        
+
         // ATTENTION! TODO: the current version of the method below may not be checking if files are already cached!
         if ("application/pdf".equals(mimeType)) {
             imageThumbFileName = ImageThumbConverter.generatePDFThumbnailFromFile(fileSystemName, ImageThumbConverter.DEFAULT_THUMBNAIL_SIZE);
         } else if (mimeType != null && mimeType.startsWith("image/")) {
             imageThumbFileName = ImageThumbConverter.generateImageThumbnailFromFile(fileSystemName, ImageThumbConverter.DEFAULT_THUMBNAIL_SIZE);
         }
-        
+
         if (imageThumbFileName != null) {
             File imageThumbFile = new File(imageThumbFileName);
             if (imageThumbFile.exists()) {
-                String previewAsBase64 = ImageThumbConverter.getImageAsBase64FromFile(imageThumbFile); 
+                String previewAsBase64 = ImageThumbConverter.getImageAsBase64FromFile(imageThumbFile);
                 if (previewAsBase64 != null) {
                     temporaryThumbnailsMap.put(fileSystemId, previewAsBase64);
                     return true;
@@ -2144,27 +2500,28 @@ public boolean isTemporaryPreviewAvailable(String fileSystemId, String mimeType)
                 }
             }
         }
-            
+
         return false;
     }
-    
+
     public String getTemporaryPreviewAsBase64(String fileSystemId) {
         return temporaryThumbnailsMap.get(fileSystemId);
     }
 
-    private Set<String> fileLabelsExisting = null; 
-    
+    private Set<String> fileLabelsExisting = null;
+
     private String duplicateFilenameCheck(FileMetadata fileMetadata) {
         if (fileLabelsExisting == null) {
             fileLabelsExisting = IngestUtil.existingPathNamesAsSet(workingVersion);
         }
-        
+
         return IngestUtil.duplicateFilenameCheck(fileMetadata, fileLabelsExisting);
     }
 
-    private  Map<String, Integer> checksumMapOld = null; // checksums of the files already in the dataset
-    private  Map<String, Integer> checksumMapNew = null; // checksums of the new files already uploaded
-    
+    private Map<String, DataFile> checksumMapOld = null; // checksums of the files already in the dataset
+    private Map<String, DataFile> checksumMapNew = null; // checksums of the new files already uploaded
+    private Map<DataFile, DataFile> fileAlreadyExists = null;
+
     private void initChecksumMap() {
         checksumMapOld = new HashMap<>();
 
@@ -2175,44 +2532,42 @@ private void initChecksumMap() {
             if (fm.getDataFile() != null && fm.getDataFile().getId() != null) {
                 String chksum = fm.getDataFile().getChecksumValue();
                 if (chksum != null) {
-                    checksumMapOld.put(chksum, 1);
+                    checksumMapOld.put(chksum, fm.getDataFile());
 
                 }
             }
         }
 
     }
-    
+
     private boolean isFileAlreadyInDataset(DataFile dataFile) {
         if (checksumMapOld == null) {
             initChecksumMap();
         }
-        
+
+        if (fileAlreadyExists == null) {
+            fileAlreadyExists = new HashMap<>();
+        }
+
         String chksum = dataFile.getChecksumValue();
-        
+
+        if (checksumMapOld.get(chksum) != null) {
+            fileAlreadyExists.put(dataFile, checksumMapOld.get(chksum));
+        }
+
         return chksum == null ? false : checksumMapOld.get(chksum) != null;
     }
-    
+
     private boolean isFileAlreadyUploaded(DataFile dataFile) {
+
         if (checksumMapNew == null) {
             checksumMapNew = new HashMap<>();
         }
-        
-        String chksum = dataFile.getChecksumValue();
-        
-        if (chksum == null) {
-            return false;
-        }
-        
-        if (checksumMapNew.get(chksum) != null) {
-            return true;
-        }
-        
-        checksumMapNew.put(chksum, 1);
-        return false;
+
+        return FileUtil.isFileAlreadyUploaded(dataFile, checksumMapNew, fileAlreadyExists);
+
     }
-    
- 
+
     public boolean isLocked() {
         if (dataset != null) {
             logger.log(Level.FINE, "checking lock status of dataset {0}", dataset.getId());
@@ -2221,33 +2576,19 @@ public boolean isLocked() {
                 // version of the dataset is locked:
             }
             Dataset lookedupDataset = datasetService.find(dataset.getId());
-            
-            if ( (lookedupDataset!=null) && lookedupDataset.isLocked() ) {
+
+            if ((lookedupDataset != null) && lookedupDataset.isLocked()) {
                 logger.fine("locked!");
                 return true;
             }
         }
         return false;
     }
-    
-    public boolean isThumbnailAvailable(FileMetadata fileMetadata) {
-        // new and optimized logic: 
-        // - check download permission here (should be cached - so it's free!)
-        // - only then ask the file service if the thumbnail is available/exists.
-        // the service itself no longer checks download permissions.  
-        if (!fileDownloadHelper.canDownloadFile(fileMetadata)) {
-            return false;
-        }
-
-        return datafileService.isThumbnailAvailable(fileMetadata.getDataFile());
-    }
-    
 
-    
     private Boolean lockedFromEditsVar;
-    
+
     public boolean isLockedFromEdits() {
-        if(null == lockedFromEditsVar ) {
+        if (null == lockedFromEditsVar) {
             try {
                 permissionService.checkEditDatasetLock(dataset, dvRequestService.getDataverseRequest(), new UpdateDatasetVersionCommand(dataset, dvRequestService.getDataverseRequest()));
                 lockedFromEditsVar = false;
@@ -2257,16 +2598,15 @@ public boolean isLockedFromEdits() {
         }
         return lockedFromEditsVar;
     }
-    
+
     // Methods for edit functions that are performed on one file at a time, 
     // in popups that block the rest of the page:
-    
     private FileMetadata fileMetadataSelected = null;
 
-    public void  setFileMetadataSelected(FileMetadata fm){
-       setFileMetadataSelected(fm, null); 
+    public void setFileMetadataSelected(FileMetadata fm) {
+        setFileMetadataSelected(fm, null);
     }
-    
+
     public void setFileMetadataSelected(FileMetadata fm, String guestbook) {
 
         fileMetadataSelected = fm;
@@ -2285,27 +2625,26 @@ public FileMetadata getFileMetadataSelected() {
     public void clearFileMetadataSelected() {
         fileMetadataSelected = null;
     }
-    
-    public boolean isDesignatedDatasetThumbnail (FileMetadata fileMetadata) {
+
+    public boolean isDesignatedDatasetThumbnail(FileMetadata fileMetadata) {
         if (fileMetadata != null) {
             if (fileMetadata.getDataFile() != null) {
                 if (fileMetadata.getDataFile().getId() != null) {
                     //if (fileMetadata.getDataFile().getOwner() != null) {
-                        if (fileMetadata.getDataFile().equals(dataset.getThumbnailFile())) {
-                            return true;
-                        }
+                    if (fileMetadata.getDataFile().equals(dataset.getThumbnailFile())) {
+                        return true;
+                    }
                     //}
                 }
             }
         }
         return false;
     }
-    
+
     /* 
      * Items for the "Designated this image as the Dataset thumbnail: 
      */
-    
-    private FileMetadata fileMetadataSelectedForThumbnailPopup = null; 
+    private FileMetadata fileMetadataSelectedForThumbnailPopup = null;
 
     /**
      * @param fm
@@ -2315,22 +2654,22 @@ public boolean isDesignatedDatasetThumbnail (FileMetadata fileMetadata) {
      * button is in editFilesFragment.xhtml and it would be nice to move it to
      * Java since it's getting long and a bit complicated.
      */
-    public void  setFileMetadataSelectedForThumbnailPopup(FileMetadata fm){
-       fileMetadataSelectedForThumbnailPopup = fm; 
-       alreadyDesignatedAsDatasetThumbnail = getUseAsDatasetThumbnail();
+    public void setFileMetadataSelectedForThumbnailPopup(FileMetadata fm) {
+        fileMetadataSelectedForThumbnailPopup = fm;
+        alreadyDesignatedAsDatasetThumbnail = getUseAsDatasetThumbnail();
 
     }
-    
+
     public FileMetadata getFileMetadataSelectedForThumbnailPopup() {
         return fileMetadataSelectedForThumbnailPopup;
     }
-    
+
     public void clearFileMetadataSelectedForThumbnailPopup() {
         fileMetadataSelectedForThumbnailPopup = null;
     }
-    
-    private boolean alreadyDesignatedAsDatasetThumbnail = false; 
-    
+
+    private boolean alreadyDesignatedAsDatasetThumbnail = false;
+
     public boolean getUseAsDatasetThumbnail() {
 
         return isDesignatedDatasetThumbnail(fileMetadataSelectedForThumbnailPopup);
@@ -2385,7 +2724,7 @@ public void deleteDatasetLogoAndUseThisDataFileAsThumbnailInstead() {
     }
 
     public boolean isThumbnailIsFromDatasetLogoRatherThanDatafile() {
-        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail();
+        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
         return datasetThumbnail != null && !datasetThumbnail.isFromDataFile();
     }
 
@@ -2393,24 +2732,23 @@ public boolean isThumbnailIsFromDatasetLogoRatherThanDatafile() {
      * Items for the "Tags (Categories)" popup.
      *
      */
-    private FileMetadata fileMetadataSelectedForTagsPopup = null; 
+    private FileMetadata fileMetadataSelectedForTagsPopup = null;
 
-    public void  setFileMetadataSelectedForTagsPopup(FileMetadata fm){
+    public void setFileMetadataSelectedForTagsPopup(FileMetadata fm) {
         fileMetadataSelectedForTagsPopup = fm;
     }
-    
+
     public FileMetadata getFileMetadataSelectedForTagsPopup() {
         return fileMetadataSelectedForTagsPopup;
     }
-    
+
     public void clearFileMetadataSelectedForTagsPopup() {
         fileMetadataSelectedForTagsPopup = null;
     }
-    
+
     /*
      * 1. Tabular File Tags: 
      */
-    
     private List<String> tabFileTags = null;
 
     public List<String> getTabFileTags() {
@@ -2423,7 +2761,7 @@ public List<String> getTabFileTags() {
     public void setTabFileTags(List<String> tabFileTags) {
         this.tabFileTags = tabFileTags;
     }
-    
+
     private String[] selectedTabFileTags = {};
 
     public String[] getSelectedTabFileTags() {
@@ -2435,13 +2773,20 @@ public void setSelectedTabFileTags(String[] selectedTabFileTags) {
     }
 
     private String[] selectedTags = {};
-    
-    public void refreshTagsPopUp(FileMetadata fm){
+
+    public void refreshTagsPopUp(FileMetadata fm) {
+                if(!isHasValidTermsOfAccess()){
+                PrimeFaces.current().executeScript("PF('blockDatasetForm').show()");
+                PrimeFaces.current().executeScript("PF('accessPopup').show()");
+                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editTerms.label"), BundleUtil.getStringFromBundle("dataset.message.editTerms.message"));
+                return; 
+        }
         setFileMetadataSelectedForTagsPopup(fm);
         refreshCategoriesByName();
         refreshTabFileTagsByName();
+        PrimeFaces.current().executeScript("PF('editFileTagsPopup').show()");
     }
-    
+
     private List<String> tabFileTagsByName;
 
     public List<String> getTabFileTagsByName() {
@@ -2451,7 +2796,7 @@ public List<String> getTabFileTagsByName() {
     public void setTabFileTagsByName(List<String> tabFileTagsByName) {
         this.tabFileTagsByName = tabFileTagsByName;
     }
-    
+
     private void refreshTabFileTagsByName() {
         tabFileTagsByName = new ArrayList<>();
         if (fileMetadataSelectedForTagsPopup.getDataFile().getTags() != null) {
@@ -2476,13 +2821,13 @@ private void refreshSelectedTabFileTags() {
     
     private void refreshCategoriesByName(){
         categoriesByName= new ArrayList<>();
-        for (String category: dataset.getCategoriesByName() ){
+        List<String> datasetFileCategories = dataFileCategoryService.mergeDatasetFileCategories(dataset.getCategories());
+        for (String category: datasetFileCategories ){
             categoriesByName.add(category);
         }
         refreshSelectedTags();
     }
-    
-    
+
     private List<String> categoriesByName;
 
     public List<String> getCategoriesByName() {
@@ -2492,7 +2837,7 @@ public List<String> getCategoriesByName() {
     public void setCategoriesByName(List<String> categoriesByName) {
         this.categoriesByName = categoriesByName;
     }
-    
+
     private void refreshSelectedTags() {
         selectedTags = null;
         selectedTags = new String[0];
@@ -2522,13 +2867,10 @@ public String[] getSelectedTags() {
     public void setSelectedTags(String[] selectedTags) {
         this.selectedTags = selectedTags;
     }
-    
-
 
     /*
      * "File Tags" (aka "File Categories"): 
-    */
-    
+     */
     private String newCategoryName = null;
 
     public String getNewCategoryName() {
@@ -2538,9 +2880,9 @@ public String getNewCategoryName() {
     public void setNewCategoryName(String newCategoryName) {
         this.newCategoryName = newCategoryName;
     }
-       
+
     public String saveNewCategory() {
-       
+
         if (newCategoryName != null && !newCategoryName.isEmpty()) {
             categoriesByName.add(newCategoryName);
         }
@@ -2553,24 +2895,30 @@ public String saveNewCategory() {
         newCategoryName = "";
         return "";
     }
+    
+    public void handleSelection(final AjaxBehaviorEvent event) {
+        if (selectedTags != null) {
+            selectedTags = selectedTags.clone();
+        }
+    }
 
     /* This method handles saving both "tabular file tags" and 
      * "file categories" (which are also considered "tags" in 4.0)
-    */
+     */
     public void saveFileTagsAndCategories() {
         if (fileMetadataSelectedForTagsPopup == null) {
             logger.fine("No FileMetadata selected for the categories popup");
-            return; 
+            return;
         }
         // 1. File categories:
         /*
         In order to get the cancel button to work we had to separate the selected tags 
         from the file metadata and re-add them on save
         
-        */
-        
+         */
+
         fileMetadataSelectedForTagsPopup.setCategories(new ArrayList<>());
-        
+
         // New, custom file category (if specified):
         if (newCategoryName != null) {
             logger.fine("Adding new category, " + newCategoryName + " for file " + fileMetadataSelectedForTagsPopup.getLabel());
@@ -2579,17 +2927,16 @@ public void saveFileTagsAndCategories() {
             logger.fine("no category specified");
         }
         newCategoryName = null;
-        
+
         // File Categories selected from the list of existing categories: 
         if (selectedTags != null) {
             for (String selectedTag : selectedTags) {
-                
+
                 fileMetadataSelectedForTagsPopup.addCategoryByName(selectedTag);
             }
-        }        
-                
+        }
+
         // 2. Tabular DataFile Tags: 
-        
         if (fileMetadataSelectedForTagsPopup.getDataFile() != null && tabularDataTagsUpdated && selectedTabFileTags != null) {
             fileMetadataSelectedForTagsPopup.getDataFile().setTags(null);
             for (String selectedTabFileTag : selectedTabFileTags) {
@@ -2604,39 +2951,39 @@ public void saveFileTagsAndCategories() {
                 }
             }
         }
-        
+
         fileMetadataSelectedForTagsPopup = null;
 
     }
-    
+
     public void handleFileCategoriesSelection(final AjaxBehaviorEvent event) {
         if (selectedTags != null) {
             selectedTags = selectedTags.clone();
         }
     }
-    
+
     public void handleTabularTagsSelection(final AjaxBehaviorEvent event) {
         tabularDataTagsUpdated = true;
     }
-        
+
     /* 
      * Items for the "Advanced (Ingest) Options" popup. 
      * 
      */
-    private FileMetadata fileMetadataSelectedForIngestOptionsPopup = null; 
+    private FileMetadata fileMetadataSelectedForIngestOptionsPopup = null;
 
-    public void  setFileMetadataSelectedForIngestOptionsPopup(FileMetadata fm){
-       fileMetadataSelectedForIngestOptionsPopup = fm; 
+    public void setFileMetadataSelectedForIngestOptionsPopup(FileMetadata fm) {
+        fileMetadataSelectedForIngestOptionsPopup = fm;
     }
-    
+
     public FileMetadata getFileMetadataSelectedForIngestOptionsPopup() {
         return fileMetadataSelectedForIngestOptionsPopup;
     }
-    
+
     public void clearFileMetadataSelectedForIngestOptionsPopup() {
         fileMetadataSelectedForIngestOptionsPopup = null;
     }
-    
+
     private String ingestLanguageEncoding = null;
 
     public String getIngestLanguageEncoding() {
@@ -2664,7 +3011,7 @@ public void handleLabelsFileUpload(FileUploadEvent event) {
 
             InputStream uploadStream = null;
             try {
-                uploadStream = file.getInputstream();
+                uploadStream = file.getInputStream();
             } catch (IOException ioex) {
                 logger.info("the file " + file.getFileName() + " failed to upload!");
                 List<String> args = Arrays.asList(file.getFileName());
@@ -2747,6 +3094,31 @@ public void saveAdvancedOptions() {
         fileMetadataSelectedForIngestOptionsPopup = null;
     }
 
+    public boolean rsyncUploadSupported() {
+        // ToDo - rsync was written before multiple store support and currently is hardcoded to use the DataAccess.S3 store. 
+        // When those restrictions are lifted/rsync can be configured per store, the test in the 
+        // Dataset Util method should be updated
+        if (settingsWrapper.isRsyncUpload() && !DatasetUtil.isRsyncAppropriateStorageDriver(dataset)) {
+            //dataset.file.upload.setUp.rsync.failed.detail
+            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.file.upload.setUp.rsync.failed"), BundleUtil.getStringFromBundle("dataset.file.upload.setUp.rsync.failed.detail"));
+            FacesContext.getCurrentInstance().addMessage(null, message);
+        }
+
+        return settingsWrapper.isRsyncUpload() && DatasetUtil.isRsyncAppropriateStorageDriver(dataset);
+    }
+    
+    // Globus must be one of the upload methods listed in the :UploadMethods setting
+    // and the dataset's store must be in the list allowed by the GlobusStores
+    // setting
+    public boolean globusUploadSupported() {
+        return settingsWrapper.isGlobusUpload()
+                && settingsWrapper.isGlobusEnabledStorageDriver(dataset.getEffectiveStorageDriverId());
+    }
+    
+    public boolean webloaderUploadSupported() {
+        return settingsWrapper.isWebloaderUpload() && StorageIO.isDirectUploadEnabled(dataset.getEffectiveStorageDriverId());
+    }
+
     private void populateFileMetadatas() {
         fileMetadatas = new ArrayList<>();
         if (selectedFileIdsList == null || selectedFileIdsList.isEmpty()) {
@@ -2759,6 +3131,44 @@ private void populateFileMetadatas() {
                     fileMetadatas.add(fmd);
                 }
             }
-        }       
-    }    
+        }
+    }
+
+    private String termsOfAccess;
+    private boolean fileAccessRequest;
+
+    public String getTermsOfAccess() {
+        return termsOfAccess;
+    }
+
+    public void setTermsOfAccess(String termsOfAccess) {
+        this.termsOfAccess = termsOfAccess;
+    }
+
+    public boolean isFileAccessRequest() {
+        return fileAccessRequest;
+    }
+
+    public void setFileAccessRequest(boolean fileAccessRequest) {
+        this.fileAccessRequest = fileAccessRequest;
+    }
+    
+    //Determines whether this Dataset uses a public store and therefore doesn't support embargoed or restricted files
+    public boolean isHasPublicStore() {
+        return settingsWrapper.isTrueForKey(SettingsServiceBean.Key.PublicInstall, StorageIO.isPublicStore(dataset.getEffectiveStorageDriverId()));
+    }
+    
+    public String getWebloaderUrlForDataset(Dataset d) {
+        String localeCode = session.getLocaleCode();
+        User user = session.getUser();
+        if (user instanceof AuthenticatedUser) {
+            ApiToken apiToken = authService.getValidApiTokenForUser((AuthenticatedUser) user);
+            return WebloaderUtil.getWebloaderUrl(d, apiToken, localeCode,
+                    settingsService.getValueForKey(SettingsServiceBean.Key.WebloaderUrl));
+        } else {
+            // Shouldn't normally happen (seesion timeout? bug?)
+            logger.warning("getWebloaderUrlForDataset called for non-Authenticated user");
+            return null;
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java
index 36d0f550955..4d6d59cb013 100644
--- a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java
+++ b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java
@@ -2,49 +2,60 @@
 
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
+import edu.harvard.iq.dataverse.dataset.DatasetFieldsValidator;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.util.cache.CacheFactoryBean;
 import edu.harvard.iq.dataverse.engine.DataverseEngine;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
 import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleServiceBean;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.engine.command.exception.RateLimitCommandException;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
-import edu.harvard.iq.dataverse.pidproviders.FakePidProviderServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
 import edu.harvard.iq.dataverse.search.IndexBatchServiceBean;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
+import edu.harvard.iq.dataverse.search.SearchServiceFactory;
+
 import java.util.Map;
 import java.util.Set;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
 import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearchServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.storageuse.StorageUseServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.ConstraintViolationUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.workflow.WorkflowServiceBean;
+import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Stack;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Resource;
-import javax.ejb.EJBContext;
-import javax.ejb.EJBException;
-import javax.ejb.TransactionAttribute;
-import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
-import static javax.ejb.TransactionAttributeType.SUPPORTS;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.annotation.Resource;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import static jakarta.ejb.TransactionAttributeType.REQUIRES_NEW;
+import static jakarta.ejb.TransactionAttributeType.SUPPORTS;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.validation.ConstraintViolationException;
 
 /**
  * An EJB capable of executing {@link Command}s in a JEE environment.
@@ -78,7 +89,7 @@ public class EjbDataverseEngine {
     SolrIndexServiceBean solrIndexService;
 
     @EJB
-    SearchServiceBean searchService;
+    SearchServiceFactory searchServiceFactory;
     
     @EJB
     IngestServiceBean ingestService;
@@ -108,17 +119,8 @@ public class EjbDataverseEngine {
     DataverseFieldTypeInputLevelServiceBean fieldTypeInputLevels;
 
     @EJB
-    DOIEZIdServiceBean doiEZId;
-    
-    @EJB
-    DOIDataCiteServiceBean doiDataCite;
-
-    @EJB
-    FakePidProviderServiceBean fakePidProvider;
+    PidProviderFactoryBean pidProviderFactory;
 
-    @EJB
-    HandlenetServiceBean handleNet;
-    
     @EJB
     SettingsServiceBean settings;
     
@@ -127,13 +129,22 @@ public class EjbDataverseEngine {
     
     @EJB
     GuestbookResponseServiceBean responses;
-    
+
+    @EJB
+    MetadataBlockServiceBean metadataBlockService;
+
+    @EJB
+    DatasetTypeServiceBean datasetTypeService;
+
     @EJB
     DataverseLinkingServiceBean dvLinking;
     
     @EJB
     DatasetLinkingServiceBean dsLinking;
 
+    @EJB
+    DatasetFieldServiceBean dsField;
+
     @EJB
     ExplicitGroupServiceBean explicitGroups;
 
@@ -158,9 +169,6 @@ public class EjbDataverseEngine {
     @EJB
     DatasetVersionServiceBean datasetVersionService;
 
-    @EJB
-    MapLayerMetadataServiceBean mapLayerMetadata;
-
     @EJB
     DataCaptureModuleServiceBean dataCaptureModule;
 
@@ -180,8 +188,22 @@ public class EjbDataverseEngine {
     ConfirmEmailServiceBean confirmEmailService;
     
     @EJB
-    EjbDataverseEngineInner innerEngine;
+    StorageUseServiceBean storageUseService;
+
+    @EJB
+    DataverseFeaturedItemServiceBean dataverseFeaturedItemServiceBean;
+
+    @EJB
+    LicenseServiceBean licenseServiceBean;
+
+    @EJB
+    DatasetFieldsValidator datasetFieldsValidator;
     
+    @EJB
+    EjbDataverseEngineInner innerEngine;
+
+    @EJB
+    CacheFactoryBean cacheFactory;
     
     @Resource
     EJBContext ejbCtxt;
@@ -207,7 +229,11 @@ public <R> R submit(Command<R> aCommand) throws CommandException {
 
         try {
             logRec.setUserIdentifier( aCommand.getRequest().getUser().getIdentifier() );
-            
+            // Check for rate limit exceeded. Must be done before anything else to prevent unnecessary processing.
+            if (!cacheFactory.checkRate(aCommand.getRequest().getUser(), aCommand)) {
+                throw new RateLimitCommandException(BundleUtil.getStringFromBundle("command.exception.user.ratelimited", Arrays.asList(aCommand.getClass().getSimpleName())), aCommand);
+            }
+
             // Check permissions - or throw an exception
             Map<String, ? extends Set<Permission>> requiredMap = aCommand.getRequiredPermissions();
             if (requiredMap == null) {
@@ -215,7 +241,21 @@ public <R> R submit(Command<R> aCommand) throws CommandException {
             }
 
             DataverseRequest dvReq = aCommand.getRequest();
-            
+
+            AuthenticatedUser authenticatedUser = dvReq.getAuthenticatedUser();
+            if (authenticatedUser != null) {
+                AuthenticatedUser auFreshLookup = authentication.findByID(authenticatedUser.getId());
+                if (auFreshLookup == null) {
+                    logger.fine("submit method found user no longer exists (was deleted).");
+                    throw new CommandException(BundleUtil.getStringFromBundle("command.exception.user.deleted", Arrays.asList(aCommand.getClass().getSimpleName())), aCommand);
+                } else {
+                    if (auFreshLookup.isDeactivated()) {
+                        logger.fine("submit method found user is deactivated.");
+                        throw new CommandException(BundleUtil.getStringFromBundle("command.exception.user.deactivated", Arrays.asList(aCommand.getClass().getSimpleName())), aCommand);
+                    }
+                }
+            }
+
             Map<String, DvObject> affectedDvObjects = aCommand.getAffectedDvObjects();
             logRec.setInfo(aCommand.describe());
             for (Map.Entry<String, ? extends Set<Permission>> pair : requiredMap.entrySet()) {
@@ -281,10 +321,7 @@ public <R> R submit(Command<R> aCommand) throws CommandException {
                 if (cause instanceof ConstraintViolationException) {
                     StringBuilder sb = new StringBuilder(); 
                     sb.append("Unexpected bean validation constraint exception:"); 
-                    ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
-                    for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
-                        sb.append(" Invalid value: <<<").append(violation.getInvalidValue()).append(">>> for ").append(violation.getPropertyPath()).append(" at ").append(violation.getLeafBean()).append(" - ").append(violation.getMessage());
-                    }
+                    sb.append(ConstraintViolationUtil.getErrorStringForConstraintViolations(cause));
                     logger.log(Level.SEVERE, sb.toString());
                     // set this more detailed info in action log
                     logRec.setInfo(logRec.getInfo() + " (" +  sb.toString() +")");
@@ -335,12 +372,35 @@ protected void completeCommand(Command command, Object r, Stack<Command> called)
     public CommandContext getContext() {
         if (ctxt == null) {
             ctxt = new CommandContext() {
-                
+
                 public Stack<Command> commandsCalled;
-                
+
                 @Override
-                public void addCommand (Command command){
-                    commandsCalled.push(command);
+                public void addCommand(Command command) {
+
+                    if (logger.isLoggable(Level.FINE) && !commandsCalled.isEmpty()) {
+                        int instance = (int) (100 * Math.random());
+                        try {
+                            logger.fine("Current Command Stack (" + instance + "): ");
+                            commandsCalled.forEach((c) -> {
+                                logger.fine("Command (" + instance + "): " + c.getClass().getSimpleName()
+                                        + "for DvObjects");
+                                for (Map.Entry<String, DvObject> e : ((Map<String, DvObject>) c.getAffectedDvObjects())
+                                        .entrySet()) {
+                                    logger.fine("(" + instance + "): " + e.getKey() + " : " + e.getValue().getId());
+                                }
+                            });
+                            logger.fine("Adding command(" + instance + "): " + command.getClass().getSimpleName()
+                                    + " for DvObjects");
+                            for (Map.Entry<String, DvObject> e : ((Map<String, DvObject>) command
+                                    .getAffectedDvObjects()).entrySet()) {
+                                logger.fine(e.getKey() + " : " + e.getValue().getId());
+                            }
+                        } catch (Exception e) {
+                            logger.fine("Exception logging command stack(" + instance + "): " + e.getMessage());
+                        }
+                    }
+					commandsCalled.push(command);
                 }
                 
                 
@@ -386,8 +446,8 @@ public SolrIndexServiceBean solrIndex() {
                 }
 
                 @Override
-                public SearchServiceBean search() {
-                    return searchService;
+                public SearchServiceFactory search() {
+                    return searchServiceFactory;
                 }
 
                 @Override
@@ -441,25 +501,10 @@ public DataverseFieldTypeInputLevelServiceBean fieldTypeInputLevels() {
                 }
 
                 @Override
-                public DOIEZIdServiceBean doiEZId() {
-                    return doiEZId;
+                public PidProviderFactoryBean pidProviderFactory() {
+                    return pidProviderFactory;
                 }
                 
-                @Override
-                public DOIDataCiteServiceBean doiDataCite() {
-                    return doiDataCite;
-                }
-
-                @Override
-                public FakePidProviderServiceBean fakePidProvider() {
-                    return fakePidProvider;
-                }
-
-                @Override
-                public HandlenetServiceBean handleNet() {
-                    return handleNet;
-                }
-
                 @Override
                 public SettingsServiceBean settings() {
                     return settings;
@@ -484,6 +529,32 @@ public DataverseLinkingServiceBean dvLinking() {
                 public DatasetLinkingServiceBean dsLinking() {
                     return dsLinking;
                 }
+
+                @Override
+                public DatasetFieldServiceBean dsField() {
+                    return dsField;
+                }
+
+                @Override
+                public DataverseFeaturedItemServiceBean dataverseFeaturedItems() {
+                    return dataverseFeaturedItemServiceBean;
+                }
+
+                @Override
+                public DatasetFieldsValidator datasetFieldsValidator() {
+                    return datasetFieldsValidator;
+                }
+
+                @Override
+                public LicenseServiceBean licenses() {
+                    return licenseServiceBean;
+                }
+
+                @Override
+                public StorageUseServiceBean storageUse() {
+                    return storageUseService;
+                }
+                
                 @Override
                 public DataverseEngine engine() {
                     return new DataverseEngine() {
@@ -539,11 +610,6 @@ public WorkflowServiceBean workflows() {
                     return workflowService;
                 }
 
-                @Override
-                public MapLayerMetadataServiceBean mapLayerMetadata() {
-                    return mapLayerMetadata;
-                }
-
                 @Override
                 public DataCaptureModuleServiceBean dataCaptureModule() {
                     return dataCaptureModule;
@@ -564,6 +630,16 @@ public ActionLogServiceBean actionLog() {
                     return logSvc;
                 }
 
+                @Override
+                public MetadataBlockServiceBean metadataBlocks() {
+                    return metadataBlockService;
+                }
+
+                @Override
+                public DatasetTypeServiceBean datasetTypes() {
+                    return datasetTypeService;
+                }
+
                 @Override
                 public void beginCommandSequence() {
                     this.commandsCalled = new Stack();
diff --git a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngineInner.java b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngineInner.java
index d8339dce856..891fe91dc66 100644
--- a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngineInner.java
+++ b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngineInner.java
@@ -4,13 +4,13 @@
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import javax.annotation.Resource;
-import javax.ejb.EJBContext;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import static javax.ejb.TransactionAttributeType.REQUIRED;
+import jakarta.annotation.Resource;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import static jakarta.ejb.TransactionAttributeType.REQUIRED;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/Embargo.java b/src/main/java/edu/harvard/iq/dataverse/Embargo.java
new file mode 100644
index 00000000000..29959b9f2d4
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/Embargo.java
@@ -0,0 +1,110 @@
+package edu.harvard.iq.dataverse;
+
+
+import jakarta.persistence.*;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+import java.time.format.DateTimeFormatter;
+import java.time.LocalDate;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ *
+ * @author mderuijter
+ */
+@NamedQueries({
+        @NamedQuery( name="Embargo.findAll",
+                query = "SELECT e FROM Embargo e"),
+        @NamedQuery( name="Embargo.findById",
+                query = "SELECT e FROM Embargo e WHERE e.id=:id"),
+        @NamedQuery( name="Embargo.findByDateAvailable",
+                query = "SELECT e FROM Embargo e WHERE e.dateAvailable=:dateAvailable"),
+        @NamedQuery( name="Embargo.deleteById",
+                query = "DELETE FROM Embargo e WHERE e.id=:id")
+})
+@Entity
+public class Embargo {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private LocalDate dateAvailable;
+
+    @Column(columnDefinition="TEXT")
+    private String reason;
+
+    @OneToMany(mappedBy="embargo", cascade={ CascadeType.REMOVE, CascadeType.PERSIST})
+    private List<DataFile> dataFiles;
+
+    public Embargo(){
+        dateAvailable = LocalDate.now().plusDays(1);
+    }
+
+    public Embargo(LocalDate dateAvailable, String reason) {
+        this.dateAvailable = dateAvailable;
+        this.reason = reason;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public LocalDate getDateAvailable() {
+        return dateAvailable;
+    }
+
+    public void setDateAvailable(LocalDate dateAvailable) {
+        this.dateAvailable = dateAvailable;
+    }
+
+    public String getFormattedDateAvailable() {
+        return getDateAvailable().format(DateTimeFormatter.ISO_LOCAL_DATE.withLocale(BundleUtil.getCurrentLocale()));
+    }
+    
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public List<DataFile> getDataFiles() {
+        return dataFiles;
+    }
+
+    public void setDataFiles(List<DataFile> dataFiles) {
+        this.dataFiles = dataFiles;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Embargo embargo = (Embargo) o;
+        return id.equals(embargo.id) && dateAvailable.equals(embargo.dateAvailable) && Objects.equals(reason, embargo.reason);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, dateAvailable, reason);
+    }
+
+    @Override
+    public String toString() {
+        return "Embargo{" +
+                "id=" + id +
+                ", dateAvailable=" + dateAvailable +
+                ", reason='" + reason + '\'' +
+                '}';
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/EmbargoServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/EmbargoServiceBean.java
new file mode 100644
index 00000000000..d0a8d214959
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/EmbargoServiceBean.java
@@ -0,0 +1,65 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
+import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import java.util.List;
+
+/**
+ * @author mderuijter
+ */
+@Stateless
+@Named
+public class EmbargoServiceBean {
+
+    @PersistenceContext
+    EntityManager em;
+
+    @EJB
+    ActionLogServiceBean actionLogSvc;
+
+    public List<Embargo> findAllEmbargoes() {
+        return em.createNamedQuery("Embargo.findAll", Embargo.class).getResultList();
+    }
+
+    public Embargo findByEmbargoId(Long id) {
+        Query query = em.createNamedQuery("Embargo.findById", Embargo.class);
+        query.setParameter("id", id);
+        try {
+            return (Embargo) query.getSingleResult();
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    public Embargo merge(Embargo e) {
+        return em.merge(e);
+    }
+    
+    public Long save(Embargo embargo, String userIdentifier) {
+        if (embargo.getId() == null) {
+            em.persist(embargo);
+            em.flush();
+        }
+        //Not quite from a command, but this action can be done by anyone, so command seems better than Admin or other alternatives
+        actionLogSvc.log(new ActionLogRecord(ActionLogRecord.ActionType.Command, "embargoCreate")
+                .setInfo("id: " + embargo.getId() + " date available: " + embargo.getDateAvailable() + " reason: " + embargo.getReason()).setUserIdentifier(userIdentifier));
+        return embargo.getId();
+    }
+
+    public int deleteById(long id, String userIdentifier) {
+        //Not quite from a command, but this action can be done by anyone, so command seems better than Admin or other alternatives
+        actionLogSvc.log(new ActionLogRecord(ActionLogRecord.ActionType.Command, "embargoDelete")
+                .setInfo(Long.toString(id))
+                .setUserIdentifier(userIdentifier));
+        return em.createNamedQuery("Embargo.deleteById")
+                .setParameter("id", id)
+                .executeUpdate();
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java b/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java
new file mode 100644
index 00000000000..c90fdc6edc2
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java
@@ -0,0 +1,110 @@
+package edu.harvard.iq.dataverse;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Index;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import java.io.Serializable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+/**
+ *
+ * @author landreev
+ * 
+ * The name of the class is provisional. I'm open to better-sounding alternatives,
+ * if anyone can think of any. 
+ * But I wanted to avoid having the word "Globus" in the entity name. I'm adding 
+ * it specifically for the Globus use case. But I'm guessing there's a chance 
+ * this setup may come in handy for other types of datafile uploads that happen
+ * externally. (?)
+ */
+@NamedQueries({
+    @NamedQuery(name = "ExternalFileUploadInProgress.deleteByTaskId",
+            query = "DELETE FROM ExternalFileUploadInProgress f WHERE f.taskId=:taskId"),
+    @NamedQuery(name = "ExternalFileUploadInProgress.findByTaskId",
+            query = "SELECT f FROM ExternalFileUploadInProgress f WHERE f.taskId=:taskId")})
+@Entity
+@Table(indexes = {@Index(columnList="taskid")})
+public class ExternalFileUploadInProgress implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+    /**
+     * Rather than saving various individual fields defining the datafile, 
+     * which would essentially replicate the DataFile table, we are simply 
+     * storing the full json record as passed to the API here.  
+     */
+    @Column(columnDefinition = "TEXT", nullable=false)
+    private String fileInfo;
+    
+    /**
+     * This is Globus-specific task id associated with the upload in progress
+     */  
+    @Column(nullable=false)
+    private String taskId; 
+    
+    public ExternalFileUploadInProgress() {
+    }
+
+    public ExternalFileUploadInProgress(String taskId, String fileInfo) {
+        this.taskId = taskId;
+        this.fileInfo = fileInfo;
+    }
+    
+    public String getFileInfo() {
+        return fileInfo;
+    }
+    
+    public void setFileInfo(String fileInfo) {
+        this.fileInfo = fileInfo;
+    }
+    
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+    
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof ExternalFileUploadInProgress)) {
+            return false;
+        }
+        ExternalFileUploadInProgress other = (ExternalFileUploadInProgress) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "edu.harvard.iq.dataverse.ExternalFileUploadInProgress[ id=" + id + " ]";
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ExternalIdentifier.java b/src/main/java/edu/harvard/iq/dataverse/ExternalIdentifier.java
new file mode 100644
index 00000000000..ef4bcb312c1
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/ExternalIdentifier.java
@@ -0,0 +1,64 @@
+package edu.harvard.iq.dataverse;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public enum ExternalIdentifier {
+    ORCID("ORCID", "https://orcid.org/%s", "^(https:\\/\\/orcid\\.org\\/)?\\d{4}-\\d{4}-\\d{4}-(\\d{4}|\\d{3}X)$"),
+    ISNI("ISNI", "http://www.isni.org/isni/%s", "^(http:\\/\\/www\\.isni\\.org\\/isni\\/)?(\\d{16}|\\d{15}X)$"),
+    LCNA("LCNA", "http://id.loc.gov/authorities/names/%s", "^(http:\\/\\/id\\.loc\\.gov\\/authorities\\/names\\/)?[a-z]+\\d+$"),
+    VIAF("VIAF", "https://viaf.org/viaf/%s", "^(https:\\/\\/viaf\\.org\\/viaf\\/)?\\d*$"),
+    // GND regex from https://www.wikidata.org/wiki/Property:P227
+    GND("GND", "https://d-nb.info/gnd/%s", "^(https:\\/\\/d-nb\\.info\\/gnd\\/)?(1[01]?\\d{7}[0-9X]|[47]\\d{6}-\\d|[1-9]\\d{0,7}-[0-9X]|3\\d{7}[0-9X])$"),
+    // note: DAI is missing from this list, because it doesn't have resolvable URL
+    ResearcherID("ResearcherID", "https://publons.com/researcher/%s/", "^([A-Z\\d][A-Z\\d-]+[A-Z\\d]|(https:\\/\\/publons\\.com\\/researcher\\/)?[A-Z\\d][A-Z\\d-]+[A-Z\\d]\\/)$"),
+    ScopusID("ScopusID", "https://www.scopus.com/authid/detail.uri?authorId=%s", "^(https:\\/\\/www\\.scopus\\.com\\/authid\\/detail\\.uri\\?authorId=)?\\d*$"),
+    // ROR regex from https://ror.readme.io/docs/identifier
+    ROR("ROR", "https://ror.org/%s", "^(https:\\/\\/ror\\.org\\/)?0[a-hj-km-np-tv-z|0-9]{6}[0-9]{2}$"),
+    DAI("DAI", "info:eu-repo/dai/nl/%s", "^(info:eu-repo\\/dai\\/nl\\/)?[\\d]?\\d{8}[0-9X]$");
+
+    private String name;
+    private String template;
+    private Pattern pattern;
+    private Matcher matcher;
+
+    ExternalIdentifier(String name, String template, String regex) {
+      this.template = template;
+      this.pattern = Pattern.compile(regex);
+      this.matcher = pattern.matcher("");
+    }
+
+    public ExternalIdentifier of(String name) {
+        System.err.println(name);
+        for (ExternalIdentifier identifier : values()) {
+            System.err.println(" vs " + identifier.name);
+            if (identifier.name.toLowerCase().equals(name.toLowerCase())) {
+              return identifier;
+            }
+        }
+        return null;
+    }
+
+    public boolean isValidIdentifier(String userInput) {
+        return matcher.reset(userInput).matches();
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public String getTemplate() {
+      return template;
+    }
+
+    public Pattern getPattern() {
+      return pattern;
+    }
+
+    public String format(String idValue) {
+        if(idValue.startsWith(template.substring(0,template.indexOf("%s")))) {
+            return idValue; 
+        }
+        return String.format(template, idValue);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ExternalVocabularyValue.java b/src/main/java/edu/harvard/iq/dataverse/ExternalVocabularyValue.java
new file mode 100644
index 00000000000..7ebfa0302ac
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/ExternalVocabularyValue.java
@@ -0,0 +1,93 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package edu.harvard.iq.dataverse;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Objects;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.Table;
+
+/**
+ *
+ * @author qqmyers
+ */
+@Entity
+@Table(indexes = { @Index(columnList = "uri")})
+public class ExternalVocabularyValue implements Serializable {
+
+    public ExternalVocabularyValue() {
+    }
+
+    public ExternalVocabularyValue(String uri, String value) {
+        this.uri = uri;
+        this.value = value;
+    }
+
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    
+    @Column(columnDefinition = "TEXT", unique=true, nullable = false)
+    private String uri;
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    @Column(columnDefinition = "TEXT", nullable = true)
+    private String value;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    private Timestamp lastUpdateDate;
+
+    public Timestamp getLastUpdateDate() {
+        return lastUpdateDate;
+    }
+
+    public void setLastUpdateDate(Timestamp lastUpdateDate) {
+        this.lastUpdateDate = lastUpdateDate;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (this.uri != null ? this.uri.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        if (!(object instanceof ExternalVocabularyValue)) {
+            return false;
+        }
+        ExternalVocabularyValue other = (ExternalVocabularyValue) object;
+        return Objects.equals(getUri(), other.getUri());
+    }
+
+    @Override
+    public String toString() {
+        return "edu.harvard.iq.dataverse.ExternalVocabularyValue[ uri=" + uri + " ]";
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/FacetConverter.java b/src/main/java/edu/harvard/iq/dataverse/FacetConverter.java
index 478bc2dee53..fd41315dbc0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FacetConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FacetConverter.java
@@ -5,12 +5,13 @@
  */
 package edu.harvard.iq.dataverse;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.inject.spi.CDI;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
 
 /**
  *
@@ -19,8 +20,8 @@
 @FacesConverter("facetConverter")
 public class FacetConverter implements Converter {
 
-    @EJB
-    DatasetFieldServiceBean datasetFieldService;
+    //@EJB
+    DatasetFieldServiceBean datasetFieldService = CDI.current().select(DatasetFieldServiceBean.class).get();
 
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
         return datasetFieldService.find(new Long(submittedValue));
diff --git a/src/main/java/edu/harvard/iq/dataverse/FeaturedDataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/FeaturedDataverseServiceBean.java
index e7362587c36..8e3ff0aa581 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FeaturedDataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FeaturedDataverseServiceBean.java
@@ -9,11 +9,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 /**
  *
@@ -66,8 +66,11 @@ public List<Dataverse> findByDataverseIdQuick(Long dataverseId) {
             }
             
             dataverse.setDataverseTheme(dataverseService.findDataverseThemeByIdQuick(id));
-            if (dataverse.getDataverseTheme()!=null){
-                logger.fine("THEME: "+dataverse.getDataverseTheme().getLogo()+", "+dataverse.getDataverseTheme().getLogoFormat());
+            if (dataverse.getDataverseTheme() != null) {
+                logger.fine("THEME: "
+                        + dataverse.getDataverseTheme().getLogo() + ", "
+                        + dataverse.getDataverseTheme().getLogoFormat() + ", "
+                        + dataverse.getDataverseTheme().getLogoThumbnail());
             }
             ret.add(dataverse);
          }
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileAccessRequest.java b/src/main/java/edu/harvard/iq/dataverse/FileAccessRequest.java
new file mode 100644
index 00000000000..51c67a37a09
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/FileAccessRequest.java
@@ -0,0 +1,200 @@
+package edu.harvard.iq.dataverse;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+
+/**
+ *
+ * @author Marina
+ */
+
+@Entity
+@Table(name = "fileaccessrequests")
+
+@NamedQueries({
+        @NamedQuery(name = "FileAccessRequest.findByAuthenticatedUserId",
+                query = "SELECT far FROM FileAccessRequest far WHERE far.user.id=:authenticatedUserId"),
+        @NamedQuery(name = "FileAccessRequest.findByGuestbookResponseId",
+                query = "SELECT far FROM FileAccessRequest far WHERE far.guestbookResponse.id=:guestbookResponseId"),
+        @NamedQuery(name = "FileAccessRequest.findByDataFileId",
+                query = "SELECT far FROM FileAccessRequest far WHERE far.dataFile.id=:dataFileId"),
+        @NamedQuery(name = "FileAccessRequest.findByRequestState",
+                query = "SELECT far FROM FileAccessRequest far WHERE far.requestState=:requestState"),
+        @NamedQuery(name = "FileAccessRequest.findByAuthenticatedUserIdAndRequestState",
+                query = "SELECT far FROM FileAccessRequest far WHERE far.user.id=:authenticatedUserId and far.requestState=:requestState"),
+        @NamedQuery(name = "FileAccessRequest.findByGuestbookResponseIdAndRequestState",
+                query = "SELECT far FROM FileAccessRequest far WHERE far.guestbookResponse.id=:guestbookResponseId and far.requestState=:requestState"),
+        @NamedQuery(name = "FileAccessRequest.findByDataFileIdAndRequestState",
+                query = "SELECT far FROM FileAccessRequest far WHERE far.dataFile.id=:dataFileId and far.requestState=:requestState"),
+        @NamedQuery(name = "FileAccessRequest.findByAuthenticatedUserIdAndDataFileIdAndRequestState",
+                query = "SELECT far FROM FileAccessRequest far WHERE far.user.id=:authenticatedUserId and far.dataFile.id=:dataFileId and far.requestState=:requestState")
+})
+
+
+public class FileAccessRequest implements Serializable{
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(nullable=false)
+    private DataFile dataFile;
+    
+    @ManyToOne
+    @JoinColumn(name="authenticated_user_id",nullable=false)
+    private AuthenticatedUser user;
+    
+    @OneToOne
+    @JoinColumn(nullable=true)
+    private GuestbookResponse guestbookResponse;
+    
+    public enum RequestState {CREATED, GRANTED, REJECTED};
+    //private RequestState state;
+    @Enumerated(EnumType.STRING)
+    @Column(name="request_state", nullable=false )
+    private RequestState requestState;
+    
+    @Temporal(value = TemporalType.TIMESTAMP)
+    @Column(name = "creation_time")
+    private Date creationTime;
+    
+    public FileAccessRequest(){
+    }
+    
+    public FileAccessRequest(DataFile df, AuthenticatedUser au){
+        setDataFile(df);
+        setRequester(au);
+        setState(RequestState.CREATED);
+        setCreationTime(new Date());
+    }
+    
+    public FileAccessRequest(DataFile df, AuthenticatedUser au, GuestbookResponse gbr){
+        this(df, au);
+        setGuestbookResponse(gbr);
+    }
+     
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+    public DataFile getDataFile(){
+        return dataFile;
+    }
+    
+    public final void setDataFile(DataFile df){
+        this.dataFile = df;
+    }
+    
+    public AuthenticatedUser getRequester(){
+        return user;
+    }
+    
+    public final void setRequester(AuthenticatedUser au){
+        this.user = au;
+    }
+    
+    public GuestbookResponse getGuestbookResponse(){
+        return guestbookResponse;
+    }
+    
+    public final void setGuestbookResponse(GuestbookResponse gbr){
+        this.guestbookResponse = gbr;
+    }
+    
+    public RequestState getState() {
+        return this.requestState;
+    }
+    
+    public void setState(RequestState requestState) {
+        this.requestState = requestState;
+    }
+    
+    public String getStateLabel() {
+        if(isStateCreated()){
+            return "created";
+        }
+        if(isStateGranted()) {
+            return "granted";
+        }
+        if(isStateRejected()) {
+            return "rejected";
+        }
+        return null; 
+    }
+    
+    public void setStateCreated() {
+        this.requestState = RequestState.CREATED;
+    }
+    
+    public void setStateGranted() {
+        this.requestState = RequestState.GRANTED;
+    }
+
+    public void setStateRejected() {
+        this.requestState = RequestState.REJECTED;
+    }
+
+    public boolean isStateCreated() {
+        return this.requestState == RequestState.CREATED;
+    }
+   
+    public boolean isStateGranted() {
+        return this.requestState == RequestState.GRANTED;
+    }
+
+    public boolean isStateRejected() {
+        return this.requestState == RequestState.REJECTED;
+    }
+    
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    public Date getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Date creationTime) {
+        this.creationTime = creationTime;
+    }
+    
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof FileAccessRequest)) {
+            return false;
+        }
+        FileAccessRequest other = (FileAccessRequest) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+    
+    
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileAccessRequestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/FileAccessRequestServiceBean.java
new file mode 100644
index 00000000000..af8577fad34
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/FileAccessRequestServiceBean.java
@@ -0,0 +1,87 @@
+package edu.harvard.iq.dataverse;
+
+import java.util.List;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+
+/**
+ *
+ * @author Marina
+ */
+@Stateless
+@Named
+public class FileAccessRequestServiceBean {
+
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    private EntityManager em;
+    
+    public FileAccessRequest find(Object pk) {
+        return em.find(FileAccessRequest.class, pk);
+    }
+
+    public List<FileAccessRequest> findAll() {
+        return em.createQuery("select object(o) from FileAccessRequest as o order by o.id", FileAccessRequest.class).getResultList();
+    }
+    
+    public List<FileAccessRequest> findAll(Long authenticatedUserId, Long fileId, FileAccessRequest.RequestState requestState){
+        return em.createNamedQuery("FileAccessRequest.findByAuthenticatedUserIdAndDataFileIdAndRequestState", FileAccessRequest.class)
+                .setParameter("authenticatedUserId",authenticatedUserId)
+                .setParameter("dataFileId",fileId)
+                .setParameter("requestState",requestState)
+                .getResultList();
+    }
+    
+    public List<FileAccessRequest> findAllByAuthenticedUserId(Long authenticatedUserId){
+        return em.createNamedQuery("FileAccessRequest.findByAuthenticatedUserId", FileAccessRequest.class)
+                        .setParameter("authenticatedUserId", authenticatedUserId)
+                        .getResultList();
+    }
+    
+    public List<FileAccessRequest> findAllByGuestbookResponseId(Long guestbookResponseId){
+        return em.createNamedQuery("FileAccessRequest.findByGuestbookResponseId", FileAccessRequest.class)
+                        .setParameter("guestbookResponseId", guestbookResponseId)
+                        .getResultList();
+    
+    }
+    
+    public List<FileAccessRequest> findAllByDataFileId(Long dataFileId){
+        return em.createNamedQuery("FileAccessRequest.findByDataFileId", FileAccessRequest.class)
+                        .setParameter("dataFileId", dataFileId)
+                        .getResultList();
+    }
+    
+    public List<FileAccessRequest> findAllByAuthenticatedUserIdAndRequestState(Long authenticatedUserId, FileAccessRequest.RequestState requestState){
+        return em.createNamedQuery("FileAccessRequest.findByAuthenticatedUserIdAndRequestState", FileAccessRequest.class)
+                        .setParameter("authenticatedUserId", authenticatedUserId)
+                        .setParameter("requestState",requestState)
+                        .getResultList();
+    }
+    
+    public List<FileAccessRequest> findAllByGuestbookResponseIdAndRequestState(Long guestbookResponseId, FileAccessRequest.RequestState requestState){
+        return em.createNamedQuery("FileAccessRequest.findByGuestbookResponseIdAndRequestState", FileAccessRequest.class)
+                        .setParameter("dataFileId", guestbookResponseId)
+                        .setParameter("requestState",requestState)
+                        .getResultList();
+    }
+    
+    public List<FileAccessRequest> findAllByDataFileIdAndRequestState(Long dataFileId, FileAccessRequest.RequestState requestState){
+        return em.createNamedQuery("FileAccessRequest.findByDataFileIdAndRequestState", FileAccessRequest.class)
+                        .setParameter("dataFileId", dataFileId)
+                        .setParameter("requestState",requestState)
+                        .getResultList();
+    }
+    
+    
+    public FileAccessRequest save(FileAccessRequest far) {
+        if (far.getId() == null) {
+            em.persist(far);
+            return far;
+        } else {
+            return em.merge(far);
+        }
+    }
+  
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileDirectoryNameValidator.java b/src/main/java/edu/harvard/iq/dataverse/FileDirectoryNameValidator.java
index e0c2b83ab65..84c033afcaf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileDirectoryNameValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileDirectoryNameValidator.java
@@ -7,8 +7,8 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileDownload.java b/src/main/java/edu/harvard/iq/dataverse/FileDownload.java
deleted file mode 100644
index 8463a8278c0..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/FileDownload.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-import javax.persistence.CascadeType;
-import javax.persistence.OneToOne;
-import javax.persistence.MapsId;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import java.util.Date;
-
-
-/**
- *
- * @author marina
- */
-@Entity
-public class FileDownload implements Serializable { 
-    
-    @Id
-    private Long id;
-    
-    @OneToOne(fetch = FetchType.LAZY)
-    @MapsId
-    private GuestbookResponse guestbookResponse;
-    
-    @Temporal(value = TemporalType.TIMESTAMP)
-    private Date downloadTimestamp;
-    
-    /*
-    Transient Values carry non-written information 
-    that will assist in the download process
-    - selected file ids is a comma delimited list that contains the file ids for multiple download
-    - fileFormat tells the download api which format a subsettable file should be downloaded as
-    */
-    
-    @Transient
-    private String selectedFileIds;
-    
-    @Transient 
-    private String fileFormat;
-    
-    
-    /**
-     * Possible values for downloadType include "Download", "Subset",
-     * "WorldMap", or the displayName of an ExternalTool.
-     *
-     * TODO: Types like "Download" and "Subset" and probably "WorldMap" should
-     * be defined once as constants (likely an enum) rather than having these
-     * strings duplicated in various places when setDownloadtype() is called.
-     * (Some day it would be nice to convert WorldMap into an ExternalTool but
-     * it's not worth the effort at this time.)
-     */
-    private String downloadtype;
-    private String sessionId;
-    
-     public FileDownload(){
-        
-    }
-     
-    public FileDownload(FileDownload source){
-        this.setDownloadTimestamp(source.getDownloadTimestamp());
-        this.setDownloadtype(source.getDownloadtype());
-        this.setFileFormat(source.getFileFormat());
-        this.setGuestbookResponse(source.getGuestbookResponse());
-        this.setSelectedFileIds(source.getSelectedFileIds());
-        this.setSessionId(source.getSessionId());
-    }
-    
-    public String getFileFormat() {
-        return fileFormat;
-    }
-
-    //for download
-    public void setFileFormat(String downloadFormat) {
-        this.fileFormat = downloadFormat;
-    }
-    
-    public String getDownloadtype() {
-        return downloadtype;
-    }
-
-    public void setDownloadtype(String downloadtype) {
-        this.downloadtype = downloadtype;
-    }
-    
-    public String getSessionId() {
-        return sessionId;
-    }
-
-    public void setSessionId(String sessionId) {
-        this.sessionId = sessionId;
-    }
-    
-    public String getSelectedFileIds() {
-        return selectedFileIds;
-    }
-
-    public void setSelectedFileIds(String selectedFileIds) {
-        this.selectedFileIds = selectedFileIds;
-    }
-    
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    
-    public Date getDownloadTimestamp(){
-        return this.downloadTimestamp;
-    }
-    
-    public void setDownloadTimestamp(Date downloadTimestamp){
-        this.downloadTimestamp = downloadTimestamp;
-    }
-    
-    
-    public void setGuestbookResponse(GuestbookResponse gbr){
-        this.guestbookResponse = gbr;
-    }
-
-    public GuestbookResponse getGuestbookResponse(){
-        return this.guestbookResponse;
-    }
-    
-    @Override
-    public int hashCode() {
-        int hash = 0;
-        hash += (id != null ? id.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        // TODO: Warning - this method won't work in the case the id fields are not set
-        if (!(object instanceof FileDownload)) {
-            return false;
-        }
-        FileDownload other = (FileDownload) object;
-        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "edu.harvard.iq.dataverse.FileDownload[ id=" + id + " ]";
-    }
-    
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java b/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java
index 70a47449e11..02f986519a2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java
@@ -7,23 +7,24 @@
 
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool;
+import edu.harvard.iq.dataverse.globus.GlobusServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
+import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.JsfHelper;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIInput;
-import javax.faces.component.UIOutput;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.primefaces.PrimeFaces;
 //import org.primefaces.context.RequestContext;
 
@@ -56,217 +57,60 @@ public class FileDownloadHelper implements java.io.Serializable {
     @EJB
     DataFileServiceBean datafileService;
     
-    UIInput nameField;
-
-    public UIInput getNameField() {
-        return nameField;
-    }
-
-    public void setNameField(UIInput nameField) {
-        this.nameField = nameField;
-    }
-
-    public UIInput getEmailField() {
-        return emailField;
-    }
-
-    public void setEmailField(UIInput emailField) {
-        this.emailField = emailField;
-    }
-
-    public UIInput getInstitutionField() {
-        return institutionField;
-    }
-
-    public void setInstitutionField(UIInput institutionField) {
-        this.institutionField = institutionField;
-    }
-
-    public UIInput getPositionField() {
-        return positionField;
-    }
-
-    public void setPositionField(UIInput positionField) {
-        this.positionField = positionField;
-    }
-    UIInput emailField;
-    UIInput institutionField;
-    UIInput positionField;
-   
-    
-
+    @EJB
+    GlobusServiceBean globusService;
 
     private final Map<Long, Boolean> fileDownloadPermissionMap = new HashMap<>(); // { FileMetadata.id : Boolean } 
 
-     public void nameValueChangeListener(AjaxBehaviorEvent e) {
-         String name= (String) ((UIOutput) e.getSource()).getValue();
-         this.guestbookResponse.setName(name);
-     }
-     
-    public void emailValueChangeListener(AjaxBehaviorEvent e) {
-         String email= (String) ((UIOutput) e.getSource()).getValue();
-         this.guestbookResponse.setEmail(email);
-     }
-    
-    public void institutionValueChangeListener(AjaxBehaviorEvent e) {        
-         String institution= (String) ((UIOutput) e.getSource()).getValue();
-         this.guestbookResponse.setInstitution(institution);
-     }
-    
-    public void positionValueChangeListener(AjaxBehaviorEvent e) {
-         String position= (String) ((UIOutput) e.getSource()).getValue();
-         this.guestbookResponse.setPosition(position);
-     }
-    
-    public void customQuestionValueChangeListener(AjaxBehaviorEvent e) {
-        String questionNo = (String) ((UIOutput) e.getSource()).getId();
-         String position= (String) ((UIOutput) e.getSource()).getValue();
-     }
-    
     public FileDownloadHelper() {
         this.filesForRequestAccess = new ArrayList<>();
     }
 
-    
-     private boolean testResponseLength(String value) {
-        return !(value != null && value.length() > 255);
-     }
-     
-     private boolean validateGuestbookResponse(GuestbookResponse guestbookResponse){
-                Dataset dataset = guestbookResponse.getDataset();
-                boolean valid = true;
-         if (dataset.getGuestbook() != null) {
-             if (dataset.getGuestbook().isNameRequired()) {
-                 boolean nameValid = (guestbookResponse.getName() != null && !guestbookResponse.getName().isEmpty());
-                 if (!nameValid) {
-                     nameField.setValid(false);
-                     FacesContext.getCurrentInstance().addMessage(nameField.getClientId(),
-                             new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("requiredField"), null));
-                 }
-                 valid &= nameValid;
-             }
-                valid &= testResponseLength(guestbookResponse.getName());
-                 if (! testResponseLength(guestbookResponse.getName())){
-                    nameField.setValid(false);
-                     FacesContext.getCurrentInstance().addMessage(nameField.getClientId(),
-                             new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.guestbookResponse.guestbook.responseTooLong"), null));
-                 }
-             if (dataset.getGuestbook().isEmailRequired()) {
-                 boolean emailValid = (guestbookResponse.getEmail() != null && !guestbookResponse.getEmail().isEmpty());
-                 if (!emailValid) {
-                     emailField.setValid(false);
-                     FacesContext.getCurrentInstance().addMessage(emailField.getClientId(),
-                             new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("requiredField"), null));
-                 }
-                 valid &= emailValid;
-             }
-                valid &= testResponseLength(guestbookResponse.getEmail());
-                 if (! testResponseLength(guestbookResponse.getEmail())){
-                    emailField.setValid(false);
-                     FacesContext.getCurrentInstance().addMessage(emailField.getClientId(),
-                             new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.guestbookResponse.guestbook.responseTooLong"), null));
-                 }
-            if (dataset.getGuestbook().isInstitutionRequired()) {
-                 boolean institutionValid = (guestbookResponse.getInstitution()!= null && !guestbookResponse.getInstitution().isEmpty());
-                 if (!institutionValid) {
-                     institutionField.setValid(false);
-                     FacesContext.getCurrentInstance().addMessage(institutionField.getClientId(),
-                             new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("requiredField"), null));
-                 }
-                valid &= institutionValid;
-            }
-                valid &= testResponseLength(guestbookResponse.getInstitution());
-                 if (! testResponseLength(guestbookResponse.getInstitution())){
-                    institutionField.setValid(false);
-                     FacesContext.getCurrentInstance().addMessage(institutionField.getClientId(),
-                             new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.guestbookResponse.guestbook.responseTooLong"), null));
-                 }
-            if (dataset.getGuestbook().isPositionRequired()) {
-                 boolean positionValid = (guestbookResponse.getPosition()!= null && !guestbookResponse.getPosition().isEmpty());
-                 if (!positionValid) {
-                     positionField.setValid(false);
-                     FacesContext.getCurrentInstance().addMessage(positionField.getClientId(),
-                             new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("requiredField"), null));
-                 }
-                valid &= positionValid;
+    // This helper method is called from the Download terms/guestbook/etc. popup,
+    // when the user clicks the "ok" button. We use it, instead of calling
+    // downloadServiceBean directly, in order to differentiate between single
+    // file downloads and multiple (batch) downloads - since both use the same
+    // terms/etc. popup.
+    public void writeGuestbookAndStartDownload(GuestbookResponse guestbookResponse, boolean isGlobusTransfer) {
+        logger.fine("inside FileDownloadHelper.writeGuestbookAndStartDownload() " + (isGlobusTransfer ? "Globus Transfer" : "NOT a Globus Transfer"));
+        PrimeFaces.current().executeScript("PF('guestbookAndTermsPopup').hide()");
+        guestbookResponse.setEventType(GuestbookResponse.DOWNLOAD);
+         // Note that this method is only ever called from the file-download-popup -
+         // meaning we know for the fact that we DO want to save this
+         // guestbookResponse permanently in the database.
+         // Do keep in mind that "true" in writeGuestbookAndStartTransfer() below
+         // would mean "DO SKIP writing the guestbookResponse", and "false" means 
+         // "DO write ..."
+         if(isGlobusTransfer) {
+            // Note that *single-file* Globus transfers are NOT handled here. 
+            // Instead they are coming in through this method with isGlobusTransfer=false,
+            // and then picked up by the fileDownloadService, below, which in turn 
+            // recognizes them as Globus types via guestbookResponse.getFileFormat() == "GlobusTransfer"
+            // and treats them as such... I'm not super clear as to why they can't 
+            // be handled here instead... Don't ask. 
+            globusService.writeGuestbookAndStartTransfer(guestbookResponse, false);
+        } else {
+            if (guestbookResponse.getSelectedFileIds() != null) {
+                // this is a batch (multiple file) download.
+                // Although here's a chance that this is not really a batch download - i.e.,
+                // there may only be one file on the file list. But the fileDownloadService
+                // method below will check for that, and will redirect to the single download,
+                // if
+                // that's the case. -- L.A.
+                fileDownloadService.writeGuestbookAndStartBatchDownload(guestbookResponse);
+            } else if (guestbookResponse.getDataFile() != null) {
+                // this a single file download:
+                fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse);
             }
-                valid &= testResponseLength(guestbookResponse.getPosition());
-                 if (! testResponseLength(guestbookResponse.getPosition())){
-                    positionField.setValid(false);
-                     FacesContext.getCurrentInstance().addMessage(positionField.getClientId(),
-                             new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.guestbookResponse.guestbook.responseTooLong"), null));
-                 }
         }
-
-        if (dataset.getGuestbook() != null && !dataset.getGuestbook().getCustomQuestions().isEmpty()) {
-            for (CustomQuestion cq : dataset.getGuestbook().getCustomQuestions()) {
-                if (cq.isRequired()) {
-                    for (CustomQuestionResponse cqr : guestbookResponse.getCustomQuestionResponses()) {
-                        if (cqr.getCustomQuestion().equals(cq)) {
-                            valid &= (cqr.getResponse() != null && !cqr.getResponse().isEmpty());
-                            if (cqr.getResponse() == null ||  cqr.getResponse().isEmpty()){
-                                cqr.setValidationMessage(BundleUtil.getStringFromBundle("requiredField"));                               
-                            } else{
-                                cqr.setValidationMessage(""); 
-                            }                          
-                        }
-                    }
-                }
-            }
-        }       
-
-        return valid;
-         
      }
-    
-     // This helper method is called from the Download terms/guestbook/etc. popup, 
-     // when the user clicks the "ok" button. We use it, instead of calling 
-     // downloadServiceBean directly, in order to differentiate between single
-     // file downloads and multiple (batch) downloads - sice both use the same 
-     // terms/etc. popup. 
-     public void writeGuestbookAndStartDownload(GuestbookResponse guestbookResponse) {
-         //RequestContext requestContext = RequestContext.getCurrentInstance();
-         boolean valid = validateGuestbookResponse(guestbookResponse);
-
-         if (!valid) {
-             JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError"));
-         } else {
-             //requestContext.execute("PF('downloadPopup').hide()");
-             PrimeFaces.current().executeScript("PF('downloadPopup').hide()");
-             guestbookResponse.setDownloadtype("Download");
-
-             // Note that this method is only ever called from the file-download-popup - 
-             // meaning we know for the fact that we DO want to save this 
-             // guestbookResponse permanently in the database.
-             if (guestbookResponse.getSelectedFileIds() != null) {
-                 // this is a batch (multiple file) download.
-                 // Although here's a chance that this is not really a batch download - i.e., 
-                 // there may only be one file on the file list. But the fileDownloadService 
-                 // method below will check for that, and will redirect to the single download, if
-                 // that's the case. -- L.A.
-                 fileDownloadService.writeGuestbookAndStartBatchDownload(guestbookResponse);
-             } else if (guestbookResponse.getDataFile() != null) {
-                 // this a single file download: 
-                 fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse);
-             }
-         }
 
-     }
-     
      public void writeGuestbookAndOpenSubset(GuestbookResponse guestbookResponse) {
-        //RequestContext requestContext = RequestContext.getCurrentInstance();
-        boolean valid = validateGuestbookResponse(guestbookResponse);
 
-         if (!valid) {
-
-         } else {
-             //requestContext.execute("PF('downloadPopup').hide()");
-             PrimeFaces.current().executeScript("PF('downloadPopup').hide()");
-             //requestContext.execute("PF('downloadDataSubsetPopup').show()");
+             PrimeFaces.current().executeScript("PF('guestbookAndTermsPopup').hide()");
              PrimeFaces.current().executeScript("PF('downloadDataSubsetPopup').show()");
-             guestbookResponse.setDownloadtype("Subset");
+             guestbookResponse.setEventType(GuestbookResponse.SUBSET);
              fileDownloadService.writeGuestbookResponseRecord(guestbookResponse);
-         }
 
      }
 
@@ -302,51 +146,39 @@ public void writeGuestbookAndLaunchExploreTool(GuestbookResponse guestbookRespon
              }
          }
 
-         //RequestContext requestContext = RequestContext.getCurrentInstance();
-         boolean valid = validateGuestbookResponse(guestbookResponse);
-
-         if (!valid) {
-             return;
-         }
          fileDownloadService.explore(guestbookResponse, fmd, externalTool);
          //requestContext.execute("PF('downloadPopup').hide()");
-         PrimeFaces.current().executeScript("PF('downloadPopup').hide()");
+         PrimeFaces.current().executeScript("PF('guestbookAndTermsPopup').hide()");
     }
      
     public void writeGuestbookAndLaunchPackagePopup(GuestbookResponse guestbookResponse) {
-        //RequestContext requestContext = RequestContext.getCurrentInstance();
-        boolean valid = validateGuestbookResponse(guestbookResponse);
 
-        if (!valid) {
-            JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError"));
-        } else {
-            //requestContext.execute("PF('downloadPopup').hide()");
-            PrimeFaces.current().executeScript("PF('downloadPopup').hide()");
-            //requestContext.execute("PF('downloadPackagePopup').show()");
+            PrimeFaces.current().executeScript("PF('guestbookAndTermsPopup').hide()");
             PrimeFaces.current().executeScript("PF('downloadPackagePopup').show()");
-            //requestContext.execute("handleResizeDialog('downloadPackagePopup')");
             PrimeFaces.current().executeScript("handleResizeDialog('downloadPackagePopup')");
-
             fileDownloadService.writeGuestbookResponseRecord(guestbookResponse);
-        }
     }
 
-    public String startWorldMapDownloadLink(GuestbookResponse guestbookResponse, FileMetadata fmd){
-        
-        //RequestContext requestContext = RequestContext.getCurrentInstance();
-        boolean valid = validateGuestbookResponse(guestbookResponse);
-                  
-         if (!valid) {
-             return "";
-         } 
-        guestbookResponse.setDownloadtype("WorldMap");
-        String retVal = fileDownloadService.startWorldMapDownloadLink(guestbookResponse, fmd);
-        //requestContext.execute("PF('downloadPopup').hide()");
-        PrimeFaces.current().executeScript("PF('downloadPopup').hide()");
-        return retVal;
+    
+    public void writeGuestbookResponseAndRequestAccess(GuestbookResponse guestbookResponse) {
+
+        if(!filesForRequestAccess.isEmpty()) {
+            /* Only for single file requests (i.e. from kebab menu) */
+            guestbookResponse.setDataFile(filesForRequestAccess.get(0));
+        }
+        PrimeFaces.current().executeScript("PF('guestbookAndTermsPopup').hide()");
+        fileDownloadService.writeGuestbookResponseAndRequestAccess(guestbookResponse);
     }
+    
+     /**
+      * Writes a guestbook entry for either popup scenario: guestbook or terms.
+      */
+     public boolean writeGuestbookAndShowPreview(GuestbookResponse guestbookResponse) {
+         guestbookResponse.setEventType(GuestbookResponse.EXPLORE);
+         fileDownloadService.writeGuestbookResponseRecord(guestbookResponse);
+         return true;
+     }
 
-        
     private List<DataFile> filesForRequestAccess;
 
     public List<DataFile> getFilesForRequestAccess() {
@@ -385,12 +217,6 @@ public void setSelectedFileId(String selectedFileId) {
      *  WARNING: Before calling this, make sure the user has download
      *  permission for the file!!  (See DatasetPage.canDownloadFile())
      * 
-     * Should there be a Explore WorldMap Button for this file?
-     *   See table in: https://github.com/IQSS/dataverse/issues/1618
-     * 
-     *  (1) Does the file have MapLayerMetadata?
-     *  (2) Are the proper settings in place
-     * 
      * @param  fileMetadata
      * @return boolean
      */
@@ -401,12 +227,20 @@ public boolean canDownloadFile(FileMetadata fileMetadata){
        
         if ((fileMetadata.getId() == null) || (fileMetadata.getDataFile().getId() == null)){
             return false;
-        } 
+        }
         
+        if (session.getUser() instanceof PrivateUrlUser) {
+             // Always allow download for PrivateUrlUser
+             return true;
+         }
+
+        // Retention expired files are always made unavailable, because they might be destroyed
+        if (FileUtil.isRetentionExpired(fileMetadata)) return false;
+
         Long fid = fileMetadata.getId();
         //logger.info("calling candownloadfile on filemetadata "+fid);
         // Note that `isRestricted` at the FileMetadata level is for expressing intent by version. Enforcement is done with `isRestricted` at the DataFile level.
-        boolean isRestrictedFile = fileMetadata.isRestricted();
+        boolean isRestrictedFile = fileMetadata.isRestricted() || fileMetadata.getDataFile().isRestricted();
         
         // Has this file been checked? Look at the DatasetPage hash
         if (this.fileDownloadPermissionMap.containsKey(fid)){
@@ -425,7 +259,9 @@ public boolean canDownloadFile(FileMetadata fileMetadata){
            }
        }
 
-        if (!isRestrictedFile){
+        if (!isRestrictedFile
+                && !FileUtil.isActivelyEmbargoed(fileMetadata)
+                && !FileUtil.isRetentionExpired(fileMetadata)) {
             // Yes, save answer and return true
             this.fileDownloadPermissionMap.put(fid, true);
             return true;
@@ -441,7 +277,11 @@ public boolean canDownloadFile(FileMetadata fileMetadata){
         this.fileDownloadPermissionMap.put(fid, false);
         return false;
     }
-   
+
+    public boolean isRestrictedOrEmbargoed(FileMetadata fileMetadata) {
+        return fileMetadata.isRestricted() || FileUtil.isActivelyEmbargoed(fileMetadata);
+    }
+
     public boolean doesSessionUserHavePermission(Permission permissionToCheck, FileMetadata fileMetadata){
         if (permissionToCheck == null){
             return false;
@@ -470,6 +310,17 @@ public void requestAccess(DataFile file){
         //Called from download button fragment via either dataset page or file page
         // when there's only one file for the access request and there's no pop-up
         processRequestAccess(file, true);        
+    }
+    
+    public void handleCommandLinkClick(FileMetadata fmd){
+        
+        if (FileUtil.isRequestAccessPopupRequired(fmd.getDatasetVersion())){
+            addFileForRequestAccess(fmd.getDataFile());
+            PrimeFaces.current().executeScript("PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');");
+        } else {
+            requestAccess(fmd.getDataFile());
+        }
+
     }
 
      public void requestAccessMultiple(List<DataFile> files) {
@@ -480,7 +331,7 @@ public void requestAccessMultiple(List<DataFile> files) {
          DataFile notificationFile = null;
          for (DataFile file : files) {
              //Not sending notification via request method so that
-             // we can bundle them up into one nofication at dataset level
+             // we can bundle them up into one notification at dataset level
              test = processRequestAccess(file, false);
              succeeded |= test;
              if (notificationFile == null) {
@@ -488,13 +339,15 @@ public void requestAccessMultiple(List<DataFile> files) {
              }
          }
          if (notificationFile != null && succeeded) {
-             fileDownloadService.sendRequestFileAccessNotification(notificationFile.getOwner(), notificationFile.getId(), (AuthenticatedUser) session.getUser());
+             fileDownloadService.sendRequestFileAccessNotification(notificationFile.getOwner(),
+                     notificationFile.getId(), (AuthenticatedUser) session.getUser());
+             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("file.accessRequested.success"));
          }
      }
     
      public void requestAccessIndirect() {
          //Called when there are multiple files and no popup
-         // or there's a popup with sigular or multiple files
+         // or there's a popup with singular or multiple files
          // The list of files for Request Access is set in the Dataset Page when
          // user clicks the request access button in the files fragment
          // (and has selected one or more files)
@@ -503,29 +356,24 @@ public void requestAccessIndirect() {
     
     
      private boolean processRequestAccess(DataFile file, Boolean sendNotification) {
-
          if (fileDownloadService.requestAccess(file.getId())) {
              // update the local file object so that the page properly updates
-             file.getFileAccessRequesters().add((AuthenticatedUser) session.getUser());
+             AuthenticatedUser user = (AuthenticatedUser) session.getUser();
+             //This seems to be required because we don't get the updated file object back from the command called in the fileDownloadService.requestAccess call above
+             FileAccessRequest request = new FileAccessRequest(file, user);
+             file.addFileAccessRequest(request);
+
              // create notification if necessary
              if (sendNotification) {
                  fileDownloadService.sendRequestFileAccessNotification(file.getOwner(), file.getId(), (AuthenticatedUser) session.getUser());
+                 JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("file.accessRequested.success"));
              }
              return true;
          }
+         JsfHelper.addWarningMessage(BundleUtil.getStringFromBundle("file.accessRequested.alreadyRequested", Arrays.asList(file.getDisplayName())));
          return false;
      } 
-     
-    private GuestbookResponse guestbookResponse;
 
-    public GuestbookResponse getGuestbookResponse() {
-        return guestbookResponse;
-    }
-
-    public void setGuestbookResponse(GuestbookResponse guestbookResponse) {
-        this.guestbookResponse = guestbookResponse;
-    }    
-    
     public GuestbookResponseServiceBean getGuestbookResponseService(){
         return this.guestbookResponseService;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
index ef198d74073..5370e9ac564 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
@@ -5,7 +5,9 @@
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
-import edu.harvard.iq.dataverse.datasetutility.WorldMapPermissionHelper;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateGuestbookResponseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RequestAccessCommand;
@@ -13,23 +15,31 @@
 import edu.harvard.iq.dataverse.externaltools.ExternalToolHandler;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean.MakeDataCountEntry;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.JsfHelper;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.URLTokenUtil;
+
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.primefaces.PrimeFaces;
 //import org.primefaces.context.RequestContext;
@@ -63,7 +73,11 @@ public class FileDownloadServiceBean implements java.io.Serializable {
     UserNotificationServiceBean userNotificationService;
     @EJB
     AuthenticationServiceBean authService;
-    
+    @EJB
+    SettingsServiceBean settingsService;
+    @EJB
+    MailServiceBean mailService;
+
     @Inject
     DataverseSession session;
     
@@ -73,7 +87,6 @@ public class FileDownloadServiceBean implements java.io.Serializable {
     @Inject
     DataverseRequestServiceBean dvRequestService;
     
-    @Inject WorldMapPermissionHelper worldMapPermissionHelper;
     @Inject FileDownloadHelper fileDownloadHelper;
     @Inject
     MakeDataCountLoggingServiceBean mdcLogService;
@@ -85,9 +98,12 @@ public void writeGuestbookAndStartBatchDownload(GuestbookResponse guestbookRespo
     }
     
     public void writeGuestbookAndStartBatchDownload(GuestbookResponse guestbookResponse, Boolean doNotSaveGuestbookRecord){
+
         if (guestbookResponse == null || guestbookResponse.getSelectedFileIds() == null) {
             return;
         }
+        
+        boolean original = "original".equals(guestbookResponse.getFileFormat());
 
         // Let's intercept the case where a multiple download method was called, 
         // with only 1 file on the list. We'll treat it like a single file download 
@@ -114,21 +130,46 @@ public void writeGuestbookAndStartBatchDownload(GuestbookResponse guestbookRespo
         }
         
         // OK, this is a real batch (multi-file) download. 
+        
+        String customZipDownloadUrl = settingsService.getValueForKey(SettingsServiceBean.Key.CustomZipDownloadServiceUrl);
+        boolean useCustomZipService = customZipDownloadUrl != null; 
+        String zipServiceKey = null; 
+
         // Do we need to write GuestbookRecord entries for the files? 
-        if (!doNotSaveGuestbookRecord) {
+        if (!doNotSaveGuestbookRecord || useCustomZipService) {
 
             List<String> list = new ArrayList<>(Arrays.asList(guestbookResponse.getSelectedFileIds().split(",")));
-
+            Timestamp timestamp = null; 
+            
             for (String idAsString : list) {
-                DataFile df = datafileService.findCheapAndEasy(new Long(idAsString));
+                //DataFile df = datafileService.findCheapAndEasy(new Long(idAsString));
+                DataFile df = datafileService.find(new Long(idAsString));
                 if (df != null) {
-                    guestbookResponse.setDataFile(df);
-                    writeGuestbookResponseRecord(guestbookResponse);
+                    if (!doNotSaveGuestbookRecord) {
+                        guestbookResponse.setDataFile(df);
+                        writeGuestbookResponseRecord(guestbookResponse);
+                    }
+                    
+                    if (useCustomZipService) {
+                        if (zipServiceKey == null) {
+                            zipServiceKey = generateServiceKey();
+                        }
+                        if (timestamp == null) {
+                            timestamp = new Timestamp(new Date().getTime());
+                        }
+                        
+                        addFileToCustomZipJob(zipServiceKey, df, timestamp, original);
+                    }
                 }
             }
         }
-
-        redirectToBatchDownloadAPI(guestbookResponse.getSelectedFileIds(), "original".equals(guestbookResponse.getFileFormat()));
+        
+        if (useCustomZipService) {
+            redirectToCustomZipDownloadService(customZipDownloadUrl, zipServiceKey);
+        } else {
+            // Use the "normal" /api/access/datafiles/ API:
+            redirectToBatchDownloadAPI(guestbookResponse.getSelectedFileIds(),original);
+        }
     }
     
     public void writeGuestbookAndStartFileDownload(GuestbookResponse guestbookResponse, FileMetadata fileMetadata, String format) {
@@ -152,6 +193,42 @@ public void writeGuestbookAndStartFileDownload(GuestbookResponse guestbookRespon
         redirectToDownloadAPI(guestbookResponse.getFileFormat(), guestbookResponse.getDataFile().getId());
         logger.fine("issued file download redirect for datafile "+guestbookResponse.getDataFile().getId());
     }
+    
+    public void writeGuestbookResponseAndRequestAccess(GuestbookResponse guestbookResponse){
+        if (guestbookResponse == null || ( guestbookResponse.getDataFile() == null && guestbookResponse.getSelectedFileIds() == null) ) {
+            return;
+        }
+
+        guestbookResponse.setEventType(GuestbookResponse.ACCESS_REQUEST);
+
+        List <DataFile> selectedDataFiles = new ArrayList<>(); //always make sure it's at least an empty List
+
+        if(guestbookResponse.getDataFile() != null ){ //one file 'selected' by 'Request Access' button click
+            selectedDataFiles.add(datafileService.find(guestbookResponse.getDataFile().getId())); //don't want the findCheapAndEasy
+        }
+
+        if(guestbookResponse.getSelectedFileIds() != null && !guestbookResponse.getSelectedFileIds().isEmpty()) { //multiple selected through multi-select REquest Access button   
+            selectedDataFiles = datafileService.findAll(guestbookResponse.getSelectedFileIds());
+        }
+
+        int countRequestAccessSuccess = 0;
+
+        for(DataFile dataFile : selectedDataFiles){
+            guestbookResponse.setDataFile(dataFile);
+            writeGuestbookResponseRecordForRequestAccess(guestbookResponse);
+            if(requestAccess(dataFile,guestbookResponse)){
+                countRequestAccessSuccess++;
+            } else {
+                JsfHelper.addWarningMessage(BundleUtil.getStringFromBundle("file.accessRequested.alreadyRequested", Arrays.asList(dataFile.getDisplayName())));
+            }
+        }
+
+        if(countRequestAccessSuccess > 0){
+            DataFile firstDataFile = selectedDataFiles.get(0);
+            sendRequestFileAccessNotification(firstDataFile.getOwner(), firstDataFile.getId(), (AuthenticatedUser) session.getUser());
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("file.accessRequested.success"));
+        }
+    }
 
     public void writeGuestbookResponseRecord(GuestbookResponse guestbookResponse, FileMetadata fileMetadata, String format) {
         if(!fileMetadata.getDatasetVersion().isDraft()){           
@@ -177,9 +254,22 @@ public void writeGuestbookResponseRecord(GuestbookResponse guestbookResponse) {
             mdcLogService.logEntry(entry);
         } catch (CommandException e) {
             //if an error occurs here then download won't happen no need for response recs...
+            logger.warning("Exception writing GuestbookResponse for file: " + guestbookResponse.getDataFile().getId() + " : " + e.getLocalizedMessage());
         }
     }
     
+    public void writeGuestbookResponseRecordForRequestAccess(GuestbookResponse guestbookResponse) {
+        try {
+            CreateGuestbookResponseCommand cmd = new CreateGuestbookResponseCommand(dvRequestService.getDataverseRequest(), guestbookResponse, guestbookResponse.getDataset());
+            commandEngine.submit(cmd);
+
+        } catch (CommandException e) {
+            //if an error occurs here then download won't happen no need for response recs...
+            logger.info("Failed to writeGuestbookResponseRecord for RequestAccess");
+        }
+
+    }
+    
     // The "guestBookRecord(s)AlreadyWritten" parameter in the 2 methods 
     // below (redirectToBatchDownloadAPI() and redirectToDownloadAPI(), for the 
     // multiple- and single-file downloads respectively) are passed to the 
@@ -198,7 +288,7 @@ public void writeGuestbookResponseRecord(GuestbookResponse guestbookResponse) {
     // to the API.
     private void redirectToBatchDownloadAPI(String multiFileString, Boolean guestbookRecordsAlreadyWritten, Boolean downloadOriginal){
 
-        String fileDownloadUrl = "/api/access/datafiles/" + multiFileString;
+        String fileDownloadUrl = "/api/access/datafiles";
         if (guestbookRecordsAlreadyWritten && !downloadOriginal){
             fileDownloadUrl += "?gbrecs=true";
         } else if (guestbookRecordsAlreadyWritten && downloadOriginal){
@@ -207,21 +297,34 @@ private void redirectToBatchDownloadAPI(String multiFileString, Boolean guestboo
             fileDownloadUrl += "?format=original";
         }
         
+        PrimeFaces.current().executeScript("downloadFiles('"+fileDownloadUrl + "','"+ multiFileString+"');");
+
+    }
+    
+    private void redirectToCustomZipDownloadService(String customZipServiceUrl, String jobKey) {
+        
+        customZipServiceUrl += "?" + jobKey; 
+        
         try {
-            FacesContext.getCurrentInstance().getExternalContext().redirect(fileDownloadUrl);
+            FacesContext.getCurrentInstance().getExternalContext().redirect(customZipServiceUrl);
         } catch (IOException ex) {
-            logger.info("Failed to issue a redirect to file download url.");
+            logger.info("Failed to issue a redirect to the custom Zip download service.");
         }
-
     }
 
-    private void redirectToDownloadAPI(String downloadType, Long fileId, boolean guestBookRecordAlreadyWritten, Long fileMetadataId) {
-        String fileDownloadUrl = FileUtil.getFileDownloadUrlPath(downloadType, fileId, guestBookRecordAlreadyWritten, fileMetadataId);
-        logger.fine("Redirecting to file download url: " + fileDownloadUrl);
-        try {
-            FacesContext.getCurrentInstance().getExternalContext().redirect(fileDownloadUrl);
-        } catch (IOException ex) {
-            logger.info("Failed to issue a redirect to file download url (" + fileDownloadUrl + "): " + ex);
+    private void redirectToDownloadAPI(String downloadType, Long fileId, boolean guestBookRecordAlreadyWritten,
+            Long fileMetadataId) {
+        String fileDownloadUrl = FileUtil.getFileDownloadUrlPath(downloadType, fileId, guestBookRecordAlreadyWritten,
+                fileMetadataId);
+        if ("GlobusTransfer".equals(downloadType)) {
+            PrimeFaces.current().executeScript(URLTokenUtil.getScriptForUrl(fileDownloadUrl));
+        } else {
+            logger.fine("Redirecting to file download url: " + fileDownloadUrl);
+            try {
+                FacesContext.getCurrentInstance().getExternalContext().redirect(fileDownloadUrl);
+            } catch (IOException ex) {
+                logger.info("Failed to issue a redirect to file download url (" + fileDownloadUrl + "): " + ex);
+            }
         }
     }
     
@@ -233,24 +336,27 @@ private void redirectToBatchDownloadAPI(String multiFileString, Boolean download
         redirectToBatchDownloadAPI(multiFileString, true, downloadOriginal);
     }
 
+    public void redirectToAuxFileDownloadAPI(Long fileId, String formatTag, String formatVersion) {
+        String fileDownloadUrl = "/api/access/datafile/" + fileId + "/auxiliary/" + formatTag + "/" + formatVersion;
+        try {
+            FacesContext.getCurrentInstance().getExternalContext().redirect(fileDownloadUrl);
+        } catch (IOException ex) {
+            logger.info("Failed to issue a redirect to aux file download url (" + fileDownloadUrl + "): " + ex);
+        }
+    }
     
     /**
      * Launch an "explore" tool which is a type of ExternalTool such as
-     * TwoRavens or Data Explorer. This method may be invoked directly from the
+     * Data Explorer. This method may be invoked directly from the
      * xhtml if no popup is required (no terms of use, no guestbook, etc.).
      */
     public void explore(GuestbookResponse guestbookResponse, FileMetadata fmd, ExternalTool externalTool) {
         ApiToken apiToken = null;
         User user = session.getUser();
         DatasetVersion version = fmd.getDatasetVersion();
-        if (version.isDraft() || (fmd.getDataFile().isRestricted())) {
-            if (user instanceof AuthenticatedUser) {
-                AuthenticatedUser authenticatedUser = (AuthenticatedUser) user;
-                apiToken = authService.findApiTokenByUser(authenticatedUser);
-                if ((apiToken == null) || (apiToken.getExpireTime().before(new Date()))) {
-                    apiToken = authService.generateApiTokenForUser(authenticatedUser);
-                }
-            }
+        if (version.isDraft() || fmd.getDatasetVersion().isDeaccessioned() || (fmd.getDataFile().isRestricted())
+                || (FileUtil.isActivelyEmbargoed(fmd)) || (FileUtil.isRetentionExpired(fmd))) {
+            apiToken = authService.getValidApiTokenForUser(user);
         }
         DataFile dataFile = null;
         if (fmd != null) {
@@ -262,11 +368,9 @@ public void explore(GuestbookResponse guestbookResponse, FileMetadata fmd, Exter
         }
         String localeCode = session.getLocaleCode();
         ExternalToolHandler externalToolHandler = new ExternalToolHandler(externalTool, dataFile, apiToken, fmd, localeCode);
-        // Back when we only had TwoRavens, the downloadType was always "Explore". Now we persist the name of the tool (i.e. "TwoRavens", "Data Explorer", etc.)
-        guestbookResponse.setDownloadtype(externalTool.getDisplayName());
-        String toolUrl = externalToolHandler.getToolUrlWithQueryParams();
-        logger.fine("Exploring with " + toolUrl);
-        PrimeFaces.current().executeScript("window.open('"+toolUrl + "', target='_blank');");
+        // Persist the name of the tool (i.e. "Data Explorer", etc.)
+        guestbookResponse.setEventType(externalTool.getDisplayName());
+        PrimeFaces.current().executeScript(externalToolHandler.getExploreScript());
         // This is the old logic from TwoRavens, null checks and all.
         if (guestbookResponse != null && guestbookResponse.isWriteResponse()
                 && ((fmd != null && fmd.getDataFile() != null) || guestbookResponse.getDataFile() != null)) {
@@ -279,67 +383,26 @@ public void explore(GuestbookResponse guestbookResponse, FileMetadata fmd, Exter
         }
     }
 
-    public String startWorldMapDownloadLink(GuestbookResponse guestbookResponse, FileMetadata fmd){
-                
-        if (guestbookResponse != null  && guestbookResponse.isWriteResponse() && ((fmd != null && fmd.getDataFile() != null) || guestbookResponse.getDataFile() != null)){
-            if(guestbookResponse.getDataFile() == null && fmd != null){
-                guestbookResponse.setDataFile(fmd.getDataFile());
-            }
-            if (fmd == null || !fmd.getDatasetVersion().isDraft()){
-                writeGuestbookResponseRecord(guestbookResponse);
-            }
-        }
-        DataFile file = null;
-        if (fmd != null){
-            file  = fmd.getDataFile();
-        }
-        if (guestbookResponse != null && guestbookResponse.getDataFile() != null && file == null){
-            file  = guestbookResponse.getDataFile();
-        }
-        
-
-        String retVal = worldMapPermissionHelper.getMapLayerMetadata(file).getLayerLink();
-        
-        try {
-            FacesContext.getCurrentInstance().getExternalContext().redirect(retVal);
-            return retVal;
-        } catch (IOException ex) {
-            logger.info("Failed to issue a redirect to file download url.");
-        }
-        return retVal;
-    }
-
-    public Boolean canSeeTwoRavensExploreButton(){
-        return false;
-    }
-    
-    
-    public Boolean canUserSeeExploreWorldMapButton(){
-        return false;
-    }
-    
-    public void downloadDatasetCitationXML(Dataset dataset) {
-        downloadCitationXML(null, dataset, false);
+    public void downloadDatasetCitationXML(DatasetVersion version) {
+        // DatasetVersion-level citation: 
+        DataCitation citation=null;
+        citation = new DataCitation(version);
+        String fileNameString;
+        fileNameString = "attachment;filename=" + getFileNameFromPid(citation.getPersistentId()) + ".xml";
+        downloadXML(citation, fileNameString);
     }
 
     public void downloadDatafileCitationXML(FileMetadata fileMetadata) {
-        downloadCitationXML(fileMetadata, null, false);
+        downloadCitationXML(fileMetadata, false);
     }
     
     public void downloadDirectDatafileCitationXML(FileMetadata fileMetadata) {
-        downloadCitationXML(fileMetadata, null, true);
+        downloadCitationXML(fileMetadata,  true);
     }
 
-    public void downloadCitationXML(FileMetadata fileMetadata, Dataset dataset, boolean direct) {
-    	DataCitation citation=null;
-        if (dataset != null){
-        	citation = new DataCitation(dataset.getLatestVersion());
-        } else {
-            citation= new DataCitation(fileMetadata, direct);
-        }
-        FacesContext ctx = FacesContext.getCurrentInstance();
-        HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
-        response.setContentType("text/xml");
+    public void downloadCitationXML(FileMetadata fileMetadata, boolean direct) {
+        DataCitation citation=null;
+        citation= new DataCitation(fileMetadata, direct);
         String fileNameString;
         if (fileMetadata == null || fileMetadata.getLabel() == null) {
             // Dataset-level citation: 
@@ -348,43 +411,46 @@ public void downloadCitationXML(FileMetadata fileMetadata, Dataset dataset, bool
             // Datafile-level citation:
             fileNameString = "attachment;filename=" + getFileNameFromPid(citation.getPersistentId()) + "-" + FileUtil.getCiteDataFileFilename(citation.getFileTitle(), FileUtil.FileCitationExtension.ENDNOTE);
         }
+        downloadXML(citation, fileNameString);
+    }
+
+    public void downloadXML(DataCitation citation, String fileNameString) {
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
+        response.setContentType("text/xml");
         response.setHeader("Content-Disposition", fileNameString);
+
         try {
             ServletOutputStream out = response.getOutputStream();
             citation.writeAsEndNoteCitation(out);
             out.flush();
             ctx.responseComplete();
         } catch (IOException e) {
-
         }
     }
-    
-    public void downloadDatasetCitationRIS(Dataset dataset) {
 
-        downloadCitationRIS(null, dataset, false);
+    public void downloadDatasetCitationRIS(DatasetVersion version) {
+        // DatasetVersion-level citation: 
+        DataCitation citation=null;
+        citation = new DataCitation(version);
 
+        String fileNameString;
+        fileNameString = "attachment;filename=" + getFileNameFromPid(citation.getPersistentId()) + ".ris";
+        downloadRIS(citation, fileNameString);
     }
 
     public void downloadDatafileCitationRIS(FileMetadata fileMetadata) {
-        downloadCitationRIS(fileMetadata, null, false);
+        downloadCitationRIS(fileMetadata, false);
     }
     
     public void downloadDirectDatafileCitationRIS(FileMetadata fileMetadata) {
-        downloadCitationRIS(fileMetadata, null, true);
+        downloadCitationRIS(fileMetadata, true);
     }
 
-    public void downloadCitationRIS(FileMetadata fileMetadata, Dataset dataset, boolean direct) {
-    	DataCitation citation=null;
-        if (dataset != null){
-        	citation = new DataCitation(dataset.getLatestVersion());
-        } else {
-            citation= new DataCitation(fileMetadata, direct);
-        }
-
-        FacesContext ctx = FacesContext.getCurrentInstance();
-        HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
-        response.setContentType("application/download");
-
+    public void downloadCitationRIS(FileMetadata fileMetadata, boolean direct) {
+        DataCitation citation=null;
+        citation= new DataCitation(fileMetadata, direct);
+        
         String fileNameString;
         if (fileMetadata == null || fileMetadata.getLabel() == null) {
             // Dataset-level citation: 
@@ -393,6 +459,14 @@ public void downloadCitationRIS(FileMetadata fileMetadata, Dataset dataset, bool
             // Datafile-level citation:
             fileNameString = "attachment;filename=" + getFileNameFromPid(citation.getPersistentId()) + "-" + FileUtil.getCiteDataFileFilename(citation.getFileTitle(), FileUtil.FileCitationExtension.RIS);
         }
+        downloadRIS(citation, fileNameString);
+    }
+    
+    public void downloadRIS(DataCitation citation, String fileNameString) {
+        //SEK 12/3/2018 changing this to open the json in a new tab. 
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
+        response.setContentType("application/download");
         response.setHeader("Content-Disposition", fileNameString);
 
         try {
@@ -404,38 +478,33 @@ public void downloadCitationRIS(FileMetadata fileMetadata, Dataset dataset, bool
 
         }
     }
-    
+
     private String getFileNameFromPid(GlobalId id) {
         return id.asString();
     }
 
-    public void downloadDatasetCitationBibtex(Dataset dataset) {
 
-        downloadCitationBibtex(null, dataset, false);
+    public void downloadDatasetCitationBibtex(DatasetVersion version) {
+        // DatasetVersion-level citation: 
+        DataCitation citation=null;
+        citation = new DataCitation(version);
 
+        String fileNameString;
+        fileNameString = "inline;filename=" + getFileNameFromPid(citation.getPersistentId()) + ".bib";
+        downloadBibtex(citation, fileNameString);
     }
 
     public void downloadDatafileCitationBibtex(FileMetadata fileMetadata) {
-        downloadCitationBibtex(fileMetadata, null, false);
+        downloadCitationBibtex(fileMetadata, false);
     }
 
     public void downloadDirectDatafileCitationBibtex(FileMetadata fileMetadata) {
-        downloadCitationBibtex(fileMetadata, null, true);
+        downloadCitationBibtex(fileMetadata, true);
     }
     
-    public void downloadCitationBibtex(FileMetadata fileMetadata, Dataset dataset, boolean direct) {
-    	DataCitation citation=null;
-        if (dataset != null){
-        	citation = new DataCitation(dataset.getLatestVersion());
-        } else {
-            citation= new DataCitation(fileMetadata, direct);
-        }
-        //SEK 12/3/2018 changing this to open the json in a new tab. 
-        FacesContext ctx = FacesContext.getCurrentInstance();
-        HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
-        
-        //Fix for 6029 FireFox was failing to parse it when content type was set to json 
-        response.setContentType("text/plain");
+    public void downloadCitationBibtex(FileMetadata fileMetadata, boolean direct) {
+        DataCitation citation=null;
+        citation= new DataCitation(fileMetadata, direct);
         
         String fileNameString;
         if (fileMetadata == null || fileMetadata.getLabel() == null) {
@@ -445,6 +514,16 @@ public void downloadCitationBibtex(FileMetadata fileMetadata, Dataset dataset, b
             // Datafile-level citation:
             fileNameString = "inline;filename=" + getFileNameFromPid(citation.getPersistentId()) + "-" + FileUtil.getCiteDataFileFilename(citation.getFileTitle(), FileUtil.FileCitationExtension.BIBTEX);
         }
+        downloadBibtex(citation, fileNameString);
+    }
+
+    public void downloadBibtex(DataCitation citation, String fileNameString) {
+        //SEK 12/3/2018 changing this to open the json in a new tab. 
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
+        
+        //Fix for 6029 FireFox was failing to parse it when content type was set to json 
+        response.setContentType("text/plain");
         response.setHeader("Content-Disposition", fileNameString);
 
         try {
@@ -462,7 +541,7 @@ public boolean requestAccess(Long fileId) {
             return false;
         }
         DataFile file = datafileService.find(fileId);
-        if (!file.getFileAccessRequesters().contains((AuthenticatedUser)session.getUser())) {
+        if (!file.containsActiveFileAccessRequestFromUser(session.getUser())) {
             try {
                 commandEngine.submit(new RequestAccessCommand(dvRequestService.getDataverseRequest(), file));                        
                 return true;
@@ -472,13 +551,98 @@ public boolean requestAccess(Long fileId) {
             }             
         }        
         return false;
-    }    
+    }
+    
+    public boolean requestAccess(DataFile dataFile, GuestbookResponse gbr){
+        boolean accessRequested = false;
+        if (dvRequestService.getDataverseRequest().getAuthenticatedUser() == null){
+            return accessRequested;
+        }
+
+        if(!dataFile.containsActiveFileAccessRequestFromUser(session.getUser())) {
+            try {
+                commandEngine.submit(new RequestAccessCommand(dvRequestService.getDataverseRequest(), dataFile, gbr));
+                accessRequested = true;
+            } catch (CommandException ex) {
+                logger.info("Unable to request access for file id " + dataFile.getId() + ". Exception: " + ex);
+            }
+        } 
+
+        return accessRequested;
+    }
     
     public void sendRequestFileAccessNotification(Dataset dataset, Long fileId, AuthenticatedUser requestor) {
-        permissionService.getUsersWithPermissionOn(Permission.ManageDatasetPermissions, dataset).stream().forEach((au) -> {
-            userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.REQUESTFILEACCESS, fileId, null, requestor, false);
+        Timestamp ts = new Timestamp(new Date().getTime());
+        permissionService.getUsersWithPermissionOn(Permission.ManageFilePermissions, dataset).stream().forEach((au) -> {
+            userNotificationService.sendNotification(au, ts, UserNotification.Type.REQUESTFILEACCESS, fileId, null, requestor, true);
         });
+        //send the user that requested access a notification that they requested the access
+        userNotificationService.sendNotification(requestor, ts, UserNotification.Type.REQUESTEDFILEACCESS, fileId, null, requestor, true);
 
-    }    
+    } 
+    
+    public String generateServiceKey() {
+        UUID uid = UUID.randomUUID();
+        // last 8 bytes, of the random UUID, 16 hex digits: 
+        return uid.toString().substring(20);
+    }
     
+    public void addFileToCustomZipJob(String key, DataFile dataFile, Timestamp timestamp, boolean orig) {
+        String location = null; 
+        String fileName = null; 
+        
+        try {
+            StorageIO<DataFile> storageIO = DataAccess.getStorageIO(dataFile);
+            location = getDirectStorageLocatrion(storageIO.getStorageLocation());
+
+            if (orig && dataFile.isTabularData()) {
+                location = location.concat(".orig");
+            }
+        } catch (IOException ioex) {
+            logger.info("Failed to open StorageIO for datafile " + dataFile.getId());
+        }
+        
+        if (dataFile.getFileMetadata() != null) {
+            if (orig && dataFile.isTabularData()) {
+                fileName = dataFile.getOriginalFileName();
+            } else {
+                fileName = dataFile.getFileMetadata().getLabel();
+            }
+        }
+        
+        if (StringUtil.nonEmpty(dataFile.getFileMetadata().getDirectoryLabel())) {
+            fileName = dataFile.getFileMetadata().getDirectoryLabel() + "/" + fileName;
+        }
+                
+        if (location != null && fileName != null) {
+            em.createNativeQuery("INSERT INTO CUSTOMZIPSERVICEREQUEST (KEY, STORAGELOCATION, FILENAME, ISSUETIME) VALUES (?1,?2,?3,?4);")
+                    .setParameter(1,key)
+                    .setParameter(2,location)
+                    .setParameter(3,fileName)
+                    .setParameter(4,timestamp)
+                    .executeUpdate();
+        }
+        
+        // TODO:
+        // While we are here, issue another query, to delete all the entries that are 
+        // more than N seconds old?
+        Timestamp deleteTime = new Timestamp(new Date().getTime() - 300000L);
+        em.createNativeQuery("DELETE FROM CUSTOMZIPSERVICEREQUEST WHERE ISSUETIME < " 
+                + "'" + deleteTime + "';").executeUpdate();
+    }
+    
+    public String getDirectStorageLocatrion(String storageLocation) {
+        String storageDriverId;
+        int separatorIndex = storageLocation.indexOf(DataAccess.SEPARATOR);
+        if ( separatorIndex > 0 ) {
+            storageDriverId = storageLocation.substring(0,separatorIndex);
+        
+            String storageType = DataAccess.getDriverType(storageDriverId);
+            if (DataAccess.FILE.equals(storageType) || DataAccess.S3.equals(storageType)) {
+                return storageType.concat(storageLocation.substring(separatorIndex));
+            }
+        }
+            
+        return null; 
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java b/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java
index 380720de4f8..932bbd60be6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java
@@ -13,30 +13,36 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.CascadeType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.Version;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.persistence.Column;
+import jakarta.persistence.ColumnResult;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.persistence.Version;
 
 import edu.harvard.iq.dataverse.datavariable.CategoryMetadata;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
@@ -46,12 +52,12 @@
 import edu.harvard.iq.dataverse.util.StringUtil;
 import java.util.HashSet;
 import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import org.hibernate.validator.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Pattern;
 
 
 /**
@@ -59,6 +65,40 @@
  * @author skraffmiller
  */
 @Table(indexes = {@Index(columnList="datafile_id"), @Index(columnList="datasetversion_id")} )
+@NamedNativeQuery(
+        name = "FileMetadata.compareFileMetadata",
+        query = "WITH fm_categories AS (" +
+                "    SELECT fmd.filemetadatas_id, " +
+                "           STRING_AGG(dfc.name, ',' ORDER BY dfc.name) AS categories " +
+                "    FROM FileMetadata_DataFileCategory fmd " +
+                "    JOIN DataFileCategory dfc ON fmd.filecategories_id = dfc.id " +
+                "    GROUP BY fmd.filemetadatas_id " +
+                ") " +
+                "SELECT fm1.id " +
+                "FROM FileMetadata fm1 " +
+                "LEFT JOIN FileMetadata fm2 ON fm1.datafile_id = fm2.datafile_id " +
+                "    AND fm2.datasetversion_id = ?1 " +
+                "LEFT JOIN fm_categories fc1 ON fc1.filemetadatas_id = fm1.id " +
+                "LEFT JOIN fm_categories fc2 ON fc2.filemetadatas_id = fm2.id " +
+                "WHERE fm1.datasetversion_id = ?2 " +
+                "    AND (fm2.id IS NULL " +
+                "         OR (fm1.datafile_id = fm2.datafile_id " +
+                "             AND (fm2.description IS DISTINCT FROM fm1.description " +
+                "                  OR fm2.directoryLabel IS DISTINCT FROM fm1.directoryLabel " +
+                "                  OR fm2.label != fm1.label " +
+                "                  OR fm2.restricted IS DISTINCT FROM fm1.restricted " +
+                "                  OR fm2.prov_freeform IS DISTINCT FROM fm1.prov_freeform " +
+                "                  OR fc1.categories IS DISTINCT FROM fc2.categories " +
+                "                 ) " +
+                "            ) " +
+                "        )",
+                resultSetMapping = "IdToLongMapping"
+    )
+/* When this mapping was to Long.class, Postgres was still returning an Integer, causing indexing failures - see #11776 */ 
+@SqlResultSetMapping(
+        name = "IdToLongMapping",
+        columns = @ColumnResult(name = "id", type = Integer.class)
+    )
 @Entity
 public class FileMetadata implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -126,6 +166,7 @@ public FileMetadata createCopy() {
         fmd.setDescription( getDescription() );
         fmd.setLabel( getLabel() );
         fmd.setRestricted( isRestricted() );
+        fmd.setDirectoryLabel(getDirectoryLabel());
         
         return fmd;
     }
@@ -202,6 +243,25 @@ public void setVarGroups(List<VarGroup> varGroups) {
     private List<DataFileCategory> fileCategories;
     
     public List<DataFileCategory> getCategories() {
+        if (fileCategories != null) {
+            /*
+             * fileCategories can sometimes be an
+             * org.eclipse.persistence.indirection.IndirectList When that happens, the
+             * comparator in the Collections.sort below is not called, possibly due to
+             * https://bugs.eclipse.org/bugs/show_bug.cgi?id=446236 which is Java 1.8+
+             * specific Converting to an ArrayList solves the problem, but the longer term
+             * solution may be in avoiding the IndirectList or moving to a new version of
+             * the jar it is in.
+             */
+            if (!(fileCategories instanceof ArrayList)) {
+                List<DataFileCategory> newDFCs = new ArrayList<DataFileCategory>();
+                for (DataFileCategory fdc : fileCategories) {
+                    newDFCs.add(fdc);
+                }
+                setCategories(newDFCs);
+            }
+            Collections.sort(fileCategories, FileMetadata.compareByNameWithSortCategories);
+        }
         return fileCategories;
     }
     
@@ -227,7 +287,7 @@ public List<String> getCategoriesByName() {
             return ret;
         }
         
-        for (DataFileCategory fileCategory : fileCategories) {
+        for (DataFileCategory fileCategory : getCategories()) {
             ret.add(fileCategory.getName());
         }
         // fileCategories.stream()
@@ -236,7 +296,6 @@ public List<String> getCategoriesByName() {
         return ret;
     }
     
-    
     public JsonArrayBuilder getCategoryNamesAsJsonArrayBuilder() {
 
         JsonArrayBuilder builder = Json.createArrayBuilder();
@@ -374,23 +433,19 @@ public String getFileDateToDisplay() {
         }
         return "";
     }
-     
+
     public String getFileCitation(){
-         return getFileCitation(false);
-     }
-     
+        return getFileCitation(false, false);
+    }
 
-    
-     
-    public String getFileCitation(boolean html){
-         return new DataCitation(this).toString(html);
-     }
-    
-    public String getDirectFileCitation(boolean html){
-    	return new DataCitation(this, true).toString(html);
+    public String getFileCitation(boolean html, boolean anonymized){
+         return new DataCitation(this).toString(html, anonymized);
     }
-    
-        
+
+    public String getDirectFileCitation(boolean html, boolean anonymized){
+        return new DataCitation(this, true).toString(html, anonymized);
+    }
+
     public DatasetVersion getDatasetVersion() {
         return datasetVersion;
     }
@@ -449,6 +504,17 @@ public Long getVersion() {
     public void setVersion(Long version) {
         this.version = version;
     }
+    
+    @Transient
+    private boolean inPriorVersion;
+
+    public boolean isInPriorVersion() {
+        return inPriorVersion;
+    }
+
+    public void setInPriorVersion(boolean inPriorVersion) {
+        this.inPriorVersion = inPriorVersion;
+    }
 
     @Transient
     private boolean selected;
@@ -461,6 +527,7 @@ public void setSelected(boolean selected) {
         this.selected = selected;
     }
     
+    
     @Transient
     private boolean restrictedUI;
 
@@ -511,60 +578,24 @@ public boolean equals(Object object) {
         
         return !((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id)));
     }
-
+    
+    public boolean contentEquals(FileMetadata other) {
     /* 
-     * An experimental method for comparing 2 file metadatas *by content*; i.e., 
-     * this would be for checking 2 metadatas from 2 different versions, to 
-     * determine if any of the actual metadata fields have changed between 
-     * versions. 
+       This method now invokes the logic contained in the FileVersionDifference compareMetadata method
+       so that the logic is in a single place
     */
-    public boolean contentEquals(FileMetadata other) {
-        if (other == null) {
-            return false; 
-        }
-        
-        if (this.getLabel() != null) {
-            if (!this.getLabel().equals(other.getLabel())) {
-                return false;
-            }
-        } else if (other.getLabel() != null) {
-            return false;
-        }
-
-        if (this.getDirectoryLabel() != null) {
-            if (!this.getDirectoryLabel().equals(other.getDirectoryLabel())) {
-                return false;
-            }
-        } else if (other.getDirectoryLabel() != null) {
-            return false;
-        }
-        
-        if (this.getDescription() != null) {
-            if (!this.getDescription().equals(other.getDescription())) {
-                return false;
-            }
-        } else if (other.getDescription() != null) {
-            return false;
-        }
-        List<String> categoryNames =this.getCategoriesByName();
-        List<String> otherCategoryNames =other.getCategoriesByName();
-        if(!categoryNames.isEmpty()) {
-            categoryNames.sort(null);
-            otherCategoryNames.sort(null);
-            if (!categoryNames.equals(otherCategoryNames)) {
-                return false;
-            }
-        } else if(!otherCategoryNames.isEmpty()) {
-            return false;
-        }
-        
-        return true;
+        return compareContent(other);
     }
+
     
+    public boolean compareContent(FileMetadata other){
+         FileVersionDifference diffObj = new FileVersionDifference(this, other, false);
+         return diffObj.isSame();
+    }
     
     @Override
     public String toString() {
-        return "edu.harvard.iq.dvn.core.study.FileMetadata[id=" + id + "]";
+        return "edu.harvard.iq.dataverse.FileMetadata[id=" + id + "]";
     }
     
     public static final Comparator<FileMetadata> compareByLabel = new Comparator<FileMetadata>() {
@@ -574,28 +605,47 @@ public int compare(FileMetadata o1, FileMetadata o2) {
         }
     };
     
-    public static final Comparator<FileMetadata> compareByLabelAndFolder = new Comparator<FileMetadata>() {
+    static Map<String,Long> categoryMap=null;
+    
+    public static void setCategorySortOrder(String categories) {
+       categoryMap=new HashMap<String, Long>();
+       long i=1;
+       for(String cat: categories.split(",\\s*")) {
+           categoryMap.put(cat.toUpperCase(), i);
+           i++;
+       }
+    }
+    
+    public static Map<String,Long> getCategorySortOrder() {
+        return categoryMap;
+    }
+    
+    
+    public static final Comparator<DataFileCategory> compareByNameWithSortCategories = new Comparator<DataFileCategory>() {
+        @Override
+        public int compare(DataFileCategory o1, DataFileCategory o2) {
+            if (categoryMap != null) {
+                //If one is in the map and one is not, the former is first, otherwise sort by name
+                boolean o1InMap = categoryMap.containsKey(o1.getName().toUpperCase()); 
+                boolean o2InMap = categoryMap.containsKey(o2.getName().toUpperCase());
+                if(o1InMap && !o2InMap) {
+                    return (-1);
+                }
+                if(!o1InMap && o2InMap) {
+                    return 1;
+                }
+            }
+            return(o1.getName().toUpperCase().compareTo(o2.getName().toUpperCase()));
+        }
+    };
+    
+    public static final Comparator<FileMetadata> compareByFullPath = new Comparator<FileMetadata>() {
         @Override
         public int compare(FileMetadata o1, FileMetadata o2) {
-            String folder1 = o1.getDirectoryLabel() == null ? "" : o1.getDirectoryLabel().toUpperCase();
-            String folder2 = o2.getDirectoryLabel() == null ? "" : o2.getDirectoryLabel().toUpperCase();
-            
-            
-            // We want to the files w/ no folders appear *after* all the folders
-            // on the sorted list:
-            if ("".equals(folder1) && !"".equals(folder2)) {
-                return 1;
-            }
+            String folder1 = StringUtil.isEmpty(o1.getDirectoryLabel()) ? "" : o1.getDirectoryLabel().toUpperCase() + "/";
+            String folder2 = StringUtil.isEmpty(o2.getDirectoryLabel()) ? "" : o2.getDirectoryLabel().toUpperCase() + "/";
             
-            if ("".equals(folder2) && !"".equals(folder1)) {
-                return -1;
-            }
-            
-            int comp = folder1.compareTo(folder2); 
-            if (comp != 0) {
-                return comp;
-            }
-            return o1.getLabel().toUpperCase().compareTo(o2.getLabel().toUpperCase());
+            return folder1.concat(o1.getLabel().toUpperCase()).compareTo(folder2.concat(o2.getLabel().toUpperCase()));
         }
     };
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileMetadataVersionsHelper.java b/src/main/java/edu/harvard/iq/dataverse/FileMetadataVersionsHelper.java
new file mode 100644
index 00000000000..6778794dea6
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/FileMetadataVersionsHelper.java
@@ -0,0 +1,267 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.json.*;
+
+import java.util.*;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
+
+@Stateless
+public class FileMetadataVersionsHelper {
+    private static final Logger logger = Logger.getLogger(FileMetadataVersionsHelper.class.getCanonicalName());
+
+    @EJB
+    DataFileServiceBean datafileService;
+    @EJB
+    DatasetVersionServiceBean datasetVersionService;
+    @EJB
+    PermissionServiceBean permissionService;
+
+    // Groups that are single element groups and therefore not arrays.
+    private static final List<String> SINGLE_ELEMENT_GROUPS = List.of("File Access");
+
+    public List<FileMetadata> loadFileVersionList(DataverseRequest req, FileMetadata fileMetadata) {
+        List<DataFile> allfiles = allRelatedFiles(fileMetadata);
+        List<FileMetadata> retList = new ArrayList<>();
+        boolean hasPermission = permissionService.requestOn(req, fileMetadata.getDatasetVersion().getDataset()).has(Permission.ViewUnpublishedDataset);
+        for (DatasetVersion versionLoop : fileMetadata.getDatasetVersion().getDataset().getVersions()) {
+            boolean foundFmd = false;
+            if (versionLoop.isReleased() || versionLoop.isDeaccessioned() || hasPermission) {
+                foundFmd = false;
+                //TODO: Improve this code to get the FileMetadata directly from the list of allfiles without the need to double loop
+                for (DataFile df : allfiles) {
+                    FileMetadata fmd = datafileService.findFileMetadataByDatasetVersionIdAndDataFileId(versionLoop.getId(), df.getId());
+                    if (fmd != null) {
+                        fmd.setContributorNames(datasetVersionService.getContributorsNames(versionLoop));
+                        FileVersionDifference fvd = new FileVersionDifference(fmd, getPreviousFileMetadata(fileMetadata, fmd), true);
+                        fmd.setFileVersionDifference(fvd);
+                        retList.add(fmd);
+                        foundFmd = true;
+                        break;
+                    }
+                }
+                // no File metadata found make dummy one
+                if (!foundFmd) {
+                    FileMetadata dummy = new FileMetadata();
+                    dummy.setDatasetVersion(versionLoop);
+                    dummy.setDataFile(null);
+                    FileVersionDifference fvd = new FileVersionDifference(dummy, getPreviousFileMetadata(fileMetadata, versionLoop), true);
+                    dummy.setFileVersionDifference(fvd);
+                    retList.add(dummy);
+                }
+            }
+        }
+        return retList;
+    }
+
+    public JsonObjectBuilder jsonDataFileVersions(FileMetadata fileMetadata) {
+        JsonObjectBuilder job = jsonObjectBuilder();
+        if (fileMetadata.getDatasetVersion() != null) {
+            job.add("datasetVersion", fileMetadata.getDatasetVersion().getFriendlyVersionNumber());
+            if (fileMetadata.getDatasetVersion().getVersionNumber() != null) {
+                job
+                    .add("versionNumber", fileMetadata.getDatasetVersion().getVersionNumber())
+                    .add("versionMinorNumber", fileMetadata.getDatasetVersion().getMinorVersionNumber());
+            }
+
+            job
+                .add("isDraft", fileMetadata.getDatasetVersion().isDraft())
+                .add("isReleased", fileMetadata.getDatasetVersion().isReleased())
+                .add("isDeaccessioned", fileMetadata.getDatasetVersion().isDeaccessioned())
+                .add("versionState", fileMetadata.getDatasetVersion().getVersionState().name())
+                .add("summary", fileMetadata.getDatasetVersion().getVersionNote())
+                .add("contributors", fileMetadata.getContributorNames())
+                .add("publishedDate", fileMetadata.getDataFile().getPublicationDate() != null ? fileMetadata.getDataFile().getPublicationDate().toString() : null)
+            ;
+        }
+        if (fileMetadata.getDataFile() != null) {
+            job.add("datafileId", fileMetadata.getDataFile().getId());
+            job.add("persistentId", (fileMetadata.getDataFile().getGlobalId() != null ? fileMetadata.getDataFile().getGlobalId().asString() : ""));
+        }
+        FileVersionDifference fvd = fileMetadata.getFileVersionDifference();
+        if (fvd != null) {
+            List<FileVersionDifference.FileDifferenceSummaryGroup> groups = fvd.getDifferenceSummaryGroups();
+            JsonObjectBuilder fileDifferenceSummary = jsonObjectBuilder()
+                .add("versionNote", fileMetadata.getDatasetVersion().getVersionNote())
+                .add("deaccessionedReason", fileMetadata.getDatasetVersion().getDeaccessionNote())
+                .add("file", getFileAction(fvd.getOriginalFileMetadata(), fvd.getNewFileMetadata()));
+
+            if (groups != null && !groups.isEmpty()) {
+                List<FileVersionDifference.FileDifferenceSummaryGroup> sortedGroups = groups.stream()
+                        .sorted(Comparator.comparing(FileVersionDifference.FileDifferenceSummaryGroup::getName))
+                        .collect(Collectors.toList());
+                String groupName = null;
+                final JsonArrayBuilder groupsArrayBuilder = Json.createArrayBuilder();
+                final JsonObjectBuilder groupsObjectBuilder = jsonObjectBuilder();
+                Map<String, Integer> itemCounts = new HashMap<>();
+
+                for (FileVersionDifference.FileDifferenceSummaryGroup group : sortedGroups) {
+                    if (!StringUtil.isEmpty(group.getName())) {
+                        // if the group name changed then add its data to the fileDifferenceSummary and reset list for next group
+                        if (groupName != null && groupName.compareTo(group.getName()) != 0) {
+                            addJsonGroupObject(fileDifferenceSummary, groupName, groupsObjectBuilder.build(), groupsArrayBuilder.build(), itemCounts);
+                            // Note: groupsArrayBuilder.build() also clears the data within it
+                            itemCounts.clear();
+                        }
+                        groupName = group.getName();
+
+                        group.getFileDifferenceSummaryItems().forEach(item -> {
+                            JsonObjectBuilder itemObjectBuilder = jsonObjectBuilder();
+                            if (item.getName().isEmpty()) {
+                                // 'groupName': {'Added'=#, 'Changed'=#, ...}
+                                // accumulate the counts since we can't make a separate array item
+                                itemCounts.merge("Added", item.getAdded(), Integer::sum);
+                                itemCounts.merge("Changed", item.getChanged(), Integer::sum);
+                                itemCounts.merge("Deleted", item.getDeleted(), Integer::sum);
+                                itemCounts.merge("Replaced", item.getReplaced(), Integer::sum);
+                            } else if (SINGLE_ELEMENT_GROUPS.contains(group.getName())) {
+                                // 'groupName': 'getNameValue'
+                                groupsObjectBuilder.add(group.getName(), group.getFileDifferenceSummaryItems().get(0).getName());
+                            } else {
+                                // 'groupName': [{name='', action=''}, {name='', action=''}]
+                                String action = item.getAdded() > 0 ? "Added" : item.getChanged() > 0 ? "Changed" :
+                                        item.getDeleted() > 0 ? "Deleted" : item.getReplaced() > 0 ? "Replaced" : "";
+                                itemObjectBuilder.add("name", item.getName());
+                                if (!action.isEmpty()) {
+                                    itemObjectBuilder.add("action", action);
+                                }
+                                groupsArrayBuilder.add(itemObjectBuilder.build());
+                            }
+                        });
+                    }
+                }
+                // process last group
+                addJsonGroupObject(fileDifferenceSummary, groupName, groupsObjectBuilder.build(), groupsArrayBuilder.build(), itemCounts);
+            }
+            JsonObject fileDifferenceSummaryObject = fileDifferenceSummary.build();
+            if (!fileDifferenceSummaryObject.isEmpty()) {
+                job.add("fileDifferenceSummary", fileDifferenceSummaryObject);
+            }
+        }
+        return job;
+    }
+
+    //TODO: this could use some refactoring to cut down on the number of for loops!
+    private FileMetadata getPreviousFileMetadata(FileMetadata fileMetadata, FileMetadata fmdIn){
+
+        DataFile dfPrevious = datafileService.findPreviousFile(fmdIn.getDataFile());
+        DatasetVersion dvPrevious = null;
+        boolean gotCurrent = false;
+        for (DatasetVersion dvloop: fileMetadata.getDatasetVersion().getDataset().getVersions()) {
+            if(gotCurrent){
+                dvPrevious  = dvloop;
+                break;
+            }
+            if(dvloop.equals(fmdIn.getDatasetVersion())){
+                gotCurrent = true;
+            }
+        }
+
+        List<DataFile> allfiles = allRelatedFiles(fileMetadata);
+
+        if (dvPrevious != null && dvPrevious.getFileMetadatasSorted() != null) {
+            for (FileMetadata fmdTest : dvPrevious.getFileMetadatasSorted()) {
+                for (DataFile fileTest : allfiles) {
+                    if (fmdTest.getDataFile().equals(fileTest)) {
+                        return fmdTest;
+                    }
+                }
+            }
+        }
+
+        Long dfId = fmdIn.getDataFile().getId();
+        if (dfPrevious != null){
+            dfId = dfPrevious.getId();
+        }
+        Long versionId = null;
+        if (dvPrevious !=null){
+            versionId = dvPrevious.getId();
+        }
+
+        FileMetadata fmd = datafileService.findFileMetadataByDatasetVersionIdAndDataFileId(versionId, dfId);
+
+        return fmd;
+    }
+
+    //TODO: this could use some refactoring to cut down on the number of for loops!
+    private FileMetadata getPreviousFileMetadata(FileMetadata fileMetadata, DatasetVersion currentversion) {
+        List<DataFile> allfiles = allRelatedFiles(fileMetadata);
+        boolean foundCurrent = false;
+        DatasetVersion priorVersion = null;
+        for (DatasetVersion versionLoop : fileMetadata.getDatasetVersion().getDataset().getVersions()) {
+            if (foundCurrent) {
+                priorVersion = versionLoop;
+                break;
+            }
+            if (versionLoop.equals(currentversion)) {
+                foundCurrent = true;
+            }
+
+        }
+        if (priorVersion != null && priorVersion.getFileMetadatasSorted() != null) {
+            for (FileMetadata fmdTest : priorVersion.getFileMetadatasSorted()) {
+                for (DataFile fileTest : allfiles) {
+                    if (fmdTest.getDataFile().equals(fileTest)) {
+                        return fmdTest;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+    private List<DataFile> allRelatedFiles(FileMetadata fileMetadata) {
+        List<DataFile> dataFiles = new ArrayList<>();
+        DataFile dataFileToTest = fileMetadata.getDataFile();
+        Long rootDataFileId = dataFileToTest.getRootDataFileId();
+        if (rootDataFileId < 0) {
+            dataFiles.add(dataFileToTest);
+        } else {
+            dataFiles.addAll(datafileService.findAllRelatedByRootDatafileId(rootDataFileId));
+        }
+        return dataFiles;
+    }
+
+    private String getFileAction(FileMetadata originalFileMetadata, FileMetadata newFileMetadata) {
+        if (newFileMetadata.getDataFile() != null && originalFileMetadata == null) {
+            return "Added";
+        } else if (newFileMetadata.getDataFile() == null && originalFileMetadata != null) {
+            return "Deleted";
+        } else if (originalFileMetadata != null &&
+                newFileMetadata.getDataFile() != null && originalFileMetadata.getDataFile() != null &&!originalFileMetadata.getDataFile().equals(newFileMetadata.getDataFile())) {
+            return "Replaced";
+        } else {
+            return null;
+        }
+    }
+
+    private void addJsonGroupObject(JsonObjectBuilder jsonObjectBuilder, String key, JsonObject jsonObjectValue, JsonArray jsonArrayValue, Map<String, Integer> itemCounts) {
+        if (key != null && !key.isEmpty()) {
+            String sanitizedKey = key.replaceAll("\\s+", "");
+            if (itemCounts.isEmpty()) {
+                if (jsonArrayValue.isEmpty()) {
+                    // add the object
+                    jsonObjectBuilder.add(sanitizedKey, jsonObjectValue.getValue("/"+key));
+                } else {
+                    // add the array
+                    jsonObjectBuilder.add(sanitizedKey, jsonArrayValue);
+                }
+            } else {
+                // add the accumulated totals
+                JsonObjectBuilder accumulatedTotalsObjectBuilder = jsonObjectBuilder();
+                itemCounts.forEach((k, v) -> {
+                    if (v != 0) {
+                        accumulatedTotalsObjectBuilder.add(k, v);
+                    }
+                });
+                jsonObjectBuilder.add(sanitizedKey, accumulatedTotalsObjectBuilder.build());
+            }
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java
index 15383eb3d57..72dde0d7d0e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FilePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FilePage.java
@@ -9,42 +9,65 @@
 import edu.harvard.iq.dataverse.dataaccess.SwiftAccessIO;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
-import edu.harvard.iq.dataverse.datasetutility.WorldMapPermissionHelper;
 import edu.harvard.iq.dataverse.engine.command.Command;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDatasetCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.PersistProvFreeFormCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RestrictFileCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.UningestFileCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
-import edu.harvard.iq.dataverse.export.ExportException;
 import edu.harvard.iq.dataverse.export.ExportService;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool;
+import edu.harvard.iq.dataverse.externaltools.ExternalToolHandler;
 import edu.harvard.iq.dataverse.externaltools.ExternalToolServiceBean;
+import edu.harvard.iq.dataverse.ingest.IngestRequest;
+import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean.MakeDataCountEntry;
-import edu.harvard.iq.dataverse.makedatacount.MakeDataCountUtil;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
+import edu.harvard.iq.dataverse.util.StringUtil;
+
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+
 import java.io.IOException;
+import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.validation.ConstraintViolation;
+import java.util.stream.Collectors;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.validation.ConstraintViolation;
+
+import org.omnifaces.util.Faces;
+import org.primefaces.PrimeFaces;
 import org.primefaces.component.tabview.TabView;
 import org.primefaces.event.TabChangeEvent;
 
@@ -61,6 +84,7 @@ public class FilePage implements java.io.Serializable {
     private FileMetadata fileMetadata;
     private Long fileId;  
     private String version;
+    private String toolType;
     private DataFile file;   
     private GuestbookResponse guestbookResponse;
     private int selectedTabIndex;
@@ -71,6 +95,13 @@ public class FilePage implements java.io.Serializable {
     private String persistentId;
     private List<ExternalTool> configureTools;
     private List<ExternalTool> exploreTools;
+    private List<ExternalTool> toolsWithPreviews;
+    private List<ExternalTool> queryTools;
+    private Long datasetVersionId;
+    /**
+     * Have the terms been met so that the Preview tab can show the preview?
+     */
+    private boolean termsMet;
 
     @EJB
     DataFileServiceBean datafileService;
@@ -88,7 +119,10 @@ public class FilePage implements java.io.Serializable {
     GuestbookResponseServiceBean guestbookResponseService;
     @EJB
     AuthenticationServiceBean authService;
-    
+    @EJB
+    DatasetServiceBean datasetService;
+    @EJB
+    IngestServiceBean ingestService;
     @EJB
     SystemConfig systemConfig;
 
@@ -99,6 +133,10 @@ public class FilePage implements java.io.Serializable {
     EjbDataverseEngine commandEngine;
     @EJB
     ExternalToolServiceBean externalToolService;
+    @EJB
+    PrivateUrlServiceBean privateUrlService;
+    @EJB
+    AuxiliaryFileServiceBean auxiliaryFileService;
 
     @Inject
     DataverseRequestServiceBean dvRequestService;
@@ -106,17 +144,17 @@ public class FilePage implements java.io.Serializable {
     PermissionsWrapper permissionsWrapper;
     @Inject
     FileDownloadHelper fileDownloadHelper;
-    @Inject WorldMapPermissionHelper worldMapPermissionHelper;
     @Inject
     MakeDataCountLoggingServiceBean mdcLogService;
+    @Inject
+    SettingsWrapper settingsWrapper;
+    @Inject
+    EmbargoServiceBean embargoService;
 
-    public WorldMapPermissionHelper getWorldMapPermissionHelper() {
-        return worldMapPermissionHelper;
-    }
-
-    public void setWorldMapPermissionHelper(WorldMapPermissionHelper worldMapPermissionHelper) {
-        this.worldMapPermissionHelper = worldMapPermissionHelper;
-    }
+    @Inject
+    RetentionServiceBean retentionService;
+    @Inject
+    FileMetadataVersionsHelper fileMetadataVersionsHelper;
 
     private static final Logger logger = Logger.getLogger(FilePage.class.getCanonicalName());
 
@@ -125,7 +163,6 @@ public String init() {
      
         
         if (fileId != null || persistentId != null) {
-
             // ---------------------------------------
             // Set the file and datasetVersion 
             // ---------------------------------------           
@@ -163,10 +200,14 @@ public String init() {
 
                 return permissionsWrapper.notFound();
             }
-
             RetrieveDatasetVersionResponse retrieveDatasetVersionResponse;
-            retrieveDatasetVersionResponse = datasetVersionService.selectRequestedVersion(file.getOwner().getVersions(), version);
-            Long getDatasetVersionID = retrieveDatasetVersionResponse.getDatasetVersion().getId();
+            Long getDatasetVersionID = null;
+            if (datasetVersionId == null) {
+                retrieveDatasetVersionResponse = datasetVersionService.selectRequestedVersion(file.getOwner().getVersions(), version);
+                getDatasetVersionID = retrieveDatasetVersionResponse.getDatasetVersion().getId();
+            } else {
+                getDatasetVersionID = datasetVersionId;
+            }
             fileMetadata = datafileService.findFileMetadataByDatasetVersionIdAndDataFileId(getDatasetVersionID, fileId);
 
             if (fileMetadata == null) {
@@ -176,17 +217,20 @@ public String init() {
                     return permissionsWrapper.notFound();
                 }
             }
-
+            
             // If this DatasetVersion is unpublished and permission is doesn't have permissions:
             //  > Go to the Login page
             //
-            // Check permisisons       
+            // Check permissions
             Boolean authorized = (fileMetadata.getDatasetVersion().isReleased())
                     || (!fileMetadata.getDatasetVersion().isReleased() && this.canViewUnpublishedDataset());
 
             if (!authorized) {
                 return permissionsWrapper.notAuthorized();
             }
+            
+            //termsOfAccess = fileMetadata.getDatasetVersion().getTermsOfUseAndAccess().getTermsOfAccess();
+            //fileAccessRequest = fileMetadata.getDatasetVersion().getTermsOfUseAndAccess().isFileAccessRequest();
 
             this.guestbookResponse = this.guestbookResponseService.initGuestbookResponseForFragment(fileMetadata, session);
 
@@ -206,26 +250,149 @@ public String init() {
             if (file.isTabularData()) {
                 contentType=DataFileServiceBean.MIME_TYPE_TSV_ALT;
             }
-            configureTools = externalToolService.findFileToolsByTypeAndContentType(ExternalTool.Type.CONFIGURE, contentType);
-            exploreTools = externalToolService.findFileToolsByTypeAndContentType(ExternalTool.Type.EXPLORE, contentType);
+            loadExternalTools();
+            
+            
+            
+            if (toolType != null) {
+                if (toolType.equals("PREVIEW")) {
+                    if (!toolsWithPreviews.isEmpty()) {
+                        setSelectedTool(toolsWithPreviews.get(0));
+                    }
+                }
+                if (toolType.equals("QUERY")) {
+                    if (!queryTools.isEmpty()) {
+                        setSelectedTool(queryTools.get(0));
+                    }
+                }
+            } else {
+                if (!getAllAvailableTools().isEmpty()){
+                    setSelectedTool(getAllAvailableTools().get(0));
+                }
+            }
 
         } else {
-
             return permissionsWrapper.notFound();
         }
+        
+        hasRestrictedFiles = fileMetadata.getDatasetVersion().isHasRestrictedFile();
+        hasValidTermsOfAccess = null;
+        hasValidTermsOfAccess = isHasValidTermsOfAccess();
+        if(!hasValidTermsOfAccess && canUpdateDataset() ){
+            JsfHelper.addWarningMessage(BundleUtil.getStringFromBundle("dataset.message.editMetadata.invalid.TOUA.message"));
+        }
+
+        LocalDate minRetentiondate = settingsWrapper.getMinRetentionDate();
+        if (minRetentiondate != null){
+            selectionRetention.setDateUnavailable(minRetentiondate.plusDays(1L));
+        }
 
+        displayPublishMessage();
         return null;
     }
     
+    private void loadExternalTools() {
+        String contentType= file.getContentType();
+        configureTools = externalToolService.findFileToolsByTypeAndContentType(ExternalTool.Type.CONFIGURE, contentType);
+        exploreTools = externalToolService.findFileToolsByTypeAndContentType(ExternalTool.Type.EXPLORE, contentType);
+        queryTools = externalToolService.findFileToolsByTypeAndContentType(ExternalTool.Type.QUERY, contentType);
+        Collections.sort(exploreTools, CompareExternalToolName);
+        toolsWithPreviews  = sortExternalTools();
+        //For inaccessible files, only show the tools that have access to aux files (which are currently always accessible)
+        if(!StorageIO.isDataverseAccessible(DataAccess.getStorageDriverFromIdentifier(file.getStorageIdentifier()))) {
+            configureTools = configureTools.stream().filter(tool ->tool.accessesAuxFiles()).collect(Collectors.toList());
+            exploreTools = exploreTools.stream().filter(tool ->tool.accessesAuxFiles()).collect(Collectors.toList());
+            queryTools = queryTools.stream().filter(tool ->tool.accessesAuxFiles()).collect(Collectors.toList());
+            toolsWithPreviews = toolsWithPreviews.stream().filter(tool ->tool.accessesAuxFiles()).collect(Collectors.toList());
+        } else {
+            // Don't list queryTools for non-public files
+            // Note - this logic is not the same as isPubliclyDownloadable which appears to be true for a draft-only file
+            // It is the same as in the DatasetPage.isShowQueryButton() method
+            if(file.isRestricted()
+                    || !file.isReleased()
+                    || FileUtil.isActivelyEmbargoed(file)
+                    || FileUtil.isRetentionExpired(file)){
+                queryTools = new ArrayList<>();
+            }
+        }
+    }
+
+    private void displayPublishMessage(){
+        if (fileMetadata.getDatasetVersion().isDraft()  && canUpdateDataset()
+                &&   (canPublishDataset() || !fileMetadata.getDatasetVersion().getDataset().isLockedFor(DatasetLock.Reason.InReview))){
+            JsfHelper.addWarningMessage(datasetService.getReminderString(fileMetadata.getDatasetVersion().getDataset(), canPublishDataset(), true, isValid()));
+        }               
+    }
+    
+    Boolean valid = null;
+
+    public boolean isValid() {
+        if (valid == null) {
+            final DatasetVersion workingVersion = fileMetadata.getDatasetVersion();
+            if (workingVersion.isDraft() || (canUpdateDataset() && JvmSettings.UI_SHOW_VALIDITY_LABEL_WHEN_PUBLISHED.lookupOptional(Boolean.class).orElse(true))) {
+                valid = workingVersion.isValid();
+            } else {
+                valid = true;
+            }
+        }
+        return valid;
+    }
+
     private boolean canViewUnpublishedDataset() {
         return permissionsWrapper.canViewUnpublishedDataset( dvRequestService.getDataverseRequest(), fileMetadata.getDatasetVersion().getDataset());
     }
-   
+    
+    public boolean canPublishDataset(){
+        return permissionsWrapper.canIssuePublishDatasetCommand(fileMetadata.getDatasetVersion().getDataset());
+    }
+    
+    public boolean canSeeCurationStatus() {
+        boolean creatorsCanSeeStatus = JvmSettings.UI_SHOW_CURATION_STATUS_TO_ALL.lookupOptional(Boolean.class).orElse(false);
+        if (creatorsCanSeeStatus) {
+            return canViewUnpublishedDataset();
+        } else {
+            return canPublishDataset();
+        }
+    }
 
     public FileMetadata getFileMetadata() {
         return fileMetadata;
     }
+
+    public Long getDatasetVersionId() {
+        return datasetVersionId;
+    }
+
+    public void setDatasetVersionId(Long datasetVersionId) {
+        this.datasetVersionId = datasetVersionId;
+    }
+
+    // findPreviewTools would be a better name
+    private List<ExternalTool> sortExternalTools(){
+        List<ExternalTool> retList = new ArrayList<>();
+        List<ExternalTool> previewTools = externalToolService.findFileToolsByTypeAndContentType(ExternalTool.Type.PREVIEW, file.getContentType());
+        for (ExternalTool previewTool : previewTools) {
+            if (externalToolService.meetsRequirements(previewTool, file)) {
+                retList.add(previewTool);
+            }
+        }
+        Collections.sort(retList, CompareExternalToolName);
+        return retList;
+    }
     
+    private String termsGuestbookPopupAction = "";
+
+    public void setTermsGuestbookPopupAction(String popupAction){
+        if(popupAction != null && popupAction.length() > 0){
+            logger.info("TGPA set to " + popupAction);
+            this.termsGuestbookPopupAction = popupAction;
+        }
+
+    }
+
+    public String getTermsGuestbookPopupAction(){
+        return termsGuestbookPopupAction;
+    }
 
     public boolean isDownloadPopupRequired() {  
         if(fileMetadata.getId() == null || fileMetadata.getDatasetVersion().getId() == null ){
@@ -241,6 +408,18 @@ public boolean isRequestAccessPopupRequired() {
         return FileUtil.isRequestAccessPopupRequired(fileMetadata.getDatasetVersion());
     }
 
+    public boolean isGuestbookAndTermsPopupRequired() {  
+        if(fileMetadata.getId() == null || fileMetadata.getDatasetVersion().getId() == null ){
+            return false;
+        }
+        return FileUtil.isGuestbookAndTermsPopupRequired(fileMetadata.getDatasetVersion());
+    }
+    
+    public boolean isGuestbookPopupRequiredAtDownload(){
+        // Only show guestbookAtDownload if guestbook at request is disabled (legacy behavior)
+        DatasetVersion workingVersion = fileMetadata.getDatasetVersion();
+        return FileUtil.isGuestbookPopupRequired(workingVersion) && !workingVersion.getDataset().getEffectiveGuestbookEntryAtRequest();
+    }
 
     public void setFileMetadata(FileMetadata fileMetadata) {
         this.fileMetadata = fileMetadata;
@@ -273,13 +452,13 @@ public void setVersion(String version) {
     public List< String[]> getExporters(){
         List<String[]> retList = new ArrayList<>();
         String myHostURL = systemConfig.getDataverseSiteUrl();
-        for (String [] provider : ExportService.getInstance(settingsService).getExportersLabels() ){
+        for (String [] provider : ExportService.getInstance().getExportersLabels() ){
             String formatName = provider[1];
             String formatDisplayName = provider[0];
             
             Exporter exporter = null; 
             try {
-                exporter = ExportService.getInstance(settingsService).getExporter(formatName);
+                exporter = ExportService.getInstance().getExporter(formatName);
             } catch (ExportException ex) {
                 exporter = null;
             }
@@ -287,9 +466,9 @@ public List< String[]> getExporters(){
                 // Not all metadata exports should be presented to the web users!
                 // Some are only for harvesting clients.
                 
-                String[] temp = new String[2];            
+                String[] temp = new String[2];
                 temp[0] = formatDisplayName;
-                temp[1] = myHostURL + "/api/datasets/export?exporter=" + formatName + "&persistentId=" + fileMetadata.getDatasetVersion().getDataset().getGlobalIdString();
+                temp[1] = myHostURL + "/api/datasets/export?exporter=" + formatName + "&persistentId=" + fileMetadata.getDatasetVersion().getDataset().getGlobalId().asString();
                 retList.add(temp);
             }
         }
@@ -301,7 +480,7 @@ public String saveProvFreeform(String freeformTextInput, DataFile dataFileFromPo
         file.setProvEntityName(dataFileFromPopup.getProvEntityName()); //passing this value into the file being saved here is pretty hacky.
         Command cmd;
         
-        for (FileMetadata fmw : editDataset.getEditVersion().getFileMetadatas()) {
+        for (FileMetadata fmw : editDataset.getOrCreateEditVersion().getFileMetadatas()) {
             if (fmw.getDataFile().equals(this.fileMetadata.getDataFile())) {
                 cmd = new PersistProvFreeFormCommand(dvRequestService.getDataverseRequest(), file, freeformTextInput);
                 commandEngine.submit(cmd);
@@ -315,23 +494,31 @@ public String saveProvFreeform(String freeformTextInput, DataFile dataFileFromPo
     
     public String restrictFile(boolean restricted) throws CommandException{
         String fileNames = null;
-        String termsOfAccess = this.fileMetadata.getDatasetVersion().getTermsOfUseAndAccess().getTermsOfAccess();        
-        Boolean allowRequest = this.fileMetadata.getDatasetVersion().getTermsOfUseAndAccess().isFileAccessRequest();
         editDataset = this.file.getOwner();
-        
-        Command cmd;
-        for (FileMetadata fmw : editDataset.getEditVersion().getFileMetadatas()) {
-            if (fmw.getDataFile().equals(this.fileMetadata.getDataFile())) {
-                fileNames += fmw.getLabel();
-                //fmw.setRestricted(restricted);
-                cmd = new RestrictFileCommand(fmw.getDataFile(), dvRequestService.getDataverseRequest(), restricted);
-                commandEngine.submit(cmd);
-            }
+        if (restricted) { // get values from access popup
+            editDataset.getOrCreateEditVersion().getTermsOfUseAndAccess().setTermsOfAccess(termsOfAccess);
+            editDataset.getOrCreateEditVersion().getTermsOfUseAndAccess().setFileAccessRequest(fileAccessRequest);   
         }
-        
-        editDataset.getEditVersion().getTermsOfUseAndAccess().setTermsOfAccess(termsOfAccess);
-        editDataset.getEditVersion().getTermsOfUseAndAccess().setFileAccessRequest(allowRequest);
-        
+        //using this method to update the terms for datasets that are out of compliance 
+        // with Terms of Access requirement - may get her with a file that is already restricted
+        // we'll allow it 
+        try {
+            Command cmd;
+            for (FileMetadata fmw : editDataset.getOrCreateEditVersion().getFileMetadatas()) {
+                if (fmw.getDataFile().equals(this.fileMetadata.getDataFile())) {
+                    fileNames += fmw.getLabel();
+                    cmd = new RestrictFileCommand(fmw.getDataFile(), dvRequestService.getDataverseRequest(), restricted);
+                    commandEngine.submit(cmd);
+                }
+            }
+
+        } catch (CommandException ex) {
+            if (ex.getLocalizedMessage().contains("is already restricted")) {
+                //ok we're just updating the terms here
+            } else {
+                throw ex;
+            }
+        }   
         if (fileNames != null) {
             String successMessage = BundleUtil.getStringFromBundle("file.restricted.success");
             successMessage = successMessage.replace("{0}", fileNames);
@@ -342,6 +529,119 @@ public String restrictFile(boolean restricted) throws CommandException{
         return returnToDraftVersion();
     }
     
+    public String ingestFile() throws CommandException{
+        
+        User u = session.getUser();
+        if(!u.isAuthenticated() ||  !u.isSuperuser()) {
+            //Shouldn't happen (choice not displayed for users who don't have the right permission), but check anyway
+            logger.warning("User: " + u.getIdentifier() + " tried to ingest a file");
+            JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("file.ingest.cantIngestFileWarning"));
+            return null;
+        }
+
+        editDataset = file.getOwner();
+        
+        if (file.isTabularData()) {
+            JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("file.ingest.alreadyIngestedWarning"));
+            return null;
+        }
+        
+        boolean ingestLock = dataset.isLockedFor(DatasetLock.Reason.Ingest);
+        
+        if (ingestLock) {
+            JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("file.ingest.ingestInProgressWarning"));
+            return null;
+        }
+        
+        if (!FileUtil.canIngestAsTabular(file)) {
+            JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("file.ingest.cantIngestFileWarning"));
+            return null;
+            
+        }
+        
+        file.SetIngestScheduled();
+                
+        if (file.getIngestRequest() == null) {
+            file.setIngestRequest(new IngestRequest(file));
+        }
+
+        file.getIngestRequest().setForceTypeCheck(true);
+        
+        // update the datafile, to save the newIngest request in the database:
+        datafileService.save(file);
+        
+        // queue the data ingest job for asynchronous execution: 
+        String status = ingestService.startIngestJobs(editDataset.getId(), new ArrayList<>(Arrays.asList(file)), (AuthenticatedUser) session.getUser());
+        
+        if (!StringUtil.isEmpty(status)) {
+            // This most likely indicates some sort of a problem (for example, 
+            // the ingest job was not put on the JMS queue because of the size
+            // of the file). But we are still returning the OK status - because
+            // from the point of view of the API, it's a success - we have 
+            // successfully gone through the process of trying to schedule the 
+            // ingest job...
+            
+            logger.warning("Ingest Status for file: " + file.getId() + " : " + status);
+        }
+        logger.fine("File: " + file.getId() + " ingest queued");
+
+        init();
+        JsfHelper.addInfoMessage(BundleUtil.getStringFromBundle("file.ingest.ingestQueued"));
+        return returnToDraftVersion();
+    }
+
+    public String uningestFile() throws CommandException {
+
+        if (!file.isTabularData()) {
+            //Ingest never succeeded, either there was a failure or this is not a tabular data file
+            if (file.isIngestProblem()) {
+                //We allow anyone who can publish to uningest in order to clear a problem
+                User u = session.getUser();
+                if (!u.isAuthenticated() || !(permissionService.permissionsFor(u, file).contains(Permission.PublishDataset))) {
+                    logger.warning("User: " + u.getIdentifier() + " tried to uningest a file");
+                    // Shouldn't happen (choice not displayed for users who don't have the right
+                    // permission), but check anyway
+                    JH.addMessage(FacesMessage.SEVERITY_WARN,
+                            BundleUtil.getStringFromBundle("file.ingest.cantUningestFileWarning"));
+                    return null;
+                }
+                file.setIngestDone();
+                file.setIngestReport(null);
+            } else {
+                //Shouldn't happen - got called when there is no tabular data or an ingest problem
+                JH.addMessage(FacesMessage.SEVERITY_WARN,
+                        BundleUtil.getStringFromBundle("file.ingest.cantUningestFileWarning"));
+                return null;
+            }
+        } else {
+            //Superuser required to uningest after a success
+            //Uningest command does it's own check for isSuperuser
+            commandEngine.submit(new UningestFileCommand(dvRequestService.getDataverseRequest(), file));
+            Long dataFileId = file.getId();
+            file = datafileService.find(dataFileId);
+        }
+        editDataset = file.getOwner();
+        if (editDataset.isReleased()) {
+            try {
+                ExportService instance = ExportService.getInstance();
+                instance.exportAllFormats(editDataset);
+
+            } catch (ExportException ex) {
+                // Something went wrong!
+                // Just like with indexing, a failure to export is not a fatal
+                // condition. We'll just log the error as a warning and keep
+                // going:
+                logger.log(Level.WARNING, "Uningest: Exception while exporting:{0}", ex.getMessage());
+            }
+        }
+        datafileService.save(file);
+
+        // Refresh filemetadata with file title, etc.
+        init();
+        JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("file.uningest.complete"));
+        return returnToDraftVersion();
+    }    
+    
     private List<FileMetadata> filesToBeDeleted = new ArrayList<>();
 
     public String deleteFile() {
@@ -352,7 +652,7 @@ public String deleteFile() {
 
         FileMetadata markedForDelete = null;
 
-        for (FileMetadata fmd : editDataset.getEditVersion().getFileMetadatas()) {
+        for (FileMetadata fmd : editDataset.getOrCreateEditVersion().getFileMetadatas()) {
 
             if (fmd.getDataFile().getId().equals(fileId)) {
                 markedForDelete = fmd;
@@ -363,17 +663,17 @@ public String deleteFile() {
             // the file already exists as part of this dataset
             // so all we remove is the file from the fileMetadatas (for display)
             // and let the delete be handled in the command (by adding it to the filesToBeDeleted list
-            editDataset.getEditVersion().getFileMetadatas().remove(markedForDelete);
+            editDataset.getOrCreateEditVersion().getFileMetadatas().remove(markedForDelete);
             filesToBeDeleted.add(markedForDelete);
 
         } else {
             List<FileMetadata> filesToKeep = new ArrayList<>();
-            for (FileMetadata fmo : editDataset.getEditVersion().getFileMetadatas()) {
+            for (FileMetadata fmo : editDataset.getOrCreateEditVersion().getFileMetadatas()) {
                 if (!fmo.getDataFile().getId().equals(this.getFile().getId())) {
                     filesToKeep.add(fmo);
                 }
             }
-            editDataset.getEditVersion().setFileMetadatas(filesToKeep);
+            editDataset.getOrCreateEditVersion().setFileMetadatas(filesToKeep);
         }
 
         fileDeleteInProgress = true;
@@ -396,115 +696,12 @@ public void tabChanged(TabChangeEvent event) {
         TabView tv = (TabView) event.getComponent();
         this.activeTabIndex = tv.getActiveIndex();
         if (this.activeTabIndex == 1 || this.activeTabIndex == 2 ) {
-            setFileMetadatasForTab(loadFileMetadataTabList());
+            setFileMetadatasForTab(fileMetadataVersionsHelper.loadFileVersionList(new DataverseRequest(session.getUser(), Faces.getRequest()), fileMetadata));
         } else {
             setFileMetadatasForTab( new ArrayList<>());         
         }
     }
-    
-    
-    private List<FileMetadata> loadFileMetadataTabList() {
-        List<DataFile> allfiles = allRelatedFiles();
-        List<FileMetadata> retList = new ArrayList<>();
-        for (DatasetVersion versionLoop : fileMetadata.getDatasetVersion().getDataset().getVersions()) {
-            boolean foundFmd = false;
-            
-            if (versionLoop.isReleased() || versionLoop.isDeaccessioned() || permissionService.on(fileMetadata.getDatasetVersion().getDataset()).has(Permission.ViewUnpublishedDataset)) {
-                foundFmd = false;
-                for (DataFile df : allfiles) {
-                    FileMetadata fmd = datafileService.findFileMetadataByDatasetVersionIdAndDataFileId(versionLoop.getId(), df.getId());
-                    if (fmd != null) {
-                        fmd.setContributorNames(datasetVersionService.getContributorsNames(versionLoop));
-                        FileVersionDifference fvd = new FileVersionDifference(fmd, getPreviousFileMetadata(fmd));
-                        fmd.setFileVersionDifference(fvd);
-                        retList.add(fmd);
-                        foundFmd = true;
-                        break;
-                    }
-                }
-                //no File metadata found make dummy one
-                if (!foundFmd) {
-                    FileMetadata dummy = new FileMetadata();
-                    dummy.setDatasetVersion(versionLoop);
-                    dummy.setDataFile(null);
-                    FileVersionDifference fvd = new FileVersionDifference(dummy, getPreviousFileMetadata(versionLoop));
-                    dummy.setFileVersionDifference(fvd);
-                    retList.add(dummy);
-                }
-            }
-        }
-        return retList;
-    }
-    
-    private FileMetadata getPreviousFileMetadata(DatasetVersion currentversion) {
-        List<DataFile> allfiles = allRelatedFiles();
-        boolean foundCurrent = false;
-        DatasetVersion priorVersion = null;
-        for (DatasetVersion versionLoop : fileMetadata.getDatasetVersion().getDataset().getVersions()) {
-            if (foundCurrent) {
-                priorVersion = versionLoop;
-                break;
-            }
-            if (versionLoop.equals(currentversion)) {
-                foundCurrent = true;
-            }
-
-        }
-        if (priorVersion != null && priorVersion.getFileMetadatasSorted() != null) {
-            for (FileMetadata fmdTest : priorVersion.getFileMetadatasSorted()) {
-                for (DataFile fileTest : allfiles) {
-                    if (fmdTest.getDataFile().equals(fileTest)) {
-                        return fmdTest;
-                    }
-                }
-            }
-        }
-
-        return null;
 
-    }
-    
-    private FileMetadata getPreviousFileMetadata(FileMetadata fmdIn){
-        
-        DataFile dfPrevious = datafileService.findPreviousFile(fmdIn.getDataFile());
-        DatasetVersion dvPrevious = null;
-        boolean gotCurrent = false;
-        for (DatasetVersion dvloop: fileMetadata.getDatasetVersion().getDataset().getVersions()){
-            if(gotCurrent){
-                dvPrevious  = dvloop;
-                break;
-            }
-             if(dvloop.equals(fmdIn.getDatasetVersion())){
-                 gotCurrent = true;
-             }
-        } 
-        
-        List<DataFile> allfiles = allRelatedFiles();
-        
-        if (dvPrevious != null && dvPrevious.getFileMetadatasSorted() != null) {
-            for (FileMetadata fmdTest : dvPrevious.getFileMetadatasSorted()) {
-                for (DataFile fileTest : allfiles) {
-                    if (fmdTest.getDataFile().equals(fileTest)) {
-                        return fmdTest;
-                    }
-                }
-            }
-        }
-        
-        Long dfId = fmdIn.getDataFile().getId();
-        if (dfPrevious != null){
-            dfId = dfPrevious.getId();
-        }
-        Long versionId = null;       
-        if (dvPrevious !=null){
-            versionId = dvPrevious.getId();
-        }
-        
-        FileMetadata fmd = datafileService.findFileMetadataByDatasetVersionIdAndDataFileId(versionId, dfId);
-        
-        return fmd;
-    }
-    
     public List<FileMetadata> getFileMetadatasForTab() {
         return fileMetadatasForTab;
     }
@@ -529,10 +726,18 @@ public List<DatasetVersion> getDatasetVersionsForTab() {
     public void setDatasetVersionsForTab(List<DatasetVersion> datasetVersionsForTab) {
         this.datasetVersionsForTab = datasetVersionsForTab;
     }
-    
+
+    public boolean isTermsMet() {
+        return termsMet;
+    }
+
+    public void setTermsMet(boolean termsMet) {
+        this.termsMet = termsMet;
+    }
+
     public String save() {
         // Validate
-        Set<ConstraintViolation> constraintViolations = this.fileMetadata.getDatasetVersion().validate();
+        Set<ConstraintViolation> constraintViolations = editDataset.getOrCreateEditVersion().validate();
         if (!constraintViolations.isEmpty()) {
              //JsfHelper.addFlashMessage(JH.localize("dataset.message.validationError"));
              fileDeleteInProgress = false;
@@ -549,7 +754,7 @@ public String save() {
 
         if (!filesToBeDeleted.isEmpty()) { 
             // We want to delete the file (there's always only one file with this page)
-            editDataset.getEditVersion().getFileMetadatas().remove(filesToBeDeleted.get(0));
+            editDataset.getOrCreateEditVersion().getFileMetadatas().remove(filesToBeDeleted.get(0));
             deleteFileId = filesToBeDeleted.get(0).getDataFile().getId();
             deleteStorageLocation = datafileService.getPhysicalFileToDelete(filesToBeDeleted.get(0).getDataFile());
         }
@@ -633,7 +838,7 @@ public boolean isThumbnailAvailable(FileMetadata fileMetadata) {
     
     private String returnToDatasetOnly(){
         
-         return "/dataset.xhtml?persistentId=" + editDataset.getGlobalIdString()  + "&version=DRAFT" + "&faces-redirect=true";   
+         return "/dataset.xhtml?persistentId=" + editDataset.getGlobalId().asString()  + "&version=DRAFT" + "&faces-redirect=true";   
     }
     
     private String returnToDraftVersion(){ 
@@ -680,6 +885,43 @@ public void setSelectedTabIndex(int selectedTabIndex) {
         this.selectedTabIndex = selectedTabIndex;
     }
     
+   private Boolean hasValidTermsOfAccess = null;
+    
+    public Boolean isHasValidTermsOfAccess() {
+        //cache in page to limit processing
+        if (hasValidTermsOfAccess != null){
+            return hasValidTermsOfAccess;
+        } else {
+            if (!isHasRestrictedFiles()){
+               hasValidTermsOfAccess = true;
+               return hasValidTermsOfAccess;
+            } else {
+                hasValidTermsOfAccess = TermsOfUseAndAccessValidator.isTOUAValid(fileMetadata.getDatasetVersion().getTermsOfUseAndAccess(), null);
+                return hasValidTermsOfAccess;
+            }
+        }    
+    }
+    
+    public boolean getHasValidTermsOfAccess(){
+        return isHasValidTermsOfAccess(); //HasValidTermsOfAccess
+    }
+    
+    public void setHasValidTermsOfAccess(boolean value){
+        //dummy for ui
+    }
+    
+    private Boolean hasRestrictedFiles = null;
+    
+    public Boolean isHasRestrictedFiles(){
+        //cache in page to limit processing
+        if (hasRestrictedFiles != null){
+            return hasRestrictedFiles;
+        } else {
+            hasRestrictedFiles = fileMetadata.getDatasetVersion().isHasRestrictedFile();
+            return hasRestrictedFiles;
+        }
+    }
+    
     public boolean isSwiftStorage () {
         Boolean swiftBool = false;
         if (file.getStorageIdentifier().startsWith("swift://")){
@@ -727,10 +969,10 @@ public String getComputeUrl() throws IOException {
         if (swiftObject != null) {
             swiftObject.open();
             //generate a temp url for a file
-            if (settingsService.isTrueForKey(SettingsServiceBean.Key.PublicInstall, false)) {
-                return settingsService.getValueForKey(SettingsServiceBean.Key.ComputeBaseUrl) + "?" + this.getFile().getOwner().getGlobalIdString() + "=" + swiftObject.getSwiftFileName();
+            if (isHasPublicStore()) {
+                return settingsService.getValueForKey(SettingsServiceBean.Key.ComputeBaseUrl) + "?" + this.getFile().getOwner().getGlobalId().asString() + "=" + swiftObject.getSwiftFileName();
             }
-            return settingsService.getValueForKey(SettingsServiceBean.Key.ComputeBaseUrl) + "?" + this.getFile().getOwner().getGlobalIdString() + "=" + swiftObject.getSwiftFileName() + "&temp_url_sig=" + swiftObject.getTempUrlSignature() + "&temp_url_expires=" + swiftObject.getTempUrlExpiry();
+            return settingsService.getValueForKey(SettingsServiceBean.Key.ComputeBaseUrl) + "?" + this.getFile().getOwner().getGlobalId().asString() + "=" + swiftObject.getSwiftFileName() + "&temp_url_sig=" + swiftObject.getTempUrlSignature() + "&temp_url_expires=" + swiftObject.getTempUrlExpiry();
         }
         return "";
     }
@@ -748,57 +990,15 @@ private List<DataFile> allRelatedFiles() {
         return dataFiles;
     }
     
-    public boolean isDraftReplacementFile(){
-        /*
-        This method tests to see if the file has been replaced in a draft version of the dataset
-        Since it must must work when you are on prior versions of the dataset 
-        it must accrue all replacement files that may have been created
-        */
-        if(null == dataset) {
-            dataset = fileMetadata.getDataFile().getOwner();
-        }
-        
-        DataFile dataFileToTest = fileMetadata.getDataFile(); 
-        
-        DatasetVersion currentVersion = dataset.getLatestVersion();
-        
-        if (!currentVersion.isDraft()){
-            return false;
+    // wrappermethod to see if the file has been deleted (or replaced) in the current version
+    public boolean isDeletedFile () {
+        if (file.getDeleted() == null) {
+            file.setDeleted(datafileService.hasBeenDeleted(file));
         }
         
-        if (dataset.getReleasedVersion() == null){
-            return false;
-        }
-        
-        List<DataFile> dataFiles = new ArrayList<>();
-        
-        dataFiles.add(dataFileToTest);
-        
-        while (datafileService.findReplacementFile(dataFileToTest.getId()) != null ){
-            dataFiles.add(datafileService.findReplacementFile(dataFileToTest.getId()));
-            dataFileToTest = datafileService.findReplacementFile(dataFileToTest.getId());
-        }
-        
-        if(dataFiles.size() <2){
-            return false;
-        }
-        
-        int numFiles = dataFiles.size();
-        
-        DataFile current = dataFiles.get(numFiles - 1 );       
-        
-        DatasetVersion publishedVersion = dataset.getReleasedVersion();
-        
-        if( datafileService.findFileMetadataByDatasetVersionIdAndDataFileId(publishedVersion.getId(), current.getId()) == null){
-            return true;
-        }
-        
-        return false;
+        return file.getDeleted();
     }
     
-
-
-    
     /**
      * To help with replace development 
      * @return 
@@ -811,7 +1011,13 @@ public boolean isReplacementFile(){
     public boolean isPubliclyDownloadable() {
         return FileUtil.isPubliclyDownloadable(fileMetadata);
     }
-    
+
+    public boolean isIngestable() {
+        DataFile f = fileMetadata.getDataFile();
+        //Datafile is an ingestable type and hasn't been ingested yet or had an ingest fail
+        return (FileUtil.canIngestAsTabular(f)&&!(f.isTabularData() || f.isIngestProblem()));
+    }
+
     private Boolean lockedFromEditsVar;
     private Boolean lockedFromDownloadVar; 
     
@@ -831,6 +1037,9 @@ public boolean isLockedFromEdits() {
             } catch (IllegalCommandException ex) {
                 lockedFromEditsVar = true;
             }
+            if (!isHasValidTermsOfAccess()){
+                lockedFromEditsVar = true;
+            }
         }
         return lockedFromEditsVar;
     }
@@ -858,8 +1067,8 @@ public String getPublicDownloadUrl() {
                 try {
                     SwiftAccessIO<DataFile> swiftIO = (SwiftAccessIO<DataFile>) storageIO;
                     swiftIO.open();
-                    //if its a public install, lets just give users the permanent URL!
-                    if (systemConfig.isPublicInstall()){                        
+                    //if its a public store, lets just give users the permanent URL!
+                    if (isHasPublicStore()){
                         fileDownloadUrl = swiftIO.getRemoteUrl();
                     } else {
                         //TODO: if a user has access to this file, they should be given the swift url
@@ -888,10 +1097,389 @@ public List<ExternalTool> getExploreTools() {
         return exploreTools;
     }
     
+    public List<ExternalTool> getToolsWithPreviews() {
+        return toolsWithPreviews;
+    }
+    
+    public List<ExternalTool> getQueryTools() {
+        return queryTools;
+    }
+    
+    
+    public List<ExternalTool> getAllAvailableTools(){
+        List<ExternalTool> externalTools = new ArrayList<>();
+        externalTools.addAll(queryTools);
+        for (ExternalTool pt : toolsWithPreviews){
+            if (!externalTools.contains(pt)){
+                externalTools.add(pt);
+            }
+        }        
+        return externalTools;
+    }
+    
+    public String getToolType() {
+        return toolType;
+    }
+
+    public void setToolType(String toolType) {
+        this.toolType = toolType;
+    }
+    
+    private ExternalTool selectedTool;
+
+    public ExternalTool getSelectedTool() {
+        return selectedTool;
+    }
+
+    public void setSelectedTool(ExternalTool selectedTool) {
+        this.selectedTool = selectedTool;
+    }
+    
+    public String preview(ExternalTool externalTool) {
+        ApiToken apiToken = null;
+        User user = session.getUser();
+        if (fileMetadata.getDatasetVersion().isDraft() || fileMetadata.getDatasetVersion().isDeaccessioned() || (fileMetadata.getDataFile().isRestricted()) || (FileUtil.isActivelyEmbargoed(fileMetadata))) {
+            apiToken=authService.getValidApiTokenForUser(user);
+        }
+        if(externalTool == null){
+            return "";
+        }
+        ExternalToolHandler externalToolHandler = new ExternalToolHandler(externalTool, file, apiToken, getFileMetadata(), session.getLocaleCode());
+        String toolUrl = externalToolHandler.getToolUrlForPreviewMode();
+        return toolUrl;
+    }
+    
     //Provenance fragment bean calls this to show error dialogs after popup failure
     //This can probably be replaced by calling JsfHelper from the provpopup bean
     public void showProvError() {
         JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.metadataTab.provenance.error"));
     }
+    
+    private static final Comparator<ExternalTool> CompareExternalToolName = new Comparator<ExternalTool>() {
+        @Override
+        public int compare(ExternalTool o1, ExternalTool o2) {
+            return o1.getDisplayName().toUpperCase().compareTo(o2.getDisplayName().toUpperCase());
+        }
+    };
+
+    public void showPreview(GuestbookResponse guestbookResponse) {
+        boolean response = fileDownloadHelper.writeGuestbookAndShowPreview(guestbookResponse);
+        if (response == true) {
+            termsMet = true;
+        } else {
+            JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.guestbookResponse.showPreview.errorMessage"), BundleUtil.getStringFromBundle("dataset.guestbookResponse.showPreview.errorDetail"));
+        }
+    }
+    
+    private String termsOfAccess;
+    private boolean fileAccessRequest;
+
+    public String getTermsOfAccess() {
+        return termsOfAccess;
+    }
+
+    public void setTermsOfAccess(String termsOfAccess) {
+        this.termsOfAccess = termsOfAccess;
+    }
+
+    public boolean isFileAccessRequest() {
+        return fileAccessRequest;
+    }
+
+    public void setFileAccessRequest(boolean fileAccessRequest) {
+        this.fileAccessRequest = fileAccessRequest;
+    }
+    public boolean isAnonymizedAccess() {
+        if(session.getUser() instanceof PrivateUrlUser) {
+            return ((PrivateUrlUser)session.getUser()).hasAnonymizedAccess();
+        }
+        return false;
+    }
+    
+    public boolean isValidEmbargoSelection() {
+        if (!fileMetadata.getDataFile().isReleased()) {
+            return true;
+        }
+        return false;
+    }
+    
+    public boolean isExistingEmbargo() {
+        if (!fileMetadata.getDataFile().isReleased() && (fileMetadata.getDataFile().getEmbargo() != null)) {
+            return true;
+        }
+        return false;
+    }
+    
+    public boolean isEmbargoForWholeSelection() {
+        return isValidEmbargoSelection();
+    }
+    
+    public Embargo getSelectionEmbargo() {
+        return selectionEmbargo;
+    }
+
+    public void setSelectionEmbargo(Embargo selectionEmbargo) {
+        this.selectionEmbargo = selectionEmbargo;
+    }
+
+    private Embargo selectionEmbargo = new Embargo();
+    
+    private boolean removeEmbargo=false;
+
+    public boolean isRemoveEmbargo() {
+        return removeEmbargo;
+    }
+
+    public void setRemoveEmbargo(boolean removeEmbargo) {
+        boolean existing = this.removeEmbargo;
+        this.removeEmbargo = removeEmbargo;
+        if (existing != this.removeEmbargo) {
+            logger.info("State flip");
+            selectionEmbargo = new Embargo();
+            if (removeEmbargo) {
+                selectionEmbargo = new Embargo(null, null);
+            }
+        }
+        PrimeFaces.current().resetInputs("fileForm:embargoInputs");
+    }
+    
+    public String saveEmbargo() {
+        
+        if(isRemoveEmbargo() || (selectionEmbargo.getDateAvailable()==null && selectionEmbargo.getReason()==null)) {
+            selectionEmbargo=null;
+        }
+        
+        Embargo emb = null;
+        // Note: this.fileMetadata.getDataFile() is not the same object as this.file.
+        // (Not sure there's a good reason for this other than that's the way it is.)
+        // So changes to this.fileMetadata.getDataFile() will not be saved with
+        // editDataset = this.file.getOwner() set as it is below.
+        if (!file.isReleased()) {
+            emb = file.getEmbargo();
+            if (emb != null) {
+                logger.fine("Before: " + emb.getDataFiles().size());
+                emb.getDataFiles().remove(fileMetadata.getDataFile());
+                logger.fine("After: " + emb.getDataFiles().size());
+            }
+            if (selectionEmbargo != null) {
+                embargoService.merge(selectionEmbargo);
+            }
+            file.setEmbargo(selectionEmbargo);
+            if (emb != null && !emb.getDataFiles().isEmpty()) {
+                emb = null;
+            }
+        }
+        if(selectionEmbargo!=null) {
+            embargoService.save(selectionEmbargo, ((AuthenticatedUser)session.getUser()).getIdentifier());
+        }
+        // success message:
+        String successMessage = BundleUtil.getStringFromBundle("file.assignedEmbargo.success");
+        logger.fine(successMessage);
+        successMessage = successMessage.replace("{0}", "Selected Files");
+        JsfHelper.addFlashMessage(successMessage);
+        selectionEmbargo = new Embargo();
+
+        //Caller has to set editDataset before calling save()
+        editDataset = this.file.getOwner();
+        
+        save();
+        init();
+        if(emb!=null) {
+            embargoService.deleteById(emb.getId(),((AuthenticatedUser)session.getUser()).getIdentifier());
+        }
+        return returnToDraftVersion();
+    }
+    
+    public void clearEmbargoPopup() {
+        setRemoveEmbargo(false);
+        selectionEmbargo = new Embargo();
+        PrimeFaces.current().resetInputs("fileForm:embargoInputs");
+    }
+    
+    public void clearSelectionEmbargo() {
+        selectionEmbargo = new Embargo();
+        PrimeFaces.current().resetInputs("fileForm:embargoInputs");
+    }
+    
+    public boolean isCantRequestDueToEmbargo() {
+        return FileUtil.isActivelyEmbargoed(fileMetadata);
+    }
+    
+    public String getEmbargoPhrase() {
+        //Should only be getting called when there is an embargo
+        if(file.isReleased()) {
+            if(FileUtil.isActivelyEmbargoed(file)) {
+                return BundleUtil.getStringFromBundle("embargoed.until");
+            } else {
+                return BundleUtil.getStringFromBundle("embargoed.wasthrough");
+            }
+        } else {
+            return BundleUtil.getStringFromBundle("embargoed.willbeuntil");
+        }
+    }
+
+    public boolean isValidRetentionSelection() {
+        if (!fileMetadata.getDataFile().isReleased()) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isExistingRetention() {
+        if (!fileMetadata.getDataFile().isReleased() && (fileMetadata.getDataFile().getRetention() != null)) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isRetentionForWholeSelection() {
+        return isValidRetentionSelection();
+    }
+
+    public Retention getSelectionRetention() {
+        return selectionRetention;
+    }
+
+    public void setSelectionRetention(Retention selectionRetention) {
+        this.selectionRetention = selectionRetention;
+    }
+
+    private Retention selectionRetention = new Retention();
+
+    private boolean removeRetention=false;
+
+    public boolean isRemoveRetention() {
+        return removeRetention;
+    }
+
+    public void setRemoveRetention(boolean removeRetention) {
+        boolean existing = this.removeRetention;
+        this.removeRetention = removeRetention;
+        if (existing != this.removeRetention) {
+            logger.info("State flip");
+            selectionRetention = new Retention();
+            if (removeRetention) {
+                selectionRetention = new Retention(null, null);
+            }
+        }
+        PrimeFaces.current().resetInputs("fileForm:retentionInputs");
+    }
+
+    public String saveRetention() {
+
+        if(isRemoveRetention() || (selectionRetention.getDateUnavailable()==null && selectionRetention.getReason()==null)) {
+            selectionRetention=null;
+        }
+
+        Retention ret = null;
+        // Note: this.fileMetadata.getDataFile() is not the same object as this.file.
+        // (Not sure there's a good reason for this other than that's the way it is.)
+        // So changes to this.fileMetadata.getDataFile() will not be saved with
+        // editDataset = this.file.getOwner() set as it is below.
+        if (!file.isReleased()) {
+            ret = file.getRetention();
+            if (ret != null) {
+                logger.fine("Before: " + ret.getDataFiles().size());
+                ret.getDataFiles().remove(fileMetadata.getDataFile());
+                logger.fine("After: " + ret.getDataFiles().size());
+            }
+            if (selectionRetention != null) {
+                retentionService.merge(selectionRetention);
+            }
+            file.setRetention(selectionRetention);
+            if (ret != null && !ret.getDataFiles().isEmpty()) {
+                ret = null;
+            }
+        }
+        if(selectionRetention!=null) {
+            retentionService.save(selectionRetention, ((AuthenticatedUser)session.getUser()).getIdentifier());
+        }
+        // success message:
+        String successMessage = BundleUtil.getStringFromBundle("file.assignedRetention.success");
+        logger.fine(successMessage);
+        successMessage = successMessage.replace("{0}", "Selected Files");
+        JsfHelper.addFlashMessage(successMessage);
+        selectionRetention = new Retention();
+
+        //Caller has to set editDataset before calling save()
+        editDataset = this.file.getOwner();
+
+        save();
+        init();
+        if(ret!=null) {
+            retentionService.delete(ret,((AuthenticatedUser)session.getUser()).getIdentifier());
+        }
+        return returnToDraftVersion();
+    }
+
+    public void clearRetentionPopup() {
+        setRemoveRetention(false);
+        selectionRetention = new Retention();
+        PrimeFaces.current().resetInputs("fileForm:retentionInputs");
+    }
+
+    public void clearSelectionRetention() {
+        selectionRetention = new Retention();
+        PrimeFaces.current().resetInputs("fileForm:retentionInputs");
+    }
+
+    public boolean isCantRequestDueToRetention() {
+        return FileUtil.isRetentionExpired(fileMetadata);
+    }
+
+    public String getRetentionPhrase() {
+        //Should only be getting called when there is a retention
+        if(file.isReleased()) {
+            if(FileUtil.isRetentionExpired(file)) {
+                return BundleUtil.getStringFromBundle("retention.after");
+            } else {
+                return BundleUtil.getStringFromBundle("retention.isfrom");
+            }
+        } else {
+            return BundleUtil.getStringFromBundle("retention.willbeafter");
+        }
+    }
+
+    public String getToolTabTitle(){
+        if (getAllAvailableTools().size() > 1) {
+            return BundleUtil.getStringFromBundle("file.toolTab.header");
+        }
+        if( getSelectedTool() != null ){
+           if(getSelectedTool().isPreviewTool()){
+               return BundleUtil.getStringFromBundle("file.previewTab.header");
+           } 
+           if(getSelectedTool().isQueryTool()){
+               return BundleUtil.getStringFromBundle("file.queryTab.header");
+           }          
+        } 
+        return BundleUtil.getStringFromBundle("file.toolTab.header");
+    }
+    
+    public String getIngestMessage() {
+        return BundleUtil.getStringFromBundle("file.ingestFailed.message", Arrays.asList(settingsWrapper.getGuidesBaseUrl(), settingsWrapper.getGuidesVersion()));
+    }
+    
+    //Determines whether this File uses a public store and therefore doesn't support embargoed or restricted files
+    public boolean isHasPublicStore() {
+        return settingsWrapper.isTrueForKey(SettingsServiceBean.Key.PublicInstall, StorageIO.isPublicStore(DataAccess.getStorageDriverFromIdentifier(file.getStorageIdentifier())));
+    }
+    
+    //Allows use of fileDownloadHelper in file.xhtml
+    public FileDownloadHelper getFileDownloadHelper() {
+        return fileDownloadHelper;
+    }
+
+    public void setFileDownloadHelper(FileDownloadHelper fileDownloadHelper) {
+        this.fileDownloadHelper = fileDownloadHelper;
+    }
+
+    /**
+     * This method only exists because in file-edit-button-fragment.xhtml we
+     * call bean.editFileMetadata() and we need both FilePage (this bean) and
+     * DatasetPage to have the method defined to prevent errors in server.log.
+     */
+    public String editFileMetadata(){
+        return "";
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileSearchCriteria.java b/src/main/java/edu/harvard/iq/dataverse/FileSearchCriteria.java
new file mode 100644
index 00000000000..e3ed507a9c2
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/FileSearchCriteria.java
@@ -0,0 +1,45 @@
+package edu.harvard.iq.dataverse;
+
+public class FileSearchCriteria {
+
+    private final String contentType;
+    private final FileAccessStatus accessStatus;
+    private final String categoryName;
+    private final String tabularTagName;
+    private final String searchText;
+
+    /**
+     * Status of the particular DataFile based on active embargoes and restriction state
+     */
+    public enum FileAccessStatus {
+        Public, Restricted, EmbargoedThenRestricted, EmbargoedThenPublic, RetentionPeriodExpired
+    }
+
+    public FileSearchCriteria(String contentType, FileAccessStatus accessStatus, String categoryName, String tabularTagName, String searchText) {
+        this.contentType = contentType;
+        this.accessStatus = accessStatus;
+        this.categoryName = categoryName;
+        this.tabularTagName = tabularTagName;
+        this.searchText = searchText;
+    }
+
+    public String getContentType() {
+        return contentType;
+    }
+
+    public FileAccessStatus getAccessStatus() {
+        return accessStatus;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public String getTabularTagName() {
+        return tabularTagName;
+    }
+
+    public String getSearchText() {
+        return searchText;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileUploadRenderer.java b/src/main/java/edu/harvard/iq/dataverse/FileUploadRenderer.java
index 5e73ef65f25..ce3b0d65875 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileUploadRenderer.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileUploadRenderer.java
@@ -6,8 +6,8 @@
 
 package edu.harvard.iq.dataverse;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileVersionDifference.java b/src/main/java/edu/harvard/iq/dataverse/FileVersionDifference.java
index b0f1cd35ab3..9a73cad7877 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileVersionDifference.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileVersionDifference.java
@@ -10,17 +10,19 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.ResourceBundle;
 
 /**
  *
  * @author skraffmi
  */
-public class FileVersionDifference {
+public final class FileVersionDifference {
     
     private  FileMetadata newFileMetadata;
     private  FileMetadata originalFileMetadata;   
     private boolean details = false;
+    private boolean same = false;
+
+
 
     private List<FileDifferenceSummaryGroup> differenceSummaryGroups = new ArrayList<>();   
     private List<FileDifferenceDetailItem> differenceDetailItems = new ArrayList<>();
@@ -37,107 +39,151 @@ public FileVersionDifference(FileMetadata newFileMetadata, FileMetadata original
         this.originalFileMetadata = originalFileMetadata;
         this.details = details;
 
-        compareMetadata(newFileMetadata, originalFileMetadata);
+        this.same = compareMetadata(newFileMetadata, originalFileMetadata);
         //Compare versions - File Metadata first
 
     } 
     
     
-    private void compareMetadata(FileMetadata newFileMetadata, FileMetadata originalFileMetadata ){
+    public boolean compareMetadata(FileMetadata newFileMetadata, FileMetadata originalFileMetadata) {
+
+        /*
+        This  method both determines if there has been a change in file metadata between the two versions supplied 
+        and it updates the FileVersionDifference object which is used to display the differences on the dataset versions tab.
+        The return value is used by the index service bean tomark whether a file needs to be re-indexed in the context of a dataset update.
+        When there are changes (after v4.19)to the file metadata data model this method must be updated.
+        retVal of True means metadatas are equal.        
+        */        
         
+        boolean retVal = true;
         if (newFileMetadata.getDataFile() == null && originalFileMetadata == null){
             //File in neither version
             //Don't add any groups
+            return true;
         }
         
         if (newFileMetadata.getDataFile() == null && originalFileMetadata != null){
             //File Deleted
-            updateDifferenceSummary("", BundleUtil.getStringFromBundle("file.versionDifferences.fileGroupTitle"),  0, 0, 1, 0);
-            return;
+            if (details) {
+                updateDifferenceSummary("", BundleUtil.getStringFromBundle("file.versionDifferences.fileGroupTitle"), 0, 0, 1, 0);
+            }
+            return false;
         }
-        
-        if (this.originalFileMetadata == null && this.newFileMetadata.getDataFile() != null ){
+
+        if (this.originalFileMetadata == null && this.newFileMetadata.getDataFile() != null){
             //File Added
-            updateDifferenceSummary( "", BundleUtil.getStringFromBundle("file.versionDifferences.fileGroupTitle"), 1, 0, 0, 0);
-        }
-        
-        //Check to see if File replaced
-        if (originalFileMetadata != null &&
-                 newFileMetadata.getDataFile() != null && originalFileMetadata.getDataFile() != null &&!this.originalFileMetadata.getDataFile().equals(this.newFileMetadata.getDataFile())){
-            updateDifferenceSummary( "", BundleUtil.getStringFromBundle("file.versionDifferences.fileGroupTitle"), 0, 0, 0, 1);
+            if (!details) {
+                return false;
+            }
+            retVal = false;
+            updateDifferenceSummary("", BundleUtil.getStringFromBundle("file.versionDifferences.fileGroupTitle"), 1, 0, 0, 0);
         }
         
-        if ( originalFileMetadata != null) {
+        if (originalFileMetadata != null) {
+            // Check to see if File replaced
+            if (newFileMetadata.getDataFile() != null && originalFileMetadata.getDataFile() != null && !this.originalFileMetadata.getDataFile().equals(this.newFileMetadata.getDataFile())) {
+                if (!details)
+                    return false;
+                updateDifferenceSummary("", BundleUtil.getStringFromBundle("file.versionDifferences.fileGroupTitle"), 0, 0, 0, 1);
+                retVal = false;
+            }
+
+            /*
+             * Get Restriction Differences
+             */
+            if (originalFileMetadata.isRestricted() != newFileMetadata.isRestricted()) {
+                if (details) {
+                    String value2 = newFileMetadata.isRestricted() ? BundleUtil.getStringFromBundle("file.versionDifferences.fileRestricted") : BundleUtil.getStringFromBundle("file.versionDifferences.fileUnrestricted");
+                    updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileAccessTitle"), value2, 0, 0, 0, 0);
+                }
+                retVal = false;
+            }
+
             if (!newFileMetadata.getLabel().equals(originalFileMetadata.getLabel())) {
                 if (details) {
                     differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.fileNameDetailTitle"), originalFileMetadata.getLabel(), newFileMetadata.getLabel()));
+                } else{
+                    return false;
                 }
                 updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
                         BundleUtil.getStringFromBundle("file.versionDifferences.fileNameDetailTitle"), 0, 1, 0, 0);
+                retVal = false;
             }
-        }
 
-        //Description differences
-        if ( originalFileMetadata != null) {
+            //Description differences
             if (newFileMetadata.getDescription() != null
                     && originalFileMetadata.getDescription() != null
                     && !newFileMetadata.getDescription().equals(originalFileMetadata.getDescription())) {
                 if (details) {
                     differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), originalFileMetadata.getDescription(), newFileMetadata.getDescription()));
+                } else {
+                    return false;
                 }
                 updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
                         BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), 0, 1, 0, 0);
+                retVal = false;
             }
             if (newFileMetadata.getDescription() != null
                     && originalFileMetadata.getDescription() == null
                     ) {
                 if (details) {
                     differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), "", newFileMetadata.getDescription()));
+                } else {
+                    return false;
                 }
                 updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
                         BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), 1, 0, 0, 0);
+                retVal = false;
             }
             if (newFileMetadata.getDescription() == null
                     && originalFileMetadata.getDescription() != null
                     ) {
                 if (details) {
                     differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), originalFileMetadata.getDescription(), "" ));
+                } else {
+                    return false;
                 }
                 updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
                         BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), 0, 0, 1, 0);
+                retVal = false;
             }
-        }  
-        //Provenance Description differences
-        if ( originalFileMetadata != null) {
+            //Provenance Description differences
             if ((newFileMetadata.getProvFreeForm() != null && !newFileMetadata.getProvFreeForm().isEmpty())
                     && (originalFileMetadata.getProvFreeForm() != null && !originalFileMetadata.getProvFreeForm().isEmpty())
                     && !newFileMetadata.getProvFreeForm().equals(originalFileMetadata.getProvFreeForm())) {
                 if (details) {
                     differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), originalFileMetadata.getProvFreeForm(), newFileMetadata.getProvFreeForm()));
+                } else {
+                    return false;
                 }
                 updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
                         BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), 0, 1, 0, 0);
+                retVal = false;
             }
             if ((newFileMetadata.getProvFreeForm() != null && !newFileMetadata.getProvFreeForm().isEmpty())
                     && (originalFileMetadata.getProvFreeForm() == null || originalFileMetadata.getProvFreeForm().isEmpty())
                     ) {
                 if (details) {
                     differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), "", newFileMetadata.getProvFreeForm()));
+                } else {
+                    return false;
                 }
                 updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
                         BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), 1, 0, 0, 0);
+                retVal = false;
             }
             if ((newFileMetadata.getProvFreeForm() == null || newFileMetadata.getProvFreeForm().isEmpty())
                     && (originalFileMetadata.getProvFreeForm() != null && !originalFileMetadata.getProvFreeForm().isEmpty())
                     ) {
                 if (details) {
                     differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), originalFileMetadata.getProvFreeForm(), "" ));
+                } else {
+                    return false;
                 }
                 updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
                         BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), 0, 0, 1, 0);
+                retVal = false;
             }
-        }
-        if (originalFileMetadata != null) {
             /*
             get Tags differences
             */
@@ -151,7 +197,9 @@ private void compareMetadata(FileMetadata newFileMetadata, FileMetadata original
             }
 
             if (!value1.equals(value2)) {
-                
+                if (!details) {
+                    return false;
+                }
                 int added = 0;
                 int deleted = 0;
                 
@@ -184,20 +232,11 @@ private void compareMetadata(FileMetadata newFileMetadata, FileMetadata original
                 if (deleted > 0){
                     updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileTagsGroupTitle"), "", 0, 0, deleted, 0, true);
                 }
-                
-            }
-            
-            /*
-            Get Restriction Differences
-            */
-            value1 = originalFileMetadata.isRestricted() ? BundleUtil.getStringFromBundle("file.versionDifferences.fileRestricted") : BundleUtil.getStringFromBundle("file.versionDifferences.fileUnrestricted");
-            value2 = newFileMetadata.isRestricted() ? BundleUtil.getStringFromBundle("file.versionDifferences.fileRestricted") : BundleUtil.getStringFromBundle("file.versionDifferences.fileUnrestricted");
-            if (!value1.equals(value2)) {
-                if (!value1.equals(value2)) {
-                    updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileAccessTitle"), value2, 0, 0, 0, 0);
-                }
+                retVal = false;
             }
+
         }
+        return retVal;
     }
     
      private void updateDifferenceSummary(String groupLabel, String itemLabel, int added, int changed, int deleted, int replaced) {
@@ -235,6 +274,14 @@ public void setOriginalFileMetadata(FileMetadata originalFileMetadata) {
         this.originalFileMetadata = originalFileMetadata;
     }
     
+    public boolean isSame() {
+        return same;
+    }
+
+    public void setSame(boolean same) {
+        this.same = same;
+    }
+    
     
     public List<FileDifferenceSummaryGroup> getDifferenceSummaryGroups() {
         return differenceSummaryGroups;
diff --git a/src/main/java/edu/harvard/iq/dataverse/ForeignMetadataFieldMapping.java b/src/main/java/edu/harvard/iq/dataverse/ForeignMetadataFieldMapping.java
index 40d219d2638..db83ab953a1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ForeignMetadataFieldMapping.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ForeignMetadataFieldMapping.java
@@ -3,13 +3,8 @@
 package edu.harvard.iq.dataverse;
 
 import java.io.Serializable;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/ForeignMetadataFormatMapping.java b/src/main/java/edu/harvard/iq/dataverse/ForeignMetadataFormatMapping.java
index 0fac75257c8..eb7b97b1a84 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ForeignMetadataFormatMapping.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ForeignMetadataFormatMapping.java
@@ -7,18 +7,18 @@
 package edu.harvard.iq.dataverse;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Index;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Index;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/GlobalId.java b/src/main/java/edu/harvard/iq/dataverse/GlobalId.java
index 98112170d25..058a6269b57 100644
--- a/src/main/java/edu/harvard/iq/dataverse/GlobalId.java
+++ b/src/main/java/edu/harvard/iq/dataverse/GlobalId.java
@@ -6,7 +6,7 @@
 
 package edu.harvard.iq.dataverse;
 
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import static edu.harvard.iq.dataverse.util.StringUtil.isEmpty;
 import java.net.MalformedURLException;
@@ -16,7 +16,6 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.ejb.EJB;
 
 /**
  *
@@ -24,51 +23,28 @@
  */
 public class GlobalId implements java.io.Serializable {
     
-    public static final String DOI_PROTOCOL = "doi";
-    public static final String HDL_PROTOCOL = "hdl";
-    public static final String HDL_RESOLVER_URL = "https://hdl.handle.net/";
-    public static final String DOI_RESOLVER_URL = "https://doi.org/";
-    
-    public static Optional<GlobalId> parse(String identifierString) {
-        try {
-            return Optional.of(new GlobalId(identifierString));
-        } catch ( IllegalArgumentException _iae) {
-            return Optional.empty();
-        }
-    }
-    
     private static final Logger logger = Logger.getLogger(GlobalId.class.getName());
-    
-    @EJB
-    SettingsServiceBean settingsService;
-
-    /**
-     * 
-     * @param identifier The string to be parsed
-     * @throws IllegalArgumentException if the passed string cannot be parsed.
-     */
-    public GlobalId(String identifier) {
-        // set the protocol, authority, and identifier via parsePersistentId        
-        if ( ! parsePersistentId(identifier) ){
-            throw new IllegalArgumentException("Failed to parse identifier: " + identifier);
-        }
-    }
 
-    public GlobalId(String protocol, String authority, String identifier) {
+    public GlobalId(String protocol, String authority, String identifier, String separator, String urlPrefix, String providerName) {
         this.protocol = protocol;
         this.authority = authority;
         this.identifier = identifier;
+        if(separator!=null) {
+          this.separator = separator;
+        }
+        this.urlPrefix = urlPrefix;
+        this.managingProviderId = providerName;
     }
     
-    public GlobalId(DvObject dvObject) {
-        this.authority = dvObject.getAuthority();
-        this.protocol = dvObject.getProtocol();
-        this.identifier = dvObject.getIdentifier(); 
-    }
-        
+    // protocol the identifier system, e.g. "doi"
+    // authority the namespace that the authority manages in the identifier system
+    // identifier the local identifier part
     private String protocol;
     private String authority;
     private String identifier;
+    private String managingProviderId;
+    private String separator = "/";
+    private String urlPrefix;
 
     /**
      * Tests whether {@code this} instance has all the data required for a 
@@ -83,161 +59,61 @@ public String getProtocol() {
         return protocol;
     }
 
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
     public String getAuthority() {
         return authority;
     }
 
-    public void setAuthority(String authority) {
-        this.authority = authority;
+    public String getSeparator() {
+        return separator;
     }
 
     public String getIdentifier() {
         return identifier;
     }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-    }
     
+    public String getProviderId() {
+        return managingProviderId;
+    }
+
     public String toString() {
         return asString();
     }
     
     /**
-     * Returns {@code this}' string representation. Differs from {@link #toString}
-     * which can also contain debug data, if needed.
+     * Concatenate the parts that make up a Global Identifier.
      * 
-     * @return The string representation of this global id.
+     * @return the Global Identifier, e.g. "doi:10.12345/67890"
      */
     public String asString() {
         if (protocol == null || authority == null || identifier == null) {
             return "";
         }
-        return protocol + ":" + authority + "/" + identifier;
+        return protocol + ":" + authority + separator + identifier;
     }
     
-    public URL toURL() {
+    public String asURL() {
         URL url = null;
         if (identifier == null){
             return null;
         }
         try {
-            if (protocol.equals(DOI_PROTOCOL)){
-               url = new URL(DOI_RESOLVER_URL + authority + "/" + identifier); 
-            } else if (protocol.equals(HDL_PROTOCOL)){
-               url = new URL(HDL_RESOLVER_URL + authority + "/" + identifier);  
-            }           
+               url = new URL(urlPrefix + authority + separator + identifier);
+               return url.toExternalForm();
         } catch (MalformedURLException ex) {
             logger.log(Level.SEVERE, null, ex);
-        }       
-        return url;
-    }    
-
-    
-    /** 
-     *   Parse a Persistent Id and set the protocol, authority, and identifier
-     * 
-     *   Example 1: doi:10.5072/FK2/BYM3IW
-     *       protocol: doi
-     *       authority: 10.5072
-     *       identifier: FK2/BYM3IW
-     * 
-     *   Example 2: hdl:1902.1/111012
-     *       protocol: hdl
-     *       authority: 1902.1
-     *       identifier: 111012
-     *
-     * @param identifierString
-     * @param separator the string that separates the authority from the identifier.
-     * @param destination the global id that will contain the parsed data.
-     * @return {@code destination}, after its fields have been updated, or
-     *         {@code null} if parsing failed.
-     */
-    private boolean parsePersistentId(String identifierString) {
-
-        if (identifierString == null) {
-            return false;
-        }
-        int index1 = identifierString.indexOf(':');
-        if (index1 > 0) { // ':' found with one or more characters before it
-            int index2 = identifierString.indexOf('/', index1 + 1);
-            if (index2 > 0 && (index2 + 1) < identifierString.length()) { // '/' found with one or more characters
-                                                                          // between ':'
-                protocol = identifierString.substring(0, index1); // and '/' and there are characters after '/'
-                if (!"doi".equals(protocol) && !"hdl".equals(protocol)) {
-                    return false;
-                }
-                //Strip any whitespace, ; and ' from authority (should finding them cause a failure instead?)
-                authority = formatIdentifierString(identifierString.substring(index1 + 1, index2));
-                if(testforNullTerminator(authority)) return false;
-                if (protocol.equals(DOI_PROTOCOL)) {
-                    if (!this.checkDOIAuthority(authority)) {
-                        return false;
-                    }
-                }
-                // Passed all checks
-                //Strip any whitespace, ; and ' from identifier (should finding them cause a failure instead?)
-                identifier = formatIdentifierString(identifierString.substring(index2 + 1));
-                if(testforNullTerminator(identifier)) return false;               
-            } else {
-                logger.log(Level.INFO, "Error parsing identifier: {0}: '':<authority>/<identifier>'' not found in string", identifierString);
-                return false;
-            }
-        } else {
-            logger.log(Level.INFO, "Error parsing identifier: {0}: ''<protocol>:'' not found in string", identifierString);
-            return false;
-        }
-        return true;
-    }
-    
-    private static String formatIdentifierString(String str){
-        
-        if (str == null){
-            return null;
-        }
-        // remove whitespace, single quotes, and semicolons
-        return str.replaceAll("\\s+|'|;","");  
-        
-        /*
-        < 	(%3C)
-> 	(%3E)
-{ 	(%7B)
-} 	(%7D)
-^ 	(%5E)
-[ 	(%5B)
-] 	(%5D)
-` 	(%60)
-| 	(%7C)
-\ 	(%5C)
-+
-        */
-        // http://www.doi.org/doi_handbook/2_Numbering.html
-    }
-    
-    private static boolean testforNullTerminator(String str){
-        if(str == null) {
-            return false;
         }
-        return str.indexOf('\u0000') > 0;
+        return null;
     }
     
-    private boolean checkDOIAuthority(String doiAuthority){
-        
-        if (doiAuthority==null){
-            return false;
-        }
-        
-        if (!(doiAuthority.startsWith("10."))){
-            return false;
+    public String asRawIdentifier() {
+        if (protocol == null || authority == null || identifier == null) {
+            return "";
         }
-        
-        return true;
+        return authority + separator + identifier;
     }
 
+
+
     /**
      * Verifies that the pid only contains allowed characters.
      *
@@ -252,4 +128,6 @@ public static boolean verifyImportCharacters(String pidParam) {
 
         return m.matches();
     }
+
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java
deleted file mode 100644
index 0d64c1050b8..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package edu.harvard.iq.dataverse;
-
-import static edu.harvard.iq.dataverse.GlobalIdServiceBean.logger;
-import edu.harvard.iq.dataverse.engine.command.CommandContext;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public interface GlobalIdServiceBean {
-
-    static final Logger logger = Logger.getLogger(GlobalIdServiceBean.class.getCanonicalName());
-
-    boolean alreadyExists(DvObject dvo) throws Exception;
-    
-    boolean alreadyExists(GlobalId globalId) throws Exception;
-
-    boolean registerWhenPublished();
-    
-    List<String> getProviderInformation();
-
-    String createIdentifier(DvObject dvo) throws Throwable;
-
-    Map<String,String> getIdentifierMetadata(DvObject dvo);
-
-    /**
-     * Concatenate the parts that make up a Global Identifier.
-     * @param protocol the identifier system, e.g. "doi"
-     * @param authority the namespace that the authority manages in the identifier system
-     * @param identifier the local identifier part
-     * @return the Global Identifier, e.g. "doi:10.12345/67890"
-     */
-    String getIdentifierForLookup(String protocol, String authority, String identifier);
-
-    String modifyIdentifierTargetURL(DvObject dvo) throws Exception;
-
-    void deleteIdentifier(DvObject dvo) throws Exception;
-    
-    Map<String, String> getMetadataForCreateIndicator(DvObject dvObject);
-    
-    Map<String,String> getMetadataForTargetURL(DvObject dvObject);
-    
-    Map<String,String> lookupMetadataFromIdentifier(String protocol, String authority, String identifier);
-    
-    DvObject generateIdentifier(DvObject dvObject);
-    
-    String getIdentifier(DvObject dvObject);
-    
-    boolean publicizeIdentifier(DvObject studyIn);
-    
-    static GlobalIdServiceBean getBean(String protocol, CommandContext ctxt) {
-        final Function<CommandContext, GlobalIdServiceBean> protocolHandler = BeanDispatcher.DISPATCHER.get(protocol);
-        if ( protocolHandler != null ) {
-            return protocolHandler.apply(ctxt);
-        } else {
-            logger.log(Level.SEVERE, "Unknown protocol: {0}", protocol);
-            return null;
-        }
-    }
-
-    static GlobalIdServiceBean getBean(CommandContext ctxt) {
-        return getBean(ctxt.settings().getValueForKey(Key.Protocol, ""), ctxt);
-    }
-    
-}
-
-/**
- * Static utility class for dispatching implementing beans, based on protocol and providers.
- * @author michael
- */
-class BeanDispatcher {
-    static final Map<String, Function<CommandContext, GlobalIdServiceBean>> DISPATCHER = new HashMap<>();
-
-    static {
-        DISPATCHER.put("hdl", ctxt->ctxt.handleNet() );
-        DISPATCHER.put("doi", ctxt->{
-            String doiProvider = ctxt.settings().getValueForKey(Key.DoiProvider, "");
-            switch ( doiProvider ) {
-                case "EZID": return ctxt.doiEZId();
-                case "DataCite": return ctxt.doiDataCite();
-                case "FAKE": return ctxt.fakePidProvider();
-                default: 
-                    logger.log(Level.SEVERE, "Unknown doiProvider: {0}", doiProvider);
-                    return null;
-            }
-        });
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/Guestbook.java b/src/main/java/edu/harvard/iq/dataverse/Guestbook.java
index 742e73403c1..2ef23d1f925 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Guestbook.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Guestbook.java
@@ -3,27 +3,25 @@
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.Serializable;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
 import java.util.List;
 import java.util.Objects;
-import javax.persistence.Column;
-import javax.persistence.ManyToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Transient;
 
 import edu.harvard.iq.dataverse.util.DateUtil;
-import org.apache.commons.lang.StringEscapeUtils;
 import org.hibernate.validator.constraints.NotBlank;
 
 /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookPage.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookPage.java
index a7fb2b5a3fd..0922af007fb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/GuestbookPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookPage.java
@@ -17,14 +17,14 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -235,7 +235,7 @@ public String save() {
         boolean create = false;
         if (!(guestbook.getCustomQuestions() == null)) {
             for (CustomQuestion cq : guestbook.getCustomQuestions()) {
-                if (cq.getQuestionType().equals("text")) {
+                if (cq.getQuestionType().equals("text") || cq.getQuestionType().equals("textarea")) {
                     cq.setCustomQuestionValues(null);
                 }
             }
@@ -288,19 +288,21 @@ public String save() {
            
         Command<Dataverse> cmd;
         try {
+            // Per recent #dv-tech conversation w/ Jim - copying the code 
+            // below from his QDR branch; the code that used to be here called
+            // UpdateDataverseCommand when saving new guestbooks, and that involved 
+            // an unnecessary reindexing of the dataverse (and, in some cases, 
+            // reindexing of the underlying datasets). - L.A.
             if (editMode == EditMode.CREATE || editMode == EditMode.CLONE ) {
                 guestbook.setCreateTime(new Timestamp(new Date().getTime()));
-                guestbook.setUsageCount(new Long(0));
+                guestbook.setUsageCount(Long.valueOf(0));
                 guestbook.setEnabled(true);
                 dataverse.getGuestbooks().add(guestbook);
-                cmd = new UpdateDataverseCommand(dataverse, null, null, dvRequestService.getDataverseRequest(), null);                
-                commandEngine.submit(cmd);
                 create = true;
-            } else {
-                cmd = new UpdateDataverseGuestbookCommand(dataverse, guestbook, dvRequestService.getDataverseRequest());
-                commandEngine.submit(cmd);
-            }
-
+            } 
+            cmd = new UpdateDataverseGuestbookCommand(dataverse, guestbook, dvRequestService.getDataverseRequest());
+            commandEngine.submit(cmd);
+        
         } catch (EJBException ex) {
             StringBuilder error = new StringBuilder();
             error.append(ex).append(" ");
@@ -320,7 +322,7 @@ public String save() {
             logger.info("Guestbook Page Command Exception. Dataverse: " + dataverse.getName());
             logger.info(ex.toString());
             FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("guestbook.save.fail"), " - " + ex.toString()));
-            //logger.severe(ex.getMessage());
+            return null;
         }
         editMode = null;
         String msg = (create)? BundleUtil.getStringFromBundle("guestbook.create"): BundleUtil.getStringFromBundle("guestbook.save");
diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java
index 646e92b3139..830c7740e34 100644
--- a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java
@@ -8,17 +8,31 @@
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.*;
+
+import edu.harvard.iq.dataverse.validation.ValidateEmail;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Size;
+import java.util.Collections;
+import java.util.Comparator;
 
 /**
  *
  * @author skraffmiller
  */
+@NamedStoredProcedureQuery(
+        name = "GuestbookResponse.estimateGuestBookResponseTableSize",
+        procedureName = "estimateGuestBookResponseTableSize",
+        parameters = {
+            @StoredProcedureParameter(mode = ParameterMode.OUT, type = Long.class)
+        }
+)
 @Entity
 @Table(indexes = {
         @Index(columnList = "guestbook_id"),
@@ -57,31 +71,60 @@ public class GuestbookResponse implements Serializable {
     @JoinColumn(nullable=true)
     private AuthenticatedUser authenticatedUser;
 
-    @OneToOne(cascade=CascadeType.ALL,mappedBy="guestbookResponse",fetch = FetchType.LAZY, optional = false)
-    private FileDownload fileDownload;
+    @OneToMany(mappedBy="guestbookResponse",cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST},fetch = FetchType.LAZY)
+    //private FileAccessRequest fileAccessRequest;
+    private List<FileAccessRequest> fileAccessRequests;
      
     @OneToMany(mappedBy="guestbookResponse",cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST},orphanRemoval=true)
     @OrderBy ("id")
     private List<CustomQuestionResponse> customQuestionResponses;
 
+    @Size(max = 255, message = "{guestbook.response.nameLength}")
     private String name;
+
+    @Size(max = 255, message = "{guestbook.response.nameLength}")
+    @ValidateEmail(message = "{user.invalidEmail}")
     private String email;
+
+    @Size(max = 255, message = "{guestbook.response.nameLength}")
     private String institution;
+
+    @Size(max = 255, message = "{guestbook.response.nameLength}")
     private String position;
     
-        
     @Temporal(value = TemporalType.TIMESTAMP)
     private Date responseTime;
+
+    private String sessionId;
+    private String eventType;
+
+    /** Event Types - there are four pre-defined values in use.
+     * The type can also be the name of a previewer/explore tool
+     */
     
+    public static final String ACCESS_REQUEST = "AccessRequest";
+    public static final String DOWNLOAD = "Download";
+    static final String SUBSET = "Subset";
+    static final String EXPLORE = "Explore";
+
     /*
     Transient Values carry non-written information 
     that will assist in the download process
     - writeResponse is set to false when dataset version is draft.
+    - selected file ids is a comma delimited list that contains the file ids for multiple download
+    - fileFormat tells the download api which format a subsettable file should be downloaded as
+
     */
       
     @Transient 
     private boolean writeResponse = true;
 
+    @Transient
+    private String selectedFileIds;
+    
+    @Transient 
+    private String fileFormat;
+
     /**
      * This transient variable is a place to temporarily retrieve the
      * ExternalTool object from the popup when the popup is required on the
@@ -90,6 +133,7 @@ public class GuestbookResponse implements Serializable {
     @Transient
     private ExternalTool externalTool;
 
+    
     public boolean isWriteResponse() {
         return writeResponse;
     }
@@ -99,19 +143,19 @@ public void setWriteResponse(boolean writeResponse) {
     }
 
     public String getSelectedFileIds(){
-        return this.fileDownload.getSelectedFileIds();
+        return this.selectedFileIds;
     }
     
     public void setSelectedFileIds(String selectedFileIds) {
-        this.fileDownload.setSelectedFileIds(selectedFileIds);
+        this.selectedFileIds = selectedFileIds;
     }
     
     public String getFileFormat() {
-        return this.fileDownload.getFileFormat();
+        return this.fileFormat;
     }
 
     public void setFileFormat(String downloadFormat) {
-        this.fileDownload.setFileFormat(downloadFormat);
+        this.fileFormat = downloadFormat;
     }
     
     public ExternalTool getExternalTool() {
@@ -123,10 +167,6 @@ public void setExternalTool(ExternalTool externalTool) {
     }
 
     public GuestbookResponse(){
-        if(this.getFileDownload() == null){
-            this.fileDownload = new FileDownload();
-            this.fileDownload.setGuestbookResponse(this);
-        }
     }
     
     public GuestbookResponse(GuestbookResponse source){
@@ -139,10 +179,10 @@ public GuestbookResponse(GuestbookResponse source){
         this.setDataset(source.getDataset());
         this.setDatasetVersion(source.getDatasetVersion());
         this.setAuthenticatedUser(source.getAuthenticatedUser());
-   
+        this.setSessionId(source.getSessionId());
         List <CustomQuestionResponse> customQuestionResponses = new ArrayList<>();
         if (!source.getCustomQuestionResponses().isEmpty()){
-            for (CustomQuestionResponse customQuestionResponse : source.getCustomQuestionResponses() ){
+            for (CustomQuestionResponse customQuestionResponse : source.getCustomQuestionResponsesSorted() ){
                 CustomQuestionResponse customQuestionResponseAdd = new CustomQuestionResponse();
                 customQuestionResponseAdd.setResponse(customQuestionResponse.getResponse());  
                 customQuestionResponseAdd.setCustomQuestion(customQuestionResponse.getCustomQuestion());
@@ -152,7 +192,6 @@ public GuestbookResponse(GuestbookResponse source){
         }
         this.setCustomQuestionResponses(customQuestionResponses);
         this.setGuestbook(source.getGuestbook());
-        this.setFileDownload(source.getFileDownload());
     }
     
     
@@ -161,7 +200,8 @@ public String getEmail() {
     }
 
     public void setEmail(String email) {
-        this.email = email;
+        // ValidateEmail requires NULL or valid email. Empty String will fail validation
+        this.email = (email == null || email.trim().isEmpty()) ? null : email;
     }
 
     public Guestbook getGuestbook() {
@@ -210,35 +250,40 @@ public Date getResponseTime() {
 
     public void setResponseTime(Date responseTime) {
         this.responseTime = responseTime;
-        this.getFileDownload().setDownloadTimestamp(responseTime);
     }
 
     public String getResponseDate() {
         return new SimpleDateFormat("MMMM d, yyyy").format(responseTime);
     }
-    
-    public String getResponseDateForDisplay(){
-        return null; //    SimpleDateFormat("yyyy").format(new Timestamp(new Date().getTime()));
-    }
-    
 
     public List<CustomQuestionResponse> getCustomQuestionResponses() {
         return customQuestionResponses;
     }
+    
+    public List<CustomQuestionResponse> getCustomQuestionResponsesSorted(){
+        
+        Collections.sort(customQuestionResponses, (CustomQuestionResponse cqr1, CustomQuestionResponse cqr2) -> {
+            int a = cqr1.getCustomQuestion().getDisplayOrder();
+            int b = cqr2.getCustomQuestion().getDisplayOrder();
+            return Integer.valueOf(a).compareTo(b);
+        });
+       
+       
+       return customQuestionResponses;
+    }
 
     public void setCustomQuestionResponses(List<CustomQuestionResponse> customQuestionResponses) {
         this.customQuestionResponses = customQuestionResponses;
     }
     
-    public FileDownload getFileDownload(){
-        return fileDownload;
+    public List<FileAccessRequest> getFileAccessRequests(){
+        return fileAccessRequests;
     }
-    
-    public void setFileDownload(FileDownload fDownload){
-        this.fileDownload = fDownload;
+
+    public void setFileAccessRequest(List<FileAccessRequest> fARs){
+        this.fileAccessRequests = fARs;
     }
     
-    
     public Dataset getDataset() {
         return dataset;
     }
@@ -271,22 +316,67 @@ public void setAuthenticatedUser(AuthenticatedUser authenticatedUser) {
         this.authenticatedUser = authenticatedUser;
     }
     
-    public String getDownloadtype() {
-        return this.fileDownload.getDownloadtype();
+    public String getEventType() {
+        return this.eventType;
     }
 
-    public void setDownloadtype(String downloadtype) {
-        this.fileDownload.setDownloadtype(downloadtype);
+    public void setEventType(String eventType) {
+        this.eventType = eventType;
         
     }
     
     public String getSessionId() {
-        return this.fileDownload.getSessionId();
+        return this.sessionId;
     }
 
     public void setSessionId(String sessionId) {
         
-        this.fileDownload.setSessionId(sessionId);
+        this.sessionId= sessionId;
+    }
+    
+    public String toHtmlFormattedResponse(){
+        return toHtmlFormattedResponse(null);
+    }
+    
+    public String toHtmlFormattedResponse(AuthenticatedUser requestor) {
+
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(BundleUtil.getStringFromBundle("dataset.guestbookResponse.id") + ": " + getId() + "<br>\n");
+        sb.append(BundleUtil.getStringFromBundle("dataset.guestbookResponse.date") + ": " + getResponseDate() + "<br>\n");
+        sb.append(BundleUtil.getStringFromBundle("dataset.guestbookResponse.respondent") + "<br><ul style=\"list-style-type:none;\">\n<li>"
+                + BundleUtil.getStringFromBundle("name") + ": " + getName() + "</li>\n<li>");
+        sb.append("  " + BundleUtil.getStringFromBundle("email") + ": " + getEmail() + "</li>\n<li>");
+        sb.append("  " + BundleUtil.getStringFromBundle("institution") + ": " + wrapNullAnswer(getInstitution()) + "</li>\n<li>");
+        sb.append("  " + BundleUtil.getStringFromBundle("position") + ": " + wrapNullAnswer(getPosition()) + "</li>");
+        
+        //Add requestor information to response to help dataset admin with request processing
+        if (requestor != null){
+            sb.append("\n<li>" + BundleUtil.getStringFromBundle("dataset.guestbookResponse.requestor.id") + ": " + requestor.getId()+ "</li>");
+            sb.append("\n<li>" + BundleUtil.getStringFromBundle("dataset.guestbookResponse.requestor.identifier") + ": " + requestor.getIdentifier()+ "</li></ul>\n");
+        } else {
+            sb.append("</ul>\n");
+        }
+
+        sb.append(BundleUtil.getStringFromBundle("dataset.guestbookResponse.guestbook.additionalQuestions")
+                + ":<ul style=\"list-style-type:none;\">\n");
+
+        for (CustomQuestionResponse cqr : getCustomQuestionResponsesSorted()) {
+            sb.append("<li>" + BundleUtil.getStringFromBundle("dataset.guestbookResponse.question") + ": "
+                    + cqr.getCustomQuestion().getQuestionString() + "<br>"
+                    + BundleUtil.getStringFromBundle("dataset.guestbookResponse.answer") + ": "
+                    + wrapNullAnswer(cqr.getResponse()) + "</li>\n<br>");
+        }
+        sb.append("</ul>");
+        return sb.toString();
+    }
+    
+    private String wrapNullAnswer(String answer) {
+        //This assumes we don't have to distinguish null from when the user actually answers "(No Reponse)". The db still has the real value
+        if (answer == null) {
+            return BundleUtil.getStringFromBundle("dataset.guestbookResponse.noResponse");
+        }
+        return answer;
     }
     
     @Override
diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java
index 7ac791acf3c..6c043b78941 100644
--- a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java
@@ -8,10 +8,11 @@
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool;
-import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.StringUtil;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -20,19 +21,18 @@
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.faces.model.SelectItem;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.StoredProcedureQuery;
+import jakarta.persistence.TypedQuery;
+import org.apache.commons.text.StringEscapeUtils;
 /**
  *
  * @author skraffmiller
@@ -42,34 +42,49 @@
 public class GuestbookResponseServiceBean {
     private static final Logger logger = Logger.getLogger(GuestbookResponseServiceBean.class.getCanonicalName());
     
+    @EJB
+    DataverseServiceBean dataverseService;
+    
     // The query below is used for retrieving guestbook responses used to download 
     // the collected data, in CSV format, from the manage-guestbooks and 
     // guestbook-results pages. (for entire dataverses, and for the individual 
     // guestbooks within dataverses, respectively). -- L.A. 
-    private static final String BASE_QUERY_STRING_FOR_DOWNLOAD_AS_CSV = "select r.id, g.name, v.value,  r.responsetime, f.downloadtype,"
-                + " m.label, r.dataFile_id, r.name, r.email, r.institution, r.position "
-                + "from guestbookresponse r, filedownload f, datasetfieldvalue v, filemetadata m, dvobject o, guestbook g  "
+    /*private static final String BASE_QUERY_STRING_FOR_DOWNLOAD_AS_CSV = "select r.id, g.name, v.value, r.responsetime, f.downloadtype,"
+                + " m.label, r.dataFile_id, r.name, r.email, r.institution, r.position,"
+                + " o.protocol, o.authority, o.identifier, d.protocol, d.authority, d.identifier "
+                + "from guestbookresponse r, filedownload f, datasetfieldvalue v, filemetadata m, dvobject o, guestbook g, dvobject d "
                 + "where "  
                 + " v.datasetfield_id = (select id from datasetfield f where datasetfieldtype_id = 1 "
                 + " and datasetversion_id = (select max(id) from datasetversion where dataset_id =r.dataset_id )) "
                 + " and m.datasetversion_id = (select max(datasetversion_id) from filemetadata where datafile_id =r.datafile_id ) "
                 + " and m.datafile_id = r.datafile_id "
+                + " and d.id = r.datafile_id "
                 + " and r.id = f.guestbookresponse_id "
                 + " and r.dataset_id = o.id "
+                + " and r.guestbook_id = g.id ";*/
+    
+    private static final String BASE_QUERY_STRING_FOR_DOWNLOAD_AS_CSV = "select r.id, g.name, o.id, r.responsetime, r.eventtype,"
+                + " m.label, r.dataFile_id, r.name, r.email, r.institution, r.position,"
+                + " o.protocol, o.authority, o.identifier, d.protocol, d.authority, d.identifier "
+                + "from guestbookresponse r, filemetadata m, dvobject o, guestbook g, dvobject d "
+                + "where "  
+                + "m.datasetversion_id = (select max(datasetversion_id) from filemetadata where datafile_id =r.datafile_id ) "
+                + " and m.datafile_id = r.datafile_id "
+                + " and d.id = r.datafile_id "
+                + " and r.dataset_id = o.id "
                 + " and r.guestbook_id = g.id ";
     
     // And this query is used for retrieving guestbook responses for displaying 
     // on the guestbook-results.xhtml page (the info we show on the page is 
     // less detailed than what we let the users download as CSV files, so this 
     // query has fewer fields than the one above). -- L.A.
-    private static final String BASE_QUERY_STRING_FOR_PAGE_DISPLAY = "select  r.id, v.value, r.responsetime, f.downloadtype,  m.label, r.name "
-                + "from guestbookresponse r, filedownload f, datasetfieldvalue v, filemetadata m , dvobject o "
+    private static final String BASE_QUERY_STRING_FOR_PAGE_DISPLAY = "select  r.id, v.value, r.responsetime, r.eventtype,  m.label, r.name "
+                + "from guestbookresponse r, datasetfieldvalue v, filemetadata m , dvobject o "
                 + "where "  
                 + " v.datasetfield_id = (select id from datasetfield f where datasetfieldtype_id = 1 "
                 + " and datasetversion_id = (select max(id) from datasetversion where dataset_id =r.dataset_id )) "
                 + " and m.datasetversion_id = (select max(datasetversion_id) from filemetadata where datafile_id =r.datafile_id ) "
                 + " and m.datafile_id = r.datafile_id "
-                + " and r.id = f.guestbookresponse_id "
                 + " and r.dataset_id = o.id ";
     
     // And a custom query for retrieving *all* the custom question responses, for 
@@ -79,7 +94,7 @@ public class GuestbookResponseServiceBean {
                 + "where q.id = r.customquestion_id "
                 + "and r.guestbookResponse_id = g.id "
                 + "and g.dataset_id = o.id ";
-
+    
     
     private static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM/d/yyyy");
     
@@ -125,6 +140,19 @@ public void streamResponsesByDataverseIdAndGuestbookId(OutputStream out, Long da
         // of queries now) -- L.A. 
         
         Map<Integer, Object> customQandAs = mapCustomQuestionAnswersAsStrings(dataverseId, guestbookId);
+        Map<Integer, String> datasetTitles = mapDatasetTitles(dataverseId);
+                
+        List<Object[]> guestbookResults = getGuestbookResults( dataverseId,  guestbookId );
+        // the CSV header:
+        out.write("Guestbook, Dataset, Dataset PID, Date, Type, File Name, File Id, File PID, User Name, Email, Institution, Position, Custom Questions\n".getBytes());
+        for (Object[] result : guestbookResults) {
+            StringBuilder sb = convertGuestbookResponsesToCSV(customQandAs, datasetTitles, result);
+            out.write(sb.toString().getBytes());
+            out.flush();
+        }
+    }
+    
+    public List<Object[]> getGuestbookResults(Long dataverseId, Long guestbookId ){
         
         String queryString = BASE_QUERY_STRING_FOR_DOWNLOAD_AS_CSV
                 + " and  o.owner_id = " 
@@ -134,15 +162,15 @@ public void streamResponsesByDataverseIdAndGuestbookId(OutputStream out, Long da
             queryString+= (" and r.guestbook_id = " + guestbookId.toString());
         }
         
-        queryString += ";";
+        queryString += " ORDER by r.id DESC;";
         logger.fine("stream responses query: " + queryString);
         
-        List<Object[]> guestbookResults = em.createNativeQuery(queryString).getResultList();
-
-        // the CSV header:
-        out.write("Guestbook, Dataset, Date, Type, File Name, File Id, User Name, Email, Institution, Position, Custom Questions\n".getBytes());
+        return  em.createNativeQuery(queryString).getResultList();
         
-        for (Object[] result : guestbookResults) {
+    }
+    
+    public StringBuilder convertGuestbookResponsesToCSV ( Map<Integer, Object> customQandAs, Map<Integer, String> datasetTitles, Object[] result) throws IOException {
+
             Integer guestbookResponseId = (Integer)result[0];
             
             StringBuilder sb = new StringBuilder();
@@ -152,12 +180,18 @@ public void streamResponsesByDataverseIdAndGuestbookId(OutputStream out, Long da
             // string fields, or the structure of the file will be broken. -- L.A.
             
             // Guestbook name: 
-            sb.append(((String)result[1]).replace(',', ' '));
+            sb.append(StringEscapeUtils.escapeCsv((String)result[1]));
             sb.append(SEPARATOR);
 
             
             // Dataset name: 
-            sb.append(((String)result[2]).replace(',', ' '));
+            Integer datasetId = (Integer) result[2];
+            String datasetTitle = datasetTitles.get(datasetId);
+            sb.append(datasetTitle == null ? "" : StringEscapeUtils.escapeCsv(datasetTitle));
+            sb.append(SEPARATOR);
+            
+            // Dataset persistent identifier: 
+            sb.append(formatPersistentIdentifier((String)result[11], (String)result[12], (String)result[13]));
             sb.append(SEPARATOR);
             
             if (result[3] != null) {
@@ -172,65 +206,65 @@ public void streamResponsesByDataverseIdAndGuestbookId(OutputStream out, Long da
             sb.append(SEPARATOR);
 
             // file name: 
-            sb.append(((String)result[5]).replace(',', ' '));
+            sb.append(StringEscapeUtils.escapeCsv((String)result[5]));
             sb.append(SEPARATOR);
 
             // file id (numeric):
             sb.append(result[6] == null ? "" : result[6]);
             sb.append(SEPARATOR);
             
+            // persistent id of the file (if available):
+            // Dataset persistent identifier: 
+            sb.append(formatPersistentIdentifier((String)result[14], (String)result[15], (String)result[16]));
+            sb.append(SEPARATOR);
+            
             // name supplied in the guestbook response: 
-            sb.append(result[7] == null ? "" : ((String)result[7]).replace(',', ' '));
+            sb.append(result[7] == null ? "" : StringEscapeUtils.escapeCsv((String)result[7]));
             sb.append(SEPARATOR);
             
             // email: 
-            sb.append(result[8] == null ? "" : result[8]);
+            sb.append(result[8] == null ? "" : StringEscapeUtils.escapeCsv((String)result[8]));           
             sb.append(SEPARATOR);
             
             // institution:
-            sb.append(result[9] == null ? "" : ((String)result[9]).replace(',', ' '));
+            sb.append(result[9] == null ? "" : StringEscapeUtils.escapeCsv((String)result[9]));
             sb.append(SEPARATOR);
             
             // position: 
-            sb.append(result[10] == null ? "" : ((String)result[10]).replace(',', ' '));
+            sb.append(result[10] == null ? "" : StringEscapeUtils.escapeCsv((String)result[10]));
             
             // Finally, custom questions and answers, if present:
             
-            // (the old implementation, below, would run one extra query FOR EVERY SINGLE
-            // guestbookresponse entry! -- instead, we are now pre-caching all the 
-            // available custom question responses, with a single native query at 
-            // the top of this method. -- L.A.)
-            
-            /*String cqString = "select q.questionstring, r.response  from customquestionresponse r, customquestion q where q.id = r.customquestion_id and r.guestbookResponse_id = " + result[0];
-            List<Object[]> customResponses = em.createNativeQuery(cqString).getResultList();
-            if (customResponses != null) {
-                for (Object[] response : customResponses) {
-                    sb.append(SEPARATOR);
-                    sb.append(response[0]);
-                    sb.append(SEPARATOR);
-                    sb.append(response[1] == null ? "" : response[1]);
-                }
-            }*/
             
             if (customQandAs.containsKey(guestbookResponseId)) {
                 sb.append(customQandAs.get(guestbookResponseId)); 
             } 
 
             sb.append(NEWLINE);
-
-            // Finally, write the line out: 
-            // (i.e., we are writing one guestbook response at a time, thus allowing the 
-            // whole thing to stream in real time -- L.A.)
-            out.write(sb.toString().getBytes());
-            out.flush();
-        }
+        return sb;
+        
+    }
+    
+    
+    private String formatPersistentIdentifier(String protocol, String authority, String identifier) {
+        // Note that the persistent id may be unavailable for this dvObject:
+        if (StringUtil.nonEmpty(protocol) && StringUtil.nonEmpty(authority) && StringUtil.nonEmpty(identifier)) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(protocol);
+            sb.append(":");
+            sb.append(authority);
+            sb.append("/");
+            sb.append(identifier);
+            return sb.toString();
+        } 
+        return "N/A";
     }
     
     /*
       This method is used to produce an array of guestbook responses for displaying 
       on the guestbook-responses page. 
     */
-    public List<Object[]> findArrayByGuestbookIdAndDataverseId (Long guestbookId, Long dataverseId, Long limit){
+    public List<Object[]> findArrayByGuestbookIdAndDataverseId(Long guestbookId, Long dataverseId, Long limit){
 
         Guestbook gbIn = em.find(Guestbook.class, guestbookId);
         boolean hasCustomQuestions = gbIn.getCustomQuestions() != null;
@@ -323,7 +357,7 @@ private Map<Integer, Object> mapCustomQuestionAnswersAsLists(Long dataverseId, L
         return selectCustomQuestionAnswers(dataverseId, guestbookId, false, firstResponse, lastResponse);
     }
     
-    private Map<Integer, Object> mapCustomQuestionAnswersAsStrings(Long dataverseId, Long guestbookId) {
+    public Map<Integer, Object> mapCustomQuestionAnswersAsStrings(Long dataverseId, Long guestbookId) {
         return selectCustomQuestionAnswers(dataverseId, guestbookId, true, null, null);
     }
     
@@ -361,9 +395,8 @@ private Map<Integer, Object> selectCustomQuestionAnswers(Long dataverseId, Long
 
                 if (asString) {
                     // as combined strings of comma-separated question and answer values
-                    
-                    String qa = SEPARATOR + ((String)response[0]).replace(',', ' ') + SEPARATOR + (response[1] == null ? "" : ((String)response[1]).replace(',', ' '));
-
+                    //assuming the strings are only being created for writing out to csv which seems to be the case
+                    String qa = SEPARATOR + StringEscapeUtils.escapeCsv((String)response[0]) + SEPARATOR + (response[1] == null ? "" : StringEscapeUtils.escapeCsv((String)response[1]));                   
                     if (ret.containsKey(responseId)) {
                         ret.put(responseId, ret.get(responseId) + qa);
                     } else {
@@ -375,6 +408,9 @@ private Map<Integer, Object> selectCustomQuestionAnswers(Long dataverseId, Long
                     if (!ret.containsKey(responseId)) {
                         ret.put(responseId, new ArrayList<>());
                     }
+                    if(response[1] != null){
+                         response[1]=((String)response[1]).replaceAll("(\r\n|\n)", "<br />");
+                    }
                     ((List) ret.get(responseId)).add(response);
                 }
 
@@ -396,7 +432,7 @@ public Long findCountByGuestbookId(Long guestbookId, Long dataverseId) {
             Query query = em.createNativeQuery(queryString);
             return (Long) query.getSingleResult();
         } else  {
-            String queryString = "select count(o) from GuestbookResponse as o, Dataset d, DvObject obj where o.dataset_id = d.id and d.id = obj.id and obj.owner_id = " + dataverseId + "and o.guestbook_id = " + guestbookId;
+            String queryString = "select count(o) from GuestbookResponse as o, Dataset d, DvObject obj where o.dataset_id = d.id and d.id = obj.id and obj.owner_id = " + dataverseId + " and o.guestbook_id = " + guestbookId;
             Query query = em.createNativeQuery(queryString);
             return (Long) query.getSingleResult();            
         }
@@ -555,7 +591,7 @@ private Guestbook findDefaultGuestbook() {
         return guestbook;
 
     }
-
+    
     public String getUserName(User user) {
         if (user.isAuthenticated()) {
             AuthenticatedUser authUser = (AuthenticatedUser) user;
@@ -603,6 +639,9 @@ public GuestbookResponse initGuestbookResponseForFragment(DatasetVersion working
        
         GuestbookResponse guestbookResponse = new GuestbookResponse();
         
+        //Not otherwise set for multi-file downloads
+        guestbookResponse.setDatasetVersion(workingVersion);
+        
         if(workingVersion.isDraft()){           
             guestbookResponse.setWriteResponse(false);
         } 
@@ -629,7 +668,7 @@ public GuestbookResponse initGuestbookResponseForFragment(DatasetVersion working
         if (dataset.getGuestbook() != null && !dataset.getGuestbook().getCustomQuestions().isEmpty()) {
             initCustomQuestions(guestbookResponse, dataset);
         }
-        guestbookResponse.setDownloadtype("Download");
+        guestbookResponse.setEventType(GuestbookResponse.DOWNLOAD);
 
         guestbookResponse.setDataset(dataset);
         
@@ -683,9 +722,9 @@ public GuestbookResponse initGuestbookResponse(FileMetadata fileMetadata, String
         if (dataset.getGuestbook() != null && !dataset.getGuestbook().getCustomQuestions().isEmpty()) {
             initCustomQuestions(guestbookResponse, dataset);
         }
-        guestbookResponse.setDownloadtype("Download");
+        guestbookResponse.setEventType(GuestbookResponse.DOWNLOAD);
         if(downloadFormat.toLowerCase().equals("subset")){
-            guestbookResponse.setDownloadtype("Subset");
+            guestbookResponse.setEventType(GuestbookResponse.SUBSET);
         }
         if(downloadFormat.toLowerCase().equals("explore")){
             /**
@@ -695,13 +734,13 @@ public GuestbookResponse initGuestbookResponse(FileMetadata fileMetadata, String
              * modifyDatafileAndFormat for TwoRavens but now we pass
              * "externalTool" for all external tools, including TwoRavens. When
              * clicking "Explore" and then the name of the tool, we want the
-             * name of the exploration tool (i.e. "TwoRavens", "Data Explorer",
-             * etc.) to be persisted as the downloadType. We execute
-             * guestbookResponse.setDownloadtype(externalTool.getDisplayName())
+             * name of the exploration tool (i.e. "Data Explorer",
+             * etc.) to be persisted as the eventType. We execute
+             * guestbookResponse.setEventType(externalTool.getDisplayName())
              * over in the "explore" method of FileDownloadServiceBean just
              * before the guestbookResponse is written.
              */
-            guestbookResponse.setDownloadtype("Explore");
+            guestbookResponse.setEventType(GuestbookResponse.EXPLORE);
         }
         guestbookResponse.setDataset(dataset);
         
@@ -780,7 +819,7 @@ public GuestbookResponse initDefaultGuestbookResponse(Dataset dataset, DataFile
         guestbookResponse.setDataset(dataset);
         guestbookResponse.setResponseTime(new Date());
         guestbookResponse.setSessionId(session.toString());
-        guestbookResponse.setDownloadtype("Download");
+        guestbookResponse.setEventType(GuestbookResponse.DOWNLOAD);
         setUserDefaultResponses(guestbookResponse, session);
         return guestbookResponse;
     }
@@ -795,30 +834,17 @@ public GuestbookResponse initAPIGuestbookResponse(Dataset dataset, DataFile data
             guestbookResponse.setGuestbook(datasetGuestbook);            
         }
 
-       if(dataset.getLatestVersion() != null && dataset.getLatestVersion().isDraft()){
-            guestbookResponse.setWriteResponse(false);
-        }
         if (dataFile != null){
             guestbookResponse.setDataFile(dataFile);
         }        
         guestbookResponse.setDataset(dataset);
         guestbookResponse.setResponseTime(new Date());
         guestbookResponse.setSessionId(session.toString());
-        guestbookResponse.setDownloadtype("Download");
+        guestbookResponse.setEventType(GuestbookResponse.DOWNLOAD);
         setUserDefaultResponses(guestbookResponse, session, user);
         return guestbookResponse;
     }
-    
-    public boolean guestbookResponseValidator( UIInput toValidate, String value) {
-        if (value != null && value.length() > 255) {
-            (toValidate).setValid(false);
-            FacesContext.getCurrentInstance().addMessage((toValidate).getClientId(),
-                           new FacesMessage( FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.guestbookResponse.guestbook.responseTooLong"), null));
-            return false;
-        }
-        return true;
-    }
-    
+
     public GuestbookResponse modifyDatafile(GuestbookResponse in, FileMetadata fm) {
         if (in != null && fm.getDataFile() != null) {
             in.setDataFile(fm.getDataFile());
@@ -856,56 +882,6 @@ public GuestbookResponse modifyDatafileAndFormat(GuestbookResponse in, FileMetad
         }
         return modifyDatafileAndFormat(in, fm, format);
     }
-
-    public Boolean validateGuestbookResponse(GuestbookResponse guestbookResponse, String type) {
-
-        boolean valid = true;
-        Dataset dataset = guestbookResponse.getDataset();
-        if (dataset.getGuestbook() != null) {
-            if (dataset.getGuestbook().isNameRequired()) {
-                if (guestbookResponse.getName() == null) {
-                    valid = false;
-                } else {
-                    valid &= !guestbookResponse.getName().isEmpty();
-                }
-            }
-            if (dataset.getGuestbook().isEmailRequired()) {
-                if (guestbookResponse.getEmail() == null) {
-                    valid = false;
-                } else {
-                    valid &= !guestbookResponse.getEmail().isEmpty();
-                }
-            }
-            if (dataset.getGuestbook().isInstitutionRequired()) {
-                if (guestbookResponse.getInstitution() == null) {
-                    valid = false;
-                } else {
-                    valid &= !guestbookResponse.getInstitution().isEmpty();
-                }
-            }
-            if (dataset.getGuestbook().isPositionRequired()) {
-                if (guestbookResponse.getPosition() == null) {
-                    valid = false;
-                } else {
-                    valid &= !guestbookResponse.getPosition().isEmpty();
-                }
-            }
-        }
-
-        if (dataset.getGuestbook() != null && !dataset.getGuestbook().getCustomQuestions().isEmpty()) {
-            for (CustomQuestion cq : dataset.getGuestbook().getCustomQuestions()) {
-                if (cq.isRequired()) {
-                    for (CustomQuestionResponse cqr : guestbookResponse.getCustomQuestionResponses()) {
-                        if (cqr.getCustomQuestion().equals(cq)) {
-                            valid &= (cqr.getResponse() != null && !cqr.getResponse().isEmpty());
-                        }
-                    }
-                }
-            }
-        }
-  
-        return valid;
-    }
     
     private List<SelectItem> setResponseUISelectItems(CustomQuestion cq) {
         List<SelectItem> retList = new ArrayList<>();
@@ -929,28 +905,92 @@ public void save(GuestbookResponse guestbookResponse) {
     }
     
     
-    public Long getCountGuestbookResponsesByDataFileId(Long dataFileId) {
+    /*
+     * Metrics - download counts from GuestbookResponses: Any GuestbookResponse that
+     * is not of eventtype=='AccessRequest' is considered a download. This includes
+     * actual 'Download's, downloads of 'Subset's, and use by 'Explore' tools and
+     * previewers (where eventtype is the previewer name)
+     */
+        
+    public Long getDownloadCountByDataFileId(Long dataFileId) {
         // datafile id is null, will return 0
-        Query query = em.createNativeQuery("select count(o.id) from GuestbookResponse  o  where o.datafile_id  = " + dataFileId);
+        Query query = em.createNativeQuery("select count(o.id) from GuestbookResponse  o  where o.datafile_id  = " + dataFileId + " and eventtype != '" + GuestbookResponse.ACCESS_REQUEST +"'");
         return (Long) query.getSingleResult();
     }
     
-    public Long getCountGuestbookResponsesByDatasetId(Long datasetId) {
+    public Long getDownloadCountByDatasetId(Long datasetId) {
+        return getDownloadCountByDatasetId(datasetId, null);
+    }
+    
+    public Long getDownloadCountByDatasetId(Long datasetId, LocalDate date) {
         // dataset id is null, will return 0        
-        Query query = em.createNativeQuery("select count(o.id) from GuestbookResponse  o  where o.dataset_id  = " + datasetId);
+        Query query;
+        if(date != null) {
+            query = em.createNativeQuery("select count(o.id) from GuestbookResponse  o  where o.dataset_id  = " + datasetId + " and responsetime < '" + date.toString() + "' and eventtype != '" + GuestbookResponse.ACCESS_REQUEST +"'");
+        }else {
+            query = em.createNativeQuery("select count(o.id) from GuestbookResponse  o  where o.dataset_id  = " + datasetId+ " and eventtype != '" + GuestbookResponse.ACCESS_REQUEST +"'");
+        }
         return (Long) query.getSingleResult();
     }    
 
-    public Long getCountOfAllGuestbookResponses() {
-        // dataset id is null, will return 0        
-        Query query = em.createNativeQuery("select count(o.id) from GuestbookResponse  o;");
+    public Long getTotalDownloadCount() {
+        // dataset id is null, will return 0  
+        
+        // "SELECT COUNT(*)" is notoriously expensive in PostgresQL for large 
+        // tables. This makes this call fairly expensive for any installation 
+        // with a lot of download/access activity. (This "total download" metrics
+        // is always displayed when the homepage is loaded). 
+        // It is safe to say that no real life user will need this number to be
+        // precise down to the last few digits, and/or withing a second, 
+        // especially once that number is in the millions. The 
+        // solution implemented below relies on estimating the number. It is 
+        // very efficient, but also very PostgresQL specific - hence it is 
+        // defined as a custom database function. 
+        // An alternative solution would be to get the exact number every 
+        // hour or so, and cache it centrally for the rest of the application 
+        // somehow. -- L.A. 5.6
+        
+        
+        try {        
+            StoredProcedureQuery query = this.em.createNamedStoredProcedureQuery("GuestbookResponse.estimateGuestBookResponseTableSize");
+            query.execute();
+            Long totalCount = (Long) query.getOutputParameterValue(1);
+        
+            if (totalCount != null) {
+                return totalCount;
+            }
+        } catch (IllegalArgumentException iae) {
+            // Don't do anything, we'll fall back to using "SELECT COUNT()"
+        }
+        Query query = em.createNativeQuery("select count(o.id) from GuestbookResponse  o where eventtype != '" + GuestbookResponse.ACCESS_REQUEST +"';");
         return (Long) query.getSingleResult();
     }
     
+    //End Metrics/download counts
+    
     public List<GuestbookResponse> findByAuthenticatedUserId(AuthenticatedUser user) {
         Query query = em.createNamedQuery("GuestbookResponse.findByAuthenticatedUserId"); 
         query.setParameter("authenticatedUserId", user.getId());
         return query.getResultList();
     }
+        
+    public Map<Integer, String> mapDatasetTitles(Long dataverseId) {
+        Map<Integer, String> ret = new HashMap<>();
+
+        List<Object[]> titleResults = dataverseService.getDatasetTitlesWithinDataverse(dataverseId);
+
+        if (titleResults != null) {
+            for (Object[] titleObj : titleResults) {
+                Integer datasetId = (Integer) titleObj[1];
+                String datasetTitle = (String) titleObj[0];
+                
+                ret.put(datasetId, datasetTitle);
+
+            }
+        }
+
+        return ret;
+        
+    }
     
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java
index 23aac4a24a3..4276eb02882 100644
--- a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java
@@ -6,20 +6,20 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseCommand;
-import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  *
@@ -102,8 +102,9 @@ public String init() {
     private String getFileName(){
        // The fix below replaces any spaces in the name of the dataverse with underscores;
        // without it, the filename was chopped off (by the browser??), and the user 
-       // was getting the file name "Foo", instead of "Foo and Bar in Social Sciences.csv". -- L.A. 
-       return  dataverse.getName().replace(' ', '_') + "_" + guestbook.getId() + "_GuestbookReponses.csv";
+       // was getting the file name "Foo", instead of "Foo and Bar in Social Sciences.csv". -- L.A.
+       // Also removing some chars that have been reported to cause issues with certain browsers
+       return  FileUtil.sanitizeFileName(dataverse.getName() + "_" + guestbook.getId() + "_GuestbookResponses.csv");
     }
 
     public void streamResponsesByDataverseAndGuestbook(){
diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookServiceBean.java
index 5394ddc652a..fcd4e91d455 100644
--- a/src/main/java/edu/harvard/iq/dataverse/GuestbookServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookServiceBean.java
@@ -5,12 +5,11 @@
  */
 package edu.harvard.iq.dataverse;
 
-import java.util.List;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/HandlenetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/HandlenetServiceBean.java
deleted file mode 100644
index 0549baaf8ae..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/HandlenetServiceBean.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
-   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   Dataverse Network - A web application to share, preserve and analyze research data.
-   Developed at the Institute for Quantitative Social Science, Harvard University.
-   Version 3.0.
-*/
-
-package edu.harvard.iq.dataverse;
-
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import java.security.PrivateKey;
-
-/* Handlenet imports: */
-import net.handle.hdllib.AbstractMessage;
-import net.handle.hdllib.AbstractResponse;
-import net.handle.hdllib.AdminRecord;
-import net.handle.hdllib.ClientSessionTracker;
-import net.handle.hdllib.CreateHandleRequest;
-import net.handle.hdllib.DeleteHandleRequest;
-import net.handle.hdllib.Encoder;
-import net.handle.hdllib.HandleException;
-import net.handle.hdllib.HandleResolver;
-import net.handle.hdllib.HandleValue;
-import net.handle.hdllib.ModifyValueRequest;
-import net.handle.hdllib.PublicKeyAuthenticationInfo;
-import net.handle.hdllib.ResolutionRequest;
-import net.handle.hdllib.Util;
-import org.apache.commons.lang.NotImplementedException;
-
-/**
- *
- * @author Leonid Andreev
- * 
- * This is a *partial* implementation of the Handles global id 
- * service. 
- * As of now, it only does the registration updates, to accommodate 
- * the modifyRegistration datasets API sub-command.
- */
-@Stateless
-public class HandlenetServiceBean extends AbstractGlobalIdServiceBean {
-
-    @EJB
-    DataverseServiceBean dataverseService;
-    @EJB 
-    SettingsServiceBean settingsService;    
-    private static final Logger logger = Logger.getLogger(HandlenetServiceBean.class.getCanonicalName());
-    
-    private static final String HANDLE_PROTOCOL_TAG = "hdl";
-    int handlenetIndex = System.getProperty("dataverse.handlenet.index")!=null? Integer.parseInt(System.getProperty("dataverse.handlenet.index")) : 300;
-    
-    public HandlenetServiceBean() {
-        logger.log(Level.FINE,"Constructor");
-    }
-
-    @Override
-    public boolean registerWhenPublished() {
-        return false; // TODO current value plays safe, can we loosen up?
-    }
-
-    public void reRegisterHandle(DvObject dvObject) {
-        logger.log(Level.FINE,"reRegisterHandle");
-        if (!HANDLE_PROTOCOL_TAG.equals(dvObject.getProtocol())) {
-            logger.log(Level.WARNING, "reRegisterHandle called on a dvObject with the non-handle global id: {0}", dvObject.getId());
-        }
-        
-        String handle = getDvObjectHandle(dvObject);
-
-        boolean handleRegistered = isHandleRegistered(handle);
-        
-        if (handleRegistered) {
-            // Rebuild/Modify an existing handle
-            
-            logger.log(Level.INFO, "Re-registering an existing handle id {0}", handle);
-            
-            String authHandle = getAuthenticationHandle(dvObject);
-
-            HandleResolver resolver = new HandleResolver();
-
-            String datasetUrl = getRegistrationUrl(dvObject);
-            
-            logger.log(Level.INFO, "New registration URL: {0}", datasetUrl);
-
-            PublicKeyAuthenticationInfo auth = getAuthInfo(dvObject.getAuthority());
-            
-            try {
-
-                AdminRecord admin = new AdminRecord(authHandle.getBytes("UTF8"), handlenetIndex,
-                        true, true, true, true, true, true,
-                        true, true, true, true, true, true);
-
-                int timestamp = (int) (System.currentTimeMillis() / 1000);
-
-                HandleValue[] val = {new HandleValue(100, "HS_ADMIN".getBytes("UTF8"),
-                    Encoder.encodeAdminRecord(admin),
-                    HandleValue.TTL_TYPE_RELATIVE, 86400,
-                    timestamp, null, true, true, true, false), new HandleValue(1, "URL".getBytes("UTF8"),
-                    datasetUrl.getBytes(),
-                    HandleValue.TTL_TYPE_RELATIVE, 86400,
-                    timestamp, null, true, true, true, false)};
-
-                ModifyValueRequest req = new ModifyValueRequest(handle.getBytes("UTF8"), val, auth);
-
-                resolver.traceMessages = true;
-                AbstractResponse response = resolver.processRequest(req);
-                if (response.responseCode == AbstractMessage.RC_SUCCESS) {
-                    logger.info("\nGot Response: \n" + response);
-                } else {
-                    logger.info("\nGot Error: \n" + response);
-                }
-            } catch (Throwable t) {
-                logger.fine("\nError: " + t);
-            }
-        } else {
-            // Create a new handle from scratch:
-            logger.log(Level.INFO, "Handle {0} not registered. Registering (creating) from scratch.", handle);
-            registerNewHandle(dvObject);
-        }
-    }
-    
-    public Throwable registerNewHandle(DvObject dvObject) {
-        logger.log(Level.FINE,"registerNewHandle");
-        String handlePrefix = dvObject.getAuthority();
-        String handle = getDvObjectHandle(dvObject);
-        String datasetUrl = getRegistrationUrl(dvObject);
-
-        logger.log(Level.INFO, "Creating NEW handle {0}", handle);
-
-        String authHandle = getAuthenticationHandle(dvObject);
-
-        PublicKeyAuthenticationInfo auth = getAuthInfo(handlePrefix);
-        HandleResolver resolver = new HandleResolver();
-
-        try {
-
-            AdminRecord admin = new AdminRecord(authHandle.getBytes("UTF8"), handlenetIndex,
-                    true, true, true, true, true, true,
-                    true, true, true, true, true, true);
-
-            int timestamp = (int) (System.currentTimeMillis() / 1000);
-
-            HandleValue[] val = {new HandleValue(100, "HS_ADMIN".getBytes("UTF8"),
-                Encoder.encodeAdminRecord(admin),
-                HandleValue.TTL_TYPE_RELATIVE, 86400,
-                timestamp, null, true, true, true, false), new HandleValue(1, "URL".getBytes("UTF8"),
-                datasetUrl.getBytes(),
-                HandleValue.TTL_TYPE_RELATIVE, 86400,
-                timestamp, null, true, true, true, false)};
-
-            CreateHandleRequest req
-                    = new CreateHandleRequest(handle.getBytes("UTF8"), val, auth);
-
-            resolver.traceMessages = true;
-            AbstractResponse response = resolver.processRequest(req);
-            if (response.responseCode == AbstractMessage.RC_SUCCESS) {
-                logger.log(Level.INFO, "Success! Response: \n{0}", response);
-                return null;
-            } else {
-                logger.log(Level.WARNING, "RegisterNewHandle failed. Error response: {0}", response);
-                return new Exception("registerNewHandle failed: " + response);
-            }
-        } catch (Throwable t) {
-            logger.log(Level.WARNING, "registerNewHandle failed", t);
-            return t;
-        }
-    }
-    
-    public boolean isHandleRegistered(String handle){
-        logger.log(Level.FINE,"isHandleRegistered");
-        boolean handleRegistered = false;
-        ResolutionRequest req = buildResolutionRequest(handle);
-        AbstractResponse response = null;
-        HandleResolver resolver = new HandleResolver();
-        try {
-            response = resolver.processRequest(req);
-        } catch (HandleException ex) {
-            logger.log(Level.WARNING, "Caught exception trying to process lookup request", ex);
-        }
-        if((response!=null && response.responseCode==AbstractMessage.RC_SUCCESS)) {
-            logger.log(Level.INFO, "Handle {0} registered.", handle);
-            handleRegistered = true;
-        } 
-        return handleRegistered;
-    }
-    
-    private ResolutionRequest buildResolutionRequest(final String handle) {
-        logger.log(Level.FINE,"buildResolutionRequest");
-        String handlePrefix = handle.substring(0,handle.indexOf("/"));
-        
-        PublicKeyAuthenticationInfo auth = getAuthInfo(handlePrefix);
-        
-        byte[][] types = null;
-        int[] indexes = null;
-        ResolutionRequest req =
-                new ResolutionRequest(Util.encodeString(handle),
-                types, indexes,
-                auth);
-        req.certify = false;
-        req.cacheCertify = true;
-        req.authoritative = false;
-        req.ignoreRestrictedValues = true;
-        return req;
-    }
-    
-    private PublicKeyAuthenticationInfo getAuthInfo(String handlePrefix) {
-        logger.log(Level.FINE,"getAuthInfo");
-        byte[] key = null;
-        String adminCredFile = System.getProperty("dataverse.handlenet.admcredfile");
-        int handlenetIndex = System.getProperty("dataverse.handlenet.index")!=null? Integer.parseInt(System.getProperty("dataverse.handlenet.index")) : 300;
-       
-        key = readKey(adminCredFile);        
-        PrivateKey privkey = null;
-        privkey = readPrivKey(key, adminCredFile);
-        String authHandle =  getAuthenticationHandle(handlePrefix);
-        PublicKeyAuthenticationInfo auth =
-                new PublicKeyAuthenticationInfo(Util.encodeString(authHandle), handlenetIndex, privkey);
-        return auth;
-    }
-    private String getRegistrationUrl(DvObject dvObject) {
-        logger.log(Level.FINE,"getRegistrationUrl");
-        String siteUrl = systemConfig.getDataverseSiteUrl();
-        String targetUrl = siteUrl + dvObject.getTargetUrl() + "hdl:" + dvObject.getAuthority()         
-                + "/" + dvObject.getIdentifier();         
-        return targetUrl;
-    }
- 
-    public String getSiteUrl() {
-        logger.log(Level.FINE,"getSiteUrl");
-        String hostUrl = System.getProperty("dataverse.siteUrl");
-        if (hostUrl != null && !"".equals(hostUrl)) {
-            return hostUrl;
-        }
-        String hostName = System.getProperty("dataverse.fqdn");
-        if (hostName == null) {
-            try {
-                hostName = InetAddress.getLocalHost().getCanonicalHostName();
-            } catch (UnknownHostException e) {
-                return null;
-            }
-        }
-        hostUrl = "https://" + hostName;
-        return hostUrl;
-    }
-    
-    private byte[] readKey(final String file) {
-        logger.log(Level.FINE,"readKey");
-        byte[] key = null;
-        try {
-            File f = new File(file);
-            FileInputStream fs = new FileInputStream(f);
-            key = new byte[(int)f.length()];
-            int n=0;
-            while(n<key.length) {
-                key[n++] = (byte)fs.read();
-            }
-        } catch (Throwable t){
-            logger.log(Level.SEVERE, "Cannot read private key {0}: {1}", new Object[]{file, t});
-        }
-        return key;
-    }
-    
-    private PrivateKey readPrivKey(byte[] key, final String file) {
-        logger.log(Level.FINE,"readPrivKey");
-        PrivateKey privkey=null;
-        
-        String secret = System.getProperty("dataverse.handlenet.admprivphrase");
-        byte secKey[] = null;
-        try {
-            if ( Util.requiresSecretKey(key) ) {
-                secKey = secret.getBytes();
-            }
-            key = Util.decrypt(key, secKey);
-            privkey = Util.getPrivateKeyFromBytes(key, 0);
-        } catch (Throwable t){
-            logger.log(Level.SEVERE, "Can''t load private key in {0}: {1}", new Object[]{file, t});
-        }
-        return privkey;
-    }
-    
-    private String getDvObjectHandle(DvObject dvObject) {
-        /* 
-         * This is different from dataset.getGlobalId() in that we don't 
-         * need the "hdl:" prefix.
-         */
-        String handle = dvObject.getAuthority() + "/" + dvObject.getIdentifier();
-        return handle;
-    }
-    
-    private String getAuthenticationHandle(DvObject dvObject){
-        return getAuthenticationHandle(dvObject.getAuthority());
-    }
-    
-    private String getAuthenticationHandle(String handlePrefix) {
-        logger.log(Level.FINE,"getAuthenticationHandle");
-        if (systemConfig.isIndependentHandleService()) {
-            return handlePrefix + "/ADMIN";
-        } else {
-            return "0.NA/" + handlePrefix;
-        }
-    }
-
-    @Override
-    public boolean alreadyExists(DvObject dvObject) throws Exception {
-        String handle = getDvObjectHandle(dvObject);
-        return isHandleRegistered(handle);
-    }
-    
-    @Override
-    public boolean alreadyExists(GlobalId pid) throws Exception {
-        String handle = pid.getAuthority() + "/" + pid.getIdentifier();
-        return isHandleRegistered(handle);
-    }
-    
-    @Override
-    public Map<String,String> getIdentifierMetadata(DvObject dvObject) {
-        throw new NotImplementedException();
-    }
-
-    @Override
-    public HashMap lookupMetadataFromIdentifier(String protocol, String authority, String identifier)  {
-        throw new NotImplementedException();
-    }
-
-    @Override
-    public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception  {
-        logger.log(Level.FINE,"modifyIdentifier");
-        reRegisterHandle(dvObject);
-        if(dvObject instanceof Dataset){
-            Dataset dataset = (Dataset) dvObject;
-            dataset.getFiles().forEach((df) -> {
-                reRegisterHandle(df);
-            });            
-        }
-        return getIdentifier(dvObject);
-    }
-
-    @Override
-    public void deleteIdentifier(DvObject dvObject) throws Exception  {
-        String handle = getDvObjectHandle(dvObject);
-        String authHandle = getAuthenticationHandle(dvObject);
-
-        String adminCredFile = System.getProperty("dataverse.handlenet.admcredfile");
-        int handlenetIndex = System.getProperty("dataverse.handlenet.index")!=null? Integer.parseInt(System.getProperty("dataverse.handlenet.index")) : 300;
-       
-        byte[] key = readKey(adminCredFile);
-        PrivateKey privkey = readPrivKey(key, adminCredFile);
-
-        HandleResolver resolver = new HandleResolver();
-        resolver.setSessionTracker(new ClientSessionTracker());
-
-        PublicKeyAuthenticationInfo auth =
-                new PublicKeyAuthenticationInfo(Util.encodeString(authHandle), handlenetIndex, privkey);
-
-        DeleteHandleRequest req =
-                new DeleteHandleRequest(Util.encodeString(handle), auth);
-        AbstractResponse response=null;
-        try {
-            response = resolver.processRequest(req);
-        } catch (HandleException ex) {
-            ex.printStackTrace();
-        }
-        if(response==null || response.responseCode!=AbstractMessage.RC_SUCCESS) {
-            logger.fine("error deleting '"+handle+"': "+response);
-        } else {
-            logger.fine("deleted "+handle);
-        }
-    }
-
-    private boolean updateIdentifierStatus(DvObject dvObject, String statusIn) {
-        logger.log(Level.FINE,"updateIdentifierStatus");
-        reRegisterHandle(dvObject); // No Need to register new - this is only called when a handle exists
-        return true;
-    }
-    
-    @Override
-    public List<String> getProviderInformation(){
-        ArrayList <String> providerInfo = new ArrayList<>();
-        String providerName = "Handle";
-        String providerLink = "https://hdl.handle.net";
-        providerInfo.add(providerName);
-        providerInfo.add(providerLink);
-        return providerInfo;
-    }
-
-
-    @Override
-    public String createIdentifier(DvObject dvObject) throws Throwable {
-        Throwable result = registerNewHandle(dvObject);
-        if (result != null)
-            throw result;
-        // TODO get exceptions from under the carpet
-        return getDvObjectHandle(dvObject);
-
-    }
-
-
-    @Override
-    public boolean publicizeIdentifier(DvObject dvObject) {
-        if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()){
-            generateIdentifier(dvObject);
-        }
-        return updateIdentifierStatus(dvObject, "public");
-
-    }
-
-}
-
-
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java b/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java
index c0d7ed01c8e..1effd137e0e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java
@@ -9,7 +9,6 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateHarvestingClientCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteHarvestingClientCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateHarvestingClientCommand;
 import edu.harvard.iq.dataverse.harvest.client.HarvesterServiceBean;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
@@ -20,25 +19,26 @@
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
+import edu.harvard.iq.dataverse.util.StringUtil;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
+import java.util.Collections;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.model.SelectItem;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.model.SelectItem;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -77,7 +77,8 @@ public class HarvestingClientsPage implements java.io.Serializable {
     private Dataverse dataverse;
     private Long dataverseId = null;
     private HarvestingClient selectedClient;
-    
+    private boolean setListTruncated = false;
+
     //private static final String solrDocIdentifierDataset = "dataset_";
     
     public enum PageMode {
@@ -206,6 +207,9 @@ public boolean isCreateStepFour() {
         return CreateStep.FOUR == this.createStep;
     }
     
+    public boolean isSetListTruncated() {
+        return setListTruncated;
+    }
     
     public void runHarvest(HarvestingClient harvestingClient) {
         try {
@@ -238,7 +242,9 @@ public void editClient(HarvestingClient harvestingClient) {
         setSelectedClient(harvestingClient);
         
         this.newNickname = harvestingClient.getName();
+        this.sourceName = harvestingClient.getSourceName();
         this.newHarvestingUrl = harvestingClient.getHarvestingUrl();
+        this.customHeader = harvestingClient.getCustomHttpHeaders();
         this.initialSettingsValidated = false;
         
         // TODO: do we want to try and contact the server, again, to make 
@@ -246,7 +252,7 @@ public void editClient(HarvestingClient harvestingClient) {
         // and if not, what do we do? 
         // alternatively, should we make these 2 fields not editable at all?
         
-        this.newOaiSet = !StringUtils.isEmpty(harvestingClient.getHarvestingSet()) ? harvestingClient.getHarvestingSet() : "none";
+        this.newOaiSet = !StringUtils.isEmpty(harvestingClient.getHarvestingSet()) ? harvestingClient.getHarvestingSet() : "";
         this.newMetadataFormat = harvestingClient.getMetadataPrefix();
         this.newHarvestingStyle = harvestingClient.getHarvestStyle();
         
@@ -318,10 +324,9 @@ public void deleteClient() {
     }
     
     public void createClient(ActionEvent ae) {
-        
-        HarvestingClient newHarvestingClient = new HarvestingClient(); // will be set as type OAI by default
-        
-        newHarvestingClient.setName(newNickname);
+
+        // will be set as type OAI by default
+        HarvestingClient newHarvestingClient = fillHarvestingClient(new HarvestingClient());
         
         if (getSelectedDestinationDataverse() == null) {
             JsfHelper.JH.addMessage(FacesMessage.SEVERITY_ERROR,BundleUtil.getStringFromBundle("harvest.create.error"));
@@ -333,34 +338,6 @@ public void createClient(ActionEvent ae) {
         }
         getSelectedDestinationDataverse().getHarvestingClientConfigs().add(newHarvestingClient);
         
-        newHarvestingClient.setHarvestingUrl(newHarvestingUrl);
-        if (!StringUtils.isEmpty(newOaiSet)) {
-            newHarvestingClient.setHarvestingSet(newOaiSet);
-        }
-        newHarvestingClient.setMetadataPrefix(newMetadataFormat);
-        newHarvestingClient.setHarvestStyle(newHarvestingStyle);
-        
-        if (isNewHarvestingScheduled()) {
-            newHarvestingClient.setScheduled(true);
-            
-            if (isNewHarvestingScheduledWeekly()) {
-                newHarvestingClient.setSchedulePeriod(HarvestingClient.SCHEDULE_PERIOD_WEEKLY);
-                if (getWeekDayNumber() == null) {
-                    // create a "week day is required..." error message, etc. 
-                    // but we may be better off not even giving them an opportunity 
-                    // to leave the field blank - ?
-                }
-                newHarvestingClient.setScheduleDayOfWeek(getWeekDayNumber());
-            } else {
-                newHarvestingClient.setSchedulePeriod(HarvestingClient.SCHEDULE_PERIOD_DAILY);
-            }
-            
-            if (getHourOfDay() == null) {
-                // see the comment above, about the day of week. same here.
-            }
-            newHarvestingClient.setScheduleHourOfDay(getHourOfDay());
-        }
-        
         // make default archive url (used to generate links pointing back to the 
         // archival sources, when harvested datasets are displayed in search results),
         // from the harvesting url:
@@ -406,50 +383,9 @@ public void createClient(ActionEvent ae) {
     // this saves an existing client that the user has edited: 
     
     public void saveClient(ActionEvent ae) {
-        
-        HarvestingClient harvestingClient = getSelectedClient(); 
-        
-        if (harvestingClient == null) {
-            // TODO: 
-            // tell the user somehow that the client cannot be saved, and advise
-            // them to save the settings they have entered. 
-            // as of now - we will show an error message, but only after the 
-            // edit form has been closed.        
-        }
-        
-        // nickname is not editable for existing clients:
-        //harvestingClient.setName(newNickname);
-        harvestingClient.setHarvestingUrl(newHarvestingUrl);
-        harvestingClient.setHarvestingSet(newOaiSet);
-        harvestingClient.setMetadataPrefix(newMetadataFormat);
-        harvestingClient.setHarvestStyle(newHarvestingStyle);
-        
-        if (isNewHarvestingScheduled()) {
-            harvestingClient.setScheduled(true);
-            
-            if (isNewHarvestingScheduledWeekly()) {
-                harvestingClient.setSchedulePeriod(HarvestingClient.SCHEDULE_PERIOD_WEEKLY);
-                if (getWeekDayNumber() == null) {
-                    // create a "week day is required..." error message, etc. 
-                    // but we may be better off not even giving them an opportunity 
-                    // to leave the field blank - ?
-                }
-                harvestingClient.setScheduleDayOfWeek(getWeekDayNumber());
-            } else {
-                harvestingClient.setSchedulePeriod(HarvestingClient.SCHEDULE_PERIOD_DAILY);
-            }
-            
-            if (getHourOfDay() == null) {
-                // see the comment above, about the day of week. same here.
-            }
-            harvestingClient.setScheduleHourOfDay(getHourOfDay());
-        } else {
-            harvestingClient.setScheduled(false);
-        }
-        
-        // will try to save it now:
-        
         try {
+            HarvestingClient harvestingClient = fillHarvestingClient(getSelectedClient());
+
             harvestingClient = engineService.submit( new UpdateHarvestingClientCommand(dvRequestService.getDataverseRequest(), harvestingClient));
             
             configuredHarvestingClients = harvestingClientService.getAllHarvestingClients();
@@ -470,9 +406,50 @@ public void saveClient(ActionEvent ae) {
         }
         setPageMode(PageMode.VIEW);
 
-        
+
     }
-    
+
+    /**
+     * Based on a new harvestingClient instance or an existing one, it will update basics fields with new UI fields values
+     * @param harvestingClient new or existing harvestingClient to update
+     * @return harvestingClient with updated values
+     */
+    private HarvestingClient fillHarvestingClient(HarvestingClient harvestingClient) {
+        // update nickname if it's a new object otherwise is not editable for existing clients
+        if(harvestingClient.getId() == null) {
+            harvestingClient.setName(newNickname);
+        }
+        harvestingClient.setSourceName(sourceName);
+        harvestingClient.setHarvestingUrl(newHarvestingUrl);
+        harvestingClient.setCustomHttpHeaders(customHeader);
+        if (!StringUtils.isEmpty(newOaiSet)) {
+            harvestingClient.setHarvestingSet(newOaiSet);
+        }
+        harvestingClient.setMetadataPrefix(newMetadataFormat);
+        harvestingClient.setHarvestStyle(newHarvestingStyle);
+
+        harvestingClient.setScheduled(isNewHarvestingScheduled());
+        if (isNewHarvestingScheduled()) {
+            if (isNewHarvestingScheduledWeekly()) {
+                harvestingClient.setSchedulePeriod(HarvestingClient.SCHEDULE_PERIOD_WEEKLY);
+                if (getWeekDayNumber() == null) {
+                    // create a "week day is required..." error message, etc.
+                    // but we may be better off not even giving them an opportunity
+                    // to leave the field blank - ?
+                }
+                harvestingClient.setScheduleDayOfWeek(getWeekDayNumber());
+            } else {
+                harvestingClient.setSchedulePeriod(HarvestingClient.SCHEDULE_PERIOD_DAILY);
+            }
+
+            if (getHourOfDay() == null) {
+                // see the comment above, about the day of week. same here.
+            }
+            harvestingClient.setScheduleHourOfDay(getHourOfDay());
+        }
+        return harvestingClient;
+    }
+
     public void validateMetadataFormat(FacesContext context, UIComponent toValidate, Object rawValue) {
         String value = (String) rawValue;
         UIInput input = (UIInput) toValidate;
@@ -492,6 +469,23 @@ public void validateMetadataFormat(FacesContext context, UIComponent toValidate,
         }
     }
     
+    public void validateRemoteArchiveStyle(FacesContext context, UIComponent toValidate, Object rawValue) {
+        String value = (String) rawValue;
+        UIInput input = (UIInput) toValidate;
+        input.setValid(true); // Optimistic approach
+        
+        // the only validation we want is to make sure the select one of the 
+        // values from the menu. 
+        if (context.getExternalContext().getRequestParameterMap().get("DO_VALIDATION") != null
+                && StringUtils.isEmpty(value)) {
+
+            input.setValid(false);
+            context.addMessage(toValidate.getClientId(),
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.harvestingStyle.required")));
+
+        }
+    }
+    
     public boolean validateNickname() {
 
         if ( !StringUtils.isEmpty(getNewNickname()) ) {
@@ -531,6 +525,9 @@ public boolean validateServerUrlOAI() {
         if (!StringUtils.isEmpty(getNewHarvestingUrl())) {
 
             OaiHandler oaiHandler = new OaiHandler(getNewHarvestingUrl());
+            if (getNewCustomHeader() != null) {
+                oaiHandler.setCustomHeaders(oaiHandler.makeCustomHeaders(getNewCustomHeader()));
+            }
             boolean success = true;
             String message = null;
 
@@ -559,10 +556,15 @@ public boolean validateServerUrlOAI() {
             }
             // And if that worked, the list of sets provided:
 
+            ArrayList<String> sets = null;
+            
+            // reset the sets menu:
+            setOaiSetsSelectItems(null);
+            setListTruncated = false;
+            
             if (success) {
                 try {
-                    List<String> sets = oaiHandler.runListSets();
-                    createOaiSetsSelectItems(sets);
+                    sets = oaiHandler.runListSets();
                 } catch (Exception ex) {
                     //success = false; 
                     // ok - we'll try and live without sets for now... 
@@ -576,6 +578,24 @@ public boolean validateServerUrlOAI() {
             }
 
             if (success) {
+                if (sets != null) {
+                    if (oaiHandler.isSetListTruncated()) {
+                        // If it was taking too long to retrieve the full list 
+                        // of sets (oai.datacite.org/oai - looking at you! -
+                        // and we had to truncate it:
+                        setListTruncated = true;
+
+                        // And if we are re-configuring an existing client, with 
+                        // a specific set in place - let's make sure it's on the pull down 
+                        // menu list; even if we have failed to retrieve it from the server. 
+                        if (StringUtil.nonEmpty(this.newOaiSet)) {
+                            if (!sets.contains(this.newOaiSet)) {
+                                sets.add(0, this.newOaiSet);
+                            }
+                        }
+                    }
+                    createOaiSetsSelectItems(sets);
+                }
                 return true;
             }
 
@@ -589,6 +609,23 @@ public boolean validateServerUrlOAI() {
         return false;
     }
     
+    public boolean validateCustomHeader() {
+        if (!StringUtils.isEmpty(getNewCustomHeader())) {
+            // TODO: put this method somewhere else as a static utility
+            
+            // check that it's looking like "{header-name}: {header value}" at least
+            if (!Pattern.matches("^[a-zA-Z0-9\\_\\-]+:.*",getNewCustomHeader())) {
+                FacesContext.getCurrentInstance().addMessage(getNewClientCustomHeaderInputField().getClientId(),
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.customHeader.invalid")));
+
+                return false; 
+            }
+        }
+        
+        // this setting is optional
+        return true;
+    }
+    
     public void validateInitialSettings() {
         if (isHarvestTypeOAI()) {
             boolean nicknameValidated = true; 
@@ -598,9 +635,10 @@ public void validateInitialSettings() {
                 destinationDataverseValidated = validateSelectedDataverse();
             }
             boolean urlValidated = validateServerUrlOAI();
+            boolean customHeaderValidated = validateCustomHeader();
             
-            if (nicknameValidated && destinationDataverseValidated && urlValidated) {
-                // In Create mode we want to run all 3 validation tests; this is why 
+            if (nicknameValidated && destinationDataverseValidated && urlValidated && customHeaderValidated) {
+                // In Create mode we want to run all 4 validation tests; this is why 
                 // we are not doing "if ((validateNickname() && validateServerUrlOAI())"
                 // in the line above. -- L.A. 4.4 May 2016.
                 
@@ -642,12 +680,16 @@ public void backToStepThree() {
     
     UIInput newClientNicknameInputField;
     UIInput newClientUrlInputField;
+    UIInput newClientCustomHeaderInputField; 
     UIInput hiddenInputField; 
-    /*UISelectOne*/ UIInput metadataFormatMenu; 
+    /*UISelectOne*/ UIInput metadataFormatMenu;
+    UIInput remoteArchiveStyleMenu;
     UIInput selectedDataverseMenu;
     
     private String newNickname = "";
+    private String sourceName = "";
     private String newHarvestingUrl = "";
+    private String customHeader = null; 
     private boolean initialSettingsValidated = false;
     private String newOaiSet = "";
     private String newMetadataFormat = ""; 
@@ -670,11 +712,13 @@ public void backToStepThree() {
     public void initNewClient(ActionEvent ae) {
         //this.selectedClient = new HarvestingClient();
         this.newNickname = "";
+        this.sourceName = "";
         this.newHarvestingUrl = "";
+        this.customHeader = null; 
         this.initialSettingsValidated = false;
         this.newOaiSet = "";
         this.newMetadataFormat = "";
-        this.newHarvestingStyle = HarvestingClient.HARVEST_STYLE_DATAVERSE;
+        this.newHarvestingStyle = "";
         
         this.harvestTypeRadio = harvestTypeRadioOAI;
         this.harvestingScheduleRadio = harvestingScheduleRadioNone; 
@@ -715,6 +759,14 @@ public void setNewHarvestingUrl(String newHarvestingUrl) {
         this.newHarvestingUrl = newHarvestingUrl;
     }
     
+    public String getNewCustomHeader() {
+        return customHeader; 
+    }
+    
+    public void setNewCustomHeader(String customHeader) {
+        this.customHeader = customHeader;
+    }
+    
     public int getHarvestTypeRadio() {
         return this.harvestTypeRadio;
     }
@@ -762,6 +814,14 @@ public int getHarvestingScheduleRadio() {
     public void setHarvestingScheduleRadio(int harvestingScheduleRadio) {
         this.harvestingScheduleRadio = harvestingScheduleRadio;
     }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
     
     public boolean isNewHarvestingScheduled() {
         return this.harvestingScheduleRadio != harvestingScheduleRadioNone;
@@ -824,6 +884,14 @@ public void setNewClientUrlInputField(UIInput newClientInputField) {
         this.newClientUrlInputField = newClientInputField;
     }
     
+    public UIInput getNewClientCustomHeaderInputField() {
+        return newClientCustomHeaderInputField;
+    }
+
+    public void setNewClientCustomHeaderInputField(UIInput newClientInputField) {
+        this.newClientCustomHeaderInputField = newClientInputField;
+    }
+    
     public UIInput getHiddenInputField() {
         return hiddenInputField;
     }
@@ -840,6 +908,14 @@ public void setMetadataFormatMenu(UIInput metadataFormatMenu) {
         this.metadataFormatMenu = metadataFormatMenu;
     }
     
+    public UIInput getRemoteArchiveStyleMenu() {
+        return remoteArchiveStyleMenu;
+    }
+
+    public void setRemoteArchiveStyleMenu(UIInput remoteArchiveStyleMenu) {
+        this.remoteArchiveStyleMenu = remoteArchiveStyleMenu;
+    }
+    
     public UIInput getSelectedDataverseMenu() {
         return selectedDataverseMenu;
     }
@@ -861,6 +937,12 @@ public void setOaiSetsSelectItems(List<SelectItem> oaiSetsSelectItems) {
     private void createOaiSetsSelectItems(List<String> setNames) {
         setOaiSetsSelectItems(new ArrayList<>());
         if (setNames != null) {
+            
+            // Let's sort the list - otherwise, if the list is long enough, 
+            // using this pulldown menu may be very difficult:
+            
+            Collections.sort(setNames, String.CASE_INSENSITIVE_ORDER);
+            
             for (String set: setNames) {
                 if (!StringUtils.isEmpty(set)) {
                     getOaiSetsSelectItems().add(new SelectItem(set, set));
diff --git a/src/main/java/edu/harvard/iq/dataverse/HarvestingDataverseConfig.java b/src/main/java/edu/harvard/iq/dataverse/HarvestingDataverseConfig.java
index 28df6e19e65..6709b978c47 100644
--- a/src/main/java/edu/harvard/iq/dataverse/HarvestingDataverseConfig.java
+++ b/src/main/java/edu/harvard/iq/dataverse/HarvestingDataverseConfig.java
@@ -6,16 +6,16 @@
 package edu.harvard.iq.dataverse;
 
 import java.io.Serializable;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java b/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java
index 496050ca7f4..0b66b652e0c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java
@@ -6,11 +6,6 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.CreateHarvestingClientCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateHarvestingClientCommand;
-import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
-import edu.harvard.iq.dataverse.harvest.client.HarvestingClientServiceBean;
 import edu.harvard.iq.dataverse.harvest.server.OAIRecord;
 import edu.harvard.iq.dataverse.harvest.server.OAIRecordServiceBean;
 import edu.harvard.iq.dataverse.harvest.server.OAISet;
@@ -26,16 +21,18 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -249,7 +246,7 @@ public void createSet(ActionEvent ae) {
         newOaiSet.setDefinition(getNewSetQuery());
         
         boolean success = false;
-        
+        //TODO: Consider putting this in a command that could be used by api as well
         try {
             oaiSetService.save(newOaiSet);
             configuredHarvestingSets = oaiSetService.findAll();  
@@ -292,7 +289,7 @@ public void saveSet(ActionEvent ae) {
         
         // will try to save it now:
         boolean success = false; 
-        
+        //TODO: Consider putting this in a command that could be used by api as well
         try {
             oaiSetService.save(oaiSet);
             configuredHarvestingSets = oaiSetService.findAll(); 
@@ -318,6 +315,7 @@ public void saveSet(ActionEvent ae) {
     }
     
     public void deleteSet() {
+        //TODO: Consider putting this in a command that could be used by api as well
         if (selectedSet != null) {
             logger.info("proceeding to delete harvesting set "+ selectedSet.getSpec());
             try {
@@ -434,44 +432,92 @@ public boolean isSessionUserAuthenticated() {
         return false;
     }
     
+    // The numbers of datasets and deleted/exported records below are used 
+    // in rendering rules on the page. They absolutely need to be cached
+    // on the first lookup. 
+    
+    Map<String, Integer> cachedSetInfoNumDatasets = new HashMap<>();
+    
     public int getSetInfoNumOfDatasets(OAISet oaiSet) {
         if (oaiSet.isDefaultSet()) {
             return getSetInfoNumOfExported(oaiSet);
         }
         
+        if (cachedSetInfoNumDatasets.get(oaiSet.getSpec()) != null) {
+            return cachedSetInfoNumDatasets.get(oaiSet.getSpec());
+        }
+        
         String query = oaiSet.getDefinition();
         
         try {
             int num = oaiSetService.validateDefinitionQuery(query);
             if (num > -1) {
+                cachedSetInfoNumDatasets.put(oaiSet.getSpec(), num);
                 return num;
             }
         } catch (OaiSetException ose) {
-            // do notghin - will return zero.
+            // do nothing - will return zero.
         }
+        cachedSetInfoNumDatasets.put(oaiSet.getSpec(), 0);
         return 0;
     }
     
+    Map<String, Integer> cachedSetInfoNumExported = new HashMap<>();
+    Integer defaultSetNumExported = null; 
+    
     public int getSetInfoNumOfExported(OAISet oaiSet) {
+        if (oaiSet.isDefaultSet() && defaultSetNumExported != null) {
+            return defaultSetNumExported;
+        } else if (cachedSetInfoNumExported.get(oaiSet.getSpec()) != null) {
+            return cachedSetInfoNumExported.get(oaiSet.getSpec());
+        }
+        
         List<OAIRecord> records = oaiRecordService.findActiveOaiRecordsBySetName(oaiSet.getSpec());
         
+        int num; 
+        
         if (records == null || records.isEmpty()) {
-            return 0; 
+            num = 0; 
+        } else {
+            num = records.size();
         }
         
-        return records.size();
+        if (oaiSet.isDefaultSet()) {
+            defaultSetNumExported = num;
+        } else {
+            cachedSetInfoNumExported.put(oaiSet.getSpec(), num);
+        }
         
+        return num;
     }
     
+    Map<String, Integer> cachedSetInfoNumDeleted = new HashMap<>();
+    Integer defaultSetNumDeleted = null;
+    
     public int getSetInfoNumOfDeleted(OAISet oaiSet) {
+        if (oaiSet.isDefaultSet() && defaultSetNumDeleted != null) {
+            return defaultSetNumDeleted;
+        } else if (cachedSetInfoNumDeleted.get(oaiSet.getSpec()) != null) {
+            return cachedSetInfoNumDeleted.get(oaiSet.getSpec());
+        }
+        
         List<OAIRecord> records = oaiRecordService.findDeletedOaiRecordsBySetName(oaiSet.getSpec());
         
+        int num; 
+        
         if (records == null || records.isEmpty()) {
-            return 0; 
+            num = 0; 
+        } else {
+            num = records.size();
         }
         
-        return records.size();
+        if (oaiSet.isDefaultSet()) {
+            defaultSetNumDeleted = num;
+        } else {
+            cachedSetInfoNumDeleted.put(oaiSet.getSpec(), num);
+        }
         
+        return num;
     }
     
     public void validateSetQuery() {
diff --git a/src/main/java/edu/harvard/iq/dataverse/HomepageServlet.java b/src/main/java/edu/harvard/iq/dataverse/HomepageServlet.java
index ef9b3267db4..e1864194436 100644
--- a/src/main/java/edu/harvard/iq/dataverse/HomepageServlet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/HomepageServlet.java
@@ -7,12 +7,12 @@
 
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import java.io.IOException;
-import javax.ejb.EJB;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ejb.EJB;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/LazyFileMetadataDataModel.java b/src/main/java/edu/harvard/iq/dataverse/LazyFileMetadataDataModel.java
deleted file mode 100644
index 2ba05224c75..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/LazyFileMetadataDataModel.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.ejb.EJB;
-import org.primefaces.model.LazyDataModel;
-import org.primefaces.model.SortOrder;
-
-/**
- *
- * @author skraffmi
- */
-public class LazyFileMetadataDataModel extends LazyDataModel<FileMetadata> {
-    
-    private final DataFileServiceBean fileServiceBean;
-    private final Long datasetVersionId;
-
-    public LazyFileMetadataDataModel(Long datasetVersionId, DataFileServiceBean fileServiceBean) {
-        this.fileServiceBean = fileServiceBean;
-        this.datasetVersionId = datasetVersionId;
-    }
-    
-    
-    @Override
-    public List<FileMetadata> load(int first, int pageSize, String sortField,
-            SortOrder sortOrder, Map<String, Object> filters) {
-
-        List<FileMetadata>  listFileMetadata = null; //fileServiceBean.findFileMetadataByDatasetVersionIdLazy(datasetVersionId, pageSize, sortField, sortField, first);
-        //this.setRowCount(fileServiceBean.findCountByDatasetVersionId(datasetVersionId).intValue());
-        return listFileMetadata;
-    }
-    
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/LinkValidator.java b/src/main/java/edu/harvard/iq/dataverse/LinkValidator.java
index 2ecfc55f67e..7d540f0a425 100644
--- a/src/main/java/edu/harvard/iq/dataverse/LinkValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/LinkValidator.java
@@ -5,13 +5,13 @@
  */
 package edu.harvard.iq.dataverse;
 
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.FacesValidator;
+import jakarta.faces.validator.Validator;
+import jakarta.faces.validator.ValidatorException;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 
 @FacesValidator(value = "linkValidator")
diff --git a/src/main/java/edu/harvard/iq/dataverse/LoginPage.java b/src/main/java/edu/harvard/iq/dataverse/LoginPage.java
index dc2ccb552e2..16d2cc53cb9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/LoginPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/LoginPage.java
@@ -7,32 +7,29 @@
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.CredentialsAuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.exceptions.AuthenticationFailedException;
+import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
-import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
-import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
+
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.faces.validator.ValidatorException;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.faces.validator.ValidatorException;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  *
@@ -129,16 +126,20 @@ public List<AuthenticationProviderDisplayInfo> listCredentialsAuthenticationProv
         return infos;
     }
     
+    /**
+     * Retrieve information about all enabled identity providers in a sorted order to be displayed to the user.
+     * @return list of display information for each provider
+     */
     public List<AuthenticationProviderDisplayInfo> listAuthenticationProviders() {
         List<AuthenticationProviderDisplayInfo> infos = new LinkedList<>();
-        for (String id : authSvc.getAuthenticationProviderIdsSorted()) {
-            AuthenticationProvider authenticationProvider = authSvc.getAuthenticationProvider(id);
-            if (authenticationProvider != null) {
-                if (ShibAuthenticationProvider.PROVIDER_ID.equals(authenticationProvider.getId())) {
-                    infos.add(authenticationProvider.getInfo());
-                } else {
-                    infos.add(authenticationProvider.getInfo());
-                }
+        List<AuthenticationProvider> idps = new ArrayList<>(authSvc.getAuthenticationProviders());
+        
+        // sort by order first. in case of same order values, be deterministic in UI and sort by id, too.
+        Collections.sort(idps, Comparator.comparing(AuthenticationProvider::getOrder).thenComparing(AuthenticationProvider::getId));
+        
+        for (AuthenticationProvider idp : idps) {
+            if (idp != null) {
+                infos.add(idp.getInfo());
             }
         }
         return infos;
@@ -163,13 +164,12 @@ public String login() {
         for ( FilledCredential fc : filledCredentialsList ) {       
             authReq.putCredential(fc.getCredential().getKey(), fc.getValue());
         }
+
         authReq.setIpAddress( dvRequestService.getDataverseRequest().getSourceAddress() );
         try {
             AuthenticatedUser r = authSvc.getUpdateAuthenticatedUser(credentialsAuthProviderId, authReq);
             logger.log(Level.FINE, "User authenticated: {0}", r.getEmail());
             session.setUser(r);
-            session.configureSessionTimeout();
-            
             if ("dataverse.xhtml".equals(redirectPage)) {
                 redirectPage = redirectToRoot();
             }
@@ -204,6 +204,7 @@ public String login() {
                     logger.log( Level.WARNING, "Error logging in: " + response.getMessage(), response.getError() );
                     return null;
                 case BREAKOUT:
+                    FacesContext.getCurrentInstance().getExternalContext().getFlash().put("silentUpgradePasswd",authReq.getCredential(BuiltinAuthenticationProvider.KEY_PASSWORD));
                     return response.getMessage();
                 default:
                     JsfHelper.addErrorMessage("INTERNAL ERROR");
diff --git a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
index 0397d795798..569bb82ff80 100644
--- a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
@@ -5,41 +5,47 @@
  */
 package edu.harvard.iq.dataverse;
 
-import com.sun.mail.smtp.SMTPSendFailedException;
 import edu.harvard.iq.dataverse.authorization.groups.Group;
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.MailUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
 import java.io.UnsupportedEncodingException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.Properties;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.List;
-import java.util.ResourceBundle;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.mail.Address;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
+
+import edu.harvard.iq.dataverse.validation.EMailValidator;
+import jakarta.json.JsonObject;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -67,7 +73,7 @@ public class MailServiceBean implements java.io.Serializable {
     GroupServiceBean groupService;
     @EJB
     ConfirmEmailServiceBean confirmEmailService;
-    
+
     private static final Logger logger = Logger.getLogger(MailServiceBean.class.getCanonicalName());
 
     private static final String charset = "UTF-8";
@@ -77,140 +83,156 @@ public class MailServiceBean implements java.io.Serializable {
      */
     public MailServiceBean() {
     }
-
-    public void sendMail(String host, String reply, String to, String subject, String messageText) {
-        Properties props = System.getProperties();
-        props.put("mail.smtp.host", host);
-        Session session = Session.getDefaultInstance(props, null);
-
-        try {
-            MimeMessage msg = new MimeMessage(session);
-            String[] recipientStrings = to.split(",");
-            InternetAddress[] recipients = new InternetAddress[recipientStrings.length];
-            try {
-            	InternetAddress fromAddress=getSystemAddress();
-            	fromAddress.setPersonal(BundleUtil.getStringFromBundle("contact.delegation", Arrays.asList(
-                        fromAddress.getPersonal(), reply)), charset);
-            	msg.setFrom(fromAddress);
-                msg.setReplyTo(new Address[] {new InternetAddress(reply, charset)});
-                for (int i = 0; i < recipients.length; i++) {
-                    recipients[i] = new InternetAddress(recipientStrings[i], "", charset);
-                }
-            } catch (UnsupportedEncodingException ex) {
-                logger.severe(ex.getMessage());
-            }
-            msg.setRecipients(Message.RecipientType.TO, recipients);
-            msg.setSubject(subject, charset);
-            msg.setText(messageText, charset);
-            Transport.send(msg, recipients);
-        } catch (AddressException ae) {
-            ae.printStackTrace(System.out);
-        } catch (MessagingException me) {
-            me.printStackTrace(System.out);
-        }
-    }
     
-    @Resource(name = "mail/notifyMailSession")
+    /**
+     * Creates a new instance of MailServiceBean with explicit injection, as used during testing.
+     */
+    public MailServiceBean(Session session, SettingsServiceBean settingsService) {
+        this.session = session;
+        this.settingsService = settingsService;
+    }
+
+    @Inject
+    @Named("mail/systemSession")
     private Session session;
 
     public boolean sendSystemEmail(String to, String subject, String messageText) {
         return sendSystemEmail(to, subject, messageText, false);
     }
-
+    
+    /**
+     * Send a system notification to one or multiple recipients by email.
+     * Will skip sending when {@link #getSystemAddress()} doesn't return a configured "from" address.
+     * @param to A comma separated list of one or multiple recipients' addresses. May contain a "personal name" and
+     *           the recipients address in &lt;&gt;. See also {@link InternetAddress}.
+     * @param subject The message's subject
+     * @param messageText The message's text
+     * @param isHtmlContent Determine if the message text is formatted using HTML or plain text.
+     * @return Status: true if sent successfully, false otherwise
+     */
     public boolean sendSystemEmail(String to, String subject, String messageText, boolean isHtmlContent) {
+        Optional<InternetAddress> optionalAddress = getSystemAddress();
+        if (optionalAddress.isEmpty()) {
+            logger.fine(() -> "Skipping sending mail to " + to + ", because no system address has been set.");
+            return false;
+        }
+        InternetAddress systemAddress = optionalAddress.get();
+        InternetAddress supportAddress = getSupportAddress().orElse(systemAddress);
 
+        String body = messageText +
+            BundleUtil.getStringFromBundle(isHtmlContent ? "notification.email.closing.html" : "notification.email.closing",
+                List.of(BrandingUtil.getSupportTeamEmailAddress(supportAddress), BrandingUtil.getSupportTeamName(supportAddress)));
 
-        boolean sent = false;
-        String rootDataverseName = dataverseService.findRootDataverse().getName();
-        InternetAddress systemAddress = getSystemAddress();
-        String body = messageText + BundleUtil.getStringFromBundle("notification.email.closing", Arrays.asList(BrandingUtil.getSupportTeamEmailAddress(systemAddress), BrandingUtil.getSupportTeamName(systemAddress, rootDataverseName)));
-        logger.fine("Sending email to " + to + ". Subject: <<<" + subject + ">>>. Body: " + body);
+        logger.fine(() -> "Sending email to %s. Subject: <<<%s>>>. Body: %s".formatted(to, subject, body));
         try {
+            // Since JavaMail 1.6, we have support for UTF-8 mail addresses and do not need to handle these ourselves.
+            InternetAddress[] recipients = InternetAddress.parse(to);
+            
             MimeMessage msg = new MimeMessage(session);
-            if (systemAddress != null) {
-                msg.setFrom(systemAddress);
-                msg.setSentDate(new Date());
-                String[] recipientStrings = to.split(",");
-                InternetAddress[] recipients = new InternetAddress[recipientStrings.length];
-                for (int i = 0; i < recipients.length; i++) {
-                    try {
-                        recipients[i] = new InternetAddress(recipientStrings[i], "", charset);
-                    } catch (UnsupportedEncodingException ex) {
-                        logger.severe(ex.getMessage());
-                    }
-                }
-                msg.setRecipients(Message.RecipientType.TO, recipients);
-                msg.setSubject(subject, charset);
-                if (isHtmlContent) {
-                    msg.setText(body, charset, "html");
-                } else {
-                    msg.setText(body, charset);
-                }
-
-                try {
-                    Transport.send(msg, recipients);
-                    sent = true;
-                } catch (SMTPSendFailedException ssfe) {
-                    logger.warning("Failed to send mail to: " + to);
-                    logger.warning("SMTPSendFailedException Message: " + ssfe);
-                }
+            msg.setFrom(systemAddress);
+            msg.setSentDate(new Date());
+            msg.setRecipients(Message.RecipientType.TO, recipients);
+            msg.setSubject(subject, charset);
+            if (isHtmlContent) {
+                msg.setText(body, charset, "html");
             } else {
-                logger.fine("Skipping sending mail to " + to + ", because the \"no-reply\" address not set (" + Key.SystemEmail + " setting).");
+                msg.setText(body, charset);
             }
-        } catch (AddressException ae) {
-            logger.warning("Failed to send mail to " + to);
-            ae.printStackTrace(System.out);
-        } catch (MessagingException me) {
-            logger.warning("Failed to send mail to " + to);
-            me.printStackTrace(System.out);
+            
+            Transport.send(msg, recipients);
+            return true;
+        } catch (MessagingException ae) {
+            logger.log(Level.WARNING, "Failed to send mail to %s: %s".formatted(to, ae.getMessage()), ae);
+            logger.info("When UTF-8 characters in recipients: make sure MTA supports it and JVM option " + JvmSettings.MAIL_MTA_SUPPORT_UTF8.getScopedKey() + "=true");
         }
-        return sent;
+        return false;
     }
     
-    private InternetAddress getSystemAddress() {
-       String systemEmail =  settingsService.getValueForKey(Key.SystemEmail);
-       return MailUtil.parseSystemAddress(systemEmail);
+    /**
+     * Lookup the system mail address ({@code InternetAddress} may contain personal and actual address).
+     * @return The system mail address or an empty {@code Optional} if not configured.
+     */
+    public Optional<InternetAddress> getSystemAddress() {
+        boolean providedByDB = false;
+        String mailAddress = JvmSettings.SYSTEM_EMAIL.lookupOptional().orElse(null);
+        
+        // Try lookup of (deprecated) database setting only if not configured via MPCONFIG
+        if (mailAddress == null) {
+            mailAddress = settingsService.getValueForKey(Key.SystemEmail);
+            // Encourage people to migrate from deprecated setting
+            if (mailAddress != null) {
+                providedByDB = true;
+                logger.warning("The :SystemMail DB setting has been deprecated, please reconfigure using JVM option " + JvmSettings.SYSTEM_EMAIL.getScopedKey());
+            }
+        }
+        
+        try {
+            // Parse and return.
+            return Optional.of(new InternetAddress(Objects.requireNonNull(mailAddress), true));
+        } catch (AddressException e) {
+            logger.log(Level.WARNING, "Could not parse system mail address '%s' provided by %s: "
+                .formatted(providedByDB ? "DB setting" : "JVM option", mailAddress), e);
+        } catch (NullPointerException e) {
+            // Do not pester the logs - no configuration may mean someone wants to disable mail notifications
+            logger.fine("Could not find a system mail setting in database (key :SystemEmail, deprecated) or JVM option '" + JvmSettings.SYSTEM_EMAIL.getScopedKey() + "'");
+        }
+        // We define the system email address as an optional setting, in case people do not want to enable mail
+        // notifications (like in a development context, but might be useful elsewhere, too).
+        return Optional.empty();
     }
-
-    //@Resource(name="mail/notifyMailSession")
-    public void sendMail(String from, String to, String subject, String messageText) {
-        sendMail(from, to, subject, messageText, new HashMap<>());
+    
+    /**
+     * Lookup the support team mail address ({@code InternetAddress} may contain personal and actual address).
+     * Will default to return {@code #getSystemAddress} if not configured.
+     * @return Support team mail address
+     */
+    public Optional<InternetAddress> getSupportAddress() {
+        Optional<String> supportMailAddress = JvmSettings.SUPPORT_EMAIL.lookupOptional();
+        if (supportMailAddress.isPresent()) {
+            try {
+                return Optional.of(new InternetAddress(supportMailAddress.get(), true));
+            } catch (AddressException e) {
+                logger.log(Level.WARNING, "Could not parse support mail address '%s', defaulting to system address: ".formatted(supportMailAddress.get()), e);
+            }
+        }
+        return getSystemAddress();
     }
 
-    public void sendMail(String reply, String to, String subject, String messageText, Map<Object, Object> extraHeaders) {
+    //@Resource(name="mail/notifyMailSession")
+    public void sendMail(String reply, String to, String cc, String subject, String messageText) {
+        Optional<InternetAddress> optionalAddress = getSystemAddress();
+        if (optionalAddress.isEmpty()) {
+            logger.fine(() -> "Skipping sending mail to " + to + ", because no system address has been set.");
+            return;
+        }
+        // Always send from system address to avoid email being blocked
+        InternetAddress fromAddress = optionalAddress.get();
+        
         try {
             MimeMessage msg = new MimeMessage(session);
-            //Always send from system address to avoid email being blocked
-            InternetAddress fromAddress=getSystemAddress();
+            
             try {
-              fromAddress.setPersonal(BundleUtil.getStringFromBundle("contact.delegation", Arrays.asList(
-                      fromAddress.getPersonal(), reply)), charset);
+                setContactDelegation(reply, fromAddress);
             } catch (UnsupportedEncodingException ex) {
                 logger.severe(ex.getMessage());
             }
             msg.setFrom(fromAddress);
-            if (EMailValidator.isEmailValid(reply, null)) {
-            	//But set the reply-to address to direct replies to the requested 'from' party if it is a valid email address	
+            if (EMailValidator.isEmailValid(reply)) {
+            	// But set the reply-to address to direct replies to the requested 'from' party if it is a valid email address
                 msg.setReplyTo(new Address[] {new InternetAddress(reply)});
             } else {
-                //Otherwise include the invalid 'from' address in the message
+                // Otherwise include the invalid 'from' address in the message
                 messageText = "From: " + reply + "\n\n" + messageText;
             }
             msg.setSentDate(new Date());
             msg.setRecipients(Message.RecipientType.TO,
                     InternetAddress.parse(to, false));
+            if (cc != null) {
+                msg.setRecipients(Message.RecipientType.CC, InternetAddress.parse(cc, false));
+            }
             msg.setSubject(subject, charset);
             msg.setText(messageText, charset);
 
-            if (extraHeaders != null) {
-                for (Object key : extraHeaders.keySet()) {
-                    String headerName = key.toString();
-                    String headerValue = extraHeaders.get(key).toString();
-
-                    msg.addHeader(headerName, headerValue);
-                }
-            }
-
             Transport.send(msg);
         } catch (AddressException ae) {
             ae.printStackTrace(System.out);
@@ -218,12 +240,32 @@ public void sendMail(String reply, String to, String subject, String messageText
             me.printStackTrace(System.out);
         }
     }
-    
-    public Boolean sendNotificationEmail(UserNotification notification){  
+
+    /**
+     * Set the contact delegation as "[dataverse team] on behalf of [user email]"
+     * @param reply The user's email address as give via the contact form
+     * @param fromAddress The system email address
+     * @throws UnsupportedEncodingException
+     */
+    public void setContactDelegation(String reply, InternetAddress fromAddress)
+            throws UnsupportedEncodingException {
+        String personal = fromAddress.getPersonal() != null
+            ? fromAddress.getPersonal()
+            : BrandingUtil.getInstallationBrandName() != null
+                ? BrandingUtil.getInstallationBrandName()
+                : BundleUtil.getStringFromBundle("contact.delegation.default_personal");
+        fromAddress.setPersonal(
+            BundleUtil.getStringFromBundle(
+                "contact.delegation",
+                Arrays.asList(personal, reply)),
+            charset
+        );
+    }
+
+    public Boolean sendNotificationEmail(UserNotification notification){
         return sendNotificationEmail(notification, "");
     }
-    
-    
+
     public Boolean sendNotificationEmail(UserNotification notification, String comment) {
         return sendNotificationEmail(notification, comment, null, false);
     }
@@ -232,7 +274,6 @@ public Boolean sendNotificationEmail(UserNotification notification, String comme
         return sendNotificationEmail(notification, comment, null, isHtmlContent);
     }
 
-
     public Boolean sendNotificationEmail(UserNotification notification, String comment, AuthenticatedUser requestor, boolean isHtmlContent){
 
         boolean retval = false;
@@ -241,9 +282,8 @@ public Boolean sendNotificationEmail(UserNotification notification, String comme
            Object objectOfNotification =  getObjectOfNotification(notification);
            if (objectOfNotification != null){
                String messageText = getMessageTextBasedOnNotification(notification, objectOfNotification, comment, requestor);
-               String rootDataverseName = dataverseService.findRootDataverse().getName();
-               String subjectText = MailUtil.getSubjectTextBasedOnNotification(notification, rootDataverseName, objectOfNotification);
-               if (!(messageText.isEmpty() || subjectText.isEmpty())){
+               String subjectText = MailUtil.getSubjectTextBasedOnNotification(notification, objectOfNotification);
+               if (!(StringUtils.isEmpty(messageText) || StringUtils.isEmpty(subjectText))){
                    retval = sendSystemEmail(emailAddress, subjectText, messageText, isHtmlContent);
                } else {
                    logger.warning("Skipping " + notification.getType() +  " notification, because couldn't get valid message");
@@ -255,21 +295,20 @@ public Boolean sendNotificationEmail(UserNotification notification, String comme
             logger.warning("Skipping " + notification.getType() +  " notification, because email address is null");
         }
         return retval;
-        
     }
 
     private String getDatasetManageFileAccessLink(DataFile datafile){
         return  systemConfig.getDataverseSiteUrl() + "/permissions-manage-files.xhtml?id=" + datafile.getOwner().getId();
     } 
-    
+
     private String getDatasetLink(Dataset dataset){        
-        return  systemConfig.getDataverseSiteUrl() + "/dataset.xhtml?persistentId=" + dataset.getGlobalIdString();
+        return  systemConfig.getDataverseSiteUrl() + "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString();
     } 
-    
+
     private String getDatasetDraftLink(Dataset dataset){        
-        return  systemConfig.getDataverseSiteUrl() + "/dataset.xhtml?persistentId=" + dataset.getGlobalIdString() + "&version=DRAFT" + "&faces-redirect=true"; 
+        return  systemConfig.getDataverseSiteUrl() + "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&version=DRAFT" + "&faces-redirect=true"; 
     } 
-    
+
     private String getDataverseLink(Dataverse dataverse){       
         return  systemConfig.getDataverseSiteUrl() + "/dataverse/" + dataverse.getAlias();
     }
@@ -331,20 +370,16 @@ private String getDvObjectTypeString(DvObject d) {
         }
         return "";
     }
-    
+
     public String getMessageTextBasedOnNotification(UserNotification userNotification, Object targetObject){
-        
         return getMessageTextBasedOnNotification(userNotification, targetObject, "");
-            
     }
-    
+
     public String getMessageTextBasedOnNotification(UserNotification userNotification, Object targetObject, String comment) {
         return getMessageTextBasedOnNotification(userNotification, targetObject, comment, null);
-
     }
 
-    public String getMessageTextBasedOnNotification(UserNotification userNotification, Object targetObject, String comment, AuthenticatedUser requestor) {      
-        
+    public String getMessageTextBasedOnNotification(UserNotification userNotification, Object targetObject, String comment, AuthenticatedUser requestor) {
         String messageText = BundleUtil.getStringFromBundle("notification.email.greeting");
         DatasetVersion version;
         Dataset dataset;
@@ -409,12 +444,21 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                 logger.fine(dataverseCreatedMessage);
                 return messageText += dataverseCreatedMessage;
             case REQUESTFILEACCESS:
+                //Notification to those who can grant file access requests on a dataset when a user makes a request
                 DataFile datafile = (DataFile) targetObject;
+                
                 pattern = BundleUtil.getStringFromBundle("notification.email.requestFileAccess");
                 String requestorName = (requestor.getLastName() != null && requestor.getLastName() != null) ? requestor.getFirstName() + " " + requestor.getLastName() : BundleUtil.getStringFromBundle("notification.email.info.unavailable");
                 String requestorEmail = requestor.getEmail() != null ? requestor.getEmail() : BundleUtil.getStringFromBundle("notification.email.info.unavailable"); 
                 String[] paramArrayRequestFileAccess = {datafile.getOwner().getDisplayName(), requestorName, requestorEmail, getDatasetManageFileAccessLink(datafile)};
+                messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html");
                 messageText += MessageFormat.format(pattern, paramArrayRequestFileAccess);
+                FileAccessRequest far = datafile.getAccessRequestForAssignee(requestor);
+                GuestbookResponse gbr = far.getGuestbookResponse();
+                if (gbr != null) {
+                    messageText += MessageFormat.format(
+                        BundleUtil.getStringFromBundle("notification.email.requestFileAccess.guestbookResponse"), gbr.toHtmlFormattedResponse(requestor));
+                }
                 return messageText;
             case GRANTFILEACCESS:
                 dataset = (Dataset) targetObject;
@@ -428,6 +472,12 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                 String[] paramArrayRejectFileAccess = {dataset.getDisplayName(), getDatasetLink(dataset)};
                 messageText += MessageFormat.format(pattern, paramArrayRejectFileAccess);
                 return messageText;
+            case DATASETCREATED:
+                dataset = (Dataset) targetObject;
+                pattern = BundleUtil.getStringFromBundle("notification.email.datasetWasCreated");
+                String[] paramArrayDatasetCreated = {getDatasetLink(dataset), dataset.getDisplayName(), userNotification.getRequestor().getName(), dataset.getOwner().getDisplayName()};
+                messageText += MessageFormat.format(pattern, paramArrayDatasetCreated);
+                return messageText;
             case CREATEDS:
                 version =  (DatasetVersion) targetObject;
                 String datasetCreatedMessage = BundleUtil.getStringFromBundle("notification.email.createDataset", Arrays.asList(
@@ -440,19 +490,6 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                 ));
                 logger.fine(datasetCreatedMessage);
                 return messageText += datasetCreatedMessage;
-            case MAPLAYERUPDATED:
-                version =  (DatasetVersion) targetObject;
-                pattern = BundleUtil.getStringFromBundle("notification.email.worldMap.added");
-                String[] paramArrayMapLayer = {version.getDataset().getDisplayName(), getDatasetLink(version.getDataset())};
-                messageText += MessageFormat.format(pattern, paramArrayMapLayer);
-                return messageText;
-            case MAPLAYERDELETEFAILED:
-                FileMetadata targetFileMetadata = (FileMetadata) targetObject;
-                version =  targetFileMetadata.getDatasetVersion();
-                pattern = BundleUtil.getStringFromBundle("notification.email.maplayer.deletefailed.text");
-                String[] paramArrayMapLayerDelete = {targetFileMetadata.getLabel(), getDatasetLink(version.getDataset())};
-                messageText += MessageFormat.format(pattern, paramArrayMapLayerDelete);
-                return messageText;                   
             case SUBMITTEDDS:
                 version =  (DatasetVersion) targetObject;
                 String mightHaveSubmissionComment = "";              
@@ -481,32 +518,84 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                     version.getDataset().getOwner().getDisplayName(),  getDataverseLink(version.getDataset().getOwner())};
                 messageText += MessageFormat.format(pattern, paramArrayPublishedDataset);
                 return messageText;
+            case PUBLISHFAILED_PIDREG:
+                version =  (DatasetVersion) targetObject;
+                pattern = BundleUtil.getStringFromBundle("notification.email.publishFailedPidReg");
+                String[] paramArrayPublishFailedDatasetPidReg = {version.getDataset().getDisplayName(), getDatasetLink(version.getDataset()), 
+                    version.getDataset().getOwner().getDisplayName(),  getDataverseLink(version.getDataset().getOwner())};
+                messageText += MessageFormat.format(pattern, paramArrayPublishFailedDatasetPidReg);
+                return messageText;
             case RETURNEDDS:
                 version =  (DatasetVersion) targetObject;
                 pattern = BundleUtil.getStringFromBundle("notification.email.wasReturnedByReviewer");
-                
-                String optionalReturnReason = "";
-                /*
-                FIXME
-                Setting up to add single comment when design completed
-                optionalReturnReason = ".";
-                if (comment != null && !comment.isEmpty()) {
-                    optionalReturnReason = ".\n\n" + BundleUtil.getStringFromBundle("wasReturnedReason") + "\n\n" + comment;
-                }
-                */
+
                 String[] paramArrayReturnedDataset = {version.getDataset().getDisplayName(), getDatasetDraftLink(version.getDataset()), 
-                    version.getDataset().getOwner().getDisplayName(),  getDataverseLink(version.getDataset().getOwner()), optionalReturnReason};
+                    version.getDataset().getOwner().getDisplayName(),  getDataverseLink(version.getDataset().getOwner())};
                 messageText += MessageFormat.format(pattern, paramArrayReturnedDataset);
+
+                if (comment != null && !comment.isEmpty()) {
+                    messageText += "\n\n" + MessageFormat.format(BundleUtil.getStringFromBundle("notification.email.wasReturnedByReviewerReason"), comment);
+                }
+
+                Dataverse d = (Dataverse) version.getDataset().getOwner();
+                List<String> contactEmailList = new ArrayList<String>();
+                for (DataverseContact dc : d.getDataverseContacts()) {
+                    contactEmailList.add(dc.getContactEmail());
+                }
+                if (!contactEmailList.isEmpty()) {
+                    String contactEmails = String.join(", ", contactEmailList);
+                    messageText += "\n\n" + MessageFormat.format(BundleUtil.getStringFromBundle("notification.email.wasReturnedByReviewer.collectionContacts"), contactEmails);
+                }
+                return messageText;
+
+            case WORKFLOW_SUCCESS:
+                version =  (DatasetVersion) targetObject;
+                pattern = BundleUtil.getStringFromBundle("notification.email.workflow.success");
+                if (comment == null) {
+                    comment = BundleUtil.getStringFromBundle("notification.email.workflow.nullMessage");
+                }
+                String[] paramArrayWorkflowSuccess = {version.getDataset().getDisplayName(), getDatasetLink(version.getDataset()), comment};
+                messageText += MessageFormat.format(pattern, paramArrayWorkflowSuccess);
+                return messageText;
+            case WORKFLOW_FAILURE:
+                version =  (DatasetVersion) targetObject;
+                pattern = BundleUtil.getStringFromBundle("notification.email.workflow.failure");
+                if (comment == null) {
+                    comment = BundleUtil.getStringFromBundle("notification.email.workflow.nullMessage");
+                }
+                String[] paramArrayWorkflowFailure = {version.getDataset().getDisplayName(), getDatasetLink(version.getDataset()), comment};
+                messageText += MessageFormat.format(pattern, paramArrayWorkflowFailure);
+                return messageText;
+            case STATUSUPDATED:
+                version =  (DatasetVersion) targetObject;
+                pattern = BundleUtil.getStringFromBundle("notification.email.status.change");
+                CurationStatus status = version.getCurationStatusAsOfDate(userNotification.getSendDateTimestamp());
+                String curationLabel = DatasetUtil.getLocaleCurationStatusLabel(status);
+                if(curationLabel == null) {
+                    curationLabel = BundleUtil.getStringFromBundle("dataset.curationstatus.none");
+                }
+                String[] paramArrayStatus = {
+                        version.getDataset().getDisplayName(),
+                        getDatasetLink(version.getDataset()),
+                        version.getDataset().getOwner().getDisplayName(),
+                        getDataverseLink(version.getDataset().getOwner()),
+                        curationLabel
+                    };
+                messageText += MessageFormat.format(pattern, paramArrayStatus);
+                  
+                return messageText;
+            case PIDRECONCILED:
+                version =  (DatasetVersion) targetObject;
+                pattern = BundleUtil.getStringFromBundle("notification.email.pid.reconciled");
+                messageText += MessageFormat.format(pattern, new String[] {version.getDataset().getDisplayName(), version.getDataset().getGlobalId().asString()});
                 return messageText;
             case CREATEACC:
-                String rootDataverseName = dataverseService.findRootDataverse().getName();
-                InternetAddress systemAddress = getSystemAddress();
                 String accountCreatedMessage = BundleUtil.getStringFromBundle("notification.email.welcome", Arrays.asList(
-                        BrandingUtil.getInstallationBrandName(rootDataverseName),
+                        BrandingUtil.getInstallationBrandName(),
                         systemConfig.getGuidesBaseUrl(),
                         systemConfig.getGuidesVersion(),
-                        BrandingUtil.getSupportTeamName(systemAddress, rootDataverseName),
-                        BrandingUtil.getSupportTeamEmailAddress(systemAddress)
+                        BrandingUtil.getSupportTeamName(getSystemAddress().orElse(null)),
+                        BrandingUtil.getSupportTeamEmailAddress(getSystemAddress().orElse(null))
                 ));
                 String optionalConfirmEmailAddon = confirmEmailService.optionalConfirmEmailAddonMsg(userNotification.getUser());
                 accountCreatedMessage += optionalConfirmEmailAddon;
@@ -516,7 +605,7 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
             case CHECKSUMFAIL:
                 dataset =  (Dataset) targetObject;
                 String checksumFailMsg = BundleUtil.getStringFromBundle("notification.checksumfail", Arrays.asList(
-                        dataset.getGlobalIdString()
+                        dataset.getGlobalId().asString()
                 ));
                 logger.fine("checksumFailMsg: " + checksumFailMsg);
                 return messageText += checksumFailMsg;
@@ -525,16 +614,82 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                 version =  (DatasetVersion) targetObject;
                 String fileImportMsg = BundleUtil.getStringFromBundle("notification.mail.import.filesystem", Arrays.asList(
                         systemConfig.getDataverseSiteUrl(),
-                        version.getDataset().getGlobalIdString(),
+                        version.getDataset().getGlobalId().asString(),
                         version.getDataset().getDisplayName()
                 ));
                 logger.fine("fileImportMsg: " + fileImportMsg);
                 return messageText += fileImportMsg;
 
+            case GLOBUSUPLOADCOMPLETED:
+                dataset =  (Dataset) targetObject;
+                messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html");
+                String uploadCompletedMessage = messageText + BundleUtil.getStringFromBundle("notification.mail.globus.upload.completed", Arrays.asList(
+                        systemConfig.getDataverseSiteUrl(),
+                        dataset.getGlobalId().asString(),
+                        dataset.getDisplayName(),
+                        comment
+                ))  ;
+                return  uploadCompletedMessage;
+
+            case GLOBUSDOWNLOADCOMPLETED:
+                dataset =  (Dataset) targetObject;
+                messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html");
+                String downloadCompletedMessage = messageText + BundleUtil.getStringFromBundle("notification.mail.globus.download.completed", Arrays.asList(
+                        systemConfig.getDataverseSiteUrl(),
+                        dataset.getGlobalId().asString(),
+                        dataset.getDisplayName(),
+                        comment
+                ))  ;
+                return downloadCompletedMessage;
+                        
+            case GLOBUSUPLOADCOMPLETEDWITHERRORS:
+                dataset =  (Dataset) targetObject;
+                messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html");
+                String uploadCompletedWithErrorsMessage = messageText + BundleUtil.getStringFromBundle("notification.mail.globus.upload.completedWithErrors", Arrays.asList(
+                        systemConfig.getDataverseSiteUrl(),
+                        dataset.getGlobalId().asString(),
+                        dataset.getDisplayName(),
+                        comment
+                ))  ;
+                return  uploadCompletedWithErrorsMessage;
+            
+            case GLOBUSUPLOADREMOTEFAILURE:
+                dataset =  (Dataset) targetObject;
+                messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html");
+                String uploadFailedRemotelyMessage = messageText + BundleUtil.getStringFromBundle("notification.mail.globus.upload.failedRemotely", Arrays.asList(
+                        systemConfig.getDataverseSiteUrl(),
+                        dataset.getGlobalId().asString(),
+                        dataset.getDisplayName(),
+                        comment
+                ))  ;
+                return  uploadFailedRemotelyMessage;
+
+            case GLOBUSUPLOADLOCALFAILURE:
+                dataset =  (Dataset) targetObject;
+                messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html");
+                String uploadFailedLocallyMessage = messageText + BundleUtil.getStringFromBundle("notification.mail.globus.upload.failedLocally", Arrays.asList(
+                        systemConfig.getDataverseSiteUrl(),
+                        dataset.getGlobalId().asString(),
+                        dataset.getDisplayName(),
+                        comment
+                ))  ;
+                return  uploadFailedLocallyMessage;
+                
+                case GLOBUSDOWNLOADCOMPLETEDWITHERRORS:
+                dataset =  (Dataset) targetObject;
+                messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html");
+                String downloadCompletedWithErrorsMessage = messageText + BundleUtil.getStringFromBundle("notification.mail.globus.download.completedWithErrors", Arrays.asList(
+                        systemConfig.getDataverseSiteUrl(),
+                        dataset.getGlobalId().asString(),
+                        dataset.getDisplayName(),
+                        comment
+                ))  ;
+                return downloadCompletedWithErrorsMessage;
+
             case CHECKSUMIMPORT:
                 version =  (DatasetVersion) targetObject;
                 String checksumImportMsg = BundleUtil.getStringFromBundle("notification.import.checksum", Arrays.asList(
-                        version.getDataset().getGlobalIdString(),
+                        version.getDataset().getGlobalId().asString(),
                         version.getDataset().getDisplayName()
                 ));
                 logger.fine("checksumImportMsg: " + checksumImportMsg);
@@ -547,32 +702,70 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
 
             case INGESTCOMPLETED:
                 dataset = (Dataset) targetObject;
-
+                messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html");
                 String ingestedCompletedMessage = messageText + BundleUtil.getStringFromBundle("notification.ingest.completed", Arrays.asList(
                         systemConfig.getDataverseSiteUrl(),
-                        dataset.getGlobalIdString(),
+                        dataset.getGlobalId().asString(),
                         dataset.getDisplayName(),
+                        systemConfig.getGuidesBaseUrl(),
+                        systemConfig.getGuidesVersion(),
                         comment
                 ));
 
                 return ingestedCompletedMessage;
             case INGESTCOMPLETEDWITHERRORS:
                 dataset = (Dataset) targetObject;
-
+                messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html");
                 String ingestedCompletedWithErrorsMessage = messageText + BundleUtil.getStringFromBundle("notification.ingest.completedwitherrors", Arrays.asList(
                         systemConfig.getDataverseSiteUrl(),
-                        dataset.getGlobalIdString(),
+                        dataset.getGlobalId().asString(),
                         dataset.getDisplayName(),
+                        systemConfig.getGuidesBaseUrl(),
+                        systemConfig.getGuidesVersion(),
                         comment
                 ));
 
                 return ingestedCompletedWithErrorsMessage;
+            case DATASETMENTIONED:
+                String additionalInfo = userNotification.getAdditionalInfo();
+                dataset = (Dataset) targetObject;
+                JsonObject citingResource = null;
+                citingResource = JsonUtil.getJsonObject(additionalInfo);
+                
+
+                pattern = BundleUtil.getStringFromBundle("notification.email.datasetWasMentioned");
+                Object[] paramArrayDatasetMentioned = {
+                        userNotification.getUser().getName(),
+                        BrandingUtil.getInstallationBrandName(), 
+                        citingResource.getString("@type"),
+                        citingResource.getString("@id"),
+                        citingResource.getString("name"),
+                        citingResource.getString("relationship"), 
+                        systemConfig.getDataverseSiteUrl(),
+                        dataset.getGlobalId().toString(), 
+                        dataset.getDisplayName()};
+                messageText = MessageFormat.format(pattern, paramArrayDatasetMentioned);
+                return messageText;
+            case REQUESTEDFILEACCESS:
+                //Notification to requestor when they make a request
+                datafile = (DataFile) targetObject;
+                
+                pattern = BundleUtil.getStringFromBundle("notification.email.requestedFileAccess");
+                 messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html");
+                 messageText += MessageFormat.format(pattern, getDvObjectLink(datafile), datafile.getOwner().getDisplayName());
+                far = datafile.getAccessRequestForAssignee(requestor);
+                gbr = far.getGuestbookResponse();
+                if (gbr != null) {
+                    messageText += MessageFormat.format(
+                            BundleUtil.getStringFromBundle("notification.email.requestFileAccess.guestbookResponse"), gbr.toHtmlFormattedResponse());
+                }
+                return messageText;
         }
-        
+
         return "";
     }
-    
-    private Object getObjectOfNotification (UserNotification userNotification){
+
+    public Object getObjectOfNotification (UserNotification userNotification){
         switch (userNotification.getType()) {
             case ASSIGNROLE:
             case REVOKEROLE:
@@ -587,17 +780,22 @@ private Object getObjectOfNotification (UserNotification userNotification){
             case CREATEDV:
                 return dataverseService.find(userNotification.getObjectId());
             case REQUESTFILEACCESS:
+            case REQUESTEDFILEACCESS:
                 return dataFileService.find(userNotification.getObjectId());
             case GRANTFILEACCESS:
             case REJECTFILEACCESS:
+            case DATASETCREATED:
+            case DATASETMENTIONED:
                 return datasetService.find(userNotification.getObjectId());
-            case MAPLAYERDELETEFAILED:
-                return dataFileService.findFileMetadata(userNotification.getObjectId());
-            case MAPLAYERUPDATED:
             case CREATEDS:
             case SUBMITTEDDS:
             case PUBLISHEDDS:
+            case PUBLISHFAILED_PIDREG:
             case RETURNEDDS:
+            case WORKFLOW_SUCCESS:
+            case WORKFLOW_FAILURE:
+            case PIDRECONCILED:
+            case STATUSUPDATED:
                 return versionService.find(userNotification.getObjectId());
             case CREATEACC:
                 return userNotification.getUser();
@@ -605,6 +803,13 @@ private Object getObjectOfNotification (UserNotification userNotification){
                 return datasetService.find(userNotification.getObjectId());
             case FILESYSTEMIMPORT:
                 return versionService.find(userNotification.getObjectId());
+            case GLOBUSUPLOADCOMPLETED:
+            case GLOBUSUPLOADCOMPLETEDWITHERRORS:
+            case GLOBUSUPLOADREMOTEFAILURE:
+            case GLOBUSUPLOADLOCALFAILURE: 
+            case GLOBUSDOWNLOADCOMPLETED:
+            case GLOBUSDOWNLOADCOMPLETEDWITHERRORS:
+                return datasetService.find(userNotification.getObjectId());
             case CHECKSUMIMPORT:
                 return versionService.find(userNotification.getObjectId());
             case APIGENERATED:
@@ -616,10 +821,7 @@ private Object getObjectOfNotification (UserNotification userNotification){
         }
         return null;
     }
-    
 
-    
-    
     private String getUserEmailAddress(UserNotification notification) {
         if (notification != null) {
             if (notification.getUser() != null) {
@@ -631,9 +833,8 @@ private String getUserEmailAddress(UserNotification notification) {
                 }
             }
         }
-        
+
         logger.fine("no email address");
         return null; 
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageFilePermissionsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageFilePermissionsPage.java
index 012332f747d..1ead0b13cdc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ManageFilePermissionsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ManageFilePermissionsPage.java
@@ -5,13 +5,13 @@
  */
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.api.Util;
 import edu.harvard.iq.dataverse.authorization.AuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.RoleAssigneeDisplayInfo;
-import edu.harvard.iq.dataverse.authorization.groups.Group;
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
@@ -20,24 +20,24 @@
 import edu.harvard.iq.dataverse.engine.command.impl.AssignRoleCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RevokeRoleCommand;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.DateUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import java.sql.Timestamp;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.apache.commons.lang.StringUtils;
-import org.primefaces.event.SelectEvent;
-import org.primefaces.event.ToggleSelectEvent;
-import org.primefaces.event.UnselectEvent;
+import java.util.stream.Collectors;
+
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.apache.commons.lang3.ObjectUtils;
 
 /**
  *
@@ -73,6 +73,8 @@ public class ManageFilePermissionsPage implements java.io.Serializable {
     DataverseRequestServiceBean dvRequestService;
     @Inject
     PermissionsWrapper permissionsWrapper;
+    @EJB
+    FileAccessRequestServiceBean fileAccessRequestService;
     
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     EntityManager em;
@@ -83,7 +85,30 @@ public class ManageFilePermissionsPage implements java.io.Serializable {
     Dataset dataset = new Dataset(); 
     private final TreeMap<RoleAssignee,List<RoleAssignmentRow>> roleAssigneeMap = new TreeMap<>();
     private final TreeMap<DataFile,List<RoleAssignmentRow>> fileMap = new TreeMap<>();
-    private final TreeMap<AuthenticatedUser,List<DataFile>> fileAccessRequestMap = new TreeMap<>();    
+
+    public TreeMap<AuthenticatedUser, List<FileAccessRequest>> getFileAccessRequestMap() {
+        return fileAccessRequestMap;
+    }
+    
+    public List<DataFile> getDataFilesForRequestor() {
+        List<FileAccessRequest> fars = fileAccessRequestMap.get(getFileRequester());
+        if (fars == null) {
+            return new ArrayList<>();
+        } else {
+            return fars.stream().map(FileAccessRequest::getDataFile).collect(Collectors.toList());
+        }
+    }
+
+    private final TreeMap<AuthenticatedUser,List<FileAccessRequest>> fileAccessRequestMap = new TreeMap<>();
+    private boolean showDeleted = true;
+
+    public boolean isShowDeleted() {
+        return showDeleted;
+    }
+
+    public void setShowDeleted(boolean showDeleted) {
+        this.showDeleted = showDeleted;
+    }
 
     public Dataset getDataset() {
         return dataset;
@@ -101,11 +126,17 @@ public TreeMap<DataFile, List<RoleAssignmentRow>> getFileMap() {
         return fileMap;
     }
 
-    public TreeMap<AuthenticatedUser, List<DataFile>> getFileAccessRequestMap() {
-        return fileAccessRequestMap;
+    private boolean backingShowDeleted = true;
+
+    public void showDeletedCheckboxChange() {
+
+        if (backingShowDeleted != showDeleted) {
+            initMaps();
+            backingShowDeleted = showDeleted;
+        }
+
     }
-    
-    
+
     public String init() {
         if (dataset.getId() != null) {
             dataset = datasetService.find(dataset.getId());
@@ -116,57 +147,101 @@ public String init() {
             return permissionsWrapper.notFound();
         }
 
-        if (!permissionService.on(dataset).has(Permission.ManageDatasetPermissions)) {
+        if (!permissionService.on(dataset).has(Permission.ManageFilePermissions)) {
             return permissionsWrapper.notAuthorized();
         }
         initMaps();
         return "";
     }
-    
+
     private void initMaps() {
         // initialize files and usergroup list
         roleAssigneeMap.clear();
         fileMap.clear();
-        fileAccessRequestMap.clear();        
-               
+        fileAccessRequestMap.clear();
+
         for (DataFile file : dataset.getFiles()) {
-            // only include if the file is restricted (or it's draft version is restricted)
-            //Added a null check in case there are files that have no metadata records SEK 
+
+            // only include if the file is restricted (or its draft version is restricted)
+            //Added a null check in case there are files that have no metadata records SEK
+            //for 6587 make sure that a file is in the current version befor adding to the fileMap SEK 2/11/2020
                 if (file.getFileMetadata() != null && (file.isRestricted() || file.getFileMetadata().isRestricted())) {
+                    //only test if file is deleted if it's restricted
+                    boolean fileIsDeleted = !((dataset.getLatestVersion().isDraft() && file.getFileMetadata().getDatasetVersion().isDraft())
+                            || (dataset.getLatestVersion().isReleased() && file.getFileMetadata().getDatasetVersion().equals(dataset.getLatestVersion())));
+
+                    if (!isShowDeleted() && fileIsDeleted) {
+                        //if don't show deleted and is deleted go to next file...
+                        continue;
+                    }
                 // we get the direct role assignments assigned to the file
                 List<RoleAssignment> ras = roleService.directRoleAssignments(file);
                 List<RoleAssignmentRow> raList = new ArrayList<>(ras.size());
                 for (RoleAssignment ra : ras) {
                     // for files, only show role assignments which can download
                     if (ra.getRole().permissions().contains(Permission.DownloadFile)) {
-                        raList.add(new RoleAssignmentRow(ra, roleAssigneeService.getRoleAssignee(ra.getAssigneeIdentifier(), true).getDisplayInfo()));                   
-                        addFileToRoleAssignee(ra);                    
+                        raList.add(new RoleAssignmentRow(ra, roleAssigneeService.getRoleAssignee(ra.getAssigneeIdentifier(), true).getDisplayInfo(), fileIsDeleted));
+                        addFileToRoleAssignee(ra, fileIsDeleted);
                     }
                 }
-                
+
+                file.setDeleted(fileIsDeleted);
+
                 fileMap.put(file, raList);
-                
+
                 // populate the file access requests map
-                for (AuthenticatedUser au : file.getFileAccessRequesters()) {
-                        List<DataFile> requestedFiles = fileAccessRequestMap.get(au);
-                        if (requestedFiles == null) {
-                            requestedFiles = new ArrayList<>();
-                            AuthenticatedUser withProvider = authenticationService.getAuthenticatedUserWithProvider(au.getUserIdentifier());                           
-                            fileAccessRequestMap.put(withProvider, requestedFiles);
-                        }
-                        requestedFiles.add(file);                                       
+                for (FileAccessRequest fileAccessRequest : file.getFileAccessRequests(FileAccessRequest.RequestState.CREATED)) {
+                    List<FileAccessRequest> fileAccessRequestList = fileAccessRequestMap.get(fileAccessRequest.getRequester());
+                    if (fileAccessRequestList == null) {
+                        fileAccessRequestList = new ArrayList<>();
+                        AuthenticatedUser withProvider = authenticationService.getAuthenticatedUserWithProvider(fileAccessRequest.getRequester().getUserIdentifier());
+                        fileAccessRequestMap.put(withProvider, fileAccessRequestList);
+                    }
+                    fileAccessRequestList.add(fileAccessRequest);
                 }
-            }  
+            }
         }
-        
     }
-    
+
     public String getAuthProviderFriendlyName(String authProviderId){
-        
         return AuthenticationProvider.getFriendlyName(authProviderId);
     }
-    
-    private void addFileToRoleAssignee(RoleAssignment assignment) {
+
+    Date getAccessRequestDate(List<FileAccessRequest> fileAccessRequests){
+        if (fileAccessRequests == null) {
+            return null;
+        }
+
+        // find the oldest date in the list of available and return a formatted date, or null if no dates were found
+        return fileAccessRequests.stream()
+            .filter(fileAccessRequest -> fileAccessRequest.getCreationTime() != null)
+            .min((a, b) -> ObjectUtils.compare(a.getCreationTime(), b.getCreationTime(), true))
+            .map(FileAccessRequest::getCreationTime)
+            .orElse(null);
+    }
+
+    public String formatAccessRequestDate(List<FileAccessRequest> fileAccessRequests){
+        Date date = getAccessRequestDate(fileAccessRequests);
+
+        if (date == null) {
+            return null;
+        }
+
+        return DateUtil.formatDate(date);
+    }
+
+
+    public String formatAccessRequestTimestamp(List<FileAccessRequest> fileAccessRequests){
+        Date date = getAccessRequestDate(fileAccessRequests);
+
+        if (date == null) {
+            return null;
+        }
+
+        return Util.getDateTimeFormat().format(date);
+    }
+
+    private void addFileToRoleAssignee(RoleAssignment assignment, boolean fileDeleted) {
         RoleAssignee ra = roleAssigneeService.getRoleAssignee(assignment.getAssigneeIdentifier());
         List<RoleAssignmentRow> assignments = roleAssigneeMap.get(ra);
         if (assignments == null) {
@@ -174,7 +249,7 @@ private void addFileToRoleAssignee(RoleAssignment assignment) {
             roleAssigneeMap.put(ra, assignments);
         }
         
-        assignments.add(new RoleAssignmentRow(assignment, ra.getDisplayInfo()));
+        assignments.add(new RoleAssignmentRow(assignment, ra.getDisplayInfo(), fileDeleted));
     }
 
     /* 
@@ -299,6 +374,10 @@ public AuthenticatedUser getFileRequester() {
 
 
     public void initAssignDialog(ActionEvent ae) {
+
+        showDeleted = false;
+        initMaps();
+
         fileRequester = null;
         selectedRoleAssignees = null;
         selectedFiles.clear();
@@ -306,6 +385,8 @@ public void initAssignDialog(ActionEvent ae) {
     }
     
     public void initAssignDialogByFile(DataFile file) {
+        showDeleted = false;
+        initMaps();
         fileRequester = null;
         selectedRoleAssignees = null;
         selectedFiles.clear();
@@ -316,7 +397,10 @@ public void initAssignDialogForFileRequester(AuthenticatedUser au) {
         fileRequester = au;
         selectedRoleAssignees = null;
         selectedFiles.clear();
-        selectedFiles.addAll(fileAccessRequestMap.get(au));    
+
+        for (FileAccessRequest fileAccessRequest : fileAccessRequestMap.get(au)) {
+            selectedFiles.add(fileAccessRequest.getDataFile());
+        }
         showUserGroupMessages();
     }     
     
@@ -335,12 +419,17 @@ public void grantAccess(ActionEvent evt) {
                     if (file.isReleased()) {
                         sendNotification = true;
                     }
-                    // remove request, if it exist
-                    if (file.getFileAccessRequesters().remove(roleAssignee)) {
-                        datafileService.save(file);
-                    }                  
-                }               
-            
+                    // set request(s) granted, if they exist
+                    for (AuthenticatedUser au : roleAssigneeService.getExplicitUsers(roleAssignee)) {
+                        FileAccessRequest far = file.getAccessRequestForAssignee(au);
+                        //There may not be a request, so do the null check
+                        if (far != null) {
+                            far.setStateGranted();
+                        }
+                    }
+                    datafileService.save(file);
+                }
+
             }
 
             if (sendNotification) {
@@ -349,7 +438,7 @@ public void grantAccess(ActionEvent evt) {
                 }
              }
         }
-        
+
         initMaps();
     }
     
@@ -358,23 +447,33 @@ public void grantAccessToRequests(AuthenticatedUser au) {
     }
     
     public void grantAccessToAllRequests(AuthenticatedUser au) {
-        grantAccessToRequests(au, fileAccessRequestMap.get(au));
-    }    
+        List<DataFile> files = new ArrayList<>();
+
+        for (FileAccessRequest fileAccessRequest : fileAccessRequestMap.get(au)) {
+            files.add(fileAccessRequest.getDataFile());
+        }
+
+        grantAccessToRequests(au, files);
+    }
 
     private void grantAccessToRequests(AuthenticatedUser au, List<DataFile> files) {
         boolean actionPerformed = false;
         // Find the built in file downloader role (currently by alias) 
         DataverseRole fileDownloaderRole = roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER);
         for (DataFile file : files) {
-            if (assignRole(au, file, fileDownloaderRole)) {                
-                file.getFileAccessRequesters().remove(au);
-                datafileService.save(file);
+            if (assignRole(au, file, fileDownloaderRole)) {
+                FileAccessRequest far = file.getAccessRequestForAssignee(au);
+                if (far!=null) {
+                    far.setStateGranted();
+                    datafileService.save(file);
+                }
                 actionPerformed = true;
             }
         }
+
         if (actionPerformed) {
             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("permission.fileAccessGranted", Arrays.asList(au.getDisplayInfo().getTitle())));
-            userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.GRANTFILEACCESS, dataset.getId()); 
+            userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.GRANTFILEACCESS, dataset.getId());
             initMaps();
         }
 
@@ -385,24 +484,34 @@ public void rejectAccessToRequests(AuthenticatedUser au) {
     }
     
     public void rejectAccessToAllRequests(AuthenticatedUser au) {
-        rejectAccessToRequests(au, fileAccessRequestMap.get(au));
-    }    
+        List<DataFile> files = new ArrayList<>();
+
+        for (FileAccessRequest fileAccessRequest : fileAccessRequestMap.get(au)) {
+            files.add(fileAccessRequest.getDataFile());
+        }
+
+        rejectAccessToRequests(au, files);
+    }
 
     private void rejectAccessToRequests(AuthenticatedUser au, List<DataFile> files) {
-        boolean actionPerformed = false;        
-        for (DataFile file : files) {               
-            file.getFileAccessRequesters().remove(au);
-            datafileService.save(file);
-            actionPerformed = true;
+        boolean actionPerformed = false;
+        for (DataFile file : files) {
+            FileAccessRequest far = file.getAccessRequestForAssignee(au);
+            if(far!=null) {
+                far.setStateRejected();
+                fileAccessRequestService.save(far);
+                file.removeFileAccessRequest(far);
+                datafileService.save(file);
+                actionPerformed = true;
+            }
         }
 
-        
         if (actionPerformed) {
             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("permission.fileAccessRejected", Arrays.asList(au.getDisplayInfo().getTitle())));
-            userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.REJECTFILEACCESS, dataset.getId());        
+            userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.REJECTFILEACCESS, dataset.getId());
             initMaps();
         }
-    }    
+    }
 
     private boolean assignRole(RoleAssignee ra,  DataFile file, DataverseRole r) {
         try {
@@ -466,11 +575,27 @@ public static class RoleAssignmentRow {
 
         private final RoleAssigneeDisplayInfo assigneeDisplayInfo;
         private final RoleAssignment ra;
+            //Used when a file to which there has been a role assignment added is deleted    
+
+        private final boolean deleted;
+
+        public boolean isDeleted() {
+            return deleted;
+        }
 
         public RoleAssignmentRow(RoleAssignment anRa, RoleAssigneeDisplayInfo disInf) {
             this.ra = anRa;
             this.assigneeDisplayInfo = disInf;
-        }        
+            this.deleted = false;
+        }
+
+        public RoleAssignmentRow(RoleAssignment anRa, RoleAssigneeDisplayInfo disInf, boolean deleted) {
+
+            this.ra = anRa;
+            this.assigneeDisplayInfo = disInf;
+            this.deleted = deleted;
+
+        } 
         
 
         public RoleAssigneeDisplayInfo getAssigneeDisplayInfo() {
@@ -485,6 +610,7 @@ public DvObject getDefinitionPoint() {
         public Long getId() {
             return ra.getId();
         }
+        
     
     }   
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java
index 6d25306d5e0..583e195ab0d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java
@@ -22,18 +22,19 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.apache.commons.lang3.StringUtils;
+
 
 /**
  * @author michaelsuo
@@ -78,7 +79,6 @@ public class ManageGroupsPage implements java.io.Serializable {
     private Dataverse dataverse;
     private Long dataverseId;
     private ExplicitGroup selectedGroup = null;
-    private Boolean showDeletePopup = false;
 
     public String init() {
         setDataverse(dataverseService.find(getDataverseId()));
@@ -96,13 +96,26 @@ public String init() {
             return permissionsWrapper.notAuthorized();
         }
         explicitGroups = new LinkedList<>(explicitGroupService.findByOwner(getDataverseId()));
-
+        renderDeletePopup = false;
         return null;
     }
+    
+    private boolean renderDeletePopup = false;
 
+    public boolean isRenderDeletePopup() {
+        return renderDeletePopup;
+    }
+
+    public void setRenderDeletePopup(boolean renderDeletePopup) {
+        this.renderDeletePopup = renderDeletePopup;
+    }
+    
+    public void clickDeleteGroup(ExplicitGroup selectedGroup) {
+        setRenderDeletePopup(true);
+        this.selectedGroup = selectedGroup;
+    }
 
     public void setSelectedGroup(ExplicitGroup selectedGroup) {
-        setShowDeletePopup(true);
         this.selectedGroup = selectedGroup;
     }
 
@@ -238,18 +251,6 @@ public String getMembershipString(ExplicitGroup eg) {
     public void removeMemberFromSelectedGroup(RoleAssignee ra) {
         selectedGroup.remove(ra);
     }
-    
-    public Boolean getShowDeletePopup() {
-        return showDeletePopup;
-    }
-
-    public void setShowDeletePopup(Boolean showDeletePopup) {
-        this.showDeletePopup = showDeletePopup;
-    }
-    
-    public void unrenderDeletePopup() {
-        setShowDeletePopup(false);
-    }
 
     public List<RoleAssignee> completeRoleAssignee( String query ) {
         List<RoleAssignee> alreadyAssignedRoleAssignees = new ArrayList<>();
diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java
index a4602759ea8..d1cc515fd01 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java
@@ -5,23 +5,26 @@
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseGuestbookRootCommand;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  *
@@ -218,7 +221,8 @@ private String getFileName(){
        // The fix below replaces any spaces in the name of the dataverse with underscores;
        // without it, the filename was chopped off (by the browser??), and the user 
        // was getting the file name "Foo", instead of "Foo and Bar in Social Sciences.csv". -- L.A.
-       return  dataverse.getName().replace(' ', '_') + "_GuestbookReponses.csv";
+       // Also removing some chars that have been reported to cause issues with certain browsers
+       return  FileUtil.sanitizeFileName(dataverse.getName() + "_GuestbookResponses.csv");
     }
     
     public void deleteGuestbook() {
@@ -325,7 +329,7 @@ public void setDisplayDownloadAll(boolean displayDownloadAll) {
         this.displayDownloadAll = displayDownloadAll;
     }
 
-    public String updateGuestbooksRoot(javax.faces.event.AjaxBehaviorEvent event) throws javax.faces.event.AbortProcessingException {
+    public String updateGuestbooksRoot(AjaxBehaviorEvent event) throws AbortProcessingException {
         try {
             dataverse = engineService.submit(
                     new UpdateDataverseGuestbookRootCommand(!isInheritGuestbooksValue(),
@@ -338,4 +342,21 @@ public String updateGuestbooksRoot(javax.faces.event.AjaxBehaviorEvent event) th
         }
         return "";
     }
+
+    public void streamResponsesByDataverseAndGuestbook(Long guestbookId) {
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
+        response.setContentType("text/comma-separated-values");
+        String fileNameString = "attachment;filename=" + getFileName();
+        response.setHeader("Content-Disposition", fileNameString);
+        try {
+            ServletOutputStream out = response.getOutputStream();
+            guestbookResponseService.streamResponsesByDataverseIdAndGuestbookId(out, dataverseId, guestbookId);
+            out.flush();
+            ctx.responseComplete();
+        } catch (Exception e) {
+            logger.warning("Failed to stream collected guestbook responses for guestbook " + guestbookId + ", dataverse " + dataverseId);
+        }
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java
index 646f1275616..0e277c5aa32 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java
@@ -29,19 +29,18 @@
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.apache.commons.lang.StringEscapeUtils;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.apache.commons.text.StringEscapeUtils;
 
 /**
  *
@@ -56,6 +55,8 @@ public class ManagePermissionsPage implements java.io.Serializable {
     @EJB
     DvObjectServiceBean dvObjectService;
     @EJB
+    FileAccessRequestServiceBean fileAccessRequestService;
+    @EJB
     DataverseRoleServiceBean roleService;
     @EJB
     RoleAssigneeServiceBean roleAssigneeService;
@@ -159,10 +160,11 @@ public List<RoleAssignmentRow> initRoleAssignments() {
         List<RoleAssignmentRow> raList = null;
         if (dvObject != null && dvObject.getId() != null) {
             Set<RoleAssignment> ras = roleService.rolesAssignments(dvObject);
+            List<DataverseRole> availableRoles = getAvailableRoles();
             raList = new ArrayList<>(ras.size());
             for (RoleAssignment roleAssignment : ras) {
-                // for files, only show role assignments which can download
-                if (!(dvObject instanceof DataFile) || roleAssignment.getRole().permissions().contains(Permission.DownloadFile)) {
+                // only show roles that are available for this DVObject
+                if (availableRoles.contains(roleAssignment.getRole())) {
                     RoleAssignee roleAssignee = roleAssigneeService.getRoleAssignee(roleAssignment.getAssigneeIdentifier());
                     if (roleAssignee != null) {
                         raList.add(new RoleAssignmentRow(roleAssignment, roleAssignee.getDisplayInfo()));
@@ -250,11 +252,11 @@ public String getDefaultContributorRoleAlias() {
         return defaultContributorRoleAlias;
     }
     
-    public Boolean isCustomDefaultContributorRole(){
-        if (defaultContributorRoleAlias == null){
+    public Boolean isCustomDefaultContributorRole() {
+        if (defaultContributorRoleAlias == null) {
             initAccessSettings();
         }
-        return !( defaultContributorRoleAlias.equals(DataverseRole.EDITOR) || defaultContributorRoleAlias.equals(DataverseRole.CURATOR));
+        return !(defaultContributorRoleAlias.equals(DataverseRole.EDITOR) || defaultContributorRoleAlias.equals(DataverseRole.CURATOR));
     }
     
     public String getCustomDefaultContributorRoleName(){
@@ -308,8 +310,11 @@ public void initAccessSettings() {
                 break;
                 // @todo handle case where more than one role has been assigned to the AutenticatedUsers group!
             }
-           
+
             defaultContributorRoleAlias = ((Dataverse) dvObject).getDefaultContributorRole() == null ? DataverseRole.NONE : ((Dataverse) dvObject).getDefaultContributorRole().getAlias();
+        } else {
+            //There are only default roles assigned at the dataverse level
+            defaultContributorRoleAlias = DataverseRole.NONE;
         }
     }
 
@@ -416,7 +421,16 @@ public List<DataverseRole> getAvailableRoles() {
                 }
 
             } else if (dvObject instanceof DataFile) {
-                roles.add(roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER));
+                // only show roles that have File level permissions
+                // current the available roles for a file are gotten from its parent's parent                
+                for (DataverseRole role : roleService.availableRoles(dvObject.getOwner().getOwner().getId())) {
+                    for (Permission permission : role.permissions()) {
+                        if (permission.appliesTo(DataFile.class)) {
+                            roles.add(role);
+                            break;
+                        }
+                    }
+                }
             }
 
             Collections.sort(roles, DataverseRole.CMP_BY_NAME);
@@ -513,7 +527,7 @@ private void assignRole(RoleAssignee ra, DataverseRole r) {
             List<String> args = Arrays.asList(
                     r.getName(),
                     ra.getDisplayInfo().getTitle(),
-                    StringEscapeUtils.escapeHtml(dvObject.getDisplayName())
+                    StringEscapeUtils.escapeHtml4(dvObject.getDisplayName())
             );
             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("permission.roleAssignedToFor", args));
             // don't notify if role = file downloader and object is not released
@@ -522,12 +536,12 @@ private void assignRole(RoleAssignee ra, DataverseRole r) {
             }
 
         } catch (PermissionException ex) {
-            JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("permission.roleNotAbleToBeAssigned"),  BundleUtil.getStringFromBundle("permission.permissionsMissing" , Arrays.asList(ex.getRequiredPermissions().toString())));
+            JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("permission.roleNotAbleToBeAssigned"), BundleUtil.getStringFromBundle("permission.permissionsMissing", Arrays.asList(ex.getRequiredPermissions().toString())));
         } catch (CommandException ex) {
             List<String> args = Arrays.asList(
                     r.getName(),
                     ra.getDisplayInfo().getTitle(),
-                    StringEscapeUtils.escapeHtml(dvObject.getDisplayName())
+                    StringEscapeUtils.escapeHtml4(dvObject.getDisplayName())
             );
             String message = BundleUtil.getStringFromBundle("permission.roleNotAssignedFor", args);
             JsfHelper.addErrorMessage(message);
@@ -587,7 +601,7 @@ public void updateRole(ActionEvent e) {
             } catch (PermissionException ex) {
                 JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("permission.roleNotSaved"), BundleUtil.getStringFromBundle("permission.permissionsMissing", Arrays.asList(ex.getRequiredPermissions().toString())));
             } catch (CommandException ex) {
-                JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("permission.roleNotSaved"));
+                JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("permission.roleNotSaved").concat(" " + ex.getMessage()) );
                 logger.log(Level.SEVERE, "Error saving role: " + ex.getMessage(), ex);
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java
index a4f5d27c38e..fa2e9fb55b8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java
@@ -5,6 +5,7 @@
 import edu.harvard.iq.dataverse.engine.command.impl.DeleteTemplateCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseTemplateRootCommand;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import java.sql.Timestamp;
@@ -13,15 +14,17 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.AjaxBehaviorEvent;
 /**
  *
  * @author skraffmiller
@@ -56,6 +59,12 @@ public class ManageTemplatesPage implements java.io.Serializable {
     
     @Inject
     PermissionsWrapper permissionsWrapper;
+    
+    @Inject
+    LicenseServiceBean licenseServiceBean;
+    
+    @Inject
+    SettingsWrapper settingsWrapper;
 
     private List<Template> templates;
     private Dataverse dataverse;
@@ -112,17 +121,19 @@ public String cloneTemplate(Template templateIn) {
         Template newOne = templateIn.cloneNewTemplate(templateIn);
         String name = BundleUtil.getStringFromBundle("page.copy") +" " + templateIn.getName();
         newOne.setName(name);
-        newOne.setUsageCount(new Long(0));
+        newOne.setUsageCount(Long.valueOf(0));
         newOne.setCreateTime(new Timestamp(new Date().getTime()));
-        dataverse.getTemplates().add(newOne);
-        templates.add(newOne);
+        newOne.setDataverse(dataverse);
+
         Template created;
         try {
             created = engineService.submit(new CreateTemplateCommand(newOne, dvRequestService.getDataverseRequest(), dataverse));
+            dataverse.getTemplates().add(created);
+            templates.add(created);
             saveDataverse("");
             String msg =  BundleUtil.getStringFromBundle("template.clone");//"The template has been copied";
             JsfHelper.addFlashMessage(msg);
-            return "/template.xhtml?id=" + created.getId() + "&ownerId=" + dataverse.getId() + "&editMode=METADATA&faces-redirect=true";
+            return "/template.xhtml?id=" + created.getId() + "&ownerId=" + dataverse.getId() + "&editMode=CLONE&faces-redirect=true";
         } catch (CommandException ex) {
             JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("template.clone.error"));//"Template could not be copied. " 
         }
@@ -224,11 +235,11 @@ public void setSelectedTemplate(Template selectedTemplate) {
 
     public void viewSelectedTemplate(Template selectedTemplate) {
         this.selectedTemplate = selectedTemplate;
-        this.selectedTemplate.setMetadataValueBlocks();
+        this.selectedTemplate.setMetadataValueBlocks(settingsWrapper.getSystemMetadataBlocks());
         tempPage.setTemplate(selectedTemplate);
     }
 
-    public String updateTemplatesRoot(javax.faces.event.AjaxBehaviorEvent event) throws javax.faces.event.AbortProcessingException {
+    public String updateTemplatesRoot(AjaxBehaviorEvent event) throws AbortProcessingException {
         try {
             if (dataverse.getOwner() != null) {
                 if (isInheritTemplatesValue() && dataverse.getDefaultTemplate() == null && dataverse.getOwner().getDefaultTemplate() != null) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/MapLayerMetadata.java b/src/main/java/edu/harvard/iq/dataverse/MapLayerMetadata.java
deleted file mode 100644
index a7dd4d9eef1..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/MapLayerMetadata.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package edu.harvard.iq.dataverse;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.Arrays;
-import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import org.hibernate.validator.constraints.NotBlank;
-
-/**
- *  File metadata: specifically WorldMap layer information for a specific DataFile 
- * 
- * @author raprasad
- */
-@NamedQueries({
-    @NamedQuery(name = "MapLayerMetadata.findAll",
-            query = "SELECT mlm FROM MapLayerMetadata mlm"),})
-@Entity
-@Table(indexes = {@Index(columnList="dataset_id")})
-public class MapLayerMetadata implements Serializable {
-
-      
-    @Transient
-    public final static String dataType = "MapLayerMetadata";
-    
-    @Transient
-    public final static List<String> MANDATORY_JSON_FIELDS = Arrays.asList("layerName", "layerLink", "embedMapLink", "worldmapUsername");
-
-   
-    private static final long serialVersionUID = 1L;
-   
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    // ForeignKey to DataFile
-    //x@ManyToOne
-    // For now, make this unique:  Each DataFile may only have one map
-    @JoinColumn(nullable=false, unique=true)
-    private DataFile dataFile;
-
-    // ForeignKey to Dataset.
-    // This is always reachable via the datafile.getOwner();
-    // However, save the Dataset itself to potentially save an extra step
-    @ManyToOne
-    @JoinColumn(nullable=false)
-    private Dataset dataset;
-
-    @Column(nullable=false)
-    @NotBlank(message = "{map.layername}")
-    private String layerName;
-    
-    @Column(nullable=false)
-    @NotBlank(message = "{map.layerlink}")
-    private String layerLink;
-    
-    @Column(nullable=false)
-    @NotBlank(message = "{map.link}")
-    private String embedMapLink;
-    
-    @Column(nullable=true)
-    @NotBlank(message = "{map.imagelink}")
-    private String mapImageLink;
-    
-    @Column(nullable=false)
-    @NotBlank(message = "{map.username}")
-    private String worldmapUsername;
-   
-
-    /**
-     * Was this layer created by joining a tabular file
-     * to an existing file?
-     */
-    private boolean isJoinLayer;
-    
-    /**
-     * Description if this was created via a tabular join, 
-     */
-    @Column(columnDefinition = "TEXT")
-    private String joinDescription;
-            
-    /**
-     * Links to alternative representations of the map
-     *  in JSON format
-     */
-    @Column(columnDefinition = "TEXT")
-    private String mapLayerLinks;
-
-    /**
-     * The HTTP Status code (200, 404, etc.) returned when you check to see if
-     * the map/layer exists on the WorldMap side.
-     */
-    @Column(nullable=true)
-    private int lastVerifiedStatus;
-
-    /**
-     * The time that lastVerifiedStatus was last recorded.
-     */
-    @Column(nullable=true)
-    private Timestamp lastVerifiedTime;
-
-    /**
-     * Get property layerName.
-     * @return value of property layerName.
-     */
-    public String getLayerName() {
-            return this.layerName;
-    }
-
-    /**
-     * Set property layerName.
-     * @param layerName new value of property layerName.
-     */
-    public void setLayerName(String layerName) {
-            this.layerName = layerName;
-    }
-
-    /**
-     * Get property layerLink.
-     * @return value of property layerLink.
-     */
-    public String getLayerLink() {
-            return this.layerLink;
-    }
-
-    /**
-     * Set property layerLink.
-     * @param layerLink new value of property layerLink.
-     */
-    public void setLayerLink(String layerLink) {
-            this.layerLink = layerLink;
-    }
-    
-        /**
-     * Get property mapImageLink.
-     * @return value of property mapImageLink.
-     */
-    public String getMapImageLink() {
-            return this.mapImageLink;
-    }
-
-    /**
-     * Set property mapImageLink.
-     * @param mapImageLink new value of property layerLink.
-     */
-    public void setMapImageLink(String mapImageLink) {
-            this.mapImageLink = mapImageLink;
-    }
-    
-    
-    /**
-     * Get property embedMapLink.
-     * @return value of property embedMapLink.
-     */
-    public String getEmbedMapLink() {
-            return this.embedMapLink;
-    }
-
-    /**
-     * Set property embedMapLink.
-     * @param embedMapLink new value of property embedMapLink.
-     */
-    public void setEmbedMapLink(String embedMapLink) {
-            this.embedMapLink = embedMapLink;
-    }
-
-    /**
-     * Get property worldmapUsername.
-     * @return value of property worldmapUsername.
-     */
-    public String getWorldmapUsername() {
-            return this.worldmapUsername;
-    }
-
-    /**
-     * Set property worldmapUsername.
-     * @param worldmapUsername new value of property worldmapUsername.
-     */
-    public void setWorldmapUsername(String worldmapUsername) {
-            this.worldmapUsername = worldmapUsername;
-    }
-
-    
-    /**
-     * Get property isJoinLayer.
-     * @return value of property isJoinLayer.
-     */
-    public boolean isJoinLayer(){
-            return this.isJoinLayer;
-    }
-
-    /**
-     * Set property isJoinLayer.
-     * @param bool new value of property isJoinLayer.
-     */
-    public void setIsJoinLayer(boolean bool) {
-            this.isJoinLayer = bool;
-    }
-    
-    /**
-     * Get property joinDescription.
-     * @return value of property joinDescription.
-     */
-    public String getJoinDescription() {
-            return this.joinDescription;
-    }
-
-    /**
-     * Set property joinDescription.
-     * @param joinDescription new value of property joinDescription.
-     */
-    public void setJoinDescription(String joinDescription) {
-            this.joinDescription = joinDescription;
-    }
-    
-    /**
-     * Get property mapLayerLinks
-     * @return value of property joinDescription.
-     */
-    public String getMapLayerLinks() {
-            return this.mapLayerLinks;
-    }
-
-    /**
-     * Set property joinDescription.
-     * @param joinDescription new value of property joinDescription.
-     */
-    public void setMapLayerLinks(String mapLayerLinks) {
-            this.mapLayerLinks = mapLayerLinks;
-    }
-    
-    public Dataset getDataset() {
-        return dataset;
-    }
-
-    public void setDataset(Dataset dataset) {
-        this.dataset = dataset;
-    }
-
-    public DataFile getDataFile() {
-        return dataFile;
-    }
-
-    public void setDataFile(DataFile dataFile) {
-        this.dataFile = dataFile;
-    }
-
-    /**
-     * Getter for property id.
-     * @return Value of property id.
-     */
-    public Long getId() {
-        return this.id;
-    }
-
-    /**
-     * Setter for property id.
-     * @param id New value of property id.
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Timestamp getLastVerifiedTime() {
-        return lastVerifiedTime;
-    }
-
-    public void setLastVerifiedTime(Timestamp lastVerifiedTime) {
-        this.lastVerifiedTime = lastVerifiedTime;
-    }
-
-    public int getLastVerifiedStatus() {
-        return lastVerifiedStatus;
-    }
-
-    public void setLastVerifiedStatus(int lastVerifiedStatus) {
-        this.lastVerifiedStatus = lastVerifiedStatus;
-    }
-    
-    @Override
-    public String toString() {
-        return "edu.harvard.iq.dataverse.MaplayerMetadata[id=" + this.id + "]";
-
-        //return "WorldMap Layer: " + this.layerName + " for DataFile: " + this.dataFile.toString();
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/MapLayerMetadataServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MapLayerMetadataServiceBean.java
deleted file mode 100755
index dbbe8b3d8bb..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/MapLayerMetadataServiceBean.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package edu.harvard.iq.dataverse;
-
-import edu.harvard.iq.dataverse.api.WorldMapRelatedData;
-import edu.harvard.iq.dataverse.authorization.Permission;
-import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.authorization.users.User;
-import edu.harvard.iq.dataverse.dataaccess.StorageIO;
-import edu.harvard.iq.dataverse.util.SystemConfig;
-import edu.harvard.iq.dataverse.worldmapauth.WorldMapToken;
-import edu.harvard.iq.dataverse.worldmapauth.WorldMapTokenServiceBean;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-
-/**
- *
- * @author raprasad
- */
-@Stateless
-@Named
-public class MapLayerMetadataServiceBean {
-    
-   
-    @PersistenceContext(unitName = "VDCNet-ejbPU")
-    private EntityManager em;
-    
-    @EJB
-    DataFileServiceBean dataFileService;
-    
-    @EJB
-    PermissionServiceBean permissionService;
-    
-    @EJB
-    SystemConfig systemConfig;
-    
-    @EJB
-    WorldMapTokenServiceBean tokenServiceBean;
-   
-    private static final Logger logger = Logger.getLogger(MapLayerMetadataServiceBean.class.getCanonicalName());
-
-    private static final String GEOCONNECT_MAP_DELETE_API = "/tabular/delete-map-no-ui/";
-    
-    public MapLayerMetadata find(Object pk) {
-        if (pk==null){
-            return null;
-        }
-        return em.find(MapLayerMetadata.class, pk);
-    }
-    
-    public MapLayerMetadata save( MapLayerMetadata layer_metadata) {
-        if (layer_metadata==null){
-            return null;
-        }
-        if ( layer_metadata.getId() == null ) {
-            em.persist(layer_metadata);
-            return layer_metadata;
-	} else {
-            return em.merge( layer_metadata );
-	}
-    }
-    
-    
-    
-    /*
-        Given a datafile id, return the associated MapLayerMetadata object
-    
-    */
-    public MapLayerMetadata findMetadataByDatafile(DataFile datafile){
-        
-        if (datafile == null){
-            return null;
-        }
-     
-        try{
- //           String sqlStatement = 
-            Query query = em.createQuery("select m from MapLayerMetadata m WHERE m.dataFile=:datafile",  MapLayerMetadata.class);
-            query.setParameter("datafile", datafile);
-            query.setMaxResults(1);
-            //entityManager.createQuery(SQL_QUERY).setParameter(arg0,arg1).setMaxResults(10).getResultList();
-            return (MapLayerMetadata) query.getSingleResult();
-        } catch ( NoResultException nre ) {
-            return null;
-        }    
-    }
-    
-    
-    /*
-        Delete a mapLayerMetadata object.
-    
-        First check if the given user has permission to edit this data.
-        
-    */
-    public boolean deleteMapLayerMetadataObject(MapLayerMetadata mapLayerMetadata, User user){
-        logger.info("deleteMapLayerMetadataObject");
-        
-        if ((mapLayerMetadata == null)||(user==null)){
-            return false;
-        }
-        
-        if (permissionService.userOn(user, mapLayerMetadata.getDataFile().getOwner()).has(Permission.EditDataset)) { 
-
-            // Remove thumbnails associated with the map metadata
-            // (this also sets theto set the "preview image" flag to false)
-            //
-            boolean success = this.deleteOlderMapThumbnails(mapLayerMetadata.getDataFile());
-            
-            // Remove the actual map metadata
-            //
-            em.remove(em.merge(mapLayerMetadata));
-
-            return true;
-        }
-        return false;
-    }
-    
-    
-    public MapLayerMetadata findMetadataByLayerNameAndDatafile(String layer_name){//, DataFile datafile) {
-        if ((layer_name == null)){//||(datafile==null)){
-            return null;
-        }
-        //Query query = em.createQuery("select o.id from MapLayerMetadta as o where o.layer_name =:layerName and o.datafile_id =:datafileID;");
-        //Query query = em.createQuery("select m from MapLayerMetadata m where m.layer_name =:layerName ;");
-        try{
-            return em.createQuery("select m from MapLayerMetadata m WHERE m.layerName=:layerName", MapLayerMetadata.class)
-					.setParameter("layerName", layer_name)
-					.getSingleResult();
-        } catch ( NoResultException nre ) {
-            return null;
-        }    
-    }
-    
-    
-    
-    public List<MapLayerMetadata> getMapLayerMetadataForDataset(Dataset dataset){
-        if (dataset == null){
-            return null;
-        }
-        TypedQuery<MapLayerMetadata> query = em.createQuery("select object(o) from MapLayerMetadata as o where o.dataset=:dataset", MapLayerMetadata.class);// order by o.name");
-        query.setParameter("dataset", dataset);
-        return query.getResultList();
-    }    
-    
-    
-    /**
-     * Before downloading a file for map icons (see "retrieveMapImageForIcon" below),
-     * first remove any existing .img and .img.* files
-     * 
-     * e.g. delete all that start with (DataFile name) + ".img"
-     * 
-     * @param mapLayerMetadata
-     * @return
-     * @throws IOException 
-     */
-    private boolean deleteOlderMapThumbnails(DataFile dataFile) {
-        if (dataFile==null){
-            logger.warning("dataFile is null");
-            return false;
-        }
-
-        // Set the preview image available flag to false
-        dataFile.setPreviewImageAvailable(false);
-        dataFile = dataFileService.save(dataFile);
-
-        
-        try {
-            StorageIO<DataFile> storageIO = dataFile.getStorageIO();
-
-            if (storageIO == null) {
-                logger.warning("Null storageIO in deleteOlderMapThumbnails()");
-                return false;
-            }
-            storageIO.open();
-            List<String> cachedObjectsTags = storageIO.listAuxObjects();
-            
-            if (cachedObjectsTags != null) {
-                String iconBaseTag = "img";
-                String iconThumbTagPrefix = "thumb";
-                for (String cachedFileTag : cachedObjectsTags) {
-                    logger.info("found AUX tag: "+cachedFileTag);
-                    if (iconBaseTag.equals(cachedFileTag) || cachedFileTag.startsWith(iconThumbTagPrefix)) {
-                        logger.info("deleting cached AUX object "+cachedFileTag);
-                        storageIO.deleteAuxObject(cachedFileTag);
-                    }
-                }
-            }
-            /*
-             * Below is the old-style code that was assuming that all the files are 
-             * stored on a local filesystem. The StorageIO code, above, should 
-             * be used instead for all the operations on the physical files associated
-             * with DataFiles. 
-            // Get the parent directory
-            //
-            Path fileDirname = dataAccess.getFileSystemPath().getParent();
-            if (fileDirname == null){
-                logger.warning("DataFile directory has null path.  Directory path: " + dataAccess.getFileSystemPath().toString());
-                return false;
-            }
-        
-            // Verify that the directory exists
-            //
-            File fileDirectory = new File(fileDirname.normalize().toString());
-            if (!(fileDirectory.isDirectory())){
-                logger.warning("DataFile directory is not actually a directory.  Directory path: " + fileDirectory.toString());
-                return false;            
-            }
-        
-            /* Iterate through directory and delete any ".img" files for this DataFile
-           
-                Example:
-                Datafile name: 14a5e4abf7d-e7eebfb6474d
-                Types of files that would be deleted (if they exist):
-                    14a5e4abf7d-e7eebfb6474d.img
-                    14a5e4abf7d-e7eebfb6474d.img.thumb64
-                    14a5e4abf7d-e7eebfb6474d.img.thumb400
-            *//*
-            String iconBaseFilename = dataAccess.getFileSystemPath().toString() +  ".img";
-            String iconThumbFilename = dataAccess.getFileSystemPath().toString() +  ".thumb";
-        
-            for (File singleFile : fileDirectory.listFiles()) {
-                if (singleFile.toString().startsWith(iconBaseFilename) || singleFile.toString().startsWith(iconThumbFilename)) {
-                    //logger.info("file found: " + singleFile.toString());
-                    singleFile.delete();
-                    //results.add(file.getName());
-                }
-            }*/
-        } catch (IOException ioEx) {
-            logger.warning("IOException in deleteOlderMapThumbnails(): "+ioEx.getMessage());
-            return false; 
-        }
-                
-        return true;
-    }
-    
-    /**
-     * Use the mapLayerMetadata.mapImageLink to retrieve a PNG file directly from WorldMap
-     * 
-     * Next step: Save this image as the default icon
-     * 
-     * Example mapImageLink: http://worldmap.harvard.edu/download/wms/14708/png?layers=geonode:power_plants_enipedia_jan_2014_kvg&width=948&bbox=76.04800165,18.31860358,132.0322222,50.78441&service=WMS&format=image/png&srs=EPSG:4326&request=GetMap&height=550
-     * 
-     * Parameter by parameter (note width/height):
-     * http://worldmap.harvard.edu/download/wms/14708/png?
-     *           layers=geonode:power_plants_enipedia_jan_2014_kvg
-     *           width=948
-     *           bbox=76.04800165,18.31860358,132.0322222,50.78441
-     *           service=WMS
-     *           format=image/png
-     *           srs=EPSG:4326
-     *           request=GetMap
-     *           height=550
-     * 
-     * @param mapLayerMetadata
-     * @return boolean
-     * @throws IOException 
-     */
-    public boolean retrieveMapImageForIcon(MapLayerMetadata mapLayerMetadata) throws IOException {
-        if (mapLayerMetadata==null){
-            logger.warning("mapLayerMetadata is null");
-            return false;
-        }
-        
-        this.deleteOlderMapThumbnails(mapLayerMetadata.getDataFile());
-
-        if ((mapLayerMetadata.getMapImageLink()==null)||mapLayerMetadata.getMapImageLink().isEmpty()){
-            logger.warning("mapLayerMetadata does not have a 'map_image_link' attribute");
-            return false;
-        }
-        
-        String imageUrl = mapLayerMetadata.getMapImageLink();
-        imageUrl = imageUrl.replace("https:", "http:");
-        logger.info("Attempt to retrieve map image: " + imageUrl);
-        
-        StorageIO<DataFile> dataAccess = null;
-        try {
-            dataAccess = mapLayerMetadata.getDataFile().getStorageIO();
-        } catch (IOException ioEx) {
-            dataAccess = null;
-        }
-
-        if (dataAccess == null) {
-            logger.warning("Failed to open Access IO on DataFile "+mapLayerMetadata.getDataFile().getId());
-            return false;
-        }
-
-        URL url = new URL(imageUrl);
-        logger.info("retrieve url : " + imageUrl);
-
-        logger.info("try to open InputStream");
-        InputStream is = null;
-        
-        try{
-            is = url.openStream();
-        }catch(IOException exio){
-            logger.warning("Error when retrieving map icon image. Exception: " + exio.getMessage());
-            if (is!=null){
-                try { is.close(); } catch (IOException ignore) {}
-            }
-            return false;
-        }
-        
-        try {
-            dataAccess.saveInputStreamAsAux(is, "img");
-        } catch (IOException ioex) {
-            logger.warning("Failed to save WorldMap-generated image; "+ioex.getMessage());
-            return false;
-        }
-        
-        logger.info("Done");
-        return true;
-    }   
-    
-    /* 
-     * This method calls GeoConnect and requests that a map layer for this 
-     * DataFile is deleted, from WorldMap and GeoConnect itself.
-     * The use case here is when a user restricts a tabular file for which 
-     * a geospatial map has already been made. 
-     * This process is initiated on the Dataverse side, without any GeoConnect
-     * UI in the picture. (The way a user normally deletes a layer map is by 
-     * clicking 'Delete' on the GeoConnect map page). 
-     * Otherwise this call follows the scheme used when accessing the 
-     * /shapefile/map-it on GeoConnect - we send along a WorldMap token and a 
-     * callback url for GC to download the file metadata.metadata
-     * Depending on how it goes we receive a yes or no response from the server.
-    */
-    public void deleteMapLayerFromWorldMap(DataFile dataFile, AuthenticatedUser user) throws IOException {
-
-        
-        if (dataFile == null){
-            logger.severe("dataFile cannot be null");
-            return;
-        }
-        
-        if (user == null){
-            logger.severe("user cannot be null");
-            return;            
-        }
-        
-        // Worldmap token: 
-        WorldMapToken token = tokenServiceBean.getNewToken(dataFile, user);
-        if (token == null){
-            logger.severe("token should NOT be null");
-            return;
-        }
-       
-        logger.info("-- new token id: " + token.getId());
-        // Callback url for geoConnect: 
-        String callback_url = URLEncoder.encode(systemConfig.getDataverseSiteUrl() + WorldMapRelatedData.GET_WORLDMAP_DATAFILE_API_PATH);
-        
-        String geoConnectAddress = token.getApplication().getMapitLink();
-        /* 
-         * this is a bit of a hack - there should be a cleaner way to get the base 
-         * geoconnect URL from the token!
-        */
-        geoConnectAddress = geoConnectAddress.replace("/shapefile/map-it", "");
-        
-        logger.log(Level.INFO, "callback_url: {0}", callback_url);
-        
-        //String geoConnectCommand = geoConnectAddress + GEOCONNECT_MAP_DELETE_API + token.getApplication().getMapitLink() + "/" + token.getToken() + "/?cb=" +  callback_url;
-        String geoConnectCommand = geoConnectAddress + GEOCONNECT_MAP_DELETE_API + token.getToken() + "/?cb=" +  callback_url;
-        logger.info("-- new token id 2: " + token.getId());
-
-        
-        logger.info("Attempting to call GeoConnect to request that the WorldMap layer for DataFile "+dataFile.getId()+":\n"+geoConnectCommand);
-        URL geoConnectUrl = new URL(geoConnectCommand);
-        
-        HttpURLConnection geoConnectConnection = (HttpURLConnection)geoConnectUrl.openConnection();
-        
-        geoConnectConnection.setRequestMethod("GET");
-        geoConnectConnection.connect();
-        
-        int code = geoConnectConnection.getResponseCode();
-        logger.info("response code: " + code);
-        if (code != 200) {
-            throw new IOException ("Failed to delete Map Layer via GeoConnect. /tabular/delete-map HTTP code response: "+code+"");
-        }
-        logger.info("response :" + geoConnectConnection.getContent());
-        
-    }
-
-    public List<MapLayerMetadata> findAll() {
-        TypedQuery<MapLayerMetadata> typedQuery = em.createNamedQuery("MapLayerMetadata.findAll", MapLayerMetadata.class);
-        List<MapLayerMetadata> mapLayerMetadatas = typedQuery.getResultList();
-        return mapLayerMetadatas;
-    }
-
-}
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/MetadataBlock.java b/src/main/java/edu/harvard/iq/dataverse/MetadataBlock.java
index 1a1a87b1b87..c6bf01868c6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/MetadataBlock.java
+++ b/src/main/java/edu/harvard/iq/dataverse/MetadataBlock.java
@@ -1,26 +1,28 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.json.JsonLDNamespace;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.MissingResourceException;
 import java.util.Objects;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 
 /**
  *
@@ -33,7 +35,7 @@
     @NamedQuery( name="MetadataBlock.findByName", query = "SELECT mdb FROM MetadataBlock mdb WHERE mdb.name=:name")
 })
 @Entity
-public class MetadataBlock implements Serializable {
+public class MetadataBlock implements Serializable, Comparable {
 
     private static final long serialVersionUID = 1L;
     
@@ -66,9 +68,26 @@ public void setName(String name) {
     public String getNamespaceUri() {
         return namespaceUri;
     }
+    
     public void setNamespaceUri(String namespaceUri) {
         this.namespaceUri = namespaceUri;
     }
+    
+    private String getAssignedNamespaceUri() {
+        String nsUri = getNamespaceUri();
+        // Standard blocks will have a namespaceUri
+        if (nsUri == null) {
+            // Locally created/edited blocks, legacy blocks may not have a defined
+            // namespaceUri, so generate one that indicates that this is a locally defined
+            // term
+            nsUri = SystemConfig.getDataverseSiteUrlStatic() + "/schema/" + name + "#";
+        }
+        return nsUri;
+    }
+    
+    public JsonLDNamespace getJsonLDNamespace() {
+        return JsonLDNamespace.defineNamespace(name, getAssignedNamespaceUri());
+    }
 
     @OneToMany(mappedBy = "metadataBlock", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     @OrderBy("displayOrder")
@@ -82,6 +101,12 @@ public void setDatasetFieldTypes(List<DatasetFieldType> datasetFieldTypes) {
     }
     
     public boolean isDisplayOnCreate() {
+        //Localize case - e.g. being called in the context of a specific collection 
+        if (getLocalDisplayOnCreate() != null){
+            return getLocalDisplayOnCreate();
+        }
+        // Non-localized case - the datasetFieldTypes are straight from the database and
+        // never have dsfType.localDsiplayOnCreate set.
         for (DatasetFieldType dsfType : datasetFieldTypes) {
             if (dsfType.isDisplayOnCreate()) {
                 return true;
@@ -89,6 +114,17 @@ public boolean isDisplayOnCreate() {
         }
         return false;
     }
+    
+    @Transient
+    private Boolean localDisplayOnCreate;
+
+    public Boolean getLocalDisplayOnCreate() {
+        return localDisplayOnCreate;
+    }
+
+    public void setLocalDisplayOnCreate(Boolean localDisplayOnCreate) {
+        this.localDisplayOnCreate = localDisplayOnCreate;
+    }
 
     public String getDisplayName() {
         return displayName;
@@ -183,12 +219,28 @@ public String toString() {
         return "edu.harvard.iq.dataverse.MetadataBlock[ id=" + id + " ]";
     }
 
-    public String getLocaleDisplayName()
-    {
+    public String getLocaleDisplayName() {
+        return getLocaleValue("metadatablock.displayName");
+    }
+
+    public String getLocaleDisplayFacet() {
+        return getLocaleValue("metadatablock.displayFacet");
+    }
+
+    // Visible for testing
+    String getLocaleValue(String metadataBlockKey) {
         try {
-            return BundleUtil.getStringFromPropertyFile("metadatablock.displayName", getName());
+            return BundleUtil.getStringFromPropertyFile(metadataBlockKey, getName());
         } catch (MissingResourceException e) {
             return displayName;
         }
     }
+
+    @Override
+    public int compareTo(Object arg0) {
+        //guaranteeing that citation will be shown first with custom blocks in order of creation
+        MetadataBlock other = (MetadataBlock) arg0;
+        Long t = "citation".equals(name) ? -1 : this.getId();
+        return t.compareTo("citation".equals(other.name) ? -1 : other.getId());
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/MetadataBlockConverter.java b/src/main/java/edu/harvard/iq/dataverse/MetadataBlockConverter.java
index 92cbef6dda7..49c50e82efb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/MetadataBlockConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/MetadataBlockConverter.java
@@ -5,12 +5,13 @@
  */
 package edu.harvard.iq.dataverse;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.inject.spi.CDI;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
 
 /**
  *
@@ -19,8 +20,8 @@
 @FacesConverter("metadataBlockConverter")
 public class MetadataBlockConverter implements Converter {
 
-    @EJB
-    DataverseServiceBean dataverseService;
+    //@EJB
+    DataverseServiceBean dataverseService = CDI.current().select(DataverseServiceBean.class).get();
 
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
         MetadataBlock mdb = dataverseService.findMDB(new Long(submittedValue));
diff --git a/src/main/java/edu/harvard/iq/dataverse/MetadataBlockServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MetadataBlockServiceBean.java
index a25480102f2..9a5a1060c50 100644
--- a/src/main/java/edu/harvard/iq/dataverse/MetadataBlockServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/MetadataBlockServiceBean.java
@@ -1,45 +1,114 @@
 package edu.harvard.iq.dataverse;
 
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.*;
+
+import java.util.Comparator;
 import java.util.List;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
 
 /**
- *
  * @author michael
  */
 @Stateless
 @Named
 public class MetadataBlockServiceBean {
-    
+
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
-    
-    
-    
+
     public MetadataBlock save(MetadataBlock mdb) {
-       return em.merge(mdb);
-    }   
-    
-    
+        return em.merge(mdb);
+    }
+
     public List<MetadataBlock> listMetadataBlocks() {
+        return listMetadataBlocks(false);
+    }
+
+    public List<MetadataBlock> listMetadataBlocks(boolean onlyDisplayedOnCreate) {
+        if (onlyDisplayedOnCreate) {
+            return listMetadataBlocksDisplayedOnCreate(null);
+        }
         return em.createNamedQuery("MetadataBlock.listAll", MetadataBlock.class).getResultList();
     }
-    
-    public MetadataBlock findById( Long id ) {
+
+    public MetadataBlock findById(Long id) {
         return em.find(MetadataBlock.class, id);
     }
-    
-    public MetadataBlock findByName( String name ) {
+
+    public MetadataBlock findByName(String name) {
         try {
             return em.createNamedQuery("MetadataBlock.findByName", MetadataBlock.class)
-                        .setParameter("name", name)
-                        .getSingleResult();
-        } catch ( NoResultException nre ) {
+                    .setParameter("name", name)
+                    .getSingleResult();
+        } catch (NoResultException nre) {
             return null;
         }
     }
+
+    public List<MetadataBlock> listMetadataBlocksDisplayedOnCreate(Dataverse ownerDataverse) {
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<MetadataBlock> criteriaQuery = criteriaBuilder.createQuery(MetadataBlock.class);
+        Root<Dataverse> dataverseRoot = criteriaQuery.from(Dataverse.class);
+
+        // Join metadataBlocks from Dataverse
+        Join<Dataverse, MetadataBlock> metadataBlockJoin = dataverseRoot.join("metadataBlocks");
+
+        // Join datasetFieldTypes from MetadataBlock
+        Join<MetadataBlock, DatasetFieldType> datasetFieldTypeJoin = metadataBlockJoin.join("datasetFieldTypes");
+
+        Predicate displayOnCreatePredicate = criteriaBuilder.isTrue(datasetFieldTypeJoin.get("displayOnCreate"));
+        Predicate requiredPredicate = criteriaBuilder.isTrue(datasetFieldTypeJoin.get("required"));
+
+        if (ownerDataverse != null) {
+            // Ensure we filter for the specific Dataverse
+            Predicate dataversePredicate = criteriaBuilder.equal(dataverseRoot.get("id"), ownerDataverse.getId());
+
+            // Join DataverseFieldTypeInputLevel (LEFT JOIN)
+            Join<Dataverse, DataverseFieldTypeInputLevel> datasetFieldTypeInputLevelJoin =
+                    dataverseRoot.join("dataverseFieldTypeInputLevels", JoinType.LEFT);
+
+            // Check if input level explicitly defines displayOnCreate
+            Predicate inputLevelDisplayPredicate = criteriaBuilder.and(
+                    criteriaBuilder.equal(datasetFieldTypeInputLevelJoin.get("datasetFieldType"), datasetFieldTypeJoin),
+                    criteriaBuilder.isTrue(datasetFieldTypeInputLevelJoin.get("displayOnCreate"))
+            );
+
+            // Check if input level explicitly defines required
+            Predicate inputLevelRequiredPredicate = criteriaBuilder.and(
+                    criteriaBuilder.equal(datasetFieldTypeInputLevelJoin.get("datasetFieldType"), datasetFieldTypeJoin),
+                    criteriaBuilder.isTrue(datasetFieldTypeInputLevelJoin.get("required"))
+            );
+
+            Predicate finalDisplayPredicate = criteriaBuilder.or(inputLevelDisplayPredicate, displayOnCreatePredicate);
+            Predicate finalRequiredPredicate = criteriaBuilder.or(inputLevelRequiredPredicate, requiredPredicate);
+
+            criteriaQuery.where(
+                    dataversePredicate,
+                    criteriaBuilder.or(finalDisplayPredicate, finalRequiredPredicate)
+            );
+        } else {
+            // When ownerDataverse is null, we need to include fields that are either displayOnCreate=true OR required=true
+            // We also need to ensure that fields from linked metadata blocks are included
+            Predicate linkedFieldsPredicate = criteriaBuilder.and(
+                    criteriaBuilder.isNotNull(datasetFieldTypeJoin.get("id")),
+                    criteriaBuilder.or(displayOnCreatePredicate, requiredPredicate)
+            );
+
+            criteriaQuery.where(linkedFieldsPredicate);
+        }
+
+        criteriaQuery.select(metadataBlockJoin).distinct(true);
+
+        List<MetadataBlock> result = em.createQuery(criteriaQuery).getResultList();
+
+        // Order by id
+        result.sort(Comparator.comparing(MetadataBlock::getId));
+
+        return result;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/Metric.java b/src/main/java/edu/harvard/iq/dataverse/Metric.java
index b1b1a276ceb..0e71ab44db4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Metric.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Metric.java
@@ -5,19 +5,20 @@
  */
 package edu.harvard.iq.dataverse;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 /**
  *
@@ -46,6 +47,10 @@ public class Metric implements Serializable {
     @Column(columnDefinition = "TEXT", nullable = true)
     private String dayString;
 
+    @ManyToOne(optional=true)
+    @JoinColumn(name="dataverse_id", nullable=true)
+    private Dataverse dataverse;
+    
     @Temporal(value = TemporalType.TIMESTAMP)
     @Column(nullable = false)
     private Date lastCalledDate;
@@ -55,16 +60,21 @@ public Metric() {
     }
 
     //For monthly and day metrics
-    
-    public Metric(String name, String dayString, String dataLocation, String value) throws IOException {
-        if(null == name || null == value) {
-            throw new IOException("A created metric must have a metricName and metricValue");
-        }
+    /**
+     * 
+     * @param name - metric name
+     * @param dayString - how many days (day metric only)
+     * @param dataLocation - local, remote, all
+     * @param d - the parent dataverse
+     * @param value - the value to cache
+     */
+    public Metric(String name, String dayString, String dataLocation, Dataverse d, String value) {
         this.name = name;
         this.valueJson = value;
         this.dataLocation = dataLocation;
         this.dayString = dayString;
         this.lastCalledDate = new Timestamp(new Date().getTime());
+        this.dataverse = d;
     }
 
     /**
@@ -121,4 +131,12 @@ public void setLastCalledDate(Date calledDate) {
         this.lastCalledDate = calledDate;
     }
 
+    public Dataverse getDataverse() {
+        return dataverse;
+    }
+
+    public void setDataverse(Dataverse dataverse) {
+        this.dataverse = dataverse;
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/NavigationWrapper.java b/src/main/java/edu/harvard/iq/dataverse/NavigationWrapper.java
index c9bc8722391..54fb8f211a6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/NavigationWrapper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/NavigationWrapper.java
@@ -14,13 +14,14 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -87,6 +88,10 @@ public String notAuthorized(){
         }        
     }
     
+    public String tooManyRequests() {
+        return sendError(Status.TOO_MANY_REQUESTS.getStatusCode());
+    }
+     
     public String notFound() {
         return sendError(HttpServletResponse.SC_NOT_FOUND);
     }
@@ -96,7 +101,8 @@ private String sendError(int errorCode) {
         try {
             context.getExternalContext().responseSendError(errorCode,null);
         } catch (IOException ex) {
-            Logger.getLogger(PermissionsWrapper.class.getName()).log(Level.SEVERE, null, ex);
+            //Logger.getLogger(PermissionsWrapper.class.getName()).log(Level.SEVERE, null, ex);
+            Logger.getLogger(NavigationWrapper.class.getName()).fine("Caught exception in sendError(): "+ex.getMessage());
         }
         context.responseComplete();
         return "";
diff --git a/src/main/java/edu/harvard/iq/dataverse/PackagePopupFragmentBean.java b/src/main/java/edu/harvard/iq/dataverse/PackagePopupFragmentBean.java
index fac2abeddb8..0c5218fb927 100644
--- a/src/main/java/edu/harvard/iq/dataverse/PackagePopupFragmentBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/PackagePopupFragmentBean.java
@@ -6,8 +6,8 @@
 
 package edu.harvard.iq.dataverse;
 
-import javax.faces.view.ViewScoped;
-import javax.inject.Named;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Named;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
index ef6aeea4d0f..f1099c0a439 100644
--- a/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
@@ -2,42 +2,43 @@
 
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IPv4Address;
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IPv6Address;
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
-import edu.harvard.iq.dataverse.authorization.groups.Group;
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
-import edu.harvard.iq.dataverse.authorization.groups.GroupUtil;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.engine.command.Command;
-import java.util.EnumSet;
-import java.util.Map;
-import java.util.Set;
+
+import java.util.*;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.util.HashSet;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import static edu.harvard.iq.dataverse.engine.command.CommandHelper.CH;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.PublishDatasetCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.logging.Level;
+import edu.harvard.iq.dataverse.workflow.PendingWorkflowInvocation;
+import edu.harvard.iq.dataverse.workflow.WorkflowServiceBean;
+
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import static java.util.stream.Collectors.toList;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 
 /**
  * Your one-stop-shop for deciding which user can do what action on which
@@ -75,6 +76,9 @@ public class PermissionServiceBean {
     
     @EJB
     DvObjectServiceBean dvObjectServiceBean;
+    
+    @EJB 
+    WorkflowServiceBean workflowService;
 
     @PersistenceContext
     EntityManager em;
@@ -88,6 +92,73 @@ public class PermissionServiceBean {
     @Inject
     DataverseRequestServiceBean dvRequestService;
 
+    @Inject
+    DatasetVersionFilesServiceBean datasetVersionFilesServiceBean;
+
+    private static final String LIST_ALL_DATAVERSES_USER_HAS_PERMISSION = """
+            WITH grouplist AS (
+                  SELECT explicitgroup_authenticateduser.explicitgroup_id as id FROM explicitgroup_authenticateduser
+                  WHERE explicitgroup_authenticateduser.containedauthenticatedusers_id = @USERID
+                )
+                        
+                SELECT * FROM DATAVERSE WHERE id IN (
+                  SELECT definitionpoint_id
+                  FROM roleassignment
+                  WHERE roleassignment.assigneeidentifier IN (
+                    SELECT CONCAT('&explicit/', explicitgroup.groupalias) as assignee
+                    FROM explicitgroup
+                    WHERE explicitgroup.id IN (
+                      (
+                      SELECT explicitgroup.id id
+                      FROM explicitgroup
+                      WHERE EXISTS (SELECT id FROM grouplist WHERE id = explicitgroup.id)
+                      ) UNION (
+                      SELECT explicitgroup_explicitgroup.containedexplicitgroups_id id
+                      FROM explicitgroup_explicitgroup
+                      WHERE EXISTS (SELECT id FROM grouplist WHERE id = explicitgroup_explicitgroup.explicitgroup_id)
+                      AND EXISTS (SELECT id FROM dataverserole
+                        WHERE dataverserole.id = roleassignment.role_id AND (dataverserole.permissionbits & @PERMISSIONBIT !=0))
+                      )
+                    )
+                  ) UNION (
+                    SELECT definitionpoint_id
+                    FROM roleassignment
+                    WHERE roleassignment.assigneeidentifier = (
+                      SELECT CONCAT('@', authenticateduser.useridentifier)
+                      FROM authenticateduser
+                      WHERE authenticateduser.id = @USERID)
+                        AND EXISTS (SELECT id FROM dataverserole
+                        WHERE dataverserole.id = roleassignment.role_id AND (dataverserole.permissionbits & @PERMISSIONBIT !=0))
+                  ) UNION (
+                     SELECT definitionpoint_id
+                     FROM roleassignment
+                     WHERE roleassignment.assigneeidentifier = ':authenticated-users'
+                       AND EXISTS (SELECT id FROM dataverserole
+                       WHERE dataverserole.id = roleassignment.role_id AND (dataverserole.permissionbits & @PERMISSIONBIT !=0))
+                  ) UNION (
+                     SELECT definitionpoint_id
+                     FROM roleassignment
+                     WHERE roleassignment.assigneeidentifier IN (
+                       SELECT CONCAT('&shib/', persistedglobalgroup.persistedgroupalias) as assignee
+                       FROM persistedglobalgroup
+                       WHERE dtype = 'ShibGroup'
+                       AND EXISTS (SELECT id FROM dataverserole WHERE dataverserole.id = roleassignment.role_id AND (dataverserole.permissionbits & @PERMISSIONBIT !=0))
+                     )
+                  ) UNION (
+                     SELECT definitionpoint_id
+                     FROM roleassignment
+                     WHERE roleassignment.assigneeidentifier IN (
+                       SELECT CONCAT('&ip/', persistedglobalgroup.persistedgroupalias) as assignee
+                       FROM persistedglobalgroup
+                       LEFT OUTER JOIN ipv4range ON persistedglobalgroup.id = ipv4range.owner_id
+                       LEFT OUTER JOIN ipv6range ON persistedglobalgroup.id = ipv6range.owner_id
+                       WHERE dtype = 'IpGroup'
+                       AND EXISTS (SELECT id FROM dataverserole WHERE dataverserole.id = roleassignment.role_id AND (dataverserole.permissionbits & @PERMISSIONBIT !=0))
+                       AND @IPRANGESQL
+                     )
+                  )
+                )
+            """;
     /**
      * A request-level permission query (e.g includes IP ras).
      */
@@ -433,22 +504,14 @@ private Set<Permission> getInferredPermissions(DvObject dvo) {
      * download permission for everybody:
      */
     private boolean isPublicallyDownloadable(DvObject dvo) {
-        if (dvo instanceof DataFile) {
+        if (dvo instanceof DataFile df) {
             // unrestricted files that are part of a release dataset 
             // automatically get download permission for everybody:
             //      -- L.A. 4.0 beta12
-
-            DataFile df = (DataFile) dvo;
-
             if (!df.isRestricted()) {
-                if (df.getOwner().getReleasedVersion() != null) {
-                    if (df.getOwner().getReleasedVersion().getFileMetadatas() != null) {
-                        for (FileMetadata fm : df.getOwner().getReleasedVersion().getFileMetadatas()) {
-                            if (df.equals(fm.getDataFile())) {
-                                return true;
-                            }
-                        }
-                    }
+                DatasetVersion releasedVersion = df.getOwner().getReleasedVersion();
+                if (releasedVersion != null) {
+                    return datasetVersionFilesServiceBean.isDataFilePresentInDatasetVersion(releasedVersion, df);
                 }
             }
         }
@@ -549,36 +612,6 @@ public RequestPermissionQuery request(DataverseRequest req) {
         return new RequestPermissionQuery(null, req);
     }
 
-    /**
-     * Go from (User, Permission) to a list of Dataverse objects that the user
- has the permission on.
-     *
-     * @param user
-     * @param permission
-     * @return The list of dataverses {@code user} has permission
- {@code permission} on.
-     */
-    public List<Dataverse> getDataversesUserHasPermissionOn(AuthenticatedUser user, Permission permission) {
-        Set<Group> groups = groupService.groupsFor(user);
-        String identifiers = GroupUtil.getAllIdentifiersForUser(user, groups);
-        /**
-         * @todo Are there any strings in identifiers that would break this SQL
-         * query?
-         */
-        String query = "SELECT id FROM dvobject WHERE dtype = 'Dataverse' and id in (select definitionpoint_id from roleassignment where assigneeidentifier in (" + identifiers + "));";
-        logger.log(Level.FINE, "query: {0}", query);
-        Query nativeQuery = em.createNativeQuery(query);
-        List<Integer> dataverseIdsToCheck = nativeQuery.getResultList();
-        List<Dataverse> dataversesUserHasPermissionOn = new LinkedList<>();
-        for (int dvIdAsInt : dataverseIdsToCheck) {
-            Dataverse dataverse = dataverseService.find(Long.valueOf(dvIdAsInt));
-            if (userOn(user, dataverse).has(permission)) {
-                dataversesUserHasPermissionOn.add(dataverse);
-            }
-        }
-        return dataversesUserHasPermissionOn;
-    }
-
     public List<AuthenticatedUser> getUsersWithPermissionOn(Permission permission, DvObject dvo) {
         List<AuthenticatedUser> usersHasPermissionOn = new LinkedList<>();
         Set<RoleAssignment> ras = roleService.rolesAssignments(dvo);
@@ -708,28 +741,84 @@ public List<Long> getDvObjectIdsUserHasRoleOn(User user, List<DataverseRole> rol
 
     public void checkEditDatasetLock(Dataset dataset, DataverseRequest dataverseRequest, Command command) throws IllegalCommandException {
         if (dataset.isLocked()) {
-            if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
+            if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            else if (dataset.isLockedFor(DatasetLock.Reason.finalizePublication)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            // TODO: Do we need to check for "Workflow"? Should the message be more specific?
+            else if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
+                if (!isMatchingWorkflowLock(dataset, dataverseRequest.getUser().getIdentifier(),
+                        dataverseRequest.getWFInvocationId())) {
+                    throw new IllegalCommandException(
+                            BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                }
+            }
+            // TODO: Do we need to check for "DcmUpload"? Should the message be more specific?
+            else if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            else if (dataset.isLockedFor(DatasetLock.Reason.GlobusUpload)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            else if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            else if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
                 // The "InReview" lock is not really a lock for curators. They can still make edits.
                 if (!isUserAllowedOn(dataverseRequest.getUser(), new PublishDatasetCommand(dataset, dataverseRequest, true), dataset)) {
                     throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowedInReview"), command);
                 }
+            } else {
+                //catch all for locked for any other reason
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
             }
+        }
+    }
+
+    public void checkUpdateDatasetVersionLock(Dataset dataset, DataverseRequest dataverseRequest, Command<?> command) throws IllegalCommandException {
+        boolean hasAtLeastOneLockThatIsNotAnIngestLock = dataset.isLocked() && dataset.getLocks().stream()
+            .anyMatch(lock -> !DatasetLock.Reason.Ingest.equals(lock.getReason()));
+        if (hasAtLeastOneLockThatIsNotAnIngestLock) {
+            checkEditDatasetLock(dataset, dataverseRequest, command);
+        }
+    }
+    
+    public void checkPublishDatasetLock(Dataset dataset, DataverseRequest dataverseRequest, Command command) throws IllegalCommandException {
+        if (dataset.isLocked()) {
             if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
-            if (dataset.isLockedFor(DatasetLock.Reason.pidRegister)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            else if (dataset.isLockedFor(DatasetLock.Reason.finalizePublication)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
             // TODO: Do we need to check for "Workflow"? Should the message be more specific?
-            if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            else if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
+                if (!isMatchingWorkflowLock(dataset, dataverseRequest.getUser().getIdentifier(),
+                        dataverseRequest.getWFInvocationId())) {
+                    throw new IllegalCommandException(
+                            BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
+                }
             }
             // TODO: Do we need to check for "DcmUpload"? Should the message be more specific?
-            if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            else if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
-            if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            else if (dataset.isLockedFor(DatasetLock.Reason.GlobusUpload)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
+            }
+            else if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
+            }
+            else if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
+                // The "InReview" lock is not really a lock for curators. They can still publish
+                if (!isUserAllowedOn(dataverseRequest.getUser(), new PublishDatasetCommand(dataset, dataverseRequest, true), dataset)) {
+                    throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
+                }
+            } else {
+                //catch all for locked for some other reason
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
         }
     }
@@ -742,21 +831,159 @@ public void checkDownloadFileLock(Dataset dataset, DataverseRequest dataverseReq
                     throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.downloadNotAllowedInReview"), command);
                 }
             }
-            if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
+            else if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
                 throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.downloadNotAllowed"), command);
             }
-            if (dataset.isLockedFor(DatasetLock.Reason.pidRegister)) {
+            else if (dataset.isLockedFor(DatasetLock.Reason.finalizePublication)) {
                 throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.downloadNotAllowed"), command);
             }
             // TODO: Do we need to check for "Workflow"? Should the message be more specific?
-            if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.downloadNotAllowed"), command);
+            else if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
+                if (!isMatchingWorkflowLock(dataset, dataverseRequest.getUser().getIdentifier(),
+                        dataverseRequest.getWFInvocationId())) {
+                    throw new IllegalCommandException(
+                            BundleUtil.getStringFromBundle("dataset.message.locked.downloadNotAllowed"), command);
+                }
             }
             // TODO: Do we need to check for "DcmUpload"? Should the message be more specific?
-            if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload)) {
+            else if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload)) {
                 throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.downloadNotAllowed"), command);
             }
         }
     }
+    
+    public boolean isMatchingWorkflowLock(Dataset d, String userId, String invocationId) {
+        if (invocationId != null) {
+            PendingWorkflowInvocation pwfi = workflowService.getPendingWorkflow(invocationId);
+            for (DatasetLock dl : d.getLocks()) {
+                if (dl.getId().equals(pwfi.getLockId()) && pwfi.getUserId().equals(userId)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks if a DataverseRequest can download at least one file of the target DatasetVersion.
+     *
+     * @param dataverseRequest DataverseRequest to check
+     * @param datasetVersion DatasetVersion to check
+     * @return boolean indicating whether the user can download at least one file or not
+     */
+    public boolean canDownloadAtLeastOneFile(DataverseRequest dataverseRequest, DatasetVersion datasetVersion) {
+        if (hasUnrestrictedReleasedFiles(datasetVersion)) {
+            return true;
+        }
+        List<FileMetadata> fileMetadatas = datasetVersion.getFileMetadatas();
+        for (FileMetadata fileMetadata : fileMetadatas) {
+            DataFile dataFile = fileMetadata.getDataFile();
+            Set<RoleAssignee> roleAssignees = new HashSet<>(groupService.groupsFor(dataverseRequest, dataFile));
+            roleAssignees.add(dataverseRequest.getUser());
+            if (hasGroupPermissionsFor(roleAssignees, dataFile, EnumSet.of(Permission.DownloadFile))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks if a DatasetVersion has unrestricted released files.
+     *
+     * This method is mostly based on {@link #isPublicallyDownloadable(DvObject)} although in this case, instead of basing
+     * the search on a particular file, it searches for the total number of files in the target version that are present
+     * in the released version.
+     *
+     * @param targetDatasetVersion DatasetVersion to check
+     * @return boolean indicating whether the dataset version has released files or not
+     */
+    private boolean hasUnrestrictedReleasedFiles(DatasetVersion targetDatasetVersion) {
+        Dataset targetDataset = targetDatasetVersion.getDataset();
+        if (!targetDataset.isReleased()) {
+            return false;
+        }
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
+        Root<DatasetVersion> datasetVersionRoot = criteriaQuery.from(DatasetVersion.class);
+        Root<FileMetadata> fileMetadataRoot = criteriaQuery.from(FileMetadata.class);
+        criteriaQuery
+                .select(criteriaBuilder.count(fileMetadataRoot))
+                .where(criteriaBuilder.and(
+                        criteriaBuilder.equal(fileMetadataRoot.get("dataFile").get("restricted"), false),
+                        criteriaBuilder.equal(datasetVersionRoot.get("dataset"), targetDataset),
+                        criteriaBuilder.equal(datasetVersionRoot.get("versionState"), DatasetVersion.VersionState.RELEASED),
+                        fileMetadataRoot.in(targetDatasetVersion.getFileMetadatas()),
+                        fileMetadataRoot.in(datasetVersionRoot.get("fileMetadatas"))));
+        Long result = em.createQuery(criteriaQuery).getSingleResult();
+        return result > 0;
+    }
+
+    public List<Dataverse> findPermittedCollections(DataverseRequest request, AuthenticatedUser user, Permission permission) {
+        return findPermittedCollections(request, user, 1 << permission.ordinal());
+    }
+
+    public List<Dataverse> findPermittedCollections(DataverseRequest request, AuthenticatedUser user, int permissionBit) {
+        if (user != null) {
+            // IP Group - Only check IP if a User is calling for themself
+            String ipRangeSQL = "FALSE";
+            if (request != null
+                    && request.getAuthenticatedUser() != null
+                    && request.getSourceAddress() != null
+                    && request.getAuthenticatedUser().getUserIdentifier().equalsIgnoreCase(user.getUserIdentifier())) {
+                IpAddress ip = request.getSourceAddress();
+                if (ip instanceof IPv4Address) {
+                    IPv4Address ipv4 = (IPv4Address) ip;
+                    ipRangeSQL = ipv4.toBigInteger() + " BETWEEN ipv4range.bottomaslong AND ipv4range.topaslong";
+                } else if (ip instanceof IPv6Address) {
+                    IPv6Address ipv6 = (IPv6Address) ip;
+                    long[] vals = ipv6.toLongArray();
+                    if (vals.length == 4) {
+                        ipRangeSQL = """
+                                (@0 BETWEEN ipv6range.bottoma AND ipv6range.topa
+                                AND @1 BETWEEN ipv6range.bottomb AND ipv6range.topb
+                                AND @2 BETWEEN ipv6range.bottomc AND ipv6range.topc
+                                AND @3 BETWEEN ipv6range.bottomd AND ipv6range.topd)
+                                """;
+                        for (int i = 0; i < vals.length; i++) {
+                            ipRangeSQL = ipRangeSQL.replace("@" + i, String.valueOf(vals[i]));
+                        }
+                    }
+                }
+            }
+
+            String sqlCode = LIST_ALL_DATAVERSES_USER_HAS_PERMISSION
+                    .replace("@USERID", String.valueOf(user.getId()))
+                    .replace("@PERMISSIONBIT", String.valueOf(permissionBit))
+                    .replace("@IPRANGESQL", ipRangeSQL);
+            return em.createNativeQuery(sqlCode, Dataverse.class).getResultList();
+        }
+        return null;
+    }
+
+    /**
+     * Calculates the complete list of role assignments for a given user on a DvObject.
+     * This includes roles assigned directly to the user and roles inherited from any groups
+     * the user is a member of.
+     * <p>
+     * This method's logic is based on the private method {@code getRoleStringFromUser}
+     * in the {@code DataverseUserPage} class, which produces a concatenated string of
+     * effective user role names required for displaying role-related user notifications.
+     * The common logic from these two methods may be centralized in the future to
+     * avoid code duplication.
+     *
+     * @param user The authenticated user whose roles are being checked.
+     * @param dvObject The dataverse object to check for role assignments.
+     * @return A List containing all effective RoleAssignments for the user. Never null.
+     */
+    public List<RoleAssignment> getEffectiveRoleAssignments(AuthenticatedUser user, DvObject dvObject) {
+        Stream<RoleAssignment> directAssignments = assignmentsFor(user, dvObject).stream();
 
+        Stream<RoleAssignment> groupAssignments = groupService.groupsFor(user, dvObject)
+                .stream()
+                .flatMap(group -> assignmentsFor(group, dvObject).stream());
+
+        return Stream.concat(directAssignments, groupAssignments)
+                .collect(Collectors.toList());
+    }
 }
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/PermissionsWrapper.java b/src/main/java/edu/harvard/iq/dataverse/PermissionsWrapper.java
index 92892a7fe77..2c6f8ff2fb1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/PermissionsWrapper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/PermissionsWrapper.java
@@ -6,16 +6,18 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.groups.impl.builtin.AuthenticatedUsers;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.impl.*;
 import java.util.HashMap;
 import java.util.Map;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import java.util.logging.Logger;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 /**
  *
@@ -24,6 +26,7 @@
 @ViewScoped
 @Named
 public class PermissionsWrapper implements java.io.Serializable {
+    private static final Logger logger = Logger.getLogger(PermissionsWrapper.class.getName());
 
     @EJB
     PermissionServiceBean permissionService;
@@ -33,13 +36,25 @@ public class PermissionsWrapper implements java.io.Serializable {
     
     @Inject
     DataverseRequestServiceBean dvRequestService;
+    
+    @Inject
+    SettingsWrapper settingsWrapper;
 
+    // This map stores looked up permission results (boolean), for multiple DvObjects
+    // (referenced by the Long ids), for multiple Commands. The current session 
+    // user is assumed when lookups are performed. 
     private final Map<Long, Map<Class<? extends Command<?>>, Boolean>> commandMap = new HashMap<>();
+    
+    // In some instances our pages need to know whether Authenticated Users as a whole - 
+    // not a specific user! - can perform a specific action on a dataverse
+    // - such as create datasets or dataverses, in the current dv, or root etc. 
+    // These values can be used in rendered= logic, so we want to cache them too. 
+    private final Map<Long, Map<Class<? extends Command<?>>, Boolean>> authUsersCommandMap = new HashMap<>();
 
     // Maps for caching permissions lookup results:
     private final Map<Long, Boolean> fileDownloadPermissionMap = new HashMap<>(); // { DvObject.id : Boolean }
     private final Map<String, Boolean> datasetPermissionMap = new HashMap<>(); // { Permission human_name : Boolean }
-
+    
     /**
      * Check if the current Dataset can Issue Commands
      *
@@ -48,42 +63,39 @@ public class PermissionsWrapper implements java.io.Serializable {
      * @return {@code true} if the user can issue the command on the object.
      */
     public boolean canIssueCommand(DvObject dvo, Class<? extends Command<?>> command) {
-        if ((dvo==null) || (dvo.getId()==null)){
-            return false;
-        }
-        if (command==null){
+        if (dvo==null || dvo.getId()==null || command==null){
             return false;
         }
 
-        if (commandMap.containsKey(dvo.getId())) {
-            Map<Class<? extends Command<?>>, Boolean> dvoCommandMap = this.commandMap.get(dvo.getId());
-            if (dvoCommandMap.containsKey(command)) {
-                return dvoCommandMap.get(command);
-            } else {
-                return addCommandtoDvoCommandMap(dvo, command, dvoCommandMap);
-            }
+        if (checkDvoCacheForCommandAuthorization(dvo.getId(), command, commandMap) == null) {
+            boolean canIssueCommand = permissionService.requestOn(dvRequestService.getDataverseRequest(), dvo).canIssue(command);
+            logger.fine("retrieved authorization for " + command.toString() + " on dvo " + dvo.getId());
 
+            addCommandAuthorizationToDvoCache(dvo.getId(), command, commandMap, canIssueCommand);
         } else {
-            Map<Class<? extends Command<?>>, Boolean> newDvoCommandMap = new HashMap<>();
-            commandMap.put(dvo.getId(), newDvoCommandMap);
-            return addCommandtoDvoCommandMap(dvo, command, newDvoCommandMap);
+            logger.fine("using cached authorization for " + command.toString() + " on dvo " + dvo.getId());
         }
+        return checkDvoCacheForCommandAuthorization(dvo.getId(), command, commandMap);
     }
 
-    private boolean addCommandtoDvoCommandMap(DvObject dvo, Class<? extends Command<?>> command, Map<Class<? extends Command<?>>, Boolean> dvoCommandMap) {
-        if ( dvo==null || (dvo.getId()==null) ){
-            return false;
+    private Boolean checkDvoCacheForCommandAuthorization(Long id, Class<? extends Command<?>> command, Map<Long, Map<Class<? extends Command<?>>, Boolean>> dvoCommandMap) {
+        if (!dvoCommandMap.containsKey(id)) {
+            return null;
         }
-        if (command==null){
-            return false;
+        if (!dvoCommandMap.get(id).containsKey(command)) {
+            return null; 
         }
-        
-        boolean canIssueCommand;
-        canIssueCommand = permissionService.requestOn(dvRequestService.getDataverseRequest(), dvo).canIssue(command);
-        dvoCommandMap.put(command, canIssueCommand);
-        return canIssueCommand;
+        return dvoCommandMap.get(id).get(command);
     }
-
+    
+    
+    private void addCommandAuthorizationToDvoCache(Long id, Class<? extends Command<?>> command, Map<Long, Map<Class<? extends Command<?>>, Boolean>> dvoCommandMap, boolean canIssueCommand) {
+        if (!dvoCommandMap.containsKey(id)) {
+            dvoCommandMap.put(id, new HashMap<>());
+        }
+        dvoCommandMap.get(id).put(command, canIssueCommand);
+    }
+    
     /* Dataverse Commands */
 
     public boolean canIssueUpdateDataverseCommand(DvObject dvo) {
@@ -102,7 +114,11 @@ public boolean canIssueCreateDataverseCommand(DvObject dvo) {
         return canIssueCommand(dvo, CreateDataverseCommand.class);
     }
     
-    
+    // TODO: 
+    // Wondering if there's a reason why we don't attempt to cache the 
+    // looked up Permission.* results as well as Command authorizations
+    // (below). For starters, need to investigate just how much these 
+    // cost us under different scenarios. May be a moot point. -- L.A. 5.7
     public boolean canManagePermissions(DvObject dvo) {
         if (dvo==null || (dvo.getId()==null) ){
             return false;
@@ -142,7 +158,9 @@ public boolean canUpdateDataset(DataverseRequest dr, Dataset dataset) {
         return doesSessionUserHaveDataSetPermission(dr, dataset, Permission.EditDataset);
     }
     
-            
+    public boolean canManageFilesOnDataset(Dataset dataset) {
+        return doesSessionUserHaveDataSetPermission(dvRequestService.getDataverseRequest(), dataset, Permission.ManageFilePermissions);
+    }
     
     /**
      * (Using Raman's implementation in DatasetPage - moving it here, so that 
@@ -233,14 +251,41 @@ public boolean canIssueDeleteDatasetCommand(DvObject dvo){
         return canIssueCommand(dvo, DeleteDatasetCommand.class);
     }
     
-    // PLUBLISH DATASET
+    // PUBLISH DATASET
     public boolean canIssuePublishDatasetCommand(DvObject dvo){
         return canIssueCommand(dvo, PublishDatasetCommand.class);
     }
     
+    // For the dataverse_header fragment (and therefore, most of the pages),
+    // we need to know if authenticated users can add dataverses and datasets to the
+    // root collection. For the "Add Data" menu further in the search include fragment
+    // if the user is not logged in, the page will check if authenticated users can 
+    // add dataverses and datasets in the *current* dataverse. 
+    // These are not very expensive operations - but each take about 10 database queries, 
+    // and it'll add up quickly, if the page keeps evaluating the expressions repeatedly. 
+    // So these values absolutely need to be cached too. 
     
+    public boolean authenticatedUsersCanIssueCommand(DvObject dvo, Class<? extends Command<?>> command) {
+        if (dvo == null || dvo.getId() == null || command == null) {
+            return false;
+        }
+        if (checkDvoCacheForCommandAuthorization(dvo.getId(), command, authUsersCommandMap) == null) {
+            boolean canIssueCommand = permissionService.isUserAllowedOn(AuthenticatedUsers.get(), command, dvo);
+            logger.fine("retrieved the authorization for authenticated users to issue "+command.toString());
+            addCommandAuthorizationToDvoCache(dvo.getId(), command, authUsersCommandMap, canIssueCommand);
+        } else {
+            logger.fine("using cached authorization for authenticated users to issue "+command.toString());
+        }
+        return checkDvoCacheForCommandAuthorization(dvo.getId(), command, authUsersCommandMap);
+    }
     
+    public boolean authUsersCanCreateDatasetsInDataverse(Dataverse dataverse) {
+        return authenticatedUsersCanIssueCommand(dataverse, CreateNewDatasetCommand.class);
+    }
     
+    public boolean authUsersCanCreateDataversesInDataverse(Dataverse dataverse) {
+        return authenticatedUsersCanIssueCommand(dataverse, CreateDataverseCommand.class);
+    }
     
     // todo: move any calls to this to call NavigationWrapper   
     @Inject NavigationWrapper navigationWrapper;
@@ -252,5 +297,4 @@ public String notAuthorized(){
     public String notFound() {
         return navigationWrapper.notFound();
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/Retention.java b/src/main/java/edu/harvard/iq/dataverse/Retention.java
new file mode 100644
index 00000000000..e1bd2231570
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/Retention.java
@@ -0,0 +1,102 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.persistence.*;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Objects;
+
+@NamedQueries({
+        @NamedQuery( name="Retention.findAll",
+                query = "SELECT r FROM Retention r"),
+        @NamedQuery( name="Retention.findById",
+                query = "SELECT r FROM Retention r WHERE r.id=:id"),
+        @NamedQuery( name="Retention.findByDateUnavailable",
+                query = "SELECT r FROM Retention r WHERE r.dateUnavailable=:dateUnavailable"),
+        @NamedQuery( name="Retention.deleteById",
+                query = "DELETE FROM Retention r WHERE r.id=:id")
+})
+@Entity
+public class Retention {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private LocalDate dateUnavailable;
+
+    @Column(columnDefinition="TEXT")
+    private String reason;
+
+    @OneToMany(mappedBy="retention", cascade={ CascadeType.REMOVE, CascadeType.PERSIST})
+    private List<DataFile> dataFiles;
+
+    public Retention(){
+        dateUnavailable = LocalDate.now().plusYears(1000); // Most likely valid with respect to configuration
+    }
+
+    public Retention(LocalDate dateUnavailable, String reason) {
+        this.dateUnavailable = dateUnavailable;
+        this.reason = reason;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public LocalDate getDateUnavailable() {
+        return dateUnavailable;
+    }
+
+    public void setDateUnavailable(LocalDate dateUnavailable) {
+        this.dateUnavailable = dateUnavailable;
+    }
+
+    public String getFormattedDateUnavailable() {
+        return getDateUnavailable().format(DateTimeFormatter.ISO_LOCAL_DATE.withLocale(BundleUtil.getCurrentLocale()));
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public List<DataFile> getDataFiles() {
+        return dataFiles;
+    }
+
+    public void setDataFiles(List<DataFile> dataFiles) {
+        this.dataFiles = dataFiles;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Retention retention = (Retention) o;
+        return id.equals(retention.id) && dateUnavailable.equals(retention.dateUnavailable) && Objects.equals(reason, retention.reason);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, dateUnavailable, reason);
+    }
+
+    @Override
+    public String toString() {
+        return "Retention{" +
+                "id=" + id +
+                ", dateUnavailable=" + dateUnavailable +
+                ", reason='" + reason + '\'' +
+                '}';
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/RetentionServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/RetentionServiceBean.java
new file mode 100644
index 00000000000..1421ac61120
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/RetentionServiceBean.java
@@ -0,0 +1,66 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
+import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+
+import java.util.List;
+
+
+@Stateless
+@Named
+public class RetentionServiceBean {
+
+    @PersistenceContext
+    EntityManager em;
+
+    @EJB
+    ActionLogServiceBean actionLogSvc;
+
+    public List<Retention> findAllRetentions() {
+        return em.createNamedQuery("Retention.findAll", Retention.class).getResultList();
+    }
+
+    public Retention findByRetentionId(Long id) {
+        Query query = em.createNamedQuery("Retention.findById", Retention.class);
+        query.setParameter("id", id);
+        try {
+            return (Retention) query.getSingleResult();
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    public Retention merge(Retention r) {
+        return em.merge(r);
+    }
+    
+    public Long save(Retention retention, String userIdentifier) {
+        if (retention.getId() == null) {
+            em.persist(retention);
+            em.flush();
+        }
+        //Not quite from a command, but this action can be done by anyone, so command seems better than Admin or other alternatives
+        actionLogSvc.log(new ActionLogRecord(ActionLogRecord.ActionType.Command, "retentionCreate")
+                .setInfo("id: " + retention.getId() + " date unavailable: " + retention.getDateUnavailable() + " reason: " + retention.getReason()).setUserIdentifier(userIdentifier));
+        return retention.getId();
+    }
+
+    private int deleteById(long id, String userIdentifier) {
+        //Not quite from a command, but this action can be done by anyone, so command seems better than Admin or other alternatives
+        actionLogSvc.log(new ActionLogRecord(ActionLogRecord.ActionType.Command, "retentionDelete")
+                .setInfo(Long.toString(id))
+                .setUserIdentifier(userIdentifier));
+        return em.createNamedQuery("Retention.deleteById")
+                .setParameter("id", id)
+                .executeUpdate();
+    }
+    public int delete(Retention retention, String userIdentifier) {
+        return deleteById(retention.getId(), userIdentifier);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeConverter.java b/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeConverter.java
index b6b4c43fa1f..0d863f47324 100644
--- a/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeConverter.java
@@ -7,14 +7,13 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.inject.spi.CDI;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
 
 /**
  *
@@ -23,8 +22,8 @@
 @FacesConverter("roleAssigneeConverter")
 public class RoleAssigneeConverter implements Converter {
     
-    @EJB
-    RoleAssigneeServiceBean roleAssigneeService;
+    //@EJB
+    RoleAssigneeServiceBean roleAssigneeService = CDI.current().select(RoleAssigneeServiceBean.class).get();
 
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
         RoleAssignee mdb = roleAssigneeService.getRoleAssignee(submittedValue);
diff --git a/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java
index b31b55b2e4f..c0b3a48d82a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java
@@ -2,6 +2,7 @@
 
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.groups.Group;
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
@@ -11,6 +12,8 @@
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.mydata.MyDataFilterParams;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlUtil;
@@ -21,13 +24,15 @@
 import java.util.TreeMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.apache.commons.lang.StringUtils;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * The place to obtain {@link RoleAssignee}s, based on their identifiers.
@@ -96,18 +101,18 @@ public RoleAssignee getRoleAssignee(String identifier, Boolean augmented) {
         if (identifier == null || identifier.isEmpty()) {
             throw new IllegalArgumentException("Identifier cannot be null or empty string.");
         }
-        switch (identifier.charAt(0)) {
-            case ':':
+        switch (identifier.substring(0,1)) {
+            case ":":
                 return predefinedRoleAssignees.get(identifier);
-            case '@':
+            case AuthenticatedUser.IDENTIFIER_PREFIX:
                 if (!augmented){
                     return authSvc.getAuthenticatedUser(identifier.substring(1));
                 } else {
                     return authSvc.getAuthenticatedUserWithProvider(identifier.substring(1));
-                }                
-            case '&':
+                }
+            case Group.IDENTIFIER_PREFIX:
                 return groupSvc.getGroup(identifier.substring(1));
-            case '#':
+            case PrivateUrlUser.PREFIX:
                 return PrivateUrlUtil.identifier2roleAssignee(identifier);
             default:
                 throw new IllegalArgumentException("Unsupported assignee identifier '" + identifier + "'");
@@ -151,10 +156,41 @@ private String getRoleIdListClause(List<Long> roleIdList) {
         return " AND r.role_id IN (" + StringUtils.join(outputList, ",") + ")";
     }
 
+    /**
+     * Retrieves the list of {@link DataverseRole}s selectable for the given {@link DataverseRequest}.
+     * <p>
+     * - If the user is a superuser, all roles are returned.<br>
+     * - If the user is not a superuser, their assigned roles are returned. If none are assigned,
+     *   all roles are returned as a fallback.
+     * <p>
+     * This method is based on the logic from {@code MyDataPage.getRolesUsedToCreateCheckboxes}.
+     * It has been implemented in this service to make the logic reusable from parts of the application
+     * other than the JSF UI.
+     *
+     * @param request the dataverse request containing user context
+     * @return a list of relevant {@link DataverseRole}s for the user
+     * @throws NullPointerException if the request is null
+     */
+    public List<DataverseRole> getSelectableDataverseRolesFor(DataverseRequest request) {
+        if (request == null) {
+            throw new NullPointerException(BundleUtil.getStringFromBundle("roleAssigneeServiceBean.error.dataverseRequestCannotBeNull"));
+        }
+
+        User user = request.getUser();
+
+        if (user.isSuperuser()) {
+            return dataverseRoleService.findAll();
+        }
+
+        List<DataverseRole> assignedRoles = getAssigneeDataverseRoleFor(request);
+
+        return assignedRoles.isEmpty() ? dataverseRoleService.findAll() : assignedRoles;
+    }
+
     public List<DataverseRole> getAssigneeDataverseRoleFor(DataverseRequest dataverseRequest) {
         
         if (dataverseRequest == null){
-            throw new NullPointerException("dataverseRequest cannot be null!");
+            throw new NullPointerException(BundleUtil.getStringFromBundle("roleAssigneeServiceBean.error.dataverseRequestCannotBeNull"));
         }
         AuthenticatedUser au = dataverseRequest.getAuthenticatedUser();
         if (au.getUserIdentifier() == null){
@@ -220,7 +256,7 @@ public List<Object[]> getAssigneeAndRoleIdListFor(MyDataFilterParams filterParam
 
     public List<Long> getRoleIdListForGivenAssigneeDvObject(DataverseRequest dataverseRequest, List<Long> roleIdList, Long defPointId) {
         if (dataverseRequest == null){
-            throw new NullPointerException("dataverseRequest cannot be null!");
+            throw new NullPointerException(BundleUtil.getStringFromBundle("roleAssigneeServiceBean.error.dataverseRequestCannotBeNull"));
         }
         AuthenticatedUser au = dataverseRequest.getAuthenticatedUser();
         if (au.getUserIdentifier() == null){
@@ -289,7 +325,7 @@ private String getGroupIdentifierClause(String roleAssigneeIdentifier, List<Stri
 
     public List<Object[]> getRoleIdsFor(DataverseRequest dataverseRequest, List<Long> dvObjectIdList) {
         if (dataverseRequest == null){
-            throw new NullPointerException("dataverseRequest cannot be null!");
+            throw new NullPointerException(BundleUtil.getStringFromBundle("roleAssigneeServiceBean.error.dataverseRequestCannotBeNull"));
         }
         AuthenticatedUser au = dataverseRequest.getAuthenticatedUser();
         if (au.getUserIdentifier() == null){
@@ -376,7 +412,9 @@ public List<RoleAssignee> filterRoleAssignees(String query, DvObject dvObject, L
                 .getResultList().stream()
                 .filter(ra -> roleAssignSelectedRoleAssignees == null || !roleAssignSelectedRoleAssignees.contains(ra))
                 .forEach((ra) -> {
-                    roleAssigneeList.add(ra);
+                    if (!ra.isDeactivated()) {
+                        roleAssigneeList.add(ra);
+                    }
                 });
 
         // now we add groups to the list, both global and explicit
@@ -392,6 +430,15 @@ public List<RoleAssignee> filterRoleAssignees(String query, DvObject dvObject, L
 
         return roleAssigneeList;
     }
+    
+
+    public List<String> findAssigneesWithPermissionOnDvObject(Long objectId, Permission permission) {
+        int bitpos = 63 - permission.ordinal();
+        return em.createNamedQuery("RoleAssignment.findAssigneesWithPermissionOnDvObject", String.class)
+                 .setParameter(1, bitpos)
+                 .setParameter(2, objectId)
+                 .getResultList();
+    }
 
     private void msg(String s) {
         //System.out.println(s);
diff --git a/src/main/java/edu/harvard/iq/dataverse/RoleAssignment.java b/src/main/java/edu/harvard/iq/dataverse/RoleAssignment.java
index 6241f120f80..474c3aca26f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/RoleAssignment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/RoleAssignment.java
@@ -3,19 +3,23 @@
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import java.util.Objects;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.ColumnResult;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedNativeQueries;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 
 /**
  * A role of a user in a Dataverse. A User may have many roles in a given Dataverse.
@@ -42,7 +46,7 @@
 	@NamedQuery( name  = "RoleAssignment.listByDefinitionPointId",
 				 query = "SELECT r FROM RoleAssignment r WHERE r.definitionPoint.id=:definitionPointId" ),
 	@NamedQuery( name  = "RoleAssignment.listByRoleId",
-				 query = "SELECT r FROM RoleAssignment r WHERE r.role=:roleId" ),
+				 query = "SELECT r FROM RoleAssignment r WHERE r.role.id=:roleId" ),
 	@NamedQuery( name  = "RoleAssignment.listByPrivateUrlToken",
 				 query = "SELECT r FROM RoleAssignment r WHERE r.privateUrlToken=:privateUrlToken" ),
 	@NamedQuery( name  = "RoleAssignment.deleteByAssigneeIdentifier_RoleIdDefinition_PointId",
@@ -52,6 +56,33 @@
         @NamedQuery( name = "RoleAssignment.deleteAllByAssigneeIdentifier_Definition_PointId_RoleType",
 				 query = "DELETE FROM RoleAssignment r WHERE r.assigneeIdentifier=:assigneeIdentifier AND r.role.id=:roleId and r.definitionPoint.id=:definitionPointId")
 })
+@NamedNativeQueries({
+    @NamedNativeQuery(
+            name = "RoleAssignment.findAssigneesWithPermissionOnDvObject",
+            query = "WITH RECURSIVE owner_hierarchy(id, owner_id, permissionroot) AS ( " +
+                    "    SELECT dvo.id, dvo.owner_id, COALESCE(dv.permissionroot, false) " +
+                    "    FROM dvobject dvo " +
+                    "    LEFT JOIN dataverse dv ON dvo.id = dv.id " +
+                    "    WHERE dvo.id = ?2 " +
+                    "    UNION ALL " +
+                    "    SELECT dvo.id, dvo.owner_id, dv.permissionroot " +
+                    "    FROM dvobject dvo " +
+                    "    LEFT JOIN dataverse dv ON dvo.id = dv.id " +
+                    "    JOIN owner_hierarchy oh ON dvo.id = oh.owner_id " +
+                    "    WHERE NOT oh.permissionroot " +
+                    ") " +
+                    "SELECT DISTINCT ra.assigneeidentifier " +
+                    "FROM roleassignment ra " +
+                    "JOIN dataverserole dr ON ra.role_id = dr.id " +
+                    "JOIN owner_hierarchy oh ON ra.definitionpoint_id = oh.id " +
+                    "WHERE get_bit(dr.permissionbits::bit(64), ?1) = '1'",
+            resultSetMapping = "AssigneeIdentifierMapping"
+        )
+})
+@SqlResultSetMapping(
+        name = "AssigneeIdentifierMapping",
+        columns = @ColumnResult(name = "assigneeidentifier")
+    )
 public class RoleAssignment implements java.io.Serializable {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -63,21 +94,29 @@ public class RoleAssignment implements java.io.Serializable {
 	@ManyToOne( cascade = {CascadeType.MERGE} )
 	@JoinColumn( nullable=false )
 	private DataverseRole role;
-	
-	@ManyToOne( cascade = {CascadeType.MERGE} ) 
+
+	@ManyToOne
 	@JoinColumn( nullable=false )
 	private DvObject definitionPoint;
 
     @Column(nullable = true)
     private String privateUrlToken;
 	
+    @Column(nullable = true)
+    private Boolean privateUrlAnonymizedAccess;
+	
 	public RoleAssignment() {}
 		
 	public RoleAssignment(DataverseRole aRole, RoleAssignee anAssignee, DvObject aDefinitionPoint, String privateUrlToken) {
+	    this(aRole, anAssignee, aDefinitionPoint, privateUrlToken, false);
+	}
+	
+	public RoleAssignment(DataverseRole aRole, RoleAssignee anAssignee, DvObject aDefinitionPoint, String privateUrlToken, Boolean anonymizedAccess) {
         role = aRole;
         assigneeIdentifier = anAssignee.getIdentifier();
         definitionPoint = aDefinitionPoint;
         this.privateUrlToken = privateUrlToken;
+        this.privateUrlAnonymizedAccess=anonymizedAccess;
     }
 	
 	public Long getId() {
@@ -116,6 +155,10 @@ public String getPrivateUrlToken() {
         return privateUrlToken;
     }
 
+    public boolean isAnonymizedAccess(){
+        return (privateUrlAnonymizedAccess==null) ? false: privateUrlAnonymizedAccess;
+    }
+
 	@Override
 	public int hashCode() {
 		int hash = 7;
diff --git a/src/main/java/edu/harvard/iq/dataverse/RolePermissionFragment.java b/src/main/java/edu/harvard/iq/dataverse/RolePermissionFragment.java
index 204806e7894..1bd337452c2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/RolePermissionFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/RolePermissionFragment.java
@@ -26,18 +26,20 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -92,7 +94,7 @@ public void setInheritAssignments(boolean inheritAssignments) {
         this.inheritAssignments = inheritAssignments;
     }
 
-    public void updatePermissionRoot(javax.faces.event.AjaxBehaviorEvent event) throws javax.faces.event.AbortProcessingException {
+    public void updatePermissionRoot(AjaxBehaviorEvent event) throws AbortProcessingException {
         try {
             dvObject = commandEngine.submit(
                     new UpdatePermissionRootCommand(!inheritAssignments, 
@@ -193,7 +195,7 @@ private void assignRole(RoleAssignee ra, DataverseRole r) {
             commandEngine.submit(new AssignRoleCommand(ra, r, dvObject, dvRequestService.getDataverseRequest(), privateUrlToken));
             JH.addMessage(FacesMessage.SEVERITY_INFO,
                 BundleUtil.getStringFromBundle("permission.roleAssignedToOn" ,
-                        Arrays.asList( r.getName() , ra.getDisplayInfo().getTitle() , StringEscapeUtils.escapeHtml(dvObject.getDisplayName()) )) );
+                        Arrays.asList( r.getName() , ra.getDisplayInfo().getTitle() , StringEscapeUtils.escapeHtml4(dvObject.getDisplayName()) )) );
         } catch (CommandException ex) {
             JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("permission.cannotAssignRole" , Arrays.asList( ex.getMessage())));
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java b/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java
index f6f46e375ff..7b8e5ebeec9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java
@@ -1,25 +1,12 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package edu.harvard.iq.dataverse;
 
-import com.amazonaws.AmazonClientException;
-import com.amazonaws.SdkClientException;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.CopyObjectRequest;
-import com.amazonaws.services.s3.model.DeleteObjectRequest;
-import com.amazonaws.services.s3.model.GetObjectRequest;
-import com.amazonaws.services.s3.model.ListObjectsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.*;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.core.sync.ResponseTransformer;
 import edu.harvard.iq.dataverse.api.AbstractApiBean;
-import edu.harvard.iq.dataverse.batch.jobs.importer.filesystem.FileRecordWriter;
-import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import java.io.BufferedReader;
@@ -31,9 +18,9 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
 
 /**
  * This class is for importing files added to s3 outside of dataverse.
@@ -45,11 +32,11 @@
 
 @Named
 @Stateless
-public class S3PackageImporter extends AbstractApiBean implements java.io.Serializable{
+public class S3PackageImporter extends AbstractApiBean implements java.io.Serializable {
     
     private static final Logger logger = Logger.getLogger(S3PackageImporter.class.getName());
 
-    private AmazonS3 s3 = null;
+    private S3Client s3;
     
     @EJB
     DataFileServiceBean dataFileServiceBean;
@@ -57,19 +44,18 @@ public class S3PackageImporter extends AbstractApiBean implements java.io.Serial
     @EJB
     EjbDataverseEngine commandEngine;
     
-    //Copies from another s3 bucket to our own
     public void copyFromS3(Dataset dataset, String s3ImportPath) throws IOException {
         try {
-            s3 = AmazonS3ClientBuilder.standard().defaultClient();
+            s3 = S3Client.create();
         } catch (Exception e) {
-            throw new AmazonClientException(
-                    "Cannot instantiate a S3 client using; check your AWS credentials and region",
+            throw new IllegalStateException(
+                    "Cannot instantiate a S3 client; check your AWS credentials and region",
                     e);
         }
         
         String dcmBucketName = System.getProperty("dataverse.files.dcm-s3-bucket-name");
         String dcmDatasetKey = s3ImportPath;
-        String dvBucketName = System.getProperty("dataverse.files.s3-bucket-name");
+        String dvBucketName = System.getProperty("dataverse.files.s3.bucket-name");
 
         String dvDatasetKey = getS3DatasetKey(dataset);
         
@@ -88,44 +74,54 @@ public void copyFromS3(Dataset dataset, String s3ImportPath) throws IOException
             throw new IllegalStateException(error);
         }
 
-        ListObjectsRequest req = new ListObjectsRequest().withBucketName(dcmBucketName).withPrefix(dcmDatasetKey);
-        ObjectListing storedDcmDatsetFilesList;
+        ListObjectsV2Request listReq = ListObjectsV2Request.builder()
+                .bucket(dcmBucketName)
+                .prefix(dcmDatasetKey)
+                .build();
+
+        ListObjectsV2Response listRes;
         try {
-            storedDcmDatsetFilesList = s3.listObjects(req);
-        } catch (SdkClientException sce) {
-            logger.info("Caught an SdkClientException in s3ImportUtil:    " + sce.getMessage());
-            throw new IOException ("S3 listAuxObjects: failed to get a listing for "+dcmDatasetKey);
+            listRes = s3.listObjectsV2(listReq);
+        } catch (S3Exception se) {
+            logger.info("Caught an S3Exception in s3ImportUtil: " + se.getMessage());
+            throw new IOException("S3 listAuxObjects: failed to get a listing for " + dcmDatasetKey);
         }
-        List<S3ObjectSummary> storedDcmDatasetFilesSummary = storedDcmDatsetFilesList.getObjectSummaries();
-        try {
-            while (storedDcmDatsetFilesList.isTruncated()) {
-                logger.fine("S3 listAuxObjects: going to next page of list");
-                storedDcmDatsetFilesList = s3.listNextBatchOfObjects(storedDcmDatsetFilesList);
-                if (storedDcmDatsetFilesList != null) {
-                    storedDcmDatasetFilesSummary.addAll(storedDcmDatsetFilesList.getObjectSummaries());
-                }
-            }
-        } catch (AmazonClientException ase) {
-            logger.info("Caught an AmazonServiceException in s3ImportUtil:    " + ase.getMessage());
-            throw new IOException("S3AccessIO: Failed to get aux objects for listing.");
+
+        List<S3Object> storedDcmDatasetFilesSummary = new ArrayList<>(listRes.contents());
+
+        while (listRes.isTruncated()) {
+            logger.fine("S3 listAuxObjects: going to next page of list");
+            listReq = listReq.toBuilder().continuationToken(listRes.nextContinuationToken()).build();
+            listRes = s3.listObjectsV2(listReq);
+            storedDcmDatasetFilesSummary.addAll(listRes.contents());
         }
-        for (S3ObjectSummary item : storedDcmDatasetFilesSummary) {
 
-            logger.log(Level.INFO, "S3 Import file copy for {0}", new Object[]{item});
-            String dcmFileKey = item.getKey();
+        for (S3Object item : storedDcmDatasetFilesSummary) {
+            logger.log(Level.INFO, "S3 Import file copy for {0}", item);
+            String dcmFileKey = item.key();
 
             String copyFileName = dcmFileKey.substring(dcmFileKey.lastIndexOf('/') + 1);
 
             logger.log(Level.INFO, "S3 file copy related attributes. dcmBucketName: {0} | dcmFileKey: {1} | dvBucketName: {2} | copyFilePath: {3} |", 
-                new Object[]{dcmBucketName, dcmFileKey, dvBucketName, dvDatasetKey+"/"+copyFileName});
+                new Object[]{dcmBucketName, dcmFileKey, dvBucketName, dvDatasetKey + "/" + copyFileName});
+
+            CopyObjectRequest copyReq = CopyObjectRequest.builder()
+                    .sourceBucket(dcmBucketName)
+                    .sourceKey(dcmFileKey)
+                    .destinationBucket(dvBucketName)
+                    .destinationKey(dvDatasetKey + "/" + copyFileName)
+                    .build();
+            s3.copyObject(copyReq);
 
-            s3.copyObject(new CopyObjectRequest(dcmBucketName, dcmFileKey, dvBucketName, dvDatasetKey+"/"+copyFileName));                
-            
             try {
-                s3.deleteObject(new DeleteObjectRequest(dcmBucketName, dcmFileKey));
-            }  catch (AmazonClientException ase) {
-                logger.warning("Caught an AmazonClientException deleting s3 object from dcm bucket: " + ase.getMessage());
-                throw new IOException("Failed to delete object" + new Object[]{item});
+                DeleteObjectRequest deleteReq = DeleteObjectRequest.builder()
+                        .bucket(dcmBucketName)
+                        .key(dcmFileKey)
+                        .build();
+                s3.deleteObject(deleteReq);
+            } catch (S3Exception se) {
+                logger.warning("Caught an S3Exception deleting s3 object from dcm bucket: " + se.getMessage());
+                throw new IOException("Failed to delete object " + item);
             }
         }
     }
@@ -134,49 +130,53 @@ public DataFile createPackageDataFile(Dataset dataset, String folderName, long t
         DataFile packageFile = new DataFile(DataFileServiceBean.MIME_TYPE_PACKAGE_FILE);
         packageFile.setChecksumType(DataFile.ChecksumType.SHA1);
 
-        //This is a brittle calculation, changes of the dcm post_upload script will blow this up
         String rootPackageName = "package_" + folderName.replace("/", "");
 
-        String dvBucketName = System.getProperty("dataverse.files.s3-bucket-name");
+        String dvBucketName = System.getProperty("dataverse.files.s3.bucket-name");
         String dvDatasetKey = getS3DatasetKey(dataset);
 
-        //getting the name of the .sha file via substring, ${packageName}.sha
-        logger.log(Level.INFO, "shaname {0}", new Object[]{rootPackageName  + ".sha"});
+        logger.log(Level.INFO, "shaname {0}", rootPackageName + ".sha");
 
-        if(!s3.doesObjectExist(dvBucketName, dvDatasetKey + "/" + rootPackageName + ".zip")) {
-            throw new IOException ("S3 Package data file could not be found after copy from dcm. Name: " + dvDatasetKey + "/" + rootPackageName + ".zip");
+        HeadObjectRequest headReq = HeadObjectRequest.builder()
+                .bucket(dvBucketName)
+                .key(dvDatasetKey + "/" + rootPackageName + ".zip")
+                .build();
+        if (!s3.headObject(headReq).sdkHttpResponse().isSuccessful()) {
+            throw new IOException("S3 Package data file could not be found after copy from dcm. Name: " + dvDatasetKey + "/" + rootPackageName + ".zip");
         }
 
-        S3Object s3FilesSha = s3.getObject(new GetObjectRequest(dvBucketName, dvDatasetKey + "/" + rootPackageName  + ".sha"));
+        GetObjectRequest getReq = GetObjectRequest.builder()
+                .bucket(dvBucketName)
+                .key(dvDatasetKey + "/" + rootPackageName + ".sha")
+                .build();
+        ResponseInputStream<GetObjectResponse> s3FilesSha = s3.getObject(getReq);
 
-        InputStreamReader str = new InputStreamReader(s3FilesSha.getObjectContent());
+        InputStreamReader str = new InputStreamReader(s3FilesSha);
         BufferedReader reader = new BufferedReader(str);
         String checksumVal = "";
         try {
             String line;
-            while((line = reader.readLine()) != null && checksumVal.isEmpty()) {
-                logger.log(Level.FINE, "line {0}", new Object[]{line});
+            while ((line = reader.readLine()) != null && checksumVal.isEmpty()) {
+                logger.log(Level.FINE, "line {0}", line);
                 String[] splitLine = line.split("  ");
 
-                //the sha file should only contain one entry, but incase it doesn't we will check for the one for our zip
-                if(splitLine[1].contains(rootPackageName + ".zip")) { 
+                if (splitLine[1].contains(rootPackageName + ".zip")) { 
                     checksumVal = splitLine[0];
-                    logger.log(Level.FINE, "checksumVal found {0}", new Object[]{checksumVal});
+                    logger.log(Level.FINE, "checksumVal found {0}", checksumVal);
                 }
             }
-            if(checksumVal.isEmpty()) {
-                logger.log(Level.SEVERE, "No checksum found for uploaded DCM S3 zip on dataset {0}", new Object[]{dataset.getIdentifier()});
+            if (checksumVal.isEmpty()) {
+                logger.log(Level.SEVERE, "No checksum found for uploaded DCM S3 zip on dataset {0}", dataset.getIdentifier());
             }                
-        } catch (IOException ex){
+        } catch (IOException ex) {
             logger.log(Level.SEVERE, "Error parsing DCM s3 checksum file on dataset {0} . Error: {1} ", new Object[]{dataset.getIdentifier(), ex});
         } finally {
             try {
                 str.close();
                 reader.close();
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "errors closing s3 DCM object reader stream: {0}", new Object[]{ex});
+                logger.log(Level.WARNING, "errors closing s3 DCM object reader stream: {0}", ex);
             }
-
         }
 
         logger.log(Level.FINE, "Checksum value for the package in Dataset {0} is: {1}", 
@@ -193,8 +193,6 @@ public DataFile createPackageDataFile(Dataset dataset, String folderName, long t
 
         packageFile.setIngestDone();
 
-        // set metadata and add to latest version
-        // Set early so we can generate the storage id with the info
         FileMetadata fmd = new FileMetadata();
         fmd.setLabel(rootPackageName + ".zip");
 
@@ -206,35 +204,20 @@ public DataFile createPackageDataFile(Dataset dataset, String folderName, long t
         fmd.setDatasetVersion(dataset.getLatestVersion());
 
         FileUtil.generateS3PackageStorageIdentifier(packageFile);
-
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(packageFile.getProtocol(), commandEngine.getContext());
+        PidProvider pidProvider = commandEngine.getContext().dvObjects().getEffectivePidGenerator(dataset);
         if (packageFile.getIdentifier() == null || packageFile.getIdentifier().isEmpty()) {
-            String packageIdentifier = dataFileServiceBean.generateDataFileIdentifier(packageFile, idServiceBean);
-            packageFile.setIdentifier(packageIdentifier);
-        }
-
-        String nonNullDefaultIfKeyNotFound = "";
-        String protocol = commandEngine.getContext().settings().getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound);
-        String authority = commandEngine.getContext().settings().getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound);
-
-        if (packageFile.getProtocol() == null) {
-            packageFile.setProtocol(protocol);
-        }
-        if (packageFile.getAuthority() == null) {
-            packageFile.setAuthority(authority);
+            pidProvider.generatePid(packageFile);
         }
 
         if (!packageFile.isIdentifierRegistered()) {
             String doiRetString = "";
-            idServiceBean = GlobalIdServiceBean.getBean(commandEngine.getContext());
             try {
-                doiRetString = idServiceBean.createIdentifier(packageFile);
+                doiRetString = pidProvider.createIdentifier(packageFile);
             } catch (Throwable e) {
-
+                // Handle exception
             }
 
-            // Check return value to make sure registration succeeded
-            if (!idServiceBean.registerWhenPublished() && doiRetString.contains(packageFile.getIdentifier())) {
+            if (!pidProvider.registerWhenPublished() && doiRetString.contains(packageFile.getIdentifier())) {
                 packageFile.setIdentifierRegistered(true);
                 packageFile.setGlobalIdCreateTime(new Date());
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java b/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java
index dd27842573f..46941c8b5b6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java
+++ b/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java
@@ -3,23 +3,24 @@
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
 import edu.harvard.iq.dataverse.feedback.Feedback;
 import edu.harvard.iq.dataverse.feedback.FeedbackUtil;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.MailUtil;
+import edu.harvard.iq.dataverse.util.JsfHelper;
 import edu.harvard.iq.dataverse.util.SystemConfig;
-import java.util.List;
+import java.util.Optional;
 import java.util.Random;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.validator.ValidatorException;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.mail.internet.InternetAddress;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.validator.ValidatorException;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.mail.internet.InternetAddress;
 import org.apache.commons.validator.routines.EmailValidator;
 
 @ViewScoped
@@ -62,7 +63,7 @@ public class SendFeedbackDialog implements java.io.Serializable {
      * Either the dataverse or the dataset that the message is pertaining to. If
      * there is no recipient, this is a general feedback message.
      */
-    private DvObject recipient;
+    private DvObject feedbackTarget;
 
     /**
      * :SystemEmail (the main support address for an installation).
@@ -97,11 +98,10 @@ public void initUserInput(ActionEvent ae) {
         userMessage = "";
         messageSubject = "";
         Random random = new Random();
-        op1 = new Long(random.nextInt(10));
-        op2 = new Long(random.nextInt(10));
+        op1 = Long.valueOf(random.nextInt(10));
+        op2 = Long.valueOf(random.nextInt(10));
         userSum = null;
-        String systemEmail = settingsService.getValueForKey(SettingsServiceBean.Key.SystemEmail);
-        systemAddress = MailUtil.parseSystemAddress(systemEmail);
+        systemAddress = mailService.getSupportAddress().orElse(null);
     }
 
     public Long getOp1() {
@@ -129,19 +129,31 @@ public void setUserSum(Long userSum) {
     }
 
     public String getMessageTo() {
-        if (recipient == null) {
-            return BrandingUtil.getSupportTeamName(systemAddress, dataverseService.findRootDataverse().getName());
-        } else if (recipient.isInstanceofDataverse()) {
-            return ((Dataverse) recipient).getDisplayName() + " " + BundleUtil.getStringFromBundle("contact.contact");
+        if (op1 == null || op2 == null) {
+            // Fix for 403 error page: initUserInput method doesn't call before
+            initUserInput(null);
+        }
+        if (feedbackTarget == null) {
+            return BrandingUtil.getSupportTeamName(systemAddress);
+        } else if (feedbackTarget.isInstanceofDataverse()) {
+            return ((Dataverse) feedbackTarget).getDisplayName() + " " + BundleUtil.getStringFromBundle("contact.contact");
         } else {
             return BundleUtil.getStringFromBundle("dataset") + " " + BundleUtil.getStringFromBundle("contact.contact");
         }
     }
+    
+    public String getMessageCC() {
+        if (ccSupport()) {
+            return BrandingUtil.getSupportTeamName(systemAddress);
+        }
+        return null;
+    }
+
 
     public String getFormHeader() {
-        if (recipient == null) {
-            return BrandingUtil.getContactHeader(systemAddress, dataverseService.findRootDataverse().getName());
-        } else if (recipient.isInstanceofDataverse()) {
+        if (feedbackTarget == null) {
+            return BrandingUtil.getContactHeader(systemAddress);
+        } else if (feedbackTarget.isInstanceofDataverse()) {
             return BundleUtil.getStringFromBundle("contact.dataverse.header");
         } else {
             return BundleUtil.getStringFromBundle("contact.dataset.header");
@@ -173,11 +185,11 @@ public String loggedInUserEmail() {
     }
 
     public DvObject getRecipient() {
-        return recipient;
+        return feedbackTarget;
     }
 
     public void setRecipient(DvObject recipient) {
-        this.recipient = recipient;
+        this.feedbackTarget = recipient;
     }
 
     public void validateUserSum(FacesContext context, UIComponent component, Object value) throws ValidatorException {
@@ -198,20 +210,29 @@ public void validateUserEmail(FacesContext context, UIComponent component, Objec
     }
 
     public String sendMessage() {
-        // FIXME: move dataverseService.findRootDataverse() to init
-        String rootDataverseName = dataverseService.findRootDataverse().getName();
-        String installationBrandName = BrandingUtil.getInstallationBrandName(rootDataverseName);
-        String supportTeamName = BrandingUtil.getSupportTeamName(systemAddress, rootDataverseName);
-        List<Feedback> feedbacks = FeedbackUtil.gatherFeedback(recipient, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, systemConfig.getDataverseSiteUrl(), installationBrandName, supportTeamName);
-        if (feedbacks.isEmpty()) {
+        String installationBrandName = BrandingUtil.getInstallationBrandName();
+        String supportTeamName = BrandingUtil.getSupportTeamName(systemAddress);
+
+        Feedback feedback = FeedbackUtil.gatherFeedback(feedbackTarget, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, systemConfig.getDataverseSiteUrl(), installationBrandName, supportTeamName, ccSupport());
+        if (feedback==null) {
             logger.warning("No feedback has been sent!");
             return null;
         }
-        for (Feedback feedback : feedbacks) {
             logger.fine("sending feedback: " + feedback);
-            mailService.sendMail(feedback.getFromEmail(), feedback.getToEmail(), feedback.getSubject(), feedback.getBody());
-        }
+            mailService.sendMail(feedback.getFromEmail(), feedback.getToEmail(), feedback.getCcEmail(), feedback.getSubject(), feedback.getBody());
+        JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("contact.sent"));
         return null;
     }
+    
+    public boolean ccSupport() {
+        return ccSupport(feedbackTarget);
+    }
+    
+    public static boolean ccSupport(DvObject feedbackTarget) {
+        //Setting is enabled and this isn't already a direct message to support (no feedbackTarget)
+        Optional<Boolean> ccSupport = JvmSettings.CC_SUPPORT_ON_CONTACT_EMAIL.lookupOptional(Boolean.class);
+        
+        return feedbackTarget!=null && ccSupport.isPresent() &&ccSupport.get();
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
index 7747d4b207a..3ff27699379 100644
--- a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
@@ -6,22 +6,41 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.GlobusAccessibleStore;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.Setting;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.MailUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.UserNotification.Type;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Named;
-import javax.mail.internet.InternetAddress;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import java.util.Optional;
+import java.util.logging.Logger;
+import java.util.Set;
+
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.ValidatorException;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Named;
+import jakarta.json.JsonObject;
+import jakarta.mail.internet.InternetAddress;
 
 /**
  *
@@ -31,21 +50,92 @@
 @Named
 public class SettingsWrapper implements java.io.Serializable {
 
+    static final Logger logger = Logger.getLogger(SettingsWrapper.class.getCanonicalName());
+    
     @EJB
-    SettingsServiceBean settingService;
+    SettingsServiceBean settingsService;
 
     @EJB
     DataverseServiceBean dataverseService;
 
     @EJB
     SystemConfig systemConfig;
+    
+    @EJB
+    DatasetFieldServiceBean fieldService;
+    
+    @EJB
+    MetadataBlockServiceBean mdbService;
+    
+    @EJB
+    MailServiceBean mailServiceBean;
 
     private Map<String, String> settingsMap;
     
     // Related to a specific setting for guide urls
-    private String guidesBaseUrl = null; 
+    private String guidesBaseUrl = null;
+    
+    private boolean embargoDateChecked = false;
+    private LocalDate maxEmbargoDate = null;
+
+    private boolean retentionDateChecked = false;
+    private LocalDate minRetentionDate = null;
+
+    private String siteUrl = null; 
+    
+    private Dataverse rootDataverse = null; 
+    
+    private String guidesVersion = null;
+    
+    private String appVersion = null; 
+    
+    private String appVersionWithBuildNumber = null; 
+    
+    private Boolean shibPassiveLoginEnabled = null; 
+    
+    private String footerCopyrightAndYear = null; 
+    
+    //External Vocabulary support
+    private Map<Long, JsonObject> cachedCvocMap = null;
+    private Map<Long, JsonObject> cachedCvocByTermFieldMap = null;
+    private Set<Long> cvocFieldSet;
+    
+    private Long zipDownloadLimit = null; 
+    
+    private Boolean publicInstall = null; 
+    
+    private Integer uploadMethodsCount;
+    
+    private Boolean rsyncUpload = null; 
+    
+    private Boolean rsyncDownload = null;
+    
+    private Boolean globusUpload = null;
+    private Boolean globusDownload = null;
+    private Boolean globusFileDownload = null;
+    
+    private String globusAppUrl = null;
+    
+    private List<String> globusStoreList = null;
+    
+    private Boolean httpUpload = null; 
+    
+    private Boolean rsyncOnly = null;
+    
+    private Boolean webloaderUpload = null;
+    
+    private String metricsUrl = null; 
+    
+    private Boolean dataFilePIDSequentialDependent = null;
+    
+    private Boolean customLicenseAllowed = null;
+    
+    private List<MetadataBlock> systemMetadataBlocks;
+    
+    private Set<Type> alwaysMuted = null;
 
- 
+    private Set<Type> neverMuted = null;
+    
     public String get(String settingKey) {
         if (settingsMap == null) {
             initSettingsMap();
@@ -112,20 +202,65 @@ public boolean isTrueForKey(String settingKey, boolean safeDefaultIfKeyNotFound)
         return ( val==null ) ? safeDefaultIfKeyNotFound : StringUtil.isTrue(val);
     }
 
+    public Integer getInteger(String settingKey, Integer defaultValue) {
+        String settingValue = get(settingKey);
+        if(settingValue != null) {
+            try {
+                return Integer.valueOf(settingValue);
+            } catch (Exception e) {
+                logger.warning(String.format("action=getInteger result=invalid-integer settingKey=%s settingValue=%s", settingKey, settingValue));
+            }
+        }
+
+        return defaultValue;
+    }
+
     private void initSettingsMap() {
         // initialize settings map
         settingsMap = new HashMap<>();
-        for (Setting setting : settingService.listAll()) {
+        for (Setting setting : settingsService.listAll()) {
             settingsMap.put(setting.getName(), setting.getContent());
         }
     }
 
+    private void initAlwaysMuted() {
+        alwaysMuted = UserNotification.Type.tokenizeToSet(getValueForKey(Key.AlwaysMuted));
+    }
+
+    private void initNeverMuted() {
+        neverMuted = UserNotification.Type.tokenizeToSet(getValueForKey(Key.NeverMuted));
+    }
+
+    public Set<Type> getAlwaysMutedSet() {
+        if (alwaysMuted == null) {
+            initAlwaysMuted();
+        }
+        return alwaysMuted;
+    }
+
+    public Set<Type> getNeverMutedSet() {
+        if (neverMuted == null) {
+            initNeverMuted();
+        }
+        return neverMuted;
+    }
+
+    public boolean isAlwaysMuted(Type type) {
+        return getAlwaysMutedSet().contains(type);
+    }
+
+    public boolean isNeverMuted(Type type) {
+        return getNeverMutedSet().contains(type);
+    }
+
+    public boolean isShowMuteOptions() {
+        return isTrueForKey(Key.ShowMuteOptions, false);
+    }
+
     
     public String getGuidesBaseUrl() {
-        if (true)
-
-            if (guidesBaseUrl == null) {
-            String saneDefault = "http://guides.dataverse.org";
+        if (guidesBaseUrl == null) {
+            String saneDefault = "https://guides.dataverse.org";
         
             guidesBaseUrl = getValueForKey(SettingsServiceBean.Key.GuidesBaseUrl);
             if (guidesBaseUrl == null) {
@@ -143,47 +278,160 @@ public String getGuidesBaseUrl() {
     }
 
     public String getGuidesVersion() {
-        return systemConfig.getGuidesVersion();
+        if (guidesVersion == null) {
+            String saneDefault = getAppVersion();
+            guidesVersion = getValueForKey(SettingsServiceBean.Key.GuidesVersion, saneDefault);
+        }
+        return guidesVersion;
+    }
+    
+    public String getDataverseSiteUrl() {
+        if (siteUrl == null) {
+            siteUrl = systemConfig.getDataverseSiteUrl();
+        }
+        return siteUrl;
+    }
+    
+    public Long getZipDownloadLimit(){
+        if (zipDownloadLimit == null) {
+            String zipLimitOption = getValueForKey(SettingsServiceBean.Key.ZipDownloadLimit);
+            zipDownloadLimit = SystemConfig.getLongLimitFromStringOrDefault(zipLimitOption, SystemConfig.defaultZipDownloadLimit);
+        }
+        return zipDownloadLimit;
     }
 
     public boolean isPublicInstall(){
-        return systemConfig.isPublicInstall();
+        if (publicInstall == null) {
+            publicInstall = systemConfig.isPublicInstall();
+        }
+        return publicInstall; 
     }
-    
+
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public boolean isRsyncUpload() {
-        return systemConfig.isRsyncUpload();
+        if (rsyncUpload == null) {
+            rsyncUpload = getUploadMethodAvailable(SystemConfig.FileUploadMethods.RSYNC.toString());
+        }
+        return rsyncUpload; 
     }
-    
+
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public boolean isRsyncDownload() {
-        return systemConfig.isRsyncDownload();
+        if (rsyncDownload == null) {
+            rsyncDownload = systemConfig.isRsyncDownload();
+        }
+        return rsyncDownload;
+    }
+
+    public boolean isGlobusUpload() {
+        if (globusUpload == null) {
+            globusUpload = systemConfig.isGlobusUpload();
+        }
+        return globusUpload;
     }
     
-    public boolean isRsyncOnly() {
-        return systemConfig.isRsyncOnly();
+    public boolean isGlobusDownload() {
+        if (globusDownload == null) {
+            globusDownload = systemConfig.isGlobusDownload();
+        }
+        return globusDownload;
     }
     
-    public boolean isHTTPUpload(){
-        return systemConfig.isHTTPUpload();
+    public boolean isGlobusFileDownload() {
+        if (globusFileDownload == null) {
+            globusFileDownload = systemConfig.isGlobusFileDownload();
+        }
+        return globusFileDownload;
+    }
+    
+    public boolean isGlobusEnabledStorageDriver(String driverId) {
+        return (GlobusAccessibleStore.acceptsGlobusTransfers(driverId) || GlobusAccessibleStore.allowsGlobusReferences(driverId));
+    }
+    
+    public boolean isDownloadable(FileMetadata fmd) {
+        boolean downloadable=true;
+        if(isGlobusFileDownload()) {
+            String driverId = DataAccess.getStorageDriverFromIdentifier(fmd.getDataFile().getStorageIdentifier());
+            
+            downloadable = downloadable && StorageIO.isDataverseAccessible(driverId); 
+        }
+        return downloadable;
+    }
+    
+    public boolean isGlobusTransferable(FileMetadata fmd) {
+        boolean globusTransferable=true;
+        if(isGlobusFileDownload()) {
+            String driverId = DataAccess.getStorageDriverFromIdentifier(fmd.getDataFile().getStorageIdentifier());
+            globusTransferable = GlobusAccessibleStore.isGlobusAccessible(driverId);
+        }
+        return globusTransferable;
     }
     
-    public boolean isDataFilePIDSequentialDependent(){
-        return systemConfig.isDataFilePIDSequentialDependent();
+    
+    public String getGlobusAppUrl() {
+        if (globusAppUrl == null) {
+            globusAppUrl = settingsService.getValueForKey(SettingsServiceBean.Key.GlobusAppUrl, "http://localhost");
+        }
+        return globusAppUrl;
+        
+    }
+    
+    public boolean isWebloaderUpload() {
+        if (webloaderUpload == null) {
+            webloaderUpload = systemConfig.isWebloaderUpload();
+        }
+        return webloaderUpload;
+    }
+
+    @Deprecated(forRemoval = true, since = "2024-07-07")
+    public boolean isRsyncOnly() {
+        if (rsyncOnly == null) {
+            String downloadMethods = getValueForKey(SettingsServiceBean.Key.DownloadMethods);
+            if(downloadMethods == null){
+                rsyncOnly = false;
+            } else if (!downloadMethods.toLowerCase().equals(SystemConfig.FileDownloadMethods.RSYNC.toString())){
+                rsyncOnly = false;
+            } else {
+                String uploadMethods = getValueForKey(SettingsServiceBean.Key.UploadMethods);
+                if (uploadMethods==null){
+                    rsyncOnly = false;
+                } else {
+                    rsyncOnly = Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).size() == 1 && uploadMethods.toLowerCase().equals(SystemConfig.FileUploadMethods.RSYNC.toString());
+                }
+            }
+        }
+        return rsyncOnly;
+    }
+
+    public boolean isHTTPUpload(){
+        if (httpUpload == null) {
+            httpUpload = getUploadMethodAvailable(SystemConfig.FileUploadMethods.NATIVE.toString());
+        }
+        return httpUpload;      
     }
     
     public String getSupportTeamName() {
-        String systemEmail = getValueForKey(SettingsServiceBean.Key.SystemEmail);
-        InternetAddress systemAddress = MailUtil.parseSystemAddress(systemEmail);
-        return BrandingUtil.getSupportTeamName(systemAddress, dataverseService.findRootDataverse().getName());
+        // TODO: should this be replaced with mailServiceBean.getSupportAddress() to expose a configured support team?
+        InternetAddress systemAddress = mailServiceBean.getSystemAddress().orElse(null);
+        return BrandingUtil.getSupportTeamName(systemAddress);
     }
     
     public String getSupportTeamEmail() {
-        String systemEmail = getValueForKey(SettingsServiceBean.Key.SystemEmail);
-        InternetAddress systemAddress = MailUtil.parseSystemAddress(systemEmail);        
-        return BrandingUtil.getSupportTeamEmailAddress(systemAddress) != null ? BrandingUtil.getSupportTeamEmailAddress(systemAddress) : BrandingUtil.getSupportTeamName(systemAddress, dataverseService.findRootDataverse().getName());
+        // TODO: should this be replaced with mailServiceBean.getSupportAddress() to expose a configured support team?
+        InternetAddress systemAddress = mailServiceBean.getSystemAddress().orElse(null);
+        return BrandingUtil.getSupportTeamEmailAddress(systemAddress) != null ? BrandingUtil.getSupportTeamEmailAddress(systemAddress) : BrandingUtil.getSupportTeamName(systemAddress);
     }
     
     public Integer getUploadMethodsCount() {
-        return systemConfig.getUploadMethodCount();
+        if (uploadMethodsCount == null) {
+            String uploadMethods = getValueForKey(SettingsServiceBean.Key.UploadMethods); 
+            if (uploadMethods==null){
+                uploadMethodsCount = 0;
+            } else {
+                uploadMethodsCount = Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).size();
+            } 
+        }
+        return uploadMethodsCount;
     }
 
     public boolean isRootDataverseThemeDisabled() {
@@ -211,51 +459,415 @@ public Boolean isHasDropBoxKey() {
     
     public boolean isLocalesConfigured() {
         if (configuredLocales == null) {
-            initLocaleSettings();
+            configuredLocales = new LinkedHashMap<>();
+            settingsService.initLocaleSettings(configuredLocales);
         }
         return configuredLocales.size() > 1;
     }
 
     public Map<String, String> getConfiguredLocales() {
         if (configuredLocales == null) {
-            initLocaleSettings(); 
+            configuredLocales = new LinkedHashMap<>();
+            settingsService.initLocaleSettings(configuredLocales); 
         }
         return configuredLocales;
     }
     
-    private void initLocaleSettings() {
+
+    public boolean isMakeDataCountDisplayEnabled() {
+        boolean safeDefaultIfKeyNotFound = (getValueForKey(SettingsServiceBean.Key.MDCLogPath)!=null); //Backward compatible
+        return isTrueForKey(SettingsServiceBean.Key.DisplayMDCMetrics, safeDefaultIfKeyNotFound);
+    }
+    
+    public LocalDate getMDCStartDate() {
+        String date = getValueForKey(SettingsServiceBean.Key.MDCStartDate);
+        LocalDate ld=null;
+        if(date!=null) {
+          ld = LocalDate.parse(date);
+        }
+        return ld;
         
-        configuredLocales = new LinkedHashMap<>();
+    }
+    
+    public boolean displayChronologicalDateFacets() {
+        //Defaults to true
+        return isTrueForKey(SettingsServiceBean.Key.ChronologicalDateFacets, true);
+    
+    }
+    
+    List<String> anonymizedFieldTypes = null;
+
+    public boolean shouldBeAnonymized(DatasetField df) {
+        // Set up once per view
+        if (anonymizedFieldTypes == null) {
+            anonymizedFieldTypes = new ArrayList<String>();
+            String names = get(SettingsServiceBean.Key.AnonymizedFieldTypeNames.toString(), "");
+            anonymizedFieldTypes.addAll(Arrays.asList(names.split(",\\s")));
+        }
+        return anonymizedFieldTypes.contains(df.getDatasetFieldType().getName());
+    }
+    
+    public LocalDate getMaxEmbargoDate() {
+        if (!embargoDateChecked) {
+            String months = getValueForKey(SettingsServiceBean.Key.MaxEmbargoDurationInMonths);
+            Long maxMonths = null;
+            if (months != null) {
+                try {
+                    maxMonths = Long.parseLong(months);
+                } catch (NumberFormatException nfe) {
+                    logger.warning("Cant interpret :MaxEmbargoDurationInMonths as a long");
+                }
+            }
+
+            if (maxMonths != null && maxMonths != 0) {
+                if (maxMonths == -1) {
+                    maxMonths = 12000l; // Arbitrary cutoff at 1000 years - needs to keep maxDate < year 999999999 and
+                                        // somehwere 1K> x >10K years the datepicker widget stops showing a popup
+                                        // calendar
+                }
+                maxEmbargoDate = LocalDate.now().plusMonths(maxMonths);
+            }
+            embargoDateChecked = true;
+        }
+        return maxEmbargoDate;
+    }
+    
+    public LocalDate getMinEmbargoDate() {
+            return LocalDate.now().plusDays(1);
+    }
+    
+    public boolean isValidEmbargoDate(Embargo e) {
         
-        try {
-            JSONArray entries = new JSONArray(getValueForKey(SettingsServiceBean.Key.Languages, "[]"));
-            for (Object obj : entries) {
-                JSONObject entry = (JSONObject) obj;
-                String locale = entry.getString("locale");
-                String title = entry.getString("title");
-
-                configuredLocales.put(locale, title);
+        if (e.getDateAvailable()==null || (isEmbargoAllowed() && e.getDateAvailable().isAfter(LocalDate.now())
+                && e.getDateAvailable().isBefore(getMaxEmbargoDate().plusDays(1)))) {
+            return true;
+        }
+        
+        return false;
+    }
+    
+    public boolean isEmbargoAllowed() {
+        //Need a valid :MaxEmbargoDurationInMonths setting to allow embargoes
+        return getMaxEmbargoDate()!=null;
+    }
+    
+    public void validateEmbargoDate(FacesContext context, UIComponent component, Object value)
+            throws ValidatorException {
+        if (isEmbargoAllowed()) {
+            UIComponent cb = component.findComponent("embargoCheckbox");
+            UIInput endComponent = (UIInput) cb;
+            boolean removedState = false;
+            if (endComponent != null) {
+                try {
+                    removedState = (Boolean) endComponent.getSubmittedValue();
+                } catch (NullPointerException npe) {
+                    // Do nothing - checkbox is not being shown (and is therefore not checked)
+                }
+            }
+            if (!removedState && value == null) {
+                String msgString = BundleUtil.getStringFromBundle("embargo.date.required");
+                FacesMessage msg = new FacesMessage(msgString);
+                msg.setSeverity(FacesMessage.SEVERITY_ERROR);
+                throw new ValidatorException(msg);
+            }
+            Embargo newE = new Embargo(((LocalDate) value), null);
+            if (!isValidEmbargoDate(newE)) {
+                String minDate = getMinEmbargoDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                String maxDate = getMaxEmbargoDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                String msgString = BundleUtil.getStringFromBundle("embargo.date.invalid",
+                        Arrays.asList(minDate, maxDate));
+                // If we don't throw an exception here, the datePicker will use it's own
+                // vaidator and display a default message. The value for that can be set by
+                // adding validatorMessage="#{bundle['embargo.date.invalid']}" (a version with
+                // no params) to the datepicker
+                // element in file-edit-popup-fragment.html, but it would be better to catch all
+                // problems here (so we can show a message with the min/max dates).
+                FacesMessage msg = new FacesMessage(msgString);
+                msg.setSeverity(FacesMessage.SEVERITY_ERROR);
+                throw new ValidatorException(msg);
+            }
+        }
+    }
+
+    public LocalDate getMinRetentionDate() {
+        if (!retentionDateChecked) {
+            String months = getValueForKey(Key.MinRetentionDurationInMonths);
+            Long minMonths = null;
+            if (months != null) {
+                try {
+                    minMonths = Long.parseLong(months);
+                } catch (NumberFormatException nfe) {
+                    logger.warning("Cant interpret :MinRetentionDurationInMonths as a long");
+                }
+            }
+
+            if (minMonths != null && minMonths != 0) {
+                if (minMonths == -1) {
+                    minMonths = 0l; // Absolute minimum is 0
+                }
+                minRetentionDate = LocalDate.now().plusMonths(minMonths);
             }
-        } catch (JSONException e) {
-            //e.printStackTrace();
-            // do we want to know? - probably not
+            retentionDateChecked = true;
         }
+        return minRetentionDate;
     }
 
-    public boolean isDoiInstallation() {
-        String protocol = getValueForKey(SettingsServiceBean.Key.Protocol);
-        if ("doi".equals(protocol)) {
+    public LocalDate getMaxRetentionDate() {
+        Long maxMonths = 12000l; // Arbitrary cutoff at 1000 years - needs to keep maxDate < year 999999999 and
+        // somehwere 1K> x >10K years the datepicker widget stops showing a popup
+        // calendar
+        return LocalDate.now().plusMonths(maxMonths);
+    }
+
+    public boolean isValidRetentionDate(Retention r) {
+
+        if (r.getDateUnavailable()==null ||
+            isRetentionAllowed() && r.getDateUnavailable().isAfter(getMinRetentionDate())) {
             return true;
+        }
+
+        return false;
+    }
+
+    public boolean isRetentionAllowed() {
+        //Need a valid :MinRetentionDurationInMonths setting to allow retentions
+        return getMinRetentionDate()!=null;
+    }
+
+    public void validateRetentionDate(FacesContext context, UIComponent component, Object value)
+            throws ValidatorException {
+        if (isRetentionAllowed()) {
+            UIComponent cb = component.findComponent("retentionCheckbox");
+            UIInput endComponent = (UIInput) cb;
+            boolean removedState = false;
+            if (endComponent != null) {
+                try {
+                    removedState = (Boolean) endComponent.getSubmittedValue();
+                } catch (NullPointerException npe) {
+                    // Do nothing - checkbox is not being shown (and is therefore not checked)
+                }
+            }
+            if (!removedState && value == null) {
+                String msgString = BundleUtil.getStringFromBundle("retention.date.required");
+                FacesMessage msg = new FacesMessage(msgString);
+                msg.setSeverity(FacesMessage.SEVERITY_ERROR);
+                throw new ValidatorException(msg);
+            }
+            Retention newR = new Retention(((LocalDate) value), null);
+            if (!isValidRetentionDate(newR)) {
+                String minDate = getMinRetentionDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                String maxDate = getMaxRetentionDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                String msgString = BundleUtil.getStringFromBundle("retention.date.invalid",
+                        Arrays.asList(minDate, maxDate));
+                // If we don't throw an exception here, the datePicker will use it's own
+                // vaidator and display a default message. The value for that can be set by
+                // adding validatorMessage="#{bundle['retention.date.invalid']}" (a version with
+                // no params) to the datepicker
+                // element in file-edit-popup-fragment.html, but it would be better to catch all
+                // problems here (so we can show a message with the min/max dates).
+                FacesMessage msg = new FacesMessage(msgString);
+                msg.setSeverity(FacesMessage.SEVERITY_ERROR);
+                throw new ValidatorException(msg);
+            }
+        }
+    }
+
+    Map<String,String> languageMap = null;
+    
+    public Map<String, String> getBaseMetadataLanguageMap(boolean refresh) {
+        if (languageMap == null || refresh) {
+           languageMap = settingsService.getBaseMetadataLanguageMap(languageMap, true);
+        }
+        return languageMap;
+    }
+    
+    public Map<String, String> getMetadataLanguages(DvObjectContainer target) {
+        Map<String,String> currentMap = new HashMap<String,String>();
+        currentMap.putAll(getBaseMetadataLanguageMap(false));
+        currentMap.put(DvObjectContainer.UNDEFINED_CODE, getDefaultMetadataLanguageLabel(target));
+        return currentMap;
+    }
+
+    private String getDefaultMetadataLanguageLabel(DvObjectContainer target) {
+        String mlLabel = BundleUtil.getStringFromBundle("dataverse.metadatalanguage.setatdatasetcreation");
+
+        if(target.getOwner() != null) { // Root collection is excluded from inherit metadata language research
+            String mlCode = target.getOwner().getEffectiveMetadataLanguage();
+
+            // If it's undefined, no parent has a metadata language defined, and the global default should be used.
+            if (!mlCode.equals(DvObjectContainer.UNDEFINED_CODE)) {
+                // Get the label for the language code found
+                mlLabel = getBaseMetadataLanguageMap(false).get(mlCode);
+                mlLabel = mlLabel + " " + BundleUtil.getStringFromBundle("dataverse.inherited");
+            }
+        }
+
+        return mlLabel;
+    }
+    
+    public String getDefaultMetadataLanguage() {
+        Map<String, String> mdMap = getBaseMetadataLanguageMap(false);
+        if(mdMap.size()>=1) {
+            if(mdMap.size()==1) {
+                //One entry - it's the default
+            return (String) mdMap.keySet().toArray()[0];
+            } else {
+                //More than one - :MetadataLanguages is set and the default is undefined (users must choose if the collection doesn't override the default)
+                return DvObjectContainer.UNDEFINED_CODE;
+            }
         } else {
-            return false;
+            // None - :MetadataLanguages is not set so return null to turn off the display (backward compatibility)
+            return null;
         }
     }
     
-    public boolean isMakeDataCountDisplayEnabled() {
-        boolean safeDefaultIfKeyNotFound = (getValueForKey(SettingsServiceBean.Key.MDCLogPath)!=null); //Backward compatible
-        return isTrueForKey(SettingsServiceBean.Key.DisplayMDCMetrics, safeDefaultIfKeyNotFound);
+    public Map<String, String> getGuestbookEntryOptions(DvObjectContainer target) {
+        Map<String, String> currentMap = new HashMap<String, String>();
+        String atDownload = BundleUtil.getStringFromBundle("dataverse.guestbookentry.atdownload");
+        String atRequest = BundleUtil.getStringFromBundle("dataverse.guestbookentry.atrequest");
+        Optional<Boolean> gbDefault = JvmSettings.GUESTBOOK_AT_REQUEST.lookupOptional(Boolean.class);
+        if (gbDefault.isPresent()) {
+            // Three options - inherited/default option, at Download, at Request
+            String useDefault = null;
+            if (target.getOwner() == null) {
+                boolean defaultOption = gbDefault.get();
+                useDefault = (defaultOption ? atRequest : atDownload)
+                        + " " + BundleUtil.getStringFromBundle("dataverse.default");
+            } else {
+                boolean defaultOption = target.getOwner().getEffectiveGuestbookEntryAtRequest();
+                useDefault = (defaultOption ? atRequest : atDownload)
+                        + " " + BundleUtil.getStringFromBundle("dataverse.inherited");
+            }
+            currentMap.put(DvObjectContainer.UNDEFINED_CODE, useDefault);
+            currentMap.put(Boolean.toString(true), atRequest);
+            currentMap.put(Boolean.toString(false), atDownload);
+        } else {
+            // Setting not defined - leave empty
+        }
+        return currentMap;
+    }
     
+    public Dataverse getRootDataverse() {
+        if (rootDataverse == null) {
+            rootDataverse = dataverseService.findRootDataverse();
+        }
+        
+        return rootDataverse;
+    }
+    
+    // The following 2 methods may be unnecessary *with the current implementation* of 
+    // how the application version is retrieved (the values are initialized and cached inside 
+    // SystemConfig once per thread - see the code there); 
+    // But in case we switch to some other method, that requires a database 
+    // lookup like other settings, it should be here. 
+    // This would be a prime candidate for moving into some kind of an 
+    // APPLICATION-scope caching singleton. -- L.A. 5.8
+    public String getAppVersion() {
+        if (appVersion == null) {
+            appVersion = systemConfig.getVersion();
+        }
+        return appVersion;
+    }
+    
+    public String getAppVersionWithBuildNumber() {
+        if (appVersionWithBuildNumber == null) {
+            appVersionWithBuildNumber = systemConfig.getVersion(true);
+        }
+        return appVersionWithBuildNumber;
+    }
+    
+    public boolean isShibPassiveLoginEnabled() {
+        if (shibPassiveLoginEnabled == null) {
+            shibPassiveLoginEnabled = systemConfig.isShibPassiveLoginEnabled();
+        }
+        return shibPassiveLoginEnabled;
+    }
+    
+    // Caching this result may not be saving much, *currently* (since the value is 
+    // stored in the bundle). -- L.A. 5.8
+    public String getFooterCopyrightAndYear() {
+        if (footerCopyrightAndYear == null) {
+            footerCopyrightAndYear = systemConfig.getFooterCopyrightAndYear();
+        }
+        return footerCopyrightAndYear; 
+    }
+    
+    public Map<Long, JsonObject> getCVocConf(boolean byTermField) {
+        if (byTermField) {
+            if (cachedCvocByTermFieldMap == null) {
+                cachedCvocByTermFieldMap = fieldService.getCVocConf(true);
+            }
+            return cachedCvocByTermFieldMap;
+        } else {
+            // Cache this in the view
+            if (cachedCvocMap == null) {
+                cachedCvocMap = fieldService.getCVocConf(false);
+            }
+            return cachedCvocMap;
+        }
+    }
+    
+    public boolean isCvocField(Long fieldId) {
+
+        if(cvocFieldSet == null) {
+            cvocFieldSet = fieldService.getCvocFieldSet();
+        }
+        if(cvocFieldSet == null) {
+         return false;
+        }
+        return cvocFieldSet.contains(fieldId);
+    }
+    
+    public String getMetricsUrl() {
+        if (metricsUrl == null) {
+            metricsUrl = getValueForKey(SettingsServiceBean.Key.MetricsUrl);
+        }
+        return metricsUrl;
+    }
+    
+    private Boolean getUploadMethodAvailable(String method){
+        String uploadMethods = getValueForKey(SettingsServiceBean.Key.UploadMethods); 
+        if (uploadMethods==null){
+            return false;
+        } else {
+           return  Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).contains(method);
+        }
+    }
+
+    List<String> allowedExternalStatuses = null;
+
+    public List<String> getAllowedCurationStatuses(Dataset d) {
+        String setName = d.getEffectiveCurationLabelSetName();
+        if(setName.equals(SystemConfig.CURATIONLABELSDISABLED)) {
+            return new ArrayList<String>();
+        }
+        String[] labelArray = systemConfig.getCurationLabels().get(setName);
+        if(labelArray==null) {
+            return new ArrayList<String>();
+        }
+        return Arrays.asList(labelArray);
+    }
+
+    public boolean isCustomLicenseAllowed() {
+        if (customLicenseAllowed == null) {
+            customLicenseAllowed = systemConfig.isAllowCustomTerms();
+        }
+        return customLicenseAllowed;
     }
 
-}
+    public List<MetadataBlock> getSystemMetadataBlocks() {
 
+        if (systemMetadataBlocks == null) {
+            systemMetadataBlocks = new ArrayList<MetadataBlock>();
+        }
+        List<MetadataBlock> blocks = mdbService.listMetadataBlocks();
+        for (MetadataBlock mdb : blocks) {
+            String smdbString = JvmSettings.MDB_SYSTEM_KEY_FOR.lookupOptional(mdb.getName()).orElse(null);
+            if (smdbString != null) {
+                systemMetadataBlocks.add(mdb);
+            }
+        }
+
+        return systemMetadataBlocks;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/Shib.java b/src/main/java/edu/harvard/iq/dataverse/Shib.java
index 8af9a22d783..51e36746f3a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Shib.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Shib.java
@@ -11,25 +11,31 @@
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibUserNameFields;
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibUtil;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.validation.EMailValidator;
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
 
 @ViewScoped
 @Named("Shib")
@@ -50,11 +56,17 @@ public class Shib implements java.io.Serializable {
     GroupServiceBean groupService;
     @EJB
     UserNotificationServiceBean userNotificationService;
+    @EJB
+    SettingsServiceBean settingsService;
+	@EJB
+	SystemConfig systemConfig;
+    @EJB
+    UserServiceBean userService;
 
     HttpServletRequest request;
 
     private String userPersistentId;
-    private String internalUserIdentifer;
+    private String internalUserIdentifier;
     AuthenticatedUserDisplayInfo displayInfo;
     /**
      * @todo Remove this boolean some day? Now the mockups show a popup. Should
@@ -64,21 +76,6 @@ public class Shib implements java.io.Serializable {
     private final String loginpage = "/loginpage.xhtml";
     private final String identityProviderProblem = "Problem with Identity Provider";
 
-    /**
-     * We only have one field in which to store a unique
-     * useridentifier/persistentuserid so we have to jam the the "entityId" for
-     * a Shibboleth Identity Provider (IdP) and the unique persistent identifier
-     * per user into the same field and a separator between these two would be
-     * nice, in case we ever want to answer questions like "How many users
-     * logged in from Harvard's Identity Provider?".
-     *
-     * A pipe ("|") is used as a separator because it's considered "unwise" to
-     * use in a URL and the "entityId" for a Shibboleth Identity Provider (IdP)
-     * looks like a URL:
-     * http://stackoverflow.com/questions/1547899/which-characters-make-a-url-invalid
-     */
-    private String persistentUserIdSeparator = "|";
-
     /**
      * The Shibboleth Identity Provider (IdP), an "entityId" which often but not
      * always looks like a URL.
@@ -183,12 +180,12 @@ public void init() {
             }
         }
 
-        if (!EMailValidator.isEmailValid(emailAddressInAssertion, null)) {
+        if (!EMailValidator.isEmailValid(emailAddressInAssertion)) {
             String msg = "The SAML assertion contained an invalid email address: \"" + emailAddressInAssertion + "\".";
             logger.info(msg);
             msg=BundleUtil.getStringFromBundle("shib.invalidEmailAddress",   Arrays.asList(emailAddressInAssertion));
             String singleEmailAddress = ShibUtil.findSingleValue(emailAddressInAssertion);
-            if (EMailValidator.isEmailValid(singleEmailAddress, null)) {
+            if (EMailValidator.isEmailValid(singleEmailAddress)) {
                 msg = "Multiple email addresses were asserted by the Identity Provider (" + emailAddressInAssertion + " ). These were sorted and the first was chosen: " + singleEmailAddress;
                 logger.info(msg);
                 emailAddress = singleEmailAddress;
@@ -202,18 +199,41 @@ public void init() {
         }
 
         String usernameAssertion = getValueFromAssertion(ShibUtil.usernameAttribute);
-        internalUserIdentifer = ShibUtil.generateFriendlyLookingUserIdentifer(usernameAssertion, emailAddress);
-        logger.fine("friendly looking identifer (backend will enforce uniqueness):" + internalUserIdentifer);
+        internalUserIdentifier = ShibUtil.generateFriendlyLookingUserIdentifier(usernameAssertion, emailAddress);
+        logger.log(Level.FINE, "friendly looking identifier (backend will enforce uniqueness): {0}", internalUserIdentifier);
+
+        String shibAffiliationAttribute = settingsService.getValueForKey(SettingsServiceBean.Key.ShibAffiliationAttribute);
+        String affiliation = (StringUtils.isNotBlank(shibAffiliationAttribute))
+            ? getValueFromAssertion(shibAffiliationAttribute)
+            : shibService.getAffiliation(shibIdp, shibService.getDevShibAccountType());
+
 
-        String affiliation = shibService.getAffiliation(shibIdp, shibService.getDevShibAccountType());
         if (affiliation != null) {
+            String ShibAffiliationSeparator = settingsService.getValueForKey(SettingsServiceBean.Key.ShibAffiliationSeparator);
+            if (ShibAffiliationSeparator == null) {
+                ShibAffiliationSeparator = ";";
+            }
+            String ShibAffiliationOrder = settingsService.getValueForKey(SettingsServiceBean.Key.ShibAffiliationOrder);
+            if (ShibAffiliationOrder != null) {
+                if (ShibAffiliationOrder.equals("lastAffiliation")) {
+                    affiliation = affiliation.substring(affiliation.lastIndexOf(ShibAffiliationSeparator) + 1); //patch for affiliation array returning last part
+                }
+                else if (ShibAffiliationOrder.equals("firstAffiliation")) {
+                    try{
+                        affiliation = affiliation.substring(0,affiliation.indexOf(ShibAffiliationSeparator)); //patch for affiliation array returning first part
+                    }
+                    catch (Exception e){
+                        logger.info("Affiliation does not contain \"" + ShibAffiliationSeparator + "\"");
+                    }
+                }
+            }
             affiliationToDisplayAtConfirmation = affiliation;
             friendlyNameForInstitution = affiliation;
         }
 //        emailAddress = "willFailBeanValidation"; // for testing createAuthenticatedUser exceptions
         displayInfo = new AuthenticatedUserDisplayInfo(firstName, lastName, emailAddress, affiliation, null);
 
-        userPersistentId = shibIdp + persistentUserIdSeparator + shibUserIdentifier;
+        userPersistentId = ShibUtil.createUserPersistentIdentifier(shibIdp, shibUserIdentifier);
         ShibAuthenticationProvider shibAuthProvider = new ShibAuthenticationProvider();
         AuthenticatedUser au = authSvc.lookupUser(shibAuthProvider.getId(), userPersistentId);
         if (au != null) {
@@ -227,6 +247,7 @@ public void init() {
             state = State.REGULAR_LOGIN_INTO_EXISTING_SHIB_ACCOUNT;
             logger.fine("Found user based on " + userPersistentId + ". Logging in.");
             logger.fine("Updating display info for " + au.getName());
+            userService.updateLastLogin(au);
             authSvc.updateAuthenticatedUser(au, displayInfo);
             logInUserAndSetShibAttributes(au);
             String prettyFacesHomePageString = getPrettyFacesHomePageString(false);
@@ -295,7 +316,7 @@ public String confirmAndCreateAccount() {
         AuthenticatedUser au = null;
         try {
             au = authSvc.createAuthenticatedUser(
-                    new UserRecordIdentifier(shibAuthProvider.getId(), lookupStringPerAuthProvider), internalUserIdentifer, displayInfo, true);
+                    new UserRecordIdentifier(shibAuthProvider.getId(), lookupStringPerAuthProvider), internalUserIdentifier, displayInfo, true);
         } catch (EJBException ex) {
             /**
              * @todo Show the ConstraintViolationException, if any.
@@ -323,10 +344,14 @@ public String confirmAndConvertAccount() {
         visibleTermsOfUse = false;
         ShibAuthenticationProvider shibAuthProvider = new ShibAuthenticationProvider();
         String lookupStringPerAuthProvider = userPersistentId;
-        UserIdentifier userIdentifier = new UserIdentifier(lookupStringPerAuthProvider, internalUserIdentifer);
+        UserIdentifier userIdentifier = new UserIdentifier(lookupStringPerAuthProvider, internalUserIdentifier);
         logger.fine("builtin username: " + builtinUsername);
         AuthenticatedUser builtInUserToConvert = authSvc.canLogInAsBuiltinUser(builtinUsername, builtinPassword);
         if (builtInUserToConvert != null) {
+            if (builtInUserToConvert.isDeactivated()) {
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("shib.convert.fail.deactivated"));
+                return null;
+            }
             // TODO: Switch from authSvc.convertBuiltInToShib to authSvc.convertBuiltInUserToRemoteUser
             AuthenticatedUser au = authSvc.convertBuiltInToShib(builtInUserToConvert, shibAuthProvider.getId(), userIdentifier);
             if (au != null) {
@@ -347,8 +372,8 @@ public String confirmAndConvertAccount() {
 
     private void logInUserAndSetShibAttributes(AuthenticatedUser au) {
         au.setShibIdentityProvider(shibIdp);
+        // setUser checks for deactivated users.
         session.setUser(au);
-        session.configureSessionTimeout();
         logger.fine("Groups for user " + au.getId() + " (" + au.getIdentifier() + "): " + getGroups(au));
     }
 
@@ -381,6 +406,9 @@ private String getValueFromAssertion(String key) {
         Object attribute = request.getAttribute(key);
         if (attribute != null) {
             String attributeValue = attribute.toString();
+            if(systemConfig.isShibAttributeCharacterSetConversionEnabled()) {
+                attributeValue = new String(attributeValue.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+            }
             String trimmedValue = attributeValue.trim();
             if (!trimmedValue.isEmpty()) {
                 logger.fine("The SAML assertion for \"" + key + "\" (optional) was \"" + attributeValue + "\" and was trimmed to \"" + trimmedValue + "\".");
@@ -419,6 +447,9 @@ private String getRequiredValueFromAssertion(String key) throws Exception {
         if (attributeValue.isEmpty()) {
             throw new Exception(key + " was empty");
         }
+        if (systemConfig.isShibAttributeCharacterSetConversionEnabled()) {
+            attributeValue= new String( attributeValue.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+        }
         String trimmedValue = attributeValue.trim();
         logger.fine("The SAML assertion for \"" + key + "\" (required) was \"" + attributeValue + "\" and was trimmed to \"" + trimmedValue + "\".");
         return trimmedValue;
diff --git a/src/main/java/edu/harvard/iq/dataverse/SuperUserPage.java b/src/main/java/edu/harvard/iq/dataverse/SuperUserPage.java
index cd6d53fd8a8..adf2e7d3010 100644
--- a/src/main/java/edu/harvard/iq/dataverse/SuperUserPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/SuperUserPage.java
@@ -6,11 +6,11 @@
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import javax.ejb.EJB;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.json.JsonObjectBuilder;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.json.JsonObjectBuilder;
 
 @SessionScoped
 @Named("SuperUserPage")
diff --git a/src/main/java/edu/harvard/iq/dataverse/Template.java b/src/main/java/edu/harvard/iq/dataverse/Template.java
index b01b0a2b792..2768cf417a4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Template.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Template.java
@@ -1,7 +1,6 @@
 package edu.harvard.iq.dataverse;
 
 import java.io.Serializable;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -10,30 +9,48 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-import javax.validation.constraints.Size;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonString;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Transient;
+import jakarta.validation.constraints.Size;
 
 import edu.harvard.iq.dataverse.util.DateUtil;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
 import org.hibernate.validator.constraints.NotBlank;
 
 /**
  *
  * @author skraffmiller
  */
+
+@NamedQueries({
+    @NamedQuery(name = "Template.findByOwnerId",
+               query = "select object(o) from Template as o where o.dataverse.id =:ownerId"),
+    @NamedQuery(name = "Template.findAll",
+               query = "select object(o) from Template as o")
+})
+
 @Entity
 @Table(indexes = {@Index(columnList="dataverse_id")})
 public class Template implements Serializable {
@@ -43,14 +60,13 @@ public class Template implements Serializable {
     private Long id;
 
     public Template() {
-
     }
 
     //Constructor for create
-    public Template(Dataverse dataverseIn) {
+    public Template(Dataverse dataverseIn, List<MetadataBlock> systemMDBlocks) {
         dataverse = dataverseIn;
         datasetFields = initDatasetFields();
-        initMetadataBlocksForCreate();
+        initMetadataBlocksForCreate(systemMDBlocks);
     }
 
     public Long getId() {
@@ -115,11 +131,21 @@ public void setTermsOfUseAndAccess(TermsOfUseAndAccess termsOfUseAndAccess) {
     public List<DatasetField> getDatasetFields() {
         return datasetFields;
     }
+    
+    @Column(columnDefinition="TEXT", nullable = true )
+    private String instructions;
+
+    @Transient
+    private Map<String, String> instructionsMap = null;
+
+    public void setInstructionsMap(Map<String, String> instructionsMap) {
+        this.instructionsMap = instructionsMap;
+    }
 
     @Transient
-    private Map<MetadataBlock, List<DatasetField>> metadataBlocksForView = new HashMap<>();
+    private TreeMap<MetadataBlock, List<DatasetField>> metadataBlocksForView = new TreeMap<>();
     @Transient
-    private Map<MetadataBlock, List<DatasetField>> metadataBlocksForEdit = new HashMap<>();
+    private TreeMap<MetadataBlock, List<DatasetField>> metadataBlocksForEdit = new TreeMap<>();
     
     @Transient
     private boolean isDefaultForDataverse;
@@ -144,19 +170,19 @@ public void setDataversesHasAsDefault(List<Dataverse> dataversesHasAsDefault) {
     }
     
 
-    public Map<MetadataBlock, List<DatasetField>> getMetadataBlocksForView() {
+    public TreeMap<MetadataBlock, List<DatasetField>> getMetadataBlocksForView() {
         return metadataBlocksForView;
     }
 
-    public void setMetadataBlocksForView(Map<MetadataBlock, List<DatasetField>> metadataBlocksForView) {
+    public void setMetadataBlocksForView(TreeMap<MetadataBlock, List<DatasetField>> metadataBlocksForView) {
         this.metadataBlocksForView = metadataBlocksForView;
     }
 
-    public Map<MetadataBlock, List<DatasetField>> getMetadataBlocksForEdit() {
+    public TreeMap<MetadataBlock, List<DatasetField>> getMetadataBlocksForEdit() {
         return metadataBlocksForEdit;
     }
 
-    public void setMetadataBlocksForEdit(Map<MetadataBlock, List<DatasetField>> metadataBlocksForEdit) {
+    public void setMetadataBlocksForEdit(TreeMap<MetadataBlock, List<DatasetField>> metadataBlocksForEdit) {
         this.metadataBlocksForEdit = metadataBlocksForEdit;
     }
 
@@ -224,54 +250,55 @@ public int compare(DatasetField d1, DatasetField d2) {
         return dsfList;
     }
 
-    private void initMetadataBlocksForCreate() {
-        metadataBlocksForView.clear();
+    private void initMetadataBlocksForCreate(List<MetadataBlock> systemMDBlocks) {
         metadataBlocksForEdit.clear();
         for (MetadataBlock mdb : this.getDataverse().getMetadataBlocks()) {
-            List<DatasetField> datasetFieldsForView = new ArrayList<>();
-            List<DatasetField> datasetFieldsForEdit = new ArrayList<>();
-            for (DatasetField dsf : this.getDatasetFields()) {
+            if (!systemMDBlocks.contains(mdb)) {
+                List<DatasetField> datasetFieldsForEdit = new ArrayList<>();
+                for (DatasetField dsf : this.getDatasetFields()) {
 
-                if (dsf.getDatasetFieldType().getMetadataBlock().equals(mdb)) {
-                    datasetFieldsForEdit.add(dsf);
+                    if (dsf.getDatasetFieldType().getMetadataBlock().equals(mdb)) {
+                        datasetFieldsForEdit.add(dsf);
+                    }
                 }
-            }
 
-            if (!datasetFieldsForView.isEmpty()) {
-                metadataBlocksForView.put(mdb, sortDatasetFields(datasetFieldsForView));
-            }
-            if (!datasetFieldsForEdit.isEmpty()) {
-                metadataBlocksForEdit.put(mdb, sortDatasetFields(datasetFieldsForEdit));
+                if (!datasetFieldsForEdit.isEmpty()) {
+                    metadataBlocksForEdit.put(mdb, sortDatasetFields(datasetFieldsForEdit));
+                }
             }
         }
     }
 
-    public void setMetadataValueBlocks() {
+    public void setMetadataValueBlocks(List<MetadataBlock> systemMDBlocks) {
         //TODO: A lot of clean up on the logic of this method
         metadataBlocksForView.clear();
         metadataBlocksForEdit.clear();
         List<DatasetField> filledInFields = this.getDatasetFields(); 
+
+        Map<String, String> instructionsMap = getInstructionsMap();
         
-        
-        List <MetadataBlock> actualMDB = new ArrayList<>();
+        List <MetadataBlock> viewMDB = new ArrayList<>();
+        List <MetadataBlock> editMDB=this.getDataverse().getMetadataBlocks(false);
             
-        actualMDB.addAll(this.getDataverse().getMetadataBlocks());
-        for (DatasetField dsfv : filledInFields) {
-            if (!dsfv.isEmptyForDisplay()) {
-                MetadataBlock mdbTest = dsfv.getDatasetFieldType().getMetadataBlock();
-                if (!actualMDB.contains(mdbTest)) {
-                    actualMDB.add(mdbTest);
+        //The metadatablocks in this template include any from the Dataverse it is associated with 
+        //plus any others where the template has a displayable field (i.e. from before a block was dropped in the dataverse/collection)
+        viewMDB.addAll(this.getDataverse().getMetadataBlocks(true));
+        for (DatasetField dsf : filledInFields) {
+            if (!dsf.isEmptyForDisplay()) {
+                MetadataBlock mdbTest = dsf.getDatasetFieldType().getMetadataBlock();
+                if (!viewMDB.contains(mdbTest)) {
+                    viewMDB.add(mdbTest);
                 }
             }
-        }       
-        
-        for (MetadataBlock mdb : actualMDB) {
+        }
+
+        for (MetadataBlock mdb : viewMDB) {
+
             List<DatasetField> datasetFieldsForView = new ArrayList<>();
-            List<DatasetField> datasetFieldsForEdit = new ArrayList<>();
             for (DatasetField dsf : this.getDatasetFields()) {
                 if (dsf.getDatasetFieldType().getMetadataBlock().equals(mdb)) {
-                    datasetFieldsForEdit.add(dsf);
-                    if (!dsf.isEmpty()) {
+                    //For viewing, show the field if it has a value or custom instructions
+                    if (!dsf.isEmpty() || instructionsMap.containsKey(dsf.getDatasetFieldType().getName())) {
                         datasetFieldsForView.add(dsf);
                     }
                 }
@@ -280,10 +307,22 @@ public void setMetadataValueBlocks() {
             if (!datasetFieldsForView.isEmpty()) {
                 metadataBlocksForView.put(mdb, sortDatasetFields(datasetFieldsForView));
             }
-            if (!datasetFieldsForEdit.isEmpty()) {
+
+        }
+        
+        for (MetadataBlock mdb : editMDB) {
+            if (!systemMDBlocks.contains(mdb)) {
+                List<DatasetField> datasetFieldsForEdit = new ArrayList<>();
+                this.setDatasetFields(initDatasetFields());
+                for (DatasetField dsf : this.getDatasetFields()) {
+                    if (dsf.getDatasetFieldType().getMetadataBlock().equals(mdb)) {
+                        datasetFieldsForEdit.add(dsf);
+                    }
+                }
                 metadataBlocksForEdit.put(mdb, sortDatasetFields(datasetFieldsForEdit));
             }
         }
+        
     }
 
     // TODO: clean up init methods and get them to work, cascading all the way down.
@@ -320,14 +359,19 @@ public Template cloneNewTemplate(Template source) {
         if (latestVersion.getDatasetFields() != null && !latestVersion.getDatasetFields().isEmpty()) {
             newTemplate.setDatasetFields(newTemplate.copyDatasetFields(source.getDatasetFields()));
         }
-        TermsOfUseAndAccess terms;
+        TermsOfUseAndAccess terms = null;
         if(source.getTermsOfUseAndAccess() != null){
             terms = source.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
         } else {
             terms = new TermsOfUseAndAccess();
-            terms.setLicense(TermsOfUseAndAccess.defaultLicense);
+           // terms.setLicense(TermsOfUseAndAccess.defaultLicense);
+            terms.setFileAccessRequest(true);
         }
+        terms.setTemplate(newTemplate);
         newTemplate.setTermsOfUseAndAccess(terms);
+        
+        newTemplate.getInstructionsMap().putAll(source.getInstructionsMap());
+        newTemplate.updateInstructions();
         return newTemplate;
     }
 
@@ -367,6 +411,45 @@ private List<DatasetField> getFlatDatasetFields(List<DatasetField> dsfList) {
         return retList;
     }
     
+    //Cache values in map for reading
+    public Map<String, String> getInstructionsMap() {
+        if(instructionsMap==null)
+            if(instructions != null) {
+            instructionsMap = JsonUtil.getJsonObject(instructions).entrySet().stream().collect(Collectors.toMap(entry -> entry.getKey(),entry -> ((JsonString)entry.getValue()).getString()));
+            } else {
+                instructionsMap = new HashMap<String,String>();
+        }
+        return instructionsMap;
+    }
+
+    //Get the cutstom instructions defined for a give fieldType
+    public String getInstructionsFor(String fieldType) {
+        return getInstructionsMap().get(fieldType);
+    }
+
+    /*
+    //Add/change or remove (null instructionString) instructions for a given fieldType
+    public void setInstructionsFor(String fieldType, String instructionString) {
+        if(instructionString==null) {
+            getInstructionsMap().remove(fieldType);
+        } else {
+        getInstructionsMap().put(fieldType, instructionString);
+        }
+        updateInstructions();
+    }
+    */
+    
+    //Keep instructions up-to-date on any change
+    public void updateInstructions() {
+        JsonObjectBuilder builder = Json.createObjectBuilder();
+        getInstructionsMap().forEach((key, value) -> {
+            if (value != null)
+                builder.add(key, value);
+        });
+        instructions = JsonUtil.prettyPrint(builder.build());
+    }
+    
+
     @Override
      public int hashCode() {
         int hash = 0;
diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplateConverter.java b/src/main/java/edu/harvard/iq/dataverse/TemplateConverter.java
index 505e6c94789..1d855e029ce 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplateConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplateConverter.java
@@ -6,11 +6,12 @@
 
 package edu.harvard.iq.dataverse;
 
-import javax.ejb.EJB;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
 
 /**
  *
@@ -19,8 +20,8 @@
 @FacesConverter("templateConverter")
 public class TemplateConverter implements Converter {
     
-    @EJB
-    TemplateServiceBean templateService;
+    //@EJB
+    TemplateServiceBean templateService = CDI.current().select(TemplateServiceBean.class).get();
 
     @Override
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
index 6e2881300d5..279944beaa7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
@@ -3,25 +3,24 @@
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateTemplateCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.DeleteTemplateCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseTemplateCommand;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import java.sql.Timestamp;
 import java.util.Date;
-import java.util.Set;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import java.util.List;
+import java.util.logging.Logger;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 /**
  *
@@ -51,10 +50,18 @@ public class TemplatePage implements java.io.Serializable {
     
     @Inject
     DataverseSession session;
+    
+    @Inject
+    LicenseServiceBean licenseServiceBean;
+    
+    @Inject
+    SettingsWrapper settingsWrapper;
+    
+    private static final Logger logger = Logger.getLogger(TemplatePage.class.getCanonicalName());
 
     public enum EditMode {
 
-        CREATE, METADATA, LICENSE, LICENSEADD
+        CREATE, METADATA, LICENSE, LICENSEADD, CLONE
     };
 
     private Template template;
@@ -126,14 +133,11 @@ public String init() {
 
             template = templateService.find(templateId);
             template.setDataverse(dataverse);
-            template.setMetadataValueBlocks();
-            
-            if (template.getTermsOfUseAndAccess() != null) {
+            template.setMetadataValueBlocks(settingsWrapper.getSystemMetadataBlocks());
 
-            } else {
-                TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+            if (template.getTermsOfUseAndAccess() != null) {
+                TermsOfUseAndAccess terms = template.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
                 terms.setTemplate(template);
-                terms.setLicense(TermsOfUseAndAccess.License.CC0);
                 template.setTermsOfUseAndAccess(terms);
             }
 
@@ -142,10 +146,11 @@ public String init() {
             // create mode for a new template
 
             editMode = TemplatePage.EditMode.CREATE;
-            template = new Template(this.dataverse);
+            template = new Template(this.dataverse, settingsWrapper.getSystemMetadataBlocks());
             TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+            terms.setFileAccessRequest(true);
             terms.setTemplate(template);
-            terms.setLicense(TermsOfUseAndAccess.License.CC0);
+            terms.setLicense(licenseServiceBean.getDefault());
             template.setTermsOfUseAndAccess(terms);
             updateDatasetFieldInputLevels();
         } else {
@@ -161,9 +166,13 @@ private void updateDatasetFieldInputLevels(){
         }        
         
         for (DatasetField dsf: template.getFlatDatasetFields()){ 
-           DataverseFieldTypeInputLevel dsfIl = dataverseFieldTypeInputLevelService.findByDataverseIdDatasetFieldTypeId(dvIdForInputLevel, dsf.getDatasetFieldType().getId());
-           if (dsfIl != null){              
+           DataverseFieldTypeInputLevel dsfIl = dataverseFieldTypeInputLevelService.findByDataverseIdDatasetFieldTypeId(
+               dvIdForInputLevel, 
+               dsf.getDatasetFieldType().getId()
+           );
+           if (dsfIl != null) {
                dsf.setInclude(dsfIl.isInclude());
+               dsf.getDatasetFieldType().setLocalDisplayOnCreate(dsfIl.getDisplayOnCreate());
            } else {
                dsf.setInclude(true);
            } 
@@ -175,14 +184,17 @@ public void edit(TemplatePage.EditMode editMode) {
     }
 
     public String save(String redirectPage) {
-
-        //SEK - removed dead code 1/6/2015
         
         boolean create = false;
         Command<Void> cmd;
         Long createdId = new Long(0);
         Template created;
         try {
+
+            DatasetFieldUtil.tidyUpFields( template.getDatasetFields(), false );
+
+            template.updateInstructions();
+            
             if (editMode == EditMode.CREATE) {
                 template.setCreateTime(new Timestamp(new Date().getTime()));
                 template.setUsageCount(new Long(0));
@@ -207,20 +219,13 @@ public String save(String redirectPage) {
                 error.append(cause).append(" ");
                 error.append(cause.getMessage()).append(" ");
             }
-            //
-            //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Template Save Failed", " - " + error.toString()));
-            System.out.print("dataverse " + dataverse.getName());
-            System.out.print("Ejb exception");
-            System.out.print(error.toString());
+            logger.warning("Template Save failed - Ejb exception " + error.toString());
             JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("template.save.fail"));
             return null;
         } catch (CommandException ex) {
-            System.out.print("command exception");
-            System.out.print(ex.toString());
-            //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Template Save Failed", " - " + ex.toString()));
+            logger.severe("Template Save failed - Ejb exception " + ex.toString());
             JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("template.save.fail"));
             return null;
-            //logger.severe(ex.getMessage());
         }
         editMode = null;       
         String msg = (create)? BundleUtil.getStringFromBundle("template.create"): BundleUtil.getStringFromBundle("template.save");
@@ -237,5 +242,26 @@ public String save(String redirectPage) {
     public void cancel() {
         editMode = null;
     }
+    
+    public String deleteTemplate(Long templateId) {
+        List <Dataverse> dataverseWDefaultTemplate = null;
+        Template doomed = templateService.find(templateId);
+        dataverse.getTemplates().remove(doomed);  
+        dataverseWDefaultTemplate = templateService.findDataversesByDefaultTemplateId(doomed.getId());
+        try {
+            commandEngine.submit(new DeleteTemplateCommand(dvRequestService.getDataverseRequest(), getDataverse(), doomed, dataverseWDefaultTemplate  ));
+            JsfHelper.addFlashMessage(BundleUtil.getStringFromBundle("template.delete"));//("The template has been deleted");
+        } catch (CommandException ex) {
+            String failMessage = BundleUtil.getStringFromBundle("template.delete.error");//"The dataset template cannot be deleted.";
+            JH.addMessage(FacesMessage.SEVERITY_FATAL, failMessage);
+        }
+        return "/manage-templates.xhtml?dataverseId=" + dataverse.getId() + "&faces-redirect=true"; 
+    }
+    
+    //Get the cutstom instructions defined for a give fieldType
+    public String getInstructionsLabelFor(String fieldType) {
+        String fieldInstructions = template.getInstructionsMap().get(fieldType);
+        return (fieldInstructions!=null && !fieldInstructions.isBlank()) ? fieldInstructions : BundleUtil.getStringFromBundle("template.instructions.empty.label");
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
index e2da5f9af0a..46382fc2588 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
@@ -2,14 +2,13 @@
 
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
@@ -31,22 +30,17 @@ public Template find(Object pk) {
     }
 
     public Template save(Template template) {
-        /*
-                if (template.getId() == null) {
-            em.persist(template);
-            return template;
-        } else {
-            return em.merge(template);
-        } */
         return em.merge(template);
     }
-
-    public Template findByDeafultTemplateOwnerId(Long ownerId) {
-        TypedQuery<Template> query = em.createQuery("select object(o.defaultTemplate) from Dataverse as o where o.owner.id =:ownerId order by o.name", Template.class);
-        query.setParameter("ownerId", ownerId);
-        return query.getSingleResult();
+    
+    public List<Template> findByOwnerId(Long ownerId) {              
+        return em.createNamedQuery("Template.findByOwnerId", Template.class).setParameter("ownerId", ownerId).getResultList();
     }
-
+    
+    public List<Template> findAll() {
+        return em.createNamedQuery("Template.findAll", Template.class).getResultList();
+    }
+    
     public List<Dataverse> findDataversesByDefaultTemplateId(Long defaultTemplateId) {
         TypedQuery<Dataverse> query = em.createQuery("select object(o) from Dataverse as o where o.defaultTemplate.id =:defaultTemplateId order by o.name", Dataverse.class);
         query.setParameter("defaultTemplateId", defaultTemplateId);
diff --git a/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccess.java b/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccess.java
index ad6775d6efd..9e48c6c0165 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccess.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccess.java
@@ -6,14 +6,39 @@
 package edu.harvard.iq.dataverse;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Transient;
+
+import edu.harvard.iq.dataverse.license.License;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+
+@NamedQueries({
+    // TermsOfUseAndAccess.findByDatasetVersionIdAndDefaultTerms 
+    // is used to determine if the dataset terms were set by the multi license support update 
+    // as part of the 5.10 release.
+    
+    @NamedQuery(name = "TermsOfUseAndAccess.findByDatasetVersionIdAndDefaultTerms", 
+                query = "SELECT o FROM TermsOfUseAndAccess o, DatasetVersion dv WHERE "
+                        + "dv.id =:id "
+                        + "AND dv.termsOfUseAndAccess.id = o.id "
+                        + "AND o.termsOfUse =:defaultTerms "
+                        + "AND o.confidentialityDeclaration IS null " 
+                        + "AND o.specialPermissions IS null "
+                        + "AND o.restrictions IS null "
+                        + "AND o.citationRequirements IS null "
+                        + "AND o.depositorRequirements IS null "
+                        + "AND o.conditions IS null "
+                        + "AND o.disclaimer IS null "
+    )
+})
 
 /**
  *
@@ -21,7 +46,10 @@
  * @author skraffmi
  */
 @Entity
+@ValidateTermsOfUseAndAccess
 public class TermsOfUseAndAccess implements Serializable {
+    
+    public static final String DEFAULT_NOTERMS = "This dataset is made available without information on how it can be used. You should communicate with the Contact(s) specified before use.";
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -57,10 +85,10 @@ public void setTemplate(Template template) {
         this.template = template;
     }
     
-    
-    @Enumerated(EnumType.STRING)
-    private TermsOfUseAndAccess.License license;
-    
+    @ManyToOne
+    @JoinColumn(name="license_id")
+    private License license;
+
     @Column(columnDefinition="TEXT")      
     private String termsOfUse;
     
@@ -116,12 +144,15 @@ public void setFileAccessRequest(boolean fileAccessRequest) {
         this.fileAccessRequest = fileAccessRequest;
     }
     
-    public TermsOfUseAndAccess.License getLicense() {
+    public License getLicense() {
         return license;
     }
 
-    public void setLicense(TermsOfUseAndAccess.License license) {
+    public void setLicense(License license) {
         this.license = license;
+        if(license!=null) {
+            clearCustomTermsVariables();
+        }
     }
 
     public String getTermsOfUse() {
@@ -249,38 +280,50 @@ public TermsOfUseAndAccess copyTermsOfUseAndAccess(){
 
         TermsOfUseAndAccess retVal = new TermsOfUseAndAccess();
         retVal.setAvailabilityStatus(this.getAvailabilityStatus());
-        retVal.setCitationRequirements(this.getCitationRequirements());
-        retVal.setConditions(this.getConditions());
-        retVal.setConfidentialityDeclaration(this.getConfidentialityDeclaration());
         retVal.setContactForAccess(this.getContactForAccess());
         retVal.setDataAccessPlace(this.getDataAccessPlace());
-        retVal.setDepositorRequirements(this.getDepositorRequirements());
-        retVal.setDisclaimer(this.getDisclaimer());
-        retVal.setLicense(this.getLicense());
         retVal.setOriginalArchive(this.getOriginalArchive());
-        retVal.setRestrictions(this.getRestrictions());
         retVal.setSizeOfCollection(this.getSizeOfCollection());
-        retVal.setSpecialPermissions(this.getSpecialPermissions());
         retVal.setStudyCompletion(this.getStudyCompletion());
         retVal.setTermsOfAccess(this.getTermsOfAccess());
-        retVal.setTermsOfUse(this.getTermsOfUse());
         retVal.setFileAccessRequest(this.isFileAccessRequest());
+        retVal.setLicense(this.getLicense());
+        if (license == null) {
+            retVal.setTermsOfUse(this.getTermsOfUse());
+            retVal.setConfidentialityDeclaration(this.getConfidentialityDeclaration());
+            retVal.setSpecialPermissions(this.getSpecialPermissions());
+            retVal.setRestrictions(this.getRestrictions());
+            retVal.setCitationRequirements(this.getCitationRequirements());
+            retVal.setDepositorRequirements(this.getDepositorRequirements());
+            retVal.setConditions(this.getConditions());
+            retVal.setDisclaimer(this.getDisclaimer());
+        }
 
         return retVal;
     }
 
-    
-        
-    public enum License {
-        NONE, CC0
+    private void clearCustomTermsVariables(){
+        termsOfUse = null;
+        confidentialityDeclaration = null;
+        specialPermissions = null;
+        restrictions = null;
+        citationRequirements = null;
+        depositorRequirements = null;
+        conditions = null;
+        disclaimer = null;
     }
     
-        /**
-     * @todo What does the GUI use for a default license? What does the "native"
-     * API use? See also https://github.com/IQSS/dataverse/issues/1385
-     */
-    public static TermsOfUseAndAccess.License defaultLicense = TermsOfUseAndAccess.License.CC0;
+    @Transient
+    private String validationMessage;
 
+    public String getValidationMessage() {
+        return validationMessage;
+    }
+
+    public void setValidationMessage(String validationMessage) {
+        this.validationMessage = validationMessage;
+    }
+    
     @Override
     public int hashCode() {
         int hash = 0;
diff --git a/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java b/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java
index dfa9e9f6c77..ca38a305d63 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessValidator.java
@@ -5,28 +5,55 @@
  */
 package edu.harvard.iq.dataverse;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 /**
  *
  * @author skraffmi
  */
-public class TermsOfUseAndAccessValidator implements ConstraintValidator<ValidateTermsOfUseAndAccess, TermsOfUseAndAccess>  {
+public class TermsOfUseAndAccessValidator implements ConstraintValidator<ValidateTermsOfUseAndAccess, TermsOfUseAndAccess> {
 
     @Override
     public void initialize(ValidateTermsOfUseAndAccess constraintAnnotation) {
-        
+
     }
 
     @Override
     public boolean isValid(TermsOfUseAndAccess value, ConstraintValidatorContext context) {
-        //if both null invalid
-        //if(value.getTemplate() == null && value.getDatasetVersion() == null) return false;
         
-        //if both not null invalid
-        //return !(value.getTemplate() != null && value.getDatasetVersion() != null);
-        return true;
+        return isTOUAValid(value, context);
+
+    }
+    
+    public static boolean isTOUAValid(TermsOfUseAndAccess value, ConstraintValidatorContext context){
+        
+        //if part of a template it is valid
+        if (value.getTemplate() != null){
+            return true;
+        }
+        
+         //If there are no restricted files then terms are valid 
+        if (!value.getDatasetVersion().isHasRestrictedFile()) {
+            return true;
+        }
+        /*If there are restricted files then the version
+        must allow access requests or have terms of access filled in.
+         */
+        boolean valid = value.isFileAccessRequest() == true || (value.getTermsOfAccess() != null && !value.getTermsOfAccess().isEmpty());
+        if (!valid) {
+            try {
+                if (context != null) {
+                    context.buildConstraintViolationWithTemplate(BundleUtil.getStringFromBundle("dataset.message.toua.invalid")).addConstraintViolation();
+                }
+
+               value.setValidationMessage(BundleUtil.getStringFromBundle("dataset.message.toua.invalid"));
+            } catch (NullPointerException e) {
+                return false;
+            }
+            return false;
+        }
+        return valid;
     }
-  
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java b/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
index 88084919acf..2474b43183f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
@@ -5,39 +5,36 @@
  */
 package edu.harvard.iq.dataverse;
 
-import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseThemeCommand;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
-import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.PreDestroy;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.html.HtmlInputText;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.ValidatorException;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.apache.commons.lang.StringUtils;
+import jakarta.annotation.PreDestroy;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.html.HtmlInputText;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.ValidatorException;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
+import org.apache.commons.lang3.StringUtils;
 import org.primefaces.PrimeFaces;
-//import org.primefaces.context.RequestContext;
 
 import org.primefaces.event.FileUploadEvent;
-import org.primefaces.model.UploadedFile;
+import org.primefaces.model.file.UploadedFile;
 
 /**
  *
@@ -52,9 +49,12 @@ public class ThemeWidgetFragment implements java.io.Serializable {
     static final String DEFAULT_TEXT_COLOR = "888888";
     private static final Logger logger = Logger.getLogger(ThemeWidgetFragment.class.getCanonicalName());   
 
+    public static final String LOGOS_SUBDIR = "logos";
+    public static final String LOGOS_TEMP_SUBDIR = LOGOS_SUBDIR + File.separator + "temp";
 
     private File tempDir;
     private File uploadedFile;
+    private File uploadedFileThumbnail;
     private File uploadedFileFooter;
     private Dataverse editDv= new Dataverse();
     private HtmlInputText linkUrlInput;
@@ -89,12 +89,18 @@ public void setTaglineInput(HtmlInputText taglineInput) {
     }
 
  
-   
+    public static Path getLogoDir(String ownerId) {
+        return Path.of(JvmSettings.DOCROOT_DIRECTORY.lookup(), LOGOS_SUBDIR, ownerId);
+    }
     
-    private  void createTempDir() {
+    private void createTempDir() {
           try {
-            File tempRoot = Files.createDirectories(Paths.get("../docroot/logos/temp")).toFile();
-            tempDir = Files.createTempDirectory(tempRoot.toPath(),editDv.getId().toString()).toFile();
+            // Create the temporary space if not yet existing (will silently ignore preexisting)
+            // Note that the docroot directory is checked within ConfigCheckService for presence and write access.
+            Path tempRoot = Path.of(JvmSettings.DOCROOT_DIRECTORY.lookup(), LOGOS_TEMP_SUBDIR);
+            Files.createDirectories(tempRoot);
+            
+            this.tempDir = Files.createTempDirectory(tempRoot, editDv.getId().toString()).toFile();
         } catch (IOException e) {
             throw new RuntimeException("Error creating temp directory", e); // improve error handling
         }
@@ -117,6 +123,7 @@ public void cleanupTempDirectory() {
             throw new RuntimeException("Error deleting temp directory", e); // improve error handling
         }
         uploadedFile=null;
+        uploadedFileThumbnail=null;
         uploadedFileFooter=null;
         tempDir=null;
     }
@@ -206,21 +213,46 @@ public boolean uploadExists() {
         return uploadedFile!=null;
     }
 
+    public boolean uploadExistsThumbnail() {
+        return uploadedFileThumbnail != null;
+    }
+
     public boolean uploadExistsFooter() {
         return uploadedFileFooter!=null;
     }
 
+    public void handleImageThumbnailFileUpload(FileUploadEvent event) {
+        logger.finer("entering handleImageFooterFileUpload");
+        if (this.tempDir == null) {
+            createTempDir();
+            logger.finer("created tempDir");
+        }
+        final UploadedFile uFile = event.getFile();
+        try {
+            this.uploadedFileThumbnail = new File(tempDir, uFile.getFileName());
+            if (!this.uploadedFileThumbnail.exists()) {
+                this.uploadedFileThumbnail.createNewFile();
+            }
+            logger.finer("created file");
+            Files.copy(uFile.getInputStream(), this.uploadedFileThumbnail.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            logger.finer("copied inputstream to file");
+            this.editDv.getDataverseTheme().setLogoThumbnail(uFile.getFileName());
+        } catch (IOException e) {
+            logger.finer("caught IOException");
+            logger.throwing("ThemeWidgetFragment", "handleImageFileUpload", e);
+            throw new RuntimeException("Error uploading logo file", e); // improve error handling
+        }
+        logger.finer("end handleImageFooterFileUpload");
+    }
+
     /**
+     * This method is for footer image.
      * Copy uploaded file to temp area, until we are ready to save
      * Copy filename into Dataverse logo 
      * @param event 
      */
-
-    // This method is for footer image. The syntax is same that handleImageFileUpload for header image
-
     public void handleImageFooterFileUpload(FileUploadEvent event) {
-
-        logger.finer("entering fileUpload");
+        logger.finer("entering handleImageFooterFileUpload");
         if (this.tempDir==null) {
             createTempDir();
             logger.finer("created tempDir");
@@ -232,7 +264,7 @@ public void handleImageFooterFileUpload(FileUploadEvent event) {
                 uploadedFileFooter.createNewFile();
             }
             logger.finer("created file");
-            Files.copy(uFile.getInputstream(), uploadedFileFooter.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(uFile.getInputStream(), uploadedFileFooter.toPath(), StandardCopyOption.REPLACE_EXISTING);
             logger.finer("copied inputstream to file");
             editDv.getDataverseTheme().setLogoFooter(uFile.getFileName());
 
@@ -241,25 +273,23 @@ public void handleImageFooterFileUpload(FileUploadEvent event) {
             logger.throwing("ThemeWidgetFragment", "handleImageFileUpload", e);
             throw new RuntimeException("Error uploading logo file", e); // improve error handling
         }
-        logger.finer("end handelImageFileUpload");
+        logger.finer("end handleImageFooterFileUpload");
     }
 
-
     public void handleImageFileUpload(FileUploadEvent event) {
-
-            logger.finer("entering fileUpload");
-            if (this.tempDir==null) {
-                createTempDir();
-                logger.finer("created tempDir");
-            }
-            UploadedFile uFile = event.getFile();
+        logger.finer("entering handleImageFileUpload");
+        if (this.tempDir==null) {
+            createTempDir();
+            logger.finer("created tempDir");
+        }
+        UploadedFile uFile = event.getFile();
         try {         
             uploadedFile = new File(tempDir, uFile.getFileName());     
             if (!uploadedFile.exists()) {
                 uploadedFile.createNewFile();
             }
             logger.finer("created file");
-            Files.copy(uFile.getInputstream(), uploadedFile.toPath(),StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(uFile.getInputStream(), uploadedFile.toPath(),StandardCopyOption.REPLACE_EXISTING);
             logger.finer("copied inputstream to file");
             editDv.getDataverseTheme().setLogo(uFile.getFileName());
 
@@ -272,9 +302,9 @@ public void handleImageFileUpload(FileUploadEvent event) {
         if (editDv.getDataverseTheme().getLogoFormat()==null) {
             editDv.getDataverseTheme().setLogoFormat(DataverseTheme.ImageFormat.SQUARE);
         }
-        logger.finer("end handelImageFileUpload");
+        logger.finer("end handleImageFileUpload");
     }
-    
+
     public void removeLogo() {
         editDv.getDataverseTheme().setLogo(null);
         this.cleanupTempDirectory();
@@ -285,6 +315,11 @@ public void removeLogoFooter() {
         this.cleanupTempDirectory();
     }
 
+    public void removeLogoThumbnail() {
+        editDv.getDataverseTheme().setLogoThumbnail(null);
+        this.cleanupTempDirectory();
+    }
+
     public boolean getInheritCustomization() {
         boolean inherit= editDv==null ? true : !editDv.getThemeRoot();
          return inherit;
@@ -317,32 +352,70 @@ public String save() {
             editDv.setDataverseTheme(null);
         }
 
-        Command<Dataverse>  cmd;
+        // Update files : logo, footer, thumbnail
+        final Dataverse currentDv = dataverseServiceBean.find(editDv.getId());
+        final Path logoDir = getLogoDir(editDv.getId().toString());
+        String currentLogo = null;
+        String editedLogo = null;
+        String currentLogoFooter = null;
+        String editedLogoFooter = null;
+        String currentLogoThumbnail = null;
+        String editedLogoThumbnail = null;
+        if (currentDv.getDataverseTheme() != null) {
+            currentLogo = currentDv.getDataverseTheme().getLogo();
+            currentLogoFooter = currentDv.getDataverseTheme().getLogoFooter();
+            currentLogoThumbnail = currentDv.getDataverseTheme().getLogoThumbnail();
+        }
+        if (editDv.getDataverseTheme() != null) {
+            editedLogo = editDv.getDataverseTheme().getLogo();
+            editedLogoFooter = editDv.getDataverseTheme().getLogoFooter();
+            editedLogoThumbnail = editDv.getDataverseTheme().getLogoThumbnail();
+        }
+        updateFile(this.uploadedFile, currentLogo, editedLogo, logoDir);
+        updateFile(this.uploadedFileFooter, currentLogoFooter, editedLogoFooter, logoDir);
+        updateFile(this.uploadedFileThumbnail, currentLogoThumbnail, editedLogoThumbnail, logoDir);
 
-        cmd = new UpdateDataverseThemeCommand(editDv, this.uploadedFile, dvRequestService.getDataverseRequest(), "HEADER");
-        if (!exectThemeCommand(cmd))
+        // Save dataverse theme into db
+        final Command<Dataverse> cmd = new UpdateDataverseThemeCommand(editDv, dvRequestService.getDataverseRequest());
+        if (!exectThemeCommand(cmd)) {
             return null;
-
-        if (uploadedFileFooter!=null){
-            cmd = new UpdateDataverseThemeCommand(editDv, this.uploadedFileFooter, dvRequestService.getDataverseRequest(), "FOOTER");
-            if (!exectThemeCommand(cmd))
-                return null;
         }
 
-        try {
-            commandEngine.submit(cmd);
-        } catch (Exception ex) {
-            logger.log(Level.SEVERE, "error updating dataverse theme", ex);
-           FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataverse.save.failed"), BundleUtil.getStringFromBundle("dataverse.theme.failure")));
-        
-          return null;
-        } finally {
-              this.cleanupTempDirectory(); 
-        }
         JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataverse.theme.success"));    
         return "dataverse.xhtml?faces-redirect=true&alias="+editDv.getAlias();  // go to dataverse page 
     }
 
+    /**
+     * Create, update, or delete file logo.
+     *
+     * @param uploadedLogoFile the logo physical file to update on disk
+     * @param currentLogo logo file name from database before update. {@code null} if absent.
+     * @param editedLogo logo file name updated. {@code null} if absent.
+     * @param logoDir folder path containing all collection logos
+     */
+    private void updateFile(File uploadedLogoFile, String currentLogo, String editedLogo, Path logoDir) {
+        try {
+            if (!Files.isDirectory(logoDir)) {
+                Files.createDirectory(logoDir);
+            }
+            if (StringUtils.isBlank(editedLogo)) {
+                // If edited logo field is empty, and a logoFile currently exists, delete it
+                if (StringUtils.isNotBlank(currentLogo)) {
+                    Files.deleteIfExists(Path.of(logoDir.toString(), currentLogo));
+                }
+            } else if (uploadedLogoFile != null) {
+                // If edited logo file isn't empty, and uploaded File exists, delete currentFile and copy uploaded file from temp dir to logos dir
+                if (StringUtils.isNotBlank(currentLogo)) {
+                    Files.deleteIfExists(Path.of(logoDir.toString(), currentLogo));
+                }
+                final Path newFile = Path.of(logoDir.toString(), editedLogo);
+                Files.copy(uploadedLogoFile.toPath(), newFile, StandardCopyOption.REPLACE_EXISTING);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("Error saving logo file", e); // improve error handling
+        }
+    }
+
 
     public  boolean exectThemeCommand(Command<Dataverse> cmd){
         try {
@@ -351,6 +424,8 @@ public  boolean exectThemeCommand(Command<Dataverse> cmd){
             logger.log(Level.SEVERE, "error updating dataverse theme", ex);
             FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataverse.save.failed"), BundleUtil.getStringFromBundle("dataverse.theme.failure")));
             return false;
+        } finally {
+            this.cleanupTempDirectory();
         }
         return true;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java
index 51d803c5e02..46736da73d4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java
@@ -5,29 +5,23 @@
  */
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
-import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.dataset.DatasetUtil;
-import static edu.harvard.iq.dataverse.dataset.DatasetUtil.datasetLogoThumbnail;
-import static edu.harvard.iq.dataverse.dataset.DatasetUtil.thumb48addedByImageThumbConverter;
 import edu.harvard.iq.dataverse.search.SolrSearchResult;
 import edu.harvard.iq.dataverse.util.FileUtil;
-import java.io.File;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.apache.commons.io.IOUtils;
+import java.util.logging.Logger;
+
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
 
 /**
  *
@@ -37,8 +31,10 @@
 @RequestScoped
 @Named
 public class ThumbnailServiceWrapper implements java.io.Serializable  {
-    @Inject
-    PermissionsWrapper permissionsWrapper;
+    
+    private static final Logger logger = Logger.getLogger(ThumbnailServiceWrapper.class.getCanonicalName());
+    @EJB
+    PermissionServiceBean permissionService;
     @EJB
     DataverseServiceBean dataverseService;
     @EJB
@@ -50,48 +46,22 @@ public class ThumbnailServiceWrapper implements java.io.Serializable  {
     
     private Map<Long, String> dvobjectThumbnailsMap = new HashMap<>();
     private Map<Long, DvObject> dvobjectViewMap = new HashMap<>();
+    private Map<Long, Boolean> hasThumbMap = new HashMap<>();
 
-    private String getAssignedDatasetImage(Dataset dataset) {
-        if (dataset == null) {
+    private boolean hasDownloadFilePermission(DvObject dvo) {
+        return permissionService.on(dvo).has(Permission.DownloadFile) ;
+    }
+    public String getFileCardImageAsUrl(SolrSearchResult result) {
+        DataFile dataFile = result != null && result.getEntity() != null ? ((DataFile) result.getEntity()) : null;
+        if (dataFile == null
+                || result.isHarvested()
+                || !isThumbnailAvailable(dataFile)
+                || (dataFile.isRestricted() && !hasDownloadFilePermission(dataFile))
+                || FileUtil.isActivelyEmbargoed(dataFile)
+                || FileUtil.isRetentionExpired(dataFile)) {
             return null;
         }
-
-        DataFile assignedThumbnailFile = dataset.getThumbnailFile();
-
-        if (assignedThumbnailFile != null) {
-            Long assignedThumbnailFileId = assignedThumbnailFile.getId();
-
-            if (this.dvobjectThumbnailsMap.containsKey(assignedThumbnailFileId)) {
-                // Yes, return previous answer
-                //logger.info("using cached result for ... "+assignedThumbnailFileId);
-                if (!"".equals(this.dvobjectThumbnailsMap.get(assignedThumbnailFileId))) {
-                    return this.dvobjectThumbnailsMap.get(assignedThumbnailFileId);
-                }
-                return null;
-            }
-
-            String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(
-                    assignedThumbnailFile,
-                    ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
-
-            if (imageSourceBase64 != null) {
-                this.dvobjectThumbnailsMap.put(assignedThumbnailFileId, imageSourceBase64);
-                return imageSourceBase64;
-            }
-
-            // OK - we can't use this "assigned" image, because of permissions, or because 
-            // the thumbnail failed to generate, etc... in this case we'll 
-            // mark this dataset in the lookup map - so that we don't have to
-            // do all these lookups again...
-            this.dvobjectThumbnailsMap.put(assignedThumbnailFileId, "");
-            
-            // TODO: (?)
-            // do we need to cache this datafile object in the view map?
-            // -- L.A., 4.2.2
-        }
-
-        return null;
-
+        return SystemConfig.getDataverseSiteUrlStatic() + "/api/access/datafile/" + dataFile.getId() + "?imageThumb=true";
     }
 
     // it's the responsibility of the user - to make sure the search result
@@ -104,6 +74,10 @@ public String getFileCardImageAsBase64Url(SolrSearchResult result) {
         if (result.isHarvested()) {
             return null; 
         }
+
+        if (result.getEntity() == null) {
+            return null;
+        }
         
         Long imageFileId = result.getEntity().getId();
 
@@ -133,8 +107,8 @@ public String getFileCardImageAsBase64Url(SolrSearchResult result) {
             }
 
             if ((!((DataFile)result.getEntity()).isRestricted()
-                        || permissionsWrapper.hasDownloadFilePermission(result.getEntity()))
-                    && dataFileService.isThumbnailAvailable((DataFile) result.getEntity())) {
+                        || hasDownloadFilePermission(result.getEntity()))
+                    && isThumbnailAvailable((DataFile) result.getEntity())) {
                 
                 cardImageUrl = ImageThumbConverter.getImageThumbnailAsBase64(
                         (DataFile) result.getEntity(),
@@ -160,9 +134,16 @@ public String getFileCardImageAsBase64Url(SolrSearchResult result) {
         return null;
     }
 
+    public boolean isThumbnailAvailable(DataFile entity) {
+        if(!hasThumbMap.containsKey(entity.getId())) {
+            hasThumbMap.put(entity.getId(), dataFileService.isThumbnailAvailable(entity));
+        }
+        return hasThumbMap.get(entity.getId());
+    }
+
     // it's the responsibility of the user - to make sure the search result
     // passed to this method is of the Dataset type!
-    public String getDatasetCardImageAsBase64Url(SolrSearchResult result) {
+    public String getDatasetCardImageAsUrl(SolrSearchResult result) {
         // Before we do anything else, check if it's a harvested dataset; 
         // no need to check anything else if so (harvested datasets never have 
         // thumbnails)
@@ -180,12 +161,14 @@ public String getDatasetCardImageAsBase64Url(SolrSearchResult result) {
             return null;
         }
         Dataset dataset = (Dataset)result.getEntity();
+        dataset.setId(result.getEntityId());
         
         Long versionId = result.getDatasetVersionId();
 
-        return getDatasetCardImageAsBase64Url(dataset, versionId, result.isPublishedState());
+        return getDatasetCardImageAsUrl(dataset, versionId, result.isPublishedState(), ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
     }
-    public String getDatasetCardImageAsBase64Url(Dataset dataset, Long versionId, boolean autoselect) {
+    
+    public String getDatasetCardImageAsUrl(Dataset dataset, Long versionId, boolean autoselect, int size) {
         Long datasetId = dataset.getId();
         if (datasetId != null) {
             if (this.dvobjectThumbnailsMap.containsKey(datasetId)) {
@@ -206,110 +189,34 @@ public String getDatasetCardImageAsBase64Url(Dataset dataset, Long versionId, bo
             this.dvobjectThumbnailsMap.put(datasetId, "");
             return null; 
         }
-        
-        String cardImageUrl = null;
-        StorageIO<Dataset> dataAccess = null;
-                
-        try{
-            dataAccess = DataAccess.getStorageIO(dataset);
-        }
-        catch(IOException ioex){
-          // ignore
-        }
-        
-        InputStream in = null;
-        // See if the dataset already has a dedicated thumbnail ("logo") saved as
-        // an auxilary file on the dataset level: 
-        // (don't bother checking if it exists; just try to open the input stream)
-        try {
-                in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumb48addedByImageThumbConverter);
-        } catch (Exception ioex) {
-              //ignore
-        }
-        
-        if (in != null) {
-            try {
-                byte[] bytes = IOUtils.toByteArray(in);
-                String base64image = Base64.getEncoder().encodeToString(bytes);
-                cardImageUrl = FileUtil.DATA_URI_SCHEME + base64image;
-                this.dvobjectThumbnailsMap.put(datasetId, cardImageUrl);
-                return cardImageUrl;
-            } catch (IOException ex) {
-                this.dvobjectThumbnailsMap.put(datasetId, "");
-                return null; 
-                // (alternatively, we could ignore the exception, and proceed with the 
-                // regular process of selecting the thumbnail from the available 
-                // image files - ?)
-            } finally
-	    {
-		    IOUtils.closeQuietly(in);
-	    }
-        } 
-
-        // If not, see if the dataset has one of its image files already assigned
-        // to be the designated thumbnail:
-        cardImageUrl = this.getAssignedDatasetImage(dataset);
-
-        if (cardImageUrl != null) {
-            //logger.info("dataset id " + result.getEntity().getId() + " has a dedicated image assigned; returning " + cardImageUrl);
-            return cardImageUrl;
-        }
-        
-        // And finally, try to auto-select the thumbnail (unless instructed not to):
-        
-        if (!autoselect) {
-            return null;
-        }
+        DataFile thumbnailFile = dataset.getThumbnailFile();
 
-        // We attempt to auto-select via the optimized, native query-based method 
-        // from the DatasetVersionService:
-        Long thumbnailImageFileId = datasetVersionService.getThumbnailByVersionId(versionId);
+        if (thumbnailFile == null) {
 
-        if (thumbnailImageFileId != null) {
-            //cardImageUrl = FILE_CARD_IMAGE_URL + thumbnailImageFileId;
-            if (this.dvobjectThumbnailsMap.containsKey(thumbnailImageFileId)) {
-                // Yes, return previous answer
-                //logger.info("using cached result for ... "+datasetId);
-                if (!"".equals(this.dvobjectThumbnailsMap.get(thumbnailImageFileId))) {
-                    return this.dvobjectThumbnailsMap.get(thumbnailImageFileId);
-                }
-                return null;
-            }
-
-            DataFile thumbnailImageFile = null;
-
-            if (dvobjectViewMap.containsKey(thumbnailImageFileId)
-                    && dvobjectViewMap.get(thumbnailImageFileId).isInstanceofDataFile()) {
-                thumbnailImageFile = (DataFile) dvobjectViewMap.get(thumbnailImageFileId);
-            } else {
-                thumbnailImageFile = dataFileService.findCheapAndEasy(thumbnailImageFileId);
-                if (thumbnailImageFile != null) {
-                    // TODO:
-                    // do we need this file on the map? - it may not even produce
-                    // a thumbnail!
-                    dvobjectViewMap.put(thumbnailImageFileId, thumbnailImageFile);
-                } else {
-                    this.dvobjectThumbnailsMap.put(thumbnailImageFileId, "");
-                    return null;
+            boolean hasDatasetLogo = false;
+            StorageIO<DvObject> storageIO = null;
+            try {
+                storageIO = DataAccess.getStorageIO(dataset);
+                if (storageIO != null && storageIO.isAuxObjectCached(DatasetUtil.datasetLogoFilenameFinal)) {
+                    // If not, return null/use the default, otherwise pass the logo URL
+                    hasDatasetLogo = true;
                 }
+            } catch (IOException ioex) {
+                logger.warning("getDatasetCardImageAsUrl(): Failed to initialize dataset StorageIO for "
+                        + dataset.getStorageIdentifier() + " (" + ioex.getMessage() + ")");
             }
-
-            if (dataFileService.isThumbnailAvailable(thumbnailImageFile)) {
-                cardImageUrl = ImageThumbConverter.getImageThumbnailAsBase64(
-                        thumbnailImageFile,
-                        ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
-            }
-
-            if (cardImageUrl != null) {
-                this.dvobjectThumbnailsMap.put(thumbnailImageFileId, cardImageUrl);
-            } else {
-                this.dvobjectThumbnailsMap.put(thumbnailImageFileId, "");
+            // If no other logo we attempt to auto-select via the optimized, native
+            // query-based method
+            // from the DatasetVersionService:
+            if (!hasDatasetLogo && datasetVersionService.getThumbnailByVersionId(versionId) == null) {
+                return null;
             }
         }
-
-        //logger.info("dataset id " + result.getEntityId() + ", returning " + cardImageUrl);
-
-        return cardImageUrl;
+        String url = SystemConfig.getDataverseSiteUrlStatic() + "/api/datasets/" + dataset.getId() + "/logo";
+        logger.fine("getDatasetCardImageAsUrl: " + url);
+        this.dvobjectThumbnailsMap.put(datasetId,url);
+        return url;
+        
     }
     
     // it's the responsibility of the user - to make sure the search result
@@ -317,10 +224,17 @@ public String getDatasetCardImageAsBase64Url(Dataset dataset, Long versionId, bo
     public String getDataverseCardImageAsBase64Url(SolrSearchResult result) {
         return dataverseService.getDataverseLogoThumbnailAsBase64ById(result.getEntityId());
     }
-    
+
+    // it's the responsibility of the user - to make sure the search result
+    // passed to this method is of the Dataverse type!
+    public String getDataverseCardImageAsUrl(SolrSearchResult result) {
+        return dataverseService.getDataverseLogoThumbnailAsUrl(result.getEntityId());
+    }
+
     public void resetObjectMaps() {
         dvobjectThumbnailsMap = new HashMap<>();
         dvobjectViewMap = new HashMap<>();
+        hasThumbMap = new HashMap<>();
     }
 
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/URLValidator.java b/src/main/java/edu/harvard/iq/dataverse/URLValidator.java
deleted file mode 100644
index 35173da5860..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/URLValidator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package edu.harvard.iq.dataverse;
-
-import edu.harvard.iq.dataverse.util.BundleUtil;
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-/**
- *
- * @author skraffmi
- */
-public class URLValidator implements ConstraintValidator<ValidateURL, String> {
-
-    @Override
-    public void initialize(ValidateURL constraintAnnotation) {
-
-    }
-
-    @Override
-    public boolean isValid(String value, ConstraintValidatorContext context) {
-
-        boolean valid = isURLValid(value);
-        if (context != null && !valid) {
-            context.buildConstraintViolationWithTemplate(value + "  " + BundleUtil.getStringFromBundle("url.invalid")).addConstraintViolation();
-        }
-        return valid;
-    }
-
-    public static boolean isURLValid(String value) {
-        if (value == null || value.isEmpty()) {
-            return true;
-        }
-        try {
-            URL url = new URL(value);
-        } catch (MalformedURLException e) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/UserBannerMessage.java b/src/main/java/edu/harvard/iq/dataverse/UserBannerMessage.java
new file mode 100644
index 00000000000..888669ee615
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/UserBannerMessage.java
@@ -0,0 +1,98 @@
+
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import java.io.Serializable;
+import java.util.Date;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+
+/**
+ *
+ * @author skraffmi
+ */
+@Entity
+public class UserBannerMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    
+    @OneToOne
+    @JoinColumn(nullable = false)
+    private AuthenticatedUser user;
+    
+    @OneToOne
+    @JoinColumn(nullable = false)
+    private BannerMessage bannerMessage;
+    
+    @Temporal(value = TemporalType.TIMESTAMP)
+    @Column( nullable=false )
+    private Date bannerDismissalTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public AuthenticatedUser getUser() {
+        return user;
+    }
+
+    public void setUser(AuthenticatedUser user) {
+        this.user = user;
+    }
+
+    public BannerMessage getBannerMessage() {
+        return bannerMessage;
+    }
+
+    public void setBannerMessage(BannerMessage bannerMessage) {
+        this.bannerMessage = bannerMessage;
+    }
+
+    public Date getBannerDismissalTime() {
+        return bannerDismissalTime;
+    }
+
+    public void setBannerDismissalTime(Date bannerDismissalTime) {
+        this.bannerDismissalTime = bannerDismissalTime;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof UserBannerMessage)) {
+            return false;
+        }
+        UserBannerMessage other = (UserBannerMessage) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "edu.harvard.iq.dataverse.UserBannerMessage[ id=" + id + " ]";
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/UserNameValidator.java b/src/main/java/edu/harvard/iq/dataverse/UserNameValidator.java
deleted file mode 100644
index b2e92586868..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/UserNameValidator.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-/**
- *
- * @author sarahferry
- * Modeled after PasswordValidator and EMailValidator
- */
-
-public class UserNameValidator implements ConstraintValidator<ValidateUserName, String> {
-    @Override
-    public void initialize(ValidateUserName constraintAnnotation) {
-
-    }
-    
-    @Override
-    public boolean isValid(String value, ConstraintValidatorContext context) {
-        return isUserNameValid(value, context);
-    }
-
-    /**
-     * Here we will validate the username
-     *
-     * @param username
-     * @return boolean 
-     */
-    public static boolean isUserNameValid(final String username, ConstraintValidatorContext context) {
-        if (username == null) {
-            return false;
-        }
-        //TODO: What other characters do we need to support?
-        String validCharacters = "[a-zA-Z0-9\\_\\-\\.";
-        /*
-         * if you would like to support accents or chinese characters, uncomment this
-         *
-        //support accents
-        validCharacters += "À-Ãŋ\\u00C0-\\u017F";
-        //support chinese characters
-        validCharacters += "\\x{4e00}-\\x{9fa5}";
-        *
-        */
-        //end
-        validCharacters += "]";
-        validCharacters += "{2,60}"; //must be between 2 and 60 characters for user name
-        Pattern p = Pattern.compile(validCharacters);
-        Matcher m = p.matcher(username);
-        return m.matches();
-    }
-
-}
-
-
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/UserNotification.java b/src/main/java/edu/harvard/iq/dataverse/UserNotification.java
index 70b9cacf4e3..c1cfe72e3cd 100644
--- a/src/main/java/edu/harvard/iq/dataverse/UserNotification.java
+++ b/src/main/java/edu/harvard/iq/dataverse/UserNotification.java
@@ -1,22 +1,28 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.DateUtil;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.stream.Collectors;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 
 /**
  *
@@ -26,8 +32,40 @@
 @Table(indexes = {@Index(columnList="user_id")})
 
 public class UserNotification implements Serializable {
+    // Keep in sync with list at admin/user-administration.rst
     public enum Type {
-        ASSIGNROLE, REVOKEROLE, CREATEDV, CREATEDS, CREATEACC, MAPLAYERUPDATED, MAPLAYERDELETEFAILED, SUBMITTEDDS, RETURNEDDS, PUBLISHEDDS, REQUESTFILEACCESS, GRANTFILEACCESS, REJECTFILEACCESS, FILESYSTEMIMPORT, CHECKSUMIMPORT, CHECKSUMFAIL, CONFIRMEMAIL, APIGENERATED, INGESTCOMPLETED, INGESTCOMPLETEDWITHERRORS
+        ASSIGNROLE, REVOKEROLE, CREATEDV, CREATEDS, CREATEACC, SUBMITTEDDS, RETURNEDDS, 
+        PUBLISHEDDS, REQUESTFILEACCESS, GRANTFILEACCESS, REJECTFILEACCESS, FILESYSTEMIMPORT, 
+        CHECKSUMIMPORT, CHECKSUMFAIL, CONFIRMEMAIL, APIGENERATED, INGESTCOMPLETED, INGESTCOMPLETEDWITHERRORS, 
+        PUBLISHFAILED_PIDREG, WORKFLOW_SUCCESS, WORKFLOW_FAILURE, STATUSUPDATED, DATASETCREATED, DATASETMENTIONED,
+        GLOBUSUPLOADCOMPLETED, GLOBUSUPLOADCOMPLETEDWITHERRORS,
+        GLOBUSDOWNLOADCOMPLETED, GLOBUSDOWNLOADCOMPLETEDWITHERRORS, REQUESTEDFILEACCESS,
+        GLOBUSUPLOADREMOTEFAILURE, GLOBUSUPLOADLOCALFAILURE, PIDRECONCILED;
+        
+        public String getDescription() {
+            return BundleUtil.getStringFromBundle("notification.typeDescription." + this.name());
+        }
+
+        public boolean hasDescription() {
+            final String description = getDescription();
+            return description != null && !description.isEmpty();
+        }
+
+        public static Set<Type> tokenizeToSet(String tokens) {
+            if (tokens == null || tokens.isEmpty()) {
+                return new HashSet<>();
+            }
+            return Collections.list(new StringTokenizer(tokens, ",")).stream()
+                .map(token -> Type.valueOf(((String) token).trim()))
+                .collect(Collectors.toSet());
+        }
+
+        public static String toStringValue(Set<Type> typesSet) {
+            if (typesSet == null || typesSet.isEmpty()) {
+                return null;
+            }
+            return String.join(",", typesSet.stream().map(x -> x.name()).collect(Collectors.toList()));
+        }
     };
     
     private static final long serialVersionUID = 1L;
@@ -40,6 +78,10 @@ public enum Type {
     @JoinColumn( nullable = false )
     private AuthenticatedUser user;
     @ManyToOne
+    /** Requestor now has a more general meaning of 'actor' - the person who's action is causing the emails.
+     * The original use of that was for people requesting dataset access
+     * This is also now used for DATASETCREATED messages where it indicates who created the dataset
+    */
     @JoinColumn( nullable = true )
     private AuthenticatedUser requestor;
     private Timestamp sendDate;
@@ -49,6 +91,8 @@ public enum Type {
     @Column( nullable = false )
     private Type type;
     private Long objectId;
+    
+    private String additionalInfo;
 
     @Transient
     private boolean displayAsRead;
@@ -86,6 +130,10 @@ public String getSendDate() {
         return new SimpleDateFormat("MMMM d, yyyy h:mm a z").format(sendDate);
     }
 
+    public Timestamp getSendDateTimestamp() {
+        return sendDate;
+    }
+
     public void setSendDate(Timestamp sendDate) {
         this.sendDate = sendDate;
     }
@@ -153,4 +201,12 @@ public void setRoleString(String roleString) {
     public String getLocaleSendDate() {
         return DateUtil.formatDate(sendDate);
     }
+
+    public String getAdditionalInfo() {
+        return additionalInfo;
+    }
+
+    public void setAdditionalInfo(String additionalInfo) {
+        this.additionalInfo = additionalInfo;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/UserNotificationServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/UserNotificationServiceBean.java
index 76e79af3049..2fb5ea35c45 100644
--- a/src/main/java/edu/harvard/iq/dataverse/UserNotificationServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/UserNotificationServiceBean.java
@@ -8,16 +8,22 @@
 
 import edu.harvard.iq.dataverse.UserNotification.Type;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key;
+
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
@@ -33,6 +39,9 @@ public class UserNotificationServiceBean {
     MailServiceBean mailService;
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
+
+    @EJB
+    SettingsServiceBean settingsService;
     
     public List<UserNotification> findByUser(Long userId) {
         TypedQuery<UserNotification> query = em.createQuery("select un from UserNotification un where un.user.id =:userId order by un.sendDate desc", UserNotification.class);
@@ -78,11 +87,21 @@ public UserNotification find(Object pk) {
     public UserNotification save(UserNotification userNotification) {
         return em.merge(userNotification);
     }
-    
+
+    public UserNotification markAsRead(UserNotification userNotification) {
+        userNotification.setReadNotification(true);
+        return em.merge(userNotification);
+    }
+
     public void delete(UserNotification userNotification) {
         em.remove(em.merge(userNotification));
     }
 
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public void sendNotificationInNewTransaction(AuthenticatedUser dataverseUser, Timestamp sendDate, Type type, Long objectId) {
+        sendNotification(dataverseUser, sendDate, type, objectId, "");
+    }
+    
     public void sendNotification(AuthenticatedUser dataverseUser, Timestamp sendDate, Type type, Long objectId) {
         sendNotification(dataverseUser, sendDate, type, objectId, "");
     }
@@ -96,20 +115,48 @@ public void sendNotification(AuthenticatedUser dataverseUser, Timestamp sendDate
     }
 
     public void sendNotification(AuthenticatedUser dataverseUser, Timestamp sendDate, Type type, Long objectId, String comment, AuthenticatedUser requestor, boolean isHtmlContent) {
+        sendNotification(dataverseUser, sendDate, type, objectId, comment, requestor, isHtmlContent, null);
+    }
+    public void sendNotification(AuthenticatedUser dataverseUser, Timestamp sendDate, Type type, Long objectId, String comment, AuthenticatedUser requestor, boolean isHtmlContent, String additionalInfo) {
         UserNotification userNotification = new UserNotification();
         userNotification.setUser(dataverseUser);
         userNotification.setSendDate(sendDate);
         userNotification.setType(type);
         userNotification.setObjectId(objectId);
         userNotification.setRequestor(requestor);
+        userNotification.setAdditionalInfo(additionalInfo);
 
-        if (mailService.sendNotificationEmail(userNotification, comment, requestor, isHtmlContent)) {
+        if (!isEmailMuted(userNotification) && mailService.sendNotificationEmail(userNotification, comment, requestor, isHtmlContent)) {
             logger.fine("email was sent");
             userNotification.setEmailed(true);
-            save(userNotification);
         } else {
             logger.fine("email was not sent");
+        }
+        if (!isNotificationMuted(userNotification)) {
             save(userNotification);
         }
     }
+    
+
+    public boolean isEmailMuted(UserNotification userNotification) {
+        final Type type = userNotification.getType();
+        final AuthenticatedUser user = userNotification.getUser();
+        final boolean alwaysMuted = settingsService.containsCommaSeparatedValueForKey(Key.AlwaysMuted, type.name());
+        final boolean neverMuted = settingsService.containsCommaSeparatedValueForKey(Key.NeverMuted, type.name());
+        if (alwaysMuted && neverMuted) {
+            logger.warning("Both; AlwaysMuted and NeverMuted are set for " + type.name() + ", email is muted");
+        }
+        return alwaysMuted || (!neverMuted && user.hasEmailMuted(type));
+    }
+    
+    public boolean isNotificationMuted(UserNotification userNotification) {
+        final Type type = userNotification.getType();
+        final AuthenticatedUser user = userNotification.getUser();
+        final boolean alwaysMuted = settingsService.containsCommaSeparatedValueForKey(Key.AlwaysMuted, type.name());
+        final boolean neverMuted = settingsService.containsCommaSeparatedValueForKey(Key.NeverMuted, type.name());
+        if (alwaysMuted && neverMuted) {
+            logger.warning("Both; AlwaysMuted and NeverMuted are set for " + type.name() + ", notification is muted");
+        }
+        return alwaysMuted || (!neverMuted && user.hasNotificationMuted(type));
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/UserServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/UserServiceBean.java
index 34aebac8f72..d63fcfa3e34 100644
--- a/src/main/java/edu/harvard/iq/dataverse/UserServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/UserServiceBean.java
@@ -1,8 +1,10 @@
 package edu.harvard.iq.dataverse;
+import edu.harvard.iq.dataverse.UserNotification.Type;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.userdata.UserUtil;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.logging.Level;
@@ -10,31 +12,39 @@
 import java.util.Date;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import org.apache.commons.lang.StringUtils;
-import org.ocpsoft.common.util.Strings;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import org.apache.commons.lang3.StringUtils;
 
 @Stateless
 @Named
 public class UserServiceBean {
 
     private static final Logger logger = Logger.getLogger(UserServiceBean.class.getCanonicalName());
+    public static final List<String> acceptableSortKeys = Arrays.asList(
+      "id", "useridentifier", "lastname", "firstname", "email", "affiliation",
+      "superuser", "position", "createdtime", "lastlogintime", "lastapiusetime",
+      "authproviderid",
+      "id desc", "useridentifier desc", "lastname desc", "firstname desc", "email desc", "affiliation desc",
+      "superuser desc", "position desc", "createdtime desc", "lastlogintime desc", "lastapiusetime desc",
+      "authproviderid desc"
+    );
 
     @PersistenceContext
     EntityManager em;
-    
+
     @EJB IndexServiceBean indexService;
 
     public AuthenticatedUser find(Object pk) {
         return (AuthenticatedUser) em.find(AuthenticatedUser.class, pk);
-    }    
+    }
 
-    
     public AuthenticatedUser save(AuthenticatedUser user) {
         if (user.getId() == null) {
             em.persist(this);
@@ -50,7 +60,7 @@ public AuthenticatedUser save(AuthenticatedUser user) {
 
         return user;
     }
-   
+
     /**
      * Return the user information as a List of AuthenticatedUser objects -- easier to work with in the UI
      * - With Role added as a transient field
@@ -58,20 +68,22 @@ public AuthenticatedUser save(AuthenticatedUser user) {
      * @param sortKey
      * @param resultLimit
      * @param offset
-     * @return 
+     * @return
      */
-    public List<AuthenticatedUser> getAuthenticatedUserList(String searchTerm, String sortKey, Integer resultLimit, Integer offset){
-        
-        if ((offset == null)||(offset < 0)){
+    public List<AuthenticatedUser> getAuthenticatedUserList(String searchTerm,
+                                                            String sortKey,
+                                                            Integer resultLimit,
+                                                            Integer offset) {
+        if ((offset == null) || (offset < 0)) {
             offset = 0;
         }
-        
+
         List<Object[]> userResults = getUserListCore(searchTerm, sortKey, resultLimit, offset);
-        
+
         // Initialize empty list for AuthenticatedUser objects
         //
         List<AuthenticatedUser> viewObjects = new ArrayList<>();
-        
+
         if (userResults == null){
             return viewObjects;
         }
@@ -80,39 +92,36 @@ public List<AuthenticatedUser> getAuthenticatedUserList(String searchTerm, Strin
         // GATHER GIANT HASHMAP OF ALL { user identifier : [role, role, role] }
         // -------------------------------------------------
 
-        
         HashMap<String, List<String>> roleLookup = retrieveRolesForUsers(userResults);
-        if (roleLookup == null){
+        if (roleLookup == null) {
             roleLookup = new HashMap<>();
         }
-        //  1st Loop : 
-        // gather  [ @user, .....] 
+        //  1st Loop :
+        // gather  [ @user, .....]
         // get the hashmap
-        
-        
+
         // -------------------------------------------------
         // We have results, format them into AuthenticatedUser objects
         // -------------------------------------------------
         int rowNum = offset++;   // used for the rowNumber
         String roleString;
-        for (Object[] userInfo : userResults) {  
+        for (Object[] userInfo : userResults) {
             // GET ROLES FOR THIS USER FROM GIANT HASHMAP
             rowNum++;
-            
+
             //String roles = getUserRolesAsString((Integer) dbResultRow[0]);
             roleString = "";
             List<String> roleList = roleLookup.get("@" + (String)userInfo[1]);
             if ((roleList != null)&&(!roleList.isEmpty())){
                 roleString = roleList.stream().collect(Collectors.joining(", "));
             }
-            AuthenticatedUser singleUser = createAuthenticatedUserForView(userInfo, roleString, rowNum);            
+            AuthenticatedUser singleUser = createAuthenticatedUserForView(userInfo, roleString, rowNum);
             viewObjects.add(singleUser);
         }
-        
-        
+
         return viewObjects;
     }
-    
+
     private AuthenticatedUser createAuthenticatedUserForView (Object[] dbRowValues, String roles, int rowNum){
         AuthenticatedUser user = new AuthenticatedUser();
 
@@ -128,20 +137,28 @@ private AuthenticatedUser createAuthenticatedUserForView (Object[] dbRowValues,
         user.setCreatedTime(UserUtil.getTimestampOrNull(dbRowValues[8]));
         user.setLastLoginTime(UserUtil.getTimestampOrNull(dbRowValues[9]));
         user.setLastApiUseTime(UserUtil.getTimestampOrNull(dbRowValues[10]));
-       
+
         user.setAuthProviderId(UserUtil.getStringOrNull(dbRowValues[11]));
         user.setAuthProviderFactoryAlias(UserUtil.getStringOrNull(dbRowValues[12]));
-        
+
+        user.setDeactivated((Boolean)(dbRowValues[13]));
+        user.setDeactivatedTime(UserUtil.getTimestampOrNull(dbRowValues[14]));
+
+        user.setMutedEmails(Type.tokenizeToSet((String) dbRowValues[15]));
+        user.setMutedNotifications(Type.tokenizeToSet((String) dbRowValues[15]));
+
+        user.setRateLimitTier((int)dbRowValues[17]);
+
         user.setRoles(roles);
         return user;
-    } 
-    
+    }
+
     /**
      * Attempt to retrieve all the user roles in 1 query
      * Consider putting limits on this -- e.g. no more than 1,000 user identifiers or something similar
      * 
      * @param userIdentifierList
-     * @return 
+     * @return
      */
     private HashMap<String, List<String>> retrieveRolesForUsers(List<Object[]> userObjectList){
         // Iterate through results, retrieving only the assignee identifiers
@@ -151,16 +168,15 @@ private HashMap<String, List<String>> retrieveRolesForUsers(List<Object[]> userO
                                         .map(userInfo -> (String)userInfo[1])
                                         .collect(Collectors.toList())
                                        ;
-        
+
         List<Integer> databaseIds = userObjectList.stream()
                                         .map(userInfo -> (Integer)userInfo[0])
                                         .collect(Collectors.toList());
-  
-        
+
         if ((userIdentifierList==null)||(userIdentifierList.isEmpty())){
             return null;
         }
-        
+
         // -------------------------------------------------
         // Prepare a string to use within the SQL "a.assigneeidentifier IN (....)" clause
         //
@@ -171,14 +187,14 @@ private HashMap<String, List<String>> retrieveRolesForUsers(List<Object[]> userO
         // This appears to be due to the JDBC driver or Postgres.  In this case SQL
         // injection isn't possible b/c the list of assigneeidentifier strings comes
         // from a previous query
-        // 
+        //
         // Add '@' to each identifier and delimit the list by ","
         // -------------------------------------------------
         String identifierListString = userIdentifierList.stream()
-                                     .filter(x -> !Strings.isNullOrEmpty(x))
+                                     .filter(x -> x != null && !x.isEmpty())
                                      .map(x -> "'@" + x + "'")
                                      .collect(Collectors.joining(", "));
-       
+
         // -------------------------------------------------
         // Create/Run the query to find directly assigned roles
         // -------------------------------------------------
@@ -193,92 +209,87 @@ private HashMap<String, List<String>> retrieveRolesForUsers(List<Object[]> userO
         Query nativeQuery = em.createNativeQuery(qstr);
 
         List<Object[]> dbRoleResults = nativeQuery.getResultList();
-        if (dbRoleResults == null){
+        if (dbRoleResults == null) {
             return null;
         }
-        
+
         HashMap<String, List<String>> userRoleLookup = new HashMap<>();
 
         String userIdentifier;
         String userRole;
-        for (Object[] dbResultRow : dbRoleResults) {            
-            
+        for (Object[] dbResultRow : dbRoleResults) {
             userIdentifier = UserUtil.getStringOrNull(dbResultRow[0]);
             userRole = UserUtil.getStringOrNull(dbResultRow[1]);
-            if ((userIdentifier != null)&&(userRole != null)){  // should never be null
-                
+            if ((userIdentifier != null) && (userRole != null)) {  // should never be null
                 List<String> userRoleList = userRoleLookup.getOrDefault(userIdentifier, new ArrayList<String>());
-                if (!userRoleList.contains(userRole)){
+                if (!userRoleList.contains(userRole)) {
                     userRoleList.add(userRole);
                     userRoleLookup.put(userIdentifier, userRoleList);
                 }
             }
         }
-        
-        // And now the roles assigned via groups: 
-        
-        
-        // 1. One query for selecting all the groups to which these users may belong: 
-        
+
+        // And now the roles assigned via groups:
+
+        // 1. One query for selecting all the groups to which these users may belong:
+
         HashMap<String, List<String>> groupsLookup = new HashMap<>();
-        
+
         String idListString = StringUtils.join(databaseIds, ",");
-        
-        // A *RECURSIVE* native query, that finds all the groups that the specified 
-        // users are part of, BOTH by direct inclusion, AND via parent groups: 
-        
+
+        // A *RECURSIVE* native query, that finds all the groups that the specified
+        // users are part of, BOTH by direct inclusion, AND via parent groups:
+
         qstr = "WITH RECURSIVE group_user AS ((" +
-            " SELECT distinct g.groupalias, g.id, u.useridentifier" + 
+            " SELECT distinct g.groupalias, g.id, u.useridentifier" +
             "  FROM explicitgroup g, explicitgroup_authenticateduser e, authenticateduser u" +
-            "  WHERE e.explicitgroup_id = g.id " + 
-            "   AND u.id IN (" + idListString + ")" + 
-            "   AND u.id = e.containedauthenticatedusers_id)" + 
+            "  WHERE e.explicitgroup_id = g.id " +
+            "   AND u.id IN (" + idListString + ")" +
+            "   AND u.id = e.containedauthenticatedusers_id)" +
             "  UNION\n" +
             "   SELECT p.groupalias, p.id, c.useridentifier" +
-            "    FROM group_user c, explicitgroup p, explicitgroup_explicitgroup e" + 
-            "    WHERE e.explicitgroup_id = p.id" + 
-            "     AND e.containedexplicitgroups_id = c.id)" + 
+            "    FROM group_user c, explicitgroup p, explicitgroup_explicitgroup e" +
+            "    WHERE e.explicitgroup_id = p.id" +
+            "     AND e.containedexplicitgroups_id = c.id)" +
             "SELECT distinct groupalias, useridentifier FROM group_user;";
-        
-        
+
         //System.out.println("qstr: " + qstr);
 
         nativeQuery = em.createNativeQuery(qstr);
         List<Object[]> groupResults = nativeQuery.getResultList();
-        if (groupResults == null){
+        if (groupResults == null) {
             return userRoleLookup;
-        } 
-        
+        }
+
         String groupIdentifiers = null;
-        
+
         for (Object group[] : groupResults) {
             String alias = UserUtil.getStringOrNull(group[0]);
             String user = UserUtil.getStringOrNull(group[1]);
             if (alias != null ) {
-                
                 alias = "&explicit/"+alias;
-                
+
                 if (groupIdentifiers == null) {
                     groupIdentifiers = "'"+alias+"'";
                 } else {
                     groupIdentifiers += ", '"+alias+"'";
                 }
-                
+
                 List<String> groupUserList = groupsLookup.getOrDefault(alias, new ArrayList<String>());
-                if (!groupUserList.contains(user)){
+                if (!groupUserList.contains(user)) {
                     groupUserList.add(user);
                     groupsLookup.put(alias, groupUserList);
                 }
              }
         }
-        
-        // 2. And now we can make another lookup on the roleassignment table, using the list 
-        // of the explicit group aliases we have just generated: 
-        
+
+        // 2. And now we can make another lookup on the roleassignment table, using the list
+        // of the explicit group aliases we have just generated:
+
         if (groupIdentifiers == null) {
             return userRoleLookup;
         }
-        
+
         qstr = "SELECT distinct a.assigneeidentifier,";
         qstr += " d.name";
         qstr += " FROM roleassignment a,";
@@ -293,26 +304,21 @@ private HashMap<String, List<String>> retrieveRolesForUsers(List<Object[]> userO
         nativeQuery = em.createNativeQuery(qstr);
 
         dbRoleResults = nativeQuery.getResultList();
-        if (dbRoleResults == null){
+        if (dbRoleResults == null) {
             return userRoleLookup;
         }
-        
-        
-        for (Object[] dbResultRow : dbRoleResults) {            
-            
+
+        for (Object[] dbResultRow : dbRoleResults) {
             String groupIdentifier = UserUtil.getStringOrNull(dbResultRow[0]);
             String groupRole = UserUtil.getStringOrNull(dbResultRow[1]);
-            if ((groupIdentifier != null)&&(groupRole != null)){  // should never be null
-                
+            if ((groupIdentifier != null) && (groupRole != null)) {  // should never be null
                 List<String> groupUserList = groupsLookup.get(groupIdentifier);
-                
                 if (groupUserList != null) {
-                
                     for (String groupUserIdentifier : groupUserList) {
-                        groupUserIdentifier = "@" + groupUserIdentifier; 
+                        groupUserIdentifier = "@" + groupUserIdentifier;
                         //System.out.println("Group user: "+groupUserIdentifier);
                         List<String> userRoleList = userRoleLookup.getOrDefault(groupUserIdentifier, new ArrayList<String>());
-                        if (!userRoleList.contains(groupRole)){
+                        if (!userRoleList.contains(groupRole)) {
                             //System.out.println("User Role: "+groupRole);
                             userRoleList.add(groupRole);
                             userRoleLookup.put(groupUserIdentifier, userRoleList);
@@ -321,15 +327,14 @@ private HashMap<String, List<String>> retrieveRolesForUsers(List<Object[]> userO
                 }
             }
         }
-        
-        
+
         return userRoleLookup;
     }
-    
+
     /**
      * 
      * @param userId
-     * @return 
+     * @return
      */
     private String getUserRolesAsString(Integer userId) {
         String retval = "";
@@ -338,7 +343,7 @@ private String getUserRolesAsString(Integer userId) {
         qstr += " FROM authenticateduser";
         qstr += " WHERE id = " + userId.toString();
         qstr += ";";
-        
+
         Query nativeQuery = em.createNativeQuery(qstr);
 
         userIdentifier = '@' + (String) nativeQuery.getSingleResult();
@@ -359,176 +364,177 @@ private String getUserRolesAsString(Integer userId) {
         }
         return retval;
     }
-    
+
     /**
      * 
      * Run a native query, returning a List<Object[]> containing
-     * AuthenticatedUser information as well as information about the 
+     * AuthenticatedUser information as well as information about the
      * Authenticated Provider (e.g. builtin user, etc)
      * 
      * @param searchTerm
      * @param sortKey
      * @param resultLimit
-     * @return 
+     * @return
      */
-    private List<Object[]> getUserListCore(String searchTerm, String sortKey, Integer resultLimit, Integer offset) {
-
-        if ((sortKey == null) || (sortKey.isEmpty())){
-            sortKey = "u.username";
-        }else{
-            sortKey = "u." + sortKey;
+    private List<Object[]> getUserListCore(String searchTerm,
+                                           String sortKey,
+                                           Integer resultLimit,
+                                           Integer offset) {
+        if (StringUtils.isNotBlank(sortKey) && acceptableSortKeys.contains(sortKey.toLowerCase())) {
+            if (sortKey.toLowerCase().equals("authproviderid")) {
+                sortKey = "prov.id";
+            } else if (sortKey.toLowerCase().equals("authproviderid desc")) {
+                sortKey = "prov.id desc";
+            } else {
+                sortKey = "u." + sortKey.toLowerCase();
+            }
+        } else {
+            sortKey = "u.useridentifier";
         }
-        
-        if ((resultLimit == null)||(resultLimit < 1)){
+
+        if ((resultLimit == null) || (resultLimit < 1)) {
             resultLimit = 1;
         }
-        
-        if ((searchTerm==null)||(searchTerm.isEmpty())){
+
+        if ((searchTerm==null) || (searchTerm.isEmpty())) {
             searchTerm = "";
         }
-        
-        if ((offset == null)||(offset < 0)){
+
+        if ((offset == null) || (offset < 0)) {
             offset = 0;
         }
-        
+
         //Results of this query are used to build Authenticated User records:
 
         searchTerm = searchTerm.trim();
 
         String sharedSearchClause = "";
-        
+
         if (!searchTerm.isEmpty()) {
             sharedSearchClause = " AND " + getSharedSearchClause(searchTerm);
         }
-        
-        
+
         String qstr = "SELECT u.id, u.useridentifier,";
         qstr += " u.lastname, u.firstname, u.email,";
         qstr += " u.affiliation, u.superuser,";
         qstr += " u.position,";
         qstr += " u.createdtime, u.lastlogintime, u.lastapiusetime, ";
-        qstr += " prov.id, prov.factoryalias";
+        qstr += " prov.id, prov.factoryalias, ";
+        qstr += " u.deactivated, u.deactivatedtime, ";
+        qstr += " u.mutedEmails, u.mutedNotifications, u.rateLimitTier ";
         qstr += " FROM authenticateduser u,";
         qstr += " authenticateduserlookup prov_lookup,";
         qstr += " authenticationproviderrow prov";
         qstr += " WHERE";
         qstr += " u.id = prov_lookup.authenticateduser_id";
-        qstr += " AND prov_lookup.authenticationproviderid = prov.id";       
+        qstr += " AND prov_lookup.authenticationproviderid = prov.id";
         qstr += sharedSearchClause;
-        qstr += " ORDER BY u.useridentifier";
+        qstr += " ORDER BY " + sortKey; // u.useridentifier
         qstr += " LIMIT " + resultLimit;
         qstr += " OFFSET " + offset;
         qstr += ";";
-        
+
         logger.log(Level.FINE, "getUserCount: {0}", qstr);
 
         Query nativeQuery = em.createNativeQuery(qstr);
-       
-        return nativeQuery.getResultList();
 
+        return nativeQuery.getResultList();
     }
-    
+
     /**
      * The search clause needs to be consistent between the searches that:
      * (1) get a user count
      * (2) get a list of users
      * 
-     * @return 
+     * @return
      */
-    
-    private String getSharedSearchClause(String searchTerm){
+
+    private String getSharedSearchClause(String searchTerm) {
         String[] searchTermTokens = searchTerm.replaceAll("['\"]", "").split("[ ,][ ,]*");
-        
+
         String searchClause = "(";
-        
+
         for (int i = 0; i < searchTermTokens.length; i++) {
             if (i > 0) {
                 searchClause += " AND ";
             }
             searchClause += "(u.useridentifier ILIKE '" + searchTermTokens[i] + "%'";
             searchClause += " OR u.firstname ILIKE '" + searchTermTokens[i] + "%'";
-            searchClause += " OR u.lastname ILIKE '" + searchTermTokens[i] + "%'"; 
+            searchClause += " OR u.lastname ILIKE '" + searchTermTokens[i] + "%'";
             searchClause += " OR u.affiliation ILIKE '" + searchTermTokens[i] + "%'";
             searchClause += " OR u.affiliation ILIKE '% " + searchTermTokens[i] + "%'";
-            searchClause += " OR u.email ILIKE '" + searchTermTokens[i] + "%')"; 
+            searchClause += " OR u.email ILIKE '" + searchTermTokens[i] + "%')";
         }
-        
+
         return searchClause + ")";
     }
-    
-    
+
     /**
      * Return the number of superusers -- for the dashboard
-     * @return 
+     * @return
      */
     public Long getSuperUserCount() {
-                
         String qstr = "SELECT count(au)";
         qstr += " FROM AuthenticatedUser au";
         qstr += " WHERE au.superuser = :superuserTrue";
-        
+
         Query query = em.createQuery(qstr);
         query.setParameter("superuserTrue", true);
-         
+
         return (Long)query.getSingleResult();
     }
 
     /**
      * Return count of all users
-     * @return 
+     * @return
      */
-    public Long getTotalUserCount(){
-        
+    public Long getTotalUserCount() {
         return getUserCount("");
     }
-    
+
     /**
      * 
      * @param searchTerm
-     * @return 
+     * @return
      */
     public Long getUserCount(String searchTerm) {
-        
-        if ((searchTerm==null)||(searchTerm.isEmpty())){
+        if ((searchTerm==null) || (searchTerm.isEmpty())) {
             searchTerm = "";
         }
         searchTerm = searchTerm.trim();
 
-
         String sharedSearchClause = "";
-        
+
         if (!searchTerm.isEmpty()) {
             sharedSearchClause = " AND " + getSharedSearchClause(searchTerm);
         }
-        
+
         String qstr = "SELECT count(u.id)";
         qstr += " FROM authenticateduser u,";
         qstr += " authenticateduserlookup prov_lookup,";
         qstr += " authenticationproviderrow prov";
         qstr += " WHERE";
         qstr += " u.id = prov_lookup.authenticateduser_id";
-        qstr += " AND prov_lookup.authenticationproviderid = prov.id";    
+        qstr += " AND prov_lookup.authenticationproviderid = prov.id";
         qstr += sharedSearchClause;
         qstr += ";";
-               
+
         Query nativeQuery = em.createNativeQuery(qstr);
-        
-        return (Long)nativeQuery.getSingleResult();
 
+        return (Long)nativeQuery.getSingleResult();
     }
-    
-    
+
     public AuthenticatedUser updateLastLogin(AuthenticatedUser user) {
         //assumes that AuthenticatedUser user already exists
         user.setLastLoginTime(new Timestamp(new Date().getTime()));
-        
+
         return save(user);
     }
 
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     public AuthenticatedUser updateLastApiUseTime(AuthenticatedUser user) {
         //assumes that AuthenticatedUser user already exists
         user.setLastApiUseTime(new Timestamp(new Date().getTime()));
         return save(user);
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ValidateDataFileDirectoryName.java b/src/main/java/edu/harvard/iq/dataverse/ValidateDataFileDirectoryName.java
index 94e33d6220a..9e8ce42491d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ValidateDataFileDirectoryName.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ValidateDataFileDirectoryName.java
@@ -10,8 +10,8 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/ValidateDatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/ValidateDatasetFieldType.java
index ae7b4a1eaef..f36a1d9541e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ValidateDatasetFieldType.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ValidateDatasetFieldType.java
@@ -13,8 +13,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 @Target({TYPE, ANNOTATION_TYPE})
 @Retention(RUNTIME)
diff --git a/src/main/java/edu/harvard/iq/dataverse/ValidateDeaccessionNote.java b/src/main/java/edu/harvard/iq/dataverse/ValidateDeaccessionNote.java
new file mode 100644
index 00000000000..d6bf2b857d6
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/ValidateDeaccessionNote.java
@@ -0,0 +1,39 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse;
+
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+/**
+ *
+ * @author skraffmi
+ */
+
+
+@Target({TYPE, ANNOTATION_TYPE})
+@Retention(RUNTIME)
+@Constraint(validatedBy = {DatasetDeaccessionNoteValidator.class})
+@Documented
+public @interface ValidateDeaccessionNote {
+
+  String message() default "Failed Validation for DatasetsDeaccessionNote";
+
+  Class<?>[] groups() default {};
+
+  Class<? extends Payload>[] payload() default {};
+  
+  String deaccessionNote();
+  
+  String versionState();
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ValidateEmail.java b/src/main/java/edu/harvard/iq/dataverse/ValidateEmail.java
deleted file mode 100644
index cadbbbf1407..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/ValidateEmail.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-/**
- *
- * @author skraffmi
- */
-@Target({FIELD})
-@Retention(RUNTIME)
-@Constraint(validatedBy = {EMailValidator.class})
-@Documented
-public @interface  ValidateEmail {
-  String message() default "Failed Validation Email Address";
-
-  Class<?>[] groups() default {};
-
-  Class<? extends Payload>[] payload() default {};
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ValidateTermsOfUseAndAccess.java b/src/main/java/edu/harvard/iq/dataverse/ValidateTermsOfUseAndAccess.java
index 8717d10fc8d..f55e93af674 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ValidateTermsOfUseAndAccess.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ValidateTermsOfUseAndAccess.java
@@ -10,8 +10,8 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/ValidateURL.java b/src/main/java/edu/harvard/iq/dataverse/ValidateURL.java
deleted file mode 100644
index 106876e423e..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/ValidateURL.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-package edu.harvard.iq.dataverse;
-
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.FIELD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-@Target({FIELD})
-@Retention(RUNTIME)
-@Constraint(validatedBy = {URLValidator.class})
-@Documented
-public @interface ValidateURL {
-
-    String message() default "Failed Validation for Validate URL";
-
-    Class<?>[] groups() default {};
-
-    Class<? extends Payload>[] payload() default {};
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ValidateUserName.java b/src/main/java/edu/harvard/iq/dataverse/ValidateUserName.java
deleted file mode 100644
index 0cd8fcb4443..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/ValidateUserName.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.FIELD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-/**
- *
- * @author sarahferry
- */
-
-@Target({FIELD})
-@Retention(RUNTIME)
-@Constraint(validatedBy = {UserNameValidator.class})
-@Documented
-public @interface  ValidateUserName {
-  String message() default "Failed Validation Username";
-
-  Class<?>[] groups() default {};
-
-  Class<? extends Payload>[] payload() default {};
-    
-}
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/ValidateVersionNote.java b/src/main/java/edu/harvard/iq/dataverse/ValidateVersionNote.java
deleted file mode 100644
index 405a7feb52f..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/ValidateVersionNote.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-/**
- *
- * @author skraffmi
- */
-
-
-@Target({TYPE, ANNOTATION_TYPE})
-@Retention(RUNTIME)
-@Constraint(validatedBy = {DatasetVersionNoteValidator.class})
-@Documented
-public @interface ValidateVersionNote {
-
-  String message() default "Failed Validation for DatasetVersionNote";
-
-  Class<?>[] groups() default {};
-
-  Class<? extends Payload>[] payload() default {};
-  
-  String versionNote();
-  
-  String versionState();
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/WidgetWrapper.java b/src/main/java/edu/harvard/iq/dataverse/WidgetWrapper.java
index 24548189239..c51903e2ed4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/WidgetWrapper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/WidgetWrapper.java
@@ -5,9 +5,10 @@
  */
 package edu.harvard.iq.dataverse;
 
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Named;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  *
@@ -17,8 +18,8 @@
 @Named
 public class WidgetWrapper implements java.io.Serializable {
 
-    private final static String WIDGET_PARAMETER = "widget";
-    private final static char WIDGET_SEPARATOR = '@';
+    private static final String WIDGET_PARAMETER = "widget";
+    private static final char WIDGET_SEPARATOR = '@';
     
     private Boolean widgetView;
     private String widgetHome;
@@ -36,6 +37,11 @@ private boolean initWidget() {
                 widgetHome = widgetParam.substring(widgetParam.indexOf(WIDGET_SEPARATOR) + 1);
             }
         }
+        if (!widgetView) {
+            // Prevent non-widgets from being embedded in iframes.
+            HttpServletResponse response = (HttpServletResponse) FacesContext.getCurrentInstance().getExternalContext().getResponse();
+            response.setHeader("Content-Security-Policy", "frame-ancestors 'none'");
+        }
         return widgetView;
     }
 
@@ -56,7 +62,7 @@ public boolean isWidgetTarget(DvObject dvo) {
                         case "dataverse": 
                             break; // keep looping
                         case "dataset":
-                            if (((Dataset) dvo).getGlobalIdString().equals(widgetHome)) {
+                            if (((Dataset) dvo).getGlobalId().asString().equals(widgetHome)) {
                                 return true;
                             }   break;
                         default:
diff --git a/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecord.java b/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecord.java
index 31a9ad25e5b..6743c3f2143 100644
--- a/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecord.java
+++ b/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecord.java
@@ -3,16 +3,16 @@
 import java.util.Date;
 import java.util.Objects;
 import java.util.UUID;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.PrePersist;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 /**
  * Logs a single action in the action log.
diff --git a/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogServiceBean.java
index ba19fdd9eeb..2d16f52bb09 100644
--- a/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogServiceBean.java
@@ -1,11 +1,11 @@
 package edu.harvard.iq.dataverse.actionlogging;
 
 import java.util.Date;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 /**
  * A service bean that persists {@link ActionLogRecord}s to the DB.
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java b/src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java
index b8616809adc..76ef91fbd3a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java
@@ -1,80 +1,65 @@
 package edu.harvard.iq.dataverse.api;
 
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.DataFileServiceBean;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
-import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.DatasetLinkingDataverse;
-import edu.harvard.iq.dataverse.DatasetLinkingServiceBean;
-import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseLinkingDataverse;
-import edu.harvard.iq.dataverse.DataverseLinkingServiceBean;
-import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
-import edu.harvard.iq.dataverse.DvObject;
-import edu.harvard.iq.dataverse.EjbDataverseEngine;
-import edu.harvard.iq.dataverse.MapLayerMetadataServiceBean;
-import edu.harvard.iq.dataverse.MetadataBlock;
-import edu.harvard.iq.dataverse.MetadataBlockServiceBean;
-import edu.harvard.iq.dataverse.PermissionServiceBean;
-import edu.harvard.iq.dataverse.RoleAssigneeServiceBean;
-import edu.harvard.iq.dataverse.UserNotificationServiceBean;
-import edu.harvard.iq.dataverse.UserServiceBean;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
+import static edu.harvard.iq.dataverse.api.Datasets.handleVersion;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.authorization.users.GuestUser;
-import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
 import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleServiceBean;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
-import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.engine.command.exception.*;
+import edu.harvard.iq.dataverse.engine.command.impl.GetDraftDatasetVersionCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.GetLatestAccessibleDatasetVersionCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.GetLatestPublishedDatasetVersionCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.GetSpecificPublishedDatasetVersionCommand;
 import edu.harvard.iq.dataverse.externaltools.ExternalToolServiceBean;
-import edu.harvard.iq.dataverse.metrics.MetricsServiceBean;
-import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.locality.StorageSiteServiceBean;
+import edu.harvard.iq.dataverse.metrics.MetricsServiceBean;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearchServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.DateUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.util.json.JsonParser;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean;
-import java.io.StringReader;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.json.*;
+import jakarta.json.JsonValue.ValueType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.Response.Status;
+
+import java.io.InputStream;
 import java.net.URI;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.UUID;
+import java.time.Instant;
+import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import static org.apache.commons.lang.StringUtils.isNumeric;
+
+import static org.apache.commons.lang3.StringUtils.isNumeric;
 
 /**
  * Base class for API beans
@@ -85,9 +70,10 @@ public abstract class AbstractApiBean {
     private static final Logger logger = Logger.getLogger(AbstractApiBean.class.getName());
     private static final String DATAVERSE_KEY_HEADER_NAME = "X-Dataverse-key";
     private static final String PERSISTENT_ID_KEY=":persistentId";
-    public static final String STATUS_ERROR = "ERROR";
-    public static final String STATUS_OK = "OK";
+    private static final String ALIAS_KEY=":alias";
     public static final String STATUS_WF_IN_PROGRESS = "WORKFLOW_IN_PROGRESS";
+    public static final String DATAVERSE_WORKFLOW_INVOCATION_HEADER_NAME = "X-Dataverse-invocationID";
+    public static final String RESPONSE_MESSAGE_AUTHENTICATED_USER_REQUIRED = "Only authenticated users can perform the requested operation";
 
     /**
      * Utility class to convey a proper error response using Java's exceptions.
@@ -129,23 +115,21 @@ public Response refineResponse( String message ) {
          * In the common case of the wrapped response being of type JSON,
          * return the message field it has (if any).
          * @return the content of a message field, or {@code null}.
+         * @throws JsonException when JSON parsing fails.
          */
         String getWrappedMessageWhenJson() {
             if ( response.getMediaType().equals(MediaType.APPLICATION_JSON_TYPE) ) {
                 Object entity = response.getEntity();
                 if ( entity == null ) return null;
 
-                String json = entity.toString();
-                try ( StringReader rdr = new StringReader(json) ){
-                    JsonReader jrdr = Json.createReader(rdr);
-                    JsonObject obj = jrdr.readObject();
-                    if ( obj.containsKey("message") ) {
-                        JsonValue message = obj.get("message");
-                        return message.getValueType() == ValueType.STRING ? obj.getString("message") : message.toString();
-                    } else {
-                        return null;
-                    }
+                JsonObject obj = JsonUtil.getJsonObject(entity.toString());
+                if ( obj.containsKey("message") ) {
+                    JsonValue message = obj.get("message");
+                    return message.getValueType() == ValueType.STRING ? obj.getString("message") : message.toString();
+                } else {
+                    return null;
                 }
+
             } else {
                 return null;
             }
@@ -155,6 +139,9 @@ String getWrappedMessageWhenJson() {
     @EJB
     protected EjbDataverseEngine engineSvc;
 
+    @EJB
+    protected DvObjectServiceBean dvObjectSvc;
+    
     @EJB
     protected DatasetServiceBean datasetSvc;
     
@@ -173,6 +160,12 @@ String getWrappedMessageWhenJson() {
     @EJB
     protected MetadataBlockServiceBean metadataBlockSvc;
 
+    @EJB
+    protected LicenseServiceBean licenseSvc;
+
+    @EJB
+    protected DatasetTypeServiceBean datasetTypeSvc;
+
     @EJB
     protected UserServiceBean userSvc;
 
@@ -197,9 +190,6 @@ String getWrappedMessageWhenJson() {
     @EJB
     protected SavedSearchServiceBean savedSearchSvc;
 
-    @EJB
-    protected PrivateUrlServiceBean privateUrlSvc;
-
     @EJB
     protected ConfirmEmailServiceBean confirmEmailSvc;
 
@@ -209,9 +199,6 @@ String getWrappedMessageWhenJson() {
     @EJB
     protected DatasetVersionServiceBean datasetVersionSvc;
 
-    @EJB
-    protected MapLayerMetadataServiceBean mapLayerMetadataSrv;
-
     @EJB
     protected SystemConfig systemConfig;
 
@@ -238,6 +225,12 @@ String getWrappedMessageWhenJson() {
 
     @EJB
     MetricsServiceBean metricsSvc;
+    
+    @EJB 
+    DvObjectServiceBean dvObjSvc;
+    
+    @EJB 
+    GuestbookResponseServiceBean gbRespSvc;
 
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     protected EntityManager em;
@@ -256,14 +249,14 @@ public enum Format {
     private final LazyRef<JsonParser> jsonParserRef = new LazyRef<>(new Callable<JsonParser>() {
         @Override
         public JsonParser call() throws Exception {
-            return new JsonParser(datasetFieldSvc, metadataBlockSvc,settingsSvc);
+            return new JsonParser(datasetFieldSvc, metadataBlockSvc,settingsSvc, licenseSvc, datasetTypeSvc);
         }
     });
 
     /**
      * Functional interface for handling HTTP requests in the APIs.
      *
-     * @see #response(edu.harvard.iq.dataverse.api.AbstractApiBean.DataverseRequestHandler)
+     * @see #response(edu.harvard.iq.dataverse.api.AbstractApiBean.DataverseRequestHandler, edu.harvard.iq.dataverse.authorization.users.User)
      */
     protected static interface DataverseRequestHandler {
         Response handle( DataverseRequest u ) throws WrappedResponse;
@@ -306,6 +299,31 @@ protected String getRequestApiKey() {
         return headerParamApiKey!=null ? headerParamApiKey : queryParamApiKey;
     }
 
+    protected User getRequestUser(ContainerRequestContext crc) {
+        return (User) crc.getProperty(ApiConstants.CONTAINER_REQUEST_CONTEXT_USER);
+    }
+
+    /**
+     * Gets the authenticated user from the ContainerRequestContext user property. If the user from the property
+     * is not authenticated, throws a wrapped "authenticated user required" user (HTTP UNAUTHORIZED) response.
+     * @param crc a ContainerRequestContext implementation
+     * @return The authenticated user
+     * @throws edu.harvard.iq.dataverse.api.AbstractApiBean.WrappedResponse in case the user is not authenticated.
+     *
+     * TODO:
+     *  This method is designed to comply with existing authorization logic, based on the old findAuthenticatedUserOrDie method.
+     *  Ideally, as for authentication, a filter could be implemented for authorization, which would extract and encapsulate the
+     *  authorization logic from the AbstractApiBean.
+     */
+    protected AuthenticatedUser getRequestAuthenticatedUserOrDie(ContainerRequestContext crc) throws WrappedResponse {
+        User requestUser = (User) crc.getProperty(ApiConstants.CONTAINER_REQUEST_CONTEXT_USER);
+        if (requestUser.isAuthenticated()) {
+            return (AuthenticatedUser) requestUser;
+        } else {
+            throw new WrappedResponse(authenticatedUserRequired());
+        }
+    }
+
     /* ========= *\
      *  Finders  *
     \* ========= */
@@ -324,59 +342,13 @@ protected RoleAssignee findAssignee(String identifier) {
     }
 
     /**
-     *
      * @param apiKey the key to find the user with
      * @return the user, or null
-     * @see #findUserOrDie(java.lang.String)
      */
     protected AuthenticatedUser findUserByApiToken( String apiKey ) {
         return authSvc.lookupUser(apiKey);
     }
 
-    /**
-     * Returns the user of pointed by the API key, or the guest user
-     * @return a user, may be a guest user.
-     * @throws edu.harvard.iq.dataverse.api.AbstractApiBean.WrappedResponse iff there is an api key present, but it is invalid.
-     */
-    protected User findUserOrDie() throws WrappedResponse {
-        final String requestApiKey = getRequestApiKey();
-        if (requestApiKey == null) {
-            return GuestUser.get();
-        }
-        PrivateUrlUser privateUrlUser = privateUrlSvc.getPrivateUrlUserFromToken(requestApiKey);
-        if (privateUrlUser != null) {
-            return privateUrlUser;
-        }
-        return findAuthenticatedUserOrDie(requestApiKey);
-    }
-
-    /**
-     * Finds the authenticated user, based on (in order):
-     * <ol>
-     *  <li>The key in the HTTP header {@link #DATAVERSE_KEY_HEADER_NAME}</li>
-     *  <li>The key in the query parameter {@code key}
-     * </ol>
-     *
-     * If no user is found, throws a wrapped bad api key (HTTP UNAUTHORIZED) response.
-     *
-     * @return The authenticated user which owns the passed api key
-     * @throws edu.harvard.iq.dataverse.api.AbstractApiBean.WrappedResponse in case said user is not found.
-     */
-    protected AuthenticatedUser findAuthenticatedUserOrDie() throws WrappedResponse {
-        return findAuthenticatedUserOrDie(getRequestApiKey());
-    }
-
-
-    private AuthenticatedUser findAuthenticatedUserOrDie( String key ) throws WrappedResponse {
-        AuthenticatedUser authUser = authSvc.lookupUser(key);
-        if ( authUser != null ) {
-            authUser = userSvc.updateLastApiUseTime(authUser);
-
-            return authUser;
-        }
-        throw new WrappedResponse( badApiKey(key) );
-    }
-
     protected Dataverse findDataverseOrDie( String dvIdtf ) throws WrappedResponse {
         Dataverse dv = findDataverse(dvIdtf);
         if ( dv == null ) {
@@ -402,33 +374,101 @@ protected DataverseLinkingDataverse findDataverseLinkingDataverseOrDie(String da
     }
 
     protected Dataset findDatasetOrDie(String id) throws WrappedResponse {
+        return findDatasetOrDie(id, false);
+    }
+
+    protected Dataset findDatasetOrDie(String id, boolean deep) throws WrappedResponse {
+        Long datasetId;
         Dataset dataset;
-        if (id.equals(PERSISTENT_ID_KEY)) {
-            String persistentId = getRequestParameter(PERSISTENT_ID_KEY.substring(1));
-            if (persistentId == null) {
+        if (isNumeric(id)) {
+            try {
+                datasetId = Long.parseLong(id);
+            } catch (NumberFormatException nfe) {
                 throw new WrappedResponse(
-                        badRequest(BundleUtil.getStringFromBundle("find.dataset.error.dataset_id_is_null", Collections.singletonList(PERSISTENT_ID_KEY.substring(1)))));
-            }
-            dataset = datasetSvc.findByGlobalId(persistentId);
-            if (dataset == null) {
-                throw new WrappedResponse(notFound(BundleUtil.getStringFromBundle("find.dataset.error.dataset.not.found.persistentId", Collections.singletonList(persistentId))));
+                        badRequest(BundleUtil.getStringFromBundle("find.dataset.error.dataset.not.found.bad.id", Collections.singletonList(id))));
             }
-            return dataset;
-
         } else {
-            try {
-                dataset = datasetSvc.find(Long.parseLong(id));
-                if (dataset == null) {
-                    throw new WrappedResponse(notFound(BundleUtil.getStringFromBundle("find.dataset.error.dataset.not.found.id", Collections.singletonList(id))));
+            String persistentId = id;
+            if (id.equals(PERSISTENT_ID_KEY)) {
+                persistentId = getRequestParameter(PERSISTENT_ID_KEY.substring(1));
+                if (persistentId == null) {
+                    throw new WrappedResponse(
+                            badRequest(BundleUtil.getStringFromBundle("find.dataset.error.dataset_id_is_null", Collections.singletonList(PERSISTENT_ID_KEY.substring(1)))));
                 }
-                return dataset;
-            } catch (NumberFormatException nfe) {
+            }
+            GlobalId globalId;
+            try {
+                globalId = PidUtil.parseAsGlobalID(persistentId);
+            } catch (IllegalArgumentException e) {
                 throw new WrappedResponse(
-                        badRequest(BundleUtil.getStringFromBundle("find.dataset.error.dataset.not.found.bad.id", Collections.singletonList(id))));
+                    badRequest(BundleUtil.getStringFromBundle("find.dataset.error.dataset.not.found.bad.id", Collections.singletonList(persistentId))));
+            }
+            datasetId = dvObjSvc.findIdByGlobalId(globalId, DvObject.DType.Dataset);
+            if (datasetId == null) {
+                datasetId = dvObjSvc.findIdByAltGlobalId(globalId, DvObject.DType.Dataset);
+            }
+            if (datasetId == null) {
+                throw new WrappedResponse(
+                    notFound(BundleUtil.getStringFromBundle("find.dataset.error.dataset_id_is_null", Collections.singletonList(PERSISTENT_ID_KEY.substring(1)))));
             }
         }
+        if (deep) {
+            dataset = datasetSvc.findDeep(datasetId);
+        } else {
+            dataset = datasetSvc.find(datasetId);
+        }
+        if (dataset == null) {
+            throw new WrappedResponse(notFound(BundleUtil.getStringFromBundle("find.dataset.error.dataset.not.found.id", Collections.singletonList(id))));
+        }
+        return dataset;
     }
-    
+
+    protected DatasetVersion findDatasetVersionOrDie(final DataverseRequest req, String versionNumber, final Dataset ds, boolean includeDeaccessioned, boolean checkPermsWhenDeaccessioned) throws WrappedResponse {
+        DatasetVersion dsv = execCommand(handleVersion(versionNumber, new Datasets.DsVersionHandler<Command<DatasetVersion>>() {
+
+            @Override
+            public Command<DatasetVersion> handleLatest() {
+                return new GetLatestAccessibleDatasetVersionCommand(req, ds, includeDeaccessioned, checkPermsWhenDeaccessioned);
+            }
+
+            @Override
+            public Command<DatasetVersion> handleDraft() {
+                return new GetDraftDatasetVersionCommand(req, ds);
+            }
+
+            @Override
+            public Command<DatasetVersion> handleSpecific(long major, long minor) {
+                return new GetSpecificPublishedDatasetVersionCommand(req, ds, major, minor, includeDeaccessioned, checkPermsWhenDeaccessioned);
+            }
+
+            @Override
+            public Command<DatasetVersion> handleLatestPublished() {
+                return new GetLatestPublishedDatasetVersionCommand(req, ds, includeDeaccessioned, checkPermsWhenDeaccessioned);
+            }
+        }));
+        return dsv;
+    }
+
+    protected void validateInternalTimestampIsNotOutdated(DvObject dvObject, String sourceLastUpdateTime) throws WrappedResponse {
+        Date date = sourceLastUpdateTime != null ? DateUtil.parseDate(sourceLastUpdateTime, "yyyy-MM-dd'T'HH:mm:ss'Z'") : null;
+        if (date == null) {
+            throw new WrappedResponse(
+                    badRequest(BundleUtil.getStringFromBundle("jsonparser.error.parsing.date", Collections.singletonList(sourceLastUpdateTime)))
+            );
+        }
+        Instant instant = date.toInstant();
+        Instant updateTimestamp =
+                (dvObject instanceof DataFile) ? ((DataFile) dvObject).getFileMetadata().getDatasetVersion().getLastUpdateTime().toInstant() :
+                (dvObject instanceof Dataset) ? ((Dataset) dvObject).getLatestVersion().getLastUpdateTime().toInstant() :
+                instant;
+        // granularity is to the second since the json output only returns dates in this format to the second
+        if (updateTimestamp.getEpochSecond() != instant.getEpochSecond()) {
+            throw new WrappedResponse(
+                    badRequest(BundleUtil.getStringFromBundle("abstractApiBean.error.internalVersionTimestampIsOutdated", Collections.singletonList(sourceLastUpdateTime)))
+            );
+        }
+    }
+
     protected DataFile findDataFileOrDie(String id) throws WrappedResponse {
         DataFile datafile;
         if (id.equals(PERSISTENT_ID_KEY)) {
@@ -455,6 +495,37 @@ protected DataFile findDataFileOrDie(String id) throws WrappedResponse {
             }
         }
     }
+       
+    protected DataverseRole findRoleOrDie(String id) throws WrappedResponse {
+        DataverseRole role;
+        if (id.equals(ALIAS_KEY)) {
+            String alias = getRequestParameter(ALIAS_KEY.substring(1));
+            try {
+                return em.createNamedQuery("DataverseRole.findDataverseRoleByAlias", DataverseRole.class)
+                        .setParameter("alias", alias)
+                        .getSingleResult();
+
+            //Should not be a multiple result exception due to table constraint
+            } catch (NoResultException nre) {
+                throw new WrappedResponse(notFound(BundleUtil.getStringFromBundle("find.dataverse.role.error.role.not.found.alias", Collections.singletonList(alias))));
+            }
+
+        } else {
+
+            try {
+                role = rolesSvc.find(Long.parseLong(id));
+                if (role == null) {
+                    throw new WrappedResponse(notFound(BundleUtil.getStringFromBundle("find.dataverse.role.error.role.not.found.id", Collections.singletonList(id))));
+                } else {
+                    return role;
+                }
+
+            } catch (NumberFormatException nfe) {
+                throw new WrappedResponse(
+                        badRequest(BundleUtil.getStringFromBundle("find.dataverse.role.error.role.not.found.bad.id", Collections.singletonList(id))));
+            }
+        }
+    }
     
     protected DatasetLinkingDataverse findDatasetLinkingDataverseOrDie(String datasetId, String linkingDataverseId) throws WrappedResponse {
         DatasetLinkingDataverse dsld;
@@ -506,17 +577,69 @@ protected DvObject findDvo( Long id ) {
      * with that alias. If that fails, tries to get a {@link Dataset} with that global id.
      * @param id a value identifying the DvObject, either numeric of textual.
      * @return A DvObject, or {@code null}
+     * @throws WrappedResponse
      */
-	protected DvObject findDvo( String id ) {
-        if ( isNumeric(id) ) {
-            return findDvo( Long.valueOf(id)) ;
+    @NotNull
+    protected DvObject findDvo(@NotNull final String id) throws WrappedResponse {
+        DvObject d = null;
+        if (isNumeric(id)) {
+            d = findDvo(Long.valueOf(id));
         } else {
-            Dataverse d = dataverseSvc.findByAlias(id);
-            return ( d != null ) ?
-                    d : datasetSvc.findByGlobalId(id);
+            d = dataverseSvc.findByAlias(id);
+        }
+        if (d == null) {
+            return findDatasetOrDie(id);
+        }
+        return d;
+    }
 
+    /**
+     *
+     * @param dvIdtf
+     * @param type
+     * @return DvObject if type matches or throw exception
+     * @throws WrappedResponse
+     */
+    @NotNull
+    protected DvObject findDvoByIdAndFeaturedItemTypeOrDie(@NotNull final String dvIdtf, String type) throws WrappedResponse {
+        try {
+            DataverseFeaturedItem.TYPES dvType = DataverseFeaturedItem.getDvType(type);
+            DvObject dvObject = null;
+            if (isNumeric(dvIdtf)) {
+                try {
+                    dvObject = findDvo(Long.valueOf(dvIdtf));
+                } catch (Exception e) {
+                    throw new WrappedResponse(error(Response.Status.BAD_REQUEST,BundleUtil.getStringFromBundle("find.dvo.error.dvObjectNotFound", Arrays.asList(dvIdtf))));
+                }
+            }
+            if (dvObject == null) {
+                List<DataverseFeaturedItem.TYPES> types = new ArrayList<>();
+                types.addAll(List.of(DataverseFeaturedItem.TYPES.values()));
+                types.remove(dvType);
+                types.add(0, dvType); // put the requested type first for speed of lookup
+                for (DataverseFeaturedItem.TYPES t : types) {
+                    try {
+                        if (DataverseFeaturedItem.TYPES.DATAVERSE == t) {
+                            dvObject = findDataverseOrDie(dvIdtf);
+                            break;
+                        } else if (DataverseFeaturedItem.TYPES.DATASET == t) {
+                            dvObject = findDatasetOrDie(dvIdtf);
+                            break;
+                        } else if (DataverseFeaturedItem.TYPES.DATAFILE == t) {
+                            dvObject = findDataFileOrDie(dvIdtf);
+                            break;
+                        }
+                    } catch (WrappedResponse e) {
+                        // ignore errors to allow other find*OrDie to be called
+                    }
+                }
+            }
+            DataverseFeaturedItem.validateTypeAndDvObject(dvIdtf, dvObject, dvType);
+            return dvObject;
+        } catch (IllegalArgumentException e) {
+            throw new WrappedResponse(error(Response.Status.BAD_REQUEST, e.getMessage()));
         }
-	}
+    }
 
     protected <T> T failIfNull( T t, String errorMessage ) throws WrappedResponse {
         if ( t != null ) return t;
@@ -551,7 +674,13 @@ protected <T> T execCommand( Command<T> cmd ) throws WrappedResponse {
         try {
             return engineSvc.submit(cmd);
 
+        } catch (RateLimitCommandException ex) {
+            throw new WrappedResponse(rateLimited(ex.getMessage()));
         } catch (IllegalCommandException ex) {
+            //for 8859 for api calls that try to update datasets with TOA out of compliance
+                if (ex.getMessage().toLowerCase().contains("terms of use")){
+                    throw new WrappedResponse(ex, conflict(ex.getMessage()));
+                }
             throw new WrappedResponse( ex, forbidden(ex.getMessage() ) );
         } catch (PermissionException ex) {
             /**
@@ -571,10 +700,24 @@ protected <T> T execCommand( Command<T> cmd ) throws WrappedResponse {
              * sometimes?) doesn't have much information in it:
              *
              * "User @jsmith is not permitted to perform requested action."
+             *
+             * Update (11/11/2024):
+             *
+             * An {@code isDetailedMessageRequired} flag has been added to {@code PermissionException} to selectively return more
+             * specific error messages when the generic message (e.g. "User :guest is not permitted to perform requested action")
+             * lacks sufficient context. This approach aims to provide valuable permission-related details in cases where it
+             * could help users better understand their permission issues without exposing unnecessary internal information.
              */
-            throw new WrappedResponse(error(Response.Status.UNAUTHORIZED,
-                                                    "User " + cmd.getRequest().getUser().getIdentifier() + " is not permitted to perform requested action.") );
-
+            if (ex.isDetailedMessageRequired()) {
+                throw new WrappedResponse(error(Response.Status.UNAUTHORIZED, ex.getMessage()));
+            } else {
+                throw new WrappedResponse(error(Response.Status.UNAUTHORIZED,
+                        "User " + cmd.getRequest().getUser().getIdentifier() + " is not permitted to perform requested action."));
+            }
+        } catch (InvalidFieldsCommandException ex) {
+            throw new WrappedResponse(ex, badRequest(ex.getMessage(), ex.getFieldErrors()));
+        } catch (InvalidCommandArgumentsException ex) {
+            throw new WrappedResponse(ex, error(Status.BAD_REQUEST, ex.getMessage()));
         } catch (CommandException ex) {
             Logger.getLogger(AbstractApiBean.class.getName()).log(Level.SEVERE, "Error while executing command " + cmd, ex);
             throw new WrappedResponse(ex, error(Status.INTERNAL_SERVER_ERROR, ex.getMessage()));
@@ -592,49 +735,39 @@ protected Response response( Callable<Response> hdl ) {
         } catch ( WrappedResponse rr ) {
             return rr.getResponse();
         } catch ( Exception ex ) {
-            String incidentId = UUID.randomUUID().toString();
-            logger.log(Level.SEVERE, "API internal error " + incidentId +": " + ex.getMessage(), ex);
-            return Response.status(500)
-                .entity( Json.createObjectBuilder()
-                             .add("status", "ERROR")
-                             .add("code", 500)
-                             .add("message", "Internal server error. More details available at the server logs.")
-                             .add("incidentId", incidentId)
-                        .build())
-                .type("application/json").build();
+            return handleDataverseRequestHandlerException(ex);
         }
     }
 
-    /**
-     * The preferred way of handling a request that requires a user. The system
-     * looks for the user and, if found, handles it to the handler for doing the
-     * actual work.
-     *
-     * This is a relatively secure way to handle things, since if the user is not
-     * found, the response is about the bad API key, rather than something else
-     * (say, 404 NOT FOUND which leaks information about the existence of the
-     * sought object).
+    /***
+     * The preferred way of handling a request that requires a user. The method
+     * receives a user and handles it to the handler for doing the actual work.
      *
      * @param hdl handling code block.
+     * @param user the associated request user.
      * @return HTTP Response appropriate for the way {@code hdl} executed.
      */
-    protected Response response( DataverseRequestHandler hdl ) {
+    protected Response response(DataverseRequestHandler hdl, User user) {
         try {
-            return hdl.handle(createDataverseRequest(findUserOrDie()));
+            return hdl.handle(createDataverseRequest(user));
         } catch ( WrappedResponse rr ) {
             return rr.getResponse();
         } catch ( Exception ex ) {
-            String incidentId = UUID.randomUUID().toString();
-            logger.log(Level.SEVERE, "API internal error " + incidentId +": " + ex.getMessage(), ex);
-            return Response.status(500)
-                .entity( Json.createObjectBuilder()
-                             .add("status", "ERROR")
-                             .add("code", 500)
-                             .add("message", "Internal server error. More details available at the server logs.")
-                             .add("incidentId", incidentId)
+            return handleDataverseRequestHandlerException(ex);
+        }
+    }
+
+    private Response handleDataverseRequestHandlerException(Exception ex) {
+        String incidentId = UUID.randomUUID().toString();
+        logger.log(Level.SEVERE, "API internal error " + incidentId +": " + ex.getMessage(), ex);
+        return Response.status(500)
+                .entity(Json.createObjectBuilder()
+                        .add("status", "ERROR")
+                        .add("code", 500)
+                        .add("message", "Internal server error. More details available at the server logs.")
+                        .add("incidentId", incidentId)
                         .build())
                 .type("application/json").build();
-        }
     }
 
     /* ====================== *\
@@ -643,39 +776,88 @@ protected Response response( DataverseRequestHandler hdl ) {
 
     protected Response ok( JsonArrayBuilder bld ) {
         return Response.ok(Json.createObjectBuilder()
-            .add("status", STATUS_OK)
-            .add("data", bld).build()).build();
+            .add("status", ApiConstants.STATUS_OK)
+            .add("data", bld).build())
+            .type(MediaType.APPLICATION_JSON).build();
+    }
+
+    protected Response ok( JsonArrayBuilder bld , long totalCount) {
+        return Response.ok(Json.createObjectBuilder()
+                        .add("status", ApiConstants.STATUS_OK)
+                        .add("totalCount", totalCount)
+                        .add("data", bld).build())
+                .type(MediaType.APPLICATION_JSON).build();
+    }
+
+    protected Response ok( JsonArray ja ) {
+        return Response.ok(Json.createObjectBuilder()
+            .add("status", ApiConstants.STATUS_OK)
+            .add("data", ja).build())
+            .type(MediaType.APPLICATION_JSON).build();
     }
 
     protected Response ok( JsonObjectBuilder bld ) {
         return Response.ok( Json.createObjectBuilder()
-            .add("status", STATUS_OK)
+            .add("status", ApiConstants.STATUS_OK)
             .add("data", bld).build() )
             .type(MediaType.APPLICATION_JSON)
             .build();
     }
+    
+    protected Response ok( JsonObject jo ) {
+        return Response.ok( Json.createObjectBuilder()
+                .add("status", ApiConstants.STATUS_OK)
+                .add("data", jo).build() )
+                .type(MediaType.APPLICATION_JSON)
+                .build();    
+    }
 
     protected Response ok( String msg ) {
         return Response.ok().entity(Json.createObjectBuilder()
-            .add("status", STATUS_OK)
+            .add("status", ApiConstants.STATUS_OK)
             .add("data", Json.createObjectBuilder().add("message",msg)).build() )
             .type(MediaType.APPLICATION_JSON)
             .build();
     }
+    
+    protected Response ok( String msg, JsonObjectBuilder bld  ) {
+        return Response.ok().entity(Json.createObjectBuilder()
+            .add("status", ApiConstants.STATUS_OK)
+            .add("message", Json.createObjectBuilder().add("message",msg))     
+            .add("data", bld).build())      
+            .type(MediaType.APPLICATION_JSON)
+            .build();
+    }
 
     protected Response ok( boolean value ) {
         return Response.ok().entity(Json.createObjectBuilder()
-            .add("status", STATUS_OK)
+            .add("status", ApiConstants.STATUS_OK)
             .add("data", value).build() ).build();
     }
 
+    protected Response ok(long value) {
+        return Response.ok().entity(Json.createObjectBuilder()
+                .add("status", ApiConstants.STATUS_OK)
+                .add("data", value).build()).build();
+    }
+
     /**
      * @param data Payload to return.
      * @param mediaType Non-JSON media type.
+     * @param downloadFilename - add Content-Disposition header to suggest filename if not null
      * @return Non-JSON response, such as a shell script.
      */
-    protected Response ok(String data, MediaType mediaType) {
-        return Response.ok().entity(data).type(mediaType).build();
+    protected Response ok(String data, MediaType mediaType, String downloadFilename) {
+        ResponseBuilder res =Response.ok().entity(data).type(mediaType);
+        if(downloadFilename != null) {
+            res = res.header("Content-Disposition", "attachment; filename=" + downloadFilename);
+        }
+        return res.build();
+    }
+
+    protected Response ok(InputStream inputStream) {
+        ResponseBuilder res = Response.ok().entity(inputStream).type(MediaType.valueOf(FileUtil.MIME_TYPE_UNDETERMINED_DEFAULT));
+        return res.build();
     }
 
     protected Response created( String uri, JsonObjectBuilder bld ) {
@@ -709,13 +891,45 @@ protected Response notFound( String msg ) {
     protected Response badRequest( String msg ) {
         return error( Status.BAD_REQUEST, msg );
     }
-    
+
+    protected Response badRequest(String msg, Map<String, String> fieldErrors) {
+        return Response.status(Status.BAD_REQUEST)
+                .entity(NullSafeJsonBuilder.jsonObjectBuilder()
+                        .add("status", ApiConstants.STATUS_ERROR)
+                        .add("message", msg)
+                        .add("fieldErrors", Json.createObjectBuilder(fieldErrors).build())
+                        .build()
+                )
+                .type(MediaType.APPLICATION_JSON_TYPE)
+                .build();
+    }
+
+    /**
+     * In short, your password is fine but you don't have permission.
+     *
+     * "The 403 (Forbidden) status code indicates that the server understood the
+     * request but refuses to authorize it. A server that wishes to make public
+     * why the request has been forbidden can describe that reason in the
+     * response payload (if any).
+     *
+     * If authentication credentials were provided in the request, the server
+     * considers them insufficient to grant access." --
+     * https://datatracker.ietf.org/doc/html/rfc7231#section-6.5.3
+     */
     protected Response forbidden( String msg ) {
         return error( Status.FORBIDDEN, msg );
     }
-    
-    protected Response badApiKey( String apiKey ) {
-        return error(Status.UNAUTHORIZED, (apiKey != null ) ? "Bad api key " : "Please provide a key query parameter (?key=XXX) or via the HTTP header " + DATAVERSE_KEY_HEADER_NAME );
+
+    protected Response rateLimited( String msg ) {
+        return error( Status.TOO_MANY_REQUESTS, msg );
+    }
+
+    protected Response conflict( String msg ) {
+        return error( Status.CONFLICT, msg );
+    }
+
+    protected Response authenticatedUserRequired() {
+        return error(Status.UNAUTHORIZED, RESPONSE_MESSAGE_AUTHENTICATED_USER_REQUIRED);
     }
 
     protected Response permissionError( PermissionException pe ) {
@@ -723,9 +937,17 @@ protected Response permissionError( PermissionException pe ) {
     }
 
     protected Response permissionError( String message ) {
-        return unauthorized( message );
+        return forbidden( message );
     }
     
+    /**
+     * In short, bad password.
+     *
+     * "The 401 (Unauthorized) status code indicates that the request has not
+     * been applied because it lacks valid authentication credentials for the
+     * target resource." --
+     * https://datatracker.ietf.org/doc/html/rfc7235#section-3.1
+     */
     protected Response unauthorized( String message ) {
         return error( Status.UNAUTHORIZED, message );
     }
@@ -733,7 +955,7 @@ protected Response unauthorized( String message ) {
     protected static Response error( Status sts, String msg ) {
         return Response.status(sts)
                 .entity( NullSafeJsonBuilder.jsonObjectBuilder()
-                        .add("status", STATUS_ERROR)
+                        .add("status", ApiConstants.STATUS_ERROR)
                         .add( "message", msg ).build()
                 ).type(MediaType.APPLICATION_JSON_TYPE).build();
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Access.java b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
index 42328367241..89a4cd743d7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Access.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
@@ -6,28 +6,11 @@
 
 package edu.harvard.iq.dataverse.api;
 
-import edu.harvard.iq.dataverse.DataCitation;
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.DataFileServiceBean;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
-import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
-import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
-import edu.harvard.iq.dataverse.DataverseSession;
-import edu.harvard.iq.dataverse.DataverseTheme;
-import edu.harvard.iq.dataverse.GuestbookResponse;
-import edu.harvard.iq.dataverse.GuestbookResponseServiceBean;
-import edu.harvard.iq.dataverse.PermissionServiceBean;
-import edu.harvard.iq.dataverse.PermissionsWrapper;
-import edu.harvard.iq.dataverse.RoleAssignment;
-import edu.harvard.iq.dataverse.UserNotification;
-import edu.harvard.iq.dataverse.UserNotificationServiceBean;
-import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
+import edu.harvard.iq.dataverse.*;
+
+import static edu.harvard.iq.dataverse.api.Datasets.handleVersion;
+
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
@@ -39,36 +22,34 @@
 import edu.harvard.iq.dataverse.dataaccess.DataAccessRequest;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.dataaccess.DataFileZipper;
+import edu.harvard.iq.dataverse.dataaccess.GlobusAccessibleStore;
 import edu.harvard.iq.dataverse.dataaccess.OptionalAccessService;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
-import edu.harvard.iq.dataverse.dataaccess.StoredOriginalFile;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.datavariable.VariableServiceBean;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
+import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.AssignRoleCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.CreateExplicitGroupCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.RequestAccessCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.RevokeRoleCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.*;
 import edu.harvard.iq.dataverse.export.DDIExportServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean.MakeDataCountEntry;
-import edu.harvard.iq.dataverse.makedatacount.MakeDataCountUtil;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
-import edu.harvard.iq.dataverse.worldmapauth.WorldMapTokenServiceBean;
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 
 import java.util.logging.Logger;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.InputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.sql.Timestamp;
@@ -76,46 +57,56 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.Properties;
 import java.util.logging.Level;
-import javax.inject.Inject;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import java.math.BigDecimal;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Consumer;
-import javax.faces.context.FacesContext;
-import javax.json.JsonArrayBuilder;
-import javax.persistence.TypedQuery;
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.UriInfo;
-
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.PUT;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.ServiceUnavailableException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import javax.ws.rs.core.StreamingOutput;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+import jakarta.inject.Inject;
+import jakarta.json.Json;
+import java.net.URI;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.persistence.TypedQuery;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.UriInfo;
+
+
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.ServiceUnavailableException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import jakarta.ws.rs.core.StreamingOutput;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+import java.net.URISyntaxException;
+
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.RedirectionException;
+import jakarta.ws.rs.ServerErrorException;
+import jakarta.ws.rs.core.MediaType;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+
+import org.eclipse.microprofile.openapi.annotations.Operation;
+import org.eclipse.microprofile.openapi.annotations.media.Content;
+import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody;
+import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
+import org.eclipse.microprofile.openapi.annotations.responses.APIResponses;
+import org.eclipse.microprofile.openapi.annotations.tags.Tag;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataParam;
 
 /*
     Custom API exceptions [NOT YET IMPLEMENTED]
@@ -159,8 +150,6 @@ public class Access extends AbstractApiBean {
     PermissionServiceBean permissionService;
     @Inject
     DataverseSession session;
-    @EJB
-    WorldMapTokenServiceBean worldMapTokenServiceBean;
     @Inject
     DataverseRequestServiceBean dvRequestService;
     @EJB
@@ -169,41 +158,43 @@ public class Access extends AbstractApiBean {
     DataverseRoleServiceBean roleService;
     @EJB
     UserNotificationServiceBean userNotificationService;
+    @EJB
+    FileDownloadServiceBean fileDownloadService; 
+    @EJB
+    AuxiliaryFileServiceBean auxiliaryFileService;
     @Inject
     PermissionsWrapper permissionsWrapper;
     @Inject
     MakeDataCountLoggingServiceBean mdcLogService;
+    @Inject
+    DataverseFeaturedItemServiceBean dataverseFeaturedItemServiceBean;
     
-    
-    private static final String API_KEY_HEADER = "X-Dataverse-key";    
-    
+    private static final String DEFAULT_BUNDLE_NAME = "dataverse_files.zip";
     //@EJB
     
     // TODO: 
     // versions? -- L.A. 4.0 beta 10
-    @Path("datafile/bundle/{fileId}")
     @GET
+    @AuthRequired
+    @Path("datafile/bundle/{fileId}")
     @Produces({"application/zip"})
-    public BundleDownloadInstance datafileBundle(@PathParam("fileId") String fileId, @QueryParam("fileMetadataId") Long fileMetadataId,@QueryParam("gbrecs") boolean gbrecs, @QueryParam("key") String apiToken, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) /*throws NotFoundException, ServiceUnavailableException, PermissionDeniedException, AuthorizationRequiredException*/ {
+    public BundleDownloadInstance datafileBundle(@Context ContainerRequestContext crc, @PathParam("fileId") String fileId, @QueryParam("fileMetadataId") Long fileMetadataId,@QueryParam("gbrecs") boolean gbrecs, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) /*throws NotFoundException, ServiceUnavailableException, PermissionDeniedException, AuthorizationRequiredException*/ {
  
 
         GuestbookResponse gbr = null;
         
         DataFile df = findDataFileOrDieWrapper(fileId);
         
-        if (apiToken == null || apiToken.equals("")) {
-            apiToken = headers.getHeaderString(API_KEY_HEADER);
-        }
-        
         // This will throw a ForbiddenException if access isn't authorized: 
-        checkAuthorization(df, apiToken);
+        checkAuthorization(getRequestUser(crc), df);
         
         if (gbrecs != true && df.isReleased()){
             // Write Guestbook record if not done previously and file is released
-            User apiTokenUser = findAPITokenUser(apiToken);
+            //This calls findUserOrDie which will retrieve the key param or api token header, or the workflow token header.
+            User apiTokenUser = findAPITokenUser(getRequestUser(crc));
             gbr = guestbookResponseService.initAPIGuestbookResponse(df.getOwner(), df, session, apiTokenUser);
             guestbookResponseService.save(gbr);
-            MakeDataCountEntry entry = new MakeDataCountEntry(uriInfo, headers, dvRequestService, df);                                        
+            MakeDataCountEntry entry = new MakeDataCountEntry(uriInfo, headers, dvRequestService, df);
             mdcLogService.logEntry(entry);
         }
         
@@ -262,11 +253,27 @@ private DataFile findDataFileOrDieWrapper(String fileId){
     }
         
             
-    @Path("datafile/{fileId}")
     @GET
-    @Produces({"application/xml"})
-    public DownloadInstance datafile(@PathParam("fileId") String fileId, @QueryParam("gbrecs") boolean gbrecs, @QueryParam("key") String apiToken, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) /*throws NotFoundException, ServiceUnavailableException, PermissionDeniedException, AuthorizationRequiredException*/ {
-
+    @AuthRequired
+    @Path("datafile/{fileId:.+}")
+    @Produces({"application/xml","*/*"})
+    public Response datafile(@Context ContainerRequestContext crc, @PathParam("fileId") String fileId, @QueryParam("gbrecs") boolean gbrecs, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) /*throws NotFoundException, ServiceUnavailableException, PermissionDeniedException, AuthorizationRequiredException*/ {
+        
+        // check first if there's a trailing slash, and chop it: 
+        while (fileId.lastIndexOf('/') == fileId.length() - 1) {
+            fileId = fileId.substring(0, fileId.length() - 1);
+        }
+            
+        if (fileId.indexOf('/') > -1) {
+            // This is for embedding folder names into the Access API URLs;
+            // something like /api/access/datafile/folder/subfolder/1234
+            // instead of the normal /api/access/datafile/1234 notation. 
+            // this is supported only for recreating folders during recursive downloads - 
+            // i.e. they are embedded into the URL for the remote client like wget,
+            // but can be safely ignored here.
+            fileId = fileId.substring(fileId.lastIndexOf('/') + 1);
+        }
+                
         DataFile df = findDataFileOrDieWrapper(fileId);
         GuestbookResponse gbr = null;
         
@@ -275,20 +282,16 @@ public DownloadInstance datafile(@PathParam("fileId") String fileId, @QueryParam
             throw new NotFoundException(errorMessage);
             // (nobody should ever be using this API on a harvested DataFile)!
         }
-        
-        if (apiToken == null || apiToken.equals("")) {
-            apiToken = headers.getHeaderString(API_KEY_HEADER);
-        }
-         
+               
+        // This will throw a ForbiddenException if access isn't authorized: 
+        checkAuthorization(getRequestUser(crc), df);
+
         if (gbrecs != true && df.isReleased()){
             // Write Guestbook record if not done previously and file is released
-            User apiTokenUser = findAPITokenUser(apiToken);
+            User apiTokenUser = findAPITokenUser(getRequestUser(crc));
             gbr = guestbookResponseService.initAPIGuestbookResponse(df.getOwner(), df, session, apiTokenUser);
         }
-               
-        // This will throw a ForbiddenException if access isn't authorized: 
-        checkAuthorization(df, apiToken);
-        
+
         DownloadInfo dInfo = new DownloadInfo(df);
 
         logger.fine("checking if thumbnails are supported on this file.");
@@ -304,6 +307,11 @@ public DownloadInstance datafile(@PathParam("fileId") String fileId, @QueryParam
             dInfo.addServiceAvailable(new OptionalAccessService("preprocessed", "application/json", "format=prep", "Preprocessed data in JSON"));
             dInfo.addServiceAvailable(new OptionalAccessService("subset", "text/tab-separated-values", "variables=&lt;LIST&gt;", "Column-wise Subsetting"));
         }
+        String driverId = DataAccess.getStorageDriverFromIdentifier(df.getStorageIdentifier());
+        if(systemConfig.isGlobusFileDownload() && (GlobusAccessibleStore.acceptsGlobusTransfers(driverId) || GlobusAccessibleStore.allowsGlobusReferences(driverId))) {
+            dInfo.addServiceAvailable(new OptionalAccessService("GlobusTransfer", df.getContentType(), "format=GlobusTransfer", "Download via Globus"));
+        }
+        
         DownloadInstance downloadInstance = new DownloadInstance(dInfo);
         downloadInstance.setRequestUriInfo(uriInfo);
         downloadInstance.setRequestHttpHeaders(headers);
@@ -323,6 +331,14 @@ public DownloadInstance datafile(@PathParam("fileId") String fileId, @QueryParam
             // So we need to identify when a service is being called and then let checkIfServiceSupportedAndSetConverter see if the required one exists
             if (key.equals("imageThumb") || key.equals("format") || key.equals("variables") || key.equals("noVarHeader")) {
                 serviceRequested = true;
+                //In the dataset file table context a user is allowed to select original as the format
+                //for download
+                // if the dataset has tabular files - it should not be applied to instances 
+                // where the file selected is not tabular see #6972
+                if("format".equals(key) && "original".equals(value) && !df.isTabularData()) {
+                    serviceRequested = false;
+                    break;
+                }
                 //Only need to check if this key is associated with a service
                 if (downloadInstance.checkIfServiceSupportedAndSetConverter(key, value)) {
                     // this automatically sets the conversion parameters in
@@ -387,7 +403,10 @@ public DownloadInstance datafile(@PathParam("fileId") String fileId, @QueryParam
         /* 
          * Provide some browser-friendly headers: (?)
          */
-        return downloadInstance;
+        if (headers.getRequestHeaders().containsKey("Range")) {
+            return Response.status(Response.Status.PARTIAL_CONTENT).entity(downloadInstance).build();
+        }
+        return Response.ok(downloadInstance).build();
     }
     
     
@@ -398,11 +417,12 @@ public DownloadInstance datafile(@PathParam("fileId") String fileId, @QueryParam
     
     
     // Metadata format defaults to DDI:
-    @Path("datafile/{fileId}/metadata")
     @GET
+    @AuthRequired
+    @Path("datafile/{fileId}/metadata")
     @Produces({"text/xml"})
-    public String tabularDatafileMetadata(@PathParam("fileId") String fileId, @QueryParam("fileMetadataId") Long fileMetadataId, @QueryParam("exclude") String exclude, @QueryParam("include") String include, @Context HttpHeaders header, @Context HttpServletResponse response) throws NotFoundException, ServiceUnavailableException /*, PermissionDeniedException, AuthorizationRequiredException*/ {
-        return tabularDatafileMetadataDDI(fileId, fileMetadataId, exclude, include, header, response);
+    public String tabularDatafileMetadata(@Context ContainerRequestContext crc, @PathParam("fileId") String fileId, @QueryParam("fileMetadataId") Long fileMetadataId, @QueryParam("exclude") String exclude, @QueryParam("include") String include, @Context HttpHeaders header, @Context HttpServletResponse response) throws NotFoundException, ServiceUnavailableException /*, PermissionDeniedException, AuthorizationRequiredException*/ {
+        return tabularDatafileMetadataDDI(crc, fileId, fileMetadataId, exclude, include, header, response);
     }
     
     /* 
@@ -410,9 +430,10 @@ public String tabularDatafileMetadata(@PathParam("fileId") String fileId, @Query
      * which we are going to retire.
      */
     @Path("datafile/{fileId}/metadata/ddi")
+    @AuthRequired
     @GET
     @Produces({"text/xml"})
-    public String tabularDatafileMetadataDDI(@PathParam("fileId") String fileId,  @QueryParam("fileMetadataId") Long fileMetadataId, @QueryParam("exclude") String exclude, @QueryParam("include") String include, @Context HttpHeaders header, @Context HttpServletResponse response) throws NotFoundException, ServiceUnavailableException /*, PermissionDeniedException, AuthorizationRequiredException*/ {
+    public String tabularDatafileMetadataDDI(@Context ContainerRequestContext crc, @PathParam("fileId") String fileId, @QueryParam("fileMetadataId") Long fileMetadataId, @QueryParam("exclude") String exclude, @QueryParam("include") String include, @Context HttpHeaders header, @Context HttpServletResponse response) throws NotFoundException, ServiceUnavailableException /*, PermissionDeniedException, AuthorizationRequiredException*/ {
         String retValue = "";
 
         DataFile dataFile = null; 
@@ -423,7 +444,23 @@ public String tabularDatafileMetadataDDI(@PathParam("fileId") String fileId,  @Q
         if (!dataFile.isTabularData()) { 
            throw new BadRequestException("tabular data required");
         }
-        
+        if (FileUtil.isRetentionExpired(dataFile)) {
+            throw new BadRequestException("unable to download file with expired retention");
+        }
+        if (dataFile.isRestricted() || FileUtil.isActivelyEmbargoed(dataFile)) {
+            boolean hasPermissionToDownloadFile = false;
+            DataverseRequest dataverseRequest;
+            dataverseRequest = createDataverseRequest(getRequestUser(crc));
+            if (dataverseRequest != null && dataverseRequest.getUser() instanceof GuestUser) {
+                // We must be in the UI. Try to get a non-GuestUser from the session.
+                dataverseRequest = dvRequestService.getDataverseRequest();
+            }
+            hasPermissionToDownloadFile = permissionService.requestOn(dataverseRequest, dataFile).has(Permission.DownloadFile);
+            if (!hasPermissionToDownloadFile) {
+                throw new BadRequestException("no permission to download file");
+            }
+        }
+
         response.setHeader("Content-disposition", "attachment; filename=\"dataverse_files.zip\"");
 
         FileMetadata fm = null;
@@ -460,98 +497,312 @@ public String tabularDatafileMetadataDDI(@PathParam("fileId") String fileId,  @Q
 
         return retValue;
     }
-    
-    @Path("variable/{varId}/metadata/ddi")
-    @GET
-    @Produces({ "application/xml" })
-
-    public String dataVariableMetadataDDI(@PathParam("varId") Long varId, @QueryParam("fileMetadataId") Long fileMetadataId, @QueryParam("exclude") String exclude, @QueryParam("include") String include, @Context HttpHeaders header, @Context HttpServletResponse response) /*throws NotFoundException, ServiceUnavailableException, PermissionDeniedException, AuthorizationRequiredException*/ {
-        String retValue = "";
-        
-        ByteArrayOutputStream outStream = null;
-        try {
-            outStream = new ByteArrayOutputStream();
 
-            ddiExportService.exportDataVariable(
-                    varId,
-                    outStream,
-                    exclude,
-                    include,
-                    fileMetadataId);
-        } catch (Exception e) {
-            // For whatever reason we've failed to generate a partial 
-            // metadata record requested. We simply return an empty string.
-            return retValue;
-        }
 
-        retValue = outStream.toString();
-        
-        return retValue; 
+    /*
+     * GET method for retrieving a list of auxiliary files associated with 
+     * a tabular datafile.
+     */
+    
+    @GET
+    @AuthRequired
+    @Path("datafile/{fileId}/auxiliary")
+    public Response listDatafileMetadataAux(@Context ContainerRequestContext crc,
+                                            @PathParam("fileId") String fileId,
+                                            @Context UriInfo uriInfo,
+                                            @Context HttpHeaders headers,
+                                            @Context HttpServletResponse response) throws ServiceUnavailableException {
+        return listAuxiliaryFiles(getRequestUser(crc), fileId, null, uriInfo, headers, response);
     }
+    /*
+     * GET method for retrieving a list auxiliary files associated with
+     * a tabular datafile and having the specified origin.
+     */
+
+    @GET
+    @AuthRequired
+    @Path("datafile/{fileId}/auxiliary/{origin}")
+    public Response listDatafileMetadataAuxByOrigin(@Context ContainerRequestContext crc,
+                                                    @PathParam("fileId") String fileId,
+                                                    @PathParam("origin") String origin,
+                                                    @Context UriInfo uriInfo,
+                                                    @Context HttpHeaders headers,
+                                                    @Context HttpServletResponse response) throws ServiceUnavailableException {
+        return listAuxiliaryFiles(getRequestUser(crc), fileId, origin, uriInfo, headers, response);
+    } 
     
+    private Response listAuxiliaryFiles(User user, String fileId, String origin, UriInfo uriInfo, HttpHeaders headers, HttpServletResponse response) {
+          DataFile df = findDataFileOrDieWrapper(fileId);
+
+        List<AuxiliaryFile> auxFileList = auxiliaryFileService.findAuxiliaryFiles(df, origin);
+
+        if (auxFileList == null || auxFileList.isEmpty()) {
+            throw new NotFoundException("No Auxiliary files exist for datafile " + fileId + (origin==null ? "": " and the specified origin"));
+        }
+        boolean isAccessAllowed = isAccessAuthorized(user, df);
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        auxFileList.forEach(auxFile -> {
+            if (isAccessAllowed || auxFile.getIsPublic()) {
+                NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+                job.add("formatTag", auxFile.getFormatTag());
+                job.add("formatVersion", auxFile.getFormatVersion());
+                job.add("fileSize", auxFile.getFileSize());
+                job.add("contentType", auxFile.getContentType());
+                job.add("isPublic", auxFile.getIsPublic());
+                job.add("type", auxFile.getType());
+                jab.add(job);
+            }
+        });
+        return ok(jab);
+    }
+
     /*
-     * "Preprocessed data" metadata format:
-     * (this was previously provided as a "format conversion" option of the 
-     * file download form of the access API call)
+     * GET method for retrieving various auxiliary files associated with 
+     * a tabular datafile.
+     *
      */
     
-    @Path("datafile/{fileId}/metadata/preprocessed")
     @GET
-    @Produces({"text/xml"})
-    
-    public DownloadInstance tabularDatafileMetadataPreprocessed(@PathParam("fileId") String fileId, @QueryParam("key") String apiToken, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) throws ServiceUnavailableException {
+    @AuthRequired
+    @Path("datafile/{fileId}/auxiliary/{formatTag}/{formatVersion}")
+    public DownloadInstance downloadAuxiliaryFile(@Context ContainerRequestContext crc,
+                                                  @PathParam("fileId") String fileId,
+                                                  @PathParam("formatTag") String formatTag,
+                                                  @PathParam("formatVersion") String formatVersion,
+                                                  @Context UriInfo uriInfo,
+                                                  @Context HttpHeaders headers,
+                                                  @Context HttpServletResponse response) throws ServiceUnavailableException {
     
         DataFile df = findDataFileOrDieWrapper(fileId);
         
-        if (apiToken == null || apiToken.equals("")) {
-            apiToken = headers.getHeaderString(API_KEY_HEADER);
-        }
-        
-        // This will throw a ForbiddenException if access isn't authorized: 
-        checkAuthorization(df, apiToken);
         DownloadInfo dInfo = new DownloadInfo(df);
+        boolean publiclyAvailable = false; 
 
-        if (df.isTabularData()) {
+        DownloadInstance downloadInstance;
+        AuxiliaryFile auxFile = null;
+        
+        /* 
+          The special case for "preprocessed" metadata should not be here at all. 
+          Access to the format should be handled by the /api/access/datafile/{id}?format=prep
+          form exclusively (this is what Data Explorer has been using all along).
+          We may have advertised /api/access/datafile/{id}/metadata/preprocessed
+          in the past - but it has been broken since 5.3 anyway, since the /{formatVersion}
+          element was added to the @Path. 
+          Now that the api method has been renamed /api/access/datafile/{id}/auxiliary/..., 
+          nobody should be using it to access the "preprocessed" format. 
+          Leaving the special case below commented-out, for now. - L.A.
+        
+        // formatTag=preprocessed is handled as a special case. 
+        // This is (as of now) the only aux. tabular metadata format that Dataverse
+        // can generate (and cache) itself. (All the other formats served have 
+        // to be deposited first, by the @POST version of this API).
+        
+        if ("preprocessed".equals(formatTag)) {
             dInfo.addServiceAvailable(new OptionalAccessService("preprocessed", "application/json", "format=prep", "Preprocessed data in JSON"));
-        } else {
-            throw new BadRequestException("tabular data required");
+            downloadInstance = new DownloadInstance(dInfo);
+            if (downloadInstance.checkIfServiceSupportedAndSetConverter("format", "prep")) {
+                logger.fine("Preprocessed data for tabular file "+fileId);
+            }
+        } else { */
+        // All other (deposited) formats:
+        auxFile = auxiliaryFileService.lookupAuxiliaryFile(df, formatTag, formatVersion);
+
+        if (auxFile == null) {
+            throw new NotFoundException("Auxiliary metadata format " + formatTag + " is not available for datafile " + fileId);
         }
-        DownloadInstance downloadInstance = new DownloadInstance(dInfo);
-        if (downloadInstance.checkIfServiceSupportedAndSetConverter("format", "prep")) {
-            logger.fine("Preprocessed data for tabular file "+fileId);
+
+        // Don't consider aux file public unless data file is published.
+        if (auxFile.getIsPublic() && df.getPublicationDate() != null) {
+            publiclyAvailable = true;
+        }
+        downloadInstance = new DownloadInstance(dInfo);
+        downloadInstance.setAuxiliaryFile(auxFile);
+        /*}*/
+        
+        // Unless this format is explicitly authorized to be publicly available, 
+        // the following will check access authorization (based on the access rules
+        // as defined for the DataFile itself), and will throw a ForbiddenException 
+        // if access is denied:
+        if (!publiclyAvailable) {
+            checkAuthorization(getRequestUser(crc), df);
         }
         
         return downloadInstance;
     }
     
     /* 
-     * API method for downloading zipped bundles of multiple files:
+     * API method for downloading zipped bundles of multiple files. Uses POST to avoid long lists of file IDs that can make the URL longer than what's supported by browsers/servers
     */
     
-    // TODO: Rather than only supporting looking up files by their database IDs, consider supporting persistent identifiers.
-    @Path("datafiles/{fileIds}")
+    // TODO: Rather than only supporting looking up files by their database IDs,
+    // consider supporting persistent identifiers.
+    @POST
+    @AuthRequired
+    @Path("datafiles")
+    @Consumes("text/plain")
+    @Produces({ "application/zip" })
+    public Response postDownloadDatafiles(@Context ContainerRequestContext crc, String fileIds, @QueryParam("gbrecs") boolean gbrecs, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) throws WebApplicationException {
+        
+
+        return downloadDatafiles(getRequestUser(crc), fileIds, gbrecs, uriInfo, headers, response, null);
+    }
+
     @GET
+    @AuthRequired
+    @Path("dataset/{id}")
     @Produces({"application/zip"})
-    public Response datafiles(@PathParam("fileIds") String fileIds,  @QueryParam("gbrecs") boolean gbrecs, @QueryParam("key") String apiTokenParam, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) throws WebApplicationException /*throws NotFoundException, ServiceUnavailableException, PermissionDeniedException, AuthorizationRequiredException*/ {
+    public Response downloadAllFromLatest(@Context ContainerRequestContext crc, @PathParam("id") String datasetIdOrPersistentId, @QueryParam("gbrecs") boolean gbrecs, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) throws WebApplicationException {
+        try {
+            User user = getRequestUser(crc);
+            DataverseRequest req = createDataverseRequest(user);
+            final Dataset retrieved = findDatasetOrDie(datasetIdOrPersistentId);
+            if (!(user instanceof GuestUser)) {
+                // The reason we are only looking up a draft version for a NON-guest user
+                // is that we know that guest never has the Permission.ViewUnpublishedDataset. 
+                final DatasetVersion draft = versionService.getDatasetVersionById(retrieved.getId(), DatasetVersion.VersionState.DRAFT.toString());
+                if (draft != null && permissionService.requestOn(req, retrieved).has(Permission.ViewUnpublishedDataset)) {                    
+                    String fileIds = getFileIdsAsCommaSeparated(draft.getFileMetadatas());
+                    // We don't want downloads from Draft versions to be counted, 
+                    // so we are setting the gbrecs (aka "do not write guestbook response") 
+                    // variable accordingly:
+                    return downloadDatafiles(getRequestUser(crc), fileIds, true, uriInfo, headers, response, "draft");
+                }
+            }
+            
+            // OK, it was not the draft. Let's see if we can serve a published version.
+            
+            final DatasetVersion latest = versionService.getLatestReleasedVersionFast(retrieved.getId()); 
+            
+            // Make sure to throw a clean error code if we have failed to locate an 
+            // accessible version:
+            // (A "Not Found" would be more appropriate here, I believe, than a "Bad Request". 
+            // But we've been using the latter for a while, and it's a popular API... 
+            // and this return code is expected by our tests - so I'm choosing it to keep 
+            // -- L.A.)
+            
+            if (latest == null) {
+                return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.exception.dataset.not.found"));
+                //throw new NotFoundException();
+            }
+            
+            String fileIds = getFileIdsAsCommaSeparated(latest.getFileMetadatas());
+            return downloadDatafiles(getRequestUser(crc), fileIds, gbrecs, uriInfo, headers, response, latest.getFriendlyVersionNumber());
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("dataset/{id}/versions/{versionId}")
+    @Produces({"application/zip"})
+    public Response downloadAllFromVersion(@Context ContainerRequestContext crc, @PathParam("id") String datasetIdOrPersistentId, @PathParam("versionId") String versionId, @QueryParam("gbrecs") boolean gbrecs, @QueryParam("key") String apiTokenParam, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) throws WebApplicationException {
+        try {
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            final Dataset ds = execCommand(new GetDatasetCommand(req, findDatasetOrDie(datasetIdOrPersistentId)));
+            DatasetVersion dsv = execCommand(handleVersion(versionId, new Datasets.DsVersionHandler<Command<DatasetVersion>>() {
+
+                @Override
+                public Command<DatasetVersion> handleLatest() {
+                    return new GetLatestAccessibleDatasetVersionCommand(req, ds);
+                }
+
+                @Override
+                public Command<DatasetVersion> handleDraft() {
+                    return new GetDraftDatasetVersionCommand(req, ds);
+                }
+
+                @Override
+                public Command<DatasetVersion> handleSpecific(long major, long minor) {
+                    return new GetSpecificPublishedDatasetVersionCommand(req, ds, major, minor);
+                }
+
+                @Override
+                public Command<DatasetVersion> handleLatestPublished() {
+                    return new GetLatestPublishedDatasetVersionCommand(req, ds);
+                }
+            }));
+            if (dsv == null) {
+                // (A "Not Found" would be more appropriate here, I believe, than a "Bad Request". 
+                // But we've been using the latter for a while, and it's a popular API... 
+                // and this return code is expected by our tests - so I'm choosing it to keep 
+                // -- L.A.)
+                return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.exception.version.not.found"));
+            }
+            String fileIds = getFileIdsAsCommaSeparated(dsv.getFileMetadatas());
+            // We don't want downloads from Draft versions to be counted, 
+            // so we are setting the gbrecs (aka "do not write guestbook response") 
+            // variable accordingly:
+            if (dsv.isDraft()) {
+                gbrecs = true;
+            }
+            return downloadDatafiles(getRequestUser(crc), fileIds, gbrecs, uriInfo, headers, response, dsv.getFriendlyVersionNumber().toLowerCase());
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
 
-        long setLimit = systemConfig.getZipDownloadLimit();
-        if (!(setLimit > 0L)) {
-            setLimit = DataFileZipper.DEFAULT_ZIPFILE_LIMIT;
+    private static String getFileIdsAsCommaSeparated(List<FileMetadata> fileMetadatas) {
+        List<String> ids = new ArrayList<>();
+        for (FileMetadata fileMetadata : fileMetadatas) {
+            Long fileId = fileMetadata.getDataFile().getId();
+            ids.add(String.valueOf(fileId));
         }
+        return String.join(",", ids);
+    }
+    
+    private String generateMultiFileBundleName(Dataset dataset, String versionTag) {
+        String bundleName = DEFAULT_BUNDLE_NAME;
         
-        final long zipDownloadSizeLimit = setLimit; //to use via anon inner class
+        if (dataset != null && dataset.getGlobalId() != null) {
+            String protocol = dataset.getProtocol();
+            String authority = dataset.getAuthority().toLowerCase();
+            String identifier = dataset.getIdentifier().replace('/', '-').toLowerCase();
+                
+            if (versionTag != null) {
+                bundleName = protocol + "-" + authority + "-" + identifier + "_" + versionTag + ".zip"; 
+            } else {
+                bundleName = protocol + "-" + authority + "-" + identifier + ".zip";
+            }
+        }
         
+        return bundleName;
+    }
+
+    /*
+     * API method for downloading zipped bundles of multiple files:
+     */
+    @GET
+    @AuthRequired
+    @Path("datafiles/{fileIds}")
+    @Produces({"application/zip"})
+    public Response datafiles(@Context ContainerRequestContext crc, @PathParam("fileIds") String fileIds, @QueryParam("gbrecs") boolean gbrecs, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) throws WebApplicationException {
+        return downloadDatafiles(getRequestUser(crc), fileIds, gbrecs, uriInfo, headers, response, null);
+    }
+
+    private Response downloadDatafiles(User user, String rawFileIds, boolean donotwriteGBResponse, UriInfo uriInfo, HttpHeaders headers, HttpServletResponse response, String versionTag) throws WebApplicationException /* throws NotFoundException, ServiceUnavailableException, PermissionDeniedException, AuthorizationRequiredException*/ {
+        final long zipDownloadSizeLimit = systemConfig.getZipDownloadLimit();
+                
         logger.fine("setting zip download size limit to " + zipDownloadSizeLimit + " bytes.");
         
-        if (fileIds == null || fileIds.equals("")) {
+        if (rawFileIds == null || rawFileIds.equals("")) {
             throw new BadRequestException();
         }
-
-        String apiToken = (apiTokenParam == null || apiTokenParam.equals("")) 
-                ? headers.getHeaderString(API_KEY_HEADER) 
-                : apiTokenParam;
         
-        User apiTokenUser = findAPITokenUser(apiToken); //for use in adding gb records if necessary
+        final String fileIds;
+        if(rawFileIds.startsWith("fileIds=")) {
+            fileIds = rawFileIds.substring(8); // String "fileIds=" from the front
+        } else {
+            fileIds=rawFileIds;
+        }
+        /* Note - fileIds coming from the POST ends in '\n' and a ',' has been added after the last file id number and before a
+         * final '\n' - this stops the last item from being parsed in the fileIds.split(","); line below.
+         */
+        
+        String customZipServiceUrl = settingsService.getValueForKey(SettingsServiceBean.Key.CustomZipDownloadServiceUrl);
+        boolean useCustomZipService = customZipServiceUrl != null; 
+        
+        User apiTokenUser = findAPITokenUser(user); //for use in adding gb records if necessary
         
         Boolean getOrig = false;
         for (String key : uriInfo.getQueryParameters().keySet()) {
@@ -560,6 +811,24 @@ public Response datafiles(@PathParam("fileIds") String fileIds,  @QueryParam("gb
                 getOrig = true;
             }
         }
+        
+        if (useCustomZipService) {
+            URI redirect_uri = null; 
+            try {
+                redirect_uri = handleCustomZipDownload(user, customZipServiceUrl, fileIds, apiTokenUser, uriInfo, headers, donotwriteGBResponse, true);
+            } catch (WebApplicationException wae) {
+                throw wae;
+            }
+            
+            Response redirect = Response.seeOther(redirect_uri).build();
+            logger.fine("Issuing redirect to the file location on S3.");
+            throw new RedirectionException(redirect);
+
+        }
+        
+        // Not using the "custom service" - API will zip the file,  
+        // and stream the output, in the "normal" manner:
+        
         final boolean getOriginal = getOrig; //to use via anon inner class
         
         StreamingOutput stream = new StreamingOutput() {
@@ -578,7 +847,7 @@ public void write(OutputStream os) throws IOException,
                         logger.fine("token: " + fileIdParams[i]);
                         Long fileId = null;
                         try {
-                            fileId = new Long(fileIdParams[i]);
+                            fileId = Long.parseLong(fileIdParams[i]);
                         } catch (NumberFormatException nfe) {
                             fileId = null;
                         }
@@ -586,11 +855,11 @@ public void write(OutputStream os) throws IOException,
                             logger.fine("attempting to look up file id " + fileId);
                             DataFile file = dataFileService.find(fileId);
                             if (file != null) {
-                                if (isAccessAuthorized(file, apiToken)) { 
-                                    
+                                if (isAccessAuthorized(user, file)) {
+
                                     logger.fine("adding datafile (id=" + file.getId() + ") to the download list of the ZippedDownloadInstance.");
                                     //downloadInstance.addDataFile(file);
-                                    if (gbrecs != true && file.isReleased()){
+                                    if (donotwriteGBResponse != true && file.isReleased()){
                                         GuestbookResponse  gbr = guestbookResponseService.initAPIGuestbookResponse(file.getOwner(), file, session, apiTokenUser);
                                         guestbookResponseService.save(gbr);
                                         MakeDataCountEntry entry = new MakeDataCountEntry(uriInfo, headers, dvRequestService, file);                                        
@@ -602,8 +871,9 @@ public void write(OutputStream os) throws IOException,
                                         // to produce some output.
                                         zipper = new DataFileZipper(os);
                                         zipper.setFileManifest(fileManifest);
-                                        response.setHeader("Content-disposition", "attachment; filename=\"dataverse_files.zip\"");
-                                        response.setHeader("Content-Type", "application/zip; name=\"dataverse_files.zip\"");
+                                        String bundleName = generateMultiFileBundleName(file.getOwner(), versionTag);
+                                        response.setHeader("Content-disposition", "attachment; filename=\"" + bundleName + "\"");
+                                        response.setHeader("Content-Type", "application/zip; name=\"" + bundleName + "\"");
                                     }
                                     
                                     long size = 0L;
@@ -648,14 +918,22 @@ public void write(OutputStream os) throws IOException,
                                         
                                         zipper.addToManifest(fileName + " (" + mimeType + ") " + " skipped because the total size of the download bundle exceeded the limit of " + zipDownloadSizeLimit + " bytes.\r\n");
                                     }
-                                } else if(file.isRestricted()) {
-                                    if (zipper == null) {
-                                        fileManifest = fileManifest + file.getFileMetadata().getLabel() + " IS RESTRICTED AND CANNOT BE DOWNLOADED\r\n";
+                                } else { 
+                                    boolean embargoed = FileUtil.isActivelyEmbargoed(file);
+                                    boolean retentionExpired = FileUtil.isRetentionExpired(file);
+                                    if (file.isRestricted() || embargoed || retentionExpired) {
+                                        if (zipper == null) {
+                                            fileManifest = fileManifest + file.getFileMetadata().getLabel() + " IS "
+                                                    + (embargoed ? "EMBARGOED" : retentionExpired ? "RETENTIONEXPIRED" : "RESTRICTED")
+                                                    + " AND CANNOT BE DOWNLOADED\r\n";
+                                        } else {
+                                            zipper.addToManifest(file.getFileMetadata().getLabel() + " IS "
+                                                    + (embargoed ? "EMBARGOED" : retentionExpired ? "RETENTIONEXPIRED" : "RESTRICTED")
+                                                    + " AND CANNOT BE DOWNLOADED\r\n");
+                                        }
                                     } else {
-                                        zipper.addToManifest(file.getFileMetadata().getLabel() + " IS RESTRICTED AND CANNOT BE DOWNLOADED\r\n");
+                                        fileId = null;
                                     }
-                                } else {
-                                    fileId = null;
                                 }
                             
                             } if (null == fileId) {
@@ -702,8 +980,8 @@ public InputStream tempPreview(@PathParam("fileSystemId") String fileSystemId, @
 
     }*/
     
-    
-    
+        
+
     // TODO: Rather than only supporting looking up files by their database IDs, consider supporting persistent identifiers.
     @Path("fileCardImage/{fileId}")
     @GET
@@ -920,16 +1198,7 @@ private File getLogo(Dataverse dataverse) {
         
         DataverseTheme theme = dataverse.getDataverseTheme(); 
         if (theme != null && theme.getLogo() != null && !theme.getLogo().equals("")) {
-            Properties p = System.getProperties();
-            String domainRoot = p.getProperty("com.sun.aas.instanceRoot");
-  
-            if (domainRoot != null && !"".equals(domainRoot)) {
-                return new File (domainRoot + File.separator + 
-                    "docroot" + File.separator + 
-                    "logos" + File.separator + 
-                    dataverse.getLogoOwnerId() + File.separator + 
-                    theme.getLogo());
-            }
+            return ThemeWidgetFragment.getLogoDir(dataverse.getLogoOwnerId()).resolve(theme.getLogo()).toFile();
         }
             
         return null;         
@@ -958,6 +1227,127 @@ private String getWebappImageResource(String imageName) {
     }
     */
     
+    /**
+     * 
+     * @param fileId
+     * @param formatTag
+     * @param formatVersion
+     * @param origin
+     * @param isPublic
+     * @param type
+     * @param fileInputStream
+     * @param contentDispositionHeader
+     * @param formDataBodyPart
+     * @return 
+     *
+     */
+    @POST
+    @AuthRequired
+    @Path("datafile/{fileId}/auxiliary/{formatTag}/{formatVersion}")
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Produces("application/json")
+    @Operation(summary = "Save auxiliary file with version", 
+               description = "Saves an auxiliary file")
+    @APIResponses(value = {
+        @APIResponse(responseCode = "200",
+                    description = "File saved response"),
+        @APIResponse(responseCode = "403",
+                    description = "User not authorized to edit the dataset."),
+        @APIResponse(responseCode = "400",
+                    description = "File not found based on id.")
+    })
+    @Tag(name = "saveAuxiliaryFileWithVersion", 
+         description = "Save Auxiliary File With Version")
+    @RequestBody(content = @Content(mediaType = MediaType.MULTIPART_FORM_DATA))
+    public Response saveAuxiliaryFileWithVersion(@Context ContainerRequestContext crc,
+                                                 @PathParam("fileId") Long fileId,
+                                                 @PathParam("formatTag") String formatTag,
+                                                 @PathParam("formatVersion") String formatVersion,
+                                                 @FormDataParam("origin") String origin,
+                                                 @FormDataParam("isPublic") boolean isPublic,
+                                                 @FormDataParam("type") String type,
+                                                 @FormDataParam("file") final FormDataBodyPart formDataBodyPart,
+                                                 @FormDataParam("file") InputStream fileInputStream) {
+        AuthenticatedUser authenticatedUser;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(FORBIDDEN, "Authorized users only.");
+        }
+
+        DataFile dataFile = dataFileService.find(fileId);
+        if (dataFile == null) {
+            return error(BAD_REQUEST, "File not found based on id " + fileId + ".");
+        }
+        
+         if (!permissionService.userOn(authenticatedUser, dataFile.getOwner()).has(Permission.EditDataset)) {
+            return error(FORBIDDEN, "User not authorized to edit the dataset.");
+        }
+
+        MediaType mediaType = null;
+        if (formDataBodyPart != null) {
+            mediaType = formDataBodyPart.getMediaType();
+        }
+
+        AuxiliaryFile saved = auxiliaryFileService.processAuxiliaryFile(fileInputStream, dataFile, formatTag, formatVersion, origin, isPublic, type, mediaType);
+
+        if (saved!=null) {
+            return ok(json(saved));
+        } else {
+            return error(BAD_REQUEST, "Error saving Auxiliary file.");
+        }
+    }
+  
+    
+
+    /**
+     * 
+     * @param fileId
+     * @param formatTag
+     * @param formatVersion
+     * @param origin
+     * @param isPublic
+     * @param fileInputStream
+     * @param contentDispositionHeader
+     * @param formDataBodyPart
+     * @return 
+     */
+    @DELETE
+    @AuthRequired
+    @Path("datafile/{fileId}/auxiliary/{formatTag}/{formatVersion}")
+    public Response deleteAuxiliaryFileWithVersion(@Context ContainerRequestContext crc,
+                                                   @PathParam("fileId") Long fileId,
+                                                   @PathParam("formatTag") String formatTag,
+                                                   @PathParam("formatVersion") String formatVersion) {
+        AuthenticatedUser authenticatedUser;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(FORBIDDEN, "Authorized users only.");
+        }
+
+        DataFile dataFile = dataFileService.find(fileId);
+        if (dataFile == null) {
+            return error(BAD_REQUEST, "File not found based on id " + fileId + ".");
+        }
+
+        if (!permissionService.userOn(authenticatedUser, dataFile.getOwner()).has(Permission.EditDataset)) {
+            return error(FORBIDDEN, "User not authorized to edit the dataset.");
+        }
+
+        try {
+            auxiliaryFileService.deleteAuxiliaryFile(dataFile, formatTag, formatVersion);
+        } catch (FileNotFoundException e) {
+            throw new NotFoundException();
+        } catch(IOException io) {
+            throw new ServerErrorException("IO Exception trying remove auxiliary file", Response.Status.INTERNAL_SERVER_ERROR, io);
+        }
+
+        return ok("Auxiliary file deleted.");
+    }
+
+  
+    
     /**
      * Allow (or disallow) access requests to Dataset
      *
@@ -968,8 +1358,9 @@ private String getWebappImageResource(String imageName) {
      * @return
      */
     @PUT
+    @AuthRequired
     @Path("{id}/allowAccessRequest")
-    public Response allowAccessRequest(@PathParam("id") String datasetToAllowAccessId, String requestStr) {
+    public Response allowAccessRequest(@Context ContainerRequestContext crc, @PathParam("id") String datasetToAllowAccessId, String requestStr) {
 
         DataverseRequest dataverseRequest = null;
         Dataset dataset;
@@ -983,14 +1374,9 @@ public Response allowAccessRequest(@PathParam("id") String datasetToAllowAccessI
 
         boolean allowRequest = Boolean.valueOf(requestStr);
 
-        try {
-            dataverseRequest = createDataverseRequest(findUserOrDie());
-        } catch (WrappedResponse wr) {
-            List<String> args = Arrays.asList(wr.getLocalizedMessage());
-            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
-        }
+        dataverseRequest = createDataverseRequest(getRequestUser(crc));
 
-        dataset.getEditVersion().getTermsOfUseAndAccess().setFileAccessRequest(allowRequest);
+        dataset.getOrCreateEditVersion().getTermsOfUseAndAccess().setFileAccessRequest(allowRequest);
 
         try {
             engineSvc.submit(new UpdateDatasetVersionCommand(dataset, dataverseRequest));
@@ -1010,14 +1396,15 @@ public Response allowAccessRequest(@PathParam("id") String datasetToAllowAccessI
      *
      * @author sekmiller
      *
+     * @param crc
      * @param fileToRequestAccessId
-     * @param apiToken
      * @param headers
      * @return
      */
     @PUT
+    @AuthRequired
     @Path("/datafile/{id}/requestAccess")
-    public Response requestFileAccess(@PathParam("id") String fileToRequestAccessId, @Context HttpHeaders headers) {
+    public Response requestFileAccess(@Context ContainerRequestContext crc, @PathParam("id") String fileToRequestAccessId, @Context HttpHeaders headers) {
         
         DataverseRequest dataverseRequest;
         DataFile dataFile;
@@ -1029,6 +1416,10 @@ public Response requestFileAccess(@PathParam("id") String fileToRequestAccessId,
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.fileNotFound", args));
         }
 
+        if (FileUtil.isRetentionExpired(dataFile)) {
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.failure.retentionExpired"));
+        }
+
         if (!dataFile.getOwner().isFileAccessRequest()) {
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.requestsNotAccepted"));
         }
@@ -1036,18 +1427,18 @@ public Response requestFileAccess(@PathParam("id") String fileToRequestAccessId,
         AuthenticatedUser requestor;
 
         try {
-            requestor = findAuthenticatedUserOrDie();
+            requestor = getRequestAuthenticatedUserOrDie(crc);
             dataverseRequest = createDataverseRequest(requestor);
         } catch (WrappedResponse wr) {
             List<String> args = Arrays.asList(wr.getLocalizedMessage());
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
         }
-
-        if (isAccessAuthorized(dataFile, getRequestApiKey())) {
+        //Already have access
+        if (isAccessAuthorized(getRequestUser(crc), dataFile)) {
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.failure.invalidRequest"));
         }
 
-        if (dataFile.getFileAccessRequesters().contains(requestor)) {
+        if (dataFile.containsActiveFileAccessRequestFromUser(requestor)) {
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.failure.requestExists"));
         }
 
@@ -1074,8 +1465,9 @@ public Response requestFileAccess(@PathParam("id") String fileToRequestAccessId,
      * @return
      */
     @GET
+    @AuthRequired
     @Path("/datafile/{id}/listRequests")
-    public Response listFileAccessRequests(@PathParam("id") String fileToRequestAccessId, @Context HttpHeaders headers) {
+    public Response listFileAccessRequests(@Context ContainerRequestContext crc, @PathParam("id") String fileToRequestAccessId, @Context HttpHeaders headers) {
 
         DataverseRequest dataverseRequest;
 
@@ -1088,27 +1480,26 @@ public Response listFileAccessRequests(@PathParam("id") String fileToRequestAcce
         }
 
         try {
-            dataverseRequest = createDataverseRequest(findUserOrDie());
+            dataverseRequest = createDataverseRequest(getRequestAuthenticatedUserOrDie(crc));
         } catch (WrappedResponse wr) {
             List<String> args = Arrays.asList(wr.getLocalizedMessage());
-            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
+            return error(UNAUTHORIZED, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
         }
-
-        if (!(dataverseRequest.getAuthenticatedUser().isSuperuser() || permissionService.requestOn(dataverseRequest, dataFile.getOwner()).has(Permission.ManageDatasetPermissions))) {
-            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.rejectAccess.failure.noPermissions"));
+        if (!(dataverseRequest.getAuthenticatedUser().isSuperuser() || permissionService.requestOn(dataverseRequest, dataFile).has(Permission.ManageFilePermissions))) {
+            return error(FORBIDDEN, BundleUtil.getStringFromBundle("access.api.rejectAccess.failure.noPermissions"));
         }
 
-        List<AuthenticatedUser> requesters = dataFile.getFileAccessRequesters();
+        List<FileAccessRequest> requests = dataFile.getFileAccessRequests(FileAccessRequest.RequestState.CREATED);
 
-        if (requesters == null || requesters.isEmpty()) {
+        if (requests == null || requests.isEmpty()) {
             List<String> args = Arrays.asList(dataFile.getDisplayName());
-            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestList.noRequestsFound"));
+            return error(Response.Status.NOT_FOUND, BundleUtil.getStringFromBundle("access.api.requestList.noRequestsFound", args));
         }
 
         JsonArrayBuilder userArray = Json.createArrayBuilder();
 
-        for (AuthenticatedUser au : requesters) {
-            userArray.add(json(au));
+        for (FileAccessRequest fileAccessRequest : requests) {
+            userArray.add(json(fileAccessRequest.getRequester()));
         }
 
         return ok(userArray);
@@ -1120,15 +1511,16 @@ public Response listFileAccessRequests(@PathParam("id") String fileToRequestAcce
      *
      * @author sekmiller
      *
+     * @param crc
      * @param fileToRequestAccessId
      * @param identifier
-     * @param apiToken
      * @param headers
      * @return
      */
     @PUT
+    @AuthRequired
     @Path("/datafile/{id}/grantAccess/{identifier}")
-    public Response grantFileAccess(@PathParam("id") String fileToRequestAccessId, @PathParam("identifier") String identifier, @Context HttpHeaders headers) {
+    public Response grantFileAccess(@Context ContainerRequestContext crc, @PathParam("id") String fileToRequestAccessId, @PathParam("identifier") String identifier, @Context HttpHeaders headers) {
         
         DataverseRequest dataverseRequest;
         DataFile dataFile;
@@ -1147,18 +1539,15 @@ public Response grantFileAccess(@PathParam("id") String fileToRequestAccessId, @
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.grantAccess.noAssigneeFound", args));
         }
 
-        try {
-            dataverseRequest = createDataverseRequest(findUserOrDie());
-        } catch (WrappedResponse wr) {
-            List<String> args = Arrays.asList(identifier);
-            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
-        }
+        dataverseRequest = createDataverseRequest(getRequestUser(crc));
 
         DataverseRole fileDownloaderRole = roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER);
 
         try {
             engineSvc.submit(new AssignRoleCommand(ra, fileDownloaderRole, dataFile, dataverseRequest, null));
-            if (dataFile.getFileAccessRequesters().remove(ra)) {
+            FileAccessRequest far = dataFile.getAccessRequestForAssignee(ra);
+            if(far!=null) {
+                far.setStateGranted();
                 dataFileService.save(dataFile);
             }
 
@@ -1184,15 +1573,16 @@ public Response grantFileAccess(@PathParam("id") String fileToRequestAccessId, @
      *
      * @author sekmiller
      *
+     * @param crc
      * @param fileToRequestAccessId
      * @param identifier
-     * @param apiToken
      * @param headers
      * @return
      */
     @DELETE
+    @AuthRequired
     @Path("/datafile/{id}/revokeAccess/{identifier}")
-    public Response revokeFileAccess(@PathParam("id") String fileToRequestAccessId, @PathParam("identifier") String identifier, @Context HttpHeaders headers) {
+    public Response revokeFileAccess(@Context ContainerRequestContext crc, @PathParam("id") String fileToRequestAccessId, @PathParam("identifier") String identifier, @Context HttpHeaders headers) {
 
         DataverseRequest dataverseRequest;
         DataFile dataFile;
@@ -1204,12 +1594,7 @@ public Response revokeFileAccess(@PathParam("id") String fileToRequestAccessId,
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.fileNotFound", args));
         }
 
-        try {
-            dataverseRequest = createDataverseRequest(findUserOrDie());
-        } catch (WrappedResponse wr) {
-            List<String> args = Arrays.asList(wr.getLocalizedMessage());
-            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
-        }
+        dataverseRequest = createDataverseRequest(getRequestUser(crc));
 
         if (identifier == null || identifier.equals("")) {
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.noKey"));
@@ -1254,15 +1639,16 @@ public Response revokeFileAccess(@PathParam("id") String fileToRequestAccessId,
      *
      * @author sekmiller
      *
+     * @param crc
      * @param fileToRequestAccessId
      * @param identifier
-     * @param apiToken
      * @param headers
      * @return
      */
     @PUT
+    @AuthRequired
     @Path("/datafile/{id}/rejectAccess/{identifier}")
-    public Response rejectFileAccess(@PathParam("id") String fileToRequestAccessId, @PathParam("identifier") String identifier, @Context HttpHeaders headers) {
+    public Response rejectFileAccess(@Context ContainerRequestContext crc, @PathParam("id") String fileToRequestAccessId, @PathParam("identifier") String identifier, @Context HttpHeaders headers) {
 
         DataverseRequest dataverseRequest;
         DataFile dataFile;
@@ -1281,55 +1667,97 @@ public Response rejectFileAccess(@PathParam("id") String fileToRequestAccessId,
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.grantAccess.noAssigneeFound", args));
         }
 
-        try {
-            dataverseRequest = createDataverseRequest(findUserOrDie());
-        } catch (WrappedResponse wr) {
-            List<String> args = Arrays.asList(identifier);
-            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
-        }
-        
-        if (!(dataverseRequest.getAuthenticatedUser().isSuperuser() || permissionService.requestOn(dataverseRequest, dataFile.getOwner()).has(Permission.ManageDatasetPermissions))) {
+        dataverseRequest = createDataverseRequest(getRequestUser(crc));
+
+        if (!(dataverseRequest.getAuthenticatedUser().isSuperuser() || permissionService.requestOn(dataverseRequest, dataFile).has(Permission.ManageFilePermissions))) {
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.rejectAccess.failure.noPermissions"));
         }
-
-        if (dataFile.getFileAccessRequesters().contains(ra)) {
-            dataFile.getFileAccessRequesters().remove(ra);
+        FileAccessRequest far = dataFile.getAccessRequestForAssignee(ra);
+        if (far != null) {
+            far.setStateRejected();
             dataFileService.save(dataFile);
 
             try {
                 AuthenticatedUser au = (AuthenticatedUser) ra;
-                userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.REJECTFILEACCESS, dataFile.getOwner().getId());
+                userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()),
+                        UserNotification.Type.REJECTFILEACCESS, dataFile.getOwner().getId());
             } catch (ClassCastException e) {
-                //nothing to do here - can only send a notification to an authenticated user
+                // nothing to do here - can only send a notification to an authenticated user
             }
 
             List<String> args = Arrays.asList(dataFile.getDisplayName());
             return ok(BundleUtil.getStringFromBundle("access.api.rejectAccess.success.for.single.file", args));
-
         } else {
             List<String> args = Arrays.asList(dataFile.getDisplayName(), ra.getDisplayInfo().getTitle());
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.rejectFailure.noRequest", args));
         }
     }
-    
+
+    @GET
+    @AuthRequired
+    @Path("/datafile/{id}/userFileAccessRequested")
+    public Response getUserFileAccessRequested(@Context ContainerRequestContext crc, @PathParam("id") String dataFileId) {
+        DataFile dataFile;
+        AuthenticatedUser requestAuthenticatedUser;
+        try {
+            dataFile = findDataFileOrDie(dataFileId);
+            requestAuthenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        boolean fileAccessRequested = false;
+        List<FileAccessRequest> requests = dataFile.getFileAccessRequests();
+        for (FileAccessRequest fileAccessRequest : requests) {
+            if (fileAccessRequest.getRequester().getId().equals(requestAuthenticatedUser.getId())) {
+                fileAccessRequested = true;
+                break;
+            }
+        }
+        return ok(fileAccessRequested);
+    }
+
+    @GET
+    @AuthRequired
+    @Path("/datafile/{id}/userPermissions")
+    public Response getUserPermissionsOnFile(@Context ContainerRequestContext crc, @PathParam("id") String dataFileId) {
+        DataFile dataFile;
+        try {
+            dataFile = findDataFileOrDie(dataFileId);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+        User requestUser = getRequestUser(crc);
+        jsonObjectBuilder.add("canDownloadFile", permissionService.userOn(requestUser, dataFile).has(Permission.DownloadFile));
+        jsonObjectBuilder.add("canManageFilePermissions", permissionService.userOn(requestUser, dataFile).has(Permission.ManageFilePermissions));
+        jsonObjectBuilder.add("canEditOwnerDataset", permissionService.userOn(requestUser, dataFile.getOwner()).has(Permission.EditDataset));
+        return ok(jsonObjectBuilder);
+    }
+
     // checkAuthorization is a convenience method; it calls the boolean method
     // isAccessAuthorized(), the actual workhorse, tand throws a 403 exception if not.
     
-    private void checkAuthorization(DataFile df, String apiToken) throws WebApplicationException {
+    private void checkAuthorization(User user, DataFile df) throws WebApplicationException {
 
-        if (!isAccessAuthorized(df, apiToken)) {
+        if (!isAccessAuthorized(user, df)) {
             throw new ForbiddenException();
         }        
     }
     
 
-    
-    private boolean isAccessAuthorized(DataFile df, String apiToken) {
+    private boolean isAccessAuthorized(User requestUser, DataFile df) {
     // First, check if the file belongs to a released Dataset version: 
         
         boolean published = false; 
         
-        
+        //True if there's an embargo that hasn't yet expired
+        //In this state, we block access as though the file is restricted (even if it is not restricted)
+        boolean embargoed = FileUtil.isActivelyEmbargoed(df);
+        // access is also blocked for retention expired files
+        boolean retentionExpired = FileUtil.isRetentionExpired(df);
+        // No access ever if retention is expired
+        if(retentionExpired) return false;
+
         /*
         SEK 7/26/2018 for 3661 relying on the version state of the dataset versions
             to which this file is attached check to see if at least one is  RELEASED
@@ -1391,37 +1819,42 @@ private boolean isAccessAuthorized(DataFile df, String apiToken) {
             }
         }
         
-        if (!restricted) {
-            // And if they are not published, they can still be downloaded, if the user
+        
+
+        //The one case where we don't need to check permissions
+        if (!restricted && !embargoed && !retentionExpired && published) {
+            // If they are not published, they can still be downloaded, if the user
             // has the permission to view unpublished versions! (this case will 
             // be handled below)
-            if (published) { 
-                return true;
-            }
+            return true;
         }
         
-        User user = null;
+        //For permissions check decide if we have a session user, or an API user
+        User sessionUser = null;
         
         /** 
          * Authentication/authorization:
+         */
+
+        User apiUser = requestUser;
+
+        /*
+         * If API user is not authenticated, and a session user exists, we use that.
+         * If the API user indicates a GuestUser, we will use that if there's no session.
          * 
-         * note that the fragment below - that retrieves the session object
-         * and tries to find the user associated with the session - is really
-         * for logging/debugging purposes only; for practical purposes, it 
-         * would be enough to just call "permissionService.on(df).has(Permission.DownloadFile)"
-         * and the method does just that, tries to authorize for the user in 
-         * the current session (or guest user, if no session user is available):
+         * This is currently the only API call that supports sessions. If the rest of
+         * the API is opened up, the custom logic here wouldn't be needed.
          */
-        
-        if (session != null) {
+
+        if ((apiUser instanceof GuestUser) && session != null) {
             if (session.getUser() != null) {
-                if (session.getUser().isAuthenticated()) {
-                    user = session.getUser();
-                } else {
+                sessionUser = session.getUser();
+                apiUser = null;
+                //Fine logging
+                if (!session.getUser().isAuthenticated()) {
                     logger.fine("User associated with the session is not an authenticated user.");
                     if (session.getUser() instanceof PrivateUrlUser) {
                         logger.fine("User associated with the session is a PrivateUrlUser user.");
-                        user = session.getUser();
                     }
                     if (session.getUser() instanceof GuestUser) {
                         logger.fine("User associated with the session is indeed a guest user.");
@@ -1433,216 +1866,162 @@ private boolean isAccessAuthorized(DataFile df, String apiToken) {
         } else {
             logger.fine("Session is null.");
         } 
-        
-        User apiTokenUser = null;
-        
-        if ((apiToken != null)&&(apiToken.length()!=64)) {
-            // We'll also try to obtain the user information from the API token, 
-            // if supplied: 
-        
-            try {
-                logger.fine("calling apiTokenUser = findUserOrDie()...");
-                apiTokenUser = findUserOrDie();
-            } catch (WrappedResponse wr) {
-                logger.log(Level.FINE, "Message from findUserOrDie(): {0}", wr.getMessage());
-            }
-            
-            if (apiTokenUser == null) {
-                logger.warning("API token-based auth: Unable to find a user with the API token provided.");
-            }
+        //If we don't have a user, nothing more to do. (Note session could have returned GuestUser)
+        if (sessionUser == null && apiUser == null) {
+            logger.warning("Unable to find a user via session or with a token.");
+            return false;
         }
-        
-        // OK, let's revisit the case of non-restricted files, this time in        
-        // an unpublished version:         
-        // (if (published) was already addressed above)
-        
-        if (!restricted) {
+
+        /*
+         * Since published and not restricted/embargoed is handled above, the main split
+         * now is whether it is published or not. If it's published, the only case left
+         * is with restricted/embargoed. With unpublished, both the restricted/embargoed
+         * and not restricted/embargoed both get handled the same way.
+         */
+
+        DataverseRequest dvr = null;
+        if (apiUser != null) {
+            dvr = createDataverseRequest(apiUser);
+        } else {
+            // used in JSF context, user may be Guest
+            dvr = dvRequestService.getDataverseRequest();
+        }
+        if (!published) { // and restricted or embargoed (implied by earlier processing)
             // If the file is not published, they can still download the file, if the user
             // has the permission to view unpublished versions:
-            
-            if ( user != null ) {
-                // used in JSF context
-                if (permissionService.requestOn(dvRequestService.getDataverseRequest(), df.getOwner()).has(Permission.ViewUnpublishedDataset)) {
-                    // it's not unthinkable, that a null user (i.e., guest user) could be given
-                    // the ViewUnpublished permission!
-                    logger.log(Level.FINE, "Session-based auth: user {0} has access rights on the non-restricted, unpublished datafile.", user.getIdentifier());
-                    return true;
-                }
-            }
-
-            if (apiTokenUser != null) {
-                // used in an API context
-                if (permissionService.requestOn( createDataverseRequest(apiTokenUser), df.getOwner()).has(Permission.ViewUnpublishedDataset)) {
-                    logger.log(Level.FINE, "Session-based auth: user {0} has access rights on the non-restricted, unpublished datafile.", apiTokenUser.getIdentifier());
-                    return true;
-                }
-            }
 
-            // last option - guest user in either contexts
-            // Guset user is impled by the code above.
-            if ( permissionService.requestOn(dvRequestService.getDataverseRequest(), df.getOwner()).has(Permission.ViewUnpublishedDataset) ) {
+            // This line handles all three authenticated session user, token user, and guest cases.
+            if (permissionService.requestOn(dvr, df.getOwner()).has(Permission.ViewUnpublishedDataset)) {
+                // it's not unthinkable, that a GuestUser could be given
+                // the ViewUnpublished permission!
+                logger.log(Level.FINE,
+                        "Session-based auth: user {0} has access rights on the non-restricted, unpublished datafile.",
+                        dvr.getUser().getIdentifier());
                 return true;
             }
-                    
-            
-            // We don't want to return false just yet. 
-            // If all else fails, we'll want to use the special WorldMapAuth 
-            // token authentication before we give up. 
-            //return false;
-        } else {
-            
-            // OK, this is a restricted file. 
-            
-            boolean hasAccessToRestrictedBySession = false; 
-            boolean hasAccessToRestrictedByToken = false; 
-            
-            if (permissionService.on(df).has(Permission.DownloadFile)) {
-            // Note: PermissionServiceBean.on(Datafile df) will obtain the 
-            // User from the Session object, just like in the code fragment 
-            // above. That's why it's not passed along as an argument.
-                hasAccessToRestrictedBySession = true; 
-            } else if (apiTokenUser != null && permissionService.requestOn(createDataverseRequest(apiTokenUser), df).has(Permission.DownloadFile)) {
-                hasAccessToRestrictedByToken = true; 
-            }
-            
-            if (hasAccessToRestrictedBySession || hasAccessToRestrictedByToken) {
-                if (published) {
-                    if (hasAccessToRestrictedBySession) {
-                        if (user != null) {
-                            logger.log(Level.FINE, "Session-based auth: user {0} is granted access to the restricted, published datafile.", user.getIdentifier());
-                        } else {
-                            logger.fine("Session-based auth: guest user is granted access to the restricted, published datafile.");
-                        }
-                    } else {
-                        logger.log(Level.FINE, "Token-based auth: user {0} is granted access to the restricted, published datafile.", apiTokenUser.getIdentifier());
-                    }
-                    return true;
-                } else {
-                    // if the file is NOT published, we will let them download the 
-                    // file ONLY if they also have the permission to view 
-                    // unpublished versions:
-                    // Note that the code below does not allow a case where it is the
-                    // session user that has the permission on the file, and the API token 
-                    // user with the ViewUnpublished permission, or vice versa!
-                    if (hasAccessToRestrictedBySession) {
-                        if (permissionService.on(df.getOwner()).has(Permission.ViewUnpublishedDataset)) {
-                            if (user != null) {
-                                logger.log(Level.FINE, "Session-based auth: user {0} is granted access to the restricted, unpublished datafile.", user.getIdentifier());
-                            } else {
-                                logger.fine("Session-based auth: guest user is granted access to the restricted, unpublished datafile.");
-                            }
-                            return true;
-                        } 
-                    } else {
-                        if (apiTokenUser != null && permissionService.requestOn(createDataverseRequest(apiTokenUser), df.getOwner()).has(Permission.ViewUnpublishedDataset)) {
-                            logger.log(Level.FINE, "Token-based auth: user {0} is granted access to the restricted, unpublished datafile.", apiTokenUser.getIdentifier());
-                            return true;
-                        }
-                    }
-                }
+        } else { // published and restricted and/or embargoed
+            // This line also handles all three authenticated session user, token user, and guest cases.
+            if (permissionService.requestOn(dvr, df).has(Permission.DownloadFile)) {
+                return true;
             }
+        }
+        if (sessionUser != null) {
+            logger.log(Level.FINE, "Session-based auth: user {0} has NO access rights on the requested datafile.", sessionUser.getIdentifier());
         } 
         
-        
-        // And if all that failed, we'll still check if the download can be authorized based
-        // on the special WorldMap token:
+        if (apiUser != null) {
+            logger.log(Level.FINE, "Token-based auth: user {0} has NO access rights on the requested datafile.", apiUser.getIdentifier());
+        } 
+        return false; 
+    }   
+    
 
         
-        if ((apiToken != null)&&(apiToken.length()==64)){
-            /* 
-                WorldMap token check
-                - WorldMap tokens are 64 chars in length
-            
-                - Use the worldMapTokenServiceBean to verify token 
-                    and check permissions against the requested DataFile
-            */
-            if (!(this.worldMapTokenServiceBean.isWorldMapTokenAuthorizedForDataFileDownload(apiToken, df))){
-                return false;
+    private User findAPITokenUser(User requestUser) {
+        User apiTokenUser = requestUser;
+        /*
+         * The idea here is to not let a guest user coming from the request (which
+         * happens when there is no key/token, and which we want if there's no session)
+         * from overriding an authenticated session user.
+         */
+        if(apiTokenUser instanceof GuestUser) {
+            if(session!=null && session.getUser()!=null) {
+            //The apiTokenUser, if set, will override the sessionUser in permissions calcs, so set it to null if we have a session user
+            apiTokenUser=null;
             }
-            
-            // Yes! User may access file
-            //
-            logger.fine("WorldMap token-based auth: Token is valid for the requested datafile");
-            return true;
-            
-        } else if ((apiToken != null)&&(apiToken.length()!=64)) {
-            // Will try to obtain the user information from the API token, 
-            // if supplied: 
+        }
+        return apiTokenUser;
+    }
+
+    private URI handleCustomZipDownload(User user, String customZipServiceUrl, String fileIds, User apiTokenUser, UriInfo uriInfo, HttpHeaders headers, boolean donotwriteGBResponse, boolean orig) throws WebApplicationException {
+        
+        String zipServiceKey = null; 
+        Timestamp timestamp = null; 
         
+        String fileIdParams[] = fileIds.split(",");
+        int validIdCount = 0; 
+        int validFileCount = 0;
+        int downloadAuthCount = 0; 
+
+        if (fileIdParams == null || fileIdParams.length == 0) {
+            throw new BadRequestException();
+        }
+        
+        for (int i = 0; i < fileIdParams.length; i++) {
+            Long fileId = null;
             try {
-                logger.fine("calling user = findUserOrDie()...");
-                user = findUserOrDie();
-            } catch (WrappedResponse wr) {
-                logger.log(Level.FINE, "Message from findUserOrDie(): {0}", wr.getMessage());
+                fileId = Long.parseLong(fileIdParams[i]);
+                validIdCount++;
+            } catch (NumberFormatException nfe) {
+                fileId = null;
             }
-            
-            if (user == null) {
-                logger.warning("API token-based auth: Unable to find a user with the API token provided.");
-                return false;
-            } 
-            
-        if (permissionService.requestOn(createDataverseRequest(user), df).has(Permission.DownloadFile)) { 
-                if (published) {
-                    logger.log(Level.FINE, "API token-based auth: User {0} has rights to access the datafile.", user.getIdentifier());
-                    return true; 
-                } else {
-                    // if the file is NOT published, we will let them download the 
-                    // file ONLY if they also have the permission to view 
-                    // unpublished versions:
-                    if (permissionService.requestOn(createDataverseRequest(user), df.getOwner()).has(Permission.ViewUnpublishedDataset)) {
-                        logger.log(Level.FINE, "API token-based auth: User {0} has rights to access the (unpublished) datafile.", user.getIdentifier());
-                        return true;
-                    } else {
-                        logger.log(Level.FINE, "API token-based auth: User {0} is not authorized to access the (unpublished) datafile.", user.getIdentifier());
+            if (fileId != null) {
+                DataFile file = dataFileService.find(fileId);
+                if (file != null) {
+                    validFileCount++;
+                    if (isAccessAuthorized(user, file)) {
+                        logger.fine("adding datafile (id=" + file.getId() + ") to the download list of the ZippedDownloadInstance.");
+                        if (donotwriteGBResponse != true && file.isReleased()) {
+                            GuestbookResponse gbr = guestbookResponseService.initAPIGuestbookResponse(file.getOwner(), file, session, apiTokenUser);
+                            guestbookResponseService.save(gbr);
+                            MakeDataCountEntry entry = new MakeDataCountEntry(uriInfo, headers, dvRequestService, file);
+                            mdcLogService.logEntry(entry);
+                        }
+
+                        if (zipServiceKey == null) {
+                            zipServiceKey = fileDownloadService.generateServiceKey();
+                        }
+                        if (timestamp == null) {
+                            timestamp = new Timestamp(new Date().getTime());
+                        }
+
+                        fileDownloadService.addFileToCustomZipJob(zipServiceKey, file, timestamp, true);
+                        downloadAuthCount++;
                     }
                 }
-            } else {
-                logger.log(Level.FINE, "API token-based auth: User {0} is not authorized to access the datafile.", user.getIdentifier());
             }
-            
-            return false;
-        } 
-        
-        if (user != null) {
-            logger.log(Level.FINE, "Session-based auth: user {0} has NO access rights on the requested datafile.", user.getIdentifier());
-        } 
-        
-        if (apiTokenUser != null) {
-            logger.log(Level.FINE, "Token-based auth: user {0} has NO access rights on the requested datafile.", apiTokenUser.getIdentifier());
-        } 
+        }
+
+        if (validIdCount == 0) {
+            throw new BadRequestException();
+        }
         
-        if (user == null && apiTokenUser == null) {
-            logger.fine("Unauthenticated access: No guest access to the datafile.");
+        if (validFileCount == 0) {
+            // no supplied id translated into an existing DataFile
+            throw new NotFoundException();
         }
         
-        return false; 
-    }   
-    
-
+        if (downloadAuthCount == 0) {
+            // none of the DataFiles were authorized for download
+            throw new ForbiddenException();
+        }
         
-    private User findAPITokenUser(String apiToken) {
-        User apiTokenUser = null;
-
-        if ((apiToken != null) && (apiToken.length() != 64)) {
-            // We'll also try to obtain the user information from the API token, 
-            // if supplied: 
-
-            try {
-                logger.fine("calling apiTokenUser = findUserOrDie()...");
-                apiTokenUser = findUserOrDie();
-                return apiTokenUser;
-            } catch (WrappedResponse wr) {
-                logger.log(Level.FINE, "Message from findUserOrDie(): {0}", wr.getMessage());
-                return null;
-            }
-
+        URI redirectUri = null;
+        try {
+            redirectUri = new URI(customZipServiceUrl + "?" + zipServiceKey);
+        } catch (URISyntaxException use) {
+            throw new BadRequestException(); 
         }
-        return apiTokenUser;
+        return redirectUri;
     }
 
-
-
-            
-            
-            
+    @GET
+    @AuthRequired
+    @Produces({"image/png"})
+    @Path("dataverseFeaturedItemImage/{itemId}")
+    public InputStream getDataverseFeatureItemImage(@Context ContainerRequestContext crc, @PathParam("itemId") Long itemId) {
+        DataverseFeaturedItem dataverseFeaturedItem;
+        try {
+            dataverseFeaturedItem = execCommand(new GetDataverseFeaturedItemCommand(createDataverseRequest(getRequestUser(crc)), dataverseFeaturedItemServiceBean.findById(itemId)));
+        } catch (WrappedResponse wr) {
+            logger.warning("Cannot locate a dataverse featured item with id " + itemId);
+            return null;
+        }
+        try {
+            return dataverseFeaturedItemServiceBean.getImageFileAsInputStream(dataverseFeaturedItem);
+        } catch (IOException e) {
+            logger.warning("Error while obtaining the input stream for the image file associated with the dataverse featured item with id " + itemId);
+            return null;
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index 931eb29eb61..d55f582ecae 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -1,5 +1,8 @@
 package edu.harvard.iq.dataverse.api;
 
+import edu.harvard.iq.dataverse.BannerMessage;
+import edu.harvard.iq.dataverse.BannerMessageServiceBean;
+import edu.harvard.iq.dataverse.BannerMessageText;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.DataFileServiceBean;
 import edu.harvard.iq.dataverse.Dataset;
@@ -8,12 +11,20 @@
 import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
+import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DataverseSession;
 import edu.harvard.iq.dataverse.DvObject;
-import edu.harvard.iq.dataverse.EMailValidator;
+import edu.harvard.iq.dataverse.DvObjectServiceBean;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.cache.CacheFactoryBean;
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+import edu.harvard.iq.dataverse.validation.EMailValidator;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
-import edu.harvard.iq.dataverse.GlobalId;
-import edu.harvard.iq.dataverse.RoleAssignment;
+import edu.harvard.iq.dataverse.Template;
+import edu.harvard.iq.dataverse.TemplateServiceBean;
 import edu.harvard.iq.dataverse.UserServiceBean;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
 import edu.harvard.iq.dataverse.api.dto.RoleDTO;
@@ -29,74 +40,100 @@
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibUtil;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailData;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailException;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailInitResponse;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.dataaccess.DataAccessOption;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.engine.command.impl.AbstractSubmitToArchiveCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.PublishDataverseCommand;
 import edu.harvard.iq.dataverse.settings.Setting;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
 import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*;
 
 import java.io.InputStream;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.apache.commons.io.IOUtils;
 
 import java.util.List;
 import edu.harvard.iq.dataverse.authorization.AuthTestDataServiceBean;
+import edu.harvard.iq.dataverse.authorization.AuthenticationProvidersRegistrationServiceBean;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.UserRecordIdentifier;
+import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.dataset.DatasetUtil;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.MergeInAccountCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.ChangeUserIdentifierCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.DeactivateUserCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.DeleteRoleCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.DeleteTemplateCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RegisterDvObjectCommand;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.userdata.UserListMaker;
 import edu.harvard.iq.dataverse.userdata.UserListResult;
 import edu.harvard.iq.dataverse.util.ArchiverUtil;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.URLTokenUtil;
+import edu.harvard.iq.dataverse.util.UrlSignerUtil;
+
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.rolesToJson;
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.toJsonArray;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import javax.inject.Inject;
-import javax.persistence.Query;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.inject.Inject;
+import jakarta.json.JsonArray;
+import jakarta.persistence.Query;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.StreamingOutput;
+import java.nio.file.Paths;
+import java.util.TreeMap;
 
 /**
  * Where the secure, setup API calls live.
@@ -107,764 +144,961 @@
 @Path("admin")
 public class Admin extends AbstractApiBean {
 
-	private static final Logger logger = Logger.getLogger(Admin.class.getName());
-
-	@EJB
-	BuiltinUserServiceBean builtinUserService;
-	@EJB
-	ShibServiceBean shibService;
-	@EJB
-	AuthTestDataServiceBean authTestDataService;
-	@EJB
-	UserServiceBean userService;
-	@EJB
-	IngestServiceBean ingestService;
-	@EJB
-	DataFileServiceBean fileService;
-	@EJB
-	DatasetServiceBean datasetService;
-	@EJB
-	DatasetVersionServiceBean datasetversionService;
-        @Inject
-        DataverseRequestServiceBean dvRequestService;
-        @EJB
-        EjbDataverseEngine commandEngine;
-        @EJB
-        GroupServiceBean groupService;
-        @EJB
-        SettingsServiceBean settingsService;
-
-	// Make the session available
-	@Inject
-	DataverseSession session;
-
-	public static final String listUsersPartialAPIPath = "list-users";
-	public static final String listUsersFullAPIPath = "/api/admin/" + listUsersPartialAPIPath;
-
-	@Path("settings")
-	@GET
-	public Response listAllSettings() {
-		JsonObjectBuilder bld = jsonObjectBuilder();
-		settingsSvc.listAll().forEach(s -> bld.add(s.getName(), s.getContent()));
-		return ok(bld);
-	}
-
-	@Path("settings/{name}")
-	@PUT
-	public Response putSetting(@PathParam("name") String name, String content) {
-		Setting s = settingsSvc.set(name, content);
-		return ok(jsonObjectBuilder().add(s.getName(), s.getContent()));
-	}
-
-	@Path("settings/{name}/lang/{lang}")
-	@PUT
-	public Response putSetting(@PathParam("name") String name, @PathParam("lang") String lang, String content) {
-		Setting s = settingsSvc.set(name, lang, content);
-		return ok("Setting " + name + " - " + lang + " - added.");
-	}
-
-	@Path("settings/{name}")
-	@GET
-	public Response getSetting(@PathParam("name") String name) {
-		String s = settingsSvc.get(name);
-
-		return (s != null) ? ok(s) : notFound("Setting " + name + " not found");
-	}
-
-	@Path("settings/{name}")
-	@DELETE
-	public Response deleteSetting(@PathParam("name") String name) {
-		settingsSvc.delete(name);
-
-		return ok("Setting " + name + " deleted.");
-	}
-
-	@Path("settings/{name}/lang/{lang}")
-	@DELETE
-	public Response deleteSetting(@PathParam("name") String name, @PathParam("lang") String lang) {
-		settingsSvc.delete(name, lang);
-		return ok("Setting " + name + " - " + lang + " deleted.");
-	}
-
-	@Path("authenticationProviderFactories")
-	@GET
-	public Response listAuthProviderFactories() {
-		return ok(authSvc.listProviderFactories().stream()
-				.map(f -> jsonObjectBuilder().add("alias", f.getAlias()).add("info", f.getInfo()))
-				.collect(toJsonArray()));
-	}
-
-	@Path("authenticationProviders")
-	@GET
-	public Response listAuthProviders() {
-		return ok(em.createNamedQuery("AuthenticationProviderRow.findAll", AuthenticationProviderRow.class)
-				.getResultList().stream().map(r -> json(r)).collect(toJsonArray()));
-	}
-
-	@Path("authenticationProviders")
-	@POST
-	public Response addProvider(AuthenticationProviderRow row) {
-		try {
-			AuthenticationProviderRow managed = em.find(AuthenticationProviderRow.class, row.getId());
-			if (managed != null) {
-				managed = em.merge(row);
-			} else {
-				em.persist(row);
-				managed = row;
-			}
-			if (managed.isEnabled()) {
-				AuthenticationProvider provider = authSvc.loadProvider(managed);
-				authSvc.deregisterProvider(provider.getId());
-				authSvc.registerProvider(provider);
-			}
-			return created("/api/admin/authenticationProviders/" + managed.getId(), json(managed));
-		} catch (AuthorizationSetupException e) {
-			return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
-		}
-	}
-
-	@Path("authenticationProviders/{id}")
-	@GET
-	public Response showProvider(@PathParam("id") String id) {
-		AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
-		return (row != null) ? ok(json(row))
-				: error(Status.NOT_FOUND, "Can't find authetication provider with id '" + id + "'");
-	}
-
-	@POST
-	@Path("authenticationProviders/{id}/:enabled")
-	public Response enableAuthenticationProvider_deprecated(@PathParam("id") String id, String body) {
-		return enableAuthenticationProvider(id, body);
-	}
-
-	@PUT
-	@Path("authenticationProviders/{id}/enabled")
-	@Produces("application/json")
-	public Response enableAuthenticationProvider(@PathParam("id") String id, String body) {
-		body = body.trim();
-		if (!Util.isBoolean(body)) {
-			return error(Response.Status.BAD_REQUEST, "Illegal value '" + body + "'. Use 'true' or 'false'");
-		}
-		boolean enable = Util.isTrue(body);
-
-		AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
-		if (row == null) {
-			return notFound("Can't find authentication provider with id '" + id + "'");
-		}
-
-		row.setEnabled(enable);
-		em.merge(row);
-
-		if (enable) {
-			// enable a provider
-			if (authSvc.getAuthenticationProvider(id) != null) {
-				return ok(String.format("Authentication provider '%s' already enabled", id));
-			}
-			try {
-				authSvc.registerProvider(authSvc.loadProvider(row));
-				return ok(String.format("Authentication Provider %s enabled", row.getId()));
-
-			} catch (AuthenticationProviderFactoryNotFoundException ex) {
-				return notFound(String.format("Can't instantiate provider, as there's no factory with alias %s",
-						row.getFactoryAlias()));
-			} catch (AuthorizationSetupException ex) {
-				logger.log(Level.WARNING, "Error instantiating authentication provider: " + ex.getMessage(), ex);
-				return error(Status.INTERNAL_SERVER_ERROR,
-						String.format("Can't instantiate provider: %s", ex.getMessage()));
-			}
-
-		} else {
-			// disable a provider
-			authSvc.deregisterProvider(id);
-			return ok("Authentication Provider '" + id + "' disabled. "
-					+ (authSvc.getAuthenticationProviderIds().isEmpty()
-							? "WARNING: no enabled authentication providers left."
-							: ""));
-		}
-	}
-
-	@GET
-	@Path("authenticationProviders/{id}/enabled")
-	public Response checkAuthenticationProviderEnabled(@PathParam("id") String id) {
-		List<AuthenticationProviderRow> prvs = em
-				.createNamedQuery("AuthenticationProviderRow.findById", AuthenticationProviderRow.class)
-				.setParameter("id", id).getResultList();
-		if (prvs.isEmpty()) {
-			return notFound("Can't find a provider with id '" + id + "'.");
-		} else {
-			return ok(Boolean.toString(prvs.get(0).isEnabled()));
-		}
-	}
-
-	@DELETE
-	@Path("authenticationProviders/{id}/")
-	public Response deleteAuthenticationProvider(@PathParam("id") String id) {
-		authSvc.deregisterProvider(id);
-		AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
-		if (row != null) {
-			em.remove(row);
-		}
-
-		return ok("AuthenticationProvider " + id + " deleted. "
-				+ (authSvc.getAuthenticationProviderIds().isEmpty()
-						? "WARNING: no enabled authentication providers left."
-						: ""));
-	}
-
-	@GET
-	@Path("authenticatedUsers/{identifier}/")
-	public Response getAuthenticatedUser(@PathParam("identifier") String identifier) {
-		AuthenticatedUser authenticatedUser = authSvc.getAuthenticatedUser(identifier);
-		if (authenticatedUser != null) {
-			return ok(json(authenticatedUser));
-		}
-		return error(Response.Status.BAD_REQUEST, "User " + identifier + " not found.");
-	}
-
-	@DELETE
-	@Path("authenticatedUsers/{identifier}/")
-	public Response deleteAuthenticatedUser(@PathParam("identifier") String identifier) {
-		AuthenticatedUser user = authSvc.getAuthenticatedUser(identifier);
-		if (user != null) {
-			authSvc.deleteAuthenticatedUser(user.getId());
-			return ok("AuthenticatedUser " + identifier + " deleted. ");
-		}
-		return error(Response.Status.BAD_REQUEST, "User " + identifier + " not found.");
-	}
+    private static final Logger logger = Logger.getLogger(Admin.class.getName());
+
+    @EJB
+    AuthenticationProvidersRegistrationServiceBean authProvidersRegistrationSvc;
+    @EJB
+    BuiltinUserServiceBean builtinUserService;
+    @EJB
+    ShibServiceBean shibService;
+    @EJB
+    AuthTestDataServiceBean authTestDataService;
+    @EJB
+    UserServiceBean userService;
+    @EJB
+    IngestServiceBean ingestService;
+    @EJB
+    DataFileServiceBean fileService;
+    @EJB
+    DatasetServiceBean datasetService;
+    @EJB
+    DataverseServiceBean dataverseService;
+    @EJB
+    DvObjectServiceBean dvObjectService;
+    @EJB
+    DatasetVersionServiceBean datasetversionService;
+    @Inject
+    DataverseRequestServiceBean dvRequestService;
+    @EJB
+    EjbDataverseEngine commandEngine;
+    @EJB
+    GroupServiceBean groupService;
+    @EJB
+    SettingsServiceBean settingsService;
+    @EJB
+    DatasetVersionServiceBean datasetVersionService;
+    @EJB
+    ExplicitGroupServiceBean explicitGroupService;
+    @EJB
+    BannerMessageServiceBean bannerMessageService;
+    @EJB
+    TemplateServiceBean templateService;
+    @EJB
+    CacheFactoryBean cacheFactory;
+
+    // Make the session available
+    @Inject
+    DataverseSession session;
+
+    public static final String listUsersPartialAPIPath = "list-users";
+    public static final String listUsersFullAPIPath = "/api/admin/" + listUsersPartialAPIPath;
+
+    @Path("settings")
+    @GET
+    public Response listAllSettings() {
+        JsonObjectBuilder bld = jsonObjectBuilder();
+        settingsSvc.listAll().forEach(s -> bld.add(s.getName(), s.getContent()));
+        return ok(bld);
+    }
+
+    @Path("settings/{name}")
+    @PUT
+    public Response putSetting(@PathParam("name") String name, String content) {
+        Setting s = settingsSvc.set(name, content);
+        return ok(jsonObjectBuilder().add(s.getName(), s.getContent()));
+    }
+
+    @Path("settings/{name}/lang/{lang}")
+    @PUT
+    public Response putSettingLang(@PathParam("name") String name, @PathParam("lang") String lang, String content) {
+        Setting s = settingsSvc.set(name, lang, content);
+        return ok("Setting " + name + " - " + lang + " - added.");
+    }
+
+    @Path("settings/{name}")
+    @GET
+    public Response getSetting(@PathParam("name") String name) {
+        String s = settingsSvc.get(name);
+
+        return (s != null) ? ok(s) : notFound("Setting " + name + " not found");
+    }
+
+    @Path("settings/{name}")
+    @DELETE
+    public Response deleteSetting(@PathParam("name") String name) {
+        settingsSvc.delete(name);
+
+        return ok("Setting " + name + " deleted.");
+    }
+
+    @Path("settings/{name}/lang/{lang}")
+    @DELETE
+    public Response deleteSettingLang(@PathParam("name") String name, @PathParam("lang") String lang) {
+        settingsSvc.delete(name, lang);
+        return ok("Setting " + name + " - " + lang + " deleted.");
+    }
+        
+    @Path("template/{id}")
+    @DELETE
+    public Response deleteTemplate(@PathParam("id") long id) {
+        
+        AuthenticatedUser superuser = authSvc.getAdminUser();
+        if (superuser == null) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, "Cannot find superuser to execute DeleteTemplateCommand.");
+        }
+
+        Template doomed = templateService.find(id);
+        if (doomed == null) {
+            return error(Response.Status.NOT_FOUND, "Template with id " + id + " -  not found.");
+        }
+
+        Dataverse dv = doomed.getDataverse();
+        List <Dataverse> dataverseWDefaultTemplate = templateService.findDataversesByDefaultTemplateId(doomed.getId());
+
+        try {
+            commandEngine.submit(new DeleteTemplateCommand(createDataverseRequest(superuser), dv, doomed, dataverseWDefaultTemplate));
+        } catch (CommandException ex) {
+            Logger.getLogger(Admin.class.getName()).log(Level.SEVERE, null, ex);
+            return error(Response.Status.BAD_REQUEST, ex.getLocalizedMessage());
+        }
+
+        return ok("Template " + doomed.getName() + " deleted.");
+    }
+    
+    
+    @Path("templates")
+    @GET
+    public Response findAllTemplates() {
+        return findTemplates("");
+    }
+    
+    @Path("templates/{alias}")
+    @GET
+    public Response findTemplates(@PathParam("alias") String alias) {
+        List<Template> templates;
+
+            if (alias.isEmpty()) {
+                templates = templateService.findAll();
+            } else {
+                try{
+                    Dataverse owner = findDataverseOrDie(alias);
+                    templates = templateService.findByOwnerId(owner.getId());
+                } catch (WrappedResponse r){
+                    return r.getResponse();
+                }
+            }
+
+            JsonArrayBuilder container = Json.createArrayBuilder();
+            for (Template t : templates) {
+                JsonObjectBuilder bld = Json.createObjectBuilder();
+                bld.add("templateId", t.getId());
+                bld.add("templateName", t.getName());
+                Dataverse loopowner = t.getDataverse();
+                if (loopowner != null) {
+                    bld.add("owner", loopowner.getDisplayName());
+                } else {
+                    bld.add("owner", "This an orphan template, it may be safely removed");
+                }
+                container.add(bld);
+            }
+
+            return ok(container);
+
+        
+    }
+
+    @Path("authenticationProviderFactories")
+    @GET
+    public Response listAuthProviderFactories() {
+        return ok(authSvc.listProviderFactories().stream()
+                .map(f -> jsonObjectBuilder().add("alias", f.getAlias()).add("info", f.getInfo()))
+                .collect(toJsonArray()));
+    }
+
+    @Path("authenticationProviders")
+    @GET
+    public Response listAuthProviders() {
+        return ok(em.createNamedQuery("AuthenticationProviderRow.findAll", AuthenticationProviderRow.class)
+                .getResultList().stream().map(r -> json(r)).collect(toJsonArray()));
+    }
+
+    @Path("authenticationProviders")
+    @POST
+    public Response addProvider(AuthenticationProviderRow row) {
+        try {
+            AuthenticationProviderRow managed = em.find(AuthenticationProviderRow.class, row.getId());
+            if (managed != null) {
+                managed = em.merge(row);
+            } else {
+                em.persist(row);
+                managed = row;
+            }
+            if (managed.isEnabled()) {
+                AuthenticationProvider provider = authProvidersRegistrationSvc.loadProvider(managed);
+                authProvidersRegistrationSvc.deregisterProvider(provider.getId());
+                authProvidersRegistrationSvc.registerProvider(provider);
+            }
+            return created("/api/admin/authenticationProviders/" + managed.getId(), json(managed));
+        } catch (AuthorizationSetupException e) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
+
+    @Path("authenticationProviders/{id}")
+    @GET
+    public Response showProvider(@PathParam("id") String id) {
+        AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
+        return (row != null) ? ok(json(row))
+                : error(Status.NOT_FOUND, "Can't find authetication provider with id '" + id + "'");
+    }
+
+    @POST
+    @Path("authenticationProviders/{id}/:enabled")
+    public Response enableAuthenticationProvider_deprecated(@PathParam("id") String id, String body) {
+        return enableAuthenticationProvider(id, body);
+    }
+
+    @PUT
+    @Path("authenticationProviders/{id}/enabled")
+    @Produces("application/json")
+    public Response enableAuthenticationProvider(@PathParam("id") String id, String body) {
+        body = body.trim();
+        if (!Util.isBoolean(body)) {
+            return error(Response.Status.BAD_REQUEST, "Illegal value '" + body + "'. Use 'true' or 'false'");
+        }
+        boolean enable = Util.isTrue(body);
+
+        AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
+        if (row == null) {
+            return notFound("Can't find authentication provider with id '" + id + "'");
+        }
+
+        row.setEnabled(enable);
+        em.merge(row);
+
+        if (enable) {
+            // enable a provider
+            if (authSvc.getAuthenticationProvider(id) != null) {
+                return ok(String.format("Authentication provider '%s' already enabled", id));
+            }
+            try {
+                authProvidersRegistrationSvc.registerProvider(authProvidersRegistrationSvc.loadProvider(row));
+                return ok(String.format("Authentication Provider %s enabled", row.getId()));
+
+            } catch (AuthenticationProviderFactoryNotFoundException ex) {
+                return notFound(String.format("Can't instantiate provider, as there's no factory with alias %s",
+                        row.getFactoryAlias()));
+            } catch (AuthorizationSetupException ex) {
+                logger.log(Level.WARNING, "Error instantiating authentication provider: " + ex.getMessage(), ex);
+                return error(Status.INTERNAL_SERVER_ERROR,
+                        String.format("Can't instantiate provider: %s", ex.getMessage()));
+            }
+
+        } else {
+            // disable a provider
+            authProvidersRegistrationSvc.deregisterProvider(id);
+            return ok("Authentication Provider '" + id + "' disabled. "
+                    + (authSvc.getAuthenticationProviderIds().isEmpty()
+                            ? "WARNING: no enabled authentication providers left."
+                            : ""));
+        }
+    }
+
+    @GET
+    @Path("authenticationProviders/{id}/enabled")
+    public Response checkAuthenticationProviderEnabled(@PathParam("id") String id) {
+        List<AuthenticationProviderRow> prvs = em
+                .createNamedQuery("AuthenticationProviderRow.findById", AuthenticationProviderRow.class)
+                .setParameter("id", id).getResultList();
+        if (prvs.isEmpty()) {
+            return notFound("Can't find a provider with id '" + id + "'.");
+        } else {
+            return ok(Boolean.toString(prvs.get(0).isEnabled()));
+        }
+    }
+
+    @DELETE
+    @Path("authenticationProviders/{id}/")
+    public Response deleteAuthenticationProvider(@PathParam("id") String id) {
+        authProvidersRegistrationSvc.deregisterProvider(id);
+        AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
+        if (row != null) {
+            em.remove(row);
+        }
+
+        return ok("AuthenticationProvider " + id + " deleted. "
+                + (authSvc.getAuthenticationProviderIds().isEmpty()
+                        ? "WARNING: no enabled authentication providers left."
+                        : ""));
+    }
+
+    @GET
+    @Path("authenticatedUsers/{identifier}/")
+    public Response getAuthenticatedUserByIdentifier(@PathParam("identifier") String identifier) {
+        AuthenticatedUser authenticatedUser = authSvc.getAuthenticatedUser(identifier);
+        if (authenticatedUser != null) {
+            return ok(json(authenticatedUser));
+        }
+        return error(Response.Status.BAD_REQUEST, "User " + identifier + " not found.");
+    }
+
+    @DELETE
+    @Path("authenticatedUsers/{identifier}/")
+    public Response deleteAuthenticatedUser(@PathParam("identifier") String identifier) {
+        AuthenticatedUser user = authSvc.getAuthenticatedUser(identifier);
+        if (user != null) {
+            return deleteAuthenticatedUser(user);
+        }
+        return error(Response.Status.BAD_REQUEST, "User " + identifier + " not found.");
+    }
+    
+    @DELETE
+    @Path("authenticatedUsers/id/{id}/")
+    public Response deleteAuthenticatedUserById(@PathParam("id") Long id) {
+        AuthenticatedUser user = authSvc.findByID(id);
+        if (user != null) {
+            return deleteAuthenticatedUser(user);
+        }
+        return error(Response.Status.BAD_REQUEST, "User " + id + " not found.");
+    }
+
+    private Response deleteAuthenticatedUser(AuthenticatedUser au) {
+        
+        //getDeleteUserErrorMessages does all of the tests to see
+        //if the user is 'deletable' if it returns an empty string the user 
+        //can be safely deleted.
         
+        String errorMessages = authSvc.getDeleteUserErrorMessages(au);
+        
+        if (!errorMessages.isEmpty()) {
+            return badRequest(errorMessages);
+        }
         
+        //if the user is deletable we will delete access requests and group membership
+        // many-to-many relationships that couldn't be cascade deleted
+        authSvc.removeAuthentictedUserItems(au);
         
-	@POST
-	@Path("publishDataverseAsCreator/{id}")
-	public Response publishDataverseAsCreator(@PathParam("id") long id) {
-		try {
-			Dataverse dataverse = dataverseSvc.find(id);
-			if (dataverse != null) {
-				AuthenticatedUser authenticatedUser = dataverse.getCreator();
-				return ok(json(execCommand(
-						new PublishDataverseCommand(createDataverseRequest(authenticatedUser), dataverse))));
-			} else {
-				return error(Status.BAD_REQUEST, "Could not find dataverse with id " + id);
-			}
-		} catch (WrappedResponse wr) {
-			return wr.getResponse();
-		}
-	}
-
-	@Deprecated
-	@GET
-	@Path("authenticatedUsers")
-	public Response listAuthenticatedUsers() {
-		try {
-			AuthenticatedUser user = findAuthenticatedUserOrDie();
-			if (!user.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN, "Superusers only.");
-		}
-		JsonArrayBuilder userArray = Json.createArrayBuilder();
-		authSvc.findAllAuthenticatedUsers().stream().forEach((user) -> {
-			userArray.add(json(user));
-		});
-		return ok(userArray);
-	}
-
-	@GET
-	@Path(listUsersPartialAPIPath)
-	@Produces({ "application/json" })
-	public Response filterAuthenticatedUsers(@QueryParam("searchTerm") String searchTerm,
-			@QueryParam("selectedPage") Integer selectedPage, @QueryParam("itemsPerPage") Integer itemsPerPage) {
-
-		User authUser;
-		try {
-			authUser = this.findUserOrDie();
-		} catch (AbstractApiBean.WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN,
-					BundleUtil.getStringFromBundle("dashboard.list_users.api.auth.invalid_apikey"));
-		}
-
-		if (!authUser.isSuperuser()) {
-			return error(Response.Status.FORBIDDEN,
-					BundleUtil.getStringFromBundle("dashboard.list_users.api.auth.not_superuser"));
-		}
-
-		UserListMaker userListMaker = new UserListMaker(userService);
-
-		String sortKey = null;
-		UserListResult userListResult = userListMaker.runUserSearch(searchTerm, itemsPerPage, selectedPage, sortKey);
-
-		return ok(userListResult.toJSON());
-	}
-
-	/**
-	 * @todo Make this support creation of BuiltInUsers.
-	 *
-	 * @todo Add way more error checking. Only the happy path is tested by AdminIT.
-	 */
-	@POST
-	@Path("authenticatedUsers")
-	public Response createAuthenicatedUser(JsonObject jsonObject) {
-		logger.fine("JSON in: " + jsonObject);
-		String persistentUserId = jsonObject.getString("persistentUserId");
-		String identifier = jsonObject.getString("identifier");
-		String proposedAuthenticatedUserIdentifier = identifier.replaceFirst("@", "");
-		String firstName = jsonObject.getString("firstName");
-		String lastName = jsonObject.getString("lastName");
-		String emailAddress = jsonObject.getString("email");
-		String position = null;
-		String affiliation = null;
-		UserRecordIdentifier userRecordId = new UserRecordIdentifier(jsonObject.getString("authenticationProviderId"),
-				persistentUserId);
-		AuthenticatedUserDisplayInfo userDisplayInfo = new AuthenticatedUserDisplayInfo(firstName, lastName,
-				emailAddress, affiliation, position);
-		boolean generateUniqueIdentifier = true;
-		AuthenticatedUser authenticatedUser = authSvc.createAuthenticatedUser(userRecordId,
-				proposedAuthenticatedUserIdentifier, userDisplayInfo, true);
-		return ok(json(authenticatedUser));
-	}
+        authSvc.deleteAuthenticatedUser(au.getId());
+        return ok("AuthenticatedUser " + au.getIdentifier() + " deleted.");
+    }
+
+    @POST
+    @Path("authenticatedUsers/{identifier}/deactivate")
+    public Response deactivateAuthenticatedUser(@PathParam("identifier") String identifier) {
+        AuthenticatedUser user = authSvc.getAuthenticatedUser(identifier);
+        if (user != null) {
+            return deactivateAuthenticatedUser(user);
+        }
+        return error(Response.Status.BAD_REQUEST, "User " + identifier + " not found.");
+    }
+
+    @POST
+    @Path("authenticatedUsers/id/{id}/deactivate")
+    public Response deactivateAuthenticatedUserById(@PathParam("id") Long id) {
+        AuthenticatedUser user = authSvc.findByID(id);
+        if (user != null) {
+            return deactivateAuthenticatedUser(user);
+        }
+        return error(Response.Status.BAD_REQUEST, "User " + id + " not found.");
+    }
+
+    private Response deactivateAuthenticatedUser(AuthenticatedUser userToDisable) {
+        AuthenticatedUser superuser = authSvc.getAdminUser();
+        if (superuser == null) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, "Cannot find superuser to execute DeactivateUserCommand.");
+        }
+        try {
+            execCommand(new DeactivateUserCommand(createDataverseRequest(superuser), userToDisable));
+            return ok("User " + userToDisable.getIdentifier() + " deactivated.");
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @POST
+    @Path("publishDataverseAsCreator/{id}")
+    public Response publishDataverseAsCreator(@PathParam("id") long id) {
+        try {
+            Dataverse dataverse = dataverseSvc.find(id);
+            if (dataverse != null) {
+                AuthenticatedUser authenticatedUser = dataverse.getCreator();
+                return ok(json(execCommand(
+                        new PublishDataverseCommand(createDataverseRequest(authenticatedUser), dataverse))));
+            } else {
+                return error(Status.BAD_REQUEST, "Could not find dataverse with id " + id);
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @Deprecated
+    @GET
+    @AuthRequired
+    @Path("authenticatedUsers")
+    public Response listAuthenticatedUsers(@Context ContainerRequestContext crc) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        JsonArrayBuilder userArray = Json.createArrayBuilder();
+        authSvc.findAllAuthenticatedUsers().stream().forEach((user) -> {
+            userArray.add(json(user));
+        });
+        return ok(userArray);
+    }
+
+    @GET
+    @AuthRequired
+    @Path(listUsersPartialAPIPath)
+    @Produces({ "application/json" })
+    public Response filterAuthenticatedUsers(
+            @Context ContainerRequestContext crc,
+            @QueryParam("searchTerm") String searchTerm,
+            @QueryParam("selectedPage") Integer selectedPage,
+            @QueryParam("itemsPerPage") Integer itemsPerPage,
+            @QueryParam("sortKey") String sortKey
+    ) {
+
+        User authUser = getRequestUser(crc);
+
+        if (!authUser.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN,
+                    BundleUtil.getStringFromBundle("dashboard.list_users.api.auth.not_superuser"));
+        }
+
+        UserListMaker userListMaker = new UserListMaker(userService);
+
+        // String sortKey = null;
+        UserListResult userListResult = userListMaker.runUserSearch(searchTerm, itemsPerPage, selectedPage, sortKey);
+
+        return ok(userListResult.toJSON());
+    }
+
+    /**
+     * @todo Make this support creation of BuiltInUsers.
+     *
+     * @todo Add way more error checking. Only the happy path is tested by AdminIT.
+     */
+    @POST
+    @Path("authenticatedUsers")
+    public Response createAuthenicatedUser(JsonObject jsonObject) {
+        logger.fine("JSON in: " + jsonObject);
+        String persistentUserId = jsonObject.getString("persistentUserId");
+        String identifier = jsonObject.getString("identifier");
+        String proposedAuthenticatedUserIdentifier = identifier.replaceFirst("@", "");
+        String firstName = jsonObject.getString("firstName");
+        String lastName = jsonObject.getString("lastName");
+        String emailAddress = jsonObject.getString("email");
+        String position = null;
+        String affiliation = null;
+        UserRecordIdentifier userRecordId = new UserRecordIdentifier(jsonObject.getString("authenticationProviderId"),
+                persistentUserId);
+        AuthenticatedUserDisplayInfo userDisplayInfo = new AuthenticatedUserDisplayInfo(firstName, lastName,
+                emailAddress, affiliation, position);
+        boolean generateUniqueIdentifier = true;
+        AuthenticatedUser authenticatedUser = authSvc.createAuthenticatedUser(userRecordId,
+                proposedAuthenticatedUserIdentifier, userDisplayInfo, true);
+        return ok(json(authenticatedUser));
+    }
 
         //TODO: Delete this endpoint after 4.9.3. Was updated with change in docs. --MAD
-	/**
-	 * curl -X PUT -d "shib@mailinator.com"
-	 * http://localhost:8080/api/admin/authenticatedUsers/id/11/convertShibToBuiltIn
-	 *
-	 * @deprecated We have documented this API endpoint so we'll keep in around for
-	 *             a while but we should encourage everyone to switch to the
-	 *             "convertRemoteToBuiltIn" endpoint and then remove this
-	 *             Shib-specfic one.
-	 */
-	@PUT
-	@Path("authenticatedUsers/id/{id}/convertShibToBuiltIn")
-	@Deprecated
-	public Response convertShibUserToBuiltin(@PathParam("id") Long id, String newEmailAddress) {
-                try {
-                        AuthenticatedUser user = findAuthenticatedUserOrDie();
-			if (!user.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN, "Superusers only.");
-		}
-		try {
-			BuiltinUser builtinUser = authSvc.convertRemoteToBuiltIn(id, newEmailAddress);
-			if (builtinUser == null) {
-				return error(Response.Status.BAD_REQUEST, "User id " + id
-						+ " could not be converted from Shibboleth to BuiltIn. An Exception was not thrown.");
-			}
+    /**
+     * curl -X PUT -d "shib@mailinator.com"
+     * http://localhost:8080/api/admin/authenticatedUsers/id/11/convertShibToBuiltIn
+     *
+     * @deprecated We have documented this API endpoint so we'll keep in around for
+     *             a while but we should encourage everyone to switch to the
+     *             "convertRemoteToBuiltIn" endpoint and then remove this
+     *             Shib-specfic one.
+     */
+    @PUT
+    @AuthRequired
+    @Path("authenticatedUsers/id/{id}/convertShibToBuiltIn")
+    @Deprecated
+    public Response convertShibUserToBuiltin(@Context ContainerRequestContext crc, @PathParam("id") Long id, String newEmailAddress) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        try {
+            BuiltinUser builtinUser = authSvc.convertRemoteToBuiltIn(id, newEmailAddress);
+            if (builtinUser == null) {
+                return error(Response.Status.BAD_REQUEST, "User id " + id
+                        + " could not be converted from Shibboleth to BuiltIn. An Exception was not thrown.");
+            }
                         AuthenticatedUser authUser = authSvc.getAuthenticatedUser(builtinUser.getUserName());
-			JsonObjectBuilder output = Json.createObjectBuilder();
-			output.add("email", authUser.getEmail());
-			output.add("username", builtinUser.getUserName());
-			return ok(output);
-		} catch (Throwable ex) {
-			StringBuilder sb = new StringBuilder();
-			sb.append(ex + " ");
-			while (ex.getCause() != null) {
-				ex = ex.getCause();
-				sb.append(ex + " ");
-			}
-			String msg = "User id " + id
-					+ " could not be converted from Shibboleth to BuiltIn. Details from Exception: " + sb;
-			logger.info(msg);
-			return error(Response.Status.BAD_REQUEST, msg);
-		}
-	}
-
-	@PUT
-	@Path("authenticatedUsers/id/{id}/convertRemoteToBuiltIn")
-	public Response convertOAuthUserToBuiltin(@PathParam("id") Long id, String newEmailAddress) {
-                try {
-			AuthenticatedUser user = findAuthenticatedUserOrDie();
-			if (!user.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN, "Superusers only.");
-		}
-		try {
-			BuiltinUser builtinUser = authSvc.convertRemoteToBuiltIn(id, newEmailAddress);
+            JsonObjectBuilder output = Json.createObjectBuilder();
+            output.add("email", authUser.getEmail());
+            output.add("username", builtinUser.getUserName());
+            return ok(output);
+        } catch (Throwable ex) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(ex + " ");
+            while (ex.getCause() != null) {
+                ex = ex.getCause();
+                sb.append(ex + " ");
+            }
+            String msg = "User id " + id
+                    + " could not be converted from Shibboleth to BuiltIn. Details from Exception: " + sb;
+            logger.info(msg);
+            return error(Response.Status.BAD_REQUEST, msg);
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("authenticatedUsers/id/{id}/convertRemoteToBuiltIn")
+    public Response convertOAuthUserToBuiltin(@Context ContainerRequestContext crc, @PathParam("id") Long id, String newEmailAddress) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        try {
+            BuiltinUser builtinUser = authSvc.convertRemoteToBuiltIn(id, newEmailAddress);
                         //AuthenticatedUser authUser = authService.getAuthenticatedUser(aUser.getUserName());
-			if (builtinUser == null) {
-				return error(Response.Status.BAD_REQUEST, "User id " + id
-						+ " could not be converted from remote to BuiltIn. An Exception was not thrown.");
-			}
+            if (builtinUser == null) {
+                return error(Response.Status.BAD_REQUEST, "User id " + id
+                        + " could not be converted from remote to BuiltIn. An Exception was not thrown.");
+            }
                         AuthenticatedUser authUser = authSvc.getAuthenticatedUser(builtinUser.getUserName());
-			JsonObjectBuilder output = Json.createObjectBuilder();
-			output.add("email", authUser.getEmail());
-			output.add("username", builtinUser.getUserName());
-			return ok(output);
-		} catch (Throwable ex) {
-			StringBuilder sb = new StringBuilder();
-			sb.append(ex + " ");
-			while (ex.getCause() != null) {
-				ex = ex.getCause();
-				sb.append(ex + " ");
-			}
-			String msg = "User id " + id + " could not be converted from remote to BuiltIn. Details from Exception: "
-					+ sb;
-			logger.info(msg);
-			return error(Response.Status.BAD_REQUEST, msg);
-		}
-	}
-
-	/**
-	 * This is used in testing via AdminIT.java but we don't expect sysadmins to use
-	 * this.
-	 */
-	@Path("authenticatedUsers/convert/builtin2shib")
-	@PUT
-	public Response builtin2shib(String content) {
-		logger.info("entering builtin2shib...");
-		try {
-			AuthenticatedUser userToRunThisMethod = findAuthenticatedUserOrDie();
-			if (!userToRunThisMethod.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN, "Superusers only.");
-		}
-		boolean disabled = false;
-		if (disabled) {
-			return error(Response.Status.BAD_REQUEST, "API endpoint disabled.");
-		}
-		AuthenticatedUser builtInUserToConvert = null;
-		String emailToFind;
-		String password;
-		String authuserId = "0"; // could let people specify id on authuser table. probably better to let them
-									// tell us their
-		String newEmailAddressToUse;
-		try {
-			String[] args = content.split(":");
-			emailToFind = args[0];
-			password = args[1];
-			newEmailAddressToUse = args[2];
-			// authuserId = args[666];
-		} catch (ArrayIndexOutOfBoundsException ex) {
-			return error(Response.Status.BAD_REQUEST, "Problem with content <<<" + content + ">>>: " + ex.toString());
-		}
-		AuthenticatedUser existingAuthUserFoundByEmail = shibService.findAuthUserByEmail(emailToFind);
-		String existing = "NOT FOUND";
-		if (existingAuthUserFoundByEmail != null) {
-			builtInUserToConvert = existingAuthUserFoundByEmail;
-			existing = existingAuthUserFoundByEmail.getIdentifier();
-		} else {
-			long longToLookup = Long.parseLong(authuserId);
-			AuthenticatedUser specifiedUserToConvert = authSvc.findByID(longToLookup);
-			if (specifiedUserToConvert != null) {
-				builtInUserToConvert = specifiedUserToConvert;
-			} else {
-				return error(Response.Status.BAD_REQUEST,
-						"No user to convert. We couldn't find a *single* existing user account based on " + emailToFind
-								+ " and no user was found using specified id " + longToLookup);
-			}
-		}
-		String shibProviderId = ShibAuthenticationProvider.PROVIDER_ID;
-		Map<String, String> randomUser = authTestDataService.getRandomUser();
-		// String eppn = UUID.randomUUID().toString().substring(0, 8);
-		String eppn = randomUser.get("eppn");
-		String idPEntityId = randomUser.get("idp");
-		String notUsed = null;
-		String separator = "|";
-		UserIdentifier newUserIdentifierInLookupTable = new UserIdentifier(idPEntityId + separator + eppn, notUsed);
-		String overwriteFirstName = randomUser.get("firstName");
-		String overwriteLastName = randomUser.get("lastName");
-		String overwriteEmail = randomUser.get("email");
-		overwriteEmail = newEmailAddressToUse;
-		logger.info("overwriteEmail: " + overwriteEmail);
-		boolean validEmail = EMailValidator.isEmailValid(overwriteEmail, null);
-		if (!validEmail) {
-			// See https://github.com/IQSS/dataverse/issues/2998
-			return error(Response.Status.BAD_REQUEST, "invalid email: " + overwriteEmail);
-		}
-		/**
-		 * @todo If affiliation is not null, put it in RoleAssigneeDisplayInfo
-		 *       constructor.
-		 */
-		/**
-		 * Here we are exercising (via an API test) shibService.getAffiliation with the
-		 * TestShib IdP and a non-production DevShibAccountType.
-		 */
-		idPEntityId = ShibUtil.testShibIdpEntityId;
-		String overwriteAffiliation = shibService.getAffiliation(idPEntityId,
-				ShibServiceBean.DevShibAccountType.RANDOM);
-		logger.info("overwriteAffiliation: " + overwriteAffiliation);
-		/**
-		 * @todo Find a place to put "position" in the authenticateduser table:
-		 *       https://github.com/IQSS/dataverse/issues/1444#issuecomment-74134694
-		 */
-		String overwritePosition = "staff;student";
-		AuthenticatedUserDisplayInfo displayInfo = new AuthenticatedUserDisplayInfo(overwriteFirstName,
-				overwriteLastName, overwriteEmail, overwriteAffiliation, overwritePosition);
-		JsonObjectBuilder response = Json.createObjectBuilder();
-		JsonArrayBuilder problems = Json.createArrayBuilder();
-		if (password != null) {
-			response.add("password supplied", password);
-			boolean knowsExistingPassword = false;
-			BuiltinUser oldBuiltInUser = builtinUserService.findByUserName(builtInUserToConvert.getUserIdentifier());
-			if (oldBuiltInUser != null) {
-				String usernameOfBuiltinAccountToConvert = oldBuiltInUser.getUserName();
-				response.add("old username", usernameOfBuiltinAccountToConvert);
-				AuthenticatedUser authenticatedUser = authSvc.canLogInAsBuiltinUser(usernameOfBuiltinAccountToConvert,
-						password);
-				if (authenticatedUser != null) {
-					knowsExistingPassword = true;
-					AuthenticatedUser convertedUser = authSvc.convertBuiltInToShib(builtInUserToConvert, shibProviderId,
-							newUserIdentifierInLookupTable);
-					if (convertedUser != null) {
-						/**
-						 * @todo Display name is not being overwritten. Logic must be in Shib backing
-						 *       bean
-						 */
-						AuthenticatedUser updatedInfoUser = authSvc.updateAuthenticatedUser(convertedUser, displayInfo);
-						if (updatedInfoUser != null) {
-							response.add("display name overwritten with", updatedInfoUser.getName());
-						} else {
-							problems.add("couldn't update display info");
-						}
-					} else {
-						problems.add("unable to convert user");
-					}
-				}
-			} else {
-				problems.add("couldn't find old username");
-			}
-			if (!knowsExistingPassword) {
-				String message = "User doesn't know password.";
-				problems.add(message);
-				/**
-				 * @todo Someday we should make a errorResponse method that takes JSON arrays
-				 *       and objects.
-				 */
-				return error(Status.BAD_REQUEST, problems.build().toString());
-			}
-			// response.add("knows existing password", knowsExistingPassword);
-		}
-
-		response.add("user to convert", builtInUserToConvert.getIdentifier());
-		response.add("existing user found by email (prompt to convert)", existing);
-		response.add("changing to this provider", shibProviderId);
-		response.add("value to overwrite old first name", overwriteFirstName);
-		response.add("value to overwrite old last name", overwriteLastName);
-		response.add("value to overwrite old email address", overwriteEmail);
-		if (overwriteAffiliation != null) {
-			response.add("affiliation", overwriteAffiliation);
-		}
-		response.add("problems", problems);
-		return ok(response);
-	}
-
-	/**
-	 * This is used in testing via AdminIT.java but we don't expect sysadmins to use
-	 * this.
-	 */
-	@Path("authenticatedUsers/convert/builtin2oauth")
-	@PUT
-	public Response builtin2oauth(String content) {
-		logger.info("entering builtin2oauth...");
-		try {
-			AuthenticatedUser userToRunThisMethod = findAuthenticatedUserOrDie();
-			if (!userToRunThisMethod.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN, "Superusers only.");
-		}
-		boolean disabled = false;
-		if (disabled) {
-			return error(Response.Status.BAD_REQUEST, "API endpoint disabled.");
-		}
-		AuthenticatedUser builtInUserToConvert = null;
-		String emailToFind;
-		String password;
-		String authuserId = "0"; // could let people specify id on authuser table. probably better to let them
-									// tell us their
-		String newEmailAddressToUse;
-		String newProviderId;
-		String newPersistentUserIdInLookupTable;
-		logger.info("content: " + content);
-		try {
-			String[] args = content.split(":");
-			emailToFind = args[0];
-			password = args[1];
-			newEmailAddressToUse = args[2];
-			newProviderId = args[3];
-			newPersistentUserIdInLookupTable = args[4];
-			// authuserId = args[666];
-		} catch (ArrayIndexOutOfBoundsException ex) {
-			return error(Response.Status.BAD_REQUEST, "Problem with content <<<" + content + ">>>: " + ex.toString());
-		}
-		AuthenticatedUser existingAuthUserFoundByEmail = shibService.findAuthUserByEmail(emailToFind);
-		String existing = "NOT FOUND";
-		if (existingAuthUserFoundByEmail != null) {
-			builtInUserToConvert = existingAuthUserFoundByEmail;
-			existing = existingAuthUserFoundByEmail.getIdentifier();
-		} else {
-			long longToLookup = Long.parseLong(authuserId);
-			AuthenticatedUser specifiedUserToConvert = authSvc.findByID(longToLookup);
-			if (specifiedUserToConvert != null) {
-				builtInUserToConvert = specifiedUserToConvert;
-			} else {
-				return error(Response.Status.BAD_REQUEST,
-						"No user to convert. We couldn't find a *single* existing user account based on " + emailToFind
-								+ " and no user was found using specified id " + longToLookup);
-			}
-		}
-		// String shibProviderId = ShibAuthenticationProvider.PROVIDER_ID;
-		Map<String, String> randomUser = authTestDataService.getRandomUser();
-		// String eppn = UUID.randomUUID().toString().substring(0, 8);
-		String eppn = randomUser.get("eppn");
-		String idPEntityId = randomUser.get("idp");
-		String notUsed = null;
-		String separator = "|";
-		// UserIdentifier newUserIdentifierInLookupTable = new
-		// UserIdentifier(idPEntityId + separator + eppn, notUsed);
-		UserIdentifier newUserIdentifierInLookupTable = new UserIdentifier(newPersistentUserIdInLookupTable, notUsed);
-		String overwriteFirstName = randomUser.get("firstName");
-		String overwriteLastName = randomUser.get("lastName");
-		String overwriteEmail = randomUser.get("email");
-		overwriteEmail = newEmailAddressToUse;
-		logger.info("overwriteEmail: " + overwriteEmail);
-		boolean validEmail = EMailValidator.isEmailValid(overwriteEmail, null);
-		if (!validEmail) {
-			// See https://github.com/IQSS/dataverse/issues/2998
-			return error(Response.Status.BAD_REQUEST, "invalid email: " + overwriteEmail);
-		}
-		/**
-		 * @todo If affiliation is not null, put it in RoleAssigneeDisplayInfo
-		 *       constructor.
-		 */
-		/**
-		 * Here we are exercising (via an API test) shibService.getAffiliation with the
-		 * TestShib IdP and a non-production DevShibAccountType.
-		 */
-		// idPEntityId = ShibUtil.testShibIdpEntityId;
-		// String overwriteAffiliation = shibService.getAffiliation(idPEntityId,
-		// ShibServiceBean.DevShibAccountType.RANDOM);
-		String overwriteAffiliation = null;
-		logger.info("overwriteAffiliation: " + overwriteAffiliation);
-		/**
-		 * @todo Find a place to put "position" in the authenticateduser table:
-		 *       https://github.com/IQSS/dataverse/issues/1444#issuecomment-74134694
-		 */
-		String overwritePosition = "staff;student";
-		AuthenticatedUserDisplayInfo displayInfo = new AuthenticatedUserDisplayInfo(overwriteFirstName,
-				overwriteLastName, overwriteEmail, overwriteAffiliation, overwritePosition);
-		JsonObjectBuilder response = Json.createObjectBuilder();
-		JsonArrayBuilder problems = Json.createArrayBuilder();
-		if (password != null) {
-			response.add("password supplied", password);
-			boolean knowsExistingPassword = false;
-			BuiltinUser oldBuiltInUser = builtinUserService.findByUserName(builtInUserToConvert.getUserIdentifier());
-			if (oldBuiltInUser != null) {
-				String usernameOfBuiltinAccountToConvert = oldBuiltInUser.getUserName();
-				response.add("old username", usernameOfBuiltinAccountToConvert);
-				AuthenticatedUser authenticatedUser = authSvc.canLogInAsBuiltinUser(usernameOfBuiltinAccountToConvert,
-						password);
-				if (authenticatedUser != null) {
-					knowsExistingPassword = true;
-					AuthenticatedUser convertedUser = authSvc.convertBuiltInUserToRemoteUser(builtInUserToConvert,
-							newProviderId, newUserIdentifierInLookupTable);
-					if (convertedUser != null) {
-						/**
-						 * @todo Display name is not being overwritten. Logic must be in Shib backing
-						 *       bean
-						 */
-						AuthenticatedUser updatedInfoUser = authSvc.updateAuthenticatedUser(convertedUser, displayInfo);
-						if (updatedInfoUser != null) {
-							response.add("display name overwritten with", updatedInfoUser.getName());
-						} else {
-							problems.add("couldn't update display info");
-						}
-					} else {
-						problems.add("unable to convert user");
-					}
-				}
-			} else {
-				problems.add("couldn't find old username");
-			}
-			if (!knowsExistingPassword) {
-				String message = "User doesn't know password.";
-				problems.add(message);
-				/**
-				 * @todo Someday we should make a errorResponse method that takes JSON arrays
-				 *       and objects.
-				 */
-				return error(Status.BAD_REQUEST, problems.build().toString());
-			}
-			// response.add("knows existing password", knowsExistingPassword);
-		}
-
-		response.add("user to convert", builtInUserToConvert.getIdentifier());
-		response.add("existing user found by email (prompt to convert)", existing);
-		response.add("changing to this provider", newProviderId);
-		response.add("value to overwrite old first name", overwriteFirstName);
-		response.add("value to overwrite old last name", overwriteLastName);
-		response.add("value to overwrite old email address", overwriteEmail);
-		if (overwriteAffiliation != null) {
-			response.add("affiliation", overwriteAffiliation);
-		}
-		response.add("problems", problems);
-		return ok(response);
-	}
-
-	@DELETE
-	@Path("authenticatedUsers/id/{id}/")
-	public Response deleteAuthenticatedUserById(@PathParam("id") Long id) {
-		AuthenticatedUser user = authSvc.findByID(id);
-		if (user != null) {
-			authSvc.deleteAuthenticatedUser(user.getId());
-			return ok("AuthenticatedUser " + id + " deleted. ");
-		}
-		return error(Response.Status.BAD_REQUEST, "User " + id + " not found.");
-	}
-
-	@Path("roles")
-	@POST
-	public Response createNewBuiltinRole(RoleDTO roleDto) {
-		ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.Admin, "createBuiltInRole")
-				.setInfo(roleDto.getAlias() + ":" + roleDto.getDescription());
-		try {
-			return ok(json(rolesSvc.save(roleDto.asRole())));
-		} catch (Exception e) {
-			alr.setActionResult(ActionLogRecord.Result.InternalError);
-			alr.setInfo(alr.getInfo() + "// " + e.getMessage());
-			return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
-		} finally {
-			actionLogSvc.log(alr);
-		}
-	}
-
-	@Path("roles")
-	@GET
-	public Response listBuiltinRoles() {
-		try {
-			return ok(rolesToJson(rolesSvc.findBuiltinRoles()));
-		} catch (Exception e) {
-			return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
-		}
-	}
-
-	@Path("superuser/{identifier}")
-	@POST
-	public Response toggleSuperuser(@PathParam("identifier") String identifier) {
-		ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.Admin, "toggleSuperuser")
-				.setInfo(identifier);
-		try {
-			AuthenticatedUser user = authSvc.getAuthenticatedUser(identifier);
-
-			user.setSuperuser(!user.isSuperuser());
-
-			return ok("User " + user.getIdentifier() + " " + (user.isSuperuser() ? "set" : "removed")
-					+ " as a superuser.");
-		} catch (Exception e) {
-			alr.setActionResult(ActionLogRecord.Result.InternalError);
-			alr.setInfo(alr.getInfo() + "// " + e.getMessage());
-			return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
-		} finally {
-			actionLogSvc.log(alr);
-		}
-	}
+            JsonObjectBuilder output = Json.createObjectBuilder();
+            output.add("email", authUser.getEmail());
+            output.add("username", builtinUser.getUserName());
+            return ok(output);
+        } catch (Throwable ex) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(ex + " ");
+            while (ex.getCause() != null) {
+                ex = ex.getCause();
+                sb.append(ex + " ");
+            }
+            String msg = "User id " + id + " could not be converted from remote to BuiltIn. Details from Exception: "
+                    + sb;
+            logger.info(msg);
+            return error(Response.Status.BAD_REQUEST, msg);
+        }
+    }
+
+    /**
+     * This is used in testing via AdminIT.java but we don't expect sysadmins to use
+     * this.
+     */
+    @PUT
+    @AuthRequired
+    @Path("authenticatedUsers/convert/builtin2shib")
+    public Response builtin2shib(@Context ContainerRequestContext crc, String content) {
+        logger.info("entering builtin2shib...");
+        try {
+            AuthenticatedUser userToRunThisMethod = getRequestAuthenticatedUserOrDie(crc);
+            if (!userToRunThisMethod.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        boolean disabled = false;
+        if (disabled) {
+            return error(Response.Status.BAD_REQUEST, "API endpoint disabled.");
+        }
+        AuthenticatedUser builtInUserToConvert = null;
+        String emailToFind;
+        String password;
+        String authuserId = "0"; // could let people specify id on authuser table. probably better to let them
+                                    // tell us their
+        String newEmailAddressToUse;
+        try {
+            String[] args = content.split(":");
+            emailToFind = args[0];
+            password = args[1];
+            newEmailAddressToUse = args[2];
+            // authuserId = args[666];
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            return error(Response.Status.BAD_REQUEST, "Problem with content <<<" + content + ">>>: " + ex.toString());
+        }
+        AuthenticatedUser existingAuthUserFoundByEmail = shibService.findAuthUserByEmail(emailToFind);
+        String existing = "NOT FOUND";
+        if (existingAuthUserFoundByEmail != null) {
+            builtInUserToConvert = existingAuthUserFoundByEmail;
+            existing = existingAuthUserFoundByEmail.getIdentifier();
+        } else {
+            long longToLookup = Long.parseLong(authuserId);
+            AuthenticatedUser specifiedUserToConvert = authSvc.findByID(longToLookup);
+            if (specifiedUserToConvert != null) {
+                builtInUserToConvert = specifiedUserToConvert;
+            } else {
+                return error(Response.Status.BAD_REQUEST,
+                        "No user to convert. We couldn't find a *single* existing user account based on " + emailToFind
+                                + " and no user was found using specified id " + longToLookup);
+            }
+        }
+        String shibProviderId = ShibAuthenticationProvider.PROVIDER_ID;
+        Map<String, String> randomUser = authTestDataService.getRandomUser();
+        // String eppn = UUID.randomUUID().toString().substring(0, 8);
+        String eppn = randomUser.get("eppn");
+        String idPEntityId = randomUser.get("idp");
+        String notUsed = null;
+        String separator = "|";
+        UserIdentifier newUserIdentifierInLookupTable = new UserIdentifier(idPEntityId + separator + eppn, notUsed);
+        String overwriteFirstName = randomUser.get("firstName");
+        String overwriteLastName = randomUser.get("lastName");
+        String overwriteEmail = randomUser.get("email");
+        overwriteEmail = newEmailAddressToUse;
+        logger.info("overwriteEmail: " + overwriteEmail);
+        boolean validEmail = EMailValidator.isEmailValid(overwriteEmail);
+        if (!validEmail) {
+            // See https://github.com/IQSS/dataverse/issues/2998
+            return error(Response.Status.BAD_REQUEST, "invalid email: " + overwriteEmail);
+        }
+        /**
+         * @todo If affiliation is not null, put it in RoleAssigneeDisplayInfo
+         *       constructor.
+         */
+        /**
+         * Here we are exercising (via an API test) shibService.getAffiliation with the
+         * TestShib IdP and a non-production DevShibAccountType.
+         */
+        idPEntityId = ShibUtil.testShibIdpEntityId;
+        String overwriteAffiliation = shibService.getAffiliation(idPEntityId,
+                ShibServiceBean.DevShibAccountType.RANDOM);
+        logger.info("overwriteAffiliation: " + overwriteAffiliation);
+        /**
+         * @todo Find a place to put "position" in the authenticateduser table:
+         *       https://github.com/IQSS/dataverse/issues/1444#issuecomment-74134694
+         */
+        String overwritePosition = "staff;student";
+        AuthenticatedUserDisplayInfo displayInfo = new AuthenticatedUserDisplayInfo(overwriteFirstName,
+                overwriteLastName, overwriteEmail, overwriteAffiliation, overwritePosition);
+        JsonObjectBuilder response = Json.createObjectBuilder();
+        JsonArrayBuilder problems = Json.createArrayBuilder();
+        if (password != null) {
+            response.add("password supplied", password);
+            boolean knowsExistingPassword = false;
+            BuiltinUser oldBuiltInUser = builtinUserService.findByUserName(builtInUserToConvert.getUserIdentifier());
+            if (oldBuiltInUser != null) {
+                                if (builtInUserToConvert.isDeactivated()) {
+                                        problems.add("builtin account has been deactivated");
+                                        return error(Status.BAD_REQUEST, problems.build().toString());
+                                }
+                String usernameOfBuiltinAccountToConvert = oldBuiltInUser.getUserName();
+                response.add("old username", usernameOfBuiltinAccountToConvert);
+                AuthenticatedUser authenticatedUser = authSvc.canLogInAsBuiltinUser(usernameOfBuiltinAccountToConvert,
+                        password);
+                if (authenticatedUser != null) {
+                    knowsExistingPassword = true;
+                    AuthenticatedUser convertedUser = authSvc.convertBuiltInToShib(builtInUserToConvert, shibProviderId,
+                            newUserIdentifierInLookupTable);
+                    if (convertedUser != null) {
+                        /**
+                         * @todo Display name is not being overwritten. Logic must be in Shib backing
+                         *       bean
+                         */
+                        AuthenticatedUser updatedInfoUser = authSvc.updateAuthenticatedUser(convertedUser, displayInfo);
+                        if (updatedInfoUser != null) {
+                            response.add("display name overwritten with", updatedInfoUser.getName());
+                        } else {
+                            problems.add("couldn't update display info");
+                        }
+                    } else {
+                        problems.add("unable to convert user");
+                    }
+                }
+            } else {
+                problems.add("couldn't find old username");
+            }
+            if (!knowsExistingPassword) {
+                String message = "User doesn't know password.";
+                problems.add(message);
+                /**
+                 * @todo Someday we should make a errorResponse method that takes JSON arrays
+                 *       and objects.
+                 */
+                return error(Status.BAD_REQUEST, problems.build().toString());
+            }
+            // response.add("knows existing password", knowsExistingPassword);
+        }
+
+        response.add("user to convert", builtInUserToConvert.getIdentifier());
+        response.add("existing user found by email (prompt to convert)", existing);
+        response.add("changing to this provider", shibProviderId);
+        response.add("value to overwrite old first name", overwriteFirstName);
+        response.add("value to overwrite old last name", overwriteLastName);
+        response.add("value to overwrite old email address", overwriteEmail);
+        if (overwriteAffiliation != null) {
+            response.add("affiliation", overwriteAffiliation);
+        }
+        response.add("problems", problems);
+        return ok(response);
+    }
+
+    /**
+     * This is used in testing via AdminIT.java but we don't expect sysadmins to use
+     * this.
+     */
+    @PUT
+    @AuthRequired
+    @Path("authenticatedUsers/convert/builtin2oauth")
+    public Response builtin2oauth(@Context ContainerRequestContext crc, String content) {
+        logger.info("entering builtin2oauth...");
+        try {
+            AuthenticatedUser userToRunThisMethod = getRequestAuthenticatedUserOrDie(crc);
+            if (!userToRunThisMethod.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        boolean disabled = false;
+        if (disabled) {
+            return error(Response.Status.BAD_REQUEST, "API endpoint disabled.");
+        }
+        AuthenticatedUser builtInUserToConvert = null;
+        String emailToFind;
+        String password;
+        String authuserId = "0"; // could let people specify id on authuser table. probably better to let them
+                                    // tell us their
+        String newEmailAddressToUse;
+        String newProviderId;
+        String newPersistentUserIdInLookupTable;
+        logger.info("content: " + content);
+        try {
+            String[] args = content.split(":");
+            emailToFind = args[0];
+            password = args[1];
+            newEmailAddressToUse = args[2];
+            newProviderId = args[3];
+            newPersistentUserIdInLookupTable = args[4];
+            // authuserId = args[666];
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            return error(Response.Status.BAD_REQUEST, "Problem with content <<<" + content + ">>>: " + ex.toString());
+        }
+        AuthenticatedUser existingAuthUserFoundByEmail = shibService.findAuthUserByEmail(emailToFind);
+        String existing = "NOT FOUND";
+        if (existingAuthUserFoundByEmail != null) {
+            builtInUserToConvert = existingAuthUserFoundByEmail;
+            existing = existingAuthUserFoundByEmail.getIdentifier();
+        } else {
+            long longToLookup = Long.parseLong(authuserId);
+            AuthenticatedUser specifiedUserToConvert = authSvc.findByID(longToLookup);
+            if (specifiedUserToConvert != null) {
+                builtInUserToConvert = specifiedUserToConvert;
+            } else {
+                return error(Response.Status.BAD_REQUEST,
+                        "No user to convert. We couldn't find a *single* existing user account based on " + emailToFind
+                                + " and no user was found using specified id " + longToLookup);
+            }
+        }
+        // String shibProviderId = ShibAuthenticationProvider.PROVIDER_ID;
+        Map<String, String> randomUser = authTestDataService.getRandomUser();
+        // String eppn = UUID.randomUUID().toString().substring(0, 8);
+        String eppn = randomUser.get("eppn");
+        String idPEntityId = randomUser.get("idp");
+        String notUsed = null;
+        String separator = "|";
+        // UserIdentifier newUserIdentifierInLookupTable = new
+        // UserIdentifier(idPEntityId + separator + eppn, notUsed);
+        UserIdentifier newUserIdentifierInLookupTable = new UserIdentifier(newPersistentUserIdInLookupTable, notUsed);
+        String overwriteFirstName = randomUser.get("firstName");
+        String overwriteLastName = randomUser.get("lastName");
+        String overwriteEmail = randomUser.get("email");
+        overwriteEmail = newEmailAddressToUse;
+        logger.info("overwriteEmail: " + overwriteEmail);
+        boolean validEmail = EMailValidator.isEmailValid(overwriteEmail);
+        if (!validEmail) {
+            // See https://github.com/IQSS/dataverse/issues/2998
+            return error(Response.Status.BAD_REQUEST, "invalid email: " + overwriteEmail);
+        }
+        /**
+         * @todo If affiliation is not null, put it in RoleAssigneeDisplayInfo
+         *       constructor.
+         */
+        /**
+         * Here we are exercising (via an API test) shibService.getAffiliation with the
+         * TestShib IdP and a non-production DevShibAccountType.
+         */
+        // idPEntityId = ShibUtil.testShibIdpEntityId;
+        // String overwriteAffiliation = shibService.getAffiliation(idPEntityId,
+        // ShibServiceBean.DevShibAccountType.RANDOM);
+        String overwriteAffiliation = null;
+        logger.info("overwriteAffiliation: " + overwriteAffiliation);
+        /**
+         * @todo Find a place to put "position" in the authenticateduser table:
+         *       https://github.com/IQSS/dataverse/issues/1444#issuecomment-74134694
+         */
+        String overwritePosition = "staff;student";
+        AuthenticatedUserDisplayInfo displayInfo = new AuthenticatedUserDisplayInfo(overwriteFirstName,
+                overwriteLastName, overwriteEmail, overwriteAffiliation, overwritePosition);
+        JsonObjectBuilder response = Json.createObjectBuilder();
+        JsonArrayBuilder problems = Json.createArrayBuilder();
+        if (password != null) {
+            response.add("password supplied", password);
+            boolean knowsExistingPassword = false;
+            BuiltinUser oldBuiltInUser = builtinUserService.findByUserName(builtInUserToConvert.getUserIdentifier());
+            if (oldBuiltInUser != null) {
+                String usernameOfBuiltinAccountToConvert = oldBuiltInUser.getUserName();
+                response.add("old username", usernameOfBuiltinAccountToConvert);
+                AuthenticatedUser authenticatedUser = authSvc.canLogInAsBuiltinUser(usernameOfBuiltinAccountToConvert,
+                        password);
+                if (authenticatedUser != null) {
+                    knowsExistingPassword = true;
+                    AuthenticatedUser convertedUser = authSvc.convertBuiltInUserToRemoteUser(builtInUserToConvert,
+                            newProviderId, newUserIdentifierInLookupTable);
+                    if (convertedUser != null) {
+                        /**
+                         * @todo Display name is not being overwritten. Logic must be in Shib backing
+                         *       bean
+                         */
+                        AuthenticatedUser updatedInfoUser = authSvc.updateAuthenticatedUser(convertedUser, displayInfo);
+                        if (updatedInfoUser != null) {
+                            response.add("display name overwritten with", updatedInfoUser.getName());
+                        } else {
+                            problems.add("couldn't update display info");
+                        }
+                    } else {
+                        problems.add("unable to convert user");
+                    }
+                }
+            } else {
+                problems.add("couldn't find old username");
+            }
+            if (!knowsExistingPassword) {
+                String message = "User doesn't know password.";
+                problems.add(message);
+                /**
+                 * @todo Someday we should make a errorResponse method that takes JSON arrays
+                 *       and objects.
+                 */
+                return error(Status.BAD_REQUEST, problems.build().toString());
+            }
+            // response.add("knows existing password", knowsExistingPassword);
+        }
+
+        response.add("user to convert", builtInUserToConvert.getIdentifier());
+        response.add("existing user found by email (prompt to convert)", existing);
+        response.add("changing to this provider", newProviderId);
+        response.add("value to overwrite old first name", overwriteFirstName);
+        response.add("value to overwrite old last name", overwriteLastName);
+        response.add("value to overwrite old email address", overwriteEmail);
+        if (overwriteAffiliation != null) {
+            response.add("affiliation", overwriteAffiliation);
+        }
+        response.add("problems", problems);
+        return ok(response);
+    }
+
+
+
+
+    @Path("roles")
+    @POST
+    public Response createNewBuiltinRole(RoleDTO roleDto) {
+        ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.Admin, "createBuiltInRole")
+                .setInfo(roleDto.getAlias() + ":" + roleDto.getDescription());
+        try {
+            return ok(json(rolesSvc.save(roleDto.asRole())));
+        } catch (Exception e) {
+            alr.setActionResult(ActionLogRecord.Result.InternalError);
+            alr.setInfo(alr.getInfo() + "// " + e.getMessage());
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        } finally {
+            actionLogSvc.log(alr);
+        }
+    }
+    @Path("roles/{id}")
+    @PUT
+    public Response updateBuiltinRole(RoleDTO roleDto, @PathParam("id") long roleId) {
+        ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.Admin, "updateBuiltInRole")
+                .setInfo(roleDto.getAlias() + ":" + roleDto.getDescription());
+        try {
+            DataverseRole role = roleDto.updateRoleFromDTO(rolesSvc.find(roleId));
+            return ok(json(rolesSvc.save(role)));
+        } catch (Exception e) {
+            alr.setActionResult(ActionLogRecord.Result.InternalError);
+            alr.setInfo(alr.getInfo() + "// " + e.getMessage());
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        } finally {
+            actionLogSvc.log(alr);
+        }
+    }
+
+    @Path("roles")
+    @GET
+    public Response listBuiltinRoles() {
+        try {
+            return ok(rolesToJson(rolesSvc.findBuiltinRoles()));
+        } catch (Exception e) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("roles/{id}")
+    public Response deleteRole(@Context ContainerRequestContext crc, @PathParam("id") String id) {
+
+        return response(req -> {
+            DataverseRole doomed = findRoleOrDie(id);
+            execCommand(new DeleteRoleCommand(req, doomed));
+            return ok("role " + doomed.getName() + " deleted.");
+        }, getRequestUser(crc));
+    }
+
+    @Path("superuser/{identifier}")
+    @Deprecated
+    @POST
+    public Response toggleSuperuser(@PathParam("identifier") String identifier) {
+        ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.Admin, "toggleSuperuser")
+                .setInfo(identifier);
+        try {
+            final AuthenticatedUser user = authSvc.getAuthenticatedUser(identifier);
+            return setSuperuserStatus(user, !user.isSuperuser());
+        } catch (Exception e) {
+            alr.setActionResult(ActionLogRecord.Result.InternalError);
+            alr.setInfo(alr.getInfo() + "// " + e.getMessage());
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        } finally {
+            actionLogSvc.log(alr);
+        }
+    }
+
+    private Response setSuperuserStatus(AuthenticatedUser user, Boolean isSuperuser) {
+        if (user.isDeactivated()) {
+            return error(Status.BAD_REQUEST, "You cannot make a deactivated user a superuser.");
+        }
+        user.setSuperuser(isSuperuser);
+        return ok("User " + user.getIdentifier() + " " + (user.isSuperuser() ? "set" : "removed")
+                + " as a superuser.");
+    }
+
+    @Path("superuser/{identifier}")
+    @PUT
+    // Using string instead of boolean so user doesn't need to add a Content-type header in their request
+    public Response setSuperuserStatus(@PathParam("identifier") String identifier, String isSuperuser) {
+        ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.Admin, "setSuperuserStatus")
+                .setInfo(identifier + ":" + isSuperuser);
+        try {
+            return setSuperuserStatus(authSvc.getAuthenticatedUser(identifier), StringUtil.isTrue(isSuperuser));
+        } catch (Exception e) {
+            alr.setActionResult(ActionLogRecord.Result.InternalError);
+            alr.setInfo(alr.getInfo() + "// " + e.getMessage());
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        } finally {
+            actionLogSvc.log(alr);
+        }
+    }
 
     @GET
     @Path("validate/datasets")
@@ -945,7 +1179,7 @@ public void write(OutputStream os) throws IOException,
                         os.write(",\n".getBytes());
                     }
 
-                    os.write(output.build().toString().getBytes("UTF8"));
+                    os.write(output.build().toString().getBytes(StandardCharsets.UTF_8));
                     
                     if (!wroteObject) {
                         wroteObject = true;
@@ -1001,146 +1235,210 @@ public Response validateDataset(@PathParam("id") String id, @QueryParam("variabl
         }
         return ok(msg);
     }
-
-	@Path("assignments/assignees/{raIdtf: .*}")
-	@GET
-	public Response getAssignmentsFor(@PathParam("raIdtf") String raIdtf) {
-
-		JsonArrayBuilder arr = Json.createArrayBuilder();
-		roleAssigneeSvc.getAssignmentsFor(raIdtf).forEach(a -> arr.add(json(a)));
-
-		return ok(arr);
-	}
-
-	/**
-	 * This method is used in integration tests.
-	 *
-	 * @param userId
-	 *            The database id of an AuthenticatedUser.
-	 * @return The confirm email token.
-	 */
-	@Path("confirmEmail/{userId}")
-	@GET
-	public Response getConfirmEmailToken(@PathParam("userId") long userId) {
-		AuthenticatedUser user = authSvc.findByID(userId);
-		if (user != null) {
-			ConfirmEmailData confirmEmailData = confirmEmailSvc.findSingleConfirmEmailDataByUser(user);
-			if (confirmEmailData != null) {
-				return ok(Json.createObjectBuilder().add("token", confirmEmailData.getToken()));
-			}
-		}
-		return error(Status.BAD_REQUEST, "Could not find confirm email token for user " + userId);
-	}
-
-	/**
-	 * This method is used in integration tests.
-	 *
-	 * @param userId
-	 *            The database id of an AuthenticatedUser.
-	 */
-	@Path("confirmEmail/{userId}")
-	@POST
-	public Response startConfirmEmailProcess(@PathParam("userId") long userId) {
-		AuthenticatedUser user = authSvc.findByID(userId);
-		if (user != null) {
-			try {
-				ConfirmEmailInitResponse confirmEmailInitResponse = confirmEmailSvc.beginConfirm(user);
-				ConfirmEmailData confirmEmailData = confirmEmailInitResponse.getConfirmEmailData();
-				return ok(Json.createObjectBuilder().add("tokenCreated", confirmEmailData.getCreated().toString())
-						.add("identifier", user.getUserIdentifier()));
-			} catch (ConfirmEmailException ex) {
-				return error(Status.BAD_REQUEST,
-						"Could not start confirm email process for user " + userId + ": " + ex.getLocalizedMessage());
-			}
-		}
-		return error(Status.BAD_REQUEST, "Could not find user based on " + userId);
-	}
-
-	/**
-	 * This method is used by an integration test in UsersIT.java to exercise bug
-	 * https://github.com/IQSS/dataverse/issues/3287 . Not for use by users!
-	 */
-	@Path("convertUserFromBcryptToSha1")
-	@POST
-	public Response convertUserFromBcryptToSha1(String json) {
-		JsonReader jsonReader = Json.createReader(new StringReader(json));
-		JsonObject object = jsonReader.readObject();
-		jsonReader.close();
-		BuiltinUser builtinUser = builtinUserService.find(new Long(object.getInt("builtinUserId")));
-		builtinUser.updateEncryptedPassword("4G7xxL9z11/JKN4jHPn4g9iIQck=", 0); // password is "sha-1Pass", 0 means
-																				// SHA-1
-		BuiltinUser savedUser = builtinUserService.save(builtinUser);
-		return ok("foo: " + savedUser);
-
-	}
-
-	@Path("permissions/{dvo}")
-	@GET
-	public Response findPermissonsOn(@PathParam("dvo") String dvo) {
-		try {
-			DvObject dvObj = findDvo(dvo);
-			if (dvObj == null) {
-				return notFound("DvObject " + dvo + " not found");
-			}
-			try {
-				User aUser = findUserOrDie();
-				JsonObjectBuilder bld = Json.createObjectBuilder();
-				bld.add("user", aUser.getIdentifier());
-				bld.add("permissions", json(permissionSvc.permissionsFor(createDataverseRequest(aUser), dvObj)));
-				return ok(bld);
-
-			} catch (WrappedResponse wr) {
-				return wr.getResponse();
-			}
-		} catch (Exception e) {
-			logger.log(Level.SEVERE, "Error while testing permissions", e);
-			return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
-		}
-	}
-
-	@Path("assignee/{idtf}")
-	@GET
-	public Response findRoleAssignee(@PathParam("idtf") String idtf) {
-		RoleAssignee ra = roleAssigneeSvc.getRoleAssignee(idtf);
-		return (ra == null) ? notFound("Role Assignee '" + idtf + "' not found.") : ok(json(ra.getDisplayInfo()));
-	}
-
-	@Path("datasets/integrity/{datasetVersionId}/fixmissingunf")
-	@POST
-	public Response fixUnf(@PathParam("datasetVersionId") String datasetVersionId,
-			@QueryParam("forceRecalculate") boolean forceRecalculate) {
-		JsonObjectBuilder info = datasetVersionSvc.fixMissingUnf(datasetVersionId, forceRecalculate);
-		return ok(info);
-	}
-
-	@Path("datafiles/integrity/fixmissingoriginaltypes")
-	@GET
-	public Response fixMissingOriginalTypes() {
-		JsonObjectBuilder info = Json.createObjectBuilder();
-
-		List<Long> affectedFileIds = fileService.selectFilesWithMissingOriginalTypes();
-
-		if (affectedFileIds.isEmpty()) {
-			info.add("message",
-					"All the tabular files in the database already have the original types set correctly; exiting.");
-		} else {
-			for (Long fileid : affectedFileIds) {
-				logger.info("found file id: " + fileid);
-			}
-			info.add("message", "Found " + affectedFileIds.size()
-					+ " tabular files with missing original types. Kicking off an async job that will repair the files in the background.");
-		}
-
-		ingestService.fixMissingOriginalTypes(affectedFileIds);
-
-		return ok(info);
-	}
-        
-    @Path("datafiles/integrity/fixmissingoriginalsizes")
+    
+    // This API does the same thing as /validateDataFileHashValue/{fileId}, 
+    // but for all the files in the dataset, with streaming output.
     @GET
-    public Response fixMissingOriginalSizes(@QueryParam("limit") Integer limit) {
-        JsonObjectBuilder info = Json.createObjectBuilder();
-
+    @Path("validate/dataset/files/{id}")
+    @Produces({"application/json"})
+    public Response validateDatasetDatafiles(@PathParam("id") String id) {
+        
+        Dataset dataset;
+        // First check if the dataset exists before starting the streaming output
+        try {
+            dataset = findDatasetOrDie(id);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse(); // This will return the proper 404 Not Found response
+        }
+        
+        // Streaming output: the API will start producing 
+        // the output right away, as it goes through the list 
+        // of the datafiles in the dataset.
+        // The streaming mechanism is modeled after validate/datasets API.
+        StreamingOutput stream = new StreamingOutput() {
+
+            @Override
+            public void write(OutputStream os) throws IOException,
+                    WebApplicationException {
+                
+                os.write("{\"dataFiles\": [\n".getBytes());
+                
+                boolean wroteObject = false;
+                for (DataFile dataFile : dataset.getFiles()) {
+
+                    boolean success = false;
+                     
+                    JsonObjectBuilder output = Json.createObjectBuilder();
+                    output.add("datafileId", dataFile.getId());
+                    output.add("storageIdentifier", dataFile.getStorageIdentifier());
+
+                    
+                    try {
+                        FileUtil.validateDataFileChecksum(dataFile);
+                        success = true;
+                    } catch (IOException ex) {
+                        output.add("status", "invalid");
+                        output.add("errorMessage", ex.getMessage());
+                    }
+                    
+                    if (success) {
+                        output.add("status", "valid");
+                    } 
+                    
+                    // write it out:
+                    
+                    if (wroteObject) {
+                        os.write(",\n".getBytes());
+                    }
+
+                    os.write(output.build().toString().getBytes(StandardCharsets.UTF_8));
+                    
+                    if (!wroteObject) {
+                        wroteObject = true;
+                    }
+                }
+                
+                os.write("\n]\n}\n".getBytes());
+            }
+            
+        };
+        return Response.ok(stream).build();
+    }
+
+    @Path("assignments/assignees/{raIdtf: .*}")
+    @GET
+    public Response getAssignmentsFor(@PathParam("raIdtf") String raIdtf) {
+
+        JsonArrayBuilder arr = Json.createArrayBuilder();
+        roleAssigneeSvc.getAssignmentsFor(raIdtf).forEach(a -> arr.add(json(a)));
+
+        return ok(arr);
+    }
+
+    /**
+     * This method is used in integration tests.
+     *
+     * @param userId
+     *            The database id of an AuthenticatedUser.
+     * @return The confirm email token.
+     */
+    @Path("confirmEmail/{userId}")
+    @GET
+    public Response getConfirmEmailToken(@PathParam("userId") long userId) {
+        AuthenticatedUser user = authSvc.findByID(userId);
+        if (user != null) {
+            ConfirmEmailData confirmEmailData = confirmEmailSvc.findSingleConfirmEmailDataByUser(user);
+            if (confirmEmailData != null) {
+                return ok(Json.createObjectBuilder().add("token", confirmEmailData.getToken()));
+            }
+        }
+        return error(Status.BAD_REQUEST, "Could not find confirm email token for user " + userId);
+    }
+
+    /**
+     * This method is used in integration tests.
+     *
+     * @param userId
+     *            The database id of an AuthenticatedUser.
+     */
+    @Path("confirmEmail/{userId}")
+    @POST
+    public Response startConfirmEmailProcess(@PathParam("userId") long userId) {
+        AuthenticatedUser user = authSvc.findByID(userId);
+        if (user != null) {
+            try {
+                ConfirmEmailInitResponse confirmEmailInitResponse = confirmEmailSvc.beginConfirm(user);
+                ConfirmEmailData confirmEmailData = confirmEmailInitResponse.getConfirmEmailData();
+                return ok(Json.createObjectBuilder().add("tokenCreated", confirmEmailData.getCreated().toString())
+                        .add("identifier", user.getUserIdentifier()));
+            } catch (ConfirmEmailException ex) {
+                return error(Status.BAD_REQUEST,
+                        "Could not start confirm email process for user " + userId + ": " + ex.getLocalizedMessage());
+            }
+        }
+        return error(Status.BAD_REQUEST, "Could not find user based on " + userId);
+    }
+
+    /**
+     * This method is used by an integration test in UsersIT.java to exercise bug
+     * https://github.com/IQSS/dataverse/issues/3287 . Not for use by users!
+     */
+    @Path("convertUserFromBcryptToSha1")
+    @POST
+    public Response convertUserFromBcryptToSha1(String json) {
+        JsonReader jsonReader = Json.createReader(new StringReader(json));
+        JsonObject object = jsonReader.readObject();
+        jsonReader.close();
+        BuiltinUser builtinUser = builtinUserService.find(new Long(object.getInt("builtinUserId")));
+        builtinUser.updateEncryptedPassword("4G7xxL9z11/JKN4jHPn4g9iIQck=", 0); // password is "sha-1Pass", 0 means
+                                                                                // SHA-1
+        BuiltinUser savedUser = builtinUserService.save(builtinUser);
+        return ok("foo: " + savedUser);
+
+    }
+
+    @Path("permissions/{dvo}")
+    @AuthRequired
+    @GET
+    public Response findPermissonsOn(@Context final ContainerRequestContext crc, @PathParam("dvo") final String dvo) {
+        try {
+            final DvObject dvObj = findDvo(dvo);
+            final User aUser = getRequestUser(crc);
+            final JsonObjectBuilder bld = Json.createObjectBuilder();
+            bld.add("user", aUser.getIdentifier());
+            bld.add("permissions", json(permissionSvc.permissionsFor(createDataverseRequest(aUser), dvObj)));
+            return ok(bld);
+        } catch (WrappedResponse r) {
+            return r.getResponse();
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "Error while testing permissions", e);
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
+
+    @Path("assignee/{idtf}")
+    @GET
+    public Response findRoleAssignee(@PathParam("idtf") String idtf) {
+        RoleAssignee ra = roleAssigneeSvc.getRoleAssignee(idtf);
+        return (ra == null) ? notFound("Role Assignee '" + idtf + "' not found.") : ok(json(ra.getDisplayInfo()));
+    }
+
+    @Path("datasets/integrity/{datasetVersionId}/fixmissingunf")
+    @POST
+    public Response fixUnf(@PathParam("datasetVersionId") String datasetVersionId,
+            @QueryParam("forceRecalculate") boolean forceRecalculate) {
+        JsonObjectBuilder info = datasetVersionSvc.fixMissingUnf(datasetVersionId, forceRecalculate);
+        return ok(info);
+    }
+
+    @Path("datafiles/integrity/fixmissingoriginaltypes")
+    @GET
+    public Response fixMissingOriginalTypes() {
+        JsonObjectBuilder info = Json.createObjectBuilder();
+
+        List<Long> affectedFileIds = fileService.selectFilesWithMissingOriginalTypes();
+
+        if (affectedFileIds.isEmpty()) {
+            info.add("message",
+                    "All the tabular files in the database already have the original types set correctly; exiting.");
+        } else {
+            for (Long fileid : affectedFileIds) {
+                logger.fine("found file id: " + fileid);
+            }
+            info.add("message", "Found " + affectedFileIds.size()
+                    + " tabular files with missing original types. Kicking off an async job that will repair the files in the background.");
+        }
+
+        ingestService.fixMissingOriginalTypes(affectedFileIds);
+
+        return ok(info);
+    }
+        
+    @Path("datafiles/integrity/fixmissingoriginalsizes")
+    @GET
+    public Response fixMissingOriginalSizes(@QueryParam("limit") Integer limit) {
+        JsonObjectBuilder info = Json.createObjectBuilder();
+
         List<Long> affectedFileIds = fileService.selectFilesWithMissingOriginalSizes();
 
         if (affectedFileIds.isEmpty()) {
@@ -1164,69 +1462,67 @@ public Response fixMissingOriginalSizes(@QueryParam("limit") Integer limit) {
         return ok(info);
     }
 
-	/**
-	 * This method is used in API tests, called from UtilIt.java.
-	 */
-	@GET
-	@Path("datasets/thumbnailMetadata/{id}")
-	public Response getDatasetThumbnailMetadata(@PathParam("id") Long idSupplied) {
-		Dataset dataset = datasetSvc.find(idSupplied);
-		if (dataset == null) {
-			return error(Response.Status.NOT_FOUND, "Could not find dataset based on id supplied: " + idSupplied + ".");
-		}
-		JsonObjectBuilder data = Json.createObjectBuilder();
-		DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail();
-		data.add("isUseGenericThumbnail", dataset.isUseGenericThumbnail());
-		data.add("datasetLogoPresent", DatasetUtil.isDatasetLogoPresent(dataset));
-		if (datasetThumbnail != null) {
-			data.add("datasetThumbnailBase64image", datasetThumbnail.getBase64image());
-			DataFile dataFile = datasetThumbnail.getDataFile();
-			if (dataFile != null) {
-				/**
-				 * @todo Change this from a String to a long.
-				 */
-				data.add("dataFileId", dataFile.getId().toString());
-			}
-		}
-		return ok(data);
-	}
-
-	/**
-	 * validatePassword
-	 * <p>
-	 * Validate a password with an API call
-	 *
-	 * @param password
-	 *            The password
-	 * @return A response with the validation result.
-	 */
-	@Path("validatePassword")
-	@POST
-	public Response validatePassword(String password) {
-
-		final List<String> errors = passwordValidatorService.validate(password, new Date(), false);
-		final JsonArrayBuilder errorArray = Json.createArrayBuilder();
-		errors.forEach(errorArray::add);
-		return ok(Json.createObjectBuilder().add("password", password).add("errors", errorArray));
-	}
-
-	@GET
-	@Path("/isOrcid")
-	public Response isOrcidEnabled() {
-		return authSvc.isOrcidEnabled() ? ok("Orcid is enabled") : ok("no orcid for you.");
-	}
+    /**
+     * This method is used in API tests, called from UtilIt.java.
+     */
+    @GET
+    @Path("datasets/thumbnailMetadata/{id}")
+    public Response getDatasetThumbnailMetadata(@PathParam("id") Long idSupplied) {
+        Dataset dataset = datasetSvc.find(idSupplied);
+        if (dataset == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataset based on id supplied: " + idSupplied + ".");
+        }
+        JsonObjectBuilder data = Json.createObjectBuilder();
+        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+        data.add("isUseGenericThumbnail", dataset.isUseGenericThumbnail());
+        data.add("datasetLogoPresent", DatasetUtil.isDatasetLogoPresent(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
+        if (datasetThumbnail != null) {
+            data.add("datasetThumbnailBase64image", datasetThumbnail.getBase64image());
+            DataFile dataFile = datasetThumbnail.getDataFile();
+            if (dataFile != null) {
+                /**
+                 * @todo Change this from a String to a long.
+                 */
+                data.add("dataFileId", dataFile.getId().toString());
+            }
+        }
+        return ok(data);
+    }
+
+    /**
+     * validatePassword
+     * <p>
+     * Validate a password with an API call
+     *
+     * @param password
+     *            The password
+     * @return A response with the validation result.
+     */
+    @Path("validatePassword")
+    @POST
+    public Response validatePassword(String password) {
+
+        final List<String> errors = passwordValidatorService.validate(password, new Date(), false);
+        final JsonArrayBuilder errorArray = Json.createArrayBuilder();
+        errors.forEach(errorArray::add);
+        return ok(Json.createObjectBuilder().add("password", password).add("errors", errorArray));
+    }
+
+    @GET
+    @Path("/isOrcid")
+    public Response isOrcidEnabled() {
+        return authSvc.isOrcidEnabled() ? ok("Orcid is enabled") : ok("no orcid for you.");
+    }
 
     @POST
+    @AuthRequired
     @Path("{id}/reregisterHDLToPID")
-    public Response reregisterHdlToPID(@PathParam("id") String id) {
+    public Response reregisterHdlToPID(@Context ContainerRequestContext crc, @PathParam("id") String id) {
         logger.info("Starting to reregister  " + id + " Dataset Id. (from hdl to doi)" + new Date());
         try {
-            if (settingsSvc.get(SettingsServiceBean.Key.Protocol.toString()).equals(GlobalId.HDL_PROTOCOL)) {
-                logger.info("Bad Request protocol set to handle  " );
-                return error(Status.BAD_REQUEST, BundleUtil.getStringFromBundle("admin.api.migrateHDL.failure.must.be.set.for.doi"));
-            }
+
             
-            User u = findUserOrDie();
+            User u = getRequestUser(crc);
             if (!u.isSuperuser()) {
                 logger.info("Bad Request Unauthor " );
                 return error(Status.UNAUTHORIZED, BundleUtil.getStringFromBundle("admin.api.auth.mustBeSuperUser"));
@@ -1234,7 +1530,12 @@ public Response reregisterHdlToPID(@PathParam("id") String id) {
 
             DataverseRequest r = createDataverseRequest(u);
             Dataset ds = findDatasetOrDie(id);
-            if (ds.getIdentifier() != null && !ds.getIdentifier().isEmpty() && ds.getProtocol().equals(GlobalId.HDL_PROTOCOL)) {
+            
+            if (HandlePidProvider.HDL_PROTOCOL.equals(dvObjectService.getEffectivePidGenerator(ds).getProtocol())) {
+                logger.info("Bad Request protocol set to handle  " );
+                return error(Status.BAD_REQUEST, BundleUtil.getStringFromBundle("admin.api.migrateHDL.failure.must.be.set.for.doi"));
+            }
+            if (ds.getIdentifier() != null && !ds.getIdentifier().isEmpty() && ds.getProtocol().equals(HandlePidProvider.HDL_PROTOCOL)) {
                 execCommand(new RegisterDvObjectCommand(r, ds, true));
             } else {
                 return error(Status.BAD_REQUEST, BundleUtil.getStringFromBundle("admin.api.migrateHDL.failure.must.be.hdl.dataset"));
@@ -1252,192 +1553,305 @@ public Response reregisterHdlToPID(@PathParam("id") String id) {
         return ok(BundleUtil.getStringFromBundle("admin.api.migrateHDL.success"));
     }
 
-	@GET
-	@Path("{id}/registerDataFile")
-	public Response registerDataFile(@PathParam("id") String id) {
-		logger.info("Starting to register  " + id + " file id. " + new Date());
-
-		try {
-			User u = findUserOrDie();
-			DataverseRequest r = createDataverseRequest(u);
-			DataFile df = findDataFileOrDie(id);
-			if (df.getIdentifier() == null || df.getIdentifier().isEmpty()) {
-				execCommand(new RegisterDvObjectCommand(r, df));
-			} else {
-				return ok("File was already registered. ");
-			}
-
-		} catch (WrappedResponse r) {
-			logger.info("Failed to register file id: " + id);
-		} catch (Exception e) {
-			logger.info("Failed to register file id: " + id + " Unexpecgted Exception " + e.getMessage());
-		}
-		return ok("Datafile registration complete. File registered successfully.");
-	}
-
-	@GET
-	@Path("/registerDataFileAll")
-	public Response registerDataFileAll() {
-		Integer count = fileService.findAll().size();
-		Integer successes = 0;
-		Integer alreadyRegistered = 0;
-		Integer released = 0;
-		Integer draft = 0;
-		logger.info("Starting to register: analyzing " + count + " files. " + new Date());
-		logger.info("Only unregistered, published files will be registered.");
-		for (DataFile df : fileService.findAll()) {
-			try {
-				if ((df.getIdentifier() == null || df.getIdentifier().isEmpty())) {
-					if (df.isReleased()) {
-						released++;
-						User u = findAuthenticatedUserOrDie();
-						DataverseRequest r = createDataverseRequest(u);
-						execCommand(new RegisterDvObjectCommand(r, df));
-						successes++;
-						if (successes % 100 == 0) {
-							logger.info(successes + " of  " + count + " files registered successfully. " + new Date());
-						}
-					} else {
-						draft++;
-						logger.info(draft + " of  " + count + " files not yet published");
-					}
-				} else {
-					alreadyRegistered++;
-					logger.info(alreadyRegistered + " of  " + count + " files are already registered. " + new Date());
-				}
-			} catch (WrappedResponse ex) {
-				released++;
-				logger.info("Failed to register file id: " + df.getId());
-				Logger.getLogger(Datasets.class.getName()).log(Level.SEVERE, null, ex);
-			} catch (Exception e) {
-				logger.info("Unexpected Exception: " + e.getMessage());
-			}
-		}
-		logger.info("Final Results:");
-		logger.info(alreadyRegistered + " of  " + count + " files were already registered. " + new Date());
-		logger.info(draft + " of  " + count + " files are not yet published. " + new Date());
-		logger.info(released + " of  " + count + " unregistered, published files to register. " + new Date());
-		logger.info(successes + " of  " + released + " unregistered, published files registered successfully. "
-				+ new Date());
-
-		return ok("Datafile registration complete." + successes + " of  " + released
-				+ " unregistered, published files registered successfully.");
-	}
-
-	@GET
-	@Path("/updateHashValues/{alg}")
-	public Response updateHashValues(@PathParam("alg") String alg, @QueryParam("num") int num) {
-		Integer count = fileService.findAll().size();
-		Integer successes = 0;
-		Integer alreadyUpdated = 0;
-		Integer rehashed = 0;
-		Integer harvested=0;
-		
-		if (num <= 0)
-			num = Integer.MAX_VALUE;
-		DataFile.ChecksumType cType = null;
-		try {
-			cType = DataFile.ChecksumType.fromString(alg);
-		} catch (IllegalArgumentException iae) {
-			return error(Status.BAD_REQUEST, "Unknown algorithm");
-		}
-		logger.info("Starting to rehash: analyzing " + count + " files. " + new Date());
-		logger.info("Hashes not created with " + alg + " will be verified, and, if valid, replaced with a hash using "
-				+ alg);
-		try {
-			User u = findAuthenticatedUserOrDie();
-			if (!u.isSuperuser())
-				return error(Status.UNAUTHORIZED, "must be superuser");
-		} catch (WrappedResponse e1) {
-			return error(Status.UNAUTHORIZED, "api key required");
-		}
-
-		for (DataFile df : fileService.findAll()) {
-			if (rehashed.intValue() >= num)
-				break;
-			InputStream in = null;
-			InputStream in2 = null; 
-			try {
-				if (df.isHarvested()) {
-					harvested++;
-				} else {
-					if (!df.getChecksumType().equals(cType)) {
-
-						rehashed++;
-						logger.fine(rehashed + ": Datafile: " + df.getFileMetadata().getLabel() + ", "
-								+ df.getIdentifier());
-						// verify hash and calc new one to replace it
-						StorageIO<DataFile> storage = df.getStorageIO();
-						storage.open(DataAccessOption.READ_ACCESS);
-						if (!df.isTabularData()) {
-							in = storage.getInputStream();
-						} else {
-							// if this is a tabular file, read the preserved original "auxiliary file"
-							// instead:
-							in = storage.getAuxFileAsInputStream(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION);
-						}
-						if (in == null)
-							logger.warning("Cannot retrieve file.");
-						String currentChecksum = FileUtil.calculateChecksum(in, df.getChecksumType());
-						if (currentChecksum.equals(df.getChecksumValue())) {
-							logger.fine("Current checksum for datafile: " + df.getFileMetadata().getLabel() + ", "
-									+ df.getIdentifier() + " is valid");
-							storage.open(DataAccessOption.READ_ACCESS);
-							if (!df.isTabularData()) {
-								in2 = storage.getInputStream();
-							} else {
-								// if this is a tabular file, read the preserved original "auxiliary file"
-								// instead:
-								in2 = storage.getAuxFileAsInputStream(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION);
-							}
-							if (in2 == null)
-								logger.warning("Cannot retrieve file to calculate new checksum.");
-							String newChecksum = FileUtil.calculateChecksum(in2, cType);
-
-							df.setChecksumType(cType);
-							df.setChecksumValue(newChecksum);
-							successes++;
-							if (successes % 100 == 0) {
-								logger.info(
-										successes + " of  " + count + " files rehashed successfully. " + new Date());
-							}
-						} else {
-							logger.warning("Problem: Current checksum for datafile: " + df.getFileMetadata().getLabel()
-									+ ", " + df.getIdentifier() + " is INVALID");
-						}
-					} else {
-						alreadyUpdated++;
-						if (alreadyUpdated % 100 == 0) {
-							logger.info(alreadyUpdated + " of  " + count
-									+ " files are already have hashes with the new algorithm. " + new Date());
-						}
-					}
-				}
-			} catch (Exception e) {
-				logger.warning("Unexpected Exception: " + e.getMessage());
-
-			} finally {
-				IOUtils.closeQuietly(in);
-				IOUtils.closeQuietly(in2);
-			}
-		}
-		logger.info("Final Results:");
-		logger.info(harvested + " harvested files skipped.");
-		logger.info(
-				alreadyUpdated + " of  " + count + " files already had hashes with the new algorithm. " + new Date());
-		logger.info(rehashed + " of  " + count + " files to rehash. " + new Date());
-		logger.info(
-				successes + " of  " + rehashed + " files successfully rehashed with the new algorithm. " + new Date());
-
-		return ok("Datafile rehashing complete." + successes + " of  " + rehashed + " files successfully rehashed.");
-	}
+    @GET
+    @AuthRequired
+    @Path("{id}/registerDataFile")
+    public Response registerDataFile(@Context ContainerRequestContext crc, @PathParam("id") String id) {
+        logger.info("Starting to register  " + id + " file id. " + new Date());
+
+        try {
+            User u = getRequestUser(crc);
+            DataverseRequest r = createDataverseRequest(u);
+            DataFile df = findDataFileOrDie(id);
+            if(!systemConfig.isFilePIDsEnabledForCollection(df.getOwner().getOwner())) {
+                return forbidden("PIDs are not enabled for this file's collection.");
+            }
+            if (df.getIdentifier() == null || df.getIdentifier().isEmpty()) {
+                execCommand(new RegisterDvObjectCommand(r, df));
+            } else {
+                return ok("File was already registered. ");
+            }
+
+        } catch (WrappedResponse r) {
+            logger.info("Failed to register file id: " + id);
+        } catch (Exception e) {
+            logger.info("Failed to register file id: " + id + " Unexpecgted Exception " + e.getMessage());
+        }
+        return ok("Datafile registration complete. File registered successfully.");
+    }
+
+    @GET
+    @AuthRequired
+    @Path("/registerDataFileAll")
+    public Response registerDataFileAll(@Context ContainerRequestContext crc) {
+        Integer count = fileService.findAll().size();
+        Integer successes = 0;
+        Integer alreadyRegistered = 0;
+        Integer released = 0;
+        Integer draft = 0;
+        Integer skipped = 0;
+        logger.info("Starting to register: analyzing " + count + " files. " + new Date());
+        logger.info("Only unregistered, published files will be registered.");
+        User u = null;
+        try {
+            u = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse e1) {
+            return error(Status.UNAUTHORIZED, "api key required");
+        }
+        DataverseRequest r = createDataverseRequest(u);
+        for (DataFile df : fileService.findAll()) {
+            try {
+                if ((df.getIdentifier() == null || df.getIdentifier().isEmpty())) {
+                    if(!systemConfig.isFilePIDsEnabledForCollection(df.getOwner().getOwner())) {
+                        skipped++;
+                        if (skipped % 100 == 0) {
+                            logger.info(skipped + " of  " + count + " files not in collections that allow file PIDs. " + new Date());
+                        }
+                    } else if (df.isReleased()) {
+                        released++;
+                        execCommand(new RegisterDvObjectCommand(r, df));
+                        successes++;
+                        if (successes % 100 == 0) {
+                            logger.info(successes + " of  " + count + " files registered successfully. " + new Date());
+                        }
+                        try {
+                            Thread.sleep(1000);
+                        } catch (InterruptedException ie) {
+                            logger.warning("Interrupted Exception when attempting to execute Thread.sleep()!");
+                        }
+                    } else {
+                        draft++;
+                        if (draft % 100 == 0) {
+                          logger.info(draft + " of  " + count + " files not yet published");
+                        }
+                    }
+                } else {
+                    alreadyRegistered++;
+                    if(alreadyRegistered % 100 == 0) {
+                      logger.info(alreadyRegistered + " of  " + count + " files are already registered. " + new Date());
+                    }
+                }
+            } catch (WrappedResponse ex) {
+                logger.info("Failed to register file id: " + df.getId());
+                Logger.getLogger(Datasets.class.getName()).log(Level.SEVERE, null, ex);
+            } catch (Exception e) {
+                logger.info("Unexpected Exception: " + e.getMessage());
+            }
+            
+
+        }
+        logger.info("Final Results:");
+        logger.info(alreadyRegistered + " of  " + count + " files were already registered. " + new Date());
+        logger.info(draft + " of  " + count + " files are not yet published. " + new Date());
+        logger.info(released + " of  " + count + " unregistered, published files to register. " + new Date());
+        logger.info(successes + " of  " + released + " unregistered, published files registered successfully. "
+                + new Date());
+        logger.info(skipped + " of  " + count + " files not in collections that allow file PIDs. " + new Date());
+
+        return ok("Datafile registration complete." + successes + " of  " + released
+                + " unregistered, published files registered successfully.");
+    }
+    
+    @GET
+    @AuthRequired
+    @Path("/registerDataFiles/{alias}")
+    public Response registerDataFilesInCollection(@Context ContainerRequestContext crc, @PathParam("alias") String alias, @QueryParam("sleep") Integer sleepInterval) {
+        Dataverse collection;
+        try {
+            collection = findDataverseOrDie(alias);
+        } catch (WrappedResponse r) {
+            return r.getResponse();
+        }
+        
+        AuthenticatedUser superuser = authSvc.getAdminUser();
+        if (superuser == null) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, "Cannot find the superuser to execute /admin/registerDataFiles.");
+        }
+        
+        if (!systemConfig.isFilePIDsEnabledForCollection(collection)) {
+            return ok("Registration of file-level pid is disabled in collection "+alias+"; nothing to do");
+        }
+        
+        List<DataFile> dataFiles = fileService.findByDirectCollectionOwner(collection.getId());
+        Integer count = dataFiles.size();
+        Integer countSuccesses = 0;
+        Integer countAlreadyRegistered = 0;
+        Integer countReleased = 0;
+        Integer countDrafts = 0;
+        
+        if (sleepInterval == null) {
+            sleepInterval = 1; 
+        } else if (sleepInterval.intValue() < 1) {
+            return error(Response.Status.BAD_REQUEST, "Invalid sleep interval: "+sleepInterval);
+        }
+        
+        logger.info("Starting to register: analyzing " + count + " files. " + new Date());
+        logger.info("Only unregistered, published files will be registered.");
+        
+        
+        
+        for (DataFile df : dataFiles) {
+            try {
+                if ((df.getIdentifier() == null || df.getIdentifier().isEmpty())) {
+                    if (df.isReleased()) {
+                        countReleased++;
+                        DataverseRequest r = createDataverseRequest(superuser);
+                        execCommand(new RegisterDvObjectCommand(r, df));
+                        countSuccesses++;
+                        if (countSuccesses % 100 == 0) {
+                            logger.info(countSuccesses + " out of " + count + " files registered successfully. " + new Date());
+                        }
+                        try {
+                            Thread.sleep(sleepInterval * 1000);
+                        } catch (InterruptedException ie) {
+                            logger.warning("Interrupted Exception when attempting to execute Thread.sleep()!");
+                        }
+                    } else {
+                        countDrafts++;
+                        logger.fine(countDrafts + " out of " + count + " files not yet published");
+                    }
+                } else {
+                    countAlreadyRegistered++;
+                    logger.fine(countAlreadyRegistered + " out of " + count + " files are already registered. " + new Date());
+                }
+            } catch (WrappedResponse ex) {
+                countReleased++;
+                logger.info("Failed to register file id: " + df.getId());
+                Logger.getLogger(Datasets.class.getName()).log(Level.SEVERE, null, ex);
+            } catch (Exception e) {
+                logger.info("Unexpected Exception: " + e.getMessage());
+            }
+        }
+        
+        logger.info(countAlreadyRegistered + " out of " + count + " files were already registered. " + new Date());
+        logger.info(countDrafts + " out of " + count + " files are not yet published. " + new Date());
+        logger.info(countReleased + " out of " + count + " unregistered, published files to register. " + new Date());
+        logger.info(countSuccesses + " out of " + countReleased + " unregistered, published files registered successfully. "
+                + new Date());
+
+        return ok("Datafile registration complete. " + countSuccesses + " out of " + countReleased
+                + " unregistered, published files registered successfully.");
+    }
+
+    @GET
+    @AuthRequired
+    @Path("/updateHashValues/{alg}")
+    public Response updateHashValues(@Context ContainerRequestContext crc, @PathParam("alg") String alg, @QueryParam("num") int num) {
+        Integer count = fileService.findAll().size();
+        Integer successes = 0;
+        Integer alreadyUpdated = 0;
+        Integer rehashed = 0;
+        Integer harvested = 0;
+
+        if (num <= 0)
+            num = Integer.MAX_VALUE;
+        DataFile.ChecksumType cType = null;
+        try {
+            cType = DataFile.ChecksumType.fromString(alg);
+        } catch (IllegalArgumentException iae) {
+            return error(Status.BAD_REQUEST, "Unknown algorithm");
+        }
+        logger.info("Starting to rehash: analyzing " + count + " files. " + new Date());
+        logger.info("Hashes not created with " + alg + " will be verified, and, if valid, replaced with a hash using "
+                + alg);
+        try {
+            User u = getRequestAuthenticatedUserOrDie(crc);
+            if (!u.isSuperuser())
+                return error(Status.UNAUTHORIZED, "must be superuser");
+        } catch (WrappedResponse e1) {
+            return error(Status.UNAUTHORIZED, "api key required");
+        }
+
+        for (DataFile df : fileService.findAll()) {
+            if (rehashed.intValue() >= num)
+                break;
+            InputStream in = null;
+            InputStream in2 = null;
+            try {
+                if (df.isHarvested()) {
+                    harvested++;
+                } else {
+                    if (!df.getChecksumType().equals(cType)) {
+
+                        rehashed++;
+                        logger.fine(rehashed + ": Datafile: " + df.getFileMetadata().getLabel() + ", "
+                                + df.getIdentifier());
+                        // verify hash and calc new one to replace it
+                        StorageIO<DataFile> storage = df.getStorageIO();
+                        storage.open(DataAccessOption.READ_ACCESS);
+                        if (!df.isTabularData()) {
+                            in = storage.getInputStream();
+                        } else {
+                            // if this is a tabular file, read the preserved original "auxiliary file"
+                            // instead:
+                            in = storage.getAuxFileAsInputStream(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION);
+                        }
+                        if (in == null)
+                            logger.warning("Cannot retrieve file.");
+                        String currentChecksum = FileUtil.calculateChecksum(in, df.getChecksumType());
+                        if (currentChecksum.equals(df.getChecksumValue())) {
+                            logger.fine("Current checksum for datafile: " + df.getFileMetadata().getLabel() + ", "
+                                    + df.getIdentifier() + " is valid");
+                            // Need to reset so we don't get the same stream (StorageIO class inputstreams
+                            // are normally only used once)
+                            storage.setInputStream(null);
+                            storage.open(DataAccessOption.READ_ACCESS);
+                            if (!df.isTabularData()) {
+                                in2 = storage.getInputStream();
+                            } else {
+                                // if this is a tabular file, read the preserved original "auxiliary file"
+                                // instead:
+                                in2 = storage.getAuxFileAsInputStream(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION);
+                            }
+                            if (in2 == null)
+                                logger.warning("Cannot retrieve file to calculate new checksum.");
+                            String newChecksum = FileUtil.calculateChecksum(in2, cType);
+
+                            df.setChecksumType(cType);
+                            df.setChecksumValue(newChecksum);
+                            successes++;
+                            if (successes % 100 == 0) {
+                                logger.info(
+                                        successes + " of  " + count + " files rehashed successfully. " + new Date());
+                            }
+                        } else {
+                            logger.warning("Problem: Current checksum for datafile: " + df.getFileMetadata().getLabel()
+                                    + ", " + df.getIdentifier() + " is INVALID");
+                        }
+                    } else {
+                        alreadyUpdated++;
+                        if (alreadyUpdated % 100 == 0) {
+                            logger.info(alreadyUpdated + " of  " + count
+                                    + " files are already have hashes with the new algorithm. " + new Date());
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                logger.warning("Unexpected Exception: " + e.getMessage());
+
+            } finally {
+                IOUtils.closeQuietly(in);
+                IOUtils.closeQuietly(in2);
+            }
+        }
+        logger.info("Final Results:");
+        logger.info(harvested + " harvested files skipped.");
+        logger.info(
+                alreadyUpdated + " of  " + count + " files already had hashes with the new algorithm. " + new Date());
+        logger.info(rehashed + " of  " + count + " files to rehash. " + new Date());
+        logger.info(
+                successes + " of  " + rehashed + " files successfully rehashed with the new algorithm. " + new Date());
+
+        return ok("Datafile rehashing complete." + successes + " of  " + rehashed + " files successfully rehashed.");
+    }
         
     @POST
+    @AuthRequired
     @Path("/computeDataFileHashValue/{fileId}/algorithm/{alg}")
-    public Response computeDataFileHashValue(@PathParam("fileId") String fileId, @PathParam("alg") String alg) {
+    public Response computeDataFileHashValue(@Context ContainerRequestContext crc, @PathParam("fileId") String fileId, @PathParam("alg") String alg) {
 
         try {
-            User u = findAuthenticatedUserOrDie();
+            User u = getRequestAuthenticatedUserOrDie(crc);
             if (!u.isSuperuser()) {
                 return error(Status.UNAUTHORIZED, "must be superuser");
             }
@@ -1494,11 +1908,12 @@ public Response computeDataFileHashValue(@PathParam("fileId") String fileId, @Pa
     }
     
     @POST
+    @AuthRequired
     @Path("/validateDataFileHashValue/{fileId}")
-    public Response validateDataFileHashValue(@PathParam("fileId") String fileId) {
+    public Response validateDataFileHashValue(@Context ContainerRequestContext crc, @PathParam("fileId") String fileId) {
 
         try {
-            User u = findAuthenticatedUserOrDie();
+            User u = getRequestAuthenticatedUserOrDie(crc);
             if (!u.isSuperuser()) {
                 return error(Status.UNAUTHORIZED, "must be superuser");
             }
@@ -1559,27 +1974,48 @@ public Response validateDataFileHashValue(@PathParam("fileId") String fileId) {
 
     }
 
-    @GET
-    @Path("/submitDataVersionToArchive/{id}/{version}")
-    public Response submitDatasetVersionToArchive(@PathParam("id") String dsid, @PathParam("version") String versionNumber) {
+    @POST
+    @AuthRequired
+    @Path("/submitDatasetVersionToArchive/{id}/{version}")
+    public Response submitDatasetVersionToArchive(@Context ContainerRequestContext crc, @PathParam("id") String dsid,
+            @PathParam("version") String versionNumber) {
 
         try {
-            AuthenticatedUser au = findAuthenticatedUserOrDie();
-            session.setUser(au);
+            AuthenticatedUser au = getRequestAuthenticatedUserOrDie(crc);
+
             Dataset ds = findDatasetOrDie(dsid);
 
             DatasetVersion dv = datasetversionService.findByFriendlyVersionNumber(ds.getId(), versionNumber);
+            if(dv==null) {
+                return error(Status.BAD_REQUEST, "Requested version not found.");
+            }
             if (dv.getArchivalCopyLocation() == null) {
                 String className = settingsService.getValueForKey(SettingsServiceBean.Key.ArchiverClassName);
-                AbstractSubmitToArchiveCommand cmd = ArchiverUtil.createSubmitToArchiveCommand(className, dvRequestService.getDataverseRequest(), dv);
+                // Note - the user is being sent via the createDataverseRequest(au) call to the
+                // back-end command where it is used to get the API Token which is
+                // then used to retrieve files (e.g. via S3 direct downloads) to create the Bag
+                AbstractSubmitToArchiveCommand cmd = ArchiverUtil.createSubmitToArchiveCommand(className,
+                        createDataverseRequest(au), dv);
+                // createSubmitToArchiveCommand() tries to find and instantiate an non-abstract
+                // implementation of AbstractSubmitToArchiveCommand based on the provided
+                // className. If a class with that name isn't found (or can't be instatiated), it
+                // will return null
                 if (cmd != null) {
+                    if(ArchiverUtil.onlySingleVersionArchiving(cmd.getClass(), settingsService)) {
+                        for (DatasetVersion version : ds.getVersions()) {
+                            if ((dv != version) && version.getArchivalCopyLocation() != null) {
+                                return error(Status.CONFLICT, "Dataset already archived.");
+                            }
+                        } 
+                    }
                     new Thread(new Runnable() {
                         public void run() {
                             try {
                                 DatasetVersion dv = commandEngine.submit(cmd);
-                                if (dv.getArchivalCopyLocation() != null) {
-                                    logger.info("DatasetVersion id=" + ds.getGlobalId().toString() + " v" + versionNumber + " submitted to Archive at: "
-                                            + dv.getArchivalCopyLocation());
+                                if (!dv.getArchivalCopyLocationStatus().equals(DatasetVersion.ARCHIVAL_STATUS_FAILURE)) {
+                                    logger.info(
+                                            "DatasetVersion id=" + ds.getGlobalId().toString() + " v" + versionNumber
+                                                    + " submitted to Archive, status: " + dv.getArchivalCopyLocationStatus());
                                 } else {
                                     logger.severe("Error submitting version due to conflict/error at Archive");
                                 }
@@ -1588,44 +2024,138 @@ public void run() {
                             }
                         }
                     }).start();
-                    return ok("Archive submission using " + cmd.getClass().getCanonicalName() + " started. Processing can take significant time for large datasets. View log and/or check archive for results.");
+                    return ok("Archive submission using " + cmd.getClass().getCanonicalName()
+                            + " started. Processing can take significant time for large datasets and requires that the user have permission to publish the dataset. View log and/or check archive for results.");
                 } else {
                     logger.log(Level.SEVERE, "Could not find Archiver class: " + className);
                     return error(Status.INTERNAL_SERVER_ERROR, "Could not find Archiver class: " + className);
                 }
             } else {
-                return error(Status.BAD_REQUEST, "Version already archived at: " + dv.getArchivalCopyLocation());
+                return error(Status.BAD_REQUEST, "Version was already submitted for archiving.");
             }
         } catch (WrappedResponse e1) {
-            return error(Status.UNAUTHORIZED, "api key required");
+            return e1.getResponse();
         }
     }
+
     
-	@DELETE
-	@Path("/clearMetricsCache")
-	public Response clearMetricsCache() {
-		em.createNativeQuery("DELETE FROM metric").executeUpdate();
-		return ok("all metric caches cleared.");
-	}
-
-	@DELETE
-	@Path("/clearMetricsCache/{name}")
-	public Response clearMetricsCacheByName(@PathParam("name") String name) {
-		Query deleteQuery = em.createNativeQuery("DELETE FROM metric where metricname = ?");
-		deleteQuery.setParameter(1, name);
-		deleteQuery.executeUpdate();
-		return ok("metric cache " + name + " cleared.");
-	}
+    /**
+     * Iteratively archives all unarchived dataset versions
+     * @param
+     * listonly - don't archive, just list unarchived versions
+     * limit - max number to process
+     * lastestonly - only archive the latest versions
+     * @return
+     */
+    @POST
+    @AuthRequired
+    @Path("/archiveAllUnarchivedDatasetVersions")
+    public Response archiveAllUnarchivedDatasetVersions(@Context ContainerRequestContext crc, @QueryParam("listonly") boolean listonly, @QueryParam("limit") Integer limit, @QueryParam("latestonly") boolean latestonly) {
+
+        try {
+            AuthenticatedUser au = getRequestAuthenticatedUserOrDie(crc);
+
+            List<DatasetVersion> dsl = datasetversionService.getUnarchivedDatasetVersions();
+            if (dsl != null) {
+                if (listonly) {
+                    JsonArrayBuilder jab = Json.createArrayBuilder();
+                    logger.fine("Unarchived versions found: ");
+                    int current = 0;
+                    for (DatasetVersion dv : dsl) {
+                        if (limit != null && current >= limit) {
+                            break;
+                        }
+                        if (!latestonly || dv.equals(dv.getDataset().getLatestVersionForCopy())) {
+                            jab.add(dv.getDataset().getGlobalId().toString() + ", v" + dv.getFriendlyVersionNumber());
+                            logger.fine("    " + dv.getDataset().getGlobalId().toString() + ", v" + dv.getFriendlyVersionNumber());
+                            current++;
+                        }
+                    }
+                    return ok(jab); 
+                }
+                String className = settingsService.getValueForKey(SettingsServiceBean.Key.ArchiverClassName);
+                // Note - the user is being sent via the createDataverseRequest(au) call to the
+                // back-end command where it is used to get the API Token which is
+                // then used to retrieve files (e.g. via S3 direct downloads) to create the Bag
+                final DataverseRequest request = createDataverseRequest(au);
+                // createSubmitToArchiveCommand() tries to find and instantiate an non-abstract
+                // implementation of AbstractSubmitToArchiveCommand based on the provided
+                // className. If a class with that name isn't found (or can't be instatiated, it
+                // will return null
+                AbstractSubmitToArchiveCommand cmd = ArchiverUtil.createSubmitToArchiveCommand(className, request, dsl.get(0));
+                if (cmd != null) {
+                    //Found an archiver to use
+                    new Thread(new Runnable() {
+                        public void run() {
+                            int total = dsl.size();
+                            int successes = 0;
+                            int failures = 0;
+                            for (DatasetVersion dv : dsl) {
+                                if (limit != null && (successes + failures) >= limit) {
+                                    break;
+                                }
+                                if (!latestonly || dv.equals(dv.getDataset().getLatestVersionForCopy())) {
+                                    try {
+                                        AbstractSubmitToArchiveCommand cmd = ArchiverUtil.createSubmitToArchiveCommand(className, request, dv);
+
+                                        dv = commandEngine.submit(cmd);
+                                        if (!dv.getArchivalCopyLocationStatus().equals(DatasetVersion.ARCHIVAL_STATUS_FAILURE)) {
+                                            successes++;
+                                            logger.info("DatasetVersion id=" + dv.getDataset().getGlobalId().toString() + " v" + dv.getFriendlyVersionNumber() + " submitted to Archive, status: "
+                                                    + dv.getArchivalCopyLocationStatus());
+                                        } else {
+                                            failures++;
+                                            logger.severe("Error submitting version due to conflict/error at Archive for " + dv.getDataset().getGlobalId().toString() + " v" + dv.getFriendlyVersionNumber());
+                                        }
+                                    } catch (CommandException ex) {
+                                        failures++;
+                                        logger.log(Level.SEVERE, "Unexpected Exception calling  submit archive command", ex);
+                                    }
+                                }
+                                logger.fine(successes + failures + " of " + total + " archive submissions complete");
+                            }
+                            logger.info("Archiving complete: " + successes + " Successes, " + failures + " Failures. See prior log messages for details.");
+                        }
+                    }).start();
+                    return ok("Starting to archive all unarchived published dataset versions using " + cmd.getClass().getCanonicalName() + ". Processing can take significant time for large datasets/ large numbers of dataset versions  and requires that the user have permission to publish the dataset(s). View log and/or check archive for results.");
+                } else {
+                    logger.log(Level.SEVERE, "Could not find Archiver class: " + className);
+                    return error(Status.INTERNAL_SERVER_ERROR, "Could not find Archiver class: " + className);
+                }
+            } else {
+                return error(Status.BAD_REQUEST, "No unarchived published dataset versions found");
+            }
+        } catch (WrappedResponse e1) {
+            return e1.getResponse();
+        }
+    }
+    
+    @DELETE
+    @Path("/clearMetricsCache")
+    public Response clearMetricsCache() {
+        em.createNativeQuery("DELETE FROM metric").executeUpdate();
+        return ok("all metric caches cleared.");
+    }
+
+    @DELETE
+    @Path("/clearMetricsCache/{name}")
+    public Response clearMetricsCacheByName(@PathParam("name") String name) {
+        Query deleteQuery = em.createNativeQuery("DELETE FROM metric where name = ?");
+        deleteQuery.setParameter(1, name);
+        deleteQuery.executeUpdate();
+        return ok("metric cache " + name + " cleared.");
+    }
 
     @GET
+    @AuthRequired
     @Path("/dataverse/{alias}/addRoleAssignmentsToChildren")
-    public Response addRoleAssignementsToChildren(@PathParam("alias") String alias) throws WrappedResponse {
+    public Response addRoleAssignementsToChildren(@Context ContainerRequestContext crc, @PathParam("alias") String alias) throws WrappedResponse {
         Dataverse owner = dataverseSvc.findByAlias(alias);
         if (owner == null) {
             return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
         }
         try {
-            AuthenticatedUser user = findAuthenticatedUserOrDie();
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
             if (!user.isSuperuser()) {
                 return error(Response.Status.FORBIDDEN, "Superusers only.");
             }
@@ -1647,5 +2177,563 @@ public Response addRoleAssignementsToChildren(@PathParam("alias") String alias)
                 "InheritParentRoleAssignments does not list any roles on this instance");
     }
     
+    @GET
+    @AuthRequired
+    @Path("/dataverse/{alias}/storageDriver")
+    public Response getStorageDriver(@Context ContainerRequestContext crc, @PathParam("alias") String alias) throws WrappedResponse {
+        Dataverse dataverse = dataverseSvc.findByAlias(alias);
+        if (dataverse == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+        }
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        //Note that this returns what's set directly on this dataverse. If null/DataAccess.UNDEFINED_STORAGE_DRIVER_IDENTIFIER, the user would have to recurse the chain of parents to find the effective storageDriver
+        return ok(dataverse.getStorageDriverId());
+    }
+    
+    @PUT
+    @AuthRequired
+    @Path("/dataverse/{alias}/storageDriver")
+    public Response setStorageDriver(@Context ContainerRequestContext crc, @PathParam("alias") String alias, String label) throws WrappedResponse {
+        Dataverse dataverse = dataverseSvc.findByAlias(alias);
+        if (dataverse == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+        }
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        for (Entry<String, String> store: DataAccess.getStorageDriverLabels().entrySet()) {
+            if(store.getKey().equals(label)) {
+                dataverse.setStorageDriverId(store.getValue());
+                return ok("Storage set to: " + store.getKey() + "/" + store.getValue());
+            }
+        }
+        return error(Response.Status.BAD_REQUEST,
+                "No Storage Driver found for : " + label);
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("/dataverse/{alias}/storageDriver")
+    public Response resetStorageDriver(@Context ContainerRequestContext crc, @PathParam("alias") String alias) throws WrappedResponse {
+        Dataverse dataverse = dataverseSvc.findByAlias(alias);
+        if (dataverse == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+        }
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        dataverse.setStorageDriverId("");
+        return ok("Storage reset to default: " + DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER);
+    }
+    
+    @GET
+    @AuthRequired
+    @Path("/dataverse/storageDrivers")
+    public Response listStorageDrivers(@Context ContainerRequestContext crc) throws WrappedResponse {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        JsonObjectBuilder bld = jsonObjectBuilder();
+        DataAccess.getStorageDriverLabels().entrySet().forEach(s -> bld.add(s.getKey(), s.getValue()));
+        return ok(bld);
+    }
+    
+    @GET
+    @AuthRequired
+    @Path("/dataverse/{alias}/curationLabelSet")
+    public Response getCurationLabelSet(@Context ContainerRequestContext crc, @PathParam("alias") String alias) throws WrappedResponse {
+        Dataverse dataverse = dataverseSvc.findByAlias(alias);
+        if (dataverse == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+        }
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        // Note that this returns what's set directly on this dataverse. If
+        // null/SystemConfig.DEFAULTCURATIONLABELSET, the user would have to recurse the
+        // chain of parents to find the effective curationLabelSet
+        return ok(dataverse.getCurationLabelSetName());
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("/dataverse/{alias}/curationLabelSet")
+    public Response setCurationLabelSet(@Context ContainerRequestContext crc, @PathParam("alias") String alias, @QueryParam("name") String name) throws WrappedResponse {
+        Dataverse dataverse = dataverseSvc.findByAlias(alias);
+        if (dataverse == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+        }
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        if (SystemConfig.CURATIONLABELSDISABLED.equals(name) || SystemConfig.DEFAULTCURATIONLABELSET.equals(name)) {
+            dataverse.setCurationLabelSetName(name);
+            return ok("Curation Label Set Name set to: " + name);
+        } else {
+            for (String setName : systemConfig.getCurationLabels().keySet()) {
+                if (setName.equals(name)) {
+                    dataverse.setCurationLabelSetName(name);
+                    return ok("Curation Label Set Name set to: " + setName);
+                }
+            }
+        }
+        return error(Response.Status.BAD_REQUEST,
+                "No Curation Label Set found for : " + name);
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("/dataverse/{alias}/curationLabelSet")
+    public Response resetCurationLabelSet(@Context ContainerRequestContext crc, @PathParam("alias") String alias) throws WrappedResponse {
+        Dataverse dataverse = dataverseSvc.findByAlias(alias);
+        if (dataverse == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+        }
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        dataverse.setCurationLabelSetName(SystemConfig.DEFAULTCURATIONLABELSET);
+        return ok("Curation Label Set reset to default: " + SystemConfig.DEFAULTCURATIONLABELSET);
+    }
+
+    @GET
+    @AuthRequired
+    @Path("/dataverse/curationLabelSets")
+    public Response listCurationLabelSets(@Context ContainerRequestContext crc) throws WrappedResponse {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        JsonObjectBuilder bld = Json.createObjectBuilder();
+
+        systemConfig.getCurationLabels().entrySet().forEach(s -> {
+            JsonArrayBuilder labels = Json.createArrayBuilder();
+            Arrays.asList(s.getValue()).forEach(l -> labels.add(l));
+            bld.add(s.getKey(), labels);
+        });
+        return ok(bld);
+    }
+    
+    @POST
+    @Path("/bannerMessage")
+    public Response addBannerMessage(JsonObject jsonObject) throws WrappedResponse {
+
+        BannerMessage toAdd = new BannerMessage();
+        try {
+
+            String dismissible = jsonObject.getString("dismissibleByUser");
+
+            boolean dismissibleByUser = false;
+            if (dismissible.equals("true")) {
+                dismissibleByUser = true;
+            }
+            toAdd.setDismissibleByUser(dismissibleByUser);
+            toAdd.setBannerMessageTexts(new ArrayList());
+            toAdd.setActive(true);
+            JsonArray jsonArray = jsonObject.getJsonArray("messageTexts");
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JsonObject obj = (JsonObject) jsonArray.get(i);
+                String message = obj.getString("message");
+                String lang = obj.getString("lang");
+                BannerMessageText messageText = new BannerMessageText();
+                messageText.setMessage(message);
+                messageText.setLang(lang);
+                messageText.setBannerMessage(toAdd);
+                toAdd.getBannerMessageTexts().add(messageText);
+            }
+            bannerMessageService.save(toAdd);
+
+            JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder()
+                .add("message", "Banner Message added successfully.")
+                .add("id", toAdd.getId());
+
+            return ok(jsonObjectBuilder);
+
+        } catch (Exception e) {
+            logger.warning("Unexpected Exception: " + e.getMessage());
+            return error(Status.BAD_REQUEST, "Add Banner Message unexpected exception: invalid or missing JSON object.");
+        }
+
+    }
+    
+    @DELETE
+    @Path("/bannerMessage/{id}")
+    public Response deleteBannerMessage(@PathParam("id") Long id) throws WrappedResponse {
+ 
+        BannerMessage message = em.find(BannerMessage.class, id);
+        if (message == null){
+            return error(Response.Status.NOT_FOUND, "Message id = "  + id + " not found.");
+        }
+        bannerMessageService.deleteBannerMessage(id);
+        
+        return ok("Message id =  " + id + " deleted.");
+
+    }
+    
+    @PUT
+    @Path("/bannerMessage/{id}/deactivate")
+    public Response deactivateBannerMessage(@PathParam("id") Long id) throws WrappedResponse {
+        BannerMessage message = em.find(BannerMessage.class, id);
+        if (message == null){
+            return error(Response.Status.NOT_FOUND, "Message id = "  + id + " not found.");
+        }
+        bannerMessageService.deactivateBannerMessage(id);
+        
+        return ok("Message id =  " + id + " deactivated.");
+
+    }
+    
+    @GET
+    @Path("/bannerMessage")
+    public Response getBannerMessages(@PathParam("id") Long id) throws WrappedResponse {
+
+        List<BannerMessage> messagesList = bannerMessageService.findAllBannerMessages();
+
+        for (BannerMessage message : messagesList) {
+            if ("".equals(message.getDisplayValue())) {
+               return error(Response.Status.INTERNAL_SERVER_ERROR, "No banner messages found for this locale.");
+            }
+        }
 
+        JsonArrayBuilder messages = messagesList.stream()
+        .map(m -> jsonObjectBuilder().add("id", m.getId()).add("displayValue", m.getDisplayValue()))
+        .collect(toJsonArray());
+        
+        return ok(messages);
+    }
+    
+    @POST
+    @AuthRequired
+    @Consumes("application/json")
+    @Path("/requestSignedUrl")
+    public Response getSignedUrl(@Context ContainerRequestContext crc, JsonObject urlInfo) {
+        AuthenticatedUser superuser = null;
+        try {
+            superuser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        if (superuser == null || !superuser.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Requesting signed URLs is restricted to superusers.");
+        }
+        
+        String userId = urlInfo.getString("user");
+        String key=null;
+        if (userId != null) {
+            AuthenticatedUser user = authSvc.getAuthenticatedUser(userId);
+            // If a user param was sent, we sign the URL for them, otherwise on behalf of
+            // the superuser who made this api call
+            if (user != null) {
+                ApiToken apiToken = authSvc.findApiTokenByUser(user);
+                if (apiToken != null && !apiToken.isExpired() && !apiToken.isDisabled()) {
+                    key = apiToken.getTokenString();
+                }
+            } else {
+                userId = superuser.getUserIdentifier();
+                // We ~know this exists - the superuser just used it and it was unexpired/not
+                // disabled. (ToDo - if we want this to work with workflow tokens (or as a
+                // signed URL), we should do more checking as for the user above))
+                key = authSvc.findApiTokenByUser(superuser).getTokenString();
+            }
+            if (key == null) {
+                return error(Response.Status.CONFLICT, "Do not have a valid user with apiToken");
+            }
+            key = JvmSettings.API_SIGNING_SECRET.lookupOptional().orElse("") + key;
+        }
+        
+        String baseUrl = urlInfo.getString("url");
+        int timeout = urlInfo.getInt(URLTokenUtil.TIMEOUT, 10);
+        String method = urlInfo.getString(URLTokenUtil.HTTP_METHOD, "GET");
+        
+        String signedUrl = UrlSignerUtil.signUrl(baseUrl, timeout, userId, method, key); 
+        
+        return ok(Json.createObjectBuilder().add(URLTokenUtil.SIGNED_URL, signedUrl));
+    }
+ 
+    @DELETE
+    @Path("/clearThumbnailFailureFlag")
+    public Response clearThumbnailFailureFlag() {
+        em.createNativeQuery("UPDATE dvobject SET previewimagefail = FALSE").executeUpdate();
+        return ok("Thumbnail Failure Flags cleared.");
+    }
+    
+    @DELETE
+    @Path("/clearThumbnailFailureFlag/{id}")
+    public Response clearThumbnailFailureFlagByDatafile(@PathParam("id") String fileId) {
+        try {
+            DataFile df = findDataFileOrDie(fileId);
+            Query deleteQuery = em.createNativeQuery("UPDATE dvobject SET previewimagefail = FALSE where id = ?");
+            deleteQuery.setParameter(1, df.getId());
+            deleteQuery.executeUpdate();
+            return ok("Thumbnail Failure Flag cleared for file id=: " + df.getId() + ".");
+        } catch (WrappedResponse r) {
+            logger.info("Could not find file with the id: " + fileId);
+            return error(Status.BAD_REQUEST, "Could not find file with the id: " + fileId);
+        }
+    }
+
+    /**
+     * For testing only. Download a file from /tmp.
+     */
+    @GET
+    @AuthRequired
+    @Path("/downloadTmpFile")
+    public Response downloadTmpFile(@Context ContainerRequestContext crc, @QueryParam("fullyQualifiedPathToFile") String fullyQualifiedPathToFile) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        java.nio.file.Path normalizedPath = Paths.get(fullyQualifiedPathToFile).normalize();
+        if (!normalizedPath.toString().startsWith("/tmp")) {
+            return error(Status.BAD_REQUEST, "Path must begin with '/tmp' but after normalization was '" + normalizedPath +"'.");
+        }
+        try {
+            return ok(new FileInputStream(fullyQualifiedPathToFile));
+        } catch (IOException ex) {
+            return error(Status.BAD_REQUEST, ex.toString());
+        }
+    }
+
+    @GET
+    @Path("/featureFlags")
+    public Response getFeatureFlags() {
+        Map<String, String> map = new TreeMap<>();
+        for (FeatureFlags flag : FeatureFlags.values()) {
+            map.put(flag.name(), flag.enabled() ? "enabled" : "disabled");
+        }
+        return ok(Json.createObjectBuilder(map));
+    }
+
+    @GET
+    @Path("/featureFlags/{flag}")
+    public Response getFeatureFlag(@PathParam("flag") String flagIn) {
+        try {
+            FeatureFlags flag = FeatureFlags.valueOf(flagIn);
+            JsonObjectBuilder job = Json.createObjectBuilder();
+            job.add("enabled", flag.enabled());
+            return ok(job);
+        } catch (IllegalArgumentException ex) {
+            return error(Status.NOT_FOUND, "Feature flag not found. Try listing all feature flags.");
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("/datafiles/auditFiles")
+    public Response getAuditFiles(@Context ContainerRequestContext crc,
+                                  @QueryParam("firstId") Long firstId, @QueryParam("lastId") Long lastId,
+                                  @QueryParam("datasetIdentifierList") String datasetIdentifierList) throws WrappedResponse {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        int datasetsChecked = 0;
+        long startId = (firstId == null ? 0 : firstId);
+        long endId = (lastId == null ? Long.MAX_VALUE : lastId);
+
+        List<String> datasetIdentifiers;
+        if (datasetIdentifierList == null || datasetIdentifierList.isEmpty()) {
+            datasetIdentifiers = Collections.emptyList();
+        } else {
+            startId = 0;
+            endId = Long.MAX_VALUE;
+            datasetIdentifiers = List.of(datasetIdentifierList.split(","));
+        }
+        if (endId < startId) {
+            return badRequest("Invalid Parameters: lastId must be equal to or greater than firstId");
+        }
+
+        NullSafeJsonBuilder jsonObjectBuilder = NullSafeJsonBuilder.jsonObjectBuilder();
+        JsonArrayBuilder jsonDatasetsArrayBuilder = Json.createArrayBuilder();
+        JsonArrayBuilder jsonFailuresArrayBuilder = Json.createArrayBuilder();
+
+        if (startId > 0) {
+            jsonObjectBuilder.add("firstId", startId);
+        }
+        if (endId < Long.MAX_VALUE) {
+            jsonObjectBuilder.add("lastId", endId);
+        }
+
+        // compile the list of ids to process
+        List<Long> datasetIds;
+        if (datasetIdentifiers.isEmpty()) {
+            datasetIds = datasetService.findAllLocalDatasetIds();
+        } else {
+            datasetIds = new ArrayList<>(datasetIdentifiers.size());
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+            datasetIdentifiers.forEach(id -> {
+                String dId = id.trim();
+                jab.add(dId);
+                Dataset d = datasetService.findByGlobalId(dId);
+                if (d != null) {
+                    datasetIds.add(d.getId());
+                } else {
+                    NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+                    job.add("datasetIdentifier",dId);
+                    job.add("reason","Not Found");
+                    jsonFailuresArrayBuilder.add(job);
+                }
+            });
+            jsonObjectBuilder.add("datasetIdentifierList", jab);
+        }
+
+        for (Long datasetId : datasetIds) {
+            if (datasetId < startId) {
+                continue;
+            } else if (datasetId > endId) {
+                break;
+            }
+            Dataset dataset;
+            try {
+                dataset = findDatasetOrDie(String.valueOf(datasetId));
+                datasetsChecked++;
+            } catch (WrappedResponse e) {
+                NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+                job.add("datasetId", datasetId);
+                job.add("reason", e.getMessage());
+                jsonFailuresArrayBuilder.add(job);
+                continue;
+            }
+
+            List<String> missingFiles = new ArrayList<>();
+            List<String> missingFileMetadata = new ArrayList<>();
+            try {
+                Predicate<String> filter = s -> true;
+                StorageIO<DvObject> datasetIO = DataAccess.getStorageIO(dataset);
+                final List<String> result = datasetIO.cleanUp(filter, true);
+                // add files that are in dataset files but not in cleanup result or DataFiles with missing FileMetadata
+                dataset.getFiles().forEach(df -> {
+                    try {
+                        StorageIO<DataFile> datafileIO = df.getStorageIO();
+                        String storageId = df.getStorageIdentifier();
+                        FileMetadata fm = df.getFileMetadata();
+                        if (!datafileIO.exists()) {
+                            missingFiles.add(storageId + "," + (fm != null ?
+                                    (fm.getDirectoryLabel() != null || !fm.getDirectoryLabel().isEmpty() ? "directoryLabel,"+fm.getDirectoryLabel()+"," : "")
+                                            +"label,"+fm.getLabel() : "type,"+df.getContentType()));
+                        }
+                        if (fm == null) {
+                            missingFileMetadata.add(storageId + ",dataFileId," + df.getId());
+                        }
+                    } catch (IOException e) {
+                        NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+                        job.add("dataFileId", df.getId());
+                        job.add("reason", e.getMessage());
+                        jsonFailuresArrayBuilder.add(job);
+                    }
+                });
+            } catch (IOException e) {
+                NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+                job.add("datasetId", datasetId);
+                job.add("reason", e.getMessage());
+                jsonFailuresArrayBuilder.add(job);
+            }
+
+            JsonObjectBuilder job = Json.createObjectBuilder();
+            if (!missingFiles.isEmpty() || !missingFileMetadata.isEmpty()) {
+                job.add("id", dataset.getId());
+                job.add("pid", dataset.getProtocol() + ":" + dataset.getAuthority() + "/" + dataset.getIdentifier());
+                job.add("persistentURL", dataset.getPersistentURL());
+                if (!missingFileMetadata.isEmpty()) {
+                    JsonArrayBuilder jabMissingFileMetadata = Json.createArrayBuilder();
+                    missingFileMetadata.forEach(mm -> {
+                        String[] missingMetadata = mm.split(",");
+                        NullSafeJsonBuilder jobj = NullSafeJsonBuilder.jsonObjectBuilder()
+                                .add("storageIdentifier", missingMetadata[0])
+                                .add(missingMetadata[1], missingMetadata[2]);
+                        jabMissingFileMetadata.add(jobj);
+                    });
+                    job.add("missingFileMetadata", jabMissingFileMetadata);
+                }
+                if (!missingFiles.isEmpty()) {
+                    JsonArrayBuilder jabMissingFiles = Json.createArrayBuilder();
+                    missingFiles.forEach(mf -> {
+                        String[] missingFile = mf.split(",");
+                        NullSafeJsonBuilder jobj = NullSafeJsonBuilder.jsonObjectBuilder()
+                                .add("storageIdentifier", missingFile[0]);
+                        for (int i = 2; i < missingFile.length; i+=2) {
+                            jobj.add(missingFile[i-1], missingFile[i]);
+                        }
+                        jabMissingFiles.add(jobj);
+                    });
+                    job.add("missingFiles", jabMissingFiles);
+                }
+                jsonDatasetsArrayBuilder.add(job);
+            }
+        }
+
+        jsonObjectBuilder.add("datasetsChecked", datasetsChecked);
+        jsonObjectBuilder.add("datasets", jsonDatasetsArrayBuilder);
+        jsonObjectBuilder.add("failures", jsonFailuresArrayBuilder);
+
+        return ok(jsonObjectBuilder);
+    }
+
+    @GET
+    @AuthRequired
+    @Path("/rateLimitStats")
+    @Produces("text/csv")
+    public Response rateLimitStats(@Context ContainerRequestContext crc,
+                                   @QueryParam("deltaMinutesFilter") Long deltaMinutesFilter) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        String csvData = cacheFactory.getStats(CacheFactoryBean.RATE_LIMIT_CACHE, deltaMinutesFilter != null ? String.valueOf(deltaMinutesFilter) : null);
+        return Response.ok(csvData).header("Content-Disposition", "attachment; filename=\"data.csv\"").build();
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/ApiBlockingFilter.java b/src/main/java/edu/harvard/iq/dataverse/api/ApiBlockingFilter.java
deleted file mode 100644
index 761a6c8ef77..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/ApiBlockingFilter.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package edu.harvard.iq.dataverse.api;
-
-import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
-import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-
-/**
- * A web filter to block API administration calls.
- * @author michael
- */
-public class ApiBlockingFilter implements javax.servlet.Filter {
-    private static final String UNBLOCK_KEY_QUERYPARAM = "unblock-key";
-            
-    interface BlockPolicy {
-        public void doBlock(ServletRequest sr, ServletResponse sr1, FilterChain fc) throws IOException, ServletException;
-    }
-    
-    /**
-     * A policy that allows all requests.
-     */
-    private static final BlockPolicy ALLOW = new BlockPolicy(){
-        @Override
-        public void doBlock(ServletRequest sr, ServletResponse sr1, FilterChain fc) throws IOException, ServletException {
-            fc.doFilter(sr, sr1);
-        }
-    };
-    
-    /**
-     * A policy that drops blocked requests.
-     */
-    private static final BlockPolicy DROP = new BlockPolicy(){
-        @Override
-        public void doBlock(ServletRequest sr, ServletResponse sr1, FilterChain fc) throws IOException, ServletException {
-            HttpServletResponse httpResponse = (HttpServletResponse) sr1;
-            httpResponse.getWriter().println("{ status:\"error\", message:\"Endpoint blocked. Please contact the dataverse administrator\"}" );
-            httpResponse.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
-            httpResponse.setContentType("application/json");
-        }
-    };
-    
-    /**
-     * Allow only from localhost.
-     */
-    private static final BlockPolicy LOCAL_HOST_ONLY = new BlockPolicy() {
-
-        @Override
-        public void doBlock(ServletRequest sr, ServletResponse sr1, FilterChain fc) throws IOException, ServletException {
-            IpAddress origin = new DataverseRequest( null, (HttpServletRequest)sr ).getSourceAddress();
-            if ( origin.isLocalhost() ) {
-                fc.doFilter(sr, sr1);
-            } else {
-                HttpServletResponse httpResponse = (HttpServletResponse) sr1;
-                httpResponse.getWriter().println("{ status:\"error\", message:\"Endpoint available from localhost only. Please contact the dataverse administrator\"}" );
-                httpResponse.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
-                httpResponse.setContentType("application/json");
-            }
-        }
-    };
-      
-    /**
-     * Allow only for requests that have the {@link #UNBLOCK_KEY_QUERYPARAM} param with
-     * value from {@link SettingsServiceBean.Key.BlockedApiKey}
-     */
-    private final BlockPolicy unblockKey = new BlockPolicy() {
-
-        @Override
-        public void doBlock(ServletRequest sr, ServletResponse sr1, FilterChain fc) throws IOException, ServletException {
-            boolean block = true;
-            
-            String masterKey = settingsSvc.getValueForKey(SettingsServiceBean.Key.BlockedApiKey);
-            if ( masterKey != null ) {
-                String queryString = ((HttpServletRequest)sr).getQueryString();
-                if ( queryString != null ) {
-                    for ( String paramPair : queryString.split("&") ) {
-                        String[] curPair = paramPair.split("=",-1);
-                        if ( (curPair.length >= 2 )
-                               && UNBLOCK_KEY_QUERYPARAM.equals(curPair[0])
-                               && masterKey.equals(curPair[1]) ) {
-                            block = false;
-                            break;
-                        }
-                    }
-                }
-            }
-            
-            if ( block ) {
-                HttpServletResponse httpResponse = (HttpServletResponse) sr1;
-                httpResponse.getWriter().println("{ status:\"error\", message:\"Endpoint available using API key only. Please contact the dataverse administrator\"}" );
-                httpResponse.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
-                httpResponse.setContentType("application/json");
-            } else {
-                fc.doFilter(sr, sr1);
-            }
-        }
-    };
-    
-    private static final Logger logger = Logger.getLogger(ApiBlockingFilter.class.getName());
-    
-    @EJB
-    protected SettingsServiceBean settingsSvc;
-    
-    final Set<String> blockedApiEndpoints = new TreeSet<>();
-    private String lastEndpointList;
-    private final Map<String, BlockPolicy> policies = new TreeMap<>();
-    
-    @Override
-    public void init(FilterConfig fc) throws ServletException {
-        updateBlockedPoints();
-        policies.put("allow", ALLOW);
-        policies.put("drop", DROP);
-        policies.put("localhost-only", LOCAL_HOST_ONLY);
-        policies.put("unblock-key", unblockKey);
-    }
-
-    private void updateBlockedPoints() {
-        blockedApiEndpoints.clear();
-        String endpointList = settingsSvc.getValueForKey(SettingsServiceBean.Key.BlockedApiEndpoints, "");
-        for ( String endpoint : endpointList.split(",") ) {
-            String endpointPrefix = canonize(endpoint);
-            if ( ! endpointPrefix.isEmpty() ) {
-                endpointPrefix = endpointPrefix + "/"; 
-                logger.log(Level.INFO, "Blocking API endpoint: {0}", endpointPrefix);
-                blockedApiEndpoints.add(endpointPrefix);
-            }
-        }
-        lastEndpointList = endpointList;
-    }
-
-    @Override
-    public void doFilter(ServletRequest sr, ServletResponse sr1, FilterChain fc) throws IOException, ServletException {
-        
-        String endpointList = settingsSvc.getValueForKey(SettingsServiceBean.Key.BlockedApiEndpoints, "");
-        if ( ! endpointList.equals(lastEndpointList) ) {
-            updateBlockedPoints();
-        }
-        
-        HttpServletRequest hsr = (HttpServletRequest) sr;
-        String requestURI = hsr.getRequestURI();
-        String apiEndpoint = canonize(requestURI.substring(hsr.getServletPath().length()));
-        for ( String prefix : blockedApiEndpoints ) {
-            if ( apiEndpoint.startsWith(prefix) ) {
-                getBlockPolicy().doBlock(sr, sr1, fc);
-                return;
-            }
-        }
-        try {
-            if (settingsSvc.isTrueForKey(SettingsServiceBean.Key.AllowCors, true )) {
-                ((HttpServletResponse) sr1).addHeader("Access-Control-Allow-Origin", "*");
-                ((HttpServletResponse) sr1).addHeader("Access-Control-Allow-Methods", "PUT, GET, POST, DELETE, OPTIONS");
-                ((HttpServletResponse) sr1).addHeader("Access-Control-Allow-Headers", "Content-Type, X-Dataverse-Key");
-            }
-            fc.doFilter(sr, sr1);
-        } catch ( ServletException se ) {
-            logger.log(Level.WARNING, "Error processing " + requestURI +": " + se.getMessage(), se);
-            HttpServletResponse resp = (HttpServletResponse) sr1;
-            resp.setStatus(500);
-            resp.setHeader("PROCUDER", "ApiBlockingFilter");
-            resp.getWriter().append("Error: " + se.getMessage());
-        }
-    }
-    
-    @Override
-    public void destroy() {}
-    
-    private BlockPolicy getBlockPolicy() {
-        String blockPolicyName = settingsSvc.getValueForKey(SettingsServiceBean.Key.BlockedApiPolicy, "");
-        BlockPolicy p = policies.get(blockPolicyName.trim());
-        if ( p != null ) {
-            return p;
-        } else {
-            logger.log(Level.WARNING, "Undefined block policy {0}. Available policies are {1}",
-                    new Object[]{blockPolicyName, policies.keySet()});
-            return ALLOW;
-        }
-    }
-    
-    /**
-     * Creates a canonical representation of {@code in}: trimmed spaces and slashes
-     * @param in the raw string
-     * @return {@code in} with no trailing and leading spaces and slashes.
-     */
-    private String canonize( String in ) {
-        in = in.trim();
-        if ( in.startsWith("/") ) {
-            in = in.substring(1);
-        }
-        if ( in.endsWith("/") ) {
-            in = in.substring(0, in.length()-1);
-        }
-        return in;
-    } 
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/ApiConfiguration.java b/src/main/java/edu/harvard/iq/dataverse/api/ApiConfiguration.java
index eead559f15e..f7c4e7e105f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/ApiConfiguration.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/ApiConfiguration.java
@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse.api;
 
-import javax.ws.rs.ApplicationPath;
+import jakarta.ws.rs.ApplicationPath;
+
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
 import org.glassfish.jersey.server.ResourceConfig;
 
@@ -13,7 +14,3 @@ public ApiConfiguration() {
        register(MultiPartFeature.class);
    }
 }
-/*
-public class ApiConfiguration extends ResourceConfi {
-}
-*/
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java b/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java
new file mode 100644
index 00000000000..15114085c21
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java
@@ -0,0 +1,24 @@
+package edu.harvard.iq.dataverse.api;
+
+public final class ApiConstants {
+
+    private ApiConstants() {
+        // Restricting instantiation
+    }
+
+    // Statuses
+    public static final String STATUS_OK = "OK";
+    public static final String STATUS_ERROR = "ERROR";
+
+    // Authentication
+    public static final String CONTAINER_REQUEST_CONTEXT_USER = "user";
+
+    // Dataset
+    public static final String DS_VERSION_LATEST = ":latest";
+    public static final String DS_VERSION_DRAFT = ":draft";
+    public static final String DS_VERSION_LATEST_PUBLISHED = ":latest-published";
+    
+    // addFiles call
+    public static final String API_ADD_FILES_COUNT_PROCESSED = "Total number of files";
+    public static final String API_ADD_FILES_COUNT_SUCCESSFUL = "Number of files successfully added";
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/ApiRouter.java b/src/main/java/edu/harvard/iq/dataverse/api/ApiRouter.java
index 691afeaef20..28b5592f0dc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/ApiRouter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/ApiRouter.java
@@ -1,21 +1,24 @@
 package edu.harvard.iq.dataverse.api;
 
+import jakarta.servlet.Filter;
 import java.io.IOException;
 import java.util.logging.Logger;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.annotation.WebFilter;
 
 /**
  * Routes API calls that don't have a version number to the latest API version
  * 
  * @author michael
  */
-public class ApiRouter implements javax.servlet.Filter {
+@WebFilter("/api/*")
+public class ApiRouter implements Filter {
     private static final Logger logger = Logger.getLogger(ApiRouter.class.getName());
     
     @Override
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/BatchImport.java b/src/main/java/edu/harvard/iq/dataverse/api/BatchImport.java
index 7b44d920fbe..a2d06bff93e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/BatchImport.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/BatchImport.java
@@ -1,5 +1,6 @@
 package edu.harvard.iq.dataverse.api;
 
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.api.imports.ImportServiceBean;
 import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
@@ -9,18 +10,21 @@
 
 import edu.harvard.iq.dataverse.api.imports.ImportException;
 import edu.harvard.iq.dataverse.api.imports.ImportUtil.ImportType;
+import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
 
 @Stateless
 @Path("batch")
@@ -42,10 +46,14 @@ public class BatchImport extends AbstractApiBean {
     BatchServiceBean batchService;
 
     @GET
+    @AuthRequired
     @Path("harvest")
-    public Response harvest(@QueryParam("path") String fileDir, @QueryParam("dv") String parentIdtf, @QueryParam("createDV") Boolean createDV, @QueryParam("key") String apiKey) throws IOException {
-        return startBatchJob(fileDir, parentIdtf, apiKey, ImportType.HARVEST, createDV);
-
+    public Response harvest(@Context ContainerRequestContext crc, @QueryParam("path") String fileDir, @QueryParam("dv") String parentIdtf, @QueryParam("createDV") Boolean createDV, @QueryParam("key") String apiKey) throws IOException {
+        try {
+            return startBatchJob(getRequestAuthenticatedUserOrDie(crc), fileDir, parentIdtf, apiKey, ImportType.HARVEST, createDV);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
     }
 
     /**
@@ -57,12 +65,13 @@ public Response harvest(@QueryParam("path") String fileDir, @QueryParam("dv") St
      * @return import status (including id of the dataset created)
      */
     @POST
+    @AuthRequired
     @Path("import")
-    public Response postImport(String body, @QueryParam("dv") String parentIdtf, @QueryParam("key") String apiKey) {
+    public Response postImport(@Context ContainerRequestContext crc, String body, @QueryParam("dv") String parentIdtf, @QueryParam("key") String apiKey) {
 
         DataverseRequest dataverseRequest;
         try {
-            dataverseRequest = createDataverseRequest(findAuthenticatedUserOrDie());
+            dataverseRequest = createDataverseRequest(getRequestAuthenticatedUserOrDie(crc));
         } catch (WrappedResponse wr) {
             return wr.getResponse();
         }
@@ -94,24 +103,23 @@ public Response postImport(String body, @QueryParam("dv") String parentIdtf, @Qu
      * @return import status (including id's of the datasets created)
      */
     @GET
+    @AuthRequired
     @Path("import")
-    public Response getImport(@QueryParam("path") String fileDir, @QueryParam("dv") String parentIdtf, @QueryParam("createDV") Boolean createDV, @QueryParam("key") String apiKey) {
-
-        return startBatchJob(fileDir, parentIdtf, apiKey, ImportType.NEW, createDV);
-
+    public Response getImport(@Context ContainerRequestContext crc, @QueryParam("path") String fileDir, @QueryParam("dv") String parentIdtf, @QueryParam("createDV") Boolean createDV, @QueryParam("key") String apiKey) {
+        try {
+            return startBatchJob(getRequestAuthenticatedUserOrDie(crc), fileDir, parentIdtf, apiKey, ImportType.NEW, createDV);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
     }
 
-    private Response startBatchJob(String fileDir, String parentIdtf, String apiKey, ImportType importType, Boolean createDV) {
+    private Response startBatchJob(User user, String fileDir, String parentIdtf, String apiKey, ImportType importType, Boolean createDV) {
         if (createDV == null) {
             createDV = Boolean.FALSE;
         }
         try {
             DataverseRequest dataverseRequest;
-            try {
-                dataverseRequest = createDataverseRequest(findAuthenticatedUserOrDie());
-            } catch (WrappedResponse wr) {
-                return wr.getResponse();
-            }
+            dataverseRequest = createDataverseRequest(user);
             if (parentIdtf == null) {
                 parentIdtf = "root";
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/BatchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/BatchServiceBean.java
index 8fe58298481..fda698d6f5c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/BatchServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/BatchServiceBean.java
@@ -14,12 +14,12 @@
 import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.Asynchronous;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
 
 /**
  * EJB for kicking off big batch jobs asynchronously from the REST API  (BatchImport.java)
@@ -46,8 +46,8 @@ public void processFilePath(String fileDir, String parentIdtf, DataverseRequest
         
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
         
-        validationLog = new PrintWriter(new FileWriter( "../logs/validationLog"+  formatter.format(timestamp)+".txt"));
-        cleanupLog = new PrintWriter(new FileWriter( "../logs/cleanupLog"+  formatter.format(timestamp)+".txt"));
+        validationLog = new PrintWriter(new FileWriter( System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "validationLog"+  formatter.format(timestamp)+".txt"));
+        cleanupLog = new PrintWriter(new FileWriter( System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "cleanupLog"+  formatter.format(timestamp)+".txt"));
         File dir = new File(fileDir);
         if (dir.isDirectory()) {
             for (File file : dir.listFiles()) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/BuiltinUsers.java b/src/main/java/edu/harvard/iq/dataverse/api/BuiltinUsers.java
index 0477c1030b8..317f7d6c870 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/BuiltinUsers.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/BuiltinUsers.java
@@ -3,6 +3,7 @@
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.UserNotification;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
+import edu.harvard.iq.dataverse.api.auth.ApiKeyAuthMechanism;
 import edu.harvard.iq.dataverse.authorization.UserRecordIdentifier;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUser;
@@ -12,25 +13,22 @@
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import java.sql.Timestamp;
-import java.util.Calendar;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 import java.util.Date;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
 
 /**
  * REST API bean for managing {@link BuiltinUser}s.
@@ -84,8 +82,11 @@ public Response getApiToken( @PathParam("username") String username, @QueryParam
     //and use the values to create BuiltinUser/AuthenticatedUser.
     //--MAD 4.9.3
     @POST
-    public Response save(BuiltinUser user, @QueryParam("password") String password, @QueryParam("key") String key) {
-        return internalSave(user, password, key);
+    public Response save(BuiltinUser user, @QueryParam("password") String password, @QueryParam("key") String key, @QueryParam("sendEmailNotification") Boolean sendEmailNotification) {   
+        if( sendEmailNotification == null )
+            sendEmailNotification = true;
+        
+        return internalSave(user, password, key, sendEmailNotification);
     }
 
     /**
@@ -105,7 +106,29 @@ public Response create(BuiltinUser user, @PathParam("password") String password,
         return internalSave(user, password, key);
     }
     
+    /**
+     * Created this new endpoint to resolve issue #6915, optionally preventing 
+     * the email notification to the new user on account creation by adding 
+     * "false" as the third path parameter.
+     *
+     * @param user
+     * @param password
+     * @param key
+     * @param sendEmailNotification
+     * @return
+     */
+    @POST
+    @Path("{password}/{key}/{sendEmailNotification}")
+    public Response createWithNotification(BuiltinUser user, @PathParam("password") String password, @PathParam("key") String key, @PathParam("sendEmailNotification") Boolean sendEmailNotification) {
+        return internalSave(user, password, key, sendEmailNotification);
+    }
+    
+    // internalSave without providing an explicit "sendEmailNotification"
     private Response internalSave(BuiltinUser user, String password, String key) {
+        return internalSave(user, password, key, true);
+    }
+    
+    private Response internalSave(BuiltinUser user, String password, String key, Boolean sendEmailNotification) {
         String expectedKey = settingsSvc.get(API_KEY_IN_SETTINGS);
         
         if (expectedKey == null) {
@@ -149,7 +172,7 @@ private Response internalSave(BuiltinUser user, String password, String key) {
             } catch (Exception e) {
                 logger.info("The root dataverse is not present. Don't send a notification to dataverseAdmin.");
             }
-            if (rootDataversePresent) {
+            if (rootDataversePresent && sendEmailNotification) {
                 userNotificationSvc.sendNotification(au,
                         new Timestamp(new Date().getTime()),
                         UserNotification.Type.CREATEACC, null);
@@ -187,4 +210,14 @@ private Response internalSave(BuiltinUser user, String password, String key) {
         }
     }
 
+    /***
+     * This method was moved here from AbstractApiBean during the filter-based auth
+     * refactoring, in order to preserve the existing BuiltinUsers endpoints behavior.
+     *
+     * @param apiKey from request
+     * @return error Response
+     */
+    private Response badApiKey(String apiKey) {
+        return error(Status.UNAUTHORIZED, (apiKey != null) ? "Bad api key " : "Please provide a key query parameter (?key=XXX) or via the HTTP header " + ApiKeyAuthMechanism.DATAVERSE_API_KEY_REQUEST_HEADER_NAME);
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/BundleDownloadInstanceWriter.java b/src/main/java/edu/harvard/iq/dataverse/api/BundleDownloadInstanceWriter.java
index c306da51231..35f19375902 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/BundleDownloadInstanceWriter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/BundleDownloadInstanceWriter.java
@@ -12,14 +12,14 @@
 import java.io.OutputStream;
 import java.io.IOException;
 
-import javax.ws.rs.WebApplicationException;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.WebApplicationException;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.dataaccess.*;
@@ -196,10 +196,10 @@ public void writeTo(BundleDownloadInstance di, Class<?> clazz, Type type, Annota
                 }
             }
         } catch (IOException ioex) {
-            throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
+            throw new InternalServerErrorException();
         }
 
-        throw new WebApplicationException(Response.Status.NOT_FOUND);
+        throw new NotFoundException();
 
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DataTagsAPI.java b/src/main/java/edu/harvard/iq/dataverse/api/DataTagsAPI.java
index 063033d4747..d7c8bd827d1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/DataTagsAPI.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DataTagsAPI.java
@@ -5,18 +5,18 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.json.JsonObject;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApi.java b/src/main/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApi.java
index 8882742d20c..f29387aeb56 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApi.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApi.java
@@ -18,29 +18,32 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.ConstraintViolationUtil;
+import org.apache.commons.lang3.StringUtils;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.asJsonArray;
 import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
-import javax.ws.rs.core.Response.Status;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response.Status;
 
 import java.io.BufferedInputStream;
 import java.io.FileOutputStream;
@@ -106,18 +109,7 @@ public Response getAll() {
                 sb.append(cause.getClass().getCanonicalName()).append(" ");
                 sb.append(cause.getMessage()).append(" ");
                 if (cause instanceof ConstraintViolationException) {
-                    ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
-                    for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
-                        sb.append("(invalid value: <<<")
-                                .append(violation.getInvalidValue())
-                                .append(">>> for ")
-                                .append(violation.getPropertyPath())
-                                .append(" at ")
-                                .append(violation.getLeafBean())
-                                .append(" - ")
-                                .append(violation.getMessage())
-                                .append(")");
-                    }
+                    sb.append(ConstraintViolationUtil.getErrorStringForConstraintViolations(cause));
                 }
             }
             return error(Status.INTERNAL_SERVER_ERROR, sb.toString());
@@ -135,6 +127,7 @@ public Response getByName(@PathParam("name") String name) {
             String solrFieldSearchable = dsf.getSolrField().getNameSearchable();
             String solrFieldFacetable = dsf.getSolrField().getNameFacetable();
             String metadataBlock = dsf.getMetadataBlock().getName();
+            String uri = dsf.getUri();
             boolean hasParent = dsf.isHasParent();
             boolean allowsMultiples = dsf.isAllowMultiples();
             boolean isRequired = dsf.isRequired();
@@ -166,7 +159,8 @@ public Response getByName(@PathParam("name") String name) {
                     .add("parentAllowsMultiples", parentAllowsMultiplesDisplay)
                     .add("solrFieldSearchable", solrFieldSearchable)
                     .add("solrFieldFacetable", solrFieldFacetable)
-                    .add("isRequired", isRequired));
+                    .add("isRequired", isRequired)
+                    .add("uri", uri));
         
         } catch ( NoResultException nre ) {
             return notFound(name);
@@ -180,10 +174,7 @@ public Response getByName(@PathParam("name") String name) {
                 sb.append(cause.getClass().getCanonicalName()).append(" ");
                 sb.append(cause.getMessage()).append(" ");
                 if (cause instanceof ConstraintViolationException) {
-                    ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
-                    for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
-                        sb.append("(invalid value: <<<").append(violation.getInvalidValue()).append(">>> for ").append(violation.getPropertyPath()).append(" at ").append(violation.getLeafBean()).append(" - ").append(violation.getMessage()).append(")");
-                    }
+                    sb.append(ConstraintViolationUtil.getErrorStringForConstraintViolations(cause));
                 }
             }
             return error( Status.INTERNAL_SERVER_ERROR, sb.toString() );
@@ -216,7 +207,7 @@ public Response showControlledVocabularyForSubject() {
     @GET
     @Path("loadNAControlledVocabularyValue")
     public Response loadNAControlledVocabularyValue() {
-        // the find will throw a javax.persistence.NoResultException if no values are in db
+        // the find will throw a NoResultException if no values are in db
 //            datasetFieldService.findNAControlledVocabularyValue();
         TypedQuery<ControlledVocabularyValue> naValueFinder = em.createQuery("SELECT OBJECT(o) FROM ControlledVocabularyValue AS o WHERE o.datasetFieldType is null AND o.strValue = :strvalue", ControlledVocabularyValue.class);
         naValueFinder.setParameter("strvalue", DatasetField.NA_VALUE);
@@ -232,8 +223,7 @@ public Response loadNAControlledVocabularyValue() {
         }
     }
 
-    private enum HeaderType {
-
+    public enum HeaderType {
         METADATABLOCK, DATASETFIELD, CONTROLLEDVOCABULARY
     }
 
@@ -249,11 +239,14 @@ public Response loadDatasetFields(File file) {
         int lineNumber = 0;
         HeaderType header = null;
         JsonArrayBuilder responseArr = Json.createArrayBuilder();
+        String[] values = null;
         try {
             br = new BufferedReader(new FileReader("/" + file));
             while ((line = br.readLine()) != null) {
                 lineNumber++;
-                String[] values = line.split(splitBy);
+                values = Arrays.stream(line.split(splitBy))
+                    .map(String::trim)
+                    .toArray(String[]::new);
                 if (values[0].startsWith("#")) { // Header row
                     switch (values[0]) {
                         case "#metadataBlock":
@@ -298,12 +291,20 @@ public Response loadDatasetFields(File file) {
             alr.setActionResult(ActionLogRecord.Result.BadRequest);
             alr.setInfo( alr.getInfo() + "// file not found");
             return error(Status.EXPECTATION_FAILED, "File not found");
-            
+
+        } catch (ArrayIndexOutOfBoundsException e) {
+            String message = getArrayIndexOutOfBoundMessage(header, lineNumber, values.length);
+            logger.log(Level.WARNING, message, e);
+            alr.setActionResult(ActionLogRecord.Result.InternalError);
+            alr.setInfo(alr.getInfo() + "// " + message);
+            return error(Status.INTERNAL_SERVER_ERROR, message);
+
         } catch (Exception e) {
-            logger.log(Level.WARNING, "Error parsing dataset fields:" + e.getMessage(), e);
+            String message = getGeneralErrorMessage(header, lineNumber, e.getMessage());
+            logger.log(Level.WARNING, message, e);
             alr.setActionResult(ActionLogRecord.Result.InternalError);
-            alr.setInfo( alr.getInfo() + "// " + e.getMessage());
-            return error(Status.INTERNAL_SERVER_ERROR, e.getMessage());
+            alr.setInfo( alr.getInfo() + "// " + message);
+            return error(Status.INTERNAL_SERVER_ERROR, message);
             
         } finally {
             if (br != null) {
@@ -319,6 +320,67 @@ public Response loadDatasetFields(File file) {
         return ok( Json.createObjectBuilder().add("added", responseArr) );
     }
 
+    /**
+     * Provide a general error message including the part and line number
+     * @param header
+     * @param lineNumber
+     * @param message
+     * @return
+     */
+    public String getGeneralErrorMessage(HeaderType header, int lineNumber, String message) {
+        List<String> arguments = new ArrayList<>();
+        arguments.add(header != null ? header.name() : "unknown");
+        arguments.add(String.valueOf(lineNumber));
+        arguments.add(message);
+        return BundleUtil.getStringFromBundle("api.admin.datasetfield.load.GeneralErrorMessage", arguments);
+    }
+
+    /**
+     * Turn ArrayIndexOutOfBoundsException into an informative error message
+     * @param header
+     * @param lineNumber
+     * @param wrongIndex
+     * @return
+     */
+    public String getArrayIndexOutOfBoundMessage(HeaderType header,
+                                                 int lineNumber,
+                                                 int wrongIndex) {
+
+        List<String> columns = getColumnsByHeader(header);
+        
+        String column = columns.get(wrongIndex - 1);
+        List<String> arguments = new ArrayList<>();
+        arguments.add(header.name());
+        arguments.add(String.valueOf(lineNumber));
+        arguments.add(column);
+        arguments.add(String.valueOf(wrongIndex + 1));
+        return BundleUtil.getStringFromBundle(
+            "api.admin.datasetfield.load.ArrayIndexOutOfBoundMessage",
+            arguments
+        );
+    }
+
+    /**
+     * Get the list of columns by the type of header
+     * @param header
+     * @return
+     */
+    private List<String> getColumnsByHeader(HeaderType header) {
+        List<String> columns = null;
+        if (header.equals(HeaderType.METADATABLOCK)) {
+            columns = Arrays.asList("name", "dataverseAlias", "displayName");
+        } else if (header.equals(HeaderType.DATASETFIELD)) {
+            columns = Arrays.asList("name", "title", "description", "watermark",
+              "fieldType", "displayOrder", "displayFormat", "advancedSearchField",
+              "allowControlledVocabulary", "allowmultiples", "facetable",
+              "displayoncreate", "required", "parent", "metadatablock_id");
+        } else if (header.equals(HeaderType.CONTROLLEDVOCABULARY)) {
+            columns = Arrays.asList("DatasetField", "Value", "identifier", "displayOrder");
+        }
+
+        return columns;
+    }
+
     private String parseMetadataBlock(String[] values) {
         //Test to see if it exists by name
         MetadataBlock mdb = metadataBlockService.findByName(values[1]);
@@ -399,15 +461,23 @@ private String parseControlledVocabulary(String[] values) {
         if (cvv == null) {
             cvv = new ControlledVocabularyValue();
             cvv.setDatasetFieldType(dsv);
-            //Alt is only for dataload so only add to new
-            for (int i = 5; i < values.length; i++) {
-                ControlledVocabAlternate alt = new ControlledVocabAlternate();
-                alt.setDatasetFieldType(dsv);
-                alt.setControlledVocabularyValue(cvv);
-                alt.setStrValue(values[i]);
-                cvv.getControlledVocabAlternates().add(alt);
-            }
-        }         
+        }
+        
+        // Alternate variants for this controlled vocab. value: 
+        
+        // Note that these are overwritten every time:
+        cvv.getControlledVocabAlternates().clear();
+        // - meaning, if an alternate has been removed from the tsv file, 
+        // it will be removed from the database! -- L.A. 5.4
+        
+        for (int i = 5; i < values.length; i++) {
+            ControlledVocabAlternate alt = new ControlledVocabAlternate();
+            alt.setDatasetFieldType(dsv);
+            alt.setControlledVocabularyValue(cvv);
+            alt.setStrValue(values[i]);
+            cvv.getControlledVocabAlternates().add(alt);
+        }
+        
         cvv.setStrValue(values[2]);
         cvv.setIdentifier(values[3]);
         cvv.setDisplayOrder(Integer.parseInt(values[4]));
@@ -420,9 +490,7 @@ private String parseControlledVocabulary(String[] values) {
     @Consumes("application/zip")
     @Path("loadpropertyfiles")
     public Response loadLanguagePropertyFile(File inputFile) {
-        try
-        {
-            ZipFile file = new ZipFile(inputFile);
+        try (ZipFile file = new ZipFile(inputFile)) {
             //Get file entries
             Enumeration<? extends ZipEntry> entries = file.entries();
 
@@ -434,20 +502,26 @@ public Response loadLanguagePropertyFile(File inputFile) {
             {
                 ZipEntry entry = entries.nextElement();
                 String dataverseLangFileName = dataverseLangDirectory + "/" + entry.getName();
-                FileOutputStream fileOutput = new FileOutputStream(dataverseLangFileName);
+                File entryFile = new File(dataverseLangFileName);
+                String canonicalPath = entryFile.getCanonicalPath();
+                if (canonicalPath.startsWith(dataverseLangDirectory + "/")) {
+                    try (FileOutputStream fileOutput = new FileOutputStream(dataverseLangFileName)) {
 
-                InputStream is = file.getInputStream(entry);
-                BufferedInputStream bis = new BufferedInputStream(is);
+                        InputStream is = file.getInputStream(entry);
+                        BufferedInputStream bis = new BufferedInputStream(is);
 
-                while (bis.available() > 0) {
-                    fileOutput.write(bis.read());
+                        while (bis.available() > 0) {
+                            fileOutput.write(bis.read());
+                        }
+                    }
+                } else {
+                    logger.log(Level.SEVERE, "Zip Slip prevented: uploaded zip file tried to write to {}", canonicalPath);
+                    return Response.status(400).entity("The zip file includes an illegal file path").build();
                 }
-                fileOutput.close();
             }
         }
-        catch(IOException e)
-        {
-            e.printStackTrace();
+        catch(IOException e) {
+            logger.log(Level.SEVERE, "Reading the language property zip file failed", e);
             return Response.status(500).entity("Internal server error. More details available at the server logs.").build();
         }
 
@@ -472,4 +546,19 @@ public static String getDataverseLangDirectory() {
         return dataverseLangDirectory;
     }
 
+    /**
+     * Set setDisplayOnCreate for a DatasetFieldType.
+     */
+    @POST
+    @Path("/setDisplayOnCreate")
+    public Response setDisplayOnCreate(@QueryParam("datasetFieldType") String datasetFieldTypeIn, @QueryParam("setDisplayOnCreate") Boolean setDisplayOnCreateIn) {
+        DatasetFieldType dft = datasetFieldService.findByName(datasetFieldTypeIn);
+        if (dft == null) {
+            return error(Status.NOT_FOUND, "Cound not find a DatasetFieldType by looking up " + datasetFieldTypeIn);
+        }
+        dft.setDisplayOnCreate(setDisplayOnCreateIn);
+        DatasetFieldType saved = datasetFieldService.save(dft);
+        return ok("DisplayOnCreate for DatasetFieldType " + saved.getName() + " is now " + saved.isDisplayOnCreate());
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DatasetFields.java b/src/main/java/edu/harvard/iq/dataverse/api/DatasetFields.java
new file mode 100644
index 00000000000..2ec35c896d9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DatasetFields.java
@@ -0,0 +1,29 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import jakarta.ejb.EJB;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+
+import java.util.List;
+
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.jsonDatasetFieldTypes;
+
+/**
+ * Api bean for managing dataset fields.
+ */
+@Path("datasetfields")
+@Produces("application/json")
+public class DatasetFields extends AbstractApiBean {
+
+    @EJB
+    DatasetFieldServiceBean datasetFieldService;
+
+    @GET
+    @Path("facetables")
+    public Response listAllFacetableDatasetFields() {
+        List<DatasetFieldType> datasetFieldTypes = datasetFieldService.findAllFacetableFieldTypes();
+        return ok(jsonDatasetFieldTypes(datasetFieldTypes));
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
index 88710823ce4..729174dedfc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
@@ -1,178 +1,150 @@
 package edu.harvard.iq.dataverse.api;
 
-import edu.harvard.iq.dataverse.ControlledVocabularyValue;
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.DataFileServiceBean;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetField;
-import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
-import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
-import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.DatasetFieldValue;
-import edu.harvard.iq.dataverse.DatasetLock;
-import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
-import edu.harvard.iq.dataverse.DataverseSession;
-import edu.harvard.iq.dataverse.EjbDataverseEngine;
-import edu.harvard.iq.dataverse.MetadataBlock;
-import edu.harvard.iq.dataverse.MetadataBlockServiceBean;
-import edu.harvard.iq.dataverse.PermissionServiceBean;
-import edu.harvard.iq.dataverse.UserNotification;
-import edu.harvard.iq.dataverse.UserNotificationServiceBean;
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.DatasetLock.Reason;
+import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
+import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.api.dto.RoleAssignmentDTO;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.batch.jobs.importer.ImportMode;
+import edu.harvard.iq.dataverse.dataaccess.*;
 import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleUtil;
+import software.amazon.awssdk.services.s3.model.CompletedPart;
 import edu.harvard.iq.dataverse.datacapturemodule.ScriptRequestResponse;
-import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
-import edu.harvard.iq.dataverse.dataset.DatasetUtil;
+import edu.harvard.iq.dataverse.dataset.*;
 import edu.harvard.iq.dataverse.datasetutility.AddReplaceFileHelper;
 import edu.harvard.iq.dataverse.datasetutility.DataFileTagException;
 import edu.harvard.iq.dataverse.datasetutility.NoFilesException;
 import edu.harvard.iq.dataverse.datasetutility.OptionalFileParams;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.engine.command.impl.AbstractSubmitToArchiveCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.AddLockCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.AssignRoleCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.CreateDatasetVersionCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.CreatePrivateUrlCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.CuratePublishedDatasetVersionCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteDatasetVersionCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteDatasetLinkingDataverseCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.DeletePrivateUrlCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.DestroyDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetSpecificPublishedDatasetVersionCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetDraftDatasetVersionCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetLatestAccessibleDatasetVersionCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetLatestPublishedDatasetVersionCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetPrivateUrlCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.ImportFromFileSystemCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.LinkDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.ListRoleAssignments;
-import edu.harvard.iq.dataverse.engine.command.impl.ListVersionsCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.MoveDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.PublishDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.PublishDatasetResult;
-import edu.harvard.iq.dataverse.engine.command.impl.RemoveLockCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.RequestRsyncScriptCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.ReturnDatasetToAuthorCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.SetDatasetCitationDateCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.SubmitDatasetForReviewCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetTargetURLCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetThumbnailCommand;
+import edu.harvard.iq.dataverse.engine.command.exception.*;
+import edu.harvard.iq.dataverse.engine.command.impl.*;
 import edu.harvard.iq.dataverse.export.DDIExportServiceBean;
 import edu.harvard.iq.dataverse.export.ExportService;
+import edu.harvard.iq.dataverse.externaltools.ExternalTool;
+import edu.harvard.iq.dataverse.externaltools.ExternalToolHandler;
+import edu.harvard.iq.dataverse.globus.GlobusServiceBean;
+import edu.harvard.iq.dataverse.globus.GlobusUtil;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
-import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
-import edu.harvard.iq.dataverse.S3PackageImporter;
-import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
-import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.exception.UnforcedCommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateDvObjectPIDMetadataCommand;
-import edu.harvard.iq.dataverse.makedatacount.DatasetExternalCitations;
-import edu.harvard.iq.dataverse.makedatacount.DatasetExternalCitationsServiceBean;
-import edu.harvard.iq.dataverse.makedatacount.DatasetMetrics;
-import edu.harvard.iq.dataverse.makedatacount.DatasetMetricsServiceBean;
-import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean;
+import edu.harvard.iq.dataverse.ingest.IngestUtil;
+import edu.harvard.iq.dataverse.makedatacount.*;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean.MakeDataCountEntry;
-import edu.harvard.iq.dataverse.makedatacount.MakeDataCountUtil;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import edu.harvard.iq.dataverse.util.ArchiverUtil;
-import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.EjbUtil;
-import edu.harvard.iq.dataverse.util.SystemConfig;
-import edu.harvard.iq.dataverse.util.json.JsonParseException;
+import edu.harvard.iq.dataverse.metrics.MetricsUtil;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*;
-import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
-import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.storageuse.UploadSessionQuotaLimit;
+import edu.harvard.iq.dataverse.util.*;
+import edu.harvard.iq.dataverse.util.bagit.OREMap;
+import edu.harvard.iq.dataverse.util.json.*;
+import edu.harvard.iq.dataverse.workflow.Workflow;
+import edu.harvard.iq.dataverse.workflow.WorkflowContext;
+import edu.harvard.iq.dataverse.workflow.WorkflowContext.TriggerType;
+import edu.harvard.iq.dataverse.workflow.WorkflowServiceBean;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.inject.Inject;
+import jakarta.json.*;
+import jakarta.json.stream.JsonParsingException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.*;
+import jakarta.ws.rs.core.Response.Status;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.util.Strings;
+import org.eclipse.microprofile.openapi.annotations.Operation;
+import org.eclipse.microprofile.openapi.annotations.media.Content;
+import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody;
+import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
+import org.eclipse.microprofile.openapi.annotations.tags.Tag;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringReader;
+import java.net.URI;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.inject.Inject;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import javax.ws.rs.core.UriInfo;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.glassfish.jersey.media.multipart.FormDataBodyPart;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import static edu.harvard.iq.dataverse.api.ApiConstants.*;
+
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
+import edu.harvard.iq.dataverse.license.License;
+
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*;
+import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
+
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
 
 @Path("datasets")
 public class Datasets extends AbstractApiBean {
 
     private static final Logger logger = Logger.getLogger(Datasets.class.getCanonicalName());
-    
-    @Inject DataverseSession session;    
+    private static final Pattern dataFilePattern = Pattern.compile("^[0-9a-f]{11}-[0-9a-f]{12}\\.?.*");
+
+    @Inject DataverseSession session;
 
     @EJB
     DatasetServiceBean datasetService;
 
     @EJB
     DataverseServiceBean dataverseService;
-    
+
+    @EJB
+    GuestbookResponseServiceBean guestbookResponseService;
+
+    @EJB
+    GlobusServiceBean globusService;
+
     @EJB
     UserNotificationServiceBean userNotificationService;
-    
+
     @EJB
     PermissionServiceBean permissionService;
-    
+
     @EJB
     AuthenticationServiceBean authenticationServiceBean;
-    
+
     @EJB
     DDIExportServiceBean ddiExportService;
-    
-    @EJB
-    DatasetFieldServiceBean datasetfieldService;
 
     @EJB
     MetadataBlockServiceBean metadataBlockService;
-    
+
     @EJB
     DataFileServiceBean fileService;
 
@@ -181,109 +153,167 @@ public class Datasets extends AbstractApiBean {
 
     @EJB
     EjbDataverseEngine commandEngine;
-    
+
     @EJB
     IndexServiceBean indexService;
 
     @EJB
     S3PackageImporter s3PackageImporter;
-     
+
     @EJB
     SettingsServiceBean settingsService;
 
     // TODO: Move to AbstractApiBean
     @EJB
     DatasetMetricsServiceBean datasetMetricsSvc;
-    
+
     @EJB
     DatasetExternalCitationsServiceBean datasetExternalCitationsService;
-    
+
+    @EJB
+    EmbargoServiceBean embargoService;
+
+    @EJB
+    RetentionServiceBean retentionService;
+
     @Inject
     MakeDataCountLoggingServiceBean mdcLogService;
-    
+
     @Inject
     DataverseRequestServiceBean dvRequestService;
 
+    @Inject
+    WorkflowServiceBean wfService;
+
+    @Inject
+    DataverseRoleServiceBean dataverseRoleService;
+
+    @EJB
+    DatasetVersionServiceBean datasetversionService;
+
+    @Inject
+    PrivateUrlServiceBean privateUrlService;
+
+    @Inject
+    DatasetVersionFilesServiceBean datasetVersionFilesServiceBean;
+
+    @Inject
+    DatasetTypeServiceBean datasetTypeSvc;
+
+    @Inject
+    DatasetFieldsValidator datasetFieldsValidator;
+
+    @Inject
+    DataFileCategoryServiceBean dataFileCategoryService;
+
     /**
      * Used to consolidate the way we parse and handle dataset versions.
-     * @param <T> 
+     * @param <T>
      */
-    private interface DsVersionHandler<T> {
+    public interface DsVersionHandler<T> {
         T handleLatest();
         T handleDraft();
         T handleSpecific( long major, long minor );
         T handleLatestPublished();
     }
-    
+
     @GET
+    @AuthRequired
     @Path("{id}")
-    public Response getDataset(@PathParam("id") String id, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) {
+    public Response getDataset(@Context ContainerRequestContext crc, @PathParam("id") String id, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response,  @QueryParam("returnOwners") boolean returnOwners) {
         return response( req -> {
-            final Dataset retrieved = execCommand(new GetDatasetCommand(req, findDatasetOrDie(id)));
+            final Dataset retrieved = execCommand(new GetDatasetCommand(req, findDatasetOrDie(id, true)));
             final DatasetVersion latest = execCommand(new GetLatestAccessibleDatasetVersionCommand(req, retrieved));
-            final JsonObjectBuilder jsonbuilder = json(retrieved);
-
-            MakeDataCountLoggingServiceBean.MakeDataCountEntry entry = new MakeDataCountEntry(uriInfo, headers, dvRequestService, retrieved);
-            mdcLogService.logEntry(entry);
-            
-            return ok(jsonbuilder.add("latestVersion", (latest != null) ? json(latest) : null));
-        });
+            final JsonObjectBuilder jsonbuilder = json(retrieved, returnOwners);
+            //Report MDC if this is a released version (could be draft if user has access, or user may not have access at all and is not getting metadata beyond the minimum)
+            if((latest != null) && latest.isReleased()) {
+                MakeDataCountLoggingServiceBean.MakeDataCountEntry entry = new MakeDataCountEntry(uriInfo, headers, dvRequestService, retrieved);
+                mdcLogService.logEntry(entry);
+            }
+            return ok(jsonbuilder.add("latestVersion", (latest != null) ? json(latest, true) : null));
+        }, getRequestUser(crc));
     }
-    
-    // TODO: 
-    // This API call should, ideally, call findUserOrDie() and the GetDatasetCommand 
-    // to obtain the dataset that we are trying to export - which would handle
-    // Auth in the process... For now, Auth isn't necessary - since export ONLY 
-    // WORKS on published datasets, which are open to the world. -- L.A. 4.5
-    
+
     @GET
+    @AuthRequired
     @Path("/export")
-    @Produces({"application/xml", "application/json", "application/html" })
-    public Response exportDataset(@QueryParam("persistentId") String persistentId, @QueryParam("exporter") String exporter, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) {
+    @Produces({"application/xml", "application/json", "application/html", "application/ld+json", "*/*" })
+    public Response exportDataset(@Context ContainerRequestContext crc, @QueryParam("persistentId") String persistentId,
+            @QueryParam("version") String versionId, @QueryParam("exporter") String exporter,
+            @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) {
 
         try {
             Dataset dataset = datasetService.findByGlobalId(persistentId);
             if (dataset == null) {
                 return error(Response.Status.NOT_FOUND, "A dataset with the persistentId " + persistentId + " could not be found.");
             }
-            
-            ExportService instance = ExportService.getInstance(settingsSvc);
-            
-            InputStream is = instance.getExport(dataset, exporter);
-           
+
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            DatasetVersion datasetVersion = null;
+            try {
+                String versionToLookUp = DS_VERSION_LATEST_PUBLISHED;
+                if (versionId != null) {
+                    versionToLookUp = versionId;
+                }
+                datasetVersion = getDatasetVersionOrDie(req, versionToLookUp, dataset, uriInfo, headers);
+            } catch (WrappedResponse wr) {
+                // wr.getLocalizedMessage() is null so don't bother returning it
+                return error(BAD_REQUEST, "Unable to look up dataset based on version. Try " + DS_VERSION_LATEST_PUBLISHED + " or " + DS_VERSION_DRAFT + ".");
+            }
+
+            // Trying to get version 1.0 for a dataset that's already at 3.0, for example, is not supported.
+            if (!datasetVersion.isDraft() && versionId != null) {
+                Command<DatasetVersion> cmd = new GetLatestPublishedDatasetVersionCommand(dvRequestService.getDataverseRequest(), dataset);
+                DatasetVersion latestPublishedVersion = commandEngine.submit(cmd);
+                if (latestPublishedVersion == null) {
+                    return error(BAD_REQUEST, "Non-draft version requested but for published versions only the latest (" + DS_VERSION_LATEST_PUBLISHED + ") is supported.");
+                }
+                if (!datasetVersion.equals(latestPublishedVersion)) {
+                    return error(BAD_REQUEST, "Non-draft version requested (" + versionId + ") but for published versions only the latest (" + DS_VERSION_LATEST_PUBLISHED + ") is supported.");
+                }
+            }
+
+            ExportService instance = ExportService.getInstance();
+
+            InputStream is = instance.getExport(datasetVersion, exporter);
+
             String mediaType = instance.getMediaType(exporter);
-            
-            MakeDataCountLoggingServiceBean.MakeDataCountEntry entry = new MakeDataCountEntry(uriInfo, headers, dvRequestService, dataset);
-            mdcLogService.logEntry(entry);
-            
+
+            if (datasetVersion.isReleased()) {
+                MakeDataCountLoggingServiceBean.MakeDataCountEntry entry = new MakeDataCountEntry(uriInfo, headers, dvRequestService, dataset);
+                mdcLogService.logEntry(entry);
+            }
+
             return Response.ok()
                     .entity(is)
                     .type(mediaType).
                     build();
         } catch (Exception wr) {
+            logger.warning(wr.getMessage());
             return error(Response.Status.FORBIDDEN, "Export Failed");
         }
     }
 
     @DELETE
+    @AuthRequired
     @Path("{id}")
-    public Response deleteDataset( @PathParam("id") String id) {
+    public Response deleteDataset(@Context ContainerRequestContext crc, @PathParam("id") String id) {
         // Internally, "DeleteDatasetCommand" simply redirects to "DeleteDatasetVersionCommand"
         // (and there's a comment that says "TODO: remove this command")
-        // do we need an exposed API call for it? 
-        // And DeleteDatasetVersionCommand further redirects to DestroyDatasetCommand, 
-        // if the dataset only has 1 version... In other words, the functionality 
+        // do we need an exposed API call for it?
+        // And DeleteDatasetVersionCommand further redirects to DestroyDatasetCommand,
+        // if the dataset only has 1 version... In other words, the functionality
         // currently provided by this API is covered between the "deleteDraftVersion" and
-        // "destroyDataset" API calls.  
-        // (The logic below follows the current implementation of the underlying 
+        // "destroyDataset" API calls.
+        // (The logic below follows the current implementation of the underlying
         // commands!)
-        
+
+        User u = getRequestUser(crc);
         return response( req -> {
             Dataset doomed = findDatasetOrDie(id);
             DatasetVersion doomedVersion = doomed.getLatestVersion();
-            User u = findUserOrDie();
             boolean destroy = false;
-            
+
             if (doomed.getVersions().size() == 1) {
                 if (doomed.isReleased() && (!(u instanceof AuthenticatedUser) || !u.isSuperuser())) {
                     throw new WrappedResponse(error(Response.Status.UNAUTHORIZED, "Only superusers can delete published datasets"));
@@ -294,108 +324,112 @@ public Response deleteDataset( @PathParam("id") String id) {
                     throw new WrappedResponse(error(Response.Status.UNAUTHORIZED, "This is a published dataset with multiple versions. This API can only delete the latest version if it is a DRAFT"));
                 }
             }
-            
-            // Gather the locations of the physical files that will need to be 
+
+            // Gather the locations of the physical files that will need to be
             // deleted once the destroy command execution has been finalized:
             Map<Long, String> deleteStorageLocations = fileService.getPhysicalFilesToDelete(doomedVersion, destroy);
-            
+
             execCommand( new DeleteDatasetCommand(req, findDatasetOrDie(id)));
-            
-            // If we have gotten this far, the destroy command has succeeded, 
+
+            // If we have gotten this far, the destroy command has succeeded,
             // so we can finalize it by permanently deleting the physical files:
-            // (DataFileService will double-check that the datafiles no 
-            // longer exist in the database, before attempting to delete 
+            // (DataFileService will double-check that the datafiles no
+            // longer exist in the database, before attempting to delete
             // the physical files)
             if (!deleteStorageLocations.isEmpty()) {
                 fileService.finalizeFileDeletes(deleteStorageLocations);
             }
-            
+
             return ok("Dataset " + id + " deleted");
-        });
+        }, u);
     }
-        
+
     @DELETE
+    @AuthRequired
     @Path("{id}/destroy")
-    public Response destroyDataset(@PathParam("id") String id) {
+    public Response destroyDataset(@Context ContainerRequestContext crc, @PathParam("id") String id) {
 
+        User u = getRequestUser(crc);
         return response(req -> {
             // first check if dataset is released, and if so, if user is a superuser
             Dataset doomed = findDatasetOrDie(id);
-            User u = findUserOrDie();
 
             if (doomed.isReleased() && (!(u instanceof AuthenticatedUser) || !u.isSuperuser())) {
                 throw new WrappedResponse(error(Response.Status.UNAUTHORIZED, "Destroy can only be called by superusers."));
             }
 
-            // Gather the locations of the physical files that will need to be 
+            // Gather the locations of the physical files that will need to be
             // deleted once the destroy command execution has been finalized:
             Map<Long, String> deleteStorageLocations = fileService.getPhysicalFilesToDelete(doomed);
 
             execCommand(new DestroyDatasetCommand(doomed, req));
 
-            // If we have gotten this far, the destroy command has succeeded, 
+            // If we have gotten this far, the destroy command has succeeded,
             // so we can finalize permanently deleting the physical files:
-            // (DataFileService will double-check that the datafiles no 
-            // longer exist in the database, before attempting to delete 
+            // (DataFileService will double-check that the datafiles no
+            // longer exist in the database, before attempting to delete
             // the physical files)
             if (!deleteStorageLocations.isEmpty()) {
                 fileService.finalizeFileDeletes(deleteStorageLocations);
             }
 
             return ok("Dataset " + id + " destroyed");
-        });
+        }, u);
     }
-    
+
     @DELETE
+    @AuthRequired
     @Path("{id}/versions/{versionId}")
-    public Response deleteDraftVersion( @PathParam("id") String id,  @PathParam("versionId") String versionId ){
-        if ( ! ":draft".equals(versionId) ) {
-            return badRequest("Only the :draft version can be deleted");
+    public Response deleteDraftVersion(@Context ContainerRequestContext crc, @PathParam("id") String id,  @PathParam("versionId") String versionId ){
+        if (!DS_VERSION_DRAFT.equals(versionId)) {
+            return badRequest("Only the " + DS_VERSION_DRAFT + " version can be deleted");
         }
 
         return response( req -> {
             Dataset dataset = findDatasetOrDie(id);
             DatasetVersion doomed = dataset.getLatestVersion();
-            
+
             if (!doomed.isDraft()) {
                 throw new WrappedResponse(error(Response.Status.UNAUTHORIZED, "This is NOT a DRAFT version"));
             }
-            
-            // Gather the locations of the physical files that will need to be 
+
+            // Gather the locations of the physical files that will need to be
             // deleted once the destroy command execution has been finalized:
-            
+
             Map<Long, String> deleteStorageLocations = fileService.getPhysicalFilesToDelete(doomed);
-            
+
             execCommand( new DeleteDatasetVersionCommand(req, dataset));
-            
-            // If we have gotten this far, the delete command has succeeded - 
-            // by either deleting the Draft version of a published dataset, 
-            // or destroying an unpublished one. 
+
+            // If we have gotten this far, the delete command has succeeded -
+            // by either deleting the Draft version of a published dataset,
+            // or destroying an unpublished one.
             // This means we can finalize permanently deleting the physical files:
-            // (DataFileService will double-check that the datafiles no 
-            // longer exist in the database, before attempting to delete 
+            // (DataFileService will double-check that the datafiles no
+            // longer exist in the database, before attempting to delete
             // the physical files)
             if (!deleteStorageLocations.isEmpty()) {
                 fileService.finalizeFileDeletes(deleteStorageLocations);
             }
-            
+
             return ok("Draft version of dataset " + id + " deleted");
-        });
+        }, getRequestUser(crc));
     }
-        
+
     @DELETE
+    @AuthRequired
     @Path("{datasetId}/deleteLink/{linkedDataverseId}")
-    public Response deleteDatasetLinkingDataverse( @PathParam("datasetId") String datasetId, @PathParam("linkedDataverseId") String linkedDataverseId) {
+    public Response deleteDatasetLinkingDataverse(@Context ContainerRequestContext crc, @PathParam("datasetId") String datasetId, @PathParam("linkedDataverseId") String linkedDataverseId) {
                 boolean index = true;
         return response(req -> {
             execCommand(new DeleteDatasetLinkingDataverseCommand(req, findDatasetOrDie(datasetId), findDatasetLinkingDataverseOrDie(datasetId, linkedDataverseId), index));
             return ok("Link from Dataset " + datasetId + " to linked Dataverse " + linkedDataverseId + " deleted");
-        });
+        }, getRequestUser(crc));
     }
-        
+
     @PUT
+    @AuthRequired
     @Path("{id}/citationdate")
-    public Response setCitationDate( @PathParam("id") String id, String dsfTypeName) {
+    public Response setCitationDate(@Context ContainerRequestContext crc, @PathParam("id") String id, String dsfTypeName) {
         return response( req -> {
             if ( dsfTypeName.trim().isEmpty() ){
                 return badRequest("Please provide a dataset field type in the requst body.");
@@ -410,65 +444,255 @@ public Response setCitationDate( @PathParam("id") String id, String dsfTypeName)
 
             execCommand(new SetDatasetCitationDateCommand(req, findDatasetOrDie(id), dsfType));
             return ok("Citation Date for dataset " + id + " set to: " + (dsfType != null ? dsfType.getDisplayName() : "default"));
-        });
-    }    
-    
+        }, getRequestUser(crc));
+    }
+
     @DELETE
+    @AuthRequired
     @Path("{id}/citationdate")
-    public Response useDefaultCitationDate( @PathParam("id") String id) {
+    public Response useDefaultCitationDate(@Context ContainerRequestContext crc, @PathParam("id") String id) {
         return response( req -> {
             execCommand(new SetDatasetCitationDateCommand(req, findDatasetOrDie(id), null));
             return ok("Citation Date for dataset " + id + " set to default");
-        });
-    }         
-    
+        }, getRequestUser(crc));
+    }
+
     @GET
+    @AuthRequired
     @Path("{id}/versions")
-    public Response listVersions( @PathParam("id") String id ) {
-        return response( req ->
-             ok( execCommand( new ListVersionsCommand(req, findDatasetOrDie(id)) )
+    public Response listVersions(@Context ContainerRequestContext crc, @PathParam("id") String id, @QueryParam("excludeFiles") Boolean excludeFiles,@QueryParam("excludeMetadataBlocks") Boolean excludeMetadataBlocks, @QueryParam("limit") Integer limit, @QueryParam("offset") Integer offset) {
+
+        return response( req -> {
+            Dataset dataset = findDatasetOrDie(id);
+            Boolean deepLookup = excludeFiles == null ? true : !excludeFiles;
+            Boolean includeMetadataBlocks = excludeMetadataBlocks == null ? true : !excludeMetadataBlocks;
+
+            return ok( execCommand( new ListVersionsCommand(req, dataset, offset, limit, deepLookup) )
                                 .stream()
-                                .map( d -> json(d) )
-                                .collect(toJsonArray())));
+                                .map( d -> json(d, deepLookup, includeMetadataBlocks) )
+                                .collect(toJsonArray()));
+        }, getRequestUser(crc));
     }
-    
+
     @GET
+    @AuthRequired
     @Path("{id}/versions/{versionId}")
-    public Response getVersion( @PathParam("id") String datasetId, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers) {
+    public Response getVersion(@Context ContainerRequestContext crc,
+                               @PathParam("id") String datasetId,
+                               @PathParam("versionId") String versionId,
+                               @QueryParam("excludeFiles") Boolean excludeFiles,
+                               @QueryParam("excludeMetadataBlocks") Boolean excludeMetadataBlocks,
+                               @QueryParam("includeDeaccessioned") boolean includeDeaccessioned,
+                               @QueryParam("returnOwners") boolean returnOwners,
+                               @Context UriInfo uriInfo,
+                               @Context HttpHeaders headers) {
         return response( req -> {
-            DatasetVersion dsv = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers);            
-            return (dsv == null || dsv.getId() == null) ? notFound("Dataset version not found")
-                                                        : ok(json(dsv));
-        });
+
+            //If excludeFiles is null the default is to provide the files and because of this we need to check permissions.
+            boolean checkPerms = excludeFiles == null ? true : !excludeFiles;
+
+            Dataset dataset = findDatasetOrDie(datasetId);
+            DatasetVersion requestedDatasetVersion = getDatasetVersionOrDie(req,
+                                                                            versionId,
+                                                                            dataset,
+                                                                            uriInfo,
+                                                                            headers,
+                                                                            includeDeaccessioned,
+                                                                            checkPerms);
+
+            if (requestedDatasetVersion == null || requestedDatasetVersion.getId() == null) {
+                return notFound("Dataset version not found");
+            }
+
+            if (excludeFiles == null ? true : !excludeFiles) {
+                requestedDatasetVersion = datasetversionService.findDeep(requestedDatasetVersion.getId());
+            }
+            Boolean includeMetadataBlocks = excludeMetadataBlocks == null ? true : !excludeMetadataBlocks;
+
+            JsonObjectBuilder jsonBuilder = json(requestedDatasetVersion,
+                                                 null,
+                                                 excludeFiles == null ? true : !excludeFiles,
+                                                 returnOwners, includeMetadataBlocks);
+            return ok(jsonBuilder);
+
+        }, getRequestUser(crc));
     }
-    
+
     @GET
+    @AuthRequired
     @Path("{id}/versions/{versionId}/files")
-    public Response getVersionFiles( @PathParam("id") String datasetId, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers) {
-        return response( req -> ok( jsonFileMetadatas(
-                         getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers).getFileMetadatas())));
+    public Response getVersionFiles(@Context ContainerRequestContext crc,
+                                    @PathParam("id") String datasetId,
+                                    @PathParam("versionId") String versionId,
+                                    @QueryParam("limit") Integer limit,
+                                    @QueryParam("offset") Integer offset,
+                                    @QueryParam("contentType") String contentType,
+                                    @QueryParam("accessStatus") String accessStatus,
+                                    @QueryParam("categoryName") String categoryName,
+                                    @QueryParam("tabularTagName") String tabularTagName,
+                                    @QueryParam("searchText") String searchText,
+                                    @QueryParam("orderCriteria") String orderCriteria,
+                                    @QueryParam("includeDeaccessioned") boolean includeDeaccessioned,
+                                    @Context UriInfo uriInfo,
+                                    @Context HttpHeaders headers) {
+        return response(req -> {
+            DatasetVersion datasetVersion = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId, false), uriInfo, headers, includeDeaccessioned);
+            DatasetVersionFilesServiceBean.FileOrderCriteria fileOrderCriteria;
+            try {
+                fileOrderCriteria = orderCriteria != null ? DatasetVersionFilesServiceBean.FileOrderCriteria.valueOf(orderCriteria) : DatasetVersionFilesServiceBean.FileOrderCriteria.NameAZ;
+            } catch (IllegalArgumentException e) {
+                return badRequest(BundleUtil.getStringFromBundle("datasets.api.version.files.invalid.order.criteria", List.of(orderCriteria)));
+            }
+            FileSearchCriteria fileSearchCriteria;
+            try {
+                fileSearchCriteria = new FileSearchCriteria(
+                        contentType,
+                        accessStatus != null ? FileSearchCriteria.FileAccessStatus.valueOf(accessStatus) : null,
+                        categoryName,
+                        tabularTagName,
+                        searchText
+                );
+            } catch (IllegalArgumentException e) {
+                return badRequest(BundleUtil.getStringFromBundle("datasets.api.version.files.invalid.access.status", List.of(accessStatus)));
+            }
+            return ok(jsonFileMetadatas(datasetVersionFilesServiceBean.getFileMetadatas(datasetVersion, limit, offset, fileSearchCriteria, fileOrderCriteria)),
+                    datasetVersionFilesServiceBean.getFileMetadataCount(datasetVersion, fileSearchCriteria));
+        }, getRequestUser(crc));
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/versions/{versionId}/files/counts")
+    public Response getVersionFileCounts(@Context ContainerRequestContext crc,
+                                         @PathParam("id") String datasetId,
+                                         @PathParam("versionId") String versionId,
+                                         @QueryParam("contentType") String contentType,
+                                         @QueryParam("accessStatus") String accessStatus,
+                                         @QueryParam("categoryName") String categoryName,
+                                         @QueryParam("tabularTagName") String tabularTagName,
+                                         @QueryParam("searchText") String searchText,
+                                         @QueryParam("includeDeaccessioned") boolean includeDeaccessioned,
+                                         @Context UriInfo uriInfo,
+                                         @Context HttpHeaders headers) {
+        return response(req -> {
+            FileSearchCriteria fileSearchCriteria;
+            try {
+                fileSearchCriteria = new FileSearchCriteria(
+                        contentType,
+                        accessStatus != null ? FileSearchCriteria.FileAccessStatus.valueOf(accessStatus) : null,
+                        categoryName,
+                        tabularTagName,
+                        searchText
+                );
+            } catch (IllegalArgumentException e) {
+                return badRequest(BundleUtil.getStringFromBundle("datasets.api.version.files.invalid.access.status", List.of(accessStatus)));
+            }
+            DatasetVersion datasetVersion = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers, includeDeaccessioned, false);
+            JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+            jsonObjectBuilder.add("total", datasetVersionFilesServiceBean.getFileMetadataCount(datasetVersion, fileSearchCriteria));
+            jsonObjectBuilder.add("perContentType", json(datasetVersionFilesServiceBean.getFileMetadataCountPerContentType(datasetVersion, fileSearchCriteria)));
+            jsonObjectBuilder.add("perCategoryName", json(datasetVersionFilesServiceBean.getFileMetadataCountPerCategoryName(datasetVersion, fileSearchCriteria)));
+            jsonObjectBuilder.add("perTabularTagName", jsonFileCountPerTabularTagNameMap(datasetVersionFilesServiceBean.getFileMetadataCountPerTabularTagName(datasetVersion, fileSearchCriteria)));
+            jsonObjectBuilder.add("perAccessStatus", jsonFileCountPerAccessStatusMap(datasetVersionFilesServiceBean.getFileMetadataCountPerAccessStatus(datasetVersion, fileSearchCriteria)));
+            return ok(jsonObjectBuilder);
+        }, getRequestUser(crc));
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/download/count")
+    public Response getDownloadCountByDatasetId(@Context ContainerRequestContext crc,
+                                     @PathParam("id") String datasetId,
+                                     @QueryParam("includeMDC") Boolean includeMDC) {
+        Long id;
+        Long count;
+        LocalDate date = includeMDC == null || !includeMDC ? getMDCStartDate() : null;
+        try {
+            Dataset ds = findDatasetOrDie(datasetId);
+            id = ds.getId();
+            count = guestbookResponseService.getDownloadCountByDatasetId(id, date);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        JsonObjectBuilder job = Json.createObjectBuilder()
+                .add("id", id)
+                .add("downloadCount", count);
+        if (date != null) {
+            job.add("MDCStartDate" , date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        }
+        return Response.ok(job.build())
+                .type(MediaType.APPLICATION_JSON)
+                .build();
+    }
+    private LocalDate getMDCStartDate() {
+        String date = settingsService.getValueForKey(SettingsServiceBean.Key.MDCStartDate);
+        LocalDate ld=null;
+        if(date!=null) {
+            ld = LocalDate.parse(date);
+        }
+        return ld;
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/dirindex")
+    @Produces("text/html")
+    public Response getFileAccessFolderView(@Context ContainerRequestContext crc, @PathParam("id") String datasetId, @QueryParam("version") String versionId, @QueryParam("folder") String folderName, @QueryParam("original") Boolean originals, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response) {
+
+        folderName = folderName == null ? "" : folderName;
+        versionId = versionId == null ? DS_VERSION_LATEST_PUBLISHED : versionId;
+
+        DatasetVersion version;
+        try {
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            version = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        String output = FileUtil.formatFolderListingHtml(folderName, version, "", originals != null && originals);
+
+        // return "NOT FOUND" if there is no such folder in the dataset version:
+
+        if ("".equals(output)) {
+            return notFound("Folder " + folderName + " does not exist");
+        }
+
+
+        String indexFileName = folderName.equals("") ? ".index.html"
+                : ".index-" + folderName.replace('/', '_') + ".html";
+        response.setHeader("Content-disposition", "filename=\"" + indexFileName + "\"");
+
+
+        return Response.ok()
+                .entity(output)
+                //.type("application/html").
+                .build();
     }
-    
+
     @GET
+    @AuthRequired
     @Path("{id}/versions/{versionId}/metadata")
-    public Response getVersionMetadata( @PathParam("id") String datasetId, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers) {
+    public Response getVersionMetadata(@Context ContainerRequestContext crc, @PathParam("id") String datasetId, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers) {
         return response( req -> ok(
                     jsonByBlocks(
                         getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers )
-                                .getDatasetFields())));
+                                .getDatasetFields())), getRequestUser(crc));
     }
-    
+
     @GET
+    @AuthRequired
     @Path("{id}/versions/{versionNumber}/metadata/{block}")
-    public Response getVersionMetadataBlock( @PathParam("id") String datasetId, 
-                                             @PathParam("versionNumber") String versionNumber, 
-                                             @PathParam("block") String blockName, 
-                                             @Context UriInfo uriInfo, 
-                                             @Context HttpHeaders headers ) {
-        
+    public Response getVersionMetadataBlock(@Context ContainerRequestContext crc,
+                                            @PathParam("id") String datasetId,
+                                            @PathParam("versionNumber") String versionNumber,
+                                            @PathParam("block") String blockName,
+                                            @Context UriInfo uriInfo,
+                                            @Context HttpHeaders headers) {
+
         return response( req -> {
             DatasetVersion dsv = getDatasetVersionOrDie(req, versionNumber, findDatasetOrDie(datasetId), uriInfo, headers );
-            
+
             Map<MetadataBlock, List<DatasetField>> fieldsByBlock = DatasetField.groupByBlock(dsv.getDatasetFields());
             for ( Map.Entry<MetadataBlock, List<DatasetField>> p : fieldsByBlock.entrySet() ) {
                 if ( p.getKey().getName().equals(blockName) ) {
@@ -476,21 +700,56 @@ public Response getVersionMetadataBlock( @PathParam("id") String datasetId,
                 }
             }
             return notFound("metadata block named " + blockName + " not found");
-        });
+        }, getRequestUser(crc));
     }
-    
+
+    /**
+     * Add Signposting
+     * @param datasetId
+     * @param versionId
+     * @param uriInfo
+     * @param headers
+     * @return
+     */
     @GET
+    @AuthRequired
+    @Path("{id}/versions/{versionId}/linkset")
+    public Response getLinkset(@Context ContainerRequestContext crc, @PathParam("id") String datasetId, @PathParam("versionId") String versionId,
+           @Context UriInfo uriInfo, @Context HttpHeaders headers) {
+        if (DS_VERSION_DRAFT.equals(versionId)) {
+            return badRequest("Signposting is not supported on the " + DS_VERSION_DRAFT + " version");
+        }
+        DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+        try {
+            DatasetVersion dsv = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers);
+            return Response
+                    .ok(Json.createObjectBuilder()
+                            .add("linkset",
+                                    new SignpostingResources(systemConfig, dsv,
+                                            JvmSettings.SIGNPOSTING_LEVEL1_AUTHOR_LIMIT.lookupOptional().orElse(""),
+                                            JvmSettings.SIGNPOSTING_LEVEL1_ITEM_LIMIT.lookupOptional().orElse(""))
+                                                    .getJsonLinkset())
+                            .build())
+                    .type(MediaType.APPLICATION_JSON).build();
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @POST
+    @AuthRequired
     @Path("{id}/modifyRegistration")
-    public Response updateDatasetTargetURL(@PathParam("id") String id ) {
+    public Response updateDatasetTargetURL(@Context ContainerRequestContext crc, @PathParam("id") String id ) {
         return response( req -> {
             execCommand(new UpdateDatasetTargetURLCommand(findDatasetOrDie(id), req));
             return ok("Dataset " + id + " target url updated");
-        });
+        }, getRequestUser(crc));
     }
-    
+
     @POST
+    @AuthRequired
     @Path("/modifyRegistrationAll")
-    public Response updateDatasetTargetURLAll() {
+    public Response updateDatasetTargetURLAll(@Context ContainerRequestContext crc) {
         return response( req -> {
             datasetService.findAll().forEach( ds -> {
                 try {
@@ -500,12 +759,13 @@ public Response updateDatasetTargetURLAll() {
                 }
             });
             return ok("Update All Dataset target url completed");
-        });
+        }, getRequestUser(crc));
     }
-    
+
     @POST
+    @AuthRequired
     @Path("{id}/modifyRegistrationMetadata")
-    public Response updateDatasetPIDMetadata(@PathParam("id") String id) {
+    public Response updateDatasetPIDMetadata(@Context ContainerRequestContext crc, @PathParam("id") String id) {
 
         try {
             Dataset dataset = findDatasetOrDie(id);
@@ -517,41 +777,51 @@ public Response updateDatasetPIDMetadata(@PathParam("id") String id) {
         }
 
         return response(req -> {
-            execCommand(new UpdateDvObjectPIDMetadataCommand(findDatasetOrDie(id), req));
-            List<String> args = Arrays.asList(id);
+            Dataset dataset = findDatasetOrDie(id);
+            execCommand(new UpdateDvObjectPIDMetadataCommand(dataset, req));
+            List<String> args = Arrays.asList(dataset.getIdentifier());
             return ok(BundleUtil.getStringFromBundle("datasets.api.updatePIDMetadata.success.for.single.dataset", args));
-        });
+        }, getRequestUser(crc));
     }
-    
-    @GET
+
+    @POST
+    @AuthRequired
     @Path("/modifyRegistrationPIDMetadataAll")
-    public Response updateDatasetPIDMetadataAll() {
+    public Response updateDatasetPIDMetadataAll(@Context ContainerRequestContext crc) {
         return response( req -> {
             datasetService.findAll().forEach( ds -> {
                 try {
+                    logger.fine("ReRegistering: " + ds.getId() + " : " + ds.getIdentifier());
+                    if (!ds.isReleased() || (!ds.isIdentifierRegistered() || (ds.getIdentifier() == null))) {
+                        if (ds.isReleased()) {
+                            logger.warning("Dataset id=" + ds.getId() + " is in an inconsistent state (publicationdate but no identifier/identifier not registered");
+                        }
+                    } else {
                     execCommand(new UpdateDvObjectPIDMetadataCommand(findDatasetOrDie(ds.getId().toString()), req));
+                    }
                 } catch (WrappedResponse ex) {
                     Logger.getLogger(Datasets.class.getName()).log(Level.SEVERE, null, ex);
                 }
-            });           
+            });
             return ok(BundleUtil.getStringFromBundle("datasets.api.updatePIDMetadata.success.for.update.all"));
-        });
+        }, getRequestUser(crc));
     }
-  
+
     @PUT
+    @AuthRequired
     @Path("{id}/versions/{versionId}")
-    public Response updateDraftVersion( String jsonBody, @PathParam("id") String id,  @PathParam("versionId") String versionId ){
-        
-        if ( ! ":draft".equals(versionId) ) {
-            return error( Response.Status.BAD_REQUEST, "Only the :draft version can be updated");
-        }
-        
-        try ( StringReader rdr = new StringReader(jsonBody) ) {
-            DataverseRequest req = createDataverseRequest(findUserOrDie());
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response updateDraftVersion(@Context ContainerRequestContext crc, String jsonBody, @PathParam("id") String id, @PathParam("versionId") String versionId) {
+        if (!DS_VERSION_DRAFT.equals(versionId)) {
+            return error( Response.Status.BAD_REQUEST, "Only the " + DS_VERSION_DRAFT + " version can be updated");
+        }
+
+        try {
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
             Dataset ds = findDatasetOrDie(id);
-            JsonObject json = Json.createReader(rdr).readObject();
+            JsonObject json = JsonUtil.getJsonObject(jsonBody);
             DatasetVersion incomingVersion = jsonParser().parseDatasetVersion(json);
-            
+
             // clear possibly stale fields from the incoming dataset version.
             // creation and modification dates are updated by the commands.
             incomingVersion.setId(null);
@@ -561,49 +831,157 @@ public Response updateDraftVersion( String jsonBody, @PathParam("id") String id,
             incomingVersion.setDataset(ds);
             incomingVersion.setCreateTime(null);
             incomingVersion.setLastUpdateTime(null);
+
+            if (!incomingVersion.getFileMetadatas().isEmpty()){
+                return error( Response.Status.BAD_REQUEST, "You may not add files via this api.");
+            }
+
             boolean updateDraft = ds.getLatestVersion().isDraft();
-            
+
             DatasetVersion managedVersion;
-            if ( updateDraft ) {
-                final DatasetVersion editVersion = ds.getEditVersion();
+            if (updateDraft) {
+                final DatasetVersion editVersion = ds.getOrCreateEditVersion();
                 editVersion.setDatasetFields(incomingVersion.getDatasetFields());
-                editVersion.setTermsOfUseAndAccess( incomingVersion.getTermsOfUseAndAccess() );
+                editVersion.setTermsOfUseAndAccess(incomingVersion.getTermsOfUseAndAccess());
+                editVersion.getTermsOfUseAndAccess().setDatasetVersion(editVersion);
+                boolean hasValidTerms = TermsOfUseAndAccessValidator.isTOUAValid(editVersion.getTermsOfUseAndAccess(), null);
+                if (!hasValidTerms) {
+                    return error(Status.CONFLICT, BundleUtil.getStringFromBundle("dataset.message.toua.invalid"));
+                }
                 Dataset managedDataset = execCommand(new UpdateDatasetVersionCommand(ds, req));
-                managedVersion = managedDataset.getEditVersion();
+                managedVersion = managedDataset.getOrCreateEditVersion();
             } else {
+                boolean hasValidTerms = TermsOfUseAndAccessValidator.isTOUAValid(incomingVersion.getTermsOfUseAndAccess(), null);
+                if (!hasValidTerms) {
+                    return error(Status.CONFLICT, BundleUtil.getStringFromBundle("dataset.message.toua.invalid"));
+                }
                 managedVersion = execCommand(new CreateDatasetVersionCommand(req, ds, incomingVersion));
             }
-//            DatasetVersion managedVersion = execCommand( updateDraft
-//                                                             ? new UpdateDatasetVersionCommand(req, incomingVersion)
-//                                                             : new CreateDatasetVersionCommand(req, ds, incomingVersion));
-            return ok( json(managedVersion) );
-                    
+            return ok( json(managedVersion, true) );
+
         } catch (JsonParseException ex) {
             logger.log(Level.SEVERE, "Semantic error parsing dataset version Json: " + ex.getMessage(), ex);
             return error( Response.Status.BAD_REQUEST, "Error parsing dataset version: " + ex.getMessage() );
-            
+
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/versions/{versionId}/metadata")
+    @Produces("application/ld+json, application/json-ld")
+    public Response getVersionJsonLDMetadata(@Context ContainerRequestContext crc, @PathParam("id") String id, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers) {
+        try {
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            DatasetVersion dsv = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(id), uriInfo, headers);
+            OREMap ore = new OREMap(dsv,
+                    settingsService.isTrueForKey(SettingsServiceBean.Key.ExcludeEmailFromExport, false));
+            return ok(ore.getOREMapBuilder(true));
+
+        } catch (WrappedResponse ex) {
+            ex.printStackTrace();
+            return ex.getResponse();
+        } catch (Exception jpe) {
+            logger.log(Level.SEVERE, "Error getting jsonld metadata for dsv: ", jpe.getLocalizedMessage());
+            jpe.printStackTrace();
+            return error(Response.Status.INTERNAL_SERVER_ERROR, jpe.getLocalizedMessage());
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/metadata")
+    @Produces("application/ld+json, application/json-ld")
+    public Response getJsonLDMetadata(@Context ContainerRequestContext crc, @PathParam("id") String id, @Context UriInfo uriInfo, @Context HttpHeaders headers) {
+        return getVersionJsonLDMetadata(crc, id, DS_VERSION_LATEST, uriInfo, headers);
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{id}/metadata")
+    @Consumes("application/ld+json, application/json-ld")
+    public Response updateVersionMetadata(@Context ContainerRequestContext crc, String jsonLDBody, @PathParam("id") String id, @DefaultValue("false") @QueryParam("replace") boolean replaceTerms) {
+
+        try {
+            Dataset ds = findDatasetOrDie(id);
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            //Get draft state as of now
+
+            boolean updateDraft = ds.getLatestVersion().isDraft();
+            //Get the current draft or create a new version to update
+            DatasetVersion dsv = ds.getOrCreateEditVersion();
+            dsv = JSONLDUtil.updateDatasetVersionMDFromJsonLD(dsv, jsonLDBody, metadataBlockService, datasetFieldSvc, !replaceTerms, false, licenseSvc);
+            dsv.getTermsOfUseAndAccess().setDatasetVersion(dsv);
+            boolean hasValidTerms = TermsOfUseAndAccessValidator.isTOUAValid(dsv.getTermsOfUseAndAccess(), null);
+            if (!hasValidTerms) {
+                return error(Status.CONFLICT, BundleUtil.getStringFromBundle("dataset.message.toua.invalid"));
+            }
+            DatasetVersion managedVersion;
+            Dataset managedDataset = execCommand(new UpdateDatasetVersionCommand(ds, req));
+            managedVersion = managedDataset.getLatestVersion();
+            String info = updateDraft ? "Version Updated" : "Version Created";
+            return ok(Json.createObjectBuilder().add(info, managedVersion.getVersionDate()));
+
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        } catch (JsonParsingException jpe) {
+            logger.log(Level.SEVERE, "Error parsing dataset json. Json: {0}", jsonLDBody);
+            return error(Status.BAD_REQUEST, "Error parsing Json: " + jpe.getMessage());
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{id}/metadata/delete")
+    @Consumes("application/ld+json, application/json-ld")
+    public Response deleteMetadata(@Context ContainerRequestContext crc, String jsonLDBody, @PathParam("id") String id) {
+        try {
+            Dataset ds = findDatasetOrDie(id);
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            //Get draft state as of now
+
+            boolean updateDraft = ds.getLatestVersion().isDraft();
+            //Get the current draft or create a new version to update
+            DatasetVersion dsv = ds.getOrCreateEditVersion();
+            dsv = JSONLDUtil.deleteDatasetVersionMDFromJsonLD(dsv, jsonLDBody, metadataBlockService, licenseSvc);
+            dsv.getTermsOfUseAndAccess().setDatasetVersion(dsv);
+            DatasetVersion managedVersion;
+            Dataset managedDataset = execCommand(new UpdateDatasetVersionCommand(ds, req));
+            managedVersion = managedDataset.getLatestVersion();
+            String info = updateDraft ? "Version Updated" : "Version Created";
+            return ok(Json.createObjectBuilder().add(info, managedVersion.getVersionDate()));
+
         } catch (WrappedResponse ex) {
+            ex.printStackTrace();
             return ex.getResponse();
-            
+        } catch (JsonParsingException jpe) {
+            logger.log(Level.SEVERE, "Error parsing dataset json. Json: {0}", jsonLDBody);
+            jpe.printStackTrace();
+            return error(Status.BAD_REQUEST, "Error parsing Json: " + jpe.getMessage());
         }
     }
-    
+
     @PUT
+    @AuthRequired
     @Path("{id}/deleteMetadata")
-    public Response deleteVersionMetadata(String jsonBody, @PathParam("id") String id) throws WrappedResponse {
+    public Response deleteVersionMetadata(@Context ContainerRequestContext crc, String jsonBody, @PathParam("id") String id) throws WrappedResponse {
 
-        DataverseRequest req = createDataverseRequest(findUserOrDie());
+        DataverseRequest req = createDataverseRequest(getRequestUser(crc));
 
         return processDatasetFieldDataDelete(jsonBody, id, req);
     }
 
     private Response processDatasetFieldDataDelete(String jsonBody, String id, DataverseRequest req) {
-        try (StringReader rdr = new StringReader(jsonBody)) {
+        try {
 
             Dataset ds = findDatasetOrDie(id);
-            JsonObject json = Json.createReader(rdr).readObject();
-            DatasetVersion dsv = ds.getEditVersion();
-
+            JsonObject json = JsonUtil.getJsonObject(jsonBody);
+            //Get the current draft or create a new version to update
+            DatasetVersion dsv = ds.getOrCreateEditVersion();
+            dsv.getTermsOfUseAndAccess().setDatasetVersion(dsv);
             List<DatasetField> fields = new LinkedList<>();
             DatasetField singleField = null;
 
@@ -625,7 +1003,7 @@ private Response processDatasetFieldDataDelete(String jsonBody, String id, Datav
                 boolean found = false;
                 for (DatasetField dsf : dsv.getDatasetFields()) {
                     if (dsf.getDatasetFieldType().equals(updateField.getDatasetFieldType())) {
-                        if (dsf.getDatasetFieldType().isAllowMultiples()) { 
+                        if (dsf.getDatasetFieldType().isAllowMultiples()) {
                             if (updateField.getDatasetFieldType().isControlledVocabulary()) {
                                 if (dsf.getDatasetFieldType().isAllowMultiples()) {
                                     for (ControlledVocabularyValue cvv : updateField.getControlledVocabularyValues()) {
@@ -690,7 +1068,7 @@ private Response processDatasetFieldDataDelete(String jsonBody, String id, Datav
                                         datasetFieldCompoundValueItemsToRemove.forEach((remove) -> {
                                             dsf.getDatasetFieldCompoundValues().remove(remove);
                                         });
-                                        if (!found) { 
+                                        if (!found) {
                                             logger.log(Level.SEVERE, "Delete metadata failed: " + updateField.getDatasetFieldType().getDisplayName() + ": " + deleteVal + " not found.");
                                             return error(Response.Status.BAD_REQUEST, "Delete metadata failed: " + updateField.getDatasetFieldType().getDisplayName() + ": " + deleteVal + " not found.");
                                         }
@@ -710,15 +1088,11 @@ private Response processDatasetFieldDataDelete(String jsonBody, String id, Datav
                     logger.log(Level.SEVERE, "Delete metadata failed: " + updateField.getDatasetFieldType().getDisplayName() + ": " + displayValue + " not found." );
                     return error(Response.Status.BAD_REQUEST, "Delete metadata failed: " + updateField.getDatasetFieldType().getDisplayName() + ": " + displayValue + " not found." );
                 }
-            }           
+            }
 
 
-            
-            boolean updateDraft = ds.getLatestVersion().isDraft();
-            DatasetVersion managedVersion = updateDraft 
-                    ? execCommand(new UpdateDatasetVersionCommand(ds, req)).getEditVersion()
-                    : execCommand(new CreateDatasetVersionCommand(req, ds, dsv));
-            return ok(json(managedVersion));
+            DatasetVersion managedVersion = execCommand(new UpdateDatasetVersionCommand(ds, req)).getLatestVersion();
+            return ok(json(managedVersion, true));
 
         } catch (JsonParseException ex) {
             logger.log(Level.SEVERE, "Semantic error parsing dataset update Json: " + ex.getMessage(), ex);
@@ -729,199 +1103,78 @@ private Response processDatasetFieldDataDelete(String jsonBody, String id, Datav
             return ex.getResponse();
 
         }
-    
+
     }
-    
+
     private String getCompoundDisplayValue (DatasetFieldCompoundValue dscv){
         String returnString = "";
-                    for (DatasetField dsf : dscv.getChildDatasetFields()) {
-                for (String value : dsf.getValues()) {
-                    if (!(value == null)) {
-                        returnString += (returnString.isEmpty() ? "" : "; ") + value.trim();
-                    }
+        for (DatasetField dsf : dscv.getChildDatasetFields()) {
+            for (String value : dsf.getValues()) {
+                if (!(value == null)) {
+                    returnString += (returnString.isEmpty() ? "" : "; ") + value.trim();
                 }
             }
+        }
         return returnString;
     }
-    
+
     @PUT
+    @AuthRequired
     @Path("{id}/editMetadata")
-    public Response editVersionMetadata(String jsonBody, @PathParam("id") String id, @QueryParam("replace") Boolean replace) throws WrappedResponse{
+    public Response editVersionMetadata(@Context ContainerRequestContext crc, String jsonBody, @PathParam("id") String id,
+                                        @QueryParam("replace") boolean replaceData,
+                                        @QueryParam("sourceLastUpdateTime") String sourceLastUpdateTime) {
+        try {
+            Dataset dataset = findDatasetOrDie(id);
 
-        Boolean replaceData = replace != null;
+            if (sourceLastUpdateTime != null) {
+                validateInternalTimestampIsNotOutdated(dataset, sourceLastUpdateTime);
+            }
 
-        DataverseRequest req = createDataverseRequest(findUserOrDie());
+            JsonObject json = JsonUtil.getJsonObject(jsonBody);
 
-        return processDatasetUpdate(jsonBody, id, req, replaceData);
-    }
-    
-    
-    private Response processDatasetUpdate(String jsonBody, String id, DataverseRequest req, Boolean replaceData){
-        try (StringReader rdr = new StringReader(jsonBody)) {
-           
-            Dataset ds = findDatasetOrDie(id);
-            JsonObject json = Json.createReader(rdr).readObject();
-            DatasetVersion dsv = ds.getEditVersion();
-            
-            List<DatasetField> fields = new LinkedList<>();
-            DatasetField singleField = null; 
-            
-            JsonArray fieldsJson = json.getJsonArray("fields");
-            if( fieldsJson == null ){
-                singleField  = jsonParser().parseField(json, Boolean.FALSE);
-                fields.add(singleField);
-            } else{
-                fields = jsonParser().parseMultipleFields(json);
-            }
-            
-
-            String valdationErrors = validateDatasetFieldValues(fields);
-
-            if (!valdationErrors.isEmpty()) {
-                logger.log(Level.SEVERE, "Semantic error parsing dataset update Json: " + valdationErrors, valdationErrors);
-                return error(Response.Status.BAD_REQUEST, "Error parsing dataset update: " + valdationErrors);
-            }
-
-            dsv.setVersionState(DatasetVersion.VersionState.DRAFT);
-
-            //loop through the update fields     
-            // and compare to the version fields  
-            //if exist add/replace values
-            //if not add entire dsf
-            for (DatasetField updateField : fields) {
-                boolean found = false;
-                for (DatasetField dsf : dsv.getDatasetFields()) {
-                    if (dsf.getDatasetFieldType().equals(updateField.getDatasetFieldType())) {
-                        found = true;
-                        if (dsf.isEmpty() || dsf.getDatasetFieldType().isAllowMultiples() || replaceData) {
-                            List priorCVV = new ArrayList<>();
-                            String cvvDisplay = "";
-
-                            if (updateField.getDatasetFieldType().isControlledVocabulary()) {
-                                cvvDisplay = dsf.getDisplayValue();
-                                for (ControlledVocabularyValue cvvOld : dsf.getControlledVocabularyValues()) {
-                                    priorCVV.add(cvvOld);
-                                }
-                            }
-
-                            if (replaceData) {
-                                if (dsf.getDatasetFieldType().isAllowMultiples()) {
-                                    dsf.setDatasetFieldCompoundValues(new ArrayList<>());
-                                    dsf.setDatasetFieldValues(new ArrayList<>());
-                                    dsf.setControlledVocabularyValues(new ArrayList<>());
-                                    priorCVV.clear();
-                                    dsf.getControlledVocabularyValues().clear();
-                                } else {
-                                    dsf.setSingleValue("");
-                                    dsf.setSingleControlledVocabularyValue(null);
-                                }
-                            }
-                            if (updateField.getDatasetFieldType().isControlledVocabulary()) {
-                                if (dsf.getDatasetFieldType().isAllowMultiples()) {
-                                    for (ControlledVocabularyValue cvv : updateField.getControlledVocabularyValues()) {
-                                        if (!cvvDisplay.contains(cvv.getStrValue())) {
-                                            priorCVV.add(cvv);
-                                        }
-                                    }
-                                    dsf.setControlledVocabularyValues(priorCVV);
-                                } else {
-                                    dsf.setSingleControlledVocabularyValue(updateField.getSingleControlledVocabularyValue());
-                                }
-                            } else {
-                                if (!updateField.getDatasetFieldType().isCompound()) {
-                                    if (dsf.getDatasetFieldType().isAllowMultiples()) {
-                                        for (DatasetFieldValue dfv : updateField.getDatasetFieldValues()) {
-                                            if (!dsf.getDisplayValue().contains(dfv.getDisplayValue())) {
-                                                dfv.setDatasetField(dsf);
-                                                dsf.getDatasetFieldValues().add(dfv);
-                                            }
-                                        }
-                                    } else {
-                                        dsf.setSingleValue(updateField.getValue());
-                                    }
-                                } else {
-                                    for (DatasetFieldCompoundValue dfcv : updateField.getDatasetFieldCompoundValues()) {
-                                        if (!dsf.getCompoundDisplayValue().contains(updateField.getCompoundDisplayValue())) {
-                                            dfcv.setParentDatasetField(dsf);
-                                            dsf.setDatasetVersion(dsv);
-                                            dsf.getDatasetFieldCompoundValues().add(dfcv);
-                                        }
-                                    }
-                                }
-                            }
-                        } else {
-                            if (!dsf.isEmpty() && !dsf.getDatasetFieldType().isAllowMultiples() || !replaceData) {
-                                return error(Response.Status.BAD_REQUEST, "You may not add data to a field that already has data and does not allow multiples. Use replace=true to replace existing data (" + dsf.getDatasetFieldType().getDisplayName() + ")");
-                            }
-                        }
-                        break;
-                    }
-                }
-                if (!found) {
-                    updateField.setDatasetVersion(dsv);
-                    dsv.getDatasetFields().add(updateField);
-                }
-            }
-            boolean updateDraft = ds.getLatestVersion().isDraft();
-            DatasetVersion managedVersion;
-
-            if (updateDraft) {
-                managedVersion = execCommand(new UpdateDatasetVersionCommand(ds, req)).getEditVersion();
+            List<DatasetField> updatedFields = new ArrayList<>();
+            if (json.getJsonArray("fields") == null) {
+                updatedFields.add(jsonParser().parseField(json, Boolean.FALSE, replaceData));
             } else {
-                managedVersion = execCommand(new CreateDatasetVersionCommand(req, ds, dsv));
+                updatedFields = jsonParser().parseMultipleFields(json, replaceData);
             }
 
-            return ok(json(managedVersion));
+            DatasetVersion updatedVersion = execCommand(new UpdateDatasetFieldsCommand(dataset, updatedFields, replaceData, createDataverseRequest(getRequestUser(crc)))).getLatestVersion();
+
+            return ok(json(updatedVersion, true));
 
         } catch (JsonParseException ex) {
             logger.log(Level.SEVERE, "Semantic error parsing dataset update Json: " + ex.getMessage(), ex);
-            return error(Response.Status.BAD_REQUEST, "Error parsing dataset update: " + ex.getMessage());
-
+            return error(Response.Status.BAD_REQUEST, BundleUtil.getStringFromBundle("datasets.api.editMetadata.error.parseUpdate", List.of(ex.getMessage())));
         } catch (WrappedResponse ex) {
-            logger.log(Level.SEVERE, "Update metdata error: " + ex.getMessage(), ex);
+            logger.log(Level.SEVERE, "Update metadata error: " + ex.getMessage(), ex);
             return ex.getResponse();
-
         }
     }
-    
-    private String validateDatasetFieldValues(List<DatasetField> fields) {
-        StringBuilder error = new StringBuilder();
 
-        for (DatasetField dsf : fields) {
-            if (dsf.getDatasetFieldType().isAllowMultiples() && dsf.getControlledVocabularyValues().isEmpty()
-                    && dsf.getDatasetFieldCompoundValues().isEmpty() && dsf.getDatasetFieldValues().isEmpty()) {
-                error.append("Empty multiple value for field: ").append(dsf.getDatasetFieldType().getDisplayName()).append(" ");
-            } else if (!dsf.getDatasetFieldType().isAllowMultiples() && dsf.getSingleValue().getValue().isEmpty()) {
-                error.append("Empty value for field: ").append(dsf.getDatasetFieldType().getDisplayName()).append(" ");
-            }
-        }
-
-        if (!error.toString().isEmpty()) {
-            return (error.toString());
-        }
-        return "";
-    }
-    
     /**
      * @deprecated This was shipped as a GET but should have been a POST, see https://github.com/IQSS/dataverse/issues/2431
      */
     @GET
+    @AuthRequired
     @Path("{id}/actions/:publish")
     @Deprecated
-    public Response publishDataseUsingGetDeprecated( @PathParam("id") String id, @QueryParam("type") String type ) {
+    public Response publishDataseUsingGetDeprecated(@Context ContainerRequestContext crc, @PathParam("id") String id, @QueryParam("type") String type ) {
         logger.info("publishDataseUsingGetDeprecated called on id " + id + ". Encourage use of POST rather than GET, which is deprecated.");
-        return publishDataset(id, type);
+        return publishDataset(crc, id, type, false);
     }
 
     @POST
+    @AuthRequired
     @Path("{id}/actions/:publish")
-    public Response publishDataset(@PathParam("id") String id, @QueryParam("type") String type) {
+    public Response publishDataset(@Context ContainerRequestContext crc, @PathParam("id") String id, @QueryParam("type") String type, @QueryParam("assureIsIndexed") boolean mustBeIndexed) {
         try {
             if (type == null) {
                 return error(Response.Status.BAD_REQUEST, "Missing 'type' parameter (either 'major','minor', or 'updatecurrent').");
             }
             boolean updateCurrent=false;
-            AuthenticatedUser user = findAuthenticatedUserOrDie();
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
             type = type.toLowerCase();
             boolean isMinor=false;
             switch (type) {
@@ -931,18 +1184,47 @@ public Response publishDataset(@PathParam("id") String id, @QueryParam("type") S
                 case "major":
                     isMinor = false;
                     break;
-            case "updatecurrent":
-                if(user.isSuperuser()) {
-                  updateCurrent=true;
-                } else {
-                    return error(Response.Status.FORBIDDEN, "Only superusers can update the current version"); 
-                }
-                break;
+                case "updatecurrent":
+                    if (user.isSuperuser()) {
+                        updateCurrent = true;
+                    } else {
+                        return error(Response.Status.FORBIDDEN, "Only superusers can update the current version");
+                    }
+                    break;
                 default:
-                return error(Response.Status.BAD_REQUEST, "Illegal 'type' parameter value '" + type + "'. It needs to be either 'major', 'minor', or 'updatecurrent'.");
+                    return error(Response.Status.BAD_REQUEST, "Illegal 'type' parameter value '" + type + "'. It needs to be either 'major', 'minor', or 'updatecurrent'.");
             }
 
             Dataset ds = findDatasetOrDie(id);
+
+            boolean hasValidTerms = TermsOfUseAndAccessValidator.isTOUAValid(ds.getLatestVersion().getTermsOfUseAndAccess(), null);
+            if (!hasValidTerms) {
+                return error(Status.CONFLICT, BundleUtil.getStringFromBundle("dataset.message.toua.invalid"));
+            }
+
+            if (mustBeIndexed) {
+                logger.fine("IT: " + ds.getIndexTime());
+                logger.fine("MT: " + ds.getModificationTime());
+                logger.fine("PIT: " + ds.getPermissionIndexTime());
+                logger.fine("PMT: " + ds.getPermissionModificationTime());
+                if (ds.getIndexTime() != null && ds.getModificationTime() != null) {
+                    logger.fine("ITMT: " + (ds.getIndexTime().compareTo(ds.getModificationTime()) <= 0));
+                }
+                /*
+                 * Some calls, such as the /datasets/actions/:import* commands do not set the
+                 * modification or permission modification times. The checks here are trying to
+                 * see if indexing or permissionindexing could be pending, so they check to see
+                 * if the relevant modification time is set and if so, whether the index is also
+                 * set and if so, if it after the modification time. If the modification time is
+                 * set and the index time is null or is before the mod time, the 409/conflict
+                 * error is returned.
+                 *
+                 */
+                if ((ds.getModificationTime()!=null && (ds.getIndexTime() == null || (ds.getIndexTime().compareTo(ds.getModificationTime()) <= 0))) ||
+                        (ds.getPermissionModificationTime()!=null && (ds.getPermissionIndexTime() == null || (ds.getPermissionIndexTime().compareTo(ds.getPermissionModificationTime()) <= 0)))) {
+                    return error(Response.Status.CONFLICT, "Dataset is awaiting indexing");
+                }
+            }
             if (updateCurrent) {
                 /*
                  * Note: The code here mirrors that in the
@@ -975,7 +1257,7 @@ public Response publishDataset(@PathParam("id") String id, @QueryParam("type") S
                          */
                         try {
                             updateVersion = commandEngine.submit(archiveCommand);
-                            if (updateVersion.getArchivalCopyLocation() != null) {
+                            if (!updateVersion.getArchivalCopyLocationStatus().equals(DatasetVersion.ARCHIVAL_STATUS_FAILURE)) {
                                 successMsg = BundleUtil.getStringFromBundle("datasetversion.update.archive.success");
                             } else {
                                 successMsg = BundleUtil.getStringFromBundle("datasetversion.update.archive.failure");
@@ -993,28 +1275,120 @@ public Response publishDataset(@PathParam("id") String id, @QueryParam("type") S
                     return error(Response.Status.INTERNAL_SERVER_ERROR, errorMsg);
                 } else {
                     return Response.ok(Json.createObjectBuilder()
-                            .add("status", STATUS_OK)
+                            .add("status", ApiConstants.STATUS_OK)
                             .add("status_details", successMsg)
                             .add("data", json(ds)).build())
                             .type(MediaType.APPLICATION_JSON)
                             .build();
                 }
             } else {
-            PublishDatasetResult res = execCommand(new PublishDatasetCommand(ds,
+                PublishDatasetResult res = execCommand(new PublishDatasetCommand(ds,
                         createDataverseRequest(user),
-                    isMinor));
-            return res.isCompleted() ? ok(json(res.getDataset())) : accepted(json(res.getDataset()));
+                        isMinor));
+                return res.isWorkflow() ? accepted(json(res.getDataset())) : ok(json(res.getDataset()));
+            }
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{id}/actions/:releasemigrated")
+    @Consumes("application/ld+json, application/json-ld")
+    public Response publishMigratedDataset(@Context ContainerRequestContext crc, String jsonldBody, @PathParam("id") String id, @DefaultValue("false") @QueryParam ("updatepidatprovider") boolean contactPIDProvider) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Only superusers can release migrated datasets");
+            }
+
+            Dataset ds = findDatasetOrDie(id);
+            try {
+                JsonObject metadata = JSONLDUtil.decontextualizeJsonLD(jsonldBody);
+                String pubDate = metadata.getString(JsonLDTerm.schemaOrg("datePublished").getUrl());
+                logger.fine("Submitted date: " + pubDate);
+                LocalDateTime dateTime = null;
+                if(!StringUtils.isEmpty(pubDate)) {
+                    dateTime = JSONLDUtil.getDateTimeFrom(pubDate);
+                    final Timestamp time = Timestamp.valueOf(dateTime);
+                    //Set version release date
+                    ds.getLatestVersion().setReleaseTime(new Date(time.getTime()));
+                }
+                // dataset.getPublicationDateFormattedYYYYMMDD())
+                // Assign a version number if not set
+                if (ds.getLatestVersion().getVersionNumber() == null) {
+
+                    if (ds.getVersions().size() == 1) {
+                        // First Release
+                        ds.getLatestVersion().setVersionNumber(Long.valueOf(1));
+                        ds.getLatestVersion().setMinorVersionNumber(Long.valueOf(0));
+                    } else if (ds.getLatestVersion().isMinorUpdate()) {
+                        ds.getLatestVersion().setVersionNumber(Long.valueOf(ds.getVersionNumber()));
+                        ds.getLatestVersion().setMinorVersionNumber(Long.valueOf(ds.getMinorVersionNumber() + 1));
+                    } else {
+                        // major, non-first release
+                        ds.getLatestVersion().setVersionNumber(Long.valueOf(ds.getVersionNumber() + 1));
+                        ds.getLatestVersion().setMinorVersionNumber(Long.valueOf(0));
+                    }
+                }
+                if(ds.getLatestVersion().getVersionNumber()==1 && ds.getLatestVersion().getMinorVersionNumber()==0) {
+                    //Also set publication date if this is the first
+                    if(dateTime != null) {
+                      ds.setPublicationDate(Timestamp.valueOf(dateTime));
+                    }
+                    // Release User is only set in FinalizeDatasetPublicationCommand if the pub date
+                    // is null, so set it here.
+                    ds.setReleaseUser((AuthenticatedUser) user);
+                }
+            } catch (Exception e) {
+                logger.fine(e.getMessage());
+                throw new BadRequestException("Unable to set publication date ("
+                        + JsonLDTerm.schemaOrg("datePublished").getUrl() + "): " + e.getMessage());
+            }
+            /*
+             * Note: The code here mirrors that in the
+             * edu.harvard.iq.dataverse.DatasetPage:updateCurrentVersion method. Any changes
+             * to the core logic (i.e. beyond updating the messaging about results) should
+             * be applied to the code there as well.
+             */
+            String errorMsg = null;
+            Optional<Workflow> prePubWf = wfService.getDefaultWorkflow(TriggerType.PrePublishDataset);
+
+            try {
+                // ToDo - should this be in onSuccess()? May relate to todo above
+                if (prePubWf.isPresent()) {
+                    // Start the workflow, the workflow will call FinalizeDatasetPublication later
+                    wfService.start(prePubWf.get(),
+                            new WorkflowContext(createDataverseRequest(user), ds, TriggerType.PrePublishDataset, !contactPIDProvider),
+                            false);
+                } else {
+                    FinalizeDatasetPublicationCommand cmd = new FinalizeDatasetPublicationCommand(ds,
+                            createDataverseRequest(user), !contactPIDProvider);
+                    ds = commandEngine.submit(cmd);
+                }
+            } catch (CommandException ex) {
+                errorMsg = BundleUtil.getStringFromBundle("datasetversion.update.failure") + " - " + ex.toString();
+                logger.severe(ex.getMessage());
+            }
+
+            if (errorMsg != null) {
+                return error(Response.Status.INTERNAL_SERVER_ERROR, errorMsg);
+            } else {
+                return prePubWf.isPresent() ? accepted(json(ds)) : ok(json(ds));
             }
+
         } catch (WrappedResponse ex) {
             return ex.getResponse();
         }
     }
-    
+
     @POST
+    @AuthRequired
     @Path("{id}/move/{targetDataverseAlias}")
-    public Response moveDataset(@PathParam("id") String id, @PathParam("targetDataverseAlias") String targetDataverseAlias, @QueryParam("forceMove") Boolean force) {
+    public Response moveDataset(@Context ContainerRequestContext crc, @PathParam("id") String id, @PathParam("targetDataverseAlias") String targetDataverseAlias, @QueryParam("forceMove") Boolean force) {
         try {
-            User u = findUserOrDie();            
+            User u = getRequestUser(crc);
             Dataset ds = findDatasetOrDie(id);
             Dataverse target = dataverseService.findByAlias(targetDataverseAlias);
             if (target == null) {
@@ -1033,868 +1407,4601 @@ public Response moveDataset(@PathParam("id") String id, @PathParam("targetDatave
             }
         }
     }
-    
-    @PUT
-    @Path("{linkedDatasetId}/link/{linkingDataverseAlias}") 
-    public Response linkDataset(@PathParam("linkedDatasetId") String linkedDatasetId, @PathParam("linkingDataverseAlias") String linkingDataverseAlias) {        
-        try{
-            User u = findUserOrDie();            
-            Dataset linked = findDatasetOrDie(linkedDatasetId);
-            Dataverse linking = findDataverseOrDie(linkingDataverseAlias);
-            if (linked == null){
-                return error(Response.Status.BAD_REQUEST, "Linked Dataset not found.");
-            } 
-            if (linking == null){
-                return error(Response.Status.BAD_REQUEST, "Linking Dataverse not found.");
-            }   
-            execCommand(new LinkDatasetCommand(
-                    createDataverseRequest(u), linking, linked
-                    ));
-            return ok("Dataset " + linked.getId() + " linked successfully to " + linking.getAlias());
+
+    @POST
+    @AuthRequired
+    @Path("{id}/files/actions/:set-embargo")
+    public Response createFileEmbargo(@Context ContainerRequestContext crc, @PathParam("id") String id, String jsonBody){
+
+        // user is authenticated
+        AuthenticatedUser authenticatedUser = null;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
         } catch (WrappedResponse ex) {
-            return ex.getResponse();
+            return error(Status.UNAUTHORIZED, "Authentication is required.");
         }
-    }
-    
-    @GET
-    @Path("{id}/links")
-    public Response getLinks(@PathParam("id") String idSupplied ) {
+
+        Dataset dataset;
         try {
-            User u = findUserOrDie();
-            if (!u.isSuperuser()) {
-                return error(Response.Status.FORBIDDEN, "Not a superuser");
-            }
-            Dataset dataset = findDatasetOrDie(idSupplied);
+            dataset = findDatasetOrDie(id);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
 
-            long datasetId = dataset.getId();
-            List<Dataverse> dvsThatLinkToThisDatasetId = dataverseSvc.findDataversesThatLinkToThisDatasetId(datasetId);
-            JsonArrayBuilder dataversesThatLinkToThisDatasetIdBuilder = Json.createArrayBuilder();
-            for (Dataverse dataverse : dvsThatLinkToThisDatasetId) {
-                dataversesThatLinkToThisDatasetIdBuilder.add(dataverse.getAlias() + " (id " + dataverse.getId() + ")");
-            }
-            JsonObjectBuilder response = Json.createObjectBuilder();
-            response.add("dataverses that link to dataset id " + datasetId, dataversesThatLinkToThisDatasetIdBuilder);
-            return ok(response);
-        } catch (WrappedResponse wr) {
-            return wr.getResponse();
+        boolean hasValidTerms = TermsOfUseAndAccessValidator.isTOUAValid(dataset.getLatestVersion().getTermsOfUseAndAccess(), null);
+
+        if (!hasValidTerms){
+            return error(Status.CONFLICT, BundleUtil.getStringFromBundle("dataset.message.toua.invalid"));
         }
-    }
 
-    /**
-     * @todo Make this real. Currently only used for API testing. Copied from
-     * the equivalent API endpoint for dataverses and simplified with values
-     * hard coded.
-     */
-    @POST
-    @Path("{identifier}/assignments")
-    public Response createAssignment(String userOrGroup, @PathParam("identifier") String id, @QueryParam("key") String apiKey) {
-        boolean apiTestingOnly = true;
-        if (apiTestingOnly) {
-            return error(Response.Status.FORBIDDEN, "This is only for API tests.");
+        // client is superadmin or (client has EditDataset permission on these files and files are unreleased)
+        /*
+         * This is only a pre-test - if there's no draft version, there are clearly no
+         * files that a normal user can change. The converse is not true. A draft
+         * version could contain only files that have already been released. Further, we
+         * haven't checked the file list yet so the user could still be trying to change
+         * released files even if there are some unreleased/draft-only files. Doing this
+         * check here does avoid having to do further parsing for some error cases. It
+         * also checks the user can edit this dataset, so we don't have to make that
+         * check later.
+         */
+
+        if ((!authenticatedUser.isSuperuser() && (dataset.getLatestVersion().getVersionState() != DatasetVersion.VersionState.DRAFT) ) || !permissionService.userOn(authenticatedUser, dataset).has(Permission.EditDataset)) {
+            return error(Status.FORBIDDEN, "Either the files are released and user is not a superuser or user does not have EditDataset permissions");
         }
+
+        // check if embargoes are allowed(:MaxEmbargoDurationInMonths), gets the :MaxEmbargoDurationInMonths setting variable, if 0 or not set(null) return 400
+        long maxEmbargoDurationInMonths = 0;
         try {
-            Dataset dataset = findDatasetOrDie(id);
-            RoleAssignee assignee = findAssignee(userOrGroup);
-            if (assignee == null) {
-                return error(Response.Status.BAD_REQUEST, "Assignee not found");
+            maxEmbargoDurationInMonths  = Long.parseLong(settingsService.get(SettingsServiceBean.Key.MaxEmbargoDurationInMonths.toString()));
+        } catch (NumberFormatException nfe){
+            if (nfe.getMessage().contains("null")) {
+                return error(Status.BAD_REQUEST, "No Embargoes allowed");
             }
-            DataverseRole theRole = rolesSvc.findBuiltinRoleByAlias("admin");
-            String privateUrlToken = null;
-            return ok(
-                    json(execCommand(new AssignRoleCommand(assignee, theRole, dataset, createDataverseRequest(findUserOrDie()), privateUrlToken))));
-        } catch (WrappedResponse ex) {
-            logger.log(Level.WARNING, "Can''t create assignment: {0}", ex.getMessage());
-            return ex.getResponse();
         }
-    }
+        if (maxEmbargoDurationInMonths == 0){
+            return error(Status.BAD_REQUEST, "No Embargoes allowed");
+        }
 
-    @GET
-    @Path("{identifier}/assignments")
-    public Response getAssignments(@PathParam("identifier") String id) {
-        return response( req -> 
-            ok( execCommand(
-                       new ListRoleAssignments(req, findDatasetOrDie(id)))
-                     .stream().map(ra->json(ra)).collect(toJsonArray())) );
-    }
+        JsonObject json = JsonUtil.getJsonObject(jsonBody);
 
-    @GET
-    @Path("{id}/privateUrl")
-    public Response getPrivateUrlData(@PathParam("id") String idSupplied) {
-        return response( req -> {
-            PrivateUrl privateUrl = execCommand(new GetPrivateUrlCommand(req, findDatasetOrDie(idSupplied)));
-            return (privateUrl != null) ? ok(json(privateUrl)) 
-                                        : error(Response.Status.NOT_FOUND, "Private URL not found.");
-        });
-    }
+        Embargo embargo = new Embargo();
 
-    @POST
-    @Path("{id}/privateUrl")
-    public Response createPrivateUrl(@PathParam("id") String idSupplied) {
-        return response( req -> 
-                ok(json(execCommand(
-                        new CreatePrivateUrlCommand(req, findDatasetOrDie(idSupplied))))));
-    }
 
-    @DELETE
-    @Path("{id}/privateUrl")
-    public Response deletePrivateUrl(@PathParam("id") String idSupplied) {
-        return response( req -> {
-            Dataset dataset = findDatasetOrDie(idSupplied);
-            PrivateUrl privateUrl = execCommand(new GetPrivateUrlCommand(req, dataset));
-            if (privateUrl != null) {
-                execCommand(new DeletePrivateUrlCommand(req, dataset));
-                return ok("Private URL deleted.");
-            } else {
-                return notFound("No Private URL to delete.");
+        LocalDate currentDateTime = LocalDate.now();
+        LocalDate dateAvailable = LocalDate.parse(json.getString("dateAvailable"));
+
+        // check :MaxEmbargoDurationInMonths if -1
+        LocalDate maxEmbargoDateTime = maxEmbargoDurationInMonths != -1 ? LocalDate.now().plusMonths(maxEmbargoDurationInMonths) : null;
+        // dateAvailable is not in the past
+        if (dateAvailable.isAfter(currentDateTime)){
+            embargo.setDateAvailable(dateAvailable);
+        } else {
+            return error(Status.BAD_REQUEST, "Date available can not be in the past");
+        }
+
+        // dateAvailable is within limits
+        if (maxEmbargoDateTime != null){
+            if (dateAvailable.isAfter(maxEmbargoDateTime)){
+                return error(Status.BAD_REQUEST, "Date available can not exceed MaxEmbargoDurationInMonths: "+maxEmbargoDurationInMonths);
             }
-        });
-    }
+        }
 
-    @GET
-    @Path("{id}/thumbnail/candidates")
-    public Response getDatasetThumbnailCandidates(@PathParam("id") String idSupplied) {
-        try {
-            Dataset dataset = findDatasetOrDie(idSupplied);
-            boolean canUpdateThumbnail = false;
-            try {
-                canUpdateThumbnail = permissionSvc.requestOn(createDataverseRequest(findUserOrDie()), dataset).canIssue(UpdateDatasetThumbnailCommand.class);
-            } catch (WrappedResponse ex) {
-                logger.info("Exception thrown while trying to figure out permissions while getting thumbnail for dataset id " + dataset.getId() + ": " + ex.getLocalizedMessage());
+        embargo.setReason(json.getString("reason"));
+
+        List<DataFile> datasetFiles = dataset.getFiles();
+        List<DataFile> filesToEmbargo = new LinkedList<>();
+
+        // extract fileIds from json, find datafiles and add to list
+        if (json.containsKey("fileIds")){
+            JsonArray fileIds = json.getJsonArray("fileIds");
+            for (JsonValue jsv : fileIds) {
+                try {
+                    DataFile dataFile = findDataFileOrDie(jsv.toString());
+                    filesToEmbargo.add(dataFile);
+                } catch (WrappedResponse ex) {
+                    return ex.getResponse();
+                }
             }
-            if (!canUpdateThumbnail) {
-                return error(Response.Status.FORBIDDEN, "You are not permitted to list dataset thumbnail candidates.");
+        }
+
+        List<Embargo> orphanedEmbargoes = new ArrayList<Embargo>();
+        // check if files belong to dataset
+        if (datasetFiles.containsAll(filesToEmbargo)) {
+            JsonArrayBuilder restrictedFiles = Json.createArrayBuilder();
+            boolean badFiles = false;
+            for (DataFile datafile : filesToEmbargo) {
+                // superuser can overrule an existing embargo, even on released files
+                if (datafile.isReleased() && !authenticatedUser.isSuperuser()) {
+                    restrictedFiles.add(datafile.getId());
+                    badFiles = true;
+                }
             }
-            JsonArrayBuilder data = Json.createArrayBuilder();
-            boolean considerDatasetLogoAsCandidate = true;
-            for (DatasetThumbnail datasetThumbnail : DatasetUtil.getThumbnailCandidates(dataset, considerDatasetLogoAsCandidate)) {
-                JsonObjectBuilder candidate = Json.createObjectBuilder();
-                String base64image = datasetThumbnail.getBase64image();
-                if (base64image != null) {
-                    logger.fine("found a candidate!");
-                    candidate.add("base64image", base64image);
+            if (badFiles) {
+                return Response.status(Status.FORBIDDEN)
+                        .entity(NullSafeJsonBuilder.jsonObjectBuilder().add("status", ApiConstants.STATUS_ERROR)
+                                .add("message", "You do not have permission to embargo the following files")
+                                .add("files", restrictedFiles).build())
+                        .type(MediaType.APPLICATION_JSON_TYPE).build();
+            }
+            embargo=embargoService.merge(embargo);
+            // Good request, so add the embargo. Track any existing embargoes so we can
+            // delete them if there are no files left that reference them.
+            for (DataFile datafile : filesToEmbargo) {
+                Embargo emb = datafile.getEmbargo();
+                if (emb != null) {
+                    emb.getDataFiles().remove(datafile);
+                    if (emb.getDataFiles().isEmpty()) {
+                        orphanedEmbargoes.add(emb);
+                    }
                 }
-                DataFile dataFile = datasetThumbnail.getDataFile();
-                if (dataFile != null) {
-                    candidate.add("dataFileId", dataFile.getId());
+                // Save merges the datafile with an embargo into the context
+                datafile.setEmbargo(embargo);
+                fileService.save(datafile);
+            }
+            //Call service to get action logged
+            long embargoId = embargoService.save(embargo, authenticatedUser.getIdentifier());
+            if (orphanedEmbargoes.size() > 0) {
+                for (Embargo emb : orphanedEmbargoes) {
+                    embargoService.deleteById(emb.getId(), authenticatedUser.getIdentifier());
                 }
-                data.add(candidate);
             }
-            return ok(data);
-        } catch (WrappedResponse ex) {
-            return error(Response.Status.NOT_FOUND, "Could not find dataset based on id supplied: " + idSupplied + ".");
-        }
-    }
-
-    @GET
-    @Produces({"image/png"})
-    @Path("{id}/thumbnail")
-    public Response getDatasetThumbnail(@PathParam("id") String idSupplied) {
-        try {
-            Dataset dataset = findDatasetOrDie(idSupplied);
-            InputStream is = DatasetUtil.getThumbnailAsInputStream(dataset);
-            if(is == null) {
-                return notFound("Thumbnail not available");
+            //If superuser, report changes to any released files
+            if (authenticatedUser.isSuperuser()) {
+                String releasedFiles = filesToEmbargo.stream().filter(d -> d.isReleased())
+                        .map(d -> d.getId().toString()).collect(Collectors.joining(","));
+                if (!releasedFiles.isBlank()) {
+                    actionLogSvc
+                            .log(new ActionLogRecord(ActionLogRecord.ActionType.Admin, "embargoAddedTo")
+                                    .setInfo("Embargo id: " + embargo.getId() + " added for released file(s), id(s) "
+                                            + releasedFiles + ".")
+                                    .setUserIdentifier(authenticatedUser.getIdentifier()));
+                }
             }
-            return Response.ok(is).build();
-        } catch (WrappedResponse wr) {
-            return notFound("Thumbnail not available");
+            return ok(Json.createObjectBuilder().add("message", "Files were embargoed"));
+        } else {
+            return error(BAD_REQUEST, "Not all files belong to dataset");
         }
     }
 
-    // TODO: Rather than only supporting looking up files by their database IDs (dataFileIdSupplied), consider supporting persistent identifiers.
     @POST
-    @Path("{id}/thumbnail/{dataFileId}")
-    public Response setDataFileAsThumbnail(@PathParam("id") String idSupplied, @PathParam("dataFileId") long dataFileIdSupplied) {
+    @AuthRequired
+    @Path("{id}/files/actions/:unset-embargo")
+    public Response removeFileEmbargo(@Context ContainerRequestContext crc, @PathParam("id") String id, String jsonBody){
+
+        // user is authenticated
+        AuthenticatedUser authenticatedUser = null;
         try {
-            DatasetThumbnail datasetThumbnail = execCommand(new UpdateDatasetThumbnailCommand(createDataverseRequest(findUserOrDie()), findDatasetOrDie(idSupplied), UpdateDatasetThumbnailCommand.UserIntent.setDatasetFileAsThumbnail, dataFileIdSupplied, null));
-            return ok("Thumbnail set to " + datasetThumbnail.getBase64image());
-        } catch (WrappedResponse wr) {
-            return wr.getResponse();
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Status.UNAUTHORIZED, "Authentication is required.");
         }
-    }
 
-    @POST
-    @Path("{id}/thumbnail")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
-    public Response uploadDatasetLogo(@PathParam("id") String idSupplied, @FormDataParam("file") InputStream inputStream
-    ) {
+        Dataset dataset;
         try {
-            DatasetThumbnail datasetThumbnail = execCommand(new UpdateDatasetThumbnailCommand(createDataverseRequest(findUserOrDie()), findDatasetOrDie(idSupplied), UpdateDatasetThumbnailCommand.UserIntent.setNonDatasetFileAsThumbnail, null, inputStream));
-            return ok("Thumbnail is now " + datasetThumbnail.getBase64image());
-        } catch (WrappedResponse wr) {
-            return wr.getResponse();
+            dataset = findDatasetOrDie(id);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
         }
-    }
 
-    @DELETE
-    @Path("{id}/thumbnail")
-    public Response removeDatasetLogo(@PathParam("id") String idSupplied) {
+        // client is superadmin or (client has EditDataset permission on these files and files are unreleased)
+        // check if files are unreleased(DRAFT?)
+        //ToDo - here and below - check the release status of files and not the dataset state (draft dataset version still can have released files)
+        if ((!authenticatedUser.isSuperuser() && (dataset.getLatestVersion().getVersionState() != DatasetVersion.VersionState.DRAFT) ) || !permissionService.userOn(authenticatedUser, dataset).has(Permission.EditDataset)) {
+            return error(Status.FORBIDDEN, "Either the files are released and user is not a superuser or user does not have EditDataset permissions");
+        }
+
+        // check if embargoes are allowed(:MaxEmbargoDurationInMonths), gets the :MaxEmbargoDurationInMonths setting variable, if 0 or not set(null) return 400
+        //Todo - is 400 right for embargoes not enabled
+        //Todo - handle getting Long for duration in one place (settings getLong method? or is that only in wrapper (view scoped)?
+        int maxEmbargoDurationInMonths = 0;
         try {
-            DatasetThumbnail datasetThumbnail = execCommand(new UpdateDatasetThumbnailCommand(createDataverseRequest(findUserOrDie()), findDatasetOrDie(idSupplied), UpdateDatasetThumbnailCommand.UserIntent.removeThumbnail, null, null));
-            return ok("Dataset thumbnail removed.");
-        } catch (WrappedResponse wr) {
-            return wr.getResponse();
+            maxEmbargoDurationInMonths  = Integer.parseInt(settingsService.get(SettingsServiceBean.Key.MaxEmbargoDurationInMonths.toString()));
+        } catch (NumberFormatException nfe){
+            if (nfe.getMessage().contains("null")) {
+                return error(Status.BAD_REQUEST, "No Embargoes allowed");
+            }
+        }
+        if (maxEmbargoDurationInMonths == 0){
+            return error(Status.BAD_REQUEST, "No Embargoes allowed");
         }
-    }
 
-    @GET
-    @Path("{identifier}/dataCaptureModule/rsync")
-    public Response getRsync(@PathParam("identifier") String id) {
-        //TODO - does it make sense to switch this to dataset identifier for consistency with the rest of the DCM APIs?
-        if (!DataCaptureModuleUtil.rsyncSupportEnabled(settingsSvc.getValueForKey(SettingsServiceBean.Key.UploadMethods))) {
-            return error(Response.Status.METHOD_NOT_ALLOWED, SettingsServiceBean.Key.UploadMethods + " does not contain " + SystemConfig.FileUploadMethods.RSYNC + ".");
+        JsonObject json = JsonUtil.getJsonObject(jsonBody);
+
+        List<DataFile> datasetFiles = dataset.getFiles();
+        List<DataFile> embargoFilesToUnset = new LinkedList<>();
+
+        // extract fileIds from json, find datafiles and add to list
+        if (json.containsKey("fileIds")){
+            JsonArray fileIds = json.getJsonArray("fileIds");
+            for (JsonValue jsv : fileIds) {
+                try {
+                    DataFile dataFile = findDataFileOrDie(jsv.toString());
+                    embargoFilesToUnset.add(dataFile);
+                } catch (WrappedResponse ex) {
+                    return ex.getResponse();
+                }
+            }
         }
-        Dataset dataset = null;
-        try {
-            dataset = findDatasetOrDie(id);
-            AuthenticatedUser user = findAuthenticatedUserOrDie();
-            ScriptRequestResponse scriptRequestResponse = execCommand(new RequestRsyncScriptCommand(createDataverseRequest(user), dataset));
-            
-            DatasetLock lock = datasetService.addDatasetLock(dataset.getId(), DatasetLock.Reason.DcmUpload, user.getId(), "script downloaded");
-            if (lock == null) {
-                logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId());
-                return error(Response.Status.FORBIDDEN, "Failed to lock the dataset (dataset id="+dataset.getId()+")");
+
+        List<Embargo> orphanedEmbargoes = new ArrayList<Embargo>();
+        // check if files belong to dataset
+        if (datasetFiles.containsAll(embargoFilesToUnset)) {
+            JsonArrayBuilder restrictedFiles = Json.createArrayBuilder();
+            boolean badFiles = false;
+            for (DataFile datafile : embargoFilesToUnset) {
+                // superuser can overrule an existing embargo, even on released files
+                if (datafile.getEmbargo()==null || ((datafile.isReleased() && datafile.getEmbargo() != null) && !authenticatedUser.isSuperuser())) {
+                    restrictedFiles.add(datafile.getId());
+                    badFiles = true;
+                }
             }
-            return ok(scriptRequestResponse.getScript(), MediaType.valueOf(MediaType.TEXT_PLAIN));
-        } catch (WrappedResponse wr) {
-            return wr.getResponse();
-        } catch (EJBException ex) {
-            return error(Response.Status.INTERNAL_SERVER_ERROR, "Something went wrong attempting to download rsync script: " + EjbUtil.ejbExceptionToString(ex));
+            if (badFiles) {
+                return Response.status(Status.FORBIDDEN)
+                        .entity(NullSafeJsonBuilder.jsonObjectBuilder().add("status", ApiConstants.STATUS_ERROR)
+                                .add("message", "The following files do not have embargoes or you do not have permission to remove their embargoes")
+                                .add("files", restrictedFiles).build())
+                        .type(MediaType.APPLICATION_JSON_TYPE).build();
+            }
+            // Good request, so remove the embargo from the files. Track any existing embargoes so we can
+            // delete them if there are no files left that reference them.
+            for (DataFile datafile : embargoFilesToUnset) {
+                Embargo emb = datafile.getEmbargo();
+                if (emb != null) {
+                    emb.getDataFiles().remove(datafile);
+                    if (emb.getDataFiles().isEmpty()) {
+                        orphanedEmbargoes.add(emb);
+                    }
+                }
+                // Save merges the datafile with an embargo into the context
+                datafile.setEmbargo(null);
+                fileService.save(datafile);
+            }
+            if (orphanedEmbargoes.size() > 0) {
+                for (Embargo emb : orphanedEmbargoes) {
+                    embargoService.deleteById(emb.getId(), authenticatedUser.getIdentifier());
+                }
+            }
+            String releasedFiles = embargoFilesToUnset.stream().filter(d -> d.isReleased()).map(d->d.getId().toString()).collect(Collectors.joining(","));
+            if(!releasedFiles.isBlank()) {
+                ActionLogRecord removeRecord = new ActionLogRecord(ActionLogRecord.ActionType.Admin, "embargoRemovedFrom").setInfo("Embargo removed from released file(s), id(s) " + releasedFiles + ".");
+                removeRecord.setUserIdentifier(authenticatedUser.getIdentifier());
+                actionLogSvc.log(removeRecord);
+            }
+            return ok(Json.createObjectBuilder().add("message", "Embargo(es) were removed from files"));
+        } else {
+            return error(BAD_REQUEST, "Not all files belong to dataset");
         }
     }
-    
-    /**
-     * This api endpoint triggers the creation of a "package" file in a dataset 
-     *    after that package has been moved onto the same filesystem via the Data Capture Module.
-     * The package is really just a way that Dataverse interprets a folder created by DCM, seeing it as just one file.
-     * The "package" can be downloaded over RSAL.
-     * 
-     * This endpoint currently supports both posix file storage and AWS s3 storage in Dataverse, and depending on which one is active acts accordingly.
-     * 
-     * The initial design of the DCM/Dataverse interaction was not to use packages, but to allow import of all individual files natively into Dataverse.
-     * But due to the possibly immense number of files (millions) the package approach was taken.
-     * This is relevant because the posix ("file") code contains many remnants of that development work.
-     * The s3 code was written later and is set to only support import as packages. It takes a lot from FileRecordWriter.
-     * -MAD 4.9.1
-     */
+
     @POST
-    @Path("{identifier}/dataCaptureModule/checksumValidation")
-    public Response receiveChecksumValidationResults(@PathParam("identifier") String id, JsonObject jsonFromDcm) {
-        logger.log(Level.FINE, "jsonFromDcm: {0}", jsonFromDcm);
+    @AuthRequired
+    @Path("{id}/files/actions/:set-retention")
+    public Response createFileRetention(@Context ContainerRequestContext crc, @PathParam("id") String id, String jsonBody){
+
+        // user is authenticated
         AuthenticatedUser authenticatedUser = null;
         try {
-            authenticatedUser = findAuthenticatedUserOrDie();
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
         } catch (WrappedResponse ex) {
-            return error(Response.Status.BAD_REQUEST, "Authentication is required.");
-        }
-        if (!authenticatedUser.isSuperuser()) {
-            return error(Response.Status.FORBIDDEN, "Superusers only.");
+            return error(Status.UNAUTHORIZED, "Authentication is required.");
         }
-        String statusMessageFromDcm = jsonFromDcm.getString("status");
+
+        Dataset dataset;
         try {
-            Dataset dataset = findDatasetOrDie(id);
-            if ("validation passed".equals(statusMessageFromDcm)) {
-               logger.log(Level.INFO, "Checksum Validation passed for DCM."); 
+            dataset = findDatasetOrDie(id);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
 
-                String storageDriver = (System.getProperty("dataverse.files.storage-driver-id") != null) ? System.getProperty("dataverse.files.storage-driver-id") : "file";
-                String uploadFolder = jsonFromDcm.getString("uploadFolder");
-                int totalSize = jsonFromDcm.getInt("totalSize");
-                
-                if (storageDriver.equals("file")) {
-                    logger.log(Level.INFO, "File storage driver used for (dataset id={0})", dataset.getId());
+        boolean hasValidTerms = TermsOfUseAndAccessValidator.isTOUAValid(dataset.getLatestVersion().getTermsOfUseAndAccess(), null);
 
-                    ImportMode importMode = ImportMode.MERGE;
-                    try {
-                        JsonObject jsonFromImportJobKickoff = execCommand(new ImportFromFileSystemCommand(createDataverseRequest(findUserOrDie()), dataset, uploadFolder, new Long(totalSize), importMode));
-                        long jobId = jsonFromImportJobKickoff.getInt("executionId");
-                        String message = jsonFromImportJobKickoff.getString("message");
-                        JsonObjectBuilder job = Json.createObjectBuilder();
-                        job.add("jobId", jobId);
-                        job.add("message", message);
-                        return ok(job);
-                    } catch (WrappedResponse wr) {
-                        String message = wr.getMessage();
-                        return error(Response.Status.INTERNAL_SERVER_ERROR, "Uploaded files have passed checksum validation but something went wrong while attempting to put the files into Dataverse. Message was '" + message + "'.");
-                    }
-                } else if(storageDriver.equals("s3")) {
-                    
-                    logger.log(Level.INFO, "S3 storage driver used for DCM (dataset id={0})", dataset.getId());
-                    try {
-                        
-                        //Where the lifting is actually done, moving the s3 files over and having dataverse know of the existance of the package
-                        s3PackageImporter.copyFromS3(dataset, uploadFolder);
-                        DataFile packageFile = s3PackageImporter.createPackageDataFile(dataset, uploadFolder, new Long(totalSize));
-                        
-                        if (packageFile == null) {
-                            logger.log(Level.SEVERE, "S3 File package import failed.");
-                            return error(Response.Status.INTERNAL_SERVER_ERROR, "S3 File package import failed.");
-                        }
-                        DatasetLock dcmLock = dataset.getLockFor(DatasetLock.Reason.DcmUpload);
-                        if (dcmLock == null) {
-                            logger.log(Level.WARNING, "Dataset not locked for DCM upload");
-                        } else {
-                            datasetService.removeDatasetLocks(dataset, DatasetLock.Reason.DcmUpload);
-                            dataset.removeLock(dcmLock);
-                        }
-                        
-                        // update version using the command engine to enforce user permissions and constraints
-                        if (dataset.getVersions().size() == 1 && dataset.getLatestVersion().getVersionState() == DatasetVersion.VersionState.DRAFT) {
-                            try {
-                                Command<Dataset> cmd;
-                                cmd = new UpdateDatasetVersionCommand(dataset, new DataverseRequest(authenticatedUser, (HttpServletRequest) null));
-                                commandEngine.submit(cmd);
-                            } catch (CommandException ex) {
-                                return error(Response.Status.INTERNAL_SERVER_ERROR, "CommandException updating DatasetVersion from batch job: " + ex.getMessage());
-                            }
-                        } else {
-                            String constraintError = "ConstraintException updating DatasetVersion form batch job: dataset must be a "
-                                    + "single version in draft mode.";
-                            logger.log(Level.SEVERE, constraintError);
-                        }
+        if (!hasValidTerms){
+            return error(Status.CONFLICT, BundleUtil.getStringFromBundle("dataset.message.toua.invalid"));
+        }
 
-                        JsonObjectBuilder job = Json.createObjectBuilder();
-                        return ok(job);
-                        
-                    }  catch (IOException e) {
-                        String message = e.getMessage();
-                        return error(Response.Status.INTERNAL_SERVER_ERROR, "Uploaded files have passed checksum validation but something went wrong while attempting to move the files into Dataverse. Message was '" + message + "'.");
-                    } 
-                } else {
-                    return error(Response.Status.INTERNAL_SERVER_ERROR, "Invalid storage driver in Dataverse, not compatible with dcm");
-                }
-            } else if ("validation failed".equals(statusMessageFromDcm)) {
-                Map<String, AuthenticatedUser> distinctAuthors = permissionService.getDistinctUsersWithPermissionOn(Permission.EditDataset, dataset);
-                distinctAuthors.values().forEach((value) -> {
-                    userNotificationService.sendNotification((AuthenticatedUser) value, new Timestamp(new Date().getTime()), UserNotification.Type.CHECKSUMFAIL, dataset.getId());
-                });
-                List<AuthenticatedUser> superUsers = authenticationServiceBean.findSuperUsers();
-                if (superUsers != null && !superUsers.isEmpty()) {
-                    superUsers.forEach((au) -> {
-                        userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.CHECKSUMFAIL, dataset.getId());
-                    });
-                }
-                return ok("User notified about checksum validation failure.");
-            } else {
-                return error(Response.Status.BAD_REQUEST, "Unexpected status cannot be processed: " + statusMessageFromDcm);
+        // client is superadmin or (client has EditDataset permission on these files and files are unreleased)
+        // check if files are unreleased(DRAFT?)
+        if ((!authenticatedUser.isSuperuser() && (dataset.getLatestVersion().getVersionState() != DatasetVersion.VersionState.DRAFT) ) || !permissionService.userOn(authenticatedUser, dataset).has(Permission.EditDataset)) {
+            return error(Status.FORBIDDEN, "Either the files are released and user is not a superuser or user does not have EditDataset permissions");
+        }
+
+        // check if retentions are allowed(:MinRetentionDurationInMonths), gets the :MinRetentionDurationInMonths setting variable, if 0 or not set(null) return 400
+        long minRetentionDurationInMonths = 0;
+        try {
+            minRetentionDurationInMonths  = Long.parseLong(settingsService.get(SettingsServiceBean.Key.MinRetentionDurationInMonths.toString()));
+        } catch (NumberFormatException nfe){
+            if (nfe.getMessage().contains("null")) {
+                return error(Status.BAD_REQUEST, "No Retention periods allowed");
             }
-        } catch (WrappedResponse ex) {
-            return ex.getResponse();
         }
-    }
-    
+        if (minRetentionDurationInMonths == 0){
+            return error(Status.BAD_REQUEST, "No Retention periods allowed");
+        }
 
-    @POST
-    @Path("{id}/submitForReview")
-    public Response submitForReview(@PathParam("id") String idSupplied) {
+        JsonObject json;
         try {
-            Dataset updatedDataset = execCommand(new SubmitDatasetForReviewCommand(createDataverseRequest(findUserOrDie()), findDatasetOrDie(idSupplied)));
-            JsonObjectBuilder result = Json.createObjectBuilder();
-            
-            boolean inReview = updatedDataset.isLockedFor(DatasetLock.Reason.InReview);
-            
-            result.add("inReview", inReview);
-            result.add("message", "Dataset id " + updatedDataset.getId() + " has been submitted for review.");
-            return ok(result);
-        } catch (WrappedResponse wr) {
-            return wr.getResponse();
+            json = JsonUtil.getJsonObject(jsonBody);
+        } catch (JsonException ex) {
+            return error(Status.BAD_REQUEST, "Invalid JSON; error message: " + ex.getMessage());
         }
-    }
 
-    @POST
-    @Path("{id}/returnToAuthor")
-    public Response returnToAuthor(@PathParam("id") String idSupplied, String jsonBody) {
-        
-        if (jsonBody == null || jsonBody.isEmpty()) {
-            return error(Response.Status.BAD_REQUEST, "You must supply JSON to this API endpoint and it must contain a reason for returning the dataset (field: reasonForReturn).");
+        Retention retention = new Retention();
+
+
+        LocalDate currentDateTime = LocalDate.now();
+
+        // Extract the dateUnavailable - check if specified and valid
+        String dateUnavailableStr = "";
+        LocalDate dateUnavailable;
+        try {
+            dateUnavailableStr = json.getString("dateUnavailable");
+            dateUnavailable = LocalDate.parse(dateUnavailableStr);
+        } catch (NullPointerException npex) {
+            return error(Status.BAD_REQUEST, "Invalid retention period; no dateUnavailable specified");
+        } catch (ClassCastException ccex) {
+            return error(Status.BAD_REQUEST, "Invalid retention period; dateUnavailable must be a string");
+        } catch (DateTimeParseException dtpex) {
+            return error(Status.BAD_REQUEST, "Invalid date format for dateUnavailable: " + dateUnavailableStr);
+        }
+
+        // check :MinRetentionDurationInMonths if -1
+        LocalDate minRetentionDateTime = minRetentionDurationInMonths != -1 ? LocalDate.now().plusMonths(minRetentionDurationInMonths) : null;
+        // dateUnavailable is not in the past
+        if (dateUnavailable.isAfter(currentDateTime)){
+            retention.setDateUnavailable(dateUnavailable);
+        } else {
+            return error(Status.BAD_REQUEST, "Date unavailable can not be in the past");
+        }
+
+        // dateAvailable is within limits
+        if (minRetentionDateTime != null){
+            if (dateUnavailable.isBefore(minRetentionDateTime)){
+                return error(Status.BAD_REQUEST, "Date unavailable can not be earlier than MinRetentionDurationInMonths: "+minRetentionDurationInMonths + " from now");
+            }
         }
-        StringReader rdr = new StringReader(jsonBody);
-        JsonObject json = Json.createReader(rdr).readObject();
+
         try {
-            Dataset dataset = findDatasetOrDie(idSupplied);
-            String reasonForReturn = null;           
-            reasonForReturn = json.getString("reasonForReturn");
-            // TODO: Once we add a box for the curator to type into, pass the reason for return to the ReturnDatasetToAuthorCommand and delete this check and call to setReturnReason on the API side.
-            if (reasonForReturn == null || reasonForReturn.isEmpty()) {
-                return error(Response.Status.BAD_REQUEST, "You must enter a reason for returning a dataset to the author(s).");
+            String reason = json.getString("reason");
+            retention.setReason(reason);
+        } catch (NullPointerException npex) {
+            // ignoring; no reason specified is OK, it is optional
+        } catch (ClassCastException ccex) {
+            return error(Status.BAD_REQUEST, "Invalid retention period; reason must be a string");
+        }
+
+
+        List<DataFile> datasetFiles = dataset.getFiles();
+        List<DataFile> filesToRetention = new LinkedList<>();
+
+        // extract fileIds from json, find datafiles and add to list
+        if (json.containsKey("fileIds")){
+            try {
+                JsonArray fileIds = json.getJsonArray("fileIds");
+                for (JsonValue jsv : fileIds) {
+                    try {
+                        DataFile dataFile = findDataFileOrDie(jsv.toString());
+                        filesToRetention.add(dataFile);
+                    } catch (WrappedResponse ex) {
+                        return ex.getResponse();
+                    }
+                }
+            } catch (ClassCastException ccex) {
+                return error(Status.BAD_REQUEST, "Invalid retention period; fileIds must be an array of id strings");
+            } catch (NullPointerException npex) {
+                return error(Status.BAD_REQUEST, "Invalid retention period; no fileIds specified");
             }
-            AuthenticatedUser authenticatedUser = findAuthenticatedUserOrDie();
-            Dataset updatedDataset = execCommand(new ReturnDatasetToAuthorCommand(createDataverseRequest(authenticatedUser), dataset, reasonForReturn ));
+        } else {
+            return error(Status.BAD_REQUEST, "No fileIds specified");
+        }
 
-            JsonObjectBuilder result = Json.createObjectBuilder();
-            result.add("inReview", false);
-            result.add("message", "Dataset id " + updatedDataset.getId() + " has been sent back to the author(s).");
-            return ok(result);
-        } catch (WrappedResponse wr) {
-            return wr.getResponse();
+        List<Retention> orphanedRetentions = new ArrayList<Retention>();
+        // check if files belong to dataset
+        if (datasetFiles.containsAll(filesToRetention)) {
+            JsonArrayBuilder restrictedFiles = Json.createArrayBuilder();
+            boolean badFiles = false;
+            for (DataFile datafile : filesToRetention) {
+                // superuser can overrule an existing retention, even on released files
+                if (datafile.isReleased() && !authenticatedUser.isSuperuser()) {
+                    restrictedFiles.add(datafile.getId());
+                    badFiles = true;
+                }
+            }
+            if (badFiles) {
+                return Response.status(Status.FORBIDDEN)
+                        .entity(NullSafeJsonBuilder.jsonObjectBuilder().add("status", ApiConstants.STATUS_ERROR)
+                                .add("message", "You do not have permission to set a retention period for the following files")
+                                .add("files", restrictedFiles).build())
+                        .type(MediaType.APPLICATION_JSON_TYPE).build();
+            }
+            retention=retentionService.merge(retention);
+            // Good request, so add the retention. Track any existing retentions so we can
+            // delete them if there are no files left that reference them.
+            for (DataFile datafile : filesToRetention) {
+                Retention ret = datafile.getRetention();
+                if (ret != null) {
+                    ret.getDataFiles().remove(datafile);
+                    if (ret.getDataFiles().isEmpty()) {
+                        orphanedRetentions.add(ret);
+                    }
+                }
+                // Save merges the datafile with an retention into the context
+                datafile.setRetention(retention);
+                fileService.save(datafile);
+            }
+            //Call service to get action logged
+            long retentionId = retentionService.save(retention, authenticatedUser.getIdentifier());
+            if (orphanedRetentions.size() > 0) {
+                for (Retention ret : orphanedRetentions) {
+                    retentionService.delete(ret, authenticatedUser.getIdentifier());
+                }
+            }
+            //If superuser, report changes to any released files
+            if (authenticatedUser.isSuperuser()) {
+                String releasedFiles = filesToRetention.stream().filter(d -> d.isReleased())
+                        .map(d -> d.getId().toString()).collect(Collectors.joining(","));
+                if (!releasedFiles.isBlank()) {
+                    actionLogSvc
+                            .log(new ActionLogRecord(ActionLogRecord.ActionType.Admin, "retentionAddedTo")
+                                    .setInfo("Retention id: " + retention.getId() + " added for released file(s), id(s) "
+                                            + releasedFiles + ".")
+                                    .setUserIdentifier(authenticatedUser.getIdentifier()));
+                }
+            }
+            return ok(Json.createObjectBuilder().add("message", "File(s) retention period has been set or updated"));
+        } else {
+            return error(BAD_REQUEST, "Not all files belong to dataset");
         }
     }
 
-    /**
-     * Add a File to an existing Dataset
-     * 
-     * @param idSupplied
-     * @param jsonData
-     * @param fileInputStream
-     * @param contentDispositionHeader
-     * @param formDataBodyPart
-     * @return 
-     */
     @POST
-    @Path("{id}/add")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
-    public Response addFileToDataset(@PathParam("id") String idSupplied,
-                    @FormDataParam("jsonData") String jsonData,
-                    @FormDataParam("file") InputStream fileInputStream,
-                    @FormDataParam("file") FormDataContentDisposition contentDispositionHeader,
-                    @FormDataParam("file") final FormDataBodyPart formDataBodyPart
-                    ){
-
-        if (!systemConfig.isHTTPUpload()) {
-            return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.httpDisabled"));
-        }
+    @AuthRequired
+    @Path("{id}/files/actions/:unset-retention")
+    public Response removeFileRetention(@Context ContainerRequestContext crc, @PathParam("id") String id, String jsonBody){
 
-        // -------------------------------------
-        // (1) Get the user from the API key
-        // -------------------------------------
-        User authUser;
+        // user is authenticated
+        AuthenticatedUser authenticatedUser = null;
         try {
-            authUser = findUserOrDie();
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
         } catch (WrappedResponse ex) {
-            return error(Response.Status.FORBIDDEN,
-                    BundleUtil.getStringFromBundle("file.addreplace.error.auth")
-                    );
+            return error(Status.UNAUTHORIZED, "Authentication is required.");
         }
-        
-        
-        // -------------------------------------
-        // (2) Get the Dataset Id
-        //  
-        // -------------------------------------
+
         Dataset dataset;
-        
         try {
-            dataset = findDatasetOrDie(idSupplied);
-        } catch (WrappedResponse wr) {
-            return wr.getResponse();           
+            dataset = findDatasetOrDie(id);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
         }
-        
-        //------------------------------------
-        // (2a) Make sure dataset does not have package file
-        //
-        // --------------------------------------
-        
-        for (DatasetVersion dv : dataset.getVersions()) {
-            if (dv.isHasPackageFile()) {
-                return error(Response.Status.FORBIDDEN,
-                        BundleUtil.getStringFromBundle("file.api.alreadyHasPackageFile")
-                );
-            }
+
+        // client is superadmin or (client has EditDataset permission on these files and files are unreleased)
+        // check if files are unreleased(DRAFT?)
+        //ToDo - here and below - check the release status of files and not the dataset state (draft dataset version still can have released files)
+        if ((!authenticatedUser.isSuperuser() && (dataset.getLatestVersion().getVersionState() != DatasetVersion.VersionState.DRAFT) ) || !permissionService.userOn(authenticatedUser, dataset).has(Permission.EditDataset)) {
+            return error(Status.FORBIDDEN, "Either the files are released and user is not a superuser or user does not have EditDataset permissions");
         }
 
-                       
-        // -------------------------------------
-        // (3) Get the file name and content type
-        // -------------------------------------
-        if(null == contentDispositionHeader) {
-             return error(BAD_REQUEST, "You must upload a file.");
+        // check if retentions are allowed(:MinRetentionDurationInMonths), gets the :MinRetentionDurationInMonths setting variable, if 0 or not set(null) return 400
+        int minRetentionDurationInMonths = 0;
+        try {
+            minRetentionDurationInMonths  = Integer.parseInt(settingsService.get(SettingsServiceBean.Key.MinRetentionDurationInMonths.toString()));
+        } catch (NumberFormatException nfe){
+            if (nfe.getMessage().contains("null")) {
+                return error(Status.BAD_REQUEST, "No Retention periods allowed");
+            }
+        }
+        if (minRetentionDurationInMonths == 0){
+            return error(Status.BAD_REQUEST, "No Retention periods allowed");
         }
-        String newFilename = contentDispositionHeader.getFileName();
-        String newFileContentType = formDataBodyPart.getMediaType().toString();
-      
-        
-        // (2a) Load up optional params via JSON
-        //---------------------------------------
-        OptionalFileParams optionalFileParams = null;
-        msgt("(api) jsonData: " +  jsonData);
 
+        JsonObject json;
         try {
-            optionalFileParams = new OptionalFileParams(jsonData);
-        } catch (DataFileTagException ex) {
-            return error( Response.Status.BAD_REQUEST, ex.getMessage());            
+            json = JsonUtil.getJsonObject(jsonBody);
+        } catch (JsonException ex) {
+            return error(Status.BAD_REQUEST, "Invalid JSON; error message: " + ex.getMessage());
         }
 
-        
-        //-------------------
-        // (3) Create the AddReplaceFileHelper object
-        //-------------------
-        msg("ADD!");
+        List<DataFile> datasetFiles = dataset.getFiles();
+        List<DataFile> retentionFilesToUnset = new LinkedList<>();
 
-        DataverseRequest dvRequest2 = createDataverseRequest(authUser);
-        AddReplaceFileHelper addFileHelper = new AddReplaceFileHelper(dvRequest2,
-                                                ingestService,
-                                                datasetService,
-                                                fileService,
-                                                permissionSvc,
-                                                commandEngine,
-                                                systemConfig);
-
-
-        //-------------------
-        // (4) Run "runAddFileByDatasetId"
-        //-------------------
-        addFileHelper.runAddFileByDataset(dataset,
-                                newFilename,
-                                newFileContentType,
-                                fileInputStream,
-                                optionalFileParams);
-
-
-        if (addFileHelper.hasError()){
-            return error(addFileHelper.getHttpErrorCode(), addFileHelper.getErrorMessagesAsString("\n"));
-        }else{
-            String successMsg = BundleUtil.getStringFromBundle("file.addreplace.success.add");
+        // extract fileIds from json, find datafiles and add to list
+        if (json.containsKey("fileIds")){
             try {
-                //msgt("as String: " + addFileHelper.getSuccessResult());
-                /**
-                 * @todo We need a consistent, sane way to communicate a human
-                 * readable message to an API client suitable for human
-                 * consumption. Imagine if the UI were built in Angular or React
-                 * and we want to return a message from the API as-is to the
-                 * user. Human readable.
-                 */
-                logger.fine("successMsg: " + successMsg);
-                return ok(addFileHelper.getSuccessResultAsJsonObjectBuilder());
-                //"Look at that!  You added a file! (hey hey, it may have worked)");
-            } catch (NoFilesException ex) {
-                Logger.getLogger(Files.class.getName()).log(Level.SEVERE, null, ex);
-                return error(Response.Status.BAD_REQUEST, "NoFileException!  Serious Error! See administrator!");
-
+                JsonArray fileIds = json.getJsonArray("fileIds");
+                for (JsonValue jsv : fileIds) {
+                    try {
+                        DataFile dataFile = findDataFileOrDie(jsv.toString());
+                        retentionFilesToUnset.add(dataFile);
+                    } catch (WrappedResponse ex) {
+                        return ex.getResponse();
+                    }
+                }
+            } catch (ClassCastException ccex) {
+                return error(Status.BAD_REQUEST, "fileIds must be an array of id strings");
+            } catch (NullPointerException npex) {
+                return error(Status.BAD_REQUEST, "No fileIds specified");
             }
+        } else {
+            return error(Status.BAD_REQUEST, "No fileIds specified");
         }
-            
-    } // end: addFileToDataset
 
-
-    
-    private void msg(String m){
-        //System.out.println(m);
-        logger.fine(m);
-    }
-    private void dashes(){
-        msg("----------------");
-    }
-    private void msgt(String m){
-        dashes(); msg(m); dashes();
-    }
-    
-    
-    private <T> T handleVersion( String versionId, DsVersionHandler<T> hdl )
-        throws WrappedResponse {
-        switch (versionId) {
-            case ":latest": return hdl.handleLatest();
-            case ":draft": return hdl.handleDraft();
-            case ":latest-published": return hdl.handleLatestPublished();
-            default:
-                try {
-                    String[] versions = versionId.split("\\.");
-                    switch (versions.length) {
-                        case 1:
-                            return hdl.handleSpecific(Long.parseLong(versions[0]), (long)0.0);
-                        case 2:
-                            return hdl.handleSpecific( Long.parseLong(versions[0]), Long.parseLong(versions[1]) );
-                        default:
-                            throw new WrappedResponse(error( Response.Status.BAD_REQUEST, "Illegal version identifier '" + versionId + "'"));
+        List<Retention> orphanedRetentions = new ArrayList<Retention>();
+        // check if files belong to dataset
+        if (datasetFiles.containsAll(retentionFilesToUnset)) {
+            JsonArrayBuilder restrictedFiles = Json.createArrayBuilder();
+            boolean badFiles = false;
+            for (DataFile datafile : retentionFilesToUnset) {
+                // superuser can overrule an existing retention, even on released files
+                if (datafile.getRetention()==null || ((datafile.isReleased() && datafile.getRetention() != null) && !authenticatedUser.isSuperuser())) {
+                    restrictedFiles.add(datafile.getId());
+                    badFiles = true;
+                }
+            }
+            if (badFiles) {
+                return Response.status(Status.FORBIDDEN)
+                        .entity(NullSafeJsonBuilder.jsonObjectBuilder().add("status", ApiConstants.STATUS_ERROR)
+                                .add("message", "The following files do not have retention periods or you do not have permission to remove their retention periods")
+                                .add("files", restrictedFiles).build())
+                        .type(MediaType.APPLICATION_JSON_TYPE).build();
+            }
+            // Good request, so remove the retention from the files. Track any existing retentions so we can
+            // delete them if there are no files left that reference them.
+            for (DataFile datafile : retentionFilesToUnset) {
+                Retention ret = datafile.getRetention();
+                if (ret != null) {
+                    ret.getDataFiles().remove(datafile);
+                    if (ret.getDataFiles().isEmpty()) {
+                        orphanedRetentions.add(ret);
                     }
-                } catch ( NumberFormatException nfe ) {
-                    throw new WrappedResponse( error( Response.Status.BAD_REQUEST, "Illegal version identifier '" + versionId + "'") );
                 }
+                // Save merges the datafile with an retention into the context
+                datafile.setRetention(null);
+                fileService.save(datafile);
+            }
+            if (orphanedRetentions.size() > 0) {
+                for (Retention ret : orphanedRetentions) {
+                    retentionService.delete(ret, authenticatedUser.getIdentifier());
+                }
+            }
+            String releasedFiles = retentionFilesToUnset.stream().filter(d -> d.isReleased()).map(d->d.getId().toString()).collect(Collectors.joining(","));
+            if(!releasedFiles.isBlank()) {
+                ActionLogRecord removeRecord = new ActionLogRecord(ActionLogRecord.ActionType.Admin, "retentionRemovedFrom").setInfo("Retention removed from released file(s), id(s) " + releasedFiles + ".");
+                removeRecord.setUserIdentifier(authenticatedUser.getIdentifier());
+                actionLogSvc.log(removeRecord);
+            }
+            return ok(Json.createObjectBuilder().add("message", "Retention periods were removed from file(s)"));
+        } else {
+            return error(BAD_REQUEST, "Not all files belong to dataset");
         }
     }
-    
-    private DatasetVersion getDatasetVersionOrDie( final DataverseRequest req, String versionNumber, final Dataset ds, UriInfo uriInfo, HttpHeaders headers) throws WrappedResponse {
-        DatasetVersion dsv = execCommand( handleVersion(versionNumber, new DsVersionHandler<Command<DatasetVersion>>(){
 
-                @Override
-                public Command<DatasetVersion> handleLatest() {
-                    return new GetLatestAccessibleDatasetVersionCommand(req, ds);
-                }
+    @POST
+    @AuthRequired
+    @Path("{id}/files/uploadlimit/{limit}")
+    public Response updateDatasetFilesLimits(@Context ContainerRequestContext crc,
+                                                @PathParam("id") String id,
+                                                @PathParam("limit") int datasetFileCountLimit) {
 
-                @Override
-                public Command<DatasetVersion> handleDraft() {
-                    return new GetDraftDatasetVersionCommand(req, ds);
-                }
-  
-                @Override
-                public Command<DatasetVersion> handleSpecific(long major, long minor) {
-                    return new GetSpecificPublishedDatasetVersionCommand(req, ds, major, minor);
-                }
+        // user is authenticated
+        AuthenticatedUser authenticatedUser = null;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Status.UNAUTHORIZED, "Authentication is required.");
+        }
+        if (!authenticatedUser.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
 
-                @Override
-                public Command<DatasetVersion> handleLatestPublished() {
-                    return new GetLatestPublishedDatasetVersionCommand(req, ds);
-                }
-            }));
-        if ( dsv == null || dsv.getId() == null ) {
-            throw new WrappedResponse( notFound("Dataset version " + versionNumber + " of dataset " + ds.getId() + " not found") );
+        Dataset dataset;
+        try {
+            dataset = findDatasetOrDie(id);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
         }
-        
-        MakeDataCountLoggingServiceBean.MakeDataCountEntry entry = new MakeDataCountEntry(uriInfo, headers, dvRequestService, ds);
-        mdcLogService.logEntry(entry);
-        
-        return dsv;
+
+        dataset.setDatasetFileCountLimit(datasetFileCountLimit);
+        datasetService.merge(dataset);
+        return ok("ok");
     }
-    
-    @GET
-    @Path("{identifier}/locks")
-    public Response getLocks(@PathParam("identifier") String id, @QueryParam("type") DatasetLock.Reason lockType) {
 
-        Dataset dataset = null;
+    @DELETE
+    @AuthRequired
+    @Path("{id}/files/uploadlimit")
+    public Response deleteDatasetFilesLimits(@Context ContainerRequestContext crc,
+                                             @PathParam("id") String id) {
+        // user is authenticated
+        AuthenticatedUser authenticatedUser = null;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Status.UNAUTHORIZED, "Authentication is required.");
+        }
+        if (!authenticatedUser.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        Dataset dataset;
         try {
             dataset = findDatasetOrDie(id);
-            Set<DatasetLock> locks;      
-            if (lockType == null) {
-                locks = dataset.getLocks();
-            } else {
-                // request for a specific type lock:
-                DatasetLock lock = dataset.getLockFor(lockType);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
 
-                locks = new HashSet<>(); 
-                if (lock != null) {
-                    locks.add(lock);
-                }
+        dataset.setDatasetFileCountLimit(null);
+        datasetService.merge(dataset);
+        return ok("ok");
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{linkedDatasetId}/link/{linkingDataverseAlias}")
+    public Response linkDataset(@Context ContainerRequestContext crc, @PathParam("linkedDatasetId") String linkedDatasetId, @PathParam("linkingDataverseAlias") String linkingDataverseAlias) {
+        try {
+            User u = getRequestUser(crc);
+            Dataset linked = findDatasetOrDie(linkedDatasetId);
+            Dataverse linking = findDataverseOrDie(linkingDataverseAlias);
+            if (linked == null){
+                return error(Response.Status.BAD_REQUEST, "Linked Dataset not found.");
+            }
+            if (linking == null) {
+                return error(Response.Status.BAD_REQUEST, "Linking Dataverse not found.");
+            }
+            execCommand(new LinkDatasetCommand(
+                    createDataverseRequest(u), linking, linked
+            ));
+            return ok("Dataset " + linked.getId() + " linked successfully to " + linking.getAlias());
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @GET
+    @Path("{id}/versions/{versionId}/customlicense")
+    public Response getCustomTermsTab(@PathParam("id") String id, @PathParam("versionId") String versionId,
+            @Context UriInfo uriInfo, @Context HttpHeaders headers) {
+        User user = session.getUser();
+        String persistentId;
+        try {
+            if (DatasetUtil.getLicense(getDatasetVersionOrDie(createDataverseRequest(user), versionId, findDatasetOrDie(id), uriInfo, headers)) != null) {
+                return error(Status.NOT_FOUND, "This Dataset has no custom license");
+            }
+            persistentId = getRequestParameter(":persistentId".substring(1));
+            if (versionId.equals(DS_VERSION_DRAFT)) {
+                versionId = "DRAFT";
+            }
+        } catch (WrappedResponse wrappedResponse) {
+            return wrappedResponse.getResponse();
+        }
+        return Response.seeOther(URI.create(systemConfig.getDataverseSiteUrl() + "/dataset.xhtml?persistentId="
+                + persistentId + "&version=" + versionId + "&selectTab=termsTab")).build();
+    }
+
+
+    @GET
+    @AuthRequired
+    @Path("{id}/links")
+    public Response getLinks(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied ) {
+        try {
+            User u = getRequestUser(crc);
+            Dataset dataset = findDatasetOrDie(idSupplied);
+
+            if (!dataset.isReleased() && !permissionService.hasPermissionsFor(u, dataset, EnumSet.of(Permission.ViewUnpublishedDataset))) {
+                return error(Response.Status.FORBIDDEN, "User is not allowed to list the link(s) of this dataset");
             }
-            
-            return ok(locks.stream().map(lock -> json(lock)).collect(toJsonArray()));
 
+            long datasetId = dataset.getId();
+            List<Dataverse> dvsThatLinkToThisDatasetId = dataverseSvc.findDataversesThatLinkToThisDatasetId(datasetId);
+            JsonArrayBuilder dataversesThatLinkToThisDatasetIdBuilder = Json.createArrayBuilder();
+            for (Dataverse dataverse : dvsThatLinkToThisDatasetId) {
+                if (dataverse.isReleased() || this.permissionService.hasPermissionsFor(u, dataverse, EnumSet.of(Permission.ViewUnpublishedDataverse))) {
+                    JsonObjectBuilder datasetBuilder = Json.createObjectBuilder();
+                    datasetBuilder.add("id", dataverse.getId());
+                    datasetBuilder.add("alias", dataverse.getAlias());
+                    datasetBuilder.add("displayName", dataverse.getDisplayName());
+                    dataversesThatLinkToThisDatasetIdBuilder.add(datasetBuilder.build());
+                }
+            }
+            JsonObjectBuilder response = Json.createObjectBuilder();
+            response.add("id", datasetId);
+            response.add("identifier", dataset.getIdentifier());
+            response.add("linked-dataverses", dataversesThatLinkToThisDatasetIdBuilder);
+            return ok(response);
         } catch (WrappedResponse wr) {
             return wr.getResponse();
-        } 
-    }   
-    
-    @DELETE
-    @Path("{identifier}/locks")
-    public Response deleteLocks(@PathParam("identifier") String id, @QueryParam("type") DatasetLock.Reason lockType) {
+        }
+    }
 
-        return response(req -> {
-            try {
-                AuthenticatedUser user = findAuthenticatedUserOrDie();
-                if (!user.isSuperuser()) {
-                    return error(Response.Status.FORBIDDEN, "This API end point can be used by superusers only.");
-                }
-                Dataset dataset = findDatasetOrDie(id);
-                
-                if (lockType == null) {
-                    Set<DatasetLock.Reason> locks = new HashSet<>();
-                    for (DatasetLock lock : dataset.getLocks()) {
-                        locks.add(lock.getReason());
-                    }
-                    if (!locks.isEmpty()) {
-                        for (DatasetLock.Reason locktype : locks) {
-                            execCommand(new RemoveLockCommand(req, dataset, locktype));
-                            // refresh the dataset:
-                            dataset = findDatasetOrDie(id);
-                        }
-                        // kick of dataset reindexing, in case the locks removed 
-                        // affected the search card:
-                        try {
-                            indexService.indexDataset(dataset, true);
-                        } catch (IOException | SolrServerException e) {
-                            String failureLogText = "Post lock removal indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-                            failureLogText += "\r\n" + e.getLocalizedMessage();
-                            LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, dataset);
+    /**
+     * Add a given assignment to a given user or group
+     * @param ra     role assignment DTO
+     * @param id     dataset id
+     * @param apiKey
+     */
+    @POST
+    @AuthRequired
+    @Path("{identifier}/assignments")
+    public Response createAssignment(@Context ContainerRequestContext crc, RoleAssignmentDTO ra, @PathParam("identifier") String id, @QueryParam("key") String apiKey) {
+        try {
+            Dataset dataset = findDatasetOrDie(id);
 
-                        }
-                        return ok("locks removed");
-                    }
-                    return ok("dataset not locked");
-                }
-                // request for a specific type lock:
-                DatasetLock lock = dataset.getLockFor(lockType);
-                if (lock != null) {
-                    execCommand(new RemoveLockCommand(req, dataset, lock.getReason()));
-                    // refresh the dataset:
-                    dataset = findDatasetOrDie(id);
-                    // ... and kick of dataset reindexing, in case the lock removed 
-                    // affected the search card:
-                    try {
-                        indexService.indexDataset(dataset, true);
-                    } catch (IOException | SolrServerException e) {
-                        String failureLogText = "Post lock removal indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-                        failureLogText += "\r\n" + e.getLocalizedMessage();
-                        LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, dataset);
+            RoleAssignee assignee = findAssignee(ra.getAssignee());
+            if (assignee == null) {
+                return error(Response.Status.BAD_REQUEST, BundleUtil.getStringFromBundle("datasets.api.grant.role.assignee.not.found.error"));
+            }
 
+            DataverseRole theRole;
+            Dataverse dv = dataset.getOwner();
+            theRole = null;
+            while ((theRole == null) && (dv != null)) {
+                for (DataverseRole aRole : rolesSvc.availableRoles(dv.getId())) {
+                    if (aRole.getAlias().equals(ra.getRole())) {
+                        theRole = aRole;
+                        break;
                     }
-                    return ok("lock type " + lock.getReason() + " removed");
                 }
-                return ok("no lock type " + lockType + " on the dataset");
-            } catch (WrappedResponse wr) {
-                return wr.getResponse();
+                dv = dv.getOwner();
+            }
+            if (theRole == null) {
+                List<String> args = Arrays.asList(ra.getRole(), dataset.getOwner().getDisplayName());
+                return error(Status.BAD_REQUEST, BundleUtil.getStringFromBundle("datasets.api.grant.role.not.found.error", args));
             }
 
-        });
+            String privateUrlToken = null;
+            return ok(
+                    json(execCommand(new AssignRoleCommand(assignee, theRole, dataset, createDataverseRequest(getRequestUser(crc)), privateUrlToken))));
+        } catch (WrappedResponse ex) {
+            var message = ExceptionUtils.getRootCause(ex).getMessage();
+            if (message != null && message.contains("duplicate key")) {
+                // concurrent update
+                return error(Status.CONFLICT, BundleUtil.getStringFromBundle("datasets.api.grant.role.assignee.has.role.error"));
+            }
+            List<String> args = Arrays.asList(ex.getMessage());
+            logger.log(Level.WARNING, BundleUtil.getStringFromBundle("datasets.api.grant.role.cant.create.assignment.error", args));
+            return ex.getResponse();
+        }
 
     }
-    
-    @POST
-    @Path("{identifier}/lock/{type}")
-    public Response lockDataset(@PathParam("identifier") String id, @PathParam("type") DatasetLock.Reason lockType) {
-        return response(req -> {
-            try {
-                AuthenticatedUser user = findAuthenticatedUserOrDie();
-                if (!user.isSuperuser()) {
-                    return error(Response.Status.FORBIDDEN, "This API end point can be used by superusers only.");
-                }   
-                Dataset dataset = findDatasetOrDie(id);
-                DatasetLock lock = dataset.getLockFor(lockType);
-                if (lock != null) {
-                    return error(Response.Status.FORBIDDEN, "dataset already locked with lock type " + lockType);
-                }
-                lock = new DatasetLock(lockType, user);
-                execCommand(new AddLockCommand(req, dataset, lock));
-                // refresh the dataset:
-                dataset = findDatasetOrDie(id);
-                // ... and kick of dataset reindexing:
-                try {
-                    indexService.indexDataset(dataset, true);
-                } catch (IOException | SolrServerException e) {
-                    String failureLogText = "Post add lock indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-                    failureLogText += "\r\n" + e.getLocalizedMessage();
-                    LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, dataset);
-
-                }
 
-                return ok("dataset locked with lock type " + lockType);
-            } catch (WrappedResponse wr) {
-                return wr.getResponse();
+    @DELETE
+    @AuthRequired
+    @Path("{identifier}/assignments/{id}")
+    public Response deleteAssignment(@Context ContainerRequestContext crc, @PathParam("id") long assignmentId, @PathParam("identifier") String dsId) {
+        RoleAssignment ra = em.find(RoleAssignment.class, assignmentId);
+        if (ra != null) {
+            try {
+                findDatasetOrDie(dsId);
+                execCommand(new RevokeRoleCommand(ra, createDataverseRequest(getRequestUser(crc))));
+                List<String> args = Arrays.asList(ra.getRole().getName(), ra.getAssigneeIdentifier(), ra.getDefinitionPoint().accept(DvObject.NamePrinter));
+                return ok(BundleUtil.getStringFromBundle("datasets.api.revoke.role.success", args));
+            } catch (WrappedResponse ex) {
+                return ex.getResponse();
             }
+        } else {
+            List<String> args = Arrays.asList(Long.toString(assignmentId));
+            return error(Status.NOT_FOUND, BundleUtil.getStringFromBundle("datasets.api.revoke.role.not.found.error", args));
+        }
+    }
 
-        });
+    @GET
+    @AuthRequired
+    @Path("{identifier}/assignments")
+    public Response getAssignments(@Context ContainerRequestContext crc, @PathParam("identifier") String id) {
+        return response(req ->
+                ok(execCommand(
+                        new ListRoleAssignments(req, findDatasetOrDie(id)))
+                        .stream().map(ra -> json(ra)).collect(toJsonArray())), getRequestUser(crc));
     }
-    
+
     @GET
-    @Path("{id}/makeDataCount/citations")
-    public Response getMakeDataCountCitations(@PathParam("id") String idSupplied) {
-        
-        try {
-            Dataset dataset = findDatasetOrDie(idSupplied);
-            JsonArrayBuilder datasetsCitations = Json.createArrayBuilder();
-            List<DatasetExternalCitations> externalCitations = datasetExternalCitationsService.getDatasetExternalCitationsByDataset(dataset);
-            for (DatasetExternalCitations citation : externalCitations ){
-                JsonObjectBuilder candidateObj = Json.createObjectBuilder();
-                /**
-                 * In the future we can imagine storing and presenting more
-                 * information about the citation such as the title of the paper
-                 * and the names of the authors. For now, we'll at least give
-                 * the URL of the citation so people can click and find out more
-                 * about the citation.
-                 */
-                candidateObj.add("citationUrl", citation.getCitedByUrl());
-                datasetsCitations.add(candidateObj);
-            }                       
-            return ok(datasetsCitations); 
-            
-        } catch (WrappedResponse wr) {
-            return wr.getResponse();
-        }
+    @AuthRequired
+    @Deprecated(forRemoval = true, since = "2024-10-17")
+    @Path("{id}/privateUrl")
+    public Response getPrivateUrlData(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied) {
+        return getPreviewUrlData(crc, idSupplied);
+    }
 
+    @POST
+    @AuthRequired
+    @Deprecated(forRemoval = true, since = "2024-10-17")
+    @Path("{id}/privateUrl")
+    public Response createPrivateUrl(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied, @DefaultValue("false") @QueryParam("anonymizedAccess") boolean anonymizedAccess) {
+        return createPreviewUrl(crc, idSupplied, anonymizedAccess);
     }
 
-    @GET
-    @Path("{id}/makeDataCount/{metric}")
-    public Response getMakeDataCountMetricCurrentMonth(@PathParam("id") String idSupplied, @PathParam("metric") String metricSupplied, @QueryParam("country") String country) {
-        String nullCurrentMonth = null;
-        return getMakeDataCountMetric(idSupplied, metricSupplied, nullCurrentMonth, country);
+    @DELETE
+    @AuthRequired
+    @Deprecated(forRemoval = true, since = "2024-10-17")
+    @Path("{id}/privateUrl")
+    public Response deletePrivateUrl(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied) {
+        return deletePreviewUrl(crc, idSupplied);
     }
 
     @GET
-    @Path("{id}/makeDataCount/{metric}/{yyyymm}")
-    public Response getMakeDataCountMetric(@PathParam("id") String idSupplied, @PathParam("metric") String metricSupplied, @PathParam("yyyymm") String yyyymm, @QueryParam("country") String country) {
+    @AuthRequired
+    @Path("{id}/previewUrl")
+    public Response getPreviewUrlData(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied) {
+        return response( req -> {
+            PrivateUrl privateUrl = execCommand(new GetPrivateUrlCommand(req, findDatasetOrDie(idSupplied)));
+            return (privateUrl != null) ? ok(json(privateUrl))
+                    : error(Response.Status.NOT_FOUND, "Private URL not found.");
+        }, getRequestUser(crc));
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{id}/previewUrl")
+    public Response createPreviewUrl(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied,@DefaultValue("false") @QueryParam ("anonymizedAccess") boolean anonymizedAccess) {
+        if(anonymizedAccess && settingsSvc.getValueForKey(SettingsServiceBean.Key.AnonymizedFieldTypeNames)==null) {
+            throw new NotAcceptableException("Anonymized Access not enabled");
+        }
+        return response(req ->
+                ok(json(execCommand(
+                new CreatePrivateUrlCommand(req, findDatasetOrDie(idSupplied), anonymizedAccess)))), getRequestUser(crc));
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{id}/previewUrl")
+    public Response deletePreviewUrl(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied) {
+        return response( req -> {
+            Dataset dataset = findDatasetOrDie(idSupplied);
+            PrivateUrl privateUrl = execCommand(new GetPrivateUrlCommand(req, dataset));
+            if (privateUrl != null) {
+                execCommand(new DeletePrivateUrlCommand(req, dataset));
+                return ok("Private URL deleted.");
+            } else {
+                return notFound("No Private URL to delete.");
+            }
+        }, getRequestUser(crc));
+    }
+
+
+    @GET
+    @AuthRequired
+    @Path("{id}/thumbnail/candidates")
+    public Response getDatasetThumbnailCandidates(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied) {
         try {
             Dataset dataset = findDatasetOrDie(idSupplied);
-            NullSafeJsonBuilder jsonObjectBuilder = jsonObjectBuilder();
-            MakeDataCountUtil.MetricType metricType = null;
-            try {
-                metricType = MakeDataCountUtil.MetricType.fromString(metricSupplied);
-            } catch (IllegalArgumentException ex) {
-                return error(Response.Status.BAD_REQUEST, ex.getMessage());
+            boolean canUpdateThumbnail = false;
+            canUpdateThumbnail = permissionSvc.requestOn(createDataverseRequest(getRequestUser(crc)), dataset).canIssue(UpdateDatasetThumbnailCommand.class);
+            if (!canUpdateThumbnail) {
+                return error(Response.Status.FORBIDDEN, "You are not permitted to list dataset thumbnail candidates.");
             }
-            String monthYear = null;
-            if (yyyymm != null) {
-                // We add "-01" because we store "2018-05-01" rather than "2018-05" in the "monthyear" column.
-                // Dates come to us as "2018-05-01" in the SUSHI JSON ("begin-date") and we decided to store them as-is.
-                monthYear = yyyymm + "-01";
+            JsonArrayBuilder data = Json.createArrayBuilder();
+            boolean considerDatasetLogoAsCandidate = true;
+            for (DatasetThumbnail datasetThumbnail : DatasetUtil.getThumbnailCandidates(dataset, considerDatasetLogoAsCandidate, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE)) {
+                JsonObjectBuilder candidate = Json.createObjectBuilder();
+                String base64image = datasetThumbnail.getBase64image();
+                if (base64image != null) {
+                    logger.fine("found a candidate!");
+                    candidate.add("base64image", base64image);
+                }
+                DataFile dataFile = datasetThumbnail.getDataFile();
+                if (dataFile != null) {
+                    candidate.add("dataFileId", dataFile.getId());
+                }
+                data.add(candidate);
             }
-            DatasetMetrics datasetMetrics = datasetMetricsSvc.getDatasetMetricsByDatasetForDisplay(dataset, monthYear, country);
-            if (datasetMetrics == null) {
-                return ok("No metrics available for dataset " + dataset.getId() + " for " + yyyymm + " for country code " + country + ".");
-            } else if (datasetMetrics.getDownloadsTotal() + datasetMetrics.getViewsTotal() == 0) {
-                return ok("No metrics available for dataset " + dataset.getId() + " for " + yyyymm + " for country code " + country + ".");
+            return ok(data);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataset based on id supplied: " + idSupplied + ".");
+        }
+    }
+
+    @GET
+    @Produces({"image/png"})
+    @Path("{id}/thumbnail")
+    public Response getDatasetThumbnail(@PathParam("id") String idSupplied) {
+        try {
+            Dataset dataset = findDatasetOrDie(idSupplied);
+            InputStream is = DatasetUtil.getThumbnailAsInputStream(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+            if(is == null) {
+                return notFound("Thumbnail not available");
             }
-            Long viewsTotalRegular = null;
-            Long viewsUniqueRegular = null;
-            Long downloadsTotalRegular = null;
-            Long downloadsUniqueRegular = null;
-            Long viewsTotalMachine = null;
-            Long viewsUniqueMachine = null;
-            Long downloadsTotalMachine = null;
-            Long downloadsUniqueMachine = null;
-            Long viewsTotal = null;
-            Long viewsUnique = null;
-            Long downloadsTotal = null;
-            Long downloadsUnique = null;
-            switch (metricSupplied) {
-                case "viewsTotal":
-                    viewsTotal = datasetMetrics.getViewsTotal();
-                    break;
-                case "viewsTotalRegular":
-                    viewsTotalRegular = datasetMetrics.getViewsTotalRegular();
-                    break;
-                case "viewsTotalMachine":
-                    viewsTotalMachine = datasetMetrics.getViewsTotalMachine();
-                    break;
-                case "viewsUnique":
-                    viewsUnique = datasetMetrics.getViewsUnique();
-                    break;
-                case "viewsUniqueRegular":
-                    viewsUniqueRegular = datasetMetrics.getViewsUniqueRegular();
-                    break;
-                case "viewsUniqueMachine":
-                    viewsUniqueMachine = datasetMetrics.getViewsUniqueMachine();
-                    break;
-                case "downloadsTotal":
-                    downloadsTotal = datasetMetrics.getDownloadsTotal();
-                    break;
-                case "downloadsTotalRegular":
-                    downloadsTotalRegular = datasetMetrics.getDownloadsTotalRegular();
-                    break;
-                case "downloadsTotalMachine":
-                    downloadsTotalMachine = datasetMetrics.getDownloadsTotalMachine();
-                    break;
-                case "downloadsUnique":
-                    downloadsUnique = datasetMetrics.getDownloadsUnique();
-                    break;
-                case "downloadsUniqueRegular":
-                    downloadsUniqueRegular = datasetMetrics.getDownloadsUniqueRegular();
-                    break;
-                case "downloadsUniqueMachine":
-                    downloadsUniqueMachine = datasetMetrics.getDownloadsUniqueMachine();
-                    break;
-                default:
-                    break;
+            return Response.ok(is).build();
+        } catch (WrappedResponse wr) {
+            return notFound("Thumbnail not available");
+        }
+    }
+
+    @GET
+    @Produces({ "image/png" })
+    @Path("{id}/logo")
+    public Response getDatasetLogo(@PathParam("id") String idSupplied) {
+        try {
+            Dataset dataset = findDatasetOrDie(idSupplied);
+            InputStream is = DatasetUtil.getLogoAsInputStream(dataset);
+            if (is == null) {
+                return notFound("Logo not available");
             }
-            /**
-             * TODO: Think more about the JSON output and the API design.
-             * getDatasetMetricsByDatasetMonthCountry returns a single row right
-             * now, by country. We could return multiple metrics (viewsTotal,
-             * viewsUnique, downloadsTotal, and downloadsUnique) by country.
-             */
-            jsonObjectBuilder.add("viewsTotalRegular", viewsTotalRegular);
-            jsonObjectBuilder.add("viewsUniqueRegular", viewsUniqueRegular);
-            jsonObjectBuilder.add("downloadsTotalRegular", downloadsTotalRegular);
-            jsonObjectBuilder.add("downloadsUniqueRegular", downloadsUniqueRegular);
-            jsonObjectBuilder.add("viewsTotalMachine", viewsTotalMachine);
-            jsonObjectBuilder.add("viewsUniqueMachine", viewsUniqueMachine);
-            jsonObjectBuilder.add("downloadsTotalMachine", downloadsTotalMachine);
-            jsonObjectBuilder.add("downloadsUniqueMachine", downloadsUniqueMachine);
-            jsonObjectBuilder.add("viewsTotal", viewsTotal);
-            jsonObjectBuilder.add("viewsUnique", viewsUnique);
-            jsonObjectBuilder.add("downloadsTotal", downloadsTotal);
-            jsonObjectBuilder.add("downloadsUnique", downloadsUnique);
-            return ok(jsonObjectBuilder);
+            return Response.ok(is).build();
+        } catch (WrappedResponse wr) {
+            return notFound("Logo not available");
+        }
+    }
+
+    // TODO: Rather than only supporting looking up files by their database IDs (dataFileIdSupplied), consider supporting persistent identifiers.
+    @POST
+    @AuthRequired
+    @Path("{id}/thumbnail/{dataFileId}")
+    public Response setDataFileAsThumbnail(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied, @PathParam("dataFileId") long dataFileIdSupplied) {
+        try {
+            DatasetThumbnail datasetThumbnail = execCommand(new UpdateDatasetThumbnailCommand(createDataverseRequest(getRequestUser(crc)), findDatasetOrDie(idSupplied), UpdateDatasetThumbnailCommand.UserIntent.setDatasetFileAsThumbnail, dataFileIdSupplied, null));
+            return ok("Thumbnail set to " + datasetThumbnail.getBase64image());
         } catch (WrappedResponse wr) {
             return wr.getResponse();
         }
     }
 
-}
+    @POST
+    @AuthRequired
+    @Path("{id}/thumbnail")
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Produces("application/json")
+    @Operation(summary = "Uploads a logo for a dataset",
+               description = "Uploads a logo for a dataset")
+    @APIResponse(responseCode = "200",
+               description = "Dataset logo uploaded successfully")
+    @Tag(name = "uploadDatasetLogo",
+         description = "Uploads a logo for a dataset")
+    @RequestBody(content = @Content(mediaType = MediaType.MULTIPART_FORM_DATA))
+    public Response uploadDatasetLogo(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied, @FormDataParam("file") InputStream inputStream) {
+        try {
+            DatasetThumbnail datasetThumbnail = execCommand(new UpdateDatasetThumbnailCommand(createDataverseRequest(getRequestUser(crc)), findDatasetOrDie(idSupplied), UpdateDatasetThumbnailCommand.UserIntent.setNonDatasetFileAsThumbnail, null, inputStream));
+            return ok("Thumbnail is now " + datasetThumbnail.getBase64image());
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{id}/thumbnail")
+    public Response removeDatasetLogo(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied) {
+        try {
+            execCommand(new UpdateDatasetThumbnailCommand(createDataverseRequest(getRequestUser(crc)), findDatasetOrDie(idSupplied), UpdateDatasetThumbnailCommand.UserIntent.removeThumbnail, null, null));
+            return ok("Dataset thumbnail removed.");
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @Deprecated(forRemoval = true, since = "2024-07-07")
+    @GET
+    @AuthRequired
+    @Path("{identifier}/dataCaptureModule/rsync")
+    public Response getRsync(@Context ContainerRequestContext crc, @PathParam("identifier") String id) {
+        //TODO - does it make sense to switch this to dataset identifier for consistency with the rest of the DCM APIs?
+        if (!DataCaptureModuleUtil.rsyncSupportEnabled(settingsSvc.getValueForKey(SettingsServiceBean.Key.UploadMethods))) {
+            return error(Response.Status.METHOD_NOT_ALLOWED, SettingsServiceBean.Key.UploadMethods + " does not contain " + SystemConfig.FileUploadMethods.RSYNC + ".");
+        }
+        Dataset dataset = null;
+        try {
+            dataset = findDatasetOrDie(id);
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            ScriptRequestResponse scriptRequestResponse = execCommand(new RequestRsyncScriptCommand(createDataverseRequest(user), dataset));
+
+            DatasetLock lock = datasetService.addDatasetLock(dataset.getId(), DatasetLock.Reason.DcmUpload, user.getId(), "script downloaded");
+            if (lock == null) {
+                logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId());
+                return error(Response.Status.FORBIDDEN, "Failed to lock the dataset (dataset id="+dataset.getId()+")");
+            }
+            return ok(scriptRequestResponse.getScript(), MediaType.valueOf(MediaType.TEXT_PLAIN), null);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        } catch (EJBException ex) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, "Something went wrong attempting to download rsync script: " + EjbUtil.ejbExceptionToString(ex));
+        }
+    }
+
+    /**
+     * This api endpoint triggers the creation of a "package" file in a dataset
+     * after that package has been moved onto the same filesystem via the Data Capture Module.
+     * The package is really just a way that Dataverse interprets a folder created by DCM, seeing it as just one file.
+     * The "package" can be downloaded over RSAL.
+     *
+     * This endpoint currently supports both posix file storage and AWS s3 storage in Dataverse, and depending on which one is active acts accordingly.
+     *
+     * The initial design of the DCM/Dataverse interaction was not to use packages, but to allow import of all individual files natively into Dataverse.
+     * But due to the possibly immense number of files (millions) the package approach was taken.
+     * This is relevant because the posix ("file") code contains many remnants of that development work.
+     * The s3 code was written later and is set to only support import as packages. It takes a lot from FileRecordWriter.
+     * -MAD 4.9.1
+     */
+    @POST
+    @AuthRequired
+    @Path("{identifier}/dataCaptureModule/checksumValidation")
+    public Response receiveChecksumValidationResults(@Context ContainerRequestContext crc, @PathParam("identifier") String id, JsonObject jsonFromDcm) {
+        logger.log(Level.FINE, "jsonFromDcm: {0}", jsonFromDcm);
+        AuthenticatedUser authenticatedUser = null;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.BAD_REQUEST, "Authentication is required.");
+        }
+        if (!authenticatedUser.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        String statusMessageFromDcm = jsonFromDcm.getString("status");
+        try {
+            Dataset dataset = findDatasetOrDie(id);
+            if ("validation passed".equals(statusMessageFromDcm)) {
+                logger.log(Level.INFO, "Checksum Validation passed for DCM.");
+
+                String storageDriver = dataset.getDataverseContext().getEffectiveStorageDriverId();
+                String uploadFolder = jsonFromDcm.getString("uploadFolder");
+                int totalSize = jsonFromDcm.getInt("totalSize");
+                String storageDriverType = System.getProperty("dataverse.file." + storageDriver + ".type");
+
+                if (storageDriverType.equals("file")) {
+                    logger.log(Level.INFO, "File storage driver used for (dataset id={0})", dataset.getId());
+
+                    ImportMode importMode = ImportMode.MERGE;
+                    try {
+                        JsonObject jsonFromImportJobKickoff = execCommand(new ImportFromFileSystemCommand(createDataverseRequest(getRequestUser(crc)), dataset, uploadFolder, new Long(totalSize), importMode));
+                        long jobId = jsonFromImportJobKickoff.getInt("executionId");
+                        String message = jsonFromImportJobKickoff.getString("message");
+                        JsonObjectBuilder job = Json.createObjectBuilder();
+                        job.add("jobId", jobId);
+                        job.add("message", message);
+                        return ok(job);
+                    } catch (WrappedResponse wr) {
+                        String message = wr.getMessage();
+                        return error(Response.Status.INTERNAL_SERVER_ERROR, "Uploaded files have passed checksum validation but something went wrong while attempting to put the files into Dataverse. Message was '" + message + "'.");
+                    }
+                } else if(storageDriverType.equals(DataAccess.S3)) {
+
+                    logger.log(Level.INFO, "S3 storage driver used for DCM (dataset id={0})", dataset.getId());
+                    try {
+
+                        //Where the lifting is actually done, moving the s3 files over and having dataverse know of the existance of the package
+                        s3PackageImporter.copyFromS3(dataset, uploadFolder);
+                        DataFile packageFile = s3PackageImporter.createPackageDataFile(dataset, uploadFolder, new Long(totalSize));
 
+                        if (packageFile == null) {
+                            logger.log(Level.SEVERE, "S3 File package import failed.");
+                            return error(Response.Status.INTERNAL_SERVER_ERROR, "S3 File package import failed.");
+                        }
+                        DatasetLock dcmLock = dataset.getLockFor(DatasetLock.Reason.DcmUpload);
+                        if (dcmLock == null) {
+                            logger.log(Level.WARNING, "Dataset not locked for DCM upload");
+                        } else {
+                            datasetService.removeDatasetLocks(dataset, DatasetLock.Reason.DcmUpload);
+                            dataset.removeLock(dcmLock);
+                        }
+
+                        // update version using the command engine to enforce user permissions and constraints
+                        if (dataset.getVersions().size() == 1 && dataset.getLatestVersion().getVersionState() == DatasetVersion.VersionState.DRAFT) {
+                            try {
+                                Command<Dataset> cmd;
+                                cmd = new UpdateDatasetVersionCommand(dataset, new DataverseRequest(authenticatedUser, (HttpServletRequest) null));
+                                commandEngine.submit(cmd);
+                            } catch (CommandException ex) {
+                                return error(Response.Status.INTERNAL_SERVER_ERROR, "CommandException updating DatasetVersion from batch job: " + ex.getMessage());
+                            }
+                        } else {
+                            String constraintError = "ConstraintException updating DatasetVersion form batch job: dataset must be a "
+                                    + "single version in draft mode.";
+                            logger.log(Level.SEVERE, constraintError);
+                        }
+
+                        JsonObjectBuilder job = Json.createObjectBuilder();
+                        return ok(job);
+
+                    } catch (IOException e) {
+                        String message = e.getMessage();
+                        return error(Response.Status.INTERNAL_SERVER_ERROR, "Uploaded files have passed checksum validation but something went wrong while attempting to move the files into Dataverse. Message was '" + message + "'.");
+                    }
+                } else {
+                    return error(Response.Status.INTERNAL_SERVER_ERROR, "Invalid storage driver in Dataverse, not compatible with dcm");
+                }
+            } else if ("validation failed".equals(statusMessageFromDcm)) {
+                Map<String, AuthenticatedUser> distinctAuthors = permissionService.getDistinctUsersWithPermissionOn(Permission.EditDataset, dataset);
+                distinctAuthors.values().forEach((value) -> {
+                    userNotificationService.sendNotification((AuthenticatedUser) value, new Timestamp(new Date().getTime()), UserNotification.Type.CHECKSUMFAIL, dataset.getId());
+                });
+                List<AuthenticatedUser> superUsers = authenticationServiceBean.findSuperUsers();
+                if (superUsers != null && !superUsers.isEmpty()) {
+                    superUsers.forEach((au) -> {
+                        userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.CHECKSUMFAIL, dataset.getId());
+                    });
+                }
+                return ok("User notified about checksum validation failure.");
+            } else {
+                return error(Response.Status.BAD_REQUEST, "Unexpected status cannot be processed: " + statusMessageFromDcm);
+            }
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+
+    @POST
+    @AuthRequired
+    @Path("{id}/submitForReview")
+    public Response submitForReview(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied) {
+        try {
+            Dataset updatedDataset = execCommand(new SubmitDatasetForReviewCommand(createDataverseRequest(getRequestUser(crc)), findDatasetOrDie(idSupplied)));
+            JsonObjectBuilder result = Json.createObjectBuilder();
+
+            boolean inReview = updatedDataset.isLockedFor(DatasetLock.Reason.InReview);
+
+            result.add("inReview", inReview);
+            result.add("message", "Dataset id " + updatedDataset.getId() + " has been submitted for review.");
+            return ok(result);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{id}/returnToAuthor")
+    public Response returnToAuthor(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied, String jsonBody) {
+
+        if (jsonBody == null || jsonBody.isEmpty()) {
+            return error(Response.Status.BAD_REQUEST, "You must supply JSON to this API endpoint and it must contain a reason for returning the dataset (field: reasonForReturn).");
+        }
+        JsonObject json = JsonUtil.getJsonObject(jsonBody);
+        try {
+            Dataset dataset = findDatasetOrDie(idSupplied);
+            String reasonForReturn = null;
+            reasonForReturn = json.getString("reasonForReturn");
+            if ((reasonForReturn == null || reasonForReturn.isEmpty())
+                    && !FeatureFlags.DISABLE_RETURN_TO_AUTHOR_REASON.enabled()) {
+                return error(Response.Status.BAD_REQUEST, BundleUtil.getStringFromBundle("dataset.reject.datasetNotInReview"));
+            }
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            Dataset updatedDataset = execCommand(new ReturnDatasetToAuthorCommand(createDataverseRequest(authenticatedUser), dataset, reasonForReturn ));
+
+            JsonObjectBuilder result = Json.createObjectBuilder();
+            result.add("inReview", false);
+            result.add("message", "Dataset id " + updatedDataset.getId() + " has been sent back to the author(s).");
+            return ok(result);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/availableFileCategories")
+    public Response getAvailableFileCategories(@Context ContainerRequestContext crc,
+            @PathParam("id") String idSupplied) {
+
+        try {
+            Dataset ds = findDatasetOrDie(idSupplied);
+            List<String> datasetFileCategories = dataFileCategoryService.mergeDatasetFileCategories(ds.getCategories());
+            JsonArrayBuilder fileCategoriesArrayBuilder = Json.createArrayBuilder();
+            for (String fieldName : datasetFileCategories) {
+                fileCategoriesArrayBuilder.add(fieldName);
+            }
+            return ok(fileCategoriesArrayBuilder);
+
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/curationStatus")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getCurationStatus(@Context ContainerRequestContext crc,
+            @PathParam("id") String idSupplied,
+            @QueryParam("includeHistory") boolean includeHistory) {
+        try {
+            Dataset ds = findDatasetOrDie(idSupplied);
+            DatasetVersion dsv = ds.getLatestVersion();
+            User user = getRequestUser(crc);
+
+            boolean canSeeStatus = false;
+            // Check if curation labels should be shown to all users
+            boolean showCurationLabelsToAll = JvmSettings.UI_SHOW_CURATION_STATUS_TO_ALL.lookupOptional(Boolean.class).orElse(false);
+            // If so, see if this user
+            if (showCurationLabelsToAll) {
+                // See if user can view the draft version
+                canSeeStatus = permissionSvc.requestOn(createDataverseRequest(user), ds).has(Permission.ViewUnpublishedDataset);
+            } else {
+                // Check if the user can publish the dataset
+                canSeeStatus = permissionSvc.requestOn(createDataverseRequest(user), ds).has(Permission.PublishDataset);
+            }
+
+            if (dsv.isDraft() && (canSeeStatus)) {
+                List<CurationStatus> statuses = includeHistory ? dsv.getCurationStatuses() : Collections.singletonList(dsv.getCurrentCurationStatus());
+                if (includeHistory) {
+                    JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
+                    for (CurationStatus status : statuses) {
+                        arrayBuilder.add(curationStatusToJson(status));
+                    }
+                    return ok(arrayBuilder);
+                } else {
+                    return ok(curationStatusToJson(statuses.get(0)));
+                }
+            } else {
+                return error(Response.Status.FORBIDDEN, "You are not permitted to view the curation status of this dataset.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    private JsonObject curationStatusToJson(CurationStatus status) {
+        if (status == null) {
+            return Json.createObjectBuilder().build();
+        }
+        return NullSafeJsonBuilder.jsonObjectBuilder()
+                .add("label", status.getLabel())
+                .add("createTime", status.getCreateTime().toString())
+                .add("assigner", status.getAuthenticatedUser().getIdentifier())
+                .build();
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{id}/curationStatus")
+    public Response setCurationStatus(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied, @QueryParam("label") String label) {
+        Dataset ds = null;
+        User u = null;
+        try {
+            ds = findDatasetOrDie(idSupplied);
+            u = getRequestUser(crc);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        try {
+            execCommand(new SetCurationStatusCommand(createDataverseRequest(u), ds, label));
+            return ok("Curation Status updated");
+        } catch (WrappedResponse wr) {
+            // Just change to Bad Request and send
+            return Response.fromResponse(wr.getResponse()).status(Response.Status.BAD_REQUEST).build();
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{id}/curationStatus")
+    public Response deleteCurationStatus(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied) {
+        Dataset ds = null;
+        User u = null;
+        try {
+            ds = findDatasetOrDie(idSupplied);
+            u = getRequestUser(crc);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        try {
+            execCommand(new SetCurationStatusCommand(createDataverseRequest(u), ds, null));
+            return ok("Curation Status deleted");
+        } catch (WrappedResponse wr) {
+            //Just change to Bad Request and send
+            return Response.fromResponse(wr.getResponse()).status(Response.Status.BAD_REQUEST).build();
+        }
+    }
+    @GET
+    @AuthRequired
+    @Path("{id}/uploadurls")
+    public Response getMPUploadUrls(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied, @QueryParam("size") long fileSize) {
+        try {
+            Dataset dataset = findDatasetOrDie(idSupplied);
+
+            boolean canUpdateDataset = false;
+            User user = getRequestUser(crc);
+            canUpdateDataset = permissionSvc.requestOn(createDataverseRequest(user), dataset)
+                    .canIssue(UpdateDatasetVersionCommand.class);
+            if (!canUpdateDataset) {
+                return error(Response.Status.FORBIDDEN, "You are not permitted to upload files to this dataset.");
+            }
+            S3AccessIO<DataFile> s3io = FileUtil.getS3AccessForDirectUpload(dataset);
+            if (s3io == null) {
+                return error(Response.Status.NOT_FOUND,
+                        "Direct upload not supported for files in this dataset: " + dataset.getId());
+            }
+            if (!user.isSuperuser()) {
+                Integer effectiveDatasetFileCountLimit = dataset.getEffectiveDatasetFileCountLimit();
+                boolean hasFileCountLimit = dataset.isDatasetFileCountLimitSet(effectiveDatasetFileCountLimit);
+                if (hasFileCountLimit) {
+                    int uploadedFileCount = datasetService.getDataFileCountByOwner(dataset.getId());
+                    if (uploadedFileCount >= effectiveDatasetFileCountLimit) {
+                        return error(Response.Status.BAD_REQUEST,
+                                BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", Arrays.asList(String.valueOf(effectiveDatasetFileCountLimit))));
+                    }
+                }
+            }
+            Long maxSize = systemConfig.getMaxFileUploadSizeForStore(dataset.getEffectiveStorageDriverId());
+            if (maxSize != null) {
+                if(fileSize > maxSize) {
+                    return error(Response.Status.BAD_REQUEST,
+                            "The file you are trying to upload is too large to be uploaded to this dataset. " +
+                                    "The maximum allowed file size is " + maxSize + " bytes.");
+                }
+            }
+            UploadSessionQuotaLimit limit = fileService.getUploadSessionQuotaLimit(dataset);
+            if (limit != null) {
+                if(fileSize > limit.getRemainingQuotaInBytes()) {
+                    return error(Response.Status.BAD_REQUEST,
+                            "The file you are trying to upload is too large to be uploaded to this dataset. " +
+                                    "The remaining file size quota is " + limit.getRemainingQuotaInBytes() + " bytes.");
+                }
+            }
+            JsonObjectBuilder response = null;
+            String storageIdentifier = null;
+            try {
+                storageIdentifier = FileUtil.getStorageIdentifierFromLocation(s3io.getStorageLocation());
+                response = s3io.generateTemporaryS3UploadUrls(dataset.getGlobalId().asString(), storageIdentifier, fileSize);
+
+            } catch (IOException io) {
+                logger.warning(io.getMessage());
+                throw new WrappedResponse(io,
+                        error(Response.Status.INTERNAL_SERVER_ERROR, "Could not create process direct upload request"));
+            }
+
+            response.add("storageIdentifier", storageIdentifier);
+            return ok(response);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("mpupload")
+    public Response abortMPUpload(@Context ContainerRequestContext crc, @QueryParam("globalid") String idSupplied, @QueryParam("storageidentifier") String storageidentifier, @QueryParam("uploadid") String uploadId) {
+        try {
+            Dataset dataset = datasetSvc.findByGlobalId(idSupplied);
+            //Allow the API to be used within a session (e.g. for direct upload in the UI)
+            User user = session.getUser();
+            if (!user.isAuthenticated()) {
+                try {
+                    user = getRequestAuthenticatedUserOrDie(crc);
+                } catch (WrappedResponse ex) {
+                    logger.info(
+                            "Exception thrown while trying to figure out permissions while getting aborting upload for dataset id "
+                                    + dataset.getId() + ": " + ex.getLocalizedMessage());
+                    throw ex;
+                }
+            }
+            boolean allowed = false;
+            if (dataset != null) {
+                allowed = permissionSvc.requestOn(createDataverseRequest(user), dataset)
+                        .canIssue(UpdateDatasetVersionCommand.class);
+            } else {
+                /*
+                 * The only legitimate case where a global id won't correspond to a dataset is
+                 * for uploads during creation. Given that this call will still fail unless all
+                 * three parameters correspond to an active multipart upload, it should be safe
+                 * to allow the attempt for an authenticated user. If there are concerns about
+                 * permissions, one could check with the current design that the user is allowed
+                 * to create datasets in some dataverse that is configured to use the storage
+                 * provider specified in the storageidentifier, but testing for the ability to
+                 * create a dataset in a specific dataverse would requiring changing the design
+                 * somehow (e.g. adding the ownerId to this call).
+                 */
+                allowed = true;
+            }
+            if (!allowed) {
+                return error(Response.Status.FORBIDDEN,
+                        "You are not permitted to abort file uploads with the supplied parameters.");
+            }
+            try {
+                S3AccessIO.abortMultipartUpload(idSupplied, storageidentifier, uploadId);
+            } catch (IOException io) {
+                logger.warning("Multipart upload abort failed for uploadId: " + uploadId + " storageidentifier="
+                        + storageidentifier + " dataset Id: " + dataset.getId());
+                logger.warning(io.getMessage());
+                throw new WrappedResponse(io,
+                        error(Response.Status.INTERNAL_SERVER_ERROR, "Could not abort multipart upload"));
+            }
+            return Response.noContent().build();
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("mpupload")
+    public Response completeMPUpload(@Context ContainerRequestContext crc, String partETagBody, @QueryParam("globalid") String idSupplied, @QueryParam("storageidentifier") String storageidentifier, @QueryParam("uploadid") String uploadId) {
+        try {
+            Dataset dataset = datasetSvc.findByGlobalId(idSupplied);
+            //Allow the API to be used within a session (e.g. for direct upload in the UI)
+            User user = session.getUser();
+            if (!user.isAuthenticated()) {
+                try {
+                    user = getRequestAuthenticatedUserOrDie(crc);
+                } catch (WrappedResponse ex) {
+                    logger.info(
+                            "Exception thrown while trying to figure out permissions to complete mpupload for dataset id "
+                                    + dataset.getId() + ": " + ex.getLocalizedMessage());
+                    throw ex;
+                }
+            }
+            boolean allowed = false;
+            if (dataset != null) {
+                allowed = permissionSvc.requestOn(createDataverseRequest(user), dataset)
+                        .canIssue(UpdateDatasetVersionCommand.class);
+            } else {
+                /*
+                 * The only legitimate case where a global id won't correspond to a dataset is
+                 * for uploads during creation. Given that this call will still fail unless all
+                 * three parameters correspond to an active multipart upload, it should be safe
+                 * to allow the attempt for an authenticated user. If there are concerns about
+                 * permissions, one could check with the current design that the user is allowed
+                 * to create datasets in some dataverse that is configured to use the storage
+                 * provider specified in the storageidentifier, but testing for the ability to
+                 * create a dataset in a specific dataverse would requiring changing the design
+                 * somehow (e.g. adding the ownerId to this call).
+                 */
+                allowed = true;
+            }
+            if (!allowed) {
+                return error(Response.Status.FORBIDDEN,
+                        "You are not permitted to complete file uploads with the supplied parameters.");
+            }
+            List<CompletedPart> completedParts = new ArrayList<>();
+            logger.fine("Etags: " + partETagBody);
+            try {
+                JsonObject object = JsonUtil.getJsonObject(partETagBody);
+                for (String partNo : object.keySet()) {
+                    completedParts.add(
+                        CompletedPart.builder()
+                            .partNumber(Integer.parseInt(partNo))
+                            .eTag(object.getString(partNo))
+                            .build()
+                    );
+                }
+                for (CompletedPart part : completedParts) {
+                    logger.fine("Part: " + part.partNumber() + " : " + part.eTag());
+                }
+            } catch (JsonException je) {
+                logger.info("Unable to parse eTags from: " + partETagBody);
+                throw new WrappedResponse(je, error(Response.Status.INTERNAL_SERVER_ERROR, "Could not complete multipart upload"));
+            }
+            try {
+                S3AccessIO.completeMultipartUpload(idSupplied, storageidentifier, uploadId, completedParts);
+            } catch (IOException io) {
+                logger.warning("Multipart upload completion failed for uploadId: " + uploadId + " storageidentifier=" + storageidentifier + " globalId: " + idSupplied);
+                logger.warning(io.getMessage());
+                try {
+                    S3AccessIO.abortMultipartUpload(idSupplied, storageidentifier, uploadId);
+                } catch (IOException e) {
+                    logger.severe("Also unable to abort the upload (and release the space on S3 for uploadId: " + uploadId + " storageidentifier=" + storageidentifier + " globalId: " + idSupplied);
+                    logger.severe(io.getMessage());
+                }
+
+                throw new WrappedResponse(io, error(Response.Status.INTERNAL_SERVER_ERROR, "Could not complete multipart upload"));
+            }
+            return ok("Multipart Upload completed");
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    /**
+     * Add a File to an existing Dataset
+     *
+     * @param idSupplied
+     * @param jsonData
+     * @param fileInputStream
+     * @param contentDispositionHeader
+     * @param formDataBodyPart
+     * @return
+     */
+    @POST
+    @AuthRequired
+    @Path("{id}/add")
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Produces("application/json")
+    @Operation(summary = "Uploads a file for a dataset",
+               description = "Uploads a file for a dataset")
+    @APIResponse(responseCode = "200",
+               description = "File uploaded successfully to dataset")
+    @Tag(name = "addFileToDataset",
+         description = "Uploads a file for a dataset")
+    @RequestBody(content = @Content(mediaType = MediaType.MULTIPART_FORM_DATA))
+    public Response addFileToDataset(@Context ContainerRequestContext crc,
+                    @PathParam("id") String idSupplied,
+                    @FormDataParam("jsonData") String jsonData,
+                    @FormDataParam("file") InputStream fileInputStream,
+                    @FormDataParam("file") FormDataContentDisposition contentDispositionHeader,
+                    @FormDataParam("file") final FormDataBodyPart formDataBodyPart
+                    ){
+
+        if (!systemConfig.isHTTPUpload()) {
+            return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.httpDisabled"));
+        }
+
+        // -------------------------------------
+        // (1) Get the user from the ContainerRequestContext
+        // -------------------------------------
+        User authUser;
+        authUser = getRequestUser(crc);
+
+        // -------------------------------------
+        // (2) Get the Dataset Id
+        //
+        // -------------------------------------
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(idSupplied);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        //------------------------------------
+        // (2a) Make sure dataset does not have package file
+        //
+        // --------------------------------------
+
+        for (DatasetVersion dv : dataset.getVersions()) {
+            if (dv.isHasPackageFile()) {
+                return error(Response.Status.FORBIDDEN,
+                        BundleUtil.getStringFromBundle("file.api.alreadyHasPackageFile")
+                );
+            }
+        }
+
+        // (2a) Load up optional params via JSON
+        //---------------------------------------
+        OptionalFileParams optionalFileParams = null;
+        msgt("(api) jsonData: " + jsonData);
+
+        try {
+            optionalFileParams = new OptionalFileParams(jsonData);
+        } catch (DataFileTagException ex) {
+            return error(Response.Status.BAD_REQUEST, ex.getMessage());
+        }
+        catch (ClassCastException | com.google.gson.JsonParseException ex) {
+            return error(Response.Status.BAD_REQUEST, BundleUtil.getStringFromBundle("file.addreplace.error.parsing"));
+        }
+
+        // -------------------------------------
+        // (3) Get the file name and content type
+        // -------------------------------------
+        String newFilename = null;
+        String newFileContentType = null;
+        String newStorageIdentifier = null;
+        if (null == contentDispositionHeader) {
+            if (optionalFileParams.hasStorageIdentifier()) {
+                newStorageIdentifier = optionalFileParams.getStorageIdentifier();
+                newStorageIdentifier = DataAccess.expandStorageIdentifierIfNeeded(newStorageIdentifier);
+
+                if(!DataAccess.uploadToDatasetAllowed(dataset,  newStorageIdentifier)) {
+                    return error(BAD_REQUEST,
+                            "Dataset store configuration does not allow provided storageIdentifier.");
+                }
+                if (optionalFileParams.hasFileName()) {
+                    newFilename = optionalFileParams.getFileName();
+                    if (optionalFileParams.hasMimetype()) {
+                        newFileContentType = optionalFileParams.getMimeType();
+                    }
+                }
+            } else {
+                return error(BAD_REQUEST,
+                        "You must upload a file or provide a valid storageidentifier, filename, and mimetype.");
+            }
+        } else {
+            newFilename = contentDispositionHeader.getFileName();
+            // Let's see if the form data part has the mime (content) type specified.
+            // Note that we don't want to rely on formDataBodyPart.getMediaType() -
+            // because that defaults to "text/plain" when no "Content-Type:" header is
+            // present. Instead we'll go through the headers, and see if "Content-Type:"
+            // is there. If not, we'll default to "application/octet-stream" - the generic
+            // unknown type. This will prompt the application to run type detection and
+            // potentially find something more accurate.
+            // newFileContentType = formDataBodyPart.getMediaType().toString();
+
+            for (String header : formDataBodyPart.getHeaders().keySet()) {
+                if (header.equalsIgnoreCase("Content-Type")) {
+                    newFileContentType = formDataBodyPart.getHeaders().get(header).get(0);
+                }
+            }
+            if (newFileContentType == null) {
+                newFileContentType = FileUtil.MIME_TYPE_UNDETERMINED_DEFAULT;
+            }
+        }
+
+
+        //-------------------
+        // (3) Create the AddReplaceFileHelper object
+        //-------------------
+        msg("ADD!");
+
+        DataverseRequest dvRequest2 = createDataverseRequest(authUser);
+        AddReplaceFileHelper addFileHelper = new AddReplaceFileHelper(dvRequest2,
+                ingestService,
+                datasetService,
+                fileService,
+                permissionSvc,
+                commandEngine,
+                systemConfig);
+
+
+        //-------------------
+        // (4) Run "runAddFileByDatasetId"
+        //-------------------
+        addFileHelper.runAddFileByDataset(dataset,
+                newFilename,
+                newFileContentType,
+                newStorageIdentifier,
+                fileInputStream,
+                optionalFileParams);
+
+
+        if (addFileHelper.hasError()){
+            //conflict response status added for 8859
+            if (Response.Status.CONFLICT.equals(addFileHelper.getHttpErrorCode())){
+                return conflict(addFileHelper.getErrorMessagesAsString("\n"));
+            }
+            return error(addFileHelper.getHttpErrorCode(), addFileHelper.getErrorMessagesAsString("\n"));
+        } else {
+            String successMsg = BundleUtil.getStringFromBundle("file.addreplace.success.add");
+            try {
+                //msgt("as String: " + addFileHelper.getSuccessResult());
+                /**
+                 * @todo We need a consistent, sane way to communicate a human
+                 * readable message to an API client suitable for human
+                 * consumption. Imagine if the UI were built in Angular or React
+                 * and we want to return a message from the API as-is to the
+                 * user. Human readable.
+                 */
+                logger.fine("successMsg: " + successMsg);
+                String duplicateWarning = addFileHelper.getDuplicateFileWarning();
+                if (duplicateWarning != null && !duplicateWarning.isEmpty()) {
+                    return ok(addFileHelper.getDuplicateFileWarning(), addFileHelper.getSuccessResultAsJsonObjectBuilder());
+                } else {
+                    return ok(addFileHelper.getSuccessResultAsJsonObjectBuilder());
+                }
+
+                //"Look at that!  You added a file! (hey hey, it may have worked)");
+            } catch (NoFilesException ex) {
+                Logger.getLogger(Files.class.getName()).log(Level.SEVERE, null, ex);
+                return error(Response.Status.BAD_REQUEST, "NoFileException!  Serious Error! See administrator!");
+
+            }
+        }
+
+    } // end: addFileToDataset
+
+
+    /**
+     * Clean storage of a Dataset
+     *
+     * @param idSupplied
+     * @return
+     */
+    @GET
+    @AuthRequired
+    @Path("{id}/cleanStorage")
+    public Response cleanStorage(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied, @QueryParam("dryrun") Boolean dryrun) {
+        // get user and dataset
+        User authUser = getRequestUser(crc);
+
+        Dataset dataset;
+        try {
+            dataset = findDatasetOrDie(idSupplied);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        // check permissions
+        if (!permissionSvc.permissionsFor(createDataverseRequest(authUser), dataset).contains(Permission.EditDataset)) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, "Access denied!");
+        }
+
+        boolean doDryRun = dryrun != null && dryrun.booleanValue();
+
+        // check if no legacy files are present
+        Set<String> datasetFilenames = getDatasetFilenames(dataset);
+        if (datasetFilenames.stream().anyMatch(x -> !dataFilePattern.matcher(x).matches())) {
+            logger.log(Level.WARNING, "Dataset contains legacy files not matching the naming pattern!");
+        }
+
+        Predicate<String> filter = getToDeleteFilesFilter(datasetFilenames);
+        List<String> deleted;
+        try {
+            StorageIO<DvObject> datasetIO = DataAccess.getStorageIO(dataset);
+            deleted = datasetIO.cleanUp(filter, doDryRun);
+        } catch (IOException ex) {
+            logger.log(Level.SEVERE, null, ex);
+            return error(Response.Status.INTERNAL_SERVER_ERROR, "IOException! Serious Error! See administrator!");
+        }
+
+        return ok("Found: " + datasetFilenames.stream().collect(Collectors.joining(", ")) + "\n" + "Deleted: " + deleted.stream().collect(Collectors.joining(", ")));
+
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/versions/{versionId1}/compare/{versionId2}")
+    public Response getCompareVersions(@Context ContainerRequestContext crc, @PathParam("id") String id,
+                                      @PathParam("versionId1") String versionId1,
+                                      @PathParam("versionId2") String versionId2,
+                                      @QueryParam("includeDeaccessioned") boolean includeDeaccessioned,
+                                      @Context UriInfo uriInfo, @Context HttpHeaders headers) {
+        try {
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            DatasetVersion dsv1 = getDatasetVersionOrDie(req, versionId1, findDatasetOrDie(id), uriInfo, headers, includeDeaccessioned);
+            DatasetVersion dsv2 = getDatasetVersionOrDie(req, versionId2, findDatasetOrDie(id), uriInfo, headers, includeDeaccessioned);
+            if (dsv1.getCreateTime().getTime() > dsv2.getCreateTime().getTime()) {
+                return error(BAD_REQUEST, BundleUtil.getStringFromBundle("dataset.version.compare.incorrect.order"));
+            }
+            return ok(DatasetVersion.compareVersions(dsv1, dsv2));
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/versions/compareSummary")
+    public Response getCompareVersionsSummary(@Context ContainerRequestContext crc, @PathParam("id") String id,
+                                      @Context UriInfo uriInfo, @Context HttpHeaders headers) {
+        try {
+            Dataset dataset = findDatasetOrDie(id);
+            User user = getRequestUser(crc);
+            JsonArrayBuilder differenceSummaries = Json.createArrayBuilder();
+
+            for (DatasetVersion dv : dataset.getVersions()) {
+                //only get summaries of draft is user may view unpublished
+
+                if (dv.isPublished() ||dv.isDeaccessioned() || permissionService.hasPermissionsFor(user, dv.getDataset(),
+                        EnumSet.of(Permission.ViewUnpublishedDataset))) {
+
+                    JsonObjectBuilder versionBuilder = new NullSafeJsonBuilder();
+                    versionBuilder.add("id", dv.getId());
+                    versionBuilder.add("versionNumber", dv.getFriendlyVersionNumber());
+                    DatasetVersionDifference dvdiff = dv.getDefaultVersionDifference();
+                    if (dvdiff == null) {
+                        if (dv.isReleased()) {
+                            if (dv.getPriorVersionState() == null) {
+                                versionBuilder.add("summary", "firstPublished");
+                            }
+                            if (dv.getPriorVersionState() != null && dv.getPriorVersionState().equals(VersionState.DEACCESSIONED)) {
+                                versionBuilder.add("summary", "previousVersionDeaccessioned");
+                            }
+                        }
+                        if (dv.isDraft()) {
+                            if (dv.getPriorVersionState() == null) {
+                                versionBuilder.add("summary", "firstDraft");
+                            }
+                            if (dv.getPriorVersionState() != null && dv.getPriorVersionState().equals(VersionState.DEACCESSIONED)) {
+                                versionBuilder.add("summary", "previousVersionDeaccessioned");
+                            }
+                        }
+                        if (dv.isDeaccessioned()) {
+                            versionBuilder.add("summary", getDeaccessionJson(dv));
+                        }
+
+                    } else {
+                        versionBuilder.add("summary", dvdiff.getSummaryDifferenceAsJson());
+                    }
+                    versionBuilder.add("versionNote", dv.getVersionNote());
+                    versionBuilder.add("contributors", datasetversionService.getContributorsNames(dv));
+                    versionBuilder.add("publishedOn", !dv.isDraft() ? dv.getPublicationDateAsString() : "");
+                    differenceSummaries.add(versionBuilder);
+                }
+            }
+            return ok(differenceSummaries);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    private JsonObject getDeaccessionJson(DatasetVersion dv) {
+
+        JsonObjectBuilder compositionBuilder = Json.createObjectBuilder();
+
+        if (dv.getDeaccessionNote() != null && !dv.getDeaccessionNote().isEmpty()) {
+            compositionBuilder.add("reason", dv.getDeaccessionNote());
+        }
+
+        if (dv.getDeaccessionLink() != null && !dv.getDeaccessionLink().isEmpty()) {
+            compositionBuilder.add("url", dv.getDeaccessionLink());
+        }
+
+        JsonObject json = Json.createObjectBuilder()
+                .add("deaccessioned", compositionBuilder)
+                .build();
+
+        return json;
+    }
+
+    private static Set<String> getDatasetFilenames(Dataset dataset) {
+        Set<String> files = new HashSet<>();
+        for (DataFile dataFile: dataset.getFiles()) {
+            String storageIdentifier = dataFile.getStorageIdentifier();
+            String location = storageIdentifier.substring(storageIdentifier.indexOf("://") + 3);
+            String[] locationParts = location.split(":");//separate bucket, swift container, etc. from fileName
+            files.add(locationParts[locationParts.length-1]);
+        }
+        return files;
+    }
+
+    public static Predicate<String> getToDeleteFilesFilter(Set<String> datasetFilenames) {
+        return f -> {
+            return dataFilePattern.matcher(f).matches() && datasetFilenames.stream().noneMatch(x -> f.startsWith(x));
+        };
+    }
+
+    private void msg(String m) {
+        //System.out.println(m);
+        logger.fine(m);
+    }
+
+    private void dashes() {
+        msg("----------------");
+    }
+
+    private void msgt(String m) {
+        dashes();
+        msg(m);
+        dashes();
+    }
+
+
+    public static <T> T handleVersion(String versionId, DsVersionHandler<T> hdl)
+            throws WrappedResponse {
+        switch (versionId) {
+            case DS_VERSION_LATEST:
+                return hdl.handleLatest();
+            case DS_VERSION_DRAFT:
+                return hdl.handleDraft();
+            case DS_VERSION_LATEST_PUBLISHED:
+                return hdl.handleLatestPublished();
+            default:
+                try {
+                    String[] versions = versionId.split("\\.");
+                    switch (versions.length) {
+                        case 1:
+                            return hdl.handleSpecific(Long.parseLong(versions[0]), (long) 0.0);
+                        case 2:
+                            return hdl.handleSpecific(Long.parseLong(versions[0]), Long.parseLong(versions[1]));
+                        default:
+                            throw new WrappedResponse(error(Response.Status.BAD_REQUEST, "Illegal version identifier '" + versionId + "'"));
+                    }
+                } catch (NumberFormatException nfe) {
+                    throw new WrappedResponse(error(Response.Status.BAD_REQUEST, "Illegal version identifier '" + versionId + "'"));
+                }
+        }
+    }
+
+    /*
+     * includeDeaccessioned default to false and checkPermsWhenDeaccessioned to false. Use it only when you are sure that the you don't need to work with
+     * a deaccessioned dataset.
+     */
+    private DatasetVersion getDatasetVersionOrDie(final DataverseRequest req,
+                                                  String versionNumber,
+                                                  final Dataset ds,
+                                                  UriInfo uriInfo,
+                                                  HttpHeaders headers) throws WrappedResponse {
+        boolean checkPermsWhenDeaccessioned = false;
+        boolean includeDeaccessioned = false;
+        return getDatasetVersionOrDie(req, versionNumber, ds, uriInfo, headers, includeDeaccessioned, checkPermsWhenDeaccessioned);
+    }
+
+    /*
+     * checkPermsWhenDeaccessioned default to true. Be aware that the version will be only be obtainable if the user has edit permissions.
+     */
+    private DatasetVersion getDatasetVersionOrDie(final DataverseRequest req, String versionNumber, final Dataset ds,
+            UriInfo uriInfo, HttpHeaders headers, boolean includeDeaccessioned) throws WrappedResponse {
+        boolean checkPermsWhenDeaccessioned = true;
+        return getDatasetVersionOrDie(req, versionNumber, ds, uriInfo, headers, includeDeaccessioned, checkPermsWhenDeaccessioned);
+    }
+
+
+    /*
+     * Will allow to define when the permissions should be checked when a deaccesioned dataset is requested. If the user doesn't have edit permissions will result in an error.
+     */
+    private DatasetVersion getDatasetVersionOrDie(final DataverseRequest req, String versionNumber, final Dataset ds,
+            UriInfo uriInfo, HttpHeaders headers, boolean includeDeaccessioned, boolean checkPermsWhenDeaccessioned)
+            throws WrappedResponse {
+
+        DatasetVersion dsv = findDatasetVersionOrDie(req, versionNumber, ds, includeDeaccessioned, checkPermsWhenDeaccessioned);
+
+        if (dsv == null || dsv.getId() == null) {
+            throw new WrappedResponse(
+                    notFound("Dataset version " + versionNumber + " of dataset " + ds.getId() + " not found"));
+        }
+        if (dsv.isReleased()&& uriInfo!=null) {
+            MakeDataCountLoggingServiceBean.MakeDataCountEntry entry = new MakeDataCountEntry(uriInfo, headers, dvRequestService, ds);
+            mdcLogService.logEntry(entry);
+        }
+        return dsv;
+    }
+
+    @GET
+    @Path("{identifier}/locks")
+    public Response getLocksForDataset(@PathParam("identifier") String id, @QueryParam("type") DatasetLock.Reason lockType) {
+
+        Dataset dataset = null;
+        try {
+            dataset = findDatasetOrDie(id);
+            Set<DatasetLock> locks;
+            if (lockType == null) {
+                locks = dataset.getLocks();
+            } else {
+                // request for a specific type lock:
+                DatasetLock lock = dataset.getLockFor(lockType);
+
+                locks = new HashSet<>();
+                if (lock != null) {
+                    locks.add(lock);
+                }
+            }
+
+            return ok(locks.stream().map(lock -> json(lock)).collect(toJsonArray()));
+
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{identifier}/locks")
+    public Response deleteLocks(@Context ContainerRequestContext crc, @PathParam("identifier") String id, @QueryParam("type") DatasetLock.Reason lockType) {
+
+        return response(req -> {
+            try {
+                AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+                if (!user.isSuperuser()) {
+                    return error(Response.Status.FORBIDDEN, "This API end point can be used by superusers only.");
+                }
+                Dataset dataset = findDatasetOrDie(id);
+
+                if (lockType == null) {
+                    Set<DatasetLock.Reason> locks = new HashSet<>();
+                    for (DatasetLock lock : dataset.getLocks()) {
+                        locks.add(lock.getReason());
+                    }
+                    if (!locks.isEmpty()) {
+                        for (DatasetLock.Reason locktype : locks) {
+                            execCommand(new RemoveLockCommand(req, dataset, locktype));
+                            // refresh the dataset:
+                            dataset = findDatasetOrDie(id);
+                        }
+                        // kick of dataset reindexing, in case the locks removed
+                        // affected the search card:
+                        indexService.asyncIndexDataset(dataset, true);
+                        return ok("locks removed");
+                    }
+                    return ok("dataset not locked");
+                }
+                // request for a specific type lock:
+                DatasetLock lock = dataset.getLockFor(lockType);
+                if (lock != null) {
+                    execCommand(new RemoveLockCommand(req, dataset, lock.getReason()));
+                    // refresh the dataset:
+                    dataset = findDatasetOrDie(id);
+                    // ... and kick of dataset reindexing, in case the lock removed
+                    // affected the search card:
+                    indexService.asyncIndexDataset(dataset, true);
+                    return ok("lock type " + lock.getReason() + " removed");
+                }
+                return ok("no lock type " + lockType + " on the dataset");
+            } catch (WrappedResponse wr) {
+                return wr.getResponse();
+            }
+
+        }, getRequestUser(crc));
+
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{identifier}/lock/{type}")
+    public Response lockDataset(@Context ContainerRequestContext crc, @PathParam("identifier") String id, @PathParam("type") DatasetLock.Reason lockType) {
+        return response(req -> {
+            try {
+                AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+                if (!user.isSuperuser()) {
+                    return error(Response.Status.FORBIDDEN, "This API end point can be used by superusers only.");
+                }
+                Dataset dataset = findDatasetOrDie(id);
+                DatasetLock lock = dataset.getLockFor(lockType);
+                if (lock != null) {
+                    return error(Response.Status.FORBIDDEN, "dataset already locked with lock type " + lockType);
+                }
+                lock = new DatasetLock(lockType, user);
+                execCommand(new AddLockCommand(req, dataset, lock));
+                // refresh the dataset:
+                dataset = findDatasetOrDie(id);
+                // ... and kick of dataset reindexing:
+                indexService.asyncIndexDataset(dataset, true);
+
+                return ok("dataset locked with lock type " + lockType);
+            } catch (WrappedResponse wr) {
+                return wr.getResponse();
+            }
+
+        }, getRequestUser(crc));
+    }
+
+    @GET
+    @AuthRequired
+    @Path("locks")
+    public Response listLocks(@Context ContainerRequestContext crc, @QueryParam("type") String lockType, @QueryParam("userIdentifier") String userIdentifier) { //DatasetLock.Reason lockType) {
+        // This API is here, under /datasets, and not under /admin, because we
+        // likely want it to be accessible to admin users who may not necessarily
+        // have localhost access, that would be required to get to /api/admin in
+        // most installations. It is still reasonable however to limit access to
+        // this api to admin users only.
+        AuthenticatedUser apiUser;
+        try {
+            apiUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.UNAUTHORIZED, "Authentication is required.");
+        }
+        if (!apiUser.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        // Locks can be optinally filtered by type, user or both.
+        DatasetLock.Reason lockTypeValue = null;
+        AuthenticatedUser user = null;
+
+        // For the lock type, we use a QueryParam of type String, instead of
+        // DatasetLock.Reason; that would be less code to write, but this way
+        // we can check if the value passed matches a valid lock type ("reason")
+        // and provide a helpful error message if it doesn't. If you use a
+        // QueryParam of an Enum type, trying to pass an invalid value to it
+        // results in a potentially confusing "404/NOT FOUND - requested
+        // resource is not available".
+        if (lockType != null && !lockType.isEmpty()) {
+            try {
+                lockTypeValue = DatasetLock.Reason.valueOf(lockType);
+            } catch (IllegalArgumentException iax) {
+                StringJoiner reasonJoiner = new StringJoiner(", ");
+                for (Reason r: Reason.values()) {
+                    reasonJoiner.add(r.name());
+                };
+                String errorMessage = "Invalid lock type value: " + lockType +
+                        "; valid lock types: " + reasonJoiner.toString();
+                return error(Response.Status.BAD_REQUEST, errorMessage);
+            }
+        }
+
+        if (userIdentifier != null && !userIdentifier.isEmpty()) {
+            user = authSvc.getAuthenticatedUser(userIdentifier);
+            if (user == null) {
+                return error(Response.Status.BAD_REQUEST, "Unknown user identifier: "+userIdentifier);
+            }
+        }
+
+        //List<DatasetLock> locks = datasetService.getDatasetLocksByType(lockType);
+        List<DatasetLock> locks = datasetService.listLocks(lockTypeValue, user);
+
+        return ok(locks.stream().map(lock -> json(lock)).collect(toJsonArray()));
+    }
+
+
+    @GET
+    @Path("{id}/makeDataCount/citations")
+    public Response getMakeDataCountCitations(@PathParam("id") String idSupplied) {
+
+        try {
+            Dataset dataset = findDatasetOrDie(idSupplied);
+            JsonArrayBuilder datasetsCitations = Json.createArrayBuilder();
+            List<DatasetExternalCitations> externalCitations = datasetExternalCitationsService.getDatasetExternalCitationsByDataset(dataset);
+            for (DatasetExternalCitations citation : externalCitations) {
+                JsonObjectBuilder candidateObj = Json.createObjectBuilder();
+                /**
+                 * In the future we can imagine storing and presenting more
+                 * information about the citation such as the title of the paper
+                 * and the names of the authors. For now, we'll at least give
+                 * the URL of the citation so people can click and find out more
+                 * about the citation.
+                 */
+                candidateObj.add("citationUrl", citation.getCitedByUrl());
+                datasetsCitations.add(candidateObj);
+            }
+            return ok(datasetsCitations);
+
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+    }
+
+    @GET
+    @Path("{id}/makeDataCount/{metric}")
+    public Response getMakeDataCountMetricCurrentMonth(@PathParam("id") String idSupplied, @PathParam("metric") String metricSupplied, @QueryParam("country") String country) {
+        String nullCurrentMonth = null;
+        return getMakeDataCountMetric(idSupplied, metricSupplied, nullCurrentMonth, country);
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/storagesize")
+    public Response getStorageSize(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf, @QueryParam("includeCached") boolean includeCached) {
+        return response(req -> ok(MessageFormat.format(BundleUtil.getStringFromBundle("datasets.api.datasize.storage"),
+                execCommand(new GetDatasetStorageSizeCommand(req, findDatasetOrDie(dvIdtf), includeCached, GetDatasetStorageSizeCommand.Mode.STORAGE, null)))), getRequestUser(crc));
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/versions/{versionId}/downloadsize")
+    public Response getDownloadSize(@Context ContainerRequestContext crc,
+                                    @PathParam("identifier") String dvIdtf,
+                                    @PathParam("versionId") String version,
+                                    @QueryParam("contentType") String contentType,
+                                    @QueryParam("accessStatus") String accessStatus,
+                                    @QueryParam("categoryName") String categoryName,
+                                    @QueryParam("tabularTagName") String tabularTagName,
+                                    @QueryParam("searchText") String searchText,
+                                    @QueryParam("mode") String mode,
+                                    @QueryParam("includeDeaccessioned") boolean includeDeaccessioned,
+                                    @Context UriInfo uriInfo,
+                                    @Context HttpHeaders headers) {
+
+        return response(req -> {
+            FileSearchCriteria fileSearchCriteria;
+            try {
+                fileSearchCriteria = new FileSearchCriteria(
+                        contentType,
+                        accessStatus != null ? FileSearchCriteria.FileAccessStatus.valueOf(accessStatus) : null,
+                        categoryName,
+                        tabularTagName,
+                        searchText
+                );
+            } catch (IllegalArgumentException e) {
+                return badRequest(BundleUtil.getStringFromBundle("datasets.api.version.files.invalid.access.status", List.of(accessStatus)));
+            }
+            DatasetVersionFilesServiceBean.FileDownloadSizeMode fileDownloadSizeMode;
+            try {
+                fileDownloadSizeMode = mode != null ? DatasetVersionFilesServiceBean.FileDownloadSizeMode.valueOf(mode) : DatasetVersionFilesServiceBean.FileDownloadSizeMode.All;
+            } catch (IllegalArgumentException e) {
+                return error(Response.Status.BAD_REQUEST, "Invalid mode: " + mode);
+            }
+            DatasetVersion datasetVersion = getDatasetVersionOrDie(req, version, findDatasetOrDie(dvIdtf), uriInfo, headers, includeDeaccessioned, false);
+            long datasetStorageSize = datasetVersionFilesServiceBean.getFilesDownloadSize(datasetVersion, fileSearchCriteria, fileDownloadSizeMode);
+            String message = MessageFormat.format(BundleUtil.getStringFromBundle("datasets.api.datasize.download"), datasetStorageSize);
+            JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+            jsonObjectBuilder.add("message", message);
+            jsonObjectBuilder.add("storageSize", datasetStorageSize);
+            return ok(jsonObjectBuilder);
+        }, getRequestUser(crc));
+    }
+
+    @GET
+    @Path("{id}/makeDataCount/{metric}/{yyyymm}")
+    public Response getMakeDataCountMetric(@PathParam("id") String idSupplied, @PathParam("metric") String metricSupplied, @PathParam("yyyymm") String yyyymm, @QueryParam("country") String country) {
+        try {
+            Dataset dataset = findDatasetOrDie(idSupplied);
+            NullSafeJsonBuilder jsonObjectBuilder = jsonObjectBuilder();
+            MakeDataCountUtil.MetricType metricType = null;
+            try {
+                metricType = MakeDataCountUtil.MetricType.fromString(metricSupplied);
+            } catch (IllegalArgumentException ex) {
+                return error(Response.Status.BAD_REQUEST, ex.getMessage());
+            }
+            String monthYear = null;
+            if (yyyymm != null) {
+                // We add "-01" because we store "2018-05-01" rather than "2018-05" in the "monthyear" column.
+                // Dates come to us as "2018-05-01" in the SUSHI JSON ("begin-date") and we decided to store them as-is.
+                monthYear = MetricsUtil.sanitizeYearMonthUserInput(yyyymm) + "-01";
+            }
+            if (country != null) {
+                country = country.toLowerCase();
+                if (!MakeDataCountUtil.isValidCountryCode(country)) {
+                    return error(Response.Status.BAD_REQUEST, "Country must be one of the ISO 1366 Country Codes");
+                }
+            }
+            DatasetMetrics datasetMetrics = datasetMetricsSvc.getDatasetMetricsByDatasetForDisplay(dataset, monthYear, country);
+            if (datasetMetrics == null) {
+                return ok("No metrics available for dataset " + dataset.getId() + " for " + yyyymm + " for country code " + country + ".");
+            } else if (datasetMetrics.getDownloadsTotal() + datasetMetrics.getViewsTotal() == 0) {
+                return ok("No metrics available for dataset " + dataset.getId() + " for " + yyyymm + " for country code " + country + ".");
+            }
+            Long viewsTotalRegular = null;
+            Long viewsUniqueRegular = null;
+            Long downloadsTotalRegular = null;
+            Long downloadsUniqueRegular = null;
+            Long viewsTotalMachine = null;
+            Long viewsUniqueMachine = null;
+            Long downloadsTotalMachine = null;
+            Long downloadsUniqueMachine = null;
+            Long viewsTotal = null;
+            Long viewsUnique = null;
+            Long downloadsTotal = null;
+            Long downloadsUnique = null;
+            switch (metricSupplied) {
+                case "viewsTotal":
+                    viewsTotal = datasetMetrics.getViewsTotal();
+                    break;
+                case "viewsTotalRegular":
+                    viewsTotalRegular = datasetMetrics.getViewsTotalRegular();
+                    break;
+                case "viewsTotalMachine":
+                    viewsTotalMachine = datasetMetrics.getViewsTotalMachine();
+                    break;
+                case "viewsUnique":
+                    viewsUnique = datasetMetrics.getViewsUnique();
+                    break;
+                case "viewsUniqueRegular":
+                    viewsUniqueRegular = datasetMetrics.getViewsUniqueRegular();
+                    break;
+                case "viewsUniqueMachine":
+                    viewsUniqueMachine = datasetMetrics.getViewsUniqueMachine();
+                    break;
+                case "downloadsTotal":
+                    downloadsTotal = datasetMetrics.getDownloadsTotal();
+                    break;
+                case "downloadsTotalRegular":
+                    downloadsTotalRegular = datasetMetrics.getDownloadsTotalRegular();
+                    break;
+                case "downloadsTotalMachine":
+                    downloadsTotalMachine = datasetMetrics.getDownloadsTotalMachine();
+                    break;
+                case "downloadsUnique":
+                    downloadsUnique = datasetMetrics.getDownloadsUnique();
+                    break;
+                case "downloadsUniqueRegular":
+                    downloadsUniqueRegular = datasetMetrics.getDownloadsUniqueRegular();
+                    break;
+                case "downloadsUniqueMachine":
+                    downloadsUniqueMachine = datasetMetrics.getDownloadsUniqueMachine();
+                    break;
+                default:
+                    break;
+            }
+            /**
+             * TODO: Think more about the JSON output and the API design.
+             * getDatasetMetricsByDatasetMonthCountry returns a single row right
+             * now, by country. We could return multiple metrics (viewsTotal,
+             * viewsUnique, downloadsTotal, and downloadsUnique) by country.
+             */
+            jsonObjectBuilder.add("viewsTotalRegular", viewsTotalRegular);
+            jsonObjectBuilder.add("viewsUniqueRegular", viewsUniqueRegular);
+            jsonObjectBuilder.add("downloadsTotalRegular", downloadsTotalRegular);
+            jsonObjectBuilder.add("downloadsUniqueRegular", downloadsUniqueRegular);
+            jsonObjectBuilder.add("viewsTotalMachine", viewsTotalMachine);
+            jsonObjectBuilder.add("viewsUniqueMachine", viewsUniqueMachine);
+            jsonObjectBuilder.add("downloadsTotalMachine", downloadsTotalMachine);
+            jsonObjectBuilder.add("downloadsUniqueMachine", downloadsUniqueMachine);
+            jsonObjectBuilder.add("viewsTotal", viewsTotal);
+            jsonObjectBuilder.add("viewsUnique", viewsUnique);
+            jsonObjectBuilder.add("downloadsTotal", downloadsTotal);
+            jsonObjectBuilder.add("downloadsUnique", downloadsUnique);
+            return ok(jsonObjectBuilder);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        } catch (Exception e) {
+            //bad date - caught in sanitize call
+            return error(BAD_REQUEST, e.getMessage());
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/storageDriver")
+    public Response getFileStore(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+            @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "No such dataset");
+        }
+
+        return response(req -> ok(dataset.getEffectiveStorageDriverId()), getRequestUser(crc));
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{identifier}/storageDriver")
+    public Response setFileStore(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+            String storageDriverLabel,
+            @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+
+        // Superuser-only:
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.BAD_REQUEST, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "No such dataset");
+        }
+
+        // We don't want to allow setting this to a store id that does not exist:
+        for (Entry<String, String> store : DataAccess.getStorageDriverLabels().entrySet()) {
+            if (store.getKey().equals(storageDriverLabel)) {
+                dataset.setStorageDriverId(store.getValue());
+                datasetService.merge(dataset);
+                return ok("Storage driver set to: " + store.getKey() + "/" + store.getValue());
+            }
+        }
+        return error(Response.Status.BAD_REQUEST,
+                "No Storage Driver found for : " + storageDriverLabel);
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{identifier}/storageDriver")
+    public Response resetFileStore(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+            @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+
+        // Superuser-only:
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.BAD_REQUEST, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "No such dataset");
+        }
+
+        dataset.setStorageDriverId(null);
+        datasetService.merge(dataset);
+        return ok("Storage reset to default: " + DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER);
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/curationLabelSet")
+    public Response getCurationLabelSet(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+            @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+
+        return response(req -> ok(dataset.getEffectiveCurationLabelSetName()), getRequestUser(crc));
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{identifier}/curationLabelSet")
+    public Response setCurationLabelSet(@Context ContainerRequestContext crc,
+                                        @PathParam("identifier") String dvIdtf,
+                                        @QueryParam("name") String curationLabelSet,
+                                        @Context UriInfo uriInfo,
+                                        @Context HttpHeaders headers) throws WrappedResponse {
+
+        // Superuser-only:
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.UNAUTHORIZED, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+        if (SystemConfig.CURATIONLABELSDISABLED.equals(curationLabelSet) || SystemConfig.DEFAULTCURATIONLABELSET.equals(curationLabelSet)) {
+            dataset.setCurationLabelSetName(curationLabelSet);
+            datasetService.merge(dataset);
+            return ok("Curation Label Set Name set to: " + curationLabelSet);
+        } else {
+            for (String setName : systemConfig.getCurationLabels().keySet()) {
+                if (setName.equals(curationLabelSet)) {
+                    dataset.setCurationLabelSetName(curationLabelSet);
+                    datasetService.merge(dataset);
+                    return ok("Curation Label Set Name set to: " + setName);
+                }
+            }
+        }
+        return error(Response.Status.BAD_REQUEST,
+            "No Such Curation Label Set");
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{identifier}/curationLabelSet")
+    public Response resetCurationLabelSet(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+            @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+
+        // Superuser-only:
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.BAD_REQUEST, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+
+        dataset.setCurationLabelSetName(SystemConfig.DEFAULTCURATIONLABELSET);
+        datasetService.merge(dataset);
+        return ok("Curation Label Set reset to default: " + SystemConfig.DEFAULTCURATIONLABELSET);
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/allowedCurationLabels")
+    public Response getAllowedCurationLabels(@Context ContainerRequestContext crc,
+                                             @PathParam("identifier") String dvIdtf,
+                                             @Context UriInfo uriInfo,
+                                             @Context HttpHeaders headers) throws WrappedResponse {
+        AuthenticatedUser user = null;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+        if (permissionSvc.requestOn(createDataverseRequest(user), dataset).has(Permission.PublishDataset)) {
+            String[] labelArray = systemConfig.getCurationLabels().get(dataset.getEffectiveCurationLabelSetName());
+            return response(req -> ok(String.join(",", labelArray)), getRequestUser(crc));
+        } else {
+            return error(Response.Status.FORBIDDEN, "You are not permitted to view the allowed curation labels for this dataset.");
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/timestamps")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getTimestamps(@Context ContainerRequestContext crc, @PathParam("identifier") String id) {
+
+        Dataset dataset = null;
+        DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+        try {
+            dataset = findDatasetOrDie(id);
+            User u = getRequestUser(crc);
+            Set<Permission> perms = new HashSet<Permission>();
+            perms.add(Permission.ViewUnpublishedDataset);
+            boolean canSeeDraft = permissionSvc.hasPermissionsFor(u, dataset, perms);
+            JsonObjectBuilder timestamps = Json.createObjectBuilder();
+            logger.fine("CSD: " + canSeeDraft);
+            logger.fine("IT: " + dataset.getIndexTime());
+            logger.fine("MT: " + dataset.getModificationTime());
+            logger.fine("PIT: " + dataset.getPermissionIndexTime());
+            logger.fine("PMT: " + dataset.getPermissionModificationTime());
+            // Basic info if it's released
+            if (dataset.isReleased() || canSeeDraft) {
+                timestamps.add("createTime", formatter.format(dataset.getCreateDate().toLocalDateTime()));
+                if (dataset.getPublicationDate() != null) {
+                    timestamps.add("publicationTime", formatter.format(dataset.getPublicationDate().toLocalDateTime()));
+                }
+
+                if (dataset.getLastExportTime() != null) {
+                    timestamps.add("lastMetadataExportTime",
+                            formatter.format(dataset.getLastExportTime().toInstant().atZone(ZoneId.systemDefault())));
+
+                }
+
+                if (dataset.getMostRecentMajorVersionReleaseDate() != null) {
+                    timestamps.add("lastMajorVersionReleaseTime", formatter.format(
+                            dataset.getMostRecentMajorVersionReleaseDate().toInstant().atZone(ZoneId.systemDefault())));
+                }
+                // If the modification/permissionmodification time is
+                // set and the index time is null or is before the mod time, the relevant index is stale
+                timestamps.add("hasStaleIndex",
+                        (dataset.getModificationTime() != null && (dataset.getIndexTime() == null
+                                || (dataset.getIndexTime().compareTo(dataset.getModificationTime()) <= 0))) ? true
+                                : false);
+                timestamps.add("hasStalePermissionIndex",
+                        (dataset.getPermissionModificationTime() != null && (dataset.getIndexTime() == null
+                                || (dataset.getIndexTime().compareTo(dataset.getModificationTime()) <= 0))) ? true
+                                : false);
+            }
+            // More detail if you can see a draft
+            if (canSeeDraft) {
+                timestamps.add("lastUpdateTime", formatter.format(dataset.getModificationTime().toLocalDateTime()));
+                if (dataset.getIndexTime() != null) {
+                    timestamps.add("lastIndexTime", formatter.format(dataset.getIndexTime().toLocalDateTime()));
+                }
+                if (dataset.getPermissionModificationTime() != null) {
+                    timestamps.add("lastPermissionUpdateTime",
+                            formatter.format(dataset.getPermissionModificationTime().toLocalDateTime()));
+                }
+                if (dataset.getPermissionIndexTime() != null) {
+                    timestamps.add("lastPermissionIndexTime",
+                            formatter.format(dataset.getPermissionIndexTime().toLocalDateTime()));
+                }
+                if (dataset.getGlobalIdCreateTime() != null) {
+                    timestamps.add("globalIdCreateTime", formatter
+                            .format(dataset.getGlobalIdCreateTime().toInstant().atZone(ZoneId.systemDefault())));
+                }
+
+            }
+            return ok(timestamps);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+
+/****************************
+ * Globus Support Section:
+ *
+ * Globus transfer in (upload) and out (download) involve three basic steps: The
+ * app is launched and makes a callback to the
+ * globusUploadParameters/globusDownloadParameters method to get all of the info
+ * needed to set up it's display.
+ *
+ * At some point after that, the user will make a selection as to which files to
+ * transfer and the app will call requestGlobusUploadPaths/requestGlobusDownload
+ * to indicate a transfer is about to start. In addition to providing the
+ * details of where to transfer the files to/from, Dataverse also grants the
+ * Globus principal involved the relevant rw or r permission for the dataset.
+ *
+ * Once the transfer is started, the app records the task id and sends it to
+ * Dataverse in the addGlobusFiles/monitorGlobusDownload call. Dataverse then
+ * monitors the transfer task and when it ultimately succeeds for fails it
+ * revokes the principal's permission and, for the transfer in case, adds the
+ * files to the dataset. (The dataset is locked until the transfer completes.)
+ *
+ * (If no transfer is started within a specified timeout, permissions will
+ * automatically be revoked - see the GlobusServiceBean for details.)
+ *
+ * The option to reference a file at a remote endpoint (rather than transfer it)
+ * follows the first two steps of the process above but completes with a call to
+ * the normal /addFiles endpoint (as there is no transfer to monitor and the
+ * files can be added to the dataset immediately.)
+ */
+
+    /**
+     * Retrieve the parameters and signed URLs required to perform a globus
+     * transfer. This api endpoint is expected to be called as a signed callback
+     * after the globus-dataverse app/other app is launched, but it will accept
+     * other forms of authentication.
+     *
+     * @param crc
+     * @param datasetId
+     */
+    @GET
+    @AuthRequired
+    @Path("{id}/globusUploadParameters")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getGlobusUploadParams(@Context ContainerRequestContext crc, @PathParam("id") String datasetId,
+            @QueryParam(value = "locale") String locale) {
+        // -------------------------------------
+        // (1) Get the user from the ContainerRequestContext
+        // -------------------------------------
+        AuthenticatedUser authUser;
+        try {
+            authUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+        // -------------------------------------
+        // (2) Get the Dataset Id
+        // -------------------------------------
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(datasetId);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        String storeId = dataset.getEffectiveStorageDriverId();
+        // acceptsGlobusTransfers should only be true for an S3 or globus store
+        if (!GlobusAccessibleStore.acceptsGlobusTransfers(storeId)
+                && !GlobusAccessibleStore.allowsGlobusReferences(storeId)) {
+            return badRequest(BundleUtil.getStringFromBundle("datasets.api.globusuploaddisabled"));
+        }
+
+        URLTokenUtil tokenUtil = new URLTokenUtil(dataset, authSvc.findApiTokenByUser(authUser), locale);
+
+        boolean managed = GlobusAccessibleStore.isDataverseManaged(storeId);
+        String transferEndpoint = null;
+        JsonArray referenceEndpointsWithPaths = null;
+        if (managed) {
+            transferEndpoint = GlobusAccessibleStore.getTransferEndpointId(storeId);
+        } else {
+            referenceEndpointsWithPaths = GlobusAccessibleStore.getReferenceEndpointsWithPaths(storeId);
+        }
+
+        JsonObjectBuilder queryParams = Json.createObjectBuilder();
+        queryParams.add("queryParameters",
+                Json.createArrayBuilder().add(Json.createObjectBuilder().add("datasetId", "{datasetId}"))
+                        .add(Json.createObjectBuilder().add("siteUrl", "{siteUrl}"))
+                        .add(Json.createObjectBuilder().add("datasetVersion", "{datasetVersion}"))
+                        .add(Json.createObjectBuilder().add("dvLocale", "{localeCode}"))
+                        .add(Json.createObjectBuilder().add("datasetPid", "{datasetPid}")));
+        JsonObject substitutedParams = tokenUtil.getParams(queryParams.build());
+        JsonObjectBuilder params = Json.createObjectBuilder();
+        substitutedParams.keySet().forEach((key) -> {
+            params.add(key, substitutedParams.get(key));
+        });
+        params.add("managed", Boolean.toString(managed));
+        if (managed) {
+            Long maxSize = systemConfig.getMaxFileUploadSizeForStore(storeId);
+            if (maxSize != null) {
+                params.add("fileSizeLimit", maxSize);
+            }
+            UploadSessionQuotaLimit limit = fileService.getUploadSessionQuotaLimit(dataset);
+            if (limit != null) {
+                params.add("remainingQuota", limit.getRemainingQuotaInBytes());
+            }
+        }
+        if (transferEndpoint != null) {
+            params.add("endpoint", transferEndpoint);
+        } else {
+            params.add("referenceEndpointsWithPaths", referenceEndpointsWithPaths);
+        }
+        int timeoutSeconds = JvmSettings.GLOBUS_CACHE_MAXAGE.lookup(Integer.class);
+        JsonArrayBuilder allowedApiCalls = Json.createArrayBuilder();
+        String requestCallName = managed ? "requestGlobusTransferPaths" : "requestGlobusReferencePaths";
+        allowedApiCalls.add(
+                Json.createObjectBuilder().add(URLTokenUtil.NAME, requestCallName).add(URLTokenUtil.HTTP_METHOD, "POST")
+                        .add(URLTokenUtil.URL_TEMPLATE, "/api/v1/datasets/{datasetId}/requestGlobusUploadPaths")
+                        .add(URLTokenUtil.TIMEOUT, timeoutSeconds));
+        if(managed) {
+        allowedApiCalls.add(Json.createObjectBuilder().add(URLTokenUtil.NAME, "addGlobusFiles")
+                .add(URLTokenUtil.HTTP_METHOD, "POST")
+                .add(URLTokenUtil.URL_TEMPLATE, "/api/v1/datasets/{datasetId}/addGlobusFiles")
+                .add(URLTokenUtil.TIMEOUT, timeoutSeconds));
+        } else {
+            allowedApiCalls.add(Json.createObjectBuilder().add(URLTokenUtil.NAME, "addFiles")
+                    .add(URLTokenUtil.HTTP_METHOD, "POST")
+                    .add(URLTokenUtil.URL_TEMPLATE, "/api/v1/datasets/{datasetId}/addFiles")
+                    .add(URLTokenUtil.TIMEOUT, timeoutSeconds));
+        }
+        allowedApiCalls.add(Json.createObjectBuilder().add(URLTokenUtil.NAME, "getDatasetMetadata")
+                .add(URLTokenUtil.HTTP_METHOD, "GET")
+                .add(URLTokenUtil.URL_TEMPLATE, "/api/v1/datasets/{datasetId}/versions/{datasetVersion}")
+                .add(URLTokenUtil.TIMEOUT, 5));
+        allowedApiCalls.add(
+                Json.createObjectBuilder().add(URLTokenUtil.NAME, "getFileListing").add(URLTokenUtil.HTTP_METHOD, "GET")
+                        .add(URLTokenUtil.URL_TEMPLATE, "/api/v1/datasets/{datasetId}/versions/{datasetVersion}/files")
+                        .add(URLTokenUtil.TIMEOUT, 5));
+
+        return ok(tokenUtil.createPostBody(params.build(), allowedApiCalls.build()));
+    }
+
+    /**
+     * Provides specific storageIdentifiers to use for each file amd requests permissions for a given globus user to upload to the dataset
+     *
+     * @param crc
+     * @param datasetId
+     * @param jsonData - an object that must include the id of the globus "principal" involved and the "numberOfFiles" that will be transferred.
+     * @return
+     * @throws IOException
+     * @throws ExecutionException
+     * @throws InterruptedException
+     */
+    @POST
+    @AuthRequired
+    @Path("{id}/requestGlobusUploadPaths")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response requestGlobusUpload(@Context ContainerRequestContext crc, @PathParam("id") String datasetId,
+            String jsonBody) throws IOException, ExecutionException, InterruptedException {
+
+        logger.info(" ====  (api allowGlobusUpload) jsonBody   ====== " + jsonBody);
+
+        if (!systemConfig.isGlobusUpload()) {
+            return error(Response.Status.SERVICE_UNAVAILABLE,
+                    BundleUtil.getStringFromBundle("file.api.globusUploadDisabled"));
+        }
+
+        // -------------------------------------
+        // (1) Get the user from the ContainerRequestContext
+        // -------------------------------------
+        AuthenticatedUser authUser;
+        try {
+            authUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+
+        // -------------------------------------
+        // (2) Get the Dataset Id
+        // -------------------------------------
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(datasetId);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        if (permissionSvc.requestOn(createDataverseRequest(authUser), dataset)
+                .canIssue(UpdateDatasetVersionCommand.class)) {
+
+            JsonObject params = JsonUtil.getJsonObject(jsonBody);
+            if (!GlobusAccessibleStore.isDataverseManaged(dataset.getEffectiveStorageDriverId())) {
+                try {
+                    JsonArray referencedFiles = params.getJsonArray("referencedFiles");
+                    if (referencedFiles == null || referencedFiles.size() == 0) {
+                        return badRequest("No referencedFiles specified");
+                    }
+                    JsonObject fileMap = globusService.requestReferenceFileIdentifiers(dataset, referencedFiles);
+                    return (ok(fileMap));
+                } catch (Exception e) {
+                    return badRequest(e.getLocalizedMessage());
+                }
+            } else {
+                try {
+                    String principal = params.getString("principal");
+                    int numberOfPaths = params.getInt("numberOfFiles");
+                    if (numberOfPaths <= 0) {
+                        return badRequest("numberOfFiles must be positive");
+                    }
+
+                    JsonObject response = globusService.requestAccessiblePaths(principal, dataset, numberOfPaths);
+                    switch (response.getInt("status")) {
+                    case 201:
+                        return ok(response.getJsonObject("paths"));
+                    case 400:
+                        return badRequest("Unable to grant permission");
+                    case 409:
+                        return conflict("Permission already exists or no more permissions allowed");
+                    default:
+                        return error(null, "Unexpected error when granting permission");
+                    }
+
+                } catch (NullPointerException | ClassCastException e) {
+                    return badRequest("Error retrieving principal and numberOfFiles from JSON request body");
+
+                }
+            }
+        } else {
+            return forbidden("User doesn't have permission to upload to this dataset");
+        }
+
+    }
+
+    /** A method analogous to /addFiles that must also include the taskIdentifier of the transfer-in-progress to monitor
+     *
+     * @param crc
+     * @param datasetId
+     * @param jsonData - see /addFiles documentation, aditional "taskIdentifier" key in the main object is required.
+     * @param uriInfo
+     * @return
+     * @throws IOException
+     * @throws ExecutionException
+     * @throws InterruptedException
+     */
+    @POST
+    @AuthRequired
+    @Path("{id}/addGlobusFiles")
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Produces("application/json")
+    @Operation(summary = "Uploads a Globus file for a dataset",
+               description = "Uploads a Globus file for a dataset")
+    @APIResponse(responseCode = "200",
+               description = "Globus file uploaded successfully to dataset")
+    @Tag(name = "addGlobusFilesToDataset",
+         description = "Uploads a Globus file for a dataset")
+    @RequestBody(content = @Content(mediaType = MediaType.MULTIPART_FORM_DATA))
+    public Response addGlobusFilesToDataset(@Context ContainerRequestContext crc,
+                                            @PathParam("id") String datasetId,
+                                            @FormDataParam("jsonData") String jsonData,
+                                            @Context UriInfo uriInfo
+    ) throws IOException, ExecutionException, InterruptedException {
+
+        logger.info(" ====  (api addGlobusFilesToDataset) jsonData   ====== " + jsonData);
+
+        // -------------------------------------
+        // (1) Get the user from the API key
+        // -------------------------------------
+        AuthenticatedUser authUser;
+        try {
+            authUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, BundleUtil.getStringFromBundle("file.addreplace.error.auth")
+            );
+        }
+
+        // -------------------------------------
+        // (2) Get the Dataset Id
+        // -------------------------------------
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(datasetId);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        // Is Globus upload service available?
+
+        // ... on this Dataverse instance?
+        if (!systemConfig.isGlobusUpload()) {
+            return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.globusUploadDisabled"));
+        }
+
+        // ... and on this specific Dataset?
+        String storeId = dataset.getEffectiveStorageDriverId();
+        // acceptsGlobusTransfers should only be true for an S3 or globus store
+        if (!GlobusAccessibleStore.acceptsGlobusTransfers(storeId)
+                && !GlobusAccessibleStore.allowsGlobusReferences(storeId)) {
+            return badRequest(BundleUtil.getStringFromBundle("datasets.api.globusuploaddisabled"));
+        }
+
+        // Check if the dataset is already locked
+        // We are reusing the code and logic used by various command to determine
+        // if there are any locks on the dataset that would prevent the current
+        // users from modifying it:
+        try {
+            DataverseRequest dataverseRequest = createDataverseRequest(authUser);
+            permissionService.checkEditDatasetLock(dataset, dataverseRequest, null);
+        } catch (IllegalCommandException icex) {
+            return error(Response.Status.FORBIDDEN, "Dataset " + datasetId + " is locked: " + icex.getLocalizedMessage());
+        }
+
+        JsonObject jsonObject = null;
+        try {
+            jsonObject = JsonUtil.getJsonObject(jsonData);
+        } catch (Exception ex) {
+            logger.fine("Error parsing json: " + jsonData + " " + ex.getMessage());
+            return badRequest("Error parsing json body");
+
+        }
+
+        //------------------------------------
+        // (2b) Make sure dataset does not have package file
+        // --------------------------------------
+
+        for (DatasetVersion dv : dataset.getVersions()) {
+            if (dv.isHasPackageFile()) {
+                return error(Response.Status.FORBIDDEN, BundleUtil.getStringFromBundle("file.api.alreadyHasPackageFile")
+                );
+            }
+        }
+
+
+        String lockInfoMessage = "Globus Upload API started ";
+        DatasetLock lock = datasetService.addDatasetLock(dataset.getId(), DatasetLock.Reason.GlobusUpload,
+                (authUser).getId(), lockInfoMessage);
+        if (lock != null) {
+            dataset.addLock(lock);
+        } else {
+            logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId());
+        }
+
+        if(uriInfo != null) {
+            logger.info(" ====  (api uriInfo.getRequestUri()) jsonData   ====== " + uriInfo.getRequestUri().toString());
+        }
+
+        String requestUrl = SystemConfig.getDataverseSiteUrlStatic();
+
+        // Async Call
+        try {
+            globusService.globusUpload(jsonObject, dataset, requestUrl, authUser);
+        } catch (IllegalArgumentException ex) {
+            return badRequest("Invalid parameters: "+ex.getMessage());
+        }
+
+        return ok("Async call to Globus Upload started ");
+
+    }
+
+/**
+ * Retrieve the parameters and signed URLs required to perform a globus
+ * transfer/download. This api endpoint is expected to be called as a signed
+ * callback after the globus-dataverse app/other app is launched, but it will
+ * accept other forms of authentication.
+ *
+ * @param crc
+ * @param datasetId
+ * @param locale
+ * @param downloadId - an id to a cached object listing the files involved. This is generated via Dataverse and provided to the dataverse-globus app in a signedURL.
+ * @return - JSON containing the parameters and URLs needed by the dataverse-globus app. The format is analogous to that for external tools.
+ */
+    @GET
+    @AuthRequired
+    @Path("{id}/globusDownloadParameters")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getGlobusDownloadParams(@Context ContainerRequestContext crc, @PathParam("id") String datasetId,
+            @QueryParam(value = "locale") String locale, @QueryParam(value = "downloadId") String downloadId) {
+        // -------------------------------------
+        // (1) Get the user from the ContainerRequestContext
+        // -------------------------------------
+        AuthenticatedUser authUser = null;
+        try {
+            authUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse e) {
+            logger.fine("guest user globus download");
+        }
+        // -------------------------------------
+        // (2) Get the Dataset Id
+        // -------------------------------------
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(datasetId);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        String storeId = dataset.getEffectiveStorageDriverId();
+        // acceptsGlobusTransfers should only be true for an S3 or globus store
+        if (!(GlobusAccessibleStore.acceptsGlobusTransfers(storeId)
+                || GlobusAccessibleStore.allowsGlobusReferences(storeId))) {
+            return badRequest(BundleUtil.getStringFromBundle("datasets.api.globusdownloaddisabled"));
+        }
+
+        JsonObject files = globusService.getFilesForDownload(downloadId);
+        if (files == null) {
+            return notFound(BundleUtil.getStringFromBundle("datasets.api.globusdownloadnotfound"));
+        }
+
+        URLTokenUtil tokenUtil = new URLTokenUtil(dataset, authSvc.findApiTokenByUser(authUser), locale);
+
+        boolean managed = GlobusAccessibleStore.isDataverseManaged(storeId);
+        String transferEndpoint = null;
+
+        JsonObjectBuilder queryParams = Json.createObjectBuilder();
+        queryParams.add("queryParameters",
+                Json.createArrayBuilder().add(Json.createObjectBuilder().add("datasetId", "{datasetId}"))
+                        .add(Json.createObjectBuilder().add("siteUrl", "{siteUrl}"))
+                        .add(Json.createObjectBuilder().add("datasetVersion", "{datasetVersion}"))
+                        .add(Json.createObjectBuilder().add("dvLocale", "{localeCode}"))
+                        .add(Json.createObjectBuilder().add("datasetPid", "{datasetPid}")));
+        JsonObject substitutedParams = tokenUtil.getParams(queryParams.build());
+        JsonObjectBuilder params = Json.createObjectBuilder();
+        substitutedParams.keySet().forEach((key) -> {
+            params.add(key, substitutedParams.get(key));
+        });
+        params.add("managed", Boolean.toString(managed));
+        if (managed) {
+            transferEndpoint = GlobusAccessibleStore.getTransferEndpointId(storeId);
+            params.add("endpoint", transferEndpoint);
+        }
+        params.add("files", files);
+        int timeoutSeconds = JvmSettings.GLOBUS_CACHE_MAXAGE.lookup(Integer.class);
+        JsonArrayBuilder allowedApiCalls = Json.createArrayBuilder();
+        allowedApiCalls.add(Json.createObjectBuilder().add(URLTokenUtil.NAME, "monitorGlobusDownload")
+                .add(URLTokenUtil.HTTP_METHOD, "POST")
+                .add(URLTokenUtil.URL_TEMPLATE, "/api/v1/datasets/{datasetId}/monitorGlobusDownload")
+                .add(URLTokenUtil.TIMEOUT, timeoutSeconds));
+        allowedApiCalls.add(Json.createObjectBuilder().add(URLTokenUtil.NAME, "requestGlobusDownload")
+                .add(URLTokenUtil.HTTP_METHOD, "POST")
+                .add(URLTokenUtil.URL_TEMPLATE,
+                        "/api/v1/datasets/{datasetId}/requestGlobusDownload?downloadId=" + downloadId)
+                .add(URLTokenUtil.TIMEOUT, timeoutSeconds));
+        allowedApiCalls.add(Json.createObjectBuilder().add(URLTokenUtil.NAME, "getDatasetMetadata")
+                .add(URLTokenUtil.HTTP_METHOD, "GET")
+                .add(URLTokenUtil.URL_TEMPLATE, "/api/v1/datasets/{datasetId}/versions/{datasetVersion}")
+                .add(URLTokenUtil.TIMEOUT, 5));
+        allowedApiCalls.add(
+                Json.createObjectBuilder().add(URLTokenUtil.NAME, "getFileListing").add(URLTokenUtil.HTTP_METHOD, "GET")
+                        .add(URLTokenUtil.URL_TEMPLATE, "/api/v1/datasets/{datasetId}/versions/{datasetVersion}/files")
+                        .add(URLTokenUtil.TIMEOUT, 5));
+
+        return ok(tokenUtil.createPostBody(params.build(), allowedApiCalls.build()));
+    }
+
+    /**
+     * Requests permissions for a given globus user to download the specified files
+     * the dataset and returns information about the paths to transfer from.
+     *
+     * When called directly rather than in response to being given a downloadId, the jsonData can include a "fileIds" key with an array of file ids to transfer.
+     *
+     * @param crc
+     * @param datasetId
+     * @param jsonData - a JSON object that must include the id of the  Globus "principal" that will be transferring the files in the case where Dataverse manages the Globus endpoint. For remote endpoints, the principal is not required.
+     * @return - a JSON object containing a map of file ids to Globus endpoint/path
+     * @throws IOException
+     * @throws ExecutionException
+     * @throws InterruptedException
+     */
+    @POST
+    @AuthRequired
+    @Path("{id}/requestGlobusDownload")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response requestGlobusDownload(@Context ContainerRequestContext crc, @PathParam("id") String datasetId,
+            @QueryParam(value = "downloadId") String downloadId, String jsonBody)
+            throws IOException, ExecutionException, InterruptedException {
+
+        logger.info(" ====  (api allowGlobusDownload) jsonBody   ====== " + jsonBody);
+
+        if (!systemConfig.isGlobusDownload()) {
+            return error(Response.Status.SERVICE_UNAVAILABLE,
+                    BundleUtil.getStringFromBundle("datasets.api.globusdownloaddisabled"));
+        }
+
+        // -------------------------------------
+        // (1) Get the user from the ContainerRequestContext
+        // -------------------------------------
+        User user = getRequestUser(crc);
+
+        // -------------------------------------
+        // (2) Get the Dataset Id
+        // -------------------------------------
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(datasetId);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        JsonObject body = null;
+        if (jsonBody != null) {
+            body = JsonUtil.getJsonObject(jsonBody);
+        }
+        Set<String> fileIds = null;
+        if (downloadId != null) {
+            JsonObject files = globusService.getFilesForDownload(downloadId);
+            if (files != null) {
+                fileIds = files.keySet();
+            }
+        } else {
+            if ((body!=null) && body.containsKey("fileIds")) {
+                Collection<JsonValue> fileVals = body.getJsonArray("fileIds").getValuesAs(JsonValue.class);
+                fileIds = new HashSet<String>(fileVals.size());
+                for (JsonValue fileVal : fileVals) {
+                    String id = null;
+                    switch (fileVal.getValueType()) {
+                    case STRING:
+                        id = ((JsonString) fileVal).getString();
+                        break;
+                    case NUMBER:
+                        id = ((JsonNumber) fileVal).toString();
+                        break;
+                    default:
+                        return badRequest("fileIds must be numeric or string (ids/PIDs)");
+                    }
+                    ;
+                    fileIds.add(id);
+                }
+            } else {
+                return badRequest("fileIds JsonArray of file ids/PIDs required in POST body");
+            }
+        }
+
+        if (fileIds.isEmpty()) {
+            return notFound(BundleUtil.getStringFromBundle("datasets.api.globusdownloadnotfound"));
+        }
+        ArrayList<DataFile> dataFiles = new ArrayList<DataFile>(fileIds.size());
+        for (String id : fileIds) {
+            boolean published = false;
+            logger.info("File id: " + id);
+
+            DataFile df = null;
+            try {
+                df = findDataFileOrDie(id);
+            } catch (WrappedResponse wr) {
+                return wr.getResponse();
+            }
+            if (!df.getOwner().equals(dataset)) {
+                return badRequest("All files must be in the dataset");
+            }
+            dataFiles.add(df);
+
+            for (FileMetadata fm : df.getFileMetadatas()) {
+                if (fm.getDatasetVersion().isPublished()) {
+                    published = true;
+                    break;
+                }
+            }
+
+            if (!published) {
+                // If the file is not published, they can still download the file, if the user
+                // has the permission to view unpublished versions:
+
+                if (!permissionService.hasPermissionsFor(user, df.getOwner(),
+                        EnumSet.of(Permission.ViewUnpublishedDataset))) {
+                    return forbidden("User doesn't have permission to download file: " + id);
+                }
+            } else { // published and restricted and/or embargoed
+                if (df.isRestricted() || FileUtil.isActivelyEmbargoed(df))
+                    // This line also handles all three authenticated session user, token user, and
+                    // guest cases.
+                    if (!permissionService.hasPermissionsFor(user, df, EnumSet.of(Permission.DownloadFile))) {
+                        return forbidden("User doesn't have permission to download file: " + id);
+                    }
+
+            }
+        }
+        // Allowed to download all requested files
+        JsonObject files = GlobusUtil.getFilesMap(dataFiles, dataset);
+        if (GlobusAccessibleStore.isDataverseManaged(dataset.getEffectiveStorageDriverId())) {
+            // If managed, give the principal read permissions
+            int status = globusService.setPermissionForDownload(dataset, body.getString("principal"));
+            switch (status) {
+            case 201:
+                return ok(files);
+            case 400:
+                return badRequest("Unable to grant permission");
+            case 409:
+                return conflict("Permission already exists or no more permissions allowed");
+            default:
+                return error(null, "Unexpected error when granting permission");
+            }
+
+        }
+
+        return ok(files);
+    }
+
+    /**
+     * Monitors a globus download and removes permissions on the dir/dataset when
+     * the specified transfer task is completed.
+     *
+     * @param crc
+     * @param datasetId
+     * @param jsonData  - a JSON Object containing the key "taskIdentifier" with the
+     *                  Globus task to monitor.
+     * @return
+     * @throws IOException
+     * @throws ExecutionException
+     * @throws InterruptedException
+     */
+    @POST
+    @AuthRequired
+    @Path("{id}/monitorGlobusDownload")
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response monitorGlobusDownload(@Context ContainerRequestContext crc, @PathParam("id") String datasetId,
+            String jsonData) throws IOException, ExecutionException, InterruptedException {
+
+        logger.info(" ====  (api deleteglobusRule) jsonData   ====== " + jsonData);
+
+        if (!systemConfig.isGlobusDownload()) {
+            return error(Response.Status.SERVICE_UNAVAILABLE,
+                    BundleUtil.getStringFromBundle("datasets.api.globusdownloaddisabled"));
+        }
+
+        // -------------------------------------
+        // (1) Get the user from the ContainerRequestContext
+        // -------------------------------------
+        User authUser;
+        authUser = getRequestUser(crc);
+
+        // -------------------------------------
+        // (2) Get the Dataset Id
+        // -------------------------------------
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(datasetId);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        JsonObject jsonObject = null;
+        try {
+            jsonObject = JsonUtil.getJsonObject(jsonData);
+        } catch (Exception ex) {
+            logger.warning("Globus download monitoring: error parsing json: " + jsonData + " " + ex.getMessage());
+            return badRequest("Error parsing json body");
+
+        }
+
+        // Async Call
+        globusService.globusDownload(jsonObject, dataset, authUser);
+
+        return ok("Async call to Globus Download started");
+
+    }
+
+    /**
+     * Add multiple Files to an existing Dataset
+     *
+     * @param idSupplied
+     * @param jsonData
+     * @return
+     */
+    @POST
+    @AuthRequired
+    @Path("{id}/addFiles")
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Produces("application/json")
+    @Operation(summary = "Uploads a set of files to a dataset",
+               description = "Uploads a set of files to a dataset")
+    @APIResponse(responseCode = "200",
+               description = "Files uploaded successfully to dataset")
+    @Tag(name = "addFilesToDataset",
+         description = "Uploads a set of files to a dataset")
+    @RequestBody(content = @Content(mediaType = MediaType.MULTIPART_FORM_DATA))
+    public Response addFilesToDataset(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied,
+            @FormDataParam("jsonData") String jsonData) {
+
+        if (!systemConfig.isHTTPUpload()) {
+            return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.httpDisabled"));
+        }
+
+        // -------------------------------------
+        // (1) Get the user from the ContainerRequestContext
+        // -------------------------------------
+        User authUser;
+        authUser = getRequestUser(crc);
+
+        // -------------------------------------
+        // (2) Get the Dataset Id
+        // -------------------------------------
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(idSupplied);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        dataset.getLocks().forEach(dl -> {
+            logger.info(dl.toString());
+        });
+
+        //------------------------------------
+        // (2a) Make sure dataset does not have package file
+        // --------------------------------------
+
+        for (DatasetVersion dv : dataset.getVersions()) {
+            if (dv.isHasPackageFile()) {
+                return error(Response.Status.FORBIDDEN,
+                        BundleUtil.getStringFromBundle("file.api.alreadyHasPackageFile")
+                );
+            }
+        }
+
+        DataverseRequest dvRequest = createDataverseRequest(authUser);
+
+        AddReplaceFileHelper addFileHelper = new AddReplaceFileHelper(
+                dvRequest,
+                this.ingestService,
+                this.datasetService,
+                this.fileService,
+                this.permissionSvc,
+                this.commandEngine,
+                this.systemConfig
+        );
+
+        return addFileHelper.addFiles(jsonData, dataset, authUser);
+
+    }
+
+    /**
+     * Replace multiple Files to an existing Dataset
+     *
+     * @param idSupplied
+     * @param jsonData
+     * @return
+     */
+    @POST
+    @AuthRequired
+    @Path("{id}/replaceFiles")
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Produces("application/json")
+    @Operation(summary = "Replace a set of files to a dataset",
+               description = "Replace a set of files to a dataset")
+    @APIResponse(responseCode = "200",
+               description = "Files replaced successfully to dataset")
+    @Tag(name = "replaceFilesInDataset",
+         description = "Replace a set of files to a dataset")
+    @RequestBody(content = @Content(mediaType = MediaType.MULTIPART_FORM_DATA))
+    public Response replaceFilesInDataset(@Context ContainerRequestContext crc,
+                                          @PathParam("id") String idSupplied,
+                                          @FormDataParam("jsonData") String jsonData) {
+
+        if (!systemConfig.isHTTPUpload()) {
+            return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.httpDisabled"));
+        }
+
+        // -------------------------------------
+        // (1) Get the user from the ContainerRequestContext
+        // -------------------------------------
+        User authUser;
+        authUser = getRequestUser(crc);
+
+        // -------------------------------------
+        // (2) Get the Dataset Id
+        // -------------------------------------
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(idSupplied);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        dataset.getLocks().forEach(dl -> {
+            logger.info(dl.toString());
+        });
+
+        //------------------------------------
+        // (2a) Make sure dataset does not have package file
+        // --------------------------------------
+
+        for (DatasetVersion dv : dataset.getVersions()) {
+            if (dv.isHasPackageFile()) {
+                return error(Response.Status.FORBIDDEN,
+                        BundleUtil.getStringFromBundle("file.api.alreadyHasPackageFile")
+                );
+            }
+        }
+
+        DataverseRequest dvRequest = createDataverseRequest(authUser);
+
+        AddReplaceFileHelper addFileHelper = new AddReplaceFileHelper(
+                dvRequest,
+                this.ingestService,
+                this.datasetService,
+                this.fileService,
+                this.permissionSvc,
+                this.commandEngine,
+                this.systemConfig
+        );
+
+        return addFileHelper.replaceFiles(jsonData, dataset, authUser);
+
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{id}/files/metadata")
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response updateMultipleFileMetadata(@Context ContainerRequestContext crc, String jsonData,
+            @PathParam("id") String datasetId) {
+        try {
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            Dataset dataset = findDatasetOrDie(datasetId);
+            User authUser = getRequestUser(crc);
+
+            // Verify that the user has EditDataset permission
+            if (!permissionSvc.requestOn(createDataverseRequest(authUser), dataset).has(Permission.EditDataset)) {
+                return error(Response.Status.FORBIDDEN, "You do not have permission to edit this dataset.");
+            }
+
+            // Parse the JSON array
+            JsonArray jsonArray = JsonUtil.getJsonArray(jsonData);
+
+            // Get the latest version of the dataset
+            DatasetVersion latestVersion = dataset.getLatestVersion();
+            List<FileMetadata> currentFileMetadatas = latestVersion.getFileMetadatas();
+
+            // Quick checks to verify all file ids in the JSON array are valid
+            Set<Long> validFileIds = currentFileMetadatas.stream().map(fm -> fm.getDataFile().getId())
+                    .collect(Collectors.toSet());
+
+            // Extract all file IDs from the JSON array
+            Set<Long> jsonFileIds = jsonArray.stream().map(JsonValue::asJsonObject).map(jsonObj -> {
+                try {
+                    return jsonObj.getJsonNumber("dataFileId").longValueExact();
+                } catch (NumberFormatException e) {
+                    return null;
+                }
+            }).collect(Collectors.toSet());
+
+            if (jsonFileIds.size() != jsonArray.size()) {
+                return error(BAD_REQUEST, "One or more invalid dataFileId values were provided");
+            }
+
+            // Check if all JSON file IDs are valid
+            if (!validFileIds.containsAll(jsonFileIds)) {
+                Set<Long> invalidIds = new HashSet<>(jsonFileIds);
+                invalidIds.removeAll(validFileIds);
+                return error(BAD_REQUEST,
+                        "The following files are not part of the current version of the Dataset. dataFileIds: " + invalidIds);
+            }
+
+            // Create editable fileMetadata if needed
+            if (!latestVersion.isDraft()) {
+                latestVersion = dataset.getOrCreateEditVersion();
+                currentFileMetadatas = latestVersion.getFileMetadatas();
+            }
+
+            // Create a map of fileId to FileMetadata for quick lookup
+            Map<Long, FileMetadata> fileMetadataMap = currentFileMetadatas.stream()
+                    .collect(Collectors.toMap(fm -> fm.getDataFile().getId(), fm -> fm));
+
+            boolean publicInstall = settingsSvc.isTrueForKey(SettingsServiceBean.Key.PublicInstall, false);
+
+            int filesUpdated = 0;
+            for (JsonValue jsonValue : jsonArray) {
+                JsonObject jsonObj = jsonValue.asJsonObject();
+                Long fileId = jsonObj.getJsonNumber("dataFileId").longValueExact();
+
+                FileMetadata fmd = fileMetadataMap.get(fileId);
+
+                if (fmd == null) {
+                    return error(BAD_REQUEST,
+                            "File with dataFileId " + fileId + " is not part of the current version of the Dataset.");
+                }
+
+                // Handle restriction
+                if (jsonObj.containsKey("restrict")) {
+                    boolean restrict = jsonObj.getBoolean("restrict");
+                    if (restrict != fmd.isRestricted()) {
+                        if (publicInstall && restrict) {
+                            return error(BAD_REQUEST, "Restricting files is not permitted on a public installation.");
+                        }
+                        fmd.setRestricted(restrict);
+                        if (!fmd.getDataFile().isReleased()) {
+                            fmd.getDataFile().setRestricted(restrict);
+                        }
+
+                    } else {
+                        // This file is already restricted or already unrestricted
+                        String text = restrict ? "restricted" : "unrestricted";
+                        return error(BAD_REQUEST, "File (dataFileId:" + fileId + ") is already " + text);
+                    }
+                }
+
+                // Load optional params
+                OptionalFileParams optionalFileParams = new OptionalFileParams(jsonObj.toString());
+
+                // Check for filename conflicts
+                String incomingLabel = null;
+                if (jsonObj.containsKey("label")) {
+                    incomingLabel = jsonObj.getString("label");
+                }
+                String incomingDirectoryLabel = null;
+                if (jsonObj.containsKey("directoryLabel")) {
+                    incomingDirectoryLabel = jsonObj.getString("directoryLabel");
+                }
+                String existingLabel = fmd.getLabel();
+                String existingDirectoryLabel = fmd.getDirectoryLabel();
+                String pathPlusFilename = IngestUtil.getPathAndFileNameToCheck(incomingLabel, incomingDirectoryLabel,
+                        existingLabel, existingDirectoryLabel);
+
+                // Create a copy of the fileMetadataMap without the current fmd
+                Map<Long, FileMetadata> fileMetadataMapCopy = new HashMap<>(fileMetadataMap);
+                fileMetadataMapCopy.remove(fileId);
+
+                List<FileMetadata> fmdListMinusCurrentFile = new ArrayList<>(fileMetadataMapCopy.values());
+
+                if (IngestUtil.conflictsWithExistingFilenames(pathPlusFilename, fmdListMinusCurrentFile)) {
+                    return error(BAD_REQUEST, BundleUtil.getStringFromBundle("files.api.metadata.update.duplicateFile",
+                            Arrays.asList(pathPlusFilename)));
+                }
+
+                // Apply optional params
+                optionalFileParams.addOptionalParams(fmd);
+
+                // Store updated FileMetadata
+                fileMetadataMap.put(fileId, fmd);
+                filesUpdated++;
+            }
+
+            latestVersion.setFileMetadatas(new ArrayList<>(fileMetadataMap.values()));
+            // Update the dataset version with all changes
+            UpdateDatasetVersionCommand updateCmd = new UpdateDatasetVersionCommand(dataset, req);
+            dataset = execCommand(updateCmd);
+
+            return ok("File metadata updates have been completed for " + filesUpdated + " files.");
+        } catch (WrappedResponse wr) {
+            return error(BAD_REQUEST,
+                    "An error has occurred attempting to update the requested DataFiles, likely related to permissions.");
+        } catch (JsonException ex) {
+            logger.log(Level.WARNING, "Dataset metadata update: exception while parsing JSON: {0}", ex);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("file.addreplace.error.parsing"));
+        } catch (DataFileTagException de) {
+            return error(BAD_REQUEST, de.getMessage());
+        }catch (Exception e) {
+            logger.log(Level.WARNING, "Dataset metadata update: exception while processing:{0}", e);
+            return error(Response.Status.INTERNAL_SERVER_ERROR, "Error updating metadata for DataFiles: " + e);
+        }
+    }
+    /**
+     * API to retrieve curation assignments and statuses for datasets.
+     *
+     * @param crc The ContainerRequestContext for authentication.
+     * @param includeHistory A boolean flag to determine whether to include the full history of curation statuses.
+     *                       If true, all historical statuses will be included. If false (default), only the latest status for each dataset is returned.
+     * @return A Response object containing a CSV formatted string with curation assignments and statuses.
+     *         The CSV includes the following columns in order:
+     *         1. Dataset Title (as a hyperlink to the dataset page)
+     *         2. Creation Date of the draft dataset version
+     *         3. Latest Modification Date of the draft dataset version
+     *         4. Assigned curation status or '<none>' if no curation status is assigned but was previously, null if no curation state has every been set.
+     *         5. Time when the curation status was applied to the draft dataset version
+     *         6. The user who assigned this curation status
+     *         7. Users (comma separated list) that can publish datasets and therefore see/set curation status
+     *         When includeHistory is true, multiple rows may be present for each dataset, showing the full history of curation statuses.
+     * @throws WrappedResponse If there's an error in authentication or data retrieval.
+     */
+    @GET
+    @AuthRequired
+    @Path("/listCurationStates")
+    @Produces("text/csv")
+    public Response getCurationStates(@Context ContainerRequestContext crc,
+                                      @QueryParam("includeHistory") @DefaultValue("false") boolean includeHistory) throws WrappedResponse {
+
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        List<DataverseRole> allRoles = dataverseRoleService.findAll();
+        List<DataverseRole> curationRoles = new ArrayList<DataverseRole>();
+        allRoles.forEach(r -> {
+            if (r.permissions().contains(Permission.PublishDataset))
+                curationRoles.add(r);
+        });
+        HashMap<String, HashSet<String>> assignees = new HashMap<String, HashSet<String>>();
+        curationRoles.forEach(r -> {
+            assignees.put(r.getAlias(), null);
+        });
+
+        StringBuilder csvSB = new StringBuilder(String.join(",",
+                BundleUtil.getStringFromBundle("dataset"),
+                BundleUtil.getStringFromBundle("datasets.api.creationdate"),
+                BundleUtil.getStringFromBundle("datasets.api.modificationdate"),
+                BundleUtil.getStringFromBundle("datasets.api.curationstatus"),
+                BundleUtil.getStringFromBundle("datasets.api.curationstatuscreatetime"),
+                BundleUtil.getStringFromBundle("datasets.api.curationstatussetter"),
+                String.join(",", assignees.keySet())));
+        for (Dataset dataset : datasetSvc.findAllWithDraftVersion()) {
+            List<RoleAssignment> ras = permissionService.assignmentsOn(dataset);
+            curationRoles.forEach(r -> {
+                assignees.put(r.getAlias(), new HashSet<String>());
+            });
+            for (RoleAssignment ra : ras) {
+                if (curationRoles.contains(ra.getRole())) {
+                    assignees.get(ra.getRole().getAlias()).add(ra.getAssigneeIdentifier());
+                }
+            }
+            DatasetVersion dsv = dataset.getLatestVersion();
+            String name = "\"" + dataset.getCurrentName().replace("\"", "\"\"") + "\"";
+
+            List<CurationStatus> statuses = includeHistory ? dsv.getCurationStatuses() : Collections.singletonList(dsv.getCurrentCurationStatus());
+
+            for (CurationStatus status : statuses) {
+                String label = BundleUtil.getStringFromBundle("dataset.curationstatus.none");
+                String statusCreator = BundleUtil.getStringFromBundle("dataset.curationstatus.none");
+                String createTime = BundleUtil.getStringFromBundle("dataset.curationstatus.none");
+
+                if (status != null) {
+                    if (Strings.isNotBlank(status.getLabel())) {
+                        label = status.getLabel();
+                    }
+                    if (status.getAuthenticatedUser() != null) {
+                        statusCreator = status.getAuthenticatedUser().getUserIdentifier();
+                    }
+                    if (status.getCreateTime() != null) {
+                        createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(status.getCreateTime());
+                    }
+                }
+                String url = systemConfig.getDataverseSiteUrl() + dataset.getTargetUrl() + dataset.getGlobalId().asString();
+                String date = new SimpleDateFormat("yyyy-MM-dd").format(dsv.getCreateTime());
+                String modDate = new SimpleDateFormat("yyyy-MM-dd").format(dsv.getLastUpdateTime());
+                String hyperlink = "\"=HYPERLINK(\"\"" + url + "\"\",\"\"" + name + "\"\")\"";
+                List<String> sList = new ArrayList<String>();
+                assignees.entrySet().forEach(e -> sList.add(e.getValue().size() == 0 ? "" : String.join(";", e.getValue())));
+                csvSB.append("\n").append(String.join(",", hyperlink, date, modDate, (status == null) ? "" : label, statusCreator, createTime, String.join(",", sList)));
+            }
+        }
+        csvSB.append("\n");
+        return ok(csvSB.toString(), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "datasets.status.csv");
+    }
+
+    // APIs to manage archival status
+
+    @GET
+    @AuthRequired
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("/{id}/{version}/archivalStatus")
+    public Response getDatasetVersionArchivalStatus(@Context ContainerRequestContext crc,
+                                                    @PathParam("id") String datasetId,
+                                                    @PathParam("version") String versionNumber,
+                                                    @Context UriInfo uriInfo,
+                                                    @Context HttpHeaders headers) {
+
+        try {
+            AuthenticatedUser au = getRequestAuthenticatedUserOrDie(crc);
+            if (!au.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+            DataverseRequest req = createDataverseRequest(au);
+            DatasetVersion dsv = getDatasetVersionOrDie(req, versionNumber, findDatasetOrDie(datasetId), uriInfo,
+                    headers);
+
+            if (dsv.getArchivalCopyLocation() == null) {
+                return error(Status.NOT_FOUND, "This dataset version has not been archived");
+            } else {
+                JsonObject status = JsonUtil.getJsonObject(dsv.getArchivalCopyLocation());
+                return ok(status);
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Path("/{id}/{version}/archivalStatus")
+    public Response setDatasetVersionArchivalStatus(@Context ContainerRequestContext crc,
+                                                    @PathParam("id") String datasetId,
+                                                    @PathParam("version") String versionNumber,
+                                                    String newStatus,
+                                                    @Context UriInfo uriInfo,
+                                                    @Context HttpHeaders headers) {
+
+        logger.fine(newStatus);
+        try {
+            AuthenticatedUser au = getRequestAuthenticatedUserOrDie(crc);
+
+            if (!au.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+
+            //Verify we have valid json after removing any HTML tags (the status gets displayed in the UI, so we want plain text).
+            JsonObject update= JsonUtil.getJsonObject(MarkupChecker.stripAllTags(newStatus));
+
+            if (update.containsKey(DatasetVersion.ARCHIVAL_STATUS) && update.containsKey(DatasetVersion.ARCHIVAL_STATUS_MESSAGE)) {
+                String status = update.getString(DatasetVersion.ARCHIVAL_STATUS);
+                if (status.equals(DatasetVersion.ARCHIVAL_STATUS_PENDING) || status.equals(DatasetVersion.ARCHIVAL_STATUS_FAILURE)
+                        || status.equals(DatasetVersion.ARCHIVAL_STATUS_SUCCESS)) {
+
+                    DataverseRequest req = createDataverseRequest(au);
+                    DatasetVersion dsv = getDatasetVersionOrDie(req, versionNumber, findDatasetOrDie(datasetId),
+                            uriInfo, headers);
+
+                    if (dsv == null) {
+                        return error(Status.NOT_FOUND, "Dataset version not found");
+                    }
+                    if (isSingleVersionArchiving()) {
+                        for (DatasetVersion version : dsv.getDataset().getVersions()) {
+                            if ((!dsv.equals(version)) && (version.getArchivalCopyLocation() != null)) {
+                                return error(Status.CONFLICT, "Dataset already archived.");
+                            }
+                        }
+                    }
+
+                    dsv.setArchivalCopyLocation(JsonUtil.prettyPrint(update));
+                    dsv = datasetversionService.merge(dsv);
+                    logger.fine("status now: " + dsv.getArchivalCopyLocationStatus());
+                    logger.fine("message now: " + dsv.getArchivalCopyLocationMessage());
+
+                    return ok("Status updated");
+                }
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        } catch (JsonException| IllegalStateException ex) {
+            return error(Status.BAD_REQUEST, "Unable to parse provided JSON");
+        }
+        return error(Status.BAD_REQUEST, "Unacceptable status format");
+    }
+
+    @DELETE
+    @AuthRequired
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("/{id}/{version}/archivalStatus")
+    public Response deleteDatasetVersionArchivalStatus(@Context ContainerRequestContext crc,
+                                                       @PathParam("id") String datasetId,
+                                                       @PathParam("version") String versionNumber,
+                                                       @Context UriInfo uriInfo,
+                                                       @Context HttpHeaders headers) {
+
+        try {
+            AuthenticatedUser au = getRequestAuthenticatedUserOrDie(crc);
+            if (!au.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+
+            DataverseRequest req = createDataverseRequest(au);
+            DatasetVersion dsv = getDatasetVersionOrDie(req, versionNumber, findDatasetOrDie(datasetId), uriInfo,
+                    headers);
+            if (dsv == null) {
+                return error(Status.NOT_FOUND, "Dataset version not found");
+            }
+            dsv.setArchivalCopyLocation(null);
+            dsv = datasetversionService.merge(dsv);
+
+            return ok("Status deleted");
+
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    private boolean isSingleVersionArchiving() {
+        String className = settingsService.getValueForKey(SettingsServiceBean.Key.ArchiverClassName, null);
+        if (className != null) {
+            Class<? extends AbstractSubmitToArchiveCommand> clazz;
+            try {
+                clazz =  Class.forName(className).asSubclass(AbstractSubmitToArchiveCommand.class);
+                return ArchiverUtil.onlySingleVersionArchiving(clazz, settingsService);
+            } catch (ClassNotFoundException e) {
+                logger.warning(":ArchiverClassName does not refer to a known Archiver");
+            } catch (ClassCastException cce) {
+                logger.warning(":ArchiverClassName does not refer to an Archiver class");
+            }
+        }
+        return false;
+    }
+
+    // This method provides a callback for an external tool to retrieve it's
+    // parameters/api URLs. If the request is authenticated, e.g. by it being
+    // signed, the api URLs will be signed. If a guest request is made, the URLs
+    // will be plain/unsigned.
+    // This supports the cases where a tool is accessing a restricted resource (e.g.
+    // for a draft dataset), or public case.
+    @GET
+    @AuthRequired
+    @Path("{id}/versions/{version}/toolparams/{tid}")
+    public Response getExternalToolDVParams(@Context ContainerRequestContext crc,
+                                            @PathParam("tid") long externalToolId,
+                                            @PathParam("id") String datasetId,
+                                            @PathParam("version") String version,
+                                            @QueryParam(value = "locale") String locale) {
+        try {
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            DatasetVersion target = getDatasetVersionOrDie(req, version, findDatasetOrDie(datasetId), null, null);
+            if (target == null) {
+                return error(BAD_REQUEST, "DatasetVersion not found.");
+            }
+
+            ExternalTool externalTool = externalToolService.findById(externalToolId);
+            if(externalTool==null) {
+                return error(BAD_REQUEST, "External tool not found.");
+            }
+            if (!ExternalTool.Scope.DATASET.equals(externalTool.getScope())) {
+                return error(BAD_REQUEST, "External tool does not have dataset scope.");
+            }
+            ApiToken apiToken = null;
+            User u = getRequestUser(crc);
+            apiToken = authSvc.getValidApiTokenForUser(u);
+
+            URLTokenUtil eth = new ExternalToolHandler(externalTool, target.getDataset(), apiToken, locale);
+            return ok(eth.createPostBody(eth.getParams(JsonUtil.getJsonObject(externalTool.getToolParameters())), JsonUtil.getJsonArray(externalTool.getAllowedApiCalls())));
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @GET
+    @Path("summaryFieldNames")
+    public Response getDatasetSummaryFieldNames() {
+        String customFieldNames = settingsService.getValueForKey(SettingsServiceBean.Key.CustomDatasetSummaryFields);
+        String[] fieldNames = DatasetUtil.getDatasetSummaryFieldNames(customFieldNames);
+        JsonArrayBuilder fieldNamesArrayBuilder = Json.createArrayBuilder();
+        for (String fieldName : fieldNames) {
+            fieldNamesArrayBuilder.add(fieldName);
+        }
+        return ok(fieldNamesArrayBuilder);
+    }
+
+    @GET
+    @Path("privateUrlDatasetVersion/{privateUrlToken}")
+    public Response getPrivateUrlDatasetVersion(@PathParam("privateUrlToken") String privateUrlToken, @QueryParam("returnOwners") boolean returnOwners) {
+        PrivateUrlUser privateUrlUser = privateUrlService.getPrivateUrlUserFromToken(privateUrlToken);
+        if (privateUrlUser == null) {
+            return notFound("Private URL user not found");
+        }
+        boolean isAnonymizedAccess = privateUrlUser.hasAnonymizedAccess();
+        String anonymizedFieldTypeNames = settingsSvc.getValueForKey(SettingsServiceBean.Key.AnonymizedFieldTypeNames);
+        if(isAnonymizedAccess && anonymizedFieldTypeNames == null) {
+            throw new NotAcceptableException("Anonymized Access not enabled");
+        }
+        DatasetVersion dsv = privateUrlService.getDraftDatasetVersionFromToken(privateUrlToken);
+        if (dsv == null || dsv.getId() == null) {
+            return notFound("Dataset version not found");
+        }
+        JsonObjectBuilder responseJson;
+        if (isAnonymizedAccess) {
+            List<String> anonymizedFieldTypeNamesList = new ArrayList<>(Arrays.asList(anonymizedFieldTypeNames.split(",\\s")));
+            responseJson = json(dsv, anonymizedFieldTypeNamesList, true, returnOwners);
+        } else {
+            responseJson = json(dsv, null, true, returnOwners);
+        }
+        return ok(responseJson);
+    }
+
+    @GET
+    @Path("previewUrlDatasetVersion/{previewUrlToken}")
+    public Response getPreviewUrlDatasetVersion(@PathParam("previewUrlToken") String previewUrlToken, @QueryParam("returnOwners") boolean returnOwners) {
+        PrivateUrlUser privateUrlUser = privateUrlService.getPrivateUrlUserFromToken(previewUrlToken);
+        if (privateUrlUser == null) {
+            return notFound("Private URL user not found");
+        }
+        boolean isAnonymizedAccess = privateUrlUser.hasAnonymizedAccess();
+        String anonymizedFieldTypeNames = settingsSvc.getValueForKey(SettingsServiceBean.Key.AnonymizedFieldTypeNames);
+        if(isAnonymizedAccess && anonymizedFieldTypeNames == null) {
+            throw new NotAcceptableException("Anonymized Access not enabled");
+        }
+        DatasetVersion dsv = privateUrlService.getDraftDatasetVersionFromToken(previewUrlToken);
+        if (dsv == null || dsv.getId() == null) {
+            return notFound("Dataset version not found");
+        }
+        JsonObjectBuilder responseJson;
+        if (isAnonymizedAccess) {
+            List<String> anonymizedFieldTypeNamesList = new ArrayList<>(Arrays.asList(anonymizedFieldTypeNames.split(",\\s")));
+            responseJson = json(dsv, anonymizedFieldTypeNamesList, true, returnOwners);
+        } else {
+            responseJson = json(dsv, null, true, returnOwners);
+        }
+        return ok(responseJson);
+    }
+
+
+    @GET
+    @Path("privateUrlDatasetVersion/{privateUrlToken}/citation")
+    public Response getPrivateUrlDatasetVersionCitation(@PathParam("privateUrlToken") String privateUrlToken) {
+        PrivateUrlUser privateUrlUser = privateUrlService.getPrivateUrlUserFromToken(privateUrlToken);
+        if (privateUrlUser == null) {
+            return notFound("Private URL user not found");
+        }
+        DatasetVersion dsv = privateUrlService.getDraftDatasetVersionFromToken(privateUrlToken);
+        return (dsv == null || dsv.getId() == null) ? notFound("Dataset version not found")
+                : ok(dsv.getCitation(true, privateUrlUser.hasAnonymizedAccess()));
+    }
+
+    @GET
+    @Path("previewUrlDatasetVersion/{previewUrlToken}/citation")
+    public Response getPreviewUrlDatasetVersionCitation(@PathParam("previewUrlToken") String previewUrlToken) {
+        PrivateUrlUser privateUrlUser = privateUrlService.getPrivateUrlUserFromToken(previewUrlToken);
+        if (privateUrlUser == null) {
+            return notFound("Private URL user not found");
+        }
+        DatasetVersion dsv = privateUrlService.getDraftDatasetVersionFromToken(previewUrlToken);
+        return (dsv == null || dsv.getId() == null) ? notFound("Dataset version not found")
+                : ok(dsv.getCitation(DataCitation.Format.Internal, true, privateUrlUser.hasAnonymizedAccess()));
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/versions/{versionId}/citation")
+    public Response getDatasetVersionInternalCitation(@Context ContainerRequestContext crc,
+            @PathParam("id") String datasetId, @PathParam("versionId") String versionId,
+            @QueryParam("includeDeaccessioned") boolean includeDeaccessioned, @Context UriInfo uriInfo,
+            @Context HttpHeaders headers) {
+        try {
+            return ok(getDatasetVersionCitationAsString(crc, datasetId, versionId, DataCitation.Format.Internal, includeDeaccessioned,
+                    uriInfo, headers));
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    /**
+     * Returns one of the DataCitation.Format types as a raw file download (not wrapped in our ok json)
+     * @param crc
+     * @param datasetId
+     * @param versionId
+     * @param formatString
+     * @param includeDeaccessioned
+     * @param uriInfo
+     * @param headers
+     * @return
+     */
+    @GET
+    @AuthRequired
+    @Path("{id}/versions/{versionId}/citation/{format}")
+    public Response getDatasetVersionCitation(@Context ContainerRequestContext crc, @PathParam("id") String datasetId,
+            @PathParam("versionId") String versionId, @PathParam("format") String formatString,
+            @QueryParam("includeDeaccessioned") boolean includeDeaccessioned, @Context UriInfo uriInfo,
+            @Context HttpHeaders headers) {
+
+        DataCitation.Format format;
+        try {
+            format = DataCitation.Format.valueOf(formatString);
+        } catch (IllegalArgumentException e) {
+            return badRequest(BundleUtil.getStringFromBundle("datasets.api.citation.invalidFormat"));
+        }
+        try {
+            //ToDo - add ContentDisposition to support downloading with a file name
+            return Response.ok().type(DataCitation.getCitationFormatMediaType(format, true)).entity(
+                    getDatasetVersionCitationAsString(crc, datasetId, versionId, format, includeDeaccessioned, uriInfo, headers))
+                    .build();
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    public String getDatasetVersionCitationAsString(ContainerRequestContext crc, String datasetId, String versionId,
+            DataCitation.Format format, boolean includeDeaccessioned, UriInfo uriInfo, HttpHeaders headers)
+            throws IllegalArgumentException, WrappedResponse {
+        boolean checkFilePerms = false;
+
+        DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+        DatasetVersion dsv = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers,
+                includeDeaccessioned, checkFilePerms);
+        return dsv.getCitation(format, true, false);
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{id}/versions/{versionId}/deaccession")
+    public Response deaccessionDataset(@Context ContainerRequestContext crc, @PathParam("id") String datasetId, @PathParam("versionId") String versionId, String jsonBody, @Context UriInfo uriInfo, @Context HttpHeaders headers) {
+        if (DS_VERSION_DRAFT.equals(versionId) || DS_VERSION_LATEST.equals(versionId)) {
+            return badRequest(BundleUtil.getStringFromBundle("datasets.api.deaccessionDataset.invalid.version.identifier.error", List.of(DS_VERSION_LATEST_PUBLISHED)));
+        }
+        return response(req -> {
+            DatasetVersion datasetVersion = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers);
+            try {
+                JsonObject jsonObject = JsonUtil.getJsonObject(jsonBody);
+                datasetVersion.setDeaccessionNote(jsonObject.getString("deaccessionReason"));
+                String deaccessionForwardURL = jsonObject.getString("deaccessionForwardURL", null);
+                if (deaccessionForwardURL != null) {
+                    try {
+                        datasetVersion.setDeaccessionLink(deaccessionForwardURL);
+                    } catch (IllegalArgumentException iae) {
+                        return badRequest(BundleUtil.getStringFromBundle("datasets.api.deaccessionDataset.invalid.forward.url", List.of(iae.getMessage())));
+                    }
+                }
+                execCommand(new DeaccessionDatasetVersionCommand(req, datasetVersion, false));
+
+                return ok("Dataset " +
+                        (":persistentId".equals(datasetId) ? datasetVersion.getDataset().getGlobalId().asString() : datasetId) +
+                        " deaccessioned for version " + versionId);
+            } catch (JsonParsingException jpe) {
+                return error(Response.Status.BAD_REQUEST, "Error parsing Json: " + jpe.getMessage());
+            }
+        }, getRequestUser(crc));
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/guestbookEntryAtRequest")
+    public Response getGuestbookEntryOption(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+                                            @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "No such dataset");
+        }
+        String gbAtRequest = dataset.getGuestbookEntryAtRequest();
+        if(gbAtRequest == null || gbAtRequest.equals(DvObjectContainer.UNDEFINED_CODE)) {
+            return ok("Not set on dataset, using the default: " + dataset.getEffectiveGuestbookEntryAtRequest());
+        }
+        return ok(dataset.getEffectiveGuestbookEntryAtRequest());
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{identifier}/guestbookEntryAtRequest")
+    public Response setguestbookEntryAtRequest(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+                                               boolean gbAtRequest,
+                                               @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+
+        // Superuser-only:
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.BAD_REQUEST, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "No such dataset");
+        }
+        Optional<Boolean> gbAtRequestOpt = JvmSettings.GUESTBOOK_AT_REQUEST.lookupOptional(Boolean.class);
+        if (!gbAtRequestOpt.isPresent()) {
+            return error(Response.Status.FORBIDDEN, "Guestbook Entry At Request cannot be set. This server is not configured to allow it.");
+        }
+        String choice = Boolean.valueOf(gbAtRequest).toString();
+        dataset.setGuestbookEntryAtRequest(choice);
+        datasetService.merge(dataset);
+        return ok("Guestbook Entry At Request set to: " + choice);
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{identifier}/guestbookEntryAtRequest")
+    public Response resetGuestbookEntryAtRequest(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+                                                 @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+
+        // Superuser-only:
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.BAD_REQUEST, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "No such dataset");
+        }
+
+        dataset.setGuestbookEntryAtRequest(DvObjectContainer.UNDEFINED_CODE);
+        datasetService.merge(dataset);
+        return ok("Guestbook Entry At Request reset to default: " + dataset.getEffectiveGuestbookEntryAtRequest());
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/userPermissions")
+    public Response getUserPermissionsOnDataset(@Context ContainerRequestContext crc, @PathParam("id") String datasetId) {
+        Dataset dataset;
+        try {
+            dataset = findDatasetOrDie(datasetId);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        User requestUser = getRequestUser(crc);
+        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+        jsonObjectBuilder.add("canViewUnpublishedDataset", permissionService.userOn(requestUser, dataset).has(Permission.ViewUnpublishedDataset));
+        jsonObjectBuilder.add("canEditDataset", permissionService.userOn(requestUser, dataset).has(Permission.EditDataset));
+        jsonObjectBuilder.add("canPublishDataset", permissionService.userOn(requestUser, dataset).has(Permission.PublishDataset));
+        jsonObjectBuilder.add("canManageDatasetPermissions", permissionService.userOn(requestUser, dataset).has(Permission.ManageDatasetPermissions));
+        jsonObjectBuilder.add("canDeleteDatasetDraft", permissionService.userOn(requestUser, dataset).has(Permission.DeleteDatasetDraft));
+        return ok(jsonObjectBuilder);
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/versions/{versionId}/canDownloadAtLeastOneFile")
+    public Response getCanDownloadAtLeastOneFile(@Context ContainerRequestContext crc,
+                                                 @PathParam("id") String datasetId,
+                                                 @PathParam("versionId") String versionId,
+                                                 @QueryParam("includeDeaccessioned") boolean includeDeaccessioned,
+                                                 @Context UriInfo uriInfo,
+                                                 @Context HttpHeaders headers) {
+        return response(req -> {
+            DatasetVersion datasetVersion = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers, includeDeaccessioned);
+            return ok(permissionService.canDownloadAtLeastOneFile(req, datasetVersion));
+        }, getRequestUser(crc));
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{identifier}/pidReconcile")
+    public Response reconcilePid(@Context ContainerRequestContext crc, @PathParam("identifier") String datasetId) throws WrappedResponse {
+
+        // Superuser-only:
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.UNAUTHORIZED, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        Dataset dataset;
+        PidProvider pidProvider;
+        try {
+            dataset = findDatasetOrDie(datasetId);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "No such dataset");
+        }
+        return response(req -> {
+            execCommand(new ReconcileDatasetPidCommand(req, dataset, dataset.getEffectivePidGenerator()));
+            return ok(dataset.getGlobalId().toString());
+        }, getRequestUser(crc));
+
+    }
+    /**
+     * Get the PidProvider that will be used for generating new DOIs in this dataset
+     *
+     * @return - the id of the effective PID generator for the given dataset
+     * @throws WrappedResponse
+     */
+    @GET
+    @AuthRequired
+    @Path("{identifier}/pidGenerator")
+    public Response getPidGenerator(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+            @Context HttpHeaders headers) throws WrappedResponse {
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "No such dataset");
+        }
+        PidProvider pidProvider = dataset.getEffectivePidGenerator();
+        if(pidProvider == null) {
+            //This is basically a config error, e.g. if a valid pid provider was removed after this dataset used it
+            return error(Response.Status.NOT_FOUND, BundleUtil.getStringFromBundle("datasets.api.pidgenerator.notfound"));
+        }
+        String pidGeneratorId = pidProvider.getId();
+        return ok(pidGeneratorId);
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{identifier}/pidGenerator")
+    public Response setPidGenerator(@Context ContainerRequestContext crc, @PathParam("identifier") String datasetId,
+            String generatorId, @Context HttpHeaders headers) throws WrappedResponse {
+
+        // Superuser-only:
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.UNAUTHORIZED, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(datasetId);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "No such dataset");
+        }
+        if (PidUtil.getManagedProviderIds().contains(generatorId)) {
+            dataset.setPidGeneratorId(generatorId);
+            datasetService.merge(dataset);
+            return ok("PID Generator set to: " + generatorId);
+        } else {
+            return error(Response.Status.NOT_FOUND, "No PID Generator found for the give id");
+        }
+
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{identifier}/pidGenerator")
+    public Response resetPidGenerator(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+            @Context HttpHeaders headers) throws WrappedResponse {
+
+        // Superuser-only:
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.BAD_REQUEST, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(dvIdtf);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.NOT_FOUND, "No such dataset");
+        }
+
+        dataset.setPidGenerator(null);
+        datasetService.merge(dataset);
+        return ok("Pid Generator reset to default: " + dataset.getEffectivePidGenerator().getId());
+    }
+
+    @GET
+    @Path("datasetTypes")
+    public Response getDatasetTypes() {
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        for (DatasetType datasetType : datasetTypeSvc.listAll()) {
+            jab.add(datasetType.toJson());
+        }
+        return ok(jab);
+    }
+
+    @GET
+    @Path("datasetTypes/{idOrName}")
+    public Response getDatasetTypes(@PathParam("idOrName") String idOrName) {
+        DatasetType datasetType = null;
+        if (StringUtils.isNumeric(idOrName)) {
+            try {
+                long id = Long.parseLong(idOrName);
+                datasetType = datasetTypeSvc.getById(id);
+            } catch (NumberFormatException ex) {
+                return error(NOT_FOUND, "Could not find a dataset type with id " + idOrName);
+            }
+        } else {
+            datasetType = datasetTypeSvc.getByName(idOrName);
+        }
+        if (datasetType != null) {
+            return ok(datasetType.toJson());
+        } else {
+            return error(NOT_FOUND, "Could not find a dataset type with name " + idOrName);
+        }
+    }
+
+    @POST
+    @AuthRequired
+    @Path("datasetTypes")
+    public Response addDatasetType(@Context ContainerRequestContext crc, String jsonIn) {
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.BAD_REQUEST, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        if (jsonIn == null || jsonIn.isEmpty()) {
+            return error(BAD_REQUEST, "JSON input was null or empty!");
+        }
+
+        String nameIn = null;
+
+        JsonArrayBuilder datasetTypesAfter = Json.createArrayBuilder();
+        List<MetadataBlock> metadataBlocksToSave = new ArrayList<>();
+        List<License> licensesToSave = new ArrayList<>();
+
+        try {
+            JsonObject datasetTypeObj =  JsonUtil.getJsonObject(jsonIn);
+            nameIn = datasetTypeObj.getString("name");
+
+            JsonArray arr = datasetTypeObj.getJsonArray("linkedMetadataBlocks");
+            if (arr != null && !arr.isEmpty()) {
+                for (JsonString jsonValue : arr.getValuesAs(JsonString.class)) {
+                    String name = jsonValue.getString();
+                    MetadataBlock metadataBlock = metadataBlockSvc.findByName(name);
+                    if (metadataBlock != null) {
+                        metadataBlocksToSave.add(metadataBlock);
+                        datasetTypesAfter.add(name);
+                    } else {
+                        String availableBlocks = metadataBlockSvc.listMetadataBlocks().stream().map(MetadataBlock::getName).collect(Collectors.joining(", "));
+                        return badRequest("Metadata block not found: " + name + ". Available metadata blocks: " + availableBlocks);
+                    }
+                }
+            }
+
+            arr = datasetTypeObj.getJsonArray("availableLicenses");
+            if (arr != null && !arr.isEmpty()) {
+                for (JsonString jsonValue : arr.getValuesAs(JsonString.class)) {
+                    String name = jsonValue.getString();
+                    License license = licenseSvc.getByNameOrUri(name);
+                    if (license != null) {
+                        licensesToSave.add(license);
+                    } else {
+                        String availableLicenses = licenseSvc.listAllActive().stream().map(License::getName).collect(Collectors.joining(", "));
+                        return badRequest("License not found: " + name + ". Available licenses: " + availableLicenses);
+                    }
+                }
+
+            }
+
+        } catch (JsonParsingException ex) {
+            return error(BAD_REQUEST, "Problem parsing supplied JSON: " + ex.getLocalizedMessage());
+        }
+        if (nameIn == null) {
+            return error(BAD_REQUEST, "A name for the dataset type is required");
+        }
+        if (StringUtils.isNumeric(nameIn)) {
+            // getDatasetTypes supports id or name so we don't want a names that looks like an id
+            return error(BAD_REQUEST, "The name of the type cannot be only digits.");
+        }
+
+        try {
+            DatasetType datasetType = new DatasetType();
+            datasetType.setName(nameIn);
+            datasetType.setMetadataBlocks(metadataBlocksToSave);
+            datasetType.setLicenses(licensesToSave);
+            DatasetType saved = datasetTypeSvc.save(datasetType);
+            Long typeId = saved.getId();
+            String name = saved.getName();
+            return ok(saved.toJson());
+        } catch (WrappedResponse ex) {
+            return error(BAD_REQUEST, ex.getMessage());
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("datasetTypes/{id}")
+    public Response deleteDatasetType(@Context ContainerRequestContext crc, @PathParam("id") String doomed) {
+        AuthenticatedUser user;
+        try {
+            user = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.BAD_REQUEST, "Authentication is required.");
+        }
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+
+        if (doomed == null || doomed.isEmpty()) {
+            throw new IllegalArgumentException("ID is required!");
+        }
+
+        long idToDelete;
+        try {
+            idToDelete = Long.parseLong(doomed);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("ID must be a number");
+        }
+
+        DatasetType datasetTypeToDelete = datasetTypeSvc.getById(idToDelete);
+        if (datasetTypeToDelete == null) {
+            return error(BAD_REQUEST, "Could not find dataset type with id " + idToDelete);
+        }
+
+        if (DatasetType.DEFAULT_DATASET_TYPE.equals(datasetTypeToDelete.getName())) {
+            return error(Status.FORBIDDEN, "You cannot delete the default dataset type: " + DatasetType.DEFAULT_DATASET_TYPE);
+        }
+
+        try {
+            int numDeleted = datasetTypeSvc.deleteById(idToDelete);
+            if (numDeleted == 1) {
+                return ok("deleted");
+            } else {
+                return error(BAD_REQUEST, "Something went wrong. Number of dataset types deleted: " + numDeleted);
+            }
+        } catch (WrappedResponse ex) {
+            return error(BAD_REQUEST, ex.getMessage());
+        }
+    }
+
+    @AuthRequired
+    @PUT
+    @Path("datasetTypes/{idOrName}")
+    public Response updateDatasetTypeLinksWithMetadataBlocks(@Context ContainerRequestContext crc, @PathParam("idOrName") String idOrName, String jsonBody) {
+        DatasetType datasetType = null;
+        if (StringUtils.isNumeric(idOrName)) {
+            try {
+                long id = Long.parseLong(idOrName);
+                datasetType = datasetTypeSvc.getById(id);
+            } catch (NumberFormatException ex) {
+                return error(NOT_FOUND, "Could not find a dataset type with id " + idOrName);
+            }
+        } else {
+            datasetType = datasetTypeSvc.getByName(idOrName);
+        }
+        JsonArrayBuilder datasetTypesBefore = Json.createArrayBuilder();
+        for (MetadataBlock metadataBlock : datasetType.getMetadataBlocks()) {
+            datasetTypesBefore.add(metadataBlock.getName());
+        }
+        JsonArrayBuilder datasetTypesAfter = Json.createArrayBuilder();
+        List<MetadataBlock> metadataBlocksToSave = new ArrayList<>();
+        if (jsonBody != null && !jsonBody.isEmpty()) {
+            JsonArray json = JsonUtil.getJsonArray(jsonBody);
+            for (JsonString jsonValue : json.getValuesAs(JsonString.class)) {
+                String name = jsonValue.getString();
+                MetadataBlock metadataBlock = metadataBlockSvc.findByName(name);
+                if (metadataBlock != null) {
+                    metadataBlocksToSave.add(metadataBlock);
+                    datasetTypesAfter.add(name);
+                } else {
+                    String availableBlocks = metadataBlockSvc.listMetadataBlocks().stream().map(MetadataBlock::getName).collect(Collectors.joining(", "));
+                    return badRequest("Metadata block not found: " + name + ". Available metadata blocks: " + availableBlocks);
+                }
+            }
+        }
+        try {
+            execCommand(new UpdateDatasetTypeLinksToMetadataBlocksCommand(createDataverseRequest(getRequestUser(crc)), datasetType, metadataBlocksToSave));
+            return ok(Json.createObjectBuilder()
+                    .add("linkedMetadataBlocks", Json.createObjectBuilder()
+                            .add("before", datasetTypesBefore)
+                            .add("after", datasetTypesAfter))
+            );
+
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @AuthRequired
+    @PUT
+    @Path("datasetTypes/{idOrName}/licenses")
+    public Response updateDatasetTypeWithLicenses(@Context ContainerRequestContext crc, @PathParam("idOrName") String idOrName, String jsonBody) {
+        DatasetType datasetType = null;
+        if (StringUtils.isNumeric(idOrName)) {
+            try {
+                long id = Long.parseLong(idOrName);
+                datasetType = datasetTypeSvc.getById(id);
+            } catch (NumberFormatException ex) {
+                return error(NOT_FOUND, "Could not find a dataset type with id " + idOrName);
+            }
+        } else {
+            datasetType = datasetTypeSvc.getByName(idOrName);
+        }
+        JsonArrayBuilder licensesBefore = Json.createArrayBuilder();
+        for (License license : datasetType.getLicenses()) {
+            licensesBefore.add(license.getName());
+        }
+        JsonArrayBuilder licensesAfter = Json.createArrayBuilder();
+        List<License> licensesToSave = new ArrayList<>();
+        if (jsonBody != null && !jsonBody.isEmpty()) {
+            JsonArray json = JsonUtil.getJsonArray(jsonBody);
+            for (JsonString jsonValue : json.getValuesAs(JsonString.class)) {
+                String name = jsonValue.getString();
+                License license = licenseSvc.getByNameOrUri(name);
+                if (license != null) {
+                    licensesToSave.add(license);
+                    licensesAfter.add(name);
+                } else {
+                    String availableLicenses = licenseSvc.listAllActive().stream().map(License::getName).collect(Collectors.joining(", "));
+                    return badRequest("License not found: " + name + ". Available licenses: " + availableLicenses);
+                }
+            }
+        }
+        try {
+            execCommand(new UpdateDatasetTypeAvailableLicensesCommand(createDataverseRequest(getRequestUser(crc)), datasetType, licensesToSave));
+            return ok(Json.createObjectBuilder()
+                    .add("availableLicenses", Json.createObjectBuilder()
+                            .add("before", licensesBefore)
+                            .add("after", licensesAfter))
+            );
+
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{id}/deleteFiles")
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response deleteDatasetFiles(@Context ContainerRequestContext crc, @PathParam("id") String id,
+            JsonArray fileIds) {
+        try {
+            getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+        return response(req -> {
+            Dataset dataset = findDatasetOrDie(id);
+            // Convert JsonArray to List<Long>
+            List<Long> fileIdList = new ArrayList<>();
+            for (JsonValue value : fileIds) {
+                fileIdList.add(((JsonNumber) value).longValue());
+            }
+            // Find the files to be deleted
+            List<FileMetadata> filesToDelete = dataset.getOrCreateEditVersion().getFileMetadatas().stream()
+                    .filter(fileMetadata -> fileIdList.contains(fileMetadata.getDataFile().getId()))
+                    .collect(Collectors.toList());
+
+            if (filesToDelete.isEmpty()) {
+                return badRequest("No files found with the provided IDs.");
+            }
+
+            if (filesToDelete.size() != fileIds.size()) {
+                return badRequest(
+                        "Some files listed are not present in the latest dataset version and cannot be deleted.");
+            }
+            try {
+
+                UpdateDatasetVersionCommand update_cmd = new UpdateDatasetVersionCommand(dataset, req, filesToDelete);
+
+                commandEngine.submit(update_cmd);
+                for (FileMetadata fm : filesToDelete) {
+                    DataFile dataFile = fm.getDataFile();
+                    boolean deletePhysicalFile = !dataFile.isReleased();
+                    if (deletePhysicalFile) {
+                        try {
+                            fileService.finalizeFileDelete(dataFile.getId(),
+                                    fileService.getPhysicalFileToDelete(dataFile));
+                        } catch (IOException ioex) {
+                            logger.warning("Failed to delete the physical file associated with the deleted datafile id="
+                                    + dataFile.getId() + ", storage location: "
+                                    + fileService.getPhysicalFileToDelete(dataFile));
+                        }
+                    }
+                }
+            } catch (PermissionException ex) {
+                return error(FORBIDDEN, "You do not have permission to delete files ont this dataset.");
+            } catch (CommandException ex) {
+                return error(BAD_REQUEST,
+                        "File deletes failed for dataset ID " + id + " (CommandException): " + ex.getMessage());
+            } catch (EJBException ex) {
+                return error(jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR,
+                        "File deletes failed for dataset ID " + id + "(EJBException): " + ex.getMessage());
+            }
+            return ok(fileIds.size() + " files deleted successfully");
+
+        }, getRequestUser(crc));
+    }
+
+@GET
+    @AuthRequired
+    @Path("{id}/versions/{versionId}/versionNote")
+    public Response getVersionCreationNote(@Context ContainerRequestContext crc, @PathParam("id") String datasetId, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+
+        return response(req -> {
+            DatasetVersion datasetVersion = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers);
+            String note = datasetVersion.getVersionNote();
+            if(note == null) {
+                return ok(Json.createObjectBuilder());
+            }
+            return ok(note);
+        }, getRequestUser(crc));
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{id}/versions/{versionId}/versionNote")
+    public Response addVersionNote(@Context ContainerRequestContext crc, @PathParam("id") String datasetId, @PathParam("versionId") String versionId, String note, @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+        if (!FeatureFlags.VERSION_NOTE.enabled()) {
+            return notFound(BundleUtil.getStringFromBundle("datasets.api.addVersionNote.notEnabled"));
+        }
+        if (!DS_VERSION_DRAFT.equals(versionId)) {
+            try {
+                AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+
+                if (!user.isSuperuser()) {
+                    return forbidden(BundleUtil.getStringFromBundle("datasets.api.addVersionNote.forbidden"));
+                }
+                return response(req -> {
+                    DatasetVersion datasetVersion = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers);
+                    datasetVersion.setVersionNote(note);
+                    execCommand(new UpdatePublishedDatasetVersionCommand(req, datasetVersion));
+                    return ok("Note added to version " + datasetVersion.getFriendlyVersionNumber());
+                }, getRequestUser(crc));
+            } catch (WrappedResponse ex) {
+                return ex.getResponse();
+            }
+        }
+        return response(req -> {
+            DatasetVersion datasetVersion = findDatasetOrDie(datasetId).getOrCreateEditVersion();
+            datasetVersion.setVersionNote(note);
+            execCommand(new UpdateDatasetVersionCommand(datasetVersion.getDataset(), req));
+
+            return ok("Note added");
+        }, getRequestUser(crc));
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{id}/versions/{versionId}/versionNote")
+    public Response deleteVersionNote(@Context ContainerRequestContext crc, @PathParam("id") String datasetId, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers) throws WrappedResponse {
+        if(!FeatureFlags.VERSION_NOTE.enabled()) {
+            return notFound(BundleUtil.getStringFromBundle("datasets.api.addVersionNote.notEnabled"));
+        }
+        if (!DS_VERSION_DRAFT.equals(versionId)) {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return forbidden(BundleUtil.getStringFromBundle("datasets.api.addVersionNote.forbidden"));
+            }
+        }
+        return response(req -> {
+            DatasetVersion datasetVersion = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId), uriInfo, headers);
+            datasetVersion.setVersionNote(null);
+            execCommand(new UpdateDatasetVersionCommand(datasetVersion.getDataset(), req));
+
+            return ok("Note deleted");
+        }, getRequestUser(crc));
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DataverseFeaturedItems.java b/src/main/java/edu/harvard/iq/dataverse/api/DataverseFeaturedItems.java
new file mode 100644
index 00000000000..30c3146fbfb
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DataverseFeaturedItems.java
@@ -0,0 +1,73 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.api.dto.UpdatedDataverseFeaturedItemDTO;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
+import edu.harvard.iq.dataverse.engine.command.impl.*;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import java.io.InputStream;
+import java.text.MessageFormat;
+
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+
+@Stateless
+@Path("dataverseFeaturedItems")
+public class DataverseFeaturedItems extends AbstractApiBean {
+
+    @Inject
+    DataverseFeaturedItemServiceBean dataverseFeaturedItemServiceBean;
+
+    @DELETE
+    @AuthRequired
+    @Path("{id}")
+    public Response deleteFeaturedItem(@Context ContainerRequestContext crc, @PathParam("id") Long id) {
+        try {
+            DataverseFeaturedItem dataverseFeaturedItem = dataverseFeaturedItemServiceBean.findById(id);
+            if (dataverseFeaturedItem == null) {
+                throw new WrappedResponse(error(Response.Status.NOT_FOUND, MessageFormat.format(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notFound"), id)));
+            }
+            execCommand(new DeleteDataverseFeaturedItemCommand(createDataverseRequest(getRequestUser(crc)), dataverseFeaturedItem));
+            return ok(MessageFormat.format(BundleUtil.getStringFromBundle("dataverseFeaturedItems.delete.successful"), id));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Path("{id}")
+    public Response updateFeaturedItem(@Context ContainerRequestContext crc,
+                                       @PathParam("id") Long id,
+                                       @FormDataParam("content") String content,
+                                       @FormDataParam("type") String type,
+                                       @FormDataParam("dvObjectIdentifier") String dvObjectIdtf,
+                                       @FormDataParam("displayOrder") int displayOrder,
+                                       @FormDataParam("keepFile") boolean keepFile,
+                                       @FormDataParam("file") InputStream imageFileInputStream,
+                                       @FormDataParam("file") FormDataContentDisposition contentDispositionHeader) {
+        try {
+            DataverseFeaturedItem dataverseFeaturedItem = dataverseFeaturedItemServiceBean.findById(id);
+            if (dataverseFeaturedItem == null) {
+                throw new WrappedResponse(error(Response.Status.NOT_FOUND, MessageFormat.format(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notFound"), id)));
+            }
+            DvObject dvObject = (dvObjectIdtf != null) ? findDvoByIdAndFeaturedItemTypeOrDie(dvObjectIdtf, type) : null;
+            UpdatedDataverseFeaturedItemDTO updatedDataverseFeaturedItemDTO = UpdatedDataverseFeaturedItemDTO.fromFormData(content, displayOrder, keepFile, imageFileInputStream, contentDispositionHeader, type, dvObject);
+            return ok(json(execCommand(new UpdateDataverseFeaturedItemCommand(createDataverseRequest(getRequestUser(crc)), dataverseFeaturedItem, updatedDataverseFeaturedItemDTO))));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
index bd5f17dcd75..ae82ff46522 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -1,22 +1,13 @@
 package edu.harvard.iq.dataverse.api;
 
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseFacet;
-import edu.harvard.iq.dataverse.DataverseContact;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
+import com.google.common.collect.Lists;
+import com.google.api.client.util.ArrayMap;
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.api.datadeposit.SwordServiceBean;
+import edu.harvard.iq.dataverse.api.dto.*;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
-import edu.harvard.iq.dataverse.DvObject;
-import edu.harvard.iq.dataverse.GlobalId;
-import edu.harvard.iq.dataverse.MetadataBlock;
-import edu.harvard.iq.dataverse.RoleAssignment;
-import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
-import edu.harvard.iq.dataverse.api.dto.ExplicitGroupDTO;
-import edu.harvard.iq.dataverse.api.dto.RoleAssignmentDTO;
-import edu.harvard.iq.dataverse.api.dto.RoleDTO;
+
 import edu.harvard.iq.dataverse.api.imports.ImportException;
 import edu.harvard.iq.dataverse.api.imports.ImportServiceBean;
 import edu.harvard.iq.dataverse.authorization.Permission;
@@ -26,83 +17,63 @@
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.dataverse.DataverseUtil;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.engine.command.impl.AddRoleAssigneesToExplicitGroupCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.AssignRoleCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.CreateDataverseCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.CreateExplicitGroupCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.CreateRoleCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteDataverseCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteDataverseLinkingDataverseCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteExplicitGroupCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetDataverseCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetDataverseStorageSizeCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetExplicitGroupCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.ImportDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.LinkDataverseCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.ListDataverseContentCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.ListExplicitGroupsCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.ListFacetsCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.ListMetadataBlocksCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.ListRoleAssignments;
-import edu.harvard.iq.dataverse.engine.command.impl.ListRolesCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.PublishDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.PublishDatasetResult;
-import edu.harvard.iq.dataverse.engine.command.impl.MoveDataverseCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.PublishDataverseCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.RemoveRoleAssigneesFromExplicitGroupCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.RevokeRoleCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseDefaultContributorRoleCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseMetadataBlocksCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateExplicitGroupCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.*;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.ConstraintViolationUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import static edu.harvard.iq.dataverse.util.StringUtil.nonEmpty;
-import edu.harvard.iq.dataverse.util.json.JsonParseException;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.brief;
-import java.io.StringReader;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.TreeSet;
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*;
+
+import edu.harvard.iq.dataverse.util.json.*;
+
+import java.io.*;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
-import javax.json.stream.JsonParsingException;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.toJsonArray;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.json.*;
+import jakarta.json.JsonValue.ValueType;
+import jakarta.json.stream.JsonParsingException;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+
 import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Optional;
-import javax.persistence.NoResultException;
+import java.text.SimpleDateFormat;
+import java.util.stream.Collectors;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.StreamingOutput;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import javax.xml.stream.XMLStreamException;
 
 /**
  * A REST API for dataverses.
@@ -114,6 +85,7 @@
 public class Dataverses extends AbstractApiBean {
 
     private static final Logger logger = Logger.getLogger(Dataverses.class.getCanonicalName());
+    private static final SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss");
 
     @EJB
     ExplicitGroupServiceBean explicitGroupSvc;
@@ -123,136 +95,406 @@ public class Dataverses extends AbstractApiBean {
     
     @EJB
     SettingsServiceBean settingsService;
+    
+    @EJB
+    GuestbookResponseServiceBean guestbookResponseService;
+    
+    @EJB
+    GuestbookServiceBean guestbookService;
+    
+    @EJB
+    DataverseServiceBean dataverseService;
+
+    @EJB
+    DataverseLinkingServiceBean linkingService;
+
+    @EJB
+    FeaturedDataverseServiceBean featuredDataverseService;
+
+    @EJB
+    SwordServiceBean swordService;
+
+    @EJB
+    PermissionServiceBean permissionService;
+
+    @EJB
+    DataverseFeaturedItemServiceBean dataverseFeaturedItemServiceBean;
 
     @POST
-    public Response addRoot(String body) {
+    @AuthRequired
+    public Response addRoot(@Context ContainerRequestContext crc, String body) {
         logger.info("Creating root dataverse");
-        return addDataverse(body, "");
+        return addDataverse(crc, body, "");
     }
 
     @POST
+    @AuthRequired
     @Path("{identifier}")
-    public Response addDataverse(String body, @PathParam("identifier") String parentIdtf) {
-
-        Dataverse d;
-        JsonObject dvJson;
-        try (StringReader rdr = new StringReader(body)) {
-            dvJson = Json.createReader(rdr).readObject();
-            d = jsonParser().parseDataverse(dvJson);
+    public Response addDataverse(@Context ContainerRequestContext crc, String body, @PathParam("identifier") String parentIdtf) {
+        Dataverse newDataverse;
+        try {
+            newDataverse = parseAndValidateAddDataverseRequestBody(body);
         } catch (JsonParsingException jpe) {
-            logger.log(Level.SEVERE, "Json: {0}", body);
-            return error(Status.BAD_REQUEST, "Error parsing Json: " + jpe.getMessage());
+            return error(Status.BAD_REQUEST, MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.create.error.jsonparse"), jpe.getMessage()));
         } catch (JsonParseException ex) {
-            logger.log(Level.SEVERE, "Error parsing dataverse from json: " + ex.getMessage(), ex);
-            return error(Response.Status.BAD_REQUEST,
-                    "Error parsing the POSTed json into a dataverse: " + ex.getMessage());
+            return error(Status.BAD_REQUEST, MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.create.error.jsonparsetodataverse"), ex.getMessage()));
         }
 
         try {
+            List<DataverseFieldTypeInputLevel> inputLevels = parseInputLevels(body, newDataverse);
+            List<MetadataBlock> metadataBlocks = parseMetadataBlocks(body);
+            List<DatasetFieldType> facets = parseFacets(body);
+
             if (!parentIdtf.isEmpty()) {
                 Dataverse owner = findDataverseOrDie(parentIdtf);
-                d.setOwner(owner);
+                newDataverse.setOwner(owner);
             }
 
-            // set the dataverse - contact relationship in the contacts
-            for (DataverseContact dc : d.getDataverseContacts()) {
-                dc.setDataverse(d);
-            }
+            AuthenticatedUser u = getRequestAuthenticatedUserOrDie(crc);
+            newDataverse = execCommand(new CreateDataverseCommand(newDataverse, createDataverseRequest(u), facets, inputLevels, metadataBlocks, true));
+            return created("/dataverses/" + newDataverse.getAlias(), json(newDataverse));
 
-            AuthenticatedUser u = findAuthenticatedUserOrDie();
-            d = execCommand(new CreateDataverseCommand(d, createDataverseRequest(u), null, null));
-            return created("/dataverses/" + d.getAlias(), json(d));
         } catch (WrappedResponse ww) {
-            Throwable cause = ww.getCause();
-            StringBuilder sb = new StringBuilder();
-            if (cause == null) {
-                return ww.refineResponse("cause was null!");
-            }
-            while (cause.getCause() != null) {
-                cause = cause.getCause();
-                if (cause instanceof ConstraintViolationException) {
-                    ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
-                    for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
-                        sb.append(" Invalid value: <<<").append(violation.getInvalidValue()).append(">>> for ")
-                                .append(violation.getPropertyPath()).append(" at ")
-                                .append(violation.getLeafBean()).append(" - ")
-                                .append(violation.getMessage());
-                    }
-                }
-            }
-            String error = sb.toString();
-            if (!error.isEmpty()) {
-                logger.log(Level.INFO, error);
-                return ww.refineResponse(error);
-            }
-            return ww.getResponse();
-
+            return handleWrappedResponse(ww);
         } catch (EJBException ex) {
-            Throwable cause = ex;
-            StringBuilder sb = new StringBuilder();
-            sb.append("Error creating dataverse.");
-            while (cause.getCause() != null) {
-                cause = cause.getCause();
-                if (cause instanceof ConstraintViolationException) {
-                    ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
-                    for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
-                        sb.append(" Invalid value: <<<").append(violation.getInvalidValue()).append(">>> for ")
-                                .append(violation.getPropertyPath()).append(" at ")
-                                .append(violation.getLeafBean()).append(" - ")
-                                .append(violation.getMessage());
-                    }
-                }
-            }
-            logger.log(Level.SEVERE, sb.toString());
-            return error(Response.Status.INTERNAL_SERVER_ERROR, "Error creating dataverse: " + sb.toString());
+            return handleEJBException(ex, "Error creating dataverse.");
         } catch (Exception ex) {
             logger.log(Level.SEVERE, "Error creating dataverse", ex);
             return error(Response.Status.INTERNAL_SERVER_ERROR, "Error creating dataverse: " + ex.getMessage());
+        }
+    }
+
+    private Dataverse parseAndValidateAddDataverseRequestBody(String body) throws JsonParsingException, JsonParseException {
+        try {
+            JsonObject addDataverseJson = JsonUtil.getJsonObject(body);
+            return jsonParser().parseDataverse(addDataverseJson);
+        } catch (JsonParsingException jpe) {
+            logger.log(Level.SEVERE, "Json: {0}", body);
+            throw jpe;
+        } catch (JsonParseException ex) {
+            logger.log(Level.SEVERE, "Error parsing dataverse from json: " + ex.getMessage(), ex);
+            throw ex;
+        }
+    }
 
+    @PUT
+    @AuthRequired
+    @Path("{identifier}")
+    public Response updateDataverse(@Context ContainerRequestContext crc, String body, @PathParam("identifier") String identifier) {
+        Dataverse dataverse;
+        try {
+            dataverse = findDataverseOrDie(identifier);
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+
+        DataverseDTO updatedDataverseDTO;
+        try {
+            updatedDataverseDTO = parseAndValidateUpdateDataverseRequestBody(body);
+        } catch (JsonParsingException jpe) {
+            return error(Status.BAD_REQUEST, MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.create.error.jsonparse"), jpe.getMessage()));
+        } catch (JsonParseException ex) {
+            return error(Status.BAD_REQUEST, MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.create.error.jsonparsetodataverse"), ex.getMessage()));
+        }
+
+        try {
+            List<DataverseFieldTypeInputLevel> inputLevels = parseInputLevels(body, dataverse);
+            List<MetadataBlock> metadataBlocks = parseMetadataBlocks(body);
+            List<DatasetFieldType> facets = parseFacets(body);
+
+            AuthenticatedUser u = getRequestAuthenticatedUserOrDie(crc);
+            dataverse = execCommand(new UpdateDataverseCommand(dataverse, facets, null, createDataverseRequest(u), inputLevels, metadataBlocks, updatedDataverseDTO));
+            return ok(json(dataverse));
+
+        } catch (WrappedResponse ww) {
+            return handleWrappedResponse(ww);
+        } catch (EJBException ex) {
+            return handleEJBException(ex, "Error updating dataverse.");
+        } catch (Exception ex) {
+            logger.log(Level.SEVERE, "Error updating dataverse", ex);
+            return error(Response.Status.INTERNAL_SERVER_ERROR, "Error updating dataverse: " + ex.getMessage());
         }
     }
 
+    private DataverseDTO parseAndValidateUpdateDataverseRequestBody(String body) throws JsonParsingException, JsonParseException {
+        try {
+            JsonObject updateDataverseJson = JsonUtil.getJsonObject(body);
+            return jsonParser().parseDataverseDTO(updateDataverseJson);
+        } catch (JsonParsingException jpe) {
+            logger.log(Level.SEVERE, "Json: {0}", body);
+            throw jpe;
+        } catch (JsonParseException ex) {
+            logger.log(Level.SEVERE, "Error parsing DataverseDTO from json: " + ex.getMessage(), ex);
+            throw ex;
+        }
+    }
+
+    /*
+    return null - ignore
+    return empty list - delete and inherit from parent
+    return non-empty list - update
+    */
+    private List<DataverseFieldTypeInputLevel> parseInputLevels(String body, Dataverse dataverse) throws WrappedResponse {
+        JsonObject metadataBlocksJson = getMetadataBlocksJson(body);
+        JsonArray inputLevelsArray = metadataBlocksJson != null ? metadataBlocksJson.getJsonArray("inputLevels") : null;
+
+        if (metadataBlocksJson != null && metadataBlocksJson.containsKey("inheritMetadataBlocksFromParent") && metadataBlocksJson.getBoolean("inheritMetadataBlocksFromParent")) {
+            return Lists.newArrayList(); // delete
+        }
+        return parseInputLevels(inputLevelsArray, dataverse);
+    }
+
+    /*
+    return null - ignore
+    return empty list - delete and inherit from parent
+    return non-empty list - update
+    */
+    private List<MetadataBlock> parseMetadataBlocks(String body) throws WrappedResponse {
+        JsonObject metadataBlocksJson = getMetadataBlocksJson(body);
+        JsonArray metadataBlocksArray = metadataBlocksJson != null ? metadataBlocksJson.getJsonArray("metadataBlockNames") : null;
+
+        if (metadataBlocksArray != null && metadataBlocksJson.containsKey("inheritMetadataBlocksFromParent") && metadataBlocksJson.getBoolean("inheritMetadataBlocksFromParent")) {
+            String errorMessage = MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.metadatablocks.error.containslistandinheritflag"), "metadataBlockNames", "inheritMetadataBlocksFromParent");
+            throw new WrappedResponse(badRequest(errorMessage));
+        }
+        if (metadataBlocksJson != null && metadataBlocksJson.containsKey("inheritMetadataBlocksFromParent") && metadataBlocksJson.getBoolean("inheritMetadataBlocksFromParent")) {
+            return Lists.newArrayList(); // delete and inherit from parent
+        }
+
+        return parseNewDataverseMetadataBlocks(metadataBlocksArray);
+    }
+
+    /*
+    return null - ignore
+    return empty list - delete and inherit from parent
+    return non-empty list - update
+    */
+    private List<DatasetFieldType> parseFacets(String body) throws WrappedResponse {
+        JsonObject metadataBlocksJson = getMetadataBlocksJson(body);
+        JsonArray facetsArray = metadataBlocksJson != null ? metadataBlocksJson.getJsonArray("facetIds") : null;
+
+        if (facetsArray != null && metadataBlocksJson.containsKey("inheritFacetsFromParent") && metadataBlocksJson.getBoolean("inheritFacetsFromParent")) {
+            String errorMessage = MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.metadatablocks.error.containslistandinheritflag"), "facetIds", "inheritFacetsFromParent");
+            throw new WrappedResponse(badRequest(errorMessage));
+        }
+
+        if (metadataBlocksJson != null && metadataBlocksJson.containsKey("inheritFacetsFromParent") && metadataBlocksJson.getBoolean("inheritFacetsFromParent")) {
+            return Lists.newArrayList(); // delete and inherit from parent
+        }
+
+        return parseFacets(facetsArray);
+    }
+
+    private JsonObject getMetadataBlocksJson(String body) {
+        JsonObject dataverseJson = JsonUtil.getJsonObject(body);
+        return dataverseJson.getJsonObject("metadataBlocks");
+    }
+
+    private Response handleWrappedResponse(WrappedResponse ww) {
+        String error = ConstraintViolationUtil.getErrorStringForConstraintViolations(ww.getCause());
+        if (!error.isEmpty()) {
+            logger.log(Level.INFO, error);
+            return ww.refineResponse(error);
+        }
+        return ww.getResponse();
+    }
+
+    private Response handleEJBException(EJBException ex, String action) {
+        Throwable cause = ex;
+        StringBuilder sb = new StringBuilder();
+        sb.append(action);
+        while (cause.getCause() != null) {
+            cause = cause.getCause();
+            if (cause instanceof ConstraintViolationException) {
+                sb.append(ConstraintViolationUtil.getErrorStringForConstraintViolations(cause));
+            }
+        }
+        logger.log(Level.SEVERE, sb.toString());
+        return error(Response.Status.INTERNAL_SERVER_ERROR, sb.toString());
+    }
+
+    private List<MetadataBlock> parseNewDataverseMetadataBlocks(JsonArray metadataBlockNamesArray) throws WrappedResponse {
+        if (metadataBlockNamesArray == null) {
+            return null;
+        }
+        List<MetadataBlock> selectedMetadataBlocks = new ArrayList<>();
+        for (JsonString metadataBlockName : metadataBlockNamesArray.getValuesAs(JsonString.class)) {
+            MetadataBlock metadataBlock = metadataBlockSvc.findByName(metadataBlockName.getString());
+            if (metadataBlock == null) {
+                String errorMessage = MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.metadatablocks.error.invalidmetadatablockname"), metadataBlockName);
+                throw new WrappedResponse(badRequest(errorMessage));
+            }
+            selectedMetadataBlocks.add(metadataBlock);
+        }
+
+        return selectedMetadataBlocks;
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{identifier}/validateDatasetJson")
+    @Consumes("application/json")
+    public Response validateDatasetJson(@Context ContainerRequestContext crc, String body, @PathParam("identifier") String idtf) {
+        User u = getRequestUser(crc);
+        try {
+            String validationMessage = execCommand(new ValidateDatasetJsonCommand(createDataverseRequest(u), findDataverseOrDie(idtf), body));
+            return ok(validationMessage);
+        } catch (WrappedResponse ex) {
+            Logger.getLogger(Dataverses.class.getName()).log(Level.SEVERE, null, ex);
+            return ex.getResponse();
+        }
+    }
+    
+    @GET
+    @AuthRequired
+    @Path("{identifier}/datasetSchema")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getDatasetSchema(@Context ContainerRequestContext crc, @PathParam("identifier") String idtf) {
+        User u = getRequestUser(crc);
+
+        try {
+            String datasetSchema = execCommand(new GetDatasetSchemaCommand(createDataverseRequest(u), findDataverseOrDie(idtf)));
+            JsonObject jsonObject = JsonUtil.getJsonObject(datasetSchema);
+            return Response.ok(jsonObject).build();
+        } catch (WrappedResponse ex) {
+            Logger.getLogger(Dataverses.class.getName()).log(Level.SEVERE, null, ex);
+            return ex.getResponse();
+        }
+    }
+            
+    
+
     @POST
+    @AuthRequired
     @Path("{identifier}/datasets")
-    public Response createDataset(String jsonBody, @PathParam("identifier") String parentIdtf) {
+    @Consumes("application/json")
+    public Response createDataset(@Context ContainerRequestContext crc, String jsonBody, @PathParam("identifier") String parentIdtf, @QueryParam("doNotValidate") String doNotValidateParam) {
         try {
-            User u = findUserOrDie();
+            logger.fine("Json is: " + jsonBody);
+            User u = getRequestUser(crc);
             Dataverse owner = findDataverseOrDie(parentIdtf);
             Dataset ds = parseDataset(jsonBody);
             ds.setOwner(owner);
+            // Will make validation happen always except for the (rare) occasion of all three conditions are true
+            boolean validate = ! ( u.isAuthenticated() && StringUtil.isTrue(doNotValidateParam) &&
+                JvmSettings.API_ALLOW_INCOMPLETE_METADATA.lookupOptional(Boolean.class).orElse(false) );
 
             if (ds.getVersions().isEmpty()) {
-                return badRequest("Please provide initial version in the dataset json");
+                return badRequest(BundleUtil.getStringFromBundle("dataverses.api.create.dataset.error.mustIncludeVersion"));
+            }
+            
+            if (!ds.getFiles().isEmpty() && !u.isSuperuser()){
+                return badRequest(BundleUtil.getStringFromBundle("dataverses.api.create.dataset.error.superuserFiles"));
             }
 
+            //Throw BadRequestException if metadataLanguage isn't compatible with setting
+            DataverseUtil.checkMetadataLangauge(ds, owner, settingsService.getBaseMetadataLanguageMap(null, true));
+
             // clean possible version metadata
             DatasetVersion version = ds.getVersions().get(0);
+
+            if (!validate && (version.getDatasetAuthors().isEmpty() || version.getDatasetAuthors().stream().anyMatch(a -> a.getName() == null || a.getName().isEmpty()))) {
+                return badRequest(BundleUtil.getStringFromBundle("dataverses.api.create.dataset.error.mustIncludeAuthorName"));
+            }
+
             version.setMinorVersionNumber(null);
             version.setVersionNumber(null);
             version.setVersionState(DatasetVersion.VersionState.DRAFT);
+            version.getTermsOfUseAndAccess().setFileAccessRequest(true);
+            version.getTermsOfUseAndAccess().setDatasetVersion(version);
 
             ds.setAuthority(null);
             ds.setIdentifier(null);
             ds.setProtocol(null);
             ds.setGlobalIdCreateTime(null);
+            Dataset managedDs;
+            try {
+                managedDs = execCommand(new CreateNewDatasetCommand(ds, createDataverseRequest(u), validate, true));
+            } catch (WrappedResponse ww) {
+                Throwable cause = ww.getCause();
+                StringBuilder sb = new StringBuilder();
+                if (cause == null) {
+                    return ww.refineResponse("cause was null!");
+                }
+                while (cause.getCause() != null) {
+                    cause = cause.getCause();
+                    if (cause instanceof ConstraintViolationException) {
+                        sb.append(ConstraintViolationUtil.getErrorStringForConstraintViolations(cause));
+                    }
+                }
+                String error = sb.toString();
+                if (!error.isEmpty()) {
+                    logger.log(Level.INFO, error);
+                    return ww.refineResponse(error);
+                }
+                return ww.getResponse();
+            }
+
+            return created("/datasets/" + managedDs.getId(),
+                    Json.createObjectBuilder()
+                            .add("id", managedDs.getId())
+                            .add("persistentId", managedDs.getGlobalId().asString())
+            );
+
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+    
+    @POST
+    @AuthRequired
+    @Path("{identifier}/datasets")
+    @Consumes("application/ld+json, application/json-ld")
+    public Response createDatasetFromJsonLd(@Context ContainerRequestContext crc, String jsonLDBody, @PathParam("identifier") String parentIdtf) {
+        try {
+            User u = getRequestUser(crc);
+            Dataverse owner = findDataverseOrDie(parentIdtf);
+            Dataset ds = new Dataset();
+
+            ds.setOwner(owner);
+            ds = JSONLDUtil.updateDatasetMDFromJsonLD(ds, jsonLDBody, metadataBlockSvc, datasetFieldSvc, false, false, licenseSvc, datasetTypeSvc);
+            
+            ds.setOwner(owner);
+
+            // clean possible dataset/version metadata
+            DatasetVersion version = ds.getVersions().get(0);
+            version.setMinorVersionNumber(null);
+            version.setVersionNumber(null);
+            version.setVersionState(DatasetVersion.VersionState.DRAFT);
+            version.getTermsOfUseAndAccess().setFileAccessRequest(true);
+            version.getTermsOfUseAndAccess().setDatasetVersion(version);
+
+            ds.setAuthority(null);
+            ds.setIdentifier(null);
+            ds.setProtocol(null);
+            ds.setGlobalIdCreateTime(null);
+            
+            //Throw BadRequestException if metadataLanguage isn't compatible with setting
+            DataverseUtil.checkMetadataLangauge(ds, owner, settingsService.getBaseMetadataLanguageMap(null, true));
 
             Dataset managedDs = execCommand(new CreateNewDatasetCommand(ds, createDataverseRequest(u)));
             return created("/datasets/" + managedDs.getId(),
                     Json.createObjectBuilder()
                             .add("id", managedDs.getId())
-                            .add("persistentId", managedDs.getGlobalIdString())
+                            .add("persistentId", managedDs.getGlobalId().asString())
             );
 
         } catch (WrappedResponse ex) {
             return ex.getResponse();
+        } catch (Exception ex) {
+            return error(Status.BAD_REQUEST, ex.getLocalizedMessage());
         }
     }
 
     @POST
+    @AuthRequired
     @Path("{identifier}/datasets/:import")
-    public Response importDataset(String jsonBody, @PathParam("identifier") String parentIdtf, @QueryParam("pid") String pidParam, @QueryParam("release") String releaseParam) {
+    public Response importDataset(@Context ContainerRequestContext crc, String jsonBody, @PathParam("identifier") String parentIdtf, @QueryParam("pid") String pidParam, @QueryParam("release") String releaseParam) {
         try {
-            User u = findUserOrDie();
+            User u = getRequestUser(crc);
+            if (!u.isSuperuser()) {
+                return error(Status.FORBIDDEN, "Not a superuser");
+            }
             Dataverse owner = findDataverseOrDie(parentIdtf);
             Dataset ds = parseDataset(jsonBody);
             ds.setOwner(owner);
@@ -261,6 +503,9 @@ public Response importDataset(String jsonBody, @PathParam("identifier") String p
                 return badRequest("Supplied json must contain a single dataset version.");
             }
 
+            //Throw BadRequestException if metadataLanguage isn't compatible with setting
+            DataverseUtil.checkMetadataLangauge(ds, owner, settingsService.getBaseMetadataLanguageMap(null, true));
+
             DatasetVersion version = ds.getVersions().get(0);
             if (version.getVersionState() == null) {
                 version.setVersionState(DatasetVersion.VersionState.DRAFT);
@@ -270,7 +515,7 @@ public Response importDataset(String jsonBody, @PathParam("identifier") String p
                 if (!GlobalId.verifyImportCharacters(pidParam)) {
                     return badRequest("PID parameter contains characters that are not allowed by the Dataverse application. On import, the PID must only contain characters specified in this regex: " + BundleUtil.getStringFromBundle("pid.allowedCharacters"));
                 }
-                Optional<GlobalId> maybePid = GlobalId.parse(pidParam);
+                Optional<GlobalId> maybePid = PidProvider.parse(pidParam);
                 if (maybePid.isPresent()) {
                     ds.setGlobalId(maybePid.get());
                 } else {
@@ -282,6 +527,12 @@ public Response importDataset(String jsonBody, @PathParam("identifier") String p
             if (ds.getIdentifier() == null) {
                 return badRequest("Please provide a persistent identifier, either by including it in the JSON, or by using the pid query parameter.");
             }
+
+            PidProvider pidProvider = PidUtil.getPidProvider(ds.getGlobalId().getProviderId());
+            if (pidProvider == null || !pidProvider.canManagePID()) {
+                return badRequest("Cannot import a dataset that has a PID that doesn't match the server's settings");
+            }
+
             boolean shouldRelease = StringUtil.isTrue(releaseParam);
             DataverseRequest request = createDataverseRequest(u);
 
@@ -301,7 +552,7 @@ public Response importDataset(String jsonBody, @PathParam("identifier") String p
             Dataset managedDs = execCommand(new ImportDatasetCommand(ds, request));
             JsonObjectBuilder responseBld = Json.createObjectBuilder()
                     .add("id", managedDs.getId())
-                    .add("persistentId", managedDs.getGlobalIdString());
+                    .add("persistentId", managedDs.getGlobalId().asString());
 
             if (shouldRelease) {
                 PublishDatasetResult res = execCommand(new PublishDatasetCommand(managedDs, request, false, shouldRelease));
@@ -317,10 +568,11 @@ public Response importDataset(String jsonBody, @PathParam("identifier") String p
 
     // TODO decide if I merge importddi with import just below (xml and json on same api, instead of 2 api)
     @POST
+    @AuthRequired
     @Path("{identifier}/datasets/:importddi")
-    public Response importDatasetDdi(String xml, @PathParam("identifier") String parentIdtf, @QueryParam("pid") String pidParam, @QueryParam("release") String releaseParam) throws ImportException {
+    public Response importDatasetDdi(@Context ContainerRequestContext crc, String xml, @PathParam("identifier") String parentIdtf, @QueryParam("pid") String pidParam, @QueryParam("release") String releaseParam) {
         try {
-            User u = findUserOrDie();
+            User u = getRequestUser(crc);
             if (!u.isSuperuser()) {
                 return error(Status.FORBIDDEN, "Not a superuser");
             }
@@ -328,16 +580,23 @@ public Response importDatasetDdi(String xml, @PathParam("identifier") String par
             Dataset ds = null;
             try {
                 ds = jsonParser().parseDataset(importService.ddiToJson(xml));
+                DataverseUtil.checkMetadataLangauge(ds, owner, settingsService.getBaseMetadataLanguageMap(null, true));
+            } catch (JsonParseException jpe) {
+                return badRequest("Error parsing data as Json: "+jpe.getMessage());
+            } catch (ImportException e) {
+                return badRequest("Invalid DOI found in the XML: "+e.getMessage());
+            } catch (XMLStreamException e) {
+                return badRequest("Invalid file content: "+e.getMessage());
             }
-            catch (JsonParseException jpe) {
-                return badRequest("Error parsing datas as Json: "+jpe.getMessage());
-            }
+
+            swordService.addDatasetSubjectIfMissing(ds.getLatestVersion());
+
             ds.setOwner(owner);
             if (nonEmpty(pidParam)) {
                 if (!GlobalId.verifyImportCharacters(pidParam)) {
                     return badRequest("PID parameter contains characters that are not allowed by the Dataverse application. On import, the PID must only contain characters specified in this regex: " + BundleUtil.getStringFromBundle("pid.allowedCharacters"));
                 }
-                Optional<GlobalId> maybePid = GlobalId.parse(pidParam);
+                Optional<GlobalId> maybePid = PidProvider.parse(pidParam);
                 if (maybePid.isPresent()) {
                     ds.setGlobalId(maybePid.get());
                 } else {
@@ -359,7 +618,7 @@ public Response importDatasetDdi(String xml, @PathParam("identifier") String par
 
             JsonObjectBuilder responseBld = Json.createObjectBuilder()
                     .add("id", managedDs.getId())
-                    .add("persistentId", managedDs.getGlobalIdString());
+                    .add("persistentId", managedDs.getGlobalId().toString());
 
             if (shouldRelease) {
                 DatasetVersion latestVersion = ds.getLatestVersion();
@@ -383,62 +642,239 @@ public Response importDatasetDdi(String xml, @PathParam("identifier") String par
         }
     }
 
+    @POST
+    @AuthRequired
+    @Path("{identifier}/datasets/:startmigration")
+    @Consumes("application/ld+json, application/json-ld")
+    public Response recreateDataset(@Context ContainerRequestContext crc, String jsonLDBody, @PathParam("identifier") String parentIdtf) {
+        try {
+            User u = getRequestUser(crc);
+            if (!u.isSuperuser()) {
+                return error(Status.FORBIDDEN, "Not a superuser");
+            }
+            Dataverse owner = findDataverseOrDie(parentIdtf);
+            
+            Dataset ds = new Dataset();
+
+            ds.setOwner(owner);
+            ds = JSONLDUtil.updateDatasetMDFromJsonLD(ds, jsonLDBody, metadataBlockSvc, datasetFieldSvc, false, true, licenseSvc, datasetTypeSvc);
+          //ToDo - verify PID is one Dataverse can manage (protocol/authority/shoulder match)
+          if (!PidUtil.getPidProvider(ds.getGlobalId().getProviderId()).canManagePID()) {
+              throw new BadRequestException(
+                      "Cannot recreate a dataset that has a PID that doesn't match the server's settings");
+          }
+            if(!dvObjectSvc.isGlobalIdLocallyUnique(ds.getGlobalId())) {
+                throw new BadRequestException("Cannot recreate a dataset whose PID is already in use");
+            }
+            
+            //Throw BadRequestException if metadataLanguage isn't compatible with setting
+            DataverseUtil.checkMetadataLangauge(ds, owner, settingsService.getBaseMetadataLanguageMap(null, true));
+
+
+            if (ds.getVersions().isEmpty()) {
+                return badRequest("Supplied json must contain a single dataset version.");
+            }
+
+            DatasetVersion version = ds.getVersions().get(0);
+            if (!version.isPublished()) {
+                throw new BadRequestException("Cannot recreate a dataset that hasn't been published.");
+            }
+            //While the datasetversion whose metadata we're importing has been published, we consider it in draft until the API caller adds files and then completes the migration
+            version.setVersionState(DatasetVersion.VersionState.DRAFT);
+
+            DataverseRequest request = createDataverseRequest(u);
+
+            Dataset managedDs = execCommand(new ImportDatasetCommand(ds, request));
+            JsonObjectBuilder responseBld = Json.createObjectBuilder()
+                    .add("id", managedDs.getId())
+                    .add("persistentId", managedDs.getGlobalId().toString());
+
+            return created("/datasets/" + managedDs.getId(), responseBld);
+
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+    
     private Dataset parseDataset(String datasetJson) throws WrappedResponse {
-        try (StringReader rdr = new StringReader(datasetJson)) {
-            return jsonParser().parseDataset(Json.createReader(rdr).readObject());
+        try {
+            return jsonParser().parseDataset(JsonUtil.getJsonObject(datasetJson));
         } catch (JsonParsingException | JsonParseException jpe) {
+            String message = jpe.getLocalizedMessage();
+            logger.log(Level.SEVERE, "Error parsing dataset JSON. message: {0}", message);
             logger.log(Level.SEVERE, "Error parsing dataset json. Json: {0}", datasetJson);
             throw new WrappedResponse(error(Status.BAD_REQUEST, "Error parsing Json: " + jpe.getMessage()));
         }
     }
 
     @GET
+    @AuthRequired
     @Path("{identifier}")
-    public Response viewDataverse(@PathParam("identifier") String idtf) {
-        return response(req -> ok(
-            json(execCommand(new GetDataverseCommand(req, findDataverseOrDie(idtf))),
-                settingsService.isTrueForKey(SettingsServiceBean.Key.ExcludeEmailFromExport, false)
-            )));
+    public Response getDataverse(@Context ContainerRequestContext crc, @PathParam("identifier") String idtf, @QueryParam("returnOwners") boolean returnOwners, @QueryParam("returnChildCount") boolean returnChildCount) {
+        return response(req -> {
+            Dataverse dataverse = execCommand(new GetDataverseCommand(req, findDataverseOrDie(idtf)));
+            boolean hideEmail = settingsService.isTrueForKey(SettingsServiceBean.Key.ExcludeEmailFromExport, false);
+            return ok(json(dataverse, hideEmail, returnOwners, returnChildCount ? dataverseService.getChildCount(dataverse) : null));
+        }, getRequestUser(crc));
     }
 
     @DELETE
+    @AuthRequired
     @Path("{identifier}")
-    public Response deleteDataverse(@PathParam("identifier") String idtf) {
+    public Response deleteDataverse(@Context ContainerRequestContext crc, @PathParam("identifier") String idtf) {
         return response(req -> {
             execCommand(new DeleteDataverseCommand(req, findDataverseOrDie(idtf)));
             return ok("Dataverse " + idtf + " deleted");
-        });
+        }, getRequestUser(crc));
+    }
+
+    /**
+     * Endpoint to change attributes of a Dataverse collection.
+     *
+     * @apiNote Example curl command:
+     *          <code>curl -X PUT -d "test" http://localhost:8080/api/dataverses/$ALIAS/attribute/alias</code>
+     *          to change the alias of the collection named $ALIAS to "test".
+     */
+    @PUT
+    @AuthRequired
+    @Path("{identifier}/attribute/{attribute}")
+    public Response updateAttribute(@Context ContainerRequestContext crc, @PathParam("identifier") String identifier,
+                                    @PathParam("attribute") String attribute, @QueryParam("value") String value) {
+        try {
+            Dataverse dataverse = findDataverseOrDie(identifier);
+            Object formattedValue = formatAttributeValue(attribute, value);
+            dataverse = execCommand(new UpdateDataverseAttributeCommand(createDataverseRequest(getRequestUser(crc)), dataverse, attribute, formattedValue));
+            return ok("Update successful", JsonPrinter.json(dataverse));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+
+    private Object formatAttributeValue(String attribute, String value) throws WrappedResponse {
+        if (List.of("filePIDsEnabled","requireFilesToPublishDataset").contains(attribute)) {
+            return parseBooleanOrDie(value);
+        }
+        return value;
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/inputLevels")
+    public Response getInputLevels(@Context ContainerRequestContext crc, @PathParam("identifier") String identifier) {
+        try {
+            Dataverse dataverse = findDataverseOrDie(identifier);
+            List<DataverseFieldTypeInputLevel> inputLevels = execCommand(new ListDataverseInputLevelsCommand(createDataverseRequest(getRequestUser(crc)), dataverse));
+            return ok(jsonDataverseInputLevels(inputLevels));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("{identifier}/inputLevels")
+    public Response updateInputLevels(@Context ContainerRequestContext crc, @PathParam("identifier") String identifier, String jsonBody) {
+        try {
+            Dataverse dataverse = findDataverseOrDie(identifier);
+            List<DataverseFieldTypeInputLevel> newInputLevels = parseInputLevels(Json.createReader(new StringReader(jsonBody)).readArray(), dataverse);
+            execCommand(new UpdateDataverseInputLevelsCommand(dataverse, createDataverseRequest(getRequestUser(crc)), newInputLevels));
+            return ok(BundleUtil.getStringFromBundle("dataverse.update.success"), JsonPrinter.json(dataverse));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+
+    private List<DataverseFieldTypeInputLevel> parseInputLevels(JsonArray inputLevelsArray, Dataverse dataverse) throws WrappedResponse {
+        if (inputLevelsArray == null) {
+            return null;
+        }
+        List<DataverseFieldTypeInputLevel> newInputLevels = new ArrayList<>();
+        for (JsonValue value : inputLevelsArray) {
+            JsonObject inputLevel = (JsonObject) value;
+            String datasetFieldTypeName = inputLevel.getString("datasetFieldTypeName");
+            DatasetFieldType datasetFieldType = datasetFieldSvc.findByName(datasetFieldTypeName);
+
+            if (datasetFieldType == null) {
+                String errorMessage = MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.inputlevels.error.invalidfieldtypename"), datasetFieldTypeName);
+                throw new WrappedResponse(badRequest(errorMessage));
+            }
+
+            boolean required = inputLevel.getBoolean("required");
+            boolean include = inputLevel.getBoolean("include");
+            Boolean displayOnCreate = null;
+            if(inputLevel.containsKey("displayOnCreate")) {
+                displayOnCreate = inputLevel.getBoolean("displayOnCreate", false);
+            }
+
+            if (required && !include) {
+                String errorMessage = MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.inputlevels.error.cannotberequiredifnotincluded"), datasetFieldTypeName);
+                throw new WrappedResponse(badRequest(errorMessage));
+            }
+
+            newInputLevels.add(new DataverseFieldTypeInputLevel(datasetFieldType, dataverse, required, include, displayOnCreate));
+        }
+
+        return newInputLevels;
+    }
+
+    private List<DatasetFieldType> parseFacets(JsonArray facetsArray) throws WrappedResponse {
+        if (facetsArray == null) {
+            return null;
+        }
+        List<DatasetFieldType> facets = new LinkedList<>();
+        for (JsonString facetId : facetsArray.getValuesAs(JsonString.class)) {
+            DatasetFieldType dsfType = findDatasetFieldType(facetId.getString());
+            if (dsfType == null) {
+                throw new WrappedResponse(badRequest(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.facets.error.fieldtypenotfound"), facetId.getString())));
+            } else if (!dsfType.isFacetable()) {
+                throw new WrappedResponse(badRequest(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.facets.error.fieldtypenotfacetable"), facetId.getString())));
+            }
+            facets.add(dsfType);
+        }
+        return facets;
     }
 
     @DELETE
+    @AuthRequired
     @Path("{linkingDataverseId}/deleteLink/{linkedDataverseId}")
-    public Response deleteDataverseLinkingDataverse(@PathParam("linkingDataverseId") String linkingDataverseId, @PathParam("linkedDataverseId") String linkedDataverseId) {
+    public Response deleteDataverseLinkingDataverse(@Context ContainerRequestContext crc, @PathParam("linkingDataverseId") String linkingDataverseId, @PathParam("linkedDataverseId") String linkedDataverseId) {
         boolean index = true;
         return response(req -> {
             execCommand(new DeleteDataverseLinkingDataverseCommand(req, findDataverseOrDie(linkingDataverseId), findDataverseLinkingDataverseOrDie(linkingDataverseId, linkedDataverseId), index));
             return ok("Link from Dataverse " + linkingDataverseId + " to linked Dataverse " + linkedDataverseId + " deleted");
-        });
+        }, getRequestUser(crc));
     }
 
     @GET
+    @AuthRequired
     @Path("{identifier}/metadatablocks")
-    public Response listMetadataBlocks(@PathParam("identifier") String dvIdtf) {
+    public Response listMetadataBlocks(@Context ContainerRequestContext crc,
+                                       @PathParam("identifier") String dvIdtf,
+                                       @QueryParam("onlyDisplayedOnCreate") boolean onlyDisplayedOnCreate,
+                                       @QueryParam("returnDatasetFieldTypes") boolean returnDatasetFieldTypes,
+                                       @QueryParam("datasetType") String datasetTypeIn) {
         try {
-            JsonArrayBuilder arr = Json.createArrayBuilder();
-            final List<MetadataBlock> blocks = execCommand(new ListMetadataBlocksCommand(createDataverseRequest(findUserOrDie()), findDataverseOrDie(dvIdtf)));
-            for (MetadataBlock mdb : blocks) {
-                arr.add(brief.json(mdb));
-            }
-            return ok(arr);
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            DatasetType datasetType = datasetTypeSvc.getByName(datasetTypeIn);
+            final List<MetadataBlock> metadataBlocks = execCommand(
+                    new ListMetadataBlocksCommand(
+                            createDataverseRequest(getRequestUser(crc)),
+                            dataverse,
+                            onlyDisplayedOnCreate,
+                            datasetType
+                    )
+            );
+            return ok(json(metadataBlocks, returnDatasetFieldTypes, onlyDisplayedOnCreate, dataverse, datasetType));
         } catch (WrappedResponse we) {
             return we.getResponse();
         }
     }
 
     @POST
+    @AuthRequired
     @Path("{identifier}/metadatablocks")
     @Produces(MediaType.APPLICATION_JSON)
-    public Response setMetadataBlocks(@PathParam("identifier") String dvIdtf, String blockIds) {
+    public Response setMetadataBlocks(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf, String blockIds) {
 
         List<MetadataBlock> blocks = new LinkedList<>();
         try {
@@ -456,7 +892,7 @@ public Response setMetadataBlocks(@PathParam("identifier") String dvIdtf, String
         }
 
         try {
-            execCommand(new UpdateDataverseMetadataBlocksCommand.SetBlocks(createDataverseRequest(findUserOrDie()), findDataverseOrDie(dvIdtf), blocks));
+            execCommand(new UpdateDataverseMetadataBlocksCommand.SetBlocks(createDataverseRequest(getRequestUser(crc)), findDataverseOrDie(dvIdtf), blocks));
             return ok("Metadata blocks of dataverse " + dvIdtf + " updated.");
 
         } catch (WrappedResponse ex) {
@@ -465,15 +901,17 @@ public Response setMetadataBlocks(@PathParam("identifier") String dvIdtf, String
     }
 
     @GET
+    @AuthRequired
     @Path("{identifier}/metadatablocks/:isRoot")
-    public Response getMetadataRoot_legacy(@PathParam("identifier") String dvIdtf) {
-        return getMetadataRoot(dvIdtf);
+    public Response getMetadataRoot_legacy(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
+        return getMetadataRoot(crc, dvIdtf);
     }
 
     @GET
+    @AuthRequired
     @Path("{identifier}/metadatablocks/isRoot")
     @Produces(MediaType.APPLICATION_JSON)
-    public Response getMetadataRoot(@PathParam("identifier") String dvIdtf) {
+    public Response getMetadataRoot(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
         return response(req -> {
             final Dataverse dataverse = findDataverseOrDie(dvIdtf);
             if (permissionSvc.request(req)
@@ -483,43 +921,77 @@ public Response getMetadataRoot(@PathParam("identifier") String dvIdtf) {
             } else {
                 return error(Status.FORBIDDEN, "Not authorized");
             }
-        });
+        }, getRequestUser(crc));
     }
 
     @POST
+    @AuthRequired
     @Path("{identifier}/metadatablocks/:isRoot")
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.WILDCARD)
-    public Response setMetadataRoot_legacy(@PathParam("identifier") String dvIdtf, String body) {
-        return setMetadataRoot(dvIdtf, body);
+    public Response setMetadataRoot_legacy(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf, String body) {
+        return setMetadataRoot(crc, dvIdtf, body);
     }
 
     @PUT
+    @AuthRequired
     @Path("{identifier}/metadatablocks/isRoot")
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.WILDCARD)
-    public Response setMetadataRoot(@PathParam("identifier") String dvIdtf, String body) {
+    public Response setMetadataRoot(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf, String body) {
         return response(req -> {
             final boolean root = parseBooleanOrDie(body);
             final Dataverse dataverse = findDataverseOrDie(dvIdtf);
             execCommand(new UpdateDataverseMetadataBlocksCommand.SetRoot(req, dataverse, root));
             return ok("Dataverse " + dataverse.getName() + " is now a metadata  " + (root ? "" : "non-") + "root");
-        });
+        }, getRequestUser(crc));
     }
 
     @GET
+    @AuthRequired
     @Path("{identifier}/facets/")
     /**
      * return list of facets for the dataverse with alias `dvIdtf`
      */
-    public Response listFacets(@PathParam("identifier") String dvIdtf) {
+    public Response listFacets(@Context ContainerRequestContext crc,
+                               @PathParam("identifier") String dvIdtf,
+                               @QueryParam("returnDetails") boolean returnDetails) {
         try {
-            User u = findUserOrDie();
+            User user = getRequestUser(crc);
+            DataverseRequest request = createDataverseRequest(user);
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            List<DataverseFacet> dataverseFacets = execCommand(new ListFacetsCommand(request, dataverse));
+
+            if (returnDetails) {
+                return ok(jsonDataverseFacets(dataverseFacets));
+            } else {
+                JsonArrayBuilder facetsBuilder = Json.createArrayBuilder();
+                for (DataverseFacet facet : dataverseFacets) {
+                    facetsBuilder.add(facet.getDatasetFieldType().getName());
+                }
+                return ok(facetsBuilder);
+            }
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/featured")
+    /*
+    Allows user to get the collections that are featured by a given collection
+    probably more for SPA than end user
+    */
+    public Response getFeaturedDataverses(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,  String dvAliases) {
+
+        try {
+            User u = getRequestUser(crc);
             DataverseRequest r = createDataverseRequest(u);
             Dataverse dataverse = findDataverseOrDie(dvIdtf);
             JsonArrayBuilder fs = Json.createArrayBuilder();
-            for (DataverseFacet f : execCommand(new ListFacetsCommand(r, dataverse))) {
-                fs.add(f.getDatasetFieldType().getName());
+            for (Dataverse f : execCommand(new ListFeaturedCollectionsCommand(r, dataverse))) {
+                fs.add(f.getAlias());
             }
             return ok(fs);
         } catch (WrappedResponse e) {
@@ -527,7 +999,89 @@ public Response listFacets(@PathParam("identifier") String dvIdtf) {
         }
     }
 
+
+    @POST
+    @AuthRequired
+    @Path("{identifier}/featured")
+    /**
+     * Allows user to set featured dataverses - must have edit dataverse permission
+     *
+     */
+    public Response setFeaturedDataverses(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,  String dvAliases) {
+        List<Dataverse> dvsFromInput = new LinkedList<>();
+
+
+        try {
+
+            for (JsonString dvAlias : Util.asJsonArray(dvAliases).getValuesAs(JsonString.class)) {
+                Dataverse dvToBeFeatured = dataverseService.findByAlias(dvAlias.getString());
+                if (dvToBeFeatured == null) {
+                    return error(Response.Status.BAD_REQUEST, "Can't find dataverse collection with alias '" + dvAlias + "'");
+                }
+                dvsFromInput.add(dvToBeFeatured);
+            }
+
+            if (dvsFromInput.isEmpty()) {
+                return error(Response.Status.BAD_REQUEST, "Please provide a valid Json array of dataverse collection aliases to be featured.");
+            }
+
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            List<Dataverse> featuredSource = new ArrayList<>();
+            List<Dataverse> featuredTarget = new ArrayList<>();
+            featuredSource.addAll(dataverseService.findAllPublishedByOwnerId(dataverse.getId()));
+            featuredSource.addAll(linkingService.findLinkedDataverses(dataverse.getId()));
+            List<DataverseFeaturedDataverse> featuredList = featuredDataverseService.findByDataverseId(dataverse.getId());
+
+            if (featuredSource.isEmpty()) {
+                return error(Response.Status.BAD_REQUEST, "There are no collections avaialble to be featured in Dataverse collection '" + dataverse.getDisplayName() + "'.");
+            }
+
+            for (DataverseFeaturedDataverse dfd : featuredList) {
+                Dataverse fd = dfd.getFeaturedDataverse();
+                featuredTarget.add(fd);
+                featuredSource.remove(fd);
+            }
+
+            for (Dataverse test : dvsFromInput) {
+                if (featuredTarget.contains(test)) {
+                    return error(Response.Status.BAD_REQUEST, "Dataverse collection '" + test.getDisplayName() + "' is already featured in Dataverse collection '" + dataverse.getDisplayName() + "'.");
+                }
+
+                if (featuredSource.contains(test)) {
+                    featuredTarget.add(test);
+                } else {
+                    return error(Response.Status.BAD_REQUEST, "Dataverse collection '" + test.getDisplayName() + "' may not be featured in Dataverse collection '" + dataverse.getDisplayName() + "'.");
+                }
+
+            }
+            // by passing null for Facets and DataverseFieldTypeInputLevel, those are not changed
+            execCommand(new UpdateDataverseCommand(dataverse, null, featuredTarget, createDataverseRequest(getRequestUser(crc)), null));
+            return ok("Featured Dataverses of dataverse " + dvIdtf + " updated.");
+
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        } catch (JsonParsingException jpe){
+            return error(Response.Status.BAD_REQUEST, "Please provide a valid Json array of dataverse collection aliases to be featured.");
+        }
+
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{identifier}/featured")
+    public Response deleteFeaturedCollections(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) throws WrappedResponse {
+        try {
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            List<Dataverse> featuredTarget = new ArrayList<>();
+            execCommand(new UpdateDataverseCommand(dataverse, null, featuredTarget, createDataverseRequest(getRequestUser(crc)), null));
+            return ok(BundleUtil.getStringFromBundle("dataverses.api.delete.featured.collections.successful"));
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
     @POST
+    @AuthRequired
     @Path("{identifier}/facets")
     @Produces(MediaType.APPLICATION_JSON)
     /**
@@ -537,23 +1091,19 @@ public Response listFacets(@PathParam("identifier") String dvIdtf) {
      * where foo.json contains a list of datasetField names, works as expected
      * (judging by the UI). This triggers a 500 when '-d @foo.json' is used.
      */
-    public Response setFacets(@PathParam("identifier") String dvIdtf, String facetIds) {
-
-        List<DatasetFieldType> facets = new LinkedList<>();
-        for (JsonString facetId : Util.asJsonArray(facetIds).getValuesAs(JsonString.class)) {
-            DatasetFieldType dsfType = findDatasetFieldType(facetId.getString());
-            if (dsfType == null) {
-                return error(Response.Status.BAD_REQUEST, "Can't find dataset field type '" + facetId + "'");
-            } else if (!dsfType.isFacetable()) {
-                return error(Response.Status.BAD_REQUEST, "Dataset field type '" + facetId + "' is not facetable");
-            }
-            facets.add(dsfType);
+    public Response setFacets(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf, String facetIds) {
+        JsonArray jsonArray = Util.asJsonArray(facetIds);
+        List<DatasetFieldType> facets;
+        try {
+            facets = parseFacets(jsonArray);
+        } catch (WrappedResponse e) {
+            return e.getResponse();
         }
 
         try {
             Dataverse dataverse = findDataverseOrDie(dvIdtf);
             // by passing null for Featured Dataverses and DataverseFieldTypeInputLevel, those are not changed
-            execCommand(new UpdateDataverseCommand(dataverse, facets, null, createDataverseRequest(findUserOrDie()), null));
+            execCommand(new UpdateDataverseCommand(dataverse, facets, null, createDataverseRequest(getRequestUser(crc)), null));
             return ok("Facets of dataverse " + dvIdtf + " updated.");
 
         } catch (WrappedResponse ex) {
@@ -561,13 +1111,89 @@ public Response setFacets(@PathParam("identifier") String dvIdtf, String facetId
         }
     }
 
+    @GET
+    @AuthRequired
+    @Path("{identifier}/metadatablockfacets")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response listMetadataBlockFacets(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
+        try {
+            User u = getRequestUser(crc);
+            DataverseRequest request = createDataverseRequest(u);
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            List<DataverseMetadataBlockFacet> metadataBlockFacets = Optional.ofNullable(execCommand(new ListMetadataBlockFacetsCommand(request, dataverse))).orElse(Collections.emptyList());
+            List<DataverseMetadataBlockFacetDTO.MetadataBlockDTO> metadataBlocksDTOs = metadataBlockFacets.stream()
+                    .map(item -> new DataverseMetadataBlockFacetDTO.MetadataBlockDTO(item.getMetadataBlock().getName(), item.getMetadataBlock().getLocaleDisplayFacet()))
+                    .collect(Collectors.toList());
+            DataverseMetadataBlockFacetDTO response = new DataverseMetadataBlockFacetDTO(dataverse.getId(), dataverse.getAlias(), dataverse.isMetadataBlockFacetRoot(), metadataBlocksDTOs);
+            return Response.ok(response).build();
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{identifier}/metadatablockfacets")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response setMetadataBlockFacets(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf, List<String> metadataBlockNames) {
+        try {
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+
+            if(!dataverse.isMetadataBlockFacetRoot()) {
+                return badRequest(String.format("Dataverse: %s must have metadata block facet root set to true", dvIdtf));
+            }
+
+            List<DataverseMetadataBlockFacet> metadataBlockFacets = new LinkedList<>();
+            for(String metadataBlockName: metadataBlockNames) {
+                MetadataBlock metadataBlock = findMetadataBlock(metadataBlockName);
+                if (metadataBlock == null) {
+                    return badRequest(String.format("Invalid metadata block name: %s", metadataBlockName));
+                }
+
+                DataverseMetadataBlockFacet metadataBlockFacet = new DataverseMetadataBlockFacet();
+                metadataBlockFacet.setDataverse(dataverse);
+                metadataBlockFacet.setMetadataBlock(metadataBlock);
+                metadataBlockFacets.add(metadataBlockFacet);
+            }
+
+            execCommand(new UpdateMetadataBlockFacetsCommand(createDataverseRequest(getRequestUser(crc)), dataverse, metadataBlockFacets));
+            return ok(String.format("Metadata block facets updated. DataverseId: %s blocks: %s", dvIdtf, metadataBlockNames));
+
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{identifier}/metadatablockfacets/isRoot")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response updateMetadataBlockFacetsRoot(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf, String body) {
+        try {
+            final boolean blockFacetsRoot = parseBooleanOrDie(body);
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            if(dataverse.isMetadataBlockFacetRoot() == blockFacetsRoot) {
+                return ok(String.format("No update needed, dataverse already consistent with new value. DataverseId: %s blockFacetsRoot: %s", dvIdtf, blockFacetsRoot));
+            }
+
+            execCommand(new UpdateMetadataBlockFacetRootCommand(createDataverseRequest(getRequestUser(crc)), dataverse, blockFacetsRoot));
+            return ok(String.format("Metadata block facets root updated. DataverseId: %s blockFacetsRoot: %s", dvIdtf, blockFacetsRoot));
+
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
     // FIXME: This listContent method is way too optimistic, always returning "ok" and never "error".
     // TODO: Investigate why there was a change in the timeframe of when pull request #4350 was merged
     // (2438-4295-dois-for-files branch) such that a contributor API token no longer allows this method
     // to be called without a PermissionException being thrown.
     @GET
+    @AuthRequired
     @Path("{identifier}/contents")
-    public Response listContent(@PathParam("identifier") String dvIdtf) throws WrappedResponse {
+    public Response listContent(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) throws WrappedResponse {
 
         DvObject.Visitor<JsonObjectBuilder> ser = new DvObject.Visitor<JsonObjectBuilder>() {
             @Override
@@ -593,43 +1219,102 @@ public JsonObjectBuilder visit(DataFile df) {
                         .stream()
                         .map(dvo -> (JsonObjectBuilder) dvo.accept(ser))
                         .collect(toJsonArray())
-        ));
+        ), getRequestUser(crc));
     }
 
     @GET
+    @AuthRequired
     @Path("{identifier}/storagesize")
-    public Response getStorageSize(@PathParam("identifier") String dvIdtf, @QueryParam("includeCached") boolean includeCached) throws WrappedResponse {
+    public Response getStorageSize(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf, @QueryParam("includeCached") boolean includeCached) throws WrappedResponse {
                 
         return response(req -> ok(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.datasize"),
-                execCommand(new GetDataverseStorageSizeCommand(req, findDataverseOrDie(dvIdtf), includeCached)))));
+                execCommand(new GetDataverseStorageSizeCommand(req, findDataverseOrDie(dvIdtf), includeCached)))), getRequestUser(crc));
+    }
+    
+    @GET
+    @AuthRequired
+    @Path("{identifier}/storage/quota")
+    public Response getCollectionQuota(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) throws WrappedResponse {
+        try {
+            Long bytesAllocated = execCommand(new GetCollectionQuotaCommand(createDataverseRequest(getRequestUser(crc)), findDataverseOrDie(dvIdtf)));
+            if (bytesAllocated != null) {
+                return ok(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.storage.quota.allocation"),bytesAllocated));
+            }
+            return ok(BundleUtil.getStringFromBundle("dataverse.storage.quota.notdefined"));
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
     }
     
+    @POST
+    @AuthRequired
+    @Path("{identifier}/storage/quota/{bytesAllocated}")
+    public Response setCollectionQuota(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf, @PathParam("bytesAllocated") Long bytesAllocated) throws WrappedResponse {
+        try {
+            execCommand(new SetCollectionQuotaCommand(createDataverseRequest(getRequestUser(crc)), findDataverseOrDie(dvIdtf), bytesAllocated));
+            return ok(BundleUtil.getStringFromBundle("dataverse.storage.quota.updated"));
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+    
+    @DELETE
+    @AuthRequired
+    @Path("{identifier}/storage/quota")
+    public Response deleteCollectionQuota(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) throws WrappedResponse {
+        try {
+            execCommand(new DeleteCollectionQuotaCommand(createDataverseRequest(getRequestUser(crc)), findDataverseOrDie(dvIdtf)));
+            return ok(BundleUtil.getStringFromBundle("dataverse.storage.quota.deleted"));
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
     
+    /**
+     *
+     * @param crc
+     * @param identifier
+     * @return
+     * @throws edu.harvard.iq.dataverse.api.AbstractApiBean.WrappedResponse 
+     * @todo: add an optional parameter that would force the recorded storage use
+     * to be recalculated (or should that be a POST version of this API?)
+     */
     @GET
+    @AuthRequired
+    @Path("{identifier}/storage/use")
+    public Response getCollectionStorageUse(@Context ContainerRequestContext crc, @PathParam("identifier") String identifier) throws WrappedResponse {
+        return response(req -> ok(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.storage.use"),
+                execCommand(new GetCollectionStorageUseCommand(req, findDataverseOrDie(identifier))))), getRequestUser(crc));
+    }
+
+    @GET
+    @AuthRequired
     @Path("{identifier}/roles")
-    public Response listRoles(@PathParam("identifier") String dvIdtf) {
+    public Response listRoles(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
         return response(req -> ok(
                 execCommand(new ListRolesCommand(req, findDataverseOrDie(dvIdtf)))
                         .stream().map(r -> json(r))
                         .collect(toJsonArray())
-        ));
+        ), getRequestUser(crc));
     }
 
     @POST
+    @AuthRequired
     @Path("{identifier}/roles")
-    public Response createRole(RoleDTO roleDto, @PathParam("identifier") String dvIdtf) {
-        return response(req -> ok(json(execCommand(new CreateRoleCommand(roleDto.asRole(), req, findDataverseOrDie(dvIdtf))))));
+    public Response createRole(@Context ContainerRequestContext crc, RoleDTO roleDto, @PathParam("identifier") String dvIdtf) {
+        return response(req -> ok(json(execCommand(new CreateRoleCommand(roleDto.asRole(), req, findDataverseOrDie(dvIdtf))))), getRequestUser(crc));
     }
 
     @GET
+    @AuthRequired
     @Path("{identifier}/assignments")
-    public Response listAssignments(@PathParam("identifier") String dvIdtf) {
+    public Response listAssignments(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
         return response(req -> ok(
                 execCommand(new ListRoleAssignments(req, findDataverseOrDie(dvIdtf)))
                         .stream()
                         .map(a -> json(a))
                         .collect(toJsonArray())
-        ));
+        ), getRequestUser(crc));
     }
 
     /**
@@ -641,6 +1326,8 @@ public Response listAssignments(@PathParam("identifier") String dvIdtf) {
      */
 //    File tempDir;
 //
+//    TODO: Code duplicate in ThemeWidgetFragment. Maybe extract, make static and put some place else?
+//          Important: at least use JvmSettings.DOCROOT_DIRECTORY and not the hardcoded location!
 //    private void createTempDir(Dataverse editDv) {
 //        try {
 //            File tempRoot = java.nio.file.Files.createDirectories(Paths.get("../docroot/logos/temp")).toFile();
@@ -722,11 +1409,12 @@ public Response listAssignments(@PathParam("identifier") String dvIdtf) {
 //        }
 //    }
     @POST
+    @AuthRequired
     @Path("{identifier}/assignments")
-    public Response createAssignment(RoleAssignmentDTO ra, @PathParam("identifier") String dvIdtf, @QueryParam("key") String apiKey) {
+    public Response createAssignment(@Context ContainerRequestContext crc, RoleAssignmentDTO ra, @PathParam("identifier") String dvIdtf, @QueryParam("key") String apiKey) {
 
         try {
-            final DataverseRequest req = createDataverseRequest(findUserOrDie());
+            final DataverseRequest req = createDataverseRequest(getRequestUser(crc));
             final Dataverse dataverse = findDataverseOrDie(dvIdtf);
 
             RoleAssignee assignee = findAssignee(ra.getAssignee());
@@ -760,13 +1448,14 @@ public Response createAssignment(RoleAssignmentDTO ra, @PathParam("identifier")
     }
 
     @DELETE
+    @AuthRequired
     @Path("{identifier}/assignments/{id}")
-    public Response deleteAssignment(@PathParam("id") long assignmentId, @PathParam("identifier") String dvIdtf) {
+    public Response deleteAssignment(@Context ContainerRequestContext crc, @PathParam("id") long assignmentId, @PathParam("identifier") String dvIdtf) {
         RoleAssignment ra = em.find(RoleAssignment.class, assignmentId);
         if (ra != null) {
             try {
                 findDataverseOrDie(dvIdtf);
-                execCommand(new RevokeRoleCommand(ra, createDataverseRequest(findUserOrDie())));
+                execCommand(new RevokeRoleCommand(ra, createDataverseRequest(getRequestUser(crc))));
                 return ok("Role " + ra.getRole().getName()
                         + " revoked for assignee " + ra.getAssigneeIdentifier()
                         + " in " + ra.getDefinitionPoint().accept(DvObject.NamePrinter));
@@ -779,11 +1468,12 @@ public Response deleteAssignment(@PathParam("id") long assignmentId, @PathParam(
     }
 
     @POST
+    @AuthRequired
     @Path("{identifier}/actions/:publish")
-    public Response publishDataverse(@PathParam("identifier") String dvIdtf) {
+    public Response publishDataverse(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
         try {
             Dataverse dv = findDataverseOrDie(dvIdtf);
-            return ok(json(execCommand(new PublishDataverseCommand(createDataverseRequest(findAuthenticatedUserOrDie()), dv))));
+            return ok(json(execCommand(new PublishDataverseCommand(createDataverseRequest(getRequestAuthenticatedUserOrDie(crc)), dv))));
 
         } catch (WrappedResponse wr) {
             return wr.getResponse();
@@ -791,8 +1481,9 @@ public Response publishDataverse(@PathParam("identifier") String dvIdtf) {
     }
 
     @POST
+    @AuthRequired
     @Path("{identifier}/groups/")
-    public Response createExplicitGroup(ExplicitGroupDTO dto, @PathParam("identifier") String dvIdtf) {
+    public Response createExplicitGroup(@Context ContainerRequestContext crc, ExplicitGroupDTO dto, @PathParam("identifier") String dvIdtf) {
         return response(req -> {
             ExplicitGroupProvider prv = explicitGroupSvc.getProvider();
             ExplicitGroup newGroup = dto.apply(prv.makeGroup());
@@ -801,41 +1492,89 @@ public Response createExplicitGroup(ExplicitGroupDTO dto, @PathParam("identifier
 
             String groupUri = String.format("%s/groups/%s", dvIdtf, newGroup.getGroupAliasInOwner());
             return created(groupUri, json(newGroup));
-        });
+        }, getRequestUser(crc));
     }
 
     @GET
+    @AuthRequired
     @Path("{identifier}/groups/")
-    public Response listGroups(@PathParam("identifier") String dvIdtf, @QueryParam("key") String apiKey) {
+    public Response listGroups(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf, @QueryParam("key") String apiKey) {
         return response(req -> ok(
                 execCommand(new ListExplicitGroupsCommand(req, findDataverseOrDie(dvIdtf)))
                         .stream().map(eg -> json(eg))
                         .collect(toJsonArray())
-        ));
+        ), getRequestUser(crc));
     }
 
     @GET
+    @AuthRequired
     @Path("{identifier}/groups/{aliasInOwner}")
-    public Response getGroupByOwnerAndAliasInOwner(@PathParam("identifier") String dvIdtf,
-            @PathParam("aliasInOwner") String grpAliasInOwner) {
+    public Response getGroupByOwnerAndAliasInOwner(@Context ContainerRequestContext crc,
+                                                   @PathParam("identifier") String dvIdtf,
+                                                   @PathParam("aliasInOwner") String grpAliasInOwner) {
         return response(req -> ok(json(findExplicitGroupOrDie(findDataverseOrDie(dvIdtf),
                 req,
-                grpAliasInOwner))));
+                grpAliasInOwner))), getRequestUser(crc));
     }
+    
+    @GET
+    @AuthRequired
+    @Path("{identifier}/guestbookResponses/")
+    public Response getGuestbookResponsesByDataverse(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf,
+            @QueryParam("guestbookId") Long gbId, @Context HttpServletResponse response) {
 
+        Dataverse dv;
+        try {
+            dv = findDataverseOrDie(dvIdtf);
+            User u = getRequestUser(crc);
+            DataverseRequest req = createDataverseRequest(u);
+            if (permissionSvc.request(req)
+                    .on(dv)
+                    .has(Permission.EditDataverse)) {
+            } else {
+                return error(Status.FORBIDDEN, "Not authorized");
+            }
+
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        StreamingOutput stream = new StreamingOutput() {
+
+            @Override
+            public void write(OutputStream os) throws IOException,
+                    WebApplicationException {
+
+                Map<Integer, Object> customQandAs = guestbookResponseService.mapCustomQuestionAnswersAsStrings(dv.getId(), gbId);
+                Map<Integer, String> datasetTitles = guestbookResponseService.mapDatasetTitles(dv.getId());
+
+                List<Object[]> guestbookResults = guestbookResponseService.getGuestbookResults(dv.getId(), gbId);
+                os.write("Guestbook, Dataset, Dataset PID, Date, Type, File Name, File Id, File PID, User Name, Email, Institution, Position, Custom Questions\n".getBytes());
+                for (Object[] result : guestbookResults) {
+                    StringBuilder sb = guestbookResponseService.convertGuestbookResponsesToCSV(customQandAs, datasetTitles, result);
+                    os.write(sb.toString().getBytes());
+                }
+            }
+        };
+        return Response.ok(stream).build();
+    }
+    
     @PUT
+    @AuthRequired
     @Path("{identifier}/groups/{aliasInOwner}")
-    public Response updateGroup(ExplicitGroupDTO groupDto,
+    public Response updateGroup(@Context ContainerRequestContext crc, ExplicitGroupDTO groupDto,
             @PathParam("identifier") String dvIdtf,
             @PathParam("aliasInOwner") String grpAliasInOwner) {
         return response(req -> ok(json(execCommand(
                 new UpdateExplicitGroupCommand(req,
-                        groupDto.apply(findExplicitGroupOrDie(findDataverseOrDie(dvIdtf), req, grpAliasInOwner)))))));
+                        groupDto.apply(findExplicitGroupOrDie(findDataverseOrDie(dvIdtf), req, grpAliasInOwner)))))), getRequestUser(crc));
     }
     
     @PUT
+    @AuthRequired
     @Path("{identifier}/defaultContributorRole/{roleAlias}")
     public Response updateDefaultContributorRole(
+            @Context ContainerRequestContext crc,
             @PathParam("identifier") String dvIdtf,
             @PathParam("roleAlias") String roleAlias) {
 
@@ -871,7 +1610,7 @@ public Response updateDefaultContributorRole(
                 List<String> args = Arrays.asList(dv.getDisplayName(), defaultRoleName);
                 String retString = BundleUtil.getStringFromBundle("dataverses.api.update.default.contributor.role.success", args);
                 return ok(retString);
-            });
+            }, getRequestUser(crc));
 
         } catch (WrappedResponse wr) {
             return wr.getResponse();
@@ -880,47 +1619,55 @@ public Response updateDefaultContributorRole(
     }
 
     @DELETE
+    @AuthRequired
     @Path("{identifier}/groups/{aliasInOwner}")
-    public Response deleteGroup(@PathParam("identifier") String dvIdtf,
-            @PathParam("aliasInOwner") String grpAliasInOwner) {
+    public Response deleteGroup(@Context ContainerRequestContext crc,
+                                @PathParam("identifier") String dvIdtf,
+                                @PathParam("aliasInOwner") String grpAliasInOwner) {
         return response(req -> {
             execCommand(new DeleteExplicitGroupCommand(req,
                     findExplicitGroupOrDie(findDataverseOrDie(dvIdtf), req, grpAliasInOwner)));
             return ok("Group " + dvIdtf + "/" + grpAliasInOwner + " deleted");
-        });
+        }, getRequestUser(crc));
     }
 
     @POST
+    @AuthRequired
     @Path("{identifier}/groups/{aliasInOwner}/roleAssignees")
     @Consumes("application/json")
-    public Response addRoleAssingees(List<String> roleAssingeeIdentifiers,
-            @PathParam("identifier") String dvIdtf,
-            @PathParam("aliasInOwner") String grpAliasInOwner) {
+    public Response addRoleAssingees(@Context ContainerRequestContext crc,
+                                     List<String> roleAssingeeIdentifiers,
+                                     @PathParam("identifier") String dvIdtf,
+                                     @PathParam("aliasInOwner") String grpAliasInOwner) {
         return response(req -> ok(
                 json(
                     execCommand(
                                 new AddRoleAssigneesToExplicitGroupCommand(req,
                                         findExplicitGroupOrDie(findDataverseOrDie(dvIdtf), req, grpAliasInOwner),
-                                        new TreeSet<>(roleAssingeeIdentifiers))))));
+                                        new TreeSet<>(roleAssingeeIdentifiers))))), getRequestUser(crc));
     }
 
     @PUT
+    @AuthRequired
     @Path("{identifier}/groups/{aliasInOwner}/roleAssignees/{roleAssigneeIdentifier: .*}")
-    public Response addRoleAssingee(@PathParam("identifier") String dvIdtf,
-            @PathParam("aliasInOwner") String grpAliasInOwner,
-            @PathParam("roleAssigneeIdentifier") String roleAssigneeIdentifier) {
-        return addRoleAssingees(Collections.singletonList(roleAssigneeIdentifier), dvIdtf, grpAliasInOwner);
+    public Response addRoleAssingee(@Context ContainerRequestContext crc,
+                                    @PathParam("identifier") String dvIdtf,
+                                    @PathParam("aliasInOwner") String grpAliasInOwner,
+                                    @PathParam("roleAssigneeIdentifier") String roleAssigneeIdentifier) {
+        return addRoleAssingees(crc, Collections.singletonList(roleAssigneeIdentifier), dvIdtf, grpAliasInOwner);
     }
 
     @DELETE
+    @AuthRequired
     @Path("{identifier}/groups/{aliasInOwner}/roleAssignees/{roleAssigneeIdentifier: .*}")
-    public Response deleteRoleAssingee(@PathParam("identifier") String dvIdtf,
-            @PathParam("aliasInOwner") String grpAliasInOwner,
-            @PathParam("roleAssigneeIdentifier") String roleAssigneeIdentifier) {
+    public Response deleteRoleAssingee(@Context ContainerRequestContext crc,
+                                       @PathParam("identifier") String dvIdtf,
+                                       @PathParam("aliasInOwner") String grpAliasInOwner,
+                                       @PathParam("roleAssigneeIdentifier") String roleAssigneeIdentifier) {
         return response(req -> ok(json(execCommand(
                 new RemoveRoleAssigneesFromExplicitGroupCommand(req,
                         findExplicitGroupOrDie(findDataverseOrDie(dvIdtf), req, grpAliasInOwner),
-                        Collections.singleton(roleAssigneeIdentifier))))));
+                        Collections.singleton(roleAssigneeIdentifier))))), getRequestUser(crc));
     }
 
     private ExplicitGroup findExplicitGroupOrDie(DvObject dv, DataverseRequest req, String groupIdtf) throws WrappedResponse {
@@ -932,10 +1679,11 @@ private ExplicitGroup findExplicitGroupOrDie(DvObject dv, DataverseRequest req,
     }
 
     @GET
+    @AuthRequired
     @Path("{identifier}/links")
-    public Response listLinks(@PathParam("identifier") String dvIdtf) {
+    public Response listLinks(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
         try {
-            User u = findUserOrDie();
+            User u = getRequestUser(crc);
             Dataverse dv = findDataverseOrDie(dvIdtf);
             if (!u.isSuperuser()) {
                 return error(Status.FORBIDDEN, "Not a superuser");
@@ -944,25 +1692,36 @@ public Response listLinks(@PathParam("identifier") String dvIdtf) {
             List<Dataverse> dvsThisDvHasLinkedToList = dataverseSvc.findDataversesThisIdHasLinkedTo(dv.getId());
             JsonArrayBuilder dvsThisDvHasLinkedToBuilder = Json.createArrayBuilder();
             for (Dataverse dataverse : dvsThisDvHasLinkedToList) {
-                dvsThisDvHasLinkedToBuilder.add(dataverse.getAlias());
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                job.add("id", dataverse.getId());
+                job.add("alias", dataverse.getAlias());
+                job.add("displayName", dataverse.getDisplayName());
+                dvsThisDvHasLinkedToBuilder.add(job);
             }
 
             List<Dataverse> dvsThatLinkToThisDvList = dataverseSvc.findDataversesThatLinkToThisDvId(dv.getId());
             JsonArrayBuilder dvsThatLinkToThisDvBuilder = Json.createArrayBuilder();
             for (Dataverse dataverse : dvsThatLinkToThisDvList) {
-                dvsThatLinkToThisDvBuilder.add(dataverse.getAlias());
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                job.add("id", dataverse.getId());
+                job.add("alias", dataverse.getAlias());
+                job.add("displayName", dataverse.getDisplayName());
+                dvsThatLinkToThisDvBuilder.add(job);
             }
 
             List<Dataset> datasetsThisDvHasLinkedToList = dataverseSvc.findDatasetsThisIdHasLinkedTo(dv.getId());
             JsonArrayBuilder datasetsThisDvHasLinkedToBuilder = Json.createArrayBuilder();
             for (Dataset dataset : datasetsThisDvHasLinkedToList) {
-                datasetsThisDvHasLinkedToBuilder.add(dataset.getLatestVersion().getTitle());
+                JsonObjectBuilder ds = new NullSafeJsonBuilder();
+                ds.add("title", dataset.getLatestVersion().getTitle());
+                ds.add("identifier",  dataset.getProtocol() + ":" + dataset.getAuthority() + "/" + dataset.getIdentifier());
+                datasetsThisDvHasLinkedToBuilder.add(ds);
             }
 
             JsonObjectBuilder response = Json.createObjectBuilder();
-            response.add("dataverses that the " + dv.getAlias() + " dataverse has linked to", dvsThisDvHasLinkedToBuilder);
-            response.add("dataverses that link to the " + dv.getAlias(), dvsThatLinkToThisDvBuilder);
-            response.add("datasets that the " + dv.getAlias() + " has linked to", datasetsThisDvHasLinkedToBuilder);
+            response.add("linkedDataverses", dvsThisDvHasLinkedToBuilder);
+            response.add("dataversesLinkingToThis", dvsThatLinkToThisDvBuilder);
+            response.add("linkedDatasets", datasetsThisDvHasLinkedToBuilder);
             return ok(response);
 
         } catch (WrappedResponse wr) {
@@ -971,10 +1730,11 @@ public Response listLinks(@PathParam("identifier") String dvIdtf) {
     }
 
     @POST
+    @AuthRequired
     @Path("{id}/move/{targetDataverseAlias}")
-    public Response moveDataverse(@PathParam("id") String id, @PathParam("targetDataverseAlias") String targetDataverseAlias, @QueryParam("forceMove") Boolean force) {
+    public Response moveDataverse(@Context ContainerRequestContext crc, @PathParam("id") String id, @PathParam("targetDataverseAlias") String targetDataverseAlias, @QueryParam("forceMove") Boolean force) {
         try {
-            User u = findUserOrDie();
+            User u = getRequestUser(crc);
             Dataverse dv = findDataverseOrDie(id);
             Dataverse target = findDataverseOrDie(targetDataverseAlias);
             if (target == null) {
@@ -990,10 +1750,11 @@ public Response moveDataverse(@PathParam("id") String id, @PathParam("targetData
     }
 
     @PUT
+    @AuthRequired
     @Path("{linkedDataverseAlias}/link/{linkingDataverseAlias}")
-    public Response linkDataverse(@PathParam("linkedDataverseAlias") String linkedDataverseAlias, @PathParam("linkingDataverseAlias") String linkingDataverseAlias) {
+    public Response linkDataverse(@Context ContainerRequestContext crc, @PathParam("linkedDataverseAlias") String linkedDataverseAlias, @PathParam("linkingDataverseAlias") String linkingDataverseAlias) {
         try {
-            User u = findUserOrDie();
+            User u = getRequestUser(crc);
             Dataverse linked = findDataverseOrDie(linkedDataverseAlias);
             Dataverse linking = findDataverseOrDie(linkingDataverseAlias);
             if (linked == null) {
@@ -1011,4 +1772,201 @@ public Response linkDataverse(@PathParam("linkedDataverseAlias") String linkedDa
         }
     }
 
+    @GET
+    @AuthRequired
+    @Path("{identifier}/userPermissions")
+    public Response getUserPermissionsOnDataverse(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
+        Dataverse dataverse;
+        try {
+            dataverse = findDataverseOrDie(dvIdtf);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        User requestUser = getRequestUser(crc);
+        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+        jsonObjectBuilder.add("canAddDataverse", permissionService.userOn(requestUser, dataverse).has(Permission.AddDataverse));
+        jsonObjectBuilder.add("canAddDataset", permissionService.userOn(requestUser, dataverse).has(Permission.AddDataset));
+        jsonObjectBuilder.add("canViewUnpublishedDataverse", permissionService.userOn(requestUser, dataverse).has(Permission.ViewUnpublishedDataverse));
+        jsonObjectBuilder.add("canEditDataverse", permissionService.userOn(requestUser, dataverse).has(Permission.EditDataverse));
+        jsonObjectBuilder.add("canManageDataversePermissions", permissionService.userOn(requestUser, dataverse).has(Permission.ManageDataversePermissions));
+        jsonObjectBuilder.add("canPublishDataverse", permissionService.userOn(requestUser, dataverse).has(Permission.PublishDataverse));
+        jsonObjectBuilder.add("canDeleteDataverse", permissionService.userOn(requestUser, dataverse).has(Permission.DeleteDataverse));
+        return ok(jsonObjectBuilder);
+    }
+
+    @POST
+    @AuthRequired
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Path("{identifier}/featuredItems")
+    public Response createFeaturedItem(@Context ContainerRequestContext crc,
+                                       @PathParam("identifier") String dvIdtf,
+                                       @FormDataParam("type") String type,
+                                       @FormDataParam("dvObjectIdentifier") String dvObjectIdtf,
+                                       @FormDataParam("content") String content,
+                                       @FormDataParam("displayOrder") int displayOrder,
+                                       @FormDataParam("file") InputStream imageFileInputStream,
+                                       @FormDataParam("file") FormDataContentDisposition contentDispositionHeader) {
+        Dataverse dataverse;
+        DvObject dvObject = null;
+        try {
+            dataverse = findDataverseOrDie(dvIdtf);
+            if (dvObjectIdtf != null) {
+                dvObject = findDvoByIdAndFeaturedItemTypeOrDie(dvObjectIdtf, type);
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        try {
+            NewDataverseFeaturedItemDTO newDataverseFeaturedItemDTO = NewDataverseFeaturedItemDTO.fromFormData(content, displayOrder, imageFileInputStream, contentDispositionHeader, type, dvObject);
+            DataverseFeaturedItem dataverseFeaturedItem = execCommand(new CreateDataverseFeaturedItemCommand(
+                    createDataverseRequest(getRequestUser(crc)),
+                    dataverse,
+                    newDataverseFeaturedItemDTO
+            ));
+            return ok(json(dataverseFeaturedItem));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/featuredItems")
+    public Response listFeaturedItems(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
+        try {
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            List<DataverseFeaturedItem> featuredItems = execCommand(new ListDataverseFeaturedItemsCommand(createDataverseRequest(getRequestUser(crc)), dataverse));
+            return ok(jsonDataverseFeaturedItems(featuredItems));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Path("{dataverseId}/featuredItems")
+    public Response updateFeaturedItems(
+            @Context ContainerRequestContext crc,
+            @PathParam("dataverseId") String dvIdtf,
+            @FormDataParam("id") List<Long> ids,
+            @FormDataParam("content") List<String> contents,
+            @FormDataParam("type") List<String> types,
+            @FormDataParam("dvObjectIdentifier") List<String> dvObjectIdtf,
+            @FormDataParam("displayOrder") List<Integer> displayOrders,
+            @FormDataParam("keepFile") List<Boolean> keepFiles,
+            @FormDataParam("fileName") List<String> fileNames,
+            @FormDataParam("file") List<FormDataBodyPart> files) {
+        try {
+            if (ids == null || contents == null || displayOrders == null || keepFiles == null || fileNames == null) {
+                throw new WrappedResponse(error(Response.Status.BAD_REQUEST,
+                        BundleUtil.getStringFromBundle("dataverse.update.featuredItems.error.missingInputParams")));
+            }
+
+            int size = ids.size();
+            if (types == null || types.isEmpty()) {
+                types = new ArrayList<>(Collections.nCopies(size, null));
+            }
+            if (dvObjectIdtf == null || dvObjectIdtf.isEmpty()) {
+                dvObjectIdtf = new ArrayList<>(Collections.nCopies(size, null));
+            }
+
+            if (contents.size() != size || displayOrders.size() != size || keepFiles.size() != size || fileNames.size() != size ||
+                    types.size() != size || dvObjectIdtf.size() != size) {
+                throw new WrappedResponse(error(Response.Status.BAD_REQUEST,
+                        BundleUtil.getStringFromBundle("dataverse.update.featuredItems.error.inputListsSizeMismatch")));
+            }
+
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            List<NewDataverseFeaturedItemDTO> newItems = new ArrayList<>();
+            Map<DataverseFeaturedItem, UpdatedDataverseFeaturedItemDTO> itemsToUpdate = new HashMap<>();
+
+            for (int i = 0; i < contents.size(); i++) {
+                String fileName = fileNames.get(i);
+                InputStream fileInputStream = null;
+                FormDataContentDisposition contentDisposition = null;
+
+                if (files != null) {
+                    Optional<FormDataBodyPart> matchingFile = files.stream()
+                            .filter(file -> fileName.equals(FileUtil.decodeFileName(file.getFormDataContentDisposition().getFileName())))
+                            .findFirst();
+
+                    if (matchingFile.isPresent()) {
+                        fileInputStream = matchingFile.get().getValueAs(InputStream.class);
+                        contentDisposition = matchingFile.get().getFormDataContentDisposition();
+                    }
+                }
+
+                // ignore dvObject if the id is missing or an empty string
+                DvObject dvObject = dvObjectIdtf.get(i) != null && !dvObjectIdtf.get(i).isEmpty()
+                        ? findDvoByIdAndFeaturedItemTypeOrDie(dvObjectIdtf.get(i), types.get(i)) : null;
+                if (ids.get(i) == 0) {
+                    newItems.add(NewDataverseFeaturedItemDTO.fromFormData(
+                            contents.get(i), displayOrders.get(i), fileInputStream, contentDisposition, types.get(i), dvObject));
+                } else {
+                    DataverseFeaturedItem existingItem = dataverseFeaturedItemServiceBean.findById(ids.get(i));
+                    if (existingItem == null) {
+                        throw new WrappedResponse(error(Response.Status.NOT_FOUND,
+                                MessageFormat.format(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notFound"), ids.get(i))));
+                    }
+                    itemsToUpdate.put(existingItem, UpdatedDataverseFeaturedItemDTO.fromFormData(
+                            contents.get(i), displayOrders.get(i), keepFiles.get(i), fileInputStream, contentDisposition, types.get(i), dvObject));
+                }
+            }
+
+            List<DataverseFeaturedItem> featuredItems = execCommand(new UpdateDataverseFeaturedItemsCommand(
+                    createDataverseRequest(getRequestUser(crc)),
+                    dataverse,
+                    newItems,
+                    itemsToUpdate
+            ));
+
+            return ok(jsonDataverseFeaturedItems(featuredItems));
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{identifier}/featuredItems")
+    public Response deleteFeaturedItems(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
+        try {
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            execCommand(new UpdateDataverseFeaturedItemsCommand(createDataverseRequest(getRequestUser(crc)), dataverse, new ArrayList<>(), new ArrayMap<>()));
+            return ok(BundleUtil.getStringFromBundle("dataverse.delete.featuredItems.success"));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/templates")
+    public Response getTemplates(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
+        try {
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            return ok(jsonTemplates(execCommand(new ListDataverseTemplatesCommand(createDataverseRequest(getRequestUser(crc)), dataverse))));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{identifier}/templates")
+    public Response createTemplate(@Context ContainerRequestContext crc, String body, @PathParam("identifier") String dvIdtf) {
+        try {
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            NewTemplateDTO newTemplateDTO;
+            try {
+                newTemplateDTO = NewTemplateDTO.fromRequestBody(body, jsonParser());
+            } catch (JsonParseException ex) {
+                return error(Status.BAD_REQUEST, MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.createTemplate.error.jsonParseMetadataFields"), ex.getMessage()));
+            }
+            return ok(jsonTemplate(execCommand(new CreateTemplateCommand(newTemplateDTO.toTemplate(), createDataverseRequest(getRequestUser(crc)), dataverse, true))));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstance.java b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstance.java
index 7e354bea24b..e9f869ad8b9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstance.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstance.java
@@ -6,14 +6,17 @@
 package edu.harvard.iq.dataverse.api;
 
 //import java.io.ByteArrayOutputStream;
+import edu.harvard.iq.dataverse.AuxiliaryFile;
 import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
 import edu.harvard.iq.dataverse.GuestbookResponse;
 import java.util.List;
+import java.util.logging.Logger;
+
 import edu.harvard.iq.dataverse.dataaccess.OptionalAccessService;
-import javax.faces.context.FacesContext;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.UriInfo;
+import jakarta.faces.context.FacesContext;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.UriInfo;
 
 /**
  *
@@ -21,6 +24,7 @@
  */
 public class DownloadInstance {
     
+    private static final Logger logger = Logger.getLogger(DownloadInstance.class.getCanonicalName());
      /*
      private ByteArrayOutputStream outStream = null;
 
@@ -47,6 +51,12 @@ public void setExtraArguments(List<Object> extraArguments) {
     private String conversionParam = null;
     private String conversionParamValue = null;
     
+    // This download instance is for an auxiliary file associated with 
+    // the DataFile. Unlike "conversions" (above) this is used for files
+    // that Dataverse has no way of producing/deriving from the parent Datafile
+    // itself, that have to be deposited externally.  
+    private AuxiliaryFile auxiliaryFile = null; 
+    
     private EjbDataverseEngine command;
 
     private DataverseRequestServiceBean dataverseRequestService;
@@ -115,6 +125,7 @@ public Boolean checkIfServiceSupportedAndSetConverter(String serviceArg, String
 
         for (OptionalAccessService dataService : servicesAvailable) {
             if (dataService != null) {
+                logger.fine("Checking service: " + dataService.getServiceName());
                 if (serviceArg.equals("variables")) {
                     // Special case for the subsetting parameter (variables=<LIST>):
                     if ("subset".equals(dataService.getServiceName())) {
@@ -142,6 +153,7 @@ public Boolean checkIfServiceSupportedAndSetConverter(String serviceArg, String
                     return true;
                 }
                 String argValuePair = serviceArg + "=" + serviceArgValue;
+                logger.fine("Comparing: " + argValuePair + " and " + dataService.getServiceArguments());
                 if (argValuePair.startsWith(dataService.getServiceArguments())) {
                     conversionParam = serviceArg;
                     conversionParamValue = serviceArgValue;
@@ -210,4 +222,12 @@ public void setDataverseRequestService(DataverseRequestServiceBean dataverseRequ
         this.dataverseRequestService = dataverseRequestService;
     }
     
+    public AuxiliaryFile getAuxiliaryFile() {
+        return auxiliaryFile;
+    }
+    
+    public void setAuxiliaryFile(AuxiliaryFile auxiliaryFile) {
+        this.auxiliaryFile = auxiliaryFile;
+    }
+    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
index 8c480bdcc36..c815caa09eb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
@@ -3,23 +3,23 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-
 package edu.harvard.iq.dataverse.api;
 
+import edu.harvard.iq.dataverse.AuxiliaryFile;
 import java.lang.reflect.Type;
 import java.lang.annotation.Annotation;
-import java.io.InputStream; 
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.IOException;
 
-import javax.ws.rs.WebApplicationException;
+import jakarta.ws.rs.WebApplicationException;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.dataaccess.*;
@@ -27,20 +27,31 @@
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateGuestbookResponseCommand;
+import edu.harvard.iq.dataverse.globus.GlobusServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean.MakeDataCountEntry;
+import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.RedirectionException;
-import javax.ws.rs.ServiceUnavailableException;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.ClientErrorException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.RedirectionException;
+import jakarta.ws.rs.ServiceUnavailableException;
+import jakarta.ws.rs.core.HttpHeaders;
+import org.apache.tika.mime.MimeType;
+import org.apache.tika.mime.MimeTypeException;
+import org.apache.tika.mime.MimeTypes;
 
 /**
  *
@@ -48,13 +59,16 @@
  */
 @Provider
 public class DownloadInstanceWriter implements MessageBodyWriter<DownloadInstance> {
-    
+
     @Inject
     MakeDataCountLoggingServiceBean mdcLogService;
-    
+    @Inject
+    SystemConfig systemConfig;
+    @Inject
+    GlobusServiceBean globusService;
+
     private static final Logger logger = Logger.getLogger(DownloadInstanceWriter.class.getCanonicalName());
 
-    
     @Override
     public boolean isWriteable(Class<?> clazz, Type type, Annotation[] annotation, MediaType mediaType) {
         return clazz == DownloadInstance.class;
@@ -65,53 +79,225 @@ public long getSize(DownloadInstance di, Class<?> clazz, Type type, Annotation[]
         return -1;
         //return getFileSize(di);
     }
-    
+
     @Override
     public void writeTo(DownloadInstance di, Class<?> clazz, Type type, Annotation[] annotation, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream outstream) throws IOException, WebApplicationException {
 
-        
         if (di.getDownloadInfo() != null && di.getDownloadInfo().getDataFile() != null) {
             DataAccessRequest daReq = new DataAccessRequest();
-            
-            
-            
+
             DataFile dataFile = di.getDownloadInfo().getDataFile();
             StorageIO<DataFile> storageIO = DataAccess.getStorageIO(dataFile, daReq);
-                        
+
             if (storageIO != null) {
                 try {
                     storageIO.open();
                 } catch (IOException ioex) {
                     //throw new WebApplicationException(Response.Status.SERVICE_UNAVAILABLE);
                     logger.log(Level.INFO, "Datafile {0}: Failed to locate and/or open physical file. Error message: {1}", new Object[]{dataFile.getId(), ioex.getLocalizedMessage()});
-                    throw new NotFoundException("Datafile "+dataFile.getId()+": Failed to locate and/or open physical file.");
+                    throw new NotFoundException("Datafile " + dataFile.getId() + ": Failed to locate and/or open physical file.");
+                }
+
+                
+                boolean redirectSupported = false;
+                String auxiliaryTag = null;
+                String auxiliaryType = null;
+                String auxiliaryFileName = null; 
+                
+                // Before we do anything else, check if this download can be handled 
+                // by a redirect to remote storage (only supported on S3, as of 5.4):
+                
+                if (storageIO.downloadRedirectEnabled()) {
+
+                    // Even if the above is true, there are a few cases where a  
+                    // redirect is not applicable. 
+                    // For example, for a tabular file, we can redirect a request 
+                    // for a saved original; but CANNOT if it is a column subsetting 
+                    // request (must be streamed in real time locally); or a format
+                    // conversion that hasn't been cached and saved on S3 yet. 
+                    redirectSupported = true;
+
+
+                    if ("imageThumb".equals(di.getConversionParam())) {
+
+                        // Can redirect - but only if already generated and cached.
+                        int requestedSize = 0;
+                        if (!"".equals(di.getConversionParamValue())) {
+                            try {
+                                requestedSize = Integer.parseInt(di.getConversionParamValue());
+                            } catch (java.lang.NumberFormatException ex) {
+                                // it's ok, the default size will be used.
+                            }
+                        }
+
+                        auxiliaryTag = ImageThumbConverter.THUMBNAIL_SUFFIX + (requestedSize > 0 ? requestedSize : ImageThumbConverter.DEFAULT_THUMBNAIL_SIZE);
+
+                        if (storageIO.downloadRedirectEnabled(auxiliaryTag) && isAuxiliaryObjectCached(storageIO, auxiliaryTag)) {
+                            auxiliaryType = ImageThumbConverter.THUMBNAIL_MIME_TYPE;
+                            String fileName = storageIO.getFileName();
+                            if (fileName != null) {
+                                auxiliaryFileName = fileName.replaceAll("\\.[^\\.]*$", ImageThumbConverter.THUMBNAIL_FILE_EXTENSION);
+                            }
+                        } else {
+                            redirectSupported = false;
+                        }
+
+                    } else if (di.getAuxiliaryFile() != null) {
+                        // We should support redirects to auxiliary files too.
+                    
+                        auxiliaryTag = di.getAuxiliaryFile().getFormatTag();
+                        String auxVersion = di.getAuxiliaryFile().getFormatVersion();
+                        if (auxVersion != null) {
+                            auxiliaryTag = auxiliaryTag + "_" + auxVersion;
+                        }
+                    
+                        if (storageIO.downloadRedirectEnabled(auxiliaryTag) && isAuxiliaryObjectCached(storageIO, auxiliaryTag)) {
+                            String fileExtension = getFileExtension(di.getAuxiliaryFile());
+                            auxiliaryFileName = storageIO.getFileName() + "." + auxiliaryTag + fileExtension;
+                            auxiliaryType = di.getAuxiliaryFile().getContentType();
+                        } else {
+                            redirectSupported = false;
+                        }
+
+                    } else if (dataFile.isTabularData()) {
+                        // Many separate special cases here. 
+
+                        if (di.getConversionParam() != null) {
+                            if (di.getConversionParam().equals("format")) {
+
+                                if ("original".equals(di.getConversionParamValue())) {
+                                    auxiliaryTag = StoredOriginalFile.SAVED_ORIGINAL_FILENAME_EXTENSION;
+                                    auxiliaryType = dataFile.getOriginalFileFormat(); 
+                                    auxiliaryFileName = dataFile.getOriginalFileName();
+                                } else {
+                                    // format conversions - can redirect, but only if 
+                                    // it has been cached already. 
+
+                                    auxiliaryTag = di.getConversionParamValue();
+                                    if (storageIO.downloadRedirectEnabled(auxiliaryTag) && isAuxiliaryObjectCached(storageIO, auxiliaryTag)) {
+                                        auxiliaryType = di.getServiceFormatType(di.getConversionParam(), auxiliaryTag);
+                                        auxiliaryFileName = FileUtil.replaceExtension(storageIO.getFileName(), auxiliaryTag);
+                                    } else {
+                                        redirectSupported = false;
+                                    }
+                                }
+                            } else if (di.getConversionParam().equals("noVarHeader")) {
+                                // This will work just fine, if the tab. file is 
+                                // stored without the var. header. Throw "unavailable"
+                                // exception otherwise. 
+                                // @todo: should we actually drop support for this "noVarHeader" flag?
+                                if (dataFile.getDataTable().isStoredWithVariableHeader()) {
+                                    throw new ServiceUnavailableException();
+                                }
+                                // ... defaults to redirectSupported = true
+                            } else {
+                                // This must be a subset request then - can't do. 
+                                redirectSupported = false; 
+                            } 
+                        } else {
+                            // "straight" download of the full tab-delimited file. 
+                            // can redirect, but only if stored with the variable 
+                            // header already added: 
+                            if (!dataFile.getDataTable().isStoredWithVariableHeader()) {
+                                redirectSupported = false;
+                            }
+                        }
+                    }
+                }
+                String redirect_url_str=null;
+
+                if (redirectSupported) {
+                    // definitely close the (potentially still open) input stream, 
+                    // since we are not going to use it. The S3 documentation in particular
+                    // emphasizes that it is very important not to leave these
+                    // lying around un-closed, since they are going to fill 
+                    // up the S3 connection pool!
+                    storageIO.closeInputStream();
+                    // [attempt to] redirect: 
+                    try {
+                        redirect_url_str = storageIO.generateTemporaryDownloadUrl(auxiliaryTag, auxiliaryType, auxiliaryFileName);
+                    } catch (IOException ioex) {
+                        logger.warning("Unable to generate downloadURL for " + dataFile.getId() + ": " + auxiliaryTag);
+                        //Setting null will let us try to get the file/aux file w/o redirecting 
+                        redirect_url_str = null;
+                    }
+                }
+                String driverId = DataAccess.getStorageDriverFromIdentifier(dataFile.getStorageIdentifier());
+                if (systemConfig.isGlobusFileDownload() && (GlobusAccessibleStore.acceptsGlobusTransfers(driverId) || GlobusAccessibleStore.allowsGlobusReferences(driverId))) {
+                    if (di.getConversionParam() != null) {
+                        if (di.getConversionParam().equals("format")) {
+
+                            if ("GlobusTransfer".equals(di.getConversionParamValue())) {
+                                List<DataFile> downloadDFList = new ArrayList<DataFile>(1);
+                                downloadDFList.add(dataFile);
+                                redirect_url_str = globusService.getGlobusAppUrlForDataset(dataFile.getOwner(), false, downloadDFList);
+                            }
+                        }
+                    }
+                }
+                if (redirect_url_str != null) {
+
+                    logger.fine("Data Access API: redirect url: " + redirect_url_str);
+                    URI redirect_uri;
+
+                    try {
+                        redirect_uri = new URI(redirect_url_str);
+                    } catch (URISyntaxException ex) {
+                        logger.info("Data Access API: failed to create redirect url (" + redirect_url_str + ")");
+                        redirect_uri = null;
+                    }
+                    if (redirect_uri != null) {
+                        // increment the download count, if necessary:
+                        if (di.getGbr() != null && !(isThumbnailDownload(di) || isPreprocessedMetadataDownload(di))) {
+                            try {
+                                logger.fine("writing guestbook response, for a download redirect.");
+                                Command<?> cmd = new CreateGuestbookResponseCommand(di.getDataverseRequestService().getDataverseRequest(), di.getGbr(), di.getGbr().getDataFile().getOwner());
+                                di.getCommand().submit(cmd);
+                                MakeDataCountEntry entry = new MakeDataCountEntry(di.getRequestUriInfo(), di.getRequestHttpHeaders(), di.getDataverseRequestService(), di.getGbr().getDataFile());
+                                mdcLogService.logEntry(entry);
+                            } catch (CommandException e) {
+                            }
+                        }
+
+                        // finally, issue the redirect:
+                        Response response = Response.seeOther(redirect_uri).build();
+                        logger.fine("Issuing redirect to the file location.");
+                        // Yes, this throws an exception. It's not an exception 
+                        // as in, "bummer, something went wrong". This is how a 
+                        // redirect is produced here!
+                        throw new RedirectionException(response);
+                    }
+                    throw new ServiceUnavailableException();
                 }
+
+                // Past this point, this is a locally served/streamed download
                 
                 if (di.getConversionParam() != null) {
                     // Image Thumbnail and Tabular data conversion: 
                     // NOTE: only supported on local files, as of 4.0.2!
                     // NOTE: should be supported on all files for which StorageIO drivers
                     // are available (but not on harvested files1) -- L.A. 4.6.2
-                    
-                    if (di.getConversionParam().equals("imageThumb") && !dataFile.isHarvested()) { 
+
+                    if (di.getConversionParam().equals("imageThumb") && !dataFile.isHarvested()) {
                         if ("".equals(di.getConversionParamValue())) {
-                            storageIO = ImageThumbConverter.getImageThumbnailAsInputStream(storageIO, ImageThumbConverter.DEFAULT_THUMBNAIL_SIZE); 
+                            storageIO = ImageThumbConverter.getImageThumbnailAsInputStream(storageIO, ImageThumbConverter.DEFAULT_THUMBNAIL_SIZE);
                         } else {
                             try {
-                                int size = new Integer(di.getConversionParamValue());
-                                if (size > 0) {                                    
+                                int size = Integer.parseInt(di.getConversionParamValue());
+                                if (size > 0) {
                                     storageIO = ImageThumbConverter.getImageThumbnailAsInputStream(storageIO, size);
                                 }
                             } catch (java.lang.NumberFormatException ex) {
                                 storageIO = ImageThumbConverter.getImageThumbnailAsInputStream(storageIO, ImageThumbConverter.DEFAULT_THUMBNAIL_SIZE);
                             }
-                            
+
                             // and, since we now have tabular data files that can 
                             // have thumbnail previews... obviously, we don't want to 
                             // add the variable header to the image stream!
-                            
-                            storageIO.setNoVarHeader(Boolean.TRUE);
-                            storageIO.setVarHeader(null);
+                            if (storageIO != null) { // ImageThumbConverter returns null if thumbnail conversion fails
+                                storageIO.setNoVarHeader(Boolean.TRUE);
+                                storageIO.setVarHeader(null);
+                            }
                         }
                     } else if (dataFile.isTabularData()) {
                         logger.fine("request for tabular data download;");
@@ -119,71 +305,84 @@ public void writeTo(DownloadInstance di, Class<?> clazz, Type type, Annotation[]
                         // tab files tagged as "geospatial"). We are going to assume that you can 
                         // do only ONE thing at a time - request the thumbnail for the file, or 
                         // request any tabular-specific services. 
-                        
+
                         if (di.getConversionParam().equals("noVarHeader")) {
-                            logger.fine("tabular data with no var header requested");
-                            storageIO.setNoVarHeader(Boolean.TRUE);
-                            storageIO.setVarHeader(null);
+                            if (!dataFile.getDataTable().isStoredWithVariableHeader()) {
+                                logger.fine("tabular data with no var header requested");
+                                storageIO.setNoVarHeader(Boolean.TRUE);
+                                storageIO.setVarHeader(null);
+                            } else {
+                                logger.fine("can't serve request for tabular data without varheader, since stored with it");
+                                throw new ServiceUnavailableException();
+                            }
                         } else if (di.getConversionParam().equals("format")) {
                             // Conversions, and downloads of "stored originals" are 
                             // now supported on all DataFiles for which StorageIO 
                             // access drivers are available.
-                            
+
                             if ("original".equals(di.getConversionParamValue())) {
                                 logger.fine("stored original of an ingested file requested");
                                 storageIO = StoredOriginalFile.retreive(storageIO);
                             } else {
                                 // Other format conversions: 
-                                logger.fine("format conversion on a tabular file requested ("+di.getConversionParamValue()+")");
-                                String requestedMimeType = di.getServiceFormatType(di.getConversionParam(), di.getConversionParamValue()); 
+                                logger.fine("format conversion on a tabular file requested (" + di.getConversionParamValue() + ")");
+                                String requestedMimeType = di.getServiceFormatType(di.getConversionParam(), di.getConversionParamValue());
                                 if (requestedMimeType == null) {
                                     // default mime type, in case real type is unknown;
                                     // (this shouldn't happen in real life - but just in case): 
                                     requestedMimeType = "application/octet-stream";
-                                } 
-                                storageIO = 
-                                        DataConverter.performFormatConversion(dataFile, 
-                                        storageIO, 
-                                        di.getConversionParamValue(), requestedMimeType);
-                            } 
+                                }
+                                storageIO
+                                        = DataConverter.performFormatConversion(dataFile,
+                                                storageIO,
+                                                di.getConversionParamValue(), requestedMimeType);
+                            }
                         } else if (di.getConversionParam().equals("subset")) {
                             logger.fine("processing subset request.");
-                            
+
                             // TODO: 
                             // If there are parameters on the list that are 
                             // not valid variable ids, or if the do not belong to 
                             // the datafile referenced - I simply skip them; 
                             // perhaps I should throw an invalid argument exception 
                             // instead. 
-                            
                             if (di.getExtraArguments() != null && di.getExtraArguments().size() > 0) {
-                                logger.fine("processing extra arguments list of length "+di.getExtraArguments().size());
-                                List <Integer> variablePositionIndex = new ArrayList<>();
+                                logger.fine("processing extra arguments list of length " + di.getExtraArguments().size());
+                                List<Integer> variablePositionIndex = new ArrayList<>();
                                 String subsetVariableHeader = null;
                                 for (int i = 0; i < di.getExtraArguments().size(); i++) {
-                                    DataVariable variable = (DataVariable)di.getExtraArguments().get(i);
+                                    DataVariable variable = (DataVariable) di.getExtraArguments().get(i);
                                     if (variable != null) {
                                         if (variable.getDataTable().getDataFile().getId().equals(dataFile.getId())) {
-                                            logger.fine("adding variable id "+variable.getId()+" to the list.");
+                                            logger.fine("adding variable id " + variable.getId() + " to the list.");
                                             variablePositionIndex.add(variable.getFileOrder());
-                                            if (subsetVariableHeader == null) {
-                                                subsetVariableHeader = variable.getName();
-                                            } else {
-                                                subsetVariableHeader = subsetVariableHeader.concat("\t");
-                                                subsetVariableHeader = subsetVariableHeader.concat(variable.getName());
+                                            if (!dataFile.getDataTable().isStoredWithVariableHeader()) {
+                                                subsetVariableHeader = subsetVariableHeader == null 
+                                                        ? variable.getName()
+                                                        : subsetVariableHeader.concat("\t" + variable.getName());
                                             }
                                         } else {
                                             logger.warning("variable does not belong to this data file.");
                                         }
-                                    }  
+                                    }
                                 }
-                                
+
                                 if (variablePositionIndex.size() > 0) {
 
                                     try {
                                         File tempSubsetFile = File.createTempFile("tempSubsetFile", ".tmp");
                                         TabularSubsetGenerator tabularSubsetGenerator = new TabularSubsetGenerator();
-                                        tabularSubsetGenerator.subsetFile(storageIO.getInputStream(), tempSubsetFile.getAbsolutePath(), variablePositionIndex, dataFile.getDataTable().getCaseQuantity(), "\t");
+                                        
+                                        long numberOfLines = dataFile.getDataTable().getCaseQuantity();
+                                        if (dataFile.getDataTable().isStoredWithVariableHeader()) {
+                                            numberOfLines++;
+                                        }
+                                        
+                                        tabularSubsetGenerator.subsetFile(storageIO.getInputStream(), 
+                                                tempSubsetFile.getAbsolutePath(), 
+                                                variablePositionIndex, 
+                                                numberOfLines, 
+                                                "\t");
 
                                         if (tempSubsetFile.exists()) {
                                             FileInputStream subsetStream = new FileInputStream(tempSubsetFile);
@@ -191,8 +390,11 @@ public void writeTo(DownloadInstance di, Class<?> clazz, Type type, Annotation[]
 
                                             InputStreamIO subsetStreamIO = new InputStreamIO(subsetStream, subsetSize);
                                             logger.fine("successfully created subset output stream.");
-                                            subsetVariableHeader = subsetVariableHeader.concat("\n");
-                                            subsetStreamIO.setVarHeader(subsetVariableHeader);
+                                            
+                                            if (subsetVariableHeader != null) {
+                                                subsetVariableHeader = subsetVariableHeader.concat("\n");
+                                                subsetStreamIO.setVarHeader(subsetVariableHeader);
+                                            }
 
                                             String tabularFileName = storageIO.getFileName();
 
@@ -217,202 +419,298 @@ public void writeTo(DownloadInstance di, Class<?> clazz, Type type, Annotation[]
                             } else {
                                 logger.fine("empty list of extra arguments.");
                             }
-                        } 
-                    }
-                    
-                    
+                            // end of tab. data subset case
+                        } else if (dataFile.getDataTable().isStoredWithVariableHeader()) {
+                            logger.fine("tabular file stored with the var header included, no need to generate it on the fly");
+                            storageIO.setNoVarHeader(Boolean.TRUE);
+                            storageIO.setVarHeader(null);
+                        }
+                    } // end of tab. data file case
+
                     if (storageIO == null) {
                         //throw new WebApplicationException(Response.Status.SERVICE_UNAVAILABLE);
                         // 404/not found may be a better return code option here
                         // (similarly to what the Access API returns when a thumbnail is requested on a text file, etc.)
                         throw new NotFoundException("datafile access error: requested optional service (image scaling, format conversion, etc.) could not be performed on this datafile.");
                     }
-                } else {
-                    if (storageIO instanceof S3AccessIO && !(dataFile.isTabularData()) && isRedirectToS3()) {
-                        // definitely close the (still open) S3 input stream, 
-                        // since we are not going to use it. The S3 documentation
-                        // emphasizes that it is very important not to leave these
-                        // lying around un-closed, since they are going to fill 
-                        // up the S3 connection pool!
-                        try {storageIO.getInputStream().close();} catch (IOException ioex) {}
-                        // [attempt to] redirect: 
-                        String redirect_url_str; 
-                        try {
-                            redirect_url_str = ((S3AccessIO)storageIO).generateTemporaryS3Url();
-                        } catch (IOException ioex) {
-                            redirect_url_str = null; 
-                        }
+                } else if (di.getAuxiliaryFile() != null) {
+                    // Make sure to close the InputStream for the main datafile: 
+                    storageIO.closeInputStream();
+                    String auxTag = di.getAuxiliaryFile().getFormatTag();
+                    String auxVersion = di.getAuxiliaryFile().getFormatVersion();
+                    if (auxVersion != null) {
+                        auxTag = auxTag + "_" + auxVersion;
+                    }
+                    long auxFileSize = di.getAuxiliaryFile().getFileSize();
+                    InputStreamIO auxStreamIO = new InputStreamIO(storageIO.getAuxFileAsInputStream(auxTag), auxFileSize);
+                    String fileExtension = getFileExtension(di.getAuxiliaryFile());
+                    auxStreamIO.setFileName(storageIO.getFileName() + "." + auxTag + fileExtension);
+                    auxStreamIO.setMimeType(di.getAuxiliaryFile().getContentType());
+                    storageIO = auxStreamIO;
+
+                } 
+
+                try (InputStream instream = storageIO.getInputStream()) {
+                    if (instream != null) {
+                        // headers:
+
+                        String fileName = storageIO.getFileName();
+                        String mimeType = storageIO.getMimeType();
+
+                        // Provide both the "Content-disposition" and "Content-Type" headers,
+                        // to satisfy the widest selection of browsers out there. 
+                        // Encode the filename as UTF-8, then deal with spaces. "encode" changes
+                        // a space to + so we change it back to a space (%20).
+                        String finalFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+                        httpHeaders.add("Content-disposition", "attachment; filename=\"" + finalFileName + "\"");
+                        httpHeaders.add("Content-Type", mimeType + "; name=\"" + finalFileName + "\"");
+
+                        long contentSize;
                         
-                        if (redirect_url_str == null) {
-                            throw new WebApplicationException(new ServiceUnavailableException());
+                        // User may have requested a rangeHeader of bytes.
+                        // Ranges are only supported when the size of the content 
+                        // stream is known (i.e., it's not a dynamically generated 
+                        // stream. 
+                        List<Range> ranges = new ArrayList<>();
+                        String rangeHeader = null;
+                        HttpHeaders headers = di.getRequestHttpHeaders();
+                        if (headers != null) {
+                            rangeHeader = headers.getHeaderString("Range");
                         }
+                        long offset = 0;
+                        long leftToRead = -1L; 
+                        // Moving the "left to read" var. here; - since we may need 
+                        // to start counting our rangeHeader bytes outside the main .write()
+                        // loop, if it's a tabular file with a header. 
                         
-                        logger.fine("Data Access API: direct S3 url: "+redirect_url_str);
-                        URI redirect_uri; 
-
-                        try {
-                            redirect_uri = new URI(redirect_url_str);
-                        } catch (URISyntaxException ex) {
-                            logger.info("Data Access API: failed to create S3 redirect url ("+redirect_url_str+")");
-                            redirect_uri = null; 
+                        if ((contentSize = getContentSize(storageIO)) > 0) {
+                            try {
+                                ranges = getRanges(rangeHeader, contentSize);
+                            } catch (Exception ex) {
+                                logger.fine("Exception caught processing Range header: " + ex.getLocalizedMessage());
+                                throw new ClientErrorException("Error due to Range header: " + ex.getLocalizedMessage(), Response.Status.REQUESTED_RANGE_NOT_SATISFIABLE);
+                            }
+                            
+                            if (ranges.isEmpty()) {
+                                logger.fine("Content size (retrieved from the AccessObject): " + contentSize);
+                                httpHeaders.add("Content-Length", contentSize);
+                            } else  {
+                                // For now we only support a single rangeHeader.
+                                long rangeContentSize = ranges.get(0).getLength();
+                                logger.fine("Content size (Range header in use): " + rangeContentSize);
+                                httpHeaders.add("Content-Length", rangeContentSize);
+                                
+                                offset = ranges.get(0).getStart();
+                                leftToRead = rangeContentSize;
+                                httpHeaders.add("Accept-Ranges", "bytes");
+                                httpHeaders.add("Content-Range", "bytes "+offset+"-"+(offset+rangeContentSize-1)+"/"+contentSize);
+
+                            }
+                        } else {
+                            // Content size unknown, must be a dynamically
+                            // generated stream, such as a subsetting request.
+                            // We do NOT want to support rangeHeader requests on such streams:
+                            if (rangeHeader != null) {
+                                throw new NotFoundException("Range headers are not supported on dynamically-generated content, such as tabular subsetting.");
+                            }
+                            
                         }
-                        if (redirect_uri != null) {
-                            // increment the download count, if necessary:
-                            if (di.getGbr() != null) {
-                                try {
-                                    logger.fine("writing guestbook response, for an S3 download redirect.");
-                                    Command<?> cmd = new CreateGuestbookResponseCommand(di.getDataverseRequestService().getDataverseRequest(), di.getGbr(), di.getGbr().getDataFile().getOwner());
-                                    di.getCommand().submit(cmd);
-                                    MakeDataCountEntry entry = new MakeDataCountEntry(di.getRequestUriInfo(), di.getRequestHttpHeaders(), di.getDataverseRequestService(), di.getGbr().getDataFile());
-                                    mdcLogService.logEntry(entry);
-                                } catch (CommandException e) {
+
+                        // (the httpHeaders map must be modified *before* writing any
+                        // data in the output stream!)
+                        int bufsize;
+                        byte[] bffr = new byte[4 * 8192];
+
+                        // Before writing out any bytes from the input stream, write
+                        // any extra content, such as the variable header for the 
+                        // subsettable files: 
+                        if (storageIO.getVarHeader() != null) {
+                            logger.fine("storageIO.getVarHeader().getBytes().length: " + storageIO.getVarHeader().getBytes().length);
+                            if (storageIO.getVarHeader().getBytes().length > 0) {
+                                // If a rangeHeader is not being requested, let's call that the normal case.
+                                // Write the entire line of variable headers. Later, the rest of the file
+                                // will be written.
+                                if (ranges.isEmpty()) {
+                                    logger.fine("writing the entire variable header");
+                                    outstream.write(storageIO.getVarHeader().getBytes());
+                                } else {
+                                    // Range requested. Since the output stream of a 
+                                    // tabular file is made up of the varHeader and the body of 
+                                    // the physical file, we should assume that the requested 
+                                    // rangeHeader may span any portion of the combined stream.
+                                    // Thus we may or may not have to write the header, or a 
+                                    // portion thereof. 
+                                    int headerLength = storageIO.getVarHeader().getBytes().length;
+                                    if (offset >= headerLength) {
+                                        // We can skip the entire header. 
+                                        // All we need to do is adjust the byte offset 
+                                        // in the physical file; the number of bytes
+                                        // left to write stays unchanged, since we haven't
+                                        // written anything.
+                                        logger.fine("Skipping the variable header completely.");
+                                        offset -= headerLength;
+                                    } else {
+                                        // We need to write some portion of the header; 
+                                        // Once we are done, we may or may not still have 
+                                        // some bytes left to write from the main physical file.
+                                        if (offset + leftToRead <= headerLength) {
+                                            // This is a more straightforward case - we just need to 
+                                            // write a portion of the header, and then we are done!
+                                            logger.fine("Writing this many bytes of the variable header line: " + leftToRead);
+                                            outstream.write(Arrays.copyOfRange(storageIO.getVarHeader().getBytes(), (int)offset, (int)offset + (int)leftToRead));
+                                            // set "left to read" to zero, indicating that we are done:
+                                            leftToRead = 0; 
+                                        } else {
+                                            // write the requested portion of the header:
+                                            logger.fine("Writing this many bytes of the variable header line: " + (headerLength - offset));
+                                            outstream.write(Arrays.copyOfRange(storageIO.getVarHeader().getBytes(), (int)offset, headerLength));
+                                            // and adjust the file offset and remaining number of bytes accordingly: 
+                                            leftToRead -= (headerLength - offset);
+                                            offset = 0;
+                                        }
+                                        
+                                    }
                                 }
                             }
-                            
-                            // finally, issue the redirect:
-                            Response response = Response.seeOther(redirect_uri).build();
-                            logger.fine("Issuing redirect to the file location on S3.");
-                            throw new RedirectionException(response);
                         }
-                        throw new WebApplicationException(new ServiceUnavailableException());
-                    }
-                }
-                
-                InputStream instream = storageIO.getInputStream();
-                if (instream != null) {
-                    // headers:
-                    
-                    String fileName = storageIO.getFileName(); 
-                    String mimeType = storageIO.getMimeType(); 
-                    
-                    // Provide both the "Content-disposition" and "Content-Type" headers,
-                    // to satisfy the widest selection of browsers out there. 
-                    
-                    httpHeaders.add("Content-disposition", "attachment; filename=\"" + fileName + "\"");
-                    httpHeaders.add("Content-Type", mimeType + "; name=\"" + fileName + "\"");
-                    
-                    long contentSize; 
-                    boolean useChunkedTransfer = false; 
-                    //if ((contentSize = getFileSize(di, storageIO.getVarHeader())) > 0) {
-                    if ((contentSize = getContentSize(storageIO)) > 0) {
-                        logger.fine("Content size (retrieved from the AccessObject): "+contentSize);
-                        httpHeaders.add("Content-Length", contentSize); 
-                    } else {
-                        //httpHeaders.add("Transfer-encoding", "chunked");
-                        //useChunkedTransfer = true;
-                    }
-                    
-                    // (the httpHeaders map must be modified *before* writing any
-                    // data in the output stream!)
-                                                              
-                    int bufsize;
-                    byte [] bffr = new byte[4*8192];
-                    byte [] chunkClose = "\r\n".getBytes();
-                    
-                    // before writing out any bytes from the input stream, flush
-                    // any extra content, such as the variable header for the 
-                    // subsettable files: 
-                    
-                    if (storageIO.getVarHeader() != null) {
-                        if (storageIO.getVarHeader().getBytes().length > 0) {
-                            if (useChunkedTransfer) {
-                                String chunkSizeLine = String.format("%x\r\n", storageIO.getVarHeader().getBytes().length);
-                                outstream.write(chunkSizeLine.getBytes());
+
+                        // Dynamic streams, etc. Normal operation. No leftToRead.
+                        if (ranges.isEmpty()) {
+                            logger.fine("Normal, non-range request of file id " + dataFile.getId());
+                            while ((bufsize = instream.read(bffr)) != -1) {
+                                outstream.write(bffr, 0, bufsize);
                             }
-                            outstream.write(storageIO.getVarHeader().getBytes());
-                            if (useChunkedTransfer) {
-                                outstream.write(chunkClose);
+                        } else if (leftToRead > 0) {
+                            // This is a rangeHeader request, and we still have bytes to read 
+                            // (for a tabular file, we may have already written enough
+                            // bytes from the variable header!)
+                            storageIO.setOffset(offset);
+                            // Thinking about it, we could just do instream.skip(offset) 
+                            // here... But I would like to have this offset functionality 
+                            // in StorageIO, for any future cases where we may not 
+                            // be able to do that on the stream directly (?) -- L.A.
+                            logger.fine("Range request of file id " + dataFile.getId());
+                            // Read a rangeHeader of bytes instead of the whole file. We'll count down as we write.
+                            // For now we only support a single rangeHeader.
+                            while ((bufsize = instream.read(bffr)) != -1) {
+                                if ((leftToRead -= bufsize) > 0) {
+                                    // Just do a normal write. Potentially lots to go. Don't break.
+                                    outstream.write(bffr, 0, bufsize);
+                                } else {
+                                    // Get those last bytes or bytes equal to bufsize. Last one. Then break.
+                                    outstream.write(bffr, 0, (int) leftToRead + bufsize);
+                                    break;
+                                }
                             }
-                        }
-                    }
 
-                    while ((bufsize = instream.read(bffr)) != -1) {
-                        if (useChunkedTransfer) {
-                            String chunkSizeLine = String.format("%x\r\n", bufsize);
-                            outstream.write(chunkSizeLine.getBytes());
                         }
-                        outstream.write(bffr, 0, bufsize);
-                        if (useChunkedTransfer) {
-                            outstream.write(chunkClose);
+
+                        logger.fine("di conversion param: " + di.getConversionParam() + ", value: " + di.getConversionParamValue());
+
+                        // Downloads of thumbnail images (scaled down, low-res versions of graphic image files) and 
+                        // "preprocessed metadata" records for tabular data files are NOT considered "real" downloads, 
+                        // so these should not produce guestbook entries: 
+                        if (di.getGbr() != null && !(isThumbnailDownload(di) || isPreprocessedMetadataDownload(di))) {
+                            try {
+                                logger.fine("writing guestbook response.");
+                                Command<?> cmd = new CreateGuestbookResponseCommand(di.getDataverseRequestService().getDataverseRequest(), di.getGbr(), di.getGbr().getDataFile().getOwner());
+                                di.getCommand().submit(cmd);
+                                MakeDataCountEntry entry = new MakeDataCountEntry(di.getRequestUriInfo(), di.getRequestHttpHeaders(), di.getDataverseRequestService(), di.getGbr().getDataFile());
+                                mdcLogService.logEntry(entry);
+                            } catch (CommandException e) {
+                            }
+                        } else {
+                            logger.fine("not writing guestbook response");
                         }
-                    }
 
-                    if (useChunkedTransfer) {
-                        String chunkClosing = "0\r\n\r\n";
-                        outstream.write(chunkClosing.getBytes());
+                        outstream.close();
+                        return;
                     }
-                    
-                    
-                    logger.fine("di conversion param: "+di.getConversionParam()+", value: "+di.getConversionParamValue());
-                    
-                    // Downloads of thumbnail images (scaled down, low-res versions of graphic image files) and 
-                    // "preprocessed metadata" records for tabular data files are NOT considered "real" downloads, 
-                    // so these should not produce guestbook entries: 
-                    
-                    if (di.getGbr() != null && !(isThumbnailDownload(di) || isPreprocessedMetadataDownload(di))) {
-                        try {
-                            logger.fine("writing guestbook response.");
-                            Command<?> cmd = new CreateGuestbookResponseCommand(di.getDataverseRequestService().getDataverseRequest(), di.getGbr(), di.getGbr().getDataFile().getOwner());
-                            di.getCommand().submit(cmd);
-                            MakeDataCountEntry entry = new MakeDataCountEntry(di.getRequestUriInfo(), di.getRequestHttpHeaders(), di.getDataverseRequestService(), di.getGbr().getDataFile());
-                            mdcLogService.logEntry(entry);
-                        } catch (CommandException e) {}
-                    } else {
-                        logger.fine("not writing guestbook response");
-                    } 
-                    
-                    instream.close();
-                    outstream.close(); 
-                    return;
                 }
             }
         }
-        
-        throw new WebApplicationException(Response.Status.NOT_FOUND);
 
+        throw new NotFoundException();
+
+    }
+
+    private boolean isAuxiliaryObjectCached(StorageIO storageIO, String auxiliaryTag) {
+        try {
+            return storageIO.isAuxObjectCached(auxiliaryTag);
+        } catch (IOException cachedIOE) {
+            return false; 
+        }
     }
     
+    // TODO: Return ".md" for "text/markdown" as well as other extensions in MimeTypeDetectionByFileExtension.properties
+    private String getFileExtension(AuxiliaryFile auxFile) {
+        String fileExtension = "";
+        if (auxFile == null) {
+            return fileExtension;
+        }
+        String contentType = auxFile.getContentType();
+        if (contentType != null) {
+            MimeTypes allTypes = MimeTypes.getDefaultMimeTypes();
+            try {
+                MimeType mimeType = allTypes.forName(contentType);
+                fileExtension = mimeType.getExtension();
+            } catch (MimeTypeException ex) {
+            }
+        }
+        return fileExtension;
+    }
+
     private boolean isThumbnailDownload(DownloadInstance downloadInstance) {
-        if (downloadInstance == null) return false; 
-        
-        if (downloadInstance.getConversionParam() == null) return false; 
-        
+        if (downloadInstance == null) {
+            return false;
+        }
+
+        if (downloadInstance.getConversionParam() == null) {
+            return false;
+        }
+
         return downloadInstance.getConversionParam().equals("imageThumb");
     }
-    
+
     private boolean isPreprocessedMetadataDownload(DownloadInstance downloadInstance) {
-        if (downloadInstance == null) return false; 
-        
-        if (downloadInstance.getConversionParam() == null) return false; 
-        
-        if (downloadInstance.getConversionParamValue() == null) return false; 
-        
+        if (downloadInstance == null) {
+            return false;
+        }
+
+        if (downloadInstance.getConversionParam() == null) {
+            return false;
+        }
+
+        if (downloadInstance.getConversionParamValue() == null) {
+            return false;
+        }
+
         return downloadInstance.getConversionParam().equals("format") && downloadInstance.getConversionParamValue().equals("prep");
     }
-    
+
     private long getContentSize(StorageIO<?> accessObject) {
-        long contentSize = 0; 
-        
+        long contentSize = 0;
+
         if (accessObject.getSize() > -1) {
-            contentSize+=accessObject.getSize();
+            contentSize += accessObject.getSize();
             if (accessObject.getVarHeader() != null) {
                 if (accessObject.getVarHeader().getBytes().length > 0) {
-                    contentSize+=accessObject.getVarHeader().getBytes().length;
+                    contentSize += accessObject.getVarHeader().getBytes().length;
                 }
             }
             return contentSize;
         }
         return -1;
     }
-    
+
     private long getFileSize(DownloadInstance di) {
         return getFileSize(di, null);
     }
-    
+
     private long getFileSize(DownloadInstance di, String extraHeader) {
-        if (di.getDownloadInfo() != null && di.getDownloadInfo().getDataFile() != null) {           
+        if (di.getDownloadInfo() != null && di.getDownloadInfo().getDataFile() != null) {
             DataFile df = di.getDownloadInfo().getDataFile();
-            
+
             // For non-tabular files, we probably know the file size: 
             // (except for when this is a thumbNail rquest on an image file - 
             // because the size will obviously be different... can still be 
@@ -423,7 +721,7 @@ private long getFileSize(DownloadInstance di, String extraHeader) {
                     return df.getFilesize();
                 }
             }
-            
+
             // For Tabular files:
             // If it's just a straight file download, it's pretty easy - we 
             // already know the size of the file on disk (just like in the 
@@ -432,7 +730,6 @@ private long getFileSize(DownloadInstance di, String extraHeader) {
             // size to the total... But the cases when it's a format conversion 
             // and, especially, subsets are of course trickier. (these are not
             // supported yet).
-            
             if (df.isTabularData() && (di.getConversionParam() == null || "".equals(di.getConversionParam()))) {
                 long fileSize = df.getFilesize();
                 if (fileSize > 0) {
@@ -445,13 +742,77 @@ private long getFileSize(DownloadInstance di, String extraHeader) {
         }
         return -1;
     }
-    
-    private boolean isRedirectToS3() {
-        String optionValue = System.getProperty("dataverse.files.s3-download-redirect");
-        if ("true".equalsIgnoreCase(optionValue)) {
-            return true;
+
+    /**
+     * @param range "bytes 0-10" for example. Found in the "Range" HTTP header.
+     * @param fileSize File size in bytes.
+     * @throws RunTimeException on any problems processing the Range header.
+     */
+    public List<Range> getRanges(String range, long fileSize) {
+        // Inspired by https://gist.github.com/davinkevin/b97e39d7ce89198774b4
+        // via https://stackoverflow.com/questions/28427339/how-to-implement-http-byte-rangeHeader-requests-in-spring-mvc/28479001#28479001
+        List<Range> ranges = new ArrayList<>();
+
+        if (range != null) {
+            logger.fine("Range header supplied: " + range);
+
+            // Technically this regex supports multiple ranges.
+            // Below we have a check to enforce a single range.
+            if (!range.matches("^bytes=\\d*-\\d*(,\\d*-\\d*)*$")) {
+                throw new RuntimeException("The format is bytes=<range-start>-<range-end> where start and end are optional.");
+            }
+
+            // The 6 is to remove "bytes="
+            String[] parts = range.substring(6).split(",");
+            if (parts.length > 1) {
+                // Only allow a single range.
+                throw new RuntimeException("Only one range is allowed.");
+            }
+            // This loop is here in case we ever want to support multiple ranges.
+            for (String part : parts) {
+
+                long start = getRangeStart(part);
+                long end = getRangeEnd(part);
+
+                if (start == -1) {
+                    // start does not exist. Base start off of how many bytes from end.
+                    start = fileSize - end;
+                    end = fileSize - 1;
+                } else if (end == -1 || end > fileSize - 1) {
+                    // Set end when it doesn't exist.
+                    // Also, automatically set end to size of file if end is beyond
+                    // the file size (rather than throwing an error).
+                    end = fileSize - 1;
+                }
+
+                if (start > end) {
+                    throw new RuntimeException("Start is larger than end or size of file.");
+                }
+
+                ranges.add(new Range(start, end));
+
+            }
         }
-        return false;
+
+        return ranges;
+    }
+
+    /**
+     * @return Return a positive long or -1 if start does not exist.
+     */
+    public static long getRangeStart(String part) {
+        // Get everything before the "-".
+        String start = part.substring(0, part.indexOf("-"));
+        return (start.length() > 0) ? Long.parseLong(start) : -1;
+    }
+
+    /**
+     * @return Return a positive long or -1 if end does not exist.
+     */
+    public static long getRangeEnd(String part) {
+        // Get everything after the "-".
+        String end = part.substring(part.indexOf("-") + 1, part.length());
+        return (end.length() > 0) ? Long.parseLong(end) : -1;
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/EditDDI.java b/src/main/java/edu/harvard/iq/dataverse/api/EditDDI.java
index 9bbb35fdf1c..1755e66823a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/EditDDI.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/EditDDI.java
@@ -1,5 +1,6 @@
 package edu.harvard.iq.dataverse.api;
 
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
@@ -24,20 +25,21 @@
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.datavariable.VariableCategory;
 import edu.harvard.iq.dataverse.datavariable.VariableMetadataDDIParser;
-
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.Path;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.PathParam;
+import edu.harvard.iq.dataverse.search.IndexServiceBean;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.PathParam;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
@@ -50,11 +52,9 @@
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Collection;
-import java.util.Date;
-import java.sql.Timestamp;
 
 
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolationException;
 
 @Stateless
 @Path("edit")
@@ -78,21 +78,22 @@ public class EditDDI  extends AbstractApiBean {
     @Inject
     DataverseRequestServiceBean dvRequestService;
 
+    @EJB
+    IndexServiceBean indexService;
+
     @Inject
     DataverseSession session;
 
     private List<FileMetadata> filesToBeDeleted = new ArrayList<>();
 
-    @Context
-    protected HttpServletRequest httpRequest;
-
     private VariableMetadataUtil variableMetadataUtil;
 
 
     @PUT
-    @Consumes("application/xml")
+    @AuthRequired
     @Path("{fileId}")
-    public Response edit (InputStream body, @PathParam("fileId") String fileId) {
+    @Consumes("application/xml")
+    public Response edit(@Context ContainerRequestContext crc, InputStream body, @PathParam("fileId") String fileId) {
         DataFile dataFile = null;
         try {
             dataFile = findDataFileOrDie(fileId);
@@ -100,7 +101,7 @@ public Response edit (InputStream body, @PathParam("fileId") String fileId) {
         } catch (WrappedResponse ex) {
             return ex.getResponse();
         }
-        User apiTokenUser = checkAuth(dataFile);
+        User apiTokenUser = checkAuth(getRequestUser(crc), dataFile);
 
         if (apiTokenUser == null) {
             return unauthorized("Cannot edit metadata, access denied" );
@@ -109,12 +110,16 @@ public Response edit (InputStream body, @PathParam("fileId") String fileId) {
         Map<Long, VariableMetadata> mapVarToVarMet = new HashMap<Long, VariableMetadata>();
         Map<Long,VarGroup> varGroupMap = new HashMap<Long, VarGroup>();
         try {
-            readXML(body, mapVarToVarMet,varGroupMap);
+            readXML(body, mapVarToVarMet, varGroupMap);
+        } catch (NullPointerException e) {
+                return error(Response.Status.BAD_REQUEST,e.getMessage() );
         } catch (XMLStreamException e) {
             logger.warning(e.getMessage());
-            return error(Response.Status.NOT_ACCEPTABLE, "bad xml file" );
+            return error(Response.Status.BAD_REQUEST, "bad xml file");
         }
 
+
+
         DatasetVersion latestVersion = dataFile.getOwner().getLatestVersion();
         Dataset dataset = latestVersion.getDataset();
 
@@ -141,7 +146,7 @@ public Response edit (InputStream body, @PathParam("fileId") String fileId) {
             boolean varUpdate = varUpdates(mapVarToVarMet, fml, neededToUpdateVM, false);
             if (varUpdate || groupUpdate) {
 
-                if (!updateDraftVersion(neededToUpdateVM, varGroupMap, dataset, latestVersion, groupUpdate, fml)) {
+                if (!updateDraftVersion(neededToUpdateVM, varGroupMap, dataset, apiTokenUser, groupUpdate, fml)) {
                     return error(Response.Status.INTERNAL_SERVER_ERROR, "Failed to update draft version" );
                 }
             } else {
@@ -184,7 +189,7 @@ private boolean createNewDraftVersion(ArrayList<VariableMetadata> neededToUpdate
         Command<Dataset> cmd;
         try {
 
-            DataverseRequest dr = new DataverseRequest(apiTokenUser, httpRequest);
+            DataverseRequest dr = createDataverseRequest(apiTokenUser);
             cmd = new UpdateDatasetVersionCommand(dataset, dr, fm);
             ((UpdateDatasetVersionCommand) cmd).setValidateLenient(true);
             dataset = commandEngine.submit(cmd);
@@ -226,7 +231,6 @@ private boolean createNewDraftVersion(ArrayList<VariableMetadata> neededToUpdate
             }
         }
 
-
         //add New groups
         for (VarGroup varGroup : varGroupMap.values()) {
             varGroup.setFileMetadata(fml);
@@ -239,6 +243,8 @@ private boolean createNewDraftVersion(ArrayList<VariableMetadata> neededToUpdate
             }
         }
 
+        boolean doNormalSolrDocCleanUp = true;
+        indexService.asyncIndexDataset(dataset, doNormalSolrDocCleanUp);
 
         return true;
     }
@@ -273,14 +279,9 @@ private void updateCategoryMetadata(VariableMetadata vmNew, VariableMetadata vmO
 
     }
 
-    private boolean updateDraftVersion(ArrayList<VariableMetadata> neededToUpdateVM, Map<Long,VarGroup> varGroupMap, Dataset dataset, DatasetVersion newDatasetVersion, boolean groupUpdate, FileMetadata fml ) {
+    private boolean updateDraftVersion(ArrayList<VariableMetadata> neededToUpdateVM, Map<Long,VarGroup> varGroupMap, Dataset dataset, User apiTokenUser, boolean groupUpdate, FileMetadata fml ) {
 
 
-        Timestamp updateTime = new Timestamp(new Date().getTime());
-
-        newDatasetVersion.setLastUpdateTime(updateTime);
-        dataset.setModificationTime(updateTime);
-
         for (int i = 0; i < neededToUpdateVM.size(); i++)  {
             VariableMetadata vm = neededToUpdateVM.get(i);
             DataVariable dv = em.find(DataVariable.class, vm.getDataVariable().getId() );
@@ -324,17 +325,49 @@ private boolean updateDraftVersion(ArrayList<VariableMetadata> neededToUpdateVM,
                 em.merge(varGroup);
             }
         }
+        Command<Dataset> cmd;
+        try {
+            DataverseRequest dr = createDataverseRequest(apiTokenUser);
+            cmd = new UpdateDatasetVersionCommand(dataset, dr);
+            ((UpdateDatasetVersionCommand) cmd).setValidateLenient(true);
+            commandEngine.submit(cmd);
+
+        } catch (EJBException ex) {
+            StringBuilder error = new StringBuilder();
+            error.append(ex).append(" ");
+            error.append(ex.getMessage()).append(" ");
+            Throwable cause = ex;
+            while (cause.getCause() != null) {
+                cause = cause.getCause();
+                error.append(cause).append(" ");
+                error.append(cause.getMessage()).append(" ");
+            }
+            logger.log(Level.SEVERE, "Couldn''t save dataset: {0}", error.toString());
+
+            return false;
+        } catch (CommandException ex) { ;
+            logger.log(Level.SEVERE, "Couldn''t save dataset: {0}", ex.getMessage());
+            return false;
+        }
 
         return true;
     }
 
-    private  void readXML(InputStream body, Map<Long,VariableMetadata> mapVarToVarMet, Map<Long,VarGroup> varGroupMap) throws XMLStreamException {
-        XMLInputFactory factory=XMLInputFactory.newInstance();
+    private void readXML(InputStream body, Map<Long,VariableMetadata> mapVarToVarMet, Map<Long,VarGroup> varGroupMap) throws XMLStreamException, NullPointerException {
+
+        XMLInputFactory factory=XmlUtil.getSecureXMLInputFactory();
         XMLStreamReader xmlr=factory.createXMLStreamReader(body);
-        VariableMetadataDDIParser vmdp = new VariableMetadataDDIParser();
 
-        vmdp.processDataDscr(xmlr,mapVarToVarMet, varGroupMap);
+        VariableMetadataDDIParser vmdp = new VariableMetadataDDIParser();
 
+        vmdp.processDataDscr(xmlr, mapVarToVarMet, varGroupMap);
+        if (xmlr != null) {
+            try {
+                xmlr.close();
+            } catch (XMLStreamException e) {
+                logger.warning("XMLStreamException closing XMLStreamReader in readXml");
+            }
+        }
     }
 
     private boolean newGroups(Map<Long,VarGroup> varGroupMap, FileMetadata fm) {
@@ -397,27 +430,10 @@ private boolean AreDefaultValues(VariableMetadata varMet) {
     }
 
 
-    private User checkAuth(DataFile dataFile) {
-
-        User apiTokenUser = null;
-
-        try {
-            apiTokenUser = findUserOrDie();
-        } catch (WrappedResponse wr) {
-            apiTokenUser = null;
-            logger.log(Level.FINE, "Message from findUserOrDie(): {0}", wr.getMessage());
-        }
-
-        if (apiTokenUser != null) {
-            // used in an API context
-            if (!permissionService.requestOn(createDataverseRequest(apiTokenUser), dataFile.getOwner()).has(Permission.EditDataset)) {
-                apiTokenUser = null;
-            }
+    private User checkAuth(User requestUser, DataFile dataFile) {
+        if (!permissionService.requestOn(createDataverseRequest(requestUser), dataFile.getOwner()).has(Permission.EditDataset)) {
+            return null;
         }
-
-        return apiTokenUser;
-
+        return requestUser;
     }
 }
-
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/ExternalTools.java b/src/main/java/edu/harvard/iq/dataverse/api/ExternalTools.java
index aef30bfb0c2..1feac1141bb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/ExternalTools.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/ExternalTools.java
@@ -1,19 +1,18 @@
 package edu.harvard.iq.dataverse.api;
 
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
-import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool;
 import edu.harvard.iq.dataverse.externaltools.ExternalToolServiceBean;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
 
 @Path("admin/externalTools")
 public class ExternalTools extends AbstractApiBean {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/ExternalToolsApi.java b/src/main/java/edu/harvard/iq/dataverse/api/ExternalToolsApi.java
new file mode 100644
index 00000000000..92139d86caf
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/ExternalToolsApi.java
@@ -0,0 +1,58 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+
+@Path("externalTools")
+public class ExternalToolsApi extends AbstractApiBean {
+
+    @Inject
+    ExternalTools externalTools;
+
+    @GET
+    public Response getExternalTools() {
+        return externalTools.getExternalTools();
+    }
+
+    @GET
+    @Path("{id}")
+    public Response getExternalTool(@PathParam("id") long externalToolIdFromUser) {
+        return externalTools.getExternalTool(externalToolIdFromUser);
+    }
+
+    @POST
+    @AuthRequired
+    public Response addExternalTool(@Context ContainerRequestContext crc, String manifest) {
+        Response notAuthorized = authorize(crc);
+        return notAuthorized == null ? externalTools.addExternalTool(manifest) : notAuthorized;
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("{id}")
+    public Response deleteExternalTool(@Context ContainerRequestContext crc, @PathParam("id") long externalToolIdFromUser) {
+        Response notAuthorized = authorize(crc);
+        return notAuthorized == null ? externalTools.deleteExternalTool(externalToolIdFromUser) : notAuthorized;
+    }
+
+    private Response authorize(ContainerRequestContext crc) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/FeedbackApi.java b/src/main/java/edu/harvard/iq/dataverse/api/FeedbackApi.java
index 7c81fe1a892..56c5ca95ce6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/FeedbackApi.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/FeedbackApi.java
@@ -2,50 +2,62 @@
 
 import edu.harvard.iq.dataverse.DataverseSession;
 import edu.harvard.iq.dataverse.DvObject;
-import edu.harvard.iq.dataverse.DvObjectServiceBean;
+import edu.harvard.iq.dataverse.MailServiceBean;
+import edu.harvard.iq.dataverse.SendFeedbackDialog;
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
 import edu.harvard.iq.dataverse.feedback.Feedback;
 import edu.harvard.iq.dataverse.feedback.FeedbackUtil;
-import java.util.List;
-import javax.ejb.EJB;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
+
+import jakarta.ejb.EJB;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 @Path("admin/feedback")
 public class FeedbackApi extends AbstractApiBean {
 
-    @EJB
-    DvObjectServiceBean dvObjectSvc;
-
+    @EJB MailServiceBean mailService;
+    
+    /**
+     * This method mimics the contact form and sends an email to the contacts of the
+     * specified Collection/Dataset/DataFile, optionally ccing the support email
+     * address, or to the support email address when there is no target object.
+     * 
+     * !!!!! This should not be moved outside the /admin path unless/until some form
+     * of captcha or other spam-prevention mechanism is added. As is, it allows an
+     * unauthenticated user (with access to the /admin api path) to send email from
+     * anyone to any contacts in Dataverse. (It also does not do much to validate
+     * user input (e.g. to strip potentially malicious html, etc.)!!!!
+     **/
     @POST
-    public Response submitFeedback(JsonObject jsonObject) throws AddressException {
-        JsonNumber jsonNumber = jsonObject.getJsonNumber("id");
-        DvObject recipient = null;
+    public Response submitFeedback(JsonObject jsonObject) {
+        JsonNumber jsonNumber = jsonObject.getJsonNumber("targetId");
+        DvObject feedbackTarget = null;
         if (jsonNumber != null) {
-            recipient = dvObjectSvc.findDvObject(jsonNumber.longValue());
+            feedbackTarget =  dvObjSvc.findDvObject(jsonNumber.longValue());
+            if(feedbackTarget==null) {
+                return error(Status.BAD_REQUEST, "Feedback target object not found");
+            }
         }
         DataverseSession dataverseSession = null;
         String userMessage = jsonObject.getString("body");
-        String systemEmail = "support@librascholar.edu";
-        InternetAddress systemAddress = new InternetAddress(systemEmail);
+        InternetAddress systemAddress = mailService.getSupportAddress().orElse(null);
         String userEmail = jsonObject.getString("fromEmail");
         String messageSubject = jsonObject.getString("subject");
         String baseUrl = systemConfig.getDataverseSiteUrl();
-        String rootDataverseName = dataverseSvc.findRootDataverse().getName();
-        String installationBrandName = BrandingUtil.getInstallationBrandName(rootDataverseName);
-        String supportTeamName = BrandingUtil.getSupportTeamName(systemAddress, rootDataverseName);
+        String installationBrandName = BrandingUtil.getInstallationBrandName();
+        String supportTeamName = BrandingUtil.getSupportTeamName(systemAddress);
         JsonArrayBuilder jab = Json.createArrayBuilder();
-        List<Feedback> feedbacks = FeedbackUtil.gatherFeedback(recipient, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        feedbacks.forEach((feedback) -> {
-            jab.add(feedback.toJsonObjectBuilder());
-        });
+        Feedback feedback = FeedbackUtil.gatherFeedback(feedbackTarget, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, SendFeedbackDialog.ccSupport(feedbackTarget));
+        jab.add(feedback.toJsonObjectBuilder());
+        mailService.sendMail(feedback.getFromEmail(), feedback.getToEmail(), feedback.getCcEmail(), feedback.getSubject(), feedback.getBody());
         return ok(jab);
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Files.java b/src/main/java/edu/harvard/iq/dataverse/api/Files.java
index 8948baec791..5834e7e0008 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Files.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Files.java
@@ -1,68 +1,77 @@
 package edu.harvard.iq.dataverse.api;
 
+import com.google.api.client.util.Lists;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetLock;
-import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
-import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
-import edu.harvard.iq.dataverse.EjbDataverseEngine;
-import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.UserNotificationServiceBean;
-import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.datasetutility.AddReplaceFileHelper;
 import edu.harvard.iq.dataverse.datasetutility.DataFileTagException;
 import edu.harvard.iq.dataverse.datasetutility.NoFilesException;
 import edu.harvard.iq.dataverse.datasetutility.OptionalFileParams;
+import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteMapLayerMetadataCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetDataFileCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetDraftFileMetadataIfAvailableCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.RedetectFileTypeCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.RestrictFileCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UningestFileCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
-import edu.harvard.iq.dataverse.export.ExportException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.engine.command.impl.*;
 import edu.harvard.iq.dataverse.export.ExportService;
+import io.gdcc.spi.export.ExportException;
+import edu.harvard.iq.dataverse.externaltools.ExternalTool;
+import edu.harvard.iq.dataverse.externaltools.ExternalToolHandler;
 import edu.harvard.iq.dataverse.ingest.IngestRequest;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
+import edu.harvard.iq.dataverse.ingest.IngestUtil;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.URLTokenUtil;
+
+import static edu.harvard.iq.dataverse.api.ApiConstants.*;
+import static edu.harvard.iq.dataverse.api.Datasets.handleVersion;
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import javax.ws.rs.core.UriInfo;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.inject.Inject;
+import jakarta.json.*;
+import jakarta.json.stream.JsonParsingException;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.jsonDT;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+
+import jakarta.ws.rs.core.UriInfo;
+
+import org.eclipse.microprofile.openapi.annotations.Operation;
+import org.eclipse.microprofile.openapi.annotations.media.Content;
+import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody;
+import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
+import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
@@ -90,7 +99,13 @@ public class Files extends AbstractApiBean {
     SettingsServiceBean settingsService;
     @Inject
     MakeDataCountLoggingServiceBean mdcLogService;
-    
+    @Inject
+    GuestbookResponseServiceBean guestbookResponseService;
+    @Inject
+    DataFileServiceBean dataFileServiceBean;
+    @Inject
+    FileMetadataVersionsHelper fileMetadataVersionsHelper;
+
     private static final Logger logger = Logger.getLogger(Files.class.getName());
     
     
@@ -114,8 +129,9 @@ private void msgt(String m){
      * @return
      */
     @PUT
+    @AuthRequired
     @Path("{id}/restrict")
-    public Response restrictFileInDataset(@PathParam("id") String fileToRestrictId, String restrictStr) {
+    public Response restrictFileInDataset(@Context ContainerRequestContext crc, @PathParam("id") String fileToRestrictId, String restrictStr) {
         //create request
         DataverseRequest dataverseRequest = null;
         //get the datafile
@@ -126,17 +142,43 @@ public Response restrictFileInDataset(@PathParam("id") String fileToRestrictId,
             return error(BAD_REQUEST, "Could not find datafile with id " + fileToRestrictId);
         }
 
-        boolean restrict = Boolean.valueOf(restrictStr);
-  
-        try {
-            dataverseRequest = createDataverseRequest(findUserOrDie());
-        } catch (WrappedResponse wr) {
-            return error(BAD_REQUEST, "Couldn't find user to execute command: " + wr.getLocalizedMessage());
+        Boolean restrict = null;
+        Boolean enableAccessRequest = null;
+        String termsOfAccess = null;
+        String returnMessage = " ";
+        // Backward comparability - allow true/false in string(old) or json(new)
+        if (restrictStr != null && restrictStr.trim().startsWith("{")) {
+            // process as json
+            jakarta.json.JsonObject jsonObject;
+            try (StringReader stringReader = new StringReader(restrictStr)) {
+                jsonObject = Json.createReader(stringReader).readObject();
+                if (jsonObject.containsKey("restrict")) {
+                    restrict = Boolean.valueOf(jsonObject.getBoolean("restrict"));
+                    returnMessage += restrict ? "restricted." : "unrestricted.";
+                } else {
+                    return badRequest("Error parsing Json: 'restrict' is required.");
+                }
+                if (jsonObject.containsKey("enableAccessRequest")) {
+                    enableAccessRequest = Boolean.valueOf(jsonObject.getBoolean("enableAccessRequest"));
+                    returnMessage += " Access Request is " + (enableAccessRequest ? "enabled." : "disabled.");
+                }
+                if (jsonObject.containsKey("termsOfAccess")) {
+                    termsOfAccess = jsonObject.getString("termsOfAccess");
+                    returnMessage += " Terms of Access for restricted files: " + termsOfAccess;
+                }
+            } catch (JsonParsingException jpe) {
+                return badRequest("Error parsing Json: " + jpe.getMessage());
+            }
+        } else {
+            restrict = Boolean.valueOf(restrictStr);
+            returnMessage += restrict ? "restricted." : "unrestricted.";
         }
 
+        dataverseRequest = createDataverseRequest(getRequestUser(crc));
+
         // try to restrict the datafile
         try {
-            engineSvc.submit(new RestrictFileCommand(dataFile, dataverseRequest, restrict));
+            engineSvc.submit(new RestrictFileCommand(dataFile, dataverseRequest, restrict, enableAccessRequest, termsOfAccess));
         } catch (CommandException ex) {
             return error(BAD_REQUEST, "Problem trying to update restriction status on " + dataFile.getDisplayName() + ": " + ex.getLocalizedMessage());
         }
@@ -144,12 +186,17 @@ public Response restrictFileInDataset(@PathParam("id") String fileToRestrictId,
         // update the dataset
         try {
             engineSvc.submit(new UpdateDatasetVersionCommand(dataFile.getOwner(), dataverseRequest));
+        } catch (IllegalCommandException ex) {
+            //special case where terms of use are out of compliance   
+            if (!TermsOfUseAndAccessValidator.isTOUAValid(dataFile.getOwner().getLatestVersion().getTermsOfUseAndAccess(), null)) {
+                return conflict(BundleUtil.getStringFromBundle("dataset.message.toua.invalid"));
+            }
+            return error(BAD_REQUEST, "Problem saving datafile " + dataFile.getDisplayName() + ": " + ex.getLocalizedMessage());
         } catch (CommandException ex) {
             return error(BAD_REQUEST, "Problem saving datafile " + dataFile.getDisplayName() + ": " + ex.getLocalizedMessage());
         }
 
-        String text =  restrict ? "restricted." : "unrestricted.";
-        return ok("File " + dataFile.getDisplayName() + " " + text);
+        return ok("File " + dataFile.getDisplayName() + returnMessage);
     }
         
     
@@ -165,9 +212,19 @@ public Response restrictFileInDataset(@PathParam("id") String fileToRestrictId,
      * @return 
      */
     @POST
+    @AuthRequired
     @Path("{id}/replace")
     @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Produces("application/json")
+    @Operation(summary = "Replace a file on a dataset", 
+               description = "Replace a file to a dataset")
+    @APIResponse(responseCode = "200",
+               description = "File replaced successfully on the dataset")
+    @Tag(name = "replaceFilesInDataset", 
+         description = "Replace a file to a dataset")
+    @RequestBody(content = @Content(mediaType = MediaType.MULTIPART_FORM_DATA)) 
     public Response replaceFileInDataset(
+                    @Context ContainerRequestContext crc,
                     @PathParam("id") String fileIdOrPersistentId,
                     @FormDataParam("jsonData") String jsonData,
                     @FormDataParam("file") InputStream testFileInputStream,
@@ -178,15 +235,8 @@ public Response replaceFileInDataset(
         if (!systemConfig.isHTTPUpload()) {
             return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.httpDisabled"));
         }
-        // (1) Get the user from the API key
-        User authUser;
-        try {
-            authUser = findUserOrDie();
-        } catch (AbstractApiBean.WrappedResponse ex) {
-            return error(Response.Status.FORBIDDEN, 
-                    BundleUtil.getStringFromBundle("file.addreplace.error.auth")
-                    );
-        }
+        // (1) Get the user from the ContainerRequestContext
+        User authUser = getRequestUser(crc);
 
         // (2) Check/Parse the JSON (if uploaded)  
         Boolean forceReplace = false;
@@ -207,19 +257,34 @@ public Response replaceFileInDataset(
                     //  - Will skip extra attributes which includes fileToReplaceId and forceReplace
                     optionalFileParams = new OptionalFileParams(jsonData);
                 } catch (DataFileTagException ex) {
-                    return error(Response.Status.BAD_REQUEST, ex.getMessage());
+                    return error(BAD_REQUEST, ex.getMessage());
                 }
-            } catch (ClassCastException ex) {
-                logger.info("Exception parsing string '" + jsonData + "': " + ex);
+            } catch (ClassCastException | com.google.gson.JsonParseException ex) {
+                return error(BAD_REQUEST, BundleUtil.getStringFromBundle("file.addreplace.error.parsing"));
             }
         }
 
         // (3) Get the file name and content type
-        if(null == contentDispositionHeader) {
-             return error(BAD_REQUEST, "You must upload a file.");
+        String newFilename = null;
+        String newFileContentType = null;
+        String newStorageIdentifier = null;
+        if (null == contentDispositionHeader) {
+            if (optionalFileParams.hasStorageIdentifier()) {
+                newStorageIdentifier = optionalFileParams.getStorageIdentifier();
+                if (optionalFileParams.hasFileName()) {
+                    newFilename = optionalFileParams.getFileName();
+                    if (optionalFileParams.hasMimetype()) {
+                        newFileContentType = optionalFileParams.getMimeType();
+                    }
+                }
+            } else {
+                return error(BAD_REQUEST,
+                        "You must upload a file or provide a valid storageidentifier, filename, and mimetype.");
+            }
+        } else {
+            newFilename = contentDispositionHeader.getFileName();
+            newFileContentType = formDataBodyPart.getMediaType().toString();
         }
-        String newFilename = contentDispositionHeader.getFileName();
-        String newFileContentType = formDataBodyPart.getMediaType().toString();
         
         // (4) Create the AddReplaceFileHelper object
         msg("REPLACE!");
@@ -238,29 +303,27 @@ public Response replaceFileInDataset(
         try {
             DataFile dataFile = findDataFileOrDie(fileIdOrPersistentId);
             fileToReplaceId = dataFile.getId();
-            
-            if (dataFile.isFilePackage()) {                           
-                return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.alreadyHasPackageFile"));
+
+            if (dataFile.isFilePackage()) {
+                return error(Response.Status.SERVICE_UNAVAILABLE,
+                        BundleUtil.getStringFromBundle("file.api.alreadyHasPackageFile"));
+            }
+
+            if (forceReplace) {
+                addFileHelper.runForceReplaceFile(fileToReplaceId, newFilename, newFileContentType,
+                        newStorageIdentifier, testFileInputStream, dataFile.getOwner(), optionalFileParams);
+            } else {
+                addFileHelper.runReplaceFile(fileToReplaceId, newFilename, newFileContentType, newStorageIdentifier,
+                        testFileInputStream, dataFile.getOwner(), optionalFileParams);
             }
         } catch (WrappedResponse ex) {
-            String error = BundleUtil.getStringFromBundle("file.addreplace.error.existing_file_to_replace_not_found_by_id", Arrays.asList(fileIdOrPersistentId));
-            // TODO: Some day, return ex.getResponse() instead. Also run FilesIT and updated expected status code and message.
+            String error = BundleUtil.getStringFromBundle(
+                    "file.addreplace.error.existing_file_to_replace_not_found_by_id",
+                    Arrays.asList(fileIdOrPersistentId));
+            // TODO: Some day, return ex.getResponse() instead. Also run FilesIT and updated
+            // expected status code and message.
             return error(BAD_REQUEST, error);
         }
-        if (forceReplace){
-            addFileHelper.runForceReplaceFile(fileToReplaceId,
-                                    newFilename,
-                                    newFileContentType,
-                                    testFileInputStream,
-                                    optionalFileParams);
-        }else{
-            addFileHelper.runReplaceFile(fileToReplaceId,
-                                    newFilename,
-                                    newFileContentType,
-                                    testFileInputStream,
-                                    optionalFileParams);            
-        }    
-            
         msg("we're back.....");
         if (addFileHelper.hasError()){
             msg("yes, has error");          
@@ -286,27 +349,75 @@ public Response replaceFileInDataset(
                 //"Look at that!  You added a file! (hey hey, it may have worked)");
             } catch (NoFilesException ex) {
                 Logger.getLogger(Files.class.getName()).log(Level.SEVERE, null, ex);
-                return error(Response.Status.BAD_REQUEST, "NoFileException!  Serious Error! See administrator!");
+                return error(BAD_REQUEST, "NoFileException!  Serious Error! See administrator!");
 
             }
         }
             
     } // end: replaceFileInDataset
+
+    /**
+     * Delete an Existing File 
+     * 
+     * @param id file ID or peristent ID
+     */
+    @DELETE
+    @AuthRequired
+    @Path("{id}")
+    public Response deleteFileInDataset(@Context ContainerRequestContext crc, @PathParam("id") String fileIdOrPersistentId){
+        // (1) Get the user from the API key and create request
+        User authUser = getRequestUser(crc);
+        DataverseRequest dvRequest = createDataverseRequest(authUser);
+
+        // (2) Delete
+        boolean deletePhysicalFile = false;
+        try {
+            DataFile dataFile = findDataFileOrDie(fileIdOrPersistentId);
+            FileMetadata fileToDelete = dataFile.getLatestFileMetadata();
+            Dataset dataset = dataFile.getOwner();
+            dataset.getOrCreateEditVersion();
+            deletePhysicalFile = !dataFile.isReleased();
+
+            UpdateDatasetVersionCommand update_cmd = new UpdateDatasetVersionCommand(dataset, dvRequest,  Arrays.asList(fileToDelete));
+            update_cmd.setValidateLenient(true);
+
+            try {
+                commandEngine.submit(update_cmd);
+            } catch (CommandException ex) {
+                return error(BAD_REQUEST, "Delete failed for file ID " + fileIdOrPersistentId + " (CommandException): " + ex.getMessage());
+            } catch (EJBException ex) {
+                return error(BAD_REQUEST, "Delete failed for file ID " + fileIdOrPersistentId + "(EJBException): " + ex.getMessage());
+            }
+    
+            if (deletePhysicalFile) {
+                try {
+                    fileService.finalizeFileDelete(dataFile.getId(), fileService.getPhysicalFileToDelete(dataFile));
+                } catch (IOException ioex) {
+                    logger.warning("Failed to delete the physical file associated with the deleted datafile id="
+                            + dataFile.getId() + ", storage location: " + fileService.getPhysicalFileToDelete(dataFile));
+                }
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        return ok(deletePhysicalFile);
+    }
     
     //Much of this code is taken from the replace command, 
     //simplified as we aren't actually switching files
     @POST
+    @AuthRequired
     @Path("{id}/metadata")
-    public Response updateFileMetadata(@FormDataParam("jsonData") String jsonData,
-                    @PathParam("id") String fileIdOrPersistentId
-        ) throws DataFileTagException, CommandException {
+    public Response updateFileMetadata(@Context ContainerRequestContext crc, @FormDataParam("jsonData") String jsonData,
+                    @PathParam("id") String fileIdOrPersistentId, @QueryParam("sourceLastUpdateTime") String sourceLastUpdateTime) {
         
         FileMetadata upFmd = null;
         
         try {
             DataverseRequest req;
             try {
-                req = createDataverseRequest(findUserOrDie());
+                req = createDataverseRequest(getRequestUser(crc));
             } catch (Exception e) {
                 return error(BAD_REQUEST, "Error attempting to request information. Maybe a bad API token?");
             }
@@ -317,8 +428,13 @@ public Response updateFileMetadata(@FormDataParam("jsonData") String jsonData,
                 return error(BAD_REQUEST, "Error attempting get the requested data file.");
             }
 
-            
-            User authUser = findUserOrDie();
+            if (sourceLastUpdateTime != null) {
+                try {
+                    validateInternalTimestampIsNotOutdated(df, sourceLastUpdateTime);
+                } catch (WrappedResponse wr) {
+                    return wr.getResponse();
+                }
+            }
 
             //You shouldn't be trying to edit a datafile that has been replaced
             List<Long> result = em.createNamedQuery("DataFile.findDataFileThatReplacedId", Long.class)
@@ -329,7 +445,7 @@ public Response updateFileMetadata(@FormDataParam("jsonData") String jsonData,
                 //we get the data file to do a permissions check, if this fails it'll go to the WrappedResponse below for an ugly unpermitted error
                 execCommand(new GetDataFileCommand(req, findDataFileOrDie(result.get(0).toString())));
 
-                return error(Response.Status.BAD_REQUEST, "You cannot edit metadata on a dataFile that has been replaced. Please try again with the newest file id.");
+                return error(BAD_REQUEST, "You cannot edit metadata on a dataFile that has been replaced. Please try again with the newest file id.");
             }
 
             // (2) Check/Parse the JSON (if uploaded)  
@@ -351,15 +467,15 @@ public Response updateFileMetadata(@FormDataParam("jsonData") String jsonData,
                         //  - Will skip extra attributes which includes fileToReplaceId and forceReplace
                         optionalFileParams = new OptionalFileParams(jsonData);
                     } catch (DataFileTagException ex) {
-                        return error(Response.Status.BAD_REQUEST, ex.getMessage());
+                        return error(BAD_REQUEST, ex.getMessage());
                     }
                 } catch (ClassCastException | com.google.gson.JsonParseException ex) {
-                    return error(Response.Status.BAD_REQUEST, "Exception parsing provided json");
+                    return error(BAD_REQUEST, BundleUtil.getStringFromBundle("file.addreplace.error.parsing"));
                 }
             }
 
             try {
-                DatasetVersion editVersion = df.getOwner().getEditVersion();
+                DatasetVersion editVersion = df.getOwner().getOrCreateEditVersion();
 
                 //We get the new fileMetadata from the new version
                 //This is because after generating the draft with getEditVersion,
@@ -368,14 +484,36 @@ public Response updateFileMetadata(@FormDataParam("jsonData") String jsonData,
                 List<FileMetadata> fmdList = editVersion.getFileMetadatas();
                 for(FileMetadata testFmd : fmdList) {
                     DataFile daf = testFmd.getDataFile();
-                    if(daf.getChecksumType().equals(df.getChecksumType())
-                        && daf.getChecksumValue().equals(df.getChecksumValue())) {
-                        upFmd = testFmd;
+                    if(daf.equals(df)){
+                       upFmd = testFmd;
+                       break;
                     }
                 }
                 
                 if (upFmd == null){
-                    return error(Response.Status.BAD_REQUEST, "An error has occurred attempting to update the requested DataFile. It is not part of the current version of the Dataset.");
+                    return error(BAD_REQUEST, "An error has occurred attempting to update the requested DataFile. It is not part of the current version of the Dataset.");
+                }
+
+                jakarta.json.JsonObject jsonObject = JsonUtil.getJsonObject(jsonData);
+                String incomingLabel = jsonObject.getString("label", null);
+                String incomingDirectoryLabel = jsonObject.getString("directoryLabel", null);
+                String existingLabel = df.getFileMetadata().getLabel();
+                String existingDirectoryLabel = df.getFileMetadata().getDirectoryLabel();
+                String pathPlusFilename = IngestUtil.getPathAndFileNameToCheck(incomingLabel, incomingDirectoryLabel, existingLabel, existingDirectoryLabel);
+                // We remove the current file from the list we'll check for duplicates.
+                // Instead, the current file is passed in as pathPlusFilename.
+                // the original test fails for published datasets/new draft because the filemetadata
+                // lacks an id for the "equals" test. Changing test to datafile for #11208
+                List<FileMetadata> fmdListMinusCurrentFile = new ArrayList<>();
+                
+                for (FileMetadata fileMetadata : fmdList) {
+                    if (!fileMetadata.getDataFile().equals(df)) {
+                        fmdListMinusCurrentFile.add(fileMetadata);
+                    }
+                }
+                
+                if (IngestUtil.conflictsWithExistingFilenames(pathPlusFilename, fmdListMinusCurrentFile)) {
+                    return error(BAD_REQUEST, BundleUtil.getStringFromBundle("files.api.metadata.update.duplicateFile", Arrays.asList(pathPlusFilename)));
                 }
 
                 optionalFileParams.addOptionalParams(upFmd);
@@ -384,11 +522,11 @@ public Response updateFileMetadata(@FormDataParam("jsonData") String jsonData,
 
             } catch (Exception e) {
                 logger.log(Level.WARNING, "Dataset publication finalization: exception while exporting:{0}", e);
-                return error(Response.Status.INTERNAL_SERVER_ERROR, "Error adding metadata to DataFile" + e);
+                return error(Response.Status.INTERNAL_SERVER_ERROR, "Error adding metadata to DataFile: " + e);
             }
 
-        } catch (WrappedResponse wr) {
-            return error(Response.Status.BAD_REQUEST, "An error has occurred attempting to update the requested DataFile, likely related to permissions.");
+        } catch (CommandException | WrappedResponse ex) {
+            return error(BAD_REQUEST, "An error has occurred attempting to update the requested DataFile, likely related to permissions.");
         }
 
         String jsonString = upFmd.asGsonObject(true).toString();
@@ -399,13 +537,90 @@ public Response updateFileMetadata(@FormDataParam("jsonData") String jsonData,
                 .type(MediaType.TEXT_PLAIN) //Our plain text string is already json
                 .build();
     }
+
+    @GET
+    @AuthRequired
+    @Path("{id}")
+    public Response getFileData(@Context ContainerRequestContext crc,
+                                @PathParam("id") String fileIdOrPersistentId,
+                                @QueryParam("includeDeaccessioned") boolean includeDeaccessioned,
+                                @QueryParam("returnDatasetVersion") boolean returnDatasetVersion,
+                                @QueryParam("returnOwners") boolean returnOwners,
+                                @Context UriInfo uriInfo,
+                                @Context HttpHeaders headers) {
+        return response( req -> getFileDataResponse(req, fileIdOrPersistentId, DS_VERSION_LATEST, includeDeaccessioned, returnDatasetVersion, returnOwners, uriInfo, headers), getRequestUser(crc));
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/versions/{datasetVersionId}")
+    public Response getFileDataForVersion(@Context ContainerRequestContext crc,
+                                @PathParam("id") String fileIdOrPersistentId,
+                                @PathParam("datasetVersionId") String datasetVersionId,
+                                @QueryParam("includeDeaccessioned") boolean includeDeaccessioned,
+                                @QueryParam("returnDatasetVersion") boolean returnDatasetVersion,
+                                @QueryParam("returnOwners") boolean returnOwners,
+                                @Context UriInfo uriInfo,
+                                @Context HttpHeaders headers) {
+        return response( req -> getFileDataResponse(req, fileIdOrPersistentId, datasetVersionId, includeDeaccessioned, returnDatasetVersion, returnOwners, uriInfo, headers), getRequestUser(crc));
+    }
+
+    private Response getFileDataResponse(final DataverseRequest req,
+                                         String fileIdOrPersistentId,
+                                         String datasetVersionId,
+                                         boolean includeDeaccessioned,
+                                         boolean returnDatasetVersion,
+                                         boolean returnOwners,
+                                         UriInfo uriInfo,
+                                         HttpHeaders headers) throws WrappedResponse {
+        final DataFile dataFile = execCommand(new GetDataFileCommand(req, findDataFileOrDie(fileIdOrPersistentId)));
+        FileMetadata fileMetadata = execCommand(handleVersion(datasetVersionId, new Datasets.DsVersionHandler<>() {
+            @Override
+            public Command<FileMetadata> handleLatest() {
+                return new GetLatestAccessibleFileMetadataCommand(req, dataFile, includeDeaccessioned);
+            }
+
+            @Override
+            public Command<FileMetadata> handleDraft() {
+                return new GetDraftFileMetadataIfAvailableCommand(req, dataFile);
+            }
+
+            @Override
+            public Command<FileMetadata> handleSpecific(long major, long minor) {
+                return new GetSpecificPublishedFileMetadataByDatasetVersionCommand(req, dataFile, major, minor, includeDeaccessioned);
+            }
+
+            @Override
+            public Command<FileMetadata> handleLatestPublished() {
+                return new GetLatestPublishedFileMetadataCommand(req, dataFile, includeDeaccessioned);
+            }
+        }));
+
+        if (fileMetadata == null) {
+            throw new WrappedResponse(notFound(BundleUtil.getStringFromBundle("files.api.notFoundInVersion", Arrays.asList(fileIdOrPersistentId, datasetVersionId))));
+        }
+
+        if (fileMetadata.getDatasetVersion().isReleased()) {
+            MakeDataCountLoggingServiceBean.MakeDataCountEntry entry = new MakeDataCountLoggingServiceBean.MakeDataCountEntry(uriInfo, headers, dvRequestService, dataFile);
+            mdcLogService.logEntry(entry);
+        } 
+                    
+        return Response.ok(Json.createObjectBuilder()
+                .add("status", ApiConstants.STATUS_OK)
+                .add("data", json(fileMetadata, returnOwners, returnDatasetVersion)).build())
+                .type(MediaType.APPLICATION_JSON)
+                .build();
+    }
     
-    @GET                             
+
+    @GET
+    @AuthRequired
     @Path("{id}/metadata")
-    public Response getFileMetadata(@PathParam("id") String fileIdOrPersistentId, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response, Boolean getDraft) throws WrappedResponse, Exception {
-            DataverseRequest req;
+    public Response getFileMetadata(@Context ContainerRequestContext crc, @PathParam("id") String fileIdOrPersistentId, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response, Boolean getDraft) throws WrappedResponse, Exception {
+        //ToDo - versionId is not used - can't get metadata for earlier versions
+        DataverseRequest req;
             try {
-                req = createDataverseRequest(findUserOrDie());
+                req = createDataverseRequest(getRequestUser(crc));
             } catch (Exception e) {
                 return error(BAD_REQUEST, "Error attempting to request information. Maybe a bad API token?");
             }
@@ -424,7 +639,7 @@ public Response getFileMetadata(@PathParam("id") String fileIdOrPersistentId, @P
                     return error(BAD_REQUEST, "An error occurred getting a draft version, you may not have permission to access unpublished data on this dataset." );
                 }
                 if(null == fm) {
-                    return error(BAD_REQUEST, "No draft availabile for this dataset");
+                    return error(BAD_REQUEST, BundleUtil.getStringFromBundle("files.api.no.draft"));
                 }
             } else {
                 fm = df.getLatestPublishedFileMetadata();
@@ -440,39 +655,18 @@ public Response getFileMetadata(@PathParam("id") String fileIdOrPersistentId, @P
                 .type(MediaType.TEXT_PLAIN) //Our plain text string is already json
                 .build();
     }
-    @GET                    
-    @Path("{id}/metadata/draft")
-    public Response getFileMetadataDraft(@PathParam("id") String fileIdOrPersistentId, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response, Boolean getDraft) throws WrappedResponse, Exception {
-        return getFileMetadata(fileIdOrPersistentId, versionId, uriInfo, headers, response, true);
-    }
     
-    // TODO: Rather than only supporting looking up files by their database IDs, consider supporting persistent identifiers.
-    // TODO: Rename this start with "delete" rather than "get".
-    @DELETE
-    @Path("{id}/map")
-    public Response getMapLayerMetadatas(@PathParam("id") Long idSupplied) {
-        DataverseRequest dataverseRequest = null;
-        try {
-            dataverseRequest = createDataverseRequest(findUserOrDie());
-        } catch (WrappedResponse wr) {
-            return error(BAD_REQUEST, "Couldn't find user to execute command: " + wr.getLocalizedMessage());
-        }
-        DataFile dataFile = fileService.find(idSupplied);
-        try {
-            boolean deleted = engineSvc.submit(new DeleteMapLayerMetadataCommand(dataverseRequest, dataFile));
-            if (deleted) {
-                return ok("Map deleted from file id " + dataFile.getId());
-            } else {
-                return error(BAD_REQUEST, "Could not delete map from file id " + dataFile.getId());
-            }
-        } catch (CommandException ex) {
-            return error(BAD_REQUEST, "Problem trying to delete map from file id " + dataFile.getId() + ": " + ex.getLocalizedMessage());
-        }
+    @GET
+    @AuthRequired
+    @Path("{id}/metadata/draft")
+    public Response getFileMetadataDraft(@Context ContainerRequestContext crc, @PathParam("id") String fileIdOrPersistentId, @PathParam("versionId") String versionId, @Context UriInfo uriInfo, @Context HttpHeaders headers, @Context HttpServletResponse response, Boolean getDraft) throws WrappedResponse, Exception {
+        return getFileMetadata(crc, fileIdOrPersistentId, versionId, uriInfo, headers, response, true);
     }
-    
-    @Path("{id}/uningest")
+
     @POST
-    public Response uningestDatafile(@PathParam("id") String id) {
+    @AuthRequired
+    @Path("{id}/uningest")
+    public Response uningestDatafile(@Context ContainerRequestContext crc, @PathParam("id") String id) {
 
         DataFile dataFile;
         try {
@@ -483,42 +677,60 @@ public Response uningestDatafile(@PathParam("id") String id) {
         if (dataFile == null) {
             return error(Response.Status.NOT_FOUND, "File not found for given id.");
         }
-
         if (!dataFile.isTabularData()) {
-            return error(Response.Status.BAD_REQUEST, "Cannot uningest non-tabular file.");
-        }
-
-        try {
-            DataverseRequest req = createDataverseRequest(findUserOrDie());
-            execCommand(new UningestFileCommand(req, dataFile));
-            Long dataFileId = dataFile.getId();
-            dataFile = fileService.find(dataFileId);
-            Dataset theDataset = dataFile.getOwner();
-            exportDatasetMetadata(settingsService, theDataset);
-            return ok("Datafile " + dataFileId + " uningested.");
-        } catch (WrappedResponse wr) {
-            return wr.getResponse();
+            // Ingest never succeeded, either there was a failure or this is not a tabular
+            // data file
+            // We allow anyone who can publish to uningest in order to clear a problem
+            if (dataFile.isIngestProblem()) {
+                try {
+                    AuthenticatedUser au = getRequestAuthenticatedUserOrDie(crc);
+                    if (!(permissionSvc.permissionsFor(au, dataFile).contains(Permission.PublishDataset))) {
+                        return forbidden(
+                                "Uningesting to remove an ingest problem can only be done by those who can publish the dataset");
+                    }
+                } catch (WrappedResponse wr) {
+                    return wr.getResponse();
+                }
+                dataFile.setIngestDone();
+                dataFile.setIngestReport(null);
+                fileService.save(dataFile);
+                return ok("Datafile " + dataFile.getId() + " uningested.");
+            } else {
+                return error(BAD_REQUEST,
+                        BundleUtil.getStringFromBundle("Cannot uningest non-tabular file."));
+            }
+        } else {
+            try {
+                DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+                execCommand(new UningestFileCommand(req, dataFile));
+                Long dataFileId = dataFile.getId();
+                dataFile = fileService.find(dataFileId);
+                Dataset theDataset = dataFile.getOwner();
+                exportDatasetMetadata(settingsService, theDataset);
+                return ok("Datafile " + dataFileId + " uningested.");
+            } catch (WrappedResponse wr) {
+                return wr.getResponse();
+            }
         }
-
     }
-    
+
     // reingest attempts to queue an *existing* DataFile 
     // for tabular ingest. It can be used on non-tabular datafiles; to try to 
     // ingest a file that has previously failed ingest, or to ingest a file of a
     // type for which ingest was not previously supported. 
     // We are considering making it possible, in the future, to reingest 
     // a datafile that's already ingested as Tabular; for example, to address a 
-    // bug that has been found in an ingest plugin. 
-    
-    @Path("{id}/reingest")
+    // bug that has been found in an ingest plugin.
     @POST
-    public Response reingest(@PathParam("id") String id) {
+    @AuthRequired
+    @Path("{id}/reingest")
+    public Response reingest(@Context ContainerRequestContext crc, @PathParam("id") String id) {
 
         AuthenticatedUser u;
         try {
-            u = findAuthenticatedUserOrDie();
+            u = getRequestAuthenticatedUserOrDie(crc);
             if (!u.isSuperuser()) {
-                return error(Response.Status.FORBIDDEN, "This API call can be used by superusers only");
+                return error(FORBIDDEN, "This API call can be used by superusers only");
             }
         } catch (WrappedResponse wr) {
             return wr.getResponse();
@@ -534,21 +746,21 @@ public Response reingest(@PathParam("id") String id) {
         Dataset dataset = dataFile.getOwner();
         
         if (dataset == null) {
-            return error(Response.Status.BAD_REQUEST, "Failed to locate the parent dataset for the datafile.");
+            return error(BAD_REQUEST, "Failed to locate the parent dataset for the datafile.");
         }
         
         if (dataFile.isTabularData()) {
-            return error(Response.Status.BAD_REQUEST, "The datafile is already ingested as Tabular.");
+            return error(BAD_REQUEST, "The datafile is already ingested as Tabular.");
         }
         
         boolean ingestLock = dataset.isLockedFor(DatasetLock.Reason.Ingest);
         
         if (ingestLock) {
-            return error(Response.Status.FORBIDDEN, "Dataset already locked with an Ingest lock");
+            return error(FORBIDDEN, "Dataset already locked with an Ingest lock");
         }
         
         if (!FileUtil.canIngestAsTabular(dataFile)) {
-            return error(Response.Status.BAD_REQUEST, "Tabular ingest is not supported for this file type (id: "+id+", type: "+dataFile.getContentType()+")");
+            return error(BAD_REQUEST, "Tabular ingest is not supported for this file type (id: "+id+", type: "+dataFile.getContentType()+")");
         }
         
         dataFile.SetIngestScheduled();
@@ -563,7 +775,7 @@ public Response reingest(@PathParam("id") String id) {
         dataFile = fileService.save(dataFile);
         
         // queue the data ingest job for asynchronous execution: 
-        String status = ingestService.startIngestJobs(new ArrayList<>(Arrays.asList(dataFile)), u);
+        String status = ingestService.startIngestJobs(dataset.getId(), new ArrayList<>(Arrays.asList(dataFile)), u);
         
         if (!StringUtil.isEmpty(status)) {
             // This most likely indicates some sort of a problem (for example, 
@@ -579,13 +791,19 @@ public Response reingest(@PathParam("id") String id) {
 
     }
 
-    @Path("{id}/redetect")
     @POST
-    public Response redetectDatafile(@PathParam("id") String id, @QueryParam("dryRun") boolean dryRun) {
+    @AuthRequired
+    @Path("{id}/redetect")
+    public Response redetectDatafile(@Context ContainerRequestContext crc, @PathParam("id") String id, @QueryParam("dryRun") boolean dryRun) {
         try {
             DataFile dataFileIn = findDataFileOrDie(id);
+            // Ingested Files have mimetype = text/tab-separated-values
+            // No need to redetect
+            if (dataFileIn.isTabularData()) {
+                return error(BAD_REQUEST, "The file is an ingested tabular file.");
+            }
             String originalContentType = dataFileIn.getContentType();
-            DataFile dataFileOut = execCommand(new RedetectFileTypeCommand(createDataverseRequest(findUserOrDie()), dataFileIn, dryRun));
+            DataFile dataFileOut = execCommand(new RedetectFileTypeCommand(createDataverseRequest(getRequestUser(crc)), dataFileIn, dryRun));
             NullSafeJsonBuilder result = NullSafeJsonBuilder.jsonObjectBuilder()
                     .add("dryRun", dryRun)
                     .add("oldContentType", originalContentType)
@@ -596,6 +814,28 @@ public Response redetectDatafile(@PathParam("id") String id, @QueryParam("dryRun
         }
     }
 
+    @POST
+    @AuthRequired
+    @Path("{id}/extractNcml")
+    public Response extractNcml(@Context ContainerRequestContext crc, @PathParam("id") String id) {
+        try {
+            AuthenticatedUser au = getRequestAuthenticatedUserOrDie(crc);
+            if (!au.isSuperuser()) {
+                // We can always make a command in the future if there's a need
+                // for non-superusers to call this API.
+                return error(FORBIDDEN, "This API call can be used by superusers only");
+            }
+            DataFile dataFileIn = findDataFileOrDie(id);
+            java.nio.file.Path tempLocationPath = null;
+            boolean successOrFail = ingestService.extractMetadataNcml(dataFileIn, tempLocationPath);
+            NullSafeJsonBuilder result = NullSafeJsonBuilder.jsonObjectBuilder()
+                    .add("result", successOrFail);
+            return ok(result);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
     /**
      * Attempting to run metadata export, for all the formats for which we have
      * metadata Exporters.
@@ -603,7 +843,7 @@ public Response redetectDatafile(@PathParam("id") String id, @QueryParam("dryRun
     private void exportDatasetMetadata(SettingsServiceBean settingsServiceBean, Dataset theDataset) {
 
         try {
-            ExportService instance = ExportService.getInstance(settingsServiceBean);
+            ExportService instance = ExportService.getInstance();
             instance.exportAllFormats(theDataset);
 
         } catch (ExportException ex) {
@@ -615,4 +855,203 @@ private void exportDatasetMetadata(SettingsServiceBean settingsServiceBean, Data
         }
     }
 
+    // This method provides a callback for an external tool to retrieve it's
+    // parameters/api URLs. If the request is authenticated, e.g. by it being
+    // signed, the api URLs will be signed. If a guest request is made, the URLs
+    // will be plain/unsigned.
+    // This supports the cases where a tool is accessing a restricted resource (e.g.
+    // preview of a draft file), or public case.
+    @GET
+    @AuthRequired
+    @Path("{id}/metadata/{fmid}/toolparams/{tid}")
+    public Response getExternalToolFMParams(@Context ContainerRequestContext crc, @PathParam("tid") long externalToolId,
+            @PathParam("id") String fileId, @PathParam("fmid") long fmid, @QueryParam(value = "locale") String locale) {
+        ExternalTool externalTool = externalToolService.findById(externalToolId);
+        if(externalTool == null) {
+            return error(BAD_REQUEST, "External tool not found.");
+        }
+        if (!ExternalTool.Scope.FILE.equals(externalTool.getScope())) {
+            return error(BAD_REQUEST, "External tool does not have file scope.");
+        }
+        ApiToken apiToken = null;
+        User user = getRequestUser(crc);
+        apiToken = authSvc.getValidApiTokenForUser(user);
+        FileMetadata target = fileSvc.findFileMetadata(fmid);
+        if (target == null) {
+            return error(BAD_REQUEST, "FileMetadata not found.");
+        }
+
+        URLTokenUtil eth = null;
+
+        eth = new ExternalToolHandler(externalTool, target.getDataFile(), apiToken, target, locale);
+        return ok(eth.createPostBody(eth.getParams(JsonUtil.getJsonObject(externalTool.getToolParameters())), JsonUtil.getJsonArray(externalTool.getAllowedApiCalls())));
+    }
+    
+    @GET
+    @Path("fixityAlgorithm")
+    public Response getFixityAlgorithm() {
+        return ok(systemConfig.getFileFixityChecksumAlgorithm().toString());
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/downloadCount")
+    public Response getFileDownloadCount(@Context ContainerRequestContext crc, @PathParam("id") String dataFileId) {
+        return response(req -> {
+            DataFile dataFile = execCommand(new GetDataFileCommand(req, findDataFileOrDie(dataFileId)));
+            return ok(guestbookResponseService.getDownloadCountByDataFileId(dataFile.getId()).toString());
+        }, getRequestUser(crc));
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/dataTables")
+    public Response getFileDataTables(@Context ContainerRequestContext crc, @PathParam("id") String dataFileId) {
+        DataFile dataFile;
+        try {
+            dataFile = findDataFileOrDie(dataFileId);
+        } catch (WrappedResponse e) {
+            return notFound("File not found for given id.");
+        }
+        if (dataFile.isRestricted() || FileUtil.isActivelyEmbargoed(dataFile)) {
+            DataverseRequest dataverseRequest = createDataverseRequest(getRequestUser(crc));
+            boolean hasPermissionToDownloadFile = permissionSvc.requestOn(dataverseRequest, dataFile).has(Permission.DownloadFile);
+            if (!hasPermissionToDownloadFile) {
+                return forbidden("Insufficient permissions to access the requested information.");
+            }
+        }
+        if (!dataFile.isTabularData()) {
+            return badRequest(BundleUtil.getStringFromBundle("files.api.only.tabular.supported"));
+        }
+        return ok(jsonDT(dataFile.getDataTables()));
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{id}/metadata/categories")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response setFileCategories(@Context ContainerRequestContext crc, @PathParam("id") String dataFileId, String jsonBody, @QueryParam("replace") boolean replaceData) {
+        return response(req -> {
+            DataFile dataFile = execCommand(new GetDataFileCommand(req, findDataFileOrDie(dataFileId)));
+            jakarta.json.JsonObject jsonObject;
+            try (StringReader stringReader = new StringReader(jsonBody)) {
+                jsonObject = Json.createReader(stringReader).readObject();
+                JsonArray requestedCategoriesJson = jsonObject.getJsonArray("categories");
+                FileMetadata fileMetadata = dataFile.getFileMetadata();
+                if (replaceData) {
+                    fileMetadata.setCategories(Lists.newArrayList());
+                }
+                for (JsonValue jsonValue : requestedCategoriesJson) {
+                    JsonString jsonString = (JsonString) jsonValue;
+                    fileMetadata.addCategoryByName(jsonString.getString());
+                }
+                execCommand(new UpdateDatasetVersionCommand(fileMetadata.getDataFile().getOwner(), req));
+                return ok("Categories of file " + dataFileId + " updated.");
+            } catch (JsonParsingException jpe) {
+                return badRequest("Error parsing Json: " + jpe.getMessage());
+            }
+        }, getRequestUser(crc));
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{id}/metadata/tabularTags")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response setFileTabularTags(@Context ContainerRequestContext crc, @PathParam("id") String dataFileId, String jsonBody, @QueryParam("replace") boolean replaceData) {
+        return response(req -> {
+            DataFile dataFile = execCommand(new GetDataFileCommand(req, findDataFileOrDie(dataFileId)));
+            if (!dataFile.isTabularData()) {
+                return badRequest(BundleUtil.getStringFromBundle("files.api.only.tabular.supported"));
+            }
+            jakarta.json.JsonObject jsonObject;
+            try (StringReader stringReader = new StringReader(jsonBody)) {
+                jsonObject = Json.createReader(stringReader).readObject();
+                JsonArray requestedTabularTagsJson = jsonObject.getJsonArray("tabularTags");
+                if (replaceData) {
+                    dataFile.setTags(Lists.newArrayList());
+                }
+                for (JsonValue jsonValue : requestedTabularTagsJson) {
+                    JsonString jsonString = (JsonString) jsonValue;
+                    try {
+                        dataFile.addUniqueTagByLabel(jsonString.getString());
+                    } catch (IllegalArgumentException iax){
+                        return badRequest(iax.getMessage());
+                    }
+                }
+                execCommand(new UpdateDatasetVersionCommand(dataFile.getOwner(), req));
+                return ok("Tabular tags of file " + dataFileId + " updated.");
+            } catch (JsonParsingException jpe) {
+                return badRequest("Error parsing Json: " + jpe.getMessage());
+            }
+        }, getRequestUser(crc));
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/hasBeenDeleted")
+    public Response getHasBeenDeleted(@Context ContainerRequestContext crc, @PathParam("id") String dataFileId) {
+        return response(req -> {
+            DataFile dataFile = execCommand(new GetDataFileCommand(req, findDataFileOrDie(dataFileId)));
+            return ok(dataFileServiceBean.hasBeenDeleted(dataFile));
+        }, getRequestUser(crc));
+    }
+
+    /**
+     * @param fileIdOrPersistentId Database ID or PID of the data file.
+     * @param versionNumber The version of the dataset, such as 1.0, :draft,
+     * :latest-published, etc.
+     * @param includeDeaccessioned Defaults to false.
+     */
+    @GET
+    @AuthRequired
+    @Path("{id}/versions/{dsVersionString}/citation")
+    public Response getFileCitationByVersion(@Context ContainerRequestContext crc, @PathParam("id") String fileIdOrPersistentId, @PathParam("dsVersionString") String versionNumber, @QueryParam("includeDeaccessioned") boolean includeDeaccessioned) {
+        try {
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            final DataFile df = execCommand(new GetDataFileCommand(req, findDataFileOrDie(fileIdOrPersistentId)));
+            Dataset ds = df.getOwner();
+            DatasetVersion dsv = findDatasetVersionOrDie(req, versionNumber, ds, includeDeaccessioned, true);
+            if (dsv == null) {
+                return unauthorized(BundleUtil.getStringFromBundle("files.api.no.draftOrUnauth"));
+            }
+
+            Long getDatasetVersionID = dsv.getId();
+            FileMetadata fm = dataFileServiceBean.findFileMetadataByDatasetVersionIdAndDataFileId(getDatasetVersionID, df.getId());
+            if (fm == null) {
+                return notFound(BundleUtil.getStringFromBundle("files.api.fileNotFound"));
+            }
+            boolean direct = df.isIdentifierRegistered();
+            DataCitation citation = new DataCitation(fm, direct);
+            return ok(citation.toString(true));
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{id}/versionDifferences")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getFileVersionsList(@Context ContainerRequestContext crc, @PathParam("id") String fileIdOrPersistentId) {
+        try {
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            final DataFile df = execCommand(new GetDataFileCommand(req, findDataFileOrDie(fileIdOrPersistentId)));
+            FileMetadata fm = df.getFileMetadata();
+            if (fm == null) {
+                return notFound(BundleUtil.getStringFromBundle("files.api.fileNotFound"));
+            }
+            List<FileMetadata> fileMetadataList = fileMetadataVersionsHelper.loadFileVersionList(req, fm);
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+            for (FileMetadata fileMetadata : fileMetadataList) {
+                jab.add(fileMetadataVersionsHelper.jsonDataFileVersions(fileMetadata).build());
+            }
+            return Response.ok()
+                    .entity(Json.createObjectBuilder()
+                            .add("status", STATUS_OK)
+                            .add("data", jab.build()).build()
+                    ).build();
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Geoconnect.java b/src/main/java/edu/harvard/iq/dataverse/api/Geoconnect.java
deleted file mode 100644
index 72991e41fef..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/Geoconnect.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package edu.harvard.iq.dataverse.api;
-
-import com.mashape.unirest.http.Unirest;
-import com.mashape.unirest.http.exceptions.UnirestException;
-import com.mashape.unirest.request.GetRequest;
-import edu.harvard.iq.dataverse.MapLayerMetadata;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-
-/**
- * @todo consolidate with WorldMapRelatedData (/api/worldmap)?
- */
-@Path("admin/geoconnect")
-public class Geoconnect extends AbstractApiBean {
-
-    private static final Logger logger = Logger.getLogger(Geoconnect.class.getCanonicalName());
-
-    @POST
-    @Path("mapLayerMetadatas/check")
-    public Response checkMapLayerMetadatas() {
-        JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder();
-        mapLayerMetadataSrv.findAll().stream().map((unmodified) -> checkStatus(unmodified)).forEach((jsonObjectBuilder) -> {
-            jsonArrayBuilder.add(jsonObjectBuilder);
-        });
-        return ok(jsonArrayBuilder);
-    }
-
-    @POST
-    @Path("mapLayerMetadatas/check/{id}")
-    public Response checkMapLayerMetadatas(@PathParam("id") Long idSupplied) {
-        MapLayerMetadata mapLayerMetadata = mapLayerMetadataSrv.find(idSupplied);
-        if (mapLayerMetadata == null) {
-            return error(NOT_FOUND, "Could not find MapLayerMetadata based on id " + idSupplied);
-        }
-        return ok(checkStatus(mapLayerMetadata));
-    }
-
-    private JsonObjectBuilder checkStatus(MapLayerMetadata unmodified) {
-        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
-        jsonObjectBuilder.add("fileId", unmodified.getDataFile().getId());
-        jsonObjectBuilder.add("mapLayerMetadataId", unmodified.getId());
-        jsonObjectBuilder.add("layerLink", unmodified.getLayerLink());
-        jsonObjectBuilder.add("fileLandingPage", systemConfig.getDataverseSiteUrl() + "/file.xhtml?fileId=" + unmodified.getDataFile().getId());
-        MapLayerMetadata modified = updateLastVerifiedTimeAndStatusCode(unmodified);
-        if (modified != null) {
-            jsonObjectBuilder.add("lastVerifiedStatus", modified.getLastVerifiedStatus());
-        } else {
-            jsonObjectBuilder.add("error", "Could not check status of map associate with file id " + unmodified.getDataFile().getId());
-        }
-        return jsonObjectBuilder;
-    }
-
-    private MapLayerMetadata updateLastVerifiedTimeAndStatusCode(MapLayerMetadata mapLayerMetadata) {
-        String layerLink = mapLayerMetadata.getLayerLink();
-        GetRequest getRequest = Unirest.get(layerLink);
-        try {
-            int statusCode = getRequest.asBinary().getStatus();
-            mapLayerMetadata.setLastVerifiedStatus(statusCode);
-            Timestamp now = new Timestamp(new Date().getTime());
-            mapLayerMetadata.setLastVerifiedTime(now);
-            logger.fine("Setting status code to " + statusCode + " and timestamp to " + now + " for MapLayerMetadata id " + mapLayerMetadata.getId() + ".");
-            return mapLayerMetadataSrv.save(mapLayerMetadata);
-        } catch (UnirestException ex) {
-            logger.info("Couldn't update last verfied status code or timestamp: " + ex.getLocalizedMessage());
-            return null;
-        }
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Groups.java b/src/main/java/edu/harvard/iq/dataverse/api/Groups.java
index 9e1b52be10b..ed996b8ecf9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Groups.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Groups.java
@@ -2,27 +2,34 @@
 
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroup;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroupProvider;
+import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroup;
+import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroupProvider;
 import edu.harvard.iq.dataverse.authorization.groups.impl.shib.ShibGroup;
 import edu.harvard.iq.dataverse.authorization.groups.impl.shib.ShibGroupProvider;
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
 import edu.harvard.iq.dataverse.util.json.JsonParser;
-import javax.ejb.Stateless;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
+
+import jakarta.ejb.Stateless;
+import jakarta.interceptor.Interceptors;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*;
+
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import javax.annotation.PostConstruct;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonString;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.PathParam;
-import static org.apache.commons.lang.StringUtils.isNumeric;
+import jakarta.annotation.PostConstruct;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.PathParam;
+import static org.apache.commons.lang3.StringUtils.isNumeric;
 
 /**
  *
@@ -35,6 +42,7 @@ public class Groups extends AbstractApiBean {
 
     private IpGroupProvider ipGroupPrv;
     private ShibGroupProvider shibGroupPrv;
+    private MailDomainGroupProvider mailDomainGroupPrv;
 
     Pattern legalGroupName = Pattern.compile("^[-_a-zA-Z0-9]+$");
 
@@ -42,6 +50,7 @@ public class Groups extends AbstractApiBean {
     void postConstruct() {
         ipGroupPrv = groupSvc.getIpGroupProvider();
         shibGroupPrv = groupSvc.getShibGroupProvider();
+        mailDomainGroupPrv = groupSvc.getMailDomainGroupProvider();
     }
 
     /**
@@ -79,8 +88,8 @@ public Response postIpGroup( JsonObject dto ){
      *         that group from being created.
      */
     @PUT
-    @Path("ip/{groupName}")
-    public Response putIpGroups( @PathParam("groupName") String groupName, JsonObject dto ){
+    @Path("ip/{group}")
+    public Response putIpGroups( @PathParam("group") String groupName, JsonObject dto ){
         try {
             if ( groupName == null || groupName.trim().isEmpty() ) {
                 return badRequest("Group name cannot be empty");
@@ -109,8 +118,8 @@ public Response listIpGroups() {
     }
 
     @GET
-    @Path("ip/{groupIdtf}")
-    public Response getIpGroup( @PathParam("groupIdtf") String groupIdtf ) {
+    @Path("ip/{group}")
+    public Response getIpGroup( @PathParam("group") String groupIdtf ) {
         IpGroup grp;
         if ( isNumeric(groupIdtf) ) {
             grp = ipGroupPrv.get( Long.parseLong(groupIdtf) );
@@ -122,8 +131,8 @@ public Response getIpGroup( @PathParam("groupIdtf") String groupIdtf ) {
     }
 
     @DELETE
-    @Path("ip/{groupIdtf}")
-    public Response deleteIpGroup( @PathParam("groupIdtf") String groupIdtf ) {
+    @Path("ip/{group}")
+    public Response deleteIpGroup( @PathParam("group") String groupIdtf ) {
         IpGroup grp;
         if ( isNumeric(groupIdtf) ) {
             grp = ipGroupPrv.get( Long.parseLong(groupIdtf) );
@@ -208,5 +217,69 @@ public Response deleteShibGroup( @PathParam("primaryKey") String id ) {
             return error(Response.Status.BAD_REQUEST, "Could not find Shibboleth group with an id of " + id);
         }
     }
+    
+    
+    /**
+     * Creates a new {@link MailDomainGroup}. The name of the group is based on the
+     * {@code alias:} field, but might be changed to ensure uniqueness.
+     * @param dto
+     * @return Response describing the created group or the error that prevented
+     *         that group from being created.
+     */
+    @POST
+    @Path("domain")
+    public Response createMailDomainGroup(JsonObject dto) throws JsonParseException {
+        MailDomainGroup grp = new JsonParser().parseMailDomainGroup(dto);
+        mailDomainGroupPrv.saveOrUpdate(Optional.empty(), grp);
+        mailDomainGroupPrv.updateGroups();
+
+        return created("/groups/domain/" + grp.getPersistedGroupAlias(), json(grp) );
+    }
+    
+    /**
+     * Creates or updates the {@link MailDomainGroup} named {@code groupName}.
+     * @param groupAlias Name of the group.
+     * @param dto data of the group.
+     * @return Response describing the created group or the error that prevented
+     *         that group from being created.
+     */
+    @PUT
+    @Path("domain/{groupAlias}")
+    public Response updateMailDomainGroups(@PathParam("groupAlias") String groupAlias, JsonObject dto) throws JsonParseException {
+        if ( groupAlias == null || groupAlias.trim().isEmpty() ) {
+            return badRequest("Group name cannot be empty");
+        }
+        if ( ! legalGroupName.matcher(groupAlias).matches() ) {
+            return badRequest("Group name can contain only letters, digits, and the chars '-' and '_'");
+        }
+        
+        MailDomainGroup grp = new JsonParser().parseMailDomainGroup(dto);
+        mailDomainGroupPrv.saveOrUpdate(Optional.of(groupAlias), grp);
+        mailDomainGroupPrv.updateGroups();
+        
+        return created("/groups/domain/" + grp.getPersistedGroupAlias(), json(grp) );
+    }
+    
+    @GET
+    @Path("domain")
+    public Response listMailDomainGroups() {
+        return ok( mailDomainGroupPrv.findGlobalGroups()
+            .stream().map(g->json(g)).collect(toJsonArray()) );
+    }
+    
+    @GET
+    @Path("domain/{groupAlias}")
+    public Response getMailDomainGroup(@PathParam("groupAlias") String groupAlias) {
+        MailDomainGroup grp = mailDomainGroupPrv.get(groupAlias);
+        return (grp == null) ? notFound( "Group " + groupAlias + " not found") : ok(json(grp));
+    }
+    
+    @DELETE
+    @Path("domain/{groupAlias}")
+    public Response deleteMailDomainGroup(@PathParam("groupAlias") String groupAlias) {
+        mailDomainGroupPrv.delete(groupAlias);
+        mailDomainGroupPrv.updateGroups();
+        return ok("Group " + groupAlias + " deleted.");
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/HarvestingClients.java b/src/main/java/edu/harvard/iq/dataverse/api/HarvestingClients.java
index d17e76c499a..e4300099244 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/HarvestingClients.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/HarvestingClients.java
@@ -1,44 +1,48 @@
 package edu.harvard.iq.dataverse.api;
 
 import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateHarvestingClientCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.GetHarvestingClientCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateHarvestingClientCommand;
 import edu.harvard.iq.dataverse.harvest.client.HarvesterServiceBean;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClientServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
-import javax.json.JsonObjectBuilder;
+import edu.harvard.iq.dataverse.util.json.JsonPrinter;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.json.JsonObjectBuilder;
 import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.EJB;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
 
-@Stateless
 @Path("harvest/clients")
 public class HarvestingClients extends AbstractApiBean {
 
     
-    @EJB
-    DataverseServiceBean dataverseService;
     @EJB
     HarvesterServiceBean harvesterService;
     @EJB
@@ -54,8 +58,9 @@ public class HarvestingClients extends AbstractApiBean {
      *  optionally, plain text output may be provided as well.
      */
     @GET
+    @AuthRequired
     @Path("/")
-    public Response harvestingClients(@QueryParam("key") String apiKey) throws IOException {
+    public Response harvestingClients(@Context ContainerRequestContext crc, @QueryParam("key") String apiKey) throws IOException {
         
         List<HarvestingClient> harvestingClients = null; 
         try {
@@ -79,7 +84,7 @@ public Response harvestingClients(@QueryParam("key") String apiKey) throws IOExc
             // the permission to view this harvesting client config. -- L.A. 4.4
             HarvestingClient retrievedHarvestingClient = null; 
             try {
-                DataverseRequest req = createDataverseRequest(findUserOrDie());
+                DataverseRequest req = createDataverseRequest(getRequestUser(crc));
                 retrievedHarvestingClient = execCommand( new GetHarvestingClientCommand(req, harvestingClient));
             } catch (Exception ex) {
                 // Don't do anything. 
@@ -88,7 +93,7 @@ public Response harvestingClients(@QueryParam("key") String apiKey) throws IOExc
             }
             
             if (retrievedHarvestingClient != null) {
-                hcArr.add(harvestingConfigAsJson(retrievedHarvestingClient));
+                hcArr.add(JsonPrinter.json(retrievedHarvestingClient));
             }
         }
         
@@ -96,8 +101,9 @@ public Response harvestingClients(@QueryParam("key") String apiKey) throws IOExc
     } 
     
     @GET
+    @AuthRequired
     @Path("{nickName}")
-    public Response harvestingClient(@PathParam("nickName") String nickName, @QueryParam("key") String apiKey) throws IOException {
+    public Response harvestingClient(@Context ContainerRequestContext crc, @PathParam("nickName") String nickName, @QueryParam("key") String apiKey) throws IOException {
         
         HarvestingClient harvestingClient = null; 
         try {
@@ -111,14 +117,18 @@ public Response harvestingClient(@PathParam("nickName") String nickName, @QueryP
             return error(Response.Status.NOT_FOUND, "Harvesting client " + nickName + " not found.");
         }
         
+        // See the comment in the harvestingClients() (plural) above for the explanation
+        // of why we are looking up the client twice (tl;dr: to utilize the 
+        // authorization logic in the command)
+        
         HarvestingClient retrievedHarvestingClient = null; 
         
         try {
             // findUserOrDie() and execCommand() both throw WrappedResponse 
             // exception, that already has a proper HTTP response in it. 
             
-            retrievedHarvestingClient = execCommand(new GetHarvestingClientCommand(createDataverseRequest(findUserOrDie()), harvestingClient));
-            logger.info("retrieved Harvesting Client " + retrievedHarvestingClient.getName() + " with the GetHarvestingClient command.");
+            retrievedHarvestingClient = execCommand(new GetHarvestingClientCommand(createDataverseRequest(getRequestUser(crc)), harvestingClient));
+            logger.fine("retrieved Harvesting Client " + retrievedHarvestingClient.getName() + " with the GetHarvestingClient command.");
         } catch (WrappedResponse wr) {
             return wr.getResponse();
         } catch (Exception ex) {
@@ -132,7 +142,7 @@ public Response harvestingClient(@PathParam("nickName") String nickName, @QueryP
         }
         
         try {
-            return ok(harvestingConfigAsJson(retrievedHarvestingClient));  
+            return ok(JsonPrinter.json(retrievedHarvestingClient));  
         } catch (Exception ex) {
             logger.warning("Unknown exception caught while trying to format harvesting client config as json: "+ex.getMessage());
             return error( Response.Status.BAD_REQUEST, 
@@ -141,31 +151,79 @@ public Response harvestingClient(@PathParam("nickName") String nickName, @QueryP
     }
     
     @POST
+    @AuthRequired
     @Path("{nickName}")
-    public Response createHarvestingClient(String jsonBody, @PathParam("nickName") String nickName, @QueryParam("key") String apiKey) throws IOException, JsonParseException {
-        
-        try ( StringReader rdr = new StringReader(jsonBody) ) {
-            JsonObject json = Json.createReader(rdr).readObject();
+    public Response createHarvestingClient(@Context ContainerRequestContext crc, String jsonBody, @PathParam("nickName") String nickName, @QueryParam("key") String apiKey) throws IOException, JsonParseException {
+        // Per the discussion during the QA of PR #9174, we decided to make 
+        // the create/edit APIs superuser-only (the delete API was already so)
+        try {
+            User u = getRequestUser(crc);
+            if ((!(u instanceof AuthenticatedUser) || !u.isSuperuser())) {
+                throw new WrappedResponse(error(Response.Status.UNAUTHORIZED, "Only superusers can create harvesting clients."));
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+ 
+        try {
+            JsonObject json = JsonUtil.getJsonObject(jsonBody);
+            
+            // Check that the client with this name doesn't exist yet: 
+            // (we could simply let the command fail, but that does not result 
+            // in a pretty report to the end user)
+            
+            HarvestingClient lookedUpClient = null; 
+            try {
+                lookedUpClient = harvestingClientService.findByNickname(nickName);
+            } catch (Exception ex) {
+                logger.warning("Exception caught looking up harvesting client " + nickName + ": " + ex.getMessage());
+                // let's hope that this was a fluke of some kind; we'll proceed
+                // with the attempt to create a new client and report an error
+                // if that fails too.
+            }
+            
+            if (lookedUpClient != null) {
+                return error(Response.Status.BAD_REQUEST, "Harvesting client " + nickName + " already exists");
+            }
             
             HarvestingClient harvestingClient = new HarvestingClient();
-            // TODO: check that it doesn't exist yet...
-            harvestingClient.setName(nickName);
+
             String dataverseAlias = jsonParser().parseHarvestingClient(json, harvestingClient);
-            Dataverse ownerDataverse = dataverseService.findByAlias(dataverseAlias);
             
+            if (dataverseAlias == null) {
+                return error(Response.Status.BAD_REQUEST, "dataverseAlias must be supplied"); 
+            }
+            
+            // Check if the dataverseAlias supplied is valid, i.e. corresponds 
+            // to an existing dataverse (collection): 
+            Dataverse ownerDataverse = dataverseSvc.findByAlias(dataverseAlias);
             if (ownerDataverse == null) {
                 return error(Response.Status.BAD_REQUEST, "No such dataverse: " + dataverseAlias);
             }
             
+            // The nickname supplied as part of the Rest path takes precedence: 
+            harvestingClient.setName(nickName);
+            
+            // Populate the description field, if none is supplied: 
+            if (harvestingClient.getArchiveDescription() == null) {
+                harvestingClient.setArchiveDescription(BundleUtil.getStringFromBundle("harvestclients.viewEditDialog.archiveDescription.default.generic"));
+            }
+            
+            if (StringUtil.isEmpty(harvestingClient.getArchiveUrl())
+                    || StringUtil.isEmpty(harvestingClient.getHarvestingUrl())
+                    || StringUtil.isEmpty(harvestingClient.getMetadataPrefix())) {
+                    return error(Response.Status.BAD_REQUEST, "Required fields harvestUrl, archiveUrl and metadataFormat must be supplied");
+            }
+            
             harvestingClient.setDataverse(ownerDataverse);
             if (ownerDataverse.getHarvestingClientConfigs() == null) {
                 ownerDataverse.setHarvestingClientConfigs(new ArrayList<>());
             }
             ownerDataverse.getHarvestingClientConfigs().add(harvestingClient);
-            
-            DataverseRequest req = createDataverseRequest(findUserOrDie());
-            HarvestingClient managedHarvestingClient = execCommand( new CreateHarvestingClientCommand(req, harvestingClient));
-            return created( "/harvest/clients/" + nickName, harvestingConfigAsJson(managedHarvestingClient));
+                        
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            harvestingClient = execCommand(new CreateHarvestingClientCommand(req, harvestingClient));
+            return created( "/harvest/clients/" + nickName, JsonPrinter.json(harvestingClient));
                     
         } catch (JsonParseException ex) {
             return error( Response.Status.BAD_REQUEST, "Error parsing harvesting client: " + ex.getMessage() );
@@ -178,8 +236,18 @@ public Response createHarvestingClient(String jsonBody, @PathParam("nickName") S
     }
     
     @PUT
+    @AuthRequired
     @Path("{nickName}")
-    public Response modifyHarvestingClient(String jsonBody, @PathParam("nickName") String nickName, @QueryParam("key") String apiKey) throws IOException, JsonParseException {
+    public Response modifyHarvestingClient(@Context ContainerRequestContext crc, String jsonBody, @PathParam("nickName") String nickName, @QueryParam("key") String apiKey) throws IOException, JsonParseException {
+        try {
+            User u = getRequestUser(crc);
+            if ((!(u instanceof AuthenticatedUser) || !u.isSuperuser())) {
+                throw new WrappedResponse(error(Response.Status.UNAUTHORIZED, "Only superusers can modify harvesting clients."));
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        
         HarvestingClient harvestingClient = null; 
         try {
             harvestingClient = harvestingClientService.findByNickname(nickName);
@@ -194,19 +262,51 @@ public Response modifyHarvestingClient(String jsonBody, @PathParam("nickName") S
         
         String ownerDataverseAlias = harvestingClient.getDataverse().getAlias();
         
-        try ( StringReader rdr = new StringReader(jsonBody) ) {
-            DataverseRequest req = createDataverseRequest(findUserOrDie());
-            JsonObject json = Json.createReader(rdr).readObject();
+        try {
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+            JsonObject json = JsonUtil.getJsonObject(jsonBody);
             
-            String newDataverseAlias = jsonParser().parseHarvestingClient(json, harvestingClient);
+            HarvestingClient newHarvestingClient = new HarvestingClient(); 
+            String newDataverseAlias = jsonParser().parseHarvestingClient(json, newHarvestingClient);
             
             if (newDataverseAlias != null 
                     && !newDataverseAlias.equals("")
                     && !newDataverseAlias.equals(ownerDataverseAlias)) {
                 return error(Response.Status.BAD_REQUEST, "Bad \"dataverseAlias\" supplied. Harvesting client "+nickName+" belongs to the dataverse "+ownerDataverseAlias);
             }
-            HarvestingClient managedHarvestingClient = execCommand( new UpdateHarvestingClientCommand(req, harvestingClient));
-            return created( "/datasets/" + nickName, harvestingConfigAsJson(managedHarvestingClient));
+            
+            // Go through the supported editable fields and update the client accordingly: 
+            // TODO: We may want to reevaluate whether we really want/need *all*
+            // of these fields to be editable.
+
+            if (newHarvestingClient.getSourceName() != null) {
+                harvestingClient.setSourceName(newHarvestingClient.getSourceName());
+            }
+            if (newHarvestingClient.getHarvestingUrl() != null) {
+                harvestingClient.setHarvestingUrl(newHarvestingClient.getHarvestingUrl());
+            }
+            if (newHarvestingClient.getHarvestingSet() != null) {
+                harvestingClient.setHarvestingSet(newHarvestingClient.getHarvestingSet());
+            }
+            if (newHarvestingClient.getMetadataPrefix() != null) {
+                harvestingClient.setMetadataPrefix(newHarvestingClient.getMetadataPrefix());
+            }
+            if (newHarvestingClient.getArchiveUrl() != null) {
+                harvestingClient.setArchiveUrl(newHarvestingClient.getArchiveUrl());
+            }
+            if (newHarvestingClient.getArchiveDescription() != null) {
+                harvestingClient.setArchiveDescription(newHarvestingClient.getArchiveDescription());
+            }
+            if (newHarvestingClient.getHarvestStyle() != null) {
+                harvestingClient.setHarvestStyle(newHarvestingClient.getHarvestStyle());
+            }
+            if (newHarvestingClient.getCustomHttpHeaders() != null) {
+                harvestingClient.setCustomHttpHeaders(newHarvestingClient.getCustomHttpHeaders());
+            }
+            // TODO: Make schedule configurable via this API too. 
+            
+            harvestingClient = execCommand( new UpdateHarvestingClientCommand(req, harvestingClient));
+            return ok( "/harvest/clients/" + nickName,  JsonPrinter.json(harvestingClient)); // harvestingConfigAsJson(harvestingClient));
                     
         } catch (JsonParseException ex) {
             return error( Response.Status.BAD_REQUEST, "Error parsing harvesting client: " + ex.getMessage() );
@@ -218,35 +318,86 @@ public Response modifyHarvestingClient(String jsonBody, @PathParam("nickName") S
         
     }
     
-    // TODO: 
-    // add a @DELETE method 
-    // (there is already a DeleteHarvestingClient command)
+    @DELETE
+    @AuthRequired
+    @Path("{nickName}")
+    public Response deleteHarvestingClient(@Context ContainerRequestContext crc, @PathParam("nickName") String nickName) throws IOException {
+        // Deleting a client can take a while (if there's a large amnount of 
+        // harvested content associated with it). So instead of calling the command
+        // directly, we will be calling an async. service bean method. 
+
+        
+        try {
+            User u = getRequestUser(crc);
+            if ((!(u instanceof AuthenticatedUser) || !u.isSuperuser())) {
+                throw new WrappedResponse(error(Response.Status.UNAUTHORIZED, "Only superusers can delete harvesting clients."));
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        
+        HarvestingClient harvestingClient = null; 
+       
+        try {
+            harvestingClient = harvestingClientService.findByNickname(nickName);
+        } catch (Exception ex) {
+            logger.warning("Exception caught looking up harvesting client " + nickName + ": " + ex.getMessage());
+            return error( Response.Status.BAD_REQUEST, "Internal error: failed to look up harvesting client " + nickName);
+        }
+        
+        if (harvestingClient == null) {
+            return error(Response.Status.NOT_FOUND, "Harvesting client " + nickName + " not found.");
+        }
+        
+        // Check if the client is in a state where it can be safely deleted: 
+        
+        if (harvestingClient.isDeleteInProgress()) {
+            return error( Response.Status.BAD_REQUEST, "Harvesting client " + nickName + " is already being deleted (in progress)");
+        }
+        
+        if (harvestingClient.isHarvestingNow()) {
+            return error( Response.Status.BAD_REQUEST, "It is not safe to delete client " + nickName + " while a harvesting job is in progress");
+        }
+        
+        // Finally, delete it (asynchronously): 
+        
+        try {
+            harvestingClientService.deleteClient(harvestingClient.getId());
+        } catch (Exception ex) {
+            return error( Response.Status.BAD_REQUEST, "Internal error: failed to delete harvesting client " + nickName);
+        }
+        
+        
+        return ok("Harvesting Client " + nickName + ": delete in progress");
+    }
+    
     
     // Methods for managing harvesting runs (jobs):
     
     
     // This POST starts a new harvesting run:
     @POST
+    @AuthRequired
     @Path("{nickName}/run")
-    public Response startHarvestingJob(@PathParam("nickName") String clientNickname, @QueryParam("key") String apiKey) throws IOException {
+    public Response startHarvestingJob(@Context ContainerRequestContext crc, @PathParam("nickName") String clientNickname, @QueryParam("key") String apiKey) throws IOException {
         
         try {
             AuthenticatedUser authenticatedUser = null; 
             
             try {
-                authenticatedUser = findAuthenticatedUserOrDie();
+                authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
             } catch (WrappedResponse wr) {
                 return error(Response.Status.UNAUTHORIZED, "Authentication required to use this API method");
             }
             
             if (authenticatedUser == null || !authenticatedUser.isSuperuser()) {
-                return error(Response.Status.FORBIDDEN, "Only the Dataverse Admin user can run harvesting jobs");
+                return error(Response.Status.FORBIDDEN, "Only admin users can run harvesting jobs");
             }
             
             HarvestingClient harvestingClient = harvestingClientService.findByNickname(clientNickname);
             
             if (harvestingClient == null) {
-                return error(Response.Status.NOT_FOUND, "No such dataverse: "+clientNickname);
+                return error(Response.Status.NOT_FOUND, "No such client: "+clientNickname);
             }
             
             DataverseRequest dataverseRequest = createDataverseRequest(authenticatedUser);
@@ -257,58 +408,4 @@ public Response startHarvestingJob(@PathParam("nickName") String clientNickname,
         }
         return this.accepted();
     }
-    
-    // This GET shows the status of the harvesting run in progress for this 
-    // client, if present: 
-    // @GET
-    // @Path("{nickName}/run")
-    // TODO: 
-    
-    // This DELETE kills the harvesting run in progress for this client, 
-    // if present: 
-    // @DELETE
-    // @Path("{nickName}/run")
-    // TODO: 
-    
-    
-    
-    
-    
-    /* Auxiliary, helper methods: */ 
-    
-    /*
-    @Deprecated
-    public static JsonArrayBuilder harvestingConfigsAsJsonArray(List<Dataverse> harvestingDataverses) {
-        JsonArrayBuilder hdArr = Json.createArrayBuilder();
-        
-        for (Dataverse hd : harvestingDataverses) {
-            hdArr.add(harvestingConfigAsJson(hd.getHarvestingClientConfig()));
-        }
-        return hdArr;
-    }*/
-    
-    public static JsonObjectBuilder harvestingConfigAsJson(HarvestingClient harvestingConfig) {
-        if (harvestingConfig == null) {
-            return null; 
-        }
-        
-        
-        return jsonObjectBuilder().add("nickName", harvestingConfig.getName()).
-                add("dataverseAlias", harvestingConfig.getDataverse().getAlias()).
-                add("type", harvestingConfig.getHarvestType()).
-                add("harvestUrl", harvestingConfig.getHarvestingUrl()).
-                add("archiveUrl", harvestingConfig.getArchiveUrl()).
-                add("archiveDescription",harvestingConfig.getArchiveDescription()).
-                add("metadataFormat", harvestingConfig.getMetadataPrefix()).
-                add("set", harvestingConfig.getHarvestingSet() == null ? "N/A" : harvestingConfig.getHarvestingSet()).
-                add("schedule", harvestingConfig.isScheduled() ? harvestingConfig.getScheduleDescription() : "none").
-                add("status", harvestingConfig.isHarvestingNow() ? "inProgress" : "inActive").
-                add("lastHarvest", harvestingConfig.getLastHarvestTime() == null ? "N/A" : harvestingConfig.getLastHarvestTime().toString()).
-                add("lastResult", harvestingConfig.getLastResult()).
-                add("lastSuccessful", harvestingConfig.getLastSuccessfulHarvestTime() == null ? "N/A" : harvestingConfig.getLastSuccessfulHarvestTime().toString()).
-                add("lastNonEmpty", harvestingConfig.getLastNonEmptyHarvestTime() == null ? "N/A" : harvestingConfig.getLastNonEmptyHarvestTime().toString()).
-                add("lastDatasetsHarvested", harvestingConfig.getLastHarvestedDatasetCount() == null ? "N/A" : harvestingConfig.getLastHarvestedDatasetCount().toString()).
-                add("lastDatasetsDeleted", harvestingConfig.getLastDeletedDatasetCount() == null ? "N/A" : harvestingConfig.getLastDeletedDatasetCount().toString()).
-                add("lastDatasetsFailed", harvestingConfig.getLastFailedDatasetCount() == null ? "N/A" : harvestingConfig.getLastFailedDatasetCount().toString());
-    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/HarvestingServer.java b/src/main/java/edu/harvard/iq/dataverse/api/HarvestingServer.java
index cb28d1fae49..308b910c425 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/HarvestingServer.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/HarvestingServer.java
@@ -5,48 +5,36 @@
  */
 package edu.harvard.iq.dataverse.api;
 
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
-import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
-
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.engine.command.impl.CreateHarvestingClientCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.GetHarvestingClientCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateHarvestingClientCommand;
-import edu.harvard.iq.dataverse.harvest.client.ClientHarvestRun;
-import edu.harvard.iq.dataverse.harvest.client.HarvesterServiceBean;
-import edu.harvard.iq.dataverse.harvest.client.HarvestingClientServiceBean;
 import edu.harvard.iq.dataverse.harvest.server.OAISet;
 import edu.harvard.iq.dataverse.harvest.server.OAISetServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
-import edu.harvard.iq.dataverse.authorization.users.User;
-import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonObjectBuilder;
 import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.List;
-import java.util.ResourceBundle;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.faces.application.FacesMessage;
-import javax.json.Json;
-import javax.json.JsonReader;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.json.Json;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -61,12 +49,12 @@ public class HarvestingServer extends AbstractApiBean {
     private static final Logger logger = Logger.getLogger(HarvestingServer.class.getName()); 
     
     // TODO: this should be available to admin only.
-
+    // TODO: if we decide to update the Harvesting Sets Page to use commands for 
+    // Create, Modify, and Delete we should also add them here.
+    
     @GET
-    @Path("/")
     public Response oaiSets(@QueryParam("key") String apiKey) throws IOException {
-        
-
+    
         List<OAISet> oaiSets = null;
         try {
             oaiSets = oaiSetService.findAll();
@@ -112,21 +100,22 @@ public Response oaiSet(@PathParam("specname") String spec, @QueryParam("key") St
                     "Internal error: failed to produce output for OAI set " + spec + ".");
         }
     }
-   
+
     /**
      * create an OAI set from spec in path and other parameters from POST body
      * (as JSON). {"name":$set_name,
      * "description":$optional_set_description,"definition":$set_search_query_string}.
      */
     @POST
-    @Path("{specname}")
-    public Response createOaiSet(String jsonBody, @PathParam("specname") String spec, @QueryParam("key") String apiKey) throws IOException, JsonParseException {
+    @AuthRequired
+    @Path("/add")
+    public Response createOaiSet(@Context ContainerRequestContext crc, String jsonBody, @QueryParam("key") String apiKey) throws IOException, JsonParseException {
         /*
 	     * authorization modeled after the UI (aka HarvestingSetsPage)
          */
         AuthenticatedUser dvUser;
         try {
-            dvUser = findAuthenticatedUserOrDie();
+            dvUser = getRequestAuthenticatedUserOrDie(crc);
         } catch (WrappedResponse wr) {
             return wr.getResponse();
         }
@@ -141,30 +130,33 @@ public Response createOaiSet(String jsonBody, @PathParam("specname") String spec
 		JsonObject json = jrdr.readObject();
 
 		OAISet set = new OAISet();
-		//Validating spec 
-		if (!StringUtils.isEmpty(spec)) {
-			if (spec.length() > 30) {
+
+
+		String name, desc, defn;
+
+		try {
+			name = json.getString("name");
+		} catch (NullPointerException npe_name) {
+			return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required"));
+		}
+                		//Validating spec 
+		if (!StringUtils.isEmpty(name)) {
+			if (name.length() > 30) {
 				return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.sizelimit"));
 			}
-			if (!Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", spec)) {
+			if (!Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", name)) {
 				return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.invalid"));
 				// If it passes the regex test, check 
 			}
-			if (oaiSetService.findBySpec(spec) != null) {
+			if (oaiSetService.findBySpec(name) != null) {
 				return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.alreadyused"));
 			}
 
 		} else {
 			return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required"));
 		}
-		set.setSpec(spec);
-		String name, desc, defn;
-
-		try {
-			name = json.getString("name");
-		} catch (NullPointerException npe_name) {
-			return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required"));
-		}
+                
+                set.setSpec(name);
 		try {
 			defn = json.getString("definition");
 		} catch (NullPointerException npe_defn) {
@@ -179,22 +171,79 @@ public Response createOaiSet(String jsonBody, @PathParam("specname") String spec
 		set.setDescription(desc);
 		set.setDefinition(defn);
 		oaiSetService.save(set);
-		return created("/harvest/server/oaisets" + spec, oaiSetAsJson(set));
+		return created("/harvest/server/oaisets" + name, oaiSetAsJson(set));
 	}
 	
     }
 
     @PUT
-    @Path("{nickName}")
-    public Response modifyOaiSet(String jsonBody, @PathParam("specname") String spec, @QueryParam("key") String apiKey) throws IOException, JsonParseException {
-        // TODO:
-        // ...
-        return created("/harvest/server/oaisets" + spec, null);
+    @AuthRequired
+    @Path("{specname}")
+    public Response modifyOaiSet(@Context ContainerRequestContext crc, String jsonBody, @PathParam("specname") String spec, @QueryParam("key") String apiKey) throws IOException, JsonParseException {
+
+        AuthenticatedUser dvUser;
+        try {
+            dvUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        if (!dvUser.isSuperuser()) {            
+            return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.superUser.required"));
+        }
+
+        StringReader rdr = new StringReader(jsonBody);
+        
+        try (JsonReader jrdr = Json.createReader(rdr)) {
+            JsonObject json = jrdr.readObject();
+            OAISet update;
+            //Validating spec 
+            if (!StringUtils.isEmpty(spec)) {
+                update = oaiSetService.findBySpec(spec);
+                if (update == null) {
+                    return badRequest(BundleUtil.getStringFromBundle("harvestserver.editSetDialog.setspec.notFound"));
+                }
+
+            } else {
+                return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required"));
+            }
+
+            String desc, defn;
+
+            try {
+                defn = json.getString("definition");
+            } catch (NullPointerException npe_defn) {
+                defn = ""; // if they're updating description but not definition;
+            }
+            try {
+                desc = json.getString("description");
+            } catch (NullPointerException npe_desc) {
+                desc = ""; //treating description as optional
+            }
+            if (defn.isEmpty() && desc.isEmpty()) {
+                return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required"));
+            }
+            update.setDescription(desc);
+            update.setDefinition(defn);
+            oaiSetService.save(update);
+            return ok("/harvest/server/oaisets" + spec, oaiSetAsJson(update));
+        }
     }
     
     @DELETE
+    @AuthRequired
     @Path("{specname}")
-    public Response deleteOaiSet(@PathParam("specname") String spec, @QueryParam("key") String apiKey) {
+    public Response deleteOaiSet(@Context ContainerRequestContext crc, @PathParam("specname") String spec, @QueryParam("key") String apiKey) {
+        
+        AuthenticatedUser dvUser;
+        try {
+            dvUser = getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        if (!dvUser.isSuperuser()) {   
+            return badRequest(BundleUtil.getStringFromBundle("harvestserver.deleteSetDialog.setspec.superUser.required"));
+        }
+        
         OAISet set = null;  
         try {
             set = oaiSetService.findBySpec(spec);
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Index.java b/src/main/java/edu/harvard/iq/dataverse/api/Index.java
index c1f5f6957e6..f83506c7e27 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Index.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Index.java
@@ -15,9 +15,9 @@
 import edu.harvard.iq.dataverse.DvObjectServiceBean;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.RoleAssignment;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
 import edu.harvard.iq.dataverse.search.SolrField;
 import edu.harvard.iq.dataverse.search.SolrQueryResponse;
 import edu.harvard.iq.dataverse.search.SolrSearchResult;
@@ -33,33 +33,39 @@
 import edu.harvard.iq.dataverse.search.SearchException;
 import edu.harvard.iq.dataverse.search.SearchFields;
 import edu.harvard.iq.dataverse.search.SearchFilesServiceBean;
+import edu.harvard.iq.dataverse.search.SearchServiceFactory;
 import edu.harvard.iq.dataverse.search.SearchUtil;
 import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
 import edu.harvard.iq.dataverse.search.SortBy;
+import edu.harvard.iq.dataverse.util.ConstraintViolationUtil;
 import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 import org.apache.solr.client.solrj.SolrServerException;
 
 @Path("admin/index")
@@ -70,7 +76,7 @@ public class Index extends AbstractApiBean {
     @EJB
     IndexServiceBean indexService;
     @EJB
-    IndexBatchServiceBean indexAllService;
+    IndexBatchServiceBean indexBatchService;
     @EJB
     SolrIndexServiceBean solrIndexService;
     @EJB
@@ -86,7 +92,7 @@ public class Index extends AbstractApiBean {
     @EJB
     SolrIndexServiceBean SolrIndexService;
     @EJB
-    SearchServiceBean searchService;
+    SearchServiceFactory searchService;
     @EJB
     DatasetFieldServiceBean datasetFieldService;
     @EJB
@@ -148,7 +154,7 @@ private Response indexAllOrSubset(Long numPartitionsSelected, Long partitionIdTo
                 availablePartitionIdsBuilder.add(i);
             }
 
-            JsonObjectBuilder preview = indexAllService.indexAllOrSubsetPreview(numPartitions, partitionIdToProcess, skipIndexed);
+            JsonObjectBuilder preview = indexBatchService.indexAllOrSubsetPreview(numPartitions, partitionIdToProcess, skipIndexed);
             if (previewOnly) {
                 preview.add("args", args);
                 preview.add("availablePartitionIds", availablePartitionIdsBuilder);
@@ -162,7 +168,7 @@ private Response indexAllOrSubset(Long numPartitionsSelected, Long partitionIdTo
              * @todo How can we expose the String returned from "index all" via
              * the API?
              */
-            Future<JsonObjectBuilder> indexAllFuture = indexAllService.indexAllOrSubset(numPartitions, partitionIdToProcess, skipIndexed, previewOnly);
+            Future<JsonObjectBuilder> indexAllFuture = indexBatchService.indexAllOrSubset(numPartitions, partitionIdToProcess, skipIndexed, previewOnly);
             JsonObject workloadPreview = preview.build().getJsonObject("previewOfPartitionWorkload");
             int dataverseCount = workloadPreview.getInt("dataverseCount");
             int datasetCount = workloadPreview.getInt("datasetCount");
@@ -178,10 +184,7 @@ private Response indexAllOrSubset(Long numPartitionsSelected, Long partitionIdTo
                 sb.append(cause.getClass().getCanonicalName() + " ");
                 sb.append(cause.getMessage()).append(" ");
                 if (cause instanceof ConstraintViolationException) {
-                    ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
-                    for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
-                        sb.append("(invalid value: <<<").append(violation.getInvalidValue()).append(">>> for ").append(violation.getPropertyPath()).append(" at ").append(violation.getLeafBean()).append(" - ").append(violation.getMessage()).append(")");
-                    }
+                    sb.append(ConstraintViolationUtil.getErrorStringForConstraintViolations(cause));
                 } else if (cause instanceof NullPointerException) {
                     for (int i = 0; i < 2; i++) {
                         StackTraceElement stacktrace = cause.getStackTrace()[i];
@@ -195,7 +198,7 @@ private Response indexAllOrSubset(Long numPartitionsSelected, Long partitionIdTo
                     }
                 }
             }
-            if (sb.toString().equals("javax.ejb.EJBException: Transaction aborted javax.transaction.RollbackException java.lang.IllegalStateException ")) {
+            if (sb.toString().contains("java.lang.IllegalStateException ")) {
                 return ok("indexing went as well as can be expected... got java.lang.IllegalStateException but some indexing may have happened anyway");
             } else {
                 return error(Status.INTERNAL_SERVER_ERROR, sb.toString());
@@ -213,7 +216,7 @@ public Response clearSolrIndex() {
             return error(Status.INTERNAL_SERVER_ERROR, ex.getLocalizedMessage());
         }
     }
-
+    
     @GET
     @Path("{type}/{id}")
     public Response indexTypeById(@PathParam("type") String type, @PathParam("id") Long id) {
@@ -239,12 +242,7 @@ public Response indexTypeById(@PathParam("type") String type, @PathParam("id") L
                 Dataset dataset = datasetService.find(id);
                 if (dataset != null) {
                     boolean doNormalSolrDocCleanUp = true;
-                    try {
-                        Future<String> indexDatasetFuture = indexService.indexDataset(dataset, doNormalSolrDocCleanUp);
-                    } catch (IOException | SolrServerException e) {
-                        //
-                        return error(Status.BAD_REQUEST, writeFailureToLog(e.getLocalizedMessage(), dataset));
-                    }
+                    indexService.asyncIndexDataset(dataset, doNormalSolrDocCleanUp);
 
                     return ok("starting reindex of dataset " + id);
                 } else {
@@ -262,11 +260,7 @@ public Response indexTypeById(@PathParam("type") String type, @PathParam("id") L
                  * @todo How can we display the result to the user?
                  */
                 boolean doNormalSolrDocCleanUp = true;
-                try {
-                    Future<String> indexDatasetFuture = indexService.indexDataset(datasetThatOwnsTheFile, doNormalSolrDocCleanUp);
-                } catch (IOException | SolrServerException e) {
-                    writeFailureToLog(e.getLocalizedMessage(), datasetThatOwnsTheFile);
-                }
+                indexService.asyncIndexDataset(datasetThatOwnsTheFile, doNormalSolrDocCleanUp);
                 
                 return ok("started reindexing " + type + "/" + id);
             } else {
@@ -282,10 +276,7 @@ public Response indexTypeById(@PathParam("type") String type, @PathParam("id") L
                 sb.append(cause.getClass().getCanonicalName()).append(" ");
                 sb.append(cause.getMessage()).append(" ");
                 if (cause instanceof ConstraintViolationException) {
-                    ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
-                    for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
-                        sb.append("(invalid value: <<<").append(violation.getInvalidValue()).append(">>> for ").append(violation.getPropertyPath()).append(" at ").append(violation.getLeafBean()).append(" - ").append(violation.getMessage()).append(")");
-                    }
+                    sb.append(ConstraintViolationUtil.getErrorStringForConstraintViolations(cause));
                 } else if (cause instanceof NullPointerException) {
                     for (int i = 0; i < 2; i++) {
                         StackTraceElement stacktrace = cause.getStackTrace()[i];
@@ -317,15 +308,11 @@ public Response indexDatasetByPersistentId(@QueryParam("persistentId") String pe
         }
         if (dataset != null) {
             boolean doNormalSolrDocCleanUp = true;
-            try {
-                Future<String> indexDatasetFuture = indexService.indexDataset(dataset, doNormalSolrDocCleanUp);
-            } catch (IOException | SolrServerException e) {
-                writeFailureToLog(e.getLocalizedMessage(), dataset);               
-            }
+            indexService.asyncIndexDataset(dataset, doNormalSolrDocCleanUp);
             JsonObjectBuilder data = Json.createObjectBuilder();
             data.add("message", "Reindexed dataset " + persistentId);
             data.add("id", dataset.getId());
-            data.add("persistentId", dataset.getGlobalIdString());
+            data.add("persistentId", dataset.getGlobalId().asString());
             JsonArrayBuilder versions = Json.createArrayBuilder();
             for (DatasetVersion version : dataset.getVersions()) {
                 JsonObjectBuilder versionObject = Json.createObjectBuilder();
@@ -340,6 +327,29 @@ public Response indexDatasetByPersistentId(@QueryParam("persistentId") String pe
         }
     }
 
+    /**
+     * Clears the entry for a dataset from Solr
+     * 
+     * @param id numer id of the dataset
+     * @return response; 
+     * will return 404 if no such dataset in the database; but will attempt to 
+     * clear the entry from Solr regardless.
+     */
+    @DELETE
+    @Path("datasets/{id}")
+    public Response clearDatasetFromIndex(@PathParam("id") Long id) {
+        Dataset dataset = datasetService.find(id);
+        // We'll attempt to delete the Solr document regardless of whether the 
+        // dataset exists in the database: 
+        String response = indexService.removeSolrDocFromIndex(IndexServiceBean.solrDocIdentifierDataset + id);
+        if (dataset != null) {
+            return ok("Sent request to clear Solr document for dataset " + id + ": " + response);
+        } else {
+            return notFound("Could not find dataset " + id + " in the database. Requested to clear from Solr anyway: " + response);
+        }
+    }
+
+
     /**
      * This is just a demo of the modular math logic we use for indexAll.
      */
@@ -377,100 +387,59 @@ public Response indexPermissions(@PathParam("id") Long id) {
             return ok(indexResponse.getMessage());
         }
     }
-
+    /**
+     * Checks whether there are inconsistencies between the Solr index and 
+     * the database, and reports back the status by content type
+     * @param sync - optional parameter, if set, then run the command 
+     * synchronously. Else, return immediately, and report the status in server.log
+     * @return status report
+     */
     @GET
     @Path("status")
-    public Response indexStatus() {
-        JsonObjectBuilder contentInDatabaseButStaleInOrMissingFromSolr = getContentInDatabaseButStaleInOrMissingFromSolr();
-
-        JsonObjectBuilder contentInSolrButNotDatabase;
-        try {
-            contentInSolrButNotDatabase = getContentInSolrButNotDatabase();
-        } catch (SearchException ex) {
-            return error(Response.Status.INTERNAL_SERVER_ERROR, "Can not determine index status. " + ex.getLocalizedMessage() + ". Is Solr down? Exception: " + ex.getCause().getLocalizedMessage());
-        }
-
-        JsonObjectBuilder permissionsInDatabaseButStaleInOrMissingFromSolr = getPermissionsInDatabaseButStaleInOrMissingFromSolr();
-        JsonObjectBuilder permissionsInSolrButNotDatabase = getPermissionsInSolrButNotDatabase();
-
-        JsonObjectBuilder data = Json.createObjectBuilder()
-                .add("contentInDatabaseButStaleInOrMissingFromIndex", contentInDatabaseButStaleInOrMissingFromSolr)
-                .add("contentInIndexButNotDatabase", contentInSolrButNotDatabase)
-                .add("permissionsInDatabaseButStaleInOrMissingFromIndex", permissionsInDatabaseButStaleInOrMissingFromSolr)
-                .add("permissionsInIndexButNotDatabase", permissionsInSolrButNotDatabase);
-
-        return ok(data);
-    }
-
-    private JsonObjectBuilder getContentInDatabaseButStaleInOrMissingFromSolr() {
-        List<Dataverse> stateOrMissingDataverses = indexService.findStaleOrMissingDataverses();
-        List<Dataset> staleOrMissingDatasets = indexService.findStaleOrMissingDatasets();
-        JsonArrayBuilder jsonStateOrMissingDataverses = Json.createArrayBuilder();
-        for (Dataverse dataverse : stateOrMissingDataverses) {
-            jsonStateOrMissingDataverses.add(dataverse.getId());
-        }
-        JsonArrayBuilder datasetsInDatabaseButNotSolr = Json.createArrayBuilder();
-        for (Dataset dataset : staleOrMissingDatasets) {
-            datasetsInDatabaseButNotSolr.add(dataset.getId());
-        }
-        JsonObjectBuilder contentInDatabaseButStaleInOrMissingFromSolr = Json.createObjectBuilder()
-                /**
-                 * @todo What about files? Currently files are always indexed
-                 * along with their parent dataset
-                 */
-                .add("dataverses", jsonStateOrMissingDataverses.build().size())
-                .add("datasets", datasetsInDatabaseButNotSolr.build().size());
-        return contentInDatabaseButStaleInOrMissingFromSolr;
-    }
-
-    private JsonObjectBuilder getContentInSolrButNotDatabase() throws SearchException {
-        List<Long> dataversesInSolrOnly = indexService.findDataversesInSolrOnly();
-        List<Long> datasetsInSolrOnly = indexService.findDatasetsInSolrOnly();
-        List<Long> filesInSolrOnly = indexService.findFilesInSolrOnly();
-        JsonArrayBuilder dataversesInSolrButNotDatabase = Json.createArrayBuilder();
-        for (Long dataverseId : dataversesInSolrOnly) {
-            dataversesInSolrButNotDatabase.add(dataverseId);
-        }
-        JsonArrayBuilder datasetsInSolrButNotDatabase = Json.createArrayBuilder();
-        for (Long datasetId : datasetsInSolrOnly) {
-            datasetsInSolrButNotDatabase.add(datasetId);
-        }
-        JsonArrayBuilder filesInSolrButNotDatabase = Json.createArrayBuilder();
-        for (Long fileId : filesInSolrOnly) {
-            filesInSolrButNotDatabase.add(fileId);
-        }
-        JsonObjectBuilder contentInSolrButNotDatabase = Json.createObjectBuilder()
-                /**
-                 * @todo What about files? Currently files are always indexed
-                 * along with their parent dataset
-                 */
-                .add("dataverses", dataversesInSolrButNotDatabase.build().size())
-                .add("datasets", datasetsInSolrButNotDatabase.build().size())
-                .add("files", filesInSolrButNotDatabase.build().size());
-        return contentInSolrButNotDatabase;
-    }
-
-    private JsonObjectBuilder getPermissionsInDatabaseButStaleInOrMissingFromSolr() {
-        List<Long> staleOrMissingPermissions;
-        staleOrMissingPermissions = solrIndexService.findPermissionsInDatabaseButStaleInOrMissingFromSolr();
-        JsonArrayBuilder stalePermissionList = Json.createArrayBuilder();
-        for (Long dvObjectId : staleOrMissingPermissions) {
-            stalePermissionList.add(dvObjectId);
+    public Response indexStatus(@QueryParam("sync") String sync) {
+        Future<JsonObjectBuilder> result = indexBatchService.indexStatus();
+        if (sync != null) {
+            try {
+                JsonObjectBuilder status = result.get();
+                return ok(status);
+            } catch (InterruptedException | ExecutionException e) {
+                return AbstractApiBean.error(Status.INTERNAL_SERVER_ERROR, "indexStatus method interrupted: " + e.getLocalizedMessage());
+            }
+        } else {
+            return ok("Index Status Batch Job initiated, check log for job status.");
         }
-        return Json.createObjectBuilder()
-                .add("dvobjects", stalePermissionList.build().size());
     }
-
-    private JsonObjectBuilder getPermissionsInSolrButNotDatabase() {
-        List<Long> staleOrMissingPermissions = solrIndexService.findPermissionsInSolrNoLongerInDatabase();
-        JsonArrayBuilder stalePermissionList = Json.createArrayBuilder();
-        for (Long dvObjectId : staleOrMissingPermissions) {
-            stalePermissionList.add(dvObjectId);
+     /**
+     * Deletes "orphan" Solr documents (that don't match anything in the database).
+     * @param sync - optional parameter, if set, then run the command 
+     * synchronously. Else, return immediately, and report the results in server.log
+     * @return what documents, if anything, was deleted
+     */
+    @GET
+    @Path("clear-orphans")
+    /**
+     * Checks whether there are inconsistencies between the Solr index and the
+     * database, and reports back the status by content type
+     *
+     * @param sync - optional parameter, if !=null, then run the command
+     * synchronously. Else, return immediately, and report the status in
+     * server.log
+     * @return
+     */
+    public Response clearOrphans(@QueryParam("sync") String sync) {
+        Future<JsonObjectBuilder> result = indexBatchService.clearOrphans();
+        if (sync != null) {
+            try {
+                JsonObjectBuilder status = result.get();
+                return ok(status);
+            } catch (InterruptedException | ExecutionException e) {
+                return AbstractApiBean.error(Status.INTERNAL_SERVER_ERROR, "indexStatus method interrupted: " + e.getLocalizedMessage());
+            }
+        } else {
+            return ok("Clear Orphans Batch Job initiated, check log for job status.");
         }
-        return Json.createObjectBuilder()
-                .add("dvobjects", stalePermissionList.build().size());
     }
-
+  
     /**
      * We use the output of this method to generate our Solr schema.xml
      *
@@ -483,10 +452,11 @@ private JsonObjectBuilder getPermissionsInSolrButNotDatabase() {
     public String getSolrSchema() {
 
         StringBuilder sb = new StringBuilder();
-
-        for (DatasetFieldType datasetField : datasetFieldService.findAllOrderedByName()) {
-            String nameSearchable = datasetField.getSolrField().getNameSearchable();
-            SolrField.SolrType solrType = datasetField.getSolrField().getSolrType();
+        Map<Long, JsonObject> cvocTermUriMap = datasetFieldSvc.getCVocConf(true);
+        for (DatasetFieldType datasetFieldType : datasetFieldService.findAllOrderedByName()) {
+            //ToDo - getSolrField() creates/returns a new object - just get it once and re-use
+            String nameSearchable = datasetFieldType.getSolrField().getNameSearchable();
+            SolrField.SolrType solrType = datasetFieldType.getSolrField().getSolrType();
             String type = solrType.getType();
             if (solrType.equals(SolrField.SolrType.EMAIL)) {
                 /**
@@ -505,7 +475,7 @@ public String getSolrSchema() {
                  */
                 logger.info("email type detected (" + nameSearchable + ") See also https://github.com/IQSS/dataverse/issues/759");
             }
-            String multivalued = datasetField.getSolrField().isAllowedToBeMultivalued().toString();
+            String multivalued = Boolean.toString(datasetFieldType.getSolrField().isAllowedToBeMultivalued() || cvocTermUriMap.containsKey(datasetFieldType.getId()));
             // <field name="datasetId" type="text_general" multiValued="false" stored="true" indexed="true"/>
             sb.append("    <field name=\"" + nameSearchable + "\" type=\"" + type + "\" multiValued=\"" + multivalued + "\" stored=\"true\" indexed=\"true\"/>\n");
         }
@@ -533,7 +503,7 @@ public String getSolrSchema() {
         }
 
         sb.append("---\n");
-
+        //ToDo - this is the same for loop as above - could combine into one by using a second string buffer and appending the latter one after the loop. 
         for (DatasetFieldType datasetField : datasetFieldService.findAllOrderedByName()) {
             String nameSearchable = datasetField.getSolrField().getNameSearchable();
             String nameFacetable = datasetField.getSolrField().getNameFacetable();
@@ -595,7 +565,7 @@ public Response searchDebug(
         List<Dataverse> dataverses = new ArrayList<>();
         dataverses.add(subtreeScope);
         try {
-            solrQueryResponse = searchService.search(createDataverseRequest(user), dataverses, query, filterQueries, sortField, sortOrder, paginationStart, dataRelatedToMe, numResultsPerPage);
+            solrQueryResponse = searchService.getDefaultSearchService().search(createDataverseRequest(user), dataverses, query, filterQueries, sortField, sortOrder, paginationStart, dataRelatedToMe, numResultsPerPage);
         } catch (SearchException ex) {
             return error(Response.Status.INTERNAL_SERVER_ERROR, ex.getLocalizedMessage() + ": " + ex.getCause().getLocalizedMessage());
         }
@@ -678,15 +648,16 @@ public Response deleteTimestamp(@PathParam("dvObjectId") long dvObjectId) {
     }
 
     @GET
+    @AuthRequired
     @Path("filesearch")
-    public Response filesearch(@QueryParam("persistentId") String persistentId, @QueryParam("semanticVersion") String semanticVersion, @QueryParam("q") String userSuppliedQuery) {
+    public Response filesearch(@Context ContainerRequestContext crc, @QueryParam("persistentId") String persistentId, @QueryParam("semanticVersion") String semanticVersion, @QueryParam("q") String userSuppliedQuery) {
         Dataset dataset = datasetService.findByGlobalId(persistentId);
         if (dataset == null) {
             return error(Status.BAD_REQUEST, "Could not find dataset with persistent id " + persistentId);
         }
         User user = GuestUser.get();
         try {
-            AuthenticatedUser authenticatedUser = findAuthenticatedUserOrDie();
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
             if (authenticatedUser != null) {
                 user = authenticatedUser;
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Info.java b/src/main/java/edu/harvard/iq/dataverse/api/Info.java
index 4fe5cba5b9f..45539424e85 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Info.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Info.java
@@ -1,15 +1,35 @@
 package edu.harvard.iq.dataverse.api;
 
+import java.util.logging.Logger;
+
+import edu.harvard.iq.dataverse.customization.CustomizationConstants;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+
+import edu.harvard.iq.dataverse.export.ExportService;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
-import javax.ejb.EJB;
-import javax.json.Json;
-import javax.json.JsonValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
+import io.gdcc.spi.export.Exporter;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.XMLExporter;
+import jakarta.ejb.EJB;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import org.eclipse.microprofile.openapi.annotations.Operation;
+import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
+import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
+import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 
 @Path("info")
+@Tag(name = "info", description = "General information about the Dataverse installation.")
 public class Info extends AbstractApiBean {
 
     @EJB
@@ -18,38 +38,125 @@ public class Info extends AbstractApiBean {
     @EJB
     SystemConfig systemConfig;
 
+    private static final Logger logger = Logger.getLogger(Info.class.getCanonicalName());
+
     @GET
     @Path("settings/:DatasetPublishPopupCustomText")
     public Response getDatasetPublishPopupCustomText() {
-        String setting = settingsService.getValueForKey(SettingsServiceBean.Key.DatasetPublishPopupCustomText);
-        if (setting != null) {
-            return ok(Json.createObjectBuilder().add("message", setting));
-        } else {
-            return notFound("Setting " + SettingsServiceBean.Key.DatasetPublishPopupCustomText + " not found");
-        }
+        return getSettingResponseByKey(SettingsServiceBean.Key.DatasetPublishPopupCustomText);
     }
-    
+
+    @GET
+    @Path("settings/:MaxEmbargoDurationInMonths")
+    public Response getMaxEmbargoDurationInMonths() {
+        return getSettingResponseByKey(SettingsServiceBean.Key.MaxEmbargoDurationInMonths);
+    }
+
     @GET
     @Path("version")
+    @Operation(summary = "Get version and build information", description = "Get version and build information")
+    @APIResponse(responseCode = "200",
+                 description = "Version and build information")
     public Response getInfo() {
         String versionStr = systemConfig.getVersion(true);
         String[] comps = versionStr.split("build",2);
         String version = comps[0].trim();
         JsonValue build = comps.length > 1 ? Json.createArrayBuilder().add(comps[1].trim()).build().get(0) : JsonValue.NULL;
-        
-        return response( req -> ok( Json.createObjectBuilder().add("version", version)
-                                                              .add("build", build)));
+        return ok(Json.createObjectBuilder()
+                .add("version", version)
+                .add("build", build));
     }
-    
+
     @GET
     @Path("server")
     public Response getServer() {
-        return response( req -> ok(systemConfig.getDataverseServer()));
+        return ok(JvmSettings.FQDN.lookup());
     }
-    
+
+    @GET
+    @Path("applicationTermsOfUse")
+    @APIResponse(responseCode = "200",
+                 description = "Application Terms of Use (General Terms of Use) that must be agreed to at signup.")
+    public Response getApplicationTermsOfUse(
+            @Parameter(description = "Two-character language code.",
+                    required = false,
+                    example = "en",
+                    schema = @Schema(type = SchemaType.STRING))
+            @QueryParam("lang") String lang) {
+        return ok(systemConfig.getApplicationTermsOfUse(lang));
+    }
+
     @GET
     @Path("apiTermsOfUse")
     public Response getTermsOfUse() {
-        return response( req -> ok(systemConfig.getApiTermsOfUse()));
+        return ok(systemConfig.getApiTermsOfUse());
+    }
+
+    @GET
+    @Path("settings/incompleteMetadataViaApi")
+    public Response getAllowsIncompleteMetadata() {
+        return ok(JvmSettings.API_ALLOW_INCOMPLETE_METADATA.lookupOptional(Boolean.class).orElse(false));
+    }
+
+    @GET
+    @Path("zipDownloadLimit")
+    public Response getZipDownloadLimit() {
+        long zipDownloadLimit = SystemConfig.getLongLimitFromStringOrDefault(settingsSvc.getValueForKey(SettingsServiceBean.Key.ZipDownloadLimit), SystemConfig.defaultZipDownloadLimit);
+        return ok(zipDownloadLimit);
+    }
+
+    @GET
+    @Path("exportFormats")
+    public Response getExportFormats() {
+        JsonObjectBuilder responseModel = Json.createObjectBuilder();
+        ExportService instance = ExportService.getInstance();
+        for (String[] labels : instance.getExportersLabels()) {
+            try {
+                Exporter exporter = instance.getExporter(labels[1]);
+                JsonObjectBuilder exporterObject = Json.createObjectBuilder().add("displayName", labels[0])
+                        .add("mediaType", exporter.getMediaType()).add("isHarvestable", exporter.isHarvestable())
+                        .add("isVisibleInUserInterface", exporter.isAvailableToUsers());
+                if (exporter instanceof XMLExporter xmlExporter) {
+                    exporterObject.add("XMLNameSpace", xmlExporter.getXMLNameSpace())
+                            .add("XMLSchemaLocation", xmlExporter.getXMLSchemaLocation())
+                            .add("XMLSchemaVersion", xmlExporter.getXMLSchemaVersion());
+                }
+                responseModel.add(labels[1], exporterObject);
+            }
+            catch (ExportException ex){
+                logger.warning("Failed to get: " + labels[1]);
+                logger.warning(ex.getLocalizedMessage());
+            }
+        }
+        return ok(responseModel);
+    }
+
+    @GET
+    @Path("settings/customization/{customizationFileType}")
+    public Response getCustomizationFile(@PathParam("customizationFileType") String customizationFileType) {
+        String type = customizationFileType != null ? customizationFileType.toLowerCase() : "";
+        if (!CustomizationConstants.validTypes.contains(type)) {
+            return badRequest("Customization type unknown or missing. Must be one of the following: " + CustomizationConstants.validTypes);
+        }
+        Client client = ClientBuilder.newClient();
+        WebTarget endpoint = client.target("http://localhost:8080/CustomizationFilesServlet");
+        Response response = endpoint.queryParam("customFileType", type)
+                .request(MediaType.MEDIA_TYPE_WILDCARD)
+                .get();
+
+        if (response.getLength() < 1) {
+            return notFound(type + " not found.");
+        } else {
+            return response;
+        }
+    }
+
+    private Response getSettingResponseByKey(SettingsServiceBean.Key key) {
+        String setting = settingsService.getValueForKey(key);
+        if (setting != null) {
+            return ok(Json.createObjectBuilder().add("message", setting));
+        } else {
+            return notFound("Setting " + key + " not found");
+        }
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/LDNInbox.java b/src/main/java/edu/harvard/iq/dataverse/api/LDNInbox.java
new file mode 100644
index 00000000000..6a9c608dc13
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/LDNInbox.java
@@ -0,0 +1,198 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.MailServiceBean;
+import edu.harvard.iq.dataverse.RoleAssigneeServiceBean;
+import edu.harvard.iq.dataverse.RoleAssignment;
+import edu.harvard.iq.dataverse.UserNotification;
+import edu.harvard.iq.dataverse.UserNotificationServiceBean;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.json.JSONLDUtil;
+import edu.harvard.iq.dataverse.util.json.JsonLDNamespace;
+import edu.harvard.iq.dataverse.util.json.JsonLDTerm;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.io.StringWriter;
+import java.sql.Timestamp;
+import java.util.logging.Logger;
+
+import jakarta.ejb.EJB;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonWriter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.ServiceUnavailableException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+
+@Path("inbox")
+public class LDNInbox extends AbstractApiBean {
+
+    private static final Logger logger = Logger.getLogger(LDNInbox.class.getName());
+
+    @EJB
+    SettingsServiceBean settingsService;
+
+    @EJB
+    DatasetServiceBean datasetService;
+
+    @EJB
+    MailServiceBean mailService;
+
+    @EJB
+    UserNotificationServiceBean userNotificationService;
+
+    @EJB
+    DataverseRoleServiceBean roleService;
+
+    @EJB
+    RoleAssigneeServiceBean roleAssigneeService;
+    @Context
+    protected HttpServletRequest httpRequest;
+
+    @POST
+    @Path("/")
+    @Consumes("application/ld+json, application/json-ld")
+    public Response acceptMessage(String body) {
+        IpAddress origin = new DataverseRequest(null, httpRequest).getSourceAddress();
+        String whitelist = settingsService.get(SettingsServiceBean.Key.LDNMessageHosts.toString(), "");
+        // Only do something if we listen to this host
+        if (whitelist.equals("*") || whitelist.contains(origin.toString())) {
+            String citingPID = null;
+            String citingType = null;
+            boolean sent = false;
+
+            JsonObject jsonld = null;
+            jsonld = JSONLDUtil.decontextualizeJsonLD(body);
+            if (jsonld == null) {
+                // Kludge - something about the coar notify URL causes a
+                // LOADING_REMOTE_CONTEXT_FAILED error in the titanium library - so replace it
+                // and try with a local copy
+                body = body.replace("\"https://purl.org/coar/notify\"",
+                        "{\n" + "                \"@vocab\": \"http://purl.org/coar/notify_vocabulary/\",\n"
+                                + "                \"ietf\": \"http://www.iana.org/assignments/relation/\",\n"
+                                + "                \"coar-notify\": \"http://purl.org/coar/notify_vocabulary/\",\n"
+                                + "                \"sorg\": \"http://schema.org/\",\n"
+                                + "                \"ReviewAction\": \"coar-notify:ReviewAction\",\n"
+                                + "                \"EndorsementAction\": \"coar-notify:EndorsementAction\",\n"
+                                + "                \"IngestAction\": \"coar-notify:IngestAction\",\n"
+                                + "                \"ietf:cite-as\": {\n" + "                \"@type\": \"@id\"\n"
+                                + "                }}");
+                jsonld = JSONLDUtil.decontextualizeJsonLD(body);
+            }
+            if (jsonld == null) {
+                throw new BadRequestException("Could not parse message to find acceptable citation link to a dataset.");
+            }
+            String relationship = "isRelatedTo";
+            String name = null;
+            JsonLDNamespace activityStreams = JsonLDNamespace.defineNamespace("as",
+                    "https://www.w3.org/ns/activitystreams#");
+            JsonLDNamespace ietf = JsonLDNamespace.defineNamespace("ietf", "http://www.iana.org/assignments/relation/");
+            String objectKey = new JsonLDTerm(activityStreams, "object").getUrl();
+            if (jsonld.containsKey(objectKey)) {
+                JsonObject msgObject = jsonld.getJsonObject(objectKey);
+
+                citingPID = msgObject.getJsonObject(new JsonLDTerm(ietf, "cite-as").getUrl()).getString("@id");
+                logger.fine("Citing PID: " + citingPID);
+                if (msgObject.containsKey("@type")) {
+                    citingType = msgObject.getString("@type");
+                    if (citingType.startsWith(JsonLDNamespace.schema.getUrl())) {
+                        citingType = citingType.replace(JsonLDNamespace.schema.getUrl(), "");
+                    }
+                    if (msgObject.containsKey(JsonLDTerm.schemaOrg("name").getUrl())) {
+                        name = msgObject.getString(JsonLDTerm.schemaOrg("name").getUrl());
+                    }
+                    logger.fine("Citing Type: " + citingType);
+                    String contextKey = new JsonLDTerm(activityStreams, "context").getUrl();
+
+                    if (jsonld.containsKey(contextKey)) {
+                        JsonObject context = jsonld.getJsonObject(contextKey);
+                        for (Map.Entry<String, JsonValue> entry : context.entrySet()) {
+
+                            relationship = entry.getKey().replace("_:", "");
+                            // Assuming only one for now - should check for array and loop
+                            JsonObject citedResource = (JsonObject) entry.getValue();
+                            String pid = citedResource.getJsonObject(new JsonLDTerm(ietf, "cite-as").getUrl())
+                                    .getString("@id");
+                            if (citedResource.getString("@type").equals(JsonLDTerm.schemaOrg("Dataset").getUrl())) {
+                                logger.fine("Raw PID: " + pid);
+                                if (pid.startsWith(AbstractDOIProvider.DOI_RESOLVER_URL)) {
+                                    pid = pid.replace(AbstractDOIProvider.DOI_RESOLVER_URL, AbstractDOIProvider.DOI_PROTOCOL + ":");
+                                } else if (pid.startsWith(HandlePidProvider.HDL_RESOLVER_URL)) {
+                                    pid = pid.replace(HandlePidProvider.HDL_RESOLVER_URL, HandlePidProvider.HDL_PROTOCOL + ":");
+                                }
+                                logger.fine("Protocol PID: " + pid);
+                                Optional<GlobalId> id = PidProvider.parse(pid);
+                                Dataset dataset = datasetSvc.findByGlobalId(pid);
+                                if (dataset != null) {
+                                    JsonObject citingResource = Json.createObjectBuilder().add("@id", citingPID)
+                                            .add("@type", citingType).add("relationship", relationship)
+                                            .add("name", name).build();
+                                    StringWriter sw = new StringWriter(128);
+                                    try (JsonWriter jw = Json.createWriter(sw)) {
+                                        jw.write(citingResource);
+                                    }
+                                    String jsonstring = sw.toString();
+                                    Set<RoleAssignment> ras = roleService.rolesAssignments(dataset);
+
+                                    roleService.rolesAssignments(dataset).stream()
+                                            .filter(ra -> ra.getRole().permissions()
+                                                    .contains(Permission.PublishDataset))
+                                            .flatMap(
+                                                    ra -> roleAssigneeService
+                                                            .getExplicitUsers(roleAssigneeService
+                                                                    .getRoleAssignee(ra.getAssigneeIdentifier()))
+                                                            .stream())
+                                            .distinct() // prevent double-send
+                                            .forEach(au -> {
+
+                                                if (au.isSuperuser()) {
+                                                    userNotificationService.sendNotification(au,
+                                                            new Timestamp(new Date().getTime()),
+                                                            UserNotification.Type.DATASETMENTIONED, dataset.getId(),
+                                                            null, null, true, jsonstring);
+
+                                                }
+                                            });
+                                    sent = true;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (!sent) {
+                if (citingPID == null || citingType == null) {
+                    throw new BadRequestException(
+                            "Could not parse message to find acceptable citation link to a dataset.");
+                } else {
+                    throw new ServiceUnavailableException(
+                            "Unable to process message. Please contact the administrators.");
+                }
+            }
+        } else {
+            logger.info("Ignoring message from IP address: " + origin.toString());
+            throw new ForbiddenException("Inbox does not acept messages from this address");
+        }
+        return ok("Message Received");
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Licenses.java b/src/main/java/edu/harvard/iq/dataverse/api/Licenses.java
new file mode 100644
index 00000000000..ab50ebbf2e4
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Licenses.java
@@ -0,0 +1,225 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import java.util.logging.Logger;
+import jakarta.ejb.Stateless;
+import jakarta.ws.rs.core.Response.Status;
+
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.util.json.JsonPrinter;
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+
+/**
+ * Where the licenses API calls live.
+ * 
+ * @author qqmyers
+ */
+@Stateless
+@Path("licenses")
+public class Licenses extends AbstractApiBean {
+
+    private static final Logger logger = Logger.getLogger(Licenses.class.getName());
+
+    @GET
+    @Path("/")
+    public Response getLicenses() {
+        JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
+        for (License license : licenseSvc.listAll()) {
+            arrayBuilder.add(JsonPrinter.json(license));
+        }
+        return ok(arrayBuilder);
+    }
+
+    @GET
+    @Path("/{id}")
+    public Response getLicenseById(@PathParam("id") long id) {
+        License license = licenseSvc.getById(id);
+        if (license == null)
+            return error(Response.Status.NOT_FOUND, "License with ID " + id + " not found");
+        return ok(json(license));
+    }
+
+    @POST
+    @AuthRequired
+    @Path("/")
+    public Response addLicense(@Context ContainerRequestContext crc, License license) {
+        User authenticatedUser;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            if (!authenticatedUser.isSuperuser()) {
+                return error(Status.FORBIDDEN, "must be superuser");
+            }
+        } catch (WrappedResponse e) {
+            return error(Status.UNAUTHORIZED, "api key required");
+        }
+        try {
+            License l = licenseSvc.save(license);
+            actionLogSvc.log(new ActionLogRecord(ActionLogRecord.ActionType.Admin, "licenseAdded")
+                    .setInfo("License " + l.getName() + "(" + l.getUri() + ") as id: " + l.getId() + ".")
+                    .setUserIdentifier(authenticatedUser.getIdentifier()));
+            return created("/api/licenses/" + l.getId(), Json.createObjectBuilder().add("message", "License created"));
+        } catch (WrappedResponse e) {
+            Throwable cause = e.getCause();
+            if (cause instanceof IllegalArgumentException) {
+                return error(Response.Status.BAD_REQUEST, cause.getMessage());
+            } else if (cause instanceof IllegalStateException) {
+                return error(Response.Status.CONFLICT, cause.getMessage());
+            }
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
+
+    @GET
+    @Path("/default")
+    public Response getDefault() {
+        return ok("Default license ID is " + licenseSvc.getDefault().getId());
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("/default/{id}")
+    public Response setDefault(@Context ContainerRequestContext crc, @PathParam("id") long id) {
+        User authenticatedUser;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            if (!authenticatedUser.isSuperuser()) {
+                return error(Status.FORBIDDEN, "must be superuser");
+            }
+        } catch (WrappedResponse e) {
+            return error(Status.UNAUTHORIZED, "api key required");
+        }
+        try {
+            if (licenseSvc.setDefault(id) == 0) {
+                return error(Response.Status.NOT_FOUND, "License with ID " + id + " not found");
+            }
+            License license = licenseSvc.getById(id);
+            actionLogSvc
+                    .log(new ActionLogRecord(ActionLogRecord.ActionType.Admin, "defaultLicenseChanged")
+                            .setInfo("License " + license.getName() + "(" + license.getUri() + ") as id: " + id
+                                    + "is now the default license.")
+                            .setUserIdentifier(authenticatedUser.getIdentifier()));
+            return ok("Default license ID set to " + id);
+        } catch (WrappedResponse e) {
+            if (e.getCause() instanceof IllegalArgumentException) {
+                return badRequest(e.getCause().getMessage());
+            }
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("/{id}/:active/{activeState}")
+    public Response setActiveState(@Context ContainerRequestContext crc, @PathParam("id") long id, @PathParam("activeState") boolean active) {
+        User authenticatedUser;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            if (!authenticatedUser.isSuperuser()) {
+                return error(Status.FORBIDDEN, "must be superuser");
+            }
+        } catch (WrappedResponse e) {
+            return error(Status.UNAUTHORIZED, "api key required");
+        }
+        try {
+            if (licenseSvc.setActive(id, active) == 0) {
+                return error(Response.Status.NOT_FOUND, "License with ID " + id + " not found");
+            }
+            License license = licenseSvc.getById(id);
+            actionLogSvc.log(new ActionLogRecord(ActionLogRecord.ActionType.Admin, "licenseStateChanged")
+                    .setInfo("License " + license.getName() + "(" + license.getUri() + ") as id: " + id
+                            + "has been made " + (active ? "active" : "inactive"))
+                    .setUserIdentifier(authenticatedUser.getIdentifier()));
+            return ok("License ID " + id + " set to " + (active ? "active" : "inactive"));
+        } catch (WrappedResponse e) {
+            if (e.getCause() instanceof IllegalArgumentException) {
+                return badRequest(e.getCause().getMessage());
+            }
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("/{id}/:sortOrder/{sortOrder}")
+    public Response setSortOrder(@Context ContainerRequestContext crc, @PathParam("id") long id, @PathParam("sortOrder") long sortOrder) {
+        User authenticatedUser;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            if (!authenticatedUser.isSuperuser()) {
+                return error(Status.FORBIDDEN, "must be superuser");
+            }
+        } catch (WrappedResponse e) {
+            return error(Status.UNAUTHORIZED, "api key required");
+        }
+        try {
+            if (licenseSvc.setSortOrder(id, sortOrder) == 0) {
+                return error(Response.Status.NOT_FOUND, "License with ID " + id + " not found");
+            }
+            License license = licenseSvc.getById(id);
+            actionLogSvc
+                    .log(new ActionLogRecord(ActionLogRecord.ActionType.Admin, "sortOrderLicenseChanged")
+                            .setInfo("License " + license.getName() + "(" + license.getUri() + ") as id: " + id
+                                    + "has now sort order " + sortOrder + ".")
+                            .setUserIdentifier(authenticatedUser.getIdentifier()));
+            return ok("License ID " + id + " sort order set to " + sortOrder);
+        } catch (WrappedResponse e) {
+            if (e.getCause() instanceof IllegalArgumentException) {
+                return badRequest(e.getCause().getMessage());
+            }
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("/{id}")
+    public Response deleteLicenseById(@Context ContainerRequestContext crc, @PathParam("id") long id) {
+        User authenticatedUser;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            if (!authenticatedUser.isSuperuser()) {
+                return error(Status.FORBIDDEN, "must be superuser");
+            }
+        } catch (WrappedResponse e) {
+            return error(Status.UNAUTHORIZED, "api key required");
+        }
+        try {
+            License license = licenseSvc.getById(id);
+            if (license == null) {
+                return error(Status.NOT_FOUND, "License with ID " + id + " not found.");
+            } else if (license.isDefault()) {
+                return error(Status.CONFLICT, "Please make sure the license is not the default before deleting it.");
+            } else {
+                if (licenseSvc.deleteById(id) == 1) {
+                    actionLogSvc
+                            .log(new ActionLogRecord(ActionLogRecord.ActionType.Admin, "licenseDeleted")
+                                    .setInfo("License " + license.getName() + "(" + license.getUri() + ") as id: " + id
+                                            + " has been deleted.")
+                                    .setUserIdentifier(authenticatedUser.getIdentifier()));
+                    return ok("OK. License with ID " + id + " was deleted.");
+                } else {
+                    return error(Status.CONFLICT, "Couldn't delete license with ID: " + id);
+                }
+            }
+        } catch (WrappedResponse e) {
+            if (e.getCause() instanceof IllegalStateException) {
+                return error(Response.Status.CONFLICT, e.getMessage());
+            }
+            return error(Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/LocalContexts.java b/src/main/java/edu/harvard/iq/dataverse/api/LocalContexts.java
new file mode 100644
index 00000000000..8190b909dbf
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/LocalContexts.java
@@ -0,0 +1,172 @@
+package edu.harvard.iq.dataverse.api;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.logging.Logger;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
+import edu.harvard.iq.dataverse.PermissionServiceBean;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.ejb.EJB;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+@Path("localcontexts")
+public class LocalContexts extends AbstractApiBean {
+
+    protected static final Logger logger = Logger.getLogger(LocalContexts.class.getName());
+
+    @EJB
+    DatasetServiceBean datasetService;
+
+    @Inject
+    DataverseRequestServiceBean dvRequestService;
+
+    @EJB
+    PermissionServiceBean permissionService;
+
+    @GET
+    @Path("/datasets/{id}")
+    @Produces(MediaType.APPLICATION_JSON)
+    @AuthRequired
+    public Response getDatasetLocalContexts(@Context ContainerRequestContext crc, @PathParam("id") String id) {
+        try {
+            Dataset dataset = findDatasetOrDie(id);
+            DataverseRequest req = createDataverseRequest(getRequestUser(crc));
+
+            // Check if the user has edit dataset permission
+            /* Feature flag to skip permission check
+             * If you add the api-session-auth FeatureFlag, you can verify if the user has edit permissions
+             * 
+             */
+            if (FeatureFlags.ADD_LOCAL_CONTEXTS_PERMISSION_CHECK.enabled() && !permissionService.userOn(req.getUser(), dataset).has(Permission.EditDataset)) {
+                return error(Response.Status.FORBIDDEN,
+                        "You do not have permission to query LocalContexts about this dataset.");
+            }
+
+            String localContextsUrl = JvmSettings.LOCALCONTEXTS_URL.lookupOptional().orElse(null);
+            String localContextsApiKey = JvmSettings.LOCALCONTEXTS_API_KEY.lookupOptional().orElse(null);
+
+            if (localContextsUrl == null || localContextsApiKey == null) {
+                return error(Response.Status.NOT_FOUND, "LocalContexts API configuration is missing.");
+            }
+
+            String datasetDoi = dataset.getGlobalId().asString();
+            String apiUrl = localContextsUrl + "api/v2/projects/?publication_doi=" + datasetDoi;
+            logger.fine("URL used: " + apiUrl);
+            try {
+                HttpClient client = HttpClient.newHttpClient();
+                HttpRequest request = HttpRequest.newBuilder().uri(new URI(apiUrl))
+                        .header("X-Api-Key", localContextsApiKey).GET().build();
+
+                HttpResponse<String> response;
+
+                response = client.send(request, HttpResponse.BodyHandlers.ofString());
+
+                if (response.statusCode() == 200) {
+                    // Assuming the response is already in JSON format
+                    logger.fine("Response from search: " + response.body());
+                    JsonObject jsonObject = JsonUtil.getJsonObject(response.body());
+                    return ok(jsonObject);
+                } else {
+                    return error(Response.Status.SERVICE_UNAVAILABLE,
+                            "Error from LocalContexts API: " + response.statusCode());
+                }
+            } catch (URISyntaxException e) {
+                logger.warning(e.getMessage());
+                return error(Response.Status.SERVICE_UNAVAILABLE, "LocalContexts connection misconfigured.");
+            } catch (IOException | InterruptedException e) {
+                logger.warning(e.getMessage());
+                e.printStackTrace();
+                return error(Response.Status.SERVICE_UNAVAILABLE, "Error contacting LocalContexts");
+
+            }
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @GET
+    @Path("/datasets/{id}/{projectId}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response searchLocalContexts(@PathParam("id") String datasetId, @PathParam("projectId") String projectId) {
+        try {
+            Dataset dataset = findDatasetOrDie(datasetId);
+            String localContextsUrl = JvmSettings.LOCALCONTEXTS_URL.lookupOptional().orElse(null);
+            String localContextsApiKey = JvmSettings.LOCALCONTEXTS_API_KEY.lookupOptional().orElse(null);
+
+            if (localContextsUrl == null || localContextsApiKey == null) {
+                return error(Response.Status.NOT_FOUND, "LocalContexts API configuration is missing.");
+            }
+
+            String apiUrl = localContextsUrl + "api/v2/projects/" + projectId + "/";
+            logger.fine("URL used: " + apiUrl);
+            try {
+                HttpClient client = HttpClient.newHttpClient();
+                HttpRequest request = HttpRequest.newBuilder().uri(new URI(apiUrl))
+                        .header("X-Api-Key", localContextsApiKey).GET().build();
+
+                HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+
+                if (response.statusCode() == 200) {
+                    // Parse the JSON response
+                    JsonObject jsonResponse = JsonUtil.getJsonObject(response.body());
+                    logger.fine("Response from get: " + JsonUtil.prettyPrint(jsonResponse));
+
+                    // Check if the response contains a "publication_doi" key
+                    if (jsonResponse.containsKey("external_ids")) {
+                        JsonObject externalIds = jsonResponse.getJsonObject("external_ids");
+                        if (externalIds.containsKey("publication_doi")) {
+                            String responseDoi = externalIds.getString("publication_doi");
+                            String datasetDoi = dataset.getGlobalId().asString();
+                            // Compare the DOI from the response with the dataset's DOI
+                            if (responseDoi.equals(datasetDoi)) {
+                                // Return the JSON response as-is
+                                return ok(jsonResponse);
+                            } else {
+                                // DOI mismatch, return 404
+                                return error(Response.Status.NOT_FOUND,
+                                        "LocalContexts information not found for this dataset.");
+                            }
+                        } else {
+                            // "publication_doi" key not found in the response, return 404
+                            return error(Response.Status.NOT_FOUND, "Invalid response from Local Contexts API.");
+                        }
+                    } else {
+                        // "external_ids" key not found in the response, return 404
+                        return error(Response.Status.NOT_FOUND, "Invalid response from Local Contexts API.");
+                    }
+
+                } else {
+                    return error(Response.Status.SERVICE_UNAVAILABLE,
+                            "Error from Local Contexts API: " + response.statusCode());
+                }
+            } catch (URISyntaxException e) {
+                logger.warning(e.getMessage());
+                return error(Response.Status.SERVICE_UNAVAILABLE, "LocalContexts connection misconfigured.");
+            } catch (IOException | InterruptedException e) {
+                logger.warning(e.getMessage());
+                e.printStackTrace();
+                return error(Response.Status.SERVICE_UNAVAILABLE, "Error contacting LocalContexts");
+            }
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Logout.java b/src/main/java/edu/harvard/iq/dataverse/api/Logout.java
new file mode 100644
index 00000000000..e8d8be04459
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Logout.java
@@ -0,0 +1,41 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.DataverseHeaderFragment;
+import edu.harvard.iq.dataverse.DataverseSession;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+
+import jakarta.inject.Inject;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+
+@Path("logout")
+public class Logout extends AbstractApiBean {
+
+    @Inject
+    DataverseSession session;
+
+    /**
+     * The only current API authentication mechanism subject to Log Out is the session cookie auth, and this mechanism is only available when the corresponding feature flag is enabled:
+     *
+     * @see FeatureFlags#API_SESSION_AUTH
+     * <p>
+     * This endpoint replicates the logic from the JSF Log Out feature:
+     * @see DataverseHeaderFragment#logout()
+     * <p>
+     * TODO: This endpoint must change when a final API authentication mechanism is established for use cases / applications subject to Log Out
+     */
+    @POST
+    @Path("/")
+    public Response logout() {
+        if (!FeatureFlags.API_SESSION_AUTH.enabled()) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, "This endpoint is only available when session authentication feature flag is enabled");
+        }
+        if (!session.getUser().isAuthenticated()) {
+            return error(Response.Status.BAD_REQUEST, "No valid session cookie was sent in the request");
+        }
+        session.setUser(null);
+        session.setStatusDismissed(false);
+        return ok("User logged out");
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Mail.java b/src/main/java/edu/harvard/iq/dataverse/api/Mail.java
index 3b5050b480b..5fac2f30c89 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Mail.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Mail.java
@@ -2,10 +2,10 @@
 
 import edu.harvard.iq.dataverse.MailServiceBean;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
-import javax.ejb.EJB;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.EJB;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/MakeDataCountApi.java b/src/main/java/edu/harvard/iq/dataverse/api/MakeDataCountApi.java
index da827de9c1f..562fd7fcb81 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/MakeDataCountApi.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/MakeDataCountApi.java
@@ -2,28 +2,46 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.makedatacount.DatasetExternalCitations;
 import edu.harvard.iq.dataverse.makedatacount.DatasetExternalCitationsServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.DatasetMetrics;
 import edu.harvard.iq.dataverse.makedatacount.DatasetMetricsServiceBean;
-import java.io.FileReader;
+import edu.harvard.iq.dataverse.makedatacount.MakeDataCountProcessState;
+import edu.harvard.iq.dataverse.makedatacount.MakeDataCountProcessStateServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ejb.EJB;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 /**
  * Note that there are makeDataCount endpoints in Datasets.java as well.
@@ -36,9 +54,13 @@ public class MakeDataCountApi extends AbstractApiBean {
     @EJB
     DatasetMetricsServiceBean datasetMetricsService;
     @EJB
+    MakeDataCountProcessStateServiceBean makeDataCountProcessStateService;
+    @EJB
     DatasetExternalCitationsServiceBean datasetExternalCitationsService;
     @EJB
     DatasetServiceBean datasetService;
+    @EJB
+    SystemConfig systemConfig;
 
     /**
      * TODO: For each dataset, send the following:
@@ -74,26 +96,21 @@ public Response sendDataToHub() {
     @Path("{id}/addUsageMetricsFromSushiReport")
     public Response addUsageMetricsFromSushiReport(@PathParam("id") String id, @QueryParam("reportOnDisk") String reportOnDisk) {
 
-        JsonObject report;
-
-        try (FileReader reader = new FileReader(reportOnDisk)) {
-            report = Json.createReader(reader).readObject();
-            Dataset dataset;
-            try {
-                dataset = findDatasetOrDie(id);
-                List<DatasetMetrics> datasetMetrics = datasetMetricsService.parseSushiReport(report, dataset);
-                if (!datasetMetrics.isEmpty()) {
-                    for (DatasetMetrics dm : datasetMetrics) {
-                        datasetMetricsService.save(dm);
-                    }
+        try {
+            JsonObject report = JsonUtil.getJsonObjectFromFile(reportOnDisk);
+            Dataset dataset = findDatasetOrDie(id);
+            List<DatasetMetrics> datasetMetrics = datasetMetricsService.parseSushiReport(report, dataset);
+            if (!datasetMetrics.isEmpty()) {
+                for (DatasetMetrics dm : datasetMetrics) {
+                    datasetMetricsService.save(dm);
                 }
-            } catch (WrappedResponse ex) {
-                Logger.getLogger(MakeDataCountApi.class.getName()).log(Level.SEVERE, null, ex);
-                return error(Status.BAD_REQUEST, "Wrapped response: " + ex.getLocalizedMessage());
             }
+        } catch (WrappedResponse ex) {
+            logger.log(Level.SEVERE, null, ex);
+            return error(Status.BAD_REQUEST, "Wrapped response: " + ex.getLocalizedMessage());
 
         } catch (IOException ex) {
-            System.out.print(ex.getMessage());
+            logger.log(Level.WARNING, ex.getMessage());
             return error(Status.BAD_REQUEST, "IOException: " + ex.getLocalizedMessage());
         }
         String msg = "Dummy Data has been added to dataset " + id;
@@ -102,12 +119,10 @@ public Response addUsageMetricsFromSushiReport(@PathParam("id") String id, @Quer
 
     @POST
     @Path("/addUsageMetricsFromSushiReport")
-    public Response addUsageMetricsFromSushiReportAll(@PathParam("id") String id, @QueryParam("reportOnDisk") String reportOnDisk) {
+    public Response addUsageMetricsFromSushiReportAll(@QueryParam("reportOnDisk") String reportOnDisk) {
 
-        JsonObject report;
-
-        try (FileReader reader = new FileReader(reportOnDisk)) {
-            report = Json.createReader(reader).readObject();
+        try {
+            JsonObject report = JsonUtil.getJsonObjectFromFile(reportOnDisk);
 
             List<DatasetMetrics> datasetMetrics = datasetMetricsService.parseSushiReport(report, null);
             if (!datasetMetrics.isEmpty()) {
@@ -117,7 +132,7 @@ public Response addUsageMetricsFromSushiReportAll(@PathParam("id") String id, @Q
             }
 
         } catch (IOException ex) {
-            System.out.print(ex.getMessage());
+            logger.log(Level.WARNING, ex.getMessage());
             return error(Status.BAD_REQUEST, "IOException: " + ex.getLocalizedMessage());
         }
         String msg = "Usage Metrics Data has been added to all datasets from file  " + reportOnDisk;
@@ -126,35 +141,76 @@ public Response addUsageMetricsFromSushiReportAll(@PathParam("id") String id, @Q
 
     @POST
     @Path("{id}/updateCitationsForDataset")
-    public Response updateCitationsForDataset(@PathParam("id") String id) throws MalformedURLException, IOException {
-        String msg = "updateCitationsForDataset called";
-        Dataset dataset = null;
+    public Response updateCitationsForDataset(@PathParam("id") String id) throws IOException {
         try {
-            // FIXME: Switch to findDatasetOrDie instead of blindly downloading citations for whatever DOI.
-            // FIXME: remove this parseBooleanOrDie which is only here to throw WrappedResponse.
-            parseBooleanOrDie("true");
-//            dataset = findDatasetOrDie(id);
-//            String authorityPlusIdentifier = dataset.getAuthority() + dataset.getIdentifier();
-            String persistentId = getRequestParameter(":persistentId".substring(1));
+            Dataset dataset = findDatasetOrDie(id);
+            GlobalId pid = dataset.getGlobalId();
+            PidProvider pidProvider = PidUtil.getPidProvider(pid.getProviderId());
+            // Only supported for DOIs and for DataCite DOI providers
+            if(!DataCiteDOIProvider.TYPE.equals(pidProvider.getProviderType())) {
+                return error(Status.BAD_REQUEST, "Only DataCite DOI providers are supported");
+            }
+            String persistentId = pid.toString();
+
             // DataCite wants "doi=", not "doi:".
             String authorityPlusIdentifier = persistentId.replaceFirst("doi:", "");
-            // curl https://api.datacite.org/events?doi=10.7910/dvn/hqzoob&source=crossref
-            String baseUrl = System.getProperty("doi.mdcbaseurlstring");
-            if(null==baseUrl) {
-            	//Backward compatible default to the production server
-            	baseUrl="https://api.datacite.org";
+            // Request max page size and then loop to handle multiple pages
+            URL url = null;
+            try {
+                url = new URI(JvmSettings.DATACITE_REST_API_URL.lookup(pidProvider.getId()) +
+                              "/events?doi=" +
+                              authorityPlusIdentifier +
+                              "&source=crossref&page[size]=1000&page[cursor]=1").toURL();
+            } catch (URISyntaxException e) {
+                //Nominally this means a config error/ bad DATACITE_REST_API_URL for this provider
+                logger.warning("Unable to create URL for " + persistentId + ", pidProvider " + pidProvider.getId());
+                return error(Status.INTERNAL_SERVER_ERROR, "Unable to create DataCite URL to retrieve citations.");
             }
-            URL url = new URL(baseUrl + "/events?doi=" + authorityPlusIdentifier + "&source=crossref");
-            logger.fine("Requesting citations from " + url);
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestMethod("GET");
-            int status = connection.getResponseCode();
-            // TODO: Do something with non 200 status.
-            System.out.println("status: " + status);
-            JsonObject report = Json.createReader(connection.getInputStream()).readObject();
-            logger.fine("body of citation response: " + report.toString());
-            List<DatasetExternalCitations> datasetExternalCitations = datasetExternalCitationsService.parseCitations(report);
-
+            logger.fine("Retrieving Citations from " + url.toString());
+            boolean nextPage = true;
+            JsonArrayBuilder dataBuilder = Json.createArrayBuilder();
+            do {
+                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                connection.setRequestMethod("GET");
+                int status = connection.getResponseCode();
+                if (status != 200) {
+                    logger.warning("Failed to get citations from " + url.toString());
+                    connection.disconnect();
+                    return error(Status.fromStatusCode(status), "Failed to get citations from " + url.toString());
+                }
+                JsonObject report;
+                try (InputStream inStream = connection.getInputStream()) {
+                    report = JsonUtil.getJsonObject(inStream);
+                } finally {
+                    connection.disconnect();
+                }
+                JsonObject links = report.getJsonObject("links");
+                JsonArray data = report.getJsonArray("data");
+                Iterator<JsonValue> iter = data.iterator();
+                while (iter.hasNext()) {
+                    dataBuilder.add(iter.next());
+                }
+                if (links.containsKey("next")) {
+                    try {
+                        url = new URI(links.getString("next")).toURL();
+                    } catch (URISyntaxException e) {
+                        logger.warning("Unable to create URL from DataCite response: " + links.getString("next"));
+                        return error(Status.INTERNAL_SERVER_ERROR, "Unable to retrieve all results from DataCite");
+                    }
+                } else {
+                    nextPage = false;
+                }
+                logger.fine("body of citation response: " + report.toString());
+            } while (nextPage == true);
+            JsonArray allData = dataBuilder.build();
+            List<DatasetExternalCitations> datasetExternalCitations = datasetExternalCitationsService.parseCitations(allData);
+            /*
+             * ToDo: If this is the only source of citations, we should remove all the existing ones for the dataset and repopulate them.
+             * As is, this call doesn't remove old citations if there are now none (legacy issue if we decide to stop counting certain types of citation
+             * as we've done for 'hasPart').
+             * If there are some, this call individually checks each one and if a matching item exists, it removes it and adds it back. Faster and better to delete all and
+             * add the new ones.
+             */
             if (!datasetExternalCitations.isEmpty()) {
                 for (DatasetExternalCitations dm : datasetExternalCitations) {
                     datasetExternalCitationsService.save(dm);
@@ -168,5 +224,57 @@ public Response updateCitationsForDataset(@PathParam("id") String id) throws Mal
             return wr.getResponse();
         }
     }
+    @GET
+    @Path("{yearMonth}/processingState")
+    public Response getProcessingState(@PathParam("yearMonth") String yearMonth) {
+        MakeDataCountProcessState mdcps;
+        try {
+            mdcps = makeDataCountProcessStateService.getMakeDataCountProcessState(yearMonth);
+        } catch (IllegalArgumentException e) {
+            return error(Status.BAD_REQUEST,e.getMessage());
+        }
+        if (mdcps != null) {
+            JsonObjectBuilder output = Json.createObjectBuilder();
+            output.add("yearMonth", mdcps.getYearMonth());
+            output.add("state", mdcps.getState().name());
+            output.add("stateChangeTimestamp", mdcps.getStateChangeTime().toString());
+            if (mdcps.getServer() != null && !mdcps.getServer().isBlank()) {
+                output.add("server", mdcps.getServer());
+            }
+            return ok(output);
+        } else {
+            return error(Status.NOT_FOUND, "Could not find an existing process state for " + yearMonth);
+        }
+    }
 
+    @POST
+    @Path("{yearMonth}/processingState")
+    public Response updateProcessingState(@PathParam("yearMonth") String yearMonth, @QueryParam("state") String state, @QueryParam("server") String server) {
+        MakeDataCountProcessState mdcps;
+        try {
+            mdcps = makeDataCountProcessStateService.setMakeDataCountProcessState(yearMonth, state, server);
+        } catch (Exception e) {
+            return badRequest(e.getMessage());
+        }
+
+        JsonObjectBuilder output = Json.createObjectBuilder();
+        output.add("yearMonth", mdcps.getYearMonth());
+        output.add("state", mdcps.getState().name());
+        output.add("stateChangeTimestamp", mdcps.getStateChangeTime().toString());
+        if ( mdcps.getServer() != null) {
+            output.add("server", mdcps.getServer());
+        }
+        return ok(output);
+    }
+
+    @DELETE
+    @Path("{yearMonth}/processingState")
+    public Response deleteProcessingState(@PathParam("yearMonth") String yearMonth) {
+        boolean deleted = makeDataCountProcessStateService.deleteMakeDataCountProcessState(yearMonth);
+        if (deleted) {
+            return ok("Processing State deleted for " + yearMonth);
+        } else {
+            return notFound("Processing State not found for " + yearMonth);
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Meta.java b/src/main/java/edu/harvard/iq/dataverse/api/Meta.java
index 99e2c773b30..f3a0d7cb96a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Meta.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Meta.java
@@ -11,23 +11,21 @@
 import edu.harvard.iq.dataverse.DataFileServiceBean;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
 import edu.harvard.iq.dataverse.export.DDIExportServiceBean;
-
 import java.util.logging.Logger;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.ByteArrayOutputStream;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.ServiceUnavailableException;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.ServiceUnavailableException;
 
 /*
     Custom API exceptions [NOT YET IMPLEMENTED]
@@ -56,9 +54,6 @@
 public class Meta {
     private static final Logger logger = Logger.getLogger(Meta.class.getCanonicalName());
 
-    @EJB
-    SearchServiceBean searchService;
-    
     @EJB
     DDIExportServiceBean ddiExportService;
     
@@ -68,35 +63,6 @@ public class Meta {
     @EJB
     DatasetServiceBean datasetService;
 
-    @Deprecated
-    @Path("variable/{varId}")
-    @GET
-    @Produces({ "application/xml" })
-
-    public String variable(@PathParam("varId") Long varId, @QueryParam("fileMetadataId") Long fileMetadataId, @QueryParam("exclude") String exclude, @QueryParam("include") String include, @Context HttpHeaders header, @Context HttpServletResponse response) /*throws NotFoundException, ServiceUnavailableException, PermissionDeniedException, AuthorizationRequiredException*/ {
-        String retValue = "";
-        
-        ByteArrayOutputStream outStream = null;
-        try {
-            outStream = new ByteArrayOutputStream();
-
-            ddiExportService.exportDataVariable(
-                    varId,
-                    outStream,
-                    exclude,
-                    include,
-                    fileMetadataId);
-        } catch (Exception e) {
-            // For whatever reason we've failed to generate a partial 
-            // metadata record requested. We simply return an empty string.
-            return retValue;
-        }
-
-        retValue = outStream.toString();
-        
-        return retValue; 
-    }
-    
     // Because this API is deprecated, we prefer to continue letting it operate on fileId rather adding support for persistent identifiers.
     @Deprecated
     @Path("datafile/{fileId}")
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Metadata.java b/src/main/java/edu/harvard/iq/dataverse/api/Metadata.java
index 5084b5267a4..bd937878286 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Metadata.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Metadata.java
@@ -5,17 +5,18 @@
  */
 package edu.harvard.iq.dataverse.api;
 
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
+
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.EJB;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.*;
+
+import jakarta.ws.rs.core.Response;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.PUT;
 import edu.harvard.iq.dataverse.harvest.server.OAISetServiceBean;
 import edu.harvard.iq.dataverse.harvest.server.OAISet;
 
@@ -59,7 +60,27 @@ public Response exportAll() {
     public Response reExportAll() {
         datasetService.reExportAllAsync();
         return this.accepted();
-    } 
+    }
+
+    @GET
+    @Path("{id}/reExportDataset")
+    public Response indexDatasetByPersistentId(@PathParam("id") String id) {
+        try {
+            Dataset dataset = findDatasetOrDie(id);
+            datasetService.reExportDatasetAsync(dataset);
+            return ok("export started");
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @GET
+    @Path("clearExportTimestamps")
+    public Response clearExportTimestamps() {
+        // only clear the timestamp in the database, cached metadata export files are not deleted
+        int numItemsCleared = datasetService.clearAllExportTimes();
+        return ok("cleared: " + numItemsCleared);
+    }
 
     /**
      * initial attempt at triggering indexing/creation/population of a OAI set without going throught
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/MetadataBlocks.java b/src/main/java/edu/harvard/iq/dataverse/api/MetadataBlocks.java
index b3e1dad13af..8861abd4803 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/MetadataBlocks.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/MetadataBlocks.java
@@ -1,34 +1,33 @@
 package edu.harvard.iq.dataverse.api;
 
 import edu.harvard.iq.dataverse.MetadataBlock;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.brief;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+
+import java.util.List;
+
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
-import static edu.harvard.iq.dataverse.util.json.JsonPrinter.toJsonArray;
 
 /**
  * Api bean for managing metadata blocks.
+ *
  * @author michael
  */
 @Path("metadatablocks")
 @Produces("application/json")
 public class MetadataBlocks extends AbstractApiBean {
-    
+
     @GET
-    public Response list()  {
-        return ok(metadataBlockSvc.listMetadataBlocks().stream().map(brief::json).collect(toJsonArray()));
+    public Response listMetadataBlocks(@QueryParam("onlyDisplayedOnCreate") boolean onlyDisplayedOnCreate,
+                                       @QueryParam("returnDatasetFieldTypes") boolean returnDatasetFieldTypes) {
+        List<MetadataBlock> metadataBlocks = metadataBlockSvc.listMetadataBlocks(onlyDisplayedOnCreate);
+        return ok(json(metadataBlocks, returnDatasetFieldTypes, onlyDisplayedOnCreate));
     }
-    
+
     @Path("{identifier}")
     @GET
-    public Response getBlock( @PathParam("identifier") String idtf ) {
+    public Response getMetadataBlock(@PathParam("identifier") String idtf) {
         MetadataBlock b = findMetadataBlock(idtf);
-        
-        return   (b != null ) ? ok(json(b)) : notFound("Can't find metadata block '" + idtf + "'");
+        return (b != null) ? ok(json(b)) : notFound("Can't find metadata block '" + idtf + "'");
     }
-    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Metrics.java b/src/main/java/edu/harvard/iq/dataverse/api/Metrics.java
index 5297a84c3d0..74bc4184099 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Metrics.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Metrics.java
@@ -1,18 +1,33 @@
 package edu.harvard.iq.dataverse.api;
 
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.Metric;
+import edu.harvard.iq.dataverse.makedatacount.MakeDataCountUtil;
 import edu.harvard.iq.dataverse.metrics.MetricsUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
+
+import java.text.ParseException;
 import java.util.Arrays;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import javax.ws.rs.core.UriInfo;
+import java.util.List;
+import java.util.logging.Logger;
+
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.Response;
+
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Variant;
 
 /**
  * API endpoints for various metrics.
@@ -26,404 +41,936 @@
  */
 @Path("info/metrics")
 public class Metrics extends AbstractApiBean {
+    private static final Logger logger = Logger.getLogger(Metrics.class.getName());
 
     /** Dataverses */
-    
+
     @GET
     @Path("dataverses")
-    public Response getDataversesAllTime(@Context UriInfo uriInfo) {
-        return getDataversesToMonth(uriInfo, MetricsUtil.getCurrentMonth());
+    public Response getDataversesAllTime(@Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        return getDataversesToMonth(uriInfo, MetricsUtil.getCurrentMonth(), parentAlias);
     }
-    
-    @Deprecated //for better path
+
     @GET
-    @Path("dataverses/toMonth")
-    public Response getDataversesToMonthCurrent(@Context UriInfo uriInfo) {
-        return getDataversesToMonth(uriInfo, MetricsUtil.getCurrentMonth());
+    @Path("dataverses/monthly")
+    @Produces("text/csv, application/json")
+    public Response getDataversesTimeSeries(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+        String metricName = "dataverses";
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
+
+        if (null == jsonArray) { // run query and save
+
+            jsonArray = metricsSvc.getDataversesTimeSeries(uriInfo, d);
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArray.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.DATE, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "dataverses.timeseries.csv");
     }
-    
+
     @GET
     @Path("dataverses/toMonth/{yyyymm}")
-    public Response getDataversesToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm) {
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{""});
+    public Response getDataversesToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-            
-        String metricName = "dataversesToMonth";
 
-        try {
-            String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
-            String jsonString = metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null);
-
-            if (null == jsonString) { //run query and save
-                Long count = metricsSvc.dataversesToMonth(sanitizedyyyymm);
-                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
-                jsonString = jsonObjBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, jsonString));
-            }
+        String metricName = "dataversesToMonth";
 
-            return ok(MetricsUtil.stringToJsonObjectBuilder(jsonString));
+        String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null, d));
 
-        //TODO: Eventually the catch in each endpoint should be more specific
-        //          and more general errors should be logged.
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        if (null == jsonObj) { // run query and save
+            Long count = metricsSvc.dataversesToMonth(sanitizedyyyymm, d);
+            jsonObj = MetricsUtil.countToJson(count).build();
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, d, jsonObj.toString()));
         }
+
+        return ok(jsonObj);
+
     }
-    
+
     @GET
     @Path("dataverses/pastDays/{days}")
-    public Response getDataversesPastDays(@Context UriInfo uriInfo, @PathParam("days") int days) {
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{""});
+    public Response getDataversesPastDays(@Context UriInfo uriInfo, @PathParam("days") int days, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-            
+
         String metricName = "dataversesPastDays";
-        
-        if(days < 1) {
+
+        if (days < 1) {
             return error(BAD_REQUEST, "Invalid parameter for number of days.");
         }
-        try {
-            String jsonString = metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days), null);
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days), null, d));
 
-            if (null == jsonString) { //run query and save
-                Long count = metricsSvc.dataversesPastDays(days);
-                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
-                jsonString = jsonObjBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, String.valueOf(days), null, jsonString));
-            }
+        if (null == jsonObj) { // run query and save
+            Long count = metricsSvc.dataversesPastDays(days, d);
+            jsonObj = MetricsUtil.countToJson(count).build();
+            metricsSvc.save(new Metric(metricName, String.valueOf(days), null, d, jsonObj.toString()));
+        }
 
-            return ok(MetricsUtil.stringToJsonObjectBuilder(jsonString));
+        return ok(jsonObj);
 
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
-        }
     }
-    
+
     @GET
     @Path("dataverses/byCategory")
-    public Response getDataversesByCategory(@Context UriInfo uriInfo) {
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{""});
+    @Produces("text/csv, application/json")
+    public Response getDataversesByCategory(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-            
-        String metricName = "dataversesByCategory";
 
-        try {
-            String jsonArrayString = metricsSvc.returnUnexpiredCacheAllTime(metricName, null);
+        String metricName = "dataversesByCategory";
 
-            if (null == jsonArrayString) { //run query and save
-                JsonArrayBuilder jsonArrayBuilder = MetricsUtil.dataversesByCategoryToJson(metricsSvc.dataversesByCategory());
-                jsonArrayString = jsonArrayBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, null, null, jsonArrayString));
-            }
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
 
-            return ok(MetricsUtil.stringToJsonArrayBuilder(jsonArrayString));
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        if (null == jsonArray) { // run query and save
+            jsonArray = MetricsUtil.dataversesByCategoryToJson(metricsSvc.dataversesByCategory(d)).build();
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArray.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
         }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.CATEGORY, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "dataverses.byCategory.csv");
     }
-    
+
     @GET
     @Path("dataverses/bySubject")
-    public Response getDataversesBySubject(@Context UriInfo uriInfo) {
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{""});
+    @Produces("text/csv, application/json")
+    public Response getDataversesBySubject(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-            
+
         String metricName = "dataversesBySubject";
-        
-        try {
-            String jsonArrayString = metricsSvc.returnUnexpiredCacheAllTime(metricName, null);
 
-            if (null == jsonArrayString) { //run query and save
-                JsonArrayBuilder jsonArrayBuilder = MetricsUtil.dataversesBySubjectToJson(metricsSvc.dataversesBySubject());
-                jsonArrayString = jsonArrayBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, null, null, jsonArrayString));
-            }
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
+
+        if (null == jsonArray) { // run query and save
+            jsonArray = MetricsUtil.dataversesBySubjectToJson(metricsSvc.dataversesBySubject(d)).build();
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArray.toString()));
+        }
 
-            return ok(MetricsUtil.stringToJsonArrayBuilder(jsonArrayString));
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
         }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.SUBJECT, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "dataverses.bySubject.csv");
     }
-    
+
     /** Datasets */
-    
+
     @GET
     @Path("datasets")
-    public Response getDatasetsAllTime(@Context UriInfo uriInfo, @QueryParam("dataLocation") String dataLocation) {
-        return getDatasetsToMonth(uriInfo, MetricsUtil.getCurrentMonth(), dataLocation);
+    public Response getDatasetsAllTime(@Context UriInfo uriInfo, @QueryParam("dataLocation") String dataLocation, @QueryParam("parentAlias") String parentAlias) {
+        return getDatasetsToMonth(uriInfo, MetricsUtil.getCurrentMonth(), dataLocation, parentAlias);
     }
-    
-    @Deprecated //for better path
+
     @GET
-    @Path("datasets/toMonth")
-    public Response getDatasetsToMonthCurrent(@Context UriInfo uriInfo, @QueryParam("dataLocation") String dataLocation) {
-        return getDatasetsToMonth(uriInfo, MetricsUtil.getCurrentMonth(), dataLocation);
+    @Path("datasets/monthly")
+    @Produces("text/csv, application/json")
+    public Response getDatasetsTimeSeriest(@Context Request req, @Context UriInfo uriInfo, @QueryParam("dataLocation") String dataLocation, @QueryParam("parentAlias") String parentAlias) {
+
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "dataLocation", "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+        String metricName = "datasets";
+        String validDataLocation = MetricsUtil.validateDataLocationStringType(dataLocation);
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, validDataLocation, d));
+
+        if (null == jsonArray) { // run query and save
+
+            jsonArray = metricsSvc.getDatasetsTimeSeries(uriInfo, validDataLocation, d);
+            metricsSvc.save(new Metric(metricName, null, validDataLocation, d, jsonArray.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.DATE, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "datasets.timeseries.csv");
     }
 
     @GET
     @Path("datasets/toMonth/{yyyymm}")
-    public Response getDatasetsToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("dataLocation") String dataLocation) {
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{"dataLocation"});
+    public Response getDatasetsToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("dataLocation") String dataLocation, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "dataLocation", "parentAlias" });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-            
-        String metricName = "datasetsToMonth";
 
-        try {
-            String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
-            String validDataLocation = MetricsUtil.validateDataLocationStringType(dataLocation);
-            String jsonString = metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, validDataLocation);
-
-            if (null == jsonString) { //run query and save
-                Long count = metricsSvc.datasetsToMonth(sanitizedyyyymm, validDataLocation);
-                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
-                jsonString = jsonObjBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, sanitizedyyyymm, validDataLocation, jsonString));
-            }
+        String metricName = "datasetsToMonth";
 
-            return ok(MetricsUtil.stringToJsonObjectBuilder(jsonString));
+        String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+        String validDataLocation = MetricsUtil.validateDataLocationStringType(dataLocation);
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, validDataLocation, d));
 
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        if (null == jsonObj) { // run query and save
+            Long count = metricsSvc.datasetsToMonth(sanitizedyyyymm, validDataLocation, d);
+            jsonObj = MetricsUtil.countToJson(count).build();
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, validDataLocation, d, jsonObj.toString()));
         }
+
+        return ok(jsonObj);
+
     }
-    
+
     @GET
     @Path("datasets/pastDays/{days}")
-    public Response getDatasetsPastDays(@Context UriInfo uriInfo, @PathParam("days") int days, @QueryParam("dataLocation") String dataLocation) {
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{"dataLocation"});
+    public Response getDatasetsPastDays(@Context UriInfo uriInfo, @PathParam("days") int days, @QueryParam("dataLocation") String dataLocation, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "dataLocation", "parentAlias" });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-            
+
         String metricName = "datasetsPastDays";
-        
-        if(days < 1) {
+
+        if (days < 1) {
             return error(BAD_REQUEST, "Invalid parameter for number of days.");
         }
-        try {
-            String validDataLocation = MetricsUtil.validateDataLocationStringType(dataLocation);
-            String jsonString = metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days), validDataLocation);
-
-            if (null == jsonString) { //run query and save
-                Long count = metricsSvc.datasetsPastDays(days, validDataLocation);
-                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
-                jsonString = jsonObjBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, String.valueOf(days), validDataLocation, jsonString));
-            }
-
-            return ok(MetricsUtil.stringToJsonObjectBuilder(jsonString));
+        String validDataLocation = MetricsUtil.validateDataLocationStringType(dataLocation);
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days), validDataLocation, d));
 
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        if (null == jsonObj) { // run query and save
+            Long count = metricsSvc.datasetsPastDays(days, validDataLocation, d);
+            jsonObj = MetricsUtil.countToJson(count).build();
+            metricsSvc.save(new Metric(metricName, String.valueOf(days), validDataLocation, d, jsonObj.toString()));
         }
+
+        return ok(jsonObj);
+
     }
-    
+
     @GET
     @Path("datasets/bySubject")
-    public Response getDatasetsBySubject(@Context UriInfo uriInfo, @QueryParam("dataLocation") String dataLocation) {
-        return getDatasetsBySubjectToMonth(uriInfo, MetricsUtil.getCurrentMonth(), dataLocation);
+    @Produces("text/csv, application/json")
+    public Response getDatasetsBySubject(@Context Request req, @Context UriInfo uriInfo, @QueryParam("dataLocation") String dataLocation, @QueryParam("parentAlias") String parentAlias) {
+        return getDatasetsBySubjectToMonth(req, uriInfo, MetricsUtil.getCurrentMonth(), dataLocation, parentAlias);
     }
-  
+
     @GET
     @Path("datasets/bySubject/toMonth/{yyyymm}")
-    public Response getDatasetsBySubjectToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("dataLocation") String dataLocation) {
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{"dataLocation"});
+    @Produces("text/csv, application/json")
+    public Response getDatasetsBySubjectToMonth(@Context Request req, @Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("dataLocation") String dataLocation, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "dataLocation", "parentAlias" });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-            
+
         String metricName = "datasetsBySubjectToMonth";
 
-        try {
-            String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
-            String validDataLocation = MetricsUtil.validateDataLocationStringType(dataLocation);
-            String jsonArrayString = metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, validDataLocation);
-            
-            if (null == jsonArrayString) { //run query and save
-                JsonArrayBuilder jsonArrayBuilder = MetricsUtil.datasetsBySubjectToJson(metricsSvc.datasetsBySubjectToMonth(sanitizedyyyymm, validDataLocation));
-                jsonArrayString = jsonArrayBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, sanitizedyyyymm, validDataLocation, jsonArrayString));
-            }
+        String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+        String validDataLocation = MetricsUtil.validateDataLocationStringType(dataLocation);
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, validDataLocation, d));
 
-            return ok(MetricsUtil.stringToJsonArrayBuilder(jsonArrayString));
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        if (null == jsonArray) { // run query and save
+            jsonArray = MetricsUtil.datasetsBySubjectToJson(metricsSvc.datasetsBySubjectToMonth(sanitizedyyyymm, validDataLocation, d)).build();
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, validDataLocation, d, jsonArray.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
         }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.SUBJECT, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "datasets.bySubject.csv");
     }
-    
+
     /** Files */
     @GET
     @Path("files")
-    public Response getFilesAllTime(@Context UriInfo uriInfo) {
-        return getFilesToMonth(uriInfo, MetricsUtil.getCurrentMonth());
+    public Response getFilesAllTime(@Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        return getFilesToMonth(uriInfo, MetricsUtil.getCurrentMonth(), parentAlias);
     }
-    
-    @Deprecated //for better path
+
     @GET
-    @Path("files/toMonth")
-    public Response getFilesToMonthCurrent(@Context UriInfo uriInfo) {
-        return getFilesToMonth(uriInfo, MetricsUtil.getCurrentMonth());
+    @Path("files/monthly")
+    @Produces("text/csv, application/json")
+    public Response getFilesTimeSeries(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+        String metricName = "files";
+
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
+
+        if (null == jsonArray) { // run query and save
+
+            jsonArray = metricsSvc.filesTimeSeries(d);
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArray.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.DATE, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "datafiles.timeseries.csv");
     }
 
     @GET
     @Path("files/toMonth/{yyyymm}")
-    public Response getFilesToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm) {
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{""});
+    public Response getFilesToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-            
-        String metricName = "filesToMonth";
 
-        try {
-            String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
-            String jsonString = metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null);
-
-            if (null == jsonString) { //run query and save
-                Long count = metricsSvc.filesToMonth(sanitizedyyyymm);
-                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
-                jsonString = jsonObjBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, jsonString));
-            }
+        String metricName = "filesToMonth";
 
-            return ok(MetricsUtil.stringToJsonObjectBuilder(jsonString));
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+        logger.fine("yyyymm: " + sanitizedyyyymm);
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null, d));
+        logger.fine("Returned");
+        if (null == jsonObj) { // run query and save
+            logger.fine("Getting filesToMonth : " + sanitizedyyyymm + " dvId=" + ((d==null) ? "not sent" : d.getId()));
+            Long count = metricsSvc.filesToMonth(sanitizedyyyymm, d);
+            logger.fine("count = " + count);
+            jsonObj = MetricsUtil.countToJson(count).build();
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, d, jsonObj.toString()));
         }
+
+        return ok(jsonObj);
     }
-    
+
     @GET
     @Path("files/pastDays/{days}")
-    public Response getFilesPastDays(@Context UriInfo uriInfo, @PathParam("days") int days) {
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{""});
+    public Response getFilesPastDays(@Context UriInfo uriInfo, @PathParam("days") int days, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-            
+
         String metricName = "filesPastDays";
-        
-        if(days < 1) {
+
+        if (days < 1) {
             return error(BAD_REQUEST, "Invalid parameter for number of days.");
         }
+
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days), null, d));
+
+        if (null == jsonObj) { // run query and save
+            Long count = metricsSvc.filesPastDays(days, d);
+            jsonObj = MetricsUtil.countToJson(count).build();
+            metricsSvc.save(new Metric(metricName, String.valueOf(days), null, d, jsonObj.toString()));
+        }
+
+        return ok(jsonObj);
+
+    }
+
+    @GET
+    @Path("/files/byType/monthly")
+    @Produces("text/csv, application/json")
+    public Response getFilesByTypeTimeSeries(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
         try {
-            String jsonString = metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days), null);
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+        String metricName = "filesByTypeMonthly";
 
-            if (null == jsonString) { //run query and save
-                Long count = metricsSvc.filesPastDays(days);
-                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
-                jsonString = jsonObjBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, String.valueOf(days), null, jsonString));
-            }
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
+
+        if (null == jsonArray) { // run query and save
+            // Only handling published right now
+            jsonArray = metricsSvc.filesByTypeTimeSeries(d, true);
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArray.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.DATE, MetricsUtil.CONTENTTYPE, MetricsUtil.COUNT, MetricsUtil.SIZE), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "datafiles.byType.timeseries.csv");
+    }
+
+    @GET
+    @Path("/files/byType")
+    @Produces("text/csv, application/json")
+    public Response getFilesByType(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+
+        String metricName = "filesByType";
 
-            return ok(MetricsUtil.stringToJsonObjectBuilder(jsonString));
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
 
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        if (null == jsonArray) { // run query and save
+            jsonArray = metricsSvc.filesByType(d);
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArray.toString()));
         }
+
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.CONTENTTYPE, MetricsUtil.COUNT, MetricsUtil.SIZE), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "datafiles.byType.csv");
     }
 
     /** Downloads */
-    
+
     @GET
     @Path("downloads")
-    public Response getDownloadsAllTime(@Context UriInfo uriInfo) {
-        return getDownloadsToMonth(uriInfo, MetricsUtil.getCurrentMonth());
+    public Response getDownloadsAllTime(@Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        return getDownloadsToMonth(uriInfo, MetricsUtil.getCurrentMonth(), parentAlias);
     }
-    
-    @Deprecated //for better path
+
     @GET
-    @Path("downloads/toMonth")
-    public Response getDownloadsToMonthCurrent(@Context UriInfo uriInfo) {
-        return getDownloadsToMonth(uriInfo, MetricsUtil.getCurrentMonth());
+    @Path("downloads/monthly")
+    @Produces("text/csv, application/json")
+    public Response getDownloadsTimeSeries(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+        String metricName = "downloads";
+
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
+
+        if (null == jsonArray) { // run query and save
+            // Only handling published right now
+            jsonArray = metricsSvc.downloadsTimeSeries(d);
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArray.toString()));
+        }
+
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.DATE, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "downloads.timeseries.csv");
     }
 
     @GET
     @Path("downloads/toMonth/{yyyymm}")
-    public Response getDownloadsToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm) {                
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{""});
+    public Response getDownloadsToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-        
+
         String metricName = "downloadsToMonth";
-        
-        try {
-            
-            String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
-            String jsonString = metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null);
-
-            if (null == jsonString) { //run query and save
-                Long count = metricsSvc.downloadsToMonth(sanitizedyyyymm);
-                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
-                jsonString = jsonObjBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, jsonString));
+
+        String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null, d));
+
+        if (null == jsonObj) { // run query and save
+            Long count;
+            try {
+                count = metricsSvc.downloadsToMonth(sanitizedyyyymm, d);
+            } catch (ParseException e) {
+                return error(BAD_REQUEST, "Unable to parse supplied date: " + e.getLocalizedMessage());
             }
+            jsonObj = MetricsUtil.countToJson(count).build();
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, d, jsonObj.toString()));
+        }
+
+        return ok(jsonObj);
+    }
+
+    @GET
+    @Path("downloads/pastDays/{days}")
+    public Response getDownloadsPastDays(@Context UriInfo uriInfo, @PathParam("days") int days, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+
+        String metricName = "downloadsPastDays";
+
+        if (days < 1) {
+            return error(BAD_REQUEST, "Invalid parameter for number of days.");
+        }
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days), null, d));
+
+        if (null == jsonObj) { // run query and save
+            Long count = metricsSvc.downloadsPastDays(days, d);
+            jsonObj = MetricsUtil.countToJson(count).build();
+            metricsSvc.save(new Metric(metricName, String.valueOf(days), null, d, jsonObj.toString()));
+        }
+
+        return ok(jsonObj);
+    }
+
+    /** Accounts */
 
-            return ok(MetricsUtil.stringToJsonObjectBuilder(jsonString));
+    @GET
+    @Path("accounts")
+    public Response getAccountsAllTime(@Context UriInfo uriInfo) {
+        return getAccountsToMonth(uriInfo, MetricsUtil.getCurrentMonth());
+    }
+
+    @GET
+    @Path("accounts/toMonth/{yyyymm}")
+    public Response getAccountsToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm) {
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
         }
+
+        String metricName = "accountsToMonth";
+        String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null, null));
+
+        if (null == jsonObj) { // run query and save
+            Long count;
+            try {
+                count = metricsSvc.accountsToMonth(sanitizedyyyymm);
+            } catch (ParseException e) {
+                return error(BAD_REQUEST, "Unable to parse supplied date: " + e.getLocalizedMessage());
+            }
+            jsonObj = MetricsUtil.countToJson(count).build();
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, null, jsonObj.toString()));
+        }
+
+        return ok(jsonObj);
     }
-    
+
     @GET
-    @Path("downloads/pastDays/{days}")
-    public Response getDownloadsPastDays(@Context UriInfo uriInfo, @PathParam("days") int days) {
-        try { 
-            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[]{""});
+    @Path("accounts/pastDays/{days}")
+    public Response getAccountsPastDays(@Context UriInfo uriInfo, @PathParam("days") int days) {
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { });
         } catch (IllegalArgumentException ia) {
             return error(BAD_REQUEST, ia.getLocalizedMessage());
         }
-                
-        String metricName = "downloadsPastDays";
-        
-        if(days < 1) {
+
+        String metricName = "accountsPastDays";
+
+        if (days < 1) {
             return error(BAD_REQUEST, "Invalid parameter for number of days.");
         }
+
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days), null, null));
+
+        if (null == jsonObj) { // run query and save
+            Long count = metricsSvc.accountsPastDays(days);
+            jsonObj = MetricsUtil.countToJson(count).build();
+            metricsSvc.save(new Metric(metricName, String.valueOf(days), null, null, jsonObj.toString()));
+        }
+
+        return ok(jsonObj);
+    }
+
+    @GET
+    @Path("accounts/monthly")
+    @Produces("text/csv, application/json")
+    public Response getAccountsTimeSeries(@Context Request req, @Context UriInfo uriInfo) {
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+
+        String metricName = "accounts";
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, null));
+
+        if (null == jsonArray) { // run query and save
+            // Only handling published right now
+            jsonArray = metricsSvc.accountsTimeSeries();
+            metricsSvc.save(new Metric(metricName, null, null, null, jsonArray.toString()));
+        }
+
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.DATE, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "accounts.timeseries.csv");
+    }
+
+    /** MakeDataCount */
+
+    @GET
+    @Path("makeDataCount/{metric}")
+    public Response getMakeDataCountMetricCurrentMonth(@Context UriInfo uriInfo, @PathParam("metric") String metricSupplied, @QueryParam("country") String country, @QueryParam("parentAlias") String parentAlias) {
+        return getMakeDataCountMetricToMonth(uriInfo, metricSupplied, MetricsUtil.getCurrentMonth(), country, parentAlias);
+    }
+
+    @GET
+    @Path("makeDataCount/{metric}/monthly")
+    @Produces("text/csv, application/json")
+    public Response getMakeDataCountMetricTimeSeries(@Context Request req, @Context UriInfo uriInfo, @PathParam("metric") String metricSupplied, @QueryParam("country") String country, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+        MakeDataCountUtil.MetricType metricType = null;
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias", "country" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
         try {
-            String jsonString = metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days), null);
+            metricType = MakeDataCountUtil.MetricType.fromString(metricSupplied);
+        } catch (IllegalArgumentException ex) {
+            return error(Response.Status.BAD_REQUEST, ex.getMessage());
+        }
+        if (country != null) {
+            country = country.toLowerCase();
 
-            if (null == jsonString) { //run query and save
-                Long count = metricsSvc.downloadsPastDays(days);
-                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
-                jsonString = jsonObjBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, String.valueOf(days), null, jsonString));
+            if (!MakeDataCountUtil.isValidCountryCode(country)) {
+                return error(Response.Status.BAD_REQUEST, "Country must be one of the ISO 1366 Country Codes");
             }
+        }
+        String metricName = "MDC-" + metricType.toString() + ((country == null) ? "" : "-" + country);
+
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
+
+        if (null == jsonArray) { // run query and save
+            // Only handling published right now
+            jsonArray = metricsSvc.mdcMetricTimeSeries(metricType, country, d);
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArray.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.DATE, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "makeDataCount." + metricType.toString() + ".timeseries.csv");
+    }
+
+    @GET
+    @Path("makeDataCount/{metric}/toMonth/{yyyymm}")
+    public Response getMakeDataCountMetricToMonth(@Context UriInfo uriInfo, @PathParam("metric") String metricSupplied, @PathParam("yyyymm") String yyyymm, @QueryParam("country") String country, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+        MakeDataCountUtil.MetricType metricType = null;
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias", "country" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+        try {
+            metricType = MakeDataCountUtil.MetricType.fromString(metricSupplied);
+        } catch (IllegalArgumentException ex) {
+            return error(Response.Status.BAD_REQUEST, ex.getMessage());
+        }
+        if (country != null) {
+            country = country.toLowerCase();
+
+            if (!MakeDataCountUtil.isValidCountryCode(country)) {
+                return error(Response.Status.BAD_REQUEST, "Country must be one of the ISO 1366 Country Codes");
+            }
+        }
+        String metricName = "MDC-" + metricType.toString() + ((country == null) ? "" : "-" + country);
+
+        String sanitizedyyyymm = null;
+        if (yyyymm != null) {
+            sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+        }
+
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null, d));
+
+        if (null == jsonObj) { // run query and save
+            jsonObj = metricsSvc.getMDCDatasetMetrics(metricType, sanitizedyyyymm, country, d);
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, d, jsonObj.toString()));
+        }
+
+        return ok(jsonObj);
+    }
+    
+    @GET
+    @Path("filedownloads")
+    @Produces("text/csv, application/json")
+    public Response getFileDownloadsAllTime(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        return getFileDownloadsToMonth(req, uriInfo, MetricsUtil.getCurrentMonth(), parentAlias);
+    }
+    
+    @GET
+    @Path("filedownloads/toMonth/{yyyymm}")
+    @Produces("text/csv, application/json")
+    public Response getFileDownloadsToMonth(@Context Request req, @Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+
+        String metricName = "fileDownloads";
+
+        String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+        JsonArray jsonArr = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null, d));
 
-            return ok(MetricsUtil.stringToJsonObjectBuilder(jsonString));
+        if (null == jsonArr) { // run query and save
+            jsonArr = metricsSvc.fileDownloads(sanitizedyyyymm, d, false);
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, d, jsonArr.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArr);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArr, MetricsUtil.ID, MetricsUtil.PID, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "filedownloads.csv");
+    }
+    
+    @GET
+    @Path("filedownloads/monthly")
+    @Produces("text/csv, application/json")
+    public Response getFileDownloadsTimeSeries(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+        String metricName = "fileDownloads";
+
+        JsonArray jsonArr = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
+
+        if (null == jsonArr) { // run query and save
+            // Only handling published right now
+            jsonArr = metricsSvc.fileDownloadsTimeSeries(d, false);
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArr.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArr);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArr, MetricsUtil.DATE, MetricsUtil.ID, MetricsUtil.PID, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "filedownloads.timeseries.csv");
+    }
+
+    @GET
+    @Path("uniquedownloads")
+    @Produces("text/csv, application/json")
+    public Response getUniqueDownloadsAllTime(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        return getUniqueDownloadsToMonth(req, uriInfo, MetricsUtil.getCurrentMonth(), parentAlias);
+    }
+
+    @GET
+    @Path("uniquedownloads/monthly")
+    @Produces("text/csv, application/json")
+    public Response getUniqueDownloadsTimeSeries(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+        String metricName = "uniqueDownloads";
+
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
+
+        if (null == jsonArray) { // run query and save
+            // Only handling published right now
+            jsonArray = metricsSvc.uniqueDownloadsTimeSeries(d);
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArray.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.DATE, MetricsUtil.PID, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "uniquedownloads.timeseries.csv");
+    }
+
+    @GET
+    @Path("uniquedownloads/toMonth/{yyyymm}")
+    @Produces("text/csv, application/json")
+    public Response getUniqueDownloadsToMonth(@Context Request req, @Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+
+        String metricName = "uniqueDownloads";
+
+        String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null, d));
+
+        if (null == jsonArray) { // run query and save
+            jsonArray = metricsSvc.uniqueDatasetDownloads(sanitizedyyyymm, d);
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, d, jsonArray.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.PID, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "uniquedownloads.csv");
+    }
+
+    @GET
+    @Path("uniquefiledownloads")
+    @Produces("text/csv, application/json")
+    public Response getUniqueFileDownloadsAllTime(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        return getUniqueFileDownloadsToMonth(req, uriInfo, MetricsUtil.getCurrentMonth(), parentAlias);
+    }
+    
+    @GET
+    @Path("uniquefiledownloads/toMonth/{yyyymm}")
+    @Produces("text/csv, application/json")
+    public Response getUniqueFileDownloadsToMonth(@Context Request req, @Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
 
-        } catch (Exception ex) {
-            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        String metricName = "uniquefileDownloads";
+
+        String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+        JsonArray jsonArr = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null, d));
+
+        if (null == jsonArr) { // run query and save
+            jsonArr = metricsSvc.fileDownloads(sanitizedyyyymm, d, true);
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, d, jsonArr.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArr);
         }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArr, MetricsUtil.ID, MetricsUtil.PID, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "uniquefiledownloads.csv");
+    }
+    
+    @GET
+    @Path("uniquefiledownloads/monthly")
+    @Produces("text/csv, application/json")
+    public Response getUniqueFileDownloadsTimeSeries(@Context Request req, @Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+        String metricName = "uniquefileDownloads";
+
+        JsonArray jsonArray = MetricsUtil.stringToJsonArray(metricsSvc.returnUnexpiredCacheAllTime(metricName, null, d));
+
+        if (null == jsonArray) { // run query and save
+            // Only handling published right now
+            jsonArray = metricsSvc.fileDownloadsTimeSeries(d, true);
+            metricsSvc.save(new Metric(metricName, null, null, d, jsonArray.toString()));
+        }
+        MediaType requestedType = getVariant(req, MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE);
+        if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+            return ok(jsonArray);
+        }
+        return ok(FileUtil.jsonArrayOfObjectsToCSV(jsonArray, MetricsUtil.DATE, MetricsUtil.ID, MetricsUtil.PID, MetricsUtil.COUNT), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), "uniquefiledownloads.timeseries.csv");
+    }
+    
+    @GET
+    @Path("tree")
+    public Response getDataversesTree(@Context UriInfo uriInfo, @QueryParam("parentAlias") String parentAlias) {
+        return getDataversesTreeToMonth(uriInfo, MetricsUtil.getCurrentMonth(), parentAlias);
+    }
+
+    @GET
+    @Path("tree/toMonth/{yyyymm}")
+    public Response getDataversesTreeToMonth(@Context UriInfo uriInfo, @PathParam("yyyymm") String yyyymm, @QueryParam("parentAlias") String parentAlias) {
+
+        Dataverse d = findDataverseOrDieIfNotFound(parentAlias);
+
+        try {
+            errorIfUnrecongizedQueryParamPassed(uriInfo, new String[] { "parentAlias" });
+        } catch (IllegalArgumentException ia) {
+            return error(BAD_REQUEST, ia.getLocalizedMessage());
+        }
+
+        String metricName = "tree";
+        String sanitizedyyyymm = MetricsUtil.sanitizeYearMonthUserInput(yyyymm);
+
+        JsonObject jsonObj = MetricsUtil.stringToJsonObject(metricsSvc.returnUnexpiredCacheMonthly(metricName, sanitizedyyyymm, null, d));
+        if (null == jsonObj) { // run query and save
+            jsonObj = metricsSvc.getDataverseTree(d, sanitizedyyyymm, DatasetVersion.VersionState.RELEASED);
+            metricsSvc.save(new Metric(metricName, sanitizedyyyymm, null, d, jsonObj.toString()));
+        }
+        return ok(jsonObj);
     }
 
     private void errorIfUnrecongizedQueryParamPassed(UriInfo uriDetails, String[] allowedQueryParams) throws IllegalArgumentException {
-        for(String theKey : uriDetails.getQueryParameters().keySet()) {
-            if(!Arrays.stream(allowedQueryParams).anyMatch(theKey::equals)) {
+        for (String theKey : uriDetails.getQueryParameters().keySet()) {
+            if (!Arrays.stream(allowedQueryParams).anyMatch(theKey::equals)) {
                 throw new IllegalArgumentException("queryParameter " + theKey + " not supported for this endpont");
             }
         }
-        
+
     }
-    
+
+    // Throws a WebApplicationException if alias is not null and Dataverse can't be
+    // found
+    private Dataverse findDataverseOrDieIfNotFound(String alias) {
+        Dataverse d = null;
+        if (alias != null) {
+            d = dataverseSvc.findByAlias(alias);
+            if (d == null) {
+                throw new NotFoundException("No Dataverse with alias: " + alias);
+            }
+        }
+        // For a public API - we only want released dataverses used as parentAliases
+        // Code could be updated to handle draft info as well (with access controls in
+        // place)
+        if ((d != null) && !d.isReleased()) {
+            d = null;
+        }
+        return d;
+    }
+
+    // Determine which content type matches the user's request
+    private MediaType getVariant(Request req, MediaType... types) {
+        List<Variant> vars = Variant
+                .mediaTypes(types)
+                .add()
+                .build();
+        return req.selectVariant(vars).getMediaType();
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Notifications.java b/src/main/java/edu/harvard/iq/dataverse/api/Notifications.java
index 4067e61a31c..eebdce5e509 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Notifications.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Notifications.java
@@ -1,68 +1,218 @@
 package edu.harvard.iq.dataverse.api;
 
 import edu.harvard.iq.dataverse.UserNotification;
-import edu.harvard.iq.dataverse.UserNotification.Type;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.authorization.users.User;
-import edu.harvard.iq.dataverse.workflows.WorkflowUtil;
+
 import java.util.List;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+import java.util.Optional;
+import java.util.Set;
+
+import jakarta.ejb.Stateless;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
 import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
-import javax.json.JsonValue;
 
+@Stateless
 @Path("notifications")
 public class Notifications extends AbstractApiBean {
 
     @GET
-    @Path("all")
-    public Response getAllNotificationsForUser() {
-        User user;
+    @AuthRequired
+    @Path("/all")
+    public Response getAllNotificationsForUser(@Context ContainerRequestContext crc, @QueryParam("inAppNotificationFormat") boolean inAppNotificationFormat) {
         try {
-            user = findUserOrDie();
-        } catch (WrappedResponse ex) {
-            return error(Response.Status.UNAUTHORIZED, "You must supply an API token.");
-        }
-        if (user == null) {
-            return error(Response.Status.BAD_REQUEST, "A user could not be found based on the API token.");
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            List<UserNotification> userNotifications = userNotificationSvc.findByUser(authenticatedUser.getId());
+            return ok(Json.createObjectBuilder().add("notifications", json(userNotifications, authenticatedUser, inAppNotificationFormat)));
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
         }
-        if (!(user instanceof AuthenticatedUser)) {
-            // It's unlikely we'll reach this error. A Guest doesn't have an API token and would have been blocked above.
-            return error(Response.Status.BAD_REQUEST, "Only an AuthenticatedUser can have notifications.");
+    }
+
+    @GET
+    @AuthRequired
+    @Path("/unreadCount")
+    public Response getUnreadNotificationsCountForUser(@Context ContainerRequestContext crc) {
+        try {
+            AuthenticatedUser au = getRequestAuthenticatedUserOrDie(crc);
+            long unreadCount = userNotificationSvc.getUnreadNotificationCountByUser(au.getId());
+            return ok(Json.createObjectBuilder()
+                    .add("unreadCount", unreadCount));
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
         }
-        AuthenticatedUser authenticatedUser = (AuthenticatedUser) user;
-        JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder();
-        List<UserNotification> notifications = userNotificationSvc.findByUser(authenticatedUser.getId());
-        for (UserNotification notification : notifications) {
-            NullSafeJsonBuilder notificationObjectBuilder = jsonObjectBuilder();
-            JsonArrayBuilder reasonsForReturn = Json.createArrayBuilder();
-            Type type = notification.getType();
-            notificationObjectBuilder.add("id", notification.getId());
-            notificationObjectBuilder.add("type", type.toString());
-            /* FIXME - Re-add reasons for return if/when they are added to the notifications page.
-            
-            if (Type.RETURNEDDS.equals(type) || Type.SUBMITTEDDS.equals(type)) {
-                JsonArrayBuilder reasons = getReasonsForReturn(notification);
-                for (JsonValue reason : reasons.build()) {
-                    reasonsForReturn.add(reason);
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("/{id}/markAsRead")
+    public Response markNotificationAsReadForUser(@Context ContainerRequestContext crc, @PathParam("id") long id) {
+        try {
+            AuthenticatedUser au = getRequestAuthenticatedUserOrDie(crc);
+            Long userId = au.getId();
+            Optional<UserNotification> notification = userNotificationSvc.findByUser(userId).stream().filter(x -> x.getId().equals(id)).findFirst();
+            if (notification.isPresent()) {
+                UserNotification saved = userNotificationSvc.markAsRead(notification.get());
+                if (saved.isReadNotification()) {
+                    return ok("Notification " + id + " marked as read.");
+                } else {
+                    return badRequest("Notification " + id + " could not be marked as read.");
                 }
-                notificationObjectBuilder.add("reasonsForReturn", reasonsForReturn);
+            } else {
+                return notFound("Notification " + id + " not found.");
             }
-            */
-            jsonArrayBuilder.add(notificationObjectBuilder);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
         }
-        JsonObjectBuilder result = Json.createObjectBuilder().add("notifications", jsonArrayBuilder);
-        return ok(result);
     }
 
-    private JsonArrayBuilder getReasonsForReturn(UserNotification notification) {
-        Long objectId = notification.getObjectId();
-        return WorkflowUtil.getAllWorkflowComments(datasetVersionSvc.find(objectId));
+    @DELETE
+    @AuthRequired
+    @Path("/{id}")
+    public Response deleteNotificationForUser(@Context ContainerRequestContext crc, @PathParam("id") long id) {
+        try {
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            Long userId = authenticatedUser.getId();
+            Optional<UserNotification> notification = userNotificationSvc.findByUser(userId).stream().filter(x -> x.getId().equals(id)).findFirst();
+
+            if (notification.isPresent()) {
+                userNotificationSvc.delete(notification.get());
+                return ok("Notification " + id + " deleted.");
+            }
+
+            return notFound("Notification " + id + " not found.");
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("/mutedEmails")
+    public Response getMutedEmailsForUser(@Context ContainerRequestContext crc) {
+        try {
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            JsonArrayBuilder mutedEmails = Json.createArrayBuilder();
+            authenticatedUser.getMutedEmails().stream().forEach(
+                    x -> mutedEmails.add(jsonObjectBuilder().add("name", x.name()).add("description", x.getDescription()))
+            );
+            JsonObjectBuilder result = Json.createObjectBuilder().add("mutedEmails", mutedEmails);
+            return ok(result);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
     }
 
+    @PUT
+    @AuthRequired
+    @Path("/mutedEmails/{typeName}")
+    public Response muteEmailsForUser(@Context ContainerRequestContext crc, @PathParam("typeName") String typeName) {
+        UserNotification.Type notificationType;
+        try {
+            notificationType = UserNotification.Type.valueOf(typeName);
+        } catch (Exception ignore) {
+            return notFound("Notification type " + typeName + " not found.");
+        }
+        try {
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            Set<UserNotification.Type> mutedEmails = authenticatedUser.getMutedEmails();
+            mutedEmails.add(notificationType);
+            authenticatedUser.setMutedEmails(mutedEmails);
+            authSvc.update(authenticatedUser);
+            return ok("Notification emails of type " + typeName + " muted.");
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("/mutedEmails/{typeName}")
+    public Response unmuteEmailsForUser(@Context ContainerRequestContext crc, @PathParam("typeName") String typeName) {
+        UserNotification.Type notificationType;
+        try {
+            notificationType = UserNotification.Type.valueOf(typeName);
+        } catch (Exception ignore) {
+            return notFound("Notification type " + typeName + " not found.");
+        }
+        try {
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            Set<UserNotification.Type> mutedEmails = authenticatedUser.getMutedEmails();
+            mutedEmails.remove(notificationType);
+            authenticatedUser.setMutedEmails(mutedEmails);
+            authSvc.update(authenticatedUser);
+            return ok("Notification emails of type " + typeName + " unmuted.");
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("/mutedNotifications")
+    public Response getMutedNotificationsForUser(@Context ContainerRequestContext crc) {
+        try {
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            JsonArrayBuilder mutedNotifications = Json.createArrayBuilder();
+            authenticatedUser.getMutedNotifications().stream().forEach(
+                    x -> mutedNotifications.add(jsonObjectBuilder().add("name", x.name()).add("description", x.getDescription()))
+            );
+            JsonObjectBuilder result = Json.createObjectBuilder().add("mutedNotifications", mutedNotifications);
+            return ok(result);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("/mutedNotifications/{typeName}")
+    public Response muteNotificationsForUser(@Context ContainerRequestContext crc, @PathParam("typeName") String typeName) {
+        UserNotification.Type notificationType;
+        try {
+            notificationType = UserNotification.Type.valueOf(typeName);
+        } catch (Exception ignore) {
+            return notFound("Notification type " + typeName + " not found.");
+        }
+        try {
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            Set<UserNotification.Type> mutedNotifications = authenticatedUser.getMutedNotifications();
+            mutedNotifications.add(notificationType);
+            authenticatedUser.setMutedNotifications(mutedNotifications);
+            authSvc.update(authenticatedUser);
+            return ok("Notification of type " + typeName + " muted.");
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Path("/mutedNotifications/{typeName}")
+    public Response unmuteNotificationsForUser(@Context ContainerRequestContext crc, @PathParam("typeName") String typeName) {
+        UserNotification.Type notificationType;
+        try {
+            notificationType = UserNotification.Type.valueOf(typeName);
+        } catch (Exception ignore) {
+            return notFound("Notification type " + typeName + " not found.");
+        }
+        try {
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            Set<UserNotification.Type> mutedNotifications = authenticatedUser.getMutedNotifications();
+            mutedNotifications.remove(notificationType);
+            authenticatedUser.setMutedNotifications(mutedNotifications);
+            authSvc.update(authenticatedUser);
+            return ok("Notification of type " + typeName + " unmuted.");
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Pids.java b/src/main/java/edu/harvard/iq/dataverse/api/Pids.java
new file mode 100644
index 00000000000..32d942f972c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Pids.java
@@ -0,0 +1,173 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.engine.command.impl.DeletePidCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.ReservePidCommand;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import java.util.Arrays;
+import java.util.logging.Logger;
+
+import jakarta.ejb.Stateless;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+/**
+ * PIDs are Persistent IDentifiers such as DOIs or Handles.
+ *
+ * Currently PIDs can be minted at the dataset and file level but there is
+ * demand for PIDs at the dataverse level too. That's why this dedicated "pids"
+ * endpoint exists, to be somewhat future proof.
+ */
+@Stateless
+@Path("pids")
+public class Pids extends AbstractApiBean {
+
+    private static final Logger logger = Logger.getLogger(Pids.class.getName());
+    @GET
+    @AuthRequired
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getPid(@Context ContainerRequestContext crc, @QueryParam("persistentId") String persistentId) {
+        User user = getRequestUser(crc);
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, BundleUtil.getStringFromBundle("admin.api.auth.mustBeSuperUser"));
+        }
+
+        // FIXME: Even before changing to MPCONFIG retrieval, this was pinned to be DataCite specific!
+        //        Should this be extended to EZID and other PID systems like Handle?
+        String baseUrl = JvmSettings.DATACITE_REST_API_URL.lookup();
+        String username = JvmSettings.DATACITE_USERNAME.lookup();
+        String password = JvmSettings.DATACITE_PASSWORD.lookup();
+        
+        try {
+            GlobalId globalId = PidUtil.parseAsGlobalID(persistentId);
+            JsonObjectBuilder result = PidUtil.queryDoi(globalId, baseUrl, username, password);
+            return ok(result);
+        } catch (NotFoundException ex) {
+            return error(ex.getResponse().getStatusInfo().toEnum(), ex.getLocalizedMessage());
+        } catch (InternalServerErrorException ex) {
+            return error(ex.getResponse().getStatusInfo().toEnum(), ex.getLocalizedMessage());
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("unreserved")
+    public Response getUnreserved(@Context ContainerRequestContext crc, @QueryParam("persistentId") String persistentId) {
+        User user = getRequestUser(crc);
+        if (!user.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN, BundleUtil.getStringFromBundle("admin.api.auth.mustBeSuperUser"));
+        }
+
+        JsonArrayBuilder unreserved = Json.createArrayBuilder();
+        for (Dataset dataset : datasetSvc.findAll()) {
+            if (dataset.isReleased()) {
+                continue;
+            }
+            if (dataset.getGlobalIdCreateTime() == null) {
+                unreserved.add(Json.createObjectBuilder()
+                        .add("id", dataset.getId())
+                        .add("pid", dataset.getGlobalId().asString())
+                );
+            }
+        }
+        JsonArray finalUnreserved = unreserved.build();
+        int size = finalUnreserved.size();
+        return ok(Json.createObjectBuilder()
+                .add("numUnreserved", size)
+                .add("count", finalUnreserved)
+        );
+    }
+
+    @POST
+    @AuthRequired
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("{id}/reserve")
+    public Response reservePid(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied) {
+        try {
+            Dataset dataset = findDatasetOrDie(idSupplied);
+            execCommand(new ReservePidCommand(createDataverseRequest(getRequestUser(crc)), dataset));
+            return ok(BundleUtil.getStringFromBundle("pids.api.reservePid.success", Arrays.asList(dataset.getGlobalId().asString())));
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @DELETE
+    @AuthRequired
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("{id}/delete")
+    public Response deletePid(@Context ContainerRequestContext crc, @PathParam("id") String idSupplied) {
+        try {
+            Dataset dataset = findDatasetOrDie(idSupplied);
+            //Restrict to never-published datasets (that should have draft/nonpublic pids). The underlying code will invalidate
+            //pids that have been made public by a pid-specific method, but it's not clear that invalidating such a pid via an api that doesn't
+            //destroy the dataset is a good idea.
+            if(dataset.isReleased()) {
+            	return badRequest("Not allowed for Datasets that have been published.");
+            }
+            execCommand(new DeletePidCommand(createDataverseRequest(getRequestUser(crc)), dataset));
+            return ok(BundleUtil.getStringFromBundle("pids.api.deletePid.success", Arrays.asList(dataset.getGlobalId().asString())));
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("providers")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getPidProviders(@Context ContainerRequestContext crc) throws WrappedResponse {
+        try {
+            getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+        return ok(PidUtil.getProviders());
+    }
+    
+
+    @GET
+    @AuthRequired
+    // The :.+ suffix allows PIDs with a / char to be entered w/o escaping
+    @Path("providers/{persistentId:.+}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getPidProviderId(@Context ContainerRequestContext crc, @PathParam("persistentId") String persistentId) throws WrappedResponse {
+        try {
+            getRequestAuthenticatedUserOrDie(crc);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+            GlobalId globalId = PidUtil.parseAsGlobalID(persistentId);
+            if(globalId== null) {
+                return error(Response.Status.NOT_FOUND, "No provider found for PID");
+            } else {
+                String providerId = globalId.getProviderId();
+                if(PidUtil.getManagedProviderIds().contains(providerId)) {
+                    return ok(globalId.getProviderId());
+                } else {
+                    return ok("PID recognized as an unmanaged " + globalId.getProtocol());
+            }
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Prov.java b/src/main/java/edu/harvard/iq/dataverse/api/Prov.java
index bb40c53c1ca..7f81ca20988 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Prov.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Prov.java
@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse.api;
 
 import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.provenance.ProvEntityFileData;
 import edu.harvard.iq.dataverse.provenance.ProvInvestigator;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
@@ -11,24 +12,27 @@
 import edu.harvard.iq.dataverse.engine.command.impl.PersistProvJsonCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import java.io.StringReader;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
 import java.util.HashMap;
 import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.json.Json;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
+import jakarta.inject.Inject;
+import jakarta.json.Json;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
 
 @Path("files")
 public class Prov extends AbstractApiBean {
@@ -39,9 +43,10 @@ public class Prov extends AbstractApiBean {
     
     /** Provenance JSON methods **/
     @POST
+    @AuthRequired
     @Path("{id}/prov-json")
     @Consumes("application/json")
-    public Response addProvJson(String body, @PathParam("id") String idSupplied, @QueryParam("entityName") String entityName) {
+    public Response addProvJson(@Context ContainerRequestContext crc, String body, @PathParam("id") String idSupplied, @QueryParam("entityName") String entityName) {
         if(!systemConfig.isProvCollectionEnabled()) {
             return error(FORBIDDEN, BundleUtil.getStringFromBundle("api.prov.error.provDisabled"));
         }
@@ -68,7 +73,7 @@ public Response addProvJson(String body, @PathParam("id") String idSupplied, @Qu
                 return error(BAD_REQUEST, BundleUtil.getStringFromBundle("api.prov.error.entityMismatch"));
             }
             
-            execCommand(new PersistProvJsonCommand(createDataverseRequest(findUserOrDie()), dataFile , body, entityName, true));
+            execCommand(new PersistProvJsonCommand(createDataverseRequest(getRequestUser(crc)), dataFile , body, entityName, true));
             JsonObjectBuilder jsonResponse = Json.createObjectBuilder();
             jsonResponse.add("message", BundleUtil.getStringFromBundle("api.prov.provJsonSaved") + " " + dataFile.getDisplayName());
             return ok(jsonResponse);
@@ -78,8 +83,9 @@ public Response addProvJson(String body, @PathParam("id") String idSupplied, @Qu
     }
     
     @DELETE
+    @AuthRequired
     @Path("{id}/prov-json")
-    public Response deleteProvJson(String body, @PathParam("id") String idSupplied) {
+    public Response deleteProvJson(@Context ContainerRequestContext crc, String body, @PathParam("id") String idSupplied) {
         if(!systemConfig.isProvCollectionEnabled()) {
             return error(FORBIDDEN, BundleUtil.getStringFromBundle("api.prov.error.provDisabled"));
         }
@@ -88,7 +94,7 @@ public Response deleteProvJson(String body, @PathParam("id") String idSupplied)
             if(dataFile.isReleased()){
                 return error(FORBIDDEN, BundleUtil.getStringFromBundle("api.prov.error.jsonDeleteNotAllowed"));
             }
-            execCommand(new DeleteProvJsonCommand(createDataverseRequest(findUserOrDie()), dataFile, true));
+            execCommand(new DeleteProvJsonCommand(createDataverseRequest(getRequestUser(crc)), dataFile, true));
             return ok(BundleUtil.getStringFromBundle("api.prov.provJsonDeleted"));
         } catch (WrappedResponse ex) {
             return ex.getResponse();
@@ -97,17 +103,17 @@ public Response deleteProvJson(String body, @PathParam("id") String idSupplied)
 
     /** Provenance FreeForm methods **/
     @POST
+    @AuthRequired
     @Path("{id}/prov-freeform")
     @Consumes("application/json")
-    public Response addProvFreeForm(String body, @PathParam("id") String idSupplied) {
+    public Response addProvFreeForm(@Context ContainerRequestContext crc, String body, @PathParam("id") String idSupplied) {
         if(!systemConfig.isProvCollectionEnabled()) {
             return error(FORBIDDEN, BundleUtil.getStringFromBundle("api.prov.error.provDisabled"));
         }
-        StringReader rdr = new StringReader(body);
         JsonObject jsonObj = null;
         
         try {
-            jsonObj = Json.createReader(rdr).readObject();
+            jsonObj = JsonUtil.getJsonObject(body);
         } catch (JsonException ex) {
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("api.prov.error.freeformInvalidJson"));
         }
@@ -118,7 +124,7 @@ public Response addProvFreeForm(String body, @PathParam("id") String idSupplied)
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("api.prov.error.freeformMissingJsonKey"));
         }
         try {
-            DataverseRequest dr= createDataverseRequest(findUserOrDie());
+            DataverseRequest dr= createDataverseRequest(getRequestUser(crc));
             DataFile dataFile = findDataFileOrDie(idSupplied);
             if (dataFile == null) {
                 return error(BAD_REQUEST, BundleUtil.getStringFromBundle("api.prov.error.badDataFileId"));
@@ -136,13 +142,14 @@ public Response addProvFreeForm(String body, @PathParam("id") String idSupplied)
     }
     
     @GET
+    @AuthRequired
     @Path("{id}/prov-freeform")
-    public Response getProvFreeForm(String body, @PathParam("id") String idSupplied) {
+    public Response getProvFreeForm(@Context ContainerRequestContext crc, String body, @PathParam("id") String idSupplied) {
         if(!systemConfig.isProvCollectionEnabled()) {
             return error(FORBIDDEN, BundleUtil.getStringFromBundle("api.prov.error.provDisabled"));
         }
         try {
-            String freeFormText = execCommand(new GetProvFreeFormCommand(createDataverseRequest(findUserOrDie()), findDataFileOrDie(idSupplied)));
+            String freeFormText = execCommand(new GetProvFreeFormCommand(createDataverseRequest(getRequestUser(crc)), findDataFileOrDie(idSupplied)));
             if(null == freeFormText) {
                 return error(BAD_REQUEST, BundleUtil.getStringFromBundle("api.prov.error.freeformNoText"));
             }
@@ -155,13 +162,14 @@ public Response getProvFreeForm(String body, @PathParam("id") String idSupplied)
     }
     
     @GET
+    @AuthRequired
     @Path("{id}/prov-json")
-    public Response getProvJson(String body, @PathParam("id") String idSupplied) {
+    public Response getProvJson(@Context ContainerRequestContext crc, String body, @PathParam("id") String idSupplied) {
         if(!systemConfig.isProvCollectionEnabled()) {
             return error(FORBIDDEN, BundleUtil.getStringFromBundle("api.prov.error.provDisabled"));
         }
         try {
-            JsonObject jsonText = execCommand(new GetProvJsonCommand(createDataverseRequest(findUserOrDie()), findDataFileOrDie(idSupplied)));
+            JsonObject jsonText = execCommand(new GetProvJsonCommand(createDataverseRequest(getRequestUser(crc)), findDataFileOrDie(idSupplied)));
             if(null == jsonText) {
                 return error(BAD_REQUEST, BundleUtil.getStringFromBundle("api.prov.error.jsonNoContent"));
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Roles.java b/src/main/java/edu/harvard/iq/dataverse/api/Roles.java
index b3f75e00c5a..804416f0f8c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Roles.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Roles.java
@@ -1,20 +1,26 @@
 package edu.harvard.iq.dataverse.api;
 
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.api.dto.RoleDTO;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.User;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateRoleCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.DeleteRoleCommand;
-import javax.ejb.Stateless;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import java.util.Arrays;
+import java.util.List;
+import jakarta.ejb.Stateless;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Util API for managing roles. Might not make it to the production version.
@@ -25,38 +31,46 @@
 public class Roles extends AbstractApiBean {
 	
 	@GET
+    @AuthRequired
 	@Path("{id}")
-	public Response viewRole( @PathParam("id") Long id) {
+	public Response viewRole(@Context ContainerRequestContext crc, @PathParam("id") String id) {
         return response( ()-> {
-            final User user = findUserOrDie(); 
+            final User user = getRequestUser(crc);
             final DataverseRole role = findRoleOrDie(id);
             return ( permissionSvc.userOn(user, role.getOwner()).has(Permission.ManageDataversePermissions) ) 
                     ? ok( json(role) ) : permissionError("Permission required to view roles.");
         });
 	}
 	
-	@DELETE
-	@Path("{id}")
-	public Response deleteRole( @PathParam("id") Long id ) {
-        return response( req -> {
-            execCommand( new DeleteRoleCommand(req, findRoleOrDie(id)) );
-            return ok("role " + id + " deleted.");
-        });
-	}
+    @DELETE
+    @AuthRequired
+    @Path("{id}")
+    public Response deleteRole(@Context ContainerRequestContext crc, @PathParam("id") String id) {
+        return response(req -> {
+            DataverseRole role = findRoleOrDie(id);
+            List<String> args = Arrays.asList(role.getName());
+            if (role.getOwner() == null) {
+                throw new WrappedResponse(forbidden(BundleUtil.getStringFromBundle("find.dataverse.role.error.role.builtin.not.allowed", args)));
+            }
+            execCommand(new DeleteRoleCommand(req, role));
+            return ok("role " + role.getName() + " deleted.");
+        }, getRequestUser(crc));
+    }
 	
 	@POST
-	public Response createNewRole( RoleDTO roleDto,
-                                   @QueryParam("dvo") String dvoIdtf ) {
+    @AuthRequired
+	public Response createNewRole(@Context ContainerRequestContext crc,
+                                  RoleDTO roleDto,
+                                  @QueryParam("dvo") String dvoIdtf) {
         return response( req -> ok(json(execCommand(
                                   new CreateRoleCommand(roleDto.asRole(),
-                                                        req,findDataverseOrDie(dvoIdtf))))));
+                                                        req,findDataverseOrDie(dvoIdtf))))), getRequestUser(crc));
 	}
-    
-    private DataverseRole findRoleOrDie( long id ) throws WrappedResponse {
-        DataverseRole role = rolesSvc.find(id);
-		if ( role != null ) {
-            return role;
-        }
-		throw new WrappedResponse(notFound( "role with id " + id + " not found"));
+
+    @GET
+    @AuthRequired
+    @Path("userSelectable")
+    public Response getUserSelectableRoles(@Context ContainerRequestContext crc) {
+        return response(req -> ok(jsonDataverseRoles(roleAssigneeSvc.getSelectableDataverseRolesFor(req))), getRequestUser(crc));
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/SavedSearches.java b/src/main/java/edu/harvard/iq/dataverse/api/SavedSearches.java
index 7ead0d23711..e6519c9ff36 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/SavedSearches.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/SavedSearches.java
@@ -11,23 +11,23 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJBException;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import jakarta.ejb.EJBException;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 
 @Path("admin/savedsearches")
 public class SavedSearches extends AbstractApiBean {
@@ -55,7 +55,7 @@ public Response list() {
             savedSearchesBuilder.add(thisSavedSearch);
         }
         JsonObjectBuilder response = Json.createObjectBuilder();
-        response.add("saved searches", savedSearchesBuilder);
+        response.add("savedSearches", savedSearchesBuilder);
         return ok(response);
     }
 
@@ -90,7 +90,6 @@ private JsonObjectBuilder toJson(SavedSearch savedSearch) {
 
     @POST
     public Response add(JsonObject body) {
-
         if (body == null) {
             return error(BAD_REQUEST, "JSON is expected.");
         }
@@ -159,7 +158,7 @@ public Response add(JsonObject body) {
 
         try {
             SavedSearch persistedSavedSearch = savedSearchSvc.add(toPersist);
-            return ok("Added: " + persistedSavedSearch);
+            return ok("Added: " + persistedSavedSearch, Json.createObjectBuilder().add("id", persistedSavedSearch.getId()));
         } catch (EJBException ex) {
             StringBuilder errors = new StringBuilder();
             Throwable throwable = ex.getCause();
@@ -173,16 +172,18 @@ public Response add(JsonObject body) {
 
     @DELETE
     @Path("{id}")
-    public Response delete(@PathParam("id") long doomedId) {
-        boolean disabled = true;
-        if (disabled) {
-            return error(BAD_REQUEST, "Saved Searches can not safely be deleted because links can not safely be deleted. See https://github.com/IQSS/dataverse/issues/1364 for details.");
-        }
+    public Response delete(@PathParam("id") long doomedId, @QueryParam("unlink") boolean unlink) {
         SavedSearch doomed = savedSearchSvc.find(doomedId);
         if (doomed == null) {
             return error(NOT_FOUND, "Could not find saved search id " + doomedId);
         }
-        boolean wasDeleted = savedSearchSvc.delete(doomedId);
+        boolean wasDeleted;
+        try {
+            wasDeleted = savedSearchSvc.delete(doomedId, unlink);
+        } catch (Exception e) {
+            return error(INTERNAL_SERVER_ERROR, "Problem while trying to unlink links of saved search id " + doomedId + ". Exception: " + e.getLocalizedMessage());
+        }
+
         if (wasDeleted) {
             return ok(Json.createObjectBuilder().add("Deleted", doomedId));
         } else {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Search.java b/src/main/java/edu/harvard/iq/dataverse/api/Search.java
index e7e671c6624..33beabd0f97 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Search.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Search.java
@@ -1,13 +1,14 @@
 package edu.harvard.iq.dataverse.api;
 
-import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.search.SearchFields;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
-import edu.harvard.iq.dataverse.DvObjectServiceBean;
+import edu.harvard.iq.dataverse.search.SearchService;
+import edu.harvard.iq.dataverse.search.SearchServiceFactory;
 import edu.harvard.iq.dataverse.search.FacetCategory;
 import edu.harvard.iq.dataverse.search.FacetLabel;
 import edu.harvard.iq.dataverse.search.SolrSearchResult;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
 import edu.harvard.iq.dataverse.search.SolrQueryResponse;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
@@ -15,27 +16,27 @@
 import edu.harvard.iq.dataverse.search.SearchConstants;
 import edu.harvard.iq.dataverse.search.SearchException;
 import edu.harvard.iq.dataverse.search.SearchUtil;
-import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
 import edu.harvard.iq.dataverse.search.SortBy;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
+import java.util.*;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.inject.Inject;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.core.Response;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * User-facing documentation:
@@ -47,16 +48,16 @@ public class Search extends AbstractApiBean {
     private static final Logger logger = Logger.getLogger(Search.class.getCanonicalName());
 
     @EJB
-    SearchServiceBean searchService;
+    SearchServiceFactory searchServiceFactory;
     @EJB
     DataverseServiceBean dataverseService;
-    @EJB
-    DvObjectServiceBean dvObjectService;
-    @EJB
-    SolrIndexServiceBean SolrIndexService;
+    @Inject
+    DatasetVersionFilesServiceBean datasetVersionFilesServiceBean;
 
     @GET
+    @AuthRequired
     public Response search(
+            @Context ContainerRequestContext crc,
             @QueryParam("q") String query,
             @QueryParam("type") final List<String> types,
             @QueryParam("subtree") final List<String> subtrees,
@@ -69,14 +70,19 @@ public Response search(
             @QueryParam("fq") final List<String> filterQueries,
             @QueryParam("show_entity_ids") boolean showEntityIds,
             @QueryParam("show_api_urls") boolean showApiUrls,
-            @QueryParam("show_my_data") boolean showMyData,
-            @QueryParam("query_entities") boolean queryEntities,
+            @QueryParam("query_entities") @DefaultValue("true") boolean queryEntities,
+            @QueryParam("metadata_fields") List<String> metadataFields,
+            @QueryParam("geo_point") String geoPointRequested,
+            @QueryParam("geo_radius") String geoRadiusRequested,
+            @QueryParam("show_type_counts") boolean showTypeCounts,
+            @QueryParam("show_collections") boolean showCollections,
+            @QueryParam("search_service") String searchServiceName,
             @Context HttpServletResponse response
     ) {
 
         User user;
         try {
-            user = getUser();
+            user = getUser(crc);
         } catch (WrappedResponse ex) {
             return ex.getResponse();
         }
@@ -86,40 +92,100 @@ public Response search(
             // sanity checking on user-supplied arguments
             SortBy sortBy;
             int numResultsPerPage;
+            String geoPoint;
+            String geoRadius;
             List<Dataverse> dataverseSubtrees = new ArrayList<>();
+            DataverseRequest requestUser = createDataverseRequest(user);
+            String allTypes = ":(" + SearchConstants.DATAVERSES + " OR " + SearchConstants.DATASETS + " OR " + SearchConstants.FILES + ")";
+            Map<String, Long> objectTypeCountsMap = new HashMap<>(3);
+            objectTypeCountsMap.put(SearchConstants.UI_DATAVERSES, 0L);
+            objectTypeCountsMap.put(SearchConstants.UI_DATASETS, 0L);
+            objectTypeCountsMap.put(SearchConstants.UI_FILES, 0L);
 
-            try {
-                if (!types.isEmpty()) {
-                    filterQueries.add(getFilterQueryFromTypes(types));
+            // hard-coded to false since dataRelatedToMe is only used by MyData (DataRetrieverAPI)
+            boolean dataRelatedToMe = false;
+            SearchService searchService = null;
+            if (StringUtils.isNotBlank(searchServiceName)) {
+                try {
+                    searchService = searchServiceFactory.getSearchService(searchServiceName);
+                } catch (IllegalArgumentException e) {
+                    return badRequest("Invalid search engine.");
                 }
-                sortBy = SearchUtil.getSortBy(sortField, sortOrder);
-                numResultsPerPage = getNumberOfResultsPerPage(numResultsPerPageRequested);
-                
-                 // we have to add "" (root) otherwise there is no permissions check
-                if(subtrees.isEmpty()) {
+            } else {
+                searchService = searchServiceFactory.getDefaultSearchService();
+            }
+            try {
+                // we have to add "" (root) otherwise there is no permissions check
+                if (subtrees.isEmpty()) {
                     dataverseSubtrees.add(getSubtree(""));
                 }
                 else {
-                    for(String subtree : subtrees) {
+                    for (String subtree : subtrees) {
                         dataverseSubtrees.add(getSubtree(subtree));
                     }
                 }
                 filterQueries.add(getFilterQueryFromSubtrees(dataverseSubtrees));
+
+                if (!types.isEmpty()) {
+                    // Query to get the totals if needed.
+                    // Only needed if the list of types doesn't include all types since missing types will default to count of 0
+                    // for 11542 we are removing the test for page one only since the show_type_counts=false will bypass this completely
+                    // SEK 6/17/25
+                    if (showTypeCounts && types.size() < objectTypeCountsMap.size()) {
+                        List<String> totalFilterQueries = new ArrayList<>();
+                        totalFilterQueries.addAll(filterQueries);
+                        totalFilterQueries.add(SearchFields.TYPE + allTypes);
+
+                        try {
+
+                            SolrQueryResponse resp = searchService.search(requestUser, dataverseSubtrees, query, totalFilterQueries, null, null, 0,
+                                    dataRelatedToMe, 1, false, null, null, false, false, false);
+                            if (resp != null) {
+                                for (FacetCategory facetCategory : resp.getTypeFacetCategories()) {
+                                    for (FacetLabel facetLabel : facetCategory.getFacetLabel()) {
+                                        objectTypeCountsMap.put(facetLabel.getName(), facetLabel.getCount());
+                                    }
+                                }
+                            }
+                        } catch(Exception e) {
+                            logger.info("Search getting total counts: " + e.getMessage());
+                        }
+                    }
+                    filterQueries.add(getFilterQueryFromTypes(types));
+                } else {
+                    /**
+                     * Added to prevent a NullPointerException for superusers
+                     * (who don't use our permission JOIN) when
+                     * SearchServiceBean tries to get SearchFields.TYPE. The GUI
+                     * always seems to add SearchFields.TYPE, even for superusers.
+                     */
+                    filterQueries.add(SearchFields.TYPE + allTypes);
+                }
+                sortBy = SearchUtil.getSortBy(sortField, sortOrder);
+                numResultsPerPage = getNumberOfResultsPerPage(numResultsPerPageRequested);
                 
                 if(filterQueries.isEmpty()) { //Extra sanity check just in case someone else touches this
                     throw new IOException("Filter is empty, which should never happen, as this allows unfettered searching of our index");
                 }
                 
+                geoPoint = getGeoPoint(geoPointRequested);
+                geoRadius = getGeoRadius(geoRadiusRequested);
+
+                if (geoPoint != null && geoRadius == null) {
+                    return error(Response.Status.BAD_REQUEST, "If you supply geo_point you must also supply geo_radius.");
+                }
+
+                if (geoRadius != null && geoPoint == null) {
+                    return error(Response.Status.BAD_REQUEST, "If you supply geo_radius you must also supply geo_point.");
+                }
+
             } catch (Exception ex) {
                 return error(Response.Status.BAD_REQUEST, ex.getLocalizedMessage());
             }
-
-            // users can't change these (yet anyway)
-            boolean dataRelatedToMe = showMyData; //getDataRelatedToMe();
             
             SolrQueryResponse solrQueryResponse;
             try {
-                solrQueryResponse = searchService.search(createDataverseRequest(user),
+                solrQueryResponse = searchService.search(requestUser,
                         dataverseSubtrees,
                         query,
                         filterQueries,
@@ -128,7 +194,12 @@ public Response search(
                         paginationStart,
                         dataRelatedToMe,
                         numResultsPerPage,
-                        queryEntities
+                        queryEntities,
+                        geoPoint,
+                        geoRadius,
+                        showFacets, // facets are expensive, no need to ask for them if not requested
+                        showRelevance, // no need for highlights unless requested either
+                        showCollections // same for collections
                 );
             } catch (SearchException ex) {
                 Throwable cause = ex;
@@ -148,7 +219,7 @@ public Response search(
             JsonArrayBuilder itemsArrayBuilder = Json.createArrayBuilder();
             List<SolrSearchResult> solrSearchResults = solrQueryResponse.getSolrSearchResults();
             for (SolrSearchResult solrSearchResult : solrSearchResults) {
-                itemsArrayBuilder.add(solrSearchResult.toJsonObject(showRelevance, showEntityIds, showApiUrls));
+                itemsArrayBuilder.add(solrSearchResult.json(showRelevance, showEntityIds, showApiUrls, metadataFields));
             }
 
             JsonObjectBuilder spelling_alternatives = Json.createObjectBuilder();
@@ -156,32 +227,46 @@ public Response search(
                 spelling_alternatives.add(entry.getKey(), entry.getValue().toString());
             }
 
-            JsonArrayBuilder facets = Json.createArrayBuilder();
-            JsonObjectBuilder facetCategoryBuilder = Json.createObjectBuilder();
-            for (FacetCategory facetCategory : solrQueryResponse.getFacetCategoryList()) {
-                JsonObjectBuilder facetCategoryBuilderFriendlyPlusData = Json.createObjectBuilder();
-                JsonArrayBuilder facetLabelBuilderData = Json.createArrayBuilder();
-                for (FacetLabel facetLabel : facetCategory.getFacetLabel()) {
-                    JsonObjectBuilder countBuilder = Json.createObjectBuilder();
-                    countBuilder.add(facetLabel.getName(), facetLabel.getCount());
-                    facetLabelBuilderData.add(countBuilder);
-                }
-                facetCategoryBuilderFriendlyPlusData.add("friendly", facetCategory.getFriendlyName());
-                facetCategoryBuilderFriendlyPlusData.add("labels", facetLabelBuilderData);
-                facetCategoryBuilder.add(facetCategory.getName(), facetCategoryBuilderFriendlyPlusData);
-            }
-            facets.add(facetCategoryBuilder);
-
             JsonObjectBuilder value = Json.createObjectBuilder()
                     .add("q", query)
                     .add("total_count", solrQueryResponse.getNumResultsFound())
                     .add("start", solrQueryResponse.getResultsStart())
                     .add("spelling_alternatives", spelling_alternatives)
                     .add("items", itemsArrayBuilder.build());
+
             if (showFacets) {
+                JsonArrayBuilder facets = Json.createArrayBuilder();
+                JsonObjectBuilder facetCategoryBuilder = Json.createObjectBuilder();
+                for (FacetCategory facetCategory : solrQueryResponse.getFacetCategoryList()) {
+                    JsonObjectBuilder facetCategoryBuilderFriendlyPlusData = Json.createObjectBuilder();
+                    JsonArrayBuilder facetLabelBuilderData = Json.createArrayBuilder();
+                    for (FacetLabel facetLabel : facetCategory.getFacetLabel()) {
+                        JsonObjectBuilder countBuilder = Json.createObjectBuilder();
+                        countBuilder.add(facetLabel.getName(), facetLabel.getCount());
+                        facetLabelBuilderData.add(countBuilder);
+                    }
+                    facetCategoryBuilderFriendlyPlusData.add("friendly", facetCategory.getFriendlyName());
+                    facetCategoryBuilderFriendlyPlusData.add("labels", facetLabelBuilderData);
+                    facetCategoryBuilder.add(facetCategory.getName(), facetCategoryBuilderFriendlyPlusData);
+                }
+                facets.add(facetCategoryBuilder);
                 value.add("facets", facets);
             }
+
             value.add("count_in_response", solrSearchResults.size());
+
+            if (showTypeCounts) {
+                for (FacetCategory facetCategory : solrQueryResponse.getTypeFacetCategories()) {
+                    for (FacetLabel facetLabel : facetCategory.getFacetLabel()) {
+                        if (facetLabel.getCount() > 0) {
+                            objectTypeCountsMap.put(facetLabel.getName(), facetLabel.getCount());
+                        }
+                    }
+                }
+                JsonObjectBuilder objectTypeCounts = Json.createObjectBuilder();
+                objectTypeCountsMap.forEach((k,v) -> objectTypeCounts.add(k,v));
+                value.add("total_count_per_object_type", objectTypeCounts);
+            }
             /**
              * @todo Returning the fq might be useful as a troubleshooting aid
              * but we don't want to expose the raw dataverse database ids in
@@ -201,19 +286,32 @@ public Response search(
         }
     }
 
-    private User getUser() throws WrappedResponse {
-        /**
-         * @todo support searching as non-guest:
-         * https://github.com/IQSS/dataverse/issues/1299
-         *
-         * Note that superusers can't currently use the Search API because they
-         * see permission documents (all Solr documents, really) and we get a
-         * NPE when trying to determine the DvObject type if their query matches
-         * a permission document.
-         */
+
+    @GET
+    @Path("/services")
+    public Response getSearchEngines() {
+        Map<String, SearchService> availableEngines = searchServiceFactory.getAvailableServices();
+        String defaultServiceName = JvmSettings.DEFAULT_SEARCH_SERVICE.lookupOptional().orElse(SearchServiceFactory.INTERNAL_SOLR_SERVICE_NAME);
+
+        JsonArrayBuilder enginesArray = Json.createArrayBuilder();
+
+        for (String engine : availableEngines.keySet()) {
+            JsonObjectBuilder engineObject = Json.createObjectBuilder()
+                .add("name", engine)
+                .add("displayName", availableEngines.get(engine).getDisplayName());
+            enginesArray.add(engineObject);
+        }
+        JsonObjectBuilder response = Json.createObjectBuilder()
+                .add("services", enginesArray)
+                .add("defaultService", defaultServiceName);
+
+        return ok(response);
+    }
+
+    private User getUser(ContainerRequestContext crc) throws WrappedResponse {
         User userToExecuteSearchAs = GuestUser.get();
         try {
-            AuthenticatedUser authenticatedUser = findAuthenticatedUserOrDie();
+            AuthenticatedUser authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
             if (authenticatedUser != null) {
                 userToExecuteSearchAs = authenticatedUser;
             }
@@ -222,34 +320,16 @@ private User getUser() throws WrappedResponse {
                 throw ex;
             }
         }
-        if (nonPublicSearchAllowed()) {
-            return userToExecuteSearchAs;
-        } else {
-            return GuestUser.get();
-        }
-    }
-
-    public boolean nonPublicSearchAllowed() {
-        boolean safeDefaultIfKeyNotFound = false;
-        return settingsSvc.isTrueForKey(SettingsServiceBean.Key.SearchApiNonPublicAllowed, safeDefaultIfKeyNotFound);
+        return userToExecuteSearchAs;
     }
 
-    public boolean tokenLessSearchAllowed() {
+    private boolean tokenLessSearchAllowed() {
         boolean outOfBoxBehavior = false;
         boolean tokenLessSearchAllowed = settingsSvc.isFalseForKey(SettingsServiceBean.Key.SearchApiRequiresToken, outOfBoxBehavior);
         logger.fine("tokenLessSearchAllowed: " + tokenLessSearchAllowed);
         return tokenLessSearchAllowed;
     }
 
-    private boolean getDataRelatedToMe() {
-        /**
-         * @todo support Data Related To Me:
-         * https://github.com/IQSS/dataverse/issues/1299
-         */
-        boolean dataRelatedToMe = false;
-        return dataRelatedToMe;
-    }
-
     private int getNumberOfResultsPerPage(int numResultsPerPage) {
         /**
          * @todo should maxLimit be configurable?
@@ -349,4 +429,12 @@ private Dataverse getSubtree(String alias) throws Exception {
         }
     }
 
+    private String getGeoPoint(String geoPointRequested) {
+        return SearchUtil.getGeoPoint(geoPointRequested);
+    }
+
+    private String getGeoRadius(String geoRadiusRequested) {
+        return SearchUtil.getGeoRadius(geoRadiusRequested);
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/SendFeedbackAPI.java b/src/main/java/edu/harvard/iq/dataverse/api/SendFeedbackAPI.java
new file mode 100644
index 00000000000..3bffcd042a3
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/SendFeedbackAPI.java
@@ -0,0 +1,126 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.engine.command.impl.CheckRateLimitForDatasetFeedbackCommand;
+import edu.harvard.iq.dataverse.feedback.Feedback;
+import edu.harvard.iq.dataverse.feedback.FeedbackUtil;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.cache.CacheFactoryBean;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import edu.harvard.iq.dataverse.validation.EMailValidator;
+import jakarta.ejb.EJB;
+import jakarta.json.*;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+
+import java.text.MessageFormat;
+import java.util.logging.Logger;
+
+@Path("sendfeedback")
+public class SendFeedbackAPI extends AbstractApiBean {
+    private static final Logger logger = Logger.getLogger(SendFeedbackAPI.class.getCanonicalName());
+    @EJB
+    MailServiceBean mailService;
+    @EJB
+    CacheFactoryBean cacheFactory;
+    /**
+     * This method mimics the contact form and sends an email to the contacts of the
+     * specified Collection/Dataset/DataFile, optionally ccing the support email
+     * address, or to the support email address when there is no target object.
+     **/
+    @POST
+    @AuthRequired
+    public Response submitFeedback(@Context ContainerRequestContext crc, String jsonString) {
+        try {
+            JsonObject jsonObject = JsonUtil.getJsonObject(jsonString);
+            if (!jsonObject.containsKey("subject") || !jsonObject.containsKey("body")) {
+                return badRequest(BundleUtil.getStringFromBundle("sendfeedback.body.error.missingRequiredFields"));
+            }
+
+            JsonNumber jsonNumber = jsonObject.containsKey("targetId") ? jsonObject.getJsonNumber("targetId") : null;
+            // idtf will hold the "targetId" or the "identifier". If neither is set then this is a general feedback to support
+            String idtf = jsonNumber != null ? jsonNumber.toString() : jsonObject.containsKey("identifier") ? jsonObject.getString("identifier") : null;
+            DvObject feedbackTarget = null;
+
+            if (jsonNumber != null) {
+                feedbackTarget = dvObjSvc.findDvObject(jsonNumber.longValue());
+            } else if (idtf != null) {
+                if (feedbackTarget == null) {
+                    feedbackTarget = dataverseSvc.findByAlias(idtf);
+                }
+                if (feedbackTarget == null) {
+                    feedbackTarget = dvObjSvc.findByGlobalId(idtf, DvObject.DType.Dataset);
+                }
+                if (feedbackTarget == null) {
+                    feedbackTarget = dvObjSvc.findByGlobalId(idtf, DvObject.DType.DataFile);
+                }
+            }
+
+            // feedbackTarget and idtf are both null this is a support feedback and is ok
+            if (feedbackTarget == null && idtf != null) {
+                return error(Response.Status.BAD_REQUEST, BundleUtil.getStringFromBundle("sendfeedback.request.error.targetNotFound"));
+            }
+            // Check for rate limit exceeded.
+            if (!cacheFactory.checkRate(getRequestUser(crc), new CheckRateLimitForDatasetFeedbackCommand(null, feedbackTarget))) {
+                return error(Response.Status.TOO_MANY_REQUESTS, BundleUtil.getStringFromBundle("sendfeedback.request.rateLimited"));
+            }
+
+            DataverseSession dataverseSession = null;
+            String userMessage = sanitizeBody(jsonObject.getString("body"));
+            InternetAddress systemAddress = mailService.getSupportAddress().orElse(null);
+            String userEmail = getEmail(jsonObject, crc);
+            String messageSubject = jsonObject.getString("subject");
+            String baseUrl = systemConfig.getDataverseSiteUrl();
+            String installationBrandName = BrandingUtil.getInstallationBrandName();
+            String supportTeamName = BrandingUtil.getSupportTeamName(systemAddress);
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+            Feedback feedback = FeedbackUtil.gatherFeedback(feedbackTarget, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, SendFeedbackDialog.ccSupport(feedbackTarget));
+            jab.add(feedback.toLimitedJsonObjectBuilder());
+            mailService.sendMail(feedback.getFromEmail(), feedback.getToEmail(), feedback.getCcEmail(), feedback.getSubject(), feedback.getBody());
+            return ok(jab);
+        } catch (WrappedResponse resp) {
+            return resp.getResponse();
+        } catch (JsonException je) {
+            return error(Response.Status.BAD_REQUEST, "Invalid JSON; error message: " + je.getMessage());
+        }
+    }
+
+    private String getEmail(JsonObject jsonObject, ContainerRequestContext crc) throws WrappedResponse {
+        String fromEmail = jsonObject.containsKey("fromEmail") ? jsonObject.getString("fromEmail") : "";
+        if (fromEmail.isBlank() && crc != null) {
+            User user = getRequestUser(crc);
+            if (user instanceof AuthenticatedUser) {
+                fromEmail = ((AuthenticatedUser) user).getEmail();
+            }
+        }
+        if (fromEmail == null || fromEmail.isBlank()) {
+            throw new WrappedResponse(badRequest(BundleUtil.getStringFromBundle("sendfeedback.fromEmail.error.missing")));
+        }
+        if (!EMailValidator.isEmailValid(fromEmail)) {
+            throw new WrappedResponse(badRequest(MessageFormat.format(BundleUtil.getStringFromBundle("sendfeedback.fromEmail.error.invalid"), fromEmail)));
+        }
+        return fromEmail;
+    }
+    private String sanitizeBody (String body) throws WrappedResponse {
+        // remove malicious html
+        String sanitizedBody = body == null ? "" : body.replaceAll("\\<.*?>", "");
+
+        long limit = systemConfig.getContactFeedbackMessageSizeLimit();
+        if (limit > 0 && sanitizedBody.length() > limit) {
+            throw new WrappedResponse(badRequest(MessageFormat.format(BundleUtil.getStringFromBundle("sendfeedback.body.error.exceedsLength"), sanitizedBody.length(), limit)));
+        } else if (sanitizedBody.length() == 0) {
+            throw new WrappedResponse(badRequest(BundleUtil.getStringFromBundle("sendfeedback.body.error.isEmpty")));
+        }
+
+        return sanitizedBody;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/SiteMap.java b/src/main/java/edu/harvard/iq/dataverse/api/SiteMap.java
index 787c3380e5b..37d6a2aa3fe 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/SiteMap.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/SiteMap.java
@@ -2,13 +2,13 @@
 
 import edu.harvard.iq.dataverse.sitemap.SiteMapServiceBean;
 import edu.harvard.iq.dataverse.sitemap.SiteMapUtil;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 @Stateless
 @Path("admin/sitemap")
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/StorageSites.java b/src/main/java/edu/harvard/iq/dataverse/api/StorageSites.java
index 54adeecd9f9..2915328428e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/StorageSites.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/StorageSites.java
@@ -3,16 +3,16 @@
 import edu.harvard.iq.dataverse.locality.StorageSite;
 import edu.harvard.iq.dataverse.locality.StorageSiteUtil;
 import java.util.List;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
 
 @Path("admin/storageSites")
 public class StorageSites extends AbstractApiBean {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/TestApi.java b/src/main/java/edu/harvard/iq/dataverse/api/TestApi.java
index b532fbd4154..46747b50c29 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/TestApi.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/TestApi.java
@@ -2,27 +2,26 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
-import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool;
 import edu.harvard.iq.dataverse.externaltools.ExternalToolHandler;
 import java.util.List;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
 
 @Path("admin/test")
 public class TestApi extends AbstractApiBean {
 
     @GET
     @Path("datasets/{id}/externalTools")
-    public Response getExternalToolsforFile(@PathParam("id") String idSupplied, @QueryParam("type") String typeSupplied) {
+    public Response getDatasetExternalToolsforFile(@PathParam("id") String idSupplied, @QueryParam("type") String typeSupplied) {
         ExternalTool.Type type;
         try {
             type = ExternalTool.Type.fromString(typeSupplied);
@@ -45,6 +44,34 @@ public Response getExternalToolsforFile(@PathParam("id") String idSupplied, @Que
             return wr.getResponse();
         }
     }
+    
+    @GET
+    @Path("datasets/{id}/externalTool/{toolId}")
+    public Response getExternalToolforDatasetById(@PathParam("id") String idSupplied, @PathParam("toolId") String toolId, @QueryParam("type") String typeSupplied) {
+        ExternalTool.Type type;
+        try {
+            type = ExternalTool.Type.fromString(typeSupplied);
+        } catch (IllegalArgumentException ex) {
+            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        }
+        Dataset dataset;
+        try {
+            dataset = findDatasetOrDie(idSupplied);
+            JsonArrayBuilder tools = Json.createArrayBuilder();
+            List<ExternalTool> datasetTools = externalToolService.findDatasetToolsByType(type);
+            for (ExternalTool tool : datasetTools) {
+                ApiToken apiToken = externalToolService.getApiToken(getRequestApiKey());
+                ExternalToolHandler externalToolHandler = new ExternalToolHandler(tool, dataset, apiToken, null);
+                JsonObjectBuilder toolToJson = externalToolService.getToolAsJsonWithQueryParameters(externalToolHandler);
+                if (tool.getId().toString().equals(toolId)) {
+                    return ok(toolToJson);
+                }
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        return error(BAD_REQUEST, "Could not find external tool with id of " + toolId);
+    }
 
     @Path("files/{id}/externalTools")
     @GET
@@ -63,12 +90,40 @@ public Response getExternalToolsForFile(@PathParam("id") String idSupplied, @Que
                 ApiToken apiToken = externalToolService.getApiToken(getRequestApiKey());
                 ExternalToolHandler externalToolHandler = new ExternalToolHandler(tool, dataFile, apiToken, dataFile.getFileMetadata(), null);
                 JsonObjectBuilder toolToJson = externalToolService.getToolAsJsonWithQueryParameters(externalToolHandler);
-                tools.add(toolToJson);
+                if (externalToolService.meetsRequirements(tool, dataFile)) {
+                    tools.add(toolToJson);
+                }
             }
             return ok(tools);
         } catch (WrappedResponse wr) {
             return wr.getResponse();
         }
     }
+    
+    @Path("files/{id}/externalTool/{toolId}")
+    @GET
+    public Response getExternalToolForFileById(@PathParam("id") String idSupplied, @QueryParam("type") String typeSupplied, @PathParam("toolId") String toolId) {
+        ExternalTool.Type type;
+        try {
+            type = ExternalTool.Type.fromString(typeSupplied);
+        } catch (IllegalArgumentException ex) {
+            return error(BAD_REQUEST, ex.getLocalizedMessage());
+        }
+        try {
+            DataFile dataFile = findDataFileOrDie(idSupplied);
+            List<ExternalTool> datasetTools = externalToolService.findFileToolsByTypeAndContentType(type, dataFile.getContentType());
+            for (ExternalTool tool : datasetTools) {
+                ApiToken apiToken = externalToolService.getApiToken(getRequestApiKey());
+                ExternalToolHandler externalToolHandler = new ExternalToolHandler(tool, dataFile, apiToken, dataFile.getFileMetadata(), null);
+                JsonObjectBuilder toolToJson = externalToolService.getToolAsJsonWithQueryParameters(externalToolHandler);
+                if (externalToolService.meetsRequirements(tool, dataFile) && tool.getId().toString().equals(toolId)) {
+                    return ok(toolToJson);
+                }
+            }
+            return error(BAD_REQUEST, "Could not find external tool with id of " + toolId);
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/TestIngest.java b/src/main/java/edu/harvard/iq/dataverse/api/TestIngest.java
index 15c3b34f6af..add43ea2091 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/TestIngest.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/TestIngest.java
@@ -18,22 +18,22 @@
 import edu.harvard.iq.dataverse.util.StringUtil;
 import java.io.BufferedInputStream;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.UriInfo;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.QueryParam;
 
 
 
@@ -100,7 +100,7 @@ public String datafile(@QueryParam("fileName") String fileName, @QueryParam("fil
         TabularDataIngest tabDataIngest = null;
         
         try {
-            tabDataIngest = ingestPlugin.read(fileInputStream, null);
+            tabDataIngest = ingestPlugin.read(fileInputStream, false, null);
         } catch (IOException ingestEx) {
             output = output.concat("Caught an exception trying to ingest file " + fileName + ": " + ingestEx.getLocalizedMessage());
             return output;
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Users.java b/src/main/java/edu/harvard/iq/dataverse/api/Users.java
index 1ffdb441ca9..77e08bf6ceb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Users.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Users.java
@@ -5,20 +5,36 @@
  */
 package edu.harvard.iq.dataverse.api;
 
-import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
-import edu.harvard.iq.dataverse.engine.command.impl.ChangeUserIdentifierCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.MergeInAccountCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.*;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
+
+import static edu.harvard.iq.dataverse.api.auth.AuthUtil.extractBearerTokenFromHeaderParam;
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.ejb.Stateless;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.stream.JsonParsingException;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.*;
 
 /**
  *
@@ -31,11 +47,12 @@ public class Users extends AbstractApiBean {
     private static final Logger logger = Logger.getLogger(Users.class.getName());
     
     @POST
+    @AuthRequired
     @Path("{consumedIdentifier}/mergeIntoUser/{baseIdentifier}")
-    public Response mergeInAuthenticatedUser(@PathParam("consumedIdentifier") String consumedIdentifier, @PathParam("baseIdentifier") String baseIdentifier) {
+    public Response mergeInAuthenticatedUser(@Context ContainerRequestContext crc, @PathParam("consumedIdentifier") String consumedIdentifier, @PathParam("baseIdentifier") String baseIdentifier) {
         User u;
         try {
-            u = findUserOrDie();
+            u = getRequestUser(crc);
             if(!u.isSuperuser()) {
                 throw new WrappedResponse(error(Response.Status.UNAUTHORIZED, "Only superusers can merge users"));
             }
@@ -65,15 +82,16 @@ public Response mergeInAuthenticatedUser(@PathParam("consumedIdentifier") String
             return error(Response.Status.BAD_REQUEST, "Error calling ChangeUserIdentifierCommand: " + e.getLocalizedMessage());
         }
 
-        return ok("All account data for " + consumedIdentifier + " has been merged into " + baseIdentifier + " .");
+        return ok(String.format("All account data for %s has been merged into %s.", consumedIdentifier, baseIdentifier));
     }
 
     @POST
+    @AuthRequired
     @Path("{identifier}/changeIdentifier/{newIdentifier}")
-    public Response changeAuthenticatedUserIdentifier(@PathParam("identifier") String oldIdentifier, @PathParam("newIdentifier")  String newIdentifier) {
+    public Response changeAuthenticatedUserIdentifier(@Context ContainerRequestContext crc, @PathParam("identifier") String oldIdentifier, @PathParam("newIdentifier")  String newIdentifier) {
         User u;
         try {
-            u = findUserOrDie();
+            u = getRequestUser(crc);
             if(!u.isSuperuser()) {
                 throw new WrappedResponse(error(Response.Status.UNAUTHORIZED, "Only superusers can change userIdentifiers"));
             }
@@ -102,16 +120,11 @@ public Response changeAuthenticatedUserIdentifier(@PathParam("identifier") Strin
     }
     
     @Path("token")
+    @AuthRequired
     @DELETE
-    public Response deleteToken() {
-        User u;
-
-        try {
-            u = findUserOrDie();
-        } catch (WrappedResponse ex) {
-            return ex.getResponse();
-        }
-        AuthenticatedUser au;        
+    public Response deleteToken(@Context ContainerRequestContext crc) {
+        User u = getRequestUser(crc);
+        AuthenticatedUser au;
        
         try{
              au = (AuthenticatedUser) u; 
@@ -126,37 +139,30 @@ public Response deleteToken() {
     }
     
     @Path("token")
+    @AuthRequired
     @GET
-    public Response getTokenExpirationDate() {
-        User u;
-        
+    public Response getTokenExpirationDate(@Context ContainerRequestContext crc) {
         try {
-            u = findUserOrDie();
-        } catch (WrappedResponse ex) {
-            return ex.getResponse();
-        }      
-        
-        ApiToken token = authSvc.findApiToken(getRequestApiKey());
-        
-        if (token == null) {
-            return notFound("Token " + getRequestApiKey() + " not found.");
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            ApiToken token = authSvc.findApiTokenByUser(user);
+
+            if (token == null) {
+                return notFound("Token not found.");
+            }
+
+            return ok(String.format("Token %s expires on %s", token.getTokenString(), token.getExpireTime()));
+
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
         }
-        
-        return ok("Token " + getRequestApiKey() + " expires on " + token.getExpireTime());
-        
     }
     
     @Path("token/recreate")
+    @AuthRequired
     @POST
-    public Response recreateToken() {
-        User u;
+    public Response recreateToken(@Context ContainerRequestContext crc, @QueryParam("returnExpiration") boolean returnExpiration) {
+        User u = getRequestUser(crc);
 
-        try {
-            u = findUserOrDie();
-        } catch (WrappedResponse ex) {
-            return ex.getResponse();
-        }
-        
         AuthenticatedUser au;        
         try{
              au = (AuthenticatedUser) u; 
@@ -171,8 +177,140 @@ public Response recreateToken() {
         ApiToken newToken = authSvc.generateApiTokenForUser(au);
         authSvc.save(newToken);
 
-        return ok("New token for " + au.getUserIdentifier() + " is " + newToken.getTokenString());
+        String message = "New token for " + au.getUserIdentifier() + " is " + newToken.getTokenString();
+        if (returnExpiration) {
+            message += " and expires on " + newToken.getExpireTime();
+        }
+
+        return ok(message);
+    }
+    
+    @GET
+    @AuthRequired
+    @Path(":me")
+    public Response getAuthenticatedUserByToken(@Context ContainerRequestContext crc) {
+
+        String tokenFromRequestAPI = getRequestApiKey();
+
+        AuthenticatedUser authenticatedUser = findUserByApiToken(tokenFromRequestAPI);
+        // This allows use of the :me API call from an active login session. Not sure
+        // this is a good idea
+        if (authenticatedUser == null) {
+            try {
+                authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            } catch (WrappedResponse ex) {
+                Logger.getLogger(Users.class.getName()).log(Level.SEVERE, null, ex);
+                return error(Response.Status.BAD_REQUEST, "User with token " + tokenFromRequestAPI + " not found.");
+            }
+        }
+        return ok(json(authenticatedUser));
+    }
+
+    @POST
+    @AuthRequired
+    @Path("{identifier}/removeRoles")
+    public Response removeUserRoles(@Context ContainerRequestContext crc, @PathParam("identifier") String identifier) {
+        try {
+            AuthenticatedUser userToModify = authSvc.getAuthenticatedUser(identifier);
+            if (userToModify == null) {
+                return error(Response.Status.BAD_REQUEST, "Cannot find user based on " + identifier + ".");
+            }
+            execCommand(new RevokeAllRolesCommand(userToModify, createDataverseRequest(getRequestUser(crc))));
+            return ok("Roles removed for user " + identifier + ".");
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
 
+    @GET
+    @AuthRequired
+    @Path("{identifier}/traces")
+    public Response getTraces(@Context ContainerRequestContext crc, @PathParam("identifier") String identifier) {
+        try {
+            AuthenticatedUser userToQuery = authSvc.getAuthenticatedUser(identifier);
+            JsonObjectBuilder jsonObj = execCommand(new GetUserTracesCommand(createDataverseRequest(getRequestUser(crc)), userToQuery, null));
+            return ok(jsonObj);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
     }
 
+    private List<String> elements = Arrays.asList("roleAssignments","dataverseCreator", "dataversePublisher","datasetCreator", "datasetPublisher","dataFileCreator","dataFilePublisher","datasetVersionUsers","explicitGroups","guestbookEntries", "savedSearches");
+    
+    @GET
+    @AuthRequired
+    @Path("{identifier}/traces/{element}")
+    @Produces("text/csv, application/json")
+    public Response getTracesElement(@Context ContainerRequestContext crc, @Context Request req, @PathParam("identifier") String identifier, @PathParam("element") String element) {
+        try {
+            AuthenticatedUser userToQuery = authSvc.getAuthenticatedUser(identifier);
+            if(!elements.contains(element)) {
+                throw new BadRequestException("Not a valid element");
+            }
+            JsonObjectBuilder jsonObj = execCommand(new GetUserTracesCommand(createDataverseRequest(getRequestUser(crc)), userToQuery, element));
+            
+            List<Variant> vars = Variant
+                    .mediaTypes(MediaType.valueOf(FileUtil.MIME_TYPE_CSV), MediaType.APPLICATION_JSON_TYPE)
+                    .add()
+                    .build();
+            MediaType requestedType = req.selectVariant(vars).getMediaType();
+            if ((requestedType != null) && (requestedType.equals(MediaType.APPLICATION_JSON_TYPE))) {
+                return ok(jsonObj);
+            
+            }
+            JsonArray items=null;
+            try {
+                items = jsonObj.build().getJsonObject("traces").getJsonObject(element).getJsonArray("items");
+            } catch(Exception e) {
+                return ok(jsonObj);
+            }
+            return ok(FileUtil.jsonArrayOfObjectsToCSV(items, items.getJsonObject(0).keySet().toArray(new String[0])), MediaType.valueOf(FileUtil.MIME_TYPE_CSV), element + ".csv");
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/allowedCollections/{permission}")
+    @Produces("application/json")
+    public Response getUserPermittedCollections(@Context ContainerRequestContext crc, @Context Request req, @PathParam("identifier") String identifier, @PathParam("permission") String permission) {
+        AuthenticatedUser authenticatedUser = null;
+        try {
+            authenticatedUser = getRequestAuthenticatedUserOrDie(crc);
+            if (!authenticatedUser.getUserIdentifier().equalsIgnoreCase(identifier) && !authenticatedUser.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "This API call can be used by Users getting there own permitted collections or by superusers.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.UNAUTHORIZED, "Authentication is required.");
+        }
+        try {
+            AuthenticatedUser userToQuery = authSvc.getAuthenticatedUser(identifier);
+            JsonObjectBuilder jsonObj = execCommand(new GetUserPermittedCollectionsCommand(createDataverseRequest(getRequestUser(crc)), userToQuery, permission));
+            return ok(jsonObj);
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
+    @POST
+    @Path("register")
+    public Response registerOIDCUser(String body) {
+        if (!FeatureFlags.API_BEARER_AUTH.enabled()) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, BundleUtil.getStringFromBundle("users.api.errors.bearerAuthFeatureFlagDisabled"));
+        }
+        Optional<String> bearerToken = extractBearerTokenFromHeaderParam(httpRequest.getHeader(HttpHeaders.AUTHORIZATION));
+        if (bearerToken.isEmpty()) {
+            return error(Response.Status.BAD_REQUEST, BundleUtil.getStringFromBundle("users.api.errors.bearerTokenRequired"));
+        }
+        try {
+            JsonObject userJson = JsonUtil.getJsonObject(body);
+            execCommand(new RegisterOIDCUserCommand(createDataverseRequest(GuestUser.get()), bearerToken.get(), jsonParser().parseUserDTO(userJson)));
+        } catch (JsonParseException | JsonParsingException e) {
+            return error(Response.Status.BAD_REQUEST, MessageFormat.format(BundleUtil.getStringFromBundle("users.api.errors.jsonParseToUserDTO"), e.getMessage()));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+        return ok(BundleUtil.getStringFromBundle("users.api.userRegistered"));
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Util.java b/src/main/java/edu/harvard/iq/dataverse/api/Util.java
index 82adedc709f..25855769a38 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Util.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Util.java
@@ -7,9 +7,9 @@
 import java.util.TimeZone;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonReader;
 
 public class Util {
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Workflows.java b/src/main/java/edu/harvard/iq/dataverse/api/Workflows.java
index 4269a0215bf..4eadcedf71a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Workflows.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Workflows.java
@@ -8,11 +8,11 @@
 import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.EJB;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
 
 /**
  * API Endpoint for external systems to report the results of workflow step
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/WorkflowsAdmin.java b/src/main/java/edu/harvard/iq/dataverse/api/WorkflowsAdmin.java
index 4babe6875e2..15478aacff7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/WorkflowsAdmin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/WorkflowsAdmin.java
@@ -11,18 +11,18 @@
 import edu.harvard.iq.dataverse.workflow.WorkflowServiceBean;
 import java.util.Arrays;
 import java.util.Optional;
-import javax.ejb.EJB;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.EJB;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
 
 /**
  * API Endpoint for managing workflows.
@@ -111,9 +111,9 @@ public Response deleteDefault(@PathParam("triggerType") String triggerType) {
         }
     }
     
-    @Path("/{identifier}")
+    @Path("/{id}")
     @GET
-    public Response getWorkflow(@PathParam("identifier") String identifier ) {
+    public Response getWorkflow(@PathParam("id") String identifier ) {
         try {
             long idtf = Long.parseLong(identifier);
             return workflows.getWorkflow(idtf)
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/WorldMapRelatedData.java b/src/main/java/edu/harvard/iq/dataverse/api/WorldMapRelatedData.java
deleted file mode 100755
index e9868f91cee..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/WorldMapRelatedData.java
+++ /dev/null
@@ -1,795 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse.api;
-
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.DataFileServiceBean;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseSession;
-import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.MapLayerMetadata;
-import edu.harvard.iq.dataverse.MapLayerMetadataServiceBean;
-import edu.harvard.iq.dataverse.PermissionServiceBean;
-import edu.harvard.iq.dataverse.UserNotification;
-import edu.harvard.iq.dataverse.worldmapauth.TokenApplicationTypeServiceBean;
-import edu.harvard.iq.dataverse.UserNotificationServiceBean;
-import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
-import edu.harvard.iq.dataverse.authorization.Permission;
-import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.worldmapauth.WorldMapToken;
-import edu.harvard.iq.dataverse.worldmapauth.WorldMapTokenServiceBean;
-import edu.harvard.iq.dataverse.util.SystemConfig;
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLEncoder;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.inject.Inject;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.stream.JsonParsingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-
-/**
- *
- * @author raprasad
- * 
- * Bean used to communicate information to the WorldMap (currently a Django project)
- * 
- * Within geoconnect, the information sent is validated by the DataverseInfoModel in this project:
- * 
- *  https://github.com/IQSS/shared-dataverse-information
- * 
- * @todo Audit these methods to ensure they don't pose a security risk. Consider
- * changing the installer so that like "admin" this "worldmap" endpoint is
- * blocked out of the box. See
- * http://guides.dataverse.org/en/4.6.1/installation/config.html#blocking-api-endpoints
- */
-@Path("worldmap")
-public class WorldMapRelatedData extends AbstractApiBean {
-
-    private static final Logger logger = Logger.getLogger(WorldMapRelatedData.class.getCanonicalName());
-
-    
-    private static final String BASE_PATH = "/api/worldmap/";
-    
-    public static final String MAP_IT_API_PATH_FRAGMENT =  "map-it/";  
-    public static final String MAP_IT_API_PATH = BASE_PATH + MAP_IT_API_PATH_FRAGMENT;
-    
-    public static final String MAP_IT_API_TOKEN_ONLY_PATH_FRAGMENT =  "map-it-token-only/";  
-    public static final String MAP_IT_API_TOKEN_ONLY_PATH = BASE_PATH + MAP_IT_API_TOKEN_ONLY_PATH_FRAGMENT;
-
-    public static final String GET_WORLDMAP_DATAFILE_API_PATH_FRAGMENT =  "datafile/";  
-    public static final String GET_WORLDMAP_DATAFILE_API_PATH =  BASE_PATH + GET_WORLDMAP_DATAFILE_API_PATH_FRAGMENT;
-    
-    
-    public static final String UPDATE_MAP_LAYER_DATA_API_PATH_FRAGMENT = "update-layer-metadata/"; 
-    public static final String UPDATE_MAP_LAYER_DATA_API_PATH = BASE_PATH + UPDATE_MAP_LAYER_DATA_API_PATH_FRAGMENT;
-
-    public static final String DELETE_MAP_LAYER_DATA_API_PATH_FRAGMENT = "delete-layer-metadata/"; 
-    public static final String DELETE_MAP_LAYER_DATA_API_PATH = BASE_PATH + DELETE_MAP_LAYER_DATA_API_PATH_FRAGMENT;
-    
-    public static final String DELETE_WORLDMAP_TOKEN_PATH_FRAGMENT = "delete-token/"; 
-    public static final String DELETE_WORLDMAP_TOKEN_PATH = BASE_PATH + DELETE_WORLDMAP_TOKEN_PATH_FRAGMENT;
-
-    @EJB
-    MapLayerMetadataServiceBean mapLayerMetadataService;
-
-    @EJB
-    DatasetServiceBean datasetService;
-
-    @EJB
-    DataFileServiceBean dataFileService;
-    
-    @EJB
-    UserNotificationServiceBean userNotificationService;
-    
-    @EJB
-    WorldMapTokenServiceBean tokenServiceBean;
-
-    @EJB
-    TokenApplicationTypeServiceBean tokenAppServiceBean;
-
-    @EJB
-    AuthenticationServiceBean dataverseUserService;
-
-    @EJB
-    PermissionServiceBean permissionService;
-    
-    @EJB
-    SystemConfig systemConfig;
-     
-    @Inject
-    DataverseSession session;
-    
-    /**
-     *  Create URL for API call to WorldMapRelatedData.mapDataFile(...)   
-     * 
-     * @param dataFileID
-     * @param dataverseUserID
-     * @return 
-     */
-    public static String getMapItURL(Long dataFileID, Long dataverseUserID){
-        if ((dataverseUserID==null)||(dataFileID==null)){
-            return null;
-        }
-        //test, see if it gets created
-        return WorldMapRelatedData.MAP_IT_API_PATH + dataFileID + "/" + dataverseUserID;
-    }
-    
-    
-    // test call to track down problems
-    // http://127.0.0.1:8080/api/worldmap/t/
-    @GET
-    @Path("t/{identifier}")
-    public Response checkWorldMapAPI(@Context HttpServletRequest request
-                                    , @PathParam("identifier") int identifier) {
-
-        MapLayerMetadata mapLayerMetadata = this.mapLayerMetadataService.find(new Long(identifier));
-        logger.info("mapLayerMetadata retrieved. Try to retrieve image (after 1st time):<br />" + mapLayerMetadata.getMapImageLink());
-        
-        try {
-            this.mapLayerMetadataService.retrieveMapImageForIcon(mapLayerMetadata);
-        } catch (IOException ex) {
-            logger.info("IOException. Failed to retrieve image. Error:" + ex);
-          //  Logger.getLogger(WorldMapRelatedData.class.getName()).log(Level.SEVERE, null, ex);
-        }catch(Exception e2){
-            logger.info("Failed to retrieve image. Error:" + e2);
-        }
-        
-        return ok( "Looks good " + identifier + " " + mapLayerMetadata.getLayerName());
-    }
-    
-    
-    @GET    
-    @Path( MAP_IT_API_PATH_FRAGMENT + "{datafile_id}/{dvuser_id}")
-    public Response mapDataFile(@Context HttpServletRequest request
-                                , @PathParam("datafile_id") Long datafile_id
-                                , @PathParam("dvuser_id") Long dvuser_id){ 
-    
-        return this.mapDataFileTokenOnlyOption(request, datafile_id, dvuser_id, false);
-    }
-    
-    @GET
-    @Path(MAP_IT_API_TOKEN_ONLY_PATH_FRAGMENT + "{datafile_id}/{dvuser_id}")
-    public Response getMapDataFileToken(@Context HttpServletRequest request
-                                , @PathParam("datafile_id") Long datafile_id
-                                , @PathParam("dvuser_id") Long dvuser_id){ 
-    
-        //request.
-        return this.mapDataFileTokenOnlyOption(request, datafile_id, dvuser_id, true);
-    }
-    
-   
-    /*
-        Link used within Dataverse for MapIt button
-        Sends file link to GeoConnect using a Redirect
-    
-    */
-    //@GET    
-    //@Path( MAP_IT_API_PATH_FRAGMENT + "token-option/{datafile_id}/{dvuser_id}/{token_only}")
-    private Response mapDataFileTokenOnlyOption(@Context HttpServletRequest request
-                                ,  Long datafile_id
-                                , Long dvuser_id
-                                , boolean tokenOnly
-    ){ 
-        
-        logger.log(Level.INFO, "mapDataFile datafile_id: {0}", datafile_id);
-        logger.log(Level.INFO, "mapDataFile dvuser_id: {0}", dvuser_id);
-        
-        AuthenticatedUser user = null;
-
-        if (session != null) {
-            if (session.getUser() != null) {
-                if (session.getUser().isAuthenticated()) {
-                    user = (AuthenticatedUser) session.getUser();
-                } 
-            }
-        } 
-        if (user==null){
-            return error(Response.Status.FORBIDDEN, "Not logged in");
-        }
-        
-        
-        if (true){
-            //return okResponse( "Looks good " + datafile_id);
-           //tokenAppServiceBean.getGeoConnectApplication();           
-           //return okResponse("Currently deactivated (mapDataFile)");
-        }
-
-        // Check if the user exists
-        AuthenticatedUser dvUser = dataverseUserService.findByID(dvuser_id);
-	if ( dvUser == null ){
-            return error(Response.Status.FORBIDDEN, "Invalid user");
-        }
-
-        // Check if this file exists
-        DataFile dfile = dataFileService.find(datafile_id);
-        if (dfile==null){
-           return error(Response.Status.NOT_FOUND, "DataFile not found for id: " + datafile_id);
-        }
-        
-        /*
-            Is the dataset public?
-        */
-        if (!dfile.getOwner().isReleased()){
-           return error(Response.Status.FORBIDDEN, "Mapping is only permitted for public datasets/files");
-            
-        }
-        
-        // Does this user have permission to edit metadata for this file?    
-        if (!permissionService.request(createDataverseRequest(dvUser)).on(dfile.getOwner()).has(Permission.EditDataset)){
-           String errMsg = "The user does not have permission to edit metadata for this file.";
-           return error(Response.Status.FORBIDDEN, errMsg);
-        }
-        
-        WorldMapToken token = tokenServiceBean.getNewToken(dfile, dvUser);
-
-        if (tokenOnly){
-            // Return only the token in a JSON object
-            final JsonObjectBuilder jsonInfo = Json.createObjectBuilder();
-            jsonInfo.add(WorldMapToken.GEOCONNECT_TOKEN_KEY, token.getToken()); 
-            return ok(jsonInfo);
-        }
-            
-        // Redirect to geoconnect url
-        String callback_url = systemConfig.getDataverseSiteUrl() + GET_WORLDMAP_DATAFILE_API_PATH;
-        String redirect_url_str = token.getApplication().getMapitLink() + "/" + token.getToken() + "/?cb=" +  URLEncoder.encode(callback_url);
-
-        URI redirect_uri;
-        
-        try {
-            redirect_uri = new URI(redirect_url_str);
-        } catch (URISyntaxException ex) {
-             return error(Response.Status.NOT_FOUND, "Faile to create URI from: " + redirect_url_str);
-        }
-//        Response.
-        return Response.seeOther(redirect_uri).build();
-        
-    }
-    
-    @Deprecated
-    private String getServerNamePort(HttpServletRequest request){
-        if (request == null){
-            return "";
-        }
-        String serverName = request.getServerName();
-        if (serverName==null){
-             return "";
-        }
-        int portNumber = request.getServerPort();
-        
-        String http_prefix = "https://";
-        if (serverName.contains("localhost")){
-            http_prefix = "http://";
-        }else if(serverName.contains("127.0.0.1")){
-            http_prefix = "http://";
-        }
-        if (portNumber==80){
-           return http_prefix + serverName;
-        }
-        return http_prefix + serverName + ":" + portNumber;
-               
-    }
-    
-    /**
-     * Parse json looking for the GEOCONNECT_TOKEN_KEY.
-     * Make sure that the string itself is not null and 64 chars
-     * 
-     * @param jsonTokenInfo
-     * @return 
-     */
-    private String retrieveTokenValueFromJson(JsonObject jsonTokenInfo){
-        if (jsonTokenInfo==null){
-            return null;
-        }
-        logger.info("retrieveTokenValueFromJson.jsonTokenInfo:"+ jsonTokenInfo);
-        logger.info("token keys: " + jsonTokenInfo.keySet());
-        logger.info("key looked for: " + WorldMapToken.GEOCONNECT_TOKEN_KEY);
-        if (!jsonTokenInfo.containsKey(WorldMapToken.GEOCONNECT_TOKEN_KEY)){
-            logger.warning("Token not found.  Permission denied.");
-            return null;
-            //return errorResponse( Response.Status.BAD_REQUEST, "Permission denied");
-        }
-        
-                
-        //String worldmapTokenParam = worldmapTokenObject.toString();                
-        String worldmapTokenParam = jsonTokenInfo.getString(WorldMapToken.GEOCONNECT_TOKEN_KEY);       
-        if (worldmapTokenParam==null){      // shouldn't happen
-            logger.warning("worldmapTokenParam is null when .toString() called.  Permission denied.");
-            return null;
-            //return errorResponse(Response.Status.UNAUTHORIZED, "No access.");
-        }
-       //logger.info("worldmapTokenParam:"+ worldmapTokenParam);
-
-       //logger.info("worldmapTokenParam length:"+ worldmapTokenParam.length());
-        if (!(worldmapTokenParam.length()==64)){
-            logger.warning("worldmapTokenParam not length 64.  Permission denied.");
-            return null;
-           // return errorResponse(Response.Status.UNAUTHORIZED, "No access.");            
-        } 
-        return worldmapTokenParam;
-    }
-    
-    
-    /**
-     * Retrieve FileMetadata for Use by WorldMap.
-     *  This includes information about the DataFile, Dataset, DatasetVersion, and Dataverse
-     * 
-     * @param jsonTokenData
-     * @param request
-     * @return 
-     */
-    @POST
-    @Path(GET_WORLDMAP_DATAFILE_API_PATH_FRAGMENT)// + "{worldmap_token}")
-    public Response getWorldMapDatafileInfo(String jsonTokenData, @Context HttpServletRequest request){//, @PathParam("worldmap_token") String worldmapTokenParam) {   
-        if (true){
-           //return okResponse("Currently deactivated");
-
-           // return okResponse("remote server: " + request.getRemoteAddr());
-        }
-        logger.info("API call: getWorldMapDatafileInfo");
-        //----------------------------------
-        // Auth check: Parse the json message and check for a valid GEOCONNECT_TOKEN_KEY and GEOCONNECT_TOKEN_VALUE
-        //   -- For testing, the GEOCONNECT_TOKEN_VALUE will be dynamic, found in the db
-        //----------------------------------
-        logger.info("(1) jsonTokenData: " + jsonTokenData);
-        // Parse JSON 
-        JsonObject jsonTokenInfo;
-        try ( StringReader rdr = new StringReader(jsonTokenData) ) {
-            jsonTokenInfo = Json.createReader(rdr).readObject();
-        } catch ( JsonParsingException jpe ) {
-            logger.log(Level.SEVERE, "Json: " + jsonTokenData);
-            return error( Response.Status.BAD_REQUEST, "Error parsing Json: " + jpe.getMessage() );
-        }
-        logger.info("(1a) jsonTokenInfo: " + jsonTokenInfo);
-        
-        // Retrieve token string
-        String worldmapTokenParam = this.retrieveTokenValueFromJson(jsonTokenInfo);
-        logger.info("(1b) token from JSON: " + worldmapTokenParam);
-        if (worldmapTokenParam==null){
-            return error(Response.Status.BAD_REQUEST, "Token not found in JSON request.");
-        }
-
-        // Retrieve WorldMapToken and make sure it is valid
-        //
-        WorldMapToken wmToken = tokenServiceBean.retrieveAndRefreshValidToken(worldmapTokenParam);
-        logger.info("(2) token retrieved from db: " + wmToken);
-
-        if (wmToken==null){
-            return error(Response.Status.UNAUTHORIZED, "No access. Invalid token.");
-        }
-        
-        // Make sure the token's User still has permissions to access the file
-        //
-        logger.info("(3) check permissions");
-        if (!(tokenServiceBean.canTokenUserEditFile(wmToken))){
-            tokenServiceBean.expireToken(wmToken);
-            return error(Response.Status.UNAUTHORIZED, "No access. Invalid token.");
-        }
-
-
-        // (1) Retrieve token connected data: DataverseUser, DataFile
-        //
-        // Make sure token user and file are still available
-        //
-        AuthenticatedUser dvUser = wmToken.getDataverseUser();
-        if (dvUser == null) {
-            return error(Response.Status.NOT_FOUND, "DataverseUser not found for token");
-        }
-        DataFile dfile = wmToken.getDatafile();
-        if (dfile  == null) {
-            return error(Response.Status.NOT_FOUND, "DataFile not found for token");
-        }
-        
-        
-        // (1a) Retrieve FileMetadata
-        FileMetadata dfile_meta = dfile.getFileMetadata();
-        if (dfile_meta==null){
-           return error(Response.Status.NOT_FOUND, "FileMetadata not found");
-        }
-        
-        // (2) Now get the dataset and the latest DatasetVersion
-        Dataset dset = dfile.getOwner();
-        if (dset==null){
-            return error(Response.Status.NOT_FOUND, "Owning Dataset for this DataFile not found");
-        }
-        
-        // (2a) latest DatasetVersion
-        // !! How do you check if the lastest version has this specific file?
-        //
-        DatasetVersion dset_version = dset.getLatestVersion();
-        if (dset_version==null){
-            return error(Response.Status.NOT_FOUND, "Latest DatasetVersion for this DataFile not found");
-        }
-        
-        // (3) get Dataverse
-        Dataverse dverse = dset.getOwner();
-        if (dverse==null){
-            return error(Response.Status.NOT_FOUND, "Dataverse for this DataFile's Dataset not found");
-        }
-        
-        // (4) Roll it all up in a JSON response
-        final JsonObjectBuilder jsonData = Json.createObjectBuilder();
-        
-        //------------------------------------
-        // Type of file, currently:
-        //  - shapefile or 
-        //  - tabular file (.tab) with geospatial tag
-        //------------------------------------
-        if (dfile.isShapefileType()){
-            jsonData.add("mapping_type", "shapefile");
-        }else if (dfile.isTabularData()){
-            jsonData.add("mapping_type", "tabular");        
-        }else{
-            logger.log(Level.SEVERE, "This was neither a Shapefile nor a Tabular data file.  DataFile id: " + dfile.getId());
-            return error( Response.Status.BAD_REQUEST, "Sorry! This file does not have mapping data. Please contact the Dataverse administrator. DataFile id: " + dfile.getId()); 
-        }
-    
-        
-        //------------------------------------
-        // DataverseUser Info
-        //------------------------------------
-        jsonData.add("dv_user_id", dvUser.getId());
-        jsonData.add("dv_username", dvUser.getUserIdentifier()); 
-        jsonData.add("dv_user_email", dvUser.getEmail());
-                
-        //------------------------------------
-        // Dataverse URLs to this server 
-        //------------------------------------
-        String serverName = systemConfig.getDataverseSiteUrl();
-        jsonData.add("return_to_dataverse_url", dset_version.getReturnToFilePageURL(serverName, dset, dfile));
-        jsonData.add("datafile_download_url", dfile.getMapItFileDownloadURL(serverName));
-
-        //------------------------------------
-        // Dataverse
-        //------------------------------------
-        //jsonData.add("dataverse_installation_name", "Harvard Dataverse"); // todo / fix
-        jsonData.add("dataverse_installation_name",  systemConfig.getDataverseSiteUrl()); // is this enough to distinguish a dataverse installation?
-
-        jsonData.add("dataverse_id", dverse.getId());      
-        jsonData.add("dataverse_name", dverse.getName());
-
-        String dataverseDesc = dverse.getDescription();
-        if (dataverseDesc == null || dataverseDesc.equalsIgnoreCase("")){
-            dataverseDesc = "";
-        }        
-        jsonData.add("dataverse_description", dataverseDesc);
-
-        //------------------------------------
-        // Dataset Info
-        //------------------------------------
-        jsonData.add("dataset_id", dset.getId());
-
-        //------------------------------------
-        // DatasetVersion Info
-        //------------------------------------
-        jsonData.add("dataset_version_id", dset_version.getId());   // database id
-        jsonData.add("dataset_semantic_version", dset_version.getSemanticVersion());  // major/minor version number, e.g. 3.1
-        
-        jsonData.add("dataset_name", dset_version.getTitle());
-        jsonData.add("dataset_citation", dset_version.getCitation(true));
-        
-        jsonData.add("dataset_description", "");  // Need to fix to/do
-
-        jsonData.add("dataset_is_public", dset_version.isReleased());
-                
-        //------------------------------------
-        // DataFile/FileMetaData Info
-        //------------------------------------
-        jsonData.add("datafile_id", dfile.getId());
-        jsonData.add("datafile_label", dfile_meta.getLabel());
-        //jsonData.add("filename", dfile_meta.getLabel());
-        jsonData.add("datafile_expected_md5_checksum", dfile.getChecksumValue());
-        Long fsize = dfile.getFilesize();
-        if (fsize == null){
-            fsize= new Long(-1);
-        }
-            
-        jsonData.add("datafile_filesize", fsize); 
-        jsonData.add("datafile_content_type", dfile.getContentType());
-        jsonData.add("datafile_create_datetime", dfile.getCreateDate().toString());
-        
-        // restriction status of the DataFile
-        jsonData.add("datafile_is_restricted", dfile.isRestricted());
-        
-        return ok(jsonData);
- 
-    }
-
-    
-   
-    /*
-        For WorldMap/GeoConnect Usage
-        Create/Updated a MapLayerMetadata object for a given Datafile id
-        
-        Example of jsonLayerData String:
-        {
-             "layerName": "geonode:boston_census_blocks_zip_cr9"
-            , "layerLink": "http://localhost:8000/data/geonode:boston_census_blocks_zip_cr9"
-            , "embedMapLink": "http://localhost:8000/maps/embed/?layer=geonode:boston_census_blocks_zip_cr9"
-            , "worldmapUsername": "dv_pete"
-        }
-    */
-    @POST
-    @Path(UPDATE_MAP_LAYER_DATA_API_PATH_FRAGMENT)
-    public Response updateWorldMapLayerData(String jsonLayerData){
-        
-         //----------------------------------
-        // Auth check: Parse the json message and check for a valid GEOCONNECT_TOKEN_KEY and GEOCONNECT_TOKEN_VALUE
-        //   -- For testing, the GEOCONNECT_TOKEN_VALUE will be dynamic, found in the db
-        //----------------------------------
-        if (jsonLayerData==null){
-            logger.log(Level.SEVERE, "jsonLayerData is null");
-            return error( Response.Status.BAD_REQUEST, "No JSON data");
-        }
-
-        // (1) Parse JSON 
-        //
-        JsonObject jsonInfo;
-        try ( StringReader rdr = new StringReader(jsonLayerData) ) {
-            jsonInfo = Json.createReader(rdr).readObject();
-        } catch ( JsonParsingException jpe ) {
-            logger.log(Level.SEVERE, "Json: " + jsonLayerData);
-            return error( Response.Status.BAD_REQUEST, "Error parsing Json: " + jpe.getMessage() );
-        }
-        
-        // Retrieve token string
-        String worldmapTokenParam = this.retrieveTokenValueFromJson(jsonInfo);
-        if (worldmapTokenParam==null){
-            return error(Response.Status.BAD_REQUEST, "Token not found in JSON request.");
-        }
-
-        // Retrieve WorldMapToken and make sure it is valid
-        //
-        WorldMapToken wmToken = this.tokenServiceBean.retrieveAndRefreshValidToken(worldmapTokenParam);
-        if (wmToken==null){
-            return error(Response.Status.UNAUTHORIZED, "No access. Invalid token.");
-        }
-
-        // Make sure the token's User still has permissions to access the file
-        //
-        if (!(tokenServiceBean.canTokenUserEditFile(wmToken))){
-            tokenServiceBean.expireToken(wmToken);
-            return error(Response.Status.UNAUTHORIZED, "No access. Invalid token.");
-        }
-
-        
-        // (2) Make sure the json message has all of the required attributes
-        //
-        for (String attr : MapLayerMetadata.MANDATORY_JSON_FIELDS ){
-            if (!jsonInfo.containsKey(attr)){
-                return error( Response.Status.BAD_REQUEST, "Error parsing Json.  Key not found [" + attr + "]\nRequired keys are: " + MapLayerMetadata.MANDATORY_JSON_FIELDS  );
-            }
-        }
-        
-        // (3) Attempt to retrieve DataverseUser      
-        AuthenticatedUser dvUser = wmToken.getDataverseUser();
-        if (dvUser == null) {
-            return error(Response.Status.NOT_FOUND, "DataverseUser not found for token");
-        }
-        
-        // (4) Attempt to retrieve DataFile      
-        DataFile dfile = wmToken.getDatafile();
-        if (dfile==null){
-            return error(Response.Status.NOT_FOUND, "DataFile not found for token");
-         }
-
-        // check permissions!
-        if (!permissionService.request( createDataverseRequest(dvUser) ).on(dfile.getOwner()).has(Permission.EditDataset)){
-           String errMsg = "The user does not have permission to edit metadata for this file. (MapLayerMetadata)";
-           return error(Response.Status.FORBIDDEN, errMsg);
-        }
-        
-        
-        // (5) See if a MapLayerMetadata already exists
-        //  
-        MapLayerMetadata mapLayerMetadata = this.mapLayerMetadataService.findMetadataByDatafile(dfile);
-        if (mapLayerMetadata==null){
-            // Create a new mapLayerMetadata object
-            mapLayerMetadata = new MapLayerMetadata();
-        }
-
-        // Create/Update new MapLayerMetadata object and save it
-        mapLayerMetadata.setDataFile(dfile);
-        mapLayerMetadata.setDataset(dfile.getOwner());
-        mapLayerMetadata.setLayerName(jsonInfo.getString("layerName"));
-        mapLayerMetadata.setLayerLink(jsonInfo.getString("layerLink"));
-        mapLayerMetadata.setEmbedMapLink(jsonInfo.getString("embedMapLink"));
-        mapLayerMetadata.setWorldmapUsername(jsonInfo.getString("worldmapUsername"));
-        if (jsonInfo.containsKey("mapImageLink")){
-            mapLayerMetadata.setMapImageLink(jsonInfo.getString("mapImageLink"));
-        }
-      
-        // If this was a tabular join set the attributes:
-        //  - isJoinLayer
-        //  - joinDescription
-        //
-        String joinDescription = jsonInfo.getString("joinDescription", null);
-        if ((joinDescription == null) || (joinDescription.equals(""))){
-            mapLayerMetadata.setIsJoinLayer(true);
-            mapLayerMetadata.setJoinDescription(joinDescription);
-        }else{
-            mapLayerMetadata.setIsJoinLayer(false);
-            mapLayerMetadata.setJoinDescription(null);            
-        }
-            
-        // Set the mapLayerLinks 
-        //
-        String mapLayerLinks = jsonInfo.getString("mapLayerLinks", null);
-        if ((mapLayerLinks == null) || (mapLayerLinks.equals(""))){
-            mapLayerMetadata.setMapLayerLinks(null);                        
-        }else{
-            mapLayerMetadata.setMapLayerLinks(mapLayerLinks);            
-        }
-        
-        
-        //mapLayer.save();
-        MapLayerMetadata savedMapLayerMetadata = mapLayerMetadataService.save(mapLayerMetadata);
-        if (savedMapLayerMetadata==null){
-            logger.log(Level.SEVERE, "Json: " + jsonLayerData);
-            return error( Response.Status.BAD_REQUEST, "Failed to save map layer!  Original JSON: ");
-        }
-        
-        
-        
-        // notify user
-        userNotificationService.sendNotification(dvUser, wmToken.getCurrentTimestamp(), UserNotification.Type.MAPLAYERUPDATED, dfile.getOwner().getLatestVersion().getId());
-
-        // ------------------------------------------
-        // Retrieve a PNG representation from WorldMap
-        // ------------------------------------------
-        try {
-                logger.info("retrieveMapImageForIcon");
-                this.mapLayerMetadataService.retrieveMapImageForIcon(savedMapLayerMetadata);
-        } catch (IOException ex) {
-                logger.severe("Failed to retrieve image from WorldMap server");
-                Logger.getLogger(WorldMapRelatedData.class.getName()).log(Level.SEVERE, null, ex);
-        }  
-        
-        return ok("map layer object saved!");
-
-    }  // end updateWorldMapLayerData
-    
-    
-    
-    
-    /*
-        For WorldMap/GeoConnect Usage
-        Delete MayLayerMetadata object for a given Datafile
-
-        POST params
-        {
-           "GEOCONNECT_TOKEN": "-- some 64 char token which contains a link to the DataFile --"
-        }
-    */
-    @POST
-    @Path(DELETE_MAP_LAYER_DATA_API_PATH_FRAGMENT)
-    public Response deleteWorldMapLayerData(String jsonData){
-        
-        /*----------------------------------
-            Parse the json message.
-            - Auth check: GEOCONNECT_TOKEN
-        //----------------------------------*/
-        if (jsonData==null){
-            logger.log(Level.SEVERE, "jsonData is null");
-            return error( Response.Status.BAD_REQUEST, "No JSON data");
-        }
-        // (1) Parse JSON 
-        //
-        JsonObject jsonInfo;
-        try ( StringReader rdr = new StringReader(jsonData) ) {
-            jsonInfo = Json.createReader(rdr).readObject();
-        } catch ( JsonParsingException jpe ) {
-            logger.log(Level.SEVERE, "Json: " + jsonData);
-            return error( Response.Status.BAD_REQUEST, "Error parsing Json: " + jpe.getMessage() );
-        }
-        
-        // (2) Retrieve token string
-        String worldmapTokenParam = this.retrieveTokenValueFromJson(jsonInfo);
-        if (worldmapTokenParam==null){
-            return error(Response.Status.BAD_REQUEST, "Token not found in JSON request.");
-        }
-
-        // (3) Retrieve WorldMapToken and make sure it is valid
-        //
-        WorldMapToken wmToken = this.tokenServiceBean.retrieveAndRefreshValidToken(worldmapTokenParam);
-        if (wmToken==null){
-            return error(Response.Status.UNAUTHORIZED, "No access. Invalid token.");
-        }
-
-        // (4) Make sure the token's User still has permissions to access the file
-        //
-        if (!(tokenServiceBean.canTokenUserEditFile(wmToken))){
-            tokenServiceBean.expireToken(wmToken);
-            return error(Response.Status.UNAUTHORIZED, "No access. Invalid token.");
-        }
-
-        // (5) Attempt to retrieve DataFile and mapLayerMetadata   
-        DataFile dfile = wmToken.getDatafile();
-        MapLayerMetadata mapLayerMetadata = this.mapLayerMetadataService.findMetadataByDatafile(dfile);
-        if (mapLayerMetadata==null){
-            return error(Response.Status.EXPECTATION_FAILED, "No map layer metadata found.");
-        }
-       
-       
-       // (6) Delete the mapLayerMetadata
-       //   (note: permissions checked here for a second time by the mapLayerMetadataService call)
-       //
-       if (!(this.mapLayerMetadataService.deleteMapLayerMetadataObject(mapLayerMetadata, wmToken.getDataverseUser()))){
-            return error(Response.Status.PRECONDITION_FAILED, "Failed to delete layer");               
-       };
-
-       
-       return ok("Map layer metadata deleted.");
-        
-    }  // end deleteWorldMapLayerData
-
-   /*
-        For WorldMap/GeoConnect Usage
-        Explicitly expire a WorldMap token, removing token from the database
-
-        POST params
-        {
-           "GEOCONNECT_TOKEN": "-- some 64 char token which contains a link to the DataFile --"
-        }
-    */
-    @POST
-    @Path(DELETE_WORLDMAP_TOKEN_PATH_FRAGMENT)
-    public Response deleteWorldMapToken(String jsonData){
-        
-        /*----------------------------------
-            Parse the json message.
-            - Auth check: GEOCONNECT_TOKEN
-        //----------------------------------*/
-        if (jsonData==null){
-            logger.log(Level.SEVERE, "jsonData is null");
-            return error( Response.Status.BAD_REQUEST, "No JSON data");
-        }
-        // (1) Parse JSON 
-        //
-        JsonObject jsonInfo;
-        try ( StringReader rdr = new StringReader(jsonData) ) {
-            jsonInfo = Json.createReader(rdr).readObject();
-        } catch ( JsonParsingException jpe ) {
-            logger.log(Level.SEVERE, "Json: " + jsonData);
-            return error( Response.Status.BAD_REQUEST, "Error parsing Json: " + jpe.getMessage() );
-        }
-        
-        // (2) Retrieve token string
-        String worldmapTokenParam = this.retrieveTokenValueFromJson(jsonInfo);
-        if (worldmapTokenParam==null){
-            return error(Response.Status.BAD_REQUEST, "Token not found in JSON request.");
-        }
-
-        // (3) Retrieve WorldMapToken
-        //
-        WorldMapToken wmToken = this.tokenServiceBean.findByName(worldmapTokenParam);
-        if (wmToken==null){
-            return error(Response.Status.NOT_FOUND, "Token not found.");
-        }
-
-        // (4) Delete the token
-        //
-        tokenServiceBean.deleteToken(wmToken);               
-        return ok("Token has been deleted.");
-        
-    }  // end deleteWorldMapLayerData    
-    
-} // end class
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/ApiKeyAuthMechanism.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/ApiKeyAuthMechanism.java
new file mode 100644
index 00000000000..fbb0b484b58
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/ApiKeyAuthMechanism.java
@@ -0,0 +1,74 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.UserServiceBean;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
+
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+import java.util.logging.Logger;
+
+/**
+ * @author Guillermo Portas
+ * Authentication mechanism that attempts to authenticate a user from an API Key provided in an API request.
+ */
+public class ApiKeyAuthMechanism implements AuthMechanism {
+
+    public static final String DATAVERSE_API_KEY_REQUEST_HEADER_NAME = "X-Dataverse-key";
+    public static final String DATAVERSE_API_KEY_REQUEST_PARAM_NAME = "key";
+    public static final String RESPONSE_MESSAGE_BAD_API_KEY = "Bad API key";
+    public static final String ACCESS_DATAFILE_PATH_PREFIX = "/access/datafile/";
+
+    @Inject
+    protected PrivateUrlServiceBean privateUrlSvc;
+
+    @Inject
+    protected AuthenticationServiceBean authSvc;
+
+    @Inject
+    protected UserServiceBean userSvc;
+
+    private static final Logger logger = Logger.getLogger(ApiKeyAuthMechanism.class.getName());
+
+    @Override
+    public User findUserFromRequest(ContainerRequestContext containerRequestContext) throws WrappedAuthErrorResponse {
+        String apiKey = getRequestApiKey(containerRequestContext);
+        if (apiKey == null) {
+            return null;
+        }
+        PrivateUrlUser privateUrlUser = privateUrlSvc.getPrivateUrlUserFromToken(apiKey);
+        if (privateUrlUser != null) {
+            checkAnonymizedAccessToRequestPath(containerRequestContext.getUriInfo().getPath(), privateUrlUser);
+            return privateUrlUser;
+        }
+        AuthenticatedUser authUser = authSvc.lookupUser(apiKey);
+        if (authUser != null) {
+            authUser = userSvc.updateLastApiUseTime(authUser);
+            return authUser;
+        }
+        throw new WrappedUnauthorizedAuthErrorResponse(RESPONSE_MESSAGE_BAD_API_KEY);
+    }
+
+    private String getRequestApiKey(ContainerRequestContext containerRequestContext) {
+        String headerParamApiKey = containerRequestContext.getHeaderString(DATAVERSE_API_KEY_REQUEST_HEADER_NAME);
+        String queryParamApiKey = containerRequestContext.getUriInfo().getQueryParameters().getFirst(DATAVERSE_API_KEY_REQUEST_PARAM_NAME);
+
+        return headerParamApiKey != null ? headerParamApiKey : queryParamApiKey;
+    }
+
+    private void checkAnonymizedAccessToRequestPath(String requestPath, PrivateUrlUser privateUrlUser) throws WrappedUnauthorizedAuthErrorResponse {
+        if (!privateUrlUser.hasAnonymizedAccess()) {
+            return;
+        }
+        // For privateUrlUsers restricted to anonymized access, all api calls are off-limits except for those used in the UI
+        // to download the file or image thumbs
+        if (!(requestPath.startsWith(ACCESS_DATAFILE_PATH_PREFIX) && !requestPath.substring(ACCESS_DATAFILE_PATH_PREFIX.length()).contains("/"))) {
+            logger.info("Anonymized access request for " + requestPath);
+            throw new WrappedUnauthorizedAuthErrorResponse(RESPONSE_MESSAGE_BAD_API_KEY);
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthFilter.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthFilter.java
new file mode 100644
index 00000000000..34a72d718f0
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthFilter.java
@@ -0,0 +1,35 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.api.ApiConstants;
+import edu.harvard.iq.dataverse.authorization.users.User;
+
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Priorities;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.ext.Provider;
+import java.io.IOException;
+
+/**
+ * @author Guillermo Portas
+ * Dedicated filter to authenticate the user requesting an API endpoint that requires user authentication.
+ */
+@AuthRequired
+@Provider
+@Priority(Priorities.AUTHENTICATION)
+public class AuthFilter implements ContainerRequestFilter {
+
+    @Inject
+    private CompoundAuthMechanism compoundAuthMechanism;
+
+    @Override
+    public void filter(ContainerRequestContext containerRequestContext) throws IOException {
+        try {
+            User user = compoundAuthMechanism.findUserFromRequest(containerRequestContext);
+            containerRequestContext.setProperty(ApiConstants.CONTAINER_REQUEST_CONTEXT_USER, user);
+        } catch (WrappedAuthErrorResponse e) {
+            containerRequestContext.abortWith(e.getResponse());
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthMechanism.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthMechanism.java
new file mode 100644
index 00000000000..bd34acbf702
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthMechanism.java
@@ -0,0 +1,24 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.authorization.users.User;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+/**
+ * @author Guillermo Portas
+ * This interface defines the common behavior for any kind of Dataverse API authentication mechanism.
+ * Any implementation must correspond to a particular Dataverse API authentication credential type.
+ */
+interface AuthMechanism {
+
+    /**
+     * Returns the user associated with a particular authentication credential provided in a request.
+     * If the credential is not provided, it is expected to return a null user.
+     * If the credential is provided, but is invalid, it will throw a WrappedAuthErrorResponse exception.
+     *
+     * @param containerRequestContext a ContainerRequestContext implementation.
+     * @return a user that can be null.
+     * @throws edu.harvard.iq.dataverse.api.auth.WrappedAuthErrorResponse if there is a credential provided, but invalid.
+     */
+    User findUserFromRequest(ContainerRequestContext containerRequestContext) throws WrappedAuthErrorResponse;
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthRequired.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthRequired.java
new file mode 100644
index 00000000000..bf0d785eeb3
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthRequired.java
@@ -0,0 +1,19 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import jakarta.ws.rs.NameBinding;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * @author Guillermo Portas
+ * Annotation intended to be placed on any API method that requires user authentication.
+ * Marks the API methods whose related requests should be filtered by {@link edu.harvard.iq.dataverse.api.auth.AuthFilter}.
+ */
+@NameBinding
+@Retention(RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+public @interface AuthRequired {
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthUtil.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthUtil.java
new file mode 100644
index 00000000000..36cd7c7f1df
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/AuthUtil.java
@@ -0,0 +1,24 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import java.util.Optional;
+
+public class AuthUtil {
+
+    private static final String BEARER_AUTH_SCHEME = "Bearer";
+
+    /**
+     * Extracts the Bearer token from the provided HTTP Authorization header value.
+     * <p>
+     * Validates that the header value starts with the "Bearer" scheme as defined in RFC 6750.
+     * If the header is null, empty, or does not start with "Bearer ", an empty {@link Optional} is returned.
+     *
+     * @param headerParamBearerToken the raw HTTP Authorization header value containing the Bearer token
+     * @return An {@link Optional} containing the raw Bearer token if present and valid; otherwise, an empty {@link Optional}
+     */
+    public static Optional<String> extractBearerTokenFromHeaderParam(String headerParamBearerToken) {
+        if (headerParamBearerToken != null && headerParamBearerToken.toLowerCase().startsWith(BEARER_AUTH_SCHEME.toLowerCase() + " ")) {
+            return Optional.of(headerParamBearerToken);
+        }
+        return Optional.empty();
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/BearerTokenAuthMechanism.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/BearerTokenAuthMechanism.java
new file mode 100644
index 00000000000..3ee9bb909f2
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/BearerTokenAuthMechanism.java
@@ -0,0 +1,65 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.UserServiceBean;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationException;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.HttpHeaders;
+
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static edu.harvard.iq.dataverse.api.auth.AuthUtil.extractBearerTokenFromHeaderParam;
+
+public class BearerTokenAuthMechanism implements AuthMechanism {
+    private static final Logger logger = Logger.getLogger(BearerTokenAuthMechanism.class.getCanonicalName());
+
+    @Inject
+    protected AuthenticationServiceBean authSvc;
+    @Inject
+    protected UserServiceBean userSvc;
+
+    @Override
+    public User findUserFromRequest(ContainerRequestContext containerRequestContext) throws WrappedAuthErrorResponse {
+        if (!FeatureFlags.API_BEARER_AUTH.enabled()) {
+            return null;
+        }
+
+        Optional<String> bearerToken = getRequestBearerToken(containerRequestContext);
+        if (bearerToken.isEmpty()) {
+            return null;
+        }
+
+        AuthenticatedUser authUser;
+        try {
+            authUser = authSvc.lookupUserByOIDCBearerToken(bearerToken.get());
+        } catch (AuthorizationException e) {
+            logger.log(Level.WARNING, "Authorization failed: {0}", e.getMessage());
+            throw new WrappedUnauthorizedAuthErrorResponse(e.getMessage());
+        }
+
+        if (authUser == null) {
+            logger.log(Level.WARNING, "Bearer token detected, OIDC provider validated the token but no linked UserAccount");
+            throw new WrappedForbiddenAuthErrorResponse(BundleUtil.getStringFromBundle("bearerTokenAuthMechanism.errors.tokenValidatedButNoRegisteredUser"));
+        }
+
+        return userSvc.updateLastApiUseTime(authUser);
+    }
+
+    /**
+     * Retrieve the raw, encoded token value from the Authorization Bearer HTTP header as defined in RFC 6750
+     *
+     * @return An {@link Optional} either empty if not present or the raw token from the header
+     */
+    public static Optional<String> getRequestBearerToken(ContainerRequestContext containerRequestContext) {
+        String headerParamBearerToken = containerRequestContext.getHeaderString(HttpHeaders.AUTHORIZATION);
+        return extractBearerTokenFromHeaderParam(headerParamBearerToken);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/CompoundAuthMechanism.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/CompoundAuthMechanism.java
new file mode 100644
index 00000000000..e5be5144897
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/CompoundAuthMechanism.java
@@ -0,0 +1,51 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author Guillermo Portas
+ * Compound authentication mechanism that attempts to authenticate a user through the different authentication mechanisms (ordered by priority) of which it is composed.
+ * If no user is returned from any of the inner authentication mechanisms, a Guest user is returned.
+ */
+public class CompoundAuthMechanism implements AuthMechanism {
+
+    private final List<AuthMechanism> authMechanisms = new ArrayList<>();
+
+    @Inject
+    public CompoundAuthMechanism(ApiKeyAuthMechanism apiKeyAuthMechanism, WorkflowKeyAuthMechanism workflowKeyAuthMechanism, SignedUrlAuthMechanism signedUrlAuthMechanism, BearerTokenAuthMechanism bearerTokenAuthMechanism, SessionCookieAuthMechanism sessionCookieAuthMechanism) {
+        // Auth mechanisms should be ordered by priority here
+        add(apiKeyAuthMechanism, workflowKeyAuthMechanism, signedUrlAuthMechanism, bearerTokenAuthMechanism, sessionCookieAuthMechanism);
+    }
+
+    public CompoundAuthMechanism(AuthMechanism... authMechanisms) {
+        add(authMechanisms);
+    }
+
+    public void add(AuthMechanism... authMechanisms) {
+        this.authMechanisms.addAll(Arrays.asList(authMechanisms));
+    }
+
+    @Override
+    public User findUserFromRequest(ContainerRequestContext containerRequestContext) throws WrappedAuthErrorResponse {
+        User user = null;
+        for (AuthMechanism authMechanism : authMechanisms) {
+            User userFromRequest = authMechanism.findUserFromRequest(containerRequestContext);
+            if (userFromRequest != null) {
+                user = userFromRequest;
+                break;
+            }
+        }
+        if (user == null) {
+            user = GuestUser.get();
+        }
+        return user;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/SessionCookieAuthMechanism.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/SessionCookieAuthMechanism.java
new file mode 100644
index 00000000000..c1471c3f5b3
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/SessionCookieAuthMechanism.java
@@ -0,0 +1,21 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.DataverseSession;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+public class SessionCookieAuthMechanism implements AuthMechanism {
+    @Inject
+    DataverseSession session;
+
+    @Override
+    public User findUserFromRequest(ContainerRequestContext containerRequestContext) throws WrappedAuthErrorResponse {
+        if (FeatureFlags.API_SESSION_AUTH.enabled()) {
+            return session.getUser();
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/SignedUrlAuthMechanism.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/SignedUrlAuthMechanism.java
new file mode 100644
index 00000000000..30e8a3b9ca4
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/SignedUrlAuthMechanism.java
@@ -0,0 +1,84 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.UrlSignerUtil;
+
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.UriInfo;
+
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+
+import static edu.harvard.iq.dataverse.util.UrlSignerUtil.SIGNED_URL_TOKEN;
+import static edu.harvard.iq.dataverse.util.UrlSignerUtil.SIGNED_URL_USER;
+
+/**
+ * @author Guillermo Portas
+ * Authentication mechanism that attempts to authenticate a user from a Signed URL provided in an API request.
+ */
+public class SignedUrlAuthMechanism implements AuthMechanism {
+
+    public static final String RESPONSE_MESSAGE_BAD_SIGNED_URL = "Bad signed URL";
+
+    @Inject
+    protected AuthenticationServiceBean authSvc;
+    @Inject
+    protected PrivateUrlServiceBean privateUrlSvc;
+    
+    @Override
+    public User findUserFromRequest(ContainerRequestContext containerRequestContext) throws WrappedAuthErrorResponse {
+        String signedUrlRequestParameter = getSignedUrlRequestParameter(containerRequestContext);
+        if (signedUrlRequestParameter == null) {
+            return null;
+        }
+        User user = getAuthenticatedUserFromSignedUrl(containerRequestContext);
+        if (user != null) {
+            return user;
+        }
+        throw new WrappedUnauthorizedAuthErrorResponse(RESPONSE_MESSAGE_BAD_SIGNED_URL);
+    }
+
+    private String getSignedUrlRequestParameter(ContainerRequestContext containerRequestContext) {
+        return containerRequestContext.getUriInfo().getQueryParameters().getFirst(SIGNED_URL_TOKEN);
+    }
+
+    private User getAuthenticatedUserFromSignedUrl(ContainerRequestContext containerRequestContext) {
+        User user = null;
+        // The signedUrl contains a param telling which user this is supposed to be for.
+        // We don't trust this. So we lookup that user, and get their API key, and use
+        // that as a secret in validating the signedURL. If the signature can't be
+        // validated with their key, the user (or their API key) has been changed and
+        // we reject the request.
+        UriInfo uriInfo = containerRequestContext.getUriInfo();
+        String userId = uriInfo.getQueryParameters().getFirst(SIGNED_URL_USER);
+        User targetUser = null; 
+        ApiToken userApiToken = null;
+        if (!userId.startsWith(PrivateUrlUser.PREFIX)) {
+            targetUser = authSvc.getAuthenticatedUser(userId);
+            userApiToken = authSvc.findApiTokenByUser((AuthenticatedUser) targetUser);
+        } else {
+            PrivateUrl privateUrl = privateUrlSvc.getPrivateUrlFromDatasetId(Long.parseLong(userId.substring(PrivateUrlUser.PREFIX.length())));
+            userApiToken = new ApiToken();
+            userApiToken.setTokenString(privateUrl.getToken());
+            targetUser = privateUrlSvc.getPrivateUrlUserFromToken(privateUrl.getToken());
+        }
+        if (targetUser != null && userApiToken != null) {
+            String signedUrl = URLDecoder.decode(uriInfo.getRequestUri().toString(), StandardCharsets.UTF_8);
+            String requestMethod = containerRequestContext.getMethod();
+            String signedUrlSigningKey = JvmSettings.API_SIGNING_SECRET.lookupOptional().orElse("") + userApiToken.getTokenString();
+            boolean isSignedUrlValid = UrlSignerUtil.isValidUrl(signedUrl, userId, requestMethod, signedUrlSigningKey);
+            if (isSignedUrlValid) {
+                user = targetUser;
+            }
+        }
+        return user;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/WorkflowKeyAuthMechanism.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/WorkflowKeyAuthMechanism.java
new file mode 100644
index 00000000000..df54b69af96
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/WorkflowKeyAuthMechanism.java
@@ -0,0 +1,42 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+/**
+ * @author Guillermo Portas
+ * Authentication mechanism that attempts to authenticate a user from a Workflow Key provided in an API request.
+ */
+public class WorkflowKeyAuthMechanism implements AuthMechanism {
+
+    public static final String DATAVERSE_WORKFLOW_KEY_REQUEST_HEADER_NAME = "X-Dataverse-invocationID";
+    public static final String DATAVERSE_WORKFLOW_KEY_REQUEST_PARAM_NAME = "invocationID";
+    public static final String RESPONSE_MESSAGE_BAD_WORKFLOW_KEY = "Bad workflow invocationID";
+
+    @Inject
+    protected AuthenticationServiceBean authSvc;
+
+    @Override
+    public User findUserFromRequest(ContainerRequestContext containerRequestContext) throws WrappedAuthErrorResponse {
+        String workflowKey = getRequestWorkflowKey(containerRequestContext);
+        if (workflowKey == null) {
+            return null;
+        }
+        AuthenticatedUser authUser = authSvc.lookupUserForWorkflowInvocationID(workflowKey);
+        if (authUser != null) {
+            return authUser;
+        }
+        throw new WrappedUnauthorizedAuthErrorResponse(RESPONSE_MESSAGE_BAD_WORKFLOW_KEY);
+    }
+
+    private String getRequestWorkflowKey(ContainerRequestContext containerRequestContext) {
+        String headerParamWorkflowKey = containerRequestContext.getHeaderString(DATAVERSE_WORKFLOW_KEY_REQUEST_HEADER_NAME);
+        String queryParamWorkflowKey = containerRequestContext.getUriInfo().getQueryParameters().getFirst(DATAVERSE_WORKFLOW_KEY_REQUEST_PARAM_NAME);
+
+        return headerParamWorkflowKey != null ? headerParamWorkflowKey : queryParamWorkflowKey;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/WrappedAuthErrorResponse.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/WrappedAuthErrorResponse.java
new file mode 100644
index 00000000000..da92d882197
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/WrappedAuthErrorResponse.java
@@ -0,0 +1,36 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.api.ApiConstants;
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+public abstract class WrappedAuthErrorResponse extends Exception {
+
+    private final String message;
+    private final Response response;
+
+    public WrappedAuthErrorResponse(Response.Status status, String message) {
+        this.message = message;
+        this.response = createErrorResponse(status, message);
+    }
+
+    protected Response createErrorResponse(Response.Status status, String message) {
+        return Response.status(status)
+                .entity(NullSafeJsonBuilder.jsonObjectBuilder()
+                        .add("status", ApiConstants.STATUS_ERROR)
+                        .add("message", message).build()
+                )
+                .type(MediaType.APPLICATION_JSON_TYPE)
+                .build();
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public Response getResponse() {
+        return response;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/WrappedForbiddenAuthErrorResponse.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/WrappedForbiddenAuthErrorResponse.java
new file mode 100644
index 00000000000..082ed3ca8d8
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/WrappedForbiddenAuthErrorResponse.java
@@ -0,0 +1,10 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import jakarta.ws.rs.core.Response;
+
+public class WrappedForbiddenAuthErrorResponse extends WrappedAuthErrorResponse {
+
+    public WrappedForbiddenAuthErrorResponse(String message) {
+        super(Response.Status.FORBIDDEN, message);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/auth/WrappedUnauthorizedAuthErrorResponse.java b/src/main/java/edu/harvard/iq/dataverse/api/auth/WrappedUnauthorizedAuthErrorResponse.java
new file mode 100644
index 00000000000..1d2eb8f8bd8
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/auth/WrappedUnauthorizedAuthErrorResponse.java
@@ -0,0 +1,10 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import jakarta.ws.rs.core.Response;
+
+public class WrappedUnauthorizedAuthErrorResponse extends WrappedAuthErrorResponse {
+
+    public WrappedUnauthorizedAuthErrorResponse(String message) {
+        super(Response.Status.UNAUTHORIZED, message);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/batchjob/BatchJobResource.java b/src/main/java/edu/harvard/iq/dataverse/api/batchjob/BatchJobResource.java
index 37c29f20efe..09a60b1b700 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/batchjob/BatchJobResource.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/batchjob/BatchJobResource.java
@@ -4,17 +4,17 @@
 import edu.harvard.iq.dataverse.api.AbstractApiBean;
 import edu.harvard.iq.dataverse.batch.entities.JobExecutionEntity;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.JobExecution;
-import javax.batch.runtime.JobInstance;
-import javax.ejb.Stateless;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.JobExecution;
+import jakarta.batch.runtime.JobInstance;
+import jakarta.ejb.Stateless;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/batchjob/FileRecordJobResource.java b/src/main/java/edu/harvard/iq/dataverse/api/batchjob/FileRecordJobResource.java
index 688a0267085..b7a6b7cfafd 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/batchjob/FileRecordJobResource.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/batchjob/FileRecordJobResource.java
@@ -3,21 +3,24 @@
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.PermissionServiceBean;
 import edu.harvard.iq.dataverse.api.AbstractApiBean;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.batch.jobs.importer.ImportMode;
 import edu.harvard.iq.dataverse.engine.command.impl.ImportFromFileSystemCommand;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
 
 @Stateless
 @Path("batch/jobs")
@@ -33,13 +36,15 @@ public class FileRecordJobResource extends AbstractApiBean {
     DatasetServiceBean datasetService;
 
     @POST
+    @AuthRequired
     @Path("import/datasets/files/{identifier}")
     @Produces(MediaType.APPLICATION_JSON)
-    public Response getFilesystemImport(@PathParam("identifier") String identifier,
-            @QueryParam("mode") @DefaultValue("MERGE") String mode,
-            /*@QueryParam("fileMode") @DefaultValue("package_file") String fileMode*/
-            @QueryParam("uploadFolder") String uploadFolder,
-            @QueryParam("totalSize") Long totalSize) {
+    public Response getFilesystemImport(@Context ContainerRequestContext crc,
+                                        @PathParam("identifier") String identifier,
+                                        @QueryParam("mode") @DefaultValue("MERGE") String mode,
+                                        /*@QueryParam("fileMode") @DefaultValue("package_file") String fileMode*/
+                                        @QueryParam("uploadFolder") String uploadFolder,
+                                        @QueryParam("totalSize") Long totalSize) {
         return response(req -> {
             ImportMode importMode = ImportMode.MERGE;
             // Switch to this if you ever need to use something other than MERGE.
@@ -53,7 +58,7 @@ public Response getFilesystemImport(@PathParam("identifier") String identifier,
                     .add("message", returnString)
                     .add("executionId", jsonObject.getInt("executionId"))
             );
-        });
+        }, getRequestUser(crc));
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/CollectionDepositManagerImpl.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/CollectionDepositManagerImpl.java
index 7d08ffc5ed0..a81848bd7af 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/CollectionDepositManagerImpl.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/CollectionDepositManagerImpl.java
@@ -6,6 +6,7 @@
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.DvObjectServiceBean;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
 import edu.harvard.iq.dataverse.PermissionServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
@@ -14,15 +15,17 @@
 import edu.harvard.iq.dataverse.api.imports.ImportGenericServiceBean;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDatasetCommand;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.ConstraintViolationUtil;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
 import org.apache.abdera.parser.ParseException;
 import org.swordapp.server.AuthCredentials;
 import org.swordapp.server.CollectionDepositManager;
@@ -43,6 +46,8 @@ public class CollectionDepositManagerImpl implements CollectionDepositManager {
     @EJB
     DatasetServiceBean datasetService;
     @EJB
+    DvObjectServiceBean dvObjectService;
+    @EJB
     PermissionServiceBean permissionService;
     @Inject
     SwordAuth swordAuth;
@@ -95,13 +100,10 @@ public DepositReceipt createNew(String collectionUri, Deposit deposit, AuthCrede
 
                     Dataset dataset = new Dataset();
                     dataset.setOwner(dvThatWillOwnDataset);
-                    String nonNullDefaultIfKeyNotFound = "";
-                    String protocol = settingsService.getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound);
-                    String authority = settingsService.getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound);
-
-                    dataset.setProtocol(protocol);
-                    dataset.setAuthority(authority);
-                    //Wait until the create command before actually getting an identifier                    
+                    PidProvider pidProvider = dvObjectService.getEffectivePidGenerator(dataset);
+                    dataset.setProtocol(pidProvider.getProtocol());
+                    dataset.setAuthority(pidProvider.getAuthority());
+                    //Wait until the create command before actually getting an identifier
                     logger.log(Level.FINE, "DS Deposit identifier: {0}", dataset.getIdentifier());
 
                     AbstractCreateDatasetCommand createDatasetCommand = new CreateNewDatasetCommand(dataset, dvReq);
@@ -109,7 +111,7 @@ public DepositReceipt createNew(String collectionUri, Deposit deposit, AuthCrede
                         throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "user " + user.getDisplayInfo().getTitle() + " is not authorized to create a dataset in this dataverse.");
                     }
 
-                    DatasetVersion newDatasetVersion = dataset.getEditVersion();
+                    DatasetVersion newDatasetVersion = dataset.getOrCreateEditVersion();
 
                     String foreignFormat = SwordUtil.DCTERMS;
                     try {
@@ -149,13 +151,7 @@ public DepositReceipt createNew(String collectionUri, Deposit deposit, AuthCrede
                              * https://github.com/IQSS/dataverse/issues/1009
                              */
                             if (cause instanceof ConstraintViolationException) {
-                                ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
-                                for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
-                                    sb.append(" Invalid value: '").append(violation.getInvalidValue()).append("' for ")
-                                            .append(violation.getPropertyPath()).append(" at ")
-                                            .append(violation.getLeafBean()).append(" - ")
-                                            .append(violation.getMessage());
-                                }
+                                sb.append(ConstraintViolationUtil.getErrorStringForConstraintViolations(cause));
                             }
                         }
                         logger.info(sb.toString());
@@ -179,7 +175,9 @@ public DepositReceipt createNew(String collectionUri, Deposit deposit, AuthCrede
                     // curl --insecure --data-binary "@multipart.dat" -H 'Content-Type: multipart/related; boundary="===============0670350989=="' -H "MIME-Version: 1.0" https://sword:sword@localhost:8181/dvn/api/data-deposit/v1/swordv2/collection/dataverse/sword/hdl:1902.1/12345
                     // but...
                     // "Yeah, multipart is critically broken across all implementations" -- http://www.mail-archive.com/sword-app-tech@lists.sourceforge.net/msg00327.html
-                    throw new UnsupportedOperationException("Not yet implemented");
+                    //
+                    // OB 2022-03-24 -> sword2-server v2.0 library drops support for multipart/related.
+                    throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Multipart/related RFC2387 type posts are not supported. Please POST an Atom entry instead.");
                 } else {
                     throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "expected deposit types are isEntryOnly, isBinaryOnly, and isMultiPart");
                 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/CollectionListManagerImpl.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/CollectionListManagerImpl.java
index 2f3777ed6ab..541fa144e80 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/CollectionListManagerImpl.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/CollectionListManagerImpl.java
@@ -11,9 +11,9 @@
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.ejb.EJB;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.xml.namespace.QName;
 import org.apache.abdera.Abdera;
 import org.apache.abdera.i18n.iri.IRI;
@@ -78,8 +78,8 @@ public Feed listCollectionContents(IRI iri, AuthCredentials authCredentials, Swo
                     if (!permissionService.isUserAllowedOn(user, new UpdateDatasetVersionCommand(dataset, dvReq), dataset)) {
                         continue;
                     }
-                    String editUri = baseUrl + "/edit/study/" + dataset.getGlobalIdString();
-                    String editMediaUri = baseUrl + "/edit-media/study/" + dataset.getGlobalIdString();
+                    String editUri = baseUrl + "/edit/study/" + dataset.getGlobalId().asString();
+                    String editMediaUri = baseUrl + "/edit-media/study/" + dataset.getGlobalId().asString();
                     Entry entry = feed.addEntry();
                     entry.setId(editUri);
                     entry.setTitle(datasetService.getTitleFromLatestVersion(dataset.getId()));
@@ -94,7 +94,7 @@ public Feed listCollectionContents(IRI iri, AuthCredentials authCredentials, Swo
                 throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Could not find dataverse: " + dvAlias);
             }
         } else {
-            throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Couldn't determine target type or identifer from URL: " + iri);
+            throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Couldn't determine target type or identifier from URL: " + iri);
         }
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ContainerManagerImpl.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ContainerManagerImpl.java
index dc178a9a740..4d4d1d08b51 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ContainerManagerImpl.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ContainerManagerImpl.java
@@ -25,12 +25,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.abdera.parser.ParseException;
 import org.swordapp.server.AuthCredentials;
 import org.swordapp.server.ContainerManager;
@@ -86,7 +86,7 @@ public DepositReceipt getEntry(String uri, Map<String, String> map, AuthCredenti
                 Dataset dataset = datasetService.findByGlobalId(globalId);
                 if (dataset != null) {
                     if (!permissionService.isUserAllowedOn(user, new GetDraftDatasetVersionCommand(dvReq, dataset), dataset)) {
-                        throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "User " + user.getDisplayInfo().getTitle() + " is not authorized to retrieve entry for " + dataset.getGlobalIdString());
+                        throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "User " + user.getDisplayInfo().getTitle() + " is not authorized to retrieve entry for " + dataset.getGlobalId().asString());
                     }
                     Dataverse dvThatOwnsDataset = dataset.getOwner();
                     ReceiptGenerator receiptGenerator = new ReceiptGenerator();
@@ -137,7 +137,7 @@ public DepositReceipt replaceMetadata(String uri, Deposit deposit, AuthCredentia
                     if (!permissionService.isUserAllowedOn(user, updateDatasetCommand, dataset)) {
                         throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "User " + user.getDisplayInfo().getTitle() + " is not authorized to modify dataverse " + dvThatOwnsDataset.getAlias());
                     }
-                    DatasetVersion datasetVersion = dataset.getEditVersion();
+                    DatasetVersion datasetVersion = dataset.getOrCreateEditVersion();
                     // erase all metadata before creating populating dataset version
                     List<DatasetField> emptyDatasetFields = new ArrayList<>();
                     datasetVersion.setDatasetFields(emptyDatasetFields);
@@ -228,21 +228,21 @@ public void deleteContainer(String uri, AuthCredentials authCredentials, SwordCo
                         DatasetVersion.VersionState datasetVersionState = dataset.getLatestVersion().getVersionState();
                         if (dataset.isReleased()) {
                             if (datasetVersionState.equals(DatasetVersion.VersionState.DRAFT)) {
-                                logger.info("destroying working copy version of dataset " + dataset.getGlobalIdString());
+                                logger.info("destroying working copy version of dataset " + dataset.getGlobalId().asString());
                                 try {
                                     engineSvc.submit(deleteDatasetVersionCommand);
                                 } catch (CommandException ex) {
-                                    throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Can't delete dataset version for " + dataset.getGlobalIdString() + ": " + ex);
+                                    throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Can't delete dataset version for " + dataset.getGlobalId().asString() + ": " + ex);
                                 }
                                 logger.info("dataset version deleted for dataset id " + dataset.getId());
                             } else if (datasetVersionState.equals(DatasetVersion.VersionState.RELEASED)) {
                                 throw new SwordError(UriRegistry.ERROR_METHOD_NOT_ALLOWED, "Deaccessioning a dataset is no longer supported as of Data Deposit API version in URL (" + swordConfiguration.getBaseUrlPathV1() + ") Equivalent functionality is being developed at https://github.com/IQSS/dataverse/issues/778");
                             } else if (datasetVersionState.equals(DatasetVersion.VersionState.DEACCESSIONED)) {
-                                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Lastest version of dataset " + dataset.getGlobalIdString() + " has already been deaccessioned.");
+                                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Lastest version of dataset " + dataset.getGlobalId().asString() + " has already been deaccessioned.");
                             } else if (datasetVersionState.equals(DatasetVersion.VersionState.ARCHIVED)) {
-                                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Lastest version of dataset " + dataset.getGlobalIdString() + " has been archived and can not be deleted or deaccessioned.");
+                                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Lastest version of dataset " + dataset.getGlobalId().asString() + " has been archived and can not be deleted or deaccessioned.");
                             } else {
-                                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Operation not valid for dataset " + dataset.getGlobalIdString() + " in state " + datasetVersionState);
+                                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Operation not valid for dataset " + dataset.getGlobalId().asString() + " in state " + datasetVersionState);
                             }
                             /**
                              * @todo Reformat else below properly so you can
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java
index f5cf35276d0..5189963ae59 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java
@@ -6,19 +6,21 @@
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
 import edu.harvard.iq.dataverse.PermissionServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.dataaccess.StorageIO;
-import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleUtil;
 import edu.harvard.iq.dataverse.datasetutility.FileExceedsMaxSizeException;
+import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDataFilesCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.storageuse.UploadSessionQuotaLimit;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.ConstraintViolationUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -28,12 +30,14 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+
+import edu.harvard.iq.dataverse.util.file.CreateDataFileResult;
 import org.swordapp.server.AuthCredentials;
 import org.swordapp.server.Deposit;
 import org.swordapp.server.DepositReceipt;
@@ -66,6 +70,8 @@ public class MediaResourceManagerImpl implements MediaResourceManager {
     SwordAuth swordAuth;
     @Inject
     UrlManager urlManager;
+    @Inject
+    DataverseRequestServiceBean dvRequestService;
 
     private HttpServletRequest httpRequest;
 
@@ -108,7 +114,7 @@ public MediaResource getMediaResourceRepresentation(String uri, Map<String, Stri
                         MediaResource mediaResource = new MediaResource(fixmeInputStream, contentType, packaging, isPackaged);
                         return mediaResource;
                     } else {
-                        throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "user " + user.getDisplayInfo().getTitle() + " is not authorized to get a media resource representation of the dataset with global ID " + dataset.getGlobalIdString());
+                        throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "user " + user.getDisplayInfo().getTitle() + " is not authorized to get a media resource representation of the dataset with global ID " + dataset.getGlobalId().asString());
                     }
                 } else {
                     throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Downloading files via the SWORD-based Dataverse Data Deposit API is not (yet) supported: https://github.com/IQSS/dataverse/issues/183");
@@ -213,7 +219,7 @@ public void deleteMediaResource(String uri, AuthCredentials authCredentials, Swo
                 throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Unsupported file type found in URL: " + uri);
             }
         } else {
-            throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Target or identifer not specified in URL: " + uri);
+            throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Target or identifier not specified in URL: " + uri);
         }
     }
 
@@ -240,14 +246,14 @@ DepositReceipt replaceOrAddFiles(String uri, Deposit deposit, AuthCredentials au
             }
             UpdateDatasetVersionCommand updateDatasetCommand = new UpdateDatasetVersionCommand(dataset, dvReq);
             if (!permissionService.isUserAllowedOn(user, updateDatasetCommand, dataset)) {
-                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "user " + user.getDisplayInfo().getTitle() + " is not authorized to modify dataset with global ID " + dataset.getGlobalIdString());
+                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "user " + user.getDisplayInfo().getTitle() + " is not authorized to modify dataset with global ID " + dataset.getGlobalId().asString());
             }
             
             //---------------------------------------
             // Make sure that the upload type is not rsync - handled above for dual mode
             // ------------------------------------- 
 
-            if (dataset.getEditVersion().isHasPackageFile()) {                
+            if (dataset.getOrCreateEditVersion().isHasPackageFile()) {                
                 throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, BundleUtil.getStringFromBundle("file.api.alreadyHasPackageFile"));
             }
             
@@ -273,7 +279,7 @@ DepositReceipt replaceOrAddFiles(String uri, Deposit deposit, AuthCredentials au
             }
 
             String uploadedZipFilename = deposit.getFilename();
-            DatasetVersion editVersion = dataset.getEditVersion();
+            DatasetVersion editVersion = dataset.getOrCreateEditVersion();
 
             if (deposit.getInputStream() == null) {
                 throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Deposit input stream was null.");
@@ -298,45 +304,50 @@ DepositReceipt replaceOrAddFiles(String uri, Deposit deposit, AuthCredentials au
              */
             String guessContentTypeForMe = null;
             List<DataFile> dataFiles = new ArrayList<>();
+
             try {
-                try {
-                    dataFiles = FileUtil.createDataFiles(editVersion, deposit.getInputStream(), uploadedZipFilename, guessContentTypeForMe, systemConfig);
-                } catch (EJBException ex) {
-                    Throwable cause = ex.getCause();
-                    if (cause != null) {
-                        if (cause instanceof IllegalArgumentException) {
-                            /**
-                             * @todo should be safe to remove this catch of
-                             * EJBException and IllegalArgumentException once
-                             * this ticket is resolved:
-                             *
-                             * IllegalArgumentException: MALFORMED when
-                             * uploading certain zip files
-                             * https://github.com/IQSS/dataverse/issues/1021
-                             */
-                            throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Exception caught calling ingestService.createDataFiles. Problem with zip file, perhaps: " + cause);
-                        } else {
-                            throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Exception caught calling ingestService.createDataFiles: " + cause);
-                        }
+                //CreateDataFileResult createDataFilesResponse =  FileUtil.createDataFiles(editVersion, deposit.getInputStream(), uploadedZipFilename, guessContentTypeForMe, null, null, systemConfig);
+                UploadSessionQuotaLimit quota = null; 
+                if (systemConfig.isStorageQuotasEnforced()) {
+                    quota = dataFileService.getUploadSessionQuotaLimit(dataset);
+                }
+                Command<CreateDataFileResult> cmd = new CreateNewDataFilesCommand(dvReq, editVersion, deposit.getInputStream(), uploadedZipFilename, guessContentTypeForMe, null, quota, null);
+                CreateDataFileResult createDataFilesResult = commandEngine.submit(cmd);
+                dataFiles = createDataFilesResult.getDataFiles();
+            } catch (CommandException ex) {
+                Throwable cause = ex.getCause();
+                if (cause != null) {
+                    if (cause instanceof IllegalArgumentException) {
+                        /**
+                         * @todo should be safe to remove this catch of
+                         * EJBException and IllegalArgumentException once this
+                         * ticket is resolved:
+                         *
+                         * IllegalArgumentException: MALFORMED when uploading
+                         * certain zip files
+                         * https://github.com/IQSS/dataverse/issues/1021
+                         */
+                        throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Unable to add file(s) to dataset. Problem with zip file, perhaps: " + cause);
                     } else {
-                        throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Exception caught calling ingestService.createDataFiles. No cause: " + ex.getMessage());
+                        throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Unable to add file(s) to dataset: " + cause);
                     }
-                } /*TODO: L.A. 4.6! catch (FileExceedsMaxSizeException ex) {
+                } else {
+                    throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Unable to add file(s) to dataset: " + ex.getMessage());
+                }
+            }
+            /*TODO: L.A. 4.6! catch (FileExceedsMaxSizeException ex) {
                     throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Exception caught calling ingestService.createDataFiles: " + ex.getMessage());
                     //Logger.getLogger(MediaResourceManagerImpl.class.getName()).log(Level.SEVERE, null, ex);
-                }*/
-            } catch (IOException ex) {
-                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Unable to add file(s) to dataset: " + ex.getMessage());
-            }
+            }*/
+            
             if (!dataFiles.isEmpty()) {
                 Set<ConstraintViolation> constraintViolations = editVersion.validate();
                 if (constraintViolations.size() > 0) {
                     ConstraintViolation violation = constraintViolations.iterator().next();
                     throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Unable to add file(s) to dataset: " + violation.getMessage() + " The invalid value was \"" + violation.getInvalidValue() + "\".");
                 } else {
-
-                    ingestService.saveAndAddFilesToDataset(editVersion, dataFiles);
-
+                    boolean ignoreUploadFileLimits = user != null ? user.isSuperuser() : false;
+                    ingestService.saveAndAddFilesToDataset(editVersion, dataFiles, null, true, ignoreUploadFileLimits);
                 }
             } else {
                 throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "No files to add to dataset. Perhaps the zip file was empty.");
@@ -362,13 +373,7 @@ DepositReceipt replaceOrAddFiles(String uri, Deposit deposit, AuthCredentials au
                     cause = cause.getCause();
                     sb.append(cause + " ");
                     if (cause instanceof ConstraintViolationException) {
-                        ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
-                        for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
-                            sb.append(" Invalid value \"").append(violation.getInvalidValue()).append("\" for ")
-                                    .append(violation.getPropertyPath()).append(" at ")
-                                    .append(violation.getLeafBean()).append(" - ")
-                                    .append(violation.getMessage());
-                        }
+                        sb.append(ConstraintViolationUtil.getErrorStringForConstraintViolations(cause));
                     }
                 }
                 throw returnEarly("EJBException: " + sb.toString());
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ReceiptGenerator.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ReceiptGenerator.java
index 69728d0bc96..37a59fe6365 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ReceiptGenerator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ReceiptGenerator.java
@@ -13,7 +13,7 @@ public class ReceiptGenerator {
     DepositReceipt createDatasetReceipt(String baseUrl, Dataset dataset) {
         logger.fine("baseUrl was: " + baseUrl);
         DepositReceipt depositReceipt = new DepositReceipt();
-        String globalId = dataset.getGlobalIdString();
+        String globalId = dataset.getGlobalId().asString();
         String editIri = baseUrl + "/edit/study/" + globalId;
         depositReceipt.setEditIRI(new IRI(editIri));
         /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2CollectionServlet.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2CollectionServlet.java
index a761afd1324..c509a8d6f52 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2CollectionServlet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2CollectionServlet.java
@@ -2,10 +2,10 @@
 
 import java.io.IOException;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.swordapp.server.CollectionAPI;
 import org.swordapp.server.servlets.SwordServlet;
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2ContainerServlet.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2ContainerServlet.java
index d8ba8eec4ca..53dce24c0fe 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2ContainerServlet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2ContainerServlet.java
@@ -2,10 +2,10 @@
 
 import java.io.IOException;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.swordapp.server.ContainerAPI;
 import org.swordapp.server.ContainerManager;
 import org.swordapp.server.StatementManager;
@@ -17,9 +17,11 @@ public class SWORDv2ContainerServlet extends SwordServlet {
     ContainerManagerImpl containerManagerImpl;
     @Inject
     StatementManagerImpl statementManagerImpl;
-    private ContainerManager cm;
+    // this field can be replaced by local variable
+//    private ContainerManager cm;
     private ContainerAPI api;
-    private StatementManager sm;
+    // this field can be replaced by local variable
+//    private StatementManager sm;
     private final ReentrantLock lock = new ReentrantLock();
     
     
@@ -28,13 +30,15 @@ public void init() throws ServletException {
         super.init();
 
         // load the container manager implementation
-        this.cm = containerManagerImpl;
-
-        // load the statement manager implementation
-        this.sm = statementManagerImpl;
+//        this.cm = containerManagerImpl;
+        ContainerManager cm = containerManagerImpl;
+                // load the statement manager implementation
+//        this.sm = statementManagerImpl;
+        StatementManager sm = statementManagerImpl;
 
         // initialise the underlying servlet processor
-        this.api = new ContainerAPI(this.cm, this.sm, this.config);
+//        this.api = new ContainerAPI(this.cm, this.sm, this.config);
+        this.api = new ContainerAPI(cm, sm, this.config);
     }
 
     @Override
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2MediaResourceServlet.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2MediaResourceServlet.java
index c455a6fd26a..245ab6ab23b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2MediaResourceServlet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2MediaResourceServlet.java
@@ -2,10 +2,10 @@
 
 import java.io.IOException;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.swordapp.server.MediaResourceAPI;
 import org.swordapp.server.servlets.SwordServlet;
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2ServiceDocumentServlet.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2ServiceDocumentServlet.java
index 37db76d3c9c..a32e97bcee2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2ServiceDocumentServlet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2ServiceDocumentServlet.java
@@ -1,10 +1,12 @@
 package edu.harvard.iq.dataverse.api.datadeposit;
 
 import java.io.IOException;
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.swordapp.server.ServiceDocumentAPI;
 import org.swordapp.server.servlets.SwordServlet;
 
@@ -29,6 +31,7 @@ public void init() throws ServletException {
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        serviceDocumentManagerImpl.setIpAddress((new DataverseRequest(null, req)).getSourceAddress());
         this.api.get(req, resp);
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2StatementServlet.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2StatementServlet.java
index ed1202d8c77..4bcc9c6afe8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2StatementServlet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2StatementServlet.java
@@ -1,10 +1,10 @@
 package edu.harvard.iq.dataverse.api.datadeposit;
 
 import java.io.IOException;
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.swordapp.server.StatementAPI;
 import org.swordapp.server.StatementManager;
 import org.swordapp.server.servlets.SwordServlet;
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ServiceDocumentManagerImpl.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ServiceDocumentManagerImpl.java
index 7c80fe810d2..62f23e97af9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ServiceDocumentManagerImpl.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ServiceDocumentManagerImpl.java
@@ -4,12 +4,16 @@
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.PermissionServiceBean;
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.inject.Inject;
+import jakarta.ejb.EJB;
+import jakarta.inject.Inject;
+
+import org.apache.commons.lang3.StringUtils;
 import org.swordapp.server.AuthCredentials;
 import org.swordapp.server.ServiceDocument;
 import org.swordapp.server.ServiceDocumentManager;
@@ -35,6 +39,8 @@ public class ServiceDocumentManagerImpl implements ServiceDocumentManager {
     @Inject
     UrlManager urlManager;
 
+    private IpAddress ipAddress = null;
+
     @Override
     public ServiceDocument getServiceDocument(String sdUri, AuthCredentials authCredentials, SwordConfiguration config)
             throws SwordError, SwordServerException, SwordAuthException {
@@ -43,12 +49,9 @@ public ServiceDocument getServiceDocument(String sdUri, AuthCredentials authCred
         String warning = urlManager.processUrl(sdUri);
         ServiceDocument service = new ServiceDocument();
         SwordWorkspace swordWorkspace = new SwordWorkspace();
-        Dataverse rootDataverse = dataverseService.findRootDataverse();
-        if (rootDataverse != null) {
-            String name = rootDataverse.getName();
-            if (name != null) {
-                swordWorkspace.setTitle(name);
-            }
+        String name = dataverseService.getRootDataverseName();
+        if (!StringUtils.isEmpty(name)) {
+            swordWorkspace.setTitle(name);
         }
         if (warning != null) {
             swordWorkspace.getWrappedWorkspace().setAttributeValue("warning", warning);
@@ -66,7 +69,7 @@ public ServiceDocument getServiceDocument(String sdUri, AuthCredentials authCred
          * shibIdentityProvider String on AuthenticatedUser is only set when a
          * SAML assertion is made at runtime via the browser.
          */
-        List<Dataverse> dataverses = permissionService.getDataversesUserHasPermissionOn(user, Permission.AddDataset);
+        List<Dataverse> dataverses = permissionService.findPermittedCollections(new DataverseRequest(user, ipAddress), user, Permission.AddDataset);
         for (Dataverse dataverse : dataverses) {
             String dvAlias = dataverse.getAlias();
             if (dvAlias != null && !dvAlias.isEmpty()) {
@@ -83,4 +86,7 @@ public ServiceDocument getServiceDocument(String sdUri, AuthCredentials authCred
         return service;
     }
 
+    public void setIpAddress(IpAddress ipAddress) {
+        this.ipAddress = ipAddress;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/StatementManagerImpl.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/StatementManagerImpl.java
index b4c227c9812..95763e0eafb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/StatementManagerImpl.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/StatementManagerImpl.java
@@ -17,9 +17,9 @@
 import java.util.Optional;
 import java.util.logging.Logger;
 import static java.util.stream.Collectors.joining;
-import javax.ejb.EJB;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.ejb.EJB;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.i18n.iri.IRISyntaxException;
 import org.apache.abdera.model.AtomDate;
@@ -68,12 +68,13 @@ public Statement getStatement(String editUri, Map<String, String> map, AuthCrede
             if (!permissionService.isUserAllowedOn(user, new GetDraftDatasetVersionCommand(dvReq, dataset), dataset)) {
                 throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "user " + user.getDisplayInfo().getTitle() + " is not authorized to view dataset with global ID " + globalId);
             }
-            String feedUri = urlManager.getHostnamePlusBaseUrlPath(editUri) + "/edit/study/" + dataset.getGlobalIdString();
+            String feedUri = urlManager.getHostnamePlusBaseUrlPath(editUri) + "/edit/study/" + dataset.getGlobalId().asString();
             String author = dataset.getLatestVersion().getAuthorsStr();
             String title = dataset.getLatestVersion().getTitle();
             // in the statement, the element is called "updated"
             Date lastUpdatedFinal = new Date();
             Date lastUpdateTime = dataset.getLatestVersion().getLastUpdateTime();
+            dataset.getLatestVersion().getTermsOfUseAndAccess().setDatasetVersion(dataset.getLatestVersion());
             if (lastUpdateTime != null) {
                 lastUpdatedFinal = lastUpdateTime;
             } else {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordAuth.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordAuth.java
index 4a474f62894..13fc37bdc40 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordAuth.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordAuth.java
@@ -36,6 +36,7 @@ public AuthenticatedUser auth(AuthCredentials authCredentials) throws SwordAuthE
             throw new SwordAuthException(msg);
         }
 
+        // Checking if the user is deactivated is done inside findUserByApiToken.
         AuthenticatedUser authenticatedUserFromToken = findUserByApiToken(username);
         if (authenticatedUserFromToken == null) {
             String msg = "User not found based on API token.";
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordConfigurationImpl.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordConfigurationImpl.java
index 4eb6e77fe21..a5564e9fbdb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordConfigurationImpl.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordConfigurationImpl.java
@@ -1,11 +1,12 @@
 package edu.harvard.iq.dataverse.api.datadeposit;
 
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import org.swordapp.server.SwordConfiguration;
 
 public class SwordConfigurationImpl implements SwordConfiguration {
@@ -86,37 +87,32 @@ public boolean storeAndCheckBinary() {
 
     @Override
     public String getTempDirectory() {
-        String tmpFileDir = System.getProperty(SystemConfig.FILES_DIRECTORY);
-        if (tmpFileDir != null) {
-            String swordDirString = tmpFileDir + File.separator + "sword";
-            File swordDirFile = new File(swordDirString);
-            /**
-             * @todo Do we really need this check? It seems like we do because
-             * if you create a dataset via the native API and then later try to
-             * upload a file via SWORD, the directory defined by
-             * dataverse.files.directory may not exist and we get errors deep in
-             * the SWORD library code. Could maybe use a try catch in the doPost
-             * method of our SWORDv2MediaResourceServlet.
-             */
-            if (swordDirFile.exists()) {
+        // will throw a runtime exception when not found
+        String tmpFileDir = JvmSettings.FILES_DIRECTORY.lookup();
+        
+        String swordDirString = tmpFileDir + File.separator + "sword";
+        File swordDirFile = new File(swordDirString);
+        /**
+         * @todo Do we really need this check? It seems like we do because
+         * if you create a dataset via the native API and then later try to
+         * upload a file via SWORD, the directory defined by
+         * dataverse.files.directory may not exist and we get errors deep in
+         * the SWORD library code. Could maybe use a try catch in the doPost
+         * method of our SWORDv2MediaResourceServlet.
+         */
+        if (swordDirFile.exists()) {
+            return swordDirString;
+        } else {
+            boolean mkdirSuccess = swordDirFile.mkdirs();
+            if (mkdirSuccess) {
+                logger.info("Created directory " + swordDirString);
                 return swordDirString;
             } else {
-                boolean mkdirSuccess = swordDirFile.mkdirs();
-                if (mkdirSuccess) {
-                    logger.info("Created directory " + swordDirString);
-                    return swordDirString;
-                } else {
-                    String msgForSwordUsers = ("Could not determine or create SWORD temp directory. Check logs for details.");
-                    logger.severe(msgForSwordUsers + " Failed to create " + swordDirString);
-                    // sadly, must throw RunTimeException to communicate with SWORD user
-                    throw new RuntimeException(msgForSwordUsers);
-                }
+                String msgForSwordUsers = ("Could not determine or create SWORD temp directory. Check logs for details.");
+                logger.severe(msgForSwordUsers + " Failed to create " + swordDirString);
+                // sadly, must throw RunTimeException to communicate with SWORD user
+                throw new RuntimeException(msgForSwordUsers);
             }
-        } else {
-            String msgForSwordUsers = ("JVM option \"" + SystemConfig.FILES_DIRECTORY + "\" not defined. Check logs for details.");
-            logger.severe(msgForSwordUsers);
-            // sadly, must throw RunTimeException to communicate with SWORD user
-            throw new RuntimeException(msgForSwordUsers);
         }
     }
 
@@ -124,8 +120,11 @@ public String getTempDirectory() {
     public int getMaxUploadSize() {
         
         int unlimited = -1;
-
-        Long maxUploadInBytes = systemConfig.getMaxFileUploadSize();
+        /* It doesn't look like we can determine which store will be used here, so we'll go with the default
+         * (It looks like the collection or study involved is available where this method is called, but the SwordConfiguration.getMaxUploadSize()
+         * doesn't allow a parameter)
+         */ 
+        Long maxUploadInBytes = systemConfig.getMaxFileUploadSizeForStore("default");
 
         if (maxUploadInBytes == null){
             // (a) No setting, return unlimited           
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordFilter.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordFilter.java
new file mode 100644
index 00000000000..aa7e028a4ba
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordFilter.java
@@ -0,0 +1,49 @@
+package edu.harvard.iq.dataverse.api.datadeposit;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import java.io.IOException;
+
+public class SwordFilter implements Filter {
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        HttpServletRequest req = (HttpServletRequest) request;
+        MutateHeaders requestWrapper = new MutateHeaders(req);
+        chain.doFilter(requestWrapper, response);
+    }
+
+    /**
+     * We are mutating headers because Payara 6 is more strict than Paraya 5 and
+     * wants "attachment; filename=" instead of just "filename=". In order to
+     * not break backward compatibility, we add "attachment; " for our (SWORD)
+     * API users. (This only seem to affect our SWORD API.) That is, the can
+     * continue to send '-H "Content-Disposition: filename=example.zip"' as
+     * we've documented for years.
+     */
+    public class MutateHeaders extends HttpServletRequestWrapper {
+
+        public MutateHeaders(HttpServletRequest request) {
+            super(request);
+        }
+
+        // inspired by https://stackoverflow.com/questions/2811769/adding-an-http-header-to-the-request-in-a-servlet-filter/2811841#2811841
+        @Override
+        public String getHeader(String name) {
+            String header = super.getHeader(name);
+            if ("Content-Disposition".equalsIgnoreCase(name)) {
+                if (header.startsWith("filename=")) {
+                    header = header.replaceFirst("filename=", "attachment; filename=");
+                }
+            }
+            return (header != null) ? header : super.getParameter(name);
+        }
+
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordServiceBean.java
index 4daaad76978..22b6ee05e48 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordServiceBean.java
@@ -9,14 +9,22 @@
 import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
-import java.util.Arrays;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import java.util.ArrayList;
+
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
+import org.apache.commons.lang3.StringUtils;
 import org.swordapp.server.SwordEntry;
 import org.swordapp.server.SwordError;
 
@@ -28,6 +36,10 @@ public class SwordServiceBean {
 
     @EJB
     DatasetFieldServiceBean datasetFieldService;
+    @Inject
+    LicenseServiceBean licenseServiceBean;
+    @EJB
+    SystemConfig systemConfig;
 
     /**
      * Mutate the dataset version, adding a datasetContact (email address) from
@@ -110,21 +122,22 @@ public void addDatasetSubjectIfMissing(DatasetVersion datasetVersion) {
 
     /**
      * The rules (from https://github.com/IQSS/dataverse/issues/805 ) are below.
+     * Edited to support multi-license.
      *
      * If you don't provide `<dcterms:license>` the license should be set to
-     * "CC0" on dataset creation.
+     * "Default License" on dataset creation.
      *
      * If you don't provide `<dcterms:license>` the license on dataset
      * modification, the license should not change.
      *
      * To provide `<dcterms:rights>` you much either omit `<dcterms:license>`
      * (for backwards compatibility since `<dcterms:license>` was not a required
-     * field for SWORD in DVN 3.6) or set `<dcterms:license>` to "NONE".
+     * field for SWORD in DVN 3.6) or set `<dcterms:license>` to "Custom License".
      *
-     * It is invalid to provide "CC0" under `<dcterms:license>` in combination
+     * It is invalid to provide a license under `<dcterms:license>` in combination
      * with any value under `<dcterms:rights>`.
      *
-     * It is invalid to attempt to change the license to "CC0" if Terms of Use
+     * It is invalid to attempt to change the license if Terms of Use
      * (`<dcterms:rights>`) is already on file.
      *
      * Both `<dcterms:rights>` and `<dcterms:license>` can only be specified
@@ -141,28 +154,36 @@ public void addDatasetSubjectIfMissing(DatasetVersion datasetVersion) {
     public void setDatasetLicenseAndTermsOfUse(DatasetVersion datasetVersionToMutate, SwordEntry swordEntry) throws SwordError {
         Map<String, List<String>> dcterms = swordEntry.getDublinCore();
         List<String> listOfLicensesProvided = dcterms.get("license");
+        List<String> rights = dcterms.get("rights");
+        if (rights != null && !systemConfig.isAllowCustomTerms()) {
+            throw new SwordError("Custom Terms (dcterms:rights) are not allowed.");
+        }
+
         TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
         datasetVersionToMutate.setTermsOfUseAndAccess(terms);
+        terms.setDatasetVersion(datasetVersionToMutate);
+        
         if (listOfLicensesProvided == null) {
-            TermsOfUseAndAccess.License existingLicense = datasetVersionToMutate.getTermsOfUseAndAccess().getLicense();
+            License existingLicense = DatasetUtil.getLicense(datasetVersionToMutate);
             if (existingLicense != null) {
                 // leave the license alone but set terms of use
                 setTermsOfUse(datasetVersionToMutate, dcterms, existingLicense);
             } else {
-                TermsOfUseAndAccess.License unspecifiedLicense = TermsOfUseAndAccess.defaultLicense;
+                License defaultLicense = licenseServiceBean.getDefault();
                 List<String> listOfRights = dcterms.get("rights");
                 if (listOfRights != null) {
                     int numRightsProvided = listOfRights.size();
                     if (numRightsProvided != 1) {
                         throw new SwordError("Only one Terms of Use (dcterms:rights) can be provided per dataset, not " + numRightsProvided);
                     } else {
-                        // Set to NONE for backwards combatibility. We didn't require a license for SWORD in DVN 3.x.
-                        unspecifiedLicense = TermsOfUseAndAccess.License.NONE;
+                        // Set to Custom for backwards compatibility. We didn't require a license for SWORD in DVN 3.x.
+                        defaultLicense = null;
                     }
                 }
-                terms.setLicense(existingLicense);
-                terms.setLicense(unspecifiedLicense);
-                setTermsOfUse(datasetVersionToMutate, dcterms, unspecifiedLicense);
+                terms.setLicense(defaultLicense);
+                terms.setFileAccessRequest(datasetVersionToMutate.getTermsOfUseAndAccess().isFileAccessRequest());
+                terms.setDatasetVersion(datasetVersionToMutate);
+                setTermsOfUse(datasetVersionToMutate, dcterms, defaultLicense);
             }
             return;
         }
@@ -174,30 +195,36 @@ public void setDatasetLicenseAndTermsOfUse(DatasetVersion datasetVersionToMutate
         if (StringUtils.isBlank(licenseProvided)) {
             throw new SwordError("License provided was blank.");
         }
-        TermsOfUseAndAccess.License licenseToSet;
-        try {
-            licenseToSet = TermsOfUseAndAccess.License.valueOf(licenseProvided);
-        } catch (IllegalArgumentException ex) {
-            throw new SwordError("License provided was \"" + licenseProvided + "\" but one " + Arrays.toString(DatasetVersion.License.values()) + " was expected.");
+        if (StringUtils.equalsIgnoreCase(licenseProvided, BundleUtil.getStringFromBundle("license.custom"))){
+            terms.setLicense(null);
+            setTermsOfUse(datasetVersionToMutate, dcterms, null);
+        } else {
+            License licenseToSet = licenseServiceBean.getByNameOrUri(licenseProvided);
+            if (licenseToSet == null || !licenseToSet.isActive()) {
+                List<String> licenses = new ArrayList<>();
+                for (License license : licenseServiceBean.listAllActive()) {
+                    licenses.add(license.getName());
+                }
+                throw new SwordError("Couldn't find an active license with: " + licenseProvided + ". Valid licenses: " + licenses);
+            }
+            terms.setLicense(licenseToSet);
+            setTermsOfUse(datasetVersionToMutate, dcterms, licenseToSet);
         }
-        terms.setLicense(licenseToSet);
-        setTermsOfUse(datasetVersionToMutate, dcterms, licenseToSet);
-
     }
 
-    private void setTermsOfUse(DatasetVersion datasetVersionToMutate, Map<String, List<String>> dcterms, TermsOfUseAndAccess.License providedLicense) throws SwordError {
-        if (providedLicense.equals(TermsOfUseAndAccess.License.CC0)) {
+    private void setTermsOfUse(DatasetVersion datasetVersionToMutate, Map<String, List<String>> dcterms, License providedLicense) throws SwordError {
+        if (providedLicense != null) {
             String existingTermsOfUse = datasetVersionToMutate.getTermsOfUseAndAccess().getTermsOfUse();
             if (existingTermsOfUse != null) {
-                throw new SwordError("Can not change license to \"" + DatasetVersion.License.CC0 + "\" due to existing Terms of Use (dcterms:rights): \"" + existingTermsOfUse + "\". You can specify a license of \"" + DatasetVersion.License.NONE + "\'.");
+                throw new SwordError("Can not change license to \"" + providedLicense.getName() + "\" due to existing Terms of Use (dcterms:rights): \"" + existingTermsOfUse + "\". You can specify a Custom license.");
             }
         }
         List<String> listOfRightsProvided = dcterms.get("rights");
         if (listOfRightsProvided != null) {
             int numRightsProvided = listOfRightsProvided.size();
-            if (providedLicense.equals(DatasetVersion.License.CC0)) {
+            if (providedLicense != null) {
                 if (numRightsProvided > 0) {
-                    throw new SwordError("Terms of Use (dcterms:rights) can not be specified in combination with the license \"" + TermsOfUseAndAccess.License.CC0 + "\". A license of \"" + TermsOfUseAndAccess.License.NONE + "\" can be used instead.");
+                    throw new SwordError("Terms of Use (dcterms:rights) cannot be specified in combination with a license.");
                 }
             } else {
                 if (numRightsProvided != 1) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/UrlManager.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/UrlManager.java
index 83a84f70638..e8621ef7a35 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/UrlManager.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/UrlManager.java
@@ -6,7 +6,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.swordapp.server.SwordError;
 import org.swordapp.server.UriRegistry;
 
@@ -30,35 +30,6 @@ String processUrl(String url) throws SwordError {
         } catch (URISyntaxException ex) {
             throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Invalid URL syntax: " + url);
         }
-        /**
-         * @todo: figure out another way to check for http. We used to use
-         * javaNetUri.getScheme() but now that we are using "ProxyPass /
-         * ajp://localhost:8009/" in Apache it's always http rather than https.
-         *
-         * http://serverfault.com/questions/6128/how-do-i-force-apache-to-use-https-in-conjunction-with-ajp
-         * http://stackoverflow.com/questions/1685563/apache-webserver-jboss-ajp-connectivity-with-https
-         * http://stackoverflow.com/questions/12460422/how-do-ensure-that-apache-ajp-to-tomcat-connection-is-secure-encrypted
-         */
-        if (!"https".equals(javaNetUri.getScheme())) {
-            /**
-             * @todo figure out how to prevent this stackstrace from showing up
-             * in Glassfish logs:
-             *
-             * Unable to populate SSL attributes
-             * java.lang.IllegalStateException: SSLEngine is null at
-             * org.glassfish.grizzly.ssl.SSLSupportImpl
-             *
-             * https://github.com/IQSS/dataverse/issues/643
-             *
-             * SSLOptions +StdEnvVars +ExportCertData ?
-             *
-             * [#GLASSFISH-20694] Glassfish 4.0 and jk Unable to populate SSL
-             * attributes - Java.net JIRA -
-             * https://java.net/jira/browse/GLASSFISH-20694
-             */
-            logger.fine("https is required but protocol was " + javaNetUri.getScheme());
-//            throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "https is required but protocol was " + javaNetUri.getScheme());
-        }
         this.port = javaNetUri.getPort();
         String[] urlPartsArray = javaNetUri.getPath().split("/");
         List<String> urlParts = Arrays.asList(urlPartsArray);
@@ -152,47 +123,14 @@ String processUrl(String url) throws SwordError {
     }
 
     String getHostnamePlusBaseUrlPath(String url) throws SwordError {
-        String optionalPort = "";
-        URI u;
-        try {
-            u = new URI(url);
-        } catch (URISyntaxException ex) {
-            throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "unable to part URL");
-        }
-        int port = u.getPort();
-        if (port != -1) {
-            // https often runs on port 8181 in dev
-            optionalPort = ":" + port;
-        }
-        String requestedHostname = u.getHost();
-        String hostName = System.getProperty(SystemConfig.FQDN);
-        if (hostName == null) {
-            hostName = "localhost";
-        }
-        /**
-         * @todo should this be configurable? In dev it's convenient to override
-         * the JVM option and force traffic to localhost.
-         */
-        if (requestedHostname.equals("localhost")) {
-            hostName = "localhost";
-        }
         /**
          * @todo Any problem with returning the current API version rather than
          * the version that was operated on? Both should work. If SWORD API
          * users are operating on the URLs returned (as they should) returning
          * the current version will avoid deprecation warnings on the Dataverse
          * side.
-         *
-         * @todo Prevent "https://localhost:8080" from being returned. It should
-         * either be "http://localhost:8080" or "https://localhost:8181". Use
-         * SystemConfig.getDataverseSiteUrl instead of SystemConfig.FQDN above.
-         * It's worse for security to not have https hard coded here but if
-         * users have configured dataverse.siteUrl to be http rather than https
-         * we assume they are doing this on purpose (despite our warnings in the
-         * Installation Guide), perhaps because they are only kicking the tires
-         * on Dataverse.
          */
-        return "https://" + hostName + optionalPort + swordConfiguration.getBaseUrlPathCurrent();
+        return SystemConfig.getDataverseSiteUrlStatic() + swordConfiguration.getBaseUrlPathCurrent();
     }
 
     public String getOriginalUrl() {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/AbstractDataverseFeaturedItemDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/AbstractDataverseFeaturedItemDTO.java
new file mode 100644
index 00000000000..97168bc8c0e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/AbstractDataverseFeaturedItemDTO.java
@@ -0,0 +1,63 @@
+package edu.harvard.iq.dataverse.api.dto;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+
+import java.io.InputStream;
+
+public abstract class AbstractDataverseFeaturedItemDTO {
+    protected String content;
+    protected int displayOrder;
+    protected InputStream imageFileInputStream;
+    protected String imageFileName;
+    protected String type;
+    protected DvObject dvObject;
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setDisplayOrder(int displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+
+    public int getDisplayOrder() {
+        return displayOrder;
+    }
+
+    public void setImageFileInputStream(InputStream imageFileInputStream) {
+        this.imageFileInputStream = imageFileInputStream;
+    }
+
+    public InputStream getImageFileInputStream() {
+        return imageFileInputStream;
+    }
+
+    public void setImageFileName(String imageFileName) {
+        this.imageFileName = imageFileName;
+    }
+
+    public String getImageFileName() {
+        return imageFileName;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+    public String getType() {
+        return type;
+    }
+    public void setDvObject(DvObject dvObject) {
+        this.dvObject = dvObject;
+    }
+    public DvObject getDvObject() {
+        return dvObject;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/DatasetDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/DatasetDTO.java
index 87564c96637..3b3e9d57151 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/dto/DatasetDTO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/DatasetDTO.java
@@ -12,13 +12,14 @@ public class DatasetDTO implements java.io.Serializable {
         private String identifier;
         private String protocol;
         private String authority;
+        private String separator;
         private String globalIdCreateTime;
         private String publisher;
         private String publicationDate;
+        private String metadataLanguage;
         private DatasetVersionDTO datasetVersion;
         private List<DataFileDTO> dataFiles;
-	public static final String DOI_PROTOCOL = "doi";
-	public static final String HDL_PROTOCOL = "hdl";
+    private Integer datasetFileCountLimit;
 
     public String getId() {
         return id;
@@ -52,6 +53,14 @@ public void setAuthority(String authority) {
         this.authority = authority;
     }
 
+    public String getSeparator() {
+        return separator;
+    }
+
+    public void setSeparator(String separator) {
+        this.separator = separator;
+    }
+
     public String getGlobalIdCreateTime() {
         return globalIdCreateTime;
     }
@@ -95,7 +104,22 @@ public void setPublicationDate(String publicationDate) {
 
     @Override
     public String toString() {
-        return "DatasetDTO{" + "id=" + id + ", identifier=" + identifier + ", protocol=" + protocol + ", authority=" + authority + ", globalIdCreateTime=" + globalIdCreateTime + ", datasetVersion=" + datasetVersion + ", dataFiles=" + dataFiles + '}';
+        return "DatasetDTO{" + "id=" + id + ", identifier=" + identifier + ", protocol=" + protocol + ", authority=" + authority + ", separator=" + separator + ", globalIdCreateTime=" + globalIdCreateTime + ", datasetVersion=" + datasetVersion + ", dataFiles=" + dataFiles + '}';
+    }
+
+    public void setMetadataLanguage(String metadataLanguage) {
+        this.metadataLanguage = metadataLanguage;
+    }
+    
+    public String getMetadataLanguage() {
+        return metadataLanguage;
+    }
+
+    public Integer getDatasetFileCountLimit() {
+        return datasetFileCountLimit;
+    }
+
+    public void setDatasetFileCountLimit(Integer datasetFileCountLimit) {
+        this.datasetFileCountLimit = datasetFileCountLimit;
     }
-        
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/DatasetVersionDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/DatasetVersionDTO.java
index 8ade19949d4..1bc080b8858 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/dto/DatasetVersionDTO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/DatasetVersionDTO.java
@@ -10,7 +10,6 @@
  * @author ellenk
  */
 public class DatasetVersionDTO {
-    String archiveNote;
     String deacessionLink;
     // FIXME: Change to versionNumberMajor and versionNumberMinor? Some partial renaming of "minor" was done.
     Long versionNumber;
@@ -40,13 +39,15 @@ public class DatasetVersionDTO {
     String studyCompletion;
     boolean fileAccessRequest;
     String citation;
-    String license;
+    LicenseDTO license;
     boolean inReview;
     
     Map<String,MetadataBlockDTO> metadataBlocks;
     List<FileMetadataDTO> fileMetadatas;
     List<FileDTO> files;
 
+    String versionNote;
+    
     public boolean isInReview() {
         return inReview;
     }
@@ -215,14 +216,6 @@ public void setFiles(List<FileDTO> files) {
         this.files = files;
     }
 
-    public String getArchiveNote() {
-        return archiveNote;
-    }
-
-    public void setArchiveNote(String archiveNote) {
-        this.archiveNote = archiveNote;
-    }
-
     public String getDeacessionLink() {
         return deacessionLink;
     }
@@ -305,12 +298,12 @@ public String getArchiveTime() {
     public void setArchiveTime(String archiveTime) {
         this.archiveTime = archiveTime;
     }
-    
-    public String getLicense() {
+
+    public LicenseDTO getLicense() {
         return license;
     }
 
-    public void setLicense(String license) {
+    public void setLicense(LicenseDTO license) {
         this.license = license;
     }
 
@@ -328,17 +321,17 @@ public List<FieldDTO> getDatasetFields() {
         return null;
     }
 
+    public String getVersionNote() {
+        return versionNote;
+    }
+
+    public void setVersionNote(String versionNote) {
+        this.versionNote = versionNote;
+    }
+
     @Override
     public String toString() {
-        return "DatasetVersionDTO{" + "archiveNote=" + archiveNote + ", deacessionLink=" + deacessionLink + ", versionNumber=" + versionNumber + ", minorVersionNumber=" + versionMinorNumber + ", id=" + id + ", versionState=" + versionState + ", releaseDate=" + releaseDate + ", lastUpdateTime=" + lastUpdateTime + ", createTime=" + createTime + ", archiveTime=" + archiveTime + ", UNF=" + UNF + ", metadataBlocks=" + metadataBlocks + ", fileMetadatas=" + fileMetadatas + '}';
+        return "DatasetVersionDTO{deacessionLink=" + deacessionLink + ", versionNumber=" + versionNumber + ", minorVersionNumber=" + versionMinorNumber + ", id=" + id + ", versionState=" + versionState + ", releaseDate=" + releaseDate + ", lastUpdateTime=" + lastUpdateTime + ", createTime=" + createTime + ", archiveTime=" + archiveTime + ", UNF=" + UNF + ", metadataBlocks=" + metadataBlocks + ", fileMetadatas=" + fileMetadatas + '}';
     }
-    
-    
-    
-     
-     
-    
-     
-    
- 
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/DataverseDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/DataverseDTO.java
new file mode 100644
index 00000000000..bcb47eb5ff4
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/DataverseDTO.java
@@ -0,0 +1,72 @@
+package edu.harvard.iq.dataverse.api.dto;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseContact;
+
+import java.util.List;
+
+public class DataverseDTO {
+    private String alias;
+    private String name;
+    private String description;
+    private String affiliation;
+    private List<DataverseContact> dataverseContacts;
+    private Dataverse.DataverseType dataverseType;
+    private Integer datasetFileCountLimit;
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAffiliation() {
+        return affiliation;
+    }
+
+    public void setAffiliation(String affiliation) {
+        this.affiliation = affiliation;
+    }
+
+    public Integer getDatasetFileCountLimit() {
+        return datasetFileCountLimit;
+    }
+
+    public void setDatasetFileCountLimit(Integer datasetFileCountLimit) {
+        this.datasetFileCountLimit = datasetFileCountLimit;
+    }
+
+    public List<DataverseContact> getDataverseContacts() {
+        return dataverseContacts;
+    }
+
+    public void setDataverseContacts(List<DataverseContact> dataverseContacts) {
+        this.dataverseContacts = dataverseContacts;
+    }
+
+    public Dataverse.DataverseType getDataverseType() {
+        return dataverseType;
+    }
+
+    public void setDataverseType(Dataverse.DataverseType dataverseType) {
+        this.dataverseType = dataverseType;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/DataverseMetadataBlockFacetDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/DataverseMetadataBlockFacetDTO.java
new file mode 100644
index 00000000000..65b6f0ff58f
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/DataverseMetadataBlockFacetDTO.java
@@ -0,0 +1,56 @@
+package edu.harvard.iq.dataverse.api.dto;
+
+import java.util.List;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class DataverseMetadataBlockFacetDTO {
+
+    private Long dataverseId;
+    private String dataverseAlias;
+    private boolean isMetadataBlockFacetRoot;
+    private List<MetadataBlockDTO> metadataBlocks;
+
+    public DataverseMetadataBlockFacetDTO(Long dataverseId, String dataverseAlias, boolean isMetadataBlockFacetRoot, List<MetadataBlockDTO> metadataBlocks) {
+        this.dataverseId = dataverseId;
+        this.dataverseAlias = dataverseAlias;
+        this.isMetadataBlockFacetRoot = isMetadataBlockFacetRoot;
+        this.metadataBlocks = metadataBlocks;
+    }
+
+    public Long getDataverseId() {
+        return dataverseId;
+    }
+
+    public String getDataverseAlias() {
+        return dataverseAlias;
+    }
+
+    public boolean isMetadataBlockFacetRoot() {
+        return isMetadataBlockFacetRoot;
+    }
+
+    public List<MetadataBlockDTO> getMetadataBlocks() {
+        return metadataBlocks;
+    }
+
+    public static class MetadataBlockDTO {
+        private String metadataBlockName;
+        private String metadataBlockFacet;
+
+        public MetadataBlockDTO(String metadataBlockName, String metadataBlockFacet) {
+            this.metadataBlockName = metadataBlockName;
+            this.metadataBlockFacet = metadataBlockFacet;
+        }
+
+        public String getMetadataBlockName() {
+            return metadataBlockName;
+        }
+
+        public String getMetadataBlockFacet() {
+            return metadataBlockFacet;
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/FieldDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/FieldDTO.java
index 9d79e68cca3..684a4d12b7e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/dto/FieldDTO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/FieldDTO.java
@@ -290,6 +290,10 @@ public Object getConvertedValue() {
         }
     }
 
+    public boolean isControlledVocabularyField() {
+        return getTypeClass().equals("controlledVocabulary");
+    }
+    
     @Override
     public int hashCode() {
         int hash = 3;
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/LicenseDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/LicenseDTO.java
new file mode 100644
index 00000000000..06312a94e9e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/LicenseDTO.java
@@ -0,0 +1,26 @@
+package edu.harvard.iq.dataverse.api.dto;
+
+/**
+ *
+ * @author mderuijter
+ */
+public class LicenseDTO {
+    String name;
+    String uri;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/MetadataBlockDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/MetadataBlockDTO.java
index 8bc65591edf..168f48322bf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/dto/MetadataBlockDTO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/MetadataBlockDTO.java
@@ -10,6 +10,7 @@
  */
 public  class MetadataBlockDTO {
          String displayName;
+         String name;
          List<FieldDTO> fields = new ArrayList<FieldDTO>();
 
         public String getDisplayName() {
@@ -55,7 +56,15 @@ public void addField(FieldDTO newField) {
             } else {
                 // If this Field doesn't allow multiples, just replace the value 
                 // with the new field value.
-                current.value = newField.value;
+                // (or concatenate, if this is a primitive field)
+                if (newField.typeClass.equals("primitive")) {
+                    String currentValue = current.getSinglePrimitive(); 
+                    String newValue = currentValue + " " + newField.getSinglePrimitive();
+                    current.setSinglePrimitive(newValue);
+                } else {
+                    current.value = newField.value;
+                    
+                }
             }
         }
     }
@@ -70,6 +79,14 @@ public void setFields(List<FieldDTO> fields) {
 
         @Override
         public String toString() {
-            return "MetadataBlockDTO{" + "displayName=" + displayName + ", fields=" + fields + '}';
+            return "MetadataBlockDTO{" + "displayName=" + displayName + ", name=" + name + ", fields=" + fields + '}';
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
         }
      }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/NewDataverseFeaturedItemDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/NewDataverseFeaturedItemDTO.java
new file mode 100644
index 00000000000..39026c9c30a
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/NewDataverseFeaturedItemDTO.java
@@ -0,0 +1,31 @@
+package edu.harvard.iq.dataverse.api.dto;
+
+import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.DvObject;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import java.io.InputStream;
+
+public class NewDataverseFeaturedItemDTO extends AbstractDataverseFeaturedItemDTO {
+
+    public static NewDataverseFeaturedItemDTO fromFormData(String content,
+                                                           int displayOrder,
+                                                           InputStream imageFileInputStream,
+                                                           FormDataContentDisposition contentDispositionHeader,
+                                                           String type,
+                                                           DvObject dvObject) {
+        NewDataverseFeaturedItemDTO newDataverseFeaturedItemDTO = new NewDataverseFeaturedItemDTO();
+
+        newDataverseFeaturedItemDTO.content = content;
+        newDataverseFeaturedItemDTO.displayOrder = displayOrder;
+        newDataverseFeaturedItemDTO.type = type;
+        newDataverseFeaturedItemDTO.dvObject = dvObject;
+
+        if (imageFileInputStream != null) {
+            newDataverseFeaturedItemDTO.imageFileInputStream = imageFileInputStream;
+            newDataverseFeaturedItemDTO.imageFileName = FileUtil.decodeFileName(contentDispositionHeader.getFileName());
+        }
+
+        return newDataverseFeaturedItemDTO;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java
new file mode 100644
index 00000000000..28e21ffc6c0
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java
@@ -0,0 +1,75 @@
+package edu.harvard.iq.dataverse.api.dto;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
+import edu.harvard.iq.dataverse.util.json.JsonParser;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.json.*;
+
+import java.sql.Timestamp;
+import java.util.*;
+
+public class NewTemplateDTO {
+
+    private String name;
+    private List<DatasetField> datasetFields;
+    private Map<String, String> instructionsMap;
+    private boolean isDefault;
+
+    public static NewTemplateDTO fromRequestBody(String requestBody, JsonParser jsonParser) throws JsonParseException {
+        NewTemplateDTO newTemplateDTO = new NewTemplateDTO();
+
+        JsonObject jsonObject = JsonUtil.getJsonObject(requestBody);
+
+        newTemplateDTO.name = jsonObject.getString("name");
+        newTemplateDTO.datasetFields = jsonParser.parseMultipleFields(jsonObject);
+        newTemplateDTO.instructionsMap = parseRequestBodyInstructionsMap(jsonObject);
+        newTemplateDTO.isDefault = jsonObject.getBoolean("isDefault", false);
+
+        return newTemplateDTO;
+    }
+
+    public Template toTemplate() {
+        Template template = new Template();
+
+        template.setDatasetFields(getDatasetFields());
+        template.setName(getName());
+        template.setInstructionsMap(getInstructionsMap());
+        template.updateInstructions();
+        template.setCreateTime(new Timestamp(new Date().getTime()));
+        template.setUsageCount(0L);
+
+        return template;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<DatasetField> getDatasetFields() {
+        return datasetFields;
+    }
+
+    public Map<String, String> getInstructionsMap() {
+        return instructionsMap;
+    }
+
+    public boolean isDefault() {
+        return isDefault;
+    }
+
+    private static Map<String, String> parseRequestBodyInstructionsMap(JsonObject jsonObject) {
+        Map<String, String> instructionsMap = new HashMap<>();
+        JsonArray instructionsJsonArray = jsonObject.getJsonArray("instructions");
+        if (instructionsJsonArray == null) {
+            return null;
+        }
+        for (JsonObject instructionJsonObject : instructionsJsonArray.getValuesAs(JsonObject.class)) {
+            instructionsMap.put(
+                    instructionJsonObject.getString("instructionField"),
+                    instructionJsonObject.getString("instructionText")
+            );
+        }
+        return instructionsMap;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/RoleDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/RoleDTO.java
index 58e30ade584..5769ab430ad 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/dto/RoleDTO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/RoleDTO.java
@@ -47,11 +47,11 @@ public void setPermissions(String[] permissions) {
 		this.permissions = permissions;
 	}
 
-	public DataverseRole asRole() {
-		DataverseRole r = new DataverseRole();
+	public DataverseRole updateRoleFromDTO(DataverseRole r) {
 		r.setAlias(alias);
 		r.setDescription(description);
 		r.setName(name);
+		r.clearPermissions();
 		if (permissions != null) {
 			if (permissions.length > 0) {
 				if (permissions[0].trim().toLowerCase().equals("all")) {
@@ -65,5 +65,9 @@ public DataverseRole asRole() {
 		}
 		return r;
 	}
+
+	public DataverseRole asRole() {
+		return updateRoleFromDTO(new DataverseRole());
+	}
 	
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/UpdatedDataverseFeaturedItemDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/UpdatedDataverseFeaturedItemDTO.java
new file mode 100644
index 00000000000..5ffba7d73d5
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/UpdatedDataverseFeaturedItemDTO.java
@@ -0,0 +1,42 @@
+package edu.harvard.iq.dataverse.api.dto;
+
+import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.DvObject;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import java.io.InputStream;
+
+public class UpdatedDataverseFeaturedItemDTO extends AbstractDataverseFeaturedItemDTO {
+    private boolean keepFile;
+
+    public static UpdatedDataverseFeaturedItemDTO fromFormData(String content,
+                                                               int displayOrder,
+                                                               boolean keepFile,
+                                                               InputStream imageFileInputStream,
+                                                               FormDataContentDisposition contentDispositionHeader,
+                                                               String type,
+                                                               DvObject dvObject) {
+        UpdatedDataverseFeaturedItemDTO updatedDataverseFeaturedItemDTO = new UpdatedDataverseFeaturedItemDTO();
+
+        updatedDataverseFeaturedItemDTO.content = content;
+        updatedDataverseFeaturedItemDTO.displayOrder = displayOrder;
+        updatedDataverseFeaturedItemDTO.keepFile = keepFile;
+        updatedDataverseFeaturedItemDTO.type = type;
+        updatedDataverseFeaturedItemDTO.dvObject = dvObject;
+
+        if (imageFileInputStream != null) {
+            updatedDataverseFeaturedItemDTO.imageFileInputStream = imageFileInputStream;
+            updatedDataverseFeaturedItemDTO.imageFileName = FileUtil.decodeFileName(contentDispositionHeader.getFileName());
+        }
+
+        return updatedDataverseFeaturedItemDTO;
+    }
+
+    public void setKeepFile(boolean keepFile) {
+        this.keepFile = keepFile;
+    }
+
+    public boolean isKeepFile() {
+        return keepFile;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/UserDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/UserDTO.java
new file mode 100644
index 00000000000..df1920c4d25
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/UserDTO.java
@@ -0,0 +1,67 @@
+package edu.harvard.iq.dataverse.api.dto;
+
+public class UserDTO {
+    private String username;
+    private String firstName;
+    private String lastName;
+    private String emailAddress;
+    private String affiliation;
+    private String position;
+    private boolean termsAccepted;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getEmailAddress() {
+        return emailAddress;
+    }
+
+    public void setEmailAddress(String emailAddress) {
+        this.emailAddress = emailAddress;
+    }
+
+    public String getAffiliation() {
+        return affiliation;
+    }
+
+    public void setAffiliation(String affiliation) {
+        this.affiliation = affiliation;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public boolean isTermsAccepted() {
+        return termsAccepted;
+    }
+
+    public void setTermsAccepted(boolean termsAccepted) {
+        this.termsAccepted = termsAccepted;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ArrayOutOfBoundsExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ArrayOutOfBoundsExceptionHandler.java
deleted file mode 100644
index 112f50eb3ed..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ArrayOutOfBoundsExceptionHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package edu.harvard.iq.dataverse.api.errorhandlers;
-
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.json.Json;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-/**
- * Produces custom 500 messages for the API.
- * @author michael
- */
-@Provider
-public class ArrayOutOfBoundsExceptionHandler implements ExceptionMapper<java.lang.ArrayIndexOutOfBoundsException>{
-    
-    private static final Logger logger = Logger.getLogger(ServeletExceptionHandler.class.getName());
-    
-    @Context
-    HttpServletRequest request;
-    
-    @Override
-    public Response toResponse(java.lang.ArrayIndexOutOfBoundsException ex){
-        String incidentId = UUID.randomUUID().toString();
-        logger.log(Level.SEVERE, "API internal error " + incidentId +": ArrayOutOfBounds:" + ex.getMessage(), ex);
-        return Response.status(500)
-                .entity( Json.createObjectBuilder()
-                             .add("status", "ERROR")
-                             .add("code", 500)
-                             .add("message", "Internal server error. More details available at the server logs.")
-                             .add("incidentId", incidentId)
-                        .build())
-                .type("application/json").build();
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/BadRequestExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/BadRequestExceptionHandler.java
deleted file mode 100644
index f6412a871ac..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/BadRequestExceptionHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse.api.errorhandlers;
-
-import edu.harvard.iq.dataverse.util.BundleUtil;
-import javax.json.Json;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-/**
- *
- * @author skraffmi
- */
-@Provider
-public class BadRequestExceptionHandler implements ExceptionMapper<BadRequestException> {
-    
-    @Context
-    HttpServletRequest request;
-
-    @Override
-    public Response toResponse(BadRequestException ex) {
-        System.out.print( ex.getMessage());
-        String uri = request.getRequestURI();
-        String exMessage = ex.getMessage(); 
-        String outputMessage;
-        if (exMessage != null && exMessage.toLowerCase().startsWith("tabular data required")) {
-            outputMessage = BundleUtil.getStringFromBundle("access.api.exception.metadata.not.available.for.nontabular.file");
-        } else {
-            outputMessage = "Bad Request. The API request cannot be completed with the parameters supplied. Please check your code for typos, or consult our API guide at http://guides.dataverse.org.";
-        }
-        return Response.status(400)
-                .entity( Json.createObjectBuilder()
-                             .add("status", "ERROR")
-                             .add("code", 400)
-                             .add("message", "'" + uri + "' " + outputMessage)
-                        .build())
-                .type("application/json").build();
-        
-       
-    }
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ConstraintViolationExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ConstraintViolationExceptionHandler.java
new file mode 100644
index 00000000000..bb57059a99a
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ConstraintViolationExceptionHandler.java
@@ -0,0 +1,62 @@
+package edu.harvard.iq.dataverse.api.errorhandlers;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Provider
+public class ConstraintViolationExceptionHandler implements ExceptionMapper<ConstraintViolationException> {
+    
+    public class ValidationError {
+        private String path;
+        private String message;
+        
+        public String getPath() { return path; }
+        public void setPath(String path) { this.path = path; }
+        public String getMessage() { return message; }
+        public void setMessage(String message) { this.message = message; }
+    }
+    
+    @Override
+    public Response toResponse(ConstraintViolationException exception) {
+        
+        List<ValidationError> errors = exception.getConstraintViolations().stream()
+            .map(this::toValidationError)
+            .collect(Collectors.toList());
+        
+        return Response.status(Response.Status.BAD_REQUEST)
+                       .entity( Json.createObjectBuilder()
+                           .add("status", "ERROR")
+                           .add("code", Response.Status.BAD_REQUEST.getStatusCode())
+                           .add("message", "JPA validation constraints failed persistence. See list of violations for details.")
+                           .add("violations", toJsonArray(errors))
+                           .build())
+                       .type(MediaType.APPLICATION_JSON_TYPE).build();
+    }
+    
+    private ValidationError toValidationError(ConstraintViolation constraintViolation) {
+        ValidationError error = new ValidationError();
+        error.setPath(constraintViolation.getPropertyPath().toString());
+        error.setMessage(constraintViolation.getMessage());
+        return error;
+    }
+    
+    private JsonArray toJsonArray(List<ValidationError> list) {
+        JsonArrayBuilder builder = Json.createArrayBuilder();
+        list.stream()
+            .forEach(error -> builder.add(
+                Json.createObjectBuilder()
+                    .add("path", error.getPath())
+                    .add("message", error.getMessage())));
+        return builder.build();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ForbiddenExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ForbiddenExceptionHandler.java
deleted file mode 100644
index 8096b719832..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ForbiddenExceptionHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package edu.harvard.iq.dataverse.api.errorhandlers;
-
-import javax.json.Json;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-/**
- * Produces custom 403 messages for the API.
- * @author michael
- */
-@Provider
-public class ForbiddenExceptionHandler implements ExceptionMapper<ForbiddenException>{
-
-    @Context
-    HttpServletRequest request;
-    
-    @Override
-    public Response toResponse(ForbiddenException ex){
-        String uri = request.getRequestURI();
-        return Response.status(403)
-                .entity( Json.createObjectBuilder()
-                             .add("status", "ERROR")
-                             .add("code", 403)
-                             .add("message", "'" + uri + "' you are not authorized to access this object via this api endpoint. Please check your code for typos, or consult our API guide at http://guides.dataverse.org.")
-                        .build())
-                .type("application/json").build();
-        
-       
-    }
-    
-}
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/JsonParseExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/JsonParseExceptionHandler.java
new file mode 100644
index 00000000000..2f974a1c5be
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/JsonParseExceptionHandler.java
@@ -0,0 +1,34 @@
+package edu.harvard.iq.dataverse.api.errorhandlers;
+
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
+
+import jakarta.json.Json;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
+
+/**
+ * Make a failing JSON parsing request appear to be a BadRequest (error code 400)
+ * and send a message what just failed...
+ */
+@Provider
+public class JsonParseExceptionHandler implements ExceptionMapper<JsonParseException>{
+    
+    @Context
+    HttpServletRequest request;
+    
+    @Override
+    public Response toResponse(JsonParseException ex){
+        return Response.status(Response.Status.BAD_REQUEST)
+                       .entity( Json.createObjectBuilder()
+                           .add("status", "ERROR")
+                           .add("code", Response.Status.BAD_REQUEST.getStatusCode())
+                           .add("message", ex.getMessage())
+                           .build())
+                       .type(MediaType.APPLICATION_JSON_TYPE).build();
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/NotAllowedExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/NotAllowedExceptionHandler.java
deleted file mode 100644
index 5df16c9596d..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/NotAllowedExceptionHandler.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package edu.harvard.iq.dataverse.api.errorhandlers;
-
-import javax.json.Json;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.NotAllowedException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-@Provider
-public class NotAllowedExceptionHandler implements ExceptionMapper<NotAllowedException>{
-
-    @Context
-    HttpServletRequest request;
-    
-    @Override
-    public Response toResponse(NotAllowedException ex){
-        String uri = request.getRequestURI();
-        return Response.status(405)
-                .entity( Json.createObjectBuilder()
-                             .add("status", "ERROR")
-                             .add("code", 405)
-                             .add("message", "'" + uri + "' endpoint does not support method '"+request.getMethod()+"'. Consult our API guide at http://guides.dataverse.org.")
-                        .build())
-                .type("application/json").build();
-        
-       
-    }
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/NotFoundExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/NotFoundExceptionHandler.java
deleted file mode 100644
index 51c4f343f85..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/NotFoundExceptionHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package edu.harvard.iq.dataverse.api.errorhandlers;
-
-import javax.json.Json;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-/**
- * Produces custom 404 messages for the API.
- * @author michael
- */
-@Provider
-public class NotFoundExceptionHandler implements ExceptionMapper<NotFoundException>{
-
-    @Context
-    HttpServletRequest request;
-    
-    @Override
-    public Response toResponse(NotFoundException ex){
-        String uri = request.getRequestURI();
-        String exMessage = ex.getMessage(); 
-        String outputMessage;
-        if (exMessage != null && exMessage.toLowerCase().startsWith("datafile")) {
-            outputMessage = exMessage;
-        } else {
-            outputMessage = "endpoint does not exist on this server. Please check your code for typos, or consult our API guide at http://guides.dataverse.org.";
-        }
-        return Response.status(404)
-                .entity( Json.createObjectBuilder()
-                             .add("status", "ERROR")
-                             .add("code", 404)
-                             .add("message", "'" + uri + "' " + outputMessage)
-                        .build())
-                .type("application/json").build();
-        
-       
-    }
-    
-}
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/NullPointerExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/NullPointerExceptionHandler.java
deleted file mode 100644
index 1e9c2a28690..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/NullPointerExceptionHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package edu.harvard.iq.dataverse.api.errorhandlers;
-
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.json.Json;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-/**
- * Produces custom 500 messages for the API.
- * @author michael
- */
-@Provider
-public class NullPointerExceptionHandler implements ExceptionMapper<java.lang.NullPointerException>{
-    
-    private static final Logger logger = Logger.getLogger(ServeletExceptionHandler.class.getName());
-    
-    @Context
-    HttpServletRequest request;
-    
-    @Override
-    public Response toResponse(java.lang.NullPointerException ex){
-        String incidentId = UUID.randomUUID().toString();
-        logger.log(Level.SEVERE, "API internal error " + incidentId +": Null Pointer", ex);
-        return Response.status(500)
-                .entity( Json.createObjectBuilder()
-                             .add("status", "ERROR")
-                             .add("code", 500)
-                             .add("message", "Internal server error. More details available at the server logs.")
-                             .add("incidentId", incidentId)
-                        .build())
-                .type("application/json").build();
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ServeletExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ServeletExceptionHandler.java
deleted file mode 100644
index fa6bff57c03..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ServeletExceptionHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package edu.harvard.iq.dataverse.api.errorhandlers;
-
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.json.Json;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-/**
- * Produces custom 500 messages for the API.
- * @author michael
- */
-@Provider
-public class ServeletExceptionHandler implements ExceptionMapper<javax.servlet.ServletException>{
-    
-    private static final Logger logger = Logger.getLogger(ServeletExceptionHandler.class.getName());
-    
-    @Context
-    HttpServletRequest request;
-    
-    @Override
-    public Response toResponse(javax.servlet.ServletException ex){
-        String incidentId = UUID.randomUUID().toString();
-        logger.log(Level.SEVERE, "API internal error " + incidentId +": " + ex.getMessage(), ex);
-        return Response.status(500)
-                .entity( Json.createObjectBuilder()
-                             .add("status", "ERROR")
-                             .add("code", 500)
-                             .add("message", "Internal server error. More details available at the server logs.")
-                             .add("incidentId", incidentId)
-                        .build())
-                .type("application/json").build();
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ServiceUnavailableExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ServiceUnavailableExceptionHandler.java
deleted file mode 100644
index ebed03a13da..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ServiceUnavailableExceptionHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package edu.harvard.iq.dataverse.api.errorhandlers;
-
-import javax.json.Json;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.ServiceUnavailableException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-/**
- * Produces custom 503 messages for the API.
- * @author michael
- */
-@Provider
-public class ServiceUnavailableExceptionHandler implements ExceptionMapper<ServiceUnavailableException>{
-
-    @Context
-    HttpServletRequest request;
-    
-    @Override
-    public Response toResponse(ServiceUnavailableException ex){
-        String uri = request.getRequestURI();
-        String exMessage = ex.getMessage(); 
-        String outputMessage;
-        if (exMessage != null && exMessage.toLowerCase().startsWith("datafile")) {
-            outputMessage = exMessage;
-        } else {
-            outputMessage = "Requested service or method not available on the requested object";
-        }
-        return Response.status(503)
-                .entity( Json.createObjectBuilder()
-                             .add("status", "ERROR")
-                             .add("code", 503)
-                             .add("message", "'" + uri + "' " + outputMessage)
-                        .build())
-                .type("application/json").build();
-        
-       
-    }
-    
-}
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ThrowableHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ThrowableHandler.java
new file mode 100644
index 00000000000..8e43a1876bf
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/ThrowableHandler.java
@@ -0,0 +1,37 @@
+package edu.harvard.iq.dataverse.api.errorhandlers;
+
+import edu.harvard.iq.dataverse.api.util.JsonResponseBuilder;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Produces a generic 500 message for the API, being a fallback handler for not specially treated exceptions.
+ *
+ * This catches bad exceptions like ArrayOutOfBoundsExceptions, NullPointerExceptions and ServeletExceptions,
+ * which had formerly specialised handlers, generating a generic error message. (This is now handled here.)
+ */
+@Provider
+public class ThrowableHandler implements ExceptionMapper<Throwable>{
+    
+    private static final Logger logger = Logger.getLogger(ThrowableHandler.class.getName());
+    
+    @Context
+    HttpServletRequest request;
+    
+    @Override
+    public Response toResponse(Throwable ex){
+        return JsonResponseBuilder.error(Response.Status.INTERNAL_SERVER_ERROR)
+            .randomIncidentId()
+            .internalError(ex)
+            .request(request)
+            .log(logger, Level.SEVERE, Optional.of(ex), true)
+            .build();
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/WebApplicationExceptionHandler.java b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/WebApplicationExceptionHandler.java
new file mode 100644
index 00000000000..af9aeffa1c9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/errorhandlers/WebApplicationExceptionHandler.java
@@ -0,0 +1,115 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse.api.errorhandlers;
+
+import edu.harvard.iq.dataverse.api.util.JsonResponseBuilder;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Catches all types of web application exceptions like NotFoundException, etc etc and handles them properly.
+ */
+@Provider
+public class WebApplicationExceptionHandler implements ExceptionMapper<WebApplicationException> {
+    
+    static final Logger logger = Logger.getLogger(WebApplicationExceptionHandler.class.getSimpleName());
+    
+    @Context
+    HttpServletRequest request;
+
+    @Override
+    public Response toResponse(WebApplicationException ex) {
+        
+        // If this is not a HTTP client or server error, just pass the response.
+        if (ex.getResponse().getStatus() < 400)
+            return ex.getResponse();
+        
+        // Otherwise, do stuff.
+        JsonResponseBuilder jrb = JsonResponseBuilder.error(ex.getResponse());
+        
+        // See also https://en.wikipedia.org/wiki/List_of_HTTP_status_codes for a list of status codes.
+        switch (ex.getResponse().getStatus()) {
+            // BadRequest
+            case 400:
+                // It's strange to have these "startsWith" conditionals here. They both come from Access.java.
+                if ( (ex.getMessage()+"").toLowerCase().startsWith("tabular data required")) {
+                    jrb.message(BundleUtil.getStringFromBundle("access.api.exception.metadata.not.available.for.nontabular.file"));
+                } else if ((ex.getMessage() + "").toLowerCase().startsWith("no permission to download file")) {
+                    jrb.message(BundleUtil.getStringFromBundle("access.api.exception.metadata.restricted.no.permission"));
+                } else {
+                    String msg = ex.getMessage();
+                    msg = StringUtils.isEmpty(msg)
+                            ? "Bad Request. The API request cannot be completed with the parameters supplied. Please check your code for typos, or consult our API guide at http://guides.dataverse.org."
+                            : "Bad Request. The API request cannot be completed with the parameters supplied. Details: "
+                                    + msg
+                                    + " - please check your code for typos, or consult our API guide at http://guides.dataverse.org.";
+
+                    jrb.message(msg);
+                    jrb.request(request);
+                }
+                break;
+            // Forbidden
+            case 403:
+                jrb.message("Not authorized to access this object via this API endpoint. Please check your code for typos, or consult our API guide at http://guides.dataverse.org.");
+                jrb.request(request);
+                break;
+            // NotFound
+            case 404:
+                if ( (ex.getMessage()+"").toLowerCase().startsWith("datafile")) {
+                    jrb.message(ex.getMessage());
+                } else {
+                    jrb.message("API endpoint does not exist on this server. Please check your code for typos, or consult our API guide at http://guides.dataverse.org.");
+                    jrb.request(request);
+                }
+                break;
+            // MethodNotAllowed
+            case 405:
+                jrb.message("API endpoint does not support this method. Consult our API guide at http://guides.dataverse.org.");
+                jrb.request(request);
+                break;
+            // NotAcceptable (might be content type, charset, encoding or language)
+            case 406:
+                jrb.message("API endpoint does not accept your request. Consult our API guide at http://guides.dataverse.org.");
+                jrb.request(request);
+                jrb.requestContentType(request);
+                break;
+            // InternalServerError
+            case 500:
+                jrb.randomIncidentId();
+                jrb.internalError(ex);
+                jrb.request(request);
+                jrb.log(logger, Level.SEVERE, Optional.of(ex));
+                break;
+            // ServiceUnavailable
+            case 503:
+                if ( (ex.getMessage()+"").toLowerCase().startsWith("datafile")) {
+                    jrb.message(ex.getMessage());
+                } else {
+                    jrb.message("Requested service or method not available on the requested object");
+                }
+                break;
+            default:
+                jrb.message(ex.getMessage());
+                break;
+        }
+    
+        // Logging for debugging. Will not double-log messages.
+        jrb.log(logger, Level.FINEST, Optional.of(ex));
+        return jrb.build();
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/filter/ApiBlockingFilter.java b/src/main/java/edu/harvard/iq/dataverse/api/filter/ApiBlockingFilter.java
new file mode 100644
index 00000000000..39efbb97aaa
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/filter/ApiBlockingFilter.java
@@ -0,0 +1,245 @@
+package edu.harvard.iq.dataverse.api.filter;
+
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+
+import org.eclipse.jetty.util.StringUtil;
+
+@Provider
+public class ApiBlockingFilter implements ContainerRequestFilter {
+
+    private static final Logger logger = Logger.getLogger(ApiBlockingFilter.class.getName());
+
+    public static final String UNBLOCK_KEY_QUERYPARAM = "unblock-key";
+    public static final String UNBLOCK_KEY_HEADER = "X-Dataverse-unblock-key";
+    // Policies
+    private static final String DROP = "drop";
+    private static final String LOCALHOST_ONLY = "localhost-only";
+    private static final String UNBLOCK_KEY = "unblock-key";
+
+    private static final Map<String, String> POLICY_ERROR_MESSAGES = new HashMap<>();
+    static {
+        POLICY_ERROR_MESSAGES.put(DROP, "Endpoint blocked. Access denied.");
+        POLICY_ERROR_MESSAGES.put(LOCALHOST_ONLY, "Endpoint restricted to localhost access only.");
+        POLICY_ERROR_MESSAGES.put(UNBLOCK_KEY, "Endpoint requires an unblock key for access.");
+    }
+
+    @Inject
+    private SettingsServiceBean settingsService;
+
+    @Inject
+    private PasswordValidatorServiceBean passwordValidatorService;
+
+    @Context
+    private ResourceInfo resourceInfo;
+
+    @Context
+    private HttpServletRequest httpServletRequest;
+
+    private String policy = null;
+
+    private JsonObject errorJson = null;
+
+    private List<Pattern> blockedApiEndpointPatterns = new ArrayList<>();
+
+    private String key;
+
+    // If any of the JvmSettings are not set, revert to checking the db settings on
+    // every call
+    private boolean checkSettings = false;
+
+    private String endpointList = null;
+
+    @PostConstruct
+    public void init() {
+        // Check JvmSettings first for BlockedApiPolicy
+        policy = JvmSettings.API_BLOCKED_POLICY.lookupOptional().orElse(settingsService.getValueForKey(SettingsServiceBean.Key.BlockedApiPolicy, DROP));
+
+        if(!(DROP.equals(policy) || LOCALHOST_ONLY.equals(policy) || UNBLOCK_KEY.equals(policy))) {
+            logger.severe("Invalid BlockedApiPolicy setting: " + policy + ". Using policy 'drop'");
+            policy = DROP;
+        }
+        Optional<String> jvmEndpointList = JvmSettings.API_BLOCKED_ENDPOINTS.lookupOptional();
+        if (!jvmEndpointList.isPresent()) {
+            checkSettings = true;
+        }
+        endpointList = jvmEndpointList
+                .orElse(settingsService.getValueForKey(SettingsServiceBean.Key.BlockedApiEndpoints, ""));
+        logger.info("Using policy: " + policy + " to block API endpoints: " + endpointList);
+        if (!(endpointList.contains("admin") && endpointList.contains("builtin-users"))) {
+            logger.warning(
+                    "Not blocking admin and builtin-user endpoints is a security issue unless you are blocking them in an external proxy.");
+        }
+        if (UNBLOCK_KEY.equals(policy)) {
+            Optional<String> jvmKey = JvmSettings.API_BLOCKED_KEY.lookupOptional();
+            if (!jvmKey.isPresent()) {
+                checkSettings = true;
+            }
+            key = jvmKey.orElse(settingsService.getValueForKey(SettingsServiceBean.Key.BlockedApiKey));
+            if (StringUtil.isBlank(key)) {
+                logger.severe(
+                        "Using unblock-key policy and no unblock key found in JvmSettings.API_BLOCKED_KEY or SettingsService.BlockedApiKey");
+            } else if (passwordValidatorService.validate(key).size() == 0) {
+                logger.warning("Weak unblock key detected. Please use a stronger key for better security.");
+            }
+        }
+        updateBlockedPoints(endpointList);
+        if(checkSettings) {
+            logger.warning("Not all required dataverse.api.blocked.* settings not found. Dataverse use deprecated db settings and check for updates on every API call.");
+        }
+
+    }
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+
+        Method method = resourceInfo.getResourceMethod();
+        Class<?> clazz = resourceInfo.getResourceClass();
+
+        String classPath = "";
+        String methodPath = "";
+
+        if (clazz.isAnnotationPresent(Path.class)) {
+            classPath = clazz.getAnnotation(Path.class).value();
+        }
+
+        if (method.isAnnotationPresent(Path.class)) {
+            methodPath = method.getAnnotation(Path.class).value();
+        }
+
+        if (checkSettings) {
+            // Backward compatibility, e.g. for setup scripts, dev environments where
+            // dynamic update from the db settings is expected
+            policy = settingsService.getValueForKey(SettingsServiceBean.Key.BlockedApiPolicy,
+                    JvmSettings.API_BLOCKED_POLICY.lookupOptional().orElse(DROP));
+            String newEndpointList = settingsService.getValueForKey(SettingsServiceBean.Key.BlockedApiEndpoints,
+                    JvmSettings.API_BLOCKED_ENDPOINTS.lookupOptional().orElse(""));
+            if (!endpointList.equals(newEndpointList)) {
+                endpointList = newEndpointList;
+                updateBlockedPoints(endpointList);
+            }
+            if (policy.equals(UNBLOCK_KEY)) {
+                key = settingsService.getValueForKey(SettingsServiceBean.Key.BlockedApiKey,
+                        JvmSettings.API_BLOCKED_KEY.lookupOptional().orElse(""));
+                if (StringUtil.isBlank(key)) {
+                    logger.severe(
+                            "Using unblock-key policy and no unblock key found in JvmSettings.API_BLOCKED_KEY or SettingsService.BlockedApiKey");
+                }
+            }
+        }
+        String fullPath = (classPath + "/" + methodPath).replaceAll("//", "/");
+        logger.fine("Full path is " + fullPath);
+
+        boolean isBlockableEndpoint = false;
+        for (Pattern blockedEndpointPattern : blockedApiEndpointPatterns) {
+            if (blockedEndpointPattern.matcher(fullPath).matches()) {
+                isBlockableEndpoint = true;
+                break;
+            }
+        }
+        if (!isBlockableEndpoint) {
+            return;
+        }
+        // Blocakble endpoint - now check policy
+        if (isBlocked(policy, requestContext)) {
+            logger.fine("Blocked " + fullPath);
+            requestContext.abortWith(Response.status(Response.Status.SERVICE_UNAVAILABLE).entity(errorJson)
+                    .type(jakarta.ws.rs.core.MediaType.APPLICATION_JSON).build());
+            return;
+        }
+    }
+
+    private boolean isBlocked(String policy, ContainerRequestContext requestContext) {
+        switch (policy) {
+        case DROP:
+            return true;
+        case LOCALHOST_ONLY:
+            if (httpServletRequest == null) {
+                logger.warning("Unable to obtain HttpServletRequest from ContainerRequestContext");
+                // Handle the case where HttpServletRequest is not available
+                return true;
+            }
+            IpAddress origin = new DataverseRequest(null, httpServletRequest).getSourceAddress();
+            if (!origin.isLocalhost()) {
+                return true;
+            }
+            break;
+        case UNBLOCK_KEY:
+            String providedKey = requestContext.getHeaderString(UNBLOCK_KEY_HEADER);
+            if (StringUtil.isBlank(providedKey)) {
+                providedKey = requestContext.getUriInfo().getQueryParameters().getFirst(UNBLOCK_KEY_QUERYPARAM);
+            }
+            // Must have a non-blank key defined and the query param must match it
+            if (StringUtil.isNotBlank(key) && key.equals(providedKey)) {
+                return false;
+            }
+            // Otherwise we have a blocked endpoint and the key doesn't work (not set or
+            // doesn't match what's sent)
+            return true;
+        }
+        return false;
+    }
+
+    private void updateBlockedPoints(String endpointList) {
+        blockedApiEndpointPatterns.clear();
+
+        String currentErrorMessage = POLICY_ERROR_MESSAGES.getOrDefault(policy,
+                "Endpoint blocked. Please contact the dataverse administrator.");
+
+        errorJson = Json.createObjectBuilder().add("status", "error").add("message", currentErrorMessage).build();
+
+        for (String endpoint : endpointList.split(",")) {
+            String endpointPrefix = canonicalize(endpoint);
+            if (!endpointPrefix.isEmpty()) {
+                logger.log(Level.INFO, "Blocking API endpoint: {0}", endpointPrefix);
+                blockedApiEndpointPatterns.add(Pattern.compile(convertPathToRegex(endpointPrefix)));
+            }
+        }
+    }
+
+    private String convertPathToRegex(String path) {
+        return "^" + path.replaceAll("\\{[^}]+\\}", "[^/]+").replace("/", "\\/") + "(\\/.*)?$";
+    }
+
+    /**
+     * Creates a canonical representation of {@code in}: trimmed spaces and slashes
+     * 
+     * @param in the raw string
+     * @return {@code in} with no trailing and leading spaces and slashes.
+     */
+    private String canonicalize(String in) {
+        in = in.trim();
+        if (in.startsWith("/")) {
+            in = in.substring(1);
+        }
+        if (in.endsWith("/")) {
+            in = in.substring(0, in.length() - 1);
+        }
+        return in;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/CustomFieldMap.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/CustomFieldMap.java
index fc96215cef0..2bea36a6047 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/imports/CustomFieldMap.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/CustomFieldMap.java
@@ -7,14 +7,14 @@
 package edu.harvard.iq.dataverse.api.imports;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/CustomFieldServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/CustomFieldServiceBean.java
index e7b8e71495b..240baeefcff 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/imports/CustomFieldServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/CustomFieldServiceBean.java
@@ -5,9 +5,9 @@
  */
 package edu.harvard.iq.dataverse.api.imports;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportDDIServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportDDIServiceBean.java
index 178a23b6f2f..fe8599150e7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportDDIServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportDDIServiceBean.java
@@ -5,12 +5,24 @@
 import edu.harvard.iq.dataverse.DatasetFieldType;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
-import edu.harvard.iq.dataverse.api.dto.*;  
+import edu.harvard.iq.dataverse.api.dto.LicenseDTO;
 import edu.harvard.iq.dataverse.api.dto.FieldDTO;
 import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO;
+import edu.harvard.iq.dataverse.api.dto.DatasetDTO;
+import edu.harvard.iq.dataverse.api.dto.DatasetVersionDTO;
+import edu.harvard.iq.dataverse.api.dto.FileMetadataDTO;
+import edu.harvard.iq.dataverse.api.dto.DataFileDTO;
+import edu.harvard.iq.dataverse.api.dto.DataTableDTO;
+
 import edu.harvard.iq.dataverse.api.imports.ImportUtil.ImportType;
 import static edu.harvard.iq.dataverse.export.ddi.DdiExportUtil.NOTE_TYPE_CONTENTTYPE;
+import static edu.harvard.iq.dataverse.export.ddi.DdiExportUtil.NOTE_TYPE_TERMS_OF_ACCESS;
+
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -20,14 +32,18 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLInputFactory;
-import org.apache.commons.lang.StringUtils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  *
@@ -99,12 +115,15 @@ public class ImportDDIServiceBean {
    
     @EJB DatasetFieldServiceBean datasetFieldService;
     
+    @EJB ImportGenericServiceBean importGenericService;
+
+    @EJB LicenseServiceBean licenseService;
+    
     
     // TODO: stop passing the xml source as a string; (it could be huge!) -- L.A. 4.5
     // TODO: what L.A. Said.
     public DatasetDTO doImport(ImportType importType, String xmlToParse) throws XMLStreamException, ImportException {
-        xmlInputFactory = javax.xml.stream.XMLInputFactory.newInstance();
-        xmlInputFactory.setProperty("javax.xml.stream.isCoalescing", java.lang.Boolean.TRUE); DatasetDTO datasetDTO = this.initializeDataset();
+        DatasetDTO datasetDTO = this.initializeDataset();
 
         // Read docDescr and studyDesc into DTO objects.
         // TODO: the fileMap is likely not needed. 
@@ -129,11 +148,16 @@ public Map<String, String> mapDDI(ImportType importType, String xmlToParse, Data
         Map<String, String> filesMap = new HashMap<>();
         StringReader reader = new StringReader(xmlToParse);
         XMLStreamReader xmlr = null;
-        XMLInputFactory xmlFactory = javax.xml.stream.XMLInputFactory.newInstance();
-        xmlFactory.setProperty("javax.xml.stream.isCoalescing", true); // allows the parsing of a CDATA segment into a single event
+        XMLInputFactory xmlFactory = XmlUtil.getSecureXMLInputFactory();
         xmlr = xmlFactory.createXMLStreamReader(reader);
         processDDI(importType, xmlr, datasetDTO, filesMap);
-
+        if (xmlr != null) {
+            try {
+                xmlr.close();
+            } catch (XMLStreamException e) {
+                logger.warning("XMLStreamException closing XMLStreamReader in mapDDI()");
+            }
+        }
         return filesMap;
     }
    
@@ -167,11 +191,19 @@ public Map<String, String> mapDDI(ImportType importType, File ddiFile,  DatasetD
     }
     
     private void processDDI(ImportType importType, XMLStreamReader xmlr, DatasetDTO datasetDTO, Map<String, String> filesMap) throws XMLStreamException, ImportException {
-       
         // make sure we have a codeBook
         //while ( xmlr.next() == XMLStreamConstants.COMMENT ); // skip pre root comments
-        xmlr.nextTag();
-        xmlr.require(XMLStreamConstants.START_ELEMENT, null, "codeBook");
+        try {
+            xmlr.nextTag();
+            xmlr.require(XMLStreamConstants.START_ELEMENT, null, "codeBook");
+        } catch( XMLStreamException e) {
+            throw new XMLStreamException("It doesn't start with the XML element <codeBook>");
+        }
+        
+        //Include metadataLanguage from an xml:lang attribute if present (null==undefined)
+        String metadataLanguage= xmlr.getAttributeValue("http://www.w3.org/XML/1998/namespace", "lang");
+        logger.fine("Found metadatalanguage in ddi xml: " + metadataLanguage);
+        datasetDTO.setMetadataLanguage(metadataLanguage);
 
         // Some DDIs provide an ID in the <codeBook> section.
         // We are going to treat it as just another otherId.
@@ -197,7 +229,7 @@ private void processDDI(ImportType importType, XMLStreamReader xmlr, DatasetDTO
                 // study description section. we'll use the one we found in 
                 // the codeBook entry:
                 FieldDTO otherIdValue = FieldDTO.createPrimitiveFieldDTO("otherIdValue", codeBookLevelId);
-                FieldDTO otherId = FieldDTO.createCompoundFieldDTO("otherId", otherIdValue);
+                FieldDTO otherId = FieldDTO.createMultipleCompoundFieldDTO("otherId", otherIdValue);
                 citationBlock.getFields().add(otherId);
                 
             }
@@ -265,18 +297,18 @@ private void processCodeBook(ImportType importType, XMLStreamReader xmlr, Datase
             }
         }
     }
-       
+
   private void processDocDscr(XMLStreamReader xmlr, DatasetDTO datasetDTO) throws XMLStreamException {
         for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
             if (event == XMLStreamConstants.START_ELEMENT) {
-                
+
                    if (xmlr.getLocalName().equals("IDNo") && StringUtil.isEmpty(datasetDTO.getIdentifier()) ) {
                     // this will set a StudyId if it has not yet been set; it will get overridden by a metadata
                     // id in the StudyDscr section, if one exists
                     if ( AGENCY_HANDLE.equals( xmlr.getAttributeValue(null, "agency") ) ) {
-                        parseStudyIdHandle( parseText(xmlr), datasetDTO );
-                    } 
-                // EMK TODO: we need to save this somewhere when we add harvesting infrastructure 
+                        importGenericService.reassignIdentifierAsGlobalId( parseText(xmlr), datasetDTO );
+                    }
+                // EMK TODO: we need to save this somewhere when we add harvesting infrastructure
                 } /*else if ( xmlr.getLocalName().equals("holdings") && StringUtil.isEmpty(datasetDTO..getHarvestHoldings()) ) {
                     metadata.setHarvestHoldings( xmlr.getAttributeValue(null, "URI") );
                 }*/
@@ -284,7 +316,7 @@ private void processDocDscr(XMLStreamReader xmlr, DatasetDTO datasetDTO) throws
                 if (xmlr.getLocalName().equals("docDscr")) return;
             }
         }
-    } 
+    }
      private String parseText(XMLStreamReader xmlr) throws XMLStreamException {
         return parseText(xmlr,true);
      }
@@ -344,7 +376,8 @@ private void processStdyDscr(ImportType importType, XMLStreamReader xmlr, Datase
                 else if (xmlr.getLocalName().equals("stdyInfo")) processStdyInfo(xmlr, datasetDTO.getDatasetVersion());
                 else if (xmlr.getLocalName().equals("method")) processMethod(xmlr, datasetDTO.getDatasetVersion());
                 
-                else if (xmlr.getLocalName().equals("dataAccs")) processDataAccs(xmlr, datasetDTO.getDatasetVersion()); 
+                else if (xmlr.getLocalName().equals("dataAccs")) processDataAccs(xmlr, datasetDTO.getDatasetVersion());
+                else if (xmlr.getLocalName().equals("notes")) processStdyNotes(xmlr, datasetDTO.getDatasetVersion());
                   
              else if (xmlr.getLocalName().equals("othrStdyMat")) processOthrStdyMat(xmlr, datasetDTO.getDatasetVersion());
                 else if (xmlr.getLocalName().equals("notes")) processNotes(xmlr, datasetDTO.getDatasetVersion());
@@ -390,41 +423,12 @@ else if (xmlr.getLocalName().equals("relStdy")) {
                     relStudy.add(parseText(xmlr, "relStdy"));
                     getCitation(dvDTO).addField(FieldDTO.createMultiplePrimitiveFieldDTO(DatasetFieldConstant.relatedDatasets, relStudy));
                  }  else if (xmlr.getLocalName().equals("relPubl")) {
-                    HashSet<FieldDTO> set = new HashSet<>();
-
-                    // call new parse text logic
-                    Object rpFromDDI = parseTextNew(xmlr, "relPubl");
-                    if (rpFromDDI instanceof Map) {
-                        Map<String, String> rpMap = (Map<String, String>) rpFromDDI;
-                        addToSet(set, DatasetFieldConstant.publicationCitation, rpMap.get("text"));
-                        addToSet(set, DatasetFieldConstant.publicationIDNumber,  rpMap.get("idNumber"));
-                        addToSet(set, DatasetFieldConstant.publicationURL,  rpMap.get("url"));
-                        if (rpMap.get("idType")!=null) {
-                            set.add(FieldDTO.createVocabFieldDTO(DatasetFieldConstant.publicationIDType, rpMap.get("idType").toLowerCase()));
-                        }
-                   //    rp.setText((String) rpMap.get("text"));
-                        //   rp.setIdType((String) rpMap.get("idType"));
-                        //   rp.setIdNumber((String) rpMap.get("idNumber"));
-                        //   rp.setUrl((String) rpMap.get("url"));
-                        // TODO: ask about where/whether we want to save this 
-                        //  if (!replicationForFound && rpMap.get("replicationData") != null) {
-                        //    rp.setReplicationData(true);
-                        ///    replicationForFound = true;
-                        //  }
-                    } else {
-                        addToSet(set, DatasetFieldConstant.publicationCitation, (String) rpFromDDI);
-                        //   rp.setText( (String) rpFromDDI );
-                    }
-                    publications.add(set);
-
-
-                } else if (xmlr.getLocalName().equals("otherRefs")) {
-
+                        processRelPubl(xmlr, dvDTO, publications);
+                 } else if (xmlr.getLocalName().equals("othRefs")) {
                     List<String> otherRefs = new ArrayList<>();
-                    otherRefs.add(parseText(xmlr, "otherRefs"));
+                    otherRefs.add(parseText(xmlr, "othRefs"));
                     getCitation(dvDTO).addField(FieldDTO.createMultiplePrimitiveFieldDTO(DatasetFieldConstant.otherReferences, otherRefs));
-
-                }
+                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (publications.size()>0) {
                     getCitation(dvDTO).addField(FieldDTO.createMultipleCompoundFieldDTO(DatasetFieldConstant.publication, publications));
@@ -435,6 +439,49 @@ else if (xmlr.getLocalName().equals("relStdy")) {
             }
         }
     }
+    private void processRelPubl(XMLStreamReader xmlr, DatasetVersionDTO dvDTO,  List<HashSet<FieldDTO>> publications) throws XMLStreamException {
+        HashSet<FieldDTO> set = new HashSet<>();
+        for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
+            if (event == XMLStreamConstants.START_ELEMENT) {
+                if (xmlr.getLocalName().equals("citation")) {
+                    for (int event2 = xmlr.next(); event2 != XMLStreamConstants.END_DOCUMENT; event2 = xmlr.next()) {
+                        if (event2 == XMLStreamConstants.START_ELEMENT) {
+                            if (xmlr.getLocalName().equals("titlStmt")) {
+                                int event3 = xmlr.next();
+                                if (event3 == XMLStreamConstants.START_ELEMENT) {
+                                    if (xmlr.getLocalName().equals("IDNo")) {
+                                        set.add(FieldDTO.createVocabFieldDTO(DatasetFieldConstant.publicationIDType, xmlr.getAttributeValue(null, "agency")));
+                                        addToSet(set, DatasetFieldConstant.publicationIDNumber, parseText(xmlr));
+                                    }
+                                }
+                            } else if (xmlr.getLocalName().equals("biblCit")) {
+                                if (event2 == XMLStreamConstants.START_ELEMENT) {
+                                    if (xmlr.getLocalName().equals("biblCit")) {
+                                        addToSet(set, DatasetFieldConstant.publicationCitation, parseText(xmlr));
+                                    }
+                                }
+                            }
+                        } else if (event2 == XMLStreamConstants.END_ELEMENT) {
+                            if (xmlr.getLocalName().equals("citation")) {
+                                break;
+                            }
+                        }
+
+                    }
+                } else if (xmlr.getLocalName().equals("ExtLink")) {
+                    addToSet(set, DatasetFieldConstant.publicationURL, xmlr.getAttributeValue(null, "URI"));
+                }
+            } else if (event == XMLStreamConstants.END_ELEMENT) {
+                if (xmlr.getLocalName().equals("relPubl")) {
+                    if (set.size() > 0) {
+                        publications.add(set);
+                    }
+                    return;
+                }
+            }
+        }
+    }
+
      private void processCitation(ImportType importType, XMLStreamReader xmlr, DatasetDTO datasetDTO) throws XMLStreamException, ImportException {
         DatasetVersionDTO dvDTO = datasetDTO.getDatasetVersion();
         MetadataBlockDTO citation=datasetDTO.getDatasetVersion().getMetadataBlocks().get("citation");
@@ -620,6 +667,52 @@ private void processNotes (XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throws
             this.addNote(formattedNotes, dvDTO);
         }
     }
+    private void processStdyNotes(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throws XMLStreamException {
+        FieldDTO notesText = null;
+        // Add notes, if they exist
+        String attrVal = parseText(xmlr, "notes");
+        if ((attrVal != null) && (!attrVal.isEmpty())){
+            notesText  = FieldDTO.createPrimitiveFieldDTO("datasetLevelErrorNotes", attrVal);
+            getSocialScience(dvDTO).addField(notesText);
+        }
+    }
+
+
+    private void processNotesSocialScience(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throws XMLStreamException {
+        //String formattedNotes = this.formatNotesfromXML(xmlr);
+        if (xmlr==null){
+            throw new NullPointerException("XMLStreamReader xmlr cannot be null");
+        }
+        FieldDTO notesSubject = null;
+        String attrVal;
+
+        // Check for "subject"
+        attrVal = xmlr.getAttributeValue(null, "subject");
+        if (attrVal != null){
+            notesSubject = FieldDTO.createPrimitiveFieldDTO("socialScienceNotesSubject", attrVal);
+        }
+
+        FieldDTO notesType = null;
+        // Check for "type"
+        attrVal = xmlr.getAttributeValue(null, "type");
+        if (attrVal != null){
+            notesType = FieldDTO.createPrimitiveFieldDTO("socialScienceNotesType", attrVal);
+        }
+
+        FieldDTO notesText = null;
+        // Add notes, if they exist
+        attrVal = parseText(xmlr, "notes");
+        if ((attrVal != null) && (!attrVal.isEmpty())){
+            notesText  = FieldDTO.createPrimitiveFieldDTO("socialScienceNotesText", attrVal);
+        }
+
+        if (notesSubject != null || notesType != null || notesText != null ){
+
+            //this.addNoteSocialScience(formattedNotes, dvDTO);
+
+            getSocialScience(dvDTO).addField(FieldDTO.createCompoundFieldDTO("socialScienceNotes", notesSubject, notesType, notesText ));
+        }
+    }
     
     private void addNote(String noteText, DatasetVersionDTO dvDTO ) {
         MetadataBlockDTO citation = getCitation(dvDTO);
@@ -640,12 +733,17 @@ private void processSumDscr(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throw
         List<String> kindOfData = new ArrayList<>();
         List<HashSet<FieldDTO>> geoBoundBox = new ArrayList<>();
         List<HashSet<FieldDTO>> geoCoverages = new ArrayList<>();
+        List<FieldDTO> timePeriod = new ArrayList<>();
+        List<FieldDTO> dateOfCollection = new ArrayList<>();
         FieldDTO timePeriodStart = null;
         FieldDTO timePeriodEnd = null;
         FieldDTO dateOfCollectionStart = null;
         FieldDTO dateOfCollectionEnd = null;
 
+        HashSet<FieldDTO> geoCoverageSet = null;
+        String otherGeographicCoverage = null;
         for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
+
             if (event == XMLStreamConstants.START_ELEMENT) {
                 if (xmlr.getLocalName().equals("timePrd")) {
                     
@@ -654,6 +752,8 @@ private void processSumDscr(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throw
                         timePeriodStart = FieldDTO.createPrimitiveFieldDTO("timePeriodCoveredStart", parseDate(xmlr, "timePrd"));
                     } else if (EVENT_END.equals(eventAttr)) {
                         timePeriodEnd = FieldDTO.createPrimitiveFieldDTO("timePeriodCoveredEnd", parseDate(xmlr, "timePrd"));
+                        timePeriod.add(FieldDTO.createMultipleCompoundFieldDTO("timePeriodCovered", timePeriodStart, timePeriodEnd));
+
                     }                   
                 } else if (xmlr.getLocalName().equals("collDate")) {
                     String eventAttr = xmlr.getAttributeValue(null, "event");
@@ -661,16 +761,32 @@ private void processSumDscr(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throw
                         dateOfCollectionStart = FieldDTO.createPrimitiveFieldDTO("dateOfCollectionStart", parseDate(xmlr, "collDate"));
                     } else if (EVENT_END.equals(eventAttr)) {
                         dateOfCollectionEnd = FieldDTO.createPrimitiveFieldDTO("dateOfCollectionEnd", parseDate(xmlr, "collDate"));
+                        dateOfCollection.add(FieldDTO.createMultipleCompoundFieldDTO("dateOfCollection", dateOfCollectionStart, dateOfCollectionEnd ));
                     }
                    
                 } else if (xmlr.getLocalName().equals("nation")) {
-                     HashSet<FieldDTO> set = new HashSet<>();
-                    set.add(FieldDTO.createVocabFieldDTO("country", parseText(xmlr)));
-                    geoCoverages.add(set);
+                    if (otherGeographicCoverage != null && !otherGeographicCoverage.equals("")) {
+                        geoCoverageSet.add(FieldDTO.createPrimitiveFieldDTO("otherGeographicCoverage", otherGeographicCoverage));
+                        otherGeographicCoverage = null;
+                    }
+                    if (geoCoverageSet != null && geoCoverageSet.size() > 0) {
+                        geoCoverages.add(geoCoverageSet);
+                    }
+                    geoCoverageSet = new HashSet<>();
+                    //HashSet<FieldDTO> set = new HashSet<>();
+                    //set.add(FieldDTO.createVocabFieldDTO("country", parseText(xmlr)));
+                    geoCoverageSet.add(FieldDTO.createVocabFieldDTO("country", parseText(xmlr)));
+
                 } else if (xmlr.getLocalName().equals("geogCover")) {
-                    HashSet<FieldDTO> set = new HashSet<>();
-                    set.add(FieldDTO.createPrimitiveFieldDTO("otherGeographicCoverage", parseText(xmlr)));
-                    geoCoverages.add(set);
+                    if (geoCoverageSet == null) {
+                        geoCoverageSet = new HashSet<>();
+                    }
+                    if (otherGeographicCoverage != null) {
+                        otherGeographicCoverage = otherGeographicCoverage + "; " + parseText(xmlr);
+                    } else {
+                        otherGeographicCoverage = parseText(xmlr);
+                    }
+
                 } else if (xmlr.getLocalName().equals("geogUnit")) {
                     geoUnit.add(parseText(xmlr));
                 } else if (xmlr.getLocalName().equals("geoBndBox")) {
@@ -684,11 +800,11 @@ private void processSumDscr(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throw
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (xmlr.getLocalName().equals("sumDscr")) {
-                    if (timePeriodStart!=null || timePeriodEnd!=null) {
-                        getCitation(dvDTO).addField(FieldDTO.createMultipleCompoundFieldDTO("timePeriodCovered", timePeriodStart, timePeriodEnd));
+                    for  (FieldDTO time : timePeriod) {
+                        getCitation(dvDTO).addField( time);
                     }
-                    if (dateOfCollectionStart!=null || dateOfCollectionEnd!=null) {
-                        getCitation(dvDTO).addField(FieldDTO.createMultipleCompoundFieldDTO("dateOfCollection", dateOfCollectionStart, dateOfCollectionEnd));
+                    for (FieldDTO date : dateOfCollection) {
+                        getCitation(dvDTO).addField(date);
                     }
                   
                     if (geoUnit.size() > 0) {
@@ -703,8 +819,14 @@ private void processSumDscr(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throw
                     if (kindOfData.size() > 0) {
                         getCitation(dvDTO).addField(FieldDTO.createMultiplePrimitiveFieldDTO("kindOfData", kindOfData));
                     }
-                    if (geoCoverages.size()>0) {
-                        getGeospatial(dvDTO).addField(FieldDTO.createMultipleCompoundFieldDTO("geographicCoverage", geoCoverages));
+                    if (otherGeographicCoverage != null && !otherGeographicCoverage.equals("") ) {
+                        geoCoverageSet.add(FieldDTO.createPrimitiveFieldDTO("otherGeographicCoverage", otherGeographicCoverage));
+                    }
+                    if (geoCoverageSet != null && geoCoverageSet.size() > 0) {
+                        geoCoverages.add(geoCoverageSet);
+                    }
+                    if (geoCoverages.size() > 0) {
+                        getGeospatial(dvDTO).addField(FieldDTO.createMultipleCompoundFieldDTO(DatasetFieldConstant.geographicCoverage, geoCoverages));
                     }
                     if (geoBoundBox.size()>0) {
                         getGeospatial(dvDTO).addField(FieldDTO.createMultipleCompoundFieldDTO("geographicBoundingBox", geoBoundBox));
@@ -715,8 +837,6 @@ private void processSumDscr(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throw
         }
     }
     
-    
-    
  private HashSet<FieldDTO> processGeoBndBox(XMLStreamReader xmlr) throws XMLStreamException {
        HashSet<FieldDTO> set = new HashSet<>();
 
@@ -727,9 +847,9 @@ private HashSet<FieldDTO> processGeoBndBox(XMLStreamReader xmlr) throws XMLStrea
                 } else if (xmlr.getLocalName().equals("eastBL")) {
                      addToSet(set,"eastLongitude", parseText(xmlr));
                } else if (xmlr.getLocalName().equals("southBL")) {
-                     addToSet(set,"southLongitude", parseText(xmlr));
+                     addToSet(set,"southLatitude", parseText(xmlr));
                } else if (xmlr.getLocalName().equals("northBL")) {
-                      addToSet(set,"northLongitude", parseText(xmlr));
+                      addToSet(set,"northLatitude", parseText(xmlr));
               }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (xmlr.getLocalName().equals("geoBndBox")) break; 
@@ -748,9 +868,7 @@ private void processMethod(XMLStreamReader xmlr, DatasetVersionDTO dvDTO ) throw
                     if (NOTE_TYPE_EXTENDED_METADATA.equalsIgnoreCase(noteType) ) {
                         processCustomField(xmlr, dvDTO);                       
                     } else {
-                        processNotes(xmlr, dvDTO);
-//                        addNote("Subject: Study Level Error Note, Notes: "+ parseText( xmlr,"notes" ) +";", dvDTO);
-                       
+                        processNotesSocialScience(xmlr, dvDTO);
                     }
                 } else if (xmlr.getLocalName().equals("anlyInfo")) {
                     processAnlyInfo(xmlr, getSocialScience(dvDTO));
@@ -902,7 +1020,7 @@ private void processAnlyInfo(XMLStreamReader xmlr, MetadataBlockDTO socialScienc
     private void processDataColl(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throws XMLStreamException {
         MetadataBlockDTO socialScience =getSocialScience(dvDTO);
         
-        String collMode = "";
+        List<String> collMode = new ArrayList<>();
         String timeMeth = "";
         String weight = "";
         String dataCollector = "";
@@ -940,16 +1058,12 @@ private void processDataColl(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) thro
                     //devationsFromSamplingDesign
                 } else if (xmlr.getLocalName().equals("deviat")) {
                    socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("deviationsFromSampleDesign", parseText( xmlr, "deviat" )));
-                 // collectionMode
+                // collectionMode - allows multiple values, as of 5.10
                 } else if (xmlr.getLocalName().equals("collMode")) {
                     String thisValue = parseText( xmlr, "collMode" );
                     if (!StringUtil.isEmpty(thisValue)) {
-                        if (!"".equals(collMode)) {
-                            collMode = collMode.concat(", ");
-                        }
-                        collMode = collMode.concat(thisValue);
+                        collMode.add(thisValue);
                     }
-                  //socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("collectionMode", parseText( xmlr, "collMode" )));                      
                 //researchInstrument
                 } else if (xmlr.getLocalName().equals("resInstru")) {
                    socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("researchInstrument", parseText( xmlr, "resInstru" )));
@@ -959,8 +1073,8 @@ private void processDataColl(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) thro
                      socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("dataCollectionSituation", parseText( xmlr, "collSitu" )));
                 } else if (xmlr.getLocalName().equals("actMin")) {
                       socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("actionsToMinimizeLoss", parseText( xmlr, "actMin" )));
-                } else if (xmlr.getLocalName().equals("ConOps")) {
-                       socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("controlOperations", parseText( xmlr, "ConOps" )));
+                } else if (xmlr.getLocalName().equals("conOps")) {
+                       socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("controlOperations", parseText( xmlr, "conOps" )));
                 } else if (xmlr.getLocalName().equals("weight")) {
                     String thisValue = parseText( xmlr, "weight" );
                     if (!StringUtil.isEmpty(thisValue)) {
@@ -972,14 +1086,16 @@ private void processDataColl(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) thro
                     //socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("weighting", parseText( xmlr, "weight" )));
                 } else if (xmlr.getLocalName().equals("cleanOps")) {
                        socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("cleaningOperations", parseText( xmlr, "cleanOps" )));
+                } else if (xmlr.getLocalName().equals("collectorTraining")) {
+                        socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("collectorTraining", parseText( xmlr, "collectorTraining" )));
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (xmlr.getLocalName().equals("dataColl")) {
                     if (!StringUtil.isEmpty(timeMeth)) {
                         socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("timeMethod", timeMeth));
                     }
-                    if (!StringUtil.isEmpty(collMode)) {
-                        socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("collectionMode", collMode));
+                    if (collMode.size() > 0) {
+                        socialScience.getFields().add(FieldDTO.createMultiplePrimitiveFieldDTO("collectionMode", collMode));
                     }
                     if (!StringUtil.isEmpty(weight)) {
                         socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("weighting", weight));
@@ -987,6 +1103,7 @@ private void processDataColl(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) thro
                     if (!StringUtil.isEmpty(dataCollector)) {
                         socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("dataCollector", dataCollector));
                     }
+
                     return;
                 }
             }
@@ -1082,7 +1199,28 @@ private void processDataAccs(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) thro
                     String noteType = xmlr.getAttributeValue(null, "type");
                     if (NOTE_TYPE_TERMS_OF_USE.equalsIgnoreCase(noteType) ) {
                         if ( LEVEL_DV.equalsIgnoreCase(xmlr.getAttributeValue(null, "level"))) {
-                            dvDTO.setTermsOfUse(parseText(xmlr, "notes"));
+                            String termsOfUseStr = parseText(xmlr, "notes").trim();
+                            Pattern pattern = Pattern.compile("<a href=\"(.*)\">(.*)</a>", Pattern.CASE_INSENSITIVE);
+                            Matcher matcher = pattern.matcher(termsOfUseStr);
+                            boolean matchFound = matcher.find();
+                            if (matchFound) {
+                                String uri = matcher.group(1);
+                                String license = matcher.group(2);
+                                License lic = licenseService.getByNameOrUri(license);
+                                if (lic != null) {
+                                    LicenseDTO licenseDTO = new LicenseDTO();
+                                    licenseDTO.setName(license);
+                                    licenseDTO.setUri(uri);
+                                    dvDTO.setLicense(licenseDTO);
+                                }
+
+                            } else {
+                                dvDTO.setTermsOfUse(termsOfUseStr);
+                            }
+                        }
+                    } else  if (NOTE_TYPE_TERMS_OF_ACCESS.equalsIgnoreCase(noteType) ) {
+                        if (LEVEL_DV.equalsIgnoreCase(xmlr.getAttributeValue(null, "level"))) {
+                            dvDTO.setTermsOfAccess(parseText(xmlr, "notes"));
                         }
                     } else {
                         processNotes(xmlr, dvDTO);
@@ -1163,24 +1301,26 @@ private void parseVersionNumber(DatasetVersionDTO dvDTO, String versionNumber) {
 
     }
    
-   private void processSerStmt(XMLStreamReader xmlr, MetadataBlockDTO citation) throws XMLStreamException {
-          FieldDTO seriesName=null;
-          FieldDTO seriesInformation=null;
-          for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
+    private void processSerStmt(XMLStreamReader xmlr, MetadataBlockDTO citation) throws XMLStreamException {
+        FieldDTO seriesInformation = null;
+        FieldDTO seriesName = null;
+        for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {            
             if (event == XMLStreamConstants.START_ELEMENT) {
+                if (xmlr.getLocalName().equals("serInfo")) {
+                     seriesInformation = FieldDTO.createPrimitiveFieldDTO("seriesInformation", parseText(xmlr));
+                }
                 if (xmlr.getLocalName().equals("serName")) {
-                   seriesName = FieldDTO.createPrimitiveFieldDTO("seriesName", parseText(xmlr));
-                  
-                } else if (xmlr.getLocalName().equals("serInfo")) {
-                    seriesInformation=FieldDTO.createPrimitiveFieldDTO("seriesInformation", parseText(xmlr) );
+                     seriesName = FieldDTO.createPrimitiveFieldDTO("seriesName", parseText(xmlr));
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (xmlr.getLocalName().equals("serStmt")) {
-                    citation.getFields().add(FieldDTO.createCompoundFieldDTO("series",seriesName,seriesInformation ));
+                    if (seriesInformation != null || seriesName != null) {
+                        citation.addField(FieldDTO.createMultipleCompoundFieldDTO("series", seriesName, seriesInformation ));
+                    }
                     return;
                 }
             }
-        }
+        }     
     }
 
     private void processDistStmt(XMLStreamReader xmlr, MetadataBlockDTO citation) throws XMLStreamException {
@@ -1189,15 +1329,16 @@ private void processDistStmt(XMLStreamReader xmlr, MetadataBlockDTO citation) th
         for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
             if (event == XMLStreamConstants.START_ELEMENT) {
                 if (xmlr.getLocalName().equals("distrbtr")) {
-                    HashSet<FieldDTO> set = new HashSet<>();
-                    addToSet(set, "distributorAbbreviation", xmlr.getAttributeValue(null, "abbr"));
-                    addToSet(set, "distributorAffiliation", xmlr.getAttributeValue(null, "affiliation"));
-
-                    Map<String, String> distDetails = parseCompoundText(xmlr, "distrbtr");
-                    addToSet(set, "distributorName", distDetails.get("name"));
-                    addToSet(set, "distributorURL", distDetails.get("url"));
-                    addToSet(set, "distributorLogoURL", distDetails.get("logo"));
-                    distributors.add(set);
+                    String source = xmlr.getAttributeValue(null, "source");
+                    if (source == null || !source.equals("archive")) {
+                        HashSet<FieldDTO> set = new HashSet<>();
+                        addToSet(set, "distributorAbbreviation", xmlr.getAttributeValue(null, "abbr"));
+                        addToSet(set, "distributorAffiliation", xmlr.getAttributeValue(null, "affiliation"));
+                        addToSet(set, "distributorURL", xmlr.getAttributeValue(null, "URI"));
+                        addToSet(set, "distributorLogoURL", xmlr.getAttributeValue(null, "role"));
+                        addToSet(set, "distributorName", xmlr.getElementText());
+                        distributors.add(set);
+                    }
 
                 } else if (xmlr.getLocalName().equals("contact")) {
                     HashSet<FieldDTO> set = new HashSet<>();
@@ -1233,6 +1374,7 @@ private void processProdStmt(XMLStreamReader xmlr, MetadataBlockDTO citation) th
         List<HashSet<FieldDTO>> producers = new ArrayList<>();
         List<HashSet<FieldDTO>> grants = new ArrayList<>();
         List<HashSet<FieldDTO>> software = new ArrayList<>();
+        List<String> prodPlac = new ArrayList<>();
 
         for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
             if (event == XMLStreamConstants.START_ELEMENT) {
@@ -1240,21 +1382,19 @@ private void processProdStmt(XMLStreamReader xmlr, MetadataBlockDTO citation) th
                     HashSet<FieldDTO> set = new HashSet<>();
                     addToSet(set,"producerAbbreviation", xmlr.getAttributeValue(null, "abbr"));
                     addToSet(set,"producerAffiliation", xmlr.getAttributeValue(null, "affiliation"));
-                    
-                    Map<String, String> prodDetails = parseCompoundText(xmlr, "producer");
-                    addToSet(set,"producerName", prodDetails.get("name"));
-                    addToSet(set,"producerURL", prodDetails.get("url" ));
-                    addToSet(set,"producerLogoURL", prodDetails.get("logo"));
+                    addToSet(set,"producerLogoURL", xmlr.getAttributeValue(null, "role"));
+                    addToSet(set,"producerURL", xmlr.getAttributeValue(null, "URI"));
+                    addToSet(set,"producerName", xmlr.getElementText());
                     if (!set.isEmpty())
                         producers.add(set);
                 } else if (xmlr.getLocalName().equals("prodDate")) {
                     citation.getFields().add(FieldDTO.createPrimitiveFieldDTO("productionDate", parseDate(xmlr, "prodDate")));
                 } else if (xmlr.getLocalName().equals("prodPlac")) {
-                    citation.getFields().add(FieldDTO.createPrimitiveFieldDTO("productionPlace", parseDate(xmlr, "prodPlac")));
+                    prodPlac.add(parseText(xmlr));
                 } else if (xmlr.getLocalName().equals("software")) {
                     HashSet<FieldDTO> set = new HashSet<>();
                     addToSet(set,"softwareVersion", xmlr.getAttributeValue(null, "version"));
-                    addToSet(set,"softwareName", xmlr.getAttributeValue(null, "version"));
+                    addToSet(set,"softwareName",  parseText(xmlr));
                     if (!set.isEmpty()) {
                         software.add(set);
                     }
@@ -1283,6 +1423,9 @@ private void processProdStmt(XMLStreamReader xmlr, MetadataBlockDTO citation) th
                     if (producers.size()>0) {
                         citation.getFields().add(FieldDTO.createMultipleCompoundFieldDTO("producer", producers));
                     }
+                    if (prodPlac.size() > 0) {
+                        citation.getFields().add(FieldDTO.createMultiplePrimitiveFieldDTO(DatasetFieldConstant.productionPlace, prodPlac));
+                    }
                     return;
                 }
             }
@@ -1292,6 +1435,7 @@ private void processProdStmt(XMLStreamReader xmlr, MetadataBlockDTO citation) th
    private void processTitlStmt(XMLStreamReader xmlr, DatasetDTO datasetDTO) throws XMLStreamException, ImportException {
        MetadataBlockDTO citation = datasetDTO.getDatasetVersion().getMetadataBlocks().get("citation");
        List<HashSet<FieldDTO>> otherIds = new ArrayList<>();
+       List<String> altTitles = new ArrayList<>();
        
        for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
             if (event == XMLStreamConstants.START_ELEMENT) {
@@ -1302,13 +1446,10 @@ private void processTitlStmt(XMLStreamReader xmlr, DatasetDTO datasetDTO) throws
                   FieldDTO field = FieldDTO.createPrimitiveFieldDTO("subtitle", parseText(xmlr));
                    citation.getFields().add(field);
                 } else if (xmlr.getLocalName().equals("altTitl")) {
-                  FieldDTO field = FieldDTO.createPrimitiveFieldDTO("alternativeTitle", parseText(xmlr));
-                   citation.getFields().add(field);
+                    altTitles.add(parseText(xmlr));
                 } else if (xmlr.getLocalName().equals("IDNo")) {
-                    if ( AGENCY_HANDLE.equals( xmlr.getAttributeValue(null, "agency") ) ) {
-                        parseStudyIdHandle( parseText(xmlr), datasetDTO );
-                    } else if ( AGENCY_DOI.equals( xmlr.getAttributeValue(null, "agency") ) ) {
-                        parseStudyIdDOI( parseText(xmlr), datasetDTO );
+                    if ( AGENCY_HANDLE.equals( xmlr.getAttributeValue(null, "agency") ) || AGENCY_DOI.equals( xmlr.getAttributeValue(null, "agency") ) ) {
+                        importGenericService.reassignIdentifierAsGlobalId(parseText(xmlr), datasetDTO);
                     } else if ( AGENCY_DARA.equals( xmlr.getAttributeValue(null, "agency"))) {
                         /* 
                             da|ra - "Registration agency for social and economic data"
@@ -1333,6 +1474,10 @@ private void processTitlStmt(XMLStreamReader xmlr, DatasetDTO datasetDTO) throws
                     if (otherIds.size()>0) {
                         citation.addField(FieldDTO.createMultipleCompoundFieldDTO("otherId", otherIds));
                     }
+                    if (!altTitles.isEmpty()) {
+                        FieldDTO field = FieldDTO.createMultiplePrimitiveFieldDTO(DatasetFieldConstant.alternativeTitle, altTitles);
+                        citation.getFields().add(field);
+                    }
                     return;
                 }
             }
@@ -1341,6 +1486,7 @@ private void processTitlStmt(XMLStreamReader xmlr, DatasetDTO datasetDTO) throws
    private void processRspStmt(XMLStreamReader xmlr, MetadataBlockDTO citation) throws XMLStreamException {
      
        List<HashSet<FieldDTO>> authors = new ArrayList<>();
+       List<HashSet<FieldDTO>> contributors = new ArrayList<>();
         for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
             if (event == XMLStreamConstants.START_ELEMENT) {
                 if (xmlr.getLocalName().equals("AuthEnty")) {
@@ -1351,12 +1497,24 @@ private void processRspStmt(XMLStreamReader xmlr, MetadataBlockDTO citation) thr
                         authors.add(set);
                     }
                 }
+                if (xmlr.getLocalName().equals("othId")) {
+                    HashSet<FieldDTO> set = new HashSet<>();
+                    set.add(FieldDTO.createVocabFieldDTO("contributorType", xmlr.getAttributeValue(null, "role") ));
+                    addToSet(set,"contributorName", parseText(xmlr));
+                    if (!set.isEmpty()) {
+                        contributors.add(set);
+                    }
+                }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (xmlr.getLocalName().equals("rspStmt")) {
                     if (authors.size()>0) {
                         FieldDTO author = FieldDTO.createMultipleCompoundFieldDTO("author", authors);
                         citation.getFields().add(author);
                     }
+                    if (contributors.size() > 0) {
+                        FieldDTO contributor = FieldDTO.createMultipleCompoundFieldDTO("contributor", contributors);
+                        citation.getFields().add(contributor);
+                    }
                   
                     return;
                 }
@@ -1572,43 +1730,6 @@ else if (xmlr.getLocalName().equals("notes")) {
         return returnValues;
     }    
      
-   private void parseStudyIdHandle(String _id, DatasetDTO datasetDTO)  {
-
-        int index1 = _id.indexOf(':');
-        int index2 = _id.indexOf('/');
-        if (index1==-1) {
-            throw new EJBException("Error parsing (Handle) IdNo: "+_id+". ':' not found in string");
-        } else {
-            datasetDTO.setProtocol(_id.substring(0,index1));
-        }
-        if (index2 == -1) {
-            throw new EJBException("Error parsing (Handle) IdNo: "+_id+". '/' not found in string");
-
-        } else {
-            datasetDTO.setAuthority(_id.substring(index1+1, index2));
-        }
-        datasetDTO.setProtocol("hdl");
-        datasetDTO.setIdentifier(_id.substring(index2+1));
-    }
-
-    private void parseStudyIdDOI(String _id, DatasetDTO datasetDTO) throws ImportException{
-        int index1 = _id.indexOf(':');
-        int index2 = _id.indexOf('/');
-        if (index1==-1) {
-            throw new EJBException("Error parsing (DOI) IdNo: "+_id+". ':' not found in string");
-        }  
-       
-        if (index2 == -1) {
-            throw new ImportException("Error parsing (DOI) IdNo: "+_id+". '/' not found in string");
-
-        } else {
-               datasetDTO.setAuthority(_id.substring(index1+1, index2));
-        }
-        datasetDTO.setProtocol("doi");
-       
-        datasetDTO.setIdentifier(_id.substring(index2+1));
-    }
-    
     private void parseStudyIdDoiICPSRdara(String _id, DatasetDTO datasetDTO) throws ImportException{
         /*
             dara/ICPSR DOIs are formatted without the hdl: prefix; for example - 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java
index 9b60993b365..d75ea42e433 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java
@@ -1,6 +1,8 @@
 package edu.harvard.iq.dataverse.api.imports;
 
 import com.google.gson.Gson;
+
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
 import edu.harvard.iq.dataverse.DatasetFieldConstant;
 import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
@@ -8,15 +10,21 @@
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.ForeignMetadataFieldMapping;
 import edu.harvard.iq.dataverse.ForeignMetadataFormatMapping;
-import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.MetadataBlockServiceBean;
 import edu.harvard.iq.dataverse.api.dto.*;  
 import edu.harvard.iq.dataverse.api.dto.FieldDTO;
 import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
+import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
 import edu.harvard.iq.dataverse.util.json.JsonParser;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -26,20 +34,22 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.json.Json;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.Json;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
 import javax.xml.stream.XMLInputFactory;
+import net.handle.hdllib.HandleException;
+import net.handle.hdllib.HandleResolver;
 
 
 /**
@@ -65,6 +75,12 @@ public class ImportGenericServiceBean {
     @EJB
     SettingsServiceBean settingsService;
 
+    @EJB
+    LicenseServiceBean licenseService;
+
+    @EJB
+    DatasetTypeServiceBean datasetTypeService;
+
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
     
@@ -92,7 +108,7 @@ public void importXML(String xmlToParse, String foreignFormat, DatasetVersion da
         
         try {
             reader = new StringReader(xmlToParse);
-            XMLInputFactory xmlFactory = javax.xml.stream.XMLInputFactory.newInstance();
+            XMLInputFactory xmlFactory = XmlUtil.getSecureXMLInputFactory();
             xmlr =  xmlFactory.createXMLStreamReader(reader);
             DatasetDTO datasetDTO = processXML(xmlr, mappingSupported);
         
@@ -101,7 +117,7 @@ public void importXML(String xmlToParse, String foreignFormat, DatasetVersion da
             logger.fine(json);
             JsonReader jsonReader = Json.createReader(new StringReader(json));
             JsonObject obj = jsonReader.readObject();
-            DatasetVersion dv = new JsonParser(datasetFieldSvc, blockService, settingsService).parseDatasetVersion(obj, datasetVersion);
+            DatasetVersion dv = new JsonParser(datasetFieldSvc, blockService, settingsService, licenseService, datasetTypeService).parseDatasetVersion(obj, datasetVersion);
         } catch (XMLStreamException ex) {
             //Logger.getLogger("global").log(Level.SEVERE, null, ex);
             throw new EJBException("ERROR occurred while parsing XML fragment  ("+xmlToParse.substring(0, 64)+"...); ", ex);
@@ -113,50 +129,6 @@ public void importXML(String xmlToParse, String foreignFormat, DatasetVersion da
             } catch (XMLStreamException ex) {}
         }
     }
-    
-    public void importXML(File xmlFile, String foreignFormat, DatasetVersion datasetVersion) {
-        
-        FileInputStream in = null;
-        XMLStreamReader xmlr = null;
-
-        // look up the foreign metadata mapping for this format:
-        
-        ForeignMetadataFormatMapping mappingSupported = findFormatMappingByName (foreignFormat);
-        if (mappingSupported == null) {
-            throw new EJBException("Unknown/unsupported foreign metadata format "+foreignFormat);
-        }
-        
-        try {
-            in = new FileInputStream(xmlFile);
-            XMLInputFactory xmlFactory = javax.xml.stream.XMLInputFactory.newInstance();
-            xmlr =  xmlFactory.createXMLStreamReader(in);
-            DatasetDTO datasetDTO = processXML(xmlr, mappingSupported);
-
-            Gson gson = new Gson();
-            String json = gson.toJson(datasetDTO.getDatasetVersion());
-            logger.info("Json:\n"+json);
-            JsonReader jsonReader = Json.createReader(new StringReader(json));
-            JsonObject obj = jsonReader.readObject();
-            DatasetVersion dv = new JsonParser(datasetFieldSvc, blockService, settingsService).parseDatasetVersion(obj, datasetVersion);
-        } catch (FileNotFoundException ex) {
-            //Logger.getLogger("global").log(Level.SEVERE, null, ex);
-            throw new EJBException("ERROR occurred in mapDDI: File Not Found!");
-        } catch (XMLStreamException ex) {
-            //Logger.getLogger("global").log(Level.SEVERE, null, ex);
-            throw new EJBException("ERROR occurred while parsing XML (file "+xmlFile.getAbsolutePath()+"); ", ex);
-        } catch (JsonParseException ex) {
-            Logger.getLogger(ImportGenericServiceBean.class.getName()).log(Level.SEVERE, null, ex);
-        } finally {
-            try {
-                if (xmlr != null) { xmlr.close(); }
-            } catch (XMLStreamException ex) {}
-
-            try {
-                if (in != null) { in.close();}
-            } catch (IOException ex) {}
-        }
-
-    }
 
     public DatasetDTO processXML( XMLStreamReader xmlr, ForeignMetadataFormatMapping foreignFormatMapping) throws XMLStreamException {
         // init - similarly to what I'm doing in the metadata extraction code? 
@@ -180,12 +152,16 @@ public DatasetDTO processXML( XMLStreamReader xmlr, ForeignMetadataFormatMapping
 
     }
     
-    // Helper method for importing harvested Dublin Core xml.
+    // Helper methods for importing harvested Dublin Core xml.
     // Dublin Core is considered a mandatory, built in metadata format mapping. 
     // It is distributed as required content, in reference_data.sql. 
     // Note that arbitrary formatting tags are supported for the outer xml
     // wrapper. -- L.A. 4.5
     public DatasetDTO processOAIDCxml(String DcXmlToParse) throws XMLStreamException {
+        return processOAIDCxml(DcXmlToParse, null, false);
+    }
+    
+    public DatasetDTO processOAIDCxml(String DcXmlToParse, String oaiIdentifier, boolean preferSuppliedIdentifier) throws XMLStreamException {
         // look up DC metadata mapping: 
         
         ForeignMetadataFormatMapping dublinCoreMapping = findFormatMappingByName(DCTERMS);
@@ -199,7 +175,7 @@ public DatasetDTO processOAIDCxml(String DcXmlToParse) throws XMLStreamException
 
         try {
             reader = new StringReader(DcXmlToParse);
-            XMLInputFactory xmlFactory = javax.xml.stream.XMLInputFactory.newInstance();
+            XMLInputFactory xmlFactory = XmlUtil.getSecureXMLInputFactory();
             xmlr = xmlFactory.createXMLStreamReader(reader);
 
             //while (xmlr.next() == XMLStreamConstants.COMMENT); // skip pre root comments
@@ -210,23 +186,46 @@ public DatasetDTO processOAIDCxml(String DcXmlToParse) throws XMLStreamException
             processXMLElement(xmlr, ":", OAI_DC_OPENING_TAG, dublinCoreMapping, datasetDTO);
         } catch (XMLStreamException ex) {
             throw new EJBException("ERROR occurred while parsing XML fragment  (" + DcXmlToParse.substring(0, 64) + "...); ", ex);
+        } finally {
+            if (xmlr != null) {
+                try {
+                    xmlr.close();
+                } catch (XMLStreamException ex) {
+                }
+            }
         }
 
         
         datasetDTO.getDatasetVersion().setVersionState(DatasetVersion.VersionState.RELEASED);
         
-        // Our DC import handles the contents of the dc:identifier field 
-        // as an "other id". In the context of OAI harvesting, we expect 
-        // the identifier to be a global id, so we need to rearrange that: 
-        
-        String identifier = getOtherIdFromDTO(datasetDTO.getDatasetVersion());
-        logger.fine("Imported identifier: "+identifier);
-        
-        String globalIdentifier = reassignIdentifierAsGlobalId(identifier, datasetDTO);
-        logger.fine("Detected global identifier: "+globalIdentifier);
+        // Note that in some harvesting cases we will want to use the OAI 
+        // identifier (the identifier from the <header> section of the OAI 
+        // record) for the global id of the harvested dataset, without expecting 
+        // to find a valid persistent id in the body of the DC record. This is  
+        // the use case when harvesting from DataCite: we always want to use the
+        // OAI identifier, disregarding any identifiers that may be found within
+        // the metadata record. 
+        // 
+        // Otherwise, we will look at the list of identifiers extracted from the 
+        // <dc:identifier> fields in the OAI_DC record. Our DC parser uses these
+        // to populate the "Other Id" field in the Citation block. The first one 
+        // of these that parses as a valid Persistent Identifier will be 
+        // selected to serve as the global id for the imported dataset. If none 
+        // are found there, we will try to use the OAI identifier as the last 
+        // resort. Note that this is the default behavior. 
         
+        String candidateGlobalId = selectIdentifier(datasetDTO.getDatasetVersion(), oaiIdentifier, preferSuppliedIdentifier);
+        logger.fine("Selected global identifier: " + candidateGlobalId);
+
+        // Re-assign the selected identifier to serve as the main persistent Id:
+        String globalIdentifier = reassignIdentifierAsGlobalId(candidateGlobalId, datasetDTO);
+        logger.fine("Successfully re-assigned the global identifier: " + globalIdentifier);
+
         if (globalIdentifier == null) {
-            throw new EJBException("Failed to find a global identifier in the OAI_DC XML record.");
+            String exceptionMsg = oaiIdentifier == null ? 
+                    "Failed to find a global identifier in the OAI_DC XML record." : 
+                    "Failed to parse the supplied identifier as a valid Persistent Id";
+            throw new EJBException(exceptionMsg);
         }
         
         return datasetDTO;
@@ -235,8 +234,17 @@ public DatasetDTO processOAIDCxml(String DcXmlToParse) throws XMLStreamException
     
     private void processXMLElement(XMLStreamReader xmlr, String currentPath, String openingTag, ForeignMetadataFormatMapping foreignFormatMapping, DatasetDTO datasetDTO) throws XMLStreamException {
         logger.fine("entering processXMLElement; ("+currentPath+")");
-        
-        for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
+
+        while (xmlr.hasNext()) {
+
+            int event;
+            try {
+                event = xmlr.next();
+            } catch (XMLStreamException ex) {
+                logger.warning("Error occurred in the XML parsing : " + ex.getMessage());
+                continue; // Skip Undeclared namespace prefix and Unexpected close tag related to com.ctc.wstx.exc.WstxParsingException
+            }
+
             if (event == XMLStreamConstants.START_ELEMENT) {
                 String currentElement = xmlr.getLocalName();
                 
@@ -297,9 +305,7 @@ private void processXMLElement(XMLStreamReader xmlr, String currentPath, String
                             MetadataBlockDTO citationBlock = datasetDTO.getDatasetVersion().getMetadataBlocks().get(mappingDefinedFieldType.getMetadataBlock().getName());
                             citationBlock.addField(value);
                         }
-                    } else // Process the payload of this XML element:
-                    //xxString dataverseFieldName = mappingDefined.getDatasetfieldName();
-                    if (dataverseFieldName != null && !dataverseFieldName.isEmpty()) {
+                    } else if (dataverseFieldName != null && !dataverseFieldName.isEmpty()) {
                         DatasetFieldType dataverseFieldType = datasetfieldService.findByNameOpt(dataverseFieldName);
                         FieldDTO value;
                         if (dataverseFieldType != null) {
@@ -365,32 +371,76 @@ private FieldDTO makeDTO(DatasetFieldType dataverseFieldType, FieldDTO value, St
         return value;
     }
     
-    private String getOtherIdFromDTO(DatasetVersionDTO datasetVersionDTO) {
+    public String selectIdentifier(DatasetVersionDTO datasetVersionDTO, String suppliedIdentifier) {
+        return selectIdentifier(datasetVersionDTO, suppliedIdentifier, false);
+    }
+    
+    private String selectIdentifier(DatasetVersionDTO datasetVersionDTO, String suppliedIdentifier, boolean preferSuppliedIdentifier) {
+        List<String> otherIds = new ArrayList<>();
+        
+        if (suppliedIdentifier != null && preferSuppliedIdentifier) {
+            // This supplied identifier (in practice, his is likely the OAI-PMH 
+            // identifier from the <record> <header> section) will be our first 
+            // choice candidate for the pid of the imported dataset:
+            otherIds.add(suppliedIdentifier);
+        }
+        
         for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
             String key = entry.getKey();
             MetadataBlockDTO value = entry.getValue();
             if ("citation".equals(key)) {
                 for (FieldDTO fieldDTO : value.getFields()) {
                     if (DatasetFieldConstant.otherId.equals(fieldDTO.getTypeName())) {
-                        String otherId = "";
                         for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
                             for (FieldDTO next : foo) {
                                 if (DatasetFieldConstant.otherIdValue.equals(next.getTypeName())) {
-                                    otherId =  next.getSinglePrimitive();
+                                    otherIds.add(next.getSinglePrimitive());
                                 }
                             }
-                            if (!otherId.isEmpty()){
-                                return otherId;
-                            }
                         }
                     }
                 }
             }
         }
+        
+        if (suppliedIdentifier != null && !preferSuppliedIdentifier) {
+            // Unless specifically instructed to prefer this extra identifier 
+            // (in practice, this is likely the OAI-PMH identifier from the 
+            // <record> <header> section), we will try to use it as the *last*
+            // possible candidate for the pid, so, adding it to the end of the 
+            // list:
+            otherIds.add(suppliedIdentifier);
+        }
+        
+        if (!otherIds.isEmpty()) {
+            // We prefer doi or hdl identifiers like "doi:10.7910/DVN/1HE30F"
+            for (String otherId : otherIds) {
+                if (otherId.startsWith(AbstractDOIProvider.DOI_PROTOCOL) || otherId.startsWith(HandlePidProvider.HDL_PROTOCOL) || otherId.startsWith(AbstractDOIProvider.DOI_RESOLVER_URL) || otherId.startsWith(HandlePidProvider.HDL_RESOLVER_URL) || otherId.startsWith(AbstractDOIProvider.HTTP_DOI_RESOLVER_URL) || otherId.startsWith(HandlePidProvider.HTTP_HDL_RESOLVER_URL) || otherId.startsWith(AbstractDOIProvider.DXDOI_RESOLVER_URL) || otherId.startsWith(AbstractDOIProvider.HTTP_DXDOI_RESOLVER_URL)) {
+                    return otherId;
+                }
+            }
+            // But identifiers without hdl or doi like "10.6084/m9.figshare.12725075.v1" are also allowed
+            for (String otherId : otherIds) {
+                try {
+                    HandleResolver hr = new HandleResolver();
+                    hr.resolveHandle(otherId);
+                    return HandlePidProvider.HDL_PROTOCOL + ":" + otherId;
+                } catch (HandleException e) {
+                    logger.fine("Not a valid handle: " + e.toString());
+                }
+            }
+        }
         return null;
     }
     
-    private String reassignIdentifierAsGlobalId(String identifierString, DatasetDTO datasetDTO) {
+    /* This is a general parser that can take DOI and Handle Ids, in their local or
+     * URL forms (e.g. doi:... or https://doi.org/...) and parse them into
+     * protocol/authority/identifier parts that are assigned to the datasetDTO.
+     * The name reflects the original purpose but it is now used in ImportDDIServiceBean as well.
+     */
+    
+    //ToDo - sync with GlobalId.parsePersistentId(String) ? - that currently doesn't do URL forms, but could
+    public String reassignIdentifierAsGlobalId(String identifierString, DatasetDTO datasetDTO) {
 
         int index1 = identifierString.indexOf(':');
         int index2 = identifierString.indexOf('/');
@@ -401,22 +451,29 @@ private String reassignIdentifierAsGlobalId(String identifierString, DatasetDTO
        
         String protocol = identifierString.substring(0, index1);
         
-        if (GlobalId.DOI_PROTOCOL.equals(protocol) || GlobalId.HDL_PROTOCOL.equals(protocol)) {
-            logger.fine("Processing hdl:- or doi:-style identifier : "+identifierString);        
+        if (AbstractDOIProvider.DOI_PROTOCOL.equals(protocol) || HandlePidProvider.HDL_PROTOCOL.equals(protocol) || PermaLinkPidProvider.PERMA_PROTOCOL.equals(protocol)) {
+            logger.fine("Processing hdl:- or doi:- or perma:-style identifier : "+identifierString);        
         
         } else if ("http".equalsIgnoreCase(protocol) || "https".equalsIgnoreCase(protocol)) {
             
             // We also recognize global identifiers formatted as global resolver URLs:
-            
-            if (identifierString.startsWith(GlobalId.HDL_RESOLVER_URL)) {
+            //ToDo - refactor index1 always has -1 here so that we can use index1+1 later
+            //ToDo - single map of protocol/url, are all three cases the same then?
+            if (identifierString.startsWith(HandlePidProvider.HDL_RESOLVER_URL) || identifierString.startsWith(HandlePidProvider.HTTP_HDL_RESOLVER_URL)) {
                 logger.fine("Processing Handle identifier formatted as a resolver URL: "+identifierString);
-                protocol = GlobalId.HDL_PROTOCOL;
-                index1 = GlobalId.HDL_RESOLVER_URL.length() - 1;
+                protocol = HandlePidProvider.HDL_PROTOCOL;
+                index1 = (identifierString.startsWith(HandlePidProvider.HDL_RESOLVER_URL)) ? HandlePidProvider.HDL_RESOLVER_URL.length() - 1 : HandlePidProvider.HTTP_HDL_RESOLVER_URL.length() - 1;
                 index2 = identifierString.indexOf("/", index1 + 1);
-            } else if (identifierString.startsWith(GlobalId.DOI_RESOLVER_URL)) {
+            } else if (identifierString.startsWith(AbstractDOIProvider.DOI_RESOLVER_URL) || identifierString.startsWith(AbstractDOIProvider.HTTP_DOI_RESOLVER_URL) || identifierString.startsWith(AbstractDOIProvider.DXDOI_RESOLVER_URL) || identifierString.startsWith(AbstractDOIProvider.HTTP_DXDOI_RESOLVER_URL)) {
                 logger.fine("Processing DOI identifier formatted as a resolver URL: "+identifierString);
-                protocol = GlobalId.DOI_PROTOCOL;
-                index1 = GlobalId.DOI_RESOLVER_URL.length() - 1; 
+                protocol = AbstractDOIProvider.DOI_PROTOCOL;
+                identifierString = identifierString.replace(AbstractDOIProvider.DXDOI_RESOLVER_URL, AbstractDOIProvider.DOI_RESOLVER_URL);
+                identifierString = identifierString.replace(AbstractDOIProvider.HTTP_DXDOI_RESOLVER_URL, AbstractDOIProvider.HTTP_DOI_RESOLVER_URL);
+                index1 = (identifierString.startsWith(AbstractDOIProvider.DOI_RESOLVER_URL)) ? AbstractDOIProvider.DOI_RESOLVER_URL.length() - 1 : AbstractDOIProvider.HTTP_DOI_RESOLVER_URL.length() - 1;
+                index2 = identifierString.indexOf("/", index1 + 1);
+            } else if (identifierString.startsWith(PermaLinkPidProvider.PERMA_RESOLVER_URL + Dataset.TARGET_URL)) {
+                protocol = PermaLinkPidProvider.PERMA_PROTOCOL;
+                index1 = PermaLinkPidProvider.PERMA_RESOLVER_URL.length() + + Dataset.TARGET_URL.length() - 1; 
                 index2 = identifierString.indexOf("/", index1 + 1);
             } else {
                 logger.warning("HTTP Url in supplied as the identifier is neither a Handle nor DOI resolver: "+identifierString);
@@ -507,9 +564,7 @@ public ImportGenericServiceBean() {
      
     public ImportGenericServiceBean(ImportType importType) {
         this.importType=importType;
-        xmlInputFactory = javax.xml.stream.XMLInputFactory.newInstance();
-        xmlInputFactory.setProperty("javax.xml.stream.isCoalescing", java.lang.Boolean.TRUE);
-
+        xmlInputFactory = XmlUtil.getSecureXMLInputFactory();
     }
     
       
@@ -530,54 +585,29 @@ public DatasetDTO doImport(String xmlToParse) throws XMLStreamException {
         return datasetDTO;
     }
     
-     public void importDCTerms(String xmlToParse, DatasetVersion datasetVersion, DatasetFieldServiceBean datasetFieldSvc, MetadataBlockServiceBean blockService, SettingsServiceBean settingsService) {
-        DatasetDTO datasetDTO = this.initializeDataset();
-        try {
-            // Read docDescr and studyDesc into DTO objects.
-            Map<String, String> fileMap = mapDCTerms(xmlToParse, datasetDTO);
-            // 
-            // convert DTO to Json, 
-            Gson gson = new Gson();
-            String json = gson.toJson(datasetDTO.getDatasetVersion());
-            JsonReader jsonReader = Json.createReader(new StringReader(json));
-            JsonObject obj = jsonReader.readObject();
-            //and call parse Json to read it into a datasetVersion
-            DatasetVersion dv = new JsonParser(datasetFieldSvc, blockService, settingsService).parseDatasetVersion(obj, datasetVersion);
-        } catch (XMLStreamException | JsonParseException e) {
-            // EMK TODO: exception handling
-            e.printStackTrace();
-        }
-        
-        //EMK TODO:  Call methods for reading FileMetadata and related objects from xml, return list of FileMetadata objects.
-        /*try {
-            
-         Map<String, DataTable> dataTableMap = new DataTableImportDDI().processDataDscr(xmlr);
-         } catch(Exception e) {
-            
-         }*/
-        // Save Dataset and DatasetVersion in database
-    }
-
     public Map<String, String> mapDCTerms(String xmlToParse, DatasetDTO datasetDTO) throws XMLStreamException {
 
         Map<String, String> filesMap = new HashMap<>();
         StringReader reader = new StringReader(xmlToParse);
         XMLStreamReader xmlr = null;
-        XMLInputFactory xmlFactory = javax.xml.stream.XMLInputFactory.newInstance();
+        XMLInputFactory xmlFactory = XmlUtil.getSecureXMLInputFactory();
         xmlr = xmlFactory.createXMLStreamReader(reader);
         processDCTerms(xmlr, datasetDTO, filesMap);
-
+        if (xmlr != null) {
+            try {
+                xmlr.close();
+            } catch (XMLStreamException ex) {
+            }
+        }
         return filesMap;
     }
    
  
     public Map<String, String> mapDCTerms(File ddiFile, DatasetDTO datasetDTO) {
-        FileInputStream in = null;
         XMLStreamReader xmlr = null;
         Map<String, String> filesMap = new HashMap<>();
 
-        try {
-            in = new FileInputStream(ddiFile);
+        try (FileInputStream in = new FileInputStream(ddiFile)) {
             xmlr =  xmlInputFactory.createXMLStreamReader(in);
             processDCTerms( xmlr,  datasetDTO , filesMap );
         } catch (FileNotFoundException ex) {
@@ -586,14 +616,11 @@ public Map<String, String> mapDCTerms(File ddiFile, DatasetDTO datasetDTO) {
         } catch (XMLStreamException ex) {
             Logger.getLogger("global").log(Level.SEVERE, null, ex);
             throw new EJBException("ERROR occurred in mapDDI.", ex);
+        } catch (IOException e) {
         } finally {
             try {
                 if (xmlr != null) { xmlr.close(); }
             } catch (XMLStreamException ex) {}
-
-            try {
-                if (in != null) { in.close();}
-            } catch (IOException ex) {}
         }
 
         return filesMap;
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
index b75811e6698..0b5fae8ee31 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
@@ -7,7 +7,6 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetField;
 import edu.harvard.iq.dataverse.DatasetFieldConstant;
@@ -20,9 +19,11 @@
 import edu.harvard.iq.dataverse.DataverseContact;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
+import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.MetadataBlockServiceBean;
 import edu.harvard.iq.dataverse.api.dto.DatasetDTO;
 import edu.harvard.iq.dataverse.api.imports.ImportUtil.ImportType;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateDatasetVersionCommand;
@@ -30,16 +31,22 @@
 import edu.harvard.iq.dataverse.engine.command.impl.CreateHarvestedDatasetCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDatasetCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.DestroyDatasetCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.UpdateHarvestedDatasetCommand;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.ConstraintViolationUtil;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
 import edu.harvard.iq.dataverse.util.json.JsonParser;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.StringReader;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Date;
@@ -49,25 +56,24 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import static jakarta.ejb.TransactionAttributeType.REQUIRES_NEW;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import javax.xml.stream.XMLStreamException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -101,6 +107,13 @@ public class ImportServiceBean {
     
     @EJB
     IndexServiceBean indexService;
+
+    @EJB
+    LicenseServiceBean licenseService;
+
+    @EJB
+    DatasetTypeServiceBean datasetTypeService;
+
     /**
      * This is just a convenience method, for testing migration.  It creates 
      * a dummy dataverse with the directory name as dataverse name & alias.
@@ -134,10 +147,7 @@ public Dataverse createDataverse(String dvName, DataverseRequest dataverseReques
             while (cause.getCause() != null) {
                 cause = cause.getCause();
                 if (cause instanceof ConstraintViolationException) {
-                    ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
-                    for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
-                        sb.append(" Invalid value: <<<").append(violation.getInvalidValue()).append(">>> for ").append(violation.getPropertyPath()).append(" at ").append(violation.getLeafBean()).append(" - ").append(violation.getMessage());
-                    }
+                    sb.append(ConstraintViolationUtil.getErrorStringForConstraintViolations(cause));
                 }
             }
             logger.log(Level.SEVERE, sb.toString());
@@ -198,9 +208,32 @@ public JsonObjectBuilder handleFile(DataverseRequest dataverseRequest, Dataverse
     }
 
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-    public Dataset doImportHarvestedDataset(DataverseRequest dataverseRequest, HarvestingClient harvestingClient, String harvestIdentifier, String metadataFormat, File metadataFile, Date oaiDateStamp, PrintWriter cleanupLog) throws ImportException, IOException {
+    public Dataset doImportHarvestedDataset(DataverseRequest dataverseRequest, 
+            HarvestingClient harvestingClient, 
+            String harvestIdentifier, 
+            String metadataFormat, 
+            File metadataFile, 
+            Date oaiDateStamp, 
+            PrintWriter cleanupLog) throws ImportException, IOException {
+        
+        logger.fine("importing " + metadataFormat + " saved in " + metadataFile.getAbsolutePath());
+      
+        //@todo? check for an IOException here, throw ImportException instead, if caught
+        String metadataAsString = new String(Files.readAllBytes(metadataFile.toPath()));
+        return doImportHarvestedDataset(dataverseRequest, harvestingClient, harvestIdentifier, metadataFormat, metadataAsString, oaiDateStamp, cleanupLog);
+    }
+    
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public Dataset doImportHarvestedDataset(DataverseRequest dataverseRequest, 
+            HarvestingClient harvestingClient, 
+            String harvestIdentifier, 
+            String metadataFormat, 
+            String metadataString, 
+            Date oaiDateStamp, 
+            PrintWriter cleanupLog) throws ImportException, IOException {
+ 
         if (harvestingClient == null || harvestingClient.getDataverse() == null) {
-            throw new ImportException("importHarvestedDataset called wiht a null harvestingClient, or an invalid harvestingClient.");
+            throw new ImportException("importHarvestedDataset called with a null harvestingClient, or an invalid harvestingClient.");
         }
         Dataverse owner = harvestingClient.getDataverse();
         Dataset importedDataset = null;
@@ -218,32 +251,28 @@ public Dataset doImportHarvestedDataset(DataverseRequest dataverseRequest, Harve
         // Kraffmiller's export modules; replace the logic below with clean
         // programmatic lookup of the import plugin needed. 
 
+        logger.fine("importing " + metadataFormat + " for " + harvestIdentifier);
+        
         if ("ddi".equalsIgnoreCase(metadataFormat) || "oai_ddi".equals(metadataFormat) 
                 || metadataFormat.toLowerCase().matches("^oai_ddi.*")) {
             try {
-                String xmlToParse = new String(Files.readAllBytes(metadataFile.toPath()));
                 // TODO: 
                 // import type should be configurable - it should be possible to 
                 // select whether you want to harvest with or without files, 
                 // ImportType.HARVEST vs. ImportType.HARVEST_WITH_FILES
-                logger.fine("importing DDI "+metadataFile.getAbsolutePath());
-                dsDTO = importDDIService.doImport(ImportType.HARVEST, xmlToParse);
-            } catch (IOException | XMLStreamException | ImportException e) {
+                dsDTO = importDDIService.doImport(ImportType.HARVEST, metadataString);
+            } catch (XMLStreamException | ImportException e) {
                 throw new ImportException("Failed to process DDI XML record: "+ e.getClass() + " (" + e.getMessage() + ")");
             }
         } else if ("dc".equalsIgnoreCase(metadataFormat) || "oai_dc".equals(metadataFormat)) {
-            logger.fine("importing DC "+metadataFile.getAbsolutePath());
             try {
-                String xmlToParse = new String(Files.readAllBytes(metadataFile.toPath()));
-                dsDTO = importGenericService.processOAIDCxml(xmlToParse);
-            } catch (IOException | XMLStreamException e) {
+                dsDTO = importGenericService.processOAIDCxml(metadataString, harvestIdentifier, harvestingClient.isUseOaiIdentifiersAsPids());
+            } catch (XMLStreamException e) {
                 throw new ImportException("Failed to process Dublin Core XML record: "+ e.getClass() + " (" + e.getMessage() + ")");
             }
         } else if ("dataverse_json".equals(metadataFormat)) {
             // This is Dataverse metadata already formatted in JSON. 
-            // Simply read it into a string, and pass to the final import further down:
-            logger.fine("Attempting to import custom dataverse metadata from file "+metadataFile.getAbsolutePath());
-            json = new String(Files.readAllBytes(metadataFile.toPath())); 
+            json = metadataString; 
         } else {
             throw new ImportException("Unsupported import metadata format: " + metadataFormat);
         }
@@ -258,153 +287,155 @@ public Dataset doImportHarvestedDataset(DataverseRequest dataverseRequest, Harve
                 throw new ImportException("Failed to transform XML metadata format "+metadataFormat+" into a DatasetDTO");
             }
         }
+
+        JsonObject obj = JsonUtil.getJsonObject(json);
+        
+        String protocol = obj.getString("protocol", null);
+        String authority = obj.getString("authority", null);
+        String identifier = obj.getString("identifier",null);
+        
+        GlobalId globalId;
+        
+        // A Global ID is required:
+        // (meaning, we will fail with an exception if the imports above have 
+        // not managed to find an acceptable global identifier in the harvested 
+        // metadata)
+        
+        try { 
+            globalId = PidUtil.parseAsGlobalID(protocol, authority, identifier);
+        } catch (IllegalArgumentException iax) {
+            throw new ImportException("The harvested metadata record with the OAI server identifier " + harvestIdentifier + " does not contain a global identifier this Dataverse can parse, skipping.");
+        }
+        
+        if (globalId == null) {
+            throw new ImportException("The harvested metadata record with the OAI server identifier " + harvestIdentifier + " does not contain a global identifier this Dataverse recognizes, skipping.");
+        }
+        
+        String globalIdString = globalId.asString();
+        
+        if (StringUtils.isEmpty(globalIdString)) {
+            // @todo this check may not be necessary, now that there's a null check above
+            throw new ImportException("The harvested metadata record with the OAI server identifier " + harvestIdentifier + " does not contain a global identifier this Dataverse recognizes, skipping.");
+        }
+        
+        DatasetVersion harvestedVersion; 
+        
+        Dataset existingDataset = datasetService.findByGlobalId(globalIdString);
         
-        JsonReader jsonReader = Json.createReader(new StringReader(json));
-        JsonObject obj = jsonReader.readObject();
-        //and call parse Json to read it into a dataset   
         try {
-            JsonParser parser = new JsonParser(datasetfieldService, metadataBlockService, settingsService);
+            Dataset harvestedDataset;
+
+            JsonParser parser = new JsonParser(datasetfieldService, metadataBlockService, settingsService, licenseService, datasetTypeService, harvestingClient);
             parser.setLenient(true);
-            Dataset ds = parser.parseDataset(obj);
 
-            // For ImportType.NEW, if the metadata contains a global identifier, and it's not a protocol
-            // we support, it should be rejected.
-            // (TODO: ! - add some way of keeping track of supported protocols!)
-            //if (ds.getGlobalId() != null && !ds.getProtocol().equals(settingsService.getValueForKey(SettingsServiceBean.Key.Protocol, ""))) {
-            //    throw new ImportException("Could not register id " + ds.getGlobalId() + ", protocol not supported");
-            //}
-            ds.setOwner(owner);
-            ds.getLatestVersion().setDatasetFields(ds.getLatestVersion().initDatasetFields());
+            if (existingDataset == null) {
+                // Creating a new dataset from scratch:
+                
+                harvestedDataset = parser.parseDataset(obj);
 
-            if (ds.getVersions().get(0).getReleaseTime() == null) {
-                ds.getVersions().get(0).setReleaseTime(oaiDateStamp);
-            }
-            
-            // Check data against required contraints
-            List<ConstraintViolation<DatasetField>> violations = ds.getVersions().get(0).validateRequired();
-            if (!violations.isEmpty()) {
-                // For migration and harvest, add NA for missing required values
-                for (ConstraintViolation<DatasetField> v : violations) {
-                    DatasetField f =  v.getRootBean();
-                    f.setSingleValue(DatasetField.NA_VALUE);
+                harvestedDataset.setHarvestedFrom(harvestingClient);
+                harvestedDataset.setHarvestIdentifier(harvestIdentifier);
+                
+                harvestedVersion = harvestedDataset.getVersions().get(0);
+            } else {
+                // We already have a dataset with this id in the database.
+                // Let's check a few things before we go any further with it: 
+                
+                // If this dataset already exists IN ANOTHER COLLECTION
+                // we are just going to skip it!
+                if (existingDataset.getOwner() != null && !owner.getId().equals(existingDataset.getOwner().getId())) {
+                    throw new ImportException("The dataset with the global id " + globalIdString + " already exists, in the dataverse " + existingDataset.getOwner().getAlias() + ", skipping.");
                 }
-            }
-
-            // Check data against validation constraints
-            // If we are migrating and "scrub migration data" is true we attempt to fix invalid data
-            // if the fix fails stop processing of this file by throwing exception
-            Set<ConstraintViolation> invalidViolations = ds.getVersions().get(0).validate();
-            ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
-            Validator validator = factory.getValidator();
-            if (!invalidViolations.isEmpty()) {
-                for (ConstraintViolation<DatasetFieldValue> v : invalidViolations) {
-                    DatasetFieldValue f = v.getRootBean();
-                    boolean fixed = false;
-                    boolean converted = false;
-                    // TODO: Is this scrubbing something we want to continue doing? 
-                    if (settingsService.isTrueForKey(SettingsServiceBean.Key.ScrubMigrationData, false)) {
-                        fixed = processMigrationValidationError(f, cleanupLog, metadataFile.getName());
-                        converted = true;
-                        if (fixed) {
-                            Set<ConstraintViolation<DatasetFieldValue>> scrubbedViolations = validator.validate(f);
-                            if (!scrubbedViolations.isEmpty()) {
-                                fixed = false;
-                            }
-                        }
-                    }
-                    if (!fixed) {
-                        String msg = "Data modified - File: " + metadataFile.getName() + "; Field: " + f.getDatasetField().getDatasetFieldType().getDisplayName() + "; "
-                                + "Invalid value:  '" + f.getValue() + "'" + " Converted Value:'" + DatasetField.NA_VALUE + "'";
-                        cleanupLog.println(msg);
-                        f.setValue(DatasetField.NA_VALUE);
-
-                    }
+                // And if we already have a dataset with this same global id at 
+                // this Dataverse instance, but it is a LOCAL dataset (can happen!), 
+                // we're going to skip it also: 
+                if (!existingDataset.isHarvested()) {
+                    throw new ImportException("A LOCAL dataset with the global id " + globalIdString + " already exists in this dataverse; skipping.");
+                }
+                // For harvested datasets, there should always only be one version.
+                if (existingDataset.getVersions().size() != 1) {
+                    throw new ImportException("Error importing Harvested Dataset, existing dataset has " + existingDataset.getVersions().size() + " versions");
                 }
+                
+                // We will attempt to import the new version, and replace the 
+                // current, already existing version with it.                
+                harvestedVersion = parser.parseDatasetVersion(obj.getJsonObject("datasetVersion"));
+                
+                // For the purposes of validation, the version needs to be attached
+                // to a non-null dataset. We will create a throwaway temporary 
+                // dataset for this:
+                harvestedDataset = createTemporaryHarvestedDataset(harvestedVersion);
             }
+        
+            harvestedDataset.setOwner(owner);
             
-            // A Global ID is required, in order for us to be able to harvest and import
-            // this dataset:
-            if (StringUtils.isEmpty(ds.getGlobalIdString())) {
-                throw new ImportException("The harvested metadata record with the OAI server identifier "+harvestIdentifier+" does not contain a global unique identifier that we could recognize, skipping.");
-            }
-
-            ds.setHarvestedFrom(harvestingClient);
-            ds.setHarvestIdentifier(harvestIdentifier);
+            // Either a full new import, or an update of an existing harvested
+            // Dataset, perform some cleanup on the new version imported from the 
+            // parsed metadata:
             
-            Dataset existingDs = datasetService.findByGlobalId(ds.getGlobalIdString());
+            harvestedVersion.setDatasetFields(harvestedVersion.initDatasetFields());
 
-            if (existingDs != null) {
-                // If this dataset already exists IN ANOTHER DATAVERSE
-                // we are just going to skip it!
-                if (existingDs.getOwner() != null && !owner.getId().equals(existingDs.getOwner().getId())) {
-                    throw new ImportException("The dataset with the global id "+ds.getGlobalIdString()+" already exists, in the dataverse "+existingDs.getOwner().getAlias()+", skipping.");
-                }
-                // And if we already have a dataset with this same id, in this same
-                // dataverse, but it is  LOCAL dataset (can happen!), we're going to 
-                // skip it also: 
-                if (!existingDs.isHarvested()) {
-                    throw new ImportException("A LOCAL dataset with the global id "+ds.getGlobalIdString()+" already exists in this dataverse; skipping.");
-                }
-                // For harvested datasets, there should always only be one version.
-                // We will replace the current version with the imported version.
-                if (existingDs.getVersions().size() != 1) {
-                    throw new ImportException("Error importing Harvested Dataset, existing dataset has " + existingDs.getVersions().size() + " versions");
-                }
-                // Purge all the SOLR documents associated with this client from the 
-                // index server: 
-                indexService.deleteHarvestedDocuments(existingDs);
-                // files from harvested datasets are removed unceremoniously, 
-                // directly in the database. no need to bother calling the 
-                // DeleteFileCommand on them.
-                for (DataFile harvestedFile : existingDs.getFiles()) {
-                    DataFile merged = em.merge(harvestedFile);
-                    em.remove(merged);
-                    harvestedFile = null; 
-                }
-                // TODO: 
-                // Verify what happens with the indexed files in SOLR? 
-                // are they going to be overwritten by the reindexing of the dataset?
-                existingDs.setFiles(null);
-                Dataset merged = em.merge(existingDs);
-                // harvested datasets don't have physical files - so no need to worry about that.
-                engineSvc.submit(new DestroyDatasetCommand(merged, dataverseRequest));
+            if (harvestedVersion.getReleaseTime() == null) {
+                harvestedVersion.setReleaseTime(oaiDateStamp);
             }
+                        
+            // Check data against validation constraints. 
+            // Make an attempt to sanitize any invalid fields encountered - 
+            // missing required fields or invalid values, by filling the values 
+            // with NAs.
+            
+            boolean sanitized = validateAndSanitizeVersionMetadata(harvestedVersion, cleanupLog);
             
-            importedDataset = engineSvc.submit(new CreateHarvestedDatasetCommand(ds, dataverseRequest));
+            // Note: this sanitizing approach, of replacing invalid values with 
+            // "NA" does not work with certain fields. For example, using it to 
+            // populate a GeoBox coordinate value will result in an invalid 
+            // field. So we will attempt to re-validate the santized version.
+            // This time around, it will throw an exception if still invalid, so 
+            // that we'll stop before proceeding any further: 
+            
+            if (sanitized) {
+                validateVersionMetadata(harvestedVersion, cleanupLog);
+            }
+               
+            DatasetFieldUtil.tidyUpFields(harvestedVersion.getDatasetFields(), true);
+
+            if (existingDataset != null) {
+                importedDataset = engineSvc.submit(new UpdateHarvestedDatasetCommand(existingDataset, harvestedVersion, dataverseRequest));
+            } else {
+                importedDataset = engineSvc.submit(new CreateHarvestedDatasetCommand(harvestedDataset, dataverseRequest));
+            }
 
         } catch (JsonParseException | ImportException | CommandException ex) {
             logger.fine("Failed to import harvested dataset: " + ex.getClass() + ": " + ex.getMessage());
-            FileOutputStream savedJsonFileStream = new FileOutputStream(new File(metadataFile.getAbsolutePath() + ".json"));
-            byte[] jsonBytes = json.getBytes();
-            int i = 0;
-            while (i < jsonBytes.length) {
-                int chunkSize = i + 8192 <= jsonBytes.length ? 8192 : jsonBytes.length - i;
-                savedJsonFileStream.write(jsonBytes, i, chunkSize);
-                i += chunkSize;
-                savedJsonFileStream.flush();
+            
+            if (!"dataverse_json".equals(metadataFormat) && json != null) {
+                // If this was an xml format that were able to transform into 
+                // our json, let's save it for debugging etc. purposes
+                File tempFile = File.createTempFile("meta", ".json");
+                FileOutputStream savedJsonFileStream = new FileOutputStream(tempFile);
+                byte[] jsonBytes = json.getBytes();
+                int i = 0;
+                while (i < jsonBytes.length) {
+                    int chunkSize = i + 8192 <= jsonBytes.length ? 8192 : jsonBytes.length - i;
+                    savedJsonFileStream.write(jsonBytes, i, chunkSize);
+                    i += chunkSize;
+                    savedJsonFileStream.flush();
+                }
+                savedJsonFileStream.close();
+                logger.info("JSON produced saved in " + tempFile.getAbsolutePath());
             }
-            savedJsonFileStream.close();
-            logger.info("JSON produced saved in " + metadataFile.getAbsolutePath() + ".json");
             throw new ImportException("Failed to import harvested dataset: " + ex.getClass() + " (" + ex.getMessage() + ")", ex);
         }
         return importedDataset;
     }
 
-    public JsonObject ddiToJson(String xmlToParse) throws ImportException{
-        DatasetDTO dsDTO = null;
-
-        try {
-            dsDTO = importDDIService.doImport(ImportType.IMPORT, xmlToParse);
-        } catch (XMLStreamException e) {
-            throw new ImportException("XMLStreamException" + e);
-        }
+    public JsonObject ddiToJson(String xmlToParse) throws ImportException, XMLStreamException {
+        DatasetDTO dsDTO = importDDIService.doImport(ImportType.IMPORT, xmlToParse);
         // convert DTO to Json,
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
         String json = gson.toJson(dsDTO);
-        JsonReader jsonReader = Json.createReader(new StringReader(json));
-        JsonObject obj = jsonReader.readObject();
 
-        return obj;
+        return JsonUtil.getJsonObject(json);
     }
     
     public JsonObjectBuilder doImport(DataverseRequest dataverseRequest, Dataverse owner, String xmlToParse, String fileName, ImportType importType, PrintWriter cleanupLog) throws ImportException, IOException {
@@ -421,26 +452,26 @@ public JsonObjectBuilder doImport(DataverseRequest dataverseRequest, Dataverse o
         // convert DTO to Json, 
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
         String json = gson.toJson(dsDTO);
-        JsonReader jsonReader = Json.createReader(new StringReader(json));
-        JsonObject obj = jsonReader.readObject();
+        JsonObject obj = JsonUtil.getJsonObject(json);
         //and call parse Json to read it into a dataset   
         try {
-            JsonParser parser = new JsonParser(datasetfieldService, metadataBlockService, settingsService);
+            JsonParser parser = new JsonParser(datasetfieldService, metadataBlockService, settingsService, licenseService, datasetTypeService);
             parser.setLenient(!importType.equals(ImportType.NEW));
             Dataset ds = parser.parseDataset(obj);
 
             // For ImportType.NEW, if the user supplies a global identifier, and it's not a protocol
             // we support, it will be rejected.
+            
             if (importType.equals(ImportType.NEW)) {
-                if (ds.getGlobalIdString() != null && !ds.getProtocol().equals(settingsService.getValueForKey(SettingsServiceBean.Key.Protocol, ""))) {
-                    throw new ImportException("Could not register id " + ds.getGlobalIdString() + ", protocol not supported");
+                if (ds.getGlobalId().asString() != null && !PidUtil.getPidProvider(ds.getGlobalId().getProviderId()).canManagePID()) {
+                    throw new ImportException("Could not register id " + ds.getGlobalId().asString() + ", protocol not supported");
                 }
             }
 
             ds.setOwner(owner);
             ds.getLatestVersion().setDatasetFields(ds.getLatestVersion().initDatasetFields());
 
-            // Check data against required contraints
+            // Check data against required constraints
             List<ConstraintViolation<DatasetField>> violations = ds.getVersions().get(0).validateRequired();
             if (!violations.isEmpty()) {
                 if ( importType.equals(ImportType.HARVEST) ) {
@@ -502,7 +533,7 @@ public JsonObjectBuilder doImport(DataverseRequest dataverseRequest, Dataverse o
             }
 
 
-            Dataset existingDs = datasetService.findByGlobalId(ds.getGlobalIdString());
+            Dataset existingDs = datasetService.findByGlobalId(ds.getGlobalId().asString());
 
             if (existingDs != null) {
                 if (importType.equals(ImportType.HARVEST)) {
@@ -521,11 +552,11 @@ public JsonObjectBuilder doImport(DataverseRequest dataverseRequest, Dataverse o
                     // check that the version number isn't already in the dataset
                     for (DatasetVersion dsv : existingDs.getVersions()) {
                         if (dsv.getVersionNumber().equals(ds.getLatestVersion().getVersionNumber())) {
-                            throw new ImportException("VersionNumber " + ds.getLatestVersion().getVersionNumber() + " already exists in dataset " + existingDs.getGlobalIdString());
+                            throw new ImportException("VersionNumber " + ds.getLatestVersion().getVersionNumber() + " already exists in dataset " + existingDs.getGlobalId().asString());
                         }
                     }
                     DatasetVersion dsv = engineSvc.submit(new CreateDatasetVersionCommand(dataverseRequest, existingDs, ds.getVersions().get(0)));
-                    status = " created datasetVersion, for dataset "+ dsv.getDataset().getGlobalIdString();
+                    status = " created datasetVersion, for dataset "+ dsv.getDataset().getGlobalId().asString();
                     createdId = dsv.getId();
                 }
 
@@ -697,6 +728,104 @@ private String convertInvalidDateString(String inString){
         return null;
     }
 
+    /**
+     * A shortcut method for validating AND attempting to sanitize a DatasetVersion
+     * @param version
+     * @param cleanupLog - any invalid values and their replacements are logged there
+     * @return true if any invalid values were encountered and sanitized
+     * @throws ImportException (although it should never happen in this mode)
+     */
+    private boolean validateAndSanitizeVersionMetadata(DatasetVersion version, PrintWriter cleanupLog) throws ImportException {
+        return validateVersionMetadata(version, true, cleanupLog);
+    }
+    
+    /**
+     * A shortcut method for validating a DatasetVersion; will throw an exception 
+     * if invalid, without attempting to sanitize the invalid values. 
+     * @param version
+     * @param log - will log the invalid fields encountered there 
+     * @throws ImportException 
+     */
+    private void validateVersionMetadata(DatasetVersion version, PrintWriter log) throws ImportException {
+        validateVersionMetadata(version, false, log);
+    } 
+    
+    /**
+     * Validate the metadata fields of a newly-created version, and depending on 
+     * the "sanitize" flag supplied, may or may not attempt to sanitize the supplied
+     * values by replacing them with "NA"s. 
+     * @param version
+     * @param sanitize - boolean indicating whether to attempt to fix invalid values
+     * @param cleanupLog - to log any invalid values encountered will be logged
+     * @return - true if any invalid values have been replaced  
+     * @throws ImportException 
+     */
+    private boolean validateVersionMetadata(DatasetVersion version, boolean sanitize, PrintWriter cleanupLog) throws ImportException {
+        boolean fixed = false;
+        Set<ConstraintViolation> invalidViolations = version.validate();
+        if (!invalidViolations.isEmpty()) {
+            for (ConstraintViolation v : invalidViolations) {
+                Object invalid = v.getRootBean();
+                String msg = "";
+                if (invalid instanceof DatasetField) {
+                    DatasetField f = (DatasetField) invalid; 
+                    
+                    msg += "Missing required field: " + f.getDatasetFieldType().getDisplayName() + ";";                  
+                    if (sanitize) {
+                        msg += " populated with '" + DatasetField.NA_VALUE + "'";
+                        f.setSingleValue(DatasetField.NA_VALUE);
+                        fixed = true;
+                    }
+                } else if (invalid instanceof DatasetFieldValue) {
+                    DatasetFieldValue fv = (DatasetFieldValue) invalid;
+                    
+                    msg += "Invalid metadata field: " + fv.getDatasetField().getDatasetFieldType().getDisplayName() + "; "
+                            + "Invalid value:  '" + fv.getValue() + "'";
+                    if (sanitize) {
+                        msg += ", replaced with '" + DatasetField.NA_VALUE + "'";
+                        fv.setValue(DatasetField.NA_VALUE);
+                        fixed = true;
+                    }
+                } else {
+                    // DatasetVersion.validate() can also produce constraint violations
+                    // in TermsOfUse and FileMetadata classes. 
+                    // We do not make any attempt to sanitize those.
+                    if (invalid != null) {
+                        msg += "Invalid " + invalid.getClass().getName() + ": " + v.getMessage();
+                    }
+                }
+                cleanupLog.println(msg);
+
+                // Note: "NA" does not work with certain fields. For example, 
+                // using it to populate a GeoBox coordinate value is going 
+                // to result in an invalid field. So we'll need to validate the 
+                // version again after the first, sanitizing pass and see if it 
+                // helped or not.
+            }
+            if (!sanitize) {
+                throw new ImportException("Version was still failing validation after the first attempt to sanitize the invalid values.");
+            }
+        }
+        return fixed;
+    }
+
+    /**
+     * Helper method that creates a throwaway Harvested Dataset to temporarily 
+     * attach the newly-harvested version to. We need this when, instead of 
+     * importing a brand-new harvested dataset from scratch, we are planning to
+     * attempt to update an already existing dataset harvested from the same 
+     * archival location.
+     * @param harvestedVersion - a newly created Version imported from harvested metadata
+     * @return - a temporary dataset to which the new version has been attached
+     */
+    private Dataset createTemporaryHarvestedDataset(DatasetVersion harvestedVersion) {
+        Dataset tempDataset = new Dataset();
+        harvestedVersion.setDataset(tempDataset);
+        tempDataset.setVersions(new ArrayList<>(1));
+        tempDataset.getVersions().add(harvestedVersion);
+        
+        return tempDataset;
+    }
 
     private static class MyCustomFormatter extends Formatter {
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/util/JsonResponseBuilder.java b/src/main/java/edu/harvard/iq/dataverse/api/util/JsonResponseBuilder.java
new file mode 100644
index 00000000000..a80d54508fd
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/util/JsonResponseBuilder.java
@@ -0,0 +1,281 @@
+package edu.harvard.iq.dataverse.api.util;
+
+import jakarta.json.Json;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
+import edu.harvard.iq.dataverse.api.filter.ApiBlockingFilter;
+
+import java.io.IOException;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class JsonResponseBuilder {
+    
+    private JsonObjectBuilder entityBuilder = Json.createObjectBuilder();
+    private Response.ResponseBuilder jerseyResponseBuilder;
+    private boolean alreadyLogged = false;
+    
+    private JsonResponseBuilder() {}
+    
+    /**
+     * Create an error response from an numeric error code (should be >= 400)
+     * @param httpStatusCode Numerical HTTP status code
+     * @return A builder with a basic JSON body
+     * @throws IllegalArgumentException if fromResponse isn't an error response
+     */
+    public static JsonResponseBuilder error(int httpStatusCode) {
+        if (httpStatusCode < 400) {
+            throw new IllegalArgumentException("A status code < 400 cannot be an error indicating response.");
+        }
+        
+        JsonResponseBuilder b = new JsonResponseBuilder();
+        b.jerseyResponseBuilder = Response.status(httpStatusCode);
+        b.entityBuilder.add("status", "ERROR");
+        b.entityBuilder.add("code", httpStatusCode);
+        // include default message if present
+        getDefaultMessage(httpStatusCode).ifPresent(v -> b.entityBuilder.add("message", v));
+        
+        return b;
+    }
+    
+    /**
+     * Create an error response from a Response.Status.
+     * @param status A JAX-RS Response.Status object
+     * @return A builder with a basic JSON body
+     * @throws IllegalArgumentException if fromResponse isn't an error response
+     */
+    public static JsonResponseBuilder error(Response.Status status) {
+        JsonResponseBuilder b = error(status.getStatusCode());
+        b.jerseyResponseBuilder = Response.status(status);
+        return b;
+    }
+    
+    /**
+     * Create an error response from an existing response.
+     * @param fromResponse An existing JAX-RS Response
+     * @return A builder with a basic JSON body
+     * @throws IllegalArgumentException if fromResponse isn't an error response
+     */
+    public static JsonResponseBuilder error(Response fromResponse) {
+        JsonResponseBuilder b = error(fromResponse.getStatus());
+        b.jerseyResponseBuilder = Response.fromResponse(fromResponse);
+        return b;
+    }
+    
+    /**
+     * Add a human friendly message to the response
+     * @param message A human readable message
+     * @return The enhanced builder
+     */
+    public JsonResponseBuilder message(String message) {
+        this.entityBuilder.add("message", message);
+        return this;
+    }
+    
+    /**
+     * Set an identifier for this (usually included in logs, too).
+     * @param id A String containing an (ideally unique) identifier
+     * @return The enhanced builder
+     */
+    public JsonResponseBuilder incidentId(String id) {
+        this.entityBuilder.add("incidentId", id);
+        return this;
+    }
+    
+    /**
+     * Add a UUID random identifier for errors. Will overwrite existing.
+     * @return The enhanced builder
+     */
+    public JsonResponseBuilder randomIncidentId() {
+        this.entityBuilder.add("incidentId", UUID.randomUUID().toString());
+        return this;
+    }
+    
+    /**
+     * Add more details about the original request: what URL was used,
+     * what HTTP method involved?
+     * @param request The original request (usually provided from a context)
+     * @return The enhanced builder
+     */
+    public JsonResponseBuilder request(HttpServletRequest request) {
+        this.entityBuilder.add("requestUrl", getOriginalURL(request));
+        this.entityBuilder.add("requestMethod", request.getMethod());
+        return this;
+    }
+    
+    /**
+     * Add more details about the original request: what content type was sent?
+     * @param request The original request (usually provided from a context)
+     * @return The enhanced builder
+     */
+    public JsonResponseBuilder requestContentType(HttpServletRequest request) {
+        String type = request.getContentType();
+        this.entityBuilder.add("requestContentType", ((type==null) ? JsonValue.NULL : Json.createValue(type)));
+        return this;
+    }
+    
+    /**
+     * Add more details about internal errors (exceptions) to the response.
+     * Will include a detail about the cause if exception has one.
+     * @param ex An exception.
+     * @return The enhanced builder
+     */
+    public JsonResponseBuilder internalError(Throwable ex) {
+        this.entityBuilder.add("interalError", ex.getClass().getSimpleName());
+        if (ex.getCause() != null) {
+            this.entityBuilder.add("internalCause", ex.getCause().getClass().getSimpleName());
+        }
+        return this;
+    }
+    
+    /**
+     * Finish building a Jersey JAX-RS response with JSON message
+     * @return JAX-RS response including JSON message
+     */
+    public Response build() {
+        return jerseyResponseBuilder.type(MediaType.APPLICATION_JSON_TYPE)
+            .entity(this.entityBuilder.build())
+            .build();
+    }
+    
+    /**
+     * For usage in non-Jersey areas like servlet filters, blocks, etc.,
+     * apply the response to the Servlet provided response object.
+     * @param response The ServletResponse from the context
+     * @throws IOException
+     */
+    public void apply(ServletResponse response) throws IOException {
+        HttpServletResponse httpServletResponse = (HttpServletResponse) response;
+        apply(httpServletResponse);
+    }
+    
+    /**
+     * For usage in non-Jersey areas like servlet filters, blocks, etc.,
+     * apply the response to the Servlet provided response object.
+     * @param response The HttpServletResponse from the context
+     * @throws IOException
+     */
+    public void apply(HttpServletResponse response) throws IOException {
+        Response jersey = jerseyResponseBuilder.build();
+        response.setStatus(jersey.getStatus());
+        response.setContentType(MediaType.APPLICATION_JSON);
+        response.getWriter().print(entityBuilder.build().toString());
+        response.getWriter().flush();
+    }
+    
+    /**
+     * Log this JSON response as a useful log message.
+     * Should be done before calling build(), but after adding any decorations.
+     *
+     * The log message will contain a message with the flattened JSON entity:
+     * { "status": "ERROR", "code": 401 } -> _status=ERROR;_code=401
+     *
+     * Will prevent logging the same response twice.
+     *
+     * @param logger Provide a logger instance to write to
+     * @param level Provide a level at which this should be logged
+     * @return The unmodified builder.
+     */
+    public JsonResponseBuilder log(Logger logger, Level level) {
+        return this.log(logger, level, Optional.empty());
+    }
+    
+    /**
+     * Log this JSON response as a useful log message.
+     * Should be done before calling build(), but after adding any decorations.
+     *
+     * The log message will contain a message with the flattened JSON entity:
+     * { "status": "ERROR", "code": 401 } -> _status=ERROR;_code=401
+     *
+     * If an exception is given, it will be folled by a "|" and the exception message
+     * formatted by the logging system itself.
+     *
+     * Will prevent logging the same response twice.
+     *
+     * @param logger Provide a logger instance to write to
+     * @param level Provide a level at which this should be logged
+     * @param ex An optional exception to be included in the log message.
+     * @param includeStackTrace whether to also include the stack trace 
+     * @return The unmodified builder.
+     */
+    public JsonResponseBuilder log(Logger logger, Level level, Optional<Throwable> ex) {
+        return log(logger, level, ex, false);
+    }
+    public JsonResponseBuilder log(Logger logger, Level level, Optional<Throwable> ex, boolean includeStackTrace) {
+        if ( ! logger.isLoggable(level) || alreadyLogged )
+            return this;
+        
+        StringBuilder metadata = new StringBuilder("");
+        this.entityBuilder.build()
+            .forEach((k,v) -> metadata.append("_"+k+"="+v.toString()+";"));
+        // remove trailing ;
+        metadata.deleteCharAt(metadata.length()-1);
+        
+        if (ex.isPresent()) {
+            ex.get().printStackTrace();
+            metadata.append("|");
+            logger.log(level, metadata.toString(), ex);
+            if(includeStackTrace) {
+                logger.log(level, ExceptionUtils.getStackTrace(ex.get()));
+            }
+        } else {
+            logger.log(level, metadata.toString());
+        }
+        this.alreadyLogged = true;
+        return this;
+    }
+
+    
+    /**
+     * Build a complete request URL for logging purposes.
+     * Masks query parameter "unblock-key" if present to avoid leaking secrets.
+     * @param req The request
+     * @return The requests URL sent by the client
+     */
+    public static String getOriginalURL(HttpServletRequest req) {
+        // Rebuild the original request URL: http://stackoverflow.com/a/5212336/356408
+        String scheme = req.getScheme();             // http
+        String serverName = req.getServerName();     // hostname.com
+        int serverPort = req.getServerPort();        // 80
+        String contextPath = req.getContextPath();   // /mywebapp
+        String servletPath = req.getServletPath();   // /servlet/MyServlet
+        String pathInfo = req.getPathInfo();         // /a/b;c=123
+        String queryString = req.getQueryString();   // d=789
+        
+        // Reconstruct original requesting URL
+        StringBuilder url = new StringBuilder();
+        url.append(scheme).append("://").append(serverName);
+        if (serverPort != 80 && serverPort != 443) {
+            url.append(":").append(serverPort);
+        }
+        url.append(contextPath).append(servletPath);
+        if (pathInfo != null) {
+            url.append(pathInfo);
+        }
+        if (queryString != null) {
+            // filter for unblock-key parameter and mask the key
+            String maskedQueryString = queryString.replaceAll(ApiBlockingFilter.UNBLOCK_KEY_QUERYPARAM+"=.+?\\b", ApiBlockingFilter.UNBLOCK_KEY_QUERYPARAM+"=****");
+            url.append("?").append(maskedQueryString);
+        }
+        
+        return url.toString();
+    }
+    
+    public static Optional<String> getDefaultMessage(int httpStatusCode) {
+        switch (httpStatusCode) {
+            case 500: return Optional.of("Internal server error. More details available at the server logs.");
+            default: return Optional.empty();
+        }
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthFilter.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthFilter.java
index 15d1cb07a11..c93a1496c17 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthFilter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthFilter.java
@@ -8,14 +8,14 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
-import javax.inject.Inject;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.inject.Inject;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class AuthFilter implements Filter {
 
@@ -29,9 +29,7 @@ public void init(FilterConfig filterConfig) throws ServletException {
         logger.info(AuthFilter.class.getName() + "initialized. filterConfig.getServletContext().getServerInfo(): " + filterConfig.getServletContext().getServerInfo());
 
         try {
-            String glassfishLogsDirectory = "logs";
-
-            FileHandler logFile = new FileHandler(".." + File.separator + glassfishLogsDirectory + File.separator + "authfilter.log");
+            FileHandler logFile = new FileHandler( System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "authfilter.log");
             SimpleFormatter formatterTxt = new SimpleFormatter();
             logFile.setFormatter(formatterTxt);
             logger.addHandler(logFile);
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthTestDataServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthTestDataServiceBean.java
index ec64800c92d..9cee3ec67c7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthTestDataServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthTestDataServiceBean.java
@@ -15,8 +15,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.Stateless;
+import org.apache.commons.lang3.StringUtils;
 
 @Stateless
 public class AuthTestDataServiceBean {
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthUtil.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthUtil.java
index 27143199b5b..01f1cbdf0a3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthUtil.java
@@ -3,6 +3,8 @@
 import edu.harvard.iq.dataverse.authorization.providers.builtin.DataverseUserPage;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProvider;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
 import java.util.Collection;
 import java.util.logging.Logger;
 
@@ -10,12 +12,15 @@ public class AuthUtil {
 
     private static final Logger logger = Logger.getLogger(DataverseUserPage.class.getCanonicalName());
 
-    public static boolean isNonLocalLoginEnabled(Collection<AuthenticationProvider> providers) {
+    public static boolean isNonLocalSignupEnabled(Collection<AuthenticationProvider> providers, SystemConfig systemConfig) {
         if (providers != null) {
+            
             for (AuthenticationProvider provider : providers) {
                 if (provider instanceof AbstractOAuth2AuthenticationProvider || provider instanceof ShibAuthenticationProvider) {
                     logger.fine("found an remote auth provider (returning true): " + provider.getId());
-                    return true;
+                    if(!systemConfig.isSignupDisabledForRemoteAuthProvider(provider.getId())) {
+                        return true;
+                    }
                 } else {
                     logger.fine("not a remote auth provider: " + provider.getId());
                 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java
index 0bd1a81048a..94871c89083 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java
@@ -14,16 +14,21 @@ public class AuthenticatedUserDisplayInfo extends RoleAssigneeDisplayInfo {
     @NotBlank(message = "{user.firstName}")
     private String firstName;
     private String position;
+    private String orcid;
     
     /*
      * @todo Shouldn't we persist the displayName too? It still exists on the
      * authenticateduser table.
      */
     public AuthenticatedUserDisplayInfo(String firstName, String lastName, String emailAddress, String affiliation, String position) {
+        this(firstName, lastName, emailAddress, affiliation, position, null);
+    }
+    public AuthenticatedUserDisplayInfo(String firstName, String lastName, String emailAddress, String affiliation, String position, String orcid) {
         super(firstName + " " + lastName,emailAddress,affiliation);
         this.firstName = firstName;
         this.lastName = lastName;
-        this.position = position;        
+        this.position = position;
+        this.orcid = orcid;
     }
 
     public AuthenticatedUserDisplayInfo() {
@@ -31,6 +36,7 @@ public AuthenticatedUserDisplayInfo() {
         firstName="";
         lastName="";
         position="";
+        orcid=null;
     }
 
     
@@ -39,7 +45,7 @@ public AuthenticatedUserDisplayInfo() {
      * @param src the display info {@code this} will be a copy of.
      */
     public AuthenticatedUserDisplayInfo( AuthenticatedUserDisplayInfo src ) {
-        this( src.getFirstName(), src.getLastName(), src.getEmailAddress(), src.getAffiliation(), src.getPosition());
+        this( src.getFirstName(), src.getLastName(), src.getEmailAddress(), src.getAffiliation(), src.getPosition(), src.getOrcid());
     }
     
     public String getLastName() {
@@ -98,6 +104,27 @@ public boolean equals(Object obj) {
         }
         return Objects.equals(this.position, other.position) && super.equals(obj);
     }
+
+    public void setOrcid(String orcidUrl) {
+        this.orcid=orcidUrl;
+    }
+
+    public String getOrcid() {
+        return orcid;
+    }
+    
+    public String getOrcidForDisplay() {
+        String orcidUrl = getOrcid();
+        if(orcidUrl == null) {
+            return null;
+        }
+        int index = orcidUrl.lastIndexOf('/');
+        if (index > 0) {
+            return orcidUrl.substring(index + 1);
+        } else {
+            return orcidUrl;
+        }
+    }
     
 }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserLookup.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserLookup.java
index 94a773bc977..3291dd2efbf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserLookup.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserLookup.java
@@ -2,17 +2,17 @@
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import java.io.Serializable;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 
 /**
  * A somewhat glorified key-value pair, persisted in the database.
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationProvider.java
index ec989317758..8dfe7ca86b3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationProvider.java
@@ -28,20 +28,11 @@ public interface AuthenticationProvider {
         
     AuthenticationProviderDisplayInfo getInfo();
     
+    default int getOrder() { return 1; }
     default boolean isPasswordUpdateAllowed() { return false; };
     default boolean isUserInfoUpdateAllowed() { return false; };
     default boolean isUserDeletionAllowed() { return false; };
     default boolean isOAuthProvider() { return false; };
-    /** @todo Consider moving some or all of these to AuthenticationProviderDisplayInfo.*/
-    /** The identifier is only displayed in the UI if it's meaningful, such as an ORCID iD.*/
-    default boolean isDisplayIdentifier() { return false; };
-    /** ORCID calls their persistent id an "ORCID iD".*/
-    default String getPersistentIdName() { return null; };
-    /** ORCID has special language to describe their ID: http://members.orcid.org/logos-web-graphics */
-    default String getPersistentIdDescription() { return null; };
-    /** An ORCID example would be the "http://orcid.org/" part of http://orcid.org/0000-0002-7874-374X*/
-    default String getPersistentIdUrlPrefix() { return null; };
-    default String getLogo() { return null; };
     
     
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationProvidersRegistrationServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationProvidersRegistrationServiceBean.java
new file mode 100644
index 00000000000..1dfd7bdb713
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationProvidersRegistrationServiceBean.java
@@ -0,0 +1,311 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse.authorization;
+
+import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
+import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
+import edu.harvard.iq.dataverse.authorization.exceptions.AuthenticationProviderFactoryNotFoundException;
+import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationSetupException;
+import edu.harvard.iq.dataverse.authorization.providers.AuthenticationProviderFactory;
+import edu.harvard.iq.dataverse.authorization.providers.AuthenticationProviderRow;
+import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProviderFactory;
+import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2AuthenticationProviderFactory;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.oidc.OIDCAuthenticationProviderFactory;
+import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProviderFactory;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Lock;
+import static jakarta.ejb.LockType.READ;
+import static jakarta.ejb.LockType.WRITE;
+import jakarta.ejb.Singleton;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+
+/**
+ *
+ * @author Leonid Andreev
+ */
+/**
+ * The AuthenticationProvidersRegistrationService is responsible for registering and listing
+ * AuthenticationProviders. There's a single instance per application. 
+ * 
+ * Register the providers in the {@link #startup()} method.
+ */
+@Named
+@Lock(READ)
+@Singleton
+public class AuthenticationProvidersRegistrationServiceBean {
+
+    private static final Logger logger = Logger.getLogger(AuthenticationProvidersRegistrationServiceBean.class.getName());
+    
+    @EJB
+    BuiltinUserServiceBean builtinUserServiceBean;
+
+    @EJB
+    PasswordValidatorServiceBean passwordValidatorService;
+    
+    @EJB
+    protected ActionLogServiceBean actionLogSvc;
+    
+    @EJB
+    AuthenticationServiceBean authenticationService;
+    
+    /**
+     * The maps below (the objects themselves) are "final", but the
+     * values will be populated in @PostConstruct (see below) during 
+     * the initialization and in later calls to the service. 
+     * This is a @Singleton, so we are guaranteed that there is only
+     * one application-wide copy of each of these maps.
+     */
+    
+    /**
+     * Authentication Provider Factories:
+     */
+    final Map<String, AuthenticationProviderFactory> providerFactories = new HashMap<>();
+
+    /**
+     * Where all registered authentication providers live.
+     */
+    final Map<String, AuthenticationProvider> authenticationProviders = new HashMap<>();
+    
+    /**
+     * Index of all OAuth2 providers mapped to {@link #authenticationProviders}.
+     */
+    final Map<String, AbstractOAuth2AuthenticationProvider> oAuth2authenticationProviders = new HashMap<>();
+        
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    private EntityManager em;
+
+    private AuthenticationProvider orcidProvider;
+    
+    // does this method also need an explicit @Lock(WRITE)? 
+    // - I'm assuming not; since it's guaranteed to only be called once,
+    // via @PostConstruct in this @Singleton. -- L.A.
+    @PostConstruct
+    public void startup() {
+        
+        // First, set up the factories
+        try {
+            // @todo: Instead of hard-coding the factories here, consider 
+            // using @AutoService - similiarly how we are using with the 
+            // metadata Exporter classes. (may not necessarily be possible, or 
+            // easy; hence "consider" -- L.A.)
+            registerProviderFactory( new BuiltinAuthenticationProviderFactory(builtinUserServiceBean, passwordValidatorService, authenticationService) );
+            registerProviderFactory( new ShibAuthenticationProviderFactory() );
+            registerProviderFactory( new OAuth2AuthenticationProviderFactory() );
+            registerProviderFactory( new OIDCAuthenticationProviderFactory() );
+        
+        } catch (AuthorizationSetupException ex) { 
+            logger.log(Level.SEVERE, "Exception setting up the authentication provider factories: " + ex.getMessage(), ex);
+        }
+        
+        // Now, load the providers.
+        em.createNamedQuery("AuthenticationProviderRow.findAll", AuthenticationProviderRow.class)
+                .getResultList().forEach((row) -> {
+                    if(row.isEnabled()) {
+                    try {
+                        registerProvider( loadProvider(row) );
+                        
+                    } catch ( AuthenticationProviderFactoryNotFoundException e ) {
+                        logger.log(Level.SEVERE, "Cannot find authentication provider factory with alias '" + e.getFactoryAlias() + "'",e);
+                        
+                    } catch (AuthorizationSetupException ex) {
+                        logger.log(Level.SEVERE, "Exception setting up the authentication provider '" + row.getId() + "': " + ex.getMessage(), ex);
+                        }
+                    } else {
+                        // We still use an ORCID provider that is not enabled for login as a way to
+                        // authenticate ORCIDs being added to account profiles
+                        Map<String, String> data = OAuth2AuthenticationProviderFactory
+                                .parseFactoryData(row.getFactoryData());
+                        if ("orcid".equals(data.get("type"))) {
+                            try {
+                                setOrcidProvider(loadProvider(row));
+                            } catch (Exception e) {
+                                logger.log(Level.SEVERE, "Cannot register ORCID provider '" + row.getId());
+                            }
+                        }
+                    }
+                });
+        // If there is an enabled ORCID provider, we'll still use that in preference to a disabled one (there should only be one but this would handle a case where, for example, someone has a disabled sandbox ORCID provider and a real enabled ORCID provider)
+        // Could be changed in the future if there's a need for two different clients for login and adding ORCIDs to profiles
+        for (AuthenticationProvider provider : authenticationProviders.values()) {
+            if (provider instanceof OrcidOAuth2AP) {
+                setOrcidProvider(provider);
+            }
+        }
+        // Add providers registered via MPCONFIG
+        if (JvmSettings.OIDC_ENABLED.lookupOptional(Boolean.class).orElse(false)) {
+            try {
+                registerProvider(OIDCAuthenticationProviderFactory.buildFromSettings());
+            } catch (AuthorizationSetupException e) {
+                logger.log(Level.SEVERE, "Exception setting up an OIDC auth provider via MicroProfile Config", e);
+            }
+        }
+    }
+
+    private void setOrcidProvider(AuthenticationProvider provider) {
+        orcidProvider = provider;
+        
+    }
+
+    public AuthenticationProvider getOrcidProvider() {
+        return orcidProvider;
+    }
+
+    private void registerProviderFactory(AuthenticationProviderFactory aFactory) 
+            throws AuthorizationSetupException 
+    {
+        if ( providerFactories.containsKey(aFactory.getAlias()) ) {
+            throw new AuthorizationSetupException(
+                    "Duplicate alias " + aFactory.getAlias() + " for authentication provider factory.");
+        }
+        providerFactories.put( aFactory.getAlias(), aFactory);
+        logger.log( Level.FINE, "Registered Authentication Provider Factory {0} as {1}", 
+                new Object[]{aFactory.getInfo(), aFactory.getAlias()});
+    }
+    
+    /**
+     * Tries to load and {@link AuthenticationProvider} using the passed {@link AuthenticationProviderRow}.
+     * @param aRow The row to load the provider from.
+     * @return The provider, if successful
+     * @throws AuthenticationProviderFactoryNotFoundException If the row specifies a non-existent factory
+     * @throws AuthorizationSetupException If the factory failed to instantiate a provider from the row.
+     */
+    @Lock(WRITE)
+    public AuthenticationProvider loadProvider( AuthenticationProviderRow aRow )
+                throws AuthenticationProviderFactoryNotFoundException, AuthorizationSetupException {
+        AuthenticationProviderFactory fact = providerFactories.get((aRow.getFactoryAlias()));
+        
+        if ( fact == null ) throw new AuthenticationProviderFactoryNotFoundException(aRow.getFactoryAlias());
+        
+        return fact.buildProvider(aRow);
+    }
+    
+    @Lock(WRITE)
+    public void registerProvider(AuthenticationProvider aProvider) throws AuthorizationSetupException {
+        if ( authenticationProviders.containsKey(aProvider.getId()) ) {
+            throw new AuthorizationSetupException(
+                    "Duplicate id " + aProvider.getId() + " for authentication provider.");
+        }
+        authenticationProviders.put( aProvider.getId(), aProvider);
+        actionLogSvc.log( new ActionLogRecord(ActionLogRecord.ActionType.Auth, "registerProvider")
+            .setInfo(aProvider.getId() + ":" + aProvider.getInfo().getTitle()));
+        if ( aProvider instanceof AbstractOAuth2AuthenticationProvider ) {
+            oAuth2authenticationProviders.put(aProvider.getId(), (AbstractOAuth2AuthenticationProvider) aProvider);
+        }
+    }
+    
+    @Lock(READ)
+    public Map<String, AbstractOAuth2AuthenticationProvider> getOAuth2AuthProvidersMap() {
+        return oAuth2authenticationProviders;
+    }
+    
+    /*
+        the commented-out methods below were moved into this service in 
+        the quick patch produced for 4.20; but have been modified and moved 
+        back into AuthenticationServiceBean again for v5.0. -- L.A.
+    
+    @Lock(READ)
+    public AbstractOAuth2AuthenticationProvider getOAuth2Provider( String id ) {
+        return oAuth2authenticationProviders.get(id);
+    }
+    
+    @Lock(READ)
+    public Set<AbstractOAuth2AuthenticationProvider> getOAuth2Providers() {
+        return new HashSet<>(oAuth2authenticationProviders.values());
+    }*/
+    
+    @Lock(READ)
+    public Map<String, AuthenticationProvider> getAuthenticationProvidersMap() {
+        return authenticationProviders;
+    }
+    
+    @Lock(WRITE)
+    public void deregisterProvider( String id ) {
+        oAuth2authenticationProviders.remove( id );
+        if ( authenticationProviders.remove(id) != null ) {
+            actionLogSvc.log( new ActionLogRecord(ActionLogRecord.ActionType.Auth, "deregisterProvider")
+                .setInfo(id));
+            logger.log(Level.INFO,"Deregistered provider {0}", new Object[]{id});
+            logger.log(Level.INFO,"Providers left {0}", new Object[]{authenticationProviders.values()});
+        }
+    }
+    
+    /*
+    @Lock(READ)
+    public Set<String> getAuthenticationProviderIds() {
+        return authenticationProviders.keySet();
+    }
+
+    @Lock(READ)
+    public Collection<AuthenticationProvider> getAuthenticationProviders() {
+        return authenticationProviders.values();
+    }
+    
+    @Lock(READ)
+    public <T extends AuthenticationProvider> Set<String> getAuthenticationProviderIdsOfType( Class<T> aClass ) {
+        // @todo: remove this!
+        //logger.info("inside getAuthenticationProviderIdsOfType and sleeping for 20 seconds");
+        //try {
+        //    Thread.sleep(20000);
+        //} catch (Exception ex) {
+        //    logger.warning("Failed to sleep for 20 seconds.");
+        //}
+        Set<String> retVal = new TreeSet<>();
+        for ( Map.Entry<String, AuthenticationProvider> p : authenticationProviders.entrySet() ) {
+            if ( aClass.isAssignableFrom( p.getValue().getClass() ) ) {
+                retVal.add( p.getKey() );
+            }
+        }
+        //logger.info("done with getAuthenticationProviderIdsOfType.");
+        return retVal;
+    }
+    */
+    
+    @Lock(READ)
+    public Map<String, AuthenticationProviderFactory> getProviderFactoriesMap() {
+        return providerFactories; 
+    }
+    
+    /*
+    @Lock(READ)
+    public AuthenticationProviderFactory getProviderFactory( String alias ) {
+        return providerFactories.get(alias);
+    }
+    
+    @Lock(READ)
+    public AuthenticationProvider getAuthenticationProvider( String id ) {
+        //logger.info("inside getAuthenticationProvider()");
+        return authenticationProviders.get( id );
+    }
+    
+    @Lock(READ)
+    public AuthenticationProvider lookupProvider( AuthenticatedUser user )  {
+        return authenticationProviders.get(user.getAuthenticatedUserLookup().getAuthenticationProviderId());
+    }
+
+    @Lock(READ)
+    public Set<AuthenticationProviderFactory> listProviderFactories() {
+        return new HashSet<>( providerFactories.values() ); 
+    }
+    
+    @Lock(READ)
+    public boolean isOrcidEnabled() {
+        return oAuth2authenticationProviders.values().stream().anyMatch( s -> s.getId().toLowerCase().contains("orcid") );
+    }
+    */
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java
index 70e8c092df3..5e82c578d8e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java
@@ -1,87 +1,87 @@
 package edu.harvard.iq.dataverse.authorization;
 
+import com.nimbusds.oauth2.sdk.ParseException;
+import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
+import com.nimbusds.openid.connect.sdk.claims.UserInfo;
+import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
+import edu.harvard.iq.dataverse.DvObjectServiceBean;
+import edu.harvard.iq.dataverse.GuestbookResponseServiceBean;
+import edu.harvard.iq.dataverse.RoleAssigneeServiceBean;
 import edu.harvard.iq.dataverse.UserNotificationServiceBean;
 import edu.harvard.iq.dataverse.UserServiceBean;
+import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationException;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2Exception;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2UserRecord;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.oidc.OIDCAuthProvider;
+import edu.harvard.iq.dataverse.authorization.providers.shib.ShibUtil;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
 import edu.harvard.iq.dataverse.authorization.exceptions.AuthenticationFailedException;
-import edu.harvard.iq.dataverse.authorization.exceptions.AuthenticationProviderFactoryNotFoundException;
-import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationSetupException;
+import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroup;
+import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.AuthenticationProviderFactory;
-import edu.harvard.iq.dataverse.authorization.providers.AuthenticationProviderRow;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProvider;
-import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProviderFactory;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUser;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.PasswordEncryption;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
-import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2AuthenticationProviderFactory;
-import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GitHubOAuth2AP;
-import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GoogleOAuth2AP;
-import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProvider;
-import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProviderFactory;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailData;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
 import edu.harvard.iq.dataverse.passwordreset.PasswordResetData;
 import edu.harvard.iq.dataverse.passwordreset.PasswordResetServiceBean;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
+import edu.harvard.iq.dataverse.search.savedsearch.SavedSearchServiceBean;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean;
+import edu.harvard.iq.dataverse.workflow.PendingWorkflowInvocation;
 import edu.harvard.iq.dataverse.workflows.WorkflowComment;
+
+import java.io.IOException;
 import java.sql.Timestamp;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Singleton;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import java.util.stream.Collectors;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 /**
- * The AuthenticationManager is responsible for registering and listing
- * AuthenticationProviders. There's a single instance per application. 
+ * AuthenticationService is for general authentication-related operations.
+ * It's no longer responsible for registering and listing
+ * AuthenticationProviders! A dedicated singleton has been created for that
+ * purpose - AuthenticationProvidersRegistrationServiceBean - and all the 
+ * related code has been moved there. 
  * 
- * Register the providers in the {@link #startup()} method.
  */
 @Named
-@Singleton
+@Stateless
 public class AuthenticationServiceBean {
     private static final Logger logger = Logger.getLogger(AuthenticationServiceBean.class.getName());
     
-    /**
-     * Where all registered authentication providers live.
-     */
-    final Map<String, AuthenticationProvider> authenticationProviders = new HashMap<>();
-    
-    /**
-     * Index of all OAuth2 providers. They also live in {@link #authenticationProviders}.
-     */
-    final Map<String, AbstractOAuth2AuthenticationProvider> oAuth2authenticationProviders = new HashMap<>();
-    
-    final Map<String, AuthenticationProviderFactory> providerFactories = new HashMap<>();
+    @EJB
+    AuthenticationProvidersRegistrationServiceBean authProvidersRegistrationService;
     
     @EJB
     BuiltinUserServiceBean builtinUserServiceBean;
@@ -106,109 +106,50 @@ public class AuthenticationServiceBean {
 
     @EJB
     PasswordValidatorServiceBean passwordValidatorService;
-        
-    @PersistenceContext(unitName = "VDCNet-ejbPU")
-    private EntityManager em;
     
-    @PostConstruct
-    public void startup() {
-        
-        // First, set up the factories
-        try {
-            registerProviderFactory( new BuiltinAuthenticationProviderFactory(builtinUserServiceBean, passwordValidatorService, this) );
-            registerProviderFactory( new ShibAuthenticationProviderFactory() );
-            registerProviderFactory( new OAuth2AuthenticationProviderFactory() );
-        
-        } catch (AuthorizationSetupException ex) { 
-            logger.log(Level.SEVERE, "Exception setting up the authentication provider factories: " + ex.getMessage(), ex);
-        }
-        
-        // Now, load the providers.
-        em.createNamedQuery("AuthenticationProviderRow.findAllEnabled", AuthenticationProviderRow.class)
-                .getResultList().forEach((row) -> {
-                    try {
-                        registerProvider( loadProvider(row) );
-                        
-                    } catch ( AuthenticationProviderFactoryNotFoundException e ) {
-                        logger.log(Level.SEVERE, "Cannot find authentication provider factory with alias '" + e.getFactoryAlias() + "'",e);
-                        
-                    } catch (AuthorizationSetupException ex) {
-                        logger.log(Level.SEVERE, "Exception setting up the authentication provider '" + row.getId() + "': " + ex.getMessage(), ex);
-                    }
-        });
-    }
+    @EJB
+    DvObjectServiceBean dvObjSvc;
     
-    public void registerProviderFactory(AuthenticationProviderFactory aFactory) 
-            throws AuthorizationSetupException 
-    {
-        if ( providerFactories.containsKey(aFactory.getAlias()) ) {
-            throw new AuthorizationSetupException(
-                    "Duplicate alias " + aFactory.getAlias() + " for authentication provider factory.");
-        }
-        providerFactories.put( aFactory.getAlias(), aFactory);
-        logger.log( Level.FINE, "Registered Authentication Provider Factory {0} as {1}", 
-                new Object[]{aFactory.getInfo(), aFactory.getAlias()});
-    }
+    @EJB
+    RoleAssigneeServiceBean roleAssigneeSvc;
     
-    /**
-     * Tries to load and {@link AuthenticationProvider} using the passed {@link AuthenticationProviderRow}.
-     * @param aRow The row to load the provider from.
-     * @return The provider, if successful
-     * @throws AuthenticationProviderFactoryNotFoundException If the row specifies a non-existent factory
-     * @throws AuthorizationSetupException If the factory failed to instantiate a provider from the row.
-     */
-    public AuthenticationProvider loadProvider( AuthenticationProviderRow aRow )
-                throws AuthenticationProviderFactoryNotFoundException, AuthorizationSetupException {
-        AuthenticationProviderFactory fact = getProviderFactory(aRow.getFactoryAlias());
-        
-        if ( fact == null ) throw new AuthenticationProviderFactoryNotFoundException(aRow.getFactoryAlias());
-        
-        return fact.buildProvider(aRow);
-    }
+    @EJB
+    GuestbookResponseServiceBean gbRespSvc;
     
-    public void registerProvider(AuthenticationProvider aProvider) throws AuthorizationSetupException {
-        if ( authenticationProviders.containsKey(aProvider.getId()) ) {
-            throw new AuthorizationSetupException(
-                    "Duplicate id " + aProvider.getId() + " for authentication provider.");
-        }
-        authenticationProviders.put( aProvider.getId(), aProvider);
-        actionLogSvc.log( new ActionLogRecord(ActionLogRecord.ActionType.Auth, "registerProvider")
-            .setInfo(aProvider.getId() + ":" + aProvider.getInfo().getTitle()));
-        if ( aProvider instanceof AbstractOAuth2AuthenticationProvider ) {
-            oAuth2authenticationProviders.put(aProvider.getId(), (AbstractOAuth2AuthenticationProvider) aProvider);
-        }
-        
-    }
+    @EJB
+    DatasetVersionServiceBean datasetVersionService;
     
+    @EJB 
+    ExplicitGroupServiceBean explicitGroupService;
+
+    @EJB
+    SavedSearchServiceBean savedSearchService;
+
+    @EJB
+    PrivateUrlServiceBean privateUrlService;
+ 
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    EntityManager em;
+
     public AbstractOAuth2AuthenticationProvider getOAuth2Provider( String id ) {
-        return oAuth2authenticationProviders.get(id);
+        return authProvidersRegistrationService.getOAuth2AuthProvidersMap().get(id);
     }
     
     public Set<AbstractOAuth2AuthenticationProvider> getOAuth2Providers() {
-        return new HashSet<>(oAuth2authenticationProviders.values());
-    }
-    
-    public void deregisterProvider( String id ) {
-        oAuth2authenticationProviders.remove( id );
-        if ( authenticationProviders.remove(id) != null ) {
-            actionLogSvc.log( new ActionLogRecord(ActionLogRecord.ActionType.Auth, "deregisterProvider")
-                .setInfo(id));
-            logger.log(Level.INFO,"Deregistered provider {0}", new Object[]{id});
-            logger.log(Level.INFO,"Providers left {0}", new Object[]{getAuthenticationProviderIds()});
-        }
+        return new HashSet<>(authProvidersRegistrationService.getOAuth2AuthProvidersMap().values());
     }
     
     public Set<String> getAuthenticationProviderIds() {
-        return authenticationProviders.keySet();
+        return authProvidersRegistrationService.getAuthenticationProvidersMap().keySet();
     }
 
     public Collection<AuthenticationProvider> getAuthenticationProviders() {
-        return authenticationProviders.values();
+        return authProvidersRegistrationService.getAuthenticationProvidersMap().values();
     }
     
     public <T extends AuthenticationProvider> Set<String> getAuthenticationProviderIdsOfType( Class<T> aClass ) {
         Set<String> retVal = new TreeSet<>();
-        for ( Map.Entry<String, AuthenticationProvider> p : authenticationProviders.entrySet() ) {
+        for ( Map.Entry<String, AuthenticationProvider> p : authProvidersRegistrationService.getAuthenticationProvidersMap().entrySet() ) {
             if ( aClass.isAssignableFrom( p.getValue().getClass() ) ) {
                 retVal.add( p.getKey() );
             }
@@ -217,11 +158,11 @@ public <T extends AuthenticationProvider> Set<String> getAuthenticationProviderI
     }
     
     public AuthenticationProviderFactory getProviderFactory( String alias ) {
-        return providerFactories.get(alias);
+        return authProvidersRegistrationService.getProviderFactoriesMap().get(alias);
     }
     
     public AuthenticationProvider getAuthenticationProvider( String id ) {
-        return authenticationProviders.get( id );
+        return authProvidersRegistrationService.getAuthenticationProvidersMap().get( id );
     }
     
     public AuthenticatedUser findByID(Object pk){
@@ -241,7 +182,7 @@ public void removeApiToken(AuthenticatedUser user){
     }
     
     public boolean isOrcidEnabled() {
-        return oAuth2authenticationProviders.values().stream().anyMatch( s -> s.getId().toLowerCase().contains("orcid") );
+        return authProvidersRegistrationService.getOAuth2AuthProvidersMap().values().stream().anyMatch( s -> s.getId().toLowerCase().contains("orcid") );
     }
     
     /**
@@ -258,10 +199,7 @@ public boolean isOrcidEnabled() {
      * 
      * Before calling this method, make sure you've deleted all the stuff tied
      * to the user, including stuff they've created, role assignments, group
-     * assignments, etc.
-     * 
-     * Longer term, the intention is to have a "disableAuthenticatedUser"
-     * method/command. See https://github.com/IQSS/dataverse/issues/2419
+     * assignments, etc. See the "removeAuthentictedUserItems" (sic) method.
      */
     public void deleteAuthenticatedUser(Object pk) {
         AuthenticatedUser user = em.find(AuthenticatedUser.class, pk);
@@ -271,6 +209,7 @@ public void deleteAuthenticatedUser(Object pk) {
             if (apiToken != null) {
                 em.remove(apiToken);
             }
+            // @todo: this should be handed down to the service instead of doing it here.
             ConfirmEmailData confirmEmailData = confirmEmailService.findSingleConfirmEmailDataByUser(user);
             if (confirmEmailData != null) {
                 /**
@@ -308,11 +247,15 @@ public AuthenticatedUser getAuthenticatedUserWithProvider( String identifier ) {
             AuthenticatedUser authenticatedUser = em.createNamedQuery("AuthenticatedUser.findByIdentifier", AuthenticatedUser.class)
                     .setParameter("identifier", identifier)
                     .getSingleResult();
-            AuthenticatedUserLookup aul = em.createNamedQuery("AuthenticatedUserLookup.findByAuthUser", AuthenticatedUserLookup.class)
-                    .setParameter("authUser", authenticatedUser)
-                    .getSingleResult();
-            authenticatedUser.setAuthProviderId(aul.getAuthenticationProviderId());
-            
+
+            if (authenticatedUser != null) {
+                AuthenticatedUserLookup aul = em.createNamedQuery("AuthenticatedUserLookup.findByAuthUser", AuthenticatedUserLookup.class)
+                        .setParameter("authUser", authenticatedUser)
+                        .getSingleResult();
+
+                authenticatedUser.setAuthProviderId(aul.getAuthenticationProviderId());
+            }
+
             return authenticatedUser;
         } catch ( NoResultException nre ) {
             return null;
@@ -367,14 +310,12 @@ public AuthenticatedUser getUpdateAuthenticatedUser( String authenticationProvid
             // yay! see if we already have this user.
             AuthenticatedUser user = lookupUser(authenticationProviderId, resp.getUserId());
 
-            if (user != null){
+            if (user != null && !user.isDeactivated()) {
                 user = userService.updateLastLogin(user);
             }
-            
+
             if ( user == null ) {
                 throw new IllegalStateException("Authenticated user does not exist. The functionality to support creating one at this point in authentication has been removed.");
-                //return createAuthenticatedUser(
-                //        new UserRecordIdentifier(authenticationProviderId, resp.getUserId()), resp.getUserId(), resp.getUserDisplayInfo(), true );
             } else {
                 if (BuiltinAuthenticationProvider.PROVIDER_ID.equals(user.getAuthenticatedUserLookup().getAuthenticationProviderId())) {
                     return user;
@@ -414,7 +355,7 @@ public AuthenticatedUser lookupUser(String authPrvId, String userPersistentId) {
     }
     
     public AuthenticationProvider lookupProvider( AuthenticatedUser user )  {
-        return authenticationProviders.get(user.getAuthenticatedUserLookup().getAuthenticationProviderId());
+        return authProvidersRegistrationService.getAuthenticationProvidersMap().get(user.getAuthenticatedUserLookup().getAuthenticationProviderId());
     }
     
     public ApiToken findApiToken(String token) {
@@ -433,12 +374,34 @@ public ApiToken findApiTokenByUser(AuthenticatedUser au) {
         }
         TypedQuery<ApiToken> typedQuery = em.createNamedQuery("ApiToken.findByUser", ApiToken.class);
         typedQuery.setParameter("user", au);
-        try {
-            return typedQuery.getSingleResult();
-        } catch (NoResultException | NonUniqueResultException ex) {
-            logger.log(Level.INFO, "When looking up API token for {0} caught {1}", new Object[]{au, ex});
+        List<ApiToken> tokens = typedQuery.getResultList();
+        if (tokens.isEmpty()) {
+            // Normal case - no token exists
             return null;
         }
+        if (tokens.size() == 1) {
+            // Normal case - one token that may or may not have expired
+            return tokens.get(0);
+        } else {
+            // We have more than one due to https://github.com/IQSS/dataverse/issues/6389 or
+            // similar, so we should delete all but one token - pick the latest.
+            ApiToken newestToken = null;
+            for (ApiToken token : tokens) {
+                if (newestToken == null) {
+                    newestToken = token;
+                } else {
+                    Timestamp time = token.getExpireTime();
+                    if (time.before(newestToken.getExpireTime())) {
+                        em.remove(token);
+                    } else {
+                        em.remove(newestToken);
+                        newestToken = token;
+                    }
+                }
+            }
+            // Null if there are no tokens
+            return newestToken;
+        }
     }
     
     
@@ -474,11 +437,109 @@ public AuthenticatedUser lookupUser( String apiToken ) {
         if ( tkn.getExpireTime() != null ) {
             if ( tkn.getExpireTime().before( new Timestamp(new Date().getTime())) ) {
                 em.remove(tkn);
+		logger.info("attempted access with expired token: " + apiToken);
                 return null;
             }
         }
         
-        return tkn.getAuthenticatedUser();
+        AuthenticatedUser user = tkn.getAuthenticatedUser();
+        if (!user.isDeactivated()) {
+            return user;
+        } else {
+            logger.info("attempted access with token from deactivated user: " + apiToken);
+            return null;
+        }
+    }
+    
+    public AuthenticatedUser lookupUserForWorkflowInvocationID(String wfId) {
+        try {
+            PendingWorkflowInvocation pwfi = em.find(PendingWorkflowInvocation.class, wfId);
+            if (pwfi == null) {
+                return null;
+            }
+            if (pwfi.getUserId().startsWith(AuthenticatedUser.IDENTIFIER_PREFIX)) {
+                if (pwfi.getLocalData().containsKey(PendingWorkflowInvocation.AUTHORIZED)
+                        && Boolean.parseBoolean(pwfi.getLocalData().get(PendingWorkflowInvocation.AUTHORIZED))) {
+                    return getAuthenticatedUser(
+                            pwfi.getUserId().substring(AuthenticatedUser.IDENTIFIER_PREFIX.length()));
+                }
+            }
+        } catch (NoResultException ex) {
+            return null;
+        }
+        return null;
+    }
+    
+    /*
+    getDeleteUserErrorMessages( AuthenticatedUser au )
+    method which checks for reasons that a user may not be deleted
+    -has created dvObjects
+    -has roles
+    -has guestbook records
+
+    An empty string is returned if the user is 'deletable'
+    */
+    
+    public String getDeleteUserErrorMessages(AuthenticatedUser au) {
+        String retVal = "";
+        List<String> reasons= new ArrayList();
+        if (!dvObjSvc.findByAuthenticatedUserId(au).isEmpty()) {
+            reasons.add(BundleUtil.getStringFromBundle("admin.api.deleteUser.failure.dvobjects"));
+        }
+
+        if (!roleAssigneeSvc.getAssignmentsFor(au.getIdentifier()).isEmpty()) {
+            reasons.add(BundleUtil.getStringFromBundle("admin.api.deleteUser.failure.roleAssignments"));
+        }
+
+        if (!gbRespSvc.findByAuthenticatedUserId(au).isEmpty()) {
+            reasons.add( BundleUtil.getStringFromBundle("admin.api.deleteUser.failure.gbResps"));
+        }
+
+        if (!datasetVersionService.getDatasetVersionUsersByAuthenticatedUser(au).isEmpty()) {
+            reasons.add(BundleUtil.getStringFromBundle("admin.api.deleteUser.failure.versionUser"));
+        }
+
+        if (!savedSearchService.findByAuthenticatedUser(au).isEmpty()) {
+            reasons.add(BundleUtil.getStringFromBundle("admin.api.deleteUser.failure.savedSearches"));
+        }
+        
+        if (!reasons.isEmpty()) {
+            retVal = BundleUtil.getStringFromBundle("admin.api.deleteUser.failure.prefix", Arrays.asList(au.getIdentifier()));
+            retVal += " " + reasons.stream().collect(Collectors.joining("; ")) + ".";
+        }
+        
+
+
+        return retVal;
+    }
+    
+    public void removeAuthentictedUserItems(AuthenticatedUser au){
+        /* if the user has pending access requests, is the member of a group or 
+        we will delete them here 
+        */
+
+        deletePendingAccessRequests(au);
+        
+        deleteBannerMessages(au);
+               
+        if (!explicitGroupService.findGroups(au).isEmpty()) {
+            for(ExplicitGroup explicitGroup: explicitGroupService.findGroups(au)){
+                explicitGroup.removeByRoleAssgineeIdentifier(au.getIdentifier());
+            }            
+        }
+        
+    }
+    
+    private void deleteBannerMessages(AuthenticatedUser  au){
+        
+       em.createNativeQuery("delete from userbannermessage where user_id  = "+au.getId()).executeUpdate();
+        
+    }
+    
+    private void deletePendingAccessRequests(AuthenticatedUser  au){
+        
+       em.createNativeQuery("delete from fileaccessrequests where authenticated_user_id  = "+au.getId()).executeUpdate();
+        
     }
     
     public AuthenticatedUser save( AuthenticatedUser user ) {
@@ -530,7 +591,7 @@ public boolean updateProvider( AuthenticatedUser authenticatedUser, String authe
      * {@code userDisplayInfo}, a lookup entry for them based
      * UserIdentifier.getLookupStringPerAuthProvider (within the supplied
      * authentication provider), and internal user identifier (used for role
-     * assignments, etc.) based on UserIdentifier.getInternalUserIdentifer.
+     * assignments, etc.) based on UserIdentifier.getInternalUserIdentifier.
      *
      * @param userRecordId
      * @param proposedAuthenticatedUserIdentifier
@@ -555,20 +616,21 @@ public AuthenticatedUser createAuthenticatedUser(UserRecordIdentifier userRecord
             proposedAuthenticatedUserIdentifier = proposedAuthenticatedUserIdentifier.trim();
         }
         // we now select a username for the generated AuthenticatedUser, or give up
-        String internalUserIdentifer = proposedAuthenticatedUserIdentifier;
+        String internalUserIdentifier = proposedAuthenticatedUserIdentifier;
         // TODO should lock table authenticated users for write here
-        if ( identifierExists(internalUserIdentifer) ) {
+        if ( identifierExists(internalUserIdentifier) ) {
             if ( ! generateUniqueIdentifier ) {
                 return null;
             }
             int i=1;
-            String identifier = internalUserIdentifer + i;
+            String identifier = internalUserIdentifier + i;
             while ( identifierExists(identifier) ) {
                 i += 1;
+                identifier = internalUserIdentifier + i;
             }
             authenticatedUser.setUserIdentifier(identifier);
         } else {
-            authenticatedUser.setUserIdentifier(internalUserIdentifer);
+            authenticatedUser.setUserIdentifier(internalUserIdentifier);
         }
         authenticatedUser = save( authenticatedUser );
         // TODO should unlock table authenticated users for write here
@@ -577,9 +639,8 @@ public AuthenticatedUser createAuthenticatedUser(UserRecordIdentifier userRecord
         authenticatedUser.setAuthenticatedUserLookup(auusLookup);
 
         if (ShibAuthenticationProvider.PROVIDER_ID.equals(auusLookup.getAuthenticationProviderId())) {
-            Timestamp emailConfirmedNow = new Timestamp(new Date().getTime());
             // Email addresses for Shib users are confirmed by the Identity Provider.
-            authenticatedUser.setEmailConfirmed(emailConfirmedNow);
+            authenticatedUser.updateEmailConfirmedToNow();
             authenticatedUser = save(authenticatedUser);
         } else {
             /* @todo Rather than creating a token directly here it might be
@@ -589,6 +650,8 @@ public AuthenticatedUser createAuthenticatedUser(UserRecordIdentifier userRecord
         
         actionLogSvc.log( new ActionLogRecord(ActionLogRecord.ActionType.Auth, "createUser")
             .setInfo(authenticatedUser.getIdentifier()));
+        
+        authenticatedUser.initialize();
 
         return authenticatedUser;
     }
@@ -606,6 +669,7 @@ public boolean identifierExists( String idtf ) {
     
     public AuthenticatedUser updateAuthenticatedUser(AuthenticatedUser user, AuthenticatedUserDisplayInfo userDisplayInfo) {
         user.applyDisplayInfo(userDisplayInfo);
+        user.updateEmailConfirmedToNow();
         actionLogSvc.log( new ActionLogRecord(ActionLogRecord.ActionType.Auth, "updateUser")
             .setInfo(user.getIdentifier()));
         return update(user);
@@ -621,7 +685,7 @@ public List<AuthenticatedUser> findSuperUsers() {
     
     
     public Set<AuthenticationProviderFactory> listProviderFactories() {
-        return new HashSet<>( providerFactories.values() ); 
+        return new HashSet<>( authProvidersRegistrationService.getProviderFactoriesMap().values() ); 
     }
     
     public Timestamp getCurrentTimestamp() {
@@ -872,23 +936,6 @@ public AuthenticatedUser canLogInAsBuiltinUser(String username, String password)
             return null;
         }
     }
-
-    /**
-     * @todo Consider making the sort order configurable by making it a colum on
-     * AuthenticationProviderRow
-     */
-    public List<String> getAuthenticationProviderIdsSorted() {
-        GitHubOAuth2AP github = new GitHubOAuth2AP(null, null);
-        GoogleOAuth2AP google = new GoogleOAuth2AP(null, null);
-        return Arrays.asList(
-                BuiltinAuthenticationProvider.PROVIDER_ID,
-                ShibAuthenticationProvider.PROVIDER_ID,
-                OrcidOAuth2AP.PROVIDER_ID_PRODUCTION,
-                OrcidOAuth2AP.PROVIDER_ID_SANDBOX,
-                github.getId(),
-                google.getId()
-        );
-    }
     
     public List <WorkflowComment> getWorkflowCommentsByAuthenticatedUser(AuthenticatedUser user){ 
         Query query = em.createQuery("SELECT wc FROM WorkflowComment wc WHERE wc.authenticatedUser.id = :auid");
@@ -896,4 +943,158 @@ public List <WorkflowComment> getWorkflowCommentsByAuthenticatedUser(Authenticat
         return query.getResultList();
     }
 
-}
+    /**
+     * This method gets a valid api token for an AuthenticatedUser, creating a new
+     * token if one doesn't exist or if the token is expired.
+     * 
+     * @param user
+     * @return
+     */
+    public ApiToken getValidApiTokenForAuthenticatedUser(AuthenticatedUser user) {
+        ApiToken apiToken = null;
+        apiToken = findApiTokenByUser(user);
+        if ((apiToken == null) || apiToken.isExpired()) {
+            logger.fine("Created apiToken for user: " + user.getIdentifier());
+            apiToken = generateApiTokenForUser(user);
+        }
+        return apiToken;
+    }
+
+    /**
+     *  Gets a token for an AuthenticatedUser or a PrivateUrlUser. It will create a
+     *  new token if needed for an AuthenticatedUser. Note that, for a PrivateUrlUser, this method creates a token
+     *  with a temporary AuthenticateUser that only has a userIdentifier - needed in generating signed Urls.
+     * @param user
+     * @return a token or null (i.e. if the user is not an AuthenticatedUser or PrivateUrlUser)
+     */
+
+    public ApiToken getValidApiTokenForUser(User user) {
+        ApiToken apiToken = null;
+        if (user instanceof AuthenticatedUser) {
+            apiToken = getValidApiTokenForAuthenticatedUser((AuthenticatedUser) user);
+        } else if (user instanceof PrivateUrlUser) {
+            PrivateUrlUser privateUrlUser = (PrivateUrlUser) user;
+            
+            PrivateUrl privateUrl = privateUrlService.getPrivateUrlFromDatasetId(privateUrlUser.getDatasetId());
+            apiToken = new ApiToken();
+            apiToken.setTokenString(privateUrl.getToken());
+            AuthenticatedUser au = new AuthenticatedUser();
+            au.setUserIdentifier(privateUrlUser.getIdentifier());
+            apiToken.setAuthenticatedUser(au);
+        }
+        return apiToken;
+    }
+
+    /**
+     * Looks up an authenticated user based on the provided OIDC bearer token.
+     *
+     * @param bearerToken The OIDC bearer token.
+     * @return An instance of {@link AuthenticatedUser} representing the authenticated user.
+     * @throws AuthorizationException If the token is invalid or no OIDC provider is configured.
+     */
+    public AuthenticatedUser lookupUserByOIDCBearerToken(String bearerToken) throws AuthorizationException {
+        // TODO: Get the identifier from an invalidating cache to avoid lookup bursts of the same token.
+        // Tokens in the cache should be removed after some (configurable) time.
+        OAuth2UserRecord oAuth2UserRecord = verifyOIDCBearerTokenAndGetOAuth2UserRecord(bearerToken);
+        AuthenticatedUser authenticatedUser;
+        if (FeatureFlags.API_BEARER_AUTH_USE_SHIB_USER_ON_ID_MATCH.enabled() && oAuth2UserRecord.hasShibAttributes()) {
+            logger.log(Level.FINE, "OAuth2UserRecord has Shibboleth attributes");
+            String userPersistentId = ShibUtil.createUserPersistentIdentifier(oAuth2UserRecord.getIdp(), oAuth2UserRecord.getShibUniquePersistentIdentifier());
+            authenticatedUser = lookupUser(ShibAuthenticationProvider.PROVIDER_ID, userPersistentId);
+            if (authenticatedUser != null) {
+                logger.log(Level.FINE, "Shibboleth user found for the given bearer token");
+                return authenticatedUser;
+            }
+        } else if (FeatureFlags.API_BEARER_AUTH_USE_OAUTH_USER_ON_ID_MATCH.enabled() && oAuth2UserRecord.hasOAuthAttributes()) {
+            OAuthUserLookupParams userLookupParams = OAuthUserLookupParamsFactory.getOAuthUserLookupParams(oAuth2UserRecord.getIdp(), oAuth2UserRecord.getOidcUserId());
+            authenticatedUser = lookupUser(userLookupParams.getProviderId(), userLookupParams.getLookupUserId());
+            if (authenticatedUser != null) {
+                logger.log(Level.FINE, "OAuth user found for the given bearer token");
+                return authenticatedUser;
+            }
+        } else if (FeatureFlags.API_BEARER_AUTH_USE_BUILTIN_USER_ON_ID_MATCH.enabled() && oAuth2UserRecord.hasBuiltinAttributes()) {
+            authenticatedUser = lookupUser(BuiltinAuthenticationProvider.PROVIDER_ID, oAuth2UserRecord.getUsername());
+            if (authenticatedUser != null) {
+                logger.log(Level.FINE, "Builtin user found for the given bearer token");
+                return authenticatedUser;
+            }
+        }
+
+        return lookupUser(oAuth2UserRecord.getUserRecordIdentifier());
+    }
+
+    /**
+     * Verifies the given OIDC bearer token and retrieves the corresponding OAuth2UserRecord.
+     *
+     * @param bearerToken The OIDC bearer token.
+     * @return An {@link OAuth2UserRecord} containing the user's info.
+     * @throws AuthorizationException If the token is invalid or if no OIDC providers are available.
+     */
+    public OAuth2UserRecord verifyOIDCBearerTokenAndGetOAuth2UserRecord(String bearerToken) throws AuthorizationException {
+        try {
+            BearerAccessToken accessToken = BearerAccessToken.parse(bearerToken);
+            List<OIDCAuthProvider> providers = getAvailableOidcProviders();
+
+            // Ensure at least one OIDC provider is configured to validate the token.
+            if (providers.isEmpty()) {
+                logger.log(Level.WARNING, "Bearer token detected, no OIDC provider configured");
+                throw new AuthorizationException(BundleUtil.getStringFromBundle("authenticationServiceBean.errors.bearerTokenDetectedNoOIDCProviderConfigured"));
+            }
+
+            // Attempt to validate the token with each configured OIDC provider.
+            for (OIDCAuthProvider provider : providers) {
+                try {
+                    // Retrieve OAuth2UserRecord if UserInfo is present
+                    Optional<UserInfo> userInfo = provider.getUserInfo(accessToken);
+                    if (userInfo.isPresent()) {
+                        logger.log(Level.FINE, "Bearer token detected, provider {0} confirmed validity and provided user info", provider.getId());
+                        return provider.getUserRecord(userInfo.get());
+                    }
+                } catch (IOException | OAuth2Exception e) {
+                    logger.log(Level.FINE, "Bearer token detected, provider " + provider.getId() + " indicates an invalid Token, skipping", e);
+                }
+            }
+        } catch (ParseException e) {
+            logger.log(Level.FINE, "Bearer token detected, unable to parse bearer token (invalid Token)", e);
+            throw new AuthorizationException(BundleUtil.getStringFromBundle("authenticationServiceBean.errors.invalidBearerToken"));
+        }
+
+        // If no provider validated the token, throw an authorization exception.
+        logger.log(Level.FINE, "Bearer token detected, yet no configured OIDC provider validated it.");
+        throw new AuthorizationException(BundleUtil.getStringFromBundle("authenticationServiceBean.errors.unauthorizedBearerToken"));
+    }
+
+    /**
+     * Retrieves a list of configured OIDC authentication providers.
+     *
+     * @return A list of available OIDCAuthProviders.
+     */
+    private List<OIDCAuthProvider> getAvailableOidcProviders() {
+        return getAuthenticationProviderIdsOfType(OIDCAuthProvider.class).stream()
+                .map(providerId -> (OIDCAuthProvider) getAuthenticationProvider(providerId))
+                .toList();
+    }
+
+    public OrcidOAuth2AP getOrcidAuthenticationProvider() {
+        return (OrcidOAuth2AP) authProvidersRegistrationService.getOrcidProvider();
+    }
+    
+    public AuthenticatedUser lookupUserByOrcid(String orcid) {
+        if (orcid == null || orcid.isEmpty()) {
+            return null;
+        }
+        
+        try {
+            TypedQuery<AuthenticatedUser> query = em.createQuery(
+                "SELECT au FROM AuthenticatedUser au WHERE au.authenticatedOrcid = :orcid", 
+                AuthenticatedUser.class);
+            query.setParameter("orcid", orcid);
+            return query.getSingleResult();
+        } catch (NoResultException e) {
+            return null;
+        } catch (NonUniqueResultException e) {
+            logger.log(Level.WARNING, "Multiple users found with ORCID: " + orcid, e);
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java
index ac55e7d8658..ff1a5546f38 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java
@@ -11,19 +11,19 @@
 import java.util.MissingResourceException;
 import java.util.Objects;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 /**
  * A role is an annotated set of permissions. A role belongs
@@ -33,18 +33,20 @@
  * @author michael
  */
 @NamedQueries({
-	@NamedQuery(name = "DataverseRole.findByOwnerId",
-			    query= "SELECT r FROM DataverseRole r WHERE r.owner.id=:ownerId ORDER BY r.name"),
-	@NamedQuery(name = "DataverseRole.findBuiltinRoles",
-			    query= "SELECT r FROM DataverseRole r WHERE r.owner is null ORDER BY r.name"),
+    @NamedQuery(name = "DataverseRole.findByOwnerId",
+            query = "SELECT r FROM DataverseRole r WHERE r.owner.id=:ownerId ORDER BY r.name"),
+    @NamedQuery(name = "DataverseRole.findBuiltinRoles",
+            query = "SELECT r FROM DataverseRole r WHERE r.owner is null ORDER BY r.name"),
     @NamedQuery(name = "DataverseRole.findBuiltinRoleByAlias",
-			    query= "SELECT r FROM DataverseRole r WHERE r.alias=:alias AND r.owner is null"),
-        @NamedQuery(name = "DataverseRole.findCustomRoleByAliasAndOwner",
-			    query= "SELECT r FROM DataverseRole r WHERE r.alias=:alias and (r.owner is null or r.owner.id=:ownerId)"),
-	@NamedQuery(name = "DataverseRole.listAll",
-			    query= "SELECT r FROM DataverseRole r"),
-	@NamedQuery(name = "DataverseRole.deleteById",
-			    query= "DELETE FROM DataverseRole r WHERE r.id=:id")
+            query = "SELECT r FROM DataverseRole r WHERE r.alias=:alias AND r.owner is null"),
+    @NamedQuery(name = "DataverseRole.findDataverseRoleByAlias",
+            query = "SELECT r FROM DataverseRole r WHERE r.alias=:alias"),
+    @NamedQuery(name = "DataverseRole.findCustomRoleByAliasAndOwner",
+            query = "SELECT r FROM DataverseRole r WHERE r.alias=:alias and (r.owner is null or r.owner.id=:ownerId)"),
+    @NamedQuery(name = "DataverseRole.listAll",
+            query = "SELECT r FROM DataverseRole r"),
+    @NamedQuery(name = "DataverseRole.deleteById",
+            query = "DELETE FROM DataverseRole r WHERE r.id=:id")
 })
 @Entity
 @Table(indexes = {@Index(columnList="owner_id")
@@ -62,8 +64,10 @@ public class DataverseRole implements Serializable  {
      * Heads up that this says "editor" which comes from
      * scripts/api/data/role-editor.json but the name is "Contributor". The
      * *alias* is "editor". Don't be fooled!
+     * #6644 change EDITOR string to contributor to coincide with the "name" value 
+     * - see above note SEK 2/13/2020
      */
-    public static final String EDITOR = "editor";
+    public static final String EDITOR = "contributor";
     public static final String MANAGER = "manager";
     public static final String CURATOR = "curator";
     public static final String MEMBER = "member";
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRolePermissionHelper.java b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRolePermissionHelper.java
index 6d0df17e520..966247bce2e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRolePermissionHelper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRolePermissionHelper.java
@@ -4,22 +4,18 @@
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
-import edu.harvard.iq.dataverse.authorization.DataverseRole;
-import java.sql.Array;
-import java.util.AbstractMap;
+
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import org.apache.commons.lang3.StringUtils;
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/GitHubUserLookupParams.java b/src/main/java/edu/harvard/iq/dataverse/authorization/GitHubUserLookupParams.java
new file mode 100644
index 00000000000..0296a1fa730
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/GitHubUserLookupParams.java
@@ -0,0 +1,15 @@
+package edu.harvard.iq.dataverse.authorization;
+
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GitHubOAuth2AP;
+
+public class GitHubUserLookupParams extends OAuthUserLookupParams {
+
+    public GitHubUserLookupParams(String userId) {
+        super(userId);
+    }
+
+    @Override
+    public String getProviderId() {
+        return GitHubOAuth2AP.PROVIDER_ID;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/GoogleUserLookupParams.java b/src/main/java/edu/harvard/iq/dataverse/authorization/GoogleUserLookupParams.java
new file mode 100644
index 00000000000..be3762a3e44
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/GoogleUserLookupParams.java
@@ -0,0 +1,15 @@
+package edu.harvard.iq.dataverse.authorization;
+
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GoogleOAuth2AP;
+
+public class GoogleUserLookupParams extends OAuthUserLookupParams {
+
+    public GoogleUserLookupParams(String userId) {
+        super(userId);
+    }
+
+    @Override
+    public String getProviderId() {
+        return GoogleOAuth2AP.PROVIDER_ID;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/OAuthUserLookupParams.java b/src/main/java/edu/harvard/iq/dataverse/authorization/OAuthUserLookupParams.java
new file mode 100644
index 00000000000..60a8c7f5377
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/OAuthUserLookupParams.java
@@ -0,0 +1,16 @@
+package edu.harvard.iq.dataverse.authorization;
+
+abstract class OAuthUserLookupParams {
+
+    protected String userId;
+
+    public OAuthUserLookupParams(String userId) {
+        this.userId = userId;
+    }
+
+    public String getLookupUserId() {
+        return userId;
+    }
+
+    public abstract String getProviderId();
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/OAuthUserLookupParamsFactory.java b/src/main/java/edu/harvard/iq/dataverse/authorization/OAuthUserLookupParamsFactory.java
new file mode 100644
index 00000000000..e9a5aff6d48
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/OAuthUserLookupParamsFactory.java
@@ -0,0 +1,44 @@
+package edu.harvard.iq.dataverse.authorization;
+
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GitHubOAuth2AP;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GoogleOAuth2AP;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
+
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * A factory for creating {@link OAuthUserLookupParams} instances based on an identity provider.
+ * This is a non-instantiable utility class.
+ */
+public final class OAuthUserLookupParamsFactory {
+
+    /**
+     * A map linking provider IDs to their corresponding user searcher constructor.
+     */
+    private static final Map<String, Function<String, OAuthUserLookupParams>> PROVIDER_MAP = Map.of(
+            GoogleOAuth2AP.PROVIDER_ID, GoogleUserLookupParams::new,
+            GitHubOAuth2AP.PROVIDER_ID, GitHubUserLookupParams::new,
+            OrcidOAuth2AP.PROVIDER_ID, ORCIDUserLookupParams::new
+    );
+
+    private OAuthUserLookupParamsFactory() {
+        // Prevent instantiation of this utility class.
+    }
+
+    /**
+     * Creates an instance of an {@link OAuthUserLookupParams} based on the identity provider claim.
+     *
+     * @param idpClaim The identity provider claim value (e.g., "https://accounts.google.com").
+     * @param userId   The user identifier from the OAuth provider.
+     * @return A new instance of a concrete {@link OAuthUserLookupParams}.
+     * @throws IllegalArgumentException if the identity provider is not supported.
+     */
+    public static OAuthUserLookupParams getOAuthUserLookupParams(String idpClaim, String userId) {
+        return PROVIDER_MAP.keySet().stream()
+                .filter(idpClaim::contains)
+                .findFirst()
+                .map(providerId -> PROVIDER_MAP.get(providerId).apply(userId))
+                .orElseThrow(() -> new IllegalArgumentException("Unsupported OAuth provider: " + idpClaim));
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/ORCIDUserLookupParams.java b/src/main/java/edu/harvard/iq/dataverse/authorization/ORCIDUserLookupParams.java
new file mode 100644
index 00000000000..34517bb080a
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/ORCIDUserLookupParams.java
@@ -0,0 +1,49 @@
+package edu.harvard.iq.dataverse.authorization;
+
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
+
+public class ORCIDUserLookupParams extends OAuthUserLookupParams {
+
+    private static final String ORCID_BASE_URL = "http://orcid.org/";
+    private static final String ORCID_BASE_URL_HTTPS = "https://orcid.org/";
+
+    public ORCIDUserLookupParams(String userId) {
+        super(userId);
+    }
+
+    @Override
+    public String getLookupUserId() {
+        return extractIdFromUrl(userId);
+    }
+
+    @Override
+    public String getProviderId() {
+        return OrcidOAuth2AP.PROVIDER_ID;
+    }
+
+    /**
+     * Extracts the ORCID iD from a full ORCID URL.
+     * <p>
+     * This method checks if the provided string starts with "http://orcid.org/" or "https://orcid.org/"
+     * and, if so, returns the trailing part of the string. If the string does not
+     * match the base URL, it is returned as-is, assuming it might already be the ID.
+     *
+     * @param orcidUrlOrId The full ORCID URL (e.g., "http://orcid.org/0009-0007-1267-8782")
+     *                     or an ORCID iD itself.
+     * @return The extracted ORCID iD (e.g., "0009-0007-1267-8782"), or the original string if it's not a URL.
+     * Returns null if the input is null.
+     */
+    private static String extractIdFromUrl(String orcidUrlOrId) {
+        if (orcidUrlOrId == null) {
+            return null;
+        }
+        if (orcidUrlOrId.startsWith(ORCID_BASE_URL)) {
+            return orcidUrlOrId.substring(ORCID_BASE_URL.length());
+        }
+        if (orcidUrlOrId.startsWith(ORCID_BASE_URL_HTTPS)) {
+            return orcidUrlOrId.substring(ORCID_BASE_URL_HTTPS.length());
+        }
+        // If it's not a URL, assume it's already the ID.
+        return orcidUrlOrId;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java b/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java
index 7fd7a40587f..77ff12fdee7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java
@@ -46,12 +46,16 @@ public enum Permission implements java.io.Serializable {
     EditDataset(BundleUtil.getStringFromBundle("permission.editDataset"), true, Dataset.class),
     ManageDataversePermissions(BundleUtil.getStringFromBundle("permission.managePermissionsDataverse"), true, Dataverse.class),
     ManageDatasetPermissions(BundleUtil.getStringFromBundle("permission.managePermissionsDataset"), true, Dataset.class),
+    ManageFilePermissions(BundleUtil.getStringFromBundle("permission.managePermissionsDataFile"), true, DataFile.class),
     PublishDataverse(BundleUtil.getStringFromBundle("permission.publishDataverse"), true, Dataverse.class),
     PublishDataset(BundleUtil.getStringFromBundle("permission.publishDataset"), true, Dataset.class, Dataverse.class),
+    LinkDataverse(BundleUtil.getStringFromBundle("permission.linkDataverse"), true, Dataverse.class),
+    LinkDataset(BundleUtil.getStringFromBundle("permission.linkDataset"), true, Dataset.class, Dataverse.class),
     // Delete
     DeleteDataverse(BundleUtil.getStringFromBundle("permission.deleteDataverse"), true, Dataverse.class),
     DeleteDatasetDraft(BundleUtil.getStringFromBundle("permission.deleteDataset"), true, Dataset.class);
 
+
     // FUTURE:
     //RestrictMetadata("Mark metadata as restricted", DvObject.class),
     //AccessRestrictedMetadata("Access metadata marked as\"restricted\"", DvObject.class),
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/UserIdentifier.java b/src/main/java/edu/harvard/iq/dataverse/authorization/UserIdentifier.java
index 1ac2c7583d6..312910e52c7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/UserIdentifier.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/UserIdentifier.java
@@ -25,18 +25,31 @@ public class UserIdentifier {
     /**
      * The String used in the permission system to assign roles, for example.
      */
-    String internalUserIdentifer;
+    String internalUserIdentifier;
 
-    public UserIdentifier(String lookupStringPerAuthProvider, String internalUserIdentifer) {
+    public UserIdentifier(String lookupStringPerAuthProvider, String internalUserIdentifier) {
         this.lookupStringPerAuthProvider = lookupStringPerAuthProvider;
-        this.internalUserIdentifer = internalUserIdentifer;
+        this.internalUserIdentifier = internalUserIdentifier;
     }
 
     public String getLookupStringPerAuthProvider() {
         return lookupStringPerAuthProvider;
     }
 
+    /**
+     * @deprecated because of a typo; use {@link #getInternalUserIdentifier()} instead
+     * @see #getInternalUserIdentifier()
+     * @return the internal user identifier
+     */
+    @Deprecated
     public String getInternalUserIdentifer() {
-        return internalUserIdentifer;
+        return getInternalUserIdentifier();
+    }
+
+    /**
+     * @return the internal user identifier
+     */
+    public String getInternalUserIdentifier() {
+        return internalUserIdentifier;
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/UserRecordIdentifier.java b/src/main/java/edu/harvard/iq/dataverse/authorization/UserRecordIdentifier.java
index 963ee592bbf..dfbb43fae46 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/UserRecordIdentifier.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/UserRecordIdentifier.java
@@ -2,6 +2,8 @@
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 
+import java.util.Objects;
+
 /**
  * Identifies a user using two strings:
  * <ul>
@@ -38,4 +40,16 @@ public AuthenticatedUserLookup createAuthenticatedUserLookup( AuthenticatedUser
         return new AuthenticatedUserLookup(userIdInRepo, repoId, u);
     }
     
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof UserRecordIdentifier)) return false;
+        UserRecordIdentifier that = (UserRecordIdentifier) o;
+        return Objects.equals(repoId, that.repoId) && Objects.equals(getUserIdInRepo(), that.getUserIdInRepo());
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(repoId, getUserIdInRepo());
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBean.java
index eb841af508a..a746eee0a60 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBean.java
@@ -7,8 +7,13 @@
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroup;
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupProvider;
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroup;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroupProvider;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroupsServiceBean;
+import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroup;
+import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroupProvider;
+import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroupServiceBean;
+import edu.harvard.iq.dataverse.authorization.groups.impl.shib.ShibGroup;
 import edu.harvard.iq.dataverse.authorization.groups.impl.shib.ShibGroupProvider;
 import edu.harvard.iq.dataverse.authorization.groups.impl.shib.ShibGroupServiceBean;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
@@ -21,10 +26,11 @@
 import java.util.logging.Logger;
 import static java.util.stream.Collectors.toSet;
 import java.util.stream.Stream;
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 /**
  *
@@ -41,12 +47,15 @@ public class GroupServiceBean {
     ShibGroupServiceBean shibGroupService;
     @EJB
     ExplicitGroupServiceBean explicitGroupService;
+    @EJB
+    MailDomainGroupServiceBean mailDomainGroupService;
     
     private final Map<String, GroupProvider> groupProviders = new HashMap<>();
     
     private IpGroupProvider ipGroupProvider;
     private ShibGroupProvider shibGroupProvider;
     private ExplicitGroupProvider explicitGroupProvider;
+    private MailDomainGroupProvider mailDomainGroupProvider;
     
     @EJB
     RoleAssigneeServiceBean roleAssigneeSvc;
@@ -57,6 +66,7 @@ public void setup() {
         addGroupProvider( ipGroupProvider = new IpGroupProvider(ipGroupsService) );
         addGroupProvider( shibGroupProvider = new ShibGroupProvider(shibGroupService) );
         addGroupProvider( explicitGroupProvider = explicitGroupService.getProvider() );
+        addGroupProvider( mailDomainGroupProvider = mailDomainGroupService.getProvider() );
         Logger.getLogger(GroupServiceBean.class.getName()).log(Level.INFO, null, "PostConstruct group service call");
     }
 
@@ -78,6 +88,10 @@ public ShibGroupProvider getShibGroupProvider() {
         return shibGroupProvider;
     }
     
+    public MailDomainGroupProvider getMailDomainGroupProvider() {
+        return mailDomainGroupProvider;
+    }
+    
     /**
      * Finds all the groups {@code req} is part of in {@code dvo}'s context.
      * Recurses upwards in {@link ExplicitGroup}s, as needed.
@@ -86,9 +100,49 @@ public ShibGroupProvider getShibGroupProvider() {
      * @return The groups {@code req} is part of under {@code dvo}.
      */
     public Set<Group> groupsFor( DataverseRequest req, DvObject dvo ) {
-        return groupProviders.values().stream()
+        Set<Group> ret = groupProviders.values().stream()
                               .flatMap(gp->(Stream<Group>)gp.groupsFor(req, dvo).stream())
                               .collect(toSet());
+        
+        // ShibGroupProvider.groupsFor(), above, only returns the Shib Groups 
+        // (as you would expect), but not the Explicit Groups that may include them 
+        // (unlike the ExplicitGroupProvider, that returns all the ancestors too). 
+        // We appear to rely on this method returning all of the ancestor groups 
+        // for everything, so we need to perform some extra hacky steps in 
+        // order to obtain the ancestors for the shib groups as well:
+        
+        Set<ExplicitGroup> directAncestorsOfShibGroups = new HashSet<>();
+        for (Group group : ret) {
+
+            if (group instanceof ShibGroup 
+                    || group instanceof IpGroup 
+                    || group instanceof MailDomainGroup) {
+                // if this is one of the non-explicit group types above, we 
+                // need to find if it is included in some explicit group; i.e., 
+                // if it has direct ancestors that happen to be explicit groups:
+                
+                directAncestorsOfShibGroups.addAll(explicitGroupService.findDirectlyContainingGroups(group));
+            }
+        }
+        
+        if (!directAncestorsOfShibGroups.isEmpty()) {
+            // ... and now we can run the Monster Query in the ExplicitServiceBean
+            // that will find ALL the hierarchical explicit group ancestors of 
+            // these groups that include the shib groups fond
+            
+            Set<ExplicitGroup> allAncestorsOfShibGroups = explicitGroupService.findClosure(directAncestorsOfShibGroups);
+            
+            if (allAncestorsOfShibGroups != null) {
+                ret.addAll(allAncestorsOfShibGroups);
+            }
+        }
+        
+        // Perhaps the code above should be moved into the ShibGroupProvider (??)
+        // Also, this most likely applies not just to ShibGroups, but to the 
+        // all the groups that are not ExplicitGroups, i.e., IP- and domain-based 
+        // groups too. (??)
+        
+        return ret;
     }
     
     /**
@@ -109,7 +163,7 @@ public Set<Group> groupsFor( RoleAssignee ra, DvObject dvo ) {
      * groups a Role assignee belongs to as advertised but this method comes
      * closer.
      *
-     * @param au An AuthenticatedUser.
+     * @param ra An AuthenticatedUser.
      * @return As many groups as we can find for the AuthenticatedUser.
      * 
      * @deprecated Does not look into IP Groups. Use {@link #groupsFor(edu.harvard.iq.dataverse.engine.command.DataverseRequest)}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/PersistedGlobalGroup.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/PersistedGlobalGroup.java
index 52785d5c7e2..1ef3b01d752 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/PersistedGlobalGroup.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/PersistedGlobalGroup.java
@@ -3,14 +3,14 @@
 import edu.harvard.iq.dataverse.authorization.groups.Group;
 import edu.harvard.iq.dataverse.authorization.RoleAssigneeDisplayInfo;
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  * Convenience base class for implementing groups that apply to the entire Dataverse
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/builtin/BuiltInGroupsProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/builtin/BuiltInGroupsProvider.java
index af9ab080443..d67d3caa24c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/builtin/BuiltInGroupsProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/builtin/BuiltInGroupsProvider.java
@@ -9,7 +9,6 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import java.util.Collections;
 import java.util.Set;
-import org.hibernate.validator.internal.util.CollectionHelper;
 
 /**
  * Provider for the built-in, hard coded groups. This class is a singleton (no
@@ -56,7 +55,7 @@ public Set<Group> groupsFor(DataverseRequest req) {
     @Override
     public Set<Group> groupsFor(RoleAssignee ra) {
         if (ra instanceof AuthenticatedUser){
-            return CollectionHelper.asSet(AllUsers.get(), AuthenticatedUsers.get());
+            return Set.of(AllUsers.get(), AuthenticatedUsers.get());
         } else if ( ra instanceof User) {
             return Collections.singleton(AllUsers.get());
         } else {
@@ -72,6 +71,6 @@ public Group get(String groupAlias) {
 
     @Override
     public Set<Group> findGlobalGroups() {
-        return CollectionHelper.asSet(AllUsers.get(), AuthenticatedUsers.get());
+        return Set.of(AllUsers.get(), AuthenticatedUsers.get());
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java
index 93de4480e55..2723561d8b4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java
@@ -13,24 +13,24 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.PostLoad;
-import javax.persistence.PrePersist;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.validation.constraints.Pattern;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.PostLoad;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.validation.constraints.Pattern;
 import org.hibernate.validator.constraints.NotBlank;
 
 /**
@@ -61,7 +61,7 @@
     @NamedQuery( name="ExplicitGroup.findByAuthenticatedUserIdentifier",
                  query="SELECT eg FROM ExplicitGroup eg JOIN eg.containedAuthenticatedUsers au "
                      + "WHERE au.userIdentifier=:authenticatedUserIdentifier"),
-    @NamedQuery( name="ExplicitGroup.findByRoleAssgineeIdentifier",
+    @NamedQuery( name="ExplicitGroup.findByRoleAssigneeIdentifier",
                  query="SELECT eg FROM ExplicitGroup eg JOIN eg.containedRoleAssignees cra "
                      + "WHERE cra=:roleAssigneeIdentifier"),
     @NamedQuery( name="ExplicitGroup.findByContainedExplicitGroupId",
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupServiceBean.java
index de9b9ba530d..a688fac0e34 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupServiceBean.java
@@ -10,17 +10,16 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import static java.util.stream.Collectors.joining;
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
 
 /**
  * A bean providing the {@link ExplicitGroupProvider}s with container services,
@@ -169,7 +168,7 @@ public Set<ExplicitGroup> findDirectlyContainingGroups( RoleAssignee ra ) {
         } else {
             return provider.updateProvider(
                     new HashSet<>(
-                            em.createNamedQuery("ExplicitGroup.findByRoleAssgineeIdentifier", ExplicitGroup.class)
+                            em.createNamedQuery("ExplicitGroup.findByRoleAssigneeIdentifier", ExplicitGroup.class)
                               .setParameter("roleAssigneeIdentifier", ra.getIdentifier())
                               .getResultList()
                   ));
@@ -198,7 +197,7 @@ public Set<ExplicitGroup> findGroups( RoleAssignee ra, DvObject o ) {
                 .filter( g -> g.owner.isAncestorOf(o) )
                 .collect( Collectors.toSet() );
     }
-    
+        
     /**
      * Finds all the groups {@code ra} directly belongs to in the context of {@code o}. In effect,
      * collects all the groups {@code ra} belongs to and that are defined at {@code o}
@@ -252,7 +251,7 @@ public Set<ExplicitGroup> findDirectGroups( RoleAssignee ra, DvObject o ) {
      * @param seed the initial set of groups.
      * @return Transitive closure (based on group  containment) of the groups in {@code seed}.
      */
-    protected Set<ExplicitGroup> findClosure( Set<ExplicitGroup> seed ) {
+    public Set<ExplicitGroup> findClosure( Set<ExplicitGroup> seed ) {
         
         if ( seed.isEmpty() ) return Collections.emptySet();
         
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroup.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroup.java
index a3231557898..038fbbfc6e0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroup.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroup.java
@@ -12,12 +12,12 @@
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Transient;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Transient;
 
 @NamedQueries({
     @NamedQuery(name="IpGroup.findAll",
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupsServiceBean.java
index c03cf26e11e..15282045b3a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupsServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupsServiceBean.java
@@ -10,12 +10,12 @@
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
 
 /**
  * Provides CRUD tools to efficiently manage IP groups in a Java EE container.
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv4Range.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv4Range.java
index 3ecd7689e1c..8694b7d455b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv4Range.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv4Range.java
@@ -1,13 +1,13 @@
 package edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip;
 
 import java.math.BigInteger;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  * A range of IPv4 addresses. In order to make SQL querying efficient, the actual fields
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv6Range.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv6Range.java
index d1301d550c7..379c64a88cf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv6Range.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv6Range.java
@@ -1,13 +1,13 @@
 package edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  * 
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressRange.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressRange.java
index b71dbcd0eba..fc21397898f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressRange.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressRange.java
@@ -2,8 +2,8 @@
 
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroup;
 import java.util.Objects;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  * A range of {@link IpAddress}es. Abstract class - to instantiate, you need to
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroup.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroup.java
new file mode 100644
index 00000000000..15b2fd1810c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroup.java
@@ -0,0 +1,132 @@
+package edu.harvard.iq.dataverse.authorization.groups.impl.maildomain;
+
+import edu.harvard.iq.dataverse.authorization.groups.impl.PersistedGlobalGroup;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import jakarta.persistence.Entity;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Transient;
+import jakarta.validation.constraints.NotEmpty;
+;
+
+/**
+ * A group that explicitly lists email address domains that a user might have to belong to this group.
+ */
+@NamedQueries({
+    @NamedQuery(name="MailDomainGroup.findAll",
+        query="SELECT g FROM MailDomainGroup g"),
+    @NamedQuery(name="MailDomainGroup.findByPersistedGroupAlias",
+        query="SELECT g FROM MailDomainGroup g WHERE g.persistedGroupAlias=:persistedGroupAlias"),
+})
+@Entity
+public class MailDomainGroup extends PersistedGlobalGroup {
+    
+    /**
+     * All the email address domains that make users belong
+     * to this group, concatenated with ";" (thus avoiding another relation)
+     */
+    @NotEmpty
+    private String emailDomains;
+    
+    private boolean isRegEx = false;
+    
+    @Transient
+    private MailDomainGroupProvider provider;
+    
+    /**
+     * Empty Constructor for JPA.
+     */
+    public MailDomainGroup() {}
+    
+    public void setEmailDomains(String domains) {
+        this.emailDomains = domains;
+    }
+    public void setEmailDomains(List<String> domains) {
+        this.emailDomains = String.join(";", domains);
+    }
+    
+    public String getEmailDomains() {
+        return this.emailDomains;
+    }
+    public List<String> getEmailDomainsAsList() {
+        return Arrays.asList(this.emailDomains.split(";"));
+    }
+    
+    public boolean isRegEx() {
+        return isRegEx;
+    }
+    public void setIsRegEx(boolean isRegEx) {
+        this.isRegEx = isRegEx;
+    }
+    
+    @Override
+    public MailDomainGroupProvider getGroupProvider() {
+        return provider;
+    }
+    public void setGroupProvider(MailDomainGroupProvider pvd) {
+        this.provider = pvd;
+    }
+    
+    /**
+     * This will throw an UnsupportOperationException if called.
+     * Due to the necessity of checking if the mail adress is confirmed,
+     * this cannot be decided in the entity class, but has to happen in the
+     * provider.
+     * @param aRequest The request whose inclusion we test
+     */
+    @Override
+    public boolean contains(DataverseRequest aRequest) {
+        throw new UnsupportedOperationException("This cannot be supported.");
+    }
+    
+    /**
+     * This will throw an UnsupportOperationException if called.
+     * We will not allow edits of this via UI due to it's static nature. Can be changed via API.
+     */
+    @Override
+    public boolean isEditable() {
+        throw new UnsupportedOperationException("This is not supported.");
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 53 * hash + Objects.hashCode(this.getId());
+        hash = 53 * hash + Objects.hashCode(this.emailDomains);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if ( ! (obj instanceof MailDomainGroup)) {
+            return false;
+        }
+        final MailDomainGroup other = (MailDomainGroup) obj;
+        if ( this.getId() != null && other.getId() != null) {
+            return Objects.equals(this.getId(), other.getId());
+        } else {
+            return Objects.equals(this.emailDomains, other.getEmailDomains());
+        }
+    }
+    
+    @Override
+    public String toString() {
+        return "[MailDomainGroup " + this.getPersistedGroupAlias() + ": id=" + this.getId() + " domains="+this.emailDomains+" ]";
+    }
+    
+    public MailDomainGroup update(MailDomainGroup src) {
+        setPersistedGroupAlias(src.getPersistedGroupAlias());
+        setDisplayName(src.getDisplayName());
+        setDescription(src.getDescription());
+        setEmailDomains(src.getEmailDomains());
+        setGroupProvider(src.getGroupProvider());
+        return this;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupProvider.java
new file mode 100644
index 00000000000..3874d4bfb6f
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupProvider.java
@@ -0,0 +1,141 @@
+package edu.harvard.iq.dataverse.authorization.groups.impl.maildomain;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.authorization.RoleAssignee;
+import edu.harvard.iq.dataverse.authorization.groups.GroupProvider;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+
+import java.util.*;
+import java.util.logging.Logger;
+
+/**
+ * Creates and manages mail domain based groups
+ */
+public class MailDomainGroupProvider implements GroupProvider<MailDomainGroup> {
+    
+    private static final Logger logger = Logger.getLogger(MailDomainGroupProvider.class.getName());
+    
+    private final MailDomainGroupServiceBean emailGroupSvc;
+
+    public MailDomainGroupProvider(MailDomainGroupServiceBean emailGroupSvc) {
+        this.emailGroupSvc = emailGroupSvc;
+    }
+       
+    @Override
+    public String getGroupProviderAlias() {
+        return "maildomain";
+    }
+
+    @Override
+    public String getGroupProviderInfo() {
+        return "Groups users by their email address domain.";
+    }
+    
+    /**
+     * This method is meant for group management. This is a global, unmanageable thing, so this will just result in an empty set.
+     * @return empty set
+     */
+    @Override
+    public Set<MailDomainGroup> groupsFor(RoleAssignee ra, DvObject o) {
+        return Collections.emptySet();
+    }
+    
+    /**
+     * This method is meant for group management. This is a global, unmanageable thing, so this will just result in an empty set.
+     * @return empty set
+     */
+    @Override
+    public Set<MailDomainGroup> groupsFor(RoleAssignee ra) {
+        return Collections.emptySet();
+    }
+    
+    /**
+     * Lookup for a request. We don't need the context, so just move to groupsFor(DataverseRequest)
+     * @param req The request whose group memberships we evaluate.
+     * @param dvo the DvObject which is the context for the groups. May be {@code null}.
+     * @return A set of groups, if any.
+     */
+    @Override
+    public Set<MailDomainGroup> groupsFor(DataverseRequest req, DvObject dvo ) {
+        return groupsFor(req);
+    }
+    
+    /**
+     * Lookup the user group on each request by using the email address domain.
+     * @param req
+     * @return
+     */
+    @Override
+    public Set<MailDomainGroup> groupsFor(DataverseRequest req) {
+        AuthenticatedUser user = req.getAuthenticatedUser();
+        if ( user != null ) {
+            return updateProvider(emailGroupSvc.findAllWithDomain(user) );
+        } else {
+            return Collections.emptySet();
+        }
+    }
+    
+    @Override
+    public MailDomainGroup get(String groupAlias) {
+        return updateProvider(emailGroupSvc.findByAlias(groupAlias).orElse(null));
+    }
+
+    /**
+     * Find all email groups available
+     * @return empty set.
+     */
+    @Override
+    public Set<MailDomainGroup> findGlobalGroups() {
+        return updateProvider( new HashSet<>(emailGroupSvc.findAll()) );
+    }
+    
+    /**
+     * Update an existing instance (if found) or create a new (if groupName = null).
+     * @param groupAlias String with the group alias of the group to update or empty if new entity
+     * @param grp The group to update or add
+     * @return The saved entity, including updated group provider attribute
+     */
+    public MailDomainGroup saveOrUpdate(Optional<String> groupAlias, MailDomainGroup grp) {
+        grp.setGroupProvider(this);
+        return emailGroupSvc.saveOrUpdate(groupAlias, grp);
+    }
+    
+    public void delete(String groupAlias) {
+        emailGroupSvc.delete(groupAlias);
+    }
+    
+    /**
+     * Enable triggering an update of groups from the database. Used in the API to refresh after changes.
+     */
+    public void updateGroups() {
+        emailGroupSvc.updateGroups();
+    }
+    
+    /**
+     * Sets the provider of the passed explicit group to {@code this}.
+     * @param eg the collection
+     * @return the passed group, updated.
+     */
+    MailDomainGroup updateProvider(MailDomainGroup eg ) {
+        if (eg == null) {
+            return null; 
+        }
+        eg.setGroupProvider(this);
+        return eg;
+    }
+    
+    /**
+     * Sets the provider of the explicit groups to {@code this}.
+     * @param <T> Collection's type
+     * @param mdgs the collection
+     * @return the collection, with all the groups updated.
+     */
+    <T extends Collection<MailDomainGroup>> T updateProvider(T mdgs ) {
+        for ( MailDomainGroup mdg : mdgs ) {
+            updateProvider(mdg);
+        }
+        return mdgs;
+    }
+}
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupServiceBean.java
new file mode 100644
index 00000000000..b1b1e883705
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupServiceBean.java
@@ -0,0 +1,203 @@
+package edu.harvard.iq.dataverse.authorization.groups.impl.maildomain;
+
+import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
+import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
+
+import java.util.*;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.*;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.ws.rs.NotFoundException;
+
+/**
+ * A bean providing the {@link MailDomainGroupProvider}s with container services, such as database connectivity.
+ * Also containing the business logic to decide about matching groups.
+ */
+@Named
+@Singleton
+@Startup
+@DependsOn("StartupFlywayMigrator")
+public class MailDomainGroupServiceBean {
+    
+    private static final Logger logger = Logger.getLogger(edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean.class.getName());
+    
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    protected EntityManager em;
+    
+    @Inject
+    ConfirmEmailServiceBean confirmEmailSvc;
+    @Inject
+    ActionLogServiceBean actionLogSvc;
+    
+    MailDomainGroupProvider provider;
+    List<MailDomainGroup> simpleGroups = Collections.EMPTY_LIST;
+    Map<MailDomainGroup, Pattern> regexGroups = new HashMap<>();
+    
+    @PostConstruct
+    void setup() {
+        provider = new MailDomainGroupProvider(this);
+        this.updateGroups();
+    }
+    
+    /**
+     * Update the groups from the database.
+     * This is done because regex compilation is an expensive operation and should be cached.
+     */
+    @Lock(LockType.WRITE)
+    public void updateGroups() {
+        List<MailDomainGroup> all = findAll();
+        this.simpleGroups = all.stream().filter(mg -> !mg.isRegEx()).collect(Collectors.toList());
+        this.regexGroups = all.stream()
+            .filter(MailDomainGroup::isRegEx)
+            .collect(Collectors.toMap(
+                mg -> mg,
+                mg -> Pattern.compile(mg.getEmailDomains().replace(";","|"))
+            ));
+    }
+    
+    @Lock(LockType.READ)
+    public MailDomainGroupProvider getProvider() {
+        return provider;
+    }
+    
+    /**
+     * Find groups for users mail address. Only done when email has been verified.
+     * @param user
+     * @return A collection of groups with matching email domains
+     */
+    @Lock(LockType.READ)
+    public Set<MailDomainGroup> findAllWithDomain(AuthenticatedUser user) {
+        
+        // if the mail address is not verified, escape...
+        if (!confirmEmailSvc.hasVerifiedEmail(user)) {
+            return Collections.emptySet();
+        }
+        
+        // otherwise start to bisect the mail and lookup groups.
+        // NOTE: the email from the user has been validated via {@link EMailValidator} when persisted.
+        Optional<String> oDomain = getDomainFromMail(user.getEmail());
+        if ( oDomain.isPresent() ) {
+            // transform to lowercase, in case someone uses uppercase letters. (we store the comparison values in lowercase)
+            String domain = oDomain.get().toLowerCase();
+            
+            // scan simple groups (containing an exact match of the domain)
+            Set<MailDomainGroup> result = this.simpleGroups.stream()
+                                                           .filter(mg -> mg.getEmailDomainsAsList().contains(domain))
+                                                           .collect(Collectors.toSet());
+            // scan regex based groups (domain matching a regular expression)
+            result.addAll(this.regexGroups.keySet().stream()
+                                                   .filter(MailDomainGroup::isRegEx)
+                                                   .filter(mg -> regexGroups.get(mg).matcher(domain).matches())
+                                                   .collect(Collectors.toSet()));
+            return result;
+            
+        }
+        return Collections.emptySet();
+    }
+    
+    /**
+     * Get all mail domain groups from the database.
+     * @return A result list from the database. May be null if no results found.
+     */
+    @Lock(LockType.READ)
+    public List<MailDomainGroup> findAll() {
+        return em.createNamedQuery("MailDomainGroup.findAll", MailDomainGroup.class).getResultList();
+    }
+    
+    /**
+     * Find a specific mail domain group by it's alias.
+     * @param groupAlias
+     * @return
+     */
+    @Lock(LockType.READ)
+    Optional<MailDomainGroup> findByAlias(String groupAlias) {
+        try  {
+            return Optional.of(
+                em.createNamedQuery("MailDomainGroup.findByPersistedGroupAlias", MailDomainGroup.class)
+                    .setParameter("persistedGroupAlias", groupAlias)
+                    .getSingleResult());
+        } catch ( NoResultException nre ) {
+            return Optional.empty();
+        }
+    }
+    
+    /**
+     * Update an existing instance (if found) or create a new (if groupName = null or groupName matches alias of grp).
+     * This method is idempotent.
+     * This being an EJB bean makes this method transactional, rolling back on unchecked exceptions.
+     * @param groupAlias String with the group alias of the group to update or empty if new entity
+     * @param grp The group to update or add
+     * @return The saved entity, including updated group provider attribute
+     * @throws NotFoundException if groupName does not match both a group in database and the alias of the provided group
+     */
+    @Lock(LockType.WRITE)
+    public MailDomainGroup saveOrUpdate(Optional<String> groupAlias, MailDomainGroup grp ) {
+        ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.GlobalGroups, "mailDomainCreate");
+        alr.setInfo(grp.getIdentifier());
+        
+        // groupAlias present means PUT means idempotence.
+        if (groupAlias.isPresent()) {
+            Optional<MailDomainGroup> old = findByAlias(groupAlias.get());
+    
+            // if an old instance is found, update:
+            // (triggering persistence once we leave the function)
+            if (old.isPresent()) {
+                old.get().update(grp);
+                
+                alr.setActionSubType("mailDomainUpdate");
+                actionLogSvc.log( alr );
+                
+                return grp;
+            }
+    
+            // otherwise check if path param and supplied group match. (so people use it according to RFC-2616)
+            // if not -> throw exception!
+            if (!groupAlias.get().equals(grp.getPersistedGroupAlias())) {
+                throw new NotFoundException();
+            }
+        }
+        // or add new ...
+        em.persist(grp);
+        actionLogSvc.log( alr );
+        
+        return grp;
+    }
+    
+    /**
+     * Delete a mail domain group if exists.
+     * @param groupAlias
+     * @throws NotFoundException if no group with given groupAlias exists.
+     */
+    @Lock(LockType.WRITE)
+    public void delete(String groupAlias) {
+        ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.GlobalGroups, "mailDomainDelete");
+        alr.setInfo(groupAlias);
+    
+        Optional<MailDomainGroup> tbd = findByAlias(groupAlias);
+        em.remove(tbd.orElseThrow(() -> new NotFoundException("Cannot find a group with alias "+groupAlias)));
+        actionLogSvc.log( alr );
+    }
+    
+    /**
+     * Retrieve the domain part only from a given email.
+     * @param email
+     * @return Domain part or empty Optional
+     */
+    static Optional<String> getDomainFromMail(String email) {
+        String[] parts = email.split("@");
+        if (parts.length < 2) {
+            return Optional.empty();
+        }
+        return Optional.of(parts[parts.length-1]);
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroup.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroup.java
index 3beb8dadedb..30850f0fb20 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroup.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroup.java
@@ -1,17 +1,16 @@
 package edu.harvard.iq.dataverse.authorization.groups.impl.shib;
 
-import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.RoleAssigneeDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.groups.Group;
 import edu.harvard.iq.dataverse.authorization.groups.GroupProvider;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Transient;
 
 /**
  * Persistence for Shibboleth groups.
@@ -135,5 +134,4 @@ public RoleAssigneeDisplayInfo getDisplayInfo() {
     public boolean contains(DataverseRequest aRequest) {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupServiceBean.java
index c15e56ee7e0..7a7844b7c1e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupServiceBean.java
@@ -11,14 +11,14 @@
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 
 /**
  * @todo Consider merging this bean into the newer and more generic
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/AuthenticationProviderRow.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/AuthenticationProviderRow.java
index 6b9c545b7f9..5b7fb09ebdf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/AuthenticationProviderRow.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/AuthenticationProviderRow.java
@@ -2,13 +2,13 @@
 
 import edu.harvard.iq.dataverse.authorization.AuthenticationProvider;
 import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.Lob;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.Lob;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  * Database-storable form of an {@code AuthenticationProvider}.
@@ -43,6 +43,7 @@ public class AuthenticationProviderRow implements java.io.Serializable {
     
     private String factoryAlias;
     
+    //Enabled for login (and possibly for registration depending on the :AllowRemoteAuthSignUp setting)
     private boolean enabled;
     
     @Lob
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProvider.java
index c9edd04cc1e..94de21a88b9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProvider.java
@@ -156,9 +156,4 @@ public boolean isOAuthProvider() {
         return false;
     }
 
-    @Override
-    public boolean isDisplayIdentifier() {
-        return false;
-    }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUser.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUser.java
index fd7231e827c..2ce36997ea9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUser.java
@@ -1,22 +1,24 @@
 package edu.harvard.iq.dataverse.authorization.providers.builtin;
 
-import edu.harvard.iq.dataverse.ValidateEmail;
-import edu.harvard.iq.dataverse.ValidateUserName;
+import edu.harvard.iq.dataverse.validation.ValidateUserName;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
-import static edu.harvard.iq.dataverse.util.StringUtil.nonEmpty;
+import edu.harvard.iq.dataverse.passwordreset.PasswordResetData;
+
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.validation.constraints.Size;
-import org.hibernate.validator.constraints.NotBlank;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 /**
  *
@@ -39,14 +41,16 @@ public class BuiltinUser implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-
-    @NotBlank(message = "{user.enterUsername}")
-    @Size(min=2, max=60, message = "{user.usernameLength}")
-    @ValidateUserName(message = "{user.illegalCharacters}")
+    
+    @ValidateUserName
     @Column(nullable = false, unique=true)  
     private String userName;
     
     private int passwordEncryptionVersion; 
+
+    @OneToOne(mappedBy = "builtinUser", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
+    private PasswordResetData passwordResetData;
+
     private String encryptedPassword;
 
     /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUserServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUserServiceBean.java
index c39c7cb2985..ffbc5d7a027 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUserServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUserServiceBean.java
@@ -9,17 +9,17 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 /**
  *
@@ -88,7 +88,7 @@ public BuiltinUser findByUserName(String userName) {
             return em.createNamedQuery("BuiltinUser.findByUserName", BuiltinUser.class)
                     .setParameter("userName", userName)
                     .getSingleResult();
-        } catch (javax.persistence.NoResultException e) {
+        } catch (NoResultException e) {
             return null;
         } catch (NonUniqueResultException ex) {
             logger.log(Level.WARNING, "multiple accounts found for username {0}", userName);
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
index 006056de348..928cc3d8038 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
@@ -10,36 +10,34 @@
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DataverseSession;
 import edu.harvard.iq.dataverse.DvObject;
-import edu.harvard.iq.dataverse.EMailValidator;
+import edu.harvard.iq.dataverse.validation.EMailValidator;
 import edu.harvard.iq.dataverse.PermissionServiceBean;
 import edu.harvard.iq.dataverse.PermissionsWrapper;
 import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.SettingsWrapper;
-import edu.harvard.iq.dataverse.UserNameValidator;
+import edu.harvard.iq.dataverse.validation.UserNameValidator;
 import edu.harvard.iq.dataverse.UserNotification;
-import static edu.harvard.iq.dataverse.UserNotification.Type.CREATEDV;
+import edu.harvard.iq.dataverse.UserNotification.Type;
 import edu.harvard.iq.dataverse.UserNotificationServiceBean;
 import edu.harvard.iq.dataverse.UserServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthUtil;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.AuthenticationProvider;
-import edu.harvard.iq.dataverse.authorization.AuthenticationProviderDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.UserRecordIdentifier;
 import edu.harvard.iq.dataverse.authorization.groups.Group;
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
-import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailData;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailException;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailUtil;
 import edu.harvard.iq.dataverse.mydata.MyDataPage;
-import edu.harvard.iq.dataverse.passwordreset.PasswordValidator;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
+import static edu.harvard.iq.dataverse.util.StringUtil.toOption;
+
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean;
 import java.io.UnsupportedEncodingException;
@@ -51,19 +49,26 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.HashSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.apache.commons.lang.StringUtils;
-import org.hibernate.validator.constraints.NotBlank;
+import java.util.stream.Collectors;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.validation.constraints.NotBlank;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2LoginBackingBean;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
+import java.io.IOException;
+import org.apache.commons.lang3.StringUtils;
 import org.primefaces.event.TabChangeEvent;
 
 /**
@@ -116,13 +121,17 @@ public enum EditMode {
 
     @EJB
     AuthenticationServiceBean authSvc;
+    
+    @Inject
+    private OAuth2LoginBackingBean oauth2LoginBackingBean;
+
 
     private AuthenticatedUser currentUser;
-    private BuiltinUser builtinUser;    
     private AuthenticatedUserDisplayInfo userDisplayInfo;
     private transient AuthenticationProvider userAuthProvider;
     private EditMode editMode;
     private String redirectPage = "dataverse.xhtml";
+    private final String accountInfoTab = "dataverseuser.xhtml?selectTab=accountInfo";
 
     @NotBlank(message = "{password.retype}")
     private String inputPassword;
@@ -132,13 +141,19 @@ public enum EditMode {
     private Long dataverseId;
     private List<UserNotification> notificationsList;
     private int activeIndex;
-    private String selectTab = "somedata";
+    private String selectTab = "dataRelatedToMe";
     UIInput usernameField;
 
     
     private String username;
     boolean nonLocalLoginEnabled;
     private List<String> passwordErrors;
+    
+    
+    private List<Type> notificationTypeList;
+    private Set<Type> mutedEmails;
+    private Set<Type> mutedNotifications;
+    private Set<Type> disabledNotifications;
 
     public String init() {
 
@@ -162,10 +177,17 @@ public String init() {
             }
         }
 
-        if ( session.getUser().isAuthenticated() ) {
+        if (session.getUser(true).isAuthenticated()) {
             setCurrentUser((AuthenticatedUser) session.getUser());
             userAuthProvider = authenticationService.lookupProvider(currentUser);
             notificationsList = userNotificationService.findByUser(currentUser.getId());
+            notificationTypeList = Arrays.asList(Type.values()).stream()
+                    .filter(x -> !Type.CONFIRMEMAIL.equals(x) && x.hasDescription() && !settingsWrapper.isAlwaysMuted(x))
+                    .collect(Collectors.toList());
+            mutedEmails = new HashSet<>(currentUser.getMutedEmails());
+            mutedNotifications = new HashSet<>(currentUser.getMutedNotifications());
+            disabledNotifications = new HashSet<>(settingsWrapper.getAlwaysMutedSet());
+            disabledNotifications.addAll(settingsWrapper.getNeverMutedSet());
             
             switch (selectTab) {
                 case "notifications":
@@ -174,18 +196,16 @@ public String init() {
                     break;
                 case "dataRelatedToMe":
                     mydatapage.init();
+                    activeIndex = 0;
                     break;
-                // case "groupsRoles":
-                // activeIndex = 2;
-                // break;
                 case "accountInfo":
                     activeIndex = 2;
-                    // activeIndex = 3;
                     break;
                 case "apiTokenTab":
                     activeIndex = 3;
                     break;
                 default:
+                    //TODO: Do we need to call mydatapage.init(); here too?
                     activeIndex = 0;
                     break;
             }
@@ -215,7 +235,7 @@ public void validateUserName(FacesContext context, UIComponent toValidate, Objec
         
         // SF fix for issue 3752
         // checks if username has any invalid characters 
-        boolean userNameValid = userName != null && UserNameValidator.isUserNameValid(userName, null);
+        boolean userNameValid = userName != null && UserNameValidator.isUserNameValid(userName);
         
         if (editMode == EditMode.CREATE && userNameFound) {
             ((UIInput) toValidate).setValid(false);
@@ -232,7 +252,7 @@ public void validateUserName(FacesContext context, UIComponent toValidate, Objec
 
     public void validateUserEmail(FacesContext context, UIComponent toValidate, Object value) {
         String userEmail = (String) value;
-        boolean emailValid = EMailValidator.isEmailValid(userEmail, null);
+        boolean emailValid = EMailValidator.isEmailValid(userEmail);
         if (!emailValid) {
             ((UIInput) toValidate).setValid(false);
             FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("oauth2.newAccount.emailInvalid"), null);
@@ -286,6 +306,12 @@ public void validateNewPassword(FacesContext context, UIComponent toValidate, Ob
 
     public String save() {
         boolean passwordChanged = false;
+        
+        //First reget user to make sure they weren't deactivated or deleted
+        if (session.getUser().isAuthenticated() && !session.getUser(true).isAuthenticated()) {
+            return "dataverse.xhtml?alias=" + dataverseService.findRootDataverse().getAlias() + "&faces-redirect=true";
+        }
+        
         if (editMode == EditMode.CHANGE_PASSWORD) {
             final AuthenticationProvider prv = getUserAuthProvider();
             if (prv.isPasswordUpdateAllowed()) {
@@ -329,14 +355,13 @@ public String save() {
             // Authenticated user registered. Save the new bulitin, and log in.
             builtinUserService.save(builtinUser);
             session.setUser(au);
-            session.configureSessionTimeout();
             /**
              * @todo Move this to
              * AuthenticationServiceBean.createAuthenticatedUser
              */
             userNotificationService.sendNotification(au,
                     new Timestamp(new Date().getTime()),
-                    UserNotification.Type.CREATEACC, null);
+                    Type.CREATEACC, null);
 
             // go back to where user came from
             
@@ -370,6 +395,8 @@ public String save() {
             logger.info("Redirecting");
             return permissionsWrapper.notAuthorized() + "faces-redirect=true";
         }else {
+            currentUser.setMutedEmails(mutedEmails);
+            currentUser.setMutedNotifications(mutedNotifications);
             String emailBeforeUpdate = currentUser.getEmail();
             AuthenticatedUser savedUser = authenticationService.updateAuthenticatedUser(currentUser, userDisplayInfo);
             String emailAfterUpdate = savedUser.getEmail();
@@ -386,7 +413,6 @@ public String save() {
                 } catch (ConfirmEmailException ex) {
                     logger.log(Level.INFO, "Unable to send email confirmation link to user id {0}", savedUser.getId());
                 }
-                session.setUser(currentUser);
                 JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("confirmEmail.changed", args));
             } else {
                 JsfHelper.addFlashMessage(msg.toString());
@@ -420,11 +446,13 @@ public void onTabChange(TabChangeEvent event) {
         if (event.getTab().getId().equals("notifications")) {
             displayNotification();
         }
+
         if (event.getTab().getId().equals("dataRelatedToMe")){
             mydatapage.init();
         }
     }
 
+    
     private String getRoleStringFromUser(AuthenticatedUser au, DvObject dvObj) {
         // Find user's role(s) for given dataverse/dataset
         Set<RoleAssignment> roles = permissionService.assignmentsFor(au, dvObj);
@@ -472,6 +500,7 @@ public void displayNotification() {
                     break;
 
                 case REQUESTFILEACCESS:
+                case REQUESTEDFILEACCESS:
                     DataFile file = fileService.find(userNotification.getObjectId());
                     if (file != null) {
                         userNotification.setTheObject(file.getOwner());
@@ -479,21 +508,23 @@ public void displayNotification() {
                     break;
                 case GRANTFILEACCESS:
                 case REJECTFILEACCESS:
+                case DATASETCREATED:
+                case DATASETMENTIONED:
                     userNotification.setTheObject(datasetService.find(userNotification.getObjectId()));
                     break;
 
-                case MAPLAYERUPDATED:
                 case CREATEDS:
                 case SUBMITTEDDS:
                 case PUBLISHEDDS:
+                case PUBLISHFAILED_PIDREG:
                 case RETURNEDDS:
+                case WORKFLOW_SUCCESS:
+                case WORKFLOW_FAILURE:
+                case PIDRECONCILED:
+                case STATUSUPDATED:
                     userNotification.setTheObject(datasetVersionService.find(userNotification.getObjectId()));
                     break;
                     
-                case MAPLAYERDELETEFAILED:
-                    userNotification.setTheObject(fileService.findFileMetadata(userNotification.getObjectId()));
-                    break;
-
                 case CREATEACC:
                     userNotification.setTheObject(userNotification.getUser());
                     break;
@@ -506,6 +537,15 @@ public void displayNotification() {
                     userNotification.setTheObject(datasetVersionService.find(userNotification.getObjectId()));
                     break;
 
+                case GLOBUSUPLOADCOMPLETED:
+                case GLOBUSUPLOADCOMPLETEDWITHERRORS:
+                case GLOBUSDOWNLOADCOMPLETED:
+                case GLOBUSDOWNLOADCOMPLETEDWITHERRORS:
+                case GLOBUSUPLOADREMOTEFAILURE:
+                case GLOBUSUPLOADLOCALFAILURE: 
+                    userNotification.setTheObject(datasetService.find(userNotification.getObjectId()));
+                    break;
+
                 case CHECKSUMIMPORT:
                     userNotification.setTheObject(datasetVersionService.find(userNotification.getObjectId()));
                     break;
@@ -523,6 +563,7 @@ public void displayNotification() {
             userNotification.setDisplayAsRead(userNotification.isReadNotification());
             if (userNotification.isReadNotification() == false) {
                 userNotification.setReadNotification(true);
+                // consider switching to userNotificationService.markAsRead
                 userNotificationService.save(userNotification);
             }
         }
@@ -544,25 +585,16 @@ public void sendConfirmEmail() {
     }
 
     
-    /**
-     * Determines whether the button to send a verification email appears on user page
-     * @return 
-     */ 
     public boolean showVerifyEmailButton() {
-        final Timestamp emailConfirmed = currentUser.getEmailConfirmed();
-        final ConfirmEmailData confirmedDate = confirmEmailService.findSingleConfirmEmailDataByUser(currentUser);
-        return (!getUserAuthProvider().isEmailVerified())
-                && confirmedDate == null
-                && emailConfirmed == null;
+        return !confirmEmailService.hasVerifiedEmail(currentUser);
     }
-
+    
     public boolean isEmailIsVerified() {
-
-        return currentUser.getEmailConfirmed() != null && confirmEmailService.findSingleConfirmEmailDataByUser(currentUser) == null;
+        return confirmEmailService.hasVerifiedEmail(currentUser);
     }
 
     public boolean isEmailNotVerified() {
-        return currentUser.getEmailConfirmed() == null || confirmEmailService.findSingleConfirmEmailDataByUser(currentUser) != null;
+        return !confirmEmailService.hasVerifiedEmail(currentUser);
     }
 
     public boolean isEmailGrandfathered() {
@@ -691,7 +723,7 @@ public void setUsername(String username) {
     }
 
     public boolean isNonLocalLoginEnabled() {
-        return AuthUtil.isNonLocalLoginEnabled(authenticationService.getAuthenticationProviders());
+        return AuthUtil.isNonLocalSignupEnabled(authenticationService.getAuthenticationProviders(), systemConfig);
     }
 
     public String getReasonForReturn(DatasetVersion datasetVersion) {
@@ -714,4 +746,84 @@ public String getRequestorEmail(UserNotification notification) {
         if(notification.getRequestor() == null) return BundleUtil.getStringFromBundle("notification.email.info.unavailable");;
         return notification.getRequestor().getEmail() != null ? notification.getRequestor().getEmail() : BundleUtil.getStringFromBundle("notification.email.info.unavailable");
     }
-}
\ No newline at end of file
+
+    public List<Type> getNotificationTypeList() {
+        return notificationTypeList;
+    }
+
+    public void setNotificationTypeList(List<Type> notificationTypeList) {
+        this.notificationTypeList = notificationTypeList;
+    }
+
+    public Set<Type> getToReceiveEmails() {
+        return notificationTypeList.stream().filter(
+            x -> isDisabled(x) ? !settingsWrapper.isAlwaysMuted(x) && settingsWrapper.isNeverMuted(x) : !mutedEmails.contains(x)
+        ).collect(Collectors.toSet());
+    }
+
+    public void setToReceiveEmails(Set<Type> toReceiveEmails) {
+        this.mutedEmails = notificationTypeList.stream().filter(
+            x -> !isDisabled(x) && !toReceiveEmails.contains(x)
+        ).collect(Collectors.toSet());
+    }
+
+    public Set<Type> getToReceiveNotifications() {
+        return notificationTypeList.stream().filter(
+            x -> isDisabled(x) ? !settingsWrapper.isAlwaysMuted(x) && settingsWrapper.isNeverMuted(x) : !mutedNotifications.contains(x)
+        ).collect(Collectors.toSet());
+    }
+
+    public void setToReceiveNotifications(Set<Type> toReceiveNotifications) {
+        this.mutedNotifications = notificationTypeList.stream().filter(
+            x -> !isDisabled(x) && !toReceiveNotifications.contains(x) 
+        ).collect(Collectors.toSet());
+    }
+    
+    public boolean isDisabled(Type t) {
+        return disabledNotifications.contains(t);
+    }
+
+    public boolean isOrcidEnabled() {
+        return authenticationService.getOrcidAuthenticationProvider() != null;
+    }
+
+    public void startOrcidAuthentication() {
+        OrcidOAuth2AP orcidProvider = authenticationService.getOrcidAuthenticationProvider();
+
+        if (orcidProvider == null) {
+            JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("auth.orcid.notConfigured"));
+            return;
+        }
+
+        try {
+            // Use the appropriate method to get the authorization URL
+            String state = oauth2LoginBackingBean.createState(orcidProvider, toOption(accountInfoTab));
+            String authorizationUrl = orcidProvider.buildAuthzUrl(state,
+                    systemConfig.getDataverseSiteUrl() + "/oauth2/orcidConfirm.xhtml");
+            ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();
+            externalContext.redirect(authorizationUrl);
+        } catch (IOException ex) {
+            logger.log(Level.SEVERE, "Error starting ORCID authentication", ex);
+            JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("auth.orcid.error"));
+        }
+    }
+
+    public void removeOrcid() {
+        currentUser.setAuthenticatedOrcid(null);
+        userService.save(currentUser);
+    }
+
+    public String getOrcidForDisplay() {
+        if (currentUser == null || currentUser.getAuthenticatedOrcid() == null) {
+            return "";
+        }
+        String orcidUrl = currentUser.getAuthenticatedOrcid();
+        int index = orcidUrl.lastIndexOf('/');
+        if (index > 0) {
+            return orcidUrl.substring(index + 1);
+        } else {
+            return orcidUrl;
+        }
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/PasswordEncryption.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/PasswordEncryption.java
index 38cabb6ef25..aef8b375b63 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/PasswordEncryption.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/PasswordEncryption.java
@@ -1,9 +1,9 @@
 package edu.harvard.iq.dataverse.authorization.providers.builtin;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.mindrot.jbcrypt.BCrypt;
 //import org.primefaces.util.Base64;
 import java.util.Base64;
@@ -36,13 +36,13 @@ public interface Algorithm {
         public String encrypt(String plainText) {
             try {
                 MessageDigest md = MessageDigest.getInstance("SHA");
-                md.update(plainText.getBytes("UTF-8"));
+                md.update(plainText.getBytes(StandardCharsets.UTF_8));
                 byte[] raw = md.digest();
                 //String hash = Base64.encodeToString(raw, true);
                 String hash = Base64.getEncoder().encodeToString(raw);
                 return hash;
                 
-            } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
+            } catch (NoSuchAlgorithmException e) {
                 throw new RuntimeException(e);
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/AbstractOAuth2AuthenticationProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/AbstractOAuth2AuthenticationProvider.java
index d26a87cf020..a6b7c1b9d49 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/AbstractOAuth2AuthenticationProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/AbstractOAuth2AuthenticationProvider.java
@@ -6,13 +6,15 @@
 import com.github.scribejava.core.model.OAuthRequest;
 import com.github.scribejava.core.model.Response;
 import com.github.scribejava.core.model.Verb;
+import com.github.scribejava.core.oauth.AuthorizationUrlBuilder;
 import com.github.scribejava.core.oauth.OAuth20Service;
+import edu.harvard.iq.dataverse.LoginPage;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.AuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.AuthenticationProviderDisplayInfo;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
@@ -21,12 +23,14 @@
 
 /**
  * Base class for OAuth2 identity providers, such as GitHub and ORCiD.
+ *
+ * TODO: this really should become an interface (contract with {@link OAuth2LoginBackingBean}) when refactoring package
  * 
  * @author michael
  */
 public abstract class AbstractOAuth2AuthenticationProvider implements AuthenticationProvider {
 
-    final static Logger logger = Logger.getLogger(AbstractOAuth2AuthenticationProvider.class.getName());
+    static final Logger logger = Logger.getLogger(AbstractOAuth2AuthenticationProvider.class.getName());
 
     protected static class ParsedUserResponse {
         public final AuthenticatedUserDisplayInfo displayInfo;
@@ -89,18 +93,37 @@ public String toString() {
     protected String clientSecret;
     protected String baseUserEndpoint;
     protected String redirectUrl;
+    
     /**
      * List of scopes to be requested for authorization at identity provider.
      * Defaults to empty so no scope will be requested (use case: public info from GitHub)
      */
     protected List<String> scope = Arrays.asList("");
     
+    /**
+     * TODO: when refactoring the package to be about token flow auth, this hard dependency should be removed.
+     */
     public abstract DefaultApi20 getApiInstance();
     
     protected abstract ParsedUserResponse parseUserResponse( String responseBody );
     
     /**
-     * Build an OAuth20Service based on client ID & secret. Add default scope and insert
+     * Build an Authorization URL for this identity provider
+     * @param state A randomized state, necessary to secure the authorization flow. @see OAuth2LoginBackingBean.createState()
+     * @param callbackUrl URL where the provider should send the browser after authn in code flow
+     */
+    public String buildAuthzUrl(String state, String callbackUrl) {
+        OAuth20Service svc = this.getService(callbackUrl);
+        
+        AuthorizationUrlBuilder aub = svc.createAuthorizationUrlBuilder().state(state);
+        // Do not include scope if empty string (necessary for GitHub)
+        if (!this.getSpacedScope().isEmpty()) { aub.scope(this.getSpacedScope()); }
+        
+        return aub.build();
+    }
+    
+    /**
+     * Build an OAuth20Service based on client ID & secret, also inserting the
      * callback URL. Build uses the real API object for the target service like GitHub etc.
      * @param callbackUrl URL where the OAuth2 Provider should send browsers to after authz.
      * @return A usable OAuth20Service object
@@ -116,18 +139,20 @@ public OAuth20Service getService(String callbackUrl) {
      * Receive user data from OAuth2 provider after authn/z has been successfull. (Callback view uses this)
      * Request a token and access the resource, parse output and return user details.
      * @param code The authz code sent from the provider
-     * @param service The service object in use to communicate with the provider
+     * @param state The state which was communicated between us and the provider, identifying the exact request
+     * @param redirectUrl The redirect URL (some providers require this when fetching the access token, e. g. Google)
      * @return A user record containing all user details accessible for us
      * @throws IOException Thrown when communication with the provider fails
      * @throws OAuth2Exception Thrown when we cannot access the user details for some reason
      * @throws InterruptedException Thrown when the requests thread is failing
      * @throws ExecutionException Thrown when the requests thread is failing
      */
-    public OAuth2UserRecord getUserRecord(String code, @NotNull OAuth20Service service)
+    public OAuth2UserRecord getUserRecord(String code, String state, String redirectUrl)
         throws IOException, OAuth2Exception, InterruptedException, ExecutionException {
         
+        OAuth20Service service = getService(redirectUrl);
         OAuth2AccessToken accessToken = service.getAccessToken(code);
-    
+        
         // We need to check if scope is null first: GitHub is used without scope, so the responses scope is null.
         // Checking scopes via Stream to be independent from order.
         if ( ( accessToken.getScope() != null && ! getScope().stream().allMatch(accessToken.getScope()::contains) ) ||
@@ -135,11 +160,12 @@ public OAuth2UserRecord getUserRecord(String code, @NotNull OAuth20Service servi
             // We did not get the permissions on the scope(s) we need. Abort and inform the user.
             throw new OAuth2Exception(200, BundleUtil.getStringFromBundle("auth.providers.insufficientScope", Arrays.asList(this.getTitle())), "");
         }
-        
         OAuthRequest request = new OAuthRequest(Verb.GET, getUserEndpoint(accessToken));
         request.setCharset("UTF-8");
+        if (id.equals("microsoft")) {
+            request.addHeader("Accept", "application/json");
+        }
         service.signRequest(accessToken, request);
-    
         Response response = service.execute(request);
         int responseCode = response.getCode();
         String body = response.getBody();
@@ -189,6 +215,14 @@ public AuthenticationProviderDisplayInfo getInfo() {
         return new AuthenticationProviderDisplayInfo(getId(), getTitle(), getSubTitle());
     }
     
+    /**
+     * Used in {@link LoginPage#listAuthenticationProviders()} for sorting the providers in the UI
+     * TODO: this might be extended to use a value set by the admin when configuring the provider via JSON.
+     * @return an integer value (sort ascending)
+     */
+    @Override
+    public int getOrder() { return 100; }
+    
     @Override
     public String getId() {
         return id;
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2AuthenticationProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2AuthenticationProviderFactory.java
index eebe87dea97..360e2c53e92 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2AuthenticationProviderFactory.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2AuthenticationProviderFactory.java
@@ -7,6 +7,7 @@
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GitHubOAuth2AP;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GoogleOAuth2AP;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.MicrosoftOAuth2AP;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -31,6 +32,7 @@ public OAuth2AuthenticationProviderFactory() {
         builders.put("github", (row, data) -> readRow(row, new GitHubOAuth2AP(data.get("clientId"), data.get("clientSecret"))));
         builders.put("google", (row, data) -> readRow(row, new GoogleOAuth2AP(data.get("clientId"), data.get("clientSecret"))));
         builders.put("orcid", (row, data)  -> readRow(row, new OrcidOAuth2AP(data.get("clientId"), data.get("clientSecret"), data.get("userEndpoint"))));
+        builders.put("microsoft", (row, data) -> readRow(row, new MicrosoftOAuth2AP(data.get("clientId"), data.get("clientSecret"))));
     }
 
     @Override
@@ -62,11 +64,13 @@ public String getInfo() {
 
     /**
      * Expected map format.: {@code name: value|name: value|...}
+     * TODO: this should be refactored to use proper JSON objects ("dicts") instead of custom string format.
+     * TODO: this should be included in some base class when refactoring the package to be about token flow based auth
      *
      * @param factoryData
      * @return A map of the factory data.
      */
-    protected Map<String, String> parseFactoryData(String factoryData) {
+    public static Map<String, String> parseFactoryData(String factoryData) {
         return Arrays.asList(factoryData.split("\\|")).stream()
                 .map(s -> s.split(":", 2))
                 .filter(p -> p.length == 2)
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java
index 213feeba8f6..96ff5516c7b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java
@@ -1,10 +1,11 @@
 package edu.harvard.iq.dataverse.authorization.providers.oauth2;
 
 import edu.harvard.iq.dataverse.DataverseSession;
-import edu.harvard.iq.dataverse.EMailValidator;
+import edu.harvard.iq.dataverse.validation.EMailValidator;
 import edu.harvard.iq.dataverse.UserNotification;
 import edu.harvard.iq.dataverse.UserNotificationServiceBean;
-import edu.harvard.iq.dataverse.ValidateEmail;
+import edu.harvard.iq.dataverse.validation.ValidateEmail;
+import edu.harvard.iq.dataverse.validation.UserNameValidator;
 import edu.harvard.iq.dataverse.authorization.AuthTestDataServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthUtil;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
@@ -29,14 +30,14 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import javax.inject.Inject;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
+import jakarta.inject.Inject;
 import org.hibernate.validator.constraints.NotBlank;
 
 /**
@@ -180,10 +181,10 @@ public String createNewAccount() {
                 newUser.getDisplayInfo().getLastName(),
                 getSelectedEmail(),
                 newUser.getDisplayInfo().getAffiliation(),
-                newUser.getDisplayInfo().getPosition());
+                newUser.getDisplayInfo().getPosition(),
+                newUser.getDisplayInfo().getOrcid());
         final AuthenticatedUser user = authenticationSvc.createAuthenticatedUser(newUser.getUserRecordIdentifier(), getUsername(), newAud, true);
         session.setUser(user);
-        session.configureSessionTimeout();
         /**
          * @todo Move this to AuthenticationServiceBean.createAuthenticatedUser
          */
@@ -192,9 +193,11 @@ public String createNewAccount() {
                 UserNotification.Type.CREATEACC, null);
         
         final OAuth2TokenData tokenData = newUser.getTokenData();
-                tokenData.setUser(user);
-                tokenData.setOauthProviderId(newUser.getServiceId());
-                oauth2Tokens.store(tokenData);
+        if (tokenData != null) {
+            tokenData.setUser(user);
+            tokenData.setOauthProviderId(newUser.getServiceId());
+            oauth2Tokens.store(tokenData);
+        }
         
         return "/dataverse.xhtml?faces-redirect=true";
     }
@@ -207,11 +210,14 @@ public String convertExistingAccount() {
         auReq.putCredential(creds.get(1).getKey(), getPassword());
         try {
             AuthenticatedUser existingUser = authenticationSvc.getUpdateAuthenticatedUser(BuiltinAuthenticationProvider.PROVIDER_ID, auReq);
+            if (existingUser.isDeactivated()) {
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("oauth2.convertAccount.failedDeactivated"));
+                return null;
+            }
             authenticationSvc.updateProvider(existingUser, newUser.getServiceId(), newUser.getIdInService());
             builtinUserSvc.removeUser(existingUser.getUserIdentifier());
 
             session.setUser(existingUser);
-            session.configureSessionTimeout();
             AuthenticationProvider newUserAuthProvider = authenticationSvc.getAuthenticationProvider(newUser.getServiceId());
             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("oauth2.convertAccount.success", Arrays.asList(newUserAuthProvider.getInfo().getTitle())));
 
@@ -234,10 +240,16 @@ public boolean isEmailAvailable() {
     public void validateUserName(FacesContext context, UIComponent toValidate, Object value) {
         String userName = (String) value;
         logger.log(Level.FINE, "Validating username: {0}", userName);
-        boolean userNameFound = authenticationSvc.identifierExists(userName);
-        if (userNameFound) {
+
+        if (UserNameValidator.isUserNameValid(userName)) {
+            if (authenticationSvc.identifierExists(userName)) {
+                ((UIInput) toValidate).setValid(false);
+                FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("user.username.taken"), null);
+                context.addMessage(toValidate.getClientId(context), message);
+            }
+        } else {
             ((UIInput) toValidate).setValid(false);
-            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("user.username.taken"), null);
+            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("user.username.invalid"), null);
             context.addMessage(toValidate.getClientId(context), message);
         }
     }
@@ -248,7 +260,7 @@ public void validateUserName(FacesContext context, UIComponent toValidate, Objec
      */
     public void validateUserEmail(FacesContext context, UIComponent toValidate, Object value) {
         String userEmail = (String) value;
-        boolean emailValid = EMailValidator.isEmailValid(userEmail, null);
+        boolean emailValid = EMailValidator.isEmailValid(userEmail);
         if (!emailValid) {
             ((UIInput) toValidate).setValid(false);
             FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("oauth2.newAccount.emailInvalid"), null);
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBean.java
index 5a43c255fcf..7e3b3fd3d90 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBean.java
@@ -1,16 +1,21 @@
 package edu.harvard.iq.dataverse.authorization.providers.oauth2;
 
-import com.github.scribejava.core.oauth.AuthorizationUrlBuilder;
-import com.github.scribejava.core.oauth.OAuth20Service;
 import edu.harvard.iq.dataverse.DataverseSession;
+import edu.harvard.iq.dataverse.UserServiceBean;
+import edu.harvard.iq.dataverse.authorization.AuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.UserRecordIdentifier;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.ClockUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Serializable;
 import java.security.SecureRandom;
+import java.time.Clock;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
@@ -18,17 +23,18 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import static java.util.stream.Collectors.toList;
-import javax.ejb.EJB;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotNull;
+import jakarta.ejb.EJB;
+import jakarta.inject.Named;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotNull;
 
 import static edu.harvard.iq.dataverse.util.StringUtil.toOption;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import org.omnifaces.util.Faces;
 
 /**
  * Backing bean of the oauth2 login process. Used from the login and the
@@ -41,11 +47,16 @@
 public class OAuth2LoginBackingBean implements Serializable {
 
     private static final Logger logger = Logger.getLogger(OAuth2LoginBackingBean.class.getName());
-    private static final long STATE_TIMEOUT = 1000 * 60 * 15; // 15 minutes in msec
+    static final long STATE_TIMEOUT = 1000 * 60 * 15; // 15 minutes in msec
     private int responseCode;
     private String responseBody;
-    private Optional<String> redirectPage;
+    Optional<String> redirectPage = Optional.empty();
     private OAuth2Exception error;
+    private boolean disabled = false; 
+    private boolean signUpDisabled = false; 
+    /**
+     * TODO: Only used in exchangeCodeForToken(). Make local var in method.
+     */
     private OAuth2UserRecord oauthUser;
 
     @EJB
@@ -57,12 +68,19 @@ public class OAuth2LoginBackingBean implements Serializable {
     @EJB
     SystemConfig systemConfig;
 
+    @EJB
+    UserServiceBean userService;
+
     @Inject
     DataverseSession session;
 
     @Inject
     OAuth2FirstLoginPage newAccountPage;
-
+    
+    @Inject
+    @ClockUtil.LocalTime
+    Clock clock;
+    
     /**
      * Generate the OAuth2 Provider URL to be used in the login page link for the provider.
      * @param idpId Unique ID for the provider (used to lookup in authn service bean)
@@ -71,16 +89,8 @@ public class OAuth2LoginBackingBean implements Serializable {
      */
     public String linkFor(String idpId, String redirectPage) {
         AbstractOAuth2AuthenticationProvider idp = authenticationSvc.getOAuth2Provider(idpId);
-        OAuth20Service svc = idp.getService(systemConfig.getOAuth2CallbackUrl());
         String state = createState(idp, toOption(redirectPage));
-        
-        AuthorizationUrlBuilder aub = svc.createAuthorizationUrlBuilder()
-                                         .state(state);
-        
-        // Do not include scope if empty string (necessary for GitHub)
-        if (!idp.getSpacedScope().isEmpty()) { aub.scope(idp.getSpacedScope()); }
-        
-        return aub.build();
+        return idp.buildAuthzUrl(state, systemConfig.getOAuth2CallbackUrl());
     }
     
     /**
@@ -88,38 +98,63 @@ public String linkFor(String idpId, String redirectPage) {
      * @throws IOException
      */
     public void exchangeCodeForToken() throws IOException {
-        HttpServletRequest req = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
+        HttpServletRequest req = Faces.getRequest();
         
         try {
-            Optional<AbstractOAuth2AuthenticationProvider> oIdp = parseStateFromRequest(req);
+            Optional<AbstractOAuth2AuthenticationProvider> oIdp = parseStateFromRequest(req.getParameter("state"));
             Optional<String> code = parseCodeFromRequest(req);
 
             if (oIdp.isPresent() && code.isPresent()) {
                 AbstractOAuth2AuthenticationProvider idp = oIdp.get();
+                oauthUser = idp.getUserRecord(code.get(), req.getParameter("state"), systemConfig.getOAuth2CallbackUrl());
                 
-                OAuth20Service svc = idp.getService(systemConfig.getOAuth2CallbackUrl());
-                oauthUser = idp.getUserRecord(code.get(), svc);
+                // Throw an error if this authentication method is disabled:
+                // (it's not clear if it's possible at all, for somebody to get here with 
+                // the provider really disabled; but, shouldn't hurt either).
+                if (isProviderDisabled(idp.getId())) {
+                    disabled = true; 
+                    throw new OAuth2Exception(-1, "", MessageFormat.format(BundleUtil.getStringFromBundle("oauth2.callback.error.providerDisabled"), idp.getId()));
+                }
                 
                 UserRecordIdentifier idtf = oauthUser.getUserRecordIdentifier();
                 AuthenticatedUser dvUser = authenticationSvc.lookupUser(idtf);
     
                 if (dvUser == null) {
-                    // need to create the user
-                    newAccountPage.setNewUser(oauthUser);
-                    FacesContext.getCurrentInstance().getExternalContext().redirect("/oauth2/firstLogin.xhtml");
+                    // Need to create a new user - unless signups are disabled 
+                    // for this authentication method; in which case, throw 
+                    // an error:
+                    if (systemConfig.isSignupDisabledForRemoteAuthProvider(idp.getId())) {
+                        signUpDisabled = true; 
+                        throw new OAuth2Exception(-1, "", MessageFormat.format(BundleUtil.getStringFromBundle("oauth2.callback.error.signupDisabledForProvider"), idp.getId())); 
+                    } else {
+                        if (idp instanceof OrcidOAuth2AP) {
+                            oauthUser.getDisplayInfo()
+                                    .setOrcid(((OrcidOAuth2AP) idp).getOrcidUrl(oauthUser.getIdInService()));
+                        }
+                        newAccountPage.setNewUser(oauthUser);
+                        Faces.redirect("/oauth2/firstLogin.xhtml");
+                    }
         
                 } else {
                     // login the user and redirect to HOME of intended page (if any).
+                    // setUser checks for deactivated users.
+                    dvUser = userService.updateLastLogin(dvUser);
+                    // On the first login (after this code was added) via the Orcid provider, set the user's ORCID
+                    // Doing this here assures the user authenticated to ORCID before their profile's ORCID is set
+                    // (and not, for example, when an account was created via API)
+                    if((idp instanceof OrcidOAuth2AP) && dvUser.getAuthenticatedOrcid()==null) {
+                        dvUser.setAuthenticatedOrcid(((OrcidOAuth2AP)idp).getOrcidUrl(oauthUser.getIdInService()));
+                        userService.save(dvUser);
+                    }
                     session.setUser(dvUser);
-                    session.configureSessionTimeout();
                     final OAuth2TokenData tokenData = oauthUser.getTokenData();
-                    tokenData.setUser(dvUser);
-                    tokenData.setOauthProviderId(idp.getId());
-                    oauth2Tokens.store(tokenData);
-                    String destination = redirectPage.orElse("/");
-                    HttpServletResponse response = (HttpServletResponse) FacesContext.getCurrentInstance().getExternalContext().getResponse();
-                    String prettyUrl = response.encodeRedirectURL(destination);
-                    FacesContext.getCurrentInstance().getExternalContext().redirect(prettyUrl);
+                    if (tokenData != null) {
+                        tokenData.setUser(dvUser);
+                        tokenData.setOauthProviderId(idp.getId());
+                        oauth2Tokens.store(tokenData);
+                    }
+                    
+                    Faces.redirect(redirectPage.orElse("/"));
                 }
             }
         } catch (OAuth2Exception ex) {
@@ -132,6 +167,57 @@ public void exchangeCodeForToken() throws IOException {
         }
     }
     
+    /**
+     * View action for orcidConfirm.xhtml, the browser redirect target for the OAuth2 provider.
+     * @throws IOException
+     */
+    public void setOrcidInProfile() throws IOException {
+        HttpServletRequest req = Faces.getRequest();
+        
+        try {
+            Optional<AbstractOAuth2AuthenticationProvider> oIdp = parseStateFromRequest(req.getParameter("state"));
+            Optional<String> code = parseCodeFromRequest(req);
+
+            if (oIdp.isPresent() && code.isPresent()) {
+                AbstractOAuth2AuthenticationProvider idp = oIdp.get();
+                oauthUser = idp.getUserRecord(code.get(), req.getParameter("state"), systemConfig.getDataverseSiteUrl() + "/oauth2/orcidConfirm.xhtml");
+                
+                UserRecordIdentifier idtf = oauthUser.getUserRecordIdentifier();
+                User user = session.getUser();
+                String orcid = ((OrcidOAuth2AP)idp).getOrcidUrl(oauthUser.getIdInService());
+                if(authenticationSvc.lookupUserByOrcid(orcid)!= null) {
+                    throw new OAuth2Exception(-1, "", MessageFormat.format(BundleUtil.getStringFromBundle("oauth2.callback.error.orcidInUse"), orcid));
+                }
+                if(user != null && user.isAuthenticated()) {
+                    AuthenticatedUser dvUser = (AuthenticatedUser) user;
+                    if((idp instanceof OrcidOAuth2AP) && dvUser.getAuthenticatedOrcid()==null) {
+                        dvUser.setAuthenticatedOrcid(orcid);
+                        userService.save(dvUser);
+                    }
+                    session.setUser(dvUser);
+                    
+                    Faces.redirect(redirectPage.orElse("/"));
+                
+                } else {
+                        throw new OAuth2Exception(-1, "", MessageFormat.format(BundleUtil.getStringFromBundle("oauth2.callback.error.accountNotFound"), idp.getId())); 
+        
+                } 
+            }
+        } catch (OAuth2Exception ex) {
+            error = ex;
+            logger.log(Level.INFO, "ORCID OAuth2Exception caught. HTTP return code: {0}. Message: {1}. Message body: {2}", new Object[]{error.getHttpReturnCode(), error.getLocalizedMessage(), error.getMessageBody()});
+            Logger.getLogger(OAuth2LoginBackingBean.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (InterruptedException | ExecutionException ex) {
+            error = new OAuth2Exception(-1, "Please see server logs for more details", "Could not login at ORCID due to threading exceptions.");
+            logger.log(Level.WARNING, "Threading exception caught. Message: {0}", ex.getLocalizedMessage());
+        }
+    }
+
+    
+    /**
+     * TODO: Refactor this to be included in calling method.
+     * TODO: Use org.apache.commons.io.IOUtils.toString(req.getReader()) instead of overcomplicated code below.
+     */
     private Optional<String> parseCodeFromRequest(@NotNull HttpServletRequest req) {
         String code = req.getParameter("code");
         if (code == null || code.trim().isEmpty()) {
@@ -152,11 +238,21 @@ private Optional<String> parseCodeFromRequest(@NotNull HttpServletRequest req) {
         }
         return Optional.of(code);
     }
-
-    private Optional<AbstractOAuth2AuthenticationProvider> parseStateFromRequest(@NotNull HttpServletRequest req) {
-        String state = req.getParameter("state");
-        
-        if (state == null) {
+    
+    /**
+     * Parse and verify the state returned from the provider.
+     *
+     * As it contains the providers implementation "id" field when send by us,
+     * we can return the corresponding provider object.
+     *
+     * This function is not side effect free: it will (if present) set {@link #redirectPage}
+     * to the value received from the state.
+     *
+     * @param state The state string, created in  {@link #createState(AbstractOAuth2AuthenticationProvider, Optional)}, send and returned by provider
+     * @return A corresponding provider object when state verification succeeded.
+     */
+    Optional<AbstractOAuth2AuthenticationProvider> parseStateFromRequest(@NotNull String state) {
+        if (state == null || state.trim().equals("")) {
             logger.log(Level.INFO, "No state present in request");
             return Optional.empty();
         }
@@ -168,8 +264,14 @@ private Optional<AbstractOAuth2AuthenticationProvider> parseStateFromRequest(@No
         }
         AbstractOAuth2AuthenticationProvider idp = authenticationSvc.getOAuth2Provider(topFields[0]);
         if (idp == null) {
-            logger.log(Level.INFO, "Can''t find IDP ''{0}''", topFields[0]);
-            return Optional.empty();
+            //No login enabled provider matches, try the Orcid provider as this could be an attempt to add an ORCID to a profile
+            AbstractOAuth2AuthenticationProvider possibleIdp = authenticationSvc.getOrcidAuthenticationProvider();
+            if(possibleIdp != null && possibleIdp.getId().equals(topFields[0])) {
+                idp = possibleIdp;
+            } else {
+                logger.log(Level.INFO, "Can''t find IDP ''{0}''", topFields[0]);
+                return Optional.empty();
+            }
         }
         
         // Verify the response by decrypting values and check for state valid timeout
@@ -177,10 +279,10 @@ private Optional<AbstractOAuth2AuthenticationProvider> parseStateFromRequest(@No
         String[] stateFields = raw.split("~", -1);
         if (idp.getId().equals(stateFields[0])) {
             long timeOrigin = Long.parseLong(stateFields[1]);
-            long timeDifference = System.currentTimeMillis() - timeOrigin;
+            long timeDifference = this.clock.millis() - timeOrigin;
             if (timeDifference > 0 && timeDifference < STATE_TIMEOUT) {
                 if ( stateFields.length > 3) {
-                    redirectPage = Optional.ofNullable(stateFields[3]);
+                    this.redirectPage = Optional.ofNullable(stateFields[3]);
                 }
                 return Optional.of(idp);
             } else {
@@ -192,14 +294,20 @@ private Optional<AbstractOAuth2AuthenticationProvider> parseStateFromRequest(@No
             return Optional.empty();
         }
     }
-
-    private String createState(AbstractOAuth2AuthenticationProvider idp, Optional<String> redirectPage ) {
+    
+    /**
+     * Create a randomized unique state string to be used while crafting the autorization request
+     * @param idp
+     * @param redirectPage
+     * @return Random state string, composed from system time, random numbers and redirectPage parameter
+     */
+    public String createState(AbstractOAuth2AuthenticationProvider idp, Optional<String> redirectPage) {
         if (idp == null) {
             throw new IllegalArgumentException("idp cannot be null");
         }
         SecureRandom rand = new SecureRandom();
         
-        String base = idp.getId() + "~" + System.currentTimeMillis() 
+        String base = idp.getId() + "~" + this.clock.millis()
                                   + "~" + rand.nextInt(1000)
                                   + redirectPage.map( page -> "~"+page).orElse("");
 
@@ -207,15 +315,24 @@ private String createState(AbstractOAuth2AuthenticationProvider idp, Optional<St
         final String state = idp.getId() + "~" + encrypted;
         return state;
     }
-
+    
+    /**
+     * TODO: Unused. Remove.
+     */
     public String getResponseBody() {
         return responseBody;
     }
-
+    
+    /**
+     * TODO: Unused. Remove.
+     */
     public int getResponseCode() {
         return responseCode;
     }
-
+    
+    /**
+     * TODO: Unused. Remove.
+     */
     public OAuth2UserRecord getUser() {
         return oauthUser;
     }
@@ -223,18 +340,55 @@ public OAuth2UserRecord getUser() {
     public OAuth2Exception getError() {
         return error;
     }
-
+    
+    /**
+     * TODO: Unused. Remove.
+     */
     public boolean isInError() {
         return error != null;
     }
-
+    
+    /**
+     * TODO: Unused. Remove.
+     */
     public List<AbstractOAuth2AuthenticationProvider> getProviders() {
         return authenticationSvc.getOAuth2Providers().stream()
                 .sorted(Comparator.comparing(AbstractOAuth2AuthenticationProvider::getTitle))
                 .collect(toList());
     }
-
+    
+    /**
+     * TODO: Unused. Remove.
+     */
     public boolean isOAuth2ProvidersDefined() {
         return !authenticationSvc.getOAuth2Providers().isEmpty();
     }
+    
+    public boolean isDisabled() {
+        return disabled;
+    }
+    
+    public boolean isSignUpDisabled() {
+        return signUpDisabled; 
+    }
+    
+    private boolean isProviderDisabled(String providerId) {
+        // Compare this provider id against the list of *enabled* auth providers 
+        // returned by the Authentication Service:
+        List<AuthenticationProvider> idps = new ArrayList<>(authenticationSvc.getAuthenticationProviders());
+        
+        // for the tests to work:
+        if (idps.isEmpty()) {
+            return false; 
+        }
+        
+        for (AuthenticationProvider idp : idps) {
+            if (idp != null) {
+                if (providerId.equals(idp.getId())) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2TokenData.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2TokenData.java
index a5ee5ddf537..59f659ff297 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2TokenData.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2TokenData.java
@@ -4,14 +4,14 @@
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import java.io.Serializable;
 import java.sql.Timestamp;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
 
 /**
  * Token data for a given user, received from an OAuth2 system. Contains the 
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2TokenDataServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2TokenDataServiceBean.java
index d8f1fa7600b..b1dcb6df8cc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2TokenDataServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2TokenDataServiceBean.java
@@ -2,10 +2,10 @@
 
 import java.util.List;
 import java.util.Optional;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 /**
  * CRUD for {@link OAuth2TokenData}.
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2UserRecord.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2UserRecord.java
index 234c2828ab5..6667d8551ca 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2UserRecord.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2UserRecord.java
@@ -2,39 +2,103 @@
 
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.UserRecordIdentifier;
+
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * Describes a single user on a remote IDP that uses OAuth2.
  * Normally generated by {@link AbstractOAuth2Idp}.
- * 
+ *
  * @author michael
  */
-public class OAuth2UserRecord implements java.io.Serializable {
-    
+public class OAuth2UserRecord implements Serializable {
+
+    /**
+     * The expected value for the "idp" claim, identifying users authenticated by our
+     * custom Builtin Users SPI.
+     * <p>
+     * This check is performed when the {@code API_BEARER_AUTH_USE_BUILTIN_USER_ON_ID_MATCH}
+     * feature is enabled.
+     * <p>
+     * By verifying this value, we significantly reduce the risk of impersonation by
+     * other IdPs, as they would have to be explicitly configured with this specific,
+     * non-standard identifier.
+     */
+    public static final String BUILTIN_IDP_EXPECTED_CLAIM_VALUE = "dv-builtin-users-authenticator";
+
+    /**
+     * The following claim names are expected to be received when using the
+     * CILogon org.cilogon.userinfo scope specification. For more details, see
+     * https://www.cilogon.org/oidc
+     */
+    public static final String OIDC_USER_ID_CLAIM_NAME = "oidc";
+    public static final String IDP_CLAIM_NAME = "idp";
+
     private final String serviceId;
-    
-    /** An immutable value, probably a number. Not a username that may change. */
+
+    /**
+     * An immutable value, probably a number. Not a username that may change.
+     */
     private final String idInService;
 
-    /** A potentially mutable String that is easier on the eye than a number. */
+    /**
+     * A potentially mutable String that is easier on the eye than a number.
+     */
     private final String username;
-    
+
+    /**
+     * For users originally coming from a Shibboleth IdP
+     */
+    private final String shibUniquePersistentIdentifier;
+
+    /**
+     * For brokered users coming from another OIDC provider
+     */
+    private final String oidcUserId;
+
+    private final String idp;
     private final AuthenticatedUserDisplayInfo displayInfo;
-    
     private final List<String> availableEmailAddresses;
-    
     private final OAuth2TokenData tokenData;
-    
-    public OAuth2UserRecord(String aServiceId, String anIdInService, String aUsername,
-                            OAuth2TokenData someTokenData,  AuthenticatedUserDisplayInfo aDisplayInfo,
-                            List<String> someAvailableEmailAddresses) {
-        serviceId = aServiceId;
-        idInService = anIdInService;
-        username = aUsername;
-        tokenData = someTokenData;
-        displayInfo = aDisplayInfo;
-        availableEmailAddresses = someAvailableEmailAddresses;
+
+    /**
+     * Constructor for users without Shibboleth attributes.
+     */
+    public OAuth2UserRecord(
+            String serviceId,
+            String idInService,
+            String username,
+            OAuth2TokenData tokenData,
+            AuthenticatedUserDisplayInfo displayInfo,
+            List<String> availableEmailAddresses
+    ) {
+        this(serviceId, idInService, username, null, null, null, tokenData, displayInfo, availableEmailAddresses);
+    }
+
+    /**
+     * Full constructor for OAuth2 user records.
+     */
+    public OAuth2UserRecord(
+            String serviceId,
+            String idInService,
+            String username,
+            String shibUniquePersistentIdentifier,
+            String idp,
+            String oidcUserId,
+            OAuth2TokenData tokenData,
+            AuthenticatedUserDisplayInfo displayInfo,
+            List<String> availableEmailAddresses
+    ) {
+        this.serviceId = serviceId;
+        this.idInService = idInService;
+        this.username = username;
+        this.shibUniquePersistentIdentifier = shibUniquePersistentIdentifier;
+        this.idp = idp;
+        this.oidcUserId = oidcUserId;
+        this.tokenData = tokenData;
+        this.displayInfo = displayInfo;
+        this.availableEmailAddresses = availableEmailAddresses;
     }
 
     public String getServiceId() {
@@ -49,10 +113,22 @@ public String getUsername() {
         return username;
     }
 
+    public String getShibUniquePersistentIdentifier() {
+        return shibUniquePersistentIdentifier;
+    }
+
+    public String getIdp() {
+        return idp;
+    }
+
+    public String getOidcUserId() {
+        return oidcUserId;
+    }
+
     public List<String> getAvailableEmailAddresses() {
         return availableEmailAddresses;
     }
-    
+
     public AuthenticatedUserDisplayInfo getDisplayInfo() {
         return displayInfo;
     }
@@ -61,12 +137,27 @@ public OAuth2TokenData getTokenData() {
         return tokenData;
     }
 
-    @Override
-    public String toString() {
-        return "OAuth2UserRecord{" + "serviceId=" + serviceId + ", idInService=" + idInService + '}';
-    }
-    
     public UserRecordIdentifier getUserRecordIdentifier() {
         return new UserRecordIdentifier(serviceId, idInService);
     }
+
+    public boolean hasShibAttributes() {
+        return idp != null && shibUniquePersistentIdentifier != null;
+    }
+
+    public boolean hasOAuthAttributes() {
+        return idp != null && oidcUserId != null;
+    }
+
+    public boolean hasBuiltinAttributes() {
+        return idp != null && idp.equals(BUILTIN_IDP_EXPECTED_CLAIM_VALUE);
+    }
+
+    @Override
+    public String toString() {
+        return "OAuth2UserRecord{" +
+                "serviceId='" + serviceId + '\'' +
+                ", idInService='" + idInService + '\'' +
+                '}';
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2AP.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2AP.java
index 62f3cc382e2..457a91bc932 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2AP.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2AP.java
@@ -9,18 +9,20 @@
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.StringReader;
 import java.util.Collections;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 
 /**
  * IDP adaptor for GitHub.com
  * @author michael
  */
 public class GitHubOAuth2AP extends AbstractOAuth2AuthenticationProvider {
-    
+
+    public static final String PROVIDER_ID = "github";
+
     public GitHubOAuth2AP(String aClientId, String aClientSecret) {
-        id = "github";
+        id = PROVIDER_ID;
         title = BundleUtil.getStringFromBundle("auth.providers.title.github");
         clientId = aClientId;
         clientSecret = aClientSecret;
@@ -58,30 +60,4 @@ protected ParsedUserResponse parseUserResponse( String responseBody ) {
         }
         
     }
-
-    @Override
-    public boolean isDisplayIdentifier() {
-        return false;
-    }
-
-    @Override
-    public String getPersistentIdName() {
-        return BundleUtil.getStringFromBundle("auth.providers.persistentUserIdName.github");
-    }
-
-    @Override
-    public String getPersistentIdDescription() {
-        return BundleUtil.getStringFromBundle("auth.providers.persistentUserIdTooltip.github");
-    }
-
-    @Override
-    public String getPersistentIdUrlPrefix() {
-        return null;
-    }
-
-    @Override
-    public String getLogo() {
-        return null;
-    }
-    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GoogleOAuth2AP.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GoogleOAuth2AP.java
index 1fa5470d551..a0889a5bfd3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GoogleOAuth2AP.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GoogleOAuth2AP.java
@@ -8,18 +8,20 @@
 import java.io.StringReader;
 import java.util.Arrays;
 import java.util.UUID;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 
 /**
  *
  * @author michael
  */
 public class GoogleOAuth2AP extends AbstractOAuth2AuthenticationProvider {
-    
+
+    public static final String PROVIDER_ID = "google";
+
     public GoogleOAuth2AP(String aClientId, String aClientSecret) {
-        id = "google";
+        id = PROVIDER_ID;
         title = BundleUtil.getStringFromBundle("auth.providers.title.google");
         clientId = aClientId;
         clientSecret = aClientSecret;
@@ -63,10 +65,4 @@ protected ParsedUserResponse parseUserResponse(String responseBody) {
             return new ParsedUserResponse(displayInfo, persistentUserId, username);
         }
     }
-
-    @Override
-    public boolean isDisplayIdentifier() {
-        return false;
-    }
-    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/MicrosoftOAuth2AP.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/MicrosoftOAuth2AP.java
new file mode 100644
index 00000000000..bd3caccc220
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/MicrosoftOAuth2AP.java
@@ -0,0 +1,60 @@
+package edu.harvard.iq.dataverse.authorization.providers.oauth2.impl;
+
+import com.github.scribejava.apis.MicrosoftAzureActiveDirectory20Api;
+import com.github.scribejava.core.builder.api.DefaultApi20;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.logging.Logger;
+import java.io.StringReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
+
+/**
+ *
+ * @author
+ */
+public class MicrosoftOAuth2AP extends AbstractOAuth2AuthenticationProvider{
+
+    private static final Logger logger = Logger.getLogger(MicrosoftOAuth2AP.class.getCanonicalName());
+
+    public MicrosoftOAuth2AP(String aClientId, String aClientSecret){
+        this.id = "microsoft";
+        this.title = "Microsoft";
+        this.clientId = aClientId;
+        this.clientSecret = aClientSecret;
+        this.scope = Arrays.asList("User.Read");
+        this.baseUserEndpoint = "https://graph.microsoft.com/v1.0/me";
+    }
+
+    @Override
+    public DefaultApi20 getApiInstance(){
+        return MicrosoftAzureActiveDirectory20Api.instance();
+    }
+
+    @Override
+    protected ParsedUserResponse parseUserResponse(final String responseBody) {
+        try ( StringReader rdr = new StringReader(responseBody);
+              JsonReader jrdr = Json.createReader(rdr) )  {
+            JsonObject response = jrdr.readObject();
+            AuthenticatedUserDisplayInfo displayInfo = new AuthenticatedUserDisplayInfo(
+                    response.getString("givenName", ""),
+                    response.getString("surname", ""),
+                    response.getString("userPrincipalName", ""),
+                    "", "");
+            String persistentUserId = response.getString("id");
+            String username = response.getString("userPrincipalName");
+            return new ParsedUserResponse(displayInfo, persistentUserId, username,
+                    (displayInfo.getEmailAddress().length() > 0 ? Collections.singletonList(displayInfo.getEmailAddress()) : Collections.emptyList() )
+            );
+        }
+    }
+
+    public boolean isDisplayIdentifier()
+    {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java
index be22e9bc332..f32ff2b18e5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java
@@ -12,7 +12,10 @@
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2Exception;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2TokenData;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2UserRecord;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.*;
@@ -23,10 +26,10 @@
 import static java.util.stream.Collectors.joining;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.validation.constraints.NotNull;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.validation.constraints.NotNull;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -49,13 +52,18 @@
  */
 public class OrcidOAuth2AP extends AbstractOAuth2AuthenticationProvider {
     
-    final static Logger logger = Logger.getLogger(OrcidOAuth2AP.class.getName());
+    static final Logger logger = Logger.getLogger(OrcidOAuth2AP.class.getName());
 
-    public static final String PROVIDER_ID_PRODUCTION = "orcid";
-    public static final String PROVIDER_ID_SANDBOX = "orcid-sandbox";
+    public static final String PROVIDER_ID = "orcid";
     
     public OrcidOAuth2AP(String clientId, String clientSecret, String userEndpoint) {
-        scope = Arrays.asList("/read-limited");
+        this.id=PROVIDER_ID;
+        if(userEndpoint != null && userEndpoint.startsWith("https://pub")) {
+            this.scope = Arrays.asList("/authenticate");
+        } else {
+            this.scope = Arrays.asList("/read-limited");
+        }
+        
         this.clientId = clientId;
         this.clientSecret = clientSecret;
         this.baseUserEndpoint = userEndpoint;
@@ -72,7 +80,7 @@ public String getUserEndpoint( OAuth2AccessToken token )  {
     
     @Override
     public DefaultApi20 getApiInstance() {
-        return OrcidApi.instance( ! baseUserEndpoint.contains("sandbox") );
+        return OrcidApi.instance( isProduction() );
     }
     
     @Override
@@ -105,52 +113,50 @@ final protected OAuth2UserRecord getUserRecord(@NotNull String responseBody, @No
     
     @Override
     protected ParsedUserResponse parseUserResponse(String responseBody) {
-        DocumentBuilderFactory dbFact = DocumentBuilderFactory.newInstance();
         try ( StringReader reader = new StringReader(responseBody)) {
-            DocumentBuilder db = dbFact.newDocumentBuilder();
-            Document doc = db.parse( new InputSource(reader) );
-            
-            String firstName = getNodes(doc, "person:person", "person:name", "personal-details:given-names" )
-                                .stream().findFirst().map( Node::getTextContent )
-                                    .map( String::trim ).orElse("");
-            String familyName = getNodes(doc, "person:person", "person:name", "personal-details:family-name")
-                                .stream().findFirst().map( Node::getTextContent )
-                                    .map( String::trim ).orElse("");
-            
-            // fallback - try to use the credit-name
-            if ( (firstName + familyName).equals("") ) {
-                firstName = getNodes(doc, "person:person", "person:name", "personal-details:credit-name" )
-                                .stream().findFirst().map( Node::getTextContent )
-                                    .map( String::trim ).orElse("");
-            }
-            
-            String primaryEmail = getPrimaryEmail(doc);
-            List<String> emails = getAllEmails(doc);
-            
-            // make the username up
-            String username;
-            if ( primaryEmail.length() > 0 ) {
-                username = primaryEmail.split("@")[0];
-            } else {
-                username = firstName.split(" ")[0] + "." + familyName;
+            DocumentBuilder db = XmlUtil.getSecureDocumentBuilder();
+            if (db != null) {
+                Document doc = db.parse(new InputSource(reader));
+
+                String firstName = getNodes(doc, "person:person", "person:name", "personal-details:given-names")
+                        .stream().findFirst().map(Node::getTextContent)
+                        .map(String::trim).orElse("");
+                String familyName = getNodes(doc, "person:person", "person:name", "personal-details:family-name")
+                        .stream().findFirst().map(Node::getTextContent)
+                        .map(String::trim).orElse("");
+
+                // fallback - try to use the credit-name
+                if ((firstName + familyName).equals("")) {
+                    firstName = getNodes(doc, "person:person", "person:name", "personal-details:credit-name")
+                            .stream().findFirst().map(Node::getTextContent)
+                            .map(String::trim).orElse("");
+                }
+
+                String primaryEmail = getPrimaryEmail(doc);
+                List<String> emails = getAllEmails(doc);
+
+                // make the username up
+                String username;
+                if (primaryEmail.length() > 0) {
+                    username = primaryEmail.split("@")[0];
+                } else {
+                    username = firstName.split(" ")[0] + "." + familyName;
+                }
+                username = username.replaceAll("[^a-zA-Z0-9.]", "");
+
+                // returning the parsed user. The user-id-in-provider will be added by the caller, since ORCiD passes it
+                // on the access token response.
+                // Affiliation added after a later call.
+                final ParsedUserResponse userResponse = new ParsedUserResponse(
+                        new AuthenticatedUserDisplayInfo(firstName, familyName, primaryEmail, "", ""), null, username);
+                userResponse.emails.addAll(emails);
+
+                return userResponse;
             }
-            username = username.replaceAll("[^a-zA-Z0-9.]","");
-            
-            // returning the parsed user. The user-id-in-provider will be added by the caller, since ORCiD passes it
-            // on the access token response.
-            // Affilifation added after a later call.
-            final ParsedUserResponse userResponse = new ParsedUserResponse(
-                    new AuthenticatedUserDisplayInfo(firstName, familyName, primaryEmail, "", ""), null, username);
-            userResponse.emails.addAll(emails);
-            
-            return userResponse;
-            
         } catch (SAXException ex) {
             logger.log(Level.SEVERE, "XML error parsing response body from ORCiD: " + ex.getMessage(), ex);
         } catch (IOException ex) {
             logger.log(Level.SEVERE, "I/O error parsing response body from ORCiD: " + ex.getMessage(), ex);
-        } catch (ParserConfigurationException ex) {
-            logger.log(Level.SEVERE, "While parsing the ORCiD response: Bad parse configuration. " + ex.getMessage(), ex);
         }
         
         return null;
@@ -227,34 +233,20 @@ private NodeList xpathMatches(Document doc, String pattern) {
 
     @Override
     public AuthenticationProviderDisplayInfo getInfo() {
-        if (PROVIDER_ID_PRODUCTION.equals(getId())) {
+        if (isProduction()) {
             return new AuthenticationProviderDisplayInfo(getId(), BundleUtil.getStringFromBundle("auth.providers.title.orcid"), "ORCID user repository");
         }
         return new AuthenticationProviderDisplayInfo(getId(), "ORCID Sandbox", "ORCID dev sandbox ");
     }
 
-    @Override
-    public boolean isDisplayIdentifier() {
-        return true;
-    }
-
-    @Override
-    public String getPersistentIdName() {
-        return BundleUtil.getStringFromBundle("auth.providers.persistentUserIdName.orcid");
-    }
-
-    @Override
-    public String getPersistentIdDescription() {
-        return BundleUtil.getStringFromBundle("auth.providers.persistentUserIdTooltip.orcid");
-    }
-
-    @Override
     public String getPersistentIdUrlPrefix() {
-        return "https://orcid.org/";
+        if(isProduction()) {
+            return "https://orcid.org/";
+        }
+        return "https://sandbox.orcid.org/";
     }
 
-    @Override
-    public String getLogo() {
+    public final static String getLogo() {
         return "/resources/images/orcid_16x16.png";
     }
     
@@ -323,4 +315,12 @@ protected AuthenticatedUserDisplayInfo parseActivitiesResponse( String responseB
         
         return null;   
     }
+
+    public String getOrcidUrl(String id) {
+        return (id == null) ? null : getPersistentIdUrlPrefix() + id;
+    }
+    
+    private boolean isProduction() {
+        return !baseUserEndpoint.contains("sandbox");
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthProvider.java
new file mode 100644
index 00000000000..3e62598ee79
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthProvider.java
@@ -0,0 +1,329 @@
+package edu.harvard.iq.dataverse.authorization.providers.oauth2.oidc;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.scribejava.core.builder.api.DefaultApi20;
+import com.nimbusds.oauth2.sdk.AuthorizationCode;
+import com.nimbusds.oauth2.sdk.AuthorizationCodeGrant;
+import com.nimbusds.oauth2.sdk.AuthorizationGrant;
+import com.nimbusds.oauth2.sdk.ErrorObject;
+import com.nimbusds.oauth2.sdk.ParseException;
+import com.nimbusds.oauth2.sdk.ResponseType;
+import com.nimbusds.oauth2.sdk.Scope;
+import com.nimbusds.oauth2.sdk.TokenRequest;
+import com.nimbusds.oauth2.sdk.TokenResponse;
+import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
+import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;
+import com.nimbusds.oauth2.sdk.auth.Secret;
+import com.nimbusds.oauth2.sdk.http.HTTPRequest;
+import com.nimbusds.oauth2.sdk.http.HTTPResponse;
+import com.nimbusds.oauth2.sdk.id.ClientID;
+import com.nimbusds.oauth2.sdk.id.Issuer;
+import com.nimbusds.oauth2.sdk.id.State;
+import com.nimbusds.oauth2.sdk.pkce.CodeChallengeMethod;
+import com.nimbusds.oauth2.sdk.pkce.CodeVerifier;
+import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
+import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
+import com.nimbusds.openid.connect.sdk.Nonce;
+import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
+import com.nimbusds.openid.connect.sdk.OIDCTokenResponseParser;
+import com.nimbusds.openid.connect.sdk.UserInfoRequest;
+import com.nimbusds.openid.connect.sdk.UserInfoResponse;
+import com.nimbusds.openid.connect.sdk.claims.UserInfo;
+import com.nimbusds.openid.connect.sdk.op.OIDCProviderConfigurationRequest;
+import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
+import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
+import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationSetupException;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2Exception;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2UserRecord;
+import edu.harvard.iq.dataverse.authorization.providers.shib.ShibUtil;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+import java.io.IOException;
+import java.net.URI;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.logging.Logger;
+
+/**
+ * TODO: this should not EXTEND, but IMPLEMENT the contract to be used in {@link edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2LoginBackingBean}
+ */
+public class OIDCAuthProvider extends AbstractOAuth2AuthenticationProvider {
+    
+    private static final Logger logger = Logger.getLogger(OIDCAuthProvider.class.getName());
+    
+    protected String id = "oidc";
+    protected String title = "Open ID Connect";
+    protected List<String> scope = Arrays.asList("openid", "email", "profile");
+    
+    final Issuer issuer;
+    final ClientAuthentication clientAuth;
+    final OIDCProviderMetadata idpMetadata;
+    final boolean pkceEnabled;
+    final CodeChallengeMethod pkceMethod;
+    
+    /**
+     * Using PKCE, we create and send a special {@link CodeVerifier}. This contains a secret
+     * we need again when verifying the response by the provider, thus the cache.
+     * To be absolutely sure this may not be abused to DDoS us and not let unused verifiers rot,
+     * use an evicting cache implementation and not a standard map.
+     */
+    private final Cache<String,CodeVerifier> verifierCache = Caffeine.newBuilder()
+        .maximumSize(JvmSettings.OIDC_PKCE_CACHE_MAXSIZE.lookup(Integer.class))
+        .expireAfterWrite(Duration.of(JvmSettings.OIDC_PKCE_CACHE_MAXAGE.lookup(Integer.class), ChronoUnit.SECONDS))
+        .build();
+    
+    public OIDCAuthProvider(String aClientId, String aClientSecret, String issuerEndpointURL,
+                            boolean pkceEnabled, String pkceMethod) throws AuthorizationSetupException {
+        this.clientSecret = aClientSecret; // nedded for state creation
+        this.clientAuth = new ClientSecretBasic(new ClientID(aClientId), new Secret(aClientSecret));
+        this.issuer = new Issuer(issuerEndpointURL);
+        
+        this.idpMetadata = getMetadata();
+        
+        this.pkceEnabled = pkceEnabled;
+        this.pkceMethod = CodeChallengeMethod.parse(pkceMethod);
+    }
+    
+    
+    /**
+     * Setup metadata from OIDC provider during creation of the provider representation
+     * @return The OIDC provider metadata, if successfull
+     * @throws IOException when sth. goes wrong with the retrieval
+     * @throws ParseException when the metadata is not parsable
+     */
+    OIDCProviderMetadata getMetadata() throws AuthorizationSetupException {
+        try {
+            var metadata = getMetadata(this.issuer);
+            // Assert that the provider supports the code flow
+            if (metadata.getResponseTypes().stream().noneMatch(ResponseType::impliesCodeFlow)) {
+                throw new AuthorizationSetupException("OIDC provider at "+this.issuer.getValue()+" does not support code flow, disabling.");
+            }
+            return metadata;
+        } catch (IOException ex) {
+            logger.severe("OIDC provider metadata at \"+issuerEndpointURL+\" not retrievable: "+ex.getMessage());
+            throw new AuthorizationSetupException("OIDC provider metadata at "+this.issuer.getValue()+" not retrievable.");
+        } catch (ParseException ex) {
+            logger.severe("OIDC provider metadata at \"+issuerEndpointURL+\" not parsable: "+ex.getMessage());
+            throw new AuthorizationSetupException("OIDC provider metadata at "+this.issuer.getValue()+" not parsable.");
+        }
+    }
+    
+    /**
+     * Retrieve metadata from OIDC provider (moved here to be mock-/spyable)
+     * @param issuer The OIDC provider (basically a wrapped URL to endpoint)
+     * @return The OIDC provider metadata, if successfull
+     * @throws IOException when sth. goes wrong with the retrieval
+     * @throws ParseException when the metadata is not parsable
+     */
+    OIDCProviderMetadata getMetadata(Issuer issuer) throws IOException, ParseException {
+        // Will resolve the OpenID provider metadata automatically
+        OIDCProviderConfigurationRequest request = new OIDCProviderConfigurationRequest(issuer);
+    
+        // Make HTTP request
+        HTTPRequest httpRequest = request.toHTTPRequest();
+        HTTPResponse httpResponse = httpRequest.send();
+    
+        // Parse OpenID provider metadata
+        return OIDCProviderMetadata.parse(httpResponse.getContentAsJSONObject());
+    }
+    
+    /**
+     * TODO: remove when refactoring package and {@link AbstractOAuth2AuthenticationProvider}
+     */
+    @Override
+    public DefaultApi20 getApiInstance() {
+        throw new UnsupportedOperationException("OIDC provider cannot provide a ScribeJava API instance object");
+    }
+    
+    /**
+     * TODO: remove when refactoring package and {@link AbstractOAuth2AuthenticationProvider}
+     */
+    @Override
+    protected ParsedUserResponse parseUserResponse(String responseBody) {
+        throw new UnsupportedOperationException("OIDC provider uses the SDK to parse the response.");
+    }
+    
+    /**
+     * Create the authz URL for the OIDC provider
+     * @param state A randomized state, necessary to secure the authorization flow. @see OAuth2LoginBackingBean.createState()
+     * @param callbackUrl URL where the provider should send the browser after authn in code flow
+     * @return
+     */
+    @Override
+    public String buildAuthzUrl(String state, String callbackUrl) {
+        State stateObject = new State(state);
+        URI callback = URI.create(callbackUrl);
+        Nonce nonce = new Nonce();
+        CodeVerifier pkceVerifier = pkceEnabled ? new CodeVerifier() : null;
+        
+        AuthenticationRequest req = new AuthenticationRequest.Builder(new ResponseType("code"),
+                                                                      Scope.parse(this.scope),
+                                                                      this.clientAuth.getClientID(),
+                                                                      callback)
+            .endpointURI(idpMetadata.getAuthorizationEndpointURI())
+            .state(stateObject)
+            // Called method is nullsafe - will disable sending a PKCE challenge in case the verifier is not present
+            .codeChallenge(pkceVerifier, pkceMethod)
+            .nonce(nonce)
+            .build();
+        
+        // Cache the PKCE verifier, as we need the secret in it for verification later again, after the client sends us
+        // the auth code! We use the state to cache the verifier, as the state is unique per authentication event.
+        if (pkceVerifier != null) {
+            this.verifierCache.put(state, pkceVerifier);
+        }
+        
+        return req.toURI().toString();
+    }
+    
+    /**
+     * Receive user data from OIDC provider after authn/z has been successfull. (Callback view uses this)
+     * Request a token and access the resource, parse output and return user details.
+     * @param code The authz code sent from the provider
+     * @param redirectUrl The redirect URL (some providers require this when fetching the access token, e. g. Google)
+     * @return A user record containing all user details accessible for us
+     * @throws IOException Thrown when communication with the provider fails
+     * @throws OAuth2Exception Thrown when we cannot access the user details for some reason
+     * @throws InterruptedException Thrown when the requests thread is failing
+     * @throws ExecutionException Thrown when the requests thread is failing
+     */
+    @Override
+    public OAuth2UserRecord getUserRecord(String code, String state, String redirectUrl) throws IOException, OAuth2Exception {
+        // Retrieve the verifier from the cache and clear from the cache. If not found, will be null.
+        // Will be sent to token endpoint for verification, so if required but missing, will lead to exception.
+        CodeVerifier verifier = verifierCache.getIfPresent(state);
+        
+        // Create grant object - again, this is null-safe for the verifier
+        AuthorizationGrant codeGrant = new AuthorizationCodeGrant(
+            new AuthorizationCode(code), URI.create(redirectUrl), verifier);
+    
+        // Get Access Token first
+        Optional<BearerAccessToken> accessToken = getAccessToken(codeGrant);
+        
+        // Now retrieve User Info
+        if (accessToken.isPresent()) {
+            Optional<UserInfo> userInfo = getUserInfo(accessToken.get());
+            
+            // Construct our internal user representation
+            if (userInfo.isPresent()) {
+                return getUserRecord(userInfo.get());
+            }
+        }
+        
+        // this should never happen, as we are throwing exceptions like champs before.
+        throw new OAuth2Exception(-1, "", "auth.providers.token.failGetUser");
+    }
+    
+    /**
+     * Create the OAuth2UserRecord from the OIDC UserInfo.
+     * TODO: extend to retrieve and insert claims about affiliation and position.
+     * @param userInfo
+     * @return the usable user record for processing ing {@link edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2LoginBackingBean}
+     */
+    public OAuth2UserRecord getUserRecord(UserInfo userInfo) {
+        // Extract Shibboleth persistent identifier claim if present
+        Object shibUniqueIdObj = userInfo.getClaim(ShibUtil.uniquePersistentIdentifier);
+
+        // Extract idp claim if present
+        Object idpObj = userInfo.getClaim(OAuth2UserRecord.IDP_CLAIM_NAME);
+
+        // Extract OIDC user id claim if present
+        Object oidcUserIdObj = userInfo.getClaim(OAuth2UserRecord.OIDC_USER_ID_CLAIM_NAME);
+
+        String shibUniqueId = (shibUniqueIdObj != null) ? shibUniqueIdObj.toString() : null;
+        String idp = (idpObj != null) ? idpObj.toString() : null;
+        String oidcUserId = (oidcUserIdObj != null) ? oidcUserIdObj.toString() : null;
+
+        // Build display info from user attributes
+        AuthenticatedUserDisplayInfo displayInfo = new AuthenticatedUserDisplayInfo(
+                userInfo.getGivenName(),
+                userInfo.getFamilyName(),
+                userInfo.getEmailAddress(),
+                "",
+                ""
+        );
+
+        return new OAuth2UserRecord(
+                this.getId(),
+                userInfo.getSubject().getValue(),
+                userInfo.getPreferredUsername(),
+                shibUniqueId,
+                idp,
+                oidcUserId,
+                null,
+                displayInfo,
+                null
+        );
+    }
+
+    /**
+     * Retrieve the Access Token from provider. Encapsulate for testing.
+     * @param grant
+     * @return The bearer access token used in code (grant) flow. May be empty if SDK could not cast internally.
+     */
+    Optional<BearerAccessToken> getAccessToken(AuthorizationGrant grant) throws IOException, OAuth2Exception {
+        // Request token
+        HTTPResponse response = new TokenRequest(this.idpMetadata.getTokenEndpointURI(),
+                                                 this.clientAuth,
+                                                 grant,
+                                                 Scope.parse(this.scope))
+                                        .toHTTPRequest()
+                                        .send();
+        
+        // Parse response
+        try {
+            TokenResponse tokenRespone = OIDCTokenResponseParser.parse(response);
+    
+            // If error --> oauth2 ex
+            if (! tokenRespone.indicatesSuccess() ) {
+                ErrorObject error = tokenRespone.toErrorResponse().getErrorObject();
+                throw new OAuth2Exception(error.getHTTPStatusCode(), error.getDescription(), "auth.providers.token.failRetrieveToken");
+            }
+    
+            // Success --> return token
+            OIDCTokenResponse successResponse = (OIDCTokenResponse)tokenRespone.toSuccessResponse();
+            
+            return Optional.of(successResponse.getOIDCTokens().getBearerAccessToken());
+            
+        } catch (ParseException ex) {
+            throw new OAuth2Exception(-1, ex.getMessage(), "auth.providers.token.failParseToken");
+        }
+    }
+    
+    /**
+     * Retrieve User Info from provider. Encapsulate for testing.
+     * @param accessToken The access token to enable reading data from userinfo endpoint
+     */
+    public Optional<UserInfo> getUserInfo(BearerAccessToken accessToken) throws IOException, OAuth2Exception {
+        // Retrieve data
+        HTTPResponse response = new UserInfoRequest(this.idpMetadata.getUserInfoEndpointURI(), accessToken)
+                                        .toHTTPRequest()
+                                        .send();
+        
+        // Parse/Extract
+        try {
+            UserInfoResponse infoResponse = UserInfoResponse.parse(response);
+    
+            // If error --> oauth2 ex
+            if (! infoResponse.indicatesSuccess() ) {
+                ErrorObject error = infoResponse.toErrorResponse().getErrorObject();
+                throw new OAuth2Exception(error.getHTTPStatusCode(),
+                                          error.getDescription(),
+                                          BundleUtil.getStringFromBundle("auth.providers.exception.userinfo", Arrays.asList(this.getTitle())));
+            }
+            
+            // Success --> return info
+            return Optional.of(infoResponse.toSuccessResponse().getUserInfo());
+            
+        } catch (ParseException ex) {
+            throw new OAuth2Exception(-1, ex.getMessage(), BundleUtil.getStringFromBundle("auth.providers.exception.userinfo", Arrays.asList(this.getTitle())));
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactory.java
new file mode 100644
index 00000000000..3f8c18d0567
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactory.java
@@ -0,0 +1,76 @@
+package edu.harvard.iq.dataverse.authorization.providers.oauth2.oidc;
+
+import edu.harvard.iq.dataverse.authorization.AuthenticationProvider;
+import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationSetupException;
+import edu.harvard.iq.dataverse.authorization.providers.AuthenticationProviderFactory;
+import edu.harvard.iq.dataverse.authorization.providers.AuthenticationProviderRow;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2AuthenticationProviderFactory;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+
+import java.util.Map;
+
+public class OIDCAuthenticationProviderFactory implements AuthenticationProviderFactory {
+    
+    /**
+     * The alias of a factory. Has to be unique in the system.
+     * @return The alias of the factory.
+     */
+    @Override
+    public String getAlias() {
+        return "oidc";
+    }
+    
+    /**
+     * @return A human readable display string describing this factory.
+     */
+    @Override
+    public String getInfo() {
+        return "Factory for Open ID Connect providers";
+    }
+    
+    /**
+     * Instantiates an {@link AuthenticationProvider} based on the row passed.
+     * @param aRow The row on which the created provider is based.
+     * @return The provider
+     * @throws AuthorizationSetupException If {@code aRow} contains malformed data.
+     */
+    @Override
+    public AuthenticationProvider buildProvider( AuthenticationProviderRow aRow ) throws AuthorizationSetupException {
+        Map<String, String> factoryData = OAuth2AuthenticationProviderFactory.parseFactoryData(aRow.getFactoryData());
+        
+        OIDCAuthProvider oidc = new OIDCAuthProvider(
+            factoryData.get("clientId"),
+            factoryData.get("clientSecret"),
+            factoryData.get("issuer"),
+            Boolean.parseBoolean(factoryData.getOrDefault("pkceEnabled", "false")),
+            factoryData.getOrDefault("pkceMethod", "S256")
+        );
+        
+        oidc.setId(aRow.getId());
+        oidc.setTitle(aRow.getTitle());
+        oidc.setSubTitle(aRow.getSubtitle());
+        
+        return oidc;
+    }
+    
+    /**
+     * Build an OIDC provider from MicroProfile Config provisioned details
+     * @return The configured auth provider
+     * @throws AuthorizationSetupException
+     */
+    public static AuthenticationProvider buildFromSettings() throws AuthorizationSetupException {
+        OIDCAuthProvider oidc = new OIDCAuthProvider(
+            JvmSettings.OIDC_CLIENT_ID.lookup(),
+            JvmSettings.OIDC_CLIENT_SECRET.lookup(),
+            JvmSettings.OIDC_AUTH_SERVER_URL.lookup(),
+            JvmSettings.OIDC_PKCE_ENABLED.lookupOptional(Boolean.class).orElse(false),
+            JvmSettings.OIDC_PKCE_METHOD.lookupOptional().orElse("S256")
+        );
+        
+        oidc.setId("oidc-mpconfig");
+        oidc.setTitle(JvmSettings.OIDC_TITLE.lookupOptional().orElse("OpenID Connect"));
+        oidc.setSubTitle(JvmSettings.OIDC_SUBTITLE.lookupOptional().orElse("OpenID Connect"));
+        
+        return oidc;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibAuthenticationProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibAuthenticationProvider.java
index 85c076ebea7..0f6be352ed9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibAuthenticationProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibAuthenticationProvider.java
@@ -7,6 +7,11 @@
 public class ShibAuthenticationProvider implements AuthenticationProvider {
 
     public static final String PROVIDER_ID = "shib";
+    
+    @Override
+    public int getOrder() {
+        return 20;
+    }
 
     @Override
     public String getId() {
@@ -23,9 +28,8 @@ public boolean isOAuthProvider() {
         return false;
     }
 
-    @Override
-    public boolean isDisplayIdentifier() {
-        return false;
-    }
+    // We don't override "isEmailVerified" because we're using timestamps
+    // ("emailconfirmed" on the "authenticateduser" table) to know if
+    // Shib users have confirmed/verified their email or not.
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibServiceBean.java
index ca247d0c9c2..0921b2c6683 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibServiceBean.java
@@ -4,17 +4,11 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import edu.harvard.iq.dataverse.authorization.AuthTestDataServiceBean;
-import edu.harvard.iq.dataverse.authorization.AuthenticationRequest;
-import edu.harvard.iq.dataverse.authorization.AuthenticationResponse;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
-import edu.harvard.iq.dataverse.authorization.exceptions.AuthenticationFailedException;
-import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUser;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
-import edu.harvard.iq.dataverse.authorization.providers.builtin.PasswordEncryption;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,11 +19,11 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Named
 @Stateless
@@ -64,6 +58,8 @@ public enum DevShibAccountType {
         UID_WITH_LEADING_SPACE,
         IDENTIFIER_WITH_LEADING_SPACE,
         MISSING_REQUIRED_ATTR,
+        ONE_AFFILIATION,
+        TWO_AFFILIATIONS,
     };
 
     public DevShibAccountType getDevShibAccountType() {
@@ -146,6 +142,14 @@ public void possiblyMutateRequestInDev(HttpServletRequest request) {
                 ShibUtil.mutateRequestForDevConstantMissingRequiredAttributes(request);
                 break;
 
+            case ONE_AFFILIATION:
+                ShibUtil.mutateRequestForDevConstantOneAffiliation(request);
+                break;
+
+            case TWO_AFFILIATIONS:
+                ShibUtil.mutateRequestForDevConstantTwoAffiliations(request);
+                break;
+
             default:
                 logger.info("Should never reach here");
                 break;
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibUtil.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibUtil.java
index 8d34bed4f2f..a2081d44834 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibUtil.java
@@ -4,7 +4,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import edu.harvard.iq.dataverse.EMailValidator;
+import edu.harvard.iq.dataverse.validation.EMailValidator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -12,7 +12,7 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class ShibUtil {
 
@@ -133,7 +133,24 @@ public static String findSingleValue(String mayHaveMultipleValues) {
         return singleValue;
     }
 
+    /**
+     * @deprecated because of a typo; use {@link #generateFriendlyLookingUserIdentifier(String, String)} instead
+     * @see #generateFriendlyLookingUserIdentifier(String, String)
+     * @param usernameAssertion
+     * @param email
+     * @return a friendly-looking user identifier based on the asserted username or email, or a UUID as fallback
+     */
+    @Deprecated
     public static String generateFriendlyLookingUserIdentifer(String usernameAssertion, String email) {
+        return generateFriendlyLookingUserIdentifier(usernameAssertion, email);
+    }
+
+    /**
+     * @param usernameAssertion
+     * @param email
+     * @return a friendly-looking user identifier based on the asserted username or email, or a UUID as fallback
+     */
+    public static String generateFriendlyLookingUserIdentifier(String usernameAssertion, String email) {
         if (usernameAssertion != null && !usernameAssertion.isEmpty()) {
             return usernameAssertion;
         }
@@ -151,7 +168,7 @@ public static String generateFriendlyLookingUserIdentifer(String usernameAsserti
                     logger.fine(ex + " parsing " + email);
                 }
             } else {
-                boolean passedValidation = EMailValidator.isEmailValid(email, null);
+                boolean passedValidation = EMailValidator.isEmailValid(email);
                 logger.fine("Odd email address. No @ sign ('" + email + "'). Passed email validation: " + passedValidation);
             }
         } else {
@@ -261,6 +278,28 @@ static void mutateRequestForDevConstantMissingRequiredAttributes(HttpServletRequ
         request.setAttribute(ShibUtil.usernameAttribute, "missing");
     }
 
+    static void mutateRequestForDevConstantOneAffiliation(HttpServletRequest request) {
+        request.setAttribute(ShibUtil.shibIdpAttribute, "https://fake.example.com/idp/shibboleth");
+        request.setAttribute(ShibUtil.uniquePersistentIdentifier, "oneAffiliation");
+        request.setAttribute(ShibUtil.firstNameAttribute, "Lurneen");
+        request.setAttribute(ShibUtil.lastNameAttribute, "Lumpkin");
+        request.setAttribute(ShibUtil.emailAttribute, "oneAffiliaton@mailinator.com");
+        request.setAttribute(ShibUtil.usernameAttribute, "oneAffiliaton");
+        // Affiliation. "ou" is the suggested attribute in :ShibAffiliationAttribute.
+        request.setAttribute("ou", "Beer-N-Brawl");
+    }
+
+    static void mutateRequestForDevConstantTwoAffiliations(HttpServletRequest request) {
+        request.setAttribute(ShibUtil.shibIdpAttribute, "https://fake.example.com/idp/shibboleth");
+        request.setAttribute(ShibUtil.uniquePersistentIdentifier, "twoAffiliatons");
+        request.setAttribute(ShibUtil.firstNameAttribute, "Lenny");
+        request.setAttribute(ShibUtil.lastNameAttribute, "Leonard");
+        request.setAttribute(ShibUtil.emailAttribute, "twoAffiliatons@mailinator.com");
+        request.setAttribute(ShibUtil.usernameAttribute, "twoAffiliatons");
+        // Affiliation. "ou" is the suggested attribute in :ShibAffiliationAttribute.
+        request.setAttribute("ou", "SNPP;Stonecutters");
+    }
+
     public static Map<String, String> getRandomUserStatic() {
         Map<String, String> fakeUser = new HashMap<>();
         String shortRandomString = UUID.randomUUID().toString().substring(0, 8);
@@ -366,4 +405,23 @@ public static void printAttributes(HttpServletRequest request) {
         logger.fine("shib values: " + shibValues);
     }
 
+    /**
+     * Creates a persistent identifier for a user authenticated via a Shibboleth Identity Provider (IdP).
+     *
+     * <p>This method combines the IdP's entity ID and the user's unique identifier into a single string,
+     * using a pipe character ("|") as a separator. This is necessary because there is only one field
+     * available to store the full identifier.</p>
+     *
+     * <p>The pipe character is chosen because it's considered "unwise" to use in URLs, and the
+     * Shibboleth IdP entity ID often resembles a URL. Using this separator allows for future parsing,
+     * such as answering questions like "How many users logged in from Harvard's Identity Provider?"</p>
+     *
+     * @param shibIdp the entity ID of the Shibboleth Identity Provider
+     * @param shibUserIdentifier the unique persistent identifier for the user from the IdP
+     * @return a combined string containing both the IdP and user identifier, separated by a pipe
+     */
+    public static String createUserPersistentIdentifier(String shibIdp, String shibUserIdentifier) {
+        String persistentUserIdSeparator = "|";
+        return shibIdp + persistentUserIdSeparator + shibUserIdentifier;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/users/ApiToken.java b/src/main/java/edu/harvard/iq/dataverse/authorization/users/ApiToken.java
index 2cb4206b439..0de7d7754a1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/users/ApiToken.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/users/ApiToken.java
@@ -2,18 +2,18 @@
 
 import java.io.Serializable;
 import java.sql.Timestamp;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @NamedQueries({
@@ -92,5 +92,9 @@ public void setCreateTime(Timestamp createTime) {
     public void setExpireTime(Timestamp expireTime) {
         this.expireTime = expireTime;
     }
+
+    public boolean isExpired() {
+        return getExpireTime().before(new Timestamp(System.currentTimeMillis()));
+    }
     
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java b/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java
index 449ca56e89e..123155f06e0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java
@@ -1,34 +1,51 @@
 package edu.harvard.iq.dataverse.authorization.users;
 
 import edu.harvard.iq.dataverse.Cart;
+import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.DatasetLock;
-import edu.harvard.iq.dataverse.ValidateEmail;
+import edu.harvard.iq.dataverse.FileAccessRequest;
+import edu.harvard.iq.dataverse.UserNotification.Type;
+import edu.harvard.iq.dataverse.UserNotification;
+import edu.harvard.iq.dataverse.validation.ValidateEmail;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserLookup;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2TokenData;
 import edu.harvard.iq.dataverse.userdata.UserUtil;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
+import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProvider;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.json.JsonPrinter;
 import static edu.harvard.iq.dataverse.util.StringUtil.nonEmpty;
+
 import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Transient;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.NotBlank;
+import java.util.Set;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.PostLoad;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.Transient;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * When adding an attribute to this class, be sure to update the following:
@@ -53,7 +70,8 @@
     @NamedQuery( name="AuthenticatedUser.filter",
                 query="select au from AuthenticatedUser au WHERE ("
                         + "LOWER(au.userIdentifier) like LOWER(:query) OR "
-                        + "lower(concat(au.firstName,' ',au.lastName)) like lower(:query))"),
+                        + "lower(concat(au.firstName,' ',au.lastName)) like lower(:query) or "
+                        + "lower(au.email) like lower(:query))"),
     @NamedQuery( name="AuthenticatedUser.findAdminUser",
                 query="select au from AuthenticatedUser au WHERE "
                         + "au.superuser = true "
@@ -112,6 +130,44 @@ public class AuthenticatedUser implements User, Serializable {
     
     private boolean superuser;
 
+    @Column(nullable=false)
+    private boolean deactivated;
+
+    @Column(nullable=true)
+    private Timestamp deactivatedTime;
+
+    @Column(columnDefinition="TEXT", nullable=true)
+    private String mutedEmails;
+
+    @Column(columnDefinition="TEXT", nullable=true)
+    private String mutedNotifications;
+    
+    @Transient
+    private Set<Type> mutedEmailsSet = new HashSet<>();
+    
+    @Transient
+    private Set<Type> mutedNotificationsSet = new HashSet<>();
+
+    @Column(nullable=false)
+    @Min(value = 1, message = "Rate Limit Tier must be greater than 0.")
+    private int rateLimitTier = 1;
+
+    //The user's ORCID - only populated if user has authenticated to ORCID to assure they own it
+    @Column(nullable=true, length=45)
+    private String authenticatedOrcid;
+    
+    @PrePersist
+    void prePersist() {
+        mutedNotifications = Type.toStringValue(mutedNotificationsSet);
+        mutedEmails = Type.toStringValue(mutedEmailsSet);
+    }
+    
+    @PostLoad
+    public void initialize() {
+        mutedNotificationsSet = Type.tokenizeToSet(mutedNotifications);
+        mutedEmailsSet = Type.tokenizeToSet(mutedEmails);
+    }
+
     /**
      * @todo Consider storing a hash of *all* potentially interesting Shibboleth
      * attribute key/value pairs, not just the Identity Provider (IdP).
@@ -123,6 +179,29 @@ public class AuthenticatedUser implements User, Serializable {
     public String getIdentifier() {
         return IDENTIFIER_PREFIX + userIdentifier;
     }
+
+    @OneToMany(mappedBy = "user", cascade={CascadeType.REMOVE})
+    private List<UserNotification> notifications;
+
+    public List<UserNotification> getUserNotifications() {
+        return notifications;
+    }
+
+    public void setUserNotifications(List<UserNotification> notifications) {
+        this.notifications = notifications;
+    }
+    
+    @OneToMany(mappedBy = "requestor", cascade={CascadeType.REMOVE})
+    private List<UserNotification> requests;
+
+    public List<UserNotification> getUserRequests() {
+        return requests;
+    }
+
+    public void setUserRequestss(List<UserNotification> requests) {
+        this.requests = requests;
+    }
+
     
     @OneToMany(mappedBy = "user", cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     private List<DatasetLock> datasetLocks;
@@ -134,10 +213,36 @@ public List<DatasetLock> getDatasetLocks() {
     public void setDatasetLocks(List<DatasetLock> datasetLocks) {
         this.datasetLocks = datasetLocks;
     }
+
+    @OneToMany(mappedBy = "user", cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
+    private List<OAuth2TokenData> oAuth2TokenDatas;
+
+    /*for many to many fileAccessRequests*/
+    @OneToMany(mappedBy = "user", cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}, fetch = FetchType.LAZY)
+    private List<FileAccessRequest> fileAccessRequests;
+
+    public List<FileAccessRequest> getFileAccessRequests() {
+        return fileAccessRequests;
+    }
+
+    public void setFileAccessRequests(List<FileAccessRequest> fARs) {
+        this.fileAccessRequests = fARs;
+    }
+
+    public List<DataFile> getRequestedDataFiles(){
+        List<DataFile> requestedDataFiles = new ArrayList<>();
+
+        for(FileAccessRequest far : getFileAccessRequests()){
+            if(far.isStateCreated()) {
+                requestedDataFiles.add(far.getDataFile());
+            }
+        }
+        return requestedDataFiles;
+    }
     
     @Override
     public AuthenticatedUserDisplayInfo getDisplayInfo() {
-        return new AuthenticatedUserDisplayInfo(firstName, lastName, email, affiliation, position);
+        return new AuthenticatedUserDisplayInfo(firstName, lastName, email, affiliation, position, authenticatedOrcid);
     }
     
     /**
@@ -156,8 +261,18 @@ public void applyDisplayInfo( AuthenticatedUserDisplayInfo inf ) {
         if ( nonEmpty(inf.getPosition()) ) {
             setPosition( inf.getPosition());
         }
+        if ( nonEmpty(inf.getOrcid()) ) {
+            setAuthenticatedOrcid(inf.getOrcid());
+        }
     }
 
+    // For Shib users, set "email confirmed" timestamp on login.
+    public void updateEmailConfirmedToNow() {
+        if (ShibAuthenticationProvider.PROVIDER_ID.equals(this.getAuthenticatedUserLookup().getAuthenticationProviderId())) {
+            Timestamp emailConfirmedNow = new Timestamp(new Date().getTime());
+            this.setEmailConfirmed(emailConfirmedNow);
+        }
+    }
 
     //For User List Admin dashboard
     @Transient
@@ -278,6 +393,30 @@ public void setSuperuser(boolean superuser) {
         this.superuser = superuser;
     }
 
+    @Override
+    public boolean isDeactivated() {
+        return deactivated;
+    }
+
+    public void setDeactivated(boolean deactivated) {
+        this.deactivated = deactivated;
+    }
+
+    public Timestamp getDeactivatedTime() {
+        return deactivatedTime;
+    }
+
+    public void setDeactivatedTime(Timestamp deactivatedTime) {
+        this.deactivatedTime = deactivatedTime;
+    }
+
+    public int getRateLimitTier() {
+        return rateLimitTier;
+    }
+    public void setRateLimitTier(int rateLimitTier) {
+        this.rateLimitTier = rateLimitTier;
+    }
+
     @OneToOne(mappedBy = "authenticatedUser")
     private AuthenticatedUserLookup authenticatedUserLookup;
 
@@ -316,7 +455,6 @@ public void setShibIdentityProvider(String shibIdentityProvider) {
     
     public JsonObjectBuilder toJson() {
         //JsonObjectBuilder authenicatedUserJson = Json.createObjectBuilder();
-        
         NullSafeJsonBuilder authenicatedUserJson = NullSafeJsonBuilder.jsonObjectBuilder();
          
         authenicatedUserJson.add("id", this.id);
@@ -335,6 +473,11 @@ public JsonObjectBuilder toJson() {
         authenicatedUserJson.add("lastLoginTime", UserUtil.getTimestampStringOrNull(this.lastLoginTime));
         authenicatedUserJson.add("lastApiUseTime", UserUtil.getTimestampStringOrNull(this.lastApiUseTime));
 
+        authenicatedUserJson.add("deactivated", this.deactivated);
+        authenicatedUserJson.add("deactivatedTime", UserUtil.getTimestampStringOrNull(this.deactivatedTime));
+        authenicatedUserJson.add("mutedEmails", JsonPrinter.enumsToJson(this.mutedEmailsSet));
+        authenicatedUserJson.add("mutedNotifications", JsonPrinter.enumsToJson(this.mutedNotificationsSet));
+
         return authenicatedUserJson;
     }
     
@@ -418,14 +561,6 @@ public Timestamp getLastApiUseTime(){
         
         return this.lastApiUseTime;
     }
-
-    public String getOrcidId() {
-        String authProviderId = getAuthenticatedUserLookup().getAuthenticationProviderId();
-        if (OrcidOAuth2AP.PROVIDER_ID_PRODUCTION.equals(authProviderId)) {
-            return getAuthenticatedUserLookup().getPersistentUserId();
-        }
-        return null;
-    }
     
     public Cart getCart() {
         if (cart == null){
@@ -437,4 +572,44 @@ public Cart getCart() {
     public void setCart(Cart cart) {
         this.cart = cart;
     }
+
+    public Set<Type> getMutedEmails() {
+        return mutedEmailsSet;
+    }
+
+    public void setMutedEmails(Set<Type> mutedEmails) {
+        this.mutedEmailsSet = mutedEmails;
+        this.mutedEmails = Type.toStringValue(mutedEmails);
+    }
+
+    public Set<Type> getMutedNotifications() {
+        return mutedNotificationsSet;
+    }
+
+    public void setMutedNotifications(Set<Type> mutedNotifications) {
+        this.mutedNotificationsSet = mutedNotifications;
+        this.mutedNotifications = Type.toStringValue(mutedNotifications);
+    }
+    
+    public boolean hasEmailMuted(Type type) {
+        if (this.mutedEmailsSet == null || type == null) {
+            return false;
+        }
+        return this.mutedEmailsSet.contains(type);
+    }
+    
+    public boolean hasNotificationMuted(Type type) {
+        if (this.mutedNotificationsSet == null || type == null) {
+            return false;
+        }
+        return this.mutedNotificationsSet.contains(type);
+    }
+
+    public String getAuthenticatedOrcid() {
+        return authenticatedOrcid;
+    }
+
+    public void setAuthenticatedOrcid(String orcid) {
+        this.authenticatedOrcid = orcid;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/users/GuestUser.java b/src/main/java/edu/harvard/iq/dataverse/authorization/users/GuestUser.java
index f16fa5afe36..16de1b2eaff 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/users/GuestUser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/users/GuestUser.java
@@ -32,7 +32,7 @@ public RoleAssigneeDisplayInfo getDisplayInfo() {
     public boolean isSuperuser() {
         return false;
     }
-   
+
     @Override
     public boolean equals( Object o ) {
         return (o instanceof GuestUser);
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/users/PrivateUrlUser.java b/src/main/java/edu/harvard/iq/dataverse/authorization/users/PrivateUrlUser.java
index 59c3240fdfa..03f018221fd 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/users/PrivateUrlUser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/users/PrivateUrlUser.java
@@ -12,7 +12,7 @@
  */
 public class PrivateUrlUser implements User {
 
-    public static final String PREFIX = "#";
+    public static final String PREFIX = "!";
 
     /**
      * In the future, this could probably be dvObjectId rather than datasetId,
@@ -20,15 +20,25 @@ public class PrivateUrlUser implements User {
      * is a DvObject.
      */
     private final long datasetId;
+    private final boolean anonymizedAccess; 
 
     public PrivateUrlUser(long datasetId) {
+        this(datasetId, false);
+    }
+    
+    public PrivateUrlUser(long datasetId, boolean anonymizedAccess) {
         this.datasetId = datasetId;
+        this.anonymizedAccess = anonymizedAccess;
     }
 
     public long getDatasetId() {
         return datasetId;
     }
 
+    public boolean hasAnonymizedAccess() {
+        return anonymizedAccess;
+    }
+    
     /**
      * By always returning false for isAuthenticated(), we prevent a
      * name from appearing in the corner as well as preventing an account page
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/users/User.java b/src/main/java/edu/harvard/iq/dataverse/authorization/users/User.java
index ea35f87d178..4655c9c9f0d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/users/User.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/users/User.java
@@ -14,4 +14,8 @@ public interface User extends RoleAssignee, Serializable {
 
     public boolean isSuperuser();
 
+    default boolean isDeactivated() {
+        return false;
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/batch/entities/JobExecutionEntity.java b/src/main/java/edu/harvard/iq/dataverse/batch/entities/JobExecutionEntity.java
index be2167fa4d5..debece131d3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/batch/entities/JobExecutionEntity.java
+++ b/src/main/java/edu/harvard/iq/dataverse/batch/entities/JobExecutionEntity.java
@@ -1,10 +1,10 @@
 package edu.harvard.iq.dataverse.batch.entities;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.BatchStatus;
-import javax.batch.runtime.JobExecution;
-import javax.batch.runtime.StepExecution;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.BatchStatus;
+import jakarta.batch.runtime.JobExecution;
+import jakarta.batch.runtime.StepExecution;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/edu/harvard/iq/dataverse/batch/entities/StepExecutionEntity.java b/src/main/java/edu/harvard/iq/dataverse/batch/entities/StepExecutionEntity.java
index 65ed3f32e1b..ba20386ed07 100644
--- a/src/main/java/edu/harvard/iq/dataverse/batch/entities/StepExecutionEntity.java
+++ b/src/main/java/edu/harvard/iq/dataverse/batch/entities/StepExecutionEntity.java
@@ -1,8 +1,8 @@
 package edu.harvard.iq.dataverse.batch.entities;
 
-import javax.batch.runtime.BatchStatus;
-import javax.batch.runtime.Metric;
-import javax.batch.runtime.StepExecution;
+import jakarta.batch.runtime.BatchStatus;
+import jakarta.batch.runtime.Metric;
+import jakarta.batch.runtime.StepExecution;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordJobListener.java b/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordJobListener.java
index 4a6f48f1600..a2f76150d7b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordJobListener.java
+++ b/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordJobListener.java
@@ -40,25 +40,27 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 
-import javax.batch.api.BatchProperty;
-import javax.batch.api.chunk.listener.ItemReadListener;
-import javax.batch.api.listener.JobListener;
-import javax.batch.api.listener.StepListener;
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.BatchStatus;
-import javax.batch.runtime.JobExecution;
-import javax.batch.runtime.StepExecution;
-import javax.batch.runtime.context.JobContext;
-import javax.batch.runtime.context.StepContext;
-import javax.ejb.EJB;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.batch.api.BatchProperty;
+import jakarta.batch.api.chunk.listener.ItemReadListener;
+import jakarta.batch.api.listener.JobListener;
+import jakarta.batch.api.listener.StepListener;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.BatchStatus;
+import jakarta.batch.runtime.JobExecution;
+import jakarta.batch.runtime.StepExecution;
+import jakarta.batch.runtime.context.JobContext;
+import jakarta.batch.runtime.context.StepContext;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import org.apache.commons.io.IOUtils;
 
+import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.sql.Timestamp;
@@ -72,14 +74,14 @@
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.batch.operations.JobSecurityException;
-import javax.batch.operations.NoSuchJobExecutionException;
+import jakarta.batch.operations.JobSecurityException;
+import jakarta.batch.operations.NoSuchJobExecutionException;
 
 @Named
 @Dependent
 public class FileRecordJobListener implements ItemReadListener, StepListener, JobListener {
     
-    public static final String SEP = System.getProperty("file.separator");
+    public static final String SEP = File.separator;
     
     private static final UserNotification.Type notifyType = UserNotification.Type.FILESYSTEMIMPORT;
     
@@ -190,7 +192,7 @@ public void beforeJob() throws Exception {
             // if mode = REPLACE, remove all filemetadata from the dataset version and start fresh
             if (mode.equalsIgnoreCase(ImportMode.REPLACE.name())) {
                 try {
-                    DatasetVersion workingVersion = dataset.getEditVersion();
+                    DatasetVersion workingVersion = dataset.getOrCreateEditVersion();
                     List<FileMetadata> fileMetadataList = workingVersion.getFileMetadatas();
                     jobLogger.log(Level.INFO, "Removing any existing file metadata since mode = REPLACE");
                     for (FileMetadata fmd : fileMetadataList) {
@@ -433,12 +435,24 @@ private void loadChecksumManifest() {
             manifest = checksumManifest;
             getJobLogger().log(Level.INFO, "Checksum manifest = " + manifest + " (FileSystemImportJob.xml property)");
         }
-        // construct full path
-        String manifestAbsolutePath = System.getProperty("dataverse.files.directory")
+        
+        // Construct full path - retrieve base dir via MPCONFIG.
+        // (Has sane default /tmp/dataverse from META-INF/microprofile-config.properties)
+        String manifestAbsolutePath = JvmSettings.FILES_DIRECTORY.lookup()
                 + SEP + dataset.getAuthority()
                 + SEP + dataset.getIdentifier()
                 + SEP + uploadFolder
                 + SEP + manifest;
+        // TODO: 
+        // The above goes directly to the filesystem directory configured by the 
+        // old "dataverse.files.directory" JVM option (otherwise used for temp
+        // files only, after the Multistore implementation (#6488). 
+        // We probably want package files to be able to use specific stores instead.
+        // More importantly perhaps, the approach above does not take into account
+        // if the dataset may have an AlternativePersistentIdentifier, that may be 
+        // designated isStorageLocationDesignator() - i.e., if a different identifier
+        // needs to be used to name the storage directory, instead of the main/current
+        // persistent identifier above. 
         getJobLogger().log(Level.INFO, "Reading checksum manifest: " + manifestAbsolutePath);
         Scanner scanner = null;
         try {
diff --git a/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordProcessor.java b/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordProcessor.java
index af7caf32a7c..e5db80b9aa6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordProcessor.java
+++ b/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordProcessor.java
@@ -25,15 +25,15 @@
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DatasetVersion;
 
-import javax.annotation.PostConstruct;
-import javax.batch.api.chunk.ItemProcessor;
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.context.JobContext;
-import javax.ejb.EJB;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.batch.api.chunk.ItemProcessor;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.context.JobContext;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.io.File;
 import java.util.Properties;
 import java.util.logging.Level;
diff --git a/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordReader.java b/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordReader.java
index 023b0876be4..9ce30683a87 100644
--- a/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordReader.java
@@ -24,20 +24,21 @@
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.batch.jobs.importer.ImportMode;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import org.apache.commons.io.filefilter.NotFileFilter;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 
-import javax.annotation.PostConstruct;
-import javax.batch.api.BatchProperty;
-import javax.batch.api.chunk.AbstractItemReader;
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.context.JobContext;
-import javax.batch.runtime.context.StepContext;
-import javax.ejb.EJB;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.batch.api.BatchProperty;
+import jakarta.batch.api.chunk.AbstractItemReader;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.context.JobContext;
+import jakarta.batch.runtime.context.StepContext;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.Serializable;
@@ -54,7 +55,7 @@
 @Dependent
 public class FileRecordReader extends AbstractItemReader {
     
-    public static final String SEP = System.getProperty("file.separator");
+    public static final String SEP = File.separator;
 
     @Inject
     JobContext jobContext;
@@ -96,9 +97,21 @@ public void init() {
 
     @Override
     public void open(Serializable checkpoint) throws Exception {
- 
-        directory = new File(System.getProperty("dataverse.files.directory")
-                + SEP + dataset.getAuthority() + SEP + dataset.getIdentifier() + SEP + uploadFolder);
+    
+        // Retrieve via MPCONFIG. Has sane default /tmp/dataverse from META-INF/microprofile-config.properties
+        String baseDir = JvmSettings.FILES_DIRECTORY.lookup();
+        
+        directory = new File(baseDir + SEP + dataset.getAuthority() + SEP + dataset.getIdentifier() + SEP + uploadFolder);
+        // TODO: 
+        // The above goes directly to the filesystem directory configured by the 
+        // old "dataverse.files.directory" JVM option (otherwise used for temp
+        // files only, after the Multistore implementation (#6488). 
+        // We probably want package files to be able to use specific stores instead.
+        // More importantly perhaps, the approach above does not take into account
+        // if the dataset may have an AlternativePersistentIdentifier, that may be 
+        // designated isStorageLocationDesignator() - i.e., if a different identifier
+        // needs to be used to name the storage directory, instead of the main/current
+        // persistent identifier above. 
         getJobLogger().log(Level.INFO, "Reading dataset directory: " + directory.getAbsolutePath() 
                 + " (excluding: " + excludes + ")");
         if (isValidDirectory(directory)) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordWriter.java b/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordWriter.java
index c82a5bb01eb..af1e9c6a294 100644
--- a/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordWriter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/batch/jobs/importer/filesystem/FileRecordWriter.java
@@ -33,20 +33,21 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.FileUtil;
 
-import javax.annotation.PostConstruct;
-import javax.batch.api.BatchProperty;
-import javax.batch.api.chunk.AbstractItemWriter;
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.context.JobContext;
-import javax.batch.runtime.context.StepContext;
-import javax.ejb.EJB;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.batch.api.BatchProperty;
+import jakarta.batch.api.chunk.AbstractItemWriter;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.context.JobContext;
+import jakarta.batch.runtime.context.StepContext;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.io.File;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -57,8 +58,7 @@
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Named
 @Dependent
@@ -358,34 +358,24 @@ private DataFile createPackageDataFile(List<File> files) {
         dataset.getLatestVersion().getFileMetadatas().add(fmd);
         fmd.setDatasetVersion(dataset.getLatestVersion());
         
-	String isFilePIDsEnabled = commandEngine.getContext().settings().getValueForKey(SettingsServiceBean.Key.FilePIDsEnabled, "true"); //default value for file PIDs is 'true'
-	if ("true".contentEquals( isFilePIDsEnabled )) {
-	
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(packageFile.getProtocol(), commandEngine.getContext());
+    if (commandEngine.getContext().systemConfig().isFilePIDsEnabledForCollection(dataset.getOwner())) {
+
+        PidProvider pidProvider = commandEngine.getContext().dvObjects().getEffectivePidGenerator(dataset);
         if (packageFile.getIdentifier() == null || packageFile.getIdentifier().isEmpty()) {
-            packageFile.setIdentifier(dataFileServiceBean.generateDataFileIdentifier(packageFile, idServiceBean));
-        }
-        String nonNullDefaultIfKeyNotFound = "";
-        String protocol = commandEngine.getContext().settings().getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound);
-        String authority = commandEngine.getContext().settings().getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound);
-        if (packageFile.getProtocol() == null) {
-            packageFile.setProtocol(protocol);
-        }
-        if (packageFile.getAuthority() == null) {
-            packageFile.setAuthority(authority);
+            pidProvider.generatePid(packageFile);
         }
 
         if (!packageFile.isIdentifierRegistered()) {
             String doiRetString = "";
-            idServiceBean = GlobalIdServiceBean.getBean(commandEngine.getContext());
+
             try {
-                doiRetString = idServiceBean.createIdentifier(packageFile);
+                doiRetString = pidProvider.createIdentifier(packageFile);
             } catch (Throwable e) {
                 
             }
 
             // Check return value to make sure registration succeeded
-            if (!idServiceBean.registerWhenPublished() && doiRetString.contains(packageFile.getIdentifier())) {
+            if (!pidProvider.registerWhenPublished() && doiRetString.contains(packageFile.getIdentifier())) {
                 packageFile.setIdentifierRegistered(true);
                 packageFile.setGlobalIdCreateTime(new Date());
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/batch/util/LoggingUtil.java b/src/main/java/edu/harvard/iq/dataverse/batch/util/LoggingUtil.java
index 4a778dc7abb..19d1112ba54 100644
--- a/src/main/java/edu/harvard/iq/dataverse/batch/util/LoggingUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/batch/util/LoggingUtil.java
@@ -25,7 +25,7 @@
 import edu.harvard.iq.dataverse.engine.command.Command;
 import org.apache.commons.io.FileUtils;
 
-import javax.batch.runtime.JobExecution;
+import jakarta.batch.runtime.JobExecution;
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -154,8 +154,8 @@ public static Logger getJobLogger(String jobId) {
 	    try {
 		    Logger jobLogger = Logger.getLogger("job-"+jobId);
 		    FileHandler fh;
-		    String logDir = System.getProperty("com.sun.aas.instanceRoot") + System.getProperty("file.separator") 
-			    + "logs" + System.getProperty("file.separator") + "batch-jobs" + System.getProperty("file.separator");
+		    String logDir = System.getProperty("com.sun.aas.instanceRoot") + File.separator
+			    + "logs" + File.separator + "batch-jobs" + File.separator;
 		    checkCreateLogDirectory( logDir );
 		    fh = new FileHandler(logDir + "job-" + jobId + ".log");
 		    logger.log(Level.INFO, "JOB LOG: " + logDir + "job-" + jobId + ".log");
diff --git a/src/main/java/edu/harvard/iq/dataverse/branding/BrandingUtil.java b/src/main/java/edu/harvard/iq/dataverse/branding/BrandingUtil.java
index ea83fc15ebc..c230229abf9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/branding/BrandingUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/branding/BrandingUtil.java
@@ -1,22 +1,43 @@
 package edu.harvard.iq.dataverse.branding;
 
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.util.Arrays;
-import javax.mail.internet.InternetAddress;
+import java.util.logging.Logger;
+
+import jakarta.mail.internet.InternetAddress;
 
 public class BrandingUtil {
 
-    public static String getInstallationBrandName(String rootDataverseName) {
-        return rootDataverseName;
+    private static final Logger logger = Logger.getLogger(BrandingUtil.class.getCanonicalName());
+    
+    private static DataverseServiceBean dataverseService;
+    private static SettingsServiceBean settingsService;
+
+    public static String getInstallationBrandName() {
+        String brandName = settingsService.getValueForKey(SettingsServiceBean.Key.InstallationName);
+        // Separate if statement simplifies test setup, otherwise could use the getValueForKey method with a default param
+        if (brandName == null) {
+            brandName = dataverseService.getRootDataverseName();
+        }
+        return brandName;
+    }
+
+    // Convenience to access root name without injecting dataverseService (e.g. in
+    // DatasetVersion)
+    public static String getRootDataverseCollectionName() {
+        return dataverseService.getRootDataverseName();
     }
 
-    public static String getSupportTeamName(InternetAddress systemAddress, String rootDataverseName) {
+    public static String getSupportTeamName(InternetAddress systemAddress) {
         if (systemAddress != null) {
             String personalName = systemAddress.getPersonal();
             if (personalName != null) {
                 return personalName;
             }
         }
+        String rootDataverseName = dataverseService.getRootDataverseName();
         if (rootDataverseName != null && !rootDataverseName.isEmpty()) {
             return rootDataverseName + " " + BundleUtil.getStringFromBundle("contact.support");
         }
@@ -31,8 +52,12 @@ public static String getSupportTeamEmailAddress(InternetAddress systemAddress) {
         return systemAddress.getAddress();
     }
 
-    public static String getContactHeader(InternetAddress systemAddress, String rootDataverseName) {
-        return BundleUtil.getStringFromBundle("contact.header", Arrays.asList(getSupportTeamName(systemAddress, rootDataverseName)));
+    public static String getContactHeader(InternetAddress systemAddress) {
+        return BundleUtil.getStringFromBundle("contact.header", Arrays.asList(getSupportTeamName(systemAddress)));
     }
 
+    public static void injectServices(DataverseServiceBean dataverseSvc, SettingsServiceBean settingsSvc) {
+        dataverseService = dataverseSvc;
+        settingsService = settingsSvc;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/branding/BrandingUtilHelper.java b/src/main/java/edu/harvard/iq/dataverse/branding/BrandingUtilHelper.java
new file mode 100644
index 00000000000..7729ab4763e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/branding/BrandingUtilHelper.java
@@ -0,0 +1,28 @@
+package edu.harvard.iq.dataverse.branding;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
+    /**
+     * This is a small helper bean 
+     * As it is a singleton and built at application start (=deployment), it will inject the (stateless)
+     * dataverse service into the BrandingUtil once it's ready.
+     */
+    @Singleton
+    @Startup
+    public class BrandingUtilHelper {
+
+        @EJB
+        DataverseServiceBean dataverseSvc;
+        @EJB SettingsServiceBean settingsSvc;
+        
+        @PostConstruct
+        public void injectService() {
+            BrandingUtil.injectServices(dataverseSvc, settingsSvc);
+        }
+    }
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailData.java b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailData.java
index c05750c13e6..0ad9ab59f4b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailData.java
+++ b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailData.java
@@ -5,17 +5,17 @@
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.UUID;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailPage.java b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailPage.java
index 45a04ba4185..b76e3db1379 100644
--- a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailPage.java
@@ -5,11 +5,12 @@
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
+import java.util.Arrays;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 /**
  *
@@ -49,18 +50,27 @@ public class ConfirmEmailPage implements java.io.Serializable {
     ConfirmEmailData confirmEmailData;
 
     public String init() {
+        String failureDetails = "";
         if (token != null) {
-            ConfirmEmailExecResponse confirmEmailExecResponse = confirmEmailService.processToken(token);
-            confirmEmailData = confirmEmailExecResponse.getConfirmEmailData();
-            if (confirmEmailData != null) {
-                user = confirmEmailData.getAuthenticatedUser();
-                session.setUser(user);
-                session.configureSessionTimeout(); // TODO: is this needed here? (it can't hurt, but still)
-                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("confirmEmail.details.success"));
-                return "/dataverse.xhtml?faces-redirect=true";
+            ConfirmEmailExecResponse confirmEmailExecResponse = null;
+            try {
+                confirmEmailExecResponse = confirmEmailService.processToken(token);
+                confirmEmailData = confirmEmailExecResponse.getConfirmEmailData();
+                if (confirmEmailData != null) {
+                    user = confirmEmailData.getAuthenticatedUser();
+                    session.setUser(user);
+                    JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("confirmEmail.details.success"));
+                    return "/dataverse.xhtml?faces-redirect=true";
+                } else {
+                    failureDetails = BundleUtil.getStringFromBundle("confirmEmail.details.failure.noConfirmEmailDataFromToken");
+                }
+            } catch (Exception ex) {
+                failureDetails = ex.getLocalizedMessage();
             }
+        } else {
+            failureDetails = BundleUtil.getStringFromBundle("confirmEmail.details.failure.noToken");
         }
-        JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("confirmEmail.details.failure"));
+        JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("confirmEmail.details.failure", Arrays.asList(failureDetails)));
         /**
          * @todo It would be nice to send a 404 response but if we enable this
          * then the user sees the contents of 404.xhtml rather than the contents
diff --git a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java
index b45bc6190ca..a54fd6bb0c1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.confirmemail;
 
-import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
@@ -16,13 +15,13 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
@@ -34,7 +33,7 @@ public class ConfirmEmailServiceBean {
     private static final Logger logger = Logger.getLogger(ConfirmEmailServiceBean.class.getCanonicalName());
 
     @EJB
-    AuthenticationServiceBean dataverseUserService;
+    AuthenticationServiceBean authenticationService;
 
     @EJB
     MailServiceBean mailService;
@@ -46,6 +45,27 @@ public class ConfirmEmailServiceBean {
 
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
+    
+    /**
+     * A simple interface to check if a user email has been verified or not.
+     * @param user
+     * @return true if verified, false otherwise
+     */
+    public boolean hasVerifiedEmail(AuthenticatedUser user) {
+        // Look up the user again in case the "verify email" link was clicked in another browser.
+        user = authenticationService.findByID(user.getId());
+        boolean hasTimestamp = user.getEmailConfirmed() != null;
+        boolean isVerifiedByAuthProvider = authenticationService.lookupProvider(user).isEmailVerified();
+        // Note: In practice, we are relying on hasTimestamp to know if an email
+        // has been confirmed/verified or not. We have switched the Shib code to automatically
+        // overwrite the "confirm email" timestamp on login. So hasTimeStamp will be enough.
+        // If we ever want to get away from using "confirmed email" timestamps for Shib users
+        // we can make use of the isVerifiedByAuthProvider boolean. Currently,
+        // isVerifiedByAuthProvider is set to false in the super class and nothing
+        // is overridden in the shib auth provider (or any auth provider) but we could override
+        // isVerifiedByAuthProvider in the Shib auth provider and have it return true.
+        return hasTimestamp || isVerifiedByAuthProvider;
+    }
 
     /**
      * Initiate the email confirmation process.
@@ -108,20 +128,19 @@ private void sendLinkOnEmailChange(AuthenticatedUser aUser, String confirmationU
 
         try {
             String toAddress = aUser.getEmail();
-            try {
-                Dataverse rootDataverse = dataverseService.findRootDataverse();
-                if (rootDataverse != null) {
-                    String rootDataverseName = rootDataverse.getName();
-                    // FIXME: consider refactoring this into MailServiceBean.sendNotificationEmail. CONFIRMEMAIL may be the only type where we don't want an in-app notification.
-                    UserNotification userNotification = new UserNotification();
-                    userNotification.setType(UserNotification.Type.CONFIRMEMAIL);
-                    String subject = MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null);
-                    logger.fine("sending email to " + toAddress + " with this subject: " + subject);
-                    mailService.sendSystemEmail(toAddress, subject, messageBody);
-                }
-            } catch (Exception e) {
-                logger.info("The root dataverse is not present. Don't send a notification to dataverseAdmin.");
+
+            // FIXME: consider refactoring this into MailServiceBean.sendNotificationEmail.
+            // CONFIRMEMAIL may be the only type where we don't want an in-app notification.
+            UserNotification userNotification = new UserNotification();
+            userNotification.setType(UserNotification.Type.CONFIRMEMAIL);
+            String subject = MailUtil.getSubjectTextBasedOnNotification(userNotification, null);
+            logger.fine("sending email to " + toAddress + " with this subject: " + subject);
+            if (ShibAuthenticationProvider.PROVIDER_ID.equals(aUser.getAuthenticatedUserLookup().getAuthenticationProviderId())) {
+                // Shib users have "emailconfirmed" timestamp set on login.
+                logger.info("Returning early to prevent an email confirmation link from being sent to Shib user " + aUser.getUserIdentifier() + ".");
+                return;
             }
+            mailService.sendSystemEmail(toAddress, subject, messageBody);
         } catch (Exception ex) {
             /**
              * @todo get more specific about the exception that's thrown when
@@ -134,51 +153,59 @@ private void sendLinkOnEmailChange(AuthenticatedUser aUser, String confirmationU
     }
 
     /**
-     * Process the email confirmation token, allowing the user to confirm the
-     * email address or report on a invalid token.
+     * Process the email confirmation token. If all looks good, set the
+     * timestamp and delete the token/confirmEmailData.
      *
      * @param tokenQueried
+     * @return ConfirmEmailExecResponse
+     * @throws Exception with details of the problem we can show the user.
      */
-    public ConfirmEmailExecResponse processToken(String tokenQueried) {
+    public ConfirmEmailExecResponse processToken(String tokenQueried) throws Exception {
         deleteAllExpiredTokens();
-        ConfirmEmailExecResponse tokenUnusable = new ConfirmEmailExecResponse(tokenQueried, null);
-        ConfirmEmailData confirmEmailData = findSingleConfirmEmailDataByToken(tokenQueried);
-        if (confirmEmailData != null) {
-            if (confirmEmailData.isExpired()) {
-                // shouldn't reach here since tokens are being expired above
-                return tokenUnusable;
-            } else {
-                ConfirmEmailExecResponse goodTokenCanProceed = new ConfirmEmailExecResponse(tokenQueried, confirmEmailData);
-                if (confirmEmailData == null) {
-                    logger.fine("Invalid token.");
-                    return null;
-                }
-                long nowInMilliseconds = new Date().getTime();
-                Timestamp emailConfirmed = new Timestamp(nowInMilliseconds);
-                AuthenticatedUser authenticatedUser = confirmEmailData.getAuthenticatedUser();
-                authenticatedUser.setEmailConfirmed(emailConfirmed);
-                em.remove(confirmEmailData);
-                return goodTokenCanProceed;
-            }
-        } else {
-            return tokenUnusable;
+        ConfirmEmailData confirmEmailData;
+        try {
+            confirmEmailData = findSingleConfirmEmailDataByToken(tokenQueried);
+        } catch (ConfirmEmailException ex) {
+            logger.info("processToken: could not find single ConfirmEmailData row using token " + tokenQueried);
+            throw new Exception(BundleUtil.getStringFromBundle("confirmEmail.details.failure.invalidToken"));
         }
+        if (confirmEmailData == null) {
+            // shouldn't reach here because "invalid token" exception should have already been thrown.
+            logger.info("processToken: ConfirmEmailData is null using token " + tokenQueried);
+            throw new Exception(BundleUtil.getStringFromBundle("confirmEmail.details.failure.lookupFailed"));
+        }
+        if (confirmEmailData.isExpired()) {
+            // shouldn't reach here since tokens are being expired above
+            logger.info("processToken: Token is expired: " + tokenQueried);
+            throw new Exception(BundleUtil.getStringFromBundle("confirmEmail.details.failure.tokenExpired"));
+        }
+        // No need for null check because confirmEmailData always has a user (a foreign key).
+        AuthenticatedUser authenticatedUser = confirmEmailData.getAuthenticatedUser();
+        if (authenticatedUser.isDeactivated()) {
+            logger.info("processToken: User is deactivated. Token was " + tokenQueried);
+            throw new Exception(BundleUtil.getStringFromBundle("confirmEmail.details.failure.userDeactivated"));
+        }
+        ConfirmEmailExecResponse response = new ConfirmEmailExecResponse(tokenQueried, confirmEmailData);
+        long nowInMilliseconds = new Date().getTime();
+        Timestamp emailConfirmed = new Timestamp(nowInMilliseconds);
+        authenticatedUser.setEmailConfirmed(emailConfirmed);
+        em.remove(confirmEmailData);
+        return response;
     }
 
     /**
      * @param token
      * @return Null or a single row of email confirmation data.
      */
-    private ConfirmEmailData findSingleConfirmEmailDataByToken(String token) {
-        ConfirmEmailData confirmEmailData = null;
+    private ConfirmEmailData findSingleConfirmEmailDataByToken(String token) throws ConfirmEmailException {
         TypedQuery<ConfirmEmailData> typedQuery = em.createNamedQuery("ConfirmEmailData.findByToken", ConfirmEmailData.class);
         typedQuery.setParameter("token", token);
         try {
-            confirmEmailData = typedQuery.getSingleResult();
+            return typedQuery.getSingleResult();
         } catch (NoResultException | NonUniqueResultException ex) {
-            logger.fine("When looking up " + token + " caught " + ex);
+            logger.info("findSingleConfirmEmailDataByToken: When looking up " + token + " caught an exception:" + ex);
+            throw new ConfirmEmailException("");
         }
-        return confirmEmailData;
     }
 
     public ConfirmEmailData findSingleConfirmEmailDataByUser(AuthenticatedUser user) {
@@ -192,6 +219,14 @@ public ConfirmEmailData findSingleConfirmEmailDataByUser(AuthenticatedUser user)
         }
         return confirmEmailData;
     }
+    
+    public boolean hasActiveVerificationToken(AuthenticatedUser au) {
+        if (findSingleConfirmEmailDataByUser(au) == null){
+            return false;
+        }
+        return !findSingleConfirmEmailDataByUser(au).isExpired();
+    }
+
 
     public List<ConfirmEmailData> findAllConfirmEmailData() {
         TypedQuery<ConfirmEmailData> typedQuery = em.createNamedQuery("ConfirmEmailData.findAll", ConfirmEmailData.class);
diff --git a/src/main/java/edu/harvard/iq/dataverse/customization/CustomizationConstants.java b/src/main/java/edu/harvard/iq/dataverse/customization/CustomizationConstants.java
index 86bab2e1f60..767bd66518d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/customization/CustomizationConstants.java
+++ b/src/main/java/edu/harvard/iq/dataverse/customization/CustomizationConstants.java
@@ -5,6 +5,8 @@
  */
 package edu.harvard.iq.dataverse.customization;
 
+import java.util.List;
+
 /**
  *
  * @author rmp553
@@ -23,5 +25,5 @@ public class CustomizationConstants {
 
     public static String fileTypeLogo = "logo";
 
-
+    public static List<String> validTypes = List.of(fileTypeHomePage, fileTypeHeader, fileTypeFooter, fileTypeStyle, fileTypeAnalytics, fileTypeLogo);
 } // end CustomizationConstants
diff --git a/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardDatamovePage.java b/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardDatamovePage.java
deleted file mode 100644
index 54e3114a0ae..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardDatamovePage.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package edu.harvard.iq.dataverse.dashboard;
-
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
-import edu.harvard.iq.dataverse.DataverseSession;
-import edu.harvard.iq.dataverse.EjbDataverseEngine;
-import edu.harvard.iq.dataverse.PermissionsWrapper;
-import edu.harvard.iq.dataverse.SettingsWrapper;
-import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
-import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.exception.UnforcedCommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.MoveDatasetCommand;
-import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.JsfHelper;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.servlet.http.HttpServletRequest;
-
-@ViewScoped
-@Named("DashboardDatamovePage")
-public class DashboardDatamovePage implements java.io.Serializable {
-  
-    @Inject
-    DataverseSession session;
-    @Inject
-    PermissionsWrapper permissionsWrapper;
-    @EJB
-    EjbDataverseEngine commandEngine;
-
-    @EJB
-    DatasetServiceBean datasetService;
-    @EJB
-    DataverseServiceBean dataverseService;
-    @Inject
-    SettingsWrapper settingsWrapper;
-
-    @PersistenceContext(unitName = "VDCNet-ejbPU")
-    private EntityManager em;
-    
-    private static final Logger logger = Logger.getLogger(DashboardDatamovePage.class.getCanonicalName());
-
-    private AuthenticatedUser authUser = null;
-
-    // source dataset
-
-    public UIInput getSelectedDatasetMenu() {
-        return selectedDatasetMenu;
-    }
-
-    public void setSelectedDatasetMenu(UIInput selectedDatasetMenu) {
-        this.selectedDatasetMenu = selectedDatasetMenu;
-    }
-
-    UIInput selectedDatasetMenu;
-
-    public Dataset getSelectedSourceDataset() {
-        return selectedSourceDataset;
-    }
-
-    public void setSelectedSourceDataset(Dataset selectedSourceDataset) {
-        this.selectedSourceDataset = selectedSourceDataset;
-    }
-
-    private Dataset selectedSourceDataset;
-
-
-    public List<Dataset> completeSelectedDataset(String query) {
-        return datasetService.filterByPidQuery(query);
-    }
-    
-    // destination dataverse
-
-    public UIInput getSelectedDataverseMenu() {
-        return selectedDataverseMenu;
-    }
-
-    public void setSelectedDataverseMenu(UIInput selectedDataverseMenu) {
-        this.selectedDataverseMenu = selectedDataverseMenu;
-    }
-
-    UIInput selectedDataverseMenu;
-
-    public Dataverse getSelectedDestinationDataverse() {
-        return selectedDestinationDataverse;
-    }
-
-    public void setSelectedDestinationDataverse(Dataverse selectedDestinationDataverse) {
-        this.selectedDestinationDataverse = selectedDestinationDataverse;
-    }
-
-    private Dataverse selectedDestinationDataverse;
-
-    public List<Dataverse> completeSelectedDataverse(String query) {
-        return dataverseService.filterByAliasQuery(query);
-    }
-
-    public String init() {
-
-        if ((session.getUser() != null) && (session.getUser().isAuthenticated()) && (session.getUser().isSuperuser())) {
-           authUser = (AuthenticatedUser) session.getUser();
-            // initialize components, if any need it
-        } else {
-            return permissionsWrapper.notAuthorized();
-            // redirect to login OR give some type of ‘you must be logged in' message
-        }
-
-        FacesContext.getCurrentInstance().addMessage(null, 
-            new FacesMessage(FacesMessage.SEVERITY_INFO, 
-                BundleUtil.getStringFromBundle("dashboard.card.datamove.manage"), 
-                BundleUtil.getStringFromBundle("dashboard.card.datamove.message", Arrays.asList(settingsWrapper.getGuidesBaseUrl(), settingsWrapper.getGuidesVersion()))));
-        return null;
-    }
-    
-    public void move(){
-        Dataset ds = selectedSourceDataset;
-        String dsPersistentId = ds!=null?ds.getGlobalId().asString():null;
-        String srcAlias = ds!=null?ds.getOwner().getAlias():null;
-
-        Dataverse target = selectedDestinationDataverse;
-        String dstAlias = target!=null?target.getAlias():null;
-
-        if (ds == null || target == null) {
-            // Move only works if both inputs are correct 
-            // But if these inputs are required, we should never get here
-            // Since we never get here, we aren't bothering to move this English to the bundle.
-            FacesContext.getCurrentInstance().addMessage(null,
-                new FacesMessage("Please specify all fields"));
-            return;
-        }
-        // Note that we do not check if the Dataset is already in target verse!
-        //srcAlias.equals(dstAlias) // moving to the same verse makes no sense
-
-        // construct arguments for message
-        List<String> arguments = new ArrayList<>();
-        arguments.add(ds!=null?ds.getDisplayName():"-");
-        arguments.add(dsPersistentId!=null?dsPersistentId:"-");
-        arguments.add(target!=null?target.getName():"-");
-
-        // copied logic from Datasets API move
-        //Command requires Super user - it will be tested by the command
-        try {
-            HttpServletRequest httpServletRequest = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
-            DataverseRequest dataverseRequest = new DataverseRequest(authUser, httpServletRequest);
-            commandEngine.submit(new MoveDatasetCommand(
-                    dataverseRequest, ds, target, false
-            ));
-            
-            logger.info("Moved " + dsPersistentId + " from " + srcAlias + " to " + dstAlias);
-            
-            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dashboard.card.datamove.message.success", arguments));
-        }
-        catch (CommandException e) {
-            logger.log(Level.SEVERE,"Unable to move "+ dsPersistentId + " from " + srcAlias + " to " + dstAlias, e);
-            arguments.add(e.getLocalizedMessage());
-            if (e instanceof UnforcedCommandException) {
-                String guidesBaseUrl = settingsWrapper.getGuidesBaseUrl();
-                String version = settingsWrapper.getGuidesVersion();
-                // Suggest using the API to force the move.
-                arguments.add(BundleUtil.getStringFromBundle("dashboard.card.datamove.dataset.command.error.unforced.suggestForce", Arrays.asList(guidesBaseUrl, version)));
-            } else {
-                String emptyStringNoDetails = "";
-                arguments.add(emptyStringNoDetails);
-            }
-            FacesContext.getCurrentInstance().addMessage(null,
-                new FacesMessage(FacesMessage.SEVERITY_ERROR,
-                    BundleUtil.getStringFromBundle("dashboard.card.datamove.message.failure.summary"),
-                    BundleUtil.getStringFromBundle("dashboard.card.datamove.message.failure.details", arguments)));
-        }
-    }
-
-    public String getDataverseCount() {
-        long count = em.createQuery("SELECT count(dv) FROM Dataverse dv", Long.class).getSingleResult();
-        return NumberFormat.getInstance().format(count);
-    }
-
-    public String getDatasetCount() {
-        long count = em.createQuery("SELECT count(ds) FROM Dataset ds", Long.class).getSingleResult();
-        return NumberFormat.getInstance().format(count);
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardMoveDatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardMoveDatasetPage.java
new file mode 100644
index 00000000000..b1333b02a46
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardMoveDatasetPage.java
@@ -0,0 +1,187 @@
+package edu.harvard.iq.dataverse.dashboard;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.DataverseSession;
+import edu.harvard.iq.dataverse.EjbDataverseEngine;
+import edu.harvard.iq.dataverse.PermissionsWrapper;
+import edu.harvard.iq.dataverse.SettingsWrapper;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.UnforcedCommandException;
+import edu.harvard.iq.dataverse.engine.command.impl.MoveDatasetCommand;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.JsfHelper;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+
+@ViewScoped
+@Named("DashboardMoveDatasetPage")
+public class DashboardMoveDatasetPage implements java.io.Serializable {
+  
+    @Inject
+    DataverseSession session;
+    @Inject
+    PermissionsWrapper permissionsWrapper;
+    @EJB
+    EjbDataverseEngine commandEngine;
+
+    @EJB
+    DatasetServiceBean datasetService;
+    @EJB
+    DataverseServiceBean dataverseService;
+    @Inject
+    SettingsWrapper settingsWrapper;
+    
+    private static final Logger logger = Logger.getLogger(DashboardMoveDatasetPage.class.getCanonicalName());
+
+    private AuthenticatedUser authUser = null;
+
+    // source dataset
+
+    public UIInput getSelectedDatasetMenu() {
+        return selectedDatasetMenu;
+    }
+
+    public void setSelectedDatasetMenu(UIInput selectedDatasetMenu) {
+        this.selectedDatasetMenu = selectedDatasetMenu;
+    }
+
+    UIInput selectedDatasetMenu;
+
+    public Dataset getSelectedSourceDataset() {
+        return selectedSourceDataset;
+    }
+
+    public void setSelectedSourceDataset(Dataset selectedSourceDataset) {
+        this.selectedSourceDataset = selectedSourceDataset;
+    }
+
+    private Dataset selectedSourceDataset;
+
+
+    public List<Dataset> completeSelectedDataset(String query) {
+        return datasetService.filterByPidQuery(query);
+    }
+    
+    // destination dataverse
+
+    public UIInput getSelectedDataverseMenu() {
+        return selectedDataverseMenu;
+    }
+
+    public void setSelectedDataverseMenu(UIInput selectedDataverseMenu) {
+        this.selectedDataverseMenu = selectedDataverseMenu;
+    }
+
+    UIInput selectedDataverseMenu;
+
+    public Dataverse getSelectedDestinationDataverse() {
+        return selectedDestinationDataverse;
+    }
+
+    public void setSelectedDestinationDataverse(Dataverse selectedDestinationDataverse) {
+        this.selectedDestinationDataverse = selectedDestinationDataverse;
+    }
+
+    private Dataverse selectedDestinationDataverse;
+
+    public List<Dataverse> completeSelectedDataverse(String query) {
+        return dataverseService.filterByAliasQuery(query);
+    }
+
+    public String init() {
+
+        if ((session.getUser() != null) && (session.getUser().isAuthenticated()) && (session.getUser().isSuperuser())) {
+           authUser = (AuthenticatedUser) session.getUser();
+            // initialize components, if any need it
+        } else {
+            return permissionsWrapper.notAuthorized();
+            // redirect to login OR give some type of ‘you must be logged in' message
+        }
+
+        FacesContext.getCurrentInstance().addMessage(null, 
+            new FacesMessage(FacesMessage.SEVERITY_INFO, 
+                BundleUtil.getStringFromBundle("dashboard.card.move.dataset.manage"), 
+                BundleUtil.getStringFromBundle("dashboard.move.dataset.message", Arrays.asList(settingsWrapper.getGuidesBaseUrl(), settingsWrapper.getGuidesVersion()))));
+        return null;
+    }
+    
+    public void move(){
+        Dataset ds = selectedSourceDataset;
+        String dsPersistentId = ds != null ? ds.getGlobalId().asString() : null;
+        String srcAlias = ds != null ? ds.getOwner().getAlias() : null;
+
+        Dataverse target = selectedDestinationDataverse;
+        String dstAlias = target != null ? target.getAlias() : null;
+
+        if (ds == null || target == null) {
+            // Move only works if both inputs are correct 
+            // But if these inputs are required, we should never get here
+            // Since we never get here, we aren't bothering to move this English to the bundle.
+            FacesContext.getCurrentInstance().addMessage(null,
+                new FacesMessage("Please specify all fields"));
+            return;
+        }
+        // Note that we do not check if the Dataset is already in target verse!
+        //srcAlias.equals(dstAlias) // moving to the same verse makes no sense
+
+        // construct arguments for message
+        List<String> arguments = new ArrayList<>();
+        arguments.add(ds != null ? ds.getDisplayName() : "-");
+        arguments.add(dsPersistentId != null ? dsPersistentId : "-");
+        arguments.add(target != null ? target.getName() : "-");
+
+        // copied logic from Datasets API move
+        //Command requires Super user - it will be tested by the command
+        try {
+            HttpServletRequest httpServletRequest = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
+            DataverseRequest dataverseRequest = new DataverseRequest(authUser, httpServletRequest);
+            commandEngine.submit(new MoveDatasetCommand(
+                    dataverseRequest, ds, target, false
+            ));
+            
+            logger.info("Moved " + dsPersistentId + " from " + srcAlias + " to " + dstAlias);
+            
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dashboard.move.dataset.message.success", arguments));
+        }
+        catch (CommandException e) {
+            logger.log(Level.SEVERE,"Unable to move "+ dsPersistentId + " from " + srcAlias + " to " + dstAlias, e);
+            arguments.add(e.getLocalizedMessage());
+            if (e instanceof UnforcedCommandException) {
+                String guidesBaseUrl = settingsWrapper.getGuidesBaseUrl();
+                String version = settingsWrapper.getGuidesVersion();
+                // Suggest using the API to force the move.
+                arguments.add(BundleUtil.getStringFromBundle("dashboard.move.dataset.command.error.unforced.suggestForce", Arrays.asList(guidesBaseUrl, version)));
+            } else {
+                String emptyStringNoDetails = "";
+                arguments.add(emptyStringNoDetails);
+            }
+            FacesContext.getCurrentInstance().addMessage(null,
+                new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                    BundleUtil.getStringFromBundle("dashboard.move.dataset.message.failure.summary"),
+                    BundleUtil.getStringFromBundle("dashboard.move.dataset.message.failure.details", arguments)));
+        }
+    }
+
+    public String getDatasetCount() {
+        long count = datasetService.getDatasetCount();
+        return NumberFormat.getInstance().format(count);
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardMoveDataversePage.java b/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardMoveDataversePage.java
new file mode 100644
index 00000000000..be3d05a823e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardMoveDataversePage.java
@@ -0,0 +1,163 @@
+package edu.harvard.iq.dataverse.dashboard;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.DataverseSession;
+import edu.harvard.iq.dataverse.EjbDataverseEngine;
+import edu.harvard.iq.dataverse.PermissionsWrapper;
+import edu.harvard.iq.dataverse.SettingsWrapper;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.impl.MoveDataverseCommand;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.JsfHelper;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+
+@ViewScoped
+@Named("DashboardMoveDataversePage")
+public class DashboardMoveDataversePage implements java.io.Serializable {
+  
+    @Inject
+    DataverseSession session;
+    @Inject
+    PermissionsWrapper permissionsWrapper;
+    @EJB
+    EjbDataverseEngine commandEngine;
+    @EJB
+    DataverseServiceBean dataverseService;
+    @Inject
+    SettingsWrapper settingsWrapper;
+    
+    private static final Logger logger = Logger.getLogger(DashboardMoveDataversePage.class.getCanonicalName());
+
+    private AuthenticatedUser authUser = null;
+
+    // source dataverse
+
+    public UIInput getSelectedSourceDataverseMenu() {
+        return selectedSourceDataverseMenu;
+    }
+
+    public void setSelectedSourceDataverseMenu(UIInput selectedSourceDataverseMenu) {
+        this.selectedSourceDataverseMenu = selectedSourceDataverseMenu;
+    }
+
+    UIInput selectedSourceDataverseMenu;
+
+    public Dataverse getSelectedSourceDataverse() {
+        return selectedSourceDataverse;
+    }
+
+    public void setSelectedSourceDataverse(Dataverse selectedSourceDataverse) {
+        this.selectedSourceDataverse = selectedSourceDataverse;
+    }
+
+    private Dataverse selectedSourceDataverse;
+    
+    // destination dataverse
+
+    public UIInput getSelectedDataverseMenu() {
+        return selectedDataverseMenu;
+    }
+
+    public void setSelectedDataverseMenu(UIInput selectedDataverseMenu) {
+        this.selectedDataverseMenu = selectedDataverseMenu;
+    }
+
+    UIInput selectedDataverseMenu;
+
+    public Dataverse getSelectedDestinationDataverse() {
+        return selectedDestinationDataverse;
+    }
+
+    public void setSelectedDestinationDataverse(Dataverse selectedDestinationDataverse) {
+        this.selectedDestinationDataverse = selectedDestinationDataverse;
+    }
+
+    private Dataverse selectedDestinationDataverse;
+
+    public List<Dataverse> completeSelectedDataverse(String query) {
+        return dataverseService.filterByAliasQuery(query);
+    }
+
+    public String init() {
+
+        if ((session.getUser() != null) && (session.getUser().isAuthenticated()) && (session.getUser().isSuperuser())) {
+           authUser = (AuthenticatedUser) session.getUser();
+            // initialize components, if any need it
+        } else {
+            return permissionsWrapper.notAuthorized();
+            // redirect to login OR give some type of ‘you must be logged in' message
+        }
+
+        FacesContext.getCurrentInstance().addMessage(null, 
+            new FacesMessage(FacesMessage.SEVERITY_INFO, 
+                BundleUtil.getStringFromBundle("dashboard.move.dataverse.message.summary"), 
+                BundleUtil.getStringFromBundle("dashboard.move.dataverse.message.detail", Arrays.asList(settingsWrapper.getGuidesBaseUrl(), settingsWrapper.getGuidesVersion()))));
+        return null;
+    }
+    
+    public void move(){
+        Dataverse dvSource = selectedSourceDataverse;
+        String srcAlias = dvSource != null ? dvSource.getAlias() : null;
+
+        Dataverse target = selectedDestinationDataverse;
+        String dstAlias = target != null ? target.getAlias() : null;
+
+        if (dvSource == null || target == null) {
+            // Move only works if both inputs are correct 
+            // But if these inputs are required, we should never get here
+            // Since we never get here, we aren't bothering to move this English to the bundle.
+            FacesContext.getCurrentInstance().addMessage(null,
+                new FacesMessage("Please specify all fields"));
+            return;
+        }
+
+        // construct arguments for message
+        List<String> arguments = new ArrayList<>();
+        arguments.add(dvSource != null ? dvSource.getName() : "-");
+        arguments.add(target != null ? target.getName() : "-");
+
+        // copied logic from Dataverse API move
+        //Command requires Super user - it will be tested by the command
+        try {
+            HttpServletRequest httpServletRequest = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
+            DataverseRequest dataverseRequest = new DataverseRequest(authUser, httpServletRequest);
+            commandEngine.submit(new MoveDataverseCommand(
+                    dataverseRequest, dvSource, target, false
+            ));
+            
+            logger.info("Moved " + srcAlias + " to " + dstAlias);
+            
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dashboard.move.dataverse.message.success", arguments));
+        }
+        catch (CommandException e) {
+            logger.log(Level.SEVERE,"Unable to move "+ srcAlias + " to " + dstAlias, e);
+            arguments.add(e.getLocalizedMessage());
+            FacesContext.getCurrentInstance().addMessage(null,
+                new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                    BundleUtil.getStringFromBundle("dashboard.move.dataverse.message.failure.summary"),
+                    BundleUtil.getStringFromBundle("dashboard.move.dataverse.message.failure.details", arguments)));
+        }
+    }
+
+    public String getDataverseCount() {
+        long count = dataverseService.getDataverseCount();
+        return NumberFormat.getInstance().format(count);
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardUsersPage.java b/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardUsersPage.java
index e4c0b835817..477e4c0fdd6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardUsersPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardUsersPage.java
@@ -19,18 +19,20 @@
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import java.text.NumberFormat;
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 @ViewScoped
 @Named("DashboardUsersPage")
 public class DashboardUsersPage implements java.io.Serializable {
-  
+
     @EJB
     AuthenticationServiceBean authenticationService;
     @EJB
@@ -52,13 +54,31 @@ public class DashboardUsersPage implements java.io.Serializable {
 
     private Pager pager;
     private List<AuthenticatedUser> userList;
-    
+
     private String searchTerm;
+    private String sortField;
 
-    public String init() {
+    private static Map<String, String> sortingMap = new LinkedHashMap<>();
+    static {
+        sortingMap.put("id",                  "dashboard.list_users.tbl_header.userIdAZ");
+        sortingMap.put("id desc",             "dashboard.list_users.tbl_header.userIdZA");
+        sortingMap.put("userIdentifier",      "dashboard.list_users.tbl_header.userIdentifierAZ");
+        sortingMap.put("userIdentifier desc", "dashboard.list_users.tbl_header.userIdentifierZA");
+        sortingMap.put("lastName",            "dashboard.list_users.tbl_header.lastNameAZ");
+        sortingMap.put("lastName desc",       "dashboard.list_users.tbl_header.lastNameZA");
+        sortingMap.put("email",               "dashboard.list_users.tbl_header.emailAZ");
+        sortingMap.put("email desc",          "dashboard.list_users.tbl_header.emailZA");
+        sortingMap.put("affiliation",         "dashboard.list_users.tbl_header.affiliationAZ");
+        sortingMap.put("affiliation desc",    "dashboard.list_users.tbl_header.affiliationZA");
+        sortingMap.put("authProviderId",      "dashboard.list_users.tbl_header.authProviderFactoryAliasAZ");
+        sortingMap.put("authProviderId desc", "dashboard.list_users.tbl_header.authProviderFactoryAliasZA");
+        sortingMap.put("superuser",           "dashboard.list_users.tbl_header.superuserAZ");
+        sortingMap.put("superuser desc",      "dashboard.list_users.tbl_header.superuserZA");
+    }
 
+    public String init() {
         if ((session.getUser() != null) && (session.getUser().isAuthenticated()) && (session.getUser().isSuperuser())) {
-           authUser = (AuthenticatedUser) session.getUser();
+            authUser = (AuthenticatedUser) session.getUser();
             userListMaker = new UserListMaker(userService);
             runUserSearch();
         } else {
@@ -68,61 +88,60 @@ public String init() {
 
         return null;
     }
-    
+
     public boolean runUserSearchWithPage(Integer pageNumber){
-        System.err.println("runUserSearchWithPage");
+        logger.fine("runUserSearchWithPage");
         setSelectedPage(pageNumber);
         runUserSearch();
         return true;
     }
-    
-    public boolean runUserSearch(){
-
-        logger.fine("Run the search!");
 
+    public boolean runUserSearchWithSort(String field) {
+        logger.log(Level.FINE, "runUserSearchWithSort({0})", field);
+        setSortField(field);
+        runUserSearch();
+        return true;
+    }
 
+    public boolean runUserSearch(){
+        logger.fine("Run the search!");
         /**
-         * (1) Determine the number of users returned by the count        
+         * (1) Determine the number of users returned by the count
          */
-        UserListResult userListResult = userListMaker.runUserSearch(searchTerm, UserListMaker.ITEMS_PER_PAGE, getSelectedPage(), null);
-        if (userListResult==null){
+        UserListResult userListResult = userListMaker.runUserSearch(searchTerm, UserListMaker.ITEMS_PER_PAGE, getSelectedPage(), sortField);
+        if (userListResult == null) {
             try {
                 throw new Exception("userListResult should not be null!");
             } catch (Exception ex) {
                 Logger.getLogger(DashboardUsersPage.class.getName()).log(Level.SEVERE, null, ex);
             }
         }
-        setSelectedPage(userListResult.getSelectedPageNumber());        
+        setSelectedPage(userListResult.getSelectedPageNumber());
 
         this.userList = userListResult.getUserList();
         this.pager = userListResult.getPager();
-        
+
         return true;
-        
     }
 
-
-    
     public String getListUsersAPIPath() {
         //return "ok";
         return Admin.listUsersFullAPIPath;
     }
 
-    /** 
+    /**
      * Number of total users
-     * @return 
+     * @return
      */
     public String getUserCount() {
-
         return NumberFormat.getInstance().format(userService.getTotalUserCount());
     }
 
-    /** 
+    /**
      * Number of total Superusers
-     * @return 
+     * @return
      */
     public Long getSuperUserCount() {
-        
         return userService.getSuperUserCount();
     }
 
@@ -134,26 +153,26 @@ public List<AuthenticatedUser> getUserList() {
      * Pager for when user list exceeds the number of display rows
      * (default: UserListMaker.ITEMS_PER_PAGE)
      * 
-     * @return 
+     * @return
      */
     public Pager getPager() {
         return this.pager;
     }
 
-    public void setSelectedPage(Integer pgNum){
-        if ((pgNum == null)||(pgNum < 1)){
+    public void setSelectedPage(Integer pgNum) {
+        if ((pgNum == null) || (pgNum < 1)) {
             this.selectedPage = 1;
         }
         selectedPage = pgNum;
     }
 
-    public Integer getSelectedPage(){
-        if ((selectedPage == null)||(selectedPage < 1)){
-            setSelectedPage(null);            
+    public Integer getSelectedPage() {
+        if ((selectedPage == null) || (selectedPage < 1)) {
+            setSelectedPage(null);
         }
         return selectedPage;
     }
-    
+
     public String getSearchTerm() {
         return searchTerm;
     }
@@ -161,29 +180,28 @@ public String getSearchTerm() {
     public void setSearchTerm(String searchTerm) {
         this.searchTerm = searchTerm;
     }
-    
+
     /* 
-       Methods for toggling the supeuser status of a selected user. 
-       Our normal two step approach is used: first showing the "are you sure?" 
-       popup, then finalizing the toggled value. 
+       Methods for toggling the supeuser status of a selected user.
+       Our normal two step approach is used: first showing the "are you sure?"
+       popup, then finalizing the toggled value.
     */
-       
+
     AuthenticatedUser selectedUserDetached = null; // Note: This is NOT the persisted object!!!!  Don't try to save it, etc.
     AuthenticatedUser selectedUserPersistent = null;  // This is called on the fly and updated
-    
+
     public void setSelectedUserDetached(AuthenticatedUser user) {
         this.selectedUserDetached = user;
     }
-    
+
     public AuthenticatedUser getSelectedUserDetached() {
         return this.selectedUserDetached;
     }
-    
-    
+
     public void setUserToToggleSuperuserStatus(AuthenticatedUser user) {
-        selectedUserDetached = user; 
+        selectedUserDetached = user;
     }
-    
+
     public void saveSuperuserStatus() {
 
         // Retrieve the persistent version for saving to db
@@ -197,7 +215,7 @@ public void saveSuperuserStatus() {
             logger.fine("selectedUserPersistent info: " + selectedUserPersistent.getId() + " set to: " + selectedUserDetached.isSuperuser());
             selectedUserPersistent.setSuperuser(selectedUserDetached.isSuperuser());
 
-            // Using the new commands for granting and revoking the superuser status: 
+            // Using the new commands for granting and revoking the superuser status:
             try {
                 if (!selectedUserPersistent.isSuperuser()) {
                     // We are revoking the status:
@@ -212,20 +230,19 @@ public void saveSuperuserStatus() {
         } else {
             logger.warning("selectedUserPersistent is null.  AuthenticatedUser not found for id: " + selectedUserDetached.getId());
         }
-
     }
-    
+
     public void cancelSuperuserStatusChange(){
-        selectedUserDetached.setSuperuser(!selectedUserDetached.isSuperuser());        
+        selectedUserDetached.setSuperuser(!selectedUserDetached.isSuperuser());
         selectedUserPersistent = null;
     }
-    
-    // Methods for the removeAllRoles for a user : 
-    
+
+    // Methods for the removeAllRoles for a user :
+
     public void removeUserRoles() {
         logger.fine("Get persisent AuthenticatedUser for id: " + selectedUserDetached.getId());
         selectedUserPersistent = userService.find(selectedUserDetached.getId());
-        
+
         selectedUserDetached.setRoles(null); // for display
         try {
             commandEngine.submit(new RevokeAllRolesCommand(selectedUserPersistent, dvRequestService.getDataverseRequest()));
@@ -234,19 +251,34 @@ public void removeUserRoles() {
             JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dashboard.list_users.removeAll.message.failure", Arrays.asList(selectedUserPersistent.getUserIdentifier())));
             return;
         }
-        // success message: 
-        JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dashboard.list_users.removeAll.message.success", Arrays.asList(selectedUserPersistent.getUserIdentifier()))); 
+        // success message:
+        JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dashboard.list_users.removeAll.message.success", Arrays.asList(selectedUserPersistent.getUserIdentifier())));
     }
-    
+
     public String getConfirmRemoveRolesMessage() {
         if (selectedUserDetached != null) {
             return BundleUtil.getStringFromBundle("dashboard.list_users.tbl_header.roles.removeAll.confirmationText", Arrays.asList(selectedUserDetached.getUserIdentifier()));
-        } 
+        }
         return BundleUtil.getStringFromBundle("dashboard.list_users.tbl_header.roles.removeAll.confirmationText");
     }
-    
-    public String getAuthProviderFriendlyName(String authProviderId){
-        
+
+    public String getAuthProviderFriendlyName(String authProviderId) {
         return AuthenticationProvider.getFriendlyName(authProviderId);
     }
+
+    public String getSortField() {
+        return sortField;
+    }
+
+    public void setSortField(String sort) {
+        this.sortField = sort;
+    }
+
+    public boolean isSortedBy(String _sortField) {
+        return _sortField.equals(sortField);
+    }
+
+    public Map<String, String> getSortingMap() {
+        return sortingMap;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/AbstractRemoteOverlayAccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/AbstractRemoteOverlayAccessIO.java
new file mode 100644
index 00000000000..18269f6970e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/AbstractRemoteOverlayAccessIO.java
@@ -0,0 +1,338 @@
+package edu.harvard.iq.dataverse.dataaccess;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.channels.Channel;
+import java.nio.file.Path;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.logging.Logger;
+
+import javax.net.ssl.SSLContext;
+
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustAllStrategy;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.ssl.SSLContextBuilder;
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObject;
+
+
+/**
+ * A base class for StorageIO implementations supporting remote access. At present, that includes the RemoteOverlayAccessIO store and the newer GlobusOverlayAccessIO store. It primarily includes
+ * common methods for handling auxiliary files in the configured base store.
+ * @param <T>
+ */
+public abstract class AbstractRemoteOverlayAccessIO<T extends DvObject> extends StorageIO<T> {
+
+    protected static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.dataaccess.RemoteOverlayAccessIO");
+    public static final String REFERENCE_ENDPOINTS_WITH_BASEPATHS = "reference-endpoints-with-basepaths";
+    static final String BASE_STORE = "base-store";
+    protected static final String SECRET_KEY = "secret-key";
+    static final String URL_EXPIRATION_MINUTES = "url-expiration-minutes";
+    protected static final String REMOTE_STORE_NAME = "remote-store-name";
+    protected static final String REMOTE_STORE_URL = "remote-store-url";
+    
+    // Whether Dataverse can access the file bytes
+    // Currently False only for the Globus store when using the S3Connector, and Remote Stores like simple web servers where the URLs resolve to the actual file bits
+    static final String FILES_NOT_ACCESSIBLE_BY_DATAVERSE = "files-not-accessible-by-dataverse";
+
+    protected StorageIO<DvObject> baseStore = null;
+    protected String path = null;
+    protected PoolingHttpClientConnectionManager cm = null;
+    CloseableHttpClient httpclient = null;
+    protected static HttpClientContext localContext = HttpClientContext.create();
+
+    protected int timeout = 1200;
+    protected RequestConfig config = RequestConfig.custom().setConnectTimeout(timeout * 1000)
+                .setConnectionRequestTimeout(timeout * 1000).setSocketTimeout(timeout * 1000)
+                .setCookieSpec(CookieSpecs.STANDARD).setExpectContinueEnabled(true).build();
+    protected static boolean trustCerts = false;
+    protected int httpConcurrency = 4;
+
+    public static String getBaseStoreIdFor(String driverId) {
+        return getConfigParamForDriver(driverId, BASE_STORE);
+    }
+
+    public AbstractRemoteOverlayAccessIO() {
+        super();
+    }
+
+    public AbstractRemoteOverlayAccessIO(String storageLocation, String driverId) {
+        super(storageLocation, driverId);
+    }
+
+    public AbstractRemoteOverlayAccessIO(T dvObject, DataAccessRequest req, String driverId) {
+        super(dvObject, req, driverId);
+    }
+
+    @Override
+    public Channel openAuxChannel(String auxItemTag, DataAccessOption... options) throws IOException {
+        return baseStore.openAuxChannel(auxItemTag, options);
+    }
+
+    @Override
+    public boolean isAuxObjectCached(String auxItemTag) throws IOException {
+        return baseStore.isAuxObjectCached(auxItemTag);
+    }
+
+    @Override
+    public long getAuxObjectSize(String auxItemTag) throws IOException {
+        return baseStore.getAuxObjectSize(auxItemTag);
+    }
+
+    @Override
+    public Path getAuxObjectAsPath(String auxItemTag) throws IOException {
+        return baseStore.getAuxObjectAsPath(auxItemTag);
+    }
+
+    @Override
+    public void backupAsAux(String auxItemTag) throws IOException {
+        baseStore.backupAsAux(auxItemTag);
+    }
+
+    @Override
+    public void revertBackupAsAux(String auxItemTag) throws IOException {
+        baseStore.revertBackupAsAux(auxItemTag);
+    }
+
+    @Override
+    public void savePathAsAux(Path fileSystemPath, String auxItemTag) throws IOException {
+        baseStore.savePathAsAux(fileSystemPath, auxItemTag);
+    }
+
+    @Override
+    public void saveInputStreamAsAux(InputStream inputStream, String auxItemTag, Long filesize) throws IOException {
+        baseStore.saveInputStreamAsAux(inputStream, auxItemTag, filesize);
+    }
+
+    /**
+     * @param inputStream InputStream we want to save
+     * @param auxItemTag  String representing this Auxiliary type ("extension")
+     * @throws IOException if anything goes wrong.
+     */
+    @Override
+    public void saveInputStreamAsAux(InputStream inputStream, String auxItemTag) throws IOException {
+        baseStore.saveInputStreamAsAux(inputStream, auxItemTag);
+    }
+
+    @Override
+    public List<String> listAuxObjects() throws IOException {
+        return baseStore.listAuxObjects();
+    }
+
+    @Override
+    public void deleteAuxObject(String auxItemTag) throws IOException {
+        baseStore.deleteAuxObject(auxItemTag);
+    }
+
+    @Override
+    public void deleteAllAuxObjects() throws IOException {
+        baseStore.deleteAllAuxObjects();
+    }
+
+    @Override
+    public InputStream getAuxFileAsInputStream(String auxItemTag) throws IOException {
+        return baseStore.getAuxFileAsInputStream(auxItemTag);
+    }
+
+    protected int getUrlExpirationMinutes() {
+        String optionValue = getConfigParam(URL_EXPIRATION_MINUTES);
+        if (optionValue != null) {
+            Integer num;
+            try {
+                num = Integer.parseInt(optionValue);
+            } catch (NumberFormatException ex) {
+                num = null;
+            }
+            if (num != null) {
+                return num;
+            }
+        }
+        return 60;
+    }
+
+    public CloseableHttpClient getSharedHttpClient() {
+        if (httpclient == null) {
+            try {
+                initHttpPool();
+                httpclient = HttpClients.custom().setConnectionManager(cm).setDefaultRequestConfig(config).build();
+    
+            } catch (NoSuchAlgorithmException | KeyStoreException | KeyManagementException ex) {
+                logger.warning(ex.getMessage());
+            }
+        }
+        return httpclient;
+    }
+
+    private void initHttpPool() throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException {
+        if (trustCerts) {
+            // use the TrustSelfSignedStrategy to allow Self Signed Certificates
+            SSLContext sslContext;
+            SSLConnectionSocketFactory connectionFactory;
+    
+            sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy()).build();
+            // create an SSL Socket Factory to use the SSLContext with the trust self signed
+            // certificate strategy
+            // and allow all hosts verifier.
+            connectionFactory = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+    
+            Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
+                    .register("https", connectionFactory).build();
+            cm = new PoolingHttpClientConnectionManager(registry);
+        } else {
+            cm = new PoolingHttpClientConnectionManager();
+        }
+        cm.setDefaultMaxPerRoute(httpConcurrency);
+        cm.setMaxTotal(httpConcurrency > 20 ? httpConcurrency : 20);
+    }
+
+    @Override
+    abstract public long retrieveSizeFromMedia();
+    
+    @Override
+    public boolean exists() {
+        logger.fine("Exists called");
+        return (retrieveSizeFromMedia() != -1);
+    }
+
+    @Override
+    public List<String> cleanUp(Predicate<String> filter, boolean dryRun) throws IOException {
+        return baseStore.cleanUp(filter, dryRun);
+    }
+    
+    @Override
+    public String getStorageLocation() throws IOException {
+        String fullStorageLocation = dvObject.getStorageIdentifier();
+        logger.fine("storageidentifier: " + fullStorageLocation);
+        int driverIndex = fullStorageLocation.lastIndexOf(DataAccess.SEPARATOR);
+        if (driverIndex >= 0) {
+            fullStorageLocation = fullStorageLocation
+                    .substring(fullStorageLocation.lastIndexOf(DataAccess.SEPARATOR) + DataAccess.SEPARATOR.length());
+        }
+        if (this.getDvObject() instanceof Dataset) {
+            throw new IOException("AbstractRemoteOverlayAccessIO: Datasets are not a supported dvObject");
+        } else if (this.getDvObject() instanceof DataFile) {
+            fullStorageLocation = StorageIO.getDriverPrefix(this.driverId) + fullStorageLocation;
+        } else if (dvObject instanceof Dataverse) {
+            throw new IOException("AbstractRemoteOverlayAccessIO: Dataverses are not a supported dvObject");
+        }
+        logger.fine("fullStorageLocation: " + fullStorageLocation);
+        return fullStorageLocation;
+    }
+    protected void configureStores(DataAccessRequest req, String driverId, String storageLocation) throws IOException {
+
+        if (baseStore == null) {
+            String baseDriverId = getBaseStoreIdFor(driverId);
+            String fullStorageLocation = null;
+            String baseDriverType = getConfigParamForDriver(baseDriverId, StorageIO.TYPE,
+                    DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER);
+
+            if (dvObject instanceof Dataset) {
+                baseStore = DataAccess.getStorageIO(dvObject, req, baseDriverId);
+            } else {
+                if (this.getDvObject() != null) {
+                    fullStorageLocation = getStoragePath();
+
+                    // S3 expects <id>://<bucketname>/<key>
+                    switch (baseDriverType) {
+                    case DataAccess.S3:
+                        fullStorageLocation = baseDriverId + DataAccess.SEPARATOR
+                                + getConfigParamForDriver(baseDriverId, S3AccessIO.BUCKET_NAME) + "/"
+                                + fullStorageLocation;
+                        break;
+                    case DataAccess.FILE:
+                        fullStorageLocation = baseDriverId + DataAccess.SEPARATOR
+                                + getConfigParamForDriver(baseDriverId, FileAccessIO.DIRECTORY, "/tmp/files")
+                                + "/" + fullStorageLocation;
+                        break;
+                    default:
+                        logger.warning("Not Supported: " + this.getClass().getName() + " store with base store type: "
+                                + getConfigParamForDriver(baseDriverId, StorageIO.TYPE));
+                        throw new IOException("Not supported");
+                    }
+
+                } else if (storageLocation != null) {
+                    // <remoteDriverId>://<baseStorageIdentifier>//<baseUrlPath>
+                    // remoteDriverId:// is removed if coming through directStorageIO
+                    int index = storageLocation.indexOf(DataAccess.SEPARATOR);
+                    if (index > 0) {
+                        storageLocation = storageLocation.substring(index + DataAccess.SEPARATOR.length());
+                    }
+                    // The base store needs the baseStoreIdentifier and not the relative URL (if it exists)
+                    int endOfId = storageLocation.indexOf("//");
+                    fullStorageLocation = (endOfId>-1) ? storageLocation.substring(0, endOfId) : storageLocation;
+
+                    switch (baseDriverType) {
+                    case DataAccess.S3:
+                        fullStorageLocation = baseDriverId + DataAccess.SEPARATOR
+                                + getConfigParamForDriver(baseDriverId, S3AccessIO.BUCKET_NAME) + "/"
+                                + fullStorageLocation;
+                        break;
+                    case DataAccess.FILE:
+                        fullStorageLocation = baseDriverId + DataAccess.SEPARATOR
+                                + getConfigParamForDriver(baseDriverId, FileAccessIO.DIRECTORY, "/tmp/files")
+                                + "/" + fullStorageLocation;
+                        break;
+                    default:
+                        logger.warning("Not Supported: " + this.getClass().getName() + " store with base store type: "
+                                + getConfigParamForDriver(baseDriverId, StorageIO.TYPE));
+                        throw new IOException("Not supported");
+                    }
+                }
+                baseStore = DataAccess.getDirectStorageIO(fullStorageLocation);
+            }
+            if (baseDriverType.contentEquals(DataAccess.S3)) {
+                ((S3AccessIO<?>) baseStore).setMainDriver(false);
+            }
+        }
+        remoteStoreName = getConfigParam(REMOTE_STORE_NAME);
+        try {
+            remoteStoreUrl = new URL(getConfigParam(REMOTE_STORE_URL));
+        } catch (MalformedURLException mfue) {
+            logger.fine("Unable to read remoteStoreUrl for driver: " + this.driverId);
+        }
+    }
+
+    protected String getStoragePath() throws IOException {
+        String fullStoragePath = dvObject.getStorageIdentifier();
+        logger.fine("storageidentifier: " + fullStoragePath);
+        int driverIndex = fullStoragePath.lastIndexOf(DataAccess.SEPARATOR);
+        if (driverIndex >= 0) {
+            fullStoragePath = fullStoragePath
+                    .substring(fullStoragePath.lastIndexOf(DataAccess.SEPARATOR) + DataAccess.SEPARATOR.length());
+        }
+        int suffixIndex = fullStoragePath.indexOf("//");
+        if (suffixIndex >= 0) {
+            fullStoragePath = fullStoragePath.substring(0, suffixIndex);
+        }
+        if (getDvObject() instanceof Dataset) {
+            fullStoragePath = getDataset().getAuthorityForFileStorage() + "/"
+                    + getDataset().getIdentifierForFileStorage() + "/" + fullStoragePath;
+        } else if (getDvObject() instanceof DataFile) {
+            fullStoragePath = getDataFile().getOwner().getAuthorityForFileStorage() + "/"
+                    + getDataFile().getOwner().getIdentifierForFileStorage() + "/" + fullStoragePath;
+        } else if (dvObject instanceof Dataverse) {
+            throw new IOException("RemoteOverlayAccessIO: Dataverses are not a supported dvObject");
+        }
+        logger.fine("fullStoragePath: " + fullStoragePath);
+        return fullStoragePath;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataAccess.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataAccess.java
index acb9336b5c6..bc4c69390cf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataAccess.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataAccess.java
@@ -20,22 +20,42 @@
 
 package edu.harvard.iq.dataverse.dataaccess;
 
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.util.FileUtil;
+
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+import org.apache.commons.lang3.StringUtils;
 /**
  *
  * @author Leonid Andreev
  */
 
+
 public class DataAccess {
 
+	private static final Logger logger = Logger.getLogger(DataAccess.class.getCanonicalName());
+	
     public DataAccess() {
 
     };
 
-
-    public static final String DEFAULT_STORAGE_DRIVER_IDENTIFIER = System.getProperty("dataverse.files.storage-driver-id");
-
+    public static final String FILE = "file";
+    public static final String S3 = "s3";
+    static final String SWIFT = "swift";
+    static final String REMOTE = "remote";
+    public static final String GLOBUS = "globus";
+    static final String TMP = "tmp";
+    public static final String SEPARATOR = "://";
+    //Default to "file" is for tests only
+    public static final String DEFAULT_STORAGE_DRIVER_IDENTIFIER = System.getProperty("dataverse.files.storage-driver-id", FILE);
+    public static final String UNDEFINED_STORAGE_DRIVER_IDENTIFIER = "undefined"; //Used in dataverse.xhtml as a non-null selection option value (indicating a null driver/inheriting the default)
+     
+    
     // The getStorageIO() methods initialize StorageIO objects for
     // datafiles that are already saved using one of the supported Dataverse
     // DataAccess IO drivers.
@@ -43,86 +63,373 @@ public static <T extends DvObject> StorageIO<T> getStorageIO(T dvObject) throws
         return getStorageIO(dvObject, null);
     }
 
-    //passing DVObject instead of a datafile to accomodate for use of datafiles as well as datasets
-    public static <T extends DvObject> StorageIO<T> getStorageIO(T dvObject, DataAccessRequest req) throws IOException {
+    
 
-        if (dvObject == null
-                || dvObject.getStorageIdentifier() == null
-            || dvObject.getStorageIdentifier().isEmpty()) {
-            throw new IOException("getDataAccessObject: null or invalid datafile.");
+    public static String getStorageDriverFromIdentifier(String storageIdentifier) {
+        
+        int separatorIndex = storageIdentifier.indexOf(SEPARATOR);
+        String driverId = DEFAULT_STORAGE_DRIVER_IDENTIFIER; // default
+        if (separatorIndex > 0) {
+            driverId = storageIdentifier.substring(0, separatorIndex);
         }
+        return driverId;
+    }
+    
+    //passing DVObject instead of a datafile to accomodate for use of datafiles as well as datasets
+	public static <T extends DvObject> StorageIO<T> getStorageIO(T dvObject, DataAccessRequest req) throws IOException {
 
-        if (dvObject.getStorageIdentifier().startsWith("file://")
-                || (!dvObject.getStorageIdentifier().matches("^[a-z][a-z0-9]*://.*"))) {
-            return new FileAccessIO<>(dvObject, req);
-        } else if (dvObject.getStorageIdentifier().startsWith("swift://")){
-            return new SwiftAccessIO<>(dvObject, req);
-        } else if (dvObject.getStorageIdentifier().startsWith("s3://")){
-            return new S3AccessIO<>(dvObject, req);
-        } else if (dvObject.getStorageIdentifier().startsWith("tmp://")) {
-            throw new IOException("DataAccess IO attempted on a temporary file that hasn't been permanently saved yet.");
-        }
+		if (dvObject == null || dvObject.getStorageIdentifier() == null || dvObject.getStorageIdentifier().isEmpty()) {
+			throw new IOException("getDataAccessObject: null or invalid datafile.");
+		}
 
-        // TODO:
-        // This code will need to be extended with a system of looking up
-        // available storage plugins by the storage tag embedded in the
-        // "storage identifier".
-        // -- L.A. 4.0.2
+        String storageDriverId = getStorageDriverFromIdentifier(dvObject.getStorageIdentifier());
 
+		return getStorageIO(dvObject, req, storageDriverId);
+	}
 
-        throw new IOException("getDataAccessObject: Unsupported storage method.");
-    }
+	protected static <T extends DvObject> StorageIO<T> getStorageIO(T dvObject, DataAccessRequest req,
+			String storageDriverId) throws IOException {
+		String storageType = getDriverType(storageDriverId);
+		switch (storageType) {
+		case FILE:
+			return new FileAccessIO<>(dvObject, req, storageDriverId);
+		case S3:
+			return new S3AccessIO<>(dvObject, req, storageDriverId);
+		case SWIFT:
+			return new SwiftAccessIO<>(dvObject, req, storageDriverId);
+		case REMOTE:
+			return new RemoteOverlayAccessIO<>(dvObject, req, storageDriverId);
+	     case GLOBUS:
+	            return new GlobusOverlayAccessIO<>(dvObject, req, storageDriverId);
+		case TMP:
+			throw new IOException(
+					"DataAccess IO attempted on a temporary file that hasn't been permanently saved yet.");
+		}
+		// TODO:
+		// This code will need to be extended with a system of looking up
+		// available storage plugins by the storage tag embedded in the
+		// "storage identifier".
+		// -- L.A. 4.0.2
+
+		logger.warning("Could not find storage driver for: " + storageDriverId);
+		throw new IOException("getDataAccessObject: Unsupported storage method.");
+	}
 
     // Experimental extension of the StorageIO system allowing direct access to
     // stored physical files that may not be associated with any DvObjects
 
-    public static StorageIO getDirectStorageIO(String storageLocation) throws IOException {
-        if (storageLocation.startsWith("file://")) {
-            return new FileAccessIO(storageLocation.substring(7));
-        } else if (storageLocation.startsWith("swift://")){
-            return new SwiftAccessIO<>(storageLocation.substring(8));
-        } else if (storageLocation.startsWith("s3://")){
-            return new S3AccessIO<>(storageLocation.substring(5));
+    public static StorageIO<DvObject> getDirectStorageIO(String fullStorageLocation) throws IOException {
+    	String[] response = getDriverIdAndStorageLocation(fullStorageLocation);
+    	String storageDriverId = response[0];
+    	String storageLocation=response[1];
+        String storageType = getDriverType(storageDriverId);
+        switch(storageType) {
+        case FILE:
+            return new FileAccessIO<>(storageLocation, storageDriverId);
+        case S3:
+            return new S3AccessIO<>(storageLocation, storageDriverId);
+        case SWIFT:
+            return new SwiftAccessIO<>(storageLocation, storageDriverId);
+        case REMOTE:
+            return new RemoteOverlayAccessIO<>(storageLocation, storageDriverId);
+        case GLOBUS:
+            return new GlobusOverlayAccessIO<>(storageLocation, storageDriverId);
+        default:
+        	logger.warning("Could not find storage driver for: " + fullStorageLocation);
+        	throw new IOException("getDirectStorageIO: Unsupported storage method.");
+        }
+    }
+    
+    public static String[] getDriverIdAndStorageLocation(String storageLocation) {
+    	//default if no prefix
+    	String storageIdentifier=storageLocation;
+        int separatorIndex = storageLocation.indexOf(SEPARATOR);
+    	String storageDriverId = ""; //default
+        if(separatorIndex>0) {
+        	storageDriverId = storageLocation.substring(0,separatorIndex);
+        	storageIdentifier = storageLocation.substring(separatorIndex + 3);
+        }
+		return new String[]{storageDriverId, storageIdentifier};
+    }
+    
+    public static String getStorageIdFromLocation(String location) {
+        if (location.contains(SEPARATOR)) {
+            // It's a full location with a driverId, so strip and reapply the driver id
+            // NOte that this will strip the bucketname out (which s3 uses) but the
+            // S3IOStorage class knows to look at re-insert it
+            return location.substring(0, location.indexOf(SEPARATOR) + 3)
+                    + location.substring(location.lastIndexOf('/') + 1);
+        }
+        return location.substring(location.lastIndexOf('/') + 1);
+    }
+    
+    /** Changes storageidentifiers of the form
+     * s3://bucketname/18b39722140-50eb7d3c5ece or file://18b39722140-50eb7d3c5ece to s3://10.5072/FK2/ABCDEF/18b39722140-50eb7d3c5ece
+     * and
+     * 18b39722140-50eb7d3c5ece to 10.5072/FK2/ABCDEF/18b39722140-50eb7d3c5ece
+     * @param id
+     * @param dataset
+     * @return
+     */
+    public static String getLocationFromStorageId(String id, Dataset dataset) {
+        String path= dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage() + "/";
+        if (id.contains(SEPARATOR)) {
+            // It's a full location with a driverId, so strip and reapply the driver id
+            // NOte that this will strip the bucketname out (which s3 uses) but the
+            // S3IOStorage class knows to look at re-insert it
+            return id.substring(0, id.indexOf(SEPARATOR) + 3) + path
+                    + id.substring(id.lastIndexOf('/') + 1);
+        }
+        return path + id.substring(id.lastIndexOf('/') + 1);
+    }
+    
+    public static String getDriverType(String driverId) {
+    	if(driverId.isEmpty() || driverId.equals("tmp")) {
+    		return "tmp";
+    	}
+    	return StorageIO.getConfigParamForDriver(driverId, StorageIO.TYPE, "Undefined");
+    }
+    
+    //This 
+    public static String getDriverPrefix(String driverId) throws IOException {
+        if(driverId.isEmpty() || driverId.equals("tmp")) {
+            return "tmp" + SEPARATOR;
+        }
+        String storageType = StorageIO.getConfigParamForDriver(driverId, StorageIO.TYPE, "Undefined");
+        switch(storageType) {
+        case FILE:
+            return FileAccessIO.getDriverPrefix(driverId);
+        case S3:
+            return S3AccessIO.getDriverPrefix(driverId);
+        case SWIFT:
+            return SwiftAccessIO.getDriverPrefix(driverId);
+        default:
+            logger.warning("Could not find storage driver for id: " + driverId);
+            throw new IOException("getDriverPrefix: Unsupported storage method.");
         }
+        
 
-        throw new IOException("getDirectStorageIO: Unsupported storage method.");
     }
 
     // createDataAccessObject() methods create a *new*, empty DataAccess objects,
     // for saving new, not yet saved datafiles.
     public static <T extends DvObject> StorageIO<T> createNewStorageIO(T dvObject, String storageTag) throws IOException {
-
-        return createNewStorageIO(dvObject, storageTag, DEFAULT_STORAGE_DRIVER_IDENTIFIER);
+        if (dvObject == null
+        		|| dvObject.getDataverseContext()==null
+                || storageTag == null
+                || storageTag.isEmpty()) {
+            throw new IOException("getDataAccessObject: null or invalid datafile.");
+        }
+                
+        if (dvObject instanceof Dataset) {
+            return createNewStorageIO(dvObject, storageTag, ((Dataset)dvObject).getEffectiveStorageDriverId());
+        } 
+        // it's a DataFile:
+        return createNewStorageIO(dvObject, storageTag, dvObject.getOwner().getEffectiveStorageDriverId());
     }
 
-    public static <T extends DvObject> StorageIO<T> createNewStorageIO(T dvObject, String storageTag, String driverIdentifier) throws IOException {
+    public static <T extends DvObject> StorageIO<T> createNewStorageIO(T dvObject, String storageTag, String storageDriverId) throws IOException {
         if (dvObject == null
                 || storageTag == null
-            || storageTag.isEmpty()) {
+                || storageTag.isEmpty()) {
             throw new IOException("getDataAccessObject: null or invalid datafile.");
         }
+        
+        /* Prior versions sometimes called createNewStorageIO(object, "placeholder") with an existing object to get a ~clone for use in storing/reading Aux files
+         * Since PR #6488 for multi-store - this can return a clone using a different store than the original (e.g. if the default store changes) which causes errors
+         * This if will catch any cases where that's attempted.
+         */
+        // Tests send objects with no storageIdentifier set
+        if((dvObject.getStorageIdentifier()!=null) && dvObject.getStorageIdentifier().contains(SEPARATOR)) {
+        	throw new IOException("Attempt to create new StorageIO for already stored object: " + dvObject.getStorageIdentifier());
+        }
 
         StorageIO<T> storageIO = null;
-
+        
         dvObject.setStorageIdentifier(storageTag);
 
-        if (driverIdentifier == null) {
-            driverIdentifier = "file";
+        if (StringUtils.isBlank(storageDriverId)) {
+        	storageDriverId = DEFAULT_STORAGE_DRIVER_IDENTIFIER;
+        }
+        String storageType = getDriverType(storageDriverId);
+        switch(storageType) {
+        case FILE:
+        	storageIO = new FileAccessIO<>(dvObject, null, storageDriverId);
+        	break;
+        case SWIFT:
+        	storageIO = new SwiftAccessIO<>(dvObject, null, storageDriverId);
+        	break;
+        case S3:
+        	storageIO = new S3AccessIO<>(dvObject, null, storageDriverId);
+        	break;
+        case REMOTE:
+        case GLOBUS:
+            storageIO = createNewStorageIO(dvObject, storageTag, AbstractRemoteOverlayAccessIO.getBaseStoreIdFor(storageDriverId)) ;
+            break;
+        default:
+        	logger.warning("Could not find storage driver for: " + storageTag);
+        	throw new IOException("createDataAccessObject: Unsupported storage method " + storageDriverId);
+        }
+        if (storageIO == null) {
+            logger.warning("Could not find storage driver for: " + storageTag);
+            throw new IOException("createDataAccessObject: Unsupported storage method " + storageDriverId);
         }
+        // Note: All storageIO classes must assure that dvObject instances' storageIdentifiers are prepended with 
+        // the <driverId>:// + any additional storageIO type information required (e.g. the bucketname for s3/swift)
+        // This currently happens when the storageIO is opened for write access
+        storageIO.open(DataAccessOption.WRITE_ACCESS);
+        return storageIO;
+    }
+
+    static HashMap<String, String> drivers = null;
+    
+    public static String getStorageDriverId(String driverLabel) {
+    	if (drivers==null) {
+    		populateDrivers();
+    	}
+    	if(!StringUtils.isBlank(driverLabel) && drivers.containsKey(driverLabel)) {
+    		return drivers.get(driverLabel);
+    	} 
+    	return DEFAULT_STORAGE_DRIVER_IDENTIFIER;
+    }
+
+    public static HashMap<String, String> getStorageDriverLabels() {
+    	if (drivers==null) {
+    		populateDrivers();
+    	}
+    	return drivers;
+    }
+
+    private static void populateDrivers() {
+    	drivers = new HashMap<String, String>();
+    	Properties p = System.getProperties();
+    	for(String property: p.stringPropertyNames()) {
+    		if(property.startsWith("dataverse.files.") && property.endsWith(".label")) {
+    			String driverId = property.substring(16); // "dataverse.files.".length
+    			driverId=driverId.substring(0,driverId.indexOf('.'));
+    			logger.info("Found Storage Driver: " + driverId + " for " + p.get(property).toString());
+    			drivers.put(p.get(property).toString(), driverId);
+    		}
+    	}
+    }
+
+    public static String getStorageDriverLabelFor(String storageDriverId) {
+    	String label = null;
+    	if(!StringUtils.isEmpty(storageDriverId)) {
+    		if (drivers==null) {
+    			populateDrivers();
+    		}
 
-        if (driverIdentifier.equals("file")) {
-            storageIO = new FileAccessIO<>(dvObject, null);
-        } else if (driverIdentifier.equals("swift")) {
-            storageIO = new SwiftAccessIO<>(dvObject, null);
-        } else if (driverIdentifier.equals("s3")) {
-            storageIO = new S3AccessIO<>(dvObject, null);
+    		if(drivers.containsValue(storageDriverId)) {
+    			for(String key: drivers.keySet()) {
+    				if(drivers.get(key).equals(storageDriverId)) {
+    					label = key;
+    					break;
+    				}
+    			}
+    		}
+    	}
+    	return label;
+    }
+    
+    /**
+     * This method checks to see if an overlay store is being used and, if so,
+     * defines a base storage identifier for use with auxiliary files, and adds it
+     * into the returned value
+     * 
+     * @param newStorageIdentifier
+     * @return - the newStorageIdentifier (for file, S3, swift stores) - the
+     *         newStorageIdentifier with a new base store identifier inserted (for
+     *         an overlay store)
+     */
+    public static String expandStorageIdentifierIfNeeded(String newStorageIdentifier) {
+        logger.fine("found: " + newStorageIdentifier);
+        String driverType = DataAccess
+                .getDriverType(newStorageIdentifier.substring(0, newStorageIdentifier.indexOf(":")));
+        logger.fine("drivertype: " + driverType);
+        if (driverType.equals(REMOTE)) {
+            // Add a generated identifier for the aux files
+            logger.fine("in: " + newStorageIdentifier);
+            int lastColon = newStorageIdentifier.lastIndexOf(SEPARATOR);
+            newStorageIdentifier = newStorageIdentifier.substring(0, lastColon + 3)
+                    + FileUtil.generateStorageIdentifier() + "//" + newStorageIdentifier.substring(lastColon + 3);
+            logger.fine("out: " + newStorageIdentifier);
+        }
+        return newStorageIdentifier;
+    }
+    
+    public static boolean uploadToDatasetAllowed(Dataset d, String storageIdentifier) {
+        boolean allowed=true;
+        String driverId = DataAccess.getStorageDriverFromIdentifier(storageIdentifier);
+        String effectiveDriverId = d.getEffectiveStorageDriverId();
+        if(!effectiveDriverId.equals(driverId)) {
+            //Not allowed unless this is a remote store and you're uploading to the basestore
+            if(getDriverType(driverId).equals(REMOTE)) {
+                String baseDriverId = RemoteOverlayAccessIO.getBaseStoreIdFor(driverId);
+                if(!effectiveDriverId.equals(baseDriverId)) {
+                    //Not allowed - wrong base driver
+                    allowed = false;
+                } else {
+                    //Only allowed if baseStore allows it
+                    allowed = StorageIO.isDirectUploadEnabled(baseDriverId);
+                }
+            } else {
+                //Not allowed - wrong main driver
+                allowed=false;
+            }
         } else {
-            throw new IOException("createDataAccessObject: Unsupported storage method " + driverIdentifier);
+            //Only allowed if main store allows it
+            allowed = StorageIO.isDirectUploadEnabled(driverId);
         }
+        return allowed;
+    }
 
-        storageIO.open(DataAccessOption.WRITE_ACCESS);
-        return storageIO;
+
+    //Method to verify that a submitted storageIdentifier (i.e. in direct/remote uploads) is consistent with the store's configuration.
+    public static boolean isValidDirectStorageIdentifier(String storageId) {
+        String driverId = DataAccess.getStorageDriverFromIdentifier(storageId);
+        String storageType = DataAccess.getDriverType(driverId);
+        if (storageType.equals("tmp") || storageType.equals("Undefined")) {
+            return false;
+        }
+        switch (storageType) {
+        case FILE:
+            return FileAccessIO.isValidIdentifier(driverId, storageId);
+        case SWIFT:
+            return SwiftAccessIO.isValidIdentifier(driverId, storageId);
+        case S3:
+            return S3AccessIO.isValidIdentifier(driverId, storageId);
+        case REMOTE:
+            return RemoteOverlayAccessIO.isValidIdentifier(driverId, storageId);
+        case GLOBUS:
+            return GlobusOverlayAccessIO.isValidIdentifier(driverId, storageId);
+        default:
+            logger.warning("Request to validate for storage driver: " + driverId);
+        }
+        return false;
     }
 
 
+
+    public static String getNewStorageIdentifier(String driverId) {
+        String storageType = DataAccess.getDriverType(driverId);
+        if (storageType.equals("tmp") || storageType.equals("Undefined")) {
+            return null;
+        }
+        switch (storageType) {
+        case FILE:
+            return FileAccessIO.getNewIdentifier(driverId);
+        case SWIFT:
+            return SwiftAccessIO.getNewIdentifier(driverId);
+        case S3:
+            return S3AccessIO.getNewIdentifier(driverId);
+        case REMOTE:
+            return RemoteOverlayAccessIO.getNewIdentifier(driverId);
+        case GLOBUS:
+            return GlobusOverlayAccessIO.getNewIdentifier(driverId);
+        default:
+            logger.warning("Request to validate for storage driver: " + driverId);
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java
index a627df0dbb3..2c60b51a525 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java
@@ -26,6 +26,9 @@
 import java.io.IOException;
 
 import java.util.logging.Logger;
+
+import org.apache.commons.io.IOUtils;
+
 import java.util.List; 
 import java.util.Map;
 import java.util.HashMap;
@@ -171,7 +174,9 @@ public static File downloadFromStorageIO(StorageIO<DataFile> storageIO) {
         } else {
             try {
                 storageIO.open();
-                return downloadFromByteChannel(storageIO.getReadChannel(), storageIO.getSize());
+                try (ReadableByteChannel tabFileChannel = storageIO.getReadChannel()) {
+                  return downloadFromByteChannel(tabFileChannel, storageIO.getSize());
+                }
             } catch (IOException ex) {
                 logger.warning("caught IOException trying to store tabular file " + storageIO.getDataFile().getStorageIdentifier() + " as a temp file.");
             }
@@ -184,12 +189,13 @@ private static File downloadFromByteChannel(ReadableByteChannel tabFileChannel,
             logger.fine("opening datafFileIO for the source tabular file...");
             
             File tabFile = File.createTempFile("tempTabFile", ".tmp");
-            FileChannel tempFileChannel = new FileOutputStream(tabFile).getChannel();
-            tempFileChannel.transferFrom(tabFileChannel, 0, size);
-            return tabFile;
+            try (FileChannel tempFileChannel = new FileOutputStream(tabFile).getChannel();) {
+              tempFileChannel.transferFrom(tabFileChannel, 0, size);
+              return tabFile;
+            }
         } catch (IOException ioex) {
             logger.warning("caught IOException trying to store tabular file as a temp file.");
-        }
+        } 
         return null;
     }
 
@@ -237,8 +243,10 @@ private static File runFormatConversion (DataFile file, File tabFile, String for
                 try {
                     StorageIO<DataFile> storageIO = file.getStorageIO();
                     long size = storageIO.getAuxObjectSize("orig");
-                    File origFile = downloadFromByteChannel((ReadableByteChannel) storageIO.openAuxChannel("orig"), size);
-                    resultInfo = dfs.directConvert(origFile, origFormat);
+                    try (ReadableByteChannel origChannel = (ReadableByteChannel) storageIO.openAuxChannel("orig")) {
+                      File origFile = downloadFromByteChannel(origChannel, size);
+                      resultInfo = dfs.directConvert(origFile, origFormat);
+                    }
                 } catch (IOException ex) {
                     ex.printStackTrace();
                     return null;
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataFileZipper.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataFileZipper.java
index 15ff7b5ac99..68553f7f5c8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataFileZipper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataFileZipper.java
@@ -39,7 +39,6 @@
  * @author Leonid Andreev
  */
 public class DataFileZipper {
-    public static long DEFAULT_ZIPFILE_LIMIT = 100 * 1024 * 1024; // 100MB
     
     private static final Logger logger = Logger.getLogger(DataFileZipper.class.getCanonicalName());
     private static final String MANIFEST_FILE_NAME = "MANIFEST.TXT";
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java
index 3afab58c1ce..26637ec5742 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java
@@ -29,10 +29,13 @@
 import java.io.FileOutputStream;
 // NIO imports: 
 import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
-
+import java.util.function.Predicate;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 // Dataverse imports:
 import edu.harvard.iq.dataverse.DataFile;
@@ -49,25 +52,28 @@
 
 public class FileAccessIO<T extends DvObject> extends StorageIO<T> {
 
-    public FileAccessIO () {
-        this((T)null);
-    }
+    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.dataaccess.FileAccessIO");
+    public static final String DIRECTORY = "directory";
 
-    public FileAccessIO(T dvObject) {
-        this (dvObject, null);
-        
+
+    public FileAccessIO() {
+        // Constructor only for testing
+        super(null, null, null);
     }
 
-    public FileAccessIO(T dvObject, DataAccessRequest req) {
+    public FileAccessIO(T dvObject, DataAccessRequest req, String driverId ) {
 
-        super(dvObject, req);
+        super(dvObject, req, driverId);
 
         this.setIsLocalFile(true);
     }
     
     // "Direct" File Access IO, opened on a physical file not associated with
     // a specific DvObject
-    public FileAccessIO(String storageLocation) {
+    public FileAccessIO(String storageLocation, String driverId) {
+        super(storageLocation, driverId);
+        this.setIsLocalFile(true);
+        logger.fine("Storage path: " + storageLocation);
         physicalPath = Paths.get(storageLocation);
     }
     
@@ -90,12 +96,12 @@ public void open (DataAccessOption... options) throws IOException {
         
         if (dvObject instanceof DataFile) {
             dataFile = this.getDataFile();
-
+            String storageIdentifier = dataFile.getStorageIdentifier();
             if (req != null && req.getParameter("noVarHeader") != null) {
                 this.setNoVarHeader(true);
             }
 
-            if (dataFile.getStorageIdentifier() == null || "".equals(dataFile.getStorageIdentifier())) {
+            if (storageIdentifier == null || "".equals(storageIdentifier)) {
                 throw new IOException("Data Access: No local storage identifier defined for this datafile.");
             }
 
@@ -108,13 +114,14 @@ public void open (DataAccessOption... options) throws IOException {
 
                 this.setInputStream(fin);
                 setChannel(fin.getChannel());
-                this.setSize(getLocalFileSize());
+                this.setSize(retrieveSizeFromMedia());
 
                 if (dataFile.getContentType() != null
                         && dataFile.getContentType().equals("text/tab-separated-values")
                         && dataFile.isTabularData()
                         && dataFile.getDataTable() != null
-                        && (!this.noVarHeader())) {
+                        && (!this.noVarHeader())
+                        && (!dataFile.getDataTable().isStoredWithVariableHeader())) {
 
                     List<DataVariable> datavariables = dataFile.getDataTable().getDataVariables();
                     String varHeaderLine = generateVariableHeader(datavariables);
@@ -122,8 +129,9 @@ public void open (DataAccessOption... options) throws IOException {
                 }
             } else if (isWriteAccess) {
                 // Creates a new directory as needed for a dataset.
-                if (dataFile.getOwner().getFileSystemDirectory() != null && !Files.exists(dataFile.getOwner().getFileSystemDirectory())) {
-                Files.createDirectories(dataFile.getOwner().getFileSystemDirectory());
+                Path datasetPath=Paths.get(getDatasetDirectory());
+                if (datasetPath != null && !Files.exists(datasetPath)) {
+                    Files.createDirectories(datasetPath);
                 }
                 FileOutputStream fout = openLocalFileAsOutputStream();
 
@@ -133,6 +141,9 @@ public void open (DataAccessOption... options) throws IOException {
 
                 this.setOutputStream(fout);
                 setChannel(fout.getChannel());
+                if (!storageIdentifier.startsWith(this.driverId + DataAccess.SEPARATOR)) {
+                    dvObject.setStorageIdentifier(this.driverId + DataAccess.SEPARATOR + storageIdentifier);
+                }
             }
 
             this.setMimeType(dataFile.getContentType());
@@ -145,7 +156,6 @@ public void open (DataAccessOption... options) throws IOException {
         } else if (dvObject instanceof Dataset) {
             //This case is for uploading a dataset related auxiliary file 
             //e.g. image thumbnails/metadata exports
-            //TODO: do we really need to do anything here? should we return the dataset directory?
             dataset = this.getDataset();
             if (isReadAccess) {
                 //TODO: Not necessary for dataset as there is no files associated with this
@@ -158,16 +168,22 @@ public void open (DataAccessOption... options) throws IOException {
 //                this.setInputStream(fin);  
               } else if (isWriteAccess) {
                 //this checks whether a directory for a dataset exists 
-                if (dataset.getFileSystemDirectory() != null && !Files.exists(dataset.getFileSystemDirectory())) {
-                    Files.createDirectories(dataset.getFileSystemDirectory());
-                }
-                dataset.setStorageIdentifier("file://"+dataset.getAuthority()+"/"+dataset.getIdentifier());
+                  Path datasetPath=Paths.get(getDatasetDirectory());
+                  if (datasetPath != null && !Files.exists(datasetPath)) {
+                      Files.createDirectories(datasetPath);
+                  }
+                dataset.setStorageIdentifier(this.driverId + DataAccess.SEPARATOR + dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage());
             }
 
         } else if (dvObject instanceof Dataverse) {
             dataverse = this.getDataverse();
         } else {
-            throw new IOException("Data Access: Invalid DvObject type");
+            logger.fine("Overlay case: FileAccessIO open for : " + physicalPath.toString());
+            Path datasetPath= physicalPath.getParent();
+            if (datasetPath != null && !Files.exists(datasetPath)) {
+                Files.createDirectories(datasetPath);
+            }
+            //throw new IOException("Data Access: Invalid DvObject type");
         }
         // This "status" is a leftover from 3.6; we don't have a use for it 
         // in 4.0 yet; and we may not need it at all. 
@@ -226,10 +242,19 @@ public void saveInputStream(InputStream inputStream) throws IOException {
     
     @Override
     public Channel openAuxChannel(String auxItemTag, DataAccessOption... options) throws IOException {
-
+      
         Path auxPath = getAuxObjectAsPath(auxItemTag);
 
         if (isWriteAccessRequested(options)) {
+            if (((dvObject instanceof Dataset) || isDirectAccess()) && !this.canWrite()) {
+                // If this is a dataset-level auxilary file (a cached metadata export,
+                // dataset logo, etc.) there's a chance that no "real" files 
+                // have been saved for this dataset yet, and thus the filesystem 
+                // directory does not exist yet. Let's force a proper .open() on 
+                // this StorageIO, that will ensure it is created:
+                open(DataAccessOption.WRITE_ACCESS);
+            }
+
             FileOutputStream auxOut = new FileOutputStream(auxPath.toFile());
 
             if (auxOut == null) {
@@ -282,15 +307,18 @@ public Path getAuxObjectAsPath(String auxItemTag) throws IOException {
         if (auxItemTag == null || "".equals(auxItemTag)) {
             throw new IOException("Null or invalid Auxiliary Object Tag.");
         }
-
+        if(isDirectAccess()) {
+            //includes overlay case
+            return Paths.get(physicalPath.toString() + "." + auxItemTag);
+        }
         String datasetDirectory = getDatasetDirectory();
-
+        
         if (dvObject.getStorageIdentifier() == null || "".equals(dvObject.getStorageIdentifier())) {
             throw new IOException("Data Access: No local storage identifier defined for this datafile.");
         }
         Path auxPath = null;
         if (dvObject instanceof DataFile) {
-            auxPath = Paths.get(datasetDirectory, dvObject.getStorageIdentifier() + "." + auxItemTag);
+            auxPath = Paths.get(datasetDirectory, stripDriverId(dvObject.getStorageIdentifier()) + "." + auxItemTag);
         } else if (dvObject instanceof Dataset) {
             auxPath = Paths.get(datasetDirectory, auxItemTag);
         } else if (dvObject instanceof Dataverse) {
@@ -305,6 +333,7 @@ public Path getAuxObjectAsPath(String auxItemTag) throws IOException {
         return auxPath;
     }
     
+
     @Override 
     public void backupAsAux(String auxItemTag) throws IOException {
         Path auxPath = getAuxObjectAsPath(auxItemTag);
@@ -321,6 +350,10 @@ public void revertBackupAsAux(String auxItemTag) throws IOException {
     // this method copies a local filesystem Path into this DataAccess Auxiliary location:
     @Override
     public void savePathAsAux(Path fileSystemPath, String auxItemTag) throws IOException {
+        if (dvObject instanceof Dataset && !this.canWrite()) {
+            // see the comment in openAuxChannel()
+            open(DataAccessOption.WRITE_ACCESS);
+        }
         // quick Files.copy method: 
         try {
             Path auxPath = getAuxObjectAsPath(auxItemTag);
@@ -336,7 +369,10 @@ public void saveInputStreamAsAux(InputStream inputStream, String auxItemTag, Lon
     
     @Override
     public void saveInputStreamAsAux(InputStream inputStream, String auxItemTag) throws IOException {
-        
+        if (dvObject instanceof Dataset && !this.canWrite()) {
+            // see the comment in openAuxChannel()
+            open(DataAccessOption.WRITE_ACCESS);
+        }
         // Since this is a local fileystem file, we can use the
         // quick NIO Files.copy method: 
 
@@ -369,7 +405,7 @@ public void saveInputStreamAsAux(InputStream inputStream, String auxItemTag) thr
         }
         
         List<String> cachedFileNames = new ArrayList<>();
-        String baseName = this.getDataFile().getStorageIdentifier() + ".";
+        String baseName = stripDriverId(this.getDataFile().getStorageIdentifier()) + ".";
         for (Path auxPath : cachedFiles) {
             cachedFileNames.add(auxPath.getFileName().toString().substring(baseName.length()));
         }
@@ -396,17 +432,17 @@ public void deleteAllAuxObjects() throws IOException {
         }
         
     }
-    
-    
+
+
     @Override
     public String getStorageLocation() {
         // For a local file, the "storage location" is a complete, absolute
-        // filesystem path, with the "file://" prefix:
+        // filesystem path, with the "<driverId>://" prefix:
         
         try {
             Path testPath = getFileSystemPath();
             if (testPath != null) {
-                return "file://" + testPath.toString();
+                return this.driverId + DataAccess.SEPARATOR + testPath.toString();
             }
         } catch (IOException ioex) {
             // just return null, below:
@@ -427,7 +463,7 @@ public Path getFileSystemPath() throws IOException {
             throw new IOException("Data Access: No local storage identifier defined for this datafile.");
         }
 
-        physicalPath = Paths.get(datasetDirectory, dvObject.getStorageIdentifier());
+        physicalPath = Paths.get(datasetDirectory, stripDriverId(dvObject.getStorageIdentifier()));
         return physicalPath;
 
     }
@@ -470,21 +506,6 @@ public void delete() throws IOException {
     
     // Auxilary helper methods, filesystem access-specific:
     
-    private long getLocalFileSize () {
-        long fileSize = -1;
-
-        try {
-            File testFile = getFileSystemPath().toFile();
-            if (testFile != null) {
-                fileSize = testFile.length();
-            }
-            return fileSize;
-        } catch (IOException ex) {
-            return -1;
-        }
-
-    }
-
     public FileInputStream openLocalFileAsInputStream () {
         FileInputStream in;
 
@@ -526,24 +547,29 @@ public FileOutputStream openLocalFileAsOutputStream () {
     }
     
     private String getDatasetDirectory() throws IOException {
-        if (dvObject == null) {
+        if (isDirectAccess()) {
             throw new IOException("No DvObject defined in the Data Access Object");
         }
-
-        Path datasetDirectoryPath=null;
         
+        String authorityForFS = null;
+        String identifierForFS = null;
         if (dvObject instanceof Dataset) {
-            datasetDirectoryPath = this.getDataset().getFileSystemDirectory();
+            authorityForFS = this.getDataset().getAuthorityForFileStorage();
+            identifierForFS = this.getDataset().getIdentifierForFileStorage();
         } else if (dvObject instanceof DataFile) {
-            datasetDirectoryPath = this.getDataFile().getOwner().getFileSystemDirectory();
+            authorityForFS = this.getDataFile().getOwner().getAuthorityForFileStorage();
+            identifierForFS = this.getDataFile().getOwner().getIdentifierForFileStorage();
         } else if (dvObject instanceof Dataverse) {
             throw new IOException("FileAccessIO: Dataverses are not a supported dvObject");
         }
-            
-        if (datasetDirectoryPath == null) {
+        
+        if (authorityForFS == null || identifierForFS == null) {
             throw new IOException("Could not determine the filesystem directory of the parent dataset.");
         }
-        String datasetDirectory = datasetDirectoryPath.toString();
+        
+        // Determine the final directory tree. As of JDK 16, the first component of the path MUST be non-null
+        // (we check for that via the setting), but also the others make no sense if they are null.
+        String datasetDirectory = Paths.get(getFilesRootDirectory(), authorityForFS, identifierForFS).toString();
 
         if (dvObject.getStorageIdentifier() == null || dvObject.getStorageIdentifier().isEmpty()) {
             throw new IOException("Data Access: No local storage identifier defined for this datafile.");
@@ -552,6 +578,12 @@ private String getDatasetDirectory() throws IOException {
         return datasetDirectory;
     }
     
+    
+    protected String getFilesRootDirectory() {
+        String filesRootDirectory = getConfigParam(DIRECTORY, "/tmp/files");
+        return filesRootDirectory;
+    }
+    
     private List<Path> listCachedFiles() throws IOException {
         List<Path> auxItems = new ArrayList<>();
 
@@ -571,9 +603,9 @@ private List<Path> listCachedFiles() throws IOException {
                 throw new IOException("Null or invalid DataFile in FileAccessIO object.");
             }
         
-            baseName = this.getDataFile().getStorageIdentifier();
+            baseName = stripDriverId(this.getDataFile().getStorageIdentifier());
 
-            datasetDirectoryPath = this.getDataFile().getOwner().getFileSystemDirectory();
+            datasetDirectoryPath = Paths.get(getDatasetDirectory());
         }
 
         if (datasetDirectoryPath == null) {
@@ -612,5 +644,101 @@ public InputStream getAuxFileAsInputStream(String auxItemTag) throws IOException
         }
         return in;
     }
+    private String stripDriverId(String storageIdentifier) {
+        int separatorIndex = storageIdentifier.indexOf(DataAccess.SEPARATOR);
+        if(separatorIndex>0) {
+            return storageIdentifier.substring(separatorIndex + DataAccess.SEPARATOR.length());
+        }
+        return storageIdentifier;
+    }
+    
+    //Confirm inputs are of the form of a relative file path that doesn't contain . or ..
+    protected static boolean isValidIdentifier(String driverId, String storageId) {
+        String pathString = storageId.substring(storageId.lastIndexOf("//") + 2);
+        String basePath = "/tmp/";
+        try {
+            String rawPathString = basePath + pathString;
+            Path normalized = Paths.get(rawPathString).normalize();
+            if(!rawPathString.equals(normalized.toString())) {
+                logger.warning("Non-normalized path in submitted identifier " + storageId);
+                return false;
+            }
+            logger.fine(normalized.getFileName().toString());
+            if (!usesStandardNamePattern(normalized.getFileName().toString())) {
+                logger.warning("Unacceptable file name in submitted identifier: " + storageId);
+                return false;
+            }
+
+        } catch (InvalidPathException ipe) {
+            logger.warning("Invalid Path in submitted identifier " + storageId);
+            return false;
+        }
+        return true;
+    }
+
+    private List<String> listAllFiles() throws IOException {
+        Dataset dataset = this.getDataset();
+        if (dataset == null) {
+            throw new IOException("This FileAccessIO object hasn't been properly initialized.");
+        }
+
+        Path datasetDirectoryPath = Paths.get(dataset.getAuthorityForFileStorage(), dataset.getIdentifierForFileStorage());
+        if (datasetDirectoryPath == null) {
+            throw new IOException("Could not determine the filesystem directory of the dataset.");
+        }
+
+        DirectoryStream<Path> dirStream = Files.newDirectoryStream(Paths.get(this.getFilesRootDirectory(), datasetDirectoryPath.toString()));
+        
+        List<String> res = new ArrayList<>();
+        if (dirStream != null) {
+            for (Path filePath : dirStream) {
+                res.add(filePath.getFileName().toString());
+            }
+            dirStream.close();
+        }
+        
+        return res;
+    }
+    
+    private void deleteFile(String fileName) throws IOException {
+        Dataset dataset = this.getDataset();
+        if (dataset == null) {
+            throw new IOException("This FileAccessIO object hasn't been properly initialized.");
+        }
+
+        Path datasetDirectoryPath = Paths.get(dataset.getAuthorityForFileStorage(), dataset.getIdentifierForFileStorage());
+        if (datasetDirectoryPath == null) {
+            throw new IOException("Could not determine the filesystem directory of the dataset.");
+        }
+
+        Path p = Paths.get(this.getFilesRootDirectory(), datasetDirectoryPath.toString(), fileName);
+        Files.delete(p);
+    }
+
+    @Override
+    public List<String> cleanUp(Predicate<String> filter, boolean dryRun) throws IOException {
+        List<String> toDelete = this.listAllFiles().stream().filter(filter).collect(Collectors.toList());
+        if (dryRun) {
+            return toDelete;
+        }
+        for (String f : toDelete) {
+            this.deleteFile(f);
+        }
+        return toDelete;
+    }
+
+    @Override
+    public long retrieveSizeFromMedia() {
+        long fileSize = -1;
+        try {
+            File testFile = getFileSystemPath().toFile();
+            if (testFile != null) {
+                fileSize = testFile.length();
+            }
+            return fileSize;
+        } catch (IOException ex) {
+            return -1;
+        }
+    }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/GlobusAccessibleStore.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/GlobusAccessibleStore.java
new file mode 100644
index 00000000000..8bed60d8302
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/GlobusAccessibleStore.java
@@ -0,0 +1,78 @@
+package edu.harvard.iq.dataverse.dataaccess;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+
+public interface GlobusAccessibleStore {
+
+    //Whether Dataverse manages access controls for the Globus endpoint or not.
+    static final String MANAGED = "managed";
+    /*
+     * transfer and reference endpoint formats: <globusEndpointId/basePath>
+     * 
+     * REFERENCE_ENDPOINTS_WITH_BASEPATHS - reference endpoints separated by a comma
+     */
+    static final String TRANSFER_ENDPOINT_WITH_BASEPATH = "transfer-endpoint-with-basepath";
+    static final String GLOBUS_TOKEN = "globus-token";
+    
+    public static boolean isDataverseManaged(String driverId) {
+        return Boolean.parseBoolean(StorageIO.getConfigParamForDriver(driverId, MANAGED));
+    }
+    
+    public static String getTransferEnpointWithPath(String driverId) {
+        return StorageIO.getConfigParamForDriver(driverId, GlobusAccessibleStore.TRANSFER_ENDPOINT_WITH_BASEPATH);
+    }
+    
+    public static String getTransferEndpointId(String driverId) {
+        String endpointWithBasePath = StorageIO.getConfigParamForDriver(driverId, TRANSFER_ENDPOINT_WITH_BASEPATH);
+        int pathStart = endpointWithBasePath.indexOf("/");
+        return pathStart > 0 ? endpointWithBasePath.substring(0, pathStart) : endpointWithBasePath;
+    }
+    
+    public static String getTransferPath(String driverId) {
+        String endpointWithBasePath = StorageIO.getConfigParamForDriver(driverId, TRANSFER_ENDPOINT_WITH_BASEPATH);
+        int pathStart = endpointWithBasePath.indexOf("/");
+        return pathStart > 0 ? endpointWithBasePath.substring(pathStart) : "";
+
+    }
+
+    public static JsonArray getReferenceEndpointsWithPaths(String driverId) {
+        String[] endpoints = StorageIO.getConfigParamForDriver(driverId, AbstractRemoteOverlayAccessIO.REFERENCE_ENDPOINTS_WITH_BASEPATHS).split("\\s*,\\s*");
+        JsonArrayBuilder builder = Json.createArrayBuilder();
+        for(int i=0;i<endpoints.length;i++) {
+            builder.add(endpoints[i]);
+        }
+        return builder.build();
+    }
+    
+    public static boolean acceptsGlobusTransfers(String storeId) {
+        if(StorageIO.getConfigParamForDriver(storeId, TRANSFER_ENDPOINT_WITH_BASEPATH) != null) {
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean allowsGlobusReferences(String storeId) {
+        if(StorageIO.getConfigParamForDriver(storeId, AbstractRemoteOverlayAccessIO.REFERENCE_ENDPOINTS_WITH_BASEPATHS) != null) {
+            return true;
+        }
+        return false;
+    }
+    
+    public static String getGlobusToken(String storeId) {
+        return StorageIO.getConfigParamForDriver(storeId, GLOBUS_TOKEN);
+    }
+    
+    public static boolean isGlobusAccessible(String storeId) {
+        String type = StorageIO.getConfigParamForDriver(storeId, StorageIO.TYPE);
+        if (type.equals(DataAccess.GLOBUS)) {
+            return true;
+        } else if (type.equals(DataAccess.S3)
+                && StorageIO.getConfigParamForDriver(storeId, TRANSFER_ENDPOINT_WITH_BASEPATH) != null) {
+            return true;
+        }
+        return false;
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/GlobusOverlayAccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/GlobusOverlayAccessIO.java
new file mode 100644
index 00000000000..89c7306929c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/GlobusOverlayAccessIO.java
@@ -0,0 +1,513 @@
+package edu.harvard.iq.dataverse.dataaccess;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.datavariable.DataVariable;
+import edu.harvard.iq.dataverse.globus.AccessToken;
+import edu.harvard.iq.dataverse.globus.GlobusServiceBean;
+import edu.harvard.iq.dataverse.util.UrlSignerUtil;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Logger;
+
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.util.EntityUtils;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+
+/**
+ * @author qqmyers
+ * 
+ * This class implements three related use cases, all of which leverage the underlying idea of using a base store (as with the Https RemoteOverlay store):
+ *   Managed - where Dataverse has control of the specified Globus endpoint and can set/remove permissions as needed to allow file transfers in/out:
+ *      File/generic endpoint - assumes Dataverse does not have access to the datafile contents
+ *      S3-Connector endpoint - assumes the datafiles are accessible via Globus and via S3 such that Dataverse can access to the datafile contents when needed.
+ *   Remote - where Dataverse references files that remain at remote Globus endpoints (as with the Https RemoteOverlay store) and cannot access to the datafile contents.
+ *   
+ *   Note that Globus endpoints can provide Http URLs to get file contents, so a future enhancement could potentially support datafile contents access in the Managed/File and Remote cases. 
+ *   
+ *    */
+/*
+ * Globus Overlay Driver storageIdentifer format:
+ * 
+ * Remote: StorageIdentifier format:
+ * <globusDriverId>://<baseStorageIdentifier>//<relativePath> 
+ * 
+ * Storage location:
+ * <globusendpointId/basepath>/<relPath> 
+ * 
+ * Internal StorageIdentifier format:
+ * <globusDriverId>://<baseStorageIdentifier> 
+ * 
+ * Storage location:
+ * <globusEndpointId/basepath>/<dataset authority>/<dataset identifier>/<baseStorageIdentifier>
+ * 
+ */
+public class GlobusOverlayAccessIO<T extends DvObject> extends AbstractRemoteOverlayAccessIO<T> implements GlobusAccessibleStore {
+    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.dataaccess.GlobusOverlayAccessIO");
+
+    /*
+     * If this is set to true, the store supports Globus transfer in and
+     * Dataverse/the globus app manage file locations, access controls, deletion,
+     * etc.
+     */
+    private Boolean dataverseManaged = null;
+
+    private String relativeDirectoryPath;
+    
+    private String endpointPath;
+    
+    private String filename;
+
+    private String[] allowedEndpoints;
+    private String endpoint;
+
+    public GlobusOverlayAccessIO(T dvObject, DataAccessRequest req, String driverId) throws IOException {
+        super(dvObject, req, driverId);
+        configureGlobusEndpoints();
+        configureStores(req, driverId, null);
+        logger.fine("Parsing storageidentifier: " + dvObject.getStorageIdentifier());
+        path = dvObject.getStorageIdentifier().substring(dvObject.getStorageIdentifier().lastIndexOf("//") + 2);
+        validatePath(path);
+
+        logger.fine("Relative path: " + path);
+    }
+
+
+    public GlobusOverlayAccessIO(String storageLocation, String driverId) throws IOException {
+        this.driverId = driverId;
+        configureGlobusEndpoints();
+        configureStores(null, driverId, storageLocation);
+        if (isManaged()) {
+            String[] parts = DataAccess.getDriverIdAndStorageLocation(storageLocation);
+            path = parts[1];
+        } else {
+            this.setIsLocalFile(false);
+            path = storageLocation.substring(storageLocation.lastIndexOf("//") + 2);
+            validatePath(path);
+            logger.fine("Referenced path: " + path);
+        }
+    }
+    
+    private boolean isManaged() {
+        if(dataverseManaged==null) {
+            dataverseManaged = GlobusAccessibleStore.isDataverseManaged(this.driverId);
+        }
+        return dataverseManaged;
+    }
+    
+    private String retrieveGlobusAccessToken() {
+        String globusToken = getConfigParam(GlobusAccessibleStore.GLOBUS_TOKEN);
+        
+
+        AccessToken accessToken = GlobusServiceBean.getClientToken(globusToken);
+        return accessToken.getOtherTokens().get(0).getAccessToken();
+    }
+
+    private void parsePath() {
+        int filenameStart = path.lastIndexOf("/") + 1;
+        String endpointWithBasePath = null;
+        if (!isManaged()) {
+            endpointWithBasePath = findMatchingEndpoint(path, allowedEndpoints);
+        } else {
+            endpointWithBasePath = allowedEndpoints[0];
+        }
+        //String endpointWithBasePath = baseEndpointPath.substring(baseEndpointPath.lastIndexOf(DataAccess.SEPARATOR) + 3);
+        int pathStart = endpointWithBasePath.indexOf("/");
+        logger.fine("endpointWithBasePath: " + endpointWithBasePath);
+        endpointPath = "/" + (pathStart > 0 ? endpointWithBasePath.substring(pathStart + 1) : "");
+        logger.fine("endpointPath: " + endpointPath);
+        
+
+        if (isManaged() && (dvObject!=null)) {
+            
+            Dataset ds = null;
+            if (dvObject instanceof Dataset) {
+                ds = (Dataset) dvObject;
+            } else if (dvObject instanceof DataFile) {
+                ds = ((DataFile) dvObject).getOwner();
+            }
+            relativeDirectoryPath = "/" + ds.getAuthority() + "/" + ds.getIdentifier();
+        } else {
+            relativeDirectoryPath = "";
+        }
+        if (filenameStart > 0) {
+            relativeDirectoryPath = relativeDirectoryPath + path.substring(0, filenameStart);
+        }
+        logger.fine("relativeDirectoryPath finally: " + relativeDirectoryPath);
+        filename = path.substring(filenameStart);
+        endpoint = pathStart > 0 ? endpointWithBasePath.substring(0, pathStart) : endpointWithBasePath;
+
+        
+    }
+
+    private static String findMatchingEndpoint(String path, String[] allowedEndpoints) {
+        for(int i=0;i<allowedEndpoints.length;i++) {
+            if (path.startsWith(allowedEndpoints[i])) {
+                return allowedEndpoints[i];
+            }
+        }
+        logger.warning("Could not find matching endpoint for path: " + path);
+        return null;
+    }
+
+    protected void validatePath(String relPath) throws IOException {
+        if (dvObject != null && dvObject.isInstanceofDataFile()) {
+            if (isManaged()) {
+                if (!usesStandardNamePattern(relPath)) {
+                    throw new IOException("Unacceptable identifier pattern in submitted identifier: " + relPath);
+                }
+            } else {
+                try {
+                    String endpoint = findMatchingEndpoint(relPath, allowedEndpoints);
+                    logger.fine(endpoint + "  " + relPath);
+
+                    if (endpoint == null || !Paths.get(endpoint, relPath).normalize().startsWith(endpoint)) {
+                        throw new IOException("storageidentifier doesn't start with one of " + this.driverId
+                                + "'s allowed endpoints");
+                    }
+                } catch (InvalidPathException e) {
+                    throw new IOException("Could not interpret storageidentifier in globus store " + this.driverId);
+                }
+            }
+        }
+    }
+
+    // Call the Globus API to get the file size
+    @Override
+    public long retrieveSizeFromMedia() {
+        parsePath();
+        String globusAccessToken = retrieveGlobusAccessToken();
+        // Construct Globus URL
+        URI absoluteURI = null;
+        try {
+
+            absoluteURI = new URI("https://transfer.api.globusonline.org/v0.10/operation/endpoint/" + endpoint
+                    + "/ls?path=" + endpointPath + relativeDirectoryPath + "&filter=name:" + filename);
+            HttpGet get = new HttpGet(absoluteURI);
+
+            get.addHeader("Authorization", "Bearer " + globusAccessToken);
+            CloseableHttpResponse response = getSharedHttpClient().execute(get, localContext);
+            if (response.getStatusLine().getStatusCode() == 200) {
+                // Get reponse as string
+                String responseString = EntityUtils.toString(response.getEntity());
+                logger.fine("Response from " + get.getURI().toString() + " is: " + responseString);
+                JsonObject responseJson = JsonUtil.getJsonObject(responseString);
+                JsonArray dataArray = responseJson.getJsonArray("DATA");
+                if (dataArray != null && dataArray.size() != 0) {
+                    //File found
+                    return (long) dataArray.getJsonObject(0).getJsonNumber("size").longValueExact();
+                }
+            } else {
+                logger.warning("Response from " + get.getURI().toString() + " was "
+                        + response.getStatusLine().getStatusCode());
+                logger.fine(EntityUtils.toString(response.getEntity()));
+            }
+        } catch (URISyntaxException e) {
+            // Should have been caught in validatePath
+            e.printStackTrace();
+        } catch (ClientProtocolException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return -1;
+    }
+
+    
+    @Override
+    public InputStream getInputStream() throws IOException {
+        //Currently only supported when using an S3 store with the Globus S3Connector.
+        //ToDo: Support when using a managed Globus endpoint that supports http access
+        if(isDataverseAccessible(driverId)) {
+            return baseStore.getInputStream();
+        } else {
+            return null;
+        }
+    }
+    
+    @Override
+    public void delete() throws IOException {
+
+        parsePath();
+        // Delete is best-effort - we tell the endpoint to delete don't monitor whether
+        // it succeeds
+        if (!isDirectAccess()) {
+            throw new IOException("Direct Access IO must be used to permanently delete stored file objects");
+        }
+        String globusAccessToken = retrieveGlobusAccessToken();
+        // Construct Globus URL
+        URI absoluteURI = null;
+        try {
+
+            absoluteURI = new URI("https://transfer.api.globusonline.org/v0.10/submission_id");
+            HttpGet get = new HttpGet(absoluteURI);
+
+            get.addHeader("Authorization", "Bearer " + globusAccessToken);
+            CloseableHttpResponse response = getSharedHttpClient().execute(get, localContext);
+            if (response.getStatusLine().getStatusCode() == 200) {
+                // Get reponse as string
+                String responseString = EntityUtils.toString(response.getEntity());
+                logger.fine("Response from " + get.getURI().toString() + " is: " + responseString);
+                JsonObject responseJson = JsonUtil.getJsonObject(responseString);
+                String submissionId = responseJson.getString("value");
+                logger.fine("submission_id for delete is: " + submissionId);
+                absoluteURI = new URI("https://transfer.api.globusonline.org/v0.10/delete");
+                HttpPost post = new HttpPost(absoluteURI);
+                JsonObjectBuilder taskJsonBuilder = Json.createObjectBuilder();
+                taskJsonBuilder.add("submission_id", submissionId).add("DATA_TYPE", "delete").add("endpoint", endpoint)
+                        .add("DATA", Json.createArrayBuilder().add(Json.createObjectBuilder().add("DATA_TYPE", "delete_item").add("path",
+                                endpointPath + relativeDirectoryPath + "/" + filename)));
+                post.setHeader("Content-Type", "application/json");
+                post.addHeader("Authorization", "Bearer " + globusAccessToken);
+                String taskJson= JsonUtil.prettyPrint(taskJsonBuilder.build());
+                logger.fine("Sending: " + taskJson);
+                post.setEntity(new StringEntity(taskJson, "utf-8"));
+                CloseableHttpResponse postResponse = getSharedHttpClient().execute(post, localContext);
+                int statusCode=postResponse.getStatusLine().getStatusCode();
+                logger.fine("Response :" + statusCode + ": " +postResponse.getStatusLine().getReasonPhrase());
+                switch (statusCode) {
+                case 202:
+                    // ~Success - delete task was accepted
+                    logger.fine("Globus delete initiated: " + EntityUtils.toString(postResponse.getEntity()));
+                    break;
+                case 200:
+                    // Duplicate - delete task was already accepted
+                    logger.warning("Duplicate Globus delete: " + EntityUtils.toString(postResponse.getEntity()));
+                    break;
+                default:
+                    logger.warning("Response from " + post.getURI().toString() + " was "
+                            + postResponse.getStatusLine().getStatusCode());
+                    logger.fine(EntityUtils.toString(postResponse.getEntity()));
+                }
+
+            } else {
+                logger.warning("Response from " + get.getURI().toString() + " was "
+                        + response.getStatusLine().getStatusCode());
+                logger.fine(EntityUtils.toString(response.getEntity()));
+            }
+        } catch (Exception e) {
+            logger.warning(e.getMessage());
+            throw new IOException("Error deleting: " + endpoint + "/" + path);
+
+        }
+
+        // Delete all the cached aux files as well:
+        deleteAllAuxObjects();
+
+    }
+
+    @Override
+    public String generateTemporaryDownloadUrl(String auxiliaryTag, String auxiliaryType, String auxiliaryFileName)
+            throws IOException {
+//Fix
+        parsePath();
+        // ToDo - support remote auxiliary Files
+        if (auxiliaryTag == null) {
+            String secretKey = getConfigParam(SECRET_KEY);
+            if (secretKey == null) {
+                return endpoint + "/" + path;
+            } else {
+                return UrlSignerUtil.signUrl(endpoint + "/" + path, getUrlExpirationMinutes(), null, "GET", secretKey);
+            }
+        } else {
+            return baseStore.generateTemporaryDownloadUrl(auxiliaryTag, auxiliaryType, auxiliaryFileName);
+        }
+    }
+
+    static boolean isValidIdentifier(String driverId, String storageId) {
+        String baseIdentifier = storageId.substring(storageId.lastIndexOf("//") + 2);
+        try {
+            
+        String[] allowedEndpoints =getAllowedEndpoints(driverId);
+            
+        // Internally managed endpoints require standard name pattern (submitted via
+        // /addFile(s) api)
+        if (GlobusAccessibleStore.isDataverseManaged(driverId)) {
+            boolean hasStandardName = usesStandardNamePattern(baseIdentifier);
+            if (hasStandardName) {
+                return true;
+            } else {
+                logger.warning("Unacceptable identifier pattern in submitted identifier: " + baseIdentifier);
+                return false;
+            }
+        }
+        // Remote endpoints require a valid URI within the baseUrl
+        try {
+            String endpoint = findMatchingEndpoint(baseIdentifier, allowedEndpoints);
+            
+            if(endpoint==null || !Paths.get(endpoint, baseIdentifier).normalize().startsWith(endpoint)) {
+                logger.warning("storageidentifier doesn't start with one of " + driverId + "'s allowed endpoints");
+                return false;
+            }
+        } catch (InvalidPathException e) {
+            logger.warning("Could not interpret storageidentifier in globus store " + driverId);
+            return false;
+        }
+        return true;
+        } catch (IOException e) {
+            return false;
+        }
+        
+    }
+
+    @Override
+    public String getStorageLocation() throws IOException {
+        parsePath();
+        if (isManaged()) {
+            return this.driverId + DataAccess.SEPARATOR + relativeDirectoryPath + "/" + filename;
+        } else {
+            return super.getStorageLocation();
+        }
+    }
+    
+    /** This endpoint configures all the endpoints the store is allowed to reference data from. At present, the RemoteOverlayAccessIO only supports a single endpoint but
+     * the derived GlobusOverlayAccessIO can support multiple endpoints.
+     * @throws IOException
+     */
+    protected void configureGlobusEndpoints() throws IOException {
+        allowedEndpoints = getAllowedEndpoints(this.driverId);
+        logger.fine("Set allowed endpoints: " + Arrays.toString(allowedEndpoints));
+    }
+    
+    private static String[] getAllowedEndpoints(String driverId) throws IOException {
+        String[] allowedEndpoints = null;
+        if (GlobusAccessibleStore.isDataverseManaged(driverId)) {
+            allowedEndpoints = new String[1];
+            allowedEndpoints[0] = getConfigParamForDriver(driverId, TRANSFER_ENDPOINT_WITH_BASEPATH);
+            if (allowedEndpoints[0] == null) {
+                throw new IOException(
+                        "dataverse.files." + driverId + "." + TRANSFER_ENDPOINT_WITH_BASEPATH + " is required");
+            }
+        } else {
+            String rawEndpoints = getConfigParamForDriver(driverId, REFERENCE_ENDPOINTS_WITH_BASEPATHS);
+            if (rawEndpoints != null) {
+                allowedEndpoints = getConfigParamForDriver(driverId, REFERENCE_ENDPOINTS_WITH_BASEPATHS).split("\\s*,\\s*");
+            }
+            if (rawEndpoints == null || allowedEndpoints.length == 0) {
+                throw new IOException("dataverse.files." + driverId + ".base-url is required");
+            }
+        }
+        return allowedEndpoints;
+    }
+
+
+    @Override
+    public void open(DataAccessOption... options) throws IOException {
+
+        baseStore.open(options);
+
+        DataAccessRequest req = this.getRequest();
+
+        if (isWriteAccessRequested(options)) {
+            isWriteAccess = true;
+            isReadAccess = false;
+        } else {
+            isWriteAccess = false;
+            isReadAccess = true;
+        }
+
+        if (dvObject instanceof DataFile) {
+            String storageIdentifier = dvObject.getStorageIdentifier();
+
+            DataFile dataFile = this.getDataFile();
+
+            if (req != null && req.getParameter("noVarHeader") != null) {
+                baseStore.setNoVarHeader(true);
+            }
+
+            if (storageIdentifier == null || "".equals(storageIdentifier)) {
+                throw new FileNotFoundException("Data Access: No local storage identifier defined for this datafile.");
+            }
+
+            logger.fine("StorageIdentifier is: " + storageIdentifier);
+
+            if (isReadAccess) {
+                if (dataFile.getFilesize() >= 0) {
+                    this.setSize(dataFile.getFilesize());
+                } else {
+                    logger.fine("Setting size");
+                    this.setSize(retrieveSizeFromMedia());
+                }
+                // Only applies for the S3 Connector case (where we could have run an ingest)
+                if (dataFile.getContentType() != null 
+                        && dataFile.getContentType().equals("text/tab-separated-values")
+                        && dataFile.isTabularData() 
+                        && dataFile.getDataTable() != null 
+                        && (!this.noVarHeader())
+                        && (!dataFile.getDataTable().isStoredWithVariableHeader())) {
+
+                    List<DataVariable> datavariables = dataFile.getDataTable().getDataVariables();
+                    String varHeaderLine = generateVariableHeader(datavariables);
+                    this.setVarHeader(varHeaderLine);
+                }
+
+            }
+
+            this.setMimeType(dataFile.getContentType());
+
+            try {
+                this.setFileName(dataFile.getFileMetadata().getLabel());
+            } catch (Exception ex) {
+                this.setFileName("unknown");
+            }
+        } else if (dvObject instanceof Dataset) {
+            throw new IOException(
+                    "Data Access: " + this.getClass().getName() + " does not support dvObject type Dataverse yet");
+        } else if (dvObject instanceof Dataverse) {
+            throw new IOException(
+                    "Data Access: " + this.getClass().getName() + " does not support dvObject type Dataverse yet");
+        }
+    }
+
+    @Override
+    public Path getFileSystemPath() throws IOException {
+        throw new UnsupportedDataAccessOperationException(
+                this.getClass().getName() + ": savePath() not implemented in this storage driver.");
+    }
+
+    @Override
+    public void savePath(Path fileSystemPath) throws IOException {
+        throw new UnsupportedDataAccessOperationException(
+                this.getClass().getName() + ": savePath() not implemented in this storage driver.");
+    }
+
+    @Override
+    public void saveInputStream(InputStream inputStream) throws IOException {
+        throw new UnsupportedDataAccessOperationException(
+                this.getClass().getName() + ": savePath() not implemented in this storage driver.");
+    }
+
+    @Override
+    public void saveInputStream(InputStream inputStream, Long filesize) throws IOException {
+        throw new UnsupportedDataAccessOperationException(
+                this.getClass().getName() + ": savePath() not implemented in this storage driver.");
+    }
+    
+    @Override
+    public boolean isDataverseAccessible() {
+        return isDataverseAccessible(this.driverId);
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java
index 81b10567a78..2435e3f778a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java
@@ -35,19 +35,21 @@
 import javax.imageio.stream.ImageOutputStream;
 
 import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DataFileServiceBean;
 import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.channels.Channel;
 import java.nio.channels.Channels;
-import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.logging.Logger;
+
+import jakarta.enterprise.inject.spi.CDI;
 import org.apache.commons.io.IOUtils;
 //import org.primefaces.util.Base64;
 import java.util.Base64;
@@ -58,11 +60,12 @@
  */
 public class ImageThumbConverter {
     public static String THUMBNAIL_SUFFIX = "thumb";
-    public static String WORLDMAP_IMAGE_SUFFIX = "img";
     public static String THUMBNAIL_MIME_TYPE = "image/png";
+    public static String THUMBNAIL_FILE_EXTENSION = ".png";
 
     public static int DEFAULT_CARDIMAGE_SIZE = 48;
     public static int DEFAULT_THUMBNAIL_SIZE = 64;
+    public static int DEFAULT_DATASETLOGO_SIZE = 140;
     public static int DEFAULT_PREVIEW_SIZE = 400;
 
     private static final Logger logger = Logger.getLogger(ImageThumbConverter.class.getCanonicalName());
@@ -107,26 +110,42 @@ private static boolean isThumbnailAvailable(StorageIO<DataFile> storageIO, int s
             return false;
         }
 
+        // check if thumbnail generation failed:
+        if (file.isPreviewImageFail()) {
+            logger.fine("Thumbnail failed to be generated for "+ file.getId());
+            return false;
+        }
+
         if (isThumbnailCached(storageIO, size)) {
+            logger.fine("Found cached thumbnail for " + file.getId());
             return true;
         }
+        return generateThumbnail(file, storageIO, size);
 
-        logger.fine("Checking for thumbnail, file type: " + file.getContentType());
+    }
 
-        if (file.getContentType().substring(0, 6).equalsIgnoreCase("image/")) {
-            return generateImageThumbnail(storageIO, size);
-        } else if (file.getContentType().equalsIgnoreCase("application/pdf")) {
-            return generatePDFThumbnail(storageIO, size);
-        } else if (file.getContentType().equalsIgnoreCase("application/zipped-shapefile") || (file.isTabularData() && file.hasGeospatialTag())) {
-            return generateWorldMapThumbnail(storageIO, size);
+    private static boolean generateThumbnail(DataFile file, StorageIO<DataFile> storageIO, int size) {
+        logger.fine((file.isPreviewImageFail() ? "Not trying" : "Trying") + " to generate thumbnail, file id: " + file.getId());
+        boolean thumbnailGenerated = false;
+        // Don't try to generate if there have been failures:
+        if (!file.isPreviewImageFail()) {
+            if (file.getContentType().substring(0, 6).equalsIgnoreCase("image/")) {
+                thumbnailGenerated = generateImageThumbnail(storageIO, size);
+            } else if (file.getContentType().equalsIgnoreCase("application/pdf")) {
+                thumbnailGenerated = generatePDFThumbnail(storageIO, size);
+            }
+            if (!thumbnailGenerated) {
+                file.setPreviewImageFail(true);
+                file.setPreviewImageAvailable(false);
+                logger.fine("No thumbnail generated for " + file.getId());
+            }
         }
 
-        return false;
-
+        return thumbnailGenerated;
     }
 
     // Note that this method works on ALL file types for which thumbnail 
-    // generation is supported - image/*, pdf, worldmap and geo-tagged tabular; 
+    // generation is supported - image/*, pdf; 
     // not just on images! The type differentiation is handled inside 
     // isThumbnailAvailable(); if the thumbnail is not yet cached, that 
     // method will attempt to generate and cache it. And once it's cached, 
@@ -153,15 +172,30 @@ public static InputStreamIO getImageThumbnailAsInputStream(StorageIO<DataFile> s
                 return null;
             }
             int cachedThumbnailSize = (int) storageIO.getAuxObjectSize(THUMBNAIL_SUFFIX + size);
+            InputStreamIO inputStreamIO = cachedThumbnailSize > 0 ? new InputStreamIO(cachedThumbnailInputStream, cachedThumbnailSize) : null;
 
-            InputStreamIO inputStreamIO = new InputStreamIO(cachedThumbnailInputStream, cachedThumbnailSize);
+            if (inputStreamIO != null) {
+                inputStreamIO.setMimeType(THUMBNAIL_MIME_TYPE);
 
-            inputStreamIO.setMimeType(THUMBNAIL_MIME_TYPE);
-
-            String fileName = storageIO.getFileName();
-            if (fileName != null) {
-                fileName = fileName.replaceAll("\\.[^\\.]*$", ".png");
-                inputStreamIO.setFileName(fileName);
+                String fileName = storageIO.getFileName();
+                if (fileName != null) {
+                    fileName = fileName.replaceAll("\\.[^\\.]*$", THUMBNAIL_FILE_EXTENSION);
+                    inputStreamIO.setFileName(fileName);
+                }
+            } else {
+                if (storageIO.getDataFile() != null && cachedThumbnailSize == 0) {
+                    // We found an older 0 length thumbnail. Newer image uploads will not have this issue.
+                    // Once cleaned up, this thumbnail will no longer have this issue
+                    logger.warning("Cleaning up zero sized thumbnail ID: "+ storageIO.getDataFile().getId());
+                    storageIO.getDataFile().setPreviewImageFail(true);
+                    storageIO.getDataFile().setPreviewImageAvailable(false);
+                    DataFileServiceBean datafileService = CDI.current().select(DataFileServiceBean.class).get();
+                    datafileService.save(storageIO.getDataFile());
+                    
+                    // Now that we have marked this File as a thumbnail failure, 
+                    // no reason not to try and delete this 0-size cache here: 
+                    storageIO.deleteAuxObject(THUMBNAIL_SUFFIX + size);
+                }
             }
             return inputStreamIO;
         } catch (Exception ioex) {
@@ -177,13 +211,14 @@ public static InputStreamIO getImageThumbnailAsInputStream(StorageIO<DataFile> s
 
     private static boolean generatePDFThumbnail(StorageIO<DataFile> storageIO, int size) {
         if (isPdfFileOverSizeLimit(storageIO.getDataFile().getFilesize())) {
-            logger.fine("Image file too large (" + storageIO.getDataFile().getFilesize() + " bytes) - skipping");
+            logger.fine("PDF file too large (" + storageIO.getDataFile().getFilesize() + " bytes) - skipping");
             return false;
         }
 
         // We rely on ImageMagick to convert PDFs; so if it's not installed, 
         // better give up right away: 
         if (!isImageMagickInstalled()) {
+            logger.fine("Couldn't find ImageMagick");
             return false;
         }
 
@@ -195,6 +230,7 @@ private static boolean generatePDFThumbnail(StorageIO<DataFile> storageIO, int s
         // will run the ImageMagick on it, and will save its output in another temp 
         // file, and will save it as an "auxiliary" file via the driver. 
         boolean tempFilesRequired = false;
+        File tempFile = null;
 
         try {
             Path pdfFilePath = storageIO.getFileSystemPath();
@@ -206,34 +242,33 @@ private static boolean generatePDFThumbnail(StorageIO<DataFile> storageIO, int s
             tempFilesRequired = true;
 
         } catch (IOException ioex) {
+            logger.warning(ioex.getMessage());
             // this on the other hand is likely a fatal condition :(
             return false;
         }
 
         if (tempFilesRequired) {
-            ReadableByteChannel pdfFileChannel;
-
+            InputStream inputStream = null;
             try {
                 storageIO.open();
-                //inputStream = storageIO.getInputStream();
-                pdfFileChannel = storageIO.getReadChannel();
+                inputStream = storageIO.getInputStream();
             } catch (Exception ioex) {
                 logger.warning("caught Exception trying to open an input stream for " + storageIO.getDataFile().getStorageIdentifier());
                 return false;
             }
 
-            File tempFile;
-            FileChannel tempFileChannel = null;
+            OutputStream outputStream = null;
             try {
                 tempFile = File.createTempFile("tempFileToRescale", ".tmp");
-                tempFileChannel = new FileOutputStream(tempFile).getChannel();
-
-                tempFileChannel.transferFrom(pdfFileChannel, 0, storageIO.getSize());
+                outputStream = new FileOutputStream(tempFile);
+                //Reads/transfers all bytes from the input stream to the output stream.
+                inputStream.transferTo(outputStream);
             } catch (IOException ioex) {
                 logger.warning("GenerateImageThumb: failed to save pdf bytes in a temporary file.");
                 return false;
             } finally {
-                IOUtils.closeQuietly(tempFileChannel);
+                IOUtils.closeQuietly(inputStream);
+                IOUtils.closeQuietly(outputStream);
             }
             sourcePdfFile = tempFile;
         }
@@ -257,6 +292,12 @@ private static boolean generatePDFThumbnail(StorageIO<DataFile> storageIO, int s
                 logger.warning("failed to save generated pdf thumbnail, as AUX file " + THUMBNAIL_SUFFIX + size + "!");
                 return false;
             }
+            finally {
+                try {
+                    tempFile.delete();
+                }
+                catch (Exception e) {}
+            }
         }
 
         return true;
@@ -271,7 +312,9 @@ private static boolean generateImageThumbnail(StorageIO<DataFile> storageIO, int
 
         try {
             storageIO.open();
-            return generateImageThumbnailFromInputStream(storageIO, size, storageIO.getInputStream());
+            try(InputStream inputStream = storageIO.getInputStream()) {
+              return generateImageThumbnailFromInputStream(storageIO, size, inputStream);
+            }
         } catch (IOException ioex) {
             logger.warning("caught IOException trying to open an input stream for " + storageIO.getDataFile().getStorageIdentifier() + ioex);
             return false;
@@ -279,50 +322,6 @@ private static boolean generateImageThumbnail(StorageIO<DataFile> storageIO, int
         
     }
 
-    /*
-     * Note that the "WorldMapThumbnail" generator does the exact same thing as the 
-     * "regular image" thumbnail generator. 
-     * The only difference is that the image generator uses the main file as 
-     * as the source; and the one for the worldmap uses an auxiliary file 
-     * with the ".img" extension (or the swift, etc. equivalent). This file is 
-     * produced and dropped into the Dataset directory (Swift container, etc.)
-     * the first time the user actually runs WorldMap on the main file. 
-     * Also note that it works the exact same way for tabular-mapped-as-worldmap
-     * files as well. 
-     */
-    private static boolean generateWorldMapThumbnail(StorageIO<DataFile> storageIO, int size) {
-
-        InputStream worldMapImageInputStream = null;
-
-        try {
-            storageIO.open();
-
-            Channel worldMapImageChannel = storageIO.openAuxChannel(WORLDMAP_IMAGE_SUFFIX);
-            if (worldMapImageChannel == null) {
-                logger.warning("Could not open channel for aux ." + WORLDMAP_IMAGE_SUFFIX + " object; (" + size + ")");
-                return false;
-            }
-            worldMapImageInputStream = Channels.newInputStream((ReadableByteChannel) worldMapImageChannel);
-
-            long worldMapImageSize = storageIO.getAuxObjectSize(WORLDMAP_IMAGE_SUFFIX);
-
-            if (isImageOverSizeLimit(worldMapImageSize)) {
-                logger.fine("WorldMap image too large - skipping");
-                worldMapImageInputStream.close();
-                return false;
-            }
-        } catch (FileNotFoundException fnfe) {
-            logger.fine("No .img file for this worldmap file yet; giving up. Original Error: " + fnfe);
-            return false;
-
-        } catch (IOException ioex) {
-            logger.warning("caught IOException trying to open an input stream for worldmap .img file (" + storageIO.getDataFile().getStorageIdentifier() + "). Original Error: " + ioex);
-            return false;
-        }
-
-        return generateImageThumbnailFromInputStream(storageIO, size, worldMapImageInputStream);
-    }
-
     /*
      * This is the actual workhorse method that does the rescaling of the full 
      * size image: 
@@ -330,6 +329,7 @@ private static boolean generateWorldMapThumbnail(StorageIO<DataFile> storageIO,
     private static boolean generateImageThumbnailFromInputStream(StorageIO<DataFile> storageIO, int size, InputStream inputStream) {
 
         BufferedImage fullSizeImage;
+        boolean thumbnailGenerated = false;
 
         try {
             logger.fine("attempting to read the image file with ImageIO.read(InputStream), " + storageIO.getDataFile().getStorageIdentifier());
@@ -382,26 +382,35 @@ private static boolean generateImageThumbnailFromInputStream(StorageIO<DataFile>
         try {
 
             rescaleImage(fullSizeImage, width, height, size, outputStream);
-            /*
-            // while we are at it, let's make sure other size thumbnails are 
-            // generated too:
-            for (int s : (new int[]{DEFAULT_PREVIEW_SIZE, DEFAULT_THUMBNAIL_SIZE, DEFAULT_CARDIMAGE_SIZE})) {
-                if (size != s && !thumbnailFileExists(fileLocation, s)) {
-                    rescaleImage(fullSizeImage, width, height, s, fileLocation);
-                }
-            }
-             */
 
             if (tempFileRequired) {
                 storageIO.savePathAsAux(Paths.get(tempFile.getAbsolutePath()), THUMBNAIL_SUFFIX + size);
             }
+            thumbnailGenerated = true;
 
         } catch (Exception ioex) {
             logger.warning("Failed to rescale and/or save the image: " + ioex.getMessage());
-            return false;
+            thumbnailGenerated = false;
+        }
+        finally {
+            if(tempFileRequired) {
+                try {
+                    tempFile.delete();
+                }
+                catch (Exception e) {}
+            } else if (!thumbnailGenerated) {
+                // if it was a local file - let's make sure we are not leaving 
+                // behind a half-baked, broken image - such as a 0-size file - 
+                // if this was a failure. 
+                try {
+                    storageIO.deleteAuxObject(THUMBNAIL_SUFFIX + size);
+                } catch (IOException ioex) {
+                    logger.fine("Failed attempt to delete the result of a failed thumbnail rescaling; this is most likely ok - for ex., because it was never created in the first place."); 
+                }
+            }
         }
 
-        return true;
+        return thumbnailGenerated;
 
     }
 
@@ -410,7 +419,7 @@ private static boolean isThumbnailCached(StorageIO<DataFile> storageIO, int size
         try {
             cached = storageIO.isAuxObjectCached(THUMBNAIL_SUFFIX + size);
         } catch (Exception ioex) {
-            logger.fine("caught Exception while checking for a cached thumbnail (file " + storageIO.getDataFile().getStorageIdentifier() + ")");
+            logger.fine("caught Exception while checking for a cached thumbnail (file " + storageIO.getDataFile().getStorageIdentifier() + "): " + ioex.getMessage());
             return false;
         }
 
@@ -477,18 +486,8 @@ public static String getImageThumbnailAsBase64(DataFile file, int size) {
         if (cachedThumbnailChannel == null) {
             logger.fine("Null channel for aux object " + THUMBNAIL_SUFFIX + size);
 
-            // try to generate, if not available: 
-            boolean generated = false;
-            if (file.getContentType().substring(0, 6).equalsIgnoreCase("image/")) {
-                generated = generateImageThumbnail(storageIO, size);
-            } else if (file.getContentType().equalsIgnoreCase("application/pdf")) {
-                generated = generatePDFThumbnail(storageIO, size);
-            } else if (file.getContentType().equalsIgnoreCase("application/zipped-shapefile") || (file.isTabularData() && file.hasGeospatialTag())) {
-                generated = generateWorldMapThumbnail(storageIO, size);
-            }
-
-            if (generated) {
-                // try to open again: 
+            // try to generate, if not available and hasn't failed before
+            if(generateThumbnail(file, storageIO, size)) {
                 try {
                     cachedThumbnailChannel = storageIO.openAuxChannel(THUMBNAIL_SUFFIX + size);
                 } catch (Exception ioEx) {
@@ -569,12 +568,10 @@ private static String getImageAsBase64FromInputStream(InputStream inputStream) {
     public static String getImageAsBase64FromFile(File imageFile) {
         InputStream imageInputStream = null;
         try {
-
-            int imageSize = (int) imageFile.length();
-
-            imageInputStream = new FileInputStream(imageFile);
-
-            return getImageAsBase64FromInputStream(imageInputStream); //, imageSize);
+            if (imageFile.length() > 0) {
+                imageInputStream = new FileInputStream(imageFile);
+                return getImageAsBase64FromInputStream(imageInputStream);
+            }
         } catch (IOException ex) {
             // too bad - but not fatal
             logger.warning("getImageAsBase64FromFile: Failed to read data from thumbnail file");
@@ -634,16 +631,12 @@ public static String generateImageThumbnailFromFile(String fileLocation, int siz
 
             logger.fine("image dimensions: " + width + "x" + height);
 
-            thumbFileLocation = rescaleImage(fullSizeImage, width, height, size, fileLocation);
+            return rescaleImage(fullSizeImage, width, height, size, fileLocation);
 
-            if (thumbFileLocation != null) {
-                return thumbFileLocation;
-            }
         } catch (Exception e) {
             logger.warning("Failed to read in an image from " + fileLocation + ": " + e.getMessage());
         }
         return null;
-
     }
 
     /*
@@ -682,10 +675,14 @@ public static String rescaleImage(BufferedImage fullSizeImage, int width, int he
         try {
             rescaleImage(fullSizeImage, width, height, size, outputFileStream);
         } catch (Exception ioex) {
-            logger.warning("caught Exceptiopn trying to create rescaled image " + outputLocation);
-            return null;
+            logger.warning("caught Exception trying to create rescaled image " + outputLocation);
+            outputLocation = null;
         } finally {
             IOUtils.closeQuietly(outputFileStream);
+            // delete the file if the rescaleImage failed
+            if (outputLocation == null) {
+                outputFile.delete();
+            }
         }
 
         return outputLocation;
@@ -741,23 +738,28 @@ private static void rescaleImage(BufferedImage fullSizeImage, int width, int hei
         if (iter.hasNext()) {
             writer = (ImageWriter) iter.next();
         } else {
-            throw new IOException("Failed to locatie ImageWriter plugin for image type PNG");
+            throw new IOException("Failed to locate ImageWriter plugin for image type PNG");
         }
 
-        BufferedImage lowRes = new BufferedImage(thumbWidth, thumbHeight, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g2 = lowRes.createGraphics();
-        g2.drawImage(thumbImage, 0, 0, null);
-        g2.dispose();
-
+        BufferedImage lowRes = null;
         try {
-            ImageOutputStream ios = ImageIO.createImageOutputStream(outputStream);
+            lowRes = new BufferedImage(thumbWidth, thumbHeight, BufferedImage.TYPE_INT_ARGB);
+            Graphics2D g2 = lowRes.createGraphics();
+            g2.drawImage(thumbImage, 0, 0, null);
+            g2.dispose();
+        } catch (Exception ex) {
+            logger.warning("Failed to create LoRes Image: " + ex.getMessage());
+            throw new IOException("Caught exception trying to generate thumbnail: " + ex.getMessage());
+        }
+
+        try (ImageOutputStream ios = ImageIO.createImageOutputStream(outputStream);) {
+            
             writer.setOutput(ios);
 
             // finally, save thumbnail image:
             writer.write(lowRes);
             writer.dispose();
 
-            ios.close();
             thumbImage.flush();
             //fullSizeImage.flush();
             lowRes.flush();
@@ -801,7 +803,7 @@ public static String generatePDFThumbnailFromFile(String fileLocation, int size)
             try {
                 fileSize = new File(fileLocation).length();
             } catch (Exception ex) {
-                // 
+               logger.warning("Can't open file: " + fileLocation);
             }
 
             if (fileSize == 0 || fileSize > sizeLimit) {
@@ -864,6 +866,7 @@ public static String generatePDFThumbnailFromFile(String fileLocation, int size)
 
             // generate the thumbnail for the requested size, *using the already scaled-down
             // 400x400 png version, above*:
+            // (the "exists()" check below appears to be unnecessary - we've already checked early on - ?)
             if (!((new File(thumbFileLocation)).exists())) {
                 thumbFileLocation = runImageMagick(imageMagickExec, previewFileLocation, thumbFileLocation, size, "png");
             }
@@ -970,27 +973,7 @@ private static long getThumbnailSizeLimitPDF() {
     }
 
     private static long getThumbnailSizeLimit(String type) {
-        String option = null;
-        if ("Image".equals(type)) {
-            option = System.getProperty("dataverse.dataAccess.thumbnail.image.limit");
-        } else if ("PDF".equals(type)) {
-            option = System.getProperty("dataverse.dataAccess.thumbnail.pdf.limit");
-        }
-        Long limit = null;
-
-        if (option != null && !option.equals("")) {
-            try {
-                limit = new Long(option);
-            } catch (NumberFormatException nfe) {
-                limit = null;
-            }
-        }
-
-        if (limit != null) {
-            return limit.longValue();
-        }
-
-        return 0;
+        return SystemConfig.getThumbnailSizeLimit(type);
     }
 
     private static boolean isImageMagickInstalled() {
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/InputStreamIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/InputStreamIO.java
index c9796d24b27..de392b74cca 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/InputStreamIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/InputStreamIO.java
@@ -14,6 +14,7 @@
 import java.nio.channels.WritableByteChannel;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.logging.Logger;
 
 /**
@@ -159,5 +160,14 @@ public void revertBackupAsAux(String auxItemTag) throws IOException {
                 throw new UnsupportedDataAccessOperationException("InputStreamIO: this method is not supported in this DataAccess driver.");
     }
 
-  
+    @Override
+    public List<String> cleanUp(Predicate<String> filter, boolean dryRun) throws IOException {
+        throw new UnsupportedDataAccessOperationException("InputStreamIO: tthis method is not supported in this DataAccess driver.");
+    }
+
+    @Override
+    public long retrieveSizeFromMedia() throws UnsupportedDataAccessOperationException {
+        throw new UnsupportedDataAccessOperationException("InputStreamIO: this method is not supported in this DataAccess driver.");
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/Range.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/Range.java
new file mode 100644
index 00000000000..2021219b1a9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/Range.java
@@ -0,0 +1,28 @@
+package edu.harvard.iq.dataverse.dataaccess;
+
+public class Range {
+
+    // Used to set the offset, how far to skip into the file.
+    private final long start;
+    // Used to calculate the length.
+    private final long end;
+
+    public Range(long start, long end) {
+        this.start = start;
+        this.end = end;
+    }
+
+    public long getStart() {
+        return start;
+    }
+
+    public long getEnd() {
+        return end;
+    }
+
+    // Used to determine when to stop reading.
+    public long getLength() {
+        return end - start + 1;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/RemoteOverlayAccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/RemoteOverlayAccessIO.java
new file mode 100644
index 00000000000..bca70259cb7
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/RemoteOverlayAccessIO.java
@@ -0,0 +1,373 @@
+package edu.harvard.iq.dataverse.dataaccess;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.datavariable.DataVariable;
+import edu.harvard.iq.dataverse.util.UrlSignerUtil;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.channels.Channel;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.apache.http.Header;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpHead;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
+
+/**
+ * @author qqmyers
+ */
+/*
+ * Remote Overlay Driver
+ * 
+ * StorageIdentifier format:
+ * <remoteDriverId>://<baseStorageIdentifier>//<relativePath>
+ * 
+ * baseUrl: http(s)://<host(:port)/basePath>
+ */
+public class RemoteOverlayAccessIO<T extends DvObject> extends AbstractRemoteOverlayAccessIO<T> {
+
+    // A single baseUrl of the form http(s)://<host(:port)/basePath> where this store can reference data
+    static final String BASE_URL = "base-url";
+    String baseUrl = null;
+
+    public RemoteOverlayAccessIO() {
+        super();
+    }
+    
+    public RemoteOverlayAccessIO(T dvObject, DataAccessRequest req, String driverId) throws IOException {
+        super(dvObject, req, driverId);
+        this.setIsLocalFile(false);
+        configureRemoteEndpoints();
+        configureStores(req, driverId, null);
+        logger.fine("Parsing storageidentifier: " + dvObject.getStorageIdentifier());
+        path = dvObject.getStorageIdentifier().substring(dvObject.getStorageIdentifier().lastIndexOf("//") + 2);
+        validatePath(path);
+
+        logger.fine("Relative path: " + path);
+    }
+
+    public RemoteOverlayAccessIO(String storageLocation, String driverId) throws IOException {
+        super(null, null, driverId);
+        this.setIsLocalFile(false);
+        configureRemoteEndpoints();
+        configureStores(null, driverId, storageLocation);
+
+        path = storageLocation.substring(storageLocation.lastIndexOf("//") + 2);
+        validatePath(path);
+        logger.fine("Relative path: " + path);
+    }
+
+    protected void validatePath(String relPath) throws IOException {
+        try {
+            URI absoluteURI = new URI(baseUrl + "/" + relPath);
+            if (!absoluteURI.normalize().toString().startsWith(baseUrl)) {
+                throw new IOException("storageidentifier doesn't start with " + this.driverId + "'s base-url");
+            }
+        } catch (URISyntaxException use) {
+            throw new IOException("Could not interpret storageidentifier in remote store " + this.driverId);
+        }
+    }
+
+    @Override
+    public void open(DataAccessOption... options) throws IOException {
+
+        baseStore.open(options);
+
+        DataAccessRequest req = this.getRequest();
+
+        if (isWriteAccessRequested(options)) {
+            isWriteAccess = true;
+            isReadAccess = false;
+        } else {
+            isWriteAccess = false;
+            isReadAccess = true;
+        }
+
+        if (dvObject instanceof DataFile) {
+            String storageIdentifier = dvObject.getStorageIdentifier();
+
+            DataFile dataFile = this.getDataFile();
+
+            if (req != null && req.getParameter("noVarHeader") != null) {
+                baseStore.setNoVarHeader(true);
+            }
+
+            if (storageIdentifier == null || "".equals(storageIdentifier)) {
+                throw new FileNotFoundException("Data Access: No local storage identifier defined for this datafile.");
+            }
+
+            // Fix new DataFiles: DataFiles that have not yet been saved may use this method
+            // when they don't have their storageidentifier in the final form
+            // So we fix it up here. ToDo: refactor so that storageidentifier is generated
+            // by the appropriate StorageIO class and is final from the start.
+            logger.fine("StorageIdentifier is: " + storageIdentifier);
+
+            if (isReadAccess) {
+                if (dataFile.getFilesize() >= 0) {
+                    this.setSize(dataFile.getFilesize());
+                } else {
+                    logger.fine("Setting size");
+                    this.setSize(retrieveSizeFromMedia());
+                }
+                if (dataFile.getContentType() != null 
+                        && dataFile.getContentType().equals("text/tab-separated-values")
+                        && dataFile.isTabularData() 
+                        && dataFile.getDataTable() != null 
+                        && (!this.noVarHeader())
+                        && (!dataFile.getDataTable().isStoredWithVariableHeader())) {
+
+                    List<DataVariable> datavariables = dataFile.getDataTable().getDataVariables();
+                    String varHeaderLine = generateVariableHeader(datavariables);
+                    this.setVarHeader(varHeaderLine);
+                }
+
+            }
+
+            this.setMimeType(dataFile.getContentType());
+
+            try {
+                this.setFileName(dataFile.getFileMetadata().getLabel());
+            } catch (Exception ex) {
+                this.setFileName("unknown");
+            }
+        } else if (dvObject instanceof Dataset) {
+            throw new IOException(
+                    "Data Access: " + this.getClass().getName() + " does not support dvObject type Dataverse yet");
+        } else if (dvObject instanceof Dataverse) {
+            throw new IOException(
+                    "Data Access: " + this.getClass().getName() + " does not support dvObject type Dataverse yet");
+        }
+    }
+
+    @Override
+    public long retrieveSizeFromMedia() {
+        long size = -1;
+        HttpHead head = new HttpHead(baseUrl + "/" + path);
+        try {
+            CloseableHttpResponse response = getSharedHttpClient().execute(head, localContext);
+
+            try {
+                int code = response.getStatusLine().getStatusCode();
+                logger.fine("Response for HEAD: " + code);
+                switch (code) {
+                case 200:
+                    Header[] headers = response.getHeaders(HTTP.CONTENT_LEN);
+                    logger.fine("Num headers: " + headers.length);
+                    String sizeString = response.getHeaders(HTTP.CONTENT_LEN)[0].getValue();
+                    logger.fine("Content-Length: " + sizeString);
+                    size = Long.parseLong(response.getHeaders(HTTP.CONTENT_LEN)[0].getValue());
+                    logger.fine("Found file size: " + size);
+                    break;
+                default:
+                    logger.warning("Response from " + head.getURI().toString() + " was " + code);
+                }
+            } finally {
+                EntityUtils.consume(response.getEntity());
+            }
+        } catch (IOException e) {
+            logger.warning(e.getMessage());
+        }
+        return size;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        if (super.getInputStream() == null) {
+            try {
+                HttpGet get = new HttpGet(generateTemporaryDownloadUrl(null, null, null));
+                CloseableHttpResponse response = getSharedHttpClient().execute(get, localContext);
+
+                int code = response.getStatusLine().getStatusCode();
+                switch (code) {
+                case 200:
+                    setInputStream(response.getEntity().getContent());
+                    break;
+                default:
+                    logger.warning("Response from " + get.getURI().toString() + " was " + code);
+                    throw new IOException("Cannot retrieve: " + baseUrl + "/" + path + " code: " + code);
+                }
+            } catch (Exception e) {
+                logger.warning(e.getMessage());
+                e.printStackTrace();
+                throw new IOException("Error retrieving: " + baseUrl + "/" + path + " " + e.getMessage());
+
+            }
+            setChannel(Channels.newChannel(super.getInputStream()));
+        }
+        return super.getInputStream();
+    }
+
+    @Override
+    public Channel getChannel() throws IOException {
+        if (super.getChannel() == null) {
+            getInputStream();
+        }
+        return channel;
+    }
+
+    @Override
+    public ReadableByteChannel getReadChannel() throws IOException {
+        // Make sure StorageIO.channel variable exists
+        getChannel();
+        return super.getReadChannel();
+    }
+
+    @Override
+    public void delete() throws IOException {
+        // Delete is best-effort - we tell the remote server and it may or may not
+        // implement this call
+        if (!isDirectAccess()) {
+            throw new IOException("Direct Access IO must be used to permanently delete stored file objects");
+        }
+        try {
+            HttpDelete del = new HttpDelete(baseUrl + "/" + path);
+            CloseableHttpResponse response = getSharedHttpClient().execute(del, localContext);
+            try {
+                int code = response.getStatusLine().getStatusCode();
+                switch (code) {
+                case 200:
+                    logger.fine("Sent DELETE for " + baseUrl + "/" + path);
+                default:
+                    logger.fine("Response from DELETE on " + del.getURI().toString() + " was " + code);
+                }
+            } finally {
+                EntityUtils.consume(response.getEntity());
+            }
+        } catch (Exception e) {
+            logger.warning(e.getMessage());
+            throw new IOException("Error deleting: " + baseUrl + "/" + path);
+
+        }
+
+        // Delete all the cached aux files as well:
+        deleteAllAuxObjects();
+
+    }
+
+    @Override
+    public Path getFileSystemPath() throws UnsupportedDataAccessOperationException {
+        throw new UnsupportedDataAccessOperationException(
+                "RemoteOverlayAccessIO: this is a remote DataAccess IO object, it has no local filesystem path associated with it.");
+    }
+
+    @Override
+    public WritableByteChannel getWriteChannel() throws UnsupportedDataAccessOperationException {
+        throw new UnsupportedDataAccessOperationException(
+                "RemoteOverlayAccessIO: there are no write Channels associated with S3 objects.");
+    }
+
+    @Override
+    public OutputStream getOutputStream() throws UnsupportedDataAccessOperationException {
+        throw new UnsupportedDataAccessOperationException(
+                "RemoteOverlayAccessIO: there are no output Streams associated with S3 objects.");
+    }
+
+    @Override
+    public boolean downloadRedirectEnabled() {
+        String optionValue = getConfigParam(StorageIO.DOWNLOAD_REDIRECT);
+        if ("true".equalsIgnoreCase(optionValue)) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean downloadRedirectEnabled(String auxObjectTag) {
+        return baseStore.downloadRedirectEnabled(auxObjectTag);
+    }
+
+    @Override
+    public String generateTemporaryDownloadUrl(String auxiliaryTag, String auxiliaryType, String auxiliaryFileName)
+            throws IOException {
+
+        // ToDo - support remote auxiliary Files
+        if (auxiliaryTag == null) {
+            String secretKey = getConfigParam(SECRET_KEY);
+            if (secretKey == null) {
+                return baseUrl + "/" + path;
+            } else {
+                return UrlSignerUtil.signUrl(baseUrl + "/" + path, getUrlExpirationMinutes(), null, "GET",
+                        secretKey);
+            }
+        } else {
+            return baseStore.generateTemporaryDownloadUrl(auxiliaryTag, auxiliaryType, auxiliaryFileName);
+        }
+    }
+
+
+    /** This endpoint configures all the endpoints the store is allowed to reference data from. At present, the RemoteOverlayAccessIO only supports a single endpoint but
+     * the derived GlobusOverlayAccessIO can support multiple endpoints.
+     * @throws IOException
+     */
+    protected void configureRemoteEndpoints() throws IOException {
+        baseUrl = getConfigParam(BASE_URL);
+        if (baseUrl == null) {
+            //Will accept the first endpoint using the newer setting
+            baseUrl = getConfigParam(REFERENCE_ENDPOINTS_WITH_BASEPATHS).split("\\s*,\\s*")[0];
+            if (baseUrl == null) {
+                throw new IOException("dataverse.files." + this.driverId + ".base-url is required");
+            }
+        }
+        if (baseUrl != null) {
+            try {
+                new URI(baseUrl);
+            } catch (Exception e) {
+                logger.warning(
+                        "Trouble interpreting base-url for store: " + this.driverId + " : " + e.getLocalizedMessage());
+                throw new IOException("Can't interpret base-url as a URI");
+            }
+
+        }
+    }
+
+    @Override
+    public void savePath(Path fileSystemPath) throws IOException {
+        throw new UnsupportedDataAccessOperationException(
+                this.getClass().getName() + ": savePath() not implemented in this storage driver.");
+
+    }
+
+    @Override
+    public void saveInputStream(InputStream inputStream) throws IOException {
+        throw new UnsupportedDataAccessOperationException(
+                this.getClass().getName() + ": saveInputStream() not implemented in this storage driver.");
+
+    }
+
+    @Override
+    public void saveInputStream(InputStream inputStream, Long filesize) throws IOException {
+        throw new UnsupportedDataAccessOperationException(
+                this.getClass().getName() + ": saveInputStream(InputStream, Long) not implemented in this storage driver.");
+
+    }
+
+    static boolean isValidIdentifier(String driverId, String storageId) {
+        String urlPath = storageId.substring(storageId.lastIndexOf("//") + 2);
+        String baseUrl = getConfigParamForDriver(driverId, BASE_URL);
+        try {
+            URI absoluteURI = new URI(baseUrl + "/" + urlPath);
+            if (!absoluteURI.normalize().toString().startsWith(baseUrl)) {
+                logger.warning("storageidentifier doesn't start with " + driverId + "'s base-url: " + storageId);
+                return false;
+            }
+        } catch (URISyntaxException use) {
+            logger.warning("Could not interpret storageidentifier in remote store " + driverId + " : " + storageId);
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
index 6918b4ffc08..cb5175bd354 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
@@ -1,51 +1,81 @@
 package edu.harvard.iq.dataverse.dataaccess;
 
-import com.amazonaws.AmazonClientException;
-import com.amazonaws.HttpMethod;
-import com.amazonaws.SdkClientException;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.amazonaws.services.s3.model.CopyObjectRequest;
-import com.amazonaws.services.s3.model.DeleteObjectRequest;
-import com.amazonaws.services.s3.model.DeleteObjectsRequest;
-import com.amazonaws.services.s3.model.DeleteObjectsRequest.KeyVersion;
-import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
-import com.amazonaws.services.s3.model.GetObjectRequest;
-import com.amazonaws.services.s3.model.ListObjectsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.ResponseHeaderOverrides;
-import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProviderChain;
+import software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.core.async.AsyncRequestBody;
+import software.amazon.awssdk.core.async.AsyncResponseTransformer;
+import software.amazon.awssdk.core.checksums.RequestChecksumCalculation;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient.Builder;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
+import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.model.*;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedUploadPartRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.UploadPartPresignRequest;
+import software.amazon.awssdk.transfer.s3.S3TransferManager;
+import software.amazon.awssdk.transfer.s3.model.UploadFileRequest;
+
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.util.FileUtil;
+import opennlp.tools.util.StringUtil;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URL;
+import java.net.URI;
 import java.net.URLEncoder;
 import java.nio.channels.Channel;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Predicate;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
 import org.apache.commons.io.IOUtils;
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
 
-import javax.validation.constraints.NotNull;
+import jakarta.annotation.Resource;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.validation.constraints.NotNull;
 
 /**
  *
@@ -55,77 +85,84 @@
  * @author Brian Silverstein
  * @param <T> what it stores
  */
-/* 
-    Amazon AWS S3 driver
+/*
+ * Amazon AWS S3 driver
  */
 public class S3AccessIO<T extends DvObject> extends StorageIO<T> {
 
-    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.dataaccess.S3AccessIO");
-
-    public S3AccessIO() {
-        this((T)null);
-    }
-
-    public S3AccessIO(T dvObject) {
-        this(dvObject, null);
-    }
+    @Resource(name = "java:comp/env/concurrent/s3UploadExecutor")
+    private ManagedExecutorService executorService;
 
-    public S3AccessIO(T dvObject, DataAccessRequest req) {
-        super(dvObject, req);
+    private static final Config config = ConfigProvider.getConfig();
+    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.dataaccess.S3AccessIO");
+    static final String URL_EXPIRATION_MINUTES = "url-expiration-minutes";
+    static final String CUSTOM_ENDPOINT_URL = "custom-endpoint-url";
+    static final String PROXY_URL = "proxy-url";
+    static final String BUCKET_NAME = "bucket-name";
+    static final String MIN_PART_SIZE = "min-part-size";
+    static final String CUSTOM_ENDPOINT_REGION = "custom-endpoint-region";
+    static final String PATH_STYLE_ACCESS = "path-style-access";
+    static final String CHUNKED_ENCODING = "chunked-encoding";
+    static final String PROFILE = "profile";
+
+    private boolean mainDriver = true;
+    boolean s3pathStyleAccess = false;
+
+    private static HashMap<String, S3AsyncClient> driverClientMap = new HashMap<String, S3AsyncClient>();
+    private static HashMap<String, S3Presigner> driverPresignerMap = new HashMap<String, S3Presigner>();
+    private static HashMap<String, AwsCredentialsProvider> driverCredentialsProviderMap = new HashMap<String, AwsCredentialsProvider>();
+    private static HashMap<String, S3TransferManager> driverTMMap = new HashMap<String, S3TransferManager>();
+
+    public S3AccessIO(T dvObject, DataAccessRequest req, String driverId) {
+        super(dvObject, req, driverId);
         this.setIsLocalFile(false);
-        
+
         try {
-            // get a standard client, using the standard way of configuration the credentials, etc.
-            AmazonS3ClientBuilder s3CB = AmazonS3ClientBuilder.standard();
-            // if the admin has set a system property (see below) we use this endpoint URL instead of the standard ones.
-            if (!s3CEUrl.isEmpty()) {
-                s3CB.setEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(s3CEUrl, s3CERegion));
+            bucketName = getBucketName(driverId);
+            minPartSize = getMinPartSize(driverId);
+            credentialsProvider = getCredentialsProvider(driverId);
+            s3 = getClient(driverId);
+            tm = getTransferManager(driverId);
+            s3Presigner = getPresigner(driverId);
+            endpoint = getConfigParam(CUSTOM_ENDPOINT_URL, "");
+            proxy = getConfigParam(PROXY_URL, "");
+            if (!StringUtil.isEmpty(proxy) && StringUtil.isEmpty(endpoint)) {
+                logger.severe(driverId + " config error: Must specify a custom-endpoint-url if proxy-url is specified");
             }
-            // some custom S3 implementations require "PathStyleAccess" as they us a path, not a subdomain. default = false
-            s3CB.withPathStyleAccessEnabled(s3pathStyleAccess);
-            // let's build the client :-)
-            this.s3 = s3CB.build();
+
         } catch (Exception e) {
-            throw new AmazonClientException(
-                        "Cannot instantiate a S3 client; check your AWS credentials and region",
-                        e);
+
+            throw S3Exception.builder().message("Cannot instantiate a S3 client; check your AWS credentials and region")
+                    .cause(e).build();
         }
     }
-    
-    public S3AccessIO(String storageLocation) {
-        this((T)null);
-        
+
+    public S3AccessIO(String storageLocation, String driverId) {
+        this(null, null, driverId);
         // TODO: validate the storage location supplied
-        bucketName = storageLocation.substring(0,storageLocation.indexOf('/'));
-        key = storageLocation.substring(storageLocation.indexOf('/')+1);
+        logger.fine("Instantiating with location: " + storageLocation);
+        bucketName = storageLocation.substring(0, storageLocation.indexOf('/'));
+        minPartSize = getMinPartSize(driverId);
+        key = storageLocation.substring(storageLocation.indexOf('/') + 1);
     }
-    
-    public S3AccessIO(T dvObject, DataAccessRequest req, @NotNull AmazonS3 s3client) {
-        super(dvObject, req);
+
+    // Used for tests only
+    public S3AccessIO(T dvObject, DataAccessRequest req, @NotNull S3AsyncClient s3client, String driverId) {
+        super(dvObject, req, driverId);
+        bucketName = getBucketName(driverId);
         this.setIsLocalFile(false);
         this.s3 = s3client;
     }
 
-    public static String S3_IDENTIFIER_PREFIX = "s3";
-    
-    private AmazonS3 s3 = null;
-    /**
-     * Pass in a URL pointing to your S3 compatible storage.
-     * For possible values see https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/client/builder/AwsClientBuilder.EndpointConfiguration.html
-     */
-    private String s3CEUrl = System.getProperty("dataverse.files.s3-custom-endpoint-url", "");
-    /**
-     * Pass in a region to use for SigV4 signing of requests.
-     * Defaults to "dataverse" as it is not relevant for custom S3 implementations.
-     */
-    private String s3CERegion = System.getProperty("dataverse.files.s3-custom-endpoint-region", "dataverse");
-    /**
-     * Pass in a boolean value if path style access should be used within the S3 client.
-     * Anything but case-insensitive "true" will lead to value of false, which is default value, too.
-     */
-    private boolean s3pathStyleAccess = Boolean.parseBoolean(System.getProperty("dataverse.files.s3-path-style-access", "false"));
-    private String bucketName = System.getProperty("dataverse.files.s3-bucket-name");
-    private String key;
+    private S3AsyncClient s3 = null;
+    private S3Presigner s3Presigner = null;
+    private AwsCredentialsProvider credentialsProvider;
+    private S3TransferManager tm = null;
+    private String bucketName = null;
+    private String key = null;
+    private long minPartSize;
+    private String endpoint = null;
+    private String proxy = null;
 
     @Override
     public void open(DataAccessOption... options) throws IOException {
@@ -133,14 +170,6 @@ public void open(DataAccessOption... options) throws IOException {
             throw new IOException("ERROR: s3 not initialised. ");
         }
 
-        try {
-            if (bucketName == null || !s3.doesBucketExist(bucketName)) {
-                throw new IOException("ERROR: S3AccessIO - You must create and configure a bucket before creating datasets.");
-            }
-        } catch (SdkClientException sce) {
-            throw new IOException("ERROR: S3AccessIO - Failed to look up bucket "+bucketName+" (is AWS properly configured?)");
-        }
-
         DataAccessRequest req = this.getRequest();
 
         if (isWriteAccessRequested(options)) {
@@ -164,21 +193,45 @@ public void open(DataAccessOption... options) throws IOException {
                 throw new FileNotFoundException("Data Access: No local storage identifier defined for this datafile.");
             }
 
-            if (isReadAccess) {
-                key = getMainFileKey();
-                ObjectMetadata objectMetadata = null; 
-                try {
-                    objectMetadata = s3.getObjectMetadata(bucketName, key);
-                } catch (SdkClientException sce) {
-                    throw new IOException("Cannot get S3 object " + key + " ("+sce.getMessage()+")");
+            // Fix new DataFiles: DataFiles that have not yet been saved may use this method
+            // when they don't have their storageidentifier in the final
+            // <driverId>://<bucketname>:<id> form
+            // So we fix it up here. ToDo: refactor so that storageidentifier is generated
+            // by the appropriate StorageIO class and is final from the start.
+            String newStorageIdentifier = null;
+            if (storageIdentifier.startsWith(this.driverId + DataAccess.SEPARATOR)) {
+                if (!storageIdentifier.substring((this.driverId + DataAccess.SEPARATOR).length()).contains(":")) {
+                    // Driver id but no bucket
+                    if (bucketName != null) {
+                        newStorageIdentifier = this.driverId + DataAccess.SEPARATOR + bucketName + ":"
+                                + storageIdentifier.substring((this.driverId + DataAccess.SEPARATOR).length());
+                    } else {
+                        throw new IOException("S3AccessIO: DataFile (storage identifier " + storageIdentifier
+                                + ") is not associated with a bucket.");
+                    }
+                } // else we're OK (assumes bucket name in storageidentifier matches the driver's
+                  // bucketname)
+            } else {
+                if (!storageIdentifier.contains(":")) {
+                    // No driver id or bucket
+                    newStorageIdentifier = this.driverId + DataAccess.SEPARATOR + bucketName + ":" + storageIdentifier;
+                } else {
+                    // Just the bucketname
+                    newStorageIdentifier = this.driverId + DataAccess.SEPARATOR + storageIdentifier;
                 }
-                this.setSize(objectMetadata.getContentLength());
+            }
+            if (newStorageIdentifier != null) {
+                // Fixup needed:
+                storageIdentifier = newStorageIdentifier;
+                dvObject.setStorageIdentifier(newStorageIdentifier);
+            }
 
-                if (dataFile.getContentType() != null
-                        && dataFile.getContentType().equals("text/tab-separated-values")
-                        && dataFile.isTabularData()
-                        && dataFile.getDataTable() != null
-                        && (!this.noVarHeader())) {
+            if (isReadAccess) {
+                this.setSize(retrieveSizeFromMedia());
+
+                if (dataFile.getContentType() != null && dataFile.getContentType().equals("text/tab-separated-values")
+                        && dataFile.isTabularData() && dataFile.getDataTable() != null && (!this.noVarHeader())
+                        && (!dataFile.getDataTable().isStoredWithVariableHeader())) {
 
                     List<DataVariable> datavariables = dataFile.getDataTable().getDataVariables();
                     String varHeaderLine = generateVariableHeader(datavariables);
@@ -186,15 +239,9 @@ public void open(DataAccessOption... options) throws IOException {
                 }
 
             } else if (isWriteAccess) {
-                key = dataFile.getOwner().getAuthorityForFileStorage() + "/" + this.getDataFile().getOwner().getIdentifierForFileStorage();
-
-                if (storageIdentifier.startsWith(S3_IDENTIFIER_PREFIX + "://")) {
-                    key += "/" + storageIdentifier.substring(storageIdentifier.lastIndexOf(":") + 1);
-                } else {
-                    key += "/" + storageIdentifier;
-                    dvObject.setStorageIdentifier(S3_IDENTIFIER_PREFIX + "://" + bucketName + ":" + storageIdentifier);
-                }
-
+                key = dataFile.getOwner().getAuthorityForFileStorage() + "/"
+                        + this.getDataFile().getOwner().getIdentifierForFileStorage();
+                key += "/" + storageIdentifier.substring(storageIdentifier.lastIndexOf(":") + 1);
             }
 
             this.setMimeType(dataFile.getContentType());
@@ -207,24 +254,67 @@ public void open(DataAccessOption... options) throws IOException {
         } else if (dvObject instanceof Dataset) {
             Dataset dataset = this.getDataset();
             key = dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage();
-            dataset.setStorageIdentifier(S3_IDENTIFIER_PREFIX + "://" + key);
+            dataset.setStorageIdentifier(this.driverId + DataAccess.SEPARATOR + key);
         } else if (dvObject instanceof Dataverse) {
             throw new IOException("Data Access: Storage driver does not support dvObject type Dataverse yet");
         } else {
-            throw new IOException("Data Access: Invalid DvObject type");
+            if (isMainDriver()) {
+                // Direct access, e.g. for external upload - no associated DVobject yet, but we
+                // want to be able to get the size
+                // With small files, it looks like we may call before S3 says it exists, so try
+                // some retries before failing
+                long contentLength = -1;
+                int retries = 20;
+                while (retries > 0) {
+                    try {
+                        // Since s3 is an S3AsyncClient, we need to call .get() to wait for the result.
+                        HeadObjectResponse headObjectResponse = s3
+                                .headObject(HeadObjectRequest.builder().bucket(bucketName).key(key).build()).get();
+                        contentLength = headObjectResponse.contentLength();
+                        if (retries != 20) {
+                            logger.warning("Success for key: " + key + " after " + ((20 - retries) * 3) + " seconds");
+                        }
+                        break;
+                    } catch (Exception e) {
+                        if (retries > 1) {
+                            retries--;
+                            try {
+                                Thread.sleep(3000);
+                            } catch (InterruptedException ie) {
+                                Thread.currentThread().interrupt();
+                                logger.warning("Thread interrupted while waiting to retry");
+                            }
+                            logger.warning("Retrying after: " + e.getMessage());
+                        } else {
+                            throw new IOException("Cannot get S3 object " + key + " (" + e.getMessage() + ")", e);
+                        }
+                    }
+                }
+
+                if (contentLength >= 0) {
+                    this.setSize(contentLength);
+                } else {
+                    throw new IOException("Failed to retrieve content length for S3 object " + key);
+                }
+            }
         }
     }
 
     @Override
     public InputStream getInputStream() throws IOException {
-        if(super.getInputStream()==null) {
+        if (super.getInputStream() == null) {
+            ResponseInputStream<GetObjectResponse> responseInputStream;
             try {
-                setInputStream(s3.getObject(new GetObjectRequest(bucketName, key)).getObjectContent());
-            } catch (SdkClientException sce) {
-                throw new IOException("Cannot get S3 object " + key + " ("+sce.getMessage()+")");
+                responseInputStream = s3.getObject(GetObjectRequest.builder().bucket(bucketName).key(key).build(),
+                        AsyncResponseTransformer.toBlockingInputStream()).get(); // Since s3 is an S3AsyncClient, we
+                                                                                 // need to call .get() to wait for the
+                                                                                 // result
+                setInputStream(responseInputStream);
+            } catch (InterruptedException | ExecutionException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
             }
         }
-
         if (super.getInputStream() == null) {
             throw new IOException("Cannot get InputStream for S3 Object" + key);
         }
@@ -233,23 +323,24 @@ public InputStream getInputStream() throws IOException {
 
         return super.getInputStream();
     }
-    
+
     @Override
     public Channel getChannel() throws IOException {
-        if(super.getChannel()==null) {
+        if (super.getChannel() == null) {
             getInputStream();
         }
         return channel;
     }
-    
+
     @Override
     public ReadableByteChannel getReadChannel() throws IOException {
-        //Make sure StorageIO.channel variable exists
+        // Make sure StorageIO.channel variable exists
         getChannel();
         return super.getReadChannel();
     }
 
-    // StorageIO method for copying a local Path (for ex., a temp file), into this DataAccess location:
+    // StorageIO method for copying a local Path (for ex., a temp file), into this
+    // DataAccess location:
     @Override
     public void savePath(Path fileSystemPath) throws IOException {
         long newFileSize = -1;
@@ -258,23 +349,21 @@ public void savePath(Path fileSystemPath) throws IOException {
             open(DataAccessOption.WRITE_ACCESS);
         }
 
-        try {
-            File inputFile = fileSystemPath.toFile();
-            if (dvObject instanceof DataFile) {
-                s3.putObject(new PutObjectRequest(bucketName, key, inputFile));
-                
-                newFileSize = inputFile.length();
-            } else {
-                throw new IOException("DvObject type other than datafile is not yet supported");
-            }
-
-        } catch (SdkClientException ioex) {
-            String failureMsg = ioex.getMessage();
-            if (failureMsg == null) {
-                failureMsg = "S3AccessIO: Unknown exception occured while uploading a local file into S3Object "+key;
+        if (dvObject instanceof DataFile) {
+            try {
+                tm.uploadFile(
+                        UploadFileRequest.builder().putObjectRequest(req -> req.bucket(bucketName).key(key)).source(fileSystemPath).build())
+                        .completionFuture().join();
+
+                newFileSize = Files.size(fileSystemPath);
+            } catch (Exception e) {
+                logger.warning(e.getMessage());
+                e.printStackTrace();
+                throw new IOException(
+                        "S3AccessIO: Exception occurred while uploading a local file into S3Object " + key, e);
             }
-
-            throw new IOException(failureMsg);
+        } else {
+            throw new IOException("DvObject type other than datafile is not yet supported");
         }
 
         // if it has uploaded successfully, we can reset the size
@@ -282,78 +371,64 @@ public void savePath(Path fileSystemPath) throws IOException {
         setSize(newFileSize);
     }
 
-    /**
-     * Implements the StorageIO saveInputStream() method. 
-     * This implementation is somewhat problematic, because S3 cannot save an object of 
-     * an unknown length. This effectively nullifies any benefits of streaming; 
-     * as we cannot start saving until we have read the entire stream. 
-     * One way of solving this would be to buffer the entire stream as byte[], 
-     * in memory, then save it... Which of course would be limited by the amount 
-     * of memory available, and thus would not work for streams larger than that. 
-     * So we have eventually decided to save save the stream to a temp file, then 
-     * save to S3. This is slower, but guaranteed to work on any size stream. 
-     * An alternative we may want to consider is to not implement this method 
-     * in the S3 driver, and make it throw the UnsupportedDataAccessOperationException, 
-     * similarly to how we handle attempts to open OutputStreams, in this and the 
-     * Swift driver. 
-     * 
-     * @param inputStream InputStream we want to save
-     * @param auxItemTag String representing this Auxiliary type ("extension")
-     * @throws IOException if anything goes wrong.
-    */
     @Override
     public void saveInputStream(InputStream inputStream, Long filesize) throws IOException {
         if (filesize == null || filesize < 0) {
             saveInputStream(inputStream);
         } else {
-            if (!this.canWrite()) {
-                open(DataAccessOption.WRITE_ACCESS);
-            }
-
-            ObjectMetadata metadata = new ObjectMetadata();
-            metadata.setContentLength(filesize);
-            try {
-                s3.putObject(bucketName, key, inputStream, metadata);
-            } catch (SdkClientException ioex) {
-                String failureMsg = ioex.getMessage();
-                if (failureMsg == null) {
-                    failureMsg = "S3AccessIO: Unknown exception occured while uploading a local file into S3 Storage.";
-                }
-
-                throw new IOException(failureMsg);
-            }
-            setSize(filesize);  
+            saveInputStreamInternal(inputStream, filesize);
         }
     }
-    
+
     @Override
     public void saveInputStream(InputStream inputStream) throws IOException {
+        saveInputStreamInternal(inputStream, null);
+    }
+
+    private void saveInputStreamInternal(InputStream inputStream, Long filesize) throws IOException {
         if (!this.canWrite()) {
             open(DataAccessOption.WRITE_ACCESS);
         }
-        String directoryString = FileUtil.getFilesTempDirectory();
 
-        Random rand = new Random();
-        Path tempPath = Paths.get(directoryString, Integer.toString(rand.nextInt(Integer.MAX_VALUE)));
-        File tempFile = createTempFile(tempPath, inputStream);
-        
+        File tempFile = null;
         try {
-            s3.putObject(bucketName, key, tempFile);
-        } catch (SdkClientException ioex) {
-            String failureMsg = ioex.getMessage();
+            PutObjectRequest.Builder putObjectRequestBuilder = PutObjectRequest.builder().bucket(bucketName).key(key);
+
+            AsyncRequestBody asyncRequestBody;
+
+            if (filesize != null) {
+                putObjectRequestBuilder.contentLength(filesize);
+                asyncRequestBody = AsyncRequestBody.fromInputStream(inputStream, filesize, executorService);
+            } else {
+                String directoryString = FileUtil.getFilesTempDirectory();
+                Random rand = new Random();
+                Path tempPath = Paths.get(directoryString, Integer.toString(rand.nextInt(Integer.MAX_VALUE)));
+                tempFile = createTempFile(tempPath, inputStream);
+                asyncRequestBody = AsyncRequestBody.fromFile(tempFile);
+            }
+
+            s3.putObject(putObjectRequestBuilder.build(), asyncRequestBody).get();
+
+            if (filesize == null) {
+                HeadObjectResponse headObjectResponse = s3
+                        .headObject(HeadObjectRequest.builder().bucket(bucketName).key(key).build()).get();
+                setSize(headObjectResponse.contentLength());
+            } else {
+                setSize(filesize);
+            }
+        } catch (InterruptedException | ExecutionException e) {
+            String failureMsg = e.getMessage();
             if (failureMsg == null) {
-                failureMsg = "S3AccessIO: Unknown exception occured while uploading a local file into S3 Storage.";
+                failureMsg = "S3AccessIO: Unknown exception occurred while uploading a file into S3 Storage.";
+            }
+            throw new IOException(failureMsg, e);
+        } finally {
+            if (tempFile != null) {
+                tempFile.delete();
             }
-            tempFile.delete();
-            throw new IOException(failureMsg);
-        }
-        tempFile.delete();
-        ObjectMetadata objectMetadata = s3.getObjectMetadata(bucketName, key);
-        if (objectMetadata != null) {
-            setSize(objectMetadata.getContentLength());
         }
     }
-    
+
     @Override
     public void delete() throws IOException {
         if (!isDirectAccess()) {
@@ -361,26 +436,29 @@ public void delete() throws IOException {
         }
         if (key == null) {
             throw new IOException("Delete called with null key");
-        }        
+        }
         // Verify that it exists, before we attempt to delete it?
-        // (probably unnecessary - attempting to delete it will fail if it doesn't exist - ?)
+        // (probably unnecessary - attempting to delete it will fail if it doesn't exist
+        // - ?)
         try {
-            DeleteObjectRequest deleteObjRequest = new DeleteObjectRequest(bucketName, key);
-            s3.deleteObject(deleteObjRequest);
-        } catch (AmazonClientException ase) {
-            logger.warning("Caught an AmazonClientException in S3AccessIO.delete(): " + ase.getMessage());
-            throw new IOException("Failed to delete storage location " + getStorageLocation());
+            DeleteObjectRequest deleteObjRequest = DeleteObjectRequest.builder().bucket(bucketName).key(key).build();
+            s3.deleteObject(deleteObjRequest).get(); // Since s3 is an S3AsyncClient, we need to call .get() to wait for
+                                                     // the result
+        } catch (InterruptedException | ExecutionException e) {
+            logger.warning("Caught an exception in S3AccessIO.delete(): " + e.getMessage());
+            throw new IOException("Failed to delete storage location " + getStorageLocation(), e);
         }
-        
+
         // Delete all the cached aux files as well:
         deleteAllAuxObjects();
-
     }
 
     @Override
     public Channel openAuxChannel(String auxItemTag, DataAccessOption... options) throws IOException {
         if (isWriteAccessRequested(options)) {
-            throw new UnsupportedDataAccessOperationException("S3AccessIO: write mode openAuxChannel() not yet implemented in this storage driver.");
+            // Need size to write to S3
+            throw new UnsupportedDataAccessOperationException(
+                    "S3AccessIO: write mode openAuxChannel() not yet implemented in this storage driver.");
         }
 
         InputStream fin = getAuxFileAsInputStream(auxItemTag);
@@ -398,10 +476,19 @@ public boolean isAuxObjectCached(String auxItemTag) throws IOException {
         logger.fine("Inside isAuxObjectCached");
         String destinationKey = getDestinationKey(auxItemTag);
         try {
-            return s3.doesObjectExist(bucketName, destinationKey);
-        } catch (AmazonClientException ase) {
-            logger.warning("Caught an AmazonClientException in S3AccessIO.isAuxObjectCached:    " + ase.getMessage());
-            throw new IOException("S3AccessIO: Failed to cache auxilary object : " + auxItemTag);
+            HeadObjectRequest headObjectRequest = HeadObjectRequest.builder().bucket(bucketName).key(destinationKey)
+                    .build();
+
+            s3.headObject(headObjectRequest).get(); // Since s3 is an S3AsyncClient, we need to call .get() to wait for
+                                                    // the result
+            return true;
+        } catch (InterruptedException | ExecutionException e) {
+            if (e.getCause() instanceof NoSuchKeyException) {
+                // Object doesn't exist
+                return false;
+            }
+            logger.warning("Caught an exception in S3AccessIO.isAuxObjectCached: " + e.getMessage());
+            throw new IOException("S3AccessIO: Failed to check if auxiliary object is cached: " + auxItemTag, e);
         }
     }
 
@@ -410,55 +497,86 @@ public long getAuxObjectSize(String auxItemTag) throws IOException {
         open();
         String destinationKey = getDestinationKey(auxItemTag);
         try {
-            return s3.getObjectMetadata(bucketName, destinationKey).getContentLength();
-        } catch (AmazonClientException ase) {
-            logger.warning("Caught an AmazonClientException in S3AccessIO.getAuxObjectSize:    " + ase.getMessage());
+            HeadObjectResponse headObjectResponse = s3
+                    .headObject(HeadObjectRequest.builder().bucket(bucketName).key(destinationKey).build()).get(); // Since
+                                                                                                                   // s3
+                                                                                                                   // is
+                                                                                                                   // an
+                                                                                                                   // S3AsyncClient,
+                                                                                                                   // we
+                                                                                                                   // need
+                                                                                                                   // to
+                                                                                                                   // call
+                                                                                                                   // .get()
+                                                                                                                   // to
+                                                                                                                   // wait
+                                                                                                                   // for
+                                                                                                                   // the
+                                                                                                                   // result
+            return headObjectResponse.contentLength();
+        } catch (InterruptedException | ExecutionException e) {
+            if (e.getCause() instanceof NoSuchKeyException) {
+                // Object doesn't exist
+                logger.warning("Auxiliary object not found: " + destinationKey);
+                return -1;
+            }
+            logger.warning("Caught an exception in S3AccessIO.getAuxObjectSize: " + e.getMessage());
+            throw new IOException("S3AccessIO: Failed to get size of auxiliary object: " + auxItemTag, e);
         }
-        return -1;
     }
 
     @Override
     public Path getAuxObjectAsPath(String auxItemTag) throws UnsupportedDataAccessOperationException {
-        throw new UnsupportedDataAccessOperationException("S3AccessIO: this is a remote DataAccess IO object, its Aux objects have no local filesystem Paths associated with it.");
+        throw new UnsupportedDataAccessOperationException(
+                "S3AccessIO: this is a remote DataAccess IO object, its Aux objects have no local filesystem Paths associated with it.");
     }
 
     @Override
     public void backupAsAux(String auxItemTag) throws IOException {
         String destinationKey = getDestinationKey(auxItemTag);
         try {
-            s3.copyObject(new CopyObjectRequest(bucketName, key, bucketName, destinationKey));
-        } catch (AmazonClientException ase) {
-            logger.warning("Caught an AmazonClientException in S3AccessIO.backupAsAux:    " + ase.getMessage());
-            throw new IOException("S3AccessIO: Unable to backup original auxiliary object");
+            CopyObjectRequest copyObjectRequest = CopyObjectRequest.builder().sourceBucket(bucketName).sourceKey(key)
+                    .destinationBucket(bucketName).destinationKey(destinationKey).build();
+
+            s3.copyObject(copyObjectRequest).get(); // Since s3 is an S3AsyncClient, we need to call .get() to wait for
+                                                    // the result
+        } catch (InterruptedException | ExecutionException e) {
+            logger.warning("Caught an exception in S3AccessIO.backupAsAux: " + e.getMessage());
+            throw new IOException("S3AccessIO: Unable to backup original auxiliary object", e);
         }
     }
-    
-    
+
     @Override
     public void revertBackupAsAux(String auxItemTag) throws IOException {
         String destinationKey = getDestinationKey(auxItemTag);
         try {
-            s3.copyObject(new CopyObjectRequest(bucketName, destinationKey,  bucketName, key));
+            CopyObjectRequest copyObjectRequest = CopyObjectRequest.builder().sourceBucket(bucketName)
+                    .sourceKey(destinationKey).destinationBucket(bucketName).destinationKey(key).build();
+
+            s3.copyObject(copyObjectRequest).get(); // Since s3 is an S3AsyncClient, we need to call .get() to wait for
+                                                    // the result
             deleteAuxObject(auxItemTag);
-        } catch (AmazonClientException ase) {
-            logger.warning("Caught an AmazonServiceException in S3AccessIO.backupAsAux:    " + ase.getMessage());
-            throw new IOException("S3AccessIO: Unable to revert backup auxiliary object");
+        } catch (InterruptedException | ExecutionException e) {
+            logger.warning("Caught an exception in S3AccessIO.revertBackupAsAux: " + e.getMessage());
+            throw new IOException("S3AccessIO: Unable to revert backup auxiliary object", e);
         }
     }
 
     @Override
-    // this method copies a local filesystem Path into this DataAccess Auxiliary location:
     public void savePathAsAux(Path fileSystemPath, String auxItemTag) throws IOException {
         if (!this.canWrite()) {
             open(DataAccessOption.WRITE_ACCESS);
         }
         String destinationKey = getDestinationKey(auxItemTag);
         try {
-            File inputFile = fileSystemPath.toFile();
-            s3.putObject(new PutObjectRequest(bucketName, destinationKey, inputFile));            
-        } catch (AmazonClientException ase) {
-            logger.warning("Caught an AmazonClientException in S3AccessIO.savePathAsAux():    " + ase.getMessage());
-            throw new IOException("S3AccessIO: Failed to save path as an auxiliary object.");
+            PutObjectRequest putObjectRequest = PutObjectRequest.builder().bucket(bucketName).key(destinationKey)
+                    .build();
+            AsyncRequestBody asyncRequestBody = AsyncRequestBody.fromFile(fileSystemPath);
+            s3.putObject(putObjectRequest, asyncRequestBody).get(); // Since s3 is an S3AsyncClient, we need to call
+                                                                    // .get() to wait for the result
+        } catch (InterruptedException | ExecutionException e) {
+            logger.warning("Caught an exception in S3AccessIO.savePathAsAux(): " + e.getMessage());
+            throw new IOException("S3AccessIO: Failed to save path as an auxiliary object.", e);
         }
     }
 
@@ -471,86 +589,113 @@ public void saveInputStreamAsAux(InputStream inputStream, String auxItemTag, Lon
                 open(DataAccessOption.WRITE_ACCESS);
             }
             String destinationKey = getDestinationKey(auxItemTag);
-            ObjectMetadata metadata = new ObjectMetadata();
-            metadata.setContentLength(filesize);
             try {
-                s3.putObject(bucketName, destinationKey, inputStream, metadata);
-            } catch (SdkClientException ioex) {
-                String failureMsg = ioex.getMessage();
+                PutObjectRequest putObjectRequest = PutObjectRequest.builder().bucket(bucketName).key(destinationKey)
+                        .contentLength(filesize).build();
+
+                AsyncRequestBody asyncRequestBody = AsyncRequestBody.fromInputStream(inputStream, filesize,
+                        executorService);
+
+                s3.putObject(putObjectRequest, asyncRequestBody).get(); // Since s3 is an S3AsyncClient, we need to call
+                                                                        // .get() to wait for the result
+            } catch (InterruptedException | ExecutionException e) {
+                String failureMsg = e.getMessage();
 
                 if (failureMsg == null) {
-                    failureMsg = "S3AccessIO: SdkClientException occured while saving a local InputStream as S3Object";
+                    failureMsg = "S3AccessIO: Exception occurred while saving a local InputStream as S3Object";
                 }
-                throw new IOException(failureMsg);
+                throw new IOException(failureMsg, e);
             }
         }
     }
-    
+
     /**
-     * Implements the StorageIO saveInputStreamAsAux() method. 
-     * This implementation is problematic, because S3 cannot save an object of 
-     * an unknown length. This effectively nullifies any benefits of streaming; 
-     * as we cannot start saving until we have read the entire stream. 
-     * One way of solving this would be to buffer the entire stream as byte[], 
-     * in memory, then save it... Which of course would be limited by the amount 
-     * of memory available, and thus would not work for streams larger than that. 
-     * So we have eventually decided to save save the stream to a temp file, then 
-     * save to S3. This is slower, but guaranteed to work on any size stream. 
-     * An alternative we may want to consider is to not implement this method 
-     * in the S3 driver, and make it throw the UnsupportedDataAccessOperationException, 
-     * similarly to how we handle attempts to open OutputStreams, in this and the 
-     * Swift driver. 
+     * Implements the StorageIO saveInputStreamAsAux() method. This implementation
+     * is problematic, because S3 cannot save an object of an unknown length. This
+     * effectively nullifies any benefits of streaming; as we cannot start saving
+     * until we have read the entire stream. One way of solving this would be to
+     * buffer the entire stream as byte[], in memory, then save it... Which of
+     * course would be limited by the amount of memory available, and thus would not
+     * work for streams larger than that. So we have eventually decided to save save
+     * the stream to a temp file, then save to S3. This is slower, but guaranteed to
+     * work on any size stream. An alternative we may want to consider is to not
+     * implement this method in the S3 driver, and make it throw the
+     * UnsupportedDataAccessOperationException, similarly to how we handle attempts
+     * to open OutputStreams, in this and the Swift driver.
      * 
      * @param inputStream InputStream we want to save
-     * @param auxItemTag String representing this Auxiliary type ("extension")
+     * @param auxItemTag  String representing this Auxiliary type ("extension")
      * @throws IOException if anything goes wrong.
-    */
+     */
     @Override
     public void saveInputStreamAsAux(InputStream inputStream, String auxItemTag) throws IOException {
         if (!this.canWrite()) {
             open(DataAccessOption.WRITE_ACCESS);
         }
 
-        String directoryString = FileUtil.getFilesTempDirectory();
-
-        Random rand = new Random();
-        String pathNum = Integer.toString(rand.nextInt(Integer.MAX_VALUE));
-        Path tempPath = Paths.get(directoryString, pathNum);
-        File tempFile = createTempFile(tempPath, inputStream);
-        
         String destinationKey = getDestinationKey(auxItemTag);
-        
+
+        PutObjectRequest putObjectRequest = PutObjectRequest.builder().bucket(bucketName).key(destinationKey).build();
+
+        // Create a temporary file from the input stream
+        File tempFile = null;
         try {
-            s3.putObject(bucketName, destinationKey, tempFile);
-        } catch (SdkClientException ioex) {
-            String failureMsg = ioex.getMessage();
+            String directoryString = FileUtil.getFilesTempDirectory();
+
+            Random rand = new Random();
+            String pathNum = Integer.toString(rand.nextInt(Integer.MAX_VALUE));
+            Path tempPath = Paths.get(directoryString, pathNum);
+            tempFile = createTempFile(tempPath, inputStream);
+
+            // Create a RequestBody that reads from the temporary file
+            AsyncRequestBody requestBody = AsyncRequestBody.fromFile(tempFile);
+
+            // Use the async client to put the object
+            s3.putObject(putObjectRequest, requestBody).get();
+        } catch (InterruptedException | ExecutionException e) {
+            String failureMsg = e.getMessage();
 
             if (failureMsg == null) {
-                failureMsg = "S3AccessIO: SdkClientException occured while saving a local InputStream as S3Object";
+                failureMsg = "S3AccessIO: Exception occurred while saving a local InputStream as S3Object";
+            }
+            throw new IOException(failureMsg, e);
+        } finally {
+            // Close the input stream
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    logger.warning("Failed to close input stream: " + e.getMessage());
+                }
+            }
+            // Delete the temporary file
+            if (tempFile != null && tempFile.exists()) {
+                if (!tempFile.delete()) {
+                    logger.warning("Failed to delete temporary file: " + tempFile.getAbsolutePath());
+                }
             }
-            tempFile.delete();
-            throw new IOException(failureMsg);
         }
-        tempFile.delete();
     }
-    
-    //Helper method for supporting saving streams with unknown length to S3
-    //We save those streams to a file and then upload the file
+
+    // Helper method for supporting saving streams with unknown length to S3
+    // We save those streams to a file and then upload the file
     private File createTempFile(Path path, InputStream inputStream) throws IOException {
 
-        File targetFile = new File(path.toUri()); //File needs a name
-        OutputStream outStream = new FileOutputStream(targetFile);
+        File targetFile = new File(path.toUri()); // File needs a name
+        try (OutputStream outStream = new FileOutputStream(targetFile);) {
+
+            byte[] buffer = new byte[8 * 1024];
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buffer)) != -1) {
+                outStream.write(buffer, 0, bytesRead);
+            }
 
-        byte[] buffer = new byte[8 * 1024];
-        int bytesRead;
-        while ((bytesRead = inputStream.read(buffer)) != -1) {
-            outStream.write(buffer, 0, bytesRead);
+        } finally {
+            IOUtils.closeQuietly(inputStream);
         }
-        IOUtils.closeQuietly(inputStream);
-        IOUtils.closeQuietly(outStream);
         return targetFile;
-    } 
-    
+    }
+
     @Override
     public List<String> listAuxObjects() throws IOException {
         if (!this.canWrite()) {
@@ -559,32 +704,43 @@ public List<String> listAuxObjects() throws IOException {
         String prefix = getDestinationKey("");
 
         List<String> ret = new ArrayList<>();
-        ListObjectsRequest req = new ListObjectsRequest().withBucketName(bucketName).withPrefix(prefix);
-        ObjectListing storedAuxFilesList = null; 
+        ListObjectsV2Request listObjectsReqManual = ListObjectsV2Request.builder().bucket(bucketName).prefix(prefix)
+                .build();
+
+        ListObjectsV2Response listObjectsResponse = null;
         try {
-            storedAuxFilesList = s3.listObjects(req);
-        } catch (SdkClientException sce) {
-            throw new IOException ("S3 listAuxObjects: failed to get a listing for "+prefix);
+            listObjectsResponse = s3.listObjectsV2(listObjectsReqManual).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException("S3 listAuxObjects: failed to get a listing for " + prefix, e);
         }
-        if (storedAuxFilesList == null) {
+
+        if (listObjectsResponse == null) {
             return ret;
         }
-        List<S3ObjectSummary> storedAuxFilesSummary = storedAuxFilesList.getObjectSummaries();
+
+        List<S3Object> storedAuxFilesSummary = new ArrayList<>(listObjectsResponse.contents());
+
         try {
-            while (storedAuxFilesList.isTruncated()) {
+            String nextContinuationToken = listObjectsResponse.nextContinuationToken();
+            while (nextContinuationToken != null) {
                 logger.fine("S3 listAuxObjects: going to next page of list");
-                storedAuxFilesList = s3.listNextBatchOfObjects(storedAuxFilesList);
-                if (storedAuxFilesList != null) {
-                    storedAuxFilesSummary.addAll(storedAuxFilesList.getObjectSummaries());
+                ListObjectsV2Request nextReq = ListObjectsV2Request.builder().bucket(bucketName).prefix(prefix)
+                        .continuationToken(nextContinuationToken).build();
+
+                ListObjectsV2Response nextResponse = s3.listObjectsV2(nextReq).get();
+                if (nextResponse != null) {
+                    storedAuxFilesSummary.addAll(nextResponse.contents());
+                    nextContinuationToken = nextResponse.nextContinuationToken();
+                } else {
+                    nextContinuationToken = null;
                 }
             }
-        } catch (AmazonClientException ase) {
-            //logger.warning("Caught an AmazonServiceException in S3AccessIO.listAuxObjects():    " + ase.getMessage());
-            throw new IOException("S3AccessIO: Failed to get aux objects for listing.");
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException("S3AccessIO: Failed to get aux objects for listing.", e);
         }
 
-        for (S3ObjectSummary item : storedAuxFilesSummary) {
-            String destinationKey = item.getKey();
+        for (S3Object item : storedAuxFilesSummary) {
+            String destinationKey = item.key();
             String fileName = destinationKey.substring(destinationKey.lastIndexOf(".") + 1);
             logger.fine("S3 cached aux object fileName: " + fileName);
             ret.add(fileName);
@@ -599,10 +755,14 @@ public void deleteAuxObject(String auxItemTag) throws IOException {
         }
         String destinationKey = getDestinationKey(auxItemTag);
         try {
-            DeleteObjectRequest dor = new DeleteObjectRequest(bucketName, destinationKey);
-            s3.deleteObject(dor);
-        } catch (AmazonClientException ase) {
-            logger.warning("S3AccessIO: Unable to delete object    " + ase.getMessage());
+            DeleteObjectRequest deleteObjectRequest = DeleteObjectRequest.builder().bucket(bucketName)
+                    .key(destinationKey).build();
+
+            s3.deleteObject(deleteObjectRequest).get(); // Since s3 is an S3AsyncClient, we need to call .get() to wait
+                                                        // for the result
+        } catch (InterruptedException | ExecutionException e) {
+            logger.warning("S3AccessIO: Unable to delete object: " + e.getMessage());
+            throw new IOException("Failed to delete auxiliary object", e);
         }
     }
 
@@ -611,108 +771,131 @@ public void deleteAllAuxObjects() throws IOException {
         if (!isDirectAccess() && !this.canWrite()) {
             open(DataAccessOption.WRITE_ACCESS);
         }
-        
+
         String prefix = getDestinationKey("");
 
-        List<S3ObjectSummary> storedAuxFilesSummary = null;
+        List<S3Object> storedAuxFilesSummary = new ArrayList<>();
         try {
-            ListObjectsRequest req = new ListObjectsRequest().withBucketName(bucketName).withPrefix(prefix);
-            ObjectListing storedAuxFilesList = s3.listObjects(req);
-            if (storedAuxFilesList == null) {
-                // nothing to delete
-                return; 
-            }
-            storedAuxFilesSummary = storedAuxFilesList.getObjectSummaries();
-            while (storedAuxFilesList.isTruncated()) {
-                storedAuxFilesList = s3.listNextBatchOfObjects(storedAuxFilesList);
-                if (storedAuxFilesList != null) {
-                    storedAuxFilesSummary.addAll(storedAuxFilesList.getObjectSummaries());
-                }
-            }
-        } catch (AmazonClientException ase) {
-            throw new IOException("S3AccessIO: Failed to get aux objects for listing to delete.");
-        }
+            ListObjectsV2Request listRequest = ListObjectsV2Request.builder().bucket(bucketName).prefix(prefix).build();
+
+            ListObjectsV2Response listResponse;
+            do {
+                listResponse = s3.listObjectsV2(listRequest).get();
+                storedAuxFilesSummary.addAll(listResponse.contents());
 
-        DeleteObjectsRequest multiObjectDeleteRequest = new DeleteObjectsRequest(bucketName);
-        List<KeyVersion> keys = new ArrayList<>();
+                listRequest = listRequest.toBuilder().continuationToken(listResponse.nextContinuationToken()).build();
+            } while (listResponse.isTruncated());
 
-        for (S3ObjectSummary item : storedAuxFilesSummary) {
-            String destinationKey = item.getKey();
-            keys.add(new KeyVersion(destinationKey));
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException("S3AccessIO: Failed to get aux objects for listing to delete.", e);
         }
-        //Check if the list of auxiliary files for a data file is empty
-        if (keys.isEmpty()) {
+
+        if (storedAuxFilesSummary.isEmpty()) {
             logger.fine("S3AccessIO: No auxiliary objects to delete.");
             return;
         }
-        multiObjectDeleteRequest.setKeys(keys);
+
+        List<ObjectIdentifier> objectsToDelete = storedAuxFilesSummary.stream()
+                .map(s3Object -> ObjectIdentifier.builder().key(s3Object.key()).build()).collect(Collectors.toList());
+
+        Delete delete = Delete.builder().objects(objectsToDelete).quiet(true).build();
+
+        DeleteObjectsRequest deleteRequest = DeleteObjectsRequest.builder().bucket(bucketName).delete(delete).build();
 
         logger.fine("Trying to delete auxiliary files...");
         try {
-            s3.deleteObjects(multiObjectDeleteRequest);
-        } catch (SdkClientException e) {
-            throw new IOException("S3AccessIO: Failed to delete one or more auxiliary objects.");
+            s3.deleteObjects(deleteRequest).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException("S3AccessIO: Failed to delete one or more auxiliary objects.", e);
         }
     }
 
-    //TODO: Do we need this? - Answer: yes! 
     @Override
     public String getStorageLocation() throws IOException {
-        String locationKey = getMainFileKey(); 
-        
+        String locationKey = getMainFileKey();
+
         if (locationKey == null) {
             throw new IOException("Failed to obtain the S3 key for the file");
         }
-        
-        return S3_IDENTIFIER_PREFIX + "://" + bucketName + "/" + locationKey; 
+
+        return this.driverId + DataAccess.SEPARATOR + bucketName + "/" + locationKey;
     }
 
     @Override
     public Path getFileSystemPath() throws UnsupportedDataAccessOperationException {
-        throw new UnsupportedDataAccessOperationException("S3AccessIO: this is a remote DataAccess IO object, it has no local filesystem path associated with it.");
+        throw new UnsupportedDataAccessOperationException(
+                "S3AccessIO: this is a remote DataAccess IO object, it has no local filesystem path associated with it.");
     }
 
     @Override
     public boolean exists() {
+        try {
+            key = getMainFileKey();
+        } catch (IOException e) {
+            logger.warning("Caught an IOException in S3AccessIO.exists(): " + e.getMessage());
+            return false;
+        }
         String destinationKey = null;
         if (dvObject instanceof DataFile) {
             destinationKey = key;
+        } else if ((dvObject == null) && (key != null)) {
+            // direct access
+            destinationKey = key;
         } else {
             logger.warning("Trying to check if a path exists is only supported for a data file.");
         }
         try {
-            return s3.doesObjectExist(bucketName, destinationKey);
-        } catch (AmazonClientException ase) {
-            logger.warning("Caught an AmazonClientException in S3AccessIO.exists():    " + ase.getMessage());
+            HeadObjectRequest headObjectRequest = HeadObjectRequest.builder().bucket(bucketName).key(destinationKey)
+                    .build();
+
+            s3.headObject(headObjectRequest).get();
+            return true;
+        } catch (InterruptedException | ExecutionException e) {
+            if (e.getCause() instanceof NoSuchKeyException) {
+                // Object does not exist
+                return false;
+            }
+            logger.warning("Caught an exception in S3AccessIO.exists(): " + e.getMessage());
             return false;
         }
     }
 
     @Override
     public WritableByteChannel getWriteChannel() throws UnsupportedDataAccessOperationException {
-        throw new UnsupportedDataAccessOperationException("S3AccessIO: there are no write Channels associated with S3 objects.");
+        throw new UnsupportedDataAccessOperationException(
+                "S3AccessIO: there are no write Channels associated with S3 objects.");
     }
 
     @Override
     public OutputStream getOutputStream() throws UnsupportedDataAccessOperationException {
-        throw new UnsupportedDataAccessOperationException("S3AccessIO: there are no output Streams associated with S3 objects.");
+        throw new UnsupportedDataAccessOperationException(
+                "S3AccessIO: there are no output Streams associated with S3 objects.");
     }
 
     @Override
     public InputStream getAuxFileAsInputStream(String auxItemTag) throws IOException {
         String destinationKey = getDestinationKey(auxItemTag);
         try {
-            S3Object s3object = s3.getObject(new GetObjectRequest(bucketName, destinationKey));
-            if (s3object != null) {
-                return s3object.getObjectContent();
-            } 
-            return null; 
-        } catch (AmazonClientException ase) {
-            logger.fine("Caught an AmazonClientException in S3AccessIO.getAuxFileAsInputStream() (object not cached?):    " + ase.getMessage());
+            GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(bucketName).key(destinationKey)
+                    .build();
+
+            ResponseInputStream<GetObjectResponse> s3ObjectContent = s3
+                    .getObject(getObjectRequest, AsyncResponseTransformer.toBlockingInputStream()).get();
+            if (s3ObjectContent != null) {
+                return s3ObjectContent;
+            }
             return null;
+        } catch (InterruptedException | ExecutionException e) {
+            if (e.getCause() instanceof NoSuchKeyException) {
+                logger.fine("S3AccessIO.getAuxFileAsInputStream(): Object not found (not cached?): " + e.getMessage());
+                return null;
+            }
+            logger.warning("Caught an exception in S3AccessIO.getAuxFileAsInputStream(): " + e.getMessage());
+            throw new IOException("Failed to get auxiliary file as input stream", e);
         }
     }
 
+    // Rename this getAuxiliaryKey(), maybe?
     String getDestinationKey(String auxItemTag) throws IOException {
         if (isDirectAccess() || dvObject instanceof DataFile) {
             return getMainFileKey() + "." + auxItemTag;
@@ -725,90 +908,134 @@ String getDestinationKey(String auxItemTag) throws IOException {
             throw new IOException("S3AccessIO: This operation is only supported for Datasets and DataFiles.");
         }
     }
-    
+
     /**
-     * TODO: this function is not side effect free (sets instance variables key and bucketName).
-     *       Is this good or bad? Need to ask @landreev
+     * TODO: this function is not side effect free (sets instance variables key and
+     * bucketName). Is this good or bad? Need to ask @landreev
      *
-     * Extract the file key from a file stored on S3.
-     * Follows template: "owner authority name"/"owner identifier"/"storage identifier without bucketname and protocol"
+     * Extract the file key from a file stored on S3. Follows template: "owner
+     * authority name"/"owner identifier"/"storage identifier without bucketname and
+     * protocol"
+     * 
      * @return Main File Key
      * @throws IOException
      */
     String getMainFileKey() throws IOException {
         if (key == null) {
-            // TODO: (?) - should we worry here about the datafile having null for the owner here? 
-            // or about the owner dataset having null for the authority and/or identifier?
-            // we should probably check for that and throw an exception. (unless we are 
-            // super positive that this condition would have been intercepted by now)
-            String baseKey = this.getDataFile().getOwner().getAuthorityForFileStorage() + "/" + this.getDataFile().getOwner().getIdentifierForFileStorage();
-            String storageIdentifier = dvObject.getStorageIdentifier();
+            DataFile df = this.getDataFile();
+            // TODO: (?) - should we worry here about the datafile having null for the owner
+            // here?
+            key = getMainFileKey(df.getOwner(), df.getStorageIdentifier(), driverId);
+        }
+        return key;
+    }
 
-            if (storageIdentifier == null || "".equals(storageIdentifier)) {
-                throw new FileNotFoundException("Data Access: No local storage identifier defined for this datafile.");
-            }
+    static String getMainFileKey(Dataset owner, String storageIdentifier, String driverId) throws IOException {
 
-            if (storageIdentifier.startsWith(S3_IDENTIFIER_PREFIX + "://")) {
-                bucketName = storageIdentifier.substring((S3_IDENTIFIER_PREFIX + "://").length(), storageIdentifier.lastIndexOf(":"));
-                key = baseKey + "/" + storageIdentifier.substring(storageIdentifier.lastIndexOf(":") + 1);
-            } else {
-                throw new IOException("S3AccessIO: DataFile (storage identifier " + storageIdentifier + ") does not appear to be an S3 object.");
-            }
+        // or about the owner dataset having null for the authority and/or identifier?
+        // we should probably check for that and throw an exception. (unless we are
+        // super positive that this condition would have been intercepted by now)
+        String baseKey = owner.getAuthorityForFileStorage() + "/" + owner.getIdentifierForFileStorage();
+        return getMainFileKey(baseKey, storageIdentifier, driverId);
+    }
+
+    private static String getMainFileKey(String baseKey, String storageIdentifier, String driverId) throws IOException {
+        String key = null;
+        if (storageIdentifier == null || "".equals(storageIdentifier)) {
+            throw new FileNotFoundException("Data Access: No local storage identifier defined for this datafile.");
+        }
+
+        if (storageIdentifier.indexOf(driverId + DataAccess.SEPARATOR) >= 0) {
+            // String driverId = storageIdentifier.substring(0,
+            // storageIdentifier.indexOf("://")+3);
+            // As currently implemented (v4.20), the bucket is part of the identifier and we
+            // could extract it and compare it with getBucketName() as a check -
+            // Only one bucket per driver is supported (though things might work if the
+            // profile creds work with multiple buckets, then again it's not clear when
+            // logic is reading from the driver property or from the DataFile).
+            // String bucketName = storageIdentifier.substring(driverId.length() + 3,
+            // storageIdentifier.lastIndexOf(":"));
+            key = baseKey + "/" + storageIdentifier.substring(storageIdentifier.lastIndexOf(":") + 1);
+        } else {
+            throw new IOException("S3AccessIO: DataFile (storage identifier " + storageIdentifier
+                    + ") does not appear to be an S3 object associated with driver: " + driverId);
         }
-        
         return key;
     }
-    
-    public String generateTemporaryS3Url() throws IOException {
-        //Questions:
-        // Q. Should this work for private and public?
-        // A. Yes! Since the URL has a limited, short life span. -- L.A. 
-        // Q. how long should the download url work?
-        // A. 1 hour by default seems like an OK number. Making it configurable seems like a good idea too. -- L.A.
+
+    @Override
+    public boolean downloadRedirectEnabled() {
+        String optionValue = getConfigParam(DOWNLOAD_REDIRECT);
+        if ("true".equalsIgnoreCase(optionValue)) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean downloadRedirectEnabled(String auxObjectTag) {
+        return downloadRedirectEnabled();
+    }
+
+    /**
+     * Generates a temporary URL for a direct S3 download; either for the main
+     * physical file, or (optionally) for an auxiliary.
+     * 
+     * @param auxiliaryTag      (optional)
+     * @param auxiliaryType     (optional) - aux. mime type, if different from the
+     *                          main type
+     * @param auxiliaryFileName (optional) - file name, if different from the main
+     *                          file label.
+     * @return redirect url
+     * @throws IOException.
+     */
+    public String generateTemporaryDownloadUrl(String auxiliaryTag, String auxiliaryType, String auxiliaryFileName)
+            throws IOException {
         if (s3 == null) {
             throw new IOException("ERROR: s3 not initialised. ");
         }
         if (dvObject instanceof DataFile) {
-            key = getMainFileKey();
-            java.util.Date expiration = new java.util.Date();
-            long msec = expiration.getTime();
-            msec += 1000 * getUrlExpirationMinutes();
-            expiration.setTime(msec);
-
-            GeneratePresignedUrlRequest generatePresignedUrlRequest = 
-                          new GeneratePresignedUrlRequest(bucketName, key);
-            generatePresignedUrlRequest.setMethod(HttpMethod.GET); // Default.
-            generatePresignedUrlRequest.setExpiration(expiration);
-            ResponseHeaderOverrides responseHeaders = new ResponseHeaderOverrides();
-            //responseHeaders.setContentDisposition("attachment; filename="+this.getDataFile().getDisplayName());
-            // Encode the file name explicitly specifying the encoding as UTF-8:
-            // (otherwise S3 may not like non-ASCII characters!)
-            // Most browsers are happy with just "filename="+URLEncoder.encode(this.getDataFile().getDisplayName(), "UTF-8") 
-            // in the header. But Firefox appears to require that "UTF8" is 
-            // specified explicitly, as below:
-            responseHeaders.setContentDisposition("attachment; filename*=UTF-8''"+URLEncoder.encode(this.getDataFile().getDisplayName(), "UTF-8"));
-            // - without it, download will work, but Firefox will leave the special
-            // characters in the file name encoded. For example, the file name 
-            // will look like "1976%E2%80%932016.txt" instead of "1976–2016.txt", 
-            // where the dash is the "long dash", represented by a 3-byte UTF8 
-            // character "\xE2\x80\x93"
-            
-            responseHeaders.setContentType(this.getDataFile().getContentType());
-            generatePresignedUrlRequest.setResponseHeaders(responseHeaders);
-
-            URL s; 
+            String key = auxiliaryTag == null ? getMainFileKey() : getDestinationKey(auxiliaryTag);
+            Duration expirationDuration = Duration.ofMinutes(getUrlExpirationMinutes());
+
+            String fileName = auxiliaryFileName == null ? this.getDataFile().getDisplayName() : auxiliaryFileName;
+            String contentType = auxiliaryType == null ? this.getDataFile().getContentType() : auxiliaryType;
+
+            GetObjectPresignRequest presignRequest = GetObjectPresignRequest.builder()
+                    .signatureDuration(expirationDuration)
+                    .getObjectRequest(req -> req.bucket(bucketName).key(key)
+                            .responseContentDisposition("attachment; filename*=UTF-8''"
+                                    + URLEncoder.encode(fileName, StandardCharsets.UTF_8).replaceAll("\\+", "%20"))
+                            .responseContentType(contentType))
+                    .build();
+
+            PresignedGetObjectRequest presignedRequest;
             try {
-                s = s3.generatePresignedUrl(generatePresignedUrlRequest);
-            } catch (SdkClientException sce) {
-                //throw new IOException("SdkClientException generating temporary S3 url for "+key+" ("+sce.getMessage()+")");
-                s = null; 
+                presignedRequest = s3Presigner.presignGetObject(presignRequest);
+            } catch (S3Exception e) {
+                logger.warning("Exception generating temporary S3 url for " + key + " (" + e.getMessage() + ")");
+                return null;
+            } finally {
+                s3Presigner.close();
             }
 
-            if (s != null) {
-                return s.toString();
+            if (presignedRequest != null) {
+                String urlString = presignedRequest.url().toString();
+                if (!StringUtil.isEmpty(proxy)) {
+                    String endpointServer = endpoint;
+                    int protocolEnd = endpoint.indexOf(DataAccess.SEPARATOR);
+                    if (protocolEnd >= 0) {
+                        endpointServer = endpoint.substring(protocolEnd + DataAccess.SEPARATOR.length());
+                    }
+                    logger.fine("Endpoint: " + endpointServer);
+                    logger.fine("Original Url: " + urlString);
+                    String finalUrl = urlString.replaceFirst("http[s]*:\\/\\/([^\\/]+\\.)" + endpointServer, proxy);
+                    logger.fine("ProxiedURL: " + finalUrl);
+                    return finalUrl;
+                } else {
+                    return urlString;
+                }
             }
-            
-            //throw new IOException("Failed to generate temporary S3 url for "+key);
+
             return null;
         } else if (dvObject instanceof Dataset) {
             throw new IOException("Data Access: GenerateTemporaryS3Url: Invalid DvObject type : Dataset");
@@ -818,20 +1045,525 @@ public String generateTemporaryS3Url() throws IOException {
             throw new IOException("Data Access: GenerateTemporaryS3Url: Unknown DvObject type");
         }
     }
-    
+
+    private String generateTemporaryS3UploadUrl(String key, Date expiration) throws IOException {
+        if (s3 == null) {
+            throw new IOException("ERROR: s3 not initialised. ");
+        }
+
+        Duration expirationDuration = Duration.between(Instant.now(), expiration.toInstant());
+
+        PutObjectPresignRequest.Builder presignRequestBuilder = PutObjectPresignRequest.builder()
+                .signatureDuration(expirationDuration);
+
+        // Add tagging if not disabled
+        final boolean taggingDisabled = JvmSettings.DISABLE_S3_TAGGING.lookupOptional(Boolean.class, this.driverId)
+                .orElse(false);
+        if (!taggingDisabled) {
+            presignRequestBuilder.putObjectRequest(req -> req.tagging("dv-state=temp").bucket(bucketName).key(key));
+        } else {
+            presignRequestBuilder.putObjectRequest(req -> req.bucket(bucketName).key(key));
+        }
+        PutObjectPresignRequest presignRequest = presignRequestBuilder.build();
+
+        PresignedPutObjectRequest presignedRequest;
+        try {
+            presignedRequest = s3Presigner.presignPutObject(presignRequest);
+        } catch (S3Exception e) {
+            logger.warning("Exception generating temporary S3 upload url for " + key + " (" + e.getMessage() + ")");
+            return null;
+        } finally {
+            s3Presigner.close();
+        }
+
+        String urlString = presignedRequest.url().toString();
+
+        if (!StringUtil.isEmpty(proxy)) {
+            String endpointServer = endpoint;
+            int protocolEnd = endpoint.indexOf(DataAccess.SEPARATOR);
+            if (protocolEnd >= 0) {
+                endpointServer = endpoint.substring(protocolEnd + DataAccess.SEPARATOR.length());
+            }
+            logger.fine("Endpoint: " + endpointServer);
+            // We're then replacing
+            // http or https followed by :// and an optional <bucketname>. before the
+            // normalized endpoint url
+            // with the proxy info (which is protocol + machine name and optional port)
+            urlString = urlString.replaceFirst("http[s]*:\\/\\/([^\\/]+\\.)" + endpointServer, proxy);
+            logger.fine("ProxiedURL: " + urlString);
+        }
+
+        return urlString;
+    }
+
+    public JsonObjectBuilder generateTemporaryS3UploadUrls(String globalId, String storageIdentifier, long fileSize)
+            throws IOException {
+        JsonObjectBuilder response = Json.createObjectBuilder();
+        key = getMainFileKey();
+        Instant expiration = Instant.now().plus(Duration.ofMinutes(getUrlExpirationMinutes()));
+
+        if (fileSize <= minPartSize) {
+            response.add("url", generateTemporaryS3UploadUrl(key, Date.from(expiration)));
+        } else {
+            JsonObjectBuilder urls = Json.createObjectBuilder();
+
+            CreateMultipartUploadRequest.Builder createMultipartUploadRequestBuilder = CreateMultipartUploadRequest
+                    .builder().bucket(bucketName).key(key);
+
+            // Use the existing s3 async client for the createMultipartUpload operation
+            CompletableFuture<CreateMultipartUploadResponse> createMultipartUploadFuture = s3.createMultipartUpload(createMultipartUploadRequestBuilder.build());
+            CreateMultipartUploadResponse createMultipartUploadResponse = createMultipartUploadFuture.join();
+            String uploadId = createMultipartUploadResponse.uploadId();
+
+            for (int i = 1; i <= (fileSize / minPartSize) + (fileSize % minPartSize > 0 ? 1 : 0); i++) {
+                final int partNum = i;
+                PresignedUploadPartRequest presignedRequest = s3Presigner.presignUploadPart(UploadPartPresignRequest
+                        .builder().signatureDuration(Duration.between(Instant.now(), expiration))
+                        .uploadPartRequest(b -> b.bucket(bucketName).key(key).uploadId(uploadId).partNumber(partNum))
+                        .build());
+
+                String urlString = presignedRequest.url().toString();
+                if (!StringUtil.isEmpty(proxy)) {
+                    urlString = urlString.replace(endpoint, proxy);
+                }
+                urls.add(Integer.toString(i), urlString);
+            }
+
+            response.add("urls", urls);
+            response.add("abort", "/api/datasets/mpupload?globalid=" + globalId + "&uploadid=" + uploadId
+                    + "&storageidentifier=" + storageIdentifier);
+            response.add("complete", "/api/datasets/mpupload?globalid=" + globalId + "&uploadid=" + uploadId
+                    + "&storageidentifier=" + storageIdentifier);
+
+            s3Presigner.close();
+        }
+
+        response.add("partSize", minPartSize);
+
+        return response;
+    }
+
     int getUrlExpirationMinutes() {
-        String optionValue = System.getProperty("dataverse.files.s3-url-expiration-minutes"); 
+        String optionValue = getConfigParam(URL_EXPIRATION_MINUTES);
         if (optionValue != null) {
-            Integer num; 
+            Integer num;
             try {
-                num = new Integer(optionValue);
+                num = Integer.parseInt(optionValue);
             } catch (NumberFormatException ex) {
-                num = null; 
+                num = null;
             }
             if (num != null) {
                 return num;
             }
         }
-        return 60; 
+        return 60;
+    }
+
+    private static String getBucketName(String driverId) {
+        return getConfigParamForDriver(driverId, BUCKET_NAME);
+    }
+
+    private static long getMinPartSize(String driverId) {
+        // as a default, pick 1 GB minimum part size for AWS S3
+        // (minimum allowed is 5*1024**2 but it probably isn't worth the complexity
+        // starting at ~5MB. Also - confirmed that they use base 2 definitions)
+        long min = 5 * 1024 * 1024l;
+
+        String partLength = getConfigParamForDriver(driverId, MIN_PART_SIZE);
+        try {
+            if (partLength != null) {
+                long val = Long.parseLong(partLength);
+                if (val >= min) {
+                    min = val;
+                } else {
+                    logger.warning(min + " is the minimum part size allowed for jvm option dataverse.files." + driverId
+                            + ".min-part-size");
+                }
+            } else {
+                min = 1024 * 1024 * 1024l;
+            }
+        } catch (NumberFormatException nfe) {
+            logger.warning("Unable to parse dataverse.files." + driverId + ".min-part-size as long: " + partLength);
+        }
+        return min;
+    }
+
+    private static S3TransferManager getTransferManager(String driverId) {
+        if (driverTMMap.containsKey(driverId)) {
+            return driverTMMap.get(driverId);
+        } else {
+            // building a TransferManager instance to support multipart uploading for files
+            // over 4gb.
+            S3TransferManager manager = S3TransferManager.builder().s3Client(getClient(driverId)).build();
+            driverTMMap.put(driverId, manager);
+            return manager;
+        }
+    }
+
+    private static S3AsyncClient getClient(String driverId) {
+
+        if (driverClientMap.containsKey(driverId)) {
+            return driverClientMap.get(driverId);
+        } else {
+            // Create a builder for the S3AsyncClient
+            S3AsyncClientBuilder s3CB = S3AsyncClient.builder().requestChecksumCalculation(RequestChecksumCalculation.WHEN_REQUIRED);
+
+            // Create a custom HTTP client with the desired pool size
+            Integer poolSize = Integer.getInteger("dataverse.files." + driverId + ".connection-pool-size", 256);
+            Builder httpClientBuilder = NettyNioAsyncHttpClient.builder().maxConcurrency(poolSize);
+
+            // Apply the custom HTTP client to the S3AsyncClientBuilder
+            s3CB.httpClientBuilder(httpClientBuilder);
+
+            // Configure endpoint and region
+            String s3CEUrl = getConfigParamForDriver(driverId, CUSTOM_ENDPOINT_URL, "");
+            String s3CERegion = getConfigParamForDriver(driverId, CUSTOM_ENDPOINT_REGION, "dataverse");
+
+            if (!s3CEUrl.isEmpty()) {
+                s3CB.endpointOverride(URI.create(s3CEUrl));
+                s3CB.region(Region.of(s3CERegion));
+            }
+
+            // Configure path style access
+            boolean s3pathStyleAccess = Boolean
+                    .parseBoolean(getConfigParamForDriver(driverId, PATH_STYLE_ACCESS, "false"));
+            s3CB.forcePathStyle(s3pathStyleAccess);
+            // Configure chunked encoding
+
+            Boolean s3chunkedEncoding = Boolean
+                    .parseBoolean(getConfigParamForDriver(driverId, CHUNKED_ENCODING, "true"));
+            s3CB.serviceConfiguration(S3Configuration.builder().chunkedEncodingEnabled(s3chunkedEncoding).build());
+
+            // Configure credentials
+            s3CB.credentialsProvider(getCredentialsProvider(driverId));
+
+            // Build the client
+            S3AsyncClient client = s3CB.build();
+            driverClientMap.put(driverId, client);
+            return client;
+        }
+    }
+
+    private static S3Presigner getPresigner(String driverId) {
+        if (driverPresignerMap.containsKey(driverId)) {
+            return driverPresignerMap.get(driverId);
+        } else {
+            S3AsyncClient s3 = getClient(driverId);
+            S3Presigner.Builder s3PresignerBuilder = S3Presigner.builder()
+                    .region(Region.of(s3.serviceClientConfiguration().region().toString()))
+                    .credentialsProvider(getCredentialsProvider(driverId));
+
+            s3.serviceClientConfiguration().endpointOverride()
+                    .ifPresent(uri -> s3PresignerBuilder.endpointOverride(uri));
+
+            // Add path style access configuration
+            Boolean s3pathStyleAccess = Boolean
+                    .parseBoolean(getConfigParamForDriver(driverId, PATH_STYLE_ACCESS, "false"));
+            s3PresignerBuilder
+                    .serviceConfiguration(S3Configuration.builder().pathStyleAccessEnabled(s3pathStyleAccess).build());
+            S3Presigner s3Presigner = s3PresignerBuilder.build();
+            driverPresignerMap.put(driverId, s3Presigner);
+            return s3Presigner;
+        }
+
+    }
+    
+    private static AwsCredentialsProvider getCredentialsProvider(String driverId) {
+        if (driverCredentialsProviderMap.containsKey(driverId)) {
+            return driverCredentialsProviderMap.get(driverId);
+        } else {
+            List<AwsCredentialsProvider> providers = new ArrayList<>();
+
+            String s3profile = getConfigParamForDriver(driverId, PROFILE);
+            boolean allowInstanceCredentials = true;
+
+            if (s3profile != null) {
+                allowInstanceCredentials = false;
+            }
+
+            Optional<String> accessKey = config.getOptionalValue("dataverse.files." + driverId + ".access-key",
+                    String.class);
+            Optional<String> secretKey = config.getOptionalValue("dataverse.files." + driverId + ".secret-key",
+                    String.class);
+
+            if (accessKey.isPresent() && secretKey.isPresent()) {
+                allowInstanceCredentials = false;
+                providers.add(
+                        StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey.get(), secretKey.get())));
+            } else if (s3profile == null) {
+                s3profile = "default";
+            }
+
+            if (s3profile != null) {
+                providers.add(ProfileCredentialsProvider.create(s3profile));
+            }
+
+            if (allowInstanceCredentials) {
+                providers.add(InstanceProfileCredentialsProvider.create());
+            }
+
+            Collections.reverse(providers);
+            AwsCredentialsProvider provider = AwsCredentialsProviderChain.builder().credentialsProviders(providers)
+                    .build();
+            driverCredentialsProviderMap.put(driverId, provider);
+            return provider;
+        }
+    }
+
+    public void removeTempTag() throws IOException {
+        if (!(dvObject instanceof DataFile)) {
+            logger.warning("Attempt to remove tag from non-file DVObject id: " + dvObject.getId());
+            throw new IOException("Attempt to remove temp tag from non-file S3 Object");
+        }
+        try {
+            key = getMainFileKey();
+            DeleteObjectTaggingRequest deleteObjectTaggingRequest = DeleteObjectTaggingRequest.builder()
+                    .bucket(bucketName).key(key).build();
+            // Note - currently we only use one tag so delete is the fastest and cheapest
+            // way to get rid of that one tag
+            // Otherwise you have to get tags, remove the one you don't want and post new
+            // tags and get charged for the operations
+            s3.deleteObjectTagging(deleteObjectTaggingRequest).get();
+        } catch (InterruptedException | ExecutionException e) {
+            if (e.getCause() instanceof S3Exception) {
+                S3Exception s3e = (S3Exception) e.getCause();
+                if (s3e.statusCode() == 501) {
+                    // In this case, it's likely that tags are not implemented at all (e.g. by
+                    // Minio) so no tag was set either and it's just something to be aware of
+                    logger.warning("Temp tag not deleted: Object tags not supported by storage: " + driverId);
+                } else {
+                    // In this case, the assumption is that adding tags has worked, so not removing
+                    // it is a problem that should be looked into.
+                    logger.severe("Unable to remove temp tag from : " + bucketName + " : " + key);
+                }
+            } else {
+                logger.severe("Unexpected error while removing temp tag: " + e.getMessage());
+                throw new IOException("Failed to remove temp tag", e);
+            }
+        } catch (IOException e) {
+            logger.warning("Could not create key for S3 object.");
+            throw e;
+        }
+    }
+
+    public static void abortMultipartUpload(String globalId, String storageIdentifier, String uploadId)
+            throws IOException {
+        String baseKey = null;
+        int index = globalId.indexOf(":");
+        if (index >= 0) {
+            baseKey = globalId.substring(index + 1);
+        } else {
+            throw new IOException("Invalid Global ID (expected form with '<type>:' prefix)");
+        }
+        String[] info = DataAccess.getDriverIdAndStorageLocation(storageIdentifier);
+        String driverId = info[0];
+        S3AsyncClient s3Client = getClient(driverId);
+        String bucketName = getBucketName(driverId);
+        String key = getMainFileKey(baseKey, storageIdentifier, driverId);
+
+        AbortMultipartUploadRequest req = AbortMultipartUploadRequest.builder().bucket(bucketName).key(key)
+                .uploadId(uploadId).build();
+
+        try {
+            s3Client.abortMultipartUpload(req).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException("Failed to abort multipart upload", e);
+        }
+    }
+
+    public static void completeMultipartUpload(String globalId, String storageIdentifier, String uploadId,
+            List<CompletedPart> completedParts) throws IOException {
+        String baseKey = null;
+        int index = globalId.indexOf(":");
+        if (index >= 0) {
+            baseKey = globalId.substring(index + 1);
+        } else {
+            throw new IOException("Invalid Global ID (expected form with '<type>:' prefix)");
+        }
+
+        String[] info = DataAccess.getDriverIdAndStorageLocation(storageIdentifier);
+        String driverId = info[0];
+        S3AsyncClient s3Client = getClient(driverId);
+        String bucketName = getBucketName(driverId);
+        String key = getMainFileKey(baseKey, storageIdentifier, driverId);
+
+        CompletedMultipartUpload completedMultipartUpload = CompletedMultipartUpload.builder().parts(completedParts)
+                .build();
+
+        CompleteMultipartUploadRequest completeMultipartUploadRequest = CompleteMultipartUploadRequest.builder()
+                .bucket(bucketName).key(key).uploadId(uploadId).multipartUpload(completedMultipartUpload).build();
+
+        try {
+            s3Client.completeMultipartUpload(completeMultipartUploadRequest).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException("Failed to complete multipart upload", e);
+        }
+    }
+
+    public boolean isMainDriver() {
+        return mainDriver;
+    }
+
+    public void setMainDriver(boolean mainDriver) {
+        this.mainDriver = mainDriver;
+    }
+
+    public static String getDriverPrefix(String driverId) {
+        return driverId + DataAccess.SEPARATOR + getBucketName(driverId) + ":";
+    }
+
+    // Confirm inputs are of the form
+    // s3://demo-dataverse-bucket:176e28068b0-1c3f80357c42
+    protected static boolean isValidIdentifier(String driverId, String storageId) {
+        String storageBucketAndId = storageId.substring(storageId.lastIndexOf("//") + 2);
+        String bucketName = getBucketName(driverId);
+        if (bucketName == null) {
+            logger.warning("No bucket defined for " + driverId);
+            return false;
+        }
+        int index = storageBucketAndId.lastIndexOf(":");
+        if (index <= 0) {
+            logger.warning("No bucket defined in submitted identifier: " + storageId);
+            return false;
+        }
+        String idBucket = storageBucketAndId.substring(0, index);
+        String id = storageBucketAndId.substring(index + 1);
+        logger.fine(id);
+        if (!bucketName.equals(idBucket)) {
+            logger.warning("Incorrect bucket in submitted identifier: " + storageId);
+            return false;
+        }
+        if (!usesStandardNamePattern(id)) {
+            logger.warning("Unacceptable identifier pattern in submitted identifier: " + storageId);
+            return false;
+        }
+        return true;
+    }
+
+    private List<String> listAllFiles() throws IOException {
+        if (!this.canWrite()) {
+            open();
+        }
+        Dataset dataset = this.getDataset();
+        if (dataset == null) {
+            throw new IOException("This S3AccessIO object hasn't been properly initialized.");
+        }
+        String prefix = dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage() + "/";
+
+        List<String> ret = new ArrayList<>();
+        ListObjectsV2Request listObjectsReqManual = ListObjectsV2Request.builder().bucket(bucketName).prefix(prefix)
+                .build();
+
+        ListObjectsV2Response listObjectsResponse = null;
+        try {
+            listObjectsResponse = s3.listObjectsV2(listObjectsReqManual).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException("S3 listObjects: failed to get a listing for " + prefix, e);
+        }
+
+        if (listObjectsResponse == null) {
+            return ret;
+        }
+
+        List<S3Object> storedFilesSummary = new ArrayList<>(listObjectsResponse.contents());
+
+        try {
+            String nextContinuationToken = listObjectsResponse.nextContinuationToken();
+            while (nextContinuationToken != null) {
+                logger.fine("S3 listObjects: going to next page of list");
+                ListObjectsV2Request nextReq = ListObjectsV2Request.builder().bucket(bucketName).prefix(prefix)
+                        .continuationToken(nextContinuationToken).build();
+
+                ListObjectsV2Response nextResponse = s3.listObjectsV2(nextReq).get();
+                if (nextResponse != null) {
+                    storedFilesSummary.addAll(nextResponse.contents());
+                    nextContinuationToken = nextResponse.nextContinuationToken();
+                } else {
+                    nextContinuationToken = null;
+                }
+            }
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException("S3AccessIO: Failed to get objects for listing.", e);
+        }
+
+        for (S3Object item : storedFilesSummary) {
+            String fileName = item.key().substring(prefix.length());
+            ret.add(fileName);
+        }
+        return ret;
+    }
+
+    private void deleteFile(String fileName) throws IOException {
+        if (!this.canWrite()) {
+            open();
+        }
+        Dataset dataset = this.getDataset();
+        if (dataset == null) {
+            throw new IOException("This S3AccessIO object hasn't been properly initialized.");
+        }
+        String prefix = dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage() + "/";
+
+        DeleteObjectRequest deleteObjectRequest = DeleteObjectRequest.builder().bucket(bucketName)
+                .key(prefix + fileName).build();
+
+        try {
+            s3.deleteObject(deleteObjectRequest).get();
+        } catch (InterruptedException | ExecutionException e) {
+            if (e.getCause() instanceof S3Exception) {
+                S3Exception s3e = (S3Exception) e.getCause();
+                logger.warning("S3AccessIO: Unable to delete object " + s3e.getMessage());
+            } else {
+                logger.warning("S3AccessIO: Unexpected error while deleting object " + e.getMessage());
+            }
+            throw new IOException("Failed to delete file", e);
+        }
+    }
+    
+    @Override
+    public void closeInputStream() {
+        try {
+            ResponseInputStream<GetObjectResponse> responseInputStream = (ResponseInputStream<GetObjectResponse>) getInputStream();
+            if(responseInputStream!= null && responseInputStream.available()>0) {
+                responseInputStream.abort();
+            }
+        } catch (IOException e) {
+            errorMessage = e.getLocalizedMessage();
+        }
+        super.closeInputStream();
+    }
+
+    @Override
+    public List<String> cleanUp(Predicate<String> filter, boolean dryRun) throws IOException {
+        List<String> toDelete = this.listAllFiles().stream().filter(filter).collect(Collectors.toList());
+        if (dryRun) {
+            return toDelete;
+        }
+        for (String f : toDelete) {
+            this.deleteFile(f);
+        }
+        return toDelete;
+    }
+
+    @Override
+    public long retrieveSizeFromMedia() throws IOException {
+        key = getMainFileKey();
+        HeadObjectRequest headObjectRequest = HeadObjectRequest.builder().bucket(bucketName).key(key).build();
+
+        try {
+            HeadObjectResponse headObjectResponse = s3.headObject(headObjectRequest).get();
+            return headObjectResponse.contentLength();
+        } catch (InterruptedException | ExecutionException e) {
+            if (e.getCause() instanceof S3Exception) {
+                S3Exception s3e = (S3Exception) e.getCause();
+                throw new IOException("Cannot get S3 object " + key + " (" + s3e.getMessage() + ")", s3e);
+            } else {
+                throw new IOException("Unexpected error while retrieving S3 object metadata", e);
+            }
+        }
+    }
+
+    public static String getNewIdentifier(String driverId) {
+        return driverId + DataAccess.SEPARATOR + getConfigParamForDriver(driverId, BUCKET_NAME) + ":"
+                + FileUtil.generateStorageIdentifier();
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java
index 1043d3f44aa..bd59c11c5b1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java
@@ -20,27 +20,28 @@
 
 package edu.harvard.iq.dataverse.dataaccess;
 
-
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
+import edu.harvard.iq.dataverse.util.FileUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URL;
 import java.nio.channels.Channel;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-
-
-//import org.apache.commons.httpclient.Header;
-//import org.apache.commons.httpclient.methods.GetMethod;
-
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  *
@@ -50,30 +51,46 @@
 
 public abstract class StorageIO<T extends DvObject> {
 
+    static final String INGEST_SIZE_LIMIT = "ingestsizelimit";
+    static final String PUBLIC = "public";
+    static final String TYPE = "type";
+    static final String UPLOAD_REDIRECT = "upload-redirect";
+    static final String UPLOAD_OUT_OF_BAND = "upload-out-of-band";
+    protected static final String DOWNLOAD_REDIRECT = "download-redirect";
+
+
     public StorageIO() {
 
     }
 
-    public StorageIO(T dvObject) {
-        this(dvObject, null);
+    public StorageIO(String storageLocation, String driverId) {
+        this.driverId = driverId;
     }
 
-    public StorageIO(T dvObject, DataAccessRequest req) {
+    public StorageIO(T dvObject, DataAccessRequest req, String driverId) {
         this.dvObject = dvObject;
         this.req = req;
+        this.driverId = driverId;
         if (this.req == null) {
             this.req = new DataAccessRequest();
         }
+        if (this.driverId == null) {
+            this.driverId = DataAccess.FILE;
+        }
     }
 
-    
-    
     // Abstract methods to be implemented by the storage drivers:
 
     public abstract void open(DataAccessOption... option) throws IOException;
 
     protected boolean isReadAccess = false;
     protected boolean isWriteAccess = false;
+    // A public store is one in which files may be accessible outside Dataverse and
+    // therefore accessible without regard to Dataverse's access controls related to
+    // restriction and embargoes.
+    // Currently, this is just used to warn users at upload time rather than disable
+    // restriction/embargo.
+    static protected Map<String, Boolean> driverPublicAccessMap = new HashMap<String, Boolean>();
 
     public boolean canRead() {
         return isReadAccess;
@@ -85,112 +102,122 @@ public boolean canWrite() {
 
     public abstract String getStorageLocation() throws IOException;
 
-    // This method will return a Path, if the storage method is a 
-    // local filesystem. Otherwise should throw an IOException. 
+    // This method will return a Path, if the storage method is a
+    // local filesystem. Otherwise should throw an IOException.
     public abstract Path getFileSystemPath() throws IOException;
-        
-    public abstract boolean exists() throws IOException; 
-        
+
+    public abstract boolean exists() throws IOException;
+
     public abstract void delete() throws IOException;
-    
+
     // this method for copies a local Path (for ex., a
     // temp file, into this DataAccess location):
     public abstract void savePath(Path fileSystemPath) throws IOException;
-    
+
     // same, for an InputStream:
     /**
-     * This method copies a local InputStream into this DataAccess location.
-     * Note that the S3 driver implementation of this abstract method is problematic, 
-     * because S3 cannot save an object of an unknown length. This effectively 
-     * nullifies any benefits of streaming; as we cannot start saving until we 
-     * have read the entire stream. 
-     * One way of solving this would be to buffer the entire stream as byte[], 
-     * in memory, then save it... Which of course would be limited by the amount 
-     * of memory available, and thus would not work for streams larger than that. 
-     * So we have eventually decided to save save the stream to a temp file, then 
-     * save to S3. This is slower, but guaranteed to work on any size stream. 
-     * An alternative we may want to consider is to not implement this method 
-     * in the S3 driver, and make it throw the UnsupportedDataAccessOperationException, 
-     * similarly to how we handle attempts to open OutputStreams, in this and the 
-     * Swift driver. 
-     * (Not an issue in either FileAccessIO or SwiftAccessIO implementations)
+     * This method copies a local InputStream into this DataAccess location. Note
+     * that the S3 driver implementation of this abstract method is problematic,
+     * because S3 cannot save an object of an unknown length. This effectively
+     * nullifies any benefits of streaming; as we cannot start saving until we have
+     * read the entire stream. One way of solving this would be to buffer the entire
+     * stream as byte[], in memory, then save it... Which of course would be limited
+     * by the amount of memory available, and thus would not work for streams larger
+     * than that. So we have eventually decided to save save the stream to a temp
+     * file, then save to S3. This is slower, but guaranteed to work on any size
+     * stream. An alternative we may want to consider is to not implement this
+     * method in the S3 driver, and make it throw the
+     * UnsupportedDataAccessOperationException, similarly to how we handle attempts
+     * to open OutputStreams, in this and the Swift driver. (Not an issue in either
+     * FileAccessIO or SwiftAccessIO implementations)
      * 
      * @param inputStream InputStream we want to save
-     * @param auxItemTag String representing this Auxiliary type ("extension")
+     * @param auxItemTag  String representing this Auxiliary type ("extension")
      * @throws IOException if anything goes wrong.
-    */
+     */
     public abstract void saveInputStream(InputStream inputStream) throws IOException;
+
     public abstract void saveInputStream(InputStream inputStream, Long filesize) throws IOException;
-    
+
     // Auxiliary File Management: (new as of 4.0.2!)
-    
+
     // An "auxiliary object" is an abstraction of the traditional DVN/Dataverse
-    // mechanism of storing extra files related to the man StudyFile/DataFile - 
-    // such as "saved original" and cached format conversions for tabular files, 
-    // thumbnails for images, etc. - in physical files with the same file 
-    // name but various reserved extensions. 
-   
-    //This function retrieves auxiliary files related to datasets, and returns them as inputstream
-    public abstract InputStream getAuxFileAsInputStream(String auxItemTag) throws IOException ;
-    
+    // mechanism of storing extra files related to the man StudyFile/DataFile -
+    // such as "saved original" and cached format conversions for tabular files,
+    // thumbnails for images, etc. - in physical files with the same file
+    // name but various reserved extensions.
+
+    // This function retrieves auxiliary files related to datasets, and returns them
+    // as inputstream
+    public abstract InputStream getAuxFileAsInputStream(String auxItemTag) throws IOException;
+
     public abstract Channel openAuxChannel(String auxItemTag, DataAccessOption... option) throws IOException;
-    
-    public abstract long getAuxObjectSize(String auxItemTag) throws IOException; 
-    
-    public abstract Path getAuxObjectAsPath(String auxItemTag) throws IOException; 
-    
-    public abstract boolean isAuxObjectCached(String auxItemTag) throws IOException; 
-    
-    public abstract void backupAsAux(String auxItemTag) throws IOException; 
-    
-    public abstract void revertBackupAsAux(String auxItemTag) throws IOException; 
-    
-    // this method copies a local filesystem Path into this DataAccess Auxiliary location:
+
+    public abstract long getAuxObjectSize(String auxItemTag) throws IOException;
+
+    public abstract Path getAuxObjectAsPath(String auxItemTag) throws IOException;
+
+    public abstract boolean isAuxObjectCached(String auxItemTag) throws IOException;
+
+    public abstract void backupAsAux(String auxItemTag) throws IOException;
+
+    public abstract void revertBackupAsAux(String auxItemTag) throws IOException;
+
+    // this method copies a local filesystem Path into this DataAccess Auxiliary
+    // location:
     public abstract void savePathAsAux(Path fileSystemPath, String auxItemTag) throws IOException;
-    
+
     /**
-     * This method copies a local InputStream into this DataAccess Auxiliary location.
-     * Note that the S3 driver implementation of this abstract method is problematic, 
-     * because S3 cannot save an object of an unknown length. This effectively 
-     * nullifies any benefits of streaming; as we cannot start saving until we 
-     * have read the entire stream. 
-     * One way of solving this would be to buffer the entire stream as byte[], 
-     * in memory, then save it... Which of course would be limited by the amount 
-     * of memory available, and thus would not work for streams larger than that. 
-     * So we have eventually decided to save save the stream to a temp file, then 
-     * save to S3. This is slower, but guaranteed to work on any size stream. 
-     * An alternative we may want to consider is to not implement this method 
-     * in the S3 driver, and make it throw the UnsupportedDataAccessOperationException, 
-     * similarly to how we handle attempts to open OutputStreams, in this and the 
-     * Swift driver. 
-     * (Not an issue in either FileAccessIO or SwiftAccessIO implementations)
+     * This method copies a local InputStream into this DataAccess Auxiliary
+     * location. Note that the S3 driver implementation of this abstract method is
+     * problematic, because S3 cannot save an object of an unknown length. This
+     * effectively nullifies any benefits of streaming; as we cannot start saving
+     * until we have read the entire stream. One way of solving this would be to
+     * buffer the entire stream as byte[], in memory, then save it... Which of
+     * course would be limited by the amount of memory available, and thus would not
+     * work for streams larger than that. So we have eventually decided to save save
+     * the stream to a temp file, then save to S3. This is slower, but guaranteed to
+     * work on any size stream. An alternative we may want to consider is to not
+     * implement this method in the S3 driver, and make it throw the
+     * UnsupportedDataAccessOperationException, similarly to how we handle attempts
+     * to open OutputStreams, in this and the Swift driver. (Not an issue in either
+     * FileAccessIO or SwiftAccessIO implementations)
      * 
      * @param inputStream InputStream we want to save
-     * @param auxItemTag String representing this Auxiliary type ("extension")
+     * @param auxItemTag  String representing this Auxiliary type ("extension")
      * @throws IOException if anything goes wrong.
-    */
-    public abstract void saveInputStreamAsAux(InputStream inputStream, String auxItemTag) throws IOException; 
-    public abstract void saveInputStreamAsAux(InputStream inputStream, String auxItemTag, Long filesize) throws IOException;
-    
-    public abstract List<String>listAuxObjects() throws IOException;
-    
-    public abstract void deleteAuxObject(String auxItemTag) throws IOException; 
-    
+     */
+    public abstract void saveInputStreamAsAux(InputStream inputStream, String auxItemTag) throws IOException;
+
+    public abstract void saveInputStreamAsAux(InputStream inputStream, String auxItemTag, Long filesize)
+            throws IOException;
+
+    public abstract List<String> listAuxObjects() throws IOException;
+
+    public abstract void deleteAuxObject(String auxItemTag) throws IOException;
+
     public abstract void deleteAllAuxObjects() throws IOException;
 
     private DataAccessRequest req;
-    private InputStream in;
-    private OutputStream out; 
+    private InputStream in = null;
+    private OutputStream out;
     protected Channel channel;
     protected DvObject dvObject;
+    protected String driverId;
 
-    /*private int status;*/
+    /* private int status; */
     private long size;
-    
+
+    /**
+     * Where in the file to seek to when reading (default is zero bytes, the start
+     * of the file).
+     */
+    private long offset;
+
     private String mimeType;
     private String fileName;
     private String varHeader;
-    private String errorMessage;
+    protected String errorMessage;
 
     private String temporarySwiftUrl;
     private String tempUrlExpiry;
@@ -199,8 +226,8 @@ public boolean canWrite() {
     private String swiftContainerName;
 
     private boolean isLocalFile = false;
-    /*private boolean isRemoteAccess = false;*/
-    /*private boolean isHttpAccess = false;*/
+    /* private boolean isRemoteAccess = false; */
+    /* private boolean isHttpAccess = false; */
     private boolean noVarHeader = false;
 
     // For remote downloads:
@@ -211,13 +238,16 @@ public boolean canWrite() {
     private String swiftFileName;
 
     private String remoteUrl;
-    
+    protected String remoteStoreName = null;
+    protected URL remoteStoreUrl = null;
+
     // For HTTP-based downloads:
-    /*private GetMethod method = null;
-    private Header[] responseHeaders;*/
+    /*
+     * private GetMethod method = null; private Header[] responseHeaders;
+     */
 
     // getters:
-    
+
     public Channel getChannel() throws IOException {
         return channel;
     }
@@ -237,16 +267,15 @@ public ReadableByteChannel getReadChannel() throws IOException {
 
         return (ReadableByteChannel) channel;
     }
-    
-    public DvObject getDvObject()
-    {
+
+    public DvObject getDvObject() {
         return dvObject;
     }
-    
+
     public DataFile getDataFile() {
         return (DataFile) dvObject;
     }
-    
+
     public Dataset getDataset() {
         return (Dataset) dvObject;
     }
@@ -259,20 +288,24 @@ public DataAccessRequest getRequest() {
         return req;
     }
 
-    /*public int getStatus() {
-        return status;
-    }*/
+    /*
+     * public int getStatus() { return status; }
+     */
 
     public long getSize() {
         return size;
     }
 
+    public long getOffset() {
+        return offset;
+    }
+
     public InputStream getInputStream() throws IOException {
         return in;
     }
-    
+
     public OutputStream getOutputStream() throws IOException {
-        return out; 
+        return out;
     }
 
     public String getMimeType() {
@@ -295,53 +328,59 @@ public String getRemoteUrl() {
         return remoteUrl;
     }
 
-    public String getTemporarySwiftUrl(){
+    public String getTemporarySwiftUrl() {
         return temporarySwiftUrl;
     }
-    
+
     public String getTempUrlExpiry() {
         return tempUrlExpiry;
     }
-    
+
     public String getTempUrlSignature() {
         return tempUrlSignature;
     }
-    
+
     public String getSwiftFileName() {
         return swiftFileName;
     }
 
-    public String getSwiftContainerName(){
+    public String getSwiftContainerName() {
         return swiftContainerName;
     }
 
-    /*public GetMethod getHTTPMethod() {
-        return method;
+    public String getRemoteStoreName() {
+        return remoteStoreName;
     }
 
-    public Header[] getResponseHeaders() {
-        return responseHeaders;
-    }*/
+    public URL getRemoteStoreUrl() {
+        return remoteStoreUrl;
+    }
+
+    /*
+     * public GetMethod getHTTPMethod() { return method; }
+     * 
+     * public Header[] getResponseHeaders() { return responseHeaders; }
+     */
 
     public boolean isLocalFile() {
         return isLocalFile;
     }
-    
-    // "Direct Access" StorageIO is used to access a physical storage 
-    // location not associated with any dvObject. (For example, when we 
-    // are deleting a physical file left behind by a DataFile that's 
-    // already been deleted from the database). 
+
+    // "Direct Access" StorageIO is used to access a physical storage
+    // location not associated with any dvObject. (For example, when we
+    // are deleting a physical file left behind by a DataFile that's
+    // already been deleted from the database).
     public boolean isDirectAccess() {
-        return dvObject == null; 
+        return dvObject == null;
     }
 
-    /*public boolean isRemoteAccess() {
-        return isRemoteAccess;
-    }*/
+    /*
+     * public boolean isRemoteAccess() { return isRemoteAccess; }
+     */
 
-    /*public boolean isHttpAccess() {
-        return isHttpAccess;
-    }*/
+    /*
+     * public boolean isHttpAccess() { return isHttpAccess; }
+     */
 
     public boolean isDownloadSupported() {
         return isDownloadSupported;
@@ -368,22 +407,34 @@ public void setRequest(DataAccessRequest dar) {
         req = dar;
     }
 
-    /*public void setStatus(int s) {
-        status = s;
-    }*/
+    /*
+     * public void setStatus(int s) { status = s; }
+     */
 
     public void setSize(long s) {
         size = s;
     }
 
+    // open() has already been called. Now we can skip, if need be.
+    public void setOffset(long offset) throws IOException {
+        InputStream inputStream = getInputStream();
+        if (inputStream != null) {
+            inputStream.skip(offset);
+            // The skip has already been done. Why not record it.
+            this.offset = offset;
+        } else {
+            throw new IOException("Could not skip into InputStream because it is null");
+        }
+    }
+
     public void setInputStream(InputStream is) {
         in = is;
     }
-    
+
     public void setOutputStream(OutputStream os) {
-        out = os; 
-    } 
-    
+        out = os;
+    }
+
     public void setChannel(Channel c) {
         channel = c;
     }
@@ -408,45 +459,46 @@ public void setRemoteUrl(String u) {
         remoteUrl = u;
     }
 
-    public void setTemporarySwiftUrl(String u){
+    public void setTemporarySwiftUrl(String u) {
         temporarySwiftUrl = u;
     }
-    
-    public void setTempUrlExpiry(Long u){
+
+    public void setTempUrlExpiry(Long u) {
         tempUrlExpiry = String.valueOf(u);
     }
-    
+
     public void setSwiftFileName(String u) {
         swiftFileName = u;
     }
-    
-    public void setTempUrlSignature(String u){
+
+    public void setTempUrlSignature(String u) {
         tempUrlSignature = u;
     }
 
-    public void setSwiftContainerName(String u){
+    public void setSwiftContainerName(String u) {
         swiftContainerName = u;
     }
 
-    /*public void setHTTPMethod(GetMethod hm) {
-        method = hm;
-    }*/
+    /*
+     * public void setHTTPMethod(GetMethod hm) { method = hm; }
+     */
 
-    /*public void setResponseHeaders(Header[] headers) {
-        responseHeaders = headers;
-    }*/
+    /*
+     * public void setResponseHeaders(Header[] headers) { responseHeaders = headers;
+     * }
+     */
 
     public void setIsLocalFile(boolean f) {
         isLocalFile = f;
     }
 
-    /*public void setIsRemoteAccess(boolean r) {
-        isRemoteAccess = r;
-    }*/
+    /*
+     * public void setIsRemoteAccess(boolean r) { isRemoteAccess = r; }
+     */
 
-    /*public void setIsHttpAccess(boolean h) {
-        isHttpAccess = h;
-    }*/
+    /*
+     * public void setIsHttpAccess(boolean h) { isHttpAccess = h; }
+     */
 
     public void setIsDownloadSupported(boolean d) {
         isDownloadSupported = d;
@@ -464,12 +516,11 @@ public void setNoVarHeader(boolean nvh) {
         noVarHeader = nvh;
     }
 
-        // connection management methods:
-    /*public void releaseConnection() {
-        if (method != null) {
-            method.releaseConnection();
-        }
-    }*/
+    // connection management methods:
+    /*
+     * public void releaseConnection() { if (method != null) {
+     * method.releaseConnection(); } }
+     */
 
     public void closeInputStream() {
         if (in != null) {
@@ -486,7 +537,7 @@ public void closeInputStream() {
             }
         }
     }
-    
+
     public String generateVariableHeader(List<DataVariable> dvs) {
         String varHeader = null;
 
@@ -528,4 +579,110 @@ protected boolean isWriteAccessRequested(DataAccessOption... options) throws IOE
         // By default, we open the file in read mode:
         return false;
     }
+
+    public boolean isBelowIngestSizeLimit() {
+        long limit = Long.parseLong(getConfigParam(INGEST_SIZE_LIMIT, "-1"));
+        if (limit > 0 && getSize() > limit) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public boolean downloadRedirectEnabled() {
+        return false;
+    }
+
+    public boolean downloadRedirectEnabled(String auxObjectTag) {
+        return false;
+    }
+
+    public String generateTemporaryDownloadUrl(String auxiliaryTag, String auxiliaryType, String auxiliaryFileName)
+            throws IOException {
+        throw new UnsupportedDataAccessOperationException("Direct download not implemented for this storage type");
+    }
+
+    public static boolean isPublicStore(String driverId) {
+        // Read once and cache
+        if (!driverPublicAccessMap.containsKey(driverId)) {
+            driverPublicAccessMap.put(driverId,
+                    Boolean.parseBoolean(getConfigParamForDriver(driverId, PUBLIC)));
+        }
+        return driverPublicAccessMap.get(driverId);
+    }
+
+    public static String getDriverPrefix(String driverId) {
+        return driverId + DataAccess.SEPARATOR;
+    }
+
+    public static boolean isDirectUploadEnabled(String driverId) {
+        return (getConfigParamForDriver(driverId, TYPE).equals(DataAccess.S3)
+                && Boolean.parseBoolean(getConfigParamForDriver(driverId, UPLOAD_REDIRECT)))
+                || Boolean.parseBoolean(getConfigParamForDriver(driverId, UPLOAD_OUT_OF_BAND));
+    }
+
+    //True by default, Stores (e.g. RemoteOverlay, Globus) can set this false to stop attempts to read bytes
+    public static boolean isDataverseAccessible(String driverId) {
+        return (true && !Boolean.parseBoolean(StorageIO.getConfigParamForDriver(driverId, AbstractRemoteOverlayAccessIO.FILES_NOT_ACCESSIBLE_BY_DATAVERSE)));
+    }
+    
+    // Check that storageIdentifier is consistent with store's config
+    // False will prevent direct uploads
+    static boolean isValidIdentifier(String driverId, String storageId) {
+        return false;
+    }
+
+    // Utility to verify the standard UUID pattern for stored files.
+    protected static boolean usesStandardNamePattern(String identifier) {
+
+        Pattern r = Pattern.compile("^[a-f,0-9]{11}-[a-f,0-9]{12}$");
+        Matcher m = r.matcher(identifier);
+        return m.find();
+    }
+
+    public abstract List<String> cleanUp(Predicate<String> filter, boolean dryRun) throws IOException;
+
+    /**
+     * A storage-type-specific mechanism for retrieving the size of a file. Intended
+     * primarily as a way to get the size before it has been recorded in the
+     * database, e.g. during direct/out-of-band transfers but could be useful to
+     * check the db values.
+     * 
+     * @return file size in bytes
+     * @throws IOException 
+     */
+    public abstract long retrieveSizeFromMedia() throws IOException;
+    
+    
+    /* Convenience methods to get a driver-specific parameter
+     * 
+     * - with or without a default
+     * - static or per object
+     * 
+     * @param parameterName
+     * @return the parameter value
+     */
+    
+    protected String getConfigParam(String parameterName) {
+        return getConfigParam(parameterName, null);
+    }
+
+    protected String getConfigParam(String parameterName, String defaultValue) {
+        return getConfigParamForDriver(this.driverId, parameterName, defaultValue);
+    }
+
+    public boolean isDataverseAccessible() {
+        return true;
+    }
+    
+    protected static String getConfigParamForDriver(String driverId, String parameterName) {
+        return getConfigParamForDriver(driverId, parameterName, null);
+    }
+    protected static String getConfigParamForDriver(String driverId, String parameterName, String defaultValue) {
+        return System.getProperty("dataverse.files." + driverId + "." + parameterName, defaultValue);
+    }
+    
+    public static String getNewIdentifier(String driverId) {
+        return driverId + DataAccess.SEPARATOR + FileUtil.generateStorageIdentifier();
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/StoredOriginalFile.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/StoredOriginalFile.java
index 63c067bbf50..068f11ccf85 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/StoredOriginalFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/StoredOriginalFile.java
@@ -26,6 +26,9 @@
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.util.logging.Logger;
+
+import org.apache.commons.io.IOUtils;
+
 /**
  *
  * @author Leonid Andreev
@@ -37,7 +40,7 @@ public StoredOriginalFile () {
         
     }
     
-    private static final String SAVED_ORIGINAL_FILENAME_EXTENSION = "orig";
+    public static final String SAVED_ORIGINAL_FILENAME_EXTENSION = "orig";
     
     public static StorageIO<DataFile> retreive(StorageIO<DataFile> storageIO) {
         String originalMimeType;
@@ -56,17 +59,18 @@ public static StorageIO<DataFile> retreive(StorageIO<DataFile> storageIO) {
 
         long storedOriginalSize; 
         InputStreamIO inputStreamIO;
-        
+        Channel storedOriginalChannel = null;
         try {
             storageIO.open();
-            Channel storedOriginalChannel = storageIO.openAuxChannel(SAVED_ORIGINAL_FILENAME_EXTENSION);
+            storedOriginalChannel = storageIO.openAuxChannel(SAVED_ORIGINAL_FILENAME_EXTENSION);
             storedOriginalSize = dataFile.getDataTable().getOriginalFileSize() != null ? 
                     dataFile.getDataTable().getOriginalFileSize() : 
                     storageIO.getAuxObjectSize(SAVED_ORIGINAL_FILENAME_EXTENSION);
             inputStreamIO = new InputStreamIO(Channels.newInputStream((ReadableByteChannel) storedOriginalChannel), storedOriginalSize);
             logger.fine("Opened stored original file as Aux "+SAVED_ORIGINAL_FILENAME_EXTENSION);
         } catch (IOException ioEx) {
-            // The original file not saved, or could not be opened.
+        	IOUtils.closeQuietly(storedOriginalChannel);
+        	// The original file not saved, or could not be opened.
             logger.fine("Failed to open stored original file as Aux "+SAVED_ORIGINAL_FILENAME_EXTENSION+"!");
             return null;
         }
@@ -81,27 +85,14 @@ public static StorageIO<DataFile> retreive(StorageIO<DataFile> storageIO) {
             inputStreamIO.setMimeType("application/x-unknown");
         }
 
-        String fileName = storageIO.getFileName();
-        if (fileName != null) {
-            if (originalMimeType != null) {
-                String origFileExtension = generateOriginalExtension(originalMimeType);
-                inputStreamIO.setFileName(fileName.replaceAll(".tab$", origFileExtension));
-            } else {
-                inputStreamIO.setFileName(fileName.replaceAll(".tab$", ""));
-            }
-        }
+        inputStreamIO.setFileName(dataFile.getOriginalFileName());
 
         return inputStreamIO;
 
     }
 
-    // TODO: 
-    // do what the comment below says - move this code into the file util, 
-    // or something like that!
-    // -- L.A. 4.0 beta15
-    // Shouldn't be here; should be part of the DataFileFormatType, or 
-    // something like that... 
-    
+    /* 
+            DataFile.getOriginalFileName() method replaces this code
     private static String generateOriginalExtension(String fileType) {
 
         if (fileType.equalsIgnoreCase("application/x-spss-sav")) {
@@ -125,5 +116,5 @@ private static String generateOriginalExtension(String fileType) {
         }
         logger.severe(fileType + " does not have an associated file extension");
         return "";
-    }
+    } */
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java
index 73ee28e17b9..717f46ffd60 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java
@@ -22,7 +22,10 @@
 import java.util.Formatter;
 import java.util.List;
 import java.util.Properties;
+import java.util.function.Predicate;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import org.javaswift.joss.client.factory.AccountFactory;
@@ -47,44 +50,60 @@ public class SwiftAccessIO<T extends DvObject> extends StorageIO<T> {
     private String swiftLocation; 
 
     private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.dataaccess.SwiftAccessIO");
-
-    public SwiftAccessIO() {
-        this((T)null);
-    }
-
-    public SwiftAccessIO(T dvObject) {
-        this(dvObject, null);
-    }
-
-    public SwiftAccessIO(T dvObject, DataAccessRequest req) {
-        super(dvObject, req);
-
+    private static final String IS_PUBLIC_CONTAINER = "isPublicContainer";
+    private static final String FOLDER_PATH_SEPARATOR = "folderPathSeparator";
+    private static final String DEFAULT_ENDPOINT = "defaultEndpoint";
+    private static final String TEMPORARY_URL_EXPIRY_TIME = "temporaryUrlExpiryTime";
+    private static final String AUTH_URL = "authUrl";
+    private static final String USERNAME = "username";
+    private static final String PASSWORD = "password";
+    private static final String TENANT = "tenant";
+    private static final String AUTH_TYPE = "authType";
+    private static final String HASH_KEY = "hashKey";
+    private static final String ENDPOINT = "endpoint";
+
+	public SwiftAccessIO() {
+		//Partially functional StorageIO object - constructor only for testing
+		super();
+	}
+	
+    public SwiftAccessIO(T dvObject, DataAccessRequest req, String driverId) {
+        super(dvObject, req, driverId);
+        readSettings();
         this.setIsLocalFile(false);
     }
     
-    public SwiftAccessIO(String swiftLocation) {
-        this((T)null);
+    public SwiftAccessIO(String swiftLocation, String driverId) {
+    	super(swiftLocation, driverId);
+    	readSettings();
         this.swiftLocation = swiftLocation;
+        this.setIsLocalFile(false);
     }
 
-    private Account account = null;
+    private void readSettings() {
+    	isPublicContainer = Boolean.parseBoolean(getConfigParam(IS_PUBLIC_CONTAINER, "true"));
+        swiftFolderPathSeparator = getConfigParam(FOLDER_PATH_SEPARATOR, "_");
+        swiftDefaultEndpoint = getConfigParam(DEFAULT_ENDPOINT);
+        tempUrlExpires = Integer.parseInt(getConfigParam(TEMPORARY_URL_EXPIRY_TIME, "60"));
+		
+	}
+
+	private Account account = null;
     private StoredObject swiftFileObject = null;
     private Container swiftContainer = null;
-    private boolean isPublicContainer = Boolean.parseBoolean(System.getProperty("dataverse.files.swift.isPublicContainer", "true"));
-    private String swiftFolderPathSeparator = System.getProperty("dataverse.files.swift.folderPathSeparator", "_");
-    private String swiftDefaultEndpoint = System.getProperty("dataverse.files.swift.defaultEndpoint");
+    private boolean isPublicContainer = true;
+    private String swiftFolderPathSeparator = "_";
+    private String swiftDefaultEndpoint = null;
 
     //for hash
     private static final String HMAC_SHA1_ALGORITHM = "HmacSHA1";
     
     //TODO: should this be dynamically generated based on size of file?
     //Also, this is in seconds
-    private static int TEMP_URL_EXPIRES = Integer.parseInt(System.getProperty("dataverse.files.swift.temporaryUrlExpiryTime", "60"));
+    private int tempUrlExpires = 60;
 
     private static int LIST_PAGE_LIMIT = 100;
 
-    public static String SWIFT_IDENTIFIER_PREFIX = "swift";
-
     @Override
     public void open(DataAccessOption... options) throws IOException {
         DataAccessRequest req = this.getRequest();
@@ -123,7 +142,8 @@ public void open(DataAccessOption... options) throws IOException {
                         && dataFile.getContentType().equals("text/tab-separated-values")
                         && dataFile.isTabularData()
                         && dataFile.getDataTable() != null
-                        && (!this.noVarHeader())) {
+                        && (!this.noVarHeader())
+                        && (!dataFile.getDataTable().isStoredWithVariableHeader())) {
 
                     List<DataVariable> datavariables = dataFile.getDataTable().getDataVariables();
                     String varHeaderLine = generateVariableHeader(datavariables);
@@ -503,7 +523,7 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
         if (dvObject instanceof DataFile) {
             Dataset owner = this.getDataFile().getOwner();
 
-            if (storageIdentifier.startsWith(SWIFT_IDENTIFIER_PREFIX + "://")) {
+            if (storageIdentifier.startsWith(this.driverId + DataAccess.SEPARATOR)) {
                 // This is a call on an already existing swift object. 
 
                 String[] swiftStorageTokens = storageIdentifier.substring(8).split(":", 3);    
@@ -547,17 +567,17 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
                 //setSwiftContainerName(swiftFolderPath);
                 //swiftFileName = dataFile.getDisplayName();
                 //Storage Identifier is now updated after the object is uploaded on Swift.
-                dvObject.setStorageIdentifier(SWIFT_IDENTIFIER_PREFIX + "://" + swiftDefaultEndpoint + ":" + swiftFolderPath + ":" + swiftFileName);
+                dvObject.setStorageIdentifier(this.driverId + DataAccess.SEPARATOR + swiftDefaultEndpoint + ":" + swiftFolderPath + ":" + swiftFileName);
             } else {
                 throw new IOException("SwiftAccessIO: unknown access mode.");
             }
         } else if (dvObject instanceof Dataset) {
             Dataset dataset = this.getDataset();
 
-            if (storageIdentifier.startsWith(SWIFT_IDENTIFIER_PREFIX + "://")) {
+            if (storageIdentifier.startsWith(this.driverId + DataAccess.SEPARATOR)) {
                 // This is a call on an already existing swift object. 
 
-                //TODO: determine how storage identifer will give us info
+                //TODO: determine how storage identifier will give us info
                 String[] swiftStorageTokens = storageIdentifier.substring(8).split(":", 3);
                 //number of tokens should be two because there is not main file
                 if (swiftStorageTokens.length != 2) {
@@ -596,7 +616,7 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
                     swiftPseudoFolderPathSeparator + dataset.getIdentifierForFileStorage();
 
                 swiftFileName = auxItemTag;
-                dvObject.setStorageIdentifier(SWIFT_IDENTIFIER_PREFIX + "://" + swiftEndPoint + ":" + swiftFolderPath);
+                dvObject.setStorageIdentifier(this.driverId + DataAccess.SEPARATOR + swiftEndPoint + ":" + swiftFolderPath);
             } else {
                 throw new IOException("SwiftAccessIO: unknown access mode.");
             }
@@ -623,7 +643,7 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
         other swiftContainerName Object Store pseudo-folder can be created, which is
         not provide by the joss Java swift library as of yet.
          */
-        if (storageIdentifier.startsWith(SWIFT_IDENTIFIER_PREFIX + "://")) {
+        if (storageIdentifier.startsWith(this.driverId + DataAccess.SEPARATOR)) {
             // An existing swift object; the container must already exist as well.
             this.swiftContainer = account.getContainer(swiftContainerName);
         } else {
@@ -659,9 +679,9 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
             setRemoteUrl(getSwiftFileURI(fileObject));
             if (!this.isWriteAccess && !this.getDataFile().isIngestInProgress()) {
                 //otherwise this gets called a bunch on upload
-                setTemporarySwiftUrl(generateTemporarySwiftUrl(swiftEndPoint, swiftContainerName, swiftFileName, TEMP_URL_EXPIRES));
-                setTempUrlSignature(generateTempUrlSignature(swiftEndPoint, swiftContainerName, swiftFileName, TEMP_URL_EXPIRES));
-                setTempUrlExpiry(generateTempUrlExpiry(TEMP_URL_EXPIRES, System.currentTimeMillis()));
+                setTemporarySwiftUrl(generateTemporarySwiftUrl(swiftEndPoint, swiftContainerName, swiftFileName, tempUrlExpires));
+                setTempUrlSignature(generateTempUrlSignature(swiftEndPoint, swiftContainerName, swiftFileName, tempUrlExpires));
+                setTempUrlExpiry(generateTempUrlExpiry(tempUrlExpires, System.currentTimeMillis()));
             }
             setSwiftFileName(swiftFileName);
 
@@ -732,12 +752,12 @@ private StoredObject openSwiftAuxFile(boolean writeAccess, String auxItemTag) th
     }
 
     Account authenticateWithSwift(String swiftEndPoint) throws IOException {
-        String swiftEndPointAuthUrl = System.getProperty("dataverse.files.swift.authUrl." + swiftEndPoint);
-        String swiftEndPointUsername = System.getProperty("dataverse.files.swift.username." + swiftEndPoint);
-        String swiftEndPointSecretKey = System.getProperty("dataverse.files.swift.password." + swiftEndPoint);
-        String swiftEndPointTenantName = System.getProperty("dataverse.files.swift.tenant." + swiftEndPoint);
-        String swiftEndPointAuthMethod = System.getProperty("dataverse.files.swift.authType." + swiftEndPoint);
-        String swiftEndPointTenantId = System.getProperty("dataverse.files.swift.tenant." + swiftEndPoint);
+        String swiftEndPointAuthUrl = getConfigParam(AUTH_URL + "." + swiftEndPoint);
+        String swiftEndPointUsername = getConfigParam(USERNAME + "." + swiftEndPoint);
+        String swiftEndPointSecretKey = getConfigParam(PASSWORD + "." + swiftEndPoint);
+        String swiftEndPointTenantName = getConfigParam(TENANT + "." + swiftEndPoint);
+        String swiftEndPointAuthMethod = getConfigParam(AUTH_TYPE + "." + swiftEndPoint);
+        String swiftEndPointTenantId = getConfigParam(TENANT + "." + swiftEndPoint);
 
         if (swiftEndPointAuthUrl == null || swiftEndPointUsername == null || swiftEndPointSecretKey == null
                 || "".equals(swiftEndPointAuthUrl) || "".equals(swiftEndPointUsername) || "".equals(swiftEndPointSecretKey)) {
@@ -806,9 +826,9 @@ private String getSwiftFileURI(StoredObject fileObject) throws IOException {
     private String hmac = null;
     public String generateTempUrlSignature(String swiftEndPoint, String containerName, String objectName, int duration) throws IOException {
         if (hmac == null || isExpiryExpired(generateTempUrlExpiry(duration, System.currentTimeMillis()), duration, System.currentTimeMillis())) {
-            String secretKey = System.getProperty("dataverse.files.swift.hashKey." + swiftEndPoint);
+            String secretKey = getConfigParam(HASH_KEY + "." + swiftEndPoint);
             if (secretKey == null) {
-                throw new IOException("Please input a hash key under dataverse.files.swift.hashKey." + swiftEndPoint);
+                throw new IOException("Please input a hash key under dataverse.files." + this.driverId + ".hashKey." + swiftEndPoint);
             }
             String path = "/v1/" + containerName + "/" + objectName;
             Long expires = generateTempUrlExpiry(duration, System.currentTimeMillis());
@@ -833,7 +853,7 @@ public long generateTempUrlExpiry(int duration, long currentTime) {
 
     private String temporaryUrl = null;
     private String generateTemporarySwiftUrl(String swiftEndPoint, String containerName, String objectName, int duration) throws IOException {
-        String baseUrl = System.getProperty("dataverse.files.swift.endpoint." + swiftEndPoint);
+        String baseUrl = getConfigParam(ENDPOINT + "." + swiftEndPoint);
         String path = "/v1/" + containerName + "/" + objectName;
         
         if (temporaryUrl == null || isExpiryExpired(generateTempUrlExpiry(duration, System.currentTimeMillis()), duration, System.currentTimeMillis())) {
@@ -859,17 +879,20 @@ public InputStream getAuxFileAsInputStream(String auxItemTag) throws IOException
         }
     }
 
+    private String getSwiftContainerName(Dataset dataset) {
+        String authorityNoSlashes = dataset.getAuthorityForFileStorage().replace("/", swiftFolderPathSeparator);
+        return dataset.getProtocolForFileStorage() + swiftFolderPathSeparator + authorityNoSlashes.replace(".", swiftFolderPathSeparator) +
+                swiftFolderPathSeparator + dataset.getIdentifierForFileStorage();
+    }
+
     @Override
     public String getSwiftContainerName() {
         if (dvObject instanceof DataFile) {
-            String authorityNoSlashes = this.getDataFile().getOwner().getAuthorityForFileStorage().replace("/", swiftFolderPathSeparator);
-            return this.getDataFile().getOwner().getProtocolForFileStorage() + swiftFolderPathSeparator
-                   +            authorityNoSlashes.replace(".", swiftFolderPathSeparator) +
-                swiftFolderPathSeparator + this.getDataFile().getOwner().getIdentifierForFileStorage();
+            return getSwiftContainerName(this.getDataFile().getOwner());
         }
         return null;
      }
-     
+
     //https://gist.github.com/ishikawa/88599
     public static String toHexString(byte[] bytes) {
         Formatter formatter = new Formatter();
@@ -888,5 +911,64 @@ public static String calculateRFC2104HMAC(String data, String key)
         mac.init(signingKey);
         return toHexString(mac.doFinal(data.getBytes()));
     }
-     
+
+    private List<String> listAllFiles() throws IOException {
+        if (!this.canWrite()) {
+            open(DataAccessOption.WRITE_ACCESS);
+        }
+        Dataset dataset = this.getDataset();
+        if (dataset == null) {
+            throw new IOException("This SwiftAccessIO object hasn't been properly initialized.");
+        }
+        String prefix = getSwiftContainerName(dataset) + swiftFolderPathSeparator;
+        
+        Collection<StoredObject> items; 
+        String lastItemName = null; 
+        List<String> ret = new ArrayList<>();
+
+        while ((items = this.swiftContainer.list(prefix, lastItemName, LIST_PAGE_LIMIT)) != null && items.size() > 0) {
+            for (StoredObject item : items) {
+                lastItemName = item.getName().substring(prefix.length());
+                ret.add(lastItemName);
+            }
+        }
+
+        return ret;
+    }
+
+    private void deleteFile(String fileName) throws IOException {
+        if (!this.canWrite()) {
+            open(DataAccessOption.WRITE_ACCESS);
+        }
+        Dataset dataset = this.getDataset();
+        if (dataset == null) {
+            throw new IOException("This SwiftAccessIO object hasn't been properly initialized.");
+        }
+        String prefix = getSwiftContainerName(dataset) + swiftFolderPathSeparator;
+        
+        StoredObject fileObject = this.swiftContainer.getObject(prefix + fileName);
+
+        if (!fileObject.exists()) {
+            throw new FileNotFoundException("SwiftAccessIO/Direct Access: " + fileName + " does not exist");
+        }
+
+        fileObject.delete();
+    }
+
+    @Override
+    public List<String> cleanUp(Predicate<String> filter, boolean dryRun) throws IOException {
+        List<String> toDelete = this.listAllFiles().stream().filter(filter).collect(Collectors.toList());
+        if (dryRun) {
+            return toDelete;
+        }
+        for (String f : toDelete) {
+            this.deleteFile(f);
+        }
+        return toDelete;
+    }
+
+    @Override
+    public long retrieveSizeFromMedia() throws IOException {
+        throw new UnsupportedDataAccessOperationException("InputStreamIO: this method is not supported in this DataAccess driver."); 
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/TabularSubsetGenerator.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/TabularSubsetGenerator.java
index c97dc747505..4ccdfb57af6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/TabularSubsetGenerator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/TabularSubsetGenerator.java
@@ -20,24 +20,23 @@
 
 package edu.harvard.iq.dataverse.dataaccess;
 
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.datavariable.DataVariable;
-import java.util.*;
-import java.util.Scanner;
-import java.util.logging.*;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 
 
-import org.apache.commons.lang.*;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**
@@ -49,313 +48,34 @@
  
 public class TabularSubsetGenerator implements SubsetGenerator {
 
-    private static Logger dbgLog = Logger.getLogger(TabularSubsetGenerator.class.getPackage().getName());
-
-    private static int COLUMN_TYPE_STRING = 1;
-    private static int COLUMN_TYPE_LONG   = 2;
-    private static int COLUMN_TYPE_DOUBLE = 3; 
-    private static int COLUMN_TYPE_FLOAT = 4; 
-    
-    private static int MAX_COLUMN_BUFFER = 8192;
-    
-    private FileChannel fileChannel = null; 
-    
-    private int varcount; 
-    private int casecount; 
-    private int subsetcount;
-    
-    private byte[][] columnEntries = null; 
+    private static Logger logger = Logger.getLogger(TabularSubsetGenerator.class.getPackage().getName());
 
-    
-    private ByteBuffer[] columnByteBuffers;
-    private int[] columnBufferSizes;
-    private int[] columnBufferOffsets;
-    
-    private long[] columnStartOffsets; 
-    private long[] columnTotalOffsets;
-    private long[] columnTotalLengths;
-    
-    public TabularSubsetGenerator() {
+    //private static int MAX_COLUMN_BUFFER = 8192;
         
-    }
-    
-    public TabularSubsetGenerator (DataFile datafile, List<DataVariable> variables) throws IOException {
-        if (!datafile.isTabularData()) {
-            throw new IOException("DataFile is not tabular data.");
-        }
-         
-        setVarCount(datafile.getDataTable().getVarQuantity().intValue()); 
-        setCaseCount(datafile.getDataTable().getCaseQuantity().intValue()); 
-        
-           
-        
-        StorageIO<DataFile> dataAccess = datafile.getStorageIO();
-        if (!dataAccess.isLocalFile()) {
-            throw new IOException("Subsetting is supported on local files only!");
-        }
-        
-        //File tabfile = datafile.getFileSystemLocation().toFile();
-        File tabfile = dataAccess.getFileSystemPath().toFile();
-        
-        File rotatedImageFile = getRotatedImage(tabfile, getVarCount(), getCaseCount());
-        long[] columnEndOffsets = extractColumnOffsets(rotatedImageFile, getVarCount(), getCaseCount()); 
-        
-        fileChannel = (FileChannel.open(Paths.get(rotatedImageFile.getAbsolutePath()), StandardOpenOption.READ));
-        
-        if (variables == null || variables.size() < 1 || variables.size() > getVarCount()) {
-            throw new IOException("Illegal number of variables in the subset request");
-        }
-        
-        subsetcount = variables.size();
-        columnTotalOffsets = new long[subsetcount];
-        columnTotalLengths = new long[subsetcount];
-        columnByteBuffers = new ByteBuffer[subsetcount];
-
-
-        
-        if (subsetcount == 1) {
-            if (!datafile.getDataTable().getId().equals(variables.get(0).getDataTable().getId())) {
-                throw new IOException("Variable in the subset request does not belong to the datafile.");
-            }
-            dbgLog.fine("single variable subset; setting fileChannel position to "+extractColumnOffset(columnEndOffsets, variables.get(0).getFileOrder()));
-            fileChannel.position(extractColumnOffset(columnEndOffsets, variables.get(0).getFileOrder()));
-            columnTotalLengths[0] = extractColumnLength(columnEndOffsets, variables.get(0).getFileOrder());
-            columnTotalOffsets[0] = 0;
-        } else {
-            columnEntries = new byte[subsetcount][];
-
-            columnBufferSizes = new int[subsetcount];
-            columnBufferOffsets = new int[subsetcount];
-            columnStartOffsets = new long[subsetcount];
-
-            int i = 0;
-            for (DataVariable var : variables) {
-                if (!datafile.getDataTable().getId().equals(var.getDataTable().getId())) {
-                    throw new IOException("Variable in the subset request does not belong to the datafile.");
-                }
-                columnByteBuffers[i] = ByteBuffer.allocate(MAX_COLUMN_BUFFER);
-                columnTotalLengths[i] = extractColumnLength(columnEndOffsets, var.getFileOrder());
-                columnStartOffsets[i] = extractColumnOffset(columnEndOffsets, var.getFileOrder());
-                if (columnTotalLengths[i] < MAX_COLUMN_BUFFER) {
-                    columnByteBuffers[i].limit((int)columnTotalLengths[i]);
-                }
-                fileChannel.position(columnStartOffsets[i]);
-                columnBufferSizes[i] = fileChannel.read(columnByteBuffers[i]);
-                columnBufferOffsets[i] = 0;
-                columnTotalOffsets[i] = columnBufferSizes[i];
-                i++;
-            }
-        }
-    }
-    
-    private int getVarCount() {
-        return varcount;
-    }
-    
-    private void setVarCount(int varcount) {
-        this.varcount = varcount; 
-    }
-    
-    private int getCaseCount() {
-        return casecount;
-    }
-    
-    private void setCaseCount(int casecount) {
-        this.casecount = casecount; 
-    }
-    
-    
-    /* 
-     * Note that this method operates on the *absolute* column number, i.e.
-     * the number of the physical column in the tabular file. This is stored
-     * in DataVariable.FileOrder. 
-     * This "column number" should not be confused with the number of column 
-     * in the subset request; a user can request any number of variable 
-     * columns, in an order that doesn't have to follow the physical order
-     * of the columns in the file. 
-    */
-    private long extractColumnOffset(long[] columnEndOffsets, int column) throws IOException {
-        if (columnEndOffsets == null || columnEndOffsets.length <= column) {
-            throw new IOException("Offsets table not initialized; or column out of bounds.");
-        }
-        long columnOffset;
+    public TabularSubsetGenerator() {
         
-        if (column > 0) {
-            columnOffset = columnEndOffsets[column - 1];
-        } else {
-            columnOffset = getVarCount() * 8; 
-        }
-        return columnOffset; 
     }
     
-    /* 
-     * See the comment for the method above. 
+    /**
+     * This class used to be much more complex. There were methods for subsetting
+     * from fixed-width field files; including using the optimized, "90 deg. rotated"
+     * versions of such files (i.e. you create a *columns-wise* copy of your data 
+     * file in which the columns are stored sequentially, and a table of byte 
+     * offsets of each column. You can then read individual variable columns 
+     * for cheap; at the expense of doubling the storage size of your tabular 
+     * data files. These methods were not used, so they were deleted (in Jan. 2024
+     * prior to 6.2.
+     * Please consult git history if you are interested in looking at that code. 
      */
-    private long extractColumnLength(long[] columnEndOffsets, int column) throws IOException {
-        if (columnEndOffsets == null || columnEndOffsets.length <= column) {
-            throw new IOException("Offsets table not initialized; or column out of bounds.");
-        }
-        long columnLength; 
-        
-        if (column > 0) {
-            columnLength = columnEndOffsets[column] - columnEndOffsets[column - 1];
-        } else {
-            columnLength = columnEndOffsets[0] - varcount * 8;  
-        }
-        
-        return columnLength; 
-    }
-      
-    
-    private void bufferMoreColumnBytes(int column) throws IOException {
-        if (columnTotalOffsets[column] >= columnTotalLengths[column]) {
-            throw new IOException("attempt to buffer bytes past the column boundary");
-        }
-        fileChannel.position(columnStartOffsets[column] + columnTotalOffsets[column]);
-        
-        columnByteBuffers[column].clear();
-        if (columnTotalLengths[column] < columnTotalOffsets[column] + MAX_COLUMN_BUFFER) {
-            dbgLog.fine("Limiting the buffer to "+(columnTotalLengths[column] - columnTotalOffsets[column])+" bytes");
-            columnByteBuffers[column].limit((int) (columnTotalLengths[column] - columnTotalOffsets[column]));
-        }
-        columnBufferSizes[column] = fileChannel.read(columnByteBuffers[column]);
-        dbgLog.fine("Read "+columnBufferSizes[column]+" bytes for subset column "+column);
-        columnBufferOffsets[column] = 0;
-        columnTotalOffsets[column] += columnBufferSizes[column];
-    }
-    
-    public byte[] readColumnEntryBytes(int column) {
-        return readColumnEntryBytes(column, true);
-    }
-    
-    
-    public byte[] readColumnEntryBytes(int column, boolean addTabs) {
-        byte[] leftover = null; 
-        byte[] ret = null; 
-        
-        if (columnBufferOffsets[column] >= columnBufferSizes[column]) {
-            try {
-                bufferMoreColumnBytes(column);
-                if (columnBufferSizes[column] < 1) {
-                    return null;
-                }
-            } catch (IOException ioe) {
-                return null; 
-            }
-        }
-        
-        int byteindex = columnBufferOffsets[column];
-        try {
-            while (columnByteBuffers[column].array()[byteindex] != '\n') {
-                byteindex++;
-                if (byteindex == columnBufferSizes[column]) {
-                    // save the leftover: 
-                    if (leftover == null) {
-                        leftover = new byte[columnBufferSizes[column] - columnBufferOffsets[column]];
-                        System.arraycopy(columnByteBuffers[column].array(), columnBufferOffsets[column], leftover, 0, columnBufferSizes[column] - columnBufferOffsets[column]);
-                    } else {
-                        byte[] merged = new byte[leftover.length + columnBufferSizes[column]];
-                        
-                        System.arraycopy(leftover, 0, merged, 0, leftover.length);
-                        System.arraycopy(columnByteBuffers[column].array(), 0, merged, leftover.length, columnBufferSizes[column]);
-                        leftover = merged;
-                        merged = null; 
-                    }
-                    // read more bytes:
-                    bufferMoreColumnBytes(column);
-                    if (columnBufferSizes[column] < 1) {
-                        return null;
-                    }
-                    byteindex = 0;
-                }
-            }
-
-            // presumably, we have found our '\n':
-            if (leftover == null) {
-                ret = new byte[byteindex - columnBufferOffsets[column] + 1];
-                System.arraycopy(columnByteBuffers[column].array(), columnBufferOffsets[column], ret, 0, byteindex - columnBufferOffsets[column] + 1);
-            } else {
-                ret = new byte[leftover.length + byteindex + 1];
-                System.arraycopy(leftover, 0, ret, 0, leftover.length);
-                System.arraycopy(columnByteBuffers[column].array(), 0, ret, leftover.length, byteindex + 1);
-            }
-
-        } catch (IOException ioe) {
-            return null;
-        }
-
-        columnBufferOffsets[column] = (byteindex + 1);
-
-        if (column < columnBufferOffsets.length - 1) {
-            ret[ret.length - 1] = '\t';
-        }
-        return ret;
-    }
-    
-    public int readSingleColumnSubset(byte[] buffer) throws IOException {
-        if (columnTotalOffsets[0] == columnTotalLengths[0]) {
-            return -1;
-        }
-        
-        if (columnByteBuffers[0] == null) {
-            dbgLog.fine("allocating single column subset buffer.");
-            columnByteBuffers[0] = ByteBuffer.allocate(buffer.length);
-        }
-                
-        int bytesread = fileChannel.read(columnByteBuffers[0]);
-        dbgLog.fine("single column subset: read "+bytesread+" bytes.");
-        if (columnTotalOffsets[0] + bytesread > columnTotalLengths[0]) {
-            bytesread = (int)(columnTotalLengths[0] - columnTotalOffsets[0]);
-        }
-        System.arraycopy(columnByteBuffers[0].array(), 0, buffer, 0, bytesread);
-
-        columnTotalOffsets[0] += bytesread;
-        columnByteBuffers[0].clear();
-        return bytesread > 0 ? bytesread : -1;
-    }
-    
-    
-    public byte[] readSubsetLineBytes() throws IOException {
-        byte[] ret = null; 
-        int total = 0; 
-        
-        for (int i = 0; i < subsetcount; i++) {
-            columnEntries[i] = readColumnEntryBytes(i);
-            if (columnEntries[i] == null) {
-                throw new IOException("Failed to read subset line entry");
-            }
-            total += columnEntries[i].length;
-        }
         
-        ret = new byte[total];
-        int offset = 0;
-        for (int i = 0; i < subsetcount; i++) {
-            System.arraycopy(columnEntries[i], 0, ret, offset, columnEntries[i].length);
-            offset += columnEntries[i].length;
-        }
-        dbgLog.fine("line: "+new String(ret));
-        return ret;
-    } 
-    
-    
-    public void close() {
-        if (fileChannel != null) {
-            try {
-                fileChannel.close();
-            } catch (IOException ioe) {
-                // don't care.
-            }
-        }
-    }
-    
     public void subsetFile(String infile, String outfile, List<Integer> columns, Long numCases) {
         subsetFile(infile, outfile, columns, numCases, "\t");
     }
 
     public void subsetFile(String infile, String outfile, List<Integer> columns, Long numCases,
         String delimiter) {
-        try {
-            subsetFile(new FileInputStream(new File(infile)), outfile, columns, numCases, delimiter);
+        try (FileInputStream fis = new FileInputStream(new File(infile))){
+            subsetFile(fis, outfile, columns, numCases, delimiter);
         } catch (IOException ex) {
             throw new RuntimeException("Could not open file "+infile);
         }
@@ -364,33 +84,28 @@ public void subsetFile(String infile, String outfile, List<Integer> columns, Lon
 
     public void subsetFile(InputStream in, String outfile, List<Integer> columns, Long numCases,
         String delimiter) {
-        try {
-          Scanner scanner =  new Scanner(in);
-          scanner.useDelimiter("\\n");
-
-          BufferedWriter out = new BufferedWriter(new FileWriter(outfile));
-            for (long caseIndex = 0; caseIndex < numCases; caseIndex++) {
-                if (scanner.hasNext()) {
-                    String[] line = (scanner.next()).split(delimiter,-1);
-                    List<String> ln = new ArrayList<String>();
-                    for (Integer i : columns) {
-                        ln.add(line[i]);
+          try (Scanner scanner = new Scanner(in); BufferedWriter out = new BufferedWriter(new FileWriter(outfile))) {
+            scanner.useDelimiter("\\n");
+
+                for (long caseIndex = 0; caseIndex < numCases; caseIndex++) {
+                    if (scanner.hasNext()) {
+                        String[] line = (scanner.next()).split(delimiter,-1);
+                        List<String> ln = new ArrayList<String>();
+                        for (Integer i : columns) {
+                            ln.add(line[i]);
+                        }
+                        out.write(StringUtils.join(ln,"\t")+"\n");
+                    } else {
+                        throw new RuntimeException("Tab file has fewer rows than the determined number of cases.");
                     }
-                    out.write(StringUtils.join(ln,"\t")+"\n");
-                } else {
-                    throw new RuntimeException("Tab file has fewer rows than the determined number of cases.");
                 }
-            }
 
-          while (scanner.hasNext()) {
-              if (!"".equals(scanner.next()) ) {
-                  throw new RuntimeException("Tab file has extra nonempty rows than the determined number of cases.");
+              while (scanner.hasNext()) {
+                  if (!"".equals(scanner.next()) ) {
+                      throw new RuntimeException("Tab file has extra nonempty rows than the determined number of cases.");
 
+                  }
               }
-          }
-
-          scanner.close();
-          out.close();
 
         } catch (FileNotFoundException e) {
             e.printStackTrace();
@@ -405,1040 +120,220 @@ public void subsetFile(InputStream in, String outfile, List<Integer> columns, Lo
      * files, OK to use on small files:
      */
     
-    public static Double[] subsetDoubleVector(InputStream in, int column, int numCases) {
+    public static Double[] subsetDoubleVector(InputStream in, int column, int numCases, boolean skipHeader) {
         Double[] retVector = new Double[numCases];
-        Scanner scanner = new Scanner(in);
-        scanner.useDelimiter("\\n");
-
-        for (int caseIndex = 0; caseIndex < numCases; caseIndex++) {
-            if (scanner.hasNext()) {
-                String[] line = (scanner.next()).split("\t", -1);
-
-                // Verified: new Double("nan") works correctly, 
-                // resulting in Double.NaN;
-                // Double("[+-]Inf") doesn't work however; 
-                // (the constructor appears to be expecting it
-                // to be spelled as "Infinity", "-Infinity", etc. 
-                if ("inf".equalsIgnoreCase(line[column]) || "+inf".equalsIgnoreCase(line[column])) {
-                    retVector[caseIndex] = java.lang.Double.POSITIVE_INFINITY;
-                } else if ("-inf".equalsIgnoreCase(line[column])) {
-                    retVector[caseIndex] = java.lang.Double.NEGATIVE_INFINITY;
-                } else if (line[column] == null || line[column].equals("")) {
-                    // missing value:
-                    retVector[caseIndex] = null;
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
+            if (skipHeader) {
+                reader.readLine(); // Skip the header line
+            }
+            
+            String line;
+            int caseIndex = 0;
+            while ((line = reader.readLine()) != null && caseIndex < numCases) {
+                String[] fields = line.split("\t", -1);
+                if (fields.length > column) {
+                    retVector[caseIndex] = parseDoubleValue(fields[column]);
                 } else {
-                    try {
-                        retVector[caseIndex] = new Double(line[column]);
-                    } catch (NumberFormatException ex) {
-                        retVector[caseIndex] = null; // missing value
-                    }
+                    throw new RuntimeException("Column index out of bounds");
                 }
-
-            } else {
-                scanner.close();
-                throw new RuntimeException("Tab file has fewer rows than the stored number of cases!");
+                caseIndex++;
             }
-        }
-
-        int tailIndex = numCases;
-        while (scanner.hasNext()) {
-            String nextLine = scanner.next();
-            if (!"".equals(nextLine)) {
-                scanner.close();
-                throw new RuntimeException("Column " + column + ": tab file has more nonempty rows than the stored number of cases (" + numCases + ")! current index: " + tailIndex + ", line: " + nextLine);
-            }
-            tailIndex++;
-        }
-
-        scanner.close();
-        return retVector;
-
-    }
     
-    /*
-     * Same deal as with the method above - straightforward, but (potentially) slow. 
-     * Not a resource hog though - will only try to store one vector in memory. 
-     */
-    public static Float[] subsetFloatVector(InputStream in, int column, int numCases) {
-        Float[] retVector = new Float[numCases];
-        Scanner scanner = new Scanner(in);
-        scanner.useDelimiter("\\n");
-
-        for (int caseIndex = 0; caseIndex < numCases; caseIndex++) {
-            if (scanner.hasNext()) {
-                String[] line = (scanner.next()).split("\t", -1);
-                // Verified: new Float("nan") works correctly, 
-                // resulting in Float.NaN;
-                // Float("[+-]Inf") doesn't work however; 
-                // (the constructor appears to be expecting it
-                // to be spelled as "Infinity", "-Infinity", etc. 
-                if ("inf".equalsIgnoreCase(line[column]) || "+inf".equalsIgnoreCase(line[column])) {
-                    retVector[caseIndex] = java.lang.Float.POSITIVE_INFINITY;
-                } else if ("-inf".equalsIgnoreCase(line[column])) {
-                    retVector[caseIndex] = java.lang.Float.NEGATIVE_INFINITY;
-                } else if (line[column] == null || line[column].equals("")) {
-                    // missing value:
-                    retVector[caseIndex] = null;
-                } else {
-                    try {
-                        retVector[caseIndex] = new Float(line[column]);
-                    } catch (NumberFormatException ex) {
-                        retVector[caseIndex] = null; // missing value
-                    }
-                }
-            } else {
-                scanner.close();
+            if (caseIndex < numCases) {
                 throw new RuntimeException("Tab file has fewer rows than the stored number of cases!");
             }
-        }
-
-        int tailIndex = numCases;
-        while (scanner.hasNext()) {
-            String nextLine = scanner.next();
-            if (!"".equals(nextLine)) {
-                scanner.close();
-                throw new RuntimeException("Column "+column+": tab file has more nonempty rows than the stored number of cases ("+numCases+")! current index: "+tailIndex+", line: "+nextLine);
+    
+            // Check for extra non-empty lines
+            while ((line = reader.readLine()) != null) {
+                if (!line.trim().isEmpty()) {
+                    throw new RuntimeException("Tab file has more nonempty rows than the stored number of cases (" + numCases + ")!");
+                }
             }
-            tailIndex++;
+        } catch (IOException e) {
+            throw new RuntimeException("Error reading from input stream", e);
         }
-
-        scanner.close();
         return retVector;
-
     }
     
-    /*
-     * Same deal as with the method above - straightforward, but (potentially) slow. 
-     * Not a resource hog though - will only try to store one vector in memory. 
-     */
-    public static Long[] subsetLongVector(InputStream in, int column, int numCases) {
-        Long[] retVector = new Long[numCases];
-        Scanner scanner = new Scanner(in);
-        scanner.useDelimiter("\\n");
-
-        for (int caseIndex = 0; caseIndex < numCases; caseIndex++) {
-            if (scanner.hasNext()) {
-                String[] line = (scanner.next()).split("\t", -1);
-                try {
-                    retVector[caseIndex] = new Long(line[column]);
-                } catch (NumberFormatException ex) {
-                    retVector[caseIndex] = null; // assume missing value
-                }
-            } else {
-                scanner.close();
-                throw new RuntimeException("Tab file has fewer rows than the stored number of cases!");
-            }
+    private static Double parseDoubleValue(String value) {
+        if (value == null || value.isEmpty()) {
+            return null; // missing value
         }
-
-        int tailIndex = numCases;
-        while (scanner.hasNext()) {
-            String nextLine = scanner.next();
-            if (!"".equals(nextLine)) {
-                scanner.close();
-                throw new RuntimeException("Column "+column+": tab file has more nonempty rows than the stored number of cases ("+numCases+")! current index: "+tailIndex+", line: "+nextLine);
+        value = value.toLowerCase();
+        if ("inf".equals(value) || "+inf".equals(value)) {
+            return Double.POSITIVE_INFINITY;
+        } else if ("-inf".equals(value)) {
+            return Double.NEGATIVE_INFINITY;
+        } else {
+            try {
+                return Double.parseDouble(value);
+            } catch (NumberFormatException ex) {
+                return null; // missing value
             }
-            tailIndex++;
         }
-
-        scanner.close();
-        return retVector;
-
     }
     
     /*
      * Same deal as with the method above - straightforward, but (potentially) slow. 
      * Not a resource hog though - will only try to store one vector in memory. 
      */
-    public static String[] subsetStringVector(InputStream in, int column, int numCases) {
-        String[] retVector = new String[numCases];
-        Scanner scanner = new Scanner(in);
-        scanner.useDelimiter("\\n");
-
-        for (int caseIndex = 0; caseIndex < numCases; caseIndex++) {
-            if (scanner.hasNext()) {
-                String[] line = (scanner.next()).split("\t", -1);
-                retVector[caseIndex] = line[column];
-                
-                
-                if ("".equals(line[column])) {
-                    // An empty string is a string missing value!
-                    // An empty string in quotes is an empty string!
-                    retVector[caseIndex] = null;
+    public static Float[] subsetFloatVector(InputStream in, int column, int numCases, boolean skipHeader) {
+        Float[] retVector = new Float[numCases];
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
+            if (skipHeader) {
+                reader.readLine(); // Skip the header line
+            }
+            
+            String line;
+            int caseIndex = 0;
+            while ((line = reader.readLine()) != null && caseIndex < numCases) {
+                String[] fields = line.split("\t", -1);
+                if (fields.length > column) {
+                    retVector[caseIndex] = parseFloatValue(fields[column]);
                 } else {
-                    // Strip the outer quotes:
-                    line[column] = line[column].replaceFirst("^\\\"", "");
-                    line[column] = line[column].replaceFirst("\\\"$", "");
-
-                    // We need to restore the special characters that 
-                    // are stored in tab files escaped - quotes, new lines 
-                    // and tabs. Before we do that however, we need to 
-                    // take care of any escaped backslashes stored in 
-                    // the tab file. I.e., "foo\t" should be transformed 
-                    // to "foo<TAB>"; but "foo\\t" should be transformed 
-                    // to "foo\t". This way new lines and tabs that were
-                    // already escaped in the original data are not 
-                    // going to be transformed to unescaped tab and 
-                    // new line characters!
-                    String[] splitTokens = line[column].split(Matcher.quoteReplacement("\\\\"), -2);
-
-                    // (note that it's important to use the 2-argument version 
-                    // of String.split(), and set the limit argument to a
-                    // negative value; otherwise any trailing backslashes 
-                    // are lost.)
-                    for (int i = 0; i < splitTokens.length; i++) {
-                        splitTokens[i] = splitTokens[i].replaceAll(Matcher.quoteReplacement("\\\""), "\"");
-                        splitTokens[i] = splitTokens[i].replaceAll(Matcher.quoteReplacement("\\t"), "\t");
-                        splitTokens[i] = splitTokens[i].replaceAll(Matcher.quoteReplacement("\\n"), "\n");
-                        splitTokens[i] = splitTokens[i].replaceAll(Matcher.quoteReplacement("\\r"), "\r");
-                    }
-                    // TODO: 
-                    // Make (some of?) the above optional; for ex., we 
-                    // do need to restore the newlines when calculating UNFs;
-                    // But if we are subsetting these vectors in order to 
-                    // create a new tab-delimited file, they will 
-                    // actually break things! -- L.A. Jul. 28 2014
-
-                    line[column] = StringUtils.join(splitTokens, '\\');
-
-                    retVector[caseIndex] = line[column];
+                    throw new RuntimeException("Column index out of bounds");
                 }
-
-            } else {
-                scanner.close();
-                throw new RuntimeException("Tab file has fewer rows than the stored number of cases!");
+                caseIndex++;
             }
-        }
-
-        int tailIndex = numCases;
-        while (scanner.hasNext()) {
-            String nextLine = scanner.next();
-            if (!"".equals(nextLine)) {
-                scanner.close();
-                throw new RuntimeException("Column "+column+": tab file has more nonempty rows than the stored number of cases ("+numCases+")! current index: "+tailIndex+", line: "+nextLine);
+    
+            if (caseIndex < numCases) {
+                throw new RuntimeException("Tab file has fewer rows than the stored number of cases!");
             }
-            tailIndex++;
-        }
-
-        scanner.close();
-        return retVector;
-
-    }
-
-    /*
-     * Straightforward method for subsetting a tab-delimited data file, extracting
-     * all the columns representing continuous variables and returning them as 
-     * a 2-dimensional array of Doubles;
-     * Inefficient on large files, OK to use on small ones.
-     */
-    public static Double[][] subsetDoubleVectors(InputStream in, Set<Integer> columns, int numCases) throws IOException {
-        Double[][] retVector = new Double[columns.size()][numCases];
-        Scanner scanner = new Scanner(in);
-        scanner.useDelimiter("\\n");
-
-        for (int caseIndex = 0; caseIndex < numCases; caseIndex++) {
-            if (scanner.hasNext()) {
-                String[] line = (scanner.next()).split("\t", -1);
-                int j = 0;
-                for (Integer i : columns) {
-                    try {
-                        // TODO: verify that NaN and +-Inf are going to be
-                        // handled correctly here! -- L.A. 
-                        // NO, "+-Inf" is not handled correctly; see the 
-                        // comment further down below. 
-                        retVector[j][caseIndex] = new Double(line[i]);
-                    } catch (NumberFormatException ex) {
-                        retVector[j][caseIndex] = null; // missing value
-                    }
-                    j++; 
+    
+            // Check for extra non-empty lines
+            while ((line = reader.readLine()) != null) {
+                if (!line.trim().isEmpty()) {
+                    throw new RuntimeException("Tab file has more nonempty rows than the stored number of cases (" + numCases + ")!");
                 }
-            } else {
-                scanner.close();
-                throw new IOException("Tab file has fewer rows than the stored number of cases!");
-            }
-        }
-
-        int tailIndex = numCases;
-        while (scanner.hasNext()) {
-            String nextLine = scanner.next();
-            if (!"".equals(nextLine)) {
-                scanner.close();
-                throw new IOException("Tab file has more nonempty rows than the stored number of cases ("+numCases+")! current index: "+tailIndex+", line: "+nextLine);
             }
-            tailIndex++;
+        } catch (IOException e) {
+            throw new RuntimeException("Error reading from input stream", e);
         }
-
-        scanner.close();
         return retVector;
-
-    }
-    
-    public String[] subsetStringVector(DataFile datafile, int column) throws IOException {
-        return (String[])subsetObjectVector(datafile, column, COLUMN_TYPE_STRING);
     }
     
-    public Double[] subsetDoubleVector(DataFile datafile, int column) throws IOException {
-        return (Double[])subsetObjectVector(datafile, column, COLUMN_TYPE_DOUBLE);
-    }
-    
-    public Long[] subsetLongVector(DataFile datafile, int column) throws IOException {
-        return (Long[])subsetObjectVector(datafile, column, COLUMN_TYPE_LONG);
-    }
-    
-    // Float methods are temporary; 
-    // In normal operations we'll be treating all the floating point types as 
-    // doubles. I need to be able to handle floats for some 4.0 vs 3.* ingest
-    // tests. -- L.A. 
-    
-    public Float[] subsetFloatVector(DataFile datafile, int column) throws IOException {
-        return (Float[])subsetObjectVector(datafile, column, COLUMN_TYPE_FLOAT);
-    }
-    
-    public String[] subsetStringVector(File tabfile, int column, int varcount, int casecount) throws IOException {
-        return (String[])subsetObjectVector(tabfile, column, varcount, casecount, COLUMN_TYPE_STRING);
-    }
-    
-    public Double[] subsetDoubleVector(File tabfile, int column, int varcount, int casecount) throws IOException {
-        return (Double[])subsetObjectVector(tabfile, column, varcount, casecount, COLUMN_TYPE_DOUBLE);
-    }
-    
-    public Long[] subsetLongVector(File tabfile, int column, int varcount, int casecount) throws IOException {
-        return (Long[])subsetObjectVector(tabfile, column, varcount, casecount, COLUMN_TYPE_LONG);
-    }
-    
-    public Float[] subsetFloatVector(File tabfile, int column, int varcount, int casecount) throws IOException {
-        return (Float[])subsetObjectVector(tabfile, column, varcount, casecount, COLUMN_TYPE_FLOAT);
-    }
-    
-    public Object[] subsetObjectVector(DataFile dataFile, int column, int columntype) throws IOException {
-        if (!dataFile.isTabularData()) {
-            throw new IOException("DataFile is not tabular data.");
-        }
-         
-        int varcount = dataFile.getDataTable().getVarQuantity().intValue(); 
-        int casecount = dataFile.getDataTable().getCaseQuantity().intValue(); 
-        
-        if (column >= varcount) {
-            throw new IOException("Column "+column+" is out of bounds.");
-        }
-        
-        StorageIO<DataFile> dataAccess = dataFile.getStorageIO();
-        if (!dataAccess.isLocalFile()) {
-            throw new IOException("Subsetting is supported on local files only!");
+    private static Float parseFloatValue(String value) {
+        if (value == null || value.isEmpty()) {
+            return null; // missing value
         }
-        
-        //File tabfile = datafile.getFileSystemLocation().toFile();
-        File tabfile = dataAccess.getFileSystemPath().toFile();
-
-        if (columntype == COLUMN_TYPE_STRING) {
-            String filename = dataFile.getFileMetadata().getLabel();
-            if (filename != null) {
-                filename = filename.replaceFirst("^_", "");
-                Integer fnumvalue = null; 
-                try {
-                    fnumvalue = new Integer(filename);
-                } catch (Exception ex){
-                    fnumvalue = null; 
-                }
-                if (fnumvalue != null) {
-                    //if ((fnumvalue.intValue() < 112497)) { // && (fnumvalue.intValue() > 60015)) {
-                    if ((fnumvalue.intValue() < 111931)) { // && (fnumvalue.intValue() > 60015)) {
-                        if (!(fnumvalue.intValue() == 60007
-                                || fnumvalue.intValue() == 59997
-                                || fnumvalue.intValue() == 60015
-                                || fnumvalue.intValue() == 59948
-                                || fnumvalue.intValue() == 60012
-                                || fnumvalue.intValue() == 52585
-                                || fnumvalue.intValue() == 60005
-                                || fnumvalue.intValue() == 60002
-                                || fnumvalue.intValue() == 59954
-                                || fnumvalue.intValue() == 60008
-                                || fnumvalue.intValue() == 54972
-                                || fnumvalue.intValue() == 55010
-                                || fnumvalue.intValue() == 54996
-                                || fnumvalue.intValue() == 53527
-                                || fnumvalue.intValue() == 53546
-                                || fnumvalue.intValue() == 55002
-                                || fnumvalue.intValue() == 55006
-                                || fnumvalue.intValue() == 54998
-                                || fnumvalue.intValue() == 52552
-                                // SPSS/SAV cases with similar issue - compat mode must be disabled
-                                //|| fnumvalue.intValue() == 101826 // temporary - tricky file with accents and v. 16...
-                                || fnumvalue.intValue() == 54618 // another SAV file, with long strings...
-                                || fnumvalue.intValue() == 54619 // [same]
-                                || fnumvalue.intValue() == 57983 
-                                || fnumvalue.intValue() == 58262
-                                || fnumvalue.intValue() == 58288
-                                || fnumvalue.intValue() == 58656
-                                || fnumvalue.intValue() == 59144
-                                // || fnumvalue.intValue() == 69626 [nope!]
-                                )) {
-                            dbgLog.info("\"Old\" file name detected; using \"compatibility mode\" for a character vector subset;");
-                            return subsetObjectVector(tabfile, column, varcount, casecount, columntype, true);
-                        }
-                    }
-                }
+        value = value.toLowerCase();
+        if ("inf".equals(value) || "+inf".equals(value)) {
+            return Float.POSITIVE_INFINITY;
+        } else if ("-inf".equals(value)) {
+            return Float.NEGATIVE_INFINITY;
+        } else {
+            try {
+                return Float.parseFloat(value);
+            } catch (NumberFormatException ex) {
+                return null; // missing value
             }
         }
-
-        return subsetObjectVector(tabfile, column, varcount, casecount, columntype);
     }
     
-    public Object[] subsetObjectVector(File tabfile, int column, int varcount, int casecount, int columntype) throws IOException {
-        return subsetObjectVector(tabfile, column, varcount, casecount, columntype, false);
-    }
-    
-    
-    
-    public Object[] subsetObjectVector(File tabfile, int column, int varcount, int casecount, int columntype, boolean compatmode) throws IOException {
-        
-        Object[] retVector = null; 
-        
-        boolean isString = false; 
-        boolean isDouble = false;
-        boolean isLong   = false; 
-        boolean isFloat  = false; 
-        
-        //Locale loc = new Locale("en", "US");
-        
-        if (columntype == COLUMN_TYPE_STRING) {
-            isString = true; 
-            retVector = new String[casecount];
-        } else if (columntype == COLUMN_TYPE_DOUBLE) {
-            isDouble = true; 
-            retVector = new Double[casecount];
-        } else if (columntype == COLUMN_TYPE_LONG) {
-            isLong = true; 
-            retVector = new Long[casecount];
-        } else if (columntype == COLUMN_TYPE_FLOAT){
-            isFloat = true;
-            retVector = new Float[casecount];
-        } else {
-            throw new IOException("Unsupported column type: "+columntype);
-        }
-        
-        File rotatedImageFile = getRotatedImage(tabfile, varcount, casecount);
-        long[] columnEndOffsets = extractColumnOffsets(rotatedImageFile, varcount, casecount); 
-        long columnOffset = 0; 
-        long columnLength = 0; 
-        
-        if (column > 0) {
-            columnOffset = columnEndOffsets[column - 1];
-            columnLength = columnEndOffsets[column] - columnEndOffsets[column - 1];
-        } else {
-            columnOffset = varcount * 8; 
-            columnLength = columnEndOffsets[0] - varcount * 8;  
-        }
-        
-        FileChannel fc = (FileChannel.open(Paths.get(rotatedImageFile.getAbsolutePath()), StandardOpenOption.READ));
-        fc.position(columnOffset);
-        int MAX_COLUMN_BUFFER = 8192;
-        
-        ByteBuffer in = ByteBuffer.allocate(MAX_COLUMN_BUFFER);
-        
-        if (columnLength < MAX_COLUMN_BUFFER) {
-          in.limit((int)(columnLength));
-        }
-        
-        long bytesRead = 0;
-        long bytesReadTotal = 0;
-        int caseindex = 0; 
-        int byteoffset = 0; 
-        byte[] leftover = null; 
-        
-        while (bytesReadTotal < columnLength) {
-            bytesRead = fc.read(in);
-            byte[] columnBytes = in.array();
-            int bytecount = 0; 
-
+    /*
+     * Same deal as with the method above - straightforward, but (potentially) slow. 
+     * Not a resource hog though - will only try to store one vector in memory. 
+     */
+    public static Long[] subsetLongVector(InputStream in, int column, int numCases, boolean skipHeader) {
+        Long[] retVector = new Long[numCases];
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
+            if (skipHeader) {
+                reader.readLine(); // Skip the header line
+            }
             
-            while (bytecount < bytesRead) {
-                if (columnBytes[bytecount] == '\n') {
-                    /*
-                    String token = new String(columnBytes, byteoffset, bytecount-byteoffset, "UTF8");
-
-                    if (leftover != null) {
-                        String leftoverString = new String (leftover, "UTF8");
-                        token = leftoverString + token;
-                        leftover = null;
-                    }
-                    */
-                    /* 
-                     * Note that the way I was doing it at first - above - 
-                     * was not quite the correct way - because I was creating UTF8
-                     * strings from the leftover bytes, and the bytes in the 
-                     * current buffer *separately*; which means, if a multi-byte
-                     * UTF8 character got split in the middle between one buffer
-                     * and the next, both chunks of it would become junk 
-                     * characters, on each side!
-                     * The correct way of doing it, of course, is to create a
-                     * merged byte buffer, and then turn it into a UTF8 string. 
-                     *      -- L.A. 4.0
-                     */
-                    String token = null; 
-                    
-                    if (leftover == null) {
-                        token = new String(columnBytes, byteoffset, bytecount-byteoffset, "UTF8");
-                    } else {
-                        byte[] merged = new byte[leftover.length + bytecount-byteoffset];
-                        
-                        System.arraycopy(leftover, 0, merged, 0, leftover.length);
-                        System.arraycopy(columnBytes, byteoffset, merged, leftover.length, bytecount-byteoffset);
-                        token = new String (merged, "UTF8");
-                        leftover = null;
-                        merged = null; 
-                    }
-                    
-                    if (isString) {
-                        if ("".equals(token)) {
-                            // An empty string is a string missing value!
-                            // An empty string in quotes is an empty string!
-                            retVector[caseindex] = null;
-                        } else {
-                            // Strip the outer quotes:
-                            token = token.replaceFirst("^\\\"", "");
-                            token = token.replaceFirst("\\\"$", "");
-                            
-                            // We need to restore the special characters that 
-                            // are stored in tab files escaped - quotes, new lines 
-                            // and tabs. Before we do that however, we need to 
-                            // take care of any escaped backslashes stored in 
-                            // the tab file. I.e., "foo\t" should be transformed 
-                            // to "foo<TAB>"; but "foo\\t" should be transformed 
-                            // to "foo\t". This way new lines and tabs that were
-                            // already escaped in the original data are not 
-                            // going to be transformed to unescaped tab and 
-                            // new line characters!
-                            
-                            String[] splitTokens = token.split(Matcher.quoteReplacement("\\\\"), -2);
-                            
-                            // (note that it's important to use the 2-argument version 
-                            // of String.split(), and set the limit argument to a
-                            // negative value; otherwise any trailing backslashes 
-                            // are lost.)
-                            
-                            for (int i = 0; i < splitTokens.length; i++) {
-                                splitTokens[i] = splitTokens[i].replaceAll(Matcher.quoteReplacement("\\\""), "\"");
-                                splitTokens[i] = splitTokens[i].replaceAll(Matcher.quoteReplacement("\\t"), "\t");
-                                splitTokens[i] = splitTokens[i].replaceAll(Matcher.quoteReplacement("\\n"), "\n");
-                                splitTokens[i] = splitTokens[i].replaceAll(Matcher.quoteReplacement("\\r"), "\r");
-                            }
-                            // TODO: 
-                            // Make (some of?) the above optional; for ex., we 
-                            // do need to restore the newlines when calculating UNFs;
-                            // But if we are subsetting these vectors in order to 
-                            // create a new tab-delimited file, they will 
-                            // actually break things! -- L.A. Jul. 28 2014
-                            
-                            token = StringUtils.join(splitTokens, '\\');
-                            
-                            // "compatibility mode" - a hack, to be able to produce
-                            // unfs identical to those produced by the "early" 
-                            // unf5 jar; will be removed in production 4.0. 
-                            // -- L.A. (TODO: ...)
-                            if (compatmode && !"".equals(token)) {
-                                if (token.length() > 128) {
-                                    if ("".equals(token.trim())) {
-                                        // don't ask... 
-                                        token = token.substring(0, 129);
-                                    } else {
-                                        token = token.substring(0, 128);
-                                        //token = String.format(loc, "%.128s", token);
-                                        token = token.trim();
-                                        //dbgLog.info("formatted and trimmed: "+token);
-                                    }
-                                } else {
-                                    if ("".equals(token.trim())) {
-                                        // again, don't ask; 
-                                        // - this replicates some bugginness 
-                                        // that happens inside unf5;
-                                        token = "null";
-                                    } else {
-                                        token = token.trim();
-                                    }
-                                }
-                            }
-                            
-                            retVector[caseindex] = token;
-                        }
-                    } else if (isDouble) {
-                        try {
-                            // TODO: verify that NaN and +-Inf are 
-                            // handled correctly here! -- L.A.
-                            // Verified: new Double("nan") works correctly, 
-                            // resulting in Double.NaN;
-                            // Double("[+-]Inf") doesn't work however; 
-                            // (the constructor appears to be expecting it
-                            // to be spelled as "Infinity", "-Infinity", etc. 
-                            if ("inf".equalsIgnoreCase(token) || "+inf".equalsIgnoreCase(token)) {
-                                retVector[caseindex] = java.lang.Double.POSITIVE_INFINITY;
-                            } else if ("-inf".equalsIgnoreCase(token)) {
-                                retVector[caseindex] = java.lang.Double.NEGATIVE_INFINITY;
-                            } else if (token == null || token.equals("")) {
-                                // missing value:
-                                retVector[caseindex] = null;
-                            } else {
-                                retVector[caseindex] = new Double(token);
-                            }
-                        } catch (NumberFormatException ex) {
-                            dbgLog.warning("NumberFormatException thrown for "+token+" as Double");
-
-                            retVector[caseindex] = null; // missing value
-                            // TODO: ?
-                        }
-                    } else if (isLong) {
-                        try {
-                            retVector[caseindex] = new Long(token);
-                        } catch (NumberFormatException ex) {
-                            retVector[caseindex] = null; // assume missing value
-                        }
-                    } else if (isFloat) {
-                        try {
-                            if ("inf".equalsIgnoreCase(token) || "+inf".equalsIgnoreCase(token)) {
-                                retVector[caseindex] = java.lang.Float.POSITIVE_INFINITY;
-                            } else if ("-inf".equalsIgnoreCase(token)) {
-                                retVector[caseindex] = java.lang.Float.NEGATIVE_INFINITY;
-                            } else if (token == null || token.equals("")) {
-                                // missing value:
-                                retVector[caseindex] = null;
-                            } else {
-                                retVector[caseindex] = new Float(token);
-                            }
-                        } catch (NumberFormatException ex) {
-                            dbgLog.warning("NumberFormatException thrown for "+token+" as Float");
-                            retVector[caseindex] = null; // assume missing value (TODO: ?)
-                        }
-                    }
-                    caseindex++;
-                    
-                    if (bytecount == bytesRead - 1) {
-                        byteoffset = 0;
-                    } else {
-                        byteoffset = bytecount + 1;
-                    }
+            String line;
+            int caseIndex = 0;
+            while ((line = reader.readLine()) != null && caseIndex < numCases) {
+                String[] fields = line.split("\t", -1);
+                if (fields.length > column) {
+                    retVector[caseIndex] = parseLongValue(fields[column]);
                 } else {
-                    if (bytecount == bytesRead - 1) {
-                        // We've reached the end of the buffer; 
-                        // This means we'll save whatever unused bytes left in 
-                        // it - i.e., the bytes between the last new line 
-                        // encountered and the end - in the leftover buffer. 
-                        
-                        // *EXCEPT*, there may be a case of a very long String
-                        // that is actually longer than MAX_COLUMN_BUFFER, in 
-                        // which case it is possible that we've read through
-                        // an entire buffer of bytes without finding any 
-                        // new lines... in this case we may need to add this
-                        // entire byte buffer to an already existing leftover 
-                        // buffer!
-                        if (leftover == null) {
-                            leftover = new byte[(int)bytesRead - byteoffset];
-                            System.arraycopy(columnBytes, byteoffset, leftover, 0, (int)bytesRead - byteoffset);
-                        } else {
-                            if (byteoffset != 0) {
-                                throw new IOException("Reached the end of the byte buffer, with some leftover left from the last read; yet the offset is not zero!");
-                            }
-                            byte[] merged = new byte[leftover.length + (int)bytesRead];
-
-                            System.arraycopy(leftover, 0, merged, 0, leftover.length);
-                            System.arraycopy(columnBytes, byteoffset, merged, leftover.length, (int)bytesRead);
-                            //leftover = null;
-                            leftover = merged;
-                            merged = null;   
-                        }
-                        byteoffset = 0;
-
-                    }
+                    throw new RuntimeException("Column index out of bounds");
                 }
-                bytecount++;
-            }
-            
-            bytesReadTotal += bytesRead; 
-            in.clear();
-            if (columnLength - bytesReadTotal < MAX_COLUMN_BUFFER) {
-                in.limit((int)(columnLength - bytesReadTotal));
+                caseIndex++;
             }
-        }
-        
-        fc.close();
-
-        if (caseindex != casecount) {
-            throw new IOException("Faile to read "+casecount+" tokens for column "+column);
-            //System.out.println("read "+caseindex+" tokens instead of expected "+casecount+".");
-        }
-        
-        return retVector; 
-    }
-    
-    private long[] extractColumnOffsets (File rotatedImageFile, int varcount, int casecount) throws IOException {
-         BufferedInputStream rotfileStream = new BufferedInputStream(new FileInputStream(rotatedImageFile));
-        
-        byte[] offsetHeader = new byte[varcount * 8];
-        long[] byteOffsets = new long[varcount];
-        
-        
-        int readlen = rotfileStream.read(offsetHeader); 
-        
-        if (readlen != varcount * 8) {
-            throw new IOException ("Could not read "+varcount*8+" header bytes from the rotated file.");
-        }
-        
-        for (int varindex = 0; varindex < varcount; varindex++) {
-            byte[] offsetBytes = new byte[8];
-            System.arraycopy(offsetHeader, varindex*8, offsetBytes, 0, 8);
-           
-            ByteBuffer offsetByteBuffer = ByteBuffer.wrap(offsetBytes);
-            byteOffsets[varindex] = offsetByteBuffer.getLong();
-            
-            //System.out.println(byteOffsets[varindex]);
-        }
-        
-        rotfileStream.close(); 
-        
-        return byteOffsets; 
-    }
     
-    private File getRotatedImage(File tabfile, int varcount, int casecount)  throws IOException {
-        String fileName = tabfile.getAbsolutePath();
-        String rotatedImageFileName = fileName + ".90d";
-        File rotatedImageFile = new File(rotatedImageFileName); 
-        if (rotatedImageFile.exists()) {
-            //System.out.println("Image already exists!");
-            return rotatedImageFile;
-        }
-        
-        return generateRotatedImage(tabfile, varcount, casecount);
-        
-    }
+            if (caseIndex < numCases) {
+                throw new RuntimeException("Tab file has fewer rows than the stored number of cases!");
+            }
     
-    private File generateRotatedImage (File tabfile, int varcount, int casecount) throws IOException {
-        // TODO: throw exceptions if bad file, zero varcount, etc. ...
-        
-        String fileName = tabfile.getAbsolutePath();
-        String rotatedImageFileName = fileName + ".90d";
-        
-        int MAX_OUTPUT_STREAMS = 32;
-        int MAX_BUFFERED_BYTES = 10 * 1024 * 1024; // 10 MB - for now?
-        int MAX_COLUMN_BUFFER = 8 * 1024; 
-        
-        // offsetHeader will contain the byte offsets of the individual column 
-        // vectors in the final rotated image file
-        byte[] offsetHeader = new byte[varcount * 8];
-        int[] bufferedSizes = new int[varcount];
-        long[] cachedfileSizes = new long[varcount];
-        File[] columnTempFiles = new File[varcount];
-        
-        for (int i = 0; i < varcount; i++) {
-            bufferedSizes[i] = 0; 
-            cachedfileSizes[i] = 0;
-        }
-        
-        // TODO: adjust MAX_COLUMN_BUFFER here, so that the total size is 
-        // no more than MAX_BUFFERED_BYTES (but no less than 1024 maybe?)
-        
-        byte[][] bufferedColumns = new byte [varcount][MAX_COLUMN_BUFFER];
-        
-        // read the tab-delimited file: 
-        
-        FileInputStream tabfileStream = new FileInputStream(tabfile);
-        
-        Scanner scanner = new Scanner(tabfileStream);
-        scanner.useDelimiter("\\n");
-        
-        for (int caseindex = 0; caseindex < casecount; caseindex++) {
-            if (scanner.hasNext()) {
-                String[] line = (scanner.next()).split("\t", -1);
-                // TODO: throw an exception if there are fewer tab-delimited 
-                // tokens than the number of variables specified. 
-                String token = "";
-                int tokensize = 0; 
-                for (int varindex = 0; varindex < varcount; varindex++) {
-                    // TODO: figure out the safest way to convert strings to 
-                    // bytes here. Is it going to be safer to use getBytes("UTF8")?
-                    // we are already making the assumption that the values 
-                    // in the tab file are in UTF8. -- L.A.
-                    token = line[varindex] + "\n";
-                    tokensize = token.getBytes().length;
-                    if (bufferedSizes[varindex]+tokensize > MAX_COLUMN_BUFFER) {
-                        // fill the buffer and dump its contents into the temp file:
-                        // (do note that there may be *several* MAX_COLUMN_BUFFERs
-                        // worth of bytes in the token!)
-                        
-                        int tokenoffset = 0; 
-
-                        if (bufferedSizes[varindex] != MAX_COLUMN_BUFFER) {
-                            tokenoffset = MAX_COLUMN_BUFFER-bufferedSizes[varindex];
-                            System.arraycopy(token.getBytes(), 0, bufferedColumns[varindex], bufferedSizes[varindex], tokenoffset);
-                        } // (otherwise the buffer is already full, and we should 
-                          // simply dump it into the temp file, without adding any 
-                          // extra bytes to it)
-                        
-                        File bufferTempFile = columnTempFiles[varindex]; 
-                        if (bufferTempFile == null) {
-                            bufferTempFile = File.createTempFile("columnBufferFile", "bytes");
-                            columnTempFiles[varindex] = bufferTempFile; 
-                        } 
-                        
-                        // *append* the contents of the buffer to the end of the
-                        // temp file, if already exists:
-                        BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream (bufferTempFile, true));
-                        outputStream.write(bufferedColumns[varindex], 0, MAX_COLUMN_BUFFER);
-                        cachedfileSizes[varindex] += MAX_COLUMN_BUFFER;
-                        
-                        // keep writing MAX_COLUMN_BUFFER-size chunks of bytes into 
-                        // the temp file, for as long as there's more than MAX_COLUMN_BUFFER
-                        // bytes left in the token:
-                        
-                        while (tokensize - tokenoffset > MAX_COLUMN_BUFFER) {
-                            outputStream.write(token.getBytes(), tokenoffset, MAX_COLUMN_BUFFER);
-                            cachedfileSizes[varindex] += MAX_COLUMN_BUFFER;
-                            tokenoffset += MAX_COLUMN_BUFFER;
-                        }
-                        
-                        outputStream.close();
-                        
-                        // buffer the remaining bytes and reset the buffered 
-                        // byte counter: 
-                        
-                        System.arraycopy(token.getBytes(), 
-                                tokenoffset, 
-                                bufferedColumns[varindex], 
-                                0,
-                                tokensize - tokenoffset); 
-                        
-                        bufferedSizes[varindex] = tokensize - tokenoffset; 
-                        
-                    } else {
-                        // continue buffering
-                        System.arraycopy(token.getBytes(), 0, bufferedColumns[varindex], bufferedSizes[varindex], tokensize);
-                        bufferedSizes[varindex] += tokensize; 
-                    }
+            // Check for extra non-empty lines
+            while ((line = reader.readLine()) != null) {
+                if (!line.trim().isEmpty()) {
+                    throw new RuntimeException("Tab file has more nonempty rows than the stored number of cases (" + numCases + ")!");
                 }
-            } else {
-                scanner.close();
-                throw new IOException("Tab file has fewer rows than the stored number of cases!");
             }
-            
+        } catch (IOException e) {
+            throw new RuntimeException("Error reading from input stream", e);
         }
-        
-        // OK, we've created the individual byte vectors of the tab file columns;
-        // they may be partially saved in temp files and/or in memory.
-        // We now need to go through all these buffers and create the final 
-        // rotated image file. 
-        
-        BufferedOutputStream finalOut = new BufferedOutputStream(new FileOutputStream (new File(rotatedImageFileName)));
-        
-        // but first we should create the offset header and write it out into 
-        // the final file; because it should be at the head, doh!
-        
-        long columnOffset = varcount * 8;
-        // (this is the offset of the first column vector; it is equal to the
-        // size of the offset header, i.e. varcount * 8 bytes)
-      
-        for (int varindex = 0; varindex < varcount; varindex++) {
-            long totalColumnBytes = cachedfileSizes[varindex] + bufferedSizes[varindex];
-            columnOffset+=totalColumnBytes;
-            //totalColumnBytes;
-            byte[] columnOffsetByteArray = ByteBuffer.allocate(8).putLong(columnOffset).array();
-            System.arraycopy(columnOffsetByteArray, 0, offsetHeader, varindex * 8, 8);
+        return retVector;
+    }
+    
+    private static Long parseLongValue(String value) {
+        if (value == null || value.isEmpty()) {
+            return null; // missing value
         }
-        
-        finalOut.write(offsetHeader, 0, varcount * 8);
-        
-        for (int varindex = 0; varindex < varcount; varindex++) {
-            long cachedBytesRead = 0; 
-            
-            // check if there is a cached temp file:
-            
-            File cachedTempFile = columnTempFiles[varindex]; 
-            if (cachedTempFile != null) {
-                byte[] cachedBytes = new byte[MAX_COLUMN_BUFFER];
-                BufferedInputStream cachedIn = new BufferedInputStream(new FileInputStream(cachedTempFile));
-                int readlen = 0; 
-                while ((readlen = cachedIn.read(cachedBytes)) > -1) {
-                    finalOut.write(cachedBytes, 0, readlen);
-                    cachedBytesRead += readlen;
-                }
-                cachedIn.close();
-                // delete the temp file: 
-                cachedTempFile.delete();
-                
-            }
-            
-            if (cachedBytesRead != cachedfileSizes[varindex]) {
-                finalOut.close();
-                throw new IOException("Could not read the correct number of bytes cached for column "+varindex+"; "+
-                        cachedfileSizes[varindex] + " bytes expected, "+cachedBytesRead+" read.");
-            }
-            
-            // then check if there are any bytes buffered for this column:
-            
-            if (bufferedSizes[varindex] > 0) {
-                finalOut.write(bufferedColumns[varindex], 0, bufferedSizes[varindex]);
-            }
-            
+        try {
+            return Long.parseLong(value);
+        } catch (NumberFormatException ex) {
+            return null; // missing value
         }
-        
-        finalOut.close();
-        return new File(rotatedImageFileName);
-
     }
-  
+    
     /*
-     * Test method for taking a "rotated" image, and reversing it, reassembling 
-     * all the columns in the original order. Which should result in a file 
-     * byte-for-byte identical file to the original tab-delimited version.
-     *
-     * (do note that this method is not efficiently implemented; it's only 
-     * being used for experiments so far, to confirm the accuracy of the 
-     * accuracy of generateRotatedImage(). It should not be used for any 
-     * practical means in the application!)
+     * Same deal as with the method above - straightforward, but (potentially) slow. 
+     * Not a resource hog though - will only try to store one vector in memory. 
      */
-    private void reverseRotatedImage (File rotfile, int varcount, int casecount) throws IOException {
-        // open the file, read in the offset header: 
-        BufferedInputStream rotfileStream = new BufferedInputStream(new FileInputStream(rotfile));
-        
-        byte[] offsetHeader = new byte[varcount * 8];
-        long[] byteOffsets = new long[varcount];
-        
-        int readlen = rotfileStream.read(offsetHeader); 
-        
-        if (readlen != varcount * 8) {
-            throw new IOException ("Could not read "+varcount*8+" header bytes from the rotated file.");
-        }
-        
-        for (int varindex = 0; varindex < varcount; varindex++) {
-            byte[] offsetBytes = new byte[8];
-            System.arraycopy(offsetHeader, varindex*8, offsetBytes, 0, 8);
-           
-            ByteBuffer offsetByteBuffer = ByteBuffer.wrap(offsetBytes);
-            byteOffsets[varindex] = offsetByteBuffer.getLong();
-            
-            //System.out.println(byteOffsets[varindex]);
-        }
-        
-        String [][] reversedMatrix = new String[casecount][varcount];
-        
-        long offset = varcount * 8; 
-        byte[] columnBytes; 
-        
-        for (int varindex = 0; varindex < varcount; varindex++) {
-            long columnLength = byteOffsets[varindex] - offset; 
-            
-            
-            
-            columnBytes = new byte[(int)columnLength];
-            readlen = rotfileStream.read(columnBytes);
-            
-            if (readlen != columnLength) {
-                throw new IOException ("Could not read "+columnBytes+" bytes for column "+varindex);
-            }
-            /*
-            String columnString = new String(columnBytes);
-            //System.out.print(columnString);
-            String[] values = columnString.split("\n", -1);
-            
-            if (values.length < casecount) {
-                throw new IOException("count mismatch: "+values.length+" tokens found for column "+varindex);
+    public static String[] subsetStringVector(InputStream in, int column, int numCases, boolean skipHeader) {
+        String[] retVector = new String[numCases];
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
+            if (skipHeader) {
+                reader.readLine(); // Skip the header line
             }
             
-            for (int caseindex = 0; caseindex < casecount; caseindex++) {
-                reversedMatrix[caseindex][varindex] = values[caseindex];
-            }*/
-            
-            int bytecount = 0; 
-            int byteoffset = 0; 
-            int caseindex = 0;
-            //System.out.println("generating value vector for column "+varindex);
-            while (bytecount < columnLength) {
-                if (columnBytes[bytecount] == '\n') {
-                    String token = new String(columnBytes, byteoffset, bytecount-byteoffset);
-                    reversedMatrix[caseindex++][varindex] = token;
-                    byteoffset = bytecount + 1;
+            String line;
+            int caseIndex = 0;
+            while ((line = reader.readLine()) != null && caseIndex < numCases) {
+                String[] fields = line.split("\t", -1);
+                if (fields.length > column) {
+                    retVector[caseIndex] = parseStringValue(fields[column]);
+                } else {
+                    throw new RuntimeException("Column index out of bounds");
                 }
-                bytecount++;
+                caseIndex++;
             }
-            
-            if (caseindex != casecount) {
-                throw new IOException("count mismatch: "+caseindex+" tokens found for column "+varindex);
+    
+            if (caseIndex < numCases) {
+                throw new RuntimeException("Tab file has fewer rows than the stored number of cases!");
             }
-            offset = byteOffsets[varindex];
-        }
-        
-        for (int caseindex = 0; caseindex < casecount; caseindex++) {
-            for (int varindex = 0; varindex < varcount; varindex++) {
-                System.out.print(reversedMatrix[caseindex][varindex]);
-                if (varindex < varcount-1) {
-                    System.out.print("\t");
-                } else {
-                    System.out.print("\n");
+    
+            // Check for extra non-empty lines
+            while ((line = reader.readLine()) != null) {
+                if (!line.trim().isEmpty()) {
+                    throw new RuntimeException("Tab file has more nonempty rows than the stored number of cases (" + numCases + ")!");
                 }
             }
+        } catch (IOException e) {
+            throw new RuntimeException("Error reading from input stream", e);
         }
-        
-        rotfileStream.close();
-        
-        
+        return retVector;
     }
     
-    /**
-     * main() method, for testing
-     * usage: java edu.harvard.iq.dataverse.dataaccess.TabularSubsetGenerator testfile.tab varcount casecount column type
-     * make sure the CLASSPATH contains ...
-     * 
-     */
-    
-    public static void main(String[] args) {
-        
-        String tabFileName = args[0]; 
-        int varcount = new Integer(args[1]).intValue();
-        int casecount = new Integer(args[2]).intValue();
-        int column = new Integer(args[3]).intValue();
-        String type = args[4];
-        
-        File tabFile = new File(tabFileName);
-        File rotatedImageFile = null; 
-        
-        TabularSubsetGenerator subsetGenerator = new TabularSubsetGenerator(); 
-        
-        /*
-        try {
-            rotatedImageFile = subsetGenerator.getRotatedImage(tabFile, varcount, casecount);
-        } catch (IOException ex) {
-            System.out.println(ex.getMessage());
+    private static String parseStringValue(String value) {
+        if (value.isEmpty() || "".equals(value)) {
+            return null; // An empty string is a string missing value
         }
-        */
-        
-        //System.out.println("\nFinished generating \"rotated\" column image file."); 
-                
-        //System.out.println("\nOffsets:");
-        
-        MathContext doubleMathContext = new MathContext(15, RoundingMode.HALF_EVEN);
-        String FORMAT_IEEE754 = "%+#.15e";
-        
-        try {
-            //subsetGenerator.reverseRotatedImage(rotatedImageFile, varcount, casecount);
-            //String[] columns = subsetGenerator.subsetStringVector(tabFile, column, varcount, casecount);
-            if ("string".equals(type)) {
-                String[] columns = subsetGenerator.subsetStringVector(tabFile, column, varcount, casecount);
-                for (int i = 0; i < casecount; i++) {
-                    System.out.println(columns[i]);
-                }
-            } else {
-
-                Double[] columns = subsetGenerator.subsetDoubleVector(tabFile, column, varcount, casecount);
-                for (int i = 0; i < casecount; i++) {
-                    if (columns[i] != null) {
-                        BigDecimal outBigDecimal = new BigDecimal(columns[i], doubleMathContext);
-                        System.out.println(String.format(FORMAT_IEEE754, outBigDecimal));
-                    } else {
-                        System.out.println("NA");
-                    }
-                    //System.out.println(columns[i]);
-                }
-            }
-        } catch (IOException ex) {
-            System.out.println(ex.getMessage());
+        // Strip the outer quotes:
+        value = value.replaceFirst("^\\\"", "").replaceFirst("\\\"$", "");
+    
+        // Unescape special characters
+        String[] splitTokens = value.split(Matcher.quoteReplacement("\\\\"), -2);
+        for (int i = 0; i < splitTokens.length; i++) {
+            splitTokens[i] = splitTokens[i].replaceAll(Matcher.quoteReplacement("\\\""), "\"")
+                                           .replaceAll(Matcher.quoteReplacement("\\t"), "\t")
+                                           .replaceAll(Matcher.quoteReplacement("\\n"), "\n")
+                                           .replaceAll(Matcher.quoteReplacement("\\r"), "\r");
         }
+        return StringUtils.join(splitTokens, '\\');
     }
-}
-
-
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/TabularSubsetInputStream.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/TabularSubsetInputStream.java
deleted file mode 100644
index 89e033353c1..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/TabularSubsetInputStream.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package edu.harvard.iq.dataverse.dataaccess;
-
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.datavariable.DataVariable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Leonid Andreev
- */
-public class TabularSubsetInputStream extends InputStream {
-    private static final Logger logger = Logger.getLogger(TabularSubsetInputStream.class.getCanonicalName());
-    
-    private TabularSubsetGenerator subsetGenerator = null;
-    private int numberOfSubsetVariables;
-    private int numberOfObservations; 
-    private int numberOfObservationsRead = 0;
-    private byte[] leftoverBytes = null; 
-    
-    public TabularSubsetInputStream(DataFile datafile, List<DataVariable> variables) throws IOException {
-        if (datafile == null) {
-            throw new IOException("Null datafile in subset request");
-        }
-        if (!datafile.isTabularData()) {
-            throw new IOException("Subset requested on a non-tabular data file");
-        }
-        numberOfObservations = datafile.getDataTable().getCaseQuantity().intValue();
-        
-        if (variables == null || variables.size() < 1) {
-            throw new IOException("Null or empty list of variables in subset request.");
-        }
-        numberOfSubsetVariables = variables.size();
-        subsetGenerator = new TabularSubsetGenerator(datafile, variables);
-
-    }
-    
-    //@Override
-    public int read() throws IOException {
-        throw new IOException("read() method not implemented; do not use.");
-    }
-
-    //@Override
-    public int read(byte[] b) throws IOException {
-        // TODO: 
-        // Move this code into TabularSubsetGenerator
-        logger.fine("subset input stream: read request, on a "+b.length+" byte buffer;");
-        
-        if (numberOfSubsetVariables == 1) {
-            logger.fine("calling the single variable subset read method");
-            return subsetGenerator.readSingleColumnSubset(b);
-        }
-        
-        int bytesread = 0; 
-        byte [] linebuffer; 
-        
-        // do we have a leftover?
-        if (leftoverBytes != null) {
-            if (leftoverBytes.length < b.length) {
-                System.arraycopy(leftoverBytes, 0, b, 0, leftoverBytes.length);
-                bytesread = leftoverBytes.length; 
-                leftoverBytes = null; 
-
-            } else {
-                // shouldn't really happen... unless it's a very large subset, 
-                // or a very long string, etc.
-                System.arraycopy(leftoverBytes, 0, b, 0, b.length);
-                byte[] tmp = new byte[leftoverBytes.length - b.length];
-                System.arraycopy(leftoverBytes, b.length, tmp, 0, leftoverBytes.length - b.length);
-                leftoverBytes = tmp; 
-                tmp = null; 
-                return b.length; 
-            }
-        }
-        
-        while (bytesread < b.length && numberOfObservationsRead < numberOfObservations) {
-            linebuffer = subsetGenerator.readSubsetLineBytes();
-            numberOfObservationsRead++;
-
-            if (bytesread + linebuffer.length < b.length) {
-                // copy linebuffer into the return buffer:
-                System.arraycopy(linebuffer, 0, b, bytesread, linebuffer.length);
-                bytesread += linebuffer.length;
-            } else {
-                System.arraycopy(linebuffer, 0, b, bytesread, b.length - bytesread);
-                // save the leftover;
-                if (bytesread + linebuffer.length > b.length) {
-                    leftoverBytes = new byte[bytesread + linebuffer.length - b.length];
-                    System.arraycopy(linebuffer, b.length - bytesread, leftoverBytes, 0, bytesread + linebuffer.length - b.length);
-                }
-                return b.length; 
-            }
-        }
-        
-        // and this means we've reached the end of the tab file!
-        
-        return bytesread > 0 ? bytesread : -1;
-    }
-    
-    //@Override
-    public void close() {
-        if (subsetGenerator != null) {
-            subsetGenerator.close();
-        }
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleException.java b/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleException.java
index 3329d92b7a9..474674bda73 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleException.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleException.java
@@ -1,7 +1,9 @@
 package edu.harvard.iq.dataverse.datacapturemodule;
 
+@Deprecated(forRemoval = true, since = "2024-07-07")
 public class DataCaptureModuleException extends Exception {
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public DataCaptureModuleException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleServiceBean.java
index c33b4e0fc71..bf5d4a0d6ab 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleServiceBean.java
@@ -6,8 +6,8 @@
 import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
 import java.io.Serializable;
-import javax.ejb.Stateless;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
 
 /**
  * This class contains all the methods that have external runtime dependencies
diff --git a/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtil.java b/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtil.java
index 1aa384d205e..094d3976133 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtil.java
@@ -8,14 +8,16 @@
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.Arrays;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
+@Deprecated(forRemoval = true, since = "2024-07-07")
 public class DataCaptureModuleUtil {
 
     private static final Logger logger = Logger.getLogger(DataCaptureModuleUtil.class.getCanonicalName());
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public static boolean rsyncSupportEnabled(String uploadMethodsSettings) {
         logger.fine("uploadMethodsSettings: " + uploadMethodsSettings);; 
         if (uploadMethodsSettings==null){
@@ -28,6 +30,7 @@ public static boolean rsyncSupportEnabled(String uploadMethodsSettings) {
     /**
      * generate JSON to send to DCM
      */
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public static JsonObject generateJsonForUploadRequest(AuthenticatedUser user, Dataset dataset) {
         JsonObjectBuilder jab = Json.createObjectBuilder();
         // The general rule should be to always pass the user id and dataset identifier to the DCM.
@@ -39,6 +42,7 @@ public static JsonObject generateJsonForUploadRequest(AuthenticatedUser user, Da
     /**
      * transfer script from DCM
      */
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public static ScriptRequestResponse getScriptFromRequest(HttpResponse<JsonNode> uploadRequest) {
         int status = uploadRequest.getStatus();
         JsonNode body = uploadRequest.getBody();
@@ -54,6 +58,7 @@ public static ScriptRequestResponse getScriptFromRequest(HttpResponse<JsonNode>
         return scriptRequestResponse;
     }
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     static UploadRequestResponse makeUploadRequest(HttpResponse<String> uploadRequest) {
         int status = uploadRequest.getStatus();
         String body = uploadRequest.getBody();
@@ -61,6 +66,7 @@ static UploadRequestResponse makeUploadRequest(HttpResponse<String> uploadReques
         return new UploadRequestResponse(uploadRequest.getStatus(), body);
     }
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public static String getMessageFromException(DataCaptureModuleException ex) {
         if (ex == null) {
             return "DataCaptureModuleException was null!";
@@ -76,6 +82,7 @@ public static String getMessageFromException(DataCaptureModuleException ex) {
         return message + " was caused by " + cause.getMessage();
     }
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public static String getScriptName(DatasetVersion datasetVersion) {
         return "upload-" + datasetVersion.getDataset().getIdentifier().replace("/", "_") + ".bash";
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetFieldsValidator.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetFieldsValidator.java
new file mode 100644
index 00000000000..c780bd30d7a
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetFieldsValidator.java
@@ -0,0 +1,69 @@
+package edu.harvard.iq.dataverse.dataset;
+
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
+import java.util.List;
+import java.util.StringJoiner;
+
+@Stateless
+@Named
+public class DatasetFieldsValidator {
+
+    @Inject
+    protected DatasetFieldServiceBean datasetFieldService;
+
+    public String validateFields(List<DatasetField> fields, DatasetVersion datasetVersion) {
+        StringJoiner errors = new StringJoiner(" ");
+
+        for (DatasetField dsf : fields) {
+            if (!datasetFieldService.isFieldRequiredInDataverse(dsf.getDatasetFieldType(), datasetVersion.getDataset().getOwner())) {
+                continue;
+            }
+
+            String fieldName = dsf.getDatasetFieldType().getDisplayName();
+
+            if (isEmptyMultipleValue(dsf)) {
+                errors.add(BundleUtil.getStringFromBundle("datasetFieldValidator.error.emptyRequiredMultipleValueForField", List.of(fieldName)));
+            } else if (!dsf.getDatasetFieldType().isAllowMultiples()) {
+                if (isEmptyControlledVocabulary(dsf)) {
+                    errors.add(BundleUtil.getStringFromBundle("datasetFieldValidator.error.emptyRequiredControlledVocabularyValueForField", List.of(fieldName)));
+                } else if (isEmptyCompoundValue(dsf)) {
+                    errors.add(BundleUtil.getStringFromBundle("datasetFieldValidator.error.emptyRequiredCompoundValueForField", List.of(fieldName)));
+                } else if (isEmptySingleValue(dsf)) {
+                    errors.add(BundleUtil.getStringFromBundle("datasetFieldValidator.error.emptyRequiredSingleValueForField", List.of(fieldName)));
+                }
+            }
+        }
+
+        return errors.length() > 0 ? errors.toString() : "";
+    }
+
+    private boolean isEmptyMultipleValue(DatasetField dsf) {
+        return dsf.getDatasetFieldType().isAllowMultiples() &&
+                dsf.getControlledVocabularyValues().isEmpty() &&
+                dsf.getDatasetFieldCompoundValues().isEmpty() &&
+                dsf.getDatasetFieldValues().isEmpty();
+    }
+
+    private boolean isEmptyControlledVocabulary(DatasetField dsf) {
+        return dsf.getDatasetFieldType().isControlledVocabulary() &&
+                dsf.getSingleControlledVocabularyValue().getStrValue().isEmpty();
+    }
+
+    private boolean isEmptyCompoundValue(DatasetField dsf) {
+        return dsf.getDatasetFieldType().isCompound() &&
+                dsf.getDatasetFieldCompoundValues().isEmpty();
+    }
+
+    private boolean isEmptySingleValue(DatasetField dsf) {
+        return !dsf.getDatasetFieldType().isControlledVocabulary() &&
+                !dsf.getDatasetFieldType().isCompound() &&
+                dsf.getSingleValue().getValue().isEmpty();
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetType.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetType.java
new file mode 100644
index 00000000000..c55324f66e3
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetType.java
@@ -0,0 +1,115 @@
+package edu.harvard.iq.dataverse.dataset;
+
+import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.license.License;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@NamedQueries({
+    @NamedQuery(name = "DatasetType.findAll",
+            query = "SELECT d FROM DatasetType d"),
+    @NamedQuery(name = "DatasetType.findById",
+            query = "SELECT d FROM DatasetType d WHERE d.id=:id"),
+    @NamedQuery(name = "DatasetType.findByName",
+            query = "SELECT d FROM DatasetType d WHERE d.name=:name"),
+    @NamedQuery(name = "DatasetType.deleteById",
+            query = "DELETE FROM DatasetType d WHERE d.id=:id"),})
+@Entity
+@Table(uniqueConstraints = {
+    @UniqueConstraint(columnNames = "name"),}
+)
+
+public class DatasetType implements Serializable {
+
+    public static final String DATASET_TYPE_DATASET = "dataset";
+    public static final String DATASET_TYPE_SOFTWARE = "software";
+    public static final String DATASET_TYPE_WORKFLOW = "workflow";
+    public static final String DEFAULT_DATASET_TYPE = DATASET_TYPE_DATASET;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    // Any constraints? @Pattern regexp?
+    @Column(nullable = false)
+    private String name;
+
+    /**
+     * The metadata blocks this dataset type is linked to.
+     */
+    @ManyToMany(cascade = {CascadeType.MERGE})
+    private List<MetadataBlock> metadataBlocks = new ArrayList<>();
+    
+    /**
+     * The Licenses this dataset type is linked to.
+     */
+    @ManyToMany(cascade = {CascadeType.MERGE})
+    private List<License> licenses = new ArrayList<>();
+
+    public DatasetType() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<MetadataBlock> getMetadataBlocks() {
+        return metadataBlocks;
+    }
+
+    public void setMetadataBlocks(List<MetadataBlock> metadataBlocks) {
+        this.metadataBlocks = metadataBlocks;
+    }
+    
+    public List<License> getLicenses() {
+        return licenses;
+    }
+
+    public void setLicenses(List<License> licenses) {
+        this.licenses = licenses;
+    }
+
+    public JsonObjectBuilder toJson() {
+        JsonArrayBuilder linkedMetadataBlocks = Json.createArrayBuilder();
+        for (MetadataBlock metadataBlock : this.getMetadataBlocks()) {
+            linkedMetadataBlocks.add(metadataBlock.getName());
+        }
+        JsonArrayBuilder availableLicenses = Json.createArrayBuilder();
+        for (License license : this.getLicenses()) {
+            availableLicenses.add(license.getName());
+        }
+        return Json.createObjectBuilder()
+                .add("id", getId())
+                .add("name", getName())
+                .add("linkedMetadataBlocks", linkedMetadataBlocks)
+                .add("availableLicenses", availableLicenses);
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetTypeServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetTypeServiceBean.java
new file mode 100644
index 00000000000..832182f2a4a
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetTypeServiceBean.java
@@ -0,0 +1,79 @@
+package edu.harvard.iq.dataverse.dataset;
+
+import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
+import edu.harvard.iq.dataverse.api.AbstractApiBean;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@Stateless
+@Named
+public class DatasetTypeServiceBean {
+
+    private static final Logger logger = Logger.getLogger(DatasetTypeServiceBean.class.getName());
+
+    @PersistenceContext
+    EntityManager em;
+
+    public List<DatasetType> listAll() {
+        return em.createNamedQuery("DatasetType.findAll", DatasetType.class).getResultList();
+    }
+
+    public DatasetType getById(long id) {
+        try {
+            return em.createNamedQuery("DatasetType.findById", DatasetType.class)
+                    .setParameter("id", id)
+                    .getSingleResult();
+        } catch (NoResultException noResultException) {
+            logger.log(Level.WARNING, "Couldn't find a dataset type with id " + id);
+            return null;
+        }
+    }
+
+    public DatasetType getByName(String name) {
+        try {
+            return em.createNamedQuery("DatasetType.findByName", DatasetType.class)
+                    .setParameter("name", name)
+                    .getSingleResult();
+        } catch (NoResultException noResultException) {
+            logger.log(Level.WARNING, "Couldn't find a dataset type named " + name);
+            return null;
+        }
+    }
+
+    public DatasetType save(DatasetType datasetType) throws AbstractApiBean.WrappedResponse {
+        if (datasetType.getId() != null) {
+            throw new AbstractApiBean.WrappedResponse(new IllegalArgumentException("There shouldn't be an ID in the request body"), null);
+        }
+        try {
+            em.persist(datasetType);
+            em.flush();
+        } catch (PersistenceException p) {
+            if (p.getMessage().contains("duplicate key")) {
+                throw new AbstractApiBean.WrappedResponse(new IllegalStateException("A dataset type with the same name is already present.", p), null);
+            } else {
+                throw p;
+            }
+        }
+        return datasetType;
+    }
+
+    public int deleteById(long id) throws AbstractApiBean.WrappedResponse {
+        try {
+            return em.createNamedQuery("DatasetType.deleteById").setParameter("id", id).executeUpdate();
+        } catch (PersistenceException p) {
+            if (p.getMessage().contains("violates foreign key constraint")) {
+                throw new AbstractApiBean.WrappedResponse(new IllegalStateException("Dataset type with id " + id + " is referenced and cannot be deleted.", p), null);
+            } else {
+                throw p;
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
index b844a9d109f..46f458c5403 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
@@ -1,46 +1,54 @@
 package edu.harvard.iq.dataverse.dataset;
 
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetField;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+
+import static edu.harvard.iq.dataverse.api.ApiConstants.DS_VERSION_DRAFT;
 import static edu.harvard.iq.dataverse.dataaccess.DataAccess.getStorageIO;
+
+import edu.harvard.iq.dataverse.dataaccess.InputStreamIO;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.logging.Logger;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
 import javax.imageio.ImageIO;
+
+import jakarta.enterprise.inject.spi.CDI;
 import org.apache.commons.io.IOUtils;
-import static edu.harvard.iq.dataverse.dataaccess.DataAccess.getStorageIO;
+import edu.harvard.iq.dataverse.datasetutility.FileSizeChecker;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.EnumUtils;
+import org.apache.logging.log4j.util.Strings;
 
 public class DatasetUtil {
 
     private static final Logger logger = Logger.getLogger(DatasetUtil.class.getCanonicalName());
+    public static final String datasetDefaultSummaryFieldNames = "dsDescription,subject,keyword,publication,notesText";
     public static String datasetLogoFilenameFinal = "dataset_logo_original";
     public static String datasetLogoThumbnail = "dataset_logo";
-    public static String thumb48addedByImageThumbConverter = ".thumb48";
+    public static String thumbExtension = ".thumb";
 
-    public static List<DatasetThumbnail> getThumbnailCandidates(Dataset dataset, boolean considerDatasetLogoAsCandidate) {
+    public static List<DatasetThumbnail> getThumbnailCandidates(Dataset dataset, boolean considerDatasetLogoAsCandidate, int size) {
         List<DatasetThumbnail> thumbnails = new ArrayList<>();
         if (dataset == null) {
             return thumbnails;
@@ -62,7 +70,7 @@ public static List<DatasetThumbnail> getThumbnailCandidates(Dataset dataset, boo
 
             InputStream in = null;
             try {
-                    in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumb48addedByImageThumbConverter);
+                    in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumbExtension + size);
             } catch (Exception ioex) {
             }
 
@@ -86,9 +94,10 @@ public static List<DatasetThumbnail> getThumbnailCandidates(Dataset dataset, boo
 
             if (dataFile != null && FileUtil.isThumbnailSupported(dataFile)
                     && ImageThumbConverter.isThumbnailAvailable(dataFile)
-                    && !dataFile.isRestricted()) {
+                    && !dataFile.isRestricted()
+                    && !FileUtil.isActivelyEmbargoed(dataFile)) {
                 String imageSourceBase64 = null;
-                imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(dataFile, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+                imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(dataFile, size);
 
                 if (imageSourceBase64 != null) {
                     DatasetThumbnail datasetThumbnail = new DatasetThumbnail(imageSourceBase64, dataFile);
@@ -105,13 +114,19 @@ public static List<DatasetThumbnail> getThumbnailCandidates(Dataset dataset, boo
      *
      * @param dataset
      * @param datasetVersion
-     * @return
+     * @param size of the requested thumbnail
+     * @return DatasetThumbnail object, or null if not available
      */
-    public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion datasetVersion) {
+    public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion datasetVersion, int size) {
         if (dataset == null) {
             return null;
         }
 
+        if (size == 0) {
+            // Size 0 will fail (and set the failure flag) and should never be sent
+            logger.warning("getThumbnail called with size 0");
+            return null;
+        }        
         StorageIO<Dataset> dataAccess = null;
                 
         try{
@@ -125,10 +140,11 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data
         try {
             if (dataAccess == null) {
                 logger.warning("getThumbnail(): Failed to initialize dataset StorageIO for " + dataset.getStorageIdentifier());
-            } else if (dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumb48addedByImageThumbConverter) != null) {
-                in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumb48addedByImageThumbConverter);
+            } else {
+                in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + ".thumb" + size);
             }
         } catch (IOException ex) {
+            in = null; 
             logger.fine("Dataset-level thumbnail file does not exist, or failed to open; will try to find an image file that can be used as the thumbnail.");
         }
 
@@ -150,6 +166,10 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data
         } else {
             DataFile thumbnailFile = dataset.getThumbnailFile();
 
+            if (thumbnailFile !=null && (thumbnailFile.isRestricted() || FileUtil.isActivelyEmbargoed(thumbnailFile))) {
+                logger.fine("Dataset (id :" + dataset.getId() + ") has a thumbnail (user selected or automatically chosen) but the file must have later been restricted or embargoed. Returning null.");
+                thumbnailFile= null;
+            }
             if (thumbnailFile == null) {
                 if (dataset.isUseGenericThumbnail()) {
                     logger.fine("Dataset (id :" + dataset.getId() + ") does not have a thumbnail and is 'Use Generic'.");
@@ -160,17 +180,14 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data
                         logger.fine("Dataset (id :" + dataset.getId() + ") does not have a thumbnail available that could be selected automatically.");
                         return null;
                     } else {
-                        String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(thumbnailFile, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+                        String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(thumbnailFile, size);
                         DatasetThumbnail defaultDatasetThumbnail = new DatasetThumbnail(imageSourceBase64, thumbnailFile);
                         logger.fine("thumbnailFile (id :" + thumbnailFile.getId() + ") will get thumbnail through automatic selection from DataFile id " + thumbnailFile.getId());
                         return defaultDatasetThumbnail;
                     }
                 }
-            } else if (thumbnailFile.isRestricted()) {
-                logger.fine("Dataset (id :" + dataset.getId() + ") has a thumbnail the user selected but the file must have later been restricted. Returning null.");
-                return null;
             } else {
-                String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(thumbnailFile, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+                String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(thumbnailFile, size);
                 DatasetThumbnail userSpecifiedDatasetThumbnail = new DatasetThumbnail(imageSourceBase64, thumbnailFile);
                 logger.fine("Dataset (id :" + dataset.getId() + ")  will get thumbnail the user specified from DataFile id " + thumbnailFile.getId());
                 return userSpecifiedDatasetThumbnail;
@@ -179,11 +196,11 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data
         }
     }
 
-    public static DatasetThumbnail getThumbnail(Dataset dataset) {
+    public static DatasetThumbnail getThumbnail(Dataset dataset, int size) {
         if (dataset == null) {
             return null;
         }
-        return getThumbnail(dataset, null);
+        return getThumbnail(dataset, null, size);
     }
 
     public static boolean deleteDatasetLogo(Dataset dataset) {
@@ -199,10 +216,12 @@ public static boolean deleteDatasetLogo(Dataset dataset) {
             }
 
             storageIO.deleteAuxObject(datasetLogoFilenameFinal);
-            storageIO.deleteAuxObject(datasetLogoThumbnail + thumb48addedByImageThumbConverter);
+            storageIO.deleteAuxObject(datasetLogoThumbnail + thumbExtension + ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
+            storageIO.deleteAuxObject(datasetLogoThumbnail + thumbExtension + ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
 
         } catch (IOException ex) {
-            logger.info("Failed to delete dataset logo: " + ex.getMessage());
+            logger.fine("Failed to delete dataset logo: " + ex.getMessage() + 
+                    " (this is most likely harmless; this method is often called without checking if the custom dataset logo was in fact present)");
             return false;
         }
         return true;
@@ -252,7 +271,7 @@ public static DataFile attemptToAutomaticallySelectThumbnailFromDataFiles(Datase
         for (FileMetadata fmd : datasetVersion.getFileMetadatas()) {
             DataFile testFile = fmd.getDataFile();
             // We don't want to use a restricted image file as the dedicated thumbnail:
-            if (!testFile.isRestricted() && FileUtil.isThumbnailSupported(testFile) && ImageThumbConverter.isThumbnailAvailable(testFile, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE)) {
+            if (!testFile.isRestricted() && !FileUtil.isActivelyEmbargoed(testFile) && FileUtil.isThumbnailSupported(testFile) && ImageThumbConverter.isThumbnailAvailable(testFile, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE)) {
                 return testFile;
             }
         }
@@ -260,7 +279,7 @@ public static DataFile attemptToAutomaticallySelectThumbnailFromDataFiles(Datase
         return null;
     }
 
-    public static Dataset persistDatasetLogoToStorageAndCreateThumbnail(Dataset dataset, InputStream inputStream) {
+    public static Dataset persistDatasetLogoToStorageAndCreateThumbnails(Dataset dataset, InputStream inputStream) {
         if (dataset == null) {
             return null;
         }
@@ -268,16 +287,16 @@ public static Dataset persistDatasetLogoToStorageAndCreateThumbnail(Dataset data
         try {
             tmpFile = FileUtil.inputStreamToFile(inputStream);
         } catch (IOException ex) {
-            logger.severe(ex.getMessage());
+        	logger.severe("FileUtil.inputStreamToFile failed for tmpFile: " + ex.getMessage());
         }
 
         StorageIO<Dataset> dataAccess = null;
                 
         try{
-             dataAccess = DataAccess.createNewStorageIO(dataset,"placeholder");
+             dataAccess = DataAccess.getStorageIO(dataset);
         }
         catch(IOException ioex){
-            //TODO: Add a suitable waing message
+            //TODO: Add a suitable warning message
             logger.warning("Failed to save the file, storage id " + dataset.getStorageIdentifier() + " (" + ioex.getMessage() + ")");
         }
         
@@ -293,56 +312,79 @@ public static Dataset persistDatasetLogoToStorageAndCreateThumbnail(Dataset data
         try {
             fullSizeImage = ImageIO.read(tmpFile);
         } catch (IOException ex) {
-            logger.severe(ex.getMessage());
+        	IOUtils.closeQuietly(inputStream);
+            logger.severe("ImageIO.read failed for tmpFile: " + ex.getMessage());
             return null;
         }
         if (fullSizeImage == null) {
             logger.fine("fullSizeImage was null!");
+            IOUtils.closeQuietly(inputStream);
             return null;
         }
         int width = fullSizeImage.getWidth();
         int height = fullSizeImage.getHeight();
         FileChannel src = null;
-        try {
-            src = new FileInputStream(tmpFile).getChannel();
-        } catch (FileNotFoundException ex) {
-            logger.severe(ex.getMessage());
-            return null;
-        }
         FileChannel dest = null;
-        try {
-            dest = new FileOutputStream(tmpFile).getChannel();
-        } catch (FileNotFoundException ex) {
-            logger.severe(ex.getMessage());
-            return null;
-        }
-        try {
+        try (FileInputStream fis = new FileInputStream(tmpFile); FileOutputStream fos = new FileOutputStream(tmpFile)) {
+            src = fis.getChannel();
+            dest = fos.getChannel();
             dest.transferFrom(src, 0, src.size());
         } catch (IOException ex) {
-            logger.severe(ex.getMessage());
+        	IOUtils.closeQuietly(inputStream);
+            logger.severe("Error occurred during transfer using FileChannels: " + ex.getMessage());
             return null;
         }
         File tmpFileForResize = null;
         try {
+        	//The stream was used around line 274 above, so this creates an empty file (OK since all it is used for is getting a path, but not reusing it here would make it easier to close it above.)
             tmpFileForResize = FileUtil.inputStreamToFile(inputStream);
         } catch (IOException ex) {
-            logger.severe(ex.getMessage());
+            logger.severe("FileUtil.inputStreamToFile failed for tmpFileForResize: " + ex.getMessage());
             return null;
+        } finally {
+        	IOUtils.closeQuietly(inputStream);
+        }
+        // We'll try to pre-generate the rescaled versions in both the 
+        // DEFAULT_DATASET_LOGO (currently 140) and DEFAULT_CARDIMAGE_SIZE (48)
+        String thumbFileLocation = ImageThumbConverter.rescaleImage(fullSizeImage, width, height, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE, tmpFileForResize.toPath().toString());
+        if (thumbFileLocation == null) {
+            logger.warning("Rescale Thumbnail Image to logo failed");
+            dataset.setPreviewImageAvailable(false);
+            dataset.setUseGenericThumbnail(true);
+        } else {
+            logger.fine("thumbFileLocation = " + thumbFileLocation);
+            logger.fine("tmpFileLocation=" + tmpFileForResize.toPath().toString());
+            //now we must save the updated thumbnail
+            try {
+                dataAccess.savePathAsAux(Paths.get(thumbFileLocation), datasetLogoThumbnail + thumbExtension + ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
+            } catch (IOException ex) {
+                logger.severe("Failed to move updated thumbnail file from " + tmpFile.getAbsolutePath() + " to its DataAccess location" + ": " + ex);
+            }
         }
-        String thumbFileLocation = ImageThumbConverter.rescaleImage(fullSizeImage, width, height, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE, tmpFileForResize.toPath().toString());
-        logger.fine("thumbFileLocation = " + thumbFileLocation);
-        logger.fine("tmpFileLocation=" + tmpFileForResize.toPath().toString());
-        //now we must save the updated thumbnail 
-        try {
-            dataAccess.savePathAsAux(Paths.get(thumbFileLocation), datasetLogoThumbnail+thumb48addedByImageThumbConverter);
-        } catch (IOException ex) {
-            logger.severe("Failed to move updated thumbnail file from " + tmpFile.getAbsolutePath() + " to its DataAccess location" + ": " + ex);
+        
+        thumbFileLocation = ImageThumbConverter.rescaleImage(fullSizeImage, width, height, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE, tmpFileForResize.toPath().toString());
+        if (thumbFileLocation == null) {
+            logger.warning("Rescale Thumbnail Image to card failed");
+            dataset.setPreviewImageAvailable(false);
+            dataset.setUseGenericThumbnail(true);
+        } else {
+            logger.fine("thumbFileLocation = " + thumbFileLocation);
+            logger.fine("tmpFileLocation=" + tmpFileForResize.toPath().toString());
+            //now we must save the updated thumbnail
+            try {
+                dataAccess.savePathAsAux(Paths.get(thumbFileLocation), datasetLogoThumbnail + thumbExtension + ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+            } catch (IOException ex) {
+                logger.severe("Failed to move updated thumbnail file from " + tmpFile.getAbsolutePath() + " to its DataAccess location" + ": " + ex);
+            }
         }
+        
         //This deletes the tempfiles created for rescaling and encoding
         boolean tmpFileWasDeleted = tmpFile.delete();
         boolean originalTempFileWasDeleted = tmpFileForResize.delete();
         try {
-            Files.delete(Paths.get(thumbFileLocation));
+            if (thumbFileLocation != null) {
+                Files.delete(Paths.get(thumbFileLocation));
+            }
         } catch (IOException ioex) {
             logger.fine("Failed to delete temporary thumbnail file");
         }
@@ -351,30 +393,98 @@ public static Dataset persistDatasetLogoToStorageAndCreateThumbnail(Dataset data
         return dataset;
     }
 
-    public static InputStream getThumbnailAsInputStream(Dataset dataset) {
+    public static InputStream getThumbnailAsInputStream(Dataset dataset, int size) {
         if (dataset == null) {
             return null;
         }
-        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail();
+        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(size);
         if (datasetThumbnail == null) {
             return null;
         } else {
             String base64Image = datasetThumbnail.getBase64image();
             String leadingStringToRemove = FileUtil.DATA_URI_SCHEME;
             String encodedImg = base64Image.substring(leadingStringToRemove.length());
-            byte[] decodedImg = null;
-            try {
-                decodedImg = Base64.getDecoder().decode(encodedImg.getBytes("UTF-8"));
-                logger.fine("returning this many bytes for  " + "dataset id: " + dataset.getId() + ", persistentId: " + dataset.getIdentifier() + " :" + decodedImg.length);
-            } catch (UnsupportedEncodingException ex) {
-                logger.info("dataset thumbnail could not be decoded for dataset id " + dataset.getId() + ": " + ex);
-                return null;
-            }
+            byte[] decodedImg = Base64.getDecoder().decode(encodedImg.getBytes(StandardCharsets.UTF_8));
+            logger.fine("returning this many bytes for  " + "dataset id: " + dataset.getId() + ", persistentId: " + dataset.getIdentifier() + " :" + decodedImg.length);
             ByteArrayInputStream nonDefaultDatasetThumbnail = new ByteArrayInputStream(decodedImg);
             logger.fine("For dataset id " + dataset.getId() + " a thumbnail was found and is being returned.");
             return nonDefaultDatasetThumbnail;
         }
     }
+    
+    public static InputStream getLogoAsInputStream(Dataset dataset) {
+        if (dataset == null) {
+            return null;
+        }
+        StorageIO<Dataset> dataAccess = null;
+
+        try {
+            dataAccess = DataAccess.getStorageIO(dataset);
+        } catch (IOException ioex) {
+            logger.warning("getLogo(): Failed to initialize dataset StorageIO for " + dataset.getStorageIdentifier()
+                    + " (" + ioex.getMessage() + ")");
+        }
+
+        InputStream in = null;
+        try {
+            if (dataAccess == null) {
+                logger.warning(
+                        "getLogo(): Failed to initialize dataset StorageIO for " + dataset.getStorageIdentifier());
+            } else {
+                in = dataAccess.getAuxFileAsInputStream(datasetLogoFilenameFinal);
+            }
+        } catch (IOException ex) {
+            logger.fine(
+                    "Dataset-level thumbnail file does not exist, or failed to open; will try to find an image file that can be used as the thumbnail.");
+        }
+
+        if (in == null) {
+            DataFile thumbnailFile = dataset.getThumbnailFile();
+
+            if (thumbnailFile == null) {
+                if (dataset.isUseGenericThumbnail()) {
+                    logger.fine("Dataset (id :" + dataset.getId() + ") does not have a logo and is 'Use Generic'.");
+                    return null;
+                } else {
+                    thumbnailFile = attemptToAutomaticallySelectThumbnailFromDataFiles(dataset, null);
+                    if (thumbnailFile == null) {
+                        logger.fine("Dataset (id :" + dataset.getId()
+                                + ") does not have a logo available that could be selected automatically.");
+                        return null;
+                    } else {
+
+                    }
+                }
+            }
+            if (thumbnailFile.isRestricted()) {
+                logger.fine("Dataset (id :" + dataset.getId()
+                        + ") has a logo the user selected but the file must have later been restricted. Returning null.");
+                return null;
+            }
+
+            try {
+
+                boolean origImageFailed = thumbnailFile.isPreviewImageFail();
+                InputStreamIO isIO = ImageThumbConverter.getImageThumbnailAsInputStream(thumbnailFile.getStorageIO(),
+                        ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
+                if (!origImageFailed && thumbnailFile.isPreviewImageFail()) {
+                    // We found an older 0 length thumbnail. Newer image uploads will not have this issue.
+                    // Once cleaned up, this thumbnail will no longer have this issue
+                    // ImageThumbConverter fixed the DataFile
+                    // Now we need to update dataset since this is a bad logo
+                    DatasetServiceBean datasetService = CDI.current().select(DatasetServiceBean.class).get();
+                    datasetService.clearDatasetLevelThumbnail(dataset);
+                }
+                in = isIO != null ? isIO.getInputStream() : null;
+            } catch (IOException ioex) {
+                logger.warning("getLogo(): Failed to get logo from DataFile for " + dataset.getStorageIdentifier()
+                        + " (" + ioex.getMessage() + ")");
+                ioex.printStackTrace();
+            }
+
+        }
+        return in;
+    }
 
     /**
      * The dataset logo is the file that a user uploads which is *not* one of
@@ -382,7 +492,7 @@ public static InputStream getThumbnailAsInputStream(Dataset dataset) {
      * file that is uploaded. Rather, we delete it after first creating at least
      * one thumbnail from it. 
      */
-    public static boolean isDatasetLogoPresent(Dataset dataset) {
+    public static boolean isDatasetLogoPresent(Dataset dataset, int size) {
         if (dataset == null) {
             return false;
         }
@@ -391,36 +501,242 @@ public static boolean isDatasetLogoPresent(Dataset dataset) {
 
         try {
             dataAccess = DataAccess.getStorageIO(dataset);
-            return dataAccess.isAuxObjectCached(datasetLogoThumbnail + thumb48addedByImageThumbConverter);
+            return dataAccess.isAuxObjectCached(datasetLogoThumbnail + thumbExtension + size);
         } catch (IOException ioex) {
         }
         return false;
     }
 
-    public static List<DatasetField> getDatasetSummaryFields(DatasetVersion datasetVersion, String customFields) {
-        
-        List<DatasetField> datasetFields = new ArrayList<>();
+    public static List<DatasetField> getDatasetSummaryFields(DatasetVersion datasetVersion, String customFieldNames) {
+        Map<String, DatasetField> datasetFieldsSet = new HashMap<>();
+        for (DatasetField dsf : datasetVersion.getFlatDatasetFields()) {
+            datasetFieldsSet.put(dsf.getDatasetFieldType().getName(), dsf);
+        }
+        String[] summaryFieldNames = getDatasetSummaryFieldNames(customFieldNames);
+        List<DatasetField> datasetSummaryFields = new ArrayList<>();
+        for (String summaryFieldName : summaryFieldNames) {
+            DatasetField df = datasetFieldsSet.get(summaryFieldName);
+            if (df != null) {
+                datasetSummaryFields.add(df);
+            }
+        }
+        return datasetSummaryFields;
+    }
+
+    public static String[] getDatasetSummaryFieldNames(String customFieldNames) {
+        String summaryFieldNames;
+        // If the custom fields are empty, go with the default fields.
+        if(customFieldNames == null || customFieldNames.isEmpty()){
+            summaryFieldNames = datasetDefaultSummaryFieldNames;
+        } else {
+            summaryFieldNames = customFieldNames;
+        }
+        return summaryFieldNames.split("\\s*,\\s*");
+    }
+
+    public static boolean isRsyncAppropriateStorageDriver(Dataset dataset){
+        // ToDo - rsync was written before multiple store support and currently is hardcoded to use the DataAccess.S3 store.
+        // When those restrictions are lifted/rsync can be configured per store, this test should check that setting
+        // instead of testing for the 's3" store,
+        //This method is used by both the dataset and edit files page so one change here
+        //will fix both
+       return dataset.getEffectiveStorageDriverId().equals(DataAccess.S3);
+    }
+    
+    /**
+     * Given a dataset version, return it's size in human readable units such as
+     * 42.9 MB.There is a GetDatasetStorageSizeCommand but it's overly complex
+     * for the use case.
+     *
+     * @param original Use the original file size rather than the archival file
+     * size for tabular files.
+     */
+    public static String getDownloadSize(DatasetVersion dsv, boolean original) {
+        return FileSizeChecker.bytesToHumanReadable(getDownloadSizeNumeric(dsv, original));
+    }
+
+    public static Long getDownloadSizeNumeric(DatasetVersion dsv, boolean original) {
+        return getDownloadSizeNumericBySelectedFiles(dsv.getFileMetadatas(), original);
+    }
+
+    public static Long getDownloadSizeNumericBySelectedFiles(List<FileMetadata> fileMetadatas, boolean original) {
+        long bytes = 0l;
+        for (FileMetadata fileMetadata : fileMetadatas) {
+            DataFile dataFile = fileMetadata.getDataFile();
+            if (original && dataFile.isTabularData()) {
+                bytes += dataFile.getOriginalFileSize() == null ? 0 : dataFile.getOriginalFileSize();
+            } else {
+                bytes += dataFile.getFilesize();
+            }
+        }
+        return bytes;
+    }
+    
+    public static boolean validateDatasetMetadataExternally(Dataset ds, String executable, DataverseRequest request) {
+        String sourceAddressLabel = "0.0.0.0"; 
+        String userIdentifier = "guest";
         
-        //if customFields are empty, go with default fields. 
-        if(customFields==null || customFields.isEmpty()){
-               customFields="dsDescription,subject,keyword,publication,notesText";
+        if (request != null) {
+            IpAddress sourceAddress = request.getSourceAddress();
+            if (sourceAddress != null) {
+                sourceAddressLabel = sourceAddress.toString();
+            }
+            
+            AuthenticatedUser user = request.getAuthenticatedUser();
+            
+            if (user != null) {
+                userIdentifier = user.getUserIdentifier();
+            }
         }
         
-        String[] customFieldList= customFields.split(",");
-        Map<String,DatasetField> DatasetFieldsSet=new HashMap<>(); 
+        String jsonMetadata; 
         
-        for (DatasetField dsf : datasetVersion.getFlatDatasetFields()) {
-            DatasetFieldsSet.put(dsf.getDatasetFieldType().getName(),dsf); 
+        // We are sending the dataset metadata encoded in our standard json 
+        // format, with a couple of extra elements added, such as the ids of 
+        // the home collection and the user, in order to make it easier 
+        // for the filter to whitelist by these attributes. 
+        
+        try {
+            jsonMetadata = json(ds).add("datasetVersion", json(ds.getLatestVersion(), true))
+                    .add("sourceAddress", sourceAddressLabel)
+                    .add("userIdentifier", userIdentifier)
+                    .add("parentAlias", ds.getOwner().getAlias())
+                    .build().toString();
+        } catch (Exception ex) {
+            logger.warning("Failed to export dataset metadata as json; "+ex.getMessage() == null ? "" : ex.getMessage());
+            return false; 
         }
         
-        for(String cfl : customFieldList)
-        {
-                DatasetField df = DatasetFieldsSet.get(cfl);
-                if(df!=null)
-                datasetFields.add(df);
+        if (StringUtil.isEmpty(jsonMetadata)) {
+            logger.warning("Failed to export dataset metadata as json.");
+            return false; 
         }
+       
+        // save the metadata in a temp file: 
+        
+        try {
+            File tempFile = File.createTempFile("datasetMetadataCheck", ".tmp");
+            FileUtils.writeStringToFile(tempFile, jsonMetadata, StandardCharsets.UTF_8);
+            
+            // run the external executable: 
+            String[] params = { executable, tempFile.getAbsolutePath() };
+            Process p = Runtime.getRuntime().exec(params);
+            p.waitFor(); 
             
-        return datasetFields;
+            return p.exitValue() == 0;
+ 
+        } catch (IOException | InterruptedException ex) {
+            logger.warning("Failed run the external executable.");
+            return false; 
+        }
+        
     }
 
+    public static License getLicense(DatasetVersion dsv) {
+        License license = null;
+        TermsOfUseAndAccess tua = dsv.getTermsOfUseAndAccess();
+        if(tua!=null) {
+            license = tua.getLicense();
+        }
+        return license;
+    }
+
+    public static String getLicenseName(DatasetVersion dsv) {
+
+        DatasetVersionServiceBean datasetVersionService = CDI.current().select(DatasetVersionServiceBean.class).get();
+        /*
+        Special case where there are default custom terms indicating that no actual choice has been made...
+         */
+        if (datasetVersionService.isVersionDefaultCustomTerms(dsv)) {
+            return BundleUtil.getStringFromBundle("license.none.chosen");
+        }
+
+        License license = DatasetUtil.getLicense(dsv);
+        return getLocalizedLicenseName(license);
+    }
+    
+    public static String getLocalizedLicenseName(License license) {
+        return license != null ? getLocalizedLicenseDetails(license,"NAME")
+                : BundleUtil.getStringFromBundle("license.custom");
+    }
+
+    public static String getLicenseURI(DatasetVersion dsv) {
+        License license = DatasetUtil.getLicense(dsv);
+        // Return the URI
+        // For standard licenses, just return the stored URI
+        return (license != null) ? license.getUri().toString()
+                // For custom terms, construct a URI with draft version constant or the version number in the URI
+                : (dsv.getVersionState().name().equals("DRAFT")
+                        ? dsv.getDataverseSiteUrl()
+                                + "/api/datasets/:persistentId/versions/" + DS_VERSION_DRAFT + "/customlicense?persistentId="
+                                + dsv.getDataset().getGlobalId().asString()
+                        : dsv.getDataverseSiteUrl() + "/api/datasets/:persistentId/versions/" + dsv.getVersionNumber()
+                                + "." + dsv.getMinorVersionNumber() + "/customlicense?persistentId="
+                                + dsv.getDataset().getGlobalId().asString());
+    }
+
+    public static String getLicenseIcon(DatasetVersion dsv) {
+        License license = DatasetUtil.getLicense(dsv);
+        return license != null && license.getIconUrl() != null ? license.getIconUrl().toString() : null;
+    }
+
+    public static String getLicenseDescription(DatasetVersion dsv) {
+        
+        DatasetVersionServiceBean datasetVersionService = CDI.current().select(DatasetVersionServiceBean.class).get();
+        /*
+        Special case where there are default custom terms indicating that no actual choice has been made...
+         */
+        if (datasetVersionService.isVersionDefaultCustomTerms(dsv)) {
+            return BundleUtil.getStringFromBundle("license.none.chosen.description");
+        }
+        License license = DatasetUtil.getLicense(dsv);
+        
+        return license != null ? getLocalizedLicenseDetails(license,"DESCRIPTION") : BundleUtil.getStringFromBundle("license.custom.description");
+    }
+
+    public enum LicenseOption {
+        NAME, DESCRIPTION
+    };
+
+    public static String getLocalizedLicenseDetails(License license,String keyPart) {
+        String licenseName = license.getName();
+        String localizedLicenseValue =  "" ;
+        try {
+            if (EnumUtils.isValidEnum(LicenseOption.class, keyPart ) ){
+                String key = "license." + licenseName.toLowerCase().replace(" ", "_") + "." + keyPart.toLowerCase();
+                localizedLicenseValue = BundleUtil.getStringFromPropertyFile(key, "License");
+            }
+        }
+        catch (Exception e) {
+            localizedLicenseValue = licenseName;
+        }
+
+        if (localizedLicenseValue == null) {
+            localizedLicenseValue = licenseName ;
+        }
+        return localizedLicenseValue;
+    }
+
+    public static String getLocaleCurationStatusLabel(CurationStatus status) {
+        String label = (status != null && Strings.isNotBlank(status.getLabel())) ? status.getLabel() : null;
+        return getLocaleCurationStatusLabelFromString(label);
+    }
+
+    public static String getLocaleCurationStatusLabelFromString(String label) {
+
+        if (label == null) {
+            return null;
+        }
+        String localizedName = "";
+        try {
+            localizedName = BundleUtil.getStringFromPropertyFile(label.toLowerCase().replace(" ", "_"), "CurationLabels");
+        } catch (Exception e) {
+            localizedName = label;
+        }
+
+        if (localizedName == null) {
+            localizedName = label;
+        }
+        return localizedName;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java
index f44e33404c9..572b7fc5b78 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java
@@ -6,46 +6,63 @@
 package edu.harvard.iq.dataverse.datasetutility;
 
 import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DataFile.ChecksumType;
 import edu.harvard.iq.dataverse.DataFileServiceBean;
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetLock;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.PermissionServiceBean;
+import edu.harvard.iq.dataverse.api.ApiConstants;
 import edu.harvard.iq.dataverse.api.Util;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.AbstractCreateDatasetCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDatasetCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RestrictFileCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.file.CreateDataFileResult;
 import edu.harvard.iq.dataverse.util.json.JsonPrinter;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
-import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJBException;
-import javax.json.JsonObjectBuilder;
-import javax.validation.ConstraintViolation;
-import javax.ws.rs.core.Response;
-import org.apache.commons.lang.StringUtils;
+
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJBException;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.validation.ConstraintViolation;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 import org.apache.commons.io.IOUtils;
-import org.ocpsoft.common.util.Strings;
+import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDataFilesCommand;
+import edu.harvard.iq.dataverse.storageuse.UploadSessionQuotaLimit;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
 
 /**
  *  Methods to add or replace a single file.
@@ -98,10 +115,9 @@ public class AddReplaceFileHelper{
     public static String FILE_ADD_OPERATION = "FILE_ADD_OPERATION";
     public static String FILE_REPLACE_OPERATION = "FILE_REPLACE_OPERATION";
     public static String FILE_REPLACE_FORCE_OPERATION = "FILE_REPLACE_FORCE_OPERATION";
-    
-            
+
     private String currentOperation;
-    
+    boolean multifile = false;
     // -----------------------------------
     // All the needed EJBs, passed to the constructor
     // -----------------------------------
@@ -111,27 +127,24 @@ public class AddReplaceFileHelper{
     private PermissionServiceBean permissionService;
     private EjbDataverseEngine commandEngine;
     private SystemConfig systemConfig;
-    
     // -----------------------------------
     // Instance variables directly added
     // -----------------------------------
     private Dataset dataset;                    // constructor (for add, not replace)
     private DataverseRequest dvRequest;         // constructor
-    private InputStream newFileInputStream;     // step 20
-    private String newFileName;                 // step 20
-    private String newFileContentType;          // step 20
+    private InputStream newFileInputStream;     // step 30
+    private String newFileName;                 // step 30
+    private String newFileContentType;          // step 30
+    private String newStorageIdentifier;        // step 30
+    
     // -- Optional  
     private DataFile fileToReplace;             // step 25
     
-    
-    // -----------------------------------
-    // Instance variables derived from other input
-    // -----------------------------------
-    private User user;
     private DatasetVersion workingVersion;
     private DatasetVersion clone;
     List<DataFile> initialFileList; 
     List<DataFile> finalFileList;
+    private boolean trustSuppliedFileSizes; 
     
     // -----------------------------------
     // Ingested files
@@ -151,6 +164,55 @@ public class AddReplaceFileHelper{
     private boolean contentTypeWarningFound;
     private String contentTypeWarningString;
     
+    private boolean duplicateFileErrorFound;
+
+    private String duplicateFileErrorString;
+
+    private boolean duplicateFileWarningFound;
+    private String duplicateFileWarningString;
+    
+    private String duplicateFileComponentMessage;
+
+    public String getDuplicateFileComponentMessage() {
+        return duplicateFileComponentMessage;
+    }
+
+    public void setDuplicateFileComponentMessage(String duplicateFileComponentMessage) {
+        this.duplicateFileComponentMessage = duplicateFileComponentMessage;
+    }
+    
+    public boolean isDuplicateFileErrorFound() {
+        return duplicateFileErrorFound;
+    }
+
+    public void setDuplicateFileErrorFound(boolean duplicateFileErrorFound) {
+        this.duplicateFileErrorFound = duplicateFileErrorFound;
+    }
+
+    public String getDuplicateFileErrorString() {
+        return duplicateFileErrorString;
+    }
+
+    public void setDuplicateFileErrorString(String duplicateFileErrorString) {
+        this.duplicateFileErrorString = duplicateFileErrorString;
+    }
+    
+    public boolean isDuplicateFileWarningFound() {
+        return duplicateFileWarningFound;
+    }
+
+    public void setDuplicateFileWarningFound(boolean duplicateFileWarningFound) {
+        this.duplicateFileWarningFound = duplicateFileWarningFound;
+    }
+
+    public String getDuplicateFileWarningString() {
+        return duplicateFileWarningString;
+    }
+
+    public void setDuplicateFileWarningString(String duplicateFileWarningString) {
+        this.duplicateFileWarningString = duplicateFileWarningString;
+    }
+    
     public void resetFileHelper(){
         
         initErrorHandling();
@@ -187,7 +249,7 @@ public void resetFileHelper(){
      * @param dvRequest 
      */
     public AddReplaceFileHelper(DataverseRequest dvRequest, 
-                            IngestServiceBean ingestService,                            
+                            IngestServiceBean ingestService,
                             DatasetServiceBean datasetService,
                             DataFileServiceBean fileService,
                             PermissionServiceBean permissionService,
@@ -234,45 +296,55 @@ public AddReplaceFileHelper(DataverseRequest dvRequest,
         this.permissionService = permissionService;
         this.commandEngine = commandEngine;
         this.systemConfig = systemConfig;
-        
-        
-        
         initErrorHandling();
         
         // Initiate instance vars
         this.dataset = null;
         this.dvRequest = dvRequest;
-        this.user = dvRequest.getUser();
+        dvRequest.getUser();
         
     }
-    
+
     /**
-     * 
+     *
      * @param chosenDataset
      * @param newFileName
      * @param newFileContentType
      * @param newFileInputStream
      * @param optionalFileParams
-     * @return 
+     * @return
      */
-    public boolean runAddFileByDataset(Dataset chosenDataset, 
-            String newFileName, 
-            String newFileContentType, 
-            InputStream newFileInputStream,
-            OptionalFileParams optionalFileParams){
-        
+    public boolean runAddFileByDataset(Dataset chosenDataset,
+                                       String newFileName,
+                                       String newFileContentType,
+                                       String newStorageIdentifier,
+                                       InputStream newFileInputStream,
+                                       OptionalFileParams optionalFileParams){
+        return this.runAddFileByDataset(chosenDataset,newFileName,newFileContentType,newStorageIdentifier,newFileInputStream,optionalFileParams,false);
+
+    }
+
+    private boolean runAddFileByDataset(Dataset chosenDataset,
+                                       String newFileName,
+                                       String newFileContentType,
+                                       String newStorageIdentifier,
+                                       InputStream newFileInputStream,
+                                       OptionalFileParams optionalFileParams,
+                                       boolean multipleFiles) {
+
         msgt(">> runAddFileByDatasetId");
 
         initErrorHandling();
-        
+
+        multifile=multipleFiles;
         this.currentOperation = FILE_ADD_OPERATION;
-        
+
         if (!this.step_001_loadDataset(chosenDataset)){
             return false;
         }
-        
+
         //return this.runAddFile(this.dataset, newFileName, newFileContentType, newFileInputStream, optionalFileParams);
-        return this.runAddReplaceFile(dataset, newFileName, newFileContentType, newFileInputStream, optionalFileParams);
+        return this.runAddReplaceFile(dataset, newFileName, newFileContentType, newStorageIdentifier, newFileInputStream, optionalFileParams);
 
     }
     
@@ -305,24 +377,34 @@ public boolean runAddFile(Dataset dataset,
     }*/
     
 
+    public boolean runForceReplaceFile(long fileToReplaceId, String newFilename, String newFileContentType,
+        String newStorageIdentifier, InputStream newFileInputStream, Dataset ds, OptionalFileParams optionalFileParams) {
+        return runForceReplaceFile(fileToReplaceId, newFilename, newFileContentType,
+                newStorageIdentifier, newFileInputStream, ds, optionalFileParams, false);
+    }
     /**
      * After the constructor, this method is called to replace a file
      * 
      * @param dataset
      * @param newFileName
      * @param newFileContentType
+     * @param newStorageIdentifier2 
      * @param newFileInputStream
      * @return 
      */
-    public boolean runForceReplaceFile(Long oldFileId,
+    private boolean runForceReplaceFile(Long oldFileId,
                         String newFileName, 
                         String newFileContentType, 
+                        String newStorageIdentifier,
                         InputStream newFileInputStream,
-                        OptionalFileParams optionalFileParams){
+                        Dataset ds,
+                        OptionalFileParams optionalFileParams,
+                        boolean multipleFiles){
         
         msgt(">> runForceReplaceFile");
         initErrorHandling();
 
+        multifile=multipleFiles;
         this.currentOperation = FILE_REPLACE_FORCE_OPERATION;
 
                
@@ -336,23 +418,35 @@ public boolean runForceReplaceFile(Long oldFileId,
         if (!this.step_005_loadFileToReplaceById(oldFileId)){
             return false;
         }
-
-        
-        return this.runAddReplaceFile(fileToReplace.getOwner(), newFileName, newFileContentType, newFileInputStream, optionalFileParams);
+        if(!ds.getId().equals(fileToReplace.getOwner().getId())) {
+            this.addErrorSevere(getBundleErr("existing_file_to_replace_not_in_dataset"));
+            return false;
+        }
+        // ds may include changes not yet in the copy created when loading the file from the db, as in replaceFiles()
+        return this.runAddReplaceFile(ds, newFileName, newFileContentType, newStorageIdentifier, newFileInputStream, optionalFileParams);
     }
     
 
-
+    public boolean runReplaceFile(long fileToReplaceId, String newFilename, String newFileContentType,
+            String newStorageIdentifier, InputStream newFileInputStream, Dataset ds, OptionalFileParams optionalFileParams) {
+        return runReplaceFile(fileToReplaceId, newFilename, newFileContentType,
+                newStorageIdentifier, newFileInputStream, ds, optionalFileParams, false);
+        
+    }
     
-    public boolean runReplaceFile(Long oldFileId,
+    private boolean runReplaceFile(Long oldFileId,
                             String newFileName, 
                             String newFileContentType, 
+                            String newStorageIdentifier, 
                             InputStream newFileInputStream,
-                            OptionalFileParams optionalFileParams){
+                            Dataset ds,
+                            OptionalFileParams optionalFileParams,
+                            boolean multipleFiles){
     
         msgt(">> runReplaceFile");
 
         initErrorHandling();
+        multifile=multipleFiles;
         this.currentOperation = FILE_REPLACE_OPERATION;
         
         if (oldFileId==null){
@@ -367,7 +461,12 @@ public boolean runReplaceFile(Long oldFileId,
             return false;
         }
 
-        return this.runAddReplaceFile(fileToReplace.getOwner(), newFileName, newFileContentType, newFileInputStream, optionalFileParams);
+        if(!ds.getId().equals(fileToReplace.getOwner().getId())) {
+            this.addErrorSevere(getBundleErr("existing_file_to_replace_not_in_dataset"));
+            return false;
+        }
+        // ds may include changes not yet in the copy created when loading the file from the db, as in replaceFiles()
+        return this.runAddReplaceFile(ds, newFileName, newFileContentType, newStorageIdentifier, newFileInputStream, optionalFileParams);
     }
     
     
@@ -386,31 +485,35 @@ public boolean runReplaceFile(Long oldFileId,
      * 
      * The UI will call Phase 1 on initial upload and 
      *   then run Phase 2 if the user chooses to save the changes.
+     * @param newStorageIdentifier 
      * 
      * 
      * @return 
      */
-    private boolean runAddReplaceFile(Dataset dataset,  
+    
+    private boolean runAddReplaceFile(Dataset owner,  
             String newFileName, String newFileContentType, 
-            InputStream newFileInputStream,
+            String newStorageIdentifier, InputStream newFileInputStream,
             OptionalFileParams optionalFileParams){
         
         // Run "Phase 1" - Initial ingest of file + error check
         // But don't save the dataset version yet
         //
-        boolean phase1Success = runAddReplacePhase1(dataset,  
+        boolean phase1Success = runAddReplacePhase1(owner,  
                                         newFileName,  
                                         newFileContentType,  
+                                        newStorageIdentifier,
                                         newFileInputStream,
                                         optionalFileParams
                                         );
-        
         if (!phase1Success){
             return false;
         }
-        
-       
-        return runAddReplacePhase2();
+        boolean tabIngest = true;
+        if (optionalFileParams != null) {
+            tabIngest = optionalFileParams.getTabIngest();
+        }
+        return runAddReplacePhase2(tabIngest);
         
     }
 
@@ -429,6 +532,7 @@ public boolean runReplaceFromUI_Phase1(Long oldFileId,
             String newFileName, 
             String newFileContentType,
             InputStream newFileInputStream,
+            String fullStorageId,
             OptionalFileParams optionalFileParams){
         
         
@@ -446,10 +550,23 @@ public boolean runReplaceFromUI_Phase1(Long oldFileId,
         if (!this.step_005_loadFileToReplaceById(oldFileId)){
             return false;
         }
+        //Update params to match existing file (except checksum, which should match the new file)
+        if(fileToReplace != null) {
+            String checksum = optionalFileParams.getCheckSum();
+            ChecksumType checkSumType = optionalFileParams.getCheckSumType();
+            try {
+                optionalFileParams = new OptionalFileParams(fileToReplace);
+                optionalFileParams.setCheckSum(checksum, checkSumType);
+            } catch (DataFileTagException e) {
+                // Shouldn't happen since fileToReplace should have valid tags
+                e.printStackTrace();
+            }
+        }
 
         return this.runAddReplacePhase1(fileToReplace.getOwner(), 
                 newFileName, 
-                newFileContentType, 
+                newFileContentType,
+                fullStorageId,
                 newFileInputStream, 
                 optionalFileParams);
 
@@ -462,13 +579,14 @@ public boolean runReplaceFromUI_Phase1(Long oldFileId,
      * 
      * Phase 1 (here): Add/replace the file and make sure there are no errors
      *          But don't update the Dataset (yet)
+     * @param newStorageIdentifier 
      * 
      * @return 
      */
-    private boolean runAddReplacePhase1(Dataset dataset,  
+    private boolean runAddReplacePhase1(Dataset owner,  
             String newFileName, 
             String newFileContentType,
-            InputStream newFileInputStream,
+            String newStorageIdentifier, InputStream newFileInputStream,
             OptionalFileParams optionalFileParams){
         
         if (this.hasError()){
@@ -476,7 +594,7 @@ private boolean runAddReplacePhase1(Dataset dataset,
         }
 
         msgt("step_001_loadDataset");
-        if (!this.step_001_loadDataset(dataset)){
+        if (!this.step_001_loadDataset(owner)){
             return false;
         }
         
@@ -487,13 +605,13 @@ private boolean runAddReplacePhase1(Dataset dataset,
         }
 
         msgt("step_020_loadNewFile");
-        if (!this.step_020_loadNewFile(newFileName, newFileContentType, newFileInputStream)){
+        if (!this.step_020_loadNewFile(newFileName, newFileContentType, newStorageIdentifier, newFileInputStream)){
             return false;
             
         }
-        
+
         msgt("step_030_createNewFilesViaIngest");
-        if (!this.step_030_createNewFilesViaIngest()){
+        if (!this.step_030_createNewFilesViaIngest(optionalFileParams)){
             return false;
             
         }
@@ -502,18 +620,44 @@ private boolean runAddReplacePhase1(Dataset dataset,
         if (!this.step_050_checkForConstraintViolations()){
             return false;            
         }
-        
+
         msgt("step_055_loadOptionalFileParams");
         if (!this.step_055_loadOptionalFileParams(optionalFileParams)){
             return false;            
         }
         
+        // if the fileToReplace hasn't been released,
+        if (fileToReplace != null && !fileToReplace.isReleased()) {
+            DataFile df = finalFileList.get(0); // step_055 uses a loop and assumes only one file
+            // set the replacement file's previous and root datafileIds to match (unless
+            // they are the defaults)
+            if (fileToReplace.getPreviousDataFileId() != null) {
+                df.setPreviousDataFileId(fileToReplace.getPreviousDataFileId());
+                df.setRootDataFileId(fileToReplace.getRootDataFileId());
+            }
+            // Reuse any file PID during a replace operation (if File PIDs are in use)
+            if (systemConfig.isFilePIDsEnabledForCollection(owner.getOwner())) {
+                df.setGlobalId(fileToReplace.getGlobalId());
+                df.setGlobalIdCreateTime(fileToReplace.getGlobalIdCreateTime());
+                // Should be true or fileToReplace wouldn't have an identifier (since it's not
+                // yet released in this if statement)
+                df.setIdentifierRegistered(fileToReplace.isIdentifierRegistered());
+                fileToReplace.setGlobalId(null);
+            }
+        }
+        
+        if(fileToReplace != null && fileToReplace.getEmbargo() != null) {
+            DataFile df = finalFileList.get(0); // step_055 uses a loop and assumes only one file
+            df.setEmbargo(fileToReplace.getEmbargo());
+        }
+      
+
         return true;
     }
     
     
     public boolean runReplaceFromUI_Phase2(){
-        return runAddReplacePhase2();
+        return runAddReplacePhase2(true);
     }
     
 
@@ -604,7 +748,7 @@ public boolean updateLabelDescriptionRestrictedFromUI(String label, String descr
      * 
      * @return 
      */
-    private boolean runAddReplacePhase2(){
+    private boolean runAddReplacePhase2(boolean tabIngest){
         
         if (this.hasError()){
             return false;   // possible to have errors already...
@@ -616,24 +760,22 @@ private boolean runAddReplacePhase2(){
         }
         
          msgt("step_060_addFilesViaIngestService");
-        if (!this.step_060_addFilesViaIngestService()){
+        if (!this.step_060_addFilesViaIngestService(tabIngest)){
             return false;
             
         }
-        
-        if (this.isFileReplaceOperation()){
+        if (this.isFileReplaceOperation()) {
             msgt("step_080_run_update_dataset_command_for_replace");
-            if (!this.step_080_run_update_dataset_command_for_replace()){
-                return false;            
+            if (!this.step_080_run_update_dataset_command_for_replace()) {
+                return false;
             }
-            
-        }else{
+        } else if (!multifile) {
             msgt("step_070_run_update_dataset_command");
-            if (!this.step_070_run_update_dataset_command()){
-                return false;            
+            if (!this.step_070_run_update_dataset_command()) {
+                return false;
             }
         }
-        
+
         msgt("step_090_notifyUser");
         if (!this.step_090_notifyUser()){
             return false;            
@@ -747,6 +889,17 @@ private void addError(Response.Status badHttpResponse, String errMsg){
         
     }
     
+    private void addErrorWarning(String errMsg){
+        if (errMsg == null){
+            throw new NullPointerException("errMsg cannot be null");
+        }
+ 
+        logger.severe(errMsg);
+        this.setDuplicateFileWarning(errMsg);
+        this.errorMessages.add(errMsg);
+        
+    }
+    
     
     private void addErrorSevere(String errMsg){
         
@@ -914,7 +1067,7 @@ private boolean step_015_auto_check_permissions(Dataset datasetToCheck){
     }
     
     
-    private boolean step_020_loadNewFile(String fileName, String fileContentType, InputStream fileInputStream){
+    private boolean step_020_loadNewFile(String fileName, String fileContentType, String storageIdentifier, InputStream fileInputStream){
         
         if (this.hasError()){
             return false;
@@ -932,18 +1085,23 @@ private boolean step_020_loadNewFile(String fileName, String fileContentType, In
             
         }
         
-        if (fileInputStream == null){
-            this.addErrorSevere(getBundleErr("file_upload_failed"));
-            return false;
-        }
-       
+		if (fileInputStream == null) {
+			if (storageIdentifier == null) {
+				this.addErrorSevere(getBundleErr("file_upload_failed"));
+				return false;
+			} 
+		} 
+		
         newFileName = fileName;
         newFileContentType = fileContentType;
+        
+        //One of these will be null
+    	newStorageIdentifier = storageIdentifier;
         newFileInputStream = fileInputStream;
         
         return true;
     }
-    
+
     
     /**
      * Optional: old file to replace
@@ -967,7 +1125,7 @@ private boolean step_005_loadFileToReplaceById(Long dataFileId){
         // Does the file exist?
         //
         DataFile existingFile = fileService.find(dataFileId);
-
+        
         if (existingFile == null){           
             this.addError(BundleUtil.getStringFromBundle("file.addreplace.error.existing_file_to_replace_not_found_by_id", Collections.singletonList(dataFileId.toString())));
             return false;
@@ -979,16 +1137,6 @@ private boolean step_005_loadFileToReplaceById(Long dataFileId){
         if (!step_015_auto_check_permissions(existingFile.getOwner())){
             return false;
         };
-
-        
-        
-        // Is the file published?
-        //
-        if (!existingFile.isReleased()){
-            addError(getBundleErr("unpublished_file_cannot_be_replaced"));
-            return false;            
-        }
-        
         // Is the file in the latest dataset version?
         //
         if (!step_007_auto_isReplacementInLatestVersion(existingFile)){
@@ -1036,24 +1184,46 @@ private boolean step_007_auto_isReplacementInLatestVersion(DataFile existingFile
     }
     
     
-    private boolean step_030_createNewFilesViaIngest(){
+    private boolean step_030_createNewFilesViaIngest(OptionalFileParams optionalFileParams){
         
         if (this.hasError()){
             return false;
         }
 
         // Load the working version of the Dataset
-        workingVersion = dataset.getEditVersion();
-        clone =   workingVersion.cloneDatasetVersion();
+        workingVersion = dataset.getOrCreateEditVersion();
+        if(!multifile) {
+            //Don't repeatedly update the clone (losing changes) in multifile case
+            clone = workingVersion.cloneDatasetVersion();
+        }
+        
+        Long suppliedFileSize = null;
+        String newCheckSum = null;
+        ChecksumType newCheckSumType = null;
+        
+        
+        if (optionalFileParams != null) {
+            if (optionalFileParams.hasCheckSum()) {
+                newCheckSum = optionalFileParams.getCheckSum();
+                newCheckSumType = optionalFileParams.getCheckSumType();
+            }
+            if (trustSuppliedFileSizes && optionalFileParams.hasFileSize()) {
+                suppliedFileSize = optionalFileParams.getFileSize();
+            }
+        }
+        
         try {
-            initialFileList = FileUtil.createDataFiles(workingVersion,
-                    this.newFileInputStream,
-                    this.newFileName,
-                    this.newFileContentType,
-                    this.systemConfig);
-
-        } catch (IOException ex) {
-            if (!Strings.isNullOrEmpty(ex.getMessage())) {
+            UploadSessionQuotaLimit quota = null; 
+            if (systemConfig.isStorageQuotasEnforced()) {
+                quota = fileService.getUploadSessionQuotaLimit(dataset);
+            }
+            Command<CreateDataFileResult> cmd = new CreateNewDataFilesCommand(dvRequest, workingVersion, newFileInputStream, newFileName, newFileContentType, newStorageIdentifier,
+                    quota, newCheckSum, newCheckSumType, suppliedFileSize, isFileReplaceOperation());
+            CreateDataFileResult createDataFilesResult = commandEngine.submit(cmd);
+            initialFileList = createDataFilesResult.getDataFiles();
+
+        } catch (CommandException ex) {
+            if (ex.getMessage() != null && !ex.getMessage().isEmpty()) {
                 this.addErrorSevere(getBundleErr("ingest_create_file_err") + " " + ex.getMessage());
             } else {
                 this.addErrorSevere(getBundleErr("ingest_create_file_err"));
@@ -1113,6 +1283,8 @@ private boolean step_030_createNewFilesViaIngest(){
      * @return 
      */
     private boolean step_040_auto_checkForDuplicates(){
+        this.duplicateFileErrorString = "";
+        this.duplicateFileErrorFound = false;
         
         msgt("step_040_auto_checkForDuplicates");
         if (this.hasError()){
@@ -1129,9 +1301,6 @@ private boolean step_040_auto_checkForDuplicates(){
         // Initialize new file list
         this.finalFileList = new ArrayList<>();
 
-        String warningMessage  = null;
-        
-
         if (isFileReplaceOperation() && this.fileToReplace == null){
             // This error shouldn't happen if steps called correctly
             this.addErrorSevere(getBundleErr("existing_file_to_replace_is_null") + " (This error shouldn't happen if steps called in sequence....checkForFileReplaceDuplicate)");
@@ -1158,20 +1327,24 @@ private boolean step_040_auto_checkForDuplicates(){
             
             // -----------------------------------------------------------
             // (2) Check for duplicates
+            // Only a warning now
             // -----------------------------------------------------------     
             if (isFileReplaceOperation() && Objects.equals(df.getChecksumValue(), fileToReplace.getChecksumValue())){
-                this.addErrorSevere(getBundleErr("replace.new_file_same_as_replacement"));                                
+                this.addError(getBundleErr("replace.new_file_same_as_replacement"));                
+                this.duplicateFileErrorFound = true;
+                this.duplicateFileErrorString = getBundleErr("replace.new_file_same_as_replacement");
                 break;
-            } else if (DuplicateFileChecker.isDuplicateOriginalWay(workingVersion, df.getFileMetadata())){
+            } 
+            
+            if (DuplicateFileChecker.isDuplicateOriginalWay(workingVersion, df.getFileMetadata())){
                 String dupeName = df.getFileMetadata().getLabel();
-                //removeUnSavedFilesFromWorkingVersion();
-                //removeLinkedFileFromDataset(dataset, df);
-                //abandonOperationRemoveAllNewFilesFromDataset();
-                this.addErrorSevere(getBundleErr("duplicate_file") + " " + dupeName);   
-                //return false;
-            } else {
-                finalFileList.add(df);
-            }
+                this.duplicateFileWarningFound = true;
+                this.duplicateFileWarningString = BundleUtil.getStringFromBundle("file.addreplace.warning.duplicate_file", 
+                                Arrays.asList(dupeName));
+                this.addErrorWarning(this.duplicateFileWarningString); 
+
+            }             
+            finalFileList.add(df);
         }
         
         if (this.hasError()){
@@ -1205,9 +1378,11 @@ private boolean step_040_auto_checkForDuplicates(){
             
             // Has the content type of the file changed?
             //
-            if (!finalFileList.get(0).getContentType().equalsIgnoreCase(fileToReplace.getContentType())){
-            
-                List<String> errParams = Arrays.asList(fileToReplace.getFriendlyType(),
+            String fileType = fileToReplace.getOriginalFileFormat() != null ? fileToReplace.getOriginalFileFormat() : fileToReplace.getContentType();
+            if (!finalFileList.get(0).getContentType().equalsIgnoreCase(fileType)) {
+                String friendlyType = fileToReplace.getOriginalFormatLabel() != null ? fileToReplace.getOriginalFormatLabel() : fileToReplace.getFriendlyType();
+
+                List<String> errParams = Arrays.asList(friendlyType,
                                                 finalFileList.get(0).getFriendlyType());
                 
                 String contentTypeErr = BundleUtil.getStringFromBundle("file.addreplace.error.replace.new_file_has_different_content_type", 
@@ -1342,12 +1517,17 @@ private boolean step_050_checkForConstraintViolations(){
             return true;
         }
         
-        // -----------------------------------------------------------   
-        // violations found: gather all error messages
-        // -----------------------------------------------------------   
-        List<String> errMsgs = new ArrayList<>();
-        for (ConstraintViolation violation : constraintViolations){
-            this.addError(violation.getMessage());
+        new ArrayList<>();
+        for (ConstraintViolation violation : constraintViolations) {
+            /*
+            for 8859 return conflict response status if the validation fails
+            due to terms of use/access out of compliance
+            */
+            if (workingVersion.getTermsOfUseAndAccess().getValidationMessage() != null) {
+                addError(Response.Status.CONFLICT,workingVersion.getTermsOfUseAndAccess().getValidationMessage());
+            } else {
+                this.addError(violation.getMessage());
+            }
         }
         
         return this.hasError();
@@ -1389,7 +1569,7 @@ private boolean step_055_loadOptionalFileParams(OptionalFileParams optionalFileP
                 }
                 
             } catch (DataFileTagException ex) {
-                Logger.getLogger(AddReplaceFileHelper.class.getName()).log(Level.SEVERE, null, ex);
+                logger.log(Level.SEVERE, null, ex);
                 addError(ex.getMessage());
                 return false;
             } catch (CommandException ex) {
@@ -1401,7 +1581,7 @@ private boolean step_055_loadOptionalFileParams(OptionalFileParams optionalFileP
         return true;
     }
     
-    private boolean step_060_addFilesViaIngestService(){
+    private boolean step_060_addFilesViaIngestService(boolean tabIngest){
                        
         if (this.hasError()){
             return false;
@@ -1414,7 +1594,8 @@ private boolean step_060_addFilesViaIngestService(){
         }
         
         int nFiles = finalFileList.size();
-        finalFileList = ingestService.saveAndAddFilesToDataset(workingVersion, finalFileList);
+        boolean ignoreUploadFileLimits = dvRequest.getAuthenticatedUser() != null ? dvRequest.getAuthenticatedUser().isSuperuser() : false;
+        finalFileList = ingestService.saveAndAddFilesToDataset(workingVersion, finalFileList, fileToReplace, tabIngest, ignoreUploadFileLimits);
 
         if (nFiles != finalFileList.size()) {
             if (nFiles == 1) {
@@ -1428,124 +1609,84 @@ private boolean step_060_addFilesViaIngestService(){
         return true;
     }
     
+    List<FileMetadata> filesToDelete = new ArrayList<FileMetadata>();
+    Map<Long, String> deleteFileStorageLocations = new HashMap<>();
     
     /**
      * Create and run the update dataset command
      * 
      * @return 
      */
-    private boolean step_070_run_update_dataset_command(){
-        
-        if (this.hasError()){
+    private boolean step_070_run_update_dataset_command() {
+        //Note -only single file operations and multifile replace call this, multifile add does not
+        if (this.hasError()) {
             return false;
         }
 
-        Command<Dataset> update_cmd;
-        update_cmd = new UpdateDatasetVersionCommand(dataset, dvRequest, clone);
-        ((UpdateDatasetVersionCommand) update_cmd).setValidateLenient(true);  
-        
-        try {            
-            // Submit the update dataset command 
-            // and update the local dataset object
-            //
-            dataset = commandEngine.submit(update_cmd);
-        } catch (CommandException ex) {
-            /**
-             * @todo Add a test to exercise this error.
-             */
-            this.addErrorSevere(getBundleErr("add.add_file_error"));
-            logger.severe(ex.getMessage());
-            return false;
-        }catch (EJBException ex) {
-            /**
-             * @todo Add a test to exercise this error.
-             */
-            this.addErrorSevere("add.add_file_error (see logs)");
-            logger.severe(ex.getMessage());
-            return false;
-        } 
-        return true;
-    }
-
-    
-    /**
-     * Go through the working DatasetVersion and remove the
-     * FileMetadata of the file to replace
-     * 
-     * @return 
-     */
-    private boolean step_085_auto_remove_filemetadata_to_replace_from_working_version(){
-
-        msgt("step_085_auto_remove_filemetadata_to_replace_from_working_version 1");
+        Command<Dataset> update_cmd = null;
+        String deleteStorageLocation = null;
+        long deleteFileId = -1;
+        if (isFileReplaceOperation()) {
+            if (!multifile) {
+                filesToDelete.clear();
+                deleteFileStorageLocations.clear();
+            }
+            filesToDelete.add(fileToReplace.getFileMetadata());
 
-        if (!isFileReplaceOperation()){
-            // Shouldn't happen!
-            this.addErrorSevere(getBundleErr("only_replace_operation") + " (step_085_auto_remove_filemetadata_to_replace_from_working_version");
-            return false;
+            if (!fileToReplace.isReleased()) {
+                // If file is only in draft version, also need to delete the physical file
+                deleteStorageLocation = fileService.getPhysicalFileToDelete(fileToReplace);
+                deleteFileId = fileToReplace.getId();
+                deleteFileStorageLocations.put(deleteFileId, deleteStorageLocation);
+            }
+            if (!multifile) {
+                // Adding the file to the delete list for the command will delete this
+                // filemetadata and, if the file hasn't been released, the datafile itself.
+                update_cmd = new UpdateDatasetVersionCommand(dataset, dvRequest, filesToDelete, clone);
+            }
+        } else {
+            update_cmd = new UpdateDatasetVersionCommand(dataset, dvRequest, clone);
         }
-        msg("step_085_auto_remove_filemetadata_to_replace_from_working_version 2");
-
-        if (this.hasError()){
-            return false;
+        if (!multifile) {
+            //Avoid NPE in multifile replace case
+            ((UpdateDatasetVersionCommand) update_cmd).setValidateLenient(true);
+        }
+        if (!multifile) {
+            try {
+                // Submit the update dataset command
+                // and update the local dataset object
+                //
+                dataset = commandEngine.submit(update_cmd);
+            } catch (CommandException ex) {
+                /**
+                 * @todo Add a test to exercise this error.
+                 */
+                this.addErrorSevere(getBundleErr("add.add_file_error"));
+                logger.severe(ex.getMessage());
+                return false;
+            } catch (EJBException ex) {
+                /**
+                 * @todo Add a test to exercise this error.
+                 */
+                this.addErrorSevere("add.add_file_error (see logs)");
+                logger.severe(ex.getMessage());
+                return false;
+            }
         }
 
-        
-        msgt("File to replace getId: " + fileToReplace.getId());
-        
-        Iterator<FileMetadata> fmIt = workingVersion.getFileMetadatas().iterator();
-        msgt("Clear file to replace");
-        int cnt = 0;
-        while (fmIt.hasNext()) {
-            cnt++;
-
-            FileMetadata fm = fmIt.next();
-            msg(cnt + ") next file: " + fm);
-            msg("   getDataFile().getId(): " + fm.getDataFile().getId());
-            if (fm.getDataFile().getId() != null) {
-                if (Objects.equals(fm.getDataFile().getId(), fileToReplace.getId())) {
-                    msg("Let's remove it!");
-
-                    // If this is a tabular data file with a UNF, we'll need 
-                    // to recalculate the version UNF, once the file is removed: 
-                    
-                    boolean recalculateUNF = !StringUtils.isEmpty(fm.getDataFile().getUnf());
-
-                    if (workingVersion.getId() != null) {
-                        // If this is an existing draft (i.e., this draft version 
-                        // is already saved in the dataset, we'll also need to remove this filemetadata 
-                        // explicitly:
-                        msg(" this is an existing draft version...");
-                        fileService.removeFileMetadata(fm);
-
-                        // remove the filemetadata from the list of filemetadatas
-                        // attached to the datafile object as well, for a good 
-                        // measure: 
-                        fileToReplace.getFileMetadatas().remove(fm);
-                        // (and yes, we can do .remove(fm) safely - if this released
-                        // file is part of an existing draft, we know that the 
-                        // filemetadata object also exists in the database, and thus
-                        // has the id, and can be identified unambiguously. 
-                    }
-
-                    // and remove it from the list of filemetadatas attached
-                    // to the version object, via the iterator:
-                    fmIt.remove();
-
-                    if (recalculateUNF) {
-                        msg("recalculating the UNF");
-                        ingestService.recalculateDatasetVersionUNF(workingVersion);
-                        msg("UNF recalculated: "+workingVersion.getUNF());
-                    }
-                    
-                    return true;
-                }
+        if (isFileReplaceOperation() && deleteFileId!=-1 && !multifile) {
+            // Finalize the delete of the physical file
+            // (File service will double-check that the datafile no
+            // longer exists in the database, before proceeding to
+            // delete the physical file)
+            try {
+                fileService.finalizeFileDelete(deleteFileId, deleteStorageLocation);
+            } catch (IOException ioex) {
+                logger.warning("Failed to delete the physical file associated with the deleted datafile id="
+                        + deleteFileId + ", storage location: " + deleteStorageLocation);
             }
         }
-        
-        msg("No matches found!");
-        addErrorSevere(getBundleErr("failed_to_remove_old_file_from_dataset"));
-        runMajorCleanup();
-        return false;
+        return true;
     }
     
 
@@ -1620,13 +1761,6 @@ private boolean step_080_run_update_dataset_command_for_replace(){
             return false;
         }
 
-        // -----------------------------------------------------------
-        // Remove the "fileToReplace" from the current working version
-        // -----------------------------------------------------------
-        if (!step_085_auto_remove_filemetadata_to_replace_from_working_version()){
-            return false;
-        }
-        
         // -----------------------------------------------------------
         // Set the "root file ids" and "previous file ids"
         // THIS IS A KEY STEP - SPLIT IT OUT
@@ -1636,26 +1770,27 @@ private boolean step_080_run_update_dataset_command_for_replace(){
         // -----------------------------------------------------------
  
         
-        /*
-            Check the root file id on fileToReplace, updating it if necessary
-        */
-        if (fileToReplace.getRootDataFileId().equals(DataFile.ROOT_DATAFILE_ID_DEFAULT)){
+        if (fileToReplace.isReleased()) {
+            /*
+             * Check the root file id on fileToReplace, updating it if necessary
+             */
+            if (fileToReplace.getRootDataFileId().equals(DataFile.ROOT_DATAFILE_ID_DEFAULT)) {
 
-            fileToReplace.setRootDataFileId(fileToReplace.getId());
-            fileToReplace = fileService.save(fileToReplace);
-        }
-        
-        /*
-            Go through the final file list, settting the rootFileId and previousFileId
-        */
-        for (DataFile df : finalFileList){            
-            df.setPreviousDataFileId(fileToReplace.getId());
-            
-            df.setRootDataFileId(fileToReplace.getRootDataFileId());
-            
-        }
+                fileToReplace.setRootDataFileId(fileToReplace.getId());
+                fileToReplace = fileService.save(fileToReplace);
+            }
+
+            /*
+             * Go through the final file list, setting the rootFileId and previousFileId
+             */
+            for (DataFile df : finalFileList) {
+                df.setPreviousDataFileId(fileToReplace.getId());
 
-        // Call the update dataset command
+                df.setRootDataFileId(fileToReplace.getRootDataFileId());
+
+            }
+        }
+        // Call the update dataset command which will delete the replaced filemetadata and file if needed (if file is not released)
         //
         return step_070_run_update_dataset_command();
         
@@ -1685,7 +1820,7 @@ private void setNewlyAddedFiles(List<DataFile> datafiles){
         newlyAddedFileMetadatas = new ArrayList<>();
         
         // Loop of uglinesss...but expect 1 to 4 files in final file list
-        List<FileMetadata> latestFileMetadatas = dataset.getEditVersion().getFileMetadatas();
+        List<FileMetadata> latestFileMetadatas = dataset.getOrCreateEditVersion().getFileMetadatas();
         
         
         for (DataFile newlyAddedFile : finalFileList){
@@ -1802,21 +1937,14 @@ private boolean step_100_startIngestJobs(){
         //
         finalFileList.clear();
 
-        // TODO: Need to run ingwest async......
-        //if (true){
-            //return true;
-        //}
-        
-        msg("pre ingest start");
-        // start the ingest!
-        //
-               
-        ingestService.startIngestJobsForDataset(dataset, dvRequest.getAuthenticatedUser());
-        
-        msg("post ingest start");
+        if (!multifile) {
+            msg("pre ingest start");
+            // start the ingest!
+            ingestService.startIngestJobsForDataset(dataset, dvRequest.getAuthenticatedUser());
+            msg("post ingest start");
+        }
         return true;
     }
-
     
     private void msg(String m){
         logger.fine(m);
@@ -1892,6 +2020,364 @@ public String getContentTypeWarningString(){
         return contentTypeWarningString;
     }
     
+    private String duplicateFileWarning;
+
+    public String getDuplicateFileWarning() {
+        return duplicateFileWarning;
+    }
+
+    public void setDuplicateFileWarning(String duplicateFileWarning) {
+        this.duplicateFileWarning = duplicateFileWarning;
+    }
+
+    /** Add multiple pre-positioned files listed in the jsonData. Works with direct upload, Globus, and other out-of-band methods.
+     * 
+     * @param jsonData - an array of jsonData entries (one per file) using the single add file jsonData format
+     * @param dataset
+     * @param authUser
+     * @param trustSuppliedSizes - whether to accept the fileSize values passed 
+     *        in jsonData (we don't want to trust the users of the S3 direct 
+     *        upload API with that information - we will verify the status of
+     *        the files in the S3 bucket and confirm the sizes in the process. 
+     *        we do want GlobusService to be able to pass the file sizes, since
+     *        they are obtained and verified via a Globus API lookup). 
+     * @return
+     */
+    public Response addFiles(String jsonData, Dataset dataset, User authUser, boolean trustSuppliedFileSizes) {
+        msgt("(addFilesToDataset) jsonData: " + jsonData.toString());
+
+        JsonArrayBuilder jarr = Json.createArrayBuilder();
+
+        JsonArray filesJson = null;
+
+        int totalNumberofFiles = 0;
+        int successNumberofFiles = 0;
+        this.trustSuppliedFileSizes = trustSuppliedFileSizes; 
+        // -----------------------------------------------------------
+        // Read jsonData and Parse files information from jsondata  :
+        // -----------------------------------------------------------
+        try {
+            filesJson = JsonUtil.getJsonArray(jsonData);
+
+
+            if (filesJson != null) {
+                totalNumberofFiles = filesJson.getValuesAs(JsonObject.class).size();
+                workingVersion = dataset.getOrCreateEditVersion();
+                clone = workingVersion.cloneDatasetVersion();
+
+                if (!authUser.isSuperuser()) {
+                    Integer effectiveDatasetFileCountLimit = dataset.getEffectiveDatasetFileCountLimit();
+                    boolean hasFileCountLimit = dataset.isDatasetFileCountLimitSet(effectiveDatasetFileCountLimit);
+                    if (hasFileCountLimit) {
+                        int uploadedFileCount = datasetService.getDataFileCountByOwner(dataset.getId());
+                        if (uploadedFileCount + totalNumberofFiles >= effectiveDatasetFileCountLimit) {
+                            return error(Response.Status.BAD_REQUEST,
+                                    BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", Arrays.asList(String.valueOf(effectiveDatasetFileCountLimit))));
+                        }
+                    }
+                }
+
+                for (JsonObject fileJson : filesJson.getValuesAs(JsonObject.class)) {
+
+                    OptionalFileParams optionalFileParams = null;
+                    try {
+                        optionalFileParams = new OptionalFileParams(fileJson.toString());
+
+                        String newFilename = null;
+                        String newFileContentType = null;
+                        String newStorageIdentifier = null;
+                        if (optionalFileParams.hasStorageIdentifier()) {
+                            newStorageIdentifier = optionalFileParams.getStorageIdentifier();
+                            newStorageIdentifier = DataAccess.expandStorageIdentifierIfNeeded(newStorageIdentifier);
+                            if(!DataAccess.uploadToDatasetAllowed(dataset,  newStorageIdentifier)) {
+                                addErrorSevere("Dataset store configuration does not allow provided storageIdentifier.");
+                            }
+                            if (optionalFileParams.hasFileName()) {
+                                newFilename = optionalFileParams.getFileName();
+                                if (optionalFileParams.hasMimetype()) {
+                                    newFileContentType = optionalFileParams.getMimeType();
+                                }
+                            }
+
+                            msgt("ADD!  = " + newFilename);
+
+                            runAddFileByDataset(dataset, newFilename, newFileContentType, newStorageIdentifier, null,
+                                    optionalFileParams, true);
+                            if (hasError()) {
+                                JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                        .add("storageIdentifier", newStorageIdentifier)
+                                        .add("errorMessage", getHttpErrorCode().toString() +":"+ getErrorMessagesAsString("\n"))
+                                        .add("fileDetails", fileJson);
+                                jarr.add(fileoutput);
+                            } else {
+                                JsonObject successresult = getSuccessResultAsJsonObjectBuilder().build();
+                                String duplicateWarning = getDuplicateFileWarning();
+
+                                if (duplicateWarning != null && !duplicateWarning.isEmpty()) {
+                                    JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                            .add("storageIdentifier", newStorageIdentifier)
+                                            .add("warningMessage", getDuplicateFileWarning())
+                                            .add("fileDetails", successresult.getJsonArray("files").getJsonObject(0));
+                                    jarr.add(fileoutput);
+                                } else {
+                                    JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                            .add("storageIdentifier", newStorageIdentifier)
+                                            .add("successMessage", "Added successfully to the dataset")
+                                            .add("fileDetails", successresult.getJsonArray("files").getJsonObject(0));
+                                    jarr.add(fileoutput);
+                                }
+                            successNumberofFiles = successNumberofFiles + 1;
+                            }
+                        } else {
+                            JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                    .add("errorMessage", "You must provide a storageidentifier, filename, and mimetype.")
+                                    .add("fileDetails", fileJson);
+
+                            jarr.add(fileoutput);
+                        }
+
+                    } catch (DataFileTagException ex) {
+                        logger.log(Level.SEVERE, null, ex);
+                        JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                .add("errorCode", Response.Status.BAD_REQUEST.getStatusCode())
+                                .add("message", ex.getMessage())
+                                .add("fileDetails", fileJson);
+                        jarr.add(fileoutput);
+
+                    }
+                    catch (NoFilesException ex) {
+                        logger.log(Level.SEVERE, null, ex);
+                        JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                .add("errorCode", Response.Status.BAD_REQUEST.getStatusCode())
+                                .add("message", BundleUtil.getStringFromBundle("NoFileException!  Serious Error! See administrator!"))
+                                .add("fileDetails", fileJson);
+                        jarr.add(fileoutput);
+                    }
+
+                }// End of adding files
+
+                DatasetLock eipLock = dataset.getLockFor(DatasetLock.Reason.EditInProgress);
+                if (eipLock == null) {
+                    logger.log(Level.WARNING, "Dataset not locked for EditInProgress ");
+                } else {
+                    datasetService.removeDatasetLocks(dataset, DatasetLock.Reason.EditInProgress);
+                    logger.log(Level.FINE, "Removed EditInProgress lock");
+                }
+                
+                try {
+                    Command<Dataset> cmd = new UpdateDatasetVersionCommand(dataset, dvRequest, clone);
+                    ((UpdateDatasetVersionCommand) cmd).setValidateLenient(true);
+                    commandEngine.submit(cmd);
+                } catch (CommandException ex) {
+                    return error(Response.Status.INTERNAL_SERVER_ERROR, "CommandException updating DatasetVersion from addFiles job: " + ex.getMessage());
+                }
+
+                dataset = datasetService.find(dataset.getId());
+
+                //ingest job
+                ingestService.startIngestJobsForDataset(dataset, (AuthenticatedUser) authUser);
+
+            }
+        }
+        catch ( jakarta.json.stream.JsonParsingException ex) {
+            ex.printStackTrace();
+            return error(BAD_REQUEST, "Json Parsing Exception :" + ex.getMessage());
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            return error(BAD_REQUEST, e.getMessage());
+        }
+
+        JsonObjectBuilder result = Json.createObjectBuilder()
+                .add(ApiConstants.API_ADD_FILES_COUNT_PROCESSED, totalNumberofFiles)
+                .add(ApiConstants.API_ADD_FILES_COUNT_SUCCESSFUL, successNumberofFiles);
+
+
+        return Response.ok().entity(Json.createObjectBuilder()
+                .add("status", ApiConstants.STATUS_OK)
+                .add("data", Json.createObjectBuilder().add("Files", jarr).add("Result", result)).build() ).build();
+    }
+    
+    public Response addFiles(String jsonData, Dataset dataset, User authUser) {
+        return addFiles(jsonData, dataset, authUser, false);
+    }
+    
+    /**
+     * Replace multiple files with prepositioned replacements as listed in the
+     * jsonData. Works with direct upload, Globus, and other out-of-band methods.
+     * 
+     * @param jsonData - must include fileToReplaceId key with file ID and may include forceReplace key with true/false(default) 
+     * @param dataset
+     * @param authUser
+     * @return
+     */
+    
+    public Response replaceFiles(String jsonData, Dataset ds, User authUser) {
+        msgt("(replaceFilesInDataset) jsonData: " + jsonData.toString());
+
+        this.dataset = ds;
+        JsonArrayBuilder jarr = Json.createArrayBuilder();
+
+        JsonArray filesJson = null;
+
+        int totalNumberofFiles = 0;
+        int successNumberofFiles = 0;
+        // -----------------------------------------------------------
+        // Read jsonData and Parse files information from jsondata  :
+        // -----------------------------------------------------------
+        try {
+            filesJson = JsonUtil.getJsonArray(jsonData);
+
+
+            if (filesJson != null) {
+                totalNumberofFiles = filesJson.getValuesAs(JsonObject.class).size();
+                workingVersion = dataset.getOrCreateEditVersion();
+                clone = workingVersion.cloneDatasetVersion();
+                for (JsonObject fileJson : filesJson.getValuesAs(JsonObject.class)) {
+                    boolean forceReplace = false;
+                    // (2a) Check for optional "forceReplace"
+                    if ((fileJson.containsKey("forceReplace"))) {
+                        forceReplace = fileJson.getBoolean("forceReplace", false);
+                    }
+                    long fileToReplaceId = -1;
+                    JsonNumber ftri = fileJson.getJsonNumber("fileToReplaceId");
+                    if(ftri !=null) {
+                        fileToReplaceId = ftri.longValueExact();
+                    }
+                    
+                    OptionalFileParams optionalFileParams = null;
+                    try {
+                        // (2b) Load up optional params via JSON
+                        //  - Will skip extra attributes which includes fileToReplaceId and forceReplace
+                        optionalFileParams = new OptionalFileParams(fileJson.toString());
+
+                        String newFilename = null;
+                        String newFileContentType = null;
+                        String newStorageIdentifier = null;
+                        if ((fileToReplaceId !=-1) && optionalFileParams.hasStorageIdentifier()) {
+                            newStorageIdentifier = optionalFileParams.getStorageIdentifier();
+                            newStorageIdentifier = DataAccess.expandStorageIdentifierIfNeeded(newStorageIdentifier);
+                            if(!DataAccess.uploadToDatasetAllowed(dataset,  newStorageIdentifier)) {
+                                addErrorSevere("Dataset store configuration does not allow provided storageIdentifier.");
+                            }
+                            if (optionalFileParams.hasFileName()) {
+                                newFilename = optionalFileParams.getFileName();
+                                if (optionalFileParams.hasMimetype()) {
+                                    newFileContentType = optionalFileParams.getMimeType();
+                                }
+                            }
+
+                            msgt("REPLACE!  = " + newFilename);
+                            if (forceReplace) {
+                                runForceReplaceFile(fileToReplaceId, newFilename, newFileContentType,
+                                        newStorageIdentifier, null, dataset, optionalFileParams, true);
+                            } else {
+                                runReplaceFile(fileToReplaceId, newFilename, newFileContentType, newStorageIdentifier,
+                                        null, dataset, optionalFileParams, true);
+                            }
+                            if (hasError()) {
+                                JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                        .add("storageIdentifier", newStorageIdentifier)
+                                        .add("errorMessage", getHttpErrorCode().toString() +":"+ getErrorMessagesAsString("\n"))
+                                        .add("fileDetails", fileJson);
+                                jarr.add(fileoutput);
+                            } else {
+                                JsonObject successresult = getSuccessResultAsJsonObjectBuilder().build();
+                                String duplicateWarning = getDuplicateFileWarning();
+
+                                if (duplicateWarning != null && !duplicateWarning.isEmpty()) {
+                                    JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                            .add("storageIdentifier", newStorageIdentifier)
+                                            .add("warningMessage", getDuplicateFileWarning())
+                                            .add("fileDetails", successresult.getJsonArray("files").getJsonObject(0));
+                                    jarr.add(fileoutput);
+                                } else {
+                                    JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                            .add("storageIdentifier", newStorageIdentifier)
+                                            .add("successMessage", "Replaced successfully in the dataset")
+                                            .add("fileDetails", successresult.getJsonArray("files").getJsonObject(0));
+                                    jarr.add(fileoutput);
+                                }
+                            successNumberofFiles = successNumberofFiles + 1;
+                            }
+                        } else {
+                            JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                    .add("errorMessage", "You must provide a fileToReplaceId, storageidentifier, filename, and mimetype.")
+                                    .add("fileDetails", fileJson);
+
+                            jarr.add(fileoutput);
+                        }
+
+                    } catch (DataFileTagException ex) {
+                        logger.log(Level.SEVERE, null, ex);
+                        JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                .add("errorCode", Response.Status.BAD_REQUEST.getStatusCode())
+                                .add("message", ex.getMessage())
+                                .add("fileDetails", fileJson);
+                        jarr.add(fileoutput);
+
+                    }
+                    catch (NoFilesException ex) {
+                        logger.log(Level.SEVERE, null, ex);
+                        JsonObjectBuilder fileoutput = Json.createObjectBuilder()
+                                .add("errorCode", Response.Status.BAD_REQUEST.getStatusCode())
+                                .add("message", BundleUtil.getStringFromBundle("NoFileException!  Serious Error! See administrator!"))
+                                .add("fileDetails", fileJson);
+                        jarr.add(fileoutput);
+                    }
+                }// End of adding files
+
+                DatasetLock eipLock = dataset.getLockFor(DatasetLock.Reason.EditInProgress);
+                if (eipLock == null) {
+                    logger.warning("Dataset not locked for EditInProgress ");
+                } else {
+                    datasetService.removeDatasetLocks(dataset, DatasetLock.Reason.EditInProgress);
+                    logger.fine("Removed EditInProgress lock ");
+                }
+
+                try {
+                    Command<Dataset> cmd = new UpdateDatasetVersionCommand(dataset, dvRequest, filesToDelete, clone);
+                    ((UpdateDatasetVersionCommand) cmd).setValidateLenient(true);
+                    commandEngine.submit(cmd);
+                } catch (CommandException ex) {
+                    return error(Response.Status.INTERNAL_SERVER_ERROR, "CommandException updating DatasetVersion from addFiles job: " + ex.getMessage());
+                }
+
+                fileService.finalizeFileDeletes(deleteFileStorageLocations);
+                
+                dataset = datasetService.find(dataset.getId());
+
+                //ingest job
+                ingestService.startIngestJobsForDataset(dataset, (AuthenticatedUser) authUser);
+
+            }
+        }
+        catch ( jakarta.json.stream.JsonParsingException ex) {
+            ex.printStackTrace();
+            return error(BAD_REQUEST, "Json Parsing Exception :" + ex.getMessage());
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            return error(BAD_REQUEST, e.getMessage());
+        }
+
+        JsonObjectBuilder result = Json.createObjectBuilder()
+                .add("Total number of files", totalNumberofFiles)
+                .add("Number of files successfully replaced", successNumberofFiles);
+
+        return Response.ok().entity(Json.createObjectBuilder()
+                .add("status", ApiConstants.STATUS_OK)
+                .add("data", Json.createObjectBuilder().add("Files", jarr).add("Result", result)).build() ).build();
+    }
+
+    protected static Response error(Response.Status sts, String msg ) {
+        return Response.status(sts)
+                .entity( NullSafeJsonBuilder.jsonObjectBuilder()
+                        .add("status", ApiConstants.STATUS_ERROR)
+                        .add( "message", msg ).build()
+                ).type(MediaType.APPLICATION_JSON_TYPE).build();
+    }
+
 } // end class
   /*
     DatasetPage sequence:
@@ -1969,4 +2455,4 @@ public String getFileName()
     1) Recovery from adding same file and duplicate being found
         - draft ok
         - published verion - nope
-*/
\ No newline at end of file
+*/
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/DuplicateFileChecker.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/DuplicateFileChecker.java
index a709f07b5b7..dd55ec72213 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/DuplicateFileChecker.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/DuplicateFileChecker.java
@@ -9,7 +9,9 @@
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
 import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -150,18 +152,27 @@ public static boolean isDuplicateOriginalWay(DatasetVersion workingVersion, File
         List<FileMetadata> wvCopy = new ArrayList<>(workingVersion.getFileMetadatas());
         Iterator<FileMetadata> fmIt = wvCopy.iterator();
 
-        while (fmIt.hasNext()) {
+        while (fmIt.hasNext()) {            
             FileMetadata fm = fmIt.next();
-            String currentCheckSum = fm.getDataFile().getChecksumValue();
+            String currentCheckSum = fm.getDataFile().getChecksumValue();            
             if (currentCheckSum != null) {
+                if (currentCheckSum.equals(selectedCheckSum)) {
+                    DataFile existingFile = fm.getDataFile();
+                    List<String> args = Arrays.asList(existingFile.getDisplayName());
+                    String inLineMessage = BundleUtil.getStringFromBundle("dataset.file.inline.message", args);
+                    fileMetadata.getDataFile().setDuplicateFilename(inLineMessage);
+                    return true;
+                }
+                /*
                 if (checkSumMap.get(currentCheckSum) != null) {
                     checkSumMap.put(currentCheckSum, checkSumMap.get(currentCheckSum).intValue() + 1);
                 } else {
                     checkSumMap.put(currentCheckSum, 1);
-                }
+                }*/
             }
         }
-        return checkSumMap.get(selectedCheckSum) != null; // && checkSumMap.get(selectedCheckSum).intValue() > 1;
+        return false;
+       // return checkSumMap.get(selectedCheckSum) != null; // && checkSumMap.get(selectedCheckSum).intValue() > 1;
             
     }
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileReplacePageHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileReplacePageHelper.java
index e6d7c1e5ebe..6e0c16a93e0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileReplacePageHelper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileReplacePageHelper.java
@@ -6,15 +6,12 @@
 package edu.harvard.iq.dataverse.datasetutility;
 
 import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DataFile.ChecksumType;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.FileMetadata;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.primefaces.event.FileUploadEvent;
-import org.primefaces.model.UploadedFile;
+
 
 /**
  * Adding single file replace to the EditDatafilesPage.
@@ -22,7 +19,7 @@
  * Phase 1: File successfully uploaded and unpersisted DataFile is in memory
  * Phase 2: Save the files
  * 
-  http://localhost:8080/editdatafiles.xhtml?mode=SINGLE_REPLACE&datasetId=26&fid=726
+  http://localhost:8080/editdatafiles.xhtml?mode=REPLACE&datasetId=26&fid=726
  * This is messy, trying to contain some of it--give me APIs or more time, more time:)
  * 
  * @author rmp553
@@ -94,16 +91,17 @@ public boolean resetReplaceFileHelper(){
     
     /**
      * Handle native file replace
+     * @param checkSum 
      * @param event 
      */
-    public boolean handleNativeFileUpload(InputStream inputStream, String fileName, String fileContentType) {
+    public boolean handleNativeFileUpload(InputStream inputStream, String fullStorageId, String fileName, String fileContentType, String checkSumValue, ChecksumType checkSumType) {
                 
         phase1Success = false;
         
         // Preliminary sanity check
         //
-        if (inputStream == null){
-            throw new NullPointerException("inputStream cannot be null");
+        if ((inputStream == null)&&(fullStorageId==null)){
+            throw new NullPointerException("inputStream and storageId cannot both be null");
         }
         if (fileName == null){
             throw new NullPointerException("fileName cannot be null");
@@ -111,14 +109,20 @@ public boolean handleNativeFileUpload(InputStream inputStream, String fileName,
         if (fileContentType == null){
             throw new NullPointerException("fileContentType cannot be null");
         }
-          
+        
+        OptionalFileParams ofp = null;
+        ofp = new OptionalFileParams();
+        if(checkSumValue != null) {
+            ofp.setCheckSum(checkSumValue, checkSumType);
+        }
         // Run 1st phase of replace
         //
         replaceFileHelper.runReplaceFromUI_Phase1(fileToReplace.getId(),
                 fileName,
                 fileContentType,
                 inputStream,
-                null
+                fullStorageId,
+                ofp
         );
         
         // Did it work?
@@ -191,6 +195,10 @@ public List<FileMetadata> getNewFileMetadatasBeforeSave(){
         
     }
     
+    public AddReplaceFileHelper getAddReplaceFileHelper(){
+        return replaceFileHelper;
+    }
+    
     /** 
      * 
      * Show file upload component if Phase 1 hasn't happened yet
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileSizeChecker.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileSizeChecker.java
index 8d24270c76c..06b3f467867 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileSizeChecker.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileSizeChecker.java
@@ -6,9 +6,6 @@
 package edu.harvard.iq.dataverse.datasetutility;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.SystemConfig;
-import java.util.Collections;
-import java.util.logging.Logger;
 
 /**
  * Convenience methods for checking max. file size
@@ -16,94 +13,24 @@
  */
 public class FileSizeChecker {
 
-    private static final Logger logger = Logger.getLogger(FileSizeChecker.class.getCanonicalName());
+	/* This method turns a number of bytes into a human readable version
+	 */
+	public static String bytesToHumanReadable(long v) {
+		return bytesToHumanReadable(v, 1);
+	}
+
+	/* This method turns a number of bytes into a human readable version
+	 * with figs decimal places
+	 */
+	public static String bytesToHumanReadable(long v, int figs) {
+		if (v < 1024) {
+			return v +  " "  + BundleUtil.getStringFromBundle("file.addreplace.error.byte_abrev");
+		}
+		// 63 - because long has 63 binary digits
+		int trailingBin0s = (63 - Long.numberOfLeadingZeros(v))/10;
+		//String base = "%."+figs+"f %s"+ BundleUtil.getStringFromBundle("file.addreplace.error.byte_abrev");
+		return String.format("%."+figs+"f %s"+ BundleUtil.getStringFromBundle("file.addreplace.error.byte_abrev"), (double)v / (1L << (trailingBin0s*10)),
+				" KMGTPE".charAt(trailingBin0s));
+	}
 
-    SystemConfig systemConfig;
-           
-    /**
-     * constructor
-     */
-    public FileSizeChecker(SystemConfig systemConfig){
-        if (systemConfig == null){
-            throw new NullPointerException("systemConfig cannot be null");
-        }
-        this.systemConfig = systemConfig;
-    }
-    
-    public FileSizeResponse isAllowedFileSize(Long filesize){
-        
-        if (filesize == null){
-            throw new NullPointerException("filesize cannot be null");            
-            //return new FileSizeResponse(false, "The file size could not be found!");
-        }
-        
-        Long maxFileSize = systemConfig.getMaxFileUploadSize();
-        
-        // If no maxFileSize in the database, set it to unlimited!
-        //
-        if (maxFileSize == null){
-            return new FileSizeResponse(true, 
-                    BundleUtil.getStringFromBundle("file.addreplace.file_size_ok")
-            );
-        }
-    
-        // Good size!
-        //
-        if (filesize <= maxFileSize){
-            return new FileSizeResponse(true, 
-                    BundleUtil.getStringFromBundle("file.addreplace.file_size_ok")
-            );
-        }
-        
-        // Nope!  Sorry! File is too big
-        //
-        String errMsg = BundleUtil.getStringFromBundle("file.addreplace.error.file_exceeds_limit", Collections.singletonList(bytesToHumanReadable(maxFileSize)));
-        
-        return new FileSizeResponse(false, errMsg);
-        
-    }
-    
-    /* This method turns a number of bytes into a human readable version
-     */
-    public static String bytesToHumanReadable(long v) {
-        return bytesToHumanReadable(v, 1);
-    }
-    
-    /* This method turns a number of bytes into a human readable version
-     * with figs decimal places
-     */
-    public static String bytesToHumanReadable(long v, int figs) {
-        if (v < 1024) {
-            return v +  " "  + BundleUtil.getStringFromBundle("file.addreplace.error.byte_abrev");
-        }
-        // 63 - because long has 63 binary digits
-        int trailingBin0s = (63 - Long.numberOfLeadingZeros(v))/10;
-        //String base = "%."+figs+"f %s"+ BundleUtil.getStringFromBundle("file.addreplace.error.byte_abrev");
-        return String.format("%."+figs+"f %s"+ BundleUtil.getStringFromBundle("file.addreplace.error.byte_abrev"), (double)v / (1L << (trailingBin0s*10)),
-                             " KMGTPE".charAt(trailingBin0s));
-    }
-    
-    /**
-     * Inner class that can also return an error message
-     */
-    public class FileSizeResponse{
-        
-        public boolean fileSizeOK;
-        public String userMsg;
-        
-        public FileSizeResponse(boolean isOk, String msg){
-            
-            fileSizeOK = isOk;
-            userMsg = msg;
-        }
-        
-        public boolean isFileSizeOK(){
-            return fileSizeOK;
-        }
-        
-        public String getUserMessage(){
-            return userMsg;
-        }
-        
-    } // end inner class
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileVersionInfo.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileVersionInfo.java
index c967de249ac..ca8775593b8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileVersionInfo.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/FileVersionInfo.java
@@ -16,6 +16,7 @@
  * 
  * @author rmp553
  */
+//ToDo - used at all?
 public class FileVersionInfo {
     
     private Long id;
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParams.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParams.java
index 6459715e518..f7df81b6386 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParams.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParams.java
@@ -10,10 +10,13 @@
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.internal.LinkedTreeMap;
 import com.google.gson.reflect.TypeToken;
+
 import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DataFile.ChecksumType;
 import edu.harvard.iq.dataverse.DataFileTag;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.api.Util;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 
 import java.lang.reflect.Type;
@@ -36,6 +39,12 @@
  *  - Provenance related information
  * 
  * @author rmp553
+ * @todo (?) We may want to consider renaming this class to DataFileParams or
+ * DataFileInfo... it was originally created to encode some bits of info - 
+ * the file "tags" specifically, that didn't fit in elsewhere in the normal 
+ * workflow; but it's been expanded to cover pretty much everything else associated
+ * with DataFiles and it's not really "optional" anymore when, for example, used
+ * in the direct upload workflow. (?)
  */
 public class OptionalFileParams {
 
@@ -62,8 +71,27 @@ public class OptionalFileParams {
     private boolean restrict = false;
     public static final String RESTRICT_ATTR_NAME = "restrict";
 
-
-     
+    private boolean tabIngest = true;
+    public static final String TAB_INGEST_ATTR_NAME = "tabIngest";
+    
+    private String storageIdentifier;
+    public static final String STORAGE_IDENTIFIER_ATTR_NAME = "storageIdentifier";
+    private String fileName;
+    public static final String FILE_NAME_ATTR_NAME = "fileName";
+    private String mimeType;
+    public static final String MIME_TYPE_ATTR_NAME = "mimeType";
+    private String checkSumValue;
+    private ChecksumType checkSumType;
+    public static final String FILE_SIZE_ATTR_NAME = "fileSize";
+    private Long fileSize;
+    public static final String LEGACY_CHECKSUM_ATTR_NAME = "md5Hash";
+    public static final String CHECKSUM_OBJECT_NAME = "checksum";
+    public static final String CHECKSUM_OBJECT_TYPE = "@type";
+    public static final String CHECKSUM_OBJECT_VALUE = "@value";
+
+    public OptionalFileParams() {
+    }
+    
     public OptionalFileParams(String jsonData) throws DataFileTagException{
         
         if (jsonData != null){
@@ -94,6 +122,21 @@ public OptionalFileParams(String description,
         this.restrict = restrict;
     }
 
+    //For use in replace operations - load the file metadata from the file being replaced so it can be applied to the new file
+    //checksum and mimetype aren't needed
+    public OptionalFileParams(DataFile df) throws DataFileTagException {
+        FileMetadata fm = df.getFileMetadata();
+
+        this.description = fm.getDescription();
+        setCategories(fm.getCategoriesByName());
+        this.addFileDataTags(df.getTagLabels());
+        this.restrict = fm.isRestricted();
+        //Explicitly do not replace the file name - replaces with -force may change the mimetype and extension
+        //this.label = fm.getLabel(); 
+        this.directoryLabel = fm.getDirectoryLabel();
+        this.provFreeForm = fm.getProvFreeForm();
+    }
+
 
     /**
      *  Set description
@@ -142,63 +185,101 @@ public void setRestriction(boolean restrict){
     public boolean getRestriction(){
         return this.restrict;
     }
-    
-    public boolean hasCategories(){
-        if ((categories == null)||(this.categories.isEmpty())){
-            return false;
-        }
-        return true;
+
+    public void setTabIngest(boolean tabIngest) {
+        this.tabIngest = tabIngest;
+    }
+
+    public boolean getTabIngest() {
+        return this.tabIngest;
+    }
+
+    public boolean hasCategories() {
+        return categories != null;
     }
  
-    public boolean hasFileDataTags(){
-        if ((dataFileTags == null)||(this.dataFileTags.isEmpty())){
-            return false;
-        }
-        return true;
+    public boolean hasFileDataTags() {
+        return dataFileTags != null;
     }
  
     public boolean hasDescription(){
-        if ((description == null)||(this.description.isEmpty())){
-            return false;
-        }
-        return true;
+        return description != null;
     }
 
-    public boolean hasDirectoryLabel(){
-        if ((directoryLabel == null)||(this.directoryLabel.isEmpty())){
-            return false;
-        }
-        return true;
+    public boolean hasDirectoryLabel() {
+        return directoryLabel != null;
     }
     
-    public boolean hasLabel(){
-        if ((label == null)||(this.label.isEmpty())){
-            return false;
-        }
-        return true;
+    public boolean hasLabel() {
+        return label != null;
     }
     
-    public boolean hasProvFreeform(){
-        if ((provFreeForm == null)||(this.provFreeForm.isEmpty())){
-            return false;
-        }
-        return true;
+    public boolean hasProvFreeform() {
+        return provFreeForm != null;
+    }
+
+	public boolean hasStorageIdentifier() {
+		return ((storageIdentifier!=null)&&(!storageIdentifier.isEmpty()));
+	}
+
+	public String getStorageIdentifier() {
+		return storageIdentifier;
+	}
+
+	public boolean hasFileName() {
+		return fileName != null;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public boolean hasMimetype() {
+		return mimeType != null;
+	}
+
+	public String getMimeType() {
+		return mimeType;
+	}
+
+	public void setCheckSum(String checkSum, ChecksumType type) {
+		this.checkSumValue = checkSum;
+		this.checkSumType = type;
+	}
+	
+	public boolean hasCheckSum() {
+		return checkSumValue != null;
+	}
+
+	public String getCheckSum() {
+		return checkSumValue;
+	}
+	
+    public ChecksumType getCheckSumType() {
+        return checkSumType;
+    }
+    
+    public boolean hasFileSize() {
+        return fileSize != null;
+    }
+    
+    public Long getFileSize() {
+        return fileSize;
     }
     
+    public void setFileSize(long fileSize) {
+        this.fileSize = fileSize;
+    }
+
     /**
      *  Set tags
      *  @param tags
      */
     public void setCategories(List<String> newCategories) {
-
         if (newCategories != null) {
             newCategories = Util.removeDuplicatesNullsEmptyStrings(newCategories);
-            if (newCategories.isEmpty()) {
-                newCategories = null;
-            }
+            this.categories = newCategories;
         }
-
-        this.categories = newCategories;
     }
 
     /**
@@ -234,12 +315,7 @@ private void loadParamsFromJson(String jsonData) throws DataFileTagException{
 //            logger.log(Level.SEVERE, "jsonData is null");
         }
         JsonObject jsonObj;
-        try {
-            jsonObj = new Gson().fromJson(jsonData, JsonObject.class);
-        } catch (ClassCastException ex) {
-            logger.info("Exception parsing string '" + jsonData + "': " + ex);
-            return;
-        }
+        jsonObj = new Gson().fromJson(jsonData, JsonObject.class);
 
         // -------------------------------
         // get description as string
@@ -280,7 +356,70 @@ private void loadParamsFromJson(String jsonData) throws DataFileTagException{
             
             this.restrict = Boolean.valueOf(jsonObj.get(RESTRICT_ATTR_NAME).getAsString());
         }
+
+        // -------------------------------
+        // get tabIngest as boolean
+        // -------------------------------
+        if ((jsonObj.has(TAB_INGEST_ATTR_NAME)) && (!jsonObj.get(TAB_INGEST_ATTR_NAME).isJsonNull())){
+
+            this.tabIngest = Boolean.valueOf(jsonObj.get(TAB_INGEST_ATTR_NAME).getAsString());
+        }
+        
+        // -------------------------------
+        // get storage identifier as string
+        // -------------------------------
+        if ((jsonObj.has(STORAGE_IDENTIFIER_ATTR_NAME)) && (!jsonObj.get(STORAGE_IDENTIFIER_ATTR_NAME).isJsonNull())){
+            // Basic sanity check that driver specified is defined and the overall
+            // identifier is consistent with that store's config. Note that being able to
+            // specify a driver that does not support direct uploads is currently used with
+            // out-of-band uploads, e.g. for bulk migration.
+            String storageId = jsonObj.get(STORAGE_IDENTIFIER_ATTR_NAME).getAsString();
+            if (DataAccess.isValidDirectStorageIdentifier(storageId)) {
+                this.storageIdentifier = storageId;
+            }
+
+        }
         
+        // -------------------------------
+        // get file name as string
+        // -------------------------------
+        if ((jsonObj.has(FILE_NAME_ATTR_NAME)) && (!jsonObj.get(FILE_NAME_ATTR_NAME).isJsonNull())){
+
+            this.fileName = jsonObj.get(FILE_NAME_ATTR_NAME).getAsString();
+        }
+        
+        // -------------------------------
+        // get mimetype as string
+        // -------------------------------
+        if ((jsonObj.has(MIME_TYPE_ATTR_NAME)) && (!jsonObj.get(MIME_TYPE_ATTR_NAME).isJsonNull())){
+
+            this.mimeType = jsonObj.get(MIME_TYPE_ATTR_NAME).getAsString();
+        }
+        
+        // -------------------------------
+        // get md5 checkSum as string
+        // -------------------------------
+        if ((jsonObj.has(LEGACY_CHECKSUM_ATTR_NAME)) && (!jsonObj.get(LEGACY_CHECKSUM_ATTR_NAME).isJsonNull())){
+
+            this.checkSumValue = jsonObj.get(LEGACY_CHECKSUM_ATTR_NAME).getAsString().toLowerCase();
+            this.checkSumType= ChecksumType.MD5;
+        }
+        // -------------------------------
+        // get checkSum type and value
+        // -------------------------------
+        else if ((jsonObj.has(CHECKSUM_OBJECT_NAME)) && (!jsonObj.get(CHECKSUM_OBJECT_NAME).isJsonNull())){
+
+            this.checkSumValue = ((JsonObject) jsonObj.get(CHECKSUM_OBJECT_NAME)).get(CHECKSUM_OBJECT_VALUE).getAsString().toLowerCase();
+            this.checkSumType = ChecksumType.fromString(((JsonObject) jsonObj.get(CHECKSUM_OBJECT_NAME)).get(CHECKSUM_OBJECT_TYPE).getAsString());
+
+        }
+        // -------------------------------
+        // get file size as a Long, if supplied
+        // -------------------------------
+        if ((jsonObj.has(FILE_SIZE_ATTR_NAME)) && (!jsonObj.get(FILE_SIZE_ATTR_NAME).isJsonNull())){
+
+            this.fileSize = jsonObj.get(FILE_SIZE_ATTR_NAME).getAsLong();
+        }
         // -------------------------------
         // get tags 
         // -------------------------------
@@ -333,27 +472,20 @@ private void addFileDataTags(List<String> potentialTags) throws DataFileTagExcep
         }
 
         potentialTags = Util.removeDuplicatesNullsEmptyStrings(potentialTags);
-                
-        if (potentialTags.isEmpty()){
-            return;
-        }
-        
+
          // Make a new list
-        this.dataFileTags = new ArrayList<>();
+        List<String> newList = new ArrayList<>();
            
         // Add valid potential tags to the list
         for (String tagToCheck : potentialTags){
             if (DataFileTag.isDataFileTag(tagToCheck)){
-                this.dataFileTags.add(tagToCheck);
+                newList.add(tagToCheck);
             }else{                    
                 String errMsg = BundleUtil.getStringFromBundle("file.addreplace.error.invalid_datafile_tag");
                 throw new DataFileTagException(errMsg + " [" + tagToCheck + "]. Please use one of the following: " + DataFileTag.getListofLabelsAsString());
             }
         }
-         // Shouldn't happen....
-         if (dataFileTags.isEmpty()){
-            dataFileTags = null;
-        }
+        this.dataFileTags = newList;
     }
     
     private void msg(String s){
@@ -516,5 +648,5 @@ private void replaceFileDataTagsInFile(DataFile df) throws DataFileTagException{
         }                
         
     }
-        
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/WorldMapPermissionHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/WorldMapPermissionHelper.java
deleted file mode 100644
index 73c0af1d2db..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/WorldMapPermissionHelper.java
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse.datasetutility;
-
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DataverseSession;
-import edu.harvard.iq.dataverse.DvObject;
-import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.MapLayerMetadata;
-import edu.harvard.iq.dataverse.MapLayerMetadataServiceBean;
-import edu.harvard.iq.dataverse.PermissionServiceBean;
-import edu.harvard.iq.dataverse.SettingsWrapper;
-import edu.harvard.iq.dataverse.authorization.Permission;
-import edu.harvard.iq.dataverse.authorization.users.GuestUser;
-import edu.harvard.iq.dataverse.authorization.users.User;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-/**
- * This class originally encapsulated display logic for the DatasetPage
- * 
- * It allows the following checks without redundantly querying the db to 
- * check permissions or if MapLayerMetadata exists
- * 
- * - canUserSeeMapDataButton (private)
- *      - canUserSeeMapDataButtonFromPage (public)
- *      - canUserSeeMapDataButtonFromAPI (public)
- * 
- * - canSeeMapButtonReminderToPublish (private)
- *      - canSeeMapButtonReminderToPublishFromPage (public)
- *      - canSeeMapButtonReminderToPublishFromAPI (public)
- * 
- * - canUserSeeExploreWorldMapButton (private)
- *      - canUserSeeExploreWorldMapButtonFromPage (public)
- *      - canUserSeeExploreWorldMapButtonFromAPI (public)
- * 
- * @author rmp553
- */
-@ViewScoped
-@Named
-public class WorldMapPermissionHelper implements java.io.Serializable {
-    
-    @Inject SettingsWrapper settingsWrapper;
-    @Inject MapLayerMetadataServiceBean mapLayerMetadataService;
-    @Inject PermissionServiceBean permissionService;
-    @Inject DataverseSession session;
-
-    
-    private final Map<Long, Boolean> fileMetadataWorldMapExplore = new HashMap<>(); // { FileMetadata.id : Boolean } 
-    private  Map<Long, MapLayerMetadata> mapLayerMetadataLookup = null;
-    private final Map<String, Boolean> datasetPermissionMap = new HashMap<>(); // { Permission human_name : Boolean }
-
-    
-    public WorldMapPermissionHelper( ){
-        
-    }
-
-    
-     /**
-     * Using a DataFile id, retrieve an associated MapLayerMetadata object
-     *
-     * The MapLayerMetadata objects have been fetched at page inception by
-     * "loadMapLayerMetadataLookup()"
-     */
-    public MapLayerMetadata getMapLayerMetadata(DataFile df) {
-        if (df == null) {
-            return null;
-        }
-        if (mapLayerMetadataLookup == null){
-            loadMapLayerMetadataLookup(df.getOwner());
-        }
-        return this.mapLayerMetadataLookup.get(df.getId());
-    }
-    
- 
-    /*
-     * Call this when using the API
-     *   - calls private method canUserSeeExploreWorldMapButton
-     */ 
-    public boolean canUserSeeExploreWorldMapButtonFromAPI(FileMetadata fm, User user){
-     
-        if (fm == null){
-            return false;
-        }
-        if (user==null){
-            return false;
-        }
-        if (!this.permissionService.userOn(user, fm.getDataFile()).has(Permission.DownloadFile)){
-            return false;
-        }
-
-        return this.canUserSeeExploreWorldMapButton(fm, true);    
-    }
-    
-     /**
-     * Call this from a Dataset or File page
-     *   - calls private method canUserSeeExploreWorldMapButton
-     * 
-     *  WARNING: Before calling this, make sure the user has download
-     *  permission for the file!!  (See DatasetPage.canDownloadFile())
-     *   
-     * @param FileMetadata fm
-     * @return boolean
-     */
-    public boolean canUserSeeExploreWorldMapButtonFromPage(FileMetadata fm){
-        
-        if (fm==null){
-            return false;
-        }
-        return this.canUserSeeExploreWorldMapButton(fm, true);
-    }
-    
-    /**
-     *  WARNING: Before calling this, make sure the user has download
-     *  permission for the file!!  (See DatasetPage.canDownloadFile())
-     * 
-     * Should there be a Explore WorldMap Button for this file?
-     *   See table in: https://github.com/IQSS/dataverse/issues/1618
-     * 
-     *  (1) Does the file have MapLayerMetadata?
-     *  (2) Are the proper settings in place
-     * 
-     * @param fm FileMetadata
-     * @return boolean
-     */
-    private boolean canUserSeeExploreWorldMapButton(FileMetadata fm, boolean permissionsChecked){
-        if (fm==null){
-            return false;
-        }
-        // This is only here to make the public method users think...
-        if (!permissionsChecked){
-            return false;
-        }
-        if (this.fileMetadataWorldMapExplore.containsKey(fm.getId())){
-            // Yes, return previous answer
-            //logger.info("using cached result for candownloadfile on filemetadata "+fid);
-            return this.fileMetadataWorldMapExplore.get(fm.getId());
-        }
-        
-        /* -----------------------------------------------------
-           Does a Map Exist?
-         ----------------------------------------------------- */
-        if (!(this.hasMapLayerMetadata(fm))) {
-            //See if it does
-            MapLayerMetadata layer_metadata = mapLayerMetadataService.findMetadataByDatafile(fm.getDataFile());
-            if (layer_metadata != null) {
-                if (mapLayerMetadataLookup == null) {
-                    loadMapLayerMetadataLookup(fm.getDataFile().getOwner());
-                }
-                // yes: keep going...
-                mapLayerMetadataLookup.put(layer_metadata.getDataFile().getId(), layer_metadata);
-            } else {
-                // Nope: no button
-                this.fileMetadataWorldMapExplore.put(fm.getId(), false);
-                return false;
-            }
-        }
-              
-        /*
-            Is setting for GeoconnectViewMaps true?
-            Nope? no button
-        */
-        if (!settingsWrapper.isTrueForKey(SettingsServiceBean.Key.GeoconnectViewMaps, false)){
-            this.fileMetadataWorldMapExplore.put(fm.getId(), false);
-            return false;
-        } 
-        //----------------------------------------------------------------------
-        //(0) Before we give it to you - if version is deaccessioned and user
-        // does not have edit dataset permission then may download
-        //----------------------------------------------------------------------
-        
-       if (fm.getDatasetVersion().isDeaccessioned()) {
-           if (this.doesSessionUserHavePermission( Permission.EditDataset, fm)) {
-               // Yes, save answer and return true
-               this.fileMetadataWorldMapExplore.put(fm.getId(), true);
-               return true;
-           } else {
-               this.fileMetadataWorldMapExplore.put(fm.getId(), false);
-               return false;
-           }
-       }
-               //Check for restrictions
-        
-        boolean isRestrictedFile = fm.isRestricted();
-        
-        // --------------------------------------------------------------------
-        //  Is the file Unrestricted ?        
-        // --------------------------------------------------------------------
-        if (!isRestrictedFile){
-            // Yes, save answer and return true
-            this.fileMetadataWorldMapExplore.put(fm.getId(), true);
-            return true;
-        }
-        
-        // --------------------------------------------------------------------
-        // Conditions (2) through (4) are for Restricted files
-        // --------------------------------------------------------------------
-
-
-        if (session.getUser() instanceof GuestUser){
-            this.fileMetadataWorldMapExplore.put(fm.getId(), false);
-            return false;
-        }
-
-        
-        // --------------------------------------------------------------------
-        // (3) Does the User have DownloadFile Permission at the **Dataset** level 
-        // --------------------------------------------------------------------
-        
-
-        if (!this.doesSessionUserHavePermission(Permission.DownloadFile, fm)){
-            // Yes, save answer and return true
-            this.fileMetadataWorldMapExplore.put(fm.getId(), false);
-            return false;
-        }
-        
-        /* -----------------------------------------------------
-             Yes: User can view button!
-         ----------------------------------------------------- */    
-        this.fileMetadataWorldMapExplore.put(fm.getId(), true);
-        return true;
-    }
-
-    
-    /*
-     Check if the FileMetadata.dataFile has an associated MapLayerMetadata object
-    
-     The MapLayerMetadata objects have been fetched at page inception by "loadMapLayerMetadataLookup()" 
-     */
-    public boolean hasMapLayerMetadata(FileMetadata fm) {
-        if (fm == null) {
-            return false;
-        }
-        if (fm.getDataFile() == null) {
-            return false;
-        }
-        if (mapLayerMetadataLookup == null) {
-            loadMapLayerMetadataLookup(fm.getDataFile().getOwner());
-        }
-        return doesDataFileHaveMapLayerMetadata(fm.getDataFile());
-    }
-
-    /**
-     * Check if a DataFile has an associated MapLayerMetadata object
-     *
-     * The MapLayerMetadata objects have been fetched at page inception by
-     * "loadMapLayerMetadataLookup()"
-     */
-    private boolean doesDataFileHaveMapLayerMetadata(DataFile df) {
-        if (df == null) {
-            return false;
-        }
-        if (df.getId() == null) {
-            return false;
-        }
-        return this.mapLayerMetadataLookup.containsKey(df.getId());
-    }
-    
-    
-    /**
-     * Create a hashmap consisting of { DataFile.id : MapLayerMetadata object}
-     *
-     * Very few DataFiles will have associated MapLayerMetadata objects so only
-     * use 1 query to get them
-     */
-    private void loadMapLayerMetadataLookup(Dataset dataset) {
-        mapLayerMetadataLookup = new HashMap<>();
-        if (dataset == null) {
-        }
-        if (dataset.getId() == null) {
-            return;
-        }
-        List<MapLayerMetadata> mapLayerMetadataList = mapLayerMetadataService.getMapLayerMetadataForDataset(dataset);
-        if (mapLayerMetadataList == null) {
-            return;
-        }
-        for (MapLayerMetadata layer_metadata : mapLayerMetadataList) {
-            mapLayerMetadataLookup.put(layer_metadata.getDataFile().getId(), layer_metadata);
-        }
-
-    }// A DataFile may have a related MapLayerMetadata object
-    
-    
-    /**
-     * Check if this is a mappable file type.
-     * 
-     * Currently (2/2016)
-     * - Shapefile (zipped shapefile)
-     * - Tabular file with Geospatial Data tag
-     * 
-     * @param fm
-     * @return 
-     */
-    private boolean isPotentiallyMappableFileType(FileMetadata fm){
-        if (fm==null){
-            return false;
-        }
-        
-        // Yes, it's a shapefile
-        //
-        if (this.isShapefileType(fm)){
-            return true;
-        }
-        
-        // Yes, it's tabular with a geospatial tag
-        //
-        if (fm.getDataFile().isTabularData()){
-            if (fm.getDataFile().hasGeospatialTag()){
-                return true;
-            } 
-        }
-        return false;
-    }
-    
-    
-    
-    public boolean isShapefileType(FileMetadata fm) {
-        if (fm == null) {
-            return false;
-        }
-        if (fm.getDataFile() == null) {
-            return false;
-        }
-
-        return fm.getDataFile().isShapefileType();
-    }
-
-    
-    /**
-     * Call this from a Dataset or File page
-     *   - calls private method canSeeMapButtonReminderToPublish
-     * 
-     *  WARNING: Assumes user isAuthenicated AND has Permission.EditDataset
-     *      - These checks should be made on the DatasetPage or FilePage which calls this method
-     * 
-     *   
-     * @param FileMetadata fm
-     * @return boolean
-     */
-    public boolean canSeeMapButtonReminderToPublishFromPage(FileMetadata fm){
-        if (fm == null){
-            return false;
-        }
-        
-        if (mapLayerMetadataLookup == null){
-            loadMapLayerMetadataLookup(fm.getDatasetVersion().getDataset());
-        }
-        
-        return this.canSeeMapButtonReminderToPublish(fm, true);
-        
-    }
-
-
-    /**
-     * Call this when using the API
-     *   - calls private method canSeeMapButtonReminderToPublish
-     * 
-     * @param fm
-     * @param user
-     * @return 
-     */
-    public boolean canSeeMapButtonReminderToPublishFromAPI(FileMetadata fm, User user){
-        if (fm == null){
-            return false;
-        }
-        if (user==null){
-            return false;
-        }
-        
-        if (!this.permissionService.userOn(user, fm.getDataFile().getOwner()).has(Permission.EditDataset)){
-            return false;
-        }
-
-        return this.canSeeMapButtonReminderToPublish(fm, true);
-        
-    }
-
-
-    
-    /**
-     *   Assumes permissions have been checked!!
-     *
-     *  See table in: https://github.com/IQSS/dataverse/issues/1618
-     * 
-     *  Can the user see a reminder to publish button?
-     *   (1) Is the view GeoconnectViewMaps
-     *   (2) Is this file a Shapefile or a Tabular file tagged as Geospatial?
-     *   (3) Is this DataFile released?  Yes, don't need reminder
-     *   (4) Does a map already exist?  Yes, don't need reminder
-     */
-    private boolean canSeeMapButtonReminderToPublish(FileMetadata fm, boolean permissionsChecked){
-        if (fm==null){
-            return false;
-        } 
-        
-        // Is this user authenticated with EditDataset permission?
-        //
-        if (!(isUserAuthenticatedWithEditDatasetPermission(fm))){
-            return false;
-        }
-        
-        // This is only here as a reminder to the public method users 
-        if (!permissionsChecked){
-            return false;
-        }
-        
-        //  (1) Is the view GeoconnectViewMaps 
-        if (!settingsWrapper.isTrueForKey(SettingsServiceBean.Key.GeoconnectCreateEditMaps, false)){
-            return false;
-        }
-        
-
-        // (2) Is this file a Shapefile or a Tabular file tagged as Geospatial?
-        //
-        if (!(this.isPotentiallyMappableFileType(fm))){
-            return false;
-        }
-
-        // (3) Is this DataFile released?  Yes, don't need reminder
-        //
-        if (fm.getDataFile().isReleased()){
-            return false;
-        }
-        
-        // (4) Does a map already exist?  Yes, don't need reminder
-        //       
-        if (this.hasMapLayerMetadata(fm)){
-            return false;
-        }
-
-        // Looks good
-        //
-        return true;
-    }
-    
-     /**
-     * 
-     *  WARNING: Assumes user isAuthenicated AND has Permission.EditDataset
-     *      - These checks are made on the DatasetPage which calls this method
-     * 
-     */ 
-    public boolean canUserSeeMapDataButtonFromPage(FileMetadata fm){
-
-        if (fm==null){
-            return false;
-        }  
-        
-        // Is this user authenticated with EditDataset permission?
-        //
-        if (!(isUserAuthenticatedWithEditDatasetPermission(fm))){
-            return false;
-        }
-        if (mapLayerMetadataLookup == null){
-            loadMapLayerMetadataLookup(fm.getDatasetVersion().getDataset());
-        }
-        return this.canUserSeeMapDataButton(fm, true);
-    }
-            
-
-    
-    /**
-     * Call this when using the API
-     *   - calls private method canUserSeeMapDataButton
-     * 
-     * @param fm
-     * @param user
-     * @return 
-     */
-    public boolean canUserSeeMapDataButtonFromAPI(FileMetadata fm, User user){
-        if (fm == null){
-            return false;
-        }
-        if (user==null){
-            return false;
-        }
-        
-        if (!this.permissionService.userOn(user, fm.getDataFile().getOwner()).has(Permission.EditDataset)){
-            return false;
-        }
-
-        return this.canUserSeeMapDataButton(fm, true);
-        
-    }
-    
-     /**
-     * 
-     *  WARNING: Assumes user isAuthenicated AND has Permission.EditDataset
-     *      - These checks are made on the DatasetPage which calls this method
-     * 
-     * Should there be a Map Data Button for this file?
-     *  see table in: https://github.com/IQSS/dataverse/issues/1618
-     *  (1) Is the user logged in?
-     *  (2) Is this file a Shapefile or a Tabular file tagged as Geospatial?
-     *  (3) Does the logged in user have permission to edit the Dataset to which this FileMetadata belongs?
-     *  (4) Is the create Edit Maps flag set to true?
-     *  (5) Any of these conditions:
-     *        9a) File Published 
-     *        (b) Draft: File Previously published  
-     * @param fm FileMetadata
-     * @return boolean
-     */
-    private boolean canUserSeeMapDataButton(FileMetadata fm, boolean permissionsChecked){
-        if (fm==null){
-            return false;
-        }         
-                 
-        // This is only here as a reminder to the public method users 
-        if (!permissionsChecked){
-
-            return false;
-        }
-        
-        //  (1) Is this file a Shapefile or a Tabular file tagged as Geospatial?
-        //  TO DO:  EXPAND FOR TABULAR FILES TAGGED AS GEOSPATIAL!
-        //
-        if (!(this.isPotentiallyMappableFileType(fm))){
-
-            return false;
-        }
-
-
-        //  (2) Is the view GeoconnectViewMaps 
-        if (!settingsWrapper.isTrueForKey(SettingsServiceBean.Key.GeoconnectCreateEditMaps, false)){
-             
-            return false;
-        }
-        
-        
-        // (3) Is File restricted? if Yes - no button.
-        if (fm.isRestricted() || fm.getDataFile().isRestricted()){
-            
-            return false;
-        }
-        
-        
-                     
-        //  (4) Is File released?
-        //
-        if (fm.getDataFile().isReleased()){
-            
-            return true;
-        }
-        
-        // Nope
-        return false;
-    }
-    
-    private boolean isUserAuthenticatedWithEditDatasetPermission( FileMetadata fm){
-        
-        // Is the user authenticated?
-        //
-        if (!(isSessionUserAuthenticated())){
-            return false;
-        }
-        
-        //  If so, can the logged in user edit the Dataset to which this FileMetadata belongs?
-        //
-        if (!this.doesSessionUserHavePermission(Permission.EditDataset, fm)){
-            return false;
-        }
-        
-        return true;
-    }
-    
-    public boolean isSessionUserAuthenticated() {
-
-        
-        if (session == null) {
-            return false;
-        }
-        
-        if (session.getUser() == null) {
-            return false;
-        }
-        
-        return session.getUser().isAuthenticated();
-
-    }
-    
-    private boolean doesSessionUserHavePermission(Permission permissionToCheck, FileMetadata fileMetadata){
-        if (permissionToCheck == null){
-            return false;
-        }
-        
-        DvObject objectToCheck = null;
-        
-        if (permissionToCheck.equals(Permission.EditDataset)){
-            objectToCheck = fileMetadata.getDatasetVersion().getDataset();
-        } else if (permissionToCheck.equals(Permission.DownloadFile)){
-            objectToCheck = fileMetadata.getDataFile();
-        }
-        
-        if (objectToCheck == null){
-            return false;
-        }
-        
-        if (this.session.getUser() == null){
-            return false;
-        }
-        
-        if (this.permissionService == null){
-             return false;
-        }
-               
-        String permName = permissionToCheck.getHumanName();
-       
-        // Has this check already been done? 
-        // 
-        if (this.datasetPermissionMap.containsKey(permName)){
-            // Yes, return previous answer
-            return this.datasetPermissionMap.get(permName);
-        }
-        
-        // Check the permission
-        //
-        
-        boolean hasPermission = this.permissionService.userOn(this.session.getUser(), objectToCheck).has(permissionToCheck);
-
-        // Save the permission
-        this.datasetPermissionMap.put(permName, hasPermission);
-        
-        // return true/false
-        return hasPermission;
-    }
-    
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/CategoryMetadata.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/CategoryMetadata.java
index 5e03899b790..a9b1694d842 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/CategoryMetadata.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/CategoryMetadata.java
@@ -1,13 +1,13 @@
 package edu.harvard.iq.dataverse.datavariable;
 
-import javax.persistence.Index;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.GenerationType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.Index;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.JoinColumn;
 
 @Entity
 @Table(indexes = {@Index(columnList="category_id"), @Index(columnList="variablemetadata_id")})
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/DataVariable.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/DataVariable.java
index 6462f690cac..b2e9441a163 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/DataVariable.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/DataVariable.java
@@ -8,22 +8,22 @@
 
 import java.io.Serializable;
 import java.util.Collection;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import org.hibernate.validator.constraints.NotBlank;
 import edu.harvard.iq.dataverse.DataTable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Index;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Index;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/SummaryStatistic.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/SummaryStatistic.java
index bf81aff3e2b..6896ef360ce 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/SummaryStatistic.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/SummaryStatistic.java
@@ -7,14 +7,14 @@
 package edu.harvard.iq.dataverse.datavariable;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 /*
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/VarGroup.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/VarGroup.java
index 242110e333f..b52c76930d7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/VarGroup.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/VarGroup.java
@@ -1,14 +1,14 @@
 package edu.harvard.iq.dataverse.datavariable;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Index;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Index;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Column;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableCategory.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableCategory.java
index 6a3e702a561..5ccef82b5d1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableCategory.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableCategory.java
@@ -8,16 +8,16 @@
 
 import java.io.Serializable;
 import java.util.List;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 
 import edu.harvard.iq.dataverse.util.AlphaNumericComparator;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import jakarta.persistence.Index;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadata.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadata.java
index c18355c9979..147c2c004db 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadata.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadata.java
@@ -2,18 +2,18 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Index;
-import javax.persistence.UniqueConstraint;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Column;
-import javax.persistence.OneToMany;
-import javax.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Index;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Column;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.CascadeType;
 
 import java.util.Collection;
 import java.util.ArrayList;
@@ -71,6 +71,7 @@ public class VariableMetadata implements Serializable  {
     /**
      * universe: metadata variable field.
      */
+    @Column(columnDefinition="TEXT")
     private String universe;
 
     /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataDDIParser.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataDDIParser.java
index 71d62c132e3..de64b1322c9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataDDIParser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataDDIParser.java
@@ -113,13 +113,13 @@ private void processVar(XMLStreamReader xmlr,  Map<Long, VariableMetadata> mapVa
             if (event == XMLStreamConstants.START_ELEMENT) {
                 if (xmlr.getLocalName().equals("labl")) {
                     processLabel(xmlr, newVM);
+                } else if (xmlr.getLocalName().equals("qstn")) {
+                    processQstn(xmlr, newVM);
                 } else if (xmlr.getLocalName().equals("universe")) {
                     processUniverse(xmlr, newVM);
                 } else if (xmlr.getLocalName().equals("notes")) {
                     processNote(xmlr, newVM);
-                } else if (xmlr.getLocalName().equals("qstn")) {
-                    processQstn(xmlr, newVM);
-                } else if (xmlr.getLocalName().equals("catgry")) {
+                }  else if (xmlr.getLocalName().equals("catgry")) {
                     processCatgry(xmlr, newVM);
                 }
 
@@ -229,6 +229,10 @@ private CategoryMetadata processCatStat(XMLStreamReader xmlr, VariableCategory c
                         String _freq = parseText(xmlr);
                         if (_freq != null && !_freq.isEmpty()) {
                             cat.setFrequency(new Double(_freq));
+                        } else {
+                            //If frequency is declared it cannot be missing
+                            // throw exception
+                            throw new NullPointerException("Frequency is declared but missing");
                         }
         } else if (wgtd != null && type != null && CAT_STAT_TYPE_FREQUENCY.equalsIgnoreCase(type) &&
                             CAT_STAT_WGTD_FREQUENCY.equalsIgnoreCase(wgtd)) {
@@ -236,6 +240,10 @@ private CategoryMetadata processCatStat(XMLStreamReader xmlr, VariableCategory c
                         String wfreq = parseText(xmlr);
                         if (wfreq != null && !wfreq.isEmpty()) {
                             cm.setWfreq(new Double(wfreq));
+                        } else {
+                            //if weighted frequency is declared it cannot be empty
+                            //through exception
+                            throw new NullPointerException("Weighted Frequency is declared but missing");
                         }
         }
         return cm;
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataUtil.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataUtil.java
index afdea41a55d..136bd1b7bae 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataUtil.java
@@ -1,7 +1,37 @@
 package edu.harvard.iq.dataverse.datavariable;
 
+import edu.harvard.iq.dataverse.FileMetadata;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
 public class VariableMetadataUtil {
 
+    public static boolean compareVariableMetadata(FileMetadata fmdo, FileMetadata fmdn) {
+        Collection<VariableMetadata> vmlo = fmdo.getVariableMetadatas();
+        Collection<VariableMetadata> vmln = fmdn.getVariableMetadatas();
+    
+        if (vmlo.size() != vmln.size()) {
+            return false;
+        }
+    
+        Map<Long, VariableMetadata> vmnMap = new HashMap<>();
+        for (VariableMetadata vmn : vmln) {
+            vmnMap.put(vmn.getDataVariable().getId(), vmn);
+        }
+    
+        for (VariableMetadata vmo : vmlo) {
+            Long id = vmo.getDataVariable().getId();
+            VariableMetadata vmn = vmnMap.get(id);
+            if (vmn == null || !compareVarMetadata(vmo, vmn)) {
+                return false;
+            }
+        }
+    
+        return true;
+    }
+
     public static boolean  compareVarMetadata(VariableMetadata vmOld, VariableMetadata vmNew) {
         boolean thesame = true;
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableRange.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableRange.java
index 17098e6af54..eb04eac846b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableRange.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableRange.java
@@ -7,14 +7,14 @@
 package edu.harvard.iq.dataverse.datavariable;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableRangeItem.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableRangeItem.java
index 81db4225515..d5f99f7e016 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableRangeItem.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableRangeItem.java
@@ -8,14 +8,14 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 
 /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableServiceBean.java
index 8287d1c7041..9fb4a3fd34c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datavariable/VariableServiceBean.java
@@ -7,12 +7,12 @@
 package edu.harvard.iq.dataverse.datavariable;
 
 import java.util.List;
-import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
@@ -105,7 +105,7 @@ public VariableFormatType findVariableFormatTypeByName(String name) {
         VariableFormatType type = null;
         try {
             type = (VariableFormatType)query.getSingleResult();
-        } catch (javax.persistence.NoResultException e) {
+        } catch (jakarta.persistence.NoResultException e) {
             // DO nothing, just return null.
         }
         return type;
@@ -116,7 +116,7 @@ public VariableIntervalType findVariableIntervalTypeByName(String name) {
         VariableIntervalType type = null;
         try {
             type=(VariableIntervalType)em.createQuery(query).getSingleResult();
-        } catch (javax.persistence.NoResultException e) {
+        } catch (jakarta.persistence.NoResultException e) {
             // DO nothing, just return null.
         }
         return type;
@@ -127,7 +127,7 @@ public SummaryStatisticType findSummaryStatisticTypeByName(String name) {
         SummaryStatisticType type = null;
         try {
             type = (SummaryStatisticType) em.createQuery(query).getSingleResult();
-        } catch (javax.persistence.NoResultException e) {
+        } catch (jakarta.persistence.NoResultException e) {
             // DO nothing, just return null.
         }
         return type;
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataverse/DataverseUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataverse/DataverseUtil.java
index 6fed8b2430b..f45a9058e7c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataverse/DataverseUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataverse/DataverseUtil.java
@@ -1,10 +1,30 @@
 package edu.harvard.iq.dataverse.dataverse;
 
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObjectContainer;
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.json.JsonLDTerm;
+
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import jakarta.ws.rs.BadRequestException;
+
+import opennlp.tools.util.StringUtil;
+import org.apache.commons.io.FileUtils;
 
 public class DataverseUtil {
 
+    private static final Logger logger = Logger.getLogger(DataverseUtil.class.getCanonicalName());
+
     public static String getSuggestedDataverseNameOnCreate(User user) {
         if (user == null) {
             return null;
@@ -13,4 +33,93 @@ public static String getSuggestedDataverseNameOnCreate(User user) {
         return user.getDisplayInfo().getTitle() + " " + BundleUtil.getStringFromBundle("dataverse");
     }
 
+    public static boolean validateDataverseMetadataExternally(Dataverse dv, String executable,
+            DataverseRequest request) {
+        String jsonMetadata;
+
+        String sourceAddressLabel = "0.0.0.0";
+        String userIdentifier = "guest";
+        String parentAlias = dv.getOwner() == null ? "" : dv.getOwner().getAlias();
+
+        if (request != null) {
+            IpAddress sourceAddress = request.getSourceAddress();
+            if (sourceAddress != null) {
+                sourceAddressLabel = sourceAddress.toString();
+            }
+            AuthenticatedUser user = request.getAuthenticatedUser();
+            
+            if (user != null) {
+                userIdentifier = user.getUserIdentifier();
+            }
+        }
+        
+        // We are sending the collection metadata encoded in our standard json 
+        // format, with a couple of extra elements added, such as the id of 
+        // the user sending the request and the alias of the parent collection, 
+        // in order to make it easier for the filter to manage whitelisting. 
+        
+        try {
+            jsonMetadata = json(dv)
+                    .add("sourceAddress", sourceAddressLabel)
+                    .add("userIdentifier", userIdentifier)
+                    .add("parentAlias", parentAlias)
+                    .build().toString();
+        } catch (Exception ex) {
+            logger.warning(
+                    "Failed to export dataverse metadata as json; " + ex.getMessage() == null ? "" : ex.getMessage());
+            return false;
+        }
+
+        if (StringUtil.isEmpty(jsonMetadata)) {
+            logger.warning("Failed to export dataverse metadata as json.");
+            return false;
+        }
+
+        // save the metadata in a temp file:
+
+        try {
+            File tempFile = File.createTempFile("dataverseMetadataCheck", ".tmp");
+            FileUtils.writeStringToFile(tempFile, jsonMetadata);
+
+            // run the external executable:
+            String[] params = { executable, tempFile.getAbsolutePath() };
+            Process p = Runtime.getRuntime().exec(params);
+            p.waitFor();
+
+            return p.exitValue() == 0;
+
+        } catch (IOException | InterruptedException ex) {
+            logger.warning("Failed run the external executable.");
+            return false;
+        }
+
+    }
+
+    public static void checkMetadataLangauge(Dataset ds, Dataverse owner, Map<String, String> mLangMap) {
+        // Verify metadatalanguage is allowed
+        logger.fine("Dataset mdl: " + ds.getMetadataLanguage());
+        logger.fine("Owner mdl: " + owner.getMetadataLanguage());
+        logger.fine("Map langs: " + mLangMap.toString());
+
+        // :MetadataLanguage setting is not set
+        // Must send UNDEFINED or match parent
+        if (mLangMap.isEmpty()) {
+            if (!(ds.getMetadataLanguage().equals(DvObjectContainer.UNDEFINED_CODE)
+                    || ds.getMetadataLanguage().equals(owner.getMetadataLanguage()))) {
+                throw new BadRequestException("This repository is not configured to support metadataLanguage.");
+            }
+        } else {
+            // When :MetadataLanguage is set, the specificed language must either match the
+            // parent collection choice, or, if that is undefined, be one of the choices
+            // allowed by the setting
+            if (!((ds.getMetadataLanguage().equals(owner.getMetadataLanguage())
+                    && !owner.getMetadataLanguage().equals(DvObjectContainer.UNDEFINED_CODE))
+                    || (owner.getMetadataLanguage().equals(DvObjectContainer.UNDEFINED_CODE)
+                            && (mLangMap.containsKey(ds.getMetadataLanguage()))))) {
+                throw new BadRequestException("Specified metadatalanguage ( metadataLanguage, "
+                        + JsonLDTerm.schemaOrg("inLanguage").getUrl() + ") not allowed in this collection.");
+            }
+        }
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataverse/featured/DataverseFeaturedItem.java b/src/main/java/edu/harvard/iq/dataverse/dataverse/featured/DataverseFeaturedItem.java
new file mode 100644
index 00000000000..563db096c62
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dataverse/featured/DataverseFeaturedItem.java
@@ -0,0 +1,165 @@
+package edu.harvard.iq.dataverse.dataverse.featured;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+import org.apache.commons.text.CaseUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@NamedQueries({
+        @NamedQuery(name = "DataverseFeaturedItem.deleteById",
+                query = "DELETE FROM DataverseFeaturedItem item WHERE item.id=:id"),
+        @NamedQuery(name = "DataverseFeaturedItem.findByDataverseOrderedByDisplayOrder",
+                query = "SELECT item FROM DataverseFeaturedItem item WHERE item.dataverse = :dataverse ORDER BY item.displayOrder ASC"),
+        @NamedQuery(name = "DataverseFeaturedItem.deleteByDvObjectId",
+                query = "DELETE FROM DataverseFeaturedItem item WHERE item.dvobject IS NOT NULL AND item.dvobject.id = :id")
+})
+@Entity
+@Table(indexes = @Index(columnList = "displayOrder"))
+public class DataverseFeaturedItem {
+
+    public static final List<String> VALID_TYPES = List.of("custom","dataverse","dataset","datafile");
+    public enum TYPES {
+        CUSTOM, DATAVERSE, DATASET, DATAFILE
+    }
+    public static final int MAX_FEATURED_ITEM_CONTENT_SIZE = 15000;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(nullable = false)
+    private Dataverse dataverse;
+
+    @ManyToOne
+    @JoinColumn(nullable = true)
+    private DvObject dvobject;
+
+    @Size(max = MAX_FEATURED_ITEM_CONTENT_SIZE)
+    @Lob
+    @Column(columnDefinition = "TEXT", nullable = true)
+    private String content;
+
+    @Min(0)
+    @Column(nullable = false)
+    private int displayOrder;
+
+    @NotBlank
+    @Column(columnDefinition = "TEXT", nullable = false)
+    private String type;
+
+    private String imageFileName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Dataverse getDataverse() {
+        return dataverse;
+    }
+
+    public void setDataverse(Dataverse dataverse) {
+        this.dataverse = dataverse;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getDisplayOrder() {
+        return displayOrder;
+    }
+
+    public void setDisplayOrder(int displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+
+    public String getImageFileName() {
+        return imageFileName;
+    }
+
+    public void setImageFileName(String imageFileName) {
+        this.imageFileName = imageFileName;
+    }
+
+    public String getImageFileUrl() {
+        if (id != null && imageFileName != null) {
+            return SystemConfig.getDataverseSiteUrlStatic() + "/api/access/dataverseFeaturedItemImage/" + id;
+        }
+        return null;
+    }
+
+    public String getType() {
+        return type;
+    }
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public DvObject getDvObject() {
+        return dvobject;
+    }
+
+    public void setDvObject(DvObject dvObject) {
+        this.dvobject = dvObject;
+    }
+
+    public void setDvObject(String type, DvObject dvObject) throws IllegalArgumentException {
+        DataverseFeaturedItem.TYPES dvType = getDvType(type);
+        validateTypeAndDvObject(dvObject != null ? dvObject.getIdentifier() : null, dvObject, dvType);
+        this.type = dvType.name().toLowerCase();
+        this.dvobject = dvObject;
+    }
+    public static DataverseFeaturedItem.TYPES getDvType(String type) throws IllegalArgumentException {
+        try {
+            return StringUtil.isEmpty(type) ? DataverseFeaturedItem.TYPES.CUSTOM : DataverseFeaturedItem.TYPES.valueOf(type.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            String validTypes = Arrays.stream(DataverseFeaturedItem.TYPES.values()).map(t -> t.name()).collect(Collectors.joining(", "));
+            throw new IllegalArgumentException(BundleUtil.getStringFromBundle("dataverse.update.featuredItems.error.invalidType", List.of(validTypes)));
+        }
+    }
+    public static void validateTypeAndDvObject(String dvIdtf, DvObject dvObject, DataverseFeaturedItem.TYPES dvType) throws IllegalArgumentException {
+        if (dvObject != null) {
+            if ((dvObject instanceof Dataverse && dvType != DataverseFeaturedItem.TYPES.DATAVERSE) ||
+                    (dvObject instanceof Dataset && dvType != DataverseFeaturedItem.TYPES.DATASET) ||
+                    (dvObject instanceof DataFile && dvType != DataverseFeaturedItem.TYPES.DATAFILE)) {
+                throw new IllegalArgumentException(BundleUtil.getStringFromBundle("dataverse.update.featuredItems.error.typeAndDvObjectMismatch"));
+            }
+            if (dvObject instanceof DataFile) {
+                DataFile df = (DataFile)dvObject;
+                if (df.isRestricted()) {
+                    throw new IllegalArgumentException(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.restricted"));
+                }
+                if (!df.isReleased()) {
+                    throw new IllegalArgumentException(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notPublished", List.of("Dataset")));
+                }
+            } else if (!dvObject.isReleased()) {
+                throw new IllegalArgumentException(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notPublished", List.of(CaseUtils.toCamelCase(dvType.name(), true))));
+            }
+        } else {
+            if (dvType != DataverseFeaturedItem.TYPES.CUSTOM) {
+                throw new IllegalArgumentException(BundleUtil.getStringFromBundle("find.dvo.error.dvObjectNotFound", List.of(dvIdtf == null ? "unknown" : dvIdtf)));
+            }
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataverse/featured/DataverseFeaturedItemServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/dataverse/featured/DataverseFeaturedItemServiceBean.java
new file mode 100644
index 00000000000..2598260aa80
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/dataverse/featured/DataverseFeaturedItemServiceBean.java
@@ -0,0 +1,136 @@
+package edu.harvard.iq.dataverse.dataverse.featured;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+@Stateless
+@Named
+public class DataverseFeaturedItemServiceBean implements Serializable {
+    private static final Logger logger = Logger.getLogger(DataverseFeaturedItemServiceBean.class.getCanonicalName());
+
+    public static class InvalidImageFileException extends Exception {
+        public InvalidImageFileException(String message) {
+            super(message);
+        }
+    }
+
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    private EntityManager em;
+    @EJB
+    protected DataFileServiceBean fileService;
+    @EJB
+    protected DatasetServiceBean datasetService;
+    @EJB
+    protected PermissionServiceBean permissionService;
+
+    public DataverseFeaturedItem findById(Long id) {
+        return em.find(DataverseFeaturedItem.class, id);
+    }
+
+    public DataverseFeaturedItem save(DataverseFeaturedItem dataverseFeaturedItem) {
+        if (dataverseFeaturedItem.getId() == null) {
+            em.persist(dataverseFeaturedItem);
+            em.flush();
+        } else {
+            dataverseFeaturedItem = em.merge(dataverseFeaturedItem);
+        }
+        return dataverseFeaturedItem;
+    }
+
+    public void delete(Long id) {
+        em.createNamedQuery("DataverseFeaturedItem.deleteById", DataverseFeaturedItem.class)
+                .setParameter("id", id)
+                .executeUpdate();
+    }
+
+    public void deleteAllByDvObjectId(Long id) {
+        em.createNamedQuery("DataverseFeaturedItem.deleteByDvObjectId", DataverseFeaturedItem.class)
+                .setParameter("id", id)
+                .executeUpdate();
+    }
+
+    public void deleteInvalidatedFeaturedItemsByDataset(Dataset dataset) {
+        // Delete any Featured Items that contain Datafiles that were removed or restricted in the latest published version
+        List<DataverseFeaturedItem> featuredItems = findAllByDataverseOrdered(dataset.getOwner());
+        for (DataverseFeaturedItem featuredItem : featuredItems) {
+            if (featuredItem.getDvObject() != null && featuredItem.getType().equalsIgnoreCase(DataverseFeaturedItem.TYPES.DATAFILE.name())) {
+                DataFile df = (DataFile) featuredItem.getDvObject();
+                List<Long> latestVersionFileIds = new ArrayList<>();
+                dataset.getLatestVersion().getFileMetadatas().stream()
+                        .map(FileMetadata::getId)
+                        .forEachOrdered(latestVersionFileIds::add);
+                // If the datafile is restricted or part of this dataset but not in the latest version we need to delete the featured item
+                if (df.isRestricted() || (dataset.getFiles().contains(df) && !latestVersionFileIds.contains(df.getId()))) {
+                    logger.fine("Deleting invalidated Featured Item for " + (df.isRestricted() ? "Restricted" : "Deleted") + "Datafile ID: " + df.getId());
+                    deleteAllByDvObjectId(df.getId());
+                }
+            }
+        }
+    }
+
+    public List<DataverseFeaturedItem> findAllByDataverseOrdered(Dataverse dataverse) {
+        List<DataverseFeaturedItem> items = em
+                .createNamedQuery("DataverseFeaturedItem.findByDataverseOrderedByDisplayOrder", DataverseFeaturedItem.class)
+                .setParameter("dataverse", dataverse)
+                .getResultList();
+        return items;
+    }
+
+    public InputStream getImageFileAsInputStream(DataverseFeaturedItem dataverseFeaturedItem) throws IOException {
+        Path imagePath = Path.of(JvmSettings.DOCROOT_DIRECTORY.lookup(),
+                JvmSettings.FEATURED_ITEMS_IMAGE_UPLOADS_DIRECTORY.lookup(),
+                dataverseFeaturedItem.getDataverse().getId().toString(),
+                dataverseFeaturedItem.getImageFileName());
+        return Files.newInputStream(imagePath);
+    }
+
+    public void saveDataverseFeaturedItemImageFile(InputStream inputStream, String imageFileName, Long dataverseId) throws IOException, InvalidImageFileException {
+        File tempFile = FileUtil.inputStreamToFile(inputStream);
+        validateImageFile(tempFile);
+
+        Path imageDir = FileUtil.createDirStructure(
+                JvmSettings.DOCROOT_DIRECTORY.lookup(),
+                JvmSettings.FEATURED_ITEMS_IMAGE_UPLOADS_DIRECTORY.lookup(),
+                dataverseId.toString()
+        );
+        File uploadedFile = new File(imageDir.toFile(), imageFileName);
+
+        if (!uploadedFile.exists()) {
+            uploadedFile.createNewFile();
+        }
+
+        Files.copy(tempFile.toPath(), uploadedFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+    }
+
+    private void validateImageFile(File file) throws IOException, InvalidImageFileException {
+        if (!FileUtil.isFileOfImageType(file)) {
+            throw new InvalidImageFileException(
+                    BundleUtil.getStringFromBundle("dataverse.create.featuredItem.error.invalidFileType")
+            );
+        }
+        Integer maxAllowedSize = JvmSettings.FEATURED_ITEMS_IMAGE_MAXSIZE.lookup(Integer.class);
+        if (file.length() > maxAllowedSize) {
+            throw new InvalidImageFileException(
+                    BundleUtil.getStringFromBundle("dataverse.create.featuredItem.error.fileSizeExceedsLimit", List.of(maxAllowedSize.toString()))
+            );
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java
index cf0d6e781b0..1945d44cd78 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java
@@ -1,49 +1,33 @@
 package edu.harvard.iq.dataverse.engine.command;
 
-import edu.harvard.iq.dataverse.DOIDataCiteServiceBean;
-import edu.harvard.iq.dataverse.DOIEZIdServiceBean;
-import edu.harvard.iq.dataverse.HandlenetServiceBean;
-import edu.harvard.iq.dataverse.DataFileServiceBean;
-import edu.harvard.iq.dataverse.DatasetLinkingServiceBean;
-import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
-import edu.harvard.iq.dataverse.DataverseFacetServiceBean;
-import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevelServiceBean;
-import edu.harvard.iq.dataverse.DataverseLinkingServiceBean;
-import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.dataset.DatasetFieldsValidator;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
-import edu.harvard.iq.dataverse.DvObjectServiceBean;
-import edu.harvard.iq.dataverse.FeaturedDataverseServiceBean;
-import edu.harvard.iq.dataverse.FileDownloadServiceBean;
-import edu.harvard.iq.dataverse.GuestbookResponseServiceBean;
-import edu.harvard.iq.dataverse.GuestbookServiceBean;
-import edu.harvard.iq.dataverse.MapLayerMetadataServiceBean;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
-import edu.harvard.iq.dataverse.PermissionServiceBean;
-import edu.harvard.iq.dataverse.RoleAssigneeServiceBean;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
-import edu.harvard.iq.dataverse.TemplateServiceBean;
-import edu.harvard.iq.dataverse.UserNotificationServiceBean;
+import edu.harvard.iq.dataverse.search.SearchService;
+import edu.harvard.iq.dataverse.search.SearchServiceFactory;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
 import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleServiceBean;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
 import edu.harvard.iq.dataverse.engine.DataverseEngine;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
-import edu.harvard.iq.dataverse.pidproviders.FakePidProviderServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
 import edu.harvard.iq.dataverse.search.IndexBatchServiceBean;
 import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearchServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.storageuse.StorageUseServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.workflow.WorkflowServiceBean;
-import java.util.List;
 import java.util.Stack;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * An interface for accessing Dataverse's resources, user info etc. Used by the
@@ -80,7 +64,7 @@ public interface CommandContext {
 
     public SolrIndexServiceBean solrIndex();
 
-    public SearchServiceBean search();
+    public SearchServiceFactory search();
     
     public IngestServiceBean ingest();
 
@@ -100,13 +84,7 @@ public interface CommandContext {
 
     public DataverseFieldTypeInputLevelServiceBean fieldTypeInputLevels();
 
-    public DOIEZIdServiceBean doiEZId();
-
-    public DOIDataCiteServiceBean doiDataCite();
-
-    public FakePidProviderServiceBean fakePidProvider();
-
-    public HandlenetServiceBean handleNet();
+    public PidProviderFactoryBean pidProviderFactory();
 
     public GuestbookServiceBean guestbooks();
 
@@ -125,6 +103,8 @@ public interface CommandContext {
     public UserNotificationServiceBean notifications();
 
     public AuthenticationServiceBean authentication();
+    
+    public StorageUseServiceBean storageUse();
 
     public SystemConfig systemConfig();
 
@@ -134,8 +114,6 @@ public interface CommandContext {
     
     public WorkflowServiceBean workflows();
 
-    public MapLayerMetadataServiceBean mapLayerMetadata();
-
     public DataCaptureModuleServiceBean dataCaptureModule();
     
     public FileDownloadServiceBean fileDownload();
@@ -143,7 +121,11 @@ public interface CommandContext {
     public ConfirmEmailServiceBean confirmEmail();
     
     public ActionLogServiceBean actionLog();
-    
+
+    public MetadataBlockServiceBean metadataBlocks();
+
+    public DatasetTypeServiceBean datasetTypes();
+
     public void beginCommandSequence();
     
     public boolean completeCommandSequence(Command command);
@@ -153,4 +135,12 @@ public interface CommandContext {
     public Stack<Command> getCommandsCalled();
     
     public void addCommand(Command command);
+
+    public DatasetFieldServiceBean dsField();
+
+    public DataverseFeaturedItemServiceBean dataverseFeaturedItems();
+
+    public DatasetFieldsValidator datasetFieldsValidator();
+
+    public LicenseServiceBean licenses();
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/DataverseRequest.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/DataverseRequest.java
index e1d5a34d5f5..4d3ec2842a1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/DataverseRequest.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/DataverseRequest.java
@@ -1,9 +1,16 @@
 package edu.harvard.iq.dataverse.engine.command;
 
+import edu.harvard.iq.dataverse.api.AbstractApiBean;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * 
@@ -13,29 +20,142 @@
  * @author michael
  */
 public class DataverseRequest {
-    
+
     private final User user;
     private final IpAddress sourceAddress;
+    private final String invocationId;
+    private final HttpServletRequest httpServletRequest;
+    
+    private static final String undefined = "0.0.0.0";
+    
+    private static final String MDKEY_PREFIX="mdkey.";
+    
+    private static final Logger logger = Logger.getLogger(DataverseRequest.class.getName());
+    
+    private static String headerToUse = null;
+    
+    private static final HashSet<String> ALLOWED_HEADERS = new HashSet<String>(Arrays.asList( 
+            "x-forwarded-for",
+            "proxy-client-ip",
+            "wl-proxy-client-ip",
+            "http_x_forwarded_for",
+            "http_x_forwarded",
+            "http_x_cluster_client_ip",
+            "http_client_ip",
+            "http_forwarded_for",
+            "http_forwarded",
+            "http_via",
+            "remote_addr" ));
+     
+    static {
+        String header = System.getProperty("dataverse.useripaddresssourceheader");
+        // Security check - make sure any supplied header is one that is used to forward
+        // IP addresses (case insensitive)
+        if((header!=null) && (ALLOWED_HEADERS.contains(header.toLowerCase()))) {
+            headerToUse=header;
+        }
+    }
     
     public DataverseRequest(User aUser, HttpServletRequest aHttpServletRequest) {
         this.user = aUser;
-
-        final String undefined = "0.0.0.0";
-        String saneDefault = undefined;
-        String remoteAddressStr = saneDefault;
+        httpServletRequest = aHttpServletRequest;
+        
+        IpAddress address = null;
 
         if (aHttpServletRequest != null) {
-            String remoteAddressFromRequest = aHttpServletRequest.getRemoteAddr();
-            if (remoteAddressFromRequest != null) {
-                remoteAddressStr = remoteAddressFromRequest;
+           
+            if (headerToUse != null) {
+                /*
+                 * The optional case of using a header to determine the IP address is discussed
+                 * at length in https://github.com/IQSS/dataverse/pull/6973 and the related
+                 * issue.
+                 * 
+                 * The code here is intended to support the use case of a single proxy (load
+                 * balancer, etc.) as well as providing partial support for the case where two
+                 * proxies exist (e.g. a campus proxy and an AWS load balancer). In this case,
+                 * the IP address returned should be that of the proxy nearer the user which
+                 * would be the correct address to use for making IPGroup access control
+                 * determinations. This does limit the accuracy of any Make Data Count
+                 * geolocation determined since it is the proxy's IP that would be geolocated.
+                 * For a campus proxy, this may be acceptable. This code should be safe in that
+                 * it won't pick up a spoofed address in any case, but beyond the two proxy
+                 * case, it is unlikely to provide useful results (why would you want the IP of
+                 * an intermediate proxy?).
+                 */
+                // One can have multiple instances of a given header. They SHOULD be in order.
+                Enumeration<String> ipEnumeration = aHttpServletRequest.getHeaders(headerToUse);
+                if (ipEnumeration.hasMoreElements()) {
+                    // Always get the last header, which SHOULD be from the proxy closest to
+                    // Dataverse
+                    String ip = ipEnumeration.nextElement();
+                    while (ipEnumeration.hasMoreElements()) {
+                        ip = ipEnumeration.nextElement();
+                    }
+                    // Always get the last value if more than one in the string, which should be the
+                    // IP address closest to the reporting proxy
+                    int index = ip.lastIndexOf(',');
+                    if (index >= 0) {
+                        ip = ip.substring(index + 1);
+                    }
+                    ip=ip.trim();
+                    /*
+                     * We should have a valid, single IP address string here. The IpAddress.valueOf
+                     * call will throw an exception if it can't be parsed into a valid address (e.g.
+                     * 4 '.' separated short ints for v4), so we just check for null here
+                     */
+                    if (ip != null) {
+                        // This conversion will throw an IllegalArgumentException if it can't be parsed.
+                        try {
+                            address = IpAddress.valueOf(ip);
+                        } catch (IllegalArgumentException iae) {
+                            logger.warning("Ignoring invalid IP address received in header " + headerToUse + " : " + ip);
+                            address = null;
+                        }
+                        if (address!= null && address.isLocalhost()) {
+                            // Not allowed since it is hard to image why a localhost request would be
+                            // proxied and we want to protect
+                            // the internal admin apis that can be restricted to localhost access
+                            logger.warning("Ignoring localhost received as IP address in header " + headerToUse + " : " + ip);
+                            address = null;
+                        }
+                    }
+                }
             }
+            /*
+             * If there was no header/no usable value from the header, use the
+             * remoteAddress.
+             * 
+             */
+            if (address == null) {
+                // use the request remote address
+                String remoteAddressFromRequest = aHttpServletRequest.getRemoteAddr();
+                if (remoteAddressFromRequest != null) {
+                    String remoteAddressStr = remoteAddressFromRequest;
+                    try {
+                        address = IpAddress.valueOf(remoteAddressStr);
+                    } catch (IllegalArgumentException iae) {
+                        address = IpAddress.valueOf(undefined);
+                    }
+                }
+            }
+            
+            String headerParamWFKey = aHttpServletRequest.getHeader(AbstractApiBean.DATAVERSE_WORKFLOW_INVOCATION_HEADER_NAME);
+            String queryParamWFKey = aHttpServletRequest.getParameter("invocationId");
+                    
+            invocationId = headerParamWFKey!=null ? headerParamWFKey : queryParamWFKey;
+
+        } else {
+            invocationId=null;
         }
-        sourceAddress = IpAddress.valueOf( remoteAddressStr );
+        
+        sourceAddress = address;
     }
 
     public DataverseRequest( User aUser, IpAddress aSourceAddress ) {
         user = aUser;
         sourceAddress = aSourceAddress;
+        invocationId=null;
+        httpServletRequest=null;
     }
     
     public User getUser() {
@@ -67,5 +187,26 @@ public AuthenticatedUser getAuthenticatedUser(){
         }
         return null;
     }
+
+    public String getWFInvocationId() {
+        return invocationId;
+    }
+    
+    public HttpServletRequest getHttpServletRequest() {
+        return httpServletRequest;
+    }
+    
+    public String getSystemMetadataBlockKeyFor(String blockName) {
+        String key = null;
+        if (httpServletRequest != null) {
+            key = httpServletRequest.getHeader(MDKEY_PREFIX + blockName);
+            logger.log(Level.FINE, ((key==null)? "Didn't find": "Found") + "system metadata block key for " + blockName + " in header");
+            if (key == null) {
+                key = httpServletRequest.getParameter(MDKEY_PREFIX + blockName);
+                logger.log(Level.FINE, ((key==null)? "Didn't find": "Found") + "system metadata block key for " + blockName + " in query parameter");
+            }
+        }
+        return key;
+    }
     
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/InvalidCommandArgumentsException.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/InvalidCommandArgumentsException.java
new file mode 100644
index 00000000000..95c6f52b880
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/InvalidCommandArgumentsException.java
@@ -0,0 +1,25 @@
+package edu.harvard.iq.dataverse.engine.command.exception;
+
+import edu.harvard.iq.dataverse.engine.command.Command;
+
+/**
+ * Exception thrown when a {@link Command} is executed with invalid or malformed arguments.
+ * <p>
+ * This exception typically indicates that the input parameters provided to the command
+ * do not meet the required criteria (e.g., missing fields, invalid formats, or other
+ * constraints).
+ * </p>
+ * <p>
+ * Example scenarios:
+ * <ul>
+ *   <li>A required argument is null or missing.</li>
+ *   <li>An argument is in an invalid format (e.g., a malformed email address).</li>
+ *   <li>Arguments violate business rules or constraints.</li>
+ * </ul>
+ */
+public class InvalidCommandArgumentsException extends CommandException {
+
+    public InvalidCommandArgumentsException(String message, Command aCommand) {
+        super(message, aCommand);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/InvalidFieldsCommandException.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/InvalidFieldsCommandException.java
new file mode 100644
index 00000000000..9bd1869f8a9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/InvalidFieldsCommandException.java
@@ -0,0 +1,42 @@
+package edu.harvard.iq.dataverse.engine.command.exception;
+
+import edu.harvard.iq.dataverse.engine.command.Command;
+import java.util.Map;
+
+public class InvalidFieldsCommandException extends CommandException {
+
+    private final Map<String, String> fieldErrors;
+
+    /**
+     * Constructs a new InvalidFieldsCommandException with the specified detail message,
+     * command, and a map of field errors.
+     *
+     * @param message The detail message.
+     * @param aCommand The command where the exception was encountered.
+     * @param fieldErrors A map containing the fields as keys and the reasons for their errors as values.
+     */
+    public InvalidFieldsCommandException(String message, Command aCommand, Map<String, String> fieldErrors) {
+        super(message, aCommand);
+        this.fieldErrors = fieldErrors;
+    }
+
+    /**
+     * Gets the map of fields and their corresponding error messages.
+     *
+     * @return The map of field errors.
+     */
+    public Map<String, String> getFieldErrors() {
+        return fieldErrors;
+    }
+
+    /**
+     * Returns a string representation of this exception, including the
+     * message and details of the invalid fields and their errors.
+     *
+     * @return A string representation of this exception.
+     */
+    @Override
+    public String toString() {
+        return super.toString() + ", fieldErrors=" + fieldErrors;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/PermissionException.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/PermissionException.java
index a7881fc7b6e..2ca63c9c4aa 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/PermissionException.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/PermissionException.java
@@ -3,6 +3,7 @@
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.engine.command.Command;
+
 import java.util.Set;
 
 /**
@@ -12,22 +13,31 @@
  * @author michael
  */
 public class PermissionException extends CommandException {
-	
-	private final Set<Permission> required;
-	private final DvObject dvObject;
-	
-	public PermissionException(String message, Command failedCommand, Set<Permission> required, DvObject aDvObject ) {
-		super(message, failedCommand);
-		this.required = required;
-		dvObject = aDvObject;
-	}
-
-	public Set<Permission> getRequiredPermissions() {
-		return required;
-	}
-
-	public DvObject getDvObject() {
-		return dvObject;
-	}
-	
+
+    private final Set<Permission> required;
+    private final DvObject dvObject;
+    private final boolean isDetailedMessageRequired;
+
+    public PermissionException(String message, Command failedCommand, Set<Permission> required, DvObject dvObject, boolean isDetailedMessageRequired) {
+        super(message, failedCommand);
+        this.required = required;
+        this.dvObject = dvObject;
+        this.isDetailedMessageRequired = isDetailedMessageRequired;
+    }
+
+    public PermissionException(String message, Command failedCommand, Set<Permission> required, DvObject dvObject) {
+        this(message, failedCommand, required, dvObject, false);
+    }
+
+    public Set<Permission> getRequiredPermissions() {
+        return required;
+    }
+
+    public DvObject getDvObject() {
+        return dvObject;
+    }
+
+    public boolean isDetailedMessageRequired() {
+        return isDetailedMessageRequired;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/RateLimitCommandException.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/RateLimitCommandException.java
new file mode 100644
index 00000000000..99a665b31ac
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/exception/RateLimitCommandException.java
@@ -0,0 +1,16 @@
+package edu.harvard.iq.dataverse.engine.command.exception;
+
+import edu.harvard.iq.dataverse.engine.command.Command;
+
+/**
+ * An exception raised when a command cannot be executed, due to the
+ * issuing user being rate limited.
+ *
+ * @author
+ */
+public class RateLimitCommandException extends CommandException {
+
+    public RateLimitCommandException(String message, Command aCommand) {
+        super(message, aCommand);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java
index eb21f70f2cb..b36a638956f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java
@@ -1,22 +1,20 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
-import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleUtil;
-import edu.harvard.iq.dataverse.datacapturemodule.ScriptRequestResponse;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandExecutionException;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
 import static edu.harvard.iq.dataverse.util.StringUtil.isEmpty;
 import java.io.IOException;
 import java.util.Objects;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.solr.client.solrj.SolrServerException;
 
@@ -30,15 +28,23 @@ public abstract class AbstractCreateDatasetCommand extends AbstractDatasetComman
     
     private static final Logger logger = Logger.getLogger(AbstractCreateDatasetCommand.class.getCanonicalName());
     
-    final protected boolean registrationRequired;
+    final protected boolean harvested;
+    final protected boolean validate;
     
     public AbstractCreateDatasetCommand(Dataset theDataset, DataverseRequest aRequest) {
         this(theDataset, aRequest, false);
     }
 
-    public AbstractCreateDatasetCommand(Dataset theDataset, DataverseRequest aRequest, boolean isRegistrationRequired) {
+    public AbstractCreateDatasetCommand(Dataset theDataset, DataverseRequest aRequest, boolean isHarvested) {
         super(aRequest, theDataset);
-        registrationRequired = isRegistrationRequired;
+        harvested=isHarvested;
+        this.validate = true;
+    }
+
+    public AbstractCreateDatasetCommand(Dataset theDataset, DataverseRequest aRequest, boolean isHarvested, boolean validate) {
+        super(aRequest, theDataset);
+        harvested=isHarvested;
+        this.validate = validate;
     }
    
     protected void additionalParameterTests(CommandContext ctxt) throws CommandException {
@@ -60,6 +66,11 @@ protected void postPersist( Dataset theDataset, CommandContext ctxt ) throws Com
         // base class - default to nothing.
     }
     
+
+    protected void postDBFlush( Dataset theDataset, CommandContext ctxt ) throws CommandException {
+        // base class - default to nothing.
+    }
+    
     protected abstract void handlePid( Dataset theDataset, CommandContext ctxt ) throws CommandException ;
     
     @Override
@@ -68,15 +79,22 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
         additionalParameterTests(ctxt);
         
         Dataset theDataset = getDataset();
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(ctxt);
+        PidProvider pidProvider = ctxt.dvObjects().getEffectivePidGenerator(theDataset);
+        
         if ( isEmpty(theDataset.getIdentifier()) ) {
-            theDataset.setIdentifier(ctxt.datasets().generateDatasetIdentifier(theDataset, idServiceBean));
+            pidProvider.generatePid(theDataset);
         }
         
         DatasetVersion dsv = getVersionToPersist(theDataset);
         // This re-uses the state setup logic of CreateDatasetVersionCommand, but
         // without persisting the new version, or altering its files. 
-        new CreateDatasetVersionCommand(getRequest(), theDataset, dsv).prepareDatasetAndVersion();
+        new CreateDatasetVersionCommand(getRequest(), theDataset, dsv, validate).prepareDatasetAndVersion();
+        
+        if(!harvested) {
+            checkSystemMetadataKeyIfNeeded(dsv, null);
+        }
+
+        registerExternalVocabValuesIfAny(ctxt, dsv);
         
         theDataset.setCreator((AuthenticatedUser) getRequest().getUser());
         
@@ -88,35 +106,35 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
             dataFile.setCreateDate(theDataset.getCreateDate());
         }
         
-        String nonNullDefaultIfKeyNotFound = "";
         if (theDataset.getProtocol()==null) {
-            theDataset.setProtocol(ctxt.settings().getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound));
+            theDataset.setProtocol(pidProvider.getProtocol());
         }
         if (theDataset.getAuthority()==null) {
-            theDataset.setAuthority(ctxt.settings().getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound));
+            theDataset.setAuthority(pidProvider.getAuthority());
         }
         if (theDataset.getStorageIdentifier() == null) {
-            try {
-                DataAccess.createNewStorageIO(theDataset, "placeholder");
-            } catch (IOException ioex) {
-                // if setting the storage identifier through createNewStorageIO fails, dataset creation
-                // does not have to fail. we just set the storage id to a default -SF
-                String storageDriver = (System.getProperty("dataverse.files.storage-driver-id") != null) ? System.getProperty("dataverse.files.storage-driver-id") : "file";
-                theDataset.setStorageIdentifier(storageDriver  + "://" + theDataset.getGlobalId().asString());
-                logger.log(Level.INFO, "Failed to create StorageIO. StorageIdentifier set to default. Not fatal.({0})", ioex.getMessage());
-            }
+        	String driverId = theDataset.getEffectiveStorageDriverId();
+        	theDataset.setStorageIdentifier(driverId  + DataAccess.SEPARATOR + theDataset.getAuthorityForFileStorage() + "/" + theDataset.getIdentifierForFileStorage());
         }
         if (theDataset.getIdentifier()==null) {
-            theDataset.setIdentifier(ctxt.datasets().generateDatasetIdentifier(theDataset, idServiceBean));
+            pidProvider.generatePid(theDataset);
         }
         
-        // Attempt the registration if importing dataset through the API, or the app (but not harvest)
-        handlePid(theDataset, ctxt);
-                
-        if (registrationRequired && (theDataset.getGlobalIdCreateTime() == null)) {
-            throw new CommandExecutionException("Dataset could not be created.  Registration failed", this);
+        DatasetType defaultDatasetType = ctxt.datasetTypes().getByName(DatasetType.DEFAULT_DATASET_TYPE);
+        DatasetType existingDatasetType = theDataset.getDatasetType();
+        logger.fine("existing dataset type: " + existingDatasetType);
+        if (existingDatasetType != null) {
+            // A dataset type can be specified via API, for example.
+            theDataset.setDatasetType(existingDatasetType);
+        } else {
+            theDataset.setDatasetType(defaultDatasetType);
         }
         
+        // Attempt the registration if importing dataset through the API, or the app (but not harvest)
+        handlePid(theDataset, ctxt);
+
+
+
         ctxt.em().persist(theDataset);
         
         postPersist(theDataset, ctxt);
@@ -130,18 +148,21 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
         // Now we need the acutal dataset id, so we can start indexing.
         ctxt.em().flush();
         
-        // TODO: switch to asynchronous version when JPA sync works
-        // ctxt.index().asyncIndexDataset(theDataset.getId(), true); 
-        try{
-              ctxt.index().indexDataset(theDataset, true);
-        } catch (IOException | SolrServerException e) {
-            String failureLogText = "Post create dataset indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + theDataset.getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, theDataset);
+        //Use for code that requires database ids
+        postDBFlush(theDataset, ctxt);
+
+        if (harvested) {
+            try {
+                ctxt.index().indexDataset(theDataset, true);
+            } catch (SolrServerException | IOException solrEx) {
+                logger.warning("Failed to index harvested dataset. " + solrEx.getMessage());
+            }
+        } else {
+            // The asynchronous version does not throw any exceptions, 
+            // logging them internally instead. 
+            ctxt.index().asyncIndexDataset(theDataset, true);
         }
-         
-        ctxt.solrIndex().indexPermissionsOnSelfAndChildren(theDataset.getId());
-        
+               
         return theDataset;
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java
index 062b90bab27..15faaad5d52 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java
@@ -1,10 +1,16 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
+import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
 import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DatasetVersionDifference;
 import edu.harvard.iq.dataverse.DatasetVersionUser;
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
@@ -12,17 +18,22 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandExecutionException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.pidproviders.doi.fake.FakeDOIProvider;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.sql.Timestamp;
+import java.util.Arrays;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import static java.util.stream.Collectors.joining;
-import javax.validation.ConstraintViolation;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
-import edu.harvard.iq.dataverse.pidproviders.FakePidProviderServiceBean;
+
+import jakarta.ejb.EJB;
+import jakarta.validation.ConstraintViolation;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 
 /**
  *
@@ -101,6 +112,7 @@ protected void validateOrDie(DatasetVersion dsv, Boolean lenient) throws Command
             if (lenient) {
                 // populate invalid fields with N/A
                 constraintViolations.stream()
+                    .filter(cv -> cv.getRootBean() instanceof DatasetField)
                     .map(cv -> ((DatasetField) cv.getRootBean()))
                     .forEach(f -> f.setSingleValue(DatasetField.NA_VALUE));
 
@@ -109,33 +121,23 @@ protected void validateOrDie(DatasetVersion dsv, Boolean lenient) throws Command
                 String validationMessage = constraintViolations.stream()
                     .map(cv -> cv.getMessage() + " (Invalid value:" + cv.getInvalidValue() + ")")
                     .collect(joining(", ", "Validation Failed: ", "."));
+                
+                validationMessage  += constraintViolations.stream()
+                    .filter(cv -> cv.getRootBean() instanceof TermsOfUseAndAccess)
+                    .map(cv -> cv.toString());
+                
+                for (ConstraintViolation cv : constraintViolations){
+                    if (cv.getRootBean() instanceof TermsOfUseAndAccess){
+                        throw new IllegalCommandException(validationMessage,  this);
+                    }
+                }
 
                 throw new IllegalCommandException(validationMessage, this);
             }
         }
     }
 
-    /**
-     * Removed empty fields, sets field value display order.
-     *
-     * @param dsv the dataset version show fields we want to tidy up.
-     */
-    protected void tidyUpFields(DatasetVersion dsv) {
-        Iterator<DatasetField> dsfIt = dsv.getDatasetFields().iterator();
-        while (dsfIt.hasNext()) {
-            if (dsfIt.next().removeBlankDatasetFieldValues()) {
-                dsfIt.remove();
-            }
-        }
-        Iterator<DatasetField> dsfItSort = dsv.getDatasetFields().iterator();
-        while (dsfItSort.hasNext()) {
-            dsfItSort.next().setValueDisplayOrder();
-        }
-        Iterator<DatasetField> dsfItTrim = dsv.getDatasetFields().iterator();
-        while (dsfItTrim.hasNext()) {
-            dsfItTrim.next().trimTrailingSpaces();
-        }
-    }
+
 
     /**
      * Whether it's EZID or DataCite, if the registration is refused because the
@@ -151,47 +153,48 @@ protected void tidyUpFields(DatasetVersion dsv) {
      * large enough number of values will be legitimately registered by another
      * entity sharing the same authority...)
      *
-     * @param theDataset
+     * @param dvObject
      * @param ctxt
      * @throws CommandException
      */
-    protected void registerExternalIdentifier(Dataset theDataset, CommandContext ctxt) throws CommandException {
-        if (!theDataset.isIdentifierRegistered()) {
-            GlobalIdServiceBean globalIdServiceBean = GlobalIdServiceBean.getBean(theDataset.getProtocol(), ctxt);
-            if ( globalIdServiceBean != null ) {
-                if (globalIdServiceBean instanceof FakePidProviderServiceBean) {
-                    try {
-                        globalIdServiceBean.createIdentifier(theDataset);
-                    } catch (Throwable ex) {
-                        logger.warning("Problem running createIdentifier for FakePidProvider: " + ex);
-                    }
-                    theDataset.setGlobalIdCreateTime(getTimestamp());
-                    theDataset.setIdentifierRegistered(true);
-                    return;
-                }
+    protected void registerExternalIdentifier(DvObject dvObject, CommandContext ctxt, boolean retry) throws CommandException {
+        if (!dvObject.isIdentifierRegistered()) {
+            PidProvider pidProvider = PidUtil.getPidProvider(dvObject.getGlobalId().getProviderId());
+            if ( pidProvider != null ) {
                 try {
-                    if (globalIdServiceBean.alreadyExists(theDataset)) {
+                    if (pidProvider.alreadyRegistered(dvObject)) {
                         int attempts = 0;
-
-                        while (globalIdServiceBean.alreadyExists(theDataset) && attempts < FOOLPROOF_RETRIAL_ATTEMPTS_LIMIT) {
-                            theDataset.setIdentifier(ctxt.datasets().generateDatasetIdentifier(theDataset, globalIdServiceBean));
-                            logger.log(Level.INFO, "Attempting to register external identifier for dataset {0} (trying: {1}).",
-                                new Object[]{theDataset.getId(), theDataset.getIdentifier()});
-                            attempts++;
+                        if(retry) {
+                            do  {
+                                pidProvider.generatePid(dvObject);
+                                logger.log(Level.INFO, "Attempting to register external identifier for dataset {0} (trying: {1}).",
+                                    new Object[]{dvObject.getId(), dvObject.getIdentifier()});
+                                attempts++;
+                            } while (pidProvider.alreadyRegistered(dvObject) && attempts <= FOOLPROOF_RETRIAL_ATTEMPTS_LIMIT);
                         }
-
-                        if (globalIdServiceBean.alreadyExists(theDataset)) {
-                            throw new CommandExecutionException("This dataset may not be published because its identifier is already in use by another dataset; "
-                                + "gave up after " + attempts + " attempts. Current (last requested) identifier: " + theDataset.getIdentifier(), this);
+                        if(!retry) {
+                            logger.warning("Reserving PID for: "  + getDataset().getId() + " failed.");
+                            throw new CommandExecutionException(BundleUtil.getStringFromBundle("abstractDatasetCommand.pidNotReserved", Arrays.asList(dvObject.getIdentifier())), this);
+                        }
+                        if(attempts > FOOLPROOF_RETRIAL_ATTEMPTS_LIMIT) {
+                            //Didn't work - we existed the loop with too many tries
+                            throw new CommandExecutionException(BundleUtil.getStringFromBundle("abstractDatasetCommand.pidReservationRetryExceeded", Arrays.asList(Integer.toString(attempts), dvObject.getIdentifier())), this);
                         }
                     }
                     // Invariant: Dataset identifier does not exist in the remote registry
-                    globalIdServiceBean.createIdentifier(theDataset);
-                    theDataset.setGlobalIdCreateTime(getTimestamp());
-                    theDataset.setIdentifierRegistered(true);
+                    try {
+                        pidProvider.createIdentifier(dvObject);
+                        dvObject.setGlobalIdCreateTime(getTimestamp());
+                        dvObject.setIdentifierRegistered(true);
+                    } catch (Throwable ex) {
+                        logger.info("Call to globalIdServiceBean.createIdentifier failed: " + ex);
+                    }
 
                 } catch (Throwable e) {
-                    throw new CommandException(BundleUtil.getStringFromBundle("dataset.publish.error", globalIdServiceBean.getProviderInformation()), this);
+                    if (e instanceof CommandException) {
+                        throw (CommandException) e;
+                    }
+                    throw new CommandException(BundleUtil.getStringFromBundle("dataset.publish.error", pidProvider.getProviderInformation()), this);
                 }
             } else {
                 throw new IllegalCommandException("This dataset may not be published because its id registry service is not supported.", this);
@@ -219,4 +222,97 @@ public void setDataset(Dataset dataset) {
     protected Timestamp getTimestamp() {
         return timestamp;
     }
+
+    protected void registerFilePidsIfNeeded(Dataset theDataset, CommandContext ctxt, boolean b) throws CommandException {
+        // Register file PIDs if needed
+        PidProvider pidGenerator = ctxt.dvObjects().getEffectivePidGenerator(getDataset());
+        boolean shouldRegister = !pidGenerator.registerWhenPublished() &&
+                ctxt.systemConfig().isFilePIDsEnabledForCollection(getDataset().getOwner()) &&
+                pidGenerator.canCreatePidsLike(getDataset().getGlobalId());
+        if (shouldRegister) {
+            for (DataFile dataFile : theDataset.getFiles()) {
+                logger.fine(dataFile.getId() + " is registered?: " + dataFile.isIdentifierRegistered());
+                if (!dataFile.isIdentifierRegistered()) {
+                    // pre-register a persistent id
+                    registerFileExternalIdentifier(dataFile, pidGenerator, ctxt, true);
+                }
+            }
+        }
+    }
+
+    private void registerFileExternalIdentifier(DataFile dataFile, PidProvider pidProvider, CommandContext ctxt, boolean retry) throws CommandException {
+
+        if (!dataFile.isIdentifierRegistered()) {
+
+            if (pidProvider instanceof FakeDOIProvider) {
+                retry = false; // No reason to allow a retry with the FakeProvider (even if it allows
+                               // pre-registration someday), so set false for efficiency
+            }
+            try {
+                if (pidProvider.alreadyRegistered(dataFile)) {
+                    int attempts = 0;
+                    if (retry) {
+                        do {
+                            pidProvider.generatePid(dataFile);
+                            logger.log(Level.INFO, "Attempting to register external identifier for datafile {0} (trying: {1}).",
+                                    new Object[] { dataFile.getId(), dataFile.getIdentifier() });
+                            attempts++;
+                        } while (pidProvider.alreadyRegistered(dataFile) && attempts <= FOOLPROOF_RETRIAL_ATTEMPTS_LIMIT);
+                    }
+                    if (!retry) {
+                        logger.warning("Reserving File PID for: " + getDataset().getId() + ", fileId: " + dataFile.getId() + ", during publication failed.");
+                        throw new CommandExecutionException(BundleUtil.getStringFromBundle("abstractDatasetCommand.filePidNotReserved", Arrays.asList(getDataset().getIdentifier())), this);
+                    }
+                    if (attempts > FOOLPROOF_RETRIAL_ATTEMPTS_LIMIT) {
+                        // Didn't work - we existed the loop with too many tries
+                        throw new CommandExecutionException("This dataset may not be published because its identifier is already in use by another dataset; "
+                                + "gave up after " + attempts + " attempts. Current (last requested) identifier: " + dataFile.getIdentifier(), this);
+                    }
+                }
+                // Invariant: DataFile identifier does not exist in the remote registry
+                try {
+                    pidProvider.createIdentifier(dataFile);
+                    dataFile.setGlobalIdCreateTime(getTimestamp());
+                    dataFile.setIdentifierRegistered(true);
+                } catch (Throwable ex) {
+                    logger.info("Call to globalIdServiceBean.createIdentifier failed: " + ex);
+                }
+
+            } catch (Throwable e) {
+                if (e instanceof CommandException) {
+                    throw (CommandException) e;
+                }
+                throw new CommandException(BundleUtil.getStringFromBundle("file.register.error", pidProvider.getProviderInformation()), this);
+            }
+        } else {
+            throw new IllegalCommandException("This datafile may not have a PID because its id registry service is not supported.", this);
+        }
+
+    }
+
+    protected void checkSystemMetadataKeyIfNeeded(DatasetVersion newVersion, DatasetVersion persistedVersion) throws IllegalCommandException {
+        Set<MetadataBlock> changedMDBs = DatasetVersionDifference.getBlocksWithChanges(newVersion, persistedVersion);
+        for (MetadataBlock mdb : changedMDBs) {
+            logger.fine(mdb.getName() + " has been changed");
+            String smdbString = JvmSettings.MDB_SYSTEM_KEY_FOR.lookupOptional(mdb.getName())
+                    .orElse(null);
+            if (smdbString != null) {
+                logger.fine("Found key: " + smdbString);
+                String mdKey = getRequest().getSystemMetadataBlockKeyFor(mdb.getName());
+                logger.fine("Found supplied key: " + mdKey);
+                if (mdKey == null || !mdKey.equalsIgnoreCase(smdbString)) {
+                    throw new IllegalCommandException("Updating system metadata in block " + mdb.getName() + " requires a valid key", this);
+                }
+            }
+        }
+    }
+
+    protected void registerExternalVocabValuesIfAny(CommandContext ctxt, DatasetVersion newVersion) {
+        for (DatasetField df : newVersion.getFlatDatasetFields()) {
+            logger.fine("Found id: " + df.getDatasetFieldType().getId());
+            if (ctxt.dsField().getCVocConf(true).containsKey(df.getDatasetFieldType().getId())) {
+                ctxt.dsField().registerExternalVocabValues(df);
+            }
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractGetPublishedFileMetadataCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractGetPublishedFileMetadataCommand.java
new file mode 100644
index 00000000000..4fef2c27efb
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractGetPublishedFileMetadataCommand.java
@@ -0,0 +1,39 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+
+@RequiredPermissions({})
+abstract class AbstractGetPublishedFileMetadataCommand extends AbstractCommand<FileMetadata> {
+    protected final DataFile dataFile;
+    protected final boolean includeDeaccessioned;
+
+    public AbstractGetPublishedFileMetadataCommand(DataverseRequest request, DataFile dataFile, boolean includeDeaccessioned) {
+        super(request, dataFile);
+        this.dataFile = dataFile;
+        this.includeDeaccessioned = includeDeaccessioned;
+    }
+
+    protected FileMetadata getLatestPublishedFileMetadata(CommandContext ctxt) {
+        return dataFile.getFileMetadatas().stream().filter(fileMetadata -> {
+            DatasetVersion.VersionState versionState = fileMetadata.getDatasetVersion().getVersionState();
+            return (!versionState.equals(DatasetVersion.VersionState.DRAFT)
+                    && isDatasetVersionAccessible(fileMetadata.getDatasetVersion(), dataFile.getOwner(), ctxt));
+        }).reduce(null, DataFile::getTheNewerFileMetadata);
+    }
+
+    protected boolean isDatasetVersionAccessible(DatasetVersion datasetVersion, Dataset ownerDataset, CommandContext ctxt) {
+        return datasetVersion.isReleased() || isDatasetVersionDeaccessionedAndAccessible(datasetVersion, ownerDataset, ctxt);
+    }
+
+    private boolean isDatasetVersionDeaccessionedAndAccessible(DatasetVersion datasetVersion, Dataset ownerDataset, CommandContext ctxt) {
+        return includeDeaccessioned && datasetVersion.isDeaccessioned() && ctxt.permissions().requestOn(getRequest(), ownerDataset).has(Permission.EditDataset);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractSubmitToArchiveCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractSubmitToArchiveCommand.java
index 976c4983bcd..29c27d0396d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractSubmitToArchiveCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractSubmitToArchiveCommand.java
@@ -1,7 +1,10 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
+import edu.harvard.iq.dataverse.DataCitation;
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.SettingsWrapper;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
@@ -10,10 +13,16 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DOIDataCiteRegisterService;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.bagit.BagGenerator;
+import edu.harvard.iq.dataverse.util.bagit.OREMap;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
 
-import java.util.Date;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.security.DigestInputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -23,7 +32,10 @@ public abstract class AbstractSubmitToArchiveCommand extends AbstractCommand<Dat
 
     private final DatasetVersion version;
     private final Map<String, String> requestedSettings = new HashMap<String, String>();
+    protected boolean success=false;
     private static final Logger logger = Logger.getLogger(AbstractSubmitToArchiveCommand.class.getName());
+    private static final int MAX_ZIP_WAIT = 20000;
+    private static final int DEFAULT_THREADS = 2;
     
     public AbstractSubmitToArchiveCommand(DataverseRequest aRequest, DatasetVersion version) {
         super(aRequest, version.getDataset());
@@ -46,7 +58,8 @@ public DatasetVersion execute(CommandContext ctxt) throws CommandException {
         
         AuthenticatedUser user = getRequest().getAuthenticatedUser();
         ApiToken token = ctxt.authentication().findApiTokenByUser(user);
-        if ((token == null) || (token.getExpireTime().before(new Date()))) {
+        if (token == null) {
+            //No un-expired token
             token = ctxt.authentication().generateApiTokenForUser(user);
         }
         performArchiveSubmission(version, token, requestedSettings);
@@ -66,10 +79,108 @@ public DatasetVersion execute(CommandContext ctxt) throws CommandException {
      */
     abstract public WorkflowStepResult performArchiveSubmission(DatasetVersion version, ApiToken token, Map<String, String> requestedSetttings);
 
+    protected int getNumberOfBagGeneratorThreads() {
+        if (requestedSettings.get(BagGenerator.BAG_GENERATOR_THREADS) != null) {
+            try {
+                return Integer.valueOf(requestedSettings.get(BagGenerator.BAG_GENERATOR_THREADS));
+            } catch (NumberFormatException nfe) {
+                logger.warning("Can't parse the value of setting " + BagGenerator.BAG_GENERATOR_THREADS
+                        + " as an integer - using default:" + DEFAULT_THREADS);
+            }
+        }
+        return DEFAULT_THREADS;
+    }
+
     @Override
     public String describe() {
         return super.describe() + "DatasetVersion: [" + version.getId() + " (v"
                 + version.getFriendlyVersionNumber()+")]";
     }
+    
+    String getDataCiteXml(DatasetVersion dv) {
+        DataCitation dc = new DataCitation(dv);
+        Map<String, String> metadata = dc.getDataCiteMetadata();
+        return DOIDataCiteRegisterService.getMetadataFromDvObject(dv.getDataset().getGlobalId().asString(), metadata,
+                dv.getDataset());
+    }
+
+    public Thread startBagThread(DatasetVersion dv, PipedInputStream in, DigestInputStream digestInputStream2,
+            String dataciteXml, ApiToken token) throws IOException, InterruptedException {
+        Thread bagThread = new Thread(new Runnable() {
+            public void run() {
+                try (PipedOutputStream out = new PipedOutputStream(in)) {
+                    // Generate bag
+                    BagGenerator bagger = new BagGenerator(new OREMap(dv, false), dataciteXml);
+                    bagger.setNumConnections(getNumberOfBagGeneratorThreads());
+                    bagger.setAuthenticationKey(token.getTokenString());
+                    bagger.generateBag(out);
+                    success = true;
+                } catch (Exception e) {
+                    logger.severe("Error creating bag: " + e.getMessage());
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                    try {
+                        digestInputStream2.close();
+                    } catch (Exception ex) {
+                        logger.warning(ex.getLocalizedMessage());
+                }
+                    throw new RuntimeException("Error creating bag: " + e.getMessage());
+            }
+            }
+        });
+        bagThread.start();
+        /*
+         * The following loop handles two issues. First, with no delay, the
+         * bucket.create() call below can get started before the piped streams are set
+         * up, causing a failure (seen when triggered in a PostPublishDataset workflow).
+         * A minimal initial wait, e.g. until some bytes are available, would address
+         * this. Second, the BagGenerator class, due to it's use of parallel streaming
+         * creation of the zip file, has the characteristic that it makes a few bytes
+         * available - from setting up the directory structure for the zip file -
+         * significantly earlier than it is ready to stream file content (e.g. for
+         * thousands of files and GB of content). If, for these large datasets,
+         * the transfer is started as soon as bytes are available, the call can
+         * timeout before the bytes for all the zipped files are available. To manage
+         * this, the loop waits until 90K bytes are available, larger than any expected
+         * dir structure for the zip and implying that the main zipped content is
+         * available, or until the thread terminates, with all of its content written to
+         * the pipe. (Note the PipedInputStream buffer is set at 100K above - I didn't
+         * want to test whether that means that exactly 100K bytes will be available()
+         * for large datasets or not, so the test below is at 90K.)
+         * 
+         * An additional sanity check limits the wait to 20K (MAX_ZIP_WAIT) seconds. The BagGenerator
+         * has been used to archive >120K files, 2K directories, and ~600GB files on the
+         * SEAD project (streaming content to disk rather than over an internet
+         * connection) which would take longer than 20K seconds (even 10+ hours) and might
+         * produce an initial set of bytes for directories > 90K. If Dataverse ever
+         * needs to support datasets of this size, the numbers here would need to be
+         * increased, and/or a change in how archives are sent to google (e.g. as
+         * multiple blobs that get aggregated) would be required.
+         */
+        int i = 0;
+        while (digestInputStream2.available() <= 90000 && i < MAX_ZIP_WAIT && bagThread.isAlive()) {
+            Thread.sleep(1000);
+            logger.fine("avail: " + digestInputStream2.available() + " : " + bagThread.getState().toString());
+            i++;
+        }
+        logger.fine("Bag: transfer started, i=" + i + ", avail = " + digestInputStream2.available());
+        if(i==MAX_ZIP_WAIT) {
+            throw new IOException("Stream not available");
+        }
+        return bagThread;
+    }
 
+    public static boolean isArchivable(Dataset dataset, SettingsWrapper settingsWrapper) {
+        return true;
+   }
+   
+   //Check if the chosen archiver imposes single-version-only archiving - in a View context
+   public static boolean isSingleVersion(SettingsWrapper settingsWrapper) {
+       return false;
+  }
+ 
+   //Check if the chosen archiver imposes single-version-only archiving - in the API
+   public static boolean isSingleVersion(SettingsServiceBean settingsService) {
+       return false;
+  }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseCommand.java
new file mode 100644
index 00000000000..8227572da3b
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseCommand.java
@@ -0,0 +1,118 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * An abstract base class for commands that perform write operations on {@link Dataverse}s.
+ */
+abstract class AbstractWriteDataverseCommand extends AbstractCommand<Dataverse> {
+
+    protected Dataverse dataverse;
+    private final List<DataverseFieldTypeInputLevel> inputLevels;
+    private final List<DatasetFieldType> facets;
+    protected final List<MetadataBlock> metadataBlocks;
+
+    public AbstractWriteDataverseCommand(Dataverse dataverse,
+                                         Dataverse affectedDataverse,
+                                         DataverseRequest request,
+                                         List<DatasetFieldType> facets,
+                                         List<DataverseFieldTypeInputLevel> inputLevels,
+                                         List<MetadataBlock> metadataBlocks) {
+        super(request, affectedDataverse);
+        this.dataverse = dataverse;
+        if (facets != null) {
+            this.facets = new ArrayList<>(facets);
+        } else {
+            this.facets = null;
+        }
+        if (inputLevels != null) {
+            this.inputLevels = new ArrayList<>(inputLevels);
+        } else {
+            this.inputLevels = null;
+        }
+        if (metadataBlocks != null) {
+            this.metadataBlocks = new ArrayList<>(metadataBlocks);
+        } else {
+            this.metadataBlocks = null;
+        }
+    }
+
+    @Override
+    public Dataverse execute(CommandContext ctxt) throws CommandException {
+        dataverse = innerExecute(ctxt);
+
+        processMetadataBlocks();
+        processFacets(ctxt);
+        processInputLevels(ctxt);
+
+        return ctxt.dataverses().save(dataverse);
+    }
+
+    /*
+      metadataBlocks = null - ignore
+      metadataBlocks is empty - delete and inherit from parent
+      metadataBlocks is not empty - set with new updated values
+    */
+    private void processMetadataBlocks() {
+        if (metadataBlocks != null) {
+            if (metadataBlocks.isEmpty()) {
+                dataverse.setMetadataBlockRoot(false);
+                dataverse.clearMetadataBlocks();
+            } else {
+                dataverse.setMetadataBlockRoot(true);
+                dataverse.setMetadataBlocks(metadataBlocks);
+            }
+        }
+    }
+
+    /*
+      facets = null - ignore
+      facets is empty - delete and inherit from parent
+      facets is not empty - set with new updated values
+    */
+    private void processFacets(CommandContext ctxt) {
+        if (facets != null) {
+            if (facets.isEmpty()) {
+                ctxt.facets().deleteFacetsFor(dataverse);
+                dataverse.setFacetRoot(false);
+            } else {
+                ctxt.facets().deleteFacetsFor(dataverse);
+                dataverse.setDataverseFacets(new ArrayList<>());
+                dataverse.setFacetRoot(true);
+                for (int i = 0; i < facets.size(); i++) {
+                    ctxt.facets().create(i, facets.get(i), dataverse);
+                }
+            }
+        }
+    }
+
+    /*
+      inputLevels = null - ignore
+      inputLevels is empty - delete
+      inputLevels is not empty - set with new updated values
+    */
+    private void processInputLevels(CommandContext ctxt) {
+        if (inputLevels != null) {
+            if (inputLevels.isEmpty()) {
+                ctxt.fieldTypeInputLevels().deleteDataverseFieldTypeInputLevelFor(dataverse);
+            } else {
+                dataverse.addInputLevelsMetadataBlocksIfNotPresent(inputLevels);
+                ctxt.fieldTypeInputLevels().deleteDataverseFieldTypeInputLevelFor(dataverse);
+                inputLevels.forEach(inputLevel -> {
+                    inputLevel.setDataverse(dataverse);
+                    ctxt.fieldTypeInputLevels().create(inputLevel);
+                });
+            }
+        }
+    }
+
+    abstract protected Dataverse innerExecute(CommandContext ctxt) throws IllegalCommandException;
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseFeaturedItemCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseFeaturedItemCommand.java
new file mode 100644
index 00000000000..d80840674f1
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseFeaturedItemCommand.java
@@ -0,0 +1,95 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.InvalidCommandArgumentsException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.MarkupChecker;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.MessageFormat;
+import java.util.List;
+
+/**
+ * An abstract base class for commands that perform write operations on {@link DataverseFeaturedItem}s.
+ */
+@RequiredPermissions({Permission.EditDataverse})
+abstract class AbstractWriteDataverseFeaturedItemCommand extends AbstractCommand<DataverseFeaturedItem> {
+
+    protected final Dataverse dataverse;
+
+    public AbstractWriteDataverseFeaturedItemCommand(DataverseRequest request, Dataverse affectedDataverse) {
+        super(request, affectedDataverse);
+        this.dataverse = affectedDataverse;
+    }
+
+    protected void validateAndSetContent(DataverseFeaturedItem featuredItem, String content) throws InvalidCommandArgumentsException {
+        if (DataverseFeaturedItem.TYPES.CUSTOM.name().equalsIgnoreCase(featuredItem.getType())) {
+            if (content == null || content.trim().isEmpty()) {
+                throw new InvalidCommandArgumentsException(
+                        BundleUtil.getStringFromBundle("dataverse.create.featuredItem.error.contentShouldBeProvided"),
+                        this
+                );
+            }
+            content = MarkupChecker.sanitizeAdvancedHTML(content);
+            if (content.length() > DataverseFeaturedItem.MAX_FEATURED_ITEM_CONTENT_SIZE) {
+                throw new InvalidCommandArgumentsException(
+                        MessageFormat.format(
+                                BundleUtil.getStringFromBundle("dataverse.create.featuredItem.error.contentExceedsLengthLimit"),
+                                List.of(DataverseFeaturedItem.MAX_FEATURED_ITEM_CONTENT_SIZE)
+                        ),
+                        this
+                );
+            }
+            featuredItem.setContent(content);
+        } else {
+            featuredItem.setContent(null);
+        }
+    }
+
+    protected void setFileImageIfAvailableOrNull(DataverseFeaturedItem featuredItem, String imageFileName, InputStream imageFileInputStream, CommandContext ctxt) throws CommandException {
+        if (imageFileName != null && imageFileInputStream != null) {
+            try {
+                ctxt.dataverseFeaturedItems().saveDataverseFeaturedItemImageFile(imageFileInputStream, imageFileName, dataverse.getId());
+            } catch (DataverseFeaturedItemServiceBean.InvalidImageFileException e) {
+                throw new InvalidCommandArgumentsException(
+                        e.getMessage(),
+                        this
+                );
+            } catch (IOException e) {
+                throw new CommandException(
+                        BundleUtil.getStringFromBundle(
+                                "dataverse.create.featuredItem.error.imageFileProcessing",
+                                List.of(e.getMessage())
+                        ),
+                        this
+                );
+            }
+            featuredItem.setImageFileName(imageFileName);
+        } else {
+            featuredItem.setImageFileName(null);
+        }
+    }
+
+    protected void validateAndSetDvObject(DataverseFeaturedItem featuredItem, String type, DvObject dvObject) throws CommandException {
+        try {
+            featuredItem.setDvObject(type, dvObject);
+        } catch (IllegalArgumentException e) {
+            throw new InvalidCommandArgumentsException(
+                    BundleUtil.getStringFromBundle(
+                            "dataverse.update.featuredItems.error.invalidTypeAndDvObject",
+                            List.of(e.getMessage())
+                    ),
+                    this
+            );
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AddRoleAssigneesToExplicitGroupCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AddRoleAssigneesToExplicitGroupCommand.java
index f6bd1316e44..59c5d970b09 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AddRoleAssigneesToExplicitGroupCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AddRoleAssigneesToExplicitGroupCommand.java
@@ -4,6 +4,7 @@
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.groups.GroupException;
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroup;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
@@ -15,7 +16,7 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 /**
  *
@@ -49,6 +50,12 @@ public ExplicitGroup execute(CommandContext ctxt) throws CommandException {
             if ( ra == null ) {
                 nonexistentRAs.add( rai );
             } else {
+                if (ra instanceof AuthenticatedUser) {
+                    AuthenticatedUser user = (AuthenticatedUser) ra;
+                    if (user.isDeactivated()) {
+                        throw new IllegalCommandException("User " + user.getUserIdentifier() + " is deactivated and cannot be added to a group.", this);
+                    }
+                }
                 try {
                     explicitGroup.add(ra);
                 } catch (GroupException ex) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AssignRoleCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AssignRoleCommand.java
index 34263599ff0..121af765737 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AssignRoleCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AssignRoleCommand.java
@@ -3,18 +3,24 @@
  */
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -28,8 +34,10 @@ public class AssignRoleCommand extends AbstractCommand<RoleAssignment> {
 
     private final DataverseRole role;
     private final RoleAssignee grantee;
+    //Kept for convenience -could get this as the only DVObject AbstractCommand<>.getAffectedDvObjects() instead of having a local defPoint
     private final DvObject defPoint;
     private final String privateUrlToken;
+    private boolean anonymizedAccess;
 
     /**
      * @param anAssignee The user being granted the role
@@ -40,26 +48,59 @@ public class AssignRoleCommand extends AbstractCommand<RoleAssignment> {
      */
     public AssignRoleCommand(RoleAssignee anAssignee, DataverseRole aRole, DvObject assignmentPoint, DataverseRequest aRequest, String privateUrlToken) {
         // for data file check permission on owning dataset
-        super(aRequest, assignmentPoint instanceof DataFile ? assignmentPoint.getOwner() : assignmentPoint);
+        super(aRequest, assignmentPoint);
         role = aRole;
         grantee = anAssignee;
         defPoint = assignmentPoint;
         this.privateUrlToken = privateUrlToken;
+        this.anonymizedAccess=false;
+    }
+
+    public AssignRoleCommand(PrivateUrlUser privateUrlUser, DataverseRole memberRole, Dataset dataset, DataverseRequest request, String privateUrlToken, boolean anonymizedAccess) {
+        this(privateUrlUser, memberRole, dataset, request, privateUrlToken);
+        this.anonymizedAccess= anonymizedAccess;
     }
 
     @Override
     public RoleAssignment execute(CommandContext ctxt) throws CommandException {
+        if (grantee instanceof AuthenticatedUser) {
+            AuthenticatedUser user = (AuthenticatedUser) grantee;
+            if (user.isDeactivated()) {
+                throw new IllegalCommandException("User " + user.getUserIdentifier() + " is deactivated and cannot be given a role.", this);
+            }
+        }
+        if(isExistingRole(ctxt)){
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasets.api.grant.role.assignee.has.role.error"), this);
+        }
         // TODO make sure the role is defined on the dataverse.
-        RoleAssignment roleAssignment = new RoleAssignment(role, grantee, defPoint, privateUrlToken);
+        RoleAssignment roleAssignment = new RoleAssignment(role, grantee, defPoint, privateUrlToken, anonymizedAccess);
         return ctxt.roles().save(roleAssignment);
     }
 
+    private boolean isExistingRole(CommandContext ctxt) {
+        return ctxt.roles()
+                .directRoleAssignments(grantee, defPoint)
+                .stream()
+                .map(RoleAssignment::getRole)
+                .anyMatch(it -> it.equals(role));
+    }
+
     @Override
     public Map<String, Set<Permission>> getRequiredPermissions() {
         // for data file check permission on owning dataset
-        return Collections.singletonMap("",
-                defPoint instanceof Dataverse ? Collections.singleton(Permission.ManageDataversePermissions)
-                : Collections.singleton(Permission.ManageDatasetPermissions));
+        Set<Permission> requiredPermissions = new HashSet<Permission>();
+
+        if (defPoint instanceof Dataverse) {
+            requiredPermissions.add(Permission.ManageDataversePermissions);
+        } else if (defPoint instanceof Dataset) {
+            requiredPermissions.add(Permission.ManageDatasetPermissions);
+        } else {
+            requiredPermissions.add(Permission.ManageFilePermissions);
+        }
+
+        requiredPermissions.addAll(role.permissions());
+
+        return Collections.singletonMap("", requiredPermissions);
     }
 
     @Override
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ChangeUserIdentifierCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ChangeUserIdentifierCommand.java
index 4a5998aea00..94aff3e3f5d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ChangeUserIdentifierCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ChangeUserIdentifierCommand.java
@@ -18,11 +18,11 @@
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import java.util.List;
 import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.ws.rs.core.Response;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import jakarta.ws.rs.core.Response;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CheckRateLimitForCollectionPageCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CheckRateLimitForCollectionPageCommand.java
new file mode 100644
index 00000000000..b23e6034c9a
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CheckRateLimitForCollectionPageCommand.java
@@ -0,0 +1,16 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+public class CheckRateLimitForCollectionPageCommand extends AbstractVoidCommand {
+    public CheckRateLimitForCollectionPageCommand(DataverseRequest aRequest, DvObject dvObject) {
+        super(aRequest, dvObject);
+    }
+
+    @Override
+    protected void executeImpl(CommandContext ctxt) throws CommandException { }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CheckRateLimitForDatasetFeedbackCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CheckRateLimitForDatasetFeedbackCommand.java
new file mode 100644
index 00000000000..d25dbd974c2
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CheckRateLimitForDatasetFeedbackCommand.java
@@ -0,0 +1,18 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+public class CheckRateLimitForDatasetFeedbackCommand extends AbstractVoidCommand {
+
+    public CheckRateLimitForDatasetFeedbackCommand(DataverseRequest aRequest, DvObject dvObject) {
+        super(aRequest, dvObject);
+    }
+
+    @Override
+    protected void executeImpl(CommandContext ctxt) throws CommandException { }
+}
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CheckRateLimitForDatasetPageCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CheckRateLimitForDatasetPageCommand.java
new file mode 100644
index 00000000000..da8c1e4d8e3
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CheckRateLimitForDatasetPageCommand.java
@@ -0,0 +1,17 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+public class CheckRateLimitForDatasetPageCommand  extends AbstractVoidCommand {
+
+    public CheckRateLimitForDatasetPageCommand(DataverseRequest aRequest, DvObject dvObject) {
+        super(aRequest, dvObject);
+    }
+
+    @Override
+    protected void executeImpl(CommandContext ctxt) throws CommandException { }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDatasetVersionCommand.java
index 24d957968fb..6539ac27ea2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDatasetVersionCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDatasetVersionCommand.java
@@ -10,6 +10,8 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
@@ -25,15 +27,26 @@ public class CreateDatasetVersionCommand extends AbstractDatasetCommand<DatasetV
     
     final DatasetVersion newVersion;
     final Dataset dataset;
+    final boolean validate;
     
     public CreateDatasetVersionCommand(DataverseRequest aRequest, Dataset theDataset, DatasetVersion aVersion) {
+        this(aRequest, theDataset, aVersion, true);
+    }
+
+    public CreateDatasetVersionCommand(DataverseRequest aRequest, Dataset theDataset, DatasetVersion aVersion, boolean validate) {
         super(aRequest, theDataset);
         dataset = theDataset;
         newVersion = aVersion;
+        this.validate = validate;
     }
     
     @Override
     public DatasetVersion execute(CommandContext ctxt) throws CommandException {
+        /*
+         * CreateDatasetVersionCommand assumes you have not added your new version to
+         * the dataset you send. Use UpdateDatasetVersionCommand if you created the new
+         * version via Dataset.getOrCreateEditVersion() and just want to persist it.
+         */
         DatasetVersion latest = dataset.getLatestVersion();
         if ( latest.isWorkingCopy() ) {
             // A dataset can only have a single draft, which has to be the latest.
@@ -43,8 +56,11 @@ public DatasetVersion execute(CommandContext ctxt) throws CommandException {
             }
         }
         
-        prepareDatasetAndVersion();
-        
+        //Will throw an IllegalCommandException if a system metadatablock is changed and the appropriate key is not supplied.
+        checkSystemMetadataKeyIfNeeded(newVersion, latest);
+
+        registerExternalVocabValuesIfAny(ctxt, newVersion);
+
         List<FileMetadata> newVersionMetadatum = new ArrayList<>(latest.getFileMetadatas().size());
         for ( FileMetadata fmd : latest.getFileMetadatas() ) {
             FileMetadata fmdCopy = fmd.createCopy();
@@ -53,10 +69,17 @@ public DatasetVersion execute(CommandContext ctxt) throws CommandException {
         }
         newVersion.setFileMetadatas(newVersionMetadatum);
         
-        // TODO make async
-        // ctxt.index().indexDataset(dataset);
-        return ctxt.datasets().storeVersion(newVersion);
+        //moving prepare Dataset here
+        //because it includes validation and we need the validation
+        //to happen after file metdata is added to return a 
+        //good wrapped response if the TOA/Request Access not in compliance
+        prepareDatasetAndVersion();
         
+        DatasetVersion version = ctxt.datasets().storeVersion(newVersion);
+        if (ctxt.index() != null) {
+            ctxt.index().asyncIndexDataset(dataset, true);
+        }
+        return version;
     }
     
     /**
@@ -71,9 +94,14 @@ public void prepareDatasetAndVersion() throws CommandException {
         newVersion.setDatasetFields(newVersion.initDatasetFields());
         newVersion.setCreateTime(getTimestamp());
         newVersion.setLastUpdateTime(getTimestamp());
-        
-        tidyUpFields(newVersion);
-        validateOrDie(newVersion, false);
+        //Switching the order of validate and tidy up
+        //originally missing/empty required fields were not
+        //throwing constraint violations because they
+        //had been stripped from the dataset fields prior to validation 
+        if (this.validate) {
+            validateOrDie(newVersion, false);
+        }
+        DatasetFieldUtil.tidyUpFields(newVersion.getDatasetFields(), true);
         
         final List<DatasetVersion> currentVersions = dataset.getVersions();
         ArrayList<DatasetVersion> dsvs = new ArrayList<>(currentVersions.size());
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommand.java
index c32e2e67ae3..ef46e1b61c3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommand.java
@@ -1,33 +1,23 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevel;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
-import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.groups.Group;
-import edu.harvard.iq.dataverse.authorization.groups.GroupProvider;
-import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupProvider;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
-import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
-import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import java.io.IOException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.logging.Logger;
-import org.apache.solr.client.solrj.SolrServerException;
 
 /**
  * TODO make override the date and user more active, so prevent code errors.
@@ -36,76 +26,84 @@
  * @author michael
  */
 @RequiredPermissions(Permission.AddDataverse)
-public class CreateDataverseCommand extends AbstractCommand<Dataverse> {
-
-    private static final Logger logger = Logger.getLogger(CreateDataverseCommand.class.getName());
-
-    private final Dataverse created;
-    private final List<DataverseFieldTypeInputLevel> inputLevelList;
-    private final List<DatasetFieldType> facetList;
-
-    public CreateDataverseCommand(Dataverse created, DataverseRequest aRequest, List<DatasetFieldType> facetList,
-            List<DataverseFieldTypeInputLevel> inputLevelList) {
-        super(aRequest, created.getOwner());
-        this.created = created;
-        if (facetList != null) {
-            this.facetList = new ArrayList<>(facetList);
-        } else {
-            this.facetList = null;
-        }
-        if (inputLevelList != null) {
-            this.inputLevelList = new ArrayList<>(inputLevelList);
-        } else {
-            this.inputLevelList = null;
-        }
+public class CreateDataverseCommand extends AbstractWriteDataverseCommand {
+
+    private final boolean sendNotificationOnSuccess;
+
+    public CreateDataverseCommand(Dataverse created,
+                                  DataverseRequest request,
+                                  List<DatasetFieldType> facets,
+                                  List<DataverseFieldTypeInputLevel> inputLevels) {
+        this(created, request, facets, inputLevels, null, false);
     }
 
-    @Override
-    public Dataverse execute(CommandContext ctxt) throws CommandException {
+    public CreateDataverseCommand(Dataverse created,
+                                  DataverseRequest request,
+                                  List<DatasetFieldType> facets,
+                                  List<DataverseFieldTypeInputLevel> inputLevels,
+                                  List<MetadataBlock> metadataBlocks,
+                                  boolean sendNotificationOnSuccess) {
+        super(created, created.getOwner(), request, facets, inputLevels, metadataBlocks);
+        this.sendNotificationOnSuccess = sendNotificationOnSuccess;
+    }
 
-        Dataverse owner = created.getOwner();
+    @Override
+    protected Dataverse innerExecute(CommandContext ctxt) throws IllegalCommandException {
+        Dataverse owner = dataverse.getOwner();
         if (owner == null) {
             if (ctxt.dataverses().isRootDataverseExists()) {
                 throw new IllegalCommandException("Root Dataverse already exists. Cannot create another one", this);
             }
         }
+        if (!getUser().isSuperuser() && dataverse.isDatasetFileCountLimitSet(dataverse.getDatasetFileCountLimit())) {
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("file.dataset.error.set.file.count.limit"), this);
+        }
+
+        if (metadataBlocks != null && !metadataBlocks.isEmpty()) {
+            dataverse.setMetadataBlockRoot(true);
+            dataverse.setMetadataBlocks(metadataBlocks);
+        }
 
-        if (created.getCreateDate() == null) {
-            created.setCreateDate(new Timestamp(new Date().getTime()));
+        if (dataverse.getCreateDate() == null) {
+            dataverse.setCreateDate(new Timestamp(new Date().getTime()));
         }
 
-        if (created.getCreator() == null) {
+        if (dataverse.getCreator() == null) {
             final User user = getRequest().getUser();
             if (user.isAuthenticated()) {
-                created.setCreator((AuthenticatedUser) user);
+                dataverse.setCreator((AuthenticatedUser) user);
             } else {
                 throw new IllegalCommandException("Guest users cannot create a Dataverse.", this);
             }
         }
 
-        if (created.getDataverseType() == null) {
-            created.setDataverseType(Dataverse.DataverseType.UNCATEGORIZED);
+        if (dataverse.getDataverseType() == null) {
+            dataverse.setDataverseType(Dataverse.DataverseType.UNCATEGORIZED);
         }
 
-        if (created.getDefaultContributorRole() == null) {
-            created.setDefaultContributorRole(ctxt.roles().findBuiltinRoleByAlias(DataverseRole.EDITOR));
+        if (dataverse.getDefaultContributorRole() == null) {
+            dataverse.setDefaultContributorRole(ctxt.roles().findBuiltinRoleByAlias(DataverseRole.EDITOR));
         }
 
         // @todo for now we are saying all dataverses are permission root
-        created.setPermissionRoot(true);
+        dataverse.setPermissionRoot(true);
 
-        if (ctxt.dataverses().findByAlias(created.getAlias()) != null) {
-            throw new IllegalCommandException("A dataverse with alias " + created.getAlias() + " already exists", this);
+        if (ctxt.dataverses().findByAlias(dataverse.getAlias()) != null) {
+            throw new IllegalCommandException("A dataverse with alias " + dataverse.getAlias() + " already exists", this);
+        }
+
+        if (dataverse.getFilePIDsEnabled() != null && !ctxt.settings().isTrueForKey(SettingsServiceBean.Key.AllowEnablingFilePIDsPerCollection, false)) {
+            throw new IllegalCommandException("File PIDs cannot be enabled per collection", this);
         }
 
         // Save the dataverse
-        Dataverse managedDv = ctxt.dataverses().save(created);
+        Dataverse managedDv = ctxt.dataverses().save(dataverse);
 
         // Find the built in admin role (currently by alias)
         DataverseRole adminRole = ctxt.roles().findBuiltinRoleByAlias(DataverseRole.ADMIN);
         String privateUrlToken = null;
 
-        ctxt.roles().save(new RoleAssignment(adminRole, getRequest().getUser(), managedDv, privateUrlToken));
+        ctxt.roles().save(new RoleAssignment(adminRole, getRequest().getUser(), managedDv, privateUrlToken), false);
         // Add additional role assignments if inheritance is set
         boolean inheritAllRoles = false;
         String rolesString = ctxt.settings().getValueForKey(SettingsServiceBean.Key.InheritParentRoleAssignments, "");
@@ -125,18 +123,18 @@ public Dataverse execute(CommandContext ctxt) throws CommandException {
                         // above...
                         if ((inheritAllRoles || rolesToInherit.contains(role.getRole().getAlias()))
                                 && !(role.getAssigneeIdentifier().equals(getRequest().getUser().getIdentifier())
-                                        && role.getRole().equals(adminRole))) {
+                                && role.getRole().equals(adminRole))) {
                             String identifier = role.getAssigneeIdentifier();
                             if (identifier.startsWith(AuthenticatedUser.IDENTIFIER_PREFIX)) {
                                 identifier = identifier.substring(AuthenticatedUser.IDENTIFIER_PREFIX.length());
                                 ctxt.roles().save(new RoleAssignment(role.getRole(),
-                                        ctxt.authentication().getAuthenticatedUser(identifier), managedDv, privateUrlToken));
+                                        ctxt.authentication().getAuthenticatedUser(identifier), managedDv, privateUrlToken), false);
                             } else if (identifier.startsWith(Group.IDENTIFIER_PREFIX)) {
                                 identifier = identifier.substring(Group.IDENTIFIER_PREFIX.length());
                                 Group roleGroup = ctxt.groups().getGroup(identifier);
                                 if (roleGroup != null) {
                                     ctxt.roles().save(new RoleAssignment(role.getRole(),
-                                            roleGroup, managedDv, privateUrlToken));
+                                            roleGroup, managedDv, privateUrlToken), false);
                                 }
                             }
                         }
@@ -146,39 +144,33 @@ public Dataverse execute(CommandContext ctxt) throws CommandException {
         }
 
         managedDv.setPermissionModificationTime(new Timestamp(new Date().getTime()));
-        managedDv = ctxt.dataverses().save(managedDv);
-
-  //      ctxt.index().indexDataverse(managedDv);
-        if (facetList != null) {
-            ctxt.facets().deleteFacetsFor(managedDv);
-            int i = 0;
-            for (DatasetFieldType df : facetList) {
-                ctxt.facets().create(i++, df, managedDv);
-            }
-        }
-
-        if (inputLevelList != null) {
-            ctxt.fieldTypeInputLevels().deleteFacetsFor(managedDv);
-            for (DataverseFieldTypeInputLevel obj : inputLevelList) {
-                obj.setDataverse(managedDv);
-                ctxt.fieldTypeInputLevels().create(obj);
-            }
-        }
         return managedDv;
     }
-    
+
+    /**
+     * Handles the successful creation of the dataverse by sending a notification
+     * and triggering indexing.
+     * <p>
+     * The {@code sendNotificationOnSuccess} flag is used because this command is
+     * consumed from two different places: the JSF front-end and the API.
+     * <ul>
+     * <li><b>From JSF:</b> The flag is {@code false}, as the user notification is
+     * sent separately by the UI logic.</li>
+     * <li><b>From the API:</b> The flag is {@code true} to ensure users receive a
+     * notification when creating a dataverse through the API.</li>
+     * </ul>
+     *
+     * @param ctxt The command context.
+     * @param r    The created Dataverse object, returned from the command execution.
+     * @return {@code true} if the dataverse was indexed successfully.
+     */
     @Override
     public boolean onSuccess(CommandContext ctxt, Object r) {
-        try{
-            ctxt.index().indexDataverse((Dataverse) r);
-        } catch (IOException | SolrServerException e){           
-            Dataverse dv = (Dataverse) r;            
-            String failureLogText = "Indexing failed. You can kickoff a re-index of this dataverse with: \r\n curl http://localhost:8080/api/admin/index/dataverses/" + dv.getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText,  dv);
-            return false;
+        if (sendNotificationOnSuccess) {
+            AuthenticatedUser authenticatedUser = (AuthenticatedUser) getUser();
+            ctxt.notifications().sendNotification(authenticatedUser, dataverse.getCreateDate(), UserNotification.Type.CREATEDV, dataverse.getId());
         }
-        return true;
-    }
 
+        return ctxt.dataverses().index((Dataverse) r);
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseFeaturedItemCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseFeaturedItemCommand.java
new file mode 100644
index 00000000000..d18f67b6461
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseFeaturedItemCommand.java
@@ -0,0 +1,43 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.api.dto.NewDataverseFeaturedItemDTO;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+/**
+ * Creates a featured item {@link DataverseFeaturedItem} for a {@link Dataverse}.
+ */
+public class CreateDataverseFeaturedItemCommand extends AbstractWriteDataverseFeaturedItemCommand {
+
+    private final NewDataverseFeaturedItemDTO newDataverseFeaturedItemDTO;
+
+    public CreateDataverseFeaturedItemCommand(DataverseRequest request,
+                                              Dataverse dataverse,
+                                              NewDataverseFeaturedItemDTO newDataverseFeaturedItemDTO) {
+        super(request, dataverse);
+        this.newDataverseFeaturedItemDTO = newDataverseFeaturedItemDTO;
+    }
+
+    @Override
+    public DataverseFeaturedItem execute(CommandContext ctxt) throws CommandException {
+        DataverseFeaturedItem dataverseFeaturedItem = new DataverseFeaturedItem();
+
+        validateAndSetDvObject(dataverseFeaturedItem, newDataverseFeaturedItemDTO.getType(), newDataverseFeaturedItemDTO.getDvObject());
+        validateAndSetContent(dataverseFeaturedItem, newDataverseFeaturedItemDTO.getContent());
+        dataverseFeaturedItem.setDisplayOrder(newDataverseFeaturedItemDTO.getDisplayOrder());
+
+        setFileImageIfAvailableOrNull(
+                dataverseFeaturedItem,
+                newDataverseFeaturedItemDTO.getImageFileName(),
+                newDataverseFeaturedItemDTO.getImageFileInputStream(),
+                ctxt
+        );
+
+        dataverseFeaturedItem.setDataverse(dataverse);
+
+        return ctxt.dataverseFeaturedItems().save(dataverseFeaturedItem);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateHarvestedDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateHarvestedDatasetCommand.java
index 01bcdca1238..78fe519e53d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateHarvestedDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateHarvestedDatasetCommand.java
@@ -16,7 +16,7 @@
 public class CreateHarvestedDatasetCommand extends AbstractCreateDatasetCommand {
 
     public CreateHarvestedDatasetCommand(Dataset theDataset, DataverseRequest aRequest) {
-        super(theDataset, aRequest);
+        super(theDataset, aRequest, true);
     }
     
     @Override
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDataFilesCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDataFilesCommand.java
new file mode 100644
index 00000000000..6789b61f9dc
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDataFilesCommand.java
@@ -0,0 +1,759 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.datasetutility.FileExceedsMaxSizeException;
+import edu.harvard.iq.dataverse.datasetutility.FileSizeChecker;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandExecutionException;
+import edu.harvard.iq.dataverse.ingest.IngestServiceShapefileHelper;
+import edu.harvard.iq.dataverse.storageuse.UploadSessionQuotaLimit;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.ShapefileHandler;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.file.BagItFileHandler;
+import edu.harvard.iq.dataverse.util.file.BagItFileHandlerFactory;
+import edu.harvard.iq.dataverse.util.file.CreateDataFileResult;
+import edu.harvard.iq.dataverse.util.file.FileExceedsStorageQuotaException;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.ws.rs.core.Response;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.logging.Logger;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import static edu.harvard.iq.dataverse.datasetutility.FileSizeChecker.bytesToHumanReadable;
+import static edu.harvard.iq.dataverse.util.FileUtil.MIME_TYPE_UNDETERMINED_DEFAULT;
+import static edu.harvard.iq.dataverse.util.FileUtil.createIngestFailureReport;
+import static edu.harvard.iq.dataverse.util.FileUtil.determineFileType;
+import static edu.harvard.iq.dataverse.util.FileUtil.determineRemoteFileType;
+import static edu.harvard.iq.dataverse.util.FileUtil.getFilesTempDirectory;
+import static edu.harvard.iq.dataverse.util.FileUtil.saveInputStreamInTempFile;
+import static edu.harvard.iq.dataverse.util.FileUtil.useRecognizedType;
+
+/**
+ *
+ * @author landreev
+ */
+// Note the commented out @RequiredPermissions. We need to use dynamic 
+// permissions instead, to accommodate both adding files to an existing 
+// dataset and files being uploaded in the context of creating a new dataset
+// via the Add Dataset page. 
+//@RequiredPermissions( Permission.EditDataset )
+public class CreateNewDataFilesCommand extends AbstractCommand<CreateDataFileResult> {
+    private static final Logger logger = Logger.getLogger(CreateNewDataFilesCommand.class.getCanonicalName());
+    
+    private final DatasetVersion version;
+    private final InputStream inputStream;
+    private final String fileName;
+    private final String suppliedContentType; 
+    private final UploadSessionQuotaLimit quota;
+    // parent Dataverse must be specified when the command is called on Create 
+    // of a new dataset that does not exist in the database yet (for the purposes
+    // of authorization - see getRequiredPermissions() below):
+    private final Dataverse parentDataverse;
+    // With Direct Upload the following values already exist and are passed to the command:
+    private final String newStorageIdentifier; 
+    private final String newCheckSum; 
+    private DataFile.ChecksumType newCheckSumType;
+    private final Long newFileSize;
+    private boolean replaceMode;
+    private DatasetServiceBean datasetServiceBean = null;
+
+    public CreateNewDataFilesCommand(DataverseRequest aRequest, DatasetVersion version, InputStream inputStream, String fileName, String suppliedContentType, String newStorageIdentifier, UploadSessionQuotaLimit quota, String newCheckSum) {
+        this(aRequest, version, inputStream, fileName, suppliedContentType, newStorageIdentifier, quota, newCheckSum, null);
+    }
+
+    public CreateNewDataFilesCommand(DataverseRequest aRequest, DatasetVersion version, InputStream inputStream, String fileName, String suppliedContentType, String newStorageIdentifier, UploadSessionQuotaLimit quota, String newCheckSum, DataFile.ChecksumType newCheckSumType) {
+        this(aRequest, version, inputStream, fileName, suppliedContentType, newStorageIdentifier, quota, newCheckSum, newCheckSumType, null, null, false);
+    }
+
+    public CreateNewDataFilesCommand(DataverseRequest aRequest, DatasetVersion version, InputStream inputStream, String fileName, String suppliedContentType, String newStorageIdentifier, UploadSessionQuotaLimit quota, String newCheckSum, DataFile.ChecksumType newCheckSumType, Long newFileSize) {
+        this(aRequest, version, inputStream, fileName, suppliedContentType, newStorageIdentifier, quota, newCheckSum, newCheckSumType, newFileSize, null, false);
+    }
+
+    public CreateNewDataFilesCommand(DataverseRequest aRequest, DatasetVersion version, InputStream inputStream, String fileName, String suppliedContentType, String newStorageIdentifier, UploadSessionQuotaLimit quota, String newCheckSum, DataFile.ChecksumType newCheckSumType, Long newFileSize, Dataverse dataverse) {
+        this(aRequest, version, inputStream, fileName, suppliedContentType, newStorageIdentifier, quota, newCheckSum, newCheckSumType, newFileSize, dataverse, false);
+    }
+
+    public CreateNewDataFilesCommand(DataverseRequest aRequest, DatasetVersion version, InputStream inputStream, String fileName, String suppliedContentType, String newStorageIdentifier, UploadSessionQuotaLimit quota, String newCheckSum, DataFile.ChecksumType newCheckSumType, Long newFileSize, boolean replace) {
+        this(aRequest, version, inputStream, fileName, suppliedContentType, newStorageIdentifier, quota, newCheckSum, newCheckSumType, newFileSize, null, replace);
+    }
+
+    // This version of the command must be used when files are created in the
+    // context of creating a brand new dataset (from the Add Dataset page):
+    
+    public CreateNewDataFilesCommand(DataverseRequest aRequest, DatasetVersion version, InputStream inputStream, String fileName, String suppliedContentType, String newStorageIdentifier, UploadSessionQuotaLimit quota, String newCheckSum, DataFile.ChecksumType newCheckSumType, Long newFileSize, Dataverse dataverse, boolean replace) {
+        super(aRequest, dataverse);
+        
+        this.version = version;
+        this.inputStream = inputStream;
+        this.fileName = fileName;
+        this.suppliedContentType = suppliedContentType; 
+        this.newStorageIdentifier = newStorageIdentifier; 
+        this.newCheckSum = newCheckSum; 
+        this.newCheckSumType = newCheckSumType;
+        this.parentDataverse = dataverse;
+        this.quota = quota;
+        this.newFileSize = newFileSize;
+        this.replaceMode = replace;
+    }
+    
+
+    @Override
+    public CreateDataFileResult execute(CommandContext ctxt) throws CommandException {
+        List<DataFile> datafiles = new ArrayList<>();
+
+        //When there is no checksum/checksumtype being sent (normal upload, needs to be calculated), set the type to the current default
+        if(newCheckSumType == null) {
+            newCheckSumType = ctxt.systemConfig().getFileFixityChecksumAlgorithm();
+        }
+
+        boolean isSuperuser = getRequest() !=null && getRequest().getAuthenticatedUser() != null && getRequest().getAuthenticatedUser().isSuperuser();
+        // ignore the file count limit check if replacing (not createMode), is superuser, or hasFileCountLimit is false
+        if (!replaceMode && !isSuperuser && version.getDataset() != null) {
+            DvObjectContainer dvo = version.getDataset();
+            Integer effectiveDatasetFileCountLimit = dvo.getEffectiveDatasetFileCountLimit();
+            boolean hasFileCountLimit = dvo.isDatasetFileCountLimitSet(effectiveDatasetFileCountLimit);
+            if (hasFileCountLimit) {
+                // Get the number of uploaded files (dvo.getId() is null if creating a new dataset and uploading at the same time)
+                DatasetServiceBean datasetService = datasetServiceBean == null ? CDI.current().select(DatasetServiceBean.class).get() : datasetServiceBean;
+                int uploadedFileCount = dvo.getId() != null ? datasetService.getDataFileCountByOwner(dvo.getId()) : 0;
+                if (uploadedFileCount >= effectiveDatasetFileCountLimit) {
+                    throw new CommandExecutionException(BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", Arrays.asList(String.valueOf(effectiveDatasetFileCountLimit))), this);
+                }
+            }
+        }
+
+        String warningMessage = null;
+
+        // save the file, in the temporary location for now: 
+        Path tempFile = null;
+
+        Long fileSizeLimit = ctxt.systemConfig().getMaxFileUploadSizeForStore(version.getDataset().getEffectiveStorageDriverId());
+        Long storageQuotaLimit = null; 
+        
+        if (ctxt.systemConfig().isStorageQuotasEnforced()) {
+            if (quota != null) {
+                storageQuotaLimit = quota.getRemainingQuotaInBytes();
+            }
+        }
+        String finalType = null;
+        File newFile = null;    // this File will be used for a single-file, local (non-direct) upload
+        long fileSize = -1; 
+
+
+        if (newStorageIdentifier == null) {
+            var filesTempDirectory = getFilesTempDirectory();
+            if (filesTempDirectory != null) {
+                try {
+                    tempFile = Files.createTempFile(Paths.get(filesTempDirectory), "tmp", "upload");
+                    // "temporary" location is the key here; this is why we are not using
+                    // the DataStore framework for this - the assumption is that
+                    // temp files will always be stored on the local filesystem.
+                    // -- L.A. Jul. 2014
+                    logger.fine("Will attempt to save the file as: " + tempFile.toString());
+                    Files.copy(inputStream, tempFile, StandardCopyOption.REPLACE_EXISTING);
+                } catch (IOException ioex) {
+                    throw new CommandExecutionException("Failed to save the upload as a temp file (temp disk space?)", ioex, this);
+                }
+
+                // A file size check, before we do anything else:
+                // (note that "no size limit set" = "unlimited")
+                // (also note, that if this is a zip file, we'll be checking
+                // the size limit for each of the individual unpacked files)
+                fileSize = tempFile.toFile().length();
+                if (fileSizeLimit != null && fileSize > fileSizeLimit) {
+                    try {
+                        tempFile.toFile().delete();
+                    } catch (Exception ex) {
+                        // ignore - but log a warning
+                        logger.warning("Could not remove temp file " + tempFile.getFileName());
+                    }
+                    throw new CommandExecutionException(MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.file_exceeds_limit"), bytesToHumanReadable(fileSize), bytesToHumanReadable(fileSizeLimit)), this);
+                }
+
+            } else {
+                throw new CommandExecutionException("Temp directory is not configured.", this);
+            }
+            
+            logger.fine("mime type supplied: " + suppliedContentType);
+            
+            // Let's try our own utilities (Jhove, etc.) to determine the file type
+            // of the uploaded file. (We may already have a mime type supplied for this
+            // file - maybe the type that the browser recognized on upload; or, if
+            // it's a harvest, maybe the remote server has already given us the type
+            // for this file... with our own type utility we may or may not do better
+            // than the type supplied:
+            // -- L.A.
+            String recognizedType = null;
+
+            try {
+                recognizedType = determineFileType(tempFile.toFile(), fileName);
+                logger.fine("File utility recognized the file as " + recognizedType);
+                if (recognizedType != null && !recognizedType.equals("")) {
+                    if (useRecognizedType(suppliedContentType, recognizedType)) {
+                        finalType = recognizedType;
+                    }
+                }
+
+            } catch (Exception ex) {
+                logger.warning("Failed to run the file utility mime type check on file " + fileName);
+            }
+
+            if (finalType == null) {
+                finalType = (suppliedContentType == null || suppliedContentType.equals(""))
+                        ? MIME_TYPE_UNDETERMINED_DEFAULT
+                        : suppliedContentType;
+            }
+
+            // A few special cases:
+            // if this is a gzipped FITS file, we'll uncompress it, and ingest it as
+            // a regular FITS file:
+            if (finalType.equals("application/fits-gzipped")) {
+
+                InputStream uncompressedIn = null;
+                String finalFileName = fileName;
+                // if the file name had the ".gz" extension, remove it,
+                // since we are going to uncompress it:
+                if (fileName != null && fileName.matches(".*\\.gz$")) {
+                    finalFileName = fileName.replaceAll("\\.gz$", "");
+                }
+
+                DataFile datafile = null;
+                long uncompressedFileSize = -1; 
+                try {
+                    uncompressedIn = new GZIPInputStream(new FileInputStream(tempFile.toFile()));
+                    File unZippedTempFile = saveInputStreamInTempFile(uncompressedIn, fileSizeLimit, storageQuotaLimit);
+                    uncompressedFileSize = unZippedTempFile.length();
+                    datafile = FileUtil.createSingleDataFile(version, unZippedTempFile, finalFileName, MIME_TYPE_UNDETERMINED_DEFAULT, ctxt.systemConfig().getFileFixityChecksumAlgorithm());
+                } catch (IOException | FileExceedsMaxSizeException | FileExceedsStorageQuotaException ioex) {
+                    // it looks like we simply skip the file silently, if its uncompressed size
+                    // exceeds the limit. we should probably report this in detail instead.
+                    datafile = null;
+                } finally {
+                    if (uncompressedIn != null) {
+                        try {
+                            uncompressedIn.close();
+                        } catch (IOException e) {
+                        }
+                    }
+                }
+
+                // If we were able to produce an uncompressed file, we'll use it
+                // to create and return a final DataFile; if not, we're not going
+                // to do anything - and then a new DataFile will be created further
+                // down, from the original, uncompressed file.
+                if (datafile != null) {
+                    // remove the compressed temp file:
+                    try {
+                        tempFile.toFile().delete();
+                    } catch (SecurityException ex) {
+                        // (this is very non-fatal)
+                        logger.warning("Failed to delete temporary file " + tempFile.toString());
+                    }
+
+                    datafiles.add(datafile);
+                    // Update quota if present
+                    if (quota != null) {
+                        quota.setTotalUsageInBytes(quota.getTotalUsageInBytes() + uncompressedFileSize);
+                    }
+                    return CreateDataFileResult.success(fileName, finalType, datafiles);
+                }
+
+                // If it's a ZIP file, we are going to unpack it and create multiple
+                // DataFile objects from its contents:
+            } else if (finalType.equals("application/zip")) {
+
+                int fileNumberLimit = ctxt.systemConfig().getZipUploadFilesLimit();
+                Long combinedUnzippedFileSize = 0L;
+
+                try {
+                    Charset charset = null;
+                    /*
+                	TODO: (?)
+                	We may want to investigate somehow letting the user specify
+                	the charset for the filenames in the zip file...
+                    - otherwise, ZipInputStream bails out if it encounteres a file
+                	name that's not valid in the current charest (i.e., UTF-8, in
+                    our case). It would be a bit trickier than what we're doing for
+                    SPSS tabular ingests - with the lang. encoding pulldown menu -
+                	because this encoding needs to be specified *before* we upload and
+                    attempt to unzip the file.
+                	        -- L.A. 4.0 beta12
+                	logger.info("default charset is "+Charset.defaultCharset().name());
+                	if (Charset.isSupported("US-ASCII")) {
+                    	logger.info("charset US-ASCII is supported.");
+                    	charset = Charset.forName("US-ASCII");
+                    	if (charset != null) {
+                       	    logger.info("was able to obtain charset for US-ASCII");
+                    	}
+
+                	 }
+                     */
+
+                    /**
+                     * Perform a quick check for how many individual files are
+                     * inside this zip archive. If it's above the limit, we can
+                     * give up right away, without doing any unpacking.
+                     * This should be a fairly inexpensive operation, we just need
+                     * to read the directory at the end of the file.
+                     */
+
+
+                    /**
+                     * The ZipFile constructors in openZipFile will throw ZipException -
+                     * a type of IOException - if there's something wrong 
+                     * with this file as a zip. There's no need to intercept it
+                     * here, it will be caught further below, with other IOExceptions,
+                     * at which point we'll give up on trying to unpack it and
+                     * then attempt to save it as is.
+                     */
+
+                    int numberOfUnpackableFiles = 0;
+
+                    /**
+                     * Note that we can't just use zipFile.size(),
+                     * unfortunately, since that's the total number of entries,
+                     * some of which can be directories. So we need to go
+                     * through all the individual zipEntries and count the ones
+                     * that are files.
+                     */
+
+                    try (var zipFile = openZipFile(tempFile, charset)) {
+                        var zipEntries = filteredZipEntries(zipFile);
+                        for (var entry : zipEntries) {
+                            logger.fine("inside first zip pass; this entry: " + entry.getName());
+                            numberOfUnpackableFiles++;
+                            if (numberOfUnpackableFiles > fileNumberLimit) {
+                                logger.warning("Zip upload - too many files in the zip to process individually.");
+                                warningMessage = "The number of files in the zip archive is over the limit (" + fileNumberLimit
+                                                 + "); please upload a zip archive with fewer files, if you want them to be ingested "
+                                                 + "as individual DataFiles.";
+                                throw new IOException();
+                            }
+                            // In addition to counting the files, we can
+                            // also check the file size while we're here,
+                            // provided the size limit is defined; if a single
+                            // file is above the individual size limit, unzipped,
+                            // we give up on unpacking this zip archive as well:
+                            if (fileSizeLimit != null && entry.getSize() > fileSizeLimit) {
+                                throw new FileExceedsMaxSizeException(MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.file_exceeds_limit"), bytesToHumanReadable(entry.getSize()), bytesToHumanReadable(fileSizeLimit)));
+                            }
+                            // Similarly, we want to check if saving all these unpacked
+                            // files is going to push the disk usage over the
+                            // quota:
+                            if (storageQuotaLimit != null) {
+                                combinedUnzippedFileSize = combinedUnzippedFileSize + entry.getSize();
+                                if (combinedUnzippedFileSize > storageQuotaLimit) {
+                                    //throw new FileExceedsStorageQuotaException(MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.quota_exceeded"), bytesToHumanReadable(combinedUnzippedFileSize), bytesToHumanReadable(storageQuotaLimit)));
+                                    // change of plans: if the unzipped content inside exceeds the remaining quota,
+                                    // we reject the upload outright, rather than accepting the zip
+                                    // file as is.
+                                    throw new CommandExecutionException(MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.unzipped.quota_exceeded"), bytesToHumanReadable(storageQuotaLimit)), this);
+                                }
+                            }
+                        }
+                        // OK we're still here - that means we can proceed unzipping.
+
+                        // reset:
+                        combinedUnzippedFileSize = 0L;
+
+                        for (var entry : zipEntries) {
+                            if (datafiles.size() > fileNumberLimit) {
+                                logger.warning("Zip upload - too many files.");
+                                warningMessage = "The number of files in the zip archive is over the limit (" + fileNumberLimit
+                                        + "); please upload a zip archive with fewer files, if you want them to be ingested "
+                                        + "as individual DataFiles.";
+                                throw new IOException();
+                            }
+                            var fileEntryName = entry.getName();
+                            var shortName = getShortName(fileEntryName);
+                            logger.fine("ZipEntry, file: " + fileEntryName);
+                            String storageIdentifier = FileUtil.generateStorageIdentifier();
+                            File unzippedFile = new File(getFilesTempDirectory() + "/" + storageIdentifier);
+                            Files.copy(zipFile.getInputStream(entry), unzippedFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+                            // No need to check the size of this unpacked file against the size limit,
+                            // since we've already checked for that in the first pass.
+                            DataFile datafile = FileUtil.createSingleDataFile(version, null, storageIdentifier, shortName,
+                                MIME_TYPE_UNDETERMINED_DEFAULT,
+                                ctxt.systemConfig().getFileFixityChecksumAlgorithm(), null, false);
+
+                            if (!fileEntryName.equals(shortName)) {
+                                // If the filename looks like a hierarchical folder name (i.e., contains slashes and backslashes),
+                                // we'll extract the directory name; then subject it to some "aggressive sanitizing" - strip all
+                                // the leading, trailing and duplicate slashes; then replace all the characters that
+                                // don't pass our validation rules.
+                                String directoryName = fileEntryName.replaceFirst("[\\\\/][\\\\/]*[^\\\\/]*$", "");
+                                directoryName = StringUtil.sanitizeFileDirectory(directoryName, true);
+                                // if (!"".equals(directoryName)) {
+                                if (!StringUtil.isEmpty(directoryName)) {
+                                    logger.fine("setting the directory label to " + directoryName);
+                                    datafile.getFileMetadata().setDirectoryLabel(directoryName);
+                                }
+                            }
+
+                            if (datafile != null) {
+                                // We have created this datafile with the mime type "unknown";
+                                // Now that we have it saved in a temporary location,
+                                // let's try and determine its real type:
+
+                                String tempFileName = getFilesTempDirectory() + "/" + datafile.getStorageIdentifier();
+
+                                try {
+                                    recognizedType = determineFileType(unzippedFile, shortName);
+                                    // null the File explicitly, to release any open FDs:
+                                    unzippedFile = null;
+                                    logger.fine("File utility recognized unzipped file as " + recognizedType);
+                                    if (recognizedType != null && !recognizedType.equals("")) {
+                                        datafile.setContentType(recognizedType);
+                                    }
+                                } catch (Exception ex) {
+                                    logger.warning("Failed to run the file utility mime type check on file " + fileName);
+                                }
+
+                                datafiles.add(datafile);
+                                combinedUnzippedFileSize += datafile.getFilesize();
+                            }
+                        }
+                    }
+
+                } catch (IOException ioex) {
+                    // just clear the datafiles list and let
+                    // ingest default to creating a single DataFile out
+                    // of the unzipped file.
+                    logger.warning("Unzipping failed; rolling back to saving the file as is.");
+                    if (warningMessage == null) {
+                        warningMessage = BundleUtil.getStringFromBundle("file.addreplace.warning.unzip.failed");
+                    }
+
+                    datafiles.clear();
+                } catch (FileExceedsMaxSizeException femsx) {
+                    logger.warning("One of the unzipped files exceeds the size limit; resorting to saving the file as is. " + femsx.getMessage());
+                    warningMessage =  BundleUtil.getStringFromBundle("file.addreplace.warning.unzip.failed.size", Arrays.asList(FileSizeChecker.bytesToHumanReadable(fileSizeLimit)));
+                    datafiles.clear();
+                } /*catch (FileExceedsStorageQuotaException fesqx) {
+                    //logger.warning("One of the unzipped files exceeds the storage quota limit; resorting to saving the file as is. " + fesqx.getMessage());
+                    //warningMessage =  BundleUtil.getStringFromBundle("file.addreplace.warning.unzip.failed.quota", Arrays.asList(FileSizeChecker.bytesToHumanReadable(storageQuotaLimit)));
+                    //datafiles.clear();
+                    throw new CommandExecutionException(fesqx.getMessage(), fesqx, this);
+                }*/
+                if (!datafiles.isEmpty()) {
+                    // remove the uploaded zip file:
+                    try {
+                        Files.delete(tempFile);
+                    } catch (IOException ioex) {
+                        // do nothing - it's just a temp file.
+                        logger.warning("Could not remove temp file " + tempFile.getFileName().toString());
+                    }
+                    // update the quota object: 
+                    if (quota != null) {
+                        quota.setTotalUsageInBytes(quota.getTotalUsageInBytes() + combinedUnzippedFileSize);
+                    }
+                    // and return:
+                    return CreateDataFileResult.success(fileName, finalType, datafiles);
+                }
+
+            } else if (finalType.equalsIgnoreCase(ShapefileHandler.SHAPEFILE_FILE_TYPE)) {
+                // Shape files may have to be split into multiple files,
+                // one zip archive per each complete set of shape files:
+
+                // File rezipFolder = new File(this.getFilesTempDirectory());
+                File rezipFolder = FileUtil.getShapefileUnzipTempDirectory();
+
+                IngestServiceShapefileHelper shpIngestHelper;
+                shpIngestHelper = new IngestServiceShapefileHelper(tempFile.toFile(), rezipFolder);
+
+                boolean didProcessWork = shpIngestHelper.processFile();
+                if (!(didProcessWork)) {
+                    logger.severe("Processing of zipped shapefile failed.");
+                    return CreateDataFileResult.error(fileName, finalType);
+                }
+                long combinedRezippedFileSize = 0L;
+
+                try {
+                    
+                    for (File finalFile : shpIngestHelper.getFinalRezippedFiles()) {
+                        FileInputStream finalFileInputStream = new FileInputStream(finalFile);
+                        finalType = FileUtil.determineContentType(finalFile);
+                        if (finalType == null) {
+                            logger.warning("Content type is null; but should default to 'MIME_TYPE_UNDETERMINED_DEFAULT'");
+                            continue;
+                        }
+
+                        File unZippedShapeTempFile = saveInputStreamInTempFile(finalFileInputStream, fileSizeLimit, storageQuotaLimit != null ? storageQuotaLimit - combinedRezippedFileSize : null);
+                        DataFile new_datafile = FileUtil.createSingleDataFile(version, unZippedShapeTempFile, finalFile.getName(), finalType, ctxt.systemConfig().getFileFixityChecksumAlgorithm());
+                        
+                        String directoryName = null;
+                        String absolutePathName = finalFile.getParent();
+                        if (absolutePathName != null) {
+                            if (absolutePathName.length() > rezipFolder.toString().length()) {
+                                // This file lives in a subfolder - we want to 
+                                // preserve it in the FileMetadata:
+                                directoryName = absolutePathName.substring(rezipFolder.toString().length() + 1);
+
+                                if (!StringUtil.isEmpty(directoryName)) {
+                                    new_datafile.getFileMetadata().setDirectoryLabel(directoryName);
+                                }
+                            }
+                        }
+                        if (new_datafile != null) {
+                            datafiles.add(new_datafile);
+                            combinedRezippedFileSize += unZippedShapeTempFile.length();
+                            // todo: can this new_datafile be null?
+                        } else {
+                            logger.severe("Could not add part of rezipped shapefile. new_datafile was null: " + finalFile.getName());
+                        }
+                        try {
+                            finalFileInputStream.close();
+                        } catch (IOException ioex) {
+                            // this one can be ignored
+                        }
+                    }
+                } catch (FileExceedsMaxSizeException | FileExceedsStorageQuotaException femsx) {
+                    logger.severe("One of the unzipped shape files exceeded the size limit, or the storage quota; giving up. " + femsx.getMessage());
+                    datafiles.clear();
+                    // (or should we throw an exception, instead of skipping it quietly?
+                } catch (IOException ioex) {
+                    throw new CommandExecutionException("Failed to process one of the components of the unpacked shape file", ioex, this);
+                    // todo? - maybe try to provide a more detailed explanation, of which repackaged component, etc.?
+                }
+
+                // Delete the temp directory used for unzipping
+                // The try-catch is due to error encountered in using NFS for stocking file,
+                // cf. https://github.com/IQSS/dataverse/issues/5909
+                try {
+                    if (rezipFolder!=null)
+                        FileUtils.deleteDirectory(rezipFolder);
+                } catch (IOException ioex) {
+                    // do nothing - it's a temp folder.
+                    logger.warning("Could not remove temp folder, error message : " + ioex.getMessage());
+                }
+
+                if (!datafiles.isEmpty()) {
+                    // remove the uploaded zip file:
+                    try {
+                        Files.delete(tempFile);
+                    } catch (IOException ioex) {
+                        // ignore - it's just a temp file - but let's log a warning
+                        logger.warning("Could not remove temp file " + tempFile.getFileName().toString());
+                    } catch (SecurityException se) {
+                        // same
+                        logger.warning("Unable to delete: " + tempFile.toString() + "due to Security Exception: "
+                                + se.getMessage());
+                    }
+                    // update the quota object: 
+                    if (quota != null) {
+                        quota.setTotalUsageInBytes(quota.getTotalUsageInBytes() + combinedRezippedFileSize);
+                    }
+                    return CreateDataFileResult.success(fileName, finalType, datafiles);
+                } else {
+                    logger.severe("No files added from directory of rezipped shapefiles");
+                }
+                return CreateDataFileResult.error(fileName, finalType);
+
+            } else if (finalType.equalsIgnoreCase(BagItFileHandler.FILE_TYPE)) {
+                
+                try { 
+                    Optional<BagItFileHandler> bagItFileHandler = CDI.current().select(BagItFileHandlerFactory.class).get().getBagItFileHandler();
+                    if (bagItFileHandler.isPresent()) {
+                        CreateDataFileResult result = bagItFileHandler.get().handleBagItPackage(ctxt.systemConfig(), version, fileName, tempFile.toFile());
+                        return result;
+                    }
+                } catch (IOException ioex) {
+                    throw new CommandExecutionException("Failed to process uploaded BagIt file", ioex, this);
+                }
+            }
+            
+            // These are the final File and its size that will be used to 
+            // add create a single Datafile: 
+            
+            newFile = tempFile.toFile();
+            fileSize = newFile.length();
+            
+        } else {
+            // Direct upload.
+            
+            finalType = StringUtils.isBlank(suppliedContentType) ? FileUtil.MIME_TYPE_UNDETERMINED_DEFAULT : suppliedContentType;
+            
+            // Since this is a direct upload, and therefore no temp file associated 
+            // with it, we may, OR MAY NOT know the size of the file. If this is 
+            // a direct upload via the UI, the page must have already looked up 
+            // the size, after the client confirmed that the upload had completed. 
+            // (so that we can reject the upload here, i.e. before the user clicks
+            // save, if it's over the size limit or storage quota). However, if 
+            // this is a direct upload via the API, we will wait until the 
+            // upload is finalized in the saveAndAddFiles method to enforce the 
+            // limits. 
+            if (newFileSize != null) {
+                fileSize = newFileSize;
+                
+                // if the size is specified, and it's above the individual size 
+                // limit for this store, we can reject it now:
+                if (fileSizeLimit != null && fileSize > fileSizeLimit) {
+                    throw new CommandExecutionException(MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.file_exceeds_limit"), bytesToHumanReadable(fileSize), bytesToHumanReadable(fileSizeLimit)), this);
+                }
+            }
+            
+        }
+        
+        // Finally, if none of the special cases above were applicable (or 
+        // if we were unable to unpack an uploaded file, etc.), we'll just 
+        // create and return a single DataFile:
+        
+        
+        // We have already checked that this file does not exceed the individual size limit; 
+        // but if we are processing it as is, as a single file, we need to check if 
+        // its size does not go beyond the allocated storage quota (if specified):
+        
+        if (storageQuotaLimit != null && fileSize > storageQuotaLimit) {
+            if (newFile != null) {
+                // Remove the temp. file, if this is a non-direct upload. 
+                // If this is a direct upload, it will be a responsibility of the 
+                // component calling the command to remove the file that may have
+                // already been saved in the S3 volume. 
+                try {
+                    newFile.delete();
+                } catch (Exception ex) {
+                    // ignore - but log a warning
+                    logger.warning("Could not remove temp file " + tempFile.getFileName());
+                }
+            }
+            throw new CommandExecutionException(MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.quota_exceeded"), bytesToHumanReadable(fileSize), bytesToHumanReadable(storageQuotaLimit)), this);
+        } 
+        
+        DataFile datafile = FileUtil.createSingleDataFile(version, newFile, newStorageIdentifier, fileName, finalType, newCheckSumType, newCheckSum);
+
+        if (datafile != null) {
+            if (newStorageIdentifier != null) {
+                // Direct upload case
+                // Improve the MIMEType
+                // Need the owner for the StorageIO class to get the file/S3 path from the
+                // storageIdentifier
+                // Currently owner is null, but using this flag will avoid making changes here
+                // if that isn't true in the future
+                boolean ownerSet = datafile.getOwner() != null;
+                if (!ownerSet) {
+                    datafile.setOwner(version.getDataset());
+                }
+                String type = determineRemoteFileType(datafile, fileName);
+                if (!StringUtils.isBlank(type)) {
+                    // Use rules for deciding when to trust browser supplied type
+                    if (useRecognizedType(finalType, type)) {
+                        datafile.setContentType(type);
+                    }
+                    logger.fine("Supplied type: " + suppliedContentType + ", finalType: " + finalType);
+                }
+                // Avoid changing
+                if (!ownerSet) {
+                    datafile.setOwner(null);
+                }
+            }
+
+            if (warningMessage != null) {
+                createIngestFailureReport(datafile, warningMessage);
+                datafile.SetIngestProblem();
+            }
+            if (datafile.getFilesize() < 0) {
+                datafile.setFilesize(fileSize);
+            }
+            datafiles.add(datafile);
+
+            // Update the quota definition for the *current upload session*
+            // This is relevant for the uploads going through the UI page 
+            // (where there may be an appreciable amount of time between the user
+            // uploading the files and clicking "save". The file size should be 
+            // available here for both direct and local uploads via the UI. 
+            // It is not yet available if this is direct-via-API - but 
+            // for API uploads the quota check will be enforced during the final 
+            // save. 
+            if (fileSize > 0 && quota != null) {
+                logger.info("Setting total usage in bytes to " + (quota.getTotalUsageInBytes() + fileSize));
+                quota.setTotalUsageInBytes(quota.getTotalUsageInBytes() + fileSize);
+            }
+
+            return CreateDataFileResult.success(fileName, finalType, datafiles);
+        }
+
+        return CreateDataFileResult.error(fileName, finalType);
+    }   // end createDataFiles
+
+    private static List<? extends ZipEntry> filteredZipEntries(ZipFile zipFile) {
+        var entries = Collections.list(zipFile.entries()).stream().filter(e -> {
+            var entryName = e.getName();
+            logger.fine("ZipEntry, file: " + entryName);
+            return !e.isDirectory() && !entryName.isEmpty() && !isFileToSkip(entryName);
+        }).toList();
+        return entries;
+    }
+
+    private static ZipFile openZipFile(Path tempFile, Charset charset) throws IOException {
+        if (charset != null) {
+            return new ZipFile(tempFile.toFile(), charset);
+        }
+        else {
+            return new ZipFile(tempFile.toFile());
+        }
+    }
+
+    private static boolean isFileToSkip(String fileName) {
+        // check if it's a "fake" file - a zip archive entry
+        // created for a MacOS X filesystem element: (these
+        // start with "._")
+        var shortName = getShortName(fileName);
+        return shortName.startsWith("._") || shortName.startsWith(".DS_Store") || "".equals(shortName);
+    }
+
+    private static String getShortName(String fileName) {
+        return fileName.replaceFirst("^.*[\\/]", "");
+    }
+
+    @Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        Map<String, Set<Permission>> ret = new HashMap<>();
+
+        ret.put("", new HashSet<>());
+        
+        if (parentDataverse != null) {
+            // The command is called in the context of uploading files on 
+            // create of a new dataset
+            ret.get("").add(Permission.AddDataset);
+        } else {
+            // An existing dataset
+            ret.get("").add(Permission.EditDataset);
+        }
+
+        return ret;
+    }
+
+    // For testing
+    protected void setDatasetService(DatasetServiceBean datasetServiceBean) {
+        this.datasetServiceBean = datasetServiceBean;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDatasetCommand.java
index 3ce10e40abe..b1f3147e97f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDatasetCommand.java
@@ -2,24 +2,27 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.Template;
+import edu.harvard.iq.dataverse.UserNotification;
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
 import static edu.harvard.iq.dataverse.util.StringUtil.nonEmpty;
-import java.util.logging.Logger;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
+
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+
+import java.sql.Timestamp;
+import java.time.Instant;
 
 /**
  * Creates a new {@link Dataset}, used to store unpublished data. This is as opposed to 
@@ -41,23 +44,27 @@
 // line above, AND un-comment out the getRequiredPermissions() method below. 
 
 public class CreateNewDatasetCommand extends AbstractCreateDatasetCommand {
-    private static final Logger logger = Logger.getLogger(CreateNewDatasetCommand.class.getName());
-    
+
     private final Template template;
-    private final Dataverse dv;
+    private boolean allowSelfNotification = false;
+
+    public CreateNewDatasetCommand(Dataset theDataset, DataverseRequest aRequest, boolean validate, boolean allowSelfNotification) {
+        this(theDataset, aRequest, null, validate);
+        this.allowSelfNotification = allowSelfNotification;
+    }
 
     public CreateNewDatasetCommand(Dataset theDataset, DataverseRequest aRequest) {
-        this( theDataset, aRequest, false); 
+        this( theDataset, aRequest, null);
     }
     
-    public CreateNewDatasetCommand(Dataset theDataset, DataverseRequest aRequest, boolean registrationRequired) {
-        this( theDataset, aRequest, registrationRequired, null);
+    public CreateNewDatasetCommand(Dataset theDataset, DataverseRequest aRequest, Template template) {
+        super(theDataset, aRequest);
+        this.template = template;
     }
     
-    public CreateNewDatasetCommand(Dataset theDataset, DataverseRequest aRequest, boolean registrationRequired, Template template) {
-        super(theDataset, aRequest, registrationRequired);
+    public CreateNewDatasetCommand(Dataset theDataset, DataverseRequest aRequest, Template template, boolean validate) {
+        super(theDataset, aRequest, false, validate);
         this.template = template;
-        dv = theDataset.getOwner();
     }
     
     /**
@@ -67,27 +74,35 @@ public CreateNewDatasetCommand(Dataset theDataset, DataverseRequest aRequest, bo
      */
     @Override
     protected void additionalParameterTests(CommandContext ctxt) throws CommandException {
-        if ( nonEmpty(getDataset().getIdentifier()) ) {
-            GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(getDataset().getProtocol(), ctxt);
-            if ( ctxt.datasets().isIdentifierUnique(getDataset().getIdentifier(), getDataset(), idServiceBean) ) {
-                throw new IllegalCommandException(String.format("Dataset with identifier '%s', protocol '%s' and authority '%s' already exists",
-                                                                 getDataset().getIdentifier(), getDataset().getProtocol(), getDataset().getAuthority()), 
-                    this);
-           }
+        if (nonEmpty(getDataset().getIdentifier())) {
+            GlobalId pid = getDataset().getGlobalId();
+            if (pid != null) {
+                PidProvider pidProvider = PidUtil.getPidProvider(pid.getProviderId());
+
+                if (!pidProvider.isGlobalIdUnique(pid)) {
+                    throw new IllegalCommandException(String.format(
+                            "Dataset with identifier '%s', protocol '%s' and authority '%s' already exists",
+                            getDataset().getIdentifier(), getDataset().getProtocol(), getDataset().getAuthority()),
+                            this);
+                }
+            }
         }
     }
     
     @Override
     protected DatasetVersion getVersionToPersist( Dataset theDataset ) {
-        return theDataset.getEditVersion();
+        return theDataset.getOrCreateEditVersion();
     }
 
     @Override
     protected void handlePid(Dataset theDataset, CommandContext ctxt) throws CommandException {
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(ctxt);
-        if ( !idServiceBean.registerWhenPublished() ) {
+        PidProvider pidProvider = PidUtil.getPidProvider(theDataset.getGlobalId().getProviderId());
+        if(!pidProvider.canManagePID()) {
+            throw new IllegalCommandException("PID Provider " + pidProvider.getId() + " is not configured.", this);
+        }
+        if ( !pidProvider.registerWhenPublished() ) {
             // pre-register a persistent id
-            registerExternalIdentifier(theDataset, ctxt);
+            registerExternalIdentifier(theDataset, ctxt, true);
         }
     }
     
@@ -105,9 +120,9 @@ protected void postPersist( Dataset theDataset, CommandContext ctxt ){
             // (saveDataset, that the command returns). This may have been the reason 
             // for the github issue #4783 - where the users were losing their contributor
             // permissions, when creating datasets AND uploading files in one step. 
-            // In that scenario, an additional UpdateDatasetCommand is exectued on the
+            // In that scenario, an additional UpdateDatasetCommand is executed on the
             // dataset returned by the Create command. That issue was fixed by adding 
-            // a full refresh of the datast with datasetService.find() between the 
+            // a full refresh of the dataset with datasetService.find() between the
             // two commands. But it may be a good idea to make sure they are properly
             // linked here (?)
             theDataset.setPermissionModificationTime(getTimestamp());
@@ -117,7 +132,43 @@ protected void postPersist( Dataset theDataset, CommandContext ctxt ){
             ctxt.templates().incrementUsageCount(template.getId());
         }
     }
-    
+
+    /**
+     * Sends notifications to those able to publish the dataset upon the successful creation of a new dataset.
+     * <p>
+     * This method checks if dataset creation notifications are enabled. If so, it
+     * notifies all users with {@code Permission.PublishDataset} on the new dataset.
+     * The user who initiated the action can be included or excluded from this
+     * notification based on the allowSelfNotification flag.
+     *
+     * @param dataset The newly created {@code Dataset}.
+     * @param ctxt    The {@code CommandContext} providing access to application services.
+     */
+    protected void postDBFlush(Dataset dataset, CommandContext ctxt) {
+        // 1. Exit early if the SendNotificationOnDatasetCreation setting is disabled.
+        if (!ctxt.settings().isTrueForKey(SettingsServiceBean.Key.SendNotificationOnDatasetCreation, false)) {
+            return;
+        }
+
+        // 2. Identify the user who initiated the action.
+        final User user = getUser();
+        final AuthenticatedUser requestor = user.isAuthenticated() ? (AuthenticatedUser) user : null;
+
+        // 3. Get all users with publish permission and notify them.
+        ctxt.permissions().getUsersWithPermissionOn(Permission.PublishDataset, dataset)
+                .stream()
+                .filter(recipient -> allowSelfNotification || !recipient.equals(requestor))
+                .forEach(recipient -> ctxt.notifications().sendNotification(
+                        recipient,
+                        Timestamp.from(Instant.now()),
+                        UserNotification.Type.DATASETCREATED,
+                        dataset.getId(),
+                        null,
+                        requestor,
+                        true
+                ));
+    }
+
     // Re-enabling the method below will change the permission setup to dynamic.
     // This will make it so that in an unpublished dataverse only users with the 
     // permission to view it will be allowed to create child datasets. 
@@ -141,5 +192,5 @@ public Map<String, Set<Permission>> getRequiredPermissions() {
         }
         return ret;
     }*/
-        
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreatePrivateUrlCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreatePrivateUrlCommand.java
index cc1adbc984a..3f5a9b042f0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreatePrivateUrlCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreatePrivateUrlCommand.java
@@ -13,6 +13,8 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.util.UUID;
 import java.util.logging.Logger;
 
@@ -22,45 +24,39 @@ public class CreatePrivateUrlCommand extends AbstractCommand<PrivateUrl> {
     private static final Logger logger = Logger.getLogger(CreatePrivateUrlCommand.class.getCanonicalName());
 
     final Dataset dataset;
+    final boolean anonymizedAccess;
 
-    public CreatePrivateUrlCommand(DataverseRequest dataverseRequest, Dataset theDataset) {
+    public CreatePrivateUrlCommand(DataverseRequest dataverseRequest, Dataset theDataset, boolean anonymizedAccess) {
         super(dataverseRequest, theDataset);
         dataset = theDataset;
+        this.anonymizedAccess = anonymizedAccess;
     }
 
     @Override
     public PrivateUrl execute(CommandContext ctxt) throws CommandException {
         logger.fine("Executing CreatePrivateUrlCommand...");
         if (dataset == null) {
-            /**
-             * @todo Internationalize this.
-             */
-            String message = "Can't create Private URL. Dataset is null.";
-            logger.info(message);
-            throw new IllegalCommandException(message, this);
+            logger.info("Can't create Private URL. Dataset is null.");
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasets.api.privateurl.error.datasetnotfound"), this);
         }
         PrivateUrl existing = ctxt.privateUrl().getPrivateUrlFromDatasetId(dataset.getId());
         if (existing != null) {
-            /**
-             * @todo Internationalize this.
-             */
-            String message = "Private URL already exists for dataset id " + dataset.getId() + ".";
-            logger.info(message);
-            throw new IllegalCommandException(message, this);
+            logger.info("Private URL already exists for dataset id " + dataset.getId() + ".");
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasets.api.privateurl.error.alreadyexists"), this);
         }
         DatasetVersion latestVersion = dataset.getLatestVersion();
         if (!latestVersion.isDraft()) {
-            /**
-             * @todo Internationalize this.
-             */
-            String message = "Can't create Private URL because the latest version of dataset id " + dataset.getId() + " is not a draft.";
-            logger.info(message);
-            throw new IllegalCommandException(message, this);
+            logger.info("Can't create Private URL because the latest version of dataset id" + dataset.getId() + " is not a draft.");
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasets.api.privateurl.error.notdraft"), this);
+        }
+        if (dataset.isReleased() && anonymizedAccess) {
+            logger.info("Can't create anonymized access Private URL because the dataset id" + dataset.getId() + " has a published version.");
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasets.api.privateurl.anonymized.error.released"), this);
         }
-        PrivateUrlUser privateUrlUser = new PrivateUrlUser(dataset.getId());
+        PrivateUrlUser privateUrlUser = new PrivateUrlUser(dataset.getId(), anonymizedAccess);
         DataverseRole memberRole = ctxt.roles().findBuiltinRoleByAlias(DataverseRole.MEMBER);
         final String privateUrlToken = UUID.randomUUID().toString();
-        RoleAssignment roleAssignment = ctxt.engine().submit(new AssignRoleCommand(privateUrlUser, memberRole, dataset, getRequest(), privateUrlToken));
+        RoleAssignment roleAssignment = ctxt.engine().submit(new AssignRoleCommand(privateUrlUser, memberRole, dataset, getRequest(), privateUrlToken, anonymizedAccess));
         PrivateUrl privateUrl = new PrivateUrl(roleAssignment, dataset, ctxt.systemConfig().getDataverseSiteUrl());
         return privateUrl;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateRoleCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateRoleCommand.java
index ff28021146d..4a897adefa2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateRoleCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateRoleCommand.java
@@ -11,6 +11,8 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.persistence.NoResultException;
 
 /**
  * Create a new role in a dataverse.
@@ -20,12 +22,12 @@
 @RequiredPermissions(Permission.ManageDataversePermissions)
 public class CreateRoleCommand extends AbstractCommand<DataverseRole> {
 
-    private final DataverseRole created;
+    private final DataverseRole role;
     private final Dataverse dv;
 
     public CreateRoleCommand(DataverseRole aRole, DataverseRequest aRequest, Dataverse anAffectedDataverse) {
         super(aRequest, anAffectedDataverse);
-        created = aRole;
+        role = aRole;
         dv = anAffectedDataverse;
     }
 
@@ -34,11 +36,21 @@ public DataverseRole execute(CommandContext ctxt) throws CommandException {
         User user = getUser();
         //todo: temporary for 4.0 - only superusers can create and edit roles
         if ((!(user instanceof AuthenticatedUser) || !user.isSuperuser())) {
-            throw new IllegalCommandException("Roles can only be created or edited by superusers.",this);
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("permission.role.must.be.created.by.superuser"),this);
         }
-
-        dv.addRole(created);
-        return ctxt.roles().save(created);
+        //Test to see if the role already exists in DB
+        try {
+            DataverseRole testRole = ctxt.em().createNamedQuery("DataverseRole.findDataverseRoleByAlias", DataverseRole.class)
+                    .setParameter("alias", role.getAlias())
+                    .getSingleResult();
+            if (testRole != null && !testRole.getId().equals(role.getId())) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("permission.role.not.created.alias.already.exists"), this);
+            }
+        } catch (NoResultException nre) {
+            //  we want no results because that meant we can create a role
+        }
+        dv.addRole(role);
+        return ctxt.roles().save(role);
     }
     
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateSavedSearchCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateSavedSearchCommand.java
index 147e1870566..7a549a51dd5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateSavedSearchCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateSavedSearchCommand.java
@@ -12,7 +12,7 @@
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearchServiceBean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonObjectBuilder;
 
 @RequiredPermissions(Permission.PublishDataverse)
 public class CreateSavedSearchCommand extends AbstractCommand<SavedSearch> {
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommand.java
index 03177ee8c1f..32c63e55cb4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommand.java
@@ -1,7 +1,6 @@
-
 package edu.harvard.iq.dataverse.engine.command.impl;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.Template;
+
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.authorization.Permission;
 
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
@@ -9,25 +8,81 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- *
  * @author skraffmiller
+ * Creates a template {@link Template} for a {@link Dataverse}.
  */
-@RequiredPermissions( Permission.EditDataverse )
+@RequiredPermissions(Permission.EditDataverse)
 public class CreateTemplateCommand extends AbstractCommand<Template> {
-    	private final Template created;
-	private final Dataverse dv;
-	
-	public CreateTemplateCommand(Template template, DataverseRequest aRequest, Dataverse anAffectedDataverse) {
-		super(aRequest, anAffectedDataverse);
-		created = template;
-		dv = anAffectedDataverse;
-	}
-
-	@Override
-	public Template execute(CommandContext ctxt) throws CommandException {
-                
-		return ctxt.templates().save(created);
-	}
-    
+    private final Template template;
+    private final Dataverse dataverse;
+
+    private final boolean initialize;
+
+    public CreateTemplateCommand(Template template, DataverseRequest request, Dataverse dataverse) {
+        this(template, request, dataverse, false);
+    }
+
+    public CreateTemplateCommand(Template template, DataverseRequest request, Dataverse dataverse, boolean initialize) {
+        super(request, dataverse);
+        this.template = template;
+        this.dataverse = dataverse;
+        this.initialize = initialize;
+    }
+
+    @Override
+    public Template execute(CommandContext ctxt) throws CommandException {
+        if (initialize) {
+            template.setDataverse(dataverse);
+            template.setMetadataValueBlocks(getSystemMetadataBlocks(ctxt));
+
+            updateTermsOfUseAndAccess(ctxt, template);
+            updateDatasetFieldInputLevels(template, ctxt);
+
+            DatasetFieldUtil.tidyUpFields(template.getDatasetFields(), false);
+        }
+
+        return ctxt.templates().save(template);
+    }
+
+    private static void updateTermsOfUseAndAccess(CommandContext ctxt, Template template) {
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+        terms.setFileAccessRequest(true);
+        terms.setTemplate(template);
+        terms.setLicense(ctxt.licenses().getDefault());
+        template.setTermsOfUseAndAccess(terms);
+    }
+
+    private void updateDatasetFieldInputLevels(Template template, CommandContext ctxt) {
+        Long dvIdForInputLevel = this.dataverse.getId();
+        if (!this.dataverse.isMetadataBlockRoot()) {
+            dvIdForInputLevel = this.dataverse.getMetadataRootId();
+        }
+
+        for (DatasetField dsf : template.getFlatDatasetFields()) {
+            DataverseFieldTypeInputLevel inputLevel = ctxt.fieldTypeInputLevels().findByDataverseIdDatasetFieldTypeId(
+                    dvIdForInputLevel,
+                    dsf.getDatasetFieldType().getId()
+            );
+            if (inputLevel != null) {
+                dsf.setInclude(inputLevel.isInclude());
+            } else {
+                dsf.setInclude(true);
+            }
+        }
+    }
+
+    private static List<MetadataBlock> getSystemMetadataBlocks(CommandContext ctxt) {
+        List<MetadataBlock> systemMetadataBlocks = new ArrayList<>();
+        for (MetadataBlock mdb : ctxt.metadataBlocks().listMetadataBlocks()) {
+            JvmSettings.MDB_SYSTEM_KEY_FOR.lookupOptional(mdb.getName()).ifPresent(smdbString -> systemMetadataBlocks.add(mdb));
+        }
+        return systemMetadataBlocks;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java
index f99c493c163..3629432b7e4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java
@@ -1,23 +1,28 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
 import edu.harvard.iq.dataverse.authorization.Permission;
-import edu.harvard.iq.dataverse.datavariable.VarGroup;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
-import edu.harvard.iq.dataverse.export.ExportException;
 import edu.harvard.iq.dataverse.export.ExportService;
+import io.gdcc.spi.export.ExportException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
 import edu.harvard.iq.dataverse.workflows.WorkflowComment;
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetField;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.DataFileCategory;
+import edu.harvard.iq.dataverse.DatasetVersionDifference;
 
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -32,7 +37,7 @@
 public class CuratePublishedDatasetVersionCommand extends AbstractDatasetCommand<Dataset> {
 
     private static final Logger logger = Logger.getLogger(CuratePublishedDatasetVersionCommand.class.getCanonicalName());
-    final private boolean validateLenient = true;
+    final private boolean validateLenient = false;
 
     public CuratePublishedDatasetVersionCommand(Dataset theDataset, DataverseRequest aRequest) {
         super(aRequest, theDataset);
@@ -47,31 +52,43 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
         if (!getUser().isSuperuser()) {
             throw new IllegalCommandException("Only superusers can curate published dataset versions", this);
         }
+        Dataset savedDataset = null;
+        // Merge the dataset into our JPA context
+        setDataset(ctxt.em().merge(getDataset()));
 
         ctxt.permissions().checkEditDatasetLock(getDataset(), getRequest(), this);
         // Invariant: Dataset has no locks preventing the update
         DatasetVersion updateVersion = getDataset().getLatestVersionForCopy();
 
+        DatasetVersion newVersion = getDataset().getOrCreateEditVersion();
         // Copy metadata from draft version to latest published version
-        updateVersion.setDatasetFields(getDataset().getEditVersion().initDatasetFields());
-
-        validateOrDie(updateVersion, isValidateLenient());
+        updateVersion.setDatasetFields(newVersion.initDatasetFields());
+        newVersion.setDatasetFields(new ArrayList<DatasetField>());
 
         // final DatasetVersion editVersion = getDataset().getEditVersion();
-        tidyUpFields(updateVersion);
-
-        // Merge the new version into out JPA context
-        ctxt.em().merge(updateVersion);
-
+        DatasetFieldUtil.tidyUpFields(updateVersion.getDatasetFields(), true);
 
         TermsOfUseAndAccess oldTerms = updateVersion.getTermsOfUseAndAccess();
-        TermsOfUseAndAccess newTerms = getDataset().getEditVersion().getTermsOfUseAndAccess();
+        TermsOfUseAndAccess newTerms = newVersion.getTermsOfUseAndAccess();
         newTerms.setDatasetVersion(updateVersion);
         updateVersion.setTermsOfUseAndAccess(newTerms);
-        //Put old terms on version that will be deleted....
-        getDataset().getEditVersion().setTermsOfUseAndAccess(oldTerms);
         
-        List<WorkflowComment> newComments = getDataset().getEditVersion().getWorkflowComments();
+        //Creation Note
+        updateVersion.setVersionNote(newVersion.getVersionNote());
+        
+        // Clear unnecessary terms relationships ....
+        newVersion.setTermsOfUseAndAccess(null);
+        oldTerms.setDatasetVersion(null);
+        // Without this there's a db exception related to the oldTerms being referenced
+        // by the datasetversion table at the flush around line 212
+        ctxt.em().flush();
+
+        // Validate metadata and TofA conditions
+        validateOrDie(updateVersion, isValidateLenient());
+        
+        //Also set the fileaccessrequest boolean on the dataset to match the new terms
+        getDataset().setFileAccessRequest(updateVersion.getTermsOfUseAndAccess().isFileAccessRequest());
+        List<WorkflowComment> newComments = newVersion.getWorkflowComments();
         if (newComments!=null && newComments.size() >0) {
             for(WorkflowComment wfc: newComments) {
                 wfc.setDatasetVersion(updateVersion);
@@ -79,60 +96,55 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
             updateVersion.getWorkflowComments().addAll(newComments);
         }
 
-        
         // we have to merge to update the database but not flush because
         // we don't want to create two draft versions!
-        Dataset tempDataset = ctxt.em().merge(getDataset());
-
+        Dataset tempDataset = getDataset();
+        updateVersion = tempDataset.getLatestVersionForCopy();
+        
         // Look for file metadata changes and update published metadata if needed
-        for (DataFile dataFile : tempDataset.getFiles()) {
-            List<FileMetadata> fmdList = dataFile.getFileMetadatas();
+        List<FileMetadata> pubFmds = updateVersion.getFileMetadatas();
+        int pubFileCount = pubFmds.size();
+        int newFileCount = tempDataset.getOrCreateEditVersion().getFileMetadatas().size();
+        /*
+         * The policy for this command is that it should only be used when the change is
+         * a 'minor update' with no file changes. Nominally we could call
+         * .isMinorUpdate() for that but we're making the same checks as we go through
+         * the update here.
+         */
+        if (pubFileCount != newFileCount) {
+            logger.severe("Draft version of dataset: " + tempDataset.getId() + " has: " + newFileCount + " while last published version has " + pubFileCount);
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasetversion.update.failure"), this);
+        }
+        Long thumbId = null;
+        if(tempDataset.getThumbnailFile()!=null) {
+            thumbId = tempDataset.getThumbnailFile().getId();
+        }
+
+        // Note - Curate allows file metadata changes but not adding/deleting files. If
+        // that ever changes, this command needs to be updated.
+        for (FileMetadata publishedFmd : pubFmds) {
+            DataFile dataFile = publishedFmd.getDataFile();
             FileMetadata draftFmd = dataFile.getLatestFileMetadata();
-            FileMetadata publishedFmd = null;
-            for (FileMetadata fmd : fmdList) {
-                if (fmd.getDatasetVersion().equals(updateVersion)) {
-                    publishedFmd = fmd;
-                    break;
-                }
-            }
             boolean metadataUpdated = false;
-            if (draftFmd != null && publishedFmd != null) {
-                if (!draftFmd.getLabel().equals(publishedFmd.getLabel())) {
-                    publishedFmd.setLabel(draftFmd.getLabel());
-                    metadataUpdated = true;
-                }
-                String draftDesc = draftFmd.getDescription();
-                String pubDesc = publishedFmd.getDescription();
-                if ((draftDesc!=null && (!draftDesc.equals(pubDesc))) || (draftDesc==null && pubDesc!=null)) {
-                    publishedFmd.setDescription(draftDesc);
-                    metadataUpdated = true;
-                }
-                if (!draftFmd.getCategories().equals(publishedFmd.getCategories())) {
-                    publishedFmd.setCategories(draftFmd.getCategories());
-                    metadataUpdated = true;
-                }
-                if (!draftFmd.isRestricted() == publishedFmd.isRestricted()) {
-                    publishedFmd.setRestricted(draftFmd.isRestricted());
-                    metadataUpdated = true;
-                    //Must also update state of file
-                    dataFile.setRestricted(draftFmd.isRestricted());
-                }
-                String draftProv = draftFmd.getProvFreeForm();
-                String pubProv = publishedFmd.getProvFreeForm();
-                if ((draftProv != null && (!draftProv.equals(pubProv)))||(draftProv==null && pubProv!=null)) {
-                    publishedFmd.setProvFreeForm(draftProv);
-                    metadataUpdated = true;
+            if (draftFmd == null || draftFmd.getDatasetVersion().equals(updateVersion)) {
+                if (draftFmd == null) {
+                    logger.severe("Unable to find latest FMD for file id: " + dataFile.getId());
+                } else {
+                    logger.severe("No filemetadata for file id: " + dataFile.getId() + " in draft version");
                 }
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasetversion.update.failure"), this);
+            } else {
 
+                metadataUpdated = !DatasetVersionDifference.compareFileMetadatas(publishedFmd, draftFmd).isEmpty();
+                publishedFmd.setLabel(draftFmd.getLabel());
+                publishedFmd.setDescription(draftFmd.getDescription());
+                publishedFmd.setCategories(draftFmd.getCategories());
+                publishedFmd.setRestricted(draftFmd.isRestricted());
+                dataFile.setRestricted(draftFmd.isRestricted());
+                publishedFmd.setProvFreeForm(draftFmd.getProvFreeForm());
                 publishedFmd.copyVariableMetadata(draftFmd.getVariableMetadatas());
-                Collection<VarGroup> vgl = publishedFmd.getVarGroups();
-                for (VarGroup vg : vgl) {
-                    ctxt.em().remove(vg);
-                }
                 publishedFmd.copyVarGroups(draftFmd.getVarGroups());
 
-            } else {
-                throw new IllegalCommandException("Cannot change files in the dataset", this);
             }
             if (metadataUpdated) {
                 dataFile.setModificationTime(getTimestamp());
@@ -142,55 +154,87 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
             ctxt.em().remove(mergedFmd);
             // including removing metadata from the list on the datafile
             draftFmd.getDataFile().getFileMetadatas().remove(draftFmd);
-            tempDataset.getEditVersion().getFileMetadatas().remove(draftFmd);
+            tempDataset.getOrCreateEditVersion().getFileMetadatas().remove(draftFmd);
             // And any references in the list held by categories
             for (DataFileCategory cat : tempDataset.getCategories()) {
                 cat.getFileMetadatas().remove(draftFmd);
             }
+            //And any thumbnail reference
+            if(publishedFmd.getDataFile().getId()==thumbId) {
+                tempDataset.setThumbnailFile(publishedFmd.getDataFile());
+            }
         }
 
         // Update modification time on the published version and the dataset
         updateVersion.setLastUpdateTime(getTimestamp());
         tempDataset.setModificationTime(getTimestamp());
+        newVersion = ctxt.em().merge(newVersion);
+        savedDataset = ctxt.em().merge(tempDataset);
 
-        Dataset savedDataset = ctxt.em().merge(tempDataset);
+        // Now delete draft version
 
-        // Flush before calling DeleteDatasetVersion which calls
-        // PrivateUrlServiceBean.getPrivateUrlFromDatasetId() that will query the DB and
-        // fail if our changes aren't there
-        ctxt.em().flush();
+        ctxt.em().remove(newVersion);
 
-        // Now delete draft version
-        DeleteDatasetVersionCommand cmd;
+        Iterator<DatasetVersion> dvIt = savedDataset.getVersions().iterator();
+        while (dvIt.hasNext()) {
+            DatasetVersion dv = dvIt.next();
+            if (dv.isDraft()) {
+                dvIt.remove();
+                break; // We've removed the draft version, no need to continue iterating
+            }
+        }
 
-        cmd = new DeleteDatasetVersionCommand(getRequest(), savedDataset);
-        ctxt.engine().submit(cmd);
-        // Running the command above reindexes the dataset, so we don't need to do it
-        // again in here.
+        savedDataset = ctxt.em().merge(savedDataset);
+        ctxt.em().flush();
+
+        RoleAssignment ra = ctxt.privateUrl().getPrivateUrlRoleAssignmentFromDataset(savedDataset);
+        if (ra != null) {
+            ctxt.roles().revoke(ra);
+        }
 
         // And update metadata at PID provider
-        ctxt.engine().submit(
-                new UpdateDvObjectPIDMetadataCommand(savedDataset, getRequest()));
-        
-        //And the exported metadata files
         try {
-            ExportService instance = ExportService.getInstance(ctxt.settings());
-            instance.exportAllFormats(getDataset());
-        } catch (ExportException ex) {
-            // Just like with indexing, a failure to export is not a fatal condition.
-            logger.log(Level.WARNING, "Curate Published DatasetVersion: exception while exporting metadata files:{0}", ex.getMessage());
+            ctxt.engine().submit(
+                    new UpdateDvObjectPIDMetadataCommand(savedDataset, getRequest()));
+        } catch (CommandException ex) {
+            // The try/catch makes this non-fatal. Should it be non-fatal - it's different from what we do in publish?
+            // This can be corrected by running the update PID API later, but who will look in the log?
+            // With the change to not use the DeleteDatasetVersionCommand above and other
+            // fixes, this error may now cleanly restore the initial state
+            // with the draft and last published versions unchanged, but this has not yet bee tested.
+            // (Alternately this could move to onSuccess if we intend it to stay non-fatal.)
+            logger.log(Level.WARNING, "Curate Published DatasetVersion: exception while updating PID metadata:{0}", ex.getMessage());
         }
-        
-
-        // Update so that getDataset() in updateDatasetUser will get the up-to-date copy
-        // (with no draft version)
+        // Update so that getDataset() in updateDatasetUser() will get the up-to-date
+        // copy (with no draft version)
         setDataset(savedDataset);
+
         updateDatasetUser(ctxt);
         
-
-
+        // ToDo - see if there are other DatasetVersionUser entries unique to the draft
+        // version that should be moved to the last published version
+        // As this command is intended for minor fixes, often done by the person pushing
+        // the update-current-version button, this is probably a minor issue.
 
         return savedDataset;
     }
 
+    @Override
+    public boolean onSuccess(CommandContext ctxt, Object r) {
+        boolean retVal = true;
+        Dataset d = (Dataset) r;
+        
+        ctxt.index().asyncIndexDataset(d, true);
+        
+        // And the exported metadata files
+        try {
+            ExportService instance = ExportService.getInstance();
+            instance.exportAllFormats(d);
+        } catch (ExportException ex) {
+            // Just like with indexing, a failure to export is not a fatal condition.
+            retVal = false;
+            logger.log(Level.WARNING, "Curate Published DatasetVersion: exception while exporting metadata files:{0}", ex.getMessage());
+        }
+        return retVal;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DRSSubmitToArchiveCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DRSSubmitToArchiveCommand.java
new file mode 100644
index 00000000000..594d4fe25ba
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DRSSubmitToArchiveCommand.java
@@ -0,0 +1,384 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.SettingsWrapper;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.engine.command.Command;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import edu.harvard.iq.dataverse.workflow.step.Failure;
+import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyFactory;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.time.Instant;
+import java.util.Base64;
+import java.util.Date;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+import javax.net.ssl.SSLContext;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.TrustAllStrategy;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContextBuilder;
+
+import org.erdtman.jcs.JsonCanonicalizer;
+
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.JWTCreationException;
+
+@RequiredPermissions(Permission.PublishDataset)
+public class DRSSubmitToArchiveCommand extends S3SubmitToArchiveCommand implements Command<DatasetVersion> {
+
+    private static final Logger logger = Logger.getLogger(DRSSubmitToArchiveCommand.class.getName());
+    private static final String DRS_CONFIG = ":DRSArchiverConfig";
+    private static final String ADMIN_METADATA = "admin_metadata";
+    private static final String S3_BUCKET_NAME = "s3_bucket_name";
+    private static final String S3_PATH = "s3_path";
+    private static final String COLLECTIONS = "collections";
+    private static final String PACKAGE_ID = "package_id";
+    private static final String SINGLE_VERSION = "single_version";
+    private static final String DRS_ENDPOINT = "DRS_endpoint";
+    
+
+    private static final String RSA_KEY = "dataverse.archiver.drs.rsa_key";
+
+    private static final String TRUST_CERT = "trust_cert";
+    private static final String TIMEOUT = "timeout";
+
+    public DRSSubmitToArchiveCommand(DataverseRequest aRequest, DatasetVersion version) {
+        super(aRequest, version);
+    }
+
+    @Override
+    public WorkflowStepResult performArchiveSubmission(DatasetVersion dv, ApiToken token,
+            Map<String, String> requestedSettings) {
+        logger.fine("In DRSSubmitToArchiveCommand...");
+        JsonObject drsConfigObject = null;
+
+        try {
+            drsConfigObject = JsonUtil.getJsonObject(requestedSettings.get(DRS_CONFIG));
+        } catch (Exception e) {
+            logger.warning("Unable to parse " + DRS_CONFIG + " setting as a Json object");
+        }
+        if (drsConfigObject != null) {
+            JsonObject adminMetadata = drsConfigObject.getJsonObject(ADMIN_METADATA);
+            Set<String> collections = adminMetadata.getJsonObject(COLLECTIONS).keySet();
+            Dataset dataset = dv.getDataset();
+            Dataverse ancestor = dataset.getOwner();
+            String alias = getArchivableAncestor(ancestor, collections);
+            String spaceName = getSpaceName(dataset);
+            String packageId = getFileName(spaceName, dv);
+
+            if (alias != null) {
+                if (drsConfigObject.getBoolean(SINGLE_VERSION, false)) {
+                    for (DatasetVersion version : dataset.getVersions()) {
+                        if (version.getArchivalCopyLocation() != null) {
+                            return new Failure("DRS Archiver fail: version " + version.getFriendlyVersionNumber()
+                                    + " already archived.");
+                        }
+                    }
+                }
+
+                JsonObject collectionConfig = adminMetadata.getJsonObject(COLLECTIONS).getJsonObject(alias);
+
+                WorkflowStepResult s3Result = super.performArchiveSubmission(dv, token, requestedSettings);
+
+                JsonObjectBuilder statusObject = Json.createObjectBuilder();
+                statusObject.add(DatasetVersion.ARCHIVAL_STATUS, DatasetVersion.ARCHIVAL_STATUS_FAILURE);
+                statusObject.add(DatasetVersion.ARCHIVAL_STATUS_MESSAGE, "Bag not transferred");
+
+                if (s3Result == WorkflowStepResult.OK) {
+                    //This will be overwritten if the further steps are successful
+                    statusObject.add(DatasetVersion.ARCHIVAL_STATUS, DatasetVersion.ARCHIVAL_STATUS_FAILURE);
+                    statusObject.add(DatasetVersion.ARCHIVAL_STATUS_MESSAGE, "Bag transferred, DRS ingest call failed");
+
+                    // Now contact DRS
+                    boolean trustCert = drsConfigObject.getBoolean(TRUST_CERT, false);
+                    int jwtTimeout = drsConfigObject.getInt(TIMEOUT, 5);
+                    JsonObjectBuilder job = Json.createObjectBuilder();
+
+                    job.add(S3_BUCKET_NAME, adminMetadata.getString(S3_BUCKET_NAME));
+
+                    job.add(PACKAGE_ID, packageId);
+                    job.add(S3_PATH, spaceName);
+
+                    // We start with the default admin_metadata
+                    JsonObjectBuilder amob = Json.createObjectBuilder(adminMetadata);
+                    // Remove collections and then override any params for the given alias
+                    amob.remove(COLLECTIONS);
+                    // Allow override of bucket name
+                    if (collectionConfig.containsKey(S3_BUCKET_NAME)) {
+                        job.add(S3_BUCKET_NAME, collectionConfig.get(S3_BUCKET_NAME));
+                    }
+
+                    for (Entry<String, JsonValue> entry : collectionConfig.entrySet()) {
+                        if (!entry.getKey().equals(S3_BUCKET_NAME)) {
+                            amob.add(entry.getKey(), entry.getValue());
+                        }
+                    }
+                    job.add(ADMIN_METADATA, amob);
+
+                    String drsConfigString = JsonUtil.prettyPrint(job.build());
+
+                    CloseableHttpClient client = null;
+                    if (trustCert) {
+                        // use the TrustSelfSignedStrategy to allow Self Signed Certificates
+                        try {
+                            SSLContext sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy())
+                                    .build();
+                            client = HttpClients.custom().setSSLContext(sslContext)
+                                    .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE).build();
+                        } catch (KeyManagementException e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        } catch (NoSuchAlgorithmException e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        } catch (KeyStoreException e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        }
+                    }
+                    if (client == null) {
+                        client = HttpClients.createDefault();
+                    }
+                    HttpPost ingestPost;
+                    try {
+                        ingestPost = new HttpPost();
+                        ingestPost.setURI(new URI(drsConfigObject.getString(DRS_ENDPOINT)));
+
+                        byte[] encoded = Base64.getDecoder().decode(System.getProperty(RSA_KEY).replaceAll("[\\r\\n]", ""));
+
+                        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+                        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(encoded);
+                        RSAPrivateKey privKey = (RSAPrivateKey) keyFactory.generatePrivate(keySpec);
+                        //RSAPublicKey publicKey;
+                        /*
+                         * If public key is needed: encoded = Base64.decodeBase64(publicKeyPEM);
+                         * 
+                         * KeyFactory keyFactory = KeyFactory.getInstance("RS256"); X509EncodedKeySpec
+                         * keySpec = new X509EncodedKeySpec(encoded); return (RSAPublicKey)
+                         * keyFactory.generatePublic(keySpec); RSAPublicKey publicKey = new
+                         * RSAPublicKey(System.getProperty(RS256_KEY));
+                         */
+                        Algorithm algorithmRSA = Algorithm.RSA256(null, privKey);
+                        
+                        String body = drsConfigString;
+                        String jwtString = createJWTString(algorithmRSA, BrandingUtil.getInstallationBrandName(), body, jwtTimeout);
+                        logger.fine("JWT: " + jwtString);
+
+                        ingestPost.setHeader("Authorization", "Bearer " + jwtString);
+
+                        logger.fine("Body: " + body);
+                        ingestPost.setEntity(new StringEntity(body, "utf-8"));
+                        ingestPost.setHeader("Content-Type", "application/json");
+
+                        try (CloseableHttpResponse response = client.execute(ingestPost)) {
+                            int code = response.getStatusLine().getStatusCode();
+                            String responseBody = new String(response.getEntity().getContent().readAllBytes(),
+                                    StandardCharsets.UTF_8);
+                            if (code == 202) {
+                                logger.fine("Status: " + code);
+                                logger.fine("Response" + responseBody);
+                                JsonObject responseObject = JsonUtil.getJsonObject(responseBody);
+                                if (responseObject.containsKey(DatasetVersion.ARCHIVAL_STATUS)
+                                        && responseObject.containsKey(DatasetVersion.ARCHIVAL_STATUS_MESSAGE)) {
+                                    String status = responseObject.getString(DatasetVersion.ARCHIVAL_STATUS);
+                                    if (status.equals(DatasetVersion.ARCHIVAL_STATUS_PENDING) || status.equals(DatasetVersion.ARCHIVAL_STATUS_FAILURE)
+                                            || status.equals(DatasetVersion.ARCHIVAL_STATUS_SUCCESS)) {
+                                        statusObject.addAll(Json.createObjectBuilder(responseObject));
+                                        switch (status) {
+                                        case DatasetVersion.ARCHIVAL_STATUS_PENDING:
+                                            logger.info("DRS Ingest successfully started for: " + packageId + " : "
+                                                    + responseObject.toString());
+                                            break;
+                                        case DatasetVersion.ARCHIVAL_STATUS_FAILURE:
+                                            logger.severe("DRS Ingest Failed for: " + packageId + " : "
+                                                    + responseObject.toString());
+                                            return new Failure("DRS Archiver fail in Ingest call");
+                                        case DatasetVersion.ARCHIVAL_STATUS_SUCCESS:
+                                            // We don't expect this from DRS
+                                            logger.warning("Unexpected Status: " + status);
+                                        }
+                                    } else {
+                                        logger.severe("DRS Ingest Failed for: " + packageId + " with returned status: "
+                                                + status);
+                                        return new Failure(
+                                                "DRS Archiver fail in Ingest call with returned status: " + status);
+                                    }
+                                } else {
+                                    logger.severe("DRS Ingest Failed for: " + packageId
+                                            + " - response does not include status and message");
+                                    return new Failure(
+                                            "DRS Archiver fail in Ingest call \" - response does not include status and message");
+                                }
+                            } else {
+                                logger.severe("DRS Ingest Failed for: " + packageId + " with status code: " + code);
+                                logger.fine("Response" + responseBody);
+                                return new Failure("DRS Archiver fail in Ingest call with status code: " + code);
+                            }
+                        } catch (ClientProtocolException e2) {
+                            e2.printStackTrace();
+                        } catch (IOException e2) {
+                            e2.printStackTrace();
+                        }
+                    } catch (URISyntaxException e) {
+                        return new Failure(
+                                "DRS Archiver workflow step failed: unable to parse " + DRS_ENDPOINT );
+                    } catch (JWTCreationException exception) {
+                        // Invalid Signing configuration / Couldn't convert Claims.
+                        return new Failure(
+                                "DRS Archiver JWT Creation failure: " + exception.getMessage() );
+
+                    }
+                    // execute
+                    catch (InvalidKeySpecException e) {
+                        e.printStackTrace();
+                    } catch (NoSuchAlgorithmException e) {
+                        e.printStackTrace();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    } finally {
+                        //Set status after success or failure
+                        dv.setArchivalCopyLocation(statusObject.build().toString());
+                    }
+                } else {
+                    logger.warning("DRS: S3 archiving failed - will not call ingest: " + packageId);
+                    dv.setArchivalCopyLocation(statusObject.build().toString());
+                    return new Failure("DRS Archiver fail in initial S3 Archiver transfer");
+                }
+                
+            } else {
+                logger.fine("DRS Archiver: No matching collection found - will not archive: " + packageId);
+                return WorkflowStepResult.OK;
+            }
+        } else {
+            logger.warning(DRS_CONFIG + " not found");
+            return new Failure("DRS Submission not configured - no " + DRS_CONFIG + " found.");
+        }
+        return WorkflowStepResult.OK;
+    }
+
+    @Override
+    protected String getFileName(String spaceName, DatasetVersion dv) {
+        return spaceName + (".v" + dv.getFriendlyVersionNumber()).replace('.', '_');
+    }
+
+    @Override
+    protected String getDataCiteFileName(String spaceName, DatasetVersion dv) {
+        return spaceName + ("_datacite.v" + dv.getFriendlyVersionNumber()).replace('.','_');
+    }
+
+    
+    public static String createJWTString(Algorithm algorithmRSA, String installationBrandName, String body, int expirationInMinutes) throws IOException {
+        String canonicalBody = new JsonCanonicalizer(body).getEncodedString();
+        logger.fine("Canonical body: " + canonicalBody);
+        String digest = DigestUtils.sha256Hex(canonicalBody);
+        if(installationBrandName==null) {
+            installationBrandName = BrandingUtil.getInstallationBrandName();
+        }
+        return JWT.create().withIssuer(installationBrandName).withIssuedAt(Date.from(Instant.now()))
+                .withExpiresAt(Date.from(Instant.now().plusSeconds(60 * expirationInMinutes)))
+                .withKeyId("defaultDataverse").withClaim("bodySHA256Hash", digest).sign(algorithmRSA);
+    }
+
+    private static String getArchivableAncestor(Dataverse ancestor, Set<String> collections) {
+        String alias = ancestor.getAlias();
+        while (ancestor != null && !collections.contains(alias)) {
+            ancestor = ancestor.getOwner();
+            if (ancestor != null) {
+                alias = ancestor.getAlias();
+            } else {
+                alias = null;
+            }
+        }
+        return alias;
+    }
+
+    //Overrides inherited method to also check whether the dataset is in a collection for which the DRS Archiver is configured
+    public static boolean isArchivable(Dataset d, SettingsWrapper sw) {
+        JsonObject drsConfigObject = null;
+
+        try {
+            String config = sw.get(DRS_CONFIG, null);
+            if (config != null) {
+                drsConfigObject = JsonUtil.getJsonObject(config);
+            }
+        } catch (Exception e) {
+            logger.warning("Unable to parse " + DRS_CONFIG + " setting as a Json object");
+        }
+        if (drsConfigObject != null) {
+            JsonObject adminMetadata = drsConfigObject.getJsonObject(ADMIN_METADATA);
+            if (adminMetadata != null) {
+                JsonObject collectionObj = adminMetadata.getJsonObject(COLLECTIONS);
+                if (collectionObj != null) {
+                    Set<String> collections = collectionObj.keySet();
+                    return getArchivableAncestor(d.getOwner(), collections) != null;
+                }
+            }
+        }
+        return false;
+    }
+    
+    // DRS Archiver supports single-version semantics if the SINGLE_VERSION key in
+    // the DRS_CONFIG is true
+    // These methods make that choices visible on the page (cached via
+    // SettingsWrapper) or in the API (using SettingServiceBean), both using the
+    // same underlying logic
+    
+    public static boolean isSingleVersion(SettingsWrapper sw) {
+            String config = sw.get(DRS_CONFIG, null);
+            return isSingleVersion(config);
+    }
+
+    public static boolean isSingleVersion(SettingsServiceBean ss) {
+        String config = ss.get(DRS_CONFIG, null);
+        return isSingleVersion(config);
+    }
+
+    private static boolean isSingleVersion(String config) {
+        JsonObject drsConfigObject = null;
+        try {
+            if (config != null) {
+                drsConfigObject = JsonUtil.getJsonObject(config);
+            }
+        } catch (Exception e) {
+            logger.warning("Unable to parse " + DRS_CONFIG + " setting as a Json object");
+        }
+        if (drsConfigObject != null) {
+            return drsConfigObject.getBoolean(SINGLE_VERSION, false);
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeaccessionDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeaccessionDatasetVersionCommand.java
index 6aa5e0e250a..39306273b61 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeaccessionDatasetVersionCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeaccessionDatasetVersionCommand.java
@@ -16,8 +16,8 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
-import edu.harvard.iq.dataverse.export.ExportException;
 import edu.harvard.iq.dataverse.export.ExportService;
+import io.gdcc.spi.export.ExportException;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.IOException;
@@ -75,7 +75,7 @@ public DatasetVersion execute(CommandContext ctxt) throws CommandException {
         boolean doNormalSolrDocCleanUp = true;
 
         
-        ExportService instance = ExportService.getInstance(ctxt.settings());
+        ExportService instance = ExportService.getInstance();
         
 
         if (managed.getDataset().getReleasedVersion() != null) {
@@ -97,6 +97,9 @@ public DatasetVersion execute(CommandContext ctxt) throws CommandException {
 
         Dataset managedDs = ctxt.em().merge(managed.getDataset());
 
+        // delete all FeaturedItems with links to this deaccessioned dataset
+        ctxt.dataverseFeaturedItems().deleteAllByDvObjectId(ds.getId());
+
         return managed;
     }
 
@@ -106,15 +109,7 @@ public boolean onSuccess(CommandContext ctxt, Object r) {
         DatasetVersion version = (DatasetVersion) r;
         Dataset dataset = version.getDataset();
 
-        try {
-            ctxt.index().indexDataset(dataset, true);
-            Future<String> indexString = ctxt.index().indexDataset(dataset, true);
-        } catch (IOException | SolrServerException e) {
-            String failureLogText = "Post-publication indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, dataset);
-            retVal = false;
-        }
+        ctxt.index().asyncIndexDataset(dataset, true);
         return retVal;
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeactivateUserCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeactivateUserCommand.java
new file mode 100644
index 00000000000..1dab8120767
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeactivateUserCommand.java
@@ -0,0 +1,44 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import java.sql.Timestamp;
+import java.util.Date;
+
+// Superuser-only enforced below.
+@RequiredPermissions({})
+public class DeactivateUserCommand extends AbstractCommand<AuthenticatedUser> {
+
+    private DataverseRequest request;
+    private AuthenticatedUser userToDeactivate;
+
+    public DeactivateUserCommand(DataverseRequest request, AuthenticatedUser userToDeactivate) {
+        super(request, (DvObject) null);
+        this.request = request;
+        this.userToDeactivate = userToDeactivate;
+    }
+
+    @Override
+    public AuthenticatedUser execute(CommandContext ctxt) throws CommandException {
+        if (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser()) {
+            throw new PermissionException("Deactivate user command can only be called by superusers.", this, null, null);
+        }
+        if (userToDeactivate == null) {
+            throw new CommandException("Cannot deactivate user. User not found.", this);
+        }
+        ctxt.engine().submit(new RevokeAllRolesCommand(userToDeactivate, request));
+        ctxt.authentication().removeAuthentictedUserItems(userToDeactivate);
+        ctxt.notifications().findByUser(userToDeactivate.getId()).forEach(ctxt.notifications()::delete);
+        userToDeactivate.setDeactivated(true);
+        userToDeactivate.setDeactivatedTime(new Timestamp(new Date().getTime()));
+        AuthenticatedUser deactivatedUser = ctxt.authentication().save(userToDeactivate);
+        return deactivatedUser;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteCollectionQuotaCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteCollectionQuotaCommand.java
new file mode 100644
index 00000000000..c0f863686da
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteCollectionQuotaCommand.java
@@ -0,0 +1,53 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.storageuse.StorageQuota;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author landreev
+ *
+ * A superuser-only command:
+ */
+@RequiredPermissions({})
+public class DeleteCollectionQuotaCommand  extends AbstractVoidCommand {
+
+    private static final Logger logger = Logger.getLogger(DeleteCollectionQuotaCommand.class.getCanonicalName());
+    
+    private final Dataverse targetDataverse;
+    
+    public DeleteCollectionQuotaCommand(DataverseRequest aRequest, Dataverse target) {
+        super(aRequest, target);
+        targetDataverse = target;
+    } 
+        
+    @Override
+    public void executeImpl(CommandContext ctxt) throws CommandException {
+        // first check if  user is a superuser
+        if ( (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser() ) ) {      
+            throw new PermissionException(BundleUtil.getStringFromBundle("dataverse.storage.quota.superusersonly"),
+                this,  null, targetDataverse);                
+        }
+        
+        if (targetDataverse == null) {
+            throw new IllegalCommandException("", this);
+        }
+        
+        StorageQuota storageQuota = targetDataverse.getStorageQuota();
+        
+        if (storageQuota != null && storageQuota.getAllocation() != null) {
+            ctxt.dataverses().disableStorageQuota(storageQuota);
+        } 
+        // ... and if no quota was enabled on the collection - nothing to do = success
+    }    
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataFileCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataFileCommand.java
index deba1d7b6be..0812c52a846 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataFileCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataFileCommand.java
@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
 import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
@@ -11,6 +12,8 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandExecutionException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import java.io.IOException;
@@ -23,7 +26,6 @@
 import java.util.Collections;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
 
 /**
  * Deletes a data file, both DB entity and filesystem object.
@@ -202,13 +204,17 @@ public FileVisitResult postVisitDirectory(final Path dir, final IOException e)
                 */
             }
         }
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(ctxt);
-        try {
-            if (idServiceBean.alreadyExists(doomed)) {
-                idServiceBean.deleteIdentifier(doomed);
+        GlobalId pid = doomed.getGlobalId();
+        if (pid != null) {
+            PidProvider pidProvider = PidUtil.getPidProvider(pid.getProviderId());
+
+            try {
+                if (pidProvider.alreadyRegistered(doomed)) {
+                    pidProvider.deleteIdentifier(doomed);
+                }
+            } catch (Exception e) {
+                logger.log(Level.WARNING, "Identifier deletion was not successfull:", e.getMessage());
             }
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "Identifier deletion was not successfull:", e.getMessage());
         }
         DataFile doomedAndMerged = ctxt.em().merge(doomed);
         ctxt.em().remove(doomedAndMerged);
@@ -220,19 +226,6 @@ public FileVisitResult postVisitDirectory(final Path dir, final IOException e)
          */
         // ctxt.em().flush();
 
-        /**
-         * We *could* re-index the entire dataset but it's more efficient to
-         * target individual files for deletion, which should always be drafts.
-         *
-         * See also https://redmine.hmdc.harvard.edu/issues/3786
-         */
-        String indexingResult = ctxt.index().removeSolrDocFromIndex(IndexServiceBean.solrDocIdentifierFile + doomed.getId() + "_draft");
-        /**
-         * @todo check indexing result for success or failure. Really, we need
-         * an indexing queuing system:
-         * https://redmine.hmdc.harvard.edu/issues/3643
-         */
-
     }
     
     @Override 
@@ -245,4 +238,42 @@ public String describe() {
         return sb.toString();
     }
 
+    @Override
+    public boolean onSuccess(CommandContext ctxt, Object r) {
+        // Adjust the storage use for the parent containers: 
+        if (!doomed.isHarvested()) {
+            long storedSize = doomed.getFilesize();
+            // ingested tabular data files also have saved originals that 
+            // are counted as "storage use"
+            Long savedOriginalSize = doomed.getOriginalFileSize(); 
+            if (savedOriginalSize != null) {
+                // Note that DataFile.getFilesize() can return -1 (for "unknown"):
+                storedSize = storedSize > 0 ? storedSize + savedOriginalSize : savedOriginalSize; 
+            }
+            if (storedSize > 0) {
+                ctxt.storageUse().incrementStorageSizeRecursively(doomed.getOwner().getId(), (0L - storedSize));
+            }
+        }
+        /**
+         * We *could* re-index the entire dataset but it's more efficient to
+         * target individual files for deletion, which should always be drafts.
+         *
+         * See also https://redmine.hmdc.harvard.edu/issues/3786
+         */
+        String indexingResult = ctxt.index().removeSolrDocFromIndex(IndexServiceBean.solrDocIdentifierFile + doomed.getId() + IndexServiceBean.draftSuffix);
+        String indexingResult2 = ctxt.index().removeSolrDocFromIndex(IndexServiceBean.solrDocIdentifierFile + doomed.getId() + IndexServiceBean.draftSuffix + IndexServiceBean.discoverabilityPermissionSuffix);
+        /**
+        * @todo: check indexing result for success or failure. This method 
+        * currently always returns true because the underlying methods 
+        * (already existing) handle exceptions and don't return a boolean value.
+        * Previously an indexing queuing system was proposed:
+        *  https://redmine.hmdc.harvard.edu/issues/3643
+        * but we are considering reworking the code such that methods throw
+        * indexing exception to callers that may need to handle effects such
+        * as on data integrity where related operations like database updates
+        * or deletes are expected to be coordinated with indexing operations
+        */
+
+        return true;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDatasetLinkingDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDatasetLinkingDataverseCommand.java
index aada2663bf6..7eb3ad71a94 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDatasetLinkingDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDatasetLinkingDataverseCommand.java
@@ -7,18 +7,18 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetLinkingDataverse;
+import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.authorization.Permission;
-import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.concurrent.Future;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.solr.client.solrj.SolrServerException;
 
 /**
@@ -26,14 +26,14 @@
  * @author sarahferry
  */
 
-@RequiredPermissions( Permission.EditDataset )
+@RequiredPermissions( Permission.LinkDataset )
 public class DeleteDatasetLinkingDataverseCommand extends AbstractCommand<Dataset>{
     private final DatasetLinkingDataverse doomed;
     private final Dataset editedDs;
     private final boolean index;
     
     public DeleteDatasetLinkingDataverseCommand(DataverseRequest aRequest, Dataset editedDs , DatasetLinkingDataverse doomed, boolean index) {
-        super(aRequest, editedDs);
+        super(aRequest, doomed.getLinkingDataverse());
         this.editedDs = editedDs;
         this.doomed = doomed;
         this.index = index;
@@ -41,20 +41,21 @@ public DeleteDatasetLinkingDataverseCommand(DataverseRequest aRequest, Dataset e
     
     @Override
     public Dataset execute(CommandContext ctxt) throws CommandException {
-        if ((!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser())) {
-            throw new PermissionException("Delete dataset linking dataverse can only be called by superusers.",
-                    this, Collections.singleton(Permission.EditDataset), editedDs);
-        }
         Dataset merged = ctxt.em().merge(editedDs);
         DatasetLinkingDataverse doomedAndMerged = ctxt.em().merge(doomed);
         ctxt.em().remove(doomedAndMerged);
 
-        try {
-            ctxt.index().indexDataverse(doomed.getLinkingDataverse());
-        } catch (IOException | SolrServerException e) {    
-            String failureLogText = "Post delete linking dataverse indexing failed for Dataverse. ";
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText,  doomed.getLinkingDataverse());
+        List<Dataverse> toReindex = new ArrayList<>();
+        toReindex.add(doomed.getLinkingDataverse());
+        toReindex.addAll(doomed.getLinkingDataverse().getOwners());
+        for (Dataverse dv : toReindex) {
+            try {
+                ctxt.index().indexDataverse(dv);
+            } catch (IOException | SolrServerException e) {
+                String failureLogText = "Post delete linking dataverse indexing failed for Dataverse. ";
+                failureLogText += "\r\n" + e.getLocalizedMessage();
+                LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, dv);
+            }
         }
 
         return merged;
@@ -66,15 +67,7 @@ public boolean onSuccess(CommandContext ctxt, Object r) {
         Dataset dataset = (Dataset) r;
 
         if (index) {
-            try {
-                ctxt.index().indexDataset(dataset, true);
-            } catch (IOException | SolrServerException e) {
-                String failureLogText = "Post delete linked dataset indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-                failureLogText += "\r\n" + e.getLocalizedMessage();
-                LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, dataset);
-                retVal = false;
-            }
-
+            ctxt.index().asyncIndexDataset(dataset, true);
         }
 
         return retVal;
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDatasetVersionCommand.java
index 3f63c3c6d27..a67d7008ef8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDatasetVersionCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDatasetVersionCommand.java
@@ -96,13 +96,7 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
                     }
                 }
                 boolean doNormalSolrDocCleanUp = true;
-                try {
-                    ctxt.index().indexDataset(doomed, doNormalSolrDocCleanUp);
-                } catch (IOException | SolrServerException e) {
-                    String failureLogText = "Post delete version indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + doomed.getId().toString();
-                    failureLogText += "\r\n" + e.getLocalizedMessage();
-                    LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, doomed);
-                }
+                ctxt.index().asyncIndexDataset(doomed, doNormalSolrDocCleanUp);
 
                 return;
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseCommand.java
index 102ea993e1c..1f7e833ef1b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseCommand.java
@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
 import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevel;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.RoleAssignment;
@@ -13,7 +14,10 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissionsMap;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.search.DvObjectSolrDoc;
+import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Deletes a {@link Dataverse} - but only if it is empty.
@@ -38,8 +42,8 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         if (doomed.getOwner() == null) {
             throw new IllegalCommandException("Cannot delete the root dataverse", this);
         }
-
-        // make sure the dataverse is emptyw
+        
+        // make sure the dataverse is empty
         if (ctxt.dvObjects().hasData(doomed)) {
             throw new IllegalCommandException("Cannot delete non-empty dataverses", this);
         }
@@ -74,11 +78,42 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
             DataverseFieldTypeInputLevel merged = ctxt.em().merge(inputLevel);
             ctxt.em().remove(merged);
         }
+
         doomed.setDataverseFieldTypeInputLevels(new ArrayList<>());
+
+        // Featured Items
+        for (DataverseFeaturedItem featuredItem : ctxt.dataverseFeaturedItems().findAllByDataverseOrdered(doomed) ) {
+            DataverseFeaturedItem merged = ctxt.em().merge(featuredItem);
+            ctxt.em().remove(merged);
+        }
+        doomed.setDataverseFeaturedItems(new ArrayList<>());
+
         // DATAVERSE
         Dataverse doomedAndMerged = ctxt.em().merge(doomed);
         ctxt.em().remove(doomedAndMerged);
+    }
+
+    @Override 
+    public boolean onSuccess(CommandContext ctxt, Object r) {
+
         // Remove from index        
         ctxt.index().delete(doomed);
+        List<String> solrIdsToDelete = new ArrayList<>();
+        List<DvObjectSolrDoc> definitionPoints = ctxt.solrIndex().determineSolrDocs(doomed);
+        definitionPoints.forEach(dvObjectSolrDoc -> {
+            boolean add = solrIdsToDelete.add(dvObjectSolrDoc.getSolrId() + IndexServiceBean.discoverabilityPermissionSuffix);
+        });
+        var deleteMultipleSolrIds = ctxt.solrIndex().deleteMultipleSolrIds(solrIdsToDelete);
+        /**
+        * @todo: this method currently always returns true because the 
+        * underlying methods (already existing) handle exceptions and don't 
+        * return a boolean value
+        * we need to consider reworking the code such that methods throw
+        * indexing exception to callers that may need to handle effects such
+        * as on data integrity where related operations like database updates
+        * or deletes are expected to be coordinated with indexing operations
+        */
+        return true;
     }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseFeaturedItemCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseFeaturedItemCommand.java
new file mode 100644
index 00000000000..215863a44da
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseFeaturedItemCommand.java
@@ -0,0 +1,26 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.*;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+/**
+ * Deletes a particular featured item {@link DataverseFeaturedItem} of a {@link Dataverse}.
+ */
+@RequiredPermissions({Permission.EditDataverse})
+public class DeleteDataverseFeaturedItemCommand extends AbstractVoidCommand {
+
+    private final DataverseFeaturedItem doomed;
+
+    public DeleteDataverseFeaturedItemCommand(DataverseRequest request, DataverseFeaturedItem doomed) {
+        super(request, doomed.getDataverse());
+        this.doomed = doomed;
+    }
+
+    @Override
+    protected void executeImpl(CommandContext ctxt) throws CommandException {
+        ctxt.dataverseFeaturedItems().delete(doomed.getId());
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteMapLayerMetadataCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteMapLayerMetadataCommand.java
deleted file mode 100644
index e4fd4c18031..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteMapLayerMetadataCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package edu.harvard.iq.dataverse.engine.command.impl;
-
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.MapLayerMetadata;
-import edu.harvard.iq.dataverse.authorization.Permission;
-import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
-import edu.harvard.iq.dataverse.engine.command.CommandContext;
-import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import java.util.logging.Logger;
-
-@RequiredPermissions(Permission.EditDataset)
-public class DeleteMapLayerMetadataCommand extends AbstractCommand<Boolean> {
-
-    private static final Logger logger = Logger.getLogger(DeleteMapLayerMetadataCommand.class.getCanonicalName());
-
-    private final DataFile dataFile;
-
-    public DeleteMapLayerMetadataCommand(DataverseRequest aRequest, DataFile datafile) {
-        super(aRequest, datafile);
-        this.dataFile = datafile;
-    }
-
-    @Override
-    public Boolean execute(CommandContext ctxt) throws CommandException {
-        if (dataFile == null) {
-            return false;
-        }
-        MapLayerMetadata mapLayerMetadata = ctxt.mapLayerMetadata().findMetadataByDatafile(dataFile);
-        if (mapLayerMetadata == null) {
-            return false;
-        }
-        boolean mapDeleted = ctxt.mapLayerMetadata().deleteMapLayerMetadataObject(mapLayerMetadata, getUser());
-        logger.info("Boolean returned from deleteMapLayerMetadataObject: " + mapDeleted);
-        return mapDeleted;
-
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeletePidCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeletePidCommand.java
new file mode 100644
index 00000000000..e7350e63683
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeletePidCommand.java
@@ -0,0 +1,60 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.logging.Logger;
+
+/**
+ * No required permissions because we check for superuser status.
+ */
+@RequiredPermissions({})
+public class DeletePidCommand extends AbstractVoidCommand {
+
+    private static final Logger logger = Logger.getLogger(ReservePidCommand.class.getCanonicalName());
+
+    private final Dataset dataset;
+
+    public DeletePidCommand(DataverseRequest request, Dataset dataset) {
+        super(request, dataset);
+        this.dataset = dataset;
+    }
+
+    @Override
+    protected void executeImpl(CommandContext ctxt) throws CommandException {
+
+        if (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser()) {
+            throw new PermissionException(BundleUtil.getStringFromBundle("admin.api.auth.mustBeSuperUser"), this,
+                    Collections.singleton(Permission.EditDataset), dataset);
+        }
+
+        PidProvider pidProvider = PidUtil.getPidProvider(dataset.getGlobalId().getProviderId());
+
+        try {
+            pidProvider.deleteIdentifier(dataset);
+            // Success! Clear the create time, etc.
+            dataset.setGlobalIdCreateTime(null);
+            dataset.setIdentifierRegistered(false);
+            ctxt.datasets().merge(dataset);
+        } catch (Exception ex) {
+            String message = BundleUtil.getStringFromBundle("pids.deletePid.failure",
+                    Arrays.asList(dataset.getGlobalId().asString(), ex.getLocalizedMessage()));
+            logger.info(message);
+            throw new IllegalCommandException(message, this);
+        }
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteTemplateCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteTemplateCommand.java
index 70cb41bea09..a8b4b4d3a31 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteTemplateCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteTemplateCommand.java
@@ -35,13 +35,17 @@ public DeleteTemplateCommand(DataverseRequest aRequest, Dataverse editedDv , Tem
 
     @Override
     public Dataverse execute(CommandContext ctxt) throws CommandException {
-        Dataverse merged = ctxt.em().merge(editedDv);
-        if (!dvWDefaultTemplate.isEmpty()){
-            for (Dataverse remove: dvWDefaultTemplate){
-                remove.setDefaultTemplate(null);
-                ctxt.em().merge(remove);
-            }                
+        Dataverse merged = null;
+        if (editedDv != null) {
+            merged = ctxt.em().merge(editedDv);
+            if (!dvWDefaultTemplate.isEmpty()) {
+                for (Dataverse remove : dvWDefaultTemplate) {
+                    remove.setDefaultTemplate(null);
+                    ctxt.em().merge(remove);
+                }
+            }
         }
+
         Template doomedAndMerged = ctxt.em().merge(doomed);
         ctxt.em().remove(doomedAndMerged);
         return merged;
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DestroyDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DestroyDatasetCommand.java
index 84e28b25f5c..49861e084b6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DestroyDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DestroyDatasetCommand.java
@@ -2,30 +2,42 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.FileAccessIO;
+import edu.harvard.iq.dataverse.dataaccess.GlobusOverlayAccessIO;
+import edu.harvard.iq.dataverse.export.ExportService;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import static edu.harvard.iq.dataverse.dataset.DatasetUtil.deleteDatasetLogo;
+import static java.text.MessageFormat.format;
+
 import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.search.IndexResponse;
+
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
+
 import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
 import java.io.IOException;
-import java.util.concurrent.Future;
+
 import org.apache.solr.client.solrj.SolrServerException;
 
 /**
@@ -42,10 +54,16 @@ public class DestroyDatasetCommand extends AbstractVoidCommand {
     private static final Logger logger = Logger.getLogger(DestroyDatasetCommand.class.getCanonicalName());
 
     private final Dataset doomed;
+    
+    private List<String> datasetAndFileSolrIdsToDelete; 
+    
+    private List<Dataverse> toReIndex;
 
     public DestroyDatasetCommand(Dataset doomed, DataverseRequest aRequest) {
         super(aRequest, doomed);
         this.doomed = doomed;
+        datasetAndFileSolrIdsToDelete = new ArrayList<>();
+        toReIndex = new ArrayList<>();
     }
 
     @Override
@@ -56,18 +74,17 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
             throw new PermissionException("Destroy can only be called by superusers.",
                 this,  Collections.singleton(Permission.DeleteDatasetDraft), doomed);                
         }
+        Dataset managedDoomed = ctxt.em().merge(doomed);
         
         // If there is a dedicated thumbnail DataFile, it needs to be reset
         // explicitly, or we'll get a constraint violation when deleting:
-        doomed.setThumbnailFile(null);
-        final Dataset managedDoomed = ctxt.em().merge(doomed);
-        
-        List<String> datasetAndFileSolrIdsToDelete = new ArrayList<>();
+        managedDoomed.setThumbnailFile(null);
+
         // files need to iterate through and remove 'by hand' to avoid
         // optimistic lock issues... (plus the physical files need to be 
         // deleted too!)
-        
-        Iterator <DataFile> dfIt = doomed.getFiles().iterator();
+        DatasetVersion dv = managedDoomed.getLatestVersion();
+        Iterator <DataFile> dfIt = managedDoomed.getFiles().iterator();
         while (dfIt.hasNext()){
             DataFile df = dfIt.next();
             // Gather potential Solr IDs of files. As of this writing deaccessioned files are never indexed.
@@ -78,60 +95,104 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
             ctxt.engine().submit(new DeleteDataFileCommand(df, getRequest(), true));
             dfIt.remove();
         }
-        
-        //also, lets delete the uploaded thumbnails!
-        if (!doomed.isHarvested()) {
-            deleteDatasetLogo(doomed);
-        }
+        dv.setFileMetadatas(null);
         
         
         // ASSIGNMENTS
-        for (RoleAssignment ra : ctxt.roles().directRoleAssignments(doomed)) {
+        for (RoleAssignment ra : ctxt.roles().directRoleAssignments(managedDoomed)) {
             ctxt.em().remove(ra);
         }
         // ROLES
-        for (DataverseRole ra : ctxt.roles().findByOwnerId(doomed.getId())) {
+        for (DataverseRole ra : ctxt.roles().findByOwnerId(managedDoomed.getId())) {
             ctxt.em().remove(ra);
-        }   
-        
-        if (!doomed.isHarvested()) {
-            GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(ctxt);
-            try {
-                if (idServiceBean.alreadyExists(doomed)) {
-                    idServiceBean.deleteIdentifier(doomed);
-                    for (DataFile df : doomed.getFiles()) {
-                        idServiceBean.deleteIdentifier(df);
+        }
+
+        if (!managedDoomed.isHarvested()) {
+            //also, lets delete the uploaded thumbnails!
+            deleteDatasetLogo(managedDoomed);
+            // and remove the PID (perhaps should be after the remove in case that causes a roll-back?)
+            GlobalId pid = managedDoomed.getGlobalId();
+            if (pid != null) {
+                PidProvider pidProvider = PidUtil.getPidProvider(pid.getProviderId());
+                try {
+                    if (pidProvider.alreadyRegistered(managedDoomed)) {
+                        pidProvider.deleteIdentifier(managedDoomed);
+                        //Files are handled in DeleteDataFileCommand
                     }
+                } catch (Exception e) {
+                    logger.log(Level.WARNING, "Identifier deletion was not successful:", e.getMessage());
                 }
-            } catch (Exception e) {
-                logger.log(Level.WARNING, "Identifier deletion was not successful:", e.getMessage());
             }
-        } 
-        
-        Dataverse toReIndex = managedDoomed.getOwner();
+        }
 
-        // dataset
-        ctxt.em().remove(managedDoomed);
+        // CACHED EXPORTS
+        var exportService = ExportService.getInstance();
+        try {
+            exportService.clearAllCachedFormats(managedDoomed);
+        }
+        catch (IOException e) {
+            var msg = format("Failed to delete cached exports of {0}: {1} ", managedDoomed.getIdentifier(), e.getClass().getSimpleName());
+            logger.log(Level.WARNING, msg, e.getMessage());
+        }
+
+        // DIRECTORY
+        try {
+            var storageIO = DataAccess.getStorageIO(managedDoomed);
+            if (storageIO instanceof FileAccessIO<Dataset> || storageIO instanceof GlobusOverlayAccessIO<Dataset>) {
+                Files.delete(storageIO.getAuxObjectAsPath(".").getParent());
+            }
+        }
+        catch (IOException e) {
+            var msg = format("Failed to delete dataset directory of {0}: {1} ", managedDoomed.getIdentifier(), e.getClass().getSimpleName());
+            logger.log(Level.WARNING, msg, e.getMessage());
+        }
+
+        toReIndex.add(managedDoomed.getOwner());
+        toReIndex.addAll(managedDoomed.getOwner().getOwners());
+        managedDoomed.getDatasetLinkingDataverses().forEach(dld -> {
+            toReIndex.add(dld.getLinkingDataverse());
+            toReIndex.addAll(dld.getLinkingDataverse().getOwners());
+        });
 
         // add potential Solr IDs of datasets to list for deletion
-        String solrIdOfPublishedDatasetVersion = IndexServiceBean.solrDocIdentifierDataset + doomed.getId();
+        String solrIdOfPublishedDatasetVersion = IndexServiceBean.solrDocIdentifierDataset + managedDoomed.getId();
         datasetAndFileSolrIdsToDelete.add(solrIdOfPublishedDatasetVersion);
-        String solrIdOfDraftDatasetVersion = IndexServiceBean.solrDocIdentifierDataset + doomed.getId() + IndexServiceBean.draftSuffix;
+        String solrIdOfDraftDatasetVersion = IndexServiceBean.solrDocIdentifierDataset + managedDoomed.getId() + IndexServiceBean.draftSuffix;
         datasetAndFileSolrIdsToDelete.add(solrIdOfDraftDatasetVersion);
-        String solrIdOfDeaccessionedDatasetVersion = IndexServiceBean.solrDocIdentifierDataset + doomed.getId() + IndexServiceBean.deaccessionedSuffix;
+        String solrIdOfDraftDatasetVersionPermission = solrIdOfDraftDatasetVersion + IndexServiceBean.discoverabilityPermissionSuffix;
+        datasetAndFileSolrIdsToDelete.add(solrIdOfDraftDatasetVersionPermission);
+        String solrIdOfDeaccessionedDatasetVersion = IndexServiceBean.solrDocIdentifierDataset + managedDoomed.getId() + IndexServiceBean.deaccessionedSuffix;
         datasetAndFileSolrIdsToDelete.add(solrIdOfDeaccessionedDatasetVersion);
+        
+        // dataset
+        ctxt.em().remove(managedDoomed);
+
+
+    }
+
+    @Override 
+    public boolean onSuccess(CommandContext ctxt, Object r) {
+
+        boolean retVal = true;
+        
+       // all the real Solr work is done here
+       // delete orphaned Solr ids
         IndexResponse resultOfSolrDeletionAttempt = ctxt.solrIndex().deleteMultipleSolrIds(datasetAndFileSolrIdsToDelete);
         logger.log(Level.FINE, "Result of attempt to delete dataset and file IDs from the search index: {0}", resultOfSolrDeletionAttempt.getMessage());
 
-        
-        try {
-            ctxt.index().indexDataverse(toReIndex);                   
-        } catch (IOException | SolrServerException e) {    
-            String failureLogText = "Post-destroy dataset indexing of the owning dataverse failed. You can kickoff a re-index of this dataverse with: \r\n curl http://localhost:8080/api/admin/index/dataverses/" + toReIndex.getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText,  toReIndex);
+        // reindex
+        for (Dataverse dv : toReIndex) {
+            try {
+                    ctxt.index().indexDataverse(dv);
+            } catch (IOException | SolrServerException e) {
+                String failureLogText = "Post-destroy dataset indexing of an owning or linking dataverse failed. You can kickoff a re-index of this dataverse with: \r\n curl http://localhost:8080/api/admin/index/dataverses/" + dv.getId().toString();
+                failureLogText += "\r\n" + e.getLocalizedMessage();
+                LoggingUtil.writeOnSuccessFailureLog(this, failureLogText,  dv);
+                retVal = false;
+            }
         }
         
+        return retVal;
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DuraCloudSubmitToArchiveCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DuraCloudSubmitToArchiveCommand.java
index 34bd3234351..94f983f0c13 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DuraCloudSubmitToArchiveCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DuraCloudSubmitToArchiveCommand.java
@@ -1,30 +1,28 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.DOIDataCiteRegisterService;
-import edu.harvard.iq.dataverse.DataCitation;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.DatasetLock.Reason;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
-import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
-import edu.harvard.iq.dataverse.util.bagit.BagGenerator;
-import edu.harvard.iq.dataverse.util.bagit.OREMap;
 import edu.harvard.iq.dataverse.workflow.step.Failure;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
 
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+
 import org.apache.commons.codec.binary.Hex;
 import org.duracloud.client.ContentStore;
 import org.duracloud.client.ContentStoreManager;
@@ -33,7 +31,7 @@
 import org.duracloud.error.ContentStoreException;
 
 @RequiredPermissions(Permission.PublishDataset)
-public class DuraCloudSubmitToArchiveCommand extends AbstractSubmitToArchiveCommand implements Command<DatasetVersion> {
+public class DuraCloudSubmitToArchiveCommand extends AbstractSubmitToArchiveCommand {
 
     private static final Logger logger = Logger.getLogger(DuraCloudSubmitToArchiveCommand.class.getName());
     private static final String DEFAULT_PORT = "443";
@@ -42,29 +40,59 @@ public class DuraCloudSubmitToArchiveCommand extends AbstractSubmitToArchiveComm
     private static final String DURACLOUD_HOST = ":DuraCloudHost";
     private static final String DURACLOUD_CONTEXT = ":DuraCloudContext";
 
+
     public DuraCloudSubmitToArchiveCommand(DataverseRequest aRequest, DatasetVersion version) {
         super(aRequest, version);
     }
 
     @Override
-    public WorkflowStepResult performArchiveSubmission(DatasetVersion dv, ApiToken token, Map<String, String> requestedSettings) {
+    public WorkflowStepResult performArchiveSubmission(DatasetVersion dv, ApiToken token,
+            Map<String, String> requestedSettings) {
 
-        String port = requestedSettings.get(DURACLOUD_PORT) != null ? requestedSettings.get(DURACLOUD_PORT) : DEFAULT_PORT;
-        String dpnContext = requestedSettings.get(DURACLOUD_CONTEXT) != null ? requestedSettings.get(DURACLOUD_CONTEXT) : DEFAULT_CONTEXT;
+        String port = requestedSettings.get(DURACLOUD_PORT) != null ? requestedSettings.get(DURACLOUD_PORT)
+                : DEFAULT_PORT;
+        String dpnContext = requestedSettings.get(DURACLOUD_CONTEXT) != null ? requestedSettings.get(DURACLOUD_CONTEXT)
+                : DEFAULT_CONTEXT;
         String host = requestedSettings.get(DURACLOUD_HOST);
+        
         if (host != null) {
             Dataset dataset = dv.getDataset();
-            if (dataset.getLockFor(Reason.pidRegister) == null) {
+            // ToDo - change after HDC 3A changes to status reporting
+            // This will make the archivalCopyLocation non-null after a failure which should
+            // stop retries
+            
+            if (dataset.getLockFor(Reason.finalizePublication) == null
+                    && dataset.getLockFor(Reason.FileValidationFailed) == null) {
                 // Use Duracloud client classes to login
                 ContentStoreManager storeManager = new ContentStoreManagerImpl(host, port, dpnContext);
                 Credential credential = new Credential(System.getProperty("duracloud.username"),
                         System.getProperty("duracloud.password"));
                 storeManager.login(credential);
-
-                String spaceName = dataset.getGlobalId().asString().replace(':', '-').replace('/', '-')
-                        .replace('.', '-').toLowerCase();
+                /*
+                 * Aliases can contain upper case characters which are not allowed in space
+                 * names. Similarly, aliases can contain '_' which isn't allowed in a space
+                 * name. The line below replaces any upper case chars with lowercase and
+                 * replaces any '_' with '.-' . The '-' after the dot assures we don't break the
+                 * rule that
+                 * "The last period in a aspace may not immediately be followed by a number".
+                 * (Although we could check, it seems better to just add '.-' all the time.As
+                 * written the replaceAll will also change any chars not valid in a spaceName to
+                 * '.' which would avoid code breaking if the alias constraints change. That
+                 * said, this line may map more than one alias to the same spaceName, e.g.
+                 * "test" and "Test" aliases both map to the "test" space name. This does not
+                 * break anything but does potentially put bags from more than one collection in
+                 * the same space.
+                 */
+                String spaceName = dataset.getOwner().getAlias().toLowerCase().replaceAll("[^a-z0-9-]", ".dcsafe");
+                String baseFileName = dataset.getGlobalId().asString().replace(':', '-').replace('/', '-')
+                        .replace('.', '-').toLowerCase() + "_v" + dv.getFriendlyVersionNumber();
 
                 ContentStore store;
+                //Set a failure status that will be updated if we succeed
+                JsonObjectBuilder statusObject = Json.createObjectBuilder();
+                statusObject.add(DatasetVersion.ARCHIVAL_STATUS, DatasetVersion.ARCHIVAL_STATUS_FAILURE);
+                statusObject.add(DatasetVersion.ARCHIVAL_STATUS_MESSAGE, "Bag not transferred");
+                
                 try {
                     /*
                      * If there is a failure in creating a space, it is likely that a prior version
@@ -74,78 +102,85 @@ public WorkflowStepResult performArchiveSubmission(DatasetVersion dv, ApiToken t
                      */
                     store = storeManager.getPrimaryContentStore();
                     // Create space to copy archival files to
-                    store.createSpace(spaceName);
-                    DataCitation dc = new DataCitation(dv);
-                    Map<String, String> metadata = dc.getDataCiteMetadata();
-                    String dataciteXml = DOIDataCiteRegisterService.getMetadataFromDvObject(
-                            dv.getDataset().getGlobalId().asString(), metadata, dv.getDataset());
+                    if (!store.spaceExists(spaceName)) {
+                        store.createSpace(spaceName);
+                    }
+                    String dataciteXml = getDataCiteXml(dv);
 
                     MessageDigest messageDigest = MessageDigest.getInstance("MD5");
-                    try (PipedInputStream dataciteIn = new PipedInputStream(); DigestInputStream digestInputStream = new DigestInputStream(dataciteIn, messageDigest)) {
+                    try (PipedInputStream dataciteIn = new PipedInputStream();
+                            DigestInputStream digestInputStream = new DigestInputStream(dataciteIn, messageDigest)) {
                         // Add datacite.xml file
 
-                        new Thread(new Runnable() {
+                        Thread dcThread = new Thread(new Runnable() {
                             public void run() {
                                 try (PipedOutputStream dataciteOut = new PipedOutputStream(dataciteIn)) {
 
-                                    dataciteOut.write(dataciteXml.getBytes(Charset.forName("utf-8")));
+                                    dataciteOut.write(dataciteXml.getBytes(StandardCharsets.UTF_8));
                                     dataciteOut.close();
+                                    success=true;
                                 } catch (Exception e) {
                                     logger.severe("Error creating datacite.xml: " + e.getMessage());
                                     // TODO Auto-generated catch block
                                     e.printStackTrace();
-                                    throw new RuntimeException("Error creating datacite.xml: " + e.getMessage());
                                 }
                             }
-                        }).start();
-
-                        String checksum = store.addContent(spaceName, "datacite.xml", digestInputStream, -1l, null, null,
-                                null);
+                        }); 
+                        dcThread.start();
+                        // Have seen Pipe Closed errors for other archivers when used as a workflow
+                        // without this delay loop
+                        int i = 0;
+                        while (digestInputStream.available() <= 0 && i < 100) {
+                            Thread.sleep(10);
+                            i++;
+                        }
+                        String checksum = store.addContent(spaceName, baseFileName + "_datacite.xml", digestInputStream,
+                                -1l, null, null, null);
                         logger.fine("Content: datacite.xml added with checksum: " + checksum);
+                        dcThread.join();
                         String localchecksum = Hex.encodeHexString(digestInputStream.getMessageDigest().digest());
-                        if (!checksum.equals(localchecksum)) {
-                            logger.severe(checksum + " not equal to " + localchecksum);
+                        if (!success || !checksum.equals(localchecksum)) {
+                            logger.severe("Failure on " + baseFileName);
+                            logger.severe(success ? checksum + " not equal to " + localchecksum : "failed to transfer to DuraCloud");
+                            try {
+                                store.deleteContent(spaceName, baseFileName + "_datacite.xml");
+                            } catch (ContentStoreException cse) {
+                                logger.warning(cse.getMessage());
+                            }
                             return new Failure("Error in transferring DataCite.xml file to DuraCloud",
                                     "DuraCloud Submission Failure: incomplete metadata transfer");
                         }
 
                         // Store BagIt file
-                        String fileName = spaceName + "v" + dv.getFriendlyVersionNumber() + ".zip";
+                        success = false;
+                        String fileName = baseFileName + ".zip";
 
                         // Add BagIt ZIP file
                         // Although DuraCloud uses SHA-256 internally, it's API uses MD5 to verify the
                         // transfer
+
                         messageDigest = MessageDigest.getInstance("MD5");
-                        try (PipedInputStream in = new PipedInputStream();  DigestInputStream digestInputStream2 = new DigestInputStream(in, messageDigest)) {
-                            new Thread(new Runnable() {
-                                public void run() {
-                                    try (PipedOutputStream out = new PipedOutputStream(in)){
-                                        // Generate bag
-                                        BagGenerator bagger = new BagGenerator(new OREMap(dv, false), dataciteXml);
-                                        bagger.setAuthenticationKey(token.getTokenString());
-                                        bagger.generateBag(out);
-                                    } catch (Exception e) {
-                                        logger.severe("Error creating bag: " + e.getMessage());
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
-                                        throw new RuntimeException("Error creating bag: " + e.getMessage());
-                                    }
+                        try (PipedInputStream in = new PipedInputStream(100000);
+                                DigestInputStream digestInputStream2 = new DigestInputStream(in, messageDigest)) {
+                            Thread bagThread = startBagThread(dv, in, digestInputStream2, dataciteXml, token);
+                            checksum = store.addContent(spaceName, fileName, digestInputStream2, -1l, null, null, null);
+                            bagThread.join();
+                            if (success) {
+                                logger.fine("Content: " + fileName + " added with checksum: " + checksum);
+                                localchecksum = Hex.encodeHexString(digestInputStream2.getMessageDigest().digest());
+                            }
+                            if (!success || !checksum.equals(localchecksum)) {
+                                logger.severe("Failure on " + fileName);
+                                logger.severe(success ? checksum + " not equal to " + localchecksum : "failed to transfer to DuraCloud");
+                                try {
+                                    store.deleteContent(spaceName, fileName);
+                                    store.deleteContent(spaceName, baseFileName + "_datacite.xml");
+                                } catch (ContentStoreException cse) {
+                                    logger.warning(cse.getMessage());
                                 }
-                            }).start();
-
-                            checksum = store.addContent(spaceName, fileName, digestInputStream2, -1l, null, null,
-                                    null);
-                            logger.fine("Content: " + fileName + " added with checksum: " + checksum);
-                            localchecksum = Hex.encodeHexString(digestInputStream2.getMessageDigest().digest());
-                            if (!checksum.equals(localchecksum)) {
-                                logger.severe(checksum + " not equal to " + localchecksum);
                                 return new Failure("Error in transferring Zip file to DuraCloud",
                                         "DuraCloud Submission Failure: incomplete archive transfer");
                             }
-                        } catch (RuntimeException rte) {
-                            logger.severe(rte.getMessage());
-                            return new Failure("Error in generating Bag",
-                                    "DuraCloud Submission Failure: archive file not created");
                         }
 
                         logger.fine("DuraCloud Submission step: Content Transferred");
@@ -161,7 +196,9 @@ public void run() {
                         sb.append("/duradmin/spaces/sm/");
                         sb.append(store.getStoreId());
                         sb.append("/" + spaceName + "/" + fileName);
-                        dv.setArchivalCopyLocation(sb.toString());
+                        statusObject.add(DatasetVersion.ARCHIVAL_STATUS, DatasetVersion.ARCHIVAL_STATUS_SUCCESS);
+                        statusObject.add(DatasetVersion.ARCHIVAL_STATUS_MESSAGE, sb.toString());
+                        
                         logger.fine("DuraCloud Submission step complete: " + sb.toString());
                     } catch (ContentStoreException | IOException e) {
                         // TODO Auto-generated catch block
@@ -169,10 +206,9 @@ public void run() {
                         e.printStackTrace();
                         return new Failure("Error in transferring file to DuraCloud",
                                 "DuraCloud Submission Failure: archive file not transferred");
-                    }  catch (RuntimeException rte) {
-                        logger.severe(rte.getMessage());
-                        return new Failure("Error in generating datacite.xml file",
-                                "DuraCloud Submission Failure: metadata file not created");
+                    } catch (InterruptedException e) {
+                        logger.warning(e.getLocalizedMessage());
+                        e.printStackTrace();
                     }
                 } catch (ContentStoreException e) {
                     logger.warning(e.getMessage());
@@ -181,12 +217,16 @@ public void run() {
                     if (!(1 == dv.getVersion()) || !(0 == dv.getMinorVersionNumber())) {
                         mesg = mesg + ": Prior Version archiving not yet complete?";
                     }
-                    return new Failure("Unable to create DuraCloud space with name: " + spaceName, mesg);
+                    return new Failure("Unable to create DuraCloud space with name: " + baseFileName, mesg);
                 } catch (NoSuchAlgorithmException e) {
                     logger.severe("MD5 MessageDigest not available!");
                 }
+                finally {
+                    dv.setArchivalCopyLocation(statusObject.build().toString());
+                }
             } else {
-                logger.warning("DuraCloud Submision Workflow aborted: Dataset locked for pidRegister");
+                logger.warning(
+                        "DuraCloud Submision Workflow aborted: Dataset locked for finalizePublication, or because file validation failed");
                 return new Failure("Dataset locked");
             }
             return WorkflowStepResult.OK;
@@ -194,5 +234,4 @@ public void run() {
             return new Failure("DuraCloud Submission not configured - no \":DuraCloudHost\".");
         }
     }
-    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java
index e134c3dc1b3..1ef68ae4853 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java
@@ -1,39 +1,53 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
+import edu.harvard.iq.dataverse.ControlledVocabularyValue;
+import edu.harvard.iq.dataverse.CurationStatus;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetField;
 import edu.harvard.iq.dataverse.DatasetFieldConstant;
 import edu.harvard.iq.dataverse.DatasetLock;
+import edu.harvard.iq.dataverse.DatasetVersion;
+
 import static edu.harvard.iq.dataverse.DatasetVersion.VersionState.*;
 import edu.harvard.iq.dataverse.DatasetVersionUser;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.Embargo;
 import edu.harvard.iq.dataverse.UserNotification;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.export.ExportException;
 import edu.harvard.iq.dataverse.export.ExportService;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.workflow.WorkflowContext.TriggerType;
+
+import java.awt.datatransfer.StringSelection;
 import java.io.IOException;
 import java.sql.Timestamp;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
+
 import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.engine.command.Command;
+import edu.harvard.iq.dataverse.util.FileUtil;
+
 import java.util.concurrent.Future;
+
+import org.apache.logging.log4j.util.Strings;
 import org.apache.solr.client.solrj.SolrServerException;
 
+
 /**
  *
  * Takes the last internal steps in publishing a dataset.
@@ -44,12 +58,18 @@
 public class FinalizeDatasetPublicationCommand extends AbstractPublishDatasetCommand<Dataset> {
 
     private static final Logger logger = Logger.getLogger(FinalizeDatasetPublicationCommand.class.getName());
-    
+
+
+
     /**
      * mirror field from {@link PublishDatasetCommand} of same name
      */
     final boolean datasetExternallyReleased;
     
+    Set<Dataverse> dataversesToIndex = new HashSet<>();
+    
+    public static final String FILE_VALIDATION_ERROR = "FILE VALIDATION ERROR";
+    
     public FinalizeDatasetPublicationCommand(Dataset aDataset, DataverseRequest aRequest) {
         this( aDataset, aRequest, false );
     }
@@ -62,25 +82,99 @@ public FinalizeDatasetPublicationCommand(Dataset aDataset, DataverseRequest aReq
     public Dataset execute(CommandContext ctxt) throws CommandException {
         Dataset theDataset = getDataset();
         
+        logger.info("Finalizing publication of the dataset "+theDataset.getGlobalId().asString());
+        
+        // validate the physical files before we do anything else: 
+        // (unless specifically disabled; or a minor version)
+        if (theDataset.getLatestVersion().getVersionState() != RELEASED
+                && theDataset.getLatestVersion().getMinorVersionNumber() != null
+                && theDataset.getLatestVersion().getMinorVersionNumber().equals((long) 0)
+                && ctxt.systemConfig().isDatafileValidationOnPublishEnabled()) {
+            // some imported datasets may already be released.
+
+            // validate the physical files (verify checksums):
+            validateDataFiles(theDataset, ctxt);
+            // (this will throw a CommandException if it fails)
+        }
+        
+        validateOrDie(theDataset.getLatestVersion(), false);
+        
+		/*
+		 * Try to register the dataset identifier. For PID providers that have registerWhenPublished == false (all except the FAKE provider at present)
+		 * the registerExternalIdentifier command will make one try to create the identifier if needed (e.g. if reserving at dataset creation wasn't done/failed).
+		 * For registerWhenPublished == true providers, if a PID conflict is found, the call will retry with new PIDs. 
+		 */
         if ( theDataset.getGlobalIdCreateTime() == null ) {
-            registerExternalIdentifier(theDataset, ctxt);
+            try {
+                // This can potentially throw a CommandException, so let's make 
+                // sure we exit cleanly:
+                registerExternalIdentifier(theDataset, ctxt, false);
+                registerFilePidsIfNeeded(theDataset, ctxt, false);
+            } catch (CommandException comEx) {
+                logger.warning("Failed to reserve the identifier " + theDataset.getGlobalId().asString() + "; notifying the user(s), unlocking the dataset");
+                // Send failure notification to the user:
+                notifyUsersDatasetPublishStatus(ctxt, theDataset, UserNotification.Type.PUBLISHFAILED_PIDREG);
+                // Remove the dataset lock:
+                ctxt.datasets().removeDatasetLocks(theDataset, DatasetLock.Reason.finalizePublication);
+                // re-throw the exception:
+                throw comEx;
+            }
         }
                 
         // is this the first publication of the dataset?
         if (theDataset.getPublicationDate() == null) {
             theDataset.setReleaseUser((AuthenticatedUser) getUser());
-        }
-        if ( theDataset.getPublicationDate() == null ) {
+        
             theDataset.setPublicationDate(new Timestamp(new Date().getTime()));
+            
+            // if there are any embargoed files in this version, we will save 
+            // the latest availability date as the "embargoCitationDate" for future 
+            // reference (if the files are not available yet, as of publishing of 
+            // the dataset, this date will be used as the "ciatation date" of the dataset, 
+            // instead of the publicatonDate, in compliance with the DataCite 
+            // best practices). 
+            // the code below replicates the logic that used to be in the method 
+            // Dataset.getCitationDate() that calculated this adjusted date in real time.
+            
+            Timestamp latestEmbargoDate = null; 
+            for (DataFile dataFile : theDataset.getFiles()) {
+                // this is the first version of the dataset that is being published. 
+                // therefore we can iterate through .getFiles() instead of obtaining
+                // the DataFiles by going through the FileMetadatas in the current version.
+                Embargo embargo = dataFile.getEmbargo();
+                if (embargo != null) {
+                    // "dataAvailable" is not nullable in the Embargo class, no need for a null check
+                    Timestamp embargoDate = Timestamp.valueOf(embargo.getDateAvailable().atStartOfDay());
+                    if (latestEmbargoDate == null || latestEmbargoDate.compareTo(embargoDate) < 0) {
+                        latestEmbargoDate = embargoDate;
+                    }
+                }
+            }
+            // the above loop could be easily replaced with a database query; 
+            // but we iterate through .getFiles() elsewhere in the command, when 
+            // updating and/or registering the files, so it should not result in 
+            // an extra performance hit. 
+            theDataset.setEmbargoCitationDate(latestEmbargoDate);
         } 
 
+        DatasetVersion version = theDataset.getLatestVersion();
+        
+        // Clear any external status
+        CurationStatus status = version.getCurrentCurationStatus();
+        if (status != null && Strings.isNotBlank(status.getLabel())) {
+            version.addCurationStatus(new CurationStatus(null, version, getRequest().getAuthenticatedUser()));
+        }
         // update metadata
-        theDataset.getLatestVersion().setReleaseTime(getTimestamp());
-        theDataset.getLatestVersion().setLastUpdateTime(getTimestamp());
+        if (version.getReleaseTime() == null) {
+            // Allow migrated versions to keep original release dates
+            version.setReleaseTime(getTimestamp());
+        }
+        version.setLastUpdateTime(getTimestamp());
         theDataset.setModificationTime(getTimestamp());
         theDataset.setFileAccessRequest(theDataset.getLatestVersion().getTermsOfUseAndAccess().isFileAccessRequest());
         
-        updateFiles(getTimestamp(), ctxt);
+        //Use dataset pub date (which may not be the current date for migrated datasets)
+        updateFiles(new Timestamp(version.getReleaseTime().getTime()), ctxt);
         
         // 
         // TODO: Not sure if this .merge() is necessary here - ? 
@@ -114,6 +208,15 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
 
         }
 
+        // The owning dataverse plus all dataverses linking to this dataset must be re-indexed to update their
+        // datasetCount
+        dataversesToIndex.add(getDataset().getOwner());
+        dataversesToIndex.addAll(getDataset().getOwner().getOwners());
+        getDataset().getDatasetLinkingDataverses().forEach(dld -> {
+            dataversesToIndex.add(dld.getLinkingDataverse());
+            dataversesToIndex.addAll(dld.getLinkingDataverse().getOwners());
+        });
+
         List<Command> previouslyCalled = ctxt.getCommandsCalled();
         
         PrivateUrl privateUrl = ctxt.engine().submit(new GetPrivateUrlCommand(getRequest(), theDataset));
@@ -125,39 +228,47 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
             ctxt.engine().submit(new DeletePrivateUrlCommand(getRequest(), theDataset));
         }
         
-	if ( theDataset.getLatestVersion().getVersionState() != RELEASED ) {
-		// some imported datasets may already be released.
-		if (!datasetExternallyReleased){
-			publicizeExternalIdentifier(theDataset, ctxt);
-		}
-		theDataset.getLatestVersion().setVersionState(RELEASED);
-	}
-        
-
-        // Remove locks
-        ctxt.engine().submit(new RemoveLockCommand(getRequest(), theDataset, DatasetLock.Reason.Workflow));
-        ctxt.engine().submit(new RemoveLockCommand(getRequest(), theDataset, DatasetLock.Reason.pidRegister));
-        if ( theDataset.isLockedFor(DatasetLock.Reason.InReview) ) {
-            ctxt.engine().submit( 
-                    new RemoveLockCommand(getRequest(), theDataset, DatasetLock.Reason.InReview) );
+	if (theDataset.getLatestVersion().getVersionState() != RELEASED) {
+            // some imported datasets may already be released.
+	        theDataset.getLatestVersion().setVersionState(RELEASED);
+            if (!datasetExternallyReleased) {
+                publicizeExternalIdentifier(theDataset, ctxt);
+                // Will throw a CommandException, unless successful.
+                // This will end the execution of the command, but the method 
+                // above takes proper care to "clean up after itself" in case of
+                // a failure - it will remove any locks, and it will send a
+                // proper notification to the user(s). 
+            }
         }
         
         final Dataset ds = ctxt.em().merge(theDataset);
+        //Remove any pre-pub workflow lock (not needed as WorkflowServiceBean.workflowComplete() should already have removed it after setting the finalizePublication lock?)
+        ctxt.datasets().removeDatasetLocks(ds, DatasetLock.Reason.Workflow);
         
+        //Should this be in onSuccess()?
         ctxt.workflows().getDefaultWorkflow(TriggerType.PostPublishDataset).ifPresent(wf -> {
             try {
-                ctxt.workflows().start(wf, buildContext(ds, TriggerType.PostPublishDataset, datasetExternallyReleased));
+                ctxt.workflows().start(wf, buildContext(ds, TriggerType.PostPublishDataset, datasetExternallyReleased), false);
             } catch (CommandException ex) {
+                ctxt.datasets().removeDatasetLocks(ds, DatasetLock.Reason.Workflow);
                 logger.log(Level.SEVERE, "Error invoking post-publish workflow: " + ex.getMessage(), ex);
             }
         });
+
+        Dataset readyDataset = ctxt.em().merge(ds);
         
-        Dataset readyDataset = ctxt.em().merge(theDataset);
-        
-        if ( readyDataset != null ) {
-            notifyUsersDatasetPublish(ctxt, theDataset);
+        // Finally, unlock the dataset (leaving any post-publish workflow lock in place)
+        ctxt.datasets().removeDatasetLocks(readyDataset, DatasetLock.Reason.finalizePublication);
+        if (readyDataset.isLockedFor(DatasetLock.Reason.InReview) ) {
+            ctxt.datasets().removeDatasetLocks(readyDataset, DatasetLock.Reason.InReview);
         }
         
+        logger.info("Successfully published the dataset "+readyDataset.getGlobalId().asString());
+        readyDataset = ctxt.em().merge(readyDataset);
+
+        // Delete any Featured Items that are invalidated by publishing this version
+        ctxt.dataverseFeaturedItems().deleteInvalidatedFeaturedItemsByDataset(readyDataset);
+        
         return readyDataset;
     }
     
@@ -170,52 +281,79 @@ public boolean onSuccess(CommandContext ctxt, Object r) {
         } catch (ClassCastException e){
             dataset  = ((PublishDatasetResult) r).getDataset();
         }
-
+        
         try {
-            Future<String> indexString = ctxt.index().indexDataset(dataset, true);                   
-        } catch (IOException | SolrServerException e) {    
-            String failureLogText = "Post-publication indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText,  dataset);
-            retVal = false;
+            // Success! - send notification:
+            notifyUsersDatasetPublishStatus(ctxt, dataset, UserNotification.Type.PUBLISHEDDS);
+        } catch (Exception e) {
+            logger.warning("Failure to send dataset published messages for : " + dataset.getId() + " : " + e.getMessage());
+        }
+        
+        //re-indexing dataverses that have additional subjects
+        if (!dataversesToIndex.isEmpty()){
+            for (Dataverse dv : dataversesToIndex) {
+                try {
+                    Future<String> indexString = ctxt.index().indexDataverse(dv);
+                } catch (IOException | SolrServerException e) {
+                    String failureLogText = "Post-publication indexing failed. You can kick off a re-index of this dataverse with: \r\n curl http://localhost:8080/api/admin/index/dataverses/" + dv.getId().toString();
+                    failureLogText += "\r\n" + e.getLocalizedMessage();
+                    LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, dataset);
+                    retVal = false;
+                } 
+            }
         }
 
-        ctxt.solrIndex().indexPermissionsForOneDvObject(dataset);
-        exportMetadata(ctxt.settings());
-        return retVal;
-    }
-
-    /**
-     * Attempting to run metadata export, for all the formats for which we have
-     * metadata Exporters.
-     */
-    private void exportMetadata(SettingsServiceBean settingsServiceBean) {
-
+        // Metadata export:
+        
         try {
-            ExportService instance = ExportService.getInstance(settingsServiceBean);
-            instance.exportAllFormats(getDataset());
-
-        } catch (ExportException ex) {
+            ExportService instance = ExportService.getInstance();
+            instance.exportAllFormats(dataset);
+            dataset = ctxt.datasets().merge(dataset); 
+        } catch (Exception ex) {
             // Something went wrong!
             // Just like with indexing, a failure to export is not a fatal
             // condition. We'll just log the error as a warning and keep
             // going:
-            logger.log(Level.WARNING, "Dataset publication finalization: exception while exporting:{0}", ex.getMessage());
+            logger.log(Level.WARNING, "Finalization: exception caught while exporting: "+ex.getMessage(), ex);
+            // ... but it is important to only update the export time stamp if the 
+            // export was indeed successful.
         }
+        ctxt.index().asyncIndexDataset(dataset, true);
+        
+        return retVal;
     }
 
     /**
      * add the dataset subjects to all parent dataverses.
      */
     private void updateParentDataversesSubjectsField(Dataset savedDataset, CommandContext ctxt) throws  SolrServerException, IOException {
+        
         for (DatasetField dsf : savedDataset.getLatestVersion().getDatasetFields()) {
             if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.subject)) {
                 Dataverse dv = savedDataset.getOwner();
                 while (dv != null) {
-                    if (dv.getDataverseSubjects().addAll(dsf.getControlledVocabularyValues())) {
+                    boolean newSubjectsAdded = false;
+                    for (ControlledVocabularyValue cvv : dsf.getControlledVocabularyValues()) {                   
+                        if (!cvv.getStrValue().equals(DatasetField.NA_VALUE)) {
+                            if (!dv.getDataverseSubjects().contains(cvv)) {
+                                logger.fine("dv "+dv.getAlias()+" does not have subject "+cvv.getStrValue());
+                                newSubjectsAdded = true;
+                                dv.getDataverseSubjects().add(cvv);
+                            } else {
+                                logger.fine("dv "+dv.getAlias()+" already has subject "+cvv.getStrValue());
+                            }
+                        } else {
+                            logger.fine("Subject is not recognized : " + cvv.getStrValue());
+                        }
+                    }
+                    if (newSubjectsAdded) {
+                        logger.fine("new dataverse subjects added - saving and reindexing in OnSuccess");
                         Dataverse dvWithSubjectJustAdded = ctxt.em().merge(dv);
                         ctxt.em().flush();
-                        ctxt.index().indexDataverse(dvWithSubjectJustAdded); // need to reindex to capture the new subjects
+                        //adding dv to list of those we need to re-index for new subjects
+                        dataversesToIndex.add(dvWithSubjectJustAdded);                       
+                    } else {
+                        logger.fine("no new subjects added to the dataverse; skipping reindexing");
                     }
                     dv = dv.getOwner();
                 }
@@ -224,46 +362,100 @@ private void updateParentDataversesSubjectsField(Dataset savedDataset, CommandCo
         }
     }
 
-    private void publicizeExternalIdentifier(Dataset dataset, CommandContext ctxt) throws CommandException {
-        String protocol = getDataset().getProtocol();
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(protocol, ctxt);
-        if (idServiceBean != null) {
-            List<String> args = idServiceBean.getProviderInformation();
-            try {
-                String currentGlobalIdProtocol = ctxt.settings().getValueForKey(SettingsServiceBean.Key.Protocol, "");
-                String dataFilePIDFormat = ctxt.settings().getValueForKey(SettingsServiceBean.Key.DataFilePIDFormat, "DEPENDENT");
-                boolean isFilePIDsEnabled = ctxt.systemConfig().isFilePIDsEnabled();
-                // We will skip trying to register the global identifiers for datafiles 
-                // if "dependent" file-level identifiers are requested, AND the naming 
-                // protocol of the dataset global id is different from the
-                // one currently configured for the Dataverse. This is to specifically 
-                // address the issue with the datasets with handle ids registered, 
-                // that are currently configured to use DOI.
-                // ...
-                // Additionaly in 4.9.3 we have added a system variable to disable 
-                // registering file PIDs on the installation level.
-                if ((currentGlobalIdProtocol.equals(protocol) || dataFilePIDFormat.equals("INDEPENDENT"))//TODO(pm) - check authority too
-                        && isFilePIDsEnabled) {
-                    //A false return value indicates a failure in calling the service
-                    for (DataFile df : dataset.getFiles()) {
-                        logger.log(Level.FINE, "registering global id for file {0}", df.getId());
-                        //A false return value indicates a failure in calling the service
-                        if (!idServiceBean.publicizeIdentifier(df)) {
-                            throw new Exception();
-                        }
-                        df.setGlobalIdCreateTime(getTimestamp());
-                        df.setIdentifierRegistered(true);
+    private void validateDataFiles(Dataset dataset, CommandContext ctxt) throws CommandException {
+        try {
+            long maxDatasetSize = ctxt.systemConfig().getDatasetValidationSizeLimit();
+            long maxFileSize = ctxt.systemConfig().getFileValidationSizeLimit();
+
+            long datasetSize = DatasetUtil.getDownloadSizeNumeric(dataset.getLatestVersion(), false);
+            if (maxDatasetSize == -1 || datasetSize < maxDatasetSize) {
+                for (DataFile dataFile : dataset.getFiles()) {
+                    // TODO: Should we validate all the files in the dataset, or only
+                    // the files that haven't been published previously?
+                    // (the decision was made to validate all the files on every
+                    // major release; we can revisit the decision if there's any
+                    // indication that this makes publishing take significantly longer.
+                    String driverId = FileUtil.getStorageDriver(dataFile);
+                    if(StorageIO.isDataverseAccessible(driverId) && (maxFileSize == -1 || dataFile.getFilesize() < maxFileSize)) {
+                        FileUtil.validateDataFileChecksum(dataFile);
+                    }
+                    else {
+                        String message = "Checksum Validation skipped for this datafile: " + dataFile.getId() + ", because of the size of the datafile limit (set to " + maxFileSize + " ); ";
+                        logger.info(message);
                     }
                 }
-                if (!idServiceBean.publicizeIdentifier(dataset)) {
-                    throw new Exception();
+            }
+            else {
+                String message = "Checksum Validation skipped for this dataset: " + dataset.getId() + ", because of the size of the dataset limit (set to " + maxDatasetSize + " ); ";
+                logger.info(message);
+            }
+        } catch (Throwable e) {
+            if (dataset.isLockedFor(DatasetLock.Reason.finalizePublication)) {
+                DatasetLock lock = dataset.getLockFor(DatasetLock.Reason.finalizePublication);
+                lock.setReason(DatasetLock.Reason.FileValidationFailed);
+                lock.setInfo(FILE_VALIDATION_ERROR);
+                ctxt.datasets().updateDatasetLock(lock);
+            } else {            
+                // Lock the dataset with a new FileValidationFailed lock: 
+                DatasetLock lock = new DatasetLock(DatasetLock.Reason.FileValidationFailed, getRequest().getAuthenticatedUser()); //(AuthenticatedUser)getUser());
+                lock.setDataset(dataset);
+                lock.setInfo(FILE_VALIDATION_ERROR);
+                ctxt.datasets().addDatasetLock(dataset, lock);
+            }
+            
+            // Throw a new CommandException; if the command is being called 
+            // synchronously, it will be intercepted and the page will display 
+            // the error message for the user.
+            throw new CommandException(BundleUtil.getStringFromBundle("dataset.publish.file.validation.error.details"), this);
+        }
+    }
+    
+    private void publicizeExternalIdentifier(Dataset dataset, CommandContext ctxt) throws CommandException {
+        PidProvider pidProvider = ctxt.dvObjects().getEffectivePidGenerator(dataset);
+        try {
+            // We will skip trying to register the global identifiers for datafiles
+            // if "dependent" file-level identifiers are requested, AND the naming
+            // protocol, or the authority of the dataset global id is different from
+            // what's currently configured for the Dataverse. In other words
+            // we can't get "dependent" DOIs assigned to files in a dataset
+            // with the registered id that is a handle; or even a DOI, but in
+            // an authority that's different from what's currently configured.
+            // File PIDs may be enabled/disabled per collection.
+            boolean registerGlobalIdsForFiles = ctxt.systemConfig().isFilePIDsEnabledForCollection(
+                    getDataset().getOwner()) 
+                    && pidProvider.canCreatePidsLike(dataset.getGlobalId());
+
+            if (registerGlobalIdsForFiles 
+                    && dataset.getLatestVersion().getMinorVersionNumber() != null
+                    && dataset.getLatestVersion().getMinorVersionNumber().equals((long) 0)) {
+                // A false return value indicates a failure in calling the service
+                for (DataFile df : dataset.getFiles()) {
+                    logger.log(Level.FINE, "registering global id for file {0}", df.getId());
+                    // A false return value indicates a failure in calling the service
+                    if (!pidProvider.publicizeIdentifier(df)) {
+                        throw new Exception();
+                    }
+                    df.setGlobalIdCreateTime(getTimestamp());
+                    df.setIdentifierRegistered(true);
                 }
-                dataset.setGlobalIdCreateTime(new Date()); // TODO these two methods should be in the responsibility of the idServiceBean.
-                dataset.setIdentifierRegistered(true);
-            } catch (Throwable e) {
-                ctxt.datasets().removeDatasetLocks(dataset, DatasetLock.Reason.pidRegister);
-                throw new CommandException(BundleUtil.getStringFromBundle("dataset.publish.error", args), this);
             }
+            if (!pidProvider.publicizeIdentifier(dataset)) {
+                throw new Exception();
+            }
+            dataset.setGlobalIdCreateTime(new Date()); // TODO these two methods should be in the responsibility of the
+                                                       // pidProvider.
+            dataset.setIdentifierRegistered(true);
+        } catch (Throwable e) {
+            logger.warning("Failed to publicize the identifier " + dataset.getGlobalId().asString()
+                    + ", or to publicize a file in the dataset; notifying the user(s), unlocking the dataset");
+
+            // Send failure notification to the user:
+            notifyUsersDatasetPublishStatus(ctxt, dataset, UserNotification.Type.PUBLISHFAILED_PIDREG);
+
+            ctxt.datasets().removeDatasetLocks(dataset, DatasetLock.Reason.finalizePublication);
+            throw new CommandException(
+                    BundleUtil.getStringFromBundle("dataset.publish.error", pidProvider.getProviderInformation()),
+                    this);
         }
     }
     
@@ -272,8 +464,9 @@ private void updateFiles(Timestamp updateTime, CommandContext ctxt) throws Comma
             if (dataFile.getPublicationDate() == null) {
                 // this is a new, previously unpublished file, so publish by setting date
                 dataFile.setPublicationDate(updateTime);
-                
-                // check if any prexisting roleassignments have file download and send notifications
+
+                // check if any pre-existing role assignments have file download and send
+                // notifications
                 notifyUsersFileDownload(ctxt, dataFile);
             }
             
@@ -284,45 +477,11 @@ private void updateFiles(Timestamp updateTime, CommandContext ctxt) throws Comma
             
             
             if (dataFile.isRestricted()) {
-                // A couple things need to happen if the file has been restricted: 
-                // 1. If there's a map layer associated with this shape file, or 
-                //    tabular-with-geo-tag file, all that map layer data (that 
-                //    includes most of the actual data in the file!) need to be
-                //    removed from WorldMap and GeoConnect, since anyone can get 
-                //    download the data from there;
-                // 2. If this (image) file has been assigned as the dedicated 
+                // If the file has been restricted: 
+                //    If this (image) file has been assigned as the dedicated 
                 //    thumbnail for the dataset, we need to remove that assignment, 
                 //    now that the file is restricted. 
-
-                // Map layer: 
-                
-                if (ctxt.mapLayerMetadata().findMetadataByDatafile(dataFile) != null) {
-                    // (We need an AuthenticatedUser in order to produce a WorldMap token!)
-                    String id = getUser().getIdentifier();
-                    id = id.startsWith("@") ? id.substring(1) : id;
-                    AuthenticatedUser authenticatedUser = ctxt.authentication().getAuthenticatedUser(id);
-                    try {
-                        ctxt.mapLayerMetadata().deleteMapLayerFromWorldMap(dataFile, authenticatedUser);
-
-                        // If that was successful, delete the layer on the Dataverse side as well:
-                        //SEK 4/20/2017                
-                        //Command to delete from Dataverse side
-                        ctxt.engine().submit(new DeleteMapLayerMetadataCommand(this.getRequest(), dataFile));
-
-                        // RP - Bit of hack, update the datafile here b/c the reference to the datafile 
-                        // is not being passed all the way up/down the chain.   
-                        //
-                        dataFile.setPreviewImageAvailable(false);
-
-                    } catch (IOException ioex) {
-                        // We are not going to treat it as a fatal condition and bail out, 
-                        // but we will send a notification to the user, warning them about
-                        // the layer still being out there, un-deleted:
-                        ctxt.notifications().sendNotification(authenticatedUser, getTimestamp(), UserNotification.Type.MAPLAYERDELETEFAILED, dataFile.getFileMetadata().getId());
-                    }
-
-                }
-                
+               
                 // Dataset thumbnail assignment: 
                 
                 if (dataFile.equals(getDataset().getThumbnailFile())) {
@@ -343,13 +502,14 @@ private void notifyUsersFileDownload(CommandContext ctxt, DvObject subject) {
             .forEach( au -> ctxt.notifications().sendNotification(au, getTimestamp(), UserNotification.Type.GRANTFILEACCESS, getDataset().getId()) );
     }
     
-    private void notifyUsersDatasetPublish(CommandContext ctxt, DvObject subject) {
+    private void notifyUsersDatasetPublishStatus(CommandContext ctxt, DvObject subject, UserNotification.Type type) {
+        
         ctxt.roles().rolesAssignments(subject).stream()
             .filter(  ra -> ra.getRole().permissions().contains(Permission.ViewUnpublishedDataset) || ra.getRole().permissions().contains(Permission.DownloadFile))
             .flatMap( ra -> ctxt.roleAssignees().getExplicitUsers(ctxt.roleAssignees().getRoleAssignee(ra.getAssigneeIdentifier())).stream() )
             .distinct() // prevent double-send
             //.forEach( au -> ctxt.notifications().sendNotification(au, timestamp, messageType, theDataset.getId()) ); //not sure why this line doesn't work instead
-            .forEach( au -> ctxt.notifications().sendNotification(au, getTimestamp(), UserNotification.Type.PUBLISHEDDS, getDataset().getLatestVersion().getId()) ); 
+            .forEach( au -> ctxt.notifications().sendNotificationInNewTransaction(au, getTimestamp(), type, getDataset().getLatestVersion().getId()) ); 
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetCollectionQuotaCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetCollectionQuotaCommand.java
new file mode 100644
index 00000000000..49f14e7c280
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetCollectionQuotaCommand.java
@@ -0,0 +1,51 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author landreev
+ * The command doesn't do much. It's sole purpose is to check the permissions
+ * when it's called by the /api/dataverses/.../storage/quota api. 
+ */
+// @RequiredPermissions - none defined, dynamic
+public class GetCollectionQuotaCommand  extends AbstractCommand<Long> {
+
+    private static final Logger logger = Logger.getLogger(GetCollectionQuotaCommand.class.getCanonicalName());
+    
+    private final Dataverse dataverse;
+    
+    public GetCollectionQuotaCommand(DataverseRequest aRequest, Dataverse target) {
+        super(aRequest, target);
+        dataverse = target;
+    } 
+        
+    @Override
+    public Long execute(CommandContext ctxt) throws CommandException {
+               
+        if (dataverse != null && dataverse.getStorageQuota() != null) {
+            return dataverse.getStorageQuota().getAllocation();
+        }
+        
+        return null;
+    }
+
+    @Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        return Collections.singletonMap("",
+                dataverse.isReleased() ? Collections.<Permission>emptySet()
+                : Collections.singleton(Permission.ViewUnpublishedDataverse));
+    }    
+}
+
+    
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetCollectionStorageUseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetCollectionStorageUseCommand.java
new file mode 100644
index 00000000000..c30a5a34a81
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetCollectionStorageUseCommand.java
@@ -0,0 +1,45 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author landreev
+ */
+@RequiredPermissions(Permission.ManageDataversePermissions)
+// alternatively, we could make it dynamic - public for published collections
+// and Permission.ViewUnpublishedDataverse required otherwise (?)
+public class GetCollectionStorageUseCommand extends AbstractCommand<Long> {
+
+    private static final Logger logger = Logger.getLogger(GetCollectionStorageUseCommand.class.getCanonicalName());
+    
+    private final Dataverse collection;
+    
+    public GetCollectionStorageUseCommand(DataverseRequest aRequest, Dataverse target) {
+        super(aRequest, target);
+        collection = target;
+    } 
+        
+    @Override
+    public Long execute(CommandContext ctxt) throws CommandException {
+               
+        if (collection == null) {
+            throw new CommandException("null collection passed to get storage use command", this);
+        }
+        return ctxt.storageUse().findStorageSizeByDvContainerId(collection.getId());        
+    }
+
+    /*@Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        return Collections.singletonMap("",
+                dataverse.isReleased() ? Collections.<Permission>emptySet()
+                : Collections.singleton(Permission.ViewUnpublishedDataverse));
+    }*/   
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataFileCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataFileCommand.java
index fdf47bbd2dd..369f3cbfda6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataFileCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataFileCommand.java
@@ -11,35 +11,34 @@
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
 /**
- *
  * @author Matthew
  */
 // no annotations here, since permissions are dynamically decided
 // based off GetDatasetCommand for similar permissions checking
 public class GetDataFileCommand extends AbstractCommand<DataFile> {
 
-    private final DataFile df;
+    private final DataFile dataFile;
 
-    public GetDataFileCommand(DataverseRequest aRequest, DataFile anAffectedDataset) {
-        super(aRequest, anAffectedDataset);
-        df = anAffectedDataset;
+    public GetDataFileCommand(DataverseRequest aRequest, DataFile dataFile) {
+        super(aRequest, dataFile);
+        this.dataFile = dataFile;
     }
 
     @Override
     public DataFile execute(CommandContext ctxt) throws CommandException {
-        return df;
+        return dataFile;
     }
 
     @Override
     public Map<String, Set<Permission>> getRequiredPermissions() {
         return Collections.singletonMap("",
-                df.isReleased() ? Collections.<Permission>emptySet()
-                : Collections.singleton(Permission.ViewUnpublishedDataset));
+                dataFile.isReleased() ? Collections.emptySet()
+                        : Collections.singleton(Permission.ViewUnpublishedDataset));
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDatasetSchemaCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDatasetSchemaCommand.java
new file mode 100644
index 00000000000..2d5e1251614
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDatasetSchemaCommand.java
@@ -0,0 +1,38 @@
+
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+
+
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author stephenkraffmiller
+ */
+@RequiredPermissions(Permission.AddDataset)
+public class GetDatasetSchemaCommand extends AbstractCommand<String> {
+    
+    private static final Logger logger = Logger.getLogger(GetDatasetSchemaCommand.class.getCanonicalName());
+    
+    private final Dataverse dataverse;
+    
+    public GetDatasetSchemaCommand(DataverseRequest aRequest, Dataverse target) {
+        super(aRequest, target);
+        dataverse = target;
+    }
+
+    @Override
+    public String execute(CommandContext ctxt) throws CommandException {            
+            return ctxt.dataverses().getCollectionDatasetSchema(dataverse.getAlias());                   
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDatasetStorageSizeCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDatasetStorageSizeCommand.java
new file mode 100644
index 00000000000..09b33c4efc4
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDatasetStorageSizeCommand.java
@@ -0,0 +1,83 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author skraffmi
+ */
+@RequiredPermissions({})
+public class GetDatasetStorageSizeCommand extends AbstractCommand<Long> {
+
+    private static final Logger logger = Logger.getLogger(GetDataverseStorageSizeCommand.class.getCanonicalName());
+
+    private final Dataset dataset;
+    private final Boolean countCachedFiles;
+    private final Mode mode;
+    private final DatasetVersion version;
+    
+    public enum Mode {
+
+        STORAGE, DOWNLOAD
+    }
+
+    public GetDatasetStorageSizeCommand(DataverseRequest aRequest, Dataset target) {
+        super(aRequest, target);
+        dataset = target;
+        countCachedFiles = false;
+        mode = Mode.DOWNLOAD;
+        version = null;
+    }
+
+    public GetDatasetStorageSizeCommand(DataverseRequest aRequest, Dataset target, boolean countCachedFiles, Mode mode, DatasetVersion version) {
+        super(aRequest, target);
+        dataset = target;
+        this.countCachedFiles = countCachedFiles;
+        this.mode = mode;
+        this.version = version;
+    }
+
+    @Override
+    public Long execute(CommandContext ctxt) throws CommandException {
+        if (dataset == null) {
+            // should never happen - must indicate some data corruption in the database
+            throw new CommandException(BundleUtil.getStringFromBundle("datasets.api.listing.error"), this);
+        }
+
+        logger.fine("getDataverseStorageSize called on " + dataset.getDisplayName());
+
+        try {
+            return ctxt.datasets().findStorageSize(dataset, countCachedFiles, mode, version);
+        } catch (IOException ex) {
+            throw new CommandException(BundleUtil.getStringFromBundle("datasets.api.datasize.ioerror"), this);
+        }
+    }
+
+    @Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        // for data file check permission on owning dataset
+        return Collections.singletonMap("",
+         mode != null &&  mode.equals(Mode.STORAGE) ? Collections.singleton(Permission.ViewUnpublishedDataset)
+                : version !=null && version.isDraft() ? Collections.singleton(Permission.ViewUnpublishedDataset) : Collections.<Permission>emptySet());
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataverseFeaturedItemCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataverseFeaturedItemCommand.java
new file mode 100644
index 00000000000..c594887b6ed
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataverseFeaturedItemCommand.java
@@ -0,0 +1,37 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Retrieves a particular featured item {@link DataverseFeaturedItem}.
+ */
+public class GetDataverseFeaturedItemCommand extends AbstractCommand<DataverseFeaturedItem> {
+
+    private final DataverseFeaturedItem dataverseFeaturedItem;
+
+    public GetDataverseFeaturedItemCommand(DataverseRequest request, DataverseFeaturedItem dataverseFeaturedItem) {
+        super(request, dataverseFeaturedItem.getDataverse());
+        this.dataverseFeaturedItem = dataverseFeaturedItem;
+    }
+
+    @Override
+    public DataverseFeaturedItem execute(CommandContext ctxt) throws CommandException {
+        return dataverseFeaturedItem;
+    }
+
+    @Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        return Collections.singletonMap("",
+                dataverseFeaturedItem.getDataverse().isReleased() ? Collections.emptySet()
+                        : Collections.singleton(Permission.ViewUnpublishedDataverse));
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataverseStorageSizeCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataverseStorageSizeCommand.java
index 05c62ea6a36..57912a6b4bd 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataverseStorageSizeCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDataverseStorageSizeCommand.java
@@ -59,7 +59,7 @@ public Long execute(CommandContext ctxt) throws CommandException {
             }
             
             try {
-                total += ctxt.datasets().findStorageSize(dataset, countCachedFiles);
+                total += ctxt.datasets().findStorageSize(dataset, countCachedFiles, GetDatasetStorageSizeCommand.Mode.STORAGE, null);
             } catch (IOException ex) {
                 throw new CommandException(BundleUtil.getStringFromBundle("dataverse.datasize.ioerror"), this);
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDraftDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDraftDatasetVersionCommand.java
index 88b5a75ea22..7e32b19e576 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDraftDatasetVersionCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDraftDatasetVersionCommand.java
@@ -24,7 +24,7 @@ public GetDraftDatasetVersionCommand(DataverseRequest aRequest, Dataset anAffect
 
     @Override
     public DatasetVersion execute(CommandContext ctxt) throws CommandException {
-        return ds.getEditVersion();
+        return ds.getOrCreateEditVersion();
     }
     
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDraftFileMetadataIfAvailableCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDraftFileMetadataIfAvailableCommand.java
index 14999548b34..1d83f0dd1f4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDraftFileMetadataIfAvailableCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDraftFileMetadataIfAvailableCommand.java
@@ -1,8 +1,6 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
 import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
@@ -12,25 +10,19 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 
 /**
- *
  * @author Matthew
  */
-@RequiredPermissions( Permission.ViewUnpublishedDataset )
-public class GetDraftFileMetadataIfAvailableCommand extends AbstractCommand<FileMetadata>{
-    private final DataFile df;
+@RequiredPermissions(Permission.ViewUnpublishedDataset)
+public class GetDraftFileMetadataIfAvailableCommand extends AbstractCommand<FileMetadata> {
+    private final DataFile dataFile;
 
-    public GetDraftFileMetadataIfAvailableCommand(DataverseRequest aRequest, DataFile dataFile) {
-        super(aRequest, dataFile);
-        df = dataFile;
+    public GetDraftFileMetadataIfAvailableCommand(DataverseRequest request, DataFile dataFile) {
+        super(request, dataFile);
+        this.dataFile = dataFile;
     }
 
     @Override
     public FileMetadata execute(CommandContext ctxt) throws CommandException {
-        FileMetadata fm = df.getLatestFileMetadata();
-        if(fm.getDatasetVersion().getVersionState().equals(DatasetVersion.VersionState.DRAFT)) {
-            return df.getLatestFileMetadata();
-        } 
-        return null;
+        return dataFile.getDraftFileMetadata();
     }
-    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestAccessibleDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestAccessibleDatasetVersionCommand.java
index 680a5c3aaef..431b3ff47c6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestAccessibleDatasetVersionCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestAccessibleDatasetVersionCommand.java
@@ -17,29 +17,33 @@
 
 /**
  * Get the latest version of a dataset a user can view.
+ *
  * @author Naomi
  */
 // No permission needed to view published dvObjects
 @RequiredPermissions({})
-public class GetLatestAccessibleDatasetVersionCommand extends AbstractCommand<DatasetVersion>{
+public class GetLatestAccessibleDatasetVersionCommand extends AbstractCommand<DatasetVersion> {
     private final Dataset ds;
+    private final boolean includeDeaccessioned;
+    private boolean checkPermsWhenDeaccessioned;
 
     public GetLatestAccessibleDatasetVersionCommand(DataverseRequest aRequest, Dataset anAffectedDataset) {
+        this(aRequest, anAffectedDataset,false, false);
+    }
+
+    public GetLatestAccessibleDatasetVersionCommand(DataverseRequest aRequest, Dataset anAffectedDataset, boolean includeDeaccessioned, boolean checkPermsWhenDeaccessioned) {
         super(aRequest, anAffectedDataset);
         ds = anAffectedDataset;
+        this.includeDeaccessioned = includeDeaccessioned;
+        this.checkPermsWhenDeaccessioned = checkPermsWhenDeaccessioned;
     }
 
     @Override
     public DatasetVersion execute(CommandContext ctxt) throws CommandException {
-
-        if (ds.getLatestVersion().isDraft() && ctxt.permissions().requestOn(getRequest(), ds).has(Permission.ViewUnpublishedDataset)) {
+        if (ds.getLatestVersion().isDraft() && 
+            ctxt.permissions().requestOn(getRequest(), ds).has(Permission.ViewUnpublishedDataset)) {
             return ctxt.engine().submit(new GetDraftDatasetVersionCommand(getRequest(), ds));
         }
-
-        return ctxt.engine().submit(new GetLatestPublishedDatasetVersionCommand(getRequest(), ds));
-
+        return ctxt.engine().submit(new GetLatestPublishedDatasetVersionCommand(getRequest(), ds, includeDeaccessioned, checkPermsWhenDeaccessioned));
     }
-    
-    
-    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestAccessibleFileMetadataCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestAccessibleFileMetadataCommand.java
new file mode 100644
index 00000000000..05f3c73bde0
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestAccessibleFileMetadataCommand.java
@@ -0,0 +1,30 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+public class GetLatestAccessibleFileMetadataCommand extends AbstractGetPublishedFileMetadataCommand {
+
+    public GetLatestAccessibleFileMetadataCommand(DataverseRequest request, DataFile dataFile, boolean includeDeaccessioned) {
+        super(request, dataFile, includeDeaccessioned);
+    }
+
+    @Override
+    public FileMetadata execute(CommandContext ctxt) throws CommandException {
+        FileMetadata fileMetadata = null;
+
+        if (ctxt.permissions().requestOn(getRequest(), dataFile.getOwner()).has(Permission.ViewUnpublishedDataset)) {
+            fileMetadata = dataFile.getDraftFileMetadata();
+        }
+
+        if (fileMetadata == null) {
+            fileMetadata = getLatestPublishedFileMetadata(ctxt);
+        }
+
+        return fileMetadata;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedDatasetVersionCommand.java
index 18adff2e55c..0afcbe2d0bb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedDatasetVersionCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedDatasetVersionCommand.java
@@ -2,6 +2,7 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
@@ -9,26 +10,56 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 
 /**
- *
  * @author Naomi
  */
 // No permission needed to view published dvObjects
 @RequiredPermissions({})
-public class GetLatestPublishedDatasetVersionCommand extends AbstractCommand<DatasetVersion>{
+public class GetLatestPublishedDatasetVersionCommand extends AbstractCommand<DatasetVersion> {
     private final Dataset ds;
-    
+    private final boolean includeDeaccessioned;
+    private final boolean checkPermsWhenDeaccessioned;
+
     public GetLatestPublishedDatasetVersionCommand(DataverseRequest aRequest, Dataset anAffectedDataset) {
+        this(aRequest, anAffectedDataset, false, false);
+    }
+
+    public GetLatestPublishedDatasetVersionCommand(DataverseRequest aRequest, Dataset anAffectedDataset, boolean includeDeaccessioned, boolean checkPermsWhenDeaccessioned) {
         super(aRequest, anAffectedDataset);
         ds = anAffectedDataset;
+        this.includeDeaccessioned = includeDeaccessioned;
+        this.checkPermsWhenDeaccessioned = checkPermsWhenDeaccessioned;
     }
 
+    /*
+     * This command depending on the requested parameters will return:
+     *
+     * If the user requested to include a deaccessioned dataset with the files, the command will return the deaccessioned version if the user has permissions to view the files. Otherwise, it will return null.
+     * If the user requested to include a deaccessioned dataset but did not request the files, the command will return the deaccessioned version.
+     * If the user did not request to include a deaccessioned dataset, the command will return the latest published version.
+     *
+     */
     @Override
     public DatasetVersion execute(CommandContext ctxt) throws CommandException {
-        for (DatasetVersion dsv: ds.getVersions()) {
-            if (dsv.isReleased()) {
-                return dsv;
-                }
+        DatasetVersion dsVersionResult = getReleaseOrDeaccessionedDatasetVersion();
+        if (dsVersionResult != null && userHasPermissionsOnDatasetVersion(dsVersionResult, checkPermsWhenDeaccessioned, ctxt, ds)) {
+            return dsVersionResult;
+        }
+        return null;
+    }
+
+    private DatasetVersion getReleaseOrDeaccessionedDatasetVersion() {
+        for (DatasetVersion dsVersion : ds.getVersions()) {
+            if (dsVersion.isReleased() || (includeDeaccessioned && dsVersion.isDeaccessioned())) {
+                return dsVersion;
             }
+        }
         return null;
+    }
+
+    private boolean userHasPermissionsOnDatasetVersion(DatasetVersion dsVersionResult, boolean checkPermsWhenDeaccessioned, CommandContext ctxt, Dataset ds) {
+        if (dsVersionResult.isDeaccessioned() && checkPermsWhenDeaccessioned) {
+            return ctxt.permissions().requestOn(getRequest(), ds).has(Permission.EditDataset);
         }
-    }
\ No newline at end of file
+        return true;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedFileMetadataCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedFileMetadataCommand.java
new file mode 100644
index 00000000000..fc13dba1a34
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedFileMetadataCommand.java
@@ -0,0 +1,19 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+public class GetLatestPublishedFileMetadataCommand extends AbstractGetPublishedFileMetadataCommand {
+
+    public GetLatestPublishedFileMetadataCommand(DataverseRequest request, DataFile dataFile, boolean includeDeaccessioned) {
+        super(request, dataFile, includeDeaccessioned);
+    }
+
+    @Override
+    public FileMetadata execute(CommandContext ctxt) throws CommandException {
+        return getLatestPublishedFileMetadata(ctxt);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetProvJsonCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetProvJsonCommand.java
index 23f08aadd3e..b98cd70a4da 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetProvJsonCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetProvJsonCommand.java
@@ -9,12 +9,12 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.JsonObject;
 
 @RequiredPermissions(Permission.EditDataset)
 public class GetProvJsonCommand extends AbstractCommand<JsonObject> {
@@ -35,13 +35,13 @@ public JsonObject execute(CommandContext ctxt) throws CommandException {
 
         try {
             StorageIO<DataFile> dataAccess = dataFile.getStorageIO();
-            InputStream inputStream = dataAccess.getAuxFileAsInputStream(provJsonExtension);
-            JsonObject jsonObject = null;
-            if(null != inputStream) {
-                JsonReader jsonReader = Json.createReader(inputStream);
-                jsonObject = jsonReader.readObject();
+            try (InputStream inputStream = dataAccess.getAuxFileAsInputStream(provJsonExtension)) {
+                JsonObject jsonObject = null;
+                if (null != inputStream) {
+                    jsonObject = JsonUtil.getJsonObject(inputStream);
+                }
+                return jsonObject;
             }
-            return jsonObject;
         } catch (IOException ex) {
             String error = "Exception caught in DataAccess.getStorageIO(dataFile) getting file. Error: " + ex;
             throw new IllegalCommandException(error, this);
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetSpecificPublishedDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetSpecificPublishedDatasetVersionCommand.java
index 3efb38e4a91..07256f057e2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetSpecificPublishedDatasetVersionCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetSpecificPublishedDatasetVersionCommand.java
@@ -8,6 +8,7 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
@@ -15,27 +16,45 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 
 /**
- *
  * @author Naomi
  */
 // No permission needed to view published dvObjects
 @RequiredPermissions({})
-public class GetSpecificPublishedDatasetVersionCommand extends AbstractCommand<DatasetVersion>{
+public class GetSpecificPublishedDatasetVersionCommand extends AbstractCommand<DatasetVersion> {
     private final Dataset ds;
     private final long majorVersion;
     private final long minorVersion;
-    
+    private boolean includeDeaccessioned;
+    private boolean checkPerms;
+
     public GetSpecificPublishedDatasetVersionCommand(DataverseRequest aRequest, Dataset anAffectedDataset, long majorVersionNum, long minorVersionNum) {
+        this(aRequest, anAffectedDataset, majorVersionNum, minorVersionNum, false, false);
+    }
+
+   
+
+    public GetSpecificPublishedDatasetVersionCommand(DataverseRequest aRequest, Dataset anAffectedDataset, long majorVersionNum, long minorVersionNum, boolean includeDeaccessioned, boolean checkPerms) {
         super(aRequest, anAffectedDataset);
         ds = anAffectedDataset;
         majorVersion = majorVersionNum;
         minorVersion = minorVersionNum;
+        this.includeDeaccessioned = includeDeaccessioned;
+        this.checkPerms = checkPerms;
     }
 
+
     @Override
     public DatasetVersion execute(CommandContext ctxt) throws CommandException {
-        for (DatasetVersion dsv: ds.getVersions()) {
-            if (dsv.isReleased()) {
+        
+        for (DatasetVersion dsv : ds.getVersions()) {
+            if (dsv.isReleased() || (includeDeaccessioned && dsv.isDeaccessioned())) {
+                
+                if(dsv.isDeaccessioned() && checkPerms){
+                    if(!ctxt.permissions().requestOn(getRequest(), ds).has(Permission.EditDataset)){
+                        return null;
+                    }
+                }
+
                 if (dsv.getVersionNumber().equals(majorVersion) && dsv.getMinorVersionNumber().equals(minorVersion)) {
                     return dsv;
                 }
@@ -43,5 +62,5 @@ public DatasetVersion execute(CommandContext ctxt) throws CommandException {
         }
         return null;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetSpecificPublishedFileMetadataByDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetSpecificPublishedFileMetadataByDatasetVersionCommand.java
new file mode 100644
index 00000000000..deffbfb57ee
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetSpecificPublishedFileMetadataByDatasetVersionCommand.java
@@ -0,0 +1,34 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+public class GetSpecificPublishedFileMetadataByDatasetVersionCommand extends AbstractGetPublishedFileMetadataCommand {
+    private final long majorVersion;
+    private final long minorVersion;
+
+    public GetSpecificPublishedFileMetadataByDatasetVersionCommand(DataverseRequest request, DataFile dataFile, long majorVersion, long minorVersion, boolean includeDeaccessioned) {
+        super(request, dataFile, includeDeaccessioned);
+        this.majorVersion = majorVersion;
+        this.minorVersion = minorVersion;
+    }
+
+    @Override
+    public FileMetadata execute(CommandContext ctxt) throws CommandException {
+        return dataFile.getFileMetadatas().stream()
+                .filter(fileMetadata -> isRequestedVersionFileMetadata(fileMetadata, ctxt))
+                .findFirst()
+                .orElse(null);
+    }
+
+    private boolean isRequestedVersionFileMetadata(FileMetadata fileMetadata, CommandContext ctxt) {
+        DatasetVersion datasetVersion = fileMetadata.getDatasetVersion();
+        return isDatasetVersionAccessible(datasetVersion, dataFile.getOwner(), ctxt)
+                && datasetVersion.getVersionNumber().equals(majorVersion)
+                && datasetVersion.getMinorVersionNumber().equals(minorVersion);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetUserPermittedCollectionsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetUserPermittedCollectionsCommand.java
new file mode 100644
index 00000000000..c4888c8c99c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetUserPermittedCollectionsCommand.java
@@ -0,0 +1,61 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+
+import java.util.List;
+import java.util.logging.Logger;
+
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+
+@RequiredPermissions({})
+public class GetUserPermittedCollectionsCommand extends AbstractCommand<JsonObjectBuilder> {
+    private static final Logger logger = Logger.getLogger(GetUserPermittedCollectionsCommand.class.getCanonicalName());
+
+    private DataverseRequest request;
+    private AuthenticatedUser user;
+    private String permission;
+    public GetUserPermittedCollectionsCommand(DataverseRequest request, AuthenticatedUser user, String permission) {
+        super(request, (DvObject) null);
+        this.request = request;
+        this.user = user;
+        this.permission = permission;
+    }
+
+    @Override
+    public JsonObjectBuilder execute(CommandContext ctxt) throws CommandException {
+        if (user == null) {
+            throw new CommandException("User not found.", this);
+        }
+        int permissionBit;
+        try {
+            permissionBit = permission.equalsIgnoreCase("any") ?
+                    Integer.MAX_VALUE : (1 << Permission.valueOf(permission).ordinal());
+        } catch (IllegalArgumentException e) {
+            throw new CommandException("Permission not valid.", this);
+        }
+        List<Dataverse> collections = ctxt.permissions().findPermittedCollections(request, user, permissionBit);
+        if (collections != null) {
+            JsonObjectBuilder job = Json.createObjectBuilder();
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+            for (Dataverse dv : collections) {
+                jab.add(json(dv));
+            }
+            job.add("count", collections.size());
+            job.add("items", jab);
+            return job;
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetUserTracesCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetUserTracesCommand.java
new file mode 100644
index 00000000000..df0b5d785e4
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetUserTracesCommand.java
@@ -0,0 +1,260 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersionUser;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GuestbookResponse;
+import edu.harvard.iq.dataverse.RoleAssignment;
+import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroup;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.search.savedsearch.SavedSearch;
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+
+// Superuser-only enforced below.
+@RequiredPermissions({})
+public class GetUserTracesCommand extends AbstractCommand<JsonObjectBuilder> {
+
+    private static final Logger logger = Logger.getLogger(GetUserTracesCommand.class.getCanonicalName());
+    
+    private DataverseRequest request;
+    private AuthenticatedUser user;
+    private String element;
+
+    public GetUserTracesCommand(DataverseRequest request, AuthenticatedUser user, String element) {
+        super(request, (DvObject) null);
+        this.request = request;
+        this.user = user;
+        this.element = element;
+    }
+
+    @Override
+    public JsonObjectBuilder execute(CommandContext ctxt) throws CommandException {
+        if (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser()) {
+            throw new PermissionException("Get user traces command can only be called by superusers.", this, null, null);
+        }
+        if (user == null) {
+            throw new CommandException("Cannot get traces. User not found.", this);
+        }
+        Long userId = user.getId();
+        JsonObjectBuilder traces = Json.createObjectBuilder();
+        if (element == null || element.equals("roleAssignments")) {
+            // List<Long> roleAssignments =
+            // ctxt.permissions().getDvObjectsUserHasRoleOn(user);
+            List<RoleAssignment> roleAssignments = ctxt.roleAssignees().getAssignmentsFor(user.getIdentifier());
+            if (roleAssignments != null && !roleAssignments.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                for (RoleAssignment roleAssignment : roleAssignments) {
+                    jab.add(NullSafeJsonBuilder.jsonObjectBuilder()
+                            .add("id", roleAssignment.getId())
+                            .add("definitionPointName", roleAssignment.getDefinitionPoint().getCurrentName())
+                            .add("definitionPointIdentifier", roleAssignment.getDefinitionPoint().getIdentifier())
+                            .add("definitionPointId", roleAssignment.getDefinitionPoint().getId())
+                            .add("roleAlias", roleAssignment.getRole().getAlias())
+                            .add("roleName", roleAssignment.getRole().getName()));
+                }
+                job.add("count", roleAssignments.size());
+                job.add("items", jab);
+                traces.add("roleAssignments", job);
+            }
+        }
+        if (element == null || element.equals("dataverseCreator")) {
+            List<Dataverse> dataversesCreated = ctxt.dataverses().findByCreatorId(userId);
+            if (dataversesCreated != null && !dataversesCreated.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                for (Dataverse dataverse : dataversesCreated) {
+                    jab.add(Json.createObjectBuilder()
+                            .add("id", dataverse.getId())
+                            .add("alias", dataverse.getAlias()));
+                }
+                job.add("count", dataversesCreated.size());
+                job.add("items", jab);
+                traces.add("dataverseCreator", job);
+            }
+        }
+        if (element == null || element.equals("dataversePublisher")) {
+            List<Dataverse> dataversesPublished = ctxt.dataverses().findByReleaseUserId(userId);
+            if (dataversesPublished != null && !dataversesPublished.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                for (Dataverse dataverse : dataversesPublished) {
+                    jab.add(Json.createObjectBuilder()
+                            .add("id", dataverse.getId())
+                            .add("alias", dataverse.getAlias()));
+                }
+                job.add("count", dataversesPublished.size());
+                job.add("items", jab);
+                traces.add("dataversePublisher", job);
+            }
+        }
+        if (element == null || element.equals("datasetCreator")) {
+            List<Dataset> datasetsCreated = ctxt.datasets().findByCreatorId(userId);
+            if (datasetsCreated != null && !datasetsCreated.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                for (Dataset dataset : datasetsCreated) {
+                    jab.add(Json.createObjectBuilder()
+                            .add("id", dataset.getId())
+                            .add("pid", dataset.getGlobalId().asString()));
+                }
+                job.add("count", datasetsCreated.size());
+                job.add("items", jab);
+                traces.add("datasetCreator", job);
+            }
+        }
+        if (element == null || element.equals("datasetPublisher")) {
+            List<Dataset> datasetsPublished = ctxt.datasets().findByReleaseUserId(userId);
+            if (datasetsPublished != null && !datasetsPublished.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                for (Dataset dataset : datasetsPublished) {
+                    jab.add(Json.createObjectBuilder()
+                            .add("id", dataset.getId())
+                            .add("pid", dataset.getGlobalId().asString()));
+                }
+                job.add("count", datasetsPublished.size());
+                job.add("items", jab);
+                traces.add("datasetPublisher", job);
+            }
+        }
+        if (element == null || element.equals("dataFileCreator")) {
+            List<DataFile> dataFilesCreated = ctxt.files().findByCreatorId(userId);
+            if (dataFilesCreated != null && !dataFilesCreated.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                for (DataFile dataFile : dataFilesCreated) {
+                    jab.add(Json.createObjectBuilder()
+                            .add("id", dataFile.getId())
+                            .add("filename", dataFile.getCurrentName())
+                            .add("datasetPid", dataFile.getOwner().getGlobalId().asString()));
+                }
+                job.add("count", dataFilesCreated.size());
+                job.add("items", jab);
+                traces.add("dataFileCreator", job);
+            }
+        }
+        if (element == null || element.equals("dataFilePublisher")) {
+            // TODO: Consider removing this because we don't seem to populate releaseuser_id
+            // for files.
+            List<DataFile> dataFilesPublished = ctxt.files().findByReleaseUserId(userId);
+            if (dataFilesPublished != null && !dataFilesPublished.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                for (DataFile dataFile : dataFilesPublished) {
+                    jab.add(Json.createObjectBuilder()
+                            .add("id", dataFile.getId())
+                            .add("filename", dataFile.getCurrentName())
+                            .add("datasetPid", dataFile.getOwner().getGlobalId().asString()));
+                }
+                job.add("count", dataFilesPublished.size());
+                job.add("items", jab);
+                traces.add("dataFilePublisher", job);
+            }
+        }
+        if (element == null || element.equals("datasetVersionUsers")) {
+            // These are the users who have published a version (or created a draft).
+            List<DatasetVersionUser> datasetVersionUsers = ctxt.datasetVersion().getDatasetVersionUsersByAuthenticatedUser(user);
+            if (datasetVersionUsers != null && !datasetVersionUsers.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                for (DatasetVersionUser datasetVersionUser : datasetVersionUsers) {
+                    jab.add(Json.createObjectBuilder()
+                            .add("id", datasetVersionUser.getId())
+                            .add("dataset", datasetVersionUser.getDatasetVersion().getDataset().getGlobalId().asString())
+                            .add("version", datasetVersionUser.getDatasetVersion().getSemanticVersion()));
+                }
+                job.add("count", datasetVersionUsers.size());
+                job.add("items", jab);
+                traces.add("datasetVersionUsers", job);
+            }
+        }
+        if (element == null || element.equals("explicitGroups")) {
+            Set<ExplicitGroup> explicitGroups = ctxt.explicitGroups().findDirectlyContainingGroups(user);
+            if (explicitGroups != null && !explicitGroups.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                for (ExplicitGroup explicitGroup : explicitGroups) {
+                    jab.add(Json.createObjectBuilder()
+                            .add("id", explicitGroup.getId())
+                            .add("name", explicitGroup.getDisplayName()));
+                }
+                job.add("count", explicitGroups.size());
+                job.add("items", jab);
+                traces.add("explicitGroups", job);
+            }
+        }
+        if (element == null || element.equals("guestbookEntries")) {
+            List<GuestbookResponse> guestbookResponses = ctxt.responses().findByAuthenticatedUserId(user);
+            if (guestbookResponses != null && !guestbookResponses.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                // The feeling is that this is too much detail for the call for all elements so
+                // we only show a count in that case.
+                if (element != null) {
+                    JsonArrayBuilder jab = Json.createArrayBuilder();
+                    for (GuestbookResponse guestbookResponse : guestbookResponses) {
+                        try {
+                            JsonObjectBuilder gbe = Json.createObjectBuilder()
+                                    .add("id", guestbookResponse.getId())
+                                    .add("eventType", guestbookResponse.getEventType())
+                                    .add("filename", guestbookResponse.getDataFile().getCurrentName())
+                                    .add("date", guestbookResponse.getResponseDate())
+                                    .add("guestbookName", guestbookResponse.getGuestbook().getName());
+                            if(guestbookResponse.getDataset().getGlobalId()!=null) {
+                                gbe.add("dataset", guestbookResponse.getDataset().getGlobalId().asString());
+                            }
+                            if (guestbookResponse.getDatasetVersion() != null) {
+                                gbe.add("version", guestbookResponse.getDatasetVersion().getSemanticVersion());
+                            }
+                            jab.add(gbe);
+                        } catch (NullPointerException npe) {
+                            //Legacy/bad db entries
+                            logger.warning("Guestbook id:" + guestbookResponse.getId() + " does not have required info.");
+                        }
+                    }
+                    job.add("items", jab);
+                }
+                job.add("count", guestbookResponses.size());
+                // job.add("items", jab);
+                traces.add("guestbookEntries", job);
+            }
+        }
+        if (element == null || element.equals("savedSearches")) {
+            List<SavedSearch> savedSearchs = ctxt.savedSearches().findByAuthenticatedUser(user);
+            if (savedSearchs != null && !savedSearchs.isEmpty()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                JsonArrayBuilder jab = Json.createArrayBuilder();
+                for (SavedSearch savedSearch : savedSearchs) {
+                    jab.add(Json.createObjectBuilder()
+                            .add("id", savedSearch.getId()));
+                }
+                job.add("count", savedSearchs.size());
+                job.add("items", jab);
+                traces.add("savedSearches", job);
+            }
+        }
+        JsonObjectBuilder result = Json.createObjectBuilder();
+        result.add("user", Json.createObjectBuilder()
+                .add("identifier", user.getIdentifier())
+                .add("name", user.getName()));
+        result.add("traces", traces);
+        return result;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GoogleCloudSubmitToArchiveCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GoogleCloudSubmitToArchiveCommand.java
new file mode 100644
index 00000000000..7d749262b87
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GoogleCloudSubmitToArchiveCommand.java
@@ -0,0 +1,186 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import com.google.auth.oauth2.ServiceAccountCredentials;
+import com.google.cloud.storage.Blob;
+import com.google.cloud.storage.Bucket;
+import com.google.cloud.storage.Storage;
+import com.google.cloud.storage.StorageException;
+import com.google.cloud.storage.StorageOptions;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetLock.Reason;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.workflow.step.Failure;
+import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
+import org.apache.commons.codec.binary.Hex;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.util.Map;
+import java.util.logging.Logger;
+
+@RequiredPermissions(Permission.PublishDataset)
+public class GoogleCloudSubmitToArchiveCommand extends AbstractSubmitToArchiveCommand {
+
+    private static final Logger logger = Logger.getLogger(GoogleCloudSubmitToArchiveCommand.class.getName());
+    private static final String GOOGLECLOUD_BUCKET = ":GoogleCloudBucket";
+    private static final String GOOGLECLOUD_PROJECT = ":GoogleCloudProject";
+
+    public GoogleCloudSubmitToArchiveCommand(DataverseRequest aRequest, DatasetVersion version) {
+        super(aRequest, version);
+    }
+
+    @Override
+    public WorkflowStepResult performArchiveSubmission(DatasetVersion dv, ApiToken token, Map<String, String> requestedSettings) {
+        logger.fine("In GoogleCloudSubmitToArchiveCommand...");
+        String bucketName = requestedSettings.get(GOOGLECLOUD_BUCKET);
+        String projectName = requestedSettings.get(GOOGLECLOUD_PROJECT);
+        logger.fine("Project: " + projectName + " Bucket: " + bucketName);
+        if (bucketName != null && projectName != null) {
+            Storage storage;
+            //Set a failure status that will be updated if we succeed
+            JsonObjectBuilder statusObject = Json.createObjectBuilder();
+            statusObject.add(DatasetVersion.ARCHIVAL_STATUS, DatasetVersion.ARCHIVAL_STATUS_FAILURE);
+            statusObject.add(DatasetVersion.ARCHIVAL_STATUS_MESSAGE, "Bag not transferred");
+            
+            String cloudKeyFile = JvmSettings.FILES_DIRECTORY.lookup() + File.separator + "googlecloudkey.json";
+            
+            try (FileInputStream cloudKeyStream = new FileInputStream(cloudKeyFile)) {
+                storage = StorageOptions.newBuilder()
+                        .setCredentials(ServiceAccountCredentials.fromStream(cloudKeyStream))
+                        .setProjectId(projectName)
+                        .build()
+                        .getService();
+                Bucket bucket = storage.get(bucketName);
+
+                Dataset dataset = dv.getDataset();
+                if (dataset.getLockFor(Reason.finalizePublication) == null) {
+
+                    String spaceName = dataset.getGlobalId().asString().replace(':', '-').replace('/', '-')
+                            .replace('.', '-').toLowerCase();
+
+                    String dataciteXml = getDataCiteXml(dv);
+                    MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+                    try (PipedInputStream dataciteIn = new PipedInputStream();
+                            DigestInputStream digestInputStream = new DigestInputStream(dataciteIn, messageDigest)) {
+                        // Add datacite.xml file
+
+                        Thread dcThread = new Thread(new Runnable() {
+                            public void run() {
+                                try (PipedOutputStream dataciteOut = new PipedOutputStream(dataciteIn)) {
+
+                                    dataciteOut.write(dataciteXml.getBytes(StandardCharsets.UTF_8));
+                                    dataciteOut.close();
+                                    success = true;
+                                } catch (Exception e) {
+                                    logger.severe("Error creating datacite.xml: " + e.getMessage());
+                                    // TODO Auto-generated catch block
+                                    e.printStackTrace();
+                                    // throw new RuntimeException("Error creating datacite.xml: " + e.getMessage());
+                                }
+                            }
+                        });
+                        dcThread.start();
+                        // Have seen Pipe Closed errors for other archivers when used as a workflow
+                        // without this delay loop
+                        int i = 0;
+                        while (digestInputStream.available() <= 0 && i < 100) {
+                            Thread.sleep(10);
+                            i++;
+                        }
+                        Blob dcXml = bucket.create(spaceName + "/datacite.v" + dv.getFriendlyVersionNumber() + ".xml", digestInputStream, "text/xml", Bucket.BlobWriteOption.doesNotExist());
+
+                        dcThread.join();
+                        String checksum = dcXml.getMd5ToHexString();
+                        logger.fine("Content: datacite.xml added with checksum: " + checksum);
+                        String localchecksum = Hex.encodeHexString(digestInputStream.getMessageDigest().digest());
+                        if (!success || !checksum.equals(localchecksum)) {
+                            logger.severe("Failure on " + spaceName);
+                            logger.severe(success ? checksum + " not equal to " + localchecksum : "datacite.xml transfer did not succeed");
+                            try {
+                                dcXml.delete(Blob.BlobSourceOption.generationMatch());
+                            } catch (StorageException se) {
+                                logger.warning(se.getMessage());
+                            }
+                            return new Failure("Error in transferring DataCite.xml file to GoogleCloud",
+                                    "GoogleCloud Submission Failure: incomplete metadata transfer");
+                        }
+
+                        // Store BagIt file
+                        success = false;
+                        String fileName = spaceName + ".v" + dv.getFriendlyVersionNumber() + ".zip";
+
+                        // Add BagIt ZIP file
+                        // Google uses MD5 as one way to verify the
+                        // transfer
+                        messageDigest = MessageDigest.getInstance("MD5");
+                        try (PipedInputStream in = new PipedInputStream(100000);
+                                DigestInputStream digestInputStream2 = new DigestInputStream(in, messageDigest)) {
+                            Thread bagThread = startBagThread(dv, in, digestInputStream2, dataciteXml, token);
+                            Blob bag = bucket.create(spaceName + "/" + fileName, digestInputStream2, "application/zip",
+                                    Bucket.BlobWriteOption.doesNotExist());
+                            if (bag.getSize() == 0) {
+                                throw new IOException("Empty Bag");
+                            }
+                            bagThread.join();
+
+                            checksum = bag.getMd5ToHexString();
+                            logger.fine("Bag: " + fileName + " added with checksum: " + checksum);
+                            localchecksum = Hex.encodeHexString(digestInputStream2.getMessageDigest().digest());
+                            if (!success || !checksum.equals(localchecksum)) {
+                                logger.severe(success ? checksum + " not equal to " + localchecksum
+                                        : "bag transfer did not succeed");
+                                try {
+                                    bag.delete(Blob.BlobSourceOption.generationMatch());
+                                } catch (StorageException se) {
+                                    logger.warning(se.getMessage());
+                                }
+                                return new Failure("Error in transferring Zip file to GoogleCloud",
+                                        "GoogleCloud Submission Failure: incomplete archive transfer");
+                            }
+                        }
+
+                        logger.fine("GoogleCloud Submission step: Content Transferred");
+
+                        // Document the location of dataset archival copy location (actually the URL
+                        // where you can view it as an admin)
+                        // Changed to point at bucket where the zip and datacite.xml are visible
+
+                        StringBuffer sb = new StringBuffer("https://console.cloud.google.com/storage/browser/");
+                        sb.append(bucketName + "/" + spaceName);
+                        statusObject.add(DatasetVersion.ARCHIVAL_STATUS, DatasetVersion.ARCHIVAL_STATUS_SUCCESS);
+                        statusObject.add(DatasetVersion.ARCHIVAL_STATUS_MESSAGE, sb.toString());
+                        
+                    }
+                } else {
+                    logger.warning("GoogleCloud Submision Workflow aborted: Dataset locked for pidRegister");
+                    return new Failure("Dataset locked");
+                }
+            } catch (Exception e) {
+                logger.warning(e.getLocalizedMessage());
+                e.printStackTrace();
+                return new Failure("GoogleCloud Submission Failure",
+                        e.getLocalizedMessage() + ": check log for details");
+
+            } finally {
+                dv.setArchivalCopyLocation(statusObject.build().toString());
+            }
+            return WorkflowStepResult.OK;
+        } else {
+            return new Failure("GoogleCloud Submission not configured - no \":GoogleCloudBucket\"  and/or \":GoogleCloudProject\".");
+        }
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GrantSuperuserStatusCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GrantSuperuserStatusCommand.java
index 29f1b891c91..ec8c8976260 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GrantSuperuserStatusCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GrantSuperuserStatusCommand.java
@@ -14,7 +14,7 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
 
 /**
  *
@@ -40,6 +40,10 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
                     this, null, null);
         }
 
+        if (targetUser.isDeactivated()) {
+            throw new CommandException("User " + targetUser.getIdentifier() + " has been deactivated and cannot become a superuser.", this);
+        }
+
         try {
             targetUser.setSuperuser(true);
             ctxt.em().merge(targetUser);
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ImportDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ImportDatasetCommand.java
index daab9771b4e..231ab725188 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ImportDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ImportDatasetCommand.java
@@ -7,13 +7,21 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandExecutionException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
-import static org.apache.commons.lang.StringUtils.isEmpty;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.io.HttpClientResponseHandler;
+
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 /**
  * Imports a dataset from a different system. This command validates that the PID
@@ -55,28 +63,58 @@ protected void additionalParameterTests(CommandContext ctxt) throws CommandExcep
             throw new IllegalCommandException("Imported datasets must have a persistent global identifier.", this);
         }
         
-        if ( ! ctxt.datasets().isIdentifierLocallyUnique(ds) ) {
-            throw new IllegalCommandException("Persistent identifier " + ds.getGlobalIdString() + " already exists in this Dataverse installation.", this);
+        if ( ! ctxt.dvObjects().isGlobalIdLocallyUnique(ds.getGlobalId()) ) {
+            throw new IllegalCommandException("Persistent identifier " + ds.getGlobalId().asString() + " already exists in this Dataverse installation.", this);
         }
         
         String pid = ds.getPersistentURL();
-        GetMethod httpGet = new GetMethod(pid); 
-        httpGet.setFollowRedirects(false);
-
-        HttpClient client = new HttpClient();
+        HttpGet httpGet = new HttpGet(pid);
+        
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setRedirectsEnabled(false)
+                .build();
 
-        try {
-            int responseStatus = client.executeMethod(httpGet);
+        try (CloseableHttpClient client = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build()) {
+            
+            HttpClientResponseHandler<Void> responseHandler = response -> {
+                int responseStatus = response.getCode();
 
-            if ( responseStatus == 404 ) {
-                throw new CommandExecutionException("Provided PID does not exist. Status code for GET '" + pid + "' is 404." , this);
+                if (responseStatus == HttpStatus.SC_NOT_FOUND) {
+                    /*
+                     * Using test DOIs from DataCite, we'll get a 404 when trying to resolve the DOI
+                     * to a landing page, but the DOI may already exist. An extra check here allows
+                     * use of DataCite test DOIs. It also changes import slightly in allowing PIDs
+                     * that exist (and accessible in the PID provider account configured in
+                     * Dataverse) but aren't findable to be used. That could be the case if, for
+                     * example, someone was importing a draft dataset from elsewhere.
+                     */
+                    PidProvider pidProvider = PidUtil.getPidProvider(ds.getGlobalId().getProviderId());
+                    try {
+                        if (pidProvider != null && pidProvider.alreadyRegistered(ds.getGlobalId(), true)) {
+                            return null;
+                        }
+                    } catch (Exception e) {
+                        throw new IOException("Cannot validate PID due to an error: " + e.getMessage());
+                    }
+                    throw new IOException("Provided PID does not exist. Status code for GET '" + pid + "' is 404.");
+                }
+                return null;
+            };
+            try {
+            client.execute(httpGet, responseHandler);
+            } catch (IOException ex) {
+                logger.log(Level.WARNING,
+                        "Error while validating PID at '" + pid + "' for an imported dataset: " + ex.getMessage(), ex);
+                throw new CommandExecutionException(ex.getMessage(), this);
             }
-
-        } catch ( IOException ex ) {
-            logger.log(Level.WARNING, "Error while validating PID at '"+pid+"' for an imported dataset: "+ ex.getMessage(), ex);
-            throw new CommandExecutionException("Cannot validate PID due to a connection error: " + ex.getMessage() , this);
+        } catch (IOException ex) {
+            logger.log(Level.WARNING,
+                    "Error while validating PID at '" + pid + "' for an imported dataset: " + ex.getMessage(), ex);
+            throw new CommandExecutionException("Cannot validate PID due to an error: " + ex.getMessage(), this);
         }
-                
+
     }
     
     @Override
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ImportFromFileSystemCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ImportFromFileSystemCommand.java
index fc0d9362545..9a75f437b66 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ImportFromFileSystemCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ImportFromFileSystemCommand.java
@@ -12,17 +12,20 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
-import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.operations.JobSecurityException;
+import jakarta.batch.operations.JobStartException;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 import java.io.File;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.batch.operations.JobOperator;
-import javax.batch.operations.JobSecurityException;
-import javax.batch.operations.JobStartException;
-import javax.batch.runtime.BatchRuntime;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+
+import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
 
 @RequiredPermissions(Permission.EditDataset)
 public class ImportFromFileSystemCommand extends AbstractCommand<JsonObject> {
@@ -69,8 +72,20 @@ public JsonObject execute(CommandContext ctxt) throws CommandException {
                 logger.info(error);
                 throw new IllegalCommandException(error, this);
             }
-            File directory = new File(System.getProperty("dataverse.files.directory")
-                    + File.separator + dataset.getAuthority() + File.separator + dataset.getIdentifier());
+            
+            File directory = new File(
+                String.join(File.separator, JvmSettings.FILES_DIRECTORY.lookup(),
+                    dataset.getAuthority(), dataset.getIdentifier()));
+            
+            // TODO: The above goes directly to the filesystem directory configured by the
+            //       old "dataverse.files.directory" JVM option (otherwise used for temp
+            //       files only, after the Multistore implementation (#6488).
+            //       We probably want package files to be able to use specific stores instead.
+            //       More importantly perhaps, the approach above does not take into account
+            //       if the dataset may have an AlternativePersistentIdentifier, that may be
+            //       designated isStorageLocationDesignator() - i.e., if a different identifier
+            //       needs to be used to name the storage directory, instead of the main/current
+            //       persistent identifier above.
             if (!isValidDirectory(directory)) {
                 String error = "Dataset directory is invalid. " + directory;
                 logger.info(error);
@@ -83,9 +98,10 @@ public JsonObject execute(CommandContext ctxt) throws CommandException {
                 throw new IllegalCommandException(error, this);
             }
 
-            File uploadDirectory = new File(System.getProperty("dataverse.files.directory")
-                    + File.separator + dataset.getAuthority() + File.separator + dataset.getIdentifier()
-                    + File.separator + uploadFolder);
+            File uploadDirectory = new File(String.join(File.separator, JvmSettings.FILES_DIRECTORY.lookup(),
+                dataset.getAuthority(), dataset.getIdentifier(), uploadFolder));
+            
+            // TODO: see the comment above.
             if (!isValidDirectory(uploadDirectory)) {
                 String error = "Upload folder is not a valid directory.";
                 logger.info(error);
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LinkDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LinkDatasetCommand.java
index fa81abfd0e3..21d36f906c9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LinkDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LinkDatasetCommand.java
@@ -19,14 +19,17 @@
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.IOException;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
+
 import org.apache.solr.client.solrj.SolrServerException;
 
 /**
  *
  * @author skraffmiller
  */
-@RequiredPermissions(Permission.PublishDataset)
+@RequiredPermissions(Permission.LinkDataset)
 public class LinkDatasetCommand extends AbstractCommand<DatasetLinkingDataverse> {
     
     private final Dataset linkedDataset;
@@ -40,16 +43,16 @@ public LinkDatasetCommand(DataverseRequest aRequest, Dataverse dataverse, Datase
 
     @Override
     public DatasetLinkingDataverse execute(CommandContext ctxt) throws CommandException {
-        
-        if (!linkedDataset.isReleased()) {
-            throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.link.not.published"), this);
-        }       
+
         if (linkedDataset.getOwner().equals(linkingDataverse)) {           
             throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.link.not.to.owner"), this);
         }
         if (linkedDataset.getOwner().getOwners().contains(linkingDataverse)) {
             throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.link.not.to.parent.dataverse"), this);
         }
+        if (ctxt.dsLinking().alreadyLinked(linkingDataverse, linkedDataset)) {
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.link.not.already.linked"), this);
+        }
        
         DatasetLinkingDataverse datasetLinkingDataverse = new DatasetLinkingDataverse();
         datasetLinkingDataverse.setDataset(linkedDataset);
@@ -66,13 +69,20 @@ public boolean onSuccess(CommandContext ctxt, Object r) {
         boolean retVal = true;
         DatasetLinkingDataverse dld = (DatasetLinkingDataverse) r;
 
-        try {
-            ctxt.index().indexDataset(dld.getDataset(), true);
-        } catch (IOException | SolrServerException e) {
-            String failureLogText = "Post link dataset indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dld.getDataset().getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, dld.getDataset());
-            retVal = false;
+        ctxt.index().asyncIndexDataset(dld.getDataset(), true);
+
+        List<Dataverse> toReindex = new ArrayList<>();
+        toReindex.add(dld.getLinkingDataverse());
+        toReindex.addAll(dld.getLinkingDataverse().getOwners());
+        for (Dataverse dv : toReindex) {
+            try {
+                ctxt.index().indexDataverse(dv);
+            } catch (IOException | SolrServerException e) {
+                String failureLogText = "Indexing of linking dataverse failed. You can kickoff a re-index of this dataverse with: \r\n curl http://localhost:8080/api/admin/index/dataverses/" + dv.getId().toString();
+                failureLogText += "\r\n" + e.getLocalizedMessage();
+                LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, dv);
+                return false;
+            }
         }
 
         return retVal;
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LinkDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LinkDataverseCommand.java
index 1120c8c3773..2e1aecc9a84 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LinkDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LinkDataverseCommand.java
@@ -17,19 +17,21 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.IOException;
 import java.sql.Timestamp;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
-import java.util.concurrent.Future;
-import javax.ws.rs.core.Response;
+
+import jakarta.ws.rs.core.Response;
 import org.apache.solr.client.solrj.SolrServerException;
 
 /**
  *
  * @author skraffmiller
  */
-@RequiredPermissions(Permission.PublishDataverse)
+@RequiredPermissions(Permission.LinkDataverse)
 public class LinkDataverseCommand extends AbstractCommand<DataverseLinkingDataverse> {
     
     private final Dataverse linkedDataverse;
@@ -45,7 +47,7 @@ public LinkDataverseCommand(DataverseRequest aRequest, Dataverse dataverse, Data
     public DataverseLinkingDataverse execute(CommandContext ctxt) throws CommandException {
         if ((!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser())) {
             throw new PermissionException("Link Dataverse can only be called by superusers.",
-                    this, Collections.singleton(Permission.PublishDataverse), linkingDataverse);
+                    this, Collections.singleton(Permission.LinkDataverse), linkingDataverse);
         }
         if (linkedDataverse.equals(linkingDataverse)) {
             throw new IllegalCommandException("Can't link a dataverse to itself", this);
@@ -53,6 +55,9 @@ public DataverseLinkingDataverse execute(CommandContext ctxt) throws CommandExce
         if (linkedDataverse.getOwners().contains(linkingDataverse)) {
             throw new IllegalCommandException("Can't link a dataverse to its parents", this);
         }
+        if (ctxt.dvLinking().alreadyLinked(linkingDataverse, linkedDataverse)) {
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataverse.linked.error.alreadyLinked", Arrays.asList(linkedDataverse.getName(), linkingDataverse.getName())), this);
+        }
         
         DataverseLinkingDataverse dataverseLinkingDataverse = new DataverseLinkingDataverse();
         dataverseLinkingDataverse.setDataverse(linkedDataverse);
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseFeaturedItemsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseFeaturedItemsCommand.java
new file mode 100644
index 00000000000..0d4051fc7d5
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseFeaturedItemsCommand.java
@@ -0,0 +1,36 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+import java.util.*;
+
+/**
+ * Lists the featured items {@link DataverseFeaturedItem} of a {@link Dataverse}.
+ */
+public class ListDataverseFeaturedItemsCommand extends AbstractCommand<List<DataverseFeaturedItem>> {
+
+    private final Dataverse dataverse;
+
+    public ListDataverseFeaturedItemsCommand(DataverseRequest request, Dataverse dataverse) {
+        super(request, dataverse);
+        this.dataverse = dataverse;
+    }
+
+    @Override
+    public List<DataverseFeaturedItem> execute(CommandContext ctxt) throws CommandException {
+        return ctxt.dataverseFeaturedItems().findAllByDataverseOrdered(dataverse);
+    }
+
+    @Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        return Collections.singletonMap("",
+                dataverse.isReleased() ? Collections.emptySet()
+                        : Collections.singleton(Permission.ViewUnpublishedDataverse));
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseInputLevelsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseInputLevelsCommand.java
new file mode 100644
index 00000000000..1727ac9698f
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseInputLevelsCommand.java
@@ -0,0 +1,40 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseFacet;
+import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevel;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * List the field type input levels {@link DataverseFieldTypeInputLevel} of a {@link Dataverse}.
+ */
+public class ListDataverseInputLevelsCommand extends AbstractCommand<List<DataverseFieldTypeInputLevel>> {
+
+    private final Dataverse dataverse;
+
+    public ListDataverseInputLevelsCommand(DataverseRequest request, Dataverse dataverse) {
+        super(request, dataverse);
+        this.dataverse = dataverse;
+    }
+
+    @Override
+    public List<DataverseFieldTypeInputLevel> execute(CommandContext ctxt) throws CommandException {
+        return dataverse.getDataverseFieldTypeInputLevels();
+    }
+
+    @Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        return Collections.singletonMap("",
+                dataverse.isReleased() ? Collections.emptySet()
+                        : Collections.singleton(Permission.ViewUnpublishedDataverse));
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.java
new file mode 100644
index 00000000000..f1104b5af15
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.java
@@ -0,0 +1,39 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.Template;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+import java.util.*;
+
+/**
+ * Lists the templates {@link Template} of a {@link Dataverse}.
+ */
+@RequiredPermissions(Permission.EditDataverse)
+public class ListDataverseTemplatesCommand extends AbstractCommand<List<Template>> {
+
+    private final Dataverse dataverse;
+
+    public ListDataverseTemplatesCommand(DataverseRequest request, Dataverse dataverse) {
+        super(request, dataverse);
+        this.dataverse = dataverse;
+    }
+
+    @Override
+    public List<Template> execute(CommandContext ctxt) throws CommandException {
+        List<Template> templates = new ArrayList<>();
+
+        if (dataverse.getOwner() != null) {
+            templates.addAll(dataverse.getParentTemplates());
+        }
+
+        templates.addAll(dataverse.getTemplates());
+
+        return templates;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListFacetsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListFacetsCommand.java
index cbab378ccac..36bd1ef4981 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListFacetsCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListFacetsCommand.java
@@ -7,6 +7,7 @@
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -14,27 +15,34 @@
 
 /**
  * List the search facets {@link DataverseFacet} of a {@link Dataverse}.
+ *
  * @author michaelsuo
  */
 // no annotations here, since permissions are dynamically decided
 public class ListFacetsCommand extends AbstractCommand<List<DataverseFacet>> {
 
-    private final Dataverse dv;
+    private final Dataverse dataverse;
+    private boolean rootFacets;
+
+    public ListFacetsCommand(DataverseRequest request, Dataverse dataverse) {
+        this(request, dataverse, true);
+    }
 
-    public ListFacetsCommand(DataverseRequest aRequest, Dataverse aDataverse) {
-        super(aRequest, aDataverse);
-        dv = aDataverse;
+    public ListFacetsCommand(DataverseRequest request, Dataverse dataverse, boolean rootFacets) {
+        super(request, dataverse);
+        this.dataverse = dataverse;
+        this.rootFacets = rootFacets;
     }
 
     @Override
     public List<DataverseFacet> execute(CommandContext ctxt) throws CommandException {
-        return dv.getDataverseFacets();
+        return dataverse.getDataverseFacets(!rootFacets);
     }
 
     @Override
     public Map<String, Set<Permission>> getRequiredPermissions() {
         return Collections.singletonMap("",
-                dv.isReleased() ? Collections.<Permission>emptySet()
-                : Collections.singleton(Permission.ViewUnpublishedDataverse));
+                dataverse.isReleased() ? Collections.<Permission>emptySet()
+                        : Collections.singleton(Permission.ViewUnpublishedDataverse));
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListFeaturedCollectionsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListFeaturedCollectionsCommand.java
new file mode 100644
index 00000000000..4dca522e499
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListFeaturedCollectionsCommand.java
@@ -0,0 +1,50 @@
+
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseFeaturedDataverse;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ *
+ * @author stephenkraffmiller
+ */
+public class ListFeaturedCollectionsCommand extends AbstractCommand<List<Dataverse>> {
+    
+    private final Dataverse dv;
+
+    public ListFeaturedCollectionsCommand(DataverseRequest aRequest, Dataverse aDataverse) {
+        super(aRequest, aDataverse);
+        dv = aDataverse;
+    }
+
+    @Override
+    public List<Dataverse> execute(CommandContext ctxt) throws CommandException {
+        List<Dataverse> featuredTarget = new ArrayList<>();
+        List<DataverseFeaturedDataverse> featuredList = ctxt.featuredDataverses().findByDataverseId(dv.getId());
+            for (DataverseFeaturedDataverse dfd : featuredList) {
+                Dataverse fd = dfd.getFeaturedDataverse();
+                featuredTarget.add(fd);
+            }
+        return featuredTarget;
+        
+    }
+    
+    @Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        return Collections.singletonMap("",
+                dv.isReleased() ? Collections.<Permission>emptySet()
+                : Collections.singleton(Permission.ViewUnpublishedDataverse));
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListMetadataBlockFacetsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListMetadataBlockFacetsCommand.java
new file mode 100644
index 00000000000..abc444dc538
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListMetadataBlockFacetsCommand.java
@@ -0,0 +1,40 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseMetadataBlockFacet;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class ListMetadataBlockFacetsCommand extends AbstractCommand<List<DataverseMetadataBlockFacet>> {
+
+    private final Dataverse dv;
+
+    public ListMetadataBlockFacetsCommand(DataverseRequest aRequest, Dataverse aDataverse) {
+        super(aRequest, aDataverse);
+        dv = aDataverse;
+    }
+
+    @Override
+    public List<DataverseMetadataBlockFacet> execute(CommandContext ctxt) throws CommandException {
+        return dv.getMetadataBlockFacets();
+    }
+
+    @Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        return Collections.singletonMap("",
+                dv.isReleased() ? Collections.<Permission>emptySet()
+                : Collections.singleton(Permission.ViewUnpublishedDataverse));
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListMetadataBlocksCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListMetadataBlocksCommand.java
index 912318cf155..e79d36de07d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListMetadataBlocksCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListMetadataBlocksCommand.java
@@ -3,40 +3,67 @@
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.MetadataBlock;
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import java.util.ArrayList;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Stream;
 
 /**
  * Lists the metadata blocks of a {@link Dataverse}.
- * 
+ *
  * @author michael
  */
 // no annotations here, since permissions are dynamically decided
-public class ListMetadataBlocksCommand extends AbstractCommand<List<MetadataBlock>>{
-    
-    private final Dataverse dv;
-    
-    public ListMetadataBlocksCommand(DataverseRequest aRequest, Dataverse aDataverse) {
-        super(aRequest, aDataverse);
-        dv = aDataverse;
+public class ListMetadataBlocksCommand extends AbstractCommand<List<MetadataBlock>> {
+
+    private final Dataverse dataverse;
+    private final boolean onlyDisplayedOnCreate;
+    private final DatasetType datasetType;
+
+    public ListMetadataBlocksCommand(DataverseRequest request, Dataverse dataverse, boolean onlyDisplayedOnCreate, DatasetType datasetType) {
+        super(request, dataverse);
+        this.dataverse = dataverse;
+        this.onlyDisplayedOnCreate = onlyDisplayedOnCreate;
+        this.datasetType = datasetType;
     }
 
     @Override
     public List<MetadataBlock> execute(CommandContext ctxt) throws CommandException {
-        return dv.getMetadataBlocks();
+        if (onlyDisplayedOnCreate) {
+            return listMetadataBlocksDisplayedOnCreate(ctxt, dataverse);
+        }
+        List<MetadataBlock> orig = dataverse.getMetadataBlocks();
+        List<MetadataBlock> extraFromDatasetTypes = new ArrayList<>();
+        if (datasetType != null) {
+            extraFromDatasetTypes = datasetType.getMetadataBlocks();
+        }
+        return Stream.concat(orig.stream(), extraFromDatasetTypes.stream()).toList();
     }
-    
+
+    private List<MetadataBlock> listMetadataBlocksDisplayedOnCreate(CommandContext ctxt, Dataverse dataverse) {
+        if (dataverse.isMetadataBlockRoot() || dataverse.getOwner() == null) {
+            List<MetadataBlock> orig = ctxt.metadataBlocks().listMetadataBlocksDisplayedOnCreate(dataverse);
+            List<MetadataBlock> extraFromDatasetTypes = new ArrayList<>();
+            if (datasetType != null) {
+                extraFromDatasetTypes = datasetType.getMetadataBlocks();
+            }
+            return Stream.concat(orig.stream(), extraFromDatasetTypes.stream()).toList();
+        }
+        return listMetadataBlocksDisplayedOnCreate(ctxt, dataverse.getOwner());
+    }
+
     @Override
     public Map<String, Set<Permission>> getRequiredPermissions() {
         return Collections.singletonMap("",
-                dv.isReleased() ? Collections.<Permission>emptySet()
-                : Collections.singleton(Permission.ViewUnpublishedDataverse));
-    }    
-    
+                dataverse.isReleased() ? Collections.<Permission>emptySet()
+                        : Collections.singleton(Permission.ViewUnpublishedDataverse));
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListRoleAssignments.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListRoleAssignments.java
index ed438bc3815..b619d32cc7e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListRoleAssignments.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListRoleAssignments.java
@@ -6,15 +6,18 @@
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Collections;
 
 /**
  * 
  * @author michael
  */
-@RequiredPermissions( Permission.ManageDataversePermissions )
+// no annotations here, since permissions are dynamically decided
 public class ListRoleAssignments extends AbstractCommand<List<RoleAssignment>> {
 	
 	private final DvObject definitionPoint;
@@ -25,7 +28,20 @@ public ListRoleAssignments(DataverseRequest aRequest, DvObject aDefinitionPoint)
 
 	@Override
 	public List<RoleAssignment> execute(CommandContext ctxt) throws CommandException {
+            if(definitionPoint.isInstanceofDataset()){
+                List <RoleAssignment> retVal = new ArrayList();
+                retVal.addAll(ctxt.permissions().assignmentsOn(definitionPoint));
+                retVal.addAll(ctxt.permissions().assignmentsOn(definitionPoint.getOwner()));
+                return retVal;
+            }
 		return ctxt.permissions().assignmentsOn(definitionPoint);
 	}
+
+	@Override
+	public Map<String, Set<Permission>> getRequiredPermissions() {
+		return Collections.singletonMap("",
+				definitionPoint.isInstanceofDataset() ? Collections.singleton(Permission.ManageDatasetPermissions)
+						: Collections.singleton(Permission.ManageDataversePermissions));
+	}
 	
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListRolesCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListRolesCommand.java
index da9e5adf247..d82b2e7a81d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListRolesCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListRolesCommand.java
@@ -27,7 +27,7 @@ public ListRolesCommand(DataverseRequest aRequest, Dataverse aDefinitionPoint) {
 
     @Override
     public Set<DataverseRole> execute(CommandContext ctxt) throws CommandException {
-        return definitionPoint.getRoles();
+        return ctxt.roles().availableRoles(definitionPoint.getId());
     }
 
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListVersionsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListVersionsCommand.java
index 51283f29156..b93833ffdf9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListVersionsCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListVersionsCommand.java
@@ -14,6 +14,7 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandExecutionException;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -23,23 +24,57 @@
  */
 // No permission needed to view published dvObjects
 @RequiredPermissions({})
-public class ListVersionsCommand extends AbstractCommand<List<DatasetVersion>>{
-    
+public class ListVersionsCommand extends AbstractCommand<List<DatasetVersion>> {
+
     private final Dataset ds;
+    private final Integer limit; 
+    private final Integer offset;
+    private final Boolean deepLookup; 
     
-	public ListVersionsCommand(DataverseRequest aRequest, Dataset aDataset) {
-		super(aRequest, aDataset);
-		ds = aDataset;
-	}
+    public ListVersionsCommand(DataverseRequest aRequest, Dataset aDataset) {
+        this(aRequest, aDataset, null, null);
+    }
+    
+    public ListVersionsCommand(DataverseRequest aRequest, Dataset aDataset, Integer offset, Integer limit) {
+        this(aRequest, aDataset, null, null, false);
+    }
+
+    public ListVersionsCommand(DataverseRequest aRequest, Dataset aDataset, Integer offset, Integer limit, boolean deepLookup) {
+        super(aRequest, aDataset);
+        ds = aDataset;
+        this.offset = offset; 
+        this.limit = limit; 
+        this.deepLookup = deepLookup; 
+    }
 
-	@Override
-	public List<DatasetVersion> execute(CommandContext ctxt) throws CommandException {
-		List<DatasetVersion> outputList = new LinkedList<>();
-		for ( DatasetVersion dsv : ds.getVersions() ) {
-            if (dsv.isReleased() || ctxt.permissions().request( getRequest() ).on(ds).has(Permission.EditDataset)) {
-                outputList.add(dsv);
+    @Override
+    public List<DatasetVersion> execute(CommandContext ctxt) throws CommandException {
+        
+        boolean includeUnpublished = ctxt.permissions().request(getRequest()).on(ds).has(Permission.EditDataset);
+        
+        if (offset == null && limit == null) { 
+            
+            List<DatasetVersion> outputList = new LinkedList<>();
+            for (DatasetVersion dsv : ds.getVersions()) {
+                if (dsv.isReleased() || includeUnpublished) {
+                    if (deepLookup) {
+                        // @todo: when "deep"/extended lookup is requested, and 
+                        // we call .findDeep() to look up each version again, 
+                        // there is probably a more economical way to obtain the 
+                        // numeric ids of the versions, by a direct single query,
+                        // rather than go through ds.getVersions() like we are now. 
+                        dsv = ctxt.datasetVersion().findDeep(dsv.getId());
+                        if (dsv == null) {
+                            throw new CommandExecutionException("Failed to look up full list of dataset versions", this);
+                        }
+                    }
+                    outputList.add(dsv);
+                }
             }
-		}
-        return outputList;
-	}
+            return outputList;
+        } else {
+            // Only a partial list (one "page"-worth) of versions is being requested
+            return ctxt.datasetVersion().findVersions(ds.getId(), offset, limit, includeUnpublished);
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LocalSubmitToArchiveCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LocalSubmitToArchiveCommand.java
index 03ac671aebc..d2f061b6e70 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LocalSubmitToArchiveCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/LocalSubmitToArchiveCommand.java
@@ -1,7 +1,5 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.DOIDataCiteRegisterService;
-import edu.harvard.iq.dataverse.DataCitation;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.DatasetLock.Reason;
@@ -15,28 +13,18 @@
 import edu.harvard.iq.dataverse.workflow.step.Failure;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.nio.charset.Charset;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
 
 import java.io.File;
 import java.io.FileOutputStream;
 
-import org.apache.commons.codec.binary.Hex;
-
 import org.apache.commons.io.FileUtils;
 
-
-
 @RequiredPermissions(Permission.PublishDataset)
 public class LocalSubmitToArchiveCommand extends AbstractSubmitToArchiveCommand implements Command<DatasetVersion> {
 
@@ -47,43 +35,61 @@ public LocalSubmitToArchiveCommand(DataverseRequest aRequest, DatasetVersion ver
     }
 
     @Override
-    public WorkflowStepResult performArchiveSubmission(DatasetVersion dv, ApiToken token, Map<String, String> requestedSettings) {
+    public WorkflowStepResult performArchiveSubmission(DatasetVersion dv, ApiToken token,
+            Map<String, String> requestedSettings) {
         logger.fine("In LocalCloudSubmitToArchive...");
         String localPath = requestedSettings.get(":BagItLocalPath");
-
+        String zipName = null;
+        
+        //Set a failure status that will be updated if we succeed
+        JsonObjectBuilder statusObject = Json.createObjectBuilder();
+        statusObject.add(DatasetVersion.ARCHIVAL_STATUS, DatasetVersion.ARCHIVAL_STATUS_FAILURE);
+        statusObject.add(DatasetVersion.ARCHIVAL_STATUS_MESSAGE, "Bag not transferred");
+        
         try {
 
             Dataset dataset = dv.getDataset();
 
-
-            if (dataset.getLockFor(Reason.pidRegister) == null) {
+            if (dataset.getLockFor(Reason.finalizePublication) == null
+                    && dataset.getLockFor(Reason.FileValidationFailed) == null) {
 
                 String spaceName = dataset.getGlobalId().asString().replace(':', '-').replace('/', '-')
                         .replace('.', '-').toLowerCase();
 
-                DataCitation dc = new DataCitation(dv);
-                Map<String, String> metadata = dc.getDataCiteMetadata();
-                String dataciteXml = DOIDataCiteRegisterService.getMetadataFromDvObject(
-                        dv.getDataset().getGlobalId().asString(), metadata, dv.getDataset());
-
-
-                FileUtils.writeStringToFile(new File(localPath+"/"+spaceName + "-datacite.v" + dv.getFriendlyVersionNumber()+".xml"), dataciteXml);
+                String dataciteXml = getDataCiteXml(dv);
+                
+                FileUtils.writeStringToFile(
+                        new File(localPath + "/" + spaceName + "-datacite.v" + dv.getFriendlyVersionNumber() + ".xml"),
+                        dataciteXml, StandardCharsets.UTF_8);
                 BagGenerator bagger = new BagGenerator(new OREMap(dv, false), dataciteXml);
+                bagger.setNumConnections(getNumberOfBagGeneratorThreads());
                 bagger.setAuthenticationKey(token.getTokenString());
-                bagger.generateBag(new FileOutputStream(localPath+"/"+spaceName + "v" + dv.getFriendlyVersionNumber() + ".zip"));
-
-
-                logger.fine("Localhost Submission step: Content Transferred");
-                StringBuffer sb = new StringBuffer("file://"+localPath+"/"+spaceName + "v" + dv.getFriendlyVersionNumber() + ".zip");
-                dv.setArchivalCopyLocation(sb.toString());
-
+                zipName = localPath + "/" + spaceName + "v" + dv.getFriendlyVersionNumber() + ".zip";
+                //ToDo: generateBag(File f, true) seems to do the same thing (with a .tmp extension) - since we don't have to use a stream here, could probably just reuse the existing code? 
+                bagger.generateBag(new FileOutputStream(zipName + ".partial"));
+
+                File srcFile = new File(zipName + ".partial");
+                File destFile = new File(zipName);
+
+                if (srcFile.renameTo(destFile)) {
+                    logger.fine("Localhost Submission step: Content Transferred");
+                    statusObject.add(DatasetVersion.ARCHIVAL_STATUS, DatasetVersion.ARCHIVAL_STATUS_SUCCESS);
+                    statusObject.add(DatasetVersion.ARCHIVAL_STATUS_MESSAGE, "file://" + zipName);
+                } else {
+                    logger.warning("Unable to move " + zipName + ".partial to " + zipName);
+                }
             } else {
-                logger.warning("Localhost Submision Workflow aborted: Dataset locked for pidRegister");
+                logger.warning(
+                        "Localhost Submision Workflow aborted: Dataset locked for finalizePublication, or because file validation failed");
                 return new Failure("Dataset locked");
             }
-        }  catch (Exception e) {
-            logger.warning(e.getLocalizedMessage() + "here");
+        } catch (Exception e) {
+            logger.warning("Failed to archive " + zipName + " : " + e.getLocalizedMessage());
+            e.printStackTrace();
+        } finally {
+            dv.setArchivalCopyLocation(statusObject.build().toString());
         }
+        
         return WorkflowStepResult.OK;
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MergeInAccountCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MergeInAccountCommand.java
index bf542138044..03f4dceef88 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MergeInAccountCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MergeInAccountCommand.java
@@ -14,7 +14,6 @@
 import edu.harvard.iq.dataverse.UserNotification;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserLookup;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUser;
-import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2TokenData;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
@@ -57,7 +56,15 @@ public MergeInAccountCommand(DataverseRequest createDataverseRequest, Authentica
     
     @Override
     protected void executeImpl(CommandContext ctxt) throws CommandException {
-        
+
+        if (consumedAU.getId() == ongoingAU.getId()) {
+            throw new IllegalCommandException("You cannot merge an account into itself.", this);
+        }
+
+        if (consumedAU.isDeactivated() && !ongoingAU.isDeactivated() || !consumedAU.isDeactivated() && ongoingAU.isDeactivated()) {
+            throw new IllegalCommandException("User accounts can only be merged if they are either both active or both deactivated.", this);
+        }
+
         List<RoleAssignment> baseRAList = ctxt.roleAssignees().getAssignmentsFor(ongoingAU.getIdentifier());
         List<RoleAssignment> consumedRAList = ctxt.roleAssignees().getAssignmentsFor(consumedAU.getIdentifier());
         
@@ -155,6 +162,7 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         
         //ConfirmEmailData  
         
+        // todo: the deletion should be handed down to the service!
         ConfirmEmailData confirmEmailData = ctxt.confirmEmail().findSingleConfirmEmailDataByUser(consumedAU); 
         if (confirmEmailData != null){
             ctxt.em().remove(confirmEmailData);
@@ -167,6 +175,7 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         
         ctxt.em().createNativeQuery("Delete from OAuth2TokenData where user_id ="+consumedAU.getId()).executeUpdate();
         
+        ctxt.em().createNativeQuery("DELETE FROM explicitgroup_authenticateduser consumed USING explicitgroup_authenticateduser ongoing WHERE consumed.containedauthenticatedusers_id="+ongoingAU.getId()+" AND ongoing.containedauthenticatedusers_id="+consumedAU.getId()).executeUpdate();
         ctxt.em().createNativeQuery("UPDATE explicitgroup_authenticateduser SET containedauthenticatedusers_id="+ongoingAU.getId()+" WHERE containedauthenticatedusers_id="+consumedAU.getId()).executeUpdate();
         
         ctxt.actionLog().changeUserIdentifierInHistory(consumedAU.getIdentifier(), ongoingAU.getIdentifier());
@@ -184,8 +193,8 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         ctxt.em().remove(consumedAUL);
         ctxt.em().remove(consumedAU);
         BuiltinUser consumedBuiltinUser = ctxt.builtinUsers().findByUserName(consumedAU.getUserIdentifier());
-        if (consumedBuiltinUser != null){
-            ctxt.em().remove(consumedBuiltinUser); 
+        if (consumedBuiltinUser != null) {
+            ctxt.builtinUsers().removeUser(consumedBuiltinUser.getUserName());
         }
         
         
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommand.java
index 55d02362e88..1c3a62ec6de 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommand.java
@@ -7,6 +7,7 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetLinkingDataverse;
+import edu.harvard.iq.dataverse.DatasetLock;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.Guestbook;
 import edu.harvard.iq.dataverse.authorization.Permission;
@@ -25,7 +26,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -70,13 +70,13 @@ public void executeImpl(CommandContext ctxt) throws CommandException {
 
         // validate the move makes sense
         if (moved.getOwner().equals(destination)) {
-            throw new IllegalCommandException(BundleUtil.getStringFromBundle("dashboard.card.datamove.dataset.command.error.targetDataverseSameAsOriginalDataverse"), this);
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("dashboard.move.dataset.command.error.targetDataverseSameAsOriginalDataverse"), this);
         }
         
         // if dataset is published make sure that its target is published
         
         if (moved.isReleased() && !destination.isReleased()){
-            throw new IllegalCommandException(BundleUtil.getStringFromBundle("dashboard.card.datamove.dataset.command.error.targetDataverseUnpublishedDatasetPublished", Arrays.asList(destination.getDisplayName())), this);
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("dashboard.move.dataset.command.error.targetDataverseUnpublishedDatasetPublished", Arrays.asList(destination.getDisplayName())), this);
         }
                 
         //if the datasets guestbook is not contained in the new dataverse then remove it
@@ -128,28 +128,28 @@ public void executeImpl(CommandContext ctxt) throws CommandException {
         if (removeGuestbook || removeLinkDs) {
             StringBuilder errorString = new StringBuilder();
             if (removeGuestbook) {
-                errorString.append(BundleUtil.getStringFromBundle("dashboard.card.datamove.dataset.command.error.unforced.datasetGuestbookNotInTargetDataverse"));
+                errorString.append(BundleUtil.getStringFromBundle("dashboard.move.dataset.command.error.unforced.datasetGuestbookNotInTargetDataverse"));
             }
             if (removeLinkDs) {
-                errorString.append(BundleUtil.getStringFromBundle("dashboard.card.datamove.dataset.command.error.unforced.linkedToTargetDataverseOrOneOfItsParents"));
+                errorString.append(BundleUtil.getStringFromBundle("dashboard.move.dataset.command.error.unforced.linkedToTargetDataverseOrOneOfItsParents"));
             }
             throw new UnforcedCommandException(errorString.toString(), this);
         }
-
+        
+        // 6575 if dataset is submitted for review and the default contributor
+        // role includes dataset publish then remove the lock
+        
+        if (moved.isLockedFor(DatasetLock.Reason.InReview)
+                && destination.getDefaultContributorRole().permissions().contains(Permission.PublishDataset)) {
+            ctxt.datasets().removeDatasetLocks(moved, DatasetLock.Reason.InReview);
+        }
 
         // OK, move
         moved.setOwner(destination);
         ctxt.em().merge(moved);
 
-        try {
-            boolean doNormalSolrDocCleanUp = true;
-            ctxt.index().indexDataset(moved, doNormalSolrDocCleanUp);
-
-        } catch (Exception e) { // RuntimeException e ) {
-            logger.log(Level.WARNING, "Exception while indexing:" + e.getMessage()); //, e);
-            throw new CommandException(BundleUtil.getStringFromBundle("dashboard.card.datamove.dataset.command.error.indexingProblem"), this);
-
-        }
+        boolean doNormalSolrDocCleanUp = true;
+        ctxt.index().asyncIndexDataset(moved, doNormalSolrDocCleanUp);
 
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommand.java
index bf18194966d..c8b59b1818a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommand.java
@@ -10,7 +10,6 @@
 import edu.harvard.iq.dataverse.Template;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
 import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
@@ -20,14 +19,12 @@
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Logger;
-import org.apache.solr.client.solrj.SolrServerException;
 
 /**
  * A command to move a {@link Dataverse} between two {@link Dataverse}s.
@@ -295,20 +292,14 @@ public void executeImpl(CommandContext ctxt) throws CommandException {
         long moveDvEnd = System.currentTimeMillis();
         logger.info("Dataverse move took " + (moveDvEnd - moveDvStart) + " milliseconds");
         
+	//TODO: indexing should be moved to an on Success method
         ctxt.indexBatch().indexDataverseRecursively(moved);
         
         //REindex datasets linked to moved dv
         if (moved.getDatasetLinkingDataverses() != null && !moved.getDatasetLinkingDataverses().isEmpty()) {
             for (DatasetLinkingDataverse dld : moved.getDatasetLinkingDataverses()) {
                 Dataset linkedDS = ctxt.datasets().find(dld.getDataset().getId());
-                try {
-                    ctxt.index().indexDataset(linkedDS, true);
-                } catch (IOException | SolrServerException e) {
-                    String failureLogText = "Post move dataverse dataset indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + linkedDS.getId().toString();
-                    failureLogText += "\r\n" + e.getLocalizedMessage();
-                    LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, linkedDS);
-
-                }
+                ctxt.index().asyncIndexDataset(linkedDS, true);
 
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PersistProvFreeFormCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PersistProvFreeFormCommand.java
index aa06967675f..a258c36d6ea 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PersistProvFreeFormCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PersistProvFreeFormCommand.java
@@ -36,7 +36,7 @@ public DataFile execute(CommandContext ctxt) throws CommandException {
         }
         else {
             Dataset dataset = dataFile.getOwner();
-            DatasetVersion workingVersion = dataset.getEditVersion();
+            DatasetVersion workingVersion = dataset.getOrCreateEditVersion();
 
             if (workingVersion.isDraft()) { 
                 if (dataset.isReleased()){
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetCommand.java
index f2584d6a153..915ef6ea2a1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetCommand.java
@@ -2,23 +2,27 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetLock;
+import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
-import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.workflow.Workflow;
 import edu.harvard.iq.dataverse.workflow.WorkflowContext.TriggerType;
-import java.util.Date;
-import java.util.List;
+
+import jakarta.persistence.OptimisticLockException;
+
 import java.util.Optional;
 import java.util.logging.Logger;
 import static java.util.stream.Collectors.joining;
+import static edu.harvard.iq.dataverse.engine.command.impl.PublishDatasetResult.Status;
+import static edu.harvard.iq.dataverse.dataset.DatasetUtil.validateDatasetMetadataExternally;
+import edu.harvard.iq.dataverse.util.StringUtil;
+
 
 /**
  * Kick-off a dataset publication process. The process may complete immediately, 
@@ -58,7 +62,7 @@ public PublishDatasetCommand(Dataset datasetIn, DataverseRequest aRequest, boole
     @Override
     public PublishDatasetResult execute(CommandContext ctxt) throws CommandException {
         
-        verifyCommandArguments();
+        verifyCommandArguments(ctxt);
         
         // Invariant 1: If we're here, publishing the dataset makes sense, from a "business logic" point of view.
         // Invariant 2: The latest version of the dataset is the one being published, EVEN IF IT IS NOT DRAFT.
@@ -66,6 +70,11 @@ public PublishDatasetResult execute(CommandContext ctxt) throws CommandException
 
         Dataset theDataset = getDataset();
         
+        validateOrDie(theDataset.getLatestVersion(), false);
+
+        //ToDo - any reason to set the version in publish versus finalize? Failure in a prepub workflow or finalize will leave draft versions with an assigned version number as is.
+        //Changing the dataset in this transaction also potentially makes a race condition with a prepub workflow, possibly resulting in an OptimisticLockException there.
+        
         // Set the version numbers:
 
         if (theDataset.getPublicationDate() == null) {
@@ -83,13 +92,33 @@ public PublishDatasetResult execute(CommandContext ctxt) throws CommandException
             theDataset.getLatestVersion().setMinorVersionNumber(new Long(0));
         }
         
+        // Perform any optional validation steps, if defined:
+        if (ctxt.systemConfig().isExternalDatasetValidationEnabled()) {
+            // For admins, an override of the external validation step may be enabled: 
+            if (!(getUser().isSuperuser() && ctxt.systemConfig().isExternalValidationAdminOverrideEnabled())) {
+                String executable = ctxt.systemConfig().getDatasetValidationExecutable();
+                boolean result = validateDatasetMetadataExternally(theDataset, executable, getRequest());
+            
+                if (!result) {
+                    String rejectionMessage = ctxt.systemConfig().getDatasetValidationFailureMsg();
+                    throw new IllegalCommandException(rejectionMessage, this);
+                }
+            } 
+        }
+        
+        //ToDo - should this be in onSuccess()? May relate to todo above 
         Optional<Workflow> prePubWf = ctxt.workflows().getDefaultWorkflow(TriggerType.PrePublishDataset);
         if ( prePubWf.isPresent() ) {
             // We start a workflow
-            theDataset = ctxt.em().merge(theDataset);
-            ctxt.em().flush();
-            ctxt.workflows().start(prePubWf.get(), buildContext(theDataset, TriggerType.PrePublishDataset, datasetExternallyReleased));
-            return new PublishDatasetResult(theDataset, false);
+            try {
+                theDataset = ctxt.em().merge(theDataset);
+                ctxt.em().flush();
+                ctxt.workflows().start(prePubWf.get(),
+                        buildContext(theDataset, TriggerType.PrePublishDataset, datasetExternallyReleased), true);
+                return new PublishDatasetResult(theDataset, Status.Workflow);
+            } catch (OptimisticLockException e) {
+                throw new CommandException(e.getMessage(), e, this);
+            }
             
         } else{
             // We will skip trying to register the global identifiers for datafiles 
@@ -104,33 +133,50 @@ public PublishDatasetResult execute(CommandContext ctxt) throws CommandException
             // ...
             // Additionaly in 4.9.3 we have added a system variable to disable 
             // registering file PIDs on the installation level.
-            String currentGlobalIdProtocol = ctxt.settings().getValueForKey(SettingsServiceBean.Key.Protocol, "");
-            String currentGlobalAuthority= ctxt.settings().getValueForKey(SettingsServiceBean.Key.Authority, "");
-            String dataFilePIDFormat = ctxt.settings().getValueForKey(SettingsServiceBean.Key.DataFilePIDFormat, "DEPENDENT");
             boolean registerGlobalIdsForFiles = 
-                    (currentGlobalIdProtocol.equals(theDataset.getProtocol()) || dataFilePIDFormat.equals("INDEPENDENT")) 
-                    && ctxt.systemConfig().isFilePIDsEnabled();
+                    ctxt.systemConfig().isFilePIDsEnabledForCollection(getDataset().getOwner()) &&
+                            ctxt.dvObjects().getEffectivePidGenerator(getDataset()).canCreatePidsLike(getDataset().getGlobalId());
             
-            if ( registerGlobalIdsForFiles ){
-                registerGlobalIdsForFiles = currentGlobalAuthority.equals( theDataset.getAuthority() );
-	    }
+            boolean validatePhysicalFiles = ctxt.systemConfig().isDatafileValidationOnPublishEnabled();
 
-            if (theDataset.getFiles().size() > ctxt.systemConfig().getPIDAsynchRegFileCount() && registerGlobalIdsForFiles) {     
-                String info = "Adding File PIDs asynchronously";
-                AuthenticatedUser user = request.getAuthenticatedUser();
+            // As of v5.0, publishing a dataset is always done asynchronously, 
+            // with the dataset locked for the duration of the operation. 
+            
                 
-                DatasetLock lock = new DatasetLock(DatasetLock.Reason.pidRegister, user);
+            String info = "Publishing the dataset; "; 
+            info += registerGlobalIdsForFiles ? "Registering PIDs for Datafiles; " : "";
+            info += validatePhysicalFiles ? "Validating Datafiles Asynchronously" : "";
+            
+            AuthenticatedUser user = request.getAuthenticatedUser();
+            /*
+             * datasetExternallyReleased is only true in the case of the
+             * Dataverses.importDataset() and importDatasetDDI() methods. In that case, we
+             * are still in the transaction that creates theDataset, so
+             * A) Trying to create a DatasetLock referncing that dataset in a new 
+             * transaction (as ctxt.datasets().addDatasetLock() does) will fail since the 
+             * dataset doesn't yet exist, and 
+             * B) a lock isn't needed because no one can be trying to edit it yet (as it
+             * doesn't exist).
+             * Thus, we can/need to skip creating the lock. Since the calls to removeLocks
+             * in FinalizeDatasetPublicationCommand search for and remove existing locks, if
+             * one doesn't exist, the removal is a no-op in this case.
+             */
+            if (!datasetExternallyReleased) {
+                DatasetLock lock = new DatasetLock(DatasetLock.Reason.finalizePublication, user);
                 lock.setDataset(theDataset);
                 lock.setInfo(info);
                 ctxt.datasets().addDatasetLock(theDataset, lock);
-                ctxt.datasets().callFinalizePublishCommandAsynchronously(theDataset.getId(), ctxt, request, datasetExternallyReleased);
-                return new PublishDatasetResult(theDataset, false);
-                
-            } else {
-                // Synchronous publishing (no workflow involved)
-                theDataset = ctxt.engine().submit(new FinalizeDatasetPublicationCommand(theDataset, getRequest(),datasetExternallyReleased));
-                return new PublishDatasetResult(theDataset, true);
             }
+            try {
+                theDataset = ctxt.em().merge(theDataset);
+            } catch (OptimisticLockException e) {
+                ctxt.datasets().removeDatasetLocks(theDataset, DatasetLock.Reason.finalizePublication);
+                throw new CommandException(e.getMessage(), e, this);
+            }
+            // The call to FinalizePublicationCommand has been moved to the new @onSuccess()
+            // method:
+            //ctxt.datasets().callFinalizePublishCommandAsynchronously(theDataset.getId(), ctxt, request, datasetExternallyReleased);
+            return new PublishDatasetResult(theDataset, Status.Inprogress);
         }
     }
     
@@ -140,7 +186,7 @@ public PublishDatasetResult execute(CommandContext ctxt) throws CommandException
      * 
      * @throws IllegalCommandException if the publication request is invalid.
      */
-    private void verifyCommandArguments() throws IllegalCommandException {
+    private void verifyCommandArguments(CommandContext ctxt) throws IllegalCommandException {
         if (!getDataset().getOwner().isReleased()) {
             throw new IllegalCommandException("This dataset may not be published because its host dataverse (" + getDataset().getOwner().getAlias() + ") has not been published.", this);
         }
@@ -149,13 +195,26 @@ private void verifyCommandArguments() throws IllegalCommandException {
             throw new IllegalCommandException("Only authenticated users can release a Dataset. Please authenticate and try again.", this);
         }
         
-        if ( getDataset().isLockedFor(DatasetLock.Reason.Workflow)
-                || getDataset().isLockedFor(DatasetLock.Reason.Ingest) ) {
+        if (getDataset().getLatestVersion().getTermsOfUseAndAccess() == null
+                || (getDataset().getLatestVersion().getTermsOfUseAndAccess().getLicense() == null 
+                && StringUtil.isEmpty(getDataset().getLatestVersion().getTermsOfUseAndAccess().getTermsOfUse()))) {
+            throw new IllegalCommandException("Dataset must have a valid license or Custom Terms Of Use configured before it can be published.", this);
+        }
+        
+        if ( (getDataset().isLockedFor(DatasetLock.Reason.Workflow)&&!ctxt.permissions().isMatchingWorkflowLock(getDataset(),request.getUser().getIdentifier(),request.getWFInvocationId())) 
+                || getDataset().isLockedFor(DatasetLock.Reason.Ingest) 
+                || getDataset().isLockedFor(DatasetLock.Reason.finalizePublication)
+                || getDataset().isLockedFor(DatasetLock.Reason.EditInProgress)) {
             throw new IllegalCommandException("This dataset is locked. Reason: " 
                     + getDataset().getLocks().stream().map(l -> l.getReason().name()).collect( joining(",") )
                     + ". Please try publishing later.", this);
         }
         
+        if ( getDataset().isLockedFor(DatasetLock.Reason.FileValidationFailed)) {
+            throw new IllegalCommandException("This dataset cannot be published because some files have been found missing or corrupted. " 
+                    + ". Please contact support to address this.", this);
+        }
+        
         if ( datasetExternallyReleased ) {
             if ( ! getDataset().getLatestVersion().isReleased() ) {
                 throw new IllegalCommandException("Latest version of dataset " + getDataset().getIdentifier() + " is not marked as releasd.", this);
@@ -174,7 +233,41 @@ private void verifyCommandArguments() throws IllegalCommandException {
             if (minorRelease && !getDataset().getLatestVersion().isMinorUpdate()) {
                 throw new IllegalCommandException("Cannot release as minor version. Re-try as major release.", this);
             }
+
+            if (getDataset().getFiles().isEmpty() && getEffectiveRequiresFilesToPublishDataset()) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.mayNotPublish.FilesRequired"), this);
+            }
         }
-    }   
+    }
+    private boolean getEffectiveRequiresFilesToPublishDataset() {
+        if (getUser().isSuperuser()) {
+            return false;
+        } else {
+            Dataverse dv = getDataset().getOwner();
+            return dv != null &&  dv.getEffectiveRequiresFilesToPublishDataset();
+        }
+    }
+    
+    @Override
+    public boolean onSuccess(CommandContext ctxt, Object r) {
+        Dataset dataset = null;
+        try{
+            dataset = (Dataset) r;
+        } catch (ClassCastException e){
+            dataset  = ((PublishDatasetResult) r).getDataset();
+        }
+
+        if (dataset != null) {
+            Optional<Workflow> prePubWf = ctxt.workflows().getDefaultWorkflow(TriggerType.PrePublishDataset);
+            //A pre-publication workflow will call FinalizeDatasetPublicationCommand itself when it completes
+            if (! prePubWf.isPresent() ) {
+                logger.fine("From onSuccess, calling FinalizeDatasetPublicationCommand for dataset " + dataset.getGlobalId().asString());
+                ctxt.datasets().callFinalizePublishCommandAsynchronously(dataset.getId(), ctxt, request, datasetExternallyReleased);
+            } 
+            return true;
+        }
+        
+        return false;
+    }
     
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetResult.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetResult.java
index 652a444dcb8..2d59da53ed0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetResult.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetResult.java
@@ -11,11 +11,21 @@
 public class PublishDatasetResult {
     
     private final Dataset dataset;
-    private final boolean isCompleted;
+    private final Status status;
+    
+    public enum Status {
+        /** Dataset has been published */
+        Completed,
+        /** Publish workflow is in progress */
+        Workflow,
+        /** Publishing is being finalized asynchronously */
+        Inprogress
+    }
+        
 
-    public PublishDatasetResult(Dataset dataset, boolean isCompleted) {
+    public PublishDatasetResult(Dataset dataset, Status status) {
         this.dataset = dataset;
-        this.isCompleted = isCompleted;
+        this.status = status;
     }
     
     /**
@@ -34,7 +44,14 @@ public Dataset getDataset() {
      * @return {@code true} iff the publication process was completed. {@code false} otherwise.
      */
     public boolean isCompleted() {
-        return isCompleted;
+        return status == Status.Completed;
     }
     
+    public boolean isWorkflow() {
+        return status == Status.Workflow;
+    }
+    
+    public boolean isInProgress() {
+        return status == Status.Inprogress;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDataverseCommand.java
index 5737cf80a46..d4b91f5940d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDataverseCommand.java
@@ -5,20 +5,22 @@
 import edu.harvard.iq.dataverse.UserNotification;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import static edu.harvard.iq.dataverse.dataverse.DataverseUtil.validateDataverseMetadataExternally;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
-import edu.harvard.iq.dataverse.search.IndexResponse;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.Future;
+import java.util.logging.Logger;
 
 @RequiredPermissions(Permission.PublishDataverse)
 public class PublishDataverseCommand extends AbstractCommand<Dataverse> {
+    private static final Logger logger = Logger.getLogger(PublishDataverseCommand.class.getName());
 
     private final Dataverse dataverse;
 
@@ -41,6 +43,20 @@ public Dataverse execute(CommandContext ctxt) throws CommandException {
             }
         }
 
+        // Perform any optional validation steps, if defined:
+        if (ctxt.systemConfig().isExternalDataverseValidationEnabled()) {
+            // For admins, an override of the external validation step may be enabled: 
+            if (!(getUser().isSuperuser() && ctxt.systemConfig().isExternalValidationAdminOverrideEnabled())) {
+                String executable = ctxt.systemConfig().getDataverseValidationExecutable();
+                boolean result = validateDataverseMetadataExternally(dataverse, executable, getRequest());
+            
+                if (!result) {
+                    String rejectionMessage = ctxt.systemConfig().getDataverseValidationFailureMsg();
+                    throw new IllegalCommandException(rejectionMessage, this);
+                }
+            }
+        }
+        
         //Before setting dataverse to released send notifications to users with download file
         List<RoleAssignment> ras = ctxt.roles().directRoleAssignments(dataverse);
         for (RoleAssignment ra : ras) {
@@ -61,9 +77,7 @@ public Dataverse execute(CommandContext ctxt) throws CommandException {
     
     @Override
     public boolean onSuccess(CommandContext ctxt, Object r) {
-        Dataverse ret = (Dataverse) r;
-        ctxt.solrIndex().indexPermissionsOnSelfAndChildren(ret.getId());
-        return true;
+        return ctxt.dataverses().index((Dataverse) r,true);
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ReconcileDatasetPidCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ReconcileDatasetPidCommand.java
new file mode 100644
index 00000000000..18db587dcc4
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ReconcileDatasetPidCommand.java
@@ -0,0 +1,181 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.export.ExportService;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Given a draft datasetVersion (which has no published predecessors), and PID provider that is different to the current
+ * configured one this command updates the PID to the new provider (Removed the existing PID, registers a new one and notifies the user about the change).
+ *
+ * @author jdarms
+ */
+// No required permissions because we check for superuser status.
+@RequiredPermissions({})
+public class ReconcileDatasetPidCommand extends AbstractDatasetCommand<Dataset> {
+
+    private static final Logger logger = Logger.getLogger(ReconcileDatasetPidCommand.class.getName());
+    PidProvider newPidProvider;
+
+    public ReconcileDatasetPidCommand(DataverseRequest aRequest, Dataset theDataset, PidProvider newPidProvider) {
+        super(aRequest, theDataset);
+        this.newPidProvider = newPidProvider;
+    }
+
+
+    @Override
+    public Dataset execute(CommandContext ctxt) throws CommandException {
+        // ensure that only superuser can execute the command.
+        if (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser()) {
+            throw new PermissionException(BundleUtil.getStringFromBundle("admin.api.auth.mustBeSuperUser"), this,
+                    Collections.singleton(Permission.EditDataset), getDataset());
+        }
+        // Datast must be unreleased! This means there is only one version!
+        if (getDataset().isReleased()) {
+            throw new IllegalCommandException("Dataset already published, cannot alter PID Provider", this);
+        }
+        // Dataset must not be harvested!
+        if (getDataset().isHarvested()) {
+            throw new IllegalCommandException("Dataset is harvested, cannot alter PID Provider", this);
+        }
+        GlobalId oldId = getDataset().getGlobalId();
+
+        if (oldId == null) {
+            throw new IllegalStateException("Dataset without a global identifier, cannot be altered!");
+        }
+        PidProvider currentPidProvider = PidUtil.getPidProvider(oldId.getProviderId());
+        // new PID Provider must be different to requested one!
+        if (this.newPidProvider.equals(currentPidProvider)) {
+            throw new IllegalCommandException("PID Provider " + currentPidProvider.getId() + " is same as configured. This Operation has no effect!", this);
+        }
+
+        logger.fine("Reconciling dataset( id =`" + getDataset().getId() + ")` - removing globalId `" + getDataset().getGlobalId() + '`');
+        // remove dataset PID
+        try {
+            if (currentPidProvider.alreadyRegistered(getDataset())) { //if not registered with PIDProvider than there is no need to delete it...
+                currentPidProvider.deleteIdentifier(getDataset()); // delete it externally
+            }
+            getDataset().setGlobalId(null); //  remove it internally
+            getDataset().setGlobalIdCreateTime(null);
+            getDataset().setIdentifierRegistered(false);
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "Identifier deletion was not successful:", e.getMessage());
+        }
+
+        if (ctxt.systemConfig().isFilePIDsEnabledForCollection(getDataset().getOwner())) {
+            reconcileFilePids(ctxt);
+        }
+
+        newPidProvider.generatePid(getDataset()); // this updates Protocol, Authority, and Identifier and thus a new GlobalID
+        logger.fine("Reconciling dataset( id =`" + getDataset().getId() + ")` - creating new globalId `" + getDataset().getGlobalId() + '`');
+        if (!newPidProvider.registerWhenPublished()) {
+            registerExternalIdentifier(getDataset(), ctxt, true); // this updates GlobalIdCreateTime and IdentifierRegistered
+        }
+
+        AlternativePersistentIdentifier api;
+        api = new AlternativePersistentIdentifier();
+        api.setProtocol(oldId.getProtocol());
+        api.setAuthority(oldId.getAuthority());
+        api.setIdentifier(oldId.getIdentifier());
+        api.setDvObject(getDataset());
+        api.setStorageLocationDesignator(true);// cf. Dataset#getIdentifierForFileStorage()
+        if (getDataset().getAlternativePersistentIndentifiers() != null) {
+            // check iF an alternative ID is already used as storage location designator
+            Optional<AlternativePersistentIdentifier> storageId = getDataset().getAlternativePersistentIndentifiers().stream().filter(s -> s.isStorageLocationDesignator()).findAny();
+            if (storageId.isPresent()) {
+                api.setStorageLocationDesignator(false);// If there is already a storage location designator we do not alter it.
+            }
+            getDataset().getAlternativePersistentIndentifiers().add(api);
+        } else {
+            getDataset().setAlternativePersistentIndentifiers(Set.of(api));
+        }
+
+        // We keep the old persistent identifier as AlternativePersistentIdentifier with storageLocationDesignator true.
+        // This keep the link the object store intact, without altering the files. A superuser can update the storage
+        // manually from old file path to the new one, and remove the AlternativeIdentifer form the database.
+        // This removed the old identifier totally from the system and avoids all side effects...
+        ctxt.em().merge(getDataset());
+        ctxt.em().flush();
+
+        logger.fine("Reconciling dataset( id =`" + getDataset().getId() + ")` - Replaced old globalId `" + oldId + " with new globalId `" + getDataset().getGlobalId() + '`');
+        // notify all users with direct role assignments about the changed persistent identifier
+        List<RoleAssignment> ras = ctxt.roles().directRoleAssignments(getDataset());
+        for (RoleAssignment ra : ras) {
+            for (AuthenticatedUser au : ctxt.roleAssignees().getExplicitUsers(ctxt.roleAssignees().getRoleAssignee(ra.getAssigneeIdentifier()))) {
+                ctxt.notifications().sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.PIDRECONCILED, getDataset().getLatestVersion().getId(), "Persistent identifier changed!");
+            }
+        }
+
+        return getDataset();
+    }
+
+    private void reconcileFilePids(CommandContext ctxt) {
+        // remove datafile PIDs
+        try {
+            for (DataFile df : getDataset().getFiles()) {
+                GlobalId oldPid = df.getGlobalId();
+                if(df.getGlobalId()==null){
+                    // if there is no global ID of a datafile, there is no need to reconcile anything.
+                    continue;
+                }
+                PidProvider currentPidProvider = PidUtil.getPidProvider(oldPid.getProviderId());
+                if (currentPidProvider.alreadyRegistered(df)) {
+                    currentPidProvider.deleteIdentifier(df);// delete it external
+                }
+
+                df.setGlobalId(null); // and remove it internally from data structure
+                df.setGlobalIdCreateTime(null);
+                df.setIdentifierRegistered(false);
+
+                AlternativePersistentIdentifier api;
+                api = new AlternativePersistentIdentifier();
+                api.setProtocol(oldPid.getProtocol());
+                api.setAuthority(oldPid.getAuthority());
+                api.setIdentifier(oldPid.getIdentifier());
+                api.setDvObject(df);
+                api.setStorageLocationDesignator(true); // cf. Dataset#getIdentifierForFileStorage()
+                if (df.getAlternativePersistentIndentifiers() != null) {
+                    // check iF an alternative ID is already used as storage location designator
+                    Optional<AlternativePersistentIdentifier> storageId = df.getAlternativePersistentIndentifiers().stream().filter(s -> s.isStorageLocationDesignator()).findAny();
+                    if (storageId.isPresent()) {
+                        api.setStorageLocationDesignator(false);// If there is already a storage location designator we do not alter it.
+                    }
+                    df.getAlternativePersistentIndentifiers().add(api);
+                } else {
+                    df.setAlternativePersistentIndentifiers(Set.of(api));
+                }
+                newPidProvider.generatePid(df); // this updates Protocol, Authority, and Identifier and thus a new GlobalID
+                logger.fine("Reconciling datafile( id =`" + df.getId() + ")` - creating new globalId `" + df.getGlobalId() + '`');
+                if (!newPidProvider.registerWhenPublished()) {
+                    registerExternalIdentifier(df, ctxt, true); // this updates GlobalIdCreateTime and IdentifierRegistered
+                }
+            }
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "Reconcilation of the datafile persistent identifier was not successful:", e.getMessage());
+        }
+    }
+
+    @Override
+    public boolean onSuccess(CommandContext ctxt, Object r) {
+        //update search index with the state
+        ctxt.index().asyncIndexDataset(getDataset(), true);
+        return true;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RedetectFileTypeCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RedetectFileTypeCommand.java
index 0477a483783..b9346a43af8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RedetectFileTypeCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RedetectFileTypeCommand.java
@@ -9,17 +9,18 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.export.ExportException;
 import edu.harvard.iq.dataverse.export.ExportService;
+import io.gdcc.spi.export.ExportException;
 import edu.harvard.iq.dataverse.util.EjbUtil;
-import edu.harvard.iq.dataverse.util.FileTypeDetection;
+import edu.harvard.iq.dataverse.util.FileUtil;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 import java.util.logging.Logger;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 @RequiredPermissions(Permission.EditDataset)
 public class RedetectFileTypeCommand extends AbstractCommand<DataFile> {
@@ -53,16 +54,16 @@ public DataFile execute(CommandContext ctxt) throws CommandException {
             } else {
                 // Need to create a temporary local file: 
 
-                ReadableByteChannel targetFileChannel = (ReadableByteChannel) storageIO.getReadChannel();
                 tempFile = File.createTempFile("tempFileTypeCheck", ".tmp");
-                FileChannel tempFileChannel = new FileOutputStream(tempFile).getChannel();
-                tempFileChannel.transferFrom(targetFileChannel, 0, storageIO.getSize());
-
+                try (ReadableByteChannel targetFileChannel = (ReadableByteChannel) storageIO.getReadChannel();
+                		FileChannel tempFileChannel = new FileOutputStream(tempFile).getChannel();) {
+                    tempFileChannel.transferFrom(targetFileChannel, 0, storageIO.getSize());
+                }
                 localFile = tempFile;
             }
 
             logger.fine("target file: " + localFile);
-            String newlyDetectedContentType = FileTypeDetection.determineFileType(localFile);
+            String newlyDetectedContentType = FileUtil.determineFileType(localFile, fileToRedetect.getDisplayName());
             fileToRedetect.setContentType(newlyDetectedContentType);
         } catch (IOException ex) {
             throw new CommandException("Exception while attempting to get the bytes of the file during file type redetection: " + ex.getLocalizedMessage(), this);
@@ -82,14 +83,10 @@ public DataFile execute(CommandContext ctxt) throws CommandException {
                 throw new CommandException("Exception while attempting to save the new file type: " + EjbUtil.ejbExceptionToString(ex), this);
             }
             Dataset dataset = fileToRedetect.getOwner();
+            boolean doNormalSolrDocCleanUp = true;
+            ctxt.index().asyncIndexDataset(dataset, doNormalSolrDocCleanUp);
             try {
-                boolean doNormalSolrDocCleanUp = true;
-                ctxt.index().indexDataset(dataset, doNormalSolrDocCleanUp);
-            } catch (Exception ex) {
-                logger.info("Exception while reindexing files during file type redetection: " + ex.getLocalizedMessage());
-            }
-            try {
-                ExportService instance = ExportService.getInstance(ctxt.settings());
+                ExportService instance = ExportService.getInstance();
                 instance.exportAllFormats(dataset);
             } catch (ExportException ex) {
                 // Just like with indexing, a failure to export is not a fatal condition.
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterDvObjectCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterDvObjectCommand.java
index 9169d6b4fe9..7b80871a1e0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterDvObjectCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterDvObjectCommand.java
@@ -4,19 +4,17 @@
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DvObject;
-import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.DvObjectContainer;
 import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
+
 import java.sql.Timestamp;
 import java.util.Date;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
-import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
-import java.io.IOException;
-import org.apache.solr.client.solrj.SolrServerException;
 
 /**
  *
@@ -43,48 +41,37 @@ public RegisterDvObjectCommand(DataverseRequest aRequest, DvObject target, Boole
     @Override
     protected void executeImpl(CommandContext ctxt) throws CommandException {
         
+        DvObjectContainer container = (target instanceof DvObjectContainer) ? (DvObjectContainer) target : target.getOwner();
+        // Get the pidProvider that is configured to mint new IDs
+        PidProvider pidProvider = ctxt.dvObjects().getEffectivePidGenerator(container);
         if(this.migrateHandle){
             //Only continue if you can successfully migrate the handle
-            if (!processMigrateHandle(ctxt)) return;
+            if (HandlePidProvider.HDL_PROTOCOL.equals(pidProvider.getProtocol()) || !processMigrateHandle(ctxt)) return;
         }
-        String nonNullDefaultIfKeyNotFound = "";
-        String protocol = ctxt.settings().getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound);
-        String authority = ctxt.settings().getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound);
-        // Get the idServiceBean that is configured to mint new IDs
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(protocol, ctxt);
+        
         try {
             //Test to see if identifier already present
             //if so, leave.
             if (target.getIdentifier() == null || target.getIdentifier().isEmpty()) {
-                if (target.isInstanceofDataset()) {
-                    target.setIdentifier(ctxt.datasets().generateDatasetIdentifier((Dataset) target, idServiceBean));
-
-                } else {
-                    target.setIdentifier(ctxt.files().generateDataFileIdentifier((DataFile) target, idServiceBean));
-                }
-                if (target.getProtocol() == null) {
-                    target.setProtocol(protocol);
-                }
-                if (target.getAuthority() == null) {
-                    target.setAuthority(authority);
-                }
+                pidProvider.generatePid(target);
             }
-            if (idServiceBean.alreadyExists(target)) {
+
+            if (pidProvider.alreadyRegistered(target)) {
                 return;
             }
-            String doiRetString = idServiceBean.createIdentifier(target);
+            String doiRetString = pidProvider.createIdentifier(target);
             if (doiRetString != null && doiRetString.contains(target.getIdentifier())) {
-                if (!idServiceBean.registerWhenPublished()) {
+                if (!pidProvider.registerWhenPublished()) {
                     // Should register ID before publicize() is called
-                    // For example, DOIEZIdServiceBean tries to recreate the id if the identifier isn't registered before
+                    // For example, DOIEZIdProvider tries to recreate the id if the identifier isn't registered before
                     // publicizeIdentifier is called
                     target.setIdentifierRegistered(true);
                     target.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
                 }
                 if (target.isReleased()) {
-                    idServiceBean.publicizeIdentifier(target);
+                    pidProvider.publicizeIdentifier(target);
                 }
-                if (idServiceBean.registerWhenPublished() && target.isReleased()) {
+                if (pidProvider.registerWhenPublished() && target.isReleased()) {
                     target.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
                     target.setIdentifierRegistered(true);
                 }
@@ -94,27 +81,21 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
                     Dataset dataset = (Dataset) target;
                     for (DataFile df : dataset.getFiles()) {
                         if (df.getIdentifier() == null || df.getIdentifier().isEmpty()) {
-                            df.setIdentifier(ctxt.files().generateDataFileIdentifier(df, idServiceBean));
-                            if (df.getProtocol() == null || df.getProtocol().isEmpty()) {
-                                df.setProtocol(protocol);
-                            }
-                            if (df.getAuthority() == null || df.getAuthority().isEmpty()) {
-                                df.setAuthority(authority);
-                            }
+                            pidProvider.generatePid(df);
                         }
-                        doiRetString = idServiceBean.createIdentifier(df);
+                        doiRetString = pidProvider.createIdentifier(df);
                         if (doiRetString != null && doiRetString.contains(df.getIdentifier())) {
-                            if (!idServiceBean.registerWhenPublished()) {
+                            if (!pidProvider.registerWhenPublished()) {
                                 // Should register ID before publicize() is called
-                                // For example, DOIEZIdServiceBean tries to recreate the id if the identifier isn't registered before
+                                // For example, DOIEZIdProvider tries to recreate the id if the identifier isn't registered before
                                 // publicizeIdentifier is called
                                 df.setIdentifierRegistered(true);
                                 df.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
                             }
                             if (df.isReleased()) {
-                                idServiceBean.publicizeIdentifier(df);
+                                pidProvider.publicizeIdentifier(df);
                             }
-                            if (idServiceBean.registerWhenPublished() && df.isReleased()) {
+                            if (pidProvider.registerWhenPublished() && df.isReleased()) {
                                 df.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
                                 df.setIdentifierRegistered(true);
                             }
@@ -136,22 +117,15 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
             //Only continue if you can successfully migrate the handle
             boolean doNormalSolrDocCleanUp = true;
             Dataset dataset = (Dataset) target;
-            try {
-                ctxt.index().indexDataset(dataset, doNormalSolrDocCleanUp);
-                ctxt.solrIndex().indexPermissionsForOneDvObject( dataset);
-            } catch (IOException | SolrServerException e) {
-                String failureLogText = "Post migrate handle dataset indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-                failureLogText += "\r\n" + e.getLocalizedMessage();
-                LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, dataset);
-
-            }
+            ctxt.index().asyncIndexDataset(dataset, doNormalSolrDocCleanUp);
+            ctxt.solrIndex().indexPermissionsForOneDvObject( dataset);
         }
     }
     
     private Boolean processMigrateHandle (CommandContext ctxt){
         boolean retval = true;
         if(!target.isInstanceofDataset()) return false;
-        if(!target.getProtocol().equals(GlobalId.HDL_PROTOCOL)) return false;
+        if(!target.getProtocol().equals(HandlePidProvider.HDL_PROTOCOL)) return false;
         
         AlternativePersistentIdentifier api = new AlternativePersistentIdentifier();
         api.setProtocol(target.getProtocol());
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterOIDCUserCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterOIDCUserCommand.java
new file mode 100644
index 00000000000..c7745c75aa9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterOIDCUserCommand.java
@@ -0,0 +1,204 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.api.dto.UserDTO;
+import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
+import edu.harvard.iq.dataverse.authorization.UserRecordIdentifier;
+import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationException;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2UserRecord;
+import edu.harvard.iq.dataverse.engine.command.*;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.engine.command.exception.InvalidFieldsCommandException;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RequiredPermissions({})
+public class RegisterOIDCUserCommand extends AbstractVoidCommand {
+
+    private static final String FIELD_USERNAME = "username";
+    private static final String FIELD_FIRST_NAME = "firstName";
+    private static final String FIELD_LAST_NAME = "lastName";
+    private static final String FIELD_EMAIL_ADDRESS = "emailAddress";
+    private static final String FIELD_TERMS_ACCEPTED = "termsAccepted";
+
+    private final String bearerToken;
+    private final UserDTO userDTO;
+
+    public RegisterOIDCUserCommand(DataverseRequest aRequest, String bearerToken, UserDTO userDTO) {
+        super(aRequest, (DvObject) null);
+        this.bearerToken = bearerToken;
+        this.userDTO = userDTO;
+    }
+
+    @Override
+    protected void executeImpl(CommandContext ctxt) throws CommandException {
+        try {
+            OAuth2UserRecord oAuth2UserRecord = ctxt.authentication().verifyOIDCBearerTokenAndGetOAuth2UserRecord(bearerToken);
+            UserRecordIdentifier userRecordIdentifier = oAuth2UserRecord.getUserRecordIdentifier();
+
+            if (ctxt.authentication().lookupUser(userRecordIdentifier) != null) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.userAlreadyRegisteredWithToken"), this);
+            }
+
+            boolean provideMissingClaimsEnabled = FeatureFlags.API_BEARER_AUTH_PROVIDE_MISSING_CLAIMS.enabled();
+
+            updateUserDTO(oAuth2UserRecord, provideMissingClaimsEnabled);
+
+            AuthenticatedUserDisplayInfo userDisplayInfo = new AuthenticatedUserDisplayInfo(
+                    userDTO.getFirstName(),
+                    userDTO.getLastName(),
+                    userDTO.getEmailAddress(),
+                    userDTO.getAffiliation() != null ? userDTO.getAffiliation() : "",
+                    userDTO.getPosition() != null ? userDTO.getPosition() : ""
+            );
+
+            validateUserFields(ctxt, provideMissingClaimsEnabled);
+
+            ctxt.authentication().createAuthenticatedUser(userRecordIdentifier, userDTO.getUsername(), userDisplayInfo, true);
+
+        } catch (AuthorizationException ex) {
+            throw new PermissionException(ex.getMessage(), this, null, null, true);
+        }
+    }
+
+    private void updateUserDTO(OAuth2UserRecord oAuth2UserRecord, boolean provideMissingClaimsEnabled) throws InvalidFieldsCommandException {
+        if (provideMissingClaimsEnabled) {
+            Map<String, String> fieldErrors = validateConflictingClaims(oAuth2UserRecord);
+            throwInvalidFieldsCommandExceptionIfErrorsExist(fieldErrors);
+            updateUserDTOWithClaims(oAuth2UserRecord);
+        } else {
+            Map<String, String> fieldErrors = validateUserDTOHasNoClaims();
+            throwInvalidFieldsCommandExceptionIfErrorsExist(fieldErrors);
+            overwriteUserDTOWithClaims(oAuth2UserRecord);
+        }
+    }
+
+    private Map<String, String> validateConflictingClaims(OAuth2UserRecord oAuth2UserRecord) {
+        Map<String, String> fieldErrors = new HashMap<>();
+
+        addFieldErrorIfConflict(FIELD_USERNAME, oAuth2UserRecord.getUsername(), userDTO.getUsername(), fieldErrors);
+        addFieldErrorIfConflict(FIELD_FIRST_NAME, oAuth2UserRecord.getDisplayInfo().getFirstName(), userDTO.getFirstName(), fieldErrors);
+        addFieldErrorIfConflict(FIELD_LAST_NAME, oAuth2UserRecord.getDisplayInfo().getLastName(), userDTO.getLastName(), fieldErrors);
+        addFieldErrorIfConflict(FIELD_EMAIL_ADDRESS, oAuth2UserRecord.getDisplayInfo().getEmailAddress(), userDTO.getEmailAddress(), fieldErrors);
+
+        return fieldErrors;
+    }
+
+    private void addFieldErrorIfConflict(String fieldName, String claimValue, String existingValue, Map<String, String> fieldErrors) {
+        if (claimValue != null && !claimValue.trim().isEmpty() && existingValue != null && !claimValue.equals(existingValue)) {
+            String errorMessage = BundleUtil.getStringFromBundle(
+                    "registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldAlreadyPresentInProvider",
+                    List.of(fieldName)
+            );
+            fieldErrors.put(fieldName, errorMessage);
+        }
+    }
+
+    private Map<String, String> validateUserDTOHasNoClaims() {
+        Map<String, String> fieldErrors = new HashMap<>();
+        if (userDTO.getUsername() != null) {
+            String errorMessage = BundleUtil.getStringFromBundle(
+                    "registerOidcUserCommand.errors.provideMissingClaimsDisabled.unableToSetFieldViaJSON",
+                    List.of(FIELD_USERNAME)
+            );
+            fieldErrors.put(FIELD_USERNAME, errorMessage);
+        }
+        if (userDTO.getEmailAddress() != null) {
+            String errorMessage = BundleUtil.getStringFromBundle(
+                    "registerOidcUserCommand.errors.provideMissingClaimsDisabled.unableToSetFieldViaJSON",
+                    List.of(FIELD_EMAIL_ADDRESS)
+            );
+            fieldErrors.put(FIELD_EMAIL_ADDRESS, errorMessage);
+        }
+        if (userDTO.getFirstName() != null) {
+            String errorMessage = BundleUtil.getStringFromBundle(
+                    "registerOidcUserCommand.errors.provideMissingClaimsDisabled.unableToSetFieldViaJSON",
+                    List.of(FIELD_FIRST_NAME)
+            );
+            fieldErrors.put(FIELD_FIRST_NAME, errorMessage);
+        }
+        if (userDTO.getLastName() != null) {
+            String errorMessage = BundleUtil.getStringFromBundle(
+                    "registerOidcUserCommand.errors.provideMissingClaimsDisabled.unableToSetFieldViaJSON",
+                    List.of(FIELD_LAST_NAME)
+            );
+            fieldErrors.put(FIELD_LAST_NAME, errorMessage);
+        }
+        return fieldErrors;
+    }
+
+    private void updateUserDTOWithClaims(OAuth2UserRecord oAuth2UserRecord) {
+        userDTO.setUsername(getValueOrDefault(oAuth2UserRecord.getUsername(), userDTO.getUsername()));
+        userDTO.setFirstName(getValueOrDefault(oAuth2UserRecord.getDisplayInfo().getFirstName(), userDTO.getFirstName()));
+        userDTO.setLastName(getValueOrDefault(oAuth2UserRecord.getDisplayInfo().getLastName(), userDTO.getLastName()));
+        userDTO.setEmailAddress(getValueOrDefault(oAuth2UserRecord.getDisplayInfo().getEmailAddress(), userDTO.getEmailAddress()));
+    }
+
+    private void overwriteUserDTOWithClaims(OAuth2UserRecord oAuth2UserRecord) {
+        userDTO.setUsername(oAuth2UserRecord.getUsername());
+        userDTO.setFirstName(oAuth2UserRecord.getDisplayInfo().getFirstName());
+        userDTO.setLastName(oAuth2UserRecord.getDisplayInfo().getLastName());
+        userDTO.setEmailAddress(oAuth2UserRecord.getDisplayInfo().getEmailAddress());
+    }
+
+    private void throwInvalidFieldsCommandExceptionIfErrorsExist(Map<String, String> fieldErrors) throws InvalidFieldsCommandException {
+        if (!fieldErrors.isEmpty()) {
+            throw new InvalidFieldsCommandException(
+                    BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.invalidFields"),
+                    this,
+                    fieldErrors
+            );
+        }
+    }
+
+    private String getValueOrDefault(String oidcValue, String dtoValue) {
+        return (oidcValue == null || oidcValue.trim().isEmpty()) ? dtoValue : oidcValue;
+    }
+
+    private void validateUserFields(CommandContext ctxt, boolean provideMissingClaimsEnabled) throws InvalidFieldsCommandException {
+        Map<String, String> fieldErrors = new HashMap<>();
+
+        if (!FeatureFlags.API_BEARER_AUTH_HANDLE_TOS_ACCEPTANCE_IN_IDP.enabled()) {
+            validateTermsAccepted(fieldErrors);
+        }
+
+        validateField(fieldErrors, FIELD_EMAIL_ADDRESS, userDTO.getEmailAddress(), ctxt, provideMissingClaimsEnabled);
+        validateField(fieldErrors, FIELD_USERNAME, userDTO.getUsername(), ctxt, provideMissingClaimsEnabled);
+        validateField(fieldErrors, FIELD_FIRST_NAME, userDTO.getFirstName(), ctxt, provideMissingClaimsEnabled);
+        validateField(fieldErrors, FIELD_LAST_NAME, userDTO.getLastName(), ctxt, provideMissingClaimsEnabled);
+
+        throwInvalidFieldsCommandExceptionIfErrorsExist(fieldErrors);
+    }
+
+    private void validateTermsAccepted(Map<String, String> fieldErrors) {
+        if (!userDTO.isTermsAccepted()) {
+            fieldErrors.put(FIELD_TERMS_ACCEPTED, BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.userShouldAcceptTerms"));
+        }
+    }
+
+    private void validateField(Map<String, String> fieldErrors, String fieldName, String fieldValue, CommandContext ctxt, boolean provideMissingClaimsEnabled) {
+        if (fieldValue == null || fieldValue.isEmpty()) {
+            String errorKey = provideMissingClaimsEnabled ?
+                    "registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldRequired" :
+                    "registerOidcUserCommand.errors.provideMissingClaimsDisabled.fieldRequired";
+            fieldErrors.put(fieldName, BundleUtil.getStringFromBundle(errorKey, List.of(fieldName)));
+        } else if (isFieldInUse(ctxt, fieldName, fieldValue)) {
+            fieldErrors.put(fieldName, BundleUtil.getStringFromBundle("registerOidcUserCommand.errors." + fieldName + "InUse"));
+        }
+    }
+
+    private boolean isFieldInUse(CommandContext ctxt, String fieldName, String value) {
+        if (FIELD_EMAIL_ADDRESS.equals(fieldName)) {
+            return ctxt.authentication().getAuthenticatedUserByEmail(value) != null;
+        } else if (FIELD_USERNAME.equals(fieldName)) {
+            return ctxt.authentication().getAuthenticatedUser(value) != null;
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RenameDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RenameDataverseCommand.java
index 1a3db8c1721..2c4a97e824c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RenameDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RenameDataverseCommand.java
@@ -35,4 +35,9 @@ public Dataverse execute(CommandContext ctxt) throws CommandException {
 		return ctxt.dataverses().save(renamed);
 	}
 	
+        @Override
+        public boolean onSuccess(CommandContext ctxt, Object r) {
+            return ctxt.dataverses().index((Dataverse) r);
+        }  	
+	
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestAccessCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestAccessCommand.java
index 0e7e7977e3a..bf291427341 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestAccessCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestAccessCommand.java
@@ -5,7 +5,13 @@
  */
 package edu.harvard.iq.dataverse.engine.command.impl;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Logger;
+
 import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.FileAccessRequest;
+import edu.harvard.iq.dataverse.GuestbookResponse;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
@@ -14,6 +20,7 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
 
 /**
  *
@@ -21,25 +28,39 @@
  */
 @RequiredPermissions({})
 public class RequestAccessCommand extends AbstractCommand<DataFile> {
-    
+
+    private static final Logger logger = Logger.getLogger(RequestAccessCommand.class.getName());
+
     private final DataFile file;
     private final AuthenticatedUser requester;
+    private final FileAccessRequest fileAccessRequest;
     private final Boolean sendNotification;
 
-
     public RequestAccessCommand(DataverseRequest dvRequest, DataFile file) {
         // for data file check permission on owning dataset
-        super(dvRequest, file);        
-        this.file = file;        
+        this(dvRequest, file, false);
+    }
+
+    public RequestAccessCommand(DataverseRequest dvRequest, DataFile file, Boolean sendNotification) {
+        // for data file check permission on owning dataset
+        super(dvRequest, file);
+        this.file = file;
         this.requester = (AuthenticatedUser) dvRequest.getUser();
-        this.sendNotification = false;
+        this.fileAccessRequest = new FileAccessRequest(file, requester);
+        this.sendNotification = sendNotification;
     }
-    
-        public RequestAccessCommand(DataverseRequest dvRequest, DataFile file, Boolean sendNotification) {
+
+    public RequestAccessCommand(DataverseRequest dvRequest, DataFile file, GuestbookResponse gbr) {
+        this(dvRequest, file, gbr, false);
+    }
+
+    public RequestAccessCommand(DataverseRequest dvRequest, DataFile file, GuestbookResponse gbr,
+            Boolean sendNotification) {
         // for data file check permission on owning dataset
-        super(dvRequest, file);        
-        this.file = file;        
+        super(dvRequest, file);
+        this.file = file;
         this.requester = (AuthenticatedUser) dvRequest.getUser();
+        this.fileAccessRequest = new FileAccessRequest(file, requester, gbr);
         this.sendNotification = sendNotification;
     }
 
@@ -49,18 +70,36 @@ public DataFile execute(CommandContext ctxt) throws CommandException {
         if (!file.getOwner().isFileAccessRequest()) {
             throw new CommandException(BundleUtil.getStringFromBundle("file.requestAccess.notAllowed"), this);
         }
-        
-        //if user already has permission to download file or the file is public throw command exception
-        if (!file.isRestricted() || ctxt.permissions().requestOn(this.getRequest(), file).has(Permission.DownloadFile)) {
-            throw new CommandException(BundleUtil.getStringFromBundle("file.requestAccess.notAllowed.alreadyHasDownloadPermisssion"), this);
+
+        // if user already has permission to download file or the file is public throw
+        // command exception
+        logger.fine("User: " + this.getRequest().getAuthenticatedUser().getName());
+        logger.fine("File: " + file.getId() + " : restricted?: " + file.isRestricted());
+        logger.fine(
+                "permission?: " + ctxt.permissions().requestOn(this.getRequest(), file).has(Permission.DownloadFile));
+        if (!file.isRestricted()
+                || ctxt.permissions().requestOn(this.getRequest(), file).has(Permission.DownloadFile)) {
+            throw new CommandException(
+                    BundleUtil.getStringFromBundle("file.requestAccess.notAllowed.alreadyHasDownloadPermisssion"),
+                    this);
         }
 
-        file.getFileAccessRequesters().add(requester);
+        if (FileUtil.isActivelyEmbargoed(file)) {
+            throw new CommandException(BundleUtil.getStringFromBundle("file.requestAccess.notAllowed.embargoed"), this);
+        }
+        file.addFileAccessRequest(fileAccessRequest);
+        List<FileAccessRequest> fars = requester.getFileAccessRequests();
+        if(fars!=null) {
+            fars.add(fileAccessRequest);
+        } else {
+            requester.setFileAccessRequests(Arrays.asList(fileAccessRequest));
+        }
+        DataFile savedFile = ctxt.files().save(file);
         if (sendNotification) {
-            ctxt.fileDownload().sendRequestFileAccessNotification(this.file.getOwner(), this.file.getId(), requester);
+            logger.fine("ctxt.fileDownload().sendRequestFileAccessNotification(savedFile, requester);");
+            ctxt.fileDownload().sendRequestFileAccessNotification(savedFile.getOwner(), savedFile.getId(), requester);
         }
-        return ctxt.files().save(file);
+        return savedFile;
     }
 
 }
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommand.java
index 2a6d7216aa5..6b7baa7d01b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommand.java
@@ -27,6 +27,7 @@
  * "actiontype" in the actionlogrecord rather than "InternalError" if you throw
  * a CommandExecutionException.
  */
+@Deprecated(forRemoval = true, since = "2024-07-07")
 @RequiredPermissions(Permission.EditDataset)
 public class RequestRsyncScriptCommand extends AbstractCommand<ScriptRequestResponse> {
 
@@ -51,7 +52,7 @@ public ScriptRequestResponse execute(CommandContext ctxt) throws CommandExceptio
         }
         String dcmBaseUrl = ctxt.settings().getValueForKey(DataCaptureModuleUrl);
         if (dcmBaseUrl == null) {
-            throw new RuntimeException(DataCaptureModuleUrl + " is null!");
+            throw new CommandException("DataCaptureModuleUrl is null!", this);
         }
         User user = request.getUser();
         if (!(user instanceof AuthenticatedUser)) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ReservePidCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ReservePidCommand.java
new file mode 100644
index 00000000000..77b06e4e152
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ReservePidCommand.java
@@ -0,0 +1,43 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import java.util.Collections;
+import java.util.logging.Logger;
+
+/**
+ * No required permissions because we check for superuser status.
+ * @param <T>
+ */
+@RequiredPermissions({})
+public class ReservePidCommand extends AbstractDatasetCommand<Dataset> {
+
+    private static final Logger logger = Logger.getLogger(ReservePidCommand.class.getCanonicalName());
+
+    private final Dataset dataset;
+
+    public ReservePidCommand(DataverseRequest request, Dataset dataset) {
+        super(request, dataset);
+        this.dataset = dataset;
+    }
+
+    @Override
+    public Dataset execute(CommandContext ctxt) throws CommandException {
+
+        if (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser()) {
+            throw new PermissionException(BundleUtil.getStringFromBundle("admin.api.auth.mustBeSuperUser"),
+                    this, Collections.singleton(Permission.EditDataset), dataset);
+        }
+        registerExternalIdentifier(getDataset(), ctxt, true);
+        registerFilePidsIfNeeded(getDataset(), ctxt, true);
+        return dataset;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommand.java
index 16fa40cd8a7..2387e5fb31b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommand.java
@@ -5,10 +5,7 @@
  */
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
@@ -34,13 +31,25 @@ public class RestrictFileCommand extends AbstractVoidCommand {
 
     private final DataFile file;
     private final boolean restrict;
-    
+    private final Boolean fileAccessRequest;
+    private final String termsOfAccess;
+
+    public RestrictFileCommand(DataFile file, DataverseRequest aRequest, boolean restrict, Boolean fileAccessRequest, String termsOfAccess) {
+        super(aRequest, file.getOwner());
+        this.file = file;
+        this.restrict = restrict;
+        this.fileAccessRequest = fileAccessRequest;
+        this.termsOfAccess = termsOfAccess;
+    }
+
     public RestrictFileCommand(DataFile file, DataverseRequest aRequest, boolean restrict) {
         super(aRequest, file.getOwner());
         this.file = file;
         this.restrict = restrict;
-    }    
-       
+        this.fileAccessRequest = null;
+        this.termsOfAccess = null;
+    }
+
     @Override
     protected void executeImpl(CommandContext ctxt) throws CommandException {
         // check if public install & don't allow
@@ -63,7 +72,14 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         }
         else {
             Dataset dataset = file.getOwner();
-            DatasetVersion workingVersion = dataset.getEditVersion();
+            DatasetVersion workingVersion = dataset.getOrCreateEditVersion();
+            if (restrict && fileAccessRequest != null) {
+                if (workingVersion.getTermsOfUseAndAccess() == null) {
+                    workingVersion.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+                }
+                workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(fileAccessRequest);
+                workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(termsOfAccess);
+            }
             // We need the FileMetadata for the file in the draft dataset version and the
             // file we have may still reference the fmd from the prior released version
             FileMetadata draftFmd = file.getFileMetadata();
@@ -86,5 +102,9 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
                 }
             }
         }
+        if (restrict) {
+            // delete all FeaturedItems with links to this restricted file
+            ctxt.dataverseFeaturedItems().deleteAllByDvObjectId(file.getId());
+        }
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ReturnDatasetToAuthorCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ReturnDatasetToAuthorCommand.java
index 169f6d790d3..8d8fddeda6b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ReturnDatasetToAuthorCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ReturnDatasetToAuthorCommand.java
@@ -11,6 +11,7 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.workflows.WorkflowComment;
 import java.io.IOException;
@@ -25,6 +26,11 @@ public class ReturnDatasetToAuthorCommand extends AbstractDatasetCommand<Dataset
 
     public ReturnDatasetToAuthorCommand(DataverseRequest aRequest, Dataset anAffectedDvObject, String comment) {
         super(aRequest, anAffectedDvObject);
+
+        if ((comment == null || comment.isEmpty()) && !FeatureFlags.DISABLE_RETURN_TO_AUTHOR_REASON.enabled()) {
+            throw new IllegalArgumentException(BundleUtil.getStringFromBundle("dataset.reject.commentNull"));
+        }
+
         this.comment = comment;
     }
 
@@ -37,11 +43,11 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
             throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.reject.datasetNotInReview"), this);
         }
         
-        dataset.getEditVersion().setLastUpdateTime(getTimestamp());
+        dataset.getOrCreateEditVersion().setLastUpdateTime(getTimestamp());
         dataset.setModificationTime(getTimestamp());
         
         ctxt.engine().submit( new RemoveLockCommand(getRequest(), getDataset(), DatasetLock.Reason.InReview) );
-        WorkflowComment workflowComment = new WorkflowComment(dataset.getEditVersion(), WorkflowComment.Type.RETURN_TO_AUTHOR, comment, (AuthenticatedUser) this.getUser());
+        WorkflowComment workflowComment = new WorkflowComment(dataset.getOrCreateEditVersion(), WorkflowComment.Type.RETURN_TO_AUTHOR, comment, (AuthenticatedUser) this.getUser());
         ctxt.datasets().addWorkflowComment(workflowComment);
 
         updateDatasetUser(ctxt);
@@ -72,14 +78,7 @@ public boolean onSuccess(CommandContext ctxt, Object r) {
         boolean retVal = true;
         Dataset dataset = (Dataset) r;
 
-        try {
-            Future<String> indexString = ctxt.index().indexDataset(dataset, true);
-        } catch (IOException | SolrServerException e) {
-            String failureLogText = "Post return to author indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, dataset);
-            retVal = false;
-        }
+        ctxt.index().asyncIndexDataset(dataset, true);
 
         return retVal;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RevokeRoleCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RevokeRoleCommand.java
index 1a290df4a4a..26ab88d29d8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RevokeRoleCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RevokeRoleCommand.java
@@ -1,7 +1,8 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
@@ -22,8 +23,7 @@ public class RevokeRoleCommand extends AbstractVoidCommand {
 	private final RoleAssignment toBeRevoked;
 
 	public RevokeRoleCommand(RoleAssignment toBeRevoked, DataverseRequest aRequest) {
-        // for data file check permission on owning dataset
-        super(aRequest, toBeRevoked.getDefinitionPoint() instanceof DataFile ? toBeRevoked.getDefinitionPoint().getOwner() : toBeRevoked.getDefinitionPoint());
+        super(aRequest, toBeRevoked.getDefinitionPoint());
 		this.toBeRevoked = toBeRevoked;
 	}
 	
@@ -34,9 +34,13 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         
     @Override
     public Map<String, Set<Permission>> getRequiredPermissions() {
-        // for data file check permission on owning dataset
+        DvObject defPoint = toBeRevoked.getDefinitionPoint();
         return Collections.singletonMap("",
-                toBeRevoked.getDefinitionPoint() instanceof Dataverse ? Collections.singleton(Permission.ManageDataversePermissions)
-                : Collections.singleton(Permission.ManageDatasetPermissions));
-    }	
+                defPoint instanceof Dataverse ? Collections.singleton(Permission.ManageDataversePermissions)
+                : defPoint instanceof Dataset ? Collections.singleton(Permission.ManageDatasetPermissions): Collections.singleton(Permission.ManageFilePermissions));
+    }
+    
+    @Override public String describe() { 
+	    return toBeRevoked.getAssigneeIdentifier() + " has had the role: " + toBeRevoked.getRole() + " REVOKED on " + toBeRevoked.getDefinitionPoint().accept(DvObject.NameIdPrinter); 
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RevokeSuperuserStatusCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RevokeSuperuserStatusCommand.java
index 0abb53ea4fb..7e55102ef5f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RevokeSuperuserStatusCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RevokeSuperuserStatusCommand.java
@@ -14,7 +14,7 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/S3SubmitToArchiveCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/S3SubmitToArchiveCommand.java
new file mode 100644
index 00000000000..4f93e88de5e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/S3SubmitToArchiveCommand.java
@@ -0,0 +1,246 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DatasetLock.Reason;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.util.bagit.BagGenerator;
+import edu.harvard.iq.dataverse.util.bagit.OREMap;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import edu.harvard.iq.dataverse.workflow.step.Failure;
+import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Logger;
+
+import jakarta.annotation.Resource;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProviderChain;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.async.AsyncRequestBody;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetObjectAttributesRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectAttributesResponse;
+import software.amazon.awssdk.services.s3.model.ObjectAttributes;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+import software.amazon.awssdk.services.s3.S3ClientBuilder;
+import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.utils.StringUtils;
+import software.amazon.awssdk.transfer.s3.S3TransferManager;
+import software.amazon.awssdk.transfer.s3.model.CompletedFileUpload;
+import software.amazon.awssdk.transfer.s3.model.FileUpload;
+import software.amazon.awssdk.transfer.s3.model.UploadFileRequest;
+
+@RequiredPermissions(Permission.PublishDataset)
+public class S3SubmitToArchiveCommand extends AbstractSubmitToArchiveCommand {
+
+    @Resource(name = "java:comp/env/concurrent/s3UploadExecutor")
+    private ManagedExecutorService executorService;
+
+    private static final Logger logger = Logger.getLogger(S3SubmitToArchiveCommand.class.getName());
+    private static final String S3_CONFIG = ":S3ArchiverConfig";
+
+    private static final Config config = ConfigProvider.getConfig();
+    protected S3AsyncClient s3 = null;
+    private S3TransferManager tm = null;
+    private String spaceName = null;
+    protected String bucketName = null;
+
+    public S3SubmitToArchiveCommand(DataverseRequest aRequest, DatasetVersion version) {
+        super(aRequest, version);
+    }
+
+    @Override
+    public WorkflowStepResult performArchiveSubmission(DatasetVersion dv, ApiToken token,
+            Map<String, String> requestedSettings) {
+        logger.fine("In S3SubmitToArchiveCommand...");
+        JsonObject configObject = null;
+
+        try {
+            configObject = JsonUtil.getJsonObject(requestedSettings.get(S3_CONFIG));
+            logger.fine("Config: " + configObject);
+            bucketName = configObject.getString("s3_bucket_name", null);
+        } catch (Exception e) {
+            logger.warning("Unable to parse " + S3_CONFIG + " setting as a Json object");
+        }
+        if (configObject != null && bucketName != null) {
+
+            createClient(configObject);
+
+            // Set a failure status that will be updated if we succeed
+            JsonObjectBuilder statusObject = Json.createObjectBuilder();
+            statusObject.add(DatasetVersion.ARCHIVAL_STATUS, DatasetVersion.ARCHIVAL_STATUS_FAILURE);
+            statusObject.add(DatasetVersion.ARCHIVAL_STATUS_MESSAGE, "Bag not transferred");
+
+            try {
+
+                Dataset dataset = dv.getDataset();
+                if (dataset.getLockFor(Reason.finalizePublication) == null) {
+
+                    spaceName = getSpaceName(dataset);
+                    String dataciteXml = getDataCiteXml(dv);
+                 // Add datacite.xml file
+                    String dcKey = spaceName + "/" + getDataCiteFileName(spaceName, dv) + ".xml";
+
+                    PutObjectRequest putRequest = PutObjectRequest.builder()
+                            .bucket(bucketName)
+                            .key(dcKey)
+                            .build();
+
+                    CompletableFuture<PutObjectResponse> putFuture = s3.putObject(putRequest, 
+                            AsyncRequestBody.fromString(dataciteXml, StandardCharsets.UTF_8));
+
+                    // Wait for the put operation to complete
+                    PutObjectResponse putResponse = putFuture.join();
+
+                    if (!putResponse.sdkHttpResponse().isSuccessful()) {
+                        logger.warning("Could not write datacite xml to S3");
+                        return new Failure("S3 Archiver failed writing datacite xml file");
+                    }
+
+                    // Store BagIt file
+                    String fileName = getFileName(spaceName, dv);
+
+                    String bagKey = spaceName + "/" + fileName + ".zip";
+                    // Add BagIt ZIP file
+                    // Google uses MD5 as one way to verify the
+                    // transfer
+
+                    // Generate bag
+                    BagGenerator bagger = new BagGenerator(new OREMap(dv, false), dataciteXml);
+                    bagger.setAuthenticationKey(token.getTokenString());
+                    if (bagger.generateBag(fileName, false)) {
+                        File bagFile = bagger.getBagFile(fileName);
+
+                        UploadFileRequest uploadFileRequest = UploadFileRequest.builder()
+                                .putObjectRequest(req -> req.bucket(bucketName).key(bagKey)).source(bagFile.toPath())
+                                .build();
+
+                        FileUpload fileUpload = tm.uploadFile(uploadFileRequest);
+
+                        CompletedFileUpload uploadResult = fileUpload.completionFuture().join();
+
+                        if (uploadResult.response().sdkHttpResponse().isSuccessful()) {
+                            logger.fine("S3 Submission step: Content Transferred");
+
+                            statusObject.add(DatasetVersion.ARCHIVAL_STATUS, DatasetVersion.ARCHIVAL_STATUS_SUCCESS);
+                            statusObject.add(DatasetVersion.ARCHIVAL_STATUS_MESSAGE,
+                                    String.format("https://%s.s3.amazonaws.com/%s", bucketName, bagKey));
+                        } else {
+                            logger.severe("Error sending file to S3: " + fileName);
+                            return new Failure("Error in transferring Bag file to S3",
+                                    "S3 Submission Failure: incomplete transfer");
+                        }
+                    } else {
+                        logger.warning("Could not write local Bag file " + fileName);
+                        return new Failure("S3 Archiver fail writing temp local bag");
+                    }
+
+                } else {
+                    logger.warning(
+                            "S3 Archiver Submision Workflow aborted: Dataset locked for publication/pidRegister");
+                    return new Failure("Dataset locked");
+                }
+            } catch (Exception e) {
+                logger.warning(e.getLocalizedMessage());
+                e.printStackTrace();
+                return new Failure("S3 Archiver Submission Failure",
+                        e.getLocalizedMessage() + ": check log for details");
+
+            } finally {
+                if (tm != null) {
+                    tm.close();
+                }
+                dv.setArchivalCopyLocation(statusObject.build().toString());
+            }
+            return WorkflowStepResult.OK;
+        } else {
+            return new Failure(
+                    "S3 Submission not configured - no \":S3ArchivalProfile\"  and/or \":S3ArchivalConfig\" or no bucket-name defined in config.");
+        }
+    }
+
+    protected String getDataCiteFileName(String spaceName, DatasetVersion dv) {
+        return spaceName + "_datacite.v" + dv.getFriendlyVersionNumber();
+    }
+
+    protected String getFileName(String spaceName, DatasetVersion dv) {
+        return spaceName + ".v" + dv.getFriendlyVersionNumber();
+    }
+
+    protected String getSpaceName(Dataset dataset) {
+        if (spaceName == null) {
+            spaceName = dataset.getGlobalId().asString().replace(':', '-').replace('/', '-').replace('.', '-')
+                    .toLowerCase();
+        }
+        return spaceName;
+    }
+
+    private S3AsyncClient createClient(JsonObject configObject) {
+
+        // Create a builder for the S3AsyncClient
+        S3AsyncClientBuilder s3CB = S3AsyncClient.builder();
+
+        // Create a custom HTTP client with the desired pool size
+        Integer poolSize = configObject.getInt("connection-pool-size", 256);
+        SdkAsyncHttpClient httpClient = NettyNioAsyncHttpClient.builder().maxConcurrency(poolSize).build();
+
+        // Apply the custom HTTP client to the S3AsyncClientBuilder
+        s3CB.httpClient(httpClient);
+
+        String s3CEUrl = configObject.getString("custom-endpoint-url", "");
+        String s3CERegion = configObject.getString("custom-endpoint-region", "dataverse");
+
+        if (!StringUtils.isBlank(s3CEUrl)) {
+            s3CB.endpointOverride(java.net.URI.create(s3CEUrl));
+            s3CB.region(Region.of(s3CERegion));
+        }
+
+        Boolean s3pathStyleAccess = configObject.getBoolean("path-style-access", false);
+        s3CB.forcePathStyle(s3pathStyleAccess);
+
+        String profile = configObject.getString("profile", "default");
+        AwsCredentialsProvider profileCredentials = ProfileCredentialsProvider.create(profile);
+
+        String accessKey = config.getOptionalValue("dataverse.s3archiver.access-key", String.class).orElse("");
+        String secretKey = config.getOptionalValue("dataverse.s3archiver.secret-key", String.class).orElse("");
+        AwsCredentialsProvider staticCredentials = StaticCredentialsProvider
+                .create(AwsBasicCredentials.create(accessKey, secretKey));
+
+        AwsCredentialsProvider credentialsProviderChain = AwsCredentialsProviderChain.builder()
+                .addCredentialsProvider(profileCredentials).addCredentialsProvider(staticCredentials)
+                .addCredentialsProvider(DefaultCredentialsProvider.create()).build();
+
+        s3CB.credentialsProvider(credentialsProviderChain);
+        s3 = s3CB.build();
+        // Create TransferManager
+        tm = S3TransferManager.builder().s3Client(s3).build();
+        return s3;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetCollectionQuotaCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetCollectionQuotaCommand.java
new file mode 100644
index 00000000000..e52c47a5e7d
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetCollectionQuotaCommand.java
@@ -0,0 +1,53 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author landreev
+ *
+ * A superuser-only command:
+ */
+@RequiredPermissions({})
+public class SetCollectionQuotaCommand  extends AbstractVoidCommand {
+
+    private static final Logger logger = Logger.getLogger(GetCollectionQuotaCommand.class.getCanonicalName());
+    
+    private final Dataverse dataverse;
+    private final Long allocation; 
+    
+    public SetCollectionQuotaCommand(DataverseRequest aRequest, Dataverse target, Long allocation) {
+        super(aRequest, target);
+        dataverse = target;
+        this.allocation = allocation; 
+    } 
+        
+    @Override
+    public void executeImpl(CommandContext ctxt) throws CommandException {
+        // Check if user is a superuser:
+        if ( (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser() ) ) {      
+            throw new PermissionException(BundleUtil.getStringFromBundle("dataverse.storage.quota.superusersonly"),
+                this,  null, dataverse);                
+        }
+        
+        if (dataverse == null) {
+            throw new IllegalCommandException("Must specify valid collection", this);
+        }
+        
+        if (allocation == null) {
+            throw new IllegalCommandException("Must specify valid allocation in bytes", this);
+        }
+        
+        ctxt.dataverses().saveStorageQuota(dataverse, allocation);
+    }    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetCurationStatusCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetCurationStatusCommand.java
new file mode 100644
index 00000000000..53901ef5128
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetCurationStatusCommand.java
@@ -0,0 +1,133 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.CurationStatus;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetLock;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DatasetVersionUser;
+import edu.harvard.iq.dataverse.UserNotification;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.Future;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.logging.log4j.util.Strings;
+import org.apache.solr.client.solrj.SolrServerException;
+
+import com.google.api.LabelDescriptor;
+
+@RequiredPermissions(Permission.PublishDataset)
+public class SetCurationStatusCommand extends AbstractDatasetCommand<Dataset> {
+
+    private static final Logger logger = Logger.getLogger(SetCurationStatusCommand.class.getName());
+
+    String label;
+
+    public SetCurationStatusCommand(DataverseRequest aRequest, Dataset dataset, String label) {
+        super(aRequest, dataset);
+        this.label = label;
+    }
+
+    @Override
+    public Dataset execute(CommandContext ctxt) throws CommandException {
+        DatasetVersion version = getDataset().getLatestVersion();
+        if (version.isReleased()) {
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.curationstatus.failure.isReleased"), this);
+        }
+        CurationStatus currentStatus = version.getCurrentCurationStatus();
+
+        CurationStatus status = null;
+        if (((currentStatus == null || Strings.isBlank(currentStatus.getLabel())) && Strings.isNotBlank(label)) ||
+                (currentStatus != null && !currentStatus.getLabel().equals(label))) {
+            status = new CurationStatus(label, version, getRequest().getAuthenticatedUser());
+        }
+
+        String setName = getDataset().getEffectiveCurationLabelSetName();
+        if (setName.equals(SystemConfig.CURATIONLABELSDISABLED)) {
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.curationstatus.failure.disabled"), this);
+        }
+        if (status != null) {
+            boolean found = false;
+            if (status.getLabel() != null) {
+                String[] labelArray = ctxt.systemConfig().getCurationLabels().get(setName);
+                for (String name : labelArray) {
+                    if (name.equals(label)) {
+                        found = true;
+                        version.addCurationStatus(status);
+                        break;
+                    }
+                }
+            } else {
+                //
+                found = true;
+                version.addCurationStatus(status);
+            }
+            if (!found) {
+                logger.fine("Label not found: " + label + " in set " + setName);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.curationstatus.failure.notallowed"), this);
+            }
+        } else {
+            logger.fine("Attempt to reset with the same label : " + label);
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.curationstatus.failure.noChange"), this);
+        }
+        Dataset updatedDataset = save(ctxt);
+        return updatedDataset;
+    }
+
+    public Dataset save(CommandContext ctxt) throws CommandException {
+
+        getDataset().getOrCreateEditVersion().setLastUpdateTime(getTimestamp());
+        getDataset().setModificationTime(getTimestamp());
+
+        Dataset savedDataset = ctxt.em().merge(getDataset());
+        ctxt.em().flush();
+
+        updateDatasetUser(ctxt);
+
+        AuthenticatedUser requestor = getUser().isAuthenticated() ? (AuthenticatedUser) getUser() : null;
+
+        boolean showToAll = JvmSettings.UI_SHOW_CURATION_STATUS_TO_ALL.lookupOptional(Boolean.class).orElse(false);
+
+        List<AuthenticatedUser> authUsers;
+        if (showToAll) {
+            authUsers = ctxt.permissions().getUsersWithPermissionOn(Permission.ViewUnpublishedDataset, savedDataset);
+        } else {
+            authUsers = ctxt.permissions().getUsersWithPermissionOn(Permission.PublishDataset, savedDataset);
+        }
+        for (AuthenticatedUser au : authUsers) {
+            ctxt.notifications().sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.STATUSUPDATED, savedDataset.getLatestVersion().getId(), "", requestor, false);
+        }
+
+        // TODO: What should we do with the indexing result? Print it to the log?
+        return savedDataset;
+    }
+
+    @Override
+    public boolean onSuccess(CommandContext ctxt, Object r) {
+        boolean retVal = true;
+        Dataset dataset = (Dataset) r;
+
+        ctxt.index().asyncIndexDataset(dataset, true);
+        return retVal;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetDatasetCitationDateCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetDatasetCitationDateCommand.java
index fe14d56562d..2cae9e51896 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetDatasetCitationDateCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetDatasetCitationDateCommand.java
@@ -49,14 +49,8 @@ public boolean onSuccess(CommandContext ctxt, Object r) {
         boolean retVal = true;
         Dataset dataset = (Dataset) r;
 
-        try {
-            Future<String> indexString = ctxt.index().indexDataset(dataset, false);
-        } catch (IOException | SolrServerException e) {
-            String failureLogText = "Post set dataset citation date indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, dataset);
-            retVal = false;
-        }
+        ctxt.index().asyncIndexDataset(dataset, false);
+
         return retVal;
     }	
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommand.java
index ad290fe221b..77a4bf5b8ba 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommand.java
@@ -31,6 +31,8 @@ public SubmitDatasetForReviewCommand(DataverseRequest aRequest, Dataset dataset)
     @Override
     public Dataset execute(CommandContext ctxt) throws CommandException {
 
+        validateOrDie(getDataset().getLatestVersion(), false);
+
         if (getDataset().getLatestVersion().isReleased()) {
             throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.submit.failure.isReleased"), this);
         }
@@ -47,9 +49,9 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
         return updatedDataset;
     }
 
-    public Dataset save(CommandContext ctxt) throws CommandException {
+    private Dataset save(CommandContext ctxt) throws CommandException {
 
-        getDataset().getEditVersion().setLastUpdateTime(getTimestamp());
+        getDataset().getOrCreateEditVersion().setLastUpdateTime(getTimestamp());
         getDataset().setModificationTime(getTimestamp());
 
         Dataset savedDataset = ctxt.em().merge(getDataset());
@@ -73,14 +75,8 @@ public boolean onSuccess(CommandContext ctxt, Object r) {
         boolean retVal = true;
         Dataset dataset = (Dataset) r;
 
-        try {
-            Future<String> indexString = ctxt.index().indexDataset(dataset, true);
-        } catch (IOException | SolrServerException e) {
-            String failureLogText = "Post submit for review indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, dataset);
-            retVal = false;
-        }
+        ctxt.index().asyncIndexDataset(dataset, true);
+
         return retVal;
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UningestFileCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UningestFileCommand.java
index 3e592aba85f..ba04c4d7931 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UningestFileCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UningestFileCommand.java
@@ -10,7 +10,6 @@
 import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.MapLayerMetadata;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
@@ -23,11 +22,11 @@
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
 import edu.harvard.iq.dataverse.util.FileUtil;
-import edu.harvard.iq.dataverse.util.StringUtil;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.logging.Logger;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 /**
  *
@@ -48,17 +47,19 @@ public UningestFileCommand(DataverseRequest aRequest, DataFile uningest) {
     @Override
     protected void executeImpl(CommandContext ctxt) throws CommandException {
         
-        // first check if  user is a superuser
-        if ( (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser() ) ) {      
-            throw new PermissionException("Uningest File can only be called by Superusers.",
-                this,  Collections.singleton(Permission.EditDataset), uningest);                
+        // first check if user is a superuser
+        if ((!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser())) {
+            throw new PermissionException("Uningest File can only be called by Superusers.", this,
+                    Collections.singleton(Permission.EditDataset), uningest);
         }
         
         // is this actually a tabular data file?
         if (!uningest.isTabularData()) {
             throw new IllegalCommandException("UningestFileCommand called on a non-tabular data file (id="+uningest.getId()+")", this);
         }
-        
+
+        String originalFileName = uningest.getOriginalFileName();
+
         StorageIO<DataFile> dataAccess = null;
         // size of the stored original:
         Long storedOriginalFileSize;
@@ -104,6 +105,7 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         // all the attribute of the file that are stored in the database: 
         
         // the file size: 
+        long archivalFileSize = uningest.getFilesize();
         uningest.setFilesize(storedOriginalFileSize);
         
         // original file format:
@@ -138,9 +140,14 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         // Modify the file name - which is stored in FileMetadata, and there
         // could be more than one: 
         
-        String originalExtension = FileUtil.generateOriginalExtension(originalFileFormat);
-        
+       // String originalExtension = FileUtil.generateOriginalExtension(originalFileFormat);
         for (FileMetadata fm : uningest.getFileMetadatas()) {
+            
+            fm.setLabel(originalFileName);
+            ctxt.em().merge(fm);
+            
+            /* 
+            getOriginalFileName method replaces this code
             String filename = fm.getLabel();
             String extensionToRemove = StringUtil.substringIncludingLast(filename, ".");
             if (StringUtil.nonEmpty(extensionToRemove)) {
@@ -148,6 +155,7 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
                 fm.setLabel(newFileName);
                 ctxt.em().merge(fm);
             }
+             */
             
             DatasetVersion dv = fm.getDatasetVersion();
             
@@ -157,27 +165,26 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
             ctxt.datasetVersion().fixMissingUnf(dv.getId().toString(), true);
         }
 
-        MapLayerMetadata mapLayerMetadata = ctxt.mapLayerMetadata().findMetadataByDatafile(uningest);
-        if (mapLayerMetadata != null) {
-            try {
-                String id = getUser().getIdentifier();
-                id = id.startsWith("@") ? id.substring(1) : id;
-                AuthenticatedUser authenticatedUser = ctxt.authentication().getAuthenticatedUser(id);
-                ctxt.mapLayerMetadata().deleteMapLayerFromWorldMap(uningest, authenticatedUser);
-            } catch (Exception e) {
-                logger.warning("Unable to delete WorldMap file - may not have existed. Data File id: " + uningest.getId());
-            }
-            ctxt.mapLayerMetadata().deleteMapLayerMetadataObject(mapLayerMetadata, getUser());
-        }
-        
         try{
             dataAccess.deleteAllAuxObjects();
         } catch (IOException e){
             logger.warning("Io Exception deleting all aux objects : " + uningest.getId());
         }
         
+        // Finally, adjust the recorded storage use for the ancestral 
+        // DvObjectContainers (the parent dataset + all the parent collections
+        // up to the root):
+        if (archivalFileSize > 0) {
+            ctxt.storageUse().incrementStorageSizeRecursively(uningest.getOwner().getId(), (0L - archivalFileSize));
+        }
+        
     }
     
+    @Override
+    public boolean onSuccess(CommandContext ctxt, Object r) {
+        
+        return true; 
+    }
     
     private void resetIngestStats(DataFile uningest, CommandContext ctxt){
         
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetFieldsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetFieldsCommand.java
new file mode 100644
index 00000000000..e52954eb4f8
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetFieldsCommand.java
@@ -0,0 +1,163 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.InvalidCommandArgumentsException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RequiredPermissions(Permission.EditDataset)
+public class UpdateDatasetFieldsCommand extends AbstractDatasetCommand<Dataset> {
+
+    private final Dataset dataset;
+    private final List<DatasetField> updatedFields;
+    private final boolean replaceData;
+    private final UpdateDatasetVersionCommand updateDatasetVersionCommand;
+
+    public UpdateDatasetFieldsCommand(Dataset dataset, List<DatasetField> updatedFields, boolean replaceData, DataverseRequest request) {
+        this(dataset, updatedFields, replaceData, request, null);
+    }
+
+    // Use only for testing purposes
+    public UpdateDatasetFieldsCommand(Dataset dataset, List<DatasetField> updatedFields, boolean replaceData, DataverseRequest request, UpdateDatasetVersionCommand updateDatasetVersionCommand) {
+        super(request, dataset);
+        this.dataset = dataset;
+        this.updatedFields = updatedFields;
+        this.replaceData = replaceData;
+        this.updateDatasetVersionCommand = updateDatasetVersionCommand;
+    }
+
+    @Override
+    public Dataset execute(CommandContext ctxt) throws CommandException {
+        DatasetVersion datasetVersion = dataset.getOrCreateEditVersion();
+        datasetVersion.getTermsOfUseAndAccess().setDatasetVersion(datasetVersion);
+
+        String validationErrors = ctxt.datasetFieldsValidator().validateFields(updatedFields, datasetVersion);
+        if (!validationErrors.isEmpty()) {
+            throw new InvalidCommandArgumentsException(
+                    BundleUtil.getStringFromBundle("updateDatasetFieldsCommand.api.processDatasetUpdate.parseError",
+                            List.of(validationErrors)), this);
+        }
+
+        datasetVersion.setVersionState(DatasetVersion.VersionState.DRAFT);
+        updateDatasetVersionFields(datasetVersion);
+
+        return ctxt.engine().submit(updateDatasetVersionCommand == null ? new UpdateDatasetVersionCommand(this.dataset, getRequest()) : updateDatasetVersionCommand);
+    }
+
+    /**
+     * Updates the dataset version fields by iterating through the updated fields and
+     * comparing them to the existing fields in the dataset version.
+     * <p>
+     * - If a matching field exists, its values are added or replaced based on conditions:
+     * - If the field is empty, allows multiple values, or replaceData is enabled, the values are updated.
+     * - If replaceData is enabled, the field is reset before updating.
+     * - If the field is a controlled vocabulary type, it is updated accordingly.
+     * - Otherwise, a regular dataset field update is performed.
+     * </p>
+     * <p>
+     * - If no matching field exists, the updated field is added to the dataset version.
+     * </p>
+     *
+     * @param datasetVersion The dataset version to update with the new fields.
+     */
+    private void updateDatasetVersionFields(DatasetVersion datasetVersion) {
+        for (DatasetField updatedField : updatedFields) {
+            boolean found = false;
+
+            for (DatasetField datasetVersionField : datasetVersion.getDatasetFields()) {
+                if (!datasetVersionField.getDatasetFieldType().equals(updatedField.getDatasetFieldType())) {
+                    continue;
+                }
+
+                found = true;
+
+                if (datasetVersionField.isEmpty() || datasetVersionField.getDatasetFieldType().isAllowMultiples() || replaceData) {
+
+                    if (replaceData) {
+                        resetDatasetField(datasetVersionField);
+                    }
+
+                    if (updatedField.getDatasetFieldType().isControlledVocabulary()) {
+                        updateControlledVocabularyDatasetField(
+                                updatedField, datasetVersionField, datasetVersionField.getDisplayValue(),
+                                new ArrayList<>(datasetVersionField.getControlledVocabularyValues())
+                        );
+                    } else {
+                        updateRegularDatasetField(updatedField, datasetVersionField, datasetVersion);
+                    }
+                    break;
+                }
+            }
+
+            if (!found) {
+                updatedField.setDatasetVersion(datasetVersion);
+                datasetVersion.getDatasetFields().add(updatedField);
+            }
+        }
+    }
+
+    private void resetDatasetField(DatasetField datasetVersionField) {
+        if (datasetVersionField.getDatasetFieldType().isAllowMultiples()) {
+            datasetVersionField.setDatasetFieldValues(new ArrayList<>());
+            datasetVersionField.setControlledVocabularyValues(new ArrayList<>());
+            datasetVersionField.setDatasetFieldCompoundValues(new ArrayList<>());
+        } else {
+            datasetVersionField.setSingleValue("");
+            datasetVersionField.setSingleControlledVocabularyValue(null);
+        }
+    }
+
+    private static void updateRegularDatasetField(DatasetField updatedField, DatasetField datasetVersionField, DatasetVersion datasetVersion) {
+        if (!updatedField.getDatasetFieldType().isCompound()) {
+            updateSingleDatasetField(updatedField, datasetVersionField);
+        } else {
+            updateCompoundDatasetField(updatedField, datasetVersionField, datasetVersion);
+        }
+    }
+
+    private static void updateSingleDatasetField(DatasetField updatedField, DatasetField datasetVersionField) {
+        if (datasetVersionField.getDatasetFieldType().isAllowMultiples()) {
+            for (DatasetFieldValue datasetFieldValue : updatedField.getDatasetFieldValues()) {
+                if (!datasetVersionField.getDisplayValue().contains(datasetFieldValue.getDisplayValue())) {
+                    datasetFieldValue.setDatasetField(datasetVersionField);
+                    datasetVersionField.getDatasetFieldValues().add(datasetFieldValue);
+                }
+            }
+        } else {
+            datasetVersionField.setSingleValue(updatedField.getValue());
+        }
+    }
+
+    private static void updateCompoundDatasetField(DatasetField updatedField, DatasetField datasetVersionField, DatasetVersion datasetVersion) {
+        for (DatasetFieldCompoundValue datasetFieldCompoundValue : updatedField.getDatasetFieldCompoundValues()) {
+            if (!datasetVersionField.getCompoundDisplayValue().contains(updatedField.getCompoundDisplayValue())) {
+                datasetFieldCompoundValue.setParentDatasetField(datasetVersionField);
+                datasetVersionField.setDatasetVersion(datasetVersion);
+                datasetVersionField.getDatasetFieldCompoundValues().add(datasetFieldCompoundValue);
+            }
+        }
+    }
+
+    private static void updateControlledVocabularyDatasetField(DatasetField updatedField,
+                                                               DatasetField datasetVersionField,
+                                                               String controlledVocabularyDisplayValue,
+                                                               List<ControlledVocabularyValue> priorControlledVocabularyValues) {
+        if (datasetVersionField.getDatasetFieldType().isAllowMultiples()) {
+            for (ControlledVocabularyValue controlledVocabularyValue : updatedField.getControlledVocabularyValues()) {
+                if (!controlledVocabularyDisplayValue.contains(controlledVocabularyValue.getStrValue())) {
+                    priorControlledVocabularyValues.add(controlledVocabularyValue);
+                }
+            }
+            datasetVersionField.setControlledVocabularyValues(priorControlledVocabularyValues);
+        } else {
+            datasetVersionField.setSingleControlledVocabularyValue(updatedField.getSingleControlledVocabularyValue());
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTargetURLCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTargetURLCommand.java
index 1f5989c9e08..8cf2d0109d6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTargetURLCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTargetURLCommand.java
@@ -10,10 +10,12 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+
 import java.sql.Timestamp;
 import java.util.Collections;
 import java.util.Date;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
 
 /**
  *
@@ -36,19 +38,21 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
             throw new PermissionException("Update Target URL can only be called by superusers.",
                     this, Collections.singleton(Permission.EditDataset), target);
         }
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(target.getProtocol(), ctxt);
+        PidProvider pidProvider = PidUtil.getPidProvider(target.getGlobalId().getProviderId());
         try {
-            String doiRetString = idServiceBean.modifyIdentifierTargetURL(target);
+            String doiRetString = pidProvider.modifyIdentifierTargetURL(target);
             if (doiRetString != null && doiRetString.contains(target.getIdentifier())) {
                 target.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
                 ctxt.em().merge(target);
                 ctxt.em().flush();
                 for (DataFile df : target.getFiles()) {
-                    doiRetString = idServiceBean.modifyIdentifierTargetURL(df);
-                    if (doiRetString != null && doiRetString.contains(df.getIdentifier())) {
-                        df.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
-                        ctxt.em().merge(df);
-                        ctxt.em().flush();
+                    if (df.isReleased()) {
+                        doiRetString = pidProvider.modifyIdentifierTargetURL(df);
+                        if (doiRetString != null && doiRetString.contains(df.getIdentifier())) {
+                            df.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
+                            ctxt.em().merge(df);
+                            ctxt.em().flush();
+                        }
                     }
                 }               
             } else {
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommand.java
index ccb276a8b98..b8c70ec6c46 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommand.java
@@ -3,6 +3,7 @@
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
@@ -10,12 +11,14 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.commons.io.IOUtils;
@@ -58,31 +61,33 @@ public DatasetThumbnail execute(CommandContext ctxt) throws CommandException {
 //            throw new CommandException("Just testing what an error would look like in the GUI.", this);
 //        }
         if (userIntent == null) {
-            throw new IllegalCommandException("No changes to save.", this);
+            throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.noChange"), this);
         }
         switch (userIntent) {
 
             case setDatasetFileAsThumbnail:
                 if (dataFileIdSupplied == null) {
-                    throw new CommandException("A file was not selected to be the new dataset thumbnail.", this);
+                    throw new CommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.fileNotSupplied"), this);
                 }
                 DataFile datasetFileThumbnailToSwitchTo = ctxt.files().find(dataFileIdSupplied);
                 if (datasetFileThumbnailToSwitchTo == null) {
-                    throw new CommandException("Could not find file based on id supplied: " + dataFileIdSupplied + ".", this);
+                    throw new CommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.fileNotFound",
+                            List.of(dataFileIdSupplied.toString())), this);
                 }
                 Dataset ds1 = ctxt.datasets().setDatasetFileAsThumbnail(dataset, datasetFileThumbnailToSwitchTo);
-                DatasetThumbnail datasetThumbnail = ds1.getDatasetThumbnail();
+                DatasetThumbnail datasetThumbnail = ds1.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
                 if (datasetThumbnail != null) {
                     DataFile dataFile = datasetThumbnail.getDataFile();
                     if (dataFile != null) {
                         if (dataFile.getId().equals(dataFileIdSupplied)) {
                             return datasetThumbnail;
                         } else {
-                            throw new CommandException("Dataset thumbnail is should be based on file id " + dataFile.getId() + " but instead it is " + dataFileIdSupplied + ".", this);
+                            throw new CommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.basedOnWrongFileId",
+                                    List.of(String.valueOf(dataFile.getId()),String.valueOf(dataFileIdSupplied))), this);
                         }
                     }
                 } else {
-                    throw new CommandException("Dataset thumbnail is unexpectedly absent.", this);
+                    throw new CommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.missing"), this);
                 }
 
             case setNonDatasetFileAsThumbnail:
@@ -90,14 +95,14 @@ public DatasetThumbnail execute(CommandContext ctxt) throws CommandException {
                 try {
                     uploadedFile = FileUtil.inputStreamToFile(inputStream);
                 } catch (IOException ex) {
-                    throw new CommandException("In setNonDatasetFileAsThumbnail caught exception calling inputStreamToFile: " + ex, this);
+                    throw new CommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.inputStreamToFile.exception", List.of(ex.getMessage())), this);
                 }
                 if (uploadedFile == null) {
-                    throw new CommandException("In setNonDatasetFileAsThumbnail uploadedFile was null.", this);
+                    throw new CommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.nonDatasetsFileIsNull"), this);
                 }
                 long uploadLogoSizeLimit = ctxt.systemConfig().getUploadLogoSizeLimit();
                 if (uploadedFile.length() > uploadLogoSizeLimit) {
-                    throw new IllegalCommandException("File is larger than maximum size: " + uploadLogoSizeLimit + ".", this);
+                    throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.fileToLarge", List.of(String.valueOf(uploadLogoSizeLimit))), this);
                 }
                 FileInputStream fileAsStream = null;
                 try {
@@ -106,23 +111,25 @@ public DatasetThumbnail execute(CommandContext ctxt) throws CommandException {
                     Logger.getLogger(UpdateDatasetThumbnailCommand.class.getName()).log(Level.SEVERE, null, ex);
                 }
                 Dataset datasetWithNewThumbnail = ctxt.datasets().setNonDatasetFileAsThumbnail(dataset, fileAsStream);
-		IOUtils.closeQuietly(fileAsStream);
+                IOUtils.closeQuietly(fileAsStream);
                 if (datasetWithNewThumbnail != null) {
-                    return datasetWithNewThumbnail.getDatasetThumbnail();
-                } else {
-                    return null;
+                    DatasetThumbnail thumbnail = datasetWithNewThumbnail.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+                    if (thumbnail != null) {
+                        return thumbnail;
+                    }
                 }
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.nonDatasetFailed"), this);
 
             case removeThumbnail:
-                Dataset ds2 = ctxt.datasets().removeDatasetThumbnail(dataset);
-                DatasetThumbnail datasetThumbnail2 = ds2.getDatasetThumbnail();
+                Dataset ds2 = ctxt.datasets().clearDatasetLevelThumbnail(dataset);
+                DatasetThumbnail datasetThumbnail2 = ds2.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
                 if (datasetThumbnail2 == null) {
                     return null;
                 } else {
-                    throw new CommandException("User wanted to remove the thumbnail it still has one!", this);
+                    throw new CommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.notDeleted"), this);
                 }
             default:
-                throw new IllegalCommandException("Whatever you are trying to do to the dataset thumbnail is not supported.", this);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("datasets.api.thumbnail.actionNotSupported"), this);
         }
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTypeAvailableLicensesCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTypeAvailableLicensesCommand.java
new file mode 100644
index 00000000000..b2dcd6cf33e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTypeAvailableLicensesCommand.java
@@ -0,0 +1,38 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.license.License;
+import java.util.List;
+
+@RequiredPermissions({})
+public class UpdateDatasetTypeAvailableLicensesCommand extends AbstractVoidCommand {
+
+    final DatasetType datasetType;
+    List<License> licenses;
+
+    public UpdateDatasetTypeAvailableLicensesCommand(DataverseRequest dataverseRequest, DatasetType datasetType, List<License> licenses) {
+        super(dataverseRequest, (DvObject) null);
+        this.datasetType = datasetType;
+        this.licenses = licenses;
+    }
+
+    @Override
+    protected void executeImpl(CommandContext ctxt) throws CommandException {
+        if (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser()) {
+            throw new PermissionException("Update dataset type links to metadata block command can only be called by superusers.",
+                    this, null, null);
+        }
+        datasetType.setLicenses(licenses);
+        ctxt.em().merge(datasetType);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTypeLinksToMetadataBlocksCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTypeLinksToMetadataBlocksCommand.java
new file mode 100644
index 00000000000..57b6da3f90c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTypeLinksToMetadataBlocksCommand.java
@@ -0,0 +1,37 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import java.util.List;
+
+@RequiredPermissions({})
+public class UpdateDatasetTypeLinksToMetadataBlocksCommand extends AbstractVoidCommand {
+
+    final DatasetType datasetType;
+    List<MetadataBlock> metadataBlocks;
+
+    public UpdateDatasetTypeLinksToMetadataBlocksCommand(DataverseRequest dataverseRequest, DatasetType datasetType, List<MetadataBlock> metadataBlocks) {
+        super(dataverseRequest, (DvObject) null);
+        this.datasetType = datasetType;
+        this.metadataBlocks = metadataBlocks;
+    }
+
+    @Override
+    protected void executeImpl(CommandContext ctxt) throws CommandException {
+        if (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser()) {
+            throw new PermissionException("Update dataset type links to metadata block command can only be called by superusers.",
+                    this, null, null);
+        }
+        datasetType.setMetadataBlocks(metadataBlocks);
+        ctxt.em().merge(datasetType);
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java
index 0bcf11d371d..209791faafb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java
@@ -1,21 +1,28 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DataFileCategory;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetLock;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DatasetVersionDifference;
+import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
-import java.io.IOException;
+import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
+import edu.harvard.iq.dataverse.util.FileMetadataUtil;
+
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.apache.solr.client.solrj.SolrServerException;
+
+import jakarta.validation.ConstraintViolationException;
 
 /**
  *
@@ -24,11 +31,11 @@
 @RequiredPermissions(Permission.EditDataset)
 public class UpdateDatasetVersionCommand extends AbstractDatasetCommand<Dataset> {
 
-    private static final Logger logger = Logger.getLogger(UpdateDatasetVersionCommand.class.getCanonicalName());
+    static final Logger logger = Logger.getLogger(UpdateDatasetVersionCommand.class.getCanonicalName());
     private final List<FileMetadata> filesToDelete;
     private boolean validateLenient = false;
     private final DatasetVersion clone;
-    private final FileMetadata fmVarMet;
+    final FileMetadata fmVarMet;
     
     public UpdateDatasetVersionCommand(Dataset theDataset, DataverseRequest aRequest) {
         super(aRequest, theDataset);
@@ -58,7 +65,7 @@ public UpdateDatasetVersionCommand(Dataset theDataset, DataverseRequest aRequest
         this.filesToDelete = new ArrayList<>();
         this.clone = null;
         this.fmVarMet = null;
-        for (FileMetadata fmd : theDataset.getEditVersion().getFileMetadatas()) {
+        for (FileMetadata fmd : theDataset.getOrCreateEditVersion().getFileMetadatas()) {
             if (fmd.getDataFile().equals(fileToDelete)) {
                 filesToDelete.add(fmd);
                 break;
@@ -95,9 +102,29 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
         }
         
         Dataset theDataset = getDataset();        
-        ctxt.permissions().checkEditDatasetLock(theDataset, getRequest(), this);
+        ctxt.permissions().checkUpdateDatasetVersionLock(theDataset, getRequest(), this);
         Dataset savedDataset = null;
         
+        DatasetVersion persistedVersion = clone;
+        /*
+         * Unless a pre-change clone has been provided, we need to get it from the db.
+         * There are two cases: We're updating an existing draft, which has an id, and
+         * exists in the database We've created a new draft, with null id, and we need
+         * to get the lastest version in the db
+         * 
+         */
+        if(persistedVersion==null) {
+            Long id = getDataset().getLatestVersion().getId();
+            persistedVersion = ctxt.datasetVersion().find(id!=null ? id : getDataset().getLatestVersionForCopy(true).getId());
+        }
+        
+        //Will throw an IllegalCommandException if a system metadatablock is changed and the appropriate key is not supplied.
+        checkSystemMetadataKeyIfNeeded(getDataset().getOrCreateEditVersion(fmVarMet), persistedVersion);
+
+        getDataset().getOrCreateEditVersion().setLastUpdateTime(getTimestamp());
+
+        registerExternalVocabValuesIfAny(ctxt, getDataset().getOrCreateEditVersion(fmVarMet));
+
         try {
             // Invariant: Dataset has no locks preventing the update
             String lockInfoMessage = "saving current edits";
@@ -108,20 +135,26 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
                 logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", getDataset().getId());
             }
             
-            getDataset().getEditVersion(fmVarMet).setDatasetFields(getDataset().getEditVersion(fmVarMet).initDatasetFields());
-            validateOrDie(getDataset().getEditVersion(fmVarMet), isValidateLenient());
+            getDataset().getOrCreateEditVersion(fmVarMet).setDatasetFields(getDataset().getOrCreateEditVersion(fmVarMet).initDatasetFields());
+            validateOrDie(getDataset().getOrCreateEditVersion(fmVarMet), isValidateLenient());
 
-            final DatasetVersion editVersion = getDataset().getEditVersion(fmVarMet);
-            
-            tidyUpFields(editVersion);
+            final DatasetVersion editVersion = getDataset().getOrCreateEditVersion(fmVarMet);
+
+            DatasetFieldUtil.tidyUpFields(editVersion.getDatasetFields(), true);
 
             // Merge the new version into out JPA context, if needed.
             if (editVersion.getId() == null || editVersion.getId() == 0L) {
                 ctxt.em().persist(editVersion);
             } else {
-                ctxt.em().merge(editVersion);
+            	try {
+            		ctxt.em().merge(editVersion);
+            	} catch (ConstraintViolationException e) {
+            		logger.log(Level.SEVERE,"Exception: ");
+            		e.getConstraintViolations().forEach(err->logger.log(Level.SEVERE,err.toString()));
+            		throw e;
+            	}
             }
-
+            //Set creator and create date for files if needed
             for (DataFile dataFile : theDataset.getFiles()) {
                 if (dataFile.getCreateDate() == null) {
                     dataFile.setCreateDate(getTimestamp());
@@ -156,43 +189,86 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
             }
             // we have to merge to update the database but not flush because
             // we don't want to create two draft versions!
-            // Dataset tempDataset = ctxt.em().merge(theDataset);
-            //SEK 5/30/2019
-            // This interim merge is causing:
-            // java.lang.IllegalArgumentException: Cannot merge an entity that has been removed: edu.harvard.iq.dvn.core.study.FileMetadata
-            // at the merge at line 177
-            //Is this merge needed to add the lock?  - seems to be 'no' so what is it needed for?
-            
-        //    theDataset = ctxt.em().merge(theDataset);
+            // Although not completely tested, it looks like this merge handles the
+            // thumbnail case - if the filemetadata is removed from the context below and
+            // the dataset still references it, that could cause an issue. Merging here
+            // avoids any reference from it being the dataset thumbnail
+            theDataset = ctxt.em().merge(theDataset);
 
+            /*
+             * This code has to handle many cases, and anyone making changes should
+             * carefully check tests and basic methods that update the dataset version. The
+             * differences between the cases stem primarily from differences in whether the
+             * files to add, and their filemetadata, and files to delete, and their
+             * filemetadata have been persisted at this point, which manifests itself as to
+             * whether they have id numbers or not, and apparently, whether or not they
+             * exists in lists, e.g. the getFileMetadatas() list of a datafile.
+             *
+             * To handle this, the code is carefully checking to make sure that deletions
+             * are deleting the right things and not, for example, doing a remove(fmd) when
+             * the fmd.getId() is null, which just removes the first element found.
+             */
             for (FileMetadata fmd : filesToDelete) {
+                logger.fine("Deleting fmd: " + fmd.getId() + " for file: " + fmd.getDataFile().getId());
+                // if file is draft (ie. new to this version), delete it. Otherwise just remove
+                // filemetadata object)
+                // There are a few cases to handle:
+                // * the fmd has an id (has been persisted) and is the one in the current
+                // (draft) version
+                // * the fmd has an id (has been persisted) but it is from a published version
+                // so we need the corresponding one from the draft version (i.e. created during
+                // a getEditVersion call)
+                // * the fmd has no id (hasn't been persisted) so we have to use non-id based
+                // means to identify it and remove it from lists
+
+                if (fmd.getId() != null) {
+                    // If the datasetversion doesn't match, we have the fmd from a published version
+                    // and we need to remove the one for the newly created draft instead, so we find
+                    // it here
+                    logger.fine("Edit ver: " + theDataset.getOrCreateEditVersion().getId());
+                    logger.fine("fmd ver: " + fmd.getDatasetVersion().getId());
+                    if (!theDataset.getOrCreateEditVersion().equals(fmd.getDatasetVersion())) {
+                        fmd = FileMetadataUtil.getFmdForFileInEditVersion(fmd, theDataset.getOrCreateEditVersion());
+                    }
+                }
+                fmd.setDataFile(ctxt.em().merge(fmd.getDataFile()));
+                fmd = ctxt.em().merge(fmd);
+
+                // There are two datafile cases as well - the file has been released, so we're
+                // just removing it from the current draft version or it is only in the draft
+                // version and we completely remove the file.
                 if (!fmd.getDataFile().isReleased()) {
-                    // if file is draft (ie. new to this version, delete; otherwise just remove
-                    // filemetadata object)
+                    // remove the file
                     ctxt.engine().submit(new DeleteDataFileCommand(fmd.getDataFile(), getRequest()));
+                    // and remove the file from the dataset's list
                     theDataset.getFiles().remove(fmd.getDataFile());
-                    theDataset.getEditVersion().getFileMetadatas().remove(fmd);
-                    // added this check to handle issue where you could not deleter a file that
-                    // shared a category with a new file
-                    // the relation ship does not seem to cascade, yet somehow it was trying to
-                    // merge the filemetadata
-                    // todo: clean this up some when we clean the create / update dataset methods
-                    for (DataFileCategory cat : theDataset.getCategories()) {
-                        cat.getFileMetadatas().remove(fmd);
-                    }
+                    ctxt.em().remove(fmd.getDataFile());
+                    ctxt.em().remove(fmd);
                 } else {
-                    FileMetadata mergedFmd = ctxt.em().merge(fmd);
-                    ctxt.em().remove(mergedFmd);
-                    fmd.getDataFile().getFileMetadatas().remove(mergedFmd);
-                    theDataset.getEditVersion().getFileMetadatas().remove(mergedFmd);
+                    ctxt.em().remove(fmd);
+                    // if we aren't removing the file, we need to remove it from the datafile's list
+                    FileMetadataUtil.removeFileMetadataFromList(fmd.getDataFile().getFileMetadatas(), fmd);
+                }
+                // In either case, we've removed from the  context 
+                // And, to fully remove the fmd, we have to remove any other possible
+                // references
+                // From the datasetversion
+                FileMetadataUtil.removeFileMetadataFromList(theDataset.getOrCreateEditVersion().getFileMetadatas(), fmd);
+                // and from the list associated with each category
+                for (DataFileCategory cat : theDataset.getCategories()) {
+                    FileMetadataUtil.removeFileMetadataFromList(cat.getFileMetadatas(), fmd);
                 }
-            }
 
+            }
+            for(FileMetadata fmd: theDataset.getOrCreateEditVersion().getFileMetadatas()) {
+                logger.fine("FMD: " + fmd.getId() + " for file: " + fmd.getDataFile().getId() + "is in final draft version");    
+            }
+            registerFilePidsIfNeeded(theDataset, ctxt, true);
+            
             if (recalculateUNF) {
-                ctxt.ingest().recalculateDatasetVersionUNF(theDataset.getEditVersion());
+                ctxt.ingest().recalculateDatasetVersionUNF(theDataset.getOrCreateEditVersion());
             }
 
-            theDataset.getEditVersion().setLastUpdateTime(getTimestamp());
             theDataset.setModificationTime(getTimestamp());
 
             savedDataset = ctxt.em().merge(theDataset);
@@ -219,21 +295,12 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
     
     @Override
     public boolean onSuccess(CommandContext ctxt, Object r) {
-
-        boolean retVal = true;
-        Dataset dataset = (Dataset) r;
-
-        try {
-            Future<String> indexString = ctxt.index().indexDataset(dataset, true);
-        } catch (IOException | SolrServerException e) {
-            String failureLogText = "Post update dataset indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, dataset);
-            retVal = false;
-        }
-
-        return retVal;
-
+        // Async indexing significantly improves performance when updating datasets with thousands of files
+        // Indexing will be started immediately, unless an index is already busy for the given data
+        // (it will be scheduled then for later indexing of the newest version).
+        // See the documentation of asyncIndexDataset method for more details.
+        ctxt.index().asyncIndexDataset((Dataset) r, true);
+        return true;
     }
-
+    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseAttributeCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseAttributeCommand.java
new file mode 100644
index 00000000000..ab12d8eea26
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseAttributeCommand.java
@@ -0,0 +1,119 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
+import java.util.Collections;
+
+/**
+ * Command to update an existing Dataverse attribute.
+ */
+@RequiredPermissions(Permission.EditDataverse)
+public class UpdateDataverseAttributeCommand extends AbstractCommand<Dataverse> {
+
+    private static final String ATTRIBUTE_ALIAS = "alias";
+    private static final String ATTRIBUTE_NAME = "name";
+    private static final String ATTRIBUTE_DESCRIPTION = "description";
+    private static final String ATTRIBUTE_AFFILIATION = "affiliation";
+    private static final String ATTRIBUTE_FILE_PIDS_ENABLED = "filePIDsEnabled";
+    private static final String ATTRIBUTE_REQUIRE_FILES_TO_PUBLISH_DATASET = "requireFilesToPublishDataset";
+    private final Dataverse dataverse;
+    private final String attributeName;
+    private final Object attributeValue;
+
+    public UpdateDataverseAttributeCommand(DataverseRequest request, Dataverse dataverse, String attributeName, Object attributeValue) {
+        super(request, dataverse);
+        this.dataverse = dataverse;
+        this.attributeName = attributeName;
+        this.attributeValue = attributeValue;
+    }
+
+    @Override
+    public Dataverse execute(CommandContext ctxt) throws CommandException {
+        switch (attributeName) {
+            case ATTRIBUTE_ALIAS:
+            case ATTRIBUTE_NAME:
+            case ATTRIBUTE_DESCRIPTION:
+            case ATTRIBUTE_AFFILIATION:
+                setStringAttribute(attributeName, attributeValue);
+                break;
+            case ATTRIBUTE_REQUIRE_FILES_TO_PUBLISH_DATASET:
+            case ATTRIBUTE_FILE_PIDS_ENABLED:
+                setBooleanAttribute(ctxt, true);
+                break;
+            default:
+                throw new IllegalCommandException("'" + attributeName + "' is not a supported attribute", this);
+        }
+
+        return ctxt.engine().submit(new UpdateDataverseCommand(dataverse, null, null, getRequest(), null));
+    }
+
+    /**
+     * Helper method to set a string attribute.
+     *
+     * @param attributeName  The name of the attribute.
+     * @param attributeValue The value of the attribute (must be a String).
+     * @throws IllegalCommandException if the provided attribute value is not of String type.
+     */
+    private void setStringAttribute(String attributeName, Object attributeValue) throws IllegalCommandException {
+        if (!(attributeValue instanceof String stringValue)) {
+            throw new IllegalCommandException("'" + attributeName + "' requires a string value", this);
+        }
+
+        switch (attributeName) {
+            case ATTRIBUTE_ALIAS:
+                dataverse.setAlias(stringValue);
+                break;
+            case ATTRIBUTE_NAME:
+                dataverse.setName(stringValue);
+                break;
+            case ATTRIBUTE_DESCRIPTION:
+                dataverse.setDescription(stringValue);
+                break;
+            case ATTRIBUTE_AFFILIATION:
+                dataverse.setAffiliation(stringValue);
+                break;
+            default:
+                throw new IllegalCommandException("Unsupported string attribute: " + attributeName, this);
+        }
+    }
+
+    /**
+     * Helper method to handle boolean attributes.
+     *
+     * @param ctxt The command context.
+     * @param adminOnly True if this attribute can only be modified by an Administrator
+     * @throws PermissionException if the user doesn't have permission to modify this attribute.
+     */
+    private void setBooleanAttribute(CommandContext ctxt, boolean adminOnly) throws CommandException {
+        if (adminOnly && !getRequest().getUser().isSuperuser()) {
+            throw new PermissionException("You must be a superuser to change this setting",
+                    this, Collections.singleton(Permission.EditDataset), dataverse);
+        }
+
+        if (!(attributeValue instanceof Boolean)) {
+            throw new IllegalCommandException("'" + attributeName + "' requires a boolean value", this);
+        }
+        switch (attributeName) {
+            case ATTRIBUTE_FILE_PIDS_ENABLED:
+                if (!ctxt.settings().isTrueForKey(SettingsServiceBean.Key.AllowEnablingFilePIDsPerCollection, false)) {
+                    throw new PermissionException("Changing File PID policy per collection is not enabled on this server",
+                            this, Collections.singleton(Permission.EditDataset), dataverse);
+                }
+                dataverse.setFilePIDsEnabled((Boolean) attributeValue);
+            case ATTRIBUTE_REQUIRE_FILES_TO_PUBLISH_DATASET:
+                dataverse.setRequireFilesToPublishDataset((Boolean) attributeValue);
+                break;
+            default:
+                throw new IllegalCommandException("Unsupported boolean attribute: " + attributeName, this);
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseCommand.java
index 0713cecec6b..2a288e22dac 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseCommand.java
@@ -1,109 +1,155 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.Dataverse.DataverseType;
-import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevel;
+import edu.harvard.iq.dataverse.api.dto.DataverseDTO;
 import edu.harvard.iq.dataverse.authorization.Permission;
-import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
-import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+
+import static edu.harvard.iq.dataverse.dataverse.DataverseUtil.validateDataverseMetadataExternally;
+
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.search.IndexResponse;
-import java.io.IOException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Future;
-import javax.persistence.TypedQuery;
-import org.apache.solr.client.solrj.SolrServerException;
 
 /**
  * Update an existing dataverse.
+ *
  * @author michael
  */
-@RequiredPermissions( Permission.EditDataverse )
-public class UpdateDataverseCommand extends AbstractCommand<Dataverse> {
-	
-	private final Dataverse editedDv;
-	private final List<DatasetFieldType> facetList;
-        private final List<Dataverse> featuredDataverseList;
-        private final List<DataverseFieldTypeInputLevel> inputLevelList;
-
-	public UpdateDataverseCommand(Dataverse editedDv, List<DatasetFieldType> facetList, List<Dataverse> featuredDataverseList, 
-                    DataverseRequest aRequest,  List<DataverseFieldTypeInputLevel> inputLevelList ) {
-            super(aRequest, editedDv);
-            this.editedDv = editedDv;
-            // add update template uses this command but does not
-            // update facet list or featured dataverses
-            if (facetList != null){
-               this.facetList = new ArrayList<>(facetList); 
-            } else {
-               this.facetList = null;
-            }
-            if (featuredDataverseList != null){
-                this.featuredDataverseList = new ArrayList<>(featuredDataverseList);
-            } else {
-                this.featuredDataverseList = null;
-            }
-            if (inputLevelList != null){
-               this.inputLevelList = new ArrayList<>(inputLevelList); 
-            } else {
-               this.inputLevelList = null;
-            }
-	}
-	
-	@Override
-	public Dataverse execute(CommandContext ctxt) throws CommandException {
-            DataverseType oldDvType = ctxt.dataverses().find(editedDv.getId()).getDataverseType();
-            String oldDvAlias = ctxt.dataverses().find(editedDv.getId()).getAlias();
-            String oldDvName = ctxt.dataverses().find(editedDv.getId()).getName();
-            Dataverse result = ctxt.dataverses().save(editedDv);
-            
-            if ( facetList != null ) {
-                ctxt.facets().deleteFacetsFor(result);
-                int i=0;
-                for ( DatasetFieldType df : facetList ) {
-                    ctxt.facets().create(i++, df.getId(), result.getId());
+@RequiredPermissions(Permission.EditDataverse)
+public class UpdateDataverseCommand extends AbstractWriteDataverseCommand {
+    private final List<Dataverse> featuredDataverseList;
+    private final DataverseDTO updatedDataverseDTO;
+
+    private boolean datasetsReindexRequired = false;
+
+    public UpdateDataverseCommand(Dataverse dataverse,
+                                  List<DatasetFieldType> facets,
+                                  List<Dataverse> featuredDataverses,
+                                  DataverseRequest request,
+                                  List<DataverseFieldTypeInputLevel> inputLevels) {
+        this(dataverse, facets, featuredDataverses, request, inputLevels, null, null);
+    }
+
+    public UpdateDataverseCommand(Dataverse dataverse,
+                                  List<DatasetFieldType> facets,
+                                  List<Dataverse> featuredDataverses,
+                                  DataverseRequest request,
+                                  List<DataverseFieldTypeInputLevel> inputLevels,
+                                  List<MetadataBlock> metadataBlocks,
+                                  DataverseDTO updatedDataverseDTO) {
+        super(dataverse, dataverse, request, facets, inputLevels, metadataBlocks);
+        if (featuredDataverses != null) {
+            this.featuredDataverseList = new ArrayList<>(featuredDataverses);
+        } else {
+            this.featuredDataverseList = null;
+        }
+        this.updatedDataverseDTO = updatedDataverseDTO;
+    }
+
+    @Override
+    protected Dataverse innerExecute(CommandContext ctxt) throws IllegalCommandException {
+        // Perform any optional validation steps, if defined:
+        if (ctxt.systemConfig().isExternalDataverseValidationEnabled()) {
+            // For admins, an override of the external validation step may be enabled:
+            if (!(getUser().isSuperuser() && ctxt.systemConfig().isExternalValidationAdminOverrideEnabled())) {
+                String executable = ctxt.systemConfig().getDataverseValidationExecutable();
+                boolean result = validateDataverseMetadataExternally(dataverse, executable, getRequest());
+
+                if (!result) {
+                    String rejectionMessage = ctxt.systemConfig().getDataverseUpdateValidationFailureMsg();
+                    throw new IllegalCommandException(rejectionMessage, this);
                 }
             }
-            if ( featuredDataverseList != null ) {
-                ctxt.featuredDataverses().deleteFeaturedDataversesFor(result);
-                int i=0;
-                for ( Object obj : featuredDataverseList ) {
-                    Dataverse dv = (Dataverse) obj;
-                    ctxt.featuredDataverses().create(i++, dv.getId(), result.getId());
-                }
+        }
+        if (!getUser().isSuperuser() && updatedDataverseDTO != null) {
+            // default if not set
+            if (updatedDataverseDTO.getDatasetFileCountLimit() == null) {
+                updatedDataverseDTO.setDatasetFileCountLimit(dataverse.getDatasetFileCountLimit());
+            } else if (updatedDataverseDTO.getDatasetFileCountLimit() != dataverse.getDatasetFileCountLimit()) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("file.dataset.error.set.file.count.limit"), this);
             }
-            if ( inputLevelList != null ) {
-                ctxt.fieldTypeInputLevels().deleteFacetsFor(result);
-                for ( DataverseFieldTypeInputLevel obj : inputLevelList ) {               
-                    ctxt.fieldTypeInputLevels().create(obj);
-                }
+        }
+
+        Dataverse oldDv = ctxt.dataverses().find(dataverse.getId());
+
+        DataverseType oldDvType = oldDv.getDataverseType();
+        String oldDvAlias = oldDv.getAlias();
+        String oldDvName = oldDv.getName();
+
+        // We don't want to reindex the children datasets unnecessarily:
+        // When these values are changed we need to reindex all children datasets
+        // This check is not recursive as all the values just report the immediate parent
+        if (!oldDvType.equals(dataverse.getDataverseType())
+                || !oldDvName.equals(dataverse.getName())
+                || !oldDvAlias.equals(dataverse.getAlias())) {
+            datasetsReindexRequired = true;
+        }
+
+        if (featuredDataverseList != null) {
+            ctxt.featuredDataverses().deleteFeaturedDataversesFor(dataverse);
+            int i = 0;
+            for (Object obj : featuredDataverseList) {
+                Dataverse dv = (Dataverse) obj;
+                ctxt.featuredDataverses().create(i++, dv.getId(), dataverse.getId());
+            }
+        }
+
+        if (updatedDataverseDTO != null) {
+            updateDataverseFromDTO(dataverse, updatedDataverseDTO);
+        }
+
+        return dataverse;
+    }
+
+    private void updateDataverseFromDTO(Dataverse dataverse, DataverseDTO dto) {
+        if (dto.getAlias() != null) {
+            dataverse.setAlias(dto.getAlias());
+        }
+        if (dto.getName() != null) {
+            dataverse.setName(dto.getName());
+        }
+        if (dto.getDescription() != null) {
+            dataverse.setDescription(dto.getDescription());
+        }
+        if (dto.getAffiliation() != null) {
+            dataverse.setAffiliation(dto.getAffiliation());
+        }
+        if (dto.getDataverseContacts() != null) {
+            dataverse.setDataverseContacts(dto.getDataverseContacts());
+            for (DataverseContact dc : dataverse.getDataverseContacts()) {
+                dc.setDataverse(dataverse);
             }
-            
-            
-            return result;
-	}
-        
+        }
+        if (dto.getDataverseType() != null) {
+            dataverse.setDataverseType(dto.getDataverseType());
+        }
+        if (dto.getDatasetFileCountLimit() != null) {
+            dataverse.setDatasetFileCountLimit(dto.getDatasetFileCountLimit());
+        }
+    }
+
     @Override
     public boolean onSuccess(CommandContext ctxt, Object r) {
+
+        // first kick of async index of datasets
+        // TODO: is this actually needed? Is there a better way to handle
+        // It appears that we at some point lost some extra logic here, where
+        // we only reindex the underlying datasets if one or more of the specific set
+        // of fields have been changed (since these values are included in the
+        // indexed solr documents for datasets). So I'm putting that back. -L.A.
         Dataverse result = (Dataverse) r;
 
-        List<Dataset> datasets = ctxt.datasets().findByOwnerId(result.getId());
-        try {
-            Future<String> indResponse = ctxt.index().indexDataverse(result);
+        if (datasetsReindexRequired) {
+            List<Dataset> datasets = ctxt.datasets().findByOwnerId(result.getId());
             ctxt.index().asyncIndexDatasetList(datasets, true);
-        } catch (IOException | SolrServerException e) {
-            String failureLogText = "Indexing failed for Updated Dataverse. You can kickoff a re-index of this datavese with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + result.getId().toString();
-            failureLogText += "\r\n" + e.getLocalizedMessage();
-            LoggingUtil.writeOnSuccessFailureLog(this, failureLogText, result);
-            return false;
         }
-        return true;
-    }
 
+        return ctxt.dataverses().index((Dataverse) r);
+    }
 }
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseFeaturedItemCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseFeaturedItemCommand.java
new file mode 100644
index 00000000000..1d2c319698d
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseFeaturedItemCommand.java
@@ -0,0 +1,42 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.api.dto.UpdatedDataverseFeaturedItemDTO;
+import edu.harvard.iq.dataverse.engine.command.*;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+/**
+ * Updates a particular featured item {@link DataverseFeaturedItem} of a {@link Dataverse}.
+ */
+public class UpdateDataverseFeaturedItemCommand extends AbstractWriteDataverseFeaturedItemCommand {
+
+    private final DataverseFeaturedItem dataverseFeaturedItem;
+    private final UpdatedDataverseFeaturedItemDTO updatedDataverseFeaturedItemDTO;
+
+    public UpdateDataverseFeaturedItemCommand(DataverseRequest request,
+                                              DataverseFeaturedItem dataverseFeaturedItem,
+                                              UpdatedDataverseFeaturedItemDTO updatedDataverseFeaturedItemDTO) {
+        super(request, dataverseFeaturedItem.getDataverse());
+        this.dataverseFeaturedItem = dataverseFeaturedItem;
+        this.updatedDataverseFeaturedItemDTO = updatedDataverseFeaturedItemDTO;
+    }
+
+    @Override
+    public DataverseFeaturedItem execute(CommandContext ctxt) throws CommandException {
+        validateAndSetDvObject(dataverseFeaturedItem, updatedDataverseFeaturedItemDTO.getType(), updatedDataverseFeaturedItemDTO.getDvObject());
+        validateAndSetContent(dataverseFeaturedItem, updatedDataverseFeaturedItemDTO.getContent());
+        dataverseFeaturedItem.setDisplayOrder(updatedDataverseFeaturedItemDTO.getDisplayOrder());
+
+        if (!updatedDataverseFeaturedItemDTO.isKeepFile()) {
+            setFileImageIfAvailableOrNull(
+                    dataverseFeaturedItem,
+                    updatedDataverseFeaturedItemDTO.getImageFileName(),
+                    updatedDataverseFeaturedItemDTO.getImageFileInputStream(),
+                    ctxt
+            );
+        }
+
+        return ctxt.dataverseFeaturedItems().save(dataverseFeaturedItem);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseFeaturedItemsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseFeaturedItemsCommand.java
new file mode 100644
index 00000000000..7d55d4a879c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseFeaturedItemsCommand.java
@@ -0,0 +1,78 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.api.dto.NewDataverseFeaturedItemDTO;
+import edu.harvard.iq.dataverse.api.dto.UpdatedDataverseFeaturedItemDTO;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.*;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Updates all featured items ({@link DataverseFeaturedItem}) for a specified {@link Dataverse}.
+ * <p>
+ * This command allows for the creation of multiple new featured items, updates to existing items with new parameters,
+ * or the deletion of existing items, all in a single command.
+ * </p>
+ **/
+@RequiredPermissions({Permission.EditDataverse})
+public class UpdateDataverseFeaturedItemsCommand extends AbstractCommand<List<DataverseFeaturedItem>> {
+
+    private final Dataverse dataverse;
+    private final List<NewDataverseFeaturedItemDTO> newDataverseFeaturedItemDTOs;
+    private final Map<DataverseFeaturedItem, UpdatedDataverseFeaturedItemDTO> dataverseFeaturedItemsToUpdate;
+
+    public UpdateDataverseFeaturedItemsCommand(DataverseRequest request, Dataverse dataverse, List<NewDataverseFeaturedItemDTO> newDataverseFeaturedItemDTOs, Map<DataverseFeaturedItem, UpdatedDataverseFeaturedItemDTO> dataverseFeaturedItemsToUpdate) {
+        super(request, dataverse);
+        this.dataverse = dataverse;
+        this.newDataverseFeaturedItemDTOs = newDataverseFeaturedItemDTOs;
+        this.dataverseFeaturedItemsToUpdate = dataverseFeaturedItemsToUpdate;
+    }
+
+    @Override
+    public List<DataverseFeaturedItem> execute(CommandContext ctxt) throws CommandException {
+        List<DataverseFeaturedItem> dataverseFeaturedItems = updateOrDeleteExistingFeaturedItems(ctxt);
+        dataverseFeaturedItems.addAll(createNewFeaturedItems(ctxt));
+        dataverseFeaturedItems.sort(Comparator.comparingInt(DataverseFeaturedItem::getDisplayOrder));
+        return dataverseFeaturedItems;
+    }
+
+    private List<DataverseFeaturedItem> updateOrDeleteExistingFeaturedItems(CommandContext ctxt) throws CommandException {
+        List<DataverseFeaturedItem> updatedFeaturedItems = new ArrayList<>();
+        List<DataverseFeaturedItem> featuredItemsToDelete = ctxt.dataverseFeaturedItems().findAllByDataverseOrdered(dataverse);
+
+        for (Map.Entry<DataverseFeaturedItem, UpdatedDataverseFeaturedItemDTO> entry : dataverseFeaturedItemsToUpdate.entrySet()) {
+            DataverseFeaturedItem featuredItem = entry.getKey();
+            UpdatedDataverseFeaturedItemDTO updatedDTO = entry.getValue();
+
+            featuredItemsToDelete.stream()
+                    .filter(item -> item.getId().equals(featuredItem.getId()))
+                    .findFirst().ifPresent(featuredItemsToDelete::remove);
+
+            DataverseFeaturedItem updatedFeatureItem = ctxt.engine().submit(new UpdateDataverseFeaturedItemCommand(getRequest(), featuredItem, updatedDTO));
+            updatedFeaturedItems.add(updatedFeatureItem);
+        }
+
+        for (DataverseFeaturedItem featuredItem : featuredItemsToDelete) {
+            ctxt.engine().submit(new DeleteDataverseFeaturedItemCommand(getRequest(), featuredItem));
+        }
+
+        return updatedFeaturedItems;
+    }
+
+    private List<DataverseFeaturedItem> createNewFeaturedItems(CommandContext ctxt) throws CommandException {
+        List<DataverseFeaturedItem> createdFeaturedItems = new ArrayList<>();
+
+        for (NewDataverseFeaturedItemDTO dto : newDataverseFeaturedItemDTOs) {
+            DataverseFeaturedItem createdFeatureItem = ctxt.engine().submit(new CreateDataverseFeaturedItemCommand(getRequest(), dataverse, dto));
+            createdFeaturedItems.add(createdFeatureItem);
+        }
+
+        return createdFeaturedItems;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseInputLevelsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseInputLevelsCommand.java
new file mode 100644
index 00000000000..cc2c525e8f6
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseInputLevelsCommand.java
@@ -0,0 +1,46 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevel;
+import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RequiredPermissions(Permission.EditDataverse)
+public class UpdateDataverseInputLevelsCommand extends AbstractCommand<Dataverse> {
+    private final Dataverse dataverse;
+    private final List<DataverseFieldTypeInputLevel> inputLevelList;
+
+    public UpdateDataverseInputLevelsCommand(Dataverse dataverse, DataverseRequest request, List<DataverseFieldTypeInputLevel> inputLevelList) {
+        super(request, dataverse);
+        this.dataverse = dataverse;
+        this.inputLevelList = new ArrayList<>(inputLevelList);
+    }
+
+    @Override
+    public Dataverse execute(CommandContext ctxt) throws CommandException {
+        if (inputLevelList == null || inputLevelList.isEmpty()) {
+            throw new CommandException("Error while updating dataverse input levels: Input level list cannot be null or empty", this);
+        }
+        
+        if (!dataverse.isMetadataBlockRoot()) {
+            Dataverse root = ctxt.dataverses().findRootDataverse();
+            if (root != null) {
+                List<MetadataBlock> inheritedBlocks = new ArrayList<>(root.getMetadataBlocks());
+                dataverse.setMetadataBlocks(inheritedBlocks);
+                dataverse.setMetadataBlockRoot(true);
+            }
+        }
+        
+        dataverse.addInputLevelsMetadataBlocksIfNotPresent(inputLevelList);
+        
+        return ctxt.engine().submit(new UpdateDataverseCommand(dataverse, null, null, getRequest(), inputLevelList));
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseThemeCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseThemeCommand.java
index add7b825659..b770b9febef 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseThemeCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseThemeCommand.java
@@ -7,12 +7,6 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 
 /**
  * Update an existing dataverse.
@@ -21,20 +15,14 @@
 @RequiredPermissions( Permission.EditDataverse )
 public class UpdateDataverseThemeCommand extends AbstractCommand<Dataverse> {
     private final Dataverse editedDv;
-    private final File uploadedFile;
-    private final Path logoPath = Paths.get("../docroot/logos");
-    private String locate;
 
-    public UpdateDataverseThemeCommand(Dataverse editedDv, File uploadedFile, DataverseRequest aRequest, String location) {
+    public UpdateDataverseThemeCommand(Dataverse editedDv, DataverseRequest aRequest) {
         super(aRequest, editedDv);
-        this.uploadedFile = uploadedFile;
         this.editedDv = editedDv;
-        this.locate = location;
-
     }
+
     /**
-     * Update Theme and Widget related data for this dataverse, and 
-     * do file management needed for theme images.
+     * Update Theme and Widget related data for this dataverse.
      * 
      * @param ctxt
      * @return
@@ -42,59 +30,6 @@ public UpdateDataverseThemeCommand(Dataverse editedDv, File uploadedFile, Datave
      */
     @Override
     public Dataverse execute(CommandContext ctxt) throws CommandException {
-        // Get current dataverse, so we can delete current logo file if necessary
-        Dataverse currentDv = ctxt.dataverses().find(editedDv.getId());
-        File logoFileDir = new File(logoPath.toFile(), editedDv.getId().toString());
-        File currentFile=null;
-
-        if (locate.equals("FOOTER")){
-            if (currentDv.getDataverseTheme()!=null && currentDv.getDataverseTheme().getLogoFooter()!=null) {
-                currentFile = new File(logoFileDir, currentDv.getDataverseTheme().getLogoFooter());
-            }
-            try {
-                // If edited logo field is empty, and a logoFile currently exists, delete it
-                if (editedDv.getDataverseTheme()==null || editedDv.getDataverseTheme().getLogoFooter()==null ) {
-                    if (currentFile!=null) {
-                        currentFile.delete();
-                    }
-                } // If edited logo file isn't empty,and uploaded File exists, delete currentFile and copy uploaded file from temp dir to logos dir
-                else if (uploadedFile!=null) {
-                    File newFile = new File(logoFileDir,editedDv.getDataverseTheme().getLogoFooter());
-                    if (currentFile!=null) {
-                        currentFile.delete();
-                    }
-                    logoFileDir.mkdirs();
-                    Files.copy(uploadedFile.toPath(), newFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-                }
-
-            } catch (IOException e) {
-                throw new CommandException("Error saving logo footer file", e,this); // improve error handling
-
-            }
-        } else if (locate.equals("HEADER")){
-            if (currentDv.getDataverseTheme()!=null && currentDv.getDataverseTheme().getLogo()!=null) {
-                currentFile = new File(logoFileDir, currentDv.getDataverseTheme().getLogo());
-            }
-            try {
-                // If edited logo field is empty, and a logoFile currently exists, delete it
-                if (editedDv.getDataverseTheme()==null || editedDv.getDataverseTheme().getLogo()==null ) {
-                    if (currentFile!=null) {
-                        currentFile.delete();
-                    }
-                } // If edited logo file isn't empty,and uploaded File exists, delete currentFile and copy uploaded file from temp dir to logos dir
-                else if (uploadedFile!=null) {
-                    File newFile = new File(logoFileDir,editedDv.getDataverseTheme().getLogo());
-                    if (currentFile!=null) {
-                        currentFile.delete();
-                    }
-                    logoFileDir.mkdirs();
-                    Files.copy(uploadedFile.toPath(), newFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-                }
-            } catch (IOException e) {
-                throw new CommandException("Error saving logo file", e,this); // improve error handling
-
-            }
-        }
         // save updated dataverse to db
         return ctxt.dataverses().save(editedDv);
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java
index 7e37241563c..14d17dcd900 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java
@@ -2,7 +2,6 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.GlobalIdServiceBean;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
@@ -11,6 +10,8 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.sql.Timestamp;
@@ -46,31 +47,32 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
             //the single dataset update api checks for drafts before calling the command
             return;
         }
-        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(target.getProtocol(), ctxt);
+        PidProvider pidProvider = PidUtil.getPidProvider(target.getGlobalId().getProviderId());
+        
         try {
-            Boolean doiRetString = idServiceBean.publicizeIdentifier(target);
+            Boolean doiRetString = pidProvider.updateIdentifier(target);
             if (doiRetString) {
                 target.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
                 ctxt.em().merge(target);
                 ctxt.em().flush();
                 // When updating, we want to traverse through files even if the dataset itself
                 // didn't need updating.
-                String currentGlobalIdProtocol = ctxt.settings().getValueForKey(SettingsServiceBean.Key.Protocol, "");
-                String dataFilePIDFormat = ctxt.settings().getValueForKey(SettingsServiceBean.Key.DataFilePIDFormat, "DEPENDENT");
-                boolean isFilePIDsEnabled = ctxt.systemConfig().isFilePIDsEnabled();
+                boolean isFilePIDsEnabled = ctxt.systemConfig().isFilePIDsEnabledForCollection(target.getOwner());
                 // We will skip trying to update the global identifiers for datafiles if they
                 // aren't being used.
                 // If they are, we need to assure that there's an existing PID or, as when
-                // creating PIDs, that the protocol matches that of the dataset DOI if
-                // we're going to create a DEPENDENT file PID.
-                String protocol = target.getProtocol();
+                // creating PIDs, that it's possible.
+                
+                boolean canCreatePidsForFiles = 
+                                isFilePIDsEnabled && ctxt.dvObjects().getEffectivePidGenerator(target).canCreatePidsLike(target.getGlobalId());
+                
                 for (DataFile df : target.getFiles()) {
                     if (isFilePIDsEnabled && // using file PIDs and
                             (!(df.getIdentifier() == null || df.getIdentifier().isEmpty()) || // identifier exists, or
-                                    currentGlobalIdProtocol.equals(protocol) || // right protocol to create dependent DOIs, or
-                                    dataFilePIDFormat.equals("INDEPENDENT"))// or independent. TODO(pm) - check authority too
+                                canCreatePidsForFiles) && // we can create PIDs for files and
+                            df.isReleased() // the file is not a draft
                     ) {
-                        doiRetString = idServiceBean.publicizeIdentifier(df);
+                        doiRetString = pidProvider.updateIdentifier(df);
                         if (doiRetString) {
                             df.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
                             ctxt.em().merge(df);
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateHarvestedDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateHarvestedDatasetCommand.java
new file mode 100644
index 00000000000..09563686299
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateHarvestedDatasetCommand.java
@@ -0,0 +1,202 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.FileMetadata;
+import static edu.harvard.iq.dataverse.search.IndexServiceBean.solrDocIdentifierFile;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.solr.client.solrj.SolrServerException;
+
+/**
+ *
+ * @author landreev
+ * 
+ * Much simplified version of UpdateDatasetVersionCommand, 
+ * but with some extra twists. The goal is to avoid creating new Dataset and 
+ * DataFile objects, and to instead preserve the database ids of the re-harvested 
+ * datasets and files, whenever possible. This in turn allows us to avoid deleting
+ * and rebuilding from scratch the Solr documents for these objects. 
+ */
+@RequiredPermissions(Permission.EditDataset)
+public class UpdateHarvestedDatasetCommand extends AbstractDatasetCommand<Dataset> {
+
+    private static final Logger logger = Logger.getLogger(UpdateHarvestedDatasetCommand.class.getCanonicalName());
+    private final DatasetVersion newHarvestedVersion;
+    final private boolean validateLenient = true;
+
+    public UpdateHarvestedDatasetCommand(Dataset theDataset, DatasetVersion newHarvestedVersion, DataverseRequest aRequest) {
+        super(aRequest, theDataset);
+        this.newHarvestedVersion = newHarvestedVersion;
+    }
+
+    public boolean isValidateLenient() {
+        return validateLenient;
+    }
+
+    @Override
+    public Dataset execute(CommandContext ctxt) throws CommandException {
+        
+        Dataset existingDataset = getDataset();
+
+        if (existingDataset == null
+                || existingDataset.getId() == null
+                || !existingDataset.isHarvested()
+                || existingDataset.getVersions().size() != 1) {
+            throw new IllegalCommandException("The command can only be called on an existing harvested dataset with only 1 version", this);
+        }
+        DatasetVersion existingVersion = existingDataset.getVersions().get(0);
+
+        if (newHarvestedVersion == null || newHarvestedVersion.getId() != null) {
+            throw new IllegalCommandException("The command can only be called with a newly-harvested, not yet saved DatasetVersion supplied", this);
+        }
+        
+        newHarvestedVersion.setCreateTime(getTimestamp());
+        newHarvestedVersion.setLastUpdateTime(getTimestamp());
+
+        
+        Map<String, Integer> existingFilesIndex = new HashMap<>();
+
+        /* 
+        Create a map of the files that are currently part of this existing
+        harvested dataset. We assume that a harvested file can be uniquely 
+        defined by its storageidentifier. Which, in the case of a datafile
+        harvested from another Dataverse should be its data access api url.
+        */
+        for (int i = 0; i < existingDataset.getFiles().size(); i++) {
+            String storageIdentifier = existingDataset.getFiles().get(i).getStorageIdentifier();
+            if (!StringUtil.isEmpty(storageIdentifier)) {
+                existingFilesIndex.put(storageIdentifier, i);
+            }
+        }
+        
+        /*
+        Go through the files in the newly-harvested version and check if any of 
+        them are (potentially new/updated) versions of files that we already
+        have, harvested previously from the same archive location. 
+        */
+        for (FileMetadata newFileMetadata : newHarvestedVersion.getFileMetadatas()) {
+            // is it safe to assume that each new FileMetadata will be 
+            // pointing to a non-null DataFile here?
+            String storageIdentifier = newFileMetadata.getDataFile().getStorageIdentifier();
+            if (!StringUtil.isEmpty(storageIdentifier) && existingFilesIndex.containsKey(storageIdentifier)) {
+                newFileMetadata.getDataFile().setFileMetadatas(new ArrayList<>());
+
+                int fileIndex = existingFilesIndex.get(storageIdentifier);
+                
+                // Make sure to update the existing DataFiles that we are going 
+                // to keep in case their newly-harvested versions have different 
+                // checksums, mime types etc. These values are supposed to be 
+                // immutable, normally - but who knows, errors happen, the source 
+                // Dataverse may have had to fix these in their database to 
+                // correct a data integrity issue (for ex.):
+                existingDataset.getFiles().get(fileIndex).setContentType(newFileMetadata.getDataFile().getContentType());
+                existingDataset.getFiles().get(fileIndex).setFilesize(newFileMetadata.getDataFile().getFilesize());
+                existingDataset.getFiles().get(fileIndex).setChecksumType(newFileMetadata.getDataFile().getChecksumType());
+                existingDataset.getFiles().get(fileIndex).setChecksumValue(newFileMetadata.getDataFile().getChecksumValue());
+                
+                // Point the newly-harvested filemetadata to the existing datafile:
+                newFileMetadata.setDataFile(existingDataset.getFiles().get(fileIndex));
+                
+                // Make sure this new FileMetadata is the only one attached to this existing file:
+                existingDataset.getFiles().get(fileIndex).setFileMetadatas(new ArrayList<>(1));
+                existingDataset.getFiles().get(fileIndex).getFileMetadatas().add(newFileMetadata);
+                // (we don't want any cascade relationships left between this existing
+                // dataset and this version, since we are going to attemp to delete it).
+                
+                // Drop the file from the index map:
+                existingFilesIndex.remove(storageIdentifier);
+            }
+        }
+        
+        // @todo? check if there's anything special that needs to be done for things
+        // like file categories
+                
+        List<String> solrIdsOfDocumentsToDelete = new ArrayList<>();
+
+        // Go through the existing files and delete the ones that are 
+        // no longer present in the version that we have just harvesed:
+        for (FileMetadata oldFileMetadata : existingDataset.getVersions().get(0).getFileMetadatas()) {
+            DataFile oldDataFile = oldFileMetadata.getDataFile();
+            String storageIdentifier = oldDataFile.getStorageIdentifier();
+            // Is it still in the existing files map? - that means it is no longer
+            // present in the newly-harvested version
+            if (StringUtil.isEmpty(storageIdentifier) || existingFilesIndex.containsKey(storageIdentifier)) {
+                solrIdsOfDocumentsToDelete.add(solrDocIdentifierFile + oldDataFile.getId());
+                existingDataset.getFiles().remove(oldDataFile);
+                // Files from harvested datasets are removed unceremoniously, 
+                // directly in the database. No need to bother calling the 
+                // DeleteFileCommand on them. We'll just need to remember to purge
+                // them from Solr as well (right below)
+                ctxt.em().remove(ctxt.em().merge(oldDataFile));
+                // (no need to explicitly remove the oldFileMetadata; it will be 
+                // removed with the entire old version is deleted)
+            }
+        }
+                
+        // purge all the SOLR documents associated with the files
+        // we have just deleted:
+        if (!solrIdsOfDocumentsToDelete.isEmpty()) {
+            ctxt.index().deleteHarvestedDocuments(solrIdsOfDocumentsToDelete);
+        }
+
+        // ... And now delete the existing version itself: 
+        existingDataset.setVersions(new ArrayList<>());
+        existingVersion.setDataset(null);
+        
+        existingVersion = ctxt.em().merge(existingVersion);
+        ctxt.em().remove(existingVersion);
+
+        // Now attach the newly-harvested version to the dataset:
+        existingDataset.getVersions().add(newHarvestedVersion);
+        newHarvestedVersion.setDataset(existingDataset);
+                
+        // ... There's one more thing to do - go through the new files, 
+        // that are not in the database yet, and make sure they are 
+        // attached to this existing dataset, instead of the dummy temp 
+        // dataset into which they were originally imported:
+        for (FileMetadata newFileMetadata : newHarvestedVersion.getFileMetadatas()) {
+            if (newFileMetadata.getDataFile().getId() == null) {
+                existingDataset.getFiles().add(newFileMetadata.getDataFile());
+                newFileMetadata.getDataFile().setOwner(existingDataset);
+            }
+        }
+                
+        ctxt.em().persist(newHarvestedVersion);
+                
+        Dataset savedDataset = ctxt.em().merge(existingDataset);
+        ctxt.em().flush();
+                
+        return savedDataset;
+    }
+
+    @Override
+    public boolean onSuccess(CommandContext ctxt, Object r) {
+        boolean retVal = true;
+        Dataset d = (Dataset) r;
+        
+        try {
+            // Note that we index harvested datasets synchronously:
+            ctxt.index().indexDataset(d, true);
+        } catch (SolrServerException|IOException solrServerEx) {
+            logger.log(Level.WARNING, "Exception while trying to index the updated Harvested dataset " + d.getGlobalId().asString(), solrServerEx.getMessage());
+            retVal = false;
+        }
+        
+        return retVal;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetRootCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetRootCommand.java
new file mode 100644
index 00000000000..2e5b6b59ebe
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetRootCommand.java
@@ -0,0 +1,65 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseMetadataBlockFacet;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * @author adaybujeda
+ */
+@RequiredPermissions( Permission.EditDataverse )
+public class UpdateMetadataBlockFacetRootCommand extends AbstractCommand<Dataverse> {
+
+    private final Dataverse editedDv;
+    private final boolean metadataBlockFacetRoot;
+
+    public UpdateMetadataBlockFacetRootCommand(DataverseRequest aRequest, Dataverse editedDv, boolean metadataBlockFacetRoot) {
+        super(aRequest, editedDv);
+        this.editedDv = editedDv;
+        this.metadataBlockFacetRoot = metadataBlockFacetRoot;
+    }
+
+    @Override
+    public Dataverse execute(CommandContext ctxt) throws CommandException {
+        if(editedDv.isMetadataBlockFacetRoot() != metadataBlockFacetRoot) {
+            // Update metadata block facets when root changes value
+            // if you set root to be false (i.e. inherit), it should clear the blocks.
+            // if you set to true (i.e. use your own), it should make a copy of what is in the parent
+            List<DataverseMetadataBlockFacet> newBlockFacets = Collections.emptyList();
+            if (metadataBlockFacetRoot) {
+                newBlockFacets = editedDv.getMetadataBlockFacets().stream().map(blockFacet -> {
+                    DataverseMetadataBlockFacet metadataBlockFacet = new DataverseMetadataBlockFacet();
+                    metadataBlockFacet.setDataverse(editedDv);
+                    metadataBlockFacet.setMetadataBlock(blockFacet.getMetadataBlock());
+                    return metadataBlockFacet;
+                }).collect(Collectors.toList());
+            }
+            editedDv.setMetadataBlockFacets(newBlockFacets);
+
+            editedDv.setMetadataBlockFacetRoot(metadataBlockFacetRoot);
+            return ctxt.dataverses().save(editedDv);
+        }
+
+        return editedDv;
+    }
+
+    // Visible for testing
+    public Dataverse getEditedDataverse() {
+        return this.editedDv;
+    }
+
+    // Visible for testing
+    public boolean getMetadataBlockFacetRoot() {
+        return metadataBlockFacetRoot;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetsCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetsCommand.java
new file mode 100644
index 00000000000..72a41f5cc3c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetsCommand.java
@@ -0,0 +1,52 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseMetadataBlockFacet;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+
+import java.util.List;
+
+/**
+ *
+ * @author adaybujeda
+ */
+@RequiredPermissions( Permission.EditDataverse )
+public class UpdateMetadataBlockFacetsCommand extends AbstractCommand<Dataverse> {
+
+    private final Dataverse editedDv;
+    private final List<DataverseMetadataBlockFacet> metadataBlockFacets;
+
+    public UpdateMetadataBlockFacetsCommand(DataverseRequest aRequest, Dataverse editedDv, List<DataverseMetadataBlockFacet> metadataBlockFacets) {
+        super(aRequest, editedDv);
+        this.editedDv = editedDv;
+        this.metadataBlockFacets = metadataBlockFacets;
+    }
+
+    @Override
+    public Dataverse execute(CommandContext ctxt) throws CommandException {
+        if (!editedDv.isMetadataBlockFacetRoot()) {
+            throw new IllegalCommandException("Cannot update metadata blocks facets when dataverse has metadata block facet root set to false", this);
+        }
+
+        editedDv.setMetadataBlockFacets(metadataBlockFacets);
+        Dataverse updated = ctxt.dataverses().save(editedDv);
+        return updated;
+    }
+
+    // Visible for testing
+    public Dataverse getEditedDataverse() {
+        return this.editedDv;
+    }
+
+    // Visible for testing
+    public List<DataverseMetadataBlockFacet> getMetadataBlockFacets() {
+        return this.metadataBlockFacets;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePermissionRootCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePermissionRootCommand.java
index a7e1122b789..0d08cff8b17 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePermissionRootCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePermissionRootCommand.java
@@ -37,6 +37,13 @@ public Dataverse execute( final CommandContext ctxt) throws CommandException {
 		}
 	}
 
+    @Override
+    public boolean onSuccess(CommandContext ctxt, Object r) {  
+        return ctxt.dataverses().index((Dataverse) r,true);
+    }        
+
+
+    //TODO: Review this as this will never be an instance of Dataset, will it?
     @Override
     public Map<String, Set<Permission>> getRequiredPermissions() {
         // for data file check permission on owning dataset
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePublishedDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePublishedDatasetVersionCommand.java
new file mode 100644
index 00000000000..f8f5d05d972
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePublishedDatasetVersionCommand.java
@@ -0,0 +1,63 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+
+/**
+ * Updates the specified dataset version, which must already be published/not
+ * draft. The command is only usable by superusers. The initial use is to allow
+ * adding version notes to existing versions but it is otherwise generic
+ * assuming there may be other cases where updating some aspect of an existing
+ * version is needed. Note this is similar to the
+ * CuratePublishedDatasetVersionCommand, but in that case changes in an existing
+ * draft version are pushed into the latest published version as a form of
+ * republishing (and the draft version ceases to exist). This command assumes
+ * changes have been made to the existing dataset version of interest, which may
+ * not be the latest published one, and it does not make any changes to a
+ * dataset's draft version if that exists.
+ */
+@RequiredPermissions(Permission.EditDataset)
+public class UpdatePublishedDatasetVersionCommand extends AbstractCommand<DatasetVersion> {
+
+    private final DatasetVersion datasetVersion;
+
+    public UpdatePublishedDatasetVersionCommand(DataverseRequest aRequest, DatasetVersion datasetVersion) {
+        super(aRequest, datasetVersion.getDataset());
+        this.datasetVersion = datasetVersion;
+    }
+
+    @Override
+    public DatasetVersion execute(CommandContext ctxt) throws CommandException {
+        // Check if the user is a superuser
+        if (!getUser().isSuperuser()) {
+            throw new IllegalCommandException("Only superusers can update published dataset versions", this);
+        }
+
+        // Ensure the version is published
+        if (!datasetVersion.isReleased()) {
+            throw new IllegalCommandException("This command can only be used on published dataset versions", this);
+        }
+
+        // Save the changes
+        DatasetVersion savedVersion = ctxt.em().merge(datasetVersion);
+
+        return savedVersion;
+    }
+
+    @Override
+    public boolean onSuccess(CommandContext ctxt, Object r) {
+        DatasetVersion version = (DatasetVersion) r;
+        // Only need to reindex if this version is the latest published version for the
+        // dataset
+        if (version.equals(version.getDataset().getLatestVersionForCopy())) {
+            ctxt.index().asyncIndexDataset(version.getDataset(), true);
+        }
+        return true;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ValidateDatasetJsonCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ValidateDatasetJsonCommand.java
new file mode 100644
index 00000000000..619740ddd89
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ValidateDatasetJsonCommand.java
@@ -0,0 +1,41 @@
+
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+
+ 
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author stephenkraffmiller
+ */
+@RequiredPermissions(Permission.AddDataset)
+public class ValidateDatasetJsonCommand extends AbstractCommand<String> {
+    
+    private static final Logger logger = Logger.getLogger(ValidateDatasetJsonCommand.class.getCanonicalName());
+    
+    private final Dataverse dataverse;
+    private final String datasetJson;
+    
+    public ValidateDatasetJsonCommand(DataverseRequest aRequest, Dataverse target, String datasetJsonIn) {
+        super(aRequest, target);
+        dataverse = target;
+        datasetJson = datasetJsonIn;
+    }
+
+    @Override
+    public String execute(CommandContext ctxt) throws CommandException {
+
+            return ctxt.dataverses().isDatasetJsonValid(dataverse.getAlias(), datasetJson);
+
+    }   
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/DCTermsExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/DCTermsExporter.java
index 7c5fea0f1ec..f82c0d9ad3d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/DCTermsExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/DCTermsExporter.java
@@ -2,12 +2,17 @@
 package edu.harvard.iq.dataverse.export;
 
 import com.google.auto.service.AutoService;
-import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.export.dublincore.DublinCoreExportUtil;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
+import io.gdcc.spi.export.XMLExporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.OutputStream;
-import javax.json.JsonObject;
+import java.util.Locale;
+import java.util.Optional;
+
+import jakarta.json.JsonObject;
 import javax.xml.stream.XMLStreamException;
 
 /**
@@ -15,34 +20,30 @@
  * @author Leonid Andreev
  */
 @AutoService(Exporter.class)
-public class DCTermsExporter implements Exporter {
+public class DCTermsExporter implements XMLExporter {
     
     
     
     @Override
-    public String getProviderName() {
+    public String getFormatName() {
         return "dcterms";
     }
 
     @Override
-    public String getDisplayName() {
-        return  BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.dublinCore") != null ? BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.dublinCore") : "Dublin Core (DCTERMS)";
+    public String getDisplayName(Locale locale) {
+        String displayName = BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.dublinCore", locale);
+        return Optional.ofNullable(displayName).orElse("Dublin Core (DCTERMS)");
     }
 
     @Override
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException {
+    public void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream) throws ExportException {
         try {
-            DublinCoreExportUtil.datasetJson2dublincore(json, outputStream, DublinCoreExportUtil.DC_FLAVOR_DCTERMS);
+            DublinCoreExportUtil.datasetJson2dublincore(dataProvider.getDatasetJson(), outputStream, DublinCoreExportUtil.DC_FLAVOR_DCTERMS);
         } catch (XMLStreamException xse) {
-            throw new ExportException("Caught XMLStreamException performing DCTERMS export");
+            throw new ExportException("Caught XMLStreamException performing DCTERMS export", xse);
         }
     }
 
-    @Override
-    public Boolean isXMLFormat() {
-        return true;
-    }
-    
     @Override
     public Boolean isHarvestable() {
         return false;
@@ -54,22 +55,18 @@ public Boolean isAvailableToUsers() {
     }
     
     @Override
-    public String getXMLNameSpace() throws ExportException {
+    public String getXMLNameSpace() {
         return DublinCoreExportUtil.DCTERMS_XML_NAMESPACE;   
     }
     
     @Override
-    public String getXMLSchemaLocation() throws ExportException {
+    public String getXMLSchemaLocation() {
         return DublinCoreExportUtil.DCTERMS_XML_SCHEMALOCATION;
     }
     
     @Override
-    public String getXMLSchemaVersion() throws ExportException {
+    public String getXMLSchemaVersion() {
         return DublinCoreExportUtil.DEFAULT_XML_VERSION;
     }
-    
-    @Override
-    public void setParam(String name, Object value) {
-        // this exporter doesn't need/doesn't currently take any parameters
-    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/DDIExportServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/export/DDIExportServiceBean.java
index 8086833f056..d76020cb8d8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/DDIExportServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/DDIExportServiceBean.java
@@ -33,14 +33,14 @@
 import java.util.logging.Logger;
 import java.util.logging.Level;
 import java.io.OutputStream;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLOutputFactory;
@@ -98,8 +98,10 @@ public class DDIExportServiceBean {
     public static final String LEVEL_FILE = "file";
     public static final String NOTE_TYPE_UNF = "VDC:UNF";
     public static final String NOTE_TYPE_TAG = "DATAVERSE:TAG";
+    public static final String NOTE_TYPE_FILEDESCRIPTION = "DATAVERSE:FILEDESC";
     public static final String NOTE_SUBJECT_UNF = "Universal Numeric Fingerprint";
     public static final String NOTE_SUBJECT_TAG = "Data File Tag";
+    public static final String NOTE_SUBJECT_FILEDESCRIPTION = "DataFile Description"; 
 
     /*
      * Internal service objects:
@@ -320,6 +322,30 @@ private void createVarDDI(XMLStreamWriter xmlw, Set<String> excludedFieldSet, Se
             }
         }
 
+        if (checkField("qstn", excludedFieldSet, includedFieldSet)) {
+            if (vm != null) {
+                if (!StringUtilisEmpty(vm.getLiteralquestion()) || !StringUtilisEmpty(vm.getInterviewinstruction()) || !StringUtilisEmpty(vm.getPostquestion())) {
+                    xmlw.writeStartElement("qstn");
+                    if (!StringUtilisEmpty(vm.getLiteralquestion())) {
+                        xmlw.writeStartElement("qstnLit");
+                        xmlw.writeCharacters(vm.getLiteralquestion());
+                        xmlw.writeEndElement(); // qstnLit
+                    }
+                    if (!StringUtilisEmpty(vm.getInterviewinstruction())) {
+                        xmlw.writeStartElement("ivuInstr");
+                        xmlw.writeCharacters(vm.getInterviewinstruction());
+                        xmlw.writeEndElement(); //ivuInstr
+                    }
+                    if (!StringUtilisEmpty(vm.getPostquestion())) {
+                        xmlw.writeStartElement("postQTxt");
+                        xmlw.writeCharacters(vm.getPostquestion());
+                        xmlw.writeEndElement(); //ivuInstr
+                    }
+                    xmlw.writeEndElement(); //qstn
+                }
+            }
+        }
+
         // invalrng
         if (checkField("invalrng", excludedFieldSet, includedFieldSet)) {
             boolean invalrngAdded = false;
@@ -465,29 +491,7 @@ private void createVarDDI(XMLStreamWriter xmlw, Set<String> excludedFieldSet, Se
             }
         }
 
-        if (checkField("qstn", excludedFieldSet, includedFieldSet)) {
-            if (vm != null) {
-                if (!StringUtilisEmpty(vm.getLiteralquestion()) || !StringUtilisEmpty(vm.getInterviewinstruction()) || !StringUtilisEmpty(vm.getPostquestion())) {
-                    xmlw.writeStartElement("qstn");
-                    if (!StringUtilisEmpty(vm.getLiteralquestion())) {
-                        xmlw.writeStartElement("qstnLit");
-                        xmlw.writeCharacters(vm.getLiteralquestion());
-                        xmlw.writeEndElement(); // qstnLit
-                    }
-                    if (!StringUtilisEmpty(vm.getInterviewinstruction())) {
-                        xmlw.writeStartElement("ivuInstr");
-                        xmlw.writeCharacters(vm.getInterviewinstruction());
-                        xmlw.writeEndElement(); //ivuInstr
-                    }
-                    if (!StringUtilisEmpty(vm.getPostquestion())) {
-                        xmlw.writeStartElement("postQTxt");
-                        xmlw.writeCharacters(vm.getPostquestion());
-                        xmlw.writeEndElement(); //ivuInstr
-                    }
-                    xmlw.writeEndElement(); //qstn
-                }
-            }
-        }
+
 
         xmlw.writeEndElement(); //var
 
@@ -543,6 +547,16 @@ private void createDataFileDDI(XMLStreamWriter xmlw, Set<String> excludedFieldSe
             List<DataVariable> vars = variableService.findByDataTableId(dt.getId());
             if (checkField("catgry", excludedFieldSet, includedFieldSet)) {
                 if (checkIsWithoutFrequencies(vars)) {
+                    // @todo: the method called here to calculate frequencies 
+                    // when they are missing from the database (for whatever
+                    // reasons) subsets the physical tab-delimited file and 
+                    // calculates them in real time. this is very expensive operation
+                    // potentially. let's make sure that, when we do this, we 
+                    // save the resulting frequencies in the database, so that 
+                    // we don't have to do this again. Also, let's double check 
+                    // whether the "checkIsWithoutFrequencies()" method is doing
+                    // the right thing - as it appears to return true when there 
+                    // are no categorical variables in the DataTable (?)
                     calculateFrequencies(df, vars);
                 }
             }
@@ -578,6 +592,7 @@ private boolean checkIsWithoutFrequencies(List<DataVariable> vars) {
 
     private void calculateFrequencies(DataFile df, List<DataVariable> vars)
     {
+        // @todo: see the comment in the part of the code that calls this method
         try {
             DataConverter dc = new DataConverter();
             File tabFile = dc.downloadFromStorageIO(df.getStorageIO());
@@ -729,11 +744,6 @@ private void createFileDscr(XMLStreamWriter xmlw, Set<String> excludedFieldSet,
                 xmlw.writeEndElement(); // fileName
             }
 
-            /*
-             xmlw.writeStartElement("fileCont");
-             xmlw.writeCharacters( df.getContentType() );
-             xmlw.writeEndElement(); // fileCont
-             */
             // dimensions
             if (checkField("dimensns", excludedFieldSet, includedFieldSet)) {
                 if (dt.getCaseQuantity() != null || dt.getVarQuantity() != null || dt.getRecordsPerCase() != null) {
@@ -788,26 +798,6 @@ private void createFileDscr(XMLStreamWriter xmlw, Set<String> excludedFieldSet,
             xmlw.writeEndElement(); // notes
         }
 
-        /*
-         xmlw.writeStartElement("notes");
-         writeAttribute( xmlw, "type", "vdc:category" );
-         xmlw.writeCharacters( fm.getCategory() );
-         xmlw.writeEndElement(); // notes
-         */
-        // A special note for LOCKSS crawlers indicating the restricted
-        // status of the file:
-
-        /*
-         if (tdf != null && isRestrictedFile(tdf)) {
-         xmlw.writeStartElement("notes");
-         writeAttribute( xmlw, "type", NOTE_TYPE_LOCKSS_CRAWL );
-         writeAttribute( xmlw, "level", LEVEL_FILE );
-         writeAttribute( xmlw, "subject", NOTE_SUBJECT_LOCKSS_PERM );
-         xmlw.writeCharacters( "restricted" );
-         xmlw.writeEndElement(); // notes
-
-         }
-         */
         if (checkField("tags", excludedFieldSet, includedFieldSet) && df.getTags() != null) {
             for (int i = 0; i < df.getTags().size(); i++) {
                 xmlw.writeStartElement("notes");
@@ -818,6 +808,17 @@ private void createFileDscr(XMLStreamWriter xmlw, Set<String> excludedFieldSet,
                 xmlw.writeEndElement(); // notes
             }
         }
+        
+        // A dedicated node for the Description entry 
+        if (!StringUtilisEmpty(fm.getDescription())) {
+            xmlw.writeStartElement("notes");
+            xmlw.writeAttribute("level", LEVEL_FILE);
+            xmlw.writeAttribute("type", NOTE_TYPE_FILEDESCRIPTION);
+            xmlw.writeAttribute("subject", NOTE_SUBJECT_FILEDESCRIPTION);
+            xmlw.writeCharacters(fm.getDescription());
+            xmlw.writeEndElement(); // notes
+        }
+        
         xmlw.writeEndElement(); // fileDscr   
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java
index a029e483c0c..0130c18b22b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java
@@ -2,92 +2,85 @@
 package edu.harvard.iq.dataverse.export;
 
 import com.google.auto.service.AutoService;
-import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.export.ddi.DdiExportUtil;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
+import io.gdcc.spi.export.XMLExporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.OutputStream;
-import javax.json.JsonObject;
+import java.util.Locale;
+import java.util.Optional;
+
+import jakarta.json.JsonObject;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.solr.common.util.IOUtils;
+
 import javax.xml.stream.XMLOutputFactory;
 
 /**
+ * This exporter is for the "full" DDI, that includes the file-level, <data> and
+ * <var> metadata.
  *
- * @author Leonid Andreev
- * (based on the original DDIExporter by
- * @author skraffmi
- * - renamed OAI_DDIExporter)
+ * @author Leonid Andreev (based on the original DDIExporter by
+ * @author skraffmi - renamed OAI_DDIExporter)
  */
 @AutoService(Exporter.class)
-public class DDIExporter implements Exporter {
-    // TODO: 
-    // move these into the ddi export utility
-    private static String DEFAULT_XML_NAMESPACE = "ddi:codebook:2_5"; 
-    private static String DEFAULT_XML_SCHEMALOCATION = "http://www.ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd";
-    private static String DEFAULT_XML_VERSION = "2.5";
-    
-    // This exporter is for the "full" DDI, that includes the file-level, 
-    // <data> and <var> metadata.
+public class DDIExporter implements XMLExporter {
+    public static String DEFAULT_XML_NAMESPACE = "ddi:codebook:2_5";
+    public static String DEFAULT_XML_SCHEMALOCATION = "https://ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd";
+    public static String DEFAULT_XML_VERSION = "2.5";
+    public static final String PROVIDER_NAME = "ddi";
+
     @Override
-    public String getProviderName() {
-        return "ddi";
+    public String getFormatName() {
+        return PROVIDER_NAME;
     }
 
     @Override
-    public String getDisplayName() {
-        return  BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.ddi") != null ? BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.ddi") : "DDI";
+    public String getDisplayName(Locale locale) {
+        String displayName = BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.ddi", locale);
+        return Optional.ofNullable(displayName).orElse("DDI");
     }
 
     @Override
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException {
+    public void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream) throws ExportException {
         try {
-        XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
-        xmlw.writeStartDocument();
-        xmlw.flush();
-            DdiExportUtil.datasetJson2ddi(json, version, outputStream);
+            DdiExportUtil.datasetJson2ddi(dataProvider.getDatasetJson(), dataProvider.getDatasetFileDetails(),
+                    outputStream);
         } catch (XMLStreamException xse) {
-            throw new ExportException ("Caught XMLStreamException performing DDI export");
+            throw new ExportException("Caught XMLStreamException performing DDI export", xse);
         }
     }
 
-    @Override
-    public Boolean isXMLFormat() {
-        return true; 
-    }
-    
     @Override
     public Boolean isHarvestable() {
         // No, we don't want this format to be harvested!
-        // For datasets with tabular data the <data> portions of the DDIs 
-        // become huge and expensive to parse; even as they don't contain any 
+        // For datasets with tabular data the <data> portions of the DDIs
+        // become huge and expensive to parse; even as they don't contain any
         // metadata useful to remote harvesters. -- L.A. 4.5
         return false;
     }
-    
+
     @Override
     public Boolean isAvailableToUsers() {
         return true;
     }
-    
+
     @Override
-    public String getXMLNameSpace() throws ExportException {
-        return DDIExporter.DEFAULT_XML_NAMESPACE;   
+    public String getXMLNameSpace() {
+        return DDIExporter.DEFAULT_XML_NAMESPACE;
     }
-    
+
     @Override
-    public String getXMLSchemaLocation() throws ExportException {
+    public String getXMLSchemaLocation() {
         return DDIExporter.DEFAULT_XML_SCHEMALOCATION;
     }
-    
+
     @Override
-    public String getXMLSchemaVersion() throws ExportException {
+    public String getXMLSchemaVersion() {
         return DDIExporter.DEFAULT_XML_VERSION;
     }
-    
-    @Override
-    public void setParam(String name, Object value) {
-        // this exporter does not uses or supports any parameters as of now.
-    }
 }
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java
index 7110067296d..c21d6b5cd1a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java
@@ -3,61 +3,48 @@
 
 import com.google.auto.service.AutoService;
 
-import edu.harvard.iq.dataverse.DOIDataCiteRegisterService;
-import edu.harvard.iq.dataverse.DataCitation;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
+import io.gdcc.spi.export.XMLExporter;
+import edu.harvard.iq.dataverse.pidproviders.doi.XmlMetadataTemplate;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.util.Map;
-import javax.json.JsonObject;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+import java.util.Optional;
 
 /**
  *
  * @author qqmyers
  */
 @AutoService(Exporter.class)
-public class DataCiteExporter implements Exporter {
-
-    private static String DEFAULT_XML_NAMESPACE = "http://datacite.org/schema/kernel-3";
-    private static String DEFAULT_XML_SCHEMALOCATION = "http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd";
-    private static String DEFAULT_XML_VERSION = "3.0";
-
+public class DataCiteExporter implements XMLExporter {
+    
     public static final String NAME = "Datacite";
+
     @Override
-    public String getProviderName() {
+    public String getFormatName() {
         return NAME;
     }
 
     @Override
-    public String getDisplayName() {
-        return BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.datacite") != null
-                ? BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.datacite")
-                : "DataCite";
+    public String getDisplayName(Locale locale) {
+        String displayName = BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.datacite", locale);
+        return Optional.ofNullable(displayName).orElse("DataCite");
     }
 
     @Override
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream)
-            throws ExportException {
+    public void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream) throws ExportException {
         try {
-            DataCitation dc = new DataCitation(version);
-            
-            Map<String, String> metadata = dc.getDataCiteMetadata();
-            String xml = DOIDataCiteRegisterService.getMetadataFromDvObject(
-                    version.getDataset().getGlobalId().asString(), metadata, version.getDataset());
-            outputStream.write(xml.getBytes(Charset.forName("utf-8")));
+            String xml = dataProvider.getDataCiteXml();
+            outputStream.write(xml.getBytes(StandardCharsets.UTF_8));
         } catch (IOException e) {
-            throw new ExportException("Caught IOException performing DataCite export");
+            throw new ExportException("Caught IOException performing DataCite export", e);
         }
     }
 
-    @Override
-    public Boolean isXMLFormat() {
-        return true;
-    }
-
     @Override
     public Boolean isHarvestable() {
         return true;
@@ -69,23 +56,18 @@ public Boolean isAvailableToUsers() {
     }
 
     @Override
-    public String getXMLNameSpace() throws ExportException {
-        return DataCiteExporter.DEFAULT_XML_NAMESPACE;
-    }
-
-    @Override
-    public String getXMLSchemaLocation() throws ExportException {
-        return DataCiteExporter.DEFAULT_XML_SCHEMALOCATION;
+    public String getXMLNameSpace() {
+        return XmlMetadataTemplate.XML_NAMESPACE;
     }
 
     @Override
-    public String getXMLSchemaVersion() throws ExportException {
-        return DataCiteExporter.DEFAULT_XML_VERSION;
+    public String getXMLSchemaLocation() {
+        return XmlMetadataTemplate.XML_SCHEMA_LOCATION;
     }
 
     @Override
-    public void setParam(String name, Object value) {
-        // this exporter does not uses or supports any parameters as of now.
+    public String getXMLSchemaVersion() {
+        return XmlMetadataTemplate.XML_SCHEMA_VERSION;
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/DublinCoreExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/DublinCoreExporter.java
index 7c4ebfdd44d..0fa32dd4bfa 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/DublinCoreExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/DublinCoreExporter.java
@@ -2,12 +2,17 @@
 package edu.harvard.iq.dataverse.export;
 
 import com.google.auto.service.AutoService;
-import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.export.dublincore.DublinCoreExportUtil;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
+import io.gdcc.spi.export.XMLExporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.OutputStream;
-import javax.json.JsonObject;
+import java.util.Locale;
+import java.util.Optional;
+
+import jakarta.json.JsonObject;
 import javax.xml.stream.XMLStreamException;
 
 /**
@@ -15,61 +20,53 @@
  * @author skraffmi
  */
 @AutoService(Exporter.class)
-public class DublinCoreExporter implements Exporter {
-    
-    
-    
+public class DublinCoreExporter implements XMLExporter {
+
     @Override
-    public String getProviderName() {
+    public String getFormatName() {
         return "oai_dc";
     }
 
     @Override
-    public String getDisplayName() {
-        return  BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.dublinCore") != null ? BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.dublinCore") : "Dublin Core";
+    public String getDisplayName(Locale locale) {
+        // ToDo: dataset.exportBtn.itemLabel.dublinCore is shared with the
+        // DCTermsExporter
+        String displayName = BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.dublinCore", locale);
+        return Optional.ofNullable(displayName).orElse("Dublin Core");
     }
 
     @Override
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException {
+    public void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream) throws ExportException {
         try {
-            DublinCoreExportUtil.datasetJson2dublincore(json, outputStream, DublinCoreExportUtil.DC_FLAVOR_OAI);
+            DublinCoreExportUtil.datasetJson2dublincore(dataProvider.getDatasetJson(), outputStream,
+                    DublinCoreExportUtil.DC_FLAVOR_OAI);
         } catch (XMLStreamException xse) {
-            throw new ExportException("Caught XMLStreamException performing DC export");
+            throw new ExportException("Caught XMLStreamException performing DC export", xse);
         }
     }
 
-    @Override
-    public Boolean isXMLFormat() {
-        return true;
-    }
-    
     @Override
     public Boolean isHarvestable() {
         return true;
     }
-    
+
     @Override
     public Boolean isAvailableToUsers() {
         return false;
     }
-    
+
     @Override
-    public String getXMLNameSpace() throws ExportException {
-        return DublinCoreExportUtil.OAI_DC_XML_NAMESPACE;   
+    public String getXMLNameSpace() {
+        return DublinCoreExportUtil.OAI_DC_XML_NAMESPACE;
     }
-    
+
     @Override
-    public String getXMLSchemaLocation() throws ExportException {
+    public String getXMLSchemaLocation() {
         return DublinCoreExportUtil.OAI_DC_XML_SCHEMALOCATION;
     }
-    
+
     @Override
-    public String getXMLSchemaVersion() throws ExportException {
+    public String getXMLSchemaVersion() {
         return DublinCoreExportUtil.DEFAULT_XML_VERSION;
     }
-    
-    @Override
-    public void setParam(String name, Object value) {
-        // this exporter doesn't need/doesn't currently take any parameters
-    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/ExportException.java b/src/main/java/edu/harvard/iq/dataverse/export/ExportException.java
deleted file mode 100644
index 0909bf06ca4..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/export/ExportException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse.export;
-
-/**
- *
- * @author Leonid Andreev
- */
-public class ExportException extends Exception {
-    public ExportException(String message) {
-        super(message);
-    }
-
-    public ExportException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/ExportService.java b/src/main/java/edu/harvard/iq/dataverse/export/ExportService.java
index e61efca2ddf..b98f88e386f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/ExportService.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/ExportService.java
@@ -2,14 +2,19 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
-import static edu.harvard.iq.dataverse.GlobalIdServiceBean.logger;
+import edu.harvard.iq.dataverse.Embargo;
+import edu.harvard.iq.dataverse.FileMetadata;
+
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import static edu.harvard.iq.dataverse.dataaccess.DataAccess.getStorageIO;
 import edu.harvard.iq.dataverse.dataaccess.DataAccessOption;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import edu.harvard.iq.dataverse.util.json.JsonPrinter;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
+import io.gdcc.spi.export.XMLExporter;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -17,23 +22,34 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.nio.channels.Channel;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
 
 import org.apache.commons.io.IOUtils;
 
@@ -45,77 +61,192 @@ public class ExportService {
 
     private static ExportService service;
     private ServiceLoader<Exporter> loader;
-    static SettingsServiceBean settingsService;
+    private Map<String, Exporter> exporterMap = new HashMap<>();
+
+    private static final Logger logger = Logger.getLogger(ExportService.class.getCanonicalName());
 
     private ExportService() {
-        loader = ServiceLoader.load(Exporter.class);
+        /*
+         * Step 1 - find the EXPORTERS dir and add all jar files there to a class loader
+         */
+        List<URL> jarUrls = new ArrayList<>();
+        Optional<String> exportPathSetting = JvmSettings.EXPORTERS_DIRECTORY.lookupOptional(String.class);
+        if (exportPathSetting.isPresent()) {
+            Path exporterDir = Paths.get(exportPathSetting.get());
+            // Get all JAR files from the configured directory
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(exporterDir, "*.jar")) {
+                // Using the foreach loop here to enable catching the URI/URL exceptions
+                for (Path path : stream) {
+                    logger.log(Level.FINE, "Adding {0}", path.toUri().toURL());
+                    // This is the syntax required to indicate a jar file from which classes should
+                    // be loaded (versus a class file).
+                    jarUrls.add(new URL("jar:" + path.toUri().toURL() + "!/"));
+                }
+            } catch (IOException e) {
+                logger.warning("Problem accessing external Exporters: " + e.getLocalizedMessage());
+            }
+        }
+        URLClassLoader cl = URLClassLoader.newInstance(jarUrls.toArray(new URL[0]), this.getClass().getClassLoader());
+
+        /*
+         * Step 2 - load all Exporters that can be found, using the jars as additional
+         * sources
+         */
+        loader = ServiceLoader.load(Exporter.class, cl);
+        /*
+         * Step 3 - Fill exporterMap with providerName as the key, allow external
+         * exporters to replace internal ones for the same providerName. FWIW: From the
+         * logging it appears that ServiceLoader returns classes in ~ alphabetical order
+         * rather than by class loader, so internal classes handling a given
+         * providerName may be processed before or after external ones.
+         */
+        loader.forEach(exp -> {
+            String formatName = exp.getFormatName();
+            // If no entry for this providerName yet or if it is an external exporter
+            if (!exporterMap.containsKey(formatName) || exp.getClass().getClassLoader().equals(cl)) {
+                exporterMap.put(formatName, exp);
+            }
+            logger.log(Level.FINE, "SL: " + exp.getFormatName() + " from " + exp.getClass().getCanonicalName()
+                    + " and classloader: " + exp.getClass().getClassLoader().getClass().getCanonicalName());
+        });
     }
 
-    /**
-     * @deprecated Use `getInstance(SettingsServiceBean settingsService)`
-     * instead. For privacy reasons, we need to pass in settingsService so that
-     * we can make a decision whether not not to exclude email addresses. No new
-     * code should call this method and it would be nice to remove calls from
-     * existing code.
-     */
-    @Deprecated
     public static synchronized ExportService getInstance() {
-        return getInstance(null);
-    }
-
-    public static synchronized ExportService getInstance(SettingsServiceBean settingsService) {
-        ExportService.settingsService = settingsService;
-        // We pass settingsService into the JsonPrinter so it can check the :ExcludeEmailFromExport setting in calls to JsonPrinter.jsonAsDatasetDto().
-        JsonPrinter.setSettingsService(settingsService);
         if (service == null) {
             service = new ExportService();
         }
         return service;
     }
 
-    public List< String[]> getExportersLabels() {
+    public List<String[]> getExportersLabels() {
         List<String[]> retList = new ArrayList<>();
-        Iterator<Exporter> exporters = ExportService.getInstance(null).loader.iterator();
-        while (exporters.hasNext()) {
-            Exporter e = exporters.next();
+
+        exporterMap.values().forEach(exp -> {
             String[] temp = new String[2];
-            temp[0] = e.getDisplayName();
-            temp[1] = e.getProviderName();
+            temp[0] = exp.getDisplayName(BundleUtil.getCurrentLocale());
+            temp[1] = exp.getFormatName();
             retList.add(temp);
-        }
+        });
         return retList;
     }
 
-    public InputStream getExport(Dataset dataset, String formatName) throws ExportException, IOException {
-        // first we will try to locate an already existing, cached export 
-        // for this format: 
-        InputStream exportInputStream = getCachedExportFormat(dataset, formatName);
+    public InputStream getExport(DatasetVersion datasetVersion, String formatName) throws ExportException, IOException {
+
+        Dataset dataset = datasetVersion.getDataset();
+        InputStream exportInputStream = null;
+
+        if (datasetVersion.isDraft()) {
+            // For drafts we create the export on the fly rather than caching.
+            Exporter exporter = exporterMap.get(formatName);
+            if (exporter != null) {
+                try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+                    // getPrerequisiteFormatName logic copied from exportFormat()
+                    if (exporter.getPrerequisiteFormatName().isPresent()) {
+                        String prereqFormatName = exporter.getPrerequisiteFormatName().get();
+                        try (InputStream preReqStream = getExport(datasetVersion, prereqFormatName)) {
+                            InternalExportDataProvider dataProvider = new InternalExportDataProvider(datasetVersion, preReqStream);
+                            exporter.exportDataset(dataProvider, outputStream);
+                        } catch (IOException ioe) {
+                            throw new ExportException("Could not get prerequisite " + prereqFormatName + " to create " + formatName + " export for dataset " + dataset.getId(), ioe);
+                        }
+                    } else {
+                        InternalExportDataProvider dataProvider = new InternalExportDataProvider(datasetVersion);
+                        exporter.exportDataset(dataProvider, outputStream);
+                    }
+                    return new ByteArrayInputStream(outputStream.toByteArray());
+                }
+            }
+        } else {
+            // for non-drafts (published versions) we try to locate an already existing, cached export
+            exportInputStream = getCachedExportFormat(dataset, formatName);
+        }
+
+        // The DDI export is limited for restricted and actively embargoed files (no
+        // data/file description sections).and when an embargo ends, we need to refresh
+        // this export.
+        boolean clearCachedExport = false;
+        if (formatName.equals(DDIExporter.PROVIDER_NAME) && (exportInputStream != null)) {
+            // We want ddi and there was a cached version
+            LocalDate exportLocalDate = null;
+            Date lastExportDate = dataset.getLastExportTime();
+            // if lastExportDate == null, assume it's not set because were exporting for the
+            // first time now (e.g. during publish) and therefore no changes are needed
+            if (lastExportDate != null) {
+                exportLocalDate = lastExportDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                logger.fine("Last export date: " + exportLocalDate.toString());
+                // Track which embargoes we've already checked
+                Set<Long> embargoIds = new HashSet<Long>();
+                // Check for all files in the latest released version
+                for (FileMetadata fm : dataset.getLatestVersionForCopy().getFileMetadatas()) {
+                    // ToDo? This loop is necessary because we have not stored the date when the
+                    // next embargo in this datasetversion will end. If we knew that (another
+                    // dataset/datasetversion column), we could make
+                    // one check that nextembargoEnd exists and is after the last export and before
+                    // now versus scanning through files until we potentially find such an embargo.
+                    Embargo e = fm.getDataFile().getEmbargo();
+                    if (e != null) {
+                        logger.fine("Datafile:  " + fm.getDataFile().getId());
+                        logger.fine("Embargo end date: " + e.getFormattedDateAvailable());
+                    }
+                    if (e != null && !embargoIds.contains(e.getId()) && e.getDateAvailable().isAfter(exportLocalDate)
+                            && e.getDateAvailable().isBefore(LocalDate.now())) {
+                        logger.fine("Request that the ddi export be cleared.");
+                        // The file has been embargoed and the embargo ended after the last export and
+                        // before the current date, so we need to remove the cached DDI export and make
+                        // it refresh
+                        clearCachedExport = true;
+                        break;
+                    } else if (e != null) {
+                        logger.fine("adding embargo to checked list: " + e.getId());
+                        embargoIds.add(e.getId());
+                    }
+                }
+            }
+            if (clearCachedExport) {
+                try {
+                    exportInputStream.close();
+                    clearCachedExport(dataset, formatName);
+                } catch (Exception ex) {
+                    logger.warning("Failure deleting DDI export format for dataset id: " + dataset.getId()
+                            + " after embargo expiration: " + ex.getLocalizedMessage());
+                } finally {
+                    exportInputStream = null;
+                }
+            }
+        }
 
         if (exportInputStream != null) {
             return exportInputStream;
         }
 
-        // if it doesn't exist, we'll try to run the export: 
+        // if it doesn't exist, we'll try to run the export:
         exportFormat(dataset, formatName);
 
-        // and then try again: 
+        // and then try again:
         exportInputStream = getCachedExportFormat(dataset, formatName);
 
         if (exportInputStream != null) {
             return exportInputStream;
         }
 
-        // if there is no cached export still - we have to give up and throw 
+        // if there is no cached export still - we have to give up and throw
         // an exception!
         throw new ExportException("Failed to export the dataset as " + formatName);
 
     }
 
-    public String getExportAsString(Dataset dataset, String formatName) {
+    public String getLatestPublishedAsString(Dataset dataset, String formatName) {
+        if (dataset == null) {
+            return null;
+        }
+        DatasetVersion releasedVersion = dataset.getReleasedVersion();
+        if (releasedVersion == null) {
+            return null;
+        }
         InputStream inputStream = null;
         InputStreamReader inp = null;
         try {
-            inputStream = getExport(dataset, formatName);
+            inputStream = getExport(releasedVersion, formatName);
             if (inputStream != null) {
                 inp = new InputStreamReader(inputStream, "UTF8");
                 BufferedReader br = new BufferedReader(inp);
@@ -130,8 +261,8 @@ public String getExportAsString(Dataset dataset, String formatName) {
                 inputStream.close();
                 return sb.toString();
             }
-        } catch (ExportException | IOException ex) {
-            //ex.printStackTrace();
+        } catch (IOException ex) {
+            logger.log(Level.FINE, ex.getMessage(), ex);
             return null;
         } finally {
             IOUtils.closeQuietly(inp);
@@ -141,9 +272,10 @@ public String getExportAsString(Dataset dataset, String formatName) {
 
     }
 
-    // This method goes through all the Exporters and calls 
-    // the "chacheExport()" method that will save the produced output  
-    // in a file in the dataset directory, on each Exporter available. 
+    // This method goes through all the Exporters and calls
+    // the "cacheExport()" method that will save the produced output
+    // in a file in the dataset directory, on each Exporter available.
+    // This is only for the latest published version.
     public void exportAllFormats(Dataset dataset) throws ExportException {
         try {
             clearAllCachedFormats(dataset);
@@ -156,139 +288,165 @@ public void exportAllFormats(Dataset dataset) throws ExportException {
             if (releasedVersion == null) {
                 throw new ExportException("No released version for dataset " + dataset.getGlobalId().toString());
             }
-
-            final JsonObjectBuilder datasetAsJsonBuilder = JsonPrinter.jsonAsDatasetDto(releasedVersion);
-            JsonObject datasetAsJson = datasetAsJsonBuilder.build();
-
-            Iterator<Exporter> exporters = loader.iterator();
-            while (exporters.hasNext()) {
-                Exporter e = exporters.next();
-                String formatName = e.getProviderName();
-
-                cacheExport(releasedVersion, formatName, datasetAsJson, e);
-
+            InternalExportDataProvider dataProvider = new InternalExportDataProvider(releasedVersion);
+
+            for (Exporter e : exporterMap.values()) {
+                String formatName = e.getFormatName();
+                if(e.getPrerequisiteFormatName().isPresent()) {
+                    String prereqFormatName = e.getPrerequisiteFormatName().get();
+                    try (InputStream preReqStream = getExport(dataset.getReleasedVersion(), prereqFormatName)) {
+                        dataProvider.setPrerequisiteInputStream(preReqStream);
+                        cacheExport(dataset, dataProvider, formatName, e);
+                        dataProvider.setPrerequisiteInputStream(null);
+                    } catch (IOException ioe) {
+                        throw new ExportException ("Could not get prerequisite " + e.getPrerequisiteFormatName() + " to create " + formatName + "export for dataset " + dataset.getId(), ioe);
+                    }
+                } else {
+                    cacheExport(dataset, dataProvider, formatName, e);
+                }
             }
+            // Finally, if we have been able to successfully export in all available
+            // formats, we'll increment the "last exported" time stamp:
+            dataset.setLastExportTime(new Timestamp(new Date().getTime()));
+
         } catch (ServiceConfigurationError serviceError) {
             throw new ExportException("Service configuration error during export. " + serviceError.getMessage());
+        } catch (RuntimeException e) {
+            logger.log(Level.FINE, e.getMessage(), e);
+            throw new ExportException(
+                    "Unknown runtime exception exporting metadata. " + (e.getMessage() == null ? "" : e.getMessage()));
         }
-        // Finally, if we have been able to successfully export in all available 
-        // formats, we'll increment the "last exported" time stamp: 
-
-        dataset.setLastExportTime(new Timestamp(new Date().getTime()));
 
     }
 
     public void clearAllCachedFormats(Dataset dataset) throws IOException {
         try {
-            Iterator<Exporter> exporters = loader.iterator();
-            while (exporters.hasNext()) {
-                Exporter e = exporters.next();
-                String formatName = e.getProviderName();
 
+            for (Exporter e : exporterMap.values()) {
+                String formatName = e.getFormatName();
                 clearCachedExport(dataset, formatName);
             }
 
             dataset.setLastExportTime(null);
         } catch (IOException ex) {
-            //not fatal
+            // not fatal
         }
     }
 
-    // This method finds the exporter for the format requested, 
+    // This method finds the exporter for the format requested,
     // then produces the dataset metadata as a JsonObject, then calls
-    // the "cacheExport()" method that will save the produced output  
-    // in a file in the dataset directory. 
+    // the "cacheExport()" method that will save the produced output
+    // in a file in the dataset directory.
     public void exportFormat(Dataset dataset, String formatName) throws ExportException {
         try {
-            Iterator<Exporter> exporters = loader.iterator();
-            while (exporters.hasNext()) {
-                Exporter e = exporters.next();
-                if (e.getProviderName().equals(formatName)) {
-                    DatasetVersion releasedVersion = dataset.getReleasedVersion();
-                    if (releasedVersion == null) {
-                        throw new IllegalStateException("No Released Version");
+
+            Exporter e = exporterMap.get(formatName);
+            if (e != null) {
+                DatasetVersion releasedVersion = dataset.getReleasedVersion();
+                if (releasedVersion == null) {
+                    throw new ExportException(
+                            "No published version found during export. " + dataset.getGlobalId().toString());
+                }
+                if(e.getPrerequisiteFormatName().isPresent()) {
+                    String prereqFormatName = e.getPrerequisiteFormatName().get();
+                    try (InputStream preReqStream = getExport(releasedVersion, prereqFormatName)) {
+                        InternalExportDataProvider dataProvider = new InternalExportDataProvider(releasedVersion, preReqStream);
+                        cacheExport(dataset, dataProvider, formatName, e);
+                    } catch (IOException ioe) {
+                        throw new ExportException ("Could not get prerequisite " + e.getPrerequisiteFormatName() + " to create " + formatName + "export for dataset " + dataset.getId(), ioe);
                     }
-                    final JsonObjectBuilder datasetAsJsonBuilder = JsonPrinter.jsonAsDatasetDto(releasedVersion);
-                    cacheExport(releasedVersion, formatName, datasetAsJsonBuilder.build(), e);
+                } else {
+                    InternalExportDataProvider dataProvider = new InternalExportDataProvider(releasedVersion);
+                    cacheExport(dataset, dataProvider, formatName, e);
                 }
+                // As with exportAll, we should update the lastexporttime for the dataset
+                dataset.setLastExportTime(new Timestamp(new Date().getTime()));
+            } else {
+                throw new ExportException("Exporter not found");
             }
-        } catch (ServiceConfigurationError serviceError) {
-            throw new ExportException("Service configuration error during export. " + serviceError.getMessage());
         } catch (IllegalStateException e) {
-            throw new ExportException("No published version found during export. " + dataset.getGlobalId().toString());
+            // IllegalStateException can potentially mean very different, and
+            // unexpected things. An exporter attempting to get a single primitive
+            // value from a fieldDTO that is in fact a Multiple and contains a
+            // json vector (this has happened, for example, when the code in the
+            // DDI exporter was not updated following a metadata fieldtype change),
+            // will result in IllegalStateException.
+            throw new ExportException("IllegalStateException caught when exporting " + formatName + " for dataset "
+                    + dataset.getGlobalId().toString()
+                    + "; may or may not be due to a mismatch between an exporter code and a metadata block update. "
+                    + e.getMessage());
         }
+
     }
-    
 
     public Exporter getExporter(String formatName) throws ExportException {
-        try {
-            Iterator<Exporter> exporters = loader.iterator();
-            while (exporters.hasNext()) {
-                Exporter e = exporters.next();
-                if (e.getProviderName().equals(formatName)) {
-                    return e;
-                }
-            }
-        } catch (ServiceConfigurationError serviceError) {
-            throw new ExportException("Service configuration error during export. " + serviceError.getMessage());
-        } catch (Exception ex) {
-            throw new ExportException("Could not find Exporter \"" + formatName + "\", unknown exception");
+        Exporter e = exporterMap.get(formatName);
+        if (e != null) {
+            return e;
         }
         throw new ExportException("No such Exporter: " + formatName);
     }
 
-    // This method runs the selected metadata exporter, caching the output 
+    // This method runs the selected metadata exporter, caching the output
     // in a file in the dataset directory / container based on its DOI:
-    private void cacheExport(DatasetVersion version, String format, JsonObject datasetAsJson, Exporter exporter) throws ExportException {
-        boolean tempFileRequired = false;
-        File tempFile = null;
+    private void cacheExport(Dataset dataset, InternalExportDataProvider dataProvider, String format, Exporter exporter)
+            throws ExportException {
+        
         OutputStream outputStream = null;
-        Dataset dataset = version.getDataset();
-        StorageIO<Dataset> storageIO = null;
         try {
-            // With some storage drivers, we can open a WritableChannel, or OutputStream 
-            // to directly write the generated metadata export that we want to cache; 
+            boolean tempFileUsed = false;
+            File tempFile = null;
+            StorageIO<Dataset> storageIO = null;
+
+            // With some storage drivers, we can open a WritableChannel, or OutputStream
+            // to directly write the generated metadata export that we want to cache;
             // Some drivers (like Swift) do not support that, and will give us an
-            // "operation not supported" exception. If that's the case, we'll have 
-            // to save the output into a temp file, and then copy it over to the 
-            // permanent storage using the IO "save" command: 
+            // "operation not supported" exception. If that's the case, we'll have
+            // to save the output into a temp file, and then copy it over to the
+            // permanent storage using the IO "save" command:
             try {
-                storageIO = DataAccess.createNewStorageIO(dataset, "placeholder");
-                Channel outputChannel = storageIO.openAuxChannel("export_" + format + ".cached", DataAccessOption.WRITE_ACCESS);
+                storageIO = DataAccess.getStorageIO(dataset);
+                Channel outputChannel = storageIO.openAuxChannel("export_" + format + ".cached",
+                        DataAccessOption.WRITE_ACCESS);
                 outputStream = Channels.newOutputStream((WritableByteChannel) outputChannel);
             } catch (IOException ioex) {
-                tempFileRequired = true;
+                // A common case = an IOException in openAuxChannel which is not supported by S3
+                // stores for WRITE_ACCESS
+                tempFileUsed = true;
                 tempFile = File.createTempFile("tempFileToExport", ".tmp");
                 outputStream = new FileOutputStream(tempFile);
             }
 
             try {
-                Path cachedMetadataFilePath = Paths.get(version.getDataset().getFileSystemDirectory().toString(), "export_" + format + ".cached");
-
-                if (!tempFileRequired) {
-                    FileOutputStream cachedExportOutputStream = new FileOutputStream(cachedMetadataFilePath.toFile());
-                    exporter.exportDataset(version, datasetAsJson, cachedExportOutputStream);
-                    cachedExportOutputStream.flush();
-                    cachedExportOutputStream.close();
-                    outputStream.close();
-                } else {
-                    // this method copies a local filesystem Path into this DataAccess Auxiliary location:
-                    exporter.exportDataset(version, datasetAsJson, outputStream);
-                    outputStream.flush();
-                    outputStream.close();
-                    
-                    logger.fine("Saving path as aux for temp file in: " + Paths.get(tempFile.getAbsolutePath()));
+                // Write the metadata export file to the outputStream, which may be the final
+                // location or a temp file
+                exporter.exportDataset(dataProvider, outputStream);
+                outputStream.flush();
+                outputStream.close();
+                if (tempFileUsed) {
+                    logger.fine("Saving export_" + format + ".cached aux file from temp file: "
+                            + Paths.get(tempFile.getAbsolutePath()));
                     storageIO.savePathAsAux(Paths.get(tempFile.getAbsolutePath()), "export_" + format + ".cached");
                     boolean tempFileDeleted = tempFile.delete();
                     logger.fine("tempFileDeleted: " + tempFileDeleted);
                 }
-
+            } catch (ExportException exex) {
+                /*
+                 * This exception is from the particular exporter and may not affect other
+                 * exporters (versus other exceptions in this method which are from the basic
+                 * mechanism to create a file) So we'll catch it here and report so that loops
+                 * over other exporters can continue. Todo: Might be better to create a new
+                 * exception subtype and send it upward, but the callers currently just log and
+                 * ignore beyond terminating any loop over exporters.
+                 */
+                logger.warning("Exception thrown while creating export_" + format + ".cached : " + exex.getMessage());
             } catch (IOException ioex) {
                 throw new ExportException("IO Exception thrown exporting as " + "export_" + format + ".cached");
             }
 
         } catch (IOException ioex) {
-            throw new ExportException("IO Exception thrown exporting as " + "export_" + format + ".cached");
+            // This catches any problem creating a local temp file in the catch clause above
+            throw new ExportException("IO Exception thrown before exporting as " + "export_" + format + ".cached");
         } finally {
             IOUtils.closeQuietly(outputStream);
         }
@@ -306,9 +464,9 @@ private void clearCachedExport(Dataset dataset, String format) throws IOExceptio
 
     }
 
-    // This method checks if the metadata has already been exported in this 
-    // format and cached on disk. If it has, it'll open the file and retun 
-    // the file input stream. If not, it'll return null. 
+    // This method checks if the metadata has already been exported in this
+    // format and cached on disk. If it has, it'll open the file and retun
+    // the file input stream. If not, it'll return null.
     private InputStream getCachedExportFormat(Dataset dataset, String formatName) throws ExportException, IOException {
 
         StorageIO<Dataset> dataAccess = null;
@@ -330,11 +488,12 @@ private InputStream getCachedExportFormat(Dataset dataset, String formatName) th
 
     }
 
-    /*The below method, getCachedExportSize(), is not currently used.
-     *An exercise for the reader could be to refactor it if it's needed
-     *to be compatible with storage drivers other than local filesystem.
-     *Files.exists() would need to be discarded.
-     * -- L.A. 4.8 */
+    /*
+     * The below method, getCachedExportSize(), is not currently used. An exercise
+     * for the reader could be to refactor it if it's needed to be compatible with
+     * storage drivers other than local filesystem. Files.exists() would need to be
+     * discarded. -- L.A. 4.8
+     */
 //    public Long getCachedExportSize(Dataset dataset, String formatName) {
 //        try {
 //            if (dataset.getFileSystemDirectory() != null) {
@@ -350,33 +509,19 @@ private InputStream getCachedExportFormat(Dataset dataset, String formatName) th
 //        return null;
 //    }
     public Boolean isXMLFormat(String provider) {
-        try {
-            Iterator<Exporter> exporters = loader.iterator();
-            while (exporters.hasNext()) {
-                Exporter e = exporters.next();
-                if (e.getProviderName().equals(provider)) {
-                    return e.isXMLFormat();
-                }
-            }
-        } catch (ServiceConfigurationError serviceError) {
-            serviceError.printStackTrace();
+        Exporter e = exporterMap.get(provider);
+        if (e != null) {
+            return e instanceof XMLExporter;
         }
         return null;
     }
 
-	public String getMediaType(String provider) {
-		 try {
-	            Iterator<Exporter> exporters = loader.iterator();
-	            while (exporters.hasNext()) {
-	                Exporter e = exporters.next();
-	                if (e.getProviderName().equals(provider)) {
-	                    return e.getMediaType();
-	                }
-	            }
-	        } catch (ServiceConfigurationError serviceError) {
-	            serviceError.printStackTrace();
-	        }
-	        return MediaType.TEXT_PLAIN;
-	}
+    public String getMediaType(String provider) {
+        Exporter e = exporterMap.get(provider);
+        if (e != null) {
+            return e.getMediaType();
+        }
+        return MediaType.TEXT_PLAIN;
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/HtmlCodeBookExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/HtmlCodeBookExporter.java
index f77821a59e2..9d0b107299e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/HtmlCodeBookExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/HtmlCodeBookExporter.java
@@ -1,55 +1,51 @@
 package edu.harvard.iq.dataverse.export;
 
 import com.google.auto.service.AutoService;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.export.ddi.DdiExportUtil;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 
-import javax.json.JsonObject;
-import javax.ws.rs.core.MediaType;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.core.MediaType;
 import javax.xml.stream.XMLStreamException;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.util.Locale;
+import java.util.Optional;
 
 @AutoService(Exporter.class)
 public class HtmlCodeBookExporter implements Exporter {
 
     @Override
-    public String getProviderName() {
+    public String getFormatName() {
         return "html";
     }
 
     @Override
-    public String getDisplayName() {
-        return  BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.html") != null ? BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.html") : "DDI html codebook";
+    public String getDisplayName(Locale locale) {
+        String displayName = BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.html", locale);
+        return Optional.ofNullable(displayName).orElse("DDI html codebook");
     }
 
     @Override
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException {
-        try {
-            InputStream ddiInputStream;
-            try {
-                ddiInputStream = ExportService.getInstance(ExportService.settingsService).getExport(version.getDataset(), "ddi");
-            } catch(ExportException | IOException e) {
-                throw new ExportException ("Cannot open export_ddi cached file");
+    public void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream) throws ExportException {
+        Optional<InputStream> ddiInputStreamOptional = dataProvider.getPrerequisiteInputStream();
+        if (ddiInputStreamOptional.isPresent()) {
+            try (InputStream ddiInputStream = ddiInputStreamOptional.get()) {
+                DdiExportUtil.datasetHtmlDDI(ddiInputStream, outputStream);
+            } catch (IOException e) {
+                throw new ExportException("Cannot open export_ddi cached file");
+            } catch (XMLStreamException xse) {
+                throw new ExportException("Caught XMLStreamException performing DDI export");
             }
-            DdiExportUtil.datasetHtmlDDI(ddiInputStream, outputStream);
-        } catch (XMLStreamException xse) {
-            throw new ExportException ("Caught XMLStreamException performing DDI export");
+        } else {
+            throw new ExportException("No prerequisite input stream found");
         }
     }
 
-    @Override
-    public Boolean isXMLFormat() {
-        return false;
-    }
-
     @Override
     public Boolean isHarvestable() {
         // No, we don't want this format to be harvested!
@@ -65,23 +61,9 @@ public Boolean isAvailableToUsers() {
     }
 
     @Override
-    public String getXMLNameSpace() throws ExportException {
-        return null;
-    }
-
-    @Override
-    public String getXMLSchemaLocation() throws ExportException {
-        return null;
-    }
-
-    @Override
-    public String getXMLSchemaVersion() throws ExportException {
-        return null;
-    }
-
-    @Override
-    public void setParam(String name, Object value) {
-        // this exporter does not uses or supports any parameters as of now.
+    public  Optional<String> getPrerequisiteFormatName() {
+        //This exporter relies on being able to get the output of the ddi exporter
+        return Optional.of("ddi");
     }
 
     @Override
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/InternalExportDataProvider.java b/src/main/java/edu/harvard/iq/dataverse/export/InternalExportDataProvider.java
new file mode 100644
index 00000000000..f0d77eb8b52
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/export/InternalExportDataProvider.java
@@ -0,0 +1,92 @@
+package edu.harvard.iq.dataverse.export;
+
+import java.io.InputStream;
+import java.util.Optional;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import edu.harvard.iq.dataverse.DataCitation;
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DOIDataCiteRegisterService;
+import io.gdcc.spi.export.ExportDataProvider;
+import edu.harvard.iq.dataverse.util.bagit.OREMap;
+import edu.harvard.iq.dataverse.util.json.JsonPrinter;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
+/**
+ * Provides all data necessary to create an export
+ * 
+ */
+public class InternalExportDataProvider implements ExportDataProvider {
+
+    private DatasetVersion dv;
+    private JsonObject jsonRepresentation = null;
+    private JsonObject schemaDotOrgRepresentation = null;
+    private JsonObject oreRepresentation = null;
+    private InputStream is = null;
+
+    InternalExportDataProvider(DatasetVersion dv) {
+        this.dv = dv;
+    }
+    
+    InternalExportDataProvider(DatasetVersion dv, InputStream is) {
+        this.dv = dv;
+        this.is=is;
+    }
+
+    @Override
+    public JsonObject getDatasetJson() {
+        if (jsonRepresentation == null) {
+            final JsonObjectBuilder datasetAsJsonBuilder = JsonPrinter.jsonAsDatasetDto(dv);
+            jsonRepresentation = datasetAsJsonBuilder.build();
+        }
+        return jsonRepresentation;
+    }
+
+    @Override
+    public JsonObject getDatasetSchemaDotOrg() {
+        if (schemaDotOrgRepresentation == null) {
+            String jsonLdAsString = dv.getJsonLd();
+            schemaDotOrgRepresentation = JsonUtil.getJsonObject(jsonLdAsString);
+        }
+        return schemaDotOrgRepresentation;
+    }
+
+    @Override
+    public JsonObject getDatasetORE() {
+        if (oreRepresentation == null) {
+            oreRepresentation = new OREMap(dv).getOREMap();
+        }
+        return oreRepresentation;
+    }
+
+    @Override
+    public String getDataCiteXml() {
+        return DOIDataCiteRegisterService.getMetadataFromDvObject(
+                dv.getDataset().getGlobalId().asString(), new DataCitation(dv).getDataCiteMetadata(), dv.getDataset());
+    }
+    
+    @Override
+    public JsonArray getDatasetFileDetails() {
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        for (FileMetadata fileMetadata : dv.getFileMetadatas()) {
+            DataFile dataFile = fileMetadata.getDataFile();
+            jab.add(JsonPrinter.json(dataFile, fileMetadata, true));
+        }
+        return jab.build();
+    }
+    
+    @Override
+    public Optional<InputStream> getPrerequisiteInputStream() {
+        return Optional.ofNullable(is);
+    }
+
+    public void setPrerequisiteInputStream(InputStream prereqStream) {
+        this.is=prereqStream;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/JSONExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/JSONExporter.java
index 0c87e02456d..cf3afd1a39a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/JSONExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/JSONExporter.java
@@ -2,12 +2,16 @@
 package edu.harvard.iq.dataverse.export;
 
 import com.google.auto.service.AutoService;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.OutputStream;
-import javax.json.JsonObject;
-import javax.ws.rs.core.MediaType;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+import java.util.Optional;
+
+import jakarta.ws.rs.core.MediaType;
 
 
 /**
@@ -18,30 +22,26 @@
 public class JSONExporter implements Exporter {
 
     @Override
-    public String getProviderName() {
+    public String getFormatName() {
         return "dataverse_json";
     }
 
     @Override
-    public String getDisplayName() {
-        return  BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.json") != null ? BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.json") : "JSON";
+    public String getDisplayName(Locale locale) {
+        String displayName = BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.json", locale); 
+        return Optional.ofNullable(displayName).orElse("JSON");
     }
 
     @Override
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException {
+    public void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream) throws ExportException {
         try{
-            outputStream.write(json.toString().getBytes("UTF8"));
+            outputStream.write(dataProvider.getDatasetJson().toString().getBytes(StandardCharsets.UTF_8));
             outputStream.flush();
         } catch (Exception e){
             throw new ExportException("Unknown exception caught during JSON export.");
         }
     }
 
-    @Override
-    public Boolean isXMLFormat() {
-        return false;
-    }
-    
     @Override
     public Boolean isHarvestable() {
         return true;
@@ -51,27 +51,7 @@ public Boolean isHarvestable() {
     public Boolean isAvailableToUsers() {
         return true;
     }
-    
-    @Override
-    public String getXMLNameSpace() throws ExportException {
-        throw new ExportException ("JSONExporter: not an XML format.");   
-    }
-    
-    @Override
-    public String getXMLSchemaLocation() throws ExportException {
-        throw new ExportException ("JSONExporter: not an XML format."); 
-    }
-    
-    @Override
-    public String getXMLSchemaVersion() throws ExportException {
-        throw new ExportException ("JSONExporter: not an XML format."); 
-    }
-    
-    @Override
-    public void setParam(String name, Object value) {
-        // this exporter doesn't need/doesn't currently take any parameters
-    }
-    
+
     @Override
     public String getMediaType() {
         return MediaType.APPLICATION_JSON;
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java
index b43fbd3e06d..0b4121c6025 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java
@@ -2,52 +2,51 @@
 package edu.harvard.iq.dataverse.export;
 
 import com.google.auto.service.AutoService;
-import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.export.ddi.DdiExportUtil;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
+import io.gdcc.spi.export.XMLExporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.OutputStream;
-import javax.json.JsonObject;
+import java.util.Locale;
+import java.util.Optional;
+
+import jakarta.json.JsonObject;
 import javax.xml.stream.XMLStreamException;
 
 /**
+ * This exporter is for the OAI ("short") flavor of the DDI - that is, without
+ * the variable/data information. The ddi export utility does not need the
+ * version entity to produce that.
  *
  * @author skraffmi
  */
 @AutoService(Exporter.class)
-public class OAI_DDIExporter implements Exporter {
-    // TODO: move these to the export utility:
-    private static String DEFAULT_XML_NAMESPACE = "ddi:codebook:2_5"; 
-    private static String DEFAULT_XML_SCHEMALOCATION = "http://www.ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd";
-    private static String DEFAULT_XML_VERSION = "2.5";
+public class OAI_DDIExporter implements XMLExporter {
     
     @Override
-    public String getProviderName() {
+    public String getFormatName() {
+        // TODO: Consider adding this "short form" to the "Export Metadata" dropdown in the GUI.
         return "oai_ddi";
     }
 
     @Override
-    public String getDisplayName() {
-        return  BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.ddi") != null ? BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.ddi") : "DDI";
+    public String getDisplayName(Locale locale) {
+        // dataset.exportBtn.itemLabel.ddi is shared with the DDIExporter
+        String displayName = BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.ddi",locale);
+        return Optional.ofNullable(displayName).orElse("DDI");
     }
 
     @Override
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException {
+    public void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream) throws ExportException {
         try {
-            // This exporter is for the OAI ("short") flavor of the DDI - 
-            // that is, without the variable/data information. The ddi export 
-            // utility does not need the version entity to produce that. 
-            DdiExportUtil.datasetJson2ddi(json, outputStream);
+            DdiExportUtil.datasetJson2ddi(dataProvider.getDatasetJson(), outputStream);
         } catch (XMLStreamException xse) {
             throw new ExportException ("Caught XMLStreamException performing DDI export");
         }
     }
 
-    @Override
-    public Boolean isXMLFormat() {
-        return true; 
-    }
-    
     @Override
     public Boolean isHarvestable() {
         return true;
@@ -59,22 +58,17 @@ public Boolean isAvailableToUsers() {
     }
     
     @Override
-    public String getXMLNameSpace() throws ExportException {
-        return OAI_DDIExporter.DEFAULT_XML_NAMESPACE;   
-    }
-    
-    @Override
-    public String getXMLSchemaLocation() throws ExportException {
-        return OAI_DDIExporter.DEFAULT_XML_SCHEMALOCATION;
+    public String getXMLNameSpace() {
+        return DDIExporter.DEFAULT_XML_NAMESPACE;
     }
     
     @Override
-    public String getXMLSchemaVersion() throws ExportException {
-        return OAI_DDIExporter.DEFAULT_XML_VERSION;
+    public String getXMLSchemaLocation() {
+        return DDIExporter.DEFAULT_XML_SCHEMALOCATION;
     }
     
     @Override
-    public void setParam(String name, Object value) {
-        // this exporter does not uses or supports any parameters as of now.
+    public String getXMLSchemaVersion() {
+        return DDIExporter.DEFAULT_XML_VERSION;
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/OAI_OREExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/OAI_OREExporter.java
index 6cfcb590681..86af45195d7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/OAI_OREExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/OAI_OREExporter.java
@@ -1,18 +1,18 @@
 package edu.harvard.iq.dataverse.export;
 
 import com.google.auto.service.AutoService;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import edu.harvard.iq.dataverse.export.ExportException;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.bagit.OREMap;
+
 import java.io.OutputStream;
-import java.util.ResourceBundle;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+import java.util.Optional;
 import java.util.logging.Logger;
 
-import javax.json.JsonObject;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 @AutoService(Exporter.class)
 public class OAI_OREExporter implements Exporter {
@@ -22,10 +22,11 @@ public class OAI_OREExporter implements Exporter {
     public static final String NAME = "OAI_ORE";
 
     @Override
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream)
+    public void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream)
             throws ExportException {
         try {
-            new OREMap(version, ExportService.settingsService.isTrueForKey(SettingsServiceBean.Key.ExcludeEmailFromExport, false)).writeOREMap(outputStream);
+            outputStream.write(dataProvider.getDatasetORE().toString().getBytes(StandardCharsets.UTF_8));
+            outputStream.flush();
         } catch (Exception e) {
             logger.severe(e.getMessage());
             e.printStackTrace();
@@ -34,20 +35,14 @@ public void exportDataset(DatasetVersion version, JsonObject json, OutputStream
 
 
     @Override
-    public String getProviderName() {
+    public String getFormatName() {
         return NAME;
     }
 
     @Override
-    public String getDisplayName() {
-        return BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.oai_ore") != null
-                ? BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.oai_ore")
-                : "OAI_ORE";
-    }
-
-    @Override
-    public Boolean isXMLFormat() {
-        return false;
+    public String getDisplayName(Locale locale) {
+        String displayName = BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.oai_ore", locale);
+        return Optional.ofNullable(displayName).orElse("OAI_ORE");
     }
 
     @Override
@@ -60,26 +55,6 @@ public Boolean isAvailableToUsers() {
         return true;
     }
 
-    @Override
-    public String getXMLNameSpace() throws ExportException {
-        throw new ExportException(OAI_OREExporter.class.getSimpleName() + ": not an XML format.");
-    }
-
-    @Override
-    public String getXMLSchemaLocation() throws ExportException {
-        throw new ExportException(OAI_OREExporter.class.getSimpleName() + ": not an XML format.");
-    }
-
-    @Override
-    public String getXMLSchemaVersion() throws ExportException {
-        throw new ExportException(SchemaDotOrgExporter.class.getSimpleName() + ": not an XML format.");
-    }
-
-    @Override
-    public void setParam(String name, Object value) {
-        // this exporter doesn't need/doesn't currently take any parameters
-    }
-    
     @Override
     public String getMediaType() {
         return MediaType.APPLICATION_JSON;
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/OpenAireExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/OpenAireExporter.java
index f4ce294f6e9..8bd4ae6a042 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/OpenAireExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/OpenAireExporter.java
@@ -1,48 +1,45 @@
 package edu.harvard.iq.dataverse.export;
 
 import java.io.OutputStream;
+import java.util.Locale;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import javax.xml.stream.XMLStreamException;
 
 import com.google.auto.service.AutoService;
 
-import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.export.openaire.OpenAireExportUtil;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
+import io.gdcc.spi.export.XMLExporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 
 @AutoService(Exporter.class)
-public class OpenAireExporter implements Exporter {
+public class OpenAireExporter implements XMLExporter {
 
     public OpenAireExporter() {
     }
 
     @Override
-    public String getProviderName() {
+    public String getFormatName() {
         return "oai_datacite";
     }
 
     @Override
-    public String getDisplayName() {
-        return BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.dataciteOpenAIRE");
+    public String getDisplayName(Locale locale) {
+        return BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.dataciteOpenAIRE", locale);
     }
 
     @Override
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream)
-            throws ExportException {
+    public void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream) throws ExportException {
         try {
-            OpenAireExportUtil.datasetJson2openaire(json, outputStream);
+            OpenAireExportUtil.datasetJson2openaire(dataProvider.getDatasetJson(), outputStream);
         } catch (XMLStreamException xse) {
             throw new ExportException("Caught XMLStreamException performing DataCite OpenAIRE export", xse);
         }
     }
 
-    @Override
-    public Boolean isXMLFormat() {
-        return true;
-    }
-
     @Override
     public Boolean isHarvestable() {
         return true;
@@ -54,22 +51,17 @@ public Boolean isAvailableToUsers() {
     }
 
     @Override
-    public String getXMLNameSpace() throws ExportException {
+    public String getXMLNameSpace() {
         return OpenAireExportUtil.RESOURCE_NAMESPACE;
     }
 
     @Override
-    public String getXMLSchemaLocation() throws ExportException {
+    public String getXMLSchemaLocation() {
         return OpenAireExportUtil.RESOURCE_SCHEMA_LOCATION;
     }
 
     @Override
-    public String getXMLSchemaVersion() throws ExportException {
+    public String getXMLSchemaVersion() {
         return OpenAireExportUtil.SCHEMA_VERSION;
     }
-
-    @Override
-    public void setParam(String name, Object value) {
-        // not used
-    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporter.java
index 971f0e5afa5..d4f2f95389f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporter.java
@@ -1,17 +1,16 @@
 package edu.harvard.iq.dataverse.export;
 
 import com.google.auto.service.AutoService;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 /**
  * Schema.org JSON-LD is used by Google Dataset Search and other services to
@@ -19,8 +18,8 @@
  * and available as an export format.
  * <p>
  * Do not make any backward incompatible changes unless it's absolutely
- * necessary and list them in the API Guide. The existing list is in the
- * "Native API" section.
+ * necessary and list them in the API Guide. The existing list is in the "Native
+ * API" section.
  * <p>
  * {@link SchemaDotOrgExporterTest} has most of the tests but
  * {@link DatasetVersionTest} has some as well. See
@@ -75,41 +74,33 @@ public class SchemaDotOrgExporter implements Exporter {
     public static final String NAME = "schema.org";
 
     @Override
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException {
-        String jsonLdAsString = version.getJsonLd();
-        try (JsonReader jsonReader = Json.createReader(new StringReader(jsonLdAsString));) {
-            JsonObject jsonLdJsonObject = jsonReader.readObject();
-            try {
-                outputStream.write(jsonLdJsonObject.toString().getBytes("UTF8"));
-            } catch (IOException ex) {
-                logger.info("IOException calling outputStream.write: " + ex);
-            }
-            try {
-                outputStream.flush();
-            } catch (IOException ex) {
-                logger.info("IOException calling outputStream.flush: " + ex);
-            }
+    public void exportDataset(ExportDataProvider dataProvider, OutputStream outputStream) throws ExportException {
+        try {
+            outputStream.write(dataProvider.getDatasetSchemaDotOrg().toString().getBytes(StandardCharsets.UTF_8));
+        } catch (IOException ex) {
+            logger.info("IOException calling outputStream.write: " + ex);
+        }
+        try {
+            outputStream.flush();
+        } catch (IOException ex) {
+            logger.info("IOException calling outputStream.flush: " + ex);
         }
     }
 
     @Override
-    public String getProviderName() {
+    public String getFormatName() {
         return NAME;
     }
 
     @Override
-    public String getDisplayName() {
-        return BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.schemaDotOrg");
-    }
-
-    @Override
-    public Boolean isXMLFormat() {
-        return false;
+    public String getDisplayName(Locale locale) {
+        return BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.schemaDotOrg", locale);
     }
 
     @Override
     public Boolean isHarvestable() {
-        // Defer harvesting because the current effort was estimated as a "2": https://github.com/IQSS/dataverse/issues/3700
+        // Defer harvesting because the current effort was estimated as a "2":
+        // https://github.com/IQSS/dataverse/issues/3700
         return false;
     }
 
@@ -118,30 +109,13 @@ public Boolean isAvailableToUsers() {
         return true;
     }
 
-    @Override
-    public String getXMLNameSpace() throws ExportException {
-        throw new ExportException(SchemaDotOrgExporter.class.getSimpleName() + ": not an XML format.");
-    }
-
-    @Override
-    public String getXMLSchemaLocation() throws ExportException {
-        throw new ExportException(SchemaDotOrgExporter.class.getSimpleName() + ": not an XML format.");
-    }
-
-    @Override
-    public String getXMLSchemaVersion() throws ExportException {
-        throw new ExportException(SchemaDotOrgExporter.class.getSimpleName() + ": not an XML format.");
-    }
-
-    @Override
-    public void setParam(String name, Object value) {
-        // this exporter doesn't need/doesn't currently take any parameters
-    }
-    
-
     @Override
     public String getMediaType() {
-        return MediaType.APPLICATION_JSON;
+        /**
+         * Changed from "application/json" to "application/ld+json" because
+         * that's what Signposting expects.
+         */
+        return "application/ld+json";
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java
index 51975ba5efe..f5cc86bf8ee 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java
@@ -1,60 +1,59 @@
 package edu.harvard.iq.dataverse.export.ddi;
 
 import com.google.gson.Gson;
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.DataTable;
+
+import edu.harvard.iq.dataverse.ControlledVocabularyValue;
 import edu.harvard.iq.dataverse.DatasetFieldConstant;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.DvObjectContainer;
 import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO;
 import edu.harvard.iq.dataverse.api.dto.DatasetDTO;
 import edu.harvard.iq.dataverse.api.dto.DatasetVersionDTO;
-import edu.harvard.iq.dataverse.api.dto.FieldDTO;
 import edu.harvard.iq.dataverse.api.dto.FileDTO;
-import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO;
-import edu.harvard.iq.dataverse.datavariable.VariableMetadata;
-import edu.harvard.iq.dataverse.datavariable.DataVariable;
-import edu.harvard.iq.dataverse.datavariable.VariableServiceBean;
-import edu.harvard.iq.dataverse.datavariable.VariableRange;
-import edu.harvard.iq.dataverse.datavariable.SummaryStatistic;
-import edu.harvard.iq.dataverse.datavariable.VariableCategory;
-import edu.harvard.iq.dataverse.datavariable.VarGroup;
-import edu.harvard.iq.dataverse.datavariable.CategoryMetadata;
+import edu.harvard.iq.dataverse.api.dto.FieldDTO;
+import edu.harvard.iq.dataverse.api.dto.LicenseDTO;
+
 
 import static edu.harvard.iq.dataverse.export.DDIExportServiceBean.LEVEL_FILE;
 import static edu.harvard.iq.dataverse.export.DDIExportServiceBean.NOTE_SUBJECT_TAG;
 import static edu.harvard.iq.dataverse.export.DDIExportServiceBean.NOTE_SUBJECT_UNF;
+import static edu.harvard.iq.dataverse.export.DDIExportServiceBean.NOTE_SUBJECT_FILEDESCRIPTION;
 import static edu.harvard.iq.dataverse.export.DDIExportServiceBean.NOTE_TYPE_TAG;
 import static edu.harvard.iq.dataverse.export.DDIExportServiceBean.NOTE_TYPE_UNF;
-import static edu.harvard.iq.dataverse.util.SystemConfig.FQDN;
-import static edu.harvard.iq.dataverse.util.SystemConfig.SITE_URL;
+import static edu.harvard.iq.dataverse.export.DDIExportServiceBean.NOTE_TYPE_FILEDESCRIPTION;
+import edu.harvard.iq.dataverse.export.DDIExporter;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
+
+import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import edu.harvard.iq.dataverse.util.xml.XmlPrinter;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+import edu.harvard.iq.dataverse.util.xml.XmlWriterUtil;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.LocalDate;
 import java.util.*;
+import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
-
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
 import org.w3c.dom.Document;
-import org.w3c.dom.DOMException;
+import org.apache.commons.lang3.StringUtils;
 
 // For write operation
 import javax.xml.transform.Transformer;
@@ -64,22 +63,30 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.transform.stream.StreamResult;
-import java.io.File;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 
 public class DdiExportUtil {
 
     private static final Logger logger = Logger.getLogger(DdiExportUtil.class.getCanonicalName());
+    public static final String NOTE_TYPE_TERMS_OF_USE = "DVN:TOU";
+    public static final String NOTE_TYPE_TERMS_OF_ACCESS = "DVN:TOA";
+    public static final String NOTE_TYPE_DATA_ACCESS_PLACE = "DVN:DAP";
+
+
+    public static final String LEVEL_DV = "dv";
 
-    @EJB
-    VariableServiceBean variableService;
+    
+    static SettingsServiceBean settingsService;
     
     public static final String NOTE_TYPE_CONTENTTYPE = "DATAVERSE:CONTENTTYPE";
     public static final String NOTE_SUBJECT_CONTENTTYPE = "Content/MIME Type";
+    public static final String CITATION_BLOCK_NAME = "citation";
+
+    //Some tests don't send real PIDs that can be parsed
+    //Use constant empty PID in these cases
+    private static final String EMPTY_PID = "null:nullnullnull";
 
     public static String datasetDtoAsJson2ddi(String datasetDtoAsJson) {
-        logger.fine(JsonUtil.prettyPrint(datasetDtoAsJson));
         Gson gson = new Gson();
         DatasetDTO datasetDto = gson.fromJson(datasetDtoAsJson, DatasetDTO.class);
         try {
@@ -106,40 +113,70 @@ private static String dto2ddi(DatasetDTO datasetDto) throws XMLStreamException {
     }
     
     private static void dtoddi(DatasetDTO datasetDto, OutputStream outputStream) throws XMLStreamException {
-        XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
-        xmlw.writeStartElement("codeBook");
-        xmlw.writeDefaultNamespace("ddi:codebook:2_5");
-        xmlw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-        xmlw.writeAttribute("xsi:schemaLocation", "ddi:codebook:2_5 http://www.ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd");
-        writeAttribute(xmlw, "version", "2.5");
-        createStdyDscr(xmlw, datasetDto);
-        createOtherMats(xmlw, datasetDto.getDatasetVersion().getFiles());
-        xmlw.writeEndElement(); // codeBook
-        xmlw.flush();
+        XMLStreamWriter xmlw = null;
+        try {
+            xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
+            xmlw.writeStartElement("codeBook");
+            xmlw.writeDefaultNamespace("ddi:codebook:2_5");
+            xmlw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+            xmlw.writeAttribute("xsi:schemaLocation", DDIExporter.DEFAULT_XML_NAMESPACE + " " + DDIExporter.DEFAULT_XML_SCHEMALOCATION);
+            xmlw.writeAttribute("version", DDIExporter.DEFAULT_XML_VERSION);
+            if (DvObjectContainer.isMetadataLanguageSet(datasetDto.getMetadataLanguage())) {
+                xmlw.writeAttribute("xml:lang", datasetDto.getMetadataLanguage());
+            }
+            createStdyDscr(xmlw, datasetDto);
+            createOtherMats(xmlw, datasetDto.getDatasetVersion().getFiles());
+            xmlw.writeEndElement(); // codeBook
+            xmlw.flush();
+        } finally {
+            if (xmlw != null) {
+                try {
+                    xmlw.close();
+                } catch (XMLStreamException e) {
+                    // Log this exception, but don't rethrow as it's in finally block
+                    logger.log(Level.WARNING, "Error closing XMLStreamWriter", e);
+                }
+            }
+        }
     }
 
     
     // "full" ddi, with the the "<fileDscr>"  and "<dataDscr>/<var>" sections: 
-    public static void datasetJson2ddi(JsonObject datasetDtoAsJson, DatasetVersion version, OutputStream outputStream) throws XMLStreamException {
+    public static void datasetJson2ddi(JsonObject datasetDtoAsJson, JsonArray fileDetails, OutputStream outputStream) throws XMLStreamException {
         logger.fine(JsonUtil.prettyPrint(datasetDtoAsJson.toString()));
         Gson gson = new Gson();
         DatasetDTO datasetDto = gson.fromJson(datasetDtoAsJson.toString(), DatasetDTO.class);
         
-        XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
-        xmlw.writeStartElement("codeBook");
-        xmlw.writeDefaultNamespace("ddi:codebook:2_5");
-        xmlw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-        xmlw.writeAttribute("xsi:schemaLocation", "ddi:codebook:2_5 http://www.ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd");
-        writeAttribute(xmlw, "version", "2.5");
-        createStdyDscr(xmlw, datasetDto);
-        createFileDscr(xmlw, version);
-        createDataDscr(xmlw, version);
-        createOtherMatsFromFileMetadatas(xmlw, version.getFileMetadatas());
-        xmlw.writeEndElement(); // codeBook
-        xmlw.flush();
+        XMLStreamWriter xmlw = null;
+        try {
+            xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
+
+            xmlw.writeStartElement("codeBook");
+            xmlw.writeDefaultNamespace("ddi:codebook:2_5");
+            xmlw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+            xmlw.writeAttribute("xsi:schemaLocation", DDIExporter.DEFAULT_XML_NAMESPACE + " " + DDIExporter.DEFAULT_XML_SCHEMALOCATION);
+            xmlw.writeAttribute("version", DDIExporter.DEFAULT_XML_VERSION);
+            if (DvObjectContainer.isMetadataLanguageSet(datasetDto.getMetadataLanguage())) {
+                xmlw.writeAttribute("xml:lang", datasetDto.getMetadataLanguage());
+            }
+            createStdyDscr(xmlw, datasetDto);
+            createFileDscr(xmlw, fileDetails);
+            createDataDscr(xmlw, fileDetails);
+            createOtherMatsFromFileMetadatas(xmlw, fileDetails);
+            xmlw.writeEndElement(); // codeBook
+            xmlw.flush();
+        } finally {
+            if (xmlw != null) {
+                try {
+                    xmlw.close();
+                } catch (XMLStreamException e) {
+                    // Log this exception, but don't rethrow as it's in finally block
+                    logger.log(Level.WARNING, "Error closing XMLStreamWriter", e);
+                }
+            }
+        }
     }
-    
-    
+
     /**
      * @todo This is just a stub, copied from DDIExportServiceBean. It should
      * produce valid DDI based on
@@ -154,6 +191,19 @@ private static void createStdyDscr(XMLStreamWriter xmlw, DatasetDTO datasetDto)
         DatasetVersionDTO version = datasetDto.getDatasetVersion();
         String persistentProtocol = datasetDto.getProtocol();
         String persistentAgency = persistentProtocol;
+
+        String persistentAuthority = datasetDto.getAuthority();
+        String persistentId = datasetDto.getIdentifier();
+
+        GlobalId pid = PidUtil.parseAsGlobalID(persistentProtocol, persistentAuthority, persistentId);
+        String pidUri, pidString;
+        if(pid != null) {
+            pidUri = pid.asURL();
+            pidString = pid.asString();
+        } else {
+            pidUri = EMPTY_PID;
+            pidString = EMPTY_PID;
+        }
         // The "persistentAgency" tag is used for the "agency" attribute of the 
         // <IDNo> ddi section; back in the DVN3 days we used "handle" and "DOI" 
         // for the 2 supported protocols, respectively. For the sake of backward
@@ -164,8 +214,6 @@ private static void createStdyDscr(XMLStreamWriter xmlw, DatasetDTO datasetDto)
             persistentAgency = "DOI";
         }
         
-        String persistentAuthority = datasetDto.getAuthority();
-        String persistentId = datasetDto.getIdentifier();       
         //docDesc Block
         writeDocDescElement (xmlw, datasetDto);
         //stdyDesc Block
@@ -173,25 +221,57 @@ private static void createStdyDscr(XMLStreamWriter xmlw, DatasetDTO datasetDto)
         xmlw.writeStartElement("citation");
         xmlw.writeStartElement("titlStmt");
        
-        writeFullElement(xmlw, "titl", dto2Primitive(version, DatasetFieldConstant.title));                       
-        writeFullElement(xmlw, "subTitl", dto2Primitive(version, DatasetFieldConstant.subTitle));
-        writeFullElement(xmlw, "altTitl", dto2Primitive(version, DatasetFieldConstant.alternativeTitle));
+        XmlWriterUtil.writeFullElement(xmlw, "titl", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.title), datasetDto.getMetadataLanguage());
+        XmlWriterUtil.writeFullElement(xmlw, "subTitl", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.subTitle));
+        FieldDTO altField = dto2FieldDTO( version, DatasetFieldConstant.alternativeTitle, "citation"  );
+        if (altField != null) {
+            writeMultipleElement(xmlw, "altTitl", altField, datasetDto.getMetadataLanguage());
+        }
         
         xmlw.writeStartElement("IDNo");
-        writeAttribute(xmlw, "agency", persistentAgency);
-        xmlw.writeCharacters(persistentProtocol + ":" + persistentAuthority + "/" + persistentId);
+        XmlWriterUtil.writeAttribute(xmlw, "agency", persistentAgency);
+        
+        
+        xmlw.writeCharacters(pidString);
         xmlw.writeEndElement(); // IDNo
-       
+        writeOtherIdElement(xmlw, version);
         xmlw.writeEndElement(); // titlStmt
 
         writeAuthorsElement(xmlw, version);
         writeProducersElement(xmlw, version);
         
         xmlw.writeStartElement("distStmt");
-        writeFullElement(xmlw, "distrbtr", datasetDto.getPublisher());
-        writeFullElement(xmlw, "distDate", datasetDto.getPublicationDate());
+      //The default is to add Dataverse Repository as a distributor. The excludeinstallationifset setting turns that off if there is a distributor defined in the metadata
+        boolean distributorSet=false;
+        MetadataBlockDTO citationDTO= version.getMetadataBlocks().get("citation");
+        if(citationDTO!=null) {
+            if(citationDTO.getField(DatasetFieldConstant.distributor)!=null) {
+                distributorSet=true;
+            }
+        }
+        
+        boolean excludeRepository = settingsService.isTrueForKey(SettingsServiceBean.Key.ExportInstallationAsDistributorOnlyWhenNotSet, false);
+        if (!StringUtils.isEmpty(datasetDto.getPublisher()) && !(excludeRepository && distributorSet)) {
+            xmlw.writeStartElement("distrbtr");
+            xmlw.writeAttribute("source", "archive");
+            xmlw.writeCharacters(datasetDto.getPublisher());
+            xmlw.writeEndElement(); //distrbtr
+        }
+        writeDistributorsElement(xmlw, version, datasetDto.getMetadataLanguage());
+        writeContactsElement(xmlw, version);
+        /* per SCHEMA, depositr comes before depDate! - L.A. */
+        XmlWriterUtil.writeFullElement(xmlw, "depositr", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.depositor));
+        /* ... and depDate comes before distDate - L.A. */
+        XmlWriterUtil.writeFullElement(xmlw, "depDate", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.dateOfDeposit));
+        XmlWriterUtil.writeFullElement(xmlw, "distDate", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.distributionDate));
+
         xmlw.writeEndElement(); // diststmt
 
+        writeSeriesElement(xmlw, version);
+        xmlw.writeStartElement("holdings");
+        XmlWriterUtil.writeAttribute(xmlw, "URI", pidUri);
+        xmlw.writeEndElement(); //holdings
+        
         xmlw.writeEndElement(); // citation
         //End Citation Block
         
@@ -199,55 +279,102 @@ private static void createStdyDscr(XMLStreamWriter xmlw, DatasetDTO datasetDto)
         // Study Info
         xmlw.writeStartElement("stdyInfo");
         
-        writeSubjectElement(xmlw, version); //Subject and Keywords
-        writeAbstractElement(xmlw, version); // Description
-        writeFullElement(xmlw, "notes", dto2Primitive(version, DatasetFieldConstant.notesText));
+        writeSubjectElement(xmlw, version, datasetDto.getMetadataLanguage()); //Subject and Keywords
+        writeAbstractElement(xmlw, version, datasetDto.getMetadataLanguage()); // Description
+        writeSummaryDescriptionElement(xmlw, version, datasetDto.getMetadataLanguage());
+        XmlWriterUtil.writeFullElement(xmlw, "notes", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.notesText));
+        ////////
+        xmlw.writeEndElement(); // stdyInfo
+
+        writeMethodElement(xmlw, version, datasetDto.getMetadataLanguage());
+        writeDataAccess(xmlw , version);
+        writeOtherStudyMaterial(xmlw , version);
+
+        XmlWriterUtil.writeFullElement(xmlw, "notes", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.datasetLevelErrorNotes));
         
-        writeSummaryDescriptionElement(xmlw, version);
+        xmlw.writeEndElement(); // stdyDscr
+
+    }
+
+    private static void writeOtherStudyMaterial(XMLStreamWriter xmlw , DatasetVersionDTO version) throws XMLStreamException {
+        List<String> relMaterials;
+        List<String> relDatasets;
+        List<String> relReferences;
+        try {
+            relMaterials = dto2PrimitiveList(version, DatasetFieldConstant.relatedMaterial);
+            relDatasets = dto2PrimitiveList(version, DatasetFieldConstant.relatedDatasets);
+            relReferences = dto2PrimitiveList(version, DatasetFieldConstant.otherReferences); 
+        } catch (Exception e) {
+            logger.warning("Exporting dataset to DDI failed for related materials element: " + e.getMessage());
+            return;
+        }
+        xmlw.writeStartElement("othrStdyMat");
+        XmlWriterUtil.writeFullElementList(xmlw, "relMat", relMaterials);
+        XmlWriterUtil.writeFullElementList(xmlw, "relStdy", relDatasets);
         writeRelPublElement(xmlw, version);
+        XmlWriterUtil.writeFullElementList(xmlw, "othRefs", relReferences);
+        xmlw.writeEndElement(); //othrStdyMat
+    }
 
-        writeOtherIdElement(xmlw, version);
-        writeDistributorsElement(xmlw, version);
-        writeContactsElement(xmlw, version);
-        writeFullElement(xmlw, "depositr", dto2Primitive(version, DatasetFieldConstant.depositor));    
-        writeFullElement(xmlw, "depDate", dto2Primitive(version, DatasetFieldConstant.dateOfDeposit));  
+    /*
+            <xs:sequence>
+               <xs:element ref="setAvail" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="useStmt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+    */
+    private static void writeDataAccess(XMLStreamWriter xmlw , DatasetVersionDTO version) throws XMLStreamException {
+        xmlw.writeStartElement("dataAccs");
         
-        writeFullElementList(xmlw, "relMat", dto2PrimitiveList(version, DatasetFieldConstant.relatedMaterial));
-        writeFullElementList(xmlw, "relStdy", dto2PrimitiveList(version, DatasetFieldConstant.relatedDatasets));
-        writeFullElementList(xmlw, "othRefs", dto2PrimitiveList(version, DatasetFieldConstant.otherReferences));
-        writeSeriesElement(xmlw, version);
-        writeSoftwareElement(xmlw, version);
-        writeFullElementList(xmlw, "dataSrc", dto2PrimitiveList(version, DatasetFieldConstant.dataSources));
-        writeFullElement(xmlw, "srcOrig", dto2Primitive(version, DatasetFieldConstant.originOfSources)); 
-        writeFullElement(xmlw, "srcChar", dto2Primitive(version, DatasetFieldConstant.characteristicOfSources)); 
-        writeFullElement(xmlw, "srcDocu", dto2Primitive(version, DatasetFieldConstant.accessToSources)); 
-        xmlw.writeEndElement(); // stdyInfo
-        // End Info Block
+        xmlw.writeStartElement("setAvail");
+        XmlWriterUtil.writeFullElement(xmlw, "accsPlac", version.getDataAccessPlace());
+        XmlWriterUtil.writeFullElement(xmlw, "origArch", version.getOriginalArchive());
+        XmlWriterUtil.writeFullElement(xmlw, "avlStatus", version.getAvailabilityStatus());
+        XmlWriterUtil.writeFullElement(xmlw, "collSize", version.getSizeOfCollection());
+        XmlWriterUtil.writeFullElement(xmlw, "complete", version.getStudyCompletion());
+        xmlw.writeEndElement(); //setAvail
         
-        //Social Science Metadata block
-               
-        writeMethodElement(xmlw, version);
-        
-        //Terms of Use and Access
-        writeFullElement(xmlw, "useStmt", version.getTermsOfUse()); 
-        writeFullElement(xmlw, "confDec", version.getConfidentialityDeclaration()); 
-        writeFullElement(xmlw, "specPerm", version.getSpecialPermissions()); 
-        writeFullElement(xmlw, "restrctn", version.getRestrictions()); 
-        writeFullElement(xmlw, "citeReq", version.getCitationRequirements()); 
-        writeFullElement(xmlw, "deposReq", version.getDepositorRequirements()); 
-        writeFullElement(xmlw, "dataAccs", version.getTermsOfAccess()); 
-        writeFullElement(xmlw, "accsPlac", version.getDataAccessPlace()); 
-        writeFullElement(xmlw, "conditions", version.getConditions()); 
-        writeFullElement(xmlw, "disclaimer", version.getDisclaimer()); 
-        writeFullElement(xmlw, "origArch", version.getOriginalArchive()); 
-        writeFullElement(xmlw, "avlStatus", version.getAvailabilityStatus()); 
-        writeFullElement(xmlw, "contact", version.getContactForAccess()); 
-        writeFullElement(xmlw, "collSize", version.getSizeOfCollection()); 
-        writeFullElement(xmlw, "complete", version.getStudyCompletion()); 
-        
-        
-        xmlw.writeEndElement(); // stdyDscr
+        xmlw.writeStartElement("useStmt");
+        XmlWriterUtil.writeFullElement(xmlw, "confDec", version.getConfidentialityDeclaration());
+        XmlWriterUtil.writeFullElement(xmlw, "specPerm", version.getSpecialPermissions());
+        XmlWriterUtil.writeFullElement(xmlw, "restrctn", version.getRestrictions());
+        XmlWriterUtil.writeFullElement(xmlw, "contact", version.getContactForAccess());
+        XmlWriterUtil.writeFullElement(xmlw, "citReq", version.getCitationRequirements());
+        XmlWriterUtil.writeFullElement(xmlw, "deposReq", version.getDepositorRequirements());
+        XmlWriterUtil.writeFullElement(xmlw, "conditions", version.getConditions());
+        XmlWriterUtil.writeFullElement(xmlw, "disclaimer", version.getDisclaimer());
+        xmlw.writeEndElement(); //useStmt
+
+        /* any <note>s: */
+        if (version.getTermsOfUse() != null && !version.getTermsOfUse().trim().equals("")) {
+            xmlw.writeStartElement("notes");
+            xmlw.writeAttribute("type", NOTE_TYPE_TERMS_OF_USE);
+            xmlw.writeAttribute("level", LEVEL_DV);
+            xmlw.writeCharacters(version.getTermsOfUse());
+            xmlw.writeEndElement(); //notes
+        }
+
+        if (version.getTermsOfAccess() != null && !version.getTermsOfAccess().trim().equals("")) {
+            xmlw.writeStartElement("notes");
+            xmlw.writeAttribute("type", NOTE_TYPE_TERMS_OF_ACCESS);
+            xmlw.writeAttribute("level", LEVEL_DV);
+            xmlw.writeCharacters(version.getTermsOfAccess());
+            xmlw.writeEndElement(); //notes
+        }
 
+        LicenseDTO license = version.getLicense();
+        if (license != null) {
+            String name = license.getName();
+            String uri = license.getUri();
+            if ((name != null && !name.trim().equals("")) && (uri != null && !uri.trim().equals(""))) {
+                xmlw.writeStartElement("notes");
+                xmlw.writeAttribute("type", NOTE_TYPE_TERMS_OF_USE);
+                xmlw.writeAttribute("level", LEVEL_DV);
+                xmlw.writeCharacters("<a href=" + '"' + uri + '"' + ">" + name + "</a>");
+                xmlw.writeEndElement(); //notes
+            }
+        }
+        xmlw.writeEndElement(); //dataAccs
     }
     
     private static void writeDocDescElement (XMLStreamWriter xmlw, DatasetDTO datasetDto) throws XMLStreamException {
@@ -266,19 +393,32 @@ private static void writeDocDescElement (XMLStreamWriter xmlw, DatasetDTO datase
         
         String persistentAuthority = datasetDto.getAuthority();
         String persistentId = datasetDto.getIdentifier();
-        
+        GlobalId pid = PidUtil.parseAsGlobalID(persistentProtocol, persistentAuthority, persistentId);
+        String pidString;
+        if(pid != null) {
+            pidString = pid.asString();
+        } else {
+            pidString = EMPTY_PID;
+        }
+
         xmlw.writeStartElement("docDscr");
         xmlw.writeStartElement("citation");
         xmlw.writeStartElement("titlStmt");
-        writeFullElement(xmlw, "titl", dto2Primitive(version, DatasetFieldConstant.title));
+        XmlWriterUtil.writeFullElement(xmlw, "titl", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.title), datasetDto.getMetadataLanguage());
         xmlw.writeStartElement("IDNo");
-        writeAttribute(xmlw, "agency", persistentAgency);
-        xmlw.writeCharacters(persistentProtocol + ":" + persistentAuthority + "/" + persistentId);
-        xmlw.writeEndElement(); // IDNo      
+        XmlWriterUtil.writeAttribute(xmlw, "agency", persistentAgency);
+        xmlw.writeCharacters(pidString);
+        xmlw.writeEndElement(); // IDNo
         xmlw.writeEndElement(); // titlStmt
         xmlw.writeStartElement("distStmt");
-        writeFullElement(xmlw, "distrbtr", datasetDto.getPublisher());
-        writeFullElement(xmlw, "distDate", datasetDto.getPublicationDate());
+        //The doc is always published by the Dataverse Repository
+        if (!StringUtils.isEmpty(datasetDto.getPublisher())) {
+            xmlw.writeStartElement("distrbtr");
+            xmlw.writeAttribute("source", "archive");
+            xmlw.writeCharacters(datasetDto.getPublisher());
+            xmlw.writeEndElement(); // distrbtr
+        }
+        XmlWriterUtil.writeFullElement(xmlw, "distDate", datasetDto.getPublicationDate());
         
         xmlw.writeEndElement(); // diststmt
         writeVersionStatement(xmlw, version);
@@ -292,199 +432,358 @@ private static void writeDocDescElement (XMLStreamWriter xmlw, DatasetDTO datase
     
     private static void writeVersionStatement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO) throws XMLStreamException{
         xmlw.writeStartElement("verStmt");
-        writeAttribute(xmlw,"source","DVN"); 
+        xmlw.writeAttribute("source","archive");
         xmlw.writeStartElement("version");
-        writeAttribute(xmlw,"date", datasetVersionDTO.getReleaseTime().substring(0, 10));
-        writeAttribute(xmlw,"type", datasetVersionDTO.getVersionState().toString()); 
-        xmlw.writeCharacters(datasetVersionDTO.getVersionNumber().toString());
+        if (datasetVersionDTO.getReleaseTime() != null) {
+            XmlWriterUtil.writeAttribute(xmlw, "date", datasetVersionDTO.getReleaseTime().substring(0, 10));
+        }
+        XmlWriterUtil.writeAttribute(xmlw, "type", datasetVersionDTO.getVersionState().toString());
+        if (datasetVersionDTO.getVersionNumber() != null) {
+            xmlw.writeCharacters(datasetVersionDTO.getVersionNumber().toString());
+        }
         xmlw.writeEndElement(); // version
+        if (!StringUtils.isBlank(datasetVersionDTO.getVersionNote())) {
+            xmlw.writeStartElement("notes");
+            xmlw.writeCharacters(datasetVersionDTO.getVersionNote());
+            xmlw.writeEndElement(); // notes
+        }
+        
         xmlw.writeEndElement(); // verStmt
     }
     
-    private static void writeSummaryDescriptionElement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO) throws XMLStreamException {
+    /* From the DDI 2.5 schema: 
+            <xs:sequence>
+               <xs:element ref="timePrd" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="collDate" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="nation" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="geogCover" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="geogUnit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="geoBndBox" minOccurs="0"/>
+               <xs:element ref="boundPoly" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="anlyUnit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="universe" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="dataKind" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+    */
+    private static void writeSummaryDescriptionElement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO, String lang) throws XMLStreamException {
         xmlw.writeStartElement("sumDscr");
+        FieldDTO timePeriodCoveredDTO = null;
+        FieldDTO dateOfCollectionDTO = null;
+        FieldDTO geographicCoverageDTO = null;
+        FieldDTO geographicBoundingBoxDTO = null;
+        FieldDTO unitOfAnalysisDTO = null;
+        FieldDTO universeDTO = null;
+        FieldDTO kindOfDataDTO = null;
+
         for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
             String key = entry.getKey();
             MetadataBlockDTO value = entry.getValue();
+
             if ("citation".equals(key)) {
-                Integer per = 0;
-                Integer coll = 0;
                 for (FieldDTO fieldDTO : value.getFields()) {
                     if (DatasetFieldConstant.timePeriodCovered.equals(fieldDTO.getTypeName())) {
-                        String dateValStart = "";
-                        String dateValEnd = "";
-                        for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
-                            per++;
-                            for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
-                                FieldDTO next = iterator.next();
-                                if (DatasetFieldConstant.timePeriodCoveredStart.equals(next.getTypeName())) {
-                                    dateValStart = next.getSinglePrimitive();
-                                }
-                                if (DatasetFieldConstant.timePeriodCoveredEnd.equals(next.getTypeName())) {
-                                    dateValEnd = next.getSinglePrimitive();
-                                }
-                            }
-                            if (!dateValStart.isEmpty()) {
-                                writeDateElement(xmlw, "timePrd", "P"+ per.toString(), "start", dateValStart );
-                            }
-                            if (!dateValEnd.isEmpty()) {
-                                writeDateElement(xmlw, "timePrd",  "P"+ per.toString(), "end", dateValEnd );
-                            }
-                        }
+                        timePeriodCoveredDTO = fieldDTO;
                     }
+
                     if (DatasetFieldConstant.dateOfCollection.equals(fieldDTO.getTypeName())) {
-                        String dateValStart = "";
-                        String dateValEnd = "";
-                        for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
-                            coll++;
-                            for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
-                                FieldDTO next = iterator.next();
-                                if (DatasetFieldConstant.dateOfCollectionStart.equals(next.getTypeName())) {
-                                    dateValStart = next.getSinglePrimitive();
-                                }
-                                if (DatasetFieldConstant.dateOfCollectionEnd.equals(next.getTypeName())) {
-                                    dateValEnd = next.getSinglePrimitive();
-                                }
-                            }
-                            if (!dateValStart.isEmpty()) {
-                                writeDateElement(xmlw, "collDate",  "P"+ coll.toString(), "start", dateValStart );
-                            }
-                            if (!dateValEnd.isEmpty()) {
-                                writeDateElement(xmlw,  "collDate",  "P"+ coll.toString(), "end", dateValEnd );
-                            }
-                        }
+                        dateOfCollectionDTO = fieldDTO;
                     }
+
                     if (DatasetFieldConstant.kindOfData.equals(fieldDTO.getTypeName())) {
-                        writeMultipleElement(xmlw, "dataKind", fieldDTO);                     
+                        kindOfDataDTO = fieldDTO;
                     }
                 }
             }
-            
-            if("geospatial".equals(key)){                
+
+            if ("geospatial".equals(key)) {
                 for (FieldDTO fieldDTO : value.getFields()) {
                     if (DatasetFieldConstant.geographicCoverage.equals(fieldDTO.getTypeName())) {
-                        for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
-                            for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
-                                FieldDTO next = iterator.next();
-                                if (DatasetFieldConstant.country.equals(next.getTypeName())) {
-                                    writeFullElement(xmlw, "nation", next.getSinglePrimitive());
-                                }
-                                if (DatasetFieldConstant.city.equals(next.getTypeName())) {
-                                    writeFullElement(xmlw, "geogCover", next.getSinglePrimitive());
-                                }
-                                if (DatasetFieldConstant.state.equals(next.getTypeName())) {
-                                    writeFullElement(xmlw, "geogCover", next.getSinglePrimitive());
-                                } 
-                                if (DatasetFieldConstant.otherGeographicCoverage.equals(next.getTypeName())) {
-                                    writeFullElement(xmlw, "geogCover", next.getSinglePrimitive());
-                                } 
-                            }
-                        }
+                        geographicCoverageDTO = fieldDTO;
                     }
                     if (DatasetFieldConstant.geographicBoundingBox.equals(fieldDTO.getTypeName())) {
-                        for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
-                            for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
-                                FieldDTO next = iterator.next();
-                                if (DatasetFieldConstant.westLongitude.equals(next.getTypeName())) {
-                                    writeFullElement(xmlw, "westBL", next.getSinglePrimitive());
-                                }
-                                if (DatasetFieldConstant.eastLongitude.equals(next.getTypeName())) {
-                                    writeFullElement(xmlw, "eastBL", next.getSinglePrimitive());
-                                }
-                                if (DatasetFieldConstant.northLatitude.equals(next.getTypeName())) {
-                                    writeFullElement(xmlw, "northBL", next.getSinglePrimitive());
-                                }  
-                                if (DatasetFieldConstant.southLatitude.equals(next.getTypeName())) {
-                                    writeFullElement(xmlw, "southBL", next.getSinglePrimitive());
-                                }                               
 
-                            }
-                        }
+                        geographicBoundingBoxDTO = fieldDTO;
+
                     }
                 }
-                    writeFullElementList(xmlw, "geogUnit", dto2PrimitiveList(datasetVersionDTO, DatasetFieldConstant.geographicUnit));
             }
 
-            if("socialscience".equals(key)){                
+            if ("socialscience".equals(key)) {
                 for (FieldDTO fieldDTO : value.getFields()) {
                     if (DatasetFieldConstant.universe.equals(fieldDTO.getTypeName())) {
-                        writeMultipleElement(xmlw, "universe", fieldDTO);
+                        universeDTO = fieldDTO;
                     }
                     if (DatasetFieldConstant.unitOfAnalysis.equals(fieldDTO.getTypeName())) {
-                        writeMultipleElement(xmlw, "anlyUnit", fieldDTO);                     
+                        unitOfAnalysisDTO = fieldDTO;
                     }
-                }              
+                }
             }
         }
+        /* Finally, we can write the fields we have collected, in the correct order: -L.A.*/
+
+        if (timePeriodCoveredDTO != null) {
+            String dateValStart = "";
+            String dateValEnd = "";
+            Integer per = 0;
+            for (HashSet<FieldDTO> foo : timePeriodCoveredDTO.getMultipleCompound()) {
+                per++;
+                for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
+                    FieldDTO next = iterator.next();
+                    if (DatasetFieldConstant.timePeriodCoveredStart.equals(next.getTypeName())) {
+                        dateValStart = next.getSinglePrimitive();
+                    }
+                    if (DatasetFieldConstant.timePeriodCoveredEnd.equals(next.getTypeName())) {
+                        dateValEnd = next.getSinglePrimitive();
+                    }
+                }
+                if (!dateValStart.isEmpty()) {
+                    writeDateElement(xmlw, "timePrd", "P" + per.toString(), "start", dateValStart);
+                }
+                if (!dateValEnd.isEmpty()) {
+                    writeDateElement(xmlw, "timePrd", "P" + per.toString(), "end", dateValEnd);
+                }
+            }
+        }
+
+        if (dateOfCollectionDTO != null) {
+            String dateValStart = "";
+            String dateValEnd = "";
+            Integer coll = 0;
+            for (HashSet<FieldDTO> foo : dateOfCollectionDTO.getMultipleCompound()) {
+                coll++;
+                for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
+                    FieldDTO next = iterator.next();
+                    if (DatasetFieldConstant.dateOfCollectionStart.equals(next.getTypeName())) {
+                        dateValStart = next.getSinglePrimitive();
+                    }
+                    if (DatasetFieldConstant.dateOfCollectionEnd.equals(next.getTypeName())) {
+                        dateValEnd = next.getSinglePrimitive();
+                    }
+                }
+                if (!dateValStart.isEmpty()) {
+                    writeDateElement(xmlw, "collDate", "P" + coll.toString(), "start", dateValStart);
+                }
+                if (!dateValEnd.isEmpty()) {
+                    writeDateElement(xmlw, "collDate", "P" + coll.toString(), "end", dateValEnd);
+                }
+            }
+        }
+
+        /* <nation> and <geogCover> come next, in that order. -L.A. */
+        if (geographicCoverageDTO != null) {
+
+            List<String> nationList = new ArrayList<>();
+            List<String> geogCoverList = new ArrayList<>();
+
+            for (HashSet<FieldDTO> foo : geographicCoverageDTO.getMultipleCompound()) {
+                for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
+                    FieldDTO next = iterator.next();
+                    /* our "country" field maps 1:1 to the DDI "<nation>": */
+                    if (DatasetFieldConstant.country.equals(next.getTypeName())) {
+                        nationList.add(next.getSinglePrimitive());
+                    }
+                    /* city, state and otherGeographicCoverage all exported as "<geogCover>": */
+                    if (DatasetFieldConstant.city.equals(next.getTypeName())
+                            || DatasetFieldConstant.state.equals(next.getTypeName())
+                            || DatasetFieldConstant.otherGeographicCoverage.equals(next.getTypeName())) {
+                        geogCoverList.add(next.getSinglePrimitive());
+                    }
+                }
+            }
+
+            /**
+             * And now we can write all the fields encountered, first the
+             * "<nation>" entries, then all the "<geogCover>" ones:
+             */
+            for (String nationEntry : nationList) {
+                XmlWriterUtil.writeFullElement(xmlw, "nation", nationEntry);
+            }
+            for (String geogCoverEntry : geogCoverList) {
+                XmlWriterUtil.writeFullElement(xmlw, "geogCover", geogCoverEntry);
+            }
+        }
+
+        XmlWriterUtil.writeFullElementList(xmlw, "geogUnit", dto2PrimitiveList(datasetVersionDTO, DatasetFieldConstant.geographicUnit));
+
+        /* Only 1 geoBndBox is allowed in the DDI.
+           So, I'm just going to arbitrarily use the first one, and ignore the rest! -L.A. */
+        if (geographicBoundingBoxDTO != null) {
+            HashSet<FieldDTO> bndBoxSet = geographicBoundingBoxDTO.getMultipleCompound().get(0);
+            xmlw.writeStartElement("geoBndBox");
+            HashMap<String, String> geoBndBoxMap = new HashMap<>();
+            for (FieldDTO next : bndBoxSet) {
+                if (DatasetFieldConstant.westLongitude.equals(next.getTypeName())) {
+                    geoBndBoxMap.put("westBL", next.getSinglePrimitive());
+                }
+                if (DatasetFieldConstant.eastLongitude.equals(next.getTypeName())) {
+                    geoBndBoxMap.put("eastBL", next.getSinglePrimitive());
+                }
+                if (DatasetFieldConstant.northLatitude.equals(next.getTypeName())) {
+                    geoBndBoxMap.put("northBL", next.getSinglePrimitive());
+                }
+                if (DatasetFieldConstant.southLatitude.equals(next.getTypeName())) {
+                    geoBndBoxMap.put("southBL", next.getSinglePrimitive());
+                }
+            }
+
+            /* Once again, order is important! */
+ /*
+                        <xs:sequence>
+                            <xs:element ref="westBL"/>
+                            <xs:element ref="eastBL"/>
+                            <xs:element ref="southBL"/>
+                            <xs:element ref="northBL"/>
+                        </xs:sequence>
+             */
+            if (geoBndBoxMap.get("westBL") != null) {
+                XmlWriterUtil.writeFullElement(xmlw, "westBL", geoBndBoxMap.get("westBL"));
+            }
+            if (geoBndBoxMap.get("eastBL") != null) {
+                XmlWriterUtil.writeFullElement(xmlw, "eastBL", geoBndBoxMap.get("eastBL"));
+            }
+            if (geoBndBoxMap.get("southBL") != null) {
+                XmlWriterUtil.writeFullElement(xmlw, "southBL", geoBndBoxMap.get("southBL"));
+            }
+            if (geoBndBoxMap.get("northBL") != null) {
+                XmlWriterUtil.writeFullElement(xmlw, "northBL", geoBndBoxMap.get("northBL"));
+            }
+
+            xmlw.writeEndElement();
+        }
+
+        /* analyUnit: */
+        if (unitOfAnalysisDTO != null) {
+            XmlWriterUtil.writeI18NElementList(xmlw, "anlyUnit", unitOfAnalysisDTO.getMultipleVocab(), "unitOfAnalysis", unitOfAnalysisDTO.getTypeClass(), "socialscience", lang);
+
+        }
+
+        /* universe: */
+        if (universeDTO != null) {
+            writeMultipleElement(xmlw, "universe", universeDTO, lang);
+        }
+
+        /* finally, any "kind of data" entries: */
+        if (kindOfDataDTO != null) {
+            writeMultipleElement(xmlw, "dataKind", kindOfDataDTO, lang);
+        }
+
         xmlw.writeEndElement(); //sumDscr     
     }
     
-    private static void writeMultipleElement(XMLStreamWriter xmlw, String element, FieldDTO fieldDTO) throws XMLStreamException {
+    private static void writeMultipleElement(XMLStreamWriter xmlw, String element, FieldDTO fieldDTO, String lang) throws XMLStreamException {
         for (String value : fieldDTO.getMultiplePrimitive()) {
-            writeFullElement(xmlw, element, value);
+            //Write multiple lang vals for controlled vocab, otherwise don't include any lang tag
+            XmlWriterUtil.writeFullElement(xmlw, element, value, fieldDTO.isControlledVocabularyField() ? lang : null);
         }
     }
     
     private static void writeDateElement(XMLStreamWriter xmlw, String element, String cycle, String event, String dateIn) throws XMLStreamException {
 
         xmlw.writeStartElement(element);
-        writeAttribute(xmlw, "cycle",  cycle);
-        writeAttribute(xmlw, "event", event);
-        writeAttribute(xmlw, "date", dateIn);
+        XmlWriterUtil.writeAttribute(xmlw, "cycle",  cycle);
+        XmlWriterUtil.writeAttribute(xmlw, "event", event);
+        XmlWriterUtil.writeAttribute(xmlw, "date", dateIn);
         xmlw.writeCharacters(dateIn);
         xmlw.writeEndElement(); 
 
     }
     
-    private static void writeMethodElement(XMLStreamWriter xmlw , DatasetVersionDTO version) throws XMLStreamException{
+    /**
+     * Again, <dataColl> is an xs:sequence - order is important and must follow
+     * the schema. -L.A.
+     * <xs:sequence>
+     * <xs:element ref="timeMeth" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="dataCollector" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="collectorTraining" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="frequenc" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="sampProc" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="sampleFrame" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="targetSampleSize" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="deviat" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="collMode" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="resInstru" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="instrumentDevelopment" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="sources" minOccurs="0"/>
+     * <xs:element ref="collSitu" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="actMin" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="ConOps" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="weight" minOccurs="0" maxOccurs="unbounded"/>
+     * <xs:element ref="cleanOps" minOccurs="0" maxOccurs="unbounded"/>
+     * </xs:sequence>
+     */
+    private static void writeMethodElement(XMLStreamWriter xmlw , DatasetVersionDTO version, String lang) throws XMLStreamException{
         xmlw.writeStartElement("method");
         xmlw.writeStartElement("dataColl");
-        writeFullElement(xmlw, "timeMeth", dto2Primitive(version, DatasetFieldConstant.timeMethod)); 
-        writeFullElement(xmlw, "dataCollector", dto2Primitive(version, DatasetFieldConstant.dataCollector));         
-        writeFullElement(xmlw, "collectorTraining", dto2Primitive(version, DatasetFieldConstant.collectorTraining));   
-        writeFullElement(xmlw, "frequenc", dto2Primitive(version, DatasetFieldConstant.frequencyOfDataCollection));      
-        writeFullElement(xmlw, "sampProc", dto2Primitive(version, DatasetFieldConstant.samplingProcedure));  
+        XmlWriterUtil.writeI18NElement(xmlw, "timeMeth", version, DatasetFieldConstant.timeMethod,lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "dataCollector", version, DatasetFieldConstant.dataCollector, lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "collectorTraining", version, DatasetFieldConstant.collectorTraining, lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "frequenc", version, DatasetFieldConstant.frequencyOfDataCollection, lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "sampProc", version, DatasetFieldConstant.samplingProcedure, lang);
+
         writeTargetSampleElement(xmlw, version);
-        writeFullElement(xmlw, "deviat", dto2Primitive(version, DatasetFieldConstant.deviationsFromSampleDesign)); 
-        writeFullElement(xmlw, "collMode", dto2Primitive(version, DatasetFieldConstant.collectionMode)); 
-        writeFullElement(xmlw, "resInstru", dto2Primitive(version, DatasetFieldConstant.researchInstrument)); 
-        writeFullElement(xmlw, "collSitu", dto2Primitive(version, DatasetFieldConstant.dataCollectionSituation)); 
-        writeFullElement(xmlw, "actMin", dto2Primitive(version, DatasetFieldConstant.actionsToMinimizeLoss));
-        writeFullElement(xmlw, "conOps", dto2Primitive(version, DatasetFieldConstant.controlOperations));  
-        writeFullElement(xmlw, "weight", dto2Primitive(version, DatasetFieldConstant.weighting));  
-        writeFullElement(xmlw, "cleanOps", dto2Primitive(version, DatasetFieldConstant.cleaningOperations));
+
+        XmlWriterUtil.writeI18NElement(xmlw, "deviat", version, DatasetFieldConstant.deviationsFromSampleDesign, lang);
+
+        /* <collMode> comes before <sources>: */
+        FieldDTO collModeFieldDTO = dto2FieldDTO(version, DatasetFieldConstant.collectionMode, "socialscience");
+        if (collModeFieldDTO != null) {
+            // This field was made multiple as of 5.10
+            // Below is a backward compatibility check allowing export to work in 
+            // an instance where the metadata block has not been updated yet.
+            if (collModeFieldDTO.getMultiple()) {
+                XmlWriterUtil.writeI18NElementList(xmlw, "collMode", collModeFieldDTO.getMultipleVocab(), DatasetFieldConstant.collectionMode, collModeFieldDTO.getTypeClass(), "socialscience", lang);
+            } else {
+                XmlWriterUtil.writeI18NElement(xmlw, "collMode", version, DatasetFieldConstant.collectionMode, lang);
+            }
+        }
+        /* and so does <resInstru>: */
+        XmlWriterUtil.writeI18NElement(xmlw, "resInstru", version, DatasetFieldConstant.researchInstrument, lang);
+        xmlw.writeStartElement("sources");
+        XmlWriterUtil.writeFullElementList(xmlw, "dataSrc", dto2PrimitiveList(version, DatasetFieldConstant.dataSources));
+        XmlWriterUtil.writeI18NElement(xmlw, "srcOrig", version, DatasetFieldConstant.originOfSources, lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "srcChar", version, DatasetFieldConstant.characteristicOfSources, lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "srcDocu", version, DatasetFieldConstant.accessToSources, lang);
+        xmlw.writeEndElement(); //sources
+
+        
+        XmlWriterUtil.writeI18NElement(xmlw, "collSitu", version, DatasetFieldConstant.dataCollectionSituation, lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "actMin", version, DatasetFieldConstant.actionsToMinimizeLoss, lang);
+        /* "<ConOps>" has the uppercase C: */
+        XmlWriterUtil.writeI18NElement(xmlw, "ConOps", version, DatasetFieldConstant.controlOperations, lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "weight", version, DatasetFieldConstant.weighting, lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "cleanOps", version, DatasetFieldConstant.cleaningOperations, lang);
 
         xmlw.writeEndElement(); //dataColl
+        /* <notes> before <anlyInfo>: */
+        writeNotesElement(xmlw, version);
+
         xmlw.writeStartElement("anlyInfo");
-        writeFullElement(xmlw, "anylInfo", dto2Primitive(version, DatasetFieldConstant.datasetLevelErrorNotes));
-        writeFullElement(xmlw, "respRate", dto2Primitive(version, DatasetFieldConstant.responseRate));  
-        writeFullElement(xmlw, "estSmpErr", dto2Primitive(version, DatasetFieldConstant.samplingErrorEstimates));  
-        writeFullElement(xmlw, "dataAppr", dto2Primitive(version, DatasetFieldConstant.otherDataAppraisal)); 
+        //XmlWriterUtil.writeFullElement(xmlw, "anylInfo", dto2Primitive(version, DatasetFieldConstant.datasetLevelErrorNotes));
+        XmlWriterUtil.writeI18NElement(xmlw, "respRate", version, DatasetFieldConstant.responseRate, lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "EstSmpErr", version, DatasetFieldConstant.samplingErrorEstimates, lang);
+        XmlWriterUtil.writeI18NElement(xmlw, "dataAppr", version, DatasetFieldConstant.otherDataAppraisal, lang);
         xmlw.writeEndElement(); //anlyInfo
-        writeNotesElement(xmlw, version);
         
         xmlw.writeEndElement();//method
     }
     
-    private static void writeSubjectElement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO) throws XMLStreamException{ 
+    private static void writeSubjectElement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO, String lang) throws XMLStreamException{ 
         
         //Key Words and Topic Classification
-        
-        xmlw.writeStartElement("subject");        
+        Locale defaultLocale = Locale.getDefault();
+        xmlw.writeStartElement("subject");
         for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
             String key = entry.getKey();
             MetadataBlockDTO value = entry.getValue();
-            if ("citation".equals(key)) {
+            if (CITATION_BLOCK_NAME.equals(key)) {
                 for (FieldDTO fieldDTO : value.getFields()) {
-                    if (DatasetFieldConstant.subject.equals(fieldDTO.getTypeName())){
-                        for ( String subject : fieldDTO.getMultipleVocab()){
-                            xmlw.writeStartElement("keyword");
-                            xmlw.writeCharacters(subject);
-                            xmlw.writeEndElement(); //Keyword
-                        }
+                    if (DatasetFieldConstant.subject.equals(fieldDTO.getTypeName())) {
+                        XmlWriterUtil.writeI18NElementList(xmlw, "keyword", fieldDTO.getMultipleVocab(), "subject",
+                                fieldDTO.getTypeClass(), "citation", lang);
                     }
-                    
+
                     if (DatasetFieldConstant.keyword.equals(fieldDTO.getTypeName())) {
+                        boolean isCVV = false;
                         for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
                             String keywordValue = "";
                             String keywordVocab = "";
@@ -492,30 +791,49 @@ private static void writeSubjectElement(XMLStreamWriter xmlw, DatasetVersionDTO
                             for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
                                 FieldDTO next = iterator.next();
                                 if (DatasetFieldConstant.keywordValue.equals(next.getTypeName())) {
-                                    keywordValue =  next.getSinglePrimitive();
+                                    if (next.isControlledVocabularyField()) {
+                                        isCVV = true;
+                                    }
+                                    keywordValue = next.getSinglePrimitive();
                                 }
                                 if (DatasetFieldConstant.keywordVocab.equals(next.getTypeName())) {
-                                    keywordVocab =  next.getSinglePrimitive();
+                                    keywordVocab = next.getSinglePrimitive();
                                 }
                                 if (DatasetFieldConstant.keywordVocabURI.equals(next.getTypeName())) {
-                                    keywordURI =  next.getSinglePrimitive();
+                                    keywordURI = next.getSinglePrimitive();
                                 }
                             }
-                            if (!keywordValue.isEmpty()){
-                                xmlw.writeStartElement("keyword"); 
-                                if(!keywordVocab.isEmpty()){
-                                   writeAttribute(xmlw,"vocab",keywordVocab); 
+                            if (!keywordValue.isEmpty()) {
+                                xmlw.writeStartElement("keyword");
+                                XmlWriterUtil.writeAttribute(xmlw, "vocab", keywordVocab);
+                                XmlWriterUtil.writeAttribute(xmlw, "vocabURI", keywordURI);
+                                if (lang != null && isCVV) {
+                                    XmlWriterUtil.writeAttribute(xmlw, "xml:lang", defaultLocale.getLanguage());
+                                    xmlw.writeCharacters(ControlledVocabularyValue.getLocaleStrValue(keywordValue,
+                                            DatasetFieldConstant.keywordValue, CITATION_BLOCK_NAME, defaultLocale,
+                                            true));
+                                } else {
+                                    xmlw.writeCharacters(keywordValue);
+                                }
+                                xmlw.writeEndElement(); // Keyword
+                                if (lang != null && isCVV && !defaultLocale.getLanguage().equals(lang)) {
+                                    String translatedValue = ControlledVocabularyValue.getLocaleStrValue(keywordValue,
+                                            DatasetFieldConstant.keywordValue, CITATION_BLOCK_NAME, new Locale(lang),
+                                            false);
+                                    if (translatedValue != null) {
+                                        xmlw.writeStartElement("keyword");
+                                        XmlWriterUtil.writeAttribute(xmlw, "vocab", keywordVocab);
+                                        XmlWriterUtil.writeAttribute(xmlw, "vocabURI", keywordURI);
+                                        XmlWriterUtil.writeAttribute(xmlw, "xml:lang", lang);
+                                        xmlw.writeCharacters(translatedValue);
+                                        xmlw.writeEndElement(); // Keyword
+                                    }
                                 }
-                                if(!keywordURI.isEmpty()){
-                                   writeAttribute(xmlw,"URI",keywordURI); 
-                                } 
-                                xmlw.writeCharacters(keywordValue);
-                                xmlw.writeEndElement(); //Keyword
                             }
-
                         }
                     }
                     if (DatasetFieldConstant.topicClassification.equals(fieldDTO.getTypeName())) {
+                        boolean isCVV = false;
                         for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
                             String topicClassificationValue = "";
                             String topicClassificationVocab = "";
@@ -523,43 +841,64 @@ private static void writeSubjectElement(XMLStreamWriter xmlw, DatasetVersionDTO
                             for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
                                 FieldDTO next = iterator.next();
                                 if (DatasetFieldConstant.topicClassValue.equals(next.getTypeName())) {
-                                    topicClassificationValue =  next.getSinglePrimitive();
+                                    // Currently getSingleVocab() is the same as getSinglePrimitive() so this works
+                                    // for either case
+                                    topicClassificationValue = next.getSinglePrimitive();
+                                    if (next.isControlledVocabularyField()) {
+                                        isCVV = true;
+                                    }
                                 }
                                 if (DatasetFieldConstant.topicClassVocab.equals(next.getTypeName())) {
-                                    topicClassificationVocab =  next.getSinglePrimitive();
+                                    topicClassificationVocab = next.getSinglePrimitive();
                                 }
                                 if (DatasetFieldConstant.topicClassVocabURI.equals(next.getTypeName())) {
-                                    topicClassificationURI =  next.getSinglePrimitive();
+                                    topicClassificationURI = next.getSinglePrimitive();
                                 }
                             }
-                            if (!topicClassificationValue.isEmpty()){
-                                xmlw.writeStartElement("topcClas"); 
-                                if(!topicClassificationVocab.isEmpty()){
-                                   writeAttribute(xmlw,"vocab",topicClassificationVocab); 
-                                } 
-                                if(!topicClassificationURI.isEmpty()){
-                                   writeAttribute(xmlw,"URI",topicClassificationURI); 
-                                } 
-                                xmlw.writeCharacters(topicClassificationValue);
-                                xmlw.writeEndElement(); //topcClas
+                            if (!topicClassificationValue.isEmpty()) {
+                                xmlw.writeStartElement("topcClas");
+                                XmlWriterUtil.writeAttribute(xmlw, "vocab", topicClassificationVocab);
+                                XmlWriterUtil.writeAttribute(xmlw, "vocabURI", topicClassificationURI);
+                                if (lang != null && isCVV) {
+                                    XmlWriterUtil.writeAttribute(xmlw, "xml:lang", defaultLocale.getLanguage());
+                                    xmlw.writeCharacters(ControlledVocabularyValue.getLocaleStrValue(
+                                            topicClassificationValue, DatasetFieldConstant.topicClassValue,
+                                            CITATION_BLOCK_NAME, defaultLocale, true));
+                                } else {
+                                    xmlw.writeCharacters(topicClassificationValue);
+                                }
+                                xmlw.writeEndElement(); // topcClas
+                                if (lang != null && isCVV && !defaultLocale.getLanguage().equals(lang)) {
+                                    String translatedValue = ControlledVocabularyValue.getLocaleStrValue(
+                                            topicClassificationValue, DatasetFieldConstant.topicClassValue,
+                                            CITATION_BLOCK_NAME, new Locale(lang), false);
+                                    if (translatedValue != null) {
+                                        xmlw.writeStartElement("topcClas");
+                                        XmlWriterUtil.writeAttribute(xmlw, "vocab", topicClassificationVocab);
+                                        XmlWriterUtil.writeAttribute(xmlw, "vocabURI", topicClassificationURI);
+                                        XmlWriterUtil.writeAttribute(xmlw, "xml:lang", lang);
+                                        xmlw.writeCharacters(translatedValue);
+                                        xmlw.writeEndElement(); // topcClas
+                                    }
+                                }
                             }
                         }
                     }
                 }
             }
-        }        
+        }
         xmlw.writeEndElement(); // subject       
     }
-    
+
     private static void writeAuthorsElement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO) throws XMLStreamException {
 
         for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
             String key = entry.getKey();
             MetadataBlockDTO value = entry.getValue();
             if ("citation".equals(key)) {
+                xmlw.writeStartElement("rspStmt");
                 for (FieldDTO fieldDTO : value.getFields()) {
                     if (DatasetFieldConstant.author.equals(fieldDTO.getTypeName())) {
-                        xmlw.writeStartElement("rspStmt");
                         String authorName = "";
                         String authorAffiliation = "";
                         for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
@@ -574,17 +913,37 @@ private static void writeAuthorsElement(XMLStreamWriter xmlw, DatasetVersionDTO
                             }
                             if (!authorName.isEmpty()){
                                 xmlw.writeStartElement("AuthEnty"); 
-                                if(!authorAffiliation.isEmpty()){
-                                   writeAttribute(xmlw,"affiliation",authorAffiliation); 
-                                } 
+                                XmlWriterUtil.writeAttribute(xmlw,"affiliation",authorAffiliation);
                                 xmlw.writeCharacters(authorName);
                                 xmlw.writeEndElement(); //AuthEnty
                             }
                         }
-                        xmlw.writeEndElement(); //rspStmt
+
+                    } else if (DatasetFieldConstant.contributor.equals(fieldDTO.getTypeName())) {
+                        String contributorName = "";
+                        String contributorType = "";
+                        for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
+                            for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
+                                FieldDTO next = iterator.next();
+                                if (DatasetFieldConstant.contributorName.equals(next.getTypeName())) {
+                                    contributorName =  next.getSinglePrimitive();
+                                }
+                                if (DatasetFieldConstant.contributorType.equals(next.getTypeName())) {
+                                    contributorType =  next.getSinglePrimitive();
+                                }
+                            }
+                            if (!contributorName.isEmpty()){
+                                xmlw.writeStartElement("othId");
+                                XmlWriterUtil.writeAttribute(xmlw,"role", contributorType);
+                                xmlw.writeCharacters(contributorName);
+                                xmlw.writeEndElement(); //othId
+                            }
+                        }
                     }
                 }
+                xmlw.writeEndElement(); //rspStmt
             }
+
         }
     }
     
@@ -615,12 +974,8 @@ private static void writeContactsElement(XMLStreamWriter xmlw, DatasetVersionDTO
                             // TODO: Since datasetContactEmail is a required field but datasetContactName is not consider not checking if datasetContactName is empty so we can write out datasetContactEmail.
                             if (!datasetContactName.isEmpty()){
                                 xmlw.writeStartElement("contact"); 
-                                if(!datasetContactAffiliation.isEmpty()){
-                                   writeAttribute(xmlw,"affiliation",datasetContactAffiliation); 
-                                } 
-                                if(!datasetContactEmail.isEmpty()){
-                                   writeAttribute(xmlw,"email",datasetContactEmail); 
-                                } 
+                                XmlWriterUtil.writeAttribute(xmlw,"affiliation",datasetContactAffiliation);
+                                XmlWriterUtil.writeAttribute(xmlw,"email",datasetContactEmail);
                                 xmlw.writeCharacters(datasetContactName);
                                 xmlw.writeEndElement(); //AuthEnty
                             }
@@ -646,7 +1001,6 @@ private static void writeProducersElement(XMLStreamWriter xmlw, DatasetVersionDT
                             String producerAffiliation = "";
                             String producerAbbreviation = "";
                             String producerLogo = "";
-                            String producerURL = "";
                             for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
                                 FieldDTO next = iterator.next();
                                 if (DatasetFieldConstant.producerName.equals(next.getTypeName())) {
@@ -661,25 +1015,12 @@ private static void writeProducersElement(XMLStreamWriter xmlw, DatasetVersionDT
                                 if (DatasetFieldConstant.producerLogo.equals(next.getTypeName())) {
                                     producerLogo = next.getSinglePrimitive();
                                 }
-                                if (DatasetFieldConstant.producerURL.equals(next.getTypeName())) {
-                                    producerURL = next.getSinglePrimitive();
-
-                                }
                             }
                             if (!producerName.isEmpty()) {
                                 xmlw.writeStartElement("producer");
-                                if (!producerAffiliation.isEmpty()) {
-                                    writeAttribute(xmlw, "affiliation", producerAffiliation);
-                                }
-                                if (!producerAbbreviation.isEmpty()) {
-                                    writeAttribute(xmlw, "abbr", producerAbbreviation);
-                                }
-                                if (!producerLogo.isEmpty()) {
-                                    writeAttribute(xmlw, "role", producerLogo);
-                                }
-                                if (!producerURL.isEmpty()) {
-                                    writeAttribute(xmlw, "URI", producerURL);
-                                }
+                                XmlWriterUtil.writeAttribute(xmlw, "affiliation", producerAffiliation);
+                                XmlWriterUtil.writeAttribute(xmlw, "abbr", producerAbbreviation);
+                                //XmlWriterUtil.writeAttribute(xmlw, "role", producerLogo);
                                 xmlw.writeCharacters(producerName);
                                 xmlw.writeEndElement(); //AuthEnty
                             }
@@ -689,27 +1030,34 @@ private static void writeProducersElement(XMLStreamWriter xmlw, DatasetVersionDT
                 }
             }
         }
-        writeFullElement(xmlw, "prodDate", dto2Primitive(version, DatasetFieldConstant.productionDate));    
-        writeFullElement(xmlw, "prodPlac", dto2Primitive(version, DatasetFieldConstant.productionPlace));
+        XmlWriterUtil.writeFullElement(xmlw, "prodDate", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.productionDate));
+        // productionPlace was made multiple as of 5.14:
+        // (a quick backward compatibility check was added to dto2PrimitiveList(),
+        // see the method for details)
+
+        FieldDTO  prodPlac = dto2FieldDTO( version, DatasetFieldConstant.productionPlace, "citation"  );
+        if (prodPlac != null) {
+            writeMultipleElement(xmlw, "prodPlac", prodPlac, null);
+        }
+        writeSoftwareElement(xmlw, version);
   
         writeGrantElement(xmlw, version);
         xmlw.writeEndElement(); //prodStmt
     }
     
-    private static void writeDistributorsElement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO) throws XMLStreamException {
+    private static void writeDistributorsElement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO, String lang) throws XMLStreamException {
         for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
             String key = entry.getKey();
             MetadataBlockDTO value = entry.getValue();
             if ("citation".equals(key)) {
                 for (FieldDTO fieldDTO : value.getFields()) {
                     if (DatasetFieldConstant.distributor.equals(fieldDTO.getTypeName())) {
-                        xmlw.writeStartElement("distrbtr");
+                        //xmlw.writeStartElement("distrbtr");
                         for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
                             String distributorName = "";
                             String distributorAffiliation = "";
                             String distributorAbbreviation = "";
                             String distributorURL = "";
-                            String distributorLogoURL = "";
                             for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
                                 FieldDTO next = iterator.next();
                                 if (DatasetFieldConstant.distributorName.equals(next.getTypeName())) {
@@ -724,30 +1072,22 @@ private static void writeDistributorsElement(XMLStreamWriter xmlw, DatasetVersio
                                 if (DatasetFieldConstant.distributorURL.equals(next.getTypeName())) {
                                     distributorURL = next.getSinglePrimitive();
                                 }
-                                if (DatasetFieldConstant.distributorLogo.equals(next.getTypeName())) {
-                                    distributorLogoURL = next.getSinglePrimitive();
-                                }
                             }
                             if (!distributorName.isEmpty()) {
                                 xmlw.writeStartElement("distrbtr");
-                                if (!distributorAffiliation.isEmpty()) {
-                                    writeAttribute(xmlw, "affiliation", distributorAffiliation);
-                                }
-                                if (!distributorAbbreviation.isEmpty()) {
-                                    writeAttribute(xmlw, "abbr", distributorAbbreviation);
-                                }
-                                if (!distributorURL.isEmpty()) {
-                                    writeAttribute(xmlw, "URI", distributorURL);
-                                }
-                                if (!distributorLogoURL.isEmpty()) {
-                                    writeAttribute(xmlw, "role", distributorLogoURL);
+                                if(DvObjectContainer.isMetadataLanguageSet(lang)) {
+                                    xmlw.writeAttribute("xml:lang", lang);
                                 }
+                                XmlWriterUtil.writeAttribute(xmlw, "affiliation", distributorAffiliation);
+                                XmlWriterUtil.writeAttribute(xmlw, "abbr", distributorAbbreviation);
+                                XmlWriterUtil.writeAttribute(xmlw, "URI", distributorURL);
                                 xmlw.writeCharacters(distributorName);
                                 xmlw.writeEndElement(); //AuthEnty
                             }
                         }
-                        xmlw.writeEndElement(); //rspStmt
+                        //xmlw.writeEndElement(); //rspStmt
                     }
+
                 }
             }
         }
@@ -781,12 +1121,44 @@ private static void writeRelPublElement(XMLStreamWriter xmlw, DatasetVersionDTO
                                     url =  next.getSinglePrimitive();
                                 }
                             }
-                            pubString = appendCommaSeparatedValue(citation, IDType);
-                            pubString = appendCommaSeparatedValue(pubString, IDNo);
-                            pubString = appendCommaSeparatedValue(pubString, url);
-                            if (!pubString.isEmpty()){
-                                xmlw.writeStartElement("relPubl"); 
-                                xmlw.writeCharacters(pubString);
+                            if (citation != null && !citation.trim().equals("")) {
+                                xmlw.writeStartElement("relPubl");
+                                xmlw.writeStartElement("citation");
+                                /* <xs:sequence>
+                                    <xs:element ref="titlStmt"/>
+                                    <xs:element ref="rspStmt" minOccurs="0"/>
+                                    <xs:element ref="prodStmt" minOccurs="0"/>
+                                    <xs:element ref="distStmt" minOccurs="0"/>
+                                    <xs:element ref="serStmt" minOccurs="0" maxOccurs="unbounded"/>
+                                    <xs:element ref="verStmt" minOccurs="0" maxOccurs="unbounded"/>
+                                    <xs:element ref="biblCit" minOccurs="0" maxOccurs="unbounded"/>
+                                    <xs:element ref="holdings" minOccurs="0" maxOccurs="unbounded"/>
+                                    <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+                                    <xs:group ref="dc:elementsAndRefinementsGroup"/>
+                                   </xs:sequence>
+                                 (In other words - titlStmt is mandatory! -L.A.)
+                                */
+                                xmlw.writeStartElement("titlStmt");
+                                XmlWriterUtil.writeFullElement(xmlw, "titl", citation);
+                                if (IDNo != null && !IDNo.trim().equals("")) {
+
+                                    xmlw.writeStartElement("IDNo");
+                                    if (IDType != null && !IDType.trim().equals("")) {
+                                        xmlw.writeAttribute("agency", IDType);
+                                    }
+                                    xmlw.writeCharacters(IDNo);
+                                    xmlw.writeEndElement(); //IDNo
+                                }
+                                xmlw.writeEndElement(); // titlStmt
+
+
+                                XmlWriterUtil.writeFullElement(xmlw,"biblCit",citation);
+                                xmlw.writeEndElement(); //citation
+                                if (url != null && !url.trim().equals("") ) {
+                                    xmlw.writeStartElement("ExtLink");
+                                    xmlw.writeAttribute("URI", url);
+                                    xmlw.writeEndElement(); //ExtLink
+                                }
                                 xmlw.writeEndElement(); //relPubl
                             }
                         }
@@ -807,7 +1179,7 @@ private static String appendCommaSeparatedValue(String inVal, String next) {
         return inVal;
     }
     
-    private static void writeAbstractElement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO) throws XMLStreamException {
+    private static void writeAbstractElement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO, String lang) throws XMLStreamException {
         for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
             String key = entry.getKey();
             MetadataBlockDTO value = entry.getValue();
@@ -828,9 +1200,10 @@ private static void writeAbstractElement(XMLStreamWriter xmlw, DatasetVersionDTO
                             }
                             if (!descriptionText.isEmpty()){
                                 xmlw.writeStartElement("abstract"); 
-                                if(!descriptionDate.isEmpty()){
-                                   writeAttribute(xmlw,"date",descriptionDate); 
-                                } 
+                                XmlWriterUtil.writeAttribute(xmlw,"date",descriptionDate);
+                                if(DvObjectContainer.isMetadataLanguageSet(lang)) {
+                                    xmlw.writeAttribute("xml:lang", lang);
+                                }
                                 xmlw.writeCharacters(descriptionText);
                                 xmlw.writeEndElement(); //abstract
                             }
@@ -862,9 +1235,7 @@ private static void writeGrantElement(XMLStreamWriter xmlw, DatasetVersionDTO da
                             }
                             if (!grantNumber.isEmpty()){
                                 xmlw.writeStartElement("grantNo"); 
-                                if(!grantAgency.isEmpty()){
-                                   writeAttribute(xmlw,"agency",grantAgency); 
-                                } 
+                                XmlWriterUtil.writeAttribute(xmlw,"agency",grantAgency);
                                 xmlw.writeCharacters(grantNumber);
                                 xmlw.writeEndElement(); //grantno
                             }
@@ -896,9 +1267,7 @@ private static void writeOtherIdElement(XMLStreamWriter xmlw, DatasetVersionDTO
                             }
                             if (!otherId.isEmpty()){
                                 xmlw.writeStartElement("IDNo"); 
-                                if(!otherIdAgency.isEmpty()){
-                                   writeAttribute(xmlw,"agency",otherIdAgency); 
-                                } 
+                                XmlWriterUtil.writeAttribute(xmlw,"agency",otherIdAgency);
                                 xmlw.writeCharacters(otherId);
                                 xmlw.writeEndElement(); //IDNo
                             }
@@ -930,9 +1299,7 @@ private static void writeSoftwareElement(XMLStreamWriter xmlw, DatasetVersionDTO
                             }
                             if (!softwareName.isEmpty()){
                                 xmlw.writeStartElement("software"); 
-                                if(!softwareVersion.isEmpty()){
-                                   writeAttribute(xmlw,"version",softwareVersion); 
-                                } 
+                                XmlWriterUtil.writeAttribute(xmlw,"version",softwareVersion);
                                 xmlw.writeCharacters(softwareName);
                                 xmlw.writeEndElement(); //software
                             }
@@ -947,33 +1314,34 @@ private static void writeSeriesElement(XMLStreamWriter xmlw, DatasetVersionDTO d
         for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
             String key = entry.getKey();
             MetadataBlockDTO value = entry.getValue();
-            if ("citation".equals(key)) {
+            if ("citation".equals(key)) {               
                 for (FieldDTO fieldDTO : value.getFields()) {
                     if (DatasetFieldConstant.series.equals(fieldDTO.getTypeName())) {
-                        xmlw.writeStartElement("serStmt");                        
                         String seriesName = "";
                         String seriesInformation = "";
-                        Set<FieldDTO> foo = fieldDTO.getSingleCompound();
+                        for (HashSet<FieldDTO> foo : fieldDTO.getMultipleCompound()) {
+                            xmlw.writeStartElement("serStmt");
                             for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
                                 FieldDTO next = iterator.next();
                                 if (DatasetFieldConstant.seriesName.equals(next.getTypeName())) {
-                                    seriesName =  next.getSinglePrimitive();
+                                    seriesName = next.getSinglePrimitive();
                                 }
                                 if (DatasetFieldConstant.seriesInformation.equals(next.getTypeName())) {
-                                    seriesInformation =  next.getSinglePrimitive();
+                                    seriesInformation = next.getSinglePrimitive();
                                 }
                             }
-                            if (!seriesName.isEmpty()){
-                                xmlw.writeStartElement("serName"); 
+                            if (!seriesName.isEmpty()) {
+                                xmlw.writeStartElement("serName");
                                 xmlw.writeCharacters(seriesName);
-                                xmlw.writeEndElement(); //grantno
+                                xmlw.writeEndElement(); //serName
                             }
-                            if (!seriesInformation.isEmpty()){
-                                xmlw.writeStartElement("serInfo"); 
+                            if (!seriesInformation.isEmpty()) {
+                                xmlw.writeStartElement("serInfo");
                                 xmlw.writeCharacters(seriesInformation);
-                                xmlw.writeEndElement(); //grantno
+                                xmlw.writeEndElement(); //serInfo
                             }
-                        xmlw.writeEndElement(); //serStmt
+                            xmlw.writeEndElement(); //serStmt
+                        }
                     }
                 }
             }
@@ -987,6 +1355,7 @@ private static void writeTargetSampleElement(XMLStreamWriter xmlw, DatasetVersio
             if ("socialscience".equals(key)) {
                 for (FieldDTO fieldDTO : value.getFields()) {
                     if (DatasetFieldConstant.targetSampleSize.equals(fieldDTO.getTypeName())) {
+                        xmlw.writeStartElement("targetSampleSize");
                         String sizeFormula = "";
                         String actualSize = "";
                         Set<FieldDTO> foo = fieldDTO.getSingleCompound();
@@ -999,16 +1368,19 @@ private static void writeTargetSampleElement(XMLStreamWriter xmlw, DatasetVersio
                                 actualSize = next.getSinglePrimitive();
                             }
                         }
-                        if (!sizeFormula.isEmpty()) {
-                            xmlw.writeStartElement("sampleSizeFormula");
-                            xmlw.writeCharacters(sizeFormula);
-                            xmlw.writeEndElement(); //sampleSizeFormula
-                        }
+                        /* <sampleSize> must come before <sampleSizeFormula>! -L.A. */
                         if (!actualSize.isEmpty()) {
                             xmlw.writeStartElement("sampleSize");
                             xmlw.writeCharacters(actualSize);
                             xmlw.writeEndElement(); //sampleSize
                         }
+                        if (!sizeFormula.isEmpty()) {
+                            xmlw.writeStartElement("sampleSizeFormula");
+                            xmlw.writeCharacters(sizeFormula);
+                            xmlw.writeEndElement(); //sampleSizeFormula
+                        }
+                        
+                        xmlw.writeEndElement(); // targetSampleSize
                     }
                 }
             }
@@ -1040,12 +1412,8 @@ private static void writeNotesElement(XMLStreamWriter xmlw, DatasetVersionDTO da
                         }
                         if (!notesText.isEmpty()) {
                             xmlw.writeStartElement("notes");
-                                if(!notesType.isEmpty()){
-                                   writeAttribute(xmlw,"type",notesType); 
-                                } 
-                                if(!notesSubject.isEmpty()){
-                                   writeAttribute(xmlw,"subject",notesSubject); 
-                                } 
+                            XmlWriterUtil.writeAttribute(xmlw,"type",notesType);
+                            XmlWriterUtil.writeAttribute(xmlw,"subject",notesSubject);
                             xmlw.writeCharacters(notesText);
                             xmlw.writeEndElement(); 
                         }
@@ -1061,7 +1429,7 @@ private static void writeNotesElement(XMLStreamWriter xmlw, DatasetVersionDTO da
     // harvesting *all* files are encoded as otherMats; even tabular ones.
     private static void createOtherMats(XMLStreamWriter xmlw, List<FileDTO> fileDtos) throws XMLStreamException {
         // The preferred URL for this dataverse, for cooking up the file access API links:
-        String dataverseUrl = getDataverseSiteUrl();
+        String dataverseUrl = SystemConfig.getDataverseSiteUrlStatic();
         
         for (FileDTO fileDTo : fileDtos) {
             // We'll continue using the scheme we've used before, in DVN2-3: non-tabular files are put into otherMat,
@@ -1069,14 +1437,14 @@ private static void createOtherMats(XMLStreamWriter xmlw, List<FileDTO> fileDtos
             // and observations, etc.)
             if (fileDTo.getDataFile().getDataTables() == null || fileDTo.getDataFile().getDataTables().isEmpty()) {
                 xmlw.writeStartElement("otherMat");
-                writeAttribute(xmlw, "ID", "f" + fileDTo.getDataFile().getId());
+                XmlWriterUtil.writeAttribute(xmlw, "ID", "f" + fileDTo.getDataFile().getId());
                 String pidURL = fileDTo.getDataFile().getPidURL();
                 if (pidURL != null && !pidURL.isEmpty()){
-                    writeAttribute(xmlw, "URI", pidURL);
+                    xmlw.writeAttribute("URI", pidURL);
                 } else {
-                    writeAttribute(xmlw, "URI", dataverseUrl + "/api/access/datafile/" + fileDTo.getDataFile().getId());
+                    xmlw.writeAttribute("URI", dataverseUrl + "/api/access/datafile/" + fileDTo.getDataFile().getId());
                 }
-                writeAttribute(xmlw, "level", "datafile");
+                xmlw.writeAttribute("level", "datafile");
                 xmlw.writeStartElement("labl");
                 xmlw.writeCharacters(fileDTo.getDataFile().getFilename());
                 xmlw.writeEndElement(); // labl
@@ -1087,9 +1455,9 @@ private static void createOtherMats(XMLStreamWriter xmlw, List<FileDTO> fileDtos
                 String contentType = fileDTo.getDataFile().getContentType();
                 if (!StringUtilisEmpty(contentType)) {
                     xmlw.writeStartElement("notes");
-                    writeAttribute(xmlw, "level", LEVEL_FILE);
-                    writeAttribute(xmlw, "type", NOTE_TYPE_CONTENTTYPE);
-                    writeAttribute(xmlw, "subject", NOTE_SUBJECT_CONTENTTYPE);
+                    xmlw.writeAttribute("level", LEVEL_FILE);
+                    xmlw.writeAttribute("type", NOTE_TYPE_CONTENTTYPE);
+                    xmlw.writeAttribute("subject", NOTE_SUBJECT_CONTENTTYPE);
                     xmlw.writeCharacters(contentType);
                     xmlw.writeEndElement(); // notes
                 }
@@ -1106,46 +1474,43 @@ private static void createOtherMats(XMLStreamWriter xmlw, List<FileDTO> fileDtos
     // otherMat, or a fileDscr section. 
     // -- L.A. 4.5 
     
-    private static void createOtherMatsFromFileMetadatas(XMLStreamWriter xmlw, List<FileMetadata> fileMetadatas) throws XMLStreamException {
+    private static void createOtherMatsFromFileMetadatas(XMLStreamWriter xmlw, JsonArray fileDetails) throws XMLStreamException {
         // The preferred URL for this dataverse, for cooking up the file access API links:
-        String dataverseUrl = getDataverseSiteUrl();
+        String dataverseUrl = SystemConfig.getDataverseSiteUrlStatic();
         
-        for (FileMetadata fileMetadata : fileMetadatas) {
+        for (int i=0;i<fileDetails.size();i++) {
+            JsonObject fileJson = fileDetails.getJsonObject(i);
             // We'll continue using the scheme we've used before, in DVN2-3: non-tabular files are put into otherMat,
             // tabular ones - in fileDscr sections. (fileDscr sections have special fields for numbers of variables
             // and observations, etc.)
-            if (fileMetadata.getDataFile() != null && !fileMetadata.getDataFile().isTabularData()) {
+            if (!fileJson.containsKey("dataTables")) {
                 xmlw.writeStartElement("otherMat");
-                writeAttribute(xmlw, "ID", "f" + fileMetadata.getDataFile().getId());
-                String dfIdentifier = fileMetadata.getDataFile().getIdentifier();
-                if (dfIdentifier != null && !dfIdentifier.isEmpty()){
-                    GlobalId globalId = new GlobalId(fileMetadata.getDataFile());
-                    writeAttribute(xmlw, "URI",  globalId.toURL().toString()); 
+                xmlw.writeAttribute("ID", "f" + fileJson.getJsonNumber(("id").toString()));
+                if (fileJson.containsKey("pidUrl")){
+                    XmlWriterUtil.writeAttribute(xmlw, "URI",  fileJson.getString("pidUrl"));
                 }  else {
-                    writeAttribute(xmlw, "URI", dataverseUrl + "/api/access/datafile/" + fileMetadata.getDataFile().getId()); 
+                    xmlw.writeAttribute("URI", dataverseUrl + "/api/access/datafile/" + fileJson.getJsonNumber("id").toString());
                 }
 
-                writeAttribute(xmlw, "level", "datafile");
+                xmlw.writeAttribute("level", "datafile");
                 xmlw.writeStartElement("labl");
-                xmlw.writeCharacters(fileMetadata.getLabel());
+                xmlw.writeCharacters(fileJson.getString("filename"));
                 xmlw.writeEndElement(); // labl
                 
-                String description = fileMetadata.getDescription();
-                if (description != null) {
+                if (fileJson.containsKey("description")) {
                     xmlw.writeStartElement("txt");
-                    xmlw.writeCharacters(description);
+                    xmlw.writeCharacters(fileJson.getString("description"));
                     xmlw.writeEndElement(); // txt
                 }
                 // there's no readily available field in the othermat section 
                 // for the content type (aka mime type); so we'll store it in this
                 // specially formatted notes section:
-                String contentType = fileMetadata.getDataFile().getContentType();
-                if (!StringUtilisEmpty(contentType)) {
+                if (fileJson.containsKey("contentType")) {
                     xmlw.writeStartElement("notes");
-                    writeAttribute(xmlw, "level", LEVEL_FILE);
-                    writeAttribute(xmlw, "type", NOTE_TYPE_CONTENTTYPE);
-                    writeAttribute(xmlw, "subject", NOTE_SUBJECT_CONTENTTYPE);
-                    xmlw.writeCharacters(contentType);
+                    xmlw.writeAttribute("level", LEVEL_FILE);
+                    xmlw.writeAttribute("type", NOTE_TYPE_CONTENTTYPE);
+                    xmlw.writeAttribute("subject", NOTE_SUBJECT_CONTENTTYPE);
+                    xmlw.writeCharacters(fileJson.getString("contentType"));
                     xmlw.writeEndElement(); // notes
                 }
                 xmlw.writeEndElement(); // otherMat
@@ -1162,55 +1527,40 @@ private static void writeFileDescription(XMLStreamWriter xmlw, FileDTO fileDTo)
         xmlw.writeEndElement(); // txt
     }
     
-    private static String dto2Primitive(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName) {
+
+    
+    private static List<String> dto2PrimitiveList(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName) {
         for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
             MetadataBlockDTO value = entry.getValue();
             for (FieldDTO fieldDTO : value.getFields()) {
                 if (datasetFieldTypeName.equals(fieldDTO.getTypeName())) {
-                    return fieldDTO.getSinglePrimitive();
+                    // This hack is here to make sure the export does not blow 
+                    // up on an instance that upgraded to a Dataverse version
+                    // where a certain primitive has been made multiple, but has
+                    // not yet update the block. 
+                    if (fieldDTO.getMultiple() != null && fieldDTO.getMultiple()) {
+                        return fieldDTO.getMultiplePrimitive();
+                    } else {
+                        return Arrays.asList(fieldDTO.getSinglePrimitive());
+                    }
                 }
             }
         }
         return null;
     }
     
-    private static List<String> dto2PrimitiveList(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName) {
-        for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
-            MetadataBlockDTO value = entry.getValue();
-            for (FieldDTO fieldDTO : value.getFields()) {
+    private static FieldDTO dto2FieldDTO(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName, String metadataBlockName) {
+        MetadataBlockDTO block = datasetVersionDTO.getMetadataBlocks().get(metadataBlockName);
+        if (block != null) {
+            for (FieldDTO fieldDTO : block.getFields()) {
                 if (datasetFieldTypeName.equals(fieldDTO.getTypeName())) {
-                    return fieldDTO.getMultiplePrimitive();
+                    return fieldDTO;
                 }
             }
         }
         return null;
     }
 
-    private static void writeFullElementList(XMLStreamWriter xmlw, String name, List<String> values) throws XMLStreamException {
-        //For the simplest Elements we can 
-        if (values != null && !values.isEmpty()) {
-            for (String value : values) {
-                xmlw.writeStartElement(name);
-                xmlw.writeCharacters(value);
-                xmlw.writeEndElement(); // labl
-            }
-        }
-    }
-    
-    private static void writeFullElement (XMLStreamWriter xmlw, String name, String value) throws XMLStreamException {
-        //For the simplest Elements we can 
-        if (!StringUtilisEmpty(value)) {
-            xmlw.writeStartElement(name);
-            xmlw.writeCharacters(value);
-            xmlw.writeEndElement(); // labl
-        }
-    }
-
-    private static void writeAttribute(XMLStreamWriter xmlw, String name, String value) throws XMLStreamException {
-        if (!StringUtilisEmpty(value)) {
-            xmlw.writeAttribute(name, value);
-        }
-    }
 
     private static boolean StringUtilisEmpty(String str) {
         if (str == null || str.trim().equals("")) {
@@ -1223,33 +1573,6 @@ private static void saveJsonToDisk(String datasetVersionAsJson) throws IOExcepti
         Files.write(Paths.get("/tmp/out.json"), datasetVersionAsJson.getBytes());
     }
     
-    /**
-     * The "official", designated URL of the site;
-     * can be defined as a complete URL; or derived from the 
-     * "official" hostname. If none of these options is set,
-     * defaults to the InetAddress.getLocalHOst() and https;
-     */
-    private static String getDataverseSiteUrl() {
-        String hostUrl = System.getProperty(SITE_URL);
-        if (hostUrl != null && !"".equals(hostUrl)) {
-            return hostUrl;
-        }
-        String hostName = System.getProperty(FQDN);
-        if (hostName == null) {
-            try {
-                hostName = InetAddress.getLocalHost().getCanonicalHostName();
-            } catch (UnknownHostException e) {
-                hostName = null;
-            }
-        }
-        
-        if (hostName != null) {
-            return "https://" + hostName;
-        }
-        
-        return "http://localhost:8080";
-    }
-    
     
     
     
@@ -1265,9 +1588,9 @@ private static String getDataverseSiteUrl() {
     // plus, the structure of file-level metadata is currently being re-designed, 
     // so we probably should not invest any time into it right now). -- L.A. 4.5
     
-    public static void createDataDscr(XMLStreamWriter xmlw, DatasetVersion datasetVersion) throws XMLStreamException {
+    public static void createDataDscr(XMLStreamWriter xmlw, JsonArray fileDetails) throws XMLStreamException {
 
-        if (datasetVersion.getFileMetadatas() == null || datasetVersion.getFileMetadatas().isEmpty()) {
+        if (fileDetails.isEmpty()) {
             return;
         }
 
@@ -1275,22 +1598,46 @@ public static void createDataDscr(XMLStreamWriter xmlw, DatasetVersion datasetVe
 
         // we're not writing the opening <dataDscr> tag until we find an actual 
         // tabular datafile.
-        for (FileMetadata fileMetadata : datasetVersion.getFileMetadatas()) {
-            DataFile dataFile = fileMetadata.getDataFile();
-
-            if (dataFile != null && dataFile.isTabularData()) {
+        for (int i=0;i<fileDetails.size();i++) {
+            JsonObject fileJson = fileDetails.getJsonObject(i);
+
+            /**
+             * Previously (in Dataverse 5.3 and below) the dataDscr section was
+             * included for restricted files but that meant that summary
+             * statistics were exposed. (To get at these statistics, API users
+             * should instead use the "Data Variable Metadata Access" endpoint.)
+             * These days we skip restricted files to avoid this exposure.
+             */
+            if (fileJson.containsKey("restricted") && fileJson.getBoolean("restricted")) {
+                continue;
+            }
+            if(fileJson.containsKey("embargo")) {
+             String dateString = fileJson.getJsonObject("embargo").getString("dateAvailable");
+             LocalDate endDate = LocalDate.parse(dateString);
+             if (endDate != null && endDate.isAfter(LocalDate.now())) {
+                 //Embargo is active so skip
+                 continue;
+             }
+            }
+        
+            if (fileJson.containsKey("dataTables")) {
                 if (!tabularData) {
                     xmlw.writeStartElement("dataDscr");
                     tabularData = true;
                 }
-                for (VarGroup varGrp : fileMetadata.getVarGroups()) {
-                    createVarGroupDDI(xmlw, varGrp);
+                if(fileJson.containsKey("varGroups")) {
+                    JsonArray varGroups = fileJson.getJsonArray("varGroups");
+                    for (int j=0;j<varGroups.size();j++){
+                        createVarGroupDDI(xmlw, varGroups.getJsonObject(j));
+                    }
                 }
-
-                List<DataVariable> vars = dataFile.getDataTable().getDataVariables();
-
-                for (DataVariable var : vars) {
-                    createVarDDI(xmlw, var, fileMetadata);
+                JsonObject dataTable = fileJson.getJsonArray("dataTables").getJsonObject(0);
+                JsonArray vars = dataTable.getJsonArray("dataVariables");
+                if (vars != null) {
+                    for (int j = 0; j < vars.size(); j++) {
+                        createVarDDI(xmlw, vars.getJsonObject(j), fileJson.getJsonNumber("id").toString(),
+                                fileJson.getJsonNumber("fileMetadataId").toString());
+                    }
                 }
             }
         }
@@ -1299,288 +1646,308 @@ public static void createDataDscr(XMLStreamWriter xmlw, DatasetVersion datasetVe
             xmlw.writeEndElement(); // dataDscr
         }
     }
-    private static void createVarGroupDDI(XMLStreamWriter xmlw, VarGroup varGrp) throws XMLStreamException {
+    private static void createVarGroupDDI(XMLStreamWriter xmlw, JsonObject varGrp) throws XMLStreamException {
         xmlw.writeStartElement("varGrp");
-        writeAttribute(xmlw, "ID", "VG" + varGrp.getId().toString());
+        xmlw.writeAttribute("ID", "VG" + varGrp.getJsonNumber("id").toString());
         String vars = "";
-        Set<DataVariable> varsInGroup = varGrp.getVarsInGroup();
-        for (DataVariable var : varsInGroup) {
-            vars = vars + " v" + var.getId();
+        JsonArray varsInGroup = varGrp.getJsonArray("dataVariableIds");
+        for (int j=0;j<varsInGroup.size();j++){
+            vars = vars + " v" + varsInGroup.getString(j);
         }
         vars = vars.trim();
-        writeAttribute(xmlw, "var", vars );
+        XmlWriterUtil.writeAttribute(xmlw, "var", vars );
 
 
-        if (!StringUtilisEmpty(varGrp.getLabel())) {
+        if (varGrp.containsKey("label")) {
             xmlw.writeStartElement("labl");
-            xmlw.writeCharacters(varGrp.getLabel());
+            xmlw.writeCharacters(varGrp.getString("label"));
             xmlw.writeEndElement(); // group label (labl)
         }
 
         xmlw.writeEndElement(); //varGrp
     }
     
-    private static void createVarDDI(XMLStreamWriter xmlw, DataVariable dv, FileMetadata fileMetadata) throws XMLStreamException {
+    private static void createVarDDI(XMLStreamWriter xmlw, JsonObject dvar, String fileId, String fileMetadataId) throws XMLStreamException {
         xmlw.writeStartElement("var");
-        writeAttribute(xmlw, "ID", "v" + dv.getId().toString());
-        writeAttribute(xmlw, "name", dv.getName());
-
-        VariableMetadata vm = null;
-        for (VariableMetadata vmIter : dv.getVariableMetadatas()) {
-            FileMetadata fm = vmIter.getFileMetadata();
-            if (fm != null && fm.equals(fileMetadata) ){
-                vm = vmIter;
+        xmlw.writeAttribute("ID", "v" + dvar.getJsonNumber("id").toString());
+        XmlWriterUtil.writeAttribute(xmlw, "name", dvar.getString("name"));
+
+        JsonObject vm = null;
+        JsonArray vmArray = dvar.getJsonArray("variableMetadata"); 
+        for (int i=0;i< vmArray.size();i++) {
+            JsonObject curVm =vmArray.getJsonObject(i); 
+            if (curVm.containsKey("fileMetadataId") && curVm.getString("fileMetadataId").equals(fileMetadataId) ){
+                vm = curVm;
                 break;
             }
         }
 
-        if (dv.getNumberOfDecimalPoints() != null) {
-            writeAttribute(xmlw, "dcml", dv.getNumberOfDecimalPoints().toString());
+        if (dvar.containsKey("numberOfDecimalPoints")) {
+            XmlWriterUtil.writeAttribute(xmlw, "dcml", dvar.getJsonNumber("numberOfDecimalPoints").toString());
         }
 
-        if (dv.isOrderedCategorical()) {
-            writeAttribute(xmlw, "nature", "ordinal");
+        if (dvar.getBoolean("isOrderedCategorical")) {
+            xmlw.writeAttribute("nature", "ordinal");
         }
 
-        if (dv.getInterval() != null) {
-            String interval = dv.getIntervalLabel();
-            if (interval != null) {
-                writeAttribute(xmlw, "intrvl", interval);
-            }
+        if (dvar.containsKey("variableIntervalType")) {
+            XmlWriterUtil.writeAttribute(xmlw, "intrvl", dvar.getString("variableIntervalType"));
         }
 
         if (vm != null) {
-            if (vm.isIsweightvar()) {
-                writeAttribute(xmlw, "wgt", "wgt");
+            if (vm.getBoolean("isWeightvar")) {
+                xmlw.writeAttribute("wgt", "wgt");
             }
-            if (vm.isWeighted() && vm.getWeightvariable() != null) {
-                writeAttribute(xmlw, "wgt-var", "v"+vm.getWeightvariable().getId().toString());
+            if (vm.containsKey("isWeighted") && vm.containsKey("weightVariableId")) {
+                xmlw.writeAttribute("wgt-var", "v"+vm.getString("weightVariableId"));
             }
         }
 
         // location
         xmlw.writeEmptyElement("location");
-        if (dv.getFileStartPosition() != null) {
-            writeAttribute(xmlw, "StartPos", dv.getFileStartPosition().toString());
+        if (dvar.containsKey("fileStartPosition")) {
+            XmlWriterUtil.writeAttribute(xmlw, "StartPos", dvar.getJsonNumber("fileStartPosition").toString());
         }
-        if (dv.getFileEndPosition() != null) {
-            writeAttribute(xmlw, "EndPos", dv.getFileEndPosition().toString());
+        if (dvar.containsKey("fileEndPosition")) {
+            XmlWriterUtil.writeAttribute(xmlw, "EndPos", dvar.getJsonNumber("fileEndPosition").toString());
         }
-        if (dv.getRecordSegmentNumber() != null) {
-            writeAttribute(xmlw, "RecSegNo", dv.getRecordSegmentNumber().toString());
+        if (dvar.containsKey("recordSegmentNumber")) {
+            XmlWriterUtil.writeAttribute(xmlw, "RecSegNo", dvar.getJsonNumber("recordSegmentNumber").toString());
         }
 
-        writeAttribute(xmlw, "fileid", "f" + dv.getDataTable().getDataFile().getId().toString());
+        xmlw.writeAttribute("fileid", "f" + fileId);
 
         // labl
-        if ((vm == null || StringUtilisEmpty(vm.getLabel())) && !StringUtilisEmpty(dv.getLabel())) {
-            xmlw.writeStartElement("labl");
-            writeAttribute(xmlw, "level", "variable");
-            xmlw.writeCharacters(dv.getLabel());
-            xmlw.writeEndElement(); //labl
-        } else if (vm != null && !StringUtilisEmpty(vm.getLabel())) {
+        if ((vm == null || !vm.containsKey("label"))) {
+            if(dvar.containsKey("label")) {
+                xmlw.writeStartElement("labl");
+                xmlw.writeAttribute("level", "variable");
+                xmlw.writeCharacters(dvar.getString("label"));
+                xmlw.writeEndElement(); //labl
+            }
+        } else {
             xmlw.writeStartElement("labl");
-            writeAttribute(xmlw, "level", "variable");
-            xmlw.writeCharacters(vm.getLabel());
+            xmlw.writeAttribute("level", "variable");
+            xmlw.writeCharacters(vm.getString("label"));
             xmlw.writeEndElement(); //labl
         }
 
-        // invalrng
-        boolean invalrngAdded = false;
-        for (VariableRange range : dv.getInvalidRanges()) {
-            //if (range.getBeginValueType() != null && range.getBeginValueType().getName().equals(DB_VAR_RANGE_TYPE_POINT)) {
-            if (range.getBeginValueType() != null && range.isBeginValueTypePoint()) {
-                if (range.getBeginValue() != null) {
-                    invalrngAdded = checkParentElement(xmlw, "invalrng", invalrngAdded);
-                    xmlw.writeEmptyElement("item");
-                    writeAttribute(xmlw, "VALUE", range.getBeginValue());
+        if (vm != null) {
+            if (vm.containsKey("literalQuestion") || vm.containsKey("interviewInstruction") || vm.containsKey("postQuestion")) {
+                xmlw.writeStartElement("qstn");
+                if (vm.containsKey("literalQuestion")) {
+                    xmlw.writeStartElement("qstnLit");
+                    xmlw.writeCharacters(vm.getString("literalQuestion"));
+                    xmlw.writeEndElement(); // qstnLit
                 }
-            } else {
-                invalrngAdded = checkParentElement(xmlw, "invalrng", invalrngAdded);
-                xmlw.writeEmptyElement("range");
-                if (range.getBeginValueType() != null && range.getBeginValue() != null) {
-                    if (range.isBeginValueTypeMin()) {
-                        writeAttribute(xmlw, "min", range.getBeginValue());
-                    } else if (range.isBeginValueTypeMinExcl()) {
-                        writeAttribute(xmlw, "minExclusive", range.getBeginValue());
-                    }
+                if (vm.containsKey("interviewInstruction")) {
+                    xmlw.writeStartElement("ivuInstr");
+                    xmlw.writeCharacters(vm.getString("interviewInstruction"));
+                    xmlw.writeEndElement(); //ivuInstr
                 }
-                if (range.getEndValueType() != null && range.getEndValue() != null) {
-                    if (range.isEndValueTypeMax()) {
-                        writeAttribute(xmlw, "max", range.getEndValue());
-                    } else if (range.isEndValueTypeMaxExcl()) {
-                        writeAttribute(xmlw, "maxExclusive", range.getEndValue());
-                    }
+                if (vm.containsKey("postQuestion")) {
+                    xmlw.writeStartElement("postQTxt");
+                    xmlw.writeCharacters(vm.getString("postQuestion"));
+                    xmlw.writeEndElement(); //ivuInstr
                 }
+                xmlw.writeEndElement(); //qstn
             }
         }
-        if (invalrngAdded) {
-            xmlw.writeEndElement(); // invalrng
+
+        // invalrng
+        if (dvar.containsKey("invalidRanges")) {
+            boolean invalrngAdded = false;
+            JsonArray ranges = dvar.getJsonArray("invalidRanges");
+            for (int i = 0; i < ranges.size(); i++) {
+                JsonObject range = ranges.getJsonObject(0);
+                // if (range.getBeginValueType() != null &&
+                // range.getBeginValueType().getName().equals(DB_VAR_RANGE_TYPE_POINT)) {
+                if (range.getBoolean("hasBeginValueType") && range.getBoolean("isBeginValueTypePoint")) {
+                    if (range.containsKey("beginValue")) {
+                        invalrngAdded = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "invalrng", invalrngAdded);
+                        xmlw.writeEmptyElement("item");
+                        XmlWriterUtil.writeAttribute(xmlw, "VALUE", range.getString("beginValue"));
+                    }
+                } else {
+                    invalrngAdded = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "invalrng", invalrngAdded);
+                    xmlw.writeEmptyElement("range");
+                    if (range.getBoolean("hasBeginValueType") && range.containsKey("beginValue")) {
+                        if (range.getBoolean("isBeginValueTypeMin")) {
+                            XmlWriterUtil.writeAttribute(xmlw, "min", range.getString("beginValue"));
+                        } else if (range.getBoolean("isBeginValueTypeMinExcl")) {
+                            XmlWriterUtil.writeAttribute(xmlw, "minExclusive", range.getString("beginValue"));
+                        }
+                    }
+                    if (range.getBoolean("hasEndValueType") && range.containsKey("endValue")) {
+                        if (range.getBoolean("isEndValueTypeMax")) {
+                            XmlWriterUtil.writeAttribute(xmlw, "max", range.getString("endValue"));
+                        } else if (range.getBoolean("isEndValueTypeMaxExcl")) {
+                            XmlWriterUtil.writeAttribute(xmlw, "maxExclusive", range.getString("endValue"));
+                        }
+                    }
+                }
+            }
+            if (invalrngAdded) {
+                xmlw.writeEndElement(); // invalrng
+            }
         }
 
         //universe
         if (vm != null) {
-            if (!StringUtilisEmpty(vm.getUniverse())) {
+            if (vm.containsKey("universe")) {
                 xmlw.writeStartElement("universe");
-                xmlw.writeCharacters(vm.getUniverse());
+                xmlw.writeCharacters(vm.getString("universe"));
                 xmlw.writeEndElement(); //universe
             }
         }
 
-        //sum stats
-        for (SummaryStatistic sumStat : dv.getSummaryStatistics()) {
-            xmlw.writeStartElement("sumStat");
-            if (sumStat.getTypeLabel() != null) {
-                writeAttribute(xmlw, "type", sumStat.getTypeLabel());
-            } else {
-                writeAttribute(xmlw, "type", "unknown");
+        // sum stats
+        if (dvar.containsKey("summaryStatistics")) {
+            for (Entry<String, JsonValue> sumStat : dvar.getJsonObject("summaryStatistics").entrySet()) {
+                xmlw.writeStartElement("sumStat");
+                XmlWriterUtil.writeAttribute(xmlw, "type", sumStat.getKey());
+                xmlw.writeCharacters(((JsonString)sumStat.getValue()).getString());
+                xmlw.writeEndElement(); // sumStat
             }
-            xmlw.writeCharacters(sumStat.getValue());
-            xmlw.writeEndElement(); //sumStat
         }
 
         // categories
-        for (VariableCategory cat : dv.getCategories()) {
-            xmlw.writeStartElement("catgry");
-            if (cat.isMissing()) {
-                writeAttribute(xmlw, "missing", "Y");
-            }
-
-            // catValu
-            xmlw.writeStartElement("catValu");
-            xmlw.writeCharacters(cat.getValue());
-            xmlw.writeEndElement(); //catValu
+        if (dvar.containsKey("variableCategories")) {
+            JsonArray varCats = dvar.getJsonArray("variableCategories");
+            for (int i = 0; i < varCats.size(); i++) {
+                JsonObject varCat = varCats.getJsonObject(i);
+                xmlw.writeStartElement("catgry");
+                if (varCat.getBoolean("isMissing")) {
+                    xmlw.writeAttribute("missing", "Y");
+                }
 
-            // label
-            if (!StringUtilisEmpty(cat.getLabel())) {
-                xmlw.writeStartElement("labl");
-                writeAttribute(xmlw, "level", "category");
-                xmlw.writeCharacters(cat.getLabel());
-                xmlw.writeEndElement(); //labl
-            }
+                // catValu
+                xmlw.writeStartElement("catValu");
+                xmlw.writeCharacters(varCat.getString("value"));
+                xmlw.writeEndElement(); // catValu
+
+                // label
+                if (varCat.containsKey("label")) {
+                    xmlw.writeStartElement("labl");
+                    xmlw.writeAttribute("level", "category");
+                    xmlw.writeCharacters(varCat.getString("label"));
+                    xmlw.writeEndElement(); // labl
+                }
 
-            // catStat
-            if (cat.getFrequency() != null) {
-                xmlw.writeStartElement("catStat");
-                writeAttribute(xmlw, "type", "freq");
-                // if frequency is actually a long value, we want to write "100" instead of "100.0"
-                if (Math.floor(cat.getFrequency()) == cat.getFrequency()) {
-                    xmlw.writeCharacters(new Long(cat.getFrequency().longValue()).toString());
-                } else {
-                    xmlw.writeCharacters(cat.getFrequency().toString());
+                // catStat
+                if (varCat.containsKey("frequency")) {
+                    xmlw.writeStartElement("catStat");
+                    xmlw.writeAttribute("type", "freq");
+                    Double freq = varCat.getJsonNumber("frequency").doubleValue();
+                    // if frequency is actually a long value, we want to write "100" instead of
+                    // "100.0"
+                    if (Math.floor(freq) == freq) {
+                        xmlw.writeCharacters(Long.valueOf(freq.longValue()).toString());
+                    } else {
+                        xmlw.writeCharacters(freq.toString());
+                    }
+                    xmlw.writeEndElement(); // catStat
                 }
-                xmlw.writeEndElement(); //catStat
-            }
 
-            //catStat weighted freq
-            if (vm != null && vm.isWeighted()) {
-                for (CategoryMetadata cm : vm.getCategoriesMetadata()) {
-                    if (cm.getCategory().getValue().equals(cat.getValue())) {
-                        xmlw.writeStartElement("catStat");
-                        writeAttribute(xmlw, "wgtd", "wgtd");
-                        writeAttribute(xmlw, "type", "freq");
-                        xmlw.writeCharacters(cm.getWfreq().toString());
-                        xmlw.writeEndElement(); //catStat
-                        break;
+                // catStat weighted freq
+                if (vm != null && vm.getBoolean("isWeighted")) {
+                    JsonArray catMetas = vm.getJsonArray("categoryMetadatas");
+                    for (int j = 0; i < catMetas.size(); j++) {
+                        JsonObject cm = catMetas.getJsonObject(j);
+                        if (cm.getString("categoryValue").equals(varCat.getString("value"))) {
+                            xmlw.writeStartElement("catStat");
+                            xmlw.writeAttribute("wgtd", "wgtd");
+                            xmlw.writeAttribute("type", "freq");
+                            xmlw.writeCharacters(cm.getJsonNumber("wFreq").toString());
+                            xmlw.writeEndElement(); // catStat
+                            break;
+                        }
                     }
                 }
-            }
 
-            xmlw.writeEndElement(); //catgry
+                xmlw.writeEndElement(); // catgry
+            }
         }
 
 
         // varFormat
         xmlw.writeEmptyElement("varFormat");
-        if (dv.isTypeNumeric()) {
-            writeAttribute(xmlw, "type", "numeric");
-        } else if (dv.isTypeCharacter()) {
-            writeAttribute(xmlw, "type", "character");
+        if(dvar.containsKey("variableFormatType")) {
+            XmlWriterUtil.writeAttribute(xmlw, "type", dvar.getString("variableFormatType").toLowerCase());
         } else {
             throw new XMLStreamException("Illegal Variable Format Type!");
         }
-        writeAttribute(xmlw, "formatname", dv.getFormat());
+        if(dvar.containsKey("format")) {
+            XmlWriterUtil.writeAttribute(xmlw, "formatname", dvar.getString("format"));
+        }
         //experiment writeAttribute(xmlw, "schema", dv.getFormatSchema());
-        writeAttribute(xmlw, "category", dv.getFormatCategory());
+        if(dvar.containsKey("formatCategory")) {
+            XmlWriterUtil.writeAttribute(xmlw, "category", dvar.getString("formatCategory"));
+        }
 
         // notes
-        if (dv.getUnf() != null && !"".equals(dv.getUnf())) {
+        if (dvar.containsKey("UNF") && !dvar.getString("UNF").isBlank()) {
             xmlw.writeStartElement("notes");
-            writeAttribute(xmlw, "subject", "Universal Numeric Fingerprint");
-            writeAttribute(xmlw, "level", "variable");
-            writeAttribute(xmlw, "type", "Dataverse:UNF");
-            xmlw.writeCharacters(dv.getUnf());
+            xmlw.writeAttribute("subject", "Universal Numeric Fingerprint");
+            xmlw.writeAttribute("level", "variable");
+            xmlw.writeAttribute("type", "Dataverse:UNF");
+            xmlw.writeCharacters(dvar.getString("UNF"));
             xmlw.writeEndElement(); //notes
         }
 
         if (vm != null) {
-            if (!StringUtilisEmpty(vm.getNotes())) {
+            if (vm.containsKey("notes")) {
                 xmlw.writeStartElement("notes");
-                xmlw.writeCData(vm.getNotes());
+                xmlw.writeCData(vm.getString("notes"));
                 xmlw.writeEndElement(); //notes CDATA
             }
         }
 
-        if (vm != null) {
-            if (!StringUtilisEmpty(vm.getLiteralquestion()) || !StringUtilisEmpty(vm.getInterviewinstruction()) || !StringUtilisEmpty(vm.getPostquestion())) {
-                xmlw.writeStartElement("qstn");
-                if (!StringUtilisEmpty(vm.getLiteralquestion())) {
-                    xmlw.writeStartElement("qstnLit");
-                    xmlw.writeCharacters(vm.getLiteralquestion());
-                    xmlw.writeEndElement(); // qstnLit
-                }
-                if (!StringUtilisEmpty(vm.getInterviewinstruction())) {
-                    xmlw.writeStartElement("ivuInstr");
-                    xmlw.writeCharacters(vm.getInterviewinstruction());
-                    xmlw.writeEndElement(); //ivuInstr
-                }
-                if (!StringUtilisEmpty(vm.getPostquestion())) {
-                    xmlw.writeStartElement("postQTxt");
-                    xmlw.writeCharacters(vm.getPostquestion());
-                    xmlw.writeEndElement(); //ivuInstr
-                }
-                xmlw.writeEndElement(); //qstn
-            }
-        }
+
 
         xmlw.writeEndElement(); //var
 
     }
     
-    private static void createFileDscr(XMLStreamWriter xmlw, DatasetVersion datasetVersion) throws XMLStreamException {
-        String dataverseUrl = getDataverseSiteUrl();
-        for (FileMetadata fileMetadata : datasetVersion.getFileMetadatas()) {
-            DataFile dataFile = fileMetadata.getDataFile();
-
-            if (dataFile != null && dataFile.isTabularData()) {
-                DataTable dt = dataFile.getDataTable();
+    private static void createFileDscr(XMLStreamWriter xmlw, JsonArray fileDetails) throws XMLStreamException {
+        String dataverseUrl = SystemConfig.getDataverseSiteUrlStatic();
+        for (int i =0;i<fileDetails.size();i++) {
+            JsonObject fileJson = fileDetails.getJsonObject(i);
+            //originalFileFormat is one of several keys that only exist for tabular data
+            if (fileJson.containsKey("originalFileFormat")) {
+                JsonObject dt = null;
+                if (fileJson.containsKey("dataTables")) {
+                    dt = fileJson.getJsonArray("dataTables").getJsonObject(0);
+                }
                 xmlw.writeStartElement("fileDscr");
-                writeAttribute(xmlw, "ID", "f" + dataFile.getId());
-                writeAttribute(xmlw, "URI", dataverseUrl + "/api/access/datafile/" + dataFile.getId());
+                String fileId = fileJson.getJsonNumber("id").toString();
+                xmlw.writeAttribute("ID", "f" + fileId);
+                xmlw.writeAttribute("URI", dataverseUrl + "/api/access/datafile/" + fileId);
 
                 xmlw.writeStartElement("fileTxt");
                 xmlw.writeStartElement("fileName");
-                xmlw.writeCharacters(fileMetadata.getLabel());
+                xmlw.writeCharacters(fileJson.getString("filename"));
                 xmlw.writeEndElement(); // fileName
 
-                if (dt.getCaseQuantity() != null || dt.getVarQuantity() != null || dt.getRecordsPerCase() != null) {
+                if (dt != null && (dt.containsKey("caseQuantity") || dt.containsKey("varQuantity")
+                        || dt.containsKey("recordsPerCase"))) {
                     xmlw.writeStartElement("dimensns");
 
-                    if (dt.getCaseQuantity() != null) {
+                    if (dt.containsKey("caseQuantity")) {
                         xmlw.writeStartElement("caseQnty");
-                        xmlw.writeCharacters(dt.getCaseQuantity().toString());
+                        xmlw.writeCharacters(dt.getJsonNumber("caseQuantity").toString());
                         xmlw.writeEndElement(); // caseQnty
                     }
 
-                    if (dt.getVarQuantity() != null) {
+                    if (dt.containsKey("varQuantity")) {
                         xmlw.writeStartElement("varQnty");
-                        xmlw.writeCharacters(dt.getVarQuantity().toString());
+                        xmlw.writeCharacters(dt.getJsonNumber("varQuantity").toString());
                         xmlw.writeEndElement(); // varQnty
                     }
 
-                    if (dt.getRecordsPerCase() != null) {
+                    if (dt.containsKey("recordsPerCase")) {
                         xmlw.writeStartElement("recPrCas");
-                        xmlw.writeCharacters(dt.getRecordsPerCase().toString());
+                        xmlw.writeCharacters(dt.getJsonNumber("recordsPerCase").toString());
                         xmlw.writeEndElement(); // recPrCas
                     }
 
@@ -1588,7 +1955,7 @@ private static void createFileDscr(XMLStreamWriter xmlw, DatasetVersion datasetV
                 }
 
                 xmlw.writeStartElement("fileType");
-                xmlw.writeCharacters(dataFile.getContentType());
+                xmlw.writeCharacters(fileJson.getString("contentType"));
                 xmlw.writeEndElement(); // fileType
 
                 xmlw.writeEndElement(); // fileTxt
@@ -1596,25 +1963,39 @@ private static void createFileDscr(XMLStreamWriter xmlw, DatasetVersion datasetV
                 // various notes:
                 // this specially formatted note section is used to store the UNF
                 // (Universal Numeric Fingerprint) signature:
-                if (dt.getUnf() != null && !dt.getUnf().equals("")) {
+                if ((dt!=null) && (dt.containsKey("UNF") && !dt.getString("UNF").isBlank())) {
                     xmlw.writeStartElement("notes");
-                    writeAttribute(xmlw, "level", LEVEL_FILE);
-                    writeAttribute(xmlw, "type", NOTE_TYPE_UNF);
-                    writeAttribute(xmlw, "subject", NOTE_SUBJECT_UNF);
-                    xmlw.writeCharacters(dt.getUnf());
+                    xmlw.writeAttribute("level", LEVEL_FILE);
+                    xmlw.writeAttribute("type", NOTE_TYPE_UNF);
+                    xmlw.writeAttribute("subject", NOTE_SUBJECT_UNF);
+                    xmlw.writeCharacters(dt.getString("UNF"));
                     xmlw.writeEndElement(); // notes
                 }
 
-                if (dataFile.getTags() != null) {
-                    for (int i = 0; i < dataFile.getTags().size(); i++) {
+                // If any tabular tags are present, each is formatted in a 
+                // dedicated note:
+                if (fileJson.containsKey("tabularTags")) {
+                    JsonArray tags = fileJson.getJsonArray("tabularTags");
+                    for (int j = 0; j < tags.size(); j++) {
                         xmlw.writeStartElement("notes");
-                        writeAttribute(xmlw, "level", LEVEL_FILE);
-                        writeAttribute(xmlw, "type", NOTE_TYPE_TAG);
-                        writeAttribute(xmlw, "subject", NOTE_SUBJECT_TAG);
-                        xmlw.writeCharacters(dataFile.getTags().get(i).getTypeLabel());
+                        xmlw.writeAttribute("level", LEVEL_FILE);
+                        xmlw.writeAttribute("type", NOTE_TYPE_TAG);
+                        xmlw.writeAttribute("subject", NOTE_SUBJECT_TAG);
+                        xmlw.writeCharacters(tags.getString(j));
                         xmlw.writeEndElement(); // notes
                     }
                 }
+                
+                // Adding a dedicated node for the description entry (for 
+                // non-tabular files we format it under the <txt> field)
+                if (fileJson.containsKey("description")) {
+                    xmlw.writeStartElement("notes");
+                    xmlw.writeAttribute("level", LEVEL_FILE);
+                    xmlw.writeAttribute("type", NOTE_TYPE_FILEDESCRIPTION);
+                    xmlw.writeAttribute("subject", NOTE_SUBJECT_FILEDESCRIPTION);
+                    xmlw.writeCharacters(fileJson.getString("description"));
+                    xmlw.writeEndElement(); // notes
+                }
 
                 // TODO: add the remaining fileDscr elements!
                 xmlw.writeEndElement(); // fileDscr
@@ -1624,26 +2005,27 @@ private static void createFileDscr(XMLStreamWriter xmlw, DatasetVersion datasetV
     
     
 
-    private static boolean checkParentElement(XMLStreamWriter xmlw, String elementName, boolean elementAdded) throws XMLStreamException {
-        if (!elementAdded) {
-            xmlw.writeStartElement(elementName);
-        }
 
-        return true;
-    }
 
     public static void datasetHtmlDDI(InputStream datafile, OutputStream outputStream) throws XMLStreamException {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 
         try {
-            Document document;
-            InputStream  styleSheetInput = DdiExportUtil.class.getClassLoader().getResourceAsStream("edu/harvard/iq/dataverse/codebook2-0.xsl");
+            // Get secure DocumentBuilder from our utility class
+            DocumentBuilder builder = XmlUtil.getSecureDocumentBuilder();
+            if (builder == null) {
+                logger.severe("Could not create secure document builder");
+                return;
+            }
+            InputStream styleSheetInput = DdiExportUtil.class.getClassLoader().getResourceAsStream("edu/harvard/iq/dataverse/codebook2-0.xsl");
 
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            document = builder.parse(datafile);
+            Document document = builder.parse(datafile);
 
             // Use a Transformer for output
             TransformerFactory tFactory = TransformerFactory.newInstance();
+            // Set secure processing feature
+            tFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+            tFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+            
             StreamSource stylesource = new StreamSource(styleSheetInput);
             Transformer transformer = tFactory.newTransformer(stylesource);
 
@@ -1656,20 +2038,18 @@ public static void datasetHtmlDDI(InputStream datafile, OutputStream outputStrea
         } catch (TransformerException te) {
             // Error generated by the parser
             logger.severe("Transformation error" + "   " + te.getMessage());
-
         } catch (SAXException sxe) {
             // Error generated by this application
             // (or a parser-initialization error)
             logger.severe("SAX error " + sxe.getMessage());
-
-        } catch (ParserConfigurationException pce) {
-            // Parser with specified options can't be built
-            logger.severe("Parser configuration error " + pce.getMessage());
         } catch (IOException ioe) {
             // I/O error
-            logger.info("I/O error " + ioe.getMessage());
+            logger.warning("I/O error " + ioe.getMessage());
         }
+    }
 
+    public static void injectSettingsService(SettingsServiceBean settingsSvc) {
+        settingsService=settingsSvc;
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtilHelper.java b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtilHelper.java
new file mode 100644
index 00000000000..d0cd8a4cae7
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtilHelper.java
@@ -0,0 +1,25 @@
+package edu.harvard.iq.dataverse.export.ddi;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
+    /**
+     * This is a small helper bean 
+     * As it is a singleton and built at application start (=deployment), it will inject the (stateless)
+     * dataverse service into the DdiExportUtil once it's ready.
+     */
+    @Singleton
+    @Startup
+    public class DdiExportUtilHelper {
+
+        @EJB SettingsServiceBean settingsSvc;
+        
+        @PostConstruct
+        public void injectService() {
+            DdiExportUtil.injectSettingsService(settingsSvc);
+        }
+    }
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java
index a4ee78ee3a8..2bd8b3ca8d4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java
@@ -7,14 +7,18 @@
 
 import com.google.gson.Gson;
 import edu.harvard.iq.dataverse.DatasetFieldConstant;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.api.dto.DatasetDTO;
 import edu.harvard.iq.dataverse.api.dto.DatasetVersionDTO;
 import edu.harvard.iq.dataverse.api.dto.FieldDTO;
+import edu.harvard.iq.dataverse.api.dto.LicenseDTO;
 import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO;
 import edu.harvard.iq.dataverse.export.ddi.DdiExportUtil;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
-import java.io.ByteArrayOutputStream;
+
 import java.io.OutputStream;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -22,11 +26,13 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  *
  * @author skraffmi
@@ -63,29 +69,40 @@ public static void datasetJson2dublincore(JsonObject datasetDtoAsJson, OutputStr
     }
     
     private static void dto2dublincore(DatasetDTO datasetDto, OutputStream outputStream, String dcFlavor) throws XMLStreamException {
-        XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
-        if (DC_FLAVOR_DCTERMS.equals(dcFlavor)) {
-		xmlw.writeStartDocument();
-            xmlw.writeStartElement("metadata");
-            xmlw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-            xmlw.writeAttribute("xmlns:dc", DC_XML_NAMESPACE);
-            xmlw.writeAttribute("xmlns:dcterms", DCTERMS_XML_NAMESPACE);
-            xmlw.writeDefaultNamespace(DCTERMS_DEFAULT_NAMESPACE);
-            //xmlw.writeAttribute("xsi:schemaLocation", DCTERMS_DEFAULT_NAMESPACE+" "+DCTERMS_XML_SCHEMALOCATION);
-            createDC(xmlw, datasetDto, dcFlavor);
-        } else if (DC_FLAVOR_OAI.equals(dcFlavor)) {      
-            xmlw.writeStartElement("oai_dc:dc");        
-            xmlw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-            xmlw.writeAttribute("xmlns:oai_dc", OAI_DC_XML_NAMESPACE);
-            xmlw.writeAttribute("xmlns:dc", DC_XML_NAMESPACE);
-            xmlw.writeAttribute("xsi:schemaLocation", OAI_DC_XML_NAMESPACE+" "+OAI_DC_XML_SCHEMALOCATION);
-            //writeAttribute(xmlw, "version", DEFAULT_XML_VERSION);
-            createOAIDC(xmlw, datasetDto, dcFlavor);
+        XMLStreamWriter xmlw = null;
+        try {
+            xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
+            if (DC_FLAVOR_DCTERMS.equals(dcFlavor)) {
+                xmlw.writeStartDocument();
+                xmlw.writeStartElement("metadata");
+                xmlw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+                xmlw.writeAttribute("xmlns:dc", DC_XML_NAMESPACE);
+                xmlw.writeAttribute("xmlns:dcterms", DCTERMS_XML_NAMESPACE);
+                xmlw.writeDefaultNamespace(DCTERMS_DEFAULT_NAMESPACE);
+                // xmlw.writeAttribute("xsi:schemaLocation", DCTERMS_DEFAULT_NAMESPACE+" "+DCTERMS_XML_SCHEMALOCATION);
+                createDC(xmlw, datasetDto, dcFlavor);
+            } else if (DC_FLAVOR_OAI.equals(dcFlavor)) {
+                xmlw.writeStartElement("oai_dc:dc");
+                xmlw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+                xmlw.writeAttribute("xmlns:oai_dc", OAI_DC_XML_NAMESPACE);
+                xmlw.writeAttribute("xmlns:dc", DC_XML_NAMESPACE);
+                xmlw.writeAttribute("xsi:schemaLocation", OAI_DC_XML_NAMESPACE + " " + OAI_DC_XML_SCHEMALOCATION);
+                // writeAttribute(xmlw, "version", DEFAULT_XML_VERSION);
+                createOAIDC(xmlw, datasetDto, dcFlavor);
+            }
+
+            xmlw.writeEndElement(); // <metadata> or <oai_dc:dc>
+            xmlw.flush();
+        } finally {
+            if (xmlw != null) {
+                try {
+                    xmlw.close();
+                } catch (XMLStreamException e) {
+                    // Log this exception, but don't rethrow as it's in finally block
+                    logger.log(Level.WARNING, "Error closing XMLStreamWriter", e);
+                }
+            }
         }
-        
-        
-        xmlw.writeEndElement(); // <metadata> or <oai_dc:dc>
-        xmlw.flush();
     }
     
     //UPDATED by rmo-cdsp:
@@ -100,12 +117,12 @@ private static void createDC(XMLStreamWriter xmlw, DatasetDTO datasetDto, String
         String persistentAgency = datasetDto.getProtocol();
         String persistentAuthority = datasetDto.getAuthority();
         String persistentId = datasetDto.getIdentifier();
-        GlobalId globalId = new GlobalId(persistentAgency, persistentAuthority, persistentId);
+        GlobalId globalId = PidUtil.parseAsGlobalID(persistentAgency, persistentAuthority, persistentId);
   
         writeFullElement(xmlw, dcFlavor+":"+"title", dto2Primitive(version, DatasetFieldConstant.title));                       
         
         xmlw.writeStartElement(dcFlavor+":"+"identifier");
-        xmlw.writeCharacters(globalId.toURL().toString());
+        xmlw.writeCharacters(globalId.asURL());
         xmlw.writeEndElement(); // decterms:identifier       
 
         writeAuthorsElement(xmlw, version, dcFlavor);
@@ -120,7 +137,12 @@ private static void createDC(XMLStreamWriter xmlw, DatasetDTO datasetDto, String
         writeFullElementList(xmlw, dcFlavor+":"+"language", dto2PrimitiveList(version, DatasetFieldConstant.language));        
         
         writeRelPublElement(xmlw, version, dcFlavor);
-        writeFullElement(xmlw, dcFlavor+":"+"date", dto2Primitive(version, DatasetFieldConstant.productionDate));  
+        
+        String date = dto2Primitive(version, DatasetFieldConstant.productionDate);
+        if (date == null) {
+            date = datasetDto.getPublicationDate();
+        }
+        writeFullElement(xmlw, dcFlavor+":"+"date", date);
         
         writeFullElement(xmlw, dcFlavor+":"+"contributor", dto2Primitive(version, DatasetFieldConstant.depositor));  
         
@@ -139,7 +161,10 @@ private static void createDC(XMLStreamWriter xmlw, DatasetDTO datasetDto, String
         writeSpatialElements(xmlw, version, dcFlavor);
         
         //License and Terms
-        writeFullElement(xmlw, dcFlavor+":"+"license", version.getLicense());        
+        LicenseDTO licDTO = version.getLicense();
+        if(licDTO != null) {
+            writeFullElement(xmlw, dcFlavor+":"+"license", licDTO.getName());
+        }
         writeFullElement(xmlw, dcFlavor+":"+"rights", version.getTermsOfUse()); 
         writeFullElement(xmlw, dcFlavor+":"+"rights", version.getRestrictions()); 
 
@@ -150,12 +175,12 @@ private static void createOAIDC(XMLStreamWriter xmlw, DatasetDTO datasetDto, Str
         String persistentAgency = datasetDto.getProtocol();
         String persistentAuthority = datasetDto.getAuthority();
         String persistentId = datasetDto.getIdentifier();
-        GlobalId globalId = new GlobalId(persistentAgency, persistentAuthority, persistentId);
+        GlobalId globalId = PidUtil.parseAsGlobalID(persistentAgency, persistentAuthority, persistentId);
   
         writeFullElement(xmlw, dcFlavor+":"+"title", dto2Primitive(version, DatasetFieldConstant.title));                       
         
         xmlw.writeStartElement(dcFlavor+":"+"identifier");
-        xmlw.writeCharacters(globalId.toURL().toString());
+        xmlw.writeCharacters(globalId.asURL());
         xmlw.writeEndElement(); // decterms:identifier       
 
         writeAuthorsElement(xmlw, version, dcFlavor); //creator
@@ -167,7 +192,24 @@ private static void createOAIDC(XMLStreamWriter xmlw, DatasetDTO datasetDto, Str
         
         writeFullElementList(xmlw, dcFlavor+":"+"language", dto2PrimitiveList(version, DatasetFieldConstant.language));        
         
-        writeFullElement(xmlw, dcFlavor+":"+"date", dto2Primitive(version, DatasetFieldConstant.productionDate));  
+        /**
+         * dc:date. "I suggest changing the Dataverse / DC Element (oai_dc)
+         * mapping, so that dc:date is mapped with Publication Date. This is
+         * also in line with citation recommendations. The publication date is
+         * the preferred date when citing research data; see, e.g., page 12 in
+         * The Tromsø Recommendations for Citation of Research Data in
+         * Linguistics; https://doi.org/10.15497/rda00040 ." --
+         * https://github.com/IQSS/dataverse/issues/8129
+         *
+         * However, if the citation date field has been set, use that.
+         */
+        String date = datasetDto.getPublicationDate();
+        DatasetFieldType citationDataType = jakarta.enterprise.inject.spi.CDI.current().select(DatasetServiceBean.class).get().findByGlobalId(globalId.asString()).getCitationDateDatasetFieldType();
+        if (citationDataType != null) {
+            date = dto2Primitive(version, citationDataType.getName());
+        }
+
+        writeFullElement(xmlw, dcFlavor+":"+"date", date);
         
         writeFullElement(xmlw, dcFlavor+":"+"contributor", dto2Primitive(version, DatasetFieldConstant.depositor));  
         
@@ -175,10 +217,16 @@ private static void createOAIDC(XMLStreamWriter xmlw, DatasetDTO datasetDto, Str
         
         writeFullElementList(xmlw, dcFlavor+":"+"relation", dto2PrimitiveList(version, DatasetFieldConstant.relatedDatasets));
         
-        writeFullElementList(xmlw, dcFlavor+":"+"type", dto2PrimitiveList(version, DatasetFieldConstant.kindOfData));
+        /**
+         * dc:type. "Dublin Core (see
+         * https://www.dublincore.org/specifications/dublin-core/dcmi-terms/#http://purl.org/dc/terms/type
+         * ) recommends “to use a controlled vocabulary such as the DCMI Type
+         * Vocabulary” for dc:type." So we hard-coded it to "Dataset". See
+         * https://github.com/IQSS/dataverse/issues/8129
+         */
+        writeFullElement(xmlw, dcFlavor+":"+"type", "Dataset");
         
         writeFullElementList(xmlw, dcFlavor+":"+"source", dto2PrimitiveList(version, DatasetFieldConstant.dataSources));
-        
 
     }
     
@@ -288,26 +336,35 @@ private static void writeRelPublElement(XMLStreamWriter xmlw, DatasetVersionDTO
                             String IDType = "";
                             String IDNo = "";
                             String url = "";
+                            String relationType = null;
                             for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
                                 FieldDTO next = iterator.next();
-                                if (DatasetFieldConstant.publicationCitation.equals(next.getTypeName())) {
-                                    citation =  next.getSinglePrimitive();
-                                }
-                                if (DatasetFieldConstant.publicationIDType.equals(next.getTypeName())) {
-                                    IDType =  next.getSinglePrimitive();
-                                }
-                                if (DatasetFieldConstant.publicationIDNumber.equals(next.getTypeName())) {
-                                    IDNo =   next.getSinglePrimitive();
-                                }
-                                if (DatasetFieldConstant.publicationURL.equals(next.getTypeName())) {
-                                    url =  next.getSinglePrimitive();
+                                switch (next.getTypeName()) {
+                                    case DatasetFieldConstant.publicationCitation:
+                                        citation = next.getSinglePrimitive();
+                                        break;
+                                    case DatasetFieldConstant.publicationIDType:
+                                        IDType = next.getSinglePrimitive();
+                                        break;
+                                    case DatasetFieldConstant.publicationIDNumber:
+                                        IDNo = next.getSinglePrimitive();
+                                        break;
+                                    case DatasetFieldConstant.publicationURL:
+                                        url = next.getSinglePrimitive();
+                                        break;
+                                    case DatasetFieldConstant.publicationRelationType:
+                                        relationType = next.getSinglePrimitive();
+                                        break;
                                 }
                             }
+                            if(StringUtils.isBlank(relationType)) {
+                                relationType = "isReferencedBy";
+                            }
                             pubString = appendCommaSeparatedValue(citation, IDType);
                             pubString = appendCommaSeparatedValue(pubString, IDNo);
                             pubString = appendCommaSeparatedValue(pubString, url);
                             if (!pubString.isEmpty()){
-                                xmlw.writeStartElement(dcFlavor+":"+"isReferencedBy"); 
+                                xmlw.writeStartElement(dcFlavor+":" + relationType); 
                                 xmlw.writeCharacters(pubString);
                                 xmlw.writeEndElement(); //relPubl
                             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/openaire/Cleanup.java b/src/main/java/edu/harvard/iq/dataverse/export/openaire/Cleanup.java
deleted file mode 100644
index 508f441bc03..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/export/openaire/Cleanup.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package edu.harvard.iq.dataverse.export.openaire;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- *
- * @author francesco.cadili@4science.it
- */
-public class Cleanup {
-    
-    /**
-     * Normalize sentence
-     *
-     * @param sentence full name or organization name
-     * @return normalize string value
-     */
-    static public String normalize(String sentence) {
-        if (StringUtils.isBlank(sentence)) {
-            return "";
-        }
-
-        sentence = sentence.trim()
-                .replaceAll(", *", ", ")
-                .replaceAll(" +", " ");
-
-        return sentence;
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java
index 4a8374f175c..166ea30461e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java
@@ -1,14 +1,11 @@
 package edu.harvard.iq.dataverse.export.openaire;
 
 import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
@@ -23,11 +20,15 @@
 import edu.harvard.iq.dataverse.api.dto.DatasetVersionDTO;
 import edu.harvard.iq.dataverse.api.dto.FieldDTO;
 import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO;
+import edu.harvard.iq.dataverse.util.PersonOrOrgUtil;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
 
 public class OpenAireExportUtil {
 
@@ -49,19 +50,31 @@ public static void datasetJson2openaire(JsonObject datasetDtoAsJson, OutputStrea
     }
 
     private static void dto2openaire(DatasetDTO datasetDto, OutputStream outputStream) throws XMLStreamException {
-        XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
+        XMLStreamWriter xmlw = null;
+        try {
+            xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
 
-        xmlw.writeStartElement("resource"); // <resource>
+            xmlw.writeStartElement("resource"); // <resource>
 
-        xmlw.writeAttribute("xmlns:xsi", XSI_NAMESPACE);
-        xmlw.writeAttribute("xmlns", RESOURCE_NAMESPACE);
-        xmlw.writeAttribute("xsi:schemaLocation", RESOURCE_NAMESPACE + " " + RESOURCE_SCHEMA_LOCATION);
+            xmlw.writeAttribute("xmlns:xsi", XSI_NAMESPACE);
+            xmlw.writeAttribute("xmlns", RESOURCE_NAMESPACE);
+            xmlw.writeAttribute("xsi:schemaLocation", RESOURCE_NAMESPACE + " " + RESOURCE_SCHEMA_LOCATION);
 
-        createOpenAire(xmlw, datasetDto);
+            createOpenAire(xmlw, datasetDto);
 
-        xmlw.writeEndElement(); // </resource>
+            xmlw.writeEndElement(); // </resource>
 
-        xmlw.flush();
+            xmlw.flush();
+        } finally {
+            if (xmlw != null) {
+                try {
+                    xmlw.close();
+                } catch (XMLStreamException e) {
+                    // Log this exception, but don't rethrow as it's in finally block
+                    logger.log(Level.WARNING, "Error closing XMLStreamWriter", e);
+                }
+            }
+        }
     }
 
     private static void createOpenAire(XMLStreamWriter xmlw, DatasetDTO datasetDto) throws XMLStreamException {
@@ -69,7 +82,7 @@ private static void createOpenAire(XMLStreamWriter xmlw, DatasetDTO datasetDto)
         String persistentAgency = datasetDto.getProtocol();
         String persistentAuthority = datasetDto.getAuthority();
         String persistentId = datasetDto.getIdentifier();
-        GlobalId globalId = new GlobalId(persistentAgency, persistentAuthority, persistentId);
+        GlobalId globalId = PidUtil.parseAsGlobalID(persistentAgency, persistentAuthority, persistentId);
 
         // The sequence is revied using sample:
         // https://schema.datacite.org/meta/kernel-4.0/example/datacite-example-full-v4.0.xml
@@ -81,7 +94,7 @@ private static void createOpenAire(XMLStreamWriter xmlw, DatasetDTO datasetDto)
         String language = null;
 
         // 1, Identifier (with mandatory type sub-property) (M)
-        writeIdentifierElement(xmlw, globalId.toURL().toString(), language);
+        writeIdentifierElement(xmlw, globalId.asURL(), language);
 
         // 2, Creator (with optional given name, family name, 
         //      name identifier and affiliation sub-properties) (M)
@@ -189,10 +202,10 @@ public static void writeIdentifierElement(XMLStreamWriter xmlw, String identifie
         if (StringUtils.isNotBlank(identifier)) {
             Map<String, String> identifier_map = new HashMap<String, String>();
 
-            if (StringUtils.containsIgnoreCase(identifier, GlobalId.DOI_RESOLVER_URL)) {
+            if (StringUtils.containsIgnoreCase(identifier, AbstractDOIProvider.DOI_RESOLVER_URL)) {
                 identifier_map.put("identifierType", "DOI");
                 identifier = StringUtils.substring(identifier, identifier.indexOf("10."));
-            } else if (StringUtils.containsIgnoreCase(identifier, GlobalId.HDL_RESOLVER_URL)) {
+            } else if (StringUtils.containsIgnoreCase(identifier, HandlePidProvider.HDL_RESOLVER_URL)) {
                 identifier_map.put("identifierType", "Handle");
                 if (StringUtils.contains(identifier, "http")) {
                     identifier = identifier.replace(identifier.substring(0, identifier.indexOf("/") + 2), "");
@@ -248,64 +261,26 @@ public static void writeCreatorsElement(XMLStreamWriter xmlw, DatasetVersionDTO
                             if (StringUtils.isNotBlank(creatorName)) {
                                 creator_check = writeOpenTag(xmlw, "creators", creator_check);
                                 xmlw.writeStartElement("creator"); // <creator>
-
-                                boolean nameType_check = false;
+                                
                                 Map<String, String> creator_map = new HashMap<String, String>();
-                                if ((StringUtils.containsIgnoreCase(nameIdentifierScheme, "orcid"))) {
-                                    creator_map.put("nameType", "Personal");
-                                    nameType_check = true;
-                                }
-
-                                creatorName = Cleanup.normalize(creatorName);
-                                // Datacite algorithm, https://github.com/IQSS/dataverse/issues/2243#issuecomment-358615313
-                                if (creatorName.contains(",")) {
-                                    String givenName = FirstNames.getInstance().getFirstName(creatorName);
-                                    boolean isOrganization = Organizations.getInstance().isOrganization(creatorName);
-
-                                    // creatorName=<FamilyName>, <FirstName>
-                                    if (givenName != null && !isOrganization) {
-                                        // givenName ok
-                                        creator_map.put("nameType", "Personal");
-                                        nameType_check = true;
-                                    } else if (isOrganization) {
-                                        creator_map.put("nameType", "Organizational");
-                                        nameType_check = false;
-                                    }
-                                    writeFullElement(xmlw, null, "creatorName", creator_map, creatorName, language);
-
-                                    if ((nameType_check) && (!creatorName.replaceFirst(",", "").contains(","))) {
-                                        // creatorName=<FamilyName>, <FirstName>
-                                        String[] fullName = creatorName.split(", ");
-                                        givenName = fullName[1];
-                                        String familyName = fullName[0];
+                                JsonObject creatorObj = PersonOrOrgUtil.getPersonOrOrganization(creatorName, false,
+                                        StringUtils.containsIgnoreCase(nameIdentifierScheme, "orcid"));
 
-                                        writeFullElement(xmlw, null, "givenName", null, givenName, language);
-                                        writeFullElement(xmlw, null, "familyName", null, familyName, language);
-                                    }
+                                // creatorName=<FamilyName>, <FirstName>
+                                if (creatorObj.getBoolean("isPerson")) {
+                                    creator_map.put("nameType", "Personal");
                                 } else {
-                                    String givenName = FirstNames.getInstance().getFirstName(creatorName);
-                                    boolean isOrganization = Organizations.getInstance().isOrganization(creatorName);
-                                    
-                                    if (givenName != null && !isOrganization) {
-                                        // givenName ok, creatorName=<FirstName> <FamilyName>
-                                        creator_map.put("nameType", "Personal");
-                                        nameType_check = true;
-                                        writeFullElement(xmlw, null, "creatorName", creator_map, creatorName, language);
-
-                                        String familyName = "";
-                                        if (givenName.length() + 1 < creatorName.length()) {
-                                            familyName = creatorName.substring(givenName.length() + 1);
-                                        }
-
-                                        writeFullElement(xmlw, null, "givenName", null, givenName, language);
-                                        writeFullElement(xmlw, null, "familyName", null, familyName, language);
-                                    } else {
-                                        // default
-                                        if (isOrganization) {
-                                            creator_map.put("nameType", "Organizational");
-                                        }
-                                        writeFullElement(xmlw, null, "creatorName", creator_map, creatorName, language);
-                                    }
+                                    creator_map.put("nameType", "Organizational");
+                                }
+                                writeFullElement(xmlw, null, "creatorName", creator_map,
+                                        creatorObj.getString("fullName"), language);
+                                if (creatorObj.containsKey("givenName")) {
+                                    writeFullElement(xmlw, null, "givenName", null, creatorObj.getString("givenName"),
+                                            language);
+                                }
+                                if (creatorObj.containsKey("familyName")) {
+                                    writeFullElement(xmlw, null, "familyName", null, creatorObj.getString("familyName"),
+                                            language);
                                 }
 
                                 if (StringUtils.isNotBlank(nameIdentifier)) {
@@ -359,12 +334,34 @@ public static void writeTitlesElement(XMLStreamWriter xmlw, DatasetVersionDTO da
         String subtitle = dto2Primitive(datasetVersionDTO, DatasetFieldConstant.subTitle);
         title_check = writeTitleElement(xmlw, "Subtitle", subtitle, title_check, language);
 
-        String alternativeTitle = dto2Primitive(datasetVersionDTO, DatasetFieldConstant.alternativeTitle);
-        title_check = writeTitleElement(xmlw, "AlternativeTitle", alternativeTitle, title_check, language);
-
+        title_check = writeMultipleTitleElement(xmlw, "AlternativeTitle", datasetVersionDTO, "citation", title_check, language);
         writeEndTag(xmlw, title_check);
     }
 
+    private static boolean writeMultipleTitleElement(XMLStreamWriter xmlw, String titleType, DatasetVersionDTO datasetVersionDTO, String metadataBlockName, boolean title_check, String language) throws XMLStreamException {
+        MetadataBlockDTO block = datasetVersionDTO.getMetadataBlocks().get(metadataBlockName);
+        if (block != null) {
+            logger.fine("Block is not empty");
+            List<FieldDTO> fieldsBlock =  block.getFields();
+            if (fieldsBlock != null) {
+                for (FieldDTO fieldDTO : fieldsBlock) {
+                    logger.fine(titleType + " " + fieldDTO.getTypeName());
+                    if (titleType.toLowerCase().equals(fieldDTO.getTypeName().toLowerCase())) {
+                        logger.fine("Found Alt title");
+                        List<String> fields = fieldDTO.getMultiplePrimitive();
+                        for (String value : fields) {
+                            if (!writeTitleElement(xmlw, titleType, value, title_check, language))
+                                title_check = false;
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        return title_check;
+    }
+
     /**
      * 3, Title (with optional type sub-properties) (M)
      *
@@ -453,7 +450,7 @@ public static void writeSubjectsElement(XMLStreamWriter xmlw, DatasetVersionDTO
                         for (String subject : fieldDTO.getMultipleVocab()) {
                             if (StringUtils.isNotBlank(subject)) {
                                 subject_check = writeOpenTag(xmlw, "subjects", subject_check);
-                                writeSubjectElement(xmlw, null, null, subject, language);
+                                writeSubjectElement(xmlw, null, null, null, subject, language);
                             }
                         }
                     }
@@ -462,7 +459,8 @@ public static void writeSubjectsElement(XMLStreamWriter xmlw, DatasetVersionDTO
                         for (HashSet<FieldDTO> fieldDTOs : fieldDTO.getMultipleCompound()) {
                             String subject = null;
                             String subjectScheme = null;
-                            String schemeURI = null;
+                            String keywordTermURI = null;
+                            String keywordVocabURI = null;
 
                             for (Iterator<FieldDTO> iterator = fieldDTOs.iterator(); iterator.hasNext();) {
                                 FieldDTO next = iterator.next();
@@ -470,18 +468,22 @@ public static void writeSubjectsElement(XMLStreamWriter xmlw, DatasetVersionDTO
                                     subject = next.getSinglePrimitive();
                                 }
 
+                                if (DatasetFieldConstant.keywordTermURI.equals(next.getTypeName())) {
+                                    keywordTermURI = next.getSinglePrimitive();
+                                }  
+
                                 if (DatasetFieldConstant.keywordVocab.equals(next.getTypeName())) {
                                     subjectScheme = next.getSinglePrimitive();
                                 }
-
+                                
                                 if (DatasetFieldConstant.keywordVocabURI.equals(next.getTypeName())) {
-                                    schemeURI = next.getSinglePrimitive();
+                                    keywordVocabURI = next.getSinglePrimitive();
                                 }
                             }
 
                             if (StringUtils.isNotBlank(subject)) {
                                 subject_check = writeOpenTag(xmlw, "subjects", subject_check);
-                                writeSubjectElement(xmlw, subjectScheme, schemeURI, subject, language);
+                                writeSubjectElement(xmlw, subjectScheme, keywordTermURI, keywordVocabURI, subject, language);
                             }
                         }
                     }
@@ -509,7 +511,7 @@ public static void writeSubjectsElement(XMLStreamWriter xmlw, DatasetVersionDTO
 
                             if (StringUtils.isNotBlank(subject)) {
                                 subject_check = writeOpenTag(xmlw, "subjects", subject_check);
-                                writeSubjectElement(xmlw, subjectScheme, schemeURI, subject, language);
+                                writeSubjectElement(xmlw, subjectScheme, null, schemeURI, subject, language);
                             }
                         }
                     }
@@ -529,7 +531,7 @@ public static void writeSubjectsElement(XMLStreamWriter xmlw, DatasetVersionDTO
      * @param language
      * @throws XMLStreamException
      */
-    private static void writeSubjectElement(XMLStreamWriter xmlw, String subjectScheme, String schemeURI, String value, String language) throws XMLStreamException {
+    private static void writeSubjectElement(XMLStreamWriter xmlw, String subjectScheme, String valueURI, String schemeURI, String value, String language) throws XMLStreamException {
         // write a subject
         Map<String, String> subject_map = new HashMap<String, String>();
 
@@ -540,6 +542,9 @@ private static void writeSubjectElement(XMLStreamWriter xmlw, String subjectSche
         if (StringUtils.isNotBlank(subjectScheme)) {
             subject_map.put("subjectScheme", subjectScheme);
         }
+        if (StringUtils.isNotBlank(valueURI)) {
+            subject_map.put("valueURI", valueURI);
+        }
         if (StringUtils.isNotBlank(schemeURI)) {
             subject_map.put("schemeURI", schemeURI);
         }
@@ -700,53 +705,23 @@ public static void writeContributorElement(XMLStreamWriter xmlw, String contribu
         boolean nameType_check = false;
         Map<String, String> contributor_map = new HashMap<String, String>();
 
-        contributorName = Cleanup.normalize(contributorName);
-        // Datacite algorithm, https://github.com/IQSS/dataverse/issues/2243#issuecomment-358615313
-        if (contributorName.contains(",")) {
-            String givenName = FirstNames.getInstance().getFirstName(contributorName);
-            boolean isOrganization = Organizations.getInstance().isOrganization(contributorName);
+        JsonObject contributorObj = PersonOrOrgUtil.getPersonOrOrganization(contributorName,
+                ("ContactPerson".equals(contributorType) && !isValidEmailAddress(contributorName)), false);
 
-            // contributorName=<FamilyName>, <FirstName>
-            if (givenName != null && !isOrganization) {
-                // givenName ok
+        if (contributorObj.getBoolean("isPerson")) {
+            if(contributorObj.containsKey("givenName")) {
                 contributor_map.put("nameType", "Personal");
-                nameType_check = true;
-            } else if (isOrganization || ("ContactPerson".equals(contributorType) && !isValidEmailAddress(contributorName))) {
-                contributor_map.put("nameType", "Organizational");
-            }
-            writeFullElement(xmlw, null, "contributorName", contributor_map, contributorName, language);
-
-            if ((nameType_check) && (!contributorName.replaceFirst(",", "").contains(","))) {
-                // contributorName=<FamilyName>, <FirstName>
-                String[] fullName = contributorName.split(", ");
-                givenName = fullName[1];
-                String familyName = fullName[0];
-
-                writeFullElement(xmlw, null, "givenName", null, givenName, language);
-                writeFullElement(xmlw, null, "familyName", null, familyName, language);
             }
         } else {
-            String givenName = FirstNames.getInstance().getFirstName(contributorName);
-            boolean isOrganization = Organizations.getInstance().isOrganization(contributorName);
-
-            if (givenName != null && !isOrganization) {
-                contributor_map.put("nameType", "Personal");
-                writeFullElement(xmlw, null, "contributorName", contributor_map, contributorName, language);
-
-                String familyName = "";
-                if (givenName.length() + 1 < contributorName.length()) {
-                    familyName = contributorName.substring(givenName.length() + 1);
-                }
+            contributor_map.put("nameType", "Organizational");
+        }
+        writeFullElement(xmlw, null, "contributorName", contributor_map, contributorName, language);
 
-                writeFullElement(xmlw, null, "givenName", null, givenName, language);
-                writeFullElement(xmlw, null, "familyName", null, familyName, language);
-            } else {
-                // default
-                if (isOrganization || ("ContactPerson".equals(contributorType) && !isValidEmailAddress(contributorName))) {
-                    contributor_map.put("nameType", "Organizational");
-                }
-                writeFullElement(xmlw, null, "contributorName", contributor_map, contributorName, language);
-            }
+        if (contributorObj.containsKey("givenName")) {
+            writeFullElement(xmlw, null, "givenName", null, contributorObj.getString("givenName"), language);
+        }
+        if (contributorObj.containsKey("familyName")) {
+            writeFullElement(xmlw, null, "familyName", null, contributorObj.getString("familyName"), language);
         }
 
         if (StringUtils.isNotBlank(contributorAffiliation)) {
@@ -970,6 +945,7 @@ public static void writeRelatedIdentifierElement(XMLStreamWriter xmlw, DatasetVe
                             String relatedIdentifierType = null;
                             String relatedIdentifier = null; // is used when relatedIdentifierType variable is not URL
                             String relatedURL = null; // is used when relatedIdentifierType variable is URL
+                            String relationType = null; // is used when relatedIdentifierType variable is URL
 
                             for (Iterator<FieldDTO> iterator = fieldDTOs.iterator(); iterator.hasNext();) {
                                 FieldDTO next = iterator.next();
@@ -982,6 +958,9 @@ public static void writeRelatedIdentifierElement(XMLStreamWriter xmlw, DatasetVe
                                 if (DatasetFieldConstant.publicationURL.equals(next.getTypeName())) {
                                     relatedURL = next.getSinglePrimitive();
                                 }
+                                if (DatasetFieldConstant.publicationRelationType.equals(next.getTypeName())) {
+                                    relationType = next.getSinglePrimitive();
+                                }
                             }
 
                             if (StringUtils.isNotBlank(relatedIdentifierType)) {
@@ -994,7 +973,10 @@ public static void writeRelatedIdentifierElement(XMLStreamWriter xmlw, DatasetVe
                                 }
 
                                 relatedIdentifier_map.put("relatedIdentifierType", relatedIdentifierType);
-                                relatedIdentifier_map.put("relationType", "IsCitedBy");
+                                if(relationType== null) {
+                                    relationType = "IsCitedBy";
+                                }
+                                relatedIdentifier_map.put("relationType", relationType);
 
                                 if (StringUtils.containsIgnoreCase(relatedIdentifierType, "url")) {
                                     writeFullElement(xmlw, null, "relatedIdentifier", relatedIdentifier_map, relatedURL, language);
@@ -1125,28 +1107,10 @@ public static void writeAccessRightsElement(XMLStreamWriter xmlw, DatasetVersion
         }
         xmlw.writeEndElement(); // </rights>
 
-        // check if getLicense() method contains CC0
-        // check if getTermsOfUse() method starts with http://
         writeRightsHeader(xmlw, language);
-        if (StringUtils.isNotBlank(datasetVersionDTO.getLicense())) {
-            if (StringUtils.containsIgnoreCase(datasetVersionDTO.getLicense(), "cc0")) {
-                xmlw.writeAttribute("rightsURI", "https://creativecommons.org/publicdomain/zero/1.0/");
-                if (StringUtils.isNotBlank(datasetVersionDTO.getTermsOfUse())) {
-                    xmlw.writeCharacters(datasetVersionDTO.getTermsOfUse());
-                }
-            } else if (StringUtils.isNotBlank(datasetVersionDTO.getTermsOfUse())) {
-                if (StringUtils.startsWithIgnoreCase(datasetVersionDTO.getTermsOfUse().trim(), "http")) {
-                    xmlw.writeAttribute("rightsURI", datasetVersionDTO.getTermsOfUse());
-                } else {
-                    xmlw.writeCharacters(datasetVersionDTO.getTermsOfUse());
-                }
-            }
-        } else if (StringUtils.isNotBlank(datasetVersionDTO.getTermsOfUse())) {
-            if (StringUtils.startsWithIgnoreCase(datasetVersionDTO.getTermsOfUse().trim(), "http")) {
-                xmlw.writeAttribute("rightsURI", datasetVersionDTO.getTermsOfUse());
-            } else {
-                xmlw.writeCharacters(datasetVersionDTO.getTermsOfUse());
-            }
+        if (datasetVersionDTO.getLicense() != null) {
+            xmlw.writeAttribute("rightsURI", datasetVersionDTO.getLicense().getUri());
+            xmlw.writeCharacters(datasetVersionDTO.getLicense().getName());
         }
         xmlw.writeEndElement(); // </rights>
         xmlw.writeEndElement(); // </rightsList>
@@ -1264,26 +1228,17 @@ public static void writeDescriptionsElement(XMLStreamWriter xmlw, DatasetVersion
                     if (DatasetFieldConstant.series.equals(fieldDTO.getTypeName())) {
                         // String seriesName = null;
                         String seriesInformation = null;
-
-                        Set<FieldDTO> fieldDTOs = fieldDTO.getSingleCompound();
-                        for (Iterator<FieldDTO> iterator = fieldDTOs.iterator(); iterator.hasNext();) {
-                            FieldDTO next = iterator.next();
-                            /*if (DatasetFieldConstant.seriesName.equals(next.getTypeName())) {
-                                seriesName =  next.getSinglePrimitive();
-                            }*/
-                            if (DatasetFieldConstant.seriesInformation.equals(next.getTypeName())) {
-                                seriesInformation = next.getSinglePrimitive();
+                        for (HashSet<FieldDTO> fieldDTOs : fieldDTO.getMultipleCompound()) {
+                            for (Iterator<FieldDTO> iterator = fieldDTOs.iterator(); iterator.hasNext();) {
+                                FieldDTO next = iterator.next();
+                                if (DatasetFieldConstant.seriesInformation.equals(next.getTypeName())) {
+                                    seriesInformation = next.getSinglePrimitive();
+                                }
+                            }
+                            if (StringUtils.isNotBlank(seriesInformation)) {
+                                description_check = writeOpenTag(xmlw, "descriptions", description_check);
+                                writeDescriptionElement(xmlw, "SeriesInformation", seriesInformation, language);
                             }
-                        }
-
-                        /*if (StringUtils.isNotBlank(seriesName)){
-                        	contributor_check = writeOpenTag(xmlw, "descriptions", description_check);
-                        	
-                        	writeDescriptionElement(xmlw, "SeriesInformation", seriesName);
-                        }*/
-                        if (StringUtils.isNotBlank(seriesInformation)) {
-                            description_check = writeOpenTag(xmlw, "descriptions", description_check);
-                            writeDescriptionElement(xmlw, "SeriesInformation", seriesInformation, language);
                         }
                     }
                 }
@@ -1329,12 +1284,16 @@ private static void writeDescriptionElement(XMLStreamWriter xmlw, String descrip
      */
     public static void writeGeoLocationsElement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO, String language) throws XMLStreamException {
         // geoLocation -> geoLocationPlace
-        String geoLocationPlace = dto2Primitive(datasetVersionDTO, DatasetFieldConstant.productionPlace);
+        List<String> geoLocationPlaces = dto2MultiplePrimitive(datasetVersionDTO, DatasetFieldConstant.productionPlace);
         boolean geoLocations_check = false;
 
         // write geoLocations
         geoLocations_check = writeOpenTag(xmlw, "geoLocations", geoLocations_check);
-        writeGeolocationPlace(xmlw, geoLocationPlace, language);
+        if (geoLocationPlaces != null) {
+            for (String geoLocationPlace : geoLocationPlaces) {
+                writeGeolocationPlace(xmlw, geoLocationPlace, language);
+            }
+        }
                 
         // get DatasetFieldConstant.geographicBoundingBox
         for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
@@ -1501,6 +1460,8 @@ public static void writeFundingReferencesElement(XMLStreamWriter xmlw, DatasetVe
         writeEndTag(xmlw, fundingReference_check);
     }
 
+    
+    //Duplicates XmlWriterUtil.dto2Primitive
     private static String dto2Primitive(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName) {
         // give the single value of the given metadata
         for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
@@ -1513,6 +1474,26 @@ private static String dto2Primitive(DatasetVersionDTO datasetVersionDTO, String
         }
         return null;
     }
+    
+    /**
+     * 
+     * @param datasetVersionDTO
+     * @param datasetFieldTypeName
+     * @return List<String> Multiple Primitive
+     * 
+     */
+    private static List<String> dto2MultiplePrimitive(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName) {
+        // give the single value of the given metadata
+        for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
+            MetadataBlockDTO value = entry.getValue();
+            for (FieldDTO fieldDTO : value.getFields()) {
+                if (datasetFieldTypeName.equals(fieldDTO.getTypeName())) {
+                    return fieldDTO.getMultiplePrimitive();
+                }
+            }
+        }
+        return null;
+    }
 
     /**
      * Write a full tag.
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/spi/Exporter.java b/src/main/java/edu/harvard/iq/dataverse/export/spi/Exporter.java
deleted file mode 100644
index e44265946f6..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/export/spi/Exporter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse.export.spi;
-
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.export.ExportException;
-import java.io.OutputStream;
-import javax.json.JsonObject;
-import javax.ws.rs.core.MediaType;
-
-/**
- *
- * @author skraffmi
- */
-public interface Exporter {
-    
-    /* When implementing exportDataset, when done writing content, please make sure to flush() the outputStream, 
-       but NOT close() it!
-       This way an exporter can be used to insert the produced metadata into the 
-       body of an HTTP response, etc. (for example, to insert it into the body 
-       of an OAI response, where more XML needs to be written, for the outer 
-       OAI-PMH record). -- L.A.  4.5
-    */
-    //public void exportDataset(JsonObject json, OutputStream outputStream) throws ExportException;
-    
-    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException;
-    
-    public String getProviderName();
-    
-    public String getDisplayName();
-    
-    public Boolean isXMLFormat();
-    
-    public Boolean isHarvestable();
-    
-    public Boolean isAvailableToUsers();
-    
-    /* These should throw an ExportException if called on an Exporter that is not isXMLFormat(): */
-    public String getXMLNameSpace() throws ExportException;
-    public String getXMLSchemaLocation() throws ExportException; 
-    public String getXMLSchemaVersion() throws ExportException; 
-    
-    public void setParam(String name, Object value);
-
-	public default String getMediaType() {
-	    return MediaType.APPLICATION_XML;
-	};
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java
index 230b51e1e2c..c103f6981e1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java
+++ b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java
@@ -1,16 +1,25 @@
 package edu.harvard.iq.dataverse.externaltools;
 
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.StringUtil;
+
 import java.io.Serializable;
 import java.util.Arrays;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import java.util.List;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
 
 /**
  * A specification or definition for how an external tool is intended to
@@ -22,11 +31,16 @@ public class ExternalTool implements Serializable {
 
     public static final String DISPLAY_NAME = "displayName";
     public static final String DESCRIPTION = "description";
-    public static final String TYPE = "type";
+    public static final String LEGACY_SINGLE_TYPE = "type";
+    public static final String TYPES = "types";
     public static final String SCOPE = "scope";
     public static final String TOOL_URL = "toolUrl";
     public static final String TOOL_PARAMETERS = "toolParameters";
     public static final String CONTENT_TYPE = "contentType";
+    public static final String TOOL_NAME = "toolName";
+    public static final String ALLOWED_API_CALLS = "allowedApiCalls";
+    public static final String REQUIREMENTS = "requirements";
+    public static final String AUX_FILES_EXIST = "auxFilesExist";
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -39,6 +53,12 @@ public class ExternalTool implements Serializable {
     @Column(nullable = false)
     private String displayName;
 
+    /**
+     * Type of tool such as dct, explorer, etc
+     */
+    @Column(nullable = true)
+    private String toolName;
+
     /**
      * The description of the tool in English.
      */
@@ -47,11 +67,11 @@ public class ExternalTool implements Serializable {
     private String description;
 
     /**
-     * Whether the tool is an "explore" tool or a "configure" tool, for example.
+     * A tool can be multiple types, "explore", "configure", "preview", etc.
      */
-    @Column(nullable = false)
-    @Enumerated(EnumType.STRING)
-    private Type type;
+    @OneToMany(mappedBy = "externalTool", cascade = CascadeType.ALL)
+    @JoinColumn(nullable = false)
+    private List<ExternalToolType> externalToolTypes;
 
     /**
      * Whether the tool operates at the dataset or file level.
@@ -77,6 +97,23 @@ public class ExternalTool implements Serializable {
     @Column(nullable = true, columnDefinition = "TEXT")
     private String contentType;
 
+    /**
+     * Set of API calls the tool would like to be able to use (e,.g. for retrieving
+     * data through the Dataverse REST API). Used to build signedUrls for POST
+     * headers, as in DP Creator
+     */
+    @Column(nullable = true, columnDefinition = "TEXT")
+    private String allowedApiCalls;
+
+    /**
+     * When non-null, the tool has indicated that it has certain requirements
+     * that must be met before it should be shown to the user. This
+     * functionality was added for tools that operate on aux files rather than
+     * data files so "auxFilesExist" is one of the possible values.
+     */
+    @Column(nullable = true, columnDefinition = "TEXT")
+    private String requirements;
+
     /**
      * This default constructor is only here to prevent this error at
      * deployment:
@@ -91,20 +128,29 @@ public class ExternalTool implements Serializable {
     public ExternalTool() {
     }
 
-    public ExternalTool(String displayName, String description, Type type, Scope scope, String toolUrl, String toolParameters, String contentType) {
+    public ExternalTool(String displayName, String toolName, String description, List<ExternalToolType> externalToolTypes, Scope scope, String toolUrl, String toolParameters, String contentType) {
+       this(displayName, toolName, description, externalToolTypes, scope, toolUrl, toolParameters, contentType, null, null);
+    }
+
+    public ExternalTool(String displayName, String toolName, String description, List<ExternalToolType> externalToolTypes, Scope scope, String toolUrl, String toolParameters, String contentType, String allowedApiCalls, String requirements) {
         this.displayName = displayName;
+        this.toolName = toolName;
         this.description = description;
-        this.type = type;
+        this.externalToolTypes = externalToolTypes;
         this.scope = scope;
         this.toolUrl = toolUrl;
         this.toolParameters = toolParameters;
         this.contentType = contentType;
+        this.allowedApiCalls = allowedApiCalls;
+        this.requirements = requirements;
     }
 
     public enum Type {
 
         EXPLORE("explore"),
-        CONFIGURE("configure");
+        CONFIGURE("configure"),
+        PREVIEW("preview"),
+        QUERY("query");
 
         private final String text;
 
@@ -169,10 +215,14 @@ public String getDisplayName() {
         return displayName;
     }
 
+    public String  getToolName() { return toolName; }
+
     public void setDisplayName(String displayName) {
         this.displayName = displayName;
     }
 
+    public void setToolName(String toolName) { this.toolName = toolName; }
+
     public String getDescription() {
         return description;
     }
@@ -181,8 +231,39 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public Type getType() {
-        return type;
+    public List<ExternalToolType> getExternalToolTypes() {
+        return externalToolTypes;
+    }
+
+    public void setExternalToolTypes(List<ExternalToolType> externalToolTypes) {
+        this.externalToolTypes = externalToolTypes;
+    }
+
+    public boolean isExploreTool() {
+        for (ExternalToolType externalToolType : externalToolTypes) {
+            if (externalToolType.getType().equals(Type.EXPLORE)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    public boolean isQueryTool() {
+        for (ExternalToolType externalToolType : externalToolTypes) {
+            if (externalToolType.getType().equals(Type.QUERY)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    public boolean isPreviewTool() {
+        for (ExternalToolType externalToolType : externalToolTypes) {
+            if (externalToolType.getType().equals(Type.PREVIEW)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     public Scope getScope() {
@@ -217,72 +298,74 @@ public JsonObjectBuilder toJson() {
         JsonObjectBuilder jab = Json.createObjectBuilder();
         jab.add("id", getId());
         jab.add(DISPLAY_NAME, getDisplayName());
+        if (getToolName() != null) {
+            jab.add(TOOL_NAME, getToolName());
+        }
         jab.add(DESCRIPTION, getDescription());
-        jab.add(TYPE, getType().text);
+        JsonArrayBuilder types = Json.createArrayBuilder();
+        for (ExternalToolType externalToolType : externalToolTypes) {
+            types.add(externalToolType.getType().text);
+        }
+        jab.add(TYPES, types);
         jab.add(SCOPE, getScope().text);
         jab.add(TOOL_URL, getToolUrl());
         jab.add(TOOL_PARAMETERS, getToolParameters());
         if (getContentType() != null) {
             jab.add(CONTENT_TYPE, getContentType());
         }
+        if (getAllowedApiCalls()!= null) {
+            jab.add(ALLOWED_API_CALLS,getAllowedApiCalls());
+        }
         return jab;
     }
 
-    public enum ReservedWord {
-
-        // TODO: Research if a format like "{reservedWord}" is easily parse-able or if another format would be
-        // better. The choice of curly braces is somewhat arbitrary, but has been observed in documenation for
-        // various REST APIs. For example, "Variable substitutions will be made when a variable is named in {brackets}."
-        // from https://swagger.io/specification/#fixed-fields-29 but that's for URLs.
-        FILE_ID("fileId"),
-        FILE_PID("filePid"),
-        SITE_URL("siteUrl"),
-        API_TOKEN("apiToken"),
-        // datasetId is the database id
-        DATASET_ID("datasetId"),
-        // datasetPid is the DOI or Handle
-        DATASET_PID("datasetPid"),
-        DATASET_VERSION("datasetVersion"),
-        FILE_METADATA_ID("fileMetadataId"),
-        LOCALE_CODE("localeCode");
-
-        private final String text;
-        private final String START = "{";
-        private final String END = "}";
-
-        private ReservedWord(final String text) {
-            this.text = START + text + END;
+    public String getDescriptionLang() {
+        String description = "";
+        if (this.toolName != null) {
+            description = (BundleUtil.getStringFromBundle("externaltools." + this.toolName + ".description"));
+        } 
+        if (StringUtil.isEmpty(description)) {
+            description = this.getDescription();
         }
+        return description;
+    }
 
-        /**
-         * This is a centralized method that enforces that only reserved words
-         * are allowed to be used by external tools. External tool authors
-         * cannot pass their own query parameters through Dataverse such as
-         * "mode=mode1".
-         *
-         * @throws IllegalArgumentException
-         */
-        public static ReservedWord fromString(String text) throws IllegalArgumentException {
-            if (text != null) {
-                for (ReservedWord reservedWord : ReservedWord.values()) {
-                    if (text.equals(reservedWord.text)) {
-                        return reservedWord;
-                    }
-                }
-            }
-            // TODO: Consider switching to a more informative message that enumerates the valid reserved words.
-            boolean moreInformativeMessage = false;
-            if (moreInformativeMessage) {
-                throw new IllegalArgumentException("Unknown reserved word: " + text + ". A reserved word must be one of these values: " + Arrays.asList(ReservedWord.values()) + ".");
-            } else {
-                throw new IllegalArgumentException("Unknown reserved word: " + text);
-            }
+    public String getDisplayNameLang() {
+        String displayName = "";
+        if (this.toolName != null) {
+            displayName = (BundleUtil.getStringFromBundle("externaltools." + this.toolName + ".displayname"));
+        } 
+        if (StringUtil.isEmpty(displayName)) {
+            displayName = this.getDisplayName();
         }
+        return displayName;
+    }
 
-        @Override
-        public String toString() {
-            return text;
-        }
+    /**
+     * @return the allowedApiCalls
+     */
+    public String getAllowedApiCalls() {
+        return allowedApiCalls;
+    }
+
+    /**
+     * @param allowedApiCalls the allowedApiCalls to set
+     */
+    public void setAllowedApiCalls(String allowedApiCalls) {
+        this.allowedApiCalls = allowedApiCalls;
+    }
+
+    public String getRequirements() {
+        return requirements;
+    }
+
+    public void setRequirements(String requirements) {
+        this.requirements = requirements;
+    }
+
+    public boolean accessesAuxFiles() {
+        String reqs = getRequirements(); 
+        return reqs!=null && reqs.contains(AUX_FILES_EXIST);
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolHandler.java b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolHandler.java
index 3f4781c0d27..e7ae451cacf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolHandler.java
+++ b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolHandler.java
@@ -2,181 +2,176 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
-import edu.harvard.iq.dataverse.externaltools.ExternalTool.ReservedWord;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.util.SystemConfig;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
+import edu.harvard.iq.dataverse.util.URLTokenUtil;
+
+import edu.harvard.iq.dataverse.util.UrlSignerUtil;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Base64;
+import java.util.Map.Entry;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.ws.rs.HttpMethod;
+
+import org.apache.commons.codec.binary.StringUtils;
+
+import static edu.harvard.iq.dataverse.api.ApiConstants.DS_VERSION_LATEST;
 
 /**
  * Handles an operation on a specific file. Requires a file id in order to be
  * instantiated. Applies logic based on an {@link ExternalTool} specification,
  * such as constructing a URL to access that file.
  */
-public class ExternalToolHandler {
+public class ExternalToolHandler extends URLTokenUtil {
 
-    private static final Logger logger = Logger.getLogger(ExternalToolHandler.class.getCanonicalName());
+    public final ExternalTool externalTool;
 
-    private final ExternalTool externalTool;
-    private final DataFile dataFile;
-    private final Dataset dataset;
-    private final FileMetadata fileMetadata;
+    private String requestMethod;
 
-    private ApiToken apiToken;
-    private String localeCode;
+    
 
     /**
      * File level tool
      *
      * @param externalTool The database entity.
-     * @param dataFile Required.
-     * @param apiToken The apiToken can be null because "explore" tools can be
-     * used anonymously.
+     * @param dataFile     Required.
+     * @param apiToken     The apiToken can be null because "explore" tools can be
+     *                     used anonymously.
      */
-    public ExternalToolHandler(ExternalTool externalTool, DataFile dataFile, ApiToken apiToken, FileMetadata fileMetadata, String localeCode) {
+    public ExternalToolHandler(ExternalTool externalTool, DataFile dataFile, ApiToken apiToken,
+            FileMetadata fileMetadata, String localeCode) {
+        super(dataFile, apiToken, fileMetadata, localeCode);
         this.externalTool = externalTool;
-        if (dataFile == null) {
-            String error = "A DataFile is required.";
-            logger.warning("Error in ExternalToolHandler constructor: " + error);
-            throw new IllegalArgumentException(error);
-        }
-        if (fileMetadata == null) {
-            String error = "A FileMetadata is required.";
-            logger.warning("Error in ExternalToolHandler constructor: " + error);
-            throw new IllegalArgumentException(error);
-        }
-        this.dataFile = dataFile;
-        this.apiToken = apiToken;
-        this.fileMetadata = fileMetadata;
-        dataset = fileMetadata.getDatasetVersion().getDataset();
-        this.localeCode = localeCode;
     }
 
     /**
      * Dataset level tool
      *
      * @param externalTool The database entity.
-     * @param dataset Required.
-     * @param apiToken The apiToken can be null because "explore" tools can be
-     * used anonymously.
+     * @param dataset      Required.
+     * @param apiToken     The apiToken can be null because "explore" tools can be
+     *                     used anonymously.
      */
     public ExternalToolHandler(ExternalTool externalTool, Dataset dataset, ApiToken apiToken, String localeCode) {
+        super(dataset, apiToken, localeCode);
         this.externalTool = externalTool;
-        if (dataset == null) {
-            String error = "A Dataset is required.";
-            logger.warning("Error in ExternalToolHandler constructor: " + error);
-            throw new IllegalArgumentException(error);
-        }
-        this.dataset = dataset;
-        this.apiToken = apiToken;
-        this.dataFile = null;
-        this.fileMetadata = null;
-        this.localeCode = localeCode;
     }
 
-    public DataFile getDataFile() {
-        return dataFile;
-    }
-
-    public FileMetadata getFileMetadata() {
-        return fileMetadata;
-    }
-
-    public ApiToken getApiToken() {
-        return apiToken;
-    }
-
-    public String getLocaleCode() {
-        return localeCode;
-    }
-
-    // TODO: rename to handleRequest() to someday handle sending headers as well as query parameters.
-    public String getQueryParametersForUrl() {
-        String toolParameters = externalTool.getToolParameters();
-        JsonReader jsonReader = Json.createReader(new StringReader(toolParameters));
-        JsonObject obj = jsonReader.readObject();
-        JsonArray queryParams = obj.getJsonArray("queryParameters");
-        if (queryParams == null || queryParams.isEmpty()) {
-            return "";
-        }
-        List<String> params = new ArrayList<>();
-        queryParams.getValuesAs(JsonObject.class).forEach((queryParam) -> {
-            queryParam.keySet().forEach((key) -> {
-                String value = queryParam.getString(key);
-                String param = getQueryParam(key, value);
-                if (param != null && !param.isEmpty()) {
-                    params.add(param);
-                }
-            });
-        });
-        return "?" + String.join("&", params);
+    public String handleRequest() {
+        return handleRequest(false);
     }
 
-    private String getQueryParam(String key, String value) {
-        ReservedWord reservedWord = ReservedWord.fromString(value);
-        switch (reservedWord) {
-            case FILE_ID:
-                // getDataFile is never null for file tools because of the constructor
-                return key + "=" + getDataFile().getId();
-            case FILE_PID:
-                GlobalId filePid = getDataFile().getGlobalId();
-                if (filePid != null) {
-                    return key + "=" + getDataFile().getGlobalId();
-                }
-                break;
-            case SITE_URL:
-                return key + "=" + SystemConfig.getDataverseSiteUrlStatic();
-            case API_TOKEN:
-                String apiTokenString = null;
-                ApiToken theApiToken = getApiToken();
-                if (theApiToken != null) {
-                    apiTokenString = theApiToken.getTokenString();
-                    return key + "=" + apiTokenString;
-                }
-                break;
-            case DATASET_ID:
-                return key + "=" + dataset.getId();
-            case DATASET_PID:
-                return key + "=" + dataset.getGlobalId().asString();
-            case DATASET_VERSION:
-                String versionString = null;
-                if(fileMetadata!=null) { //true for file case
-                    versionString = fileMetadata.getDatasetVersion().getFriendlyVersionNumber();
-                } else { //Dataset case - return the latest visible version (unless/until the dataset case allows specifying a version)
-                    if (getApiToken() != null) {
-                        versionString = dataset.getLatestVersion().getFriendlyVersionNumber();
+    public String handleRequest(boolean preview) {
+        JsonObject toolParameters = JsonUtil.getJsonObject(externalTool.getToolParameters());
+        JsonString method = toolParameters.getJsonString(HTTP_METHOD);
+        requestMethod = method != null ? method.getString() : HttpMethod.GET;
+        JsonObject params = getParams(toolParameters);
+        logger.fine("Found params: " + JsonUtil.prettyPrint(params));
+        if (requestMethod.equals(HttpMethod.GET)) {
+            String paramsString = "";
+            if (externalTool.getAllowedApiCalls() == null) {
+                // Legacy, using apiKey
+                logger.fine("Legacy Case");
+
+                for (Entry<String, JsonValue> entry : params.entrySet()) {
+                    paramsString = paramsString + (paramsString.isEmpty() ? "?" : "&") + entry.getKey() + "=";
+                    JsonValue val = entry.getValue();
+                    if (val.getValueType().equals(JsonValue.ValueType.NUMBER)) {
+                        paramsString += ((JsonNumber) val).intValue();
                     } else {
-                        versionString = dataset.getLatestVersionForCopy().getFriendlyVersionNumber();
+                        paramsString += ((JsonString) val).getString();
                     }
                 }
-                if (("DRAFT").equals(versionString)) {
-                    versionString = ":draft"; // send the token needed in api calls that can be substituted for a numeric
-                                              // version.
+            } else {
+                //Send a signed callback to get params and signedURLs 
+                String callback = null;
+                switch (externalTool.getScope()) {
+                case DATASET:
+                    callback=SystemConfig.getDataverseSiteUrlStatic() + "/api/v1/datasets/"
+                            + dataset.getId() + "/versions/" + DS_VERSION_LATEST + "/toolparams/" + externalTool.getId();
+                    break;
+                case FILE:
+                    callback= SystemConfig.getDataverseSiteUrlStatic() + "/api/v1/files/"
+                            + dataFile.getId() + "/metadata/" + fileMetadata.getId() + "/toolparams/"
+                            + externalTool.getId();
+                }
+                if (apiToken != null) {
+                    callback = UrlSignerUtil.signUrl(callback, 5, apiToken.getAuthenticatedUser().getUserIdentifier(), HttpMethod.GET,
+                        JvmSettings.API_SIGNING_SECRET.lookupOptional().orElse("") + apiToken.getTokenString());
+                }
+                paramsString= "?callback=" + Base64.getEncoder().encodeToString(StringUtils.getBytesUtf8(callback));
+                if (getLocaleCode() != null) {
+                    paramsString += "&locale=" + getLocaleCode();
                 }
-                return key + "=" + versionString;
-            case FILE_METADATA_ID:
-                if(fileMetadata!=null) { //true for file case
-                    return key + "=" + fileMetadata.getId();
+            }
+            if (preview) {
+                paramsString += "&preview=true";
+            }
+            logger.fine("GET return is: " + paramsString);
+            return paramsString;
+
+        } else {
+            // ToDo - if the allowedApiCalls() are defined, could/should we send them to
+            // tools using POST as well?
+
+            if (requestMethod.equals(HttpMethod.POST)) {
+                String body = JsonUtil.prettyPrint(createPostBody(params, null).build());
+                try {
+                    logger.fine("POST Body: " + body);
+                    return postFormData(body);
+                } catch (IOException | InterruptedException ex) {
+                    Logger.getLogger(ExternalToolHandler.class.getName()).log(Level.SEVERE, null, ex);
                 }
-            case LOCALE_CODE:
-                return key + "=" + getLocaleCode();
-            default:
-                break;
+            }
         }
         return null;
     }
 
+    private String postFormData(String allowedApis) throws IOException, InterruptedException {
+        String url = null;
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder().POST(HttpRequest.BodyPublishers.ofString(allowedApis))
+                .uri(URI.create(externalTool.getToolUrl())).header("Content-Type", "application/json").build();
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+        boolean redirect = false;
+        int status = response.statusCode();
+        if (status != HttpURLConnection.HTTP_OK) {
+            if (status == HttpURLConnection.HTTP_MOVED_TEMP || status == HttpURLConnection.HTTP_MOVED_PERM
+                    || status == HttpURLConnection.HTTP_SEE_OTHER) {
+                redirect = true;
+            }
+        }
+        if (redirect == true) {
+            String newUrl = response.headers().firstValue("location").get();
+//            toolContext = "http://" + response.uri().getAuthority();
+
+            url = newUrl;
+        }
+        return url;
+    }
+
     public String getToolUrlWithQueryParams() {
-        return externalTool.getToolUrl() + getQueryParametersForUrl();
+        String params = ExternalToolHandler.this.handleRequest();
+        return externalTool.getToolUrl() + params;
+    }
+
+    public String getToolUrlForPreviewMode() {
+        return externalTool.getToolUrl() + handleRequest(true);
     }
 
     public ExternalTool getExternalTool() {
@@ -187,4 +182,21 @@ public void setApiToken(ApiToken apiToken) {
         this.apiToken = apiToken;
     }
 
+    /**
+     * @return Returns Javascript that opens the explore tool in a new browser tab
+     *         if the browser allows it.If not, it shows an alert that popups must
+     *         be enabled in the browser.
+     */
+    public String getExploreScript() {
+        String toolUrl = this.getToolUrlWithQueryParams();
+        logger.fine("Exploring with " + toolUrl);
+        return getScriptForUrl(toolUrl);
+    }
+
+    // TODO: Consider merging with getExploreScript
+    public String getConfigureScript() {
+        String toolUrl = this.getToolUrlWithQueryParams();
+        logger.fine("Configuring with " + toolUrl);
+        return getScriptForUrl(toolUrl);
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolServiceBean.java
index 6d3490750a3..5ee0bf1355d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolServiceBean.java
@@ -1,36 +1,38 @@
 package edu.harvard.iq.dataverse.externaltools;
 
+import edu.harvard.iq.dataverse.AuxiliaryFile;
+import edu.harvard.iq.dataverse.AuxiliaryFileServiceBean;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.DataFileServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
-import edu.harvard.iq.dataverse.externaltools.ExternalTool.ReservedWord;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool.Type;
+import edu.harvard.iq.dataverse.util.URLTokenUtil.ReservedWord;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool.Scope;
 
-import static edu.harvard.iq.dataverse.externaltools.ExternalTool.DESCRIPTION;
-import static edu.harvard.iq.dataverse.externaltools.ExternalTool.DISPLAY_NAME;
-import static edu.harvard.iq.dataverse.externaltools.ExternalTool.TOOL_PARAMETERS;
-import static edu.harvard.iq.dataverse.externaltools.ExternalTool.TOOL_URL;
-import static edu.harvard.iq.dataverse.externaltools.ExternalTool.TYPE;
-import static edu.harvard.iq.dataverse.externaltools.ExternalTool.SCOPE;
-import static edu.harvard.iq.dataverse.externaltools.ExternalTool.CONTENT_TYPE;
-import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
+
+import static edu.harvard.iq.dataverse.externaltools.ExternalTool.*;
+
+import jakarta.ejb.EJB;
+import jakarta.json.JsonValue;
 
 @Stateless
 @Named
@@ -41,13 +43,16 @@ public class ExternalToolServiceBean {
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
 
+    @EJB
+    AuxiliaryFileServiceBean auxiliaryFileService;
+
     public List<ExternalTool> findAll() {
         TypedQuery<ExternalTool> typedQuery = em.createQuery("SELECT OBJECT(o) FROM ExternalTool AS o ORDER BY o.id", ExternalTool.class);
         return typedQuery.getResultList();
     }
 
     /**
-     * @param type explore or configure
+     * @param type explore, configure or preview
      * @return A list of tools or an empty list.
      */
     public List<ExternalTool> findDatasetToolsByType(Type type) {
@@ -56,7 +61,7 @@ public List<ExternalTool> findDatasetToolsByType(Type type) {
     }
 
     /**
-     * @param type explore or configure
+     * @param type explore, configure or preview, query
      * @return A list of tools or an empty list.
      */
     public List<ExternalTool> findFileToolsByType(Type type) {
@@ -65,7 +70,7 @@ public List<ExternalTool> findFileToolsByType(Type type) {
     }
 
     /**
-     * @param type explore or configure
+     * @param type explore, configure or preview, query
      * @param contentType file content type (MIME type)
      * @return A list of tools or an empty list.
      */
@@ -75,7 +80,7 @@ public List<ExternalTool> findFileToolsByTypeAndContentType(Type type, String co
 
     /**
      * @param scope dataset or file
-     * @param type explore or configure
+     * @param type explore, configure, or preview
      * @param contentType file content type (MIME type)
      * @return A list of tools or an empty list.
      */
@@ -85,7 +90,7 @@ private List<ExternalTool> findByScopeTypeAndContentType(Scope scope, Type type,
         if (contentType != null) {
             contentTypeClause = "AND o.contentType = :contentType";
         }
-        TypedQuery<ExternalTool> typedQuery = em.createQuery("SELECT OBJECT(o) FROM ExternalTool AS o WHERE o.scope = :scope AND o.type = :type " + contentTypeClause, ExternalTool.class);
+        TypedQuery<ExternalTool> typedQuery = em.createQuery("SELECT OBJECT(o) FROM ExternalTool AS o JOIN o.externalToolTypes t WHERE o.scope = :scope AND t.type = :type " + contentTypeClause, ExternalTool.class);
         typedQuery.setParameter("scope", scope);
         typedQuery.setParameter("type", type);
         if (contentType != null) {
@@ -121,6 +126,10 @@ public boolean delete(long doomedId) {
     }
 
     public ExternalTool save(ExternalTool externalTool) {
+        for (ExternalToolType externalToolType : externalTool.getExternalToolTypes()) {
+            // Avoid ERROR: null value in column "externaltool_id" violates not-null constraint
+            externalToolType.setExternalTool(externalTool);
+        }
         em.persist(externalTool);
         return em.merge(externalTool);
     }
@@ -130,13 +139,14 @@ public ExternalTool save(ExternalTool externalTool) {
      * file supports The list of tools is passed in so it doesn't hit the
      * database each time
      */
-    public static List<ExternalTool> findExternalToolsByFile(List<ExternalTool> allExternalTools, DataFile file) {
+    public List<ExternalTool> findExternalToolsByFile(List<ExternalTool> allExternalTools, DataFile file) {
         List<ExternalTool> externalTools = new ArrayList<>();
         //Map tabular data to it's mimetype (the isTabularData() check assures that this code works the same as before, but it may need to change if tabular data is split into subtypes with differing mimetypes)
         final String contentType = file.isTabularData() ? DataFileServiceBean.MIME_TYPE_TSV_ALT : file.getContentType();
+        boolean isAccessible = StorageIO.isDataverseAccessible(DataAccess.getStorageDriverFromIdentifier(file.getStorageIdentifier()));
         allExternalTools.forEach((externalTool) -> {
-            //Match tool and file type 
-            if (contentType.equals(externalTool.getContentType())) {
+            //Match tool and file type, then check requirements
+            if (contentType.equals(externalTool.getContentType()) && meetsRequirements(externalTool, file) && (isAccessible || externalTool.accessesAuxFiles())) {
                 externalTools.add(externalTool);
             }
         });
@@ -144,21 +154,46 @@ public static List<ExternalTool> findExternalToolsByFile(List<ExternalTool> allE
         return externalTools;
     }
 
+    public boolean meetsRequirements(ExternalTool externalTool, DataFile dataFile) {
+        String requirements = externalTool.getRequirements();
+        if (requirements == null) {
+            logger.fine("Data file id" + dataFile.getId() + ": no requirements for tool id " + externalTool.getId());
+            return true;
+        }
+        boolean meetsRequirements = true;
+        JsonObject requirementsObj = JsonUtil.getJsonObject(requirements);
+        JsonArray auxFilesExist = requirementsObj.getJsonArray(ExternalTool.AUX_FILES_EXIST);
+        for (JsonValue jsonValue : auxFilesExist) {
+            String formatTag = jsonValue.asJsonObject().getString("formatTag");
+            String formatVersion = jsonValue.asJsonObject().getString("formatVersion");
+            AuxiliaryFile auxFile = auxiliaryFileService.lookupAuxiliaryFile(dataFile, formatTag, formatVersion);
+            if (auxFile == null) {
+                logger.fine("Data file id" + dataFile.getId() + ": cannot find required aux file. formatTag=" + formatTag + ". formatVersion=" + formatVersion);
+                meetsRequirements = false;
+                break;
+            } else {
+                logger.fine("Data file id" + dataFile.getId() + ": found required aux file. formatTag=" + formatTag + ". formatVersion=" + formatVersion);
+                meetsRequirements = true;
+            }
+        }
+        return meetsRequirements;
+    }
+
     public static ExternalTool parseAddExternalToolManifest(String manifest) {
+
         if (manifest == null || manifest.isEmpty()) {
             throw new IllegalArgumentException("External tool manifest was null or empty!");
         }
-        JsonReader jsonReader = Json.createReader(new StringReader(manifest));
-        JsonObject jsonObject = jsonReader.readObject();
+        JsonObject jsonObject = JsonUtil.getJsonObject(manifest);
         //Note: ExternalToolServiceBeanTest tests are dependent on the order of these retrievals
         String displayName = getRequiredTopLevelField(jsonObject, DISPLAY_NAME);
+        String toolName = getOptionalTopLevelField(jsonObject, TOOL_NAME);
         String description = getRequiredTopLevelField(jsonObject, DESCRIPTION);
-        String typeUserInput = getRequiredTopLevelField(jsonObject, TYPE);
+        // Types are complicated enough to warrant their own method.
+        List<ExternalToolType> externalToolTypes = getAndValidateTypes(jsonObject);
         String scopeUserInput = getRequiredTopLevelField(jsonObject, SCOPE);
         String contentType = getOptionalTopLevelField(jsonObject, CONTENT_TYPE);
 
-        // Allow IllegalArgumentException to bubble up from ExternalTool.Type.fromString
-        ExternalTool.Type type = ExternalTool.Type.fromString(typeUserInput);
         ExternalTool.Scope scope = ExternalTool.Scope.fromString(scopeUserInput);
         if (scope.equals(Scope.FILE) && (contentType == null || contentType.isEmpty())) {
             contentType = getRequiredTopLevelField(jsonObject, CONTENT_TYPE);
@@ -166,6 +201,9 @@ public static ExternalTool parseAddExternalToolManifest(String manifest) {
         String toolUrl = getRequiredTopLevelField(jsonObject, TOOL_URL);
         JsonObject toolParametersObj = jsonObject.getJsonObject(TOOL_PARAMETERS);
         JsonArray queryParams = toolParametersObj.getJsonArray("queryParameters");
+        JsonArray allowedApiCallsArray = jsonObject.getJsonArray(ALLOWED_API_CALLS);
+        JsonObject requirementsObj = jsonObject.getJsonObject(REQUIREMENTS);
+ 
         boolean allRequiredReservedWordsFound = false;
         if (scope.equals(Scope.FILE)) {
             List<ReservedWord> requiredReservedWordCandidates = new ArrayList<>();
@@ -218,7 +256,16 @@ public static ExternalTool parseAddExternalToolManifest(String manifest) {
 
         }
         String toolParameters = toolParametersObj.toString();
-        return new ExternalTool(displayName, description, type, scope, toolUrl, toolParameters, contentType);
+        String allowedApiCalls = null;
+        if(allowedApiCallsArray !=null) {
+            allowedApiCalls = allowedApiCallsArray.toString();
+        }
+        String requirements = null;
+        if (requirementsObj != null) {
+            requirements = requirementsObj.toString();
+        }
+
+        return new ExternalTool(displayName, toolName, description, externalToolTypes, scope, toolUrl, toolParameters, contentType, allowedApiCalls, requirements);
     }
 
     private static String getRequiredTopLevelField(JsonObject jsonObject, String key) {
@@ -237,6 +284,57 @@ private static String getOptionalTopLevelField(JsonObject jsonObject, String key
         }
     }
 
+    private static List<String> getRequiredTopLevelFieldArray(JsonObject jsonObject, String key) {
+        try {
+            List<String> returnList = new ArrayList<>();
+            JsonArray jsonArray = jsonObject.getJsonArray(key);
+            for (int i = 0; i < jsonArray.size(); i++) {
+                String listItem = jsonArray.getString(i);
+                returnList.add(listItem);
+            }
+            return returnList;
+        } catch (NullPointerException ex) {
+            throw new IllegalArgumentException(key + " is required.");
+        }
+    }
+
+    /**
+     * Throws exceptions to enforce that a type is present in the manifest and
+     * that each type is one of the supported types.
+     *
+     * While the newer "types: [string]" form is greatly preferred, the older
+     * "type: string" form is supported for backward compatibility.
+     */
+    private static List<ExternalToolType> getAndValidateTypes(JsonObject jsonObject) {
+        List<ExternalToolType> externalToolTypes = new ArrayList<>();
+        try {
+            // Try to get the preferred "types" form, which supports multiple.
+            List<String> typesUserInput = getRequiredTopLevelFieldArray(jsonObject, TYPES);
+            for (String typeUserInput : typesUserInput) {
+                ExternalToolType externalToolType = new ExternalToolType();
+                try {
+                    externalToolType.setType(ExternalTool.Type.fromString(typeUserInput));
+                } catch (IllegalArgumentException ex) {
+                    // The error we return here might be something like
+                    // "Type must be one of these values:...".
+                    // To let it bubble up we throw something other than
+                    // IllegalArgumentException so it isn't caught below.
+                    throw new RuntimeException(ex.getLocalizedMessage());
+                }
+                externalToolTypes.add(externalToolType);
+            }
+        } catch (IllegalArgumentException ex) {
+            // Fallback to the legacy "type" form, a single type.
+            // Known issue: If you pass an array in, you get a weird error.
+            String typeUserInput = getRequiredTopLevelField(jsonObject, LEGACY_SINGLE_TYPE);
+            ExternalToolType externalToolType = new ExternalToolType();
+            // Allow IllegalArgumentException to bubble up from ExternalTool.Type.fromString
+            externalToolType.setType(ExternalTool.Type.fromString(typeUserInput));
+            externalToolTypes.add(externalToolType);
+        }
+        return externalToolTypes;
+    }
+
     public ApiToken getApiToken(String apiTokenString) {
         ApiToken apiToken = null;
         if (apiTokenString != null) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolType.java b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolType.java
new file mode 100644
index 00000000000..fb4c0f5dc5d
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolType.java
@@ -0,0 +1,63 @@
+package edu.harvard.iq.dataverse.externaltools;
+
+import java.io.Serializable;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(indexes = {
+    @Index(columnList = "externaltool_id")})
+public class ExternalToolType implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private ExternalTool.Type type;
+
+    /**
+     * TODO: Should this be something other than CascadeType.PERSIST? Right now
+     * if you delete the last or only ExternalToolType for an ExternalTool, the
+     * ExternalTool is not deleted from the database.
+     */
+    @ManyToOne(cascade = CascadeType.PERSIST)
+    @JoinColumn(nullable = false)
+    private ExternalTool externalTool;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public ExternalTool.Type getType() {
+        return type;
+    }
+
+    public void setType(ExternalTool.Type type) {
+        this.type = type;
+    }
+
+    public ExternalTool getExternalTool() {
+        return externalTool;
+    }
+
+    public void setExternalTool(ExternalTool externalTool) {
+        this.externalTool = externalTool;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/feedback/Feedback.java b/src/main/java/edu/harvard/iq/dataverse/feedback/Feedback.java
index e8677869496..60742ca8a91 100644
--- a/src/main/java/edu/harvard/iq/dataverse/feedback/Feedback.java
+++ b/src/main/java/edu/harvard/iq/dataverse/feedback/Feedback.java
@@ -1,18 +1,22 @@
 package edu.harvard.iq.dataverse.feedback;
 
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 
 public class Feedback {
 
     private final String fromEmail;
     private final String toEmail;
+    private final String ccEmail;
     private final String subject;
     private final String body;
 
-    public Feedback(String fromEmail, String toEmail, String subject, String body) {
+    public Feedback(String fromEmail, String toEmail, String ccEmail, String subject, String body) {
         this.fromEmail = fromEmail;
         this.toEmail = toEmail;
+        this.ccEmail=ccEmail;
         this.subject = subject;
         this.body = body;
     }
@@ -24,6 +28,10 @@ public String getFromEmail() {
     public String getToEmail() {
         return toEmail;
     }
+    
+    public String getCcEmail() {
+        return ccEmail;
+    }
 
     public String getSubject() {
         return subject;
@@ -35,15 +43,22 @@ public String getBody() {
 
     @Override
     public String toString() {
-        return "Feedback{" + "fromEmail=" + fromEmail + ", toEmail=" + toEmail + ", subject=" + subject + ", body=" + body + '}';
+        return "Feedback{" + "fromEmail=" + fromEmail + ", toEmail=" + toEmail + ", ccEmail=" + ccEmail + ", subject=" + subject + ", body=" + body + '}';
     }
 
     public JsonObjectBuilder toJsonObjectBuilder() {
-        return Json.createObjectBuilder()
+        return new NullSafeJsonBuilder()
                 .add("fromEmail", fromEmail)
                 .add("toEmail", toEmail)
+                .add("ccEmail", ccEmail)
                 .add("subject", subject)
                 .add("body", body);
     }
 
+    public JsonObjectBuilder toLimitedJsonObjectBuilder() {
+        return new NullSafeJsonBuilder()
+                .add("fromEmail", fromEmail)
+                .add("subject", subject)
+                .add("body", body);
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/feedback/FeedbackUtil.java b/src/main/java/edu/harvard/iq/dataverse/feedback/FeedbackUtil.java
index 8b23d68f4b7..6ae0e165141 100644
--- a/src/main/java/edu/harvard/iq/dataverse/feedback/FeedbackUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/feedback/FeedbackUtil.java
@@ -10,11 +10,15 @@
 import edu.harvard.iq.dataverse.DataverseSession;
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.PersonOrOrgUtil;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.mail.internet.InternetAddress;
+
+import jakarta.json.JsonObject;
+import jakarta.mail.internet.InternetAddress;
 
 public class FeedbackUtil {
 
@@ -22,87 +26,118 @@ public class FeedbackUtil {
 
     private static final String NO_DATASET_CONTACT_INTRO = BundleUtil.getStringFromBundle("contact.context.dataset.noContact");
 
-    // TODO: consider changing "recipient" into an object called something like FeedbackTarget
-    public static List<Feedback> gatherFeedback(DvObject recipient, DataverseSession dataverseSession, String messageSubject, String userMessage, InternetAddress systemAddress, String userEmail, String dataverseSiteUrl, String installationBrandName, String supportTeamName) {
+    public static Feedback gatherFeedback(DvObject feedbackTarget, DataverseSession dataverseSession, String messageSubject, String userMessage, InternetAddress systemAddress, String userEmail, String dataverseSiteUrl, String installationBrandName, String supportTeamName, boolean ccSupport) {
         String systemEmail = null;
         if (systemAddress != null) {
             systemEmail = systemAddress.getAddress();
         }
         logger.fine("systemAddress: " + systemAddress);
-        List<Feedback> feedbacks = new ArrayList<>();
+        Feedback feedback = null;
         if (isLoggedIn(dataverseSession)) {
             userEmail = loggedInUserEmail(dataverseSession);
         }
-        if (recipient != null) {
+        String contextIntro;
+        String contextEnding;
+        String contactEmails;
+        String ccEmails = ccSupport ? systemEmail : null;
+
+        if (feedbackTarget != null) {
             messageSubject = BundleUtil.getStringFromBundle("contact.context.subject.dvobject", Arrays.asList(installationBrandName, messageSubject));
-            if (recipient.isInstanceofDataverse()) {
-                Dataverse dataverse = (Dataverse) recipient;
-                String dataverseContextEnding = BundleUtil.getStringFromBundle("contact.context.dataverse.ending", Arrays.asList(supportTeamName, systemEmail, dataverseSiteUrl, dataverse.getAlias(), supportTeamName, systemEmail));
-                List<DvObjectContact> dataverseContacts = getDataverseContacts(dataverse);
-                for (DvObjectContact dataverseContact : dataverseContacts) {
-                    String placeHolderIfDataverseContactsGetNames = "";
-                    String dataverseContextIntro = BundleUtil.getStringFromBundle("contact.context.dataverse.intro", Arrays.asList(placeHolderIfDataverseContactsGetNames, userEmail, installationBrandName, dataverse.getAlias()));
-                    Feedback feedback = new Feedback(userEmail, dataverseContact.getEmail(), messageSubject, dataverseContextIntro + userMessage + dataverseContextEnding);
-                    feedbacks.add(feedback);
+
+            String contactGreeting;
+
+            if (feedbackTarget.isInstanceofDataverse()) {
+                // Dataverse target
+                Dataverse dataverse = (Dataverse) feedbackTarget;
+                contextEnding = BundleUtil.getStringFromBundle("contact.context.dataverse.ending", Arrays.asList(supportTeamName, systemEmail, dataverseSiteUrl, dataverse.getAlias(), supportTeamName, systemEmail));
+                List<DvObjectContact> contacts = getDataverseContacts(dataverse);
+                List<String> contactEmailList = new ArrayList<String>();
+                for (DvObjectContact contact : contacts) {
+                    contactEmailList.add(contact.getEmail());
                 }
-                if (!feedbacks.isEmpty()) {
-                    return feedbacks;
+                if (!contactEmailList.isEmpty()) {
+                    contactEmails = String.join(",", contactEmailList);
+                    // Dataverse contacts do not have a name, just email address
+                    contactGreeting = "";
+                    contextIntro = BundleUtil.getStringFromBundle("contact.context.dataverse.intro", Arrays.asList(contactGreeting, userEmail, installationBrandName, dataverse.getAlias()));
                 } else {
-                    String dataverseContextIntroError = BundleUtil.getStringFromBundle("contact.context.dataverse.noContact");
-                    Feedback feedback = new Feedback(userEmail, systemEmail, messageSubject, dataverseContextIntroError + userMessage + dataverseContextEnding);
-                    feedbacks.add(feedback);
-                    return feedbacks;
+                    // No contacts
+                    contextIntro = BundleUtil.getStringFromBundle("contact.context.dataverse.noContact");
+                    contactEmails = systemEmail;
+                    ccEmails = null;
                 }
-            } else if (recipient.isInstanceofDataset()) {
-                Dataset dataset = (Dataset) recipient;
+            } else if (feedbackTarget.isInstanceofDataset()) {
+                // Dataset target
+                Dataset dataset = (Dataset) feedbackTarget;
                 String datasetTitle = dataset.getLatestVersion().getTitle();
-                String datasetPid = dataset.getGlobalIdString();
-                String datasetContextEnding = BundleUtil.getStringFromBundle("contact.context.dataset.ending", Arrays.asList(supportTeamName, systemEmail, dataverseSiteUrl, dataset.getGlobalIdString(), supportTeamName, systemEmail));
-                List<DvObjectContact> datasetContacts = getDatasetContacts(dataset);
-                for (DvObjectContact datasetContact : datasetContacts) {
-                    String contactFullName = getGreeting(datasetContact);
-                    String datasetContextIntro = BundleUtil.getStringFromBundle("contact.context.dataset.intro", Arrays.asList(contactFullName, userEmail, installationBrandName, datasetTitle, datasetPid));
-                    Feedback feedback = new Feedback(userEmail, datasetContact.getEmail(), messageSubject, datasetContextIntro + userMessage + datasetContextEnding);
-                    feedbacks.add(feedback);
+                String datasetPid = dataset.getGlobalId().asString();
+                contextEnding = BundleUtil.getStringFromBundle("contact.context.dataset.ending", Arrays.asList(supportTeamName, systemEmail, dataverseSiteUrl, datasetPid, supportTeamName, systemEmail));
+                List<DvObjectContact> contacts = getDatasetContacts(dataset);
+                List<String> contactEmailList = new ArrayList<String>();
+                List<String> contactNameList = new ArrayList<String>();
+
+                for (DvObjectContact contact : contacts) {
+                    String name = getContactName(contact);
+                    if (name != null) {
+                        contactNameList.add(name);
+                    }
+                    contactEmailList.add(contact.getEmail());
                 }
-                if (!feedbacks.isEmpty()) {
-                    return feedbacks;
+                if (!contactEmailList.isEmpty()) {
+                    contactEmails = String.join(",", contactEmailList);
+                    contactGreeting = getGreeting(contactNameList);
+
+                    contextIntro = BundleUtil.getStringFromBundle("contact.context.dataset.intro", Arrays.asList(contactGreeting, userEmail, installationBrandName, datasetTitle, datasetPid));
                 } else {
-                    // TODO: Add more of an intro for the person receiving the system email in this "no dataset contact" scenario?
-                    Feedback feedback = new Feedback(userEmail, systemEmail, messageSubject, NO_DATASET_CONTACT_INTRO + userMessage + datasetContextEnding);
-                    feedbacks.add(feedback);
-                    return feedbacks;
+                    // No contacts
+                    // TODO: Add more of an intro for the person receiving the system email in this
+                    // "no dataset contact" scenario?
+                    contextIntro = NO_DATASET_CONTACT_INTRO;
+                    contactEmails = systemEmail;
+                    ccEmails = null;
                 }
             } else {
-                DataFile datafile = (DataFile) recipient;
+                // DataFile target
+                DataFile datafile = (DataFile) feedbackTarget;
                 String datasetTitle = datafile.getOwner().getLatestVersion().getTitle();
-                String datasetPid = datafile.getOwner().getGlobalIdString();
+                String datasetPid = datafile.getOwner().getGlobalId().asString();
                 String filename = datafile.getFileMetadatas().get(0).getLabel();
-                List<DvObjectContact> datasetContacts = getDatasetContacts(datafile.getOwner());
-                String fileContextEnding = BundleUtil.getStringFromBundle("contact.context.file.ending", Arrays.asList(supportTeamName, systemEmail, dataverseSiteUrl, datafile.getId().toString(), supportTeamName, systemEmail));
-                for (DvObjectContact datasetContact : datasetContacts) {
-                    String contactFullName = getGreeting(datasetContact);
-                    String fileContextIntro = BundleUtil.getStringFromBundle("contact.context.file.intro", Arrays.asList(contactFullName, userEmail, installationBrandName, filename, datasetTitle, datasetPid));
-                    Feedback feedback = new Feedback(userEmail, datasetContact.getEmail(), messageSubject, fileContextIntro + userMessage + fileContextEnding);
-                    feedbacks.add(feedback);
+                List<DvObjectContact> contacts = getDatasetContacts(datafile.getOwner());
+                contextEnding = BundleUtil.getStringFromBundle("contact.context.file.ending", Arrays.asList(supportTeamName, systemEmail, dataverseSiteUrl, datafile.getId().toString(), supportTeamName, systemEmail));
+                List<String> contactEmailList = new ArrayList<String>();
+                List<String> contactNameList = new ArrayList<String>();
+
+                for (DvObjectContact contact : contacts) {
+                    String name = getContactName(contact);
+                    if (name != null) {
+                        contactNameList.add(name);
+                    }
+                    contactEmailList.add(contact.getEmail());
                 }
-                if (!feedbacks.isEmpty()) {
-                    return feedbacks;
+                if (!contactEmailList.isEmpty()) {
+                    contactEmails = String.join(",", contactEmailList);
+                    contactGreeting = getGreeting(contactNameList);
+
+                    contextIntro = BundleUtil.getStringFromBundle("contact.context.file.intro", Arrays.asList(contactGreeting, userEmail, installationBrandName, filename, datasetTitle, datasetPid));
                 } else {
-                    // TODO: Add more of an intro for the person receiving the system email in this "no dataset contact" scenario?
-                    Feedback feedback = new Feedback(userEmail, systemEmail, messageSubject, NO_DATASET_CONTACT_INTRO + userMessage + fileContextEnding);
-                    feedbacks.add(feedback);
-                    return feedbacks;
+                    // No contacts
+                    // TODO: Add more of an intro for the person receiving the system email in this
+                    // "no dataset contact" scenario?
+                    contextIntro = NO_DATASET_CONTACT_INTRO;
+                    contactEmails = systemEmail;
+                    ccEmails = null;
                 }
             }
         } else {
+            // No target
             messageSubject = BundleUtil.getStringFromBundle("contact.context.subject.support", Arrays.asList(installationBrandName, messageSubject));
-            String noDvObjectContextIntro = BundleUtil.getStringFromBundle("contact.context.support.intro", Arrays.asList(supportTeamName, userEmail));
-            String noDvObjectContextEnding = BundleUtil.getStringFromBundle("contact.context.support.ending", Arrays.asList(""));
-            Feedback feedback = new Feedback(userEmail, systemEmail, messageSubject, noDvObjectContextIntro + userMessage + noDvObjectContextEnding);
-            feedbacks.add(feedback);
-            return feedbacks;
+            contextIntro = BundleUtil.getStringFromBundle("contact.context.support.intro", Arrays.asList(supportTeamName, userEmail));
+            contextEnding = BundleUtil.getStringFromBundle("contact.context.support.ending", Arrays.asList(""));
+            contactEmails = systemEmail;
+            ccEmails = null;
         }
+        feedback = new Feedback(userEmail, contactEmails, ccEmails, messageSubject, contextIntro + userMessage + contextEnding);
+        return feedback;
     }
 
     private static boolean isLoggedIn(DataverseSession dataverseSession) {
@@ -156,30 +191,53 @@ private static List<DvObjectContact> getDatasetContacts(Dataset dataset) {
     }
 
     /**
-     * When contacts are people we suggest that they be stored as "Simpson,
-     * Homer" so the idea of this method is that it returns "Homer Simpson", if
-     * it can.
+     * When contacts are people we suggest that they be stored as "Simpson, Homer"
+     * so the idea of this method is that it returns "Homer Simpson", if it can.
      *
      * Contacts don't necessarily have to be people, however. They can be
-     * organizations. We ran into similar trouble (but for authors) when
-     * implementing Schema.org JSON-LD support. See getJsonLd on DatasetVersion.
-     * Some day it might be nice to store whether an author or a contact is a
-     * person or an organization.
+     * organizations. This method uses the algorithm to detect whether an entry is a
+     * Person or Organization and relies on it to create a full name, i.e. removing
+     * the comma and reversion the order of names for a Person but not changing the
+     * string for an Organization.
+     */
+    private static String getContactName(DvObjectContact dvObjectContact) {
+        String contactName = dvObjectContact.getName();
+        String name = null;
+        if (contactName != null) {
+            JsonObject entity = PersonOrOrgUtil.getPersonOrOrganization(contactName, false, false);
+            if (entity.getBoolean("isPerson") && entity.containsKey("givenName") && entity.containsKey("familyName")) {
+                name = entity.getString("givenName") + " " + entity.getString("familyName");
+            } else {
+                name = entity.getString("fullName");
+            }
+        }
+        return name;
+
+    }
+
+    /**
+     * Concatenates names using commas and a final 'and' and creates the greeting
+     * string, e.g. "Hello Homer Simpson, Bart Simson, and Marge Simpson"
      */
-    private static String getGreeting(DvObjectContact dvObjectContact) {
-        logger.fine("dvObjectContact: " + dvObjectContact);
-        try {
-            String name = dvObjectContact.getName();
-            logger.fine("dvObjectContact name: " + name);
-            String lastFirstString = dvObjectContact.getName();
-            String[] lastFirstParts = lastFirstString.split(",");
-            String last = lastFirstParts[0];
-            String first = lastFirstParts[1];
-            return BundleUtil.getStringFromBundle("contact.context.dataset.greeting.helloFirstLast", Arrays.asList(first.trim(), last.trim()));
-        } catch (Exception ex) {
-            logger.warning("problem in getGreeting: " + ex);
+    private static String getGreeting(List<String> contactNameList) {
+        int size = contactNameList.size();
+        String nameString;
+        String finalName = null;
+        // Treat the final name separately
+        switch (size) {
+        case 0:
             return BundleUtil.getStringFromBundle("contact.context.dataset.greeting.organization");
+        case 1:
+            nameString = contactNameList.get(0);
+            break;
+        case 2:
+            nameString = contactNameList.get(0) + " and " + contactNameList.get(1);
+            break;
+        default:
+            finalName = contactNameList.remove(size - 1);
+            nameString = String.join(",", contactNameList) + ", and " + finalName;
         }
+        return BundleUtil.getStringFromBundle("contact.context.dataset.greeting.helloFirstLast", Arrays.asList(nameString));
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/filter/CorsFilter.java b/src/main/java/edu/harvard/iq/dataverse/filter/CorsFilter.java
new file mode 100644
index 00000000000..7d99d9ee4d2
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/filter/CorsFilter.java
@@ -0,0 +1,69 @@
+package edu.harvard.iq.dataverse.filter;
+
+import jakarta.inject.Inject;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
+/**
+ * CorsFilter is a servlet filter that handles Cross-Origin Resource Sharing (CORS) for the Dataverse application.
+ * It configures and applies CORS headers to HTTP responses based on application settings.
+ * 
+ * This filter:
+ * 1. Reads CORS configuration from JVM settings or (deprecated) the SettingsServiceBean. See the Dataverse Configuration Guide for more details.
+ * 2. Determines whether CORS should be allowed based on these settings.
+ * 3. If CORS is allowed, it adds the appropriate CORS headers to all HTTP responses. The JVMSettings allow customization of the header contents if desired.
+ * 
+ * The filter is applied to all paths ("/*") in the application.
+ */
+
+@WebFilter("/*")
+public class CorsFilter implements Filter {
+
+    @Inject
+    private SettingsServiceBean settingsSvc;
+
+    private boolean allowCors;
+    private String origin;
+    private String methods;
+    private String allowHeaders;
+    private String exposeHeaders;
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+        origin = JvmSettings.CORS_ORIGIN.lookupOptional().orElse(null);
+        boolean corsSetting = settingsSvc.isTrueForKey(SettingsServiceBean.Key.AllowCors, true);
+
+        if (origin == null && !corsSetting) {
+            allowCors = false;
+        } else {
+            allowCors = true;
+            origin = (origin != null) ? origin : "*";
+        }
+
+        if (allowCors) {
+            methods = JvmSettings.CORS_METHODS.lookupOptional().orElse("PUT, GET, POST, DELETE, OPTIONS");
+            allowHeaders = JvmSettings.CORS_ALLOW_HEADERS.lookupOptional()
+                    .orElse("Accept, Content-Type, X-Dataverse-key, Range");
+            exposeHeaders = JvmSettings.CORS_EXPOSE_HEADERS.lookupOptional()
+                    .orElse("Accept-Ranges, Content-Range, Content-Encoding");
+        }
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain)
+            throws IOException, ServletException {
+        if (allowCors) {
+            HttpServletResponse response = (HttpServletResponse) servletResponse;
+            response.addHeader("Access-Control-Allow-Origin", origin);
+            response.addHeader("Access-Control-Allow-Methods", methods);
+            response.addHeader("Access-Control-Allow-Headers", allowHeaders);
+            response.addHeader("Access-Control-Expose-Headers", exposeHeaders);
+        }
+        chain.doFilter(servletRequest, servletResponse);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/flyway/StartupFlywayMigrator.java b/src/main/java/edu/harvard/iq/dataverse/flyway/StartupFlywayMigrator.java
index d5f4f8520a7..39bc46216ca 100644
--- a/src/main/java/edu/harvard/iq/dataverse/flyway/StartupFlywayMigrator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/flyway/StartupFlywayMigrator.java
@@ -2,12 +2,12 @@
 
 import org.flywaydb.core.Flyway;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 import javax.sql.DataSource;
 
 @Startup
@@ -15,7 +15,7 @@
 @TransactionManagement(value = TransactionManagementType.BEAN)
 public class StartupFlywayMigrator {
 
-    @Resource(lookup = "jdbc/VDCNetDS")
+    @Resource(lookup = "java:app/jdbc/dataverse")
     private DataSource dataSource;
 
     @PostConstruct
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/AccessList.java b/src/main/java/edu/harvard/iq/dataverse/globus/AccessList.java
new file mode 100644
index 00000000000..9a963000541
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/AccessList.java
@@ -0,0 +1,33 @@
+package edu.harvard.iq.dataverse.globus;
+
+import java.util.ArrayList;
+
+public class AccessList {
+    private int length;
+    private String endpoint;
+    private ArrayList<Permissions> DATA;
+
+    public void setDATA(ArrayList<Permissions> DATA) {
+        this.DATA = DATA;
+    }
+
+    public void setEndpoint(String endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    public void setLength(int length) {
+        this.length = length;
+    }
+
+    public String getEndpoint() {
+        return endpoint;
+    }
+
+    public ArrayList<Permissions> getDATA() {
+        return DATA;
+    }
+
+    public int getLength() {
+        return length;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/AccessToken.java b/src/main/java/edu/harvard/iq/dataverse/globus/AccessToken.java
new file mode 100644
index 00000000000..c93e2c6aa94
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/AccessToken.java
@@ -0,0 +1,88 @@
+package edu.harvard.iq.dataverse.globus;
+
+import java.util.ArrayList;
+
+public class AccessToken implements java.io.Serializable {
+
+    private String accessToken;
+    private String idToken;
+    private Long expiresIn;
+    private String resourceServer;
+    private String tokenType;
+    private String state;
+    private String scope;
+    private String refreshToken;
+    private ArrayList<AccessToken> otherTokens;
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    String getIdToken() {
+        return idToken;
+    }
+
+    Long getExpiresIn() {
+        return expiresIn;
+    }
+
+    String getResourceServer() {
+        return resourceServer;
+    }
+
+    String getTokenType() {
+        return tokenType;
+    }
+
+    String getState() {
+        return state;
+    }
+
+    String getScope() {
+        return scope;
+    }
+
+    String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public ArrayList<AccessToken> getOtherTokens() {
+        return otherTokens;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public void setExpiresIn(Long expiresIn) {
+        this.expiresIn = expiresIn;
+    }
+
+    public void setIdToken(String idToken) {
+        this.idToken = idToken;
+    }
+
+    public void setOtherTokens(ArrayList<AccessToken> otherTokens) {
+        this.otherTokens = otherTokens;
+    }
+
+    public void setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
+
+    public void setResourceServer(String resourceServer) {
+        this.resourceServer = resourceServer;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public void setTokenType(String tokenType) {
+        this.tokenType = tokenType;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/ExpiredTokenException.java b/src/main/java/edu/harvard/iq/dataverse/globus/ExpiredTokenException.java
new file mode 100644
index 00000000000..7902bb780fd
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/ExpiredTokenException.java
@@ -0,0 +1,16 @@
+package edu.harvard.iq.dataverse.globus;
+
+/**
+ *
+ * @author landreev
+ */
+public class ExpiredTokenException extends Exception {
+    public ExpiredTokenException(String message) {
+        super(message);
+    }
+    
+    public ExpiredTokenException(String message, Throwable cause) {
+        super(message, cause);
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/FileDetailsHolder.java b/src/main/java/edu/harvard/iq/dataverse/globus/FileDetailsHolder.java
new file mode 100644
index 00000000000..0b8373cba09
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/FileDetailsHolder.java
@@ -0,0 +1,29 @@
+package edu.harvard.iq.dataverse.globus;
+
+public class FileDetailsHolder {
+
+    private String hash;
+    private String mime;
+    private String storageID;
+
+    public FileDetailsHolder(String id, String hash, String mime) {
+
+        this.storageID = id;
+        this.hash = hash;
+        this.mime = mime;
+
+    }
+
+    public String getStorageID() {
+        return this.storageID;
+    }
+
+    public String getHash() {
+        return hash;
+    }
+
+    public String getMime() {
+        return mime;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusEndpoint.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusEndpoint.java
new file mode 100644
index 00000000000..7e555935e2e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusEndpoint.java
@@ -0,0 +1,38 @@
+package edu.harvard.iq.dataverse.globus;
+
+public class GlobusEndpoint {
+
+    private String id;
+    private String clientToken;
+    private String basePath;
+
+    public GlobusEndpoint(String id, String clientToken, String basePath) {
+        this.id = id;
+        this.clientToken = clientToken;
+        this.basePath = basePath;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getClientToken() {
+        return clientToken;
+    }
+
+    public void setClientToken(String clientToken) {
+        this.clientToken = clientToken;
+    }
+
+    public String getBasePath() {
+        return basePath;
+    }
+
+    public void setBasePath(String basePath) {
+        this.basePath = basePath;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java
new file mode 100644
index 00000000000..789e0883a7c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java
@@ -0,0 +1,1843 @@
+package edu.harvard.iq.dataverse.globus;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.Scheduler;
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.GsonBuilder;
+import edu.harvard.iq.dataverse.*;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonPatch;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue.ValueType;
+import jakarta.json.stream.JsonParsingException;
+import jakarta.ws.rs.HttpMethod;
+
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.toJsonArray;
+
+import java.io.*;
+
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.logging.FileHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.apache.commons.codec.binary.StringUtils;
+import org.primefaces.PrimeFaces;
+
+import com.google.gson.Gson;
+import edu.harvard.iq.dataverse.api.ApiConstants;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.GlobusAccessibleStore;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
+import edu.harvard.iq.dataverse.datasetutility.AddReplaceFileHelper;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.URLTokenUtil;
+import edu.harvard.iq.dataverse.util.UrlSignerUtil;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonReader;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.Response;
+import org.apache.http.util.EntityUtils;
+
+@Stateless
+@Named("GlobusServiceBean")
+public class GlobusServiceBean implements java.io.Serializable {
+
+    @EJB
+    protected DatasetServiceBean datasetSvc;
+    @EJB
+    protected SettingsServiceBean settingsSvc;
+    @Inject
+    DataverseSession session;
+    @Inject
+    DataverseRequestServiceBean dataverseRequestSvc;
+    @EJB
+    protected AuthenticationServiceBean authSvc;
+    @EJB
+    EjbDataverseEngine commandEngine;
+    @EJB
+    UserNotificationServiceBean userNotificationService;
+    @EJB
+    PrivateUrlServiceBean privateUrlService;
+    @EJB
+    FileDownloadServiceBean fileDownloadService;
+    @EJB
+    DataFileServiceBean dataFileSvc;
+    @EJB
+    PermissionServiceBean permissionSvc;
+    @EJB 
+    IngestServiceBean ingestSvc;
+    @EJB
+    SystemConfig systemConfig;
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    private EntityManager em;
+
+    private static final Logger logger = Logger.getLogger(GlobusServiceBean.class.getCanonicalName());
+    private static final SimpleDateFormat logFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss");
+
+    private String getRuleId(GlobusEndpoint endpoint, String principal, String permissions) {
+
+        String principalType = "identity";
+        String apiUrlString = "https://transfer.api.globusonline.org/v0.10/endpoint/" + endpoint.getId() + "/access_list";
+        URL url = null;
+        
+        try {
+            url = new URL(apiUrlString);
+        } catch (MalformedURLException mue) {
+            logger.severe("Malformed URL exception when attempting to look up ACL rule via Globus API: " + apiUrlString);
+            return null;
+        }
+        MakeRequestResponse result = makeRequest(url, "Bearer", endpoint.getClientToken(), "GET", null);
+        if (result.status == 200) {
+            AccessList al = parseJson(result.jsonResponse, AccessList.class, false);
+
+            for (int i = 0; i < al.getDATA().size(); i++) {
+                Permissions pr = al.getDATA().get(i);
+
+                if ((pr.getPath().equals(endpoint.getBasePath() + "/") || pr.getPath().equals(endpoint.getBasePath()))
+                        && pr.getPrincipalType().equals(principalType)
+                        && ((principal == null) || (principal != null && pr.getPrincipal().equals(principal)))
+                        && pr.getPermissions().equals(permissions)) {
+                    return pr.getId();
+                } else {
+                    logger.fine(pr.getPath() + " === " + endpoint.getBasePath() + " == " + pr.getPrincipalType());
+                    continue;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Call to delete a globus rule related to the specified dataset.
+     * 
+     * @param ruleId       - Globus rule id - assumed to be associated with the
+     *                     dataset's file path (should not be called with a user
+     *                     specified rule id w/o further checking)
+     * @param dataset    - the dataset associated with the rule
+     * @param globusLogger - a separate logger instance, may be null
+     */
+    private void deletePermission(String ruleId, Dataset dataset, Logger globusLogger) {
+        globusLogger.fine("Start deleting rule " + ruleId + " for dataset " + dataset.getId());
+        if (ruleId.length() > 0) {
+            if (dataset != null) {
+                GlobusEndpoint endpoint = getGlobusEndpoint(dataset);
+                if (endpoint != null) {
+                    deletePermission(ruleId, endpoint, globusLogger);
+                }
+            }
+        }
+    }
+    
+    /**
+     * Call to delete a globus rule, via the ruleId and supplied endpoint
+     * 
+     * @param ruleId       - Globus rule id - assumed to be associated with the
+     *                     dataset's file path (should not be called with a user
+     *                     specified rule id w/o further checking)
+     * @param endpoint     - the Globus endpoint associated with the rule
+     * @param globusLogger - a separate logger instance, may be null
+     */
+    private void deletePermission(String ruleId, GlobusEndpoint endpoint, Logger globusLogger) {
+        globusLogger.fine("Start deleting rule " + ruleId + " for endpoint " + endpoint.getBasePath());
+        if (ruleId.length() > 0) {
+            if (endpoint != null) {
+                String accessToken = endpoint.getClientToken();
+                globusLogger.info("Start deleting permissions.");
+                try {
+                    URL url = new URL("https://transfer.api.globusonline.org/v0.10/endpoint/" + endpoint.getId()
+                            + "/access/" + ruleId);
+                    MakeRequestResponse result = makeRequest(url, "Bearer", accessToken, "DELETE", null);
+                    if (result.status != 200) {
+                        globusLogger.warning("Cannot delete access rule " + ruleId);
+                    } else {
+                        globusLogger.info("Access rule " + ruleId + " was deleted successfully");
+                    }
+                } catch (MalformedURLException ex) {
+                    globusLogger.log(Level.WARNING,
+                            "Failed to delete access rule " + ruleId + " on endpoint " + endpoint.getId(), ex);
+                }
+            }
+        }
+    }
+
+    /**
+     * Request read/write access for the specified principal and generate a list of
+     * accessible paths for new files for the specified dataset.
+     * 
+     * @param principal     - the id of the Globus principal doing the transfer
+     * @param dataset
+     * @param numberOfPaths - how many files are to be transferred
+     * @return
+     */
+    public JsonObject requestAccessiblePaths(String principal, Dataset dataset, int numberOfPaths) {
+
+        GlobusEndpoint endpoint = getGlobusEndpoint(dataset);
+        String principalType = "identity";
+
+        Permissions permissions = new Permissions();
+        permissions.setDATA_TYPE("access");
+        permissions.setPrincipalType(principalType);
+        permissions.setPrincipal(principal);
+        permissions.setPath(endpoint.getBasePath() + "/");
+        permissions.setPermissions("rw");
+        
+        JsonObjectBuilder response = Json.createObjectBuilder();
+        //Try to create the directory (202 status) if it does not exist (502-already exists)
+        int mkDirStatus = makeDirs(endpoint, dataset);
+        if (!(mkDirStatus== 202 || mkDirStatus == 502)) {
+            return response.add("status", mkDirStatus).build();
+        }
+        //The dir for the dataset's data exists, so try to request permission for the principal
+        int requestPermStatus = requestPermission(endpoint, dataset, permissions);
+        
+        if (requestPermStatus == 409) {
+            // This is a special case - a 409 *may* mean that the rule already
+            // exists for this endnote and for this user (if, for example, 
+            // Dataverse failed to remove it after the last upload has completed). 
+            // That should be ok with us (but let's confirm that is indeed the 
+            // case; alternatively it may mean that permissions cannot be issued 
+            // for some other reason):
+            String ruleId = getRuleId(endpoint, principal, "rw");
+            if (ruleId != null) {
+                logger.warning("Attention: potentially stale write access rule found for Globus path "
+                        + endpoint.getBasePath() 
+                        + " for the principal " 
+                        + principal
+                        + "; check the Globus endpoints for stale rules that are not properly deleted.");
+                requestPermStatus = 201;
+            }
+            // Unlike with DOWNloads, it should be somewhat safe not to worry 
+            // about multiple transfers happening in parallel, all using the 
+            // same access rule - since the dataset gets locked for the duration 
+            // of an upload. 
+        }
+        
+        response.add("status", requestPermStatus);
+        if (requestPermStatus == 201) {
+            String driverId = dataset.getEffectiveStorageDriverId();
+            JsonObjectBuilder paths = Json.createObjectBuilder();
+            for (int i = 0; i < numberOfPaths; i++) {
+                String storageIdentifier = DataAccess.getNewStorageIdentifier(driverId);
+                int lastIndex = Math.max(storageIdentifier.lastIndexOf("/"), storageIdentifier.lastIndexOf(":"));
+                paths.add(storageIdentifier, endpoint.getBasePath() + "/" + storageIdentifier.substring(lastIndex + 1));
+
+            }
+            response.add("paths", paths.build());
+        }
+        return response.build();
+    }
+
+    /**
+     * Call to create the directories for the specified dataset.
+     * 
+     * @param dataset
+     * @return - an error status at whichever subdir the process fails at or the
+     *         final success status
+     */
+    private int makeDirs(GlobusEndpoint endpoint, Dataset dataset) {
+        logger.fine("Creating dirs: " + endpoint.getBasePath());
+        int index = endpoint.getBasePath().lastIndexOf(dataset.getAuthorityForFileStorage())
+                + dataset.getAuthorityForFileStorage().length();
+        String nextDir = endpoint.getBasePath().substring(0, index);
+        int response = makeDir(endpoint, nextDir);
+        String identifier = dataset.getIdentifierForFileStorage();
+        //Usually identifiers will have 0 or 1 slashes (e.g. FK2/ABCDEF) but the while loop will handle any that could have more
+        //Will skip if the first makeDir above failed
+        while ((identifier.length() > 0) && ((response == 202 || response == 502))) {
+            index = identifier.indexOf('/');
+            if (index == -1) {
+                //Last dir to create
+                response = makeDir(endpoint, nextDir + "/" + identifier);
+                identifier = "";
+            } else {
+                //The next dir to create
+                nextDir = nextDir + "/" + identifier.substring(0, index);
+                response = makeDir(endpoint, nextDir);
+                //The rest of the identifier
+                identifier = identifier.substring(index + 1);
+            }
+        }
+        return response;
+    }
+    
+    private int makeDir(GlobusEndpoint endpoint, String dir) {
+        MakeRequestResponse result = null;
+        String body = "{\"DATA_TYPE\":\"mkdir\",\"path\":\"" + dir + "\"}";
+        try {
+            logger.fine(body);
+            URL url = new URL(
+                    "https://transfer.api.globusonline.org/v0.10/operation/endpoint/" + endpoint.getId() + "/mkdir");
+            result = makeRequest(url, "Bearer", endpoint.getClientToken(), "POST", body);
+
+            switch (result.status) {
+            case 202:
+                logger.fine("Dir " + dir + " was created successfully.");
+                break;
+            case 502:
+                logger.fine("Dir " + dir + " already exists.");
+                break;
+            default:
+                logger.warning("Status " + result.status + " received when creating dir " + dir);
+                logger.fine("Response: " + result.jsonResponse);
+            }
+        } catch (MalformedURLException ex) {
+            // Misconfiguration
+            logger.warning("Failed to create dir on " + endpoint.getId());
+            return 500;
+        }
+        return result.status;
+    }
+    
+    private Map<String, Long> lookupFileSizes(GlobusEndpoint endpoint, String dir) {        
+        MakeRequestResponse result;
+        
+        try {
+            logger.fine("Attempting to look up the contents of the Globus folder "+dir);
+            URL url = new URL(
+                    "https://transfer.api.globusonline.org/v0.10/operation/endpoint/" + endpoint.getId() 
+                            + "/ls?path=" + dir);
+            result = makeRequest(url, "Bearer", endpoint.getClientToken(), "GET", null);
+
+            switch (result.status) {
+                case 200:
+                    logger.fine("Looked up directory " + dir + " successfully.");
+                    break;
+                default:
+                    logger.warning("Status " + result.status + " received when looking up dir " + dir);
+                    logger.fine("Response: " + result.jsonResponse);
+                    return null; 
+            }
+        } catch (MalformedURLException ex) {
+            // Misconfiguration
+            logger.warning("Failed to list the contents of the directory "+ dir + " on endpoint " + endpoint.getId());
+            return null;
+        }
+        
+        Map<String, Long> ret = new HashMap<>(); 
+        
+        JsonObject listObject  = JsonUtil.getJsonObject(result.jsonResponse);
+        JsonArray dataArray = listObject.getJsonArray("DATA");
+        
+        if (dataArray != null && !dataArray.isEmpty()) {
+            for (int i = 0; i < dataArray.size(); i++) {
+                String dataType = dataArray.getJsonObject(i).getString("DATA_TYPE", null);
+                if (dataType != null && dataType.equals("file")) {
+                    // is it safe to assume that any entry with a valid "DATA_TYPE": "file" 
+                    // will also have valid "name" and "size" entries? 
+                    String fileName = dataArray.getJsonObject(i).getString("name");
+                    long fileSize = dataArray.getJsonObject(i).getJsonNumber("size").longValueExact();
+                    ret.put(fileName, fileSize);
+                }
+            }
+        }
+        
+        return ret; 
+    }
+    
+    private int requestPermission(GlobusEndpoint endpoint, Dataset dataset, Permissions permissions) {
+        Gson gson = new GsonBuilder().create();
+        MakeRequestResponse result = null;
+        logger.fine("Start creating the rule");
+
+        try {
+            URL url = new URL("https://transfer.api.globusonline.org/v0.10/endpoint/" + endpoint.getId() + "/access");
+            result = makeRequest(url, "Bearer", endpoint.getClientToken(), "POST", gson.toJson(permissions));
+
+            switch (result.status) {
+            case 404:
+                logger.severe("Endpoint " + endpoint.getId() + " was not found");
+                break;
+            case 400:
+                logger.severe("Path " + permissions.getPath() + " is not valid");
+                break;
+            case 409:
+                logger.warning("ACL already exists or Endpoint ACL already has the maximum number of access rules");
+                break;
+            case 201:
+                JsonObject globusResponse = JsonUtil.getJsonObject(result.jsonResponse);
+                if (globusResponse != null && globusResponse.containsKey("access_id")) {
+                    permissions.setId(globusResponse.getString("access_id"));
+                    monitorTemporaryPermissions(permissions.getId(), dataset.getId());
+                    logger.fine("Access rule " + permissions.getId() + " was created successfully");
+                } else {
+                    // Shouldn't happen!
+                    logger.warning("Access rule id not returned for dataset " + dataset.getId());
+                }
+            }
+            return result.status;
+        } catch (MalformedURLException ex) {
+            // Misconfiguration
+            logger.warning("Failed to create access rule URL for " + endpoint.getId());
+            return 500;
+        }
+    }
+
+    /**
+     * Given an array of remote files to be referenced in the dataset, create a set
+     * of valid storage identifiers and return a map of the remote file paths to
+     * storage identifiers.
+     * 
+     * @param dataset
+     * @param referencedFiles - a JSON array of remote files to be referenced in the
+     *                        dataset - each should be a string with the <Globus
+     *                        endpoint>/path/to/file
+     * @return - a map of supplied paths to valid storage identifiers
+     */
+    public JsonObject requestReferenceFileIdentifiers(Dataset dataset, JsonArray referencedFiles) {
+        String driverId = dataset.getEffectiveStorageDriverId();
+        JsonArray endpoints = GlobusAccessibleStore.getReferenceEndpointsWithPaths(driverId);
+
+        JsonObjectBuilder fileMap = Json.createObjectBuilder();
+        referencedFiles.forEach(value -> {
+            if (value.getValueType() != ValueType.STRING) {
+                throw new JsonParsingException("ReferencedFiles must be strings", null);
+            }
+            String referencedFile = ((JsonString) value).getString();
+            boolean valid = false;
+            for (int i = 0; i < endpoints.size(); i++) {
+                if (referencedFile.startsWith(((JsonString) endpoints.get(i)).getString())) {
+                    valid = true;
+                }
+            }
+            if (!valid) {
+                throw new IllegalArgumentException(
+                        "Referenced file " + referencedFile + " is not in an allowed endpoint/path");
+            }
+            String storageIdentifier = DataAccess.getNewStorageIdentifier(driverId);
+            fileMap.add(referencedFile, storageIdentifier + "//" + referencedFile);
+        });
+        return fileMap.build();
+    }
+
+    /**
+     * A cache of temporary permission requests - for upload (rw) and download (r)
+     * access. When a temporary permission request is created, it is added to the
+     * cache. After GLOBUS_CACHE_MAXAGE minutes, if a transfer has not been started,
+     * the permission will be revoked/deleted. (If a transfer has been started, the
+     * permission will not be revoked/deleted until the transfer is complete. This
+     * is handled in other methods.)
+     */
+    // ToDo - nominally this doesn't need to be as long as the allowed time for the
+    // downloadCache so there could be two separate settings.
+    // Single cache of open rules/permission requests
+    private final Cache<String, Long> rulesCache = Caffeine.newBuilder()
+            .expireAfterWrite(Duration.of(JvmSettings.GLOBUS_CACHE_MAXAGE.lookup(Integer.class), ChronoUnit.MINUTES))
+            .scheduler(Scheduler.systemScheduler()).evictionListener((ruleId, datasetId, cause) -> {
+                // Delete rules that expire
+                logger.fine("Rule " + ruleId + " expired");
+                Dataset dataset = datasetSvc.find(datasetId);
+                deletePermission((String) ruleId, dataset, logger);
+            })
+
+            .build();
+
+    // Convenience method to add a temporary permission request to the cache -
+    // allows logging of temporary permission requests
+    private void monitorTemporaryPermissions(String ruleId, long datasetId) {
+        logger.fine("Adding rule " + ruleId + " for dataset " + datasetId);
+        rulesCache.put(ruleId, datasetId);
+    }
+
+    /**
+     * Call the Globus API to get info about the transfer.
+     * 
+     * @param accessToken
+     * @param taskId       - the Globus task id supplied by the user
+     * @param globusLogger - the transaction-specific logger to use (separate log
+     *                     files are created in general, some calls may use the
+     *                     class logger)
+     * @return
+     * @throws edu.harvard.iq.dataverse.globus.ExpiredTokenException
+     */
+    public GlobusTaskState getTask(String accessToken, String taskId, Logger globusLogger) throws ExpiredTokenException {
+
+        Logger myLogger = globusLogger != null ? globusLogger : logger;
+
+        URL url;
+        try {
+            url = new URL("https://transfer.api.globusonline.org/v0.10/endpoint_manager/task/" + taskId);
+        } catch (MalformedURLException mue) {
+            myLogger.warning("Malformed URL exception when trying to contact Globus. Globus API url: "
+                    + "https://transfer.api.globusonline.org/v0.10/endpoint_manager/task/"
+                    + taskId);
+            return null;
+        }
+
+        MakeRequestResponse result = makeRequest(url, "Bearer", accessToken, "GET", null);
+
+        GlobusTaskState taskState = null;
+
+        if (result.status == 200) {
+            taskState = parseJson(result.jsonResponse, GlobusTaskState.class, false);
+        }
+        
+        if (result.status != 200) {
+            // @todo It should probably retry it 2-3 times before giving up;
+            // similarly, it should probably differentiate between a "no such task" 
+            // response and something intermittent like a server/network error or 
+            // an expired token... i.e. something that's recoverable (?)
+            // edit: yes, but, should be done outside of this method, in the code
+            // that uses it
+            myLogger.warning("Cannot find information for the task " + taskId
+                    + " status: "
+                    + result.status
+                    + " : Reason :   "
+                    + result.jsonResponse != null ? result.jsonResponse.toString() : "unknown" );
+        }
+        
+        if (result.status == 401) {
+            throw new ExpiredTokenException("Http code 401 received. Auth. token must be expired.");
+        }
+
+        return taskState;
+    }
+
+    /**
+     * Globus call to get an access token for the user using the long-term token we
+     * hold.
+     * 
+     * @param globusBasicToken - the base64 encoded Globus Basic token comprised of
+     *                         the <Globus user id>:<key>
+     * @return - a valid Globus access token
+     */
+    public static AccessToken getClientToken(String globusBasicToken) {
+        URL url;
+        AccessToken clientTokenUser = null;
+
+        try {
+            url = new URL(
+                    "https://auth.globus.org/v2/oauth2/token?scope=openid+email+profile+urn:globus:auth:scope:transfer.api.globus.org:all&grant_type=client_credentials");
+
+            MakeRequestResponse result = makeRequest(url, "Basic", globusBasicToken, "POST", null);
+            if (result.status == 200) {
+                clientTokenUser = parseJson(result.jsonResponse, AccessToken.class, true);
+            }
+        } catch (MalformedURLException e) {
+            // On a statically defined URL...
+            e.printStackTrace();
+        }
+        return clientTokenUser;
+    }
+
+    private static MakeRequestResponse makeRequest(URL url, String authType, String authCode, String method,
+            String jsonString) {
+        String str = null;
+        HttpURLConnection connection = null;
+        int status = 0;
+        try {
+            connection = (HttpURLConnection) url.openConnection();
+            // Basic
+            logger.fine("For URL: " + url.toString());
+            connection.setRequestProperty("Authorization", authType + " " + authCode);
+            // connection.setRequestProperty("Content-Type",
+            // "application/x-www-form-urlencoded");
+            connection.setRequestMethod(method);
+            if (jsonString != null) {
+                connection.setRequestProperty("Content-Type", "application/json");
+                connection.setRequestProperty("Accept", "application/json");
+                logger.fine(jsonString);
+                connection.setDoOutput(true);
+
+                OutputStreamWriter wr = new OutputStreamWriter(connection.getOutputStream());
+                wr.write(jsonString);
+                wr.flush();
+            }
+
+            status = connection.getResponseCode();
+            logger.fine("Status now " + status);
+            InputStream result = connection.getInputStream();
+            if (result != null) {
+                str = readResultJson(result).toString();
+                logger.fine("str is " + result.toString());
+            } else {
+                logger.fine("Result is null");
+                str = null;
+            }
+
+            logger.fine("status: " + status);
+        } catch (IOException ex) {
+            logger.severe(ex.getMessage());
+            logger.fine(ex.getCause().toString());
+            logger.fine(ex.getStackTrace().toString());
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+        MakeRequestResponse r = new MakeRequestResponse(str, status);
+        return r;
+
+    }
+
+    private static StringBuilder readResultJson(InputStream in) {
+        StringBuilder sb = null;
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) {
+            sb = new StringBuilder();
+            String line;
+            while ((line = br.readLine()) != null) {
+                sb.append(line + "\n");
+            }
+            br.close();
+            logger.fine(sb.toString());
+        } catch (IOException e) {
+            sb = null;
+            logger.severe(e.getMessage());
+        }
+        return sb;
+    }
+
+    private static <T> T parseJson(String sb, Class<T> jsonParserClass, boolean namingPolicy) {
+        if (sb != null) {
+            Gson gson = null;
+            if (namingPolicy) {
+                gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
+
+            } else {
+                gson = new GsonBuilder().create();
+            }
+            T jsonClass = gson.fromJson(sb, jsonParserClass);
+            return jsonClass;
+        } else {
+            logger.severe("Bad respond from token rquest");
+            return null;
+        }
+    }
+
+    static class MakeRequestResponse {
+        public String jsonResponse;
+        public int status;
+
+        MakeRequestResponse(String jsonResponse, int status) {
+            this.jsonResponse = jsonResponse;
+            this.status = status;
+        }
+
+    }
+
+    /**
+     * Cache of open download Requests This cache keeps track of the set of files
+     * selected for transfer out (download) via Globus. It is a means of
+     * transferring the list from the DatasetPage, where it is generated via user UI
+     * actions, and the Datasets/globusDownloadParameters API.
+     * 
+     * Nominally, the dataverse-globus app will call that API endpoint and then
+     * /requestGlobusDownload, at which point the cached info is sent to the app. If
+     * the app doesn't call within 5 minutes (the time allowed to call
+     * /globusDownloadParameters) + GLOBUS_CACHE_MAXAGE minutes (a ~longer period
+     * giving the user time to make choices in the app), the cached info is deleted.
+     * 
+     */
+    private final Cache<String, JsonObject> downloadCache = Caffeine.newBuilder()
+            .expireAfterWrite(
+                    Duration.of(JvmSettings.GLOBUS_CACHE_MAXAGE.lookup(Integer.class) + 5, ChronoUnit.MINUTES))
+            .scheduler(Scheduler.systemScheduler()).evictionListener((downloadId, datasetId, cause) -> {
+                // Delete downloads that expire
+                logger.fine("Download for " + downloadId + " expired");
+            })
+
+            .build();
+
+    public JsonObject getFilesForDownload(String downloadId) {
+        return downloadCache.getIfPresent(downloadId);
+    }
+
+    public int setPermissionForDownload(Dataset dataset, String principal) {
+        GlobusEndpoint endpoint = getGlobusEndpoint(dataset);
+        String principalType = "identity";
+
+        Permissions permissions = new Permissions();
+        permissions.setDATA_TYPE("access");
+        permissions.setPrincipalType(principalType);
+        permissions.setPrincipal(principal);
+        permissions.setPath(endpoint.getBasePath() + "/");
+        permissions.setPermissions("r");
+
+        int status = requestPermission(endpoint, dataset, permissions);
+        
+        if (status == 409) {
+            // It is possible that the permission already exists. If, for example, 
+            // Dataverse failed to delete it after the last download by this 
+            // user, or if there is another download from the same user 
+            // currently in progress. The latter is now an option when the 
+            // "asynchronous mode" is enabled for task monitoring (since all the 
+            // ongoing tasks are recorded in the database, it is possible to check 
+            // whether it is safe to delete the rule on completion of a task, vs.
+            // if other tasks are still using it). If that's the case, we'll 
+            // confirm that the rule does exist and assume that it's ok to 
+            // proceed with the download.
+            String ruleId = getRuleId(endpoint, principal, "r");
+            if (ruleId != null) {
+                if (FeatureFlags.GLOBUS_USE_EXPERIMENTAL_ASYNC_FRAMEWORK.enabled()) {
+                    return 201;
+                } else {
+                    logger.warning("Attention: potentially stale read access rule found for Globus path "
+                        + endpoint.getBasePath() 
+                        + " for the principal " 
+                        + principal
+                        + "; check the Globus endpoints for stale rules that are not properly deleted.");
+                }
+            }
+        }
+        return status;
+    }
+
+    // Generates the URL to launch the Globus app for upload
+    public String getGlobusAppUrlForDataset(Dataset d) {
+        return getGlobusAppUrlForDataset(d, true, null);
+    }
+
+    /**
+     * Generated the App URl for upload (in) or download (out)
+     * 
+     * @param d         - the dataset involved
+     * @param upload    - boolean, true for upload, false for download
+     * @param dataFiles - a list of the DataFiles to be downloaded
+     * @return
+     */
+    public String getGlobusAppUrlForDataset(Dataset d, boolean upload, List<DataFile> dataFiles) {
+        String localeCode = session.getLocaleCode();
+        ApiToken apiToken = null;
+        User user = session.getUser();
+
+        if (user instanceof AuthenticatedUser) {
+            apiToken = authSvc.findApiTokenByUser((AuthenticatedUser) user);
+
+            if ((apiToken == null) || (apiToken.getExpireTime().before(new Date()))) {
+                logger.fine("Created apiToken for user: " + user.getIdentifier());
+                apiToken = authSvc.generateApiTokenForUser((AuthenticatedUser) user);
+            }
+        }
+        String driverId = d.getEffectiveStorageDriverId();
+        try {
+        } catch (Exception e) {
+            logger.warning("GlobusAppUrlForDataset: Failed to get storePrefix for " + driverId);
+        }
+
+        // Use URLTokenUtil for params currently in common with external tools.
+        URLTokenUtil tokenUtil = new URLTokenUtil(d, null, apiToken, localeCode);
+        String appUrl = settingsSvc.getValueForKey(SettingsServiceBean.Key.GlobusAppUrl, "http://localhost");
+        String callback = null;
+        if (upload) {
+            appUrl = appUrl + "/upload?dvLocale={localeCode}";
+            callback = SystemConfig.getDataverseSiteUrlStatic() + "/api/v1/datasets/" + d.getId()
+                    + "/globusUploadParameters?locale=" + localeCode;
+        } else {
+            // Download
+            JsonObject files = GlobusUtil.getFilesMap(dataFiles, d);
+
+            String downloadId = UUID.randomUUID().toString();
+            downloadCache.put(downloadId, files);
+            appUrl = appUrl + "/download?dvLocale={localeCode}";
+            callback = SystemConfig.getDataverseSiteUrlStatic() + "/api/v1/datasets/" + d.getId()
+                    + "/globusDownloadParameters?locale=" + localeCode + "&downloadId=" + downloadId;
+
+        }
+        if (apiToken != null) {
+            callback = UrlSignerUtil.signUrl(callback, 5, apiToken.getAuthenticatedUser().getUserIdentifier(),
+                    HttpMethod.GET,
+                    JvmSettings.API_SIGNING_SECRET.lookupOptional().orElse("") + apiToken.getTokenString());
+        } else {
+            // Shouldn't happen
+            logger.warning("Unable to get api token for user: " + user.getIdentifier());
+        }
+        appUrl = appUrl + "&callback=" + Base64.getEncoder().encodeToString(StringUtils.getBytesUtf8(callback));
+
+        String finalUrl = tokenUtil.replaceTokensWithValues(appUrl);
+        logger.fine("Calling app: " + finalUrl);
+        return finalUrl;
+    }
+
+    private String getGlobusDownloadScript(Dataset dataset, ApiToken apiToken, List<DataFile> downloadDFList) {
+        return URLTokenUtil.getScriptForUrl(getGlobusAppUrlForDataset(dataset, false, downloadDFList));
+    }
+
+    @Asynchronous
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public void globusUpload(JsonObject jsonData, Dataset dataset, String httpRequestUrl,
+            AuthenticatedUser authUser) throws IllegalArgumentException, ExecutionException, InterruptedException, MalformedURLException {
+
+        // Before we do anything else, let's do some basic validation of what
+        // we've been passed:
+        
+        JsonArray filesJsonArray = jsonData.getJsonArray("files");
+
+        if (filesJsonArray == null || filesJsonArray.size() < 1) {
+            throw new IllegalArgumentException("No valid json entries supplied for the files being uploaded");
+        }
+        
+        Date startDate = new Date();
+        
+        String logTimestamp = logFormatter.format(startDate);
+        Logger globusLogger = Logger.getLogger(
+                "edu.harvard.iq.dataverse.globus.GlobusServiceBean." + "Globus" 
+                        + GlobusTaskInProgress.TaskType.UPLOAD + logTimestamp);
+        
+        String logFileName = System.getProperty("com.sun.aas.instanceRoot") 
+                + File.separator + "logs" 
+                + File.separator + "globus" + GlobusTaskInProgress.TaskType.UPLOAD + "_" 
+                + logTimestamp + "_" + dataset.getId()
+                + ".log";        
+        FileHandler fileHandler;
+
+        try {
+            fileHandler = new FileHandler(logFileName);
+            globusLogger.setUseParentHandlers(false);
+        } catch (IOException | SecurityException ex) {
+            Logger.getLogger(DatasetServiceBean.class.getName()).log(Level.SEVERE, null, ex);
+            fileHandler = null;
+        }
+
+        if (fileHandler != null) {
+            globusLogger.addHandler(fileHandler);
+        } else {
+            globusLogger = logger;
+        }
+
+        logger.fine("json: " + JsonUtil.prettyPrint(jsonData));
+        
+        String taskIdentifier = jsonData.getString("taskIdentifier");
+
+        
+        globusLogger.info("Globus upload initiated, task "+taskIdentifier);
+
+        GlobusEndpoint endpoint = getGlobusEndpoint(dataset);
+        
+        // The first check on the status of the task: 
+        // It is important to be careful here, and not give up on the task 
+        // prematurely if anything goes wrong during this initial api call!
+
+        GlobusTaskState taskState = null; 
+        
+        int retriesLimit = 3;
+        int retries = 0;
+        
+        while (taskState == null && retries++ < retriesLimit) {
+            // Sleep for 3 seconds before the first check, to make sure the 
+            // task is properly registered on the remote end. Then we'll sleep 
+            // for 3 sec. more if needed, up to retriesLimit number of times.
+            try {
+                Thread.sleep(3000);
+            } catch (InterruptedException ie) {
+                logger.warning("caught an Interrupted Exception while trying to sleep for 3 sec. in globusDownload()");
+            }
+
+            try {
+                taskState = getTask(endpoint.getClientToken(), taskIdentifier, globusLogger);
+            } catch (ExpiredTokenException ete) {
+                // We have just obtained this token milliseconds ago - this shouldn't 
+                // really happen - ? 
+            }
+        }
+        
+        if (taskState != null) {
+            globusLogger.info("Task owner: "+taskState.getOwner_id()+", human-friendly owner name: "+taskState.getOwner_string());
+        }
+        
+        String ruleId = taskState != null 
+                ? getRuleId(endpoint, taskState.getOwner_id(), "rw")
+                : null;
+        
+        if (ruleId != null) {
+            logger.fine("Found rule: " + ruleId);
+            Long datasetId = rulesCache.getIfPresent(ruleId);
+            if (datasetId != null) {
+                // This will only "invalidate" the local cache entry, will not 
+                // delete or invalidate the actual Globus rule
+                rulesCache.invalidate(ruleId);
+            }
+        } else {
+            // Something is wrong - the rule should be there 
+            logger.warning("ruleId not found for download taskId: " + taskIdentifier);
+        }
+        
+        if (FeatureFlags.GLOBUS_USE_EXPERIMENTAL_ASYNC_FRAMEWORK.enabled()) {
+            
+            // Save the task information in the database so that the Globus monitoring
+            // service can continue checking on its progress.
+            
+            GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, GlobusTaskInProgress.TaskType.UPLOAD, dataset, endpoint.getClientToken(), authUser, ruleId, new Timestamp(startDate.getTime()));
+            em.persist(taskInProgress);
+            
+            // Save the metadata entries that define the files that are being uploaded
+            // in the database. These entries will be used once/if the uploads
+            // completes successfully to add the files to the dataset. 
+
+            for (JsonObject fileJsonObject : filesJsonArray.getValuesAs(JsonObject.class)) {
+                ExternalFileUploadInProgress fileUploadRecord = new ExternalFileUploadInProgress(taskIdentifier, fileJsonObject.toString());
+
+                em.persist(fileUploadRecord);
+            }
+            
+            if (fileHandler != null) {
+                fileHandler.close();
+            }
+
+            // return and forget
+            return;
+        }
+        
+        
+        // the old implementation that relies on looping continuosly, 
+        // sleeping-then-checking the task status repeatedly:
+        
+        // globus task status check
+        // (the following method performs continuous looped checks of the remote
+        // Globus API, monitoring it for as long as it takes for the task to 
+        // finish one way or another!)
+        taskState = globusStatusCheck(endpoint, taskIdentifier, globusLogger);
+        // @todo null check, or make sure it's never null
+        String taskStatus = GlobusUtil.getCompletedTaskStatus(taskState);
+
+        boolean taskSuccess = GlobusUtil.isTaskCompleted(taskState);
+        
+        processCompletedUploadTask(dataset, filesJsonArray, authUser, ruleId, globusLogger, taskSuccess, taskStatus);
+        
+        if (fileHandler != null) {
+            fileHandler.close();
+        }
+    }
+    /**
+     * As the name suggests, the method completes and finalizes an upload task, 
+     * whether it completed successfully or failed. (In the latter case, it 
+     * simply sends a failure notification and does some cleanup). 
+     * The method is called in both task monitoring scenarios: the old method, 
+     * that relies on continuous looping, and the new, implemented on the basis
+     * of timer-like monitoring from a dedicated monitoring Singleton service.
+     * @param dataset           the dataset
+     * @param filesJsonArray    JsonArray containing files metadata entries as passed to /addGlobusFiles
+     * @param authUser          the user that should be be performing the addFiles call 
+     *                          finalizing adding the files to the Dataset. Note that this 
+     *                          user will need to be obtained from the saved api token, when this
+     *                          method is called via the TaskMonitoringService
+     * @param ruleId            Globus rule/permission id associated with the task
+     * @param myLogger          the Logger; if null, the main logger of the service bean will be used
+     * @param fileHandler       FileHandler associated with the Logger, when not null
+     * @param taskSuccess       boolean task status of the completed task
+     * @param taskState         human-readable task status label as reported by the Globus API
+     * the method should not throw any exceptions; all the exceptions thrown 
+     * by the methods within are expected to be intercepted. 
+     */
+    private void processCompletedUploadTask(Dataset dataset, 
+            JsonArray filesJsonArray, 
+            AuthenticatedUser authUser, 
+            String ruleId, 
+            Logger globusLogger,
+            boolean taskSuccess, 
+            String taskStatus) {
+        
+        Logger myLogger = globusLogger == null ? logger : globusLogger;
+        
+        if (ruleId != null) {
+            // Transfer is complete, so delete rule
+            deletePermission(ruleId, dataset, myLogger);
+        }
+        
+        // If success, switch to an EditInProgress lock - do this before removing the
+        // GlobusUpload lock
+        // Keeping a lock through the add datafiles API call avoids a conflicting edit
+        // and keeps any open dataset page refreshing until the datafile appears.
+        
+        if (taskSuccess) {
+            myLogger.info("Finished upload via Globus job.");
+
+            DatasetLock editLock = datasetSvc.addDatasetLock(dataset.getId(), 
+                    DatasetLock.Reason.EditInProgress, 
+                    (authUser).getId(), 
+                    "Completing Globus Upload");
+            if (editLock != null) {
+                dataset.addLock(editLock);
+            } else {
+                myLogger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId());
+            }
+        }
+
+        DatasetLock gLock = dataset.getLockFor(DatasetLock.Reason.GlobusUpload);
+        if (gLock == null) {
+            logger.log(Level.WARNING, "No lock found for dataset");
+        } else {
+            logger.log(Level.FINE, "Removing GlobusUpload lock " + gLock.getId());
+            /*
+             * Note: This call to remove a lock only works immediately because it is in
+             * another service bean. Despite the removeDatasetLocks method having the
+             * REQUIRES_NEW transaction annotation, when the globusUpload method and that
+             * method were in the same bean (globusUpload was in the DatasetServiceBean to
+             * start), the globus lock was still seen in the API call initiated in the
+             * addFilesAsync method called within the globusUpload method. I.e. it appeared
+             * that the lock removal was not committed/visible outside this method until
+             * globusUpload itself ended.
+             * (from @landreev:) If I understand the comment above correctly - annotations 
+             * like "@TransactionAttribute(REQUIRES_NEW) do NOT work when you call a method 
+             * directly within the same service bean. Strictly speaking, it's not the 
+             * "within the same bean" part that is the key, rather, these annotations
+             * only apply when calling a method via an @EJB-defined service. So it 
+             * is generally possible to call another method within FooServiceBean 
+             * with the REQUIRES_NEW transaction taking effect - but then it would need
+             * to define *itself* as an @EJB - 
+             * @EJB FooServiceBean fooSvc; 
+             * ...
+             * fooSvc.doSomethingInNewTransaction(...); 
+             * etc. 
+             */
+            datasetSvc.removeDatasetLocks(dataset, DatasetLock.Reason.GlobusUpload);
+        }
+        
+        if (!taskSuccess) {
+            String comment; 
+            if (taskStatus != null) {
+                comment = "Reason : " + taskStatus.split("#")[1] + "<br> Short Description : "
+                        + taskStatus.split("#")[2];
+            } else {
+                comment = "No further information available";
+            }
+            
+            myLogger.info("Globus Upload task failed ");
+            userNotificationService.sendNotification((AuthenticatedUser) authUser, new Timestamp(new Date().getTime()),
+                    UserNotification.Type.GLOBUSUPLOADREMOTEFAILURE, dataset.getId(), comment, true);
+
+        } else {
+            try {
+                processUploadedFiles(filesJsonArray, dataset, authUser, myLogger);
+            } catch (Exception e) {
+                logger.info("Exception from processUploadedFiles call ");
+                e.printStackTrace();
+                myLogger.info("Exception from processUploadedFiles call " + e.getMessage());
+                datasetSvc.removeDatasetLocks(dataset, DatasetLock.Reason.EditInProgress);
+            }
+        }
+        
+        // @todo: this appears to be redundant - it was already deleted above - ?
+        if (ruleId != null) {
+            deletePermission(ruleId, dataset, myLogger);
+            myLogger.info("Removed upload permission: " + ruleId);
+        }
+        
+    }
+    
+    
+    /**
+     * The code in this method is copy-and-pasted from the previous Borealis 
+     * implemenation. 
+     * @todo see if it can be refactored and simplified a bit, the json manipulation 
+     *       specifically (?)
+     * @param filesJsonArray    JsonArray containing files metadata entries as passed to /addGlobusFiles
+     * @param dataset           the dataset
+     * @param authUser          the user that should be be performing the addFiles call 
+     *                          finalizing adding the files to the Dataset. Note that this 
+     *                          user will need to be obtained from the saved api token, when this
+     *                          method is called via the TaskMonitoringService
+     * @param myLogger          the Logger; if null, the main logger of the service bean will be used
+     * @throws IOException, InterruptedException, ExecutionException @todo may need to throw more exceptions (?)
+     */
+    private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, AuthenticatedUser authUser, Logger myLogger) throws IOException, InterruptedException, ExecutionException {
+        myLogger = myLogger != null ? myLogger : logger; 
+        
+        Integer countAll = 0;
+        Integer countSuccess = 0;
+        Integer countError = 0;
+        Integer countAddFilesSuccess = 0;
+        String notificationErrorMessage = ""; 
+        
+        List<String> inputList = new ArrayList<String>();
+
+        String datasetIdentifier = dataset.getAuthorityForFileStorage() + "/"
+                + dataset.getIdentifierForFileStorage();
+
+        for (JsonObject fileJsonObject : filesJsonArray.getValuesAs(JsonObject.class)) {
+
+            // storageIdentifier s3://gcs5-bucket1:1781cfeb8a7-748c270a227c from
+            // externalTool
+            String storageIdentifier = fileJsonObject.getString("storageIdentifier");
+            String[] parts = DataAccess.getDriverIdAndStorageLocation(storageIdentifier);
+            String storeId = parts[0];
+            // If this is an S3 store, we need to split out the bucket name
+            String[] bits = parts[1].split(":");
+            String bucketName = "";
+            if (bits.length > 1) {
+                bucketName = bits[0];
+            }
+            String fileId = bits[bits.length - 1];
+
+            // fullpath s3://gcs5-bucket1/10.5072/FK2/3S6G2E/1781cfeb8a7-4ad9418a5873
+            // or globus:///10.5072/FK2/3S6G2E/1781cfeb8a7-4ad9418a5873
+            String fullPath = storeId + "://" + bucketName + "/" + datasetIdentifier + "/" + fileId;
+            String fileName = fileJsonObject.getString("fileName");
+
+            inputList.add(fileId + "IDsplit" + fullPath + "IDsplit" + fileName);
+        }
+        
+        Map<String, Long> fileSizeMap = null; 
+        
+        if (filesJsonArray.size() >= systemConfig.getGlobusBatchLookupSize()) {
+            // Look up the sizes of all the files in the dataset folder, to avoid 
+            // looking them up one by one later:
+            // @todo: we should only be doing this if this is a managed store, probably (?) 
+            GlobusEndpoint endpoint = getGlobusEndpoint(dataset);
+            fileSizeMap = lookupFileSizes(endpoint, endpoint.getBasePath());
+        }
+
+        // calculateMissingMetadataFields: checksum, mimetype
+        JsonObject newfilesJsonObject = calculateMissingMetadataFields(inputList, myLogger);
+        
+        JsonArray newfilesJsonArray = newfilesJsonObject.getJsonArray("files");
+        logger.fine("Size: " + newfilesJsonArray.size());
+        logger.fine("Val: " + JsonUtil.prettyPrint(newfilesJsonArray.getJsonObject(0)));
+        JsonArrayBuilder addFilesJsonData = Json.createArrayBuilder();
+
+        for (JsonObject fileJsonObject : filesJsonArray.getValuesAs(JsonObject.class)) {
+
+            countAll++;
+            String storageIdentifier = fileJsonObject.getString("storageIdentifier");
+            String fileName = fileJsonObject.getString("fileName");
+            String[] parts = DataAccess.getDriverIdAndStorageLocation(storageIdentifier);
+            // If this is an S3 store, we need to split out the bucket name
+            String[] bits = parts[1].split(":");
+            if (bits.length > 1) {
+            }
+            String fileId = bits[bits.length - 1];
+
+            List<JsonObject> newfileJsonObject = IntStream.range(0, newfilesJsonArray.size())
+                    .mapToObj(index -> ((JsonObject) newfilesJsonArray.get(index)).getJsonObject(fileId))
+                    .filter(Objects::nonNull).collect(Collectors.toList());
+            if (newfileJsonObject != null) {
+                logger.fine("List Size: " + newfileJsonObject.size());
+                // if (!newfileJsonObject.get(0).getString("hash").equalsIgnoreCase("null")) {
+                JsonPatch patch = Json.createPatchBuilder()
+                        .add("/md5Hash", newfileJsonObject.get(0).getString("hash")).build();
+                fileJsonObject = patch.apply(fileJsonObject);
+                patch = Json.createPatchBuilder()
+                        .add("/mimeType", newfileJsonObject.get(0).getString("mime")).build();
+                fileJsonObject = patch.apply(fileJsonObject);
+                // If we already know the size of this file on the Globus end, 
+                // we'll pass it to /addFiles, to avoid looking up file sizes 
+                // one by one:
+                if (fileSizeMap != null && fileSizeMap.get(fileId) != null) {
+                    Long uploadedFileSize = fileSizeMap.get(fileId);
+                    myLogger.info("Found size for file " + fileId + ": " + uploadedFileSize + " bytes");
+                    patch = Json.createPatchBuilder()
+                            .add("/fileSize", Json.createValue(uploadedFileSize)).build();
+                    fileJsonObject = patch.apply(fileJsonObject);
+                } else {
+                    logger.fine("No file size entry found for file "+fileId);
+                }
+                addFilesJsonData.add(fileJsonObject);
+                countSuccess++;
+            } else {
+                myLogger.info(fileName
+                        + " will be skipped from adding to dataset in the final AddReplaceFileHelper.addFiles() call. ");
+                countError++;
+            }
+        }
+
+        String newjsonData = addFilesJsonData.build().toString();
+
+        myLogger.info("Successfully generated new JsonData for addFiles call");
+
+        myLogger.info("Files passed to /addGlobusFiles: " + countAll);
+        myLogger.info("Files processed successfully: " + countSuccess);
+        myLogger.info("Files failures to process: " + countError);
+
+        if (countSuccess < 1) {
+            // We don't have any valid entries to call addFiles() for; so, no 
+            // need to proceed. 
+            notificationErrorMessage = "Failed to successfully process any of the file entries, "
+                    + "out of the " + countAll + " total as submitted to Dataverse";
+            userNotificationService.sendNotification((AuthenticatedUser) authUser,
+                        new Timestamp(new Date().getTime()), UserNotification.Type.GLOBUSUPLOADREMOTEFAILURE,
+                        dataset.getId(), notificationErrorMessage, true);
+            return;
+        } else if (countSuccess < countAll) {
+            notificationErrorMessage = "Out of the " + countAll + " file entries submitted to /addGlobusFiles " 
+                    + "only " + countSuccess + " could be successfully parsed and processed. ";
+        }
+        
+        // A new AddReplaceFileHelper implementation, replacing the old one that 
+        // was relying on calling /addFiles api via curl: 
+        
+        // Passing null for the HttpServletRequest to make a new DataverseRequest. 
+        // The parent method is always executed asynchronously, so the real request 
+        // that was associated with the original API call that triggered this upload
+        // cannot be obtained. 
+        DataverseRequest dataverseRequest = new DataverseRequest(authUser, (HttpServletRequest)null);
+        
+        AddReplaceFileHelper addFileHelper = new AddReplaceFileHelper(
+                dataverseRequest,
+                this.ingestSvc,
+                this.datasetSvc,
+                this.dataFileSvc,
+                this.permissionSvc,
+                this.commandEngine,
+                this.systemConfig
+        );
+                
+        // The old code had 2 sec. of sleep, so ...
+        Thread.sleep(2000);
+
+        Response addFilesResponse = addFileHelper.addFiles(newjsonData, dataset, authUser, true);
+
+        if (addFilesResponse == null) {
+            logger.info("null response from addFiles call");
+            //@todo add this case to the user notification in case of error
+            return;
+        }
+        
+        JsonObject addFilesJsonObject = JsonUtil.getJsonObject(addFilesResponse.getEntity().toString());
+        
+        // @todo null check?
+        String addFilesStatus = addFilesJsonObject.getString("status", null);
+        myLogger.info("addFilesResponse status: " + addFilesStatus);
+        
+        if (ApiConstants.STATUS_OK.equalsIgnoreCase(addFilesStatus)) {
+            if (addFilesJsonObject.containsKey("data") && addFilesJsonObject.getJsonObject("data").containsKey("Result")) {
+
+                //Integer countAddFilesTotal = addFilesJsonObject.getJsonObject("data").getJsonObject("Result").getInt(ApiConstants.API_ADD_FILES_COUNT_PROCESSED, -1);
+                countAddFilesSuccess = addFilesJsonObject.getJsonObject("data").getJsonObject("Result").getInt(ApiConstants.API_ADD_FILES_COUNT_SUCCESSFUL, -1);
+                myLogger.info("Files successfully added by addFiles(): " + countAddFilesSuccess);
+
+            } else {
+                myLogger.warning("Malformed addFiles response json: " + addFilesJsonObject.toString());
+                notificationErrorMessage = "Malformed response received when attempting to add the files to the dataset. ";
+            }
+
+            myLogger.info("Completed addFiles call ");
+        } else if (ApiConstants.STATUS_ERROR.equalsIgnoreCase(addFilesStatus)) {
+            String addFilesMessage = addFilesJsonObject.getString("message", null);
+
+            myLogger.log(Level.SEVERE,
+                    "******* Error while executing addFiles ", newjsonData);
+            myLogger.log(Level.SEVERE, "****** Output from addFiles: ", addFilesMessage);
+            notificationErrorMessage += "Error response received when attempting to add the files to the dataset: " + addFilesMessage + " "; 
+
+        } else {
+            myLogger.log(Level.SEVERE,
+                    "******* Error while executing addFiles ", newjsonData);
+            notificationErrorMessage += "Unexpected error encountered when attemptingh to add the files to the dataset.";
+        }
+        
+        // if(!taskSkippedFiles)
+        if (countAddFilesSuccess == countAll) {
+            userNotificationService.sendNotification((AuthenticatedUser) authUser,
+                    new Timestamp(new Date().getTime()), UserNotification.Type.GLOBUSUPLOADCOMPLETED,
+                    dataset.getId(), countSuccess + " files added out of " + countAll, true);
+        } else if (countAddFilesSuccess > 0) {
+            // success, but partial:
+            userNotificationService.sendNotification((AuthenticatedUser) authUser,
+                    new Timestamp(new Date().getTime()),
+                    UserNotification.Type.GLOBUSUPLOADCOMPLETEDWITHERRORS, dataset.getId(),
+                    countSuccess + " files added out of " + countAll + notificationErrorMessage, true);
+        } else {
+            notificationErrorMessage = "".equals(notificationErrorMessage) 
+                    ? " No additional information is available." : notificationErrorMessage;
+            userNotificationService.sendNotification((AuthenticatedUser) authUser,
+                    new Timestamp(new Date().getTime()),
+                    UserNotification.Type.GLOBUSUPLOADLOCALFAILURE, dataset.getId(),
+                    notificationErrorMessage, true);
+        }
+
+    }
+    
+    @Asynchronous
+    public void globusDownload(JsonObject jsonObject, Dataset dataset, User authUser) throws MalformedURLException {
+
+        Date startDate = new Date();
+        
+        // the logger initialization method may need to be moved into the GlobusUtil
+        // eventually, for both this and the monitoring service to use
+        String logTimestamp = logFormatter.format(startDate);
+        Logger globusLogger = Logger.getLogger(
+                "edu.harvard.iq.dataverse.globus.GlobusServiceBean." + "Globus" 
+                        + GlobusTaskInProgress.TaskType.DOWNLOAD + logTimestamp);
+
+        String logFileName = System.getProperty("com.sun.aas.instanceRoot") 
+                + File.separator + "logs" 
+                + File.separator + "globus" + GlobusTaskInProgress.TaskType.DOWNLOAD + "_" 
+                + logTimestamp + "_" + dataset.getId()
+                + ".log";
+        FileHandler fileHandler;
+        boolean fileHandlerSuceeded;
+        try {
+            fileHandler = new FileHandler(logFileName);
+            globusLogger.setUseParentHandlers(false);
+            fileHandlerSuceeded = true;
+        } catch (IOException | SecurityException ex) {
+            Logger.getLogger(DatasetServiceBean.class.getName()).log(Level.SEVERE, null, ex);
+            return;
+        }
+
+        if (fileHandlerSuceeded) {
+            globusLogger.addHandler(fileHandler);
+        } else {
+            globusLogger = logger;
+        }
+        
+        String taskIdentifier = jsonObject.getString("taskIdentifier");
+
+        globusLogger.info("Starting monitoring a globus download task "+taskIdentifier);
+                
+        GlobusEndpoint endpoint = getGlobusEndpoint(dataset);
+        logger.fine("Endpoint path: " + endpoint.getBasePath());
+
+        // If the rules_cache times out, the permission will be deleted. Presumably that
+        // doesn't affect a
+        // globus task status check
+
+        // The first check on the status of the task: 
+        // It is important to be careful here, and not give up on the task 
+        // prematurely if anything goes wrong during this initial api call!
+
+        GlobusTaskState taskState = null; 
+        
+        int retriesLimit = 3;
+        int retries = 0;
+        
+        while (taskState == null && retries++ < retriesLimit) {
+            // Sleep for 3 seconds before the first check, to make sure the 
+            // task is properly registered on the remote end. Then we'll sleep 
+            // for 3 sec. more if needed, up to retriesLimit number of times.
+            try {
+                Thread.sleep(3000);
+            } catch (InterruptedException ie) {
+                logger.warning("caught an Interrupted Exception while trying to sleep for 3 sec. in globusDownload()");
+            }
+            
+            try {            
+                taskState = getTask(endpoint.getClientToken(), taskIdentifier, globusLogger);
+            } catch (ExpiredTokenException ete) {
+                // We have just obtained this token milliseconds ago - this shouldn't 
+                // really happen (?)
+                endpoint = getGlobusEndpoint(dataset);
+            }
+        }
+        
+        if (taskState != null) {
+            globusLogger.info("Task owner: "+taskState.getOwner_id()+", human-friendly owner name: "+taskState.getOwner_string());
+        }
+        
+        String ruleId = taskState != null 
+                ? getRuleId(endpoint, taskState.getOwner_id(), "r")
+                : null;
+        
+        if (ruleId != null) {
+            logger.fine("Found rule: " + ruleId);
+            Long datasetId = rulesCache.getIfPresent(ruleId);
+            if (datasetId != null) {
+                logger.fine("Deleting from local cache: rule: " + ruleId);
+                // This will only "invalidate" the local cache entry, will not 
+                // delete or invalidate the actual Globus rule
+                rulesCache.invalidate(ruleId);
+            }
+        } else {
+            // Something is wrong - the rule should be there
+            logger.warning("ruleId not found for download taskId: " + taskIdentifier);
+            // We will proceed monitoring the transfer, even though the ruleId 
+            // is null at the moment. The whole point of monitoring a download 
+            // task is to remove the rule on the collection side once it's done, 
+            // and we will need the rule id for that. But let's hope this was a
+            // temporary condition and we will eventually be able to look it up. 
+        }
+                
+        if (FeatureFlags.GLOBUS_USE_EXPERIMENTAL_ASYNC_FRAMEWORK.enabled()) {
+            
+            // Save the task information in the database so that the Globus monitoring
+            // service can continue checking on its progress.
+            
+            GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, 
+                    GlobusTaskInProgress.TaskType.DOWNLOAD, 
+                    dataset, 
+                    endpoint.getClientToken(), 
+                    authUser instanceof AuthenticatedUser ? (AuthenticatedUser)authUser : null, 
+                    ruleId, 
+                    new Timestamp(startDate.getTime()));
+            em.persist(taskInProgress);
+                        
+            fileHandler.close();
+
+            // return and forget; the Monitoring Service will pick it up on 
+            // the next scheduled check
+            return;
+        }
+        
+        // Old implementation: 
+        // globusStatusCheck will loop continuously, until it determines that the
+        // task has completed - i.e., for the duration of the task
+        taskState = globusStatusCheck(endpoint, taskIdentifier, globusLogger);
+                
+        processCompletedDownloadTask(taskState, 
+                authUser instanceof AuthenticatedUser ? (AuthenticatedUser)authUser : null, 
+                dataset, 
+                ruleId, 
+                globusLogger);
+    }
+
+    Executor executor = Executors.newFixedThreadPool(10);
+
+    private GlobusTaskState globusStatusCheck(GlobusEndpoint endpoint, String taskId, Logger globusLogger)
+            throws MalformedURLException {
+        boolean taskCompleted = false;
+        GlobusTaskState task = null;
+        int pollingInterval = SystemConfig.getIntLimitFromStringOrDefault(
+                settingsSvc.getValueForKey(SettingsServiceBean.Key.GlobusPollingInterval), 50);
+        int retries = 0;
+        do {
+            try {
+                globusLogger.info("checking globus transfer task   " + taskId);
+                Thread.sleep(pollingInterval * 1000);
+                // Call the (centralized) Globus API to check on the task state/status:
+                task = getTask(endpoint.getClientToken(), taskId, globusLogger);
+                taskCompleted = GlobusUtil.isTaskCompleted(task);
+                if (taskCompleted) {
+                    if (task.getStatus().equalsIgnoreCase("ACTIVE")) {
+                        retries++; 
+                        // isTaskCompleted() method assumes that a task that is still 
+                        // being reported as "ACTIVE" is in fact completed if its 
+                        // "nice status" is neither "ok" nor "queued". If that is the 
+                        // case, we want it to happen at least 3 times in a row before
+                        // we give up on this task. 
+                        globusLogger.fine("Task is reported as \"ACTIVE\", but appears completed (nice_status: " 
+                                + task.getNice_status() 
+                                + ", " 
+                                + retries 
+                                + " attempts so far");
+                        taskCompleted = retries > 3;
+                    }
+                } else {
+                    retries = 0; 
+                } 
+
+            } catch (Exception ex) {
+                logger.warning("Caught exception while in globusStatusCheck(); stack trace below");
+                ex.printStackTrace();
+            }
+
+        } while (!taskCompleted);
+
+        globusLogger.info("globus transfer task completed");
+        return task;
+    }
+    
+    private JsonObject calculateMissingMetadataFields(List<String> inputList, Logger globusLogger)
+            throws InterruptedException, ExecutionException, IOException {
+
+        List<CompletableFuture<FileDetailsHolder>> hashvalueCompletableFutures = inputList.stream()
+                .map(iD -> calculateDetailsAsync(iD, globusLogger)).collect(Collectors.toList());
+
+        CompletableFuture<Void> allFutures = CompletableFuture
+                .allOf(hashvalueCompletableFutures.toArray(new CompletableFuture[hashvalueCompletableFutures.size()]));
+
+        CompletableFuture<List<FileDetailsHolder>> allCompletableFuture = allFutures.thenApply(future -> {
+            return hashvalueCompletableFutures.stream().map(completableFuture -> completableFuture.join())
+                    .collect(Collectors.toList());
+        });
+
+        CompletableFuture<?> completableFuture = allCompletableFuture.thenApply(files -> {
+            return files.stream().map(d -> json(d)).collect(toJsonArray());
+        });
+
+        JsonArrayBuilder filesObject = (JsonArrayBuilder) completableFuture.get();
+        
+        JsonObject output = Json.createObjectBuilder().add("files", filesObject).build();
+
+        return output;
+
+    }
+
+    private CompletableFuture<FileDetailsHolder> calculateDetailsAsync(String id, Logger globusLogger) {
+
+        return CompletableFuture.supplyAsync(() -> {
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            try {
+                return (calculateDetails(id, globusLogger));
+            } catch (InterruptedException | IOException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }, executor).exceptionally(ex -> {
+            return null;
+        });
+    }
+
+    private FileDetailsHolder calculateDetails(String id, Logger globusLogger)
+            throws InterruptedException, IOException {
+        int count = 0;
+        String checksumVal = "";
+        InputStream in = null;
+        String fileId = id.split("IDsplit")[0];
+        String fullPath = id.split("IDsplit")[1];
+        String fileName = id.split("IDsplit")[2];
+
+        // ToDo: what if the file does not exist in s3
+        // (L.A.) - good question. maybe it should call .open and .exists() here? 
+        //          otherwise, there doesn't seem to be any diagnostics as to which 
+        //          files uploaded successfully and which failed (?)
+        //          ... however, any partially successful upload cases should be 
+        //          properly handled later, during the .addFiles() call - only 
+        //          the files that actually exists in storage remotely will be 
+        //          added to the dataset permanently then. 
+        // ToDo: what if checksum calculation failed
+        // (L.A.) - this appears to have been addressed - by using "Not available in Dataverse"
+        //          in place of a checksum. 
+
+        String storageDriverId = DataAccess.getDriverIdAndStorageLocation(fullPath)[0];
+
+        if (StorageIO.isDataverseAccessible(storageDriverId)) {
+            do {
+                try {
+                    StorageIO<DvObject> dataFileStorageIO = DataAccess.getDirectStorageIO(fullPath);
+                        in = dataFileStorageIO.getInputStream();
+                    checksumVal = FileUtil.calculateChecksum(in, DataFile.ChecksumType.MD5);
+                    count = 3;
+                } catch (IOException ioex) {
+                    count = 3;
+                    logger.fine(ioex.getMessage());
+                    globusLogger.info(
+                            "DataFile (fullPath " + fullPath + ") does not appear to be accessible within Dataverse: ");
+                } catch (Exception ex) {
+                    count = count + 1;
+                    ex.printStackTrace();
+                    logger.info(ex.getMessage());
+                    Thread.sleep(5000);
+                }
+            } while (count < 3);
+        }
+
+        if (checksumVal.length() == 0) {
+            checksumVal = "Not available in Dataverse";
+        }
+
+        String mimeType = calculatemime(fileName);
+        globusLogger.info(" File Name " + fileName + "  File Details " + fileId + " checksum = " + checksumVal
+                + " mimeType = " + mimeType);
+        return new FileDetailsHolder(fileId, checksumVal, mimeType);
+        // getBytes(in)+"" );
+        // calculatemime(fileName));
+    }
+
+    public String calculatemime(String fileName) throws InterruptedException {
+
+        String finalType = FileUtil.MIME_TYPE_UNDETERMINED_DEFAULT;
+        String type = FileUtil.determineFileTypeByNameAndExtension(fileName);
+
+        if (type != null && !type.isBlank()) {
+            if (FileUtil.useRecognizedType(finalType, type)) {
+                finalType = type;
+            }
+        }
+
+        return finalType;
+    }
+
+    private GlobusEndpoint getGlobusEndpoint(DvObject dvObject) {
+        Dataset dataset = null;
+        if (dvObject instanceof Dataset) {
+            dataset = (Dataset) dvObject;
+        } else if (dvObject instanceof DataFile) {
+            dataset = (Dataset) dvObject.getOwner();
+        } else {
+            throw new IllegalArgumentException("Unsupported DvObject type: " + dvObject.getClass().getName());
+        }
+        String driverId = dataset.getEffectiveStorageDriverId();
+        GlobusEndpoint endpoint = null;
+
+        String directoryPath = GlobusAccessibleStore.getTransferPath(driverId);
+
+        if (GlobusAccessibleStore.isDataverseManaged(driverId) && (dataset != null)) {
+            directoryPath = directoryPath + "/" + dataset.getAuthorityForFileStorage() + "/"
+                    + dataset.getIdentifierForFileStorage();
+        } else {
+            // remote store - may have path in file storageidentifier
+            String relPath = dvObject.getStorageIdentifier()
+                    .substring(dvObject.getStorageIdentifier().lastIndexOf("//") + 2);
+            int filenameStart = relPath.lastIndexOf("/") + 1;
+            if (filenameStart > 0) {
+                directoryPath = directoryPath + relPath.substring(0, filenameStart);
+            }
+        }
+        logger.fine("directoryPath finally: " + directoryPath);
+
+        String endpointId = GlobusAccessibleStore.getTransferEndpointId(driverId);
+
+        logger.fine("endpointId: " + endpointId);
+
+        String clientToken = getClientTokenForDataset(dataset); 
+        endpoint = new GlobusEndpoint(endpointId, clientToken, directoryPath);
+
+        return endpoint;
+    }
+    
+    public String getClientTokenForDataset(Dataset dataset) {
+        String clientToken = null;
+        
+        String driverId = dataset.getEffectiveStorageDriverId();
+        String globusBasicToken = GlobusAccessibleStore.getGlobusToken(driverId);
+        AccessToken accessToken = GlobusServiceBean.getClientToken(globusBasicToken);
+        if (accessToken != null) {
+            clientToken = accessToken.getOtherTokens().get(0).getAccessToken();
+            // the above should be safe null pointers-wise, 
+            // if the accessToken returned is not null; i.e., if it should be 
+            // well-structured, with at least one non-null "Other Token", etc. 
+            // - otherwise a null would be returned. 
+        }
+        return clientToken;        
+    }
+
+    // This helper method is called from the Download terms/guestbook/etc. popup,
+    // when the user clicks the "ok" button. We use it, instead of calling
+    // downloadServiceBean directly, in order to differentiate between single
+    // file downloads and multiple (batch) downloads - since both use the same
+    // terms/etc. popup.
+    public void writeGuestbookAndStartTransfer(GuestbookResponse guestbookResponse,
+            boolean doNotSaveGuestbookResponse) {
+        PrimeFaces.current().executeScript("PF('guestbookAndTermsPopup').hide()");
+        
+        logger.fine("Inside writeGuestbookAndStartTransfer; " + (doNotSaveGuestbookResponse ? "doNotSaveGuestbookResponse" : "DOsaveGuestbookResponse"));
+        
+        guestbookResponse.setEventType(GuestbookResponse.DOWNLOAD);
+
+        ApiToken apiToken = null;
+        User user = session.getUser();
+        if (user instanceof AuthenticatedUser) {
+            apiToken = authSvc.findApiTokenByUser((AuthenticatedUser) user);
+        } else if (user instanceof PrivateUrlUser) {
+            PrivateUrlUser privateUrlUser = (PrivateUrlUser) user;
+            PrivateUrl privUrl = privateUrlService.getPrivateUrlFromDatasetId(privateUrlUser.getDatasetId());
+            apiToken = new ApiToken();
+            apiToken.setTokenString(privUrl.getToken());
+        }
+
+        logger.fine("selected file ids from the guestbookResponse: " +guestbookResponse.getSelectedFileIds());
+        
+        DataFile df = guestbookResponse.getDataFile();
+        if (df != null) {
+            logger.fine("Single datafile case for writeGuestbookAndStartTransfer");
+            List<DataFile> downloadDFList = new ArrayList<DataFile>(1);
+            downloadDFList.add(df);
+            if (!doNotSaveGuestbookResponse) {
+                fileDownloadService.writeGuestbookResponseRecord(guestbookResponse);
+            }
+            PrimeFaces.current().executeScript(getGlobusDownloadScript(df.getOwner(), apiToken, downloadDFList));
+        } else {
+            // Following FileDownloadServiceBean writeGuestbookAndStartBatchDownload
+            List<String> list = new ArrayList<>(Arrays.asList(guestbookResponse.getSelectedFileIds().split(",")));
+            List<DataFile> selectedFiles = new ArrayList<DataFile>();
+            for (String idAsString : list) {
+                try {
+                    Long fileId = Long.parseLong(idAsString);
+                    // If we need to create a GuestBookResponse record, we have to
+                    // look up the DataFile object for this file:
+                    df = dataFileSvc.findCheapAndEasy(fileId);
+                    selectedFiles.add(df);
+                    if (!doNotSaveGuestbookResponse) {
+                        guestbookResponse.setDataFile(df);
+                        fileDownloadService.writeGuestbookResponseRecord(guestbookResponse);
+                    }
+                } catch (NumberFormatException nfe) {
+                    logger.warning(
+                            "A file id passed to the writeGuestbookAndStartTransfer method as a string could not be converted back to Long: "
+                                    + idAsString);
+                    return;
+                }
+
+            }
+            if (!selectedFiles.isEmpty()) {
+                // Use dataset from one file - files should all be from the same dataset
+                PrimeFaces.current().executeScript(getGlobusDownloadScript(df.getOwner(), apiToken, selectedFiles));
+            }
+        }
+    }
+    
+    public List<GlobusTaskInProgress> findAllOngoingTasks() {
+        return em.createQuery("select object(o) from GlobusTaskInProgress as o order by o.startTime", GlobusTaskInProgress.class).getResultList();
+    }
+    
+    public List<GlobusTaskInProgress> findAllOngoingTasks(GlobusTaskInProgress.TaskType taskType) {
+        return em.createQuery("select object(o) from GlobusTaskInProgress as o where o.taskType=:taskType order by o.startTime", GlobusTaskInProgress.class).setParameter("taskType", taskType).getResultList();
+    }
+    
+    public boolean isRuleInUseByOtherTasks(String ruleId) {
+        Long numTask = em.createQuery("select count(o) from GlobusTaskInProgress as o where o.ruleId=:ruleId", Long.class).setParameter("ruleId", ruleId).getSingleResult();
+        return numTask > 1;
+    }
+          
+    public void deleteTask(GlobusTaskInProgress task) {
+        GlobusTaskInProgress mergedTask = em.merge(task);
+        em.remove(mergedTask);
+    }
+    
+    public List<ExternalFileUploadInProgress> findExternalUploadsByTaskId(String taskId) {
+        return em.createNamedQuery("ExternalFileUploadInProgress.findByTaskId").setParameter("taskId", taskId).getResultList();    
+    }
+    
+    public void processCompletedTask(GlobusTaskInProgress globusTask, 
+            GlobusTaskState taskState, 
+            boolean taskSuccess, 
+            String taskStatus,
+            boolean deleteRule,
+            Logger taskLogger) {
+    
+        String ruleId = globusTask.getRuleId();
+        Dataset dataset = globusTask.getDataset();
+        AuthenticatedUser authUser = globusTask.getLocalUser();
+        
+        switch (globusTask.getTaskType()) {
+
+            case UPLOAD:
+                List<ExternalFileUploadInProgress> fileUploadsInProgress = findExternalUploadsByTaskId(globusTask.getTaskId());
+
+                if (fileUploadsInProgress == null || fileUploadsInProgress.size() < 1) {
+                    // @todo log error message; do nothing
+                    // (will this ever happen though?)
+                    return;
+                }
+
+                JsonArrayBuilder filesJsonArrayBuilder = Json.createArrayBuilder();
+
+                for (ExternalFileUploadInProgress pendingFile : fileUploadsInProgress) {
+                    String jsonInfoString = pendingFile.getFileInfo();
+                    JsonObject fileObject = JsonUtil.getJsonObject(jsonInfoString);
+                    filesJsonArrayBuilder.add(fileObject);
+                }
+
+                JsonArray filesJsonArray = filesJsonArrayBuilder.build();
+
+                processCompletedUploadTask(dataset, filesJsonArray, authUser, ruleId, taskLogger, taskSuccess, taskStatus);
+                break;
+                
+            case DOWNLOAD:
+
+                processCompletedDownloadTask(taskState, authUser, dataset, ruleId, deleteRule, taskLogger);
+                break;
+
+            default:
+                logger.warning("Unknown or null TaskType passed to processCompletedTask()");
+        }
+
+    }
+    
+    private void processCompletedDownloadTask(GlobusTaskState taskState,
+            AuthenticatedUser authUser,
+            Dataset dataset, 
+            String ruleId,
+            Logger taskLogger) {
+        processCompletedDownloadTask(taskState, authUser, dataset, ruleId, true, taskLogger);
+    }
+    
+    private void processCompletedDownloadTask(GlobusTaskState taskState,
+            AuthenticatedUser authUser,
+            Dataset dataset, 
+            String ruleId,
+            boolean deleteRule,
+            Logger taskLogger) {
+        // The only thing to do on completion of a remote download 
+        // transfer is to delete the permission ACL that Dataverse 
+        // had negotiated for the user before the task was initialized ...
+
+        GlobusEndpoint endpoint = getGlobusEndpoint(dataset);
+        
+        if (endpoint != null) {
+            if (deleteRule) {
+                if (ruleId == null) {
+                    // It is possible that, for whatever reason, we failed to look up 
+                    // the rule id when the monitoring of the task was initiated - but 
+                    // now that it has completed, let's try and look it up again:
+                    getRuleId(endpoint, taskState.getOwner_id(), "r");
+                }
+
+                if (ruleId != null) {
+                    deletePermission(ruleId, endpoint, taskLogger);
+                }
+            }
+        }
+
+        String taskStatus = GlobusUtil.getCompletedTaskStatus(taskState);
+        
+        // ... plus log the outcome and send any notifications:
+        if (taskStatus.startsWith("FAILED") || taskStatus.startsWith("INACTIVE")) {
+            // Outright, unambiguous failure: 
+            String comment = "Reason : " + taskStatus.split("#")[1] + "<br> Short Description : "
+                    + taskStatus.split("#")[2];
+            taskLogger.info("Globus task failed during download process: " + comment);
+
+            sendNotification(authUser, UserNotification.Type.GLOBUSDOWNLOADCOMPLETEDWITHERRORS, dataset.getId(), comment);
+
+        } else {
+            // Success, total or partial
+            boolean taskSkippedFiles = (taskState == null || taskState.getSkip_source_errors() == null) ? false : taskState.getSkip_source_errors();
+
+            if (!taskSkippedFiles) {
+                taskLogger.info("Globus task completed successfully");
+
+                sendNotification(authUser, UserNotification.Type.GLOBUSDOWNLOADCOMPLETED, dataset.getId(), "");
+            } else {
+                taskLogger.info("Globus task completed with partial success (skip source errors)");
+
+                sendNotification(authUser, UserNotification.Type.GLOBUSDOWNLOADCOMPLETEDWITHERRORS, dataset.getId(), "");
+            }
+        }
+    }
+    
+    private void sendNotification(AuthenticatedUser authUser, 
+            UserNotification.Type type, 
+            Long datasetId,
+            String comment) {
+        if (authUser != null) {
+            userNotificationService.sendNotification(authUser,
+                    new Timestamp(new Date().getTime()), 
+                    type,
+                    datasetId,
+                    comment);
+        }
+    }
+            
+    public void deleteExternalUploadRecords(String taskId) {
+        em.createNamedQuery("ExternalFileUploadInProgress.deleteByTaskId")
+                .setParameter("taskId", taskId)
+                .executeUpdate();
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java
new file mode 100644
index 00000000000..f1bbd99fa67
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java
@@ -0,0 +1,203 @@
+package edu.harvard.iq.dataverse.globus;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import jakarta.persistence.Column;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Arrays;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+
+/**
+ *
+ * @author landreev
+ */
+@Entity
+@Table(uniqueConstraints = {@UniqueConstraint(columnNames = "taskid")})
+public class GlobusTaskInProgress implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    
+    /**
+     * Globus-side identifier of the task in progress, upload or download
+     */
+    @Column(nullable=false, unique = true)
+    private String taskId;
+
+    /**
+     * I was considering giving this enum type a more specific name "TransferType"
+     * - but maybe there will be another use case where we need to keep track of
+     * Globus tasks that are not data transfers (?)
+     */
+    public enum TaskType {
+
+        UPLOAD("UPLOAD"),
+        DOWNLOAD("DOWNLOAD");
+
+        private final String text;
+
+        private TaskType(final String text) {
+            this.text = text;
+        }
+
+        public static TaskType fromString(String text) {
+            if (text != null) {
+                for (TaskType taskType : TaskType.values()) {
+                    if (text.equals(taskType.text)) {
+                        return taskType;
+                    }
+                }
+            }
+            throw new IllegalArgumentException("TaskType must be one of these values: " + Arrays.asList(TaskType.values()) + ".");
+        }
+
+        @Override
+        public String toString() {
+            return text;
+        }
+    }
+    
+    @Column(nullable=false)
+    @Enumerated(EnumType.STRING)
+    private TaskType taskType;
+
+    /**
+     * Globus API token that should be used to monitor the status of the task
+     */
+    @Column(nullable=false)
+    private String globusToken;
+    
+    /**
+     * This is the the user who initiated the Globus task
+     */    
+    @ManyToOne
+    @JoinColumn
+    private AuthenticatedUser user;
+    
+    // @Column(nullable=false) @todo we will need a flyway script in order to make
+    // this field nullable
+    private String ruleId;
+    
+    @JoinColumn(nullable = false)
+    @ManyToOne
+    private Dataset dataset;
+    
+    @Column
+    private Timestamp startTime;
+    
+    public GlobusTaskInProgress() {
+    }
+
+    GlobusTaskInProgress(String taskId, TaskType taskType, Dataset dataset, String globusToken, AuthenticatedUser authUser, String ruleId, Timestamp startTime) {
+        this.taskId = taskId; 
+        this.taskType = taskType; 
+        this.dataset = dataset;
+        this.globusToken = globusToken; 
+        this.user = authUser; 
+        this.ruleId = ruleId;
+        this.startTime = startTime; 
+    }
+    
+
+        
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+    public String getTaskId() {
+        return taskId;
+    }
+    
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+    
+    public TaskType getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(TaskType taskType) {
+        this.taskType = taskType;
+    }
+
+    public String getGlobusToken() {
+        return globusToken;
+    }
+
+    public void setGlobusToken(String clientToken) {
+        this.globusToken = clientToken;
+    }
+    
+    public AuthenticatedUser getLocalUser() {
+        return user;
+    }
+
+    public void setLocalUser(AuthenticatedUser authUser) {
+        this.user = authUser;
+    }
+
+    public String getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(String ruleId) {
+        this.ruleId = ruleId;
+    }
+    public Dataset getDataset() {
+        return dataset;
+    }
+
+    public void setDataset(Dataset dataset) {
+        this.dataset = dataset;
+    }
+
+    public Timestamp getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Timestamp startTime) {
+        this.startTime = startTime;
+    }
+    
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof GlobusTaskInProgress)) {
+            return false;
+        }
+        GlobusTaskInProgress other = (GlobusTaskInProgress) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "edu.harvard.iq.dataverse.globus.GlobusTaskInProgress[ id=" + id + " ]";
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskState.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskState.java
new file mode 100644
index 00000000000..08dfb02b0e3
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskState.java
@@ -0,0 +1,104 @@
+package edu.harvard.iq.dataverse.globus;
+
+/**
+ * This class is used to store the state of an ongoing Globus task (transfer)
+ * as reported by the Globus task API.
+ */
+public class GlobusTaskState {
+
+    private String DATA_TYPE;
+    private String type;
+    private String status;
+    private String owner_id;
+    private String request_time;
+    private String task_id;
+    private String destination_endpoint_display_name;
+    private boolean skip_source_errors;
+    private String nice_status;
+    private String nice_status_short_description;
+    private String owner_string; 
+
+    public String getDestination_endpoint_display_name() {
+        return destination_endpoint_display_name;
+    }
+
+    public void setDestination_endpoint_display_name(String destination_endpoint_display_name) {
+        this.destination_endpoint_display_name = destination_endpoint_display_name;
+    }
+
+    public void setRequest_time(String request_time) {
+        this.request_time = request_time;
+    }
+
+    public String getRequest_time() {
+        return request_time;
+    }
+
+    public String getTask_id() {
+        return task_id;
+    }
+
+    public void setTask_id(String task_id) {
+        this.task_id = task_id;
+    }
+
+    public String getDATA_TYPE() {
+        return DATA_TYPE;
+    }
+
+    public void setDATA_TYPE(String DATA_TYPE) {
+        this.DATA_TYPE = DATA_TYPE;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getOwner_id() {
+        return owner_id;
+    }
+
+    public void setOwner_id(String owner_id) {
+        this.owner_id = owner_id;
+    }
+
+    public Boolean getSkip_source_errors() {
+        return skip_source_errors;
+    }
+
+    public void setSkip_source_errors(Boolean skip_source_errors) {
+        this.skip_source_errors = skip_source_errors;
+    }
+
+    public String getNice_status() {
+        return nice_status;
+    }
+
+    public void setNice_status(String nice_status) {
+        this.nice_status = nice_status;
+    }
+
+    public String getNice_status_short_description() {
+        return nice_status_short_description;
+    }
+    
+    public void setOwner_string(String owner_string) {
+        this.owner_string = owner_string;
+    }
+    
+    public String getOwner_string() {
+        return owner_string;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java
new file mode 100644
index 00000000000..c9bb7fb6c4e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java
@@ -0,0 +1,98 @@
+package edu.harvard.iq.dataverse.globus;
+
+import java.util.List;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.GlobusAccessibleStore;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+
+public class GlobusUtil {
+
+    public static JsonObject getFilesMap(List<DataFile> dataFiles, Dataset d) {
+        JsonObjectBuilder filesBuilder = Json.createObjectBuilder();
+        for (DataFile df : dataFiles) {
+            String storageId = df.getStorageIdentifier();
+            String[] parts = DataAccess
+                    .getDriverIdAndStorageLocation(DataAccess.getLocationFromStorageId(storageId, d));
+            String driverId = parts[0];
+            String fileLocation = parts[1];
+            if (GlobusAccessibleStore.isDataverseManaged(driverId)) {
+                String endpointWithBasePath = GlobusAccessibleStore.getTransferEnpointWithPath(driverId);
+                fileLocation = endpointWithBasePath + "/" + fileLocation;
+            } else {
+                fileLocation = storageId.substring(storageId.lastIndexOf("//") + 2);
+            }
+            filesBuilder.add(df.getId().toString(), fileLocation);
+        }
+        return filesBuilder.build();
+    }
+    
+    public static boolean isTaskCompleted(GlobusTaskState task) {
+        if (task != null) {
+            String status = task.getStatus();
+            if (status != null) {
+                if (status.equalsIgnoreCase("ACTIVE")) {
+                    // We will take "ACTIVE" for face value, i.e., assume that 
+                    // this really means that the task is still ongoing.
+                    // (prior to 6.6 we used to assume that was only the case in 
+                    // combination with "nice_status" being "ok" or "queued")
+                    /*if (task.getNice_status().equalsIgnoreCase("ok")
+                            || task.getNice_status().equalsIgnoreCase("queued")) {*/
+                        return false;
+                }
+                return true;
+            }
+        }
+        // if either task, or status is null - it likely indicates that there 
+        // was an error contacting the task management api, and NOT that it has 
+        // completed one way or another
+        return false;
+    }
+    
+    public static boolean isTaskSucceeded(GlobusTaskState task) {
+        String status = null;
+        if (task != null) {
+            status = task.getStatus();
+            if (status != null) {
+                status = status.toUpperCase();
+                if (status.equals("ACTIVE") || status.startsWith("FAILED") || status.startsWith("INACTIVE")) {
+                    return false;
+                } 
+                return true;
+            } 
+        } 
+        return false;
+    }
+    /**
+     * Produces a human-readable Status label of a completed task
+     * @param GlobusTaskState task - a looked-up state of a task as reported by Globus API
+     */
+    public static String getCompletedTaskStatus(GlobusTaskState task) {
+        String status = null;
+        if (task != null) {
+            status = task.getStatus();
+            if (status != null) {
+                // The task is in progress but is not ok or queued
+                // (L.A.) I think the assumption here is that this method is called 
+                // exclusively on tasks that have already completed. So that's why
+                // the code below assumes that "ACTIVE" means "FAILED". 
+                if (status.equalsIgnoreCase("ACTIVE")) {
+                    status = "FAILED" + "#" + task.getNice_status() + "#" + task.getNice_status_short_description();
+                } else {
+                    // The task is either succeeded, failed or inactive.
+                    status = status + "#" + task.getNice_status() + "#" + task.getNice_status_short_description();
+                }
+            } else {
+                status = "FAILED";
+            }
+        } else {
+            // @todo are we sure? 
+            status = "FAILED";
+        }
+        return status;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/Permissions.java b/src/main/java/edu/harvard/iq/dataverse/globus/Permissions.java
new file mode 100644
index 00000000000..b8bb5193fa4
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/Permissions.java
@@ -0,0 +1,58 @@
+package edu.harvard.iq.dataverse.globus;
+
+public class Permissions {
+    private String DATA_TYPE;
+    private String principal_type;
+    private String principal;
+    private String id;
+    private String path;
+    private String permissions;
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public void setDATA_TYPE(String DATA_TYPE) {
+        this.DATA_TYPE = DATA_TYPE;
+    }
+
+    public void setPermissions(String permissions) {
+        this.permissions = permissions;
+    }
+
+    public void setPrincipal(String principal) {
+        this.principal = principal;
+    }
+
+    public void setPrincipalType(String principalType) {
+        this.principal_type = principalType;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public String getDATA_TYPE() {
+        return DATA_TYPE;
+    }
+
+    public String getPermissions() {
+        return permissions;
+    }
+
+    public String getPrincipal() {
+        return principal;
+    }
+
+    public String getPrincipalType() {
+        return principal_type;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java
new file mode 100644
index 00000000000..63c58f9d422
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java
@@ -0,0 +1,245 @@
+package edu.harvard.iq.dataverse.globus;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.enterprise.concurrent.ManagedScheduledExecutorService;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.FileHandler;
+import java.util.logging.Logger;
+
+/**
+ * 
+ * This Singleton monitors ongoing Globus tasks by checking with the centralized
+ * Globus API on the status of all the registered ongoing tasks. 
+ * When a successful completion of a task is detected, the service triggers
+ * the execution of the associated tasks (for example, finalizing adding datafiles
+ * to the dataset on completion of a remote Globus upload). When a task fails or 
+ * terminates abnormally, a message is logged and the task record is deleted 
+ * from the database. 
+ * 
+ * @author landreev
+ */
+@Singleton
+@Startup
+public class TaskMonitoringServiceBean {
+    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.globus.TaskMonitoringServiceBean");
+    
+    @Resource
+    ManagedScheduledExecutorService scheduler;
+    
+    @EJB
+    SettingsServiceBean settingsSvc;
+    @EJB 
+    GlobusServiceBean globusService;
+    
+    final Map<String, String> globusClientKeys = new HashMap<>();
+    
+    private static final SimpleDateFormat logFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss");
+    
+    @PostConstruct
+    public void init() {
+        if (JvmSettings.GLOBUS_TASK_MONITORING_SERVER.lookupOptional(Boolean.class).orElse(false)) {
+            logger.info("Starting Globus task monitoring service");
+            int pollingInterval = SystemConfig.getIntLimitFromStringOrDefault(
+                settingsSvc.getValueForKey(SettingsServiceBean.Key.GlobusPollingInterval), 600);
+            
+            // Monitoring service scheduler for ongoing upload tasks:
+            this.scheduler.scheduleWithFixedDelay(this::checkOngoingUploadTasks,
+                    0, pollingInterval,
+                    TimeUnit.SECONDS);
+            
+            // A separate monitoring service scheduler for ongoing download tasks: 
+            this.scheduler.scheduleWithFixedDelay(this::checkOngoingDownloadTasks,
+                    0, pollingInterval,
+                    TimeUnit.SECONDS);
+
+        } else {
+            logger.info("Skipping Globus task monitor initialization");
+        }
+        
+        
+    }
+    
+    /**
+     * This method will be executed on a timer-like schedule, continuously 
+     * monitoring all the ongoing external Globus upload tasks (transfers TO remote 
+     * Globus endnodes). 
+     */
+    public void checkOngoingUploadTasks() {
+        logger.fine("Performing a scheduled external Globus UPLOAD task check");
+        List<GlobusTaskInProgress> tasks = globusService.findAllOngoingTasks(GlobusTaskInProgress.TaskType.UPLOAD);
+
+        tasks.forEach(t -> {
+            GlobusTaskState retrieved = checkTaskState(t); 
+
+            if (GlobusUtil.isTaskCompleted(retrieved)) {
+                FileHandler taskLogHandler = getTaskLogHandler(t);
+                Logger taskLogger = getTaskLogger(t, taskLogHandler);
+
+                // Do our thing, finalize adding the files to the dataset
+                globusService.processCompletedTask(t, retrieved, GlobusUtil.isTaskSucceeded(retrieved), GlobusUtil.getCompletedTaskStatus(retrieved), true, taskLogger);
+                // Whether it finished successfully, or failed in the process, 
+                // there's no need to keep monitoring this task, so we can 
+                // delete it.
+                //globusService.deleteExternalUploadRecords(t.getTaskId());
+                globusService.deleteTask(t);
+
+                if (taskLogHandler != null) {
+                    taskLogHandler.close();
+                }
+            }
+
+        });
+    }
+    
+    /**
+     * This method will be executed on a timer-like schedule, continuously 
+     * monitoring all the ongoing external Globus download tasks (transfers by
+     * Dataverse users FROM remote, Dataverse-managed Globus endnodes). 
+     */
+    public void checkOngoingDownloadTasks() {
+        logger.fine("Performing a scheduled external Globus DOWNLOAD task check");
+        List<GlobusTaskInProgress> tasks = globusService.findAllOngoingTasks(GlobusTaskInProgress.TaskType.DOWNLOAD);
+
+        // Unlike with uploads, it is now possible for a user to run several 
+        // download transfers on the same dataset - with several download 
+        // tasks using the same access rule on the corresponding Globus
+        // pseudofolder. This means that we'll need to be careful not to 
+        // delete any rule, without checking if there are still other 
+        // active tasks using it: 
+        Map <String, Long> rulesInUse = new HashMap<>(); 
+        
+        tasks.forEach(t -> {
+            String ruleId = t.getRuleId();
+            if (ruleId != null) {
+                if (rulesInUse.containsKey(ruleId)) {
+                    rulesInUse.put(ruleId, rulesInUse.get(ruleId) + 1); 
+                } else {
+                    rulesInUse.put(ruleId, 1L);
+                }
+            }
+        });
+        
+        tasks.forEach(t -> {
+
+            GlobusTaskState retrieved = checkTaskState(t); 
+
+            if (GlobusUtil.isTaskCompleted(retrieved)) {
+                FileHandler taskLogHandler = getTaskLogHandler(t);
+                Logger taskLogger = getTaskLogger(t, taskLogHandler);
+                
+                String taskStatus = retrieved == null ? "N/A" : retrieved.getStatus();
+                taskLogger.info("Processing completed task " + t.getTaskId() + ", status: " + taskStatus);
+                
+                boolean deleteRule = true;
+                
+                if (t.getRuleId() == null || rulesInUse.get(t.getRuleId()) > 1) {
+                    taskLogger.info("Access rule " + t.getRuleId() + " is still in use by other tasks.");
+                    deleteRule = false;
+                    rulesInUse.put(t.getRuleId(), rulesInUse.get(t.getRuleId()) - 1);
+                } else {
+                    taskLogger.info("Access rule " + t.getRuleId() + " is no longer in use by other tasks; will delete.");
+                }
+
+                globusService.processCompletedTask(t, retrieved, GlobusUtil.isTaskSucceeded(retrieved), GlobusUtil.getCompletedTaskStatus(retrieved), deleteRule, taskLogger);
+                
+                // Whether it finished successfully or failed, the entry for the 
+                // task can now be deleted from the database. 
+                globusService.deleteTask(t);                
+
+                if (taskLogHandler != null) {
+                    taskLogHandler.close();
+                }
+            } else {
+                String taskStatus = retrieved == null ? "N/A" : retrieved.getStatus();
+                logger.fine("task "+t.getTaskId()+" is still running; " + ", status: " + taskStatus);
+            }
+            
+        });
+    }
+    
+    private GlobusTaskState checkTaskState(GlobusTaskInProgress task) {
+        GlobusTaskState retrieved = null;
+        int attempts = 2;
+        // we will make an extra attempt to refresh the token and try again
+        // in the event of an exception indicating the token is stale 
+
+        String globusClientToken = getClientTokenForStorageDriver(task.getDataset(), false);
+
+        while (retrieved == null && attempts > 0) {
+            try {
+                retrieved = globusService.getTask(globusClientToken, task.getTaskId(), null);
+            } catch (ExpiredTokenException ete) {
+                globusClientToken = getClientTokenForStorageDriver(task.getDataset(), true);
+            }
+            attempts--;
+        }
+
+        return retrieved;
+    }
+    
+    private String getClientTokenForStorageDriver(Dataset dataset, boolean forceRefresh) {
+        String storageDriverId = dataset.getEffectiveStorageDriverId();
+        if (globusClientKeys.get(storageDriverId) == null || forceRefresh) {
+            String clientToken = globusService.getClientTokenForDataset(dataset);
+            globusClientKeys.put(storageDriverId, clientToken);
+        }
+        
+        return globusClientKeys.get(storageDriverId);
+    }
+    
+    private FileHandler getTaskLogHandler(GlobusTaskInProgress task) {
+        if (task == null) {
+            return null; 
+        }
+        
+        Date startDate = new Date(task.getStartTime().getTime());
+        String logTimeStamp = logFormatter.format(startDate);
+        
+        String logFileName = System.getProperty("com.sun.aas.instanceRoot") 
+                + File.separator + "logs" 
+                + File.separator + "globus" + task.getTaskType() + "_" 
+                + logTimeStamp + "_" + task.getDataset().getId()
+                + ".log";
+        FileHandler fileHandler;
+        try {
+            fileHandler = new FileHandler(logFileName, true);
+        } catch (IOException | SecurityException ex) {
+            // @todo log this error somehow?
+            fileHandler = null;
+        }
+        return fileHandler;
+    }
+    
+    private Logger getTaskLogger(GlobusTaskInProgress task, FileHandler logFileHandler) {
+        if (logFileHandler == null) {
+            return null;
+        }
+        Date startDate = new Date(task.getStartTime().getTime());
+        String logTimeStamp = logFormatter.format(startDate);
+        
+        Logger taskLogger = Logger.getLogger(
+                "edu.harvard.iq.dataverse.globus.GlobusServiceBean." + "Globus" 
+                        + task.getTaskType() + logTimeStamp);
+            taskLogger.setUseParentHandlers(false);
+       
+        taskLogger.addHandler(logFileHandler);
+        
+        return taskLogger;        
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/ClientHarvestRun.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/ClientHarvestRun.java
index 141536175a4..6a85219cc3c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/client/ClientHarvestRun.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/client/ClientHarvestRun.java
@@ -6,15 +6,18 @@
 package edu.harvard.iq.dataverse.harvest.client;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Date;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 /**
  *
@@ -40,12 +43,7 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    public enum RunResultType { SUCCESS, FAILURE, INPROGRESS };
-    
-    private static String RESULT_LABEL_SUCCESS = "SUCCESS";
-    private static String RESULT_LABEL_FAILURE = "FAILED";
-    private static String RESULT_LABEL_INPROGRESS = "INPROGRESS";
-    private static String RESULT_DELETE_IN_PROGRESS = "DELETE IN PROGRESS";
+    public enum RunResultType { COMPLETED, COMPLETED_WITH_FAILURES, FAILURE, IN_PROGRESS, INTERRUPTED }
     
     @ManyToOne
     @JoinColumn(nullable = false)
@@ -67,34 +65,43 @@ public RunResultType getResult() {
     
     public String getResultLabel() {
         if (harvestingClient != null && harvestingClient.isDeleteInProgress()) {
-            return RESULT_DELETE_IN_PROGRESS;
+            return BundleUtil.getStringFromBundle("harvestclients.result.deleteInProgress");
         }
-        
-        if (isSuccess()) {
-            return RESULT_LABEL_SUCCESS;
+
+        if (isCompleted()) {
+            return BundleUtil.getStringFromBundle("harvestclients.result.completed");
+        } else if (isCompletedWithFailures()) {
+            return BundleUtil.getStringFromBundle("harvestclients.result.completedWithFailures");
         } else if (isFailed()) {
-            return RESULT_LABEL_FAILURE;
+            return BundleUtil.getStringFromBundle("harvestclients.result.failure");
         } else if (isInProgress()) {
-            return RESULT_LABEL_INPROGRESS;
+            return BundleUtil.getStringFromBundle("harvestclients.result.inProgess");
+        } else if (isInterrupted()) {
+            return BundleUtil.getStringFromBundle("harvestclients.result.interrupted");
         }
         return null;
     }
     
     public String getDetailedResultLabel() {
         if (harvestingClient != null && harvestingClient.isDeleteInProgress()) {
-            return RESULT_DELETE_IN_PROGRESS;
+            return BundleUtil.getStringFromBundle("harvestclients.result.deleteInProgress");
         }
-        if (isSuccess()) {
-            String resultLabel = RESULT_LABEL_SUCCESS;
-            
-            resultLabel = resultLabel.concat("; "+harvestedDatasetCount+" harvested, ");
-            resultLabel = resultLabel.concat(deletedDatasetCount+" deleted, ");
-            resultLabel = resultLabel.concat(failedDatasetCount+" failed.");
+        if (isCompleted() || isCompletedWithFailures() || isInterrupted()) {
+            String resultLabel = getResultLabel();
+
+            String details = BundleUtil.getStringFromBundle("harvestclients.result.details", Arrays.asList(
+                    harvestedDatasetCount.toString(),
+                    deletedDatasetCount.toString(),
+                    failedDatasetCount.toString()
+            ));
+            if(details != null) {
+                resultLabel = resultLabel + "; " + details;
+            }
             return resultLabel;
         } else if (isFailed()) {
-            return RESULT_LABEL_FAILURE;
+            return BundleUtil.getStringFromBundle("harvestclients.result.failure");
         } else if (isInProgress()) {
-            return RESULT_LABEL_INPROGRESS;
+            return BundleUtil.getStringFromBundle("harvestclients.result.inProgess");
         }
         return null;
     }
@@ -103,12 +110,20 @@ public void setResult(RunResultType harvestResult) {
         this.harvestResult = harvestResult;
     }
 
-    public boolean isSuccess() {
-        return RunResultType.SUCCESS == harvestResult;
+    public boolean isCompleted() {
+        return RunResultType.COMPLETED == harvestResult;
     }
 
-    public void setSuccess() {
-        harvestResult = RunResultType.SUCCESS;
+    public void setCompleted() {
+        harvestResult = RunResultType.COMPLETED;
+    }
+
+    public boolean isCompletedWithFailures() {
+        return RunResultType.COMPLETED_WITH_FAILURES == harvestResult;
+    }
+
+    public void setCompletedWithFailures() {
+        harvestResult = RunResultType.COMPLETED_WITH_FAILURES;
     }
 
     public boolean isFailed() {
@@ -120,14 +135,22 @@ public void setFailed() {
     }
     
     public boolean isInProgress() {
-        return RunResultType.INPROGRESS == harvestResult ||
+        return RunResultType.IN_PROGRESS == harvestResult ||
                 (harvestResult == null && startTime != null && finishTime == null);
     }
     
     public void setInProgress() {
-        harvestResult = RunResultType.INPROGRESS;
+        harvestResult = RunResultType.IN_PROGRESS;
     }
 
+    public boolean isInterrupted() {
+        return RunResultType.INTERRUPTED == harvestResult;
+    }
+    
+    public void setInterrupted() {
+        harvestResult = RunResultType.INTERRUPTED;
+    }
+    
     // Time of this harvest attempt:
     @Temporal(value = TemporalType.TIMESTAMP)
     private Date startTime;
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/FastGetRecord.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/FastGetRecord.java
index 742771ef9a5..594e5f22170 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/client/FastGetRecord.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/client/FastGetRecord.java
@@ -19,8 +19,10 @@
 */
 package edu.harvard.iq.dataverse.harvest.client;
 
+import edu.harvard.iq.dataverse.harvest.client.oai.OaiHandler;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+
 import java.io.IOException;
-import java.io.FileNotFoundException;
 
 import java.io.InputStream;
 import java.io.StringReader;
@@ -31,9 +33,14 @@
 import java.io.FileOutputStream;
 
 import java.io.PrintWriter;
-import java.net.HttpURLConnection;
+import static java.net.HttpURLConnection.HTTP_OK;
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Map;
+import java.util.Optional;
 
 import java.util.zip.GZIPInputStream;
 import java.util.zip.InflaterInputStream;
@@ -72,30 +79,30 @@
 
 public class FastGetRecord {
    
-    private static final String DATAVERSE_EXTENDED_METADATA = "dataverse_json";
     private static final String XML_METADATA_TAG = "metadata";
     private static final String XML_METADATA_TAG_OPEN = "<"+XML_METADATA_TAG+">";
     private static final String XML_METADATA_TAG_CLOSE = "</"+XML_METADATA_TAG+">";
     private static final String XML_OAI_PMH_CLOSING_TAGS = "</record></GetRecord></OAI-PMH>";
-    private static final String XML_XMLNS_XSI_ATTRIBUTE_TAG = "xmlns:xsi=";
-    private static final String XML_XMLNS_XSI_ATTRIBUTE = " "+XML_XMLNS_XSI_ATTRIBUTE_TAG+"\"http://www.w3.org/2001/XMLSchema-instance\">";
+    public static final String XML_XMLNS_XSI_ATTRIBUTE_TAG = "xmlns:xsi=";
+    public static final String XML_XMLNS_XSI_ATTRIBUTE = " "+XML_XMLNS_XSI_ATTRIBUTE_TAG+"\"http://www.w3.org/2001/XMLSchema-instance\">";
     private static final String XML_COMMENT_START = "<!--";
     private static final String XML_COMMENT_END = "-->";
     
     /**
      * Client-side GetRecord verb constructor
      *
-     * @param baseURL the baseURL of the server to be queried
+     * @param oaiHandler the configured OaiHande running this harvest
+     * @param identifier Record identifier
+     * @param httpClient jdk HttpClient used to make http requests
      * @exception MalformedURLException the baseURL is bad
      * @exception SAXException the xml response is bad
      * @exception IOException an I/O error occurred
+     * @exception TransformerException if it fails to parse the service portion of the record
      */
 
-    public FastGetRecord(String baseURL, String identifier, String metadataPrefix)
-    throws IOException, ParserConfigurationException, SAXException,
+    public FastGetRecord(OaiHandler oaiHandler, String identifier, HttpClient httpClient) throws IOException, ParserConfigurationException, SAXException,
     TransformerException {
-        harvestRecord (baseURL, identifier, metadataPrefix);
-
+        harvestRecord (oaiHandler.getBaseOaiUrl(), identifier, oaiHandler.getMetadataPrefix(), oaiHandler.getCustomHeaders(), httpClient);
     }
     
     private String errorMessage = null;
@@ -118,57 +125,63 @@ public boolean isDeleted () {
     }
 
 
-    public void harvestRecord(String baseURL, String identifier, String metadataPrefix) throws IOException,
-        ParserConfigurationException, SAXException, TransformerException {
-
-        xmlInputFactory = javax.xml.stream.XMLInputFactory.newInstance();
+    public void harvestRecord(String baseURL, String identifier, String metadataPrefix, Map<String,String> customHeaders, HttpClient httpClient) throws IOException,
+        ParserConfigurationException, SAXException, TransformerException{
 
+        xmlInputFactory = XmlUtil.getSecureXMLInputFactory();
         String requestURL = getRequestURL(baseURL, identifier, metadataPrefix);
+        InputStream in;
+        
+        // This was one other place where the Harvester code was still using 
+        // the obsolete java.net.ttpUrlConnection that didn't get replaced with
+        // the new java.net.http.HttpClient during the first pas of the XOAI 
+        // rewrite. (L.A.)
 
-        InputStream in = null;
-        URL url = new URL(requestURL);
-        HttpURLConnection con = null;
-        int responseCode = 0;
-
-        con = (HttpURLConnection) url.openConnection();
-        con.setRequestProperty("User-Agent", "DataverseHarvester/3.0");
-        con.setRequestProperty("Accept-Encoding",
-                                   "compress, gzip, identify");
-        try {
-            responseCode = con.getResponseCode();
-            //logger.debug("responseCode=" + responseCode);
-        } catch (FileNotFoundException e) {
-            //logger.info(requestURL, e);
-            responseCode = HttpURLConnection.HTTP_UNAVAILABLE;
-        }
-
-        // TODO: -- L.A.
-        //
-        // support for cookies;
-        // support for limited retry attempts -- ?
-        // implement reading of the stream as filterinputstream -- ?
-        // -- that could make it a little faster still. -- L.A. 
-
-
-
-        if (responseCode == 200) {
-
-            String contentEncoding = con.getHeaderField("Content-Encoding");
-            //logger.debug("contentEncoding=" + contentEncoding);
-
-            // support for the standard compress/gzip/deflate compression
-            // schemes:
 
-            if ("compress".equals(contentEncoding)) {
-                ZipInputStream zis = new ZipInputStream(con.getInputStream());
-                zis.getNextEntry();
-                in = zis;
-            } else if ("gzip".equals(contentEncoding)) {
-                in = new GZIPInputStream(con.getInputStream());
-            } else if ("deflate".equals(contentEncoding)) {
-                in = new InflaterInputStream(con.getInputStream());
-            } else {
-                in = con.getInputStream();
+        if (httpClient == null) {
+            throw new IOException("Null Http Client, cannot make a GetRecord call to obtain the metadata.");
+        }
+        
+        HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
+                .uri(URI.create(requestURL))
+                .GET()
+                .header("User-Agent", "XOAI Service Provider v5 (Dataverse)")
+                .header("Accept-Encoding", "compress, gzip");
+        
+        if (customHeaders != null) {
+            for (String headerName : customHeaders.keySet()) {
+                requestBuilder.header(headerName, customHeaders.get(headerName));
+            }
+        }
+        
+        HttpRequest request = requestBuilder.build();
+        HttpResponse<InputStream> response;
+
+        try {            
+             response = httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
+        } catch (InterruptedException ex) {
+            Thread.currentThread().interrupt();
+            throw new IOException("Failed to connect to the remote dataverse server to obtain GetRecord metadata");
+        }
+        
+        int responseCode = response.statusCode();
+        
+        if (responseCode == HTTP_OK) {
+            InputStream inputStream = response.body();
+            Optional<String> contentEncoding = response.headers().firstValue("Content-Encoding");
+            
+            // support for the standard gzip encoding:
+            in = inputStream; 
+            if (contentEncoding.isPresent()) {
+                if (contentEncoding.get().equals("compress")) {
+                    ZipInputStream zis = new ZipInputStream(inputStream);
+                    zis.getNextEntry();
+                    in = zis;
+                } else if (contentEncoding.get().equals("gzip")) {
+                    in = new GZIPInputStream(inputStream);
+                } else if (contentEncoding.get().equals("deflate")) {
+                    in = new InflaterInputStream(inputStream);
+                }
             }
 
             // We are going to read the OAI header and SAX-parse it for the
@@ -186,9 +199,7 @@ public void harvestRecord(String baseURL, String identifier, String metadataPref
             FileOutputStream tempFileStream = null;
             PrintWriter metadataOut = null;
 
-            savedMetadataFile = File.createTempFile("meta", ".tmp");
-            
-            
+            savedMetadataFile = File.createTempFile("meta", ".tmp");            
 
             int mopen = 0;
             int mclose = 0;
@@ -222,13 +233,7 @@ public void harvestRecord(String baseURL, String identifier, String metadataPref
                         //metadataOut.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); /* ? */
 
                         metadataFlag = true;
-                    } else if (line.matches(".*<"+XML_METADATA_TAG+" [^>]*>.*")) {
-                        if (metadataPrefix.equals(DATAVERSE_EXTENDED_METADATA)) {
-                            oaiResponseHeader = oaiResponseHeader.concat(line);
-                            metadataWritten = true;
-                            metadataFlag = true;
-                        }
-                    }
+                    } 
                 }
                 
                 //System.out.println(line);
@@ -380,19 +385,12 @@ public void harvestRecord(String baseURL, String identifier, String metadataPref
             try {
                 StringReader reader = new StringReader(oaiResponseHeader);
                 xmlr = xmlInputFactory.createXMLStreamReader(reader);
-                processOAIheader(xmlr, metadataPrefix.equals(DATAVERSE_EXTENDED_METADATA));
+                processOAIheader(xmlr);
 
             } catch (XMLStreamException ex) {
-                //Logger.getLogger("global").log(Level.SEVERE, null, ex);
                 if (this.errorMessage == null) {
-                    this.errorMessage = "Malformed GetRecord response: " + oaiResponseHeader;
-                }
-
-                // delete the temp metadata file; we won't need it:
-                if (savedMetadataFile != null) {
-                    //savedMetadataFile.delete();
+                    this.errorMessage = "Malformed GetRecord response; baseURL=" + baseURL + ", identifier=" + identifier + ", metadataPrefix=" + metadataPrefix;
                 }
-
             }
 
             try {
@@ -413,18 +411,9 @@ public void harvestRecord(String baseURL, String identifier, String metadataPref
             }
 
             if (!(metadataWritten) && !(this.isDeleted())) {
-                if (oaiResponseHeader.length() > 64) {
-                    oaiResponseHeader = oaiResponseHeader.substring(0, 32) + "...";
-                }
-                this.errorMessage = "Failed to parse GetRecord response; "+oaiResponseHeader;
-                //savedMetadataFile.delete();
-            }
-
-            if (this.isDeleted()) {
-                //savedMetadataFile.delete();
+                this.errorMessage = "Failed to parse GetRecord response; baseURL=" + baseURL + ", identifier=" + identifier + ", metadataPrefix=" + metadataPrefix;
             }
 
-
         } else {
             this.errorMessage = "GetRecord request failed. HTTP error code "+responseCode;
         }
@@ -448,16 +437,16 @@ private static String getRequestURL(String baseURL,
         return requestURL.toString();
     }
 
-    private void processOAIheader (XMLStreamReader xmlr, boolean extensionMode) throws XMLStreamException, IOException {
+    private void processOAIheader (XMLStreamReader xmlr) throws XMLStreamException, IOException {
 
         // is this really a GetRecord response?
         xmlr.nextTag();
         xmlr.require(XMLStreamConstants.START_ELEMENT, null, "OAI-PMH");
-        processOAIPMH(xmlr, extensionMode);
+        processOAIPMH(xmlr);
 
     }
 
-    private void processOAIPMH (XMLStreamReader xmlr, boolean extensionMode) throws XMLStreamException, IOException {
+    private void processOAIPMH (XMLStreamReader xmlr) throws XMLStreamException, IOException {
 
         for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
             if (event == XMLStreamConstants.START_ELEMENT) {
@@ -480,7 +469,7 @@ else if (xmlr.getLocalName().equals("error")) {
 
                 }
                 else if (xmlr.getLocalName().equals("GetRecord")) {
-                    processGetRecordSection(xmlr, extensionMode);
+                    processGetRecordSection(xmlr);
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (xmlr.getLocalName().equals("OAI-PMH")) return;
@@ -488,11 +477,11 @@ else if (xmlr.getLocalName().equals("GetRecord")) {
         }
     }
 
-    private void processGetRecordSection (XMLStreamReader xmlr, boolean extensionMode) throws XMLStreamException, IOException {
+    private void processGetRecordSection (XMLStreamReader xmlr) throws XMLStreamException, IOException {
         for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
             if (event == XMLStreamConstants.START_ELEMENT) {
                  if (xmlr.getLocalName().equals("record")) {
-                     processRecord(xmlr, extensionMode);
+                     processRecord(xmlr);
                  }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (xmlr.getLocalName().equals("GetRecord")) return;
@@ -501,7 +490,7 @@ private void processGetRecordSection (XMLStreamReader xmlr, boolean extensionMod
 
     }
 
-    private void processRecord (XMLStreamReader xmlr, boolean extensionMode) throws XMLStreamException, IOException {
+    private void processRecord (XMLStreamReader xmlr) throws XMLStreamException, IOException {
         for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
             if (event == XMLStreamConstants.START_ELEMENT) {
                  if (xmlr.getLocalName().equals("header")) {
@@ -509,11 +498,6 @@ private void processRecord (XMLStreamReader xmlr, boolean extensionMode) throws
                         this.recordDeleted = true;
                      }
                      processHeader(xmlr);
-                 } else if (xmlr.getLocalName().equals("metadata")) {
-                     if (extensionMode) {
-                        String extendedMetadataApiUrl = xmlr.getAttributeValue(null, "directApiCall");
-                        processMetadataExtended(extendedMetadataApiUrl);
-                     }
                  }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (xmlr.getLocalName().equals("record")) return;
@@ -535,67 +519,6 @@ else if (xmlr.getLocalName().equals("setSpec")) {/*do nothing*/}
         }
     }
     
-    private void processMetadataExtended (String extendedApiUrl) throws IOException {
-        InputStream in = null;
-        int responseCode = 0;
-        HttpURLConnection con = null;
-
-
-        
-        try {
-            URL url = new URL(extendedApiUrl.replaceAll("&amp;", "&")); // is this necessary?
-
-            con = (HttpURLConnection) url.openConnection();
-            con.setRequestProperty("User-Agent", "DataverseHarvester/3.0");
-            responseCode = con.getResponseCode();
-        } catch (MalformedURLException mue) {
-            throw new IOException ("Bad API URL: "+extendedApiUrl);
-        } catch (FileNotFoundException e) {
-            responseCode = HttpURLConnection.HTTP_UNAVAILABLE;
-        }
-
-        
-
-
-        if (responseCode == 200) {
-            in = con.getInputStream();
-            // TODO: 
-            /* we should probably still support gzip/compress encoding here - ?
-            String contentEncoding = con.getHeaderField("Content-Encoding");
-
-            // support for the standard compress/gzip/deflate compression
-            // schemes:
-
-            if ("compress".equals(contentEncoding)) {
-                ZipInputStream zis = new ZipInputStream(con.getInputStream());
-                zis.getNextEntry();
-                in = zis;
-            } else if ("gzip".equals(contentEncoding)) {
-                in = new GZIPInputStream(con.getInputStream());
-            } else if ("deflate".equals(contentEncoding)) {
-                in = new InflaterInputStream(con.getInputStream());
-            } ...
-            */
-            FileOutputStream tempOut = new FileOutputStream(savedMetadataFile);
-            
-            int bufsize;
-            byte[] buffer = new byte[4 * 8192];
-
-            while ((bufsize = in.read(buffer)) != -1) {
-                tempOut.write(buffer, 0, bufsize);
-                tempOut.flush();
-            }
-
-            in.close();
-            tempOut.close();
-            return;
-        }
-
-        throw new IOException("Failed to download extended metadata.");
-  
-    }
-
-    
     // (from Gustavo's ddiServiceBean -- L.A.)
     //
     /* We had to add this method because the ref getElementText has a bug where it
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvesterServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvesterServiceBean.java
index 9d0ee40d9d3..cb28691a596 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvesterServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvesterServiceBean.java
@@ -5,6 +5,7 @@
  */
 package edu.harvard.iq.dataverse.harvest.client;
 
+import static java.net.HttpURLConnection.HTTP_OK;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.Dataverse;
@@ -17,36 +18,46 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-//import java.net.URLEncoder;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Resource;
-import javax.ejb.Asynchronous;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.ejb.Timer;
-import javax.faces.bean.ManagedBean;
-import javax.inject.Named;
-//import javax.xml.bind.Unmarshaller;
+import jakarta.annotation.Resource;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Timer;
+import jakarta.inject.Named;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
-import org.apache.commons.lang.mutable.MutableBoolean;
-import org.apache.commons.lang.mutable.MutableLong;
+import org.apache.commons.lang3.mutable.MutableBoolean;
+import org.apache.solr.client.solrj.SolrServerException;
 import org.xml.sax.SAXException;
 
-import com.lyncode.xoai.model.oaipmh.Header;
+import io.gdcc.xoai.model.oaipmh.results.Record;
+import io.gdcc.xoai.model.oaipmh.results.record.Header;
+import io.gdcc.xoai.model.oaipmh.results.record.Metadata;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
 import edu.harvard.iq.dataverse.api.imports.ImportServiceBean;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import static edu.harvard.iq.dataverse.harvest.client.FastGetRecord.XML_XMLNS_XSI_ATTRIBUTE_TAG;
+import static edu.harvard.iq.dataverse.harvest.client.FastGetRecord.XML_XMLNS_XSI_ATTRIBUTE;
 import edu.harvard.iq.dataverse.harvest.client.oai.OaiHandler;
 import edu.harvard.iq.dataverse.harvest.client.oai.OaiHandlerException;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
+import java.io.InputStream;
 import java.io.PrintWriter;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.Path;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 /**
  *
@@ -54,7 +65,6 @@
  */
 @Stateless(name = "harvesterService")
 @Named
-@ManagedBean
 public class HarvesterServiceBean {
     @PersistenceContext(unitName="VDCNet-ejbPU")
     private EntityManager em;
@@ -64,7 +74,7 @@ public class HarvesterServiceBean {
     @EJB
     DatasetServiceBean datasetService;
     @Resource
-    javax.ejb.TimerService timerService;
+    jakarta.ejb.TimerService timerService;
     @EJB
     DataverseTimerServiceBean dataverseTimerService;
     @EJB
@@ -77,13 +87,12 @@ public class HarvesterServiceBean {
     IndexServiceBean indexService;
     
     private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.client.HarvesterServiceBean");
-    private static final SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
     private static final SimpleDateFormat logFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss");
     
     public static final String HARVEST_RESULT_SUCCESS="success";
     public static final String HARVEST_RESULT_FAILED="failed";
-    private static final Long  INDEXING_CONTENT_BATCH_SIZE = 10000000L;
-
+    public static final String DATAVERSE_PROPRIETARY_METADATA_FORMAT="dataverse_json";
+    public static final String DATAVERSE_PROPRIETARY_METADATA_API="/api/datasets/export?exporter="+DATAVERSE_PROPRIETARY_METADATA_FORMAT+"&persistentId=";
 
     public HarvesterServiceBean() {
 
@@ -129,7 +138,7 @@ public List<HarvestTimerInfo> getHarvestTimers() {
     }
 
     /**
-     * Run a harvest for an individual harvesting Dataverse
+     * Run a harvest for an individual harvesting client
      * @param dataverseRequest
      * @param harvestingClientId
      * @throws IOException
@@ -140,35 +149,26 @@ public void doHarvest(DataverseRequest dataverseRequest, Long harvestingClientId
         if (harvestingClientConfig == null) {
             throw new IOException("No such harvesting client: id="+harvestingClientId);
         }
-        
-        Dataverse harvestingDataverse = harvestingClientConfig.getDataverse();
-        
-        MutableBoolean harvestErrorOccurred = new MutableBoolean(false);
+                
         String logTimestamp = logFormatter.format(new Date());
-        Logger hdLogger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.client.HarvesterServiceBean." + harvestingDataverse.getAlias() + logTimestamp);
-        String logFileName = "../logs" + File.separator + "harvest_" + harvestingClientConfig.getName() + "_" + logTimestamp + ".log";
+        Logger hdLogger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.client.HarvesterServiceBean." + harvestingClientConfig.getName() + logTimestamp);
+        String logFileName = System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "harvest_" + harvestingClientConfig.getName() + "_" + logTimestamp + ".log";
         FileHandler fileHandler = new FileHandler(logFileName);
         hdLogger.setUseParentHandlers(false);
         hdLogger.addHandler(fileHandler);
         
-        PrintWriter importCleanupLog = new PrintWriter(new FileWriter( "../logs/harvest_cleanup_" + harvestingClientConfig.getName() + "_" + logTimestamp+".txt"));
+        PrintWriter importCleanupLog = new PrintWriter(new FileWriter(System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs/harvest_cleanup_" + harvestingClientConfig.getName() + "_" + logTimestamp + ".txt"));
         
         
-        List<Long> harvestedDatasetIds = null;
-
-        List<Long> harvestedDatasetIdsThisBatch = new ArrayList<Long>();
-
-        List<String> failedIdentifiers = new ArrayList<String>();
-        List<String> deletedIdentifiers = new ArrayList<String>();
+        List<Long> harvestedDatasetIds = new ArrayList<>();
+        List<String> failedIdentifiers = new ArrayList<>();
+        List<String> deletedIdentifiers = new ArrayList<>();
         
         Date harvestStartTime = new Date();
         
         try {
-            boolean harvestingNow = harvestingClientConfig.isHarvestingNow();
-
-            if (harvestingNow) {
-                harvestErrorOccurred.setValue(true);
-                hdLogger.log(Level.SEVERE, "Cannot begin harvesting, Dataverse " + harvestingDataverse.getName() + " is currently being harvested.");
+            if (harvestingClientConfig.isHarvestingNow()) {
+                hdLogger.log(Level.SEVERE, String.format("Cannot start harvest, client %s is already harvesting.", harvestingClientConfig.getName()));
 
             } else {
                 harvestingClientService.resetHarvestInProgress(harvestingClientId);
@@ -176,45 +176,45 @@ public void doHarvest(DataverseRequest dataverseRequest, Long harvestingClientId
 
                
                 if (harvestingClientConfig.isOai()) {
-                    harvestedDatasetIds = harvestOAI(dataverseRequest, harvestingClientConfig, hdLogger, importCleanupLog, harvestErrorOccurred, failedIdentifiers, deletedIdentifiers, harvestedDatasetIdsThisBatch);
+                    harvestOAI(dataverseRequest, harvestingClientConfig, hdLogger, importCleanupLog, failedIdentifiers, deletedIdentifiers, harvestedDatasetIds);
 
                 } else {
                     throw new IOException("Unsupported harvest type");
                 }
-               harvestingClientService.setHarvestSuccess(harvestingClientId, new Date(), harvestedDatasetIds.size(), failedIdentifiers.size(), deletedIdentifiers.size());
-               hdLogger.log(Level.INFO, "COMPLETED HARVEST, server=" + harvestingClientConfig.getArchiveUrl() + ", metadataPrefix=" + harvestingClientConfig.getMetadataPrefix());
-               hdLogger.log(Level.INFO, "Datasets created/updated: " + harvestedDatasetIds.size() + ", datasets deleted: " + deletedIdentifiers.size() + ", datasets failed: " + failedIdentifiers.size());
-
-                // now index all the datasets we have harvested - created, modified or deleted:
-                /* (TODO: may not be needed at all. In Dataverse4, we may be able to get away with the normal 
-                    reindexing after every import. See the rest of the comments about batch indexing throughout 
-                    this service bean)
-                    if (this.processedSizeThisBatch > 0) {
-                        hdLogger.log(Level.INFO, "POST HARVEST, reindexing the remaining studies.");
-                        if (this.harvestedDatasetIdsThisBatch != null) {
-                            hdLogger.log(Level.INFO, this.harvestedDatasetIdsThisBatch.size()+" studies in the batch");
-                        }
-                        hdLogger.log(Level.INFO, this.processedSizeThisBatch + " bytes of content");
-                        indexService.updateIndexList(this.harvestedDatasetIdsThisBatch);
-                        hdLogger.log(Level.INFO, "POST HARVEST, calls to index finished.");
-                    } else {
-                        hdLogger.log(Level.INFO, "(All harvested content already reindexed)");
+
+                if (failedIdentifiers.isEmpty()) {
+                    harvestingClientService.setHarvestCompleted(harvestingClientId, new Date(), harvestedDatasetIds.size(), failedIdentifiers.size(), deletedIdentifiers.size());
+                    hdLogger.log(Level.INFO, String.format("\"COMPLETED HARVEST, server=%s, metadataPrefix=%s", harvestingClientConfig.getArchiveUrl(), harvestingClientConfig.getMetadataPrefix()));
+                } else {
+                    harvestingClientService.setHarvestCompletedWithFailures(harvestingClientId, new Date(), harvestedDatasetIds.size(), failedIdentifiers.size(), deletedIdentifiers.size());
+                    hdLogger.log(Level.INFO, String.format("\"COMPLETED HARVEST WITH FAILURES, server=%s, metadataPrefix=%s", harvestingClientConfig.getArchiveUrl(), harvestingClientConfig.getMetadataPrefix()));
+                }
+
+                hdLogger.log(Level.INFO, String.format("Datasets created/updated: %s, datasets deleted: %s, datasets failed: %s", harvestedDatasetIds.size(), deletedIdentifiers.size(), failedIdentifiers.size()));
+
+                // Reindex dataverse to update datasetCount
+                List<Dataverse> toReindex = new ArrayList<>();
+                toReindex.add(harvestingClientConfig.getDataverse());
+                toReindex.addAll(harvestingClientConfig.getDataverse().getOwners());
+                for (Dataverse dv : toReindex) {
+                    try {
+                        indexService.indexDataverse(dv);
+                    } catch (IOException | SolrServerException e) {
+                        hdLogger.log(Level.SEVERE, "Dataverse indexing failed. You can kickoff a re-index of this dataverse with: \r\n curl http://localhost:8080/api/admin/index/dataverses/" + dv.getId().toString());
                     }
-                 */
+                }
             }
-            //mailService.sendHarvestNotification(...getSystemEmail(), harvestingDataverse.getName(), logFileName, logTimestamp, harvestErrorOccurred.booleanValue(), harvestedDatasetIds.size(), failedIdentifiers);
+        } catch (StopHarvestException she) {
+            hdLogger.log(Level.INFO, "HARVEST INTERRUPTED BY EXTERNAL REQUEST");
+            harvestingClientService.setPartiallyCompleted(harvestingClientId, new Date(), harvestedDatasetIds.size(), failedIdentifiers.size(), deletedIdentifiers.size());
         } catch (Throwable e) {
-            harvestErrorOccurred.setValue(true);
+            // Any other exception should be treated as a complete failure
             String message = "Exception processing harvest, server= " + harvestingClientConfig.getHarvestingUrl() + ",format=" + harvestingClientConfig.getMetadataPrefix() + " " + e.getClass().getName() + " " + e.getMessage();
             hdLogger.log(Level.SEVERE, message);
             logException(e, hdLogger);
             hdLogger.log(Level.INFO, "HARVEST NOT COMPLETED DUE TO UNEXPECTED ERROR.");
-            // TODO: 
-            // even though this harvesting run failed, we may have had successfully 
-            // processed some number of datasets, by the time the exception was thrown. 
-            // We should record that number too. And the number of the datasets that
-            // had failed, that we may have counted.  -- L.A. 4.4
-            harvestingClientService.setHarvestFailure(harvestingClientId, new Date());
+
+            harvestingClientService.setHarvestFailure(harvestingClientId, new Date(), harvestedDatasetIds.size(), failedIdentifiers.size(), deletedIdentifiers.size());
 
         } finally {
             harvestingClientService.resetHarvestInProgress(harvestingClientId);
@@ -231,14 +231,13 @@ public void doHarvest(DataverseRequest dataverseRequest, Long harvestingClientId
      * @param harvestErrorOccurred  have we encountered any errors during harvest?
      * @param failedIdentifiers     Study Identifiers for failed "GetRecord" requests
      */
-    private List<Long> harvestOAI(DataverseRequest dataverseRequest, HarvestingClient harvestingClient, Logger hdLogger, PrintWriter importCleanupLog, MutableBoolean harvestErrorOccurred, List<String> failedIdentifiers, List<String> deletedIdentifiers, List<Long> harvestedDatasetIdsThisBatch)
-            throws IOException, ParserConfigurationException, SAXException, TransformerException {
+    private void harvestOAI(DataverseRequest dataverseRequest, HarvestingClient harvestingClient, Logger hdLogger, PrintWriter importCleanupLog, List<String> failedIdentifiers, List<String> deletedIdentifiers, List<Long> harvestedDatasetIds)
+            throws IOException, ParserConfigurationException, SAXException, TransformerException, StopHarvestException {
 
         logBeginOaiHarvest(hdLogger, harvestingClient);
         
-        List<Long> harvestedDatasetIds = new ArrayList<Long>();
-        MutableLong processedSizeThisBatch = new MutableLong(0L);
         OaiHandler oaiHandler;
+        HttpClient httpClient = null; 
 
         try {
             oaiHandler = new OaiHandler(harvestingClient);
@@ -250,112 +249,183 @@ private List<Long> harvestOAI(DataverseRequest dataverseRequest, HarvestingClien
             hdLogger.log(Level.SEVERE, errorMessage);
             throw new IOException(errorMessage);
         }
-                
+
+        // We will use this jdk http client to make direct calls to the remote 
+        // OAI (or remote Dataverse API) to obtain the metadata records 
+        httpClient = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.ALWAYS).build();
+        
         try {
-            for (Iterator<Header> idIter = oaiHandler.runListIdentifiers(); idIter.hasNext();) {
+            if (harvestingClient.isUseListRecords()) {
+                harvestOAIviaListRecords(oaiHandler, dataverseRequest, harvestingClient, httpClient, failedIdentifiers, deletedIdentifiers, harvestedDatasetIds, hdLogger, importCleanupLog);
+            } else {
+                // The default behavior is to use ListIdentifiers:
+                harvestOAIviaListIdentifiers(oaiHandler, dataverseRequest, harvestingClient, httpClient, failedIdentifiers, deletedIdentifiers, harvestedDatasetIds, hdLogger, importCleanupLog);
+            }
+        } catch (OaiHandlerException e) {
+            throw new IOException("Failed to run ListIdentifiers: " + e.getMessage());
+        }
 
-                Header h = idIter.next();
-                String identifier = h.getIdentifier();
-                Date dateStamp = h.getDatestamp();
-                
-                hdLogger.info("processing identifier: " + identifier + ", date: " + dateStamp);
+        logCompletedOaiHarvest(hdLogger, harvestingClient);
 
-                MutableBoolean getRecordErrorOccurred = new MutableBoolean(false);
+    }  
+    
+    private void harvestOAIviaListIdentifiers(OaiHandler oaiHandler, DataverseRequest dataverseRequest, HarvestingClient harvestingClient, HttpClient httpClient, List<String> failedIdentifiers, List<String> deletedIdentifiers, List<Long> harvestedDatasetIds, Logger harvesterLogger, PrintWriter importCleanupLog) throws OaiHandlerException, StopHarvestException {
+        for (Iterator<Header> idIter = oaiHandler.runListIdentifiers(); idIter.hasNext();) {
+            // Before each iteration, check if this harvesting job needs to be aborted:
+            if (checkIfStoppingJob(harvestingClient)) {
+                throw new StopHarvestException("Harvesting stopped by external request");
+            }
 
-                // Retrieve and process this record with a separate GetRecord call:
-                Long datasetId = processRecord(dataverseRequest, hdLogger, importCleanupLog, oaiHandler, identifier, getRecordErrorOccurred, processedSizeThisBatch, deletedIdentifiers, dateStamp);
-                
-                hdLogger.info("Total content processed in this batch so far: "+processedSizeThisBatch);
-                if (datasetId != null) {
-                    harvestedDatasetIds.add(datasetId);
-                    
-                    if ( harvestedDatasetIdsThisBatch == null ) {
-                        harvestedDatasetIdsThisBatch = new ArrayList<Long>();
-                    }
-                    harvestedDatasetIdsThisBatch.add(datasetId);
-                    
-                }
-                
-                if (getRecordErrorOccurred.booleanValue() == true) {
-                    failedIdentifiers.add(identifier);
-                    harvestErrorOccurred.setValue(true);
-                    //temporary:
-                    //throw new IOException("Exception occured, stopping harvest");
-                }
-                
-                // reindexing in batches? - this is from DVN 3; 
-                // we may not need it anymore. 
-                if ( processedSizeThisBatch.longValue() > INDEXING_CONTENT_BATCH_SIZE ) {
+            Header h = idIter.next();
+            String identifier = h.getIdentifier();
+            Date dateStamp = Date.from(h.getDatestamp());
 
-                    hdLogger.log(Level.INFO, "REACHED CONTENT BATCH SIZE LIMIT; calling index ("+ harvestedDatasetIdsThisBatch.size()+" datasets in the batch).");
-                    //indexService.updateIndexList(this.harvestedDatasetIdsThisBatch);
-                    hdLogger.log(Level.INFO, "REINDEX DONE.");
+            harvesterLogger.info("ListIdentifiers; processing identifier: " + identifier + ", date: " + dateStamp);
 
+            if (h.isDeleted()) {
+                harvesterLogger.info("ListIdentifiers; deleting harvesting dataset for " + identifier);
 
-                    processedSizeThisBatch.setValue(0L);
-                    harvestedDatasetIdsThisBatch = null;
-                }
+                deleteHarvestedDatasetIfExists(identifier, oaiHandler.getHarvestingClient().getDataverse(), dataverseRequest, deletedIdentifiers, harvesterLogger);
+                continue;
+            }
+
+            MutableBoolean getRecordErrorOccurred = new MutableBoolean(false);
 
+            // Retrieve and process this record with a separate GetRecord call:
+            Long datasetId = processRecord(dataverseRequest, harvesterLogger, importCleanupLog, oaiHandler, identifier, getRecordErrorOccurred, deletedIdentifiers, dateStamp, httpClient);
+
+            if (datasetId != null) {
+                harvestedDatasetIds.add(datasetId);
+            }
+
+            if (getRecordErrorOccurred.booleanValue() == true) {
+                failedIdentifiers.add(identifier);
+                //can be uncommented out for testing failure handling:
+                //throw new IOException("Exception occured, stopping harvest");
             }
-        } catch (OaiHandlerException e) {
-            throw new IOException("Failed to run ListIdentifiers: " + e.getMessage());
         }
+    }
+    
+    private void harvestOAIviaListRecords(OaiHandler oaiHandler, DataverseRequest dataverseRequest, HarvestingClient harvestingClient, HttpClient httpClient, List<String> failedIdentifiers, List<String> deletedIdentifiers, List<Long> harvestedDatasetIds, Logger harvesterLogger, PrintWriter importCleanupLog) throws OaiHandlerException, StopHarvestException {
+        for (Iterator<Record> idIter = oaiHandler.runListRecords(); idIter.hasNext();) {
+            // Before each iteration, check if this harvesting job needs to be aborted:
+            if (checkIfStoppingJob(harvestingClient)) {
+                throw new StopHarvestException("Harvesting stopped by external request");
+            }
 
-        logCompletedOaiHarvest(hdLogger, harvestingClient);
+            Record oaiRecord = idIter.next();
+                        
+            Header h = oaiRecord.getHeader();
+            String identifier = h.getIdentifier();
+            Date dateStamp = Date.from(h.getDatestamp());
+
+            harvesterLogger.info("ListRecords; processing identifier : " + identifier + ", date: " + dateStamp);
+
+            if (h.isDeleted()) {
+                harvesterLogger.info("ListRecords; Deleting harvested dataset for " + identifier);
+
+                deleteHarvestedDatasetIfExists(identifier, oaiHandler.getHarvestingClient().getDataverse(), dataverseRequest, deletedIdentifiers, harvesterLogger);
+                continue;
+            }
+
+            MutableBoolean getRecordErrorOccurred = new MutableBoolean(false);
+            
+            Metadata oaiMetadata = oaiRecord.getMetadata();
+            String metadataString = oaiMetadata.asUnparsedString();
+
+            Long datasetId = null; 
+            
+            if (metadataString != null) {
+                Dataset harvestedDataset = null;
+                
+                // Some xml header sanitation: 
+                if (!metadataString.matches("^<[^>]*" + XML_XMLNS_XSI_ATTRIBUTE_TAG + ".*")) {
+                    metadataString = metadataString.replaceFirst(">", XML_XMLNS_XSI_ATTRIBUTE);
+                }
+
+                try {
+                    harvestedDataset = importService.doImportHarvestedDataset(dataverseRequest,
+                            oaiHandler.getHarvestingClient(),
+                            identifier,
+                            oaiHandler.getMetadataPrefix(),
+                            metadataString,
+                            dateStamp,
+                            importCleanupLog);
+
+                    harvesterLogger.fine("Harvest Successful for identifier " + identifier);
+                    harvesterLogger.fine("Size of this record: " + metadataString.length());
+                } catch (Throwable e) {
+                    logGetRecordException(harvesterLogger, oaiHandler, identifier, e);
+                }
+                if (harvestedDataset != null) {
+                    datasetId = harvestedDataset.getId();
+                }
+            } else {
+                // Instead of giving up here, let's try to retrieve and process 
+                // this record with a separate GetRecord call:
+                datasetId = processRecord(dataverseRequest, harvesterLogger, importCleanupLog, oaiHandler, identifier, getRecordErrorOccurred, deletedIdentifiers, dateStamp, httpClient);
+            }
 
-        return harvestedDatasetIds;
+            if (datasetId != null) {
+                harvestedDatasetIds.add(datasetId);
+            }
 
+            if (getRecordErrorOccurred.booleanValue() == true) {
+                failedIdentifiers.add(identifier);
+                //can be uncommented out for testing failure handling:
+                //throw new IOException("Exception occured, stopping harvest");
+            }
+        }
     }
     
-    
-    
-    private Long processRecord(DataverseRequest dataverseRequest, Logger hdLogger, PrintWriter importCleanupLog, OaiHandler oaiHandler, String identifier, MutableBoolean recordErrorOccurred, MutableLong processedSizeThisBatch, List<String> deletedIdentifiers, Date dateStamp) {
+    private Long processRecord(DataverseRequest dataverseRequest, Logger hdLogger, PrintWriter importCleanupLog, OaiHandler oaiHandler, String identifier, MutableBoolean recordErrorOccurred, List<String> deletedIdentifiers, Date dateStamp, HttpClient httpClient) {
         String errMessage = null;
         Dataset harvestedDataset = null;
         logGetRecord(hdLogger, oaiHandler, identifier);
         File tempFile = null;
         
-        try {  
-            FastGetRecord record = oaiHandler.runGetRecord(identifier);
-            errMessage = record.getErrorMessage();
+        try {
+            boolean deleted = false;
+            
+            if (DATAVERSE_PROPRIETARY_METADATA_FORMAT.equals(oaiHandler.getMetadataPrefix())) {
+                // Make direct call to obtain the proprietary Dataverse metadata
+                // in JSON from the remote Dataverse server:
+                String metadataApiUrl = oaiHandler.getProprietaryDataverseMetadataURL(identifier);
+                logger.fine("calling "+metadataApiUrl);
+                tempFile = retrieveProprietaryDataverseMetadata(httpClient, metadataApiUrl);
+                
+            } else {
+                FastGetRecord record = oaiHandler.runGetRecord(identifier, httpClient);
+                errMessage = record.getErrorMessage();
+                deleted = record.isDeleted();
+                tempFile = record.getMetadataFile();
+            }
 
             if (errMessage != null) {
                 hdLogger.log(Level.SEVERE, "Error calling GetRecord - " + errMessage);
-            } else if (record.isDeleted()) {
-                hdLogger.info("Deleting harvesting dataset for "+identifier+", per the OAI server's instructions.");
                 
-                Dataset dataset = datasetService.getDatasetByHarvestInfo(oaiHandler.getHarvestingClient().getDataverse(), identifier);
-                if (dataset != null) {
-                    hdLogger.info("Deleting dataset " + dataset.getGlobalIdString());
-                    datasetService.deleteHarvestedDataset(dataset, dataverseRequest, hdLogger);
-                    // TODO: 
-                    // check the status of that Delete - see if it actually succeeded
-                    deletedIdentifiers.add(identifier);
-                } else {
-                    hdLogger.info("No dataset found for "+identifier+", skipping delete. ");
-                }
-
+            } else if (deleted) {
+                hdLogger.info("Deleting harvesting dataset for "+identifier+", per GetRecord.");
+                
+                deleteHarvestedDatasetIfExists(identifier, oaiHandler.getHarvestingClient().getDataverse(), dataverseRequest, deletedIdentifiers, hdLogger); 
             } else {
                 hdLogger.info("Successfully retrieved GetRecord response.");
 
-                tempFile = record.getMetadataFile();
                 PrintWriter cleanupLog;
                 harvestedDataset = importService.doImportHarvestedDataset(dataverseRequest, 
                         oaiHandler.getHarvestingClient(),
                         identifier,
                         oaiHandler.getMetadataPrefix(), 
-                        record.getMetadataFile(),
+                        tempFile,
                         dateStamp,
                         importCleanupLog);
                 
                 hdLogger.fine("Harvest Successful for identifier " + identifier);
-                hdLogger.fine("Size of this record: " + record.getMetadataFile().length());
-                processedSizeThisBatch.add(record.getMetadataFile().length());
+                hdLogger.fine("Size of this record: " + tempFile.length());
             }
         } catch (Throwable e) {
             logGetRecordException(hdLogger, oaiHandler, identifier, e);
             errMessage = "Caught exception while executing GetRecord on "+identifier;
-            //logException(e, hdLogger);
                 
         } finally {
             if (tempFile != null) {
@@ -366,14 +436,12 @@ private Long processRecord(DataverseRequest dataverseRequest, Logger hdLogger, P
             }
         }
 
-        // TODO: the message below is taken from DVN3; - figure out what it means...
-        // 
         // If we got an Error from the OAI server or an exception happened during import, then
         // set recordErrorOccurred to true (if recordErrorOccurred is being used)
         // otherwise throw an exception (if recordErrorOccurred is not used, i.e null)
         
         if (errMessage != null) {
-            if (recordErrorOccurred  != null) {
+            if (recordErrorOccurred != null) {
                 recordErrorOccurred.setValue(true);
             } else {
                 throw new EJBException(errMessage);
@@ -382,7 +450,75 @@ private Long processRecord(DataverseRequest dataverseRequest, Logger hdLogger, P
 
         return harvestedDataset != null ? harvestedDataset.getId() : null;
     }
-       
+    
+    File retrieveProprietaryDataverseMetadata (HttpClient client, String remoteApiUrl) throws IOException {
+        
+        if (client == null) {
+            throw new IOException("Null Http Client, cannot make a call to obtain native metadata.");
+        }
+        
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(remoteApiUrl))
+                .GET()
+                .header("User-Agent", "XOAI Service Provider v5 (Dataverse)")
+                .build();
+        
+        HttpResponse<InputStream> response;
+
+        try {            
+             response = client.send(request, HttpResponse.BodyHandlers.ofInputStream());
+        } catch (InterruptedException ex) {
+            Thread.currentThread().interrupt();
+            throw new IOException("Failed to connect to the remote dataverse server to obtain native metadata");
+        }
+            
+        int responseCode = response.statusCode();
+            
+        if (responseCode == HTTP_OK) {
+            File tempMetadataFile = File.createTempFile("meta", ".tmp");
+
+            try (InputStream inputStream = response.body();
+                    FileOutputStream outputStream = new FileOutputStream(tempMetadataFile);) {
+                inputStream.transferTo(outputStream);
+                return tempMetadataFile;
+            }
+        }
+            
+        throw new IOException("Failed to download native metadata from the remote dataverse server.");
+    }
+    
+    private void deleteHarvestedDatasetIfExists(String persistentIdentifier, Dataverse harvestingDataverse, DataverseRequest dataverseRequest, List<String> deletedIdentifiers, Logger hdLogger) {
+        Dataset dataset = datasetService.getDatasetByHarvestInfo(harvestingDataverse, persistentIdentifier);
+        if (dataset != null) {
+            datasetService.deleteHarvestedDataset(dataset, dataverseRequest, hdLogger);
+            // TODO: 
+            // check the status of that Delete - see if it actually succeeded
+            deletedIdentifiers.add(persistentIdentifier);
+            return;
+        }
+        hdLogger.info("No dataset found for " + persistentIdentifier + ", skipping delete. ");
+    }
+    
+    private boolean checkIfStoppingJob(HarvestingClient harvestingClient) {
+        Long pid = ProcessHandle.current().pid();
+        String stopFileName = System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "stopharvest_" + harvestingClient.getName() + "." + pid; 
+        Path stopFilePath = Paths.get(stopFileName);
+        
+        if (Files.exists(stopFilePath)) {
+            // Now that we know that the file is there, let's (try to) delete it,
+            // so that the harvest can be re-run. 
+            try {
+                Files.delete(stopFilePath);
+            } catch (IOException ioex) {
+                // No need to treat this is a big deal (could be a permission, etc.)
+                logger.warning("Failed to delete the flag file "+stopFileName + "; check permissions and delete manually.");
+            }
+            return true;
+        }
+        
+        return false;                 
+    }
+           
     private void logBeginOaiHarvest(Logger hdLogger, HarvestingClient harvestingClient) {
         hdLogger.log(Level.INFO, "BEGIN HARVEST, oaiUrl=" 
                 +harvestingClient.getHarvestingUrl() 
@@ -414,12 +550,12 @@ public void logGetRecord(Logger hdLogger, OaiHandler oaiHandler, String identifi
     public void logGetRecordException(Logger hdLogger, OaiHandler oaiHandler, String identifier, Throwable e) {
         String errMessage = "Exception processing getRecord(), oaiUrl=" 
                 +oaiHandler.getBaseOaiUrl() 
-                +",identifier=" 
+                +", identifier="
                 +identifier 
-                +" " 
+                +", "
                 +e.getClass().getName() 
                 //+" (exception message suppressed)";
-                +" " 
+                +", "
                 +e.getMessage();
         
             hdLogger.log(Level.SEVERE, errMessage);
@@ -450,47 +586,5 @@ private void logException(Throwable e, Logger logger) {
         } while ((e = e.getCause()) != null);
         logger.severe(fullMessage);
     }
-    
-    /*
-     some dead code below: 
-     this functionality has been moved into OaiHandler. 
-    TODO: test that harvesting is still working and remove.
-     
-    private ServiceProvider getServiceProvider(String baseOaiUrl, Granularity oaiGranularity) {
-        Context context = new Context();
-
-        context.withBaseUrl(baseOaiUrl);
-        context.withGranularity(oaiGranularity);
-        context.withOAIClient(new HttpOAIClient(baseOaiUrl));
-
-        ServiceProvider serviceProvider = new ServiceProvider(context);
-        return serviceProvider;
-    }
-    */
-    
-    /**
-     * Creates an XOAI parameters object for the ListIdentifiers call
-     *
-     * @param metadataPrefix
-     * @param set
-     * @param from
-     * @return ListIdentifiersParameters
-     */
-    /*
-    private ListIdentifiersParameters buildParams(String metadataPrefix, String set, Date from) {
-        ListIdentifiersParameters mip = ListIdentifiersParameters.request();
-        mip.withMetadataPrefix(metadataPrefix);
-
-        if (from != null) {
-            mip.withFrom(from);
-        }
-
-        if (set != null) {
-            mip.withSetSpec(set);
-        }
-        return mip;
-    }
-    */
-    
-    
+        
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java
index b4ed7c3d32f..c8b6ebce232 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java
@@ -7,6 +7,7 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.util.StringUtil;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -17,25 +18,24 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import java.text.ParseException;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.NotBlank;
 
 /**
@@ -90,7 +90,7 @@ public void setId(Long id) {
     public static final String HARVEST_STYLE_DESCRIPTION_NESSTAR="Nesstar archive";
     public static final String HARVEST_STYLE_DESCRIPTION_ROPER="Roper Archive";
     public static final String HARVEST_STYLE_DESCRIPTION_HGL="HGL";
-    public static final String HARVEST_STYLE_DESCRIPTION_DEFAULT="Generic OAI resource (DC)";
+    public static final String HARVEST_STYLE_DESCRIPTION_DEFAULT="Generic OAI archive";
     
     
     public static final List<String> HARVEST_STYLE_LIST = Arrays.asList(HARVEST_STYLE_DATAVERSE, HARVEST_STYLE_VDC, HARVEST_STYLE_ICPSR, HARVEST_STYLE_NESSTAR, HARVEST_STYLE_ROPER, HARVEST_STYLE_HGL, HARVEST_STYLE_DEFAULT);
@@ -188,7 +188,23 @@ public String getHarvestingUrl() {
     }
 
     public void setHarvestingUrl(String harvestingUrl) {
-        this.harvestingUrl = harvestingUrl.trim();
+        if (harvestingUrl != null) {
+            this.harvestingUrl = harvestingUrl.trim();
+        }
+    }
+
+    private String sourceName;
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
+
+    public String getMetadataSource() {
+        return StringUtils.isNotBlank(this.sourceName) ? this.sourceName : this.name;
     }
     
     private String archiveUrl; 
@@ -212,6 +228,7 @@ public void setArchiveDescription(String archiveDescription) {
         this.archiveDescription = archiveDescription; 
     }
     
+    @Column(columnDefinition="TEXT")
     private String harvestingSet;
 
     public String getHarvestingSet() {
@@ -232,8 +249,44 @@ public void setMetadataPrefix(String metadataPrefix) {
         this.metadataPrefix = metadataPrefix;
     }
     
-    // TODO: do we need "orphanRemoval=true"? -- L.A. 4.4
-    // TODO: should it be @OrderBy("startTime")? -- L.A. 4.4
+    private String customHttpHeaders; 
+    
+    public String getCustomHttpHeaders() {
+        return customHttpHeaders;
+    }
+    
+    public void setCustomHttpHeaders(String customHttpHeaders) {
+        this.customHttpHeaders = customHttpHeaders;
+    }
+
+    private boolean allowHarvestingMissingCVV;
+    public boolean getAllowHarvestingMissingCVV() {
+        return allowHarvestingMissingCVV;
+    }
+    public void setAllowHarvestingMissingCVV(boolean allowHarvestingMissingCVV) {
+        this.allowHarvestingMissingCVV = allowHarvestingMissingCVV;
+    }
+    
+    private boolean useListRecords; 
+    
+    public boolean isUseListRecords() {
+        return useListRecords; 
+    }
+    
+    public void setUseListrecords(boolean useListRecords) {
+        this.useListRecords = useListRecords; 
+    }
+    
+    private boolean useOaiIdAsPid; 
+    
+    public boolean isUseOaiIdentifiersAsPids() {
+        return useOaiIdAsPid; 
+    }
+    
+    public void setUseOaiIdentifiersAsPids(boolean useOaiIdAsPid) {
+        this.useOaiIdAsPid = useOaiIdAsPid; 
+    }
+    
     @OneToMany(mappedBy="harvestingClient", cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     @OrderBy("id")
     private List<ClientHarvestRun> harvestHistory;
@@ -269,7 +322,7 @@ public ClientHarvestRun getLastSuccessfulRun() {
         int i = harvestHistory.size() - 1;
         
         while (i > -1) {
-            if (harvestHistory.get(i).isSuccess()) {
+            if (harvestHistory.get(i).isCompleted() || harvestHistory.get(i).isCompletedWithFailures()) {
                 return harvestHistory.get(i);
             }
             i--;
@@ -286,7 +339,7 @@ ClientHarvestRun getLastNonEmptyRun() {
         int i = harvestHistory.size() - 1;
         
         while (i > -1) {
-            if (harvestHistory.get(i).isSuccess()) {
+            if (harvestHistory.get(i).isCompleted() || harvestHistory.get(i).isCompletedWithFailures()) {
                 if (harvestHistory.get(i).getHarvestedDatasetCount().longValue() > 0 ||
                     harvestHistory.get(i).getDeletedDatasetCount().longValue() > 0) {
                     return harvestHistory.get(i);
@@ -343,95 +396,7 @@ public Long getLastDeletedDatasetCount() {
             return lastNonEmptyHarvest.getDeletedDatasetCount();
         }
         return null;
-    }
-    
-    /* move the fields below to the new HarvestingClientRun class: 
-    private String harvestResult;
-    
-    public String getResult() {
-        return harvestResult;
-    }
-
-    public void setResult(String harvestResult) {
-        this.harvestResult = harvestResult;
-    }
-    
-    // "Last Harvest Time" is the last time we *attempted* to harvest 
-    // from this remote resource. 
-    // It wasn't necessarily a successful attempt!
-    
-    @Temporal(value = TemporalType.TIMESTAMP)
-    private Date lastHarvestTime;
-
-    public Date getLastHarvestTime() {
-        return lastHarvestTime;
-    }
-
-    public void setLastHarvestTime(Date lastHarvestTime) {
-        this.lastHarvestTime = lastHarvestTime;
-    }
-    
-    // This is the last "successful harvest" - i.e., the last time we 
-    // tried to harvest, and got a response from the remote server. 
-    // We may not have necessarily harvested any useful content though; 
-    // the result may have been a "no content" or "no changes since the last harvest"
-    // response. 
-    
-    @Temporal(value = TemporalType.TIMESTAMP)
-    private Date lastSuccessfulHarvestTime; 
-    
-    public Date getLastSuccessfulHarvestTime() {
-        return lastSuccessfulHarvestTime;
-    }
-
-    public void setLastSuccessfulHarvestTime(Date lastSuccessfulHarvestTime) {
-        this.lastSuccessfulHarvestTime = lastSuccessfulHarvestTime;
-    }
-    
-    // Finally, this is the time stamp from the last "non-empty" harvest. 
-    // I.e. the last time we ran a harvest that actually resulted in 
-    // some Datasets created, updated or deleted:
-    
-    @Temporal(value = TemporalType.TIMESTAMP)
-    private Date lastNonEmptyHarvestTime;
-    
-    public Date getLastNonEmptyHarvestTime() {
-        return lastNonEmptyHarvestTime;
-    }
-
-    public void setLastNonEmptyHarvestTime(Date lastNonEmptyHarvestTime) {
-        this.lastNonEmptyHarvestTime = lastNonEmptyHarvestTime;
-    }
-    
-    // And these are the Dataset counts from that last "non-empty" harvest:
-    private Long harvestedDatasetCount;
-    private Long failedDatasetCount;
-    private Long deletedDatasetCount;
-    
-    public Long getLastHarvestedDatasetCount() {
-        return harvestedDatasetCount;
-    }
-
-    public void setHarvestedDatasetCount(Long harvestedDatasetCount) {
-        this.harvestedDatasetCount = harvestedDatasetCount;
-    }
-    
-    public Long getLastFailedDatasetCount() {
-        return failedDatasetCount;
-    }
-
-    public void setFailedDatasetCount(Long failedDatasetCount) {
-        this.failedDatasetCount = failedDatasetCount;
-    }
-    
-    public Long getLastDeletedDatasetCount() {
-        return deletedDatasetCount;
-    }
-
-    public void setDeletedDatasetCount(Long deletedDatasetCount) {
-        this.deletedDatasetCount = deletedDatasetCount;
-    }
-    */
+    }   
     
     private boolean scheduled;
 
@@ -483,14 +448,55 @@ public String getScheduleDescription() {
         if (schedulePeriod!=null && schedulePeriod!="") {
             cal.set(Calendar.HOUR_OF_DAY, scheduleHourOfDay);
             if (schedulePeriod.equals(this.SCHEDULE_PERIOD_WEEKLY)) {
-                cal.set(Calendar.DAY_OF_WEEK,scheduleDayOfWeek);
-                desc="Weekly, "+weeklyFormat.format(cal.getTime());
+                cal.set(Calendar.DAY_OF_WEEK,scheduleDayOfWeek + 1);
+                desc="Weekly, "+weeklyFormat.format(cal.getTime());                
             } else {
                 desc="Daily, "+dailyFormat.format(cal.getTime());
             }
         }
         return desc;
     }
+    
+    public void readScheduleDescription(String description) {
+        this.setScheduled(false);
+        if (description == null || "none".equals(description)) {
+            return;
+        }
+        
+        if (StringUtil.nonEmpty(description)) {
+            Date parsed = null;
+            Calendar cal = new GregorianCalendar();
+            
+            if (description.startsWith("Weekly, ")) {
+                description = description.replaceFirst("^Weekly, *", "");
+                SimpleDateFormat weeklyFormat = new SimpleDateFormat("E h a");
+                try {
+                    parsed = weeklyFormat.parse(description);
+                    cal.setTime(parsed);
+                    this.setScheduled(true);
+                    this.setScheduleDayOfWeek(cal.get(Calendar.DAY_OF_WEEK) - 1);
+                    this.setScheduleHourOfDay(cal.get(Calendar.HOUR_OF_DAY));
+                    this.setSchedulePeriod(this.SCHEDULE_PERIOD_WEEKLY);
+                } catch (ParseException pex) {
+                    // return; no need; the client will simply stay unscheduled 
+                }
+            } else if (description.startsWith("Daily, ")) {
+                description = description.replaceFirst("^Daily, *", "");
+                SimpleDateFormat  dailyFormat = new SimpleDateFormat("h a");
+                try {
+                    parsed = dailyFormat.parse(description);
+                    cal.setTime(parsed);
+                    this.setScheduled(true);
+                    this.setScheduleHourOfDay(cal.get(Calendar.HOUR_OF_DAY));
+                    this.setSchedulePeriod(this.SCHEDULE_PERIOD_DAILY);
+                    
+                } catch (ParseException pex) {
+                    // return; no need; the client will simply stay unscheduled
+                }
+            }
+        }
+    }
+    
     private boolean harvestingNow;
 
     public boolean isHarvestingNow() {
@@ -536,5 +542,4 @@ public boolean equals(Object object) {
     public String toString() {
         return "edu.harvard.iq.dataverse.harvest.client.HarvestingClient[ id=" + id + " ]";
     }
-    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClientServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClientServiceBean.java
index 0af73550190..4b491a5e722 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClientServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClientServiceBean.java
@@ -1,29 +1,26 @@
 package edu.harvard.iq.dataverse.harvest.client;
 
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.DataFileServiceBean;
-import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
-import edu.harvard.iq.dataverse.EjbDataverseEngine;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.impl.DeleteHarvestingClientCommand;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.timer.DataverseTimerServiceBean;
+
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.Asynchronous;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import org.apache.solr.client.solrj.SolrServerException;
 
 /**
  *
@@ -156,6 +153,19 @@ public void deleteClient(Long clientId) {
             }
 
             em.remove(merged);
+
+            // Reindex dataverse to update datasetCount
+            List<Dataverse> toReindex = new ArrayList<>();
+            toReindex.add(victim.getDataverse());
+            toReindex.addAll(victim.getDataverse().getOwners());
+            for (Dataverse dv : toReindex) {
+                try {
+                    indexService.indexDataverse(dv);
+                } catch (IOException | SolrServerException e) {
+                    logger.severe("Dataverse indexing failed. You can kickoff a re-index of this dataverse with: \r\n curl http://localhost:8080/api/admin/index/dataverses/" + dv.getId().toString());
+                }
+            }
+
         } catch (Exception e) {
             errorMessage = "Failed to delete cleint. Unknown exception: " + e.getMessage();
         }
@@ -166,29 +176,26 @@ public void deleteClient(Long clientId) {
     }
     
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-    public void setHarvestSuccess(Long hcId, Date currentTime, int harvestedCount, int failedCount, int deletedCount) {
-        HarvestingClient harvestingClient = em.find(HarvestingClient.class, hcId);
-        if (harvestingClient == null) {
-            return;
-        }
-        em.refresh(harvestingClient);
-        
-        ClientHarvestRun currentRun = harvestingClient.getLastRun();
-        
-        if (currentRun != null && currentRun.isInProgress()) {
-            // TODO: what if there's no current run in progress? should we just
-            // give up quietly, or should we make a noise of some kind? -- L.A. 4.4      
-            
-            currentRun.setSuccess();
-            currentRun.setFinishTime(currentTime);
-            currentRun.setHarvestedDatasetCount(new Long(harvestedCount));
-            currentRun.setFailedDatasetCount(new Long(failedCount));
-            currentRun.setDeletedDatasetCount(new Long(deletedCount));
-        }
+    public void setHarvestCompleted(Long hcId, Date currentTime, int harvestedCount, int failedCount, int deletedCount) {
+        recordHarvestJobStatus(hcId, currentTime, harvestedCount, failedCount, deletedCount, ClientHarvestRun.RunResultType.COMPLETED);
     }
 
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-    public void setHarvestFailure(Long hcId, Date currentTime) {
+    public void setHarvestCompletedWithFailures(Long hcId, Date currentTime, int harvestedCount, int failedCount, int deletedCount) {
+        recordHarvestJobStatus(hcId, currentTime, harvestedCount, failedCount, deletedCount, ClientHarvestRun.RunResultType.COMPLETED_WITH_FAILURES);
+    }
+
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public void setHarvestFailure(Long hcId, Date currentTime, int harvestedCount, int failedCount, int deletedCount) {
+        recordHarvestJobStatus(hcId, currentTime, harvestedCount, failedCount, deletedCount, ClientHarvestRun.RunResultType.FAILURE);
+    } 
+    
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public void setPartiallyCompleted(Long hcId, Date finishTime, int harvestedCount, int failedCount, int deletedCount) {
+        recordHarvestJobStatus(hcId, finishTime, harvestedCount, failedCount, deletedCount, ClientHarvestRun.RunResultType.INTERRUPTED);
+    }
+    
+    public void recordHarvestJobStatus(Long hcId, Date finishTime, int harvestedCount, int failedCount, int deletedCount, ClientHarvestRun.RunResultType result) {
         HarvestingClient harvestingClient = em.find(HarvestingClient.class, hcId);
         if (harvestingClient == null) {
             return;
@@ -198,28 +205,40 @@ public void setHarvestFailure(Long hcId, Date currentTime) {
         ClientHarvestRun currentRun = harvestingClient.getLastRun();
         
         if (currentRun != null && currentRun.isInProgress()) {
-            // TODO: what if there's no current run in progress? should we just
-            // give up quietly, or should we make a noise of some kind? -- L.A. 4.4      
             
-            currentRun.setFailed();
-            currentRun.setFinishTime(currentTime);
+            currentRun.setResult(result);
+            currentRun.setFinishTime(finishTime);
+            currentRun.setHarvestedDatasetCount(Long.valueOf(harvestedCount));
+            currentRun.setFailedDatasetCount(Long.valueOf(failedCount));
+            currentRun.setDeletedDatasetCount(Long.valueOf(deletedCount));
         }
-    }  
+    }
+    
+    public Long getNumberOfHarvestedDatasetsByAllClients() {
+        try {
+            return (Long) em.createNativeQuery("SELECT count(d.id) FROM dataset d "
+                    + " WHERE d.harvestingclient_id IS NOT NULL").getSingleResult();
+
+        } catch (Exception ex) {
+            logger.info("Warning: exception looking up the total number of harvested datasets: " + ex.getMessage());
+            return 0L;
+        }
+    }
     
     public Long getNumberOfHarvestedDatasetByClients(List<HarvestingClient> clients) {
-        String dvs = null; 
+        String clientIds = null; 
         for (HarvestingClient client: clients) {
-            if (dvs == null) {
-                dvs = client.getDataverse().getId().toString();
+            if (clientIds == null) {
+                clientIds = client.getId().toString();
             } else {
-                dvs = dvs.concat(","+client.getDataverse().getId().toString());
+                clientIds = clientIds.concat(","+client.getId().toString());
             }
         }
         
         try {
-            return (Long) em.createNativeQuery("SELECT count(d.id) FROM dataset d, "
-                    + " dvobject o WHERE d.id = o.id AND o.owner_id in (" 
-                    + dvs + ")").getSingleResult();
+            return (Long) em.createNativeQuery("SELECT count(d.id) FROM dataset d "
+                    + " WHERE d.harvestingclient_id in (" 
+                    + clientIds + ")").getSingleResult();
 
         } catch (Exception ex) {
             logger.info("Warning: exception trying to count harvested datasets by clients: " + ex.getMessage());
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/StopHarvestException.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/StopHarvestException.java
new file mode 100644
index 00000000000..dffa2dd0385
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/client/StopHarvestException.java
@@ -0,0 +1,17 @@
+package edu.harvard.iq.dataverse.harvest.client;
+
+/**
+ *
+ * @author landreev
+ */
+
+public class StopHarvestException extends Exception {
+    public StopHarvestException(String message) {
+        super(message);
+    }
+
+    public StopHarvestException(String message, Throwable cause) {
+        super(message, cause);
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/oai/OaiHandler.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/oai/OaiHandler.java
index e4642fe0a4d..0a71dc4ea15 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/client/oai/OaiHandler.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/client/oai/OaiHandler.java
@@ -1,43 +1,45 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package edu.harvard.iq.dataverse.harvest.client.oai;
 
-import com.lyncode.xoai.model.oaipmh.Description;
-import com.lyncode.xoai.model.oaipmh.Granularity;
-import com.lyncode.xoai.model.oaipmh.Header;
-import com.lyncode.xoai.model.oaipmh.MetadataFormat;
-import com.lyncode.xoai.model.oaipmh.Set;
-import com.lyncode.xoai.serviceprovider.ServiceProvider;
-import com.lyncode.xoai.serviceprovider.client.HttpOAIClient;
-import com.lyncode.xoai.serviceprovider.exceptions.BadArgumentException;
-import com.lyncode.xoai.serviceprovider.exceptions.InvalidOAIResponse;
-import com.lyncode.xoai.serviceprovider.exceptions.NoSetHierarchyException;
-import com.lyncode.xoai.serviceprovider.model.Context;
-import com.lyncode.xoai.serviceprovider.parameters.ListIdentifiersParameters;
+import io.gdcc.xoai.model.oaipmh.Granularity;
+import io.gdcc.xoai.model.oaipmh.results.Record;
+import io.gdcc.xoai.model.oaipmh.results.record.Header;
+import io.gdcc.xoai.model.oaipmh.results.MetadataFormat;
+import io.gdcc.xoai.model.oaipmh.results.Set;
+import io.gdcc.xoai.model.oaipmh.verbs.Identify;
+import io.gdcc.xoai.serviceprovider.ServiceProvider;
+import io.gdcc.xoai.serviceprovider.exceptions.BadArgumentException;
+import io.gdcc.xoai.serviceprovider.exceptions.InvalidOAIResponse;
+import io.gdcc.xoai.serviceprovider.exceptions.NoSetHierarchyException;
+import io.gdcc.xoai.serviceprovider.exceptions.IdDoesNotExistException;
+import io.gdcc.xoai.serviceprovider.model.Context;
+import io.gdcc.xoai.serviceprovider.parameters.ListIdentifiersParameters;
+import io.gdcc.xoai.serviceprovider.parameters.ListRecordsParameters;
 import edu.harvard.iq.dataverse.harvest.client.FastGetRecord;
+import static edu.harvard.iq.dataverse.harvest.client.HarvesterServiceBean.DATAVERSE_PROPRIETARY_METADATA_API;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
+import io.gdcc.xoai.serviceprovider.client.JdkHttpOaiClient;
 import java.io.IOException;
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
+import java.net.http.HttpClient;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.xml.sax.SAXException;
 import javax.xml.transform.TransformerException;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  *
  * @author Leonid Andreev
  */
 public class OaiHandler implements Serializable {
+    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.client.oai.OaiHandler");
     
     public OaiHandler() {
         
@@ -66,22 +68,23 @@ public OaiHandler(HarvestingClient harvestingClient) throws OaiHandlerException
         this.metadataPrefix = harvestingClient.getMetadataPrefix();
         
         if (!StringUtils.isEmpty(harvestingClient.getHarvestingSet())) {
-            try {
-                this.setName = URLEncoder.encode(harvestingClient.getHarvestingSet(), "UTF-8");
-            } catch (UnsupportedEncodingException uee) {
-                throw new OaiHandlerException("Harvesting set: unsupported (non-UTF8) encoding");
-            }
+            this.setName = harvestingClient.getHarvestingSet();
         }
         
         this.fromDate = harvestingClient.getLastNonEmptyHarvestTime();
         
+        this.customHeaders = makeCustomHeaders(harvestingClient.getCustomHttpHeaders());
+        
         this.harvestingClient = harvestingClient;
     }
     
-    private String baseOaiUrl; //= harvestingClient.getHarvestingUrl();
-    private String metadataPrefix; // = harvestingClient.getMetadataPrefix();
+    private String baseOaiUrl; 
+    private String dataverseApiUrl; // if the remote server is a Dataverse and we access its native metadata
+    private String metadataPrefix; 
     private String setName; 
     private Date   fromDate;
+    private Boolean setListTruncated = false;
+    private Map<String,String> customHeaders = null;
     
     private ServiceProvider serviceProvider; 
     
@@ -123,8 +126,19 @@ public void setHarvestingClient(HarvestingClient harvestingClient) {
         this.harvestingClient = harvestingClient; 
     }
     
+    public boolean isSetListTruncated() {
+        return setListTruncated;
+    }
     
-    private ServiceProvider getServiceProvider() throws OaiHandlerException {
+    public Map<String,String> getCustomHeaders() {
+        return this.customHeaders;
+    }
+    
+    public void setCustomHeaders(Map<String,String> customHeaders) {
+       this.customHeaders = customHeaders;
+    }
+    
+    public ServiceProvider getServiceProvider() throws OaiHandlerException {
         if (serviceProvider == null) {
             if (baseOaiUrl == null) {
                 throw new OaiHandlerException("Could not instantiate Service Provider, missing OAI server URL.");
@@ -133,20 +147,30 @@ private ServiceProvider getServiceProvider() throws OaiHandlerException {
 
             context.withBaseUrl(baseOaiUrl);
             context.withGranularity(Granularity.Second);
-            context.withOAIClient(new HttpOAIClient(baseOaiUrl));
-
+            
+            JdkHttpOaiClient.Builder xoaiClientBuilder = JdkHttpOaiClient.newBuilder().withBaseUrl(getBaseOaiUrl());
+            if (getCustomHeaders() != null) {
+                for (String headerName : getCustomHeaders().keySet()) {
+                    logger.fine("adding custom header; name: "+headerName+", value: "+getCustomHeaders().get(headerName));
+                }   
+                xoaiClientBuilder = xoaiClientBuilder.withCustomHeaders(getCustomHeaders());
+            }
+            context.withOAIClient(xoaiClientBuilder.build());
+            context.withSaveUnparsedMetadata();
             serviceProvider = new ServiceProvider(context);
         }
         
         return serviceProvider;
     }
     
-    public List<String> runListSets() throws OaiHandlerException {
+    public ArrayList<String> runListSets() throws OaiHandlerException {
     
         ServiceProvider sp = getServiceProvider(); 
         
         Iterator<Set> setIter;
         
+        long startMilSec = new Date().getTime();
+        
         try {
             setIter = sp.listSets();
         } catch (NoSetHierarchyException nshe) {
@@ -155,9 +179,12 @@ public List<String> runListSets() throws OaiHandlerException {
             throw new OaiHandlerException("No valid response received from the OAI server.");
         }
         
-        List<String> sets = new ArrayList<>();
+        ArrayList<String> sets = new ArrayList<>();
 
+        int count = 0;
+        
         while ( setIter.hasNext()) {
+            count++;
             Set set = setIter.next();
             String setSpec = set.getSpec();
             /*
@@ -166,6 +193,15 @@ public List<String> runListSets() throws OaiHandlerException {
                 
             }
             */
+            
+            if (count >= 100) {
+                // Have we been waiting more than 30 seconds?
+                if (new Date().getTime() - startMilSec > 30000) {
+                    setListTruncated = true;
+                    break; 
+                }
+            }
+                         
             if (!StringUtils.isEmpty(setSpec)) {
                 sets.add(setSpec);
             }
@@ -185,6 +221,16 @@ public List<String> runListMetadataFormats() throws OaiHandlerException {
         
         try {
             mfIter = sp.listMetadataFormats();
+        } catch (IdDoesNotExistException idnee) {
+            // TODO: 
+            // not sure why this exception is now thrown by List Metadata Formats (?)
+            // but looks like it was added in xoai 4.2. 
+            // It appears that the answer is, they added it because you can 
+            // call ListMetadataFormats on a specific identifier, optionally, 
+            // and therefore it is possible to get back that response. Of course 
+            // it will never be the case when calling it on an entire repository. 
+            // But it's ok. 
+            throw new OaiHandlerException("Id does not exist exception");
         } catch (InvalidOAIResponse ior) {
             throw new OaiHandlerException("No valid response received from the OAI server."); 
         }
@@ -216,7 +262,17 @@ public Iterator<Header> runListIdentifiers() throws OaiHandlerException {
                 
     }
     
-    public FastGetRecord runGetRecord(String identifier) throws OaiHandlerException { 
+    public Iterator<Record> runListRecords() throws OaiHandlerException {
+        ListRecordsParameters parameters = buildListRecordsParams();
+        try {
+            return getServiceProvider().listRecords(parameters);
+        } catch (BadArgumentException bae) {
+            throw new OaiHandlerException("BadArgumentException thrown when attempted to run ListRecords");
+        }
+                
+    }
+    
+    public FastGetRecord runGetRecord(String identifier, HttpClient httpClient) throws OaiHandlerException { 
         if (StringUtils.isEmpty(this.baseOaiUrl)) {
             throw new OaiHandlerException("Attempted to execute GetRecord without server URL specified.");
         }
@@ -225,7 +281,7 @@ public FastGetRecord runGetRecord(String identifier) throws OaiHandlerException
         }
         
         try {
-            return new FastGetRecord(this.baseOaiUrl, identifier, this.metadataPrefix);
+            return new FastGetRecord(this, identifier, httpClient);
         } catch (ParserConfigurationException pce) {
             throw new OaiHandlerException("ParserConfigurationException executing GetRecord: "+pce.getMessage());
         } catch (SAXException se) {
@@ -247,7 +303,28 @@ private ListIdentifiersParameters buildListIdentifiersParams() throws OaiHandler
         mip.withMetadataPrefix(metadataPrefix);
 
         if (this.fromDate != null) {
-            mip.withFrom(this.fromDate);
+            Identify identify = runIdentify();
+            mip.withGranularity(identify.getGranularity().toString());
+            mip.withFrom(this.fromDate.toInstant());
+        }
+
+        if (!StringUtils.isEmpty(this.setName)) {
+            mip.withSetSpec(this.setName);
+        }
+        
+        return mip;
+    }
+    
+    private ListRecordsParameters buildListRecordsParams() throws OaiHandlerException {
+        ListRecordsParameters mip = ListRecordsParameters.request();
+        
+        if (StringUtils.isEmpty(this.metadataPrefix)) {
+            throw new OaiHandlerException("Attempted to create a ListRecords request without metadataPrefix specified");
+        }
+        mip.withMetadataPrefix(metadataPrefix);
+
+        if (this.fromDate != null) {
+            mip.withFrom(this.fromDate.toInstant());
         }
 
         if (!StringUtils.isEmpty(this.setName)) {
@@ -257,9 +334,48 @@ private ListIdentifiersParameters buildListIdentifiersParams() throws OaiHandler
         return mip;
     }
     
-    public void runIdentify() {
-        // not implemented yet
-        // (we will need it, both for validating the remote server,
-        // and to learn about its extended capabilities)
+    public String getProprietaryDataverseMetadataURL(String identifier) {
+
+        if (dataverseApiUrl == null) {
+            dataverseApiUrl = baseOaiUrl.replaceFirst("/oai", "");
+        }
+        
+        StringBuilder requestURL =  new StringBuilder(dataverseApiUrl);
+        requestURL.append(DATAVERSE_PROPRIETARY_METADATA_API).append(identifier);
+
+        return requestURL.toString();
+    }
+    
+    public Identify runIdentify() throws OaiHandlerException {
+        ServiceProvider sp = getServiceProvider();
+        try {
+            return sp.identify();
+        } catch (InvalidOAIResponse ior) {
+            throw new OaiHandlerException("No valid response received from the OAI server.");
+        }
+    }
+    
+    public Map<String,String> makeCustomHeaders(String headersString) {
+        if (headersString != null) {
+            String[] parts = headersString.split("\\\\n");
+            HashMap<String,String> ret = new HashMap<>();
+            logger.info("found "+parts.length+" parts");
+            int count = 0;
+            for (int i = 0; i < parts.length; i++) {
+                if (parts[i].indexOf(':') > 0) {
+                    String headerName = parts[i].substring(0, parts[i].indexOf(':'));
+                    String headerValue = parts[i].substring(parts[i].indexOf(':')+1).strip();
+                    
+                    ret.put(headerName, headerValue);
+                    count++;
+                } 
+                // simply skipping it if malformed; or we could throw an exception - ?
+            }
+            if (ret.size() > 0) {
+                logger.info("returning the array with "+ret.size()+" name/value pairs");
+                return ret;
+            }
+        }
+        return null; 
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecord.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecord.java
index 49e40e786ea..94753d8594d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecord.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecord.java
@@ -21,12 +21,12 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java
index 973c712b5c8..cc15d4c978b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java
@@ -8,31 +8,27 @@
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.export.ExportException;
 import edu.harvard.iq.dataverse.export.ExportService;
+import io.gdcc.spi.export.ExportException;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import java.io.File;
-import java.io.IOException;
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import javax.persistence.TemporalType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import static jakarta.ejb.TransactionAttributeType.REQUIRES_NEW;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.TemporalType;
 
 /**
  *
@@ -44,10 +40,6 @@
 @Stateless
 @Named
 public class OAIRecordServiceBean implements java.io.Serializable {
-    @EJB 
-    OAISetServiceBean oaiSetService;    
-    @EJB 
-    IndexServiceBean indexService;
     @EJB 
     DatasetServiceBean datasetService;
     @EJB 
@@ -59,13 +51,24 @@ public class OAIRecordServiceBean implements java.io.Serializable {
     EntityManager em;   
     
     private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.server.OAIRecordServiceBean");
-
-    public void updateOaiRecords(String setName, List<Long> datasetIds, Date updateTime, boolean doExport) {
-        updateOaiRecords(setName, datasetIds, updateTime, doExport, logger);
-    }
     
-    public void updateOaiRecords(String setName, List<Long> datasetIds, Date updateTime, boolean doExport, Logger setUpdateLogger) {
-
+    /**
+     * Updates the OAI records for the set specified
+     * @param setName    name of the OAI set
+     * @param datasetIds ids of the datasets that are candidates for this OAI set
+     * @param updateTime time stamp
+     * @param doExport   attempt to export datasets that haven't been exported yet
+     * @param confirmed  true if the datasetIds above were looked up in the database 
+     *                   - as opposed to in the search engine. Meaning, that it is
+     *                   confirmed that any dataset not on this list that's currently 
+     *                   in the set is no longer in the database and should be 
+     *                   marked as deleted without any further checks. Otherwise 
+     *                   we'll want to double-check if the dataset still exists
+     *                   as published. This is to prevent marking existing datasets 
+     *                   as deleted during a full reindex etc.
+     * @param setUpdateLogger dedicated Logger 
+     */
+    public void updateOaiRecords(String setName, List<Long> datasetIds, Date updateTime, boolean doExport, boolean confirmed, Logger setUpdateLogger) {
         // create Map of OaiRecords
         List<OAIRecord> oaiRecords = findOaiRecordsBySetName(setName);
         Map<String, OAIRecord> recordMap = new HashMap<>();
@@ -105,14 +108,11 @@ public void updateOaiRecords(String setName, List<Long> datasetIds, Date updateT
                         DatasetVersion releasedVersion = dataset.getReleasedVersion();
                         Date publicationDate = releasedVersion == null ? null : releasedVersion.getReleaseTime();
 
-                        //if (dataset.getPublicationDate() != null
-                        //        && (dataset.getLastExportTime() == null
-                        //        || dataset.getLastExportTime().before(dataset.getPublicationDate()))) {
                         if (publicationDate != null
                                 && (dataset.getLastExportTime() == null
                                 || dataset.getLastExportTime().before(publicationDate))) {
 
-                            setUpdateLogger.fine("Attempting to run export on dataset " + dataset.getGlobalIdString());
+                            setUpdateLogger.fine("Attempting to run export on dataset " + dataset.getGlobalId().asString());
                             exportAllFormats(dataset);
                         }
                         
@@ -129,7 +129,9 @@ public void updateOaiRecords(String setName, List<Long> datasetIds, Date updateT
         }
 
         // anything left in the map should be marked as removed!
-        markOaiRecordsAsRemoved( recordMap.values(), updateTime, setUpdateLogger);
+        markOaiRecordsAsRemoved(recordMap.values(), updateTime, confirmed, setUpdateLogger);
+        
+                   
         
     }
     
@@ -146,14 +148,14 @@ public void updateOaiRecordForDataset(Dataset dataset, String setName, Map<Strin
         boolean isReleased = dataset.getReleasedVersion() != null;
         
         if (isReleased && dataset.getLastExportTime() != null) {
-            OAIRecord record = recordMap.get(dataset.getGlobalIdString());
+            OAIRecord record = recordMap.get(dataset.getGlobalId().asString());
             if (record == null) {
-                setUpdateLogger.info("creating a new OAI Record for " + dataset.getGlobalIdString());
-                record = new OAIRecord(setName, dataset.getGlobalIdString(), new Date());
+                setUpdateLogger.info("creating a new OAI Record for " + dataset.getGlobalId().asString());
+                record = new OAIRecord(setName, dataset.getGlobalId().asString(), new Date());
                 em.persist(record);
             } else {
                 if (record.isRemoved()) {
-                    setUpdateLogger.info("\"un-deleting\" an existing OAI Record for " + dataset.getGlobalIdString());
+                    setUpdateLogger.info("\"un-deleting\" an existing OAI Record for " + dataset.getGlobalId().asString());
                     record.setRemoved(false);
                     record.setLastUpdateTime(new Date());
                 } else if (dataset.getLastExportTime().after(record.getLastUpdateTime())) {
@@ -166,7 +168,7 @@ record = new OAIRecord(setName, dataset.getGlobalIdString(), new Date());
         }
     }
     
-    
+   /*
     // Updates any existing OAI records for this dataset
     // Should be called whenever there's a change in the release status of the Dataset
     // (i.e., when it's published or deaccessioned), so that the timestamps and 
@@ -180,7 +182,7 @@ record = new OAIRecord(setName, dataset.getGlobalIdString(), new Date());
     public void updateOaiRecordsForDataset(Dataset dataset) {
         // create Map of OaiRecords
 
-        List<OAIRecord> oaiRecords = findOaiRecordsByGlobalId(dataset.getGlobalIdString());
+        List<OAIRecord> oaiRecords = findOaiRecordsByGlobalId(dataset.getGlobalId().asString());
         if (oaiRecords != null) {
 
             DatasetVersion releasedVersion = dataset.getReleasedVersion();
@@ -194,7 +196,7 @@ public void updateOaiRecordsForDataset(Dataset dataset) {
             
             for (OAIRecord record : oaiRecords) {
                 if (record.isRemoved()) {
-                    logger.fine("\"un-deleting\" an existing OAI Record for " + dataset.getGlobalIdString());
+                    logger.fine("\"un-deleting\" an existing OAI Record for " + dataset.getGlobalId().asString());
                     record.setRemoved(false);
                     record.setLastUpdateTime(new Date());
                 } else if (dataset.getLastExportTime().after(record.getLastUpdateTime())) {
@@ -205,13 +207,31 @@ public void updateOaiRecordsForDataset(Dataset dataset) {
             logger.fine("Null returned - no records found.");
         }
     }
+*/
     
-    public void markOaiRecordsAsRemoved(Collection<OAIRecord> records, Date updateTime, Logger setUpdateLogger) {
+    public void markOaiRecordsAsRemoved(Collection<OAIRecord> records, Date updateTime, boolean confirmed, Logger setUpdateLogger) {
         for (OAIRecord oaiRecord : records) {
             if ( !oaiRecord.isRemoved() ) {
-                setUpdateLogger.fine("marking OAI record "+oaiRecord.getGlobalId()+" as removed");
-                oaiRecord.setRemoved(true);
-                oaiRecord.setLastUpdateTime(updateTime);
+                boolean confirmedRemoved = confirmed; 
+                if (!confirmedRemoved) {
+                    Dataset lookedUp = datasetService.findByGlobalId(oaiRecord.getGlobalId());
+                    if (lookedUp == null) {
+                        confirmedRemoved = true;
+                    } else if (lookedUp.getLastExportTime() == null) {
+                        confirmedRemoved = true; 
+                    } else {                   
+                        boolean isReleased = lookedUp.getReleasedVersion() != null;
+                        if (!isReleased) {
+                            confirmedRemoved = true;
+                        }
+                    }
+                }
+                
+                if (confirmedRemoved) {
+                    setUpdateLogger.fine("marking OAI record "+oaiRecord.getGlobalId()+" as removed");
+                    oaiRecord.setRemoved(true);
+                    oaiRecord.setLastUpdateTime(updateTime);
+                } 
             } else {
                 setUpdateLogger.fine("OAI record "+oaiRecord.getGlobalId()+" is already marked as removed.");
             }
@@ -229,10 +249,10 @@ public void markOaiRecordsAsRemoved(Collection<OAIRecord> records, Date updateTi
     
     public void exportAllFormats(Dataset dataset) {
         try {
-            ExportService exportServiceInstance = ExportService.getInstance(settingsService);
+            ExportService exportServiceInstance = ExportService.getInstance();
             logger.log(Level.FINE, "Attempting to run export on dataset {0}", dataset.getGlobalId());
             exportServiceInstance.exportAllFormats(dataset);
-            datasetService.updateLastExportTimeStamp(dataset.getId());
+            dataset = datasetService.merge(dataset);
         } catch (ExportException ee) {logger.fine("Caught export exception while trying to export. (ignoring)");}
         catch (Exception e) {logger.fine("Caught unknown exception while trying to export (ignoring)");}
     }
@@ -240,11 +260,11 @@ public void exportAllFormats(Dataset dataset) {
     @TransactionAttribute(REQUIRES_NEW)
     public void exportAllFormatsInNewTransaction(Dataset dataset) throws ExportException {
         try {
-            ExportService exportServiceInstance = ExportService.getInstance(settingsService);
+            ExportService exportServiceInstance = ExportService.getInstance();
             exportServiceInstance.exportAllFormats(dataset);
-            datasetService.updateLastExportTimeStamp(dataset.getId());
+            dataset = datasetService.merge(dataset);
         } catch (Exception e) {
-            logger.fine("Caught unknown exception while trying to export");
+            logger.log(Level.FINE, "Caught unknown exception while trying to export", e);
             throw new ExportException(e.getMessage());
         }
     }
@@ -264,7 +284,7 @@ public OAIRecord findOAIRecordBySetNameandGlobalId(String setName, String global
         
         try {
            oaiRecord = (OAIRecord) query.setMaxResults(1).getSingleResult();
-        } catch (javax.persistence.NoResultException e) {
+        } catch (jakarta.persistence.NoResultException e) {
            // Do nothing, just return null. 
         }
         logger.fine("returning oai record.");
@@ -286,15 +306,15 @@ public List<OAIRecord> findOaiRecordsBySetName(String setName) {
         return findOaiRecordsBySetName(setName, null, null);
     }    
     
-    public List<OAIRecord> findOaiRecordsBySetName(String setName, Date from, Date until) {
+    public List<OAIRecord> findOaiRecordsBySetName(String setName, Instant from, Instant until) {
         return findOaiRecordsBySetName(setName, from, until, false);
     }
     
-    public List<OAIRecord> findOaiRecordsNotInThisSet(String setName, Date from, Date until) {
+    public List<OAIRecord> findOaiRecordsNotInThisSet(String setName, Instant from, Instant until) {
         return findOaiRecordsBySetName(setName, from, until, true);
     }
     
-    public List<OAIRecord> findOaiRecordsBySetName(String setName, Date from, Date until, boolean excludeSet) {
+    public List<OAIRecord> findOaiRecordsBySetName(String setName, Instant from, Instant until, boolean excludeSet) {
                 
         if (setName == null) {
             setName = "";
@@ -314,35 +334,18 @@ public List<OAIRecord> findOaiRecordsBySetName(String setName, Date from, Date u
         logger.fine("Query: "+queryString);
         
         TypedQuery<OAIRecord> query = em.createQuery(queryString, OAIRecord.class);
-        if (setName != null) { query.setParameter("setName",setName); }
-        if (from != null) { query.setParameter("from",from,TemporalType.TIMESTAMP); }
-        // In order to achieve inclusivity on the "until" matching, we need to do 
-        // the following (if the "until" parameter is supplied):
-        // 1) if the supplied "until" parameter has the time portion (and is not just
-        // a date), we'll increment it by one second. This is because the time stamps we 
-        // keep in the database also have fractional thousands of a second. 
-        // So, a record may be shown as "T17:35:45", but in the database it is 
-        // actually "17:35:45.356", so "<= 17:35:45" isn't going to work on this 
-        // time stamp! - So we want to try "<= 17:35:45" instead. 
-        // 2) if it's just a date, we'll increment it by a *full day*. Otherwise
-        // our database time stamp of 2016-10-23T17:35:45.123Z is NOT going to 
-        // match " <= 2016-10-23" - which is really going to be interpreted as 
-        // "2016-10-23T00:00:00.000". 
-        // -- L.A. 4.6
+        if (setName != null) { 
+            query.setParameter("setName",setName); 
+        }
+        // TODO: review and phase out the use of java.util.Date throughout this service.
+        
+        if (from != null) { 
+            query.setParameter("from",Date.from(from),TemporalType.TIMESTAMP); 
+        }
         
         if (until != null) { 
-            // 24 * 3600 * 1000 = number of milliseconds in a day. 
-            
-            if (until.getTime() % (24 * 3600 * 1000) == 0) {
-                // The supplied "until" parameter is a date, with no time
-                // portion. 
-                logger.fine("plain date. incrementing by one day");
-                until.setTime(until.getTime()+(24 * 3600 * 1000));
-            } else {
-                logger.fine("date and time. incrementing by one second");
-                until.setTime(until.getTime()+1000);
-            }
-            query.setParameter("until",until,TemporalType.TIMESTAMP); 
+            Date untilDate = Date.from(until);
+            query.setParameter("until",untilDate,TemporalType.TIMESTAMP); 
         }
                 
         try {
@@ -391,4 +394,16 @@ public List<OAIRecord> findDeletedOaiRecordsBySetName(String setName) {
         }
     }
     
+    public Instant getEarliestDate() {
+        String queryString = "SELECT min(r.lastUpdateTime) FROM OAIRecord r";
+        TypedQuery<Date> query = em.createQuery(queryString, Date.class);
+        Date retDate = query.getSingleResult();
+        if (retDate != null) {
+            return retDate.toInstant();
+        }
+        
+        // if there are no records yet, return the default "now"
+        return new Date().toInstant();
+    }
+    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISet.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISet.java
index 038bb66de32..8d6b04effef 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISet.java
@@ -20,16 +20,16 @@
 package edu.harvard.iq.dataverse.harvest.server;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Version;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Version;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISetServiceBean.java
index f300f02f70c..242187db7f1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISetServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISetServiceBean.java
@@ -17,19 +17,18 @@
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.Asynchronous;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.apache.solr.client.solrj.SolrClient;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.apache.solr.client.solrj.impl.HttpSolrClient.RemoteSolrException;
+import org.apache.solr.client.solrj.impl.BaseHttpSolrClient.RemoteSolrException;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
@@ -67,7 +66,7 @@ public OAISet find(Object pk) {
         return em.find(OAISet.class, pk);
     }
     
-    public boolean specExists(String spec) {
+    public boolean setExists(String spec) {
         boolean specExists = false;
         OAISet set = findBySpec(spec);
         
@@ -123,6 +122,25 @@ public List<OAISet> findAllNamedSets() {
         }
     }
     
+    /**
+     * "Active" sets are the ones that have been successfully exported, and contain
+     * a non-zero number of records. (Although a set that contains a number of 
+     * records that are all marked as "deleted" is still an active set!)
+     * @return list of OAISets
+     */
+    public List<OAISet> findAllActiveNamedSets() {
+        String jpaQueryString = "select object(o) "
+                + "from OAISet as o, OAIRecord as r "
+                + "where r.setName = o.spec "
+                + "and o.spec != '' "
+                + "group by o order by o.spec";
+        
+        Query query = em.createQuery(jpaQueryString);
+        List<OAISet> queryResults = query.getResultList();
+        
+        return queryResults;
+    }
+    
     @Asynchronous
     public void remove(Long setId) {
         OAISet oaiSet = find(setId);
@@ -153,6 +171,8 @@ public void exportOaiSet(OAISet oaiSet, Logger exportLogger) {
         String query = managedSet.getDefinition();
 
         List<Long> datasetIds;
+        boolean databaseLookup = false; // As opposed to a search engine lookup
+        
         try {
             if (!oaiSet.isDefaultSet()) {
                 datasetIds = expandSetQuery(query);
@@ -163,6 +183,7 @@ public void exportOaiSet(OAISet oaiSet, Logger exportLogger) {
                 // including the unpublished drafts and deaccessioned ones.
                 // Those will be filtered out further down the line. 
                 datasetIds = datasetService.findAllLocalDatasetIds();
+                databaseLookup = true; 
             }
         } catch (OaiSetException ose) {
             datasetIds = null;
@@ -173,7 +194,7 @@ public void exportOaiSet(OAISet oaiSet, Logger exportLogger) {
         // they will be properly marked as "deleted"! -- L.A. 4.5
         //if (datasetIds != null && !datasetIds.isEmpty()) {
         exportLogger.info("Calling OAI Record Service to re-export " + datasetIds.size() + " datasets.");
-        oaiRecordService.updateOaiRecords(managedSet.getSpec(), datasetIds, new Date(), true, exportLogger);
+        oaiRecordService.updateOaiRecords(managedSet.getSpec(), datasetIds, new Date(), true, databaseLookup, exportLogger);
         //}
         managedSet.setUpdateInProgress(false);
 
@@ -182,7 +203,7 @@ public void exportOaiSet(OAISet oaiSet, Logger exportLogger) {
     public void exportAllSets() {
         String logTimestamp = logFormatter.format(new Date());
         Logger exportLogger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.client.OAISetServiceBean." + "UpdateAllSets." + logTimestamp);
-        String logFileName = "../logs" + File.separator + "oaiSetsUpdate_" + logTimestamp + ".log";
+        String logFileName = System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "oaiSetsUpdate_" + logTimestamp + ".log";
         FileHandler fileHandler = null;
         boolean fileHandlerSuceeded = false;
         try {
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/web/servlet/OAIServlet.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/web/servlet/OAIServlet.java
index 555e5a99634..f9047e3ee5f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/web/servlet/OAIServlet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/web/servlet/OAIServlet.java
@@ -5,66 +5,62 @@
  */
 package edu.harvard.iq.dataverse.harvest.server.web.servlet;
 
-import com.lyncode.xml.exceptions.XmlWriteException;
-import com.lyncode.xoai.dataprovider.builder.OAIRequestParametersBuilder;
-import com.lyncode.xoai.dataprovider.exceptions.OAIException;
-import com.lyncode.xoai.dataprovider.repository.Repository;
-import com.lyncode.xoai.dataprovider.repository.RepositoryConfiguration;
-import com.lyncode.xoai.dataprovider.model.Context;
-import com.lyncode.xoai.dataprovider.model.MetadataFormat;
-import com.lyncode.xoai.services.impl.SimpleResumptionTokenFormat;
-import com.lyncode.xoai.dataprovider.repository.ItemRepository;
-import com.lyncode.xoai.dataprovider.repository.SetRepository;
-import com.lyncode.xoai.model.oaipmh.DeletedRecord;
-import com.lyncode.xoai.model.oaipmh.Granularity;
-import com.lyncode.xoai.model.oaipmh.OAIPMH;
-import static com.lyncode.xoai.model.oaipmh.OAIPMH.NAMESPACE_URI;
-import static com.lyncode.xoai.model.oaipmh.OAIPMH.SCHEMA_LOCATION;
-import com.lyncode.xoai.model.oaipmh.Verb;
-import com.lyncode.xoai.xml.XSISchema;
-
-import com.lyncode.xoai.xml.XmlWriter;
-import static com.lyncode.xoai.xml.XmlWriter.defaultContext;
+import edu.harvard.iq.dataverse.MailServiceBean;
+import io.gdcc.xoai.dataprovider.DataProvider;
+import io.gdcc.xoai.dataprovider.repository.Repository;
+import io.gdcc.xoai.dataprovider.repository.RepositoryConfiguration;
+import io.gdcc.xoai.dataprovider.model.Context;
+import io.gdcc.xoai.dataprovider.model.MetadataFormat;
+import io.gdcc.xoai.dataprovider.request.RequestBuilder;
+import io.gdcc.xoai.dataprovider.request.RequestBuilder.RawRequest;
+import io.gdcc.xoai.dataprovider.repository.ItemRepository;
+import io.gdcc.xoai.dataprovider.repository.SetRepository;
+import io.gdcc.xoai.model.oaipmh.DeletedRecord;
+import io.gdcc.xoai.model.oaipmh.OAIPMH;
+
+import io.gdcc.xoai.xml.XmlWriter;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
-import edu.harvard.iq.dataverse.export.ExportException;
 import edu.harvard.iq.dataverse.export.ExportService;
-import edu.harvard.iq.dataverse.export.spi.Exporter;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
+import io.gdcc.spi.export.XMLExporter;
 import edu.harvard.iq.dataverse.harvest.server.OAIRecordServiceBean;
 import edu.harvard.iq.dataverse.harvest.server.OAISetServiceBean;
-import edu.harvard.iq.dataverse.harvest.server.xoai.XdataProvider;
-import edu.harvard.iq.dataverse.harvest.server.xoai.XgetRecord;
-import edu.harvard.iq.dataverse.harvest.server.xoai.XitemRepository;
-import edu.harvard.iq.dataverse.harvest.server.xoai.XsetRepository;
-import edu.harvard.iq.dataverse.harvest.server.xoai.XlistRecords;
+import edu.harvard.iq.dataverse.harvest.server.xoai.DataverseXoaiItemRepository;
+import edu.harvard.iq.dataverse.harvest.server.xoai.DataverseXoaiSetRepository;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.MailUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
-import org.apache.commons.lang.StringUtils;
+import io.gdcc.xoai.exceptions.BadVerbException;
+import io.gdcc.xoai.exceptions.OAIException;
+import io.gdcc.xoai.model.oaipmh.Granularity;
+import io.gdcc.xoai.services.impl.SimpleResumptionTokenFormat;
+import org.apache.commons.lang3.StringUtils;
 
-import java.io.ByteArrayOutputStream;
 
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.Date;
-import java.util.HashMap;
+import java.util.Optional;
 import java.util.logging.Logger;
-import java.util.zip.DeflaterOutputStream;
-import java.util.zip.GZIPOutputStream;
-import javax.ejb.EJB;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ejb.EJB;
+import jakarta.inject.Inject;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
 import javax.xml.stream.XMLStreamException;
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
 
 /**
  *
  * @author Leonid Andreev
  * Dedicated servlet for handling OAI-PMH requests.
- * Uses lyncode XOAI data provider implementation for serving content. 
+ * Uses lyncode/Dspace/gdcc XOAI data provider implementation for serving content. 
  * The servlet itself is somewhat influenced by the older OCLC OAIcat implementation.
  */
 public class OAIServlet extends HttpServlet {
@@ -73,31 +69,56 @@ public class OAIServlet extends HttpServlet {
     @EJB
     OAIRecordServiceBean recordService;
     @EJB
-    SettingsServiceBean settingsService;
-    @EJB
     DataverseServiceBean dataverseService;
     @EJB
     DatasetServiceBean datasetService;
     
     @EJB
     SystemConfig systemConfig;
+    @EJB
+    MailServiceBean mailServiceBean;
+
+    @Inject
+    @ConfigProperty(name = "dataverse.oai.server.maxidentifiers", defaultValue="100")
+    private Integer maxListIdentifiers;
+    
+    @Inject
+    @ConfigProperty(name = "dataverse.oai.server.maxsets", defaultValue="100")
+    private Integer maxListSets;
+    
+    @Inject
+    @ConfigProperty(name = "dataverse.oai.server.maxrecords", defaultValue="10")
+    private Integer maxListRecords;
     
     private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.server.web.servlet.OAIServlet");
-    protected HashMap attributesMap = new HashMap();
-    private static final String OAI_PMH = "OAI-PMH";
-    private static final String RESPONSEDATE_FIELD = "responseDate";
-    private static final String REQUEST_FIELD = "request";
+    // If we are going to stick with this solution - of providing a minimalist 
+    // xml record containing a link to the proprietary json metadata API for 
+    // "dataverse json harvesting", we'll probably want to create minimalistic,  
+    // but valid schemas for this format as well. 
+    // UPDATE: we are keeping this hack on the server side purely for backward 
+    // compatibility with older (pre v6) Dataverses who may still be using the 
+    // format. Once v6 has been around for a while, we will get rid of it completely. 
+    // Starting this version, harvesting clients will not be making GetRecord 
+    // calls at all when using harvesting dataverse_json; instead they will only 
+    // be calling ListIdentifiers, and then making direct calls to the export 
+    // API of the remote Dataverse, to obtain the records in native json. This 
+    // is how we should have implemented this in the first place, really. 
+    /*
+    SEK
+     per #3621 we are adding urls to the namespace and schema
+     These will not resolve presently. the change is so that the
+     xml produced by  https://demo.dataverse.org/oai?verb=ListMetadataFormats will validate
+    */
     private static final String DATAVERSE_EXTENDED_METADATA_FORMAT = "dataverse_json";
-    private static final String DATAVERSE_EXTENDED_METADATA_INFO = "Custom Dataverse metadata in JSON format (Dataverse4 to Dataverse4 harvesting only)";
-    private static final String DATAVERSE_EXTENDED_METADATA_SCHEMA = "JSON schema pending";
-     
+    private static final String DATAVERSE_EXTENDED_METADATA_NAMESPACE = "https://dataverse.org/schema/core";
+    private static final String DATAVERSE_EXTENDED_METADATA_SCHEMA = "https://dataverse.org/schema/core.xsd";     
     
     private Context xoaiContext;
     private SetRepository setRepository;
     private ItemRepository itemRepository;
     private RepositoryConfiguration repositoryConfiguration;
     private Repository xoaiRepository;
-    private XdataProvider dataProvider; 
+    private DataProvider dataProvider;
 
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
@@ -108,18 +129,16 @@ public void init(ServletConfig config) throws ServletException {
             xoaiContext = addDataverseJsonMetadataFormat(xoaiContext);
         }
         
-        setRepository = new XsetRepository(setService);
-        itemRepository = new XitemRepository(recordService, datasetService);
+        setRepository = new DataverseXoaiSetRepository(setService);
+        itemRepository = new DataverseXoaiItemRepository(recordService, datasetService, SystemConfig.getDataverseSiteUrlStatic());
 
         repositoryConfiguration = createRepositoryConfiguration(); 
-                        
-        xoaiRepository = new Repository()
+                                
+        xoaiRepository = new Repository(repositoryConfiguration)
             .withSetRepository(setRepository)
-            .withItemRepository(itemRepository)
-            .withResumptionTokenFormatter(new SimpleResumptionTokenFormat())
-            .withConfiguration(repositoryConfiguration);
+            .withItemRepository(itemRepository);
         
-        dataProvider = new XdataProvider(getXoaiContext(), getXoaiRepository());
+        dataProvider = new DataProvider(getXoaiContext(), getXoaiRepository());
     }
     
     private Context createContext() {
@@ -130,37 +149,32 @@ private Context createContext() {
     }
     
     private void addSupportedMetadataFormats(Context context) {
-        for (String[] provider : ExportService.getInstance(settingsService).getExportersLabels()) {
+        for (String[] provider : ExportService.getInstance().getExportersLabels()) {
             String formatName = provider[1];
             Exporter exporter;
             try {
-                exporter = ExportService.getInstance(settingsService).getExporter(formatName);
+                exporter = ExportService.getInstance().getExporter(formatName);
             } catch (ExportException ex) {
                 exporter = null;
             }
 
-            if (exporter != null && exporter.isXMLFormat() && exporter.isHarvestable()) {
+            if (exporter != null && (exporter instanceof XMLExporter) && exporter.isHarvestable()) {
                 MetadataFormat metadataFormat;
 
-                try {
+                metadataFormat = MetadataFormat.metadataFormat(formatName);
+                metadataFormat.withNamespace(((XMLExporter) exporter).getXMLNameSpace());
+                metadataFormat.withSchemaLocation(((XMLExporter) exporter).getXMLSchemaLocation());
 
-                    metadataFormat = MetadataFormat.metadataFormat(formatName);
-                    metadataFormat.withNamespace(exporter.getXMLNameSpace());
-                    metadataFormat.withSchemaLocation(exporter.getXMLSchemaLocation());
-                } catch (ExportException ex) {
-                    metadataFormat = null;
-                }
                 if (metadataFormat != null) {
                     context.withMetadataFormat(metadataFormat);
                 }
             }
         }
-        //return context;
     }
     
     private Context addDataverseJsonMetadataFormat(Context context) {
         MetadataFormat metadataFormat = MetadataFormat.metadataFormat(DATAVERSE_EXTENDED_METADATA_FORMAT);
-        metadataFormat.withNamespace(DATAVERSE_EXTENDED_METADATA_INFO);
+        metadataFormat.withNamespace(DATAVERSE_EXTENDED_METADATA_NAMESPACE);
         metadataFormat.withSchemaLocation(DATAVERSE_EXTENDED_METADATA_SCHEMA);
         context.withMetadataFormat(metadataFormat);
         return context;
@@ -171,28 +185,43 @@ private boolean isDataverseOaiExtensionsSupported() {
     }
     
     private RepositoryConfiguration createRepositoryConfiguration() {
-        // TODO: 
-        // some of the settings below - such as the max list numbers - 
-        // need to be configurable!
+        Config config = ConfigProvider.getConfig();
+        String repositoryName = config.getOptionalValue("dataverse.oai.server.repositoryname", String.class).orElse("");
         
-        String dataverseName = dataverseService.findRootDataverse().getName();
-        String repositoryName = StringUtils.isEmpty(dataverseName) || "Root".equals(dataverseName) ? "Test Dataverse OAI Archive" : dataverseName + " Dataverse OAI Archive";
+        if (repositoryName == null || repositoryName.isEmpty()) {
+            String dataverseName = dataverseService.getRootDataverseName();
+            repositoryName = StringUtils.isEmpty(dataverseName) || "Root".equals(dataverseName) ? "Test Dataverse OAI Archive" : dataverseName + " Dataverse OAI Archive";
+        }
+        // The admin email address associated with this installation: 
+        // (Note: if the setting does not exist, we are going to assume that they
+        // have a reason not to want to configure their email address, if it is
+        // a developer's instance, for example; or a reason not to want to 
+        // advertise it to the world.)
+        String systemEmailLabel = "donotreply@localhost";
+        // TODO: should we expose the support team's address if configured?
+        Optional<InternetAddress> systemAddress = mailServiceBean.getSystemAddress();
+        if (systemAddress.isPresent()) {
+            systemEmailLabel = systemAddress.get().getAddress();
+        }
         
-
-        RepositoryConfiguration repositoryConfiguration = new RepositoryConfiguration()
+        RepositoryConfiguration configuration = new RepositoryConfiguration.RepositoryConfigurationBuilder()
+                .withAdminEmail(systemEmailLabel)
+                .withCompression("gzip")
+                .withCompression("deflate")
+                .withGranularity(Granularity.Lenient)
+                .withResumptionTokenFormat(new SimpleResumptionTokenFormat().withGranularity(Granularity.Second))
                 .withRepositoryName(repositoryName)
                 .withBaseUrl(systemConfig.getDataverseSiteUrl()+"/oai")
-                .withCompression("gzip")        // ?
-                .withCompression("deflate")     // ?
-                .withAdminEmail(settingsService.getValueForKey(SettingsServiceBean.Key.SystemEmail))
+                .withEarliestDate(recordService.getEarliestDate())
+                .withMaxListIdentifiers(maxListIdentifiers)
+                .withMaxListSets(maxListSets)
+                .withMaxListRecords(maxListRecords)
                 .withDeleteMethod(DeletedRecord.TRANSIENT)
-                .withGranularity(Granularity.Second)
-                .withMaxListIdentifiers(100)
-                .withMaxListRecords(100)
-                .withMaxListSets(100)
-                .withEarliestDate(new Date());
+                .withEnableMetadataAttributes(true)
+                .withRequireFromAfterEarliest(false)
+                .build();        
         
-        return repositoryConfiguration; 
+        return configuration; 
     }
     
     /**
@@ -223,9 +252,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         processRequest(request, response);
     }
-     
+          
     
-    private void processRequest(HttpServletRequest request, HttpServletResponse response)
+    private void processRequest(HttpServletRequest httpServletRequest, HttpServletResponse response)
             throws ServletException, IOException {
         
         try {
@@ -235,150 +264,28 @@ private void processRequest(HttpServletRequest request, HttpServletResponse resp
                         "Sorry. OAI Service is disabled on this Dataverse node.");
                 return;
             }
-            
-            OAIRequestParametersBuilder parametersBuilder = newXoaiRequest();
-            
-            for (Object p : request.getParameterMap().keySet()) {
-                String parameterName = (String)p; 
-                String parameterValue = request.getParameter(parameterName);
-                parametersBuilder = parametersBuilder.with(parameterName, parameterValue);
 
+            Map<String, String[]> params = httpServletRequest.getParameterMap();
+            OAIPMH handle;
+            try {
+                RawRequest rawRequest = RequestBuilder.buildRawRequest(params);
+                handle = dataProvider.handle(rawRequest);
+            } catch (BadVerbException bve) {
+                handle = dataProvider.handle(params);
             }
-            
-            OAIPMH handle = dataProvider.handle(parametersBuilder);
+
             response.setContentType("text/xml;charset=UTF-8");
-            
-            if (isGetRecord(request) && !handle.hasErrors()) {
-                writeGetRecord(response, handle);
-            } else if (isListRecords(request) && !handle.hasErrors()) {
-                writeListRecords(response, handle);
-            } else {
-                XmlWriter xmlWriter = new XmlWriter(response.getOutputStream());
+
+            try (XmlWriter xmlWriter = new XmlWriter(response.getOutputStream(), repositoryConfiguration);) {
                 xmlWriter.write(handle);
-                xmlWriter.flush();
-                xmlWriter.close();
             }
                        
-        } catch (IOException ex) {
-            logger.warning("IO exception in Get; "+ex.getMessage());
-            throw new ServletException ("IO Exception in Get", ex);
-        } catch (OAIException oex) {
-            logger.warning("OAI exception in Get; "+oex.getMessage());
-            throw new ServletException ("OAI Exception in Get", oex);
-        } catch (XMLStreamException xse) {
-            logger.warning("XML Stream exception in Get; "+xse.getMessage());
-            throw new ServletException ("XML Stream Exception in Get", xse);
-        } catch (XmlWriteException xwe) {
-            logger.warning("XML Write exception in Get; "+xwe.getMessage());
-            throw new ServletException ("XML Write Exception in Get", xwe);  
-        } catch (Exception e) {
-            logger.warning("Unknown exception in Get; "+e.getMessage());
-            throw new ServletException ("Unknown servlet exception in Get.", e);
-        }
-        
-    }
-    
-    // Custom methods for the potentially expensive GetRecord and ListRecords requests:
-    
-    private void writeListRecords(HttpServletResponse response, OAIPMH handle) throws IOException {
-        OutputStream outputStream = response.getOutputStream();
-
-        outputStream.write(oaiPmhResponseToString(handle).getBytes());
-
-        Verb verb = handle.getVerb();
-
-        if (verb == null) {
-            throw new IOException("An error or a valid response must be set");
-        }
-
-        if (!verb.getType().equals(Verb.Type.ListRecords)) {
-            throw new IOException("writeListRecords() called on a non-ListRecords verb");
-        }
-
-        outputStream.write(("<" + verb.getType().displayName() + ">").getBytes());
-
-        outputStream.flush();
-
-        ((XlistRecords) verb).writeToStream(outputStream);
-
-        outputStream.write(("</" + verb.getType().displayName() + ">").getBytes());
-        outputStream.write(("</" + OAI_PMH + ">\n").getBytes());
-
-        outputStream.flush();
-        outputStream.close();
-
-    }
-    
-    private void writeGetRecord(HttpServletResponse response, OAIPMH handle) throws IOException, XmlWriteException, XMLStreamException {
-        OutputStream outputStream = response.getOutputStream();
-
-        outputStream.write(oaiPmhResponseToString(handle).getBytes());
-
-        Verb verb = handle.getVerb();
-
-        if (verb == null) {
-            throw new IOException("An error or a valid response must be set");
-        }
-
-        if (!verb.getType().equals(Verb.Type.GetRecord)) {
-            throw new IOException("writeListRecords() called on a non-GetRecord verb");
+        } catch (XMLStreamException | OAIException e) {
+            throw new ServletException (e);
         }
-
-        outputStream.write(("<" + verb.getType().displayName() + ">").getBytes());
-
-        outputStream.flush();
-
-        ((XgetRecord) verb).writeToStream(outputStream);
-
-        outputStream.write(("</" + verb.getType().displayName() + ">").getBytes());
-        outputStream.write(("</" + OAI_PMH + ">\n").getBytes());
-
-        outputStream.flush();
-        outputStream.close();
-
-     }
-    
-    // This function produces the string representation of the top level,
-    // "service" record of an OAIPMH response (i.e., the header that precedes
-    // the actual "payload" record, such as <GetRecord>, <ListIdentifiers>, 
-    // <ListRecords>, etc.
-    
-    private String oaiPmhResponseToString(OAIPMH handle) {
-        try {
-            ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
-            XmlWriter writer = new XmlWriter(byteOutputStream, defaultContext());
-
-            writer.writeStartElement(OAI_PMH);
-            writer.writeDefaultNamespace(NAMESPACE_URI); 
-            writer.writeNamespace(XSISchema.PREFIX, XSISchema.NAMESPACE_URI);
-            writer.writeAttribute(XSISchema.PREFIX, XSISchema.NAMESPACE_URI, "schemaLocation",
-                    NAMESPACE_URI + " " + SCHEMA_LOCATION);
-
-            writer.writeElement(RESPONSEDATE_FIELD, handle.getResponseDate(), Granularity.Second);
-            writer.writeElement(REQUEST_FIELD, handle.getRequest());
-            writer.writeEndElement();
-            writer.flush();
-            writer.close();
-
-            String ret = byteOutputStream.toString().replaceFirst("</"+OAI_PMH+">", "");
-
-            return ret;
-        } catch (Exception ex) {
-            logger.warning("caught exception trying to convert an OAIPMH response header to string: " + ex.getMessage());
-            ex.printStackTrace();
-            return null;
-        }
-    }
-    
-    private boolean isGetRecord(HttpServletRequest request) {
-        return "GetRecord".equals(request.getParameter("verb"));
         
     }
     
-    private boolean isListRecords(HttpServletRequest request) {
-        return "ListRecords".equals(request.getParameter("verb"));
-    }
-
     protected Context getXoaiContext () {
         return xoaiContext;
     }
@@ -387,11 +294,6 @@ protected Repository getXoaiRepository() {
         return xoaiRepository;
     }
     
-    protected OAIRequestParametersBuilder newXoaiRequest() {
-        return new OAIRequestParametersBuilder();
-    }
-    
-    
     public boolean isHarvestingServerEnabled() {
         return systemConfig.isOAIServerEnabled();
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/DataverseXoaiItem.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/DataverseXoaiItem.java
new file mode 100644
index 00000000000..ecfd2f82369
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/DataverseXoaiItem.java
@@ -0,0 +1,89 @@
+package edu.harvard.iq.dataverse.harvest.server.xoai;
+
+import io.gdcc.xoai.dataprovider.model.Item;
+import io.gdcc.xoai.dataprovider.model.Set;
+import io.gdcc.xoai.model.oaipmh.results.record.Metadata;
+import io.gdcc.xoai.model.oaipmh.results.record.About;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.harvest.server.OAIRecord;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ *
+ * @author Leonid Andreev
+ * 
+ * This is an implemention of a Lyncode/DSpace/gdcc XOAI Item.
+ * You can think of it as an XOAI Item wrapper around the
+ * Dataverse OAIRecord entity.
+ */
+public final class DataverseXoaiItem implements Item {
+    
+    public DataverseXoaiItem(OAIRecord oaiRecord) {
+        super();
+        this.oaiRecord = oaiRecord;
+        oaisets = new ArrayList<>();
+        if (!StringUtil.isEmpty(oaiRecord.getSetName())) {
+            oaisets.add(new Set(oaiRecord.getSetName()));
+        }
+    }
+   
+    private OAIRecord oaiRecord;
+    
+    public OAIRecord getOaiRecord() {
+        return oaiRecord;
+    }
+    
+    public void setOaiRecord(OAIRecord oaiRecord) {
+        this.oaiRecord = oaiRecord;
+    }
+
+    private Dataset dataset; 
+    
+    public Dataset getDataset() {
+        return dataset;
+    }
+    
+    public DataverseXoaiItem withDataset(Dataset dataset) {
+        this.dataset = dataset; 
+        return this; 
+    }
+    
+    private Metadata metadata;
+    
+    @Override
+    public Metadata getMetadata() {
+        return metadata;
+    }
+    
+    public DataverseXoaiItem withMetadata(Metadata metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
+    @Override
+    public String getIdentifier() {
+        return oaiRecord.getGlobalId();
+    }
+
+    @Override
+    public Instant getDatestamp() {
+        return oaiRecord.getLastUpdateTime().toInstant();
+    }
+    
+    private  List<Set> oaisets;
+
+    @Override
+    public List<Set> getSets() {
+        
+        return oaisets;
+    }
+
+    @Override
+    public boolean isDeleted() {
+        return oaiRecord.isRemoved();
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/DataverseXoaiItemRepository.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/DataverseXoaiItemRepository.java
new file mode 100644
index 00000000000..93679c7812b
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/DataverseXoaiItemRepository.java
@@ -0,0 +1,270 @@
+package edu.harvard.iq.dataverse.harvest.server.xoai;
+
+import io.gdcc.xoai.dataprovider.exceptions.handler.IdDoesNotExistException;
+import io.gdcc.xoai.dataprovider.filter.ScopedFilter;
+import io.gdcc.xoai.dataprovider.model.Item;
+import io.gdcc.xoai.dataprovider.model.ItemIdentifier;
+import io.gdcc.xoai.dataprovider.model.Set;
+import io.gdcc.xoai.dataprovider.model.MetadataFormat;
+import io.gdcc.xoai.dataprovider.repository.ItemRepository;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.export.ExportService;
+import io.gdcc.spi.export.ExportException;
+import edu.harvard.iq.dataverse.harvest.server.OAIRecord;
+import edu.harvard.iq.dataverse.harvest.server.OAIRecordServiceBean;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import io.gdcc.xoai.dataprovider.exceptions.handler.HandlerException;
+import io.gdcc.xoai.dataprovider.exceptions.handler.NoMetadataFormatsException;
+import io.gdcc.xoai.dataprovider.repository.ResultsPage;
+import io.gdcc.xoai.model.oaipmh.ResumptionToken;
+import io.gdcc.xoai.model.oaipmh.results.record.Metadata;
+import io.gdcc.xoai.xml.EchoElement;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.time.Instant;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author Leonid Andreev
+ * Implements an XOAI "Item Repository". Retrieves Dataverse "OAIRecords" 
+ * representing harvestable local datasets and translates them into 
+ * XOAI "items". 
+ */
+
+public class DataverseXoaiItemRepository implements ItemRepository {
+    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.server.xoai.DataverseXoaiItemRepository");
+    
+    private final OAIRecordServiceBean recordService;
+    private final DatasetServiceBean datasetService;
+    private final String serverUrl; 
+
+    public DataverseXoaiItemRepository (OAIRecordServiceBean recordService, DatasetServiceBean datasetService, String serverUrl) {
+        this.recordService = recordService;
+        this.datasetService = datasetService;
+        this.serverUrl = serverUrl; 
+    }
+    
+    @Override
+    public ItemIdentifier getItemIdentifier(String identifier) throws IdDoesNotExistException {
+        // This method is called when ListMetadataFormats request specifies 
+        // the identifier, requesting the formats available for this specific record.
+        // In our case, under the current implementation, we need to simply look 
+        // up if the record exists; if it does, all the OAI formats that we serve
+        // should be available for this record. 
+        
+        List<OAIRecord> oaiRecords = recordService.findOaiRecordsByGlobalId(identifier);
+        if (oaiRecords != null && !oaiRecords.isEmpty()) {
+            for (OAIRecord oaiRecord : oaiRecords) {
+                // We can return the first *active* record we find for this identifier. 
+                if (!oaiRecord.isRemoved()) {
+                    return new DataverseXoaiItem(oaiRecord);
+                }
+            }
+        }
+        
+        throw new IdDoesNotExistException();
+    }
+    
+    @Override
+    public Item getItem(String identifier, MetadataFormat metadataFormat) throws HandlerException {
+        logger.fine("getItem; calling findOaiRecordsByGlobalId, identifier " + identifier);
+        
+        if (metadataFormat == null) {
+            throw new NoMetadataFormatsException("Metadata Format is Required");
+        }
+        
+        List<OAIRecord> oaiRecords = recordService.findOaiRecordsByGlobalId(identifier);
+        if (oaiRecords != null && !oaiRecords.isEmpty()) {
+            DataverseXoaiItem xoaiItem = null; 
+            for (OAIRecord oaiRecord : oaiRecords) {
+                if (xoaiItem == null) {
+                    xoaiItem = new DataverseXoaiItem(oaiRecord); 
+                    xoaiItem = addMetadata(xoaiItem, metadataFormat);
+                } else {
+                    // Adding extra set specs to the XOAI Item, if this oaiRecord
+                    // is part of multiple sets:
+                    if (!StringUtil.isEmpty(oaiRecord.getSetName())) {
+                        xoaiItem.getSets().add(new Set(oaiRecord.getSetName()));
+                    }
+                }
+            }
+            if (xoaiItem != null) {
+                return xoaiItem;
+            }
+        }
+
+        throw new IdDoesNotExistException();
+    }
+
+    @Override
+    public ResultsPage<ItemIdentifier> getItemIdentifiers(List<ScopedFilter> filters, MetadataFormat metadataFormat, int maxResponseLength, ResumptionToken.Value resumptionToken) throws HandlerException {
+        
+        return (ResultsPage<ItemIdentifier>)getRepositoryRecords(metadataFormat, maxResponseLength, resumptionToken, false);
+
+    }
+ 
+    @Override
+    public ResultsPage<Item> getItems(List<ScopedFilter> filters, MetadataFormat metadataFormat, int maxResponseLength, ResumptionToken.Value resumptionToken) throws HandlerException {
+        
+        return (ResultsPage<Item>)getRepositoryRecords(metadataFormat, maxResponseLength, resumptionToken, true);
+    }
+    
+    private ResultsPage<? extends ItemIdentifier> getRepositoryRecords (
+            MetadataFormat metadataFormat, 
+            int maxResponseLength, 
+            ResumptionToken.Value resumptionToken,
+            boolean fullItems) throws HandlerException {
+                
+        int offset = Long.valueOf(resumptionToken.getOffset()).intValue();
+        String setSpec = resumptionToken.getSetSpec();
+        Instant from = resumptionToken.getFrom();
+        Instant until = resumptionToken.getUntil();
+        
+        boolean hasMore = false; 
+        
+        logger.fine("calling " + (fullItems ? "getItems" : "getItemIdentifiers")
+                + "; offset=" + offset
+                + ", length=" + maxResponseLength
+                + ", setSpec=" + setSpec
+                + ", from=" + from
+                + ", until=" + until);
+
+        List<OAIRecord> oaiRecords = recordService.findOaiRecordsBySetName(setSpec, from, until);
+        
+        List<DataverseXoaiItem> xoaiItems = new ArrayList<>();
+
+        if (oaiRecords != null && !oaiRecords.isEmpty()) {
+            logger.fine("total " + oaiRecords.size() + " records returned");
+            
+            for (int i = offset; i < offset + maxResponseLength && i < oaiRecords.size(); i++) {
+                OAIRecord record = oaiRecords.get(i);
+                DataverseXoaiItem xoaiItem = new DataverseXoaiItem(record);
+                
+                if (fullItems) {
+                    // If we are cooking "full" Items (for the ListRecords verb),
+                    // add the metadata to the item object (if not a deleted
+                    // record, if available, etc.):
+                    xoaiItem = addMetadata(xoaiItem, metadataFormat);
+                }
+                
+                xoaiItems.add(xoaiItem);
+            }
+            
+            // Run a second pass, looking for records in this set that occur
+            // in *other* sets. Then we'll add these multiple sets to the 
+            // formatted output in the header:
+            addExtraSets(xoaiItems, setSpec, from, until);
+            
+            hasMore = offset + maxResponseLength < oaiRecords.size();
+            
+            ResultsPage<DataverseXoaiItem> result = new ResultsPage(resumptionToken, hasMore, xoaiItems, oaiRecords.size());
+            logger.fine("returning result with " + xoaiItems.size() + " items.");
+            return result;
+        }
+
+        return new ResultsPage(resumptionToken, false, xoaiItems, 0);
+    }
+    
+    private void addExtraSets(Object xoaiItemsList, String setSpec, Instant from, Instant until) {
+        
+        List<DataverseXoaiItem> xoaiItems = (List<DataverseXoaiItem>)xoaiItemsList;
+        
+        List<OAIRecord> oaiRecords = recordService.findOaiRecordsNotInThisSet(setSpec, from, until);
+        
+        if (oaiRecords == null || oaiRecords.isEmpty()) {
+            return;
+        }
+                
+        // Make a second pass through the list of xoaiItems already found for this set, 
+        // and add any other sets in which this item occurs:
+        
+        int j = 0;
+        for (int i = 0; i < xoaiItems.size(); i++) {
+            // fast-forward the second list, until we find a oaiRecord with this identifier, 
+            // or until we are past this oaiRecord (both lists are sorted alphabetically by
+            // the identifier:
+            DataverseXoaiItem xitem = xoaiItems.get(i);
+            
+            while (j < oaiRecords.size() && xitem.getIdentifier().compareTo(oaiRecords.get(j).getGlobalId()) > 0) {
+                j++;
+            }
+            
+            while (j < oaiRecords.size() && xitem.getIdentifier().equals(oaiRecords.get(j).getGlobalId())) {
+                xoaiItems.get(i).getSets().add(new Set(oaiRecords.get(j).getSetName()));
+                j++;
+            }
+        }
+    }
+    
+    private DataverseXoaiItem addMetadata(DataverseXoaiItem xoaiItem, MetadataFormat metadataFormat) {
+        // This may be a "deleted" record - i.e., a oaiRecord kept in 
+        // the OAI set for a dataset that's no longer in this Dataverse. 
+        // (it serves to tell the remote client to delete it from their 
+        // holdings too). 
+        // If this is the case here, there's nothing we need to do for this item.
+        // If not, if it's a live record, let's try to look up the dataset and 
+        // open the pre-generated metadata stream.
+
+        if (!xoaiItem.isDeleted()) {
+            Dataset dataset = datasetService.findByGlobalId(xoaiItem.getIdentifier());
+            if (dataset != null) {
+                try {
+                    Metadata metadata = getDatasetMetadata(dataset, metadataFormat.getPrefix());
+                    xoaiItem.withDataset(dataset).withMetadata(metadata);
+                } catch (IOException ex) {
+                    // This is not supposed to happen in normal operations; 
+                    // since by design only the datasets for which the metadata
+                    // records have been pre-generated ("exported") should be 
+                    // served as "OAI Record". But, things happen. If for one
+                    // reason or another that cached metadata file is no longer there, 
+                    // we are not going to serve any metadata for this oaiRecord, 
+                    // BUT we are going to include it marked as "deleted"
+                    // (because skipping it could potentially mess up the
+                    // counts and offsets, in a resumption token scenario.
+                    xoaiItem.getOaiRecord().setRemoved(true);
+                }
+            } else {
+                // If dataset (somehow) no longer exists (again, this is 
+                // not supposed to happen), we will serve the oaiRecord, 
+                // marked as "deleted" and without any metadata. 
+                // We can't just skip it, because that could mess up the
+                // counts and offsets, in a resumption token scenario.
+                xoaiItem.getOaiRecord().setRemoved(true);
+            }
+        }
+        return xoaiItem;
+    }
+    
+    private Metadata getDatasetMetadata(Dataset dataset, String metadataPrefix) throws ExportException, IOException {
+        Metadata metadata;
+
+        if ("dataverse_json".equals(metadataPrefix)) {
+            // Solely for backward compatibility, for older Dataverse harvesting clients
+            // that may still be relying on harvesting "dataverse_json";
+            // we will want to eventually get rid of this hack! 
+            // @Deprecated(since = "5.0")
+            metadata = new Metadata(
+                    new EchoElement("<dataverse_json>custom metadata</dataverse_json>"))
+                    .withAttribute("directApiCall", customDataverseJsonApiUri(dataset.getGlobalId().asString()));
+            
+        } else {
+            InputStream pregeneratedMetadataStream;
+            pregeneratedMetadataStream = ExportService.getInstance().getExport(dataset.getReleasedVersion(), metadataPrefix);
+
+            metadata = Metadata.copyFromStream(pregeneratedMetadataStream);
+        }
+        return metadata;
+    }
+    
+    private String customDataverseJsonApiUri(String identifier) {
+        String ret = serverUrl  
+                + "/api/datasets/export?exporter=dataverse_json&amp;persistentId="
+                + identifier;
+        
+        return ret;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/DataverseXoaiSetRepository.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/DataverseXoaiSetRepository.java
new file mode 100644
index 00000000000..1e713b08adb
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/DataverseXoaiSetRepository.java
@@ -0,0 +1,74 @@
+package edu.harvard.iq.dataverse.harvest.server.xoai;
+
+import io.gdcc.xoai.model.xoai.Element;
+import io.gdcc.xoai.dataprovider.repository.SetRepository;
+import io.gdcc.xoai.dataprovider.model.Set;
+import io.gdcc.xoai.model.xoai.XOAIMetadata;
+import edu.harvard.iq.dataverse.harvest.server.OAISet;
+import edu.harvard.iq.dataverse.harvest.server.OAISetServiceBean;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author Leonid Andreev
+ */
+public class DataverseXoaiSetRepository implements SetRepository {
+    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.server.xoai.DataverseXoaiSetRepository");
+    
+    private OAISetServiceBean setService;
+
+    public DataverseXoaiSetRepository (OAISetServiceBean setService) {
+        this.setService = setService;
+    }
+    
+    public OAISetServiceBean getSetService() {
+        return setService;
+    }
+    
+    public void setSetService(OAISetServiceBean setService) {
+        this.setService = setService;
+    }
+
+
+    @Override
+    public boolean supportSets() {
+        List<OAISet> dataverseOAISets = setService.findAllActiveNamedSets();
+        
+        if (dataverseOAISets == null || dataverseOAISets.isEmpty()) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public List<Set> getSets() { 
+        logger.fine("calling retrieveSets()");
+        List<OAISet> dataverseOAISets = setService.findAllActiveNamedSets();
+        List<Set> XOAISets = new ArrayList<Set>();
+        
+        if (dataverseOAISets != null) {
+            for (int i = 0; i < dataverseOAISets.size(); i++) {
+                OAISet dataverseSet = dataverseOAISets.get(i);
+                Set xoaiSet = new Set(dataverseSet.getSpec());
+                xoaiSet.withName(dataverseSet.getName());
+                XOAIMetadata xoaiMetadata = new XOAIMetadata();
+                Element element = new Element("description");
+                element.withField("description", dataverseSet.getDescription());
+                xoaiMetadata.getElements().add(element);
+                xoaiSet.withDescription(xoaiMetadata);
+                XOAISets.add(xoaiSet);
+            }
+        }
+        
+        return XOAISets;
+    }
+
+    @Override
+    public boolean exists(String setSpec) {
+        return setService.setExists(setSpec);
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XdataProvider.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XdataProvider.java
deleted file mode 100644
index 63b9fc1799f..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XdataProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-
-import com.lyncode.builder.Builder;
-import com.lyncode.xoai.dataprovider.exceptions.*;
-import com.lyncode.xoai.dataprovider.handlers.*;
-import com.lyncode.xoai.exceptions.InvalidResumptionTokenException;
-import com.lyncode.xoai.dataprovider.model.Context;
-import com.lyncode.xoai.model.oaipmh.OAIPMH;
-import com.lyncode.xoai.model.oaipmh.Request;
-import com.lyncode.xoai.dataprovider.parameters.OAICompiledRequest;
-import com.lyncode.xoai.dataprovider.parameters.OAIRequest;
-import com.lyncode.xoai.dataprovider.repository.Repository;
-import com.lyncode.xoai.services.api.DateProvider;
-import com.lyncode.xoai.services.impl.UTCDateProvider;
-import org.apache.log4j.Logger;
-
-import static com.lyncode.xoai.dataprovider.parameters.OAIRequest.Parameter.*;
-
-/**
- *
- * @author Leonid Andreev
- */
-public class XdataProvider {
-    private static Logger log = Logger.getLogger(XdataProvider.class);
-
-    public static XdataProvider dataProvider (Context context, Repository repository) {
-        return new XdataProvider(context, repository);
-    }
-
-    private Repository repository;
-    private DateProvider dateProvider;
-
-    private final IdentifyHandler identifyHandler;
-    private final XgetRecordHandler getRecordHandler;
-    private final ListSetsHandler listSetsHandler;
-    private final XlistRecordsHandler listRecordsHandler;
-    private final ListIdentifiersHandler listIdentifiersHandler;
-    private final ListMetadataFormatsHandler listMetadataFormatsHandler;
-    private final ErrorHandler errorsHandler;
-
-    public XdataProvider (Context context, Repository repository) {
-        this.repository = repository;
-        this.dateProvider = new UTCDateProvider();
-
-        this.identifyHandler = new IdentifyHandler(context, repository);
-        this.listSetsHandler = new ListSetsHandler(context, repository);
-        this.listMetadataFormatsHandler = new ListMetadataFormatsHandler(context, repository);
-        this.listRecordsHandler = new XlistRecordsHandler(context, repository);
-        this.listIdentifiersHandler = new ListIdentifiersHandler(context, repository);
-        //this.getRecordHandler = new GetRecordHandler(context, repository);
-        this.getRecordHandler = new XgetRecordHandler(context, repository);
-        this.errorsHandler = new ErrorHandler();
-    }
-
-    public OAIPMH handle (Builder<OAIRequest> builder) throws OAIException {
-        return handle(builder.build());
-    }
-
-    public OAIPMH handle (OAIRequest requestParameters) throws OAIException {
-        log.debug("Handling OAI request");
-        Request request = new Request(repository.getConfiguration().getBaseUrl())
-                .withVerbType(requestParameters.get(Verb))
-                .withResumptionToken(requestParameters.get(ResumptionToken))
-                .withIdentifier(requestParameters.get(Identifier))
-                .withMetadataPrefix(requestParameters.get(MetadataPrefix))
-                .withSet(requestParameters.get(Set))
-                .withFrom(requestParameters.get(From))
-                .withUntil(requestParameters.get(Until));
-
-        OAIPMH response = new OAIPMH()
-                .withRequest(request)
-                .withResponseDate(dateProvider.now());
-        try {
-            OAICompiledRequest parameters = compileParameters(requestParameters);
-
-            switch (request.getVerbType()) {
-                case Identify:
-                    response.withVerb(identifyHandler.handle(parameters));
-                    break;
-                case ListSets:
-                    response.withVerb(listSetsHandler.handle(parameters));
-                    break;
-                case ListMetadataFormats:
-                    response.withVerb(listMetadataFormatsHandler.handle(parameters));
-                    break;
-                case GetRecord:
-                    response.withVerb(getRecordHandler.handle(parameters));
-                    break;
-                case ListIdentifiers:
-                    response.withVerb(listIdentifiersHandler.handle(parameters));
-                    break;
-                case ListRecords:
-                    response.withVerb(listRecordsHandler.handle(parameters));
-                    break;
-            }
-        } catch (HandlerException e) {
-            log.debug(e.getMessage(), e);
-            response.withError(errorsHandler.handle(e));
-        }
-
-        return response;
-    }
-
-    private OAICompiledRequest compileParameters(OAIRequest requestParameters) throws IllegalVerbException, UnknownParameterException, BadArgumentException, DuplicateDefinitionException, BadResumptionToken {
-        try {
-            return requestParameters.compile();
-        } catch (InvalidResumptionTokenException e) {
-            throw new BadResumptionToken("The resumption token is invalid");
-        }
-    }    
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XgetRecord.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XgetRecord.java
deleted file mode 100644
index d86f555d105..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XgetRecord.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-import com.lyncode.xoai.model.oaipmh.GetRecord;
-import com.lyncode.xoai.model.oaipmh.Record;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- *
- * @author Leonid Andreev
- * 
- * This is the Dataverse extension of XOAI GetRecord, 
- * optimized to stream individual records to the output directly
- */
-
-public class XgetRecord extends GetRecord {
-    private static final String RECORD_FIELD = "record";
-    private static final String RECORD_START_ELEMENT = "<"+RECORD_FIELD+">";
-    private static final String RECORD_CLOSE_ELEMENT = "</"+RECORD_FIELD+">";
-    private static final String RESUMPTION_TOKEN_FIELD = "resumptionToken";
-    private static final String EXPIRATION_DATE_ATTRIBUTE = "expirationDate";
-    private static final String COMPLETE_LIST_SIZE_ATTRIBUTE = "completeListSize"; 
-    private static final String CURSOR_ATTRIBUTE = "cursor";
-    
-    
-    public XgetRecord(Xrecord record) {
-        super(record);
-    }
-    
-    public void writeToStream(OutputStream outputStream) throws IOException {
-
-        if (this.getRecord() == null) {
-            throw new IOException("XgetRecord: null Record");
-        }
-        Xrecord xrecord = (Xrecord) this.getRecord();
-
-        outputStream.write(RECORD_START_ELEMENT.getBytes());
-        outputStream.flush();
-
-        xrecord.writeToStream(outputStream);
-
-        outputStream.write(RECORD_CLOSE_ELEMENT.getBytes());
-        outputStream.flush();
-
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XgetRecordHandler.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XgetRecordHandler.java
deleted file mode 100644
index ba28894482a..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XgetRecordHandler.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-import com.lyncode.xml.exceptions.XmlWriteException;
-import com.lyncode.xoai.dataprovider.exceptions.BadArgumentException;
-import com.lyncode.xoai.dataprovider.exceptions.CannotDisseminateFormatException;
-import com.lyncode.xoai.dataprovider.parameters.OAICompiledRequest;
-import com.lyncode.xoai.dataprovider.exceptions.CannotDisseminateRecordException;
-import com.lyncode.xoai.dataprovider.exceptions.HandlerException;
-import com.lyncode.xoai.dataprovider.exceptions.IdDoesNotExistException;
-import com.lyncode.xoai.dataprovider.exceptions.NoMetadataFormatsException;
-import com.lyncode.xoai.dataprovider.exceptions.OAIException;
-import com.lyncode.xoai.dataprovider.handlers.VerbHandler;
-import com.lyncode.xoai.dataprovider.handlers.helpers.ItemHelper;
-import com.lyncode.xoai.dataprovider.model.Context;
-import com.lyncode.xoai.dataprovider.model.Item;
-import com.lyncode.xoai.dataprovider.model.MetadataFormat;
-import com.lyncode.xoai.dataprovider.model.Set;
-import com.lyncode.xoai.model.oaipmh.*;
-import com.lyncode.xoai.dataprovider.repository.Repository;
-import com.lyncode.xoai.xml.XSLPipeline;
-import com.lyncode.xoai.xml.XmlWriter;
-import edu.harvard.iq.dataverse.Dataset;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.transform.TransformerException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.logging.Logger;
-
-/*
- * @author Leonid Andreev
-*/
-public class XgetRecordHandler extends VerbHandler<GetRecord> {
-    private static Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.server.xoai.XgetRecordHandler");
-    public XgetRecordHandler(Context context, Repository repository) {
-        super(context, repository);
-    }
-
-    @Override
-    public GetRecord handle(OAICompiledRequest parameters) throws OAIException, HandlerException {        
-
-        MetadataFormat format = getContext().formatForPrefix(parameters.getMetadataPrefix());
-        Item item = getRepository().getItemRepository().getItem(parameters.getIdentifier());
-
-        if (getContext().hasCondition() &&
-                !getContext().getCondition().getFilter(getRepository().getFilterResolver()).isItemShown(item))
-            throw new IdDoesNotExistException("This context does not include this item");
-
-        if (format.hasCondition() &&
-                !format.getCondition().getFilter(getRepository().getFilterResolver()).isItemShown(item))
-            throw new CannotDisseminateRecordException("Format not applicable to this item");
-
-        
-        Xrecord record = this.createRecord(parameters, item);
-        GetRecord result = new XgetRecord(record);
-        
-        return result;
-    }
-    
-    private Xrecord createRecord(OAICompiledRequest parameters, Item item)
-            throws BadArgumentException, CannotDisseminateRecordException,
-            OAIException, NoMetadataFormatsException, CannotDisseminateFormatException {
-        MetadataFormat format = getContext().formatForPrefix(parameters.getMetadataPrefix());
-        Header header = new Header();
-        
-        Dataset dataset = ((Xitem)item).getDataset();
-        Xrecord xrecord = new Xrecord().withFormatName(parameters.getMetadataPrefix()).withDataset(dataset);
-        header.withIdentifier(item.getIdentifier());
-
-        ItemHelper itemHelperWrap = new ItemHelper(item);
-        header.withDatestamp(item.getDatestamp());
-        for (Set set : itemHelperWrap.getSets(getContext(), getRepository().getFilterResolver()))
-            header.withSetSpec(set.getSpec());
-        if (item.isDeleted())
-            header.withStatus(Header.Status.DELETED);
-
-        xrecord.withHeader(header);
-        xrecord.withMetadata(item.getMetadata());
-        
-        return xrecord;
-    }
-
-    private XSLPipeline toPipeline(Item item) throws XmlWriteException, XMLStreamException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        XmlWriter writer = new XmlWriter(output);
-        Metadata metadata = item.getMetadata();
-        metadata.write(writer);
-        writer.close();
-        return new XSLPipeline(new ByteArrayInputStream(output.toByteArray()), true);
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/Xitem.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/Xitem.java
deleted file mode 100644
index bd7a35ddb79..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/Xitem.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-import com.lyncode.xoai.dataprovider.model.Item;
-import com.lyncode.xoai.dataprovider.model.Set;
-import com.lyncode.xoai.model.oaipmh.About;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.harvest.server.OAIRecord;
-import edu.harvard.iq.dataverse.util.StringUtil;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- *
- * @author Leonid Andreev
- * 
- * This is an implemention of an Lyncode XOAI Item; 
- * You can think of it as an XOAI Item wrapper around the
- * Dataverse OAIRecord entity.
- */
-public class Xitem implements Item {
-    
-    public Xitem(OAIRecord oaiRecord) {
-        super();
-        this.oaiRecord = oaiRecord;
-        oaisets = new ArrayList<>();
-        if (!StringUtil.isEmpty(oaiRecord.getSetName())) {
-            oaisets.add(new Set(oaiRecord.getSetName()));
-        }
-    }
-    
-    private OAIRecord oaiRecord;
-    
-    public OAIRecord getOaiRecord() {
-        return oaiRecord;
-    }
-    
-    public void setOaiRecord(OAIRecord oaiRecord) {
-        this.oaiRecord = oaiRecord;
-    }
-
-    private Dataset dataset; 
-    
-    public Dataset getDataset() {
-        return dataset;
-    }
-    
-    public Xitem withDataset(Dataset dataset) {
-        this.dataset = dataset; 
-        return this; 
-    }
-    
-    @Override
-    public List<About> getAbout() {
-        return null;
-    }
-
-    @Override
-    public Xmetadata getMetadata() {
-        return new Xmetadata((String)null);
-    }
-
-    @Override
-    public String getIdentifier() {
-        return oaiRecord.getGlobalId();
-    }
-
-    @Override
-    public Date getDatestamp() {
-        return oaiRecord.getLastUpdateTime();
-    }
-    
-    private  List<Set> oaisets;
-
-    @Override
-    public List<Set> getSets() {
-        
-        return oaisets;
- 
-    }
-
-    @Override
-    public boolean isDeleted() {
-        return oaiRecord.isRemoved();
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XitemRepository.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XitemRepository.java
deleted file mode 100644
index b4c60a3171d..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XitemRepository.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-import com.lyncode.xoai.dataprovider.exceptions.IdDoesNotExistException;
-import com.lyncode.xoai.dataprovider.exceptions.OAIException;
-import com.lyncode.xoai.dataprovider.filter.ScopedFilter;
-import com.lyncode.xoai.dataprovider.handlers.results.ListItemIdentifiersResult;
-import com.lyncode.xoai.dataprovider.handlers.results.ListItemsResults;
-import com.lyncode.xoai.dataprovider.model.Item;
-import com.lyncode.xoai.dataprovider.model.ItemIdentifier;
-import com.lyncode.xoai.dataprovider.model.Set;
-import com.lyncode.xoai.dataprovider.repository.ItemRepository;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.harvest.server.OAIRecord;
-import edu.harvard.iq.dataverse.harvest.server.OAIRecordServiceBean;
-import edu.harvard.iq.dataverse.util.StringUtil;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Leonid Andreev
- * Implements an XOAI "Item Repository". Retrieves Dataverse "OAIRecords" 
- * representing harvestable local datasets and translates them into 
- * XOAI "items". 
- */
-
-public class XitemRepository implements ItemRepository {
-    private static Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.server.xoai.XitemRepository");
-    
-    private OAIRecordServiceBean recordService;
-    private DatasetServiceBean datasetService;
-
-    public XitemRepository (OAIRecordServiceBean recordService, DatasetServiceBean datasetService) {
-        super();
-        this.recordService = recordService;
-        this.datasetService = datasetService;
-    }
-    
-    private List<Xitem> list = new ArrayList<Xitem>();
-
-
-    @Override
-    public Item getItem(String identifier) throws IdDoesNotExistException, OAIException {
-        logger.fine("getItem; calling findOaiRecordsByGlobalId, identifier " + identifier);
-        List<OAIRecord> oaiRecords = recordService.findOaiRecordsByGlobalId(identifier);
-        if (oaiRecords != null && !oaiRecords.isEmpty()) {
-            Xitem xoaiItem = null; 
-            for (OAIRecord record : oaiRecords) {
-                if (xoaiItem == null) {
-                    Dataset dataset = datasetService.findByGlobalId(record.getGlobalId());
-                    if (dataset != null) {
-                        xoaiItem = new Xitem(record).withDataset(dataset);
-                    }
-                } else {
-                    // Adding extra set specs to the XOAI Item, if this record
-                    // is part of multiple sets:
-                    if (!StringUtil.isEmpty(record.getSetName())) {
-                        xoaiItem.getSets().add(new Set(record.getSetName()));
-                    }
-                }
-            }
-            if (xoaiItem != null) {
-                return xoaiItem;
-            }
-        }
-
-        throw new IdDoesNotExistException();
-    }
-
-    @Override
-    public ListItemIdentifiersResult getItemIdentifiers(List<ScopedFilter> filters, int offset, int length) throws OAIException {
-        return getItemIdentifiers(filters, offset, length, null, null, null);
-    }
-
-    @Override
-    public ListItemIdentifiersResult getItemIdentifiers(List<ScopedFilter> filters, int offset, int length, Date from) throws OAIException {
-        return getItemIdentifiers(filters, offset, length, null, from, null);
-    }
-
-    @Override
-    public ListItemIdentifiersResult getItemIdentifiersUntil(List<ScopedFilter> filters, int offset, int length, Date until) throws OAIException {
-        return getItemIdentifiers(filters, offset, length, null, null, until);
-    }
-
-    @Override
-    public ListItemIdentifiersResult getItemIdentifiers(List<ScopedFilter> filters, int offset, int length, Date from, Date until) throws OAIException {
-        return getItemIdentifiers(filters, offset, length, null, from, until);
-    }
-
-    @Override
-    public ListItemIdentifiersResult getItemIdentifiers(List<ScopedFilter> filters, int offset, int length, String setSpec) throws OAIException {
-        return getItemIdentifiers(filters, offset, length, setSpec, null, null);
-    }
-
-    @Override
-    public ListItemIdentifiersResult getItemIdentifiers(List<ScopedFilter> filters, int offset, int length, String setSpec, Date from) throws OAIException {
-        return getItemIdentifiers(filters, offset, length, setSpec, from, null);
-    }
-
-    @Override
-    public ListItemIdentifiersResult getItemIdentifiersUntil(List<ScopedFilter> filters, int offset, int length, String setSpec, Date until) throws OAIException {
-        return getItemIdentifiers(filters, offset, length, setSpec, null, until);
-    }
-
-    @Override
-    public ListItemIdentifiersResult getItemIdentifiers(List<ScopedFilter> filters, int offset, int length, String setSpec, Date from, Date until) throws OAIException {
-        logger.fine("calling getItemIdentifiers; offset=" + offset
-                + ", length=" + length
-                + ", setSpec=" + setSpec
-                + ", from=" + from
-                + ", until=" + until);
-
-        List<OAIRecord> oaiRecords = recordService.findOaiRecordsBySetName(setSpec, from, until);
-
-        logger.fine("total " + oaiRecords.size() + " returned");
-
-        List<ItemIdentifier> xoaiItems = new ArrayList<>();
-        if (oaiRecords != null && !oaiRecords.isEmpty()) {
-
-            for (int i = offset; i < offset + length && i < oaiRecords.size(); i++) {
-                OAIRecord record = oaiRecords.get(i);
-                xoaiItems.add(new Xitem(record));
-            }
-            
-            // Run a second pass, looking for records in this set that occur
-            // in *other* sets. Then we'll add these multiple sets to the 
-            // formatted output in the header:
-            addExtraSets(xoaiItems, setSpec, from, until);
-            
-            boolean hasMore = offset + length < oaiRecords.size();
-            ListItemIdentifiersResult result = new ListItemIdentifiersResult(hasMore, xoaiItems);
-            logger.fine("returning result with " + xoaiItems.size() + " items.");
-            return result;
-        }
-
-        return new ListItemIdentifiersResult(false, xoaiItems);
-    }
-
-    @Override
-    public ListItemsResults getItems(List<ScopedFilter> filters, int offset, int length) throws OAIException {
-        return getItems(filters, offset, length, null, null, null);
-    }
-
-    @Override
-    public ListItemsResults getItems(List<ScopedFilter> filters, int offset, int length, Date from) throws OAIException {
-        return getItems(filters, offset, length, null, from, null);
-    }
-
-    @Override
-    public ListItemsResults getItemsUntil(List<ScopedFilter> filters, int offset, int length, Date until) throws OAIException {
-        return getItems(filters, offset, length, null, null, until);
-    }
-
-    @Override
-    public ListItemsResults getItems(List<ScopedFilter> filters, int offset, int length, Date from, Date until) throws OAIException {
-        return getItems(filters, offset, length, null, from, until);
-    }
-
-    @Override
-    public ListItemsResults getItems(List<ScopedFilter> filters, int offset, int length, String setSpec) throws OAIException {
-        return getItems(filters, offset, length, setSpec, null, null);
-    }
-
-    @Override
-    public ListItemsResults getItems(List<ScopedFilter> filters, int offset, int length, String setSpec, Date from) throws OAIException {
-        return getItems(filters, offset, length, setSpec, from, null);
-    }
-
-    @Override
-    public ListItemsResults getItemsUntil(List<ScopedFilter> filters, int offset, int length, String setSpec, Date until) throws OAIException {
-        return getItems(filters, offset, length, setSpec, null, until);
-    }
-
-    @Override
-    public ListItemsResults getItems(List<ScopedFilter> filters, int offset, int length, String setSpec, Date from, Date until) throws OAIException {
-        logger.fine("calling getItems; offset=" + offset
-                + ", length=" + length
-                + ", setSpec=" + setSpec
-                + ", from=" + from
-                + ", until=" + until);
-
-        List<OAIRecord> oaiRecords = recordService.findOaiRecordsBySetName(setSpec, from, until);
-
-        logger.fine("total " + oaiRecords.size() + " returned");
-
-        List<Item> xoaiItems = new ArrayList<>();
-        if (oaiRecords != null && !oaiRecords.isEmpty()) {
-
-            for (int i = offset; i < offset + length && i < oaiRecords.size(); i++) {
-                OAIRecord oaiRecord = oaiRecords.get(i);
-                Dataset dataset = datasetService.findByGlobalId(oaiRecord.getGlobalId());
-                if (dataset != null) {
-                    Xitem xItem = new Xitem(oaiRecord).withDataset(dataset);
-                    xoaiItems.add(xItem);
-                }
-            }
-            
-            addExtraSets(xoaiItems, setSpec, from, until);
-            
-            boolean hasMore = offset + length < oaiRecords.size();
-            ListItemsResults result = new ListItemsResults(hasMore, xoaiItems);
-            logger.fine("returning result with " + xoaiItems.size() + " items.");
-            return result;
-        }
-
-        return new ListItemsResults(false, xoaiItems);
-    }
-    
-    private void addExtraSets(Object xoaiItemsList, String setSpec, Date from, Date until) {
-        
-        List<Xitem> xoaiItems = (List<Xitem>)xoaiItemsList;
-        
-        List<OAIRecord> oaiRecords = recordService.findOaiRecordsNotInThisSet(setSpec, from, until);
-        
-        if (oaiRecords == null || oaiRecords.isEmpty()) {
-            return;
-        }
-                
-        // Make a second pass through the list of xoaiItems already found for this set, 
-        // and add any other sets in which this item occurs:
-        
-        int j = 0;
-        for (int i = 0; i < xoaiItems.size(); i++) {
-            // fast-forward the second list, until we find a record with this identifier, 
-            // or until we are past this record (both lists are sorted alphabetically by
-            // the identifier:
-            Xitem xitem = xoaiItems.get(i);
-            
-            while (j < oaiRecords.size() && xitem.getIdentifier().compareTo(oaiRecords.get(j).getGlobalId()) > 0) {
-                j++;
-            }
-            
-            while (j < oaiRecords.size() && xitem.getIdentifier().equals(oaiRecords.get(j).getGlobalId())) {
-                xoaiItems.get(i).getSets().add(new Set(oaiRecords.get(j).getSetName()));
-                j++;
-            }
-        }
-                
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XlistRecords.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XlistRecords.java
deleted file mode 100644
index e2366119f54..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XlistRecords.java
+++ /dev/null
@@ -1,87 +0,0 @@
-
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-import com.lyncode.xml.exceptions.XmlWriteException;
-import static com.lyncode.xoai.model.oaipmh.Granularity.Second;
-import com.lyncode.xoai.model.oaipmh.ListRecords;
-import com.lyncode.xoai.model.oaipmh.Record;
-import com.lyncode.xoai.model.oaipmh.ResumptionToken;
-import com.lyncode.xoai.xml.XmlWriter;
-import static com.lyncode.xoai.xml.XmlWriter.defaultContext;
-import java.io.ByteArrayOutputStream;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import javax.xml.stream.XMLStreamException;
-
-/**
- *
- * @author Leonid Andreev
- * 
- * This is the Dataverse extension of XOAI ListRecords, 
- * optimized to stream individual records using fast dumping 
- * of pre-exported metadata fragments (and by-passing expensive 
- * XML parsing and writing). 
- */
-public class XlistRecords extends ListRecords {
-    private static final String RECORD_FIELD = "record";
-    private static final String RECORD_START_ELEMENT = "<"+RECORD_FIELD+">";
-    private static final String RECORD_CLOSE_ELEMENT = "</"+RECORD_FIELD+">";
-    private static final String RESUMPTION_TOKEN_FIELD = "resumptionToken";
-    private static final String EXPIRATION_DATE_ATTRIBUTE = "expirationDate";
-    private static final String COMPLETE_LIST_SIZE_ATTRIBUTE = "completeListSize"; 
-    private static final String CURSOR_ATTRIBUTE = "cursor";
-    
-    public void writeToStream(OutputStream outputStream) throws IOException {
-        if (!this.records.isEmpty()) {
-            for (Record record : this.records) {
-                outputStream.write(RECORD_START_ELEMENT.getBytes());
-                outputStream.flush();
-
-                ((Xrecord)record).writeToStream(outputStream);
-
-                outputStream.write(RECORD_CLOSE_ELEMENT.getBytes());
-                outputStream.flush();
-            }
-        }
-        
-        if (resumptionToken != null) {
-            
-            String resumptionTokenString = resumptionTokenToString(resumptionToken);
-            if (resumptionTokenString == null) {
-                throw new IOException("XlistRecords: failed to output resumption token");
-            }
-            outputStream.write(resumptionTokenString.getBytes());
-            outputStream.flush();
-        }
-    }
-    
-    private String resumptionTokenToString(ResumptionToken token) {
-        try {
-            ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
-            XmlWriter writer = new XmlWriter(byteOutputStream, defaultContext());
-
-            writer.writeStartElement(RESUMPTION_TOKEN_FIELD);
-            
-            if (token.getExpirationDate() != null)
-                writer.writeAttribute(EXPIRATION_DATE_ATTRIBUTE, token.getExpirationDate(), Second);
-            if (token.getCompleteListSize() != null)
-                writer.writeAttribute(COMPLETE_LIST_SIZE_ATTRIBUTE, "" + token.getCompleteListSize());
-            if (token.getCursor() != null)
-                writer.writeAttribute(CURSOR_ATTRIBUTE, "" + token.getCursor());
-            if (token.getValue() != null)
-                writer.write(token.getValue());
-            
-            writer.writeEndElement(); // resumptionToken;
-            writer.flush();
-            writer.close();
-
-            String ret = byteOutputStream.toString();
-
-            return ret;
-        } catch (XMLStreamException | XmlWriteException e) {
-            return null;
-        }
-    }
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XlistRecordsHandler.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XlistRecordsHandler.java
deleted file mode 100644
index 5651545e505..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XlistRecordsHandler.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-import com.lyncode.xml.exceptions.XmlWriteException;
-import com.lyncode.xoai.dataprovider.handlers.*;
-import com.lyncode.xoai.dataprovider.exceptions.*;
-import com.lyncode.xoai.dataprovider.handlers.results.ListItemsResults;
-import com.lyncode.xoai.dataprovider.handlers.helpers.ItemHelper;
-import com.lyncode.xoai.dataprovider.handlers.helpers.ItemRepositoryHelper;
-import com.lyncode.xoai.dataprovider.handlers.helpers.ResumptionTokenHelper;
-import com.lyncode.xoai.dataprovider.handlers.helpers.SetRepositoryHelper;
-import com.lyncode.xoai.dataprovider.model.Context;
-import com.lyncode.xoai.dataprovider.model.Item;
-import com.lyncode.xoai.dataprovider.model.MetadataFormat;
-import com.lyncode.xoai.dataprovider.model.Set;
-import com.lyncode.xoai.model.oaipmh.*;
-import com.lyncode.xoai.dataprovider.parameters.OAICompiledRequest;
-import com.lyncode.xoai.dataprovider.repository.Repository;
-import com.lyncode.xoai.xml.XSLPipeline;
-import com.lyncode.xoai.xml.XmlWriter;
-import edu.harvard.iq.dataverse.Dataset;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.transform.TransformerException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-/**
- *
- * @author Leonid Andreev
- * 
- * This is Dataverse's own implementation of ListRecords Verb Handler
- * (used instead of the ListRecordsHandler provided by XOAI). 
- * It is customized to support the optimizations that allows 
- * Dataverse to directly output pre-exported metadata records to the output 
- * stream, bypassing expensive XML parsing and writing. 
- */
-public class XlistRecordsHandler extends VerbHandler<ListRecords> {
-    private static java.util.logging.Logger logger = java.util.logging.Logger.getLogger("XlistRecordsHandler");
-    private final ItemRepositoryHelper itemRepositoryHelper;
-    private final SetRepositoryHelper setRepositoryHelper;
-
-    public XlistRecordsHandler(Context context, Repository repository) {
-        super(context, repository);
-        this.itemRepositoryHelper = new ItemRepositoryHelper(getRepository().getItemRepository());
-        this.setRepositoryHelper = new SetRepositoryHelper(getRepository().getSetRepository());
-    }
-
-    @Override
-    public ListRecords handle(OAICompiledRequest parameters) throws OAIException, HandlerException {
-        XlistRecords res = new XlistRecords();
-        int length = getRepository().getConfiguration().getMaxListRecords();
-
-        if (parameters.hasSet() && !getRepository().getSetRepository().supportSets())
-            throw new DoesNotSupportSetsException();
-
-        int offset = getOffset(parameters);
-        ListItemsResults result;
-        if (!parameters.hasSet()) {
-            if (parameters.hasFrom() && !parameters.hasUntil())
-                result = itemRepositoryHelper.getItems(getContext(), offset,
-                        length, parameters.getMetadataPrefix(),
-                        parameters.getFrom());
-            else if (!parameters.hasFrom() && parameters.hasUntil())
-                result = itemRepositoryHelper.getItemsUntil(getContext(), offset,
-                        length, parameters.getMetadataPrefix(),
-                        parameters.getUntil());
-            else if (parameters.hasFrom() && parameters.hasUntil())
-                result = itemRepositoryHelper.getItems(getContext(), offset,
-                        length, parameters.getMetadataPrefix(),
-                        parameters.getFrom(), parameters.getUntil());
-            else
-                result = itemRepositoryHelper.getItems(getContext(), offset,
-                        length, parameters.getMetadataPrefix());
-        } else {
-            if (!setRepositoryHelper.exists(getContext(), parameters.getSet())) {
-            //    throw new NoMatchesException();
-            }
-            if (parameters.hasFrom() && !parameters.hasUntil())
-                result = itemRepositoryHelper.getItems(getContext(), offset,
-                        length, parameters.getMetadataPrefix(),
-                        parameters.getSet(), parameters.getFrom());
-            else if (!parameters.hasFrom() && parameters.hasUntil())
-                result = itemRepositoryHelper.getItemsUntil(getContext(), offset,
-                        length, parameters.getMetadataPrefix(),
-                        parameters.getSet(), parameters.getUntil());
-            else if (parameters.hasFrom() && parameters.hasUntil())
-                result = itemRepositoryHelper.getItems(getContext(), offset,
-                        length, parameters.getMetadataPrefix(),
-                        parameters.getSet(), parameters.getFrom(),
-                        parameters.getUntil());
-            else
-                result = itemRepositoryHelper.getItems(getContext(), offset,
-                        length, parameters.getMetadataPrefix(),
-                        parameters.getSet());
-        }
-
-        List<Item> results = result.getResults();
-        if (results.isEmpty()) throw new NoMatchesException();
-        for (Item i : results)
-            res.withRecord(this.createRecord(parameters, i));
-
-
-        ResumptionToken.Value currentResumptionToken = new ResumptionToken.Value();
-        if (parameters.hasResumptionToken()) {
-            currentResumptionToken = parameters.getResumptionToken();
-        } else if (result.hasMore()) {
-            currentResumptionToken = parameters.extractResumptionToken();
-        }
-
-        XresumptionTokenHelper resumptionTokenHelper = new XresumptionTokenHelper(currentResumptionToken,
-                getRepository().getConfiguration().getMaxListRecords());
-        res.withResumptionToken(resumptionTokenHelper.resolve(result.hasMore()));
-
-        return res;
-    }
-
-
-    private int getOffset(OAICompiledRequest parameters) {
-        if (!parameters.hasResumptionToken())
-            return 0;
-        if (parameters.getResumptionToken().getOffset() == null)
-            return 0;
-        return parameters.getResumptionToken().getOffset().intValue();
-    }
-
-    private Record createRecord(OAICompiledRequest parameters, Item item)
-            throws BadArgumentException, CannotDisseminateRecordException,
-            OAIException, NoMetadataFormatsException, CannotDisseminateFormatException {
-        MetadataFormat format = getContext().formatForPrefix(parameters.getMetadataPrefix());
-        Header header = new Header();
-        
-        Dataset dataset = ((Xitem)item).getDataset();
-        Xrecord xrecord = new Xrecord().withFormatName(parameters.getMetadataPrefix()).withDataset(dataset);
-        header.withIdentifier(item.getIdentifier());
-
-        ItemHelper itemHelperWrap = new ItemHelper(item);
-        header.withDatestamp(item.getDatestamp());
-        for (Set set : itemHelperWrap.getSets(getContext(), getRepository().getFilterResolver()))
-            header.withSetSpec(set.getSpec());
-        if (item.isDeleted())
-            header.withStatus(Header.Status.DELETED);
-
-        xrecord.withHeader(header);
-        xrecord.withMetadata(item.getMetadata());
-        
-        return xrecord;
-    }
-
-
-    private XSLPipeline toPipeline(Item item) throws XmlWriteException, XMLStreamException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        XmlWriter writer = new XmlWriter(output);
-        Metadata metadata = item.getMetadata();
-        metadata.write(writer);
-        writer.close();
-        return new XSLPipeline(new ByteArrayInputStream(output.toByteArray()), true);
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/Xmetadata.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/Xmetadata.java
deleted file mode 100644
index 225b9b13777..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/Xmetadata.java
+++ /dev/null
@@ -1,27 +0,0 @@
- 
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-import com.lyncode.xml.exceptions.XmlWriteException;
-import com.lyncode.xoai.model.oaipmh.Metadata;
-import com.lyncode.xoai.xml.XmlWriter;
-
-/**
- *
- * @author Leonid Andreev
- */
-public class Xmetadata extends Metadata {
-    
-    
-    public Xmetadata(String value) {
-        super(value);
-    }
-    
-    
-    @Override
-    public void write(XmlWriter writer) throws XmlWriteException {
-        // Do nothing!
-        // - rather than writing Metadata as an XML writer stram, we will write 
-        // the pre-exported *and pre-validated* content as a byte stream, directly.
-    }
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/Xrecord.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/Xrecord.java
deleted file mode 100644
index 538f0fe7219..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/Xrecord.java
+++ /dev/null
@@ -1,181 +0,0 @@
-
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-import com.lyncode.xoai.model.oaipmh.Header;
-import com.lyncode.xoai.model.oaipmh.Record;
-import com.lyncode.xoai.xml.XmlWriter;
-import static com.lyncode.xoai.xml.XmlWriter.defaultContext;
-
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.export.ExportException;
-import edu.harvard.iq.dataverse.export.ExportService;
-import static edu.harvard.iq.dataverse.util.SystemConfig.FQDN;
-import static edu.harvard.iq.dataverse.util.SystemConfig.SITE_URL;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- *
- * @author Leonid Andreev
- * 
- * This is the Dataverse extension of XOAI Record, 
- * optimized to directly output a pre-exported metadata record to the 
- * output stream, thus by-passing expensive parsing and writing by 
- * an XML writer, as in the original XOAI implementation.
- */
-
-public class Xrecord extends Record {
-    private static final String METADATA_FIELD = "metadata";
-    private static final String METADATA_START_ELEMENT = "<"+METADATA_FIELD+">";
-    private static final String METADATA_END_ELEMENT = "</"+METADATA_FIELD+">";
-    private static final String HEADER_FIELD = "header";
-    private static final String STATUS_ATTRIBUTE = "status";
-    private static final String IDENTIFIER_FIELD = "identifier";
-    private static final String DATESTAMP_FIELD = "datestamp";
-    private static final String SETSPEC_FIELD = "setSpec";
-    private static final String DATAVERSE_EXTENDED_METADATA_FORMAT = "dataverse_json";
-    private static final String DATAVERSE_EXTENDED_METADATA_API = "/api/datasets/export";
-    
-    protected Dataset dataset; 
-    protected String formatName;
-    
-    
-    public Dataset getDataset() {
-        return dataset; 
-    }
-    
-    public Xrecord withDataset(Dataset dataset) {
-        this.dataset = dataset;
-        return this;
-    }
-    
-    
-    public String getFormatName() {
-        return formatName; 
-    }
-    
-    
-    public Xrecord withFormatName(String formatName) {
-        this.formatName = formatName;
-        return this;
-    }
-    
-    public void writeToStream(OutputStream outputStream) throws IOException {
-        outputStream.flush();
-
-        String headerString = itemHeaderToString(this.header); 
-        
-        if (headerString == null) {
-            throw new IOException("Xrecord: failed to stream item header.");
-        }
-        
-        outputStream.write(headerString.getBytes());
-        
-        // header.getStatus() is only non-null when it's indicating "deleted".
-        if (header.getStatus() == null) { // Deleted records should not show metadata
-            if (!isExtendedDataverseMetadataMode(formatName)) {
-                outputStream.write(METADATA_START_ELEMENT.getBytes());
-  
-                outputStream.flush();
-  
-                if (dataset != null && formatName != null) {
-                    InputStream inputStream = null;
-                    try {
-                        inputStream = ExportService.getInstance().getExport(dataset, formatName);
-                    } catch (ExportException ex) {
-                        inputStream = null;
-                    }
-    
-                    if (inputStream == null) {
-                        throw new IOException("Xrecord: failed to open metadata stream.");
-                    }
-                    writeMetadataStream(inputStream, outputStream);
-                }
-                outputStream.write(METADATA_END_ELEMENT.getBytes());
-            } else {
-                outputStream.write(customMetadataExtensionRef(this.dataset.getGlobalIdString()).getBytes());
-            }
-        }
-        outputStream.flush();
-
-    }
-    
-    private String itemHeaderToString(Header header) {
-        try {
-            ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
-            XmlWriter writer = new XmlWriter(byteOutputStream, defaultContext());
-
-            writer.writeStartElement(HEADER_FIELD);
-
-             if (header.getStatus() != null) {
-                writer.writeAttribute(STATUS_ATTRIBUTE, header.getStatus().value());
-             }
-            writer.writeElement(IDENTIFIER_FIELD, header.getIdentifier());
-            writer.writeElement(DATESTAMP_FIELD, header.getDatestamp());
-            for (String setSpec : header.getSetSpecs()) {
-                writer.writeElement(SETSPEC_FIELD, setSpec);
-            }
-            writer.writeEndElement(); // header
-            writer.flush();
-            writer.close();
-
-            String ret = byteOutputStream.toString();
-
-            return ret;
-        } catch (Exception ex) {
-            return null;
-        }
-    }
-    
-    private void writeMetadataStream(InputStream inputStream, OutputStream outputStream) throws IOException {
-        int bufsize;
-        byte[] buffer = new byte[4 * 8192];
-
-        while ((bufsize = inputStream.read(buffer)) != -1) {
-            outputStream.write(buffer, 0, bufsize);
-            outputStream.flush();
-        }
-
-        inputStream.close();
-    }
-    
-    private String customMetadataExtensionRef(String identifier) {
-        String ret = "<" + METADATA_FIELD 
-                + " directApiCall=\"" 
-                + getDataverseSiteUrl()
-                + DATAVERSE_EXTENDED_METADATA_API 
-                + "?exporter=" 
-                + DATAVERSE_EXTENDED_METADATA_FORMAT 
-                + "&amp;persistentId="
-                + identifier
-                + "\""
-                + "/>";
-        
-        return ret;
-    }
-    
-    private boolean isExtendedDataverseMetadataMode(String formatName) {
-        return DATAVERSE_EXTENDED_METADATA_FORMAT.equals(formatName);
-    }
-    
-    private String getDataverseSiteUrl() {
-        String hostUrl = System.getProperty(SITE_URL);
-        if (hostUrl != null && !"".equals(hostUrl)) {
-            return hostUrl;
-        }
-        String hostName = System.getProperty(FQDN);
-        if (hostName == null) {
-            try {
-                hostName = InetAddress.getLocalHost().getCanonicalHostName();
-            } catch (UnknownHostException e) {
-                return null;
-            }
-        }
-        hostUrl = "https://" + hostName;
-        return hostUrl;
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XresumptionTokenHelper.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XresumptionTokenHelper.java
deleted file mode 100644
index 7f9eac2cbe8..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XresumptionTokenHelper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-import com.lyncode.xoai.dataprovider.handlers.helpers.ResumptionTokenHelper;
-import com.lyncode.xoai.model.oaipmh.ResumptionToken;
-import static java.lang.Math.round;
-import static com.google.common.base.Predicates.isNull;
-
-/**
- *
- * @author Leonid Andreev
- * Dataverse's own version of the XOAI ResumptionTokenHelper
- * Fixes the issue with the offset cursor: the OAI validation spec 
- * insists that it starts with 0, while the XOAI implementation uses 1 
- * as the initial offset. 
- */
-public class XresumptionTokenHelper {
-        
-    private ResumptionToken.Value current;
-    private long maxPerPage;
-    private Long totalResults;
-
-    public XresumptionTokenHelper(ResumptionToken.Value current, long maxPerPage) {
-        this.current = current;
-        this.maxPerPage = maxPerPage;
-    }
-
-    public XresumptionTokenHelper withTotalResults(long totalResults) {
-        this.totalResults = totalResults;
-        return this;
-    }
-
-    public ResumptionToken resolve (boolean hasMoreResults) {
-        if (isInitialOffset() && !hasMoreResults) return null;
-        else {
-            if (hasMoreResults) {
-                ResumptionToken.Value next = current.next(maxPerPage);
-                return populate(new ResumptionToken(next));
-            } else {
-                ResumptionToken resumptionToken = new ResumptionToken();
-                resumptionToken.withCursor(round((current.getOffset()) / maxPerPage));
-                if (totalResults != null)
-                    resumptionToken.withCompleteListSize(totalResults);
-                return resumptionToken;
-            }
-        }
-    }
-
-    private boolean isInitialOffset() {
-        return isNull().apply(current.getOffset()) || current.getOffset() == 0;
-    }
-
-    private ResumptionToken populate(ResumptionToken resumptionToken) {
-        if (totalResults != null)
-            resumptionToken.withCompleteListSize(totalResults);
-        resumptionToken.withCursor(round((resumptionToken.getValue().getOffset() - maxPerPage)/ maxPerPage));
-        return resumptionToken;
-    }
-    
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XsetRepository.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XsetRepository.java
deleted file mode 100644
index 8e58e1bbf9a..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XsetRepository.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse.harvest.server.xoai;
-
-import com.lyncode.xoai.model.xoai.Element;
-import com.lyncode.xoai.dataprovider.repository.SetRepository;
-import com.lyncode.xoai.dataprovider.handlers.results.ListSetsResult;
-import com.lyncode.xoai.dataprovider.model.Set;
-import com.lyncode.xoai.model.xoai.XOAIMetadata;
-import edu.harvard.iq.dataverse.harvest.server.OAISet;
-import edu.harvard.iq.dataverse.harvest.server.OAISetServiceBean;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Leonid Andreev
- */
-public class XsetRepository implements SetRepository {
-    private static Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.server.xoai.XsetRepository");
-    
-    private OAISetServiceBean setService;
-
-    public XsetRepository (OAISetServiceBean setService) {
-        super();
-        this.setService = setService;
-    }
-    
-    public OAISetServiceBean getSetService() {
-        return setService;
-    }
-    
-    public void setSetService(OAISetServiceBean setService) {
-        this.setService = setService;
-    }
-
-
-    @Override
-    public boolean supportSets() {
-        logger.fine("calling supportSets()");
-        List<OAISet> dataverseOAISets = setService.findAllNamedSets();
-        
-        if (dataverseOAISets == null || dataverseOAISets.isEmpty()) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public ListSetsResult retrieveSets(int offset, int length) {
-        logger.fine("calling retrieveSets()");
-        List<OAISet> dataverseOAISets = setService.findAllNamedSets();
-        List<Set> XOAISets = new ArrayList<Set>();
-        
-        if (dataverseOAISets != null) {
-            for (int i = 0; i < dataverseOAISets.size(); i++) {
-                OAISet dataverseSet = dataverseOAISets.get(i);
-                Set xoaiSet = new Set(dataverseSet.getSpec());
-                xoaiSet.withName(dataverseSet.getName());
-                XOAIMetadata xMetadata = new XOAIMetadata();
-                Element element = new Element("description");
-                element.withField("description", dataverseSet.getDescription());
-                xMetadata.getElements().add(element);
-                xoaiSet.withDescription(xMetadata);
-                XOAISets.add(xoaiSet);
-            }
-        }
-        
-        return new ListSetsResult(offset + length < XOAISets.size(), XOAISets.subList(offset, Math.min(offset + length, XOAISets.size())));
-    }
-
-    @Override
-    public boolean exists(String setSpec) {
-        //for (Set s : this.sets)
-        //    if (s.getSpec().equals(setSpec))
-        //        return true;
-
-        return false;
-    }
-    
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestMessage.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestMessage.java
index e9923012fad..b1c93e52ebd 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestMessage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestMessage.java
@@ -19,7 +19,6 @@
 */
 package edu.harvard.iq.dataverse.ingest;
 
-import edu.harvard.iq.dataverse.DataFile;
 import java.io.Serializable;
 import java.util.List;
 import java.util.ArrayList;
@@ -32,49 +31,21 @@
  * @author Leonid Andreev
  */
 public class IngestMessage implements Serializable {
-    public static final int INGEST_MESAGE_LEVEL_ERROR = 1; 
-    public static final int INGEST_MESAGE_LEVEL_INFO = 2;
-
     /** Creates a new instance of IngestMessage */
-    public IngestMessage()  {
-        this(INGEST_MESAGE_LEVEL_INFO);
-    }
 
-    public IngestMessage(int messageLevel)  {
-        this.messageLevel = messageLevel;
+    public IngestMessage()  {
         datafile_ids = new ArrayList<Long>();
     }
 
-    public IngestMessage(int messageLevel, Long authenticatedUserId) {
-        this.messageLevel = messageLevel;
+    public IngestMessage(Long authenticatedUserId) {
         this.authenticatedUserId = authenticatedUserId;
         datafile_ids = new ArrayList<Long>();
     }
-
-    private int messageLevel = INGEST_MESAGE_LEVEL_INFO;
     
     private Long datasetId;
-    private Long datasetVersionId;
-    private String versionNote;
-    private String datasetVersionNumber;
     private List<Long> datafile_ids;
     private Long authenticatedUserId;
-
-    public String getVersionNote() {
-        return versionNote;
-    }
-
-    public void setVersionNote(String versionNote) {
-        this.versionNote = versionNote;
-    }
-
-    public int getMessageLevel() {
-        return messageLevel;
-    }
-
-    public void setMessageLevel(int messageLevel) {
-        this.messageLevel = messageLevel;
-    }
+    private String info;
 
     public Long getDatasetId() {
         return datasetId;
@@ -83,30 +54,6 @@ public Long getDatasetId() {
     public void setDatasetId(Long datasetId) {
         this.datasetId = datasetId;
     }
-
-    public Long getDatasetVersionId() {
-        return datasetVersionId;
-    }
-
-    public void setDatasetVersionId(Long datasetVersionId) {
-        this.datasetVersionId = datasetVersionId;
-    }
-
-    public boolean sendInfoMessage() {
-        return messageLevel >= INGEST_MESAGE_LEVEL_INFO;
-    }
-
-    public boolean sendErrorMessage() {
-        return messageLevel >= INGEST_MESAGE_LEVEL_ERROR;
-    }
-
-    public String getDatasetVersionNumber() {
-        return datasetVersionNumber;
-    }
-
-    public void setDatasetVersionNumber(String datasetVersionNumber) {
-        this.datasetVersionNumber = datasetVersionNumber;
-    }
     
     public List<Long> getFileIds() {
         return datafile_ids; 
@@ -123,4 +70,12 @@ public void addFileId(Long file_id) {
     public Long getAuthenticatedUserId() {
         return authenticatedUserId;
     }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getInfo() {
+        return info;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestMessageBean.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestMessageBean.java
index 42dec6f1d46..c46599e83b5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestMessageBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestMessageBean.java
@@ -23,21 +23,22 @@
 import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.search.IndexServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.Iterator;
 import java.util.logging.Logger;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJB;
-import javax.ejb.MessageDriven;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-
+import jakarta.ejb.ActivationConfigProperty;
+import jakarta.ejb.EJB;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.ObjectMessage;
 /**
  *
  * This is an experimental, JMS-based implementation of asynchronous 
@@ -45,7 +46,14 @@
  * 
  * @author Leonid Andreev 
  */
-@MessageDriven(mappedName = "jms/DataverseIngest", activationConfig =  {@ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"), @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue")})
+@MessageDriven(
+    mappedName = "java:app/jms/queue/ingest",
+    activationConfig =  {
+        @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"),
+        @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "jakarta.jms.Queue")
+    }
+)
+
 public class IngestMessageBean implements MessageListener {
     private static final Logger logger = Logger.getLogger(IngestMessageBean.class.getCanonicalName());
     @EJB DatasetServiceBean datasetService;
@@ -53,6 +61,7 @@ public class IngestMessageBean implements MessageListener {
     @EJB IngestServiceBean ingestService;
     @EJB UserNotificationServiceBean userNotificationService;
     @EJB AuthenticationServiceBean authenticationServiceBean;
+    @EJB IndexServiceBean indexService;
 
    
     public IngestMessageBean() {
@@ -62,17 +71,27 @@ public IngestMessageBean() {
     public void onMessage(Message message) {
         IngestMessage ingestMessage = null;
 
-        Long datafile_id = null;
         AuthenticatedUser authenticatedUser = null;
         
         try {
             ObjectMessage om = (ObjectMessage) message;
             ingestMessage = (IngestMessage) om.getObject();
 
+            // if the lock was removed while an ingest was queued, ratake the lock
+            // The "if" is the first thing that addDatasetLock method does.
+            // It has some complexity and would result in the code duplication if repeated here.
+            // If that check would be removed from the addDatasetLock method in the future without
+            // updating the code using this method, ingest code would still not break because
+            // we remove "all" ingest locks at the end (right now, there can be at most one ingest lock).
+            datasetService.addDatasetLock(ingestMessage.getDatasetId(),
+                    DatasetLock.Reason.Ingest,
+                    ingestMessage.getAuthenticatedUserId(),
+                    ingestMessage.getInfo());
+
             authenticatedUser = authenticationServiceBean.findByID(ingestMessage.getAuthenticatedUserId());
 
-            Iterator iter = ingestMessage.getFileIds().iterator();
-            datafile_id = null;
+            Iterator<Long> iter = ingestMessage.getFileIds().iterator();
+            Long datafile_id = null;
 
             boolean ingestWithErrors = false;
 
@@ -80,7 +99,7 @@ public void onMessage(Message message) {
             sbIngestedFiles.append("<ul>");
             
             while (iter.hasNext()) {
-                datafile_id = (Long) iter.next();
+                datafile_id = iter.next();
 
                 logger.fine("Start ingest job;");
                 try {
@@ -90,10 +109,14 @@ public void onMessage(Message message) {
                     if (ingestService.ingestAsTabular(datafile_id)) {
                         //Thread.sleep(10000);
                         logger.fine("Finished ingest job;");
-                        sbIngestedFiles.append(String.format("<li>%s</li>", datafile.getCurrentName()));
+                        // We used to list the successfully ingested files in the "success"
+                        // and "mixed success and failure" emails. Now we never list successfully
+                        // ingested files so this line is commented out.
+                        // sbIngestedFiles.append(String.format("<li>%s</li>", datafile.getCurrentName()));
+                        indexService.asyncIndexDataset(datafile.getOwner(), true);
                     } else {
                         logger.warning("Error occurred during ingest job for file id " + datafile_id + "!");
-                        sbIngestedFiles.append(String.format("<li>%s (Error)</li>", datafile.getCurrentName()));
+                        sbIngestedFiles.append(String.format("<li>%s</li>", datafile.getCurrentName()));
                         ingestWithErrors = true;
                     }
 
@@ -112,15 +135,15 @@ public void onMessage(Message message) {
 
                             ingestWithErrors = true;
 
-                            sbIngestedFiles.append(String.format("<li>%s (Error)</li>", datafile.getCurrentName()));
+                            sbIngestedFiles.append(String.format("<li>%s</li>", datafile.getCurrentName()));
 
                             datafile.SetIngestProblem();
                             IngestReport errorReport = new IngestReport();
                             errorReport.setFailure();
                             if (ex.getMessage() != null) {
-                                errorReport.setReport("Ingest succeeded, but failed to save the ingested tabular data in the database: " + ex.getMessage());
+                                errorReport.setReport(BundleUtil.getStringFromBundle("file.ingest.saveFailed.detail.message") + ex.getMessage());
                             } else {
-                                errorReport.setReport("Ingest succeeded, but failed to save the ingested tabular data in the database; no further information is available");
+                                errorReport.setReport(BundleUtil.getStringFromBundle("file.ingest.saveFailed.message"));
                             }
                             errorReport.setDataFile(datafile);
                             datafile.setIngestReport(errorReport);
@@ -129,11 +152,10 @@ public void onMessage(Message message) {
                             logger.info("trying to save datafile and the failed ingest report, id=" + datafile_id);
                             datafile = datafileService.save(datafile);
 
-                            Dataset dataset = datafile.getOwner();
-                            if (dataset != null && dataset.getId() != null) {
+                            if (ingestMessage.getDatasetId() != null) {
                                 //logger.info("attempting to remove dataset lock for dataset " + dataset.getId());
                                 //datasetService.removeDatasetLock(dataset.getId());
-                                ingestService.sendFailNotification(dataset.getId());
+                                ingestService.sendFailNotification(ingestMessage.getDatasetId());
                             }
                         }
                     }
@@ -142,27 +164,11 @@ public void onMessage(Message message) {
 
             sbIngestedFiles.append("</ul>");
 
-            Long objectId = null;
-            
-            // Remove the dataset lock: 
-            // (note that the assumption here is that all of the datafiles
-            // packed into this IngestMessage belong to the same dataset) 
-            if (datafile_id != null) {
-                DataFile datafile = datafileService.find(datafile_id);
-                if (datafile != null) {
-                    Dataset dataset = datafile.getOwner();
-                    objectId = dataset.getId();
-                    if (dataset != null && dataset.getId() != null) {
-                        datasetService.removeDatasetLocks(dataset, DatasetLock.Reason.Ingest);
-                    }
-                } 
-            }
-
             userNotificationService.sendNotification(
                     authenticatedUser,
                     Timestamp.from(Instant.now()),
                     !ingestWithErrors ? UserNotification.Type.INGESTCOMPLETED : UserNotification.Type.INGESTCOMPLETEDWITHERRORS,
-                    objectId,
+                    ingestMessage.getDatasetId(),
                     sbIngestedFiles.toString(),
                     true
             );
@@ -172,9 +178,15 @@ public void onMessage(Message message) {
             ex.printStackTrace(); // error in getting object from message; can't send e-mail
 
         } finally {
-            // when we're done, go ahead and remove the lock (not yet)
+            // when we're done, go ahead and remove the lock
             try {
-                //datasetService.removeDatasetLock( ingestMessage.getDatasetId() );
+                // Remove the dataset lock: 
+                // (note that the assumption here is that all of the datafiles
+                // packed into this IngestMessage belong to the same dataset) 
+                Dataset dataset = datasetService.find(ingestMessage.getDatasetId());
+                if (dataset != null && dataset.getId() != null) {
+                    datasetService.removeDatasetLocks(dataset, DatasetLock.Reason.Ingest);
+                }
             } catch (Exception ex) {
                 ex.printStackTrace(); // application was unable to remove the datasetLock
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestQueueProducer.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestQueueProducer.java
new file mode 100644
index 00000000000..0fed25e5c88
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestQueueProducer.java
@@ -0,0 +1,50 @@
+package edu.harvard.iq.dataverse.ingest;
+
+import jakarta.annotation.Resource;
+// https://www.baeldung.com/jee-cdi-vs-ejb-singleton
+import jakarta.inject.Singleton;
+import jakarta.enterprise.inject.Produces;
+import jakarta.jms.JMSConnectionFactoryDefinition;
+import jakarta.jms.JMSDestinationDefinition;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueConnectionFactory;
+
+@JMSConnectionFactoryDefinition(
+    description = "Dataverse Ingest Queue Factory",
+    name = "java:app/jms/factory/ingest",
+    resourceAdapter = "jmsra",
+    interfaceName = "jakarta.jms.QueueConnectionFactory",
+    maxPoolSize = 250,
+    minPoolSize = 1,
+    properties = {
+        "org.glassfish.connector-connection-pool.max-wait-time-in-millis=60000",
+        "org.glassfish.connector-connection-pool.pool-resize-quantity=2"
+    }
+)
+@JMSDestinationDefinition(
+    description = "Dataverse Ingest Queue",
+    name = "java:app/jms/queue/ingest",
+    resourceAdapter = "jmsra",
+    interfaceName="jakarta.jms.Queue",
+    destinationName = "DataverseIngest"
+)
+@Singleton
+public class IngestQueueProducer {
+    
+    @Resource(lookup="java:app/jms/queue/ingest")
+    Queue ingestQueue;
+    
+    @Resource(lookup="java:app/jms/factory/ingest")
+    QueueConnectionFactory ingestQueueFactory;
+    
+    @Produces
+    public Queue getIngestQueue() {
+        return ingestQueue;
+    }
+    
+    @Produces
+    public QueueConnectionFactory getIngestQueueFactory() {
+        return ingestQueueFactory;
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestReport.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestReport.java
index 31208abf839..a1a8bde77f4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestReport.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestReport.java
@@ -9,17 +9,17 @@
 import edu.harvard.iq.dataverse.DataFile;
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestRequest.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestRequest.java
index 024e90325c3..a5d6a1af75c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestRequest.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestRequest.java
@@ -7,16 +7,16 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import java.io.Serializable;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
index eb1b2b658d5..2917c5828a4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
@@ -20,7 +20,10 @@
 
 package edu.harvard.iq.dataverse.ingest;
 
+import edu.harvard.iq.dataverse.AuxiliaryFile;
+import edu.harvard.iq.dataverse.AuxiliaryFileServiceBean;
 import edu.harvard.iq.dataverse.ControlledVocabularyValue;
+import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.datavariable.VariableCategory;
 import edu.harvard.iq.dataverse.datavariable.VariableServiceBean;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
@@ -36,18 +39,24 @@
 import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
 import edu.harvard.iq.dataverse.DatasetLock;
 import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.MetadataBlock;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.DataAccessOption;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
+import edu.harvard.iq.dataverse.dataaccess.S3AccessIO;
 import edu.harvard.iq.dataverse.dataaccess.TabularSubsetGenerator;
+import edu.harvard.iq.dataverse.datasetutility.FileExceedsMaxSizeException;
+import static edu.harvard.iq.dataverse.datasetutility.FileSizeChecker.bytesToHumanReadable;
 import edu.harvard.iq.dataverse.datavariable.SummaryStatistic;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.ingest.metadataextraction.FileMetadataExtractor;
 import edu.harvard.iq.dataverse.ingest.metadataextraction.FileMetadataIngest;
 import edu.harvard.iq.dataverse.ingest.metadataextraction.impl.plugins.fits.FITSFileMetadataExtractor;
+import edu.harvard.iq.dataverse.ingest.metadataextraction.impl.plugins.netcdf.NetcdfFileMetadataExtractor;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataFileReader;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataIngest;
 import edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.dta.DTAFileReader;
@@ -63,18 +72,27 @@
 import edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.sav.SAVFileReaderSpi;
 import edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.por.PORFileReader;
 import edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.por.PORFileReaderSpi;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.storageuse.StorageUseServiceBean;
+import edu.harvard.iq.dataverse.storageuse.UploadSessionQuotaLimit;
 import edu.harvard.iq.dataverse.util.*;
+import edu.harvard.iq.dataverse.util.file.FileExceedsStorageQuotaException;
+
+import org.apache.commons.io.IOUtils;
 //import edu.harvard.iq.dvn.unf.*;
 import org.dataverse.unf.*;
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -94,20 +112,24 @@
 import java.util.ListIterator;
 import java.util.logging.Logger;
 import java.util.Hashtable;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.jms.Queue;
-import javax.jms.QueueConnectionFactory;
-import javax.annotation.Resource;
-import javax.ejb.Asynchronous;
-import javax.jms.JMSException;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Message;
-import javax.faces.bean.ManagedBean;
-import javax.faces.application.FacesMessage;
+import java.util.Optional;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.annotation.Resource;
+import jakarta.ejb.Asynchronous;
+import jakarta.jms.JMSException;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Message;
+import jakarta.faces.application.FacesMessage;
+import jakarta.ws.rs.core.MediaType;
+import java.text.MessageFormat;
+import ucar.nc2.NetcdfFile;
+import ucar.nc2.NetcdfFiles;
 
 /**
  *
@@ -118,7 +140,6 @@
  */
 @Stateless
 @Named
-@ManagedBean
 public class IngestServiceBean {
     private static final Logger logger = Logger.getLogger(IngestServiceBean.class.getCanonicalName());
     @EJB
@@ -130,11 +151,15 @@ public class IngestServiceBean {
     @EJB
     DataFileServiceBean fileService; 
     @EJB
+    AuxiliaryFileServiceBean auxiliaryFileService;
+    @EJB
+    StorageUseServiceBean storageUseService; 
+    @EJB
     SystemConfig systemConfig;
 
-    @Resource(mappedName = "jms/DataverseIngest")
+    @Resource(lookup = "java:app/jms/queue/ingest")
     Queue queue;
-    @Resource(mappedName = "jms/IngestQueueConnectionFactory")
+    @Resource(lookup = "java:app/jms/factory/ingest")
     QueueConnectionFactory factory;
     
 
@@ -142,7 +167,8 @@ public class IngestServiceBean {
     private static String dateTimeFormat_ymdhmsS = "yyyy-MM-dd HH:mm:ss.SSS";
     private static String dateFormat_ymd = "yyyy-MM-dd";
     
-    // This method tries to permanently store new files on the filesystem. 
+    // This method tries to permanently store new files in storage (on the filesystem,
+    // in an S3 bucket, etc.).
     // Then it adds the files that *have been successfully saved* to the 
     // dataset (by attaching the DataFiles to the Dataset, and the corresponding
     // FileMetadatas to the DatasetVersion). It also tries to ensure that none 
@@ -150,206 +176,385 @@ public class IngestServiceBean {
     // attached to the Dataset via some cascade path (for example, via 
     // DataFileCategory objects, if any were already assigned to the files). 
     // It must be called before we attempt to permanently save the files in 
-    // the database by calling the Save command on the dataset and/or version. 
-    public List<DataFile> saveAndAddFilesToDataset(DatasetVersion version, List<DataFile> newFiles) {
+    // the database by calling the Save command on the dataset and/or version.
+    
+    // !! There is way too much going on in this method. :( !!
+    
+    // @todo: Is this method a good candidate for turning into a dedicated Command? 
+    public List<DataFile> saveAndAddFilesToDataset(DatasetVersion version,
+                                                   List<DataFile> newFiles,
+                                                   DataFile fileToReplace,
+                                                   boolean tabIngest,
+                                                   boolean ignoreUploadFileLimits) {
+        UploadSessionQuotaLimit uploadSessionQuota = null; 
         List<DataFile> ret = new ArrayList<>();
-        
+
         if (newFiles != null && newFiles.size() > 0) {
-            //ret = new ArrayList<>();
-            // final check for duplicate file names; 
-            // we tried to make the file names unique on upload, but then 
-            // the user may have edited them on the "add files" page, and 
+            // ret = new ArrayList<>();
+            // final check for duplicate file names;
+            // we tried to make the file names unique on upload, but then
+            // the user may have edited them on the "add files" page, and
             // renamed FOOBAR-1.txt back to FOOBAR.txt...
-
-            IngestUtil.checkForDuplicateFileNamesFinal(version, newFiles);
-
+            IngestUtil.checkForDuplicateFileNamesFinal(version, newFiles, fileToReplace);
             Dataset dataset = version.getDataset();
+            long totalBytesSaved = 0L;
 
-            for (DataFile dataFile : newFiles) {
-                String tempFileLocation = FileUtil.getFilesTempDirectory() + "/" + dataFile.getStorageIdentifier();
-
-                // Try to save the file in its permanent location: 
-                String storageId = dataFile.getStorageIdentifier().replaceFirst("^tmp://", "");
+            if (systemConfig.isStorageQuotasEnforced()) {
+                // Check if this dataset is subject to any storage quotas:
+                uploadSessionQuota = fileService.getUploadSessionQuotaLimit(dataset);
+            }
 
-                Path tempLocationPath = Paths.get(FileUtil.getFilesTempDirectory() + "/" + storageId);
-                WritableByteChannel writeChannel = null;
-                FileChannel readChannel = null;
+            Integer maxFiles = version.getDataset().getEffectiveDatasetFileCountLimit();
+            if (!ignoreUploadFileLimits && fileToReplace == null && version.getDataset().getId() != null && version.getDataset().isDatasetFileCountLimitSet(maxFiles)) {
+                maxFiles = maxFiles - datasetService.getDataFileCountByOwner(version.getDataset().getId());
+            } else {
+                maxFiles = Integer.MAX_VALUE;
+            }
 
+            for (DataFile dataFile : newFiles) {
                 boolean unattached = false;
                 boolean savedSuccess = false;
-                StorageIO<DataFile> dataAccess = null;
+                if (dataFile.getOwner() == null) {
+                    // is it ever "attached"? 
+                    // do we ever call this method with dataFile.getOwner() != null? 
+                    // - we really shouldn't be, either. 
+                    unattached = true;
+                    dataFile.setOwner(dataset);
+                }
 
-                try {
-                    logger.fine("Attempting to create a new storageIO object for " + storageId);
-                    if (dataFile.getOwner() == null) {
-                        unattached = true; 
-                        dataFile.setOwner(dataset);
-                    }
-                    dataAccess = DataAccess.createNewStorageIO(dataFile, storageId);
+                if (--maxFiles < 0) {
+                    logger.warning("Failed to save all the files due to the limit on the number of files that can be uploaded to this dataset.");
+                    break;
+                }
+                
+                String[] storageInfo = DataAccess.getDriverIdAndStorageLocation(dataFile.getStorageIdentifier());
+                String driverType = DataAccess.getDriverType(storageInfo[0]);
+                String storageLocation = storageInfo[1];
+                String tempFileLocation = null;
+                Path tempLocationPath = null;
+                long confirmedFileSize = 0L; 
+                if (driverType.equals("tmp")) {  //"tmp" is the default if no prefix or the "tmp://" driver
+                    tempFileLocation = FileUtil.getFilesTempDirectory() + "/" + storageLocation;
+
+                    // Try to save the file in its permanent location:
+                    tempLocationPath = Paths.get(tempFileLocation);
+                    WritableByteChannel writeChannel = null;
+                    FileChannel readChannel = null;
+
+                    StorageIO<DataFile> dataAccess = null;
 
-                    logger.fine("Successfully created a new storageIO object.");
-                    /* 
-                         This commented-out code demonstrates how to copy bytes
-                         from a local InputStream (or a readChannel) into the
-                         writable byte channel of a Dataverse DataAccessIO object:
-                     */
-                    
-                    /*
-                        storageIO.open(DataAccessOption.WRITE_ACCESS);
-                                                
-                        writeChannel = storageIO.getWriteChannel();
-                        readChannel = new FileInputStream(tempLocationPath.toFile()).getChannel();
-                                                
-                        long bytesPerIteration = 16 * 1024; // 16K bytes
-                        long start = 0;
-                        while ( start < readChannel.size() ) {
-                            readChannel.transferTo(start, bytesPerIteration, writeChannel);
-                            start += bytesPerIteration;
+                    try {
+                        logger.fine("Attempting to create a new storageIO object for " + storageLocation);
+                        dataAccess = DataAccess.createNewStorageIO(dataFile, storageLocation);
+
+                        logger.fine("Successfully created a new storageIO object.");
+                        /**
+                         * This commented-out code demonstrates how to copy
+                         * bytes from a local InputStream (or a readChannel)
+                         * into the writable byte channel of a Dataverse
+                         * DataAccessIO object:
+                         */
+
+                        /**
+                         * storageIO.open(DataAccessOption.WRITE_ACCESS);
+                         *
+                         * writeChannel = storageIO.getWriteChannel();
+                         * readChannel = new
+                         * FileInputStream(tempLocationPath.toFile()).getChannel();
+                         *
+                         * long bytesPerIteration = 16 * 1024; // 16K bytes long
+                         * start = 0; 
+                         * while ( start < readChannel.size() ) {
+                         *    readChannel.transferTo(start, bytesPerIteration, writeChannel); start += bytesPerIteration;
+                         * }
+                         */
+
+                        /**
+                         * But it's easier to use this convenience method from
+                         * the DataAccessIO:
+                         *
+                         * (if the underlying storage method for this file is
+                         * local filesystem, the DataAccessIO will simply copy
+                         * the file using Files.copy, like this:
+                         *
+                         * Files.copy(tempLocationPath,
+                         * storageIO.getFileSystemLocation(),
+                         * StandardCopyOption.REPLACE_EXISTING);
+                         */
+                        dataAccess.savePath(tempLocationPath);
+
+                        // Set filesize in bytes
+                        //
+                        confirmedFileSize = dataAccess.getSize();
+                        dataFile.setFilesize(confirmedFileSize);
+                        savedSuccess = true;
+                        logger.fine("Success: permanently saved file " + dataFile.getFileMetadata().getLabel());
+
+                        // TODO: reformat this file to remove the many tabs added in cc08330 - done, I think?
+                        extractMetadataNcml(dataFile, tempLocationPath);
+
+                    } catch (IOException ioex) {
+                        logger.warning("Failed to save the file, storage id " + dataFile.getStorageIdentifier() + " (" + ioex.getMessage() + ")");
+                    } finally {
+                        if (readChannel != null) {
+                            try {
+                                readChannel.close();
+                            } catch (IOException e) {
+                            }
                         }
-                     */
+                        if (writeChannel != null) {
+                            try {
+                                writeChannel.close();
+                            } catch (IOException e) {
+                            }
+                        }
+                    }
 
-                    /* 
-                            But it's easier to use this convenience method from the
-                            DataAccessIO: 
-                            
-                            (if the underlying storage method for this file is 
-                            local filesystem, the DataAccessIO will simply copy 
-                            the file using Files.copy, like this:
-                        
-                            Files.copy(tempLocationPath, storageIO.getFileSystemLocation(), StandardCopyOption.REPLACE_EXISTING);
-                     */
-                    dataAccess.savePath(tempLocationPath);
+                    // Since we may have already spent some CPU cycles scaling down image thumbnails, 
+                    // we may as well save them, by moving these generated images to the permanent
+                    // dataset directory. We should also remember to delete any such files in the
+                    // temp directory:
+                    List<Path> generatedTempFiles = listGeneratedTempFiles(Paths.get(FileUtil.getFilesTempDirectory()),
+                            storageLocation);
+                    if (generatedTempFiles != null) {
+                        for (Path generated : generatedTempFiles) {
+                            if (savedSuccess) { // no need to try to save this aux file permanently, if we've failed to
+                                // save the main file!
+                                logger.fine("(Will also try to permanently save generated thumbnail file "
+                                        + generated.toString() + ")");
+                                try {
+                                    // Files.copy(generated, Paths.get(dataset.getFileSystemDirectory().toString(),
+                                    // generated.getFileName().toString()));
+                                    int i = generated.toString().lastIndexOf("thumb");
+                                    if (i > 1) {
+                                        String extensionTag = generated.toString().substring(i);
+                                        dataAccess.savePathAsAux(generated, extensionTag);
+                                        logger.fine(
+                                                "Saved generated thumbnail as aux object. \"preview available\" status: "
+                                                + dataFile.isPreviewImageAvailable());
+                                    } else {
+                                        logger.warning(
+                                                "Generated thumbnail file name does not match the expected pattern: "
+                                                + generated.toString());
+                                    }
 
-                    // Set filesize in bytes
-                    // 
-                    dataFile.setFilesize(dataAccess.getSize());
-                    savedSuccess = true;
-                    logger.fine("Success: permanently saved file " + dataFile.getFileMetadata().getLabel());
+                                } catch (IOException ioex) {
+                                    logger.warning("Failed to save generated file " + generated.toString());
+                                }
+                            }
 
-                } catch (IOException ioex) {
-                    logger.warning("Failed to save the file, storage id " + dataFile.getStorageIdentifier() + " (" + ioex.getMessage() + ")");
-                } finally {
-                    if (readChannel != null) {
-                        try {
-                            readChannel.close();
-                        } catch (IOException e) {
+                            // ... but we definitely want to delete it:
+                            try {
+                                Files.delete(generated);
+                            } catch (IOException ioex) {
+                                logger.warning("Failed to delete generated file " + generated.toString());
+                            }
                         }
                     }
-                    if (writeChannel != null) {
-                        try {
-                            writeChannel.close();
-                        } catch (IOException e) {
+                    // Any necessary post-processing:
+                    // performPostProcessingTasks(dataFile);
+                } else {
+                    // This is a direct upload 
+                    try {
+                        StorageIO<DvObject> dataAccess = DataAccess.getStorageIO(dataFile);
+                        //Populate metadata
+                        
+                        // There are direct upload sub-cases where the file size 
+                        // is already known at this point. For example, direct uploads
+                        // to S3 that go through the jsf dataset page. Or the Globus
+                        // uploads, where the file sizes are looked up in bulk on 
+                        // the completion of the remote upload task. 
+                        if (dataFile.getFilesize() >= 0) {
+                            confirmedFileSize = dataFile.getFilesize();
+                        } else {
+                            dataAccess.open(DataAccessOption.READ_ACCESS);
+                            // (the .open() above makes a remote call to check if 
+                            // the file exists and obtains its size)
+                            confirmedFileSize = dataAccess.getSize();
+                        }
+                        
+                        // For directly-uploaded files, we will perform the file size
+                        // limit and quota checks here. Perform them *again*, in 
+                        // some cases: files directly uploaded via the UI have already been 
+                        // checked (for the sake of being able to reject the upload 
+                        // before the user clicks "save"). But in case of direct 
+                        // uploads via API, these checks haven't been performed yet, 
+                        // so, here's our chance.
+                        
+                        Long fileSizeLimit = systemConfig.getMaxFileUploadSizeForStore(version.getDataset().getEffectiveStorageDriverId());
+                        
+                        if (fileSizeLimit == null || confirmedFileSize < fileSizeLimit) {
+                        
+                            //set file size
+                            if (dataFile.getFilesize() < 0) {
+                                logger.fine("Setting file size: " + confirmedFileSize);
+                                dataFile.setFilesize(confirmedFileSize);
+                            }
+                                                
+                            if (dataAccess instanceof S3AccessIO) {
+                                ((S3AccessIO<DvObject>) dataAccess).removeTempTag();
+                            }
+                            savedSuccess = true;
+                            logger.info("directly uploaded file successfully saved. file size: "+dataFile.getFilesize());
                         }
+                    } catch (IOException ioex) {
+                        logger.warning("Failed to get file size, storage id, or failed to remove the temp tag on the saved S3 object" + dataFile.getStorageIdentifier() + " ("
+                                + ioex.getMessage() + ")");
                     }
                 }
                 
-                // Since we may have already spent some CPU cycles scaling down image thumbnails, 
-                // we may as well save them, by moving these generated images to the permanent 
-                // dataset directory. We should also remember to delete any such files in the
-                // temp directory:
-                List<Path> generatedTempFiles = listGeneratedTempFiles(Paths.get(FileUtil.getFilesTempDirectory()), storageId);
-                if (generatedTempFiles != null) {
-                    for (Path generated : generatedTempFiles) {
-                        if (savedSuccess) { // no need to try to save this aux file permanently, if we've failed to save the main file!
-                            logger.fine("(Will also try to permanently save generated thumbnail file " + generated.toString() + ")");
-                            try {
-                                //Files.copy(generated, Paths.get(dataset.getFileSystemDirectory().toString(), generated.getFileName().toString()));
-                                int i = generated.toString().lastIndexOf("thumb");
-                                if (i > 1) {
-                                    String extensionTag = generated.toString().substring(i);
-                                    dataAccess.savePathAsAux(generated, extensionTag);
-                                    logger.fine("Saved generated thumbnail as aux object. \"preview available\" status: " + dataFile.isPreviewImageAvailable());
-                                } else {
-                                    logger.warning("Generated thumbnail file name does not match the expected pattern: " + generated.toString());
-                                }
+                // If quotas are enforced, we will perform a quota check here. 
+                // If this is an upload via the UI, we must have already 
+                // performed this check once. But it is possible that somebody 
+                // else may have added more data to the same collection/dataset 
+                // etc., before this user was ready to click "save", so this is
+                // necessary. For other cases, such as the direct uploads via 
+                // the API, this is the single point in the workflow where  
+                // storage quotas are enforced. 
 
-                            } catch (IOException ioex) {
-                                logger.warning("Failed to save generated file " + generated.toString());
-                            }
+                if (savedSuccess) {
+                    if (uploadSessionQuota != null) {
+                        // It may be worth considering refreshing the quota here, 
+                        // and incrementing the Storage Use record for 
+                        // all the parent objects in real time, as 
+                        // *each* individual file is being saved. I experimented
+                        // with that, but decided against it for performance 
+                        // reasons. But yes, there may be some edge case where 
+                        // parallel multi-file uploads can end up being able 
+                        // to save 2X worth the quota that was available at the 
+                        // beginning of each session. 
+                        if (confirmedFileSize > uploadSessionQuota.getRemainingQuotaInBytes()) {
+                            savedSuccess = false;
+                            logger.warning("file size over quota limit, skipping");
+                            // @todo: we need to figure out how to better communicate
+                            // this (potentially partial) failure to the user.  
+                            //throw new FileExceedsStorageQuotaException(MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.quota_exceeded"), bytesToHumanReadable(confirmedFileSize), bytesToHumanReadable(storageQuotaLimit)));
+                        } else {
+                            // Adjust quota: 
+                            logger.info("Setting total usage in bytes to " + (uploadSessionQuota.getTotalUsageInBytes() + confirmedFileSize));
+                            uploadSessionQuota.setTotalUsageInBytes(uploadSessionQuota.getTotalUsageInBytes() + confirmedFileSize);
                         }
+                    }
 
-                        // ... but we definitely want to delete it:
-                        try {
-                            Files.delete(generated);
-                        } catch (IOException ioex) {
-                            logger.warning("Failed to delete generated file " + generated.toString());
-                        }
+                    // ... unless we had to reject the file just now because of 
+                    // the quota limits, count the number of bytes saved for the 
+                    // purposes of incrementing the total storage of the parent
+                    // DvObjectContainers:
+                    
+                    if (savedSuccess) {
+                        totalBytesSaved += confirmedFileSize; 
                     }
                 }
 
-                // ... and let's delete the main temp file:
+                logger.fine("Done! Finished saving new file in permanent storage and adding it to the dataset.");
+                boolean belowLimit = false;
+
                 try {
-                    logger.fine("Will attempt to delete the temp file " + tempLocationPath.toString());
-                    Files.delete(tempLocationPath);
-                } catch (IOException ex) {
-                    // (non-fatal - it's just a temp file.)
-                    logger.warning("Failed to delete temp file " + tempLocationPath.toString());
+                    //getting StorageIO may require knowing the owner (so this must come before owner is potentially set back to null
+                    belowLimit = dataFile.getStorageIO().isBelowIngestSizeLimit();
+                } catch (IOException e) {
+                    logger.warning("Error getting ingest limit for file: " + dataFile.getIdentifier() + " : " + e.getMessage());
                 }
 
-                if (unattached) {
-                    dataFile.setOwner(null);
-                }
-                // Any necessary post-processing: 
-                //performPostProcessingTasks(dataFile);
-                
-                if (savedSuccess) {
-                    // These are all brand new files, so they should all have 
-                    // one filemetadata total. -- L.A. 
+                if (savedSuccess && belowLimit) {
+                    // These are all brand new files, so they should all have
+                    // one filemetadata total. -- L.A.
                     FileMetadata fileMetadata = dataFile.getFileMetadatas().get(0);
                     String fileName = fileMetadata.getLabel();
 
                     boolean metadataExtracted = false;
-                    if (FileUtil.canIngestAsTabular(dataFile)) {
-                        /*
-                         * Note that we don't try to ingest the file right away - 
-                         * instead we mark it as "scheduled for ingest", then at 
-                         * the end of the save process it will be queued for async. 
-                         * ingest in the background. In the meantime, the file 
-                         * will be ingested as a regular, non-tabular file, and 
-                         * appear as such to the user, until the ingest job is
-                         * finished with the Ingest Service.
+                    boolean metadataExtractedFromNetcdf = false;
+                    if (tabIngest && FileUtil.canIngestAsTabular(dataFile)) {
+                        /**
+                         * Note that we don't try to ingest the file right away
+                         * - instead we mark it as "scheduled for ingest", then
+                         * at the end of the save process it will be queued for
+                         * async. ingest in the background. In the meantime, the
+                         * file will be ingested as a regular, non-tabular file,
+                         * and appear as such to the user, until the ingest job
+                         * is finished with the Ingest Service.
                          */
                         dataFile.SetIngestScheduled();
                     } else if (fileMetadataExtractable(dataFile)) {
 
                         try {
-                            // FITS is the only type supported for metadata 
-                            // extraction, as of now. -- L.A. 4.0 
+                            // FITS is the only type supported for metadata
+                            // extraction, as of now. -- L.A. 4.0
+                            // Note that extractMetadataNcml() is used for NetCDF/HDF5.
                             dataFile.setContentType("application/fits");
                             metadataExtracted = extractMetadata(tempFileLocation, dataFile, version);
                         } catch (IOException mex) {
-                            logger.severe("Caught exception trying to extract indexable metadata from file " + fileName + ",  " + mex.getMessage());
+                            logger.severe("Caught exception trying to extract indexable metadata from file "
+                                    + fileName + ",  " + mex.getMessage());
                         }
                         if (metadataExtracted) {
                             logger.fine("Successfully extracted indexable metadata from file " + fileName);
                         } else {
                             logger.fine("Failed to extract indexable metadata from file " + fileName);
                         }
+                    } else if (fileMetadataExtractableFromNetcdf(dataFile, tempLocationPath)) {
+                        try {
+                            logger.fine("trying to extract metadata from netcdf");
+                            metadataExtractedFromNetcdf = extractMetadataFromNetcdf(tempFileLocation, dataFile, version);
+                        } catch (IOException ex) {
+                            logger.fine("could not extract metadata from netcdf: " + ex);
+                        }
+                        if (metadataExtractedFromNetcdf) {
+                            logger.fine("Successfully extracted indexable metadata from netcdf file " + fileName);
+                        } else {
+                            logger.fine("Failed to extract indexable metadata from netcdf file " + fileName);
+                        }
+
+                    } else if (FileUtil.MIME_TYPE_INGESTED_FILE.equals(dataFile.getContentType())) {
+                        // Make sure no *uningested* tab-delimited files are saved with the type "text/tab-separated-values"!
+                        // "text/tsv" should be used instead: 
+                        dataFile.setContentType(FileUtil.MIME_TYPE_TSV);
                     }
+                }
+                if (unattached) {
+                    dataFile.setOwner(null);
+                }
+                // ... and let's delete the main temp file if it exists:
+                if (tempLocationPath != null) {
+                    try {
+                        logger.fine("Will attempt to delete the temp file " + tempLocationPath.toString());
+                        Files.delete(tempLocationPath);
+                    } catch (IOException ex) {
+                        // (non-fatal - it's just a temp file.)
+                        logger.warning("Failed to delete temp file " + tempLocationPath.toString());
+                    }
+                }
+                if (savedSuccess) {
                     // temp dbug line
-                    //System.out.println("ADDING FILE: " + fileName + "; for dataset: " + dataset.getGlobalId());                    
-                    // Make sure the file is attached to the dataset and to the version, if this 
+                    // System.out.println("ADDING FILE: " + fileName + "; for dataset: " +
+                    // dataset.getGlobalId());
+                    // Make sure the file is attached to the dataset and to the version, if this
                     // hasn't been done yet:
+                    // @todo: but shouldn't we be doing the reverse if we haven't been 
+                    // able to save the file? - disconnect it from the dataset and 
+                    // the version?? - L.A. 2023 
+                    // (that said, is there *ever* a case where dataFile.getOwner() != null ?)
                     if (dataFile.getOwner() == null) {
                         dataFile.setOwner(dataset);
 
                         version.getFileMetadatas().add(dataFile.getFileMetadata());
                         dataFile.getFileMetadata().setDatasetVersion(version);
                         dataset.getFiles().add(dataFile);
-                        
+
                         if (dataFile.getFileMetadata().getCategories() != null) {
-                            ListIterator<DataFileCategory> dfcIt = dataFile.getFileMetadata().getCategories().listIterator();
+                            ListIterator<DataFileCategory> dfcIt = dataFile.getFileMetadata().getCategories()
+                                    .listIterator();
 
                             while (dfcIt.hasNext()) {
                                 DataFileCategory dataFileCategory = dfcIt.next();
-                                
+
                                 if (dataFileCategory.getDataset() == null) {
                                     DataFileCategory newCategory = dataset.getCategoryByName(dataFileCategory.getName());
                                     if (newCategory != null) {
                                         newCategory.addFileMetadata(dataFile.getFileMetadata());
-                                        //dataFileCategory = newCategory;
+                                        // dataFileCategory = newCategory;
                                         dfcIt.set(newCategory);
-                                    } else { 
+                                    } else {
                                         dfcIt.remove();
                                     }
                                 }
@@ -357,13 +562,26 @@ from a local InputStream (or a readChannel) into the
                         }
                     }
                     
+                    // Hmm. Noticing that the following two things - adding the 
+                    // files to the return list were being 
+                    // done outside of this "if (savedSuccess)" block. I'm pretty
+                    // sure that was wrong. - L.A. 11-30-2023
                     ret.add(dataFile);
+                    // (unless that is that return value isn't used for anything - ?)
                 }
-            }
 
-            logger.fine("Done! Finished saving new files in permanent storage and adding them to the dataset.");
+            }
+            // Update storage use for all the parent dvobjects: 
+            logger.info("Incrementing recorded storage use by " + totalBytesSaved + " bytes for dataset " + dataset.getId());
+            // Q. Need to consider what happens when this code is called on Create?
+            // A. It works on create as well, yes. (the recursive increment
+            // query in the method below does need the parent dataset to 
+            // have the database id. But even if these files have been
+            // uploaded on the Create form, we first save the dataset, and 
+            // then add the files to it. - L.A. 
+            storageUseService.incrementStorageSizeRecursively(dataset.getId(), totalBytesSaved);
         }
-        
+
         return ret;
     }
     
@@ -408,27 +626,29 @@ public void startIngestJobsForDataset(Dataset dataset, AuthenticatedUser user) {
                 // todo: investigate why when calling save with the file object
                 // gotten from the loop, the roles assignment added at create is removed
                 // (switching to refinding via id resolves that)                
+                // possible explanation: when flush-mode is auto, flush is on query,
+                // we make sure that the roles assignment added at create is flushed
                 dataFile = fileService.find(dataFile.getId());
                 scheduledFiles.add(dataFile);
             }
         }
 
-        startIngestJobs(scheduledFiles, user);
+        startIngestJobs(dataset.getId(), scheduledFiles, user);
     }
     
-    public String startIngestJobs(List<DataFile> dataFiles, AuthenticatedUser user) {
+    public String startIngestJobs(Long datasetId, List<DataFile> dataFiles, AuthenticatedUser user) {
 
         IngestMessage ingestMessage = null;
         StringBuilder sb = new StringBuilder();
 
         List<DataFile> scheduledFiles = new ArrayList<>();
         for (DataFile dataFile : dataFiles) {
+            // refresh the copy of the DataFile:
+            dataFile = fileService.find(dataFile.getId());
+            
             if (dataFile.isIngestScheduled()) {
 
-                // refresh the copy of the DataFile:
-                dataFile = fileService.find(dataFile.getId());
-
-                long ingestSizeLimit = -1;
+                long ingestSizeLimit = 0;
                 try {
                     ingestSizeLimit = systemConfig.getTabularIngestSizeLimit(getTabDataReaderByMimeType(dataFile.getContentType()).getFormatName());
                 } catch (IOException ioex) {
@@ -457,7 +677,7 @@ public String startIngestJobs(List<DataFile> dataFiles, AuthenticatedUser user)
         if (count > 0) {
             String info = "Ingest of " + count + " tabular data file(s) is in progress.";
             logger.info(info);
-            datasetService.addDatasetLock(scheduledFiles.get(0).getOwner().getId(),
+            datasetService.addDatasetLock(datasetId,
                     DatasetLock.Reason.Ingest,
                     (user != null) ? user.getId() : null,
                     info);
@@ -475,10 +695,12 @@ public int compare(DataFile d1, DataFile d2) {
                 }
             });
 
-            ingestMessage = new IngestMessage(IngestMessage.INGEST_MESAGE_LEVEL_INFO, user.getId());
+            ingestMessage = new IngestMessage(user.getId());
             for (int i = 0; i < count; i++) {
                 ingestMessage.addFileId(scheduledFilesArray[i].getId());
             }
+            ingestMessage.setDatasetId(datasetId);
+            ingestMessage.setInfo(info);
 
             QueueConnection conn = null;
             QueueSession session = null;
@@ -519,7 +741,6 @@ public int compare(DataFile d1, DataFile d2) {
         return sb.toString();
     }
 
-    
     public void produceSummaryStatistics(DataFile dataFile, File generatedTabularFile) throws IOException {
         /*
         logger.info("Skipping summary statistics and UNF.");
@@ -533,43 +754,38 @@ public void produceSummaryStatistics(DataFile dataFile, File generatedTabularFil
     }
     
     public void produceContinuousSummaryStatistics(DataFile dataFile, File generatedTabularFile) throws IOException {
-
-        /* 
-        // quick, but memory-inefficient way:
-        // - this method just loads the entire file-worth of continuous vectors 
-        // into a Double[][] matrix. 
-        //Double[][] variableVectors = subsetContinuousVectors(dataFile);
-        //calculateContinuousSummaryStatistics(dataFile, variableVectors);
-        
-        // A more sophisticated way: this subsets one column at a time, using 
-        // the new optimized subsetting that does not have to read any extra 
-        // bytes from the file to extract the column:
-        
-        TabularSubsetGenerator subsetGenerator = new TabularSubsetGenerator();
-        */
         
         for (int i = 0; i < dataFile.getDataTable().getVarQuantity(); i++) {
             if (dataFile.getDataTable().getDataVariables().get(i).isIntervalContinuous()) {
                 logger.fine("subsetting continuous vector");
-
-                if ("float".equals(dataFile.getDataTable().getDataVariables().get(i).getFormat())) {
-                    Float[] variableVector = TabularSubsetGenerator.subsetFloatVector(new FileInputStream(generatedTabularFile), i, dataFile.getDataTable().getCaseQuantity().intValue());
-                    logger.fine("Calculating summary statistics on a Float vector;");
-                    calculateContinuousSummaryStatistics(dataFile, i, variableVector);
-                    // calculate the UNF while we are at it:
-                    logger.fine("Calculating UNF on a Float vector;");
-                    calculateUNF(dataFile, i, variableVector);
-                    variableVector = null; 
-                } else {
-                    Double[] variableVector = TabularSubsetGenerator.subsetDoubleVector(new FileInputStream(generatedTabularFile), i, dataFile.getDataTable().getCaseQuantity().intValue());
-                    logger.fine("Calculating summary statistics on a Double vector;");
-                    calculateContinuousSummaryStatistics(dataFile, i, variableVector);
-                    // calculate the UNF while we are at it:
-                    logger.fine("Calculating UNF on a Double vector;");
-                    calculateUNF(dataFile, i, variableVector);
-                    variableVector = null; 
+                try (InputStream in = new FileInputStream(generatedTabularFile)) {
+                    if ("float".equals(dataFile.getDataTable().getDataVariables().get(i).getFormat())) {
+                        Float[] variableVector = TabularSubsetGenerator.subsetFloatVector(
+                                in,
+                                i,
+                                dataFile.getDataTable().getCaseQuantity().intValue(),
+                                dataFile.getDataTable().isStoredWithVariableHeader());
+                        logger.fine("Calculating summary statistics on a Float vector;");
+                        calculateContinuousSummaryStatistics(dataFile, i, variableVector);
+                        // calculate the UNF while we are at it:
+                        logger.fine("Calculating UNF on a Float vector;");
+                        calculateUNF(dataFile, i, variableVector);
+                        variableVector = null;
+                    } else {
+                        Double[] variableVector = TabularSubsetGenerator.subsetDoubleVector(
+                                in,
+                                i,
+                                dataFile.getDataTable().getCaseQuantity().intValue(),
+                                dataFile.getDataTable().isStoredWithVariableHeader());
+                        logger.fine("Calculating summary statistics on a Double vector;");
+                        calculateContinuousSummaryStatistics(dataFile, i, variableVector);
+                        // calculate the UNF while we are at it:
+                        logger.fine("Calculating UNF on a Double vector;");
+                        calculateUNF(dataFile, i, variableVector);
+                        variableVector = null;
+                    }
+                    logger.fine("Done! (continuous);");
                 }
-                logger.fine("Done! (continuous);");
             }
         }
     }
@@ -582,17 +798,22 @@ public void produceDiscreteNumericSummaryStatistics(DataFile dataFile, File gene
             if (dataFile.getDataTable().getDataVariables().get(i).isIntervalDiscrete()
                     && dataFile.getDataTable().getDataVariables().get(i).isTypeNumeric()) {
                 logger.fine("subsetting discrete-numeric vector");
-
-                Long[] variableVector = TabularSubsetGenerator.subsetLongVector(new FileInputStream(generatedTabularFile), i, dataFile.getDataTable().getCaseQuantity().intValue());
-                // We are discussing calculating the same summary stats for 
-                // all numerics (the same kind of sumstats that we've been calculating
-                // for numeric continuous type)  -- L.A. Jul. 2014
-                calculateContinuousSummaryStatistics(dataFile, i, variableVector);
-                // calculate the UNF while we are at it:
-                logger.fine("Calculating UNF on a Long vector");
-                calculateUNF(dataFile, i, variableVector);
-                logger.fine("Done! (discrete numeric)");
-                variableVector = null; 
+                try (InputStream in = new FileInputStream(generatedTabularFile)) {
+                    Long[] variableVector = TabularSubsetGenerator.subsetLongVector(
+                            in,
+                            i,
+                            dataFile.getDataTable().getCaseQuantity().intValue(),
+                            dataFile.getDataTable().isStoredWithVariableHeader());
+                    // We are discussing calculating the same summary stats for
+                    // all numerics (the same kind of sumstats that we've been calculating
+                    // for numeric continuous type) -- L.A. Jul. 2014
+                    calculateContinuousSummaryStatistics(dataFile, i, variableVector);
+                    // calculate the UNF while we are at it:
+                    logger.fine("Calculating UNF on a Long vector");
+                    calculateUNF(dataFile, i, variableVector);
+                    logger.fine("Done! (discrete numeric)");
+                    variableVector = null;
+                }
             }
         }
     }
@@ -617,13 +838,19 @@ public void produceCharacterSummaryStatistics(DataFile dataFile, File generatedT
             if (dataFile.getDataTable().getDataVariables().get(i).isTypeCharacter()) {
 
                 logger.fine("subsetting character vector");
-                String[] variableVector = TabularSubsetGenerator.subsetStringVector(new FileInputStream(generatedTabularFile), i, dataFile.getDataTable().getCaseQuantity().intValue());
-                //calculateCharacterSummaryStatistics(dataFile, i, variableVector);
-                // calculate the UNF while we are at it:
-                logger.fine("Calculating UNF on a String vector");
-                calculateUNF(dataFile, i, variableVector);
-                logger.fine("Done! (character)");
-                variableVector = null; 
+                try (InputStream in = new FileInputStream(generatedTabularFile)) {
+                    String[] variableVector = TabularSubsetGenerator.subsetStringVector(
+                            in,
+                            i,
+                            dataFile.getDataTable().getCaseQuantity().intValue(),
+                            dataFile.getDataTable().isStoredWithVariableHeader());
+                    // calculateCharacterSummaryStatistics(dataFile, i, variableVector);
+                    // calculate the UNF while we are at it:
+                    logger.fine("Calculating UNF on a String vector");
+                    calculateUNF(dataFile, i, variableVector);
+                    logger.fine("Done! (character)");
+                    variableVector = null;
+                }
             }
         }
     }
@@ -635,20 +862,30 @@ public static void produceFrequencyStatistics(DataFile dataFile, File generatedT
         produceFrequencies(generatedTabularFile, vars);
     }
 
-    public static void produceFrequencies( File generatedTabularFile, List<DataVariable> vars) throws IOException {
+    public static void produceFrequencies(File generatedTabularFile, List<DataVariable> vars) throws IOException {
 
         for (int i = 0; i < vars.size(); i++) {
 
             Collection<VariableCategory> cats = vars.get(i).getCategories();
             int caseQuantity = vars.get(i).getDataTable().getCaseQuantity().intValue();
             boolean isNumeric = vars.get(i).isTypeNumeric();
+            boolean skipVariableHeaderLine = vars.get(i).getDataTable().isStoredWithVariableHeader();
             Object[] variableVector = null;
             if (cats.size() > 0) {
-                if (isNumeric) {
-                    variableVector = TabularSubsetGenerator.subsetFloatVector(new FileInputStream(generatedTabularFile), i, caseQuantity);
-                }
-                else {
-                    variableVector = TabularSubsetGenerator.subsetStringVector(new FileInputStream(generatedTabularFile), i, caseQuantity);
+                try (InputStream in = new FileInputStream(generatedTabularFile)) {
+                    if (isNumeric) {
+                        variableVector = TabularSubsetGenerator.subsetFloatVector(
+                                in,
+                                i,
+                                caseQuantity,
+                                skipVariableHeaderLine);
+                    } else {
+                        variableVector = TabularSubsetGenerator.subsetStringVector(
+                                in,
+                                i,
+                                caseQuantity,
+                                skipVariableHeaderLine);
+                    }
                 }
                 if (variableVector != null) {
                     Hashtable<Object, Double> freq = calculateFrequency(variableVector);
@@ -730,6 +967,16 @@ public boolean ingestAsTabular(Long datafile_id) {
         DataFile dataFile = fileService.find(datafile_id);
         boolean ingestSuccessful = false;
         boolean forceTypeCheck = false;
+        boolean storingWithVariableHeader = systemConfig.isStoringIngestedFilesWithHeaders();
+        
+        // Never attempt to ingest a file that's already ingested!
+        if (dataFile.isTabularData()) {
+            FileUtil.createIngestFailureReport(dataFile, "Repeated ingest attempted on a tabular data file! (status flag was: "+dataFile.getIngestStatus());
+            dataFile.setIngestDone();
+            dataFile = fileService.save(dataFile);
+            logger.warning("Repeated ingest attempted on a tabular data file (datafile id "+datafile_id+"); exiting.");
+            return false;
+        }
         
         IngestRequest ingestRequest = dataFile.getIngestRequest();
         if (ingestRequest != null) {
@@ -769,12 +1016,13 @@ public boolean ingestAsTabular(Long datafile_id) {
                 localFile = storageIO.getFileSystemPath().toFile();
                 inputStream = new BufferedInputStream(storageIO.getInputStream());
             } else {
-                ReadableByteChannel dataFileChannel = storageIO.getReadChannel();
+                
                 localFile = File.createTempFile("tempIngestSourceFile", ".tmp");
-                FileChannel tempIngestSourceChannel = new FileOutputStream(localFile).getChannel();
+				try (ReadableByteChannel dataFileChannel = storageIO.getReadChannel();
+						FileChannel tempIngestSourceChannel = new FileOutputStream(localFile).getChannel();) {
 
-                tempIngestSourceChannel.transferFrom(dataFileChannel, 0, storageIO.getSize());
-                
+					tempIngestSourceChannel.transferFrom(dataFileChannel, 0, storageIO.getSize());
+				}
                 inputStream = new BufferedInputStream(new FileInputStream(localFile));
                 logger.fine("Saved "+storageIO.getSize()+" bytes in a local temp file.");
             }
@@ -821,11 +1069,7 @@ public boolean ingestAsTabular(Long datafile_id) {
         
         TabularDataIngest tabDataIngest = null; 
         try {
-            if (additionalData != null) {
-                tabDataIngest = ingestPlugin.read(inputStream, additionalData);
-            } else {
-                tabDataIngest = ingestPlugin.read(inputStream, null);
-            }
+            tabDataIngest = ingestPlugin.read(inputStream, storingWithVariableHeader, additionalData);
         } catch (IOException ingestEx) {
             dataFile.SetIngestProblem();
             FileUtil.createIngestFailureReport(dataFile, ingestEx.getMessage());
@@ -841,6 +1085,8 @@ public boolean ingestAsTabular(Long datafile_id) {
             logger.warning("Ingest failure (Exception " + unknownEx.getClass() + "): "+unknownEx.getMessage()+".");
             return false;
             
+        } finally {
+        	IOUtils.closeQuietly(inputStream);
         }
 
         String originalContentType = dataFile.getContentType();
@@ -875,7 +1121,9 @@ public boolean ingestAsTabular(Long datafile_id) {
 
                 dataFile.setDataTable(tabDataIngest.getDataTable());
                 tabDataIngest.getDataTable().setDataFile(dataFile);
-
+                tabDataIngest.getDataTable().setOriginalFileName(originalFileName);
+                dataFile.getDataTable().setStoredWithVariableHeader(storingWithVariableHeader);
+                
                 try {
                     produceSummaryStatistics(dataFile, tabFile);
                     produceFrequencyStatistics(dataFile, tabFile);
@@ -911,7 +1159,7 @@ public boolean ingestAsTabular(Long datafile_id) {
                             throw new EJBException("Deliberate database save failure");
                         }
                      */
-                    dataFile = fileService.save(dataFile);
+                    dataFile = fileService.saveInTransaction(dataFile);
                     databaseSaveSuccessful = true;
 
                     logger.fine("Ingest (" + dataFile.getFileMetadata().getLabel() + ".");
@@ -937,8 +1185,15 @@ public boolean ingestAsTabular(Long datafile_id) {
                     }
                 }
 
-                if (!databaseSaveSuccessful) {
-                    logger.warning("Ingest failure (!databaseSaveSuccessful).");
+                if (databaseSaveSuccessful) {
+                    // Add the size of the tab-delimited version of the data file 
+                    // that we have produced and stored to the recorded storage 
+                    // size of all the ancestor DvObjectContainers: 
+                    if (dataFile.getFilesize() > 0) {
+                        storageUseService.incrementStorageSizeRecursively(dataFile.getOwner().getId(), dataFile.getFilesize());
+                    }
+                } else {
+                    logger.warning("Ingest failure (failed to save the tabular data in the database; file left intact as uploaded).");
                     return false;
                 }
 
@@ -959,8 +1214,12 @@ public boolean ingestAsTabular(Long datafile_id) {
 
                     // Replace contents of the file with the tab-delimited data produced:
                     dataAccess.savePath(Paths.get(tabFile.getAbsolutePath()));
+                    
                     // Reset the file size: 
                     dataFile.setFilesize(dataAccess.getSize());
+                    
+                    dataFile = fileService.save(dataFile);
+                    logger.fine("saved data file after updating the size");
 
                     // delete the temp tab-file:
                     tabFile.delete();
@@ -991,25 +1250,6 @@ public boolean ingestAsTabular(Long datafile_id) {
         return ingestSuccessful;
     }
 
-    private BufferedInputStream openFile(DataFile dataFile) throws IOException {
-        BufferedInputStream inputStream;
-        StorageIO<DataFile> storageIO = dataFile.getStorageIO();
-        storageIO.open();
-        if (storageIO.isLocalFile()) {
-            inputStream = new BufferedInputStream(storageIO.getInputStream());
-        } else {
-            ReadableByteChannel dataFileChannel = storageIO.getReadChannel();
-            File tempFile = File.createTempFile("tempIngestSourceFile", ".tmp");
-            FileChannel tempIngestSourceChannel = new FileOutputStream(tempFile).getChannel();
-            
-            tempIngestSourceChannel.transferFrom(dataFileChannel, 0, storageIO.getSize());
-            
-            inputStream = new BufferedInputStream(new FileInputStream(tempFile));
-            logger.fine("Saved "+storageIO.getSize()+" bytes in a local temp file.");
-        }
-        return inputStream;
-    }
-
     private void restoreIngestedDataFile(DataFile dataFile, TabularDataIngest tabDataIngest, long originalSize, String originalFileName, String originalContentType) {
         dataFile.setDataTables(null);
         if (tabDataIngest != null && tabDataIngest.getDataTable() != null) {
@@ -1068,7 +1308,7 @@ public static TabularDataFileReader getTabDataReaderByMimeType(String mimeType)
             ingestPlugin = new RDATAFileReader(new RDATAFileReaderSpi());
         } else if (mimeType.equals(FileUtil.MIME_TYPE_CSV) || mimeType.equals(FileUtil.MIME_TYPE_CSV_ALT)) {
             ingestPlugin = new CSVFileReader(new CSVFileReaderSpi(), ',');
-        } else if (mimeType.equals(FileUtil.MIME_TYPE_TSV) || mimeType.equals(FileUtil.MIME_TYPE_TSV_ALT)) {
+        } else if (mimeType.equals(FileUtil.MIME_TYPE_TSV) /*|| mimeType.equals(FileUtil.MIME_TYPE_TSV_ALT)*/) {
             ingestPlugin = new CSVFileReader(new CSVFileReaderSpi(), '\t');
         }  else if (mimeType.equals(FileUtil.MIME_TYPE_XLSX)) {
             ingestPlugin = new XLSXFileReader(new XLSXFileReaderSpi());
@@ -1093,7 +1333,19 @@ public boolean fileMetadataExtractable(DataFile dataFile) {
         }
         return false;
     }
-    
+
+    // Inspired by fileMetadataExtractable, above
+    public boolean fileMetadataExtractableFromNetcdf(DataFile dataFile, Path tempLocationPath) {
+        logger.fine("fileMetadataExtractableFromNetcdf dataFileIn: " + dataFile + ". tempLocationPath: " + tempLocationPath + ". contentType: " + dataFile.getContentType());
+        if (dataFile.getContentType() != null
+                && (dataFile.getContentType().equals(FileUtil.MIME_TYPE_NETCDF)
+                || dataFile.getContentType().equals(FileUtil.MIME_TYPE_XNETCDF)
+                || dataFile.getContentType().equals(FileUtil.MIME_TYPE_HDF5))) {
+            return true;
+        }
+        return false;
+    }
+
     /* 
      * extractMetadata: 
      * framework for extracting metadata from uploaded files. The results will 
@@ -1102,12 +1354,17 @@ public boolean fileMetadataExtractable(DataFile dataFile) {
     public boolean extractMetadata(String tempFileLocation, DataFile dataFile, DatasetVersion editVersion) throws IOException {
         boolean ingestSuccessful = false;
 
-        FileInputStream tempFileInputStream = null; 
-        
-        try {
-            tempFileInputStream = new FileInputStream(new File(tempFileLocation));
-        } catch (FileNotFoundException notfoundEx) {
-            throw new IOException("Could not open temp file "+tempFileLocation);
+        InputStream tempFileInputStream = null; 
+        if(tempFileLocation == null) {
+        	StorageIO<DataFile> sio = dataFile.getStorageIO();
+        	sio.open(DataAccessOption.READ_ACCESS);
+        	tempFileInputStream = sio.getInputStream();
+        } else {
+        	try {
+        		tempFileInputStream = new FileInputStream(new File(tempFileLocation));
+        	} catch (FileNotFoundException notfoundEx) {
+        		throw new IOException("Could not open temp file "+tempFileLocation);
+        	}
         }
         
         // Locate metadata extraction plugin for the file format by looking
@@ -1140,7 +1397,208 @@ public boolean extractMetadata(String tempFileLocation, DataFile dataFile, Datas
         return ingestSuccessful;
     }
 
-    
+    /**
+     * Try to extract bounding box (west, south, east, north).
+     *
+     * Inspired by extractMetadata(). Consider merging the methods. Note that
+     * unlike extractMetadata(), we are not calling processFileLevelMetadata().
+     *
+     * Also consider merging with extractMetadataNcml() but while NcML should be
+     * extractable from all files that the NetCDF Java library can open only
+     * some NetCDF files will have a bounding box.
+     *
+     * Note that if we haven't yet created an API endpoint for this method for
+     * files that are already persisted to disk or S3, but the code should work
+     * to download files from S3 as necessary.
+     */
+    public boolean extractMetadataFromNetcdf(String tempFileLocation, DataFile dataFile, DatasetVersion editVersion) throws IOException {
+        boolean ingestSuccessful = false;
+
+        String dataFileLocation = null;
+        if (tempFileLocation != null) {
+            logger.fine("tempFileLocation is non null. Setting dataFileLocation to " + tempFileLocation);
+            dataFileLocation = tempFileLocation;
+        } else {
+            logger.fine("tempFileLocation is null. Perhaps the file is alrady on disk or S3 direct upload is enabled.");
+            File tempFile = null;
+            File localFile;
+            StorageIO<DataFile> storageIO = null;
+            try {
+                storageIO = dataFile.getStorageIO();
+                
+                if (storageIO.isLocalFile()) {
+                    localFile = storageIO.getFileSystemPath().toFile();
+                    dataFileLocation = localFile.getAbsolutePath();
+                    logger.fine("extractMetadataFromNetcdf: file is local. Path: " + dataFileLocation);
+                } else {
+                    storageIO.open();
+                    Optional<Boolean> allow = JvmSettings.GEO_EXTRACT_S3_DIRECT_UPLOAD.lookupOptional(Boolean.class);
+                    if (!(allow.isPresent() && allow.get())) {
+                        logger.fine("extractMetadataFromNetcdf: skipping because of config is set to not slow down S3 remote upload.");
+                        return false;
+                    }
+                    // Need to create a temporary local file:
+                    tempFile = File.createTempFile("tempFileExtractMetadataNetcdf", ".tmp");
+                    try ( ReadableByteChannel targetFileChannel = (ReadableByteChannel) storageIO.getReadChannel();  FileChannel tempFileChannel = new FileOutputStream(tempFile).getChannel();) {
+                        tempFileChannel.transferFrom(targetFileChannel, 0, storageIO.getSize());
+                    }
+                    dataFileLocation = tempFile.getAbsolutePath();
+                    logger.fine("extractMetadataFromNetcdf: file is on S3. Downloaded and saved to temp path: " + dataFileLocation);
+                }
+            } catch (IOException ex) {
+                logger.info("extractMetadataFromNetcdf, could not use storageIO for data file id " + dataFile.getId() + ". Exception: " + ex);
+                return false;
+            } finally {
+                if(storageIO!= null) {
+                    storageIO.closeInputStream();
+                }
+            }
+        }
+
+        if (dataFileLocation == null) {
+            logger.fine("after all that dataFileLocation is still null! Returning early.");
+            return false;
+        }
+
+        // Locate metadata extraction plugin for the file format by looking
+        // it up with the Ingest Service Provider Registry:
+        NetcdfFileMetadataExtractor extractorPlugin = new NetcdfFileMetadataExtractor();
+        logger.fine("creating file from " + dataFileLocation);
+        File file = new File(dataFileLocation);
+        FileMetadataIngest extractedMetadata = extractorPlugin.ingestFile(file);
+        Map<String, Set<String>> extractedMetadataMap = extractedMetadata.getMetadataMap();
+
+        if (extractedMetadataMap != null) {
+            logger.fine("Ingest Service: Processing extracted metadata from netcdf;");
+            if (extractedMetadata.getMetadataBlockName() != null) {
+                logger.fine("Ingest Service: This metadata from netcdf belongs to the " + extractedMetadata.getMetadataBlockName() + " metadata block.");
+                processDatasetMetadata(extractedMetadata, editVersion);
+            }
+        }
+
+        ingestSuccessful = true;
+
+        return ingestSuccessful;
+    }
+
+    /**
+     * @param dataFile The DataFile from which to attempt NcML extraction
+     * (NetCDF or HDF5 format)
+     * @param tempLocationPath Null if the file is already saved to permanent
+     * storage. Otherwise, the path to the temp location of the files, as during
+     * initial upload.
+     * @return True if the Ncml files was created. False on any error or if the
+     * NcML file already exists.
+     */
+    public boolean extractMetadataNcml(DataFile dataFile, Path tempLocationPath) {
+        String contentType = dataFile.getContentType();
+        if (!("application/netcdf".equals(contentType) || "application/x-hdf5".equals(contentType))) {
+            logger.fine("Returning early from extractMetadataNcml because content type is " + contentType + " rather than application/netcdf or application/x-hdf5");
+            return false;
+        }
+        boolean ncmlFileCreated = false;
+        logger.fine("extractMetadataNcml: dataFileIn: " + dataFile + ". tempLocationPath: " + tempLocationPath);
+        InputStream inputStream = null;
+        String dataFileLocation = null;
+        if (tempLocationPath != null) {
+            logger.fine("extractMetadataNcml: tempLocationPath is non null. Setting dataFileLocation to " + tempLocationPath);
+            // This file was just uploaded and hasn't been saved to S3 or local storage.
+            dataFileLocation = tempLocationPath.toString();
+        } else {
+            logger.fine("extractMetadataNcml: tempLocationPath null. Calling getExistingFile for dataFileLocation.");
+            dataFileLocation = getExistingFile(dataFile, dataFileLocation);
+        }
+        if (dataFileLocation != null) {
+            try ( NetcdfFile netcdfFile = NetcdfFiles.open(dataFileLocation)) {
+                logger.fine("trying to open " + dataFileLocation);
+                if (netcdfFile != null) {
+                    ncmlFileCreated = isNcmlFileCreated(netcdfFile, tempLocationPath, dataFile, ncmlFileCreated);
+                } else {
+                    logger.info("NetcdfFiles.open() could not open file id " + dataFile.getId() + " (null returned).");
+                }
+            } catch (IOException ex) {
+                logger.info("NetcdfFiles.open() could not open file id " + dataFile.getId() + ". Exception caught: " + ex);
+            }
+        } else {
+            logger.info("dataFileLocation is null for file id " + dataFile.getId() + ". Can't extract NcML.");
+        }
+
+        return ncmlFileCreated;
+    }
+
+    private boolean isNcmlFileCreated(final NetcdfFile netcdfFile, Path tempLocationPath, DataFile dataFile, boolean ncmlFileCreated) {
+        InputStream inputStream;
+        // For now, empty string. What should we pass as a URL to toNcml()? The filename (including the path) most commonly at https://docs.unidata.ucar.edu/netcdf-java/current/userguide/ncml_cookbook.html
+        // With an empty string the XML will show 'location="file:"'.
+        String ncml = netcdfFile.toNcml("");
+        inputStream = new ByteArrayInputStream(ncml.getBytes(StandardCharsets.UTF_8));
+        String formatTag = "NcML";
+        // 0.1 is arbitrary. It's our first attempt to put out NcML so we're giving it a low number.
+        // If you bump the number here, be sure the bump the number in the previewer as well.
+        // We could use 2.2 here since that's the current version of NcML.
+        String formatVersion = "0.1";
+        String origin = "netcdf-java";
+        boolean isPublic = true;
+        // See also file.auxfiles.types.NcML in Bundle.properties. Used to group aux files in UI.
+        String type = "NcML";
+        // XML because NcML doesn't have its own MIME/content type at https://www.iana.org/assignments/media-types/media-types.xhtml
+        MediaType mediaType = new MediaType("text", "xml");
+        try {
+            // Let the cascade do the save if the file isn't yet on permanent storage.
+            boolean callSave = false;
+            if (tempLocationPath == null) {
+                callSave = true;
+                // Check for an existing NcML file
+                logger.fine("Checking for existing NcML aux file for file id  " + dataFile.getId());
+                AuxiliaryFile existingAuxiliaryFile = auxiliaryFileService.lookupAuxiliaryFile(dataFile, formatTag, formatVersion);
+                if (existingAuxiliaryFile != null) {
+                    logger.fine("Aux file already exists for NetCDF/HDF5 file for file id  " + dataFile.getId());
+                    ncmlFileCreated = false;
+//                                return false;
+                }
+            }
+            AuxiliaryFile auxFile = auxiliaryFileService.processAuxiliaryFile(inputStream, dataFile, formatTag, formatVersion, origin, isPublic, type, mediaType, callSave);
+            logger.fine("Aux file extracted from NetCDF/HDF5 file saved to storage (but not to the database yet) from file id  " + dataFile.getId());
+            ncmlFileCreated = true;
+        } catch (Exception ex) {
+            logger.info("exception throw calling processAuxiliaryFile: " + ex);
+        }
+        return ncmlFileCreated;
+    }
+
+    private String getExistingFile(DataFile dataFile, String dataFileLocation) {
+        // This file is already on S3 (non direct upload) or local storage.
+        File tempFile = null;
+        File localFile;
+        StorageIO<DataFile> storageIO = null;
+        try {
+            storageIO = dataFile.getStorageIO();
+            
+            if (storageIO.isLocalFile()) {
+                localFile = storageIO.getFileSystemPath().toFile();
+                dataFileLocation = localFile.getAbsolutePath();
+                logger.fine("getExistingFile: file is local. Path: " + dataFileLocation);
+            } else {
+                storageIO.open();
+                // Need to create a temporary local file:
+                tempFile = File.createTempFile("tempFileExtractMetadataNcml", ".tmp");
+                try ( ReadableByteChannel targetFileChannel = (ReadableByteChannel) storageIO.getReadChannel();  FileChannel tempFileChannel = new FileOutputStream(tempFile).getChannel();) {
+                    tempFileChannel.transferFrom(targetFileChannel, 0, storageIO.getSize());
+                }
+                dataFileLocation = tempFile.getAbsolutePath();
+                logger.fine("getExistingFile: file is on S3. Downloaded and saved to temp path: " + dataFileLocation);
+            }
+        } catch (IOException ex) {
+            logger.fine("getExistingFile: While attempting to extract NcML, could not use storageIO for data file id " + dataFile.getId() + ". Exception: " + ex);
+        } finally {
+            if(storageIO!= null) {
+                storageIO.closeInputStream();
+            }
+        }
+        
+        return dataFileLocation;
+    }
+
     private void processDatasetMetadata(FileMetadataIngest fileMetadataIngest, DatasetVersion editVersion) throws IOException {
         
         
@@ -1153,189 +1611,189 @@ private void processDatasetMetadata(FileMetadataIngest fileMetadataIngest, Datas
                 Map<String, Set<String>> fileMetadataMap = fileMetadataIngest.getMetadataMap();
                 for (DatasetFieldType dsft : mdb.getDatasetFieldTypes()) {
                     if (dsft.isPrimitive()) {
-                        if (!dsft.isHasParent()) {
-                            String dsfName = dsft.getName();
-                            // See if the plugin has found anything for this field: 
-                            if (fileMetadataMap.get(dsfName) != null && !fileMetadataMap.get(dsfName).isEmpty()) {
-
-                                logger.fine("Ingest Service: found extracted metadata for field " + dsfName);
-                                // go through the existing fields:
-                                for (DatasetField dsf : editVersion.getFlatDatasetFields()) {
-                                    if (dsf.getDatasetFieldType().equals(dsft)) {
-                                        // yep, this is our field!
-                                        // let's go through the values that the ingest 
-                                        // plugin found in the file for this field: 
-
-                                        Set<String> mValues = fileMetadataMap.get(dsfName);
-
-                                        // Special rules apply to aggregation of values for 
-                                        // some specific fields - namely, the resolution.* 
-                                        // fields from the Astronomy Metadata block. 
-                                        // TODO: rather than hard-coded, this needs to be
-                                        // programmatically defined. -- L.A. 4.0
-                                        if (dsfName.equals("resolution.Temporal")
-                                                || dsfName.equals("resolution.Spatial")
-                                                || dsfName.equals("resolution.Spectral")) {
-                                            // For these values, we aggregate the minimum-maximum 
-                                            // pair, for the entire set. 
-                                            // So first, we need to go through the values found by 
-                                            // the plugin and select the min. and max. values of 
-                                            // these: 
-                                            // (note that we are assuming that they all must
-                                            // validate as doubles!)
-
-                                            Double minValue = null;
-                                            Double maxValue = null;
-
-                                            for (String fValue : mValues) {
-
-                                                try {
-                                                    double thisValue = Double.parseDouble(fValue);
-
-                                                    if (minValue == null || Double.compare(thisValue, minValue) < 0) {
-                                                        minValue = thisValue;
-                                                    }
-                                                    if (maxValue == null || Double.compare(thisValue, maxValue) > 0) {
-                                                        maxValue = thisValue;
-                                                    }
-                                                } catch (NumberFormatException e) {
-                                                }
-                                            }
-
-                                            // Now let's see what aggregated values we 
-                                            // have stored already: 
-                                            
-                                            // (all of these resolution.* fields have allowedMultiple set to FALSE, 
-                                            // so there can be only one!)
-                                            //logger.fine("Min value: "+minValue+", Max value: "+maxValue);
-                                            if (minValue != null && maxValue != null) {
-                                                Double storedMinValue = null; 
-                                                Double storedMaxValue = null;
-                                            
-                                                String storedValue = "";
-                                                
-                                                if (dsf.getDatasetFieldValues() != null && dsf.getDatasetFieldValues().get(0) != null) {
-                                                    storedValue = dsf.getDatasetFieldValues().get(0).getValue();
-                                                
-                                                    if (storedValue != null && !storedValue.equals("")) {
-                                                        try {
-
-                                                            if (storedValue.indexOf(" - ") > -1) {
-                                                                storedMinValue = Double.parseDouble(storedValue.substring(0, storedValue.indexOf(" - ")));
-                                                                storedMaxValue = Double.parseDouble(storedValue.substring(storedValue.indexOf(" - ") + 3));
-                                                            } else {
-                                                                storedMinValue = Double.parseDouble(storedValue);
-                                                                storedMaxValue = storedMinValue;
-                                                            }
-                                                            if (storedMinValue != null && storedMinValue.compareTo(minValue) < 0) {
-                                                                minValue = storedMinValue;
-                                                            }
-                                                            if (storedMaxValue != null && storedMaxValue.compareTo(maxValue) > 0) {
-                                                                maxValue = storedMaxValue;
-                                                            }
-                                                        } catch (NumberFormatException e) {}
-                                                    } else {
-                                                        storedValue = "";
-                                                    }
-                                                }
+        if (!dsft.isHasParent()) {
+            String dsfName = dsft.getName();
+            // See if the plugin has found anything for this field:
+            if (fileMetadataMap.get(dsfName) != null && !fileMetadataMap.get(dsfName).isEmpty()) {
+                
+                logger.fine("Ingest Service: found extracted metadata for field " + dsfName);
+                // go through the existing fields:
+                for (DatasetField dsf : editVersion.getFlatDatasetFields()) {
+                    if (dsf.getDatasetFieldType().equals(dsft)) {
+                        // yep, this is our field!
+                        // let's go through the values that the ingest
+                        // plugin found in the file for this field:
+                        
+                        Set<String> mValues = fileMetadataMap.get(dsfName);
+                        
+                        // Special rules apply to aggregation of values for
+                        // some specific fields - namely, the resolution.*
+                        // fields from the Astronomy Metadata block.
+                        // TODO: rather than hard-coded, this needs to be
+                        // programmatically defined. -- L.A. 4.0
+                        if (dsfName.equals("resolution.Temporal")
+                                || dsfName.equals("resolution.Spatial")
+                                || dsfName.equals("resolution.Spectral")) {
+                            // For these values, we aggregate the minimum-maximum
+                            // pair, for the entire set.
+                            // So first, we need to go through the values found by
+                            // the plugin and select the min. and max. values of
+                            // these:
+                            // (note that we are assuming that they all must
+                            // validate as doubles!)
+                            
+                            Double minValue = null;
+                            Double maxValue = null;
+                            
+                            for (String fValue : mValues) {
+                                
+                                try {
+                                    double thisValue = Double.parseDouble(fValue);
+                                    
+                                    if (minValue == null || Double.compare(thisValue, minValue) < 0) {
+                                        minValue = thisValue;
+                                    }
+                                    if (maxValue == null || Double.compare(thisValue, maxValue) > 0) {
+                                        maxValue = thisValue;
+                                    }
+                                } catch (NumberFormatException e) {
+                                }
+                            }
+                            
+                            // Now let's see what aggregated values we
+                            // have stored already:
+                            
+                            // (all of these resolution.* fields have allowedMultiple set to FALSE,
+                            // so there can be only one!)
+                            //logger.fine("Min value: "+minValue+", Max value: "+maxValue);
+                            if (minValue != null && maxValue != null) {
+                                Double storedMinValue = null;
+                                Double storedMaxValue = null;
+                                
+                                String storedValue = "";
+                                
+                                if (dsf.getDatasetFieldValues() != null && dsf.getDatasetFieldValues().get(0) != null) {
+                                    storedValue = dsf.getDatasetFieldValues().get(0).getValue();
+                                    
+                                    if (storedValue != null && !storedValue.equals("")) {
+                                        try {
                                             
-                                                //logger.fine("Stored min value: "+storedMinValue+", Stored max value: "+storedMaxValue);
-                                                
-                                                String newAggregateValue = "";
-                                                
-                                                if (minValue.equals(maxValue)) {
-                                                    newAggregateValue = minValue.toString();
-                                                } else {
-                                                    newAggregateValue = minValue.toString() + " - " + maxValue.toString();
-                                                }
-                                                
-                                                // finally, compare it to the value we have now:
-                                                if (!storedValue.equals(newAggregateValue)) {
-                                                    if (dsf.getDatasetFieldValues() == null) {
-                                                        dsf.setDatasetFieldValues(new ArrayList<DatasetFieldValue>());
-                                                    }
-                                                    if (dsf.getDatasetFieldValues().get(0) == null) {
-                                                        DatasetFieldValue newDsfv = new DatasetFieldValue(dsf);
-                                                        dsf.getDatasetFieldValues().add(newDsfv);
-                                                    }
-                                                    dsf.getDatasetFieldValues().get(0).setValue(newAggregateValue);
-                                                }
+                                            if (storedValue.indexOf(" - ") > -1) {
+                                                storedMinValue = Double.parseDouble(storedValue.substring(0, storedValue.indexOf(" - ")));
+                                                storedMaxValue = Double.parseDouble(storedValue.substring(storedValue.indexOf(" - ") + 3));
+                                            } else {
+                                                storedMinValue = Double.parseDouble(storedValue);
+                                                storedMaxValue = storedMinValue;
+                                            }
+                                            if (storedMinValue != null && storedMinValue.compareTo(minValue) < 0) {
+                                                minValue = storedMinValue;
                                             }
-                                            // Ouch. 
-                                        } else {
-                                            // Other fields are aggregated simply by 
-                                            // collecting a list of *unique* values encountered 
-                                            // for this Field throughout the dataset. 
-                                            // This means we need to only add the values *not yet present*.
-                                            // (the implementation below may be inefficient - ?)
-
-                                            for (String fValue : mValues) {
-                                                if (!dsft.isControlledVocabulary()) {
-                                                    Iterator<DatasetFieldValue> dsfvIt = dsf.getDatasetFieldValues().iterator();
-
-                                                    boolean valueExists = false;
-
-                                                    while (dsfvIt.hasNext()) {
-                                                        DatasetFieldValue dsfv = dsfvIt.next();
-                                                        if (fValue.equals(dsfv.getValue())) {
-                                                            logger.fine("Value " + fValue + " already exists for field " + dsfName);
-                                                            valueExists = true;
-                                                            break;
-                                                        }
-                                                    }
-
-                                                    if (!valueExists) {
-                                                        logger.fine("Creating a new value for field " + dsfName + ": " + fValue);
-                                                        DatasetFieldValue newDsfv = new DatasetFieldValue(dsf);
-                                                        newDsfv.setValue(fValue);
-                                                        dsf.getDatasetFieldValues().add(newDsfv);
-                                                    }
-
-                                                } else {
-                                                    // A controlled vocabulary entry: 
-                                                    // first, let's see if it's a legit control vocab. entry: 
-                                                    ControlledVocabularyValue legitControlledVocabularyValue = null;
-                                                    Collection<ControlledVocabularyValue> definedVocabularyValues = dsft.getControlledVocabularyValues();
-                                                    if (definedVocabularyValues != null) {
-                                                        for (ControlledVocabularyValue definedVocabValue : definedVocabularyValues) {
-                                                            if (fValue.equals(definedVocabValue.getStrValue())) {
-                                                                logger.fine("Yes, " + fValue + " is a valid controlled vocabulary value for the field " + dsfName);
-                                                                legitControlledVocabularyValue = definedVocabValue;
-                                                                break;
-                                                            }
-                                                        }
-                                                    }
-                                                    if (legitControlledVocabularyValue != null) {
-                                                        // Only need to add the value if it is new, 
-                                                        // i.e. if it does not exist yet: 
-                                                        boolean valueExists = false;
-
-                                                        List<ControlledVocabularyValue> existingControlledVocabValues = dsf.getControlledVocabularyValues();
-                                                        if (existingControlledVocabValues != null) {
-                                                            Iterator<ControlledVocabularyValue> cvvIt = existingControlledVocabValues.iterator();
-                                                            while (cvvIt.hasNext()) {
-                                                                ControlledVocabularyValue cvv = cvvIt.next();
-                                                                if (fValue.equals(cvv.getStrValue())) {
-                                                                    // or should I use if (legitControlledVocabularyValue.equals(cvv)) ?
-                                                                    logger.fine("Controlled vocab. value " + fValue + " already exists for field " + dsfName);
-                                                                    valueExists = true;
-                                                                    break;
-                                                                }
-                                                            }
-                                                        }
-
-                                                        if (!valueExists) {
-                                                            logger.fine("Adding controlled vocabulary value " + fValue + " to field " + dsfName);
-                                                            dsf.getControlledVocabularyValues().add(legitControlledVocabularyValue);
-                                                        }
-                                                    }
+                                            if (storedMaxValue != null && storedMaxValue.compareTo(maxValue) > 0) {
+                                                maxValue = storedMaxValue;
+                                            }
+                                        } catch (NumberFormatException e) {}
+                                    } else {
+                                        storedValue = "";
+                                    }
+                                }
+                                
+                                //logger.fine("Stored min value: "+storedMinValue+", Stored max value: "+storedMaxValue);
+                                
+                                String newAggregateValue = "";
+                                
+                                if (minValue.equals(maxValue)) {
+                                    newAggregateValue = minValue.toString();
+                                } else {
+                                    newAggregateValue = minValue.toString() + " - " + maxValue.toString();
+                                }
+                                
+                                // finally, compare it to the value we have now:
+                                if (!storedValue.equals(newAggregateValue)) {
+                                    if (dsf.getDatasetFieldValues() == null) {
+                                        dsf.setDatasetFieldValues(new ArrayList<DatasetFieldValue>());
+                                    }
+                                    if (dsf.getDatasetFieldValues().get(0) == null) {
+                                        DatasetFieldValue newDsfv = new DatasetFieldValue(dsf);
+                                        dsf.getDatasetFieldValues().add(newDsfv);
+                                    }
+                                    dsf.getDatasetFieldValues().get(0).setValue(newAggregateValue);
+                                }
+                            }
+                            // Ouch.
+                        } else {
+                            // Other fields are aggregated simply by
+                            // collecting a list of *unique* values encountered
+                            // for this Field throughout the dataset.
+                            // This means we need to only add the values *not yet present*.
+                            // (the implementation below may be inefficient - ?)
+                            
+                            for (String fValue : mValues) {
+                                if (!dsft.isControlledVocabulary()) {
+                                    Iterator<DatasetFieldValue> dsfvIt = dsf.getDatasetFieldValues().iterator();
+                                    
+                                    boolean valueExists = false;
+                                    
+                                    while (dsfvIt.hasNext()) {
+                                        DatasetFieldValue dsfv = dsfvIt.next();
+                                        if (fValue.equals(dsfv.getValue())) {
+                                            logger.fine("Value " + fValue + " already exists for field " + dsfName);
+                                            valueExists = true;
+                                            break;
+                                        }
+                                    }
+                                    
+                                    if (!valueExists) {
+                                        logger.fine("Creating a new value for field " + dsfName + ": " + fValue);
+                                        DatasetFieldValue newDsfv = new DatasetFieldValue(dsf);
+                                        newDsfv.setValue(fValue);
+                                        dsf.getDatasetFieldValues().add(newDsfv);
+                                    }
+                                    
+                                } else {
+                                    // A controlled vocabulary entry:
+                                    // first, let's see if it's a legit control vocab. entry:
+                                    ControlledVocabularyValue legitControlledVocabularyValue = null;
+                                    Collection<ControlledVocabularyValue> definedVocabularyValues = dsft.getControlledVocabularyValues();
+                                    if (definedVocabularyValues != null) {
+                                        for (ControlledVocabularyValue definedVocabValue : definedVocabularyValues) {
+                                            if (fValue.equals(definedVocabValue.getStrValue())) {
+                                                logger.fine("Yes, " + fValue + " is a valid controlled vocabulary value for the field " + dsfName);
+                                                legitControlledVocabularyValue = definedVocabValue;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    if (legitControlledVocabularyValue != null) {
+                                        // Only need to add the value if it is new,
+                                        // i.e. if it does not exist yet:
+                                        boolean valueExists = false;
+                                        
+                                        List<ControlledVocabularyValue> existingControlledVocabValues = dsf.getControlledVocabularyValues();
+                                        if (existingControlledVocabValues != null) {
+                                            Iterator<ControlledVocabularyValue> cvvIt = existingControlledVocabValues.iterator();
+                                            while (cvvIt.hasNext()) {
+                                                ControlledVocabularyValue cvv = cvvIt.next();
+                                                if (fValue.equals(cvv.getStrValue())) {
+                                                    // or should I use if (legitControlledVocabularyValue.equals(cvv)) ?
+                                                    logger.fine("Controlled vocab. value " + fValue + " already exists for field " + dsfName);
+                                                    valueExists = true;
+                                                    break;
                                                 }
                                             }
                                         }
+                                        
+                                        if (!valueExists) {
+                                            logger.fine("Adding controlled vocabulary value " + fValue + " to field " + dsfName);
+                                            dsf.getControlledVocabularyValues().add(legitControlledVocabularyValue);
+                                        }
                                     }
                                 }
                             }
                         }
+                    }
+                }
+            }
+        }
                     } else {
                         // A compound field: 
                         // See if the plugin has found anything for the fields that 
@@ -1344,72 +1802,71 @@ private void processDatasetMetadata(FileMetadataIngest fileMetadataIngest, Datas
                         // create a new compound field value and its child 
                         // 
                         DatasetFieldCompoundValue compoundDsfv = new DatasetFieldCompoundValue();
-                        int nonEmptyFields = 0; 
+                        int nonEmptyFields = 0;
                         for (DatasetFieldType cdsft : dsft.getChildDatasetFieldTypes()) {
                             String dsfName = cdsft.getName();
-                            if (fileMetadataMap.get(dsfName) != null && !fileMetadataMap.get(dsfName).isEmpty()) {  
-                                logger.fine("Ingest Service: found extracted metadata for field " + dsfName + ", part of the compound field "+dsft.getName());
-                                
+                            if (fileMetadataMap.get(dsfName) != null && !fileMetadataMap.get(dsfName).isEmpty()) {
+                                logger.fine("Ingest Service: found extracted metadata for field " + dsfName + ", part of the compound field " + dsft.getName());
+
                                 if (cdsft.isPrimitive()) {
                                     // probably an unnecessary check - child fields
-                                    // of compound fields are always primitive... 
-                                    // but maybe it'll change in the future. 
+                                    // of compound fields are always primitive...
+                                    // but maybe it'll change in the future.
                                     if (!cdsft.isControlledVocabulary()) {
                                         // TODO: can we have controlled vocabulary
                                         // sub-fields inside compound fields?
-                                        
+
                                         DatasetField childDsf = new DatasetField();
                                         childDsf.setDatasetFieldType(cdsft);
-                                        
+
                                         DatasetFieldValue newDsfv = new DatasetFieldValue(childDsf);
-                                        newDsfv.setValue((String)fileMetadataMap.get(dsfName).toArray()[0]);
+                                        newDsfv.setValue((String) fileMetadataMap.get(dsfName).toArray()[0]);
                                         childDsf.getDatasetFieldValues().add(newDsfv);
-                                        
+
                                         childDsf.setParentDatasetFieldCompoundValue(compoundDsfv);
                                         compoundDsfv.getChildDatasetFields().add(childDsf);
-                                        
+
                                         nonEmptyFields++;
                                     }
-                                } 
+                                }
                             }
                         }
-                        
+
                         if (nonEmptyFields > 0) {
-                            // let's go through this dataset's fields and find the 
-                            // actual parent for this sub-field: 
+                            // let's go through this dataset's fields and find the
+                            // actual parent for this sub-field:
                             for (DatasetField dsf : editVersion.getFlatDatasetFields()) {
                                 if (dsf.getDatasetFieldType().equals(dsft)) {
-                                    
+
                                     // Now let's check that the dataset version doesn't already have
-                                    // this compound value - we are only interested in aggregating 
-                                    // unique values. Note that we need to compare compound values 
-                                    // as sets! -- i.e. all the sub fields in 2 compound fields 
-                                    // must match in order for these 2 compounds to be recognized 
+                                    // this compound value - we are only interested in aggregating
+                                    // unique values. Note that we need to compare compound values
+                                    // as sets! -- i.e. all the sub fields in 2 compound fields
+                                    // must match in order for these 2 compounds to be recognized
                                     // as "the same":
-                                    
-                                    boolean alreadyExists = false; 
+                                    boolean alreadyExists = false;
                                     for (DatasetFieldCompoundValue dsfcv : dsf.getDatasetFieldCompoundValues()) {
-                                        int matches = 0; 
+                                        int matches = 0;
 
                                         for (DatasetField cdsf : dsfcv.getChildDatasetFields()) {
                                             String cdsfName = cdsf.getDatasetFieldType().getName();
                                             String cdsfValue = cdsf.getDatasetFieldValues().get(0).getValue();
                                             if (cdsfValue != null && !cdsfValue.equals("")) {
-                                                String extractedValue = (String)fileMetadataMap.get(cdsfName).toArray()[0];
-                                                logger.fine("values: existing: "+cdsfValue+", extracted: "+extractedValue);
+                                                String extractedValue = (String) fileMetadataMap.get(cdsfName).toArray()[0];
+                                                logger.fine("values: existing: " + cdsfValue + ", extracted: " + extractedValue);
                                                 if (cdsfValue.equals(extractedValue)) {
                                                     matches++;
                                                 }
                                             }
                                         }
                                         if (matches == nonEmptyFields) {
-                                            alreadyExists = true; 
+                                            alreadyExists = true;
                                             break;
                                         }
                                     }
-                                                                        
+
                                     if (!alreadyExists) {
-                                        // save this compound value, by attaching it to the 
+                                        // save this compound value, by attaching it to the
                                         // version for proper cascading:
                                         compoundDsfv.setParentDatasetField(dsf);
                                         dsf.getDatasetFieldCompoundValues().add(compoundDsfv);
@@ -1716,7 +2173,7 @@ private void fixMissingOriginalType(long fileId) {
                 // swift and similar implementations, we'll read the saved aux 
                 // channel and save it as a local temp file. 
                 
-                StorageIO<DataFile> storageIO;
+                StorageIO<DataFile> storageIO = null;
 
                 File savedOriginalFile = null;
                 boolean tempFileRequired = false;
@@ -1738,15 +2195,23 @@ private void fixMissingOriginalType(long fileId) {
                     if (savedOriginalFile == null) {
                         tempFileRequired = true;
 
-                        ReadableByteChannel savedOriginalChannel = (ReadableByteChannel) storageIO.openAuxChannel(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION);
-                        savedOriginalFile = File.createTempFile("tempSavedOriginal", ".tmp");
-                        FileChannel tempSavedOriginalChannel = new FileOutputStream(savedOriginalFile).getChannel();
-                        tempSavedOriginalChannel.transferFrom(savedOriginalChannel, 0, storageIO.getAuxObjectSize(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION));
+						savedOriginalFile = File.createTempFile("tempSavedOriginal", ".tmp");
+						try (ReadableByteChannel savedOriginalChannel = (ReadableByteChannel) storageIO
+								.openAuxChannel(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION);
+								FileChannel tempSavedOriginalChannel = new FileOutputStream(savedOriginalFile)
+										.getChannel();) {
+							tempSavedOriginalChannel.transferFrom(savedOriginalChannel, 0,
+									storageIO.getAuxObjectSize(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION));
+						}
 
                     }
                 } catch (Exception ex) {
                     logger.warning("Exception "+ex.getClass()+" caught trying to open StorageIO channel for the saved original; (datafile id=" + fileId + ", datatable id=" + datatableId + "): " + ex.getMessage());
                     savedOriginalFile = null;
+                } finally {
+                    if (storageIO!= null) {
+                        storageIO.closeInputStream();
+                    }
                 }
 
                 if (savedOriginalFile == null) {
@@ -1872,7 +2337,7 @@ public static void main(String[] args) {
         TabularDataIngest tabDataIngest = null;
         
         try {
-            tabDataIngest = ingestPlugin.read(fileInputStream, null);
+            tabDataIngest = ingestPlugin.read(fileInputStream, false, null);
         } catch (IOException ingestEx) {
             System.err.println("Caught an exception trying to ingest file "+file+".");
             System.exit(1);
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceShapefileHelper.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceShapefileHelper.java
index 9ea2cd0343f..27a2ab99376 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceShapefileHelper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceShapefileHelper.java
@@ -16,7 +16,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.logging.Logger;
-//import javax.ejb.EJB;
+//import jakarta.ejb.EJB;
 
 /**
  *  Used by the IngestServiceBean to redistribute a zipped Shapefile*
@@ -100,71 +100,48 @@ public IngestServiceShapefileHelper(File zippedShapefile, File rezipFolder){
         //this.processFile(zippedShapefile, rezipFolder);
 
     }
-    
-   private FileInputStream getFileInputStream(File fileObject){
-       if (fileObject==null){
-           return null;
-       }
-       try {
+
+    private FileInputStream getFileInputStream(File fileObject){
+        if (fileObject==null){
+            return null;
+        }
+        try {
             return new FileInputStream(fileObject);
         } catch (FileNotFoundException ex) {
             logger.severe("Failed to create FileInputStream from File: " + fileObject.getAbsolutePath());
             return null;
         }
-   }
-   
-   private void closeFileInputStream(FileInputStream fis){
-       if (fis==null){
-           return;
-       }
+    }
+
+    private void closeFileInputStream(FileInputStream fis){
+        if (fis==null){
+            return;
+        }
         try {
-            fis.close();            
+            fis.close();
         } catch (IOException ex) {
             logger.info("Failed to close FileInputStream");
         }
-   }
-   
+    }
+
     public boolean processFile() {
        
        if ((!isValidFile(this.zippedShapefile))||(!isValidFolder(this.rezipFolder))){
             return false;
         }
-        
-       // (1) Use the ShapefileHandler to the .zip for a shapefile
-       //
-        FileInputStream shpfileInputStream = this.getFileInputStream(zippedShapefile);
-        if (shpfileInputStream==null){
-            return false;
-        }
-        
-        this.shpHandler = new ShapefileHandler(shpfileInputStream);
-        if (!shpHandler.containsShapefile()){
-            logger.severe("Shapefile was incorrectly detected upon Ingest (FileUtil) and passed here");
-            return false;
-        }
-
-        this.closeFileInputStream(shpfileInputStream);
-        
-        //  (2) Rezip the shapefile pieces
-        logger.info("rezipFolder: " + rezipFolder.getAbsolutePath());
-        shpfileInputStream = this.getFileInputStream(zippedShapefile);
-        if (shpfileInputStream==null){
-            return false;
-        }
-
-        boolean rezipSuccess;
         try {
-            rezipSuccess = shpHandler.rezipShapefileSets(shpfileInputStream, rezipFolder);
+            this.shpHandler = new ShapefileHandler(zippedShapefile);
+            if (!shpHandler.containsShapefile()){
+                logger.severe("Shapefile was incorrectly detected upon Ingest (FileUtil) and passed here");
+                return false;
+            }
+            logger.info("rezipFolder: " + rezipFolder.getAbsolutePath());
+            return shpHandler.rezipShapefileSets(rezipFolder);
         } catch (IOException ex) {
             logger.severe("Shapefile was not correctly unpacked/repacked");
             logger.severe("shpHandler message: " + shpHandler.errorMessage);
             return false;
         }
-        
-        this.closeFileInputStream(shpfileInputStream);
-        
-        return rezipSuccess;
-     
         //   return createDataFiles(rezipFolder);
         
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestUtil.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestUtil.java
index 033e89bf0aa..3d30f7e6ec3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestUtil.java
@@ -20,24 +20,22 @@
 package edu.harvard.iq.dataverse.ingest;
 
 import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.util.FileUtil;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
 import org.dataverse.unf.UNFUtil;
 import org.dataverse.unf.UnfException;
 
@@ -56,13 +54,13 @@ public class IngestUtil {
      *
      * @param version the dataset version
      * @param newFiles the list of new data files to add to it
+     * @param fileToReplace
      */
-    public static void checkForDuplicateFileNamesFinal(DatasetVersion version, List<DataFile> newFiles) {
+    public static void checkForDuplicateFileNamesFinal(DatasetVersion version, List<DataFile> newFiles, DataFile fileToReplace) {
 
         // Step 1: create list of existing path names from all FileMetadata in the DatasetVersion
         // unique path name: directoryLabel + file separator + fileLabel
-        Set<String> pathNamesExisting = existingPathNamesAsSet(version);
-
+        Set<String> pathNamesExisting = existingPathNamesAsSet(version, ((fileToReplace == null) ? null : fileToReplace.getFileMetadata()));
         // Step 2: check each new DataFile against the list of path names, if a duplicate create a new unique file name
         for (Iterator<DataFile> dfIt = newFiles.iterator(); dfIt.hasNext();) {
 
@@ -100,6 +98,87 @@ public static String duplicateFilenameCheck(FileMetadata fileMetadata, Set<Strin
         return fileName;
     }
 
+    /**
+     * Given an existing file that may or may not have a directoryLabel, take
+     * the incoming label and/or directory label and combine it with what's in
+     * the existing file, overwriting and filling in as necessary.
+     */
+    public static String getPathAndFileNameToCheck(String incomingLabel, String incomingDirectoryLabel, String existingLabel, String existingDirectoryLabel) {
+        String labelToReturn = existingLabel;
+        String directoryLabelToReturn = existingDirectoryLabel;
+        if (incomingLabel != null) {
+            labelToReturn = incomingLabel;
+        }
+        if (incomingDirectoryLabel != null) {
+            directoryLabelToReturn = incomingDirectoryLabel;
+        }
+        if (directoryLabelToReturn != null) {
+            return directoryLabelToReturn + "/" + labelToReturn;
+        } else {
+            return labelToReturn;
+        }
+    }
+
+    /**
+     * Given a new proposed label or directoryLabel for a file, check against
+     * existing files if a duplicate directoryLabel/label combination would be
+     * created.
+     */
+    public static boolean conflictsWithExistingFilenames(String pathPlusFilename, List<FileMetadata> fileMetadatas) {
+        List<String> filePathsAndNames = getPathsAndFileNames(fileMetadatas);
+        return filePathsAndNames.contains(pathPlusFilename);
+    }
+
+    /**
+     * Given a DatasetVersion, and the newFiles about to be added to the 
+     * version iterate across all the files (including their
+     * paths) and return any duplicates.
+     *
+     * @param datasetVersion
+     * @param newFiles
+     * @return A Collection of Strings in the form of path/to/file.txt
+     */
+    public static Collection<String> findDuplicateFilenames(DatasetVersion datasetVersion, List<DataFile> newFiles) {
+        List<FileMetadata> toTest = new ArrayList();
+        datasetVersion.getFileMetadatas().forEach((fm) -> {
+            toTest.add(fm);
+        });
+        newFiles.forEach((df) -> {
+            toTest.add(df.getFileMetadata());
+        });
+        List<String> allFileNamesWithPaths = getPathsAndFileNames(toTest);
+        return findDuplicates(allFileNamesWithPaths);
+    }
+
+    // https://stackoverflow.com/questions/7414667/identify-duplicates-in-a-list
+    private static <T> Set<T> findDuplicates(Collection<T> collection) {
+        Set<T> duplicates = new HashSet<>();
+        Set<T> uniques = new HashSet<>();
+        for (T t : collection) {
+            if (!uniques.add(t)) {
+                duplicates.add(t);
+            }
+        }
+        return duplicates;
+    }
+
+    /**
+     * @return A List of Strings in the form of path/to/file.txt
+     */
+    public static List<String> getPathsAndFileNames(List<FileMetadata> fileMetadatas) {
+        List<String> allFileNamesWithPaths = new ArrayList<>();
+        for (FileMetadata fileMetadata : fileMetadatas) {
+            String directoryLabel = fileMetadata.getDirectoryLabel();
+            String path = "";
+            if (directoryLabel != null) {
+                path = directoryLabel + "/";
+            }
+            String pathAndfileName = path + fileMetadata.getLabel();
+            allFileNamesWithPaths.add(pathAndfileName);
+        }
+        return allFileNamesWithPaths;
+    }
+
     // This method is called on a single file, when we need to modify the name 
     // of an already ingested/persisted datafile. For ex., when we have converted
     // a file to tabular data, and want to update the extension accordingly. 
@@ -166,15 +245,16 @@ public static Set<String> existingPathNamesAsSet(DatasetVersion version) {
         return existingPathNamesAsSet(version, null);
     }
 
-    private static Set<String> existingPathNamesAsSet(DatasetVersion version, FileMetadata fileMetadata) {
+    public static Set<String> existingPathNamesAsSet(DatasetVersion version, FileMetadata replacedFmd) {
         Set<String> pathNamesExisting = new HashSet<>();
 
         // create list of existing path names from all FileMetadata in the DatasetVersion
         // (skipping the one specified fileMetadata, if supplied. That's in order to 
         // be able to call this method 
+        // #6942 added proxy for existing files to a boolean set when dataset version copy is done
         for (Iterator<FileMetadata> fmIt = version.getFileMetadatas().iterator(); fmIt.hasNext();) {
             FileMetadata fm = fmIt.next();
-            if (fm.getId() != null && (fileMetadata == null || !fm.getId().equals(fileMetadata.getId()))) {
+            if((fm.isInPriorVersion() || fm.getId() != null) && (replacedFmd==null || !fm.getDataFile().equals(replacedFmd.getDataFile()))) {
                 String existingName = fm.getLabel();
                 String existingDir = fm.getDirectoryLabel();
 
@@ -267,7 +347,7 @@ public static boolean shouldHaveUnf(DatasetVersion version) {
             return false;
         }
         List<String> values = getUnfValuesOfFiles(version);
-        logger.fine("UNF values for files from Dataset version " + version.getSemanticVersion() + " from " + version.getDataset().getGlobalIdString() + ": " + values);
+        logger.fine("UNF values for files from Dataset version " + version.getSemanticVersion() + " from " + version.getDataset().getGlobalId().asString() + ": " + values);
         if (values.size() > 0) {
             return true;
         } else {
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestableDataChecker.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestableDataChecker.java
index a73fb710ead..4752022b570 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestableDataChecker.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestableDataChecker.java
@@ -24,12 +24,13 @@
 import java.io.*;
 import java.nio.*;
 import java.nio.channels.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.lang.reflect.*;
 import java.util.regex.*;
 import java.util.zip.*;
 import java.util.logging.Logger;
-import org.apache.commons.lang.builder.*;
+import org.apache.commons.lang3.builder.*;
 import org.apache.commons.io.IOUtils;
 
 /**
@@ -68,7 +69,7 @@ public class IngestableDataChecker implements java.io.Serializable {
     private static String regex = "^test(\\w+)format$";
 
     // static initialization block
-    private static String rdargx = "^(52)(44)(41|42|58)(31|32)(0A)$";
+    private static String rdargx = "^(52)(44)(41|42|58)(31|32|33)(0A)$";
     private static int RDA_HEADER_SIZE = 5;
     private static Pattern ptn;
 
@@ -142,13 +143,29 @@ public String[] getTestFormatSet() {
         return this.testFormatSet;
     }
 
+    /*ToDo
+     * Rather than making these tests just methods, perhaps they could be implemented as
+     * classes inheriting a common interface. In addition to the existing ~test*format methods,
+     * the interface could include a method indicating whether the test requires
+     * the whole file or, if not, how many bytes are needed. That would make it easier to
+     * decide whether to use the test on direct/remote uploads (where retrieving a big file may not be worth it, 
+     * but retrieving the 42 bytes needed for a stata check or the ~491 bytes needed for a por check) could be.
+     * 
+     *  Could also add a method to indicate which mimetypes the test can identify/refine which
+     *  might make it possible to replace FileUtil.useRecognizedType(String, String) at some point.
+     *  
+     *  It might also make sense to make this interface broader than just the current ingestable types,
+     *  e.g. to support the NetCDF, graphML and other checks in the same framework. (Some of these might only
+     *  support using a file rather than a bytebuffer though.)
+    */
+    
     // test methods start here ------------------------------------------------
     /**
      * test this byte buffer against SPSS-SAV spec
      *
      *
      */
-    public String testSAVformat(MappedByteBuffer buff) {
+    public String testSAVformat(ByteBuffer buff) {
         String result = null;
         buff.rewind();
         boolean DEBUG = false;
@@ -191,7 +208,7 @@ public String testSAVformat(MappedByteBuffer buff) {
      * test this byte buffer against STATA DTA spec
      *
      */
-    public String testDTAformat(MappedByteBuffer buff) {
+    public String testDTAformat(ByteBuffer buff) {
         String result = null;
         buff.rewind();
         boolean DEBUG = false;
@@ -252,7 +269,7 @@ public String testDTAformat(MappedByteBuffer buff) {
             try {
                 headerBuffer = new byte[STATA_13_HEADER.length()];
                 buff.get(headerBuffer, 0, STATA_13_HEADER.length());
-                headerString = new String(headerBuffer, "US-ASCII");
+                headerString = new String(headerBuffer, StandardCharsets.US_ASCII);
             } catch (Exception ex) {
                 // probably a buffer underflow exception; 
                 // we don't have to do anything... null will 
@@ -273,7 +290,7 @@ public String testDTAformat(MappedByteBuffer buff) {
             try {
                 headerBuffer = new byte[STATA_14_HEADER.length()];
                 buff.get(headerBuffer, 0, STATA_14_HEADER.length());
-                headerString = new String(headerBuffer, "US-ASCII");
+                headerString = new String(headerBuffer, StandardCharsets.US_ASCII);
             } catch (Exception ex) {
                 // probably a buffer underflow exception;
                 // we don't have to do anything... null will
@@ -292,7 +309,7 @@ public String testDTAformat(MappedByteBuffer buff) {
             try {
                 headerBuffer = new byte[STATA_15_HEADER.length()];
                 buff.get(headerBuffer, 0, STATA_15_HEADER.length());
-                headerString = new String(headerBuffer, "US-ASCII");
+                headerString = new String(headerBuffer, StandardCharsets.US_ASCII);
             } catch (Exception ex) {
                 // probably a buffer underflow exception;
                 // we don't have to do anything... null will
@@ -310,7 +327,7 @@ public String testDTAformat(MappedByteBuffer buff) {
      * test this byte buffer against SAS Transport(XPT) spec
      *
      */
-    public String testXPTformat(MappedByteBuffer buff) {
+    public String testXPTformat(ByteBuffer buff) {
         String result = null;
         buff.rewind();
         boolean DEBUG = false;
@@ -358,7 +375,7 @@ public String testXPTformat(MappedByteBuffer buff) {
      * test this byte buffer against SPSS Portable (POR) spec
      *
      */
-    public String testPORformat(MappedByteBuffer buff) {
+    public String testPORformat(ByteBuffer buff) {
         String result = null;
         buff.rewind();
         boolean DEBUG = false;
@@ -524,7 +541,7 @@ public String testPORformat(MappedByteBuffer buff) {
      * test this byte buffer against R data file
      *
      */
-    public String testRDAformat(MappedByteBuffer buff) {
+    public String testRDAformat(ByteBuffer buff) {
         String result = null;
         buff.rewind();
         
@@ -606,73 +623,20 @@ public String testRDAformat(MappedByteBuffer buff) {
 
     // public instance methods ------------------------------------------------
     public String detectTabularDataFormat(File fh) {
-        boolean DEBUG = false;
-        String readableFormatType = null;
+
         FileChannel srcChannel = null;
         FileInputStream inp = null;
+
         try {
-            int buffer_size = this.getBufferSize(fh);
-            dbgLog.fine("buffer_size: " + buffer_size);
-        
             // set-up a FileChannel instance for a given file object
             inp = new FileInputStream(fh);
             srcChannel = inp.getChannel();
+            long buffer_size = this.getBufferSize(srcChannel);
+            dbgLog.fine("buffer_size: " + buffer_size);
 
             // create a read-only MappedByteBuffer
             MappedByteBuffer buff = srcChannel.map(FileChannel.MapMode.READ_ONLY, 0, buffer_size);
-
-            //this.printHexDump(buff, "hex dump of the byte-buffer");
-
-            //for (String fmt : defaultFormatSet){
-            buff.rewind();
-            dbgLog.fine("before the for loop");
-            for (String fmt : this.getTestFormatSet()) {
-                
-                // get a test method
-                Method mthd = testMethods.get(fmt);
-                //dbgLog.info("mthd: " + mthd.getName());
-
-                try {
-                    // invoke this method
-                    Object retobj = mthd.invoke(this, buff);
-                    String result = (String) retobj;
-
-                    if (result != null) {
-                        dbgLog.fine("result for (" + fmt + ")=" + result);
-                        if (DEBUG) {
-                            out.println("result for (" + fmt + ")=" + result);
-                        }
-                        if (readableFileTypes.contains(result)) {
-                            readableFormatType = result;
-                        }
-                        dbgLog.fine("readableFormatType=" + readableFormatType);
-                        return readableFormatType;
-                    } else {
-                        dbgLog.fine("null was returned for " + fmt + " test");
-                        if (DEBUG) {
-                            out.println("null was returned for " + fmt + " test");
-                        }
-                    }
-                } catch (InvocationTargetException e) {
-                    Throwable cause = e.getCause();
-                    // added null check because of "homemade.zip" from https://redmine.hmdc.harvard.edu/issues/3273
-                    if (cause.getMessage() != null) {
-                        err.format(cause.getMessage());
-                        e.printStackTrace();
-                    } else {
-                        dbgLog.info("cause.getMessage() was null for " + e);
-                        e.printStackTrace();
-                    }
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                } catch (BufferUnderflowException e){
-                    dbgLog.info("BufferUnderflowException " + e);
-                    e.printStackTrace();
-                }
-            }
-
-            return readableFormatType;
-
+            return detectTabularDataFormat(buff);
         } catch (FileNotFoundException fe) {
             dbgLog.fine("exception detected: file was not foud");
             fe.printStackTrace();
@@ -683,8 +647,73 @@ public String detectTabularDataFormat(File fh) {
             IOUtils.closeQuietly(srcChannel);
             IOUtils.closeQuietly(inp);
         }
+        return null;
+    }
+
+    public String detectTabularDataFormat(ByteBuffer buff) {
+        boolean DEBUG = false;
+        String readableFormatType = null;
+
+        // this.printHexDump(buff, "hex dump of the byte-buffer");
+
+        buff.rewind();
+        dbgLog.fine("before the for loop");
+        for (String fmt : this.getTestFormatSet()) {
+
+            // get a test method
+            Method mthd = testMethods.get(fmt);
+            // dbgLog.info("mthd: " + mthd.getName());
+
+            try {
+                // invoke this method
+                Object retobj = mthd.invoke(this, buff);
+                String result = (String) retobj;
+
+                if (result != null) {
+                    dbgLog.fine("result for (" + fmt + ")=" + result);
+                    if (DEBUG) {
+                        out.println("result for (" + fmt + ")=" + result);
+                    }
+                    if (readableFileTypes.contains(result)) {
+                        readableFormatType = result;
+                    }
+                    dbgLog.fine("readableFormatType=" + readableFormatType);
+                } else {
+                    dbgLog.fine("null was returned for " + fmt + " test");
+                    if (DEBUG) {
+                        out.println("null was returned for " + fmt + " test");
+                    }
+                }
+            } catch (InvocationTargetException e) {
+                Throwable cause = e.getCause();
+                // added null check because of "homemade.zip" from
+                // https://redmine.hmdc.harvard.edu/issues/3273
+                if (cause.getMessage() != null) {
+                    err.format(cause.getMessage());
+                    e.printStackTrace();
+                } else {
+                    dbgLog.info("cause.getMessage() was null for " + e);
+                    e.printStackTrace();
+                }
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (BufferUnderflowException e) {
+                dbgLog.info("BufferUnderflowException " + e);
+                e.printStackTrace();
+            }
+
+            if (readableFormatType != null) {
+                break;
+            }
+        }
+
+        // help garbage-collect the mapped buffer sooner, to avoid the jvm
+        // holding onto the underlying file unnecessarily:
+        buff = null;
+
         return readableFormatType;
     }
+    
 
     /**
      * identify the first 5 bytes
@@ -716,19 +745,23 @@ private String checkUncompressedFirst5bytes(String fisrt5bytes) {
      * adjust the size of the buffer according to the size of 
      * the file if necessary; otherwise, use the default size
      */
-    private int getBufferSize(File fh) {
+    private long getBufferSize(FileChannel fileChannel) {
         boolean DEBUG = false;
         int BUFFER_SIZE = DEFAULT_BUFFER_SIZE;
-        if (fh.length() < DEFAULT_BUFFER_SIZE) {
-            BUFFER_SIZE = (int) fh.length();
+        try {
+        if (fileChannel.size() < DEFAULT_BUFFER_SIZE) {
+            BUFFER_SIZE = (int) fileChannel.size();
             if (DEBUG) {
                 out.println("non-default buffer_size: new size=" + BUFFER_SIZE);
             }
         }
+        } catch (IOException ioex) {
+            dbgLog.warning("failed to check the physical file size under an open FileChannel");
+        }
         return BUFFER_SIZE;
     }
 
-    private int getGzipBufferSize(MappedByteBuffer buff) {
+    private int getGzipBufferSize(ByteBuffer buff) {
         int GZIP_BUFFER_SIZE = 120;
         /*
         note:
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/metadataextraction/impl/plugins/netcdf/NetcdfFileMetadataExtractor.java b/src/main/java/edu/harvard/iq/dataverse/ingest/metadataextraction/impl/plugins/netcdf/NetcdfFileMetadataExtractor.java
new file mode 100644
index 00000000000..9221a6ca679
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/metadataextraction/impl/plugins/netcdf/NetcdfFileMetadataExtractor.java
@@ -0,0 +1,192 @@
+package edu.harvard.iq.dataverse.ingest.metadataextraction.impl.plugins.netcdf;
+
+import edu.harvard.iq.dataverse.DatasetFieldConstant;
+import edu.harvard.iq.dataverse.ingest.metadataextraction.FileMetadataExtractor;
+import edu.harvard.iq.dataverse.ingest.metadataextraction.FileMetadataIngest;
+import edu.harvard.iq.dataverse.ingest.metadataextraction.spi.FileMetadataExtractorSpi;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+import ucar.ma2.DataType;
+import ucar.nc2.Attribute;
+import ucar.nc2.NetcdfFile;
+import ucar.nc2.NetcdfFiles;
+
+public class NetcdfFileMetadataExtractor extends FileMetadataExtractor {
+
+    private static final Logger logger = Logger.getLogger(NetcdfFileMetadataExtractor.class.getCanonicalName());
+
+    public static final String WEST_LONGITUDE_KEY = "geospatial_lon_min";
+    public static final String EAST_LONGITUDE_KEY = "geospatial_lon_max";
+    public static final String NORTH_LATITUDE_KEY = "geospatial_lat_max";
+    public static final String SOUTH_LATITUDE_KEY = "geospatial_lat_min";
+
+    private static final String GEOSPATIAL_BLOCK_NAME = "geospatial";
+    private static final String WEST_LONGITUDE = DatasetFieldConstant.westLongitude;
+    private static final String EAST_LONGITUDE = DatasetFieldConstant.eastLongitude;
+    private static final String NORTH_LATITUDE = DatasetFieldConstant.northLatitude;
+    private static final String SOUTH_LATITUDE = DatasetFieldConstant.southLatitude;
+
+    public NetcdfFileMetadataExtractor(FileMetadataExtractorSpi originatingProvider) {
+        super(originatingProvider);
+    }
+
+    public NetcdfFileMetadataExtractor() {
+        super(null);
+    }
+
+    @Override
+    public FileMetadataIngest ingest(BufferedInputStream stream) throws IOException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public FileMetadataIngest ingestFile(File file) throws IOException {
+        FileMetadataIngest fileMetadataIngest = new FileMetadataIngest();
+        fileMetadataIngest.setMetadataBlockName(GEOSPATIAL_BLOCK_NAME);
+
+        Map<String, String> geoFields = parseGeospatial(getNetcdfFile(file));
+        WestAndEastLongitude welong = getStandardLongitude(new WestAndEastLongitude(geoFields.get(WEST_LONGITUDE), geoFields.get(EAST_LONGITUDE)));
+        String westLongitudeFinal = welong != null ? welong.getWestLongitude() : null;
+        String eastLongitudeFinal = welong != null ? welong.getEastLongitude() : null;
+        String northLatitudeFinal = geoFields.get(NORTH_LATITUDE);
+        String southLatitudeFinal = geoFields.get(SOUTH_LATITUDE);
+
+        logger.fine(getLineStringsUrl(westLongitudeFinal, southLatitudeFinal, eastLongitudeFinal, northLatitudeFinal));
+
+        Map<String, Set<String>> metadataMap = new HashMap<>();
+        metadataMap.put(WEST_LONGITUDE, new HashSet<>());
+        metadataMap.get(WEST_LONGITUDE).add(westLongitudeFinal);
+        metadataMap.put(EAST_LONGITUDE, new HashSet<>());
+        metadataMap.get(EAST_LONGITUDE).add(eastLongitudeFinal);
+        metadataMap.put(NORTH_LATITUDE, new HashSet<>());
+        metadataMap.get(NORTH_LATITUDE).add(northLatitudeFinal);
+        metadataMap.put(SOUTH_LATITUDE, new HashSet<>());
+        metadataMap.get(SOUTH_LATITUDE).add(southLatitudeFinal);
+        fileMetadataIngest.setMetadataMap(metadataMap);
+        return fileMetadataIngest;
+    }
+
+    public NetcdfFile getNetcdfFile(File file) throws IOException {
+        /**
+         * <attribute name="geospatial_lat_min" value="25.066666666666666" />
+         * south
+         * <attribute name="geospatial_lat_max" value="49.40000000000000" />
+         * north
+         * <attribute name="geospatial_lon_min" value="-124.7666666333333" />
+         * west
+         * <attribute name="geospatial_lon_max" value="-67.058333300000015" />
+         * east
+         * <attribute name="geospatial_lon_resolution" value="0.041666666666666" />
+         * <attribute name="geospatial_lat_resolution" value="0.041666666666666" />
+         * <attribute name="geospatial_lat_units" value="decimal_degrees north" />
+         * <attribute name="geospatial_lon_units" value="decimal_degrees east" />
+         */
+        return NetcdfFiles.open(file.getAbsolutePath());
+    }
+
+    private Map<String, String> parseGeospatial(NetcdfFile netcdfFile) {
+        Map<String, String> geoFields = new HashMap<>();
+
+        Attribute westLongitude = netcdfFile.findGlobalAttribute(WEST_LONGITUDE_KEY);
+        Attribute eastLongitude = netcdfFile.findGlobalAttribute(EAST_LONGITUDE_KEY);
+        Attribute northLatitude = netcdfFile.findGlobalAttribute(NORTH_LATITUDE_KEY);
+        Attribute southLatitude = netcdfFile.findGlobalAttribute(SOUTH_LATITUDE_KEY);
+
+        geoFields.put(DatasetFieldConstant.westLongitude, getValue(westLongitude));
+        geoFields.put(DatasetFieldConstant.eastLongitude, getValue(eastLongitude));
+        geoFields.put(DatasetFieldConstant.northLatitude, getValue(northLatitude));
+        geoFields.put(DatasetFieldConstant.southLatitude, getValue(southLatitude));
+
+        logger.fine(getLineStringsUrl(
+                geoFields.get(DatasetFieldConstant.westLongitude),
+                geoFields.get(DatasetFieldConstant.southLatitude),
+                geoFields.get(DatasetFieldConstant.eastLongitude),
+                geoFields.get(DatasetFieldConstant.northLatitude)));
+
+        return geoFields;
+    }
+
+    // We store strings in the database.
+    private String getValue(Attribute attribute) {
+        if (attribute == null) {
+            return null;
+        }
+        DataType dataType = attribute.getDataType();
+        if (dataType.isString()) {
+            return attribute.getStringValue();
+        } else if (dataType.isNumeric()) {
+            return attribute.getNumericValue().toString();
+        } else {
+            return null;
+        }
+    }
+
+    // Convert to standard -180 to 180 range by subtracting 360
+    // if both longitudea are greater than 180. For example:
+    //       west     south      east      north
+    //     343.68,     41.8,   353.78,     49.62 becomes
+    //     -16.320007, 41.8,    -6.220001, 49.62 instead
+    // "If one of them is > 180, the domain is 0:360.
+    // If one of them is <0, the domain is -180:180.
+    // If both are between 0 and 180, the answer is indeterminate."
+    // https://github.com/cf-convention/cf-conventions/issues/435#issuecomment-1505614364
+    // Solr only wants -180 to 180. It will throw an error for values outside this range.
+    public WestAndEastLongitude getStandardLongitude(WestAndEastLongitude westAndEastLongitude) {
+        if (westAndEastLongitude == null) {
+            return null;
+        }
+        if (westAndEastLongitude.getWestLongitude() == null || westAndEastLongitude.getEastLongitude() == null) {
+            return null;
+        }
+        float eastAsFloat;
+        float westAsFloat;
+        try {
+            westAsFloat = Float.valueOf(westAndEastLongitude.getWestLongitude());
+            eastAsFloat = Float.valueOf(westAndEastLongitude.getEastLongitude());
+        } catch (NumberFormatException ex) {
+            return null;
+        }
+        // "If one of them is > 180, the domain is 0:360"
+        if (westAsFloat > 180 && eastAsFloat > 180) {
+            Float westStandard = westAsFloat - 360;
+            Float eastStandard = eastAsFloat - 360;
+            WestAndEastLongitude updatedWeLong = new WestAndEastLongitude(westStandard.toString(), eastStandard.toString());
+            return updatedWeLong;
+        }
+        // "If one of them is <0, the domain is -180:180."
+        // 180:180 is what Solr wants. Return it.
+        if (westAsFloat < 0 || eastAsFloat < 0) {
+            // BUT! Don't return it if the values
+            // are so low to be out of range!
+            // Something must be wrong with the data.
+            if (westAsFloat < -180 || eastAsFloat < -180) {
+                return null;
+            }
+            if (westAsFloat > 180 || eastAsFloat > 180) {
+                // Not in the proper range of -80:180
+                return null;
+            }
+            return westAndEastLongitude;
+        }
+        if ((westAsFloat > 180 || eastAsFloat > 180) && (westAsFloat < 180 || eastAsFloat < 180)) {
+            // One value is over 180 and the other is under 180.
+            // We don't know if we should subtract 360 or not.
+            // Return null to prevent inserting a potentially
+            // incorrect bounding box.
+            return null;
+        }
+        return westAndEastLongitude;
+    }
+
+    // Generates a handy link to see what the bounding box looks like on a map
+    private String getLineStringsUrl(String west, String south, String east, String north) {
+        // BBOX (Left (LON) ,Bottom (LAT), Right (LON), Top (LAT), comma separated, with or without decimal point):
+        return "https://linestrings.com/bbox/#" + west + "," + south + "," + east + "," + north;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/metadataextraction/impl/plugins/netcdf/WestAndEastLongitude.java b/src/main/java/edu/harvard/iq/dataverse/ingest/metadataextraction/impl/plugins/netcdf/WestAndEastLongitude.java
new file mode 100644
index 00000000000..02a984f3424
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/metadataextraction/impl/plugins/netcdf/WestAndEastLongitude.java
@@ -0,0 +1,52 @@
+package edu.harvard.iq.dataverse.ingest.metadataextraction.impl.plugins.netcdf;
+
+import java.util.Objects;
+
+public class WestAndEastLongitude {
+
+    private final String westLongitude;
+    private final String eastLongitude;
+
+    public WestAndEastLongitude(String westLongitude, String eastLongitude) {
+        this.westLongitude = westLongitude;
+        this.eastLongitude = eastLongitude;
+    }
+
+    public String getWestLongitude() {
+        return westLongitude;
+    }
+
+    public String getEastLongitude() {
+        return eastLongitude;
+    }
+
+    @Override
+    public String toString() {
+        return "WestAndEastLongitude{" + "westLongitude=" + westLongitude + ", eastLongitude=" + eastLongitude + '}';
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final WestAndEastLongitude other = (WestAndEastLongitude) obj;
+        if (!Objects.equals(this.westLongitude, other.westLongitude)) {
+            return false;
+        }
+        return Objects.equals(this.eastLongitude, other.eastLongitude);
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/metadataextraction/spi/FileMetadataExtractorSpi.java b/src/main/java/edu/harvard/iq/dataverse/ingest/metadataextraction/spi/FileMetadataExtractorSpi.java
index ab8f610cb06..a30dfafe67f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/metadataextraction/spi/FileMetadataExtractorSpi.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/metadataextraction/spi/FileMetadataExtractorSpi.java
@@ -10,9 +10,7 @@
 import java.util.logging.*;
 import java.io.*;
 
-import edu.harvard.iq.dataverse.ingest.plugin.spi.RegisterableService;
 import edu.harvard.iq.dataverse.ingest.plugin.spi.IngestServiceProvider;
-import edu.harvard.iq.dataverse.ingest.plugin.spi.ServiceRegistry;
 import java.nio.MappedByteBuffer;
 import java.util.Locale;
 
@@ -44,22 +42,6 @@ public FileMetadataExtractorSpi(String vendorName, String version) {
         this.version = version;
     }
 
-    public void onRegistration(ServiceRegistry registry,
-                               Class<?> category) {}
-                               
-    
-    public void onDeregistration(ServiceRegistry registry,
-                                 Class<?> category) {}
-    
-    public String getVersion() {
-        return version;
-    }
-
-    public String getVendorName() {
-        return vendorName;
-    }
-
-    
     public abstract String getDescription(Locale locale);
     
     protected String[] names = null;
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/DigraphNode.java b/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/DigraphNode.java
deleted file mode 100644
index 4db48b5c06a..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/DigraphNode.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   Dataverse Network - A web application to share, preserve and analyze research data.
-   Developed at the Institute for Quantitative Social Science, Harvard University.
-   Version 3.0.
-*/
-
-package edu.harvard.iq.dataverse.ingest.plugin.spi;
-
-// This file was Taken out from openjdk-6-src-b16-24_apr_2009.tar.gz
-// http://download.java.net/openjdk/jdk6/promoted/b16/openjdk-6-src-b16-24_apr_2009.tar.gz
-// downloaded: 2009-05-07
-
-
-/*
- * Copyright 2000 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-//package javax.imageio.spi;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * A node in a directed graph.  In addition to an arbitrary
- * <code>Object</code> containing user data associated with the node,
- * each node maintains a <code>Set</code>s of nodes which are pointed
- * to by the current node (available from <code>getOutNodes</code>).
- * The in-degree of the node (that is, number of nodes that point to
- * the current node) may be queried.
- *
- */
-class DigraphNode implements Cloneable, Serializable {
-
-    /** The data associated with this node. */
-    protected Object data;
-
-    /**
-     * A <code>Set</code> of neighboring nodes pointed to by this
-     * node.
-     */
-    protected Set outNodes = new HashSet();
-
-    /** The in-degree of the node. */
-    protected int inDegree = 0;
-
-    /**
-     * A <code>Set</code> of neighboring nodes that point to this
-     * node.
-     */
-    private Set inNodes = new HashSet();
-
-    public DigraphNode(Object data) {
-        this.data = data;
-    }
-
-    /** Returns the <code>Object</code> referenced by this node. */
-    public Object getData() {
-        return data;
-    }
-
-    /**
-     * Returns an <code>Iterator</code> containing the nodes pointed
-     * to by this node.
-     */
-    public Iterator getOutNodes() {
-        return outNodes.iterator();
-    }
-
-    /**
-     * Adds a directed edge to the graph.  The outNodes list of this
-     * node is updated and the in-degree of the other node is incremented.
-     *
-     * @param node a <code>DigraphNode</code>.
-     *
-     * @return <code>true</code> if the node was not previously the
-     * target of an edge.
-     */
-    public boolean addEdge(DigraphNode node) {
-        if (outNodes.contains(node)) {
-            return false;
-        }
-
-        outNodes.add(node);
-        node.inNodes.add(this);
-        node.incrementInDegree();
-        return true;
-    }
-
-    /**
-     * Returns <code>true</code> if an edge exists between this node
-     * and the given node.
-     *
-     * @param node a <code>DigraphNode</code>.
-     *
-     * @return <code>true</code> if the node is the target of an edge.
-     */
-    public boolean hasEdge(DigraphNode node) {
-        return outNodes.contains(node);
-    }
-
-    /**
-     * Removes a directed edge from the graph.  The outNodes list of this
-     * node is updated and the in-degree of the other node is decremented.
-     *
-     * @return <code>true</code> if the node was previously the target
-     * of an edge.
-     */
-    public boolean removeEdge(DigraphNode node) {
-        if (!outNodes.contains(node)) {
-            return false;
-        }
-
-        outNodes.remove(node);
-        node.inNodes.remove(this);
-        node.decrementInDegree();
-        return true;
-    }
-
-    /**
-     * Removes this node from the graph, updating neighboring nodes
-     * appropriately.
-     */
-    public void dispose() {
-        Object[] inNodesArray = inNodes.toArray();
-        for(int i=0; i<inNodesArray.length; i++) {
-            DigraphNode node = (DigraphNode) inNodesArray[i];
-            node.removeEdge(this);
-        }
-
-        Object[] outNodesArray = outNodes.toArray();
-        for(int i=0; i<outNodesArray.length; i++) {
-            DigraphNode node = (DigraphNode) outNodesArray[i];
-            removeEdge(node);
-        }
-    }
-
-    /** Returns the in-degree of this node. */
-    public int getInDegree() {
-        return inDegree;
-    }
-
-    /** Increments the in-degree of this node. */
-    private void incrementInDegree() {
-        ++inDegree;
-    }
-
-    /** Decrements the in-degree of this node. */
-    private void decrementInDegree() {
-        --inDegree;
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/IngestServiceProvider.java b/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/IngestServiceProvider.java
index c327ecb2da1..c792156d648 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/IngestServiceProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/IngestServiceProvider.java
@@ -29,7 +29,7 @@
  * 
  * @author akio sone at UNC-Odum
  */
-public abstract class IngestServiceProvider  implements RegisterableService {
+public abstract class IngestServiceProvider  {
 
     /**
      * The name of the vendor that is responsible for coding this
@@ -62,29 +62,6 @@ public IngestServiceProvider(String vendorName, String version) {
     public IngestServiceProvider() {
     }
 
-    /**
-     * A callback to be called exactly once after this Spi class
-     * has been instantiated and registered in a 
-     * <code>ServiceRegistry</code>.
-     *
-     * @param registry the ServiceRegistry instance.
-     * @param category a <code>Class</code>  object that indicatges
-     * its registry category under which this object has been registered.
-     * category.
-     */
-    public void onRegistration(ServiceRegistry registry,
-                               Class<?> category) {}
-                               
-    /**
-     * A callback whenever this Spi class is deregistered from
-     * a <code>ServiceRegistry</code>.
-     *
-     * @param registry the ServiceRegistry instance.
-     * @param category a <code>Class</code> object that indicatges
-     * its registry category from which this object is being de-registered.
-     */
-    public void onDeregistration(ServiceRegistry registry,
-                                 Class<?> category) {}
     /**
      * Gets the value of the version field.
      *
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/PartiallyOrderedSet.java b/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/PartiallyOrderedSet.java
deleted file mode 100644
index 87f4f57cdb6..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/PartiallyOrderedSet.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
-   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   Dataverse Network - A web application to share, preserve and analyze research data.
-   Developed at the Institute for Quantitative Social Science, Harvard University.
-   Version 3.0.
-*/
-
-package edu.harvard.iq.dataverse.ingest.plugin.spi;
-
-// This file was Taken out from openjdk-6-src-b16-24_apr_2009.tar.gz
-// http://download.java.net/openjdk/jdk6/promoted/b16/openjdk-6-src-b16-24_apr_2009.tar.gz
-// downloaded: 2009-05-07
-
-
-/*
- * Copyright 2000 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-//package javax.imageio.spi;
-
-import java.util.AbstractSet;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A set of <code>Object</code>s with pairwise orderings between them.
- * The <code>iterator</code> method provides the elements in
- * topologically sorted order.  Elements participating in a cycle
- * are not returned.
- *
- * Unlike the <code>SortedSet</code> and <code>SortedMap</code>
- * interfaces, which require their elements to implement the
- * <code>Comparable</code> interface, this class receives ordering
- * information via its <code>setOrdering</code> and
- * <code>unsetPreference</code> methods.  This difference is due to
- * the fact that the relevant ordering between elements is unlikely to
- * be inherent in the elements themselves; rather, it is set
- * dynamically accoring to application policy.  For example, in a
- * service provider registry situation, an application might allow the
- * user to set a preference order for service provider objects
- * supplied by a trusted vendor over those supplied by another.
- *
- */
-class PartiallyOrderedSet extends AbstractSet {
-
-    // The topological sort (roughly) follows the algorithm described in
-    // Horowitz and Sahni, _Fundamentals of Data Structures_ (1976),
-    // p. 315.
-
-    // Maps Objects to DigraphNodes that contain them
-    private Map poNodes = new HashMap();
-
-    // The set of Objects
-    private Set nodes = poNodes.keySet();
-
-    /**
-     * Constructs a <code>PartiallyOrderedSet</code>.
-     */
-    public PartiallyOrderedSet() {}
-
-    public int size() {
-        return nodes.size();
-    }
-
-    public boolean contains(Object o) {
-        return nodes.contains(o);
-    }
-
-    /**
-     * Returns an iterator over the elements contained in this
-     * collection, with an ordering that respects the orderings set
-     * by the <code>setOrdering</code> method.
-     */
-    public Iterator iterator() {
-        return new PartialOrderIterator(poNodes.values().iterator());
-    }
-
-    /**
-     * Adds an <code>Object</code> to this
-     * <code>PartiallyOrderedSet</code>.
-     */
-    public boolean add(Object o) {
-        if (nodes.contains(o)) {
-            return false;
-        }
-
-        DigraphNode node = new DigraphNode(o);
-        poNodes.put(o, node);
-        return true;
-    }
-
-    /**
-     * Removes an <code>Object</code> from this
-     * <code>PartiallyOrderedSet</code>.
-     */
-    public boolean remove(Object o) {
-        DigraphNode node = (DigraphNode)poNodes.get(o);
-        if (node == null) {
-            return false;
-        }
-
-        poNodes.remove(o);
-        node.dispose();
-        return true;
-    }
-
-    public void clear() {
-        poNodes.clear();
-    }
-
-    /**
-     * Sets an ordering between two nodes.  When an iterator is
-     * requested, the first node will appear earlier in the
-     * sequence than the second node.  If a prior ordering existed
-     * between the nodes in the opposite order, it is removed.
-     *
-     * @return <code>true</code> if no prior ordering existed
-     * between the nodes, <code>false</code>otherwise.
-     */
-    public boolean setOrdering(Object first, Object second) {
-        DigraphNode firstPONode =
-            (DigraphNode)poNodes.get(first);
-        DigraphNode secondPONode =
-            (DigraphNode)poNodes.get(second);
-
-        secondPONode.removeEdge(firstPONode);
-        return firstPONode.addEdge(secondPONode);
-    }
-
-    /**
-     * Removes any ordering between two nodes.
-     *
-     * @return true if a prior prefence existed between the nodes.
-     */
-    public boolean unsetOrdering(Object first, Object second) {
-        DigraphNode firstPONode =
-            (DigraphNode)poNodes.get(first);
-        DigraphNode secondPONode =
-            (DigraphNode)poNodes.get(second);
-
-        return firstPONode.removeEdge(secondPONode) ||
-            secondPONode.removeEdge(firstPONode);
-    }
-
-    /**
-     * Returns <code>true</code> if an ordering exists between two
-     * nodes.
-     */
-    public boolean hasOrdering(Object preferred, Object other) {
-        DigraphNode preferredPONode =
-            (DigraphNode)poNodes.get(preferred);
-        DigraphNode otherPONode =
-            (DigraphNode)poNodes.get(other);
-
-        return preferredPONode.hasEdge(otherPONode);
-    }
-}
-
-class PartialOrderIterator implements Iterator {
-
-    LinkedList zeroList = new LinkedList();
-    Map inDegrees = new HashMap(); // DigraphNode -> Integer
-
-    public PartialOrderIterator(Iterator iter) {
-        // Initialize scratch in-degree values, zero list
-        while (iter.hasNext()) {
-            DigraphNode node = (DigraphNode)iter.next();
-            int inDegree = node.getInDegree();
-            inDegrees.put(node, new Integer(inDegree));
-
-            // Add nodes with zero in-degree to the zero list
-            if (inDegree == 0) {
-                zeroList.add(node);
-            }
-        }
-    }
-
-    public boolean hasNext() {
-        return !zeroList.isEmpty();
-    }
-
-    public Object next() {
-        DigraphNode first = (DigraphNode)zeroList.removeFirst();
-
-        // For each out node of the output node, decrement its in-degree
-        Iterator outNodes = first.getOutNodes();
-        while (outNodes.hasNext()) {
-            DigraphNode node = (DigraphNode)outNodes.next();
-            int inDegree = ((Integer)inDegrees.get(node)).intValue() - 1;
-            inDegrees.put(node, new Integer(inDegree));
-
-            // If the in-degree has fallen to 0, place the node on the list
-            if (inDegree == 0) {
-                zeroList.add(node);
-            }
-        }
-
-        return first.getData();
-    }
-
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/RegisterableService.java b/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/RegisterableService.java
deleted file mode 100644
index d3609b1e4b9..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/RegisterableService.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   Dataverse Network - A web application to share, preserve and analyze research data.
-   Developed at the Institute for Quantitative Social Science, Harvard University.
-   Version 3.0.
-*/
-
-package edu.harvard.iq.dataverse.ingest.plugin.spi;
-
-// This file was Taken out from openjdk-6-src-b16-24_apr_2009.tar.gz
-// http://download.java.net/openjdk/jdk6/promoted/b16/openjdk-6-src-b16-24_apr_2009.tar.gz
-// downloaded: 2009-05-07
-
-
-/*
- * Copyright 2000-2004 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-
-/**
- * An optional interface that may be provided by service provider
- * objects that will be registered with a
- * <code>ServiceRegistry</code>.  If this interface is present,
- * notification of registration and deregistration will be performed.
- *
- * @see ServiceRegistry
- *
- */
-public interface RegisterableService {
-
-    /**
-     * Called when an object implementing this interface is added to
-     * the given <code>category</code> of the given
-     * <code>registry</code>.  The object may already be registered
-     * under another category or categories.
-     *
-     * @param registry a <code>ServiceRegistry</code> where this
-     * object has been registered.
-     * @param category a <code>Class</code> object indicating the
-     * registry category under which this object has been registered.
-     */
-    void onRegistration(ServiceRegistry registry, Class<?> category);
-
-    /**
-     * Called when an object implementing this interface is removed
-     * from the given <code>category</code> of the given
-     * <code>registry</code>.  The object may still be registered
-     * under another category or categories.
-     *
-     * @param registry a <code>ServiceRegistry</code> from which this
-     * object is being (wholly or partially) deregistered.
-     * @param category a <code>Class</code> object indicating the
-     * registry category from which this object is being deregistered.
-     */
-    void onDeregistration(ServiceRegistry registry, Class<?> category);
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/ServiceRegistry.java b/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/ServiceRegistry.java
deleted file mode 100644
index 1794adb5de2..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/plugin/spi/ServiceRegistry.java
+++ /dev/null
@@ -1,861 +0,0 @@
-/*
-   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   Dataverse Network - A web application to share, preserve and analyze research data.
-   Developed at the Institute for Quantitative Social Science, Harvard University.
-   Version 3.0.
-*/
-package edu.harvard.iq.dataverse.ingest.plugin.spi;
-
-
-
-// This file was Taken out from openjdk-6-src-b16-24_apr_2009.tar.gz
-// http://download.java.net/openjdk/jdk6/promoted/b16/openjdk-6-src-b16-24_apr_2009.tar.gz
-// downloaded: 2009-05-07
-
-
-/*
- * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-//package javax.imageio.spi;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.ServiceLoader;
-
-/**
- * A registry for service provider instances.
- *
- * <p> A <i>service</i> is a well-known set of interfaces and (usually
- * abstract) classes.  A <i>service provider</i> is a specific
- * implementation of a service.  The classes in a provider typically
- * implement the interface or subclass the class defined by the
- * service itself.
- *
- * <p> Service providers are stored in one or more <i>categories</i>,
- * each of which is defined by a class of interface (described by a
- * <code>Class</code> object) that all of its members must implement.
- * The set of categories may be changed dynamically.
- *
- * <p> Only a single instance of a given leaf class (that is, the
- * actual class returned by <code>getClass()</code>, as opposed to any
- * inherited classes or interfaces) may be registered.  That is,
- * suppose that the
- * <code>com.mycompany.mypkg.GreenServiceProvider</code> class
- * implements the <code>com.mycompany.mypkg.MyService</code>
- * interface.  If a <code>GreenServiceProvider</code> instance is
- * registered, it will be stored in the category defined by the
- * <code>MyService</code> class.  If a new instance of
- * <code>GreenServiceProvider</code> is registered, it will replace
- * the previous instance.  In practice, service provider objects are
- * usually singletons so this behavior is appropriate.
- *
- * <p> To declare a service provider, a <code>services</code>
- * subdirectory is placed within the <code>META-INF</code> directory
- * that is present in every JAR file.  This directory contains a file
- * for each service provider interface that has one or more
- * implementation classes present in the JAR file.  For example, if
- * the JAR file contained a class named
- * <code>com.mycompany.mypkg.MyServiceImpl</code> which implements the
- * <code>javax.someapi.SomeService</code> interface, the JAR file
- * would contain a file named: <pre>
- * META-INF/services/javax.someapi.SomeService </pre>
- *
- * containing the line:
- *
- * <pre>
- * com.mycompany.mypkg.MyService
- * </pre>
- *
- * <p> The service provider classes should be to be lightweight and
- * quick to load.  Implementations of these interfaces should avoid
- * complex dependencies on other classes and on native code. The usual
- * pattern for more complex services is to register a lightweight
- * proxy for the heavyweight service.
- *
- * <p> An application may customize the contents of a registry as it
- * sees fit, so long as it has the appropriate runtime permission.
- *
- * <p> For more details on declaring service providers, and the JAR
- * format in general, see the <a
- * href="../../../../technotes/guides/jar/jar.html">
- * JAR File Specification</a>.
- *
- * @see RegisterableService
- *
- */
-public class ServiceRegistry {
-
-    // Class -> Registry
-    private Map<Class<?>, SubRegistry> categoryMap = new HashMap<>();
-
-    /**
-     * Constructs a <code>ServiceRegistry</code> instance with a
-     * set of categories taken from the <code>categories</code>
-     * argument.
-     *
-     * @param categories an <code>Iterator</code> containing
-     * <code>Class</code> objects to be used to define categories.
-     *
-     * @exception IllegalArgumentException if
-     * <code>categories</code> is <code>null</code>.
-     */
-    public ServiceRegistry(Iterator<Class<?>> categories) {
-        if (categories == null) {
-            throw new IllegalArgumentException("categories == null!");
-        }
-        while (categories.hasNext()) {
-            Class<?> category = categories.next();
-            SubRegistry reg = new SubRegistry(this, category);
-            categoryMap.put(category, reg);
-        }
-    }
-
-    // The following two methods expose functionality from
-    // sun.misc.Service.  If that class is made public, they may be
-    // removed.
-    //
-    // The sun.misc.ServiceConfigurationError class may also be
-    // exposed, in which case the references to 'an
-    // <code>Error</code>' below should be changed to 'a
-    // <code>ServiceConfigurationError</code>'.
-
-    /**
-     * Searches for implementations of a particular service class
-     * using the given class loader.
-     *
-     * <p> This method transforms the name of the given service class
-     * into a provider-configuration filename as described in the
-     * class comment and then uses the <code>getResources</code>
-     * method of the given class loader to find all available files
-     * with that name.  These files are then read and parsed to
-     * produce a list of provider-class names.  The iterator that is
-     * returned uses the given class loader to look up and then
-     * instantiate each element of the list.
-     *
-     * <p> Because it is possible for extensions to be installed into
-     * a running Java virtual machine, this method may return
-     * different results each time it is invoked.
-     *
-     * @param providerClass a <code>Class</code>object indicating the
-     * class or interface of the service providers being detected.
-     *
-     * @param loader the class loader to be used to load
-     * provider-configuration files and instantiate provider classes,
-     * or <code>null</code> if the system class loader (or, failing that
-     * the bootstrap class loader) is to be used.
-     *
-     * @return An <code>Iterator</code> that yields provider objects
-     * for the given service, in some arbitrary order.  The iterator
-     * will throw an <code>Error</code> if a provider-configuration
-     * file violates the specified format or if a provider class
-     * cannot be found and instantiated.
-     *
-     * @exception IllegalArgumentException if
-     * <code>providerClass</code> is <code>null</code>.
-     */
-    public static <T> Iterator<T> lookupProviders(Class<T> providerClass,
-                                                  ClassLoader loader)
-    {
-        if (providerClass == null) {
-            throw new IllegalArgumentException("providerClass == null!");
-        }
-        return ServiceLoader.load(providerClass, loader).iterator();
-    }
-
-    /**
-     * Locates and incrementally instantiates the available providers
-     * of a given service using the context class loader.  This
-     * convenience method is equivalent to:
-     *
-     * <pre>
-     *   ClassLoader cl = Thread.currentThread().getContextClassLoader();
-     *   return Service.providers(service, cl);
-     * </pre>
-     *
-     * @param providerClass a <code>Class</code>object indicating the
-     * class or interface of the service providers being detected.
-     *
-     * @return An <code>Iterator</code> that yields provider objects
-     * for the given service, in some arbitrary order.  The iterator
-     * will throw an <code>Error</code> if a provider-configuration
-     * file violates the specified format or if a provider class
-     * cannot be found and instantiated.
-     *
-     * @exception IllegalArgumentException if
-     * <code>providerClass</code> is <code>null</code>.
-     */
-    public static <T> Iterator<T> lookupProviders(Class<T> providerClass) {
-        if (providerClass == null) {
-            throw new IllegalArgumentException("providerClass == null!");
-        }
-        return ServiceLoader.load(providerClass).iterator();
-    }
-
-    /**
-     * Returns an <code>Iterator</code> of <code>Class</code> objects
-     * indicating the current set of categories.  The iterator will be
-     * empty if no categories exist.
-     *
-     * @return an <code>Iterator</code> containing
-     * <code>Class</code>objects.
-     */
-    public Iterator<Class<?>> getCategories() {
-        Set<Class<?>> keySet = categoryMap.keySet();
-        return keySet.iterator();
-    }
-
-    /**
-     * Returns an Iterator containing the subregistries to which the
-     * provider belongs.
-     */
-    private Iterator<SubRegistry> getSubRegistries(Object provider) {
-        List<SubRegistry> l = new ArrayList<>();
-        Iterator<Class<?>> iter = categoryMap.keySet().iterator();
-        while (iter.hasNext()) {
-            Class<?> c = iter.next();
-            if (c.isAssignableFrom(provider.getClass())) {
-                l.add(categoryMap.get(c));
-            }
-        }
-        return l.iterator();
-    }
-
-    /**
-     * Adds a service provider object to the registry.  The provider
-     * is associated with the given category.
-     *
-     * <p> If <code>provider</code> implements the
-     * <code>RegisterableService</code> interface, its
-     * <code>onRegistration</code> method will be called.  Its
-     * <code>onDeregistration</code> method will be called each time
-     * it is deregistered from a category, for example if a
-     * category is removed or the registry is garbage collected.
-     *
-     * @param provider the service provide object to be registered.
-     * @param category the category under which to register the
-     * provider.
-     *
-     * @return true if no provider of the same class was previously
-     * registered in the same category category.
-     *
-     * @exception IllegalArgumentException if <code>provider</code> is
-     * <code>null</code>.
-     * @exception IllegalArgumentException if there is no category
-     * corresponding to <code>category</code>.
-     * @exception ClassCastException if provider does not implement
-     * the <code>Class</code> defined by <code>category</code>.
-     */
-    public <T> boolean registerServiceProvider(T provider,
-                                               Class<T> category) {
-        if (provider == null) {
-            throw new IllegalArgumentException("provider == null!");
-        }
-        SubRegistry reg = categoryMap.get(category);
-        if (reg == null) {
-            throw new IllegalArgumentException("category unknown!");
-        }
-        if (!category.isAssignableFrom(provider.getClass())) {
-            throw new ClassCastException();
-        }
-
-        return reg.registerServiceProvider(provider);
-    }
-
-    /**
-     * Adds a service provider object to the registry.  The provider
-     * is associated within each category present in the registry
-     * whose <code>Class</code> it implements.
-     *
-     * <p> If <code>provider</code> implements the
-     * <code>RegisterableService</code> interface, its
-     * <code>onRegistration</code> method will be called once for each
-     * category it is registered under.  Its
-     * <code>onDeregistration</code> method will be called each time
-     * it is deregistered from a category or when the registry is
-     * finalized.
-     *
-     * @param provider the service provider object to be registered.
-     *
-     * @exception IllegalArgumentException if
-     * <code>provider</code> is <code>null</code>.
-     */
-    public void registerServiceProvider(Object provider) {
-        if (provider == null) {
-            throw new IllegalArgumentException("provider == null!");
-        }
-        Iterator<SubRegistry> regs = getSubRegistries(provider);
-        while (regs.hasNext()) {
-            SubRegistry reg = regs.next();
-            reg.registerServiceProvider(provider);
-        }
-    }
-
-    /**
-     * Adds a set of service provider objects, taken from an
-     * <code>Iterator</code> to the registry.  Each provider is
-     * associated within each category present in the registry whose
-     * <code>Class</code> it implements.
-     *
-     * <p> For each entry of <code>providers</code> that implements
-     * the <code>RegisterableService</code> interface, its
-     * <code>onRegistration</code> method will be called once for each
-     * category it is registered under.  Its
-     * <code>onDeregistration</code> method will be called each time
-     * it is deregistered from a category or when the registry is
-     * finalized.
-     *
-     * @param providers an Iterator containing service provider
-     * objects to be registered.
-     *
-     * @exception IllegalArgumentException if <code>providers</code>
-     * is <code>null</code> or contains a <code>null</code> entry.
-     */
-    public void registerServiceProviders(Iterator<?> providers) {
-        if (providers == null) {
-            throw new IllegalArgumentException("provider == null!");
-        }
-        while (providers.hasNext()) {
-            registerServiceProvider(providers.next());
-        }
-    }
-
-    /**
-     * Removes a service provider object from the given category.  If
-     * the provider was not previously registered, nothing happens and
-     * <code>false</code> is returned.  Otherwise, <code>true</code>
-     * is returned.  If an object of the same class as
-     * <code>provider</code> but not equal (using <code>==</code>) to
-     * <code>provider</code> is registered, it will not be
-     * deregistered.
-     *
-     * <p> If <code>provider</code> implements the
-     * <code>RegisterableService</code> interface, its
-     * <code>onDeregistration</code> method will be called.
-     *
-     * @param provider the service provider object to be deregistered.
-     * @param category the category from which to deregister the
-     * provider.
-     *
-     * @return <code>true</code> if the provider was previously
-     * registered in the same category category,
-     * <code>false</code> otherwise.
-     *
-     * @exception IllegalArgumentException if <code>provider</code> is
-     * <code>null</code>.
-     * @exception IllegalArgumentException if there is no category
-     * corresponding to <code>category</code>.
-     * @exception ClassCastException if provider does not implement
-     * the class defined by <code>category</code>.
-     */
-    public <T> boolean deregisterServiceProvider(T provider,
-                                                 Class<T> category) {
-        if (provider == null) {
-            throw new IllegalArgumentException("provider == null!");
-        }
-        SubRegistry reg = categoryMap.get(category);
-        if (reg == null) {
-            throw new IllegalArgumentException("category unknown!");
-        }
-        if (!category.isAssignableFrom(provider.getClass())) {
-            throw new ClassCastException();
-        }
-        return reg.deregisterServiceProvider(provider);
-    }
-
-    /**
-     * Removes a service provider object from all categories that
-     * contain it.
-     *
-     * @param provider the service provider object to be deregistered.
-     *
-     * @exception IllegalArgumentException if <code>provider</code> is
-     * <code>null</code>.
-     */
-    public void deregisterServiceProvider(Object provider) {
-        if (provider == null) {
-            throw new IllegalArgumentException("provider == null!");
-        }
-        Iterator<SubRegistry> regs = getSubRegistries(provider);
-        while (regs.hasNext()) {
-            SubRegistry reg = regs.next();
-            reg.deregisterServiceProvider(provider);
-        }
-    }
-
-    /**
-     * Returns <code>true</code> if <code>provider</code> is currently
-     * registered.
-     *
-     * @param provider the service provider object to be queried.
-     *
-     * @return <code>true</code> if the given provider has been
-     * registered.
-     *
-     * @exception IllegalArgumentException if <code>provider</code> is
-     * <code>null</code>.
-     */
-    public boolean contains(Object provider) {
-        if (provider == null) {
-            throw new IllegalArgumentException("provider == null!");
-        }
-        Iterator<SubRegistry> regs = getSubRegistries(provider);
-        while (regs.hasNext()) {
-            SubRegistry reg = regs.next();
-            if (reg.contains(provider)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns an <code>Iterator</code> containing all registered
-     * service providers in the given category.  If
-     * <code>useOrdering</code> is <code>false</code>, the iterator
-     * will return all of the server provider objects in an arbitrary
-     * order.  Otherwise, the ordering will respect any pairwise
-     * orderings that have been set.  If the graph of pairwise
-     * orderings contains cycles, any providers that belong to a cycle
-     * will not be returned.
-     *
-     * @param category the category to be retrieved from.
-     * @param useOrdering <code>true</code> if pairwise orderings
-     * should be taken account in ordering the returned objects.
-     *
-     * @return an <code>Iterator</code> containing service provider
-     * objects from the given category, possibly in order.
-     *
-     * @exception IllegalArgumentException if there is no category
-     * corresponding to <code>category</code>.
-     */
-    public <T> Iterator<T> getServiceProviders(Class<T> category,
-                                               boolean useOrdering) {
-        SubRegistry reg = categoryMap.get(category);
-        if (reg == null) {
-            throw new IllegalArgumentException("category unknown!");
-        }
-        return reg.getServiceProviders(useOrdering);
-    }
-
-    /**
-     * A simple filter interface used by
-     * <code>ServiceRegistry.getServiceProviders</code> to select
-     * providers matching an arbitrary criterion.  Classes that
-     * implement this interface should be defined in order to make use
-     * of the <code>getServiceProviders</code> method of
-     * <code>ServiceRegistry</code> that takes a <code>Filter</code>.
-     *
-     * @see ServiceRegistry#getServiceProviders(Class, ServiceRegistry.Filter, boolean)
-     */
-    public interface Filter {
-
-        /**
-         * Returns <code>true</code> if the given
-         * <code>provider</code> object matches the criterion defined
-         * by this <code>Filter</code>.
-         *
-         * @param provider a service provider <code>Object</code>.
-         *
-         * @return true if the provider matches the criterion.
-         */
-        boolean filter(Object provider);
-    }
-
-    /**
-     * Returns an <code>Iterator</code> containing service provider
-     * objects within a given category that satisfy a criterion
-     * imposed by the supplied <code>ServiceRegistry.Filter</code>
-     * object's <code>filter</code> method.
-     *
-     * <p> The <code>useOrdering</code> argument controls the
-     * ordering of the results using the same rules as
-     * <code>getServiceProviders(Class, boolean)</code>.
-     *
-     * @param category the category to be retrieved from.
-     * @param filter an instance of <code>ServiceRegistry.Filter</code>
-     * whose <code>filter</code> method will be invoked.
-     * @param useOrdering <code>true</code> if pairwise orderings
-     * should be taken account in ordering the returned objects.
-     *
-     * @return an <code>Iterator</code> containing service provider
-     * objects from the given category, possibly in order.
-     *
-     * @exception IllegalArgumentException if there is no category
-     * corresponding to <code>category</code>.
-     */
-    public <T> Iterator<T> getServiceProviders(Class<T> category,
-                                               Filter filter,
-                                               boolean useOrdering) {
-        SubRegistry reg = categoryMap.get(category);
-        if (reg == null) {
-            throw new IllegalArgumentException("category unknown!");
-        }
-        Iterator iter = getServiceProviders(category, useOrdering);
-        return new FilterIterator(iter, filter);
-    }
-
-    /**
-     * Returns the currently registered service provider object that
-     * is of the given class type.  At most one object of a given
-     * class is allowed to be registered at any given time.  If no
-     * registered object has the desired class type, <code>null</code>
-     * is returned.
-     *
-     * @param providerClass the <code>Class</code> of the desired
-     * service provider object.
-     *
-     * @return a currently registered service provider object with the
-     * desired <code>Class</code>type, or <code>null</code> is none is
-     * present.
-     *
-     * @exception IllegalArgumentException if <code>providerClass</code> is
-     * <code>null</code>.
-     */
-    public <T> T getServiceProviderByClass(Class<T> providerClass) {
-        if (providerClass == null) {
-            throw new IllegalArgumentException("providerClass == null!");
-        }
-        for (Class c : categoryMap.keySet()) {
-            if (c.isAssignableFrom(providerClass)) {
-                SubRegistry reg = (SubRegistry)categoryMap.get(c);
-                T provider = reg.getServiceProviderByClass(providerClass);
-                if (provider != null) {
-                    return provider;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Sets a pairwise ordering between two service provider objects
-     * within a given category.  If one or both objects are not
-     * currently registered within the given category, or if the
-     * desired ordering is already set, nothing happens and
-     * <code>false</code> is returned.  If the providers previously
-     * were ordered in the reverse direction, that ordering is
-     * removed.
-     *
-     * <p> The ordering will be used by the
-     * <code>getServiceProviders</code> methods when their
-     * <code>useOrdering</code> argument is <code>true</code>.
-     *
-     * @param category a <code>Class</code> object indicating the
-     * category under which the preference is to be established.
-     * @param firstProvider the preferred provider.
-     * @param secondProvider the provider to which
-     * <code>firstProvider</code> is preferred.
-     *
-     * @return <code>true</code> if a previously unset ordering
-     * was established.
-     *
-     * @exception IllegalArgumentException if either provider is
-     * <code>null</code> or they are the same object.
-     * @exception IllegalArgumentException if there is no category
-     * corresponding to <code>category</code>.
-     */
-    public <T> boolean setOrdering(Class<T> category,
-                                   T firstProvider,
-                                   T secondProvider) {
-        if (firstProvider == null || secondProvider == null) {
-            throw new IllegalArgumentException("provider is null!");
-        }
-        if (firstProvider == secondProvider) {
-            throw new IllegalArgumentException("providers are the same!");
-        }
-        SubRegistry reg = (SubRegistry)categoryMap.get(category);
-        if (reg == null) {
-            throw new IllegalArgumentException("category unknown!");
-        }
-        if (reg.contains(firstProvider) &&
-            reg.contains(secondProvider)) {
-            return reg.setOrdering(firstProvider, secondProvider);
-        }
-        return false;
-    }
-
-    /**
-     * Sets a pairwise ordering between two service provider objects
-     * within a given category.  If one or both objects are not
-     * currently registered within the given category, or if no
-     * ordering is currently set between them, nothing happens
-     * and <code>false</code> is returned.
-     *
-     * <p> The ordering will be used by the
-     * <code>getServiceProviders</code> methods when their
-     * <code>useOrdering</code> argument is <code>true</code>.
-     *
-     * @param category a <code>Class</code> object indicating the
-     * category under which the preference is to be disestablished.
-     * @param firstProvider the formerly preferred provider.
-     * @param secondProvider the provider to which
-     * <code>firstProvider</code> was formerly preferred.
-     *
-     * @return <code>true</code> if a previously set ordering was
-     * disestablished.
-     *
-     * @exception IllegalArgumentException if either provider is
-     * <code>null</code> or they are the same object.
-     * @exception IllegalArgumentException if there is no category
-     * corresponding to <code>category</code>.
-     */
-    public <T> boolean unsetOrdering(Class<T> category,
-                                     T firstProvider,
-                                     T secondProvider) {
-        if (firstProvider == null || secondProvider == null) {
-            throw new IllegalArgumentException("provider is null!");
-        }
-        if (firstProvider == secondProvider) {
-            throw new IllegalArgumentException("providers are the same!");
-        }
-        SubRegistry reg = (SubRegistry)categoryMap.get(category);
-        if (reg == null) {
-            throw new IllegalArgumentException("category unknown!");
-        }
-        if (reg.contains(firstProvider) &&
-            reg.contains(secondProvider)) {
-            return reg.unsetOrdering(firstProvider, secondProvider);
-        }
-        return false;
-    }
-
-    /**
-     * Deregisters all service provider object currently registered
-     * under the given category.
-     *
-     * @param category the category to be emptied.
-     *
-     * @exception IllegalArgumentException if there is no category
-     * corresponding to <code>category</code>.
-     */
-    public void deregisterAll(Class<?> category) {
-        SubRegistry reg = (SubRegistry)categoryMap.get(category);
-        if (reg == null) {
-            throw new IllegalArgumentException("category unknown!");
-        }
-        reg.clear();
-    }
-
-    /**
-     * Deregisters all currently registered service providers from all
-     * categories.
-     */
-    public void deregisterAll() {
-        Iterator iter = categoryMap.values().iterator();
-        while (iter.hasNext()) {
-            SubRegistry reg = (SubRegistry)iter.next();
-            reg.clear();
-        }
-    }
-
-    /**
-     * Finalizes this object prior to garbage collection.  The
-     * <code>deregisterAll</code> method is called to deregister all
-     * currently registered service providers.  This method should not
-     * be called from application code.
-     *
-     * @exception Throwable if an error occurs during superclass
-     * finalization.
-     */
-    public void finalize() throws Throwable {
-        deregisterAll();
-        super.finalize();
-    }
-}
-
-
-/**
- * A portion of a registry dealing with a single superclass or
- * interface.
- */
-class SubRegistry {
-
-    ServiceRegistry registry;
-
-    Class<?> category;
-
-    // Provider Objects organized by partial oridering
-    PartiallyOrderedSet poset = new PartiallyOrderedSet();
-
-    // Class -> Provider Object of that class
-    Map<Class<?>,Object> map = new HashMap<>();
-
-    public SubRegistry(ServiceRegistry registry, Class<?> category) {
-        this.registry = registry;
-        this.category = category;
-    }
-
-    public boolean registerServiceProvider(Object provider) {
-        Object oprovider = map.get(provider.getClass());
-        boolean present =  oprovider != null;
-
-        if (present) {
-            deregisterServiceProvider(oprovider);
-        }
-        map.put(provider.getClass(), provider);
-        poset.add(provider);
-        if (provider instanceof RegisterableService) {
-            RegisterableService rs = (RegisterableService)provider;
-            rs.onRegistration(registry, category);
-        }
-
-        return !present;
-    }
-
-    /**
-     * If the provider was not previously registered, do nothing.
-     *
-     * @return true if the provider was previously registered.
-     */
-    public boolean deregisterServiceProvider(Object provider) {
-        Object oprovider = map.get(provider.getClass());
-
-        if (provider == oprovider) {
-            map.remove(provider.getClass());
-            poset.remove(provider);
-            if (provider instanceof RegisterableService) {
-                RegisterableService rs = (RegisterableService)provider;
-                rs.onDeregistration(registry, category);
-            }
-
-            return true;
-        }
-        return false;
-    }
-
-    public boolean contains(Object provider) {
-        Object oprovider = map.get(provider.getClass());
-        return oprovider == provider;
-    }
-
-    public boolean setOrdering(Object firstProvider,
-                               Object secondProvider) {
-        return poset.setOrdering(firstProvider, secondProvider);
-    }
-
-    public boolean unsetOrdering(Object firstProvider,
-                                 Object secondProvider) {
-        return poset.unsetOrdering(firstProvider, secondProvider);
-    }
-
-    public Iterator getServiceProviders(boolean useOrdering) {
-        if (useOrdering) {
-            return poset.iterator();
-        } else {
-            return map.values().iterator();
-        }
-    }
-
-    public <T> T getServiceProviderByClass(Class<T> providerClass) {
-        return (T)map.get(providerClass);
-    }
-
-    public void clear() {
-        Iterator iter = map.values().iterator();
-        while (iter.hasNext()) {
-            Object provider = iter.next();
-            iter.remove();
-
-            if (provider instanceof RegisterableService) {
-                RegisterableService rs = (RegisterableService)provider;
-                rs.onDeregistration(registry, category);
-            }
-        }
-        poset.clear();
-    }
-
-    public void finalize() {
-        clear();
-    }
-}
-
-
-/**
- * A class for wrapping <code>Iterators</code> with a filter function.
- * This provides an iterator for a subset without duplication.
- */
-class FilterIterator<T> implements Iterator<T> {
-
-    private Iterator<T> iter;
-    private ServiceRegistry.Filter filter;
-
-    private T next = null;
-
-    public FilterIterator(Iterator<T> iter,
-                          ServiceRegistry.Filter filter) {
-        this.iter = iter;
-        this.filter = filter;
-        advance();
-    }
-
-    private void advance() {
-        while (iter.hasNext()) {
-            T elt = iter.next();
-            if (filter.filter(elt)) {
-                next = elt;
-                return;
-            }
-        }
-
-        next = null;
-    }
-
-    public boolean hasNext() {
-        return next != null;
-    }
-
-    public T next() {
-        if (next == null) {
-            throw new NoSuchElementException();
-        }
-        T o = next;
-        advance();
-        return o;
-    }
-
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/InvalidData.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/InvalidData.java
index 4f584abc4cb..de8e2f7aa82 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/InvalidData.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/InvalidData.java
@@ -20,8 +20,8 @@
 package edu.harvard.iq.dataverse.ingest.tabulardata;
 
 import java.util.*;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 /**
  * A class that stores information about a variables' invalid data.
  * Akio Sone's original DVN v.2.* implementation, virtually unchanged. 
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/TabularDataFileReader.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/TabularDataFileReader.java
index 223b171dfb5..0f23a3d9781 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/TabularDataFileReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/TabularDataFileReader.java
@@ -20,10 +20,13 @@
 
 package edu.harvard.iq.dataverse.ingest.tabulardata;
 
+import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.ingest.tabulardata.spi.*;
 //import edu.harvard.iq.dataverse.ingest.plugin.metadata.*;
 import java.io.*;
 import static java.lang.System.*;
+import java.util.Iterator;
+import java.util.List;
 import java.util.regex.Matcher;
 
 /**
@@ -98,7 +101,7 @@ public void setDataLanguageEncoding(String dataLanguageEncoding) {
      *
      * @throws java.io.IOException if a reading error occurs.
      */
-    public abstract TabularDataIngest read(BufferedInputStream stream, File dataFile)
+    public abstract TabularDataIngest read(BufferedInputStream stream, boolean storeWithVariableHeader, File dataFile)
         throws IOException;
 
     
@@ -176,5 +179,26 @@ protected String escapeCharacterString(String rawString) {
         
         return escapedString;
     }
+    
+    protected String generateVariableHeader(List<DataVariable> dvs) {
+        String varHeader = null;
+
+        if (dvs != null) {
+            Iterator<DataVariable> iter = dvs.iterator();
+            DataVariable dv;
+
+            if (iter.hasNext()) {
+                dv = iter.next();
+                varHeader = dv.getName();
+            }
+
+            while (iter.hasNext()) {
+                dv = iter.next();
+                varHeader = varHeader + "\t" + dv.getName();
+            }
+        }
+
+        return varHeader;
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/csv/CSVFileReader.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/csv/CSVFileReader.java
index d1e85c208ae..f8816ababb4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/csv/CSVFileReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/csv/CSVFileReader.java
@@ -50,7 +50,7 @@
 import java.util.Set;
 import java.util.logging.Logger;
 import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
@@ -71,7 +71,7 @@ public class CSVFileReader extends TabularDataFileReader {
     private static final String FORMAT_IEEE754 = "%+#." + DIGITS_OF_PRECISION_DOUBLE + "e";
     private MathContext doubleMathContext;
     private CSVFormat inFormat;
-    private final Set<Character> firstNumCharSet = new HashSet<>();
+    //private final Set<Character> firstNumCharSet = new HashSet<>();
 
     // DATE FORMATS
     private static SimpleDateFormat[] DATE_FORMATS = new SimpleDateFormat[]{
@@ -99,7 +99,7 @@ public CSVFileReader(TabularDataFileReaderSpi originator, char delim) {
 
     private void init() throws IOException {
         doubleMathContext = new MathContext(DIGITS_OF_PRECISION_DOUBLE, RoundingMode.HALF_EVEN);
-        firstNumCharSet.addAll(Arrays.asList(new Character[]{'+', '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}));
+        //firstNumCharSet.addAll(Arrays.asList(new Character[]{'+', '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}));
     }
 
     /**
@@ -110,7 +110,7 @@ private void init() throws IOException {
      * @throws java.io.IOException if a reading error occurs.
      */
     @Override
-    public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws IOException {
+    public TabularDataIngest read(BufferedInputStream stream, boolean saveWithVariableHeader, File dataFile) throws IOException {
         init();
 
         if (stream == null) {
@@ -124,7 +124,7 @@ public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws
         File tabFileDestination = File.createTempFile("data-", ".tab");
         PrintWriter tabFileWriter = new PrintWriter(tabFileDestination.getAbsolutePath());
 
-        int lineCount = readFile(localBufferedReader, dataTable, tabFileWriter);
+        int lineCount = readFile(localBufferedReader, dataTable, saveWithVariableHeader, tabFileWriter);
 
         logger.fine("Tab file produced: " + tabFileDestination.getAbsolutePath());
 
@@ -136,14 +136,17 @@ public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws
 
     }
 
-    public int readFile(BufferedReader csvReader, DataTable dataTable, PrintWriter finalOut) throws IOException {
+    public int readFile(BufferedReader csvReader, DataTable dataTable, boolean saveWithVariableHeader, PrintWriter finalOut) throws IOException {
 
         List<DataVariable> variableList = new ArrayList<>();
         CSVParser parser = new CSVParser(csvReader, inFormat.withHeader());
         Map<String, Integer> headers = parser.getHeaderMap();
 
         int i = 0;
+        String variableNameHeader = null;
+        
         for (String varName : headers.keySet()) {
+            // @todo: is .keySet() guaranteed to return the names in the right order?
             if (varName == null || varName.isEmpty()) {
                 // TODO:
                 // Add a sensible variable name validation algorithm.
@@ -158,6 +161,13 @@ public int readFile(BufferedReader csvReader, DataTable dataTable, PrintWriter f
 
             dv.setTypeCharacter();
             dv.setIntervalDiscrete();
+            
+            if (saveWithVariableHeader) {
+                    variableNameHeader = variableNameHeader == null
+                            ? varName 
+                            : variableNameHeader.concat("\t" + varName);
+                }
+            
             i++;
         }
 
@@ -207,8 +217,9 @@ public int readFile(BufferedReader csvReader, DataTable dataTable, PrintWriter f
                                            && varString != null
                                            && (varString.isEmpty()
                                                || varString.equals("null")
-                                               || (firstNumCharSet.contains(varString.charAt(0))
-                                                   && StringUtils.isNumeric(varString.substring(1))));
+                                               || (StringUtils.isNumeric(varString)
+                                                    || (varString.substring(0,1).matches("[+-]") 
+                                                        && StringUtils.isNumeric(varString.substring(1)))));
                     if (isNumericVariable[i]) {
                         // If variable might be "numeric" test to see if this value is a parsable number:
                         if (varString != null && !varString.isEmpty()) {
@@ -341,6 +352,14 @@ public int readFile(BufferedReader csvReader, DataTable dataTable, PrintWriter f
         try (BufferedReader secondPassReader = new BufferedReader(new FileReader(firstPassTempFile))) {
             parser = new CSVParser(secondPassReader, inFormat.withHeader());
             String[] caseRow = new String[headers.size()];
+            
+            // Save the variable name header, if requested
+            if (saveWithVariableHeader) {
+                if (variableNameHeader == null) {
+                    throw new IOException("failed to generate the Variable Names header");
+                }
+                finalOut.println(variableNameHeader);
+            }
 
             for (CSVRecord record : parser) {
                 if (!record.isConsistent()) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReader.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReader.java
index 48a6212ffd7..f0262af9e33 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReader.java
@@ -20,34 +20,47 @@
 
 package edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.dta;
 
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
 
-
-import java.io.*;
-import java.nio.*;
-import java.util.logging.*;
-
-import java.util.*;
-import java.util.regex.*;
-import java.text.*;
-
-
-import org.apache.commons.lang.*;
 import org.apache.commons.codec.binary.Hex;
-import javax.inject.Inject;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 
 import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.datavariable.VariableCategory;
-//import edu.harvard.iq.dataverse.datavariable.VariableFormatType;
-//import edu.harvard.iq.dataverse.datavariable.VariableServiceBean;
 
-import edu.harvard.iq.dataverse.ingest.plugin.spi.*;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataFileReader;
 import edu.harvard.iq.dataverse.ingest.tabulardata.spi.TabularDataFileReaderSpi;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataIngest;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**
@@ -493,7 +506,7 @@ private void init() throws IOException {
     }
 
     @Override
-    public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws IOException {
+    public TabularDataIngest read(BufferedInputStream stream, boolean storeWithVariableHeader, File dataFile) throws IOException {
         dbgLog.info("***** DTAFileReader: read() start *****");
         
         if (dataFile != null) {
@@ -507,7 +520,7 @@ public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws
             if (releaseNumber!=104) {
                 decodeExpansionFields(stream);
             }
-            decodeData(stream);
+            decodeData(stream, storeWithVariableHeader);
             decodeValueLabels(stream);
 
             ingesteddata.setDataTable(dataTable);
@@ -673,7 +686,7 @@ private void decodeHeader(BufferedInputStream stream) throws IOException {
         }
 
         String data_label = new String(Arrays.copyOfRange(header, dl_offset,
-                (dl_offset + dataLabelLength)), "ISO-8859-1");
+                (dl_offset + dataLabelLength)), StandardCharsets.ISO_8859_1);
 
         if (dbgLog.isLoggable(Level.FINE)) {
             dbgLog.fine("data_label_length=" + data_label.length());
@@ -698,7 +711,7 @@ private void decodeHeader(BufferedInputStream stream) throws IOException {
         if (releaseNumber > 104) {
             int ts_offset = dl_offset + dataLabelLength;
             String time_stamp = new String(Arrays.copyOfRange(header, ts_offset,
-                    ts_offset + TIME_STAMP_LENGTH), "ISO-8859-1");
+                    ts_offset + TIME_STAMP_LENGTH), StandardCharsets.ISO_8859_1);
             if (dbgLog.isLoggable(Level.FINE)) {
                 dbgLog.fine("time_stamp_length=" + time_stamp.length());
             }
@@ -900,7 +913,7 @@ private void decodeDescriptorVarNameList(BufferedInputStream stream, int nvar) t
         for (DataVariable dataVariable: dataTable.getDataVariables()) {
             offset_end += length_var_name;
             String vari = new String(Arrays.copyOfRange(variableNameBytes, offset_start,
-                    offset_end), "ISO-8859-1");
+                    offset_end), StandardCharsets.ISO_8859_1);
             String varName = getNullStrippedString(vari);
             dataVariable.setName(varName);
             dbgLog.fine("next name=[" + varName + "]");
@@ -966,7 +979,7 @@ private void decodeDescriptorVariableFormat(BufferedInputStream stream, int nvar
         for (int i = 0; i < nvar; i++) {
             offset_end += length_var_format;
             String vari = new String(Arrays.copyOfRange(variableFormatList, offset_start,
-                    offset_end), "ISO-8859-1");
+                    offset_end), StandardCharsets.ISO_8859_1);
             String variableFormat = getNullStrippedString(vari);
             if (dbgLog.isLoggable(Level.FINE)) dbgLog.fine(i + "-th format=[" + variableFormat + "]");
                         
@@ -1033,7 +1046,7 @@ private void decodeDescriptorValueLabel(BufferedInputStream stream, int nvar) th
         for (int i = 0; i < nvar; i++) {
             offset_end += length_label_name;
             String vari = new String(Arrays.copyOfRange(labelNameList, offset_start,
-                    offset_end), "ISO-8859-1");
+                    offset_end), StandardCharsets.ISO_8859_1);
             labelNames[i] = getNullStrippedString(vari);
             dbgLog.fine(i + "-th label=[" + labelNames[i] + "]");
             offset_start = offset_end;
@@ -1078,7 +1091,7 @@ private void decodeVariableLabels(BufferedInputStream stream) throws IOException
         for (int i = 0; i < nvar; i++) {
             offset_end += length_var_label;
             String vari = new String(Arrays.copyOfRange(variableLabelBytes, offset_start,
-                    offset_end), "ISO-8859-1");
+                    offset_end), StandardCharsets.ISO_8859_1);
             
             String variableLabelParsed = getNullStrippedString(vari);
             if (dbgLog.isLoggable(Level.FINE)) {
@@ -1260,7 +1273,7 @@ void parseValueLabelsRelease105(BufferedInputStream stream) throws IOException {
                     valueLabelHeader,
                     value_label_table_length,
                     (value_label_table_length + length_label_name)),
-                    "ISO-8859-1");
+                    StandardCharsets.ISO_8859_1);
 
             if (dbgLog.isLoggable(Level.FINE)) {
                 dbgLog.fine("rawLabelName(length)=" + rawLabelName.length());
@@ -1323,7 +1336,7 @@ void parseValueLabelsRelease105(BufferedInputStream stream) throws IOException {
             for (int l = 0; l < no_value_label_pairs; l++) {
 
                 String string_l = new String(Arrays.copyOfRange(valueLabelTable_i, offset_start,
-                        offset_end), "ISO-8859-1");
+                        offset_end), StandardCharsets.ISO_8859_1);
 
                 int null_position = string_l.indexOf(0);
                 if (null_position != -1) {
@@ -1473,7 +1486,7 @@ private void parseValueLabelsReleasel108(BufferedInputStream stream) throws IOEx
                     valueLabelHeader,
                     value_label_table_length,
                     (value_label_table_length + length_label_name)),
-                    "ISO-8859-1");
+                    StandardCharsets.ISO_8859_1);
             String labelName = getNullStrippedString(rawLabelName);
 
             if (dbgLog.isLoggable(Level.FINE)) {
@@ -1569,7 +1582,7 @@ private void parseValueLabelsReleasel108(BufferedInputStream stream) throws IOEx
             String label_segment = new String(
                     Arrays.copyOfRange(valueLabelTable_i,
                             offset_value,
-                            (length_label_segment + offset_value)), "ISO-8859-1");
+                            (length_label_segment + offset_value)), StandardCharsets.ISO_8859_1);
 
             // L.A. -- 2011.2.25:
             // This assumes that the labels are already stored in the right
@@ -1653,7 +1666,7 @@ private void parseValueLabelsReleasel108(BufferedInputStream stream) throws IOEx
         dbgLog.fine("parseValueLabelsRelease108(): end");
     }
 
-    private void decodeData(BufferedInputStream stream) throws IOException {
+    private void decodeData(BufferedInputStream stream, boolean saveWithVariableHeader) throws IOException {
 
         dbgLog.fine("\n***** decodeData(): start *****");
 
@@ -1689,7 +1702,7 @@ private void decodeData(BufferedInputStream stream) throws IOException {
         ingesteddata.setTabDelimitedFile(tabDelimitedDataFile);
 
         fileOutTab = new FileOutputStream(tabDelimitedDataFile);
-        pwout = new PrintWriter(new OutputStreamWriter(fileOutTab, "utf8"), true);
+        pwout = new PrintWriter(new OutputStreamWriter(fileOutTab, StandardCharsets.UTF_8), true);
 
         /* Should we lose this dateFormat thing in 4.0? 
          * the UNF should be calculatable on the app side solely from the data
@@ -1707,6 +1720,11 @@ private void decodeData(BufferedInputStream stream) throws IOException {
           BUT, this needs to be reviewed/confirmed etc! 
          */
         //String[][] dateFormat = new String[nvar][nobs];
+        
+        // add the variable header here, if needed
+        if (saveWithVariableHeader) {
+            pwout.println(generateVariableHeader(dataTable.getDataVariables())); 
+        }
 
         for (int i = 0; i < nobs; i++) {
             byte[] dataRowBytes = new byte[bytes_per_row];
@@ -1915,7 +1933,7 @@ private void decodeData(BufferedInputStream stream) throws IOException {
                         // String case
                         int strVarLength = StringLengthTable.get(columnCounter);
                         String raw_datum = new String(Arrays.copyOfRange(dataRowBytes, byte_offset,
-                                (byte_offset + strVarLength)), "ISO-8859-1");
+                                (byte_offset + strVarLength)), StandardCharsets.ISO_8859_1);
                         // TODO: 
                         // is it the right thing to do, to default to "ISO-8859-1"?
                         // (it may be; since there's no mechanism for specifying
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReaderSpi.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReaderSpi.java
index 519684d1668..53ce587fc75 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReaderSpi.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReaderSpi.java
@@ -131,6 +131,7 @@ public boolean canDecodeInput(Object source) throws IOException {
 
     @Override
     public boolean canDecodeInput(BufferedInputStream stream) throws IOException {
+    	//who closes this stream?
         if (stream ==null){
             throw new IllegalArgumentException("stream == null!");
         }
@@ -185,21 +186,21 @@ public boolean canDecodeInput(File file) throws IOException {
             throw new IIOException("cannot read the input file");
         }
 
+        byte[] hdr4 = new byte[4];
         // set-up a FileChannel instance for a given file object
-        FileChannel srcChannel = new FileInputStream(file).getChannel();
-
-        // create a read-only MappedByteBuffer
-        MappedByteBuffer buff = srcChannel.map(FileChannel.MapMode.READ_ONLY, 0, DTA_HEADER_SIZE);
+		try (FileChannel srcChannel = new FileInputStream(file).getChannel();) {
 
-        //printHexDump(buff, "hex dump of the byte-buffer");
+			// create a read-only MappedByteBuffer
+			MappedByteBuffer buff = srcChannel.map(FileChannel.MapMode.READ_ONLY, 0, DTA_HEADER_SIZE);
 
-        buff.rewind();
+			// printHexDump(buff, "hex dump of the byte-buffer");
 
-        dbgLog.fine("applying the dta test\n");
+			buff.rewind();
 
-        byte[] hdr4 = new byte[4];
-        buff.get(hdr4, 0, 4);
+			dbgLog.fine("applying the dta test\n");
 
+			buff.get(hdr4, 0, 4);
+		}
        dbgLog.fine("hex dump: 1st 4bytes =>" +
                 new String(Hex.encodeHex(hdr4)) + "<-");
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DataReader.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DataReader.java
index f321f507d30..913c0ebeab2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DataReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DataReader.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.logging.Logger;
 
@@ -273,7 +274,7 @@ public float readFloat() throws IOException {
      */
     public String readString(int n) throws IOException {
 
-        String ret = new String(readBytes(n), "US-ASCII");
+        String ret = new String(readBytes(n), StandardCharsets.US_ASCII);
 
         // Remove the terminating and/or padding zero bytes:
         if (ret != null && ret.indexOf(0) > -1) {
@@ -281,6 +282,20 @@ public String readString(int n) throws IOException {
         }
         return ret;
     }
+    
+    /* 
+     * Same, but expecting potential Unicode characters.
+     */
+    public String readUtfString(int n) throws IOException {
+
+        String ret = new String(readBytes(n), StandardCharsets.UTF_8);
+
+        // Remove the terminating and/or padding zero bytes:
+        if (ret.indexOf(0) > -1) {
+            return ret.substring(0, ret.indexOf(0));
+        }
+        return ret;
+    }
 
     /* 
      * More complex helper methods for reading NewDTA "sections" ...
@@ -300,11 +315,11 @@ public byte[] readPrimitiveSection(String tag, int length) throws IOException {
     }
 
     public String readPrimitiveStringSection(String tag) throws IOException {
-        return new String(readPrimitiveSection(tag), "US-ASCII");
+        return new String(readPrimitiveSection(tag), StandardCharsets.US_ASCII);
     }
 
     public String readPrimitiveStringSection(String tag, int length) throws IOException {
-        return new String(readPrimitiveSection(tag, length), "US-ASCII");
+        return new String(readPrimitiveSection(tag, length), StandardCharsets.US_ASCII);
     }
 
     public String readLabelSection(String tag, int limit) throws IOException {
@@ -318,7 +333,7 @@ public String readLabelSection(String tag, int limit) throws IOException {
         logger.fine("length of label: " + lengthOfLabel);
         String label = null;
         if (lengthOfLabel > 0) {
-            label = new String(readBytes(lengthOfLabel), "US-ASCII");
+            label = new String(readBytes(lengthOfLabel), StandardCharsets.US_ASCII);
         }
         logger.fine("ret: " + label);
         readClosingTag(tag);
@@ -344,7 +359,7 @@ public String readDefinedStringSection(String tag, int limit) throws IOException
         }
         String ret = null;
         if (number > 0) {
-            ret = new String(readBytes(number), "US-ASCII");
+            ret = new String(readBytes(number), StandardCharsets.US_ASCII);
         }
         logger.fine("ret: " + ret);
         readClosingTag(tag);
@@ -386,7 +401,7 @@ public boolean checkTag(String tag) throws IOException {
 
         int n = tag.length();
         if ((this.buffer_size - buffer_byte_offset) >= n) {
-            return (tag).equals(new String(Arrays.copyOfRange(buffer, buffer_byte_offset, buffer_byte_offset+n),"US-ASCII"));
+            return (tag).equals(new String(Arrays.copyOfRange(buffer, buffer_byte_offset, buffer_byte_offset+n),StandardCharsets.US_ASCII));
         }
         else{
             bufferMoreBytes();
@@ -400,7 +415,7 @@ public void readOpeningTag(String tag) throws IOException {
             throw new IOException("opening tag must be a non-empty string.");
         }
 
-        String openTagString = new String(readBytes(tag.length() + 2), "US-ASCII");
+        String openTagString = new String(readBytes(tag.length() + 2), StandardCharsets.US_ASCII);
         if (openTagString == null || !openTagString.equals("<"+tag+">")) {
             throw new IOException("Could not read opening tag <"+tag+">");
         }
@@ -411,7 +426,7 @@ public void readClosingTag(String tag) throws IOException {
             throw new IOException("closing tag must be a non-empty string.");
         }
 
-        String closeTagString = new String(readBytes(tag.length() + 3), "US-ASCII");
+        String closeTagString = new String(readBytes(tag.length() + 3), StandardCharsets.US_ASCII);
         logger.fine("closeTagString: " + closeTagString);
 
         if (closeTagString == null || !closeTagString.equals("</" + tag + ">")) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/NewDTAFileReader.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/NewDTAFileReader.java
index d523b3d4587..b0f2c50c997 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/NewDTAFileReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/NewDTAFileReader.java
@@ -1,12 +1,31 @@
 package edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.dta;
 
-import java.io.*;
-import java.util.logging.*;
-
-import java.util.*;
-import java.text.*;
-
-import org.apache.commons.lang.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.logging.Logger;
 
 import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
@@ -15,6 +34,7 @@
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataFileReader;
 import edu.harvard.iq.dataverse.ingest.tabulardata.spi.TabularDataFileReaderSpi;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataIngest;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * ingest plugin for Stata 13-15 (117-119) DTA file format. A copy and paste from
@@ -320,7 +340,7 @@ private void init() throws IOException {
     }
 
     @Override
-    public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws IOException {
+    public TabularDataIngest read(BufferedInputStream stream, boolean storeWithVariableHeader, File dataFile) throws IOException {
         logger.fine("NewDTAFileReader: read() start");
 
         // shit ton of diagnostics (still) needed here!!  -- L.A.
@@ -344,7 +364,13 @@ public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws
         // "characteristics" - STATA-proprietary information
         // (we are skipping it)
         readCharacteristics(dataReader);
-        readData(dataReader);
+        
+        String variableHeaderLine = null; 
+        
+        if (storeWithVariableHeader) {
+            variableHeaderLine = generateVariableHeader(dataTable.getDataVariables());
+        }
+        readData(dataReader, variableHeaderLine);
 
         // (potentially) large, (potentially) non-ASCII character strings
         // saved outside the <data> section, and referenced 
@@ -668,7 +694,7 @@ private void readVariableLabels(DataReader reader) throws IOException {
         reader.readOpeningTag(TAG_VARIABLE_LABELS);
 
         for (int i = 0; i < dataTable.getVarQuantity(); i++) {
-            String variableLabel = reader.readString(DTAVersion == 117? 81: 321);
+            String variableLabel = reader.readUtfString(DTAVersion == 117? 81: 321);
             logger.fine("variable " + i + ": label=" + variableLabel);
             if ((variableLabel != null) && (!variableLabel.equals(""))) {
                 dataTable.getDataVariables().get(i).setLabel(variableLabel);
@@ -688,7 +714,7 @@ private void readCharacteristics(DataReader reader) throws IOException {
 
     }
 
-    private void readData(DataReader reader) throws IOException {
+    private void readData(DataReader reader, String variableHeaderLine) throws IOException {
         logger.fine("Data section; at offset " + reader.getByteOffset() + "; dta map offset: " + dtaMap.getOffset_data());
         logger.fine("readData(): start");
         reader.readOpeningTag(TAG_DATA);
@@ -710,8 +736,13 @@ private void readData(DataReader reader) throws IOException {
         ingesteddata.setTabDelimitedFile(tabDelimitedDataFile);
 
         FileOutputStream fileOutTab = new FileOutputStream(tabDelimitedDataFile);
-        PrintWriter pwout = new PrintWriter(new OutputStreamWriter(fileOutTab, "utf8"), true);
+        PrintWriter pwout = new PrintWriter(new OutputStreamWriter(fileOutTab, StandardCharsets.UTF_8), true);
 
+        // add the variable header here, if needed
+        if (variableHeaderLine != null) {
+            pwout.println(variableHeaderLine); 
+        }
+        
         logger.fine("Beginning to read data stream.");
 
         for (int i = 0; i < nobs; i++) {
@@ -971,7 +1002,7 @@ private void readSTRLs(DataReader reader) throws IOException {
 
             File finalTabFile = File.createTempFile("finalTabfile.", ".tab");
             FileOutputStream fileOutTab = new FileOutputStream(finalTabFile);
-            PrintWriter pwout = new PrintWriter(new OutputStreamWriter(fileOutTab, "utf8"), true);
+            PrintWriter pwout = new PrintWriter(new OutputStreamWriter(fileOutTab, StandardCharsets.UTF_8), true);
 
             logger.fine("Setting the tab-delimited file to " + finalTabFile.getName());
             ingesteddata.setTabDelimitedFile(finalTabFile);
@@ -980,6 +1011,8 @@ private void readSTRLs(DataReader reader) throws IOException {
             int nobs = dataTable.getCaseQuantity().intValue();
 
             String[] line;
+            
+            //@todo: adjust for the case of storing the file with the variable header
 
             for (int obsindex = 0; obsindex < nobs; obsindex++) {
                 if (scanner.hasNext()) {
@@ -1098,9 +1131,9 @@ private String readGSO(DataReader reader, long v, long o) throws IOException {
 
         String gsoString;
         if (binary) {
-            gsoString = new String(contents, "utf8"); 
+            gsoString = new String(contents, StandardCharsets.UTF_8); 
         } else {
-            gsoString = new String(contents, 0, (int) length - 1, "US-ASCII");
+            gsoString = new String(contents, 0, (int) length - 1, StandardCharsets.US_ASCII);
         }
 
         logger.fine("GSO " + v + "," + o + ": " + gsoString);
@@ -1194,7 +1227,7 @@ private void readValueLabels(DataReader reader) throws IOException {
                 }
                 label_length = (int)(label_end - label_offset);
 
-                category_value_labels[i] = new String(Arrays.copyOfRange(labelBytes, (int)label_offset, (int)label_end-1), "US-ASCII");
+                category_value_labels[i] = new String(Arrays.copyOfRange(labelBytes, (int)label_offset, (int)label_end-1), StandardCharsets.UTF_8);
                 total_label_bytes += label_length;
             }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/por/PORFileReader.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/por/PORFileReader.java
index a39b044e1b3..13325ca8f60 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/por/PORFileReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/por/PORFileReader.java
@@ -19,19 +19,45 @@
 */
 package edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.por;
 
-import java.io.*;
-import java.nio.*;
-import java.util.logging.*;
-
-import java.util.*;
-import java.util.regex.*;
-import java.text.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.logging.Logger;
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
-import org.apache.commons.lang.*;
 import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
@@ -44,7 +70,6 @@
 import edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.sav.SPSSConstants;
 
 
-
 /**
  * ingest plugin for SPSS/POR ("portable") file format.
  *
@@ -155,7 +180,7 @@ private void init() throws IOException {
     }
     
     @Override
-    public TabularDataIngest read(BufferedInputStream stream, File additionalData) throws IOException{
+    public TabularDataIngest read(BufferedInputStream stream, boolean storeWithVariableHeader, File additionalData) throws IOException{
         dbgLog.fine("PORFileReader: read() start");
         
         if (additionalData != null) {
@@ -170,7 +195,7 @@ public TabularDataIngest read(BufferedInputStream stream, File additionalData) t
         BufferedReader bfReader = null;
         
         try {            
-            bfReader = new BufferedReader(new InputStreamReader(new FileInputStream(tempPORfile.getAbsolutePath()), "US-ASCII"));
+            bfReader = new BufferedReader(new InputStreamReader(new FileInputStream(tempPORfile.getAbsolutePath()), StandardCharsets.US_ASCII));
             if (bfReader == null){
                 dbgLog.fine("bfReader is null");
                 throw new IOException("bufferedReader is null");
@@ -201,7 +226,7 @@ public TabularDataIngest read(BufferedInputStream stream, File additionalData) t
                     headerId = "8S";
                 }
 
-                decode(headerId, bfReader);
+                decode(headerId, bfReader, storeWithVariableHeader);
 
                 
                 // for last iteration
@@ -357,7 +382,7 @@ public TabularDataIngest read(BufferedInputStream stream, File additionalData) t
         return ingesteddata;
     }
     
-    private void decode(String headerId, BufferedReader reader) throws IOException{
+    private void decode(String headerId, BufferedReader reader, boolean storeWithVariableHeader) throws IOException{
         if (headerId.equals("1")) decodeProductName(reader);
         else if (headerId.equals("2")) decodeLicensee(reader);
         else if (headerId.equals("3")) decodeFileLabel(reader);
@@ -373,7 +398,7 @@ private void decode(String headerId, BufferedReader reader) throws IOException{
         else if (headerId.equals("C")) decodeVariableLabel(reader);
         else if (headerId.equals("D")) decodeValueLabel(reader);
         else if (headerId.equals("E")) decodeDocument(reader);
-        else if (headerId.equals("F")) decodeData(reader);
+        else if (headerId.equals("F")) decodeData(reader, storeWithVariableHeader);
     }
     
 
@@ -542,7 +567,7 @@ private File decodeHeader(BufferedInputStream stream) throws IOException {
         try {
             tempPORfile = File.createTempFile("tempPORfile.", ".por");
             fileOutPOR = new FileOutputStream(tempPORfile);
-            fileWriter = new BufferedWriter(new OutputStreamWriter(fileOutPOR, "utf8"));
+            fileWriter = new BufferedWriter(new OutputStreamWriter(fileOutPOR, StandardCharsets.UTF_8));
             porScanner = new Scanner(stream);
 
             // Because 64-bit and 32-bit machines decode POR's first 40-byte
@@ -1074,7 +1099,7 @@ private void decodeDocument(BufferedReader reader) throws IOException {
     }
 
 
-    private void decodeData(BufferedReader reader) throws IOException {
+    private void decodeData(BufferedReader reader, boolean storeWithVariableHeader) throws IOException {
         dbgLog.fine("decodeData(): start");
         // TODO: get rid of this "variableTypeFinal"; -- L.A. 4.0 beta
         int[] variableTypeFinal= new int[varQnty];
@@ -1090,7 +1115,7 @@ private void decodeData(BufferedReader reader) throws IOException {
 
         try {
             fileOutTab = new FileOutputStream(tabDelimitedDataFile);
-            pwout = new PrintWriter(new OutputStreamWriter(fileOutTab, "utf8"), true);
+            pwout = new PrintWriter(new OutputStreamWriter(fileOutTab, StandardCharsets.UTF_8), true);
 
             variableFormatTypeList = new String[varQnty];
             for (int i = 0; i < varQnty; i++) {
@@ -1101,6 +1126,9 @@ private void decodeData(BufferedReader reader) throws IOException {
             // contents (variable) checker concering decimals
             Arrays.fill(variableTypeFinal, 0);
 
+            if (storeWithVariableHeader) {
+                pwout.println(StringUtils.join(variableNameList, "\t"));
+            } 
             // raw-case counter
             int j = 0; // case
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RDATAFileReader.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RDATAFileReader.java
index b2da2f12ff6..215c7a5e6d2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RDATAFileReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RDATAFileReader.java
@@ -21,16 +21,14 @@
 
 
 import java.io.*;
-import java.io.FileReader;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.text.*;
 import java.util.logging.*;
 import java.util.*;
-import java.security.NoSuchAlgorithmException;
-
-import javax.inject.Inject;
 
 // Rosuda Wrappers and Methods for R-calls to Rserve
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import org.rosuda.REngine.REXP;
 import org.rosuda.REngine.REXPMismatchException;
 import org.rosuda.REngine.RList;
@@ -42,18 +40,14 @@
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.datavariable.VariableCategory;
 
-import edu.harvard.iq.dataverse.ingest.plugin.spi.*;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataFileReader;
 import edu.harvard.iq.dataverse.ingest.tabulardata.spi.TabularDataFileReaderSpi;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataIngest;
 import edu.harvard.iq.dataverse.rserve.*;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 
 
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+
 /**
  * Dataverse 4.0 implementation of <code>TabularDataFileReader</code> for the 
  * RData Binary Format.
@@ -88,10 +82,10 @@ public class RDATAFileReader extends TabularDataFileReader {
   static private String RSCRIPT_WRITE_DVN_TABLE = "";
   
   // RServe static variables
-  private static String RSERVE_HOST = System.getProperty("dataverse.rserve.host");
-  private static String RSERVE_USER = System.getProperty("dataverse.rserve.user");
-  private static String RSERVE_PASSWORD = System.getProperty("dataverse.rserve.password");
-  private static int RSERVE_PORT;
+  private final String RSERVE_HOST;
+  private final int RSERVE_PORT;
+  private final String RSERVE_USER;
+  private final String RSERVE_PASSWORD;
   
   // TODO: 
   // we're not using these time/data formats for anything, are we?
@@ -138,24 +132,6 @@ public class RDATAFileReader extends TabularDataFileReader {
    * This is primarily to construct the R-Script
    */
   static {
-    /*
-     * Set defaults fallbacks for class properties
-     */
-    if (RSERVE_HOST == null)
-      RSERVE_HOST = "localhost";
-
-    if (RSERVE_USER == null)
-      RSERVE_USER = "rserve";
-
-    if (RSERVE_PASSWORD == null)
-      RSERVE_PASSWORD = "rserve";
-
-    if (System.getProperty("dataverse.ingest.rserve.port") == null)
-      RSERVE_PORT = 6311;
-    else
-      RSERVE_PORT = Integer.parseInt(System.getProperty("dataverse.rserve.port"));
-
-    
     // Load R Scripts into memory, so that we can run them via R-serve
     RSCRIPT_WRITE_DVN_TABLE = readLocalResource("scripts/write.table.R");
     RSCRIPT_GET_DATASET = readLocalResource("scripts/get.dataset.R");
@@ -451,7 +427,20 @@ public RDATAFileReader(TabularDataFileReaderSpi originator) {
 
     super(originator);
     
-    
+    // These settings have sane defaults in resources/META-INF/microprofile-config.properties,
+    // ready to be overridden by a sysadmin. Every time a file would be read with this file reader,
+    // a new reader will be created, reading from the cached config source settings with minimal overhead.
+    this.RSERVE_HOST = JvmSettings.RSERVE_HOST.lookup();
+    int port;
+    try {
+      port = JvmSettings.RSERVE_PORT.lookup(Integer.class);
+    } catch (IllegalArgumentException e) {
+      LOG.log(Level.SEVERE, "Could not parse value for " + JvmSettings.RSERVE_PORT.getScopedKey() + ", defaulting to 6311", e);
+      port = 6311;
+    }
+    this.RSERVE_PORT = port;
+    this.RSERVE_USER = JvmSettings.RSERVE_USER.lookup();
+    this.RSERVE_PASSWORD = JvmSettings.RSERVE_PASSWORD.lookup();
 
     LOG.fine("RDATAFileReader: INSIDE RDATAFileReader");
 
@@ -483,7 +472,7 @@ private void init() throws IOException {
    * @throws java.io.IOException if a reading error occurs.
    */
     @Override
-    public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws IOException {
+    public TabularDataIngest read(BufferedInputStream stream, boolean saveWithVariableHeader, File dataFile) throws IOException {
 
         init();
 
@@ -514,12 +503,12 @@ public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws
             // created!
             // - L.A. 
             RTabFileParser csvFileReader = new RTabFileParser('\t');
-            BufferedReader localBufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(localCsvFile), "UTF-8"));
+            BufferedReader localBufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(localCsvFile), StandardCharsets.UTF_8));
 
             File tabFileDestination = File.createTempFile("data-", ".tab");
-            PrintWriter tabFileWriter = new PrintWriter(tabFileDestination.getAbsolutePath(), "UTF-8");
+            PrintWriter tabFileWriter = new PrintWriter(tabFileDestination.getAbsolutePath(), StandardCharsets.UTF_8);
         
-            int lineCount = csvFileReader.read(localBufferedReader, dataTable, tabFileWriter);
+            int lineCount = csvFileReader.read(localBufferedReader, dataTable, saveWithVariableHeader, tabFileWriter);
 
             LOG.fine("RDATAFileReader: successfully read "+lineCount+" lines of tab-delimited data.");
         
@@ -695,7 +684,7 @@ private static String readLocalResource(String path) {
 
         // Try opening a buffered reader stream
         try {
-            BufferedReader rd = new BufferedReader(new InputStreamReader(resourceStream, "UTF-8"));
+            BufferedReader rd = new BufferedReader(new InputStreamReader(resourceStream, StandardCharsets.UTF_8));
 
             String line = null;
             while ((line = rd.readLine()) != null) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RTabFileParser.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RTabFileParser.java
index d5ca06a96f3..fbe7e401b57 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RTabFileParser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RTabFileParser.java
@@ -24,7 +24,7 @@
 import java.util.logging.*;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
@@ -61,8 +61,8 @@ public RTabFileParser (char delimiterChar) {
     // should be used.
 
 
-  public int read(BufferedReader csvReader, DataTable dataTable, PrintWriter pwout) throws IOException {
-    dbgLog.warning("RTabFileParser: Inside R Tab file parser");
+    public int read(BufferedReader csvReader, DataTable dataTable, boolean saveWithVariableHeader, PrintWriter pwout) throws IOException {
+        dbgLog.fine("RTabFileParser: Inside R Tab file parser");
       
         int varQnty = 0;
 
@@ -94,14 +94,17 @@ public int read(BufferedReader csvReader, DataTable dataTable, PrintWriter pwout
         boolean[] isTimeVariable = new boolean[varQnty];
         boolean[] isBooleanVariable = new boolean[varQnty];
         
+        String variableNameHeader = null;
+        
         if (dataTable.getDataVariables() != null) {
             for (int i = 0; i < varQnty; i++) {
                 DataVariable var = dataTable.getDataVariables().get(i);
                 if (var == null) {
-                    // throw exception!
+                    throw new IOException ("null dataVariable passed to the parser");
+                    
                 }
                 if (var.getType() == null) {
-                    // throw exception!
+                    throw new IOException ("null dataVariable type passed to the parser");
                 }
                 if (var.isTypeCharacter()) {
                     isCharacterVariable[i] = true; 
@@ -128,13 +131,24 @@ public int read(BufferedReader csvReader, DataTable dataTable, PrintWriter pwout
                         }
                     }
                 } else {
-                    // throw excepion "unknown variable format type" - ?
+                     throw new IOException ("unknown dataVariable format passed to the parser");
                 }
                 
-                
+                if (saveWithVariableHeader) {
+                    variableNameHeader = variableNameHeader == null  
+                            ? var.getName() 
+                            : variableNameHeader.concat("\t" + var.getName());
+                }
             }
         } else {
-            // throw exception!
+            throw new IOException ("null dataVariables list passed to the parser");
+        }
+        
+        if (saveWithVariableHeader) {
+            if (variableNameHeader == null) {
+                throw new IOException ("failed to generate the Variable Names header");
+            }
+            pwout.println(variableNameHeader);
         }
         
         while ((line = csvReader.readLine()) != null) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/sav/SAVFileReader.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/sav/SAVFileReader.java
index 53441c0de65..308ff352b2a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/sav/SAVFileReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/sav/SAVFileReader.java
@@ -19,29 +19,50 @@
 */
 package edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.sav;
 
-import java.io.*;
-import java.nio.*;
-import java.util.logging.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
-import java.util.*;
-import java.util.regex.*;
-import java.text.*;
 
-
-import org.apache.commons.lang.*;
 import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
-import edu.harvard.iq.dataverse.datavariable.SummaryStatistic;
 import edu.harvard.iq.dataverse.datavariable.VariableCategory;
-import edu.harvard.iq.dataverse.datavariable.VariableRange;
-
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataFileReader;
 import edu.harvard.iq.dataverse.ingest.tabulardata.spi.TabularDataFileReaderSpi;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataIngest;
-import edu.harvard.iq.dataverse.ingest.tabulardata.InvalidData; 
-
+import edu.harvard.iq.dataverse.ingest.tabulardata.InvalidData;
 
 
 /**
@@ -314,7 +335,7 @@ private void init() throws IOException {
         }
     }
 
-    public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws IOException{
+    public TabularDataIngest read(BufferedInputStream stream, boolean storeWithVariableHeader, File dataFile) throws IOException{
         dbgLog.info("SAVFileReader: read() start");
         
         if (dataFile != null) {
@@ -398,7 +419,7 @@ public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws
 
 	    methodCurrentlyExecuted = "decodeRecordTypeData";
 	    dbgLog.fine("***** SAVFileReader: executing method decodeRecordTypeData");
-	    decodeRecordTypeData(stream); 
+	    decodeRecordTypeData(stream, storeWithVariableHeader); 
 
 		
 	} catch (IllegalArgumentException e) {
@@ -609,7 +630,7 @@ void decodeRecordType1(BufferedInputStream stream) throws IOException {
             int offset_end = LENGTH_SPSS_PRODUCT_INFO; // 60 bytes
             
             String productInfo = new String(Arrays.copyOfRange(recordType1, offset_start,
-                offset_end),"US-ASCII");
+                offset_end),StandardCharsets.US_ASCII);
                 
             dbgLog.fine("productInfo:\n"+productInfo+"\n");
             dataTable.setOriginalFormatVersion(productInfo);
@@ -848,7 +869,7 @@ void decodeRecordType1(BufferedInputStream stream) throws IOException {
             offset_end += LENGTH_FILE_CREATION_INFO; // 84 bytes
             
             String fileCreationInfo = getNullStrippedString(new String(Arrays.copyOfRange(recordType1, offset_start,
-                offset_end),"US-ASCII"));
+                offset_end),StandardCharsets.US_ASCII));
                 
             dbgLog.fine("fileCreationInfo:\n"+fileCreationInfo+"\n");
             
@@ -1196,7 +1217,7 @@ void decodeRecordType2(BufferedInputStream stream) throws IOException {
                     // borders. So we always read the bytes, but only use them for
                     // the real variable entries.
                         /*String variableLabel = new String(Arrays.copyOfRange(variable_label,
-                                0, rawVariableLabelLength),"US-ASCII");*/
+                                0, rawVariableLabelLength),StandardCharsets.US_ASCII);*/
 
                         variableLabelMap.put(variableName, variableLabel);
                     }
@@ -2051,7 +2072,7 @@ void decodeRecordType7(BufferedInputStream stream) throws IOException {
                         byte[] work = new byte[unitLength*numberOfUnits];
                         int nbtyes13 = stream.read(work);
 
-                        String[] variableShortLongNamePairs = new String(work,"US-ASCII").split("\t");
+                        String[] variableShortLongNamePairs = new String(work,StandardCharsets.US_ASCII).split("\t");
 
                         for (int i=0; i<variableShortLongNamePairs.length; i++){
                             dbgLog.fine("RT7: "+i+"-th pair"+variableShortLongNamePairs[i]);
@@ -2142,7 +2163,7 @@ void decodeRecordType7(BufferedInputStream stream) throws IOException {
                         byte[] rt7st20bytes = new byte[unitLength*numberOfUnits];
                         int nbytes20 = stream.read(rt7st20bytes);
 
-                        String dataCharSet = new String(rt7st20bytes,"US-ASCII");
+                        String dataCharSet = new String(rt7st20bytes,StandardCharsets.US_ASCII);
 
                         if (dataCharSet != null && !(dataCharSet.equals(""))) {
                             dbgLog.fine("RT7-20: data charset: "+ dataCharSet);
@@ -2284,7 +2305,7 @@ void decodeRecordType999(BufferedInputStream stream) throws IOException {
     
     
 
-    void decodeRecordTypeData(BufferedInputStream stream) throws IOException {
+    void decodeRecordTypeData(BufferedInputStream stream, boolean storeWithVariableHeader) throws IOException {
         dbgLog.fine("decodeRecordTypeData(): start");
 
 	///String fileUnfValue = null;
@@ -2296,9 +2317,9 @@ void decodeRecordTypeData(BufferedInputStream stream) throws IOException {
             throw new IllegalArgumentException("stream == null!");
         }
         if (isDataSectionCompressed){
-            decodeRecordTypeDataCompressed(stream);
+            decodeRecordTypeDataCompressed(stream, storeWithVariableHeader);
         } else {
-            decodeRecordTypeDataUnCompressed(stream);
+            decodeRecordTypeDataUnCompressed(stream, storeWithVariableHeader);
         }
             
         /* UNF calculation was here... */
@@ -2323,7 +2344,7 @@ PrintWriter createOutputWriter (BufferedInputStream stream) throws IOException {
 
             fileOutTab = new FileOutputStream(tabDelimitedDataFile);
             
-            pwout = new PrintWriter(new OutputStreamWriter(fileOutTab, "utf8"), true);
+            pwout = new PrintWriter(new OutputStreamWriter(fileOutTab, StandardCharsets.UTF_8), true);
 
         } catch (FileNotFoundException ex) {
             ex.printStackTrace();
@@ -2338,7 +2359,7 @@ PrintWriter createOutputWriter (BufferedInputStream stream) throws IOException {
 
     }
 
-    void decodeRecordTypeDataCompressed(BufferedInputStream stream) throws IOException {
+    void decodeRecordTypeDataCompressed(BufferedInputStream stream, boolean storeWithVariableHeader) throws IOException {
 
         dbgLog.fine("***** decodeRecordTypeDataCompressed(): start *****");
 
@@ -2371,7 +2392,10 @@ void decodeRecordTypeDataCompressed(BufferedInputStream stream) throws IOExcepti
         dbgLog.fine("printFormatTable:\n" + printFormatTable);
         variableFormatTypeList = new String[varQnty];
 
-
+        // write the variable header out, if instructed to do so
+        if (storeWithVariableHeader) {
+            pwout.println(generateVariableHeader(dataTable.getDataVariables()));
+        }
 
         for (int i = 0; i < varQnty; i++) {
             variableFormatTypeList[i] = SPSSConstants.FORMAT_CATEGORY_TABLE.get(
@@ -2923,7 +2947,7 @@ void decodeRecordTypeDataCompressed(BufferedInputStream stream) throws IOExcepti
     }
 
 
-    void decodeRecordTypeDataUnCompressed(BufferedInputStream stream) throws IOException {
+    void decodeRecordTypeDataUnCompressed(BufferedInputStream stream, boolean storeWithVariableHeader) throws IOException {
         dbgLog.fine("***** decodeRecordTypeDataUnCompressed(): start *****");
 
         if (stream ==null){
@@ -2989,6 +3013,11 @@ void decodeRecordTypeDataUnCompressed(BufferedInputStream stream) throws IOExcep
         ///dataTable2 = new Object[varQnty][caseQnty];
 	// storage of date formats to pass to UNF	
         ///dateFormats = new String[varQnty][caseQnty];
+        
+        // write the variable header out, if instructed to do so
+        if (storeWithVariableHeader) {
+            pwout.println(generateVariableHeader(dataTable.getDataVariables()));
+        }
 
         try {
             for (int i = 0; ; i++){  // case-wise loop
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/xlsx/XLSXFileReader.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/xlsx/XLSXFileReader.java
index 5a7642126fe..43b2210efa4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/xlsx/XLSXFileReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/xlsx/XLSXFileReader.java
@@ -23,6 +23,9 @@
 import java.io.*;
 import java.io.FileReader;
 import java.util.logging.*;
+
+import javax.xml.parsers.ParserConfigurationException;
+
 import java.util.*;
 
 import edu.harvard.iq.dataverse.DataTable;
@@ -33,11 +36,12 @@
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataIngest;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import org.apache.commons.lang.StringUtils;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+
+import org.apache.commons.lang3.StringUtils;
 
 import org.apache.poi.xssf.eventusermodel.XSSFReader;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.apache.poi.xssf.model.SharedStringsTable;
+import org.apache.poi.xssf.model.SharedStrings;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -81,7 +85,9 @@ private void init() throws IOException {
      * @throws java.io.IOException if a reading error occurs.
      */
     @Override
-    public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws IOException {
+    public TabularDataIngest read(BufferedInputStream stream, boolean storeWithVariableHeader, File dataFile) throws IOException {
+        // @todo: implement handling of "saveWithVariableHeader" option
+        
         init();
         
         TabularDataIngest ingesteddata = new TabularDataIngest();
@@ -118,6 +124,10 @@ public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws
         String[] caseRow = new String[varQnty];
         String[] valueTokens;
 
+        // add the variable header here, if needed
+        if (storeWithVariableHeader) {
+            finalWriter.println(generateVariableHeader(dataTable.getDataVariables())); 
+        }
         
         while ((line = secondPassReader.readLine()) != null) {
             // chop the line:
@@ -229,7 +239,7 @@ public void processSheet(InputStream inputStream, DataTable dataTable, PrintWrit
         dbglog.info("entering processSheet");
         OPCPackage pkg = OPCPackage.open(inputStream);
         XSSFReader r = new XSSFReader(pkg);
-        SharedStringsTable sst = r.getSharedStringsTable();
+        SharedStrings sst = r.getSharedStringsTable();
 
         XMLReader parser = fetchSheetParser(sst, dataTable, tempOut);
 
@@ -241,7 +251,7 @@ public void processSheet(InputStream inputStream, DataTable dataTable, PrintWrit
         sheet1.close();
     }
     
-    public XMLReader fetchSheetParser(SharedStringsTable sst, DataTable dataTable, PrintWriter tempOut) throws SAXException {
+    public XMLReader fetchSheetParser(SharedStrings sst, DataTable dataTable, PrintWriter tempOut) throws ParserConfigurationException, SAXException {
         // An attempt to use org.apache.xerces.parsers.SAXParser resulted 
         // in some weird conflict in the app; the default XMLReader obtained 
         // from the XMLReaderFactory (from xml-apis.jar) appears to be working
@@ -255,7 +265,7 @@ public XMLReader fetchSheetParser(SharedStringsTable sst, DataTable dataTable, P
         // unnecessary.
         // -- L.A. 4.0 alpha 1
  
-        XMLReader xReader = XMLReaderFactory.createXMLReader();
+        XMLReader xReader = XmlUtil.getSecureXMLReader();
         dbglog.fine("creating new SheetHandler;");
         ContentHandler handler = new SheetHandler(sst, dataTable, tempOut);
         xReader.setContentHandler(handler);
@@ -265,7 +275,7 @@ public XMLReader fetchSheetParser(SharedStringsTable sst, DataTable dataTable, P
     private static class SheetHandler extends DefaultHandler {
 
         private DataTable dataTable;
-        private SharedStringsTable sst;
+        private SharedStrings sst;
         private String cellContents;
         private boolean nextIsString;
         private boolean variableHeader;
@@ -277,11 +287,11 @@ private static class SheetHandler extends DefaultHandler {
         String[] dataRow; 
         PrintWriter tempOut; 
 
-        private SheetHandler(SharedStringsTable sst) {
+        private SheetHandler(SharedStrings sst) {
             this(sst, null, null);
         }
 
-        private SheetHandler(SharedStringsTable sst, DataTable dataTable, PrintWriter tempOut) {
+        private SheetHandler(SharedStrings sst, DataTable dataTable, PrintWriter tempOut) {
             this.sst = sst;
             this.dataTable = dataTable;
             this.tempOut = tempOut; 
@@ -410,7 +420,7 @@ public void endElement(String uri, String localName, String name)
             // Do it now, as characters() may be called more than once
             if (nextIsString) {
                 int idx = Integer.parseInt(cellContents);
-                cellContents = new XSSFRichTextString(sst.getEntryAt(idx)).toString();
+                cellContents = sst.getItemAt(idx).getString();
                 nextIsString = false;
             }
 
@@ -549,7 +559,7 @@ public static void main(String[] args) throws Exception {
         
         BufferedInputStream xlsxInputStream = new BufferedInputStream(new FileInputStream(new File(args[0])));
         
-        TabularDataIngest dataIngest = testReader.read(xlsxInputStream, null);
+        TabularDataIngest dataIngest = testReader.read(xlsxInputStream, false, null);
         
         dataTable = dataIngest.getDataTable();
         
diff --git a/src/main/java/edu/harvard/iq/dataverse/license/License.java b/src/main/java/edu/harvard/iq/dataverse/license/License.java
new file mode 100644
index 00000000000..88766cde73b
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/license/License.java
@@ -0,0 +1,269 @@
+package edu.harvard.iq.dataverse.license;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+
+import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author Jing Ma
+ */
+ @NamedQueries({
+    @NamedQuery( name="License.findAll",
+            query="SELECT l FROM License l ORDER BY (case when l.isDefault then 0 else 1 end), l.sortOrder, l.id asc"),
+    @NamedQuery( name="License.findAllActive",
+            query="SELECT l FROM License l WHERE l.active='true' ORDER BY (case when l.isDefault then 0 else 1 end), l.sortOrder, l.id asc"),
+    @NamedQuery( name="License.findById",
+            query = "SELECT l FROM License l WHERE l.id=:id"),
+    @NamedQuery( name="License.findDefault",
+            query = "SELECT l FROM License l WHERE l.isDefault='true' "),
+    @NamedQuery( name="License.findActiveByNameOrUri",
+            query = "SELECT l FROM License l WHERE l.name=:name AND l.active='true' OR l.uri=:uri AND l.active='true'"),
+    @NamedQuery( name="License.deleteById",
+            query = "DELETE FROM License l WHERE l.id=:id"),
+    @NamedQuery( name="License.deleteByName",
+            query = "DELETE FROM License l WHERE l.name=:name"),
+    @NamedQuery( name="License.setDefault",
+            query = "UPDATE License l SET l.isDefault='true' WHERE l.id=:id"),
+    @NamedQuery( name="License.clearDefault",
+                query = "UPDATE License l SET l.isDefault='false'"),
+    @NamedQuery( name="License.setActiveState",
+    query = "UPDATE License l SET l.active=:state WHERE l.id=:id"),
+    @NamedQuery( name="License.setSortOrder",
+    query = "UPDATE License l SET l.sortOrder=:sortOrder WHERE l.id=:id"),
+
+})
+@Entity
+@Table(uniqueConstraints = {
+      @UniqueConstraint(columnNames = "name"),
+      @UniqueConstraint(columnNames = "uri")}
+)
+public class License {
+    public static String CC0 = "http://creativecommons.org/publicdomain/zero/1.0";
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(columnDefinition = "TEXT", nullable = false, unique = true)
+    private String name;
+
+    @Column(columnDefinition = "TEXT")
+    private String shortDescription;
+
+    @Column(columnDefinition = "TEXT", nullable = false, unique = true)
+    private String uri;
+
+    @Column(columnDefinition = "TEXT")
+    private String iconUrl;
+
+    @Column(nullable = false)
+    private boolean active;
+
+    @Column(nullable = false)
+    private boolean isDefault;
+
+    @Column(nullable = false, columnDefinition = "BIGINT NOT NULL DEFAULT 0")
+    private Long sortOrder;
+
+    @Column(name = "rights_identifier")
+    private String rightsIdentifier;
+
+    @Column(name = "rights_identifier_scheme")
+    private String rightsIdentifierScheme;
+
+    @Column(name = "scheme_uri")
+    private String schemeUri;
+    
+    @Column(name = "language_code")
+    private String languageCode;
+
+    @OneToMany(mappedBy = "license")
+    private List<TermsOfUseAndAccess> termsOfUseAndAccess;
+
+    public License() {
+    }
+
+    public License(String name, String shortDescription, URI uri, URI iconUrl, boolean active, Long sortOrder) {
+        this.name = name;
+        this.shortDescription = shortDescription;
+        this.uri = uri.toASCIIString();
+        if (iconUrl != null) {
+            this.iconUrl = iconUrl.toASCIIString();
+        } else {
+            this.iconUrl = null;
+        }
+        this.active = active;
+        isDefault = false;
+        this.sortOrder = sortOrder;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public URI getUri() {
+        try {
+            return new URI(uri);
+        } catch (URISyntaxException e) {
+            throw new IllegalStateException("Incorrect URI in JSON");
+        }
+    }
+
+    public void setUri(URI uri) {
+        this.uri = uri.toASCIIString();
+    }
+
+    public URI getIconUrl() {
+        if (iconUrl == null) {
+            return null;
+        }
+        try {
+            return new URI(iconUrl);
+        } catch (URISyntaxException e) {
+            throw new IllegalStateException("Incorrect URI in JSON");
+        }
+    }
+
+    public String getShortDescription() {
+        return shortDescription;
+    }
+
+    public void setShortDescription(String shortDescription) {
+        this.shortDescription = shortDescription;
+    }
+
+    public void setIconUrl(URI iconUrl) {
+        if (iconUrl != null) {
+            this.iconUrl = iconUrl.toASCIIString();
+        } else {
+            this.iconUrl = null;
+        }
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public boolean isDefault() {
+        return isDefault;
+    }
+
+    public void setDefault(boolean isDefault) {
+        this.isDefault = isDefault;
+    }
+
+    public List<TermsOfUseAndAccess> getTermsOfUseAndAccess() {
+        return termsOfUseAndAccess;
+    }
+
+    public void setTermsOfUseAndAccess(List<TermsOfUseAndAccess> termsOfUseAndAccess) {
+        this.termsOfUseAndAccess = termsOfUseAndAccess;
+    }
+
+    public Long getSortOrder() {
+        return sortOrder;
+    }
+
+    public void setSortOrder(Long sortOrder) {
+        this.sortOrder = sortOrder;
+    }
+
+    public String getRightsIdentifier() {
+        return rightsIdentifier;
+    }
+
+    public void setRightsIdentifier(String rightsIdentifier) {
+        this.rightsIdentifier = rightsIdentifier;
+    }
+
+    public String getRightsIdentifierScheme() {
+        return rightsIdentifierScheme;
+    }
+
+    public void setRightsIdentifierScheme(String rightsIdentifierScheme) {
+        this.rightsIdentifierScheme = rightsIdentifierScheme;
+    }
+
+    public String getSchemeUri() {
+        return schemeUri;
+    }
+
+    public void setSchemeUri(String schemeUri) {
+        this.schemeUri = schemeUri;
+    }
+
+    public String getLanguageCode() {
+        return languageCode;
+    }
+
+    public void setLanguageCode(String languageCode) {
+        this.languageCode = languageCode;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        License license = (License) o;
+        return active == license.active && id.equals(license.id) && name.equals(license.name)
+                && shortDescription.equals(license.shortDescription) && uri.equals(license.uri)
+                && Objects.equals(iconUrl, license.iconUrl) && Objects.equals(sortOrder, license.sortOrder)
+                && Objects.equals(rightsIdentifier, license.rightsIdentifier)
+                && Objects.equals(rightsIdentifierScheme, license.rightsIdentifierScheme)
+                && Objects.equals(schemeUri, license.schemeUri);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, shortDescription, uri, iconUrl, active, sortOrder, rightsIdentifier,
+                rightsIdentifierScheme, schemeUri);
+    }
+
+    @Override
+    public String toString() {
+        return "License{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", shortDescription='" + shortDescription + '\'' +
+                ", uri=" + uri +
+                ", iconUrl=" + iconUrl +
+                ", active=" + active +
+                ", isDefault=" + isDefault +
+                ", sortOrder=" + sortOrder +
+                ", rightsIdentifier='" + rightsIdentifier + '\'' +
+                ", rightsIdentifierScheme='" + rightsIdentifierScheme + '\'' +
+                ", schemeUri='" + schemeUri + '\'' +
+                '}';
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/license/LicenseConverter.java b/src/main/java/edu/harvard/iq/dataverse/license/LicenseConverter.java
new file mode 100644
index 00000000000..26b7ca63a29
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/license/LicenseConverter.java
@@ -0,0 +1,36 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package edu.harvard.iq.dataverse.license;
+
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
+
+@FacesConverter("licenseConverter")
+public class LicenseConverter implements Converter {
+
+    LicenseServiceBean licenseService = CDI.current().select(LicenseServiceBean.class).get();
+
+    @Override
+    public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
+        if (submittedValue == null || submittedValue.equals("")) {
+            return null;
+        }
+        return licenseService.getById(Long.parseLong(submittedValue));
+    }
+
+    @Override
+    public String getAsString(FacesContext facesContext, UIComponent component, Object value) {
+        if (value == null || value.equals("")) {
+            return "";
+        } else {
+            return ((License) value).getId().toString();
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/license/LicenseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/license/LicenseServiceBean.java
new file mode 100644
index 00000000000..93f4958038c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/license/LicenseServiceBean.java
@@ -0,0 +1,167 @@
+package edu.harvard.iq.dataverse.license;
+
+import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
+import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
+import edu.harvard.iq.dataverse.api.AbstractApiBean.WrappedResponse;
+import static edu.harvard.iq.dataverse.dataset.DatasetUtil.getLocalizedLicenseName;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @author Jing Ma
+ */
+@Stateless
+@Named
+public class LicenseServiceBean {
+    private static final Logger logger = Logger.getLogger(LicenseServiceBean.class.getName());
+
+    @PersistenceContext
+    EntityManager em;
+
+    @EJB
+    ActionLogServiceBean actionLogSvc;
+
+    public List<License> listAll() {
+        return em.createNamedQuery("License.findAll", License.class).getResultList();
+    }
+
+    public List<License> listAllActive() {
+        return em.createNamedQuery("License.findAllActive", License.class).getResultList();
+    }
+
+    public License getById(Long id) {
+        try {
+            return em.createNamedQuery("License.findById", License.class)
+                    .setParameter("id", id)
+                    .getSingleResult();
+        }catch (NoResultException noResultException) {
+            logger.log(Level.WARNING, "License with ID {0} doesn't exist.", id);
+            return null;
+        }
+    }
+
+    public License getDefault() {
+        return em.createNamedQuery("License.findDefault", License.class)
+                .getSingleResult();
+    }
+
+    public License getByNameOrUri(String nameOrUri) {
+        try {
+            return em.createNamedQuery("License.findActiveByNameOrUri", License.class)
+                    .setParameter("name", nameOrUri)
+                    .setParameter("uri", nameOrUri)
+                    .getSingleResult();
+        } catch (NoResultException noResultException) {
+            logger.log(Level.WARNING, "Couldn't find a license for: " + nameOrUri);
+            return null;
+        }
+    }
+    
+    public License getByPotentiallyLocalizedName(String name) {
+        // First, try the name against the name column in the License table, 
+        // verbatim: 
+        License license = getByNameOrUri(name); 
+        if (license != null) {
+            return license; 
+        }
+        
+        // Then, if still here, go through the list, see if any of the names
+        // match this string as a translated name:
+        List<License> allActiveLicenses = listAllActive();
+        if (allActiveLicenses == null) {
+            return null; 
+        }
+        for (License activeLicense : allActiveLicenses) {
+            // This is DatasetUtil.getLicenseName(), it will return the 
+            // localized/translated name, if available.
+            if (name.equals(getLocalizedLicenseName(activeLicense))) {
+                return activeLicense;
+            }
+        }
+        
+        return null; 
+    }
+
+    public int setDefault(Long id) throws WrappedResponse{
+        License candidate = getById(id);
+        if (candidate == null) return 0;
+        if (candidate.isActive()) {
+                em.createNamedQuery("License.clearDefault").executeUpdate();
+               return em.createNamedQuery("License.setDefault").setParameter("id", id).executeUpdate();
+        } else {
+            throw new WrappedResponse(new IllegalArgumentException("Cannot set an inactive license as default"), null);
+        }
+    }
+
+    public int setActive(Long id, boolean state) throws WrappedResponse {
+        License candidate = getById(id);
+        if (candidate == null)
+            return 0;
+        
+        if (candidate.isActive() != state) {
+            if(candidate.isDefault() && state==false) {
+                throw new WrappedResponse(
+                        new IllegalArgumentException("Cannot inactivate the default license"), null);
+            }
+            return em.createNamedQuery("License.setActiveState").setParameter("id", id).setParameter("state", state)
+                    .executeUpdate();
+        } else {
+            throw new WrappedResponse(
+                    new IllegalArgumentException("License already " + (state ? "active" : "inactive")), null);
+        }
+    }
+
+    public int setSortOrder(Long id, Long sortOrder) throws WrappedResponse {
+        License candidate = getById(id);
+        if (candidate == null)
+            return 0;
+        
+        return em.createNamedQuery("License.setSortOrder").setParameter("id", id).setParameter("sortOrder", sortOrder)
+                .executeUpdate();
+    }
+    
+    public License save(License license) throws WrappedResponse {
+        if (license.getId() != null) {
+            throw new WrappedResponse(new IllegalArgumentException("There shouldn't be an ID in the request body"), null);
+        }
+        if (license.getSortOrder() == null) {
+            throw new WrappedResponse(new IllegalArgumentException("There should be a sort order value in the request body"), null);
+        }
+        try {
+            em.persist(license);
+            em.flush();
+        }
+        catch (PersistenceException p) {
+            if (p.getMessage().contains("duplicate key")) {
+                throw new WrappedResponse(new IllegalStateException("A license with the same URI or name is already present.", p), null);
+            }
+            else {
+                throw p;
+            }
+        }
+        return license;
+    }
+
+    public int deleteById(long id) throws WrappedResponse {
+        actionLogSvc.log( new ActionLogRecord(ActionLogRecord.ActionType.Admin, "delete")
+                            .setInfo(Long.toString(id)));
+        try {
+            return em.createNamedQuery("License.deleteById").setParameter("id", id).executeUpdate();
+        } catch (PersistenceException p) {
+            if (p.getMessage().contains("violates foreign key constraint")) {
+                throw new WrappedResponse(new IllegalStateException("License with id " + id + " is referenced and cannot be deleted.", p), null);
+            } else {
+                throw p;
+            }
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/locality/DvObjectStorageLocation.java b/src/main/java/edu/harvard/iq/dataverse/locality/DvObjectStorageLocation.java
index 33486128e7b..5844c8b6ab9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/locality/DvObjectStorageLocation.java
+++ b/src/main/java/edu/harvard/iq/dataverse/locality/DvObjectStorageLocation.java
@@ -2,11 +2,11 @@
 
 import edu.harvard.iq.dataverse.DvObject;
 import java.io.Serializable;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
 
 /**
  * Future use, maybe. Once we're happy with the design we'll enable it as an
diff --git a/src/main/java/edu/harvard/iq/dataverse/locality/StorageSite.java b/src/main/java/edu/harvard/iq/dataverse/locality/StorageSite.java
index d873b9f8989..c074cb5918f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/locality/StorageSite.java
+++ b/src/main/java/edu/harvard/iq/dataverse/locality/StorageSite.java
@@ -2,13 +2,13 @@
 
 import java.io.Serializable;
 import java.util.Objects;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class StorageSite implements Serializable {
diff --git a/src/main/java/edu/harvard/iq/dataverse/locality/StorageSiteServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/locality/StorageSiteServiceBean.java
index c7057ab9318..781e896e9a7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/locality/StorageSiteServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/locality/StorageSiteServiceBean.java
@@ -2,12 +2,12 @@
 
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 
 @Stateless
 public class StorageSiteServiceBean {
diff --git a/src/main/java/edu/harvard/iq/dataverse/locality/StorageSiteUtil.java b/src/main/java/edu/harvard/iq/dataverse/locality/StorageSiteUtil.java
index ebc2bb0f19f..6ff0f7ca379 100644
--- a/src/main/java/edu/harvard/iq/dataverse/locality/StorageSiteUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/locality/StorageSiteUtil.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.List;
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 
 public class StorageSiteUtil {
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetExternalCitations.java b/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetExternalCitations.java
index 3c1c0bc0c68..469f3abe9da 100644
--- a/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetExternalCitations.java
+++ b/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetExternalCitations.java
@@ -7,14 +7,14 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetExternalCitationsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetExternalCitationsServiceBean.java
index 0c1816241bb..fa56432cc3c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetExternalCitationsServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetExternalCitationsServiceBean.java
@@ -7,18 +7,22 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonValue;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 
 /**
  *
@@ -33,39 +37,64 @@ public class DatasetExternalCitationsServiceBean implements java.io.Serializable
     
     @EJB
     DatasetServiceBean datasetService;
-    
-    
-    public List<DatasetExternalCitations> parseCitations(JsonObject report) {
+
+  //Array of relationship types that are considered to be citations
+  static ArrayList<String> inboundRelationships = new ArrayList<String>( 
+          Arrays.asList(
+          "cites",
+          "references",
+          "supplements",
+          "is-supplement-to"));
+  static ArrayList<String> outboundRelationships = new ArrayList<String>( 
+          Arrays.asList(
+          "is-cited-by",
+          "is-referenced-by",
+          "is-supplemented-by"));
+  
+    public List<DatasetExternalCitations> parseCitations(JsonArray citations) {
         List<DatasetExternalCitations> datasetExternalCitations = new ArrayList<>();
-        JsonArray citations = report.getJsonArray("data");
         for (JsonValue citationValue : citations) {
             DatasetExternalCitations exCit = new DatasetExternalCitations();
             JsonObject citation = (JsonObject) citationValue;
-            exCit.setCitedByUrl(citation.getJsonObject("attributes").getString("subj-id"));
-           
-            String localDatasetDOI = citation.getJsonObject("attributes").getString("obj-id");
+            String subjectUri = citation.getJsonObject("attributes").getString("subj-id");
             
-            Dataset localDs = null;
-            if (localDatasetDOI.contains("doi")) {
-                String globalId = localDatasetDOI.replace("https://", "").replace("doi.org/", "doi:").toUpperCase().replace("DOI:", "doi:");
-                localDs = datasetService.findByGlobalId(globalId);
-                exCit.setDataset(localDs);
-            }
+            String objectUri = citation.getJsonObject("attributes").getString("obj-id");
+            String relationship = citation.getJsonObject("attributes").getString("relation-type-id");
+            if (inboundRelationships.contains(relationship)) {
+                Dataset localDs = null;
+                if (objectUri.contains("doi")) {
+                    localDs = datasetService.findByGlobalId(objectUri);
+                    exCit.setDataset(localDs);
+                }
+                exCit.setCitedByUrl(subjectUri);
 
-            if (localDs != null && !exCit.getCitedByUrl().isEmpty() ) {
-                datasetExternalCitations.add(exCit);
+                if (localDs != null && !exCit.getCitedByUrl().isEmpty()) {
+                    datasetExternalCitations.add(exCit);
+                }
             }
+            if (outboundRelationships.contains(relationship)) {
+                Dataset localDs = null;
+                if (subjectUri.contains("doi")) {
+                    localDs = datasetService.findByGlobalId(subjectUri);
+                    exCit.setDataset(localDs);
 
+                }
+                exCit.setCitedByUrl(objectUri);
+                
+                if (localDs != null && !exCit.getCitedByUrl().isEmpty()) {
+                    datasetExternalCitations.add(exCit);
+                }
+            }
         }
         return datasetExternalCitations;
     }
     
     public DatasetExternalCitations save(DatasetExternalCitations datasetExternalCitations) {  
         //Replace existing if necessary
-        Dataset testDs =  datasetExternalCitations.getDataset();
-        String testMonth = datasetExternalCitations.getCitedByUrl();
+        Dataset dataset =  datasetExternalCitations.getDataset();
+        String citedByUrl = datasetExternalCitations.getCitedByUrl();
 
-        DatasetExternalCitations getExisting = getDatasetExternalCitationsByDatasetCitingPID(testDs, testMonth);
+        DatasetExternalCitations getExisting = getDatasetExternalCitationsByDatasetCitingPID(dataset, citedByUrl);
         if (getExisting != null){
             em.remove(getExisting);
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetrics.java b/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetrics.java
index d561b6d530f..15ee35c6404 100644
--- a/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetrics.java
+++ b/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetrics.java
@@ -2,15 +2,16 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Transient;
-import javax.validation.constraints.NotNull;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Transient;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * Cached versions of views, downloads, and citations to show in the UI and API.
@@ -116,10 +117,10 @@ public class DatasetMetrics implements Serializable {
      * For an example of sending various metric types (total-dataset-requests,
      * unique-dataset-investigations, etc) for a given month (2018-04) per
      * country (DK, US, etc.) see
-     * https://github.com/CDLUC3/counter-processor/blob/5ce045a09931fb680a32edcc561f88a407cccc8d/good_test.json#L893
+     * https://github.com/gdcc/counter-processor/blob/5ce045a09931fb680a32edcc561f88a407cccc8d/good_test.json#L893
      *
      * counter-processor uses GeoLite2 for IP lookups according to their
-     * https://github.com/CDLUC3/counter-processor#download-the-free-ip-to-geolocation-database
+     * https://github.com/gdcc/counter-processor#download-the-free-ip-to-geolocation-database
      */
     @Column(nullable = true)
     private String countryCode;
@@ -217,11 +218,9 @@ public String getCountryCode() {
     }
 
     public void setCountryCode(String countryCode) {
-        this.countryCode = countryCode;
+        this.countryCode = ((countryCode == null) ? null : countryCode.toLowerCase());
     }
     
-
-    
     @Transient private Long viewsUnique;
     @Transient private Long viewsTotal;
     @Transient private Long downloadsUnique;
diff --git a/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetricsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetricsServiceBean.java
index 9c9dc24a17a..0fb7e9f1e6c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetricsServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetricsServiceBean.java
@@ -3,28 +3,24 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
-import java.io.StringReader;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
 import java.math.BigDecimal;
-import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Set;
-import java.util.concurrent.Future;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 
 /**
  *
@@ -118,14 +114,17 @@ public List<DatasetMetrics> parseSushiReport(JsonObject report){
     
     public List<DatasetMetrics> parseSushiReport(JsonObject report, Dataset dataset) {
         List<DatasetMetrics> datasetMetricsAll = new ArrayList<>();
-        JsonArray reportDatasets = report.getJsonArray("report_datasets");
+        //Current counter-processor v 0.1.04+ format
+        JsonArray reportDatasets = report.getJsonArray("report-datasets");
+        if(reportDatasets==null) {
+            //Try counter-processor v 0.0.1 name
+            reportDatasets = report.getJsonArray("report_datasets");
+        }
         for (JsonValue reportDataset : reportDatasets) {
             List<DatasetMetrics> datasetMetricsDataset = new ArrayList<>();
             String globalId = null;
             Dataset ds = null;
-            StringReader rdr = new StringReader(reportDataset.toString());
-            JsonReader jrdr = Json.createReader(rdr);
-            JsonObject obj = jrdr.readObject();
+            JsonObject obj = JsonUtil.getJsonObject(reportDataset.toString());
             String jsonGlobalId = "";
             String globalIdType = "";
             if (obj.containsKey("dataset-id")) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountLoggingServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountLoggingServiceBean.java
index e1a635a9d6c..c3bf85e699a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountLoggingServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountLoggingServiceBean.java
@@ -16,14 +16,14 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.UriInfo;
 
 /**
  *
@@ -46,6 +46,12 @@ public void logEntry(MakeDataCountEntry entry) {
     public String getLogFileName() {
         return "counter_"+new SimpleDateFormat("yyyy-MM-dd").format(new Timestamp(new Date().getTime()))+".log";
     }
+
+    // Sanitize the values to a safe string for the log file
+    static String sanitize(String in) {
+        // Log lines are tab delimited so tabs must be replaced. Replacing escape sequences with a space.
+        return in != null ? in.replaceAll("\\s+", " ") : null;
+    }
     
     public static class MakeDataCountEntry {
     
@@ -367,7 +373,7 @@ public String getTitle() {
          * @param title the title to set
          */
         public final void setTitle(String title) {
-            this.title = title;
+            this.title = sanitize(title);
         }
 
         /**
@@ -384,7 +390,7 @@ public String getPublisher() {
          * @param publisher the publisher to set
          */
         public final void setPublisher(String publisher) {
-            this.publisher = publisher;
+            this.publisher = sanitize(publisher);
         }
 
         /**
@@ -401,7 +407,7 @@ public String getPublisherId() {
          * @param publisherId the publisherId to set
          */
         public final void setPublisherId(String publisherId) {
-            this.publisherId = publisherId;
+            this.publisherId = sanitize(publisherId);
         }
 
         /**
@@ -418,7 +424,7 @@ public String getAuthors() {
          * @param authors the authors to set
          */
         public final void setAuthors(String authors) {
-            this.authors = authors;
+            this.authors = sanitize(authors);
         }
 
         /**
@@ -452,7 +458,7 @@ public String getVersion() {
          * @param version the version to set
          */
         public final void setVersion(String version) {
-            this.version = version;
+            this.version = sanitize(version);
         }
 
         /**
@@ -469,7 +475,7 @@ public String getOtherId() {
          * @param otherId the otherId to set
          */
         public void setOtherId(String otherId) {
-            this.otherId = otherId;
+            this.otherId = sanitize(otherId);
         }
 
         /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountProcessState.java b/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountProcessState.java
new file mode 100644
index 00000000000..f1005af30e2
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountProcessState.java
@@ -0,0 +1,84 @@
+package edu.harvard.iq.dataverse.makedatacount;
+
+import jakarta.persistence.*;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.Arrays;
+
+@Entity
+@Table(indexes = {@Index(columnList="yearMonth")})
+public class MakeDataCountProcessState implements Serializable {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(nullable = false)
+    private Long id;
+
+    public enum MDCProcessState {
+        NEW("new"), DONE("done"), SKIP("skip"), PROCESSING("processing"), FAILED("failed");
+        private final String text;
+        private MDCProcessState(final String text) {
+            this.text = text;
+        }
+        public static MDCProcessState fromString(String text) {
+            if (text != null) {
+                for (MDCProcessState state : MDCProcessState.values()) {
+                    if (text.equals(state.text)) {
+                        return state;
+                    }
+                }
+            }
+            throw new IllegalArgumentException("State must be one of these values: " + Arrays.asList(MDCProcessState.values()) + ".");
+        }
+        @Override
+        public String toString() {
+            return text;
+        }
+    }
+    @Column(nullable = false)
+    private String yearMonth;
+    @Column(nullable = false)
+    private MDCProcessState state;
+    @Column(nullable = true)
+    private Timestamp stateChangeTimestamp;
+    @Column(nullable = true)
+    private String server;
+
+    public MakeDataCountProcessState() { }
+    public MakeDataCountProcessState (String yearMonth, String state, String server) {
+        this.setYearMonth(yearMonth);
+        this.setState(state);
+        this.setServer(server);
+    }
+
+    public void setYearMonth(String yearMonth) throws IllegalArgumentException {
+        // Todo: add constraint
+        if (yearMonth == null || (!yearMonth.matches("\\d{4}-\\d{2}") && !yearMonth.matches("\\d{4}-\\d{2}-\\d{2}"))) {
+            throw new IllegalArgumentException("YEAR-MONTH date format must be either yyyy-mm or yyyy-mm-dd");
+        }
+        this.yearMonth = yearMonth;
+    }
+    public String getYearMonth() {
+        return this.yearMonth;
+    }
+    public void setState(MDCProcessState state) {
+        this.state = state;
+        this.stateChangeTimestamp = Timestamp.from(Instant.now());
+    }
+    public void setState(String state) throws IllegalArgumentException {
+        setState(MDCProcessState.fromString(state));
+    }
+    public MDCProcessState getState() {
+        return this.state;
+    }
+    public Timestamp getStateChangeTime() {
+        return stateChangeTimestamp;
+    }
+    public void setServer(String server) {
+        this.server = server;
+    }
+    public String getServer() {
+        return server;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountProcessStateServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountProcessStateServiceBean.java
new file mode 100644
index 00000000000..74d95cab324
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountProcessStateServiceBean.java
@@ -0,0 +1,61 @@
+package edu.harvard.iq.dataverse.makedatacount;
+
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+
+import java.util.List;
+
+@Named
+@Stateless
+public class MakeDataCountProcessStateServiceBean {
+
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    protected EntityManager em;
+
+    public MakeDataCountProcessState getMakeDataCountProcessState(String yearMonth) {
+        validateYearMonth(yearMonth);
+        MakeDataCountProcessState mdcps = null;
+        String queryStr = "SELECT d FROM MakeDataCountProcessState d WHERE d.yearMonth = '" + yearMonth + "' ";
+        Query query = em.createQuery(queryStr);
+        List resultList = query.getResultList();
+        if (resultList.size() > 1) {
+            throw new EJBException("More than one MakeDataCount Process State record found for YearMonth " + yearMonth + ".");
+        }
+        if (resultList.size() == 1) {
+            mdcps = (MakeDataCountProcessState) resultList.get(0);
+        }
+        return mdcps;
+    }
+
+    public MakeDataCountProcessState setMakeDataCountProcessState(String yearMonth, String state, String server) {
+        MakeDataCountProcessState mdcps = getMakeDataCountProcessState(yearMonth);
+        if (mdcps == null) {
+            mdcps = new MakeDataCountProcessState(yearMonth, state, server);
+        } else {
+            mdcps.setState(state);
+        }
+        return em.merge(mdcps);
+    }
+
+    public boolean deleteMakeDataCountProcessState(String yearMonth) {
+        MakeDataCountProcessState mdcps = getMakeDataCountProcessState(yearMonth);
+        if (mdcps == null) {
+            return false;
+        } else {
+            em.remove(mdcps);
+            em.flush();
+            return true;
+        }
+    }
+
+    private void validateYearMonth(String yearMonth) {
+        // Check yearMonth format. either yyyy-mm or yyyy-mm-dd
+        if (yearMonth == null || (!yearMonth.matches("\\d{4}-\\d{2}") && !yearMonth.matches("\\d{4}-\\d{2}-\\d{2}"))) {
+            throw new IllegalArgumentException("YEAR-MONTH date format must be either yyyy-mm or yyyy-mm-dd");
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountUtil.java b/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountUtil.java
index 0447fef012e..30cbed18337 100644
--- a/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountUtil.java
@@ -1,11 +1,16 @@
 package edu.harvard.iq.dataverse.makedatacount;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonValue;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import jakarta.persistence.Transient;
 
 /**
  * See doc/sphinx-guides/source/admin/make-data-count.rst for user facing docs
@@ -22,7 +27,7 @@
  * How to Make Your Data Count July 10th, 2018).
  *
  * The recommended starting point to implement Make Data Count is
- * https://github.com/CDLUC3/Make-Data-Count/blob/master/getting-started.md
+ * https://github.com/gdcc/Make-Data-Count/blob/master/getting-started.md
  * which specifically recommends reading the "COUNTER Code of Practice for
  * Research Data" mentioned in the user facing docs.
  *
@@ -30,7 +35,7 @@
  * https://dash.ucmerced.edu/stash/dataset/doi:10.6071/M3RP49
  *
  * For processing logs we could try DASH's
- * https://github.com/CDLUC3/counter-processor
+ * https://github.com/gdcc/counter-processor
  *
  * Next, DataOne implemented it, and you can see an example dataset here:
  * https://search.dataone.org/view/doi:10.5063/F1Z899CZ
@@ -42,6 +47,14 @@ public class MakeDataCountUtil {
 
     public static final String LOG_HEADER = "#Fields: event_time	client_ip	session_cookie_id	user_cookie_id	user_id	request_url	identifier	filename	size	user-agent	title	publisher	publisher_id	authors	publication_date	version	other_id	target_url	publication_year\n";
 
+    //ISO 3166 Country codes as used by Geomind Geolite2 database in counter-processor
+    @Transient private static Set<String> validCountryCodes = Stream
+            .of("a1", "a2", "o1", "ad", "ae", "af", "ag", "ai", "al", "am", "ao", "ap", "aq", "ar", "as", "at", "au", "aw", "ax", "az", "ba", "bb", "bd", "be", "bf", "bg", "bh", "bi", "bj", "bl", "bm", "bn", "bo", "bq", "br", "bs", "bt", "bv", "bw", "by", "bz", "ca", "cc", "cd", "cf", "cg", "ch", "ci", "ck", "cl", "cm", "cn", "co", "cr", "cu", "cv", "cw", "cx", "cy", "cz", "de", "dj", "dk", "dm", "do", "dz", "ec", "ee", "eg", "eh", "er", "es", "et", "eu", "fi", "fj", "fk",
+                    "fm", "fo", "fr", "ga", "gb", "gd", "ge", "gf", "gg", "gh", "gi", "gl", "gm", "gn", "gp", "gq", "gr", "gs", "gt", "gu", "gw", "gy", "hk", "hm", "hn", "hr", "ht", "hu", "id", "ie", "il", "im", "in", "io", "iq", "ir", "is", "it", "je", "jm", "jo", "jp", "ke", "kg", "kh", "ki", "km", "kn", "kp", "kr", "kw", "ky", "kz", "la", "lb", "lc", "li", "lk", "lr", "ls", "lt", "lu", "lv", "ly", "ma", "mc", "md", "me", "mf", "mg", "mh", "mk", "ml", "mm", "mn", "mo",
+                    "mp", "mq", "mr", "ms", "mt", "mu", "mv", "mw", "mx", "my", "mz", "na", "nc", "ne", "nf", "ng", "ni", "nl", "no", "np", "nr", "nu", "nz", "om", "pa", "pe", "pf", "pg", "ph", "pk", "pl", "pm", "pn", "pr", "ps", "pt", "pw", "py", "qa", "re", "ro", "rs", "ru", "rw", "sa", "sb", "sc", "sd", "se", "sg", "sh", "si", "sj", "sk", "sl", "sm", "sn", "so", "sr", "ss", "st", "sv", "sx", "sy", "sz", "tc", "td", "tf", "tg", "th", "tj", "tk", "tl", "tm", "tn", "to",
+                    "tr", "tt", "tv", "tw", "tz", "ua", "ug", "um", "us", "uy", "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu", "wf", "ws", "ye", "yt", "za", "zm", "zw")
+            .collect(Collectors.toCollection(HashSet<String>::new));;
+
     public enum MetricType {
 
         VIEWS_TOTAL("viewsTotal"),
@@ -73,12 +86,31 @@ public static MetricType fromString(String text) {
                     }
                 }
             }
-            throw new IllegalArgumentException("MetricType must be one of these values: " + Arrays.asList(MetricType.values()) + ".");
+            throw new IllegalArgumentException("MetricType must be one of these values: " + getMetricNameList() + ".");
+        }
+        
+        private static List<String> getMetricNameList() {
+           ArrayList<String> names = new ArrayList<String>();
+           for(MetricType mt: MetricType.values()) {
+               names.add(mt.text);
+           }
+            return names;
         }
 
         @Override
         public String toString() {
-            return text;
+            switch (this) {
+            case DOWNLOADS_TOTAL:
+                return (MetricType.DOWNLOADS_TOTAL_MACHINE + " + " + MetricType.DOWNLOADS_TOTAL_REGULAR);
+            case VIEWS_TOTAL:
+                return (MetricType.VIEWS_TOTAL_MACHINE + " + " + MetricType.VIEWS_TOTAL_REGULAR);
+            case DOWNLOADS_UNIQUE:
+                return (MetricType.DOWNLOADS_UNIQUE_MACHINE + " + " + MetricType.DOWNLOADS_UNIQUE_REGULAR);
+            case VIEWS_UNIQUE:
+                return (MetricType.VIEWS_UNIQUE_MACHINE + " + " + MetricType.VIEWS_UNIQUE_REGULAR);
+            default:
+                return text;
+            }
         }
     }
 
@@ -105,5 +137,12 @@ public static List<DatasetExternalCitations> parseCitations(JsonObject report) {
         }
         return datasetExternalCitations;
     }
+    
+    
+    //counter-processor sushi report uses lower case, so standardizing on that for storage
+    public static boolean isValidCountryCode(String code) {
+        return validCountryCodes.contains(code.toLowerCase());
+    }
+
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/metadataimport/ForeignMetadataImportServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/metadataimport/ForeignMetadataImportServiceBean.java
index 88af8478a8f..1cd68016996 100644
--- a/src/main/java/edu/harvard/iq/dataverse/metadataimport/ForeignMetadataImportServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/metadataimport/ForeignMetadataImportServiceBean.java
@@ -2,7 +2,6 @@
 package edu.harvard.iq.dataverse.metadataimport;
 
 
-import edu.harvard.iq.dataverse.ControlledVocabularyValue;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.DatasetField;
 import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
@@ -11,19 +10,21 @@
 import edu.harvard.iq.dataverse.DatasetFieldValue;
 import edu.harvard.iq.dataverse.ForeignMetadataFieldMapping;
 import edu.harvard.iq.dataverse.ForeignMetadataFormatMapping;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.logging.Logger;
 import java.io.StringReader;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -69,7 +70,7 @@ public void importXML(String xmlToParse, String foreignFormat, DatasetVersion da
         
         try {
             reader = new StringReader(xmlToParse);
-            XMLInputFactory xmlFactory = javax.xml.stream.XMLInputFactory.newInstance();
+            XMLInputFactory xmlFactory = XmlUtil.getSecureXMLInputFactory();
             xmlr =  xmlFactory.createXMLStreamReader(reader);
             processXML(xmlr, mappingSupported, datasetVersion);
         
@@ -96,7 +97,7 @@ public void importXML(File xmlFile, String foreignFormat, DatasetVersion dataset
         
         try {
             in = new FileInputStream(xmlFile);
-            XMLInputFactory xmlFactory = javax.xml.stream.XMLInputFactory.newInstance();
+            XMLInputFactory xmlFactory = XmlUtil.getSecureXMLInputFactory();
             xmlr =  xmlFactory.createXMLStreamReader(in);
             processXML(xmlr, mappingSupported, datasetVersion);
         } catch (FileNotFoundException ex) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsServiceBean.java
index 2b1caa22fe9..9090ef05918 100644
--- a/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsServiceBean.java
@@ -1,25 +1,41 @@
 package edu.harvard.iq.dataverse.metrics;
 
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.GuestbookResponse;
 import edu.harvard.iq.dataverse.Metric;
+import edu.harvard.iq.dataverse.makedatacount.MakeDataCountUtil.MetricType;
+
 import static edu.harvard.iq.dataverse.metrics.MetricsUtil.*;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.ws.rs.core.UriInfo;
 
 @Stateless
 public class MetricsServiceBean implements Serializable {
@@ -33,147 +49,180 @@ public class MetricsServiceBean implements Serializable {
     @EJB
     SystemConfig systemConfig;
 
-    
     /** Dataverses */
-    
+
+
+    public JsonArray getDataversesTimeSeries(UriInfo uriInfo, Dataverse d) {
+        Query query = em.createNativeQuery(""
+                + "select distinct to_char(date_trunc('month', dvobject.publicationdate),'YYYY-MM') as month, count(date_trunc('month', dvobject.publicationdate))\n"
+                + "from dataverse\n"
+                + "join dvobject on dvobject.id = dataverse.id\n"
+                + "where dvobject.publicationdate is not null\n"
+                + ((d == null) ? "" : "and dvobject.id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
+                + "group by  date_trunc('month', publicationdate);");
+        logger.log(Level.FINE, "Metric query: {0}", query);
+        List<Object[]> results = query.getResultList();
+        return MetricsUtil.timeSeriesToJson(results);
+    }
+
     /**
      * @param yyyymm Month in YYYY-MM format.
+     * @param d
      */
-    public long dataversesToMonth(String yyyymm) throws Exception {        
+    public long dataversesToMonth(String yyyymm, Dataverse d) {
         Query query = em.createNativeQuery(""
                 + "select count(dvobject.id)\n"
                 + "from dataverse\n"
                 + "join dvobject on dvobject.id = dataverse.id\n"
                 + "where dvobject.publicationdate is not null\n"
+                + ((d == null) ? "" : "and dvobject.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
                 + "and date_trunc('month', publicationdate) <=  to_date('" + yyyymm + "','YYYY-MM');"
         );
         logger.log(Level.FINE, "Metric query: {0}", query);
-        
+
         return (long) query.getSingleResult();
     }
-    
-    public long dataversesPastDays(int days) throws Exception {
+
+    public long dataversesPastDays(int days, Dataverse d) {
         Query query = em.createNativeQuery(""
                 + "select count(dvobject.id)\n"
                 + "from dataverse\n"
                 + "join dvobject on dvobject.id = dataverse.id\n"
                 + "where dvobject.publicationdate is not null\n"
+                + ((d == null) ? "" : "and dvobject.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
                 + "and publicationdate > current_date - interval '"+days+"' day;\n"
         );
         logger.log(Level.FINE, "Metric query: {0}", query);
-        
+
         return (long) query.getSingleResult();
     }
-    
-    public List<Object[]> dataversesByCategory() throws Exception {
+
+    public List<Object[]> dataversesByCategory(Dataverse d) {
 
         Query query = em.createNativeQuery(""
                 + "select dataversetype, count(dataversetype) from dataverse\n"
                 + "join dvobject on dvobject.id = dataverse.id\n"
                 + "where dvobject.publicationdate is not null\n"
+                + ((d == null) ? "" : "and dvobject.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
                 + "group by dataversetype\n"
                 + "order by count desc;"
         );
         logger.log(Level.FINE, "Metric query: {0}", query);
-        
+
         return query.getResultList();
     }
-    
-    public List<Object[]> dataversesBySubject() {
+
+    public List<Object[]> dataversesBySubject(Dataverse d) {
+        // ToDo - published only?
         Query query = em.createNativeQuery(""
                 + "select cvv.strvalue, count(dataverse_id) from dataversesubjects\n"
                 + "join controlledvocabularyvalue cvv ON cvv.id = controlledvocabularyvalue_id \n"
                 //+ "where dataverse_id != ( select id from dvobject where owner_id is null) \n" //removes root, we decided to do this in the homepage js instead
+                + ((d == null) ? "" : "and dataverse_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
                 + "group by cvv.strvalue\n"
                 + "order by count desc;"
         );
         logger.log(Level.FINE, "Metric query: {0}", query);
-        
+
         return query.getResultList();
     }
-    
+
     /** Datasets */
 
-    
+
+    public JsonArray getDatasetsTimeSeries(UriInfo uriInfo, String dataLocation, Dataverse d) {
+        Query query = em.createNativeQuery(
+                "select distinct date, count(dataset_id)\n"
+                + "from (\n"
+                + "select min(to_char(COALESCE(releasetime, createtime), 'YYYY-MM')) as date, dataset_id\n"
+                + "from datasetversion\n"
+                + "where versionstate='RELEASED' \n"
+                + (((d == null)&&(DATA_LOCATION_ALL.equals(dataLocation))) ? "" : "and dataset_id in (select dataset.id from dataset, dvobject where dataset.id=dvobject.id\n")
+                + ((DATA_LOCATION_LOCAL.equals(dataLocation)) ? "and dataset.harvestingclient_id IS NULL and publicationdate is not null\n " : "")
+                + ((DATA_LOCATION_REMOTE.equals(dataLocation)) ? "and dataset.harvestingclient_id IS NOT NULL\n "  : "")
+                + ((d == null) ? "" : "and dvobject.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n ")
+                + (((d == null)&&(DATA_LOCATION_ALL.equals(dataLocation))) ? "" : ")\n")
+                + "group by dataset_id) as subq group by subq.date order by date;"
+
+        );
+        logger.log(Level.FINE, "Metric query: {0}", query);
+        List<Object[]> results = query.getResultList();
+        return MetricsUtil.timeSeriesToJson(results);
+    }
+
+
     /**
      * @param yyyymm Month in YYYY-MM format.
+     * @param d
      */
-    public long datasetsToMonth(String yyyymm, String dataLocation) throws Exception {
-        String dataLocationLine = "(date_trunc('month', releasetime) <=  to_date('" + yyyymm +"','YYYY-MM') and dataset.harvestingclient_id IS NULL)\n"; 
-        
-        if(!DATA_LOCATION_LOCAL.equals(dataLocation)) { //Default api state is DATA_LOCATION_LOCAL
+    public long datasetsToMonth(String yyyymm, String dataLocation, Dataverse d) {
+        String dataLocationLine = "(date_trunc('month', releasetime) <=  to_date('" + yyyymm + "','YYYY-MM') and dataset.harvestingclient_id IS NULL)\n";
+
+        if (!DATA_LOCATION_LOCAL.equals(dataLocation)) { // Default api state is DATA_LOCATION_LOCAL
             //we have to use createtime for harvest as post dvn3 harvests do not have releasetime populated
-            String harvestBaseLine = "(date_trunc('month', createtime) <=  to_date('" + yyyymm +"','YYYY-MM') and dataset.harvestingclient_id IS NOT NULL)\n"; 
+            String harvestBaseLine = "(date_trunc('month', createtime) <=  to_date('" + yyyymm + "','YYYY-MM') and dataset.harvestingclient_id IS NOT NULL)\n";
             if (DATA_LOCATION_REMOTE.equals(dataLocation)) {
-                dataLocationLine = harvestBaseLine; //replace
-            } else if(DATA_LOCATION_ALL.equals(dataLocation)) {
-                dataLocationLine = "(" + dataLocationLine + " OR " + harvestBaseLine + ")\n"; //append
+                dataLocationLine = harvestBaseLine; // replace
+            } else if (DATA_LOCATION_ALL.equals(dataLocation)) {
+                dataLocationLine = "(" + dataLocationLine + " OR " + harvestBaseLine + ")\n"; // append
             }
         }
-        
-        // Note that this SQL line in the code below: 
-        // datasetversion.dataset_id || ':' || max(datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber))
-        // behaves somewhat counter-intuitively if the versionnumber and/or 
-        // minorversionnumber is/are NULL - it results in an empty string 
-        // (NOT the string "{dataset_id}:", in other words). Some harvested 
-        // versions do not have version numbers (only the ones harvested from 
-        // other Dataverses!) It works fine 
-        // for our purposes below, because we are simply counting the selected 
-        // lines - i.e. we don't care if some of these lines are empty. 
-        // But do not use this notation if you need the values returned to 
-        // meaningfully identify the datasets!
 
         Query query = em.createNativeQuery(
-             "select count(*)\n"
-            +"from (\n"
-            +   "select datasetversion.dataset_id || ':' || max(datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber))\n"
-            +   "from datasetversion\n"
-            +   "join dataset on dataset.id = datasetversion.dataset_id\n"
-            +   "where versionstate='RELEASED' \n"
-            +   "and \n" 
-            +   dataLocationLine //be careful about adding more and statements after this line.
-            +   "group by dataset_id \n"
+
+
+                "select count(*)\n"
+                        + "from (\n"
+                        + "select DISTINCT ON (datasetversion.dataset_id) datasetversion.dataset_id \n"
+                        + "from datasetversion\n"
+                        + "join dataset on dataset.id = datasetversion.dataset_id\n"
+                        + ((d == null) ? "" : "join dvobject on dvobject.id = dataset.id\n")
+                        + "where versionstate='RELEASED' \n"
+                        + ((d == null) ? "" : "and dvobject.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n ")
+                        + "and \n"
+                        + dataLocationLine // be careful about adding more and statements after this line.
+                        + " order by datasetversion.dataset_id, datasetversion.versionnumber desc, datasetversion.minorversionnumber desc\n"
             +") sub_temp"
         );
         logger.log(Level.FINE, "Metric query: {0}", query);
-        
+
         return (long) query.getSingleResult();
     }
-    
-    public List<Object[]> datasetsBySubjectToMonth(String yyyymm, String dataLocation) {  
+
+    public List<Object[]> datasetsBySubjectToMonth(String yyyymm, String dataLocation, Dataverse d) {
         // The SQL code below selects the local, non-harvested dataset versions:
         // A published local datasets may have more than one released version!
         // So that's why we have to jump through some extra hoops below
         // in order to select the latest one:
-        String originClause = "(datasetversion.dataset_id || ':' || datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber) in\n" +
-      	        "(\n" +
-		"select datasetversion.dataset_id || ':' || max(datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber))\n" +
+        String originClause = "(datasetversion.id in\n" +
+                "(\n" +
+                "select DISTINCT ON (datasetversion.dataset_id) datasetversion.id\n" +
                 "       from datasetversion\n" +
                 "       join dataset on dataset.id = datasetversion.dataset_id\n" +
                 "       where versionstate='RELEASED'\n" +
                 "       	     and dataset.harvestingclient_id is null\n" +
                 "       	     and date_trunc('month', releasetime) <=  to_date('" + yyyymm + "','YYYY-MM')\n" +
-                "       group by dataset_id\n" +
+                "       order by datasetversion.dataset_id, datasetversion.versionnumber desc, datasetversion.minorversionnumber desc\n" +
                 "))\n";
-        
-        if(!DATA_LOCATION_LOCAL.equals(dataLocation)) { //Default api state is DATA_LOCATION_LOCAL
+
+        if (!DATA_LOCATION_LOCAL.equals(dataLocation)) { // Default api state is DATA_LOCATION_LOCAL
             //we have to use createtime for harvest as post dvn3 harvests do not have releasetime populated
             // But we can operate on the assumption that all the harvested datasets
-            // are published, and there is always only one version per dataset - 
+            // are published, and there is always only one version per dataset -
             // so the query is simpler:
             String harvestOriginClause = "(\n" +
-                "   datasetversion.dataset_id = dataset.id\n" +
-                "   AND dataset.harvestingclient_id IS NOT null \n" +
-                "   AND date_trunc('month', datasetversion.createtime) <=  to_date('" + yyyymm + "','YYYY-MM')\n" +
-                ")\n"; 
-            
+                    "   datasetversion.dataset_id = dataset.id\n" +
+                    "   AND dataset.harvestingclient_id IS NOT null \n" +
+                    "   AND date_trunc('month', datasetversion.createtime) <=  to_date('" + yyyymm + "','YYYY-MM')\n" +
+                    ")\n";
+
             if (DATA_LOCATION_REMOTE.equals(dataLocation)) {
-                originClause = harvestOriginClause; //replace
-            } else if(DATA_LOCATION_ALL.equals(dataLocation)) {
-                originClause = "(" + originClause + " OR " + harvestOriginClause + ")\n"; //append
+                originClause = harvestOriginClause; // replace
+            } else if (DATA_LOCATION_ALL.equals(dataLocation)) {
+                originClause = "(" + originClause + " OR " + harvestOriginClause + ")\n"; // append
             }
         }
-        
+
         Query query = em.createNativeQuery(""
                 + "SELECT strvalue, count(dataset.id)\n"
                 + "FROM datasetfield_controlledvocabularyvalue \n"
@@ -182,9 +231,11 @@ public List<Object[]> datasetsBySubjectToMonth(String yyyymm, String dataLocatio
                 + "JOIN datasetfieldtype ON datasetfieldtype.id = controlledvocabularyvalue.datasetfieldtype_id\n"
                 + "JOIN datasetversion ON datasetversion.id = datasetfield.datasetversion_id\n"
                 + "JOIN dataset ON dataset.id = datasetversion.dataset_id\n"
+                + ((d == null) ? "" : "JOIN dvobject ON dvobject.id = dataset.id\n")
                 + "WHERE\n"
                 + originClause
                 + "AND datasetfieldtype.name = 'subject'\n"
+                + ((d == null) ? "" : "AND dvobject.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
                 + "GROUP BY strvalue\n"
                 + "ORDER BY count(dataset.id) desc;"
         );
@@ -192,30 +243,32 @@ public List<Object[]> datasetsBySubjectToMonth(String yyyymm, String dataLocatio
 
         return query.getResultList();
     }
-    
-    public long datasetsPastDays(int days, String dataLocation) throws Exception {
-        String dataLocationLine = "(releasetime > current_date - interval '"+days+"' day and dataset.harvestingclient_id IS NULL)\n"; 
-        
-        if(!DATA_LOCATION_LOCAL.equals(dataLocation)) { //Default api state is DATA_LOCATION_LOCAL
+
+    public long datasetsPastDays(int days, String dataLocation, Dataverse d) {
+        String dataLocationLine = "(releasetime > current_date - interval '" + days + "' day and dataset.harvestingclient_id IS NULL)\n";
+
+        if (!DATA_LOCATION_LOCAL.equals(dataLocation)) { // Default api state is DATA_LOCATION_LOCAL
             //we have to use createtime for harvest as post dvn3 harvests do not have releasetime populated
-            String harvestBaseLine = "(createtime > current_date - interval '"+days+"' day and dataset.harvestingclient_id IS NOT NULL)\n"; 
+            String harvestBaseLine = "(createtime > current_date - interval '" + days + "' day and dataset.harvestingclient_id IS NOT NULL)\n";
             if (DATA_LOCATION_REMOTE.equals(dataLocation)) {
-                dataLocationLine = harvestBaseLine; //replace
-            } else if(DATA_LOCATION_ALL.equals(dataLocation)) {
-                dataLocationLine += " or " +harvestBaseLine; //append
+                dataLocationLine = harvestBaseLine; // replace
+            } else if (DATA_LOCATION_ALL.equals(dataLocation)) {
+                dataLocationLine += " or " + harvestBaseLine; // append
             }
         }
 
         Query query = em.createNativeQuery(
-             "select count(*)\n"
-            +"from (\n"
-            +   "select datasetversion.dataset_id || ':' || max(datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber)) as max\n"
-            +   "from datasetversion\n"
-            +   "join dataset on dataset.id = datasetversion.dataset_id\n"
-            +   "where versionstate='RELEASED' \n"
-            +   "and \n" 
-            +   dataLocationLine //be careful about adding more and statements after this line.
-            +   "group by dataset_id \n"
+                "select count(*)\n"
+                        + "from (\n"
+                        + "select DISTINCT ON (datasetversion.dataset_id) datasetversion.id\n"
+                        + "from datasetversion\n"
+                        + "join dataset on dataset.id = datasetversion.dataset_id\n"
+                        + ((d == null) ? "" : "join dvobject on dvobject.id = dataset.id\n")
+                        + "where versionstate='RELEASED' \n"
+                        + ((d == null) ? "" : "and dvobject.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
+                        + "and \n"
+                        + dataLocationLine // be careful about adding more and statements after this line.
+                        + " order by datasetversion.dataset_id, datasetversion.versionnumber desc, datasetversion.minorversionnumber desc \n"
             +") sub_temp"
         );
         logger.log(Level.FINE, "Metric query: {0}", query);
@@ -223,47 +276,81 @@ public long datasetsPastDays(int days, String dataLocation) throws Exception {
         return (long) query.getSingleResult();
     }
 
-
     /** Files */
-    
+
     /**
      * @param yyyymm Month in YYYY-MM format.
+     * @param d
      */
-    public long filesToMonth(String yyyymm) throws Exception {
+    public JsonArray filesTimeSeries(Dataverse d) {
+        Query query = em.createNativeQuery(
+                "select distinct date, count(id)\n"
+                        + "from (\n"
+                        + "select min(to_char(COALESCE(releasetime, createtime), 'YYYY-MM')) as date, filemetadata.id as id\n"
+                        + "from datasetversion, filemetadata\n"
+                        + "where datasetversion.id = filemetadata.datasetversion_id\n"
+                        + "and datasetversion.versionstate = 'RELEASED'\n"
+                        + "and dataset_id in (select dataset.id from dataset, dvobject where dataset.id = dvobject.id\n"
+                        + "and dataset.harvestingclient_id IS NULL and publicationdate is not null\n "
+                        + ((d == null) ? ")" : "and dvobject.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + "))\n ")
+                        + "and filemetadata.id = (\n"
+                        + "    select min(fm.id)\n"
+                        + "    from filemetadata fm\n"
+                        + "    join datasetversion dv on dv.id = fm.datasetversion_id\n"
+                        + "    where fm.datafile_id = filemetadata.datafile_id\n"
+                        + "    and dv.versionstate = 'RELEASED'\n"
+                        + ")\n"
+                        + "group by filemetadata.id) as subq group by subq.date order by date;");
+        logger.log(Level.FINE, "Metric query: {0}", query);
+        List<Object[]> results = query.getResultList();
+        return MetricsUtil.timeSeriesToJson(results);
+    }
+
+
+    /**
+     * @param yyyymm Month in YYYY-MM format.
+     * @param d
+     */
+    public long filesToMonth(String yyyymm, Dataverse d) {
         Query query = em.createNativeQuery(""
                 + "select count(*)\n"
                 + "from filemetadata\n"
                 + "join datasetversion on datasetversion.id = filemetadata.datasetversion_id\n"
-                + "where datasetversion.dataset_id || ':' || datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber) in \n"
+                + "where datasetversion.id in \n"
                 + "(\n"
-                + "select datasetversion.dataset_id || ':' || max(datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber)) as max \n"
+                + "select DISTINCT ON (datasetversion.dataset_id) datasetversion.id \n"
                 + "from datasetversion\n"
                 + "join dataset on dataset.id = datasetversion.dataset_id\n"
-                + "where versionstate='RELEASED'\n"
+                + "join filemetadata fm on fm.datasetversion_id = datasetversion.id\n"
+                + ((d == null) ? "" : "join dvobject on dvobject.id = dataset.id\n")
+                + "where datasetversion.versionstate='RELEASED' and filemetadata.datafile_id=fm.datafile_id\n"
+                + ((d == null) ? "" : "and dvobject.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
                 + "and date_trunc('month', releasetime) <=  to_date('" + yyyymm + "','YYYY-MM')\n"
                 + "and dataset.harvestingclient_id is null\n"
-                + "group by dataset_id \n"
+                + "order by datasetversion.dataset_id, datasetversion.versionnumber desc, datasetversion.minorversionnumber \n"
                 + ");"
         );
         logger.log(Level.FINE, "Metric query: {0}", query);
-        
+
         return (long) query.getSingleResult();
     }
-    
-    public long filesPastDays(int days) throws Exception {
+
+    public long filesPastDays(int days, Dataverse d) {
         Query query = em.createNativeQuery(""
                 + "select count(*)\n"
                 + "from filemetadata\n"
                 + "join datasetversion on datasetversion.id = filemetadata.datasetversion_id\n"
-                + "where datasetversion.dataset_id || ':' || datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber) in \n"
+                + "where datasetversion.id in \n"
                 + "(\n"
-                + "select datasetversion.dataset_id || ':' || max(datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber)) as max \n"
+                + "select DISTINCT ON (datasetversion.dataset_id) datasetversion.id \n"
                 + "from datasetversion\n"
                 + "join dataset on dataset.id = datasetversion.dataset_id\n"
+                + ((d == null) ? "" : "join dvobject on dvobject.id = dataset.id\n")
                 + "where versionstate='RELEASED'\n"
-                + "and releasetime > current_date - interval '"+days+"' day\n"
+                + "and releasetime > current_date - interval '" + days + "' day\n"
+                + ((d == null) ? "" : "AND dvobject.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
                 + "and dataset.harvestingclient_id is null\n"
-                + "group by dataset_id \n"
+                + "order by datasetversion.dataset_id, datasetversion.versionnumber desc, datasetversion.minorversionnumber desc \n"
                 + ");"
         );
         logger.log(Level.FINE, "Metric query: {0}", query);
@@ -271,71 +358,309 @@ public long filesPastDays(int days) throws Exception {
         return (long) query.getSingleResult();
     }
 
-    /** Downloads */
-    
+
+    public JsonArray filesByType(Dataverse d) {
+        // SELECT DISTINCT df.contenttype, sum(df.filesize) FROM datafile df, dvObject ob where ob.id = df.id and dob.owner_id< group by df.contenttype
+        Query query = em.createNativeQuery("SELECT DISTINCT df.contenttype, count(df.id), coalesce(sum(df.filesize), 0) "
+                + " FROM DataFile df "
+                + " JOIN DvObject ob ON ob.id = df.id "
+                + " JOIN FileMetadata fm ON fm.datafile_id = df.id "
+                + " JOIN DatasetVersion dv ON dv.id = fm.datasetversion_id "
+                + " WHERE dv.versionstate = 'RELEASED' "
+                + ((d == null) ? "" : "AND ob.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataset") + ") ")
+                + "GROUP BY df.contenttype;");
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        try {
+            List<Object[]> results = query.getResultList();
+            for (Object[] result : results) {
+                if((BigDecimal)result[2]==BigDecimal.ZERO) {
+                    logger.warning("File(s) of type " + (String) result[0] + " are reported as having 0 total size");
+                }
+                JsonObject stats = Json.createObjectBuilder().add(MetricsUtil.CONTENTTYPE, (String) result[0]).add(MetricsUtil.COUNT, (long) result[1]).add(MetricsUtil.SIZE, (BigDecimal) result[2]).build();
+                jab.add(stats);
+            }
+
+        } catch (NoResultException nr) {
+            // do nothing
+        }
+        return jab.build();
+
+    }
+
+    public JsonArray filesByTypeTimeSeries(Dataverse d, boolean published) {
+        Query query = em.createNativeQuery("SELECT DISTINCT to_char(" + (published ? "ob.publicationdate" : "ob.createdate") + ",'YYYY-MM') as date, df.contenttype, count(df.id), coalesce(sum(df.filesize),0) "
+                + " FROM DataFile df, DvObject ob"
+                + " where ob.id = df.id "
+                + (published ? "and publicationdate is not null\n" : " and createdate is not null\n")
+                + ((d == null) ? "" : "and ob.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataset") + ")\n")
+                + "group by df.contenttype,\n"
+                + (published ? " to_char(ob.publicationdate,'YYYY-MM') order by  to_char(ob.publicationdate,'YYYY-MM');" : " to_char(ob.createdate,'YYYY-MM') order by  to_char(ob.createdate,'YYYY-MM');")
+                );
+        logger.log(Level.FINE, "Metric query: {0}", query);
+        List<Object[]> results = query.getResultList();
+        return MetricsUtil.timeSeriesByTypeToJson(results);
+
+    }
+    /** Downloads
+     * @param d
+     * @throws ParseException */
+
+
+    public JsonArray downloadsTimeSeries(Dataverse d) {
+        // ToDo - published only?
+        Query earlyDateQuery = em.createNativeQuery(""
+                + "select responsetime from guestbookresponse\n"
+                + "ORDER BY responsetime LIMIT 1;");
+
+        Timestamp earlyDateTimestamp = (Timestamp) earlyDateQuery.getSingleResult();
+        LocalDate earliestDate = earlyDateTimestamp.toLocalDateTime().toLocalDate().minusMonths(1);
+        String earliest = earliestDate.format(DateTimeFormatter.ofPattern(YEAR_AND_MONTH_PATTERN));
+
+        // Counts historic guestbook records without date as occurring in the month
+        // prior to the first dated counts
+        Query query = em.createNativeQuery(""
+                + "select  distinct COALESCE(to_char(responsetime, 'YYYY-MM'),'" + earliest + "') as date, count(id)\n"
+                + "from guestbookresponse\n"
+                + ((d == null) ? "" : "where dataset_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataset") + ")")
+                + ((d == null) ? "where ":" and ") + "eventtype!='" + GuestbookResponse.ACCESS_REQUEST +"'\n"
+                + " group by COALESCE(to_char(responsetime, 'YYYY-MM'),'" + earliest + "') order by  COALESCE(to_char(responsetime, 'YYYY-MM'),'" + earliest + "');");
+
+        logger.log(Level.FINE, "Metric query: {0}", query);
+        List<Object[]> results = query.getResultList();
+        return MetricsUtil.timeSeriesToJson(results);
+    }
+
     /*
      * This includes getting historic download without a timestamp if query
      * is earlier than earliest timestamped record
-     * 
+     *
      * @param yyyymm Month in YYYY-MM format.
      */
-    public long downloadsToMonth(String yyyymm) throws Exception {
+    public long downloadsToMonth(String yyyymm, Dataverse d) throws ParseException {
+        // ToDo - published only?
         Query earlyDateQuery = em.createNativeQuery(""
-               + "select responsetime from guestbookresponse\n"
+                + "select responsetime from guestbookresponse\n"
                + "ORDER BY responsetime LIMIT 1;"
         );
 
         try {
             Timestamp earlyDateTimestamp = (Timestamp) earlyDateQuery.getSingleResult();
-             Date earliestDate = new Date(earlyDateTimestamp.getTime());
-            SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM");  
-            Date dateQueried = formatter2.parse(yyyymm);
+            Date earliestDate = new Date(earlyDateTimestamp.getTime());
+
+            Date dateQueried = yyyymmFormat.parse(yyyymm);
 
-            if(!dateQueried.before(earliestDate)) {
+            if (!dateQueried.before(earliestDate)) {
                 Query query = em.createNativeQuery(""
-                    + "select count(id)\n"
-                    + "from guestbookresponse\n"
-                    + "where date_trunc('month', responsetime) <=  to_date('" + yyyymm + "','YYYY-MM')"
-                    + "or responsetime is NULL;" //includes historic guestbook records without date
+                        + "select count(id)\n"
+                        + "from guestbookresponse\n"
+                        + "where (date_trunc('month', responsetime) <=  to_date('" + yyyymm + "','YYYY-MM')"
+                        + "or responsetime is NULL)\n" // includes historic guestbook records without date
+                        + "and eventtype!='" + GuestbookResponse.ACCESS_REQUEST +"'\n"
+                    + ((d==null) ? ";": "AND dataset_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataset") + ");")
                 );
                 logger.log(Level.FINE, "Metric query: {0}", query);
                 return (long) query.getSingleResult();
-            }
-            else {
-                //When we query before the earliest dated record, return 0;
+            } else {
+                // When we query before the earliest dated record, return 0;
                 return 0L;
             }
-        } catch(NoResultException e) {
+        } catch (NoResultException e) {
             //If earlyDateQuery.getSingleResult is null, then there are no guestbooks and we can return 0
             return 0L;
         }
 
     }
 
-    public long downloadsPastDays(int days) throws Exception {
+    public long downloadsPastDays(int days, Dataverse d) {
+        // ToDo - published only?
         Query query = em.createNativeQuery(""
                 + "select count(id)\n"
                 + "from guestbookresponse\n"
-                + "where responsetime > current_date - interval '"+days+"' day;\n"
+                + "where responsetime > current_date - interval '" + days + "' day\n"
+                + "and eventtype!='" + GuestbookResponse.ACCESS_REQUEST +"'\n"
+                + ((d==null) ? ";": "AND dataset_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataset") + ");")
         );
         logger.log(Level.FINE, "Metric query: {0}", query);
 
         return (long) query.getSingleResult();
     }
-    
+
+    public JsonArray fileDownloadsTimeSeries(Dataverse d, boolean uniqueCounts) {
+        Query query = em.createNativeQuery("select distinct to_char(gb.responsetime, 'YYYY-MM') as date, ob.id, ob.protocol || ':' || ob.authority || '/' || ob.identifier as pid, count(" + (uniqueCounts ? "distinct email" : "*") + ") "
+                + " FROM guestbookresponse gb, DvObject ob"
+                + " where ob.id = gb.datafile_id "
+                + ((d == null) ? "" : " and ob.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataset") + ")\n")
+                + "and eventtype!='" + GuestbookResponse.ACCESS_REQUEST +"'\n"
+                + "group by gb.datafile_id, ob.id, ob.protocol, ob.authority, ob.identifier, to_char(gb.responsetime, 'YYYY-MM') order by to_char(gb.responsetime, 'YYYY-MM');");
+
+        logger.log(Level.FINE, "Metric query: {0}", query);
+        List<Object[]> results = query.getResultList();
+        return MetricsUtil.timeSeriesByIDAndPIDToJson(results);
+
+    }
+
+    public JsonArray fileDownloads(String yyyymm, Dataverse d, boolean uniqueCounts) {
+        Query query = em.createNativeQuery("select ob.id, ob.protocol || ':' || ob.authority || '/' || ob.identifier as pid, count(" + (uniqueCounts ? "distinct email" : "*") + ") "
+                + " FROM guestbookresponse gb, DvObject ob"
+                + " where ob.id = gb.datafile_id "
+                + ((d == null) ? "" : " and ob.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataset") + ")\n")
+                + " and date_trunc('month', gb.responsetime) <=  to_date('" + yyyymm + "','YYYY-MM')\n"
+                + "and eventtype!='" + GuestbookResponse.ACCESS_REQUEST +"'\n"
+                + "group by gb.datafile_id, ob.id, ob.protocol, ob.authority, ob.identifier order by count desc;");
+
+        logger.log(Level.FINE, "Metric query: {0}", query);
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        try {
+            List<Object[]> results = query.getResultList();
+            for (Object[] result : results) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                job.add(MetricsUtil.ID, (int) result[0]);
+                if(result[1]!=null) {
+                    job.add(MetricsUtil.PID, (String) result[1]);
+                }
+                job.add(MetricsUtil.COUNT, (long) result[2]);
+                jab.add(job);
+            }
+        } catch (NoResultException nr) {
+            // do nothing
+        }
+        return jab.build();
+    }
+
+    public JsonArray uniqueDownloadsTimeSeries(Dataverse d) {
+        Query query = em.createNativeQuery("select distinct to_char(gb.responsetime, 'YYYY-MM') as date, ob.protocol || ':' || ob.authority || '/' || ob.identifier as pid, count(distinct email) "
+                + " FROM guestbookresponse gb, DvObject ob"
+                + " where ob.id = gb.dataset_id "
+                + ((d == null) ? "" : " and ob.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
+                + "and eventtype!='" + GuestbookResponse.ACCESS_REQUEST +"'\n"
+                + "group by gb.dataset_id, ob.protocol, ob.authority, ob.identifier, to_char(gb.responsetime, 'YYYY-MM') order by to_char(gb.responsetime, 'YYYY-MM');");
+
+        logger.log(Level.FINE, "Metric query: {0}", query);
+        List<Object[]> results = query.getResultList();
+        return MetricsUtil.timeSeriesByPIDToJson(results);
+
+    }
+
+    public JsonArray uniqueDatasetDownloads(String yyyymm, Dataverse d) {
+
+    //select distinct count(distinct email),dataset_id, date_trunc('month', responsetime)  from guestbookresponse group by dataset_id, date_trunc('month',responsetime) order by dataset_id,date_trunc('month',responsetime);
+
+        Query query = em.createNativeQuery("select ob.protocol || ':' || ob.authority || '/' || ob.identifier as pid, count(distinct email) "
+                + " FROM guestbookresponse gb, DvObject ob"
+                + " where ob.id = gb.dataset_id "
+                + ((d == null) ? "" : " and ob.owner_id in (" + getCommaSeparatedIdStringForSubtree(d, "Dataverse") + ")\n")
+                + " and date_trunc('month', responsetime) <=  to_date('" + yyyymm + "','YYYY-MM')\n"
+                + "and eventtype!='" + GuestbookResponse.ACCESS_REQUEST +"'\n"
+                + "group by gb.dataset_id, ob.protocol, ob.authority, ob.identifier order by count(distinct email) desc;");
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        try {
+            List<Object[]> results = query.getResultList();
+            for (Object[] result : results) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                job.add(MetricsUtil.PID, (String) result[0]);
+                job.add(MetricsUtil.COUNT, (long) result[1]);
+                jab.add(job);
+            }
+
+        } catch (NoResultException nr) {
+            // do nothing
+        }
+        return jab.build();
+
+    }
+
+    //Accounts
+
+    /*
+     *
+     * @param yyyymm Month in YYYY-MM format.
+     */
+    public long accountsToMonth(String yyyymm) throws ParseException {
+        Query query = em.createNativeQuery(""
+                + "select count(authenticateduser.id)\n"
+                + "from authenticateduser\n"
+                + "where authenticateduser.createdtime is not null\n"
+                + "and date_trunc('month', createdtime) <=  to_date('" + yyyymm + "','YYYY-MM');"
+        );
+        logger.log(Level.FINE, "Metric query: {0}", query);
+
+        return (long) query.getSingleResult();
+    }
+
+    /*
+     * 
+     * @param days interval since the current date to list 
+     * the number of user accounts created
+     */
+    public long accountsPastDays(int days) {
+        Query query = em.createNativeQuery(""
+                + "select count(id)\n"
+                + "from authenticateduser\n"
+                + "where authenticateduser.createdtime is not null\n"
+                + "and authenticateduser.createdtime > current_date - interval '" + days + "' day;"
+        );
+        logger.log(Level.FINE, "Metric query: {0}", query);
+
+        return (long) query.getSingleResult();
+    }
+
+    public JsonArray accountsTimeSeries() {
+        Query query = em.createNativeQuery(""
+                + "select distinct to_char(au.createdtime, 'YYYY-MM'), count(id)\n"
+                + "from authenticateduser as au\n"
+                + "where au.createdtime is not null\n"
+                + "group by to_char(au.createdtime, 'YYYY-MM')\n"
+                + "order by to_char(au.createdtime, 'YYYY-MM');");
+
+        logger.log(Level.FINE, "Metric query: {0}", query);
+        List<Object[]> results = query.getResultList();
+        return MetricsUtil.timeSeriesToJson(results);
+    }
+
+    //MDC
+
+
+    public JsonArray mdcMetricTimeSeries(MetricType metricType, String country, Dataverse d) {
+        Query query = em.createNativeQuery("SELECT distinct substring(monthyear from 1 for 7) as date, coalesce(sum(" + metricType.toString() + "),0) as count FROM DatasetMetrics\n"
+                + ((d == null) ? "" : "WHERE dataset_id in ( " + getCommaSeparatedIdStringForSubtree(d, "Dataset") + ")\n")
+                + ((country == null) ? "" : ((d == null) ? "WHERE " : "and ") + "countryCode = '" + country + "'")
+                + " group by substring(monthyear from 1 for 7) order by substring(monthyear from 1 for 7);"
+                );
+        logger.log(Level.FINE, "Metric query: {0}", query);
+        List<Object[]> results = query.getResultList();
+        return MetricsUtil.timeSeriesToJson(results, true);
+    }
+
+    public JsonObject getMDCDatasetMetrics(MetricType metricType, String yyyymm, String country, Dataverse d) {
+        String queryStr = "SELECT coalesce(sum(" + metricType.toString() + "),0) as count FROM DatasetMetrics\n"
+                + ((d == null) ? "WHERE " : "WHERE dataset_id in ( " + getCommaSeparatedIdStringForSubtree(d, "Dataset") + ") and\n")
+                + " monthYear <= '" + yyyymm + "' "
+                + ((country == null) ? ";" : " and countryCode = '" + country + "';");
+        logger.info("final query: " + queryStr);
+
+        Query query = em.createNativeQuery(queryStr);
+        BigDecimal sum = (BigDecimal) query.getSingleResult();
+        // if(sum==null) {
+        // sum = BigDecimal.ZERO;
+        // }
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add(metricType.toString(), sum.longValue());
+        return job.build();
+    }
+
     /** Helper functions for metric caching */
-    
-    public String returnUnexpiredCacheDayBased(String metricName, String days, String dataLocation) throws Exception {
-        Metric queriedMetric = getMetric(metricName, dataLocation, days);
+
+    public String returnUnexpiredCacheDayBased(String metricName, String days, String dataLocation, Dataverse d) {
+        Metric queriedMetric = getMetric(metricName, dataLocation, days, d);
 
         if (!doWeQueryAgainDayBased(queriedMetric)) {
             return queriedMetric.getValueJson();
         }
         return null;
     }
-    
-    public String returnUnexpiredCacheMonthly(String metricName, String yyyymm, String dataLocation) throws Exception {
-        Metric queriedMetric = getMetric(metricName, dataLocation, yyyymm);
+
+    public String returnUnexpiredCacheMonthly(String metricName, String yyyymm, String dataLocation, Dataverse d) {
+        Metric queriedMetric = getMetric(metricName, dataLocation, yyyymm, d);
 
         if (!doWeQueryAgainMonthly(queriedMetric)) {
             return queriedMetric.getValueJson();
@@ -343,36 +668,35 @@ public String returnUnexpiredCacheMonthly(String metricName, String yyyymm, Stri
         return null;
     }
 
-    public String returnUnexpiredCacheAllTime(String metricName, String dataLocation) throws Exception {
-        Metric queriedMetric = getMetric(metricName, dataLocation, null); //MAD: not passing a date
+    public String returnUnexpiredCacheAllTime(String metricName, String dataLocation, Dataverse d) {
+        Metric queriedMetric = getMetric(metricName, dataLocation, null, d); // MAD: not passing a date
 
         if (!doWeQueryAgainAllTime(queriedMetric)) {
             return queriedMetric.getValueJson();
         }
         return null;
     }
-        
-    //For day based metrics we check to see if the metric has been pulled today
+
+    // For day based metrics we check to see if the metric has been pulled today
     public boolean doWeQueryAgainDayBased(Metric queriedMetric) {
-        if (null == queriedMetric) { //never queried before
+        if (null == queriedMetric) { // never queried before
             return true;
         }
 
         LocalDate lastCalled = LocalDate.from(queriedMetric.getLastCalledDate().toInstant().atZone(ZoneId.systemDefault()));
         LocalDate todayDate = LocalDate.now(ZoneId.systemDefault());
-        
 
-        if(!lastCalled.equals(todayDate)) {
+        if (!lastCalled.equals(todayDate)) {
             return true;
         } else {
             return false;
-        }        
+        }
     }
 
-    //This is for deciding whether to used a cached value on monthly queries
+    // This is for deciding whether to used a cached value on monthly queries
     //Assumes the metric passed in is sane (e.g. not run for past the current month, not a garbled date string, etc)
     public boolean doWeQueryAgainMonthly(Metric queriedMetric) {
-        if (null == queriedMetric) { //never queried before
+        if (null == queriedMetric) { // never queried before
             return true;
         }
 
@@ -384,24 +708,24 @@ public boolean doWeQueryAgainMonthly(Metric queriedMetric) {
 
         int minutesUntilNextQuery = systemConfig.getMetricsCacheTimeoutMinutes();
 
-        if (yyyymm.equals(thisMonthYYYYMM)) { //if this month
+        if (yyyymm.equals(thisMonthYYYYMM)) { // if this month
             LocalDateTime ldtMinus = ldt.minusMinutes(minutesUntilNextQuery);
             Date todayMinus = Date.from(ldtMinus.atZone(ZoneId.systemDefault()).toInstant());
 
-            //allow if today minus query wait is after last called time
+            // allow if today minus query wait is after last called time
             return (todayMinus.after(lastCalled));
         } else {
             String lastRunYYYYMM = yyyymmFormat.format(lastCalled);
 
-            //if queried was last run during the month it was querying.  
-            //Allows one requery of a past month to make it up to date.
+            // if queried was last run during the month it was querying.
+            // Allows requery of a past month to make it up to date.
             return (lastRunYYYYMM.equals(yyyymm));
         }
     }
 
-    //This is for deciding whether to used a cached value over all time
+    // This is for deciding whether to used a cached value over all time
     public boolean doWeQueryAgainAllTime(Metric queriedMetric) {
-        if (null == queriedMetric) { //never queried before
+        if (null == queriedMetric) { // never queried before
             return true;
         }
 
@@ -412,12 +736,12 @@ public boolean doWeQueryAgainAllTime(Metric queriedMetric) {
         LocalDateTime ldtMinus = ldt.minusMinutes(minutesUntilNextQuery);
         Date todayMinus = Date.from(ldtMinus.atZone(ZoneId.systemDefault()).toInstant());
 
-        //allow if today minus query wait is after last called time
+        // allow if today minus query wait is after last called time
         return (todayMinus.after(lastCalled));
     }
 
-    public Metric save(Metric newMetric) throws Exception {
-        Metric oldMetric = getMetric(newMetric.getName(), newMetric.getDataLocation(), newMetric.getDateString());
+    public Metric save(Metric newMetric) {
+        Metric oldMetric = getMetric(newMetric.getName(), newMetric.getDataLocation(), newMetric.getDateString(), newMetric.getDataverse());
 
         if (oldMetric != null) {
             em.remove(oldMetric);
@@ -427,36 +751,166 @@ public Metric save(Metric newMetric) throws Exception {
         return em.merge(newMetric);
     }
 
-    //This works for date and day based metrics
-    //It is ok to pass null for dataLocation and dayString
-    public Metric getMetric(String name, String dataLocation, String dayString) throws Exception {
+    // This works for date and day based metrics
+    // It is ok to pass null for dataLocation and dayString
+    public Metric getMetric(String name, String dataLocation, String dayString, Dataverse dataverse) {
         Query query = em.createQuery("select object(o) from Metric as o"
                 + " where o.name = :name"
                 + " and o.dataLocation" + (dataLocation == null ? " is null" : " = :dataLocation")
-                + " and o.dayString" + (dayString == null ? " is null" :  " = :dayString")
+                + " and o.dayString" + (dayString == null ? " is null" : " = :dayString")
+                + (dataverse == null ? " and o.dataverse is null" :  " and o.dataverse.id = :dataverseId")
                 , Metric.class);
         query.setParameter("name", name);
         if(dataLocation != null){ query.setParameter("dataLocation", dataLocation);}
         if(dayString != null) {query.setParameter("dayString", dayString);}
-        
+        if(dataverse != null) {query.setParameter("dataverseId", dataverse.getId());}
+
         logger.log(Level.FINE, "getMetric query: {0}", query);
-        
+
         Metric metric = null;
         try {
             metric = (Metric) query.getSingleResult();
-        } catch (javax.persistence.NoResultException nr) {
-            //do nothing
+        } catch (NoResultException nr) {
+            // do nothing
+            logger.fine("No result");
         } catch (NonUniqueResultException nur) {
             //duplicates can happen when a new/requeried metric is called twice and saved twice before one can use the cache
-            //this remove all but the 0th index one in that case
-            for(int i = 1; i < query.getResultList().size(); i++) {
+            // this remove all but the 0th index one in that case
+            for (int i = 1; i < query.getResultList().size(); i++) {
                 Metric extraMetric = (Metric) query.getResultList().get(i);
                 em.remove(extraMetric);
                 em.flush();
             }
             metric = (Metric) query.getResultList().get(0);
         }
+        logger.fine("returning: " + ((metric == null) ? "Null" : metric.getValueJson()));
         return metric;
     }
 
+    // Modified from DANS
+    // https://github.com/DANS-KNAW/dataverse/blob/dans-develop/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsDansServiceBean.java
+
+    /**
+     *
+     * @param dvId - parent dataverse id
+     * @param dtype - type of object to return 'Dataverse' or 'Dataset'
+     * @return - list of objects of specified type included in the subtree (includes parent dataverse if dtype is 'Dataverse')
+     */
+    private String getCommaSeparatedIdStringForSubtree(Dataverse d, String dtype) {
+        /* Currently limited to returning published items (non-null publicationdate)
+         * To support queries of draft/other states, this method would have to be updated
+         */
+        // Start with parentID if returning a subtree of dataverses
+        String idString = (dtype.equals("Dataverse")) ? (d.isReleased() ? Long.toString(d.getId()) : "null") : "null";
+
+        String[] dvObjectIds = Arrays.stream(getChildrenIdsRecursively(d.getId(), dtype, DatasetVersion.VersionState.RELEASED).stream().mapToInt(i -> i).toArray())
+                .mapToObj(String::valueOf).toArray(String[]::new);
+        if (dvObjectIds.length != 0) {
+            // Append parent if returning Dataverses
+            idString = String.join(",", dvObjectIds) + ((dtype.equals("Dataverse")) ? ("," + idString) : "");
+        }
+        return idString;
+    }
+
+    private List<Integer> getChildrenIdsRecursively(Long dvId, String dtype, DatasetVersion.VersionState versionState) {
+
+        //Intended to be called only with dvId != null
+        String sql = "WITH RECURSIVE querytree AS (\n"
+                + "     SELECT id, dtype, owner_id, publicationdate\n"
+                + "     FROM dvobject\n"
+                + "     WHERE id = " + dvId + "\n"
+                + "     UNION ALL\n"
+                + "     SELECT e.id, e.dtype, e.owner_id, e.publicationdate\n"
+                + "     FROM dvobject e\n"
+                + "     INNER JOIN querytree qtree ON qtree.id = e.owner_id\n"
+                + ")\n"
+                + "SELECT id\n"
+                + "FROM querytree\n"
+                + "where dtype='" + dtype + "' and owner_id is not null\n";
+        //TODO: DEACCESSIONED datasets still have a publication date - should check versionstate explicitly?
+        if (versionState != null) {
+            switch (versionState) {
+            case RELEASED:
+                sql += "and publicationdate is not null\n";
+                break;
+            case DRAFT:
+                sql += "and publicationdate is null\n";
+                break;
+            }
+        }
+        sql += ";";
+
+        logger.fine("query  - (" + dvId + ") - getChildrenIdsRecursively: " + sql);
+        return em.createNativeQuery(sql).getResultList();
+    }
+
+    public JsonObject getDataverseTree(Dataverse d, String yyyymm, DatasetVersion.VersionState state) {
+        List<Object[]> results = getDataversesChildrenRecursively(d, yyyymm, state);
+        HashMap<Long, JsonArray> subtrees = new HashMap<Long, JsonArray>();
+        // Relying on the depth-first order
+        // id, depth, alias, name, ownerid
+        // (String)objs[2], (int)objs[0], (int) (long)objs[4], (int)objs[1],
+        // (String)objs[3]));
+        int currentDepth = Integer.MAX_VALUE;
+        long currentOwnerId = -1;
+        JsonArrayBuilder children = null;
+        for (Object[] result : results) {
+            int depth = (int) result[1];
+            long ownerId = (long) result[4];
+            long id = (int) result[0];
+            JsonObjectBuilder node = Json.createObjectBuilder()
+                    .add("id", id)
+                    .add("ownerId", ownerId)
+                    .add("alias", (String) result[2])
+                    .add("depth", depth)
+                    .add("name", (String) result[3]);
+            if (ownerId != currentOwnerId) {
+                // Add current array of children to map and start a new one
+                if (children != null) {
+                    subtrees.put(currentOwnerId, children.build());
+                }
+                children = Json.createArrayBuilder();
+                currentOwnerId = ownerId;
+            }
+            if (subtrees.containsKey(id)) {
+                node.add("children", subtrees.get(id));
+                subtrees.remove(id);
+            }
+            children.add(node);
+        }
+        return (JsonObject) children.build().get(0);
+    }
+
+    private List<Object[]> getDataversesChildrenRecursively(Dataverse d, String yyyymm, DatasetVersion.VersionState versionState) {
+        String sql = "WITH RECURSIVE querytree AS (\n"
+                + "     SELECT id, dtype, owner_id, publicationdate, 0 as depth\n"
+                + "     FROM dvobject\n"
+                + "     WHERE id =" + ((d == null) ? "1" : d.getId() + " \n")
+                + "     UNION ALL\n"
+                + "     SELECT e.id, e.dtype, e.owner_id, e.publicationdate, depth+ 1\n"
+                + "     FROM dvobject e\n"
+                + "     INNER JOIN querytree qtree ON qtree.id = e.owner_id\n"
+                + ")\n"
+                + "SELECT qt.id, depth, dv.alias, dv.name, coalesce(qt.owner_id,0) as ownerId\n"
+                + "FROM querytree qt, dataverse dv\n"
+                + "where dtype='Dataverse'\n"
+                + "and qt.id=dv.id\n";
+
+        //TODO: DEACCESSIONED datasets still have a publication date - should check versionstate explicitly?
+        if (versionState != null) {
+            switch (versionState) {
+            case RELEASED:
+                sql += " and date_trunc('month', publicationdate) <=  to_date('" + yyyymm + "','YYYY-MM')\n";
+                break;
+            case DRAFT:
+                sql += " and date_trunc('month', createdate) <=  to_date('" + yyyymm + "','YYYY-MM')\n";
+                break;
+            }
+        }
+        sql = sql + "order by depth desc, ownerId asc;";
+
+        logger.fine("query  - getDataversesChildrenRecursively: " + sql);
+        return em.createNativeQuery(sql).getResultList();
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsUtil.java b/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsUtil.java
index a3e4c68c848..7d968e7e5c1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsUtil.java
@@ -1,38 +1,47 @@
 package edu.harvard.iq.dataverse.metrics;
 
 import edu.harvard.iq.dataverse.Dataverse;
-import java.io.StringReader;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
+import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.ZoneId;
+import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.DateTimeParseException;
-import java.time.temporal.ChronoField;
-import java.util.Date;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonException;
+import jakarta.ws.rs.BadRequestException;
 
 public class MetricsUtil {
 
     private static final Logger logger = Logger.getLogger(MetricsUtil.class.getCanonicalName());
 
-    private final static String COUNT = "count";
-    private final static String CATEGORY = "category";
-    private final static String SUBJECT = "subject";
-    public static String YEAR_AND_MONTH_PATTERN = "yyyy-MM";
-    
+    public static final String CONTENTTYPE = "contenttype";
+    public static final String COUNT = "count";
+    public static final String CATEGORY = "category";
+    public static final String ID = "id";
+    public static final String PID = "pid";
+    public static final String SUBJECT = "subject";
+    public static final String DATE = "date";
+    public static final String SIZE = "size";
+
+    public static final String YEAR_AND_MONTH_PATTERN = "yyyy-MM";
+
     public static final String DATA_LOCATION_LOCAL = "local";
     public static final String DATA_LOCATION_REMOTE = "remote";
     public static final String DATA_LOCATION_ALL = "all";
 
+    private MetricsUtil() {}
+
     public static JsonObjectBuilder countToJson(long count) {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add(COUNT, count);
@@ -54,8 +63,8 @@ public static JsonArrayBuilder dataversesByCategoryToJson(List<Object[]> listOfO
         }
         return jab;
     }
-    
-    public static JsonArrayBuilder dataversesBySubjectToJson(List<Object[]> listOfObjectArrays){
+
+    public static JsonArrayBuilder dataversesBySubjectToJson(List<Object[]> listOfObjectArrays) {
         JsonArrayBuilder jab = Json.createArrayBuilder();
         for (Object[] objectArray : listOfObjectArrays) {
             JsonObjectBuilder job = Json.createObjectBuilder();
@@ -80,90 +89,237 @@ public static JsonArrayBuilder datasetsBySubjectToJson(List<Object[]> listOfObje
         }
         return jab;
     }
+    
+    public static JsonArray timeSeriesToJson(List<Object[]> results) {
+        return timeSeriesToJson(results, false);
+    }
+    
+    public static JsonArray timeSeriesToJson(List<Object[]> results, boolean isBigDecimal) {
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        long total = 0;
+        String curDate = (String) results.get(0)[0];
+        // Get a list of all the monthly dates from the start until now
+        List<String> dates = getDatesFrom(curDate);
+        int i = 0;
+        // Create an entry for each date
+        for (String date : dates) {
+            JsonObjectBuilder job = Json.createObjectBuilder();
+            
+            // If there's a result for this date, add it's count to the total
+            // and find the date of the next entry
+            if (date.equals(curDate)) {
+                if(isBigDecimal) {
+                    total +=((BigDecimal) results.get(i)[1]).longValue();
+                } else {
+                    total += (long) results.get(i)[1];
+                }
+                i += 1;
+                if (i < results.size()) {
+                    curDate = (String) results.get(i)[0];
+                }
+            }
+            /*Don't report dates prior to the first count
+             * Probably generally useful but added specifically because some installations
+             * with MDC did not get unique view info to start, so there are MDC downloads
+             * starting from the first logging date but unique views/downloads only start
+             * later and it is odd to see no unique counts for the prior months
+             */
+
+            if (total != 0) {
+                job.add(MetricsUtil.DATE, date);
+                // Then add the aggregate count
+                job.add(MetricsUtil.COUNT, total);
+                jab.add(job);
+            }
+        }
+        return jab.build();
+    }
+    
+    public static JsonArray timeSeriesByTypeToJson(List<Object[]> results) {
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        Map<String, Long> totals = new HashMap<>();
+        Map<String, Long> sizes =  new HashMap<>();
+        String curDate = (String) results.get(0)[0];
+        // Get a list of all the monthly dates from the start until now
+        List<String> dates = getDatesFrom(curDate);
+        int i = 0;
+        // Create an entry for each date
+        for (String date : dates) {
+
+            // If there's are results for this date, add their counts to the totals
+            // and find the date of the next entry(ies)
+            while (date.equals(curDate) && i < results.size()) {
+                String type = (String) results.get(i)[1];
+                totals.put(type,  (totals.containsKey(type) ? totals.get(type) : 0) + (long) results.get(i)[2]);
+                sizes.put(type,  (sizes.containsKey(type) ? sizes.get(type) : 0) + ((BigDecimal) results.get(i)[3]).longValue());
+                i += 1;
+                if (i < results.size()) {
+                    curDate = (String) results.get(i)[0];
+                }
+            }
+            // Then add the aggregate count and size for all types
+            for(String type: totals.keySet()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                job.add(MetricsUtil.DATE, date);
+                job.add(CONTENTTYPE, type);
+                job.add(COUNT, totals.get(type));
+                job.add(SIZE, sizes.get(type));
+                jab.add(job);
+            }
+        }
+        return jab.build();
+    }
+    
+    public static JsonArray timeSeriesByPIDToJson(List<Object[]> results) {
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        Map<String, Long> totals = new HashMap<>();
+        String curDate = (String) results.get(0)[0];
+        // Get a list of all the monthly dates from the start until now
+        List<String> dates = getDatesFrom(curDate);
+        int i = 0;
+        // Create an entry for each date
+        for (String date : dates) {
+            // If there's are results for this date, add their counts to the totals
+            // and find the date of the next entry(ies)
+            while (date.equals(curDate) && i < results.size()) {
+                String pid = (String) results.get(i)[1];
+                totals.put(pid,  (totals.containsKey(pid) ? totals.get(pid) : 0) + (long) results.get(i)[2]);
+                i += 1;
+                if (i < results.size()) {
+                    curDate = (String) results.get(i)[0];
+                }
+            }
+            // Then add the aggregate count and size for all types
+            for(String type: totals.keySet()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                job.add(MetricsUtil.DATE, date);
+                job.add(PID, type);
+                job.add(COUNT, totals.get(type));
+                jab.add(job);
+            }
+        }
+        return jab.build();
+    }
+    
+    public static JsonArray timeSeriesByIDAndPIDToJson(List<Object[]> results) {
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        Map<Integer, Long> totals = new HashMap<>();
+        Map<Integer, String> pids = new HashMap<>();
+        String curDate = (String) results.get(0)[0];
+        // Get a list of all the monthly dates from the start until now
+        List<String> dates = getDatesFrom(curDate);
+        int i = 0;
+        // Create an entry for each date
+        for (String date : dates) {
+            // If there's are results for this date, add their counts to the totals
+            // and find the date of the next entry(ies)
+            while (date.equals(curDate) && i < results.size()) {
+                Integer id = (Integer) results.get(i)[1];
+                String pid = (String) results.get(i)[2];
+                totals.put(id,  (totals.containsKey(id) ? totals.get(id) : 0) + (long) results.get(i)[3]);
+                pids.put(id,  pid);
+                i += 1;
+                if (i < results.size()) {
+                    curDate = (String) results.get(i)[0];
+                }
+            }
+            // Then add the aggregate count and size for all types
+            for(Integer id: totals.keySet()) {
+                JsonObjectBuilder job = Json.createObjectBuilder();
+                job.add(MetricsUtil.DATE, date);
+                job.add(ID, id);
+                if(pids.get(id)!=null) {
+                    job.add(PID, pids.get(id));
+                }
+                job.add(COUNT, totals.get(id));
+                jab.add(job);
+            }
+        }
+        return jab.build();
+    }
+    
 
     /**
      *
-     * @param userInput A year and month in YYYY-MM format.
-     * @return A year and month in YYYY-MM format.
-     *
-     * Note that along with sanitization, this checks that the inputted month is
+     * Note that along with sanitization, this checks that the requested month is
      * not after the current one. This will need to be made more robust if we
      * start writing metrics for farther in the future (e.g. the current year)
+     * @param userInput A year and month in YYYY-MM format.
+     * @return A year and month in YYYY-M     
      */
-    public static String sanitizeYearMonthUserInput(String userInput) throws Exception {
+    public static String sanitizeYearMonthUserInput(String userInput) throws BadRequestException {
         logger.fine("string from user to sanitize (hopefully YYYY-MM format): " + userInput);
-        DateTimeFormatter dateTimeFormatter = new DateTimeFormatterBuilder()
-                .appendPattern("yyyy-MM")
-                // To make the parser happy, we set the day of the month to the first of the month.
-                .parseDefaulting(ChronoField.DAY_OF_MONTH, 1)
-                .toFormatter();
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(YEAR_AND_MONTH_PATTERN);
         LocalDate inputLocalDate = null;
         try {
-            inputLocalDate = LocalDate.parse(userInput, dateTimeFormatter);
+            inputLocalDate = YearMonth.parse(userInput, dateTimeFormatter).atDay(1);
         } catch (DateTimeParseException ex) {
-            throw new Exception("The expected format is YYYY-MM but an exception was thrown: " + ex.getLocalizedMessage());
+            throw new BadRequestException("The expected format is YYYY-MM but an exception was thrown: " + ex.getLocalizedMessage());
         }
 
-        LocalDate currentDate = (new Date()).toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        LocalDate currentDate = LocalDate.now();
 
         if (inputLocalDate.isAfter(currentDate)) {
-            throw new Exception("The inputted date is set past the current month.");
+            throw new BadRequestException("The requested date is set past the current month.");
         }
 
-        String sanitized = inputLocalDate.format(DateTimeFormatter.ofPattern(YEAR_AND_MONTH_PATTERN));
-        return sanitized;
+        return inputLocalDate.format(dateTimeFormatter);
     }
 
-    public static String validateDataLocationStringType(String dataLocation) throws Exception {
-        if( null == dataLocation || "".equals(dataLocation)) {
+    public static String validateDataLocationStringType(String dataLocation) throws BadRequestException {
+        if (null == dataLocation || "".equals(dataLocation)) {
             dataLocation = DATA_LOCATION_LOCAL;
-        } 
-        if(!(DATA_LOCATION_LOCAL.equals(dataLocation) || DATA_LOCATION_REMOTE.equals(dataLocation) || DATA_LOCATION_ALL.equals(dataLocation))) {
-            throw new Exception("The inputted data location is not valid");
         }
-        
+        if (!(DATA_LOCATION_LOCAL.equals(dataLocation) || DATA_LOCATION_REMOTE.equals(dataLocation) || DATA_LOCATION_ALL.equals(dataLocation))) {
+            throw new BadRequestException("Data location must be 'local', 'remote', or 'all'");
+        }
+
         return dataLocation;
     }
-    
+
     public static String getCurrentMonth() {
         return LocalDate.now().format(DateTimeFormatter.ofPattern(MetricsUtil.YEAR_AND_MONTH_PATTERN));
     }
 
-    //Responses need jsonObjectBuilder's to return correct json
-    //Sadly this first requires creating a non-builder object and then populating a builder
-    public static JsonObjectBuilder stringToJsonObjectBuilder(String str) {
-        JsonReader jsonReader = Json.createReader(new StringReader(str));
-        JsonObject jo = jsonReader.readObject();
-        jsonReader.close();
-
-        JsonObjectBuilder job = Json.createObjectBuilder();
-
-        for (Map.Entry<String, JsonValue> entry : jo.entrySet()) {
-            job.add(entry.getKey(), entry.getValue());
+    /**
+     * Parse a String into a JSON object
+     * @param str serialized JSON
+     * @return {@code null} if {@code str} is {@code null}, or the parsed JSON object
+     * @throws JsonException
+     * @see JsonUtil#getJsonObject(String)
+     */
+    public static JsonObject stringToJsonObject(String str) {
+        if (str == null) {
+            return null;
         }
 
-        return job;
+        return JsonUtil.getJsonObject(str);
     }
 
-    //Responses need jsonObjectBuilder's to return correct json
-    //Sadly this first requires creating a non-builder object and then populating a builder
-    public static JsonArrayBuilder stringToJsonArrayBuilder(String str) {
-        JsonReader jsonReader = Json.createReader(new StringReader(str));
-        JsonArray ja = jsonReader.readArray();
-        jsonReader.close();
-
-        JsonArrayBuilder jab = Json.createArrayBuilder();
-
-        for (int i = 0; i < ja.size(); i++) {
-            JsonObjectBuilder job = Json.createObjectBuilder();
+    /**
+     * Parse a String into a JSON array
+     * @param str serialized JSON
+     * @return {@code null} if {@code str} is {@code null}, or the parsed JSON array
+     * @throws JsonException
+     * @see JsonUtil#getJsonArray(String)
+     */
+    public static JsonArray stringToJsonArray(String str) {
+        if (str == null) {
+            return null;
+        }
 
-            for (Map.Entry<String, JsonValue> entry : ja.getJsonObject(i).entrySet()) {
-                job.add(entry.getKey(), entry.getValue());
-            }
+        return JsonUtil.getJsonArray(str);
+    }
 
-            jab.add(job);
+    public static List<String> getDatesFrom(String startMonth) {
+        List<String> dates = new ArrayList<>();
+        LocalDate next = LocalDate.parse(startMonth+ "-01").plusMonths(1);
+        dates.add(startMonth);
+        DateTimeFormatter monthFormat = DateTimeFormatter.ofPattern(YEAR_AND_MONTH_PATTERN);
+        while (next.isBefore(LocalDate.now())) {
+            dates.add(next.format(monthFormat));
+            next = next.plusMonths(1);
         }
-
-        return jab;
+        return dates;
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/DataRetrieverAPI.java b/src/main/java/edu/harvard/iq/dataverse/mydata/DataRetrieverAPI.java
index 523d06bb8a1..e8605da09bc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/mydata/DataRetrieverAPI.java
+++ b/src/main/java/edu/harvard/iq/dataverse/mydata/DataRetrieverAPI.java
@@ -3,12 +3,14 @@
  */
 package edu.harvard.iq.dataverse.mydata;
 
+import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DataverseSession;
+import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.DvObjectServiceBean;
 import edu.harvard.iq.dataverse.RoleAssigneeServiceBean;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
+import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.search.SolrQueryResponse;
 import edu.harvard.iq.dataverse.search.SolrSearchResult;
 import edu.harvard.iq.dataverse.api.AbstractApiBean;
@@ -22,24 +24,27 @@
 import edu.harvard.iq.dataverse.search.SearchConstants;
 import edu.harvard.iq.dataverse.search.SearchException;
 import edu.harvard.iq.dataverse.search.SearchFields;
+import edu.harvard.iq.dataverse.search.SearchServiceFactory;
 import edu.harvard.iq.dataverse.search.SortBy;
-import java.math.BigDecimal;
+
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.inject.Inject;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import jakarta.ejb.EJB;
+import jakarta.inject.Inject;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -59,7 +64,7 @@ public class DataRetrieverAPI extends AbstractApiBean {
     private static final String retrieveDataPartialAPIPath = "retrieve";
 
     @Inject
-    DataverseSession session;    
+    DataverseSession session;
 
     @EJB
     DataverseRoleServiceBean dataverseRoleService;
@@ -68,7 +73,7 @@ public class DataRetrieverAPI extends AbstractApiBean {
     @EJB
     DvObjectServiceBean dvObjectServiceBean;
     @EJB
-    SearchServiceBean searchService;
+    SearchServiceFactory searchService;
     @EJB
     AuthenticationServiceBean authenticationService;
     @EJB
@@ -77,10 +82,11 @@ public class DataRetrieverAPI extends AbstractApiBean {
     //MyDataQueryHelperServiceBean myDataQueryHelperServiceBean;
     @EJB
     GroupServiceBean groupService;
+    @EJB
+    DatasetServiceBean datasetService;
     
     private List<DataverseRole> roleList;
     private DataverseRolePermissionHelper rolePermissionHelper;
-    private List<String> defaultDvObjectTypes = MyDataFilterParams.defaultDvObjectTypes;
     private MyDataFinder myDataFinder;
     private SolrQueryResponse solrQueryResponse;
     private AuthenticatedUser authUser = null;
@@ -88,9 +94,7 @@ public class DataRetrieverAPI extends AbstractApiBean {
     public static final String JSON_SUCCESS_FIELD_NAME = "success";
     public static final String JSON_ERROR_MSG_FIELD_NAME = "error_message";
     public static final String JSON_DATA_FIELD_NAME = "data";
-    
-    public static final String MSG_NO_RESULTS_FOUND = BundleUtil.getStringFromBundle("dataretrieverAPI.noMsgResultsFound");
-    
+
     /**
      * Constructor
      * 
@@ -99,11 +103,6 @@ public DataRetrieverAPI(){
            
     }
     
-    private int randInt(int min, int max) {
-        Random rand = new Random();
-        return rand.nextInt((max - min) + 1) + min;
-    }
-    
     public String getRetrieveDataFullAPIPath(){
         return DataRetrieverAPI.retrieveDataFullAPIPath;
     }
@@ -220,7 +219,7 @@ private SolrQueryResponse getTotalCountsFromSolr(DataverseRequest dataverseReque
         // -------------------------------------------------------
         SolrQueryResponse solrQueryResponseForCounts;
         try {
-            solrQueryResponseForCounts = searchService.search(
+            solrQueryResponseForCounts = searchService.getDefaultSearchService().search(
                     dataverseRequest,
                     null, // subtree, default it to Dataverse for now
                     "*",  //    Get everything--always
@@ -229,7 +228,13 @@ private SolrQueryResponse getTotalCountsFromSolr(DataverseRequest dataverseReque
                     //SearchFields.RELEASE_OR_CREATE_DATE, SortBy.DESCENDING,
                     0, //paginationStart,
                     true, // dataRelatedToMe
-                    SearchConstants.NUM_SOLR_DOCS_TO_RETRIEVE //10 // SearchFields.NUM_SOLR_DOCS_TO_RETRIEVE
+                    SearchConstants.NUM_SOLR_DOCS_TO_RETRIEVE, //10 // SearchFields.NUM_SOLR_DOCS_TO_RETRIEVE
+                    true, 
+                    null,
+                    null,
+                    false, // no need to request facets here ...
+                    false, // ... same for highlights
+                    false  // ... same for collections
             );
         } catch (SearchException ex) {
             logger.severe("Search for total counts failed with filter query");
@@ -255,81 +260,59 @@ private String getJSONErrorString(String jsonMsg, String optionalLoggerMsg){
         return jsonData.build().toString();
         
     }
-    
 
-    /**
-     * @todo This should support the "X-Dataverse-key" header like the other
-     * APIs.
-     */
-    @Path(retrieveDataPartialAPIPath)
+
     @GET
+    @AuthRequired
+    @Path(retrieveDataPartialAPIPath)
     @Produces({"application/json"})
-    public String retrieveMyDataAsJsonString(@QueryParam("dvobject_types") List<String> dvobject_types, 
+    public String retrieveMyDataAsJsonString(
+            @Context ContainerRequestContext crc,
+            @QueryParam("dvobject_types") List<DvObject.DType> dvobject_types,
             @QueryParam("published_states") List<String> published_states, 
             @QueryParam("selected_page") Integer selectedPage, 
             @QueryParam("mydata_search_term") String searchTerm,             
             @QueryParam("role_ids") List<Long> roleIds, 
             @QueryParam("userIdentifier") String userIdentifier,
-            @QueryParam("key") String apiToken) { //String myDataParams) {
-        //System.out.println("_YE_OLDE_QUERY_COUNTER_");
-        //msgt("_YE_OLDE_QUERY_COUNTER_");  // for debug purposes
-        boolean DEBUG_MODE = false;
+            @QueryParam("filter_validities") Boolean filterValidities,
+            @QueryParam("dataset_valid") List<Boolean> datasetValidities) {
         boolean OTHER_USER = false;
 
+        String noMsgResultsFound = BundleUtil.getStringFromBundle("dataretrieverAPI.noMsgResultsFound");
 
-        
-        // For, superusers, the searchUser may differ from the authUser
-        //
-        AuthenticatedUser searchUser = null;  
-
-        if (DEBUG_MODE==true){      // DEBUG: use userIdentifier
-            authUser = getUserFromIdentifier(userIdentifier);
-            if (authUser == null){
-                return this.getJSONErrorString("Requires authentication", "retrieveMyDataAsJsonString. User not found!  Shouldn't be using this anyway");              
+        if ((session.getUser() != null) && (session.getUser().isAuthenticated())) {
+            authUser = (AuthenticatedUser) session.getUser();
+        } else {
+            try {
+                authUser = getRequestAuthenticatedUserOrDie(crc);
+            } catch (WrappedResponse e) {
+                return this.getJSONErrorString(
+                    BundleUtil.getStringFromBundle("dataretrieverAPI.authentication.required"),
+                    BundleUtil.getStringFromBundle("dataretrieverAPI.authentication.required.opt")
+                );
             }
-        } else if ((session.getUser() != null)&&(session.getUser().isAuthenticated())){            
-             authUser = (AuthenticatedUser)session.getUser();
-       
-             // If person is a superuser, see if a userIdentifier has been specified 
-             // and use that instead
-             if ((authUser.isSuperuser())&&(userIdentifier != null)&&(!userIdentifier.isEmpty())){
-                 searchUser = getUserFromIdentifier(userIdentifier);
-                 if (searchUser != null){
-                     authUser = searchUser;
-                     OTHER_USER = true;
-                 }else{
-                    return this.getJSONErrorString("No user found for: \"" + userIdentifier + "\"", null);              
-                 }
-             }       
-        } else if (apiToken != null) {      // Is this being accessed by an API Token?
-            
-            authUser = findUserByApiToken(apiToken);
-            if (authUser == null){
-                return this.getJSONErrorString("Requires authentication.  Please login.", "retrieveMyDataAsJsonString. User not found!  Shouldn't be using this anyway");              
-            }else{
-                // If person is a superuser, see if a userIdentifier has been specified 
-                // and use that instead
-                if ((authUser.isSuperuser())&&(userIdentifier != null)&&(!userIdentifier.isEmpty())){
-                    searchUser = getUserFromIdentifier(userIdentifier);
-                    if (searchUser != null){
-                        authUser = searchUser;
-                        OTHER_USER = true;
-                    }else{
-                        return this.getJSONErrorString("No user found for: \"" + userIdentifier + "\"", null);              
-                    }
-                }       
+        }
 
+        // For superusers, the searchUser may differ from the authUser
+        AuthenticatedUser searchUser = null;
+        // If the user is a superuser, see if a userIdentifier has been specified and use that instead
+        if ((authUser.isSuperuser()) && (userIdentifier != null) && (!userIdentifier.isEmpty())) {
+            searchUser = getUserFromIdentifier(userIdentifier);
+            if (searchUser != null) {
+                authUser = searchUser;
+                OTHER_USER = true;
+            } else {
+                return this.getJSONErrorString(
+                        BundleUtil.getStringFromBundle("dataretrieverAPI.user.not.found", Arrays.asList(userIdentifier)),
+                        null);
             }
-                    
-        } else{
-            return this.getJSONErrorString("Requires authentication.  Please login.", "retrieveMyDataAsJsonString. User not found!  Shouldn't be using this anyway");              
         }
-                     
+
         roleList = dataverseRoleService.findAll();
         rolePermissionHelper = new DataverseRolePermissionHelper(roleList);    
         
        
-        List<String> dtypes;
+        List<DvObject.DType> dtypes;
         if (dvobject_types != null){
             dtypes = dvobject_types;
         }else{
@@ -339,6 +322,10 @@ public String retrieveMyDataAsJsonString(@QueryParam("dvobject_types") List<Stri
         if (published_states != null){
             pub_states = published_states;
         }
+        List<Boolean> validities = null;
+        if (filterValidities != null && filterValidities){
+            validities = datasetValidities;
+        }
         
         // ---------------------------------
         // (1) Initialize filterParams and check for Errors 
@@ -346,7 +333,7 @@ public String retrieveMyDataAsJsonString(@QueryParam("dvobject_types") List<Stri
         DataverseRequest dataverseRequest = createDataverseRequest(authUser);
 
         
-        MyDataFilterParams filterParams = new MyDataFilterParams(dataverseRequest, dtypes, pub_states, roleIds, searchTerm);
+        MyDataFilterParams filterParams = new MyDataFilterParams(dataverseRequest, dtypes, pub_states, roleIds, searchTerm, validities);
         if (filterParams.hasError()){
             return this.getJSONErrorString(filterParams.getErrorMessage(), filterParams.getErrorMessage());
         }
@@ -384,14 +371,14 @@ public String retrieveMyDataAsJsonString(@QueryParam("dvobject_types") List<Stri
         List<String> filterQueries = this.myDataFinder.getSolrFilterQueries();
         if (filterQueries==null){
             logger.fine("No ids found for this search");
-            return this.getJSONErrorString(DataRetrieverAPI.MSG_NO_RESULTS_FOUND, null);
+            return this.getJSONErrorString(noMsgResultsFound, null);
         }
         //msgt("myDataFinder.getSolrFilterQueries(): " + myDataFinder.getSolrFilterQueries().toString());
         
         //msg("Selected paginationStart: " + paginationStart);
 
         try {
-                solrQueryResponse = searchService.search(
+                solrQueryResponse = searchService.getDefaultSearchService().search(
                         dataverseRequest,
                         null, // subtree, default it to Dataverse for now
                         filterParams.getSearchTerm(),  //"*", //
@@ -407,16 +394,19 @@ public String retrieveMyDataAsJsonString(@QueryParam("dvobject_types") List<Stri
                 //msgt("getNumResultsFound: " + this.solrQueryResponse.getNumResultsFound());
                 //msgt("getSolrSearchResults: " + this.solrQueryResponse.getSolrSearchResults().toString());
                 if (this.solrQueryResponse.getNumResultsFound()==0){
-                    return this.getJSONErrorString(DataRetrieverAPI.MSG_NO_RESULTS_FOUND, null);
+                    return this.getJSONErrorString(noMsgResultsFound, null);
                 }                
                          
         } catch (SearchException ex) {
             solrQueryResponse = null;   
-            this.logger.severe("Solr SearchException: " + ex.getMessage());
+            logger.severe("Solr SearchException: " + ex.getMessage());
         }
         
-        if (solrQueryResponse==null){
-            return this.getJSONErrorString("Sorry!  There was an error with the search service.", "Sorry!  There was a SOLR Error");
+        if (solrQueryResponse == null) {
+            return this.getJSONErrorString(
+                BundleUtil.getStringFromBundle("dataretrieverAPI.solr.error"),
+                BundleUtil.getStringFromBundle("dataretrieverAPI.solr.error.opt")
+            );
         }
                 
          // ---------------------------------
@@ -460,7 +450,7 @@ public String retrieveMyDataAsJsonString(@QueryParam("dvobject_types") List<Stri
         //jsonData.add("total_dvobject_counts", getTotalCountsFromSolrAsJSON(searchUser, this.myDataFinder));
 
         
-        if (OTHER_USER==true){
+        if (OTHER_USER){
             jsonData.add("other_user", searchUser.getIdentifier());
         }
                                 
@@ -510,9 +500,10 @@ private JsonArrayBuilder formatSolrDocs(SolrQueryResponse solrResponse, RoleTagR
             // -------------------------------------------
             // (a) Get core card data from solr
             // -------------------------------------------
-            myDataCardInfo = doc.getJsonForMyData();
             
-            if (!doc.getEntity().isInstanceofDataFile()){
+            myDataCardInfo = doc.getJsonForMyData(isValid(doc));
+            
+            if (doc.getEntity() != null && !doc.getEntity().isInstanceofDataFile()){
                 String parentAlias = dataverseService.getParentAliasString(doc);
                 myDataCardInfo.add("parent_alias",parentAlias);
             }
@@ -533,4 +524,8 @@ private JsonArrayBuilder formatSolrDocs(SolrQueryResponse solrResponse, RoleTagR
         return jsonSolrDocsArrayBuilder;
         
     }
+
+    private boolean isValid(SolrSearchResult result) {
+        return result.isValid(x -> true);
+    }
 }        
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFilterParams.java b/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFilterParams.java
index b10a37aff5d..2acb93d37f5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFilterParams.java
+++ b/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFilterParams.java
@@ -6,26 +6,22 @@
 package edu.harvard.iq.dataverse.mydata;
 
 import edu.harvard.iq.dataverse.DvObject;
-import static edu.harvard.iq.dataverse.DvObject.DATASET_DTYPE_STRING;
-import static edu.harvard.iq.dataverse.DvObject.DATAVERSE_DTYPE_STRING;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.authorization.DataverseRolePermissionHelper;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.search.SearchConstants;
 import edu.harvard.iq.dataverse.search.SearchFields;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import org.apache.commons.lang.StringUtils;
-import org.primefaces.json.JSONException;
-import org.primefaces.json.JSONObject;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -38,8 +34,8 @@ public class MyDataFilterParams {
     // -----------------------------------
     // Static Reference objects
     // -----------------------------------
-    public static final List<String> defaultDvObjectTypes = Arrays.asList(DvObject.DATAVERSE_DTYPE_STRING, DvObject.DATASET_DTYPE_STRING);
-    public static final List<String> allDvObjectTypes = Arrays.asList(DvObject.DATAVERSE_DTYPE_STRING, DvObject.DATASET_DTYPE_STRING, DvObject.DATAFILE_DTYPE_STRING);
+    public static final List<DvObject.DType> defaultDvObjectTypes = Arrays.asList(DvObject.DType.Dataverse, DvObject.DType.Dataset);
+    public static final List<DvObject.DType> allDvObjectTypes = Arrays.asList(DvObject.DType.Dataverse, DvObject.DType.Dataset, DvObject.DType.Dataverse, DvObject.DType.DataFile);
     
     public static final List<String> defaultPublishedStates = Arrays.asList(IndexServiceBean.getPUBLISHED_STRING(),
                                                     IndexServiceBean.getUNPUBLISHED_STRING(),
@@ -53,22 +49,23 @@ public class MyDataFilterParams {
                                                     IndexServiceBean.getIN_REVIEW_STRING(),
                                                     IndexServiceBean.getDEACCESSIONED_STRING());*/
             
-    public static final HashMap<String, String> sqlToSolrSearchMap ;
+    public static final HashMap<DvObject.DType, String> sqlToSolrSearchMap ;
     static
     {
         sqlToSolrSearchMap = new HashMap<>();
-        sqlToSolrSearchMap.put(DvObject.DATAVERSE_DTYPE_STRING, SearchConstants.DATAVERSES);
-        sqlToSolrSearchMap.put(DvObject.DATASET_DTYPE_STRING, SearchConstants.DATASETS);
-        sqlToSolrSearchMap.put(DvObject.DATAFILE_DTYPE_STRING, SearchConstants.FILES);
+        sqlToSolrSearchMap.put(DvObject.DType.Dataverse, SearchConstants.DATAVERSES);
+        sqlToSolrSearchMap.put(DvObject.DType.Dataset, SearchConstants.DATASETS);
+        sqlToSolrSearchMap.put(DvObject.DType.DataFile, SearchConstants.FILES);
     }
     
-    public static final HashMap<String, String> userInterfaceToSqlSearchMap ;
+    public static final HashMap<DvObject.DType, String> userInterfaceToSqlSearchMap ;
     static
     {
         userInterfaceToSqlSearchMap = new HashMap<>();
-        userInterfaceToSqlSearchMap.put(DvObject.DATAVERSE_DTYPE_STRING, SearchConstants.UI_DATAVERSES);
-        userInterfaceToSqlSearchMap.put(DvObject.DATASET_DTYPE_STRING, SearchConstants.UI_DATAVERSES);
-        userInterfaceToSqlSearchMap.put(DvObject.DATAFILE_DTYPE_STRING, SearchConstants.UI_FILES);
+        
+        userInterfaceToSqlSearchMap.put(DvObject.DType.Dataverse, SearchConstants.UI_DATAVERSES);
+        userInterfaceToSqlSearchMap.put(DvObject.DType.Dataset, SearchConstants.UI_DATAVERSES);
+        userInterfaceToSqlSearchMap.put(DvObject.DType.DataFile, SearchConstants.UI_FILES);
     }
     
     
@@ -78,9 +75,10 @@ public class MyDataFilterParams {
     private DataverseRequest dataverseRequest;
     private AuthenticatedUser authenticatedUser;
     private String userIdentifier;
-    private List<String> dvObjectTypes;    
+    private List<DvObject.DType> dvObjectTypes;
     private List<String> publicationStatuses;
     private List<Long> roleIds;
+    private List<Boolean> datasetValidities;
     
     //private ArrayList<DataverseRole> roles;
     public static final String defaultSearchTerm = "*:*";
@@ -114,6 +112,7 @@ public MyDataFilterParams(DataverseRequest dataverseRequest, DataverseRolePermis
         }
         this.dvObjectTypes = MyDataFilterParams.allDvObjectTypes;
         this.publicationStatuses = MyDataFilterParams.allPublishedStates;
+        this.datasetValidities = null;
         this.searchTerm = MyDataFilterParams.defaultSearchTerm;
         this.roleIds = roleHelper.getRoleIdList();
     }
@@ -123,8 +122,9 @@ public MyDataFilterParams(DataverseRequest dataverseRequest, DataverseRolePermis
      * @param dvObjectTypes
      * @param publicationStatuses 
      * @param searchTerm 
-     */    
-    public MyDataFilterParams(DataverseRequest dataverseRequest, List<String> dvObjectTypes, List<String> publicationStatuses, List<Long> roleIds, String searchTerm){
+     * @param datasetValidities
+     */
+    public MyDataFilterParams(DataverseRequest dataverseRequest, List<DvObject.DType> dvObjectTypes, List<String> publicationStatuses, List<Long> roleIds, String searchTerm, List<Boolean> datasetValidities) {
         if (dataverseRequest==null){
             throw new NullPointerException("MyDataFilterParams constructor: dataverseRequest cannot be null ");
         }
@@ -143,6 +143,8 @@ public MyDataFilterParams(DataverseRequest dataverseRequest, List<String> dvObje
         }else{
             this.publicationStatuses = publicationStatuses;
         }
+
+        this.datasetValidities = datasetValidities;
         
         // Do something here if none chosen!
         this.roleIds = roleIds;
@@ -177,38 +179,30 @@ public List<Long> getRoleIds(){
     }
     
     
-    
-    private void checkParams(){
-        
-        if ((this.userIdentifier == null)||(this.userIdentifier.isEmpty())){
-            this.addError("Sorry!  No user was found!");
+    private void checkParams() {
+        if ((this.userIdentifier == null) || (this.userIdentifier.isEmpty())) {
+            this.addError(BundleUtil.getStringFromBundle("myDataFilterParams.error.no.user"));
             return;
         }
 
-        if ((this.roleIds == null)||(this.roleIds.isEmpty())){
-            this.addError("No results. Please select at least one Role.");
+        if ((this.roleIds == null) || (this.roleIds.isEmpty())) {
+            this.addError(BundleUtil.getStringFromBundle("myDataFilterParams.error.result.no.role"));
             return;
         }
 
-        if ((this.dvObjectTypes == null)||(this.dvObjectTypes.isEmpty())){
-            this.addError("No results. Please select one of Dataverses, Datasets, Files.");
+        if ((this.dvObjectTypes == null) || (this.dvObjectTypes.isEmpty())) {
+            this.addError(BundleUtil.getStringFromBundle("myDataFilterParams.error.result.no.dvobject"));
             return;
         }
-        
-        if ((this.publicationStatuses == null)||(this.publicationStatuses.isEmpty())){
-            this.addError("No results. Please select one of " + StringUtils.join(MyDataFilterParams.defaultPublishedStates, ", ") + ".");
+
+        if ((this.publicationStatuses == null) || (this.publicationStatuses.isEmpty())) {
+            this.addError(BundleUtil.getStringFromBundle("dataretrieverAPI.user.not.found",
+                    Arrays.asList(StringUtils.join(MyDataFilterParams.defaultPublishedStates, ", "))));
             return;
         }
-
-        for (String dtype : this.dvObjectTypes){
-            if (!DvObject.DTYPE_LIST.contains(dtype)){
-                this.addError("Sorry!  The type '" + dtype + "' is not known.");
-                return;
-            }               
-        }        
     }
     
-    public List<String> getDvObjectTypes(){
+    public List<DvObject.DType> getDvObjectTypes(){
         return this.dvObjectTypes;
     }
     
@@ -240,19 +234,19 @@ public void addError(String s){
     // start: Convenience methods for dvObjectTypes
     // --------------------------------------------
     public boolean areDataversesIncluded(){
-        if (this.dvObjectTypes.contains(DvObject.DATAVERSE_DTYPE_STRING)){
+        if (this.dvObjectTypes.contains(DvObject.DType.Dataverse)){
             return true;
         }
         return false;
     }
     public boolean areDatasetsIncluded(){
-        if (this.dvObjectTypes.contains(DvObject.DATASET_DTYPE_STRING)){
+        if (this.dvObjectTypes.contains(DvObject.DType.Dataset)){
             return true;
         }
         return false;
     }
     public boolean areFilesIncluded(){
-        if (this.dvObjectTypes.contains(DvObject.DATAFILE_DTYPE_STRING)){
+        if (this.dvObjectTypes.contains(DvObject.DType.DataFile)){
             return true;
         }
         return false;
@@ -264,7 +258,7 @@ public String getSolrFragmentForDvObjectType(){
         }
         
         List<String> solrTypes = new ArrayList<>();
-        for (String dtype : this.dvObjectTypes){
+        for (DvObject.DType dtype : this.dvObjectTypes){
             solrTypes.add(MyDataFilterParams.sqlToSolrSearchMap.get(dtype));
         }
                 
@@ -297,6 +291,20 @@ public String getSolrFragmentForPublicationStatus(){
         return  "(" + SearchFields.PUBLICATION_STATUS + ":" + valStr + ")";
     }
 
+    public String getSolrFragmentForDatasetValidity(){
+        if ((this.datasetValidities == null) || (this.datasetValidities.isEmpty()) || (this.datasetValidities.size() > 1)){
+            return "";
+        }
+    
+        
+        String valStr = StringUtils.join(datasetValidities, " OR ");
+        if (this.datasetValidities.size() > 1){
+            valStr = "(" + valStr + ")";
+        }
+
+        return  "(" + SearchFields.DATASET_VALID + ":" + valStr + ")";
+    }
+
     public String getDvObjectTypesAsJSONString(){
         
         return this.getDvObjectTypesAsJSON().build().toString();
@@ -317,19 +325,38 @@ public JsonArrayBuilder getListofSelectedPublicationStatuses(){
         return jsonArray;
                 
     }
+
+        
+    /**
+     * "dataset_valid" : [ true, false ]
+     *
+     * @return
+     */
+    public JsonArrayBuilder getListofSelectedValidities(){
+        if (this.datasetValidities == null || this.datasetValidities.isEmpty()) {
+            return null;
+        }
+
+        JsonArrayBuilder jsonArray = Json.createArrayBuilder();
+
+        for (Boolean valid : this.datasetValidities){
+            jsonArray.add(valid);
+        }
+        return jsonArray;
+    }
     
     
     public JsonObjectBuilder getDvObjectTypesAsJSON(){
         
         JsonArrayBuilder jsonArray = Json.createArrayBuilder();
 
-        jsonArray.add(Json.createObjectBuilder().add("value", DvObject.DATAVERSE_DTYPE_STRING)
+        jsonArray.add(Json.createObjectBuilder().add("value", DvObject.DType.Dataverse.getDType())
                             .add("label", SearchConstants.UI_DATAVERSES)
                             .add("selected", this.areDataversesIncluded()))
-                .add(Json.createObjectBuilder().add("value", DvObject.DATASET_DTYPE_STRING)
+                .add(Json.createObjectBuilder().add("value", DvObject.DType.Dataset.getDType())
                             .add("label", SearchConstants.UI_DATASETS)
                             .add("selected", this.areDatasetsIncluded()))
-                .add(Json.createObjectBuilder().add("value", DvObject.DATAFILE_DTYPE_STRING)
+                .add(Json.createObjectBuilder().add("value", DvObject.DType.DataFile.getDType())
                             .add("label", SearchConstants.UI_FILES)
                             .add("selected", this.areFilesIncluded())
                 );
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFinder.java b/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFinder.java
index c9faf797d57..091fbde484e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFinder.java
+++ b/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFinder.java
@@ -11,17 +11,19 @@
 import edu.harvard.iq.dataverse.authorization.DataverseRolePermissionHelper;
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.search.SearchFields;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import org.apache.commons.lang.StringUtils;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Given a user and a set of filters (dvobject type, roles, publication status):
@@ -211,7 +213,7 @@ private List<String> getSolrFilterQueries(boolean totalCountsOnly){
         // -----------------------------------------------------------------
         String dvObjectFQ = this.getSolrDvObjectFilterQuery();
         if (dvObjectFQ ==null){
-            this.addErrorMessage(DataRetrieverAPI.MSG_NO_RESULTS_FOUND);
+            this.addErrorMessage(BundleUtil.getStringFromBundle("myDataFinder.error.result.empty"));
             return null;
         }
         filterQueries.add(dvObjectFQ);
@@ -236,6 +238,12 @@ private List<String> getSolrFilterQueries(boolean totalCountsOnly){
         filterQueries.add(this.filterParams.getSolrFragmentForPublicationStatus());
         //fq=publicationStatus:"Unpublished"&fq=publicationStatus:"Draft"
 
+        // -----------------------------------------------------------------
+        // (4) FQ by dataset metadata validity
+        // -----------------------------------------------------------------
+        filterQueries.add(this.filterParams.getSolrFragmentForDatasetValidity());
+        //fq=datasetValid:(true OR false)
+
         return filterQueries;
     }
 
@@ -278,7 +286,7 @@ public String getSolrDvObjectFilterQuery(){
 
 
         if ((distinctEntityIds.isEmpty()) && (distinctParentIds.isEmpty())) {
-            this.addErrorMessage(DataRetrieverAPI.MSG_NO_RESULTS_FOUND);
+            this.addErrorMessage(BundleUtil.getStringFromBundle("myDataFinder.error.result.empty"));
             return null;
         }
 
@@ -390,12 +398,17 @@ public String formatUserIdentifierAsAssigneeIdentifier(String userIdentifier){
      *
      * @return
      */
-    public JsonObjectBuilder getSelectedFilterParamsAsJSON(){
+    public JsonObjectBuilder getSelectedFilterParamsAsJSON() {
 
         JsonObjectBuilder jsonData = Json.createObjectBuilder();
         jsonData.add("publication_statuses", this.filterParams.getListofSelectedPublicationStatuses())
                 .add("role_names", this.getListofSelectedRoles());
 
+        JsonArrayBuilder selVal = this.filterParams.getListofSelectedValidities();
+        if (selVal != null) {
+            jsonData.add("dataset_valid", selVal);
+        }
+
         return jsonData;
     }
 
@@ -417,26 +430,14 @@ public JsonArrayBuilder getListofSelectedRoles(){
     }
 
 
-    private boolean runStep1RoleAssignments(){
+    private boolean runStep1RoleAssignments() {
 
         List<Object[]> results = this.roleAssigneeService.getAssigneeAndRoleIdListFor(filterParams);
 
         //logger.info("runStep1RoleAssignments results: " + results.toString());
 
-        if (results == null){
-            this.addErrorMessage("Sorry, the EntityManager isn't working (still).");
-            return false;
-        }else if (results.isEmpty()){
-            List<String> roleNames = this.rolePermissionHelper.getRoleNamesByIdList(this.filterParams.getRoleIds());
-            if ((roleNames == null)||(roleNames.isEmpty())){
-                this.addErrorMessage("Sorry, you have no assigned roles.");
-            }else{
-                if (roleNames.size()==1){
-                    this.addErrorMessage("Sorry, nothing was found for this role: " + StringUtils.join(roleNames, ", "));
-                }else{
-                    this.addErrorMessage("Sorry, nothing was found for these roles: " + StringUtils.join(roleNames, ", "));
-                }
-            }
+        if (results == null) {
+            this.addErrorMessage(BundleUtil.getStringFromBundle("myDataFinder.error.result.null"));
             return false;
         }
 
@@ -471,6 +472,21 @@ private boolean runStep1RoleAssignments(){
             }
             directDvObjectIds.add(dvId);
         }
+
+        if (directDvObjectIds.isEmpty()) {
+            List<String> roleNames = this.rolePermissionHelper.getRoleNamesByIdList(this.filterParams.getRoleIds());
+            if ((roleNames == null) || (roleNames.isEmpty())) {
+                this.addErrorMessage(BundleUtil.getStringFromBundle("myDataFinder.error.result.no.role"));
+            } else {
+                final List<String> args = Arrays.asList(StringUtils.join(roleNames, ", "));
+                if (roleNames.size() == 1) {
+                    this.addErrorMessage(BundleUtil.getStringFromBundle("myDataFinder.error.result.role.empty", args));
+                } else {
+                    this.addErrorMessage(BundleUtil.getStringFromBundle("myDataFinder.error.result.roles.empty", args));
+                }
+            }
+            return false;
+        }
         return true;
     }
 
@@ -484,7 +500,7 @@ private boolean runStep2DirectAssignments(){
         List<Object[]> results = this.dvObjectServiceBean.getDvObjectInfoForMyData(directDvObjectIds);
 //List<RoleAssignment> results = this.roleAssigneeService.getAssignmentsFor(this.userIdentifier);
         if (results.isEmpty()){
-            this.addErrorMessage("Sorry, you have no assigned Dataverses, Datasets, or Files.");
+            this.addErrorMessage(BundleUtil.getStringFromBundle("myDataFinder.error.result.no.dvobject"));
             return false;
         }
 
@@ -514,8 +530,8 @@ private boolean runStep2DirectAssignments(){
 
             this.childToParentIds.put(dvId, parentId);
 
-            switch(dtype){
-                case(DvObject.DATAVERSE_DTYPE_STRING):
+            switch(DvObject.DType.valueOf(dtype)){
+                case Dataverse:
                     //if (this.idsWithDataversePermissions.containsKey(dvId)){
                     this.directDataverseIds.add(dvId);  // Direct dataverse (no indirect dataverses)
                     //}
@@ -530,7 +546,7 @@ private boolean runStep2DirectAssignments(){
                         this.datasetParentIds.add(dvId);    // Parent to dataset
                     }
                     break;
-                case(DvObject.DATASET_DTYPE_STRING):
+                case Dataset:
                     //if (this.idsWithDatasetPermissions.containsKey(dvId)){
                     this.directDatasetIds.add(dvId); // Direct dataset
                     //}
@@ -538,7 +554,7 @@ private boolean runStep2DirectAssignments(){
                         this.fileParentIds.add(dvId);   // Parent to file
                     }
                     break;
-                case(DvObject.DATAFILE_DTYPE_STRING):
+                case DataFile:
                     if (this.idsWithFilePermissions.containsKey(dvId)){
                         this.directFileIds.add(dvId); // Direct file
                     }
@@ -583,7 +599,7 @@ private boolean runStep3FilePermsAssignedAtDataverse(){
             this.childToParentIds.put(dvId, parentId);
 
             // Should ALWAYS be a Dataset!
-            if (dtype.equals(DvObject.DATASET_DTYPE_STRING)){
+            if (DvObject.DType.valueOf(dtype).equals(DvObject.DType.Dataset)){
                 this.fileParentIds.add(dvId);
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataPage.java b/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataPage.java
index 03acc0ccddc..d095c03389c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataPage.java
@@ -1,32 +1,29 @@
 package edu.harvard.iq.dataverse.mydata;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import edu.harvard.iq.dataverse.DatasetPage;
 import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
 import edu.harvard.iq.dataverse.DataverseSession;
-import edu.harvard.iq.dataverse.DvObject;
-import static edu.harvard.iq.dataverse.DvObject.DATAFILE_DTYPE_STRING;
-import static edu.harvard.iq.dataverse.DvObject.DATASET_DTYPE_STRING;
-import static edu.harvard.iq.dataverse.DvObject.DATAVERSE_DTYPE_STRING;
 import edu.harvard.iq.dataverse.DvObjectServiceBean;
 import edu.harvard.iq.dataverse.PermissionsWrapper;
 import edu.harvard.iq.dataverse.RoleAssigneeServiceBean;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
-import edu.harvard.iq.dataverse.search.SolrQueryResponse;
+import edu.harvard.iq.dataverse.SettingsWrapper;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.DataverseRolePermissionHelper;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.ejb.EJB;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
 
 /*
  * To change this license header, choose License Headers in Project Properties.
@@ -45,6 +42,7 @@ public class MyDataPage implements java.io.Serializable {
     private static final Logger logger = Logger.getLogger(DatasetPage.class.getCanonicalName());
 
     @Inject DataverseSession session;    
+    @Inject SettingsWrapper settingsWrapper;
 
     @EJB
     DataverseRoleServiceBean dataverseRoleService;
@@ -52,10 +50,6 @@ public class MyDataPage implements java.io.Serializable {
     RoleAssigneeServiceBean roleAssigneeService;
     @EJB
     DvObjectServiceBean dvObjectServiceBean;
-    @EJB
-    SearchServiceBean searchService;
-//    @EJB
-//    MyDataQueryHelperServiceBean myDataQueryHelperServiceBean;
     @Inject
     PermissionsWrapper permissionsWrapper;
     
@@ -113,6 +107,17 @@ public List<String[]> getRoleInfoForCheckboxes(){
             return new ArrayList<>();
         }
     }
+    
+    public List<String[]> getValidityInfoForCheckboxes(){
+        return Arrays.asList(
+            new String[] {"true", "valid", BundleUtil.getStringFromBundle("valid")},
+            new String[] {"false", "incomplete", BundleUtil.getStringFromBundle("incomplete")}
+        );
+    }
+
+    public boolean showValidityFilter() {
+        return JvmSettings.UI_SHOW_VALIDITY_FILTER.lookupOptional(Boolean.class).orElse(false);
+    }
            
     public String getRetrieveDataFullAPIPath(){
         return DataRetrieverAPI.retrieveDataFullAPIPath;
@@ -167,7 +172,7 @@ public String init() {
         HttpServletRequest httpServletRequest = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
 
         DataverseRequest dataverseRequest = new DataverseRequest(authUser, httpServletRequest);
-        this.filterParams = new MyDataFilterParams(dataverseRequest,  MyDataFilterParams.defaultDvObjectTypes, null, null, null);
+        this.filterParams = new MyDataFilterParams(dataverseRequest,  MyDataFilterParams.defaultDvObjectTypes, null, null, null, null);
         
         
         // Temp DataverseRolePermissionHelper -- not in its normal role but for creating initial checkboxes
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/Pager.java b/src/main/java/edu/harvard/iq/dataverse/mydata/Pager.java
index 4bf13e04284..096974b9d72 100644
--- a/src/main/java/edu/harvard/iq/dataverse/mydata/Pager.java
+++ b/src/main/java/edu/harvard/iq/dataverse/mydata/Pager.java
@@ -15,9 +15,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/RolePermissionHelperPage.java b/src/main/java/edu/harvard/iq/dataverse/mydata/RolePermissionHelperPage.java
index 06841c470d8..dcb76f42acb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/mydata/RolePermissionHelperPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/mydata/RolePermissionHelperPage.java
@@ -8,10 +8,10 @@
 import edu.harvard.iq.dataverse.authorization.DataverseRolePermissionHelper;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 /*
  * To change this license header, choose License Headers in Project Properties.
@@ -46,13 +46,6 @@ public String init() {
         List<DataverseRole> roleList = dataverseRoleService.findAll();
         rolePermissionHelper = new DataverseRolePermissionHelper(roleList);
 
-        
-        List<String> dtypes = MyDataFilterParams.defaultDvObjectTypes;
-        //List<String> dtypes = Arrays.asList(DvObject.DATAFILE_DTYPE_STRING, DvObject.DATASET_DTYPE_STRING);
-        //DvObject.DATAFILE_DTYPE_STRING, DvObject.DATASET_DTYPE_STRING, DvObject.DATAVERSE_DTYPE_STRING
-        
-        //List<String> dtypes = new ArrayList<>();
-        
         return null;
     }
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/RoleTagRetriever.java b/src/main/java/edu/harvard/iq/dataverse/mydata/RoleTagRetriever.java
index 9f03f8addb1..e328a50e962 100644
--- a/src/main/java/edu/harvard/iq/dataverse/mydata/RoleTagRetriever.java
+++ b/src/main/java/edu/harvard/iq/dataverse/mydata/RoleTagRetriever.java
@@ -23,9 +23,8 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import org.apache.commons.lang.StringUtils;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
 
 /**
  * Input:  dvObject id, parent Id, and dvObject type (from Solr)
@@ -346,7 +345,7 @@ private void findDataverseIdsForFiles(){
                        
             //msg("result: dvId: " + dvId + " |dtype: " + dtype + " |parentId: " + parentId);
             // Should ALWAYS be a Dataset!
-            if (dtype.equals(DvObject.DATASET_DTYPE_STRING)){  
+            if (DvObject.DType.valueOf(dtype).equals(DvObject.DType.Dataset)) {
                 this.childToParentIdHash.put(dvId, parentId); // Store the parent child relation
                 this.addIdNeedingRoleRetrieval(parentId); // We need the roles for this dataverse
                 this.idToDvObjectType.put(parentId, SearchConstants.SOLR_DATAVERSES); // store the dv object type
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/SolrQueryFormatter.java b/src/main/java/edu/harvard/iq/dataverse/mydata/SolrQueryFormatter.java
index 9aefbee240c..1c3fca1537b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/mydata/SolrQueryFormatter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/mydata/SolrQueryFormatter.java
@@ -12,7 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Convenience methods for formatting long arrays of ids into solrQuery strings
diff --git a/src/main/java/edu/harvard/iq/dataverse/openapi/OpenApi.java b/src/main/java/edu/harvard/iq/dataverse/openapi/OpenApi.java
new file mode 100644
index 00000000000..6bd54916e0d
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/openapi/OpenApi.java
@@ -0,0 +1,101 @@
+package edu.harvard.iq.dataverse.openapi;
+
+import java.io.*;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.logging.*;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
+import jakarta.ws.rs.core.*;
+import org.apache.commons.io.IOUtils;
+import edu.harvard.iq.dataverse.api.Info;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+@WebServlet("/openapi")
+public class OpenApi extends HttpServlet {
+
+    private static final Logger logger = Logger.getLogger(Info.class.getCanonicalName());
+
+    private static final String YAML_FORMAT = "yaml";
+    private static final String JSON_FORMAT = "json";
+
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        
+        
+        String format = req.getParameter("format");
+        String accept = req.getHeader("Accept");
+
+        /*
+         * We first check for the headers, if the request accepts application/json 
+         * have to check for the format parameter, if it is different from json 
+         * return BAD_REQUEST (400)
+         */
+        if (MediaType.APPLICATION_JSON.equals(accept)){
+            if (format != null && !JSON_FORMAT.equals(format)){
+                List<String> args = Arrays.asList(accept, format);
+                String bundleResponse = BundleUtil.getStringFromBundle("openapi.exception.unaligned", args);
+                resp.sendError(Response.Status.BAD_REQUEST.getStatusCode(),
+                                bundleResponse);
+                return;
+            } else {
+                format = JSON_FORMAT;
+            }
+        }
+
+        /*
+         * We currently support only JSON or YAML being the second the default
+         * if no format is specified, if a different format is specified we return 
+         * UNSUPPORTED_MEDIA_TYPE (415) specifying that the format is not supported
+         */
+
+        format = format == null ? YAML_FORMAT : format.toLowerCase();
+
+        if (JSON_FORMAT.equals(format)) {
+            resp.setContentType(MediaType.APPLICATION_JSON_TYPE.toString());
+        } else  if (YAML_FORMAT.equals(format)){
+            resp.setContentType(MediaType.TEXT_PLAIN_TYPE.toString());
+        } else {
+            
+            List<String> args = Arrays.asList(format);
+            String bundleResponse = BundleUtil.getStringFromBundle("openapi.exception.invalid.format", args);
+
+            JsonObject errorResponse = Json.createObjectBuilder()
+                .add("status", "ERROR")
+                .add("code", HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE)
+                .add("message", bundleResponse)
+                .build();
+
+            resp.setContentType(MediaType.APPLICATION_JSON_TYPE.toString());
+            resp.setStatus(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
+
+            PrintWriter responseWriter = resp.getWriter();
+            responseWriter.println(errorResponse.toString());
+            responseWriter.flush();
+            return;
+        }
+
+        try {
+            String baseFileName = "/META-INF/openapi." + format;
+            ClassLoader classLoader = this.getClass().getClassLoader();
+            URL aliasesResource = classLoader.getResource(baseFileName);
+            InputStream openapiDefinitionStream  = aliasesResource.openStream();
+            String content = IOUtils.toString(openapiDefinitionStream, StandardCharsets.UTF_8);
+            resp.getWriter().write(content);
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "OpenAPI Definition format not found " + format + ":" + e.getMessage(), e);
+            String bundleResponse = BundleUtil.getStringFromBundle("openapi.exception");
+            resp.sendError(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
+                            bundleResponse);
+        }
+
+        
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetData.java b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetData.java
index 78af2a31dc2..c078860ad8e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetData.java
+++ b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetData.java
@@ -6,19 +6,19 @@
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.UUID;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 @Table(indexes = {@Index(columnList="token")
 		, @Index(columnList="builtinuser_id")})
@@ -28,7 +28,9 @@
     @NamedQuery(name="PasswordResetData.findByUser",
             query="SELECT prd FROM PasswordResetData prd WHERE prd.builtinUser = :user"),
     @NamedQuery(name="PasswordResetData.findByToken",
-            query="SELECT prd FROM PasswordResetData prd WHERE prd.token = :token")
+            query="SELECT prd FROM PasswordResetData prd WHERE prd.token = :token"),
+    @NamedQuery(name="PasswordResetData.deleteByUser",
+            query="DELETE FROM PasswordResetData prd WHERE prd.builtinUser = :user"),
 })
 @Entity
 public class PasswordResetData implements Serializable {
diff --git a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
index 532c0216038..b19721d56bb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
@@ -3,7 +3,7 @@
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DataverseSession;
 import edu.harvard.iq.dataverse.SettingsWrapper;
-import edu.harvard.iq.dataverse.ValidateEmail;
+import edu.harvard.iq.dataverse.validation.ValidateEmail;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
@@ -16,20 +16,20 @@
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import org.apache.commons.lang.StringUtils;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.NotBlank;
 
 @ViewScoped
@@ -91,6 +91,8 @@ public class PasswordResetPage implements java.io.Serializable {
     String newPassword;
     
     PasswordResetData passwordResetData;
+
+    boolean validationFailed = true;
     
     private List<String> passwordErrors;
 
@@ -100,6 +102,10 @@ public void init() {
             passwordResetData = passwordResetExecResponse.getPasswordResetData();
             if (passwordResetData != null) {
                 user = passwordResetData.getBuiltinUser();
+                if (passwordResetData.getReason().equals(PasswordResetData.Reason.UPGRADE_REQUIRED)){
+                    newPassword = (String) FacesContext.getCurrentInstance().getExternalContext().getFlash().get("silentUpgradePasswd");
+                    validationFailed = false;
+                }
             } else {
                 FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, 
                         BundleUtil.getStringFromBundle("passwdVal.passwdReset.resetLinkTitle"),
@@ -121,13 +127,15 @@ public String sendPasswordResetLink() {
                 actionLogSvc.log( new ActionLogRecord(ActionLogRecord.ActionType.BuiltinUser, "passwordResetSent")
                             .setInfo("Email Address: " + emailAddress) );
             } else {
-                /**
-                 * @todo remove "single" when it's no longer necessary. See
-                 * https://github.com/IQSS/dataverse/issues/844 and
-                 * https://github.com/IQSS/dataverse/issues/1141
-                 */
-                logger.log(Level.INFO, "Couldn''t find single account using {0}", emailAddress);
+                logger.log(Level.INFO, "Cannot find account (or it's deactivated) given {0}", emailAddress);
             }
+            /**
+             * We show this "an email will be sent" message no matter what (if
+             * the account can be found or not, if the account has been
+             * deactivated or not) to prevent hackers from figuring out if you
+             * have an account based on your email address. Yes, this is a white
+             * lie sometimes, in the name of security.
+             */
             FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("passwdVal.passwdReset.resetInitiated"), 
                     BundleUtil.getStringFromBundle("passwdReset.successSubmit.tip", Arrays.asList(emailAddress))));
         } catch (PasswordResetException ex) {
@@ -141,12 +149,12 @@ public String sendPasswordResetLink() {
 
     public String resetPassword() {
         PasswordChangeAttemptResponse response = passwordResetService.attemptPasswordReset(user, newPassword, this.token);
+        validationFailed = response.getMessageDetail().contains("Password Reset Problem");
         if (response.isChanged()) {
             FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, response.getMessageSummary(), response.getMessageDetail()));
             String builtinAuthProviderId = BuiltinAuthenticationProvider.PROVIDER_ID;
             AuthenticatedUser au = authSvc.lookupUser(builtinAuthProviderId, user.getUserName());
             session.setUser(au);
-            session.configureSessionTimeout();
             return "/dataverse.xhtml?alias=" + dataverseService.findRootDataverse().getAlias() + "faces-redirect=true";
         } else {
             FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, response.getMessageSummary(), response.getMessageDetail()));
@@ -197,6 +205,10 @@ public void setToken(String token) {
         this.token = token;
     }
 
+    public boolean isFailedValidation(){
+        return validationFailed;
+    }
+
     public BuiltinUser getUser() {
         return user;
     }
@@ -233,14 +245,13 @@ public String getGoodPasswordDescription() {
         // FIXME: Pass the errors in.
         return passwordValidatorService.getGoodPasswordDescription(null);
     }
-    
+
     public String getCustomPasswordResetAlertMessage() {
         String customPasswordResetAlertMessage = settingsWrapper.getValueForKey(SettingsServiceBean.Key.PVCustomPasswordResetAlertMessage);
         if(customPasswordResetAlertMessage != null && !customPasswordResetAlertMessage.isEmpty()){
             return customPasswordResetAlertMessage;
         } else {
-            String defaultPasswordResetAlertMessage = BundleUtil.getStringFromBundle("passwdReset.newPasswd.details");
-            return defaultPasswordResetAlertMessage;
+            return BundleUtil.getStringFromBundle("passwdReset.newPasswd.details");
         }
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBean.java
index 507c31f5595..5d1c167d2a5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBean.java
@@ -10,18 +10,17 @@
 import edu.harvard.iq.dataverse.util.SystemConfig;
 
 import java.text.MessageFormat;
-import java.util.Date;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 
 @Stateless
@@ -52,13 +51,23 @@ public class PasswordResetServiceBean {
      * Initiate the password reset process.
      *
      * @param emailAddress
-     * @return {@link PasswordResetInitResponse}
+     * @return {@link PasswordResetInitResponse} with empty PasswordResetData if
+     * the reset won't continue (no user, deactivated user).
      * @throws edu.harvard.iq.dataverse.passwordreset.PasswordResetException
      */
     // inspired by Troy Hunt: Everything you ever wanted to know about building a secure password reset feature - http://www.troyhunt.com/2012/05/everything-you-ever-wanted-to-know.html
     public PasswordResetInitResponse requestReset(String emailAddress) throws PasswordResetException {
         deleteAllExpiredTokens();
         AuthenticatedUser authUser = authService.getAuthenticatedUserByEmail(emailAddress);        
+        // This null check is for the NPE reported in https://github.com/IQSS/dataverse/issues/5462
+        if (authUser == null) {
+            logger.info("Cannot find a user based on " + emailAddress + ". Cannot reset password.");
+            return new PasswordResetInitResponse(false);
+        }
+        if (authUser.isDeactivated()) {
+            logger.info("Cannot reset password for " + emailAddress + " because account is deactivated.");
+            return new PasswordResetInitResponse(false);
+        }
         BuiltinUser user = dataverseUserService.findByUserName(authUser.getUserIdentifier());
 
         if (user != null) {
@@ -186,6 +195,12 @@ private long deleteAllExpiredTokens() {
         return numDeleted;
     }
 
+    public void deleteResetDataByDataverseUser(BuiltinUser user) {
+        TypedQuery<PasswordResetData> typedQuery = em.createNamedQuery("PasswordResetData.deleteByUser", PasswordResetData.class);
+        typedQuery.setParameter("user", user);
+        int numRowsAffected = typedQuery.executeUpdate();
+    }
+
     public PasswordChangeAttemptResponse attemptPasswordReset(BuiltinUser user, String newPassword, String token) {
 
         final String messageSummarySuccess = "Password Reset Successfully";
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/AbstractPidProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/AbstractPidProvider.java
new file mode 100644
index 00000000000..d7da92f5dd7
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/AbstractPidProvider.java
@@ -0,0 +1,596 @@
+package edu.harvard.iq.dataverse.pidproviders;
+
+import edu.harvard.iq.dataverse.DataCitation;
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import com.beust.jcommander.Strings;
+
+public abstract class AbstractPidProvider implements PidProvider {
+
+    private static final Logger logger = Logger.getLogger(AbstractPidProvider.class.getCanonicalName());
+
+    public static String UNAVAILABLE = ":unav";
+    public static final String SEPARATOR = "/";
+
+    protected PidProviderFactoryBean pidProviderService;
+
+    private String protocol;
+
+    private String authority = null;
+
+    private String shoulder = null;
+
+    private String identifierGenerationStyle = null;
+
+    private String datafilePidFormat = null;
+
+    protected HashSet<String> managedSet = new HashSet<String>();
+
+    protected HashSet<String> excludedSet = new HashSet<String>();
+
+    private String id;
+    private String label;
+
+    protected AbstractPidProvider(String id, String label, String protocol) {
+        this.id = id;
+        this.label = label;
+        this.protocol = protocol;
+    }
+
+    protected AbstractPidProvider(String id, String label, String protocol, String authority, String shoulder,
+            String identifierGenerationStyle, String datafilePidFormat, String managedList, String excludedList) {
+        this.id = id;
+        this.label = label;
+        this.protocol = protocol;
+        this.authority = authority;
+        this.shoulder = shoulder;
+        this.identifierGenerationStyle = identifierGenerationStyle;
+        this.datafilePidFormat = datafilePidFormat;
+        if(!managedList.isEmpty()) {
+            this.managedSet.addAll(Arrays.asList(managedList.split(",\\s")));
+        }
+        if(!excludedList.isEmpty()) {
+            this.excludedSet.addAll(Arrays.asList(excludedList.split(",\\s")));
+        }
+        if (logger.isLoggable(Level.FINE)) {
+            Iterator<String> iter = managedSet.iterator();
+            while (iter.hasNext()) {
+                logger.fine("managedSet in " + getId() + ": " + iter.next());
+            }
+            iter = excludedSet.iterator();
+            while (iter.hasNext()) {
+                logger.fine("excludedSet in " + getId() + ": " + iter.next());
+            }
+        }
+    }
+
+    @Override
+    public Map<String, String> getMetadataForCreateIndicator(DvObject dvObjectIn) {
+        logger.log(Level.FINE, "getMetadataForCreateIndicator(DvObject)");
+        Map<String, String> metadata = new HashMap<>();
+        metadata = addBasicMetadata(dvObjectIn, metadata);
+        metadata.put("datacite.publicationyear", generateYear(dvObjectIn));
+        metadata.put("_target", getTargetUrl(dvObjectIn));
+        return metadata;
+    }
+
+    protected Map<String, String> getUpdateMetadata(DvObject dvObjectIn) {
+        logger.log(Level.FINE, "getUpdateMetadataFromDataset");
+        Map<String, String> metadata = new HashMap<>();
+        metadata = addBasicMetadata(dvObjectIn, metadata);
+        return metadata;
+    }
+
+    protected Map<String, String> addBasicMetadata(DvObject dvObjectIn, Map<String, String> metadata) {
+
+        String authorString = dvObjectIn.getAuthorString();
+        if (authorString.isEmpty() || authorString.contains(DatasetField.NA_VALUE)) {
+            authorString = UNAVAILABLE;
+        }
+
+        String producerString = pidProviderService.getProducer();
+
+        if (producerString.isEmpty() || producerString.equals(DatasetField.NA_VALUE)) {
+            producerString = UNAVAILABLE;
+        }
+
+        String titleString = dvObjectIn.getCurrentName();
+
+        if (titleString.isEmpty() || titleString.equals(DatasetField.NA_VALUE)) {
+            titleString = UNAVAILABLE;
+        }
+
+        metadata.put("datacite.creator", authorString);
+        metadata.put("datacite.title", titleString);
+        metadata.put("datacite.publisher", producerString);
+        metadata.put("datacite.publicationyear", generateYear(dvObjectIn));
+        return metadata;
+    }
+
+    protected Map<String, String> addDOIMetadataForDestroyedDataset(DvObject dvObjectIn) {
+        Map<String, String> metadata = new HashMap<>();
+        String authorString = UNAVAILABLE;
+        String producerString = UNAVAILABLE;
+        String titleString = "This item has been removed from publication";
+
+        metadata.put("datacite.creator", authorString);
+        metadata.put("datacite.title", titleString);
+        metadata.put("datacite.publisher", producerString);
+        metadata.put("datacite.publicationyear", "9999");
+        return metadata;
+    }
+
+    protected String getTargetUrl(DvObject dvObjectIn) {
+        logger.log(Level.FINE, "getTargetUrl");
+        return SystemConfig.getDataverseSiteUrlStatic() + dvObjectIn.getTargetUrl()
+                + dvObjectIn.getGlobalId().asString();
+    }
+
+    @Override
+    public String getIdentifier(DvObject dvObject) {
+        GlobalId gid = dvObject.getGlobalId();
+        return gid != null ? gid.asString() : null;
+    }
+
+    protected String generateYear(DvObject dvObjectIn) {
+        return dvObjectIn.getYearPublishedCreated();
+    }
+
+    public Map<String, String> getMetadataForTargetURL(DvObject dvObject) {
+        logger.log(Level.FINE, "getMetadataForTargetURL");
+        HashMap<String, String> metadata = new HashMap<>();
+        metadata.put("_target", getTargetUrl(dvObject));
+        return metadata;
+    }
+
+    @Override
+    public boolean alreadyRegistered(DvObject dvo) throws Exception {
+        if (dvo == null) {
+            logger.severe("Null DvObject sent to alreadyRegistered().");
+            return false;
+        }
+        GlobalId globalId = dvo.getGlobalId();
+        if (globalId == null) {
+            return false;
+        }
+        return alreadyRegistered(globalId, false);
+    }
+
+    public abstract boolean alreadyRegistered(GlobalId globalId, boolean noProviderDefault) throws Exception;
+
+    /*
+     * ToDo: the DvObject being sent in provides partial support for the case where
+     * it has a different authority/protocol than what is configured (i.e. a legacy
+     * Pid that can actually be updated by the Pid account being used.) Removing
+     * this now would potentially break/make it harder to handle that case prior to
+     * support for configuring multiple Pid providers. Once that exists, it would be
+     * cleaner to always find the PidProvider associated with the
+     * protocol/authority/shoulder of the current dataset and then not pass the
+     * DvObject as a param. (This would also remove calls to get the settings since
+     * that would be done at construction.)
+     */
+    @Override
+    public DvObject generatePid(DvObject dvObject) {
+
+        if (dvObject.getProtocol() == null) {
+            dvObject.setProtocol(getProtocol());
+        } else {
+            if (!dvObject.getProtocol().equals(getProtocol())) {
+                logger.warning("The protocol of the DvObject (" + dvObject.getProtocol()
+                        + ") does not match the configured protocol (" + getProtocol() + ")");
+                throw new IllegalArgumentException("The protocol of the DvObject (" + dvObject.getProtocol()
+                        + ") doesn't match that of the provider, id: " + getId());
+            }
+        }
+        if (dvObject.getAuthority() == null) {            
+            dvObject.setAuthority(getAuthority());
+        } else {
+            if (!dvObject.getAuthority().equals(getAuthority())) {
+                logger.warning("The authority of the DvObject (" + dvObject.getAuthority()
+                        + ") does not match the configured authority (" + getAuthority() + ")");
+                throw new IllegalArgumentException("The authority of the DvObject (" + dvObject.getAuthority()
+                        + ") doesn't match that of the provider, id: " + getId());
+            }
+        }
+        if (dvObject.getSeparator() == null) {
+            dvObject.setSeparator(getSeparator());
+        } else {
+            //only check separator if identifier is not null because a null authority would be set above...
+            //SEK 06/26/25 #11546
+            if (dvObject.getIdentifier() != null
+                    && !dvObject.getSeparator().equals(getSeparator())) {
+                logger.warning("The separator of the DvObject (" + dvObject.getSeparator()
+                        + ") does not match the configured separator (" + getSeparator() + ")");
+                throw new IllegalArgumentException("The separator of the DvObject (" + dvObject.getSeparator()
+                        + ") doesn't match that of the provider, id: " + getId());
+            } else {
+                //we know it's not null so fill it if it's empty
+                if (dvObject.getSeparator().isEmpty()) {
+                    dvObject.setSeparator(getSeparator());
+                }
+            }
+        }
+        if (dvObject.isInstanceofDataset()) {
+            dvObject.setIdentifier(generateDatasetIdentifier((Dataset) dvObject));
+        } else {
+            dvObject.setIdentifier(generateDataFileIdentifier((DataFile) dvObject));
+        }
+        return dvObject;
+    }
+
+    private String generateDatasetIdentifier(Dataset dataset) {
+        String shoulder = getShoulder();
+
+        switch (getIdentifierGenerationStyle()) {
+        case "randomString":
+            return generateIdentifierAsRandomString(dataset, shoulder);
+        case "storedProcGenerated":
+            return generateIdentifierFromStoredProcedureIndependent(dataset, shoulder);
+        default:
+            /* Should we throw an exception instead?? -- L.A. 4.6.2 */
+            return generateIdentifierAsRandomString(dataset, shoulder);
+        }
+    }
+
+    /**
+     * Check that a identifier entered by the user is unique (not currently used for
+     * any other study in this Dataverse Network) also check for duplicate in EZID
+     * if needed
+     * 
+     * @param userIdentifier
+     * @param dataset
+     * @return {@code true} if the identifier is unique, {@code false} otherwise.
+     */
+    public boolean isGlobalIdUnique(GlobalId globalId) {
+        if (!pidProviderService.isGlobalIdLocallyUnique(globalId)) {
+            return false; // duplication found in local database
+        }
+
+        // not in local DB, look in the persistent identifier service
+        try {
+            return !alreadyRegistered(globalId, false);
+        } catch (Exception e) {
+            // we can live with failure - means identifier not found remotely
+        }
+
+        return true;
+    }
+
+    /**
+     * Parse a Persistent Id and set the protocol, authority, and identifier
+     * 
+     * Example 1: doi:10.5072/FK2/BYM3IW protocol: doi authority: 10.5072
+     * identifier: FK2/BYM3IW
+     * 
+     * Example 2: hdl:1902.1/111012 protocol: hdl authority: 1902.1 identifier:
+     * 111012
+     *
+     * @param identifierString
+     * @param separator        the string that separates the authority from the
+     *                         identifier.
+     * @param destination      the global id that will contain the parsed data.
+     * @return {@code destination}, after its fields have been updated, or
+     *         {@code null} if parsing failed.
+     */
+    @Override
+    public GlobalId parsePersistentId(String fullIdentifierString) {
+        // Occasionally, the protocol separator character ':' comes in still
+        // URL-encoded as %3A (usually as a result of the URL having been
+        // encoded twice):
+        fullIdentifierString = fullIdentifierString.replace("%3A", ":");
+
+        int index1 = fullIdentifierString.indexOf(':');
+        if (index1 > 0) { // ':' found with one or more characters before it
+            String protocol = fullIdentifierString.substring(0, index1);
+            GlobalId globalId = parsePersistentId(protocol, fullIdentifierString.substring(index1 + 1));
+            return globalId;
+        }
+        logger.log(Level.INFO, "Error parsing identifier: {0}: ''<protocol>:'' not found in string",
+                fullIdentifierString);
+        return null;
+    }
+
+    protected GlobalId parsePersistentId(String protocol, String identifierString) {
+        String authority;
+        String identifier;
+        if (identifierString == null) {
+            return null;
+        }
+        int index = identifierString.indexOf(getSeparator());
+        if (index > 0 && (index + 1) < identifierString.length()) {
+            // '/' found with one or more characters
+            // before and after it
+            // Strip any whitespace, ; and ' from authority (should finding them cause a
+            // failure instead?)
+            authority = PidProvider.formatIdentifierString(identifierString.substring(0, index));
+
+            if (PidProvider.testforNullTerminator(authority)) {
+                return null;
+            }
+            identifier = PidProvider.formatIdentifierString(identifierString.substring(index + 1));
+            if (PidProvider.testforNullTerminator(identifier)) {
+                return null;
+            }
+
+        } else {
+            logger.log(Level.INFO, "Error parsing identifier: {0}: '':<authority>/<identifier>'' not found in string",
+                    identifierString);
+            return null;
+        }
+        return parsePersistentId(protocol, authority, identifier);
+    }
+
+    public GlobalId parsePersistentId(String protocol, String authority, String identifier) {
+        return parsePersistentId(protocol, authority, identifier, false);
+    }
+    
+    public GlobalId parsePersistentId(String protocol, String authority, String identifier, boolean isCaseInsensitive) {
+        logger.fine("Parsing: " + protocol + ":" + authority + getSeparator() + identifier + " in " + getId());
+        if (!PidProvider.isValidGlobalId(protocol, authority, identifier)) {
+            return null;
+        }
+        String comparableShoulder = getShoulder();
+        
+        if(isCaseInsensitive) {
+            identifier = identifier.toUpperCase();
+            if(comparableShoulder != null) {
+                comparableShoulder = comparableShoulder.toUpperCase();
+            }
+        }
+        // Check authority/identifier if this is a provider that manages specific
+        // identifiers
+        // /is not one of the unmanaged providers that has null authority
+        if (getAuthority() != null) {
+
+            String cleanIdentifier = protocol + ":" + authority + getSeparator() + identifier;
+            /*
+             * Test if this provider manages this identifier - return null if it does not.
+             * It does match if ((the identifier's authority and shoulder match the
+             * provider's), or the identifier is in the managed set), and, in either case,
+             * the identifier is not in the excluded set.
+             */
+            logger.fine("clean pid in " + getId() + ": " + cleanIdentifier);
+            logger.fine("managed in " + getId() + ": " + getManagedSet().contains(cleanIdentifier));
+            logger.fine("excluded from " + getId() + ": " + getExcludedSet().contains(cleanIdentifier));
+
+            if (!(((authority.equals(getAuthority()) && identifier.startsWith(comparableShoulder))
+                    || getManagedSet().contains(cleanIdentifier)) && !getExcludedSet().contains(cleanIdentifier))) {
+                return null;
+            }
+        }
+        return new GlobalId(protocol, authority, identifier, getSeparator(), getUrlPrefix(), getId());
+    }
+
+    public String getSeparator() {
+        // The standard default
+        return SEPARATOR;
+    }
+
+    private String generateDataFileIdentifier(DataFile datafile) {
+        String doiDataFileFormat = getDatafilePidFormat();
+
+        String prepend = "";
+        if (doiDataFileFormat.equals(SystemConfig.DataFilePIDFormat.DEPENDENT.toString())) {
+            // If format is dependent then pre-pend the dataset identifier
+            prepend = datafile.getOwner().getIdentifier() + SEPARATOR;
+            datafile.setProtocol(datafile.getOwner().getProtocol());
+            datafile.setAuthority(datafile.getOwner().getAuthority());
+        } else {
+            // If there's a shoulder prepend independent identifiers with it
+            prepend = getShoulder();
+            datafile.setProtocol(getProtocol());
+            datafile.setAuthority(getAuthority());
+        }
+
+        switch (getIdentifierGenerationStyle()) {
+        case "randomString":
+            return generateIdentifierAsRandomString(datafile, prepend);
+        case "storedProcGenerated":
+            if (doiDataFileFormat.equals(SystemConfig.DataFilePIDFormat.INDEPENDENT.toString())) {
+                return generateIdentifierFromStoredProcedureIndependent(datafile, prepend);
+            } else {
+                return generateIdentifierFromStoredProcedureDependent(datafile, prepend);
+            }
+        default:
+            /* Should we throw an exception instead?? -- L.A. 4.6.2 */
+            return generateIdentifierAsRandomString(datafile, prepend);
+        }
+    }
+
+    /*
+     * This method checks locally for a DvObject with the same PID and if that is
+     * OK, checks with the PID service.
+     * 
+     * @param dvo - the object to check (ToDo - get protocol/authority from this
+     * PidProvider object)
+     * 
+     * @param prepend - for Datasets, this is always the shoulder, for DataFiles, it
+     * could be the shoulder or the parent Dataset identifier
+     */
+    private String generateIdentifierAsRandomString(DvObject dvo, String prepend) {
+        String identifier = null;
+        do {
+            identifier = prepend + RandomStringUtils.randomAlphanumeric(6).toUpperCase();
+        } while (!isGlobalIdUnique(new GlobalId(dvo.getProtocol(), dvo.getAuthority(), identifier, this.getSeparator(),
+                this.getUrlPrefix(), this.getId())));
+
+        return identifier;
+    }
+
+    /*
+     * This method checks locally for a DvObject with the same PID and if that is
+     * OK, checks with the PID service.
+     * 
+     * @param dvo - the object to check (ToDo - get protocol/authority from this
+     * PidProvider object)
+     * 
+     * @param prepend - for Datasets, this is always the shoulder, for DataFiles, it
+     * could be the shoulder or the parent Dataset identifier
+     */
+
+    private String generateIdentifierFromStoredProcedureIndependent(DvObject dvo, String prepend) {
+        String identifier;
+        do {
+            String identifierFromStoredProcedure = pidProviderService.generateNewIdentifierByStoredProcedure();
+            // some diagnostics here maybe - is it possible to determine that it's failing
+            // because the stored procedure hasn't been created in the database?
+            if (identifierFromStoredProcedure == null) {
+                return null;
+            }
+            identifier = prepend + identifierFromStoredProcedure;
+        } while (!isGlobalIdUnique(new GlobalId(dvo.getProtocol(), dvo.getAuthority(), identifier, this.getSeparator(),
+                this.getUrlPrefix(), this.getId())));
+
+        return identifier;
+    }
+
+    /*
+     * This method is only used for DataFiles with DEPENDENT Pids. It is not for
+     * Datasets
+     * 
+     */
+    private String generateIdentifierFromStoredProcedureDependent(DataFile datafile, String prepend) {
+        String identifier;
+        Long retVal;
+        retVal = Long.valueOf(0L);
+        // ToDo - replace loops with one lookup for largest entry? (the do loop runs
+        // ~n**2/2 calls). The check for existingIdentifiers means this is mostly a
+        // local loop now, versus involving db or PidProvider calls, but still...)
+
+        // This will catch identifiers already assigned in the current transaction (e.g.
+        // in FinalizeDatasetPublicationCommand) that haven't been committed to the db
+        // without having to make a call to the PIDProvider
+        Set<String> existingIdentifiers = new HashSet<String>();
+        List<DataFile> files = datafile.getOwner().getFiles();
+        for (DataFile f : files) {
+            existingIdentifiers.add(f.getIdentifier());
+        }
+
+        do {
+            retVal++;
+            identifier = prepend + retVal.toString();
+
+        } while (existingIdentifiers.contains(identifier) || !isGlobalIdUnique(new GlobalId(datafile.getProtocol(),
+                datafile.getAuthority(), identifier, this.getSeparator(), this.getUrlPrefix(), this.getId())));
+
+        return identifier;
+    }
+
+
+    @Override
+    public boolean canManagePID() {
+        // The default expectation is that PID providers are configured to manage some
+        // set (i.e. based on protocol/authority/shoulder) of PIDs
+        return true;
+    }
+
+    @Override
+    public void setPidProviderServiceBean(PidProviderFactoryBean pidProviderServiceBean) {
+        this.pidProviderService = pidProviderServiceBean;
+    }
+
+    @Override
+    public String getProtocol() {
+        return protocol;
+    }
+
+    @Override
+    public String getAuthority() {
+        return authority;
+    }
+
+    @Override
+    public String getShoulder() {
+        return shoulder;
+    }
+
+    @Override
+    public String getIdentifierGenerationStyle() {
+        return identifierGenerationStyle;
+    }
+
+    @Override
+    public String getDatafilePidFormat() {
+        return datafilePidFormat;
+    }
+
+    @Override
+    public Set<String> getManagedSet() {
+        return managedSet;
+    }
+
+    @Override
+    public Set<String> getExcludedSet() {
+        return excludedSet;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+
+    @Override
+    /**
+     * True if this provider can manage PIDs in general, this pid is not in the
+     * managedSet (meaning it is managed but the provider does not generally manage
+     * it's protocol/authority/separator/shoulder) and either this provider is the
+     * same as the pid's or we're allowed to create INDEPENDENT pids. The latter
+     * clause covers the potential case where the effective pid provider/generator
+     * for the dataset is set to a different one that handles the dataset's pid
+     * itself. In this case, we can create file PIDs if they are independent.
+     * 
+     * @param pid - the related pid to check
+     * @return true if this provider can manage PIDs like the one supplied
+     */
+    public boolean canCreatePidsLike(GlobalId pid) {
+        return canManagePID() && !managedSet.contains(pid.asString())
+                && (getIdentifierGenerationStyle().equals("INDEPENDENT") || getId().equals(pid.getProviderId()));
+    }
+    
+    @Override
+    public JsonObject getProviderSpecification() {
+        JsonObjectBuilder providerSpecification = Json.createObjectBuilder();
+        providerSpecification.add("id", id);
+        providerSpecification.add("label", label);
+        providerSpecification.add("protocol", protocol);
+        providerSpecification.add("authority", authority);
+        providerSpecification.add("separator", getSeparator());
+        providerSpecification.add("shoulder", shoulder);
+        providerSpecification.add("identifierGenerationStyle", identifierGenerationStyle);
+        providerSpecification.add("datafilePidFormat", datafilePidFormat);
+        providerSpecification.add("managedSet", Strings.join(",", managedSet.toArray()));
+        providerSpecification.add("excludedSet", Strings.join(",", excludedSet.toArray()));
+        return providerSpecification.build();
+    }
+    
+    @Override
+    public boolean updateIdentifier(DvObject dvObject) {
+        //By default, these are the same
+        return publicizeIdentifier(dvObject);
+    }
+    
+    /** By default, this is not implemented */
+    @Override
+    public JsonObject getCSLJson(DatasetVersion datasetVersion) {
+        return new DataCitation(datasetVersion).getCSLJsonFormat();
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/FakePidProviderServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/FakePidProviderServiceBean.java
deleted file mode 100644
index ce9e281e986..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/FakePidProviderServiceBean.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package edu.harvard.iq.dataverse.pidproviders;
-
-import edu.harvard.iq.dataverse.AbstractGlobalIdServiceBean;
-import edu.harvard.iq.dataverse.DvObject;
-import edu.harvard.iq.dataverse.GlobalId;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.ejb.Stateless;
-
-@Stateless
-public class FakePidProviderServiceBean extends AbstractGlobalIdServiceBean {
-
-    @Override
-    public boolean alreadyExists(DvObject dvo) throws Exception {
-        return true;
-    }
-    
-    @Override
-    public boolean alreadyExists(GlobalId globalId) throws Exception {
-        return true;
-    }
-
-    @Override
-    public boolean registerWhenPublished() {
-        return false;
-    }
-
-    @Override
-    public List<String> getProviderInformation() {
-        ArrayList<String> providerInfo = new ArrayList<>();
-        String providerName = "FAKE";
-        String providerLink = "http://dataverse.org";
-        providerInfo.add(providerName);
-        providerInfo.add(providerLink);
-        return providerInfo;
-    }
-
-    @Override
-    public String createIdentifier(DvObject dvo) throws Throwable {
-        return "fakeIdentifier";
-    }
-
-    @Override
-    public Map<String, String> getIdentifierMetadata(DvObject dvo) {
-        Map<String, String> map = new HashMap<>();
-        return map;
-    }
-
-    @Override
-    public String modifyIdentifierTargetURL(DvObject dvo) throws Exception {
-        return "fakeModifyIdentifierTargetURL";
-    }
-
-    @Override
-    public void deleteIdentifier(DvObject dvo) throws Exception {
-        // no-op
-    }
-
-    @Override
-    public Map<String, String> lookupMetadataFromIdentifier(String protocol, String authority, String identifier) {
-        Map<String, String> map = new HashMap<>();
-        return map;
-    }
-
-    @Override
-    public boolean publicizeIdentifier(DvObject studyIn) {
-        return true;
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProvider.java
new file mode 100644
index 00000000000..ecc13d17279
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProvider.java
@@ -0,0 +1,200 @@
+package edu.harvard.iq.dataverse.pidproviders;
+
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+import jakarta.json.JsonObject;
+import java.util.*;
+import java.util.logging.Logger;
+
+public interface PidProvider {
+
+    static final Logger logger = Logger.getLogger(PidProvider.class.getCanonicalName());
+
+    boolean alreadyRegistered(DvObject dvo) throws Exception;
+    
+    /**
+     * This call reports whether a PID is registered with the external Provider
+     * service. For providers like DOIs/Handles with an external service, this call
+     * should accurately report whether the PID has been registered in the service.
+     * For providers with no external service, the call should return true if the
+     * PID is defined locally. If it isn't, these no-service providers need to know
+     * whether use case of the caller requires that the returned value should
+     * default to true or false - via the noProviderDefault parameter.
+     * 
+     * @param globalId
+     * @param noProviderDefault - when there is no external service, and no local
+     *                          use of the PID, this should be returned
+     * @return whether the PID should be considered registered or not.
+     * @throws Exception
+     */
+    boolean alreadyRegistered(GlobalId globalId, boolean noProviderDefault) throws Exception;
+    
+    boolean registerWhenPublished();
+    boolean canManagePID();
+    
+    List<String> getProviderInformation();
+
+    String createIdentifier(DvObject dvo) throws Throwable;
+
+    Map<String,String> getIdentifierMetadata(DvObject dvo);
+
+    String modifyIdentifierTargetURL(DvObject dvo) throws Exception;
+
+    void deleteIdentifier(DvObject dvo) throws Exception;
+    
+    Map<String, String> getMetadataForCreateIndicator(DvObject dvObject);
+    
+    Map<String,String> getMetadataForTargetURL(DvObject dvObject);
+    
+    DvObject generatePid(DvObject dvObject);
+    
+    String getIdentifier(DvObject dvObject);
+    
+    boolean publicizeIdentifier(DvObject studyIn);
+    
+    boolean updateIdentifier(DvObject dvObject);
+    
+    boolean isGlobalIdUnique(GlobalId globalId);
+    
+    String getUrlPrefix();
+    String getSeparator();
+    
+    String getProtocol();
+    String getProviderType();
+    String getId();
+    String getLabel();
+    String getAuthority();
+    String getShoulder();
+    String getIdentifierGenerationStyle();
+    
+    public static Optional<GlobalId> parse(String identifierString) {
+        try {
+            return Optional.of(PidUtil.parseAsGlobalID(identifierString));
+        } catch ( IllegalArgumentException _iae) {
+            return Optional.empty();
+        }
+    }
+    
+    /** 
+     *   Parse a Persistent Id and set the protocol, authority, and identifier
+     * 
+     *   Example 1: doi:10.5072/FK2/BYM3IW
+     *       protocol: doi
+     *       authority: 10.5072
+     *       identifier: FK2/BYM3IW
+     * 
+     *   Example 2: hdl:1902.1/111012
+     *       protocol: hdl
+     *       authority: 1902.1
+     *       identifier: 111012
+     *
+     * @param identifierString
+     * @param separator the string that separates the authority from the identifier.
+     * @param destination the global id that will contain the parsed data.
+     * @return {@code destination}, after its fields have been updated, or
+     *         {@code null} if parsing failed.
+     */
+    public GlobalId parsePersistentId(String identifierString);
+    
+    public GlobalId parsePersistentId(String protocol, String authority, String identifier);
+
+    
+    
+    public static boolean isValidGlobalId(String protocol, String authority, String identifier) {
+        if (protocol == null || authority == null || identifier == null) {
+            return false;
+        }
+        if(!authority.equals(PidProvider.formatIdentifierString(authority))) {
+            return false;
+        }
+        if (PidProvider.testforNullTerminator(authority)) {
+            return false;
+        }
+        if(!identifier.equals(PidProvider.formatIdentifierString(identifier))) {
+            return false;
+        }
+        if (PidProvider.testforNullTerminator(identifier)) {
+            return false;
+        }
+        return true;
+    }
+    
+    static String formatIdentifierString(String str){
+        
+        if (str == null){
+            return null;
+        }
+        // remove whitespace, single quotes, and semicolons
+        return str.replaceAll("\\s+|'|;","");  
+        
+        /*
+        <   (%3C)
+>   (%3E)
+{   (%7B)
+}   (%7D)
+^   (%5E)
+[   (%5B)
+]   (%5D)
+`   (%60)
+|   (%7C)
+\   (%5C)
++
+        */
+        // http://www.doi.org/doi_handbook/2_Numbering.html
+    }
+    
+    static boolean testforNullTerminator(String str){
+        if(str == null) {
+            return false;
+        }
+        return str.indexOf('\u0000') > 0;
+    }
+    
+    static boolean checkDOIAuthority(String doiAuthority){
+        
+        if (doiAuthority==null){
+            return false;
+        }
+        
+        if (!(doiAuthority.startsWith("10."))){
+            return false;
+        }
+        
+        return true;
+    }
+
+    public void setPidProviderServiceBean(PidProviderFactoryBean pidProviderFactoryBean);
+
+    String getDatafilePidFormat();
+
+    Set<String> getManagedSet();
+
+    Set<String> getExcludedSet();
+
+    /** 
+     * Whether related pids can be created by this pid provider
+     * @see edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider#canCreatePidsLike(GlobalId) more details in the abstract implementation
+     * 
+     * @param pid
+     * @return - whether related pids can be created by this pid provider. 
+     */
+    boolean canCreatePidsLike(GlobalId pid);
+
+    /**
+     * Returns a JSON representation of this pid provider including it's id, label, protocol, authority, separator, and identifier.
+     * @return
+     */
+    public JsonObject getProviderSpecification();
+    
+    /**
+     * Returns a the Citation Style Language (CSL) JSON representation of the pid.
+     * For some providers, this could be a call to the service API. For others, it
+     * may involve generating a local copy.
+     * 
+     * @param datasetVersion
+     * @return - the CSL Json for the PID
+     */
+    public JsonObject getCSLJson(DatasetVersion datasetVersion);
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactory.java
new file mode 100644
index 00000000000..f7c1a4b9174
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactory.java
@@ -0,0 +1,8 @@
+package edu.harvard.iq.dataverse.pidproviders;
+
+public interface PidProviderFactory {
+
+    String getType();
+
+    PidProvider createPidProvider(String id);
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java
new file mode 100644
index 00000000000..1bd49bc7f6e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java
@@ -0,0 +1,253 @@
+package edu.harvard.iq.dataverse.pidproviders;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.DvObjectServiceBean;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.doi.UnmanagedDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.ezid.EZIdDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.fake.FakeDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
+import edu.harvard.iq.dataverse.pidproviders.handle.UnmanagedHandlePidProvider;
+import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider;
+import edu.harvard.iq.dataverse.pidproviders.perma.UnmanagedPermaLinkPidProvider;
+
+/**
+ * This Bean loads all of the PidProviderFactory types available (e.g. EZID,
+ * DataCite, Handle, PermaLink) and then reads the configuration to load
+ * particular PidProviders (e.g. a DataCite provider with a specific
+ * authority/shoulder, username/password, etc.)
+ */
+@Startup
+@Singleton
+public class PidProviderFactoryBean {
+
+    private static final Logger logger = Logger.getLogger(PidProviderFactoryBean.class.getCanonicalName());
+
+    @Inject
+    DataverseServiceBean dataverseService;
+    @EJB
+    protected SettingsServiceBean settingsService;
+    @Inject
+    protected DvObjectServiceBean dvObjectService;
+    @Inject
+    SystemConfig systemConfig;
+
+    private ServiceLoader<PidProviderFactory> loader;
+    private Map<String, PidProviderFactory> pidProviderFactoryMap = new HashMap<>();
+
+    @PostConstruct
+    public void init() {
+        loadProviderFactories();
+        loadProviders();
+    }
+
+    private void loadProviderFactories() {
+        /*
+         * Step 1 - find the PROVIDERS dir and add all jar files there to a class loader
+         */
+        List<URL> jarUrls = new ArrayList<>();
+        Optional<String> providerPathSetting = JvmSettings.PIDPROVIDERS_DIRECTORY.lookupOptional(String.class);
+        if (providerPathSetting.isPresent()) {
+            Path providersDir = Paths.get(providerPathSetting.get());
+            // Get all JAR files from the configured directory
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(providersDir, "*.jar")) {
+                // Using the foreach loop here to enable catching the URI/URL exceptions
+                for (Path path : stream) {
+                    logger.log(Level.FINE, "Adding {0}", path.toUri().toURL());
+                    // This is the syntax required to indicate a jar file from which classes should
+                    // be loaded (versus a class file).
+                    jarUrls.add(new URL("jar:" + path.toUri().toURL() + "!/"));
+                }
+            } catch (IOException e) {
+                logger.warning("Problem accessing external Providers: " + e.getLocalizedMessage());
+            }
+        }
+        URLClassLoader cl = URLClassLoader.newInstance(jarUrls.toArray(new URL[0]), this.getClass().getClassLoader());
+
+        /*
+         * Step 2 - load all PidProcviderFactories that can be found, using the jars as
+         * additional sources
+         */
+        loader = ServiceLoader.load(PidProviderFactory.class, cl);
+        /*
+         * Step 3 - Fill pidProviderFactoryMap with type as the key, allow external
+         * factories to replace internal ones for the same type. FWIW: From the logging
+         * it appears that ServiceLoader returns classes in ~ alphabetical order rather
+         * than by class loader, so internal classes handling a given providerName may
+         * be processed before or after external ones.
+         */
+        loader.forEach(providerFactory -> {
+            String type = providerFactory.getType();
+            logger.fine("Loaded PidProviderFactory of type: " + type);
+            // If no entry for this providerName yet or if it is an external provider
+            if (!pidProviderFactoryMap.containsKey(type) || providerFactory.getClass().getClassLoader().equals(cl)) {
+                logger.fine("Adding PidProviderFactory of type: " + type + " to the map");
+                pidProviderFactoryMap.put(type, providerFactory);
+            }
+            logger.log(Level.FINE,
+                    "Loaded PidProviderFactory of type: " + type + " from "
+                            + providerFactory.getClass().getCanonicalName() + " and classloader: "
+                            + providerFactory.getClass().getClassLoader().getClass().getCanonicalName());
+        });
+    }
+
+    private void loadProviders() {
+        Optional<String[]> providers = JvmSettings.PID_PROVIDERS.lookupOptional(String[].class);
+        if (!providers.isPresent()) {
+            logger.warning(
+                    "No PidProviders configured via dataverse.pid.providers. Please consider updating as older PIDProvider configuration mechanisms will be removed in a future version of Dataverse.");
+        } else {
+            for (String id : providers.get()) {
+                //Allows spaces in PID_PROVIDERS setting
+                id=id.trim();
+                Optional<String> type = JvmSettings.PID_PROVIDER_TYPE.lookupOptional(id);
+                if (!type.isPresent()) {
+                    logger.warning("PidProvider " + id
+                            + " listed in dataverse.pid.providers is not properly configured and will not be used.");
+                } else {
+                    String typeString = type.get();
+                    if (pidProviderFactoryMap.containsKey(typeString)) {
+                        PidProvider provider = pidProviderFactoryMap.get(typeString).createPidProvider(id);
+                        provider.setPidProviderServiceBean(this);
+                        PidUtil.addToProviderList(provider);
+                    }
+                }
+            }
+        }
+        String protocol = settingsService.getValueForKey(SettingsServiceBean.Key.Protocol);
+        String authority = settingsService.getValueForKey(SettingsServiceBean.Key.Authority);
+        String shoulder = settingsService.getValueForKey(SettingsServiceBean.Key.Shoulder);
+        String provider = settingsService.getValueForKey(SettingsServiceBean.Key.DoiProvider);
+
+        if (protocol != null && authority != null && shoulder != null && provider != null) {
+            logger.warning("Found legacy settings: " + protocol + " " + authority + " " + shoulder + " " + provider
+                    + "Please consider updating as this PIDProvider configuration mechanism will be removed in a future version of Dataverse");
+            if (PidUtil.getPidProvider(protocol, authority, shoulder) != null) {
+                logger.warning(
+                        "Legacy PID provider settings found - ignored since a provider for the same protocol, authority, shoulder has been registered");
+            } else {
+                PidProvider legacy = null;
+                // Try to add a legacy provider
+                String identifierGenerationStyle = settingsService
+                        .getValueForKey(SettingsServiceBean.Key.IdentifierGenerationStyle, "random");
+                String dataFilePidFormat = settingsService.getValueForKey(SettingsServiceBean.Key.DataFilePIDFormat,
+                        "DEPENDENT");
+                switch (protocol) {
+                case "doi":
+                    switch (provider) {
+                    case "EZID":
+
+                        String baseUrl = JvmSettings.LEGACY_EZID_API_URL.lookup();
+                        String username = JvmSettings.LEGACY_EZID_USERNAME.lookup();
+                        String password = JvmSettings.LEGACY_EZID_PASSWORD.lookup();
+                        PidUtil.addToProviderList(new EZIdDOIProvider("legacy", "legacy", authority, shoulder,
+                                identifierGenerationStyle, dataFilePidFormat, "", "", baseUrl, username, password));
+
+                        break;
+                    case "DataCite":
+                        String mdsUrl = JvmSettings.LEGACY_DATACITE_MDS_API_URL.lookup();
+                        String restUrl = JvmSettings.LEGACY_DATACITE_REST_API_URL.lookup();
+                        // Defaults for testing where no account is set up
+                        String dcUsername = JvmSettings.LEGACY_DATACITE_USERNAME.lookup();
+                        String dcPassword = JvmSettings.LEGACY_DATACITE_PASSWORD.lookup();
+                        if (mdsUrl != null && restUrl != null && dcUsername != null && dcPassword != null) {
+                            legacy = new DataCiteDOIProvider("legacy", "legacy", authority, shoulder,
+                                    identifierGenerationStyle, dataFilePidFormat, "", "", mdsUrl, restUrl, dcUsername,
+                                    dcPassword);
+                        }
+                        break;
+                    case "FAKE":
+                        logger.warning("Adding FAKE provider");
+                        legacy = new FakeDOIProvider("legacy", "legacy", authority, shoulder, identifierGenerationStyle,
+                                dataFilePidFormat, "", "");
+                        break;
+                    }
+                    break;
+                case "hdl":
+                    int index = JvmSettings.LEGACY_HANDLENET_INDEX.lookup(Integer.class);
+                    String path = JvmSettings.LEGACY_HANDLENET_KEY_PATH.lookup();
+                    String passphrase = JvmSettings.LEGACY_HANDLENET_KEY_PASSPHRASE.lookup();
+                    boolean independentHandleService = settingsService
+                            .isTrueForKey(SettingsServiceBean.Key.IndependentHandleService, false);
+                    String handleAuthHandle = settingsService.getValueForKey(SettingsServiceBean.Key.HandleAuthHandle);
+
+                    legacy = new HandlePidProvider("legacy", "legacy", authority, shoulder, identifierGenerationStyle,
+                            dataFilePidFormat, "", "", index, independentHandleService, handleAuthHandle, path,
+                            passphrase);
+                    break;
+                case "perma":
+                    String baseUrl = JvmSettings.LEGACY_PERMALINK_BASEURL.lookupOptional().orElse(SystemConfig.getDataverseSiteUrlStatic());
+                    legacy = new PermaLinkPidProvider("legacy", "legacy", authority, shoulder,
+                            identifierGenerationStyle, dataFilePidFormat, "", "", baseUrl,
+                            PermaLinkPidProvider.SEPARATOR);
+                }
+                if (legacy != null) {
+                    legacy.setPidProviderServiceBean(this);
+                    PidUtil.addToProviderList(legacy);
+                }
+            }
+            logger.info("Have " + PidUtil.getManagedProviderIds().size() + " managed PID providers");
+        }
+        PidUtil.addAllToUnmanagedProviderList(Arrays.asList(new UnmanagedDOIProvider(),
+                new UnmanagedHandlePidProvider(), new UnmanagedPermaLinkPidProvider()));
+    }
+
+    public String getProducer() {
+        return dataverseService.getRootDataverseName();
+    }
+
+    public boolean isGlobalIdLocallyUnique(GlobalId globalId) {
+         return dvObjectService.isGlobalIdLocallyUnique(globalId) && dvObjectService.isGlobalIdLocallyUniqueAlternativeIds(globalId);
+    }
+
+    String generateNewIdentifierByStoredProcedure() {
+        return dvObjectService.generateNewIdentifierByStoredProcedure();
+    }
+
+    public PidProvider getDefaultPidGenerator() {
+        Optional<String> pidProviderDefaultId = JvmSettings.PID_DEFAULT_PROVIDER.lookupOptional(String.class);
+        if (pidProviderDefaultId.isPresent()) {
+            return PidUtil.getPidProvider(pidProviderDefaultId.get());
+        } else {
+            String nonNullDefaultIfKeyNotFound = "";
+            String protocol = settingsService.getValueForKey(SettingsServiceBean.Key.Protocol,
+                    nonNullDefaultIfKeyNotFound);
+            String authority = settingsService.getValueForKey(SettingsServiceBean.Key.Authority,
+                    nonNullDefaultIfKeyNotFound);
+            String shoulder = settingsService.getValueForKey(SettingsServiceBean.Key.Shoulder,
+                    nonNullDefaultIfKeyNotFound);
+
+            return PidUtil.getPidProvider(protocol, authority, shoulder);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidUtil.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidUtil.java
new file mode 100644
index 00000000000..003b4e3f61c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidUtil.java
@@ -0,0 +1,290 @@
+package edu.harvard.iq.dataverse.pidproviders;
+
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
+import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.ServiceUnavailableException;
+
+public class PidUtil {
+
+    private static final Logger logger = Logger.getLogger(PidUtil.class.getCanonicalName());
+
+    /**
+     * @throws BadRequestException          if user didn't supply a DOI.
+     *
+     * @throws NotFoundException            if DOI not found in DataCite.
+     *
+     * @throws ServiceUnavailableException  if non 200 or non 404 response from
+     *                                      DataCite.
+     *
+     * @throws InternalServerErrorException on local misconfiguration such as
+     *                                      DataCite hostname not in DNS.
+     */
+    public static JsonObjectBuilder queryDoi(GlobalId globalId, String baseUrl, String username, String password) {
+        try {
+            // This throws an exception if this is not a DOI, which is the only
+            // user-supplied param - treat this as a BadRequest in the catch statement.
+            String doi = acceptOnlyDoi(globalId);
+            URL url;
+            // Other errors are all internal misconfiguration (any problems creating the
+            // URL), the
+            // DOI doesn't exist (404 from DataCite), or problem at DataCite (other non-200
+            // responses).
+            int status = 0;
+            HttpURLConnection connection = null;
+            try {
+                url = new URL(baseUrl + "/dois/" + doi);
+
+                connection = (HttpURLConnection) url.openConnection();
+
+                connection.setRequestMethod("GET");
+                String userpass = username + ":" + password;
+                String basicAuth = "Basic " + new String(Base64.getEncoder().encode(userpass.getBytes()));
+                connection.setRequestProperty("Authorization", basicAuth);
+
+                status = connection.getResponseCode();
+            } catch (IOException ex) {
+                // Hostname not in DNS, for example.
+                throw new InternalServerErrorException(
+                        BundleUtil.getStringFromBundle("pids.datacite.errors.noResponseCode", Arrays.asList(baseUrl)));
+            }
+            if (status == 404) {
+                // Could check to see if Dataverse expects the DOI to be registered - that would
+                // result in a 404 from Dataverse before having to contact DataCite, and
+                // DataCite could still return a 404
+                throw new NotFoundException("404 (NOT FOUND) from DataCite for DOI " + globalId);
+            }
+            if (status != 200) {
+                /*
+                 * We could just send back whatever status code DataCite sends, but we've seen
+                 * DataCite sometimes respond with 403 when the credentials were OK, and their
+                 * 500 error doesn't mean a problem with Dataverse, so wrapping any of them in a
+                 * 503 error, to indicate this is a temporary error, might be the better option.
+                 * In any case, we need to log the issue to be able to debug it.
+                 */
+                logger.severe("Received " + status + " error from DataCite for DOI: " + globalId);
+                InputStream errorStream = connection.getErrorStream();
+                if (errorStream != null) {
+                    JsonObject out = Json.createReader(connection.getErrorStream()).readObject();
+                    logger.severe("DataCite error response: " + out.toString());
+                } else {
+                    logger.severe("No error stream from DataCite");
+                }
+                throw new ServiceUnavailableException();
+            }
+            JsonObject out;
+            try {
+                out = Json.createReader(connection.getInputStream()).readObject();
+            } catch (IOException ex) {
+                return Json.createObjectBuilder().add("response", ex.getLocalizedMessage());
+            }
+            JsonObject data = out.getJsonObject("data");
+            String id = data.getString("id");
+            JsonObject attributes = data.getJsonObject("attributes");
+            String state = attributes.getString("state");
+            JsonObjectBuilder ret = Json.createObjectBuilder().add("id", id).add("state", state);
+            return ret;
+        } catch (IllegalArgumentException ex) {
+            throw new BadRequestException(ex.getLocalizedMessage());
+        }
+    }
+
+    /**
+     * @param PID in the form doi:10.7910/DVN/TJCLKP
+     * @return DOI in the form 10.7910/DVN/TJCLKP (no "doi:")
+     */
+    private static String acceptOnlyDoi(GlobalId globalId) {
+        if (!AbstractDOIProvider.DOI_PROTOCOL.equals(globalId.getProtocol())) {
+            throw new IllegalArgumentException(BundleUtil.getStringFromBundle("pids.datacite.errors.DoiOnly"));
+        }
+        return globalId.getAuthority() + "/" + globalId.getIdentifier();
+    }
+
+    static Map<String, PidProvider> providerMap = new HashMap<String, PidProvider>();
+    static Map<String, PidProvider> unmanagedProviderMap = new HashMap<String, PidProvider>();
+
+    public static void addToProviderList(PidProvider pidProvider) {
+        providerMap.put(pidProvider.getId(), pidProvider);
+    }
+
+    public static void addAllToUnmanagedProviderList(List<PidProvider> list) {
+        for (PidProvider pidProvider : list) {
+            unmanagedProviderMap.put(pidProvider.getId(), pidProvider);
+        }
+    }
+
+    /**
+     * 
+     * @param identifier The string to be parsed
+     * @throws IllegalArgumentException if the passed string cannot be parsed.
+     */
+    public static GlobalId parseAsGlobalID(String identifier) {
+        logger.fine("In parseAsGlobalId: " + providerMap.size());
+        for (PidProvider pidProvider : providerMap.values()) {
+            logger.fine(" Checking " + String.join(",", pidProvider.getProviderInformation()));
+            GlobalId globalId = pidProvider.parsePersistentId(identifier);
+            if (globalId != null) {
+                return globalId;
+            }
+        }
+        // If no providers can managed this PID, at least allow it to be recognized
+        for (PidProvider pidProvider : unmanagedProviderMap.values()) {
+            logger.fine(" Checking " + String.join(",", pidProvider.getProviderInformation()));
+            GlobalId globalId = pidProvider.parsePersistentId(identifier);
+            if (globalId != null) {
+                return globalId;
+            }
+        }
+        throw new IllegalArgumentException("Failed to parse identifier: " + identifier);
+    }
+
+    /**
+     * 
+     * @param identifier The string to be parsed
+     * @throws IllegalArgumentException if the passed string cannot be parsed.
+     */
+    public static GlobalId parseAsGlobalID(String protocol, String authority, String identifier) {
+        logger.fine("Looking for " + protocol + " " + authority + " " + identifier);
+        logger.fine("In parseAsGlobalId: " + providerMap.size());
+        for (PidProvider pidProvider : providerMap.values()) {
+            logger.fine(" Checking " + String.join(",", pidProvider.getProviderInformation()));
+            GlobalId globalId = pidProvider.parsePersistentId(protocol, authority, identifier);
+            if (globalId != null) {
+                return globalId;
+            }
+        }
+        for (PidProvider pidProvider : unmanagedProviderMap.values()) {
+            logger.fine(" Checking " + String.join(",", pidProvider.getProviderInformation()));
+            GlobalId globalId = pidProvider.parsePersistentId(protocol, authority, identifier);
+            if (globalId != null) {
+                return globalId;
+            }
+        }
+        // For unit tests which don't have any provider Beans - todo remove when
+        // providers are no longer beans and can be configured easily in tests
+        return parseUnmanagedDoiOrHandle(protocol, authority, identifier);
+        // throw new IllegalArgumentException("Failed to parse identifier from protocol:
+        // " + protocol + ", authority:" + authority + ", identifier: " + identifier);
+    }
+    /*
+     * This method should be deprecated/removed when further refactoring to support
+     * multiple PID providers is done. At that point, when the providers aren't
+     * beans, this code can be moved into other classes that go in the providerMap.
+     * If this method is not kept in sync with the AbstractDOIProvider and HandlePidProvider
+     * implementations, the tests using it won't be valid tests of the production
+     * code.
+     */
+
+    private static GlobalId parseUnmanagedDoiOrHandle(String protocol, String authority, String identifier) {
+        // Default recognition - could be moved to new classes in the future.
+        if (!PidProvider.isValidGlobalId(protocol, authority, identifier)) {
+            return null;
+        }
+        String urlPrefix = null;
+        switch (protocol) {
+        case AbstractDOIProvider.DOI_PROTOCOL:
+            if (!PidProvider.checkDOIAuthority(authority)) {
+                return null;
+            }
+            urlPrefix = AbstractDOIProvider.DOI_RESOLVER_URL;
+            break;
+        case HandlePidProvider.HDL_PROTOCOL:
+            urlPrefix = HandlePidProvider.HDL_RESOLVER_URL;
+            break;
+        }
+        return new GlobalId(protocol, authority, identifier, "/", urlPrefix, null);
+    }
+
+    /**
+     * Get a PidProvider by name. GlobalIds have a getProviderName() method so this
+     * method is often used as
+     * getPidProvider(dvObject.getGlobalId().getProviderName(); (which will fail if
+     * the GlobalId is null - use PidProviderFactoryBean.getPidProvider(DvObject) if
+     * you aren't sure.
+     * 
+     */
+
+    public static PidProvider getPidProvider(String name) {
+        for (PidProvider pidProvider : providerMap.values()) {
+            if (name.equals(pidProvider.getId())) {
+                return pidProvider;
+            }
+        }
+        for (PidProvider pidProvider : unmanagedProviderMap.values()) {
+            if (name.equals(pidProvider.getId())) {
+                return pidProvider;
+            }
+        }
+        return null;
+    }
+
+
+
+    /**
+     * Method to clear all managed/unmanaged PidProviders. Only for testing as these
+     * lists are only loaded once by the @Stateless PidProviderFactoryBean in Dataverse.
+     */
+    public static void clearPidProviders() {
+        providerMap.clear();
+        unmanagedProviderMap.clear();
+    }
+
+    /**
+     * Get a PidProvider by protocol/authority/shoulder.
+     */
+    public static PidProvider getPidProvider(String protocol, String authority, String shoulder) {
+        switch(protocol) {
+        case PermaLinkPidProvider.PERMA_PROTOCOL: 
+            return getPidProvider(protocol, authority, shoulder, PermaLinkPidProvider.SEPARATOR);
+        default:
+            return getPidProvider(protocol, authority, shoulder, AbstractPidProvider.SEPARATOR);
+        }
+    }
+    
+    public static PidProvider getPidProvider(String protocol, String authority, String shoulder, String separator) {
+        for (PidProvider pidProvider : providerMap.values()) {
+            if (protocol.equals(pidProvider.getProtocol()) && authority.equals(pidProvider.getAuthority())
+                    && shoulder.equals(pidProvider.getShoulder()) && separator.equals(pidProvider.getSeparator())) {
+                return pidProvider;
+            }
+        }
+        for (PidProvider pidProvider : unmanagedProviderMap.values()) {
+            if (protocol.equals(pidProvider.getProtocol())) {
+                return pidProvider;
+            }
+        }
+        return null;
+    }
+
+    public static Set<String> getManagedProviderIds() {
+        return providerMap.keySet();
+    }
+    
+    public static JsonObject getProviders() {
+        JsonObjectBuilder builder = Json.createObjectBuilder();
+        for (PidProvider pidProvider : providerMap.values()) {
+            builder.add(pidProvider.getId(), pidProvider.getProviderSpecification());
+        }
+        return builder.build();
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/AbstractDOIProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/AbstractDOIProvider.java
new file mode 100644
index 00000000000..70ce1ec4c14
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/AbstractDOIProvider.java
@@ -0,0 +1,138 @@
+package edu.harvard.iq.dataverse.pidproviders.doi;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+
+
+public abstract class AbstractDOIProvider extends AbstractPidProvider {
+
+    private static final Logger logger = Logger.getLogger(AbstractDOIProvider.class.getCanonicalName());
+
+    public static final String DOI_PROTOCOL = "doi";
+    public static final String DOI_RESOLVER_URL = "https://doi.org/";
+    public static final String HTTP_DOI_RESOLVER_URL = "http://doi.org/";
+    public static final String DXDOI_RESOLVER_URL = "https://dx.doi.org/";
+    public static final String HTTP_DXDOI_RESOLVER_URL = "http://dx.doi.org/";
+
+    public AbstractDOIProvider(String id, String label, String providerAuthority, String providerShoulder, String identifierGenerationStyle, String datafilePidFormat, String managedList, String excludedList) {
+        super(id, label, DOI_PROTOCOL, providerAuthority, providerShoulder, identifierGenerationStyle, datafilePidFormat, managedList, excludedList);
+        //Create case insensitive (converted toUpperCase) managedSet and excludedSet
+        managedSet = clean(managedSet, "managed");
+        excludedSet = clean(excludedSet, "excluded");
+    }
+
+    private HashSet<String> clean(HashSet<String> originalSet, String setName) {
+        HashSet<String> cleanSet = new HashSet<String>();
+        for(String entry: originalSet) {
+            if(entry.startsWith(DOI_PROTOCOL)) {
+                cleanSet.add(DOI_PROTOCOL + entry.substring(DOI_PROTOCOL.length()).toUpperCase());
+            } else {
+                logger.warning("Non-DOI found in " + setName + " set of pidProvider id: " + getId() + ": " + entry + ". Entry is being dropped.");
+            }
+        }
+        return cleanSet;
+    }
+
+    //For Unmanaged provider
+    public AbstractDOIProvider(String name, String label) {
+        super(name, label, DOI_PROTOCOL);
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String pidString) {
+        if (pidString.startsWith(DOI_RESOLVER_URL)) {
+            pidString = pidString.replace(DOI_RESOLVER_URL,
+                    (DOI_PROTOCOL + ":"));
+        } else if (pidString.startsWith(HTTP_DOI_RESOLVER_URL)) {
+            pidString = pidString.replace(HTTP_DOI_RESOLVER_URL,
+                    (DOI_PROTOCOL + ":"));
+        } else if (pidString.startsWith(DXDOI_RESOLVER_URL)) {
+            pidString = pidString.replace(DXDOI_RESOLVER_URL,
+                    (DOI_PROTOCOL + ":"));
+        }
+        return super.parsePersistentId(pidString);
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String protocol, String identifierString) {
+
+        if (!DOI_PROTOCOL.equals(protocol)) {
+            return null;
+        }
+        GlobalId globalId = super.parsePersistentId(protocol, identifierString);
+        if (globalId!=null && !PidProvider.checkDOIAuthority(globalId.getAuthority())) {
+            return null;
+        }
+        return globalId;
+    }
+    
+    @Override
+    public GlobalId parsePersistentId(String protocol, String authority, String identifier) {
+
+        if (!DOI_PROTOCOL.equals(protocol)) {
+            return null;
+        }
+        return super.parsePersistentId(protocol, authority, identifier, true);
+    }
+
+    public String getUrlPrefix() {
+        return DOI_RESOLVER_URL;
+    }
+
+    protected String getProviderKeyName() {
+        return null;
+    }
+    
+    public String getProtocol() {
+        return DOI_PROTOCOL;
+    }
+    
+    public String getMetadataFromDvObject(String identifier, Map<String, String> metadata, DvObject dvObject) {
+
+        Dataset dataset = null;
+
+        if (dvObject instanceof Dataset) {
+            dataset = (Dataset) dvObject;
+        } else {
+            dataset = (Dataset) dvObject.getOwner();
+        }
+        DoiMetadata doiMetadata = new DoiMetadata();
+        doiMetadata.setIdentifier(identifier.substring(identifier.indexOf(':') + 1));
+        doiMetadata.setCreators(Arrays.asList(metadata.get("datacite.creator").split("; ")));
+        doiMetadata.setAuthors(dataset.getLatestVersion().getDatasetAuthors());
+        if (dvObject.isInstanceofDataset()) {
+            doiMetadata.setDescription(dataset.getLatestVersion().getDescriptionPlainText());
+        }
+        if (dvObject.isInstanceofDataFile()) {
+            DataFile df = (DataFile) dvObject;
+            String fileDescription = df.getDescription();
+            doiMetadata.setDescription(fileDescription == null ? "" : fileDescription);
+        }
+
+        doiMetadata.setContacts(dataset.getLatestVersion().getDatasetContacts());
+        doiMetadata.setProducers(dataset.getLatestVersion().getDatasetProducers());
+        doiMetadata.setTitle(dvObject.getCurrentName());
+        String producerString = pidProviderService.getProducer();
+        if (producerString.isEmpty() || producerString.equals(DatasetField.NA_VALUE)) {
+            producerString = UNAVAILABLE;
+        }
+        doiMetadata.setPublisher(producerString);
+        doiMetadata.setPublisherYear(metadata.get("datacite.publicationyear"));
+
+        String xmlMetadata = new XmlMetadataTemplate(doiMetadata).generateXML(dvObject);
+        logger.log(Level.FINE, "XML to send to DataCite: {0}", xmlMetadata);
+        return xmlMetadata;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/DoiMetadata.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/DoiMetadata.java
new file mode 100644
index 00000000000..ffd24747bc2
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/DoiMetadata.java
@@ -0,0 +1,138 @@
+package edu.harvard.iq.dataverse.pidproviders.doi;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
+import edu.harvard.iq.dataverse.DatasetAuthor;
+
+
+//Parses some specific parts of a DataCite XML metadata file
+public class DoiMetadata {
+
+    private String identifier;
+    private List<String> creators;
+    private String title;
+    private String publisher;
+    private String publisherYear;
+    private List<String> datafileIdentifiers;
+    private List<DatasetAuthor> authors;
+    private String description;
+    private List<String[]> contacts;
+    private List<String[]> producers;
+
+
+    public DoiMetadata() {
+    }
+
+    public void parseDataCiteXML(String xmlMetaData) {
+        Document doc = Jsoup.parseBodyFragment(xmlMetaData);
+        Elements identifierElements = doc.select("identifier");
+        if (identifierElements.size() > 0) {
+            identifier = identifierElements.get(0).html();
+        }
+        Elements creatorElements = doc.select("creatorName");
+        creators = new ArrayList<>();
+        for (Element creatorElement : creatorElements) {
+            creators.add(creatorElement.html());
+        }
+        Elements titleElements = doc.select("title");
+        if (titleElements.size() > 0) {
+            title = titleElements.get(0).html();
+        }
+        Elements publisherElements = doc.select("publisher");
+        if (publisherElements.size() > 0) {
+            publisher = publisherElements.get(0).html();
+        }
+        Elements publisherYearElements = doc.select("publicationYear");
+        if (publisherYearElements.size() > 0) {
+            publisherYear = publisherYearElements.get(0).html();
+        }
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public List<String> getCreators() {
+        return creators;
+    }
+
+    public void setCreators(List<String> creators) {
+        this.creators = creators;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getPublisher() {
+        return publisher;
+    }
+
+    public void setPublisher(String publisher) {
+        this.publisher = publisher;
+    }
+
+    public String getPublisherYear() {
+        return publisherYear;
+    }
+
+    public void setPublisherYear(String publisherYear) {
+        this.publisherYear = publisherYear;
+    }
+
+
+    public List<String[]> getProducers() {
+        return producers;
+    }
+
+    public void setProducers(List<String[]> producers) {
+        this.producers = producers;
+    }
+
+    public List<String[]> getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(List<String[]> contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List<DatasetAuthor> getAuthors() {
+        return authors;
+    }
+
+    public void setAuthors(List<DatasetAuthor> authors) {
+        this.authors = authors;
+    }
+
+
+    public List<String> getDatafileIdentifiers() {
+        return datafileIdentifiers;
+    }
+
+    public void setDatafileIdentifiers(List<String> datafileIdentifiers) {
+        this.datafileIdentifiers = datafileIdentifiers;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/UnmanagedDOIProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/UnmanagedDOIProvider.java
new file mode 100644
index 00000000000..208ea2bbe54
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/UnmanagedDOIProvider.java
@@ -0,0 +1,78 @@
+package edu.harvard.iq.dataverse.pidproviders.doi;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang3.NotImplementedException;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+
+/** This class is just used to parse DOIs that are not managed by any account configured in Dataverse
+ * It does not implement any of the methods related to PID CRUD
+ * 
+ */
+
+public class UnmanagedDOIProvider extends AbstractDOIProvider {
+
+    public static final String ID = "UnmanagedDOIProvider";
+
+    public UnmanagedDOIProvider() {
+        //Also using ID as label
+        super(ID, ID);
+    }
+
+    @Override
+    public boolean canManagePID() {
+        return false;
+    }
+
+    @Override
+    public boolean registerWhenPublished() {
+        return false;
+    }
+
+    @Override
+    public boolean alreadyRegistered(GlobalId pid, boolean noProviderDefault) {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public String createIdentifier(DvObject dvObject) throws Exception {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public Map<String, String> getIdentifierMetadata(DvObject dvObject) {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public void deleteIdentifier(DvObject dvObject) throws IOException {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public boolean publicizeIdentifier(DvObject dvObject) {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public List<String> getProviderInformation() {
+        return List.of(getId(), "");
+    }
+
+    @Override
+    public String getProviderType() {
+        return "unamagedDOI";
+    }
+
+    // PID recognition
+    // Done by AbstractDOIProvider
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java
new file mode 100644
index 00000000000..baf8302437d
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java
@@ -0,0 +1,1583 @@
+package edu.harvard.iq.dataverse.pidproviders.doi;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
+import org.ocpsoft.common.util.Strings;
+
+import edu.harvard.iq.dataverse.AlternativePersistentIdentifier;
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetAuthor;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
+import edu.harvard.iq.dataverse.DatasetFieldConstant;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DatasetRelPublication;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.ExternalIdentifier;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+import edu.harvard.iq.dataverse.api.Util;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
+import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.PersonOrOrgUtil;
+import edu.harvard.iq.dataverse.util.xml.XmlPrinter;
+import edu.harvard.iq.dataverse.util.xml.XmlWriterUtil;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.json.JsonObject;
+
+public class XmlMetadataTemplate {
+
+    private static final Logger logger = Logger.getLogger(XmlMetadataTemplate.class.getName());
+
+    public static final String XML_NAMESPACE = "http://datacite.org/schema/kernel-4";
+    public static final String XML_SCHEMA_LOCATION = "http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.5/metadata.xsd";
+    public static final String XML_XSI = "http://www.w3.org/2001/XMLSchema-instance";
+    public static final String XML_SCHEMA_VERSION = "4.5";
+
+    private DoiMetadata doiMetadata;
+
+    public XmlMetadataTemplate() {
+    }
+
+    public XmlMetadataTemplate(DoiMetadata doiMetadata) {
+        this.doiMetadata = doiMetadata;
+    }
+
+    public String generateXML(DvObject dvObject) {
+        try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+            generateXML(dvObject, outputStream);
+
+            String xml = outputStream.toString();
+            logger.fine(xml);
+            return XmlPrinter.prettyPrintXml(xml);
+        } catch (XMLStreamException | IOException e) {
+            logger.severe("Unable to generate DataCite XML for DOI: " + dvObject.getGlobalId().asString() + " : " + e.getMessage());
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private void generateXML(DvObject dvObject, OutputStream outputStream) throws XMLStreamException {
+        // Could/should use dataset metadata language for metadata from DvObject itself?
+        String language = null; // machine locale? e.g. for Publisher which is global
+        String metadataLanguage = null; // when set, otherwise = language?
+        
+        XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
+        xmlw.writeStartElement("resource");
+        boolean deaccessioned=false;
+        if(dvObject instanceof Dataset d) {
+            deaccessioned=d.isDeaccessioned();
+        } else if (dvObject instanceof DataFile df) {
+            deaccessioned = df.isDeaccessioned();
+        }
+        xmlw.writeDefaultNamespace(XML_NAMESPACE);
+        xmlw.writeAttribute("xmlns:xsi", XML_XSI);
+        xmlw.writeAttribute("xsi:schemaLocation", XML_SCHEMA_LOCATION);
+
+        writeIdentifier(xmlw, dvObject);
+        writeCreators(xmlw, doiMetadata.getAuthors(), deaccessioned);
+        writeTitles(xmlw, dvObject, language, deaccessioned);
+        writePublisher(xmlw, dvObject, deaccessioned);
+        writePublicationYear(xmlw, dvObject, deaccessioned);
+        if (!deaccessioned) {
+            writeSubjects(xmlw, dvObject);
+            writeContributors(xmlw, dvObject);
+            writeDates(xmlw, dvObject);
+            writeLanguage(xmlw, dvObject);
+        }
+        writeResourceType(xmlw, dvObject);
+        if (!deaccessioned) {
+            writeAlternateIdentifiers(xmlw, dvObject);
+            writeRelatedIdentifiers(xmlw, dvObject);
+            writeSize(xmlw, dvObject);
+            writeFormats(xmlw, dvObject);
+            writeVersion(xmlw, dvObject);
+            writeAccessRights(xmlw, dvObject);
+        }
+        writeDescriptions(xmlw, dvObject, deaccessioned);
+        if (!deaccessioned) {
+            writeGeoLocations(xmlw, dvObject);
+            writeFundingReferences(xmlw, dvObject);
+        }
+        xmlw.writeEndElement();
+        xmlw.flush();
+    }
+
+    /**
+     * 3, Title(s) (with optional type sub-properties) (M)
+     *
+     * @param xmlw
+     *            The Stream writer
+     * @param dvObject
+     *            The dataset/file
+     * @param language
+     *            the metadata language
+     * @return
+     * @throws XMLStreamException
+     */
+    private void writeTitles(XMLStreamWriter xmlw, DvObject dvObject, String language, boolean deaccessioned) throws XMLStreamException {
+        String title = null;
+        String subTitle = null;
+        List<String> altTitles = new ArrayList<>();
+
+        if (!deaccessioned) {
+            title = doiMetadata.getTitle();
+
+            // Only Datasets can have a subtitle or alternative titles
+            if (dvObject instanceof Dataset d) {
+                DatasetVersion dv = d.getLatestVersionForCopy();
+                Optional<DatasetField> subTitleField = dv.getDatasetFields().stream().filter(f -> f.getDatasetFieldType().getName().equals(DatasetFieldConstant.subTitle)).findFirst();
+                if (subTitleField.isPresent()) {
+                    subTitle = subTitleField.get().getValue();
+                }
+                Optional<DatasetField> altTitleField = dv.getDatasetFields().stream().filter(f -> f.getDatasetFieldType().getName().equals(DatasetFieldConstant.alternativeTitle)).findFirst();
+                if (altTitleField.isPresent()) {
+                    altTitles = altTitleField.get().getValues();
+                }
+            }
+        } else {
+            title = AbstractDOIProvider.UNAVAILABLE;
+        }
+        if (StringUtils.isNotBlank(title) || StringUtils.isNotBlank(subTitle) || (altTitles != null && !String.join("", altTitles).isBlank())) {
+            xmlw.writeStartElement("titles");
+            if (StringUtils.isNotBlank(title)) {
+                XmlWriterUtil.writeFullElement(xmlw, "title", title, language);
+            }
+            Map<String, String> attributes = new HashMap<String, String>();
+
+            if (StringUtils.isNotBlank(subTitle)) {
+                attributes.put("titleType", "Subtitle");
+                XmlWriterUtil.writeFullElementWithAttributes(xmlw, "title", attributes, subTitle);
+            }
+            if ((altTitles != null && !String.join("", altTitles).isBlank())) {
+                attributes.clear();
+                attributes.put("titleType", "AlternativeTitle");
+                for (String altTitle : altTitles) {
+                    XmlWriterUtil.writeFullElementWithAttributes(xmlw, "title", attributes, altTitle);
+                }
+            }
+            xmlw.writeEndElement();
+        }
+    }
+
+    /**
+     * 1, Identifier (with mandatory type sub-property) (M) Note DataCite expects
+     * identifierType="DOI" but OpenAire allows several others (see
+     * https://guidelines.readthedocs.io/en/latest/data/field_identifier.html#d-identifiertype)
+     * Dataverse is currently only capable of creating DOI, Handle, or URL types
+     * from the OpenAire list (the last from PermaLinks) ToDo - If we add,e.g., an
+     * ARK or PURL provider, this code has to change or we'll need to refactor so
+     * that the identifiertype and id value can be sent via the JSON/ORE
+     * 
+     * @param xmlw
+     *            The Steam writer
+     * @param dvObject
+     *            The dataset or file with the PID
+     * @throws XMLStreamException
+     */
+    private void writeIdentifier(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        GlobalId pid = dvObject.getGlobalId();
+        String identifierType = null;
+        String identifier = null;
+        switch (pid.getProtocol()) {
+        case AbstractDOIProvider.DOI_PROTOCOL:
+            identifierType = AbstractDOIProvider.DOI_PROTOCOL.toUpperCase();
+            identifier = pid.asRawIdentifier();
+            break;
+        case HandlePidProvider.HDL_PROTOCOL:
+            identifierType = "Handle";
+            identifier = pid.asRawIdentifier();
+            break;
+        case PermaLinkPidProvider.PERMA_PROTOCOL:
+            identifierType = "URL";
+            identifier = pid.asURL();
+            break;
+        }
+        Map<String, String> attributeMap = new HashMap<String, String>();
+        attributeMap.put("identifierType", identifierType);
+        XmlWriterUtil.writeFullElementWithAttributes(xmlw, "identifier", attributeMap, identifier);
+    }
+
+    /**
+     * 2, Creator (with optional given name, family name, name identifier and
+     * affiliation sub-properties) (M)
+     *
+     * @param xmlw
+     *            The stream writer
+     * @param authorList
+     *            - the list of authors
+     * @throws XMLStreamException
+     */
+    public void writeCreators(XMLStreamWriter xmlw, List<DatasetAuthor> authorList, boolean deaccessioned) throws XMLStreamException {
+        // creators -> creator -> creatorName with nameType attribute, givenName,
+        // familyName, nameIdentifier
+        // write all creators
+        xmlw.writeStartElement("creators"); // <creators>
+        if(deaccessioned) {
+            //skip the loop below
+            authorList = null;
+        }
+        boolean nothingWritten = true;
+        if (authorList != null && !authorList.isEmpty()) {
+            for (DatasetAuthor author : authorList) {
+                String creatorName = author.getName().getDisplayValue();
+                String affiliation = null;
+                if (author.getAffiliation() != null && !author.getAffiliation().getValue().isEmpty()) {
+                    affiliation = author.getAffiliation().getValue();
+                }
+                String nameIdentifier = null;
+                String nameIdentifierScheme = null;
+                if (StringUtils.isNotBlank(author.getIdValue()) && StringUtils.isNotBlank(author.getIdType())) {
+                    nameIdentifier = author.getIdValue();
+                    if (nameIdentifier != null) {
+                        // Normalizes to the URL form of the identifier, returns null if the identifier
+                        // is not valid given the type
+                        nameIdentifier = author.getIdentifierAsUrl();
+                    }
+                    nameIdentifierScheme = author.getIdType();
+                }
+
+                if (StringUtils.isNotBlank(creatorName)) {
+                    JsonObject creatorObj = PersonOrOrgUtil.getPersonOrOrganization(creatorName, false,
+                            StringUtils.containsIgnoreCase(nameIdentifierScheme, "orcid"));
+                    nothingWritten = false;
+                    writeEntityElements(xmlw, "creator", null, creatorObj, affiliation, nameIdentifier, nameIdentifierScheme);
+                }
+
+                
+            }
+        }
+        if (nothingWritten) {
+            // Authors unavailable
+            xmlw.writeStartElement("creator");
+            XmlWriterUtil.writeFullElement(xmlw, "creatorName", AbstractPidProvider.UNAVAILABLE);
+            xmlw.writeEndElement();
+        }
+        xmlw.writeEndElement(); // </creators>
+    }
+
+    private void writePublisher(XMLStreamWriter xmlw, DvObject dvObject, boolean deaccessioned) throws XMLStreamException {
+        // publisher should already be non null - :unav if it wasn't available
+        if(deaccessioned) {
+            doiMetadata.setPublisher(AbstractPidProvider.UNAVAILABLE);
+        }
+        XmlWriterUtil.writeFullElement(xmlw, "publisher", doiMetadata.getPublisher());
+    }
+
+    private void writePublicationYear(XMLStreamWriter xmlw, DvObject dvObject, boolean deaccessioned) throws XMLStreamException {
+        // Can't use "UNKNOWN" here because DataCite will respond with "[facet
+        // 'pattern'] the value 'unknown' is not accepted by the pattern '[\d]{4}'"
+        String pubYear = "9999";
+        // FIXME: Investigate why this.publisherYear is sometimes null now that pull
+        // request #4606 has been merged.
+        if (! deaccessioned && (doiMetadata.getPublisherYear() != null)) {
+            // Added to prevent a NullPointerException when trying to destroy datasets when
+            // using DataCite rather than EZID.
+            pubYear = doiMetadata.getPublisherYear();
+        }
+        XmlWriterUtil.writeFullElement(xmlw, "publicationYear", String.valueOf(pubYear));
+    }
+
+    /**
+     * 6, Subject (with scheme sub-property) R
+     *
+     * @param xmlw
+     *            The Steam writer
+     * @param dvObject
+     *            The Dataset/DataFile
+     * @throws XMLStreamException
+     */
+    private void writeSubjects(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        // subjects -> subject with subjectScheme and schemeURI attributes when
+        // available
+        boolean subjectsCreated = false;
+        List<String> subjects = new ArrayList<String>();
+        List<DatasetFieldCompoundValue> compoundKeywords = new ArrayList<DatasetFieldCompoundValue>();
+        List<DatasetFieldCompoundValue> compoundTopics = new ArrayList<DatasetFieldCompoundValue>();
+        // Dataset Subject= Dataverse subject, keyword, and/or topic classification
+        // fields
+        if (dvObject instanceof Dataset d) {
+            DatasetVersion dv = d.getLatestVersionForCopy();
+            for (DatasetField dsf : dv.getDatasetFields()) {
+                if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.subject)) {
+                    subjects.addAll(dsf.getValues());
+                }
+                if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.keyword)) {
+                    compoundKeywords = dsf.getDatasetFieldCompoundValues();
+                } else if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.topicClassification)) {
+                    compoundTopics = dsf.getDatasetFieldCompoundValues();
+                }
+            }
+
+        } else if (dvObject instanceof DataFile df) {
+            subjects = df.getTagLabels();
+        }
+        for (String subject : subjects) {
+            if (StringUtils.isNotBlank(subject)) {
+                subjectsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "subjects", subjectsCreated);
+                XmlWriterUtil.writeFullElement(xmlw, "subject", StringEscapeUtils.escapeXml10(subject));
+            }
+        }
+        for (DatasetFieldCompoundValue keywordFieldValue : compoundKeywords) {
+            String keyword = null;
+            String scheme = null;
+            String schemeUri = null;
+
+            for (DatasetField subField : keywordFieldValue.getChildDatasetFields()) {
+                switch (subField.getDatasetFieldType().getName()) {
+                case DatasetFieldConstant.keywordValue:
+                    keyword = subField.getValue();
+                    break;
+                case DatasetFieldConstant.keywordVocab:
+                    scheme = subField.getValue();
+                    break;
+                case DatasetFieldConstant.keywordVocabURI:
+                    schemeUri = subField.getValue();
+                    break;
+                }
+            }
+            if (StringUtils.isNotBlank(keyword)) {
+                Map<String, String> attributesMap = new HashMap<String, String>();
+                if (StringUtils.isNotBlank(scheme)) {
+                    attributesMap.put("subjectScheme", scheme);
+                }
+                if (StringUtils.isNotBlank(schemeUri)) {
+                    attributesMap.put("schemeURI", schemeUri);
+                }
+                subjectsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "subjects", subjectsCreated);
+                XmlWriterUtil.writeFullElementWithAttributes(xmlw, "subject", attributesMap, StringEscapeUtils.escapeXml10(keyword));
+            }
+        }
+        for (DatasetFieldCompoundValue topicFieldValue : compoundTopics) {
+            String topic = null;
+            String scheme = null;
+            String schemeUri = null;
+
+            for (DatasetField subField : topicFieldValue.getChildDatasetFields()) {
+
+                switch (subField.getDatasetFieldType().getName()) {
+                case DatasetFieldConstant.topicClassValue:
+                    topic = subField.getValue();
+                    break;
+                case DatasetFieldConstant.topicClassVocab:
+                    scheme = subField.getValue();
+                    break;
+                case DatasetFieldConstant.topicClassVocabURI:
+                    schemeUri = subField.getValue();
+                    break;
+                }
+            }
+            if (StringUtils.isNotBlank(topic)) {
+                Map<String, String> attributesMap = new HashMap<String, String>();
+                if (StringUtils.isNotBlank(scheme)) {
+                    attributesMap.put("subjectScheme", scheme);
+                }
+                if (StringUtils.isNotBlank(schemeUri)) {
+                    attributesMap.put("schemeURI", schemeUri);
+                }
+                subjectsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "subjects", subjectsCreated);
+                XmlWriterUtil.writeFullElementWithAttributes(xmlw, "subject", attributesMap, StringEscapeUtils.escapeXml10(topic));
+            }
+        }
+        if (subjectsCreated) {
+            xmlw.writeEndElement();
+        }
+    }
+
+    /**
+     * 7, Contributor (with optional given name, family name, name identifier and
+     * affiliation sub-properties)
+     *
+     * @see #writeContributorElement(javax.xml.stream.XMLStreamWriter,
+     *      java.lang.String, java.lang.String, java.lang.String)
+     *
+     * @param xmlw
+     *            The stream writer
+     * @param dvObject
+     *            The Dataset/DataFile
+     * @throws XMLStreamException
+     */
+    private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        boolean contributorsCreated = false;
+        List<DatasetFieldCompoundValue> compoundProducers = new ArrayList<DatasetFieldCompoundValue>();
+        List<DatasetFieldCompoundValue> compoundDistributors = new ArrayList<DatasetFieldCompoundValue>();
+        List<DatasetFieldCompoundValue> compoundContacts = new ArrayList<DatasetFieldCompoundValue>();
+        List<DatasetFieldCompoundValue> compoundContributors = new ArrayList<DatasetFieldCompoundValue>();
+        // Dataset Subject= Dataverse subject, keyword, and/or topic classification
+        // fields
+        // ToDo Include for files?
+        /*
+         * if(dvObject instanceof DataFile df) { dvObject = df.getOwner(); }
+         */
+
+        if (dvObject instanceof Dataset d) {
+            DatasetVersion dv = d.getLatestVersionForCopy();
+            for (DatasetField dsf : dv.getDatasetFields()) {
+                switch (dsf.getDatasetFieldType().getName()) {
+                case DatasetFieldConstant.producer:
+                    compoundProducers = dsf.getDatasetFieldCompoundValues();
+                    break;
+                case DatasetFieldConstant.distributor:
+                    compoundDistributors = dsf.getDatasetFieldCompoundValues();
+                    break;
+                case DatasetFieldConstant.datasetContact:
+                    compoundContacts = dsf.getDatasetFieldCompoundValues();
+                    break;
+                case DatasetFieldConstant.contributor:
+                    compoundContributors = dsf.getDatasetFieldCompoundValues();
+                }
+            }
+        }
+
+        for (DatasetFieldCompoundValue producerFieldValue : compoundProducers) {
+            String producer = null;
+            String affiliation = null;
+
+            for (DatasetField subField : producerFieldValue.getChildDatasetFields()) {
+
+                switch (subField.getDatasetFieldType().getName()) {
+                case DatasetFieldConstant.producerName:
+                    producer = subField.getValue();
+                    break;
+                case DatasetFieldConstant.producerAffiliation:
+                    affiliation = subField.getValue();
+                    break;
+                }
+            }
+            if (StringUtils.isNotBlank(producer)) {
+                contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated);
+                JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(producer, false, false);
+                writeEntityElements(xmlw, "contributor", "Producer", entityObject, affiliation, null, null);
+            }
+
+        }
+
+        for (DatasetFieldCompoundValue distributorFieldValue : compoundDistributors) {
+            String distributor = null;
+            String affiliation = null;
+
+            for (DatasetField subField : distributorFieldValue.getChildDatasetFields()) {
+
+                switch (subField.getDatasetFieldType().getName()) {
+                case DatasetFieldConstant.distributorName:
+                    distributor = subField.getValue();
+                    break;
+                case DatasetFieldConstant.distributorAffiliation:
+                    affiliation = subField.getValue();
+                    break;
+                }
+            }
+            if (StringUtils.isNotBlank(distributor)) {
+                contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated);
+                JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(distributor, false, false);
+                writeEntityElements(xmlw, "contributor", "Distributor", entityObject, affiliation, null, null);
+            }
+
+        }
+        for (DatasetFieldCompoundValue contactFieldValue : compoundContacts) {
+            String contact = null;
+            String affiliation = null;
+
+            for (DatasetField subField : contactFieldValue.getChildDatasetFields()) {
+
+                switch (subField.getDatasetFieldType().getName()) {
+                case DatasetFieldConstant.datasetContactName:
+                    contact = subField.getValue();
+                    break;
+                case DatasetFieldConstant.datasetContactAffiliation:
+                    affiliation = subField.getValue();
+                    break;
+                }
+            }
+            if (StringUtils.isNotBlank(contact)) {
+                contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated);
+                JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(contact, false, false);
+                writeEntityElements(xmlw, "contributor", "ContactPerson", entityObject, affiliation, null, null);
+            }
+
+        }
+        for (DatasetFieldCompoundValue contributorFieldValue : compoundContributors) {
+            String contributor = null;
+            String contributorType = null;
+
+            for (DatasetField subField : contributorFieldValue.getChildDatasetFields()) {
+
+                switch (subField.getDatasetFieldType().getName()) {
+                    case DatasetFieldConstant.contributorName:
+                        contributor = subField.getValue();
+                        break;
+                    case DatasetFieldConstant.contributorType:
+                        contributorType = subField.getValue();
+                        if (contributorType != null) {
+                            contributorType = contributorType.replace(" ", "");
+                        }
+                        break;
+                }
+            }
+            // QDR - doesn't have Funder in the contributor type list.
+            // Using a string isn't i18n
+            if (StringUtils.isNotBlank(contributor) && !StringUtils.equalsIgnoreCase("Funder", contributorType)) {
+                contributorType = getCanonicalContributorType(contributorType);
+                contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated);
+                JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(contributor, false, false);
+                writeEntityElements(xmlw, "contributor", contributorType, entityObject, null, null, null);
+            }
+
+        }
+
+        if (contributorsCreated) {
+            xmlw.writeEndElement();
+        }
+    }
+
+    //List from https://schema.datacite.org/meta/kernel-4/include/datacite-contributorType-v4.xsd
+    private Set<String> contributorTypes = new HashSet<>(Arrays.asList("ContactPerson", "DataCollector", "DataCurator", "DataManager", "Distributor", "Editor", 
+                "HostingInstitution", "Other", "Producer", "ProjectLeader", "ProjectManager", "ProjectMember", "RegistrationAgency", "RegistrationAuthority", 
+                "RelatedPerson", "ResearchGroup", "RightsHolder", "Researcher", "Sponsor", "Supervisor", "WorkPackageLeader"));
+
+    private String getCanonicalContributorType(String contributorType) {
+        if(StringUtils.isBlank(contributorType) || !contributorTypes.contains(contributorType)) {
+            return "Other";
+        }
+        return contributorType;
+    }
+
+    private void writeEntityElements(XMLStreamWriter xmlw, String elementName, String type, JsonObject entityObject, String affiliation, String nameIdentifier, String nameIdentifierScheme) throws XMLStreamException {
+        xmlw.writeStartElement(elementName);
+        Map<String, String> attributeMap = new HashMap<String, String>();
+        if (StringUtils.isNotBlank(type)) {
+            xmlw.writeAttribute("contributorType", type);
+        }
+        // person name=<FamilyName>, <FirstName>
+        if (entityObject.getBoolean("isPerson")) {
+            attributeMap.put("nameType", "Personal");
+        } else {
+            attributeMap.put("nameType", "Organizational");
+        }
+        XmlWriterUtil.writeFullElementWithAttributes(xmlw, elementName + "Name", attributeMap,
+                StringEscapeUtils.escapeXml10(entityObject.getString("fullName")));
+        if (entityObject.containsKey("givenName")) {
+            XmlWriterUtil.writeFullElement(xmlw, "givenName", StringEscapeUtils.escapeXml10(entityObject.getString("givenName")));
+        }
+        if (entityObject.containsKey("familyName")) {
+            XmlWriterUtil.writeFullElement(xmlw, "familyName", StringEscapeUtils.escapeXml10(entityObject.getString("familyName")));
+        }
+
+        if (nameIdentifier != null) {
+            attributeMap.clear();
+            URL url;
+            try {
+                url = new URL(nameIdentifier);
+                String protocol = url.getProtocol();
+                String authority = url.getAuthority();
+                String site = String.format("%s://%s", protocol, authority);
+                attributeMap.put("schemeURI", site);
+                attributeMap.put("nameIdentifierScheme", nameIdentifierScheme);
+                XmlWriterUtil.writeFullElementWithAttributes(xmlw, "nameIdentifier", attributeMap, nameIdentifier);
+            } catch (MalformedURLException e) {
+                logger.warning("DatasetAuthor.getIdentifierAsUrl returned a Malformed URL: " + nameIdentifier);
+            }
+        }
+
+        if (StringUtils.isNotBlank(affiliation)) {
+            attributeMap.clear();
+            boolean isROR=false;
+            String orgName = affiliation;
+            ExternalIdentifier externalIdentifier = ExternalIdentifier.ROR;
+            if (externalIdentifier.isValidIdentifier(orgName)) {
+                isROR = true;
+                JsonObject jo = getExternalVocabularyValue(orgName);
+                if (jo != null) {
+                    orgName = jo.getString("termName");
+                }
+            }
+          
+            if (isROR) {
+
+                attributeMap.put("schemeURI", "https://ror.org");
+                attributeMap.put("affiliationIdentifierScheme", "ROR");
+                attributeMap.put("affiliationIdentifier", affiliation);
+            }
+
+            XmlWriterUtil.writeFullElementWithAttributes(xmlw, "affiliation", attributeMap, StringEscapeUtils.escapeXml10(orgName));
+        }
+        xmlw.writeEndElement();
+    }
+
+    private JsonObject getExternalVocabularyValue(String id) {
+        return CDI.current().select(DatasetFieldServiceBean.class).get().getExternalVocabularyValue(id);
+    }
+
+    /**
+     * 8, Date (with type sub-property) (R)
+     *
+     * @param xmlw
+     *            The Steam writer
+     * @param dvObject
+     *            The dataset/datafile
+     * @throws XMLStreamException
+     */
+    private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        boolean datesWritten = false;
+        String dateOfDistribution = null;
+        String dateOfProduction = null;
+        String dateOfDeposit = null;
+        Date releaseDate = null;
+        String publicationDate = null;
+        boolean isAnUpdate=false;
+        List<DatasetFieldCompoundValue> datesOfCollection = new ArrayList<DatasetFieldCompoundValue>();
+        List<DatasetFieldCompoundValue> timePeriods = new ArrayList<DatasetFieldCompoundValue>();
+
+        if (dvObject instanceof DataFile df) {
+            // Find the first released version the file is in to give a published date
+            List<FileMetadata> fmds = df.getFileMetadatas();
+            DatasetVersion initialVersion = null;
+            for (FileMetadata fmd : fmds) {
+                DatasetVersion dv = fmd.getDatasetVersion();
+                if (dv.isReleased()) {
+                    initialVersion = dv;
+                    publicationDate = Util.getDateFormat().format(dv.getReleaseTime());
+                    break;
+                }
+            }
+            // And the last update is the most recent
+            for (int i = fmds.size() - 1; i >= 0; i--) {
+                DatasetVersion dv = fmds.get(i).getDatasetVersion();
+                if (dv.isReleased() && !dv.equals(initialVersion)) {
+                    releaseDate = dv.getReleaseTime();
+                    isAnUpdate=true;
+                    break;
+                }
+            }
+        } else if (dvObject instanceof Dataset d) {
+            DatasetVersion dv = d.getLatestVersionForCopy();
+            Long versionNumber = dv.getVersionNumber();
+            if (versionNumber != null && !(versionNumber.equals(1L) && dv.getMinorVersionNumber().equals(0L))) {
+                isAnUpdate = true;
+            }
+            releaseDate = dv.getReleaseTime();
+            publicationDate = d.getPublicationDateFormattedYYYYMMDD();
+            for (DatasetField dsf : dv.getDatasetFields()) {
+                switch (dsf.getDatasetFieldType().getName()) {
+                case DatasetFieldConstant.distributionDate:
+                    dateOfDistribution = dsf.getValue();
+                    break;
+                case DatasetFieldConstant.productionDate:
+                    dateOfProduction = dsf.getValue();
+                    break;
+                case DatasetFieldConstant.dateOfDeposit:
+                    dateOfDeposit = dsf.getValue();
+                    break;
+                case DatasetFieldConstant.dateOfCollection:
+                    datesOfCollection = dsf.getDatasetFieldCompoundValues();
+                    break;
+                case DatasetFieldConstant.timePeriodCovered:
+                    timePeriods = dsf.getDatasetFieldCompoundValues();
+                    break;
+                }
+            }
+        }
+        Map<String, String> attributes = new HashMap<String, String>();
+        if (StringUtils.isNotBlank(dateOfDistribution)) {
+            datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten);
+            attributes.put("dateType", "Issued");
+            XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, dateOfDistribution);
+        }
+        // dates -> date with dateType attribute
+
+        if (StringUtils.isNotBlank(dateOfProduction)) {
+            datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten);
+            attributes.put("dateType", "Created");
+            XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, dateOfProduction);
+        }
+        if (StringUtils.isNotBlank(dateOfDeposit)) {
+            datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten);
+            attributes.put("dateType", "Submitted");
+            XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, dateOfDeposit);
+        }
+
+        if (publicationDate != null) {
+            datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten);
+
+            attributes.put("dateType", "Available");
+            XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, publicationDate);
+        }
+        if (isAnUpdate) {
+            String date = Util.getDateFormat().format(releaseDate);
+            datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten);
+
+            attributes.put("dateType", "Updated");
+            XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, date);
+        }
+        if (datesOfCollection != null) {
+            for (DatasetFieldCompoundValue collectionDateFieldValue : datesOfCollection) {
+                String startDate = null;
+                String endDate = null;
+
+                for (DatasetField subField : collectionDateFieldValue.getChildDatasetFields()) {
+                    switch (subField.getDatasetFieldType().getName()) {
+                    case DatasetFieldConstant.dateOfCollectionStart:
+                        startDate = subField.getValue();
+                        break;
+                    case DatasetFieldConstant.dateOfCollectionEnd:
+                        endDate = subField.getValue();
+                        break;
+                    }
+                }
+                // Minimal clean-up - useful? Parse/format would remove unused chars, and an
+                // exception would clear the date so we don't send nonsense
+                startDate = cleanUpDate(startDate);
+                endDate = cleanUpDate(endDate);
+                if (StringUtils.isNotBlank(startDate) || StringUtils.isNotBlank(endDate)) {
+                    datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten);
+                    attributes.put("dateType", "Collected");
+                    XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, (startDate + "/" + endDate).trim());
+                }
+            }
+        }
+        if (timePeriods != null) {
+            for (DatasetFieldCompoundValue timePeriodFieldValue : timePeriods) {
+                String startDate = null;
+                String endDate = null;
+
+                for (DatasetField subField : timePeriodFieldValue.getChildDatasetFields()) {
+                    switch (subField.getDatasetFieldType().getName()) {
+                    case DatasetFieldConstant.timePeriodCoveredStart:
+                        startDate = subField.getValue();
+                        break;
+                    case DatasetFieldConstant.timePeriodCoveredEnd:
+                        endDate = subField.getValue();
+                        break;
+                    }
+                }
+                // Minimal clean-up - useful? Parse/format would remove unused chars, and an
+                // exception would clear the date so we don't send nonsense
+                startDate = cleanUpDate(startDate);
+                endDate = cleanUpDate(endDate);
+                if (StringUtils.isNotBlank(startDate) || StringUtils.isNotBlank(endDate)) {
+                    datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten);
+                    attributes.put("dateType", "Other");
+                    attributes.put("dateInformation", "Time period covered by the data");
+                    XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, (startDate + "/" + endDate).trim());
+                }
+            }
+        }
+        if (datesWritten) {
+            xmlw.writeEndElement();
+        }
+    }
+
+    private String cleanUpDate(String date) {
+        String newDate = null;
+        if (!StringUtils.isBlank(date)) {
+            try {
+                SimpleDateFormat sdf = Util.getDateFormat();
+                Date start = sdf.parse(date);
+                newDate = sdf.format(start);
+            } catch (ParseException e) {
+                logger.warning("Could not parse date: " + date);
+            }
+        }
+        return newDate;
+    }
+
+    // 9, Language (MA), language
+    private void writeLanguage(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        // Currently not supported. Spec indicates one 'primary' language. Could send
+        // the first entry in DatasetFieldConstant.language or send iff there is only
+        // one entry, and/or default to the machine's default lang, or the dataverse metadatalang?
+        return;
+    }
+
+    // 10, ResourceType (with mandatory general type
+    // description sub- property) (M)
+    private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        List<String> kindOfDataValues = new ArrayList<String>();
+        Map<String, String> attributes = new HashMap<String, String>();
+        String resourceType = "Dataset";
+        if (dvObject instanceof Dataset dataset) {
+            String datasetTypeName = dataset.getDatasetType().getName();
+            resourceType = switch (datasetTypeName) {
+            case DatasetType.DATASET_TYPE_DATASET -> "Dataset";
+            case DatasetType.DATASET_TYPE_SOFTWARE -> "Software";
+            case DatasetType.DATASET_TYPE_WORKFLOW -> "Workflow";
+            default -> "Dataset";
+            };
+        }
+        attributes.put("resourceTypeGeneral", resourceType);
+        if (dvObject instanceof Dataset d) {
+            DatasetVersion dv = d.getLatestVersionForCopy();
+            for (DatasetField dsf : dv.getDatasetFields()) {
+                switch (dsf.getDatasetFieldType().getName()) {
+                case DatasetFieldConstant.kindOfData:
+                    List<String> vals = dsf.getValues();
+                    for(String val: vals) {
+                        if(StringUtils.isNotBlank(val)) {
+                            kindOfDataValues.add(val);
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+        if (!kindOfDataValues.isEmpty()) {
+            XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, String.join(";", kindOfDataValues));
+
+        } else {
+            // Write an attribute only element if there are no kindOfData values.
+            xmlw.writeStartElement("resourceType");
+            xmlw.writeAttribute("resourceTypeGeneral", attributes.get("resourceTypeGeneral"));
+            xmlw.writeEndElement();
+        }
+
+    }
+
+    /**
+     * 11 AlternateIdentifier (with type sub-property) (O)
+     *
+     * @param xmlw
+     *            The Steam writer
+     * @param dvObject
+     *            The dataset/datafile
+     * @throws XMLStreamException
+     */
+    private void writeAlternateIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        List<DatasetFieldCompoundValue> otherIdentifiers = new ArrayList<DatasetFieldCompoundValue>();
+        Set<AlternativePersistentIdentifier> altPids = dvObject.getAlternativePersistentIndentifiers();
+
+        boolean alternatesWritten = false;
+
+        Map<String, String> attributes = new HashMap<String, String>();
+        if (dvObject instanceof Dataset d) {
+            DatasetVersion dv = d.getLatestVersionForCopy();
+            for (DatasetField dsf : dv.getDatasetFields()) {
+                if (DatasetFieldConstant.otherId.equals(dsf.getDatasetFieldType().getName())) {
+                    otherIdentifiers = dsf.getDatasetFieldCompoundValues();
+                    break;
+                }
+            }
+        }
+
+        if (altPids != null && !altPids.isEmpty()) {
+            alternatesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "alternateIdentifiers", alternatesWritten);
+            for (AlternativePersistentIdentifier altPid : altPids) {
+                String identifierType = null;
+                String identifier = null;
+                switch (altPid.getProtocol()) {
+                case AbstractDOIProvider.DOI_PROTOCOL:
+                    identifierType = AbstractDOIProvider.DOI_PROTOCOL.toUpperCase();
+                    identifier = altPid.getAuthority() + "/" + altPid.getIdentifier();
+                    break;
+                case HandlePidProvider.HDL_PROTOCOL:
+                    identifierType = "Handle";
+                    identifier = altPid.getAuthority() + "/" + altPid.getIdentifier();
+                    break;
+                default:
+                    // The AlternativePersistentIdentifier class isn't really ready for anything but
+                    // doi or handle pids, but will add this as a default.
+                    identifierType = ":unav";
+                    identifier = altPid.getAuthority() + altPid.getIdentifier();
+                    break;
+                }
+                attributes.put("alternateIdentifierType", identifierType);
+                XmlWriterUtil.writeFullElementWithAttributes(xmlw, "alternateIdentifier", attributes, identifier);
+
+            }
+        }
+
+        for (DatasetFieldCompoundValue otherIdentifier : otherIdentifiers) {
+            String identifierType = null;
+            String identifier = null;
+            for (DatasetField subField : otherIdentifier.getChildDatasetFields()) {
+                identifierType = ":unav";
+                switch (subField.getDatasetFieldType().getName()) {
+                case DatasetFieldConstant.otherIdAgency:
+                    identifierType = subField.getValue();
+                    break;
+                case DatasetFieldConstant.otherIdValue:
+                    identifier = subField.getValue();
+                    break;
+                }
+            }
+            attributes.put("alternateIdentifierType", identifierType);
+            if (!StringUtils.isBlank(identifier)) {
+                alternatesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "alternateIdentifiers", alternatesWritten);
+
+                XmlWriterUtil.writeFullElementWithAttributes(xmlw, "alternateIdentifier", attributes, identifier);
+            }
+        }
+        if (alternatesWritten) {
+            xmlw.writeEndElement();
+        }
+    }
+
+    /**
+     * 12, RelatedIdentifier (with type and relation type sub-properties) (R)
+     *
+     * @param xmlw
+     *            The Steam writer
+     * @param dvObject
+     *            the dataset/datafile
+     * @throws XMLStreamException
+     */
+    private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+
+        boolean relatedIdentifiersWritten = false;
+
+        Map<String, String> attributes = new HashMap<String, String>();
+
+        if (dvObject instanceof Dataset dataset) {
+            List<DatasetRelPublication> relatedPublications = dataset.getLatestVersionForCopy().getRelatedPublications();
+            if (!relatedPublications.isEmpty()) {
+                for (DatasetRelPublication relatedPub : relatedPublications) {
+                    attributes.clear();
+
+                    String pubIdType = relatedPub.getIdType();
+                    String identifier = relatedPub.getIdNumber();
+                    String url = relatedPub.getUrl();
+                    String relationType = relatedPub.getRelationType();
+                    if(StringUtils.isBlank(relationType)) {
+                        relationType = "IsSupplementTo";
+                    }
+                    /*
+                     * Note - with identifier and url fields, it's not clear that there's a single
+                     * way those two fields are used for all identifier types. The code here is
+                     * ~best effort to interpret those fields.
+                     */
+                    logger.fine("Found relpub: " + pubIdType + " " + identifier + " " + url);
+
+                    pubIdType = getCanonicalPublicationType(pubIdType);
+                    logger.fine("Canonical type: " + pubIdType);
+                    // Prefer identifier if set, otherwise check url
+                    String relatedIdentifier = identifier;
+                    if (StringUtils.isBlank(relatedIdentifier)) {
+                        relatedIdentifier = url;
+                    }
+                    logger.fine("Related identifier: " + relatedIdentifier);
+                    // For types where we understand the protocol, get the canonical form
+                    if (StringUtils.isNotBlank(relatedIdentifier)) {
+                        switch (pubIdType != null ? pubIdType : "none") {
+                        case "DOI":
+                            if (!(relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http"))) {
+                                relatedIdentifier = "doi:" + relatedIdentifier;
+                            }
+                            logger.fine("Intermediate Related identifier: " + relatedIdentifier);
+                            try {
+                                GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier);
+                                relatedIdentifier = pid.asRawIdentifier();
+                            } catch (IllegalArgumentException e) {
+                                logger.warning("Invalid DOI: " + e.getLocalizedMessage());
+                                relatedIdentifier = null;
+                            }
+                            logger.fine("Final Related identifier: " + relatedIdentifier);
+                            break;
+                        case "Handle":
+                            if (!relatedIdentifier.startsWith("hdl:") || !relatedIdentifier.startsWith("http")) {
+                                relatedIdentifier = "hdl:" + relatedIdentifier;
+                            }
+                            try {
+                                GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier);
+                                relatedIdentifier = pid.asRawIdentifier();
+                            } catch (IllegalArgumentException e) {
+                                relatedIdentifier = null;
+                            }
+                            break;
+                        case "URL":
+                            // If a URL is given, split the string to get a schemeUri
+                            try {
+                                URL relatedUrl = new URI(relatedIdentifier).toURL();
+                                String protocol = relatedUrl.getProtocol();
+                                String authority = relatedUrl.getAuthority();
+                                String site = String.format("%s://%s", protocol, authority);
+                                relatedIdentifier = relatedIdentifier.substring(site.length());
+                                attributes.put("schemeURI", site);
+                            } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) {
+                                // Just an identifier but without a pubIdType we won't include it
+                                logger.warning("Invalid Identifier of type URL: " + relatedIdentifier);
+                                relatedIdentifier = null;
+                            }
+                            break;
+                        case "none":
+                            //Try to identify PIDs and URLs and send them as related identifiers
+                            if (relatedIdentifier != null) {
+                                // See if it is a GlobalID we know
+                                try {
+                                    GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier);
+                                    relatedIdentifier = pid.asRawIdentifier();
+                                    pubIdType = getCanonicalPublicationType(pid.getProtocol());
+                                } catch (IllegalArgumentException e) {
+                                }
+                                // For non-URL types, if a URL is given, split the string to get a schemeUri
+                                try {
+                                    URL relatedUrl = new URI(relatedIdentifier).toURL();
+                                    String protocol = relatedUrl.getProtocol();
+                                    String authority = relatedUrl.getAuthority();
+                                    String site = String.format("%s://%s", protocol, authority);
+                                    relatedIdentifier = relatedIdentifier.substring(site.length());
+                                    attributes.put("schemeURI", site);
+                                    pubIdType = "URL";
+                                } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) {
+                                    // Just an identifier but without a pubIdType we won't include it
+                                    logger.warning("Related Identifier found without type: " + relatedIdentifier);
+                                    //Won't be sent since pubIdType is null - could also set relatedIdentifier to null
+                                }
+                            }
+                            break;
+                        default:
+                            //Some other valid type - we just send the identifier w/o optional attributes
+                            //To Do - validation for other types?
+                            break;
+                        }
+                    }
+                    if (StringUtils.isNotBlank(relatedIdentifier) && StringUtils.isNotBlank(pubIdType)) {
+                        // Still have a valid entry
+                        attributes.put("relatedIdentifierType", pubIdType);
+                        attributes.put("relationType", relationType);
+                        relatedIdentifiersWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "relatedIdentifiers", relatedIdentifiersWritten);
+                        XmlWriterUtil.writeFullElementWithAttributes(xmlw, "relatedIdentifier", attributes, relatedIdentifier);
+                    }
+                }
+            }
+            List<FileMetadata> fmds = dataset.getLatestVersionForCopy().getFileMetadatas();
+            if (!((fmds==null) && fmds.isEmpty())) {
+                attributes.clear();
+                attributes.put("relationType", "HasPart");
+                for (FileMetadata fmd : fmds) {
+                    DataFile dataFile = fmd.getDataFile();
+                    GlobalId pid = dataFile.getGlobalId();
+                    if (pid != null) {
+                        String pubIdType = getCanonicalPublicationType(pid.getProtocol());
+                        if (pubIdType != null) {
+                            attributes.put("relatedIdentifierType", pubIdType);
+                            relatedIdentifiersWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "relatedIdentifiers", relatedIdentifiersWritten);
+                            XmlWriterUtil.writeFullElementWithAttributes(xmlw, "relatedIdentifier", attributes, pid.asRawIdentifier());
+                        }
+                    }
+                }
+            }
+        } else if (dvObject instanceof DataFile df) {
+            GlobalId pid = df.getOwner().getGlobalId();
+            if (pid != null) {
+                String pubIdType = getCanonicalPublicationType(pid.getProtocol());
+                if (pubIdType != null) {
+
+                    attributes.clear();
+                    attributes.put("relationType", "IsPartOf");
+                    attributes.put("relatedIdentifierType", pubIdType);
+                    relatedIdentifiersWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "relatedIdentifiers", relatedIdentifiersWritten);
+                    XmlWriterUtil.writeFullElementWithAttributes(xmlw, "relatedIdentifier", attributes, pid.asRawIdentifier());
+                }
+            }
+        }
+        if (relatedIdentifiersWritten) {
+            xmlw.writeEndElement();
+        }
+    }
+
+    static HashMap<String, String> relatedIdentifierTypeMap = new HashMap<String, String>();
+
+    private static String getCanonicalPublicationType(String pubIdType) {
+        if (relatedIdentifierTypeMap.isEmpty()) {
+            relatedIdentifierTypeMap.put("ARK".toLowerCase(), "ARK");
+            relatedIdentifierTypeMap.put("arXiv", "arXiv");
+            relatedIdentifierTypeMap.put("bibcode".toLowerCase(), "bibcode");
+            relatedIdentifierTypeMap.put("DOI".toLowerCase(), "DOI");
+            relatedIdentifierTypeMap.put("EAN13".toLowerCase(), "EAN13");
+            relatedIdentifierTypeMap.put("EISSN".toLowerCase(), "EISSN");
+            relatedIdentifierTypeMap.put("Handle".toLowerCase(), "Handle");
+            relatedIdentifierTypeMap.put("IGSN".toLowerCase(), "IGSN");
+            relatedIdentifierTypeMap.put("ISBN".toLowerCase(), "ISBN");
+            relatedIdentifierTypeMap.put("ISSN".toLowerCase(), "ISSN");
+            relatedIdentifierTypeMap.put("ISTC".toLowerCase(), "ISTC");
+            relatedIdentifierTypeMap.put("LISSN".toLowerCase(), "LISSN");
+            relatedIdentifierTypeMap.put("LSID".toLowerCase(), "LSID");
+            relatedIdentifierTypeMap.put("PISSN".toLowerCase(), "PISSN");
+            relatedIdentifierTypeMap.put("PMID".toLowerCase(), "PMID");
+            relatedIdentifierTypeMap.put("PURL".toLowerCase(), "PURL");
+            relatedIdentifierTypeMap.put("UPC".toLowerCase(), "UPC");
+            relatedIdentifierTypeMap.put("URL".toLowerCase(), "URL");
+            relatedIdentifierTypeMap.put("URN".toLowerCase(), "URN");
+            relatedIdentifierTypeMap.put("WOS".toLowerCase(), "WOS");
+            // Add entry for Handle,Perma protocols so this can be used with GlobalId/getProtocol()
+            relatedIdentifierTypeMap.put("hdl".toLowerCase(), "Handle");
+            relatedIdentifierTypeMap.put("perma".toLowerCase(), "URL");
+            
+        }
+        return relatedIdentifierTypeMap.get(pubIdType);
+    }
+
+    private void writeSize(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        // sizes -> size
+        boolean sizesWritten = false;
+        List<DataFile> dataFiles = new ArrayList<DataFile>();
+
+        if (dvObject instanceof Dataset dataset) {
+            dataFiles = dataset.getFiles();
+        } else if (dvObject instanceof DataFile df) {
+            dataFiles.add(df);
+        }
+        if (dataFiles != null && !dataFiles.isEmpty()) {
+            for (DataFile dataFile : dataFiles) {
+                Long size = dataFile.getFilesize();
+                if (size != -1) {
+                    sizesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "sizes", sizesWritten);
+                    XmlWriterUtil.writeFullElement(xmlw, "size", size.toString());
+                }
+            }
+        }
+        if (sizesWritten) {
+            xmlw.writeEndElement();
+        }
+
+    }
+
+    private void writeFormats(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+
+        boolean formatsWritten = false;
+        List<DataFile> dataFiles = new ArrayList<DataFile>();
+
+        if (dvObject instanceof Dataset dataset) {
+            dataFiles = dataset.getFiles();
+        } else if (dvObject instanceof DataFile df) {
+            dataFiles.add(df);
+        }
+        if (dataFiles != null && !dataFiles.isEmpty()) {
+            for (DataFile dataFile : dataFiles) {
+                String format = dataFile.getContentType();
+                if (StringUtils.isNotBlank(format)) {
+                    formatsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "formats", formatsWritten);
+                    XmlWriterUtil.writeFullElement(xmlw, "format", format);
+                }
+                /*
+                 * Should original formats be sent? What about original sizes above?
+                 * if(dataFile.isTabularData()) { String originalFormat =
+                 * dataFile.getOriginalFileFormat(); if(StringUtils.isNotBlank(originalFormat))
+                 * { XmlWriterUtil.writeFullElement(xmlw, "format", format); } }
+                 */
+            }
+        }
+        if (formatsWritten) {
+            xmlw.writeEndElement();
+        }
+
+    }
+
+    private void writeVersion(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        Dataset d = null;
+        if (dvObject instanceof Dataset) {
+            d = (Dataset) dvObject;
+        } else if (dvObject instanceof DataFile) {
+            d = ((DataFile) dvObject).getOwner();
+        }
+        if (d != null) {
+            DatasetVersion dv = d.getLatestVersionForCopy();
+            String version = dv.getFriendlyVersionNumber();
+            if (StringUtils.isNotBlank(version)) {
+                XmlWriterUtil.writeFullElement(xmlw, "version", version);
+            }
+        }
+
+    }
+
+    private void writeAccessRights(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        // rightsList -> rights with rightsURI attribute
+        xmlw.writeStartElement("rightsList"); // <rightsList>
+
+        // set terms from the info:eu-repo-Access-Terms vocabulary
+        xmlw.writeStartElement("rights"); // <rights>
+        DatasetVersion dv = null;
+        boolean closed = false;
+        if (dvObject instanceof Dataset d) {
+            dv = d.getLatestVersionForCopy();
+            closed = dv.isHasRestrictedFile();
+        } else if (dvObject instanceof DataFile df) {
+            dv = df.getOwner().getLatestVersionForCopy();
+
+            closed = df.isRestricted();
+        }
+        TermsOfUseAndAccess terms = dv.getTermsOfUseAndAccess();
+        boolean requestsAllowed = terms.isFileAccessRequest();
+        License license = terms.getLicense();
+
+        if (requestsAllowed && closed) {
+            xmlw.writeAttribute("rightsURI", "info:eu-repo/semantics/restrictedAccess");
+        } else if (!requestsAllowed && closed) {
+            xmlw.writeAttribute("rightsURI", "info:eu-repo/semantics/closedAccess");
+        } else {
+            xmlw.writeAttribute("rightsURI", "info:eu-repo/semantics/openAccess");
+        }
+        xmlw.writeEndElement(); // </rights>
+        xmlw.writeStartElement("rights"); // <rights>
+        
+        if (license != null) {
+            xmlw.writeAttribute("rightsURI", license.getUri().toString());
+            String label = license.getShortDescription();
+            if(StringUtils.isBlank(label)) {
+                //Use name as a backup in case the license has no short description
+                label = license.getName();
+            }
+            
+            if (license.getRightsIdentifier() != null) {
+                xmlw.writeAttribute("rightsIdentifier", license.getRightsIdentifier());
+            }
+            if (license.getRightsIdentifierScheme() != null) {
+                xmlw.writeAttribute("rightsIdentifierScheme", license.getRightsIdentifierScheme());
+            }
+            if (license.getSchemeUri() != null) {
+                xmlw.writeAttribute("schemeURI", license.getSchemeUri());
+            }
+            String langCode = license.getLanguageCode();
+            if (StringUtils.isBlank(langCode)) {
+                langCode = "en";
+            }
+            xmlw.writeAttribute("xml:lang", langCode);
+            xmlw.writeCharacters(license.getShortDescription());
+
+        } else {
+            xmlw.writeAttribute("rightsURI", DatasetUtil.getLicenseURI(dv));
+            xmlw.writeCharacters(BundleUtil.getStringFromBundle("license.custom.description"));
+            ;
+        }
+        xmlw.writeEndElement(); // </rights>
+        xmlw.writeEndElement(); // </rightsList>
+    }
+
+    private void writeDescriptions(XMLStreamWriter xmlw, DvObject dvObject, boolean deaccessioned) throws XMLStreamException {
+        // descriptions -> description with descriptionType attribute
+        boolean descriptionsWritten = false;
+        List<String> descriptions = null;
+        DatasetVersion dv = null;
+        if(deaccessioned) {
+            descriptions = new ArrayList<String>();
+            descriptions.add(AbstractDOIProvider.UNAVAILABLE);
+        } else {
+            if (dvObject instanceof Dataset d) {
+                dv = d.getLatestVersionForCopy();
+                descriptions = dv.getDescriptions();
+            } else if (dvObject instanceof DataFile df) {
+                String description = df.getDescription();
+                if (description != null) {
+                    descriptions = new ArrayList<String>();
+                    descriptions.add(description);
+                }
+            }
+        }
+        Map<String, String> attributes = new HashMap<String, String>();
+        attributes.put("descriptionType", "Abstract");
+        if (descriptions != null) {
+            for (String description : descriptions) {
+                descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten);
+                XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, StringEscapeUtils.escapeXml10(description));
+            }
+        }
+
+        if (dv != null) {
+            List<DatasetField> dsfs = dv.getDatasetFields();
+
+            for (DatasetField dsf : dsfs) {
+
+                switch (dsf.getDatasetFieldType().getName()) {
+                    case DatasetFieldConstant.software:
+                        attributes.clear();
+                        attributes.put("descriptionType", "TechnicalInfo");
+                        List<DatasetFieldCompoundValue> dsfcvs = dsf.getDatasetFieldCompoundValues();
+                        for (DatasetFieldCompoundValue dsfcv : dsfcvs) {
+
+                            String softwareName = null;
+                            String softwareVersion = null;
+                            List<DatasetField> childDsfs = dsfcv.getChildDatasetFields();
+                            for (DatasetField childDsf : childDsfs) {
+                                if (DatasetFieldConstant.softwareName.equals(childDsf.getDatasetFieldType().getName())) {
+                                    softwareName = childDsf.getValue();
+                                } else if (DatasetFieldConstant.softwareVersion.equals(childDsf.getDatasetFieldType().getName())) {
+                                    softwareVersion = childDsf.getValue();
+                                }
+                            }
+                            if (StringUtils.isNotBlank(softwareName)) {
+                                if (StringUtils.isNotBlank(softwareVersion)) {
+                                    softwareName = softwareName + ", " + softwareVersion;
+                                }
+                                descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten);
+                                XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, softwareName);
+                            }
+                        }
+                        break;
+                    case DatasetFieldConstant.originOfSources:
+                    case DatasetFieldConstant.characteristicOfSources:
+                    case DatasetFieldConstant.accessToSources:
+                        attributes.clear();
+                        attributes.put("descriptionType", "Methods");
+                        String method = dsf.getValue();
+                        if (StringUtils.isNotBlank(method)) {
+                            descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten);
+                            XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, method);
+
+                        }
+                        break;
+                    case DatasetFieldConstant.series:
+                        attributes.clear();
+                        attributes.put("descriptionType", "SeriesInformation");
+                        dsfcvs = dsf.getDatasetFieldCompoundValues();
+                        for (DatasetFieldCompoundValue dsfcv : dsfcvs) {
+                            List<DatasetField> childDsfs = dsfcv.getChildDatasetFields();
+                            for (DatasetField childDsf : childDsfs) {
+
+                                if (DatasetFieldConstant.seriesName.equals(childDsf.getDatasetFieldType().getName())) {
+                                    String seriesInformation = childDsf.getValue();
+                                    if (StringUtils.isNotBlank(seriesInformation)) {
+                                        descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten);
+                                        XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, seriesInformation);
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                        break;
+                    case DatasetFieldConstant.notesText:
+                        attributes.clear();
+                        attributes.put("descriptionType", "Other");
+                        String notesText = dsf.getValue();
+                        if (StringUtils.isNotBlank(notesText)) {
+                            descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten);
+                            XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, notesText);
+                        }
+                        break;
+
+                }
+            }
+            String versionNote = dv.getVersionNote();
+            if(!StringUtils.isBlank(versionNote)) {
+                attributes.clear();
+                attributes.put("descriptionType", "TechnicalInfo");
+                descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten);
+                XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, versionNote);
+            }
+        }
+
+        if (descriptionsWritten) {
+            xmlw.writeEndElement(); // </descriptions>
+        }
+    }
+
+    private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        if (dvObject instanceof Dataset d) {
+            boolean geoLocationsWritten = false;
+            DatasetVersion dv = d.getLatestVersionForCopy();
+
+            List<String[]> places = dv.getGeographicCoverage();
+            if (places != null && !places.isEmpty()) {
+                // geoLocationPlace
+                geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocations", geoLocationsWritten);
+                for (String[] place : places) {
+                    xmlw.writeStartElement("geoLocation"); // <geoLocation>
+                    
+                    ArrayList<String> placeList = new ArrayList<String>();
+                    for (String placePart : place) {
+                        if (!StringUtils.isBlank(placePart)) {
+                            placeList.add(placePart);
+                        }
+                    }
+                    XmlWriterUtil.writeFullElement(xmlw, "geoLocationPlace", Strings.join(placeList, ", "));
+                    xmlw.writeEndElement(); // </geoLocation>
+                }
+                
+            }
+            boolean boundingBoxFound = false;
+            boolean productionPlaceFound = false;
+            for (DatasetField dsf : dv.getDatasetFields()) {
+                switch (dsf.getDatasetFieldType().getName()) {
+                case DatasetFieldConstant.geographicBoundingBox:
+                    boundingBoxFound = true;
+                    for (DatasetFieldCompoundValue dsfcv : dsf.getDatasetFieldCompoundValues()) {
+                        List<DatasetField> childDsfs = dsfcv.getChildDatasetFields();
+                        String nLatitude = null;
+                        String sLatitude = null;
+                        String eLongitude = null;
+                        String wLongitude = null;
+                        for (DatasetField childDsf : childDsfs) {
+                            switch (childDsf.getDatasetFieldType().getName()) {
+                            case DatasetFieldConstant.northLatitude:
+                                nLatitude = childDsf.getValue();
+                                break;
+                            case DatasetFieldConstant.southLatitude:
+                                sLatitude = childDsf.getValue();
+                                break;
+                            case DatasetFieldConstant.eastLongitude:
+                                eLongitude = childDsf.getValue();
+                                break;
+                            case DatasetFieldConstant.westLongitude:
+                                wLongitude = childDsf.getValue();
+
+                            }
+                        }
+                        if (StringUtils.isNoneBlank(wLongitude, eLongitude, nLatitude, sLatitude)) {
+                            geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocations", geoLocationsWritten);
+                            xmlw.writeStartElement("geoLocation"); // <geoLocation>
+                            if (wLongitude.equals(eLongitude) && nLatitude.equals(sLatitude)) {
+                                // A point
+                                xmlw.writeStartElement("geoLocationPoint");
+                                XmlWriterUtil.writeFullElement(xmlw, "pointLongitude", eLongitude);
+                                XmlWriterUtil.writeFullElement(xmlw, "pointLatitude", sLatitude);
+                                xmlw.writeEndElement();
+                            } else {
+                                // A box
+                                xmlw.writeStartElement("geoLocationBox");
+                                XmlWriterUtil.writeFullElement(xmlw, "westBoundLongitude", wLongitude);
+                                XmlWriterUtil.writeFullElement(xmlw, "eastBoundLongitude", eLongitude);
+                                XmlWriterUtil.writeFullElement(xmlw, "southBoundLatitude", sLatitude);
+                                XmlWriterUtil.writeFullElement(xmlw, "northBoundLatitude", nLatitude);
+                                xmlw.writeEndElement();
+
+                            }
+                            xmlw.writeEndElement(); // </geoLocation>
+                        }
+                    }
+                case DatasetFieldConstant.productionPlace:
+                    productionPlaceFound = true;
+                    // geoLocationPlace
+                    geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocations", geoLocationsWritten);
+                    List<String> prodPlaces = dsf.getValues();
+                    for (String prodPlace : prodPlaces) {
+                        xmlw.writeStartElement("geoLocation"); // <geoLocation>
+                        XmlWriterUtil.writeFullElement(xmlw, "geoLocationPlace", prodPlace);
+                        xmlw.writeEndElement(); // </geoLocation>
+                    }
+                    break;
+                }
+                if (boundingBoxFound && productionPlaceFound) {
+                    break;
+                }
+            }
+            if (geoLocationsWritten) {
+                xmlw.writeEndElement(); // <geoLocations>
+            }
+        }
+
+    }
+
+    private void writeFundingReferences(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException {
+        // fundingReferences -> fundingReference -> funderName, awardNumber
+        boolean fundingReferenceWritten = false;
+        DatasetVersion dv = null;
+        if (dvObject instanceof Dataset d) {
+            dv = d.getLatestVersionForCopy();
+        } else if (dvObject instanceof DataFile df) {
+            dv = df.getOwner().getLatestVersionForCopy();
+        }
+        if (dv != null) {
+            List<String> retList = new ArrayList<>();
+            for (DatasetField dsf : dv.getDatasetFields()) {
+                if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.contributor)) {
+                    boolean addFunder = false;
+                    for (DatasetFieldCompoundValue contributorValue : dsf.getDatasetFieldCompoundValues()) {
+                        String contributorName = null;
+                        String contributorType = null;
+                        for (DatasetField subField : contributorValue.getChildDatasetFields()) {
+                            if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.contributorName)) {
+                                contributorName = subField.getDisplayValue();
+                            }
+                            if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.contributorType)) {
+                                contributorType = subField.getRawValue();
+                            }
+                        }
+                        // SEK 02/12/2019 move outside loop to prevent contrib type to carry over to
+                        // next contributor
+                        // TODO: Consider how this will work in French, Chinese, etc.
+                        if ("Funder".equals(contributorType)) {
+                            if (!StringUtils.isBlank(contributorName)) {
+                                fundingReferenceWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "fundingReferences", fundingReferenceWritten);
+                                xmlw.writeStartElement("fundingReference"); // <fundingReference>
+                                XmlWriterUtil.writeFullElement(xmlw, "funderName", StringEscapeUtils.escapeXml10(contributorName));
+                                xmlw.writeEndElement(); // </fundingReference>
+                            }
+                        }
+                    }
+                }
+                if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.grantNumber)) {
+                    for (DatasetFieldCompoundValue grantObject : dsf.getDatasetFieldCompoundValues()) {
+                        String funder = null;
+                        String awardNumber = null;
+                        for (DatasetField subField : grantObject.getChildDatasetFields()) {
+                            // It would be nice to do something with grantNumberValue (the actual number)
+                            // but schema.org doesn't support it.
+                            if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.grantNumberAgency)) {
+                                String grantAgency = subField.getDisplayValue();
+                                funder = grantAgency;
+                            } else if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.grantNumberValue)) {
+                                String grantNumberValue = subField.getDisplayValue();
+                                awardNumber = grantNumberValue;
+                            }
+                        }
+                        if (!StringUtils.isBlank(funder)) {
+                            fundingReferenceWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "fundingReferences", fundingReferenceWritten);
+                            boolean isROR=false;
+                            String funderIdentifier = null;
+                            ExternalIdentifier externalIdentifier = ExternalIdentifier.ROR;
+                            if (externalIdentifier.isValidIdentifier(funder)) {
+                                isROR = true;
+                                JsonObject jo = getExternalVocabularyValue(funder);
+                                if (jo != null) {
+                                    funderIdentifier = funder;
+                                    funder = jo.getString("termName");
+                                }
+                            }
+                          
+                            xmlw.writeStartElement("fundingReference"); // <fundingReference>
+                            XmlWriterUtil.writeFullElement(xmlw, "funderName", StringEscapeUtils.escapeXml10(funder));
+                            if (isROR) {
+                                Map<String, String> attributeMap = new HashMap<>();
+                                attributeMap.put("schemeURI", "https://ror.org");
+                                attributeMap.put("funderIdentifierType", "ROR");
+                                XmlWriterUtil.writeFullElementWithAttributes(xmlw, "funderIdentifier", attributeMap, StringEscapeUtils.escapeXml10(funderIdentifier));
+                            }
+                            if (StringUtils.isNotBlank(awardNumber)) {
+                                XmlWriterUtil.writeFullElement(xmlw, "awardNumber", StringEscapeUtils.escapeXml10(awardNumber));
+                            }
+                            xmlw.writeEndElement(); // </fundingReference>
+                        }
+
+                    }
+                }
+            }
+
+            if (fundingReferenceWritten) {
+                xmlw.writeEndElement(); // </fundingReferences>
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProvider.java
new file mode 100644
index 00000000000..bd66759a5ec
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProvider.java
@@ -0,0 +1,125 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.crossref;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class CrossRefDOIProvider extends AbstractDOIProvider {
+    private static final Logger logger = Logger.getLogger(CrossRefDOIProvider.class.getCanonicalName());
+
+    public static final String TYPE = "crossref";
+
+    CrossRefDOIRegisterService crossRefDOIRegisterService;
+
+    public CrossRefDOIProvider(String id, String label, String providerAuthority, String providerShoulder, String identifierGenerationStyle, String datafilePidFormat, String managedList, String excludedList,
+                               String url, String apiUrl, String username, String password, String depositor, String depositorEmail) {
+        super(id, label, providerAuthority, providerShoulder, identifierGenerationStyle, datafilePidFormat,
+                managedList, excludedList);
+
+        crossRefDOIRegisterService = new CrossRefDOIRegisterService(url, apiUrl, username, password, depositor, depositorEmail);
+    }
+
+    @Override
+    public boolean alreadyRegistered(GlobalId pid, boolean noProviderDefault) {
+        logger.info("CrossRef alreadyRegistered");
+        if (pid == null || pid.asString().isEmpty()) {
+            logger.fine("No identifier sent.");
+            return false;
+        }
+        boolean alreadyExists;
+        String identifier = pid.asString();
+        try {
+            alreadyExists = crossRefDOIRegisterService.testDOIExists(identifier);
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "alreadyExists failed");
+            return false;
+        }
+        return alreadyExists;
+    }
+
+    @Override
+    public boolean registerWhenPublished() {
+        return true;
+    }
+
+    @Override
+    public List<String> getProviderInformation() {
+        return List.of("CrossRef", "https://status.crossref.org/");
+    }
+
+    @Override
+    public String createIdentifier(DvObject dvObject) throws Throwable {
+        logger.info("CrossRef createIdentifier");
+        if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) {
+            dvObject = generatePid(dvObject);
+        }
+        String identifier = getIdentifier(dvObject);
+        try {
+            String retString = crossRefDOIRegisterService.reserveIdentifier(identifier, dvObject);
+            logger.log(Level.FINE, "CrossRef create DOI identifier retString : " + retString);
+            return retString;
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "CrossRef Identifier not created: create failed", e);
+            throw e;
+        }
+    }
+
+    @Override
+    public Map<String, String> getIdentifierMetadata(DvObject dvObject) {
+        logger.info("CrossRef getIdentifierMetadata");
+        String identifier = getIdentifier(dvObject);
+        Map<String, String> metadata = new HashMap<>();
+        try {
+            metadata = crossRefDOIRegisterService.getMetadata(identifier);
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "getIdentifierMetadata failed", e);
+        }
+        return metadata;
+    }
+
+    @Override
+    public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception {
+        logger.info("CrossRef modifyIdentifier");
+        String identifier = getIdentifier(dvObject);
+        try {
+            crossRefDOIRegisterService.modifyIdentifier(identifier, dvObject);
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "modifyMetadata failed", e);
+            throw e;
+        }
+        return identifier;
+    }
+
+    @Override
+    public void deleteIdentifier(DvObject dvo) throws Exception {
+        logger.info("CrossRef deleteIdentifier");
+    }
+
+    @Override
+    public boolean publicizeIdentifier(DvObject dvObject) {
+        logger.info("CrossRef updateIdentifierStatus");
+        if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) {
+            dvObject = generatePid(dvObject);
+        }
+        String identifier = getIdentifier(dvObject);
+
+        try {
+            crossRefDOIRegisterService.reserveIdentifier(identifier, dvObject);
+            return true;
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "modifyMetadata failed: " + e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public String getProviderType() {
+        return TYPE;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java
new file mode 100644
index 00000000000..545212cc43c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java
@@ -0,0 +1,43 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.crossref;
+
+import com.google.auto.service.AutoService;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactory;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
+@AutoService(PidProviderFactory.class)
+public class CrossRefDOIProviderFactory implements PidProviderFactory {
+
+    @Override
+    public PidProvider createPidProvider(String providerId) {
+        String providerType = JvmSettings.PID_PROVIDER_TYPE.lookup(providerId);
+        if (!providerType.equals(CrossRefDOIProvider.TYPE)) {
+            // Being asked to create a non-CrossRef provider
+            return null;
+        }
+        String providerLabel = JvmSettings.PID_PROVIDER_LABEL.lookup(providerId);
+        String providerAuthority = JvmSettings.PID_PROVIDER_AUTHORITY.lookup(providerId);
+        String providerShoulder = JvmSettings.PID_PROVIDER_SHOULDER.lookupOptional(providerId).orElse("");
+        String identifierGenerationStyle = JvmSettings.PID_PROVIDER_IDENTIFIER_GENERATION_STYLE
+                .lookupOptional(providerId).orElse("randomString");
+        String datafilePidFormat = JvmSettings.PID_PROVIDER_DATAFILE_PID_FORMAT.lookupOptional(providerId)
+                .orElse(SystemConfig.DataFilePIDFormat.DEPENDENT.toString());
+        String managedList = JvmSettings.PID_PROVIDER_MANAGED_LIST.lookupOptional(providerId).orElse("");
+        String excludedList = JvmSettings.PID_PROVIDER_EXCLUDED_LIST.lookupOptional(providerId).orElse("");
+
+        String baseUrl = JvmSettings.CROSSREF_URL.lookup(providerId);
+        String apiUrl = JvmSettings.CROSSREF_REST_API_URL.lookup(providerId);
+        String username = JvmSettings.CROSSREF_USERNAME.lookup(providerId);
+        String password = JvmSettings.CROSSREF_PASSWORD.lookup(providerId);
+        String depositor = JvmSettings.CROSSREF_DEPOSITOR.lookup(providerId);
+        String depositorEmail = JvmSettings.CROSSREF_DEPOSITOR_EMAIL.lookup(providerId);
+
+        return new CrossRefDOIProvider(providerId, providerLabel, providerAuthority, providerShoulder, identifierGenerationStyle,
+                datafilePidFormat, managedList, excludedList, baseUrl, apiUrl, username, password, depositor, depositorEmail);
+    }
+
+    public String getType() {
+        return CrossRefDOIProvider.TYPE;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java
new file mode 100644
index 00000000000..825b18e7f4b
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java
@@ -0,0 +1,319 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.crossref;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.XmlMetadataTemplate;
+import jakarta.enterprise.inject.spi.CDI;
+import org.apache.commons.text.StringEscapeUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static edu.harvard.iq.dataverse.util.SystemConfig.getDataverseSiteUrlStatic;
+
+public class CrossRefDOIRegisterService implements java.io.Serializable {
+    private static final Logger logger = Logger.getLogger(CrossRefDOIRegisterService.class.getCanonicalName());
+
+    private final String url;
+    private final String apiUrl;
+    private final String username;
+    private final String password;
+    private final String depositor;
+    private final String depositorEmail;
+
+
+    private static DataverseServiceBean dataverseService = null;
+
+    private CrossRefRESTfullClient client = null;
+
+    public CrossRefDOIRegisterService(String url, String apiUrl, String username, String password, String depositor, String depositorEmail) {
+        this.url = url;
+        this.apiUrl = apiUrl;
+        this.username = username;
+        this.password = password;
+        this.depositor = depositor;
+        this.depositorEmail = depositorEmail;
+    }
+
+    private CrossRefRESTfullClient getClient() {
+        if (client == null) {
+            client = new CrossRefRESTfullClient(url, apiUrl, username, password);
+        }
+        return client;
+    }
+
+    public boolean testDOIExists(String identifier) {
+        boolean doiExists;
+        try {
+            CrossRefRESTfullClient client = getClient();
+            doiExists = client.testDOIExists(identifier.substring(identifier.indexOf(":") + 1));
+        } catch (Exception e) {
+            logger.log(Level.INFO, identifier, e);
+            return false;
+        }
+        return doiExists;
+    }
+
+    public HashMap<String, String> getMetadata(String identifier) throws IOException {
+        HashMap<String, String> metadata = new HashMap<>();
+        try {
+            CrossRefRESTfullClient client = getClient();
+            String jsonMetadata = client.getMetadata(identifier.substring(identifier.indexOf(":") + 1));
+            Map<String, Object> mappedJson = new ObjectMapper().readValue(jsonMetadata, HashMap.class);
+            logger.log(Level.FINE, jsonMetadata);
+            metadata.put("_status", mappedJson.get("status").toString());
+        } catch (RuntimeException e) {
+            logger.log(Level.INFO, identifier, e);
+        }
+        return metadata;
+    }
+
+    public String reserveIdentifier(String identifier, DvObject dvObject) throws IOException {
+        logger.fine("Crossref reserveIdentifier");
+        String xmlMetadata = getMetadataFromDvObject(identifier, dvObject);
+
+        CrossRefRESTfullClient client = getClient();
+        return client.postMetadata(xmlMetadata);
+    }
+
+    public void modifyIdentifier(String identifier, DvObject dvObject) throws IOException {
+        logger.fine("Crossref modifyIdentifier");
+        String xmlMetadata = getMetadataFromDvObject(identifier, dvObject);
+
+        CrossRefRESTfullClient client = getClient();
+        client.postMetadata(xmlMetadata);
+    }
+
+    public String getMetadataFromDvObject(String identifier, DvObject dvObject) {
+        Dataset dataset;
+
+        if (dvObject instanceof Dataset) {
+            dataset = (Dataset) dvObject;
+        } else {
+            dataset = (Dataset) dvObject.getOwner();
+        }
+        if (dataverseService == null) {
+            dataverseService = CDI.current().select(DataverseServiceBean.class).get();
+        }
+
+        CrossRefMetadataTemplate metadataTemplate = new CrossRefMetadataTemplate();
+        metadataTemplate.setIdentifier(identifier.substring(identifier.indexOf(':') + 1));
+        metadataTemplate.setAuthors(dataset.getLatestVersion().getDatasetAuthors());
+        metadataTemplate.setDepositor(depositor);
+        metadataTemplate.setDepositorEmail(depositorEmail);
+        metadataTemplate.setInstitution(dataverseService.getRootDataverseName());
+
+        String title = dvObject.getCurrentName();
+        if (dvObject.isInstanceofDataFile()) {
+            //Note file title is not currently escaped the way the dataset title is, so adding it here.
+            title = StringEscapeUtils.escapeXml10(title);
+        }
+
+        if (title.isEmpty() || title.equals(DatasetField.NA_VALUE)) {
+            title = AbstractPidProvider.UNAVAILABLE;
+        }
+
+        metadataTemplate.setTitle(title);
+
+        return metadataTemplate.generateXML();
+    }
+}
+
+class CrossRefMetadataTemplate {
+
+    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.edu.harvard.iq.dataverse.CrossRefMetadataTemplate");
+    private static String template;
+
+    static {
+        try (InputStream in = XmlMetadataTemplate.class.getResourceAsStream("crossref_metadata_template.xml")) {
+            template = CrossRefFileUtil.readAndClose(in, "utf-8");
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "crossref metadata template load error");
+            logger.log(Level.SEVERE, "String " + e);
+            logger.log(Level.SEVERE, "localized message " + e.getLocalizedMessage());
+            logger.log(Level.SEVERE, "cause " + e.getCause());
+            logger.log(Level.SEVERE, "message " + e.getMessage());
+        }
+    }
+
+    private final String timestamp = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+    private String institution;
+    private String depositor;
+    private String depositorEmail;
+    private String databaseTitle;
+    private String identifier;
+    private String title;
+    private final String baseUrl = getDataverseSiteUrlStatic();
+    private List<DatasetAuthor> authors;
+
+    public List<DatasetAuthor> getAuthors() {
+        return authors;
+    }
+
+    public void setAuthors(List<DatasetAuthor> authors) {
+        this.authors = authors;
+    }
+
+    public CrossRefMetadataTemplate() {
+    }
+
+    public String generateXML() {
+        String xmlMetadata = template.replace("${depositor}", depositor)
+                .replace("${depositorEmail}", depositorEmail)
+                .replace("${title}", title)
+                .replace("${institution}", institution)
+                .replace("${batchId}", identifier + " " + timestamp)
+                .replace("${timestamp}", timestamp);
+
+        StringBuilder datasetElement = new StringBuilder();
+        datasetElement.append("<dataset dataset_type=\"collection\">");
+
+        StringBuilder contributorsElement = new StringBuilder();
+        if (authors != null && !authors.isEmpty()) {
+            contributorsElement.append("<contributors>");
+            for (DatasetAuthor author : authors) {
+                contributorsElement.append("<person_name contributor_role=\"author\" sequence=\"first\"><given_name>");
+                contributorsElement.append(author.getName().getDisplayValue());
+                contributorsElement.append("</given_name><surname>");
+                contributorsElement.append(author.getName().getDisplayValue());
+                contributorsElement.append("</surname>");
+
+                if (author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) {
+                    contributorsElement.append("<affiliations><institution><institution_name>")
+                            .append(author.getAffiliation().getDisplayValue())
+                            .append("</institution_name></institution></affiliations>");
+                }
+
+                if (author.getIdType() != null &&
+                        author.getIdValue() != null &&
+                        !author.getIdType().isEmpty() &&
+                        !author.getIdValue().isEmpty() &&
+                        author.getAffiliation() != null &&
+                        !author.getAffiliation().getDisplayValue().isEmpty()) {
+                    if (author.getIdType().equals("ORCID")) {
+                        contributorsElement.append("<ORCID>").append("https://orcid.org/").append(author.getIdValue()).append("</ORCID>");
+                    }
+                    if (author.getIdType().equals("ISNI")) {
+                        contributorsElement.append("<ISNI>").append(author.getIdValue()).append("</ISNI>");
+                    }
+                    if (author.getIdType().equals("LCNA")) {
+                        contributorsElement.append("<LCNA>").append(author.getIdValue()).append("</LCNA>");
+                    }
+                }
+
+                contributorsElement.append("</person_name>");
+            }
+            contributorsElement.append("</contributors>");
+
+        } else {
+            contributorsElement.append("<contributors><person_name>")
+                    .append(AbstractPidProvider.UNAVAILABLE)
+                    .append("</person_name></contributors>");
+        }
+
+        datasetElement.append(contributorsElement);
+
+        datasetElement.append("<titles><title>")
+                .append(this.title)
+                .append("</title></titles>");
+
+        datasetElement.append("<doi_data><doi>")
+                .append(this.identifier)
+                .append("</doi><resource>")
+                .append(this.baseUrl).append("/dataset.xhtml?persistentId=doi:").append(this.identifier)
+                .append("</resource></doi_data>");
+
+        datasetElement.append("</dataset>");
+        xmlMetadata = xmlMetadata.replace("${datasets}", datasetElement.toString());
+        return xmlMetadata;
+    }
+
+    public static String getTemplate() {
+        return template;
+    }
+
+    public static void setTemplate(String template) {
+        CrossRefMetadataTemplate.template = template;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public String getDepositor() {
+        return depositor;
+    }
+
+    public void setDepositor(String depositor) {
+        this.depositor = depositor;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getInstitution() {
+        return institution;
+    }
+
+    public void setInstitution(String institution) {
+        this.institution = institution;
+    }
+
+    public String getDepositorEmail() {
+        return depositorEmail;
+    }
+
+    public void setDepositorEmail(String depositorEmail) {
+        this.depositorEmail = depositorEmail;
+    }
+
+    public String getDatabaseTitle() {
+        return databaseTitle;
+    }
+
+    public void setDatabaseTitle(String databaseTitle) {
+        this.databaseTitle = databaseTitle;
+    }
+}
+
+class CrossRefFileUtil {
+
+    public static void close(InputStream in) {
+        if (in != null) {
+            try {
+                in.close();
+            } catch (IOException e) {
+                throw new RuntimeException("Fail to close InputStream");
+            }
+        }
+    }
+
+    public static String readAndClose(InputStream inStream, String encoding) throws IOException {
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buf = new byte[128];
+        int cnt;
+        while ((cnt = inStream.read(buf)) >= 0) {
+            outStream.write(buf, 0, cnt);
+        }
+        return outStream.toString(encoding);
+    }
+}
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java
new file mode 100644
index 00000000000..ebdf875e664
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java
@@ -0,0 +1,119 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.crossref;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.HttpMultipartMode;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class CrossRefRESTfullClient implements Closeable {
+
+    private static final Logger logger = Logger.getLogger(CrossRefRESTfullClient.class.getCanonicalName());
+
+    private final String url;
+    private final String apiUrl;
+    private final String username;
+    private final String password;
+    private final CloseableHttpClient httpClient;
+    private final HttpClientContext context;
+    private final String encoding = "utf-8";
+
+    public CrossRefRESTfullClient(String url, String apiUrl, String username, String password) {
+        this.url = url;
+        this.apiUrl = apiUrl;
+        this.username = username;
+        this.password = password;
+        try {
+            context = HttpClientContext.create();
+            CredentialsProvider credsProvider = new BasicCredentialsProvider();
+            credsProvider.setCredentials(new AuthScope(null, -1),
+                    new UsernamePasswordCredentials(username, password));
+            context.setCredentialsProvider(credsProvider);
+
+            httpClient = HttpClients.createDefault();
+        } catch (Exception ioe) {
+            close();
+            logger.log(Level.SEVERE,"Fail to init Client",ioe);
+            throw new RuntimeException("Fail to init Client", ioe);
+        }
+    }
+
+    public void close() {
+        if (this.httpClient != null) {
+            try {
+                httpClient.close();
+            } catch (IOException io) {
+                logger.warning("IOException closing httpClient: " + io.getMessage());
+            }
+        }
+    }
+
+    public String getMetadata(String doi) {
+        HttpGet httpGet = new HttpGet(this.apiUrl + "/works/" + doi);
+        httpGet.setHeader("Accept", "application/json");
+        try {
+            HttpResponse response = httpClient.execute(httpGet);
+            String data = EntityUtils.toString(response.getEntity(), encoding);
+            if (response.getStatusLine().getStatusCode() != 200) {
+                String errMsg = "Response from getMetadata: " + response.getStatusLine().getStatusCode() + ", " + data;
+                logger.warning(errMsg);
+                throw new RuntimeException(errMsg);
+            }
+            return data;
+        } catch (IOException ioe) {
+            logger.warning("IOException when get metadata");
+            throw new RuntimeException("IOException when get metadata", ioe);
+        }
+    }
+
+    public String postMetadata(String xml) throws IOException {
+        HttpEntity entity = MultipartEntityBuilder.create()
+                .addTextBody("operation", "doMDUpload")
+                .addTextBody("login_id", username)
+                .addTextBody("login_passwd", password)
+                .addBinaryBody("fname", xml.getBytes(StandardCharsets.UTF_8), ContentType.APPLICATION_XML, "metadata.xml")
+                .setMode(HttpMultipartMode.BROWSER_COMPATIBLE)
+                .build();
+
+        HttpPost httpPost = new HttpPost(url + "/servlet/deposit");
+        httpPost.setHeader("Accept", "*/*");
+        httpPost.setEntity(entity);
+        HttpResponse response = httpClient.execute(httpPost);
+
+        String data = EntityUtils.toString(response.getEntity(), encoding);
+        if (response.getStatusLine().getStatusCode() != 200) {
+            String errMsg = "Response from postMetadata: " + response.getStatusLine().getStatusCode() + ", " + data;
+            logger.warning(errMsg);
+            throw new IOException(errMsg);
+        }
+        return data;
+    }
+
+    public boolean testDOIExists(String doi) throws IOException {
+        HttpGet httpGet = new HttpGet(this.apiUrl + "/works/" + doi);
+        httpGet.setHeader("Accept", "application/json");
+        HttpResponse response = httpClient.execute(httpGet);
+        if (response.getStatusLine().getStatusCode() != 200) {
+            EntityUtils.consumeQuietly(response.getEntity());
+            return false;
+        }
+        EntityUtils.consumeQuietly(response.getEntity());
+        return true;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DOIDataCiteRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DOIDataCiteRegisterService.java
new file mode 100644
index 00000000000..a4d788de4df
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DOIDataCiteRegisterService.java
@@ -0,0 +1,260 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse.pidproviders.doi.datacite;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.commons.text.StringEscapeUtils;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.DoiMetadata;
+import edu.harvard.iq.dataverse.pidproviders.doi.XmlMetadataTemplate;
+
+import org.xmlunit.builder.DiffBuilder;
+import org.xmlunit.builder.Input;
+import org.xmlunit.builder.Input.Builder;
+import org.xmlunit.diff.Diff;
+import org.xmlunit.diff.Difference;
+
+/**
+ *
+ * @author luopc
+ */
+public class DOIDataCiteRegisterService {
+
+    private static final Logger logger = Logger.getLogger(DOIDataCiteRegisterService.class.getCanonicalName());
+    
+        
+    //A singleton since it, and the httpClient in it can be reused.
+    private DataCiteRESTfullClient client=null;
+
+    public DOIDataCiteRegisterService(String url, String username, String password) {
+            client = new DataCiteRESTfullClient(url, username, password);
+    }
+
+    /**
+     * This "reserveIdentifier" method is heavily based on the
+     * "registerIdentifier" method below but doesn't, this one doesn't doesn't
+     * register a URL, which causes the "state" of DOI to transition from
+     * "draft" to "findable". Here are some DataCite docs on the matter:
+     *
+     * "DOIs can exist in three states: draft, registered, and findable. DOIs
+     * are in the draft state when metadata have been registered, and will
+     * transition to the findable state when registering a URL." --
+     * https://support.datacite.org/docs/mds-api-guide#doi-states
+     */
+    public String reserveIdentifier(String identifier, Map<String, String> metadata, DvObject dvObject) throws IOException {
+        String retString = "";
+        String xmlMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
+
+        retString = client.postMetadata(xmlMetadata);
+        
+        return retString;
+    }
+
+    public String registerIdentifier(String identifier, Map<String, String> metadata, DvObject dvObject) throws IOException {
+        String retString = "";
+        String xmlMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
+        String target = metadata.get("_target");
+        
+        retString = client.postMetadata(xmlMetadata);
+        client.postUrl(identifier.substring(identifier.indexOf(":") + 1), target);
+
+        return retString;
+    }
+    
+    
+    public String reRegisterIdentifier(String identifier, Map<String, String> metadata, DvObject dvObject) throws IOException {
+        String retString = "";
+        String numericIdentifier = identifier.substring(identifier.indexOf(":") + 1);
+        String xmlMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
+        String target = metadata.get("_target");
+        String currentMetadata = client.getMetadata(numericIdentifier);
+        Diff myDiff = DiffBuilder.compare(xmlMetadata)
+                .withTest(currentMetadata).ignoreWhitespace().checkForSimilar()
+                .build();
+
+        if (myDiff.hasDifferences()) {
+            for(Difference d : myDiff.getDifferences()) {
+            
+              logger.fine(d.toString());
+            }
+            retString = "metadata:\\r" + client.postMetadata(xmlMetadata) + "\\r";
+        }
+        if (!target.equals(client.getUrl(numericIdentifier))) {
+            logger.info("Updating target URL to " +  target);
+            client.postUrl(numericIdentifier, target);
+            retString = retString + "url:\\r" + target;
+
+        }
+
+        return retString;
+    }
+
+
+    public String deactivateIdentifier(String identifier, Map<String, String> metadata, DvObject dvObject) throws IOException {
+        String retString = "";
+
+            String metadataString = getMetadataForDeactivateIdentifier(identifier, metadata, dvObject);
+            retString = client.postMetadata(metadataString);
+            retString = client.inactiveDataset(identifier.substring(identifier.indexOf(":") + 1));
+
+        return retString;
+    }
+    
+        public static String getMetadataFromDvObject(String identifier, Map<String, String> metadata, DvObject dvObject) {
+
+        Dataset dataset = null;
+
+        if (dvObject instanceof Dataset) {
+            dataset = (Dataset) dvObject;
+        } else {
+            dataset = (Dataset) dvObject.getOwner();
+        }
+
+        DoiMetadata doiMetadata = new DoiMetadata();
+        doiMetadata.setIdentifier(identifier.substring(identifier.indexOf(':') + 1));
+        doiMetadata.setCreators(Arrays.asList(metadata.get("datacite.creator").split("; ")));
+        doiMetadata.setAuthors(dataset.getLatestVersion().getDatasetAuthors());
+        if (dvObject.isInstanceofDataset()) {
+            //While getDescriptionPlainText strips < and > from HTML, it leaves '&' (at least so we need to xml escape as well
+            String description = StringEscapeUtils.escapeXml10(dataset.getLatestVersion().getDescriptionPlainText());
+            if (description.isEmpty() || description.equals(DatasetField.NA_VALUE)) {
+                description = AbstractPidProvider.UNAVAILABLE;
+            }
+            doiMetadata.setDescription(description);
+        }
+        if (dvObject.isInstanceofDataFile()) {
+            DataFile df = (DataFile) dvObject;
+            //Note: File metadata is not escaped like dataset metadata is, so adding an xml escape here.
+            //This could/should be removed if the datafile methods add escaping
+            String fileDescription = StringEscapeUtils.escapeXml10(df.getDescription());
+            doiMetadata.setDescription(fileDescription == null ? AbstractPidProvider.UNAVAILABLE : fileDescription);
+        }
+
+        doiMetadata.setContacts(dataset.getLatestVersion().getDatasetContacts());
+        doiMetadata.setProducers(dataset.getLatestVersion().getDatasetProducers());
+        String title = dvObject.getCurrentName();
+        if(dvObject.isInstanceofDataFile()) {
+            //Note file title is not currently escaped the way the dataset title is, so adding it here.
+            title = StringEscapeUtils.escapeXml10(title);
+        }
+        
+        if (title.isEmpty() || title.equals(DatasetField.NA_VALUE)) {
+            title = AbstractPidProvider.UNAVAILABLE;
+        }
+        
+        doiMetadata.setTitle(title);
+        String producerString = BrandingUtil.getInstallationBrandName();
+        if (producerString.isEmpty() || producerString.equals(DatasetField.NA_VALUE)) {
+            producerString = AbstractPidProvider.UNAVAILABLE;
+        }
+        doiMetadata.setPublisher(producerString);
+        doiMetadata.setPublisherYear(metadata.get("datacite.publicationyear"));
+
+        String xmlMetadata = new XmlMetadataTemplate(doiMetadata).generateXML(dvObject);
+        logger.log(Level.FINE, "XML to send to DataCite: {0}", xmlMetadata);
+        return xmlMetadata;
+    }
+
+    public static String getMetadataForDeactivateIdentifier(String identifier, Map<String, String> metadata, DvObject dvObject) {
+
+        DoiMetadata doiMetadata = new DoiMetadata();
+        
+        doiMetadata.setIdentifier(identifier.substring(identifier.indexOf(':') + 1));
+        doiMetadata.setCreators(Arrays.asList(metadata.get("datacite.creator").split("; ")));
+
+        doiMetadata.setDescription(AbstractPidProvider.UNAVAILABLE);
+
+        String title =metadata.get("datacite.title");
+        
+        System.out.print("Map metadata title: "+ metadata.get("datacite.title"));
+        
+        doiMetadata.setAuthors(null);
+        
+        doiMetadata.setTitle(title);
+        String producerString = AbstractPidProvider.UNAVAILABLE;
+
+        doiMetadata.setPublisher(producerString);
+        doiMetadata.setPublisherYear(metadata.get("datacite.publicationyear"));
+
+        String xmlMetadata = new XmlMetadataTemplate(doiMetadata).generateXML(dvObject);
+        logger.log(Level.FINE, "XML to send to DataCite: {0}", xmlMetadata);
+        return xmlMetadata;
+    }
+
+    public String modifyIdentifier(String identifier, Map<String, String> metadata, DvObject dvObject)
+            throws IOException {
+
+        String xmlMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
+
+        logger.fine("XML to send to DataCite: " + xmlMetadata);
+
+        String status = metadata.get("_status").trim();
+        String target = metadata.get("_target");
+        String retString = "";
+        switch (status) {
+        case DataCiteDOIProvider.DRAFT:
+            // draft DOIs aren't currently being updated after every edit - ToDo - should
+            // this be changed or made optional?
+            retString = "success to reserved " + identifier;
+            break;
+        case DataCiteDOIProvider.FINDABLE:
+            try {
+                retString = client.postMetadata(xmlMetadata);
+                client.postUrl(identifier.substring(identifier.indexOf(":") + 1), target);
+            } catch (UnsupportedEncodingException ex) {
+                logger.log(Level.SEVERE, null, ex);
+            } catch (RuntimeException rte) {
+                logger.log(Level.SEVERE, "Error creating DOI at DataCite: {0}", rte.getMessage());
+                logger.log(Level.SEVERE, "Exception", rte);
+            }
+            break;
+        case DataCiteDOIProvider.REGISTERED:
+            retString = client.inactiveDataset(identifier.substring(identifier.indexOf(":") + 1));
+            break;
+        }
+        return retString;
+    }
+
+    public boolean testDOIExists(String identifier) {
+        boolean doiExists;
+        try {
+            doiExists = client.testDOIExists(identifier.substring(identifier.indexOf(":") + 1));
+        } catch (Exception e) {
+            logger.log(Level.INFO, identifier, e);
+            return false;
+        }
+        return doiExists;
+    }
+
+    Map<String, String> getMetadata(String identifier) throws IOException {
+        Map<String, String> metadata = new HashMap<>();
+        try {
+            String xmlMetadata = client.getMetadata(identifier.substring(identifier.indexOf(":") + 1));
+            DoiMetadata doiMetadata = new DoiMetadata();
+            doiMetadata.parseDataCiteXML(xmlMetadata);
+            metadata.put("datacite.creator", String.join("; ", doiMetadata.getCreators()));
+            metadata.put("datacite.title", doiMetadata.getTitle());
+            metadata.put("datacite.publisher", doiMetadata.getPublisher());
+            metadata.put("datacite.publicationyear", doiMetadata.getPublisherYear());
+        } catch (RuntimeException e) {
+            logger.log(Level.INFO, identifier, e);
+        }
+        return metadata;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java
new file mode 100644
index 00000000000..dd64a89dfe6
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java
@@ -0,0 +1,394 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.datacite;
+
+import java.io.IOException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.json.JsonObject;
+
+import org.apache.hc.client5.http.classic.methods.HttpDelete;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+
+/**
+ *
+ * @author luopc
+ */
+public class DataCiteDOIProvider extends AbstractDOIProvider {
+
+    private static final Logger logger = Logger.getLogger(DataCiteDOIProvider.class.getCanonicalName());
+
+    static final String FINDABLE = "findable";     //public - published dataset versions
+    static final String DRAFT = "draft";           //reserved but not findable yet - draft/unpublished datasets
+    static final String REGISTERED = "registered"; //was findable once, not anymore - deaccessioned datasets
+    static final String NONE = "none";             //no record - draft/unpublished datasets where the initial request to reserve has failed
+
+    public static final String TYPE = "datacite";
+
+
+    private String mdsUrl;
+    private String apiUrl;
+    private String username;
+    private String password;
+    
+    private DOIDataCiteRegisterService doiDataCiteRegisterService;
+
+    public DataCiteDOIProvider(String id, String label, String providerAuthority, String providerShoulder,
+            String identifierGenerationStyle, String datafilePidFormat, String managedList, String excludedList,
+            String mdsUrl, String apiUrl, String username, String password) {
+        super(id, label, providerAuthority, providerShoulder, identifierGenerationStyle, datafilePidFormat, managedList,
+                excludedList);
+        this.mdsUrl = mdsUrl;
+        this.apiUrl = apiUrl;
+        this.username = username;
+        this.password = password;
+        doiDataCiteRegisterService = new DOIDataCiteRegisterService(mdsUrl, username, password);
+    }
+
+    @Override
+    public boolean registerWhenPublished() {
+        return false;
+    }
+
+    @Override
+    public boolean alreadyRegistered(GlobalId pid, boolean noProviderDefault) {
+        logger.log(Level.FINE, "alreadyRegistered");
+        if (pid == null || pid.asString().isEmpty()) {
+            logger.fine("No identifier sent.");
+            return false;
+        }
+        boolean alreadyRegistered;
+        String identifier = pid.asString();
+        try {
+            alreadyRegistered = doiDataCiteRegisterService.testDOIExists(identifier);
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "alreadyRegistered failed");
+            return false;
+        }
+        return alreadyRegistered;
+    }
+
+    @Override
+    public String createIdentifier(DvObject dvObject) throws Exception {
+        logger.log(Level.FINE, "createIdentifier");
+        if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) {
+            dvObject = generatePid(dvObject);
+        }
+        String identifier = getIdentifier(dvObject);
+        Map<String, String> metadata = getMetadataForCreateIndicator(dvObject);
+        metadata.put("_status", DRAFT);
+        try {
+            String retString = doiDataCiteRegisterService.reserveIdentifier(identifier, metadata, dvObject);
+            logger.log(Level.FINE, "create DOI identifier retString : " + retString);
+            return retString;
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "Identifier not created: create failed", e);
+            throw e;
+        }
+    }
+
+    @Override
+    public Map<String, String> getIdentifierMetadata(DvObject dvObject) {
+        logger.log(Level.FINE, "getIdentifierMetadata");
+        String identifier = getIdentifier(dvObject);
+        Map<String, String> metadata = new HashMap<>();
+        try {
+            metadata = doiDataCiteRegisterService.getMetadata(identifier);
+            metadata.put("_status", getPidStatus(dvObject));
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "getIdentifierMetadata failed", e);
+        }
+        return metadata;
+    }
+
+    /**
+     * Modifies the DOI metadata for a Dataset
+     * 
+     * @param dvObject the dvObject whose metadata needs to be modified
+     * @return the Dataset identifier, or null if the modification failed
+     * @throws java.lang.Exception
+     */
+    @Override
+    public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception {
+        logger.log(Level.FINE, "modifyIdentifier");
+        String identifier = getIdentifier(dvObject);
+        try {
+            Map<String, String> metadata = getIdentifierMetadata(dvObject);
+            metadata.put("_target", getTargetUrl(dvObject));
+            doiDataCiteRegisterService.modifyIdentifier(identifier, metadata, dvObject);
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "modifyMetadata failed", e);
+            throw e;
+        }
+        return identifier;
+    }
+
+    /*
+     * Deletes a DOI if it is in DRAFT/DRAFT state or removes metadata and
+     * changes it from PUBLIC/FINDABLE to REGISTERED.
+     */
+    @Override
+    public void deleteIdentifier(DvObject dvObject) throws IOException {
+        logger.log(Level.FINE, "deleteIdentifier");
+        String identifier = getIdentifier(dvObject);
+        String idStatus = getPidStatus(dvObject);
+        switch (idStatus) {
+        case DRAFT:
+            logger.log(Level.FINE, "Delete status is reserved..");
+            deleteDraftIdentifier(dvObject);
+            break;
+        case FINDABLE:
+            // if public then it has been released set to REGISTERED/unavailable and reset
+            // target to n2t url
+            Map<String, String> metadata = addDOIMetadataForDestroyedDataset(dvObject);
+            metadata.put("_status", "registered");
+            metadata.put("_target", getTargetUrl(dvObject));
+            doiDataCiteRegisterService.deactivateIdentifier(identifier, metadata, dvObject);
+            break;
+
+        case REGISTERED:
+        case NONE:
+            // Nothing to do
+        }
+    }
+
+    /**
+     * Deletes DOI from the DataCite side, if possible. Only "draft" DOIs can be
+     * deleted.
+     */
+    private void deleteDraftIdentifier(DvObject dvObject) throws IOException {
+
+        GlobalId doi = dvObject.getGlobalId();
+        /**
+         * Deletes the DOI from DataCite if it can. Returns 204 if PID was deleted (only
+         * possible for "draft" DOIs), 405 (method not allowed) if the DOI wasn't
+         * deleted (because it's in "findable" state, for example, 404 if the DOI wasn't
+         * found, and possibly other status codes such as 500 if DataCite is down.
+         */
+        String doiUrl = getApiUrl() + "/dois/" + doi.getAuthority() + "/" + doi.getIdentifier();
+        HttpDelete httpDelete = new HttpDelete(doiUrl);
+        
+        String userpass = getUsername() + ":" + getPassword();
+        String basicAuth = "Basic " + new String(Base64.getEncoder().encode(userpass.getBytes()));
+        httpDelete.setHeader(HttpHeaders.AUTHORIZATION, basicAuth);
+        
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            httpClient.execute(httpDelete, response -> {
+                int status = response.getCode();
+                if (status != HttpStatus.SC_NO_CONTENT) {
+                    String responseBody = EntityUtils.toString(response.getEntity());
+                    logger.warning("Incorrect Response Status from DataCite: " + status + " : " + responseBody);
+                    throw new IOException("Status: " + status);
+                }
+                logger.fine("deleteDoi status for " + doi.asString() + ": " + status);
+                return null;
+            });
+        } catch (IOException e) {
+            logger.log(Level.SEVERE, "Error deleting DOI: " + doi.asString(), e);
+            throw e;
+        }
+    }
+
+    @Override
+    public boolean publicizeIdentifier(DvObject dvObject) {
+        logger.log(Level.FINE, "updateIdentifierStatus");
+        if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) {
+            dvObject = generatePid(dvObject);
+        }
+        String identifier = getIdentifier(dvObject);
+        Map<String, String> metadata = getUpdateMetadata(dvObject);
+        metadata.put("_status", FINDABLE);
+        metadata.put("datacite.publicationyear", generateYear(dvObject));
+        metadata.put("_target", getTargetUrl(dvObject));
+        try {
+            doiDataCiteRegisterService.registerIdentifier(identifier, metadata, dvObject);
+            return true;
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "modifyMetadata failed: " + e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public List<String> getProviderInformation() {
+        return List.of(getId(), "https://status.datacite.org");
+    }
+
+    @Override
+    protected String getProviderKeyName() {
+        return "DataCite";
+    }
+
+    @Override
+    public String getProviderType() {
+        return TYPE;
+    }
+
+    public String getMdsUrl() {
+        return mdsUrl;
+    }
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Method to determine the status of a dvObject's PID. It replaces keeping a
+     * separate DOIDataCiteRegisterCache. We could also try to get this info from
+     * DataCite directly, but it appears to not be in the xml metadata return, so it
+     * would require another/different api call (possible ToDo).
+     * 
+     * @param dvObject - Dataset or DataFile
+     * @return PID status - NONE, DRAFT, FINDABLE, or REGISTERED
+     */
+    String getPidStatus(DvObject dvObject) {
+        String status = NONE;
+        if (dvObject instanceof Dataset) {
+            Dataset dataset = (Dataset) dvObject;
+            // return true, if all published versions were deaccessioned
+            boolean hasDeaccessionedVersions = false;
+            for (DatasetVersion testDsv : dataset.getVersions()) {
+                if (testDsv.isReleased()) {
+                    // With any released version, we're done
+                    return FINDABLE;
+                }
+                // Also check for draft version
+                if (testDsv.isDraft()) {
+                    if (dataset.isIdentifierRegistered()) {
+                        status = DRAFT;
+                        // Keep interating to see if there's a released version
+                    }
+                }
+                if (testDsv.isDeaccessioned()) {
+                    hasDeaccessionedVersions = true;
+                    // Keep interating to see if there's a released version
+                }
+            }
+            if (hasDeaccessionedVersions) {
+                if (dataset.isIdentifierRegistered()) {
+                    return REGISTERED;
+                }
+            }
+            return status;
+        } else if (dvObject instanceof DataFile) {
+            DataFile df = (DataFile) dvObject;
+            // return true, if all published versions were deaccessioned
+            boolean isInDeaccessionedVersions = false;
+            for (FileMetadata fmd : df.getFileMetadatas()) {
+                DatasetVersion testDsv = fmd.getDatasetVersion();
+                if (testDsv.isReleased()) {
+                    // With any released version, we're done
+                    return FINDABLE;
+                }
+                // Also check for draft version
+                if (testDsv.isDraft()) {
+                    if (df.isIdentifierRegistered()) {
+                        status = DRAFT;
+                        // Keep interating to see if there's a released/deaccessioned version
+                    }
+                }
+                if (testDsv.isDeaccessioned()) {
+                    isInDeaccessionedVersions = true;
+                    // Keep interating to see if there's a released version
+                }
+            }
+            if (isInDeaccessionedVersions) {
+                if (df.isIdentifierRegistered()) {
+                    return REGISTERED;
+                }
+            }
+
+        }
+        return status;
+    }
+    
+    
+    @Override
+    public boolean updateIdentifier(DvObject dvObject) {
+        logger.log(Level.FINE,"updateIdentifierStatus");
+        if(dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty() ){
+            dvObject = generatePid(dvObject);
+        }
+        String identifier = getIdentifier(dvObject);
+        Map<String, String> metadata = getUpdateMetadata(dvObject);
+        metadata.put("_status", "public");
+        metadata.put("datacite.publicationyear", generateYear(dvObject));
+        metadata.put("_target", getTargetUrl(dvObject));
+        try {
+            String updated = doiDataCiteRegisterService.reRegisterIdentifier(identifier, metadata, dvObject);
+            if(updated.length()!=0) {
+                logger.info(identifier + "updated: " + updated );
+                return true;
+            } else {
+                logger.info("No updated needed for " + identifier);
+                return false; //No update needed
+            }
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "updateIdentifier failed: " + e.getMessage(), e);
+            return false;
+        }
+    }
+
+    /** Retrieve the CSL JSON - used in cases where this is not directly available from https://doi.org/
+     * i.e. for test DOIs and non-findable DOIs.
+     *  
+     */
+    @Override
+    public JsonObject getCSLJson(DatasetVersion dsv) {
+        if (dsv.isLatestVersion() && dsv.isReleased()) {
+            String doi = dsv.getDataset().getGlobalId().asRawIdentifier();
+            String doiUrl = getApiUrl() + "/dois/" + doi;
+    
+            HttpGet httpGet = new HttpGet(doiUrl);
+            
+            String userpass = getUsername() + ":" + getPassword();
+            String basicAuth = "Basic " + new String(Base64.getEncoder().encode(userpass.getBytes()));
+            httpGet.setHeader(HttpHeaders.AUTHORIZATION, basicAuth);
+            httpGet.setHeader(HttpHeaders.ACCEPT, "application/vnd.citationstyles.csl+json");
+            
+            try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+                return httpClient.execute(httpGet, response -> {
+                    int status = response.getCode();
+                    if (status != HttpStatus.SC_OK) {
+                        logger.warning("Incorrect Response Status from DataCite: " + status + " : " + response.getReasonPhrase());
+                        throw new IOException("Status: " + status);
+                    }
+                    logger.fine("getCSLJson status for " + doi + ": " + status);
+                    
+                    String cslString = EntityUtils.toString(response.getEntity());
+                    logger.fine(cslString);
+                    return JsonUtil.getJsonObject(cslString);
+                });
+            } catch (IOException e) {
+                logger.log(Level.WARNING, "Error getting CSL JSON for " + doi, e);
+                return super.getCSLJson(dsv);
+            }
+        } else {
+            return super.getCSLJson(dsv);
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteProviderFactory.java
new file mode 100644
index 00000000000..99d13b2647c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteProviderFactory.java
@@ -0,0 +1,43 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.datacite;
+
+import com.google.auto.service.AutoService;
+
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactory;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
+@AutoService(PidProviderFactory.class)
+public class DataCiteProviderFactory implements PidProviderFactory {
+
+    @Override
+    public PidProvider createPidProvider(String providerId) {
+        String providerType = JvmSettings.PID_PROVIDER_TYPE.lookup(providerId);
+        if (!providerType.equals(DataCiteDOIProvider.TYPE)) {
+            // Being asked to create a non-DataCite provider
+            return null;
+        }
+        String providerLabel = JvmSettings.PID_PROVIDER_LABEL.lookup(providerId);
+        String providerAuthority = JvmSettings.PID_PROVIDER_AUTHORITY.lookup(providerId);
+        String providerShoulder = JvmSettings.PID_PROVIDER_SHOULDER.lookupOptional(providerId).orElse("");
+        String identifierGenerationStyle = JvmSettings.PID_PROVIDER_IDENTIFIER_GENERATION_STYLE
+                .lookupOptional(providerId).orElse("randomString");
+        String datafilePidFormat = JvmSettings.PID_PROVIDER_DATAFILE_PID_FORMAT.lookupOptional(providerId)
+                .orElse(SystemConfig.DataFilePIDFormat.DEPENDENT.toString());
+        String managedList = JvmSettings.PID_PROVIDER_MANAGED_LIST.lookupOptional(providerId).orElse("");
+        String excludedList = JvmSettings.PID_PROVIDER_EXCLUDED_LIST.lookupOptional(providerId).orElse("");
+
+        String mdsUrl = JvmSettings.DATACITE_MDS_API_URL.lookupOptional(providerId).orElse("https://mds.test.datacite.org");
+        String apiUrl = JvmSettings.DATACITE_REST_API_URL.lookupOptional(providerId).orElse("https://api.test.datacite.org");
+        String username = JvmSettings.DATACITE_USERNAME.lookup(providerId);
+        String password = JvmSettings.DATACITE_PASSWORD.lookup(providerId);
+
+        return new DataCiteDOIProvider(providerId, providerLabel, providerAuthority, providerShoulder, identifierGenerationStyle,
+                datafilePidFormat, managedList, excludedList, mdsUrl, apiUrl, username, password);
+    }
+
+    public String getType() {
+        return DataCiteDOIProvider.TYPE;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteRESTfullClient.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteRESTfullClient.java
new file mode 100644
index 00000000000..465b10ee407
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteRESTfullClient.java
@@ -0,0 +1,235 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse.pidproviders.doi.datacite;
+
+
+import java.io.Closeable;
+import java.io.IOException;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.HttpEntity;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+
+
+
+import org.apache.http.util.EntityUtils;
+
+/**
+ * DataCiteRESTfullClient
+ *
+ * @author luopc
+ *
+ */
+public class DataCiteRESTfullClient implements Closeable {
+    
+    private static final Logger logger = Logger.getLogger(DataCiteRESTfullClient.class.getCanonicalName());
+
+    private String url;
+    private CloseableHttpClient httpClient;
+    private HttpClientContext context;
+    private String encoding = "utf-8";
+    
+    public DataCiteRESTfullClient(String url, String username, String password) {
+        this.url = url;
+        context = HttpClientContext.create();
+        CredentialsProvider credsProvider = new BasicCredentialsProvider();
+        credsProvider.setCredentials(new AuthScope(null, -1), new UsernamePasswordCredentials(username, password));
+        context.setCredentialsProvider(credsProvider);
+
+        httpClient = HttpClients.createDefault();
+    }
+
+    public void close() {
+        if (this.httpClient != null) {
+            try {
+           httpClient.close();
+            } catch (IOException io) {
+               logger.warning("IOException closing hhtpClient: " + io.getMessage());
+           }
+        }
+    }
+
+    /**
+     * getUrl
+     *
+     * @param doi
+     * @return
+     */
+    public String getUrl(String doi) {
+        HttpGet httpGet = new HttpGet(this.url + "/doi/" + doi);
+        try {
+            HttpResponse response = httpClient.execute(httpGet,context);
+            HttpEntity entity = response.getEntity();
+            String data = null;
+
+            if(entity != null) {
+                data = EntityUtils.toString(entity, encoding);
+            }
+            if (response.getStatusLine().getStatusCode() != 200) {
+                throw new RuntimeException("Response code: " + response.getStatusLine().getStatusCode() + ", " + data);
+            }
+            return data;
+        } catch (IOException ioe) {
+            logger.log(Level.SEVERE,"IOException when get url",ioe);
+            throw new RuntimeException("IOException when get url", ioe);
+        }
+    }
+
+    /**
+     * postUrl
+     *
+     * @param doi
+     * @param url
+     * @return
+     */
+    public String postUrl(String doi, String url) throws IOException {
+        HttpPost httpPost = new HttpPost(this.url + "/doi");
+        httpPost.setHeader("Content-Type", "text/plain;charset=UTF-8");
+        httpPost.setEntity(new StringEntity("doi=" + doi + "\nurl=" + url, "utf-8"));
+
+        HttpResponse response = httpClient.execute(httpPost, context);
+        String data = EntityUtils.toString(response.getEntity(), encoding);
+        if (response.getStatusLine().getStatusCode() != 201) {
+            String errMsg = "Response from postUrl: " + response.getStatusLine().getStatusCode() + ", " + data;
+            logger.log(Level.SEVERE, errMsg);
+            throw new IOException(errMsg);
+        }
+        return data;
+    }
+
+    /**
+     * getMetadata
+     *
+     * @param doi
+     * @return
+     */
+    public String getMetadata(String doi) {
+        HttpGet httpGet = new HttpGet(this.url + "/metadata/" + doi);
+        httpGet.setHeader("Accept", "application/xml");
+        try {
+            HttpResponse response = httpClient.execute(httpGet,context);
+            String data = EntityUtils.toString(response.getEntity(), encoding);
+            if (response.getStatusLine().getStatusCode() != 200) {
+                String errMsg = "Response from getMetadata: " + response.getStatusLine().getStatusCode() + ", " + data;
+                logger.log(Level.SEVERE, errMsg);
+                throw new RuntimeException(errMsg);
+            }
+            return data;
+        } catch (IOException ioe) {
+            logger.log(Level.SEVERE, "IOException when get metadata");
+            throw new RuntimeException("IOException when get metadata", ioe);
+        }
+    }
+    
+    /**
+     * testDOIExists
+     *
+     * @param doi
+     * @return boolean true if identifier already exists on DataCite site
+     */
+    public boolean testDOIExists(String doi) throws IOException {
+        HttpGet httpGet = new HttpGet(this.url + "/metadata/" + doi);
+        httpGet.setHeader("Accept", "application/xml");
+        HttpResponse response = httpClient.execute(httpGet, context);
+        if (response.getStatusLine().getStatusCode() != 200) {
+            EntityUtils.consumeQuietly(response.getEntity());
+            return false;
+        }
+        EntityUtils.consumeQuietly(response.getEntity());
+        return true;
+    }
+
+    /**
+     * postMetadata
+     *
+     * @param metadata
+     * @return
+     */
+    public String postMetadata(String metadata) throws IOException {
+        HttpPost httpPost = new HttpPost(this.url + "/metadata");
+        httpPost.setHeader("Content-Type", "application/xml;charset=UTF-8");
+        httpPost.setEntity(new StringEntity(metadata, "utf-8"));
+        HttpResponse response = httpClient.execute(httpPost, context);
+        String data = EntityUtils.toString(response.getEntity(), encoding);
+        if (response.getStatusLine().getStatusCode() != 201) {
+            String errMsg = "Response from postMetadata: " + response.getStatusLine().getStatusCode() + ", " + data;
+            logger.log(Level.SEVERE, errMsg);
+            throw new IOException(errMsg);
+        }
+        return data;
+    }
+
+    /**
+     * inactiveDataset
+     *
+     * @param doi
+     * @return
+     */
+    public String inactiveDataset(String doi) {
+        HttpDelete httpDelete = new HttpDelete(this.url + "/metadata/" + doi);
+        try {
+            HttpResponse response = httpClient.execute(httpDelete,context);
+            String data = EntityUtils.toString(response.getEntity(), encoding);
+            if (response.getStatusLine().getStatusCode() != 200) {
+                String errMsg = "Response code: " + response.getStatusLine().getStatusCode() + ", " + data;
+                logger.log(Level.SEVERE, errMsg);
+                throw new RuntimeException(errMsg);
+            }
+            return data;
+        } catch (IOException ioe) {
+            logger.log(Level.SEVERE, "IOException when inactive dataset");
+            throw new RuntimeException("IOException when inactive dataset", ioe);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        String doi = "10.5072/DVN/274533";
+        DataCiteRESTfullClient client = new DataCiteRESTfullClient("https://mds.test.datacite.org", "DATACITE_TEST_USERNAME", "DATACITE_TEST_PASSWORD");
+//		System.out.println(client.getUrl(doi));
+//		System.out.println(client.getMetadata(doi));
+//        System.out.println(client.postMetadata(readAndClose("C:/Users/luopc/Desktop/datacite.xml", "utf-8")));
+//        System.out.println(client.postUrl("10.5072/000000001", "http://opendata.pku.edu.cn/dvn/dv/DAIM/faces/study/StudyPage.xhtml?globalId=hdl:TEST/10027&studyListingIndex=1_1acc4e9f23fa10b3cc0500d9eb5e"));
+//        client.close();
+//		String doi2 = "10.1/1.0003";
+//		SimpleRESTfullClient client2 = new SimpleRESTfullClient("https://162.105.140.119:8443/mds", "PKULIB.IR", "luopengcheng","localhost.keystore");
+//		System.out.println(client2.getUrl("10.1/1.0002"));
+//		System.out.println(client2.getUrl("10.1/1.0002"));
+//		System.out.println(client2.getMetadata(doi2));
+//		client2.postUrl("10.1/1.0003", "http://ir.pku.edu.cn");
+//		System.out.println(client2.postUrl("10.1/1.0008", "http://ir.pku.edu.cn"));
+//		System.out.println(client2.postMetadata(FileUtil.loadAsString(new File("C:/Users/luopc/Desktop/test/datacite-example-ResourceTypeGeneral_Collection-v3.0.xml"), "utf-8")));
+//		System.out.println(client2.getMetadata("10.1/1.0007"));
+//		System.out.println(client2.inactiveDataSet("10.1/1.0007"));
+//		client2.close();
+}
+
+    
+//    private static String readAndClose(String file, String encoding) throws IOException{
+//        BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),encoding));
+//        StringBuilder str = new StringBuilder();
+//        String line;
+//        while((line = in.readLine()) != null){
+//            str.append(line);
+//        }
+//        in.close();
+//        return str.toString();
+//    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/ezid/EZIdDOIProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/ezid/EZIdDOIProvider.java
new file mode 100644
index 00000000000..ac3276bd119
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/ezid/EZIdDOIProvider.java
@@ -0,0 +1,292 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.ezid;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.ucsb.nceas.ezid.EZIDException;
+import edu.ucsb.nceas.ezid.EZIDService;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import jakarta.ejb.Stateless;
+
+/**
+ *
+ * @author skraffmiller
+ */
+public class EZIdDOIProvider extends AbstractDOIProvider {
+    
+
+
+    private static final Logger logger = Logger.getLogger(EZIdDOIProvider.class.getCanonicalName());
+    
+    EZIDService ezidService;
+    
+    public static final String TYPE = "ezid";
+    
+    private String baseUrl;
+    
+    
+    public EZIdDOIProvider(String id, String label, String providerAuthority, String providerShoulder, String identifierGenerationStyle,
+            String datafilePidFormat, String managedList, String excludedList, String baseUrl, String username, String password) {
+        super(id, label, providerAuthority, providerShoulder, identifierGenerationStyle, datafilePidFormat, managedList, excludedList);
+        // Creating the service doesn't do any harm, just initializing some object data here.
+        // Makes sure we don't run into NPEs from the other methods, but will obviously fail if the
+        // login below does not work.
+        this.baseUrl = baseUrl;
+        this.ezidService = new EZIDService(baseUrl);
+        
+        try {
+
+            if (username != null && password != null) {
+                this.ezidService.login(username, password);
+            } else {
+                logger.log(Level.WARNING, "You must give both username and password. Will not try to login.");
+            }
+        } catch (EZIDException e) {
+            // We only do the warnings here, but the object still needs to be created.
+            // The EJB stateless thing expects this to go through, and it is requested on any
+            // global id parsing.
+            logger.log(Level.WARNING, "Login failed to {0}", baseUrl);
+            logger.log(Level.WARNING, "Exception String: {0}", e.toString());
+            logger.log(Level.WARNING, "Localized message: {0}", e.getLocalizedMessage());
+            logger.log(Level.WARNING, "Cause:", e.getCause());
+            logger.log(Level.WARNING, "Message {0}", e.getMessage());
+        // TODO: is this antipattern really necessary?
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "Other Error on ezidService.login(USERNAME, PASSWORD) - not EZIDException ", e.getMessage());
+        }
+    }
+
+    @Override
+    public boolean registerWhenPublished() {
+        return false;
+    }
+
+    @Override
+    public boolean alreadyRegistered(GlobalId pid, boolean noProviderDefault) throws EZIDException {
+        logger.log(Level.FINE,"alreadyRegistered");
+        try {
+            HashMap<String, String> result = ezidService.getMetadata(pid.asString());
+            return result != null && !result.isEmpty();
+            // TODO just check for HTTP status code 200/404, sadly the status code is swept under the carpet
+        } catch (EZIDException e ){
+            //No such identifier is treated as an exception
+            //but if that is the case then we want to just return false
+            if(pid.getIdentifier() == null){
+                return false;
+            }
+            if (e.getLocalizedMessage().contains("no such identifier")){
+                return false;
+            }
+            logger.log(Level.WARNING, "alreadyRegistered failed");
+            logger.log(Level.WARNING, "getIdentifier(dvObject) {0}", pid.asString());
+            logger.log(Level.WARNING, "String {0}", e.toString());
+            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
+            logger.log(Level.WARNING, "cause", e.getCause());
+            logger.log(Level.WARNING, "message {0}", e.getMessage());
+            throw e;
+        }
+    }
+
+    @Override
+    public Map<String, String> getIdentifierMetadata(DvObject dvObject) {
+        logger.log(Level.FINE,"getIdentifierMetadata");
+        String identifier = getIdentifier(dvObject);
+        Map<String, String> metadata = new HashMap<>();
+        try {
+            metadata = ezidService.getMetadata(identifier);
+        } catch (EZIDException e) {
+            logger.log(Level.WARNING, "getIdentifierMetadata failed");
+            logger.log(Level.WARNING, "String {0}", e.toString());
+            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
+            logger.log(Level.WARNING, "cause", e.getCause());
+            logger.log(Level.WARNING, "message {0}", e.getMessage());
+            return metadata;
+        }
+        return metadata;
+    }
+
+    /**
+     * Modifies the EZID metadata for a Dataset
+     *
+     * @param dvObject the Dataset whose metadata needs to be modified
+     * @return the Dataset identifier, or null if the modification failed
+     * @throws java.lang.Exception
+     */
+    @Override
+    public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception {
+        String identifier = getIdentifier(dvObject);
+        HashMap<String, String> metadata = new HashMap<>();
+        metadata.put("_target", getTargetUrl(dvObject));
+        try {
+            ezidService.setMetadata(identifier,metadata);
+            return identifier;
+        } catch (EZIDException e) {
+            logger.log(Level.WARNING, "modifyMetadata failed");
+            logger.log(Level.WARNING, "String {0}", e.toString());
+            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
+            logger.log(Level.WARNING, "cause", e.getCause());
+            logger.log(Level.WARNING, "message {0}", e.getMessage());
+            throw e;
+        }
+    }
+        
+    @Override
+    public void deleteIdentifier(DvObject dvObject) throws Exception {
+                logger.log(Level.FINE,"deleteIdentifier");
+        String identifier = getIdentifier(dvObject);
+        HashMap<String, String> doiMetadata;
+        try {
+            doiMetadata = ezidService.getMetadata(identifier);
+        } catch (EZIDException e) {
+            logger.log(Level.WARNING, "get matadata failed cannot delete");
+            logger.log(Level.WARNING, "String {0}", e.toString());
+            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
+            logger.log(Level.WARNING, "cause ", e.getCause());
+            logger.log(Level.WARNING, "message {0}", e.getMessage());
+            return;
+        }
+
+        String idStatus = doiMetadata.get("_status");
+
+        if (idStatus.equals("reserved")) {
+            logger.log(Level.INFO, "Delete status is reserved..");
+            try {
+                ezidService.deleteIdentifier(identifier);
+            } catch (EZIDException e) {
+                logger.log(Level.WARNING, "delete failed");
+                logger.log(Level.WARNING, "String {0}", e.toString());
+                logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
+                logger.log(Level.WARNING, "cause", e.getCause());
+                logger.log(Level.WARNING, "message {0}", e.getMessage());
+            }
+            return;
+        }
+        if (idStatus.equals("public")) {
+            //if public then it has been released set to unavaialble and reset target to n2t url
+            updateIdentifierStatus(dvObject, "unavailable | withdrawn by author");
+            Map<String, String> metadata = new HashMap<>();
+            metadata.put("_target", "http://ezid.cdlib.org/id/" + dvObject.getProtocol() + ":" + dvObject.getAuthority()
+                    + "/" + dvObject.getIdentifier());
+            try {
+                modifyIdentifierTargetURL(dvObject);
+                if (dvObject instanceof Dataset) {
+                    Dataset dataset = (Dataset) dvObject;
+                    for (DataFile df : dataset.getFiles()) {
+                        metadata = new HashMap<>();
+                        metadata.put("_target", "http://ezid.cdlib.org/id/" + df.getProtocol() + ":" + df.getAuthority()
+                                + "/" + df.getIdentifier());
+                                        modifyIdentifierTargetURL(df);
+                    }
+                }
+
+            } catch (Exception e) {
+                // TODO already logged, how to react here?
+            }
+        }
+    }
+    
+    @Override
+    public boolean publicizeIdentifier(DvObject dvObject) {
+        logger.log(Level.FINE,"publicizeIdentifier - dvObject");
+        if(!dvObject.isIdentifierRegistered()){
+            try {
+                createIdentifier(dvObject);
+            } catch (Throwable e){
+                return false; 
+            }
+        }
+        return updateIdentifierStatus(dvObject, "public");
+    }
+
+    private boolean updateIdentifierStatus(DvObject dvObject, String statusIn) {
+        logger.log(Level.FINE, "updateIdentifierStatus");
+        String identifier = getIdentifier(dvObject);
+        Map<String, String> metadata = getUpdateMetadata(dvObject);
+        String objMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
+        Map<String, String> dcMetadata;
+        dcMetadata = new HashMap<>();
+        dcMetadata.put("datacite", objMetadata);
+        dcMetadata.put("_status", statusIn);
+        dcMetadata.put("_target", getTargetUrl(dvObject));
+
+        try {
+            // ezID API requires HashMap, not just any map.            
+            ezidService.setMetadata(identifier, asHashMap(dcMetadata));
+            return true;
+
+        } catch (EZIDException e) {
+            logger.log(Level.WARNING, "modifyMetadata failed");
+            logger.log(Level.WARNING, "String {0}", e.toString());
+            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
+            logger.log(Level.WARNING, "cause", e.getCause());
+            logger.log(Level.WARNING, "message {0}", e.getMessage());
+            return false;
+        }
+    }
+    
+    @Override
+    public List<String> getProviderInformation(){
+        return List.of(getId(), this.baseUrl);
+    }
+
+    @Override
+    public String createIdentifier(DvObject dvObject) throws Throwable {
+        logger.log(Level.FINE, "createIdentifier");
+        if(dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty() ){
+            dvObject = generatePid(dvObject);
+        }
+        String identifier = getIdentifier(dvObject);
+        Map<String, String> metadata = getMetadataForCreateIndicator(dvObject);
+        String objMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
+        Map<String, String> dcMetadata;
+        dcMetadata = new HashMap<>();
+        dcMetadata.put("datacite", objMetadata);
+        dcMetadata.put("datacite.resourcetype", "Dataset");
+        dcMetadata.put("_status", "reserved");
+
+        try {
+            String retString = ezidService.createIdentifier(identifier, asHashMap(dcMetadata));
+            logger.log(Level.FINE, "create DOI identifier retString : {0}", retString);
+            return retString;
+        } catch (EZIDException e) {
+            logger.log(Level.WARNING, "Identifier not created: create failed");
+            logger.log(Level.WARNING, "String {0}", e.toString());
+            logger.log(Level.WARNING, "localized message {0}", e.getLocalizedMessage());
+            logger.log(Level.WARNING, "cause", e.getCause());
+            logger.log(Level.WARNING, "message {0}", e.getMessage());
+            logger.log(Level.WARNING, "identifier: ", identifier);
+            throw e;
+        }
+    }
+    
+     /**
+     * Returns a HashMap with the same values as {@code map}. This can be either
+     * {@code map} itself, or a new instance with the same values.
+     * 
+     * This is needed as some of the internal APIs here require HashMap, but we
+     * don't want the external APIs to use an implementation class.
+     * @param <T>
+     * @param map
+     * @return A HashMap with the same values as {@code map}
+     */
+    private <T> HashMap<T,T> asHashMap(Map<T,T> map) {
+        return (map instanceof HashMap) ? (HashMap<T, T>)map : new HashMap<>(map);
+    }
+
+    @Override
+    protected String getProviderKeyName() {
+        return "EZID";
+    }
+
+    @Override
+    public String getProviderType() {
+        return TYPE;
+    }
+}
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/ezid/EZIdProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/ezid/EZIdProviderFactory.java
new file mode 100644
index 00000000000..95ad9bdeff0
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/ezid/EZIdProviderFactory.java
@@ -0,0 +1,42 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.ezid;
+
+import com.google.auto.service.AutoService;
+
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactory;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
+@AutoService(PidProviderFactory.class)
+public class EZIdProviderFactory implements PidProviderFactory {
+
+    @Override
+    public PidProvider createPidProvider(String providerId) {
+        String providerType = JvmSettings.PID_PROVIDER_TYPE.lookup(providerId);
+        if (!providerType.equals(EZIdDOIProvider.TYPE)) {
+            // Being asked to create a non-EZId provider
+            return null;
+        }
+        String providerLabel = JvmSettings.PID_PROVIDER_LABEL.lookup(providerId);
+        String providerAuthority = JvmSettings.PID_PROVIDER_AUTHORITY.lookup(providerId);
+        String providerShoulder = JvmSettings.PID_PROVIDER_SHOULDER.lookupOptional(providerId).orElse("");
+        String identifierGenerationStyle = JvmSettings.PID_PROVIDER_IDENTIFIER_GENERATION_STYLE
+                .lookupOptional(providerId).orElse("randomString");
+        String datafilePidFormat = JvmSettings.PID_PROVIDER_DATAFILE_PID_FORMAT.lookupOptional(providerId)
+                .orElse(SystemConfig.DataFilePIDFormat.DEPENDENT.toString());
+        String managedList = JvmSettings.PID_PROVIDER_MANAGED_LIST.lookupOptional(providerId).orElse("");
+        String excludedList = JvmSettings.PID_PROVIDER_EXCLUDED_LIST.lookupOptional(providerId).orElse("");
+
+        String baseUrl = JvmSettings.EZID_API_URL.lookupOptional(providerId).orElse("https://ezid.cdlib.org");
+        String username = JvmSettings.EZID_USERNAME.lookup(providerId);
+        String password = JvmSettings.EZID_PASSWORD.lookup(providerId);
+
+        return new EZIdDOIProvider(providerId, providerLabel, providerAuthority, providerShoulder, identifierGenerationStyle, datafilePidFormat,
+                managedList, excludedList, baseUrl, username, password);
+    }
+
+    public String getType() {
+        return EZIdDOIProvider.TYPE;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/fake/FakeDOIProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/fake/FakeDOIProvider.java
new file mode 100644
index 00000000000..023b766f2ac
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/fake/FakeDOIProvider.java
@@ -0,0 +1,88 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.fake;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FakeDOIProvider extends AbstractDOIProvider {
+
+    public static final String TYPE = "FAKE";
+
+    public FakeDOIProvider(String id, String label, String providerAuthority, String providerShoulder, String identifierGenerationStyle,
+            String datafilePidFormat, String managedList, String excludedList) {
+        super(id, label, providerAuthority, providerShoulder, identifierGenerationStyle, datafilePidFormat, managedList, excludedList);
+    }
+
+    //Only need to check locally
+    public boolean isGlobalIdUnique(GlobalId globalId) {
+        try {
+            return ! alreadyRegistered(globalId, false);
+        } catch (Exception e){
+            //we can live with failure - means identifier not found remotely
+        }
+        return true;
+    }
+    
+    @Override
+    public boolean alreadyRegistered(GlobalId globalId, boolean noProviderDefault) {
+        boolean existsLocally = !pidProviderService.isGlobalIdLocallyUnique(globalId);
+        return existsLocally ? existsLocally : noProviderDefault;
+    }
+
+    @Override
+    public boolean registerWhenPublished() {
+        return false;
+    }
+
+    @Override
+    public List<String> getProviderInformation() {
+        return List.of(getId(), "https://dataverse.org");
+    }
+
+    @Override
+    public String createIdentifier(DvObject dvObject) throws Throwable {
+        if(dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty() ){
+            dvObject = generatePid(dvObject);
+        }
+        return dvObject.getIdentifier();
+    }
+
+    @Override
+    public Map<String, String> getIdentifierMetadata(DvObject dvo) {
+        Map<String, String> map = new HashMap<>();
+        return map;
+    }
+
+    @Override
+    public String modifyIdentifierTargetURL(DvObject dvo) throws Exception {
+        return "fakeModifyIdentifierTargetURL";
+    }
+
+    @Override
+    public void deleteIdentifier(DvObject dvo) throws Exception {
+        // no-op
+    }
+
+    @Override
+    public boolean publicizeIdentifier(DvObject dvObject) {
+        if(dvObject.isInstanceofDataFile() && dvObject.getGlobalId()==null) {
+            generatePid(dvObject);
+        }
+        return true;
+    }
+    
+    @Override
+    protected String getProviderKeyName() {
+        return "FAKE";
+    }
+
+    @Override
+    public String getProviderType() {
+        return TYPE;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/fake/FakeProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/fake/FakeProviderFactory.java
new file mode 100644
index 00000000000..292c39d4383
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/fake/FakeProviderFactory.java
@@ -0,0 +1,38 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.fake;
+
+import com.google.auto.service.AutoService;
+
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactory;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
+@AutoService(PidProviderFactory.class)
+public class FakeProviderFactory implements PidProviderFactory {
+    
+    @Override
+    public PidProvider createPidProvider(String providerId) {
+        String providerType = JvmSettings.PID_PROVIDER_TYPE.lookup(providerId);
+        if (!providerType.equals(FakeDOIProvider.TYPE)) {
+            // Being asked to create a non-EZId provider
+            return null;
+        }
+        String providerLabel = JvmSettings.PID_PROVIDER_LABEL.lookup(providerId);
+        String providerAuthority = JvmSettings.PID_PROVIDER_AUTHORITY.lookup(providerId);
+        String providerShoulder = JvmSettings.PID_PROVIDER_SHOULDER.lookupOptional(providerId).orElse("");
+        String identifierGenerationStyle = JvmSettings.PID_PROVIDER_IDENTIFIER_GENERATION_STYLE
+                .lookupOptional(providerId).orElse("randomString");
+        String datafilePidFormat = JvmSettings.PID_PROVIDER_DATAFILE_PID_FORMAT.lookupOptional(providerId)
+                .orElse(SystemConfig.DataFilePIDFormat.DEPENDENT.toString());
+        String managedList = JvmSettings.PID_PROVIDER_MANAGED_LIST.lookupOptional(providerId).orElse("");;
+        String excludedList = JvmSettings.PID_PROVIDER_EXCLUDED_LIST.lookupOptional(providerId).orElse("");;
+
+        return new FakeDOIProvider(providerId, providerLabel, providerAuthority, providerShoulder, identifierGenerationStyle,
+                datafilePidFormat, managedList, excludedList);
+    }
+
+    public String getType() {
+        return FakeDOIProvider.TYPE;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/handle/HandlePidProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/handle/HandlePidProvider.java
new file mode 100644
index 00000000000..972ffe5d864
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/handle/HandlePidProvider.java
@@ -0,0 +1,480 @@
+/*
+   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   Dataverse Network - A web application to share, preserve and analyze research data.
+   Developed at the Institute for Quantitative Social Science, Harvard University.
+   Version 3.0.
+*/
+
+package edu.harvard.iq.dataverse.pidproviders.handle;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.security.PrivateKey;
+
+/* Handlenet imports: */
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import net.handle.hdllib.AbstractMessage;
+import net.handle.hdllib.AbstractResponse;
+import net.handle.hdllib.AdminRecord;
+import net.handle.hdllib.ClientSessionTracker;
+import net.handle.hdllib.CreateHandleRequest;
+import net.handle.hdllib.DeleteHandleRequest;
+import net.handle.hdllib.Encoder;
+import net.handle.hdllib.HandleException;
+import net.handle.hdllib.HandleResolver;
+import net.handle.hdllib.HandleValue;
+import net.handle.hdllib.ModifyValueRequest;
+import net.handle.hdllib.PublicKeyAuthenticationInfo;
+import net.handle.hdllib.ResolutionRequest;
+import net.handle.hdllib.Util;
+import org.apache.commons.lang3.NotImplementedException;
+
+/**
+ *
+ * @author Leonid Andreev
+ * 
+ * This is a *partial* implementation of the Handles global id 
+ * service. 
+ * As of now, it only does the registration updates, to accommodate 
+ * the modifyRegistration datasets API sub-command.
+ * 
+ * Note that while Handles are nominally case sensitive, handle.net is
+ * configured to be case-insensitive and Dataverse makes case-insensitve
+ * database look-ups to find Handles (See #11003). That said, database
+ * entries are stored in the case matching the configuration of the provider.
+ */
+public class HandlePidProvider extends AbstractPidProvider {
+
+    private static final Logger logger = Logger.getLogger(HandlePidProvider.class.getCanonicalName());
+    
+    public static final String HDL_PROTOCOL = "hdl";
+    public static final String TYPE = "hdl";
+    public static final String HTTP_HDL_RESOLVER_URL = "http://hdl.handle.net/";
+    public static final String HDL_RESOLVER_URL = "https://hdl.handle.net/";
+
+    
+    
+    int handlenetIndex;
+    private boolean isIndependentHandleService;
+    private String authHandle;
+    private String keyPath;
+    private String keyPassphrase;
+    
+    public HandlePidProvider(String id, String label, String authority, String shoulder, String identifierGenerationStyle,
+            String datafilePidFormat, String managedList, String excludedList, int index, boolean isIndependentService, String authHandle, String path, String passphrase) {
+        super(id, label, HDL_PROTOCOL, authority, shoulder, identifierGenerationStyle, datafilePidFormat, managedList, excludedList);
+        this.handlenetIndex = index;
+        this.isIndependentHandleService = isIndependentService;
+        this.authHandle = authHandle;
+        this.keyPath = path;
+        this.keyPassphrase = passphrase;
+
+    }
+
+    @Override
+    public boolean registerWhenPublished() {
+        return false; // TODO current value plays safe, can we loosen up?
+    }
+
+    public void reRegisterHandle(DvObject dvObject) {
+        logger.log(Level.FINE,"reRegisterHandle");
+        if (!HDL_PROTOCOL.equals(dvObject.getProtocol())) {
+            logger.log(Level.WARNING, "reRegisterHandle called on a dvObject with the non-handle global id: {0}", dvObject.getId());
+        }
+        
+        String handle = getDvObjectHandle(dvObject);
+
+        boolean handleRegistered = isHandleRegistered(handle);
+        
+        if (handleRegistered) {
+            // Rebuild/Modify an existing handle
+            
+            logger.log(Level.INFO, "Re-registering an existing handle id {0}", handle);
+            
+            String authHandle = getAuthenticationHandle(dvObject);
+
+            HandleResolver resolver = new HandleResolver();
+
+            String datasetUrl = getRegistrationUrl(dvObject);
+            
+            logger.log(Level.INFO, "New registration URL: {0}", datasetUrl);
+
+            PublicKeyAuthenticationInfo auth = getAuthInfo(dvObject.getAuthority());
+            
+            try {
+
+                AdminRecord admin = new AdminRecord(authHandle.getBytes(StandardCharsets.UTF_8), handlenetIndex,
+                        true, true, true, true, true, true,
+                        true, true, true, true, true, true);
+
+                int timestamp = (int) (System.currentTimeMillis() / 1000);
+
+                HandleValue[] val = {new HandleValue(100, "HS_ADMIN".getBytes(StandardCharsets.UTF_8),
+                    Encoder.encodeAdminRecord(admin),
+                    HandleValue.TTL_TYPE_RELATIVE, 86400,
+                    timestamp, null, true, true, true, false), new HandleValue(1, "URL".getBytes(StandardCharsets.UTF_8),
+                    datasetUrl.getBytes(),
+                    HandleValue.TTL_TYPE_RELATIVE, 86400,
+                    timestamp, null, true, true, true, false)};
+
+                ModifyValueRequest req = new ModifyValueRequest(handle.getBytes(StandardCharsets.UTF_8), val, auth);
+
+                resolver.traceMessages = true;
+                AbstractResponse response = resolver.processRequest(req);
+                if (response.responseCode == AbstractMessage.RC_SUCCESS) {
+                    logger.info("\nGot Response: \n" + response);
+                } else {
+                    logger.info("\nGot Error: \n" + response);
+                }
+            } catch (Throwable t) {
+                logger.fine("\nError: " + t);
+            }
+        } else {
+            // Create a new handle from scratch:
+            logger.log(Level.INFO, "Handle {0} not registered. Registering (creating) from scratch.", handle);
+            registerNewHandle(dvObject);
+        }
+    }
+    
+    public Throwable registerNewHandle(DvObject dvObject) {
+        logger.log(Level.FINE,"registerNewHandle");
+        String handlePrefix = dvObject.getAuthority();
+        String handle = getDvObjectHandle(dvObject);
+        String datasetUrl = getRegistrationUrl(dvObject);
+
+        logger.log(Level.INFO, "Creating NEW handle {0}", handle);
+
+        String authHandle = getAuthenticationHandle(dvObject);
+
+        PublicKeyAuthenticationInfo auth = getAuthInfo(handlePrefix);
+        HandleResolver resolver = new HandleResolver();
+
+        try {
+
+            AdminRecord admin = new AdminRecord(authHandle.getBytes(StandardCharsets.UTF_8), handlenetIndex,
+                    true, true, true, true, true, true,
+                    true, true, true, true, true, true);
+
+            int timestamp = (int) (System.currentTimeMillis() / 1000);
+
+            HandleValue[] val = {new HandleValue(100, "HS_ADMIN".getBytes(StandardCharsets.UTF_8),
+                Encoder.encodeAdminRecord(admin),
+                HandleValue.TTL_TYPE_RELATIVE, 86400,
+                timestamp, null, true, true, true, false), new HandleValue(1, "URL".getBytes(StandardCharsets.UTF_8),
+                datasetUrl.getBytes(),
+                HandleValue.TTL_TYPE_RELATIVE, 86400,
+                timestamp, null, true, true, true, false)};
+
+            CreateHandleRequest req
+                    = new CreateHandleRequest(handle.getBytes(StandardCharsets.UTF_8), val, auth);
+
+            resolver.traceMessages = true;
+            AbstractResponse response = resolver.processRequest(req);
+            if (response.responseCode == AbstractMessage.RC_SUCCESS) {
+                logger.log(Level.INFO, "Success! Response: \n{0}", response);
+                return null;
+            } else {
+                logger.log(Level.WARNING, "RegisterNewHandle failed. Error response: {0}", response);
+                return new Exception("registerNewHandle failed: " + response);
+            }
+        } catch (Throwable t) {
+            logger.log(Level.WARNING, "registerNewHandle failed", t);
+            return t;
+        }
+    }
+    
+    public boolean isHandleRegistered(String handle){
+        logger.log(Level.FINE,"isHandleRegistered");
+        boolean handleRegistered = false;
+        ResolutionRequest req = buildResolutionRequest(handle);
+        AbstractResponse response = null;
+        HandleResolver resolver = new HandleResolver();
+        try {
+            response = resolver.processRequest(req);
+        } catch (HandleException ex) {
+            logger.log(Level.WARNING, "Caught exception trying to process lookup request", ex);
+        }
+        if((response!=null && response.responseCode==AbstractMessage.RC_SUCCESS)) {
+            logger.log(Level.INFO, "Handle {0} registered.", handle);
+            handleRegistered = true;
+        } 
+        return handleRegistered;
+    }
+    
+    private ResolutionRequest buildResolutionRequest(final String handle) {
+        logger.log(Level.FINE,"buildResolutionRequest");
+        String handlePrefix = handle.substring(0,handle.indexOf("/"));
+        
+        PublicKeyAuthenticationInfo auth = getAuthInfo(handlePrefix);
+        
+        byte[][] types = null;
+        int[] indexes = null;
+        ResolutionRequest req =
+                new ResolutionRequest(Util.encodeString(handle),
+                types, indexes,
+                auth);
+        req.certify = false;
+        req.cacheCertify = true;
+        req.authoritative = false;
+        req.ignoreRestrictedValues = true;
+        return req;
+    }
+    
+    private PublicKeyAuthenticationInfo getAuthInfo(String handlePrefix) {
+        logger.log(Level.FINE,"getAuthInfo");
+        byte[] key = null;
+        String adminCredFile = getKeyPath();
+       
+        key = readKey(adminCredFile);
+        PrivateKey privkey = null;
+        privkey = readPrivKey(key, adminCredFile);
+        String authHandle =  getAuthenticationHandle(handlePrefix);
+        PublicKeyAuthenticationInfo auth =
+                new PublicKeyAuthenticationInfo(Util.encodeString(authHandle), handlenetIndex, privkey);
+        return auth;
+    }
+    private String getRegistrationUrl(DvObject dvObject) {
+        logger.log(Level.FINE,"getRegistrationUrl");
+        String siteUrl = SystemConfig.getDataverseSiteUrlStatic();
+        String targetUrl = siteUrl + dvObject.getTargetUrl() + "hdl:" + dvObject.getAuthority()
+                + "/" + dvObject.getIdentifier();         
+        return targetUrl;
+    }
+ 
+    public String getSiteUrl() {
+        return SystemConfig.getDataverseSiteUrlStatic();
+    }
+    
+    private byte[] readKey(final String file) {
+        logger.log(Level.FINE,"readKey");
+        byte[] key = null;
+        try {
+            File f = new File(file);
+            FileInputStream fs = new FileInputStream(f);
+            key = new byte[(int)f.length()];
+            int n=0;
+            while(n<key.length) {
+                key[n++] = (byte)fs.read();
+            }
+        } catch (Throwable t){
+            logger.log(Level.SEVERE, "Cannot read private key {0}: {1}", new Object[]{file, t});
+        }
+        return key;
+    }
+    
+    private PrivateKey readPrivKey(byte[] key, final String file) {
+        logger.log(Level.FINE,"readPrivKey");
+        PrivateKey privkey = null;
+        
+        try {
+            byte[] secKey = null;
+            if ( Util.requiresSecretKey(key) ) {
+                secKey = getKeyPassphrase().getBytes(StandardCharsets.UTF_8);
+            }
+            key = Util.decrypt(key, secKey);
+            privkey = Util.getPrivateKeyFromBytes(key, 0);
+        } catch (Throwable t){
+            logger.log(Level.SEVERE, "Can''t load private key in {0}: {1}", new Object[]{file, t});
+        }
+        return privkey;
+    }
+    
+    private String getDvObjectHandle(DvObject dvObject) {
+        /* 
+         * This is different from dataset.getGlobalId() in that we don't 
+         * need the "hdl:" prefix.
+         */
+        String handle = dvObject.getAuthority() + "/" + dvObject.getIdentifier();
+        return handle;
+    }
+    
+    private String getAuthenticationHandle(DvObject dvObject){
+        return getAuthenticationHandle(dvObject.getAuthority());
+    }
+    
+    private String getAuthenticationHandle(String handlePrefix) {
+        logger.log(Level.FINE,"getAuthenticationHandle");
+        if (getHandleAuthHandle()!=null) {
+            return getHandleAuthHandle();
+        } else if (isIndependentHandleService()) {
+            return handlePrefix + "/ADMIN";
+        } else {
+            return "0.NA/" + handlePrefix;
+        }
+    }
+
+    @Override
+    public boolean alreadyRegistered(DvObject dvObject) {
+        String handle = getDvObjectHandle(dvObject);
+        return isHandleRegistered(handle);
+    }
+    
+    @Override
+    public boolean alreadyRegistered(GlobalId pid, boolean noProviderDefault) throws Exception {
+        String handle = pid.getAuthority() + "/" + pid.getIdentifier();
+        return isHandleRegistered(handle);
+    }
+    
+    @Override
+    public Map<String,String> getIdentifierMetadata(DvObject dvObject) {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception  {
+        logger.log(Level.FINE,"modifyIdentifier");
+        reRegisterHandle(dvObject);
+        if(dvObject instanceof Dataset){
+            Dataset dataset = (Dataset) dvObject;
+            dataset.getFiles().forEach((df) -> {
+                reRegisterHandle(df);
+            });            
+        }
+        return getIdentifier(dvObject);
+    }
+
+    @Override
+    public void deleteIdentifier(DvObject dvObject) throws Exception  {
+        String handle = getDvObjectHandle(dvObject);
+        String authHandle = getAuthenticationHandle(dvObject);
+    
+        String adminCredFile = getKeyPath();
+        
+        byte[] key = readKey(adminCredFile);
+        PrivateKey privkey = readPrivKey(key, adminCredFile);
+
+        HandleResolver resolver = new HandleResolver();
+        resolver.setSessionTracker(new ClientSessionTracker());
+
+        PublicKeyAuthenticationInfo auth =
+                new PublicKeyAuthenticationInfo(Util.encodeString(authHandle), handlenetIndex, privkey);
+
+        DeleteHandleRequest req =
+                new DeleteHandleRequest(Util.encodeString(handle), auth);
+        AbstractResponse response=null;
+        try {
+            response = resolver.processRequest(req);
+        } catch (HandleException ex) {
+            ex.printStackTrace();
+        }
+        if(response==null || response.responseCode!=AbstractMessage.RC_SUCCESS) {
+            logger.fine("error deleting '"+handle+"': "+response);
+        } else {
+            logger.fine("deleted "+handle);
+        }
+    }
+
+    private boolean updateIdentifierStatus(DvObject dvObject, String statusIn) {
+        logger.log(Level.FINE,"updateIdentifierStatus");
+        reRegisterHandle(dvObject); // No Need to register new - this is only called when a handle exists
+        return true;
+    }
+    
+    @Override
+    public List<String> getProviderInformation(){
+        return List.of(getId(), HDL_RESOLVER_URL);
+    }
+
+
+    @Override
+    public String createIdentifier(DvObject dvObject) throws Throwable {
+        Throwable result = registerNewHandle(dvObject);
+        if (result != null)
+            throw result;
+        // TODO get exceptions from under the carpet
+        return getDvObjectHandle(dvObject);
+
+    }
+
+
+    @Override
+    public boolean publicizeIdentifier(DvObject dvObject) {
+        if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()){
+            generatePid(dvObject);
+        }
+        return updateIdentifierStatus(dvObject, "public");
+
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String pidString) {
+        if (pidString.startsWith(HDL_RESOLVER_URL)) {
+            pidString = pidString.replace(HDL_RESOLVER_URL, (HDL_PROTOCOL + ":"));
+        } else if (pidString.startsWith(HTTP_HDL_RESOLVER_URL)) {
+            pidString = pidString.replace(HTTP_HDL_RESOLVER_URL, (HDL_PROTOCOL + ":"));
+        }
+        return super.parsePersistentId(pidString);
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String protocol, String identifierString) {
+        if (!HDL_PROTOCOL.equals(protocol)) {
+            return null;
+        }
+        GlobalId globalId = super.parsePersistentId(protocol, identifierString);
+        return globalId;
+    }
+    
+    @Override
+    public GlobalId parsePersistentId(String protocol, String authority, String identifier) {
+        if (!HDL_PROTOCOL.equals(protocol)) {
+            return null;
+        }
+        return super.parsePersistentId(protocol, authority, identifier);
+    }
+
+    @Override
+    public String getUrlPrefix() {
+        return HDL_RESOLVER_URL;
+    }
+
+    @Override
+    public String getProtocol() {
+        return HDL_PROTOCOL;
+    }
+
+    @Override
+    public String getProviderType() {
+        return TYPE;
+    }
+
+    public String getKeyPath() {
+        return keyPath;
+    }
+
+    public String getKeyPassphrase() {
+        return keyPassphrase;
+    }
+
+    public boolean isIndependentHandleService() {
+        return isIndependentHandleService;
+    }
+    
+    public String getHandleAuthHandle() {
+        return authHandle;
+    }
+}
+
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/handle/HandleProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/handle/HandleProviderFactory.java
new file mode 100644
index 00000000000..eef5bed8432
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/handle/HandleProviderFactory.java
@@ -0,0 +1,45 @@
+package edu.harvard.iq.dataverse.pidproviders.handle;
+
+import com.google.auto.service.AutoService;
+
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactory;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
+@AutoService(PidProviderFactory.class)
+public class HandleProviderFactory implements PidProviderFactory {
+    
+    @Override
+    public PidProvider createPidProvider(String providerId) {
+        String providerType = JvmSettings.PID_PROVIDER_TYPE.lookup(providerId);
+        if (!providerType.equals(HandlePidProvider.TYPE)) {
+            // Being asked to create a non-EZId provider
+            return null;
+        }
+        String providerLabel = JvmSettings.PID_PROVIDER_LABEL.lookup(providerId);
+        String providerAuthority = JvmSettings.PID_PROVIDER_AUTHORITY.lookup(providerId);
+        String providerShoulder = JvmSettings.PID_PROVIDER_SHOULDER.lookupOptional(providerId).orElse("");
+        String identifierGenerationStyle = JvmSettings.PID_PROVIDER_IDENTIFIER_GENERATION_STYLE
+                .lookupOptional(providerId).orElse("randomString");
+        String datafilePidFormat = JvmSettings.PID_PROVIDER_DATAFILE_PID_FORMAT.lookupOptional(providerId)
+                .orElse(SystemConfig.DataFilePIDFormat.DEPENDENT.toString());
+        String managedList = JvmSettings.PID_PROVIDER_MANAGED_LIST.lookupOptional(providerId).orElse("");
+        String excludedList = JvmSettings.PID_PROVIDER_EXCLUDED_LIST.lookupOptional(providerId).orElse("");
+
+        int index = JvmSettings.HANDLENET_INDEX.lookupOptional(Integer.class, providerId).orElse(300);
+        boolean independentHandleService = JvmSettings.HANDLENET_INDEPENDENT_SERVICE
+                .lookupOptional(Boolean.class, providerId).orElse(false);
+        String handleAuthHandle = JvmSettings.HANDLENET_AUTH_HANDLE.lookup(providerId);
+        String path = JvmSettings.HANDLENET_KEY_PATH.lookup(providerId);
+        String passphrase = JvmSettings.HANDLENET_KEY_PASSPHRASE.lookup(providerId);
+        return new HandlePidProvider(providerId, providerLabel, providerAuthority, providerShoulder, identifierGenerationStyle,
+                datafilePidFormat, managedList, excludedList, index, independentHandleService, handleAuthHandle, path,
+                passphrase);
+    }
+
+    public String getType() {
+        return HandlePidProvider.TYPE;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/handle/UnmanagedHandlePidProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/handle/UnmanagedHandlePidProvider.java
new file mode 100644
index 00000000000..075e10d8164
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/handle/UnmanagedHandlePidProvider.java
@@ -0,0 +1,114 @@
+package edu.harvard.iq.dataverse.pidproviders.handle;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider;
+
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jakarta.ejb.Stateless;
+import org.apache.commons.lang3.NotImplementedException;
+
+/**
+ * This class is just used to parse Handles that are not managed by any account
+ * configured in Dataverse It does not implement any of the methods related to
+ * PID CRUD
+ * 
+ */
+
+public class UnmanagedHandlePidProvider extends AbstractPidProvider {
+
+    private static final Logger logger = Logger.getLogger(UnmanagedHandlePidProvider.class.getCanonicalName());
+    public static final String ID = "UnmanagedHandleProvider";
+
+    public UnmanagedHandlePidProvider() {
+        // Also using ID as label
+        super(ID, ID, HandlePidProvider.HDL_PROTOCOL);
+        logger.log(Level.FINE, "Constructor");
+
+    }
+
+    @Override
+    public boolean canManagePID() {
+        return false;
+    }
+
+    @Override
+    public boolean registerWhenPublished() {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public boolean alreadyRegistered(GlobalId pid, boolean noProviderDefault) throws Exception {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public Map<String, String> getIdentifierMetadata(DvObject dvObject) {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public void deleteIdentifier(DvObject dvObject) throws Exception {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public List<String> getProviderInformation() {
+        return List.of(getId(), "");
+    }
+
+    @Override
+    public String createIdentifier(DvObject dvObject) throws Throwable {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public boolean publicizeIdentifier(DvObject dvObject) {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String pidString) {
+        if (pidString.startsWith(HandlePidProvider.HDL_RESOLVER_URL)) {
+            pidString = pidString.replace(HandlePidProvider.HDL_RESOLVER_URL, (HandlePidProvider.HDL_PROTOCOL + ":"));
+        } else if (pidString.startsWith(HandlePidProvider.HTTP_HDL_RESOLVER_URL)) {
+            pidString = pidString.replace(HandlePidProvider.HTTP_HDL_RESOLVER_URL,
+                    (HandlePidProvider.HDL_PROTOCOL + ":"));
+        }
+        return super.parsePersistentId(pidString);
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String protocol, String identifierString) {
+        if (!HandlePidProvider.HDL_PROTOCOL.equals(protocol)) {
+            return null;
+        }
+        GlobalId globalId = super.parsePersistentId(protocol, identifierString);
+        return globalId;
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String protocol, String authority, String identifier) {
+        if (!HandlePidProvider.HDL_PROTOCOL.equals(protocol)) {
+            return null;
+        }
+        return super.parsePersistentId(protocol, authority, identifier);
+    }
+
+    @Override
+    public String getUrlPrefix() {
+        return HandlePidProvider.HDL_RESOLVER_URL;
+    }
+
+    @Override
+    public String getProviderType() {
+        return "unamagedHandle";
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkPidProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkPidProvider.java
new file mode 100644
index 00000000000..2cc0d41ede7
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkPidProvider.java
@@ -0,0 +1,204 @@
+package edu.harvard.iq.dataverse.pidproviders.perma;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+/**
+ * PermaLink provider This is a minimalist permanent ID provider intended for
+ * use with 'real' datasets/files where the use case none-the-less doesn't lend
+ * itself to the use of DOIs or Handles, e.g. * due to cost * for a
+ * catalog/archive where Dataverse has a dataset representing a dataset with
+ * DOI/handle stored elsewhere
+ * 
+ * The initial implementation will mint identifiers locally and will provide the
+ * existing page URLs (using the ?persistentID=<id> format). This will be
+ * overridable by a configurable parameter to support use of an external
+ * resolver.
+ * 
+ * Note that while PermaLinks are nominally case sensitive, Dataverse makes 
+ * case-insensitve database look-ups to find them (See #11003). That said, database
+ * entries are stored in the case matching the configuration of the provider.
+ */
+public class PermaLinkPidProvider extends AbstractPidProvider {
+
+    private static final Logger logger = Logger.getLogger(PermaLinkPidProvider.class.getCanonicalName());
+
+    public static final String PERMA_PROTOCOL = "perma";
+    public static final String TYPE = "perma";
+    public static final String SEPARATOR = "";
+
+    // ToDo - remove
+    @Deprecated
+    public static final String PERMA_RESOLVER_URL = JvmSettings.PERMALINK_BASE_URL.lookupOptional("permalink")
+            .orElse(SystemConfig.getDataverseSiteUrlStatic());
+
+    
+    private String separator = SEPARATOR;
+
+    private String baseUrl;
+
+    public PermaLinkPidProvider(String id, String label, String providerAuthority, String providerShoulder, String identifierGenerationStyle,
+            String datafilePidFormat, String managedList, String excludedList, String baseUrl, String separator) {
+        super(id, label, PERMA_PROTOCOL, providerAuthority, providerShoulder, identifierGenerationStyle, datafilePidFormat,
+                managedList, excludedList);
+        this.baseUrl = baseUrl;
+        this.separator = separator;
+    }
+
+    @Override
+    public String getSeparator() {
+        return separator;
+    }
+
+    @Override
+    public boolean alreadyRegistered(GlobalId globalId, boolean noProviderDefault) {
+        // Perma doesn't manage registration, so we assume all local PIDs can be treated
+        // as registered
+        boolean existsLocally = !pidProviderService.isGlobalIdLocallyUnique(globalId);
+        return existsLocally ? existsLocally : noProviderDefault;
+    }
+
+    @Override
+    public boolean registerWhenPublished() {
+        return false;
+    }
+
+    @Override
+    public List<String> getProviderInformation() {
+        return List.of(getId(), getBaseUrl());
+    }
+
+    @Override
+    public String createIdentifier(DvObject dvo) throws Throwable {
+        // Call external resolver and send landing URL?
+        // FWIW: Return value appears to only be used in RegisterDvObjectCommand where
+        // success requires finding the dvo identifier in this string. (Also logged a
+        // couple places).
+        return (dvo.getGlobalId().asString());
+    }
+
+    @Override
+    public Map<String, String> getIdentifierMetadata(DvObject dvo) {
+        Map<String, String> map = new HashMap<>();
+        return map;
+    }
+
+    @Override
+    public String modifyIdentifierTargetURL(DvObject dvo) throws Exception {
+        return getTargetUrl(dvo);
+    }
+
+    @Override
+    public void deleteIdentifier(DvObject dvo) throws Exception {
+        // no-op
+    }
+
+    @Override
+    public boolean publicizeIdentifier(DvObject dvObject) {
+        // Generate if needed (i.e. datafile case where we don't create/register early
+        // (even with registerWhenPublished == false))
+        if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) {
+            dvObject = generatePid(dvObject);
+        }
+        // Call external resolver and send landing URL?
+        return true;
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String pidString) {
+        // ToDo - handle local PID resolver for dataset/file
+        logger.info("Parsing in Perma: " + pidString);
+        if (pidString.startsWith(getUrlPrefix())) {
+            pidString = pidString.replace(getUrlPrefix(), (PERMA_PROTOCOL + ":"));
+        }
+        return super.parsePersistentId(pidString);
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String protocol, String identifierString) {
+        logger.info("Checking Perma: " + identifierString);
+        if (!PERMA_PROTOCOL.equals(protocol)) {
+            return null;
+        }
+        String cleanIdentifier = PERMA_PROTOCOL + ":" + identifierString;
+        // With permalinks, we have to check the sets before parsing since the permalinks in these sets could have different authority, spearator, and shoulders
+        if (getExcludedSet().contains(cleanIdentifier)) {
+            return null;
+        }
+        if(getManagedSet().contains(cleanIdentifier)) {
+            /** With a variable separator that could also be empty, there is no way to determine the authority and shoulder for an unknown permalink.
+             * Since knowing this split isn't relevant for permalinks except for minting, the code below just assumes the authority
+             * is the first 4 characters and that the separator and the shoulder are empty.
+             * If this is found to cause issues, users should be able to use a managed permalink provider as a work-around. The code here could 
+             * be changed to allow default lengths for the authority, separator, and shoulder and/or to add a list of known (but unmanaged) authority, separator, shoulder combos.
+             */
+            if(identifierString.length() < 4) {
+                return new GlobalId(protocol, "", identifierString, SEPARATOR, getUrlPrefix(),
+                        getId());
+            }
+            return new GlobalId(protocol, identifierString.substring(0,4), identifierString.substring(4), SEPARATOR, getUrlPrefix(),
+                    getId());
+        }
+        String identifier = null;
+        if (getAuthority() != null) {
+            if (identifierString.startsWith(getAuthority())) {
+                identifier = identifierString.substring(getAuthority().length());
+            } else {
+                //Doesn't match authority
+                return null;
+            }
+            if (identifier.startsWith(separator)) {
+                identifier = identifier.substring(separator.length());
+            } else {
+                //Doesn't match separator
+                return null;
+            }
+        }
+        identifier = PidProvider.formatIdentifierString(identifier);
+        if (PidProvider.testforNullTerminator(identifier)) {
+            return null;
+        }
+        if(!identifier.startsWith(getShoulder())) {
+            //Doesn't match shoulder
+            return null;
+        }
+        return new GlobalId(PERMA_PROTOCOL, getAuthority(), identifier, separator, getUrlPrefix(), getId());
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String protocol, String authority, String identifier) {
+        if (!PERMA_PROTOCOL.equals(protocol)) {
+            return null;
+        }
+        return super.parsePersistentId(protocol, authority, identifier);
+    }
+
+    @Override
+    public String getUrlPrefix() {
+
+        return getBaseUrl();
+    }
+
+    @Override
+    public String getProtocol() {
+        return PERMA_PROTOCOL;
+    }
+
+    @Override
+    public String getProviderType() {
+        return PERMA_PROTOCOL;
+    }
+
+    public String getBaseUrl() {
+        return baseUrl;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkProviderFactory.java
new file mode 100644
index 00000000000..ca75fbff3a8
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkProviderFactory.java
@@ -0,0 +1,43 @@
+package edu.harvard.iq.dataverse.pidproviders.perma;
+
+import com.google.auto.service.AutoService;
+
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactory;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
+@AutoService(PidProviderFactory.class)
+public class PermaLinkProviderFactory implements PidProviderFactory {
+    
+    @Override
+    public PidProvider createPidProvider(String providerId) {
+        String providerType = JvmSettings.PID_PROVIDER_TYPE.lookup(providerId);
+        if (!providerType.equals(PermaLinkPidProvider.TYPE)) {
+            // Being asked to create a non-EZId provider
+            return null;
+        }
+        String providerLabel = JvmSettings.PID_PROVIDER_LABEL.lookup(providerId);
+        String providerAuthority = JvmSettings.PID_PROVIDER_AUTHORITY.lookup(providerId);
+        String providerShoulder = JvmSettings.PID_PROVIDER_SHOULDER.lookupOptional(providerId).orElse("");
+        String identifierGenerationStyle = JvmSettings.PID_PROVIDER_IDENTIFIER_GENERATION_STYLE
+                .lookupOptional(providerId).orElse("randomString");
+        String datafilePidFormat = JvmSettings.PID_PROVIDER_DATAFILE_PID_FORMAT.lookupOptional(providerId)
+                .orElse(SystemConfig.DataFilePIDFormat.DEPENDENT.toString());
+        String managedList = JvmSettings.PID_PROVIDER_MANAGED_LIST.lookupOptional(providerId).orElse("");
+        String excludedList = JvmSettings.PID_PROVIDER_EXCLUDED_LIST.lookupOptional(providerId).orElse("");
+
+        String baseUrl = JvmSettings.PERMALINK_BASE_URL.lookupOptional(providerId)
+                .orElse(SystemConfig.getDataverseSiteUrlStatic() + "/citation?persistentId=" + PermaLinkPidProvider.PERMA_PROTOCOL + ":");
+        ;
+        String separator = JvmSettings.PERMALINK_SEPARATOR.lookupOptional(providerId).orElse("");
+
+        return new PermaLinkPidProvider(providerId, providerLabel, providerAuthority, providerShoulder, identifierGenerationStyle,
+                datafilePidFormat, managedList, excludedList, baseUrl, separator);
+    }
+
+    public String getType() {
+        return PermaLinkPidProvider.TYPE;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/UnmanagedPermaLinkPidProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/UnmanagedPermaLinkPidProvider.java
new file mode 100644
index 00000000000..b7961a41c50
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/UnmanagedPermaLinkPidProvider.java
@@ -0,0 +1,114 @@
+package edu.harvard.iq.dataverse.pidproviders.perma;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jakarta.ejb.Stateless;
+import org.apache.commons.lang3.NotImplementedException;
+
+/** This class is just used to parse Handles that are not managed by any account configured in Dataverse
+ * It does not implement any of the methods related to PID CRUD
+ * 
+ */
+public class UnmanagedPermaLinkPidProvider extends AbstractPidProvider {
+
+    private static final Logger logger = Logger.getLogger(UnmanagedPermaLinkPidProvider.class.getCanonicalName());
+    public static final String ID = "UnmanagedPermaLinkProvider";
+    
+    public UnmanagedPermaLinkPidProvider() {
+        // Also using ID as label
+        super(ID, ID, PermaLinkPidProvider.PERMA_PROTOCOL);
+        logger.log(Level.FINE, "Constructor");
+    }
+
+    @Override
+    public boolean canManagePID() {
+        return false;
+    }
+
+    @Override
+    public boolean registerWhenPublished() {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public boolean alreadyRegistered(GlobalId pid, boolean noProviderDefault) throws Exception {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public Map<String, String> getIdentifierMetadata(DvObject dvObject) {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public void deleteIdentifier(DvObject dvObject) throws Exception {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public List<String> getProviderInformation() {
+        return List.of(getId(), "");
+    }
+
+    @Override
+    public String createIdentifier(DvObject dvObject) throws Throwable {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public boolean publicizeIdentifier(DvObject dvObject) {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String protocol, String identifierString) {
+        if (!PermaLinkPidProvider.PERMA_PROTOCOL.equals(protocol)) {
+            return null;
+        }
+        /** With a variable separator that could also be empty, there is no way to determine the authority and shoulder for an unknown/unmanaged permalink.
+         * Since knowing this split isn't relevant for unmanaged permalinks, the code below just assumes the authority
+         * is the first 4 characters and that the separator and the shoulder are empty.
+         * If this is found to cause issues, users should be able to use a managed permalink provider as a work-around. The code here could 
+         * be changed to allow default lengths for the authority, separator, and shoulder and/or to add a list of known (but unmanaged) authority, separator, shoulder combos.
+         */
+        if(identifierString.length() < 4) {
+            logger.warning("A short unmanaged permalink was found - assuming the authority is empty: " + identifierString);
+            return super.parsePersistentId(protocol, "", identifierString);
+        }
+        return super.parsePersistentId(protocol, identifierString.substring(0, 4), identifierString.substring(4));
+    }
+
+    @Override
+    public GlobalId parsePersistentId(String protocol, String authority, String identifier) {
+        if (!PermaLinkPidProvider.PERMA_PROTOCOL.equals(protocol)) {
+            return null;
+        }
+        return super.parsePersistentId(protocol, authority, identifier);
+    }
+
+    @Override
+    public String getUrlPrefix() {
+        return SystemConfig.getDataverseSiteUrlStatic()+ "/citation?persistentId=" + PermaLinkPidProvider.PERMA_PROTOCOL + ":";
+    }
+
+    @Override
+    public String getProviderType() {
+        return PermaLinkPidProvider.TYPE;
+    }
+    
+    @Override
+    public String getSeparator() {
+        return PermaLinkPidProvider.SEPARATOR;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrl.java b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrl.java
index ff3a14ec72e..63b5bf03ea7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrl.java
+++ b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrl.java
@@ -30,7 +30,7 @@ public class PrivateUrl {
 
     public PrivateUrl(RoleAssignment roleAssignment, Dataset dataset, String dataverseSiteUrl) {
         this.token = roleAssignment.getPrivateUrlToken();
-        this.link = dataverseSiteUrl + "/privateurl.xhtml?token=" + token;
+        this.link = dataverseSiteUrl + "/previewurl.xhtml?token=" + token;
         this.dataset = dataset;
         this.roleAssignment = roleAssignment;
     }
@@ -51,4 +51,8 @@ public String getLink() {
         return link;
     }
 
+    public boolean isAnonymizedAccess() {
+        return roleAssignment.isAnonymizedAccess();
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlPage.java b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlPage.java
index e8bc9fc3da7..17c622be9e2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlPage.java
@@ -1,13 +1,17 @@
 package edu.harvard.iq.dataverse.privateurl;
 
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
 import edu.harvard.iq.dataverse.DataverseSession;
+import edu.harvard.iq.dataverse.PermissionsWrapper;
 import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
 import java.io.Serializable;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 /**
  * Backing bean for JSF page. Sets session to {@link PrivateUrlUser}. 
@@ -20,8 +24,14 @@ public class PrivateUrlPage implements Serializable {
 
     @EJB
     PrivateUrlServiceBean privateUrlService;
+    @EJB
+    DatasetServiceBean datasetServiceBean;
     @Inject
     DataverseSession session;
+    @Inject
+    PermissionsWrapper permissionsWrapper;
+    @Inject
+    DataverseRequestServiceBean dvRequestService;
 
     /**
      * The unique string used to look up a PrivateUrlUser and the associated
@@ -34,8 +44,16 @@ public String init() {
             PrivateUrlRedirectData privateUrlRedirectData = privateUrlService.getPrivateUrlRedirectDataFromToken(token);
             String draftDatasetPageToBeRedirectedTo = privateUrlRedirectData.getDraftDatasetPageToBeRedirectedTo() + "&faces-redirect=true";
             PrivateUrlUser privateUrlUser = privateUrlRedirectData.getPrivateUrlUser();
-            session.setUser(privateUrlUser);
-            session.configureSessionTimeout();
+            boolean sessionUserCanViewUnpublishedDataset = false;
+            if (session.getUser().isAuthenticated()){
+                Long datasetId = privateUrlUser.getDatasetId();
+                Dataset dataset = datasetServiceBean.find(datasetId);
+                sessionUserCanViewUnpublishedDataset = permissionsWrapper.canViewUnpublishedDataset(dvRequestService.getDataverseRequest(), dataset);
+            }
+            if(!sessionUserCanViewUnpublishedDataset){
+                //Only Reset if user cannot view this Draft Version
+                session.setUser(privateUrlUser); 
+            }
             logger.info("Redirecting PrivateUrlUser '" + privateUrlUser.getIdentifier() + "' to " + draftDatasetPageToBeRedirectedTo);
             return draftDatasetPageToBeRedirectedTo;
         } catch (Exception ex) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlServiceBean.java
index efe64052c4a..01710e06f8f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlServiceBean.java
@@ -2,19 +2,20 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.Serializable;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 
 /**
  *
@@ -61,6 +62,13 @@ public PrivateUrlRedirectData getPrivateUrlRedirectDataFromToken(String token) {
         return PrivateUrlUtil.getPrivateUrlRedirectData(getRoleAssignmentFromPrivateUrlToken(token));
     }
 
+    /**
+     * @return DatasetVersion if it can be found using the token or null.
+     */
+    public DatasetVersion getDraftDatasetVersionFromToken(String token) {
+        return PrivateUrlUtil.getDraftDatasetVersionFromRoleAssignment(getRoleAssignmentFromPrivateUrlToken(token));
+    }
+
     /**
      * @return A RoleAssignment or null.
      *
@@ -88,7 +96,7 @@ private RoleAssignment getRoleAssignmentFromPrivateUrlToken(String privateUrlTok
      *
      * @todo This might be a good place for Optional.
      */
-    private RoleAssignment getPrivateUrlRoleAssignmentFromDataset(Dataset dataset) {
+    public RoleAssignment getPrivateUrlRoleAssignmentFromDataset(Dataset dataset) {
         if (dataset == null) {
             return null;
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtil.java b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtil.java
index 0a092f36851..e9d95e2faf4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtil.java
@@ -93,7 +93,7 @@ static public PrivateUrlUser getPrivateUrlUserFromRoleAssignment(RoleAssignment
         }
         Dataset dataset = getDatasetFromRoleAssignment(roleAssignment);
         if (dataset != null) {
-            PrivateUrlUser privateUrlUser = new PrivateUrlUser(dataset.getId());
+            PrivateUrlUser privateUrlUser = new PrivateUrlUser(dataset.getId(), roleAssignment.isAnonymizedAccess());
             return privateUrlUser;
         }
         return null;
@@ -130,7 +130,7 @@ static String getDraftDatasetPageToBeRedirectedTo(RoleAssignment roleAssignment)
     static String getDraftUrl(DatasetVersion draft) {
         if (draft != null) {
             Dataset dataset = draft.getDataset();
-            if (dataset != null) {
+            if (dataset != null && dataset.getGlobalId()!=null) {
                 if ( dataset.getGlobalId().isComplete() ) {
                     String relativeUrl = "/dataset.xhtml?persistentId=" + dataset.getGlobalId().toString() + "&version=DRAFT";
                     return relativeUrl;
diff --git a/src/main/java/edu/harvard/iq/dataverse/privateurl/package-info.java b/src/main/java/edu/harvard/iq/dataverse/privateurl/package-info.java
index 16ba6e5bf4c..1310e0eb199 100644
--- a/src/main/java/edu/harvard/iq/dataverse/privateurl/package-info.java
+++ b/src/main/java/edu/harvard/iq/dataverse/privateurl/package-info.java
@@ -1,12 +1,19 @@
 /**
- * Private URL for unpublished datasets.
+ * Preview URL for unpublished datasets.
  * <p>
- * The Private URL feature has been implemented as a specialized role assignment
+ * The Preview (formerly Private) URL feature has been implemented as a specialized role assignment
  * with an associated token that permits read-only access to the metadata and
  * all files (regardless of if the files are restricted or not) of a draft
  * version of a dataset.
  * <p>
- * The primary use case for a Private URL is for journal editors to send a link
+ * As of this note, a second option - to create a Preview URL that provides an
+ * anonymized view of the dataset has been added. This option works the same as
+ * the original except that it hides author names in the citation block, hides
+ * the values for an admin specified list of metadata fields, disables citation
+ * downloads, and disables API access (except for file and file thumbnail
+ * downloads which are used by the UI).
+ * <p>
+ * The primary use case for a Preview URL is for journal editors to send a link
  * to reviewers of a dataset before publication. In most cases, these journal
  * editors do not permit depositors to publish on their own, which is to say
  * they only allow depositors to have the "Contributor" role on the datasets
@@ -17,34 +24,42 @@
  * the depositor, who is in charge of both the security of the dataset and the
  * timing of when the dataset is published.
  * <p>
- * A secondary use case for a Private URL is for depositors who have the ability
+ * A secondary use case for a Preview URL is for depositors who have the ability
  * to manage permissions on their dataset (depositors who have the "Curator" or
  * "Admin" role, which grants much more power than the "Contributor" role) to
  * send a link to coauthors or other trusted parties to preview the dataset
  * before the depositors publish the dataset on their own. For better security,
  * these depositors could ask their coauthors to create Dataverse accounts and
- * assign roles to them directly, rather than using a Private URL which requires
+ * assign roles to them directly, rather than using a Preview URL which requires
  * no username or password.
  * <p>
- * The token associated with the Private URL role assignment that can be used
- * either in the GUI or via the API to elevate privileges beyond what a "Guest"
- * can see. The ability to use a Private URL token via API was added mostly to
- * facilitate automated testing of the feature but the far more common case is
- * expected to be use of the Private URL token in a link that is clicked to open
- * a browser, similar to links shared via Dropbox, Google, etc.
+ * As of this note, a second option aimed specifically at the review use case -
+ * to create a Preview URL that provides an anonymized view of the dataset - has
+ * been added. This option works the same as the original except that it hides
+ * author names in the citation block, hides the values for an admin specified
+ * list of metadata fields, disables citation downloads, and disables API access
+ * (except for file and file thumbnail downloads which are used by the UI).
+ * <p>
+ * The token associated with the Preview URL role assignment that can be used
+ * either in the GUI or, for the non-anonymized-access option, via the API to
+ * elevate privileges beyond what a "Guest" can see. The ability to use a
+ * Preview URL token via API was added mostly to facilitate automated testing of
+ * the feature but the far more common case is expected to be use of the Preview
+ * URL token in a link that is clicked to open a browser, similar to links
+ * shared via Dropbox, Google, etc.
  * <p>
- * When reviewers click a Private URL their browser sessions are set to the
+ * When reviewers click a Preview URL their browser sessions are set to the
  * "{@link edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser}" that
  * has the "Member" role only on the dataset in question and redirected to that
  * dataset, where they will see an indication in blue at the top of the page
  * that they are viewing an unpublished dataset. If the reviewer happens to be
  * logged into Dataverse already, clicking the link will log them out because
  * the review is meant to be blind. Because the dataset is always in draft when
- * a Private URL is in effect, no downloads or any other activity by the
- * reviewer are logged to the guestbook. All reviewers click the same Private
+ * a Preview URL is in effect, no downloads or any other activity by the
+ * reviewer are logged to the guestbook. All reviewers click the same Preview
  * URL containing the same token, and with the exception of an IP address being
  * logged, it should be impossible to trace which reviewers have clicked a
- * Private URL. If the reviewer navigates to the home page, the session is set
+ * Preview URL. If the reviewer navigates to the home page, the session is set
  * to the Guest user and they will see what a Guest would see.
  * <p>
  * The "Member" role is used because it contains the necessary read-only
@@ -61,43 +76,51 @@
  * version. A Member can also download restricted files that have been deleted
  * from previously published versions.
  * <p>
- * Likewise, when a Private URL token is used via API, commands are executed
+ * Likewise, when a Preview URL token is used via API, commands are executed
  * using the "PrivateUrlUser" that has the "Member" role only on the dataset in
  * question. This means that read-only operations such as downloads of the
- * dataset's files are permitted. The Search API does not respect the Private
- * URL token but you can download unpublished metadata using the Native API and
- * download files using the Access API.
+ * dataset's files are permitted. The Search API does not respect the Preview
+ * URL token but you can download files using the Access API, and, with the
+ * non-anonymized-access option, download unpublished metadata using the Native
+ * API.
  * <p>
- * A Private URL cannot be created for a published version of a dataset. In the
+ * A Preview URL cannot be created for a published version of a dataset. In the
  * GUI, you will be reminded of this fact with a popup. The API will explain
  * this as well.
  * <p>
- * If a draft dataset containing a Private URL is published, the Private URL is
- * deleted. This means that reviewers who click the link after publication will
- * see a 404.
+ * An anonymized-access Preview URL can't be created if any published dataset
+ * version exists. The primary reason for this is that, since datasets have
+ * DOIs, the full metadata about published versions is available directly from
+ * the DOI provider. (While the metadata for that version could be somewhat
+ * different, in practice it would probably provide a means of identifying
+ * some/all of the authors).
+ * <p>
+ * If a draft dataset containing a Preview URL is
+ * published, the Preview URL is deleted. This means that reviewers who click
+ * the link after publication will see a 404.
  * <p>
- * If a post-publication draft containing a Private URL is deleted, the Private
+ * If a post-publication draft containing a Preview URL is deleted, the Preview
  * URL is deleted. This is to ensure that if a new draft is created in the
  * future, a new token will be used.
  * <p>
- * The creation and deletion of a Private URL are limited to the "Curator" and
+ * The creation and deletion of a Preview URL are limited to the "Curator" and
  * "Admin" roles because only those roles have the permission called
  * "ManageDatasetPermissions", which is the permission used by the
  * "AssignRoleCommand" and "RevokeRoleCommand" commands. If you have the
- * permission to create or delete a Private URL, the fact that a Private URL is
+ * permission to create or delete a Preview URL, the fact that a Preview URL is
  * enabled for a dataset will be indicated in blue at the top of the page.
  * Success messages are shown at the top of the page when you create or delete a
- * Private URL. In the GUI, deleting a Private URL is called "disabling" and you
+ * Preview URL. In the GUI, deleting a Preview URL is called "disabling" and you
  * will be prompted for a confirmation. No matter what you call it the role is
- * revoked. You can also delete a Private URL by revoking the role.
+ * revoked. You can also delete a Preview URL by revoking the role.
  * <p>
  * A "Contributor" does not have the "ManageDatasetPermissions" permission and
- * cannot see "Permissions" nor "Private URL" under the "Edit" menu of their
- * dataset. When a Curator or Admin has enabled a Private URL on a Contributor's
- * dataset, the Contributor does not see a visual indication that a Private URL
+ * cannot see "Permissions" nor "Preview URL" under the "Edit" menu of their
+ * dataset. When a Curator or Admin has enabled a Preview URL on a Contributor's
+ * dataset, the Contributor does not see a visual indication that a Preview URL
  * has been enabled for their dataset.
  * <p>
- * There is no way for an "Admin" or "Curator" to see when a Private URL was
+ * There is no way for an "Admin" or "Curator" to see when a Preview URL was
  * created or deleted for a dataset but someone who has access to the database
  * can see that the following commands are logged to the "actionlogrecord"
  * database table:
@@ -106,8 +129,8 @@
  * <li>{@link edu.harvard.iq.dataverse.engine.command.impl.CreatePrivateUrlCommand}</li>
  * <li>{@link edu.harvard.iq.dataverse.engine.command.impl.DeletePrivateUrlCommand}</li>
  * </ul>
- * See also the Private URL To Unpublished Dataset BRD at
- * <a href="https://docs.google.com/document/d/1FT47QkZKcmjSgRnePaJO2g1nzcotLyN3Yb2ORvBr6cs/edit?usp=sharing">
+ * See also the Preview URL To Unpublished Dataset BRD at <a href=
+ * "https://docs.google.com/document/d/1FT47QkZKcmjSgRnePaJO2g1nzcotLyN3Yb2ORvBr6cs/edit?usp=sharing">
  * https://docs.google.com/document/d/1FT47QkZKcmjSgRnePaJO2g1nzcotLyN3Yb2ORvBr6cs/edit?usp=sharing</a>
  */
 package edu.harvard.iq.dataverse.privateurl;
diff --git a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvEntityFileDataConverter.java b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvEntityFileDataConverter.java
index cd3fb42ab84..ba5aba1b69b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvEntityFileDataConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvEntityFileDataConverter.java
@@ -1,10 +1,11 @@
 package edu.harvard.iq.dataverse.provenance;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
+import jakarta.inject.Inject;
 
 /**
  *
@@ -14,8 +15,8 @@
 @FacesConverter("provEntityFileDataConverter")
 public class ProvEntityFileDataConverter implements Converter{
 
-    @Inject
-    ProvPopupFragmentBean provBean;
+    //@Inject
+    ProvPopupFragmentBean provBean = CDI.current().select(ProvPopupFragmentBean.class).get();
     
     @Override
     public Object getAsObject(FacesContext context, UIComponent component, String value) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvInvestigator.java b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvInvestigator.java
index a17e77f2a9e..c2eecb90d9e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvInvestigator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvInvestigator.java
@@ -5,12 +5,12 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import edu.harvard.iq.dataverse.api.AbstractApiBean;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import org.everit.json.schema.Schema;
 import org.everit.json.schema.ValidationException;
 import org.everit.json.schema.loader.SchemaLoader;
diff --git a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java
index cea26bc65db..a8b28d2d79d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java
@@ -10,11 +10,9 @@
 import edu.harvard.iq.dataverse.FilePage;
 import edu.harvard.iq.dataverse.api.AbstractApiBean;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import java.io.IOException;
 import java.util.logging.Logger;
 import org.primefaces.event.FileUploadEvent;
-import org.primefaces.model.UploadedFile;
 import edu.harvard.iq.dataverse.engine.command.impl.PersistProvJsonCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.DeleteProvJsonCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.GetProvJsonCommand;
@@ -23,22 +21,24 @@
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.apache.commons.io.IOUtils;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.json.JsonObject;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.json.JsonObject;
+import org.primefaces.model.file.UploadedFile;
 
 /**
  * This bean contains functionality for the provenance json pop up
@@ -92,7 +92,7 @@ public class ProvPopupFragmentBean extends AbstractApiBean implements java.io.Se
     public void handleFileUpload(FileUploadEvent event) throws IOException {
         jsonUploadedTempFile = event.getFile();
         provJsonParsedEntities = new HashMap<>();
-        provJsonState = IOUtils.toString(jsonUploadedTempFile.getInputstream());
+        provJsonState = IOUtils.toString(jsonUploadedTempFile.getInputStream());
         
         
         if(!provUtil.isProvValid(provJsonState)) { //if uploaded prov-json does not comply with schema
@@ -214,7 +214,7 @@ public String stagePopupChanges(boolean saveInPopup) throws IOException{
             popupDataFile.setProvEntityName(null); 
         }        
         if(null != jsonUploadedTempFile && "application/json".equalsIgnoreCase(jsonUploadedTempFile.getContentType())) { //delete and create again can both happen at once
-            stagingEntry.provJson = IOUtils.toString(jsonUploadedTempFile.getInputstream());
+            stagingEntry.provJson = IOUtils.toString(jsonUploadedTempFile.getInputStream());
             stagingEntry.deleteJson = false;
 
             jsonUploadedTempFile = null;
@@ -500,7 +500,7 @@ public void showJsonPreviewNewWindow() throws IOException, WrappedResponse {
 
         OutputStream output = ec.getResponseOutputStream();
         
-        OutputStreamWriter osw = new OutputStreamWriter(output, "UTF-8");
+        OutputStreamWriter osw = new OutputStreamWriter(output, StandardCharsets.UTF_8);
         osw.write(provJsonState); //the button calling this will only be rendered if provJsonState exists (e.g. a file is uploaded)
         osw.close();
         fc.responseComplete();
diff --git a/src/main/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerPage.java b/src/main/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerPage.java
index 4d89a2842cd..9edb536eda2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerPage.java
@@ -6,11 +6,12 @@
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.json.JsonArray;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.JsonArray;
 
+@Deprecated(forRemoval = true, since = "2024-07-07")
 @Stateless
 @Named
 public class RepositoryStorageAbstractionLayerPage {
@@ -22,17 +23,20 @@ public class RepositoryStorageAbstractionLayerPage {
     @EJB
     StorageSiteServiceBean storageSiteServiceBean;
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public String getLocalDataAccessDirectory(DatasetVersion datasetVersion) {
         String localDataAccessParentDir = settingsService.getValueForKey(SettingsServiceBean.Key.LocalDataAccessPath);
         return RepositoryStorageAbstractionLayerUtil.getLocalDataAccessDirectory(localDataAccessParentDir, datasetVersion.getDataset());
     }
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public List<RsyncSite> getRsyncSites(DatasetVersion datasetVersion) {
         List<StorageSite> storageSites = storageSiteServiceBean.findAll();
         JsonArray storageSitesAsJson = RepositoryStorageAbstractionLayerUtil.getStorageSitesAsJson(storageSites);
         return RepositoryStorageAbstractionLayerUtil.getRsyncSites(datasetVersion.getDataset(), storageSitesAsJson);
     }
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public String getVerifyDataCommand(DatasetVersion datasetVersion) {
         return RepositoryStorageAbstractionLayerUtil.getVerifyDataCommand(datasetVersion.getDataset());
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerUtil.java b/src/main/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerUtil.java
index ee52254d6f5..0d547402676 100644
--- a/src/main/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerUtil.java
@@ -3,20 +3,22 @@
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.locality.StorageSite;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import edu.harvard.iq.dataverse.util.SystemConfig;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
 
+@Deprecated(forRemoval = true, since = "2024-07-07")
 public class RepositoryStorageAbstractionLayerUtil {
 
     private static final Logger logger = Logger.getLogger(RepositoryStorageAbstractionLayerUtil.class.getCanonicalName());
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public static List<RsyncSite> getRsyncSites(Dataset dataset, JsonArray rsalSitesAsJson) {
         List<RsyncSite> rsalSites = new ArrayList<>();
         boolean leafDirectoryOnly = false;
@@ -30,6 +32,7 @@ public static List<RsyncSite> getRsyncSites(Dataset dataset, JsonArray rsalSites
         return rsalSites;
     }
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     static String getLocalDataAccessDirectory(String localDataAccessParentDir, Dataset dataset) {
         if (localDataAccessParentDir == null) {
             localDataAccessParentDir = File.separator + "UNCONFIGURED ( " + SettingsServiceBean.Key.LocalDataAccessPath + " )";
@@ -38,6 +41,7 @@ static String getLocalDataAccessDirectory(String localDataAccessParentDir, Datas
         return localDataAccessParentDir + File.separator + getDirectoryContainingTheData(dataset, leafDirectoryOnly);
     }
 
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     static String getVerifyDataCommand(Dataset dataset) {
         boolean leafDirectoryOnly = true;
         // TODO: if "files.sha" is defined somewhere, use it.
@@ -51,6 +55,7 @@ static String getVerifyDataCommand(Dataset dataset) {
      * leafDirectoryOnly. See also
      * http://www.gnu.org/software/coreutils/manual/html_node/basename-invocation.html
      */
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public static String getDirectoryContainingTheData(Dataset dataset, boolean leafDirectoryOnly) {
         /**
          * FIXME: What if there is more than one package in the dataset?
@@ -81,6 +86,7 @@ public static String getDirectoryContainingTheData(Dataset dataset, boolean leaf
      * RSAL or some other "big data" component live for a list of remotes sites
      * to which a particular dataset is replicated to.
      */
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     static JsonArray getStorageSitesAsJson(List<StorageSite> storageSites) {
         JsonArrayBuilder arraybuilder = Json.createArrayBuilder();
         if (storageSites == null || storageSites.isEmpty()) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/rserve/RJobRequest.java b/src/main/java/edu/harvard/iq/dataverse/rserve/RJobRequest.java
index d59e8f1050f..9171b8313ff 100644
--- a/src/main/java/edu/harvard/iq/dataverse/rserve/RJobRequest.java
+++ b/src/main/java/edu/harvard/iq/dataverse/rserve/RJobRequest.java
@@ -25,9 +25,15 @@
  * @author Leonid Andreev
  */
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
-import java.util.*;
-import java.util.logging.*;
-import org.apache.commons.lang.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.apache.commons.lang3.StringUtils;
 
 
 public class RJobRequest {
diff --git a/src/main/java/edu/harvard/iq/dataverse/rserve/RemoteDataFrameService.java b/src/main/java/edu/harvard/iq/dataverse/rserve/RemoteDataFrameService.java
index 503125eb45a..dbcfc039fa1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/rserve/RemoteDataFrameService.java
+++ b/src/main/java/edu/harvard/iq/dataverse/rserve/RemoteDataFrameService.java
@@ -23,16 +23,33 @@
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.dataaccess.DataAccessRequest;
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import org.apache.commons.io.IOUtils;
 
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.rosuda.REngine.*;
 import org.rosuda.REngine.Rserve.*;
 
-import org.apache.commons.lang.*;
-
 /**
  * 
  * @author Leonid Andreev
@@ -57,57 +74,33 @@ public class RemoteDataFrameService {
 
     private static String TMP_TABDATA_FILE_EXT = ".tab";
     private static String TMP_RDATA_FILE_EXT = ".RData";
-
-    private static String RSERVE_HOST = null;
-    private static String RSERVE_USER = null;
-    private static String RSERVE_PWD = null;    
-    private static int    RSERVE_PORT = -1;
+    
+    // These settings have sane defaults in resources/META-INF/microprofile-config.properties,
+    // ready to be overridden by a sysadmin
+    private final String RSERVE_HOST;
+    private final String RSERVE_USER;
+    private final String RSERVE_PWD;
+    private final int    RSERVE_PORT;
+    private final String RSERVE_TMP_DIR;
         
     private static String DATAVERSE_R_FUNCTIONS = "scripts/dataverse_r_functions.R";
     private static String DATAVERSE_R_PREPROCESSING = "scripts/preprocess.R";
-                    
-    public static String LOCAL_TEMP_DIR = System.getProperty("java.io.tmpdir");
-    public static String RSERVE_TMP_DIR=null;
     
     public String PID = null;
     public String tempFileNameIn = null;
     public String tempFileNameOut = null;
- 
-    static {
-    
-        RSERVE_TMP_DIR = System.getProperty("dataverse.rserve.tempdir");
-        
-        if (RSERVE_TMP_DIR == null){
-            RSERVE_TMP_DIR = "/tmp/";            
-        }
-        
-        RSERVE_HOST = System.getProperty("dataverse.rserve.host");
-        if (RSERVE_HOST == null){
-            RSERVE_HOST= "localhost";
-        }
-        
-        RSERVE_USER = System.getProperty("dataverse.rserve.user");
-        if (RSERVE_USER == null){
-            RSERVE_USER= "rserve";
-        }
-        
-        RSERVE_PWD = System.getProperty("dataverse.rserve.password");
-        if (RSERVE_PWD == null){
-            RSERVE_PWD= "rserve";
-        }
-        
-
-        if (System.getProperty("dataverse.rserve.port") == null ){
-            RSERVE_PORT= 6311;
-        } else {
-            RSERVE_PORT = Integer.parseInt(System.getProperty("dataverse.rserve.port"));
-        }
-
-    }
-
-   
 
     public RemoteDataFrameService() {
+        // These settings have sane defaults in resources/META-INF/microprofile-config.properties,
+        // ready to be overridden by a sysadmin. Config sources have their own caches, so adding
+        // these here means the setting can be changed dynamically without too much overhead.
+        this.RSERVE_HOST = JvmSettings.RSERVE_HOST.lookup();
+        this.RSERVE_USER = JvmSettings.RSERVE_USER.lookup();
+        this.RSERVE_PWD = JvmSettings.RSERVE_PASSWORD.lookup();
+        this.RSERVE_PORT = JvmSettings.RSERVE_PORT.lookup(Integer.class);
+        this.RSERVE_TMP_DIR = JvmSettings.RSERVE_TEMPDIR.lookup();
+        
+        
         // initialization
         PID = RandomStringUtils.randomNumeric(6);
 
@@ -688,15 +681,12 @@ public Map<String, String> runDataFrameRequest(RJobRequest jobRequest, RConnecti
     public File transferRemoteFile(RConnection connection, String targetFilename,
             String tmpFilePrefix, String tmpFileExt, int fileSize) {
 
-        // set up a local temp file: 
-        
+        // set up a local temp file:
         File tmpResultFile = null;
-        String resultFile = tmpFilePrefix + PID + "." + tmpFileExt;
-
         RFileInputStream rInStream = null;
         OutputStream outbr = null;
         try {
-            tmpResultFile = new File(LOCAL_TEMP_DIR, resultFile);
+            tmpResultFile = File.createTempFile(tmpFilePrefix + PID, "."+tmpFileExt);
             outbr = new BufferedOutputStream(new FileOutputStream(tmpResultFile));
             // open the input stream
             rInStream = connection.openFile(targetFilename);
@@ -769,7 +759,7 @@ private static String readLocalResource(String path) {
 
         // Try opening a buffered reader stream
         try {
-            resourceAsString = IOUtils.toString(resourceStream, "UTF-8");
+            resourceAsString = IOUtils.toString(resourceStream, StandardCharsets.UTF_8);
             resourceStream.close();
         } catch (IOException ex) {
             logger.warning(String.format("RDATAFileReader: (readLocalResource) resource stream from path \"%s\" was invalid", path));
diff --git a/src/main/java/edu/harvard/iq/dataverse/rserve/VariableNameCheckerForR.java b/src/main/java/edu/harvard/iq/dataverse/rserve/VariableNameCheckerForR.java
index dea0c886cd1..65a64241364 100644
--- a/src/main/java/edu/harvard/iq/dataverse/rserve/VariableNameCheckerForR.java
+++ b/src/main/java/edu/harvard/iq/dataverse/rserve/VariableNameCheckerForR.java
@@ -20,10 +20,14 @@
 package edu.harvard.iq.dataverse.rserve;
 
 
-import org.apache.commons.lang.*;
-import java.util.*;
-import java.util.regex.*;
+import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/rserve/scripts/preprocess.R b/src/main/java/edu/harvard/iq/dataverse/rserve/scripts/preprocess.R
index 456db994410..d4a373cfdf0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/rserve/scripts/preprocess.R
+++ b/src/main/java/edu/harvard/iq/dataverse/rserve/scripts/preprocess.R
@@ -23,7 +23,7 @@ preprocess<-function(hostname=NULL, fileid=NULL, testdata=NULL, types=NULL, file
     }
     
     defaulttypes <- typeGuess(mydata)
-    # Note: types can be passed directly to preprocess, as would be the case if a TwoRavens user tagged a variable as "nominal"
+    # Note: types can be passed directly to preprocess, as would be the case if an external tool tagged a variable as "nominal"
     if(is.null(types)) { # no types have been passed, so simply copying the defaults into the type fields
         types$numchar <- defaulttypes$defaultNumchar
         types$nature <- defaulttypes$defaultNature
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/AbstractExternalSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/AbstractExternalSearchServiceBean.java
new file mode 100644
index 00000000000..7a2ef96b615
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/AbstractExternalSearchServiceBean.java
@@ -0,0 +1,106 @@
+package edu.harvard.iq.dataverse.search;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+
+public abstract class AbstractExternalSearchServiceBean implements ConfigurableSearchService {
+
+    protected static final Logger logger = Logger
+            .getLogger(AbstractExternalSearchServiceBean.class.getCanonicalName());
+
+    protected SettingsServiceBean settingsService;
+
+    protected SearchService solrSearchService;
+
+    @Override
+    public void setSolrSearchService(SearchService solrSearchService) {
+        this.solrSearchService = solrSearchService;
+    }
+
+    @Override
+    public void setSettingsService(SettingsServiceBean settingsService) {
+        this.settingsService = settingsService;
+    }
+
+    /**
+     * Creates a SolrQueryResponse object from the external search service response.
+     * The external service is expected to return a JSON object with the following
+     * structure: { "results": [ { "PID": "doi:10.3886/ICPSR09083.v1", "Distance":
+     * 0.30227208137512207 },... ] }
+     * "DOI" can be used instead of "PID" (preferred) 
+     * 
+     * @param responseString   - see above
+     * @param dataverseRequest
+     * @param retrieveEntities
+     * @param addFacets
+     * @param addHighlights
+     * @return
+     * @throws Exception
+     */
+    protected SolrQueryResponse postProcessResponse(String responseString, DataverseRequest dataverseRequest,
+            boolean retrieveEntities, boolean addFacets, boolean addHighlights, boolean addCollections) throws Exception {
+
+        JsonObject responseObject = JsonUtil.getJsonObject(responseString);
+        JsonArray resultsArray = responseObject.getJsonArray("results");
+
+        List<String> pids = new ArrayList<>();
+        Map<String, Float> pidToDistanceMap = new HashMap<>();
+
+        for (JsonValue value : resultsArray) {
+            JsonObject result = (JsonObject) value;
+            String pid = null;
+            if (result.containsKey("PID")) {
+                pid = result.getString("PID");
+            }
+            //Backward compatibility
+            if(result.containsKey("DOI")) {
+                pid = result.getString("DOI");
+            } 
+
+            float distance = result.getJsonNumber("Distance").bigDecimalValue().floatValue();
+
+            pids.add(pid);
+            pidToDistanceMap.put(pid, distance);
+        }
+
+        // Create a Solr query to fetch the entities
+        String solrQuery = "identifier:("
+                + String.join(" OR ", pids.stream().map(pid -> "\"" + pid + "\"").collect(Collectors.toList())) + ")";
+        logger.fine("Query to solr: " + solrQuery);
+        // Execute Solr query
+        SolrQueryResponse solrResponse = solrSearchService.search(dataverseRequest, null, solrQuery,
+                Collections.emptyList(), null, null, 0, false, pids.size(), retrieveEntities, null, null, addFacets,
+                addHighlights, addCollections);
+
+        // Reorder results based on distance, lowest values first
+        List<SolrSearchResult> reorderedResults = solrResponse.getSolrSearchResults().stream()
+                .filter(result -> pidToDistanceMap.containsKey(result.getIdentifier())).sorted((r1, r2) -> Float
+                        .compare(pidToDistanceMap.get(r1.getIdentifier()), pidToDistanceMap.get(r2.getIdentifier())))
+                .collect(Collectors.toList());
+
+        // Add distance information to each SolrSearchResult
+        reorderedResults.forEach(result -> {
+            String pid = result.getIdentifier();
+            if (pidToDistanceMap.containsKey(pid)) {
+                result.setScore(pidToDistanceMap.get(pid));
+            }
+        });
+
+        solrResponse.setSolrSearchResults(reorderedResults);
+        solrResponse.setNumResultsFound((long) reorderedResults.size());
+
+        return solrResponse;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/AbstractSolrClientService.java b/src/main/java/edu/harvard/iq/dataverse/search/AbstractSolrClientService.java
new file mode 100644
index 00000000000..1ae236d348f
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/AbstractSolrClientService.java
@@ -0,0 +1,51 @@
+package edu.harvard.iq.dataverse.search;
+
+import java.io.IOException;
+import java.util.logging.Logger;
+
+import org.apache.solr.client.solrj.SolrClient;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.ejb.EJB;
+
+/**
+ * Generics methods for Solr clients implementations
+ * 
+ * @author jeromeroucou
+ */
+public abstract class AbstractSolrClientService {
+    private static final Logger logger = Logger.getLogger(AbstractSolrClientService.class.getCanonicalName());
+
+    @EJB
+    SystemConfig systemConfig;
+
+    public abstract void init();
+    public abstract void close();
+    public abstract SolrClient getSolrClient();
+    public abstract void setSolrClient(SolrClient solrClient);
+
+    public void close(SolrClient solrClient) {
+        if (solrClient != null) {
+            try {
+                solrClient.close();
+            } catch (IOException e) {
+                logger.warning("Solr closing error: " + e);
+            }
+            solrClient = null;
+        }
+    }
+
+    public void reInitialize() {
+        close();
+        init();
+    }
+
+    public String getSolrUrl() {
+        // Get from MPCONFIG. Might be configured by a sysadmin or simply return the
+        // default shipped with resources/META-INF/microprofile-config.properties.
+        final String protocol = JvmSettings.SOLR_PROT.lookup();
+        final String path = JvmSettings.SOLR_PATH.lookup();
+        return protocol + "://" + this.systemConfig.getSolrHostColonPort() + path;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java b/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
index 821236f4d8f..bc92959a5ac 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
@@ -6,6 +6,7 @@
 import edu.harvard.iq.dataverse.DatasetFieldType;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.DataverseSession;
 import edu.harvard.iq.dataverse.MetadataBlock;
 import edu.harvard.iq.dataverse.WidgetWrapper;
 import static edu.harvard.iq.dataverse.search.SearchUtil.constructQuery;
@@ -17,13 +18,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.StringTokenizer;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.json.JsonObject;
+
+import org.apache.commons.lang3.StringUtils;
 
 @ViewScoped
 @Named("AdvancedSearchPage")
@@ -38,6 +40,7 @@ public class AdvancedSearchPage implements java.io.Serializable {
     DatasetFieldServiceBean datasetFieldService;
     
     @Inject WidgetWrapper widgetWrapper;
+    @Inject DataverseSession session;
 
     private Dataverse dataverse;
     private String dataverseIdentifier;
@@ -57,7 +60,10 @@ public class AdvancedSearchPage implements java.io.Serializable {
     private String fileFieldFiletype;
     private String fileFieldVariableName;
     private String fileFieldVariableLabel;
+    private String fileFieldFileTags;
 
+    Map<Long, JsonObject> cachedCvocMap=null;
+    
     public void init() {
 
         if (dataverseIdentifier != null) {
@@ -101,7 +107,8 @@ private String constructDatasetQuery() {
         List<String> queryStrings = new ArrayList<>();
         for (DatasetFieldType dsfType : metadataFieldList) {
             if (dsfType.getSearchValue() != null && !dsfType.getSearchValue().equals("")) {
-                queryStrings.add(constructQuery(dsfType.getSolrField().getNameSearchable(), dsfType.getSearchValue()));
+                //CVoc fields return term URIs - add quotes around them to avoid solr breaking them into individual search words
+                queryStrings.add(constructQuery(dsfType.getSolrField().getNameSearchable(), dsfType.getSearchValue(), getCVocConf().containsKey(dsfType.getId())));
             } else if (dsfType.getListValues() != null && !dsfType.getListValues().isEmpty()) {
                 List<String> listQueryStrings = new ArrayList<>();
                 for (String value : dsfType.getListValues()) {
@@ -174,6 +181,10 @@ private String constructFileQuery() {
             queryStrings.add(constructQuery(SearchFields.VARIABLE_LABEL, fileFieldVariableLabel));
         }
 
+        if (StringUtils.isNotBlank(fileFieldFileTags)) {
+            queryStrings.add(constructQuery(SearchFields.FILE_TAG_SEARCHABLE, fileFieldFileTags));
+        }
+
         return constructQuery(queryStrings, true);
     }
     
@@ -319,4 +330,30 @@ public void setFileFieldVariableLabel(String fileFieldVariableLabel) {
         this.fileFieldVariableLabel = fileFieldVariableLabel;
     }
 
+    public String getFileFieldFileTags() {
+        return fileFieldFileTags;
+    }
+
+    public void setFileFieldFileTags(String fileFieldFileTags) {
+        this.fileFieldFileTags = fileFieldFileTags;
+    }
+    
+    
+    //External Vocabulary Support
+
+    public Map<Long, JsonObject> getCVocConf() {
+        //Cache this in the view
+        if(cachedCvocMap==null) {
+        cachedCvocMap = datasetFieldService.getCVocConf(true);
+        }
+        return cachedCvocMap;
+    }
+    
+    public List<String> getVocabScripts() {
+        return datasetFieldService.getVocabScripts(getCVocConf());
+    }
+
+    public String getFieldLanguage(String languages) {
+        return datasetFieldService.getFieldLanguage(languages,session.getLocaleCode());
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/ConfigurableSearchService.java b/src/main/java/edu/harvard/iq/dataverse/search/ConfigurableSearchService.java
new file mode 100644
index 00000000000..7e7f21d91dd
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/ConfigurableSearchService.java
@@ -0,0 +1,7 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
+public interface ConfigurableSearchService extends SearchService {
+    void setSettingsService(SettingsServiceBean settingsService);
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/FacetCategory.java b/src/main/java/edu/harvard/iq/dataverse/search/FacetCategory.java
index dc9307c463d..58a48d5bf8f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/FacetCategory.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/FacetCategory.java
@@ -7,6 +7,7 @@ public class FacetCategory {
     private String name;
     private List<FacetLabel> facetLabel;
     private String friendlyName;
+    private Long datasetFieldTypeId;
 
     public String getName() {
         return name;
@@ -32,4 +33,12 @@ public void setFriendlyName(String friendlyName) {
         this.friendlyName = friendlyName;
     }
 
+    public Long getDatasetFieldTypeId() {
+        return datasetFieldTypeId;
+    }
+
+    public void setDatasetFieldTypeId(Long datasetFieldId) {
+        this.datasetFieldTypeId = datasetFieldId;
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/FacetLabel.java b/src/main/java/edu/harvard/iq/dataverse/search/FacetLabel.java
index bebd6b418fc..f97c1641479 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/FacetLabel.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/FacetLabel.java
@@ -1,9 +1,9 @@
 package edu.harvard.iq.dataverse.search;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named
-public class FacetLabel {
+public class FacetLabel implements Comparable<FacetLabel>{
 
     private String name;
     private Long count;
@@ -46,4 +46,12 @@ public void setFilterQuery(String filterQuery) {
         this.filterQuery = filterQuery;
     }
 
+    @Override
+    public int compareTo(FacetLabel otherFacetLabel) {
+        // This is used to 'chronologically' order entries in the Publication Year facet
+        // display. That should work for 4 digit years (until 10K AD), but this could be
+        // changed to do a real numberical comparison instead.
+        return name.compareTo(otherFacetLabel.getName());
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/GetExternalSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/GetExternalSearchServiceBean.java
new file mode 100644
index 00000000000..4902bddccc9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/GetExternalSearchServiceBean.java
@@ -0,0 +1,115 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.logging.Logger;
+
+@Stateless
+@Named
+public class GetExternalSearchServiceBean extends AbstractExternalSearchServiceBean {
+
+    protected static final Logger logger = Logger.getLogger(GetExternalSearchServiceBean.class.getCanonicalName());
+
+    public GetExternalSearchServiceBean() {
+        // Default constructor
+    }
+
+    @Override
+    public String getServiceName() {
+        return "getExternalSearch";
+    }
+
+    @Override
+    public String getDisplayName() {
+        return settingsService.getValueForKey(SettingsServiceBean.Key.GetExternalSearchName, "External Search (GET)");
+    }
+
+    @Override
+    public void setSolrSearchService(SearchService solrSearchService) {
+        this.solrSearchService = solrSearchService;
+    }
+
+    @Override
+    public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query,
+            List<String> filterQueries, String sortField, String sortOrder, int paginationStart,
+            boolean onlyDataRelatedToMe, int numResultsPerPage, boolean retrieveEntities, String geoPoint,
+            String geoRadius, boolean addFacets, boolean addHighlights, boolean addCollections) throws SearchException {
+
+        String externalSearchUrl = settingsService.getValueForKey(SettingsServiceBean.Key.GetExternalSearchUrl);
+        if (externalSearchUrl == null || externalSearchUrl.isEmpty()) {
+            throw new SearchException("External search URL is not configured", null);
+        }
+
+        // Prepare query parameters
+        String queryParams = prepareQuery(query, paginationStart, numResultsPerPage, sortField, sortOrder,
+                filterQueries, addHighlights, addCollections, addFacets, onlyDataRelatedToMe, retrieveEntities, geoPoint, geoRadius);
+
+        // Send GET request to external service
+        try (Client client = ClientBuilder.newClient()) {
+            Response response = client.target(externalSearchUrl).queryParam("params", queryParams)
+                    .request(MediaType.APPLICATION_JSON).get();
+
+            if (response.getStatus() != 200) {
+                throw new SearchException("External search service returned status " + response.getStatus(), null);
+            }
+
+            // Parse response and process results
+            String responseString = response.readEntity(String.class);
+            logger.finest("External search returned: " + responseString);
+            return postProcessResponse(responseString, dataverseRequest, retrieveEntities, addFacets, addHighlights, addCollections);
+        } catch (Exception e) {
+            throw new SearchException("Error parsing external search service response", e);
+        }
+    }
+
+    private String prepareQuery(String query, int paginationStart, int numResultsPerPage, String sortField,
+            String sortOrder, List<String> filterQueries, boolean addHighlights, boolean addCollections, boolean addFacets,
+            boolean onlyDataRelatedToMe, boolean retrieveEntities, String geoPoint, String geoRadius) {
+        StringBuilder queryParams = new StringBuilder();
+        queryParams.append("q=").append(URLEncoder.encode(query, StandardCharsets.UTF_8));
+        queryParams.append("&start=").append(paginationStart);
+        queryParams.append("&per_page=").append(numResultsPerPage);
+
+        if (sortField != null && !sortField.isEmpty()) {
+            queryParams.append("&sort=").append(URLEncoder.encode(sortField, StandardCharsets.UTF_8));
+        }
+        if (sortOrder != null && !sortOrder.isEmpty()) {
+            queryParams.append("&order=").append(URLEncoder.encode(sortOrder, StandardCharsets.UTF_8));
+        }
+
+        // Add filter queries with numbers
+        for (int i = 0; i < filterQueries.size(); i++) {
+            queryParams.append("&fq").append(i).append("=").append(filterQueries.get(i));
+        }
+
+        queryParams.append("&show_relevance=").append(addHighlights);
+        queryParams.append("&show_collections=").append(addCollections);
+        queryParams.append("&show_facets=").append(addFacets);
+        queryParams.append("&show_entity_ids=true");
+        queryParams.append("&show_api_urls=true");
+        queryParams.append("&show_my_data=").append(onlyDataRelatedToMe);
+        queryParams.append("&query_entities=").append(retrieveEntities);
+
+        if (geoPoint != null && !geoPoint.isEmpty()) {
+            queryParams.append("&geo_point=").append(URLEncoder.encode(geoPoint, StandardCharsets.UTF_8));
+        }
+        if (geoRadius != null && !geoRadius.isEmpty()) {
+            queryParams.append("&geo_radius=").append(URLEncoder.encode(geoRadius, StandardCharsets.UTF_8));
+        }
+
+        queryParams.append("&show_type_counts=true");
+
+        return queryParams.toString();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/GoldenOldiesSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/GoldenOldiesSearchServiceBean.java
new file mode 100644
index 00000000000..f49398ae7c8
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/GoldenOldiesSearchServiceBean.java
@@ -0,0 +1,89 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import java.util.Comparator;
+import java.util.List;
+import java.util.logging.Logger;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import org.apache.solr.client.solrj.SolrQuery;
+
+@Stateless
+@Named
+public class GoldenOldiesSearchServiceBean implements SearchService {
+
+    private static final Logger logger = Logger.getLogger(GoldenOldiesSearchServiceBean.class.getCanonicalName());
+
+    private SearchService solrSearchService;
+    
+    public GoldenOldiesSearchServiceBean() {
+        // Default constructor
+    }
+    @Override
+    public void setSolrSearchService(SearchService solrSearchService) {
+        this.solrSearchService = solrSearchService;
+    }
+
+    @Override
+    public String getServiceName() {
+        return "goldenOldies";
+    }
+    
+    @Override
+    public String getDisplayName() {
+        return "Demo: Search Over First 1K Entries";
+    }
+    /**
+     * @param dataverseRequest
+     * @param dataverses
+     * @param query
+     * @param filterQueries
+     * @param sortField
+     * @param sortOrder
+     * @param paginationStart
+     * @param onlyDatatRelatedToMe
+     * @param numResultsPerPage
+     * @param retrieveEntities - look up dvobject entities with .find() (potentially expensive!)
+     * @param geoPoint e.g. "35,15"
+     * @param geoRadius e.g. "5"
+     * @param addFacets boolean
+     * @param addHighlights boolean
+     * @param addCollections boolean
+     * @return
+     * @throws SearchException
+     */
+    @Override
+    public SolrQueryResponse search(
+            DataverseRequest dataverseRequest,
+            List<Dataverse> dataverses,
+            String query,
+            List<String> filterQueries,
+            String sortField, 
+            String sortOrder,
+            int paginationStart,
+            boolean onlyDatatRelatedToMe,
+            int numResultsPerPage,
+            boolean retrieveEntities,
+            String geoPoint,
+            String geoRadius,
+            boolean addFacets,
+            boolean addHighlights,
+            boolean addCollections
+    ) throws SearchException {
+
+        // Execute the query using SolrSearchService
+        SolrQueryResponse queryResponse = solrSearchService.search(dataverseRequest, null, "entityId:[* TO 1000]", null, "entityId", SolrQuery.ORDER.asc.toString(), paginationStart, false, numResultsPerPage, retrieveEntities, null, null);
+        
+        // Process the results
+        List<SolrSearchResult> solrSearchResults = queryResponse.getSolrSearchResults();
+        
+        // Sort the results by ID
+        solrSearchResults.sort(Comparator.comparing(SolrSearchResult::getEntityId));
+        
+        queryResponse.setSolrSearchResults(solrSearchResults);
+        
+        return queryResponse;
+    }
+}
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/Highlight.java b/src/main/java/edu/harvard/iq/dataverse/search/Highlight.java
index 98a882c13ca..d40d8c362af 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/Highlight.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/Highlight.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse.search;
 
 import java.util.List;
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named
 public class Highlight {
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexAsync.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexAsync.java
index a04ae934259..c9cf1cd9dc7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/IndexAsync.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexAsync.java
@@ -5,9 +5,9 @@
 import java.util.Collection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.Asynchronous;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class IndexAsync {
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java
index 3746bb1d92c..6e47d1938c1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java
@@ -1,26 +1,27 @@
 package edu.harvard.iq.dataverse.search;
 
-import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DvObjectServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Future;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.AsyncResult;
-import javax.ejb.Asynchronous;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.AsyncResult;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.apache.solr.client.solrj.SolrServerException;
 
 @Named
@@ -44,11 +45,67 @@ public class IndexBatchServiceBean {
     DvObjectServiceBean dvObjectService;
     @EJB
     SystemConfig systemConfig;
+    
+    @Asynchronous
+    public Future<JsonObjectBuilder> indexStatus() {
+        JsonObjectBuilder response = Json.createObjectBuilder();
+        logger.info("Beginning indexStatus()");
+        try {
+            JsonObject contentInDatabaseButStaleInOrMissingFromSolr = getContentInDatabaseButStaleInOrMissingFromSolr().build();
+            JsonObject contentInSolrButNotDatabase = getContentInSolrButNotDatabase().build();
+            JsonObject permissionsInSolrButNotDatabase = getPermissionsInSolrButNotDatabase().build();
+            JsonObject permissionsInDatabaseButStaleInOrMissingFromSolr = getPermissionsInDatabaseButStaleInOrMissingFromSolr().build();
+
+            response
+                    .add("contentInDatabaseButStaleInOrMissingFromIndex", contentInDatabaseButStaleInOrMissingFromSolr)
+                    .add("contentInIndexButNotDatabase", contentInSolrButNotDatabase)
+                    .add("permissionsInDatabaseButStaleInOrMissingFromIndex", permissionsInDatabaseButStaleInOrMissingFromSolr)
+                    .add("permissionsInIndexButNotDatabase", permissionsInSolrButNotDatabase);
+
+            logger.log(Level.INFO, "contentInDatabaseButStaleInOrMissingFromIndex: {0}", contentInDatabaseButStaleInOrMissingFromSolr);
+            logger.log(Level.INFO, "contentInIndexButNotDatabase: {0}", contentInSolrButNotDatabase);
+            logger.log(Level.INFO, "permissionsInDatabaseButStaleInOrMissingFromIndex: {0}", permissionsInDatabaseButStaleInOrMissingFromSolr);
+            logger.log(Level.INFO, "permissionsInIndexButNotDatabase: {0}", permissionsInSolrButNotDatabase);
+        } catch (Exception ex) {
+            String msg = "Can not determine index status. " + ex.getLocalizedMessage() + ". Is Solr down? Exception: " + ex.getCause().getLocalizedMessage();
+            logger.info(msg);
+            ex.printStackTrace();
+            response.add("SearchException ", msg);
+        }
+        return new AsyncResult<>(response);
+    }
+
+    @Asynchronous
+    public Future<JsonObjectBuilder> clearOrphans() {
+        JsonObjectBuilder response = Json.createObjectBuilder();
+        List<String> solrIds = new ArrayList<>();
+        logger.info("Beginning clearOrphans() to check for orphan Solr documents.");
+        try {     
+            logger.info("checking for orphans type dataverse");
+            solrIds.addAll(indexService.findDataversesInSolrOnly());
+            logger.info("checking for orphans type dataset");
+            solrIds.addAll(indexService.findDatasetsInSolrOnly());
+            logger.info("checking for orphans file");
+            solrIds.addAll(indexService.findFilesInSolrOnly());
+            logger.info("checking for orphan permissions");
+            solrIds.addAll(indexService.findPermissionsInSolrOnly());
+        } catch (SearchException e) {
+            logger.info("SearchException in clearOrphans: " + e.getMessage());
+            response.add("response from clearOrphans","SearchException: " + e.getMessage() );
+        } 
+        logger.info("found " + solrIds.size()+ " orphan documents");
+        IndexResponse resultOfSolrDeletionAttempt = solrIndexService.deleteMultipleSolrIds(solrIds);
+        logger.info(resultOfSolrDeletionAttempt.getMessage());
+        response.add("resultOfSolrDeletionAttempt", resultOfSolrDeletionAttempt.getMessage());
+        
+        return new AsyncResult<>(response);
+    }
 
+    
     @Asynchronous
     public Future<JsonObjectBuilder> indexAllOrSubset(long numPartitions, long partitionId, boolean skipIndexed, boolean previewOnly) {
         JsonObjectBuilder response = Json.createObjectBuilder();
-        Future<String> responseFromIndexAllOrSubset = indexAllOrSubset(numPartitions, partitionId, skipIndexed);
+        indexAllOrSubset(numPartitions, partitionId, skipIndexed);
         String status = "indexAllOrSubset has begun";
         response.add("responseFromIndexAllOrSubset", status);
         return new AsyncResult<>(response);
@@ -118,7 +175,7 @@ public Future<String> indexAllOrSubset(long numPartitions, long partitionId, boo
         // List<Dataverse> dataverses = dataverseService.findAllOrSubset(numPartitions, partitionId, skipIndexed);
         // Note: no support for "partitions" in this experimental branch. 
         // The method below returns the ids of all the unindexed dataverses.
-        List<Long> dataverseIds = dataverseIds = dataverseService.findDataverseIdsForIndexing(skipIndexed);
+        List<Long> dataverseIds = dataverseService.findDataverseIdsForIndexing(skipIndexed);
         
         int dataverseIndexCount = 0;
         int dataverseFailureCount = 0;
@@ -139,17 +196,11 @@ public Future<String> indexAllOrSubset(long numPartitions, long partitionId, boo
 
         int datasetIndexCount = 0;
         int datasetFailureCount = 0;
-        List<Long> datasetIds = datasetService.findAllOrSubset(numPartitions, partitionId, skipIndexed);
+        List<Long> datasetIds = datasetService.findAllOrSubsetOrderByFilesOwned(skipIndexed);
         for (Long id : datasetIds) {
-            try {
-                datasetIndexCount++;
-                logger.info("indexing dataset " + datasetIndexCount + " of " + datasetIds.size() + " (id=" + id + ")");
-                Future<String> result = indexService.indexDatasetInNewTransaction(id);
-            } catch (Exception e) {
-                //We want to keep running even after an exception so throw some more info into the log
-                datasetFailureCount++;
-                logger.info("FAILURE indexing dataset " + datasetIndexCount + " of " + datasetIds.size() + " (id=" + id + ") Exception info: " + e.getMessage());
-            }
+            datasetIndexCount++;
+            logger.info("indexing dataset " + datasetIndexCount + " of " + datasetIds.size() + " (id=" + id + ")");
+            indexService.indexDatasetInNewTransaction(id);
         }
         logger.info("done iterating through all datasets");
 
@@ -205,15 +256,9 @@ public void indexDataverseRecursively(Dataverse dataverse) {
         
         // index the Dataset children
         for (Long childId : datasetChildren) {
-            try {
-                datasetIndexCount++;
-                logger.info("indexing dataset " + datasetIndexCount + " of " + datasetChildren.size() + " (id=" + childId + ")");
-                indexService.indexDatasetInNewTransaction(childId);
-            } catch (Exception e) {
-                //We want to keep running even after an exception so throw some more info into the log
-                datasetFailureCount++;
-                logger.info("FAILURE indexing dataset " + datasetIndexCount + " of " + datasetChildren.size() + " (id=" + childId + ") Exception info: " + e.getMessage());
-            }
+            datasetIndexCount++;
+            logger.info("indexing dataset " + datasetIndexCount + " of " + datasetChildren.size() + " (id=" + childId + ")");
+            indexService.indexDatasetInNewTransaction(childId);
         }
         long end = System.currentTimeMillis();
         if (datasetFailureCount + dataverseFailureCount > 0){
@@ -221,5 +266,85 @@ public void indexDataverseRecursively(Dataverse dataverse) {
         }
         logger.info(dataverseIndexCount + " dataverses and " + datasetIndexCount + " datasets indexed. Total time to index " + (end - start) + ".");
     }
+      private JsonObjectBuilder getContentInDatabaseButStaleInOrMissingFromSolr() {
+        logger.info("checking for stale or missing dataverses");
+        List<Long> stateOrMissingDataverses = indexService.findStaleOrMissingDataverses();
+        logger.info("checking for stale or missing datasets");  
+        List<Long> staleOrMissingDatasets = indexService.findStaleOrMissingDatasets();
+        JsonArrayBuilder jsonStaleOrMissingDataverses = Json.createArrayBuilder();
+        for (Long id : stateOrMissingDataverses) {
+            jsonStaleOrMissingDataverses.add(id);
+        }
+        JsonArrayBuilder datasetsInDatabaseButNotSolr = Json.createArrayBuilder();
+        for (Long id : staleOrMissingDatasets) {
+            datasetsInDatabaseButNotSolr.add(id);
+        }
+        JsonObjectBuilder contentInDatabaseButStaleInOrMissingFromSolr = Json.createObjectBuilder()
+                /**
+                 * @todo What about files? Currently files are always indexed
+                 * along with their parent dataset
+                 */
+                .add("dataverses", jsonStaleOrMissingDataverses.build())
+                .add("datasets", datasetsInDatabaseButNotSolr.build());
+        logger.info("completed check for stale or missing content.");
+        return contentInDatabaseButStaleInOrMissingFromSolr;
+    }
+
+    private JsonObjectBuilder getContentInSolrButNotDatabase() throws SearchException {
+        logger.info("checking for dataverses in Solr only");
+        List<String> dataversesInSolrOnly = indexService.findDataversesInSolrOnly();
+        logger.info("checking for datasets in Solr only");
+        List<String> datasetsInSolrOnly = indexService.findDatasetsInSolrOnly();
+        logger.info("checking for files in Solr only");
+        List<String> filesInSolrOnly = indexService.findFilesInSolrOnly();
+        JsonArrayBuilder dataversesInSolrButNotDatabase = Json.createArrayBuilder();
+        logger.info("completed check for content in Solr but not database");
+        for (String dataverseId : dataversesInSolrOnly) {
+            dataversesInSolrButNotDatabase.add(dataverseId);
+        }
+        JsonArrayBuilder datasetsInSolrButNotDatabase = Json.createArrayBuilder();
+        for (String datasetId : datasetsInSolrOnly) {
+            datasetsInSolrButNotDatabase.add(datasetId);
+        }
+        JsonArrayBuilder filesInSolrButNotDatabase = Json.createArrayBuilder();
+        for (String fileId : filesInSolrOnly) {
+            filesInSolrButNotDatabase.add(fileId);
+        }
+        JsonObjectBuilder contentInSolrButNotDatabase = Json.createObjectBuilder()
+                /**
+                 * @todo What about files? Currently files are always indexed
+                 * along with their parent dataset
+                 */
+                .add("dataverses", dataversesInSolrButNotDatabase.build())
+                .add("datasets", datasetsInSolrButNotDatabase.build())
+                .add("files", filesInSolrButNotDatabase.build());
+        
+        return contentInSolrButNotDatabase;
+    }
+
+    private JsonObjectBuilder getPermissionsInDatabaseButStaleInOrMissingFromSolr() {
+        List<Long> staleOrMissingPermissions;
+        logger.info("checking for permissions in database but stale or missing from Solr");
+        staleOrMissingPermissions = solrIndexService.findPermissionsInDatabaseButStaleInOrMissingFromSolr();
+        logger.info("completed checking for permissions in database but stale or missing from Solr");
+        JsonArrayBuilder stalePermissionList = Json.createArrayBuilder();
+        for (Long dvObjectId : staleOrMissingPermissions) {
+            stalePermissionList.add(dvObjectId);
+        }
+        return Json.createObjectBuilder()
+                .add("dvobjects", stalePermissionList.build());
+    }
+    
+    private JsonObjectBuilder getPermissionsInSolrButNotDatabase() throws SearchException {
+        
+        List<String> staleOrMissingPermissions = indexService.findPermissionsInSolrOnly();
+        JsonArrayBuilder stalePermissionList = Json.createArrayBuilder();
+        for (String id : staleOrMissingPermissions) {
+            stalePermissionList.add(id);
+        }
+        return Json.createObjectBuilder()
+                .add("permissions", stalePermissionList.build());
+    }
+
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
index 3eb3c290208..1f7f869a35f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
@@ -1,29 +1,51 @@
 package edu.harvard.iq.dataverse.search;
 
 import edu.harvard.iq.dataverse.ControlledVocabularyValue;
+import edu.harvard.iq.dataverse.CurationStatus;
 import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DataFileServiceBean;
 import edu.harvard.iq.dataverse.DataFileTag;
+import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
 import edu.harvard.iq.dataverse.DatasetFieldConstant;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
 import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.DatasetFieldValue;
+import edu.harvard.iq.dataverse.DatasetFieldValueValidator;
 import edu.harvard.iq.dataverse.DatasetLinkingServiceBean;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
+import edu.harvard.iq.dataverse.DatasetVersionFilesServiceBean;
+import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseLinkingServiceBean;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.DvObject.DType;
 import edu.harvard.iq.dataverse.DvObjectServiceBean;
+import edu.harvard.iq.dataverse.Embargo;
 import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.PermissionServiceBean;
+import edu.harvard.iq.dataverse.Retention;
+import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
+import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.dataaccess.DataAccessRequest;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
+import edu.harvard.iq.dataverse.datavariable.VariableMetadata;
+import edu.harvard.iq.dataverse.datavariable.VariableMetadataUtil;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
+import edu.harvard.iq.dataverse.search.IndexableDataset.DatasetState;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
@@ -31,48 +53,69 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.Timestamp;
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
+
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.AsyncResult;
-import javax.ejb.Asynchronous;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.apache.commons.lang.StringUtils;
-import org.apache.solr.client.solrj.SolrClient;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import jakarta.ejb.AsyncResult;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import static jakarta.ejb.TransactionAttributeType.REQUIRES_NEW;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.json.JsonObject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.util.Strings;
 import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrQuery.SortClause;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.UpdateResponse;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.params.CursorMarkParams;
 import org.apache.tika.parser.AutoDetectParser;
-import org.apache.tika.io.IOUtils;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.sax.BodyContentHandler;
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.metrics.MetricUnits;
+import org.eclipse.microprofile.metrics.Timer;
+import org.eclipse.microprofile.metrics.annotation.Metric;
 import org.xml.sax.ContentHandler;
 
 @Stateless
@@ -80,6 +123,7 @@
 public class IndexServiceBean {
 
     private static final Logger logger = Logger.getLogger(IndexServiceBean.class.getCanonicalName());
+    private static final Config config = ConfigProvider.getConfig();
 
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
@@ -91,6 +135,8 @@ public class IndexServiceBean {
     @EJB
     DatasetServiceBean datasetService;
     @EJB
+    DatasetVersionServiceBean datasetVersionService;
+    @EJB
     BuiltinUserServiceBean dataverseUserServiceBean;
     @EJB
     PermissionServiceBean permissionService;
@@ -109,7 +155,17 @@ public class IndexServiceBean {
     @EJB
     SettingsServiceBean settingsService;
     @EJB
-    SolrClientService solrClientService;
+    SolrClientService solrClientService; // only for query index on Solr
+    @EJB
+    SolrClientIndexService solrClientIndexService; // only for add, update, or remove index on Solr
+    @EJB
+    DataFileServiceBean dataFileService;
+
+    @EJB
+    DatasetFieldServiceBean datasetFieldService;
+
+    @Inject
+    DatasetVersionFilesServiceBean datasetVersionFilesServiceBean;
 
     public static final String solrDocIdentifierDataverse = "dataverse_";
     public static final String solrDocIdentifierFile = "datafile_";
@@ -127,36 +183,20 @@ public class IndexServiceBean {
     private static final String IN_REVIEW_STRING = "In Review";
     private static final String DEACCESSIONED_STRING = "Deaccessioned";
     public static final String HARVESTED = "Harvested";
-    private String rootDataverseName;
     private Dataverse rootDataverseCached;
-    private SolrClient solrServer;
-
-    @PostConstruct
-    public void init() {
-        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr/collection1";
-        solrServer = new HttpSolrClient.Builder(urlString).build();
 
-        rootDataverseName = findRootDataverseCached().getName();
-    }
+    private VariableMetadataUtil variableMetadataUtil;
 
-    @PreDestroy
-    public void close() {
-        if (solrServer != null) {
-            try {
-                solrServer.close();
-            } catch (IOException e) {
-                logger.warning("Solr closing error: " + e);
-            }
-            solrServer = null;
-        }
-    }
-    
     @TransactionAttribute(REQUIRES_NEW)
     public Future<String> indexDataverseInNewTransaction(Dataverse dataverse) throws SolrServerException, IOException{
-        return indexDataverse(dataverse);
+        return indexDataverse(dataverse, false);
     }
-
+    
     public Future<String> indexDataverse(Dataverse dataverse) throws SolrServerException, IOException {
+       return  indexDataverse(dataverse, true);
+    }
+
+    public Future<String> indexDataverse(Dataverse dataverse, boolean processPaths) throws SolrServerException, IOException {
         logger.fine("indexDataverse called on dataverse id " + dataverse.getId() + "(" + dataverse.getAlias() + ")");
         if (dataverse.getId() == null) {
             // TODO: Investigate the root cause of this "unable to index dataverse"
@@ -187,11 +227,15 @@ public Future<String> indexDataverse(Dataverse dataverse) throws SolrServerExcep
         solrInputDocument.addField(SearchFields.DATAVERSE_CATEGORY, dataverse.getIndexableCategoryName());
         if (dataverse.isReleased()) {
             solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, PUBLISHED_STRING);
+            if (FeatureFlags.ADD_PUBLICOBJECT_SOLR_FIELD.enabled()) {
+                solrInputDocument.addField(SearchFields.PUBLIC_OBJECT, true);
+            }
             solrInputDocument.addField(SearchFields.RELEASE_OR_CREATE_DATE, dataverse.getPublicationDate());
         } else {
             solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, UNPUBLISHED_STRING);
             solrInputDocument.addField(SearchFields.RELEASE_OR_CREATE_DATE, dataverse.getCreateDate());
         }
+
         /* We don't really have harvested dataverses yet; 
            (I have in fact just removed the isHarvested() method from the Dataverse object) -- L.A.
         if (dataverse.isHarvested()) {
@@ -199,7 +243,7 @@ public Future<String> indexDataverse(Dataverse dataverse) throws SolrServerExcep
             solrInputDocument.addField(SearchFields.SOURCE, HARVESTED);
         } else { (this means that all dataverses are "local" - should this be removed? */
         solrInputDocument.addField(SearchFields.IS_HARVESTED, false);
-        solrInputDocument.addField(SearchFields.METADATA_SOURCE, findRootDataverseCached().getName()); //rootDataverseName);
+        solrInputDocument.addField(SearchFields.METADATA_SOURCE, rootDataverse.getName()); //rootDataverseName);
         /*}*/
 
         addDataverseReleaseDateToSolrDoc(solrInputDocument, dataverse);
@@ -219,10 +263,18 @@ public Future<String> indexDataverse(Dataverse dataverse) throws SolrServerExcep
             solrInputDocument.addField(SearchFields.AFFILIATION, dataverse.getAffiliation());
             solrInputDocument.addField(SearchFields.DATAVERSE_AFFILIATION, dataverse.getAffiliation());
         }
+        Set<String> langs = settingsService.getConfiguredLanguages();
         for (ControlledVocabularyValue dataverseSubject : dataverse.getDataverseSubjects()) {
             String subject = dataverseSubject.getStrValue();
             if (!subject.equals(DatasetField.NA_VALUE)) {
-                solrInputDocument.addField(SearchFields.DATAVERSE_SUBJECT, subject);
+             // Index in all used languages (display and metadata languages
+                for(String locale: langs) {
+                    solrInputDocument.addField(SearchFields.DATAVERSE_SUBJECT, dataverseSubject.getLocaleStrValue(locale));
+                }
+                if (langs.isEmpty()) {
+                    solrInputDocument.addField(SearchFields.DATAVERSE_SUBJECT, dataverseSubject.getStrValue());
+                }
+
                 // collapse into shared "subject" field used as a facet
                 solrInputDocument.addField(SearchFields.SUBJECT, subject);
             }
@@ -233,33 +285,53 @@ public Future<String> indexDataverse(Dataverse dataverse) throws SolrServerExcep
             if (dataverse.getOwner() != null) {
                 solrInputDocument.addField(SearchFields.PARENT_ID, dataverse.getOwner().getId());
                 solrInputDocument.addField(SearchFields.PARENT_NAME, dataverse.getOwner().getName());
+                solrInputDocument.addField(SearchFields.DATAVERSE_PARENT_ALIAS, dataverse.getOwner().getAlias());
             }
         }
         List<String> dataversePathSegmentsAccumulator = new ArrayList<>();
         List<String> dataverseSegments = findPathSegments(dataverse, dataversePathSegmentsAccumulator);
         List<String> dataversePaths = getDataversePathsFromSegments(dataverseSegments);
         if (dataversePaths.size() > 0) {
-            // don't show yourself while indexing or in search results:
-            // https://redmine.hmdc.harvard.edu/issues/3613
-            // logger.info(dataverse.getName() + " size " + dataversePaths.size());
+            // removing the dataverse's own id from the paths
             dataversePaths.remove(dataversePaths.size() - 1);
         }
-        // Add paths for linking dataverses
-        for (Dataverse linkingDataverse : dvLinkingService.findLinkingDataverses(dataverse.getId())) {
-            List<String> linkingDataversePathSegmentsAccumulator = new ArrayList<>();
-            List<String> linkingdataverseSegments = findPathSegments(linkingDataverse, linkingDataversePathSegmentsAccumulator);
-            List<String> linkingDataversePaths = getDataversePathsFromSegments(linkingdataverseSegments);
-            for (String dvPath : linkingDataversePaths) {
-                dataversePaths.add(dvPath);
+
+        //Add paths for my linking dataverses
+        List<Dataverse> linkingDataverses = findAllLinkingDataverses(dataverse);
+        List<String> linkingDataversePaths = findLinkingDataversePaths(linkingDataverses);
+        for (String dvPath:linkingDataversePaths ){
+            dataversePaths.add(dvPath);
+        }
+        //only do this if we're indexing an individual dataverse ie not full re-index
+        List<Long> dataverseChildrenIds = new ArrayList();
+        List<Long> datasetChildrenIds = new ArrayList();
+        if (processPaths) {
+            //Get Linking Dataverses to see if I need to reindex my children
+            if (hasAnyLinkingDataverses(dataverse)) {
+                dataverseChildrenIds = dataverseService.findAllDataverseDataverseChildren(dataverse.getId());
+                datasetChildrenIds = dataverseService.findAllDataverseDatasetChildren(dataverse.getId());
+                for (Long id : datasetChildrenIds) {
+                    updatePathForExistingSolrDocs(datasetService.find(id));
+                }
+
+                for (Long id : dataverseChildrenIds) {
+                    updatePathForExistingSolrDocs(dataverseService.find(id));
+                }
             }
         }
+        
         solrInputDocument.addField(SearchFields.SUBTREE, dataversePaths);
+
+        if (dataverse.isReleased()) {
+            solrInputDocument.addField(SearchFields.DATASET_COUNT, dataverseService.getDatasetCount(dataverse.getId()));
+        }
+
         docs.add(solrInputDocument);
 
         String status;
         try {
             if (dataverse.getId() != null) {
-                solrClientService.getSolrClient().add(docs);
+                solrClientIndexService.getSolrClient().add(docs);
             } else {
                 logger.info("WARNING: indexing of a dataverse with no id attempted");
             }
@@ -268,148 +340,330 @@ public Future<String> indexDataverse(Dataverse dataverse) throws SolrServerExcep
             logger.info(status);
             return new AsyncResult<>(status);
         }
-        try {
-            solrClientService.getSolrClient().commit();
-        } catch (SolrServerException | IOException ex) {
-            status = ex.toString();
-            logger.info(status);
-            return new AsyncResult<>(status);
-        }
-
         dvObjectService.updateContentIndexTime(dataverse);
         IndexResponse indexResponse = solrIndexService.indexPermissionsForOneDvObject(dataverse);
         String msg = "indexed dataverse " + dataverse.getId() + ":" + dataverse.getAlias() + ". Response from permission indexing: " + indexResponse.getMessage();
         return new AsyncResult<>(msg);
 
     }
-
+    
     @TransactionAttribute(REQUIRES_NEW)
-    public Future<String> indexDatasetInNewTransaction(Long datasetId) throws  SolrServerException, IOException{ //Dataset dataset) {
+    public void indexDatasetInNewTransaction(Long datasetId) { //Dataset dataset) {
         boolean doNormalSolrDocCleanUp = false;
-        Dataset dataset = em.find(Dataset.class, datasetId);
-        // return indexDataset(dataset, doNormalSolrDocCleanUp);
-        Future<String> ret = indexDataset(dataset, doNormalSolrDocCleanUp);
-        dataset = null;
-        return ret;
+        asyncIndexDataset(datasetId, doNormalSolrDocCleanUp);
+    }
+    
+    // The following two variables are only used in the synchronized getNextToIndex method and do not need to be synchronized themselves
+
+    // nextToIndex contains datasets mapped by dataset id that were added for future indexing while the indexing was already ongoing for a given dataset
+    // (if there already was a dataset scheduled for indexing, it is overwritten and only the most recently requested version is kept in the map)
+    private static final Map<Long, Dataset> NEXT_TO_INDEX = new ConcurrentHashMap<>();
+    // indexingNow is a set of dataset ids of datasets being indexed asynchronously right now
+    private static final Map<Long, Boolean> INDEXING_NOW = new ConcurrentHashMap<>();
+    // semaphore for async indexing
+    private static final Semaphore ASYNC_INDEX_SEMAPHORE = new Semaphore(JvmSettings.MAX_ASYNC_INDEXES.lookupOptional(Integer.class).orElse(4), true);
+    
+    @Inject
+    @Metric(name = "index_permit_wait_time", absolute = true, unit = MetricUnits.NANOSECONDS,
+            description = "Displays how long does it take to receive a permit to index a dataset")
+    Timer indexPermitWaitTimer;
+    
+    @Inject
+    @Metric(name = "index_time", absolute = true, unit = MetricUnits.NANOSECONDS,
+            description = "Displays how long does it take to index a dataset")
+    Timer indexTimer;
+    
+    /**
+     * Try to acquire a permit from the semaphore avoiding too many parallel indexes, potentially overwhelming Solr.
+     * This method will time the duration waiting for the permit, allowing indexing performance to be measured.
+     * @throws InterruptedException
+     */
+    private void acquirePermitFromSemaphore() throws InterruptedException {
+        try (var timeContext = indexPermitWaitTimer.time()) {
+            ASYNC_INDEX_SEMAPHORE.acquire();
+        }
     }
 
+    // When you pass null as Dataset parameter to this method, it indicates that the indexing of the dataset with "id" has finished
+    // Pass non-null Dataset to schedule it for indexing
+    synchronized private static Dataset getNextToIndex(Long id, Dataset d) {
+        if (d == null) { // -> indexing of the dataset with id has finished
+            Dataset next = NEXT_TO_INDEX.remove(id);
+            if (next == null) { // -> no new indexing jobs were requested while indexing was ongoing
+                // the job can be stopped now
+                INDEXING_NOW.remove(id);
+            }
+            return next;
+        }
+        // index job is requested for a non-null dataset
+        if (INDEXING_NOW.containsKey(id)) { // -> indexing job is already ongoing, and a new job should not be started by the current thread -> return null
+            NEXT_TO_INDEX.put(id, d);
+            return null;
+        }
+        // otherwise, start a new job
+        INDEXING_NOW.put(id, true);
+        return d;
+    }
+
+    /**
+     * Indexes a dataset asynchronously.
+     * 
+     * Note that this method implement a synchronized skipping mechanism. When an
+     * indexing job is already running for a given dataset in the background, the
+     * new call will not index that dataset, but will delegate the execution to
+     * the already running job. The running job will pick up the requested indexing
+     * once that it is finished with the ongoing indexing. If another indexing is
+     * requested before the ongoing indexing is finished, only the indexing that is
+     * requested most recently will be picked up for the next indexing.
+     * 
+     * In other words: we can have at most one indexing ongoing for the given
+     * dataset, and at most one (most recent) request for reindexing of the same
+     * dataset. All requests that come between the most recent one and the ongoing
+     * one are skipped for the optimization reasons. For a more in depth discussion,
+     * see the pull request: https://github.com/IQSS/dataverse/pull/9558
+     * 
+     * @param dataset                The dataset to be indexed.
+     * @param doNormalSolrDocCleanUp Flag for normal Solr doc clean up.
+     */
     @Asynchronous
-    public Future<String> asyncIndexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) throws  SolrServerException, IOException {
-        return indexDataset(dataset, doNormalSolrDocCleanUp);
+    public void asyncIndexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) {
+        try {
+            acquirePermitFromSemaphore();
+            doAsyncIndexDataset(dataset, doNormalSolrDocCleanUp);
+        } catch (InterruptedException e) {
+            String failureLogText = "Indexing failed: interrupted. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
+            failureLogText += "\r\n" + e.getLocalizedMessage();
+            LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, dataset);
+        } finally {
+            ASYNC_INDEX_SEMAPHORE.release();
+        }
     }
-    
+
     @Asynchronous
-    public void asyncIndexDatasetList(List<Dataset> datasets, boolean doNormalSolrDocCleanUp) throws  SolrServerException, IOException {
+    public void asyncIndexDataset(Long datasetId, boolean doNormalSolrDocCleanUp) {
+        //Initialize dataset here for logging (LoggingUtil) purposes
+        Dataset dataset = null;
+        try {
+            acquirePermitFromSemaphore();
+            dataset = datasetService.find(datasetId);
+            doAsyncIndexDataset(dataset, doNormalSolrDocCleanUp);
+        } catch (InterruptedException e) {
+            String failureLogText = "Indexing failed: interrupted. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + datasetId.toString();
+            failureLogText += "\r\n" + e.getLocalizedMessage();
+            if(dataset==null) {
+                dataset = new Dataset();
+                dataset.setId(datasetId);
+            }
+            LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, dataset);
+        } finally {
+            ASYNC_INDEX_SEMAPHORE.release();
+        }
+    }
+    private void doAsyncIndexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) {
+        Long id = dataset.getId();
+        Dataset next = getNextToIndex(id, dataset); // if there is an ongoing index job for this dataset, next is null (ongoing index job will reindex the newest version after current indexing finishes)
+        while (next != null) {
+            // Time context will automatically start on creation and stop when leaving the try block
+            try (var timeContext = indexTimer.time()) {
+                indexDataset(next, doNormalSolrDocCleanUp);
+            } catch (Exception e) { // catch all possible exceptions; otherwise when something unexpected happes the dataset wold remain locked and impossible to reindex
+                String failureLogText = "Indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
+                failureLogText += "\r\n" + e.getLocalizedMessage();
+                LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, dataset);
+            }
+            next = getNextToIndex(id, null); // if dataset was not changed during the indexing (and no new job was requested), next is null and loop can be stopped
+        }
+    }
+
+    @Asynchronous
+    public void asyncIndexDatasetList(List<Dataset> datasets, boolean doNormalSolrDocCleanUp) {
         for(Dataset dataset : datasets) {
-            indexDataset(dataset, true);
+            try {
+                acquirePermitFromSemaphore();
+                doAsyncIndexDataset(dataset, true);
+            } catch (InterruptedException e) {
+                String failureLogText = "Indexing failed: interrupted. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString();
+                failureLogText += "\r\n" + e.getLocalizedMessage();
+                LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, dataset);
+            } finally {
+                ASYNC_INDEX_SEMAPHORE.release();
+            }
         }
     }
     
-    public Future<String> indexDvObject(DvObject objectIn) throws  SolrServerException, IOException {
-        
+    public void indexDvObject(DvObject objectIn) throws  SolrServerException, IOException {
         if (objectIn.isInstanceofDataset() ){
-            return (indexDataset((Dataset)objectIn, true));
-        }
-        if (objectIn.isInstanceofDataverse() ){
-            return (indexDataverse((Dataverse)objectIn));
+            asyncIndexDataset((Dataset)objectIn, true);
+        } else if (objectIn.isInstanceofDataverse() ){
+            indexDataverse((Dataverse)objectIn);
         }
-        return null;
+    }
+
+    public void indexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) throws  SolrServerException, IOException {
+        doIndexDataset(dataset, doNormalSolrDocCleanUp);
+        updateLastIndexedTime(dataset.getId());
     }
     
-    public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) throws  SolrServerException, IOException {
+    private void doIndexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) throws  SolrServerException, IOException {
         logger.fine("indexing dataset " + dataset.getId());
         /**
          * @todo should we use solrDocIdentifierDataset or
          * IndexableObject.IndexableTypes.DATASET.getName() + "_" ?
          */
-        // String solrIdPublished = solrDocIdentifierDataset + dataset.getId();
         String solrIdPublished = determinePublishedDatasetSolrDocId(dataset);
         String solrIdDraftDataset = IndexableObject.IndexableTypes.DATASET.getName() + "_" + dataset.getId() + IndexableDataset.DatasetState.WORKING_COPY.getSuffix();
-        // String solrIdDeaccessioned = IndexableObject.IndexableTypes.DATASET.getName()
-        // + "_" + dataset.getId() +
-        // IndexableDataset.DatasetState.DEACCESSIONED.getSuffix();
         String solrIdDeaccessioned = determineDeaccessionedDatasetId(dataset);
         StringBuilder debug = new StringBuilder();
         debug.append("\ndebug:\n");
-        int numPublishedVersions = 0;
-        List<DatasetVersion> versions = dataset.getVersions();
-        List<String> solrIdsOfFilesToDelete = new ArrayList<>();
-        for (DatasetVersion datasetVersion : versions) {
-            Long versionDatabaseId = datasetVersion.getId();
-            String versionTitle = datasetVersion.getTitle();
-            String semanticVersion = datasetVersion.getSemanticVersion();
-            DatasetVersion.VersionState versionState = datasetVersion.getVersionState();
-            if (versionState.equals(DatasetVersion.VersionState.RELEASED)) {
-                numPublishedVersions += 1;
-            }
-            debug.append("version found with database id " + versionDatabaseId + "\n");
-            debug.append("- title: " + versionTitle + "\n");
-            debug.append("- semanticVersion-VersionState: " + semanticVersion + "-" + versionState + "\n");
-            List<FileMetadata> fileMetadatas = datasetVersion.getFileMetadatas();
-            List<String> fileInfo = new ArrayList<>();
-            for (FileMetadata fileMetadata : fileMetadatas) {
-                String solrIdOfPublishedFile = solrDocIdentifierFile + fileMetadata.getDataFile().getId();
-                /**
-                 * It sounds weird but the first thing we'll do is preemptively
-                 * delete the Solr documents of all published files. Don't
-                 * worry, published files will be re-indexed later along with
-                 * the dataset. We do this so users can delete files from
-                 * published versions of datasets and then re-publish a new
-                 * version without fear that their old published files (now
-                 * deleted from the latest published version) will be
-                 * searchable. See also
-                 * https://github.com/IQSS/dataverse/issues/762
-                 */
-                solrIdsOfFilesToDelete.add(solrIdOfPublishedFile);
-                fileInfo.add(fileMetadata.getDataFile().getId() + ":" + fileMetadata.getLabel());
-            }
-            try {
-                /**
-                 * Preemptively delete *all* Solr documents for files associated
-                 * with the dataset based on a Solr query.
-                 *
-                 * We must query Solr for this information because the file has
-                 * been deleted from the database ( perhaps when Solr was down,
-                 * as reported in https://github.com/IQSS/dataverse/issues/2086
-                 * ) so the database doesn't even know about the file. It's an
-                 * orphan.
-                 *
-                 * @todo This Solr query should make the iteration above based
-                 * on the database unnecessary because it the Solr query should
-                 * find all files for the dataset. We can probably remove the
-                 * iteration above after an "index all" has been performed.
-                 * Without an "index all" we won't be able to find files based
-                 * on parentId because that field wasn't searchable in 4.0.
-                 *
-                 * @todo We should also delete the corresponding Solr
-                 * "permission" documents for the files.
-                 */
-                List<String> allFilesForDataset = findFilesOfParentDataset(dataset.getId());
-                solrIdsOfFilesToDelete.addAll(allFilesForDataset);
-            } catch (SearchException | NullPointerException ex) {
-                logger.fine("could not run search of files to delete: " + ex);
+        boolean reduceSolrDeletes = FeatureFlags.REDUCE_SOLR_DELETES.enabled();
+        if (!reduceSolrDeletes) {
+            int numPublishedVersions = 0;
+            List<DatasetVersion> versions = dataset.getVersions();
+            List<String> solrIdsOfFilesToDelete = new ArrayList<>();
+            for (DatasetVersion datasetVersion : versions) {
+                Long versionDatabaseId = datasetVersion.getId();
+                String versionTitle = datasetVersion.getTitle();
+                String semanticVersion = datasetVersion.getSemanticVersion();
+                DatasetVersion.VersionState versionState = datasetVersion.getVersionState();
+                if (versionState.equals(DatasetVersion.VersionState.RELEASED)) {
+                    numPublishedVersions += 1;
+                }
+                debug.append("version found with database id " + versionDatabaseId + "\n");
+                debug.append("- title: " + versionTitle + "\n");
+                debug.append("- semanticVersion-VersionState: " + semanticVersion + "-" + versionState + "\n");
+                List<FileMetadata> fileMetadatas = datasetVersion.getFileMetadatas();
+                List<String> fileInfo = new ArrayList<>();
+                for (FileMetadata fileMetadata : fileMetadatas) {
+                    String solrIdOfPublishedFile = solrDocIdentifierFile + fileMetadata.getDataFile().getId();
+                    /**
+                     * It sounds weird but the first thing we'll do is preemptively
+                     * delete the Solr documents of all published files. Don't
+                     * worry, published files will be re-indexed later along with
+                     * the dataset. We do this so users can delete files from
+                     * published versions of datasets and then re-publish a new
+                     * version without fear that their old published files (now
+                     * deleted from the latest published version) will be
+                     * searchable. See also
+                     * https://github.com/IQSS/dataverse/issues/762
+                     */
+                    solrIdsOfFilesToDelete.add(solrIdOfPublishedFile);
+                    fileInfo.add(fileMetadata.getDataFile().getId() + ":" + fileMetadata.getLabel());
+                }
+                try {
+                    /**
+                     * Preemptively delete *all* Solr documents for files associated
+                     * with the dataset based on a Solr query.
+                     *
+                     * We must query Solr for this information because the file has
+                     * been deleted from the database ( perhaps when Solr was down,
+                     * as reported in https://github.com/IQSS/dataverse/issues/2086
+                     * ) so the database doesn't even know about the file. It's an
+                     * orphan.
+                     *
+                     * @todo This Solr query should make the iteration above based
+                     * on the database unnecessary because it the Solr query should
+                     * find all files for the dataset. We can probably remove the
+                     * iteration above after an "index all" has been performed.
+                     * Without an "index all" we won't be able to find files based
+                     * on parentId because that field wasn't searchable in 4.0.
+                     *
+                     * @todo We should also delete the corresponding Solr
+                     * "permission" documents for the files.
+                     */
+                    List<String> allFilesForDataset = findFilesOfParentDataset(dataset.getId());
+                    solrIdsOfFilesToDelete.addAll(allFilesForDataset);
+                } catch (SearchException | NullPointerException ex) {
+                    logger.fine("could not run search of files to delete: " + ex);
+                }
+                int numFiles = 0;
+                if (fileMetadatas != null) {
+                    numFiles = fileMetadatas.size();
+                }
+                debug.append("- files: " + numFiles + " " + fileInfo.toString() + "\n");
             }
-            int numFiles = 0;
-            if (fileMetadatas != null) {
-                numFiles = fileMetadatas.size();
+            debug.append("numPublishedVersions: " + numPublishedVersions + "\n");
+            if (doNormalSolrDocCleanUp) {
+                IndexResponse resultOfAttemptToPremptivelyDeletePublishedFiles = solrIndexService.deleteMultipleSolrIds(solrIdsOfFilesToDelete);
+                debug.append("result of attempt to premptively deleted published files before reindexing: " + resultOfAttemptToPremptivelyDeletePublishedFiles + "\n");
             }
-            debug.append("- files: " + numFiles + " " + fileInfo.toString() + "\n");
-        }
-        debug.append("numPublishedVersions: " + numPublishedVersions + "\n");
-        if (doNormalSolrDocCleanUp) {
-            IndexResponse resultOfAttemptToPremptivelyDeletePublishedFiles = solrIndexService.deleteMultipleSolrIds(solrIdsOfFilesToDelete);
-            debug.append("result of attempt to premptively deleted published files before reindexing: " + resultOfAttemptToPremptivelyDeletePublishedFiles + "\n");
         }
         DatasetVersion latestVersion = dataset.getLatestVersion();
-        String latestVersionStateString = latestVersion.getVersionState().name();
         DatasetVersion.VersionState latestVersionState = latestVersion.getVersionState();
+        String latestVersionStateString = latestVersionState.name();
         DatasetVersion releasedVersion = dataset.getReleasedVersion();
         boolean atLeastOnePublishedVersion = false;
         if (releasedVersion != null) {
             atLeastOnePublishedVersion = true;
-        } else {
-            atLeastOnePublishedVersion = false;
         }
+        if (reduceSolrDeletes) {
+            List<String> solrIdsOfDocsToDelete = null;
+            if (logger.isLoggable(Level.FINE)) {
+                writeDebugInfo(debug, dataset);
+            }
+            if (doNormalSolrDocCleanUp) {
+                try {
+                    solrIdsOfDocsToDelete = findFilesOfParentDataset(dataset.getId());
+                    logger.fine("Existing file docs: " + String.join(", ", solrIdsOfDocsToDelete));
+                    if (!solrIdsOfDocsToDelete.isEmpty()) {
+                        // We keep the latest version's docs unless it is deaccessioned and there is no
+                        // published/released version
+                        // So skip the loop removing those docs from the delete list except in that case
+                        if ((!latestVersion.isDeaccessioned() || atLeastOnePublishedVersion)) {
+                            List<FileMetadata> latestFileMetadatas = latestVersion.getFileMetadatas();
+                            String suffix = (new IndexableDataset(latestVersion)).getDatasetState().getSuffix();
+                            for (FileMetadata fileMetadata : latestFileMetadatas) {
+                                String solrIdOfPublishedFile = solrDocIdentifierFile
+                                        + fileMetadata.getDataFile().getId() + suffix;
+                                solrIdsOfDocsToDelete.remove(solrIdOfPublishedFile);
+                            }
+                        }
+                        if (releasedVersion != null && !releasedVersion.equals(latestVersion)) {
+                            List<FileMetadata> releasedFileMetadatas = releasedVersion.getFileMetadatas();
+                            for (FileMetadata fileMetadata : releasedFileMetadatas) {
+                                String solrIdOfPublishedFile = solrDocIdentifierFile
+                                        + fileMetadata.getDataFile().getId();
+                                solrIdsOfDocsToDelete.remove(solrIdOfPublishedFile);
+                            }
+                        }
+                    }
+                    // Clear any unused dataset docs
+                    if (!latestVersion.isDraft()) {
+                        // The latest version is released, so should delete any draft docs for the
+                        // dataset
+                        solrIdsOfDocsToDelete.add(solrIdDraftDataset);
+                    }
+                    if (!atLeastOnePublishedVersion) {
+                        // There's no released version, so should delete any normal state docs for the
+                        // dataset
+                        solrIdsOfDocsToDelete.add(solrIdPublished);
+                    }
+                    if (atLeastOnePublishedVersion || !latestVersion.isDeaccessioned()) {
+                        // There's a released version or a draft, so should delete any deaccessioned
+                        // state docs for the dataset
+                        solrIdsOfDocsToDelete.add(solrIdDeaccessioned);
+                    }
+                } catch (SearchException | NullPointerException ex) {
+                    logger.fine("could not run search of files to delete: " + ex);
+                }
+                logger.fine("Solr docs to delete: " + String.join(", ", solrIdsOfDocsToDelete));
+
+                if (!solrIdsOfDocsToDelete.isEmpty()) {
+                    List<String> solrIdsOfPermissionDocsToDelete = new ArrayList<>();
+                    for (String file : solrIdsOfDocsToDelete) {
+                        // Also remove associated permission docs
+                        solrIdsOfPermissionDocsToDelete.add(file + discoverabilityPermissionSuffix);
+                    }
+                    solrIdsOfDocsToDelete.addAll(solrIdsOfPermissionDocsToDelete);
+                    logger.fine("Solr docs and perm docs to delete: " + String.join(", ", solrIdsOfDocsToDelete));
+
+                    IndexResponse resultOfAttemptToPremptivelyDeletePublishedFiles = solrIndexService
+                            .deleteMultipleSolrIds(solrIdsOfDocsToDelete);
+                    debug.append("result of attempt to premptively deleted published files before reindexing: "
+                            + resultOfAttemptToPremptivelyDeletePublishedFiles + "\n");
+                }
+            }
+        }
+       
         Map<DatasetVersion.VersionState, Boolean> desiredCards = new LinkedHashMap<>();
         /**
          * @todo refactor all of this below and have a single method that takes
@@ -432,7 +686,7 @@ public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                         .append(indexDraftResult).append("\n");
 
                 desiredCards.put(DatasetVersion.VersionState.DEACCESSIONED, false);
-                if (doNormalSolrDocCleanUp) {
+                if (!reduceSolrDeletes && doNormalSolrDocCleanUp) {
                     String deleteDeaccessionedResult = removeDeaccessioned(dataset);
                     results.append("Draft exists, no need for deaccessioned version. Deletion attempted for ")
                             .append(solrIdDeaccessioned).append(" (and files). Result: ")
@@ -440,7 +694,7 @@ public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 }
 
                 desiredCards.put(DatasetVersion.VersionState.RELEASED, false);
-                if (doNormalSolrDocCleanUp) {
+                if (!reduceSolrDeletes && doNormalSolrDocCleanUp) {
                     String deletePublishedResults = removePublished(dataset);
                     results.append("No published version. Attempting to delete traces of published version from index. Result: ")
                             .append(deletePublishedResults).append("\n");
@@ -475,7 +729,6 @@ public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 String result = getDesiredCardState(desiredCards) + results.toString() + debug.toString();
                 logger.fine(result);
                 indexDatasetPermissions(dataset);
-                return new AsyncResult<>(result);
             } else if (latestVersionState.equals(DatasetVersion.VersionState.DEACCESSIONED)) {
 
                 desiredCards.put(DatasetVersion.VersionState.DEACCESSIONED, true);
@@ -484,13 +737,13 @@ public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 results.append("No draft version. Attempting to index as deaccessioned. Result: ").append(indexDeaccessionedVersionResult).append("\n");
 
                 desiredCards.put(DatasetVersion.VersionState.RELEASED, false);
-                if (doNormalSolrDocCleanUp) {
+                if (!reduceSolrDeletes && doNormalSolrDocCleanUp) {
                     String deletePublishedResults = removePublished(dataset);
                     results.append("No published version. Attempting to delete traces of published version from index. Result: ").append(deletePublishedResults).append("\n");
                 }
 
                 desiredCards.put(DatasetVersion.VersionState.DRAFT, false);
-                if (doNormalSolrDocCleanUp) {
+                if (!reduceSolrDeletes && doNormalSolrDocCleanUp) {
                     List<String> solrDocIdsForDraftFilesToDelete = findSolrDocIdsForDraftFilesToDelete(dataset);
                     String deleteDraftDatasetVersionResult = removeSolrDocFromIndex(solrIdDraftDataset);
                     String deleteDraftFilesResults = deleteDraftFiles(solrDocIdsForDraftFilesToDelete);
@@ -522,11 +775,9 @@ public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 String result = getDesiredCardState(desiredCards) + results.toString() + debug.toString();
                 logger.fine(result);
                 indexDatasetPermissions(dataset);
-                return new AsyncResult<>(result);
             } else {
                 String result = "No-op. Unexpected condition reached: No released version and latest version is neither draft nor deaccessioned";
                 logger.fine(result);
-                return new AsyncResult<>(result);
             }
         } else if (atLeastOnePublishedVersion == true) {
             results.append("Published versions found. ")
@@ -540,7 +791,7 @@ public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 results.append("Attempted to index " + solrIdPublished).append(". Result: ").append(indexReleasedVersionResult).append("\n");
 
                 desiredCards.put(DatasetVersion.VersionState.DRAFT, false);
-                if (doNormalSolrDocCleanUp) {
+                if (!reduceSolrDeletes && doNormalSolrDocCleanUp) {
                     List<String> solrDocIdsForDraftFilesToDelete = findSolrDocIdsForDraftFilesToDelete(dataset);
                     String deleteDraftDatasetVersionResult = removeSolrDocFromIndex(solrIdDraftDataset);
                     String deleteDraftFilesResults = deleteDraftFiles(solrDocIdsForDraftFilesToDelete);
@@ -549,7 +800,7 @@ public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 }
 
                 desiredCards.put(DatasetVersion.VersionState.DEACCESSIONED, false);
-                if (doNormalSolrDocCleanUp) {
+                if (!reduceSolrDeletes && doNormalSolrDocCleanUp) {
                     String deleteDeaccessionedResult = removeDeaccessioned(dataset);
                     results.append("No need for deaccessioned version. Deletion attempted for ")
                             .append(solrIdDeaccessioned).append(". Result: ").append(deleteDeaccessionedResult);
@@ -579,7 +830,6 @@ public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 String result = getDesiredCardState(desiredCards) + results.toString() + debug.toString();
                 logger.fine(result);
                 indexDatasetPermissions(dataset);
-                return new AsyncResult<>(result);
             } else if (latestVersionState.equals(DatasetVersion.VersionState.DRAFT)) {
 
                 IndexableDataset indexableDraftVersion = new IndexableDataset(latestVersion);
@@ -588,18 +838,20 @@ public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 for (FileMetadata fm : latestVersion.getFileMetadatas()) {
                     datafilesInDraftVersion.add(fm.getDataFile().getId());
                 }
-                String indexDraftResult = addOrUpdateDataset(indexableDraftVersion);
-                results.append("The latest version is a working copy (latestVersionState: ")
-                        .append(latestVersionStateString).append(") and will be indexed as ")
-                        .append(solrIdDraftDataset).append(" (limited visibility). Result: ").append(indexDraftResult).append("\n");
+
 
                 desiredCards.put(DatasetVersion.VersionState.RELEASED, true);
                 IndexableDataset indexableReleasedVersion = new IndexableDataset(releasedVersion);
                 String indexReleasedVersionResult = addOrUpdateDataset(indexableReleasedVersion, datafilesInDraftVersion);
                 results.append("There is a published version we will attempt to index. Result: ").append(indexReleasedVersionResult).append("\n");
 
+                String indexDraftResult = addOrUpdateDataset(indexableDraftVersion);
+                results.append("The latest version is a working copy (latestVersionState: ")
+                        .append(latestVersionStateString).append(") and will be indexed as ")
+                        .append(solrIdDraftDataset).append(" (limited visibility). Result: ").append(indexDraftResult).append("\n");
+                
                 desiredCards.put(DatasetVersion.VersionState.DEACCESSIONED, false);
-                if (doNormalSolrDocCleanUp) {
+                if (!reduceSolrDeletes && doNormalSolrDocCleanUp) {
                     String deleteDeaccessionedResult = removeDeaccessioned(dataset);
                     results.append("No need for deaccessioned version. Deletion attempted for ")
                             .append(solrIdDeaccessioned).append(". Result: ").append(deleteDeaccessionedResult);
@@ -631,24 +883,52 @@ public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 String result = getDesiredCardState(desiredCards) + results.toString() + debug.toString();
                 logger.fine(result);
                 indexDatasetPermissions(dataset);
-                return new AsyncResult<>(result);
             } else {
                 String result = "No-op. Unexpected condition reached: There is at least one published version but the latest version is neither published nor draft";
                 logger.fine(result);
-                return new AsyncResult<>(result);
             }
         } else {
             String result = "No-op. Unexpected condition reached: Has a version been published or not?";
             logger.fine(result);
-            return new AsyncResult<>(result);
         }
     }
     
-    private String deleteDraftFiles(List<String> solrDocIdsForDraftFilesToDelete) {
-        String deleteDraftFilesResults = "";
-        IndexResponse indexResponse = solrIndexService.deleteMultipleSolrIds(solrDocIdsForDraftFilesToDelete);
-        deleteDraftFilesResults = indexResponse.toString();
-        return deleteDraftFilesResults;
+    private void writeDebugInfo(StringBuilder debug, Dataset dataset) {
+        List<DatasetVersion> versions = dataset.getVersions();
+        int numPublishedVersions = 0;
+        for (DatasetVersion datasetVersion : versions) {
+            Long versionDatabaseId = datasetVersion.getId();
+            String versionTitle = datasetVersion.getTitle();
+            String semanticVersion = datasetVersion.getSemanticVersion();
+            DatasetVersion.VersionState versionState = datasetVersion.getVersionState();
+            if (versionState.equals(DatasetVersion.VersionState.RELEASED)) {
+                numPublishedVersions += 1;
+            }
+            debug.append("version found with database id " + versionDatabaseId + "\n");
+            debug.append("- title: " + versionTitle + "\n");
+            debug.append("- semanticVersion-VersionState: " + semanticVersion + "-" + versionState + "\n");
+            List<String> fileInfo = new ArrayList<>();
+            List<FileMetadata> fileMetadatas = datasetVersion.getFileMetadatas();
+
+            for (FileMetadata fileMetadata : fileMetadatas) {
+                /**
+                 * It sounds weird but the first thing we'll do is preemptively delete the Solr
+                 * documents of all published files. Don't worry, published files will be
+                 * re-indexed later along with the dataset. We do this so users can delete files
+                 * from published versions of datasets and then re-publish a new version without
+                 * fear that their old published files (now deleted from the latest published
+                 * version) will be searchable. See also
+                 * https://github.com/IQSS/dataverse/issues/762
+                 */
+                fileInfo.add(fileMetadata.getDataFile().getId() + ":" + fileMetadata.getLabel());
+            }
+            int numFiles = 0;
+            if (fileMetadatas != null) {
+                numFiles = fileMetadatas.size();
+            }
+            debug.append("- files: " + numFiles + " " + fileInfo.toString() + "\n");
+        }
+        debug.append("numPublishedVersions: " + numPublishedVersions + "\n");
     }
 
     private IndexResponse indexDatasetPermissions(Dataset dataset) {
@@ -666,31 +946,15 @@ private IndexResponse indexDatasetPermissions(Dataset dataset) {
     }
 
     private String addOrUpdateDataset(IndexableDataset indexableDataset) throws  SolrServerException, IOException {
-        return addOrUpdateDataset(indexableDataset, null);
+        String result = addOrUpdateDataset(indexableDataset, null);
+        return result;
     }
-    
-    private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> datafilesInDraftVersion) throws  SolrServerException, IOException {
+
+    public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set<Long> datafilesInDraftVersion) throws  SolrServerException, IOException {
         IndexableDataset.DatasetState state = indexableDataset.getDatasetState();
         Dataset dataset = indexableDataset.getDatasetVersion().getDataset();
         logger.fine("adding or updating Solr document for dataset id " + dataset.getId());
         Collection<SolrInputDocument> docs = new ArrayList<>();
-        List<String> dataversePathSegmentsAccumulator = new ArrayList<>();
-        List<String> dataverseSegments = new ArrayList<>();
-        try {
-            dataverseSegments = findPathSegments(dataset.getOwner(), dataversePathSegmentsAccumulator);
-        } catch (Exception ex) {
-            logger.info("failed to find dataverseSegments for dataversePaths for " + SearchFields.SUBTREE + ": " + ex);
-        }
-        List<String> dataversePaths = getDataversePathsFromSegments(dataverseSegments);
-        // Add Paths for linking dataverses
-        for (Dataverse linkingDataverse : dsLinkingService.findLinkingDataverses(dataset.getId())) {
-            List<String> linkingDataversePathSegmentsAccumulator = new ArrayList<>();
-            List<String> linkingdataverseSegments = findPathSegments(linkingDataverse, linkingDataversePathSegmentsAccumulator);
-            List<String> linkingDataversePaths = getDataversePathsFromSegments(linkingdataverseSegments);
-            for (String dvPath : linkingDataversePaths) {
-                dataversePaths.add(dvPath);
-            }
-        }
         SolrInputDocument solrInputDocument = new SolrInputDocument();
         String datasetSolrDocId = indexableDataset.getSolrDocId();
         solrInputDocument.addField(SearchFields.ID, datasetSolrDocId);
@@ -701,71 +965,134 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
         solrInputDocument.addField(SearchFields.DATASET_PERSISTENT_ID, dataset.getGlobalId().toString());
         solrInputDocument.addField(SearchFields.PERSISTENT_URL, dataset.getPersistentURL());
         solrInputDocument.addField(SearchFields.TYPE, "datasets");
+        solrInputDocument.addField(SearchFields.DATASET_VALID, indexableDataset.getDatasetVersion().isValid());
 
+        final Dataverse dataverse = dataset.getDataverseContext();
+        final String dvIndexableCategoryName = dataverse.getIndexableCategoryName();
+        final String dvAlias = dataverse.getAlias();
+        final String dvDisplayName = dataverse.getDisplayName();
+        final String rdvName = findRootDataverseCached().getName();
         //This only grabs the immediate parent dataverse's category. We do the same for dataverses themselves.
-        solrInputDocument.addField(SearchFields.CATEGORY_OF_DATAVERSE, dataset.getDataverseContext().getIndexableCategoryName());
-        solrInputDocument.addField(SearchFields.IDENTIFIER_OF_DATAVERSE, dataset.getDataverseContext().getAlias());
-        solrInputDocument.addField(SearchFields.DATAVERSE_NAME, dataset.getDataverseContext().getDisplayName());
-        
-        Date datasetSortByDate = new Date();
-        Date majorVersionReleaseDate = dataset.getMostRecentMajorVersionReleaseDate();
-        if (majorVersionReleaseDate != null) {
-            if (true) {
-                String msg = "major release date found: " + majorVersionReleaseDate.toString();
-                logger.fine(msg);
-            }
-            datasetSortByDate = majorVersionReleaseDate;
-        } else {
-            if (indexableDataset.getDatasetState().equals(IndexableDataset.DatasetState.WORKING_COPY)) {
-                solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, UNPUBLISHED_STRING);
-            } else if (indexableDataset.getDatasetState().equals(IndexableDataset.DatasetState.DEACCESSIONED)) {
-                solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, DEACCESSIONED_STRING);
-            }
-            Date createDate = dataset.getCreateDate();
-            if (createDate != null) {
-                if (true) {
-                    String msg = "can't find major release date, using create date: " + createDate;
-                    logger.fine(msg);
-                }
-                datasetSortByDate = createDate;
+        solrInputDocument.addField(SearchFields.CATEGORY_OF_DATAVERSE, dvIndexableCategoryName);
+        solrInputDocument.addField(SearchFields.IDENTIFIER_OF_DATAVERSE, dvAlias);
+        solrInputDocument.addField(SearchFields.DATAVERSE_NAME, dvDisplayName);
+
+        Date datasetSortByDate;
+        // For now, drafts are indexed using to their last update time, and published versions are indexed using their
+        // most recent major version release date.
+        // This means that newly created or edited drafts will show up on the top when sorting by newest, newly
+        // published major versions will also show up on the top, and newly published minor versions will be shown
+        // next to their corresponding major version.
+        if (state.equals(DatasetState.WORKING_COPY)) {
+            Date lastUpdateTime = indexableDataset.getDatasetVersion().getLastUpdateTime();
+            if (lastUpdateTime != null) {
+                logger.fine("using last update time of indexed dataset version: " + lastUpdateTime);
+                datasetSortByDate = lastUpdateTime;
             } else {
-                String msg = "can't find major release date or create date, using \"now\"";
-                logger.info(msg);
+                logger.fine("can't find last update time, using \"now\"");
                 datasetSortByDate = new Date();
             }
+        } else {
+            Date majorVersionReleaseDate = dataset.getMostRecentMajorVersionReleaseDate();
+            if (majorVersionReleaseDate != null) {
+                logger.fine("major release date found: " + majorVersionReleaseDate.toString());
+                datasetSortByDate = majorVersionReleaseDate;
+            } else {
+                Date createDate = dataset.getCreateDate();
+                if (createDate != null) {
+                    logger.fine("can't find major release date, using create date: " + createDate);
+                    datasetSortByDate = createDate;
+                } else {
+                    logger.fine("can't find major release date or create date, using \"now\"");
+                    datasetSortByDate = new Date();
+                }
+            }
         }
         solrInputDocument.addField(SearchFields.RELEASE_OR_CREATE_DATE, datasetSortByDate);
 
-        if (state.equals(indexableDataset.getDatasetState().PUBLISHED)) {
+        if (state.equals(DatasetState.PUBLISHED)) {
             solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, PUBLISHED_STRING);
+            if (FeatureFlags.ADD_PUBLICOBJECT_SOLR_FIELD.enabled()) {
+                solrInputDocument.addField(SearchFields.PUBLIC_OBJECT, true);
+            }
             // solrInputDocument.addField(SearchFields.RELEASE_OR_CREATE_DATE,
             // dataset.getPublicationDate());
-        } else if (state.equals(indexableDataset.getDatasetState().WORKING_COPY)) {
+        } else if (state.equals(DatasetState.WORKING_COPY)) {
+            if (dataset.getReleasedVersion() == null) {
+                solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, UNPUBLISHED_STRING);
+            }
             solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, DRAFT_STRING);
+        } else if (state.equals(IndexableDataset.DatasetState.DEACCESSIONED)) {
+            solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, DEACCESSIONED_STRING);
         }
 
         addDatasetReleaseDateToSolrDoc(solrInputDocument, dataset);
 
         if (dataset.isHarvested()) {
             solrInputDocument.addField(SearchFields.IS_HARVESTED, true);
-            solrInputDocument.addField(SearchFields.METADATA_SOURCE, HARVESTED);
+            if (FeatureFlags.INDEX_HARVESTED_METADATA_SOURCE.enabled()) {
+                // New - as of 6.3 - option of indexing the actual origin of 
+                // harvested objects as the metadata source:
+                solrInputDocument.addField(SearchFields.METADATA_SOURCE,
+                                        dataset.getHarvestedFrom() != null ? dataset.getHarvestedFrom().getMetadataSource() : HARVESTED);
+            } else {
+                solrInputDocument.addField(SearchFields.METADATA_SOURCE, HARVESTED);
+            }
         } else {
             solrInputDocument.addField(SearchFields.IS_HARVESTED, false);
-            solrInputDocument.addField(SearchFields.METADATA_SOURCE, findRootDataverseCached().getName()); //rootDataverseName);
+            solrInputDocument.addField(SearchFields.METADATA_SOURCE, rdvName); //rootDataverseName);
         }
 
+        DatasetType datasetType = dataset.getDatasetType();
+        solrInputDocument.addField(SearchFields.DATASET_TYPE, datasetType.getName());
+
         DatasetVersion datasetVersion = indexableDataset.getDatasetVersion();
         String parentDatasetTitle = "TBD";
         if (datasetVersion != null) {
 
+            addLicenseToSolrDoc(solrInputDocument, datasetVersion);
+
             solrInputDocument.addField(SearchFields.DATASET_VERSION_ID, datasetVersion.getId());
             solrInputDocument.addField(SearchFields.DATASET_CITATION, datasetVersion.getCitation(false));
             solrInputDocument.addField(SearchFields.DATASET_CITATION_HTML, datasetVersion.getCitation(true));
 
+            solrInputDocument.addField(SearchFields.FILE_COUNT, datasetVersionFilesServiceBean.getFileMetadataCount(datasetVersion));
+
             if (datasetVersion.isInReview()) {
                 solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, IN_REVIEW_STRING);
             }
+            
+            CurationStatus status = datasetVersion.getCurrentCurationStatus();
+            if(status != null && Strings.isNotBlank(status.getLabel())) {
+                solrInputDocument.addField(SearchFields.CURATION_STATUS, status.getLabel());
+            }
+            // Add the creation time of the curation status
+            if (status != null && status.getCreateTime() != null) {
+                // Convert Date to ISO-8601 format for Solr pdate field
+                String isoDateString = status.getCreateTime().toInstant()
+                        .atOffset(ZoneOffset.UTC)
+                        .format(DateTimeFormatter.ISO_INSTANT);
+                solrInputDocument.addField(SearchFields.CURATION_STATUS_CREATE_TIME, isoDateString);
+            }
+
+
+            Set<String> langs = settingsService.getConfiguredLanguages();
+            Map<Long, JsonObject> cvocMap = datasetFieldService.getCVocConf(true);
+            Map<Long, Set<String>> cvocManagedFieldMap = new HashMap<>();
+            for (Map.Entry<Long, JsonObject> cvocEntry : cvocMap.entrySet()) {
+                if(cvocEntry.getValue().containsKey("managed-fields")) {
+                    JsonObject managedFields = cvocEntry.getValue().getJsonObject("managed-fields");
+                    Set<String> managedFieldValues = new HashSet<>();
+                    for (String s : managedFields.keySet()) {
+                        managedFieldValues.add(managedFields.getString(s));
+                    }
+                    cvocManagedFieldMap.put(cvocEntry.getKey(), managedFieldValues);
+                }
+            }
+
+
 
+            Set<String> metadataBlocksWithValue = new HashSet<>();
             for (DatasetField dsf : datasetVersion.getFlatDatasetFields()) {
 
                 DatasetFieldType dsfType = dsf.getDatasetFieldType();
@@ -773,40 +1100,100 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
                 String solrFieldFacetable = dsfType.getSolrField().getNameFacetable();
 
                 if (dsf.getValues() != null && !dsf.getValues().isEmpty() && dsf.getValues().get(0) != null && solrFieldSearchable != null) {
+                    // Index all metadata blocks that have a value - To show in new facet category SearchFields.METADATA_TYPES
+                    if (dsfType.getMetadataBlock() != null) {
+                        metadataBlocksWithValue.add(dsfType.getMetadataBlock().getName());
+                    }
+
                     logger.fine("indexing " + dsf.getDatasetFieldType().getName() + ":" + dsf.getValues() + " into " + solrFieldSearchable + " and maybe " + solrFieldFacetable);
                     // if (dsfType.getSolrField().getSolrType().equals(SolrField.SolrType.INTEGER))
                     // {
                     if (dsfType.getSolrField().getSolrType().equals(SolrField.SolrType.EMAIL)) {
                         // no-op. we want to keep email address out of Solr per
                         // https://github.com/IQSS/dataverse/issues/759
+                    } else if (dsfType.getSolrField().getSolrType().equals(SolrField.SolrType.INTEGER)) {
+                        // we need to filter invalid integer values, because otherwise the whole document will
+                        // fail to be indexed
+                        Pattern intPattern = Pattern.compile("^-?\\d+$");
+                        List<String> indexableValues = dsf.getValuesWithoutNaValues().stream()
+                                .filter(s -> intPattern.matcher(s).find())
+                                .collect(Collectors.toList());
+                        solrInputDocument.addField(solrFieldSearchable, indexableValues);
+                        if (dsfType.getSolrField().isFacetable()) {
+                            solrInputDocument.addField(solrFieldFacetable, indexableValues);
+                        }
+                    } else if (dsfType.getSolrField().getSolrType().equals(SolrField.SolrType.FLOAT)) {
+                        // same as for integer values, we need to filter invalid float values
+                        List<String> indexableValues = dsf.getValuesWithoutNaValues().stream()
+                                .filter(s -> {
+                                    try {
+                                        Double.parseDouble(s);
+                                        return true;
+                                    } catch (NumberFormatException e) {
+                                        return false;
+                                    }
+                                })
+                                .collect(Collectors.toList());
+                        solrInputDocument.addField(solrFieldSearchable, indexableValues);
+                        if (dsfType.getSolrField().isFacetable()) {
+                            solrInputDocument.addField(solrFieldFacetable, indexableValues);
+                        }
                     } else if (dsfType.getSolrField().getSolrType().equals(SolrField.SolrType.DATE)) {
+                        // Solr accepts dates in the ISO-8601 format, e.g. YYYY-MM-DDThh:mm:ssZ, YYYYY-MM-DD, YYYY-MM, YYYY
+                        // See: https://solr.apache.org/guide/solr/latest/indexing-guide/date-formatting-math.html
+                        // If dates have been entered in other formats, we need to skip or convert them
+                        // TODO at the moment we are simply skipping, but converting them would offer more value for search
+                        // For use in facets, we index only the year (YYYY)
                         String dateAsString = "";
                         if (!dsf.getValues_nondisplay().isEmpty()) {
-                            dateAsString = dsf.getValues_nondisplay().get(0);
-                        }                      
+                            dateAsString = dsf.getValues_nondisplay().get(0).trim();
+                        }
+
                         logger.fine("date as string: " + dateAsString);
+
                         if (dateAsString != null && !dateAsString.isEmpty()) {
-                            SimpleDateFormat inputDateyyyy = new SimpleDateFormat("yyyy", Locale.ENGLISH);
-                            try {
-                                /**
-                                 * @todo when bean validation is working we
-                                 * won't have to convert strings into dates
-                                 */
-                                logger.fine("Trying to convert " + dateAsString + " to a YYYY date from dataset " + dataset.getId());
-                                Date dateAsDate = inputDateyyyy.parse(dateAsString);
-                                SimpleDateFormat yearOnly = new SimpleDateFormat("yyyy");
-                                String datasetFieldFlaggedAsDate = yearOnly.format(dateAsDate);
-                                logger.fine("YYYY only: " + datasetFieldFlaggedAsDate);
-                                // solrInputDocument.addField(solrFieldSearchable,
-                                // Integer.parseInt(datasetFieldFlaggedAsDate));
-                                solrInputDocument.addField(solrFieldSearchable, datasetFieldFlaggedAsDate);
-                                if (dsfType.getSolrField().isFacetable()) {
-                                    // solrInputDocument.addField(solrFieldFacetable,
+                            boolean dateValid = false;
+
+                            DateTimeFormatter[] possibleFormats = {
+                                    DateTimeFormatter.ISO_INSTANT,
+                                    DateTimeFormatter.ofPattern("yyyy-MM-dd"),
+                                    DateTimeFormatter.ofPattern("yyyy-MM"),
+                                    DateTimeFormatter.ofPattern("yyyy")
+                            };
+                            for (DateTimeFormatter format : possibleFormats){
+                                try {
+                                    format.parse(dateAsString);
+                                    dateValid = true;
+                                } catch (DateTimeParseException e) {
+                                    // no-op, date is invalid
+                                }
+                            }
+
+                            if (!dateValid) {
+                                logger.fine("couldn't index " + dsf.getDatasetFieldType().getName() + ":" + dsf.getValues() + " because it's not a valid date format according to Solr");
+                            } else {
+                                SimpleDateFormat inputDateyyyy = new SimpleDateFormat("yyyy", Locale.ENGLISH);
+                                try {
+                                    /**
+                                     * @todo when bean validation is working we
+                                     * won't have to convert strings into dates
+                                     */
+                                    logger.fine("Trying to convert " + dateAsString + " to a YYYY date from dataset " + dataset.getId());
+                                    Date dateAsDate = inputDateyyyy.parse(dateAsString);
+                                    SimpleDateFormat yearOnly = new SimpleDateFormat("yyyy");
+                                    String datasetFieldFlaggedAsDate = yearOnly.format(dateAsDate);
+                                    logger.fine("YYYY only: " + datasetFieldFlaggedAsDate);
+                                    // solrInputDocument.addField(solrFieldSearchable,
                                     // Integer.parseInt(datasetFieldFlaggedAsDate));
-                                    solrInputDocument.addField(solrFieldFacetable, datasetFieldFlaggedAsDate);
+                                    solrInputDocument.addField(solrFieldSearchable, dateAsString);
+                                    if (dsfType.getSolrField().isFacetable()) {
+                                        // solrInputDocument.addField(solrFieldFacetable,
+                                        // Integer.parseInt(datasetFieldFlaggedAsDate));
+                                        solrInputDocument.addField(solrFieldFacetable, datasetFieldFlaggedAsDate);
+                                    }
+                                } catch (Exception ex) {
+                                    logger.info("unable to convert " + dateAsString + " into YYYY format and couldn't index it (" + dsfType.getName() + ")");
                                 }
-                            } catch (Exception ex) {
-                                logger.info("unable to convert " + dateAsString + " into YYYY format and couldn't index it (" + dsfType.getName() + ")");
                             }
                         }
                     } else {
@@ -834,14 +1221,71 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
                             }
                             solrInputDocument.addField(SearchFields.NAME_SORT, dsf.getValues());
                         }
-                        if (dsfType.isControlledVocabulary()) {
-                            for (ControlledVocabularyValue controlledVocabularyValue : dsf.getControlledVocabularyValues()) {
-                                if (controlledVocabularyValue.getStrValue().equals(DatasetField.NA_VALUE)) {
-                                    continue;
+
+                        // If there is a CVOCConf for the field
+                        if(cvocMap.containsKey(dsfType.getId())) {
+                            List<String> vals = dsf.getValues_nondisplay();
+                            Set<String> searchStrings = new HashSet<>();
+                            for (String val: vals) {
+                                searchStrings.add(val);
+                                // Try to get string values from externalvocabularyvalue using val as termUri
+                                searchStrings.addAll(datasetFieldService.getIndexableStringsByTermUri(val, cvocMap.get(dsfType.getId()), dsfType.getName()));
+
+                                if(dsfType.getParentDatasetFieldType()!=null) {
+                                    List<DatasetField> childDatasetFields = dsf.getParentDatasetFieldCompoundValue().getChildDatasetFields();
+                                    for (DatasetField df : childDatasetFields) {
+                                        if(cvocManagedFieldMap.containsKey(dsfType.getId()) && cvocManagedFieldMap.get(dsfType.getId()).contains(df.getDatasetFieldType().getName())) {
+                                            String solrManagedFieldSearchable = df.getDatasetFieldType().getSolrField().getNameSearchable();
+                                            // Try to get string values from externalvocabularyvalue but for a managed fields of the CVOCConf
+                                            Set<String> stringsForManagedField = datasetFieldService.getIndexableStringsByTermUri(val, cvocMap.get(dsfType.getId()), df.getDatasetFieldType().getName());
+                                            logger.fine(solrManagedFieldSearchable + " filled with externalvocabularyvalue : " + stringsForManagedField);
+                                            //.addField works as addition of value not a replace of value
+                                            // it allows to add mapped values by CVOCConf before or after indexing real DatasetField value(s) of solrManagedFieldSearchable
+                                            solrInputDocument.addField(solrManagedFieldSearchable, stringsForManagedField);
+                                        }
+                                    }
                                 }
-                                solrInputDocument.addField(solrFieldSearchable, controlledVocabularyValue.getStrValue());
-                                if (dsfType.getSolrField().isFacetable()) {
-                                    solrInputDocument.addField(solrFieldFacetable, controlledVocabularyValue.getStrValue());
+                            }
+                            logger.fine(solrFieldSearchable + " filled with externalvocabularyvalue : " + searchStrings);
+                            solrInputDocument.addField(solrFieldSearchable, searchStrings);
+                            if (dsfType.getSolrField().isFacetable()) {
+                                logger.fine(solrFieldFacetable + " gets " + vals);
+                                solrInputDocument.addField(solrFieldFacetable, vals);
+                            }
+                        } else if (dsfType.isControlledVocabulary()) {
+                            /** If the cvv list is empty but the dfv list is not then it is assumed this was harvested
+                             *  from an installation that had controlled vocabulary entries that don't exist in our this db
+                             * @see <a href="https://github.com/IQSS/dataverse/issues/9992">Feature Request/Idea: Harvest metadata values that aren't from a list of controlled values #9992</a>
+                             */
+                            if (dsf.getControlledVocabularyValues().isEmpty()) {
+                                for (DatasetFieldValue dfv : dsf.getDatasetFieldValues()) {
+                                    if (dfv.getValue() == null || dfv.getValue().equals(DatasetField.NA_VALUE)) {
+                                        continue;
+                                    }
+                                    solrInputDocument.addField(solrFieldSearchable, dfv.getValue());
+
+                                    if (dsfType.getSolrField().isFacetable()) {
+                                        solrInputDocument.addField(solrFieldFacetable, dfv.getValue());
+                                    }
+                                }
+                            } else {
+                                for (ControlledVocabularyValue controlledVocabularyValue : dsf.getControlledVocabularyValues()) {
+                                    if (controlledVocabularyValue.getStrValue().equals(DatasetField.NA_VALUE)) {
+                                        continue;
+                                    }
+
+                                    // Index in all used languages (display and metadata languages
+                                    if (!dsfType.isAllowMultiples() || langs.isEmpty()) {
+                                        solrInputDocument.addField(solrFieldSearchable, controlledVocabularyValue.getStrValue());
+                                    } else {
+                                        for(String locale: langs) {
+                                            solrInputDocument.addField(solrFieldSearchable, controlledVocabularyValue.getLocaleStrValue(locale));
+                                        }
+                                    }
+
+                                    if (dsfType.getSolrField().isFacetable()) {
+                                        solrInputDocument.addField(solrFieldFacetable, controlledVocabularyValue.getStrValue());
+                                    }
                                 }
                             }
                         } else if (dsfType.getFieldType().equals(DatasetFieldType.FieldType.TEXTBOX)) {
@@ -868,22 +1312,98 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
                         }
                     }
                 }
+                
+                //ToDo - define a geom/bbox type solr field and find those instead of just this one
+                if(dsfType.getName().equals(DatasetFieldConstant.geographicBoundingBox)) {
+                    String minWestLon=null;
+                    String maxEastLon=null;
+                    String maxNorthLat=null;
+                    String minSouthLat=null;
+                    for (DatasetFieldCompoundValue compoundValue : dsf.getDatasetFieldCompoundValues()) {
+                        String westLon=null;
+                        String eastLon=null;
+                        String northLat=null;
+                        String southLat=null;
+                        for(DatasetField childDsf: compoundValue.getChildDatasetFields()) {
+                            switch (childDsf.getDatasetFieldType().getName()) {
+                            case DatasetFieldConstant.westLongitude:
+                                westLon = childDsf.getRawValue();
+                                break;
+                            case DatasetFieldConstant.eastLongitude:
+                                eastLon = childDsf.getRawValue();
+                                break;
+                            case DatasetFieldConstant.northLatitude:
+                                northLat = childDsf.getRawValue();
+                                break;
+                            case DatasetFieldConstant.southLatitude:
+                                southLat = childDsf.getRawValue();
+                                break;
+                            }
+                        }
+                        if ((eastLon != null || westLon != null) && (northLat != null || southLat != null)) {
+                            // we have a point or a box, so proceed
+                            if (eastLon == null) {
+                                eastLon = westLon;
+                            } else if (westLon == null) {
+                                westLon = eastLon;
+                            }
+                            if (northLat == null) {
+                                northLat = southLat;
+                            } else if (southLat == null) {
+                                southLat = northLat;
+                            }
+                            //Find the overall bounding box that includes all bounding boxes
+                            if(minWestLon==null || Float.parseFloat(minWestLon) > Float.parseFloat(westLon)) {
+                                minWestLon=westLon;
+                            }
+                            if(maxEastLon==null || Float.parseFloat(maxEastLon) < Float.parseFloat(eastLon)) {
+                                maxEastLon=eastLon;
+                            }
+                            if(minSouthLat==null || Float.parseFloat(minSouthLat) > Float.parseFloat(southLat)) {
+                                minSouthLat=southLat;
+                            }
+                            if(maxNorthLat==null || Float.parseFloat(maxNorthLat) < Float.parseFloat(northLat)) {
+                                maxNorthLat=northLat;
+                            }
+
+                            if (DatasetFieldValueValidator.validateBoundingBox(westLon, eastLon, northLat, southLat)) {
+                                //W, E, N, S
+                                solrInputDocument.addField(SearchFields.GEOLOCATION, "ENVELOPE(" + westLon + "," + eastLon + "," + northLat + "," + southLat + ")");
+                            }
+                        }
+                    }
+                    //Only one bbox per dataset
+                    //W, E, N, S
+                    if (DatasetFieldValueValidator.validateBoundingBox(minWestLon, maxEastLon, maxNorthLat, minSouthLat) &&
+                            (minWestLon != null || maxEastLon != null) && (maxNorthLat != null || minSouthLat != null)) {
+                        solrInputDocument.addField(SearchFields.BOUNDING_BOX, "ENVELOPE(" + minWestLon + "," + maxEastLon + "," + maxNorthLat + "," + minSouthLat + ")");
+                    }
+
+                }
             }
-        }
 
+            for(String metadataBlockName : metadataBlocksWithValue) {
+                solrInputDocument.addField(SearchFields.METADATA_TYPES, metadataBlockName);
+            }
+        }
+        
+        List<String> dataversePaths = retrieveDVOPaths(dataset); 
         solrInputDocument.addField(SearchFields.SUBTREE, dataversePaths);
         // solrInputDocument.addField(SearchFields.HOST_DATAVERSE,
         // dataset.getOwner().getName());
         solrInputDocument.addField(SearchFields.PARENT_ID, dataset.getOwner().getId());
         solrInputDocument.addField(SearchFields.PARENT_NAME, dataset.getOwner().getName());
 
-        if (state.equals(indexableDataset.getDatasetState().DEACCESSIONED)) {
-            String deaccessionNote = datasetVersion.getVersionNote();
+        if (state.equals(DatasetState.DEACCESSIONED)) {
+            String deaccessionNote = datasetVersion.getDeaccessionNote();
             if (deaccessionNote != null) {
                 solrInputDocument.addField(SearchFields.DATASET_DEACCESSION_REASON, deaccessionNote);
             }
         }
-
+        String versionNote = datasetVersion.getVersionNote();
+        if (versionNote != null) {
+            solrInputDocument.addField(SearchFields.DATASET_VERSION_NOTE, versionNote);
+        }
         docs.add(solrInputDocument);
 
         /**
@@ -894,97 +1414,202 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
         long maxSize = maxFTIndexingSize != null ? maxFTIndexingSize.longValue() : Long.MAX_VALUE;
 
         List<String> filesIndexed = new ArrayList<>();
+        final List<Long> changedFileMetadataIds = new ArrayList<>();
         if (datasetVersion != null) {
             List<FileMetadata> fileMetadatas = datasetVersion.getFileMetadatas();
-            boolean checkForDuplicateMetadata = false;
+            List<FileMetadata> rfm = new ArrayList<>();
+            Map<Long, FileMetadata> fileMap = new HashMap<>();
             if (datasetVersion.isDraft() && dataset.isReleased() && dataset.getReleasedVersion() != null) {
-                checkForDuplicateMetadata = true;
+                rfm = dataset.getReleasedVersion().getFileMetadatas();
+                for (FileMetadata released : rfm) {
+                    fileMap.put(released.getDataFile().getId(), released);
+                }
+
+                Query query = em.createNamedQuery("FileMetadata.compareFileMetadata", Long.class);
+                query.setParameter(1, dataset.getReleasedVersion().getId());
+                query.setParameter(2, datasetVersion.getId());
+
+                /*
+                 * When the query was configured to return Long, it was returning Integer. The query has been changed to return Integer now. The code here is robust if that changes in the future.
+                 */
+                List<Object> queryResults = query.getResultList();
+                for (Object result : queryResults) {
+                    if (result != null) {
+                        // Ensure we're adding Long objects to the list
+                        if (result instanceof Integer intResult) {
+                            logger.finest("Converted Integer result to Long: " + result);
+                            changedFileMetadataIds.add(Long.valueOf(intResult));
+                        } else if (result instanceof Long longResult) {
+                            // Already a Long, add directly
+                            logger.finest("Added existing Long to list: " + result);
+                            changedFileMetadataIds.add(longResult);
+                        } else {
+                            // If it's not a Long, convert it to one via String
+                            try {
+                                changedFileMetadataIds.add(Long.valueOf(result.toString()));
+                                logger.finest("Converted non-Long result to Long: " + result + " of type " + result.getClass().getName());
+                            } catch (NumberFormatException e) {
+                                logger.warning("Could not convert query result to Long: " + result);
+                            }
+                        }
+                    }
+                }
                 logger.fine(
                         "We are indexing a draft version of a dataset that has a released version. We'll be checking file metadatas if they are exact clones of the released versions.");
+            } else if (datasetVersion.isDraft()) {
+                // Add all file metadata ids to changedFileMetadataIds
+                changedFileMetadataIds.addAll(
+                    fileMetadatas.stream()
+                        .map(FileMetadata::getId)
+                        .collect(Collectors.toList())
+                );
             }
 
-            for (FileMetadata fileMetadata : fileMetadatas) {
-                boolean indexThisMetadata = true;
-                if (checkForDuplicateMetadata) {
+            AtomicReference<LocalDate> embargoEndDateRef = new AtomicReference<>(null);
+            AtomicReference<LocalDate> retentionEndDateRef = new AtomicReference<>(null);
+            final String datasetCitation = (dataset.isReleased() && dataset.getReleasedVersion() != null) ? dataset.getCitation(dataset.getReleasedVersion()) : dataset.getCitation();
+            final Long datasetId = dataset.getId();
+            final String datasetGlobalId = dataset.getGlobalId().toString();
+            final String parentTitle = parentDatasetTitle;
+
+            AutoDetectParser ap = null;
+            ParseContext ct = null;
+            if (doFullTextIndexing) {
+                ap = new AutoDetectParser();
+                ct = new ParseContext();
+            }
+            final AutoDetectParser autoParser = ap;
+            final ParseContext context = ct;
+
+            Set<String> datasetPublicationStatuses = new HashSet<String>();
+            if (dataset.getReleasedVersion() == null && !dataset.isHarvested()) {
+                datasetPublicationStatuses.add(UNPUBLISHED_STRING);
+            }
+
+            if (datasetVersion.isInReview()) {
+                datasetPublicationStatuses.add(IN_REVIEW_STRING);
+            }
+
+            if (indexableDataset.getDatasetState().equals(DatasetState.PUBLISHED)) {
+                datasetPublicationStatuses.add(PUBLISHED_STRING);
+            } else {
+                if (indexableDataset.getDatasetState().equals(DatasetState.WORKING_COPY)) {
+                    datasetPublicationStatuses.add(DRAFT_STRING);
+                }
+            }
+
+            String datasetVersionId = datasetVersion.getId().toString();
+            boolean indexThisMetadata = indexableDataset.isFilesShouldBeIndexed();
+            boolean isReleasedVersion = datasetVersion.isReleased();
+
+            String datasetPersistentURL = dataset.getPersistentURL();
+            boolean isHarvested = dataset.isHarvested();
+            long startTime = System.currentTimeMillis();
+            LocalDate now = LocalDate.now();
+            fileMetadatas.stream().forEach(fileMetadata -> {
+                DataFile datafile = fileMetadata.getDataFile();
+                Embargo emb = datafile.getEmbargo();
+                LocalDate end = null;
+                if (emb != null) {
+                    final LocalDate endDate = emb.getDateAvailable();
+                    embargoEndDateRef.updateAndGet(current -> (current == null || endDate.isAfter(current)) ? endDate : current);
+                    end = endDate;
+                }
+                Retention ret = datafile.getRetention();
+                LocalDate start = null;
+                if (ret != null) {
+                    final LocalDate startDate = ret.getDateUnavailable();
+                    retentionEndDateRef.updateAndGet(current -> (current == null || startDate.isBefore(current)) ? startDate : current);
+                    start = startDate;
+                }
+                boolean indexThisFile = false;
+
+                if (indexThisMetadata && (isReleasedVersion || changedFileMetadataIds.contains(fileMetadata.getId()))) {
+                    indexThisFile = true;
+                } else if (indexThisMetadata) {
+                    // Draft version, file is not new or all file metadata matches the released version
+                    // The only thing left to check is variable-level metadata, index if there is a difference
                     logger.fine("Checking if this file metadata is a duplicate.");
-                    for (FileMetadata releasedFileMetadata : dataset.getReleasedVersion().getFileMetadatas()) {
-                        if (fileMetadata.getDataFile() != null && fileMetadata.getDataFile().equals(releasedFileMetadata.getDataFile())) {
-                            /*
-                             * Duplicate if metadata matches and, for full text indexing and the
-                             * SearchFields.ACCESS field, if the restricted status of the file hasn't
-                             * changed. To address the case where full text indexing was on when a file was
-                             * not restricted and it is now restricted and full text indexing has been shut
-                             * off, we need to check for the change in restricted status regardless of
-                             * whether full text indexing is on now.
-                             */
-                            if ((fileMetadata.getDataFile().isRestricted() == releasedFileMetadata.getDataFile().isRestricted())) {
-                                if (fileMetadata.contentEquals(releasedFileMetadata)) {
-                                    indexThisMetadata = false;
-                                    logger.fine("This file metadata hasn't changed since the released version; skipping indexing.");
-                                } else {
-                                    logger.fine("This file metadata has changed since the released version; we want to index it!");
-                                }
-                            } else {
-                                logger.fine("This file's restricted status has changed since the released version; we want to index it!");
-                            }
-                            break;
+                    FileMetadata getFromMap = fileMap.get(datafile.getId());
+                    if (getFromMap != null) {
+                        if (!VariableMetadataUtil.compareVariableMetadata(getFromMap, fileMetadata)) {
+                            indexThisFile = true;
+                            logger.fine("This file metadata hasn't changed since the released version; skipping indexing.");
                         }
+                    } else {
+                        logger.warning("File is not in released version when trying to compare variable metadata, fileId: " + datafile.getId());
                     }
                 }
-                if (indexThisMetadata) {
+                if (indexThisFile) {
+
                     SolrInputDocument datafileSolrInputDocument = new SolrInputDocument();
-                    Long fileEntityId = fileMetadata.getDataFile().getId();
+                    Long fileEntityId = datafile.getId();
+                    logger.finest("Indexing file " + fileEntityId);
+
                     datafileSolrInputDocument.addField(SearchFields.ENTITY_ID, fileEntityId);
                     datafileSolrInputDocument.addField(SearchFields.DATAVERSE_VERSION_INDEXED_BY, dataverseVersion);
                     datafileSolrInputDocument.addField(SearchFields.IDENTIFIER, fileEntityId);
-                    datafileSolrInputDocument.addField(SearchFields.PERSISTENT_URL, dataset.getPersistentURL());
+                    datafileSolrInputDocument.addField(SearchFields.PERSISTENT_URL, datasetPersistentURL);
                     datafileSolrInputDocument.addField(SearchFields.TYPE, "files");
-                    datafileSolrInputDocument.addField(SearchFields.CATEGORY_OF_DATAVERSE, dataset.getDataverseContext().getIndexableCategoryName());
-
+                    datafileSolrInputDocument.addField(SearchFields.CATEGORY_OF_DATAVERSE, dvIndexableCategoryName);
+                    boolean embargoed = false;
+                    if (end != null) {
+                        datafileSolrInputDocument.addField(SearchFields.EMBARGO_END_DATE, end.toEpochDay());
+                        embargoed = end.isAfter(now);
+                    }
+                    if (start != null) {
+                        datafileSolrInputDocument.addField(SearchFields.RETENTION_END_DATE, start.toEpochDay());
+                    }
                     /* Full-text indexing using Apache Tika */
                     if (doFullTextIndexing) {
-                        if (!dataset.isHarvested() && !fileMetadata.getDataFile().isRestricted() && !fileMetadata.getDataFile().isFilePackage()) {
+                        long fileSize = datafile.getFilesize();
+                        if (!isHarvested && !datafile.isRestricted()
+                                && !datafile.isFilePackage()
+                                && fileSize != 0 && fileSize <= maxSize
+                                && datafile.getRetention() == null
+                                && !embargoed) {
                             StorageIO<DataFile> accessObject = null;
                             InputStream instream = null;
                             ContentHandler textHandler = null;
                             try {
-                                accessObject = DataAccess.getStorageIO(fileMetadata.getDataFile(),
+                                accessObject = DataAccess.getStorageIO(datafile,
                                         new DataAccessRequest());
-                                if (accessObject != null) {
+                                if (accessObject != null && accessObject.isDataverseAccessible()) {
                                     accessObject.open();
                                     // If the size is >max, we don't use the stream. However, for S3, the stream is
                                     // currently opened in the call above (see
                                     // https://github.com/IQSS/dataverse/issues/5165), so we want to get a handle so
                                     // we can close it below.
                                     instream = accessObject.getInputStream();
-                                    if (accessObject.getSize() <= maxSize) {
-                                        AutoDetectParser autoParser = new AutoDetectParser();
-                                        textHandler = new BodyContentHandler(-1);
-                                        Metadata metadata = new Metadata();
-                                        ParseContext context = new ParseContext();
-                                        /*
+                                    textHandler = new BodyContentHandler(-1);
+                                    Metadata metadata = new Metadata();
+                                    /*
                                          * Try parsing the file. Note that, other than by limiting size, there's been no
                                          * check see whether this file is a good candidate for text extraction (e.g.
                                          * based on type).
-                                         */
-                                        autoParser.parse(instream, textHandler, metadata, context);
-                                        datafileSolrInputDocument.addField(SearchFields.FULL_TEXT,
-                                                textHandler.toString());
-                                    }
+                                     */
+                                    autoParser.parse(instream, textHandler, metadata, context);
+                                    datafileSolrInputDocument.addField(SearchFields.FULL_TEXT,
+                                            textHandler.toString());
                                 }
                             } catch (Exception e) {
                                 // Needs better logging of what went wrong in order to
                                 // track down "bad" documents.
-                                logger.warning(String.format("Full-text indexing for %s failed",
-                                        fileMetadata.getDataFile().getDisplayName()));
-                                e.printStackTrace();
-                                continue;
+                                logger.warning(String.format("Full-text indexing for %s failed: %s",
+                                        datafile.getDisplayName(), e.getLocalizedMessage()));
+                                if (logger.isLoggable(Level.FINE)) {
+                                    e.printStackTrace();
+                                }
                             } catch (OutOfMemoryError e) {
-                                textHandler = null;
                                 logger.warning(String.format("Full-text indexing for %s failed due to OutOfMemoryError",
-                                        fileMetadata.getDataFile().getDisplayName()));
-                                continue;
+                                        datafile.getDisplayName()));
+                            } catch (Error e) {
+                                // Catch everything - full-text indexing is complex enough (and using enough 3rd party components) that it can fail
+                                // and we don't want problems here to break other Dataverse functionality (e.g. edits)
+                                logger.severe(String.format("Full-text indexing for %s failed due to Error: %s : %s",
+                                        datafile.getDisplayName(), e.getClass().getCanonicalName(), e.getLocalizedMessage()));
                             } finally {
+                                textHandler = null;
                                 IOUtils.closeQuietly(instream);
                             }
                         }
@@ -1021,7 +1646,8 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
                     datafileSolrInputDocument.addField(SearchFields.NAME_SORT, filenameCompleteFinal);
                     datafileSolrInputDocument.addField(SearchFields.FILE_NAME, filenameCompleteFinal);
 
-                    datafileSolrInputDocument.addField(SearchFields.DATASET_VERSION_ID, datasetVersion.getId());
+                    datafileSolrInputDocument.addField(SearchFields.DATASET_VERSION_ID, datasetVersionId);
+                    addLicenseToSolrDoc(datafileSolrInputDocument, datasetVersion);
 
                     /**
                      * for rules on sorting files see
@@ -1029,7 +1655,7 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
                      * via https://redmine.hmdc.harvard.edu/issues/3701
                      */
                     Date fileSortByDate = new Date();
-                    DataFile datafile = fileMetadata.getDataFile();
+
                     if (datafile != null) {
                         boolean fileHasBeenReleased = datafile.isReleased();
                         if (fileHasBeenReleased) {
@@ -1041,7 +1667,14 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
                                 String msg = "filePublicationTimestamp was null for fileMetadata id " + fileMetadata.getId() + " (file id " + datafile.getId() + ")";
                                 logger.info(msg);
                             }
-                            datafileSolrInputDocument.addField(SearchFields.ACCESS, datafile.isRestricted() ? SearchConstants.RESTRICTED : SearchConstants.PUBLIC);
+                            datafileSolrInputDocument.addField(SearchFields.ACCESS,
+                                    FileUtil.isRetentionExpired(datafile)
+                                        ? SearchConstants.RETENTIONEXPIRED :
+                                            FileUtil.isActivelyEmbargoed(datafile)
+                                                ? (fileMetadata.isRestricted() ? SearchConstants.EMBARGOEDTHENRESTRICTED
+                                                        : SearchConstants.EMBARGOEDTHENPUBLIC)
+                                                : (fileMetadata.isRestricted() ? SearchConstants.RESTRICTED
+                                                        : SearchConstants.PUBLIC));
                         } else {
                             logger.fine("indexing file with fileCreateTimestamp. " + fileMetadata.getId() + " (file id " + datafile.getId() + ")");
                             Timestamp fileCreateTimestamp = datafile.getCreateDate();
@@ -1052,89 +1685,102 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
                                 logger.info(msg);
                             }
                             datafileSolrInputDocument.addField(SearchFields.ACCESS,
-                                    fileMetadata.isRestricted() ? SearchConstants.RESTRICTED : SearchConstants.PUBLIC);
+                                    FileUtil.isActivelyEmbargoed(fileMetadata)
+                                            ? (fileMetadata.isRestricted() ? SearchConstants.EMBARGOEDTHENRESTRICTED
+                                                    : SearchConstants.EMBARGOEDTHENPUBLIC)
+                                            : (fileMetadata.isRestricted() ? SearchConstants.RESTRICTED
+                                                    : SearchConstants.PUBLIC));
                         }
                         if (datafile.isHarvested()) {
                             datafileSolrInputDocument.addField(SearchFields.IS_HARVESTED, true);
-                            datafileSolrInputDocument.addField(SearchFields.METADATA_SOURCE, HARVESTED);
+                            if (FeatureFlags.INDEX_HARVESTED_METADATA_SOURCE.enabled()) {
+                                // New - as of 6.3 - option of indexing the actual origin of 
+                                // harvested objects as the metadata source:
+                                datafileSolrInputDocument.addField(SearchFields.METADATA_SOURCE,
+                                        dataset.getHarvestedFrom() != null ? dataset.getHarvestedFrom().getMetadataSource() : HARVESTED);
+                            } else {
+                                datafileSolrInputDocument.addField(SearchFields.METADATA_SOURCE, HARVESTED);
+                            }
                         } else {
                             datafileSolrInputDocument.addField(SearchFields.IS_HARVESTED, false);
-                            datafileSolrInputDocument.addField(SearchFields.METADATA_SOURCE, findRootDataverseCached().getName());
-                        }
-                    }
-                    if (fileSortByDate == null) {
-                        if (datasetSortByDate != null) {
-                            logger.info("fileSortByDate was null, assigning datasetSortByDate");
-                            fileSortByDate = datasetSortByDate;
-                        } else {
-                            logger.info("fileSortByDate and datasetSortByDate were null, assigning 'now'");
-                            fileSortByDate = new Date();
+                            datafileSolrInputDocument.addField(SearchFields.METADATA_SOURCE, rdvName);
                         }
                     }
                     datafileSolrInputDocument.addField(SearchFields.RELEASE_OR_CREATE_DATE, fileSortByDate);
 
-                    if (majorVersionReleaseDate == null && !datafile.isHarvested()) {
-                        datafileSolrInputDocument.addField(SearchFields.PUBLICATION_STATUS, UNPUBLISHED_STRING);
-                    }
-
-                    if (datasetVersion.isInReview()) {
-                        datafileSolrInputDocument.addField(SearchFields.PUBLICATION_STATUS, IN_REVIEW_STRING);
-                    }
+                    datasetPublicationStatuses.forEach(s -> datafileSolrInputDocument.addField(SearchFields.PUBLICATION_STATUS, s));
 
                     String fileSolrDocId = solrDocIdentifierFile + fileEntityId;
-                    if (indexableDataset.getDatasetState().equals(indexableDataset.getDatasetState().PUBLISHED)) {
-                        fileSolrDocId = solrDocIdentifierFile + fileEntityId;
-                        datafileSolrInputDocument.addField(SearchFields.PUBLICATION_STATUS, PUBLISHED_STRING);
-                        // datafileSolrInputDocument.addField(SearchFields.PERMS, publicGroupString);
+                    indexableDataset.getDatasetState();
+                    if (datasetPublicationStatuses.contains(PUBLISHED_STRING)) {
+                        if (FeatureFlags.ADD_PUBLICOBJECT_SOLR_FIELD.enabled()) {
+                            datafileSolrInputDocument.addField(SearchFields.PUBLIC_OBJECT, true);
+                        }
                         addDatasetReleaseDateToSolrDoc(datafileSolrInputDocument, dataset);
-                        // has this published file been deleted from the current draft version? 
+                        // has this published file been deleted from the current draft version?
                         if (datafilesInDraftVersion != null && !datafilesInDraftVersion.contains(datafile.getId())) {
                             datafileSolrInputDocument.addField(SearchFields.FILE_DELETED, true);
                         }
-                    } else if (indexableDataset.getDatasetState().equals(indexableDataset.getDatasetState().WORKING_COPY)) {
-                        fileSolrDocId = solrDocIdentifierFile + fileEntityId + indexableDataset.getDatasetState().getSuffix();
-                        datafileSolrInputDocument.addField(SearchFields.PUBLICATION_STATUS, DRAFT_STRING);
+                    } else {
+                        indexableDataset.getDatasetState();
+                        if (datasetPublicationStatuses.contains(DRAFT_STRING)) {
+                            fileSolrDocId = solrDocIdentifierFile + fileEntityId + indexableDataset.getDatasetState().getSuffix();
+                        }
                     }
                     datafileSolrInputDocument.addField(SearchFields.ID, fileSolrDocId);
 
-                    datafileSolrInputDocument.addField(SearchFields.FILE_TYPE_FRIENDLY, fileMetadata.getDataFile().getFriendlyType());
-                    datafileSolrInputDocument.addField(SearchFields.FILE_CONTENT_TYPE, fileMetadata.getDataFile().getContentType());
-                    datafileSolrInputDocument.addField(SearchFields.FILE_TYPE_SEARCHABLE, fileMetadata.getDataFile().getFriendlyType());
+                    datafileSolrInputDocument.addField(SearchFields.FILE_TYPE_FRIENDLY, datafile.getFriendlyType());
+                    datafileSolrInputDocument.addField(SearchFields.FILE_CONTENT_TYPE, datafile.getContentType());
+                    datafileSolrInputDocument.addField(SearchFields.FILE_TYPE_SEARCHABLE, datafile.getFriendlyType());
                     // For the file type facets, we have a property file that maps mime types
                     // to facet-friendly names; "application/fits" should become "FITS", etc.:
-                    datafileSolrInputDocument.addField(SearchFields.FILE_TYPE, FileUtil.getIndexableFacetFileType(fileMetadata.getDataFile()));
-                    datafileSolrInputDocument.addField(SearchFields.FILE_TYPE_SEARCHABLE, FileUtil.getIndexableFacetFileType(fileMetadata.getDataFile()));
-                    datafileSolrInputDocument.addField(SearchFields.FILE_SIZE_IN_BYTES, fileMetadata.getDataFile().getFilesize());
-                    if (DataFile.ChecksumType.MD5.equals(fileMetadata.getDataFile().getChecksumType())) {
+                    datafileSolrInputDocument.addField(SearchFields.FILE_TYPE, FileUtil.getIndexableFacetFileType(datafile));
+                    datafileSolrInputDocument.addField(SearchFields.FILE_TYPE_SEARCHABLE, FileUtil.getIndexableFacetFileType(datafile));
+                    datafileSolrInputDocument.addField(SearchFields.FILE_SIZE_IN_BYTES, datafile.getFilesize());
+                    if (DataFile.ChecksumType.MD5.equals(datafile.getChecksumType())) {
                         /**
                          * @todo Someday we should probably deprecate this
                          * FILE_MD5 in favor of a combination of
                          * FILE_CHECKSUM_TYPE and FILE_CHECKSUM_VALUE.
                          */
-                        datafileSolrInputDocument.addField(SearchFields.FILE_MD5, fileMetadata.getDataFile().getChecksumValue());
+                        datafileSolrInputDocument.addField(SearchFields.FILE_MD5, datafile.getChecksumValue());
                     }
-                    datafileSolrInputDocument.addField(SearchFields.FILE_CHECKSUM_TYPE, fileMetadata.getDataFile().getChecksumType().toString());
-                    datafileSolrInputDocument.addField(SearchFields.FILE_CHECKSUM_VALUE, fileMetadata.getDataFile().getChecksumValue());
+                    datafileSolrInputDocument.addField(SearchFields.FILE_CHECKSUM_TYPE, datafile.getChecksumType().toString());
+                    datafileSolrInputDocument.addField(SearchFields.FILE_CHECKSUM_VALUE, datafile.getChecksumValue());
+                    datafileSolrInputDocument.addField(SearchFields.FILE_RESTRICTED, datafile.isRestricted());
                     datafileSolrInputDocument.addField(SearchFields.DESCRIPTION, fileMetadata.getDescription());
                     datafileSolrInputDocument.addField(SearchFields.FILE_DESCRIPTION, fileMetadata.getDescription());
-                    datafileSolrInputDocument.addField(SearchFields.FILE_PERSISTENT_ID, fileMetadata.getDataFile().getGlobalId().toString());
-                    datafileSolrInputDocument.addField(SearchFields.UNF, fileMetadata.getDataFile().getUnf());
+                    GlobalId filePid = datafile.getGlobalId();
+                    datafileSolrInputDocument.addField(SearchFields.FILE_PERSISTENT_ID,
+                            (filePid != null) ? filePid.toString() : null);
+                       
                     datafileSolrInputDocument.addField(SearchFields.SUBTREE, dataversePaths);
                     // datafileSolrInputDocument.addField(SearchFields.HOST_DATAVERSE,
                     // dataFile.getOwner().getOwner().getName());
                     // datafileSolrInputDocument.addField(SearchFields.PARENT_NAME,
                     // dataFile.getDataset().getTitle());
-                    datafileSolrInputDocument.addField(SearchFields.PARENT_ID, fileMetadata.getDataFile().getOwner().getId());
-                    datafileSolrInputDocument.addField(SearchFields.PARENT_IDENTIFIER, fileMetadata.getDataFile().getOwner().getGlobalId().toString());
-                    datafileSolrInputDocument.addField(SearchFields.PARENT_CITATION, fileMetadata.getDataFile().getOwner().getCitation());
-
-                    datafileSolrInputDocument.addField(SearchFields.PARENT_NAME, parentDatasetTitle);
+                    datafileSolrInputDocument.addField(SearchFields.PARENT_ID, datasetId);
+                    datafileSolrInputDocument.addField(SearchFields.PARENT_IDENTIFIER, datasetGlobalId);
+                    datafileSolrInputDocument.addField(SearchFields.PARENT_CITATION, datasetCitation);
 
+                    datafileSolrInputDocument.addField(SearchFields.PARENT_NAME, parentTitle);
                     // If this is a tabular data file -- i.e., if there are data
                     // variables associated with this file, we index the variable
                     // names and labels:
-                    if (fileMetadata.getDataFile().isTabularData()) {
-                        List<DataVariable> variables = fileMetadata.getDataFile().getDataTable().getDataVariables();
+                    DataTable dtable = datafile.getDataTable();
+                    if (dtable != null) {
+                        List<DataVariable> variables = dtable.getDataVariables();
+                        Long observations = dtable.getCaseQuantity();
+                        datafileSolrInputDocument.addField(SearchFields.VARIABLE_COUNT, variables.size());
+                        datafileSolrInputDocument.addField(SearchFields.OBSERVATIONS, observations);
+                        datafileSolrInputDocument.addField(SearchFields.UNF, dtable.getUnf());
+                            
+
+                        Map<Long, VariableMetadata> variableMap = null;
+                        Collection<VariableMetadata> variablesByMetadata = fileMetadata.getVariableMetadatas();
+
+                        variableMap = variablesByMetadata.stream().collect(Collectors.toMap(VariableMetadata::getId, Function.identity()));
+
                         for (DataVariable var : variables) {
                             // Hard-coded search fields, for now:
                             // TODO: eventually: review, decide how datavariables should
@@ -1145,54 +1791,105 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
                             // is something social science-specific...
                             // anyway -- needs to be reviewed. -- L.A. 4.0alpha1
 
+                            // Variable Name
                             if (var.getName() != null && !var.getName().equals("")) {
                                 datafileSolrInputDocument.addField(SearchFields.VARIABLE_NAME, var.getName());
                             }
-                            if (var.getLabel() != null && !var.getLabel().equals("")) {
-                                datafileSolrInputDocument.addField(SearchFields.VARIABLE_LABEL, var.getLabel());
+
+                            VariableMetadata vm = variableMap.get(var.getId());
+                            if (vm == null) {
+                                // Variable Label
+                                if (var.getLabel() != null && !var.getLabel().equals("")) {
+                                    datafileSolrInputDocument.addField(SearchFields.VARIABLE_LABEL, var.getLabel());
+                                }
+                            } else {
+                                if (vm.getLabel() != null && !vm.getLabel().equals("")) {
+                                    datafileSolrInputDocument.addField(SearchFields.VARIABLE_LABEL, vm.getLabel());
+                                }
+                                if (vm.getLiteralquestion() != null && !vm.getLiteralquestion().equals("")) {
+                                    datafileSolrInputDocument.addField(SearchFields.LITERAL_QUESTION, vm.getLiteralquestion());
+                                }
+                                if (vm.getInterviewinstruction() != null && !vm.getInterviewinstruction().equals("")) {
+                                    datafileSolrInputDocument.addField(SearchFields.INTERVIEW_INSTRUCTIONS, vm.getInterviewinstruction());
+                                }
+                                if (vm.getPostquestion() != null && !vm.getPostquestion().equals("")) {
+                                    datafileSolrInputDocument.addField(SearchFields.POST_QUESTION, vm.getPostquestion());
+                                }
+                                if (vm.getUniverse() != null && !vm.getUniverse().equals("")) {
+                                    datafileSolrInputDocument.addField(SearchFields.VARIABLE_UNIVERSE, vm.getUniverse());
+                                }
+                                if (vm.getNotes() != null && !vm.getNotes().equals("")) {
+                                    datafileSolrInputDocument.addField(SearchFields.VARIABLE_NOTES, vm.getNotes());
+                                }
+
                             }
                         }
+
                         // TABULAR DATA TAGS:
                         // (not to be confused with the file categories, indexed above!)
-                        for (DataFileTag tag : fileMetadata.getDataFile().getTags()) {
+                        for (DataFileTag tag : datafile.getTags()) {
                             String tagLabel = tag.getTypeLabel();
                             datafileSolrInputDocument.addField(SearchFields.TABDATA_TAG, tagLabel);
                         }
                     }
 
-                    if (indexableDataset.isFilesShouldBeIndexed()) {
-                        filesIndexed.add(fileSolrDocId);
-                        docs.add(datafileSolrInputDocument);
-                    }
+                    filesIndexed.add(fileSolrDocId);
+                    docs.add(datafileSolrInputDocument);
                 }
+            });
+            long totalLoopTime = System.currentTimeMillis() - startTime;
+            logger.fine("Processed all " + fileMetadatas.size() + " fileMetadatas in " + totalLoopTime + " ms");
+            logger.fine("Indexed " + docs.size() + " documents to Solr");
+            LocalDate embargoEndDate = embargoEndDateRef.get();
+            LocalDate retentionEndDate = retentionEndDateRef.get();
+            if(embargoEndDate!=null) {
+              solrInputDocument.addField(SearchFields.EMBARGO_END_DATE, embargoEndDate.toEpochDay());
+            }
+            if(retentionEndDate!=null) {
+                solrInputDocument.addField(SearchFields.RETENTION_END_DATE, retentionEndDate.toEpochDay());
             }
         }
+        Long datasetId = dataset.getId();
+        final String msg = "indexed dataset " + datasetId + " as " + datasetSolrDocId + ". filesIndexed: " + filesIndexed;
+        logger.fine(msg);
+        return new SolrInputDocuments(docs, msg, datasetId);
+    }
+    
+    private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> datafilesInDraftVersion) throws  SolrServerException, IOException {   
+        final SolrInputDocuments docs = toSolrDocs(indexableDataset, datafilesInDraftVersion);
 
         try {
-            solrClientService.getSolrClient().add(docs);
-            solrClientService.getSolrClient().commit();
+            solrClientIndexService.getSolrClient().add(docs.getDocuments());
         } catch (SolrServerException | IOException ex) {
+            logger.warning("Check process-failures logs re: " + ex.getLocalizedMessage());
             if (ex.getCause() instanceof SolrServerException) {
                 throw new SolrServerException(ex);
             } else if (ex.getCause() instanceof IOException) {
                 throw new IOException(ex);
             }
         }
+        return docs.getMessage();
+    }
+
+    @Asynchronous
+    private void updateLastIndexedTime(Long id) {
+        // indexing is often in a transaction with update statements
+        // if we flush on query (flush-mode auto), we want to prevent locking
+        // -> update the dataset asynchronously in a new transaction
+        updateLastIndexedTimeInNewTransaction(id);
+    }
 
-        Long dsId = dataset.getId();
+    @TransactionAttribute(REQUIRES_NEW)
+    private void updateLastIndexedTimeInNewTransaction(Long id) {
         /// Dataset updatedDataset =
         /// (Dataset)dvObjectService.updateContentIndexTime(dataset);
         /// updatedDataset = null;
         // instead of making a call to dvObjectService, let's try and
         // modify the index time stamp using the local EntityManager:
-        DvObject dvObjectToModify = em.find(DvObject.class, dsId);
+        DvObject dvObjectToModify = em.find(DvObject.class, id);
         dvObjectToModify.setIndexTime(new Timestamp(new Date().getTime()));
         dvObjectToModify = em.merge(dvObjectToModify);
-        dvObjectToModify = null;
-
-        // return "indexed dataset " + dataset.getId() + " as " + solrDocId +
-        // "\nindexFilesResults for " + solrDocId + ":" + fileInfo.toString();
-        return "indexed dataset " + dsId + " as " + datasetSolrDocId + ". filesIndexed: " + filesIndexed;
+        em.flush();
     }
 
     /**
@@ -1225,11 +1922,18 @@ private String getTopicClassificationTermOrTermAndVocabulary(DatasetField topicC
     }
 
     public List<String> findPathSegments(Dataverse dataverse, List<String> segments) {
+        return findPathSegments(dataverse, segments, null);
+    }
+
+    public List<String> findPathSegments(Dataverse dataverse, List<String> segments, Dataverse topOfPath) {
         Dataverse rootDataverse = findRootDataverseCached();
+        if (topOfPath == null) {
+            topOfPath = rootDataverse;
+        }
         if (!dataverse.equals(rootDataverse)) {
             // important when creating root dataverse
             if (dataverse.getOwner() != null) {
-                findPathSegments(dataverse.getOwner(), segments);
+                findPathSegments(dataverse.getOwner(), segments, topOfPath);
             }
             segments.add(dataverse.getId().toString());
             return segments;
@@ -1238,8 +1942,76 @@ public List<String> findPathSegments(Dataverse dataverse, List<String> segments)
             return segments;
         }
     }
+        
+    private boolean hasAnyLinkingDataverses(Dataverse dataverse) {
+        Dataverse rootDataverse = findRootDataverseCached();
+        List<Dataverse> ancestorList = dataverse.getOwners();
+        ancestorList.add(dataverse);
+        for (Dataverse prior : ancestorList) {
+            if (!dataverse.equals(rootDataverse)) {
+                List<Dataverse> linkingDVs = dvLinkingService.findLinkingDataverses(prior.getId());
+                if (!linkingDVs.isEmpty()){
+                    return true;
+                }
+            }
+        }       
+        return false;
+    }
+    
+    private List<Dataverse> findAllLinkingDataverses(DvObject dvObject){
+        /*
+        here we find the linking dataverse of the input object
+        then any linked dvs in its owners list
+        */
+        Dataset dataset = null;
+        Dataverse dv = null;
+        Dataverse rootDataverse = findRootDataverseCached();        
+        List <Dataverse>linkingDataverses = new ArrayList();
+        List<Dataverse> ancestorList = new ArrayList();
+        
+        try {
+            if(dvObject.isInstanceofDataset()){
+                dataset = (Dataset) dvObject;
+                linkingDataverses = dsLinkingService.findLinkingDataverses(dataset.getId());
+                ancestorList = dataset.getOwner().getOwners();
+                ancestorList.add(dataset.getOwner()); //to show dataset in linking dv when parent dv is linked
+            }
+            if(dvObject.isInstanceofDataverse()){
+                dv = (Dataverse) dvObject;
+                linkingDataverses = dvLinkingService.findLinkingDataverses(dv.getId());
+                ancestorList = dv.getOwners();
+            }
+        } catch (Exception ex) {
+            logger.info("failed to find Linking Dataverses for " + SearchFields.SUBTREE + ": " + ex);
+        }
+        
+        for (Dataverse owner : ancestorList) {
+            if (!owner.equals(rootDataverse)) {
+            linkingDataverses.addAll(dvLinkingService.findLinkingDataverses(owner.getId()));
+            }
+        }       
+        
+        return linkingDataverses;
+    }
+    
+    private List<String> findLinkingDataversePaths(List<Dataverse> linkingDVs) {
+
+        List<String> pathListAccumulator = new ArrayList<>();
+        for (Dataverse toAdd : linkingDVs) {
+            //get paths for each linking dataverse
+            List<String> linkingDataversePathSegmentsAccumulator = findPathSegments(toAdd, new ArrayList<>());
+            List<String> linkingDataversePaths = getDataversePathsFromSegments(linkingDataversePathSegmentsAccumulator);
+            for (String dvPath : linkingDataversePaths) {
+                if (!pathListAccumulator.contains(dvPath)) {
+                    pathListAccumulator.add(dvPath);
+                }
+            }
+        }
+
+        return pathListAccumulator;
+    }
 
-    List<String> getDataversePathsFromSegments(List<String> dataversePathSegments) {
+    private List<String> getDataversePathsFromSegments(List<String> dataversePathSegments) {
         List<String> subtrees = new ArrayList<>();
         for (int i = 0; i < dataversePathSegments.size(); i++) {
             StringBuilder pathBuilder = new StringBuilder();
@@ -1254,6 +2026,26 @@ List<String> getDataversePathsFromSegments(List<String> dataversePathSegments) {
         return subtrees;
     }
 
+    private void addLicenseToSolrDoc(SolrInputDocument solrInputDocument, DatasetVersion datasetVersion) {
+        if (datasetVersion != null && datasetVersion.getTermsOfUseAndAccess() != null) {
+            //test to see if the terms of use are the default set in 5.10 - if so and there's no license then don't add license to solr doc.   
+            //fixes 10513
+            if(TermsOfUseAndAccess.DEFAULT_NOTERMS.equals(datasetVersion.getTermsOfUseAndAccess().getTermsOfUse())) {
+                return; 
+            }
+            
+            String licenseName = "Custom Terms";
+            if (datasetVersion.getTermsOfUseAndAccess().getLicense() != null) {
+                licenseName = datasetVersion.getTermsOfUseAndAccess().getLicense().getName();
+            } else if (datasetVersion.getTermsOfUseAndAccess().getTermsOfUse() == null) {
+                // this fixes #10513 for datasets harvested in oai_dc - these 
+                // have neither the license id, nor any actual custom terms 
+                return; 
+            }
+            solrInputDocument.addField(SearchFields.DATASET_LICENSE, licenseName);
+        }
+    }
+
     private void addDataverseReleaseDateToSolrDoc(SolrInputDocument solrInputDocument, Dataverse dataverse) {
         if (dataverse.getPublicationDate() != null) {
             Calendar calendar = Calendar.getInstance();
@@ -1304,17 +2096,88 @@ public static String getIN_REVIEW_STRING() {
     public static String getDEACCESSIONED_STRING() {
         return DEACCESSIONED_STRING;
     }
+    
+    
+    
+    private void updatePathForExistingSolrDocs(DvObject object) throws SolrServerException, IOException {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setQuery(SearchUtil.constructQuery(SearchFields.ENTITY_ID, object.getId().toString()));
+
+        QueryResponse res = solrClientService.getSolrClient().query(solrQuery);
+        
+        if (!res.getResults().isEmpty()) {            
+            SolrDocument doc = res.getResults().get(0);
+            SolrInputDocument sid = new SolrInputDocument();
+
+            for (String fieldName : doc.getFieldNames()) {
+                sid.addField(fieldName, doc.getFieldValue(fieldName));
+            }
+
+            Dataset dataset = null;
+            if (object.isInstanceofDataset()) {
+                dataset = datasetService.findDeep(object.getId());
+            }
+            List<String> paths = object.isInstanceofDataset() ? retrieveDVOPaths(dataset)
+                    : retrieveDVOPaths(dataverseService.find(object.getId()));
+
+            sid.removeField(SearchFields.SUBTREE);
+            sid.addField(SearchFields.SUBTREE, paths);
+            UpdateResponse addResponse = solrClientIndexService.getSolrClient().add(sid);
+            if (object.isInstanceofDataset()) {
+                for (DataFile df : dataset.getFiles()) {
+                    solrQuery.setQuery(SearchUtil.constructQuery(SearchFields.ENTITY_ID, df.getId().toString()));
+                    res = solrClientService.getSolrClient().query(solrQuery);
+                    if (!res.getResults().isEmpty()) {
+                        doc = res.getResults().get(0);
+                        sid = new SolrInputDocument();
+                        for (String fieldName : doc.getFieldNames()) {
+                            sid.addField(fieldName, doc.getFieldValue(fieldName));
+                        }
+                        sid.removeField(SearchFields.SUBTREE);
+                        sid.addField(SearchFields.SUBTREE, paths);
+                        addResponse = solrClientIndexService.getSolrClient().add(sid);
+                    }
+                }
+            }
+        }            
+    }
+    
+    
+    private List<String> retrieveDVOPaths(DvObject dvo) {
+        List<String> dataversePathSegmentsAccumulator = new ArrayList<>();
+        List<String> dataverseSegments = new ArrayList<>();
+        Dataset dataset = null;
+        Dataverse dv = null;
+        try {
+            if(dvo.isInstanceofDataset()){
+                dataset = (Dataset) dvo;
+                dataverseSegments = findPathSegments(dataset.getOwner(), dataversePathSegmentsAccumulator);
+            }
+            if(dvo.isInstanceofDataverse()){
+                dv = (Dataverse) dvo;
+                dataverseSegments = findPathSegments(dv, dataversePathSegmentsAccumulator);
+            }
+        } catch (Exception ex) {
+            logger.info("failed to find dataverseSegments for dataversePaths for " + SearchFields.SUBTREE + ": " + ex);
+        }        
+        Set<String> dataversePaths = new HashSet<>(getDataversePathsFromSegments(dataverseSegments));
+        if (dataversePaths.size() > 0 && dvo.isInstanceofDataverse()) {
+            // removing the dataverse's own id from the paths
+            // fixes bug where if my parent dv was linked my dv was shown as linked to myself
+            dataversePaths.remove(dataversePaths.size() - 1);
+        }
+        /*
+        add linking paths
+        */
+        dataversePaths.addAll(findLinkingDataversePaths(findAllLinkingDataverses(dvo)));
+        return new ArrayList<>(dataversePaths);
+    }
 
     public String delete(Dataverse doomed) {
         logger.fine("deleting Solr document for dataverse " + doomed.getId());
         UpdateResponse updateResponse;
         try {
-            updateResponse = solrClientService.getSolrClient().deleteById(solrDocIdentifierDataverse + doomed.getId());
-        } catch (SolrServerException | IOException ex) {
-            return ex.toString();
-        }
-        try {
-            solrClientService.getSolrClient().commit();
+            updateResponse = solrClientIndexService.getSolrClient().deleteById(solrDocIdentifierDataverse + doomed.getId());
         } catch (SolrServerException | IOException ex) {
             return ex.toString();
         }
@@ -1334,12 +2197,7 @@ public String removeSolrDocFromIndex(String doomed) {
         logger.fine("deleting Solr document: " + doomed);
         UpdateResponse updateResponse;
         try {
-            updateResponse = solrClientService.getSolrClient().deleteById(doomed);
-        } catch (SolrServerException | IOException ex) {
-            return ex.toString();
-        }
-        try {
-            solrClientService.getSolrClient().commit();
+            updateResponse = solrClientIndexService.getSolrClient().deleteById(doomed);
         } catch (SolrServerException | IOException ex) {
             return ex.toString();
         }
@@ -1384,6 +2242,7 @@ private String determineDeaccessionedDatasetId(Dataset dataset) {
         return IndexableObject.IndexableTypes.DATASET.getName() + "_" + dataset.getId() + IndexableDataset.DatasetState.DEACCESSIONED.getSuffix();
     }
 
+    //Only used when FeatureFlags.REDUCE_SOLR_DELETES is disabled
     private String removeDeaccessioned(Dataset dataset) {
         StringBuilder result = new StringBuilder();
         String deleteDeaccessionedResult = removeSolrDocFromIndex(determineDeaccessionedDatasetId(dataset));
@@ -1394,6 +2253,7 @@ private String removeDeaccessioned(Dataset dataset) {
         return result.toString();
     }
 
+    //Only used when FeatureFlags.REDUCE_SOLR_DELETES is disabled
     private String removePublished(Dataset dataset) {
         StringBuilder result = new StringBuilder();
         String deletePublishedResult = removeSolrDocFromIndex(determinePublishedDatasetSolrDocId(dataset));
@@ -1403,6 +2263,14 @@ private String removePublished(Dataset dataset) {
         result.append(deleteFilesResult);
         return result.toString();
     }
+    
+    // Only used when FeatureFlags.REDUCE_SOLR_DELETES is disabled
+    private String deleteDraftFiles(List<String> solrDocIdsForDraftFilesToDelete) {
+        String deleteDraftFilesResults = "";
+        IndexResponse indexResponse = solrIndexService.deleteMultipleSolrIds(solrDocIdsForDraftFilesToDelete);
+        deleteDraftFilesResults = indexResponse.toString();
+        return deleteDraftFilesResults;
+    }
 
     private Dataverse findRootDataverseCached() {
         if (true) {
@@ -1463,46 +2331,28 @@ private String getDesiredCardState(Map<DatasetVersion.VersionState, Boolean> des
     /**
      * @return Dataverses that should be reindexed either because they have
      * never been indexed or their index time is before their modification time.
+     * (Exclude root because it is never indexed)
      */
-    public List<Dataverse> findStaleOrMissingDataverses() {
-        List<Dataverse> staleDataverses = new ArrayList<>();
-        for (Dataverse dataverse : dataverseService.findAll()) {
-            if (dataverse.equals(dataverseService.findRootDataverse())) {
-                continue;
-            }
-            if (stale(dataverse)) {
-                staleDataverses.add(dataverse);
-            }
-        }
-        return staleDataverses;
+    public List<Long> findStaleOrMissingDataverses() {
+        List<Long> staleDataverseIds = dataverseService.findIdStale();
+        Long rootId = dataverseService.findRootDataverse().getId();
+        List<Long> ids = new ArrayList<>();
+        staleDataverseIds.stream().filter(id -> (!id.equals(rootId))).forEachOrdered(id -> {
+            ids.add(id);
+        });
+        return ids;
     }
 
     /**
      * @return Datasets that should be reindexed either because they have never
      * been indexed or their index time is before their modification time.
      */
-    public List<Dataset> findStaleOrMissingDatasets() {
-        List<Dataset> staleDatasets = new ArrayList<>();
-        for (Dataset dataset : datasetService.findAll()) {
-            if (stale(dataset)) {
-                staleDatasets.add(dataset);
-            }
-        }
-        return staleDatasets;
-    }
-
-    private boolean stale(DvObject dvObject) {
-        Timestamp indexTime = dvObject.getIndexTime();
-        Timestamp modificationTime = dvObject.getModificationTime();
-        if (indexTime == null) {
-            return true;
-        } else if (indexTime.before(modificationTime)) {
-            return true;
-        }
-        return false;
+    public List<Long> findStaleOrMissingDatasets() {
+        return datasetService.findIdStale();
     }
 
-    public List<Long> findDataversesInSolrOnly() throws SearchException {
+  
+    public List<String> findDataversesInSolrOnly() throws SearchException {
         try {
             /**
              * @todo define this centrally and statically
@@ -1513,7 +2363,7 @@ public List<Long> findDataversesInSolrOnly() throws SearchException {
         }
     }
 
-    public List<Long> findDatasetsInSolrOnly() throws SearchException {
+    public List<String> findDatasetsInSolrOnly() throws SearchException {
         try {
             /**
              * @todo define this centrally and statically
@@ -1524,7 +2374,7 @@ public List<Long> findDatasetsInSolrOnly() throws SearchException {
         }
     }
 
-    public List<Long> findFilesInSolrOnly() throws SearchException {
+    public List<String> findFilesInSolrOnly() throws SearchException {
         try {
             /**
              * @todo define this centrally and statically
@@ -1534,34 +2384,130 @@ public List<Long> findFilesInSolrOnly() throws SearchException {
             throw ex;
         }
     }
-
-    private List<Long> findDvObjectInSolrOnly(String type) throws SearchException {
-        SolrQuery solrQuery = new SolrQuery();
-        solrQuery.setQuery("*");
-        solrQuery.setRows(Integer.MAX_VALUE);
-        solrQuery.addFilterQuery(SearchFields.TYPE + ":" + type);
-        List<Long> dvObjectInSolrOnly = new ArrayList<>();
-        QueryResponse queryResponse = null;
+    /**
+     * Finds permissions documents in Solr that don't have corresponding dvObjects
+     * in the database, and returns a list of their Solr "id" field.
+     * @return list of "id" field vales for the orphaned Solr permission documents
+     * @throws SearchException 
+     */
+    public List<String> findPermissionsInSolrOnly() throws SearchException {
+        logger.info("Checking for solr-only permissions");
+        List<String> permissionInSolrOnly = new ArrayList<>();
         try {
-            queryResponse = solrClientService.getSolrClient().query(solrQuery);
+            int rows = 1000;
+            SolrQuery q = (new SolrQuery(SearchFields.DEFINITION_POINT_DVOBJECT_ID+":*")).setRows(rows).setSort(SortClause.asc(SearchFields.ID));
+            String cursorMark = CursorMarkParams.CURSOR_MARK_START;
+            boolean done = false;
+            while (!done) {
+                q.set(CursorMarkParams.CURSOR_MARK_PARAM, cursorMark);
+                QueryResponse rsp = solrClientService.getSolrClient().query(q);
+                String nextCursorMark = rsp.getNextCursorMark();
+                logger.fine("Next cursor mark (1K entries): " + nextCursorMark);
+                SolrDocumentList list = rsp.getResults();
+                for (SolrDocument doc: list) {
+                    long id = Long.parseLong((String) doc.getFieldValue(SearchFields.DEFINITION_POINT_DVOBJECT_ID));
+                    String docId = (String) doc.getFieldValue(SearchFields.ID);
+                    String dtype = dvObjectService.getDtype(id);
+                    if (dtype == null) {
+                        permissionInSolrOnly.add(docId);
+                    } else if (dtype.equals(DType.Dataset.getDType())) {
+                        List<String> states = datasetService.getVersionStates(id);
+                        if (states != null) {
+                            String latestState = states.get(states.size() - 1);
+                            if (docId.endsWith("draft_permission")) {
+                                if (!latestState.equals(VersionState.DRAFT.toString())) {
+                                    permissionInSolrOnly.add(docId);
+                                }
+                            } else if (docId.endsWith("deaccessioned_permission")) {
+                                if (!latestState.equals(VersionState.DEACCESSIONED.toString())) {
+                                    permissionInSolrOnly.add(docId);
+                                }
+                            } else {
+                                if (!states.contains(VersionState.RELEASED.toString())) {
+                                    permissionInSolrOnly.add(docId);
+                                }
+                            }
+                        }
+                    } else if (dtype.equals(DType.DataFile.getDType())) {
+                        List<VersionState> states = dataFileService.findVersionStates(id);
+                        Set<String> strings = states.stream().map(VersionState::toString).collect(Collectors.toSet());
+                        logger.finest("States for " + docId + ": " + String.join(", ", strings));
+                        if (docId.endsWith("draft_permission")) {
+                            if (!states.contains(VersionState.DRAFT)) {
+                                permissionInSolrOnly.add(docId);
+                            }
+                        } else if (docId.endsWith("deaccessioned_permission")) {
+                            if (!states.contains(VersionState.DEACCESSIONED) && states.size() == 1) {
+                                permissionInSolrOnly.add(docId);
+                            }
+                        } else {
+                            if (!states.contains(VersionState.RELEASED)) {
+                                permissionInSolrOnly.add(docId);
+                            } else {
+                                if (!dataFileService.isInReleasedVersion(id)) {
+                                    logger.finest("Adding doc " + docId + " to list of permissions in Solr only");
+                                    permissionInSolrOnly.add(docId);
+                                }
+                            }
+
+                        }
+                    }
+                }
+                if (cursorMark.equals(nextCursorMark)) {
+                    done = true;
+                }
+                cursorMark = nextCursorMark;
+            }
         } catch (SolrServerException | IOException ex) {
-            throw new SearchException("Error searching Solr for " + type, ex);
+           throw new SearchException("Error searching Solr for permissions" , ex);
+ 
+        } catch (Exception e) {
+            logger.warning(e.getLocalizedMessage());
+            e.printStackTrace();
         }
-        SolrDocumentList results = queryResponse.getResults();
-        for (SolrDocument solrDocument : results) {
-            Object idObject = solrDocument.getFieldValue(SearchFields.ENTITY_ID);
-            if (idObject != null) {
-                try {
-                    long id = (Long) idObject;
-                    DvObject dvobject = dvObjectService.findDvObject(id);
-                    if (dvobject == null) {
-                        dvObjectInSolrOnly.add(id);
+        return permissionInSolrOnly;
+    }
+    
+    private List<String> findDvObjectInSolrOnly(String type) throws SearchException {
+        SolrQuery solrQuery = new SolrQuery();
+        int rows = 100;
+     
+        solrQuery.setQuery("*").setRows(rows).setSort(SortClause.asc(SearchFields.ID));
+        solrQuery.addFilterQuery(SearchFields.TYPE + ":" + type);
+        List<String> dvObjectInSolrOnly = new ArrayList<>();
+       
+        String cursorMark = CursorMarkParams.CURSOR_MARK_START;
+        boolean done = false;
+        while (!done) {
+            solrQuery.set(CursorMarkParams.CURSOR_MARK_PARAM, cursorMark);
+            QueryResponse rsp = null;
+            try {
+                rsp = solrClientService.getSolrClient().query(solrQuery);
+             } catch (SolrServerException | IOException ex) {
+                throw new SearchException("Error searching Solr type: " + type, ex);
+
+            }
+            String nextCursorMark = rsp.getNextCursorMark();
+            SolrDocumentList list = rsp.getResults();
+            for (SolrDocument doc: list) {
+                Object idObject = doc.getFieldValue(SearchFields.ENTITY_ID);
+                if (idObject != null) {
+                    try {
+                        long id = (Long) idObject;
+                        if (dvObjectService.getDtype(id) == null) {
+                            dvObjectInSolrOnly.add((String)doc.getFieldValue(SearchFields.ID));
+                        }
+                    } catch (ClassCastException ex) {
+                        throw new SearchException("Found " + SearchFields.ENTITY_ID + " but error casting " + idObject + " to long", ex);
                     }
-                } catch (ClassCastException ex) {
-                    throw new SearchException("Found " + SearchFields.ENTITY_ID + " but error casting " + idObject + " to long", ex);
                 }
             }
+            if (cursorMark.equals(nextCursorMark)) {
+                done = true;
+            }
+            cursorMark = nextCursorMark;
         }
+
         return dvObjectInSolrOnly;
     }
 
@@ -1640,6 +2586,11 @@ public void deleteHarvestedDocuments(Dataset harvestedDataset) {
             solrIdsOfDocumentsToDelete.add(solrDocIdentifierFile + datafile.getId());
         }
 
+        deleteHarvestedDocuments(solrIdsOfDocumentsToDelete);
+    }
+    
+    public void deleteHarvestedDocuments(List<String> solrIdsOfDocumentsToDelete) {
+
         logger.fine("attempting to delete the following documents from the index: " + StringUtils.join(solrIdsOfDocumentsToDelete, ","));
         IndexResponse resultOfAttemptToDeleteDocuments = solrIndexService.deleteMultipleSolrIds(solrIdsOfDocumentsToDelete);
         logger.fine("result of attempt to delete harvested documents: " + resultOfAttemptToDeleteDocuments + "\n");
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/OddlyEnoughSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/OddlyEnoughSearchServiceBean.java
new file mode 100644
index 00000000000..06ad4856a9c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/OddlyEnoughSearchServiceBean.java
@@ -0,0 +1,108 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import java.util.Comparator;
+import java.util.List;
+import java.util.logging.Logger;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+
+@Stateless
+@Named
+public class OddlyEnoughSearchServiceBean implements SearchService {
+
+    private static final Logger logger = Logger.getLogger(OddlyEnoughSearchServiceBean.class.getCanonicalName());
+
+    private SearchService solrSearchService;
+    
+    public OddlyEnoughSearchServiceBean() {
+        // Default constructor
+    }
+    
+    @Override
+    public void setSolrSearchService(SearchService solrSearchService) {
+        this.solrSearchService = solrSearchService;
+    }
+
+    @Override
+    public String getServiceName() {
+        return "oddlyEnough";
+    }
+    @Override 
+    public String getDisplayName() {
+        return "Demo: Odd Results Only";
+    }
+    
+    /**
+     * @param dataverseRequest
+     * @param dataverses
+     * @param query
+     * @param filterQueries
+     * @param sortField
+     * @param sortOrder
+     * @param paginationStart
+     * @param onlyDatatRelatedToMe
+     * @param numResultsPerPage
+     * @param retrieveEntities - look up dvobject entities with .find() (potentially expensive!)
+     * @param geoPoint e.g. "35,15"
+     * @param geoRadius e.g. "5"
+     * @param addFacets boolean
+     * @param addHighlights boolean
+     * @param addCollections boolean
+     * @return
+     * @throws SearchException
+     */
+    @Override
+    public SolrQueryResponse search(
+            DataverseRequest dataverseRequest,
+            List<Dataverse> dataverses,
+            String query,
+            List<String> filterQueries,
+            String sortField, 
+            String sortOrder,
+            int paginationStart,
+            boolean onlyDatatRelatedToMe,
+            int numResultsPerPage,
+            boolean retrieveEntities,
+            String geoPoint,
+            String geoRadius,
+            boolean addFacets,
+            boolean addHighlights,
+            boolean addCollections
+    ) throws SearchException {
+
+        logger.info("Search query: " + query + "handled by OddlyEnough search service");
+        // Execute the query using SolrSearchService
+        SolrQueryResponse queryResponse = solrSearchService.search(dataverseRequest, dataverses, query, filterQueries, sortField, sortOrder, 0, onlyDatatRelatedToMe, 1000, retrieveEntities, geoPoint, geoRadius, addFacets, addHighlights, addCollections);
+        
+        // Process the results
+        List<SolrSearchResult> solrSearchResults = queryResponse.getSolrSearchResults();
+        
+        logger.info("Number of results: " + solrSearchResults.size());
+        logger.info("Number of results found: " + queryResponse.getNumResultsFound());
+        
+        // Sort the results by ID and filter out even entityIds
+        // Sort the results by ID, filter out even entityIds, skip entries based on pagination, and limit results
+        solrSearchResults = solrSearchResults.stream()
+                .filter(result -> result.getEntityId() % 2 != 0)
+                .sorted(Comparator.comparing(SolrSearchResult::getEntityId))
+                .toList();
+        queryResponse.setNumResultsFound((long) solrSearchResults.size());
+        logger.info("Number of results after filter: " + queryResponse.getNumResultsFound());
+        
+        solrSearchResults = solrSearchResults.stream()
+                .skip((long) paginationStart * numResultsPerPage)
+                .limit(numResultsPerPage)
+                .toList();
+        
+        logger.info("Remaining number of results: " + solrSearchResults.size());
+        for(SolrSearchResult result : solrSearchResults) {
+            logger.info("Result ID: " + result.getEntityId());
+        }
+        queryResponse.setSolrSearchResults(solrSearchResults);
+        
+        return queryResponse;
+    }
+}
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/PostExternalSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/PostExternalSearchServiceBean.java
new file mode 100644
index 00000000000..f7e9fe5fb0f
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/PostExternalSearchServiceBean.java
@@ -0,0 +1,82 @@
+package edu.harvard.iq.dataverse.search;
+
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+import java.util.List;
+import java.util.logging.Logger;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+
+@Stateless
+@Named
+public class PostExternalSearchServiceBean extends AbstractExternalSearchServiceBean {
+
+    protected static final Logger logger = Logger.getLogger(PostExternalSearchServiceBean.class.getCanonicalName());
+
+    @Override
+    public String getServiceName() {
+        return "postExternalSearch";
+    }
+
+    private JsonObject prepareQuery(String query, int paginationStart, int numResultsPerPage, String sortField,
+            String sortOrder, List<String> filterQueries, boolean addHighlights, boolean addFacets,
+            boolean onlyDataRelatedToMe, boolean retrieveEntities, String geoPoint, String geoRadius) {
+
+        // Create JSON object with search parameters JsonObject searchParams =
+        return NullSafeJsonBuilder.jsonObjectBuilder().add("query", query)
+                .add("filterQueries", Json.createArrayBuilder(filterQueries)).add("sortField", sortField)
+                .add("sortOrder", sortOrder).add("paginationStart", paginationStart)
+                .add("onlyDataRelatedToMe", onlyDataRelatedToMe).add("numResultsPerPage", numResultsPerPage)
+                .add("geoPoint", geoPoint).add("geoRadius", geoRadius).build();
+    }
+
+    @Override
+    public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query,
+            List<String> filterQueries, String sortField, String sortOrder, int paginationStart,
+            boolean onlyDataRelatedToMe, int numResultsPerPage, boolean retrieveEntities, String geoPoint,
+            String geoRadius, boolean addFacets, boolean addHighlights, boolean addCollections) throws SearchException {
+
+        String externalSearchUrl = settingsService.getValueForKey(SettingsServiceBean.Key.PostExternalSearchUrl);
+        if (externalSearchUrl == null || externalSearchUrl.isEmpty()) {
+            throw new SearchException("External search URL is not configured", null);
+        }
+
+        // Prepare query parameters
+        JsonObject queryJson = prepareQuery(query, paginationStart, numResultsPerPage, sortField, sortOrder,
+                filterQueries, addHighlights, addFacets, onlyDataRelatedToMe, retrieveEntities, geoPoint, geoRadius);
+
+        // Send POST request to external service
+        Client client = ClientBuilder.newClient();
+        Response response = client.target(externalSearchUrl).request(MediaType.APPLICATION_JSON)
+                .post(Entity.json(queryJson));
+
+        if (response.getStatus() != 200) {
+            throw new SearchException("External search service returned status " + response.getStatus(), null);
+        }
+        try {
+            // Parse response and process results
+            String responseString = response.readEntity(String.class);
+            logger.fine("External search returned: " + responseString);
+            return postProcessResponse(responseString, dataverseRequest, retrieveEntities, addFacets, addHighlights, addCollections);
+        } catch (Exception e) {
+            throw new SearchException("Error parsing external search service response", e);
+        }
+    }
+
+    @Override
+    public String getDisplayName() {
+        return settingsService.getValueForKey(SettingsServiceBean.Key.PostExternalSearchName, "External Search (POST)");
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchConstants.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchConstants.java
index d09b0fca2d6..2d6632760fb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchConstants.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchConstants.java
@@ -38,5 +38,7 @@ public class SearchConstants {
 
     public static final String PUBLIC = "Public";
     public static final String RESTRICTED = "Restricted";
-
+    public static final String EMBARGOEDTHENRESTRICTED = "EmbargoedThenRestricted";
+    public static final String EMBARGOEDTHENPUBLIC = "EmbargoedThenPublic";
+    public static final String RETENTIONEXPIRED = "RetentionPeriodExpired";
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java
index 181d649080e..a3328531821 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java
@@ -94,6 +94,7 @@ public class SearchFields {
     public static final String UNF = "unf";
     public static final String DATAVERSE_NAME = "dvName";
     public static final String DATAVERSE_ALIAS = "dvAlias";
+    public static final String DATAVERSE_PARENT_ALIAS = "dvParentAlias";
     public static final String DATAVERSE_AFFILIATION = "dvAffiliation";
     public static final String DATAVERSE_DESCRIPTION = "dvDescription";
     public static final String DATAVERSE_CATEGORY = "dvCategory";
@@ -170,6 +171,7 @@ public class SearchFields {
     public static final String FILE_CHECKSUM_TYPE = "fileChecksumType";
     public static final String FILE_CHECKSUM_VALUE = "fileChecksumValue";
     public static final String FILENAME_WITHOUT_EXTENSION = "fileNameWithoutExtension";
+    public static final String FILE_RESTRICTED = "fileRestricted";
     /**
      * Indexed as a string so we can facet on it.
      */
@@ -206,6 +208,7 @@ public class SearchFields {
      * A dataverse, a dataset, or a file.
      */
     public static final String TYPE = "dvObjectType";
+    public static final String METADATA_TYPES = "metadata_type_ss";
     public static final String NAME_SORT = "nameSort";
     // PUBLICATION_YEAR used to be called PUBLICATION_DATE.
     public static final String PUBLICATION_YEAR = "publicationDate";
@@ -216,10 +219,22 @@ public class SearchFields {
     public static final String DEFINITION_POINT_DVOBJECT_ID = "definitionPointDvObjectId";
     public static final String DISCOVERABLE_BY = "discoverableBy";
 
+    /**
+     * publicObject_b is an experimental field tied to the
+     * avoid-expensive-solr-join feature flag. Rather than discoverableBy which
+     * is a field on permission documents, publicObject_b is a field on content
+     * documents (dvObjects). By indexing publicObject_b=true, we can let guests
+     * search on it, avoiding an expensive join for those (common) users.
+     */
+    public static final String PUBLIC_OBJECT = "publicObject_b";
+
     /**
      * i.e. "Unpublished", "Draft" (multivalued)
      */
     public static final String PUBLICATION_STATUS = "publicationStatus";
+    
+    public static final String CURATION_STATUS = "curationStatus";
+    public static final String CURATION_STATUS_CREATE_TIME = "curationStatusCreateTime";
     /**
      * @todo reconcile different with Solr schema.xml where type is Long rather
      * than String.
@@ -244,6 +259,7 @@ public class SearchFields {
     public static final String DATASET_CITATION = "citation";
     public static final String DATASET_CITATION_HTML = "citationHtml";
     public static final String DATASET_DEACCESSION_REASON = "deaccessionReason";
+    public static final String DATASET_VERSION_NOTE = "versionNote";
     /**
      * In contrast to PUBLICATION_YEAR, this field applies only to datasets for
  more targeted results for just datasets. The format is YYYY (i.e.
@@ -252,9 +268,35 @@ more targeted results for just datasets. The format is YYYY (i.e.
     public static final String DATASET_PUBLICATION_DATE = "dsPublicationDate";
     public static final String DATASET_PERSISTENT_ID = "dsPersistentId";
     public static final String DATASET_VERSION_ID = "datasetVersionId";
+    /**
+     * Datasets can be software, workflow, etc. See the DatasetType object.
+     */
+    public static final String DATASET_TYPE = "datasetType";
 
+    public static final String OBSERVATIONS = "observations";
+    public static final String VARIABLE_COUNT = "variableCount";
     public static final String VARIABLE_NAME = "variableName";
     public static final String VARIABLE_LABEL = "variableLabel";
+    public static final String LITERAL_QUESTION = "literalQuestion";
+    public static final String INTERVIEW_INSTRUCTIONS = "interviewInstructions";
+    public static final String POST_QUESTION = "postQuestion";
+    public static final String VARIABLE_UNIVERSE = "variableUniverse";
+    public static final String VARIABLE_NOTES = "variableNotes";
+
+
     public static final String FULL_TEXT = "_text_";
+    public static final String EMBARGO_END_DATE = "embargoEndDate";
+    public static final String RETENTION_END_DATE = "retentionEndDate";
+    
+    // SpatialRecursivePrefixTreeFieldType: https://solr.apache.org/guide/8_11/spatial-search.html#rpt
+    public static final String GEOLOCATION = "geolocation";
+    // BBoxField (bounding box): https://solr.apache.org/guide/8_11/spatial-search.html#bboxfield
+    public static final String BOUNDING_BOX = "boundingBox";
+
+    public static final String DATASET_VALID = "datasetValid";
+
+    public static final String DATASET_LICENSE = "license";
+    public static final String FILE_COUNT = "fileCount";
+    public static final String DATASET_COUNT = "datasetCount";
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBean.java
index 2bf8807e301..14b5c8d7f68 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBean.java
@@ -7,11 +7,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Named
 @Stateless
@@ -20,7 +20,7 @@ public class SearchFilesServiceBean {
     private static final Logger logger = Logger.getLogger(SearchFilesServiceBean.class.getCanonicalName());
 
     @EJB
-    SearchServiceBean searchService;
+    SearchServiceFactory searchService;
     
     public FileView getFileView(DatasetVersion datasetVersion, User user, String userSuppliedQuery) {
         Dataverse dataverse = null;
@@ -46,7 +46,7 @@ public FileView getFileView(DatasetVersion datasetVersion, User user, String use
         dataverses.add(dataverse);
         try {
             HttpServletRequest httpServletRequest = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
-            solrQueryResponse = searchService.search(new DataverseRequest(user, httpServletRequest), dataverses, finalQuery, filterQueries, sortField, sortOrder, paginationStart, onlyDataRelatedToMe, numResultsPerPage);
+            solrQueryResponse = searchService.getDefaultSearchService().search(new DataverseRequest(user, httpServletRequest), dataverses, finalQuery, filterQueries, sortField, sortOrder, paginationStart, onlyDataRelatedToMe, numResultsPerPage);
         } catch (SearchException ex) {
             logger.info(SearchException.class + " searching for files: " + ex);
             return null;
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
index 6de1e7e97aa..2ebb1903655 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
@@ -2,12 +2,15 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.DataFileServiceBean;
-import edu.harvard.iq.dataverse.DataFileTag;
 import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseFacet;
 import edu.harvard.iq.dataverse.DataversePage;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DataverseSession;
@@ -18,37 +21,32 @@
 import edu.harvard.iq.dataverse.SettingsWrapper;
 import edu.harvard.iq.dataverse.ThumbnailServiceWrapper;
 import edu.harvard.iq.dataverse.WidgetWrapper;
-import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
-import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
-import edu.harvard.iq.dataverse.dataset.DatasetUtil;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.FileUtil;
-import edu.harvard.iq.dataverse.util.SystemConfig;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Base64;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Optional;
 import java.util.Set;
-import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.lang3.StringUtils;
+
 
 //@ViewScoped
 @RequestScoped
@@ -58,7 +56,7 @@ public class SearchIncludeFragment implements java.io.Serializable {
     private static final Logger logger = Logger.getLogger(SearchIncludeFragment.class.getCanonicalName());
 
     @EJB
-    SearchServiceBean searchService;
+    SearchServiceFactory searchServiceFactory;
     @EJB
     DataverseServiceBean dataverseService;
     @EJB
@@ -84,7 +82,7 @@ public class SearchIncludeFragment implements java.io.Serializable {
     @Inject
     DataversePage dataversePage;
     @EJB
-    SystemConfig systemConfig;
+    DatasetFieldServiceBean datasetFieldService;
 
     private String browseModeString = "browse";
     private String searchModeString = "search";
@@ -126,7 +124,6 @@ public class SearchIncludeFragment implements java.io.Serializable {
     private Long facetCountDatasets = 0L;
     private Long facetCountFiles = 0L;
     Map<String, Long> previewCountbyType = new HashMap<>();
-    private SolrQueryResponse solrQueryResponseAllTypes;
     private String sortField;
     private SortOrder sortOrder;
     private String currentSort;
@@ -138,8 +135,8 @@ public class SearchIncludeFragment implements java.io.Serializable {
     Map<String, String> datasetfieldFriendlyNamesBySolrField = new HashMap<>();
     Map<String, String> staticSolrFieldFriendlyNamesBySolrField = new HashMap<>();
     private boolean solrIsDown = false;
+    private boolean solrIsTemporarilyUnavailable = false; 
     private Map<String, Integer> numberOfFacets = new HashMap<>();
-    private boolean debug = false;
 //    private boolean showUnpublished;
     List<String> filterQueriesDebug = new ArrayList<>();
 //    private Map<String, String> friendlyName = new HashMap<>();
@@ -220,7 +217,7 @@ public String searchRedirect(String dataverseRedirectPage, Dataverse dataverseIn
             qParam = "&q=" + query;
         }
 
-        return widgetWrapper.wrapURL(dataverseRedirectPage + "?faces-redirect=true&q=" + qParam + optionalDataverseScope);
+        return widgetWrapper.wrapURL(dataverseRedirectPage + "?faces-redirect=true" + qParam + optionalDataverseScope);
 
     }
 
@@ -264,18 +261,32 @@ public void search(boolean onlyDataRelatedToMe) {
                 selectedTypesString = "dataverses:datasets:files";
             }
         }
+        
+        /*
+        The real issue here (https://github.com/IQSS/dataverse/issues/7304) is caused 
+        by the types query being treated as a filter query.
+        So I'm ignoring it if it comes up in the fq array and setting it via the 
+        selectedTypesString
+        SEK 8/25/2021
+        */
 
         filterQueries = new ArrayList<>();
         for (String fq : Arrays.asList(fq0, fq1, fq2, fq3, fq4, fq5, fq6, fq7, fq8, fq9)) {
             if (fq != null) {
-                filterQueries.add(fq);
+                if (!isfilterQueryAlreadyInMap(fq)) {
+                    if(!fq.contains(SearchFields.TYPE)){
+                        filterQueries.add(fq);
+                    }                    
+                }
             }
         }
 
-        SolrQueryResponse solrQueryResponse = null;
 
-        List<String> filterQueriesFinal = new ArrayList<>();
+        SolrQueryResponse solrQueryResponse = null;
+        SolrQueryResponse solrQueryResponseSecondPass = null;
 
+        List<String> filterQueriesExtended = new ArrayList<>();
+        
         if (dataverseAlias != null) {
             this.dataverse = dataverseService.findByAlias(dataverseAlias);
         }
@@ -283,38 +294,42 @@ public void search(boolean onlyDataRelatedToMe) {
             dataversePath = dataverseService.determineDataversePath(this.dataverse);
             String filterDownToSubtree = SearchFields.SUBTREE + ":\"" + dataversePath + "\"";
             //logger.info("SUBTREE parameter: " + dataversePath);
-            if (!this.dataverse.equals(dataverseService.findRootDataverse())) {
+            if (!(this.dataverse.getOwner() == null)) { 
                 /**
                  * @todo centralize this into SearchServiceBean
                  */
-                filterQueriesFinal.add(filterDownToSubtree);
+                if (!isfilterQueryAlreadyInMap(filterDownToSubtree)){
+                    filterQueriesExtended.add(filterDownToSubtree);
+                }
 //                this.dataverseSubtreeContext = dataversePath;
             } else {
 //                this.dataverseSubtreeContext = "all";
                 this.setRootDv(true);
             }
         } else {
-            this.dataverse = dataverseService.findRootDataverse();
+            this.dataverse = settingsWrapper.getRootDataverse();
 //            this.dataverseSubtreeContext = "all";
             this.setRootDv(true);
         }
 
+        filterQueriesExtended.addAll(filterQueries);
+
+        /**
+         * Add type queries, for the types (Dataverses, Datasets, Datafiles) 
+         * currently selected:
+         */
         selectedTypesList = new ArrayList<>();
         String[] parts = selectedTypesString.split(":");
-//        int count = 0;
         selectedTypesList.addAll(Arrays.asList(parts));
-
-        List<String> filterQueriesFinalAllTypes = new ArrayList<>();
+                
         String[] arr = selectedTypesList.toArray(new String[selectedTypesList.size()]);
         selectedTypesHumanReadable = combine(arr, " OR ");
         if (!selectedTypesHumanReadable.isEmpty()) {
             typeFilterQuery = SearchFields.TYPE + ":(" + selectedTypesHumanReadable + ")";
-        }
-        filterQueriesFinal.addAll(filterQueries);
-        filterQueriesFinalAllTypes.addAll(filterQueriesFinal);
+        } 
+        List<String> filterQueriesFinal = new ArrayList<>();
+        filterQueriesFinal.addAll(filterQueriesExtended);
         filterQueriesFinal.add(typeFilterQuery);
-        String allTypesFilterQuery = SearchFields.TYPE + ":(dataverses OR datasets OR files)";
-        filterQueriesFinalAllTypes.add(allTypesFilterQuery);
 
         if (page <= 1) {
             // http://balusc.omnifaces.org/2015/10/the-empty-string-madness.html
@@ -335,6 +350,7 @@ public void search(boolean onlyDataRelatedToMe) {
         try {
             logger.fine("ATTENTION! query from user:   " + query);
             logger.fine("ATTENTION! queryToPassToSolr: " + queryToPassToSolr);
+            logger.fine("ATTENTION! filterQueriesFinal: " + filterQueriesFinal.toString());
             logger.fine("ATTENTION! sort by: " + sortField);
 
             /**
@@ -342,21 +358,82 @@ public void search(boolean onlyDataRelatedToMe) {
              * https://github.com/IQSS/dataverse/issues/84
              */
             int numRows = 10;
-            HttpServletRequest httpServletRequest = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
-            DataverseRequest dataverseRequest = new DataverseRequest(session.getUser(), httpServletRequest);
+            DataverseRequest dataverseRequest = getDataverseRequest();
             List<Dataverse> dataverses = new ArrayList<>();
             dataverses.add(dataverse);
-            solrQueryResponse = searchService.search(dataverseRequest, dataverses, queryToPassToSolr, filterQueriesFinal, sortField, sortOrder.toString(), paginationStart, onlyDataRelatedToMe, numRows, false);
+            solrQueryResponse = searchServiceFactory.getDefaultSearchService().search(dataverseRequest, dataverses, queryToPassToSolr, filterQueriesFinal, sortField, sortOrder.toString(), paginationStart, onlyDataRelatedToMe, numRows, false, null, null, !isFacetsDisabled(), true, false);
             if (solrQueryResponse.hasError()){
                 logger.info(solrQueryResponse.getError());
                 setSolrErrorEncountered(true);
+            } 
+            // Solr "temporarily unavailable" is the condition triggered by 
+            // receiving a 503 from the search engine, that is in turn a result
+            // of one of the Solr "circuit breakers" being triggered by excessive
+            // load. We treat this condition as distinct from "Solr is down", 
+            // on the assumption that it is transitive. 
+            if (solrQueryResponse.isSolrTemporarilyUnavailable()) {
+                setSolrTemporarilyUnavailable(true);
             }
             // This 2nd search() is for populating the "type" ("dataverse", "dataset", "file") facets: -- L.A. 
             // (why exactly do we need it, again?)
-            solrQueryResponseAllTypes = searchService.search(dataverseRequest, dataverses, queryToPassToSolr, filterQueriesFinalAllTypes, sortField, sortOrder.toString(), paginationStart, onlyDataRelatedToMe, numRows, false);
-            if (solrQueryResponse.hasError()){
-                logger.info(solrQueryResponse.getError());
-                setSolrErrorEncountered(true);
+            // To get the counts we display in the types facets particulary for unselected types - SEK 08/25/2021
+            // Sure, but we should not waste resources here. We will try to save 
+            // solr some extra work and a) only run this second query IF there is 
+            // one or more unselected type facets; and b) drop all the extra 
+            // parameters from this second query - such as facets and highlights -
+            // that we do not actually need for the purposes of finding these 
+            // extra numbers. -- L.A. 10/16/2023
+            
+            // populate preview counts: https://redmine.hmdc.harvard.edu/issues/3560
+            previewCountbyType.put(BundleUtil.getStringFromBundle("dataverses"), 0L);
+            previewCountbyType.put(BundleUtil.getStringFromBundle("datasets"), 0L);
+            previewCountbyType.put(BundleUtil.getStringFromBundle("files"), 0L);
+            
+            
+            // This will populate the type facet counts for the types that are 
+            // currently selected on the collection page:
+            for (FacetCategory facetCategory : solrQueryResponse.getTypeFacetCategories()) {
+                for (FacetLabel facetLabel : facetCategory.getFacetLabel()) {
+                    previewCountbyType.put(facetLabel.getName(), facetLabel.getCount());
+                }
+            }
+            
+            if (!wasSolrErrorEncountered() && selectedTypesList.size() < 3 && !isSolrTemporarilyUnavailable() && !isFacetsDisabled() && !isUncheckedTypesFacetDisabled()) {
+                // If some types are NOT currently selected, we will need to 
+                // run a second search to obtain the numbers of the unselected types:
+                
+                List<String> filterQueriesFinalSecondPass = new ArrayList<>();
+                filterQueriesFinalSecondPass.addAll(filterQueriesExtended);
+                   
+                arr = new String[3];
+                int c = 0;
+                for (String dvObjectType : Arrays.asList("dataverses", "datasets", "files")) {
+                    if (!selectedTypesList.contains(dvObjectType)) {
+                        arr[c++] = dvObjectType;
+                    }
+                }
+                filterQueriesFinalSecondPass.add(SearchFields.TYPE + ":(" + combine(arr, " OR ", c) + ")");
+                logger.fine("second pass query: " + queryToPassToSolr);
+                logger.fine("second pass filter query: "+filterQueriesFinalSecondPass.toString());
+
+                solrQueryResponseSecondPass = searchServiceFactory.getDefaultSearchService().search(dataverseRequest, dataverses, queryToPassToSolr, filterQueriesFinalSecondPass, null, sortOrder.toString(), 0, onlyDataRelatedToMe, 1, false, null, null, false, false, false);
+
+                if (solrQueryResponseSecondPass != null) {
+
+                    if (solrQueryResponseSecondPass.hasError()) {
+                        logger.fine(solrQueryResponseSecondPass.getError());
+                        setSolrErrorEncountered(true);
+                    }
+
+                    // And now populate the remaining type facets:
+                    for (FacetCategory facetCategory : solrQueryResponseSecondPass.getTypeFacetCategories()) {
+                        for (FacetLabel facetLabel : facetCategory.getFacetLabel()) {
+                            previewCountbyType.put(facetLabel.getName(), facetLabel.getCount());
+                        }
+                    }
+                } else {
+                    logger.warning("null solr response from the second pass type query");
+                }
             }
             
         } catch (SearchException ex) {
@@ -436,23 +513,34 @@ public void search(boolean onlyDataRelatedToMe) {
                 }
             }
 
-            // populate preview counts: https://redmine.hmdc.harvard.edu/issues/3560
-            previewCountbyType.put(BundleUtil.getStringFromBundle("dataverses"), 0L);
-            previewCountbyType.put(BundleUtil.getStringFromBundle("datasets"), 0L);
-            previewCountbyType.put(BundleUtil.getStringFromBundle("files"), 0L);
-            if (solrQueryResponseAllTypes != null) {
-                for (FacetCategory facetCategory : solrQueryResponseAllTypes.getTypeFacetCategories()) {
-                    for (FacetLabel facetLabel : facetCategory.getFacetLabel()) {
-                        previewCountbyType.put(facetLabel.getName(), facetLabel.getCount());
-                    }
-                }
-            }
             
             setDisplayCardValues();
             
+            if (settingsWrapper.displayChronologicalDateFacets()) {
+                Set<String> facetsToSort = new HashSet<String>();
+                facetsToSort.add(SearchFields.PUBLICATION_YEAR);
+                List<DataverseFacet> facets = dataversePage.getDataverse().getDataverseFacets();
+                for (DataverseFacet facet : facets) {
+                    DatasetFieldType dft = facet.getDatasetFieldType();
+                    if (dft.getFieldType() == FieldType.DATE) {
+                        // Currently all date fields are stored in solr as strings and so get an "_s" appended. 
+                        // If these someday are indexed as dates, this should change
+                        facetsToSort.add(dft.getName()+"_s");
+                    }
+                }
+
+                // Sort Pub Year Chronologically (alphabetically descending - works until 10000
+                // AD)
+                for (FacetCategory fc : facetCategoryList) {
+                    if (facetsToSort.contains(fc.getName())) {
+                        Collections.sort(fc.getFacetLabel(), Collections.reverseOrder());
+                    }
+                }
+            }
+                        
             dataversePage.setQuery(query);
             dataversePage.setFacetCategoryList(facetCategoryList);
-            dataversePage.setFilterQueries(filterQueries);
+            dataversePage.setFilterQueries(filterQueriesFinal);
             dataversePage.setSearchResultsCount(searchResultsCount);
             dataversePage.setSelectedTypesString(selectedTypesString);
             dataversePage.setSortField(sortField);
@@ -481,6 +569,25 @@ public void search(boolean onlyDataRelatedToMe) {
 //        friendlyName.put(SearchFields.PRODUCTION_DATE_YEAR_ONLY, "Production Date");
 //        friendlyName.put(SearchFields.DISTRIBUTION_DATE_YEAR_ONLY, "Distribution Date");
     }
+    
+    private Map<String, Integer> fqMap = null;
+
+    private boolean isfilterQueryAlreadyInMap(String fq) {
+        
+        if (fqMap == null) {
+            fqMap = new HashMap<>();
+            fqMap.put(fq, 1);
+            return false;
+        }
+
+        if (fqMap.get(fq) != null) {
+            return true;
+        } else {
+            fqMap.put(fq, 1);
+            return false;
+        }
+        
+    }
 
   
     /**
@@ -555,6 +662,10 @@ public void incrementFacets(String name, int incrementNum) {
     // http://stackoverflow.com/questions/1515437/java-function-for-arrays-like-phps-join/1515548#1515548
     String combine(String[] s, String glue) {
         int k = s.length;
+        return combine(s, glue, k);
+    }
+    
+    String combine(String[] s, String glue, int k) {
         if (k == 0) {
             return null;
         }
@@ -969,7 +1080,68 @@ public boolean isSolrIsDown() {
     public void setSolrIsDown(boolean solrIsDown) {
         this.solrIsDown = solrIsDown;
     }
+    
+    public boolean isSolrTemporarilyUnavailable() {
+        return solrIsTemporarilyUnavailable;
+    }
+    
+    public void setSolrTemporarilyUnavailable(boolean solrIsTemporarilyUnavailable) {
+        this.solrIsTemporarilyUnavailable = solrIsTemporarilyUnavailable; 
+    }
 
+    Boolean solrFacetsDisabled = null; 
+    /**
+     * Indicates that the fragment should not be requesting facets in Solr 
+     * searches and rendering them on the page.
+     * @return true if disabled; false by default 
+     */
+    public boolean isFacetsDisabled() {
+        if (this.solrFacetsDisabled != null) {
+            return this.solrFacetsDisabled;
+        }
+        
+        if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.DisableSolrFacets, false)) {
+            return this.solrFacetsDisabled = true;
+        }
+        
+        // We also have mechanisms for disabling the facets selectively, just for 
+        // the guests, or anonymous users:
+        if (session.getUser() instanceof GuestUser) {
+            if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.DisableSolrFacetsForGuestUsers, false)) {
+                return this.solrFacetsDisabled = true; 
+            }
+            
+            // An even lower grade of user than Guest is a truly anonymous user -
+            // a guest user who came without the session cookie:
+            Map<String, Object> cookies = FacesContext.getCurrentInstance().getExternalContext().getRequestCookieMap();
+            if (!(cookies != null && cookies.containsKey("JSESSIONID"))) {
+                if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.DisableSolrFacetsWithoutJsession, false)) {
+                    return this.solrFacetsDisabled = true; 
+                }
+            }
+        }
+        
+        return this.solrFacetsDisabled = false;
+    }
+    
+    Boolean disableSecondPassSearch = null; 
+    
+    /**
+     * Indicates that we do not need to run the second search query to populate 
+     * the counts for *unchecked* type facets.
+     * @return true if disabled; false by default 
+     */
+    public boolean isUncheckedTypesFacetDisabled() {
+        if (this.disableSecondPassSearch != null) {
+            return this.disableSecondPassSearch; 
+        }
+        if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.DisableUncheckedTypesFacet, false)) {
+            return this.disableSecondPassSearch = true;
+        }
+        return this.disableSecondPassSearch = false;
+    }
+    
+    
     public boolean isRootDv() {
         return rootDv;
     }
@@ -978,15 +1150,6 @@ public void setRootDv(boolean rootDv) {
         this.rootDv = rootDv;
     }
 
-    public boolean isDebug() {
-        return (debug && session.getUser().isSuperuser())
-                || settingsWrapper.isTrueForKey(":Debug", false);
-    }
-
-    public void setDebug(boolean debug) {
-        this.debug = debug;
-    }
-
     public List<String> getFilterQueriesDebug() {
         return filterQueriesDebug;
     }
@@ -1055,52 +1218,98 @@ public boolean hasValidFilterQueries(){
         return true;
     }
     
+    public String getTypeFromFilterQuery(String filterQuery) {
+
+        if (filterQuery == null) {
+            return null;
+        }
+
+        if(!filterQuery.contains(":")) {
+            //Filter query must be delimited by a :
+            return null;
+        } else {
+            return filterQuery.substring(0,filterQuery.indexOf(":"));
+        }
+    }
+    
     public List<String> getFriendlyNamesFromFilterQuery(String filterQuery) {
-        
-        
-        if ((filterQuery == null)||
-            (datasetfieldFriendlyNamesBySolrField == null)||
-            (staticSolrFieldFriendlyNamesBySolrField==null)){
+
+        if ((filterQuery == null) ||
+                (datasetfieldFriendlyNamesBySolrField == null) ||
+                (staticSolrFieldFriendlyNamesBySolrField == null)) {
             return null;
         }
-        
-        String[] parts = filterQuery.split(":");
-        if (parts.length != 2){
-            //logger.log(Level.INFO, "String array has {0} part(s).  Should have 2: {1}", new Object[]{parts.length, filterQuery});
+
+        if (!filterQuery.contains(":")) {
             return null;
         }
-        String key = parts[0];
-        String value = parts[1];
 
-        List<String> friendlyNames = new ArrayList<>();
+        int index = filterQuery.indexOf(":");
+        String key = filterQuery.substring(0,index);
+        String value = filterQuery.substring(index+1);
 
+        // friendlyNames get 2 entries : key and value
+        List<String> friendlyNames = new ArrayList<>(2);
+
+        // Get dataset field friendly name from default ressource bundle file
         String datasetfieldFriendyName = datasetfieldFriendlyNamesBySolrField.get(key);
         if (datasetfieldFriendyName != null) {
             friendlyNames.add(datasetfieldFriendyName);
         } else {
+            // Get non dataset field friendly name from "staticSearchFields" resource bundle file
             String nonDatasetSolrField = staticSolrFieldFriendlyNamesBySolrField.get(key);
             if (nonDatasetSolrField != null) {
                 friendlyNames.add(nonDatasetSolrField);
-            } else if (key.equals(SearchFields.PUBLICATION_STATUS)) {
-                /**
-                 * @todo Refactor this quick fix for
-                 * https://github.com/IQSS/dataverse/issues/618 . We really need
-                 * to get rid of all the reflection that's happening with
-                 * solrQueryResponse.getStaticSolrFieldFriendlyNamesBySolrField()
-                 * and
-                 */
-                friendlyNames.add("Publication Status");
             } else {
                 // meh. better than nuthin'
                 friendlyNames.add(key);
             }
         }
+
         String noLeadingQuote = value.replaceAll("^\"", "");
         String noTrailingQuote = noLeadingQuote.replaceAll("\"$", "");
         String valueWithoutQuotes = noTrailingQuote;
-        friendlyNames.add(valueWithoutQuotes);
+
+        if (key.equals(SearchFields.METADATA_TYPES) && getDataverse() != null && getDataverse().getMetadataBlockFacets() != null) {
+            Optional<String> friendlyName = getDataverse().getMetadataBlockFacets()
+                    .stream()
+                    .filter(block -> block.getMetadataBlock().getName().equals(valueWithoutQuotes))
+                    .findFirst()
+                    .map(block -> block.getMetadataBlock().getLocaleDisplayFacet());
+            logger.fine(String.format("action=getFriendlyNamesFromFilterQuery key=%s value=%s friendlyName=%s", key, value, friendlyName));
+            if (friendlyName.isPresent()) {
+                friendlyNames.add(friendlyName.get());
+                return friendlyNames;
+            }
+        } else if (key.equals(SearchFields.DATASET_LICENSE)) {
+            try {
+                friendlyNames.add(BundleUtil.getStringFromPropertyFile("license." + valueWithoutQuotes.toLowerCase().replace(" ","_") + ".name", "License"));
+            } catch (Exception e) {
+                logger.fine(String.format("action=getFriendlyNamesFromFilterQuery cannot find friendlyName for key=%s value=%s", key, value));
+            }
+        }
+
+        // Get value friendly name from default ressource bundle file
+        String valueFriendlyName;
+        try {
+            valueFriendlyName = BundleUtil.getStringFromPropertyFile(noTrailingQuote, "Bundle");
+        } catch (MissingResourceException e) {
+            valueFriendlyName = noTrailingQuote;
+        }
+
+        friendlyNames.add(valueFriendlyName);
         return friendlyNames;
     }
+    
+    public Long getFieldTypeId(String friendlyName) {
+        List<DatasetFieldType> types = datasetFieldService.findAllFacetableFieldTypes();
+        for (DatasetFieldType type : types) {
+            if (datasetfieldFriendlyNamesBySolrField.get(type.getSolrField().getNameFacetable()).equals(friendlyName)) {
+                return type.getId();
+            }
+        }
+        return null;
+    }
 
     public String getNewSelectedTypes(String typeClicked) {
         List<String> newTypesSelected = new ArrayList<>();
@@ -1155,55 +1364,58 @@ public SearchException getSearchException() {
     }
 
     public String tabularDataDisplayInfo(DataFile datafile) {
-        String ret = "";
+        String tabInfo = "";
 
         if (datafile == null) {
-            return null;
+            return "";
         }
 
         if (datafile.isTabularData() && datafile.getDataTable() != null) {
             DataTable datatable = datafile.getDataTable();
-            String unf = datatable.getUnf();
             Long varNumber = datatable.getVarQuantity();
             Long obsNumber = datatable.getCaseQuantity();
             if (varNumber != null && varNumber.intValue() != 0) {
-                ret = ret.concat(varNumber + " Variables");
+                tabInfo = tabInfo.concat(varNumber + " " + BundleUtil.getStringFromBundle("file.metaData.dataFile.dataTab.variables"));
                 if (obsNumber != null && obsNumber.intValue() != 0) {
-                    ret = ret.concat(", " + obsNumber + " Observations");
+                    tabInfo = tabInfo.concat(", " + obsNumber + " " + BundleUtil.getStringFromBundle("file.metaData.dataFile.dataTab.observations"));
                 }
-                ret = ret.concat(" - ");
-            }
-            if (unf != null && !unf.equals("")) {
-                ret = ret.concat("UNF: " + unf);
             }
         }
 
-        return ret;
+        return tabInfo;
     }
+    
+    public String tabularDataUnfDisplay(DataFile datafile) {
+        String tabUnf = "";
 
-    public String dataFileSizeDisplay(DataFile datafile) {
         if (datafile == null) {
             return "";
         }
 
-        return datafile.getFriendlySize();
+        if (datafile.isTabularData() && datafile.getDataTable() != null) {
+            DataTable datatable = datafile.getDataTable();
+            String unf = datatable.getUnf();
+            if (unf != null && !unf.equals("")) {
+                tabUnf = tabUnf.concat(unf);
+            }
+        }
 
+        return tabUnf;
     }
 
-    public String dataFileChecksumDisplay(DataFile datafile) {
+    public String dataFileSizeDisplay(DataFile datafile) {
         if (datafile == null) {
             return "";
         }
 
-        if (datafile.getChecksumValue() != null && !StringUtils.isEmpty(datafile.getChecksumValue())) {
-            if (datafile.getChecksumType() != null) {
-                return " " + datafile.getChecksumType() + ": " + datafile.getChecksumValue() + " ";
-            }
-        }
+        return datafile.getFriendlySize();
 
-        return "";
     }
 
+    public boolean canPublishDataset(Long datasetId){
+        return permissionsWrapper.canIssuePublishDatasetCommand(dvObjectService.findDvObject(datasetId));
+    }
+    
     public void setDisplayCardValues() {
 
         Set<Long> harvestedDatasetIds = null;
@@ -1220,7 +1432,7 @@ public void setDisplayCardValues() {
                 result.setImageUrl(thumbnailServiceWrapper.getDataverseCardImageAsBase64Url(result));
             } else if (result.getType().equals("datasets")) {
                 if (result.getEntity() != null) {
-                    result.setImageUrl(thumbnailServiceWrapper.getDatasetCardImageAsBase64Url(result));
+                    result.setImageUrl(thumbnailServiceWrapper.getDatasetCardImageAsUrl(result));
                 }
                 
                 if (result.isHarvested()) {
@@ -1276,7 +1488,7 @@ public void setDisplayCardValues() {
                 if (dataverse.getId().equals(result.getParentIdAsLong())) {
                     // definitely NOT linked:
                     result.setIsInTree(true);
-                } else if (result.getParentIdAsLong() == dataverseService.findRootDataverse().getId()) {
+                } else if (result.getParentIdAsLong().equals(settingsWrapper.getRootDataverse().getId())) {
                     // the object's parent is the root Dv; and the current 
                     // Dv is NOT root... definitely linked:
                     result.setIsInTree(false);
@@ -1306,6 +1518,50 @@ public void setDisplayCardValues() {
         
     }
     
+    public boolean isActivelyEmbargoed(SolrSearchResult result) {
+        Long embargoEndDate = result.getEmbargoEndDate();
+        if(embargoEndDate != null) {
+            return LocalDate.now().toEpochDay() < embargoEndDate;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isRetentionExpired(SolrSearchResult result) {
+        Long retentionEndDate = result.getRetentionEndDate();
+        if(retentionEndDate != null) {
+            return LocalDate.now().toEpochDay() > retentionEndDate;
+        } else {
+            return false;
+        }
+    }
+    
+    private DataverseRequest getDataverseRequest() {
+        final HttpServletRequest httpServletRequest = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
+        return new DataverseRequest(session.getUser(), httpServletRequest);
+    }
+
+    public boolean isValid(SolrSearchResult result) {
+        return result.isValid(x -> {
+            Long id = x.getEntityId();
+            DvObject obj = dvObjectService.findDvObject(id);
+            if(obj != null && obj instanceof Dataset) {
+                return permissionsWrapper.canUpdateDataset(getDataverseRequest(), (Dataset) obj);
+            }
+            logger.fine("isValid called for dvObject that is null (or not a dataset), id: " + id + "This can occur if a dataset is deleted while a search is in progress");
+            return true;
+        });
+    }
+    
+    public boolean canSeeCurationStatus(Long datasetId) {
+        boolean creatorsCanSeeStatus = JvmSettings.UI_SHOW_CURATION_STATUS_TO_ALL.lookupOptional(Boolean.class).orElse(false);
+        if (creatorsCanSeeStatus) {
+            return permissionsWrapper.canViewUnpublishedDataset(getDataverseRequest(),(Dataset) dvObjectService.findDvObject(datasetId));
+        } else {
+            return canPublishDataset(datasetId);
+        }
+    }
+
     public enum SortOrder {
 
         asc, desc
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchPermissionsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchPermissionsServiceBean.java
index e96164d442d..c25a462efab 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchPermissionsServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchPermissionsServiceBean.java
@@ -1,5 +1,6 @@
 package edu.harvard.iq.dataverse.search;
 
+import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.Dataverse;
@@ -20,11 +21,10 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
 
 /**
  * Determine whether items should be searchable.
@@ -52,9 +52,6 @@ public class SearchPermissionsServiceBean {
     @EJB
     SettingsServiceBean settingsService;
 
-    LinkedHashMap<String, RoleAssignee> roleAssigneeCache = new LinkedHashMap<>(100, 0.7f, true);
-    private static final int MAX_CACHE_SIZE = 2000;
-
     /**
      * @todo Should we make a PermStrings object? Probably.
      *
@@ -65,65 +62,29 @@ public List<String> findDataversePerms(Dataverse dataverse) {
         if (hasBeenPublished(dataverse)) {
             permStrings.add(IndexServiceBean.getPublicGroupString());
         }
-//        permStrings.addAll(findDirectAssignments(dataverse));
-//        permStrings.addAll(findImplicitAssignments(dataverse));
         permStrings.addAll(findDvObjectPerms(dataverse));
         return permStrings;
     }
-
+    
     public List<String> findDatasetVersionPerms(DatasetVersion version) {
         List<String> perms = new ArrayList<>();
         if (version.isReleased()) {
             perms.add(IndexServiceBean.getPublicGroupString());
         }
-//        perms.addAll(findDirectAssignments(version.getDataset()));
-//        perms.addAll(findImplicitAssignments(version.getDataset()));
+
         perms.addAll(findDvObjectPerms(version.getDataset()));
         return perms;
     }
 
     public List<String> findDvObjectPerms(DvObject dvObject) {
         List<String> permStrings = new ArrayList<>();
-        resetRoleAssigneeCache();
-        Set<RoleAssignment> roleAssignments = rolesSvc.rolesAssignments(dvObject);
-        for (RoleAssignment roleAssignment : roleAssignments) {
-            logger.fine("role assignment on dvObject " + dvObject.getId() + ": " + roleAssignment.getAssigneeIdentifier());
-            if (roleAssignment.getRole().permissions().contains(getRequiredSearchPermission(dvObject))) {
-                RoleAssignee userOrGroup = getRoleAssignee(roleAssignment.getAssigneeIdentifier());
-                String indexableUserOrGroupPermissionString = getIndexableStringForUserOrGroup(userOrGroup);
-                if (indexableUserOrGroupPermissionString != null) {
-                    permStrings.add(indexableUserOrGroupPermissionString);
-                }
-            }
-        }
-        resetRoleAssigneeCache();
-        return permStrings;
-    }
+        Permission p = getRequiredSearchPermission(dvObject);
 
-    private void resetRoleAssigneeCache() {
-        roleAssigneeCache.clear();
-    }
-
-    private RoleAssignee getRoleAssignee(String idtf) {
-        RoleAssignee ra = roleAssigneeCache.get(idtf);
-        if (ra != null) {
-            return ra;
-        }
-        ra = roleAssigneeService.getRoleAssignee(idtf);
-        roleAssigneeCache.put(idtf, ra);
-        if (roleAssigneeCache.size() > MAX_CACHE_SIZE) {
-            roleAssigneeCache.remove(roleAssigneeCache.keySet().iterator().next());
-        }
-        return ra;
-    }
-
-    @Deprecated
-    private List<String> findDirectAssignments(DvObject dvObject) {
-        List<String> permStrings = new ArrayList<>();
-        List<RoleAssignee> roleAssignees = findWhoHasDirectAssignments(dvObject);
-        for (RoleAssignee roleAssignee : roleAssignees) {
-            logger.fine("user or group (findDirectAssignments): " + roleAssignee.getIdentifier());
-            String indexableUserOrGroupPermissionString = getIndexableStringForUserOrGroup(roleAssignee);
+       List<String> assigneeIdStrings = null;
+           assigneeIdStrings = roleAssigneeService.findAssigneesWithPermissionOnDvObject(dvObject.getId(), p);
+        for (String id : assigneeIdStrings) {
+            RoleAssignee userOrGroup = roleAssigneeService.getRoleAssignee(id);
+            String indexableUserOrGroupPermissionString = getIndexableStringForUserOrGroup(userOrGroup);
             if (indexableUserOrGroupPermissionString != null) {
                 permStrings.add(indexableUserOrGroupPermissionString);
             }
@@ -131,46 +92,6 @@ private List<String> findDirectAssignments(DvObject dvObject) {
         return permStrings;
     }
 
-    @Deprecated
-    private List<RoleAssignee> findWhoHasDirectAssignments(DvObject dvObject) {
-        List<RoleAssignee> emptyList = new ArrayList<>();
-        List<RoleAssignee> peopleWhoCanSearch = emptyList;
-        resetRoleAssigneeCache();
-
-        List<RoleAssignment> assignmentsOn = permissionService.assignmentsOn(dvObject);
-        for (RoleAssignment roleAssignment : assignmentsOn) {
-            if (roleAssignment.getRole().permissions().contains(getRequiredSearchPermission(dvObject))) {
-                RoleAssignee userOrGroup = getRoleAssignee(roleAssignment.getAssigneeIdentifier());
-                if (userOrGroup != null) {
-                    peopleWhoCanSearch.add(userOrGroup);
-                }
-            }
-        }
-        resetRoleAssigneeCache();
-        return peopleWhoCanSearch;
-    }
-
-    @Deprecated
-    private List<String> findImplicitAssignments(DvObject dvObject) {
-        List<String> permStrings = new ArrayList<>();
-        DvObject parent = dvObject.getOwner();
-        while (parent != null) {
-            if (respectPermissionRoot()) {
-                if (parent.isEffectivelyPermissionRoot()) {
-                    return permStrings;
-                }
-            }
-            if (parent.isInstanceofDataverse()) {
-                permStrings.addAll(findDirectAssignments(parent));
-            } else if (parent.isInstanceofDataset()) {
-                // files get discoverability from their parent dataset
-                permStrings.addAll(findDirectAssignments(parent));
-            }
-            parent = parent.getOwner();
-        }
-        return permStrings;
-    }
-
     public Map<DatasetVersion.VersionState, Boolean> getDesiredCards(Dataset dataset) {
         Map<DatasetVersion.VersionState, Boolean> desiredCards = new LinkedHashMap<>();
         DatasetVersion latestVersion = dataset.getLatestVersion();
@@ -230,13 +151,6 @@ private Permission getRequiredSearchPermission(DvObject dvObject) {
 
     }
 
-    @Deprecated
-    private boolean respectPermissionRoot() {
-        boolean safeDefaultIfKeyNotFound = true;
-        // see javadoc of the key
-        return settingsService.isTrueForKey(SettingsServiceBean.Key.SearchRespectPermissionRoot, safeDefaultIfKeyNotFound);
-    }
-
     /**
      * From a Solr perspective we can't just index any string when we go to do
      * the JOIN to enforce security. (Maybe putting quotes around the string at
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchService.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchService.java
new file mode 100644
index 00000000000..543d3e964dd
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchService.java
@@ -0,0 +1,100 @@
+package edu.harvard.iq.dataverse.search;
+
+import java.util.List;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+
+public interface SearchService {
+
+    String getServiceName();
+    String getDisplayName();
+    
+    /**
+     * Import note: "onlyDataRelatedToMe" relies on filterQueries for providing
+     * access to Private Data for the correct user
+     *
+     * In other words "onlyDataRelatedToMe", negates other filter Queries
+     * related to permissions
+
+     *
+     *
+     * @param dataverseRequest
+     * @param dataverses
+     * @param query
+     * @param filterQueries
+     * @param sortField
+     * @param sortOrder
+     * @param paginationStart
+     * @param onlyDataRelatedToMe
+     * @param numResultsPerPage
+     * @return
+     * @throws SearchException
+     */
+    default SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query,
+            List<String> filterQueries, String sortField, String sortOrder, int paginationStart,
+            boolean onlyDataRelatedToMe, int numResultsPerPage) throws SearchException {
+        return search(dataverseRequest, dataverses, query, filterQueries, sortField, sortOrder, paginationStart, onlyDataRelatedToMe, numResultsPerPage, true, null, null);
+    }
+
+    /**
+     * Import note: "onlyDataRelatedToMe" relies on filterQueries for providing
+     * access to Private Data for the correct user
+     *
+     * In other words "onlyDataRelatedToMe", negates other filter Queries
+     * related to permissions
+     *
+     *
+     * @param dataverseRequest
+     * @param dataverses
+     * @param query
+     * @param filterQueries
+     * @param sortField
+     * @param sortOrder
+     * @param paginationStart
+     * @param onlyDataRelatedToMe
+     * @param numResultsPerPage
+     * @param retrieveEntities - look up dvobject entities with .find() (potentially expensive!)
+     * @param geoPoint e.g. "35,15"
+     * @param geoRadius e.g. "5"
+    
+     * @return
+     * @throws SearchException
+     */
+    default SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query,
+            List<String> filterQueries, String sortField, String sortOrder, int paginationStart,
+            boolean onlyDataRelatedToMe, int numResultsPerPage, boolean retrieveEntities, String geoPoint,
+            String geoRadius) throws SearchException{
+        return search(dataverseRequest, dataverses, query, filterQueries, sortField, sortOrder, paginationStart, onlyDataRelatedToMe, numResultsPerPage, true, null, null, true, true, false);
+    }
+
+    /**
+     * @param dataverseRequest
+     * @param dataverses
+     * @param query
+     * @param filterQueries
+     * @param sortField
+     * @param sortOrder
+     * @param paginationStart
+     * @param onlyDataRelatedToMe
+     * @param numResultsPerPage
+     * @param retrieveEntities - look up dvobject entities with .find() (potentially expensive!)
+     * @param geoPoint e.g. "35,15"
+     * @param geoRadius e.g. "5"
+     * @param addFacets boolean
+     * @param addHighlights boolean
+     * @param addCollections boolean
+     * @return
+     * @throws SearchException
+     */
+    SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query,
+            List<String> filterQueries, String sortField, String sortOrder, int paginationStart,
+            boolean onlyDataRelatedToMe, int numResultsPerPage, boolean retrieveEntities, String geoPoint,
+            String geoRadius, boolean addFacets, boolean addHighlights, boolean addCollections) throws SearchException;
+
+    /** Provide a way for other search engines to use the solr search engine
+     * 
+     * @param solrSearchService
+     */
+    default public void setSolrSearchService(SearchService solrSearchService) {};
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
deleted file mode 100644
index 099176ce036..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
+++ /dev/null
@@ -1,969 +0,0 @@
-package edu.harvard.iq.dataverse.search;
-
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.DatasetFieldConstant;
-import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
-import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseFacet;
-import edu.harvard.iq.dataverse.DvObjectServiceBean;
-import edu.harvard.iq.dataverse.authorization.groups.Group;
-import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
-import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import edu.harvard.iq.dataverse.authorization.users.GuestUser;
-import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
-import edu.harvard.iq.dataverse.authorization.users.User;
-import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.SystemConfig;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.MissingResourceException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.EJBTransactionRolledbackException;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionRolledbackLocalException;
-import javax.inject.Named;
-import javax.persistence.NoResultException;
-import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrQuery.SortClause;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.HttpSolrClient.RemoteSolrException;
-import org.apache.solr.client.solrj.response.FacetField;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.client.solrj.response.RangeFacet;
-import org.apache.solr.client.solrj.response.SpellCheckResponse;
-import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrDocumentList;
-
-@Stateless
-@Named
-public class SearchServiceBean {
-
-    private static final Logger logger = Logger.getLogger(SearchServiceBean.class.getCanonicalName());
-
-    /**
-     * We're trying to make the SearchServiceBean lean, mean, and fast, with as
-     * few injections of EJBs as possible.
-     */
-    /**
-     * @todo Can we do without the DatasetFieldServiceBean?
-     */
-    @EJB
-    DvObjectServiceBean dvObjectService;
-    @EJB
-    DatasetVersionServiceBean datasetVersionService;
-    @EJB
-    DatasetFieldServiceBean datasetFieldService;
-    @EJB
-    GroupServiceBean groupService;
-    @EJB
-    SystemConfig systemConfig;
-    @EJB
-    SolrClientService solrClientService;
-    
-    /**
-     * Import note: "onlyDatatRelatedToMe" relies on filterQueries for providing
-     * access to Private Data for the correct user
-     *
-     * In other words "onlyDatatRelatedToMe", negates other filter Queries
-     * related to permissions
-     *
-     *
-     * @param dataverseRequest
-     * @param dataverses
-     * @param query
-     * @param filterQueries
-     * @param sortField
-     * @param sortOrder
-     * @param paginationStart
-     * @param onlyDatatRelatedToMe
-     * @param numResultsPerPage
-     * @return
-     * @throws SearchException
-     */
-    public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query, List<String> filterQueries, String sortField, String sortOrder, int paginationStart, boolean onlyDatatRelatedToMe, int numResultsPerPage) throws SearchException {
-        return search(dataverseRequest, dataverses, query, filterQueries, sortField, sortOrder, paginationStart, onlyDatatRelatedToMe, numResultsPerPage, true);
-    }
-
-    /**
-     * Import note: "onlyDatatRelatedToMe" relies on filterQueries for providing
-     * access to Private Data for the correct user
-     *
-     * In other words "onlyDatatRelatedToMe", negates other filter Queries
-     * related to permissions
-     *
-     *
-     * @param dataverseRequest
-     * @param dataverses
-     * @param query
-     * @param filterQueries
-     * @param sortField
-     * @param sortOrder
-     * @param paginationStart
-     * @param onlyDatatRelatedToMe
-     * @param numResultsPerPage
-     * @param retrieveEntities - look up dvobject entities with .find() (potentially expensive!)
-     * @return
-     * @throws SearchException
-     */
-    public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query, List<String> filterQueries, String sortField, String sortOrder, int paginationStart, boolean onlyDatatRelatedToMe, int numResultsPerPage, boolean retrieveEntities) throws SearchException {
-
-        if (paginationStart < 0) {
-            throw new IllegalArgumentException("paginationStart must be 0 or greater");
-        }
-        if (numResultsPerPage < 1) {
-            throw new IllegalArgumentException("numResultsPerPage must be 1 or greater");
-        }
-
-        SolrQuery solrQuery = new SolrQuery();
-        query = SearchUtil.sanitizeQuery(query);
-        solrQuery.setQuery(query);
-//        SortClause foo = new SortClause("name", SolrQuery.ORDER.desc);
-//        if (query.equals("*") || query.equals("*:*")) {
-//            solrQuery.setSort(new SortClause(SearchFields.NAME_SORT, SolrQuery.ORDER.asc));
-        solrQuery.setSort(new SortClause(sortField, sortOrder));
-//        } else {
-//            solrQuery.setSort(sortClause);
-//        }
-//        solrQuery.setSort(sortClause);
-        solrQuery.setHighlight(true).setHighlightSnippets(1);
-        Integer fragSize = systemConfig.getSearchHighlightFragmentSize();
-        if (fragSize != null) {
-            solrQuery.setHighlightFragsize(fragSize);
-        }
-        solrQuery.setHighlightSimplePre("<span class=\"search-term-match\">");
-        solrQuery.setHighlightSimplePost("</span>");
-        Map<String, String> solrFieldsToHightlightOnMap = new HashMap<>();
-        // TODO: Do not hard code "Name" etc as English here.
-        solrFieldsToHightlightOnMap.put(SearchFields.NAME, "Name");
-        solrFieldsToHightlightOnMap.put(SearchFields.AFFILIATION, "Affiliation");
-        solrFieldsToHightlightOnMap.put(SearchFields.FILE_TYPE_FRIENDLY, "File Type");
-        solrFieldsToHightlightOnMap.put(SearchFields.DESCRIPTION, "Description");
-        solrFieldsToHightlightOnMap.put(SearchFields.VARIABLE_NAME, "Variable Name");
-        solrFieldsToHightlightOnMap.put(SearchFields.VARIABLE_LABEL, "Variable Label");
-        solrFieldsToHightlightOnMap.put(SearchFields.FILE_TYPE_SEARCHABLE, "File Type");
-        solrFieldsToHightlightOnMap.put(SearchFields.DATASET_PUBLICATION_DATE, "Publication Year");
-        solrFieldsToHightlightOnMap.put(SearchFields.DATASET_PERSISTENT_ID, BundleUtil.getStringFromBundle("advanced.search.datasets.persistentId"));
-        solrFieldsToHightlightOnMap.put(SearchFields.FILE_PERSISTENT_ID, BundleUtil.getStringFromBundle("advanced.search.files.persistentId"));
-        /**
-         * @todo Dataverse subject and affiliation should be highlighted but
-         * this is commented out right now because the "friendly" names are not
-         * being shown on the dataverse cards. See also
-         * https://github.com/IQSS/dataverse/issues/1431
-         */
-//        solrFieldsToHightlightOnMap.put(SearchFields.DATAVERSE_SUBJECT, "Subject");
-//        solrFieldsToHightlightOnMap.put(SearchFields.DATAVERSE_AFFILIATION, "Affiliation");
-        /**
-         * @todo: show highlight on file card?
-         * https://redmine.hmdc.harvard.edu/issues/3848
-         */
-        solrFieldsToHightlightOnMap.put(SearchFields.FILENAME_WITHOUT_EXTENSION, "Filename Without Extension");
-        solrFieldsToHightlightOnMap.put(SearchFields.FILE_TAG_SEARCHABLE, "File Tag");
-        List<DatasetFieldType> datasetFields = datasetFieldService.findAllOrderedById();
-        for (DatasetFieldType datasetFieldType : datasetFields) {
-            String solrField = datasetFieldType.getSolrField().getNameSearchable();
-            String displayName = datasetFieldType.getDisplayName();
-            solrFieldsToHightlightOnMap.put(solrField, displayName);
-        }
-        for (Map.Entry<String, String> entry : solrFieldsToHightlightOnMap.entrySet()) {
-            String solrField = entry.getKey();
-            // String displayName = entry.getValue();
-            solrQuery.addHighlightField(solrField);
-        }
-        solrQuery.setParam("fl", "*,score");
-        solrQuery.setParam("qt", "/select");
-        solrQuery.setParam("facet", "true");
-        /**
-         * @todo: do we need facet.query?
-         */
-        solrQuery.setParam("facet.query", "*");
-        for (String filterQuery : filterQueries) {
-            solrQuery.addFilterQuery(filterQuery);
-        }
-
-
-
-        // -----------------------------------
-        // Facets to Retrieve
-        // -----------------------------------
-//        solrQuery.addFacetField(SearchFields.HOST_DATAVERSE);
-//        solrQuery.addFacetField(SearchFields.AUTHOR_STRING);
-        solrQuery.addFacetField(SearchFields.DATAVERSE_CATEGORY);
-        solrQuery.addFacetField(SearchFields.METADATA_SOURCE);
-//        solrQuery.addFacetField(SearchFields.AFFILIATION);
-        solrQuery.addFacetField(SearchFields.PUBLICATION_YEAR);
-//        solrQuery.addFacetField(SearchFields.CATEGORY);
-//        solrQuery.addFacetField(SearchFields.FILE_TYPE_MIME);
-//        solrQuery.addFacetField(SearchFields.DISTRIBUTOR);
-//        solrQuery.addFacetField(SearchFields.KEYWORD);
-        /**
-         * @todo when a new method on datasetFieldService is available
-         * (retrieveFacetsByDataverse?) only show the facets that the dataverse
-         * in question wants to show (and in the right order):
-         * https://redmine.hmdc.harvard.edu/issues/3490
-         *
-         * also, findAll only returns advancedSearchField = true... we should
-         * probably introduce the "isFacetable" boolean rather than caring about
-         * if advancedSearchField is true or false
-         *
-         */
-
-        //I'm not sure if just adding null here is good for hte permissions system... i think it needs something
-        if(dataverses != null) {
-            for(Dataverse dataverse : dataverses) {
-                // -----------------------------------
-                // PERMISSION FILTER QUERY
-                // -----------------------------------
-                String permissionFilterQuery = this.getPermissionFilterQuery(dataverseRequest, solrQuery, dataverse, onlyDatatRelatedToMe);
-                if (permissionFilterQuery != null) {
-                    solrQuery.addFilterQuery(permissionFilterQuery);
-                }
-                if (dataverse != null) {
-                    for (DataverseFacet dataverseFacet : dataverse.getDataverseFacets()) {
-                        DatasetFieldType datasetField = dataverseFacet.getDatasetFieldType();
-                        solrQuery.addFacetField(datasetField.getSolrField().getNameFacetable());
-                    }
-                }
-            }
-        } else {
-            String permissionFilterQuery = this.getPermissionFilterQuery(dataverseRequest, solrQuery, null, onlyDatatRelatedToMe);
-            if (permissionFilterQuery != null) {
-                solrQuery.addFilterQuery(permissionFilterQuery);
-            }
-        }
-
-        solrQuery.addFacetField(SearchFields.FILE_TYPE);
-        /**
-         * @todo: hide the extra line this shows in the GUI... at least it's
-         * last...
-         */
-        solrQuery.addFacetField(SearchFields.TYPE);
-        solrQuery.addFacetField(SearchFields.FILE_TAG);
-        if (!systemConfig.isPublicInstall()) {
-            solrQuery.addFacetField(SearchFields.ACCESS);
-        }
-        /**
-         * @todo: do sanity checking... throw error if negative
-         */
-        solrQuery.setStart(paginationStart);
-        /**
-         * @todo: decide if year CITATION_YEAR is good enough or if we should
-         * support CITATION_DATE
-         */
-//        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.UK);
-//        calendar.set(2010, 1, 1);
-//        Date start = calendar.getTime();
-//        calendar.set(2013, 1, 1);
-//        Date end = calendar.getTime();
-//        solrQuery.addDateRangeFacet(SearchFields.CITATION_DATE, start, end, "+1MONTH");
-        /**
-         * @todo make this configurable
-         */
-        int thisYear = Calendar.getInstance().get(Calendar.YEAR);
-        /**
-         * @todo: odd or even makes a difference. Couldn't find value of 2014
-         * when this was set to 2000
-         */
-        final int citationYearRangeStart = 1901;
-        final int citationYearRangeEnd = thisYear;
-        final int citationYearRangeSpan = 2;
-        /**
-         * @todo: these are dates and should be "range facets" not "field
-         * facets"
-         *
-         * right now they are lumped in with the datasetFieldService.findAll()
-         * above
-         */
-//        solrQuery.addNumericRangeFacet(SearchFields.PRODUCTION_DATE_YEAR_ONLY, citationYearRangeStart, citationYearRangeEnd, citationYearRangeSpan);
-//        solrQuery.addNumericRangeFacet(SearchFields.DISTRIBUTION_DATE_YEAR_ONLY, citationYearRangeStart, citationYearRangeEnd, citationYearRangeSpan);
-        solrQuery.setRows(numResultsPerPage);
-        logger.fine("Solr query:" + solrQuery);
-
-        // -----------------------------------
-        // Make the solr query
-        // -----------------------------------
-        QueryResponse queryResponse = null;
-        try {
-            queryResponse = solrClientService.getSolrClient().query(solrQuery);
-        } catch (RemoteSolrException ex) {
-            String messageFromSolr = ex.getLocalizedMessage();
-            String error = "Search Syntax Error: ";
-            String stringToHide = "org.apache.solr.search.SyntaxError: ";
-            if (messageFromSolr.startsWith(stringToHide)) {
-                // hide "org.apache.solr..."
-                error += messageFromSolr.substring(stringToHide.length());
-            } else {
-                error += messageFromSolr;
-            }
-            logger.info(error);
-            SolrQueryResponse exceptionSolrQueryResponse = new SolrQueryResponse(solrQuery);
-            exceptionSolrQueryResponse.setError(error);
-
-            // we can't show anything because of the search syntax error
-            long zeroNumResultsFound = 0;
-            long zeroGetResultsStart = 0;
-            List<SolrSearchResult> emptySolrSearchResults = new ArrayList<>();
-            List<FacetCategory> exceptionFacetCategoryList = new ArrayList<>();
-            Map<String, List<String>> emptySpellingSuggestion = new HashMap<>();
-            exceptionSolrQueryResponse.setNumResultsFound(zeroNumResultsFound);
-            exceptionSolrQueryResponse.setResultsStart(zeroGetResultsStart);
-            exceptionSolrQueryResponse.setSolrSearchResults(emptySolrSearchResults);
-            exceptionSolrQueryResponse.setFacetCategoryList(exceptionFacetCategoryList);
-            exceptionSolrQueryResponse.setTypeFacetCategories(exceptionFacetCategoryList);
-            exceptionSolrQueryResponse.setSpellingSuggestionsByToken(emptySpellingSuggestion);
-            return exceptionSolrQueryResponse;
-        } catch (SolrServerException | IOException ex) {
-            throw new SearchException("Internal Dataverse Search Engine Error", ex);
-        }
-
-        SolrDocumentList docs = queryResponse.getResults();
-        List<SolrSearchResult> solrSearchResults = new ArrayList<>();
-
-        /**
-         * @todo refactor SearchFields to a hashmap (or something? put in
-         * database? internationalize?) to avoid the crazy reflection and string
-         * manipulation below
-         */
-        Object searchFieldsObject = new SearchFields();
-        Field[] staticSearchFields = searchFieldsObject.getClass().getDeclaredFields();
-        String titleSolrField = null;
-        try {
-            DatasetFieldType titleDatasetField = datasetFieldService.findByName(DatasetFieldConstant.title);
-            titleSolrField = titleDatasetField.getSolrField().getNameSearchable();
-        } catch (EJBTransactionRolledbackException ex) {
-            logger.info("Couldn't find " + DatasetFieldConstant.title);
-            if (ex.getCause() instanceof TransactionRolledbackLocalException) {
-                if (ex.getCause().getCause() instanceof NoResultException) {
-                    logger.info("Caught NoResultException");
-                }
-            }
-        }
-        Map<String, String> datasetfieldFriendlyNamesBySolrField = new HashMap<>();
-        Map<String, String> staticSolrFieldFriendlyNamesBySolrField = new HashMap<>();
-        String baseUrl = systemConfig.getDataverseSiteUrl();
-
-        //Going through the results
-        for (SolrDocument solrDocument : docs) {
-            String id = (String) solrDocument.getFieldValue(SearchFields.ID);
-            Long entityid = (Long) solrDocument.getFieldValue(SearchFields.ENTITY_ID);
-            String type = (String) solrDocument.getFieldValue(SearchFields.TYPE);
-            float score = (Float) solrDocument.getFieldValue(SearchFields.RELEVANCE);
-            logger.fine("score for " + id + ": " + score);
-            String identifier = (String) solrDocument.getFieldValue(SearchFields.IDENTIFIER);
-            String citation = (String) solrDocument.getFieldValue(SearchFields.DATASET_CITATION);
-            String citationPlainHtml = (String) solrDocument.getFieldValue(SearchFields.DATASET_CITATION_HTML);
-            String persistentUrl = (String) solrDocument.getFieldValue(SearchFields.PERSISTENT_URL);
-            String name = (String) solrDocument.getFieldValue(SearchFields.NAME);
-            String nameSort = (String) solrDocument.getFieldValue(SearchFields.NAME_SORT);
-//            ArrayList titles = (ArrayList) solrDocument.getFieldValues(SearchFields.TITLE);
-            String title = (String) solrDocument.getFieldValue(titleSolrField);
-            Long datasetVersionId = (Long) solrDocument.getFieldValue(SearchFields.DATASET_VERSION_ID);
-            String deaccessionReason = (String) solrDocument.getFieldValue(SearchFields.DATASET_DEACCESSION_REASON);
-//            logger.info("titleSolrField: " + titleSolrField);
-//            logger.info("title: " + title);
-            String filetype = (String) solrDocument.getFieldValue(SearchFields.FILE_TYPE_FRIENDLY);
-            String fileContentType = (String) solrDocument.getFieldValue(SearchFields.FILE_CONTENT_TYPE);
-            Date release_or_create_date = (Date) solrDocument.getFieldValue(SearchFields.RELEASE_OR_CREATE_DATE);
-            String dvTree = (String) solrDocument.getFirstValue(SearchFields.SUBTREE);
-            String identifierOfDataverse = (String) solrDocument.getFieldValue(SearchFields.IDENTIFIER_OF_DATAVERSE);
-            String nameOfDataverse = (String) solrDocument.getFieldValue(SearchFields.DATAVERSE_NAME);
-
-            List<String> matchedFields = new ArrayList<>();
-            List<Highlight> highlights = new ArrayList<>();
-            Map<SolrField, Highlight> highlightsMap = new HashMap<>();
-            Map<SolrField, List<String>> highlightsMap2 = new HashMap<>();
-            Map<String, Highlight> highlightsMap3 = new HashMap<>();
-            if (queryResponse.getHighlighting().get(id) != null) {
-                for (Map.Entry<String, String> entry : solrFieldsToHightlightOnMap.entrySet()) {
-                    String field = entry.getKey();
-                    String displayName = entry.getValue();
-
-                    List<String> highlightSnippets = queryResponse.getHighlighting().get(id).get(field);
-                    if (highlightSnippets != null) {
-                        matchedFields.add(field);
-                        /**
-                         * @todo only SolrField.SolrType.STRING? that's not
-                         * right... knit the SolrField object more into the
-                         * highlighting stuff
-                         */
-                        SolrField solrField = new SolrField(field, SolrField.SolrType.STRING, true, true);
-                        Highlight highlight = new Highlight(solrField, highlightSnippets, displayName);
-                        highlights.add(highlight);
-                        highlightsMap.put(solrField, highlight);
-                        highlightsMap2.put(solrField, highlightSnippets);
-                        highlightsMap3.put(field, highlight);
-                    }
-                }
-
-            }
-            SolrSearchResult solrSearchResult = new SolrSearchResult(query, name);
-            /**
-             * @todo put all this in the constructor?
-             */
-            List<String> states = (List<String>) solrDocument.getFieldValue(SearchFields.PUBLICATION_STATUS);
-            if (states != null) {
-                // set list of all statuses
-                // this method also sets booleans for individual statuses
-                solrSearchResult.setPublicationStatuses(states);
-            }
-//            logger.info(id + ": " + description);
-            solrSearchResult.setId(id);
-            solrSearchResult.setEntityId(entityid);
-            if (retrieveEntities) {
-                solrSearchResult.setEntity(dvObjectService.findDvObject(entityid));
-            }
-            solrSearchResult.setIdentifier(identifier);
-            solrSearchResult.setPersistentUrl(persistentUrl);
-            solrSearchResult.setType(type);
-            solrSearchResult.setScore(score);
-            solrSearchResult.setNameSort(nameSort);
-            solrSearchResult.setReleaseOrCreateDate(release_or_create_date);
-            solrSearchResult.setMatchedFields(matchedFields);
-            solrSearchResult.setHighlightsAsList(highlights);
-            solrSearchResult.setHighlightsMap(highlightsMap);
-            solrSearchResult.setHighlightsAsMap(highlightsMap3);
-            Map<String, String> parent = new HashMap<>();
-            String description = (String) solrDocument.getFieldValue(SearchFields.DESCRIPTION);
-            solrSearchResult.setDescriptionNoSnippet(description);
-            solrSearchResult.setDeaccessionReason(deaccessionReason);
-            solrSearchResult.setDvTree(dvTree);
-
-            String originSource = (String) solrDocument.getFieldValue(SearchFields.METADATA_SOURCE);
-            if (IndexServiceBean.HARVESTED.equals(originSource)) {
-                solrSearchResult.setHarvested(true);
-            }
-
-            /**
-             * @todo start using SearchConstants class here
-             */
-            if (type.equals("dataverses")) {
-                solrSearchResult.setName(name);
-                solrSearchResult.setHtmlUrl(baseUrl + SystemConfig.DATAVERSE_PATH + identifier);
-                // Do not set the ImageUrl, let the search include fragment fill in
-                // the thumbnail, similarly to how the dataset and datafile cards
-                // are handled.
-                //solrSearchResult.setImageUrl(baseUrl + "/api/access/dvCardImage/" + entityid);
-                /**
-                 * @todo Expose this API URL after "dvs" is changed to
-                 * "dataverses". Also, is an API token required for published
-                 * dataverses? Michael: url changed.
-                 */
-//                solrSearchResult.setApiUrl(baseUrl + "/api/dataverses/" + entityid);
-            } else if (type.equals("datasets")) {
-                solrSearchResult.setHtmlUrl(baseUrl + "/dataset.xhtml?globalId=" + identifier);
-                solrSearchResult.setApiUrl(baseUrl + "/api/datasets/" + entityid);
-                //Image url now set via thumbnail api
-                //solrSearchResult.setImageUrl(baseUrl + "/api/access/dsCardImage/" + datasetVersionId);
-                // No, we don't want to set the base64 thumbnails here.
-                // We want to do it inside SearchIncludeFragment, AND ONLY once the rest of the
-                // page has already loaded.
-                //DatasetVersion datasetVersion = datasetVersionService.find(datasetVersionId);
-                //if (datasetVersion != null){
-                //    solrSearchResult.setDatasetThumbnail(datasetVersion.getDataset().getDatasetThumbnail(datasetVersion));
-                //}
-                /**
-                 * @todo Could use getFieldValues (plural) here.
-                 */
-                List<String> datasetDescriptions = (List<String>) solrDocument.getFieldValue(SearchFields.DATASET_DESCRIPTION);
-                if (datasetDescriptions != null) {
-                    String firstDatasetDescription = datasetDescriptions.get(0);
-                    if (firstDatasetDescription != null) {
-                        solrSearchResult.setDescriptionNoSnippet(firstDatasetDescription);
-                    }
-                }
-                solrSearchResult.setDatasetVersionId(datasetVersionId);
-
-                solrSearchResult.setCitation(citation);
-                solrSearchResult.setCitationHtml(citationPlainHtml);
-
-                solrSearchResult.setIdentifierOfDataverse(identifierOfDataverse);
-                solrSearchResult.setNameOfDataverse(nameOfDataverse);
-
-                if (title != null) {
-//                    solrSearchResult.setTitle((String) titles.get(0));
-                    solrSearchResult.setTitle(title);
-                } else {
-                    logger.fine("No title indexed. Setting to empty string to prevent NPE. Dataset id " + entityid + " and version id " + datasetVersionId);
-                    solrSearchResult.setTitle("");
-                }
-                List<String> authors = (List) solrDocument.getFieldValues(DatasetFieldConstant.authorName);
-                if (authors != null) {
-                    solrSearchResult.setDatasetAuthors(authors);
-                }
-            } else if (type.equals("files")) {
-                String parentGlobalId = null;
-                Object parentGlobalIdObject = solrDocument.getFieldValue(SearchFields.PARENT_IDENTIFIER);
-                if (parentGlobalIdObject != null) {
-                    parentGlobalId = (String) parentGlobalIdObject;
-                    parent.put(SolrSearchResult.PARENT_IDENTIFIER, parentGlobalId);
-                }
-                solrSearchResult.setHtmlUrl(baseUrl + "/dataset.xhtml?persistentId=" + parentGlobalId);
-                solrSearchResult.setDownloadUrl(baseUrl + "/api/access/datafile/" + entityid);
-                /**
-                 * @todo We are not yet setting the API URL for files because
-                 * not all files have metadata. Only subsettable files (those
-                 * with a datatable) seem to have metadata. Furthermore, the
-                 * response is in XML whereas the rest of the Search API returns
-                 * JSON.
-                 */
-//                solrSearchResult.setApiUrl(baseUrl + "/api/meta/datafile/" + entityid);
-                //solrSearchResult.setImageUrl(baseUrl + "/api/access/fileCardImage/" + entityid);
-                solrSearchResult.setName(name);
-                solrSearchResult.setFiletype(filetype);
-                solrSearchResult.setFileContentType(fileContentType);
-                Object fileSizeInBytesObject = solrDocument.getFieldValue(SearchFields.FILE_SIZE_IN_BYTES);
-                if (fileSizeInBytesObject != null) {
-                    try {
-                        long fileSizeInBytesLong = (long) fileSizeInBytesObject;
-                        solrSearchResult.setFileSizeInBytes(fileSizeInBytesLong);
-                    } catch (ClassCastException ex) {
-                        logger.info("Could not cast file " + entityid + " to long for " + SearchFields.FILE_SIZE_IN_BYTES + ": " + ex.getLocalizedMessage());
-                    }
-                }
-                solrSearchResult.setFileMd5((String) solrDocument.getFieldValue(SearchFields.FILE_MD5));
-                try {
-                    solrSearchResult.setFileChecksumType(DataFile.ChecksumType.fromString((String) solrDocument.getFieldValue(SearchFields.FILE_CHECKSUM_TYPE)));
-                } catch (IllegalArgumentException ex) {
-                    logger.info("Exception setting setFileChecksumType: " + ex);
-                }
-                solrSearchResult.setFileChecksumValue((String) solrDocument.getFieldValue(SearchFields.FILE_CHECKSUM_VALUE));
-                solrSearchResult.setUnf((String) solrDocument.getFieldValue(SearchFields.UNF));
-                solrSearchResult.setDatasetVersionId(datasetVersionId);
-                List<String> fileCategories = (List) solrDocument.getFieldValues(SearchFields.FILE_TAG);
-                if (fileCategories != null) {
-                    solrSearchResult.setFileCategories(fileCategories);
-                }
-                List<String> tabularDataTags = (List) solrDocument.getFieldValues(SearchFields.TABDATA_TAG);
-                if (tabularDataTags != null) {
-                    Collections.sort(tabularDataTags);
-                    solrSearchResult.setTabularDataTags(tabularDataTags);
-                }
-                String filePID = (String) solrDocument.getFieldValue(SearchFields.FILE_PERSISTENT_ID);
-                if(null != filePID && !"".equals(filePID) && !"".equals("null")) {
-                    solrSearchResult.setFilePersistentId(filePID);
-                }
-            }
-            /**
-             * @todo store PARENT_ID as a long instead and cast as such
-             */
-            parent.put("id", (String) solrDocument.getFieldValue(SearchFields.PARENT_ID));
-            parent.put("name", (String) solrDocument.getFieldValue(SearchFields.PARENT_NAME));
-            parent.put("citation", (String) solrDocument.getFieldValue(SearchFields.PARENT_CITATION));
-            solrSearchResult.setParent(parent);
-            solrSearchResults.add(solrSearchResult);
-        }
-        Map<String, List<String>> spellingSuggestionsByToken = new HashMap<>();
-        SpellCheckResponse spellCheckResponse = queryResponse.getSpellCheckResponse();
-        if (spellCheckResponse != null) {
-            List<SpellCheckResponse.Suggestion> suggestions = spellCheckResponse.getSuggestions();
-            for (SpellCheckResponse.Suggestion suggestion : suggestions) {
-                spellingSuggestionsByToken.put(suggestion.getToken(), suggestion.getAlternatives());
-            }
-        }
-
-        List<FacetCategory> facetCategoryList = new ArrayList<>();
-        List<FacetCategory> typeFacetCategories = new ArrayList<>();
-        boolean hidePublicationStatusFacet = true;
-        boolean draftsAvailable = false;
-        boolean unpublishedAvailable = false;
-        boolean deaccessionedAvailable = false;
-        boolean hideMetadataSourceFacet = true;
-        for (FacetField facetField : queryResponse.getFacetFields()) {
-            FacetCategory facetCategory = new FacetCategory();
-            List<FacetLabel> facetLabelList = new ArrayList<>();
-            int numMetadataSources = 0;
-            String metadataBlockName = "";
-            String datasetFieldName = "";
-            /**
-             * To find the metadata block name to which the facetField belongs to
-             * ===facetField: authorName_ss   metadatablockname : citation
-             * ===facetField: dvCategory  metadatablockname : ""
-             */
-            for (DatasetFieldType datasetField : datasetFields) {
-                String solrFieldNameForDataset = datasetField.getSolrField().getNameFacetable();
-                if (solrFieldNameForDataset != null && facetField.getName().equals(solrFieldNameForDataset)) {
-                    metadataBlockName = datasetField.getMetadataBlock().getName() ;
-                    datasetFieldName = datasetField.getName();
-                    break;
-                }
-            }
-
-
-            for (FacetField.Count facetFieldCount : facetField.getValues()) {
-                /**
-                 * @todo we do want to show the count for each facet
-                 */
-//                logger.info("field: " + facetField.getName() + " " + facetFieldCount.getName() + " (" + facetFieldCount.getCount() + ")");
-                String localefriendlyName = null;
-                if (facetFieldCount.getCount() > 0) {
-                   if(metadataBlockName.length() > 0 ) {
-                       localefriendlyName = getLocaleTitle(datasetFieldName,facetFieldCount.getName(), metadataBlockName);
-                    } else {
-                       try {
-                           localefriendlyName = BundleUtil.getStringFromPropertyFile(facetFieldCount.getName(), "Bundle");
-                       } catch (Exception e) {
-                           localefriendlyName = facetFieldCount.getName();
-                       }
-                   }
-                    FacetLabel facetLabel = new FacetLabel(localefriendlyName, facetFieldCount.getCount());
-                    // quote field facets
-                    facetLabel.setFilterQuery(facetField.getName() + ":\"" + facetFieldCount.getName() + "\"");
-                    facetLabelList.add(facetLabel);
-                    if (facetField.getName().equals(SearchFields.PUBLICATION_STATUS)) {
-                        if (facetFieldCount.getName().equals(IndexServiceBean.getUNPUBLISHED_STRING())) {
-                            unpublishedAvailable = true;
-                        } else if (facetFieldCount.getName().equals(IndexServiceBean.getDRAFT_STRING())) {
-                            draftsAvailable = true;
-                        } else if (facetFieldCount.getName().equals(IndexServiceBean.getDEACCESSIONED_STRING())) {
-                            deaccessionedAvailable = true;
-                        }
-                    }
-                    if (facetField.getName().equals(SearchFields.METADATA_SOURCE)) {
-                        numMetadataSources++;
-                    }
-                }
-            }
-            if (numMetadataSources > 1) {
-                hideMetadataSourceFacet = false;
-            }
-            facetCategory.setName(facetField.getName());
-            // hopefully people will never see the raw facetField.getName() because it may well have an _s at the end
-            facetCategory.setFriendlyName(facetField.getName());
-            // try to find a friendlier name to display as a facet
-            /**
-             * @todo hmm, we thought we wanted the datasetFields array to go
-             * away once we have more granularity than findAll() available per
-             * the todo above but we need a way to lookup by Solr field, so
-             * we'll build a hashmap
-             */
-            for (DatasetFieldType datasetField : datasetFields) {
-                String solrFieldNameForDataset = datasetField.getSolrField().getNameFacetable();
-                String friendlyName = datasetField.getDisplayName();
-                if (solrFieldNameForDataset != null && facetField.getName().endsWith(datasetField.getTmpNullFieldTypeIdentifier())) {
-                    // give it the non-friendly name so we remember to update the reference data script for datasets
-                    facetCategory.setName(facetField.getName());
-                } else if (solrFieldNameForDataset != null && facetField.getName().equals(solrFieldNameForDataset)) {
-                    if (friendlyName != null && !friendlyName.isEmpty()) {
-                        facetCategory.setFriendlyName(friendlyName);
-                        // stop examining available dataset fields. we found a match
-                        break;
-                    }
-                }
-                datasetfieldFriendlyNamesBySolrField.put(datasetField.getSolrField().getNameFacetable(), friendlyName);
-            }
-            /**
-             * @todo get rid of this crazy reflection, per todo above... or
-             * should we... let's put into a hash the friendly names of facet
-             * categories, indexed by Solr field
-             */
-            for (Field fieldObject : staticSearchFields) {
-                String name = fieldObject.getName();
-                String staticSearchField = null;
-                try {
-                    staticSearchField = (String) fieldObject.get(searchFieldsObject);
-                } catch (IllegalArgumentException | IllegalAccessException ex) {
-                    Logger.getLogger(SearchServiceBean.class.getName()).log(Level.SEVERE, null, ex);
-                }
-                if (staticSearchField != null && facetField.getName().equals(staticSearchField)) {
-                    String friendlyName = BundleUtil.getStringFromBundle("staticSearchFields."+staticSearchField);
-                    if(friendlyName != null && friendlyName.length() > 0) {
-                        facetCategory.setFriendlyName(friendlyName);
-                    } else {
-                        String[] parts = name.split("_");
-                        StringBuilder stringBuilder = new StringBuilder();
-                        for (String part : parts) {
-                            stringBuilder.append(getCapitalizedName(part.toLowerCase()) + " ");
-                        }
-                        String friendlyNameWithTrailingSpace = stringBuilder.toString();
-                        friendlyName = friendlyNameWithTrailingSpace.replaceAll(" $", "");
-                        facetCategory.setFriendlyName(friendlyName);
-                    }
-
-//                    logger.info("adding <<<" + staticSearchField + ":" + friendlyName + ">>>");
-                    staticSolrFieldFriendlyNamesBySolrField.put(staticSearchField, friendlyName);
-                    // stop examining the declared/static fields in the SearchFields object. we found a match
-                    break;
-                }
-            }
-
-            facetCategory.setFacetLabel(facetLabelList);
-            if (!facetLabelList.isEmpty()) {
-                if (facetCategory.getName().equals(SearchFields.TYPE)) {
-                    // the "type" facet is special, these are not
-                    typeFacetCategories.add(facetCategory);
-                } else if (facetCategory.getName().equals(SearchFields.PUBLICATION_STATUS)) {
-                    if (unpublishedAvailable || draftsAvailable || deaccessionedAvailable) {
-                        hidePublicationStatusFacet = false;
-                    }
-                    if (!hidePublicationStatusFacet) {
-                        facetCategoryList.add(facetCategory);
-                    }
-                } else if (facetCategory.getName().equals(SearchFields.METADATA_SOURCE)) {
-                    if (!hideMetadataSourceFacet) {
-                        facetCategoryList.add(facetCategory);
-                    }
-                } else {
-                    facetCategoryList.add(facetCategory);
-                }
-            }
-        }
-
-        // for now the only range facet is citation year
-        for (RangeFacet<String, String> rangeFacet : queryResponse.getFacetRanges()) {
-            FacetCategory facetCategory = new FacetCategory();
-            List<FacetLabel> facetLabelList = new ArrayList<>();
-            for (Object rfObj : rangeFacet.getCounts()) {
-                RangeFacet.Count rangeFacetCount = (RangeFacet.Count) rfObj;
-                String valueString = rangeFacetCount.getValue();
-                Integer start = Integer.parseInt(valueString);
-                Integer end = start + Integer.parseInt(rangeFacet.getGap().toString());
-                // to avoid overlapping dates
-                end = end - 1;
-                if (rangeFacetCount.getCount() > 0) {
-                    FacetLabel facetLabel = new FacetLabel(start + "-" + end, new Long(rangeFacetCount.getCount()));
-                    // special [12 TO 34] syntax for range facets
-                    facetLabel.setFilterQuery(rangeFacet.getName() + ":" + "[" + start + " TO " + end + "]");
-                    facetLabelList.add(facetLabel);
-                }
-            }
-            facetCategory.setName(rangeFacet.getName());
-            facetCategory.setFacetLabel(facetLabelList);
-            // reverse to show the newest citation year range at the top
-            List<FacetLabel> facetLabelListReversed = new ArrayList<>();
-            ListIterator<FacetLabel> li = facetLabelList.listIterator(facetLabelList.size());
-            while (li.hasPrevious()) {
-                facetLabelListReversed.add(li.previous());
-            }
-            facetCategory.setFacetLabel(facetLabelListReversed);
-            if (!facetLabelList.isEmpty()) {
-                facetCategoryList.add(facetCategory);
-            }
-        }
-
-        SolrQueryResponse solrQueryResponse = new SolrQueryResponse(solrQuery);
-        solrQueryResponse.setSolrSearchResults(solrSearchResults);
-        solrQueryResponse.setSpellingSuggestionsByToken(spellingSuggestionsByToken);
-        solrQueryResponse.setFacetCategoryList(facetCategoryList);
-        solrQueryResponse.setTypeFacetCategories(typeFacetCategories);
-        solrQueryResponse.setNumResultsFound(queryResponse.getResults().getNumFound());
-        solrQueryResponse.setResultsStart(queryResponse.getResults().getStart());
-        solrQueryResponse.setDatasetfieldFriendlyNamesBySolrField(datasetfieldFriendlyNamesBySolrField);
-        solrQueryResponse.setStaticSolrFieldFriendlyNamesBySolrField(staticSolrFieldFriendlyNamesBySolrField);
-        String[] filterQueriesArray = solrQuery.getFilterQueries();
-        if (filterQueriesArray != null) {
-            // null check added because these tests were failing: mvn test -Dtest=SearchIT
-            List<String> actualFilterQueries = Arrays.asList(filterQueriesArray);
-            logger.fine("actual filter queries: " + actualFilterQueries);
-            solrQueryResponse.setFilterQueriesActual(actualFilterQueries);
-        } else {
-            // how often is this null?
-            logger.info("solrQuery.getFilterQueries() was null");
-        }
-
-        solrQueryResponse.setDvObjectCounts(queryResponse.getFacetField("dvObjectType"));
-        solrQueryResponse.setPublicationStatusCounts(queryResponse.getFacetField("publicationStatus"));
-
-        return solrQueryResponse;
-    }
-
-    public String getLocaleTitle(String title,  String controlledvoc , String propertyfile) {
-
-        String output = "";
-        try {
-            if(controlledvoc != "" ) {
-                output =  BundleUtil.getStringFromPropertyFile("controlledvocabulary." + title +"."+ controlledvoc.toLowerCase().replace(" ","_")  , propertyfile);
-            } else {
-                output = BundleUtil.getStringFromPropertyFile("datasetfieldtype." + title + ".title", propertyfile);
-            }
-        } catch (MissingResourceException e1) {
-            if(controlledvoc != "" ) {
-                return controlledvoc;
-            } else {
-                return title;
-            }
-        }
-
-        if(output != null && output.length() >0) {
-            return output;
-        }
-        else
-            return title;
-    }
-
-
-    public String getCapitalizedName(String name) {
-        return Character.toUpperCase(name.charAt(0)) + name.substring(1);
-    }
-
-    /**
-     * Moved this logic out of the "search" function
-     *
-     * @return
-     */
-    private String getPermissionFilterQuery(DataverseRequest dataverseRequest, SolrQuery solrQuery, Dataverse dataverse, boolean onlyDatatRelatedToMe) {
-
-        User user = dataverseRequest.getUser();
-        if (user == null) {
-            throw new NullPointerException("user cannot be null");
-        }
-        if (solrQuery == null) {
-            throw new NullPointerException("solrQuery cannot be null");
-        }
-        /**
-         * @todo For people who are not logged in, should we show stuff indexed
-         * with "AllUsers" group or not? If so, uncomment the allUsersString
-         * stuff below.
-         */
-//        String allUsersString = IndexServiceBean.getGroupPrefix() + AllUsers.get().getAlias();
-//        String publicOnly = "{!join from=" + SearchFields.DEFINITION_POINT + " to=id}" + SearchFields.DISCOVERABLE_BY + ":(" + IndexServiceBean.getPublicGroupString() + " OR " + allUsersString + ")";
-        String publicOnly = "{!join from=" + SearchFields.DEFINITION_POINT + " to=id}" + SearchFields.DISCOVERABLE_BY + ":(" + IndexServiceBean.getPublicGroupString() + ")";
-//        String publicOnly = "{!join from=" + SearchFields.GROUPS + " to=" + SearchFields.PERMS + "}id:" + IndexServiceBean.getPublicGroupString();
-        // initialize to public only to be safe
-        String dangerZoneNoSolrJoin = null;
-
-        if (user instanceof PrivateUrlUser) {
-            user = GuestUser.get();
-        }
-
-        // ----------------------------------------------------
-        // (1) Is this a GuestUser?
-        // Yes, see if GuestUser is part of any groups such as IP Groups.
-        // ----------------------------------------------------
-        if (user instanceof GuestUser) {
-            String groupsFromProviders = "";
-            Set<Group> groups = groupService.collectAncestors(groupService.groupsFor(dataverseRequest));
-            StringBuilder sb = new StringBuilder();
-            for (Group group : groups) {
-                logger.fine("found group " + group.getIdentifier() + " with alias " + group.getAlias());
-                String groupAlias = group.getAlias();
-                if (groupAlias != null && !groupAlias.isEmpty()) {
-                    sb.append(" OR ");
-                    // i.e. group_builtIn/all-users, ip/ipGroup3
-                    sb.append(IndexServiceBean.getGroupPrefix()).append(groupAlias);
-                }
-            }
-            groupsFromProviders = sb.toString();
-            logger.fine("groupsFromProviders:" + groupsFromProviders);
-            String guestWithGroups = "{!join from=" + SearchFields.DEFINITION_POINT + " to=id}" + SearchFields.DISCOVERABLE_BY + ":(" + IndexServiceBean.getPublicGroupString() + groupsFromProviders + ")";
-            logger.fine(guestWithGroups);
-            return guestWithGroups;
-        }
-
-        // ----------------------------------------------------
-        // (2) Retrieve Authenticated User
-        // ----------------------------------------------------
-        if (!(user instanceof AuthenticatedUser)) {
-            logger.severe("Should never reach here. A User must be an AuthenticatedUser or a Guest");
-            throw new IllegalStateException("A User must be an AuthenticatedUser or a Guest");
-        }
-
-        AuthenticatedUser au = (AuthenticatedUser) user;
-
-        // Logged in user, has publication status facet
-        //
-        solrQuery.addFacetField(SearchFields.PUBLICATION_STATUS);
-
-        // ----------------------------------------------------
-        // (3) Is this a Super User?
-        //      Yes, give back everything
-        // ----------------------------------------------------
-        if (au.isSuperuser()) {
-            // dangerous because this user will be able to see
-            // EVERYTHING in Solr with no regard to permissions!
-
-            return dangerZoneNoSolrJoin;
-        }
-
-        // ----------------------------------------------------
-        // (4) User is logged in AND onlyDatatRelatedToMe == true
-        // Yes, give back everything -> the settings will be in
-        //          the filterqueries given to search
-        // ----------------------------------------------------
-        if (onlyDatatRelatedToMe == true) {
-            if (systemConfig.myDataDoesNotUsePermissionDocs()) {
-                logger.fine("old 4.2 behavior: MyData is not using Solr permission docs");
-                return dangerZoneNoSolrJoin;
-            } else {
-                logger.fine("new post-4.2 behavior: MyData is using Solr permission docs");
-            }
-        }
-
-        // ----------------------------------------------------
-        // (5) Work with Authenticated User who is not a Superuser
-        // ----------------------------------------------------
-        /**
-         * @todo all this code needs cleanup and clarification.
-         */
-        /**
-         * Every AuthenticatedUser is part of a "User Private Group" (UGP), a
-         * concept we borrow from RHEL:
-         * https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/ch-Managing_Users_and_Groups.html#s2-users-groups-private-groups
-         */
-        /**
-         * @todo rename this from publicPlusUserPrivateGroup. Confusing
-         */
-        // safe default: public only
-        String publicPlusUserPrivateGroup = publicOnly;
-//                    + (onlyDatatRelatedToMe ? "" : (publicOnly + " OR "))
-//                    + "{!join from=" + SearchFields.GROUPS + " to=" + SearchFields.PERMS + "}id:" + IndexServiceBean.getGroupPerUserPrefix() + au.getId() + ")";
-
-//            /**
-//             * @todo add onlyDatatRelatedToMe option into the experimental JOIN
-//             * before enabling it.
-//             */
-        /**
-         * From a search perspective, we don't care about if the group was
-         * created within one dataverse or another. We just want a list of *all*
-         * the groups the user is part of. We are greedy. We want all BuiltIn
-         * Groups, Shibboleth Groups, IP Groups, "system" groups, everything.
-         *
-         * A JOIN on "permission documents" will determine if the user can find
-         * a given "content document" (dataset version, etc) in Solr.
-         */
-        String groupsFromProviders = "";
-        Set<Group> groups = groupService.collectAncestors(groupService.groupsFor(dataverseRequest));
-        StringBuilder sb = new StringBuilder();
-        for (Group group : groups) {
-            logger.fine("found group " + group.getIdentifier() + " with alias " + group.getAlias());
-            String groupAlias = group.getAlias();
-            if (groupAlias != null && !groupAlias.isEmpty()) {
-                sb.append(" OR ");
-                // i.e. group_builtIn/all-users, group_builtIn/authenticated-users, group_1-explictGroup1, group_shib/2
-                sb.append(IndexServiceBean.getGroupPrefix() + groupAlias);
-            }
-        }
-        groupsFromProviders = sb.toString();
-
-        logger.fine(groupsFromProviders);
-        if (true) {
-            /**
-             * @todo get rid of "experimental" in name
-             */
-            String experimentalJoin = "{!join from=" + SearchFields.DEFINITION_POINT + " to=id}" + SearchFields.DISCOVERABLE_BY + ":(" + IndexServiceBean.getPublicGroupString() + " OR " + IndexServiceBean.getGroupPerUserPrefix() + au.getId() + groupsFromProviders + ")";
-            publicPlusUserPrivateGroup = experimentalJoin;
-        }
-
-        //permissionFilterQuery = publicPlusUserPrivateGroup;
-        logger.fine(publicPlusUserPrivateGroup);
-
-        return publicPlusUserPrivateGroup;
-
-    }
-
-}
-
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceFactory.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceFactory.java
new file mode 100644
index 00000000000..8d86919756b
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceFactory.java
@@ -0,0 +1,113 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.Singleton;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@Singleton
+public class SearchServiceFactory {
+
+    private static final Logger logger = Logger.getLogger(SearchServiceFactory.class.getCanonicalName());
+
+    @Inject
+    private BeanManager beanManager;
+    
+    @Inject
+    SettingsServiceBean settingsService;
+    
+    private SearchService solrSearchService;
+    public static String INTERNAL_SOLR_SERVICE_NAME = "solr";
+
+    private Map<String, SearchService> serviceMap = new HashMap<>();
+
+    @PostConstruct
+    public void init() {
+        loadSearchServices();
+    }
+
+    private void loadSearchServices() {
+        // Load built-in services
+        Set<Bean<?>> beans = beanManager.getBeans(SearchService.class);
+        for (Bean<?> bean : beans) {
+            SearchService service = (SearchService) beanManager.getReference(bean, SearchService.class,
+                    beanManager.createCreationalContext(bean));
+            if (INTERNAL_SOLR_SERVICE_NAME.equals(service.getServiceName())) {
+                //May be a proxy and not a SolrSearchServiceBean at this point
+                solrSearchService = service;
+                serviceMap.put(service.getServiceName(), service);
+                logger.log(Level.INFO, "Loaded built-in search service: {0}", service.getServiceName());
+            } else {
+                logger.warning(service.getServiceName() + " found in Dataverse war - will not be loaded");
+            }
+        }
+
+        // Load external services
+        Optional<String> searchServicePathSetting = JvmSettings.SEARCHSERVICES_DIRECTORY.lookupOptional(String.class);
+        if (searchServicePathSetting.isPresent()) {
+            Path servicesDir = Paths.get(searchServicePathSetting.get());
+            List<URL> jarUrls = new ArrayList<>();
+
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(servicesDir, "*.jar")) {
+                for (Path path : stream) {
+                    jarUrls.add(new URL("jar:" + path.toUri().toURL() + "!/"));
+                }
+            } catch (IOException e) {
+                logger.warning("Problem accessing external Search Services: " + e.getLocalizedMessage());
+            }
+
+            for (URL jarUrl : jarUrls) {
+                URLClassLoader cl = URLClassLoader.newInstance(new URL[]{jarUrl}, this.getClass().getClassLoader());
+                ServiceLoader<SearchService> loader = ServiceLoader.load(SearchService.class, cl);
+
+                for (SearchService service : loader) {
+                    if (!serviceMap.containsKey(service.getServiceName())) {
+                        if(service instanceof ConfigurableSearchService extSearch) {
+                            extSearch.setSettingsService(settingsService);
+                        }
+                        serviceMap.put(service.getServiceName(), service);
+                        logger.log(Level.INFO, "Loaded external search service: {0}", service.getServiceName());
+                    }
+                }
+            }
+        }
+        for (String service : getAvailableServices().keySet()) {
+            logger.log(Level.FINE, "Setting solr search service for: {0}", service);
+            getSearchService(service).setSolrSearchService(solrSearchService);
+        }
+
+    }
+
+    public SearchService getSearchService(String name) {
+        SearchService service = serviceMap.get(name);
+        if (service == null) {
+            throw new IllegalArgumentException("Unknown search service: " + name);
+        }
+        service.setSolrSearchService(solrSearchService);
+        return service;
+    }
+
+    public SearchService getDefaultSearchService() {
+        String defaultService = JvmSettings.DEFAULT_SEARCH_SERVICE.lookupOptional().orElse(INTERNAL_SOLR_SERVICE_NAME);
+        logger.log(Level.FINE, "Using default search service: {0}", defaultService);
+        return getSearchService(defaultService);
+    }
+
+    public Map<String, SearchService> getAvailableServices() {
+        return serviceMap;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchUtil.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchUtil.java
index a8e013f3ca3..adcc5825766 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchUtil.java
@@ -5,7 +5,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.common.SolrInputDocument;
 
 public class SearchUtil {
@@ -117,6 +117,10 @@ public static String determineFinalQuery(String userSuppliedQuery) {
     }
 
     public static String constructQuery(String solrField, String userSuppliedQuery) {
+       return constructQuery(solrField, userSuppliedQuery, false);
+    }
+    
+    public static String constructQuery(String solrField, String userSuppliedQuery, boolean addQuotes) {
 
         StringBuilder queryBuilder = new StringBuilder();
         String delimiter = "[\"]+";
@@ -134,7 +138,12 @@ public static String constructQuery(String solrField, String userSuppliedQuery)
             } else {
                 StringTokenizer st = new StringTokenizer(userSuppliedQuery);
                 while (st.hasMoreElements()) {
-                    queryStrings.add(solrField + ":" + st.nextElement());
+                    String nextElement = (String) st.nextElement();
+                    //Entries such as URIs will get tokenized into individual words by solr unless they are in quotes
+                    if(addQuotes) {
+                        nextElement = "\"" + nextElement + "\"";
+                    }
+                    queryStrings.add(solrField + ":" + nextElement);
                 }
             }
         }
@@ -181,5 +190,49 @@ public static String constructQuery(List<String> queryStrings, boolean isAnd, bo
 
         return queryBuilder.toString().trim();
     }
-    
+
+    /**
+     * @return Null if supplied point is null or whitespace.
+     * @throws IllegalArgumentException If the lat/long is not separated by a
+     * comma.
+     * @throws NumberFormatException If the lat/long values are not numbers.
+     */
+    public static String getGeoPoint(String userSuppliedGeoPoint) throws IllegalArgumentException, NumberFormatException {
+        if (userSuppliedGeoPoint == null || userSuppliedGeoPoint.isBlank()) {
+            return null;
+        }
+        String[] parts = userSuppliedGeoPoint.split(",");
+        // We'll supply our own errors but Solr gives a decent one:
+        // "Point must be in 'lat, lon' or 'x y' format: 42.3;-71.1"
+        if (parts.length != 2) {
+            String msg = "Must contain a single comma to separate latitude and longitude.";
+            throw new IllegalArgumentException(msg);
+        }
+        float latitude = Float.parseFloat(parts[0]);
+        float longitude = Float.parseFloat(parts[1]);
+        return latitude + "," + longitude;
+    }
+
+    /**
+     * @return Null if supplied radius is null or whitespace.
+     * @throws NumberFormatException If the radius is not a positive number.
+     */
+    public static String getGeoRadius(String userSuppliedGeoRadius) throws NumberFormatException {
+        if (userSuppliedGeoRadius == null || userSuppliedGeoRadius.isBlank()) {
+            return null;
+        }
+        float radius = 0;
+        try {
+            radius = Float.parseFloat(userSuppliedGeoRadius);
+        } catch (NumberFormatException ex) {
+            String msg = "Non-number radius supplied.";
+            throw new NumberFormatException(msg);
+        }
+        if (radius <= 0) {
+            String msg = "The supplied radius must be greater than zero.";
+            throw new NumberFormatException(msg);
+        }
+        return userSuppliedGeoRadius;
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrClientIndexService.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrClientIndexService.java
new file mode 100644
index 00000000000..0b7f1aae798
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrClientIndexService.java
@@ -0,0 +1,49 @@
+package edu.harvard.iq.dataverse.search;
+
+import java.util.logging.Logger;
+
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.impl.ConcurrentUpdateHttp2SolrClient;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.ejb.Singleton;
+import jakarta.inject.Named;
+
+/**
+ * Solr client to provide insert/update/delete operations.
+ * Don't use this service with queries to Solr, use {@link SolrClientService} instead.
+ */
+@Named
+@Singleton
+public class SolrClientIndexService extends AbstractSolrClientService {
+
+    private static final Logger logger = Logger.getLogger(SolrClientIndexService.class.getCanonicalName());
+
+    private SolrClient solrClient;
+
+    @PostConstruct
+    public void init() {
+        solrClient = new ConcurrentUpdateHttp2SolrClient.Builder(
+            getSolrUrl(), new Http2SolrClient.Builder().build()).build();
+    }
+
+    @PreDestroy
+    public void close() {
+        close(solrClient);
+    }
+
+    public SolrClient getSolrClient() {
+        // Should never happen - but?
+        if (solrClient == null) {
+            init();
+        }
+        return solrClient;
+    }
+
+    public void setSolrClient(SolrClient solrClient) {
+        this.solrClient = solrClient;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrClientService.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrClientService.java
index f00ece9aacc..f9d94b8c6d3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SolrClientService.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrClientService.java
@@ -1,59 +1,39 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package edu.harvard.iq.dataverse.search;
 
-import edu.harvard.iq.dataverse.util.SystemConfig;
-import java.io.IOException;
-import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.EJB;
-import javax.ejb.Singleton;
-import javax.inject.Named;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.ejb.Singleton;
+import jakarta.inject.Named;
+import java.util.logging.Logger;
 
 /**
  *
  * @author landreev
  * 
- * This singleton is dedicated to initializing the HttpSolrClient used by the 
- * application to talk to the search engine, and serving it to all the other
- * classes that need it. 
+ * This singleton is dedicated to initializing the Http2SolrClient, used by
+ * the application to talk to the search engine, and serving it to all the
+ * other classes that need it.
  * This ensures that we are using one client only - as recommended by the 
  * documentation. 
  */
 @Named
 @Singleton
-public class SolrClientService {
+public class SolrClientService extends AbstractSolrClientService {
     private static final Logger logger = Logger.getLogger(SolrClientService.class.getCanonicalName());
     
-    @EJB
-    SystemConfig systemConfig;
-    
     private SolrClient solrClient;
     
     @PostConstruct
     public void init() {
-        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr/collection1";
-        solrClient = new HttpSolrClient.Builder(urlString).build();
-        
+        solrClient = new Http2SolrClient.Builder(getSolrUrl()).build();
     }
     
     @PreDestroy
     public void close() {
-        if (solrClient != null) {
-            try {
-                solrClient.close();
-            } catch (IOException e) {
-                logger.warning("Solr closing error: " + e);
-            }
-
-            solrClient = null;
-        }
+        close(solrClient);
     }
 
     public SolrClient getSolrClient() {
@@ -67,9 +47,4 @@ public SolrClient getSolrClient() {
     public void setSolrClient(SolrClient solrClient) {
         this.solrClient = solrClient;
     }
-    
-    public void reInitialize() {
-        close(); 
-        init();
-    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrField.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrField.java
index ca9805b6c57..7092a01beb1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SolrField.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrField.java
@@ -63,7 +63,7 @@ public enum SolrType {
          * support range queries) in
          * https://github.com/IQSS/dataverse/issues/370
          */
-        STRING("string"), TEXT_EN("text_en"), INTEGER("int"), LONG("long"), DATE("text_en"), EMAIL("text_en");
+        STRING("string"), TEXT_EN("text_en"), INTEGER("plong"), FLOAT("pdouble"), DATE("date_range"), EMAIL("text_en");
 
         private String type;
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrIndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrIndexServiceBean.java
index e77d05a9c4c..64679b05beb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SolrIndexServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrIndexServiceBean.java
@@ -4,17 +4,19 @@
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.DvObjectServiceBean;
 import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+
 import java.io.IOException;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -22,17 +24,17 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import org.apache.solr.client.solrj.SolrClient;
+import java.util.stream.Stream;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.apache.solr.client.solrj.response.UpdateResponse;
 import org.apache.solr.common.SolrInputDocument;
 
 @Named
@@ -41,8 +43,6 @@ public class SolrIndexServiceBean {
 
     private static final Logger logger = Logger.getLogger(SolrIndexServiceBean.class.getCanonicalName());
 
-    @EJB
-    SystemConfig systemConfig;
     @EJB
     DvObjectServiceBean dvObjectService;
     @EJB
@@ -52,41 +52,18 @@ public class SolrIndexServiceBean {
     @EJB
     DatasetServiceBean datasetService;
     @EJB
-    DataverseRoleServiceBean rolesSvc;
+    DatasetVersionServiceBean datasetVersionService;
     @EJB
-    IndexServiceBean indexService;
+    DataverseRoleServiceBean rolesSvc;
     @EJB
-    SolrClientService solrClientService;
+    SolrClientIndexService solrClientService;
+    
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    private EntityManager em;
 
     public static String numRowsClearedByClearAllIndexTimes = "numRowsClearedByClearAllIndexTimes";
     public static String messageString = "message";
 
-    /**
-     * @deprecated Now that MyData has shipped in 4.1 we have no plans to change
-     * the unpublishedDataRelatedToMeModeEnabled boolean to false. We should
-     * probably remove the boolean altogether to simplify the code.
-     *
-     * This non-default mode changes the behavior of the "Data Related To Me"
-     * feature to be more like "**Unpublished** Data Related to Me" after you
-     * have changed this boolean to true and run "index all".
-     *
-     * The "Data Related to Me" feature relies on *always* indexing permissions
-     * regardless of if the DvObject is published or not.
-     *
-     * In "Unpublished Data Related to Me" mode, we first check if the DvObject
-     * is published. If it's published, we set the search permissions to *only*
-     * contain "group_public", which is quick and cheap to do. If the DvObject
-     * in question is *not* public, we perform the expensive operation of
-     * rooting around in the system to determine who should be able to
-     * "discover" the unpublished version of DvObject. By default this mode is
-     * *not* enabled. If you want to enable it, change the boolean to true and
-     * run "index all".
-     *
-     * See also https://github.com/IQSS/dataverse/issues/50
-     */
-    @Deprecated
-    private boolean unpublishedDataRelatedToMeModeEnabled = true;
-
     public List<DvObjectSolrDoc> determineSolrDocs(DvObject dvObject) {
         List<DvObjectSolrDoc> emptyList = new ArrayList<>();
         if (dvObject == null) {
@@ -100,9 +77,18 @@ public List<DvObjectSolrDoc> determineSolrDocs(DvObject dvObject) {
             List<DvObjectSolrDoc> datasetSolrDocs = constructDatasetSolrDocs((Dataset) dvObject);
             solrDocs.addAll(datasetSolrDocs);
         } else if (dvObject.isInstanceofDataFile()) {
-            Map<Long, List<String>> permStringByDatasetVersion = new HashMap<>();
-            List<DvObjectSolrDoc> fileSolrDocs = constructDatafileSolrDocs((DataFile) dvObject, permStringByDatasetVersion);
-            solrDocs.addAll(fileSolrDocs);
+            DataFile datafile = (DataFile) dvObject;
+            Map<DatasetVersion.VersionState, Boolean> desiredCards = searchPermissionsService.getDesiredCards(datafile.getOwner());
+            Set<DatasetVersion> datasetVersions = datasetVersionsToBuildCardsFor(datafile.getOwner());
+            for (DatasetVersion version : datasetVersions) {
+                if(desiredCards.containsKey(version.getVersionState()) && desiredCards.get(version.getVersionState()) && datafile.isInDatasetVersion(version)) {
+                            List<String> cachedPerms = searchPermissionsService.findDatasetVersionPerms(version);
+                            String solrIdEnd = getDatasetOrDataFileSolrEnding(version.getVersionState());
+                            Long versionId = version.getId();
+                            DvObjectSolrDoc fileSolrDoc = constructDatafileSolrDoc(new DataFileProxy(datafile.getFileMetadata()),  cachedPerms, versionId, solrIdEnd);
+            solrDocs.add(fileSolrDoc);
+                }
+            }
         } else {
             logger.info("Unexpected DvObject: " + dvObject.getClass().getName());
         }
@@ -129,12 +115,8 @@ private List<DvObjectSolrDoc> determineSolrDocsForFilesFromDataset(Map.Entry<Lon
      */
     private DvObjectSolrDoc constructDataverseSolrDoc(Dataverse dataverse) {
         List<String> perms = new ArrayList<>();
-        if (unpublishedDataRelatedToMeModeEnabled) {
-            if (dataverse.isReleased()) {
-                perms.add(IndexServiceBean.getPublicGroupString());
-            } else {
-                perms = searchPermissionsService.findDataversePerms(dataverse);
-            }
+        if (dataverse.isReleased()) {
+            perms.add(IndexServiceBean.getPublicGroupString());
         } else {
             perms = searchPermissionsService.findDataversePerms(dataverse);
         }
@@ -157,43 +139,16 @@ private List<DvObjectSolrDoc> constructDatasetSolrDocs(Dataset dataset) {
         return solrDocs;
     }
 
-//    private List<DvObjectSolrDoc> constructDatafileSolrDocs(DataFile dataFile) {
-    private List<DvObjectSolrDoc> constructDatafileSolrDocs(DataFile dataFile, Map<Long, List<String>> permStringByDatasetVersion) {
-        List<DvObjectSolrDoc> datafileSolrDocs = new ArrayList<>();
-        Map<DatasetVersion.VersionState, Boolean> desiredCards = searchPermissionsService.getDesiredCards(dataFile.getOwner());
-        for (DatasetVersion datasetVersionFileIsAttachedTo : datasetVersionsToBuildCardsFor(dataFile.getOwner())) {
-            boolean cardShouldExist = desiredCards.get(datasetVersionFileIsAttachedTo.getVersionState());
-            if (cardShouldExist) {
-                String solrIdStart = IndexServiceBean.solrDocIdentifierFile + dataFile.getId();
-                String solrIdEnd = getDatasetOrDataFileSolrEnding(datasetVersionFileIsAttachedTo.getVersionState());
-                String solrId = solrIdStart + solrIdEnd;
-                List<String> perms = new ArrayList<>();
-                if (unpublishedDataRelatedToMeModeEnabled) {
-                    List<String> cachedPerms = null;
-                    if (permStringByDatasetVersion != null) {
-                        cachedPerms = permStringByDatasetVersion.get(datasetVersionFileIsAttachedTo.getId());
-                    }
-                    if (cachedPerms != null) {
-                        logger.fine("reusing cached perms for file " + dataFile.getId());
-                        perms = cachedPerms;
-                    } else if (datasetVersionFileIsAttachedTo.isReleased()) {
-                        logger.fine("no cached perms, file is public/discoverable/searchable for file " + dataFile.getId());
-                        perms.add(IndexServiceBean.getPublicGroupString());
-                    } else {
-                        // go to the well (slow)
-                        logger.fine("no cached perms, file is not public, finding perms for file " + dataFile.getId());
-                        perms = searchPermissionsService.findDatasetVersionPerms(datasetVersionFileIsAttachedTo);
-                    }
-                } else {
-                    // This should never be executed per the deprecation notice on the boolean.
-                    perms = searchPermissionsService.findDatasetVersionPerms(datasetVersionFileIsAttachedTo);
-                }
-                DvObjectSolrDoc dataFileSolrDoc = new DvObjectSolrDoc(dataFile.getId().toString(), solrId, datasetVersionFileIsAttachedTo.getId(), dataFile.getDisplayName(), perms);
-                datafileSolrDocs.add(dataFileSolrDoc);
-            }
+    private DvObjectSolrDoc constructDatafileSolrDoc(DataFileProxy fileProxy, List<String> cachedPerms, long versionId, String solrIdEnd) {
+        String solrIdStart = IndexServiceBean.solrDocIdentifierFile + fileProxy.getFileId();
+        String solrId = solrIdStart + solrIdEnd;
+        List<String> perms = new ArrayList<>();
+        assert(cachedPerms != null);
+        if (cachedPerms != null) {
+            logger.finest("reusing cached perms for file " + fileProxy.getFileId());
+            perms = cachedPerms;
         }
-
-        return datafileSolrDocs;
+        return new DvObjectSolrDoc(fileProxy.getFileId().toString(), solrId, versionId, fileProxy.getName(), perms);
     }
 
     private List<DvObjectSolrDoc> constructDatafileSolrDocsFromDataset(Dataset dataset) {
@@ -203,22 +158,19 @@ private List<DvObjectSolrDoc> constructDatafileSolrDocsFromDataset(Dataset datas
             boolean cardShouldExist = desiredCards.get(datasetVersionFileIsAttachedTo.getVersionState());
             if (cardShouldExist) {
                 List<String> perms = new ArrayList<>();
-                if (unpublishedDataRelatedToMeModeEnabled) {
-                    if (datasetVersionFileIsAttachedTo.isReleased()) {
-                        perms.add(IndexServiceBean.getPublicGroupString());
-                    } else {
-                        perms = searchPermissionsService.findDatasetVersionPerms(datasetVersionFileIsAttachedTo);
-                    }
+                if (datasetVersionFileIsAttachedTo.isReleased()) {
+                    perms.add(IndexServiceBean.getPublicGroupString());
                 } else {
                     perms = searchPermissionsService.findDatasetVersionPerms(datasetVersionFileIsAttachedTo);
                 }
+
                 for (FileMetadata fileMetadata : datasetVersionFileIsAttachedTo.getFileMetadatas()) {
                     Long fileId = fileMetadata.getDataFile().getId();
                     String solrIdStart = IndexServiceBean.solrDocIdentifierFile + fileId;
                     String solrIdEnd = getDatasetOrDataFileSolrEnding(datasetVersionFileIsAttachedTo.getVersionState());
                     String solrId = solrIdStart + solrIdEnd;
                     DvObjectSolrDoc dataFileSolrDoc = new DvObjectSolrDoc(fileId.toString(), solrId, datasetVersionFileIsAttachedTo.getId(), fileMetadata.getLabel(), perms);
-                    logger.fine("adding fileid " + fileId);
+                    logger.finest("adding fileid " + fileId);
                     datafileSolrDocs.add(dataFileSolrDoc);
                 }
             }
@@ -245,12 +197,8 @@ private DvObjectSolrDoc makeDatasetSolrDoc(DatasetVersion version) {
         String solrId = solrIdStart + solrIdEnd;
         String name = version.getTitle();
         List<String> perms = new ArrayList<>();
-        if (unpublishedDataRelatedToMeModeEnabled) {
-            if (version.isReleased()) {
-                perms.add(IndexServiceBean.getPublicGroupString());
-            } else {
-                perms = searchPermissionsService.findDatasetVersionPerms(version);
-            }
+        if (version.isReleased()) {
+            perms.add(IndexServiceBean.getPublicGroupString());
         } else {
             perms = searchPermissionsService.findDatasetVersionPerms(version);
         }
@@ -276,7 +224,7 @@ public IndexResponse indexAllPermissions() {
         Map<Long, List<Long>> filesPerDataset = new HashMap<>();
         List<DvObject> allExceptFiles = dvObjectService.findAll();
         for (DvObject dvObject : allExceptFiles) {
-            logger.info("determining definition points for dvobject id " + dvObject.getId());
+            logger.fine("determining definition points for dvobject id " + dvObject.getId());
             if (dvObject.isInstanceofDataFile()) {
                 Long dataset = dvObject.getOwner().getId();
                 Long datafile = dvObject.getId();
@@ -304,9 +252,9 @@ public IndexResponse indexAllPermissions() {
         }
 
         for (DvObjectSolrDoc dvObjectSolrDoc : definitionPoints) {
-            logger.info("creating solr doc in memory for " + dvObjectSolrDoc.getSolrId());
+            logger.fine("creating solr doc in memory for " + dvObjectSolrDoc.getSolrId());
             SolrInputDocument solrInputDocument = SearchUtil.createSolrDoc(dvObjectSolrDoc);
-            logger.info("adding to list of docs to index " + dvObjectSolrDoc.getSolrId());
+            logger.fine("adding to list of docs to index " + dvObjectSolrDoc.getSolrId());
             docs.add(solrInputDocument);
         }
         try {
@@ -364,27 +312,21 @@ private void persistToSolr(Collection<SolrInputDocument> docs) throws SolrServer
         /**
          * @todo Do something with these responses from Solr.
          */
-        UpdateResponse addResponse = solrClientService.getSolrClient().add(docs);
-        UpdateResponse commitResponse = solrClientService.getSolrClient().commit();
+        solrClientService.getSolrClient().add(docs);
     }
 
-    public IndexResponse indexPermissionsOnSelfAndChildren(long definitionPointId) {
-        DvObject definitionPoint = dvObjectService.findDvObject(definitionPointId);
-        if ( definitionPoint == null ) {
-            logger.log(Level.WARNING, "Cannot find a DvOpbject with id of {0}", definitionPointId);
-            return null;
-        } else {
-            return indexPermissionsOnSelfAndChildren(definitionPoint);
-        }
-    }
-    
     /**
      * We use the database to determine direct children since there is no
      * inheritance
      */
     public IndexResponse indexPermissionsOnSelfAndChildren(DvObject definitionPoint) {
-        List<DvObject> dvObjectsToReindexPermissionsFor = new ArrayList<>();
-        List<DataFile> filesToReindexAsBatch = new ArrayList<>();
+
+        if (definitionPoint == null) {
+            logger.log(Level.WARNING, "Cannot perform indexPermissionsOnSelfAndChildren with a definitionPoint null");
+            return null;
+        }
+        int fileQueryMin= JvmSettings.MIN_FILES_TO_USE_PROXY.lookupOptional(Integer.class).orElse(Integer.MAX_VALUE);
+        List<DataFileProxy> filesToReindexAsBatch = new ArrayList<>();
         /**
          * @todo Re-indexing the definition point itself seems to be necessary
          * for revoke but not necessarily grant.
@@ -392,121 +334,138 @@ public IndexResponse indexPermissionsOnSelfAndChildren(DvObject definitionPoint)
 
         // We don't create a Solr "primary/content" doc for the root dataverse
         // so don't create a Solr "permission" doc either.
+        final int[] counter = {0};
+        int numObjects = 0;
+        long globalStartTime = System.currentTimeMillis();
         if (definitionPoint.isInstanceofDataverse()) {
             Dataverse selfDataverse = (Dataverse) definitionPoint;
             if (!selfDataverse.equals(dataverseService.findRootDataverse())) {
-                dvObjectsToReindexPermissionsFor.add(definitionPoint);
+                indexPermissionsForOneDvObject(definitionPoint);
+                numObjects++;
             }
             List<Dataset> directChildDatasetsOfDvDefPoint = datasetService.findByOwnerId(selfDataverse.getId());
             for (Dataset dataset : directChildDatasetsOfDvDefPoint) {
-                dvObjectsToReindexPermissionsFor.add(dataset);
-                for (DataFile datafile : filesToReIndexPermissionsFor(dataset)) {
-                    filesToReindexAsBatch.add(datafile);
+                indexPermissionsForOneDvObject(dataset);
+                numObjects++;
+
+                Map<DatasetVersion.VersionState, Boolean> desiredCards = searchPermissionsService.getDesiredCards(dataset);
+                long startTime = System.currentTimeMillis();
+                for (DatasetVersion version : versionsToReIndexPermissionsFor(dataset)) {
+                    if (desiredCards.get(version.getVersionState())) {
+                        List<String> cachedPerms = searchPermissionsService.findDatasetVersionPerms(version);
+                        String solrIdEnd = getDatasetOrDataFileSolrEnding(version.getVersionState());
+                        Long versionId = version.getId();
+                        for (FileMetadata fmd : version.getFileMetadatas()) {
+                            DataFileProxy fileProxy = new DataFileProxy(fmd);
+                            // Since reindexFilesInBatches() re-indexes a file in all versions needed, we should not send a file already in the released version twice
+                            filesToReindexAsBatch.add(fileProxy);
+                            counter[0]++;
+                            if (counter[0] % 100 == 0) {
+                                reindexFilesInBatches(filesToReindexAsBatch, cachedPerms, versionId, solrIdEnd);
+                                filesToReindexAsBatch.clear();
+                            }
+                            if (counter[0] % 1000 == 0) {
+                                logger.fine("Progress: " + counter[0] + "files permissions reindexed");
+                            }
+                        }
+
+                        // Re-index any remaining files in the datasetversion (so that verionId, etc. remain constants for all files in the batch)
+                        reindexFilesInBatches(filesToReindexAsBatch, cachedPerms, versionId, solrIdEnd);
+                        logger.info("Progress : dataset " + dataset.getId() + " permissions reindexed in " + (System.currentTimeMillis() - startTime) + " ms");
+                    }
                 }
             }
         } else if (definitionPoint.isInstanceofDataset()) {
-            // index the dataset itself
             indexPermissionsForOneDvObject(definitionPoint);
-            dvObjectsToReindexPermissionsFor.add(definitionPoint);
+            numObjects++;
             // index files
             Dataset dataset = (Dataset) definitionPoint;
-            for (DataFile datafile : filesToReIndexPermissionsFor(dataset)) {
-                filesToReindexAsBatch.add(datafile);
+            Map<DatasetVersion.VersionState, Boolean> desiredCards = searchPermissionsService.getDesiredCards(dataset);
+            for (DatasetVersion version : versionsToReIndexPermissionsFor(dataset)) {
+                if (desiredCards.get(version.getVersionState())) {
+                    List<String> cachedPerms = searchPermissionsService.findDatasetVersionPerms(version);
+                    String solrIdEnd = getDatasetOrDataFileSolrEnding(version.getVersionState());
+                    Long versionId = version.getId();
+                    if (version.getFileMetadatas().size() > fileQueryMin) {
+                        // For large datasets, use a more efficient SQL query instead of loading all file metadata objects
+                        getDataFileInfoForPermissionIndexing(version.getId()).forEach(fileInfo -> {
+                            filesToReindexAsBatch.add(fileInfo);
+                            counter[0]++;
+
+                            if (counter[0] % 100 == 0) {
+                                long startTime = System.currentTimeMillis();
+                                reindexFilesInBatches(filesToReindexAsBatch, cachedPerms, versionId, solrIdEnd);
+                                filesToReindexAsBatch.clear();
+                                logger.fine("Progress: 100 file permissions at " + counter[0] + " files reindexed in " + (System.currentTimeMillis() - startTime) + " ms");
+                            }
+                        });
+                    } else {
+                        version.getFileMetadatas().stream()
+                                .forEach(fmd -> {
+                                    DataFileProxy fileProxy = new DataFileProxy(fmd);
+                                    filesToReindexAsBatch.add(fileProxy);
+                                    counter[0]++;
+                                    if (counter[0] % 100 == 0) {
+                                        long startTime = System.currentTimeMillis();
+                                        reindexFilesInBatches(filesToReindexAsBatch, cachedPerms, versionId, solrIdEnd);
+                                        filesToReindexAsBatch.clear();
+                                        logger.fine("Progress: 100 file permissions at  " + counter[0] + "files reindexed in " + (System.currentTimeMillis() - startTime) + " ms");
+                                    }
+                                });
+                    }
+                    // Re-index any remaining files in the dataset version (versionId, etc. remain constants for all files in the batch)
+                    reindexFilesInBatches(filesToReindexAsBatch, cachedPerms, versionId, solrIdEnd);
+                    filesToReindexAsBatch.clear();
+                }
+
             }
         } else {
-            dvObjectsToReindexPermissionsFor.add(definitionPoint);
+            indexPermissionsForOneDvObject(definitionPoint);
+            numObjects++;
         }
 
         /**
          * @todo Error handling? What to do with response?
          *
-         * @todo Should update timestamps, probably, even thought these are
-         * files, see https://github.com/IQSS/dataverse/issues/2421
+         * @todo Should update timestamps, probably, even thought these are files, see
+         *       https://github.com/IQSS/dataverse/issues/2421
          */
-        String response = reindexFilesInBatches(filesToReindexAsBatch);
-
-        List<String> updatePermissionTimeSuccessStatus = new ArrayList<>();
-        for (DvObject dvObject : dvObjectsToReindexPermissionsFor) {
-            /**
-             * @todo do something with this response
-             */
-            IndexResponse indexResponse = indexPermissionsForOneDvObject(dvObject);
-            DvObject managedDefinitionPoint = dvObjectService.updatePermissionIndexTime(definitionPoint);
-            boolean updatePermissionTimeSuccessful = false;
-            if (managedDefinitionPoint != null) {
-                updatePermissionTimeSuccessful = true;
-            }
-            updatePermissionTimeSuccessStatus.add(dvObject + ":" + updatePermissionTimeSuccessful);
-        }
+        logger.fine("Reindexed permissions for " + counter[0] + " files and " + numObjects + "datasets/collections in " + (System.currentTimeMillis() - globalStartTime) + " ms");
         return new IndexResponse("Number of dvObject permissions indexed for " + definitionPoint
-                + " (updatePermissionTimeSuccessful:" + updatePermissionTimeSuccessStatus
-                + "): " + dvObjectsToReindexPermissionsFor.size()
-        );
+                + ": " + numObjects);
     }
 
-    private String reindexFilesInBatches(List<DataFile> filesToReindexPermissionsFor) {
+    private String reindexFilesInBatches(List<DataFileProxy> filesToReindexAsBatch, List<String> cachedPerms, Long versionId, String solrIdEnd) {
         List<SolrInputDocument> docs = new ArrayList<>();
-        Map<Long, List<Long>> byParentId = new HashMap<>();
-        Map<Long, List<String>> permStringByDatasetVersion = new HashMap<>();
-        for (DataFile file : filesToReindexPermissionsFor) {
-            Dataset dataset = (Dataset) file.getOwner();
-            Map<DatasetVersion.VersionState, Boolean> desiredCards = searchPermissionsService.getDesiredCards(dataset);
-            for (DatasetVersion datasetVersionFileIsAttachedTo : datasetVersionsToBuildCardsFor(dataset)) {
-                boolean cardShouldExist = desiredCards.get(datasetVersionFileIsAttachedTo.getVersionState());
-                if (cardShouldExist) {
-                    List<String> cachedPermission = permStringByDatasetVersion.get(datasetVersionFileIsAttachedTo.getId());
-                    if (cachedPermission == null) {
-                        logger.fine("no cached permission! Looking it up...");
-                        List<DvObjectSolrDoc> fileSolrDocs = constructDatafileSolrDocs((DataFile) file, permStringByDatasetVersion);
-                        for (DvObjectSolrDoc fileSolrDoc : fileSolrDocs) {
-                            Long datasetVersionId = fileSolrDoc.getDatasetVersionId();
-                            if (datasetVersionId != null) {
-                                permStringByDatasetVersion.put(datasetVersionId, fileSolrDoc.getPermissions());
-                                SolrInputDocument solrDoc = SearchUtil.createSolrDoc(fileSolrDoc);
-                                docs.add(solrDoc);
-                            }
-                        }
-                    } else {
-                        logger.fine("cached permission is " + cachedPermission);
-                        List<DvObjectSolrDoc> fileSolrDocsBasedOnCachedPermissions = constructDatafileSolrDocs((DataFile) file, permStringByDatasetVersion);
-                        for (DvObjectSolrDoc fileSolrDoc : fileSolrDocsBasedOnCachedPermissions) {
+        try {
+            // Assume all files have the same owner
+            if (filesToReindexAsBatch.isEmpty()) {
+                return "No files to reindex";
+            }
+
+                    for (DataFileProxy file : filesToReindexAsBatch) {
+
+                            DvObjectSolrDoc fileSolrDoc = constructDatafileSolrDoc(file, cachedPerms, versionId, solrIdEnd);
                             SolrInputDocument solrDoc = SearchUtil.createSolrDoc(fileSolrDoc);
                             docs.add(solrDoc);
-                        }
                     }
-                }
-            }
-            Long parent = file.getOwner().getId();
-            List<Long> existingList = byParentId.get(parent);
-            if (existingList == null) {
-                List<Long> empty = new ArrayList<>();
-                byParentId.put(parent, empty);
-            } else {
-                List<Long> updatedList = existingList;
-                updatedList.add(file.getId());
-                byParentId.put(parent, updatedList);
-            }
-        }
-        try {
             persistToSolr(docs);
-            return " " + filesToReindexPermissionsFor.size() + " files indexed across " + docs.size() + " Solr documents ";
+            return " " + filesToReindexAsBatch.size() + " files indexed across " + docs.size() + " Solr documents ";
         } catch (SolrServerException | IOException ex) {
-            return " tried to reindex " + filesToReindexPermissionsFor.size() + " files indexed across " + docs.size() + " Solr documents but caught exception: " + ex;
+            return " tried to reindex " + filesToReindexAsBatch.size() + " files indexed across " + docs.size() + " Solr documents but caught exception: " + ex;
         }
     }
 
-    private List<DataFile> filesToReIndexPermissionsFor(Dataset dataset) {
-        List<DataFile> filesToReindexPermissionsFor = new ArrayList<>();
+    private List<DatasetVersion> versionsToReIndexPermissionsFor(Dataset dataset) {
+        List<DatasetVersion> versionsToReindexPermissionsFor = new ArrayList<>();
         Map<DatasetVersion.VersionState, Boolean> desiredCards = searchPermissionsService.getDesiredCards(dataset);
         for (DatasetVersion version : datasetVersionsToBuildCardsFor(dataset)) {
             boolean cardShouldExist = desiredCards.get(version.getVersionState());
             if (cardShouldExist) {
-                for (FileMetadata fileMetadata : version.getFileMetadatas()) {
-                    filesToReindexPermissionsFor.add(fileMetadata.getDataFile());
-                }
+                    versionsToReindexPermissionsFor.add(version);
             }
         }
-        return filesToReindexPermissionsFor;
+        return versionsToReindexPermissionsFor;
     }
 
     public IndexResponse deleteMultipleSolrIds(List<String> solrIdsToDelete) {
@@ -521,19 +480,13 @@ public IndexResponse deleteMultipleSolrIds(List<String> solrIdsToDelete) {
              */
             return new IndexResponse("problem deleting the following documents from Solr: " + solrIdsToDelete);
         }
-        try {
-            solrClientService.getSolrClient().commit();
-        } catch (SolrServerException | IOException ex) {
-            return new IndexResponse("problem committing deletion of the following documents from Solr: " + solrIdsToDelete);
-        }
         return new IndexResponse("no known problem deleting the following documents from Solr:" + solrIdsToDelete);
     }
 
     public JsonObjectBuilder deleteAllFromSolrAndResetIndexTimes() throws SolrServerException, IOException {
         JsonObjectBuilder response = Json.createObjectBuilder();
-        logger.info("attempting to delete all Solr documents before a complete re-index");
+        logger.fine("attempting to delete all Solr documents before a complete re-index");
         solrClientService.getSolrClient().deleteByQuery("*:*");
-        solrClientService.getSolrClient().commit();
         int numRowsAffected = dvObjectService.clearAllIndexTimes();
         response.add(numRowsClearedByClearAllIndexTimes, numRowsAffected);
         response.add(messageString, "Solr index and database index timestamps cleared.");
@@ -541,47 +494,85 @@ public JsonObjectBuilder deleteAllFromSolrAndResetIndexTimes() throws SolrServer
     }
 
     /**
-     * @todo Do we want to report the root dataverse (id 1, often) in
-     * permissionsInDatabaseButMissingFromSolr?
-     *
      * @return A list of dvobject ids that should have their permissions
-     * re-indexed Solr was down when a permission was added. The permission
-     * should be added to Solr.
+     * re-indexed because Solr was down when a permission was added. The
+     * permission should be added to Solr. The id of the permission contains the
+     * type of DvObject and the primary key of the dvObject. DvObjects of type
+     * DataFile are currently skipped because their index time isn't stored in
+     * the database, since they are indexed along with their parent dataset
+     * (this may change).
      */
     public List<Long> findPermissionsInDatabaseButStaleInOrMissingFromSolr() {
         List<Long> indexingRequired = new ArrayList<>();
         long rootDvId = dataverseService.findRootDataverse().getId();
-        for (DvObject dvObject : dvObjectService.findAll()) {
-//            logger.info("examining dvObjectId " + dvObject.getId() + "...");
-            Timestamp permissionModificationTime = dvObject.getPermissionModificationTime();
-            Timestamp permissionIndexTime = dvObject.getPermissionIndexTime();
-            if (permissionIndexTime == null) {
-                if (dvObject.getId() != rootDvId) {
-                    // we don't index the rootDv
-                    indexingRequired.add(dvObject.getId());
-                }
-            } else if (permissionModificationTime == null) {
-                /**
-                 * @todo What should we do here? Permissions should always be
-                 * there. They are assigned at create time.
-                 */
-                logger.info("no permission modification time for dvobject id " + dvObject.getId());
-            } else if (permissionIndexTime.before(permissionModificationTime)) {
-                indexingRequired.add(dvObject.getId());
+        List<Long> missingDataversePermissionIds = dataverseService.findIdStalePermission();
+        List<Long> missingDatasetPermissionIds = datasetService.findIdStalePermission();
+        for (Long id : missingDataversePermissionIds) {
+            if (!id.equals(rootDvId)) {
+                indexingRequired.add(id);
             }
         }
+        indexingRequired.addAll(missingDatasetPermissionIds);
         return indexingRequired;
     }
 
+    public Stream<DataFileProxy> getDataFileInfoForPermissionIndexing(Long id) {
+        return em.createNamedQuery("DataFile.getDataFileInfoForPermissionIndexing", DataFileProxy.class)
+                .setParameter(1, id)
+                .getResultStream();
+    }
+
     /**
-     * @return A list of dvobject ids that should have their permissions
-     * re-indexed because Solr was down when a permission was revoked. The
-     * permission should be removed from Solr.
+     * A lightweight proxy for DataFile objects used during permission indexing. This class avoids loading the full DataFile entity from the database when only basic properties are needed for indexing,
+     * improving performance for large datasets.
      */
-    public List<Long> findPermissionsInSolrNoLongerInDatabase() {
+    public static class DataFileProxy {
+
+        private final Long id;
+        private final String name;
+        private final boolean released;
+
         /**
-         * @todo Implement this!
+         * Creates a new DataFileProxy with the specified properties.
+         * 
+         * @param id
+         *            The ID of the data file
+         * @param label
+         *            The label/name of the data file
+         * @param restricted
+         *            Whether the file is restricted
+         * @param released
+         *            Whether the file is released
          */
-        return new ArrayList<>();
+        public DataFileProxy(FileMetadata fmd) {
+            DataFile df = fmd.getDataFile();
+            this.id = df.getId();
+            this.name = fmd.getLabel();
+            this.released = df.isReleased();
+        }
+
+        public DataFileProxy(String label, Long id, Date publicationDate) {
+            this.id = id;
+            this.name = label;
+            this.released = publicationDate != null;
+        }
+
+        public boolean isReleased() {
+            return released;
+        }
+
+        public Long getFileId() {
+            return id;
+        }
+
+        public String getName() {
+            return name;
+        }
+        
+        public DataFile getMinimalDataFile() {
+            DataFile df = new DataFile();
+            df.setId(id);
+            return df;
+        }
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrInputDocuments.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrInputDocuments.java
new file mode 100644
index 00000000000..739368add4e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrInputDocuments.java
@@ -0,0 +1,29 @@
+package edu.harvard.iq.dataverse.search;
+
+import java.util.Collection;
+
+import org.apache.solr.common.SolrInputDocument;
+
+public class SolrInputDocuments {
+    private Collection<SolrInputDocument> documents;
+    private String message;
+    private Long datasetId;
+
+    public SolrInputDocuments(Collection<SolrInputDocument> documents, String message, Long datasetId) {
+        this.documents = documents;
+        this.message = message;
+        this.datasetId = datasetId;
+    }
+
+    public Collection<SolrInputDocument> getDocuments() {
+        return documents;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public Long getDatasetId() {
+        return datasetId;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrQueryResponse.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrQueryResponse.java
index b499b80961e..27e79cb1fc2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SolrQueryResponse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrQueryResponse.java
@@ -5,8 +5,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.response.FacetField;
 
@@ -26,6 +26,7 @@ public class SolrQueryResponse {
     private String error;
     private Map<String, Long> dvObjectCounts = new HashMap<>();
     private Map<String, Long> publicationStatusCounts = new HashMap<>();
+    private boolean solrTemporarilyUnavailable = false;
 
     public static String DATAVERSES_COUNT_KEY = "dataverses_count";
     public static String DATASETS_COUNT_KEY = "datasets_count";
@@ -91,7 +92,14 @@ public JsonObjectBuilder getPublicationStatusCountsAsJSON(){
         }
         return this.getMapCountsAsJSON(publicationStatusCounts);
     }
-       
+    
+    public boolean isSolrTemporarilyUnavailable() {
+        return solrTemporarilyUnavailable;
+    }
+    
+    public void setSolrTemporarilyUnavailable(boolean solrTemporarilyUnavailable) {
+        this.solrTemporarilyUnavailable = solrTemporarilyUnavailable;
+    }
     
     public JsonObjectBuilder getDvObjectCountsAsJSON(){
         
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java
index 85681bf0c9f..67af99e4b78 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java
@@ -1,23 +1,31 @@
 package edu.harvard.iq.dataverse.search;
 
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DvObject;
-import edu.harvard.iq.dataverse.api.Util;
-import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
-import edu.harvard.iq.dataverse.util.DateUtil;
-import edu.harvard.iq.dataverse.util.json.JsonPrinter;
-import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
+
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Predicate;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
+
+import edu.harvard.iq.dataverse.*;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+
+import org.apache.commons.collections4.CollectionUtils;
+
+import edu.harvard.iq.dataverse.api.Util;
+import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.DateUtil;
+import edu.harvard.iq.dataverse.util.json.JsonPrinter;
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+
+import javax.xml.crypto.Data;
 
 public class SolrSearchResult {
 
@@ -71,6 +79,15 @@ public class SolrSearchResult {
     private String dataverseAffiliation;
     private String citation;
     private String citationHtml;
+    private String datasetType;
+    /**
+    * Only Dataset can have a file count
+    */
+    private Long fileCount;
+    /**
+     * Only Dataverses can have a dataset count
+     */
+    private Long datasetCount;
     /**
      * Files and datasets might have a UNF. Dataverses don't.
      */
@@ -79,13 +96,19 @@ public class SolrSearchResult {
     private String fileContentType;
     private Long fileSizeInBytes;
     /**
-     * fileMD5 is here for legacy and backward-compatibility reasons. It might be deprecated some day in favor of "fileChecksumType" and "fileChecksumValue"
+     * fileMD5 is here for legacy and backward-compatibility reasons. It might
+     * be deprecated some day in favor of "fileChecksumType" and
+     * "fileChecksumValue"
      */
     private String fileMd5;
     private DataFile.ChecksumType fileChecksumType;
     private String fileChecksumValue;
+    private Boolean fileRestricted;
+    private Boolean canDownloadFile;
     private String dataverseAlias;
     private String dataverseParentAlias;
+    private String dataverseParentName;
+    private List<Dataverse> collections;
 //    private boolean statePublished;
     /**
      * @todo Investigate/remove this "unpublishedState" variable. For files that
@@ -99,7 +122,7 @@ public class SolrSearchResult {
     private boolean deaccessionedState = false;
     private long datasetVersionId;
     private String versionNumberFriendly;
-    //Determine if the search result is owned by any of the dvs in the tree of the DV displayed
+    // Determine if the search result is owned by any of the dvs in the tree of the DV displayed
     private boolean isInTree;
     private float score;
     private List<String> userRole;
@@ -108,20 +131,28 @@ public class SolrSearchResult {
     private String harvestingDescription = null;
     private List<String> fileCategories = null;
     private List<String> tabularDataTags = null;
-    
+    private Long tabularDataCount;
+    private Long observations;
+
     private String identifierOfDataverse = null;
     private String nameOfDataverse = null;
-    
+
     private String filePersistentId = null;
-    
+
+    private Long embargoEndDate;
+
+    private Long retentionEndDate;
+
+    private boolean datasetValid;
+
     public String getDvTree() {
         return dvTree;
     }
-    
+
     public void setDvTree(String dvTree) {
         this.dvTree = dvTree;
-    } 
-    
+    }
+
     public boolean isIsInTree() {
         return isInTree;
     }
@@ -129,7 +160,7 @@ public boolean isIsInTree() {
     public void setIsInTree(boolean isInTree) {
         this.isInTree = isInTree;
     }
-    
+
     public boolean isHarvested() {
         return harvested;
     }
@@ -137,14 +168,14 @@ public boolean isHarvested() {
     public void setHarvested(boolean harvested) {
         this.harvested = harvested;
     }
-    
+
     public String getHarvestingDescription() {
-        //if (this.isHarvested()) {
-            return harvestingDescription;
-        //}
-        //return null;
+        // if (this.isHarvested()) {
+        return harvestingDescription;
+        // }
+        // return null;
     }
-    
+
     public void setHarvestingDescription(String harvestingDescription) {
         this.harvestingDescription = harvestingDescription;
     }
@@ -246,11 +277,15 @@ public boolean isDeaccessionedState() {
     public void setDeaccessionedState(boolean deaccessionedState) {
         this.deaccessionedState = deaccessionedState;
     }
+
     /**
      * @todo: used? remove
      */
     private List<String> matchedFields;
 
+    // External Status Label (enabled via AllowedCurationLabels setting)
+    private String curationStatus;
+
     /**
      * @todo: remove name?
      */
@@ -398,25 +433,20 @@ public JsonArrayBuilder getRelevance() {
         return matchedFieldsArray;
     }
 
-    public JsonObject toJsonObject(boolean showRelevance, boolean showEntityIds, boolean showApiUrls) {
-        return json(showRelevance, showEntityIds, showApiUrls).build();
-    }
-
     /**
      * Add additional fields for the MyData page
      *
      * @return
      */
-    public JsonObjectBuilder getJsonForMyData() {
+    public JsonObjectBuilder getJsonForMyData(boolean isValid) {
 
-        JsonObjectBuilder myDataJson = json(true, true, true);//boolean showRelevance, boolean showEntityIds, boolean showApiUrls)
+        JsonObjectBuilder myDataJson = json(true, true, true);// boolean showRelevance, boolean showEntityIds, boolean showApiUrls)
 
         myDataJson.add("publication_statuses", this.getPublicationStatusesAsJSON())
-                .add("is_draft_state", this.isDraftState())
-                .add("is_in_review_state", this.isInReviewState())
-                .add("is_unpublished_state", this.isUnpublishedState())
-                .add("is_published", this.isPublishedState())
+                .add("is_draft_state", this.isDraftState()).add("is_in_review_state", this.isInReviewState())
+                .add("is_unpublished_state", this.isUnpublishedState()).add("is_published", this.isPublishedState())
                 .add("is_deaccesioned", this.isDeaccessionedState())
+                .add("is_valid", isValid)
                 .add("date_to_display_on_card", getDateToDisplayOnCard());
 
         // Add is_deaccessioned attribute, even though MyData currently screens any deaccessioned info out
@@ -426,23 +456,25 @@ public JsonObjectBuilder getJsonForMyData() {
         }
 
         if ((this.getParent() != null) && (!this.getParent().isEmpty())) {
-            //System.out.println("keys:" + parent.keySet().toString());
-            if (this.entity.isInstanceofDataFile()) {
+            // System.out.println("keys:" + parent.keySet().toString());
+            if (this.entity != null && this.entity.isInstanceofDataFile()) {
                 myDataJson.add("parentIdentifier", this.getParent().get(SolrSearchResult.PARENT_IDENTIFIER))
                         .add("parentName", this.getParent().get("name"));
 
             } else {
                 // for Dataverse and Dataset, get parent which is a Dataverse
-                myDataJson.add("parentId", this.getParent().get("id"))
-                        .add("parentName", this.getParent().get("name"));
+                myDataJson.add("parentId", this.getParent().get("id")).add("parentName", this.getParent().get("name"));
             }
         }
 
         return myDataJson;
-    } //getJsonForMydata
+    } // getJsonForMydata
 
     public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, boolean showApiUrls) {
+        return json(showRelevance, showEntityIds, showApiUrls, null);
+    }
 
+    public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, boolean showApiUrls, List<String> metadataFields) {
         if (this.type == null) {
             return jsonObjectBuilder();
         }
@@ -453,10 +485,11 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool
         String datasetCitation = null;
         String datasetName = null;
         String datasetId = null;
-        String datasetPersistentId = null;  
+        String datasetPersistentId = null;
         String filePersistentId = null;
         String preferredUrl = null;
         String apiUrl = null;
+        String publisherName = null;
 
         if (this.type.equals(SearchConstants.DATAVERSES)) {
             displayName = this.name;
@@ -466,6 +499,8 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool
             displayName = this.title;
             identifierLabel = "global_id";
             preferredUrl = getPersistentUrl();
+            publisherName = this.parent.get("name");
+            // if
             /**
              * @todo Should we show the name of the parent dataverse?
              */
@@ -483,15 +518,15 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool
             datasetPersistentId = parent.get(SolrSearchResult.PARENT_IDENTIFIER);
         }
 
-        //displayName = null; // testing NullSafeJsonBuilder
+        // displayName = null; // testing NullSafeJsonBuilder
         // because we are using NullSafeJsonBuilder key/value pairs will be dropped if the value is null
         NullSafeJsonBuilder nullSafeJsonBuilder = jsonObjectBuilder()
                 .add("name", displayName)
                 .add("type", getDisplayType(getType()))
                 .add("url", preferredUrl)
                 .add("image_url", getImageUrl())
-                //                .add("persistent_url", this.persistentUrl)
-                //                .add("download_url", this.downloadUrl)
+                // .add("persistent_url", this.persistentUrl)
+                // .add("download_url", this.downloadUrl)
                 /**
                  * @todo How much value is there in exposing the identifier for
                  * dataverses? For
@@ -534,13 +569,19 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool
                 .add("file_persistent_id", this.filePersistentId)
                 .add("dataset_name", datasetName)
                 .add("dataset_id", datasetId)
+                .add("publisher", publisherName)
                 .add("dataset_persistent_id", datasetPersistentId)
                 .add("dataset_citation", datasetCitation)
                 .add("deaccession_reason", this.deaccessionReason)
                 .add("citationHtml", this.citationHtml)
                 .add("identifier_of_dataverse", this.identifierOfDataverse)
                 .add("name_of_dataverse", this.nameOfDataverse)
-                .add("citation", this.citation);
+                .add("citation", this.citation)
+                .add("restricted", this.fileRestricted)
+                .add("variables", this.tabularDataCount)
+                .add("observations", this.observations)
+                .add("canDownloadFile", this.canDownloadFile);
+
         // Now that nullSafeJsonBuilder has been instatiated, check for null before adding to it!
         if (showRelevance) {
             nullSafeJsonBuilder.add("matches", getRelevance());
@@ -551,7 +592,145 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool
                 nullSafeJsonBuilder.add("entity_id", this.entityId);
             }
         }
-        
+        if (!getPublicationStatuses().isEmpty()) {
+            nullSafeJsonBuilder.add("publicationStatuses", getPublicationStatusesAsJSON());
+        }
+        if (this.fileCategories != null && !this.fileCategories.isEmpty()) {
+            nullSafeJsonBuilder.add("categories", JsonPrinter.asJsonArray(this.fileCategories));
+        }
+        if (this.tabularDataTags != null && !this.tabularDataTags.isEmpty()) {
+            nullSafeJsonBuilder.add("tabularTags", JsonPrinter.asJsonArray(this.tabularDataTags));
+        }
+
+        if (this.entity == null) {
+
+        } else {
+            if (this.entity.isInstanceofDataset()) {
+                nullSafeJsonBuilder.add("storageIdentifier", this.entity.getStorageIdentifier());
+                Dataset ds = (Dataset) this.entity;
+                DatasetVersion dv = ds.getVersionFromId(this.datasetVersionId);
+
+                if (!dv.getKeywords().isEmpty()) {
+                    JsonArrayBuilder keyWords = Json.createArrayBuilder();
+                    for (String keyword : dv.getKeywords()) {
+                        keyWords.add(keyword);
+                    }
+                    nullSafeJsonBuilder.add("keywords", keyWords);
+                }
+
+                JsonArrayBuilder subjects = Json.createArrayBuilder();
+                for (String subject : dv.getDatasetSubjects()) {
+                    subjects.add(subject);
+                }
+                nullSafeJsonBuilder.add("subjects", subjects);
+                nullSafeJsonBuilder.add("fileCount", this.fileCount);
+                nullSafeJsonBuilder.add("versionId", dv.getId());
+                nullSafeJsonBuilder.add("versionState", dv.getVersionState().toString());
+                if (this.isPublishedState()) {
+                    nullSafeJsonBuilder.add("majorVersion", dv.getVersionNumber());
+                    nullSafeJsonBuilder.add("minorVersion", dv.getMinorVersionNumber());
+                }
+
+                nullSafeJsonBuilder.add("createdAt", ds.getCreateDate());
+                nullSafeJsonBuilder.add("updatedAt", ds.getModificationTime());
+
+                if (!dv.getDatasetContacts().isEmpty()) {
+                    JsonArrayBuilder contacts = Json.createArrayBuilder();
+                    NullSafeJsonBuilder nullSafeJsonBuilderInner = jsonObjectBuilder();
+                    for (String contact[] : dv.getDatasetContacts(false)) {
+                        nullSafeJsonBuilderInner.add("name", contact[0]);
+                        nullSafeJsonBuilderInner.add("affiliation", contact[1]);
+                        contacts.add(nullSafeJsonBuilderInner);
+                    }
+                    nullSafeJsonBuilder.add("contacts", contacts);
+                }
+                if (!dv.getRelatedPublications().isEmpty()) {
+                    JsonArrayBuilder relPub = Json.createArrayBuilder();
+                    NullSafeJsonBuilder inner = jsonObjectBuilder();
+                    for (DatasetRelPublication dsRelPub : dv.getRelatedPublications()) {
+                        inner.add("title", dsRelPub.getTitle());
+                        inner.add("citation", dsRelPub.getText());
+                        inner.add("url", dsRelPub.getUrl());
+                        relPub.add(inner);
+                    }
+                    nullSafeJsonBuilder.add("publications", relPub);
+                }
+
+                if (!dv.getDatasetProducers().isEmpty()) {
+                    JsonArrayBuilder producers = Json.createArrayBuilder();
+                    for (String[] producer : dv.getDatasetProducers()) {
+                        producers.add(producer[0]);
+                    }
+                    nullSafeJsonBuilder.add("producers", producers);
+                }
+                if (!dv.getRelatedMaterial().isEmpty()) {
+                    JsonArrayBuilder relatedMaterials = Json.createArrayBuilder();
+                    for (String relatedMaterial : dv.getRelatedMaterial()) {
+                        relatedMaterials.add(relatedMaterial);
+                    }
+                    nullSafeJsonBuilder.add("relatedMaterial", relatedMaterials);
+                }
+
+                if (!dv.getGeographicCoverage().isEmpty()) {
+                    JsonArrayBuilder geoCov = Json.createArrayBuilder();
+                    NullSafeJsonBuilder inner = jsonObjectBuilder();
+                    for (String ind[] : dv.getGeographicCoverage()) {
+                        inner.add("country", ind[0]);
+                        inner.add("state", ind[1]);
+                        inner.add("city", ind[2]);
+                        inner.add("other", ind[3]);
+                        geoCov.add(inner);
+                    }
+                    nullSafeJsonBuilder.add("geographicCoverage", geoCov);
+                }
+                if (!dv.getDataSource().isEmpty()) {
+                    JsonArrayBuilder dataSources = Json.createArrayBuilder();
+                    for (String dsource : dv.getDataSource()) {
+                        dataSources.add(dsource);
+                    }
+                    nullSafeJsonBuilder.add("dataSources", dataSources);
+                }
+
+                if (CollectionUtils.isNotEmpty(metadataFields)) {
+                    // create metadata fields map names
+                    Map<String, List<String>> metadataFieldMapNames = computeRequestedMetadataFieldMapNames(
+                            metadataFields);
+
+                    // add metadatafields objet to wrap all requeested fields
+                    NullSafeJsonBuilder metadataFieldBuilder = jsonObjectBuilder();
+
+                    Map<MetadataBlock, List<DatasetField>> groupedFields = DatasetField
+                            .groupByBlock(dv.getFlatDatasetFields());
+                    json(metadataFieldMapNames, groupedFields, metadataFieldBuilder);
+
+                    nullSafeJsonBuilder.add("metadataBlocks", metadataFieldBuilder);
+                }
+
+                if (this.collections != null && !this.collections.isEmpty()) {
+                    JsonArrayBuilder collections = Json.createArrayBuilder();
+                    for (Dataverse collection : this.collections) {
+                        NullSafeJsonBuilder dvBuilder = jsonObjectBuilder();
+                        dvBuilder.add("id", collection.getId());
+                        dvBuilder.add("name", collection.getName());
+                        dvBuilder.add("alias", collection.getAlias());
+                        collections.add(dvBuilder);
+                    }
+                    nullSafeJsonBuilder.add("collections", collections);
+                }
+
+            } else if (this.entity.isInstanceofDataverse()) {
+                nullSafeJsonBuilder.add("affiliation", dataverseAffiliation);
+                nullSafeJsonBuilder.add("parentDataverseName", dataverseParentName);
+                nullSafeJsonBuilder.add("parentDataverseIdentifier", dataverseParentAlias);
+                nullSafeJsonBuilder.add("datasetCount", this.datasetCount);
+            } else if (this.entity.isInstanceofDataFile()) {
+                // "published_at" field is only set when the version state is not draft.
+                // On the contrary, this field also takes into account DataFiles in draft version,
+                // returning the creation date if the DataFile is not published, or the publication date otherwise.
+                nullSafeJsonBuilder.add("releaseOrCreateDate", getFormattedReleaseOrCreateDate());
+            }
+        }
+
         if (showApiUrls) {
             /**
              * @todo We should probably have a metadata_url or api_url concept
@@ -576,14 +755,67 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool
         return nullSafeJsonBuilder;
     }
 
+    private void json(Map<String, List<String>> metadataFieldMapNames,
+            Map<MetadataBlock, List<DatasetField>> groupedFields, NullSafeJsonBuilder metadataFieldBuilder) {
+        for (Map.Entry<String, List<String>> metadataFieldNamesEntry : metadataFieldMapNames.entrySet()) {
+            String metadataBlockName = metadataFieldNamesEntry.getKey();
+            List<String> metadataBlockFieldNames = metadataFieldNamesEntry.getValue();
+            for (MetadataBlock metadataBlock : groupedFields.keySet()) {
+                if (metadataBlockName.equals(metadataBlock.getName())) {
+                    // create metadataBlock object
+                    NullSafeJsonBuilder metadataBlockBuilder = jsonObjectBuilder();
+                    metadataBlockBuilder.add("displayName", metadataBlock.getDisplayName());
+                    JsonArrayBuilder fieldsArray = Json.createArrayBuilder();
+
+                    List<DatasetField> datasetFields = groupedFields.get(metadataBlock);
+                    for (DatasetField datasetField : datasetFields) {
+                        if (metadataBlockFieldNames.contains("*")
+                                || metadataBlockFieldNames.contains(datasetField.getDatasetFieldType().getName())) {
+                            if (!datasetField.getDatasetFieldType().isHasParent()) {
+                                JsonObject item = JsonPrinter.json(datasetField);
+                                if (item != null) {
+                                    fieldsArray.add(item);
+                                }
+                            }
+                        }
+                    }
+                    // with a fields to hold all requested properties
+                    metadataBlockBuilder.add("fields", fieldsArray);
+
+                    metadataFieldBuilder.add(metadataBlock.getName(), metadataBlockBuilder);
+                }
+            }
+        }
+    }
+
+    private Map<String, List<String>> computeRequestedMetadataFieldMapNames(List<String> metadataFields) {
+        Map<String, List<String>> metadataFieldMapNames = new HashMap<>();
+        for (String metadataField : metadataFields) {
+            String parts[] = metadataField.split(":");
+            if (parts.length == 2) {
+                List<String> metadataFieldNames = metadataFieldMapNames.get(parts[0]);
+                if (metadataFieldNames == null) {
+                    metadataFieldNames = new ArrayList<>();
+                    metadataFieldMapNames.put(parts[0], metadataFieldNames);
+                }
+                metadataFieldNames.add(parts[1]);
+            }
+        }
+        return metadataFieldMapNames;
+    }
+
     private String getDateTimePublished() {
         String datePublished = null;
         if (draftState == false) {
-            datePublished = releaseOrCreateDate == null ? null : Util.getDateTimeFormat().format(releaseOrCreateDate);
+            datePublished = getFormattedReleaseOrCreateDate();
         }
         return datePublished;
     }
 
+    private String getFormattedReleaseOrCreateDate() {
+        return releaseOrCreateDate == null ? null : Util.getDateTimeFormat().format(releaseOrCreateDate);
+    }
+
     public String getId() {
         return id;
     }
@@ -732,10 +964,8 @@ public List<Highlight> getHighlightsAsList() {
              * @todo don't hard code "title" here. And should we collapse name
              * and title together anyway?
              */
-            if (!field.equals(SearchFields.NAME)
-                    && !field.equals(SearchFields.DESCRIPTION)
-                    && !field.equals(SearchFields.DATASET_DESCRIPTION)
-                    && !field.equals(SearchFields.AFFILIATION)
+            if (!field.equals(SearchFields.NAME) && !field.equals(SearchFields.DESCRIPTION)
+                    && !field.equals(SearchFields.DATASET_DESCRIPTION) && !field.equals(SearchFields.AFFILIATION)
                     && !field.equals("title")) {
                 filtered.add(highlight);
             }
@@ -750,19 +980,31 @@ public void setHighlightsAsList(List<Highlight> highlightsAsList) {
     public List<String> getFileCategories() {
         return fileCategories;
     }
-    
+
     public void setFileCategories(List<String> fileCategories) {
         this.fileCategories = fileCategories;
     }
-    
+
     public List<String> getTabularDataTags() {
         return tabularDataTags;
     }
-    
+
     public void setTabularDataTags(List<String> tabularDataTags) {
         this.tabularDataTags = tabularDataTags;
     }
-    
+    public void setTabularDataCount(Long tabularDataCount) {
+        this.tabularDataCount = tabularDataCount;
+    }
+    public Long getTabularDataCount() {
+        return tabularDataCount;
+    }
+    public Long getObservations() {
+        return observations;
+    }
+    public void setObservations(Long observations) {
+        this.observations = observations;
+    }
+
     public Map<String, String> getParent() {
         return parent;
     }
@@ -816,6 +1058,14 @@ public void setCitationHtml(String citationHtml) {
         this.citationHtml = citationHtml;
     }
 
+    public String getDatasetType() {
+        return datasetType;
+    }
+
+    public void setDatasetType(String datasetType) {
+        this.datasetType = datasetType;
+    }
+
     public String getFiletype() {
         return filetype;
     }
@@ -876,6 +1126,21 @@ public void setFileChecksumValue(String fileChecksumValue) {
         this.fileChecksumValue = fileChecksumValue;
     }
 
+    public Boolean getFileRestricted() {
+        return fileRestricted;
+    }
+
+    public void setFileRestricted(Boolean fileRestricted) {
+        this.fileRestricted = fileRestricted;
+    }
+    public Boolean getCanDownloadFile() {
+        return canDownloadFile;
+    }
+
+    public void setCanDownloadFile(Boolean canDownloadFile) {
+        this.canDownloadFile = canDownloadFile;
+    }
+
     public String getNameSort() {
         return nameSort;
     }
@@ -932,7 +1197,7 @@ public String getDatasetUrl() {
             String badString = "null";
             if (!identifier.contains(badString)) {
                 if (entity != null && entity instanceof Dataset) {
-                    if (this.isHarvested() && ((Dataset)entity).getHarvestedFrom() != null) {
+                    if (this.isHarvested() && ((Dataset) entity).getHarvestedFrom() != null) {
                         String remoteArchiveUrl = ((Dataset) entity).getRemoteArchiveURL();
                         if (remoteArchiveUrl != null) {
                             return remoteArchiveUrl;
@@ -945,7 +1210,9 @@ public String getDatasetUrl() {
                 }
                 return "/dataset.xhtml?persistentId=" + identifier;
             } else {
-                logger.info("Dataset identifier/globalId contains \"" + badString + "\" perhaps due to https://github.com/IQSS/dataverse/issues/1147 . Fix data in database and reindex. Returning failsafe URL: " + failSafeUrl);
+                logger.info("Dataset identifier/globalId contains \"" + badString
+                        + "\" perhaps due to https://github.com/IQSS/dataverse/issues/1147 . Fix data in database and reindex. Returning failsafe URL: "
+                        + failSafeUrl);
                 return failSafeUrl;
             }
         } else {
@@ -959,13 +1226,13 @@ public String getFileParentIdentifier() {
             return null;
         }
         if (entity instanceof DataFile) {
-            return parent.get(PARENT_IDENTIFIER);   // Dataset globalID
+            return parent.get(PARENT_IDENTIFIER); // Dataset globalID
         }
 
         return null;
-        //if (entity)
+        // if (entity)
     }
-    
+
     public String getFilePersistentId() {
         return filePersistentId;
     }
@@ -973,51 +1240,47 @@ public String getFilePersistentId() {
     public void setFilePersistentId(String pid) {
         filePersistentId = pid;
     }
+
     public String getFileUrl() {
-        // Nothing special needs to be done for harvested file URLs: 
+        // Nothing special needs to be done for harvested file URLs:
         // simply directing these to the local dataset.xhtml for this dataset
-        // will take care of it - because DatasetPage will issue a redirect 
-        // to the remote archive URL. 
+        // will take care of it - because DatasetPage will issue a redirect
+        // to the remote archive URL.
         // This is true AS OF 4.2.4, FEB. 2016! - We'll probably want to make
-        // .getRemoteArchiveURL() methods, both in DataFile and Dataset objects, 
-        // work again at some point in the future. 
+        // .getRemoteArchiveURL() methods, both in DataFile and Dataset objects,
+        // work again at some point in the future.
         /*
-        if (entity != null && entity instanceof DataFile && this.isHarvested()) {
-            String remoteArchiveUrl = ((DataFile) entity).getRemoteArchiveURL();
-            if (remoteArchiveUrl != null) {
-                return remoteArchiveUrl;
-            }
-            return null;
-        }*/
-        if (entity.getIdentifier() != null){
-            return "/file.xhtml?persistentId=" + entity.getGlobalIdString();
+		 * if (entity != null && entity instanceof DataFile && this.isHarvested()) { String remoteArchiveUrl = ((DataFile) entity).getRemoteArchiveURL(); if
+		 * (remoteArchiveUrl != null) { return remoteArchiveUrl; } return null; }
+         */
+        if (entity.getIdentifier() != null) {
+            GlobalId entityPid = entity.getGlobalId();
+            return "/file.xhtml?persistentId=" + ((entityPid != null) ? entityPid.asString() : null);
         }
-        
+
         return "/file.xhtml?fileId=" + entity.getId() + "&datasetVersionId=" + datasetVersionId;
-        
+
         /*
-        if (parentDatasetGlobalId != null) {
-            return "/dataset.xhtml?persistentId=" + parentDatasetGlobalId;
-        } else {
-            return "/dataset.xhtml?id=" + parent.get(SearchFields.ID) + "&versionId=" + datasetVersionId;
-        }*/
+		 * if (parentDatasetGlobalId != null) { return "/dataset.xhtml?persistentId=" + parentDatasetGlobalId; } else { return "/dataset.xhtml?id=" +
+		 * parent.get(SearchFields.ID) + "&versionId=" + datasetVersionId; }
+         */
     }
-    
+
     public String getFileDatasetUrl() {
         // See the comment in the getFileUrl() method above. -- L.A. 4.2.4
         /*
-        if (entity != null && entity instanceof DataFile && this.isHarvested()) {
-            String remoteArchiveUrl = ((DataFile) entity).getRemoteArchiveURL();
-            if (remoteArchiveUrl != null) {
-                return remoteArchiveUrl;
-            }
-            return null;
-        }*/
-               
-        String parentDatasetGlobalId = parent.get(PARENT_IDENTIFIER);        
+		 * if (entity != null && entity instanceof DataFile && this.isHarvested()) { String remoteArchiveUrl = ((DataFile) entity).getRemoteArchiveURL(); if
+		 * (remoteArchiveUrl != null) { return remoteArchiveUrl; } return null; }
+         */
+
+        String parentDatasetGlobalId = parent.get(PARENT_IDENTIFIER);
 
         if (parentDatasetGlobalId != null) {
-            return "/dataset.xhtml?persistentId=" + parentDatasetGlobalId;
+            if (isDraftState()) {
+                return "/dataset.xhtml?persistentId=" + parentDatasetGlobalId + "&version=DRAFT";
+            } else {
+                return "/dataset.xhtml?persistentId=" + parentDatasetGlobalId;
+            }
         } else {
             return "/dataset.xhtml?id=" + parent.get(SearchFields.ID) + "&versionId=" + datasetVersionId;
         }
@@ -1051,6 +1314,17 @@ public void setDataverseParentAlias(String dataverseParentAlias) {
         this.dataverseParentAlias = dataverseParentAlias;
     }
 
+    /**
+     * @param dataverseParentName the dataverseParentName to set
+     */
+    public void setDataverseParentName(String dataverseParentName) {
+        this.dataverseParentName = dataverseParentName;
+    }
+
+    public void setCollections(List<Dataverse> collections) {
+        this.collections = collections;
+    }
+
     public float getScore() {
         return score;
     }
@@ -1072,14 +1346,11 @@ private String getDisplayType(String type) {
     }
 
     /*
-    public JsonArrayBuilder getUserRolesAsJson() {
-
-        JsonArrayBuilder jsonRoleStrings = Json.createArrayBuilder();
-        for (String role : this.getUserRole()) {
-            jsonRoleStrings.add(role);
-        }
-        return jsonRoleStrings;
-    }*/
+	 * public JsonArrayBuilder getUserRolesAsJson() {
+	 * 
+	 * JsonArrayBuilder jsonRoleStrings = Json.createArrayBuilder(); for (String role : this.getUserRole()) { jsonRoleStrings.add(role); } return
+	 * jsonRoleStrings; }
+     */
     public List<String> getUserRole() {
         return userRole;
     }
@@ -1091,16 +1362,77 @@ public void setUserRole(List<String> userRole) {
     public String getIdentifierOfDataverse() {
         return identifierOfDataverse;
     }
-    
+
     public void setIdentifierOfDataverse(String id) {
         this.identifierOfDataverse = id;
     }
-    
+
     public String getNameOfDataverse() {
         return nameOfDataverse;
     }
-    
+
     public void setNameOfDataverse(String id) {
         this.nameOfDataverse = id;
     }
+
+    public String getCurationStatus() {
+        return curationStatus;
+    }
+
+    public void setCurationStatus(String curationStatus) {
+        this.curationStatus = curationStatus;
+
+    }
+
+    public Long getEmbargoEndDate() {
+        return embargoEndDate;
+    }
+
+    public void setEmbargoEndDate(Long embargoEndDate) {
+        this.embargoEndDate = embargoEndDate;
+    }
+
+    public Long getRetentionEndDate() {
+        return retentionEndDate;
+    }
+
+    public void setRetentionEndDate(Long retentionEndDate) {
+        this.retentionEndDate = retentionEndDate;
+    }
+
+    public void setDatasetValid(Boolean datasetValid) {
+        this.datasetValid = datasetValid == null || Boolean.valueOf(datasetValid);
+    }
+
+    public boolean isValid(Predicate<SolrSearchResult> canUpdateDataset) {
+        if (this.datasetValid) {
+            return true;
+        }
+        if (!this.getType().equals("datasets")) {
+            return true;
+        }
+        if (this.isDraftState()) {
+            return false;
+        }
+        if (!JvmSettings.UI_SHOW_VALIDITY_LABEL_WHEN_PUBLISHED.lookupOptional(Boolean.class).orElse(true)) {
+            return true;
+        }
+        return !canUpdateDataset.test(this);
+    }
+
+    public Long getFileCount() {
+        return fileCount;
+    }
+
+    public void setFileCount(Long fileCount) {
+        this.fileCount = fileCount;
+    }
+
+    public Long getDatasetCount() {
+        return datasetCount;
+    }
+
+    public void setDatasetCount(Long datasetCount) {
+        this.datasetCount = datasetCount;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchServiceBean.java
new file mode 100644
index 00000000000..530d3f9ef7e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchServiceBean.java
@@ -0,0 +1,1089 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.groups.Group;
+import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.MissingResourceException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBTransactionRolledbackException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionRolledbackLocalException;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.persistence.NoResultException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrQuery.SortClause;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.BaseHttpSolrClient.RemoteSolrException;
+import org.apache.solr.client.solrj.response.FacetField;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.client.solrj.response.RangeFacet;
+import org.apache.solr.client.solrj.response.SpellCheckResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+
+@Stateless
+@Named
+public class SolrSearchServiceBean implements SearchService {
+
+    private static final Logger logger = Logger.getLogger(SolrSearchServiceBean.class.getCanonicalName());
+
+    private static final String ALL_GROUPS = "*";
+
+    /**
+     * We're trying to make the SolrSearchServiceBean lean, mean, and fast, with as
+     * few injections of EJBs as possible.
+     */
+    /**
+     * @todo Can we do without the DatasetFieldServiceBean?
+     */
+    @EJB
+    DvObjectServiceBean dvObjectService;
+    @EJB
+    DatasetVersionServiceBean datasetVersionService;
+    @EJB
+    DataverseServiceBean dataverseService;
+    @EJB
+    DatasetFieldServiceBean datasetFieldService;
+    @EJB
+    GroupServiceBean groupService;
+    @EJB
+    SystemConfig systemConfig;
+    @EJB
+    SolrClientService solrClientService;
+    @EJB
+    PermissionServiceBean permissionService;
+    @Inject
+    ThumbnailServiceWrapper thumbnailServiceWrapper;
+    
+
+    @Override
+    public String getServiceName() {
+        return SearchServiceFactory.INTERNAL_SOLR_SERVICE_NAME;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "Dataverse Standard Search";
+    }
+    /**
+     * @param dataverseRequest
+     * @param dataverses
+     * @param query
+     * @param filterQueries
+     * @param sortField
+     * @param sortOrder
+     * @param paginationStart
+     * @param onlyDatatRelatedToMe
+     * @param numResultsPerPage
+     * @param retrieveEntities - look up dvobject entities with .find() (potentially expensive!)
+     * @param geoPoint e.g. "35,15"
+     * @param geoRadius e.g. "5"
+     * @param addFacets boolean
+     * @param addHighlights boolean
+     * @param addCollections boolean
+     * @return
+     * @throws SearchException
+     */
+    @Override
+    public SolrQueryResponse search(
+            DataverseRequest dataverseRequest,
+            List<Dataverse> dataverses,
+            String query,
+            List<String> filterQueries,
+            String sortField, 
+            String sortOrder,
+            int paginationStart,
+            boolean onlyDatatRelatedToMe,
+            int numResultsPerPage,
+            boolean retrieveEntities,
+            String geoPoint,
+            String geoRadius,
+            boolean addFacets,
+            boolean addHighlights,
+            boolean addCollections
+    ) throws SearchException {
+
+        if (paginationStart < 0) {
+            throw new IllegalArgumentException("paginationStart must be 0 or greater");
+        }
+        if (numResultsPerPage < 1) {
+            throw new IllegalArgumentException("numResultsPerPage must be 1 or greater");
+        }
+
+        SolrQuery solrQuery = new SolrQuery();
+        query = SearchUtil.sanitizeQuery(query);
+
+        solrQuery.setQuery(query);
+        if (sortField != null) {
+            // is it ok not to specify any sort? - there are cases where we 
+            // don't care, and it must cost some extra cycles -- L.A.
+            solrQuery.setSort(new SortClause(sortField, sortOrder));
+        }
+        
+        solrQuery.setParam("fl", "*,score");
+        solrQuery.setParam("qt", "/select");
+        solrQuery.setParam("facet", "true");
+        
+        /**
+         * @todo: do we need facet.query?
+         */
+        solrQuery.setParam("facet.query", "*");
+        solrQuery.addFacetField(SearchFields.TYPE); // this one is always performed
+
+        for (String filterQuery : filterQueries) {
+            solrQuery.addFilterQuery(filterQuery);
+        }
+        if (geoPoint != null && !geoPoint.isBlank() && geoRadius != null && !geoRadius.isBlank()) {
+            solrQuery.setParam("pt", geoPoint);
+            solrQuery.setParam("d", geoRadius);
+            // See https://solr.apache.org/guide/8_11/spatial-search.html#bbox
+            solrQuery.addFilterQuery("{!bbox sfield=" + SearchFields.GEOLOCATION + "}");
+        }
+        
+        List<DataverseMetadataBlockFacet> metadataBlockFacets = new LinkedList<>();
+
+        if (addFacets) {
+
+            
+
+            // -----------------------------------
+            // Facets to Retrieve
+            // -----------------------------------
+            solrQuery.addFacetField(SearchFields.METADATA_TYPES);
+            solrQuery.addFacetField(SearchFields.DATASET_TYPE);
+            solrQuery.addFacetField(SearchFields.DATAVERSE_CATEGORY);
+            solrQuery.addFacetField(SearchFields.METADATA_SOURCE);
+            solrQuery.addFacetField(SearchFields.PUBLICATION_YEAR);
+            /*
+            * We talked about this in slack on 2021-09-14, Users can see objects on draft/unpublished 
+            *  if the owner gives permissions to all users so it makes sense to expose this facet 
+            *  to all users. The request of this change started because the order of the facets were 
+            *  changed with the PR #9635 and this was unintended.
+            */
+            solrQuery.addFacetField(SearchFields.PUBLICATION_STATUS);
+            solrQuery.addFacetField(SearchFields.DATASET_LICENSE);
+            solrQuery.addFacetField(SearchFields.CURATION_STATUS);
+
+            /**
+             * @todo when a new method on datasetFieldService is available
+             * (retrieveFacetsByDataverse?) only show the facets that the
+             * dataverse in question wants to show (and in the right order):
+             * https://redmine.hmdc.harvard.edu/issues/3490
+             *
+             * also, findAll only returns advancedSearchField = true... we
+             * should probably introduce the "isFacetable" boolean rather than
+             * caring about if advancedSearchField is true or false
+             *
+             */
+
+            if (dataverses != null) {
+                for (Dataverse dataverse : dataverses) {
+                    if (dataverse != null) {
+                        for (DataverseFacet dataverseFacet : dataverse.getDataverseFacets()) {
+                            DatasetFieldType datasetField = dataverseFacet.getDatasetFieldType();
+                            solrQuery.addFacetField(datasetField.getSolrField().getNameFacetable());
+                        }
+
+                        // Get all metadata block facets configured to be displayed
+                        metadataBlockFacets.addAll(dataverse.getMetadataBlockFacets());
+                    }
+                }
+            }
+            
+            solrQuery.addFacetField(SearchFields.FILE_TYPE);
+            /**
+            * @todo: hide the extra line this shows in the GUI... at least it's
+            * last...
+            */
+            solrQuery.addFacetField(SearchFields.FILE_TAG);
+            if (!systemConfig.isPublicInstall()) {
+                solrQuery.addFacetField(SearchFields.ACCESS);
+            }
+        }
+
+        List<DatasetFieldType> datasetFields = datasetFieldService.findAllOrderedById();
+        Map<String, String> solrFieldsToHightlightOnMap = new HashMap<>();
+        if (addHighlights) {
+            solrQuery.setHighlight(true).setHighlightSnippets(1).setHighlightRequireFieldMatch(true);
+            Integer fragSize = systemConfig.getSearchHighlightFragmentSize();
+            if (fragSize != null) {
+                solrQuery.setHighlightFragsize(fragSize);
+            }
+            solrQuery.setHighlightSimplePre("<span class=\"search-term-match\">");
+            solrQuery.setHighlightSimplePost("</span>");
+
+            // TODO: Do not hard code "Name" etc as English here.
+            solrFieldsToHightlightOnMap.put(SearchFields.NAME, "Name");
+            solrFieldsToHightlightOnMap.put(SearchFields.AFFILIATION, "Affiliation");
+            solrFieldsToHightlightOnMap.put(SearchFields.FILE_TYPE_FRIENDLY, "File Type");
+            solrFieldsToHightlightOnMap.put(SearchFields.DESCRIPTION, "Description");
+            solrFieldsToHightlightOnMap.put(SearchFields.VARIABLE_NAME, "Variable Name");
+            solrFieldsToHightlightOnMap.put(SearchFields.VARIABLE_LABEL, "Variable Label");
+            solrFieldsToHightlightOnMap.put(SearchFields.LITERAL_QUESTION, BundleUtil.getStringFromBundle("search.datasets.literalquestion"));
+            solrFieldsToHightlightOnMap.put(SearchFields.INTERVIEW_INSTRUCTIONS, BundleUtil.getStringFromBundle("search.datasets.interviewinstructions"));
+            solrFieldsToHightlightOnMap.put(SearchFields.POST_QUESTION, BundleUtil.getStringFromBundle("search.datasets.postquestion"));
+            solrFieldsToHightlightOnMap.put(SearchFields.VARIABLE_UNIVERSE, BundleUtil.getStringFromBundle("search.datasets.variableuniverse"));
+            solrFieldsToHightlightOnMap.put(SearchFields.VARIABLE_NOTES, BundleUtil.getStringFromBundle("search.datasets.variableNotes"));
+
+            solrFieldsToHightlightOnMap.put(SearchFields.FILE_TYPE_SEARCHABLE, "File Type");
+            solrFieldsToHightlightOnMap.put(SearchFields.DATASET_PUBLICATION_DATE, "Publication Year");
+            solrFieldsToHightlightOnMap.put(SearchFields.DATASET_PERSISTENT_ID, BundleUtil.getStringFromBundle("advanced.search.datasets.persistentId"));
+            solrFieldsToHightlightOnMap.put(SearchFields.FILE_PERSISTENT_ID, BundleUtil.getStringFromBundle("advanced.search.files.persistentId"));
+            /**
+             * @todo Dataverse subject and affiliation should be highlighted but
+             * this is commented out right now because the "friendly" names are
+             * not being shown on the dataverse cards. See also
+             * https://github.com/IQSS/dataverse/issues/1431
+             */
+//        solrFieldsToHightlightOnMap.put(SearchFields.DATAVERSE_SUBJECT, "Subject");
+//        solrFieldsToHightlightOnMap.put(SearchFields.DATAVERSE_AFFILIATION, "Affiliation");
+            /**
+             * @todo: show highlight on file card?
+             * https://redmine.hmdc.harvard.edu/issues/3848
+             */
+            solrFieldsToHightlightOnMap.put(SearchFields.FILENAME_WITHOUT_EXTENSION, "Filename Without Extension");
+            solrFieldsToHightlightOnMap.put(SearchFields.FILE_TAG_SEARCHABLE, "File Tag");
+
+            for (DatasetFieldType datasetFieldType : datasetFields) {
+                String solrField = datasetFieldType.getSolrField().getNameSearchable();
+                String displayName = datasetFieldType.getDisplayName();
+                solrFieldsToHightlightOnMap.put(solrField, displayName);
+            }
+            for (Map.Entry<String, String> entry : solrFieldsToHightlightOnMap.entrySet()) {
+                String solrField = entry.getKey();
+                // String displayName = entry.getValue();
+                solrQuery.addHighlightField(solrField);
+            }
+        }
+
+        // -----------------------------------
+        // PERMISSION FILTER QUERY
+        // -----------------------------------
+        String permissionFilterQuery = getPermissionFilterQuery(dataverseRequest, solrQuery, onlyDatatRelatedToMe, addFacets);
+        if (!permissionFilterQuery.isEmpty()) {
+            String[] filterParts = permissionFilterQuery.split("&q1=");
+            solrQuery.addFilterQuery(filterParts[0]);
+            if(filterParts.length > 1 ) {
+                solrQuery.add("q1", filterParts[1]);
+            }
+        }
+        
+        /**
+         * @todo: do sanity checking... throw error if negative
+         */
+        solrQuery.setStart(paginationStart);
+        /**
+         * @todo: decide if year CITATION_YEAR is good enough or if we should
+         * support CITATION_DATE
+         */
+//        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.UK);
+//        calendar.set(2010, 1, 1);
+//        Date start = calendar.getTime();
+//        calendar.set(2013, 1, 1);
+//        Date end = calendar.getTime();
+//        solrQuery.addDateRangeFacet(SearchFields.CITATION_DATE, start, end, "+1MONTH");
+        /**
+         * @todo make this configurable
+         */
+        int thisYear = Calendar.getInstance().get(Calendar.YEAR);
+        /**
+         * @todo: odd or even makes a difference. Couldn't find value of 2014
+         * when this was set to 2000
+         */
+        final int citationYearRangeStart = 1901;
+        final int citationYearRangeEnd = thisYear;
+        final int citationYearRangeSpan = 2;
+        /**
+         * @todo: these are dates and should be "range facets" not "field
+         * facets"
+         *
+         * right now they are lumped in with the datasetFieldService.findAll()
+         * above
+         */
+//        solrQuery.addNumericRangeFacet(SearchFields.PRODUCTION_DATE_YEAR_ONLY, citationYearRangeStart, citationYearRangeEnd, citationYearRangeSpan);
+//        solrQuery.addNumericRangeFacet(SearchFields.DISTRIBUTION_DATE_YEAR_ONLY, citationYearRangeStart, citationYearRangeEnd, citationYearRangeSpan);
+        solrQuery.setRows(numResultsPerPage);
+        logger.fine("Solr query:" + solrQuery);
+
+        // -----------------------------------
+        // Make the solr query
+        // -----------------------------------
+        QueryResponse queryResponse = null;
+        
+        try {
+            queryResponse = solrClientService.getSolrClient().query(solrQuery);
+
+        } catch (RemoteSolrException ex) {
+            String messageFromSolr = ex.getLocalizedMessage();
+            
+            logger.fine("message from the solr exception: "+messageFromSolr+"; code: "+ex.code());
+            
+            SolrQueryResponse exceptionSolrQueryResponse = new SolrQueryResponse(solrQuery);
+
+            // We probably shouldn't be assuming that this is necessarily a 
+            // "search syntax error", as the code below implies - could be 
+            // something else too - ? 
+            
+            // Specifically, we now rely on the Solr "circuit breaker" mechanism
+            // to start dropping requests with 503, when the service is 
+            // overwhelmed with requests load (with the assumption that this is
+            // a transient condition): 
+            
+            if (ex.code() == 503) {
+                // actual logic for communicating this state back to the local 
+                // client code TBD (@todo)
+                exceptionSolrQueryResponse.setSolrTemporarilyUnavailable(true);
+            }
+            
+            String error = "Search Syntax Error: ";
+            String stringToHide = "org.apache.solr.search.SyntaxError: ";
+            if (messageFromSolr.startsWith(stringToHide)) {
+                // hide "org.apache.solr..."
+                error += messageFromSolr.substring(stringToHide.length());
+            } else {
+                error += messageFromSolr;
+            }
+            logger.info(error);
+            exceptionSolrQueryResponse.setError(error);
+
+            // we can't show anything because of the search syntax error
+                        
+            long zeroNumResultsFound = 0;
+            long zeroGetResultsStart = 0;
+            List<SolrSearchResult> emptySolrSearchResults = new ArrayList<>();
+            List<FacetCategory> exceptionFacetCategoryList = new ArrayList<>();
+            Map<String, List<String>> emptySpellingSuggestion = new HashMap<>();
+            exceptionSolrQueryResponse.setNumResultsFound(zeroNumResultsFound);
+            exceptionSolrQueryResponse.setResultsStart(zeroGetResultsStart);
+            exceptionSolrQueryResponse.setSolrSearchResults(emptySolrSearchResults);
+            exceptionSolrQueryResponse.setFacetCategoryList(exceptionFacetCategoryList);
+            exceptionSolrQueryResponse.setTypeFacetCategories(exceptionFacetCategoryList);
+            exceptionSolrQueryResponse.setSpellingSuggestionsByToken(emptySpellingSuggestion);
+            return exceptionSolrQueryResponse;
+        } catch (SolrServerException | IOException ex) {
+            throw new SearchException("Internal Dataverse Search Engine Error", ex);
+        }
+        
+        int statusCode = queryResponse.getStatus();
+        
+        logger.fine("status code of the query response: "+statusCode);
+        logger.fine("_size from query response: "+queryResponse._size());
+        logger.fine("qtime: "+queryResponse.getQTime());
+
+        SolrDocumentList docs = queryResponse.getResults();
+        List<SolrSearchResult> solrSearchResults = new ArrayList<>();
+
+        /**
+         * @todo refactor SearchFields to a hashmap (or something? put in
+         * database? internationalize?) to avoid the crazy reflection and string
+         * manipulation below
+         */
+        Object searchFieldsObject = new SearchFields();
+        Field[] staticSearchFields = searchFieldsObject.getClass().getDeclaredFields();
+        String titleSolrField = null;
+        try {
+            DatasetFieldType titleDatasetField = datasetFieldService.findByName(DatasetFieldConstant.title);
+            titleSolrField = titleDatasetField.getSolrField().getNameSearchable();
+        } catch (EJBTransactionRolledbackException ex) {
+            logger.info("Couldn't find " + DatasetFieldConstant.title);
+            if (ex.getCause() instanceof TransactionRolledbackLocalException) {
+                if (ex.getCause().getCause() instanceof NoResultException) {
+                    logger.info("Caught NoResultException");
+                }
+            }
+        }
+        Map<String, String> datasetfieldFriendlyNamesBySolrField = new HashMap<>();
+        Map<String, String> staticSolrFieldFriendlyNamesBySolrField = new HashMap<>();
+        String baseUrl = systemConfig.getDataverseSiteUrl();
+
+        //Going through the results
+        for (SolrDocument solrDocument : docs) {
+            String id = (String) solrDocument.getFieldValue(SearchFields.ID);
+            Long entityid = (Long) solrDocument.getFieldValue(SearchFields.ENTITY_ID);
+            String type = (String) solrDocument.getFieldValue(SearchFields.TYPE);
+            float score = (Float) solrDocument.getFieldValue(SearchFields.RELEVANCE);
+            logger.fine("score for " + id + ": " + score);
+            String identifier = (String) solrDocument.getFieldValue(SearchFields.IDENTIFIER);
+            String citation = (String) solrDocument.getFieldValue(SearchFields.DATASET_CITATION);
+            String citationPlainHtml = (String) solrDocument.getFieldValue(SearchFields.DATASET_CITATION_HTML);
+            String datasetType = (String) solrDocument.getFieldValue(SearchFields.DATASET_TYPE);
+            String persistentUrl = (String) solrDocument.getFieldValue(SearchFields.PERSISTENT_URL);
+            String name = (String) solrDocument.getFieldValue(SearchFields.NAME);
+            String nameSort = (String) solrDocument.getFieldValue(SearchFields.NAME_SORT);
+//            ArrayList titles = (ArrayList) solrDocument.getFieldValues(SearchFields.TITLE);
+            String title = (String) solrDocument.getFieldValue(titleSolrField);
+            Long datasetVersionId = (Long) solrDocument.getFieldValue(SearchFields.DATASET_VERSION_ID);
+            String deaccessionReason = (String) solrDocument.getFieldValue(SearchFields.DATASET_DEACCESSION_REASON);
+//            logger.info("titleSolrField: " + titleSolrField);
+//            logger.info("title: " + title);
+            String filetype = (String) solrDocument.getFieldValue(SearchFields.FILE_TYPE_FRIENDLY);
+            String fileContentType = (String) solrDocument.getFieldValue(SearchFields.FILE_CONTENT_TYPE);
+            Date release_or_create_date = (Date) solrDocument.getFieldValue(SearchFields.RELEASE_OR_CREATE_DATE);
+            String dvTree = (String) solrDocument.getFirstValue(SearchFields.SUBTREE);
+            String identifierOfDataverse = (String) solrDocument.getFieldValue(SearchFields.IDENTIFIER_OF_DATAVERSE);
+            String nameOfDataverse = (String) solrDocument.getFieldValue(SearchFields.DATAVERSE_NAME);
+            String dataverseAffiliation = (String) solrDocument.getFieldValue(SearchFields.DATAVERSE_AFFILIATION);
+            String dataverseParentAlias = (String) solrDocument.getFieldValue(SearchFields.DATAVERSE_PARENT_ALIAS);
+            String dataverseParentName = (String) solrDocument.getFieldValue(SearchFields.PARENT_NAME);
+            List<String> subtreePaths = (List) solrDocument.getFieldValues(SearchFields.SUBTREE);
+            Long embargoEndDate = (Long) solrDocument.getFieldValue(SearchFields.EMBARGO_END_DATE);
+            Long retentionEndDate = (Long) solrDocument.getFieldValue(SearchFields.RETENTION_END_DATE);
+            //
+            Boolean datasetValid = (Boolean) solrDocument.getFieldValue(SearchFields.DATASET_VALID);
+            Long fileCount = (Long) solrDocument.getFieldValue(SearchFields.FILE_COUNT);
+            Long datasetCount = (Long) solrDocument.getFieldValue(SearchFields.DATASET_COUNT);
+            
+            List<String> matchedFields = new ArrayList<>();
+            
+            SolrSearchResult solrSearchResult = new SolrSearchResult(query, name);
+            
+            if (addHighlights) {
+                List<Highlight> highlights = new ArrayList<>();
+                Map<SolrField, Highlight> highlightsMap = new HashMap<>();
+                Map<SolrField, List<String>> highlightsMap2 = new HashMap<>();
+                Map<String, Highlight> highlightsMap3 = new HashMap<>();
+                if (queryResponse.getHighlighting().get(id) != null) {
+                    for (Map.Entry<String, String> entry : solrFieldsToHightlightOnMap.entrySet()) {
+                        String field = entry.getKey();
+                        String displayName = entry.getValue();
+
+                        List<String> highlightSnippets = queryResponse.getHighlighting().get(id).get(field);
+                        if (highlightSnippets != null) {
+                            matchedFields.add(field);
+                            /**
+                             * @todo only SolrField.SolrType.STRING? that's not
+                             * right... knit the SolrField object more into the
+                             * highlighting stuff
+                             */
+                            SolrField solrField = new SolrField(field, SolrField.SolrType.STRING, true, true);
+                            Highlight highlight = new Highlight(solrField, highlightSnippets, displayName);
+                            highlights.add(highlight);
+                            highlightsMap.put(solrField, highlight);
+                            highlightsMap2.put(solrField, highlightSnippets);
+                            highlightsMap3.put(field, highlight);
+                        }
+                    }
+
+                }
+
+                solrSearchResult.setHighlightsAsList(highlights);
+                solrSearchResult.setHighlightsMap(highlightsMap);
+                solrSearchResult.setHighlightsAsMap(highlightsMap3);
+            }
+            
+            
+            /**
+             * @todo put all this in the constructor?
+             */
+            List<String> states = (List<String>) solrDocument.getFieldValue(SearchFields.PUBLICATION_STATUS);
+            if (states != null) {
+                // set list of all statuses
+                // this method also sets booleans for individual statuses
+                solrSearchResult.setPublicationStatuses(states);
+            }
+            String curationStatus = (String) solrDocument.getFieldValue(SearchFields.CURATION_STATUS);
+            if (curationStatus != null) {
+                solrSearchResult.setCurationStatus(curationStatus);
+            }
+//            logger.info(id + ": " + description);
+            solrSearchResult.setId(id);
+            solrSearchResult.setEntityId(entityid);
+            if (retrieveEntities) {
+                solrSearchResult.setEntity(dvObjectService.findDvObject(entityid));
+            }
+            solrSearchResult.setIdentifier(identifier);
+            solrSearchResult.setPersistentUrl(persistentUrl);
+            solrSearchResult.setType(type);
+            solrSearchResult.setScore(score);
+            solrSearchResult.setNameSort(nameSort);
+            solrSearchResult.setReleaseOrCreateDate(release_or_create_date);
+            solrSearchResult.setMatchedFields(matchedFields);
+            
+            Map<String, String> parent = new HashMap<>();
+            String description = (String) solrDocument.getFieldValue(SearchFields.DESCRIPTION);
+            solrSearchResult.setDescriptionNoSnippet(description);
+            solrSearchResult.setDeaccessionReason(deaccessionReason);
+            solrSearchResult.setDvTree(dvTree);
+            solrSearchResult.setDatasetValid(datasetValid);
+            solrSearchResult.setFileCount(fileCount);
+            solrSearchResult.setDatasetCount(datasetCount);
+
+            if (Boolean.TRUE.equals((Boolean) solrDocument.getFieldValue(SearchFields.IS_HARVESTED))) {
+                solrSearchResult.setHarvested(true);
+            }
+
+            solrSearchResult.setEmbargoEndDate(embargoEndDate);
+            solrSearchResult.setRetentionEndDate(retentionEndDate);
+
+            /**
+             * @todo start using SearchConstants class here
+             */
+            if (type.equals("dataverses")) {
+                solrSearchResult.setName(name);
+                solrSearchResult.setHtmlUrl(baseUrl + SystemConfig.DATAVERSE_PATH + identifier);
+                solrSearchResult.setDataverseAffiliation(dataverseAffiliation);
+                solrSearchResult.setDataverseParentAlias(dataverseParentAlias);
+                solrSearchResult.setDataverseParentName(dataverseParentName);
+                solrSearchResult.setImageUrl(thumbnailServiceWrapper.getDataverseCardImageAsUrl(solrSearchResult));
+                /**
+                 * @todo Expose this API URL after "dvs" is changed to
+                 * "dataverses". Also, is an API token required for published
+                 * dataverses? Michael: url changed.
+                 */
+//                solrSearchResult.setApiUrl(baseUrl + "/api/dataverses/" + entityid);
+            } else if (type.equals("datasets")) {
+                solrSearchResult.setHtmlUrl(baseUrl + "/dataset.xhtml?globalId=" + identifier);
+                solrSearchResult.setApiUrl(baseUrl + "/api/datasets/" + entityid);
+                solrSearchResult.setImageUrl(thumbnailServiceWrapper.getDatasetCardImageAsUrl(solrSearchResult));
+                //Image url now set via thumbnail api
+                //solrSearchResult.setImageUrl(baseUrl + "/api/access/dsCardImage/" + datasetVersionId);
+                // No, we don't want to set the base64 thumbnails here.
+                // We want to do it inside SearchIncludeFragment, AND ONLY once the rest of the
+                // page has already loaded.
+                //DatasetVersion datasetVersion = datasetVersionService.find(datasetVersionId);
+                //if (datasetVersion != null){
+                //    solrSearchResult.setDatasetThumbnail(datasetVersion.getDataset().getDatasetThumbnail(datasetVersion));
+                //}
+                /**
+                 * @todo Could use getFieldValues (plural) here.
+                 */
+                List<String> datasetDescriptions = (List<String>) solrDocument.getFieldValue(SearchFields.DATASET_DESCRIPTION);
+                if (datasetDescriptions != null) {
+                    String firstDatasetDescription = datasetDescriptions.get(0);
+                    if (firstDatasetDescription != null) {
+                        solrSearchResult.setDescriptionNoSnippet(String.join(" ", datasetDescriptions));
+                    }
+                }
+                solrSearchResult.setDatasetVersionId(datasetVersionId);
+
+                solrSearchResult.setCitation(citation);
+                solrSearchResult.setCitationHtml(citationPlainHtml);
+
+                solrSearchResult.setIdentifierOfDataverse(identifierOfDataverse);
+                solrSearchResult.setNameOfDataverse(nameOfDataverse);
+
+                if (addCollections) {
+                    List<Dataverse> collections = new ArrayList<>();
+                    for (String subtreePath : subtreePaths) {
+                        String[] pathSegments = subtreePath.split("/");
+                        if (pathSegments.length == 0) {
+                            // Skip unexpected malformed subtree path
+                            continue;
+                        }
+                        collections.add(dataverseService.find(Long.valueOf(pathSegments[pathSegments.length - 1])));
+                    }
+                    solrSearchResult.setCollections(collections);
+                }
+
+                if (title != null) {
+//                    solrSearchResult.setTitle((String) titles.get(0));
+                    solrSearchResult.setTitle(title);
+                } else {
+                    logger.fine("No title indexed. Setting to empty string to prevent NPE. Dataset id " + entityid + " and version id " + datasetVersionId);
+                    solrSearchResult.setTitle("");
+                }
+                List<String> authors = (List) solrDocument.getFieldValues(DatasetFieldConstant.authorName);
+                if (authors != null) {
+                    solrSearchResult.setDatasetAuthors(authors);
+                }
+                solrSearchResult.setDatasetType(datasetType);
+            } else if (type.equals("files")) {
+                String parentGlobalId = null;
+                Object parentGlobalIdObject = solrDocument.getFieldValue(SearchFields.PARENT_IDENTIFIER);
+                if (parentGlobalIdObject != null) {
+                    parentGlobalId = (String) parentGlobalIdObject;
+                    parent.put(SolrSearchResult.PARENT_IDENTIFIER, parentGlobalId);
+                }
+                solrSearchResult.setHtmlUrl(baseUrl + "/dataset.xhtml?persistentId=" + parentGlobalId);
+                solrSearchResult.setDownloadUrl(baseUrl + "/api/access/datafile/" + entityid);
+                solrSearchResult.setImageUrl(thumbnailServiceWrapper.getFileCardImageAsUrl(solrSearchResult));
+                /**
+                 * @todo We are not yet setting the API URL for files because
+                 * not all files have metadata. Only subsettable files (those
+                 * with a datatable) seem to have metadata. Furthermore, the
+                 * response is in XML whereas the rest of the Search API returns
+                 * JSON.
+                 */
+//                solrSearchResult.setApiUrl(baseUrl + "/api/meta/datafile/" + entityid);
+                //solrSearchResult.setImageUrl(baseUrl + "/api/access/fileCardImage/" + entityid);
+                solrSearchResult.setName(name);
+                solrSearchResult.setFiletype(filetype);
+                solrSearchResult.setFileContentType(fileContentType);
+                Object fileSizeInBytesObject = solrDocument.getFieldValue(SearchFields.FILE_SIZE_IN_BYTES);
+                if (fileSizeInBytesObject != null) {
+                    try {
+                        long fileSizeInBytesLong = (long) fileSizeInBytesObject;
+                        solrSearchResult.setFileSizeInBytes(fileSizeInBytesLong);
+                    } catch (ClassCastException ex) {
+                        logger.info("Could not cast file " + entityid + " to long for " + SearchFields.FILE_SIZE_IN_BYTES + ": " + ex.getLocalizedMessage());
+                    }
+                }
+                solrSearchResult.setFileMd5((String) solrDocument.getFieldValue(SearchFields.FILE_MD5));
+                try {
+                    solrSearchResult.setFileChecksumType(DataFile.ChecksumType.fromString((String) solrDocument.getFieldValue(SearchFields.FILE_CHECKSUM_TYPE)));
+                } catch (IllegalArgumentException ex) {
+                    logger.info("Exception setting setFileChecksumType: " + ex);
+                }
+                solrSearchResult.setFileChecksumValue((String) solrDocument.getFieldValue(SearchFields.FILE_CHECKSUM_VALUE));
+
+                if (solrDocument.getFieldValue(SearchFields.FILE_RESTRICTED) != null) {
+                    solrSearchResult.setFileRestricted((Boolean) solrDocument.getFieldValue(SearchFields.FILE_RESTRICTED));
+                }
+
+                if (solrSearchResult.getEntity() != null) {
+                    solrSearchResult.setCanDownloadFile(permissionService.hasPermissionsFor(dataverseRequest, solrSearchResult.getEntity(), EnumSet.of(Permission.DownloadFile)));
+                }
+
+                solrSearchResult.setUnf((String) solrDocument.getFieldValue(SearchFields.UNF));
+                solrSearchResult.setDatasetVersionId(datasetVersionId);
+                List<String> fileCategories = (List) solrDocument.getFieldValues(SearchFields.FILE_TAG);
+                if (fileCategories != null) {
+                    solrSearchResult.setFileCategories(fileCategories);
+                }
+                List<String> tabularDataTags = (List) solrDocument.getFieldValues(SearchFields.TABDATA_TAG);
+                if (tabularDataTags != null) {
+                    Collections.sort(tabularDataTags);
+                    solrSearchResult.setTabularDataTags(tabularDataTags);
+                }
+                Long observations = (Long) solrDocument.getFieldValue(SearchFields.OBSERVATIONS);
+                solrSearchResult.setObservations(observations);
+                Long tabCount = (Long) solrDocument.getFieldValue(SearchFields.VARIABLE_COUNT);
+                solrSearchResult.setTabularDataCount(tabCount);
+                String filePID = (String) solrDocument.getFieldValue(SearchFields.FILE_PERSISTENT_ID);
+                if(null != filePID && !"".equals(filePID) && !"".equals("null")) {
+                    solrSearchResult.setFilePersistentId(filePID);
+                }
+            }
+            /**
+             * @todo store PARENT_ID as a long instead and cast as such
+             */
+            parent.put("id", (String) solrDocument.getFieldValue(SearchFields.PARENT_ID));
+            parent.put("name", (String) solrDocument.getFieldValue(SearchFields.PARENT_NAME));
+            parent.put("citation", (String) solrDocument.getFieldValue(SearchFields.PARENT_CITATION));
+            solrSearchResult.setParent(parent);
+            solrSearchResults.add(solrSearchResult);
+        }
+        Map<String, List<String>> spellingSuggestionsByToken = new HashMap<>();
+        SpellCheckResponse spellCheckResponse = queryResponse.getSpellCheckResponse();
+        if (spellCheckResponse != null) {
+            List<SpellCheckResponse.Suggestion> suggestions = spellCheckResponse.getSuggestions();
+            for (SpellCheckResponse.Suggestion suggestion : suggestions) {
+                spellingSuggestionsByToken.put(suggestion.getToken(), suggestion.getAlternatives());
+            }
+        }
+
+        List<FacetCategory> facetCategoryList = new ArrayList<>();
+        List<FacetCategory> typeFacetCategories = new ArrayList<>();
+        boolean hidePublicationStatusFacet = true;
+        boolean draftsAvailable = false;
+        boolean unpublishedAvailable = false;
+        boolean deaccessionedAvailable = false;
+        boolean hideMetadataSourceFacet = true;
+        boolean hideLicenseFacet = true;
+        boolean hideDatasetTypeFacet = true;
+        for (FacetField facetField : queryResponse.getFacetFields()) {
+            FacetCategory facetCategory = new FacetCategory();
+            List<FacetLabel> facetLabelList = new ArrayList<>();
+            int numMetadataSources = 0;
+            int numLicenses = 0;
+            int numDatasetTypes = 0;
+            String metadataBlockName = "";
+            String datasetFieldName = "";
+            /**
+             * To find the metadata block name to which the facetField belongs to
+             * ===facetField: authorName_ss   metadatablockname : citation
+             * ===facetField: dvCategory  metadatablockname : ""
+             */
+            for (DatasetFieldType datasetField : datasetFields) {
+                String solrFieldNameForDataset = datasetField.getSolrField().getNameFacetable();
+                if (solrFieldNameForDataset != null && facetField.getName().equals(solrFieldNameForDataset)) {
+                    metadataBlockName = datasetField.getMetadataBlock().getName() ;
+                    datasetFieldName = datasetField.getName();
+                    facetCategory.setDatasetFieldTypeId(datasetField.getId());
+                    break;
+                }
+            }
+
+
+            for (FacetField.Count facetFieldCount : facetField.getValues()) {
+                /**
+                 * @todo we do want to show the count for each facet
+                 */
+//                logger.info("field: " + facetField.getName() + " " + facetFieldCount.getName() + " (" + facetFieldCount.getCount() + ")");
+                String localefriendlyName = null;
+                if (facetFieldCount.getCount() > 0) {
+                    if(metadataBlockName.length() > 0 ) {
+                        localefriendlyName = getLocaleTitle(datasetFieldName,facetFieldCount.getName(), metadataBlockName);
+                    } else if (facetField.getName().equals(SearchFields.METADATA_TYPES)) {
+                        Optional<DataverseMetadataBlockFacet> metadataBlockFacet = metadataBlockFacets.stream().filter(blockFacet -> blockFacet.getMetadataBlock().getName().equals(facetFieldCount.getName())).findFirst();
+                        if (metadataBlockFacet.isEmpty()) {
+                           // metadata block facet is not configured to be displayed => ignore
+                           continue;
+                        }
+
+                        localefriendlyName = metadataBlockFacet.get().getMetadataBlock().getLocaleDisplayFacet();
+                    } else if (facetField.getName().equals(SearchFields.DATASET_LICENSE)) {
+                        try {
+                            localefriendlyName = BundleUtil.getStringFromPropertyFile("license." + facetFieldCount.getName().toLowerCase().replace(" ","_") + ".name", "License");
+                        } catch (Exception e) {
+                            localefriendlyName = facetFieldCount.getName();
+                        }
+                    } else {
+                        try {
+                            // This is where facets are capitalized.
+                            // This will be a problem for the API clients because they get back a string like this from the Search API...
+                            // {"datasetType":{"friendly":"Dataset Type","labels":[{"Dataset":1},{"Software":1}]}
+                            // ... but they will need to use the lower case version (e.g. "software") to narrow results.
+                           localefriendlyName = BundleUtil.getStringFromPropertyFile(facetFieldCount.getName(), "Bundle");
+                        } catch (Exception e) {
+                           localefriendlyName = facetFieldCount.getName();
+                        }
+                    }
+                    FacetLabel facetLabel = new FacetLabel(localefriendlyName, facetFieldCount.getCount());
+                    // quote field facets
+                    facetLabel.setFilterQuery(facetField.getName() + ":\"" + facetFieldCount.getName() + "\"");
+                    facetLabelList.add(facetLabel);
+                    if (facetField.getName().equals(SearchFields.PUBLICATION_STATUS)) {
+                        if (facetFieldCount.getName().equals(IndexServiceBean.getUNPUBLISHED_STRING())) {
+                            unpublishedAvailable = true;
+                        } else if (facetFieldCount.getName().equals(IndexServiceBean.getDRAFT_STRING())) {
+                            draftsAvailable = true;
+                        } else if (facetFieldCount.getName().equals(IndexServiceBean.getDEACCESSIONED_STRING())) {
+                            deaccessionedAvailable = true;
+                        }
+                    } else if (facetField.getName().equals(SearchFields.METADATA_SOURCE)) {
+                        numMetadataSources++;
+                    } else if (facetField.getName().equals(SearchFields.DATASET_LICENSE)) {
+                        numLicenses++;
+                    } else if (facetField.getName().equals(SearchFields.DATASET_TYPE)) {
+                        numDatasetTypes++;
+                    }
+                }
+            }
+            if (numMetadataSources > 1) {
+                hideMetadataSourceFacet = false;
+            }
+            if (numLicenses > 1) {
+                hideLicenseFacet = false;
+            }
+            if (numDatasetTypes > 1 ) {
+                hideDatasetTypeFacet = false;
+            }
+            facetCategory.setName(facetField.getName());
+            // hopefully people will never see the raw facetField.getName() because it may well have an _s at the end
+            facetCategory.setFriendlyName(facetField.getName());
+            // try to find a friendlier name to display as a facet
+            /**
+             * @todo hmm, we thought we wanted the datasetFields array to go
+             * away once we have more granularity than findAll() available per
+             * the todo above but we need a way to lookup by Solr field, so
+             * we'll build a hashmap
+             */
+            for (DatasetFieldType datasetField : datasetFields) {
+                String solrFieldNameForDataset = datasetField.getSolrField().getNameFacetable();
+                String friendlyName = datasetField.getDisplayName();
+                if (solrFieldNameForDataset != null && facetField.getName().endsWith(datasetField.getTmpNullFieldTypeIdentifier())) {
+                    // give it the non-friendly name so we remember to update the reference data script for datasets
+                    facetCategory.setName(facetField.getName());
+                } else if (solrFieldNameForDataset != null && facetField.getName().equals(solrFieldNameForDataset)) {
+                    if (friendlyName != null && !friendlyName.isEmpty()) {
+                        facetCategory.setFriendlyName(friendlyName);
+                        // stop examining available dataset fields. we found a match
+                        break;
+                    }
+                }
+                datasetfieldFriendlyNamesBySolrField.put(datasetField.getSolrField().getNameFacetable(), friendlyName);
+            }
+            /**
+             * @todo get rid of this crazy reflection, per todo above... or
+             * should we... let's put into a hash the friendly names of facet
+             * categories, indexed by Solr field
+             */
+            for (Field fieldObject : staticSearchFields) {
+                String name = fieldObject.getName();
+                String staticSearchField = null;
+                try {
+                    staticSearchField = (String) fieldObject.get(searchFieldsObject);
+                } catch (IllegalArgumentException | IllegalAccessException ex) {
+                    Logger.getLogger(SolrSearchServiceBean.class.getName()).log(Level.SEVERE, null, ex);
+                }
+                if (staticSearchField != null && facetField.getName().equals(staticSearchField)) {
+                    String friendlyName = BundleUtil.getStringFromPropertyFile("staticSearchFields."+staticSearchField, "staticSearchFields");
+                    if(friendlyName != null && friendlyName.length() > 0) {
+                        facetCategory.setFriendlyName(friendlyName);
+                    } else {
+                        String[] parts = name.split("_");
+                        StringBuilder stringBuilder = new StringBuilder();
+                        for (String part : parts) {
+                            stringBuilder.append(getCapitalizedName(part.toLowerCase()) + " ");
+                        }
+                        String friendlyNameWithTrailingSpace = stringBuilder.toString();
+                        friendlyName = friendlyNameWithTrailingSpace.replaceAll(" $", "");
+                        facetCategory.setFriendlyName(friendlyName);
+                    }
+
+//                    logger.info("adding <<<" + staticSearchField + ":" + friendlyName + ">>>");
+                    staticSolrFieldFriendlyNamesBySolrField.put(staticSearchField, friendlyName);
+                    // stop examining the declared/static fields in the SearchFields object. we found a match
+                    break;
+                }
+            }
+
+            facetCategory.setFacetLabel(facetLabelList);
+            if (!facetLabelList.isEmpty()) {
+                if (facetCategory.getName().equals(SearchFields.TYPE)) {
+                    // the "type" facet is special, these are not
+                    typeFacetCategories.add(facetCategory);
+                } else if (facetCategory.getName().equals(SearchFields.PUBLICATION_STATUS)) {
+                    if (unpublishedAvailable || draftsAvailable || deaccessionedAvailable) {
+                        hidePublicationStatusFacet = false;
+                    }
+                    if (!hidePublicationStatusFacet) {
+                        facetCategoryList.add(facetCategory);
+                    }
+                } else if (facetCategory.getName().equals(SearchFields.METADATA_SOURCE)) {
+                    if (!hideMetadataSourceFacet) {
+                        facetCategoryList.add(facetCategory);
+                    }
+                } else if (facetCategory.getName().equals(SearchFields.DATASET_LICENSE)) {
+                    if (!hideLicenseFacet) {
+                        facetCategoryList.add(facetCategory);
+                    }
+                } else if (facetCategory.getName().equals(SearchFields.DATASET_TYPE)) {
+                    if (!hideDatasetTypeFacet) {
+                        facetCategoryList.add(facetCategory);
+                    }
+                } else {
+                    facetCategoryList.add(facetCategory);
+                }
+            }
+        }
+
+        // for now the only range facet is citation year
+        for (RangeFacet<String, String> rangeFacet : queryResponse.getFacetRanges()) {
+            FacetCategory facetCategory = new FacetCategory();
+            List<FacetLabel> facetLabelList = new ArrayList<>();
+            for (Object rfObj : rangeFacet.getCounts()) {
+                RangeFacet.Count rangeFacetCount = (RangeFacet.Count) rfObj;
+                String valueString = rangeFacetCount.getValue();
+                Integer start = Integer.parseInt(valueString);
+                Integer end = start + Integer.parseInt(rangeFacet.getGap().toString());
+                // to avoid overlapping dates
+                end = end - 1;
+                if (rangeFacetCount.getCount() > 0) {
+                    FacetLabel facetLabel = new FacetLabel(start + "-" + end, Long.valueOf(rangeFacetCount.getCount()));
+                    // special [12 TO 34] syntax for range facets
+                    facetLabel.setFilterQuery(rangeFacet.getName() + ":" + "[" + start + " TO " + end + "]");
+                    facetLabelList.add(facetLabel);
+                }
+            }
+            facetCategory.setName(rangeFacet.getName());
+            facetCategory.setFacetLabel(facetLabelList);
+            // reverse to show the newest citation year range at the top
+            List<FacetLabel> facetLabelListReversed = new ArrayList<>();
+            ListIterator<FacetLabel> li = facetLabelList.listIterator(facetLabelList.size());
+            while (li.hasPrevious()) {
+                facetLabelListReversed.add(li.previous());
+            }
+            facetCategory.setFacetLabel(facetLabelListReversed);
+            if (!facetLabelList.isEmpty()) {
+                facetCategoryList.add(facetCategory);
+            }
+        }
+
+        SolrQueryResponse solrQueryResponse = new SolrQueryResponse(solrQuery);
+        solrQueryResponse.setSolrSearchResults(solrSearchResults);
+        solrQueryResponse.setSpellingSuggestionsByToken(spellingSuggestionsByToken);
+        solrQueryResponse.setFacetCategoryList(facetCategoryList);
+        solrQueryResponse.setTypeFacetCategories(typeFacetCategories);
+        solrQueryResponse.setNumResultsFound(queryResponse.getResults().getNumFound());
+        solrQueryResponse.setResultsStart(queryResponse.getResults().getStart());
+        solrQueryResponse.setDatasetfieldFriendlyNamesBySolrField(datasetfieldFriendlyNamesBySolrField);
+        solrQueryResponse.setStaticSolrFieldFriendlyNamesBySolrField(staticSolrFieldFriendlyNamesBySolrField);
+        String[] filterQueriesArray = solrQuery.getFilterQueries();
+        if (filterQueriesArray != null) {
+            // null check added because these tests were failing: mvn test -Dtest=SearchIT
+            List<String> actualFilterQueries = Arrays.asList(filterQueriesArray);
+            logger.fine("actual filter queries: " + actualFilterQueries);
+            solrQueryResponse.setFilterQueriesActual(actualFilterQueries);
+        } else {
+            // how often is this null?
+            logger.info("solrQuery.getFilterQueries() was null");
+        }
+
+        solrQueryResponse.setDvObjectCounts(queryResponse.getFacetField("dvObjectType"));
+        solrQueryResponse.setPublicationStatusCounts(queryResponse.getFacetField("publicationStatus"));
+
+        return solrQueryResponse;
+    }
+
+    public String getLocaleTitle(String title,  String controlledvoc , String propertyfile) {
+
+        String output = "";
+        try {
+            if(controlledvoc != "" ) {
+                output =  BundleUtil.getStringFromPropertyFile("controlledvocabulary." + title +"."+ controlledvoc.toLowerCase().replace(" ","_")  , propertyfile);
+            } else {
+                output = BundleUtil.getStringFromPropertyFile("datasetfieldtype." + title + ".title", propertyfile);
+            }
+        } catch (MissingResourceException e1) {
+            if(controlledvoc != "" ) {
+                return controlledvoc;
+            } else {
+                return title;
+            }
+        }
+
+        if(output != null && output.length() >0) {
+            return output;
+        }
+        else
+            return title;
+    }
+
+
+    public String getCapitalizedName(String name) {
+        return Character.toUpperCase(name.charAt(0)) + name.substring(1);
+    }
+
+    /**
+     * Moved this logic out of the "search" function
+     *
+     * @return
+     */
+    private String getPermissionFilterQuery(DataverseRequest dataverseRequest, SolrQuery solrQuery, boolean onlyDatatRelatedToMe, boolean addFacets) {
+
+        User user = dataverseRequest.getUser();
+        if (user == null) {
+            throw new NullPointerException("user cannot be null");
+        }
+        if (solrQuery == null) {
+            throw new NullPointerException("solrQuery cannot be null");
+        }
+        
+        if (user instanceof PrivateUrlUser) {
+            user = GuestUser.get();
+        }
+
+        ArrayList<String> groupList = new ArrayList<String>();
+        AuthenticatedUser au = null;
+        Set<Group> groups;
+
+        boolean avoidJoin = FeatureFlags.AVOID_EXPENSIVE_SOLR_JOIN.enabled();
+
+        if (user instanceof AuthenticatedUser) {
+            au = (AuthenticatedUser) user;
+
+            // ----------------------------------------------------
+            // Is this a Super User?
+            // If so, they can see everything
+            // ----------------------------------------------------
+            if (au.isSuperuser()) {
+                // Somewhat dangerous because this user (a superuser) will be able
+                // to see everything in Solr with no regard to permissions. But it's
+                // been this way since Dataverse 4.0. So relax. :)
+
+                return buildPermissionFilterQuery(avoidJoin, ALL_GROUPS);
+            }
+
+            // ----------------------------------------------------
+            // User is logged in AND onlyDatatRelatedToMe == true
+            // Yes, give back everything -> the settings will be in
+            // the filterqueries given to search
+            // ----------------------------------------------------
+            if (onlyDatatRelatedToMe == true) {
+                if (systemConfig.myDataDoesNotUsePermissionDocs()) {
+                    logger.fine("old 4.2 behavior: MyData is not using Solr permission docs");
+                    return buildPermissionFilterQuery(avoidJoin, ALL_GROUPS);
+                } else {
+                    // fall-through
+                    logger.fine("new post-4.2 behavior: MyData is using Solr permission docs");
+                }
+            }
+            // ----------------------------------------------------
+            // Work with Authenticated User who is not a Superuser
+            // ----------------------------------------------------
+            groupList.add(IndexServiceBean.getGroupPerUserPrefix() + au.getId());
+        }
+        
+        // In addition to the user referenced directly, we will also
+        // add joins on all the non-public groups that may exist for the
+        // user:
+
+        // Authenticated users, *and the GuestUser*, may be part of one or more groups; such
+        // as IP Groups.
+        groups = groupService.collectAncestors(groupService.groupsFor(dataverseRequest));
+
+        for (Group group : groups) {
+            String groupAlias = group.getAlias();
+            if (groupAlias != null && !groupAlias.isEmpty() && (!avoidJoin || !groupAlias.startsWith("builtIn"))) {
+                groupList.add(IndexServiceBean.getGroupPrefix() + groupAlias);
+            }
+        }
+
+        if (!avoidJoin) {
+            // Add the public group
+            groupList.add(0, IndexServiceBean.getPublicGroupString());
+        } 
+        
+        String groupString = null;
+        //If we have additional groups, format them correctly into a search string, with parens if there is more than one
+        if (groupList.size() > 1) {
+            groupString = "(" + StringUtils.join(groupList, " OR ") + ")";
+        } else if (groupList.size() == 1) {
+            groupString = groupList.get(0);
+        }
+        logger.fine("Groups: " + groupString);
+        String permissionQuery = buildPermissionFilterQuery(avoidJoin, groupString);
+        logger.fine("Permission Query: " + permissionQuery);
+        return permissionQuery;
+    }
+
+    private String buildPermissionFilterQuery(boolean avoidJoin, String permissionFilterGroups) {
+        String query = (avoidJoin&& !isAllGroups(permissionFilterGroups)) ? SearchFields.PUBLIC_OBJECT + ":" + true : "";
+        if (permissionFilterGroups != null && !isAllGroups(permissionFilterGroups)) {
+            if (!query.isEmpty()) {
+                query = "(" + query + " OR " + "{!join from=" + SearchFields.DEFINITION_POINT + " to=id v=$q1})&q1=" + SearchFields.DISCOVERABLE_BY + ":" + permissionFilterGroups;
+            } else {
+                query = "{!join from=" + SearchFields.DEFINITION_POINT + " to=id v=$q1}&q1=" + SearchFields.DISCOVERABLE_BY + ":" + permissionFilterGroups;
+            }
+        }
+        return query;
+    }
+    
+    private boolean isAllGroups(String groups) {
+        return (groups!=null &&groups.equals(ALL_GROUPS));
+    }
+}
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearch.java b/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearch.java
index 66bb63ed596..ff4a2e4aa96 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearch.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearch.java
@@ -5,16 +5,16 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(indexes = {@Index(columnList="definitionpoint_id")
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchFilterQuery.java b/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchFilterQuery.java
index f884a9529c9..7f51f9c8728 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchFilterQuery.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchFilterQuery.java
@@ -1,16 +1,16 @@
 package edu.harvard.iq.dataverse.search.savedsearch;
 
 import java.io.Serializable;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(indexes = {@Index(columnList="savedsearch_id")})
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchServiceBean.java
index 75f373a8ffe..4840131a57e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchServiceBean.java
@@ -10,31 +10,39 @@
 import edu.harvard.iq.dataverse.DvObjectServiceBean;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
-import edu.harvard.iq.dataverse.search.SolrQueryResponse;
-import edu.harvard.iq.dataverse.search.SolrSearchResult;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.impl.DeleteDatasetLinkingDataverseCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.DeleteDataverseLinkingDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.LinkDatasetCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.LinkDataverseCommand;
 import edu.harvard.iq.dataverse.search.SearchException;
 import edu.harvard.iq.dataverse.search.SearchFields;
+import edu.harvard.iq.dataverse.search.SearchServiceFactory;
+import edu.harvard.iq.dataverse.search.SolrQueryResponse;
+import edu.harvard.iq.dataverse.search.SolrSearchResult;
 import edu.harvard.iq.dataverse.search.SortBy;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
+import jakarta.servlet.http.HttpServletRequest;
+
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import javax.servlet.http.HttpServletRequest;
 
 @Stateless
 @Named
@@ -43,15 +51,17 @@ public class SavedSearchServiceBean {
     private static final Logger logger = Logger.getLogger(SavedSearchServiceBean.class.getCanonicalName());
 
     @EJB
-    SearchServiceBean searchService;
+    SearchServiceFactory searchService;
     @EJB
     DvObjectServiceBean dvObjectService;
     @EJB
-    DatasetLinkingServiceBean datasetLinkingService;
+    protected DatasetLinkingServiceBean dsLinkingService;
     @EJB
-    DataverseLinkingServiceBean dataverseLinkingService;
+    protected DataverseLinkingServiceBean dvLinkingService;
     @EJB
     EjbDataverseEngine commandEngine;
+    @EJB
+    SystemConfig systemConfig;
 
     private final String resultString = "result";
 
@@ -95,21 +105,25 @@ public SavedSearch add(SavedSearch toPersist) {
         try {
             persisted = em.merge(toPersist);
         } catch (Exception ex) {
-            System.out.println("exeption: " + ex);
+            logger.fine("Failed to add SavedSearch" + ex);
         }
         return persisted;
     }
 
-    public boolean delete(long id) {
+    public boolean delete(long id, boolean unlink) throws SearchException, CommandException {
         SavedSearch doomed = find(id);
         boolean wasDeleted = false;
         if (doomed != null) {
-            System.out.println("deleting saved search id " + doomed.getId());
+            logger.info("Deleting saved search id " + doomed.getId());
+            if(unlink) {
+                DataverseRequest dataverseRequest = new DataverseRequest(doomed.getCreator(), getHttpServletRequest());
+                removeLinks(dataverseRequest, doomed);
+            }
             em.remove(doomed);
             em.flush();
             wasDeleted = true;
         } else {
-            System.out.println("problem deleting saved search id " + id);
+            logger.info("Problem deleting saved search id " + id);
         }
         return wasDeleted;
     }
@@ -122,6 +136,19 @@ public SavedSearch save(SavedSearch savedSearch) {
             return em.merge(savedSearch);
         }
     }
+    
+    
+    @Schedule(dayOfWeek="0", hour="0", minute="30", persistent = false)
+    public void makeLinksForAllSavedSearchesTimer() {
+        if (systemConfig.isTimerServer()) {
+            logger.info("Linking saved searches");
+            try {
+                JsonObjectBuilder makeLinksForAllSavedSearches = makeLinksForAllSavedSearches(false);
+            } catch (SearchException | CommandException ex) {
+                Logger.getLogger(SavedSearchServiceBean.class.getName()).log(Level.SEVERE, null, ex);
+            }       
+        }
+    }
 
     public JsonObjectBuilder makeLinksForAllSavedSearches(boolean debugFlag) throws SearchException, CommandException {
         JsonObjectBuilder response = Json.createObjectBuilder();
@@ -152,29 +179,46 @@ public JsonObjectBuilder makeLinksForAllSavedSearches(boolean debugFlag) throws
      * more structured that a simple String.
      */
     public JsonObjectBuilder makeLinksForSingleSavedSearch(DataverseRequest dvReq, SavedSearch savedSearch, boolean debugFlag) throws SearchException, CommandException {
+        logger.info("SAVED SEARCH (" + savedSearch.getId() + ") START search and link process");
+        Date start = new Date();
         JsonObjectBuilder response = Json.createObjectBuilder();
         JsonArrayBuilder savedSearchArrayBuilder = Json.createArrayBuilder();
         JsonArrayBuilder infoPerHit = Json.createArrayBuilder();
         SolrQueryResponse queryResponse = findHits(savedSearch);
+
+        List skipList = new ArrayList(); // a list for the definition point itself and already linked objects
+        skipList.add(savedSearch.getDefinitionPoint().getId());
+        
+        TypedQuery<Long> typedQuery = em.createNamedQuery("DataverseLinkingDataverse.findIdsByLinkingDataverseId", Long.class)
+            .setParameter("linkingDataverseId", savedSearch.getDefinitionPoint().getId());
+        skipList.addAll(typedQuery.getResultList());
+        
+        typedQuery = em.createNamedQuery("DatasetLinkingDataverse.findIdsByLinkingDataverseId", Long.class)
+            .setParameter("linkingDataverseId", savedSearch.getDefinitionPoint().getId());
+        skipList.addAll(typedQuery.getResultList());
+           
         for (SolrSearchResult solrSearchResult : queryResponse.getSolrSearchResults()) {
 
             JsonObjectBuilder hitInfo = Json.createObjectBuilder();
             hitInfo.add("name", solrSearchResult.getNameSort());
             hitInfo.add("dvObjectId", solrSearchResult.getEntityId());
+            
+            if (skipList.contains(solrSearchResult.getEntityId())) {
+                hitInfo.add(resultString, "Skipping because would link to itself or an already linked entity.");
+                infoPerHit.add(hitInfo);
+                continue;
+            }
 
             DvObject dvObjectThatDefinitionPointWillLinkTo = dvObjectService.findDvObject(solrSearchResult.getEntityId());
             if (dvObjectThatDefinitionPointWillLinkTo == null) {
                 hitInfo.add(resultString, "Could not find DvObject with id " + solrSearchResult.getEntityId());
                 infoPerHit.add(hitInfo);
-                break;
-            }
+                continue;
+            }   
+                    
             if (dvObjectThatDefinitionPointWillLinkTo.isInstanceofDataverse()) {
                 Dataverse dataverseToLinkTo = (Dataverse) dvObjectThatDefinitionPointWillLinkTo;
-                if (wouldResultInLinkingToItself(savedSearch.getDefinitionPoint(), dataverseToLinkTo)) {
-                    hitInfo.add(resultString, "Skipping because dataverse id " + dataverseToLinkTo.getId() + " would link to itself.");
-                } else if (alreadyLinkedToTheDataverse(savedSearch.getDefinitionPoint(), dataverseToLinkTo)) {
-                    hitInfo.add(resultString, "Skipping because dataverse " + savedSearch.getDefinitionPoint().getId() + " already links to dataverse " + dataverseToLinkTo.getId() + ".");
-                } else if (dataverseToLinkToIsAlreadyPartOfTheSubtree(savedSearch.getDefinitionPoint(), dataverseToLinkTo)) {
+                if (dataverseToLinkToIsAlreadyPartOfTheSubtree(savedSearch.getDefinitionPoint(), dataverseToLinkTo)) {
                     hitInfo.add(resultString, "Skipping because " + dataverseToLinkTo + " is already part of the subtree for " + savedSearch.getDefinitionPoint());
                 } else {
                     DataverseLinkingDataverse link = commandEngine.submitInNewTransaction(new LinkDataverseCommand(dvReq, savedSearch.getDefinitionPoint(), dataverseToLinkTo));
@@ -182,36 +226,74 @@ public JsonObjectBuilder makeLinksForSingleSavedSearch(DataverseRequest dvReq, S
                 }
             } else if (dvObjectThatDefinitionPointWillLinkTo.isInstanceofDataset()) {
                 Dataset datasetToLinkTo = (Dataset) dvObjectThatDefinitionPointWillLinkTo;
-                if (alreadyLinkedToTheDataset(savedSearch.getDefinitionPoint(), datasetToLinkTo)) {
-                    hitInfo.add(resultString, "Skipping because dataverse " + savedSearch.getDefinitionPoint() + " already links to dataset " + datasetToLinkTo + ".");
-                } else if (datasetToLinkToIsAlreadyPartOfTheSubtree(savedSearch.getDefinitionPoint(), datasetToLinkTo)) {
+                if (datasetToLinkToIsAlreadyPartOfTheSubtree(savedSearch.getDefinitionPoint(), datasetToLinkTo)) {
                     // already there from normal search/browse
                     hitInfo.add(resultString, "Skipping because dataset " + datasetToLinkTo.getId() + " is already part of the subtree for " + savedSearch.getDefinitionPoint().getAlias());
                 } else if (datasetAncestorAlreadyLinked(savedSearch.getDefinitionPoint(), datasetToLinkTo)) {
                     hitInfo.add(resultString, "FIXME: implement this?");
-                } else {
+                }
+                else {
                     DatasetLinkingDataverse link = commandEngine.submitInNewTransaction(new LinkDatasetCommand(dvReq, savedSearch.getDefinitionPoint(), datasetToLinkTo));
                     hitInfo.add(resultString, "Persisted DatasetLinkingDataverse id " + link.getId() + " link of " + link.getDataset() + " to " + link.getLinkingDataverse());
                 }
-            } else if (dvObjectThatDefinitionPointWillLinkTo.isInstanceofDataFile()) {
-                hitInfo.add(resultString, "Skipping because the search matched a file. The matched file id was " + dvObjectThatDefinitionPointWillLinkTo.getId() + ".");
             } else {
                 hitInfo.add(resultString, "Unexpected DvObject type.");
             }
             infoPerHit.add(hitInfo);
         }
-
+        
         JsonObjectBuilder info = getInfo(savedSearch, infoPerHit);
         if (debugFlag) {
             info.add("debug", getDebugInfo(savedSearch));
         }
         savedSearchArrayBuilder.add(info);
         response.add("hits for saved search id " + savedSearch.getId(), savedSearchArrayBuilder);
+        
+        logger.info("SAVED SEARCH (" + savedSearch.getId() + ") total time in ms: " + (new Date().getTime() - start.getTime()));
         return response;
     }
 
+    /**
+     * This method to the reverse of a makeLinksForSingleSavedSearch method.
+     * It removes all Dataset and Dataverse links that match savedSearch's query.
+     * @param dvReq
+     * @param savedSearch
+     * @throws SearchException
+     * @throws CommandException
+     */
+    public void removeLinks(DataverseRequest dvReq, SavedSearch savedSearch) throws SearchException, CommandException {
+        logger.fine("UNLINK SAVED SEARCH (" + savedSearch.getId() + ") START search and unlink process");
+        Date start = new Date();
+        Dataverse linkingDataverse = savedSearch.getDefinitionPoint();
+
+        SolrQueryResponse queryResponse = findHits(savedSearch);
+        for (SolrSearchResult solrSearchResult : queryResponse.getSolrSearchResults()) {
+
+            DvObject dvObjectThatDefinitionPointWillLinkTo = dvObjectService.findDvObject(solrSearchResult.getEntityId());
+            if (dvObjectThatDefinitionPointWillLinkTo == null) {
+                continue;
+            }
+
+            if (dvObjectThatDefinitionPointWillLinkTo.isInstanceofDataverse()) {
+                Dataverse linkedDataverse = (Dataverse) dvObjectThatDefinitionPointWillLinkTo;
+                DataverseLinkingDataverse dvld = dvLinkingService.findDataverseLinkingDataverse(linkedDataverse.getId(), linkingDataverse.getId());
+                if(dvld != null) {
+                    Dataverse dv = commandEngine.submitInNewTransaction(new DeleteDataverseLinkingDataverseCommand(dvReq, linkingDataverse, dvld, true));
+                }
+            } else if (dvObjectThatDefinitionPointWillLinkTo.isInstanceofDataset()) {
+                Dataset linkedDataset = (Dataset) dvObjectThatDefinitionPointWillLinkTo;
+                DatasetLinkingDataverse dsld = dsLinkingService.findDatasetLinkingDataverse(linkedDataset.getId(), linkingDataverse.getId());
+                if(dsld != null) {
+                    Dataset ds = commandEngine.submitInNewTransaction(new DeleteDatasetLinkingDataverseCommand(dvReq, linkedDataset, dsld, true));
+                }
+            }
+        }
+
+        logger.fine("UNLINK SAVED SEARCH (" + savedSearch.getId() + ") total time in ms: " + (new Date().getTime() - start.getTime()));
+    }
+
     private SolrQueryResponse findHits(SavedSearch savedSearch) throws SearchException {
-        String sortField = SearchFields.RELEVANCE;
+        String sortField = SearchFields.TYPE; // first return dataverses, then datasets
         String sortOrder = SortBy.DESCENDING;
         SortBy sortBy = new SortBy(sortField, sortOrder);
         int paginationStart = 0;
@@ -219,16 +301,25 @@ private SolrQueryResponse findHits(SavedSearch savedSearch) throws SearchExcepti
         int numResultsPerPage = Integer.MAX_VALUE;
         List<Dataverse> dataverses = new ArrayList<>();
         dataverses.add(savedSearch.getDefinitionPoint());
-        SolrQueryResponse solrQueryResponse = searchService.search(
-                new DataverseRequest(savedSearch.getCreator(), getHttpServletRequest()),
+        
+        // since saved search can only link Dataverses and Datasets, we can limit our search
+        List<String> searchFilterQueries = savedSearch.getFilterQueriesAsStrings();        
+        searchFilterQueries.add("dvObjectType:(dataverses OR datasets)");
+                        
+        // run the search as GuestUser to only link published objects
+        SolrQueryResponse solrQueryResponse = searchService.getDefaultSearchService().search(
+                new DataverseRequest(GuestUser.get(), getHttpServletRequest()),
                 dataverses,
                 savedSearch.getQuery(),
-                savedSearch.getFilterQueriesAsStrings(),
+                searchFilterQueries,
                 sortBy.getField(),
                 sortBy.getOrder(),
                 paginationStart,
                 dataRelatedToMe,
-                numResultsPerPage
+                numResultsPerPage,
+                false, // do not retrieve entities
+                null,
+                null
         );
         return solrQueryResponse;
     }
@@ -257,18 +348,6 @@ private JsonArrayBuilder getFilterQueries(SavedSearch savedSearch) {
         return filterQueriesArrayBuilder;
     }
 
-    private boolean alreadyLinkedToTheDataverse(Dataverse definitionPoint, Dataverse dataverseToLinkTo) {
-        return dataverseLinkingService.alreadyLinked(definitionPoint, dataverseToLinkTo);
-    }
-
-    private boolean alreadyLinkedToTheDataset(Dataverse definitionPoint, Dataset linkToThisDataset) {
-        return datasetLinkingService.alreadyLinked(definitionPoint, linkToThisDataset);
-    }
-
-    private static boolean wouldResultInLinkingToItself(Dataverse savedSearchDefinitionPoint, Dataverse dataverseToLinkTo) {
-        return savedSearchDefinitionPoint.equals(dataverseToLinkTo);
-    }
-
     private boolean datasetToLinkToIsAlreadyPartOfTheSubtree(Dataverse definitionPoint, Dataset datasetWeMayLinkTo) {
         Dataverse ancestor = datasetWeMayLinkTo.getOwner();
         while (ancestor != null) {
@@ -319,14 +398,12 @@ public static HttpServletRequest getHttpServletRequest() {
          * Saved Search was created. The default IP address in the
          * DataverseRequest constructor is used instead, which as of this
          * writing is 0.0.0.0 to mean "undefined". Is this a feature or a bug?
-         * What is the expected interplay between Saved Search and IP Groups?
-         * Users might be surprised to see certain DvObjects in the results of
-         * their query when creating the Saved Search and later find that those
-         * DvObjects, which are only visible due to an IP Groups membership, are
-         * not found by Saved Search when executed by cron, for example. As of
-         * this writing Saved Search is a superuser-only feature so perhaps IP
-         * Groups are irrelevant because all DvObjects are discoverable to
-         * superusers.
+         * This is not an issue for the search itself, since it is now run as the
+         * Guest User, but would present a problem if the user does not have
+         * permission to create links and could only create the saved search due to 
+         * a granted permission from the IP Group.
+         * As of this writing Saved Search is a superuser-only feature; so IP
+         * Groups are irrelevant because all superusers can create links.
          */
         return null;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/ConfigCheckService.java b/src/main/java/edu/harvard/iq/dataverse/settings/ConfigCheckService.java
new file mode 100644
index 00000000000..96222f40daf
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/settings/ConfigCheckService.java
@@ -0,0 +1,150 @@
+package edu.harvard.iq.dataverse.settings;
+
+import edu.harvard.iq.dataverse.MailServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key;
+import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.MailSessionProducer;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.inject.Inject;
+import jakarta.mail.internet.InternetAddress;
+
+import java.io.IOException;
+import java.nio.file.FileSystemException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@Startup
+@Singleton
+@DependsOn({"StartupFlywayMigrator", "PidProviderFactoryBean"})
+public class ConfigCheckService {
+    
+    private static final Logger logger = Logger.getLogger(ConfigCheckService.class.getCanonicalName());
+    
+    @Inject
+    MailSessionProducer mailSessionProducer;
+    @Inject
+    MailServiceBean mailService;
+    @Inject
+    PidProviderFactoryBean pidProviderFactoryBean;
+
+    public static class ConfigurationError extends RuntimeException {
+        public ConfigurationError(String message) {
+            super(message);
+        }
+    }
+    
+    @PostConstruct
+    public void startup() {
+        if (!checkSystemDirectories() || !checkPidProviders()) {
+            throw new ConfigurationError("Not all configuration checks passed successfully. See logs above.");
+        }
+        
+        // Only checks resulting in warnings, nothing critical that needs to stop deployment
+        checkSystemMailSetup();
+    }
+
+    /**
+     * In this method, we check the existence and write-ability of all important directories we use during
+     * normal operations. It does not include checks for the storage system. If directories are not available,
+     * try to create them (and fail when not allowed to).
+     *
+     * @return True if all checks successful, false otherwise.
+     */
+    public boolean checkSystemDirectories() {
+        Map<Path, String> paths = Map.of(
+                Path.of(JvmSettings.UPLOADS_DIRECTORY.lookup()), "temporary JSF upload space (see " + JvmSettings.UPLOADS_DIRECTORY.getScopedKey() + ")",
+                Path.of(FileUtil.getFilesTempDirectory()), "temporary processing space (see " + JvmSettings.FILES_DIRECTORY.getScopedKey() + ")",
+                Path.of(JvmSettings.DOCROOT_DIRECTORY.lookup()), "docroot space (see " + JvmSettings.DOCROOT_DIRECTORY.getScopedKey() + ")");
+        
+        boolean success = true;
+        for (Path path : paths.keySet()) {
+            // Check if the configured path is absolute - avoid potential problems with relative paths this way
+            if (! path.isAbsolute()) {
+                logger.log(Level.SEVERE, () -> "Configured directory " + path + " for " + paths.get(path) + " is not absolute");
+                success = false;
+                continue;
+            }
+            
+            if (! Files.exists(path)) {
+                try {
+                    Files.createDirectories(path);
+                } catch (IOException e) {
+                    String details;
+                    if (e instanceof FileSystemException) {
+                        details = ": " + e.getClass();
+                    } else {
+                        details = "";
+                    }
+                    
+                    logger.log(Level.SEVERE, () -> "Could not create directory " + path + " for " + paths.get(path) + details);
+                    success = false;
+                }
+            } else if (!Files.isWritable(path)) {
+                logger.log(Level.SEVERE, () -> "Directory " + path + " for " + paths.get(path) + " exists, but is not writeable");
+                success = false;
+            }
+        }
+        return success;
+    }
+    
+    /**
+     * This method is not expected to make a deployment fail, but send out clear warning messages about missing or
+     * wrong configuration settings.
+     */
+    public void checkSystemMailSetup() {
+        // Check if a system mail setting has been provided or issue warning about disabled mail notifications
+        Optional<InternetAddress> mailAddress = mailService.getSystemAddress();
+        
+        // Not present -> warning
+        if (mailAddress.isEmpty()) {
+            logger.warning("Could not find a system mail setting in database (key :" + Key.SystemEmail + ", deprecated) or JVM option '" + JvmSettings.SYSTEM_EMAIL.getScopedKey() + "'");
+            logger.warning("Mail notifications and system messages are deactivated until you provide a configuration");
+        }
+        
+        // If there is an app server provided mail config, let's determine if the setup is matching
+        // TODO: when support for appserver provided mail session goes away, this code can be deleted
+        if (mailSessionProducer.hasSessionFromAppServer()) {
+            if (mailAddress.isEmpty()) {
+                logger.warning("Found a mail session provided by app server, but no system mail address (see logs above)");
+            // Check if the "from" in the session is the same as the system mail address (see issue 4210)
+            } else {
+                String sessionFrom = mailSessionProducer.getSession().getProperty("mail.from");
+                if (! mailAddress.get().toString().equals(sessionFrom)) {
+                    logger.warning(() -> String.format(
+                        "Found app server mail session provided 'from' (%s) does not match system mail setting (%s)",
+                        sessionFrom, mailAddress.get()));
+                }
+            }
+        }
+    }
+
+    /**
+     * Verifies that at least one PidProvider capable of editing/minting PIDs is
+     * configured. Requires the @DependsOn("PidProviderFactoryBean") annotation above
+     * since it is the @PostCOnstruct init() method of that class that loads the PidProviders
+     *
+     * @return True if all checks successful, false otherwise.
+     */
+    private boolean checkPidProviders() {
+        // Check if at least one PidProvider capable of editing/minting PIDs is configured.
+        boolean valid=true;
+        if(!(PidUtil.getManagedProviderIds().size() > 0)) {
+            valid = false;
+            logger.warning("No PID providers configured");
+        }
+        if (pidProviderFactoryBean.getDefaultPidGenerator()==null){
+            valid=false;
+            logger.warning("No default PID provider configured");
+        }
+        return valid;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java b/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java
new file mode 100644
index 00000000000..bbbbc7aee30
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java
@@ -0,0 +1,233 @@
+package edu.harvard.iq.dataverse.settings;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ *     This enum holds so-called "feature flags" aka "feature gates", etc. It can be used throughout the application
+ *     to avoid activating or using experimental functionality or feature previews that are opt-in.
+ * </p><p>
+ *     The current implementation reuses {@link JvmSettings} to interpret any
+ *     <a href="https://download.eclipse.org/microprofile/microprofile-config-3.0/microprofile-config-spec-3.0.html#_built_in_converters">boolean values</a>
+ *     (true == case-insensitive one of "true", "1", "YES", "Y", "ON") and hook into the usual settings system
+ *     (any MicroProfile Config Source available).
+ * </p><p>
+ *     If you add any new flags, please add it here, think of a default status, add some Javadocs about the flagged
+ *     feature and add a "@since" tag to make it easier to identify when a flag has been introduced.
+ * </p><p>
+ *     When removing a flag because of a feature being removed, drop the entry. When a feature matures, drop the flag,
+ *     too! Flags are not meant to be switches for configuration!
+ * </p>
+ *
+ * @see <a href="https://guides.dataverse.org/en/latest/installation/config.html#feature-flags">Configuration Guide</a>
+ * @see <a href="https://guides.dataverse.org/en/latest/developers/configuration.html#adding-a-feature-flag">Developer Guide</a>
+ */
+public enum FeatureFlags {
+
+    /**
+     * Enables API authentication via session cookie (JSESSIONID). Caution: Enabling this feature flag may expose the installation to CSRF risks
+     * @apiNote Raise flag by setting "dataverse.feature.api-session-auth"
+     * @since Dataverse 5.14
+     */
+    API_SESSION_AUTH("api-session-auth"),
+    /**
+     * Enables API authentication via Bearer Token.
+     * @apiNote Raise flag by setting "dataverse.feature.api-bearer-auth"
+     * @since Dataverse 5.14:
+     */
+    API_BEARER_AUTH("api-bearer-auth"),
+    /**
+     * Enables sending the missing user claims in the request JSON provided during OIDC user registration
+     * (see API endpoint /users/register) when these claims are not returned by the identity provider
+     * but are necessary for registering the user in Dataverse.
+     *
+     * <p>The value of this feature flag is only considered when the feature flag
+     * {@link #API_BEARER_AUTH} is enabled.</p>
+     *
+     * @apiNote Raise flag by setting "dataverse.feature.api-bearer-auth-provide-missing-claims"
+     * @since Dataverse 6.6:
+     */
+    API_BEARER_AUTH_PROVIDE_MISSING_CLAIMS("api-bearer-auth-provide-missing-claims"),
+    /**
+     * Specifies that Terms of Service acceptance is handled by the IdP, eliminating the need to include
+     * ToS acceptance boolean parameter (termsAccepted) in the OIDC user registration request body.
+     *
+     * <p>The value of this feature flag is only considered when the feature flag
+     * {@link #API_BEARER_AUTH} is enabled.</p>
+     *
+     * @apiNote Raise flag by setting "dataverse.feature.api-bearer-auth-handle-tos-acceptance-in-idp"
+     * @since Dataverse 6.6:
+     */
+    API_BEARER_AUTH_HANDLE_TOS_ACCEPTANCE_IN_IDP("api-bearer-auth-handle-tos-acceptance-in-idp"),
+    /**
+     * Allows the use of a built-in user account when an identity match is found during API bearer authentication.
+     * This feature enables automatic association of an incoming IdP identity with an existing built-in user account,
+     * bypassing the need for additional user registration steps.
+     *
+     * <p>The value of this feature flag is only considered when the feature flag
+     * {@link #API_BEARER_AUTH} is enabled.</p>
+     *
+     * @apiNote Raise flag by setting "dataverse.feature.api-bearer-auth-use-builtin-user-on-id-match"
+     * @since Dataverse @6.7:
+     */
+    API_BEARER_AUTH_USE_BUILTIN_USER_ON_ID_MATCH("api-bearer-auth-use-builtin-user-on-id-match"),
+
+    /**
+     * Allows the use of a Shibboleth user account when an identity match is found during API bearer authentication.
+     * This feature enables automatic association of an incoming IdP identity with an existing Shibboleth user account,
+     * bypassing the need for additional user registration steps.
+     *
+     * <p>The value of this feature flag is only considered when the feature flag
+     * {@link #API_BEARER_AUTH} is enabled.</p>
+     *
+     * @apiNote Raise flag by setting "dataverse.feature.api-bearer-auth-use-shib-user-on-id-match"
+     * @since Dataverse @TODO:
+     */
+    API_BEARER_AUTH_USE_SHIB_USER_ON_ID_MATCH("api-bearer-auth-use-shib-user-on-id-match"),
+
+    /**
+     * Allows the use of an OAuth user account (GitHub, Google, or ORCID) when an identity match is found during API bearer authentication.
+     * This feature enables automatic association of an incoming IdP identity with an existing OAuth user account,
+     * bypassing the need for additional user registration steps.
+     *
+     * <p>The value of this feature flag is only considered when the feature flag
+     * {@link #API_BEARER_AUTH} is enabled.</p>
+     *
+     * @apiNote Raise flag by setting "dataverse.feature.api-bearer-auth-use-oauth-user-on-id-match"
+     * @since Dataverse 6.8:
+     */
+    API_BEARER_AUTH_USE_OAUTH_USER_ON_ID_MATCH("api-bearer-auth-use-oauth-user-on-id-match"),
+
+    /**
+     * For published (public) objects, don't use a join when searching Solr. 
+     * Experimental! Requires a reindex with the following feature flag enabled,
+     * in order to add the boolean publicObject_b:true field to all the public
+     * Solr documents. 
+     *
+     * @apiNote Raise flag by setting
+     * "dataverse.feature.avoid-expensive-solr-join"
+     * @since Dataverse 6.3
+     */
+    AVOID_EXPENSIVE_SOLR_JOIN("avoid-expensive-solr-join"),
+    /**
+     * With this flag enabled, the boolean field publicObject_b:true will be 
+     * added to all the indexed Solr documents for publicly-available collections,
+     * datasets and files. This flag makes it possible to rely on it in searches,
+     * instead of the very expensive join (the feature flag above).
+     *
+     * @apiNote Raise flag by setting
+     * "dataverse.feature.add-publicobject-solr-field"
+     * @since Dataverse 6.3
+     */
+    ADD_PUBLICOBJECT_SOLR_FIELD("add-publicobject-solr-field"),
+    /**
+     * With this flag set, Dataverse will index the actual origin of harvested
+     * metadata records, instead of the "Harvested" string in all cases. 
+     * 
+     * @apiNote Raise flag by setting
+     * "dataverse.feature.index-harvested-metadata-source"
+     * @since Dataverse 6.3
+     */
+    INDEX_HARVESTED_METADATA_SOURCE("index-harvested-metadata-source"),
+    /**
+     * Dataverse normally deletes all solr documents related to a dataset's files
+     * when the dataset is reindexed. With this flag enabled, additional logic is
+     * added to the reindex process to delete only the solr documents that are no
+     * longer needed. (Required docs will be updated rather than deleted and 
+     * replaced.) Enabling this feature flag should make the reindex process 
+     * faster without impacting the search results.
+     *
+     * @apiNote Raise flag by setting
+     * "dataverse.feature.reduce-solr-deletes"
+     * @since Dataverse 6.3
+     */
+    REDUCE_SOLR_DELETES("reduce-solr-deletes"),
+    /**
+     * With this flag enabled, the Return To Author pop-up will not have a required
+     * "Reason" field, and a reason will not be required in the 
+     * /api/datasets/{id}/returnToAuthor api call.
+     * 
+     * @apiNote Raise flag by setting
+     * "dataverse.feature.disable-return-to-author-reason"
+     * @since Dataverse 6.3
+     */
+    DISABLE_RETURN_TO_AUTHOR_REASON("disable-return-to-author-reason"),
+    /**
+     * This flag disables the feature that automatically selects one of the 
+     * DataFile thumbnails in the dataset/version as the dedicated thumbnail
+     * for the dataset.
+     * 
+     * @apiNote Raise flag by setting
+     * "dataverse.feature.disable-dataset-thumbnail-autoselect"
+     * @since Dataverse 6.4
+     */
+    DISABLE_DATASET_THUMBNAIL_AUTOSELECT("disable-dataset-thumbnail-autoselect"),
+    /**
+     * Feature flag for the new Globus upload framework.
+     * 
+     * @apiNote Raise flag by setting
+     * "dataverse.feature.globus-use-experimental-async-framework"
+     * @since Dataverse 6.4
+     */
+    GLOBUS_USE_EXPERIMENTAL_ASYNC_FRAMEWORK("globus-use-experimental-async-framework"),
+    /**
+     * This flag adds a note field to input/display a reason explaining why a version was created.
+     * 
+     * @apiNote Raise flag by setting
+     * "dataverse.feature.enable-version-creation-note"
+     * @since Dataverse 6.5
+     */
+    VERSION_NOTE("enable-version-note"),
+    /**
+     * This flag adds a permission check to assure that the user calling the
+     * /api/localcontexts/datasets/{id} can edit the dataset with that id. This is
+     * currently the only use case - see
+     * https://github.com/gdcc/dataverse-external-vocab-support/tree/main/packages/local_contexts.
+     * The flag adds additional security to stop other uses, but would currently
+     * have to be used in conjunction with the api-session-auth feature flag (the
+     * security implications of which have not been fully investigated) to still
+     * allow adding Local Contexts metadata to a dataset.
+     * 
+     * @apiNote Raise flag by setting
+     *          "dataverse.feature.add-local-contexts-permission-check"
+     * @since Dataverse 6.5
+     */
+    ADD_LOCAL_CONTEXTS_PERMISSION_CHECK("add-local-contexts-permission-check"),
+
+    ;
+    
+    final String flag;
+    final boolean defaultStatus;
+    
+    /**
+     * Construct a flag with default status "off".
+     *
+     * @param flag This flag name will be used to create a scoped String with {@link JvmSettings#FEATURE_FLAG},
+     *             making it available as "dataverse.feature.${flag}".
+     */
+    FeatureFlags(String flag) {
+        this(flag, false);
+    }
+    
+    /**
+     * Construct a flag.
+     * @param flag This flag name will be used to create a scoped String with {@link JvmSettings#FEATURE_FLAG},
+     *             making it available as "dataverse.feature.${flag}".
+     * @param defaultStatus A sensible default should be given here. Probably this will be "false" for most
+     *                      experimental feature previews.
+     */
+    FeatureFlags(String flag, boolean defaultStatus) {
+        Objects.requireNonNull(flag);
+        this.flag = flag;
+        this.defaultStatus = defaultStatus;
+    }
+    
+    /**
+     * Determine the status of this flag via {@link JvmSettings}.
+     * @return True or false, depending on the configuration or {@link #defaultStatus} if not found.
+     */
+    public boolean enabled() {
+        return JvmSettings.FEATURE_FLAG.lookupOptional(Boolean.class, flag).orElse(defaultStatus);
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java
new file mode 100644
index 00000000000..53dff244ae1
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java
@@ -0,0 +1,607 @@
+package edu.harvard.iq.dataverse.settings;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * Enum to store each and every JVM-based setting as a reference,
+ * much like the enum {@link SettingsServiceBean.Key} for DB settings.
+ *
+ * To be able to have more control over JVM settings names,
+ * avoid typos, maybe create lists of settings and so on,
+ * this enum will provide the place to add any old and new
+ * settings that are destined to be made at the JVM level.
+ *
+ * Further future extensions of this enum class include
+ * - adding predicates for validation and
+ * - adding data manipulation for aliased config names.
+ *
+ * To create a setting, simply add it within a scope:
+ * {@link JvmSettings#JvmSettings(JvmSettings, String)}
+ *
+ * Settings that might get renamed may provide their old names as aliases:
+ * {@link JvmSettings#JvmSettings(JvmSettings, String, String...)}
+ *
+ * Some scopes or settings may need one or more placeholders, simply don't give
+ * a key in these cases:
+ * {@link JvmSettings#JvmSettings(JvmSettings)}
+ *
+ */
+public enum JvmSettings {
+    // the upmost root scope - every setting shall start with it.
+    PREFIX("dataverse"),
+    
+    // GENERAL SETTINGS
+    VERSION(PREFIX, "version"),
+    BUILD(PREFIX, "build"),
+    FQDN(PREFIX, "fqdn"),
+    SITE_URL(PREFIX, "siteUrl"),
+    
+    // FILES SETTINGS
+    SCOPE_FILES(PREFIX, "files"),
+    FILES_DIRECTORY(SCOPE_FILES, "directory"),
+    UPLOADS_DIRECTORY(SCOPE_FILES, "uploads"),
+    DOCROOT_DIRECTORY(SCOPE_FILES, "docroot"),
+    GUESTBOOK_AT_REQUEST(SCOPE_FILES, "guestbook-at-request"),
+    GLOBUS_CACHE_MAXAGE(SCOPE_FILES, "globus-cache-maxage"),
+    GLOBUS_TASK_MONITORING_SERVER(SCOPE_FILES, "globus-monitoring-server"),
+    SCOPE_FEATURED_ITEMS(SCOPE_FILES, "featured-items"),
+    FEATURED_ITEMS_IMAGE_MAXSIZE(SCOPE_FEATURED_ITEMS, "image-maxsize"),
+    FEATURED_ITEMS_IMAGE_UPLOADS_DIRECTORY(SCOPE_FEATURED_ITEMS, "image-uploads"),
+    HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS(SCOPE_FILES, "hide-schema-dot-org-download-urls"),
+    DEFAULT_DATASET_FILE_COUNT_LIMIT(SCOPE_FILES, "default-dataset-file-count-limit"),
+
+    //STORAGE DRIVER SETTINGS
+    SCOPE_DRIVER(SCOPE_FILES),
+    DISABLE_S3_TAGGING(SCOPE_DRIVER, "disable-tagging"),
+    
+    // SOLR INDEX SETTINGS
+    SCOPE_SOLR(PREFIX, "solr"),
+    SOLR_HOST(SCOPE_SOLR, "host"),
+    SOLR_PORT(SCOPE_SOLR, "port"),
+    SOLR_PROT(SCOPE_SOLR, "protocol"),
+    SOLR_CORE(SCOPE_SOLR, "core"),
+    SOLR_PATH(SCOPE_SOLR, "path"),
+    MIN_FILES_TO_USE_PROXY(SCOPE_SOLR, "min-files-to-use-proxy"),
+
+
+    // INDEX CONCURENCY
+    SCOPE_SOLR_CONCURENCY(SCOPE_SOLR, "concurrency"),
+    MAX_ASYNC_INDEXES(SCOPE_SOLR_CONCURENCY, "max-async-indexes"),
+
+    // RSERVE CONNECTION
+    SCOPE_RSERVE(PREFIX, "rserve"),
+    RSERVE_HOST(SCOPE_RSERVE, "host"),
+    RSERVE_PORT(SCOPE_RSERVE, "port", "dataverse.ingest.rserve.port"),
+    RSERVE_USER(SCOPE_RSERVE, "user"),
+    RSERVE_PASSWORD(SCOPE_RSERVE, "password"),
+    RSERVE_TEMPDIR(SCOPE_RSERVE, "tempdir"),
+    
+    // API SETTINGS
+    SCOPE_API(PREFIX, "api"),
+    API_SIGNING_SECRET(SCOPE_API, "signing-secret"),
+    API_ALLOW_INCOMPLETE_METADATA(SCOPE_API, "allow-incomplete-metadata"),
+    // API: BLOCKED_API SETTINGS
+    SCOPE_API_BLOCKED(SCOPE_API, "blocked"),
+    API_BLOCKED_ENDPOINTS(SCOPE_API_BLOCKED, "endpoints"),
+    API_BLOCKED_POLICY(SCOPE_API_BLOCKED, "policy"),
+    API_BLOCKED_KEY(SCOPE_API_BLOCKED, "key"),
+
+    // SIGNPOSTING SETTINGS
+    SCOPE_SIGNPOSTING(PREFIX, "signposting"),
+    SIGNPOSTING_LEVEL1_AUTHOR_LIMIT(SCOPE_SIGNPOSTING, "level1-author-limit"),
+    SIGNPOSTING_LEVEL1_ITEM_LIMIT(SCOPE_SIGNPOSTING, "level1-item-limit"),
+
+    // FEATURE FLAGS SETTINGS
+    SCOPE_FLAGS(PREFIX, "feature"),
+    // This is a special placeholder-type setting entry, to be filled in by FeatureFlag entries during lookup.
+    // Avoids adding flag entries twice.
+    FEATURE_FLAG(SCOPE_FLAGS),
+    
+    // METADATA SETTINGS
+    SCOPE_METADATA(PREFIX, "metadata"),
+    MDB_SYSTEM_METADATA_KEYS(SCOPE_METADATA, "block-system-metadata-keys"),
+    MDB_SYSTEM_KEY_FOR(MDB_SYSTEM_METADATA_KEYS),
+
+    // PERSISTENT IDENTIFIER SETTINGS
+    SCOPE_PID(PREFIX, "pid"),
+    PID_PROVIDERS(SCOPE_PID, "providers"),
+    PID_DEFAULT_PROVIDER(SCOPE_PID, "default-provider"),
+    SCOPE_PID_PROVIDER(SCOPE_PID),
+    PID_PROVIDER_TYPE(SCOPE_PID_PROVIDER, "type"),
+    PID_PROVIDER_LABEL(SCOPE_PID_PROVIDER, "label"),
+    PID_PROVIDER_AUTHORITY(SCOPE_PID_PROVIDER, "authority"),
+    PID_PROVIDER_SHOULDER(SCOPE_PID_PROVIDER, "shoulder"),
+    PID_PROVIDER_IDENTIFIER_GENERATION_STYLE(SCOPE_PID_PROVIDER, "identifier-generation-style"),
+    PID_PROVIDER_DATAFILE_PID_FORMAT(SCOPE_PID_PROVIDER, "datafile-pid-format"),
+    PID_PROVIDER_MANAGED_LIST(SCOPE_PID_PROVIDER, "managed-list"),
+    PID_PROVIDER_EXCLUDED_LIST(SCOPE_PID_PROVIDER, "excluded-list"),
+
+        
+    // PROVIDER EZID - these settings were formerly kept together with DataCite ones
+    SCOPE_PID_EZID(SCOPE_PID_PROVIDER, "ezid"),
+    EZID_API_URL(SCOPE_PID_EZID, "api-url"),
+    EZID_USERNAME(SCOPE_PID_EZID, "username"),
+    EZID_PASSWORD(SCOPE_PID_EZID, "password"),
+    
+    // PROVIDER DATACITE
+    SCOPE_PID_DATACITE(SCOPE_PID_PROVIDER, "datacite"),
+    DATACITE_MDS_API_URL(SCOPE_PID_DATACITE, "mds-api-url"),
+    DATACITE_REST_API_URL(SCOPE_PID_DATACITE, "rest-api-url"),
+    DATACITE_USERNAME(SCOPE_PID_DATACITE, "username"),
+    DATACITE_PASSWORD(SCOPE_PID_DATACITE, "password"),
+
+    // PROVIDER CROSSREF
+    SCOPE_PID_CROSSREF(SCOPE_PID_PROVIDER, "crossref"),
+    CROSSREF_URL(SCOPE_PID_CROSSREF, "url"),
+    CROSSREF_REST_API_URL(SCOPE_PID_CROSSREF, "rest-api-url"),
+    CROSSREF_USERNAME(SCOPE_PID_CROSSREF, "username"),
+    CROSSREF_PASSWORD(SCOPE_PID_CROSSREF, "password"),
+    CROSSREF_DEPOSITOR(SCOPE_PID_CROSSREF, "depositor"),
+    CROSSREF_DEPOSITOR_EMAIL(SCOPE_PID_CROSSREF, "depositor-email"),
+
+    // PROVIDER PERMALINK
+    SCOPE_PID_PERMALINK(SCOPE_PID_PROVIDER, "permalink"),
+    PERMALINK_BASE_URL(SCOPE_PID_PERMALINK, "base-url"),
+    PERMALINK_SEPARATOR(SCOPE_PID_PERMALINK, "separator"),
+    
+    // PROVIDER HANDLE
+    SCOPE_PID_HANDLENET(SCOPE_PID_PROVIDER, "handlenet"),
+    HANDLENET_INDEX(SCOPE_PID_HANDLENET, "index"),
+    HANDLENET_INDEPENDENT_SERVICE(SCOPE_PID_HANDLENET, "independent-service"),
+    HANDLENET_AUTH_HANDLE(SCOPE_PID_HANDLENET, "auth-handle"),
+    SCOPE_PID_HANDLENET_KEY(SCOPE_PID_HANDLENET, "key"),
+    HANDLENET_KEY_PATH(SCOPE_PID_HANDLENET_KEY, "path"),
+    HANDLENET_KEY_PASSPHRASE(SCOPE_PID_HANDLENET_KEY, "passphrase"),
+
+    /*
+     * The deprecated legacy settings below are from when you could only have a
+     * single PIDProvider. They mirror the settings above, but are global,not within
+     * the SCOPE_PID_PROVIDER of an individual provider.
+     */
+    /**
+     * DEPRECATED PROVIDER DATACITE
+     * 
+     * @deprecated - legacy single provider setting providing backward compatibility
+     */
+    @Deprecated(forRemoval = true, since = "2024-02-13")
+    SCOPE_LEGACY_PID_DATACITE(SCOPE_PID, "datacite"),
+    LEGACY_DATACITE_MDS_API_URL(SCOPE_LEGACY_PID_DATACITE, "mds-api-url", "doi.baseurlstring"),
+    LEGACY_DATACITE_REST_API_URL(SCOPE_LEGACY_PID_DATACITE, "rest-api-url", "doi.dataciterestapiurlstring",
+            "doi.mdcbaseurlstring"),
+    LEGACY_DATACITE_USERNAME(SCOPE_LEGACY_PID_DATACITE, "username", "doi.username"),
+    LEGACY_DATACITE_PASSWORD(SCOPE_LEGACY_PID_DATACITE, "password", "doi.password"),
+
+    /**
+     * DEPRECATED PROVIDER EZID
+     * 
+     * @deprecated - legacy single provider setting providing backward compatibility
+     */
+    @Deprecated(forRemoval = true, since = "2024-02-13")
+    SCOPE_LEGACY_PID_EZID(SCOPE_PID, "ezid"), LEGACY_EZID_API_URL(SCOPE_LEGACY_PID_EZID, "api-url"),
+    LEGACY_EZID_USERNAME(SCOPE_LEGACY_PID_EZID, "username"), LEGACY_EZID_PASSWORD(SCOPE_LEGACY_PID_EZID, "password"),
+
+    /**
+     * DEPRECATED PROVIDER PERMALINK
+     * 
+     * @deprecated - legacy single provider setting providing backward compatibility
+     */
+    @Deprecated(forRemoval = true, since = "2024-02-13")
+    SCOPE_LEGACY_PID_PERMALINK(SCOPE_PID, "permalink"),
+    LEGACY_PERMALINK_BASEURL(SCOPE_LEGACY_PID_PERMALINK, "base-url", "perma.baseurlstring"),
+
+    /**
+     * DEPRECATED PROVIDER HANDLE
+     * 
+     * @deprecated - legacy single provider setting providing backward compatibility
+     */
+    @Deprecated(forRemoval = true, since = "2024-02-13")
+    SCOPE_LEGACY_PID_HANDLENET(SCOPE_PID, "handlenet"),
+    LEGACY_HANDLENET_INDEX(SCOPE_LEGACY_PID_HANDLENET, "index", "dataverse.handlenet.index"),
+    @Deprecated(forRemoval = true, since = "2024-02-13")
+    SCOPE_LEGACY_PID_HANDLENET_KEY(SCOPE_LEGACY_PID_HANDLENET, "key"),
+    LEGACY_HANDLENET_KEY_PATH(SCOPE_LEGACY_PID_HANDLENET_KEY, "path", "dataverse.handlenet.admcredfile"),
+    LEGACY_HANDLENET_KEY_PASSPHRASE(SCOPE_LEGACY_PID_HANDLENET_KEY, "passphrase", "dataverse.handlenet.admprivphrase"),
+
+    // SPI SETTINGS
+    SCOPE_SPI(PREFIX, "spi"),
+    SCOPE_EXPORTERS(SCOPE_SPI, "exporters"),
+    EXPORTERS_DIRECTORY(SCOPE_EXPORTERS, "directory"),
+    SCOPE_PIDPROVIDERS(SCOPE_SPI, "pidproviders"),
+    PIDPROVIDERS_DIRECTORY(SCOPE_PIDPROVIDERS, "directory"),
+    
+    // SEARCH SERVICES SETTINGS
+    SCOPE_SEARCH(PREFIX, "search"),
+    SCOPE_SEARCHSERVICES(SCOPE_SEARCH, "services"),
+    SEARCHSERVICES_DIRECTORY(SCOPE_SEARCHSERVICES, "directory"),
+    DEFAULT_SEARCH_SERVICE(SCOPE_SEARCH, "default-service"),
+    
+    // MAIL SETTINGS
+    SCOPE_MAIL(PREFIX, "mail"),
+    SYSTEM_EMAIL(SCOPE_MAIL, "system-email"),
+    SUPPORT_EMAIL(SCOPE_MAIL, "support-email"),
+    CC_SUPPORT_ON_CONTACT_EMAIL(SCOPE_MAIL, "cc-support-on-contact-email"),
+    MAIL_DEBUG(SCOPE_MAIL, "debug"),
+    // Mail Transfer Agent settings
+    SCOPE_MAIL_MTA(SCOPE_MAIL, "mta"),
+    MAIL_MTA_AUTH(SCOPE_MAIL_MTA, "auth"),
+    MAIL_MTA_USER(SCOPE_MAIL_MTA, "user"),
+    MAIL_MTA_PASSWORD(SCOPE_MAIL_MTA, "password"),
+    MAIL_MTA_SUPPORT_UTF8(SCOPE_MAIL_MTA, "allow-utf8-addresses"),
+    // Placeholder setting for a large list of extra settings
+    MAIL_MTA_SETTING(SCOPE_MAIL_MTA),
+    
+    // AUTH SETTINGS
+    SCOPE_AUTH(PREFIX, "auth"),
+    // AUTH: OIDC SETTINGS
+    SCOPE_OIDC(SCOPE_AUTH, "oidc"),
+    OIDC_ENABLED(SCOPE_OIDC, "enabled"),
+    OIDC_TITLE(SCOPE_OIDC, "title"),
+    OIDC_SUBTITLE(SCOPE_OIDC, "subtitle"),
+    OIDC_AUTH_SERVER_URL(SCOPE_OIDC, "auth-server-url"),
+    OIDC_CLIENT_ID(SCOPE_OIDC, "client-id"),
+    OIDC_CLIENT_SECRET(SCOPE_OIDC, "client-secret"),
+    SCOPE_OIDC_PKCE(SCOPE_OIDC, "pkce"),
+    OIDC_PKCE_ENABLED(SCOPE_OIDC_PKCE, "enabled"),
+    OIDC_PKCE_METHOD(SCOPE_OIDC_PKCE, "method"),
+    OIDC_PKCE_CACHE_MAXSIZE(SCOPE_OIDC_PKCE, "max-cache-size"),
+    OIDC_PKCE_CACHE_MAXAGE(SCOPE_OIDC_PKCE, "max-cache-age"),
+
+    // UI SETTINGS
+    SCOPE_UI(PREFIX, "ui"),
+    UI_ALLOW_REVIEW_INCOMPLETE(SCOPE_UI, "allow-review-for-incomplete"),
+    UI_SHOW_VALIDITY_FILTER(SCOPE_UI, "show-validity-filter"),
+    UI_SHOW_VALIDITY_LABEL_WHEN_PUBLISHED(SCOPE_UI, "show-validity-label-when-published"),
+    UI_SHOW_CURATION_STATUS_TO_ALL(SCOPE_UI, "show-curation-status-to-all"),
+
+    // NetCDF SETTINGS
+    SCOPE_NETCDF(PREFIX, "netcdf"),
+    GEO_EXTRACT_S3_DIRECT_UPLOAD(SCOPE_NETCDF, "geo-extract-s3-direct-upload"),
+
+    // BAGIT SETTINGS
+    SCOPE_BAGIT(PREFIX, "bagit"),
+    SCOPE_BAGIT_SOURCEORG(SCOPE_BAGIT, "sourceorg"),
+    BAGIT_SOURCE_ORG_NAME(SCOPE_BAGIT_SOURCEORG, "name"),
+    BAGIT_SOURCEORG_ADDRESS(SCOPE_BAGIT_SOURCEORG, "address"),
+    BAGIT_SOURCEORG_EMAIL(SCOPE_BAGIT_SOURCEORG, "email"),
+
+    // STORAGE USE SETTINGS
+    SCOPE_STORAGEUSE(PREFIX, "storageuse"),
+    STORAGEUSE_DISABLE_UPDATES(SCOPE_STORAGEUSE, "disable-storageuse-increments"),
+    
+    //CSL CITATION SETTINGS
+    SCOPE_CSL(PREFIX, "csl"),
+    CSL_COMMON_STYLES(SCOPE_CSL, "common-styles"),
+
+    // PersonOrOrgUtil SETTINGS
+    SCOPE_PERSONORORG(PREFIX, "person-or-org"),
+    ASSUME_COMMA_IN_PERSON_NAME(SCOPE_PERSONORORG, "assume-comma-in-person-name", "dataverse.personOrOrg.assumeCommaInPersonName"),
+    ORG_PHRASE_ARRAY(SCOPE_PERSONORORG, "org-phrase-array"),
+
+    // CORS SETTINGS
+    SCOPE_CORS(PREFIX, "cors"),
+    CORS_ORIGIN(SCOPE_CORS, "origin"),
+    CORS_METHODS(SCOPE_CORS, "methods"),
+    SCOPE_CORS_HEADERS(SCOPE_CORS, "headers"),
+    CORS_ALLOW_HEADERS(SCOPE_CORS_HEADERS, "allow"),
+    CORS_EXPOSE_HEADERS(SCOPE_CORS_HEADERS, "expose"),
+    
+    // LOCALCONTEXTS
+    SCOPE_LOCALCONTEXTS(PREFIX, "localcontexts"),
+    LOCALCONTEXTS_URL(SCOPE_LOCALCONTEXTS, "url"),
+    LOCALCONTEXTS_API_KEY(SCOPE_LOCALCONTEXTS, "api-key"),
+    ;
+
+    private static final String SCOPE_SEPARATOR = ".";
+    public static final String PLACEHOLDER_KEY = "%s";
+    private static final Pattern OLD_NAME_PLACEHOLDER_PATTERN = Pattern.compile("%(\\d\\$)?s");
+    
+    private final String key;
+    private final String scopedKey;
+    private final JvmSettings parent;
+    private final List<String> oldNames;
+    private final int placeholders;
+    
+    /**
+     * Create a root scope.
+     * @param key The scopes name.
+     */
+    JvmSettings(String key) {
+        this.key = key;
+        this.scopedKey = key;
+        this.parent = null;
+        this.oldNames = List.of();
+        this.placeholders = 0;
+    }
+    
+    /**
+     * Create a scope or setting with a placeholder for a variable argument in it.
+     * Used to create "configurable objects" with certain attributes using dynamic, programmatic lookup.
+     *
+     * Any placeholder present in a settings full scoped key will be replaced when looked up
+     * via {@link #lookup(Class, String...)}.
+     *
+     * @param scope The parent scope.
+     */
+    JvmSettings(JvmSettings scope) {
+        this.key = PLACEHOLDER_KEY;
+        this.scopedKey = scope.scopedKey + SCOPE_SEPARATOR + this.key;
+        this.parent = scope;
+        this.oldNames = List.of();
+        this.placeholders = scope.placeholders + 1;
+    }
+    
+    /**
+     * Create a scope or setting with name it and associate with a parent scope.
+     * @param scope The parent scope.
+     * @param key The name of this scope or setting.
+     */
+    JvmSettings(JvmSettings scope, String key) {
+        this.key = key;
+        this.scopedKey = scope.scopedKey + SCOPE_SEPARATOR + key;
+        this.parent = scope;
+        this.oldNames = List.of();
+        this.placeholders = scope.placeholders;
+    }
+    
+    /**
+     * Create a setting with name it and associate with a parent scope.
+     * (Could also be a scope, but old names for scopes aren't the way this is designed.)
+     *
+     * When old names are given, these need to be given as fully scoped setting names! (Otherwise
+     * it would not be possible to switch between completely different scopes.)
+     *
+     * @param scope The parent scope of this setting.
+     * @param key The name of the setting.
+     * @param oldNames Any previous names this setting was known as.
+     *                 Must be given as fully scopes names, not just the old unscoped key/name.
+     *                 Used by {@link edu.harvard.iq.dataverse.settings.source.AliasConfigSource} to allow backward
+     *                 compatible, non-breaking deprecation and switching to new setting names.
+     */
+    JvmSettings(JvmSettings scope, String key, String... oldNames) {
+        this.key = key;
+        this.scopedKey = scope.scopedKey + SCOPE_SEPARATOR + key;
+        this.parent = scope;
+        this.oldNames = Arrays.stream(oldNames).collect(Collectors.toUnmodifiableList());
+        this.placeholders = scope.placeholders;
+    }
+    
+    private static final List<JvmSettings> aliased = new ArrayList<>();
+    static {
+        for (JvmSettings setting : JvmSettings.values()) {
+            if (!setting.oldNames.isEmpty()) {
+                aliased.add(setting);
+            }
+        }
+    }
+    
+    /**
+     * Get all settings having old names to include them in {@link edu.harvard.iq.dataverse.settings.source.AliasConfigSource}
+     * @return List of settings with old alias names. Can be empty, but will not be null.
+     */
+    public static List<JvmSettings> getAliasedSettings() {
+        return Collections.unmodifiableList(aliased);
+    }
+    
+    /**
+     * Return a list of old names to be used as aliases for backward compatibility.
+     * Will return empty list if no old names present.
+     *
+     * This method should only be used by {@link edu.harvard.iq.dataverse.settings.source.AliasConfigSource}.
+     * In case of a setting containing placeholder(s), it will check any old names given in the definition
+     * for presence of at least one placeholder plus it doesn't use more placeholders than available.
+     * (Old names containing placeholders for settings without any are checked, too.)
+     *
+     * Violations will result in a {@link IllegalArgumentException} and will be noticed during any test execution.
+     * A developer must fix the old name definition before shipping the code.
+     *
+     * @return List of old names, may be empty, but never null.
+     * @throws IllegalArgumentException When an old name has no or too many placeholders for this setting.
+     */
+    public List<String> getOldNames() {
+        if (needsVarArgs()) {
+            for (String name : oldNames) {
+                long matches = OLD_NAME_PLACEHOLDER_PATTERN.matcher(name).results().count();
+                
+                if (matches == 0) {
+                    throw new IllegalArgumentException("JvmSettings." + this.name() + "'s old name '" +
+                        name + "' needs at least one placeholder");
+                } else if (matches > this.placeholders) {
+                    throw new IllegalArgumentException("JvmSettings." + this.name() + "'s old name '" +
+                        name + "' has more placeholders than the current name");
+                }
+            }
+        } else if (! this.oldNames.stream().noneMatch(OLD_NAME_PLACEHOLDER_PATTERN.asPredicate())) {
+            throw new IllegalArgumentException("JvmSettings." + this.name() + " has no placeholder but old name requires it");
+        }
+        
+        return oldNames;
+    }
+    
+    /**
+     * Retrieve the scoped key for this setting. Scopes are separated by dots.
+     * If the setting contains placeholders, these will be represented as {@link #PLACEHOLDER_KEY}.
+     *
+     * @return The scoped key (or the key if no scope). Example: dataverse.subscope.subsubscope.key
+     */
+    public String getScopedKey() {
+        return this.scopedKey;
+    }
+    
+    public Pattern getPatternizedKey() {
+        return Pattern.compile(
+            getScopedKey()
+                .replace(SCOPE_SEPARATOR, "\\.")
+                .replace(PLACEHOLDER_KEY, "(.+?)"));
+    }
+    
+    
+    /**
+     * Does this setting carry and placeholders for variable arguments?
+     * @return True if so, False otherwise.
+     */
+    public boolean needsVarArgs() {
+        return this.placeholders > 0;
+    }
+    
+    /**
+     * Return the number of placeholders / variable arguments are necessary to lookup this setting.
+     * An exact match in the number of arguments will be necessary for a successful lookup.
+     * @return Number of placeholders for this scoped setting.
+     */
+    public int numberOfVarArgs() {
+        return placeholders;
+    }
+    
+    /**
+     * Lookup this setting via MicroProfile Config as a required option (it will fail if not present).
+     * @throws java.util.NoSuchElementException - if the property is not defined or is defined as an empty string
+     * @return The setting as a String
+     */
+    public String lookup() {
+        return lookup(String.class);
+    }
+    
+    /**
+     * Lookup this setting via MicroProfile Config as an optional setting.
+     * @return The setting as String wrapped in a (potentially empty) Optional
+     */
+    public Optional<String> lookupOptional() {
+        return lookupOptional(String.class);
+    }
+    
+    /**
+     * Lookup this setting via MicroProfile Config as a required option (it will fail if not present).
+     *
+     * @param klass The target type class to convert the setting to if found and not null
+     * @return The setting as an instance of {@link T}
+     * @param <T> Target type to convert the setting to (you can create custom converters)
+     *
+     * @throws java.util.NoSuchElementException When the property is not defined or is defined as an empty string.
+     * @throws IllegalArgumentException When the settings value could not be converted to target type.
+     */
+    public <T> T lookup(Class<T> klass) {
+        if (needsVarArgs()) {
+            throw new IllegalArgumentException("Cannot lookup a setting containing placeholders with this method.");
+        }
+        
+        // This must be done with the full-fledged lookup, as we cannot store the config in an instance or static
+        // variable, as the alias config source depends on this enum (circular dependency). This is easiest
+        // avoided by looking up the static cached config at the cost of a method invocation.
+        return ConfigProvider.getConfig().getValue(this.getScopedKey(), klass);
+    }
+    
+    /**
+     * Lookup this setting via MicroProfile Config as an optional setting.
+     *
+     * @param klass The target type class to convert the setting to if found and not null
+     * @param <T> Target type to convert the setting to (you can create custom converters)
+     * @return The setting as an instance of {@link Optional<T>} or an empty Optional
+     *
+     * @throws IllegalArgumentException When the settings value could not be converted to target type.
+     */
+    public <T> Optional<T> lookupOptional(Class<T> klass) {
+        if (needsVarArgs()) {
+            throw new IllegalArgumentException("Cannot lookup a setting containing variable arguments with this method.");
+        }
+        
+        // This must be done with the full-fledged lookup, as we cannot store the config in an instance or static
+        // variable, as the alias config source depends on this enum (circular dependency). This is easiest
+        // avoided by looking up the static cached config at the cost of a method invocation.
+        return ConfigProvider.getConfig().getOptionalValue(this.getScopedKey(), klass);
+    }
+    
+    /**
+     * Lookup a required setting containing placeholders for arguments like a name and return as plain String.
+     * To use type conversion, use {@link #lookup(Class, String...)}.
+     *
+     * @param arguments The var args to replace the placeholders of this setting.
+     * @return The value of the setting.
+     *
+     * @throws java.util.NoSuchElementException When the setting has not been set in any MPCONFIG source or is an empty string.
+     * @throws IllegalArgumentException When using it on a setting without placeholders.
+     * @throws IllegalArgumentException When not providing as many arguments as there are placeholders.
+     */
+    public String lookup(String... arguments) {
+        return lookup(String.class, arguments);
+    }
+    
+    /**
+     * Lookup an optional setting containing placeholders for arguments like a name and return as plain String.
+     * To use type conversion, use {@link #lookupOptional(Class, String...)}.
+     *
+     * @param arguments The var args to replace the placeholders of this setting.
+     * @return The value as an instance of {@link Optional<String>} or an empty Optional
+     *
+     * @throws IllegalArgumentException When using it on a setting without placeholders.
+     * @throws IllegalArgumentException When not providing as many arguments as there are placeholders.
+     */
+    public Optional<String> lookupOptional(String... arguments) {
+        return lookupOptional(String.class, arguments);
+    }
+    
+    /**
+     * Lookup a required setting containing placeholders for arguments like a name and return as converted type.
+     * To avoid type conversion, use {@link #lookup(String...)}.
+     *
+     * @param klass The target type class.
+     * @param arguments The var args to replace the placeholders of this setting.
+     * @param <T> Target type to convert the setting to (you can create custom converters)
+     * @return The value of the setting, converted to the given type.
+     *
+     * @throws java.util.NoSuchElementException When the setting has not been set in any MPCONFIG source or is an empty string.
+     * @throws IllegalArgumentException When using it on a setting without placeholders.
+     * @throws IllegalArgumentException When not providing as many arguments as there are placeholders.
+     * @throws IllegalArgumentException When the settings value could not be converted to the target type.
+     */
+    public <T> T lookup(Class<T> klass, String... arguments) {
+        if (needsVarArgs()) {
+            if (arguments == null || arguments.length != placeholders) {
+                throw new IllegalArgumentException("You must specify " + placeholders + " placeholder lookup arguments.");
+            }
+            return ConfigProvider.getConfig().getValue(this.insert(arguments), klass);
+        }
+        throw new IllegalArgumentException("Cannot lookup a setting without variable arguments with this method.");
+    }
+    
+    /**
+     * Lookup an optional setting containing placeholders for arguments like a name and return as converted type.
+     * To avoid type conversion, use {@link #lookupOptional(String...)}.
+     *
+     * @param klass The target type class.
+     * @param arguments The var args to replace the placeholders of this setting.
+     * @param <T> Target type to convert the setting to (you can create custom converters)
+     * @return The value as an instance of {@link Optional<T>} or an empty Optional
+     *
+     * @throws IllegalArgumentException When using it on a setting without placeholders.
+     * @throws IllegalArgumentException When not providing as many arguments as there are placeholders.
+     * @throws IllegalArgumentException When the settings value could not be converted to the target type.
+     */
+    public <T> Optional<T> lookupOptional(Class<T> klass, String... arguments) {
+        if (needsVarArgs()) {
+            if (arguments == null || arguments.length != placeholders) {
+                throw new IllegalArgumentException("You must specify " + placeholders + " placeholder lookup arguments.");
+            }
+            return ConfigProvider.getConfig().getOptionalValue(this.insert(arguments), klass);
+        }
+        throw new IllegalArgumentException("Cannot lookup a setting without variable arguments with this method.");
+    }
+    
+    /**
+     * Inject arguments into the placeholders of this setting. Will not do anything when no placeholders present.
+     *
+     * @param arguments The variable arguments to be inserted for the placeholders.
+     * @return The formatted setting name.
+     */
+    public String insert(String... arguments) {
+        return String.format(this.getScopedKey(), (Object[]) arguments);
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/Setting.java b/src/main/java/edu/harvard/iq/dataverse/settings/Setting.java
index 160ed693eee..b1910a2fbb5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/settings/Setting.java
+++ b/src/main/java/edu/harvard/iq/dataverse/settings/Setting.java
@@ -2,13 +2,13 @@
 
 import java.io.Serializable;
 import java.util.Objects;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
 
 /**
  * A single value in the config of dataverse.
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
index 2b47c8562f0..b323a9b7861 100644
--- a/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
@@ -2,18 +2,32 @@
 
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
-import edu.harvard.iq.dataverse.api.ApiBlockingFilter;
+import edu.harvard.iq.dataverse.api.filter.ApiBlockingFilter;
 import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.StringTokenizer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 
 /**
  * Service bean accessing a persistent hash map, used as settings in the application.
@@ -31,6 +45,7 @@ public class SettingsServiceBean {
      * over your shoulder when typing strings in various places of a large app. 
      * So there.
      */
+    @SuppressWarnings("java:S115")
     public enum Key {
         AllowApiTokenLookupViaApi,
         /**
@@ -40,6 +55,10 @@ public enum Key {
         CustomDatasetSummaryFields,
         /**
          * Defines a public installation -- all datafiles are unrestricted
+         *
+         * This was added along with CloudEnvironmentName and ComputeBaseUrl.
+         * See https://github.com/IQSS/dataverse/issues/3776 and
+         * https://github.com/IQSS/dataverse/pull/3967
          */
         PublicInstall,
         /**
@@ -60,9 +79,12 @@ public enum Key {
         /**
          * For example, https://datacapture.example.org
          */
+        @Deprecated(forRemoval = true, since = "2024-07-07")
         DataCaptureModuleUrl,
+        @Deprecated(forRemoval = true, since = "2024-07-07")
         RepositoryStorageAbstractionLayerUrl,
         UploadMethods,
+        @Deprecated(forRemoval = true, since = "2024-07-07")
         DownloadMethods,
         /**
          * If the data replicated around the world using RSAL (Repository
@@ -72,7 +94,17 @@ public enum Key {
          * TODO: Think about if it makes sense to make this a column in the
          * StorageSite database table.
          */
+        @Deprecated(forRemoval = true, since = "2024-07-07")
         LocalDataAccessPath,
+        /**
+         * The algorithm used to generate PIDs, randomString (default) or
+         * storedProcedure
+         * 
+         * @deprecated New installations should not use this database setting, but use
+         *             the settings within {@link JvmSettings#SCOPE_PID}.
+         * 
+         */
+        @Deprecated(forRemoval = true, since = "2024-02-13")
         IdentifierGenerationStyle,
         OAuth2CallbackUrl,
         DefaultAuthProvider,
@@ -93,11 +125,6 @@ public enum Key {
          * shouldn't.
          */
         MyDataDoesNotUseSolrPermissionDocs,
-        /**
-         * Experimental: Allow non-public search with a key/token using the
-         * Search API. See also https://github.com/IQSS/dataverse/issues/1299
-         */
-        SearchApiNonPublicAllowed,
         /**
          * In Dataverse 4.7 and earlier, an API token was required to use the
          * Search API. Tokens are no longer required but you can revert to the
@@ -111,19 +138,25 @@ public enum Key {
 
         /**
          * API endpoints that are not accessible. Comma separated list.
+         * @see JvmSettings#API_BLOCKED_ENDPOINTS
          */
+        @Deprecated(forRemoval = true, since = "2025-04-29")
         BlockedApiEndpoints,
         
         /**
          * A key that, with the right {@link ApiBlockingFilter.BlockPolicy},
          * allows calling blocked APIs.
+         * @see JvmSettings#API_BLOCKED_KEY
          */
+        @Deprecated(forRemoval = true, since = "2025-04-29")
         BlockedApiKey,
         
         
         /**
          * How to treat blocked APIs. One of drop, localhost-only, unblock-key
+         * @see JvmSettings#API_BLOCKED_POLICY
          */
+        @Deprecated(forRemoval = true, since = "2025-04-29")
         BlockedApiPolicy,
         
         /**
@@ -142,32 +175,16 @@ public enum Key {
          */
         ApplicationPrivacyPolicyUrl,
         /**
-         * A boolean defining if indexing and search should respect the concept
-         * of "permission root".
-         *
-         * <p>
-         *
-         * If we ignore permissionRoot at index time, we should blindly give
-         * search ("discoverability") access to people and group who have access
-         * defined in a parent dataverse, all the way back to the root.
-         *
-         * <p>
-         *
-         * If we respect permissionRoot, this means that the dataverse being
-         * indexed is an island of permissions all by itself. We should not look
-         * to its parent to see if more people and groups might be able to
-         * search the DvObjects within it. We would assume no implicit
-         * inheritance of permissions. In this mode, all permissions must be
-         * explicitly defined on DvObjects. No implied inheritance.
-         *
+         * Solr hostname and port, such as "localhost:8983".
+         * @deprecated New installations should not use this database setting, but use {@link JvmSettings#SOLR_HOST}
+         *             and {@link JvmSettings#SOLR_PORT}.
          */
-        SearchRespectPermissionRoot,
-        /** Solr hostname and port, such as "localhost:8983". */
+        @Deprecated(forRemoval = true, since = "2022-12-23")
         SolrHostColonPort,
         /** Enable full-text indexing in solr up to max file size */
         SolrFullTextIndexing, //true or false (default)
         SolrMaxFileSizeForFullTextIndexing, //long - size in bytes (default unset/no limit)
-        /** Key for limiting the number of bytes uploaded via the Data Deposit API, UI (web site and . */
+        /** Default Key for limiting the number of bytes uploaded via the Data Deposit API, UI (web site and . */
         MaxFileUploadSizeInBytes,
         /** Key for if ScrubMigrationData is enabled or disabled. */
         ScrubMigrationData,
@@ -175,28 +192,57 @@ public enum Key {
         SignUpUrl,
         /** Key for whether we allow users to sign up */
         AllowSignUp,
-        /** protocol for global id */
+        /**
+         * protocol for global id
+         * 
+         * @deprecated New installations should not use this database setting, but use
+         *             the settings within {@link JvmSettings#SCOPE_PID}.
+         * 
+         */
+        @Deprecated(forRemoval = true, since = "2024-02-13")
         Protocol,
-        /** authority for global id */
+        /**
+         * authority for global id
+         * 
+         * @deprecated New installations should not use this database setting, but use
+         *             the settings within {@link JvmSettings#SCOPE_PID}.
+         * 
+         */
+        @Deprecated(forRemoval = true, since = "2024-02-13")
         Authority,
-        /** DoiProvider for global id */
+        /**
+         * DoiProvider for global id
+         * 
+         * @deprecated New installations should not use this database setting, but use
+         *             the settings within {@link JvmSettings#SCOPE_PID}.
+         * 
+         */
+        @Deprecated(forRemoval = true, since = "2024-02-13")
         DoiProvider,
-        /** Shoulder for global id - used to create a common prefix on identifiers */
+        /**
+         * Shoulder for global id - used to create a common prefix on identifiers
+         * 
+         * @deprecated New installations should not use this database setting, but use
+         *             the settings within {@link JvmSettings#SCOPE_PID}.
+         * 
+         */
+        @Deprecated(forRemoval = true, since = "2024-02-13")
         Shoulder,
-        /* Removed for now - tried to add here but DOI Service Bean didn't like it at start-up
-        DoiUsername,
-        DoiPassword,
-        DoiBaseurlstring,
-        */
         /** Optionally override http://guides.dataverse.org . */
         GuidesBaseUrl,
 
+        CVocConf,
+
+        // Default calls per hour for each tier. csv format (30,60,...)
+        RateLimitingDefaultCapacityTiers,
+        // json defined list of capacities by tier and action list. See RateLimitSetting.java
+        RateLimitingCapacityByTierAndAction,
         /**
          * A link to an installation of https://github.com/IQSS/miniverse or
          * some other metrics app.
          */
         MetricsUrl,
-        
+
         /**
          * Number of minutes before a metrics query can be rerun. Otherwise a cached value is returned.
          * Previous month dates always return cache. Only applies to new internal caching system (not miniverse).
@@ -211,17 +257,12 @@ public enum Key {
         /* the number of files the GUI user is allowed to upload in one batch, 
             via drag-and-drop, or through the file select dialog */
         MultipleUploadFilesLimit,
-        /* Size limits for generating thumbnails on the fly */
-        /* (i.e., we'll attempt to generate a thumbnail on the fly if the 
-         * size of the file is less than this)
-        */
-        ThumbnailSizeLimitImage,
-        ThumbnailSizeLimitPDF,
-        /* status message that will appear on the home page */
-        StatusMessageHeader,
-        /* full text of status message, to appear in popup */
-        StatusMessageText,
-        /* return email address for system emails such as notifications */
+        /**
+         * Return email address for system emails such as notifications
+         * @deprecated Please replace usages with {@link edu.harvard.iq.dataverse.MailServiceBean#getSystemAddress},
+         *             which is backward compatible with this setting.
+         */
+        @Deprecated(since = "6.2", forRemoval = true)
         SystemEmail, 
         /* size limit for Tabular data file ingests */
         /* (can be set separately for specific ingestable formats; in which 
@@ -231,20 +272,10 @@ public enum Key {
         SPSS/sav format, "RData" for R, etc.
         for example: :TabularIngestSizeLimit:RData */
         TabularIngestSizeLimit,
-        /**
-        Whether to allow user to create GeoConnect Maps
-        This boolean effects whether the user sees the map button on 
-        the dataset page and if the ingest will create a shape file
-        Default is false
-        */
-        GeoconnectCreateEditMaps,
-        /**
-        Whether to allow a user to view existing maps
-        This boolean effects whether a user may see the 
-        Explore World Map Button
-        Default is false;
-        */
-        GeoconnectViewMaps,
+        /* Validate physical files in the dataset when publishing, if the dataset size less than the threshold limit */
+        DatasetChecksumValidationSizeLimit,
+        /* Validate physical files in the dataset when publishing, if the datafile size less than the threshold limit */
+        DataFileChecksumValidationSizeLimit,
         /**
          The message added to a popup upon dataset publish
          * 
@@ -351,10 +382,16 @@ Whether Harvesting (OAI) service is enabled
          */
         PVCustomPasswordResetAlertMessage,
         /*
-        String to describe DOI format for data files. Default is DEPENDENT. 
-        'DEPENEDENT' means the DOI will be the Dataset DOI plus a file DOI with a slash in between.
-        'INDEPENDENT' means a new global id, completely independent from the dataset-level global id.
-        */
+         * String to describe DOI format for data files. Default is DEPENDENT.
+         * 'DEPENDENT' means the DOI will be the Dataset DOI plus a file DOI with a
+         * slash in between. 'INDEPENDENT' means a new global id, completely independent
+         * from the dataset-level global id.
+         *
+         * @deprecated New installations should not use this database setting, but use
+         * the settings within {@link JvmSettings#SCOPE_PID}.
+         * 
+         */
+        @Deprecated(forRemoval = true, since = "2024-02-13")
         DataFilePIDFormat, 
         /* Json array of supported languages
         */
@@ -362,7 +399,7 @@ Whether Harvesting (OAI) service is enabled
         /*
         Number for the minimum number of files to send PID registration to asynchronous workflow
         */
-        PIDAsynchRegFileCount,
+        //PIDAsynchRegFileCount,
         /**
          * 
          */
@@ -370,9 +407,24 @@ Whether Harvesting (OAI) service is enabled
 
         /**
          * Indicates if the Handle service is setup to work 'independently' (No communication with the Global Handle Registry)
+         * 
+         * @deprecated New installations should not use this database setting, but use
+         *             the settings within {@link JvmSettings#SCOPE_PID}.
+         * 
          */
+        @Deprecated(forRemoval = true, since = "2024-02-13")
         IndependentHandleService,
 
+        /**
+        Handle to use for authentication if the default is not being used
+         * 
+         * @deprecated New installations should not use this database setting, but use
+         *             the settings within {@link JvmSettings#SCOPE_PID}.
+         * 
+         */
+        @Deprecated(forRemoval = true, since = "2024-02-13")
+        HandleAuthHandle,
+
         /**
          * Archiving can be configured by providing an Archiver class name (class must extend AstractSubmitToArchiverCommand)
          * and a list of settings that should be passed to the Archiver.
@@ -402,21 +454,241 @@ Whether Harvesting (OAI) service is enabled
          */
         InheritParentRoleAssignments,
         
-        /** Make Data Count Logging and Display */
+        /** Make Data Count Logging, Display, and Start Date */
         MDCLogPath, 
         DisplayMDCMetrics,
+        MDCStartDate,
 
         /**
          * Allow CORS flag (true or false). It is true by default
          *
+         * The allowed origin for CORS requests.
+         * 
+         * @see JvmSettings#CORS_ORIGIN
+         * @see JvmSettings#CORS_METHODS
+         * @see JvmSettings#CORS_ALLOW_HEADERS
+         * @see JvmSettings#CORS_EXPOSE_HEADERS
          */
+        @Deprecated(forRemoval = true, since = "2025-04-29")
+        
         AllowCors, 
         
         /**
          * Lifespan, in minutes, of a login user session 
          * (both DataverseSession and the underlying HttpSession)
          */
-        LoginSessionTimeout;
+        LoginSessionTimeout,
+
+        /**
+         * Shibboleth affiliation attribute which holds information about the affiliation of the user (e.g. ou)
+         */
+        ShibAffiliationAttribute,
+        /**
+         * Convert shibboleth AJP attributes from ISO-8859-1 to UTF-8
+         */
+        ShibAttributeCharacterSetConversionEnabled,
+        /**
+         *Return the last or first value of an array of affiliation names
+         */
+        ShibAffiliationOrder,
+         /**
+         *Split the affiliation array on given string, default ";"
+         */
+        ShibAffiliationSeparator,
+        /**
+         * Validate physical files for all the datafiles in the dataset when publishing
+         */
+        FileValidationOnPublishEnabled,
+        /**
+         * If defined, this is the URL of the zipping service outside 
+         * the main Application Service where zip downloads should be directed
+         * instead of /api/access/datafiles/
+         */
+        CustomZipDownloadServiceUrl,
+        /**
+         * Sort Date Facets Chronologically instead or presenting them in order of # of hits as other facets are. Default is true
+         */
+        ChronologicalDateFacets, 
+        /**
+         * Used where BrandingUtil.getInstallationBrandName is called, overides the default use of the root Dataverse collection name
+         */
+        InstallationName,
+        /**
+         * In metadata exports that set a 'distributor' this flag determines whether the
+         * Installation Brand Name is always included (default/false) or is not included
+         * when the Distributor field (citation metadatablock) is set (true)
+         */
+        ExportInstallationAsDistributorOnlyWhenNotSet,
+
+        /** Globus App URL
+         * 
+         */
+        GlobusAppUrl,
+        /** Globus Polling Interval how long in seconds Dataverse waits between checks on Globus upload status checks
+         * 
+         */
+        GlobusPollingInterval,
+        /**Enable single-file download/transfers for Globus
+         *
+         */
+        GlobusSingleFileTransfer,
+        /** Lower limit of the number of files in a Globus upload task where 
+         * the batch mode should be utilized in looking up the file information 
+         * on the remote end node (file sizes, primarily), instead of individual
+         * lookups. 
+         */
+        GlobusBatchLookupSize,
+        /**
+         * Optional external executables to run on the metadata for dataverses 
+         * and datasets being published; as an extra validation step, to 
+         * check for spam, etc. 
+         */
+        DataverseMetadataValidatorScript,
+        DatasetMetadataValidatorScript,
+        DataverseMetadataPublishValidationFailureMsg,
+        DataverseMetadataUpdateValidationFailureMsg,
+        DatasetMetadataValidationFailureMsg,
+        ExternalValidationAdminOverride,
+        /**
+         * A comma-separated list of field type names that should be 'withheld' when
+         * dataset access occurs via a Private Url with Anonymized Access (e.g. to
+         * support anonymized review). A suggested minimum includes author,
+         * datasetContact, and contributor, but additional fields such as depositor, grantNumber, and
+         * publication might also need to be included.
+         */
+        AnonymizedFieldTypeNames,
+        /**
+         * A Json array containing key/values corresponding the the allowed languages
+         * for entering metadata. FOrmat matches that of the Languages setting: e.g.
+         * '[{"locale":"en","title":"English"},{"locale":"fr","title":"Français"}]' with
+         * the locale being an ISO-639 code for that language (2 and 3 letter codes from
+         * the 639-2 and 639-3 standards are allowed. These will be used directly in
+         * metadata exports) and the title containing a human readable string. These
+         * values are selectable at the Dataverse level and apply to Dataset metadata.
+         */
+        MetadataLanguages,
+        /**
+         * A boolean setting that, if true will send an email and notification to users
+         * when a Dataset is created. Messages go to those who have the
+         * ability/permission necessary to publish the dataset
+         */
+        SendNotificationOnDatasetCreation,
+        /**
+         * A JSON Object containing named comma separated sets(s) of allowed labels (up
+         * to 32 characters, spaces allowed) that can be set on draft datasets, via API
+         * or UI by users with the permission to publish a dataset. (Set names are
+         * string keys, labels are a JSON array of strings). These should correspond to
+         * the states in an organizations curation process(es) and are intended to help
+         * users/curators track the progress of a dataset through an externally defined
+         * curation process. Only one set of labels are allowed per dataset (defined via
+         * API by a superuser per collection (UI or API) or per dataset (API only)). A
+         * dataset may only have one label at a time and if a label is set, it will be
+         * removed at publication time. This functionality is disabled when this setting
+         * is empty/not set.
+         */
+        AllowedCurationLabels,
+        /** This setting enables Embargo capabilities in Dataverse and sets the maximum Embargo duration allowed.
+         * 0 or not set: new embargoes disabled
+         * -1: embargo enabled, no time limit
+         * n: embargo enabled with n months the maximum allowed duration
+         */
+        MaxEmbargoDurationInMonths,
+        /** This setting enables Retention capabilities in Dataverse and sets the minimum Retention duration allowed.
+         * 0 or not set: new retentions disabled
+         * -1: retention enabled, no time limit
+         * n: retention enabled with n months the minimum allowed duration
+         */
+        MinRetentionDurationInMonths,
+        /*
+         * Include "Custom Terms" as an item in the license drop-down or not.
+         */
+        AllowCustomTermsOfUse,
+        /*
+         * Allow users to mute notifications or not.
+         */
+        ShowMuteOptions,
+        /*
+         * List (comma separated, e.g., "ASSIGNROLE,REVOKEROLE", extra whitespaces are trimmed such that "ASSIGNROLE, REVOKEROLE"
+         * would also work) of always muted notifications that cannot be turned on by the users.
+         */
+        AlwaysMuted,
+        /*
+         * List (comma separated, e.g., "ASSIGNROLE,REVOKEROLE", extra whitespaces are trimmed such that "ASSIGNROLE, REVOKEROLE"
+         * would also work) of never muted notifications that cannot be turned off by the users. AlwaysMuted setting overrides
+         * Nevermuted setting warning is logged.
+         */
+        NeverMuted,
+        /**
+         * LDN Inbox Allowed Hosts - a comma separated list of IP addresses allowed to submit messages to the inbox
+         */
+        LDNMessageHosts,
+
+        /*
+         * Allow a custom JavaScript to control values of specific fields.
+         */
+        ControlledVocabularyCustomJavaScript, 
+        /**
+         * A compound setting for disabling signup for remote Auth providers:
+         */
+        AllowRemoteAuthSignUp,
+        /**
+         * The URL for the DvWebLoader tool (see github.com/gdcc/dvwebloader for details)
+         */
+        WebloaderUrl, 
+        /**
+         * Enforce storage quotas:
+         */
+        UseStorageQuotas, 
+        /** 
+         * Placeholder storage quota (defines the same quota setting for every user; used to test the concept of a quota.
+         */
+        StorageQuotaSizeInBytes,
+
+        /**
+         * A comma-separated list of CategoryName in the desired order for files to be
+         * sorted in the file table display. If not set, files will be sorted
+         * alphabetically by default. If set, files will be sorted by these categories
+         * and alphabetically within each category.
+         */
+        CategoryOrder,
+        /**
+         * True(default)/false option deciding whether ordering by folder should be applied to the 
+         * dataset listing of datafiles.
+         */
+        OrderByFolder,
+        /**
+         * True/false(default) option deciding whether the dataset file table display should include checkboxes
+         * allowing users to dynamically turn folder and category ordering on/off.
+         */
+        AllowUserManagementOfOrder,
+        /*
+         * True/false(default) option deciding whether file PIDs can be enabled per collection - using the Dataverse/collection set attribute API call.
+         */
+        AllowEnablingFilePIDsPerCollection,
+        /**
+         * Allows an instance admin to disable Solr search facets on the collection
+         * and dataset pages instantly
+         */
+        DisableSolrFacets,
+        DisableSolrFacetsForGuestUsers,
+        DisableSolrFacetsWithoutJsession,
+        DisableUncheckedTypesFacet,
+        /**
+         * When ingesting tabular data files, store the generated tab-delimited 
+         * files *with* the variable names line up top. 
+         */
+        StoreIngestedTabularFilesWithVarHeaders,
+
+        ContactFeedbackMessageSizeLimit,
+        //Experimental setting to allow connecting to a GET external search service expecting a GET request with query parameter mirroring the search API query parameters (without search_service) 
+        GetExternalSearchUrl,
+        //Experimental setting to provide a display name for the GET external search service
+        GetExternalSearchName,
+        //Experimental setting to allow connecting to a POST external search service expecting a POST request with a JSON payload mirroring the search API query parameters 
+        PostExternalSearchUrl,
+        //Experimental setting to provide a display name for the POST external search service
+        PostExternalSearchName,
+        ;
 
         @Override
         public String toString() {
@@ -447,7 +719,7 @@ public String get( String name ) {
     }
     
     /**
-     * Same as {@link #get(java.lang.String)}, but with static checking.
+     * Same as {@link #get(String)}, but with static checking.
      * @param key Enum value of the name.
      * @return The setting, or {@code null}.
      */
@@ -480,9 +752,96 @@ public Long getValueForKeyAsLong(Key key){
             return null;
         }
         
+    }
+
+    /**
+     * Attempt to convert the value to an integer
+     *  - Applicable for keys such as MaxFileUploadSizeInBytes
+     *
+     * On failure (key not found or string not convertible to a long), returns defaultValue
+     * @param key
+     * @param defaultValue
+     * @return
+     */
+    public Long getValueForKeyAsLong(Key key, Long defaultValue) {
+           Long val = getValueForKeyAsLong(key);
+           if (val == null) {
+               return defaultValue;
+           }
+           return val;
     }
     
+       /**
+        * Attempt to convert a value in a compound key to a long
+        *  - Applicable for keys such as MaxFileUploadSizeInBytes after multistore capabilities were added in ~v4.20
+        *  backward compatible with a single value. For multi values, the key's value must be an object with param:value pairs.
+        *  A "default":value pair is allowed and will be returned for any param that doesn't have a defined value.   
+        * 
+        * On failure (key not found or string not convertible to a long), returns null
+        * @param key
+        * @return 
+        */
+       public Long getValueForCompoundKeyAsLong(Key key, String param){
+
+    	   String val = this.getValueForKey(key);
+
+    	   if (val == null){
+    		   return null;
+    	   }
+
+    	   try {
+    		   return Long.parseLong(val);
+    	   } catch (NumberFormatException ex) {
+    		   try {
+    			   JsonObject settings = JsonUtil.getJsonObject(val);
+    			   if(settings.containsKey(param)) {
+    				   return Long.parseLong(settings.getString(param));
+    			   } else if(settings.containsKey("default")) {
+    				   return Long.parseLong(settings.getString("default"));
+    			   } else {
+    				   return null;
+    			   }
+
+    		   } catch (Exception e) {
+    			   logger.log(Level.WARNING, "Incorrect setting.  Could not convert \"{0}\" from setting {1} to long: {2}", new Object[]{val, key.toString(), e.getMessage()});
+    			   return null;
+    		   }
+    	   }
+
+       }
+       
+    /**
+     * Same, but with Booleans 
+     * (returns null if not set; up to the calling method to decide what that should
+     * default to in each specific case)
+     * Example:
+     * :AllowRemoteAuthSignUp	{"default":"true","google":"false"}
+     */
     
+    public Boolean getValueForCompoundKeyAsBoolean(Key key, String param) {
+
+        String val = this.getValueForKey(key);
+
+        if (val == null) {
+            return null;
+        }
+
+        try {
+            JsonObject settings = JsonUtil.getJsonObject(val);
+            if (settings.containsKey(param)) {
+                return Boolean.parseBoolean(settings.getString(param));
+            } else if (settings.containsKey("default")) {
+                return Boolean.parseBoolean(settings.getString("default"));
+            } else {
+                return null;
+            }
+
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "Incorrect setting.  Could not convert \"{0}\" from setting {1} to boolean: {2}", new Object[]{val, key.toString(), e.getMessage()});
+            return null;
+        }
+
+    }
     /**
      * Return the value stored, or the default value, in case no setting by that
      * name exists. The main difference between this method and the other {@code get()}s
@@ -587,6 +946,15 @@ public boolean isTrueForKey( Key key, boolean defaultValue ) {
     public boolean isFalseForKey( Key key, boolean defaultValue ) {
         return ! isTrue( key.toString(), defaultValue );
     }
+
+    public boolean containsCommaSeparatedValueForKey(Key key, String value) {
+        final String tokens = getValueForKey(key);
+        if (tokens == null || tokens.isEmpty()) {
+            return false;
+        }
+        return Collections.list(new StringTokenizer(tokens, ",")).stream()
+            .anyMatch(token -> ((String) token).trim().equals(value));
+    }
             
     public void deleteValueForKey( Key name ) {
         delete( name.toString() );
@@ -613,5 +981,52 @@ public Set<Setting> listAll() {
         return new HashSet<>(em.createNamedQuery("Setting.findAll", Setting.class).getResultList());
     }
     
+    public Map<String, String> getBaseMetadataLanguageMap(Map<String,String> languageMap, boolean refresh) {
+        if (languageMap == null || refresh) {
+            languageMap = new HashMap<String, String>();
+
+            /* If MetadataLanaguages is set, use it.
+             * If not, we can't assume anything and should avoid assuming a metadata language
+             */
+            String mlString = getValueForKey(SettingsServiceBean.Key.MetadataLanguages,"");
+            
+            if(mlString.isEmpty()) {
+                mlString="[]";
+            }
+            JsonArray languages = JsonUtil.getJsonArray(mlString);
+            for(JsonValue jv: languages) {
+                JsonObject lang = (JsonObject) jv;
+                languageMap.put(lang.getString("locale"), lang.getString("title"));
+            }
+        }
+        return languageMap;
+    }
+    
+    public void initLocaleSettings(Map<String, String> configuredLocales) {
+        
+        try {
+            JSONArray entries = new JSONArray(getValueForKey(SettingsServiceBean.Key.Languages, "[]"));
+            for (Object obj : entries) {
+                JSONObject entry = (JSONObject) obj;
+                String locale = entry.getString("locale");
+                String title = entry.getString("title");
+
+                configuredLocales.put(locale, title);
+            }
+        } catch (JSONException e) {
+            //e.printStackTrace();
+            // do we want to know? - probably not
+        }
+    }
     
+
+    public Set<String> getConfiguredLanguages() {
+        Set<String> langs = new HashSet<String>();
+        langs.addAll(getBaseMetadataLanguageMap(new HashMap<String, String>(), true).keySet());
+        Map<String, String> configuredLocales = new LinkedHashMap<>();
+        initLocaleSettings(configuredLocales);
+        langs.addAll(configuredLocales.keySet());
+        return langs;
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/source/AliasConfigSource.java b/src/main/java/edu/harvard/iq/dataverse/settings/source/AliasConfigSource.java
new file mode 100644
index 00000000000..970da323de3
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/settings/source/AliasConfigSource.java
@@ -0,0 +1,182 @@
+package edu.harvard.iq.dataverse.settings.source;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.spi.ConfigSource;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Enable using an old name for a new config name.
+ * Usages will be logged and this source will ALWAYS stand back if the new name is used anywhere.
+ */
+public final class AliasConfigSource implements ConfigSource {
+    
+    private static final Logger logger = Logger.getLogger(AliasConfigSource.class.getName());
+    private static final String ALIASES_PROP_FILE = "META-INF/microprofile-aliases.properties";
+    
+    private final ConcurrentHashMap<String, List<String>> aliases = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<Pattern, List<String>> varArgAliases = new ConcurrentHashMap<>();
+    
+    public AliasConfigSource() {
+        try {
+            // read properties from class path file
+            Properties aliasProps = readAliases(ALIASES_PROP_FILE);
+            // store in our aliases map
+            importAliases(aliasProps);
+        } catch (IOException e) {
+            // Usually it's an anti-pattern to catch the exception here, but skipping the file
+            // should be fine here, as it's optional.
+            logger.log(Level.INFO, "Could not read from "+ALIASES_PROP_FILE+". Skipping MPCONFIG alias setup.", e);
+        }
+    
+        // Store all old names from JvmSettings
+        importJvmSettings(JvmSettings.getAliasedSettings());
+    }
+    
+    private void importJvmSettings(List<JvmSettings> aliasedSettings) {
+        // First add all simple aliases not containing placeholders
+        aliasedSettings.stream()
+            .filter(s -> ! s.needsVarArgs())
+            .forEach(setting -> aliases.put(setting.getScopedKey(), setting.getOldNames()));
+        
+        // Aliases with placeholders need to be compiled into a regex
+        aliasedSettings.stream()
+            .filter(JvmSettings::needsVarArgs)
+            .forEach(setting -> varArgAliases.put(setting.getPatternizedKey(), setting.getOldNames()));
+    }
+    
+    
+    private Properties readAliases(String filePath) throws IOException {
+        // get resource from classpath
+        ClassLoader classLoader = this.getClass().getClassLoader();
+        URL aliasesResource = classLoader.getResource(filePath);
+        
+        // Prevent errors if file not found or could not be loaded
+        if (aliasesResource == null) {
+            throw new IOException("Could not find or load, class loader returned null");
+        }
+    
+        // load properties from file resource (parsing included)
+        Properties aliasProps = new Properties();
+        try (InputStream propStream = aliasesResource.openStream()) {
+            aliasProps.load(propStream);
+        }
+        return aliasProps;
+    }
+    
+    private void importAliases(Properties aliasProps) {
+        aliasProps.forEach((key, value) -> aliases.put(key.toString(), List.of(value.toString())));
+    }
+    
+    // Has visibility "package" to be usable from test class!
+    void addAlias(String newName, List<String> oldNames) {
+        this.aliases.put(newName, oldNames);
+    }
+    
+    // Has visibility "package" to be usable from test class!
+    void addAlias(Pattern newNamePattern, List<String> oldNamePatterns) {
+        this.varArgAliases.put(newNamePattern, oldNamePatterns);
+    }
+    
+    @Override
+    public Map<String, String> getProperties() {
+        // No, just no. We're not going to drop a list of stuff. We're only de-aliasing on calls to getValue()
+        return new HashMap<>();
+    }
+    
+    @Override
+    public Set<String> getPropertyNames() {
+        // It does not make sense to retrieve the aliased names...
+        return new HashSet<>();
+    }
+    
+    @Override
+    public int getOrdinal() {
+        // Any other config source can override us, except the microprofile-config.properties source (ordinal = 100)
+        // We use *the same* ordinal (which is also the default ordinal). As our source is named "Alias",
+        // it will be served first as "A" = 65 comes before other letters (uses String::compareTo).
+        return ConfigSource.DEFAULT_ORDINAL;
+    }
+    
+    @Override
+    public String getValue(String key) {
+        
+        // If the key is null or not starting with the prefix ("dataverse"), we are not going to jump through loops,
+        // avoiding computation overhead
+        if (key == null || ! key.startsWith(JvmSettings.PREFIX.getScopedKey())) {
+            return null;
+        }
+        
+        List<String> oldNames = new ArrayList<>();
+        
+        // Retrieve simple cases without placeholders
+        if (this.aliases.containsKey(key)) {
+            oldNames.addAll(this.aliases.get(key));
+        // Or try with regex patterns
+        } else {
+            // Seek for the given key within all the patterns for placeholder containing settings,
+            // returning a Matcher to extract the variable arguments as regex match groups.
+            Optional<Matcher> foundMatcher = varArgAliases.keySet().stream()
+                .map(pattern -> pattern.matcher(key))
+                .filter(Matcher::matches)
+                .findFirst();
+            
+            // Extract the matched groups and construct all old setting names with them
+            if (foundMatcher.isPresent()) {
+                Matcher matcher = foundMatcher.get();
+                
+                List<String> varArgs = new ArrayList<>();
+                for (int i = 1; i <= matcher.groupCount(); i++) {
+                    varArgs.add(matcher.group(i));
+                }
+                Object[] args = varArgs.toArray();
+                
+                this.varArgAliases
+                    .get(matcher.pattern())
+                    .forEach(oldNamePattern -> oldNames.add(String.format(oldNamePattern, args)));
+            }
+        }
+    
+        // Return the first non-empty result
+        // NOTE: When there are multiple old names in use, they would conflict anyway. Upon deletion of one of the
+        //       old settings the other becomes visible and triggers the warning again. There might even be different
+        //       old settings in different sources, which might conflict, too (see ordinal value).
+        // NOTE: As the default is an empty oldNames array, loop will only be executed if anything was found before.
+        for (String oldName : oldNames) {
+            Optional<String> value = ConfigProvider.getConfig().getOptionalValue(oldName, String.class);
+        
+            if (value.isPresent()) {
+                logger.log(
+                    Level.WARNING,
+                    "Detected deprecated config option {0} in use. Please update your config to use {1}.",
+                    new String[]{oldName, key}
+                );
+                return value.get();
+            }
+        }
+        
+        // Sane default: nothing found.
+        return null;
+    }
+    
+    @Override
+    public String getName() {
+        return "Alias";
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/spi/AliasConfigSourceProvider.java b/src/main/java/edu/harvard/iq/dataverse/settings/spi/AliasConfigSourceProvider.java
new file mode 100644
index 00000000000..05d88d2c892
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/settings/spi/AliasConfigSourceProvider.java
@@ -0,0 +1,14 @@
+package edu.harvard.iq.dataverse.settings.spi;
+
+import edu.harvard.iq.dataverse.settings.source.AliasConfigSource;
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
+
+import java.util.Arrays;
+
+public class AliasConfigSourceProvider implements ConfigSourceProvider {
+    @Override
+    public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) {
+        return Arrays.asList(new AliasConfigSource());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapServiceBean.java
index 14db98e540e..a51acd1f54f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapServiceBean.java
@@ -3,8 +3,8 @@
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
 import java.util.List;
-import javax.ejb.Asynchronous;
-import javax.ejb.Stateless;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class SiteMapServiceBean {
diff --git a/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtil.java b/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtil.java
index e32b811ee2c..8408e7d91f2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtil.java
@@ -1,192 +1,140 @@
 package edu.harvard.iq.dataverse.sitemap;
 
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DvObjectContainer;
-import edu.harvard.iq.dataverse.util.SystemConfig;
-import edu.harvard.iq.dataverse.util.xml.XmlValidator;
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.text.SimpleDateFormat;
+import java.text.ParseException;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
+
+import com.redfin.sitemapgenerator.W3CDateFormat;
+import com.redfin.sitemapgenerator.W3CDateFormat.Pattern;
+import com.redfin.sitemapgenerator.WebSitemapGenerator;
+import com.redfin.sitemapgenerator.WebSitemapUrl;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObjectContainer;
+import edu.harvard.iq.dataverse.settings.ConfigCheckService;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.SystemConfig;
 
 public class SiteMapUtil {
 
+    static final String DATE_PATTERN = "yyyy-MM-dd";
+    static final String SITEMAP_FILENAME_STAGED = "sitemap.xml.staged";
+    /** @see https://www.sitemaps.org/protocol.html#index */
+    static final int SITEMAP_LIMIT = 50000;
+
     private static final Logger logger = Logger.getLogger(SiteMapUtil.class.getCanonicalName());
+    private static DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATE_PATTERN);
 
-    static final String SITEMAP_FILENAME_FINAL = "sitemap.xml";
-    static final String SITEMAP_FILENAME_STAGED = "sitemap.xml.staged";
 
-    /**
-     * TODO: Handle more than 50,000 entries in the sitemap.
-     *
-     * (As of this writing Harvard Dataverse only has ~3000 dataverses and
-     * ~30,000 datasets.)
-     *
-     * "each Sitemap file that you provide must have no more than 50,000 URLs"
-     * https://www.sitemaps.org/protocol.html
-     *
-     * Consider using a third party library: "One sitemap can contain a maximum
-     * of 50,000 URLs. (Some sitemaps, like Google News sitemaps, can contain
-     * only 1,000 URLs.) If you need to put more URLs than that in a sitemap,
-     * you'll have to use a sitemap index file. Fortunately, WebSitemapGenerator
-     * can manage the whole thing for you."
-     * https://github.com/dfabulich/sitemapgen4j
-     */
     public static void updateSiteMap(List<Dataverse> dataverses, List<Dataset> datasets) {
 
         logger.info("BEGIN updateSiteMap");
 
-        String sitemapPathString = getSitemapPathString();
-        String stagedSitemapPathAndFileString = sitemapPathString + File.separator + SITEMAP_FILENAME_STAGED;
-        String finalSitemapPathAndFileString = sitemapPathString + File.separator + SITEMAP_FILENAME_FINAL;
-
-        Path stagedPath = Paths.get(stagedSitemapPathAndFileString);
-        if (Files.exists(stagedPath)) {
-            logger.warning("Unable to update sitemap! The staged file from a previous run already existed. Delete " + stagedSitemapPathAndFileString + " and try again.");
+        final String dataverseSiteUrl = SystemConfig.getDataverseSiteUrlStatic();
+        final String msgErrorFormat = "Problem with %s : %s. The exception is %s";
+        final String msgErrorW3CFormat = "%s isn't a valid W3C date time for %s. The exception is %s";
+        final String sitemapPathString = getSitemapPathString();
+        final String stagedSitemapPathAndFileString = sitemapPathString + File.separator + SITEMAP_FILENAME_STAGED;
+        final Path stagedSitemapPath = Paths.get(stagedSitemapPathAndFileString);
+
+        if (Files.exists(stagedSitemapPath)) {
+            logger.warning(String.format(
+                    "Unable to update sitemap! The staged file from a previous run already existed. Delete %s and try again.",
+                    stagedSitemapPathAndFileString));
             return;
         }
 
-        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder documentBuilder = null;
+        final File directory = new File(sitemapPathString);
+        if (!directory.exists()) {
+            directory.mkdir();
+        }
+
+        // Use DAY pattern (YYYY-MM-DD), local machine timezone
+        final W3CDateFormat dateFormat = new W3CDateFormat(Pattern.DAY);
+        WebSitemapGenerator wsg = null;
         try {
-            documentBuilder = documentBuilderFactory.newDocumentBuilder();
-        } catch (ParserConfigurationException ex) {
-            logger.warning("Unable to update sitemap! ParserConfigurationException: " + ex.getLocalizedMessage());
+            // All sitemap files are in "sitemap" folder, see "getSitemapPathString" method.
+            // But with pretty-faces configuration, "sitemap.xml" and "sitemap_index.xml" are accessible directly,
+            // like "https://demo.dataverse.org/sitemap.xml". So "/sitemap/" need to be added on "WebSitemapGenerator"
+            // in order to have valid URL for sitemap location.
+            wsg = WebSitemapGenerator.builder(dataverseSiteUrl + "/sitemap/", directory).autoValidate(true).dateFormat(dateFormat)
+                    .build();
+        } catch (MalformedURLException e) {
+            logger.warning(String.format(msgErrorFormat, "Dataverse site URL", dataverseSiteUrl, e.getLocalizedMessage()));
             return;
         }
-        Document document = documentBuilder.newDocument();
-
-        Element urlSet = document.createElement("urlset");
-        urlSet.setAttribute("xmlns", "http://www.sitemaps.org/schemas/sitemap/0.9");
-        urlSet.setAttribute("xmlns:xhtml", "http://www.w3.org/1999/xhtml");
-        document.appendChild(urlSet);
 
         for (Dataverse dataverse : dataverses) {
             if (!dataverse.isReleased()) {
                 continue;
             }
-            Element url = document.createElement("url");
-            urlSet.appendChild(url);
-
-            Element loc = document.createElement("loc");
-            String dataverseAlias = dataverse.getAlias();
-            loc.appendChild(document.createTextNode(SystemConfig.getDataverseSiteUrlStatic() + "/dataverse/" + dataverseAlias));
-            url.appendChild(loc);
-
-            Element lastmod = document.createElement("lastmod");
-            lastmod.appendChild(document.createTextNode(getLastModDate(dataverse)));
-            url.appendChild(lastmod);
+            final String dvAlias = dataverse.getAlias();
+            final String dataverseUrl = dataverseSiteUrl + "/dataverse/" + dvAlias;
+            final String lastModDate = getLastModDate(dataverse);
+            try {
+                final WebSitemapUrl url = new WebSitemapUrl.Options(dataverseUrl).lastMod(lastModDate).build();
+                wsg.addUrl(url);
+            } catch (MalformedURLException e) {
+                logger.fine(String.format(msgErrorFormat, "dataverse URL", dataverseUrl, e.getLocalizedMessage()));
+            } catch (ParseException e) {
+                logger.fine(String.format(msgErrorW3CFormat, lastModDate, "dataverse alias " + dvAlias, e.getLocalizedMessage()));
+            }
         }
 
         for (Dataset dataset : datasets) {
-            if (!dataset.isReleased()) {
-                continue;
-            }
-            if (dataset.isHarvested()) {
-                continue;
-            }
             // The deaccessioned check is last because it has to iterate through dataset versions.
-            if (dataset.isDeaccessioned()) {
+            if (!dataset.isReleased() || dataset.isHarvested() || dataset.isDeaccessioned()) {
                 continue;
             }
-            Element url = document.createElement("url");
-            urlSet.appendChild(url);
-
-            Element loc = document.createElement("loc");
-            String datasetPid = dataset.getGlobalId().asString();
-            loc.appendChild(document.createTextNode(SystemConfig.getDataverseSiteUrlStatic() + "/dataset.xhtml?persistentId=" + datasetPid));
-            url.appendChild(loc);
-
-            Element lastmod = document.createElement("lastmod");
-            lastmod.appendChild(document.createTextNode(getLastModDate(dataset)));
-            url.appendChild(lastmod);
-        }
-
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
-        Transformer transformer = null;
-        try {
-            transformer = transformerFactory.newTransformer();
-        } catch (TransformerConfigurationException ex) {
-            logger.warning("Unable to update sitemap! TransformerConfigurationException: " + ex.getLocalizedMessage());
-            return;
-        }
-        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-        DOMSource source = new DOMSource(document);
-        File directory = new File(sitemapPathString);
-        if (!directory.exists()) {
-            directory.mkdir();
-        }
-
-        boolean debug = false;
-        if (debug) {
-            logger.info("Writing sitemap to console/logs");
-            StreamResult consoleResult = new StreamResult(System.out);
+            final String datasetPid = dataset.getGlobalId().asString();
+            final String datasetUrl = dataverseSiteUrl + "/dataset.xhtml?persistentId=" + datasetPid;
+            final String lastModDate = getLastModDate(dataset);
             try {
-                transformer.transform(source, consoleResult);
-            } catch (TransformerException ex) {
-                logger.warning("Unable to print sitemap to the console: " + ex.getLocalizedMessage());
+                final WebSitemapUrl url = new WebSitemapUrl.Options(datasetUrl).lastMod(lastModDate).build();
+                wsg.addUrl(url);
+            } catch (MalformedURLException e) {
+                logger.fine(String.format(msgErrorFormat, "dataset URL", datasetUrl, e.getLocalizedMessage()));
+            } catch (ParseException e) {
+                logger.fine(String.format(msgErrorW3CFormat, lastModDate, "dataset " + datasetPid, e.getLocalizedMessage()));
             }
         }
 
-        logger.info("Writing staged sitemap to " + stagedSitemapPathAndFileString);
-        StreamResult result = new StreamResult(new File(stagedSitemapPathAndFileString));
-        try {
-            transformer.transform(source, result);
-        } catch (TransformerException ex) {
-            logger.warning("Unable to update sitemap! Unable to write staged sitemap to " + stagedSitemapPathAndFileString + ". TransformerException: " + ex.getLocalizedMessage());
-            return;
-        }
-
-        logger.info("Checking staged sitemap for well-formedness. The staged file is " + stagedSitemapPathAndFileString);
+        logger.info(String.format("Writing and checking sitemap file into %s", sitemapPathString));
         try {
-            XmlValidator.validateXmlWellFormed(stagedSitemapPathAndFileString);
+            wsg.write();
+            if (dataverses.size() + datasets.size() > SITEMAP_LIMIT) {
+                wsg.writeSitemapsWithIndex();
+            }
         } catch (Exception ex) {
-            logger.warning("Unable to update sitemap! Staged sitemap file is not well-formed XML! The exception for " + stagedSitemapPathAndFileString + " is " + ex.getLocalizedMessage());
-            return;
-        }
-
-        logger.info("Checking staged sitemap against XML schema. The staged file is " + stagedSitemapPathAndFileString);
-        URL schemaUrl = null;
-        try {
-            schemaUrl = new URL("https://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd");
-        } catch (MalformedURLException ex) {
-            // This URL is hard coded and it's fine. We should never get MalformedURLException so we just swallow the exception and carry on.
-        }
-        try {
-            XmlValidator.validateXmlSchema(stagedSitemapPathAndFileString, schemaUrl);
-        } catch (SAXException | IOException ex) {
-            logger.warning("Unable to update sitemap! Exception caught while checking XML staged file (" + stagedSitemapPathAndFileString + " ) against XML schema: " + ex.getLocalizedMessage());
+            final StringBuffer errorMsg = new StringBuffer("Unable to write or validate sitemap ! The exception is ");
+            errorMsg.append(ex.getLocalizedMessage());
+            // Add causes messages exception
+            Throwable cause = ex.getCause();
+            // Fix limit to 5 causes
+            final int causeLimit = 5;
+            int cpt = 0;
+            while (cause != null && cpt < causeLimit) {
+                errorMsg.append(" with cause ").append(cause.getLocalizedMessage());
+                cause = ex.getCause();
+                cpt = cpt + 1;
+            }
+            logger.warning(errorMsg.toString());
             return;
         }
 
-        Path finalPath = Paths.get(finalSitemapPathAndFileString);
-        logger.info("Copying staged sitemap from " + stagedSitemapPathAndFileString + " to " + finalSitemapPathAndFileString);
+        logger.info(String.format("Remove staged sitemap %s", stagedSitemapPathAndFileString));
         try {
-            Files.move(stagedPath, finalPath, StandardCopyOption.REPLACE_EXISTING);
+            Files.deleteIfExists(stagedSitemapPath);
         } catch (IOException ex) {
-            logger.warning("Unable to update sitemap! Unable to copy staged sitemap from " + stagedSitemapPathAndFileString + " to " + finalSitemapPathAndFileString + ". IOException: " + ex.getLocalizedMessage());
+            logger.warning("Unable to delete sitemap staged file! IOException: " + ex.getLocalizedMessage());
             return;
         }
 
@@ -197,12 +145,11 @@ private static String getLastModDate(DvObjectContainer dvObjectContainer) {
         // TODO: Decide if YYYY-MM-DD is enough. https://www.sitemaps.org/protocol.html
         // says "The date of last modification of the file. This date should be in W3C Datetime format.
         // This format allows you to omit the time portion, if desired, and use YYYY-MM-DD."
-        return new SimpleDateFormat("yyyy-MM-dd").format(dvObjectContainer.getModificationTime());
+        return dvObjectContainer.getModificationTime().toLocalDateTime().format(formatter);
     }
 
     public static boolean stageFileExists() {
-        String sitemapPathString = getSitemapPathString();
-        String stagedSitemapPathAndFileString = sitemapPathString + File.separator + SITEMAP_FILENAME_STAGED;
+        String stagedSitemapPathAndFileString = getSitemapPathString() + File.separator + SITEMAP_FILENAME_STAGED;
         Path stagedPath = Paths.get(stagedSitemapPathAndFileString);
         if (Files.exists(stagedPath)) {
             logger.warning("Unable to update sitemap! The staged file from a previous run already existed. Delete " + stagedSitemapPathAndFileString + " and try again.");
@@ -211,15 +158,16 @@ public static boolean stageFileExists() {
         return false;
     }
 
+    /**
+     * Lookup the location where to generate the sitemap.
+     *
+     * Note: the location is checked to be configured, does exist and is writeable in
+     * {@link ConfigCheckService#checkSystemDirectories()}
+     *
+     * @return Sitemap storage location ([docroot]/sitemap)
+     */
     private static String getSitemapPathString() {
-        String sitemapPathString = "/tmp";
-        // i.e. /usr/local/glassfish4/glassfish/domains/domain1
-        String domainRoot = System.getProperty("com.sun.aas.instanceRoot");
-        if (domainRoot != null) {
-            // Note that we write to a directory called "sitemap" but we serve just "/sitemap.xml" using PrettyFaces.
-            sitemapPathString = domainRoot + File.separator + "docroot" + File.separator + "sitemap";
-        }
-        return sitemapPathString;
-
+        return JvmSettings.DOCROOT_DIRECTORY.lookup() + File.separator + "sitemap";
     }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/storageuse/StorageQuota.java b/src/main/java/edu/harvard/iq/dataverse/storageuse/StorageQuota.java
new file mode 100644
index 00000000000..d00f7041e61
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/storageuse/StorageQuota.java
@@ -0,0 +1,116 @@
+package edu.harvard.iq.dataverse.storageuse;
+
+import edu.harvard.iq.dataverse.DvObject;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import java.io.Serializable;
+import java.util.logging.Logger;
+
+//import jakarta.persistence.*;
+
+/**
+ *
+ * @author landreev
+ * 
+ */
+@Entity
+public class StorageQuota implements Serializable {
+    private static final Logger logger = Logger.getLogger(StorageQuota.class.getCanonicalName()); 
+    
+    /**
+     * Only Collection quotas are supported, for now
+     */
+    
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+    /**
+     * For defining quotas for Users and/or Groups 
+     * (Not supported as of yet)
+     
+    @Column(nullable = true)
+    private String assigneeIdentifier;
+    */
+    
+    /**
+     * Could be changed to ManyToOne - if we wanted to be able to define separate
+     * quotas on the same collection for different users. (?)
+     * Whether we actually want to support the above is TBD. (possibly not)
+     * Only collection-wide quotas are supported for now. 
+     */
+    @OneToOne
+    @JoinColumn(name="definitionPoint_id", nullable=true)
+    private DvObject definitionPoint;
+    
+    @Column(nullable = true)
+    private Long allocation; 
+    
+    public StorageQuota() {}
+    
+    /**
+     * Could be uncommented if/when we want to add per-user quotas (see above)
+    public String getAssigneeIdentifier() {
+        return assigneeIdentifier;
+    }
+
+    public void setAssigneeIdentifier(String assigneeIdentifier) {
+        this.assigneeIdentifier = assigneeIdentifier;
+    }*/
+    
+    public DvObject getDefinitionPoint() {
+        return definitionPoint;
+    }
+
+    public void setDefinitionPoint(DvObject definitionPoint) {
+        this.definitionPoint = definitionPoint;
+    }
+    
+    public Long getAllocation() {
+        return allocation; 
+    }
+    
+    public void setAllocation(Long allocation) {
+        this.allocation = allocation; 
+    }
+    
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof StorageQuota)) {
+            return false;
+        }
+        StorageQuota other = (StorageQuota) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "edu.harvard.iq.dataverse.storageuse.StorageQuota[ id=" + id + " ]";
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/storageuse/StorageUse.java b/src/main/java/edu/harvard/iq/dataverse/storageuse/StorageUse.java
new file mode 100644
index 00000000000..b777736dc8d
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/storageuse/StorageUse.java
@@ -0,0 +1,100 @@
+package edu.harvard.iq.dataverse.storageuse;
+
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.DvObjectContainer;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import java.io.Serializable;
+
+/**
+ *
+ * @author landreev
+ */
+@NamedQueries({
+    @NamedQuery(name = "StorageUse.findByteSizeByDvContainerId",query = "SELECT su.sizeInBytes FROM StorageUse su WHERE su.dvObjectContainer.id =:dvObjectId "),
+    @NamedQuery(name = "StorageUse.findByDvContainerId",query = "SELECT su FROM StorageUse su WHERE su.dvObjectContainer.id =:dvObjectId "),
+    @NamedQuery(name = "StorageUse.incrementByteSizeByDvContainerId", query = "UPDATE StorageUse su SET su.sizeInBytes = su.sizeInBytes +:fileSize WHERE su.dvObjectContainer.id =:dvObjectId")
+})
+@Entity
+@Table(indexes = {@Index(columnList="dvobjectcontainer_id")})
+public class StorageUse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @OneToOne
+    @JoinColumn(nullable=false)
+    private DvObject dvObjectContainer; 
+    
+    @Column
+    private Long sizeInBytes = null; 
+    
+    public StorageUse() {}
+    
+    public StorageUse(DvObjectContainer dvObjectContainer) {
+        this(dvObjectContainer, 0L);
+    }
+    
+    public StorageUse(DvObjectContainer dvObjectContainer, Long sizeInBytes) {
+        this.dvObjectContainer = dvObjectContainer;
+        this.sizeInBytes = sizeInBytes;
+    }
+    
+    public Long getSizeInBytes() {
+        return sizeInBytes; 
+    }
+    
+    public void setSizeInBytes(Long sizeInBytes) {
+        this.sizeInBytes = sizeInBytes;
+    }
+    
+    public void incrementSizeInBytes(Long sizeInBytes) {
+        this.sizeInBytes += sizeInBytes; 
+    }
+    
+    
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof StorageUse)) {
+            return false;
+        }
+        StorageUse other = (StorageUse) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "edu.harvard.iq.dataverse.storageuse.StorageUse[ id=" + id + " ]";
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/storageuse/StorageUseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/storageuse/StorageUseServiceBean.java
new file mode 100644
index 00000000000..7aea7a7b596
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/storageuse/StorageUseServiceBean.java
@@ -0,0 +1,72 @@
+package edu.harvard.iq.dataverse.storageuse;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author landreev
+ */
+@Stateless
+@Named
+public class StorageUseServiceBean  implements java.io.Serializable {
+    private static final Logger logger = Logger.getLogger(StorageUseServiceBean.class.getCanonicalName());
+    
+    @PersistenceContext(unitName = "VDCNet-ejbPU")
+    private EntityManager em;
+    
+    public StorageUse findByDvContainerId(Long dvObjectId) {
+        return em.createNamedQuery("StorageUse.findByDvContainerId", StorageUse.class).setParameter("dvObjectId", dvObjectId).getSingleResult();
+    }
+    
+    /**
+     * Looks up the current storage use size, using a named query in a new 
+     * transaction
+     * @param dvObjectId
+     * @return 
+     */
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public Long findStorageSizeByDvContainerId(Long dvObjectId) {
+        Long res = em.createNamedQuery("StorageUse.findByteSizeByDvContainerId", Long.class).setParameter("dvObjectId", dvObjectId).getSingleResult();
+        return res == null ? 0L : res;
+    }
+    
+    /**
+     * Increments the recorded storage size for all the dvobject parents of a
+     * datafile, recursively. 
+     * @param dvObjectContainerId database id of the immediate parent (dataset)
+     * @param increment size in bytes of the file(s) being added 
+     */
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public void incrementStorageSizeRecursively(Long dvObjectContainerId, Long increment) {
+        if (dvObjectContainerId != null && increment != null) {
+            Optional<Boolean> allow = JvmSettings.STORAGEUSE_DISABLE_UPDATES.lookupOptional(Boolean.class);
+            if (!(allow.isPresent() && allow.get())) {
+                String queryString = "WITH RECURSIVE uptree (id, owner_id) AS\n"
+                        + "("
+                        + "    SELECT id, owner_id\n"
+                        + "    FROM dvobject\n"
+                        + "    WHERE id=" + dvObjectContainerId + "\n"
+                        + "    UNION ALL\n"
+                        + "    SELECT dvobject.id, dvobject.owner_id\n"
+                        + "    FROM dvobject\n"
+                        + "    JOIN uptree ON dvobject.id = uptree.owner_id)\n"
+                        + "UPDATE storageuse SET sizeinbytes=COALESCE(sizeinbytes,0)+" + increment + "\n"
+                        + "FROM uptree\n"
+                        + "WHERE dvobjectcontainer_id = uptree.id;";
+
+                int parentsUpdated = em.createNativeQuery(queryString).executeUpdate();
+            }
+        }
+        // @todo throw an exception if the number of parent dvobjects updated by
+        // the query is < 2 - ? 
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/storageuse/UploadSessionQuotaLimit.java b/src/main/java/edu/harvard/iq/dataverse/storageuse/UploadSessionQuotaLimit.java
new file mode 100644
index 00000000000..f7dac52e886
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/storageuse/UploadSessionQuotaLimit.java
@@ -0,0 +1,38 @@
+package edu.harvard.iq.dataverse.storageuse;
+
+/**
+ *
+ * @author landreev
+ */
+public class UploadSessionQuotaLimit {
+        private Long totalAllocatedInBytes = 0L; 
+        private Long totalUsageInBytes = 0L;
+        
+        public UploadSessionQuotaLimit(Long allocated, Long used) {
+            this.totalAllocatedInBytes = allocated;
+            this.totalUsageInBytes = used; 
+        }
+        
+        public Long getTotalAllocatedInBytes() {
+            return totalAllocatedInBytes;
+        }
+        
+        public void setTotalAllocatedInBytes(Long totalAllocatedInBytes) {
+            this.totalAllocatedInBytes = totalAllocatedInBytes;
+        }
+        
+        public Long getTotalUsageInBytes() {
+            return totalUsageInBytes;
+        }
+        
+        public void setTotalUsageInBytes(Long totalUsageInBytes) {
+            this.totalUsageInBytes = totalUsageInBytes;
+        }
+        
+        public Long getRemainingQuotaInBytes() {
+            if (totalUsageInBytes > totalAllocatedInBytes) {
+                return 0L; 
+            }
+            return totalAllocatedInBytes - totalUsageInBytes;
+        }
+    }
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/timer/DataverseTimerServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/timer/DataverseTimerServiceBean.java
index f4a30139a97..a783b211b36 100644
--- a/src/main/java/edu/harvard/iq/dataverse/timer/DataverseTimerServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/timer/DataverseTimerServiceBean.java
@@ -7,10 +7,7 @@
 
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
-import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUser;
-import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
@@ -28,19 +25,17 @@
 import java.util.Iterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerConfig;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.servlet.http.HttpServletRequest;
 
 
 /**
@@ -56,16 +51,14 @@
 @Singleton
 @Startup
 public class DataverseTimerServiceBean implements Serializable {
-    @Resource
-    javax.ejb.TimerService timerService;
-    @PersistenceContext(unitName = "VDCNet-ejbPU")
-    private EntityManager em;
+    
     private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.timer.DataverseTimerServiceBean");
+    
+    @Resource
+    jakarta.ejb.TimerService timerService;
     @EJB
     HarvesterServiceBean harvesterService;
     @EJB
-    DataverseServiceBean dataverseService;
-    @EJB
     HarvestingClientServiceBean harvestingClientService;
     @EJB 
     AuthenticationServiceBean authSvc;
@@ -105,7 +98,7 @@ public void createTimer(Date initialExpiration, long intervalDuration, Serializa
         } catch (UnknownHostException ex) {
             Logger.getLogger(DataverseTimerServiceBean.class.getName()).log(Level.SEVERE, null, ex);
         }
-        timerService.createTimer(initialExpiration, intervalDuration, info);
+        timerService.createIntervalTimer(initialExpiration, intervalDuration, new TimerConfig(info, false));
     }
 
     /**
@@ -116,7 +109,7 @@ public void createTimer(Date initialExpiration, long intervalDuration, Serializa
      */
     @Timeout
     @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-    public void handleTimeout(javax.ejb.Timer timer) {
+    public void handleTimeout(jakarta.ejb.Timer timer) {
         // We have to put all the code in a try/catch block because
         // if an exception is thrown from this method, Glassfish will automatically
         // call the method a second time. (The minimum number of re-tries for a Timer method is 1)
@@ -127,13 +120,13 @@ public void handleTimeout(javax.ejb.Timer timer) {
         }
         
         try {
-            logger.log(Level.INFO,"Handling timeout on " + InetAddress.getLocalHost().getCanonicalHostName());
+            logger.log(Level.FINE,"Handling timeout on " + InetAddress.getLocalHost().getCanonicalHostName());
         } catch (UnknownHostException ex) {
             Logger.getLogger(DataverseTimerServiceBean.class.getName()).log(Level.SEVERE, null, ex);
         }
         
         if (timer.getInfo() instanceof MotherTimerInfo) {
-            logger.info("Behold! I am the Master Timer, king of all timers! I'm here to create all the lesser timers!");
+            logger.fine("Behold! I am the Master Timer, king of all timers! I'm here to create all the lesser timers!");
             removeHarvestTimers();
             for (HarvestingClient client : harvestingClientService.getAllHarvestingClients()) {
                 createHarvestTimer(client);
diff --git a/src/main/java/edu/harvard/iq/dataverse/userdata/UserListMaker.java b/src/main/java/edu/harvard/iq/dataverse/userdata/UserListMaker.java
index f942a52291c..18ff033b337 100644
--- a/src/main/java/edu/harvard/iq/dataverse/userdata/UserListMaker.java
+++ b/src/main/java/edu/harvard/iq/dataverse/userdata/UserListMaker.java
@@ -10,47 +10,39 @@
 import edu.harvard.iq.dataverse.mydata.Pager;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
 
 /**
  *
  * @author rmp553
  */
 public class UserListMaker {
-    
+
     private static final Logger logger = Logger.getLogger(UserListMaker.class.getName());
 
     UserServiceBean userService;
-    
+
     public boolean errorFound = false;
     public String errorMessage = null;
-    
+
     public static final int ITEMS_PER_PAGE = 25;
     public static final int MIN_ITEMS_PER_PAGE = 1;
     public static final int DEFAULT_OFFSET = 0;
-    
-    
+
     /*
      * Constructor
      */
     public UserListMaker(UserServiceBean userService) {
         this.userService = userService;
     }
-    
-    
-    public Long getTotalUserCount(boolean superusers_only){
-    
-        if (superusers_only){
+
+    public Long getTotalUserCount(boolean superusers_only) {
+        if (superusers_only) {
             return userService.getSuperUserCount();            
-        }else{
+        } else {
             return userService.getUserCount(null);  // send null for the optional search term
         }
-    
     }
-    
-    
+
     /** 
      * 
      * Get user count with search
@@ -58,120 +50,111 @@ public Long getTotalUserCount(boolean superusers_only){
      * @param searchTerm
      * @return 
      */
-    public Long getUserCountWithSearch(String searchTerm){
-
-        if (searchTerm == null){
+    public Long getUserCountWithSearch(String searchTerm) {
+        if (searchTerm == null) {
             searchTerm = "";
-        }else{
+        } else {
             searchTerm = searchTerm.trim();
         }
-        
         return userService.getUserCount(searchTerm);
     }
-  
-    public UserListResult runUserSearch(String searchTerm, Integer itemsPerPage, Integer selectedPage, String sorKey){
-        
+
+    public UserListResult runUserSearch(String searchTerm,
+                                        Integer itemsPerPage,
+                                        Integer selectedPage,
+                                        String sortKey) {
         // Initialize searchTerm
-        if ((searchTerm == null) || (searchTerm.trim().isEmpty())){
+        if ((searchTerm == null) || (searchTerm.trim().isEmpty())) {
             searchTerm = null;
         }
 
         // Initialize itemsPerPage
-        if ((itemsPerPage == null) || (itemsPerPage < MIN_ITEMS_PER_PAGE)){
+        if ((itemsPerPage == null) || (itemsPerPage < MIN_ITEMS_PER_PAGE)) {
             itemsPerPage = ITEMS_PER_PAGE;
         }
 
         // Initialize selectedPage
-        if ((selectedPage == null) || (selectedPage < 1)){
+        if ((selectedPage == null) || (selectedPage < 1)) {
             selectedPage = 1;
         }
 
-        // Initialize sortKey
-        String sortKey = null;
-        
         Pager pager;
 
          // -------------------------------------------------
         // (1) What is the user count for this search?
         // -------------------------------------------------
         Long userCount = userService.getUserCount(searchTerm);
-        
+
         // Are there any hits?  No; return info
-        if ((userCount == null)||(userCount == 0)){
+        if ((userCount == null) || (userCount == 0)) {
             pager = new Pager(0, itemsPerPage, selectedPage);
             return new UserListResult(searchTerm, pager, null);
         }
-              
+
         // -------------------------------------------------
         // (2) Do some calculations here regarding the selected page, offset, etc.
         // -------------------------------------------------
-        
+
         OffsetPageValues offsetPageValues = getOffset(userCount, selectedPage, itemsPerPage);
         selectedPage = offsetPageValues.getPageNumber();
         int offset = offsetPageValues.getOffset();
-                
+
         // -------------------------------------------------
         // (3) Retrieve the users
         // -------------------------------------------------
-        List<AuthenticatedUser> userList = userService.getAuthenticatedUserList(searchTerm, sortKey, itemsPerPage, offset);       
-        if (userList ==null){
+        List<AuthenticatedUser> userList = userService.getAuthenticatedUserList(searchTerm, sortKey, itemsPerPage, offset);
+        if (userList == null) {
             pager = new Pager(0, itemsPerPage, selectedPage);
             return new UserListResult(searchTerm, pager, null);
         }
-        
+
         pager = new Pager(userCount.intValue(), itemsPerPage, selectedPage);
 
         return new UserListResult(searchTerm, pager, userList);
-
     }
-    
-    
-    public OffsetPageValues getOffset(Long userCount, Integer selectedPage, Integer itemsPerPage){
-        
-        if (userCount == null){
+
+    public OffsetPageValues getOffset(Long userCount, Integer selectedPage, Integer itemsPerPage) {
+        if (userCount == null) {
             return new OffsetPageValues(DEFAULT_OFFSET, 0);
         }
-        
-        if (itemsPerPage == null){
+
+        if (itemsPerPage == null) {
             itemsPerPage = ITEMS_PER_PAGE;
         }
-        if ((selectedPage == null)||(selectedPage < 1)){
+
+        if ((selectedPage == null) || (selectedPage < 1)) {
             selectedPage = 1;
         }
-        
+
         int offset = (selectedPage - 1) * itemsPerPage;
         if (offset > userCount){
             offset = DEFAULT_OFFSET;
             selectedPage = 1;
         }
-        
+
         return new OffsetPageValues(offset, selectedPage);
-                
     }
-    
-    
-    
-    public boolean hasError(){
+
+    public boolean hasError() {
         return this.errorFound;
     }
-    
-    public String getErrorMessage(){
+
+    public String getErrorMessage() {
         return this.errorMessage;
     }
-    
+
     private void addErrorMessage(String errMsg){
         this.errorFound = true;
         this.errorMessage = errMsg;
     }
-   
-    private void msg(String s){
+
+    private void msg(String s) {
         System.out.println(s);
     }
-    
+
     private void msgt(String s){
         msg("-------------------------------");
         msg(s);
         msg("-------------------------------");
     }
-    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/userdata/UserListResult.java b/src/main/java/edu/harvard/iq/dataverse/userdata/UserListResult.java
index 07937638607..5e7f532d2ac 100644
--- a/src/main/java/edu/harvard/iq/dataverse/userdata/UserListResult.java
+++ b/src/main/java/edu/harvard/iq/dataverse/userdata/UserListResult.java
@@ -7,14 +7,13 @@
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.mydata.Pager;
-import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/userdata/UserUtil.java b/src/main/java/edu/harvard/iq/dataverse/userdata/UserUtil.java
index 1ec17ac5928..8ab07cbc1a1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/userdata/UserUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/userdata/UserUtil.java
@@ -5,7 +5,11 @@
  */
 package edu.harvard.iq.dataverse.userdata;
 
+import edu.harvard.iq.dataverse.UserNotification.Type;
 import java.sql.Timestamp;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -65,5 +69,4 @@ public static Timestamp getTimestampOrNull(Object dbResult){
         }
         return (Timestamp)dbResult;
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/ArchiverUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/ArchiverUtil.java
index fc97f972f5c..18ec6243d5a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/ArchiverUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/ArchiverUtil.java
@@ -1,11 +1,15 @@
 package edu.harvard.iq.dataverse.util;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.logging.Logger;
 
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.impl.AbstractSubmitToArchiveCommand;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 
 /**
  * Simple class to reflectively get an instance of the desired class for
@@ -35,4 +39,37 @@ public static AbstractSubmitToArchiveCommand createSubmitToArchiveCommand(String
         }
         return null;
     }
-}
+    
+    public static boolean onlySingleVersionArchiving(Class<? extends AbstractSubmitToArchiveCommand> clazz, SettingsServiceBean settingsService) {
+        Method m;
+        try {
+            m = clazz.getMethod("isSingleVersion", SettingsServiceBean.class);
+            Object[] params = { settingsService };
+            return (Boolean) m.invoke(null, params);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (SecurityException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return (AbstractSubmitToArchiveCommand.isSingleVersion(settingsService));
+    }
+
+    public static boolean isSomeVersionArchived(Dataset dataset) {
+        boolean someVersionArchived = false;
+        for (DatasetVersion dv : dataset.getVersions()) {
+            if (dv.getArchivalCopyLocation() != null) {
+                someVersionArchived = true;
+                break;
+            }
+        }
+
+        return someVersionArchived;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java
index 1311a2495ae..771cf5fd0f0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java
@@ -10,7 +10,9 @@
 import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.faces.context.FacesContext;
+import java.util.Map;
+import java.util.HashMap;
+import jakarta.faces.context.FacesContext;
 
 public class BundleUtil {
 
@@ -18,8 +20,22 @@ public class BundleUtil {
 
     private static final String defaultBundleFile = "Bundle";
 
+    private static final Map<String, ClassLoader> classLoaderCache = new HashMap<String, ClassLoader>();
+
     public static String getStringFromBundle(String key) {
-        return getStringFromBundle(key, null);
+        return getStringFromBundle(key, (List<String>)null);
+    }
+    
+    public static String getStringFromBundle(String key, Locale locale) {
+        return getStringFromBundle(key, null, locale);
+    }
+
+    private static String getStringFromBundle(String key, List<String> arguments, Locale locale) {
+        ResourceBundle bundle = getResourceBundle(defaultBundleFile, locale);
+        if (bundle == null) {
+            return null;
+        }
+        return getStringFromBundle(key, arguments, bundle);
     }
 
     public static String getStringFromBundle(String key, List<String> arguments) {
@@ -63,8 +79,12 @@ private static String getStringFromBundleNoMissingCheck(String key, List<String>
         }
     }
 
-    public static String getStringFromPropertyFile(String key, String propertyFileName  ) throws MissingResourceException {
-        ResourceBundle bundle = getResourceBundle(propertyFileName);
+    public static String getStringFromPropertyFile(String key, String propertyFileName) throws MissingResourceException {
+        return getStringFromPropertyFile(key, propertyFileName, null);
+    }
+    
+    public static String getStringFromPropertyFile(String key, String propertyFileName, Locale locale) throws MissingResourceException {
+        ResourceBundle bundle = getResourceBundle(propertyFileName,locale);
         if (bundle == null) {
             return null;
         }
@@ -85,24 +105,40 @@ public static ResourceBundle getResourceBundle(String propertyFileName, Locale c
         }
 
         if (filesRootDirectory == null || filesRootDirectory.isEmpty()) {
-            bundle = ResourceBundle.getBundle("propertyFiles/" +propertyFileName, currentLocale);
+            bundle = ResourceBundle.getBundle("propertyFiles/" + propertyFileName, currentLocale);
         } else {
-            File bundleFileDir  = new File(filesRootDirectory);
-            URL[] urls = null;
             try {
-                urls = new URL[]{bundleFileDir.toURI().toURL()};
-            } catch (Exception e) {
-                e.printStackTrace();
-                return null;
+                ClassLoader loader = getClassLoader(filesRootDirectory);
+                bundle = ResourceBundle.getBundle(propertyFileName, currentLocale, loader);
+            } catch (MissingResourceException mre) {
+                logger.fine("No property file named " + propertyFileName + "_" + currentLocale.getLanguage()
+                        + " found in " + filesRootDirectory + ", using untranslated values");
+                bundle = ResourceBundle.getBundle("propertyFiles/" + propertyFileName, currentLocale);
             }
-
-            ClassLoader loader = new URLClassLoader(urls);
-            bundle = ResourceBundle.getBundle(propertyFileName, currentLocale, loader);
         }
 
         return bundle ;
     }
 
+    private static ClassLoader getClassLoader(String filesRootDirectory) {
+        if (classLoaderCache.containsKey(filesRootDirectory)){
+            return classLoaderCache.get(filesRootDirectory);
+        }
+
+        File bundleFileDir  = new File(filesRootDirectory);
+        URL[] urls = null;
+        try {
+            urls = new URL[]{bundleFileDir.toURI().toURL()};
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+
+        ClassLoader loader = new URLClassLoader(urls);
+        classLoaderCache.put(filesRootDirectory, loader);
+        return loader;
+    }
+
     public static Locale getCurrentLocale() {
         if (FacesContext.getCurrentInstance() == null) {
             String localeEnvVar = System.getenv().get("LANG");
@@ -145,19 +181,21 @@ public static String getStringFromDefaultPropertyFile(String key, String propert
         }
         return getStringFromBundleNoMissingCheck(key, null, bundle);
     }
-
+    
+    /**
+     * Return JVM default locale.
+     *
+     * For now, this simply forwards default system behaviour.
+     * That means on JDK8 the system property user.language will be set on startup
+     * from environment variables like LANG or via Maven arguments (which is important for testing).
+     * (See also pom.xml for an example how we pinpoint this for reproducible tests!)
+     * (You should also be aware that good IDEs are honoring settings from pom.xml.)
+     *
+     * Nonetheless, someday we might want to have more influence on how this is determined, thus this wrapper.
+     * @return Dataverse default locale
+     */
     public static Locale getDefaultLocale() {
-        String localeEnvVar = System.getenv().get("LANG");
-        if (localeEnvVar != null) {
-            if (localeEnvVar.indexOf('.') > 0) {
-                localeEnvVar = localeEnvVar.substring(0, localeEnvVar.indexOf('.'));
-            }
-            if (!"en_US".equals(localeEnvVar)) {
-                logger.fine("BundleUtil: LOCALE code from the environmental variable is "+localeEnvVar);
-                return new Locale(localeEnvVar);
-            }
-        }
-
-        return new Locale("en");
+        return Locale.getDefault();
     }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/CSLUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/CSLUtil.java
new file mode 100644
index 00000000000..fe9e00bd837
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/CSLUtil.java
@@ -0,0 +1,128 @@
+package edu.harvard.iq.dataverse.util;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
+
+import org.apache.commons.lang3.LocaleUtils;
+
+import de.undercouch.citeproc.CSL;
+import de.undercouch.citeproc.helper.CSLUtils;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import jakarta.faces.model.SelectItem;
+import jakarta.faces.model.SelectItemGroup;
+
+public class CSLUtil {
+    private static final Logger logger = Logger.getLogger(CSLUtil.class.getName());
+
+    static ArrayList<String> supportedStyles;
+    static Map<String, List<SelectItem>> groupedStylesCache = new ConcurrentHashMap<>();
+
+
+    public static String getDefaultStyle() {
+        return getCommonStyles()[0];
+    }
+
+    public static List<SelectItem> getSupportedStyles(String localeCode) {
+        Locale locale = LocaleUtils.toLocale(localeCode);
+        if (locale == null) {
+            locale = Locale.getDefault();
+        }
+        String languageKey = locale.getLanguage();
+
+        if (groupedStylesCache.containsKey(languageKey)) {
+            return groupedStylesCache.get(languageKey);
+        }
+
+        List<SelectItem> groupedStyles = new ArrayList<>();
+        supportedStyles = new ArrayList<>();
+        try {
+            Set<String> styleSet = CSL.getSupportedStyles();
+            // Remove styles starting with "dependent/"
+            styleSet.removeIf(style -> style.startsWith("dependent/"));
+            supportedStyles = new ArrayList<>(styleSet);
+        } catch (IOException e) {
+            logger.warning("Unable to retrieve supported CSL styles: " + e.getMessage());
+            e.printStackTrace();
+        }
+        supportedStyles.sort(Comparator.naturalOrder());
+
+        String commonTitle = BundleUtil.getStringFromBundle("dataset.cite.cslDialog.commonStyles", locale);
+        SelectItemGroup commonStyles = new SelectItemGroup(commonTitle);
+        ArrayList<SelectItem> commonArray = new ArrayList<>();
+        String[] styleStrings = getCommonStyles();
+        Arrays.stream(styleStrings).forEach(style -> {
+            logger.fine("Found style: " + style);
+            commonArray.add(new SelectItem(style, style));
+            supportedStyles.remove(style);
+        });
+        commonStyles.setSelectItems(commonArray);
+
+        String otherTitle = BundleUtil.getStringFromBundle("dataset.cite.cslDialog.otherStyles", locale);
+        SelectItemGroup otherStyles = new SelectItemGroup(otherTitle);
+
+        ArrayList<SelectItem> otherArray = new ArrayList<>(supportedStyles.size());
+        supportedStyles.forEach(style -> {
+            otherArray.add(new SelectItem(style, style));
+        });
+        otherStyles.setSelectItems(otherArray);
+
+        groupedStyles.add(commonStyles);
+        groupedStyles.add(otherStyles);
+
+        groupedStylesCache.put(languageKey, groupedStyles);
+        return groupedStyles;
+    }
+
+    /**
+     * Adapted from private retrieveStyle method in de.undercouch.citeproc.CSL
+     * Retrieves a CSL style from the classpath. For example, if the given name is
+     * <code>ieee</code> this method will load the file <code>/ieee.csl</code>
+     * 
+     * @param styleName the style's name
+     * @return the serialized XML representation of the style
+     * @throws IOException if the style could not be loaded
+     */
+    public static String getCitationFormat(String styleName) throws IOException {
+        URL url;
+
+        // normalize file name
+        if (!styleName.endsWith(".csl")) {
+            styleName = styleName + ".csl";
+        }
+        if (!styleName.startsWith("/")) {
+            styleName = "/" + styleName;
+        }
+
+        // try to find style in classpath
+        url = CSL.class.getResource(styleName);
+        if (url == null) {
+            throw new FileNotFoundException("Could not find style in " + "classpath: " + styleName);
+        }
+
+        // load style
+        String result = CSLUtils.readURLToString(url, "UTF-8");
+        result = result.replace("\"", "\\\"").replace("\r", "").replace("\n", "");
+        return result;
+    }
+
+    private static String[] commonStyles = null;
+
+    private static String[] getCommonStyles() {
+        if (commonStyles == null) {
+            commonStyles = JvmSettings.CSL_COMMON_STYLES.lookupOptional().orElse("chicago-author-date, ieee")
+                    .split("\\s*,\\s*");
+        }
+        return commonStyles;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/ClockUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/ClockUtil.java
new file mode 100644
index 00000000000..d51f70229a9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/ClockUtil.java
@@ -0,0 +1,26 @@
+package edu.harvard.iq.dataverse.util;
+
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Qualifier;
+import jakarta.inject.Singleton;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.time.Clock;
+
+@Singleton
+public class ClockUtil {
+    
+    
+    @Qualifier
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER})
+    public @interface LocalTime {
+    }
+    
+    @Produces
+    @LocalTime
+    public static final Clock LOCAL_CLOCK = Clock.systemDefaultZone();
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/ConstraintViolationUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/ConstraintViolationUtil.java
new file mode 100644
index 00000000000..1910fde6489
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/ConstraintViolationUtil.java
@@ -0,0 +1,38 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse.util;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+
+/**
+ *
+ * @author skraffmi
+ */
+public class ConstraintViolationUtil {
+
+    public static String getErrorStringForConstraintViolations(Throwable cause) {
+
+        StringBuilder sb = new StringBuilder();
+        if (cause == null) {
+            return "";
+        }
+        while (cause.getCause() != null) {
+            cause = cause.getCause();
+            if (cause instanceof ConstraintViolationException) {
+                ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
+                for (ConstraintViolation<?> violation : constraintViolationException.getConstraintViolations()) {
+                    sb.append(" Invalid value: <<<").append(violation.getInvalidValue()).append(">>> for ")
+                            .append(violation.getPropertyPath()).append(" at ")
+                            .append(violation.getLeafBean()).append(" - ")
+                            .append(violation.getMessage());
+                }
+            }
+        }
+        return sb.toString();
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DataFileComparator.java b/src/main/java/edu/harvard/iq/dataverse/util/DataFileComparator.java
new file mode 100644
index 00000000000..8003fefd635
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DataFileComparator.java
@@ -0,0 +1,129 @@
+package edu.harvard.iq.dataverse.util;
+
+
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Map;
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DataFileCategory;
+import edu.harvard.iq.dataverse.FileMetadata;
+
+/**
+ *
+ * @author qqmyers
+ */
+public class DataFileComparator implements Comparator<FileMetadata> {
+
+    boolean byFolder = false;
+    boolean byCategory = false;
+    String field = "name";
+    boolean ascending = true;
+
+    public Comparator<FileMetadata> compareBy(boolean byFolder, boolean byCategory, String field, boolean ascending) {
+        this.byFolder = byFolder;
+        this.byCategory = byCategory;
+        if(StringUtil.nonEmpty(field)) {
+            this.field = field;
+        }
+        this.ascending = ascending;
+        return this;
+    }
+    
+    public boolean getByFolder() {
+        return this.byFolder;
+    }
+    public int getByCategory() {
+        return FileMetadata.getCategorySortOrder().size();
+    }
+    
+    public String getField() {
+        return this.field;
+    }
+    
+    public boolean getAsc() {
+        return this.ascending;
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Override
+    public int compare(FileMetadata o1, FileMetadata o2) {
+        if (byFolder) {
+            // Compare folders first
+            String folder1 = o1.getDirectoryLabel() == null ? "" : o1.getDirectoryLabel().toUpperCase();
+            String folder2 = o2.getDirectoryLabel() == null ? "" : o2.getDirectoryLabel().toUpperCase();
+
+            if ("".equals(folder1) && !"".equals(folder2)) {
+                return -1;
+            }
+
+            if ("".equals(folder2) && !"".equals(folder1)) {
+                return 1;
+            }
+
+            int comp = folder1.compareTo(folder2);
+            if (comp != 0) {
+                return comp;
+            }
+        }
+        Map<String,Long> categoryMap = FileMetadata.getCategorySortOrder();
+        
+        if (byCategory) {
+            // Then by category if set
+            if (categoryMap != null) {
+                long rank1 = Long.MAX_VALUE;
+                for (DataFileCategory c : o1.getCategories()) {
+                    Long rank = categoryMap.get(c.getName().toUpperCase());
+                    if (rank != null) {
+                        if (rank < rank1) {
+                            rank1 = rank;
+                        }
+                    }
+                }
+                long rank2 = Long.MAX_VALUE;
+                for (DataFileCategory c : o2.getCategories()) {
+                    Long rank = categoryMap.get(c.getName().toUpperCase());
+                    if (rank != null) {
+                        if (rank < rank2) {
+                            rank2 = rank;
+                        }
+                    }
+                }
+                if (rank1 != rank2) {
+                    return rank1 < rank2 ? -1 : 1;
+                }
+            }
+        }
+
+        // Folders are equal, no categories or category score is equal, so compare
+        // labels
+        Comparable file1 = null;
+        Comparable file2 = null;
+        switch (field) {
+        case "date":
+            file1 = getFileDateToCompare(o1);
+            file2 = getFileDateToCompare(o2);
+            break;
+        case "type":
+            file1 = StringUtil.isEmpty(o1.getDataFile().getFriendlyType()) ? "" : o1.getDataFile().getContentType();
+            file2 = StringUtil.isEmpty(o2.getDataFile().getFriendlyType()) ? "" : o2.getDataFile().getContentType();
+            break;
+        case "size":
+            file1 = new Long(o1.getDataFile().getFilesize());
+            file2 = new Long(o2.getDataFile().getFilesize());
+            break;
+        default: // "name" or not recognized
+            file1 = o1.getLabel().toUpperCase();
+            file2 = o2.getLabel().toUpperCase();
+
+        }
+        return (ascending ? file1.compareTo(file2) : file2.compareTo(file1));
+    }
+
+    private Date getFileDateToCompare(FileMetadata fileMetadata) {
+        DataFile datafile = fileMetadata.getDataFile();
+        if (datafile.isReleased()) {
+            return datafile.getPublicationDate();
+        }
+        return datafile.getCreateDate();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DataSourceProducer.java b/src/main/java/edu/harvard/iq/dataverse/util/DataSourceProducer.java
new file mode 100644
index 00000000000..62cd318706f
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DataSourceProducer.java
@@ -0,0 +1,70 @@
+package edu.harvard.iq.dataverse.util;
+
+import jakarta.annotation.Resource;
+import jakarta.annotation.sql.DataSourceDefinition;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
+import javax.sql.DataSource;
+
+// Find docs here: https://jakarta.ee/specifications/annotations/2.1/apidocs/jakarta.annotation/jakarta/annotation/sql/datasourcedefinition
+@Singleton
+@DataSourceDefinition(
+        name = "java:app/jdbc/dataverse",
+        // The app server (Payara) deploys a managed pool for this data source for us.
+        // We don't need to deal with this on our own.
+        //
+        // HINT: PGSimpleDataSource would work too, but as we use a connection pool, go with a javax.sql.ConnectionPoolDataSource
+        // HINT: PGXADataSource is unnecessary (no distributed transactions used) and breaks ingest.
+        className = "org.postgresql.ds.PGConnectionPoolDataSource",
+        
+        // BEWARE: as this resource is created before defaults are read from META-INF/microprofile-config.properties,
+        // defaults must be provided in this Payara-proprietary manner.
+        user = "${MPCONFIG=dataverse.db.user:dataverse}",
+        password = "${MPCONFIG=dataverse.db.password}",
+        url = "jdbc:postgresql://${MPCONFIG=dataverse.db.host:localhost}:${MPCONFIG=dataverse.db.port:5432}/${MPCONFIG=dataverse.db.name:dataverse}?${MPCONFIG=dataverse.db.parameters:}",
+        
+        // If we ever need to change these pool settings, we need to remove this class and create the resource
+        // from web.xml. We can use MicroProfile Config in there for these values, impossible to do in the annotation.
+        //
+        // See also https://blog.payara.fish/an-intro-to-connection-pools-in-payara-server-5
+        // Payara DataSourceDefinitionDeployer default value = 8
+        minPoolSize = 10,
+        // HINT: Payara DataSourceDefinitionDeployer default value = 32
+        // HINT: Harvard Dataverse is fine for a while with 64
+        maxPoolSize = 100,
+        // "The number of seconds that a physical connection should remain unused in the pool before the connection is closed for a connection pool. "
+        // Payara DataSourceDefinitionDeployer default value = 300 (seconds)
+        maxIdleTime = 300,
+
+        // Set more options via MPCONFIG, including defaults where applicable.
+        // TODO: Future versions of Payara might support setting integer properties like pool size,
+        //       idle times, etc in a Payara-propietary way. See https://github.com/payara/Payara/pull/5272
+        properties = {
+            // The following options are documented here:
+            // https://docs.payara.fish/community/docs/documentation/payara-server/jdbc/advanced-connection-pool-properties.html
+            // VALIDATION
+            "fish.payara.is-connection-validation-required=${MPCONFIG=dataverse.db.is-connection-validation-required:false}",
+            "fish.payara.connection-validation-method=${MPCONFIG=dataverse.db.connection-validation-method:}",
+            "fish.payara.validation-table-name=${MPCONFIG=dataverse.db.validation-table-name:}",
+            "fish.payara.validation-classname=${MPCONFIG=dataverse.db.validation-classname:}",
+            "fish.payara.validate-atmost-once-period-in-seconds=${MPCONFIG=dataverse.db.validate-atmost-once-period-in-seconds:0}",
+            // LEAK DETECTION
+            "fish.payara.connection-leak-timeout-in-seconds=${MPCONFIG=dataverse.db.connection-leak-timeout-in-seconds:0}",
+            "fish.payara.connection-leak-reclaim=${MPCONFIG=dataverse.db.connection-leak-reclaim:false}",
+            "fish.payara.statement-leak-timeout-in-seconds=${MPCONFIG=dataverse.db.statement-leak-timeout-in-seconds:0}",
+            "fish.payara.statement-leak-reclaim=${MPCONFIG=dataverse.db.statement-leak-reclaim:false}",
+            // LOGGING, SLOWNESS, PERFORMANCE
+            "fish.payara.statement-timeout-in-seconds=${MPCONFIG=dataverse.db.statement-timeout-in-seconds:-1}",
+            "fish.payara.slow-query-threshold-in-seconds=${MPCONFIG=dataverse.db.slow-query-threshold-in-seconds:-1}",
+            "fish.payara.log-jdbc-calls=${MPCONFIG=dataverse.db.log-jdbc-calls:false}"
+        })
+public class DataSourceProducer {
+
+    @Resource(lookup = "java:app/jdbc/dataverse")
+    DataSource ds;
+
+    @Produces
+    public DataSource getDatasource() {
+        return ds;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DatasetFieldUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/DatasetFieldUtil.java
new file mode 100644
index 00000000000..c5c725283f2
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DatasetFieldUtil.java
@@ -0,0 +1,42 @@
+package edu.harvard.iq.dataverse.util;
+
+import edu.harvard.iq.dataverse.DatasetField;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ * Toolkit for datasetFields
+ * @author alejandra.tenorio
+ * @author qqmyers
+ */
+public class DatasetFieldUtil {
+
+    private static final Logger logger = Logger.getLogger(DatasetFieldUtil.class.getCanonicalName());
+
+    /**
+     * Removed empty fields, sets field value display order.
+     * @param datasetFields the datasetFields from templates or datasetVersions we want to tidy up.
+     * @param removeBlanks if remove blank fields
+     */
+    public static void tidyUpFields(List<DatasetField> datasetFields, boolean removeBlanks) {
+        if(removeBlanks){
+            Iterator<DatasetField> dsfIt = datasetFields.iterator();
+            while (dsfIt.hasNext()) {
+                if (dsfIt.next().removeBlankDatasetFieldValues()) {
+                    dsfIt.remove();
+                }
+            }
+            Iterator<DatasetField> dsfItTrim = datasetFields.iterator();
+            while (dsfItTrim.hasNext()) {
+                dsfItTrim.next().trimTrailingSpaces();
+            }
+        }
+        Iterator<DatasetField> dsfItSort = datasetFields.iterator();
+        while (dsfItSort.hasNext()) {
+            dsfItSort.next().setValueDisplayOrder();
+        }
+
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DatasetFieldWalker.java b/src/main/java/edu/harvard/iq/dataverse/util/DatasetFieldWalker.java
index 4c6434b83a5..25032860d11 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/DatasetFieldWalker.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DatasetFieldWalker.java
@@ -10,10 +10,12 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.Map;
 import java.util.logging.Logger;
 
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+
 /**
  * A means of iterating over {@link DatasetField}s, or a collection of them.
  * As these may have a complex structure (compound values, etc), this object 
@@ -28,9 +30,11 @@ public class DatasetFieldWalker {
 
     public interface Listener {
         void startField( DatasetField f );
+        void addExpandedValuesArray( DatasetField f );
         void endField( DatasetField f );
+        void externalVocabularyValue( DatasetFieldValue dsfv, JsonObject cvocEntry );
         void primitiveValue( DatasetFieldValue dsfv );
-        void controledVocabularyValue( ControlledVocabularyValue cvv );
+        void controlledVocabularyValue( ControlledVocabularyValue cvv );
         void startCompoundValue( DatasetFieldCompoundValue dsfcv );
         void endCompoundValue( DatasetFieldCompoundValue dsfcv );
     }
@@ -40,8 +44,8 @@ public interface Listener {
      * @param dsf the field to walk over.
      * @param l the listener to execute on {@code dsf}'s values and structure.
      */
-    public static void walk( DatasetField dsf, Listener l ) {
-        DatasetFieldWalker joe = new DatasetFieldWalker(l);
+    public static void walk( DatasetField dsf, Listener l, Map<Long, JsonObject> cvocMap ) {
+        DatasetFieldWalker joe = new DatasetFieldWalker(l, cvocMap);
         SettingsServiceBean nullServiceBean = null;
         joe.walk(dsf, nullServiceBean);
     }
@@ -53,32 +57,34 @@ public static void walk( DatasetField dsf, Listener l ) {
      * @param exclude the fields to skip
      * @param l the listener to execute on each field values and structure.
      */
-    public static void walk(List<DatasetField> fields, SettingsServiceBean settingsService, Listener l) {
-        DatasetFieldWalker joe = new DatasetFieldWalker(l);
+    public static void walk(List<DatasetField> fields, SettingsServiceBean settingsService, Map<Long, JsonObject> cvocMap, Listener l) {
+        DatasetFieldWalker joe = new DatasetFieldWalker(l, cvocMap);
         for ( DatasetField dsf : sort( fields, DatasetField.DisplayOrder) ) {
             joe.walk(dsf, settingsService);
         }
     }
     
     private Listener l;
+    private Map<Long, JsonObject> cvocMap;
     
     
-    public DatasetFieldWalker(Listener l) {
+    public DatasetFieldWalker(Listener l, Map<Long, JsonObject> cvocMap) {
         this.l = l;
+        this.cvocMap = cvocMap;
     }
     
     public DatasetFieldWalker(){
-        this( null );
+        this( null, null);
     }
     
     public void walk(DatasetField fld, SettingsServiceBean settingsService) {
         l.startField(fld);
         DatasetFieldType datasetFieldType = fld.getDatasetFieldType();
-
+        
         if ( datasetFieldType.isControlledVocabulary() ) {
             for ( ControlledVocabularyValue cvv 
                     : sort(fld.getControlledVocabularyValues(), ControlledVocabularyValue.DisplayOrder) ) {
-                l.controledVocabularyValue(cvv);
+                l.controlledVocabularyValue(cvv);
             }
             
         } else if ( datasetFieldType.isPrimitive() ) {
@@ -98,6 +104,16 @@ public void walk(DatasetField fld, SettingsServiceBean settingsService) {
                l.endCompoundValue(dsfcv);
            }
         }
+        l.addExpandedValuesArray(fld); 
+        if(datasetFieldType.isPrimitive() && cvocMap.containsKey(datasetFieldType.getId())) {
+            for ( DatasetFieldValue evv : sort(fld.getDatasetFieldValues(), DatasetFieldValue.DisplayOrder) ) {
+                if (settingsService != null && settingsService.isTrueForKey(SettingsServiceBean.Key.ExcludeEmailFromExport, false) && DatasetFieldType.FieldType.EMAIL.equals(evv.getDatasetField().getDatasetFieldType().getFieldType())) {
+                    continue;
+                }
+                l.externalVocabularyValue(evv, cvocMap.get(datasetFieldType.getId()));
+            }
+            
+        }
         l.endField(fld);
     }
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
index d6f22471f68..669780b9436 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
@@ -16,7 +16,9 @@
  */
 public class DateUtil {
 
+    public static String YEAR_PATTERN = "yyyy";
     public static String YEAR_DASH_MONTH_PATTERN = "yyyy-MM";
+    public static String YEAR_DASH_MONTH_DASH_DAY_PATTERN = "yyyy-MM-dd";
 
     public static String formatDate(Date dateToformat) {
         String formattedDate;
@@ -63,4 +65,40 @@ public static String formatDate(Timestamp datetimeToformat) {
          }
     }
 
+    public static Date parseDate(String dateString) {
+        SimpleDateFormat sdf;
+        Date date;
+
+        // YYYY-MM-DD
+        date = parseDate(dateString, YEAR_DASH_MONTH_DASH_DAY_PATTERN);
+        if (date != null) {
+            return date;
+        }
+
+        // YYYY-MM
+        date = parseDate(dateString, YEAR_DASH_MONTH_PATTERN);
+        if (date != null) {
+            return date;
+        }
+
+        // YYYT
+        date = parseDate(dateString, YEAR_PATTERN);
+        return date;
+        
+    }
+
+    public static Date parseDate(String dateString, String format) {
+        
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat(format);
+            Date date = sdf.parse(dateString);
+            return date;
+        } catch (ParseException ex) {
+            // ignore
+        } catch (Exception ex) {
+            // ignore
+        }
+        return null;
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/EjbUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/EjbUtil.java
index cf337b0a020..fd8c8fa4a9c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/EjbUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/EjbUtil.java
@@ -1,6 +1,6 @@
 package edu.harvard.iq.dataverse.util;
 
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 public class EjbUtil {
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileMetadataUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/FileMetadataUtil.java
new file mode 100644
index 00000000000..cd5db359344
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/FileMetadataUtil.java
@@ -0,0 +1,95 @@
+/*
+   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   Dataverse Network - A web application to share, preserve and analyze research data.
+   Developed at the Institute for Quantitative Social Science, Harvard University.
+   Version 3.0.
+*/
+
+package edu.harvard.iq.dataverse.util;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.FileMetadata;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.logging.Logger;
+
+public class FileMetadataUtil implements java.io.Serializable {
+    private static final Logger logger = Logger.getLogger(FileMetadataUtil.class.getCanonicalName());
+
+    //Delete the filemetadata from the list if and only if it is in the list
+    public static void removeFileMetadataFromList(Collection<FileMetadata> collection, FileMetadata fmToDelete) {
+        // With an id, the standard remove will work
+        if (fmToDelete.getId() != null) {
+            collection.remove(fmToDelete);
+        } else {
+            Iterator<FileMetadata> fmit = collection.iterator();
+            while (fmit.hasNext()) {
+                FileMetadata fmd = fmit.next();
+                // If not, we can remove based on a match based on the id of the related
+                // datafile
+                if (fmToDelete.getDataFile().getStorageIdentifier().equals(fmd.getDataFile().getStorageIdentifier())) {
+                    // and a match on the datasetversion
+                    if(fmToDelete.getDatasetVersion() == null) {
+                        //not yet associated with a version (i.e. deleting from the upload screen), so the match on datafile is good enough 
+                        fmit.remove();
+                    } else if (fmToDelete.getDatasetVersion().getId() == null) {
+                        // If the fmd to delete is for a datasetversion with no id, we assume match to
+                        // any other fmd with a datasetversion with no id (since there should be only
+                        // one)
+                        // Otherwise, we don't delete anything (this fmd hasn't been persisted and isn't
+                        // in the list.
+                        if (fmd.getDatasetVersion().getId() == null) {
+                            fmit.remove();
+                            break;
+                        }
+                    } else if (fmToDelete.getDatasetVersion().getId().equals(fmd.getDatasetVersion().getId())) {
+                        fmit.remove();
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    //Delete datafile from the list even if it's id is null (hasn't yet been persisted)
+    public static void removeDataFileFromList(List<DataFile> dfList, DataFile dfToDelete) {
+        // With an id, the standard remove will work
+        if (dfToDelete.getId() != null) {
+            dfList.remove(dfToDelete);
+        } else {
+            Iterator<DataFile> dfit = dfList.iterator();
+            while (dfit.hasNext()) {
+                DataFile df = dfit.next();
+                if (dfToDelete.getStorageIdentifier().equals(df.getStorageIdentifier())) {
+                    dfit.remove();
+                    break;
+                }
+            }
+        }
+    }
+
+    public static FileMetadata getFmdForFileInEditVersion(FileMetadata fmd, DatasetVersion editVersion) {
+        for(FileMetadata editFmd: editVersion.getFileMetadatas()) {
+            if(editFmd.getDataFile().getId().equals(fmd.getDataFile().getId())) {
+                return editFmd;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileSortFieldAndOrder.java b/src/main/java/edu/harvard/iq/dataverse/util/FileSortFieldAndOrder.java
index ba66c404349..ef921ff185c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/FileSortFieldAndOrder.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/FileSortFieldAndOrder.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse.util;
 
 import edu.harvard.iq.dataverse.search.SortBy;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class FileSortFieldAndOrder {
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileTypeDetection.java b/src/main/java/edu/harvard/iq/dataverse/util/FileTypeDetection.java
deleted file mode 100644
index 52515c00524..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/util/FileTypeDetection.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package edu.harvard.iq.dataverse.util;
-
-import java.io.File;
-import java.io.IOException;
-
-public class FileTypeDetection {
-
-    public static String determineFileType(File file) throws IOException {
-        return FileUtil.determineFileType(file, file.getName());
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
index 45ce6949127..38707f5fc7c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
@@ -21,21 +21,39 @@
 package edu.harvard.iq.dataverse.util;
 
 
-import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.DataFile.ChecksumType;
-import edu.harvard.iq.dataverse.DataFileServiceBean;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
-import static edu.harvard.iq.dataverse.dataaccess.S3AccessIO.S3_IDENTIFIER_PREFIX;
+import edu.harvard.iq.dataverse.dataaccess.S3AccessIO;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
 import edu.harvard.iq.dataverse.datasetutility.FileExceedsMaxSizeException;
+
+import static edu.harvard.iq.dataverse.api.ApiConstants.DS_VERSION_DRAFT;
 import static edu.harvard.iq.dataverse.datasetutility.FileSizeChecker.bytesToHumanReadable;
 import edu.harvard.iq.dataverse.ingest.IngestReport;
+import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
 import edu.harvard.iq.dataverse.ingest.IngestServiceShapefileHelper;
 import edu.harvard.iq.dataverse.ingest.IngestableDataChecker;
-import java.awt.image.BufferedImage;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.settings.ConfigCheckService;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.file.BagItFileHandler;
+import edu.harvard.iq.dataverse.util.file.CreateDataFileResult;
+import edu.harvard.iq.dataverse.util.file.BagItFileHandlerFactory;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+import edu.harvard.iq.dataverse.util.xml.html.HtmlFormatUtil;
+import static edu.harvard.iq.dataverse.util.xml.html.HtmlFormatUtil.formatDoc;
+import static edu.harvard.iq.dataverse.util.xml.html.HtmlFormatUtil.HTML_H1;
+import static edu.harvard.iq.dataverse.util.xml.html.HtmlFormatUtil.HTML_TABLE_HDR;
+import static edu.harvard.iq.dataverse.util.xml.html.HtmlFormatUtil.formatTitle;
+import static edu.harvard.iq.dataverse.util.xml.html.HtmlFormatUtil.formatTable;
+import static edu.harvard.iq.dataverse.util.xml.html.HtmlFormatUtil.formatTableCell;
+import static edu.harvard.iq.dataverse.util.xml.html.HtmlFormatUtil.formatLink;
+import static edu.harvard.iq.dataverse.util.xml.html.HtmlFormatUtil.formatTableCellAlignRight;
+import static edu.harvard.iq.dataverse.util.xml.html.HtmlFormatUtil.formatTableRow;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -45,8 +63,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.channels.FileChannel;
-import java.nio.channels.WritableByteChannel;
+import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -57,29 +74,43 @@
 import java.sql.Timestamp;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
+import java.util.ResourceBundle;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.activation.MimetypesFileTypeMap;
-import javax.ejb.EJBException;
+import jakarta.activation.MimetypesFileTypeMap;
+import jakarta.ejb.EJBException;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+
+import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.commons.io.FileUtils;
 
 import java.util.zip.GZIPInputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import static edu.harvard.iq.dataverse.datasetutility.FileSizeChecker.bytesToHumanReadable;
 import org.apache.commons.io.FilenameUtils;
 
+import edu.harvard.iq.dataverse.dataaccess.DataAccessOption;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
+import edu.harvard.iq.dataverse.util.file.FileExceedsStorageQuotaException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tika.Tika;
+import ucar.nc2.NetcdfFile;
+import ucar.nc2.NetcdfFiles;
 
 /**
  * a 4.0 implementation of the DVN FileUtil;
@@ -146,8 +177,14 @@ public class FileUtil implements java.io.Serializable  {
     
     public static final String SAVED_ORIGINAL_FILENAME_EXTENSION = "orig";
     
+    //Todo - this is the same as MIME_TYPE_TSV_ALT
     public static final String MIME_TYPE_INGESTED_FILE = "text/tab-separated-values";
 
+    public static final String MIME_TYPE_NETCDF = "application/netcdf";
+    public static final String MIME_TYPE_XNETCDF = "application/x-netcdf";
+    public static final String MIME_TYPE_HDF5 = "application/x-hdf5";
+    public static final String MIME_TYPE_RO_CRATE = "application/ld+json; profile=\"http://www.w3.org/ns/json-ld#flattened http://www.w3.org/ns/json-ld#compacted https://w3id.org/ro/crate\"";
+
     // File type "thumbnail classes" tags:
     
     public static final String FILE_THUMBNAIL_CLASS_AUDIO = "audio";
@@ -201,6 +238,8 @@ public class FileUtil implements java.io.Serializable  {
         FILE_THUMBNAIL_CLASSES.put(FILE_FACET_CLASS_UNKNOWN, FILE_THUMBNAIL_CLASS_OTHER);
         FILE_THUMBNAIL_CLASSES.put(FILE_FACET_CLASS_ARCHIVE, FILE_THUMBNAIL_CLASS_PACKAGE);
     }
+    
+    private static final String FILE_LIST_DATE_FORMAT = "d-MMMM-yyyy HH:mm";
 
     /**
      * This string can be prepended to a Base64-encoded representation of a PNG
@@ -212,26 +251,6 @@ public class FileUtil implements java.io.Serializable  {
     public FileUtil() {
     }
     
-    public static void copyFile(File inputFile, File outputFile) throws IOException {
-        FileChannel in = null;
-        WritableByteChannel out = null;
-        
-        try {
-            in = new FileInputStream(inputFile).getChannel();
-            out = new FileOutputStream(outputFile).getChannel();
-            long bytesPerIteration = 50000;
-            long start = 0;
-            while ( start < in.size() ) {
-                in.transferTo(start, bytesPerIteration, out);
-                start += bytesPerIteration;
-            }
-            
-        } finally {
-            if (in != null) { in.close(); }
-            if (out != null) { out.close(); }
-        }
-    }
-
    
     public static String getFileExtension(String fileName){
         String ext = null;
@@ -261,6 +280,11 @@ public static String getUserFriendlyFileType(DataFile dataFile) {
             if (fileType.equalsIgnoreCase(ShapefileHandler.SHAPEFILE_FILE_TYPE)){
                 return ShapefileHandler.SHAPEFILE_FILE_TYPE_FRIENDLY_NAME;
             }
+            try {
+                return BundleUtil.getStringFromPropertyFile(fileType,"MimeTypeDisplay" );
+            } catch (MissingResourceException e) {
+                //NOOP: we will try again after trimming ";"
+            }
             if (fileType.contains(";")) {
                 fileType = fileType.substring(0, fileType.indexOf(";"));
             }
@@ -275,6 +299,11 @@ public static String getUserFriendlyFileType(DataFile dataFile) {
     }
 
     public static String getIndexableFacetFileType(DataFile dataFile) {
+        try {
+            return BundleUtil.getStringFromDefaultPropertyFile(dataFile.getContentType(),"MimeTypeFacets" );
+        } catch (MissingResourceException e) {
+            //NOOP: we will try again after trimming ";"
+        }
         String fileType = getFileType(dataFile);
         try {
             return BundleUtil.getStringFromDefaultPropertyFile(fileType,"MimeTypeFacets"  );
@@ -377,7 +406,7 @@ public static String getUserFriendlyOriginalType(DataFile dataFile) {
      *  Returns a content type string for a FileObject
      * 
      */
-    private static String determineContentType(File fileObject) {
+    public static String determineContentType(File fileObject) {
         if (fileObject==null){
             return null;
         }
@@ -403,8 +432,47 @@ public static String retestIngestableFileType(File file, String fileType) {
         return newType != null ? newType : fileType;
     }
     
-    public static String determineFileType(File f, String fileName) throws IOException{
-        String fileType = null;
+    public static String determineRemoteFileType(DataFile df, String fileName) {
+        String fileType = determineFileTypeByNameAndExtension(fileName);
+
+        if (!StringUtils.isBlank(fileType) && fileType.startsWith("application/x-stata")) {
+            String driverId = DataAccess
+                    .getStorageDriverFromIdentifier(df.getStorageIdentifier());
+            if (StorageIO.isDataverseAccessible(driverId)) {
+                try {
+                    StorageIO<DataFile> storage = df.getStorageIO();
+                    storage.open(DataAccessOption.READ_ACCESS);
+                    try (InputStream is = storage.getInputStream()) {
+
+                        // Read the first 42 bytes of the file to determine the file type
+                        byte[] buffer = new byte[42];
+                        is.read(buffer, 0, 42);
+                        ByteBuffer bb = ByteBuffer.allocate(42);
+                        bb.put(buffer);
+
+                        // step 1:
+                        // Apply our custom methods to try and recognize data files that can be
+                        // converted to tabular data
+                        logger.fine("Attempting to identify potential tabular data files;");
+                        IngestableDataChecker tabChk = new IngestableDataChecker(new String[] { "DTA" });
+                        fileType = tabChk.detectTabularDataFormat(bb);
+                    } catch (IOException ex) {
+                        logger.warning("Unable to getInputStream for storageIdentifier: " + df.getStorageIdentifier());
+                    }
+                } catch (IOException ex) {
+                    logger.warning("Unable to open storageIO for storageIdentifier: " + df.getStorageIdentifier());
+                }
+            }
+        }
+        return fileType;
+
+    }
+
+    public static String determineFileType(File f, String fileName) throws IOException {
+        String fileType = lookupFileTypeByFileName(fileName);
+        if (fileType != null) {
+            return fileType;
+        }
         String fileExtension = getFileExtension(fileName);
         
         
@@ -436,6 +504,11 @@ public static String determineFileType(File f, String fileName) throws IOExcepti
                 fileType = "application/fits";
             }
         }
+
+        // step 3a: Check if NetCDF or HDF5
+        if (fileType == null) {
+            fileType = checkNetcdfOrHdf5(f);
+        }
        
         // step 3: check the mime type of this file with Jhove
         if (fileType == null){
@@ -449,8 +522,8 @@ public static String determineFileType(File f, String fileName) throws IOExcepti
         // step 4: 
         // Additional processing; if we haven't gotten much useful information 
         // back from Jhove, we'll try and make an educated guess based on 
-        // the file extension:
-        
+        // the file name and extension:
+
         if ( fileExtension != null) {
             logger.fine("fileExtension="+fileExtension);
 
@@ -458,13 +531,19 @@ public static String determineFileType(File f, String fileName) throws IOExcepti
                 if (fileType != null && fileType.startsWith("text/plain") && STATISTICAL_FILE_EXTENSION.containsKey(fileExtension)) {
                     fileType = STATISTICAL_FILE_EXTENSION.get(fileExtension);
                 } else {
-                    fileType = determineFileTypeByExtension(fileName);
+                    fileType = lookupFileTypeByExtension(fileName);
                 }
-                
+
                 logger.fine("mime type recognized by extension: "+fileType);
             }
         } else {
+            //ToDo - if the extension is null, how can this call do anything
             logger.fine("fileExtension is null");
+            final String fileTypeByExtension = lookupFileTypeByExtensionFromPropertiesFile(fileName);
+            if(!StringUtil.isEmpty(fileTypeByExtension)) {
+                logger.fine(String.format("mime type: %s recognized by extension: %s", fileTypeByExtension, fileName));
+                fileType = fileTypeByExtension;
+            }
         }
         
         // step 5: 
@@ -474,64 +553,81 @@ public static String determineFileType(File f, String fileName) throws IOExcepti
 
         if ("application/x-gzip".equals(fileType)) {
             logger.fine("we'll run additional checks on this gzipped file.");
-            // We want to be able to support gzipped FITS files, same way as
-            // if they were just regular FITS files:
-            FileInputStream gzippedIn = new FileInputStream(f);
-            // (new FileInputStream() can throw a "filen not found" exception;
-            // however, if we've made it this far, it really means that the 
-            // file does exist and can be opened)
-            InputStream uncompressedIn = null; 
-            try {
-                uncompressedIn = new GZIPInputStream(gzippedIn);
+            try (FileInputStream gzippedIn = new FileInputStream(f);
+                     InputStream uncompressedIn = new GZIPInputStream(gzippedIn)) {
                 if (isFITSFile(uncompressedIn)) {
                     fileType = "application/fits-gzipped";
                 }
             } catch (IOException ioex) {
-                if (uncompressedIn != null) {
-                    try {uncompressedIn.close();} catch (IOException e) {}
-                }
+                logger.warning("IOException while processing gzipped FITS file: " + ioex.getMessage());
             }
-        } 
+        }
         if ("application/zip".equals(fileType)) {
             
             // Is this a zipped Shapefile?
             // Check for shapefile extensions as described here: http://en.wikipedia.org/wiki/Shapefile
             //logger.info("Checking for shapefile");
 
-            ShapefileHandler shp_handler = new ShapefileHandler(new FileInputStream(f));
+            ShapefileHandler shp_handler = new ShapefileHandler(f);
              if (shp_handler.containsShapefile()){
               //  logger.info("------- shapefile FOUND ----------");
                  fileType = ShapefileHandler.SHAPEFILE_FILE_TYPE; //"application/zipped-shapefile";
              }
+             try {
+                 Optional<BagItFileHandler> bagItFileHandler = CDI.current().select(BagItFileHandlerFactory.class).get().getBagItFileHandler();
+                 if (bagItFileHandler.isPresent() && bagItFileHandler.get().isBagItPackage(fileName, f)) {
+                     fileType = BagItFileHandler.FILE_TYPE;
+                 }
+             } catch (Exception e) {
+                 logger.warning("Error checking for BagIt package: " + e.getMessage());
+             }
         } 
         
+        if(fileType==null) {
+            fileType = MIME_TYPE_UNDETERMINED_DEFAULT;
+        }
         logger.fine("returning fileType "+fileType);
         return fileType;
     }
 
-    public static String determineFileTypeByExtension(String fileName) {
-        String mimetypesFileTypeMapResult = MIME_TYPE_MAP.getContentType(fileName);
+    public static String determineFileTypeByNameAndExtension(final String fileName) {
+        final String fileType = lookupFileTypeByFileName(fileName);
+        if (fileType != null) {
+            return fileType;
+        }
+        return lookupFileTypeByExtension(fileName);
+    }
+
+    private static String lookupFileTypeByExtension(final String fileName) {
+        final String mimetypesFileTypeMapResult = MIME_TYPE_MAP.getContentType(fileName);
         logger.fine("MimetypesFileTypeMap type by extension, for " + fileName + ": " + mimetypesFileTypeMapResult);
-        if (mimetypesFileTypeMapResult != null) {
-            if ("application/octet-stream".equals(mimetypesFileTypeMapResult)) {
-                return lookupFileTypeFromPropertiesFile(fileName);
-            } else {
-                return mimetypesFileTypeMapResult;
-            }
-        } else {
+        if (mimetypesFileTypeMapResult == null) {
             return null;
         }
+        if ("application/octet-stream".equals(mimetypesFileTypeMapResult)) {
+            return lookupFileTypeByExtensionFromPropertiesFile(fileName);
+        }
+        return mimetypesFileTypeMapResult;
+    }
+
+    private static String lookupFileTypeByFileName(final String fileName) {
+        return lookupFileTypeFromPropertiesFile(fileName, false);
     }
 
-    public static String lookupFileTypeFromPropertiesFile(String fileName) {
-        String fileExtension = FilenameUtils.getExtension(fileName);
-        String propertyFileName = "MimeTypeDetectionByFileExtension";
-        String propertyFileNameOnDisk = propertyFileName + ".properties";
+    private static String lookupFileTypeByExtensionFromPropertiesFile(final String fileName) {
+        final String fileKey = FilenameUtils.getExtension(fileName);
+        return lookupFileTypeFromPropertiesFile(fileKey, true);
+    }
+
+    private static String lookupFileTypeFromPropertiesFile(final String fileKey, boolean byExtension) {
+        final String propertyFileName = byExtension ? "MimeTypeDetectionByFileExtension" : "MimeTypeDetectionByFileName";
+        final String propertyFileNameOnDisk =  propertyFileName + ".properties";
         try {
-            logger.fine("checking " + propertyFileNameOnDisk + " for file extension " + fileExtension);
-            return BundleUtil.getStringFromPropertyFile(fileExtension, propertyFileName);
-        } catch (MissingResourceException ex) {
-            logger.info(fileExtension + " is a file extension Dataverse doesn't know about. Consider adding it to the " + propertyFileNameOnDisk + " file.");
+            logger.fine("checking " + propertyFileNameOnDisk + " for file key " + fileKey);
+            return BundleUtil.getStringFromPropertyFile(fileKey, propertyFileName);
+        } catch (final MissingResourceException ex) {
+            //Only use info level if it's for an extension
+            logger.log(byExtension ? Level.INFO : Level.FINE, fileKey + " is a filename/extension Dataverse doesn't know about. Consider adding it to the " + propertyFileNameOnDisk + " file.");
             return null;
         }
     }
@@ -545,12 +641,11 @@ public static String lookupFileTypeFromPropertiesFile(String fileName) {
      * -- L.A. 4.0 alpha
     */
     private static boolean isFITSFile(File file) {
-        BufferedInputStream ins = null;
 
-        try {
-            ins = new BufferedInputStream(new FileInputStream(file));
+        try (BufferedInputStream ins = new BufferedInputStream(new FileInputStream(file))) {
             return isFITSFile(ins);
         } catch (IOException ex) {
+            logger.fine("IOException: "+ ex.getMessage());
         } 
         
         return false;
@@ -591,12 +686,11 @@ private static boolean isFITSFile(InputStream ins) {
     private static boolean isGraphMLFile(File file) {
         boolean isGraphML = false;
         logger.fine("begin isGraphMLFile()");
-        try{
-            FileReader fileReader = new FileReader(file);
-            javax.xml.stream.XMLInputFactory xmlif = javax.xml.stream.XMLInputFactory.newInstance();
-            xmlif.setProperty("javax.xml.stream.isCoalescing", java.lang.Boolean.TRUE);
+        XMLStreamReader xmlr = null;
+        try(FileReader fileReader = new FileReader(file)) {
+            XMLInputFactory xmlif = XmlUtil.getSecureXMLInputFactory();
 
-            XMLStreamReader xmlr = xmlif.createXMLStreamReader(fileReader);
+            xmlr = xmlif.createXMLStreamReader(fileReader);
             for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
                 if (event == XMLStreamConstants.START_ELEMENT) {
                     if (xmlr.getLocalName().equals("graphml")) {
@@ -615,11 +709,56 @@ private static boolean isGraphMLFile(File file) {
             isGraphML = false;
         } catch(IOException e) {
             throw new EJBException(e);
+        } finally {
+            if (xmlr != null) {
+                try {
+                    xmlr.close();
+                } catch (XMLStreamException e) {
+                    logger.warning("XMLStreamException closing XMLStreamReader in GraphML type checker");
+                }
+            }
         }
         logger.fine("end isGraphML()");
         return isGraphML;
     }
 
+    public static String checkNetcdfOrHdf5(File file) {
+        try ( NetcdfFile netcdfFile = NetcdfFiles.open(file.getAbsolutePath())) {
+            if (netcdfFile == null) {
+                // Can't open as a NetCDF or HDF5 file.
+                return null;
+            }
+            String type = netcdfFile.getFileTypeId();
+            if (type == null) {
+                return null;
+            }
+            switch (type) {
+                case "NetCDF":
+                    return "application/netcdf";
+                case "NetCDF-4":
+                    return "application/netcdf";
+                case "HDF5":
+                    return "application/x-hdf5";
+                default:
+                    break;
+            }
+        } catch (IOException ex) {
+            /**
+             * When an HDF4 file is passed, it won't be detected. Instead, we've
+             * seen exceptions like this:
+             *
+             * ucar.nc2.internal.iosp.hdf4.H4header makeDimension WARNING:
+             * **dimension length=0 for TagVGroup= *refno=124 tag= VG (1965)
+             * Vgroup length=28 class= Dim0.0 name= ixx using data 123
+             *
+             * java.lang.IllegalArgumentException: Dimension length =0 must be >
+             * 0
+             */
+            return null;
+        }
+        return null;
+    }
+
     // from MD5Checksum.java
     public static String calculateChecksum(String datafile, ChecksumType checksumType) {
 
@@ -677,7 +816,7 @@ public static String calculateChecksum(byte[] dataBytes, ChecksumType checksumTy
         
     }
     
-    private static String checksumDigestToString(byte[] digestBytes) {
+    public static String checksumDigestToString(byte[] digestBytes) {
         StringBuilder sb = new StringBuilder("");
         for (int i = 0; i < digestBytes.length; i++) {
             sb.append(Integer.toString((digestBytes[i] & 0xff) + 0x100, 16).substring(1));
@@ -686,423 +825,74 @@ private static String checksumDigestToString(byte[] digestBytes) {
     }
 
     public static String generateOriginalExtension(String fileType) {
-
         if (fileType.equalsIgnoreCase("application/x-spss-sav")) {
             return ".sav";
         } else if (fileType.equalsIgnoreCase("application/x-spss-por")) {
-            return ".por";
-        } else if (fileType.equalsIgnoreCase("application/x-stata")) {
+            return ".por";    
+        // in addition to "application/x-stata" we want to support 
+        // "application/x-stata-13" ... etc.:
+        } else if (fileType.toLowerCase().startsWith("application/x-stata")) {
             return ".dta";
-        } else if (fileType.equalsIgnoreCase( "application/x-rlang-transport")) {
+        } else if (fileType.equalsIgnoreCase("application/x-dvn-csvspss-zip")) {
+            return ".zip";
+        } else if (fileType.equalsIgnoreCase("application/x-dvn-tabddi-zip")) {
+            return ".zip";
+        } else if (fileType.equalsIgnoreCase("application/x-rlang-transport")) {
             return ".RData";
-        } else if (fileType.equalsIgnoreCase("text/csv")) {
+        } else if (fileType.equalsIgnoreCase("text/csv") || fileType.equalsIgnoreCase("text/comma-separated-values")) {
             return ".csv";
-        } else if (fileType.equalsIgnoreCase( "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) {
+        } else if (fileType.equalsIgnoreCase("text/tsv") || fileType.equalsIgnoreCase("text/tab-separated-values")) {
+            return ".tsv";
+        } else if (fileType.equalsIgnoreCase("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) {
             return ".xlsx";
         }
-
         return "";
     }
-    
-    public static List<DataFile> createDataFiles(DatasetVersion version, InputStream inputStream, String fileName, String suppliedContentType, SystemConfig systemConfig) throws IOException {
-        List<DataFile> datafiles = new ArrayList<>(); 
-        
-        String warningMessage = null; 
-        
-        // save the file, in the temporary location for now: 
-        Path tempFile = null; 
-        
-        Long fileSizeLimit = systemConfig.getMaxFileUploadSize();
-        
-        if (getFilesTempDirectory() != null) {
-            tempFile = Files.createTempFile(Paths.get(getFilesTempDirectory()), "tmp", "upload");
-            // "temporary" location is the key here; this is why we are not using 
-            // the DataStore framework for this - the assumption is that 
-            // temp files will always be stored on the local filesystem. 
-            //          -- L.A. Jul. 2014
-            logger.fine("Will attempt to save the file as: " + tempFile.toString());
-            Files.copy(inputStream, tempFile, StandardCopyOption.REPLACE_EXISTING);
-            
-            // A file size check, before we do anything else:
-            // (note that "no size limit set" = "unlimited")
-            // (also note, that if this is a zip file, we'll be checking 
-            // the size limit for each of the individual unpacked files)
-            Long fileSize = tempFile.toFile().length();
-            if (fileSizeLimit != null && fileSize > fileSizeLimit) {
-                try {tempFile.toFile().delete();} catch (Exception ex) {}
-                throw new IOException (MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.file_exceeds_limit"), bytesToHumanReadable(fileSize), bytesToHumanReadable(fileSizeLimit)));  
-            }
-            
-        } else {
-            throw new IOException ("Temp directory is not configured.");
-        }
-        logger.fine("mime type supplied: "+suppliedContentType);
-        // Let's try our own utilities (Jhove, etc.) to determine the file type 
-        // of the uploaded file. (We may already have a mime type supplied for this
-        // file - maybe the type that the browser recognized on upload; or, if 
-        // it's a harvest, maybe the remote server has already given us the type
-        // for this file... with our own type utility we may or may not do better 
-        // than the type supplied:
-        //  -- L.A. 
-        String recognizedType = null;
-        String finalType = null; 
-        try {
-            recognizedType = determineFileType(tempFile.toFile(), fileName);
-            logger.fine("File utility recognized the file as " + recognizedType);
-            if (recognizedType != null && !recognizedType.equals("")) {
-                // is it any better than the type that was supplied to us,
-                // if any?
-                // This is not as trivial a task as one might expect... 
-                // We may need a list of "good" mime types, that should always
-                // be chosen over other choices available. Maybe it should 
-                // even be a weighed list... as in, "application/foo" should 
-                // be chosen over "application/foo-with-bells-and-whistles".
-                
-                // For now the logic will be as follows: 
-                //
-                // 1. If the contentType supplied (by the browser, most likely) 
-                // is some form of "unknown", we always discard it in favor of 
-                // whatever our own utilities have determined; 
-                // 2. We should NEVER trust the browser when it comes to the 
-                // following "ingestable" types: Stata, SPSS, R;
-                // 2a. We are willing to TRUST the browser when it comes to
-                //  the CSV and XSLX ingestable types.
-                // 3. We should ALWAYS trust our utilities when it comes to 
-                // ingestable types. 
-                
-                if (suppliedContentType == null
-                        || suppliedContentType.equals("")
-                        || suppliedContentType.equalsIgnoreCase(MIME_TYPE_UNDETERMINED_DEFAULT)
-                        || suppliedContentType.equalsIgnoreCase(MIME_TYPE_UNDETERMINED_BINARY)
-                        || (canIngestAsTabular(suppliedContentType)
-                            && !suppliedContentType.equalsIgnoreCase(MIME_TYPE_CSV)
-                            && !suppliedContentType.equalsIgnoreCase(MIME_TYPE_CSV_ALT)
-                            && !suppliedContentType.equalsIgnoreCase(MIME_TYPE_XLSX))
-                        || canIngestAsTabular(recognizedType)
-                        || recognizedType.equals("application/fits-gzipped")
-                        || recognizedType.equalsIgnoreCase(ShapefileHandler.SHAPEFILE_FILE_TYPE)
-                        || recognizedType.equals(MIME_TYPE_ZIP)) {
-                    finalType = recognizedType;
-                }
-            }
-            
-        } catch (Exception ex) {
-            logger.warning("Failed to run the file utility mime type check on file " + fileName);
-        }
-        
-        if (finalType == null) {
-            finalType = (suppliedContentType == null || suppliedContentType.equals("")) 
-                ? MIME_TYPE_UNDETERMINED_DEFAULT
-                : suppliedContentType;
-        }
-                
-        // A few special cases: 
-        
-        // if this is a gzipped FITS file, we'll uncompress it, and ingest it as
-        // a regular FITS file:
-        
-        if (finalType.equals("application/fits-gzipped")) {
-
-            InputStream uncompressedIn = null;
-            String finalFileName = fileName;
-            // if the file name had the ".gz" extension, remove it, 
-            // since we are going to uncompress it:
-            if (fileName != null && fileName.matches(".*\\.gz$")) {
-                finalFileName = fileName.replaceAll("\\.gz$", "");
-            }
-            
-            DataFile datafile = null; 
-            try {                
-                uncompressedIn = new GZIPInputStream(new FileInputStream(tempFile.toFile()));
-                File unZippedTempFile = saveInputStreamInTempFile(uncompressedIn, fileSizeLimit);
-                datafile = createSingleDataFile(version, unZippedTempFile, finalFileName, MIME_TYPE_UNDETERMINED_DEFAULT, systemConfig.getFileFixityChecksumAlgorithm());
-            } catch (IOException | FileExceedsMaxSizeException ioex) {
-                datafile = null;
-            } finally {
-                if (uncompressedIn != null) {
-                    try {uncompressedIn.close();} catch (IOException e) {}
-                }
-            }
-            
-            // If we were able to produce an uncompressed file, we'll use it 
-            // to create and return a final DataFile; if not, we're not going
-            // to do anything - and then a new DataFile will be created further 
-            // down, from the original, uncompressed file.
-            if (datafile != null) {
-                // remove the compressed temp file: 
-                try {
-                    tempFile.toFile().delete();
-                } catch (SecurityException ex) {
-                    // (this is very non-fatal)
-                    logger.warning("Failed to delete temporary file "+tempFile.toString());
-                }
-                
-                datafiles.add(datafile);
-                return datafiles;
-            }
-                
-        // If it's a ZIP file, we are going to unpack it and create multiple 
-        // DataFile objects from its contents:
-          } else if (finalType.equals("application/zip")) {   
-            
-            ZipInputStream unZippedIn = null; 
-            ZipEntry zipEntry = null; 
-            
-            int fileNumberLimit = systemConfig.getZipUploadFilesLimit();
-            
-            try {
-                Charset charset = null;
-                /*
-                TODO: (?)
-                We may want to investigate somehow letting the user specify 
-                the charset for the filenames in the zip file...
-                - otherwise, ZipInputStream bails out if it encounteres a file 
-                name that's not valid in the current charest (i.e., UTF-8, in 
-                our case). It would be a bit trickier than what we're doing for 
-                SPSS tabular ingests - with the lang. encoding pulldown menu - 
-                because this encoding needs to be specified *before* we upload and
-                attempt to unzip the file. 
-                        -- L.A. 4.0 beta12
-                logger.info("default charset is "+Charset.defaultCharset().name());
-                if (Charset.isSupported("US-ASCII")) {
-                    logger.info("charset US-ASCII is supported.");
-                    charset = Charset.forName("US-ASCII");
-                    if (charset != null) {
-                        logger.info("was able to obtain charset for US-ASCII");
-                    }
-                    
-                }
-                */
-                
-                if (charset != null) {
-                    unZippedIn = new ZipInputStream(new FileInputStream(tempFile.toFile()), charset);
-                } else {
-                    unZippedIn = new ZipInputStream(new FileInputStream(tempFile.toFile()));
-                } 
-
-                while (true) { 
-                    try {
-                        zipEntry = unZippedIn.getNextEntry();
-                    } catch (IllegalArgumentException iaex) {
-                        // Note: 
-                        // ZipInputStream documentation doesn't even mention that 
-                        // getNextEntry() throws an IllegalArgumentException!
-                        // but that's what happens if the file name of the next
-                        // entry is not valid in the current CharSet. 
-                        //      -- L.A.
-                        warningMessage = "Failed to unpack Zip file. (Unknown Character Set used in a file name?) Saving the file as is.";
-                        logger.warning(warningMessage);
-                        throw new IOException();
-                    } 
-                    
-                    if (zipEntry == null) {
-                        break;
-                    }
-                    // Note that some zip entries may be directories - we 
-                    // simply skip them:
-                    
-                    if (!zipEntry.isDirectory()) {
-                        if (datafiles.size() > fileNumberLimit) {
-                            logger.warning("Zip upload - too many files.");
-                            warningMessage = "The number of files in the zip archive is over the limit (" + fileNumberLimit + 
-                                "); please upload a zip archive with fewer files, if you want them to be ingested " +
-                                "as individual DataFiles.";
-                            throw new IOException();
-                        }
 
-                        String fileEntryName = zipEntry.getName();
-                        logger.fine("ZipEntry, file: "+fileEntryName);
-
-                        if (fileEntryName != null && !fileEntryName.equals("")) {
-
-                            String shortName = fileEntryName.replaceFirst("^.*[\\/]", "");
-
-                            // Check if it's a "fake" file - a zip archive entry 
-                            // created for a MacOS X filesystem element: (these 
-                            // start with "._")
-                            if (!shortName.startsWith("._") && !shortName.startsWith(".DS_Store") && !"".equals(shortName)) {
-                                // OK, this seems like an OK file entry - we'll try 
-                                // to read it and create a DataFile with it:
-
-                                File unZippedTempFile = saveInputStreamInTempFile(unZippedIn, fileSizeLimit);
-                                DataFile datafile = createSingleDataFile(version, unZippedTempFile, shortName, MIME_TYPE_UNDETERMINED_DEFAULT, systemConfig.getFileFixityChecksumAlgorithm(), false);
-
-                                if (!fileEntryName.equals(shortName)) {
-                                    // If the filename looks like a hierarchical folder name (i.e., contains slashes and backslashes),
-                                    // we'll extract the directory name; then subject it to some "aggressive sanitizing" - strip all 
-                                    // the leading, trailing and duplicate slashes; then replace all the characters that 
-                                    // don't pass our validation rules. 
-                                    String directoryName = fileEntryName.replaceFirst("[\\\\/][\\\\/]*[^\\\\/]*$", "");
-                                    directoryName = StringUtil.sanitizeFileDirectory(directoryName, true);
-                                    //if (!"".equals(directoryName)) {
-                                    if (!StringUtil.isEmpty(directoryName)) {
-                                        logger.fine("setting the directory label to " + directoryName);
-                                        datafile.getFileMetadata().setDirectoryLabel(directoryName);
-                                    }
-                                }
-                                
-                                if (datafile != null) {
-                                    // We have created this datafile with the mime type "unknown";
-                                    // Now that we have it saved in a temporary location, 
-                                    // let's try and determine its real type:
-                                    
-                                    String tempFileName = getFilesTempDirectory() + "/" + datafile.getStorageIdentifier();
-                                    
-                                    try {
-                                        recognizedType = determineFileType(new File(tempFileName), shortName);
-                                        logger.fine("File utility recognized unzipped file as " + recognizedType);
-                                        if (recognizedType != null && !recognizedType.equals("")) {
-                                             datafile.setContentType(recognizedType);
-                                        }
-                                    } catch (Exception ex) {
-                                        logger.warning("Failed to run the file utility mime type check on file " + fileName);
-                                    }
-                                    
-                                    datafiles.add(datafile);
-                                }
-                            }
-                        }
-                    } 
-                    unZippedIn.closeEntry(); 
-                    
-                }
-                
-            } catch (IOException ioex) {
-                // just clear the datafiles list and let 
-                // ingest default to creating a single DataFile out
-                // of the unzipped file. 
-                logger.warning("Unzipping failed; rolling back to saving the file as is.");
-                if (warningMessage == null) {
-                    warningMessage = "Failed to unzip the file. Saving the file as is.";
-                }
-                
-                datafiles.clear();
-            } catch (FileExceedsMaxSizeException femsx) {
-                logger.warning("One of the unzipped files exceeds the size limit; resorting to saving the file as is. " + femsx.getMessage());
-                warningMessage = femsx.getMessage() + "; saving the zip file as is, unzipped.";
-                datafiles.clear();
-            } finally {
-                if (unZippedIn != null) {
-                    try {unZippedIn.close();} catch (Exception zEx) {}
-                }
-            }
-            if (datafiles.size() > 0) {
-                // link the data files to the dataset/version: 
-                // (except we no longer want to do this! -- 4.6)
-                /*Iterator<DataFile> itf = datafiles.iterator();
-                while (itf.hasNext()) {
-                    DataFile datafile = itf.next();
-                    datafile.setOwner(version.getDataset());
-                    if (version.getFileMetadatas() == null) {
-                        version.setFileMetadatas(new ArrayList());
-                    }
-                    version.getFileMetadatas().add(datafile.getFileMetadata());
-                    datafile.getFileMetadata().setDatasetVersion(version);
-                    
-                    version.getDataset().getFiles().add(datafile);
-                } */
-                // remove the uploaded zip file: 
-                try {
-                    Files.delete(tempFile);
-                } catch (IOException ioex) {
-                    // do nothing - it's just a temp file.
-                    logger.warning("Could not remove temp file "+tempFile.getFileName().toString());
-                }
-                // and return:
-                return datafiles;
-            }
-            
-        } else if (finalType.equalsIgnoreCase(ShapefileHandler.SHAPEFILE_FILE_TYPE)) {
-            // Shape files may have to be split into multiple files, 
-            // one zip archive per each complete set of shape files:
-                       
-            //File rezipFolder = new File(this.getFilesTempDirectory());
-            File rezipFolder = getShapefileUnzipTempDirectory();
-            
-            IngestServiceShapefileHelper shpIngestHelper;
-            shpIngestHelper = new IngestServiceShapefileHelper(tempFile.toFile(), rezipFolder);
-
-            boolean didProcessWork = shpIngestHelper.processFile();
-            if (!(didProcessWork)){            
-                logger.severe("Processing of zipped shapefile failed.");
-                return null;
-            }
-            
-            try {
-                for (File finalFile : shpIngestHelper.getFinalRezippedFiles()) {
-                    FileInputStream finalFileInputStream = new FileInputStream(finalFile);
-                    finalType = determineContentType(finalFile);
-                    if (finalType == null) {
-                        logger.warning("Content type is null; but should default to 'MIME_TYPE_UNDETERMINED_DEFAULT'");
-                        continue;
-                    }
-
-                    File unZippedShapeTempFile = saveInputStreamInTempFile(finalFileInputStream, fileSizeLimit);
-                    DataFile new_datafile = createSingleDataFile(version, unZippedShapeTempFile, finalFile.getName(), finalType, systemConfig.getFileFixityChecksumAlgorithm());
-                    if (new_datafile != null) {
-                        datafiles.add(new_datafile);
-                    } else {
-                        logger.severe("Could not add part of rezipped shapefile. new_datafile was null: " + finalFile.getName());
-                    }
-                    finalFileInputStream.close();
+	public static boolean useRecognizedType(String suppliedContentType, String recognizedType) {
+		// is it any better than the type that was supplied to us,
+		// if any?
+		// This is not as trivial a task as one might expect...
+		// We may need a list of "good" mime types, that should always
+		// be chosen over other choices available. Maybe it should
+		// even be a weighed list... as in, "application/foo" should
+		// be chosen over "application/foo-with-bells-and-whistles".
+
+		// For now the logic will be as follows:
+		//
+		// 1. If the contentType supplied (by the browser, most likely)
+		// is some form of "unknown", we always discard it in favor of
+		// whatever our own utilities have determined;
+		// 2. We should NEVER trust the browser when it comes to the
+		// following "ingestable" types: Stata, SPSS, R;
+		// 2a. We are willing to TRUST the browser when it comes to
+		// the CSV and XSLX ingestable types.
+		// 3. We should ALWAYS trust our utilities when it comes to
+		// ingestable types.
+		if (suppliedContentType == null || suppliedContentType.equals("")
+				|| suppliedContentType.equalsIgnoreCase(MIME_TYPE_UNDETERMINED_DEFAULT)
+				|| suppliedContentType.equalsIgnoreCase(MIME_TYPE_UNDETERMINED_BINARY)
+				|| (canIngestAsTabular(suppliedContentType) 
+						&& !suppliedContentType.equalsIgnoreCase(MIME_TYPE_CSV)
+						&& !suppliedContentType.equalsIgnoreCase(MIME_TYPE_CSV_ALT)
+						&& !suppliedContentType.equalsIgnoreCase(MIME_TYPE_XLSX))
+				|| canIngestAsTabular(recognizedType) || recognizedType.equals("application/fits-gzipped")
+				|| recognizedType.equalsIgnoreCase(ShapefileHandler.SHAPEFILE_FILE_TYPE)
+				|| recognizedType.equalsIgnoreCase(BagItFileHandler.FILE_TYPE)
+				|| recognizedType.equals(MIME_TYPE_ZIP)
+                || recognizedType.equals(MIME_TYPE_RO_CRATE)) {
+			return true;
+		}
+		return false;
+	}
 
-                }
-            } catch (FileExceedsMaxSizeException femsx) {
-                logger.severe("One of the unzipped shape files exceeded the size limit; giving up. " + femsx.getMessage());
-                datafiles.clear();
-            }
-            
-            // Delete the temp directory used for unzipping
-            // The try-catch is due to error encountered in using NFS for stocking file,
-            // cf. https://github.com/IQSS/dataverse/issues/5909
-            try {
-            	FileUtils.deleteDirectory(rezipFolder);
-            } catch (IOException ioex) {
-                // do nothing - it's a tempo folder.
-                logger.warning("Could not remove temp folder, error message : " + ioex.getMessage());
-            }
-            
-            if (datafiles.size() > 0) {
-                // remove the uploaded zip file:
-                try {
-                    Files.delete(tempFile);
-                } catch (IOException ioex) {
-                    // do nothing - it's just a temp file.
-                    logger.warning("Could not remove temp file " + tempFile.getFileName().toString());
-                } catch (SecurityException se) {
-                    logger.warning("Unable to delete: " + tempFile.toString() + "due to Security Exception: "
-                            + se.getMessage());
-                }
-                return datafiles;
-            }else{
-                logger.severe("No files added from directory of rezipped shapefiles");
-            }
-            return null;
-           
-        } 
-        // Finally, if none of the special cases above were applicable (or 
-        // if we were unable to unpack an uploaded file, etc.), we'll just 
-        // create and return a single DataFile:
-        
-        DataFile datafile = createSingleDataFile(version, tempFile.toFile(), fileName, finalType, systemConfig.getFileFixityChecksumAlgorithm());
-        
-        if (datafile != null && tempFile.toFile() != null) {
-       
-            if (warningMessage != null) {
-                createIngestFailureReport(datafile, warningMessage);
-                datafile.SetIngestProblem();
-            }
-            datafiles.add(datafile);
-            
-            return datafiles;
+	public static File saveInputStreamInTempFile(InputStream inputStream, Long fileSizeLimit)
+            throws IOException, FileExceedsMaxSizeException, FileExceedsStorageQuotaException {
+            return saveInputStreamInTempFile(inputStream, fileSizeLimit, null);
         }
         
-        return null;
-    }   // end createDataFiles
-    
-
-    private static File saveInputStreamInTempFile(InputStream inputStream, Long fileSizeLimit)
-            throws IOException, FileExceedsMaxSizeException {
+        public static File saveInputStreamInTempFile(InputStream inputStream, Long fileSizeLimit, Long storageQuotaLimit)
+            throws IOException, FileExceedsMaxSizeException, FileExceedsStorageQuotaException {
         Path tempFile = Files.createTempFile(Paths.get(getFilesTempDirectory()), "tmp", "upload");
         
         if (inputStream != null && tempFile != null) {
@@ -1113,7 +903,12 @@ private static File saveInputStreamInTempFile(InputStream inputStream, Long file
             Long fileSize = tempFile.toFile().length();
             if (fileSizeLimit != null && fileSize > fileSizeLimit) {
                 try {tempFile.toFile().delete();} catch (Exception ex) {}
-                throw new FileExceedsMaxSizeException (MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.file_exceeds_limit"), bytesToHumanReadable(fileSize), bytesToHumanReadable(fileSizeLimit)));  
+                throw new FileExceedsMaxSizeException(MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.file_exceeds_limit"), bytesToHumanReadable(fileSize), bytesToHumanReadable(fileSizeLimit)));  
+            }
+            
+            if (storageQuotaLimit != null && fileSize > storageQuotaLimit) {
+                try {tempFile.toFile().delete();} catch (Exception ex) {}
+                throw new FileExceedsStorageQuotaException(MessageFormat.format(BundleUtil.getStringFromBundle("file.addreplace.error.quota_exceeded"), bytesToHumanReadable(fileSize), bytesToHumanReadable(storageQuotaLimit)));  
             }
             
             return tempFile.toFile();
@@ -1130,14 +925,18 @@ private static File saveInputStreamInTempFile(InputStream inputStream, Long file
      * individual files, etc., and once the file name and mime type have already 
      * been figured out. 
     */
-    
-    private static DataFile createSingleDataFile(DatasetVersion version, File tempFile, String fileName, String contentType, DataFile.ChecksumType checksumType) {
-        return createSingleDataFile(version, tempFile, fileName, contentType, checksumType, false);
+
+    public static DataFile createSingleDataFile(DatasetVersion version, File tempFile, String fileName, String contentType, DataFile.ChecksumType checksumType) {
+        return createSingleDataFile(version, tempFile, null, fileName, contentType, checksumType, null, false);
+    }
+
+    public static DataFile createSingleDataFile(DatasetVersion version, File tempFile, String storageIdentifier,  String fileName, String contentType, DataFile.ChecksumType checksumType, String checksum) {
+        return createSingleDataFile(version, tempFile, storageIdentifier, fileName, contentType, checksumType, checksum, false);
     }
     
-    private static DataFile createSingleDataFile(DatasetVersion version, File tempFile, String fileName, String contentType, DataFile.ChecksumType checksumType, boolean addToDataset) {
+    public static DataFile createSingleDataFile(DatasetVersion version, File tempFile, String storageIdentifier, String fileName, String contentType, DataFile.ChecksumType checksumType, String checksum, boolean addToDataset) {
 
-        if (tempFile == null) {
+        if ((tempFile == null) && (storageIdentifier == null)) {
             return null;
         }
 
@@ -1152,7 +951,6 @@ private static DataFile createSingleDataFile(DatasetVersion version, File tempFi
         datafile.setPermissionModificationTime(new Timestamp(new Date().getTime()));
         FileMetadata fmd = new FileMetadata();
 
-        // TODO: add directoryLabel?
         fmd.setLabel(fileName);
 
         if (addToDataset) {
@@ -1168,20 +966,27 @@ private static DataFile createSingleDataFile(DatasetVersion version, File tempFi
             fmd.setDatasetVersion(version);
             version.getDataset().getFiles().add(datafile);
         }
-
-        generateStorageIdentifier(datafile);
-        if (!tempFile.renameTo(new File(getFilesTempDirectory() + "/" + datafile.getStorageIdentifier()))) {
-            return null;
+        if (storageIdentifier == null) {
+            generateStorageIdentifier(datafile);
+            if (!tempFile.renameTo(new File(getFilesTempDirectory() + "/" + datafile.getStorageIdentifier()))) {
+                return null;
+            }
+        } else {
+            datafile.setStorageIdentifier(storageIdentifier);
         }
 
-        try {
-            // We persist "SHA1" rather than "SHA-1".
-            datafile.setChecksumType(checksumType);
-            datafile.setChecksumValue(calculateChecksum(getFilesTempDirectory() + "/" + datafile.getStorageIdentifier(), datafile.getChecksumType()));
-        } catch (Exception cksumEx) {
-            logger.warning("Could not calculate " + checksumType + " signature for the new file " + fileName);
+        if ((checksum !=null)&&(!checksum.isEmpty())) {
+        	datafile.setChecksumType(checksumType);
+            datafile.setChecksumValue(checksum);
+        } else {
+        	try {
+        		// We persist "SHA1" rather than "SHA-1".
+        		datafile.setChecksumType(checksumType);
+        		datafile.setChecksumValue(calculateChecksum(getFilesTempDirectory() + "/" + datafile.getStorageIdentifier(), datafile.getChecksumType()));
+        	} catch (Exception cksumEx) {
+        		logger.warning("Could not calculate " + checksumType + " signature for the new file " + fileName);
+        	}
         }
-
         return datafile;
     }
     
@@ -1192,7 +997,7 @@ private static DataFile createSingleDataFile(DatasetVersion version, File tempFi
     
         Naming convention: getFilesTempDirectory() + "shp_" + "yyyy-MM-dd-hh-mm-ss-SSS"
     */
-    private static File getShapefileUnzipTempDirectory(){
+    public static File getShapefileUnzipTempDirectory(){
         
         String tempDirectory = getFilesTempDirectory();
         if (tempDirectory == null){
@@ -1246,7 +1051,7 @@ public static boolean canIngestAsTabular(String mimeType) {
             case MIME_TYPE_CSV:
             case MIME_TYPE_CSV_ALT:
             case MIME_TYPE_TSV:
-            case MIME_TYPE_TSV_ALT:
+            //case MIME_TYPE_TSV_ALT:
             case MIME_TYPE_XLSX:
             case MIME_TYPE_SPSS_SAV:
             case MIME_TYPE_SPSS_POR:
@@ -1256,37 +1061,29 @@ public static boolean canIngestAsTabular(String mimeType) {
         }
     }
     
+    /**
+     * Return the location where data should be stored temporarily after uploading (UI or API)
+     * for local processing (ingest, unzip, ...) and transfer to final destination (see storage subsystem).
+     *
+     * This location is checked to be configured, does exist, and is writeable via
+     * {@link ConfigCheckService#checkSystemDirectories()}.
+     *
+     * @return String with a path to the temporary location. Will not be null (former versions did to indicate failure)
+     */
     public static String getFilesTempDirectory() {
-        String filesRootDirectory = System.getProperty("dataverse.files.directory");
-        if (filesRootDirectory == null || filesRootDirectory.equals("")) {
-            filesRootDirectory = "/tmp/files";
-        }
-
-        String filesTempDirectory = filesRootDirectory + "/temp";
-
-        if (!Files.exists(Paths.get(filesTempDirectory))) {
-            /* Note that "createDirectories()" must be used - not 
-             * "createDirectory()", to make sure all the parent 
-             * directories that may not yet exist are created as well. 
-             */
-            try {
-                Files.createDirectories(Paths.get(filesTempDirectory));
-            } catch (IOException ex) {
-                logger.severe("Failed to create filesTempDirectory: " + filesTempDirectory );
-                return null;
-            }
-        }
-
-        return filesTempDirectory;
+        return JvmSettings.FILES_DIRECTORY.lookup() + File.separator + "temp";
     }
     
     public static void generateS3PackageStorageIdentifier(DataFile dataFile) {
-        String bucketName = System.getProperty("dataverse.files.s3-bucket-name");
-        String storageId = S3_IDENTIFIER_PREFIX + "://" + bucketName + ":" + dataFile.getFileMetadata().getLabel();
+    	String driverId = dataFile.getOwner().getEffectiveStorageDriverId();
+		
+        String bucketName = System.getProperty("dataverse.files." + driverId + ".bucket-name");
+        String storageId = driverId + DataAccess.SEPARATOR + bucketName + ":" + dataFile.getFileMetadata().getLabel();
         dataFile.setStorageIdentifier(storageId);
     }
     
     public static void generateStorageIdentifier(DataFile dataFile) {
+    	//Is it true that this is only used for temp files and we could safely prepend "tmp://" to indicate that?
         dataFile.setStorageIdentifier(generateStorageIdentifier());
     }
     
@@ -1356,75 +1153,115 @@ public static String getCiteDataFileFilename(String fileTitle, FileCitationExten
      * elaborate on the text "This file cannot be downloaded publicly."
      */
     public static boolean isDownloadPopupRequired(DatasetVersion datasetVersion) {
-        // Each of these conditions is sufficient reason to have to 
-        // present the user with the popup: 
+        logger.fine("Checking if download popup is required.");
+        Boolean answer = popupDueToStateOrTerms(datasetVersion);
+        if (answer != null) {
+            return answer;
+        }
+        // 3. Guest Book:
+        if (datasetVersion.getDataset() != null && datasetVersion.getDataset().getGuestbook() != null && datasetVersion.getDataset().getGuestbook().isEnabled() && datasetVersion.getDataset().getGuestbook().getDataverse() != null) {
+            logger.fine("Download popup required because of guestbook.");
+            return true;
+        }
+        logger.fine("Download popup is not required.");
+        return false;
+    }
+    
+    public static boolean isRequestAccessPopupRequired(DatasetVersion datasetVersion) {
+        
+        Boolean answer = popupDueToStateOrTerms(datasetVersion);
+        if (answer != null) {
+            return answer;
+        }
+     // 3. Guest Book:
+        if (datasetVersion.getDataset() != null && datasetVersion.getDataset().getGuestbook() != null && datasetVersion.getDataset().getGuestbook().isEnabled() && datasetVersion.getDataset().getGuestbook().getDataverse() != null) {
+            logger.fine("Request access popup required because of guestbook.");
+            return true;
+        }
+        logger.fine("Request access popup is not required.");
+        return false;
+    }
+    
+    /* Code shared by isDownloadPopupRequired and isRequestAccessPopupRequired.
+     * 
+     * Returns Boolean to allow null = no decision. This allows the isDownloadPopupRequired method to then add another check w.r.t. guestbooks before returning its value.
+     * 
+     */
+    private static Boolean popupDueToStateOrTerms(DatasetVersion datasetVersion) {
+
+        // Each of these conditions is sufficient reason to have to
+        // present the user with the popup:
         if (datasetVersion == null) {
-            logger.fine("Download popup required because datasetVersion is null.");
+            logger.fine("Popup not required because datasetVersion is null.");
             return false;
         }
-        //0. if version is draft then Popup "not required"
+        // 0. if version is draft then Popup "not required"
         if (!datasetVersion.isReleased()) {
-            logger.fine("Download popup required because datasetVersion has not been released.");
+            logger.fine("Popup not required because datasetVersion has not been released.");
             return false;
         }
         // 1. License and Terms of Use:
         if (datasetVersion.getTermsOfUseAndAccess() != null) {
-            if (!TermsOfUseAndAccess.License.CC0.equals(datasetVersion.getTermsOfUseAndAccess().getLicense())
-                    && !(datasetVersion.getTermsOfUseAndAccess().getTermsOfUse() == null
-                    || datasetVersion.getTermsOfUseAndAccess().getTermsOfUse().equals(""))) {
-                logger.fine("Download popup required because of license or terms of use.");
+            License license = DatasetUtil.getLicense(datasetVersion);
+            if ((license == null && StringUtils.isNotBlank(datasetVersion.getTermsOfUseAndAccess().getTermsOfUse()))
+                    || (license != null && !license.isDefault())) {
+                logger.fine("Popup required because of license or terms of use.");
                 return true;
             }
 
             // 2. Terms of Access:
             if (!(datasetVersion.getTermsOfUseAndAccess().getTermsOfAccess() == null) && !datasetVersion.getTermsOfUseAndAccess().getTermsOfAccess().equals("")) {
-                logger.fine("Download popup required because of terms of access.");
+                logger.fine("Popup required because of terms of access.");
                 return true;
             }
         }
+        //No decision based on the criteria above
+        return null;
+    }
 
-        // 3. Guest Book:
-        if (datasetVersion.getDataset() != null && datasetVersion.getDataset().getGuestbook() != null && datasetVersion.getDataset().getGuestbook().isEnabled() && datasetVersion.getDataset().getGuestbook().getDataverse() != null) {
-            logger.fine("Download popup required because of guestbook.");
-            return true;
-        }
+    /**
+     * isGuestbookAndTermsPopupRequired
+     * meant to replace both isDownloadPopupRequired() and isRequestAccessDownloadPopupRequired() when the guestbook-terms-popup-fragment.xhtml
+     * replaced file-download-popup-fragment.xhtml and file-request-access-popup-fragment.xhtml
+     * @param datasetVersion
+     * @return boolean
+     */
 
-        logger.fine("Download popup is not required.");
-        return false;
+    public static boolean isGuestbookAndTermsPopupRequired(DatasetVersion datasetVersion) {
+        return isGuestbookPopupRequired(datasetVersion) || isTermsPopupRequired(datasetVersion);
     }
-    
-    public static boolean isRequestAccessPopupRequired(DatasetVersion datasetVersion){
-        // Each of these conditions is sufficient reason to have to 
-        // present the user with the popup: 
+
+    public static boolean isGuestbookPopupRequired(DatasetVersion datasetVersion) {
+
         if (datasetVersion == null) {
-            logger.fine("Download popup required because datasetVersion is null.");
+            logger.fine("GuestbookPopup not required because datasetVersion is null.");
             return false;
         }
         //0. if version is draft then Popup "not required"
         if (!datasetVersion.isReleased()) {
-            logger.fine("Download popup required because datasetVersion has not been released.");
+            logger.fine("GuestbookPopup not required because datasetVersion has not been released.");
             return false;
         }
-        // 1. License and Terms of Use:
-        if (datasetVersion.getTermsOfUseAndAccess() != null) {
-            if (!TermsOfUseAndAccess.License.CC0.equals(datasetVersion.getTermsOfUseAndAccess().getLicense())
-                    && !(datasetVersion.getTermsOfUseAndAccess().getTermsOfUse() == null
-                    || datasetVersion.getTermsOfUseAndAccess().getTermsOfUse().equals(""))) {
-                logger.fine("Download popup required because of license or terms of use.");
-                return true;
-            }
 
-            // 2. Terms of Access:
-            if (!(datasetVersion.getTermsOfUseAndAccess().getTermsOfAccess() == null) && !datasetVersion.getTermsOfUseAndAccess().getTermsOfAccess().equals("")) {
-                logger.fine("Download popup required because of terms of access.");
-                return true;
-            }
+        // 3. Guest Book:
+        if (datasetVersion.getDataset() != null && datasetVersion.getDataset().getGuestbook() != null && datasetVersion.getDataset().getGuestbook().isEnabled() && datasetVersion.getDataset().getGuestbook().getDataverse() != null) {
+            logger.fine("GuestbookPopup required because an enabled guestbook exists.");
+            return true;
         }
 
-        logger.fine("Download popup is not required.");
+        logger.fine("GuestbookPopup is not required.");
         return false;
     }
 
+    public static boolean isTermsPopupRequired(DatasetVersion datasetVersion) {
+        Boolean answer = popupDueToStateOrTerms(datasetVersion);
+        if(answer == null) {
+            logger.fine("TermsPopup is not required.");
+            return false;
+        }
+        return answer;
+    }
+    
     /**
      * Provide download URL if no Terms of Use, no guestbook, and not
      * restricted.
@@ -1438,6 +1275,12 @@ public static boolean isPubliclyDownloadable(FileMetadata fileMetadata) {
             logger.fine(msg);
             return false;
         }
+        if (isActivelyEmbargoed(fileMetadata)) {
+            return false;
+        }
+        if (isRetentionExpired(fileMetadata)) {
+            return false;
+        }
         boolean popupReasons = isDownloadPopupRequired(fileMetadata.getDatasetVersion());
         if (popupReasons == true) {
             /**
@@ -1488,32 +1331,33 @@ public static String getPublicDownloadUrl(String dataverseSiteUrl, String persis
      */
     public static String getFileDownloadUrlPath(String downloadType, Long fileId, boolean gbRecordsWritten, Long fileMetadataId) {
         String fileDownloadUrl = "/api/access/datafile/" + fileId;
-        if (downloadType != null && downloadType.equals("bundle")) {
-            if (fileMetadataId == null) {
-                fileDownloadUrl = "/api/access/datafile/bundle/" + fileId;
-            } else {
-                fileDownloadUrl = "/api/access/datafile/bundle/" + fileId + "?fileMetadataId=" + fileMetadataId;
-            }
-        }
-        if (downloadType != null && downloadType.equals("original")) {
-            fileDownloadUrl = "/api/access/datafile/" + fileId + "?format=original";
-        }
-        if (downloadType != null && downloadType.equals("RData")) {
-            fileDownloadUrl = "/api/access/datafile/" + fileId + "?format=RData";
-        }
-        if (downloadType != null && downloadType.equals("var")) {
-            if (fileMetadataId == null) {
-                fileDownloadUrl = "/api/access/datafile/" + fileId + "/metadata";
-            } else {
-                fileDownloadUrl = "/api/access/datafile/" + fileId + "/metadata?fileMetadataId=" + fileMetadataId;
+        if (downloadType != null) {
+            switch(downloadType) {
+            case "original":
+            case"RData":
+            case "tab":
+            case "GlobusTransfer":
+                    fileDownloadUrl = "/api/access/datafile/" + fileId + "?format=" + downloadType;
+                    break;
+            case "bundle":
+                    if (fileMetadataId == null) {
+                        fileDownloadUrl = "/api/access/datafile/bundle/" + fileId;
+                    } else {
+                        fileDownloadUrl = "/api/access/datafile/bundle/" + fileId + "?fileMetadataId=" + fileMetadataId;
+                    }
+                    break;
+            case "var":
+                    if (fileMetadataId == null) {
+                        fileDownloadUrl = "/api/access/datafile/" + fileId + "/metadata";
+                    } else {
+                        fileDownloadUrl = "/api/access/datafile/" + fileId + "/metadata?fileMetadataId=" + fileMetadataId;
+                    }
+                    break;
+                }
+                
             }
-        }
-        if (downloadType != null && downloadType.equals("tab")) {
-            fileDownloadUrl = "/api/access/datafile/" + fileId + "?format=tab";
-        }
         if (gbRecordsWritten) {
-            if (downloadType != null && ((downloadType.equals("original") || downloadType.equals("RData") || downloadType.equals("tab")) ||
-                    ((downloadType.equals("var") || downloadType.equals("bundle") ) && fileMetadataId != null))) {
+            if (fileDownloadUrl.contains("?")) {
                 fileDownloadUrl += "&gbrecs=true";
             } else {
                 fileDownloadUrl += "?gbrecs=true";
@@ -1549,7 +1393,7 @@ public static boolean isThumbnailSupported (DataFile file) {
             return false;
         }
         
-        if (file.isHarvested() || "".equals(file.getStorageIdentifier())) {
+        if (file.isHarvested() || StringUtil.isEmpty(file.getStorageIdentifier())) {
             return false;
         }
         
@@ -1611,5 +1455,447 @@ public static DatasetThumbnail getThumbnail(DataFile file) {
     public static boolean isPackageFile(DataFile dataFile) {
         return DataFileServiceBean.MIME_TYPE_PACKAGE_FILE.equalsIgnoreCase(dataFile.getContentType());
     }
+    
+    public static S3AccessIO getS3AccessForDirectUpload(Dataset dataset) {
+    	String driverId = dataset.getEffectiveStorageDriverId();
+    	boolean directEnabled = Boolean.getBoolean("dataverse.files." + driverId + ".upload-redirect");
+    	//Should only be requested when it is allowed, but we'll log a warning otherwise
+    	if(!directEnabled) {
+    		logger.warning("Direct upload not supported for files in this dataset: " + dataset.getId());
+    		return null;
+    	}
+    	S3AccessIO<DataFile> s3io = null;
+    	String bucket = System.getProperty("dataverse.files." + driverId + ".bucket-name") + "/";
+    	String sid = null;
+    	int i=0;
+    	while (s3io==null && i<5) {
+    		sid = bucket+ dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage() + "/" + FileUtil.generateStorageIdentifier();
+    		try {
+    			s3io = new S3AccessIO<DataFile>(sid, driverId);
+    			if(s3io.exists()) {
+    				s3io=null;
+    				i=i+1;
+    			} 
+
+    		} catch (Exception e) {
+    			i=i+1;
+    		}
+
+    	}
+    	return s3io;
+    }
+    
+    private static InputStream getOriginalFileInputStream(StorageIO<DataFile> storage, boolean isTabularData) throws IOException {
+        storage.open(DataAccessOption.READ_ACCESS);
+        if (!isTabularData) {
+            return storage.getInputStream();
+        } else {
+            // if this is a tabular file, read the preserved original "auxiliary file"
+            // instead:
+            return storage.getAuxFileAsInputStream(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION);
+        }
+    }
+
+    public static void validateDataFileChecksum(DataFile dataFile) throws IOException {
+        DataFile.ChecksumType checksumType = dataFile.getChecksumType();
+        if (checksumType == null) {
+            String info = BundleUtil.getStringFromBundle("dataset.publish.file.validation.error.noChecksumType", Arrays.asList(dataFile.getId().toString()));
+            logger.log(Level.INFO, info);
+            throw new IOException(info);
+        }
+
+        StorageIO<DataFile> storage = dataFile.getStorageIO();
+        String recalculatedChecksum = null;
+
+        try (InputStream inputStream = getOriginalFileInputStream(storage, dataFile.isTabularData())) {
+            recalculatedChecksum = FileUtil.calculateChecksum(inputStream, checksumType);
+        } catch (IOException ioex) {
+            String info = BundleUtil.getStringFromBundle("dataset.publish.file.validation.error.failRead", Arrays.asList(dataFile.getId().toString()));
+            logger.log(Level.INFO, info);
+            throw new IOException(info);
+        } catch (RuntimeException rte) {
+            logger.log(Level.SEVERE, "failed to calculated checksum, one retry", rte);
+            recalculatedChecksum = null;
+        }
+
+        if (recalculatedChecksum == null) { //retry once
+            storage = dataFile.getStorageIO();
+            try (InputStream inputStream = getOriginalFileInputStream(storage, dataFile.isTabularData())) {
+                recalculatedChecksum = FileUtil.calculateChecksum(inputStream, checksumType);
+            }
+        }
+
+        if (recalculatedChecksum == null) {
+            String info = BundleUtil.getStringFromBundle("dataset.publish.file.validation.error.failCalculateChecksum", Arrays.asList(dataFile.getId().toString()));
+            logger.log(Level.INFO, info);
+            throw new IOException(info);
+        }
+
+        // TODO? What should we do if the datafile does not have a non-null checksum?
+        // Should we fail, or should we assume that the recalculated checksum
+        // is correct, and populate the checksumValue field with it?
+        if (!recalculatedChecksum.equals(dataFile.getChecksumValue())) {
+            // There's one possible condition that is 100% recoverable and can
+            // be automatically fixed (issue #6660):
+            boolean fixed = false;
+            if (!dataFile.isTabularData() && dataFile.getIngestReport() != null) {
+                // try again, see if the .orig file happens to be there:
+                try (InputStream in = storage.getAuxFileAsInputStream(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION)) {
+                    recalculatedChecksum = FileUtil.calculateChecksum(in, checksumType);
+                } catch (RuntimeException rte) {
+                    recalculatedChecksum = null;
+                }
+                if (recalculatedChecksum != null) {
+                    // try again:
+                    if (recalculatedChecksum.equals(dataFile.getChecksumValue())) {
+                        fixed = true;
+                        try {
+                            storage.revertBackupAsAux(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION);
+                        } catch (IOException ioex) {
+                            fixed = false;
+                        }
+                    }
+                }
+            }
+
+            if (!fixed) {
+                String info = BundleUtil.getStringFromBundle("dataset.publish.file.validation.error.wrongChecksumValue", Arrays.asList(dataFile.getId().toString()));
+                logger.log(Level.INFO, info);
+                logger.fine("Expected: " + dataFile.getChecksumValue() +", calculated: " + recalculatedChecksum);
+                throw new IOException(info);
+            }
+        }
+
+        logger.log(Level.INFO, "successfully validated DataFile {0}; checksum {1}", new Object[]{dataFile.getId(), recalculatedChecksum});
+    }
+    
+    public static String getStorageIdentifierFromLocation(String location) {
+    	int driverEnd = location.indexOf(DataAccess.SEPARATOR) + DataAccess.SEPARATOR.length();
+    	int bucketEnd = driverEnd + location.substring(driverEnd).indexOf("/");
+    	return location.substring(0,bucketEnd) + ":" + location.substring(location.lastIndexOf("/") + 1);
+    }
+    
+    public static void deleteTempFile(DataFile dataFile, Dataset dataset, IngestServiceBean ingestService) {
+    	logger.info("Deleting " + dataFile.getStorageIdentifier());
+    	// Before we remove the file from the list and forget about 
+    	// it:
+    	// The physical uploaded file is still sitting in the temporary
+    	// directory. If it were saved, it would be moved into its 
+    	// permanent location. But since the user chose not to save it,
+    	// we have to delete the temp file too. 
+    	// 
+    	// Eventually, we will likely add a dedicated mechanism
+    	// for managing temp files, similar to (or part of) the storage 
+    	// access framework, that would allow us to handle specialized
+    	// configurations - highly sensitive/private data, that 
+    	// has to be kept encrypted even in temp files, and such. 
+    	// But for now, we just delete the file directly on the 
+    	// local filesystem: 
+
+    	try {
+    		List<Path> generatedTempFiles = ingestService.listGeneratedTempFiles(
+    				Paths.get(getFilesTempDirectory()), dataFile.getStorageIdentifier());
+    		if (generatedTempFiles != null) {
+    			for (Path generated : generatedTempFiles) {
+    				logger.fine("(Deleting generated thumbnail file " + generated.toString() + ")");
+    				try {
+    					Files.delete(generated);
+    				} catch (IOException ioex) {
+    					logger.warning("Failed to delete generated file " + generated.toString());
+    				}
+    			}
+    		}
+    		String si = dataFile.getStorageIdentifier();
+    		if (si.contains(DataAccess.SEPARATOR)) {
+    			//Direct upload files will already have a store id in their storageidentifier
+    			//but they need to be associated with a dataset for the overall storagelocation to be calculated
+    			//so we temporarily set the owner
+    			if(dataFile.getOwner()!=null) {
+    				logger.warning("Datafile owner was not null as expected");
+    			}
+    			dataFile.setOwner(dataset);
+    			//Use one StorageIO to get the storageLocation and then create a direct storage storageIO class to perform the delete 
+    			// (since delete is forbidden except for direct storage)
+    			String sl = DataAccess.getStorageIO(dataFile).getStorageLocation();
+    			DataAccess.getDirectStorageIO(sl).delete();
+    		} else {
+    			//Temp files sent to this method have no prefix, not even "tmp://"
+    			Files.delete(Paths.get(FileUtil.getFilesTempDirectory() + "/" + dataFile.getStorageIdentifier()));
+    		}
+    	} catch (IOException ioEx) {
+    		// safe to ignore - it's just a temp file. 
+    		logger.warning(ioEx.getMessage());
+    		if(dataFile.getStorageIdentifier().contains(DataAccess.SEPARATOR)) {
+    			logger.warning("Failed to delete temporary file " + dataFile.getStorageIdentifier());
+    		} else {
+    			logger.warning("Failed to delete temporary file " + FileUtil.getFilesTempDirectory() + "/"
+    					+ dataFile.getStorageIdentifier());
+    		}
+    	} finally {
+    		dataFile.setOwner(null);
+    	}
+    }
+    
+    public static boolean isFileAlreadyUploaded(DataFile dataFile, Map checksumMapNew, Map fileAlreadyExists) {
+        if (checksumMapNew == null) {
+            checksumMapNew = new HashMap<>();
+        }
+        
+        if (fileAlreadyExists == null) {
+            fileAlreadyExists = new HashMap<>();
+        }
+        
+        String chksum = dataFile.getChecksumValue();
+        
+        if (chksum == null) {
+            return false;
+        }
+        
+        if (checksumMapNew.get(chksum) != null) {
+            fileAlreadyExists.put(dataFile, checksumMapNew.get(chksum));
+            return true;
+        }
+        
+        checksumMapNew.put(chksum, dataFile);
+        return false;
+    }
+    
+    public static String formatFolderListingHtml(String folderName, DatasetVersion version, String apiLocation, boolean originals) {
+        String title = formatTitle("Index of folder /" + folderName);
+        List<FileMetadata> fileMetadatas = version.getFileMetadatasFolderListing(folderName);
+        
+        if (fileMetadatas == null || fileMetadatas.isEmpty()) {
+            return "";
+        }
+        
+        String persistentId = version.getDataset().getGlobalId().asString();
+        
+        StringBuilder sb = new StringBuilder();
+        
+        String versionTag = version.getFriendlyVersionNumber();
+        versionTag = "DRAFT".equals(versionTag) ? "Draft Version" : "v. " + versionTag;
+        sb.append(HtmlFormatUtil.formatTag("Index of folder /" + folderName + 
+                " in dataset " + persistentId + 
+                " (" + versionTag + ")", HTML_H1));
+        sb.append("\n");
+        sb.append(formatFolderListingTableHtml(folderName, fileMetadatas, apiLocation, originals));
+        
+        String body = sb.toString();
+                 
+        return formatDoc(title, body);
+    }
+    
+    private static String formatFolderListingTableHtml(String folderName, List<FileMetadata> fileMetadatas, String apiLocation, boolean originals) {
+        StringBuilder sb = new StringBuilder(); 
+        
+        sb.append(formatFolderListingTableHeaderHtml());
+        
+        for (FileMetadata fileMetadata : fileMetadatas) {
+            String localFolder = fileMetadata.getDirectoryLabel() == null ? "" : fileMetadata.getDirectoryLabel(); 
+            
+            if (folderName.equals(localFolder)) {
+                String accessUrl = getFileAccessUrl(fileMetadata, apiLocation, originals);
+                sb.append(formatFileListEntryHtml(fileMetadata, accessUrl));
+                sb.append("\n");
+
+            } else if (localFolder.startsWith(folderName)){
+                String subFolder = "".equals(folderName) ? localFolder : localFolder.substring(folderName.length() + 1);
+                if (subFolder.indexOf('/') > 0) {
+                    subFolder = subFolder.substring(0, subFolder.indexOf('/'));
+                }
+                String folderAccessUrl = getFolderAccessUrl(fileMetadata.getDatasetVersion(), folderName, subFolder, apiLocation, originals);
+                sb.append(formatFileListFolderHtml(subFolder, folderAccessUrl));
+                sb.append("\n");
+            }
+        }
+        
+        return formatTable(sb.toString());
+    }
+        
+    private static String formatFolderListingTableHeaderHtml() {
+        
+        StringBuilder sb = new StringBuilder();
+        sb.append(HtmlFormatUtil.formatTag("Name", HTML_TABLE_HDR));
+        sb.append(HtmlFormatUtil.formatTag("Last Modified", HTML_TABLE_HDR));
+        sb.append(HtmlFormatUtil.formatTag("Size", HTML_TABLE_HDR));
+        sb.append(HtmlFormatUtil.formatTag("Description", HTML_TABLE_HDR));
+        
+        String hdr = formatTableRow(sb.toString());
+        
+        // add a separator row (again, we want it to look just like Apache index)
+        return hdr.concat(formatTableRow(HtmlFormatUtil.formatTag("<hr>", HTML_TABLE_HDR,"colspan=\"4\""))); 
+        
+    }
+    
+    private static String formatFileListEntryHtml(FileMetadata fileMetadata, String accessUrl) {
+        StringBuilder sb = new StringBuilder(); 
+        
+        String fileName = fileMetadata.getLabel();
+        String dateString =  new SimpleDateFormat(FILE_LIST_DATE_FORMAT).format(fileMetadata.getDataFile().getCreateDate()); 
+        String sizeString = fileMetadata.getDataFile().getFriendlySize();
+        
+        sb.append(formatTableCell(formatLink(fileName, accessUrl))); 
+        sb.append(formatTableCellAlignRight(dateString));
+        sb.append(formatTableCellAlignRight(sizeString));
+        sb.append(formatTableCellAlignRight("&nbsp;"));
+        
+        return formatTableRow(sb.toString());
+    }
+    
+    private static String formatFileListFolderHtml(String folderName, String listApiUrl) {
+        
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append(formatTableCell(formatLink(folderName+"/", listApiUrl)));
+        sb.append(formatTableCellAlignRight(" - "));
+        sb.append(formatTableCellAlignRight(" - "));
+        sb.append(formatTableCellAlignRight("&nbsp;"));
+        
+        return formatTableRow(sb.toString());
+    }
+    
+    private static String getFileAccessUrl(FileMetadata fileMetadata, String apiLocation, boolean original) {
+        String fileId = fileMetadata.getDataFile().getId().toString();
+        
+        if (StringUtil.nonEmpty(fileMetadata.getDirectoryLabel())) {
+            fileId = fileMetadata.getDirectoryLabel().concat("/").concat(fileId);
+        }
+        
+        String formatArg = fileMetadata.getDataFile().isTabularData() && original ? "?format=original" : ""; 
+        
+        return apiLocation + "/api/access/datafile/" + fileId + formatArg; 
+    }
+    
+    private static String getFolderAccessUrl(DatasetVersion version, String currentFolder, String subFolder, String apiLocation, boolean originals) {
+        String datasetId = version.getDataset().getId().toString();
+        String versionTag = version.getFriendlyVersionNumber();
+        versionTag = versionTag.replace("DRAFT", DS_VERSION_DRAFT);
+        if (!"".equals(currentFolder)) {
+            subFolder = currentFolder + "/" + subFolder;
+        }
+        
+        return apiLocation + "/api/datasets/" + datasetId + 
+                "/dirindex/?version=" + versionTag + "&" +
+                "folder=" + subFolder + 
+                (originals ? "&original=true" : "");
+    }
+
+    /**
+     * This method takes a JsonArray of JsonObjects and extracts the fields of those
+     * objects corresponding to the supplied list of headers to create a rectangular
+     * CSV file (with headers) that lists the values from each object in rows. It
+     * was developed for use with the metrics API but could be useful in other calls
+     * that require the same transformation.
+     * 
+     * @param jsonArray
+     *            - the array of JsonObjects containing key/value pairs with keys
+     *            matching the headers. Keys that don't match a header are
+     *            ignored/not included.
+     * @param headers
+     *            - strings to use as CSV headers
+     * @return - the CSV file as a string, rows separated by '\n'
+     */
+    public static String jsonArrayOfObjectsToCSV(JsonArray jsonArray, String... headers) {
+        StringBuilder csvSB = new StringBuilder(String.join(",", headers));
+        jsonArray.forEach((jv) -> {
+            JsonObject jo = (JsonObject) jv;
+            String[] values = new String[headers.length];
+            for (int i = 0; i < headers.length; i++) {
+                if(jo.containsKey(headers[i])) {
+                    values[i] = jo.get(headers[i]).toString();
+                }
+            }
+            csvSB.append("\n").append(String.join(",", values));
+        });
+        return csvSB.toString();
+    }
+
+    public static boolean isActivelyEmbargoed(DataFile df) {
+        Embargo e = df.getEmbargo();
+        if (e != null) {
+            LocalDate endDate = e.getDateAvailable();
+            if (endDate != null && endDate.isAfter(LocalDate.now())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isActivelyEmbargoed(FileMetadata fileMetadata) {
+        return isActivelyEmbargoed(fileMetadata.getDataFile());
+    }
+    
+    public static boolean isActivelyEmbargoed(List<FileMetadata> fmdList) {
+        for (FileMetadata fmd : fmdList) {
+            if (isActivelyEmbargoed(fmd)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isRetentionExpired(DataFile df) {
+        Retention e = df.getRetention();
+        if (e != null) {
+            LocalDate endDate = e.getDateUnavailable();
+            if (endDate != null && endDate.isBefore(LocalDate.now())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isRetentionExpired(FileMetadata fileMetadata) {
+        return isRetentionExpired(fileMetadata.getDataFile());
+    }
+
+    public static boolean isRetentionExpired(List<FileMetadata> fmdList) {
+        for (FileMetadata fmd : fmdList) {
+            if (isRetentionExpired(fmd)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static String getStorageDriver(DataFile dataFile) {
+        String storageIdentifier = dataFile.getStorageIdentifier();
+        return storageIdentifier.substring(0, storageIdentifier.indexOf(DataAccess.SEPARATOR));
+    }
+
+    /**
+     * Replace spaces with "_" and remove invalid chars
+     * @param fileNameIn - Name before sanitization NOTE: not full path since this method removes '/' and '\'
+     * @return filename without spaces or invalid chars
+     */
+    public static String sanitizeFileName(String fileNameIn) {
+        return fileNameIn == null ? null : fileNameIn.replace(' ', '_').replaceAll("[\\\\/:*?\"<>|,;]", "");
+    }
+
+    public static Path createDirStructure(String rootDirectory, String... subdirectories) throws IOException {
+        Path path = Path.of(rootDirectory, subdirectories);
+        Files.createDirectories(path);
+        return path;
+    }
+
+    public static boolean isFileOfImageType(File file) throws IOException {
+        Tika tika = new Tika();
+        String mimeType = tika.detect(file);
+        return mimeType != null && mimeType.startsWith("image/");
+    }
+
+    /**
+     * Converts a filename from ISO_8859_1 to UTF_8 to handle encoding issues.
+     * Ref: https://github.com/eclipse-ee4j/jersey/issues/1700
+     *
+     * @param originalFileName the original filename
+     * @return the filename converted to UTF_8
+     */
+    public static String decodeFileName(String originalFileName) {
+        if (originalFileName == null) {
+            return null;
+        }
+        return new String(originalFileName.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/openaire/FirstNames.java b/src/main/java/edu/harvard/iq/dataverse/util/FirstNames.java
similarity index 98%
rename from src/main/java/edu/harvard/iq/dataverse/export/openaire/FirstNames.java
rename to src/main/java/edu/harvard/iq/dataverse/util/FirstNames.java
index 6a7bfe400f0..d82aa5e59b2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/openaire/FirstNames.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/FirstNames.java
@@ -1,4 +1,4 @@
-package edu.harvard.iq.dataverse.export.openaire;
+package edu.harvard.iq.dataverse.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -9,10 +9,10 @@
 import java.util.logging.Level;
 
 /**
- *
+ * Used by PersonOrOrgUtil
  * @author francesco.cadili@4science.it
  */
-public class FirstNames {
+class FirstNames {
 
     private static FirstNames instance = null;
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java
index 5b87b18573b..b02ac63cacd 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java
@@ -1,11 +1,9 @@
 package edu.harvard.iq.dataverse.util;
 
-import java.util.Locale;
-import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
 
 /**
  * Utility class for common JSF tasks.
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/MailSessionProducer.java b/src/main/java/edu/harvard/iq/dataverse/util/MailSessionProducer.java
new file mode 100644
index 00000000000..149f92761d2
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/MailSessionProducer.java
@@ -0,0 +1,150 @@
+package edu.harvard.iq.dataverse.util;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import jakarta.annotation.Resource;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
+import jakarta.mail.Authenticator;
+import jakarta.mail.PasswordAuthentication;
+import jakarta.mail.Session;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+@ApplicationScoped
+public class MailSessionProducer {
+    
+    // NOTE: We do not allow "from" here, as we want the transport to get it from the message being sent, enabling
+    //       matching addresses. If "from" in transport and "from" in the message differ, some MTAs may reject or
+    //       classify as spam.
+    // NOTE: Complete list including descriptions at https://eclipse-ee4j.github.io/angus-mail/docs/api/org.eclipse.angus.mail/org/eclipse/angus/mail/smtp/package-summary.html
+    static final List<String> smtpStringProps = List.of(
+        "host", "localhost", "localaddress", "auth.mechanisms", "auth.ntlm.domain", "submitter", "dsn.notify", "dsn.ret",
+        "sasl.mechanisms", "sasl.authorizationid", "sasl.realm", "ssl.trust", "ssl.protocols", "ssl.ciphersuites",
+        "proxy.host", "proxy.port", "proxy.user", "proxy.password", "socks.host", "socks.port", "mailextension"
+    );
+    static final List<String> smtpIntProps = List.of(
+        "port", "connectiontimeout", "timeout", "writetimeout", "localport", "auth.ntlm.flag"
+    );
+    static final List<String> smtpBoolProps = List.of(
+        "auth", "ehlo", "auth.login.disable", "auth.plain.disable", "auth.digest-md5.disable", "auth.ntlm.disable",
+        "auth.xoauth2.disable", "allow8bitmime", "sendpartial", "sasl.enable", "sasl.usecanonicalhostname",
+        "quitwait", "quitonsessionreject", "ssl.enable", "ssl.checkserveridentity", "starttls.enable",
+        "starttls.required", "userset", "noop.strict"
+    );
+    
+    private static final String PREFIX = "mail.smtp.";
+    private static final Logger logger = Logger.getLogger(MailSessionProducer.class.getCanonicalName());
+    
+    static {
+        if (Boolean.TRUE.equals(JvmSettings.MAIL_DEBUG.lookup(Boolean.class))) {
+            logger.setLevel(Level.FINE);
+        }
+    }
+    
+    Session systemMailSession;
+    
+    /**
+     * Cache the application server provided (user defined) javamail resource to enable backwards compatibility.
+     * No direct JNDI lookup on the field to avoid deployment failures when not present.
+     * @deprecated This should be removed with the next major release of Dataverse, as it would be a breaking change.
+     */
+    @Deprecated(forRemoval = true, since = "6.2")
+    Session appserverProvidedSession;
+    
+    public MailSessionProducer() {
+        try {
+            // Do JNDI lookup of legacy mail session programmatically to avoid deployment errors when not found.
+            Context initialContext = new InitialContext();
+            this.appserverProvidedSession = (Session)initialContext.lookup("mail/notifyMailSession");
+        } catch (NamingException e) {
+            // This exception simply means the appserver did not provide the legacy mail session.
+            // Debug level output is just fine.
+            logger.log(Level.FINER, "Error during legacy appserver-level mail resource lookup", e);
+        }
+    }
+    
+    @Produces
+    @Named("mail/systemSession")
+    public Session getSession() {
+        //  For backward compatibility, prefer to return the mail resource configured on the appserver.
+        if (appserverProvidedSession != null) {
+            logger.warning("The configuration of mail transfer agents using asadmin create-javamail-resource is" +
+                " deprecated. Please migrate to using JVM options, see Dataverse guides for details");
+            return appserverProvidedSession;
+        }
+        
+        if (systemMailSession == null) {
+            logger.fine("Setting up new mail session");
+            
+            // Initialize with null (= no authenticator) is a valid argument for the session factory method.
+            Authenticator authenticator = null;
+            
+            // In case we want auth, create an authenticator (default = false from microprofile-config.properties)
+            if (Boolean.TRUE.equals(JvmSettings.MAIL_MTA_AUTH.lookup(Boolean.class))) {
+                logger.fine("Mail Authentication is enabled, building authenticator");
+                authenticator = new Authenticator() {
+                    @Override
+                    protected PasswordAuthentication getPasswordAuthentication() {
+                        logger.fine(() ->
+                            String.format("Returning PasswordAuthenticator with username='%s', password='%s'",
+                                JvmSettings.MAIL_MTA_USER.lookup(),
+                                "*".repeat(JvmSettings.MAIL_MTA_PASSWORD.lookup().length())));
+                        return new PasswordAuthentication(JvmSettings.MAIL_MTA_USER.lookup(), JvmSettings.MAIL_MTA_PASSWORD.lookup());
+                    }
+                };
+            }
+            
+            this.systemMailSession = Session.getInstance(getMailProperties(), authenticator);
+        }
+        return systemMailSession;
+    }
+    
+    Properties getMailProperties() {
+        Properties configuration = new Properties();
+        
+        // See https://jakarta.ee/specifications/mail/2.1/apidocs/jakarta.mail/jakarta/mail/package-summary
+        configuration.put("mail.transport.protocol", "smtp");
+        configuration.put("mail.debug", JvmSettings.MAIL_DEBUG.lookupOptional(Boolean.class).orElse(false).toString());
+        // Only enable if your MTA properly supports UTF-8 mail addresses following RFC 6530/6531/6532.
+        // Before, we used a hack to put the raw UTF-8 mail address into the system.
+        // Now, make it proper, but make it possible to disable it - see also EMailValidator.
+        // Default = true from microprofile-config.properties as most MTAs these days support SMTPUTF8 extension
+        configuration.put("mail.mime.allowutf8", JvmSettings.MAIL_MTA_SUPPORT_UTF8.lookup(Boolean.class).toString());
+        
+        // Map properties 1:1 to mail.smtp properties for the mail session.
+        smtpStringProps.forEach(
+            prop -> JvmSettings.MAIL_MTA_SETTING.lookupOptional(prop).ifPresent(
+                string -> configuration.put(PREFIX + prop, string)));
+        smtpBoolProps.forEach(
+            prop -> JvmSettings.MAIL_MTA_SETTING.lookupOptional(Boolean.class, prop).ifPresent(
+                bool -> configuration.put(PREFIX + prop, bool.toString())));
+        smtpIntProps.forEach(
+            prop -> JvmSettings.MAIL_MTA_SETTING.lookupOptional(Integer.class, prop).ifPresent(
+                number -> configuration.put(PREFIX + prop, number.toString())));
+        
+        logger.fine(() -> "Compiled properties:" + configuration.entrySet().stream()
+            .map(entry -> "\"" + entry.getKey() + "\": \"" + entry.getValue() + "\"")
+            .collect(Collectors.joining(",\n")));
+        
+        return configuration;
+    }
+    
+    /**
+     * Determine if the session returned by {@link #getSession()} has been provided by the application server
+     * @return True if injected as resource from app server, false otherwise
+     * @deprecated This is supposed to be removed when {@link #appserverProvidedSession} is removed.
+     */
+    @Deprecated(forRemoval = true, since = "6.2")
+    public boolean hasSessionFromAppServer() {
+        return this.appserverProvidedSession != null;
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java
index 7a144e65ee1..fe309dbe345 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java
@@ -1,36 +1,32 @@
 package edu.harvard.iq.dataverse.util;
 
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.UserNotification;
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
-import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.SystemEmail;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
 
 public class MailUtil {
 
     private static final Logger logger = Logger.getLogger(MailUtil.class.getCanonicalName());
 
-    public static InternetAddress parseSystemAddress(String systemEmail) {
-        if (systemEmail != null) {
-            try {
-                InternetAddress parsedSystemEmail = new InternetAddress(systemEmail);
-                logger.fine("parsed system email: " + parsedSystemEmail);
-                return parsedSystemEmail;
-            } catch (AddressException ex) {
-                logger.info("Email will not be sent due to invalid value in " + SystemEmail + " setting: " + ex);
-                return null;
+    public static String getSubjectTextBasedOnNotification(UserNotification userNotification, Object objectOfNotification) {
+        List<String> rootDvNameAsList = Arrays.asList(BrandingUtil.getInstallationBrandName());
+        String datasetDisplayName = "";
+
+        if (objectOfNotification != null) {
+            if (objectOfNotification instanceof Dataset) {
+                datasetDisplayName = ((Dataset) objectOfNotification).getDisplayName();
+            } else if (objectOfNotification instanceof DatasetVersion) {
+                datasetDisplayName = ((DatasetVersion) objectOfNotification).getDataset().getDisplayName();
+            } else if (objectOfNotification instanceof DataFile) {
+                datasetDisplayName = ((DataFile) objectOfNotification).getOwner().getDisplayName();
             }
         }
-        logger.fine("Email will not be sent because the " + SystemEmail + " setting is null.");
-        return null;
-    }
 
-    public static String getSubjectTextBasedOnNotification(UserNotification userNotification, String rootDataverseName, Object objectOfNotification) {
-        List<String> rootDvNameAsList = Arrays.asList(BrandingUtil.getInstallationBrandName(rootDataverseName));
         switch (userNotification.getType()) {
             case ASSIGNROLE:
                 return BundleUtil.getStringFromBundle("notification.email.assign.role.subject", rootDvNameAsList);
@@ -39,23 +35,36 @@ public static String getSubjectTextBasedOnNotification(UserNotification userNoti
             case CREATEDV:
                 return BundleUtil.getStringFromBundle("notification.email.create.dataverse.subject", rootDvNameAsList);
             case REQUESTFILEACCESS:
-                return BundleUtil.getStringFromBundle("notification.email.request.file.access.subject", rootDvNameAsList);
+                String userNameFirst = userNotification.getRequestor().getFirstName();
+                String userNameLast = userNotification.getRequestor().getLastName();
+                String userIdentifier = userNotification.getRequestor().getIdentifier();
+                return BundleUtil.getStringFromBundle("notification.email.request.file.access.subject", Arrays.asList(rootDvNameAsList.get(0), userNameFirst, userNameLast, userIdentifier, datasetDisplayName));
+            case REQUESTEDFILEACCESS:
+                return BundleUtil.getStringFromBundle("notification.email.requested.file.access.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
             case GRANTFILEACCESS:
                 return BundleUtil.getStringFromBundle("notification.email.grant.file.access.subject", rootDvNameAsList);
             case REJECTFILEACCESS:
                 return BundleUtil.getStringFromBundle("notification.email.rejected.file.access.subject", rootDvNameAsList);
-            case MAPLAYERUPDATED:
-                return BundleUtil.getStringFromBundle("notification.email.update.maplayer", rootDvNameAsList);
-            case MAPLAYERDELETEFAILED:
-                return BundleUtil.getStringFromBundle("notification.email.maplayer.deletefailed.subject", rootDvNameAsList);
+            case DATASETCREATED:
+                return BundleUtil.getStringFromBundle("notification.email.dataset.created.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
             case CREATEDS:
-                return BundleUtil.getStringFromBundle("notification.email.create.dataset.subject", rootDvNameAsList);
+                return BundleUtil.getStringFromBundle("notification.email.create.dataset.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
             case SUBMITTEDDS:
-                return BundleUtil.getStringFromBundle("notification.email.submit.dataset.subject", rootDvNameAsList);
+                return BundleUtil.getStringFromBundle("notification.email.submit.dataset.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
             case PUBLISHEDDS:
-                return BundleUtil.getStringFromBundle("notification.email.publish.dataset.subject", rootDvNameAsList);
+                return BundleUtil.getStringFromBundle("notification.email.publish.dataset.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
+            case PUBLISHFAILED_PIDREG:
+                return BundleUtil.getStringFromBundle("notification.email.publishFailure.dataset.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
             case RETURNEDDS:
-                return BundleUtil.getStringFromBundle("notification.email.returned.dataset.subject", rootDvNameAsList);
+                return BundleUtil.getStringFromBundle("notification.email.returned.dataset.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
+            case WORKFLOW_SUCCESS:
+                return BundleUtil.getStringFromBundle("notification.email.workflow.success.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
+            case WORKFLOW_FAILURE:
+                return BundleUtil.getStringFromBundle("notification.email.workflow.failure.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
+            case STATUSUPDATED:
+                return BundleUtil.getStringFromBundle("notification.email.status.change.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
+            case PIDRECONCILED:
+                return BundleUtil.getStringFromBundle("notification.email.pid.reconciled.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
             case CREATEACC:
                 return BundleUtil.getStringFromBundle("notification.email.create.account.subject", rootDvNameAsList);
             case CHECKSUMFAIL:
@@ -68,6 +77,55 @@ public static String getSubjectTextBasedOnNotification(UserNotification userNoti
                 } catch (Exception e) {
                     return BundleUtil.getStringFromBundle("notification.email.import.filesystem.subject", rootDvNameAsList);
                 }
+            case GLOBUSUPLOADCOMPLETED:
+                try {
+                    DatasetVersion version =  (DatasetVersion)objectOfNotification;
+                    List<String> dsNameAsList = Arrays.asList(version.getDataset().getDisplayName());
+                    return BundleUtil.getStringFromBundle("notification.email.globus.uploadCompleted.subject", dsNameAsList);
+                } catch (Exception e) {
+                    return BundleUtil.getStringFromBundle("notification.email.globus.uploadCompleted.subject", rootDvNameAsList);
+                }
+            case GLOBUSDOWNLOADCOMPLETED:
+                try {
+                    DatasetVersion version =  (DatasetVersion)objectOfNotification;
+                    List<String> dsNameAsList = Arrays.asList(version.getDataset().getDisplayName());
+                    return BundleUtil.getStringFromBundle("notification.email.globus.downloadCompleted.subject", dsNameAsList);
+                } catch (Exception e) {
+                    return BundleUtil.getStringFromBundle("notification.email.globus.downloadCompleted.subject", rootDvNameAsList);
+                }
+            case GLOBUSUPLOADCOMPLETEDWITHERRORS:
+                try {
+                    DatasetVersion version =  (DatasetVersion)objectOfNotification;
+                    List<String> dsNameAsList = Arrays.asList(version.getDataset().getDisplayName());
+                    return BundleUtil.getStringFromBundle("notification.email.globus.uploadCompletedWithErrors.subject", dsNameAsList);
+                } catch (Exception e) {
+                    return BundleUtil.getStringFromBundle("notification.email.globus.uploadCompletedWithErrors.subject", rootDvNameAsList);
+                }
+            case GLOBUSUPLOADREMOTEFAILURE:
+                try {
+                    DatasetVersion version =  (DatasetVersion)objectOfNotification;
+                    List<String> dsNameAsList = Arrays.asList(version.getDataset().getDisplayName());
+                    return BundleUtil.getStringFromBundle("notification.email.globus.uploadFailedRemotely.subject", dsNameAsList);
+                    
+                } catch (Exception e) {
+                    return BundleUtil.getStringFromBundle("notification.email.globus.uploadFailedRemotely.subject", rootDvNameAsList);
+                }
+            case GLOBUSUPLOADLOCALFAILURE:
+                try {
+                    DatasetVersion version =  (DatasetVersion)objectOfNotification;
+                    List<String> dsNameAsList = Arrays.asList(version.getDataset().getDisplayName());
+                    return BundleUtil.getStringFromBundle("notification.email.globus.uploadFailedLocally.subject", dsNameAsList);
+                } catch (Exception e) {
+                    return BundleUtil.getStringFromBundle("notification.email.globus.uploadFailedLocally.subject", rootDvNameAsList);
+                }
+            case GLOBUSDOWNLOADCOMPLETEDWITHERRORS:
+                try {
+                    DatasetVersion version =  (DatasetVersion)objectOfNotification;
+                    List<String> dsNameAsList = Arrays.asList(version.getDataset().getDisplayName());
+                    return BundleUtil.getStringFromBundle("notification.email.globus.downloadCompletedWithErrors.subject", dsNameAsList);
+                } catch (Exception e) {
+                    return BundleUtil.getStringFromBundle("notification.email.globus.downloadCompletedWithErrors.subject", rootDvNameAsList);
+                }
 
             case CHECKSUMIMPORT:
                 return BundleUtil.getStringFromBundle("notification.email.import.checksum.subject", rootDvNameAsList);
@@ -76,9 +134,11 @@ public static String getSubjectTextBasedOnNotification(UserNotification userNoti
             case APIGENERATED:
                 return BundleUtil.getStringFromBundle("notification.email.apiTokenGenerated.subject",  rootDvNameAsList);
             case INGESTCOMPLETED:
-                return BundleUtil.getStringFromBundle("notification.email.ingestCompleted.subject", rootDvNameAsList);
+                return BundleUtil.getStringFromBundle("notification.email.ingestCompleted.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
             case INGESTCOMPLETEDWITHERRORS:
-                return BundleUtil.getStringFromBundle("notification.email.ingestCompletedWithErrors.subject", rootDvNameAsList);
+                return BundleUtil.getStringFromBundle("notification.email.ingestCompletedWithErrors.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
+            case DATASETMENTIONED:
+                return BundleUtil.getStringFromBundle("notification.email.datasetWasMentioned.subject", rootDvNameAsList);
         }
         return "";
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/MarkupChecker.java b/src/main/java/edu/harvard/iq/dataverse/util/MarkupChecker.java
index 7b096786351..02055ad60e9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/MarkupChecker.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/MarkupChecker.java
@@ -1,66 +1,110 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package edu.harvard.iq.dataverse.util;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.jsoup.Jsoup;
-import org.jsoup.safety.Whitelist;
+import org.jsoup.safety.Safelist;
 import org.jsoup.parser.Parser;
 
 /**
- * Wrapper for Jsoup clean
- * 
+ * Provides utility methods for sanitizing and processing HTML content.
+ * <p>
+ * This class serves as a wrapper for the {@code Jsoup.clean} method and offers
+ * multiple configurations for cleaning HTML input. It also provides a method
+ * for escaping HTML entities and stripping all HTML tags.
+ * </p>
+ *
  * @author rmp553
  */
 public class MarkupChecker {
-    
-    
-    
+
     /**
-     * Wrapper around Jsoup clean method with the basic White list
-     *   http://jsoup.org/cookbook/cleaning-html/whitelist-sanitizer
-     * @param unsafe
-     * @return 
+     * Sanitizes the provided HTML content using a customizable configuration.
+     * <p>
+     * This method uses the {@code Jsoup.clean} method with a configurable {@code Safelist}.
+     * For more details, see the
+     * <a href="http://jsoup.org/cookbook/cleaning-html/safelist-sanitizer">Jsoup SafeList Sanitizer</a>.
+     * </p>
+     * <p>
+     * It supports preserving class attributes and optionally adding "noopener noreferrer nofollow"
+     * attributes to anchor tags to enhance security and usability.
+     * </p>
+     *
+     * @param unsafe                    the HTML content to be sanitized; may contain unsafe or untrusted elements.
+     * @param keepClasses               whether to preserve class attributes in the sanitized HTML.
+     * @param includeNoopenerNoreferrer whether to add "noopener noreferrer nofollow" to <a> tags.
+     * @return a sanitized HTML string, free from potentially harmful content.
      */
-    public static String sanitizeBasicHTML(String unsafe) {
-
+    private static String sanitizeHTML(String unsafe, boolean keepClasses, boolean includeNoopenerNoreferrer) {
         if (unsafe == null) {
             return null;
         }
-        // basic includes: a, b, blockquote, br, cite, code, dd, dl, dt, em, i, li, ol, p, pre, q, small, span, strike, strong, sub, sup, u, ul
-        //Whitelist wl = Whitelist.basic().addTags("img", "h1", "h2", "h3", "kbd", "hr", "s", "del");  
 
-        Whitelist wl = Whitelist.basicWithImages().addTags("h1", "h2", "h3", "kbd", "hr", "s", "del", "map", "area").addAttributes("img", "usemap")
-                .addAttributes("map", "name").addAttributes("area", "shape", "coords", "href", "title", "alt")
+        // Create a base Safelist configuration
+        Safelist sl = Safelist.basicWithImages()
+                .addTags("h1", "h2", "h3", "kbd", "hr", "s", "del", "map", "area")
+                .addAttributes("img", "usemap")
+                .addAttributes("map", "name")
+                .addAttributes("area", "shape", "coords", "href", "title", "alt")
                 .addEnforcedAttribute("a", "target", "_blank");
 
-        return Jsoup.clean(unsafe, wl);
+        // Add class attributes if requested
+        if (keepClasses) {
+            sl.addAttributes(":all", "class");
+        }
+
+        // Add "noopener noreferrer nofollow" to <a> tags if requested
+        if (includeNoopenerNoreferrer) {
+            sl.addEnforcedAttribute("a", "rel", "noopener noreferrer nofollow");
+        }
 
+        return Jsoup.clean(unsafe, sl);
     }
-        
+
     /**
-     * Strip all HTMl tags
-     * 
-     * http://jsoup.org/apidocs/org/jsoup/safety/Whitelist.html#none%28%29
-     * 
-     * @param unsafe
-     * @return 
+     * Sanitizes the provided HTML content using a basic configuration.
+     *
+     * @param unsafe the HTML content to be sanitized; may contain unsafe or untrusted elements.
+     * @return a sanitized HTML string, free from potentially harmful content.
      */
-    public static String stripAllTags(String unsafe) {
+    public static String sanitizeBasicHTML(String unsafe) {
+        return sanitizeHTML(unsafe, false, false);
+    }
 
+    /**
+     * Sanitizes the provided HTML content using an advanced configuration.
+     * <p>
+     * This configuration preserves class attributes and adds "noopener noreferrer nofollow"
+     * attributes to <a> tags to enhance security and usability.
+     * </p>
+     *
+     * @param unsafe the HTML content to be sanitized; may contain unsafe or untrusted elements.
+     * @return a sanitized HTML string, free from potentially harmful content.
+     */
+    public static String sanitizeAdvancedHTML(String unsafe) {
+        return sanitizeHTML(unsafe, true, true);
+    }
+
+    /**
+     * Removes all HTML tags from the provided content, leaving only plain text.
+     *
+     * @param unsafe the HTML content to process; may contain HTML tags.
+     * @return the plain text content with all HTML tags removed, or {@code null} if the input is {@code null}.
+     */
+    public static String stripAllTags(String unsafe) {
         if (unsafe == null) {
             return null;
         }
 
-        return Parser.unescapeEntities(Jsoup.clean(unsafe, Whitelist.none()), true);
-
+        return Parser.unescapeEntities(Jsoup.clean(unsafe, Safelist.none()), true);
     }
-    
+
+    /**
+     * Escapes special characters in the provided string into their corresponding HTML entities.
+     *
+     * @param unsafe the string to escape; may contain special characters.
+     * @return a string with HTML entities escaped.
+     */
     public static String escapeHtml(String unsafe) {
-         return StringEscapeUtils.escapeHtml(unsafe);
+        return StringEscapeUtils.escapeHtml4(unsafe);
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/openaire/Organizations.java b/src/main/java/edu/harvard/iq/dataverse/util/Organizations.java
similarity index 97%
rename from src/main/java/edu/harvard/iq/dataverse/export/openaire/Organizations.java
rename to src/main/java/edu/harvard/iq/dataverse/util/Organizations.java
index d08ea723176..475afdb48b8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/openaire/Organizations.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/Organizations.java
@@ -1,6 +1,5 @@
-package edu.harvard.iq.dataverse.export.openaire;
+package edu.harvard.iq.dataverse.util;
 
-import edu.harvard.iq.dataverse.util.StringUtil;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -15,10 +14,10 @@
 import opennlp.tools.util.Span;
 
 /**
- *
+ * Used by PersonOrOrgUtil
  * @author francesco.cadili@4science.it
  */
-public class Organizations {
+class Organizations {
 
     private static Organizations instance = null;
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/PersonOrOrgUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/PersonOrOrgUtil.java
new file mode 100644
index 00000000000..a3039d99ff7
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/PersonOrOrgUtil.java
@@ -0,0 +1,150 @@
+package edu.harvard.iq.dataverse.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+
+/**
+ *
+ * @author qqmyers
+ * 
+ *         Adapted from earlier code in OpenAireExportUtil
+ * 
+ *         Implements an algorithm derived from code at DataCite to determine
+ *         whether a name is that of a Person or Organization and, if the
+ *         former, to pull out the given and family names.
+ * 
+ *         Adds parameters that can improve accuracy:
+ * 
+ *         * e.g. for curated repositories, allowing the code to assume that all
+ *         Person entries are in <family name>, <given name> order.
+ * 
+ *         * allow local configuration of specific words/phrases that will
+ *         automatically categorize one-off cases that the algorithm would
+ *         otherwise mis-categorize. For example, the code appears to not
+ *         recognize names ending in "Project" as an Organization.
+ * 
+ */
+
+public class PersonOrOrgUtil {
+
+    private static final Logger logger = Logger.getLogger(PersonOrOrgUtil.class.getCanonicalName());
+
+    static boolean assumeCommaInPersonName = false;
+    static List<String> orgPhrases;
+
+    static {
+        setAssumeCommaInPersonName(JvmSettings.ASSUME_COMMA_IN_PERSON_NAME.lookupOptional(Boolean.class).orElse(false));
+        setOrgPhraseArray(JvmSettings.ORG_PHRASE_ARRAY.lookupOptional(String[].class).orElse(new String[]{}));
+    }
+
+    /**
+     * This method tries to determine if a name belongs to a person or an
+     * organization and, if it is a person, what the given and family names are. The
+     * core algorithm is adapted from a Datacite algorithm, see
+     * https://github.com/IQSS/dataverse/issues/2243#issuecomment-358615313
+     * 
+     * @param name
+     *            - the name to test
+     * @param organizationIfTied
+     *            - if a given name isn't found, should the name be assumed to be
+     *            from an organization. This could be a generic true/false or
+     *            information from some non-name aspect of the entity, e.g. which
+     *            field is in use, or whether a .edu email exists, etc.
+     * @param isPerson
+     *            - if this is known to be a person due to other info (i.e. they
+     *            have an ORCID). In this case the algorithm is just looking for
+     *            given/family names.
+     * @return
+     */
+    public static JsonObject getPersonOrOrganization(String name, boolean organizationIfTied, boolean isPerson) {
+        name = StringUtil.normalize(name);
+
+        String givenName = null;
+        String familyName = null;
+
+        boolean isOrganization = !isPerson && Organizations.getInstance().isOrganization(name);
+        if (!isOrganization) {
+            for (String phrase : orgPhrases) {
+                if (name.contains(phrase)) {
+                    isOrganization = true;
+                    break;
+                }
+            }
+        }
+        if (name.contains(",")) {
+            givenName = FirstNames.getInstance().getFirstName(name);
+            // contributorName=<FamilyName>, <FirstName>
+            if (givenName != null && !isOrganization) {
+                // givenName ok
+                isOrganization = false;
+                // contributor_map.put("nameType", "Personal");
+                if (!name.replaceFirst(",", "").contains(",")) {
+                    // contributorName=<FamilyName>, <FirstName>
+                    String[] fullName = name.split(", ");
+                    givenName = fullName[1];
+                    familyName = fullName[0];
+                }
+            } else if (isOrganization || organizationIfTied) {
+                isOrganization = true;
+                givenName = null;
+            }
+
+        } else {
+            if (assumeCommaInPersonName && !isPerson) {
+                isOrganization = true;
+            } else {
+                givenName = FirstNames.getInstance().getFirstName(name);
+
+                if (givenName != null && !isOrganization) {
+                    isOrganization = false;
+                    if (givenName.length() + 1 < name.length()) {
+                        familyName = name.substring(givenName.length() + 1);
+                    }
+                } else {
+                    // default
+                    if (isOrganization || organizationIfTied) {
+                        isOrganization = true;
+                        givenName=null;
+                    }
+                }
+            }
+        }
+        if(!isOrganization && givenName == null && name.contains(",")) {
+            //If we still think this is a person and there's only one comma, assume we can extract the given name and family name
+            if (!name.replaceFirst(",", "").contains(",")) {
+                // contributorName=<FamilyName>, <FirstName>
+                String[] fullName = name.split(", ");
+                givenName = fullName.length > 1 ? fullName[1] : null;
+                familyName = fullName[0];
+            }
+        }
+        JsonObjectBuilder job = new NullSafeJsonBuilder();
+        job.add("fullName", name);
+        job.add("givenName", givenName);
+        job.add("familyName", familyName);
+        job.add("isPerson", !isOrganization);
+        return job.build();
+
+    }
+
+    // Public for testing
+    public static void setOrgPhraseArray(String[] phraseArray) {
+        if (phraseArray == null) {
+            orgPhrases = new ArrayList<>();
+        } else {
+            orgPhrases = List.of(phraseArray);
+        }
+    }
+
+    // Public for testing
+    public static void setAssumeCommaInPersonName(boolean assume) {
+        assumeCommaInPersonName = assume;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/RequiredCheckboxValidator.java b/src/main/java/edu/harvard/iq/dataverse/util/RequiredCheckboxValidator.java
index 0221d45e4b0..fdac50ee58a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/RequiredCheckboxValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/RequiredCheckboxValidator.java
@@ -1,12 +1,12 @@
 package edu.harvard.iq.dataverse.util;
 
 import java.text.MessageFormat;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.Validator;
+import jakarta.faces.validator.ValidatorException;
 
 /**
  * from http://balusc.blogspot.com/2008/09/validate-required-checkbox.html via
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SessionUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/SessionUtil.java
new file mode 100644
index 00000000000..effa1980d70
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/SessionUtil.java
@@ -0,0 +1,32 @@
+package edu.harvard.iq.dataverse.util;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map.Entry;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
+public class SessionUtil {
+
+    /**
+	 * Changes the session id (jsessionId) - for use when the session's authority increases (i.e. at login)
+	 * Servlet 3.1 Note: This method is needed while using Servlets 2.0. 3.1 has a HttpServletRequest.chageSessionId(); method that can be used instead.
+	 * 
+	 * @param h the current HttpServletRequest
+     * e.g. for pages you can get this from (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
+     */
+    public static void changeSessionId(HttpServletRequest h) {
+        HttpSession session = h.getSession(false);
+        HashMap<String, Object> sessionAttributes = new HashMap<String,Object>();
+        for(Enumeration<String> e = session.getAttributeNames();e.hasMoreElements();) {
+        	String name = e.nextElement();
+        	sessionAttributes.put(name, session.getAttribute(name));
+        }
+        h.getSession().invalidate();
+        session = h.getSession(true);
+        for(Entry<String, Object> entry: sessionAttributes.entrySet()) {
+        	session.setAttribute(entry.getKey(), entry.getValue());
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java b/src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java
index e147f5fed0b..345a2d3cccc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java
@@ -1,22 +1,22 @@
 package edu.harvard.iq.dataverse.util;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.Date;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipException;
+import java.util.stream.Collectors;
+import java.util.zip.ZipFile;
 import java.util.HashMap;
 import java.util.*;
 
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-import java.util.logging.Level;
+
 import java.util.logging.Logger;
 import org.apache.commons.io.FileUtils;
 
@@ -42,11 +42,10 @@
  *                                  "shape1.pdf", "README.md", "shape_notes.txt"
  * 
  *  Code Example:  
- *          FileInputStream shp_file_input_stream = new FileInputStream(new File("zipped_shapefile.zip"))
- *          ShapefileHandler shp_handler = new ShapefileHandler(shp_file_input_stream);
+ *          ShapefileHandler shp_handler = new ShapefileHandler(new File("zipped_shapefile.zip"));
  *          if (shp_handler.containsShapefile()){
  *              File rezip_folder = new File("~/folder_for_rezipping");
- *              boolean rezip_success = shp_handler.rezipShapefileSets(shp_file_input_stream, rezip_folder );
+ *              boolean rezip_success = shp_handler.rezipShapefileSets(rezip_folder );
  *              if (!rezip_success){
  *                  // rezip failed, should be an error message (String) available
                     System.out.println(shp_handler.error_message);
@@ -67,13 +66,13 @@ public class ShapefileHandler{
     private static final Logger logger = Logger.getLogger(ShapefileHandler.class.getCanonicalName());
 
     // Reference for these extensions: http://en.wikipedia.org/wiki/Shapefile
-    public final static String SHAPEFILE_FILE_TYPE = "application/zipped-shapefile";
-    public final static String SHAPEFILE_FILE_TYPE_FRIENDLY_NAME = "Shapefile as ZIP Archive";
-    public final static List<String> SHAPEFILE_MANDATORY_EXTENSIONS = Arrays.asList("shp", "shx", "dbf", "prj");
-    public final static String SHP_XML_EXTENSION = "shp.xml";
-    public final static String BLANK_EXTENSION = "__PLACEHOLDER-FOR-BLANK-EXTENSION__";
-    public final static List<String> SHAPEFILE_ALL_EXTENSIONS = Arrays.asList("shp", "shx", "dbf", "prj", "sbn", "sbx", "fbn", "fbx", "ain", "aih", "ixs", "mxs", "atx", "cpg", SHP_XML_EXTENSION);  
-    
+    public static final String SHAPEFILE_FILE_TYPE = "application/zipped-shapefile";
+    public static final String SHAPEFILE_FILE_TYPE_FRIENDLY_NAME = "Shapefile as ZIP Archive";
+    public static final List<String> SHAPEFILE_MANDATORY_EXTENSIONS = Arrays.asList("shp", "shx", "dbf", "prj");
+    public static final String SHP_XML_EXTENSION = "shp.xml";
+    public static final String BLANK_EXTENSION = "__PLACEHOLDER-FOR-BLANK-EXTENSION__";
+    public static final List<String> SHAPEFILE_ALL_EXTENSIONS = Arrays.asList("shp", "shx", "dbf", "prj", "sbn", "sbx", "fbn", "fbx", "ain", "aih", "ixs", "mxs", "atx", "cpg", "qpj", "qmd", SHP_XML_EXTENSION);
+    private final File zipFile;
     public boolean DEBUG = false;
         
     private boolean zipFileProcessed = false;
@@ -96,9 +95,6 @@ public class ShapefileHandler{
     private Map<String, List<String>> fileGroups = new HashMap<>();
     
     private List<File> finalRezippedFiles = new ArrayList<>();
-    
-    private String outputFolder = "unzipped";
-    private String rezippedFolder = "rezipped";
 
     // Debug helper
     private void msg(String s){
@@ -115,40 +111,28 @@ private void msgt(String s){
     }
 
     /*
-        Constructor, start with filename
-    */
-    public ShapefileHandler(String filename){
-
-        if (filename==null){
-            this.addErrorMessage("The filename was null");
-            return;
-        }
-        
-        FileInputStream zip_file_stream;
-        try {
-            zip_file_stream = new FileInputStream(new File(filename));
-        } catch (FileNotFoundException ex) {
-            this.addErrorMessage("The file was not found");
+         Constructor, start with File
+     */
+    public ShapefileHandler(File zip_file) throws IOException {
+        zipFile = zip_file;
+        if (zip_file == null) {
+            this.addErrorMessage("The file was null");
             return;
         }
-        
-       this.examineZipfile(zip_file_stream);
-
-    }
 
-   
-   /*
-        Constructor, start with FileInputStream
-    */
-   public ShapefileHandler(FileInputStream zip_file_stream){
-
-        if (zip_file_stream==null){
-            this.addErrorMessage("The zip_file_stream was null");
-            return;
+        try (var zip_file_object = new ZipFile(zip_file)) {
+            this.examineZipfile(zip_file_object);
+        }
+        catch (FileNotFoundException ex) {
+            // While this constructor had a FileInputStream as argument:
+            //  FileUtil.determineFileType threw this exception before calling the constructor with a FileInputStream
+            //  IngestServiceShapefileHelper.processFile won´t call this constructor if the file is not valid hence does not exist.
+            //  When the file would have disappeared in the meantime, it would have produced a slightly different error message.
+            logger.severe("File not found: " + zip_file.getAbsolutePath());
+            throw ex;
         }
-        this.examineZipfile(zip_file_stream);
     }
-    
+
     public List<File> getFinalRezippedFiles(){
         return this.finalRezippedFiles;
     }
@@ -273,35 +257,39 @@ private String getFileBasename(String fileName){
         }
         return unzipFileName;
     }
-    /*
-        Unzip the files to the directory, FLATTENING the directory structure
-        
-        Any colliding names will result  in overwrites
     
+    private String getFolderName(String fileName){
+        if (fileName==null){
+            return null;
+        }
+        return new File(fileName).getParent(); 
+    }
+    /*
+        We used to unzip the files to the directory, FLATTENING the directory structure
+        Any colliding names would result  in overwrites
+        HOWEVER, starting with v5.1, we are now preserving the folder structure
+        inside the uploaded zip file (issue #6873). To achieve this, we recreate 
+        all the folders as they appear in the original zip archive, and as we 
+        rezip any found shape file sets. The FileUtil then preserve any such
+        subfolders in the FileMetadata of the newly created DataFiles. 
+        (-- L.A. 09/2020) 
     */
-    private boolean unzipFilesToDirectory(FileInputStream zipfile_input_stream, File target_directory){
-        //logger.info("unzipFilesToDirectory: " + target_directory.getAbsolutePath() );
+    private boolean unzipFilesToDirectory(ZipFile zipfileInput, File target_directory){
+        logger.fine("unzipFilesToDirectory: " + target_directory.getAbsolutePath() );
 
-        if (zipfile_input_stream== null){
-            this.addErrorMessage("unzipFilesToDirectory. The zipfile_input_stream is null.");
-            return false;
-        }
         if (!target_directory.isDirectory()){
              this.addErrorMessage("This directory does not exist: " + target_directory.getAbsolutePath());
             return false;
         }
 
-       List<String> unzippedFileNames = new ArrayList<>(); 
-       
-       ZipInputStream zipStream = new ZipInputStream(zipfile_input_stream);
+       List<String> unzippedFileNames = new ArrayList<>();
+
 
-       ZipEntry origEntry;
-        byte[] buffer = new byte[2048];
         try {
-            while((origEntry = zipStream.getNextEntry())!=null){
+            for(var origEntry : Collections.list(zipfileInput.entries())){
                 
                 String zentryFileName = origEntry.getName();
-                //logger.info("\nOriginal entry name: " + origEntry);
+                logger.fine("\nOriginal entry name: " + origEntry);
                 
                  if (this.isFileToSkip(zentryFileName)){
                     logger.fine("Skip file");
@@ -312,20 +300,35 @@ private boolean unzipFilesToDirectory(FileInputStream zipfile_input_stream, File
                 if (origEntry.isDirectory()) {
                     //logger.info("Subdirectory found!");
                     logger.fine("Skip directory");
-                    //String dirpath = target_directory.getAbsolutePath() + "/" + zentryFileName;
-                    //createDirectory(dirpath);
+                    String dirpath = target_directory.getAbsolutePath() + "/" + zentryFileName;
+                    createDirectory(dirpath);
                     continue;           // Continue to next Entry
                 }
                 logger.fine("file found!");
                 
                 // Write the file
                 String unzipFileName = this.getFileBasename(zentryFileName);
+                String unzipFolderName = this.getFolderName(zentryFileName);
+                
+                String unzipFilePath = unzipFileName; 
+                if (unzipFolderName != null) {
+                    unzipFilePath = unzipFolderName + "/" + unzipFileName;
+                    
+                    // There's a chance we haven't created this folder yet 
+                    // in the destination directory (this happens if the folder 
+                    // is not explicitly listed in the Zip archive directory). 
+                    String dirpath = target_directory.getAbsolutePath() + "/" + unzipFolderName;
+                    // (and if it already exists, it'll be skipped)
+                    createDirectory(dirpath);
+                }
+                
                 if (unzipFileName==null){
                     logger.warning("Zip Entry Basename is an empty string: " + zentryFileName);
                     continue;
                 }
                 
-                String outpath = target_directory.getAbsolutePath() + "/" + unzipFileName;
+                //String outpath = target_directory.getAbsolutePath() + "/" + unzipFileName;
+                String outpath = target_directory.getAbsolutePath() + "/" + unzipFilePath;
                 if (unzippedFileNames.contains(outpath)){
                    logger.info("Potential name collision.  Avoiding duplicate files in 'collapsed' zip directories. Skipping file: " + zentryFileName);
                    continue;
@@ -333,15 +336,10 @@ private boolean unzipFilesToDirectory(FileInputStream zipfile_input_stream, File
                     unzippedFileNames.add(outpath);
                 }
                 logger.fine("Write zip file: " + outpath);
-                FileOutputStream fileOutputStream;
-                long fsize = 0;
-                fileOutputStream = new FileOutputStream(outpath);
-                int len;// = 0;
-                while ((len = zipStream.read(buffer)) > 0){
-                    fileOutputStream.write(buffer, 0, len);
-                    fsize+=len;
-                } // end while
-                fileOutputStream.close();
+                try(var inputStream = zipfileInput.getInputStream(origEntry)) {
+                    Files.createDirectories(new File(outpath).getParentFile().toPath());
+                    Files.copy(inputStream, Path.of(outpath), StandardCopyOption.REPLACE_EXISTING);
+                }
             } // end outer while
         } catch (IOException ex) {
             for (StackTraceElement el : ex.getStackTrace()){
@@ -350,19 +348,13 @@ private boolean unzipFilesToDirectory(FileInputStream zipfile_input_stream, File
             this.addErrorMessage("Failed to open ZipInputStream entry" +  ex.getMessage());
             return false;
         }
-
-        try {
-             zipStream.close();
-        } catch (IOException ex) {
-             Logger.getLogger(ShapefileHandler.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    return true;
+        return true;
     }
     /*
         Rezip the shapefile(s) into a given directory
         Assumes that the zipfile_input_stream has already been checked!
     */
-    public boolean rezipShapefileSets(FileInputStream zipfile_input_stream, File rezippedFolder) throws IOException{
+    public boolean rezipShapefileSets(File rezippedFolder) throws IOException{
         logger.fine("rezipShapefileSets");
         //msgt("rezipShapefileSets");
         if (!this.zipFileProcessed){
@@ -373,10 +365,6 @@ public boolean rezipShapefileSets(FileInputStream zipfile_input_stream, File rez
              this.addErrorMessage("There are no shapefiles here!");
             return false;
         }
-        if (zipfile_input_stream== null){
-            this.addErrorMessage("The zipfile_input_stream is null.");
-            return false;
-        }
         if (rezippedFolder == null){
             this.addErrorMessage("The rezippedFolder is null.");
             return false;
@@ -406,9 +394,11 @@ public boolean rezipShapefileSets(FileInputStream zipfile_input_stream, File rez
         
         
         // Unzip files!
-        if (!this.unzipFilesToDirectory(zipfile_input_stream, dir_for_unzipping)){
-            this.addErrorMessage("Failed to unzip files.");
-            return false;
+        try(var zipfileObject = new ZipFile(zipFile)) {
+            if (!this.unzipFilesToDirectory(zipfileObject, dir_for_unzipping)) {
+                this.addErrorMessage("Failed to unzip files.");
+                return false;
+            }
         }
         // Redistribute files!
         String target_dirname = rezippedFolder.getAbsolutePath();
@@ -493,6 +483,8 @@ private boolean redistributeFilesFromZip(String source_dirname, String target_di
                 //this.msg("source_dirname: "+ source_dirname);
                 
                 //msgt("create zipped shapefile");
+                // Make sure the parent folder(s) are there:
+                createDirectory(new File(target_zipfile_name).getParentFile());
                 ZipMaker zip_maker = new ZipMaker(namesToZip, source_dirname, target_zipfile_name);
                 this.addFinalRezippedFile(target_zipfile_name);
 
@@ -526,6 +518,11 @@ private boolean straightFileCopy(String sourceFileName, String targetFileName){
         
         File source_file = new File(sourceFileName);
         File target_file = new File(targetFileName);
+        
+        if (target_file.getParentFile() != null) {
+            // Make sure the parent folder(s) are there:
+            createDirectory(target_file.getParentFile());
+        }
         try {
             Files.copy(source_file.toPath(), target_file.toPath(), REPLACE_EXISTING);    
         } catch (IOException ex) {
@@ -565,7 +562,7 @@ private boolean isShapefileExtension(String ext_name){
         if (ext_name == null){
             return false;
         }
-        return SHAPEFILE_ALL_EXTENSIONS.contains(ext_name);
+        return SHAPEFILE_ALL_EXTENSIONS.contains(ext_name.toLowerCase());
     }
     /*
         Does a list of file extensions match those required for a shapefile set?
@@ -574,7 +571,10 @@ private boolean doesListContainShapefileExtensions(List<String> ext_list){
         if (ext_list == null){
             return false;
         }
-        return ext_list.containsAll(SHAPEFILE_MANDATORY_EXTENSIONS);
+        var lowerCaseExtensions = ext_list.stream()
+            .map(String::toLowerCase)
+            .toList();
+        return lowerCaseExtensions.containsAll(SHAPEFILE_MANDATORY_EXTENSIONS);
     }
     
     
@@ -647,60 +647,65 @@ private boolean isFileToSkip(String fname){
     /**************************************
      * Iterate through the zip file contents.
      * Does it contain any shapefiles?
-     *
-     * @param FileInputStream zip_file_stream
      */
-    private boolean examineZipfile(FileInputStream zip_file_stream){
+    private boolean examineZipfile(ZipFile zip_file){
        // msgt("examineZipfile");
-        
-        if (zip_file_stream==null){
-               this.addErrorMessage("The zip file stream was null");
-               return false;
-           }
-        
+
        // Clear out file lists
        this.filesListInDir.clear();
        this.filesizeHash.clear();
        this.fileGroups.clear();
-       
-       try{
-            ZipInputStream zipStream = new ZipInputStream(zip_file_stream);
-            ZipEntry entry;
-            
-            while((entry = zipStream.getNextEntry())!=null){
 
-                 String zentryFileName = entry.getName();
-                 //msg("zip entry: " + entry.getName());
-                 // Skip files or folders starting with __
-                 if (this.isFileToSkip(zentryFileName)){
-                     continue;
-                 }
+       try{
+           List<String> hiddenDirectories = new ArrayList<>();
+           for(var entry : Collections.list(zip_file.entries())){
+
+                String zentryFileName = entry.getName();
+                boolean isDirectory = entry.isDirectory();
+
+                Boolean skip = isDirectory || this.isFileToSkip(zentryFileName);
+
+                // check if path is hidden
+                if (isDirectory && Files.isHidden(Paths.get(zentryFileName))) {
+                    hiddenDirectories.add(zentryFileName);
+                    logger.fine("Ignoring files under hidden directory: " + zentryFileName);
+                } else {
+                    // check if the path was already found to be hidden
+                    for (String hidden : hiddenDirectories) {
+                        if (zentryFileName.startsWith(hidden)) {
+                            skip = true;
+                            break;
+                        }
+                    }
+                }
 
-                if (entry.isDirectory()) {
-                   //String dirpath = outputFolder + "/" + zentryFileName;
-                   //createDirectory(dirpath);
-                   continue;       
+                if (skip) {
+                    continue;
                 }
-                
+
                 String unzipFileName = this.getFileBasename(zentryFileName);
                 if (unzipFileName==null){
                     logger.warning("Zip Entry Basename is an empty string: " + zentryFileName);
                     continue;
                 }
+                String unzipFolderName = this.getFolderName(zentryFileName);
+
+                String unzipFilePath = unzipFileName; 
+                if (unzipFolderName != null) {
+                    unzipFilePath = unzipFolderName + "/" + unzipFileName; 
+                }
 
                 
                 String s = String.format("Entry: %s len %d added %TD",
-                                   unzipFileName, entry.getSize(),
+                                   unzipFilePath, entry.getSize(),
                                    new Date(entry.getTime()));
 
                 if (!this.filesListInDir.contains(s)){                   
                     this.filesListInDir.add(s);
-                    updateFileGroupHash(unzipFileName);
-                    this.filesizeHash.put(unzipFileName, entry.getSize());
+                    updateFileGroupHash(unzipFilePath);
+                    this.filesizeHash.put(unzipFilePath, entry.getSize());
                 }
            } // end while
-           
-           zipStream.close();
 
            if (this.filesListInDir.isEmpty()){
                errorMessage = "No files in zipStream";
@@ -710,13 +715,8 @@ private boolean examineZipfile(FileInputStream zip_file_stream){
            this.zipFileProcessed = true;
            return true;
 
-       }catch(ZipException ex){
-               this.addErrorMessage("ZipException");
-               msgt("ZipException");
-               return false;
-
        }catch(IOException ex){
-           //ex.printStackTrace(); 
+           //ex.printStackTrace();
            this.addErrorMessage("IOException File name");
            msgt("IOException");
            return false;
@@ -724,9 +724,6 @@ private boolean examineZipfile(FileInputStream zip_file_stream){
            this.addErrorMessage("IllegalArgumentException when parsing zipfile");
            msgt("IllegalArgumentException when parsing zipfile");
            return false;
-           
-       }finally{
-           
        }
 
    } // end examineFile
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SignpostingResources.java b/src/main/java/edu/harvard/iq/dataverse/util/SignpostingResources.java
new file mode 100644
index 00000000000..8bebcf4d438
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/SignpostingResources.java
@@ -0,0 +1,303 @@
+package edu.harvard.iq.dataverse.util;
+
+/**
+  Eko Indarto, DANS
+  Vic Ding, DANS
+
+  This file prepares the resources used in Signposting
+
+  Two configurable options allow changing the limit for the number of authors or datafiles (items) allowed in the level-1 header.
+  If more than this number exists, no entries of that type are included in the level-1 header.
+  See the documentation for the dataverse.signposting.level1-author-limit, and dataverse.signposting.level1-item-limit
+
+  Also note that per the signposting spec, authors for which no PID/URL has been provided are not included in the signposting output.
+  
+ */
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
+import edu.harvard.iq.dataverse.export.ExportService;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import org.apache.commons.validator.routines.UrlValidator;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.logging.Logger;
+
+import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
+import io.gdcc.spi.export.ExportException;
+import io.gdcc.spi.export.Exporter;
+
+public class SignpostingResources {
+    private static final Logger logger = Logger.getLogger(SignpostingResources.class.getCanonicalName());
+    SystemConfig systemConfig;
+    DatasetVersion workingDatasetVersion;
+    static final String defaultFileTypeValue = "https://schema.org/Dataset";
+    static final int defaultMaxLinks = 5;
+    int maxAuthors;
+    int maxItems;
+
+    public SignpostingResources(SystemConfig systemConfig, DatasetVersion workingDatasetVersion, String authorLimitSetting, String itemLimitSetting) {
+        this.systemConfig = systemConfig;
+        this.workingDatasetVersion = workingDatasetVersion;
+        maxAuthors = SystemConfig.getIntLimitFromStringOrDefault(authorLimitSetting, defaultMaxLinks);
+        maxItems = SystemConfig.getIntLimitFromStringOrDefault(itemLimitSetting, defaultMaxLinks);
+    }
+
+
+    /**
+     * Get key, values of signposting items and return as string
+     *
+     * @return comma delimited string
+     */
+    public String getLinks() {
+        List<String> valueList = new LinkedList<>();
+        Dataset ds = workingDatasetVersion.getDataset();
+
+        String identifierSchema = getAuthorsAsString(getAuthorURLs(true));
+        if (identifierSchema != null && !identifierSchema.isEmpty()) {
+            valueList.add(identifierSchema);
+        }
+
+        if (!Objects.equals(ds.getPersistentURL(), "")) {
+            String citeAs = "<" + ds.getPersistentURL() + ">;rel=\"cite-as\"";
+            valueList.add(citeAs);
+        }
+
+        List<FileMetadata> fms = workingDatasetVersion.getFileMetadatas();
+        String items = getItems(fms);
+        if (items != null && !Objects.equals(items, "")) {
+            valueList.add(items);
+        }
+
+        String describedby = "<" + ds.getGlobalId().asURL().toString() + ">;rel=\"describedby\"" + ";type=\"" + "application/vnd.citationstyles.csl+json\"";
+        ExportService instance = ExportService.getInstance();
+        for (String[] labels : instance.getExportersLabels()) {
+            String formatName = labels[1];
+            Exporter exporter;
+            try {
+                exporter = ExportService.getInstance().getExporter(formatName);
+                describedby += ",<" + getExporterUrl(formatName, ds) + ">;rel=\"describedby\"" + ";type=\"" + exporter.getMediaType() + "\"";
+            } catch (ExportException ex) {
+                logger.warning("Could not look up exporter based on " + formatName + ". Exception: " + ex);
+            }
+        }
+        valueList.add(describedby);
+
+        String type = "<https://schema.org/AboutPage>;rel=\"type\"";
+        type = "<https://schema.org/AboutPage>;rel=\"type\",<" + defaultFileTypeValue + ">;rel=\"type\"";
+        valueList.add(type);
+
+        String licenseString = "<" + DatasetUtil.getLicenseURI(workingDatasetVersion) + ">;rel=\"license\"";
+        valueList.add(licenseString);
+
+        String linkset = "<" + systemConfig.getDataverseSiteUrl() + "/api/datasets/:persistentId/versions/"
+                + workingDatasetVersion.getVersionNumber() + "." + workingDatasetVersion.getMinorVersionNumber()
+                + "/linkset?persistentId=" + ds.getGlobalId().asString() + "> ; rel=\"linkset\";type=\"application/linkset+json\"";
+        valueList.add(linkset);
+        logger.fine(String.format("valueList is: %s", valueList));
+
+        return String.join(", ", valueList);
+    }
+
+    public JsonArrayBuilder getJsonLinkset() {
+        Dataset ds = workingDatasetVersion.getDataset();
+        GlobalId gid = ds.getGlobalId();
+        String landingPage = systemConfig.getDataverseSiteUrl() + "/dataset.xhtml?persistentId=" + ds.getGlobalId().asString();
+        JsonArrayBuilder authors = getJsonAuthors(getAuthorURLs(false));
+        JsonArrayBuilder items = getJsonItems();
+
+        String licenseString = DatasetUtil.getLicenseURI(workingDatasetVersion);
+
+        JsonArrayBuilder mediaTypes = Json.createArrayBuilder();
+        mediaTypes.add(
+                jsonObjectBuilder().add(
+                        "href",
+                        gid.asURL().toString()
+                ).add(
+                        "type",
+                        "application/vnd.citationstyles.csl+json"
+                )
+        );
+
+        ExportService instance = ExportService.getInstance();
+        for (String[] labels : instance.getExportersLabels()) {
+            String formatName = labels[1];
+            Exporter exporter;
+            try {
+                exporter = ExportService.getInstance().getExporter(formatName);
+                mediaTypes.add(
+                        jsonObjectBuilder().add(
+                                "href", getExporterUrl(formatName, ds)
+                        ).add(
+                                "type",
+                                exporter.getMediaType()
+                        )
+                );
+            } catch (ExportException ex) {
+                logger.warning("Could not look up exporter based on " + formatName + ". Exception: " + ex);
+            }
+        }
+        JsonArrayBuilder linksetJsonObj = Json.createArrayBuilder();
+
+        JsonObjectBuilder mandatory;
+        mandatory = jsonObjectBuilder().add("anchor", landingPage)
+                .add("cite-as", Json.createArrayBuilder().add(jsonObjectBuilder().add("href", ds.getPersistentURL())))
+                .add("type",
+                        Json.createArrayBuilder().add(jsonObjectBuilder().add("href", "https://schema.org/AboutPage"))
+                                .add(jsonObjectBuilder().add("href", defaultFileTypeValue)));
+
+        if (authors != null) {
+            mandatory.add("author", authors);
+        }
+        if (licenseString != null && !licenseString.isBlank()) {
+            mandatory.add("license", jsonObjectBuilder().add("href", licenseString));
+        }
+        if (!mediaTypes.toString().isBlank()) {
+            mandatory.add("describedby", mediaTypes);
+        }
+        if (items != null) {
+            mandatory.add("item", items);
+        }
+        linksetJsonObj.add(mandatory);
+
+        // remove scholarly type as shown already on landing page
+        for (FileMetadata fm : workingDatasetVersion.getFileMetadatas()) {
+            DataFile df = fm.getDataFile();
+            JsonObjectBuilder itemAnchor = jsonObjectBuilder().add("anchor", getPublicDownloadUrl(df));
+            itemAnchor.add("collection", Json.createArrayBuilder().add(jsonObjectBuilder()
+                    .add("href", landingPage)));
+            linksetJsonObj.add(itemAnchor);
+        }
+
+        return linksetJsonObj;
+    }
+
+    /*Method retrieves all the authors of a DatasetVersion with a valid URL and puts them in a list
+     * @param limit - if true, will return an empty list (for level 1) if more than maxAuthor authors with URLs are found 
+     */
+    private List<String> getAuthorURLs(boolean limit) {
+        List<String> authorURLs = new ArrayList<String>(maxAuthors);
+        int visibleAuthorCounter = 0;
+
+        for (DatasetAuthor da : workingDatasetVersion.getDatasetAuthors()) {
+            logger.fine(String.format("idtype: %s; idvalue: %s, affiliation: %s; identifierUrl: %s", da.getIdType(),
+                    da.getIdValue(), da.getAffiliation(), da.getIdentifierAsUrl()));
+            String authorURL = getAuthorUrl(da);
+            if (authorURL != null && !authorURL.isBlank()) {
+                // return empty if number of visible author more than max allowed
+                // >= since we're comparing before incrementing visibleAuthorCounter
+                if (limit && visibleAuthorCounter >= maxAuthors) {
+                    authorURLs.clear();
+                    break;
+                }
+                authorURLs.add(authorURL);
+                visibleAuthorCounter++;
+                
+
+            }
+        }
+        return authorURLs;
+    }
+
+
+    /**
+     * Get Authors as string
+     * For example:
+     * if author has VIAF
+     * Link: <http://viaf.org/viaf/:id/>; rel="author"
+     *
+     * @param datasetAuthorURLs list of all DatasetAuthors with a valid URL
+     * @return all the author links in a string
+     */
+    private String getAuthorsAsString(List<String> datasetAuthorURLs) {
+        String singleAuthorString;
+        String identifierSchema = null;
+        for (String authorURL : datasetAuthorURLs) {
+                singleAuthorString = "<" + authorURL + ">;rel=\"author\"";
+                if (identifierSchema == null) {
+                    identifierSchema = singleAuthorString;
+                } else {
+                    identifierSchema = String.join(",", identifierSchema, singleAuthorString);
+                }
+        }
+        logger.fine(String.format("identifierSchema: %s", identifierSchema));
+        return identifierSchema;
+    }
+
+    /* 
+     * 
+     */
+    private String getAuthorUrl(DatasetAuthor da) {
+
+        final String identifierAsUrl = da.getIdentifierAsUrl();
+        // First, try to get URL using the type and value
+        if(identifierAsUrl != null) {
+            return identifierAsUrl;
+        }
+
+        final String idValue = da.getIdValue();
+        UrlValidator urlValidator = new UrlValidator(new String[]{"http", "https"});
+        // Otherwise, try to use idValue as url if it's valid
+        if(urlValidator.isValid(idValue)) {
+            return idValue;
+        }
+
+        // No url found
+        return null;
+    }
+
+    private JsonArrayBuilder getJsonAuthors(List<String> datasetAuthorURLs) {
+        if(datasetAuthorURLs.isEmpty()) {
+            return null;
+        }
+        JsonArrayBuilder authors = Json.createArrayBuilder();
+        for (String authorURL : datasetAuthorURLs) {
+                authors.add(jsonObjectBuilder().add("href", authorURL));
+        }
+        return authors;
+    }
+
+    private String getItems(List<FileMetadata> fms) {
+        if (fms.size() > maxItems) {
+            logger.fine(String.format("maxItem is %s and fms size is %s", maxItems, fms.size()));
+            return null;
+        }
+
+        String itemString = null;
+        for (FileMetadata fm : fms) {
+            DataFile df = fm.getDataFile();
+            if (itemString == null) {
+                itemString = "<" + getPublicDownloadUrl(df) + ">;rel=\"item\";type=\"" + df.getContentType() + "\"";
+            } else {
+                itemString = String.join(",", itemString, "<" + getPublicDownloadUrl(df) + ">;rel=\"item\";type=\"" + df.getContentType() + "\"");
+            }
+        }
+        return itemString;
+    }
+
+    private JsonArrayBuilder getJsonItems() {
+        JsonArrayBuilder items = Json.createArrayBuilder();
+        for (FileMetadata fm : workingDatasetVersion.getFileMetadatas()) {
+            DataFile df = fm.getDataFile();
+            items.add(jsonObjectBuilder().add("href", getPublicDownloadUrl(df)).add("type", df.getContentType()));
+        }
+
+        return items;
+    }
+    
+    private String getPublicDownloadUrl(DataFile dataFile) {
+        GlobalId gid = dataFile.getGlobalId();
+        return FileUtil.getPublicDownloadUrl(systemConfig.getDataverseSiteUrl(),
+                ((gid != null) ? gid.asString() : null), dataFile.getId());
+    }
+
+    private String getExporterUrl(String formatName, Dataset ds) {
+        return systemConfig.getDataverseSiteUrl()
+                + "/api/datasets/export?exporter=" + formatName + "&persistentId=" + ds.getGlobalId().asString();
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/StringUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/StringUtil.java
index 33032e46268..56f85436773 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/StringUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/StringUtil.java
@@ -1,12 +1,17 @@
 package edu.harvard.iq.dataverse.util;
 
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2LoginBackingBean;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.nio.ByteBuffer;
+import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.spec.AlgorithmParameterSpec;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -14,14 +19,14 @@
 import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import org.apache.xerces.impl.dv.util.Base64;
+
+import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 
 /**
@@ -117,6 +122,10 @@ public static List<String> htmlArray2textArray(List<String> htmlArray) {
         return cleanTextArray;
     }
     
+    private final static SecureRandom secureRandom = new SecureRandom();
+    // 12 bytes is recommended by GCM spec
+    private final static int GCM_IV_LENGTH = 12;
+
     /**
      * Generates an AES-encrypted version of the string. Resultant string is URL safe.
      * @param value The value to encrypt.
@@ -124,19 +133,26 @@ public static List<String> htmlArray2textArray(List<String> htmlArray) {
      * @return encrypted string, URL-safe.
      */
     public static String encrypt(String value, String password ) {
+
         byte[] baseBytes = value.getBytes();
         try {
-            Cipher aes = Cipher.getInstance("AES");
+            byte[] iv = new byte[GCM_IV_LENGTH]; //NEVER REUSE THIS IV WITH SAME KEY
+            secureRandom.nextBytes(iv);
+            Cipher aes = Cipher.getInstance("AES/GCM/NoPadding");
             final SecretKeySpec secretKeySpec = generateKeyFromString(password);
-            aes.init(Cipher.ENCRYPT_MODE, secretKeySpec);
+            GCMParameterSpec parameterSpec = new GCMParameterSpec(128, iv); 
+            aes.init(Cipher.ENCRYPT_MODE, secretKeySpec, parameterSpec);
             byte[] encrypted = aes.doFinal(baseBytes);
-            String base64ed = Base64.encode(encrypted);
+            ByteBuffer byteBuffer = ByteBuffer.allocate(iv.length + encrypted.length);
+            byteBuffer.put(iv);
+            byteBuffer.put(encrypted);
+            String base64ed = new String(Base64.getEncoder().encode(byteBuffer.array()));
             return base64ed.replaceAll("\\+", ".")
                     .replaceAll("=", "-")
                     .replaceAll("/", "_");
             
         } catch (  InvalidKeyException | NoSuchAlgorithmException | BadPaddingException
-                  | IllegalBlockSizeException | NoSuchPaddingException | UnsupportedEncodingException ex) {
+                  | IllegalBlockSizeException | NoSuchPaddingException | InvalidAlgorithmParameterException ex) {
             Logger.getLogger(OAuth2LoginBackingBean.class.getName()).log(Level.SEVERE, null, ex);
             throw new RuntimeException(ex);
         }
@@ -147,15 +163,17 @@ public static String decrypt(String value, String password ) {
                     .replaceAll("-", "=")
                     .replaceAll("_", "/");
         
-        byte[] baseBytes = Base64.decode(base64);
+        byte[] baseBytes = Base64.getDecoder().decode(base64);
         try {
-            Cipher aes = Cipher.getInstance("AES");
-            aes.init( Cipher.DECRYPT_MODE, generateKeyFromString(password));
-            byte[] decrypted = aes.doFinal(baseBytes);
+            Cipher aes = Cipher.getInstance("AES/GCM/NoPadding");
+            //use first 12 bytes for iv
+            AlgorithmParameterSpec gcmIv = new GCMParameterSpec(128, baseBytes, 0, GCM_IV_LENGTH);
+            aes.init( Cipher.DECRYPT_MODE, generateKeyFromString(password),gcmIv);
+            byte[] decrypted = aes.doFinal(baseBytes,GCM_IV_LENGTH, baseBytes.length - GCM_IV_LENGTH);
             return new String(decrypted);
             
         } catch ( InvalidKeyException | NoSuchAlgorithmException | BadPaddingException
-                  | IllegalBlockSizeException | NoSuchPaddingException | UnsupportedEncodingException ex) {
+                  | IllegalBlockSizeException | NoSuchPaddingException | InvalidAlgorithmParameterException ex) {
             Logger.getLogger(OAuth2LoginBackingBean.class.getName()).log(Level.SEVERE, null, ex);
             throw new RuntimeException(ex);
         }
@@ -191,8 +209,8 @@ public static String sanitizeFileDirectory(String value, boolean aggressively){
     }
     
     
-    private static SecretKeySpec generateKeyFromString(final String secKey) throws UnsupportedEncodingException, NoSuchAlgorithmException {
-        byte[] key = (secKey).getBytes("UTF-8");
+    private static SecretKeySpec generateKeyFromString(final String secKey) throws NoSuchAlgorithmException {
+        byte[] key = (secKey).getBytes(StandardCharsets.UTF_8);
         MessageDigest sha = MessageDigest.getInstance("SHA-1");
         key = sha.digest(key);
         key = Arrays.copyOf(key, 16); // use only first 128 bits
@@ -200,4 +218,23 @@ private static SecretKeySpec generateKeyFromString(final String secKey) throws U
         SecretKeySpec secretKeySpec = new SecretKeySpec(key, "AES");
         return secretKeySpec;
     }
+    
+    /**
+     * Normalize sentence
+     * 
+     * @author francesco.cadili@4science.it
+     *
+     *
+     * @param sentence full name or organization name
+     * @return normalize string value
+     */
+    static public String normalize(String sentence) {
+        if (StringUtils.isBlank(sentence)) {
+            return "";
+        }
+
+        sentence = sentence.trim().replaceAll(", *", ", ").replaceAll(" +", " ");
+
+        return sentence;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SumStatCalculator.java b/src/main/java/edu/harvard/iq/dataverse/util/SumStatCalculator.java
index ee37bd51206..545f2937f70 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/SumStatCalculator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/SumStatCalculator.java
@@ -19,13 +19,13 @@
 */
 
 package edu.harvard.iq.dataverse.util;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.commons.lang.*;
-import org.apache.commons.math.stat.*;
-//import cern.colt.list.*;
-//import cern.jet.stat.Descriptive;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.math.stat.StatUtils;
 
 
 /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
index b8836060069..69f9262ab5b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
@@ -2,30 +2,41 @@
 
 import com.ocpsoft.pretty.PrettyContext;
 import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.DvObjectContainer;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
-import static edu.harvard.iq.dataverse.datasetutility.FileSizeChecker.bytesToHumanReadable;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.validation.PasswordValidatorUtil;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import org.passay.CharacterRule;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import java.io.StringReader;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.time.Year;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.MissingResourceException;
-import java.util.Properties;
+import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import org.passay.CharacterRule;
-import org.apache.commons.io.IOUtils;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * System-wide configuration
@@ -47,196 +58,97 @@ public class SystemConfig {
     
    public static final String DATAVERSE_PATH = "/dataverse/";
 
-    /**
-     * A JVM option for the advertised fully qualified domain name (hostname) of
-     * the Dataverse installation, such as "dataverse.example.com", which may
-     * differ from the hostname that the server knows itself as.
-     *
-     * The equivalent in DVN 3.x was "dvn.inetAddress".
-     */
-    public static final String FQDN = "dataverse.fqdn";
-    
-    /**
-     * A JVM option for specifying the "official" URL of the site.
-     * Unlike the FQDN option above, this would be a complete URL, 
-     * with the protocol, port number etc. 
-     */
-    public static final String SITE_URL = "dataverse.siteUrl";
-
-    /**
-     * A JVM option for where files are stored on the file system.
-     */
-    public static final String FILES_DIRECTORY = "dataverse.files.directory";
-
-    /**
-     * Some installations may not want download URLs to their files to be
-     * available in Schema.org JSON-LD output.
-     */
-    public static final String FILES_HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS = "dataverse.files.hide-schema-dot-org-download-urls";
-
     /**
      * A JVM option to override the number of minutes for which a password reset
-     * token is valid ({@link #minutesUntilPasswordResetTokenExpires}).
+     * token is valid ({@link #getMinutesUntilPasswordResetTokenExpires}).
      */
     private static final String PASSWORD_RESET_TIMEOUT_IN_MINUTES = "dataverse.auth.password-reset-timeout-in-minutes";
 
-    /**
-     * A common place to find the String for a sane Solr hostname:port
-     * combination.
-     */
-    private String saneDefaultForSolrHostColonPort = "localhost:8983";
-
     /**
      * The default number of datafiles that we allow to be created through 
      * zip file upload.
      */
     private static final int defaultZipUploadFilesLimit = 1000; 
+    public static final long defaultZipDownloadLimit = 104857600L; // 100MB
     private static final int defaultMultipleUploadFilesLimit = 1000;
     private static final int defaultLoginSessionTimeout = 480; // = 8 hours
-
-    private static String appVersionString = null; 
-    private static String buildNumberString = null; 
+    private static final int defaultGlobusBatchLookupSize = 50; 
+    
+    private String buildNumber = null;
     
     private static final String JVM_TIMER_SERVER_OPTION = "dataverse.timerServer";
     
     private static final long DEFAULT_GUESTBOOK_RESPONSES_DISPLAY_LIMIT = 5000L; 
+    private static final long DEFAULT_THUMBNAIL_SIZE_LIMIT_IMAGE = 3000000L; // 3 MB
+    private static final long DEFAULT_THUMBNAIL_SIZE_LIMIT_PDF = 1000000L; // 1 MB
+    
+    public static final String DEFAULTCURATIONLABELSET = "DEFAULT";
+    public static final String CURATIONLABELSDISABLED = "DISABLED";
     
     public String getVersion() {
         return getVersion(false);
     }
     
+    // The return value is a "prviate static String", that should be initialized
+    // once, on the first call (see the code below)... But this is a @Stateless 
+    // bean... so that would mean "once per thread"? - this would be a prime 
+    // candidate for being moved into some kind of an application-scoped caching
+    // service... some CachingService @Singleton - ? (L.A. 5.8)
     public String getVersion(boolean withBuildNumber) {
-        
-        if (appVersionString == null) {
-
-            // The Version Number is no longer supplied in a .properties file - so
-            // we can't just do 
-            //  return BundleUtil.getStringFromBundle("version.number", null, ResourceBundle.getBundle("VersionNumber", Locale.US));
-            //
-            // Instead, we'll rely on Maven placing the version number into the
-            // Manifest, and getting it from there:
-            // (this is considered a better practice, and will also allow us
-            // to maintain this number in only one place - the pom.xml file)
-            // -- L.A. 4.0.2
-            
-            // One would assume, that once the version is in the MANIFEST.MF, 
-            // as Implementation-Version:, it would be possible to obtain 
-            // said version simply as 
-            //    appVersionString = getClass().getPackage().getImplementationVersion();
-            // alas - that's not working, for whatever reason. (perhaps that's 
-            // only how it works with jar-ed packages; not with .war files).
-            // People on the interwebs suggest that one should instead 
-            // open the Manifest as a resource, then extract its attributes. 
-            // There were some complications with that too. Plus, relying solely 
-            // on the MANIFEST.MF would NOT work for those of the developers who 
-            // are using "in place deployment" (i.e., where 
-            // Netbeans runs their builds directly from the local target 
-            // directory, bypassing the war file deployment; and the Manifest 
-            // is only available in the .war file). For that reason, I am 
-            // going to rely on the pom.properties file, and use java.util.Properties 
-            // to read it. We have to look for this file in 2 different places
-            // depending on whether this is a .war file deployment, or a 
-            // developers build. (the app-level META-INF is only populated when
-            // a .war file is built; the "maven-archiver" directory, on the other 
-            // hand, is only available when it's a local build deployment).
-            // So, long story short, I'm resorting to the convoluted steps below. 
-            // It may look hacky, but it should actually be pretty solid and 
-            // reliable. 
-            
-            
-            // First, find the absolute path url of the application persistence file
-            // always supplied with the Dataverse app:
-            java.net.URL fileUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/persistence.xml");
-            String filePath = null;
-
-
-            if (fileUrl != null) {
-                filePath = fileUrl.getFile();
-                if (filePath != null) {
-                    InputStream mavenPropertiesInputStream = null;
-                    String mavenPropertiesFilePath; 
-                    Properties mavenProperties = new Properties();
-
-                    
-                    filePath = filePath.replaceFirst("/[^/]*$", "/");
-                    // Using a relative path, find the location of the maven pom.properties file. 
-                    // First, try to look for it in the app-level META-INF. This will only be 
-                    // available if it's a war file deployment: 
-                    mavenPropertiesFilePath = filePath.concat("../../../META-INF/maven/edu.harvard.iq/dataverse/pom.properties");                                     
-                    
-                    try {
-                        mavenPropertiesInputStream = new FileInputStream(mavenPropertiesFilePath);
-                    } catch (IOException ioex) {
-                        // OK, let's hope this is a local dev. build. 
-                        // In that case the properties file should be available in 
-                        // the maven-archiver directory: 
-                        
-                        mavenPropertiesFilePath = filePath.concat("../../../../maven-archiver/pom.properties");
-                        
-                        // try again: 
-                        
-                        try {
-                            mavenPropertiesInputStream = new FileInputStream(mavenPropertiesFilePath);
-                        } catch (IOException ioex2) {
-                            logger.warning("Failed to find and/or open for reading the pom.properties file.");
-                            mavenPropertiesInputStream = null; 
-                        }
-                    }
-                    
-                    if (mavenPropertiesInputStream != null) {
-                        try {
-                            mavenProperties.load(mavenPropertiesInputStream);
-                            appVersionString = mavenProperties.getProperty("version");                        
-                        } catch (IOException ioex) {
-                            logger.warning("caught IOException trying to read and parse the pom properties file.");
-                        } finally {
-                            IOUtils.closeQuietly(mavenPropertiesInputStream);
-                        }
-                    }
-                    
-                } else {
-                    logger.warning("Null file path representation of the location of persistence.xml in the webapp root directory!"); 
-                }
-            } else {
-                logger.warning("Could not find the location of persistence.xml in the webapp root directory!");
-            }
-
-            
-            if (appVersionString == null) {
-                // still null? - defaulting to 4.0:    
-                appVersionString = "4.0";
-            }
-        }
+        // Retrieve the version via MPCONFIG
+        // NOTE: You may override the version via all methods of MPCONFIG.
+        //       It will default to read from microprofile-config.properties source,
+        //       which contains in the source a Maven property reference to ${project.version}.
+        //       When packaging the app to deploy it, Maven will replace this, rendering it a static entry.
+        String appVersion = JvmSettings.VERSION.lookup();
             
         if (withBuildNumber) {
-            if (buildNumberString == null) {
-                // (build number is still in a .properties file in the source tree; it only 
-                // contains a real build number if this war file was built by 
-                // Jenkins) 
-                        
+            if (buildNumber == null) {
+                // (build number is still in a .properties file in the source tree; it only
+                // contains a real build number if this war file was built by Jenkins)
+                // TODO: might be replaced with same trick as for version via Maven property w/ empty default
                 try {
-                    buildNumberString = ResourceBundle.getBundle("BuildNumber").getString("build.number");
+                    buildNumber = ResourceBundle.getBundle("BuildNumber").getString("build.number");
                 } catch (MissingResourceException ex) {
-                    buildNumberString = null; 
+                    buildNumber = null;
+                }
+                
+                // Also try to read the build number via MicroProfile Config if not already present from the
+                // properties file (so can be overridden by env var or other source)
+                if (buildNumber == null || buildNumber.isEmpty()) {
+                    buildNumber = JvmSettings.BUILD.lookupOptional().orElse("");
                 }
             }
             
-            if (buildNumberString != null && !buildNumberString.equals("")) {
-                return appVersionString + " build " + buildNumberString; 
-            } 
-        }        
+            if (!buildNumber.equals("")) {
+                return appVersion + " build " + buildNumber;
+            }
+        }
         
-        return appVersionString; 
+        return appVersion;
     }
-
+    
+    /**
+     * Retrieve the Solr endpoint in "host:port" form, to be used with a Solr client.
+     *
+     * This will retrieve the setting from either the database ({@link SettingsServiceBean.Key#SolrHostColonPort}) or
+     * via Microprofile Config API (properties {@link JvmSettings#SOLR_HOST} and {@link JvmSettings#SOLR_PORT}).
+     *
+     * A database setting always takes precedence. If not given via other config sources, a default from
+     * <code>resources/META-INF/microprofile-config.properties</code> is used. (It's possible to use profiles.)
+     *
+     * @return Solr endpoint as string "hostname:port"
+     */
     public String getSolrHostColonPort() {
-        String SolrHost;
-        if ( System.getenv("SOLR_SERVICE_HOST") != null && System.getenv("SOLR_SERVICE_HOST") != ""){
-            SolrHost = System.getenv("SOLR_SERVICE_HOST");
-        }
-        else SolrHost = saneDefaultForSolrHostColonPort;
-        String solrHostColonPort = settingsService.getValueForKey(SettingsServiceBean.Key.SolrHostColonPort, SolrHost);
-        return solrHostColonPort;
+        // Get from MPCONFIG. Might be configured by a sysadmin or simply return the default shipped with
+        // resources/META-INF/microprofile-config.properties.
+        // NOTE: containers should use system property mp.config.profile=ct to use sane container usage default
+        String host = JvmSettings.SOLR_HOST.lookup();
+        String port = JvmSettings.SOLR_PORT.lookup();
+        
+        // DB setting takes precedence over all. If not present, will return default from above.
+        return Optional.ofNullable(settingsService.getValueForKey(SettingsServiceBean.Key.SolrHostColonPort))
+            .orElse(host + ":" + port);
     }
 
     public boolean isProvCollectionEnabled() {
@@ -252,16 +164,18 @@ public int getMetricsCacheTimeoutMinutes() {
         int defaultValue = 10080; //one week in minutes
         SettingsServiceBean.Key key = SettingsServiceBean.Key.MetricsCacheTimeoutMinutes;
         String metricsCacheTimeString = settingsService.getValueForKey(key);
-        int returnInt = 0;
-        try {
-            returnInt = Integer.parseInt(metricsCacheTimeString);
-            if (returnInt >= 0) {
-                return returnInt;
-            } else {
-                logger.info("Returning " + defaultValue + " for " + key + " because value must be greater than zero, not \"" + metricsCacheTimeString + "\".");
+        if (metricsCacheTimeString != null) {
+            int returnInt = 0;
+            try {
+                returnInt = Integer.parseInt(metricsCacheTimeString);
+                if (returnInt >= 0) {
+                    return returnInt;
+                } else {
+                    logger.info("Returning " + defaultValue + " for " + key + " because value must be greater than zero, not \"" + metricsCacheTimeString + "\".");
+                }
+            } catch (NumberFormatException ex) {
+                logger.info("Returning " + defaultValue + " for " + key + " because value must be an integer greater than zero, not \"" + metricsCacheTimeString + "\".");
             }
-        } catch (NumberFormatException ex) {
-            logger.info("Returning " + defaultValue + " for " + key + " because value must be an integer greater than zero, not \"" + metricsCacheTimeString + "\".");
         }
         return defaultValue;
     }
@@ -312,32 +226,58 @@ public static int getMinutesUntilPasswordResetTokenExpires() {
     }
     
     /**
-     * The "official", designated URL of the site;
-     * can be defined as a complete URL; or derived from the 
-     * "official" hostname. If none of these options is set,
-     * defaults to the InetAddress.getLocalHOst() and https;
-     * These are legacy JVM options. Will be eventualy replaced
-     * by the Settings Service configuration.
+     * Lookup (or construct) the designated URL of this instance from configuration.
+     *
+     * Can be defined as a complete URL via <code>dataverse.siteUrl</code>; or derived from the hostname
+     * <code>dataverse.fqdn</code> and HTTPS. If none of these options is set, defaults to the
+     * {@link InetAddress#getLocalHost} and HTTPS.
+     *
+     * NOTE: This method does not provide any validation.
+     * TODO: The behaviour of this method is subject to a later change, see
+     *       https://github.com/IQSS/dataverse/issues/6636
+     *
+     * @return The designated URL of this instance as per configuration.
      */
     public String getDataverseSiteUrl() {
         return getDataverseSiteUrlStatic();
     }
     
+    /**
+     * Lookup (or construct) the designated URL of this instance from configuration.
+     *
+     * Can be defined as a complete URL via <code>dataverse.siteUrl</code>; or derived from the hostname
+     * <code>dataverse.fqdn</code> and HTTPS. If none of these options is set, defaults to the
+     * {@link InetAddress#getLocalHost} and HTTPS.
+     *
+     * NOTE: This method does not provide any validation.
+     * TODO: The behaviour of this method is subject to a later change, see
+     *       https://github.com/IQSS/dataverse/issues/6636
+     *
+     * @return The designated URL of this instance as per configuration.
+     */
     public static String getDataverseSiteUrlStatic() {
-        String hostUrl = System.getProperty(SITE_URL);
-        if (hostUrl != null && !"".equals(hostUrl)) {
-            return hostUrl;
+        // If dataverse.siteUrl has been configured, simply return it
+        Optional<String> siteUrl = JvmSettings.SITE_URL.lookupOptional();
+        if (siteUrl.isPresent()) {
+            return siteUrl.get();
         }
-        String hostName = System.getProperty(FQDN);
-        if (hostName == null) {
-            try {
-                hostName = InetAddress.getLocalHost().getCanonicalHostName();
-            } catch (UnknownHostException e) {
-                return null;
-            }
+        
+        // Otherwise try to lookup dataverse.fqdn setting and default to HTTPS
+        Optional<String> fqdn = JvmSettings.FQDN.lookupOptional();
+        if (fqdn.isPresent()) {
+            return "https://" + fqdn.get();
+        }
+        
+        // Last resort - get the servers local name and use it.
+        // BEWARE - this is dangerous.
+        // 1) A server might have a different name than your repository URL.
+        // 2) The underlying reverse DNS lookup might point to a different name than your repository URL.
+        // 3) If this server has multiple IPs assigned, which one will it be for the lookup?
+        try {
+            return "https://" + InetAddress.getLocalHost().getCanonicalHostName();
+        } catch (UnknownHostException e) {
+            return null;
         }
-        hostUrl = "https://" + hostName;
-        return hostUrl;
     }
     
     /**
@@ -347,26 +287,14 @@ public String getPageURLWithQueryString() {
         return PrettyContext.getCurrentInstance().getRequestURL().toURL() + PrettyContext.getCurrentInstance().getRequestQueryString().toQueryString();
     }
 
-    /**
-     * The "official" server's fully-qualified domain name: 
-     */
-    public String getDataverseServer() {
-        // still reliese on a JVM option: 
-        String fqdn = System.getProperty(FQDN);
-        if (fqdn == null) {
-            try {
-                fqdn = InetAddress.getLocalHost().getCanonicalHostName();
-            } catch (UnknownHostException e) {
-                return null;
-            }
-        }
-        return fqdn;
+    public String getGuidesBaseUrl() {
+        return getGuidesBaseUrl(true);
     }
 
-    public String getGuidesBaseUrl() {
-        String saneDefault = "http://guides.dataverse.org";
+    public String getGuidesBaseUrl(boolean includeLang) {
+        String saneDefault = "https://guides.dataverse.org";
         String guidesBaseUrl = settingsService.getValueForKey(SettingsServiceBean.Key.GuidesBaseUrl, saneDefault);
-        return guidesBaseUrl + "/" + getGuidesLanguage();
+        return includeLang ? guidesBaseUrl + "/" + getGuidesLanguage() : guidesBaseUrl;
     }
 
     private String getGuidesLanguage() {
@@ -389,12 +317,12 @@ public String getMetricsUrl() {
         return metricsUrl;
     }
 
-    static long getLongLimitFromStringOrDefault(String limitSetting, Long defaultValue) {
+    public static long getLongLimitFromStringOrDefault(String limitSetting, Long defaultValue) {
         Long limit = null;
 
         if (limitSetting != null && !limitSetting.equals("")) {
             try {
-                limit = new Long(limitSetting);
+                limit = Long.valueOf(limitSetting);
             } catch (NumberFormatException nfe) {
                 limit = null;
             }
@@ -403,12 +331,12 @@ static long getLongLimitFromStringOrDefault(String limitSetting, Long defaultVal
         return limit != null ? limit : defaultValue;
     }
 
-    static int getIntLimitFromStringOrDefault(String limitSetting, Integer defaultValue) {
+    public static int getIntLimitFromStringOrDefault(String limitSetting, Integer defaultValue) {
         Integer limit = null;
 
         if (limitSetting != null && !limitSetting.equals("")) {
             try {
-                limit = new Integer(limitSetting);
+                limit = Integer.valueOf(limitSetting);
             } catch (NumberFormatException nfe) {
                 limit = null;
             }
@@ -419,13 +347,12 @@ static int getIntLimitFromStringOrDefault(String limitSetting, Integer defaultVa
 
     /**
      * Download-as-zip size limit.
-     * returns 0 if not specified; 
-     * (the file zipper will then use the default value)
+     * returns defaultZipDownloadLimit if not specified; 
      * set to -1 to disable zip downloads. 
      */
     public long getZipDownloadLimit() {
         String zipLimitOption = settingsService.getValueForKey(SettingsServiceBean.Key.ZipDownloadLimit);
-        return getLongLimitFromStringOrDefault(zipLimitOption, 0L);
+        return getLongLimitFromStringOrDefault(zipLimitOption, defaultZipDownloadLimit);
     }
     
     public int getZipUploadFilesLimit() {
@@ -461,29 +388,28 @@ public long getUploadLogoSizeLimit(){
         return 500000;
     }
 
-    // TODO: (?)
-    // create sensible defaults for these things? -- 4.2.2
     public long getThumbnailSizeLimitImage() {
-        long limit = getThumbnailSizeLimit("Image");
-        return limit == 0 ? 500000 : limit;
-    } 
-    
+        return getThumbnailSizeLimit("Image");
+    }
+
     public long getThumbnailSizeLimitPDF() {
-        long limit = getThumbnailSizeLimit("PDF");
-        return limit == 0 ? 500000 : limit;
+        return getThumbnailSizeLimit("PDF");
     }
-    
-    public long getThumbnailSizeLimit(String type) {
+
+    public static long getThumbnailSizeLimit(String type) {
         String option = null; 
         
         //get options via jvm options
         
         if ("Image".equals(type)) {
             option = System.getProperty("dataverse.dataAccess.thumbnail.image.limit");
+            return getLongLimitFromStringOrDefault(option, DEFAULT_THUMBNAIL_SIZE_LIMIT_IMAGE);
         } else if ("PDF".equals(type)) {
             option = System.getProperty("dataverse.dataAccess.thumbnail.pdf.limit");
+            return getLongLimitFromStringOrDefault(option, DEFAULT_THUMBNAIL_SIZE_LIMIT_PDF);
         }
 
+        // Zero (0) means no limit.
         return getLongLimitFromStringOrDefault(option, 0L);
     }
     
@@ -500,16 +426,24 @@ public boolean isThumbnailGenerationDisabledForPDF() {
     }
     
     public String getApplicationTermsOfUse() {
-        String language = BundleUtil.getCurrentLocale().getLanguage();
-        String saneDefaultForAppTermsOfUse = BundleUtil.getStringFromBundle("system.app.terms");
-        String appTermsOfUse = "";
-         if(language.equalsIgnoreCase(BundleUtil.getDefaultLocale().getLanguage()) )
-        {
-             appTermsOfUse = settingsService.getValueForKey(SettingsServiceBean.Key.ApplicationTermsOfUse, saneDefaultForAppTermsOfUse);
+        return getApplicationTermsOfUse(null);
+    }
+
+    public String getApplicationTermsOfUse(String languageIn) {
+        String language = null;
+        if (languageIn != null) {
+            language = languageIn;
+        } else {
+            language = BundleUtil.getCurrentLocale().getLanguage();
         }
-        else
-        {
-            appTermsOfUse = settingsService.getValueForKey(SettingsServiceBean.Key.ApplicationTermsOfUse, language, saneDefaultForAppTermsOfUse);
+        String saneDefaultForAppTermsOfUse = BundleUtil.getStringFromBundle("system.app.terms");
+        // Get the value for the defaultLocale. It will either be used as the return
+        // value, or as a better default than the saneDefaultForAppTermsOfUse if there
+        // is no language-specific value
+        String appTermsOfUse = settingsService.getValueForKey(SettingsServiceBean.Key.ApplicationTermsOfUse, saneDefaultForAppTermsOfUse);
+        // Now get the language-specific value if it exists
+        if (language != null && !language.equalsIgnoreCase(BundleUtil.getDefaultLocale().getLanguage())) {
+            appTermsOfUse = settingsService.getValueForKey(SettingsServiceBean.Key.ApplicationTermsOfUse, language, appTermsOfUse);
         }
         return appTermsOfUse;
     }
@@ -539,26 +473,22 @@ public boolean isFilesOnDatasetPageFromSolr() {
         return settingsService.isTrueForKey(SettingsServiceBean.Key.FilesOnDatasetPageFromSolr, safeDefaultIfKeyNotFound);
     }
 
-    public Long getMaxFileUploadSize(){
-         return settingsService.getValueForKeyAsLong(SettingsServiceBean.Key.MaxFileUploadSizeInBytes);
+    public Long getMaxFileUploadSizeForStore(String driverId){
+         return settingsService.getValueForCompoundKeyAsLong(SettingsServiceBean.Key.MaxFileUploadSizeInBytes, driverId);
      }
     
-    public String getHumanMaxFileUploadSize(){
-         return bytesToHumanReadable(getMaxFileUploadSize());
-     }
-
     public Integer getSearchHighlightFragmentSize() {
         String fragSize = settingsService.getValueForKey(SettingsServiceBean.Key.SearchHighlightFragmentSize);
         if (fragSize != null) {
             try {
-                return new Integer(fragSize);
+                return Integer.valueOf(fragSize);
             } catch (NumberFormatException nfe) {
                 logger.info("Could not convert " + SettingsServiceBean.Key.SearchHighlightFragmentSize + " to int: " + nfe);
             }
         }
         return null;
     }
-    
+
     public long getTabularIngestSizeLimit() {
         // This method will return the blanket ingestable size limit, if 
         // set on the system. I.e., the universal limit that applies to all 
@@ -568,7 +498,7 @@ public long getTabularIngestSizeLimit() {
         
         if (limitEntry != null) {
             try {
-                Long sizeOption = new Long(limitEntry);
+                Long sizeOption = Long.valueOf(limitEntry);
                 return sizeOption;
             } catch (NumberFormatException nfe) {
                 logger.warning("Invalid value for TabularIngestSizeLimit option? - " + limitEntry);
@@ -593,7 +523,7 @@ public long getTabularIngestSizeLimit(String formatName) {
                 
         if (limitEntry != null) {
             try {
-                Long sizeOption = new Long(limitEntry);
+                Long sizeOption = Long.valueOf(limitEntry);
                 return sizeOption;
             } catch (NumberFormatException nfe) {
                 logger.warning("Invalid value for TabularIngestSizeLimit:" + formatName + "? - " + limitEntry );
@@ -623,7 +553,7 @@ public boolean isTimerServer() {
         }
         return false;
     }
-
+    
     public String getFooterCopyrightAndYear() {
         return BundleUtil.getStringFromBundle("footer.copyright", Arrays.asList(Year.now().getValue() + ""));
     }
@@ -653,7 +583,7 @@ public String getDefaultAuthProvider() {
     }
 
     public String getNameOfInstallation() {
-        return dataverseService.findRootDataverse().getName();
+        return dataverseService.getRootDataverseName();
     }
 
     public AbstractOAuth2AuthenticationProvider.DevOAuthAccountType getDevOAuthAccountType() {
@@ -688,6 +618,10 @@ public boolean isShibPassiveLoginEnabled() {
         boolean defaultResponse = false;
         return settingsService.isTrueForKey(SettingsServiceBean.Key.ShibPassiveLoginEnabled, defaultResponse);
     }
+    public boolean isShibAttributeCharacterSetConversionEnabled() {
+        boolean defaultResponse = true;
+        return settingsService.isTrueForKey(SettingsServiceBean.Key.ShibAttributeCharacterSetConversionEnabled, defaultResponse);
+    }
 
     /**
      * getPVDictionaries
@@ -826,12 +760,26 @@ public enum FileUploadMethods {
          * DCM stands for Data Capture Module. Right now it supports upload over
          * rsync+ssh but DCM may support additional methods in the future.
          */
+        @Deprecated(forRemoval = true, since = "2024-07-07")
         RSYNC("dcm/rsync+ssh"),
         /**
          * Traditional Dataverse file handling, which tends to involve users
          * uploading and downloading files using a browser or APIs.
          */
-        NATIVE("native/http");
+        NATIVE("native/http"),
+
+        /**
+         * Upload through Globus of large files
+         */
+
+        GLOBUS("globus"), 
+        
+        /**
+         * Upload folders of files through dvwebloader app
+         */
+
+        WEBLOADER("dvwebloader");
+        ;
 
 
         private final String text;
@@ -862,7 +810,7 @@ public String toString() {
     /**
      * See FileUploadMethods.
      *
-     * TODO: Consider if dataverse.files.s3-download-redirect belongs here since
+     * TODO: Consider if dataverse.files.<id>.download-redirect belongs here since
      * it's a way to bypass Glassfish when downloading.
      */
     public enum FileDownloadMethods {
@@ -870,8 +818,11 @@ public enum FileDownloadMethods {
          * RSAL stands for Repository Storage Abstraction Layer. Downloads don't
          * go through Glassfish.
          */
+        @Deprecated(forRemoval = true, since = "2024-07-07")
         RSYNC("rsal/rsync"),
-        NATIVE("native/http");
+        NATIVE("native/http"),
+        GLOBUS("globus")
+        ;
         private final String text;
 
         private FileDownloadMethods(final String text) {
@@ -921,6 +872,7 @@ public String toString() {
      */
     public enum TransferProtocols {
 
+        @Deprecated(forRemoval = true, since = "2024-07-07")
         RSYNC("rsync"),
         /**
          * POSIX includes NFS. This is related to Key.LocalDataAccessPath in
@@ -952,22 +904,32 @@ public String toString() {
         }
 
     }
-
+    
     public boolean isPublicInstall(){
         boolean saneDefault = false;
         return settingsService.isTrueForKey(SettingsServiceBean.Key.PublicInstall, saneDefault);
     }
-    
+
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public boolean isRsyncUpload(){
-        return getUploadMethodAvailable(SystemConfig.FileUploadMethods.RSYNC.toString());
+        return getMethodAvailable(SystemConfig.FileUploadMethods.RSYNC.toString(), true);
+    }
+
+    public boolean isGlobusUpload(){
+        return getMethodAvailable(FileUploadMethods.GLOBUS.toString(), true);
     }
     
+    public boolean isWebloaderUpload(){
+        return getMethodAvailable(FileUploadMethods.WEBLOADER.toString(), true);
+    }
+
     // Controls if HTTP upload is enabled for both GUI and API.
     public boolean isHTTPUpload(){       
-        return getUploadMethodAvailable(SystemConfig.FileUploadMethods.NATIVE.toString());       
+        return getMethodAvailable(SystemConfig.FileUploadMethods.NATIVE.toString(), true);
     }
-    
-    public boolean isRsyncOnly(){       
+
+    @Deprecated(forRemoval = true, since = "2024-07-07")
+    public boolean isRsyncOnly(){
         String downloadMethods = settingsService.getValueForKey(SettingsServiceBean.Key.DownloadMethods);
         if(downloadMethods == null){
             return false;
@@ -980,26 +942,38 @@ public boolean isRsyncOnly(){
             return false;
         } else {
            return  Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).size() == 1 && uploadMethods.toLowerCase().equals(SystemConfig.FileUploadMethods.RSYNC.toString());
-        }        
+        }
     }
-    
+
+    @Deprecated(forRemoval = true, since = "2024-07-07")
     public boolean isRsyncDownload() {
-        String downloadMethods = settingsService.getValueForKey(SettingsServiceBean.Key.DownloadMethods);
-        return downloadMethods !=null && downloadMethods.toLowerCase().contains(SystemConfig.FileDownloadMethods.RSYNC.toString());
+        return getMethodAvailable(SystemConfig.FileUploadMethods.RSYNC.toString(), false);
     }
-    
+
     public boolean isHTTPDownload() {
-        String downloadMethods = settingsService.getValueForKey(SettingsServiceBean.Key.DownloadMethods);
-        logger.warning("Download Methods:" + downloadMethods);
-        return downloadMethods !=null && downloadMethods.toLowerCase().contains(SystemConfig.FileDownloadMethods.NATIVE.toString());
+        return getMethodAvailable(SystemConfig.FileUploadMethods.NATIVE.toString(), false);
+    }
+
+    public boolean isGlobusDownload() {
+        return getMethodAvailable(FileDownloadMethods.GLOBUS.toString(), false);
     }
     
-    private Boolean getUploadMethodAvailable(String method){
-        String uploadMethods = settingsService.getValueForKey(SettingsServiceBean.Key.UploadMethods); 
-        if (uploadMethods==null){
+    public boolean isGlobusFileDownload() {
+        return (isGlobusDownload() && settingsService.isTrueForKey(SettingsServiceBean.Key.GlobusSingleFileTransfer, false));
+    }
+
+    public int getGlobusBatchLookupSize() {
+        String batchSizeOption = settingsService.getValueForKey(SettingsServiceBean.Key.GlobusBatchLookupSize);
+        return getIntLimitFromStringOrDefault(batchSizeOption, defaultGlobusBatchLookupSize);
+    }
+    
+    private Boolean getMethodAvailable(String method, boolean upload) {
+        String methods = settingsService.getValueForKey(
+                upload ? SettingsServiceBean.Key.UploadMethods : SettingsServiceBean.Key.DownloadMethods);
+        if (methods == null) {
             return false;
         } else {
-           return  Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).contains(method);
+            return Arrays.asList(methods.toLowerCase().split("\\s*,\\s*")).contains(method);
         }
     }
     
@@ -1011,39 +985,203 @@ public Integer getUploadMethodCount(){
            return  Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).size();
         }       
     }
-    public boolean isDataFilePIDSequentialDependent(){
-        String doiIdentifierType = settingsService.getValueForKey(SettingsServiceBean.Key.IdentifierGenerationStyle, "randomString");
-        String doiDataFileFormat = settingsService.getValueForKey(SettingsServiceBean.Key.DataFilePIDFormat, "DEPENDENT");
-        if (doiIdentifierType.equals("sequentialNumber") && doiDataFileFormat.equals("DEPENDENT")){
-            return true;
-        }
-        return false;
+
+    public boolean isAllowCustomTerms() {
+        boolean safeDefaultIfKeyNotFound = true;
+        return settingsService.isTrueForKey(SettingsServiceBean.Key.AllowCustomTermsOfUse, safeDefaultIfKeyNotFound);
     }
-    
-    public int getPIDAsynchRegFileCount() {
-        String fileCount = settingsService.getValueForKey(SettingsServiceBean.Key.PIDAsynchRegFileCount, "10");
-        int retVal = 10;
-        try {
-            retVal = Integer.parseInt(fileCount);
-        } catch (NumberFormatException e) {           
-            //if no number in the setting we'll return 10
+
+    public boolean isFilePIDsEnabledForCollection(Dataverse collection) {
+        if (collection == null) {
+            return false;
         }
-        return retVal;
+        
+        Dataverse thisCollection = collection; 
+        
+        // If neither enabled nor disabled specifically for this collection,
+        // the parent collection setting is inherited (recursively): 
+        while (thisCollection.getFilePIDsEnabled() == null) {
+            if (thisCollection.getOwner() == null) {
+                // We've reached the root collection, and file PIDs registration
+                // hasn't been explicitly enabled, therefore we presume that it is
+                // subject to how the registration is configured for the 
+                // entire instance:
+                return settingsService.isTrueForKey(SettingsServiceBean.Key.FilePIDsEnabled, false); 
+            }
+            thisCollection = thisCollection.getOwner();
+        }
+        
+        // If present, the setting of the first direct ancestor collection 
+        // takes precedent:
+        return thisCollection.getFilePIDsEnabled();
+    }
+
+    public String getMDCLogPath() {
+        String mDCLogPath = settingsService.getValueForKey(SettingsServiceBean.Key.MDCLogPath, null);
+        return mDCLogPath;
     }
     
-    public boolean isFilePIDsEnabled() {
+    public boolean isDatafileValidationOnPublishEnabled() {
         boolean safeDefaultIfKeyNotFound = true;
-        return settingsService.isTrueForKey(SettingsServiceBean.Key.FilePIDsEnabled, safeDefaultIfKeyNotFound);
+        return settingsService.isTrueForKey(SettingsServiceBean.Key.FileValidationOnPublishEnabled, safeDefaultIfKeyNotFound);
+    }
+
+	public boolean directUploadEnabled(DvObjectContainer container) {
+    	return Boolean.getBoolean("dataverse.files." + container.getEffectiveStorageDriverId() + ".upload-redirect");
+	}
+        
+    public boolean isExternalDataverseValidationEnabled() {
+        return settingsService.getValueForKey(SettingsServiceBean.Key.DataverseMetadataValidatorScript) != null;
+        // alternatively, we can also check if the script specified exists, 
+        // and is executable. -- ?
     }
     
-    public boolean isIndependentHandleService() {
-        boolean safeDefaultIfKeyNotFound = false;
-        return settingsService.isTrueForKey(SettingsServiceBean.Key.IndependentHandleService, safeDefaultIfKeyNotFound);
+    public boolean isExternalDatasetValidationEnabled() {
+        return settingsService.getValueForKey(SettingsServiceBean.Key.DatasetMetadataValidatorScript) != null;
+        // alternatively, we can also check if the script specified exists, 
+        // and is executable. -- ?
+    }
     
+    public String getDataverseValidationExecutable() {
+        return settingsService.getValueForKey(SettingsServiceBean.Key.DataverseMetadataValidatorScript);
     }
     
-    public String getMDCLogPath() {
-        String mDCLogPath = settingsService.getValueForKey(SettingsServiceBean.Key.MDCLogPath, null);
-        return mDCLogPath;
+    public String getDatasetValidationExecutable() {
+        return settingsService.getValueForKey(SettingsServiceBean.Key.DatasetMetadataValidatorScript);
+    }
+    
+    public String getDataverseValidationFailureMsg() {
+        String defaultMessage = "This dataverse collection cannot be published because it has failed an external metadata validation test.";
+        return settingsService.getValueForKey(SettingsServiceBean.Key.DataverseMetadataPublishValidationFailureMsg, defaultMessage);
+    }
+    
+    public String getDataverseUpdateValidationFailureMsg() {
+        String defaultMessage = "This dataverse collection cannot be updated because it has failed an external metadata validation test.";
+        return settingsService.getValueForKey(SettingsServiceBean.Key.DataverseMetadataUpdateValidationFailureMsg, defaultMessage);
+    }
+    
+    public String getDatasetValidationFailureMsg() {
+        String defaultMessage = "This dataset cannot be published because it has failed an external metadata validation test.";
+        return settingsService.getValueForKey(SettingsServiceBean.Key.DatasetMetadataValidationFailureMsg, defaultMessage);
+    }
+    
+    public boolean isExternalValidationAdminOverrideEnabled() {
+        return "true".equalsIgnoreCase(settingsService.getValueForKey(SettingsServiceBean.Key.ExternalValidationAdminOverride));
+    }
+    
+    public long getDatasetValidationSizeLimit() {
+        String limitEntry = settingsService.getValueForKey(SettingsServiceBean.Key.DatasetChecksumValidationSizeLimit);
+
+        if (limitEntry != null) {
+            try {
+                Long sizeOption = Long.valueOf(limitEntry);
+                return sizeOption;
+            } catch (NumberFormatException nfe) {
+                logger.warning("Invalid value for DatasetValidationSizeLimit option? - " + limitEntry);
+            }
+        }
+        // -1 means no limit is set;
+        return -1;
+    }
+
+    public long getFileValidationSizeLimit() {
+        String limitEntry = settingsService.getValueForKey(SettingsServiceBean.Key.DataFileChecksumValidationSizeLimit);
+
+        if (limitEntry != null) {
+            try {
+                Long sizeOption = Long.valueOf(limitEntry);
+                return sizeOption;
+            } catch (NumberFormatException nfe) {
+                logger.warning("Invalid value for FileValidationSizeLimit option? - " + limitEntry);
+            }
+        }
+        // -1 means no limit is set;
+        return -1;
+    }
+    public Map<String, String[]> getCurationLabels() {
+        Map<String, String[]> labelMap = new HashMap<String, String[]>();
+        String setting = settingsService.getValueForKey(SettingsServiceBean.Key.AllowedCurationLabels, "");
+        if (!setting.isEmpty()) {
+            try (JsonReader jsonReader = Json.createReader(new StringReader(setting))){
+                
+                Pattern pattern = Pattern.compile("(^[\\w ]+$)"); // alphanumeric, underscore and whitespace allowed
+
+                JsonObject labelSets = jsonReader.readObject();
+                for (String key : labelSets.keySet()) {
+                    JsonArray labels = (JsonArray) labelSets.getJsonArray(key);
+                    String[] labelArray = new String[labels.size()];
+
+                    boolean allLabelsOK = true;
+                    Iterator<JsonValue> iter = labels.iterator();
+                    int i = 0;
+                    while (iter.hasNext()) {
+                        String label = ((JsonString) iter.next()).getString();
+                        Matcher matcher = pattern.matcher(label);
+                        if (!matcher.matches()) {
+                            logger.warning("Label rejected: " + label + ", Label set " + key + " ignored.");
+                            allLabelsOK = false;
+                            break;
+                        }
+                        labelArray[i] = label;
+                        i++;
+                    }
+                    if (allLabelsOK) {
+                        labelMap.put(key, labelArray);
+                    }
+                }
+            } catch (Exception e) {
+                logger.warning("Unable to parse " + SettingsServiceBean.Key.AllowedCurationLabels.name() + ": "
+                        + e.getLocalizedMessage());
+                e.printStackTrace();
+            }
+        }
+        return labelMap;
+    }
+    
+    public boolean isSignupDisabledForRemoteAuthProvider(String providerId) {
+        Boolean ret =  settingsService.getValueForCompoundKeyAsBoolean(SettingsServiceBean.Key.AllowRemoteAuthSignUp, providerId);
+        
+        // we default to false - i.e., "not disabled" if the setting is not present: 
+        if (ret == null) {
+            return false; 
+        }
+        
+        return !ret; 
+    }
+    
+    public boolean isStorageQuotasEnforced() {
+        return settingsService.isTrueForKey(SettingsServiceBean.Key.UseStorageQuotas, false);
+    }
+    
+    /**
+     * This method should only be used for testing of the new storage quota 
+     * mechanism, temporarily. (it uses the same value as the quota for 
+     * *everybody* regardless of the circumstances, defined as a database 
+     * setting)
+     */
+    public Long getTestStorageQuotaLimit() {
+        return settingsService.getValueForKeyAsLong(SettingsServiceBean.Key.StorageQuotaSizeInBytes);
+    }
+    /**
+     * Should we store tab-delimited files produced during ingest *with* the
+     * variable name header line included?
+     * @return boolean - defaults to false.
+     */
+    public boolean isStoringIngestedFilesWithHeaders() {
+        return settingsService.isTrueForKey(SettingsServiceBean.Key.StoreIngestedTabularFilesWithVarHeaders, false);
+    }
+
+    /**
+     * RateLimitUtil will parse the json to create a List<RateLimitSetting>
+     */
+    public String getRateLimitsJson() {
+        return settingsService.getValueForKey(SettingsServiceBean.Key.RateLimitingCapacityByTierAndAction, "");
+    }
+    public String getRateLimitingDefaultCapacityTiers() {
+        return settingsService.getValueForKey(SettingsServiceBean.Key.RateLimitingDefaultCapacityTiers, "");
+    }
+
+    public long getContactFeedbackMessageSizeLimit() {
+        return settingsService.getValueForKeyAsLong(SettingsServiceBean.Key.ContactFeedbackMessageSizeLimit, 0L);
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/URLTokenUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/URLTokenUtil.java
new file mode 100644
index 00000000000..90557a530c9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/URLTokenUtil.java
@@ -0,0 +1,327 @@
+package edu.harvard.iq.dataverse.util;
+
+import java.util.Arrays;
+import java.util.Random;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
+import static edu.harvard.iq.dataverse.api.ApiConstants.DS_VERSION_DRAFT;
+
+public class URLTokenUtil {
+
+    protected static final Logger logger = Logger.getLogger(URLTokenUtil.class.getCanonicalName());
+    protected final DataFile dataFile;
+    protected final Dataset dataset;
+    protected final FileMetadata fileMetadata;
+    protected ApiToken apiToken;
+    protected String localeCode;
+    
+    
+    public static final String HTTP_METHOD="httpMethod";
+    public static final String TIMEOUT="timeOut";
+    public static final String SIGNED_URL="signedUrl";
+    public static final String NAME="name";
+    public static final String URL_TEMPLATE="urlTemplate";
+
+    /**
+     * File level
+     *
+     * @param dataFile     Required.
+     * @param apiToken     The apiToken can be null
+     * @param fileMetadata Required.
+     * @param localeCode   optional.
+     * 
+     */
+    public URLTokenUtil(DataFile dataFile, ApiToken apiToken, FileMetadata fileMetadata, String localeCode)
+            throws IllegalArgumentException {
+        if (dataFile == null) {
+            String error = "A DataFile is required.";
+            logger.warning("Error in URLTokenUtil constructor: " + error);
+            throw new IllegalArgumentException(error);
+        }
+        if (fileMetadata == null) {
+            String error = "A FileMetadata is required.";
+            logger.warning("Error in URLTokenUtil constructor: " + error);
+            throw new IllegalArgumentException(error);
+        }
+        this.dataFile = dataFile;
+        this.dataset = fileMetadata.getDatasetVersion().getDataset();
+        this.fileMetadata = fileMetadata;
+        this.apiToken = apiToken;
+        this.localeCode = localeCode;
+    }
+
+    /**
+     * Dataset level
+     *
+     * @param dataset  Required.
+     * @param apiToken The apiToken can be null
+     */
+    public URLTokenUtil(Dataset dataset, ApiToken apiToken, String localeCode) {
+        this(dataset, null, apiToken, localeCode);
+    }
+
+    /**
+     * Dataset level
+     *
+     * @param dataset  Required.
+     * @param datafile Optional.
+     * @param apiToken Optional The apiToken can be null
+     * @localeCode     Optional
+     * 
+     */
+    public URLTokenUtil(Dataset dataset, DataFile datafile, ApiToken apiToken, String localeCode) {
+        if (dataset == null) {
+            String error = "A Dataset is required.";
+            logger.warning("Error in URLTokenUtil constructor: " + error);
+            throw new IllegalArgumentException(error);
+        }
+        this.dataset = dataset;
+        this.dataFile = datafile;
+        this.fileMetadata = null;
+        this.apiToken = apiToken;
+        this.localeCode = localeCode;
+    }
+
+    public DataFile getDataFile() {
+        return dataFile;
+    }
+
+    public FileMetadata getFileMetadata() {
+        return fileMetadata;
+    }
+
+    public ApiToken getApiToken() {
+        return apiToken;
+    }
+
+    public String getLocaleCode() {
+        return localeCode;
+    }
+    
+    public JsonValue getParam(String value) {
+        String tokenValue = null;
+        tokenValue = getTokenValue(value);
+        if (tokenValue != null && !tokenValue.isBlank()) {
+            try{
+                int x =Integer.parseInt(tokenValue);
+                return Json.createValue(x);
+            } catch (NumberFormatException nfe){
+                return Json.createValue(tokenValue);
+            }
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Tries to replace all occurrences of {<text>} with the value for the
+     * corresponding ReservedWord
+     * 
+     * @param url - the input string in which to replace tokens, normally a url
+     * @throws IllegalArgumentException if there is no matching ReservedWord or if
+     *                                  the configuation of this instance doesn't
+     *                                  have values for this ReservedWord (e.g.
+     *                                  asking for FILE_PID when using the dataset
+     *                                  constructor, etc.)
+     */
+    public String replaceTokensWithValues(String url) {
+        String newUrl = url;
+        Pattern pattern = Pattern.compile("(\\{.*?\\})");
+        Matcher matcher = pattern.matcher(url);
+        while(matcher.find()) {
+            String token = matcher.group(1);
+            ReservedWord reservedWord = ReservedWord.fromString(token);
+            String tValue = getTokenValue(token);
+            logger.fine("Replacing " + reservedWord.toString() + " with " + tValue + " in " + newUrl);
+            newUrl = newUrl.replace(reservedWord.toString(), tValue);
+        }
+        return newUrl;
+    }
+
+    private String getTokenValue(String value) {
+        ReservedWord reservedWord = ReservedWord.fromString(value);
+        switch (reservedWord) {
+        case FILE_ID:
+            // getDataFile is never null for file tools because of the constructor
+            return getDataFile().getId().toString();
+        case FILE_PID:
+            GlobalId filePid = getDataFile().getGlobalId();
+            if (filePid != null) {
+                return getDataFile().getGlobalId().asString();
+            }
+            break;
+        case SITE_URL:
+            return SystemConfig.getDataverseSiteUrlStatic();
+        case API_TOKEN:
+            String apiTokenString = null;
+            ApiToken theApiToken = getApiToken();
+            if (theApiToken != null) {
+                apiTokenString = theApiToken.getTokenString();
+            }
+            return apiTokenString;
+        case DATASET_ID:
+            return dataset.getId().toString();
+        case DATASET_PID:
+            return dataset.getGlobalId().asString();
+        case DATASET_VERSION:
+            String versionString = null;
+            if (fileMetadata != null) { // true for file case
+                versionString = fileMetadata.getDatasetVersion().getFriendlyVersionNumber();
+            } else { // Dataset case - return the latest visible version (unless/until the dataset
+                     // case allows specifying a version)
+                if (getApiToken() != null) {
+                    versionString = dataset.getLatestVersion().getFriendlyVersionNumber();
+                } else {
+                    versionString = dataset.getLatestVersionForCopy().getFriendlyVersionNumber();
+                }
+            }
+            if (("DRAFT").equals(versionString)) {
+                versionString = DS_VERSION_DRAFT; // send the token needed in api calls that can be substituted for a numeric version.
+            }
+            return versionString;
+        case FILE_METADATA_ID:
+            if (fileMetadata != null) { // true for file case
+                return fileMetadata.getId().toString();
+            }
+        case LOCALE_CODE:
+            return getLocaleCode();
+        default:
+            break;
+        }
+        throw new IllegalArgumentException("Cannot replace reserved word: " + value);
+    }
+    
+    public JsonObjectBuilder createPostBody(JsonObject params, JsonArray allowedApiCalls) {
+        JsonObjectBuilder bodyBuilder = Json.createObjectBuilder();
+        bodyBuilder.add("queryParameters", params);
+        if (allowedApiCalls != null && !allowedApiCalls.isEmpty()) {
+            JsonArrayBuilder apisBuilder = Json.createArrayBuilder();
+            allowedApiCalls.getValuesAs(JsonObject.class).forEach(((apiObj) -> {
+                logger.fine(JsonUtil.prettyPrint(apiObj));
+                String name = apiObj.getJsonString(NAME).getString();
+                String httpmethod = apiObj.getJsonString(HTTP_METHOD).getString();
+                int timeout = apiObj.getInt(TIMEOUT);
+                String urlTemplate = apiObj.getJsonString(URL_TEMPLATE).getString();
+                logger.fine("URL Template: " + urlTemplate);
+                urlTemplate = SystemConfig.getDataverseSiteUrlStatic() + urlTemplate;
+                String apiPath = replaceTokensWithValues(urlTemplate);
+                logger.fine("URL WithTokens: " + apiPath);
+                String url = apiPath;
+                // Sign if apiToken exists, otherwise send unsigned URL (i.e. for guest users)
+                ApiToken apiToken = getApiToken();
+                if (apiToken != null) {
+                    url = UrlSignerUtil.signUrl(apiPath, timeout, apiToken.getAuthenticatedUser().getUserIdentifier(),
+                            httpmethod, JvmSettings.API_SIGNING_SECRET.lookupOptional().orElse("")
+                                    + getApiToken().getTokenString());
+                }
+                logger.fine("Signed URL: " + url);
+                apisBuilder.add(Json.createObjectBuilder().add(NAME, name).add(HTTP_METHOD, httpmethod)
+                        .add(SIGNED_URL, url).add(TIMEOUT, timeout));
+            }));
+            bodyBuilder.add("signedUrls", apisBuilder);
+        }
+        return bodyBuilder;
+    }
+
+    public JsonObject getParams(JsonObject toolParameters) {
+        //ToDo - why an array of object each with a single key/value pair instead of one object?
+        JsonArray queryParams = toolParameters.getJsonArray("queryParameters");
+    
+        // ToDo return json and print later
+        JsonObjectBuilder paramsBuilder = Json.createObjectBuilder();
+        if (!(queryParams == null) && !queryParams.isEmpty()) {
+            queryParams.getValuesAs(JsonObject.class).forEach((queryParam) -> {
+                queryParam.keySet().forEach((key) -> {
+                    String value = queryParam.getString(key);
+                    JsonValue param = getParam(value);
+                    if (param != null) {
+                        paramsBuilder.add(key, param);
+                    }
+                });
+            });
+        }
+        return paramsBuilder.build();
+    }
+
+    public static String getScriptForUrl(String url) {
+        String msg = BundleUtil.getStringFromBundle("externaltools.enable.browser.popups");
+        String newWin = "newWin" + (new Random()).nextInt(1000000000);
+        //Always use a unique identifier so that more than one script can run (or one can be rerun) without conflicts
+        String script = String.format("const %1$s = window.open('" + url + "', target='_blank'); if (!%1$s || %1$s.closed || typeof %1$s.closed == \"undefined\") {alert(\"" + msg + "\");}", newWin);
+        return script;
+   }
+
+    public enum ReservedWord {
+
+        // TODO: Research if a format like "{reservedWord}" is easily parse-able or if
+        // another format would be
+        // better. The choice of curly braces is somewhat arbitrary, but has been
+        // observed in documentation for
+        // various REST APIs. For example, "Variable substitutions will be made when a
+        // variable is named in {brackets}."
+        // from https://swagger.io/specification/#fixed-fields-29 but that's for URLs.
+        FILE_ID("fileId"), FILE_PID("filePid"), SITE_URL("siteUrl"), API_TOKEN("apiToken"),
+        // datasetId is the database id
+        DATASET_ID("datasetId"),
+        // datasetPid is the DOI or Handle
+        DATASET_PID("datasetPid"), DATASET_VERSION("datasetVersion"), FILE_METADATA_ID("fileMetadataId"),
+        LOCALE_CODE("localeCode");
+
+        private final String text;
+        private final String START = "{";
+        private final String END = "}";
+
+        private ReservedWord(final String text) {
+            this.text = START + text + END;
+        }
+
+        /**
+         * This is a centralized method that enforces that only reserved words are
+         * allowed to be used by external tools. External tool authors cannot pass their
+         * own query parameters through Dataverse such as "mode=mode1".
+         *
+         * @throws IllegalArgumentException
+         */
+        public static ReservedWord fromString(String text) throws IllegalArgumentException {
+            if (text != null) {
+                for (ReservedWord reservedWord : ReservedWord.values()) {
+                    if (text.equals(reservedWord.text)) {
+                        return reservedWord;
+                    }
+                }
+            }
+            // TODO: Consider switching to a more informative message that enumerates the
+            // valid reserved words.
+            boolean moreInformativeMessage = false;
+            if (moreInformativeMessage) {
+                throw new IllegalArgumentException(
+                        "Unknown reserved word: " + text + ". A reserved word must be one of these values: "
+                                + Arrays.asList(ReservedWord.values()) + ".");
+            } else {
+                throw new IllegalArgumentException("Unknown reserved word: " + text);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return text;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/UrlSignerUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/UrlSignerUtil.java
new file mode 100644
index 00000000000..18ea3771301
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/UrlSignerUtil.java
@@ -0,0 +1,170 @@
+package edu.harvard.iq.dataverse.util;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.joda.time.LocalDateTime;
+
+/**
+ * Simple class to sign/validate URLs.
+ * 
+ */
+public class UrlSignerUtil {
+
+    private static final Logger logger = Logger.getLogger(UrlSignerUtil.class.getName());
+
+    public static final String SIGNED_URL_TOKEN="token";
+    public static final String SIGNED_URL_METHOD="method";
+    public static final String SIGNED_URL_USER="user";
+    public static final String SIGNED_URL_UNTIL="until";
+    /**
+     * 
+     * @param baseUrl - the URL to sign - cannot contain query params
+     *                "until","user", "method", or "token"
+     * @param timeout - how many minutes to make the URL valid for (note - time skew
+     *                between the creator and receiver could affect the validation
+     * @param user    - a string representing the user - should be understood by the
+     *                creator/receiver
+     * @param method  - one of the HTTP methods
+     * @param key     - a secret key shared by the creator/receiver. In Dataverse
+     *                this could be an APIKey (when sending URL to a tool that will
+     *                use it to retrieve info from Dataverse)
+     * @return - the signed URL
+     */
+    public static String signUrl(String baseUrl, Integer timeout, String user, String method, String key) {
+        StringBuilder signedUrlBuilder = new StringBuilder(baseUrl);
+
+        boolean firstParam = true;
+        if (baseUrl.contains("?")) {
+            firstParam = false;
+        }
+        if (timeout != null) {
+            LocalDateTime validTime = LocalDateTime.now();
+            validTime = validTime.plusMinutes(timeout);
+            validTime.toString();
+            signedUrlBuilder.append(firstParam ? "?" : "&").append(SIGNED_URL_UNTIL + "=").append(validTime);
+            firstParam = false;
+        }
+        if (user != null) {
+            signedUrlBuilder.append(firstParam ? "?" : "&").append(SIGNED_URL_USER + "=").append(user);
+            firstParam = false;
+        }
+        if (method != null) {
+            signedUrlBuilder.append(firstParam ? "?" : "&").append(SIGNED_URL_METHOD + "=").append(method);
+            firstParam=false;
+        }
+        signedUrlBuilder.append(firstParam ? "?" : "&").append(SIGNED_URL_TOKEN + "=");
+        logger.fine("String to sign: " + signedUrlBuilder.toString() + "<key>");
+        String signedUrl = signedUrlBuilder.toString();
+        signedUrl= signedUrl + (DigestUtils.sha512Hex(signedUrl + key));
+        if (logger.isLoggable(Level.FINE)) {
+            logger.fine(
+                    "URL signature is " + (isValidUrl(signedUrl, user, method, key) ? "valid" : "invalid"));
+        }
+        return signedUrl;
+    }
+
+    /**
+     * This method will only return true if the URL and parameters except the
+     * "token" are unchanged from the original/match the values sent to this method,
+     * and the "token" parameter matches what this method recalculates using the
+     * shared key. The method also assures that the "until" timestamp is after the
+     * current time.
+     * 
+     * @param signedUrl - the signed URL as received from Dataverse
+     * @param method    - an HTTP method. If provided, the method in the URL must
+     *                  match
+     * @param user      - a string representing the user, if provided the value must
+     *                  match the one in the url
+     * @param key       - the shared secret key to be used in validation
+     * @return - true if valid, false if not: e.g. the key is not the same as the
+     *         one used to generate the "token" any part of the URL preceding the
+     *         "token" has been altered the method doesn't match (e.g. the server
+     *         has received a POST request and the URL only allows GET) the user
+     *         string doesn't match (e.g. the server knows user A is logged in, but
+     *         the URL is only for user B) the url has expired (was used after the
+     *         until timestamp)
+     */
+    public static boolean isValidUrl(String signedUrl, String user, String method, String key) {
+        boolean valid = true;
+        try {
+            URL url = new URL(signedUrl);
+            List<NameValuePair> params = URLEncodedUtils.parse(url.getQuery(), StandardCharsets.UTF_8);
+            String hash = null;
+            String dateString = null;
+            String allowedMethod = null;
+            String allowedUser = null;
+            for (NameValuePair nvp : params) {
+                if (nvp.getName().equals(SIGNED_URL_TOKEN)) {
+                    hash = nvp.getValue();
+                    logger.fine("Hash: " + hash);
+                }
+                if (nvp.getName().equals(SIGNED_URL_UNTIL)) {
+                    dateString = nvp.getValue();
+                    logger.fine("Until: " + dateString);
+                }
+                if (nvp.getName().equals(SIGNED_URL_METHOD)) {
+                    allowedMethod = nvp.getValue();
+                    logger.fine("Method: " + allowedMethod);
+                }
+                if (nvp.getName().equals(SIGNED_URL_USER)) {
+                    allowedUser = nvp.getValue();
+                    logger.fine("User: " + allowedUser);
+                }
+            }
+
+            int index = signedUrl.indexOf(((dateString==null && allowedMethod==null && allowedUser==null) ? "?":"&") + "token=");
+            // Assuming the token is last - doesn't have to be, but no reason for the URL
+            // params to be rearranged either, and this should only cause false negatives if
+            // it does happen
+            String urlToHash = signedUrl.substring(0, index + 7);
+            logger.fine("String to hash: " + urlToHash + "<key>");
+            String newHash = DigestUtils.sha512Hex(urlToHash + key);
+            logger.fine("Calculated Hash: " + newHash);
+            if (!hash.equals(newHash)) {
+                logger.fine("Hash doesn't match");
+                valid = false;
+            }
+            if (dateString != null && LocalDateTime.parse(dateString).isBefore(LocalDateTime.now())) {
+                logger.fine("Url is expired");
+                valid = false;
+            }
+            if (method != null && !method.equals(allowedMethod)) {
+                logger.fine("Method doesn't match");
+                valid = false;
+            }
+            if (user != null && !user.equals(allowedUser)) {
+                logger.fine("User doesn't match");
+                valid = false;
+            }
+        } catch (Throwable t) {
+            // Want to catch anything like null pointers, etc. to force valid=false upon any
+            // error
+            logger.warning("Bad URL: " + signedUrl + " : " + t.getMessage());
+            valid = false;
+        }
+        return valid;
+    }
+
+    public static boolean hasToken(String urlString) {
+        try {
+            URL url = new URL(urlString);
+            List<NameValuePair> params = URLEncodedUtils.parse(url.getQuery(), StandardCharsets.UTF_8);
+            for (NameValuePair nvp : params) {
+                if (nvp.getName().equals(SIGNED_URL_TOKEN)) {
+                    return true;
+                }
+            }
+        } catch (MalformedURLException mue) {
+            logger.fine("Bad url string: " + urlString);
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/WebloaderUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/WebloaderUtil.java
new file mode 100644
index 00000000000..acbdc6aa3c6
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/WebloaderUtil.java
@@ -0,0 +1,26 @@
+package edu.harvard.iq.dataverse.util;
+
+import java.util.logging.Logger;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+
+public class WebloaderUtil {
+
+    private static final Logger logger = Logger.getLogger(WebloaderUtil.class.getCanonicalName());
+
+    /**
+     * Create the URL required to launch https://github.com/gdcc/dvwebloader
+     */
+    public static String getWebloaderUrl(Dataset d, ApiToken apiToken, String localeCode, String baseUrl) {
+        // Use URLTokenUtil for params currently in common with external tools.
+        URLTokenUtil tokenUtil = new URLTokenUtil(d, apiToken, localeCode);
+        String appUrl;
+        appUrl = baseUrl
+                + "?datasetPid={datasetPid}&siteUrl={siteUrl}&key={apiToken}&datasetId={datasetId}&datasetVersion={datasetVersion}&dvLocale={localeCode}";
+        return tokenUtil.replaceTokensWithValues(appUrl);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagChecksumType.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagChecksumType.java
new file mode 100644
index 00000000000..bd13b76b57b
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagChecksumType.java
@@ -0,0 +1,42 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import org.apache.commons.codec.digest.DigestUtils;
+
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public enum BagChecksumType {
+    MD5("manifest-md5.txt", inputStream -> DigestUtils.md5Hex(inputStream)),
+    SHA1("manifest-sha1.txt", inputStream -> DigestUtils.sha1Hex(inputStream)),
+    SHA256("manifest-sha256.txt", inputStream -> DigestUtils.sha256Hex(inputStream)),
+    SHA512("manifest-sha512.txt", inputStream -> DigestUtils.sha512Hex(inputStream));
+
+    private final String fileName;
+    private final InputStreamDigester inputStreamDigester;
+
+    private BagChecksumType(String fileName, InputStreamDigester inputStreamDigester) {
+        this.fileName = fileName;
+        this.inputStreamDigester = inputStreamDigester;
+    }
+
+    public static List<BagChecksumType> asList() {
+        return Arrays.asList(BagChecksumType.values());
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public InputStreamDigester getInputStreamDigester() {
+        return inputStreamDigester;
+    }
+
+    public static interface InputStreamDigester {
+        public String digest(InputStream inputStream) throws Exception;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagGenerator.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagGenerator.java
index 66fabefd4c4..f6b12d5f904 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagGenerator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagGenerator.java
@@ -9,10 +9,10 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
@@ -24,7 +24,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
-import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.Map.Entry;
@@ -46,21 +45,21 @@
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.apache.commons.compress.parallel.InputStreamSupplier;
 import org.apache.commons.compress.utils.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
-
+import org.apache.http.util.EntityUtils;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
@@ -74,7 +73,10 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.DataFile.ChecksumType;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.util.json.JsonLDTerm;
+import java.util.Optional;
 
 public class BagGenerator {
 
@@ -91,8 +93,8 @@ public class BagGenerator {
 
     private int timeout = 60;
     private RequestConfig config = RequestConfig.custom().setConnectTimeout(timeout * 1000)
-            .setConnectionRequestTimeout(timeout * 1000).setSocketTimeout(timeout * 1000).build();
-    private static HttpClientContext localContext = HttpClientContext.create();
+            .setConnectionRequestTimeout(timeout * 1000).setSocketTimeout(timeout * 1000)
+            .setCookieSpec(CookieSpecs.STANDARD).build();
     protected CloseableHttpClient client;
     private PoolingHttpClientConnectionManager cm = null;
 
@@ -110,7 +112,7 @@ public class BagGenerator {
 
     private String apiKey = null;
 
-    private javax.json.JsonObject oremapObject;
+    private jakarta.json.JsonObject oremapObject;
     private JsonObject aggregation;
 
     private String dataciteXml;
@@ -118,6 +120,7 @@ public class BagGenerator {
     private boolean usetemp = false;
 
     private int numConnections = 8;
+    public static final String BAG_GENERATOR_THREADS = ":BagGeneratorThreads";
 
     private OREMap oremap;
 
@@ -158,6 +161,7 @@ public BagGenerator(OREMap oreMap, String dataciteXml) throws JsonSyntaxExceptio
             SSLConnectionSocketFactory sslConnectionFactory = new SSLConnectionSocketFactory(builder.build(), NoopHostnameVerifier.INSTANCE);
 
             Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
+            		.register("http", PlainConnectionSocketFactory.getSocketFactory())
                     .register("https", sslConnectionFactory).build();
             cm = new PoolingHttpClientConnectionManager(registry);
 
@@ -176,7 +180,11 @@ public BagGenerator(OREMap oreMap, String dataciteXml) throws JsonSyntaxExceptio
     public void setIgnoreHashes(boolean val) {
         ignorehashes = val;
     }
-
+    
+    public void setDefaultCheckSumType(ChecksumType type) {
+    	hashtype=type;
+    }
+    
     public static void println(String s) {
         System.out.println(s);
         System.out.flush();
@@ -194,15 +202,19 @@ public static void println(String s) {
      * @return success true/false
      */
     public boolean generateBag(OutputStream outputStream) throws Exception {
-        logger.info("Generating: Bag to the Future!");
+        
 
         File tmp = File.createTempFile("qdr-scatter-dirs", "tmp");
         dirs = ScatterZipOutputStream.fileBased(tmp);
         // The oremapObject is javax.json.JsonObject and we need com.google.gson.JsonObject for the aggregation object
         aggregation = (JsonObject) new JsonParser().parse(oremapObject.getJsonObject(JsonLDTerm.ore("describes").getLabel()).toString());
 
-        bagID = aggregation.get("@id").getAsString() + "v."
+        String pidUrlString = aggregation.get("@id").getAsString();
+        String pidString=PidUtil.parseAsGlobalID(pidUrlString).asString();
+        bagID = pidString + "v."
                 + aggregation.get(JsonLDTerm.schemaOrg("version").getLabel()).getAsString();
+        
+        logger.info("Generating Bag: " + bagID);
         try {
             // Create valid filename from identifier and extend path with
             // two levels of hash-based subdirs to help distribute files
@@ -273,7 +285,8 @@ public boolean generateBag(OutputStream outputStream) throws Exception {
             }
             createFileFromString(manifestName, sha1StringBuffer.toString());
         } else {
-            logger.warning("No Hash values sent - Bag File does not meet BagIT specification requirement");
+            logger.warning("No Hash values (no files?) sending empty manifest to nominally comply with BagIT specification requirement");
+            createFileFromString("manifest-md5.txt", "");
         }
         // bagit.txt - Required by spec
         createFileFromString("bagit.txt", "BagIt-Version: 1.0\r\nTag-File-Character-Encoding: UTF-8");
@@ -355,6 +368,7 @@ public boolean generateBag(String bagName, boolean temp) {
             // Create an output stream backed by the file
             bagFileOS = new FileOutputStream(bagFile);
             if (generateBag(bagFileOS)) {
+                //The generateBag call sets this.bagName to the correct value
                 validateBagFile(bagFile);
                 if (usetemp) {
                     logger.fine("Moving tmp zip");
@@ -380,7 +394,8 @@ public void validateBag(String bagId) {
         ZipFile zf = null;
         InputStream is = null;
         try {
-            zf = new ZipFile(getBagFile(bagId));
+            File bagFile = getBagFile(bagId);
+            zf = new ZipFile(bagFile);
             ZipArchiveEntry entry = zf.getEntry(getValidName(bagId) + "/manifest-sha1.txt");
             if (entry != null) {
                 logger.info("SHA1 hashes used");
@@ -420,7 +435,7 @@ public void validateBag(String bagId) {
             }
             IOUtils.closeQuietly(is);
             logger.info("HashMap Map contains: " + checksumMap.size() + " entries");
-            checkFiles(checksumMap, zf);
+            checkFiles(checksumMap, bagFile);
         } catch (IOException io) {
             logger.log(Level.SEVERE,"Could not validate Hashes", io);
         } catch (Exception e) {
@@ -449,14 +464,13 @@ public File getBagFile(String bagID) throws Exception {
 
     private void validateBagFile(File bagFile) throws IOException {
         // Run a confirmation test - should verify all files and hashes
-        ZipFile zf = new ZipFile(bagFile);
+        
         // Check files calculates the hashes and file sizes and reports on
         // whether hashes are correct
-        checkFiles(checksumMap, zf);
+        checkFiles(checksumMap, bagFile);
 
         logger.info("Data Count: " + dataCount);
         logger.info("Data Size: " + totalDataSize);
-        zf.close();
     }
 
     public static String getValidName(String bagName) {
@@ -473,7 +487,7 @@ private void processContainer(JsonObject item, String currentPath) throws IOExce
         } else if (item.has(JsonLDTerm.schemaOrg("name").getLabel())) {
             title = item.get(JsonLDTerm.schemaOrg("name").getLabel()).getAsString();
         }
-
+        logger.fine("Adding " + title + "/ to path " + currentPath);
         currentPath = currentPath + title + "/";
         int containerIndex = -1;
         try {
@@ -520,28 +534,38 @@ private void processContainer(JsonObject item, String currentPath) throws IOExce
                 String childTitle = child.get(JsonLDTerm.schemaOrg("name").getLabel()).getAsString();
                 if (titles.contains(childTitle)) {
                     logger.warning("**** Multiple items with the same title in: " + currentPath);
-                    logger.warning("**** Will cause failure in hash and size validation.");
+                    logger.warning("**** Will cause failure in hash and size validation in: " + bagID);
                 } else {
                     titles.add(childTitle);
                 }
                 String childPath = currentPath + childTitle;
+                JsonElement directoryLabel = child.get(JsonLDTerm.DVCore("directoryLabel").getLabel());
+                if(directoryLabel!=null) {
+                    childPath=currentPath + directoryLabel.getAsString() + "/" + childTitle;
+                }
+                
 
                 String childHash = null;
                 if (child.has(JsonLDTerm.checksum.getLabel())) {
                     ChecksumType childHashType = ChecksumType.fromString(
                             child.getAsJsonObject(JsonLDTerm.checksum.getLabel()).get("@type").getAsString());
-                    if (hashtype != null && !hashtype.equals(childHashType)) {
-                        logger.warning("Multiple hash values in use - not supported");
-                    }
-                    if (hashtype == null)
+                    if (hashtype == null) {
+                    	//If one wasn't set as a default, pick up what the first child with one uses
                         hashtype = childHashType;
-                    childHash = child.getAsJsonObject(JsonLDTerm.checksum.getLabel()).get("@value").getAsString();
-                    if (checksumMap.containsValue(childHash)) {
-                        // Something else has this hash
-                        logger.warning("Duplicate/Collision: " + child.get("@id").getAsString() + " has SHA1 Hash: "
-                                + childHash);
                     }
-                    checksumMap.put(childPath, childHash);
+                    if (hashtype != null && !hashtype.equals(childHashType)) {
+                        logger.warning("Multiple hash values in use - will calculate " + hashtype.toString()
+                            + " hashes for " + childTitle);
+                    } else {
+                        childHash = child.getAsJsonObject(JsonLDTerm.checksum.getLabel()).get("@value").getAsString();
+                        if (checksumMap.containsValue(childHash)) {
+                            // Something else has this hash
+                            logger.warning("Duplicate/Collision: " + child.get("@id").getAsString() + " has SHA1 Hash: "
+                                + childHash + " in: " + bagID);
+                        }
+                        logger.fine("Adding " + childPath + " with hash " + childHash + " to checksumMap");
+                        checksumMap.put(childPath, childHash);
+                    }
                 }
                 if ((hashtype == null) | ignorehashes) {
                     // Pick sha512 when ignoring hashes or none exist
@@ -567,8 +591,8 @@ private void processContainer(JsonObject item, String currentPath) throws IOExce
                             }
 
                         } catch (IOException e) {
-                            // TODO Auto-generated catch block
-                            e.printStackTrace();
+                            logger.severe("Failed to read " + childPath);
+                            throw e;
                         } finally {
                             IOUtils.closeQuietly(inputStream);
                         }
@@ -662,12 +686,7 @@ private void createFileFromString(final String relPath, final String content)
         archiveEntry.setMethod(ZipEntry.DEFLATED);
         InputStreamSupplier supp = new InputStreamSupplier() {
             public InputStream get() {
-                try {
-                    return new ByteArrayInputStream(content.getBytes("UTF-8"));
-                } catch (UnsupportedEncodingException e) {
-                    e.printStackTrace();
-                }
-                return null;
+                return new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));
             }
         };
 
@@ -683,29 +702,39 @@ private void createFileFromURL(final String relPath, final String uri)
         addEntry(archiveEntry, supp);
     }
 
-    private void checkFiles(HashMap<String, String> shaMap, ZipFile zf) {
+    private void checkFiles(HashMap<String, String> shaMap, File bagFile) {
         ExecutorService executor = Executors.newFixedThreadPool(numConnections);
-        BagValidationJob.setZipFile(zf);
-        BagValidationJob.setBagGenerator(this);
-        logger.fine("Validating hashes for zipped data files");
-        int i = 0;
-        for (Entry<String, String> entry : shaMap.entrySet()) {
-            BagValidationJob vj = new BagValidationJob(entry.getValue(), entry.getKey());
-            executor.execute(vj);
-            i++;
-            if (i % 1000 == 0) {
-                logger.info("Queuing Hash Validations: " + i);
-            }
-        }
-        logger.fine("All Hash Validations Queued: " + i);
-
-        executor.shutdown();
+        ZipFile zf = null;
         try {
-            while (!executor.awaitTermination(10, TimeUnit.MINUTES)) {
-                logger.fine("Awaiting completion of hash calculations.");
+            zf = new ZipFile(bagFile);
+
+            BagValidationJob.setZipFile(zf);
+            BagValidationJob.setBagGenerator(this);
+            logger.fine("Validating hashes for zipped data files");
+            int i = 0;
+            for (Entry<String, String> entry : shaMap.entrySet()) {
+                BagValidationJob vj = new BagValidationJob(bagName, entry.getValue(), entry.getKey());
+                executor.execute(vj);
+                i++;
+                if (i % 1000 == 0) {
+                    logger.info("Queuing Hash Validations: " + i);
+                }
             }
-        } catch (InterruptedException e) {
-            logger.log(Level.SEVERE,"Hash Calculations interrupted", e);
+            logger.fine("All Hash Validations Queued: " + i);
+
+            executor.shutdown();
+            try {
+                while (!executor.awaitTermination(10, TimeUnit.MINUTES)) {
+                    logger.fine("Awaiting completion of hash calculations.");
+                }
+            } catch (InterruptedException e) {
+                logger.log(Level.SEVERE, "Hash Calculations interrupted", e);
+            } 
+        } catch (IOException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        } finally {
+            IOUtils.closeQuietly(zf);
         }
         logger.fine("Hash Validations Completed");
 
@@ -754,8 +783,10 @@ private String generateInfoFile() {
                         info.append(CRLF);
 
                     } else {
-                        info.append(((JsonObject) person).get(contactNameTerm.getLabel()).getAsString());
-                        info.append(CRLF);
+                        if(contactNameTerm != null) {
+                          info.append(((JsonObject) person).get(contactNameTerm.getLabel()).getAsString());
+                          info.append(CRLF);
+                        }
                         if ((contactEmailTerm!=null) &&((JsonObject) person).has(contactEmailTerm.getLabel())) {
                             info.append("Contact-Email: ");
                             info.append(((JsonObject) person).get(contactEmailTerm.getLabel()).getAsString());
@@ -772,9 +803,10 @@ private String generateInfoFile() {
 
                 } else {
                     JsonObject person = contacts.getAsJsonObject();
-
-                    info.append(person.get(contactNameTerm.getLabel()).getAsString());
-                    info.append(CRLF);
+                    if(contactNameTerm != null) {
+                      info.append(person.get(contactNameTerm.getLabel()).getAsString());
+                      info.append(CRLF);
+                    }
                     if ((contactEmailTerm!=null) && (person.has(contactEmailTerm.getLabel()))) {
                         info.append("Contact-Email: ");
                         info.append(person.get(contactEmailTerm.getLabel()).getAsString());
@@ -787,17 +819,20 @@ private String generateInfoFile() {
             logger.warning("No contact info available for BagIt Info file");
         }
 
-        info.append("Source-Organization: " + BundleUtil.getStringFromBundle("bagit.sourceOrganization"));
+        String orgName = JvmSettings.BAGIT_SOURCE_ORG_NAME.lookupOptional(String.class).orElse("Dataverse Installation (<Site Url>)");
+        String orgAddress = JvmSettings.BAGIT_SOURCEORG_ADDRESS.lookupOptional(String.class).orElse("<Full address>");
+        String orgEmail = JvmSettings.BAGIT_SOURCEORG_EMAIL.lookupOptional(String.class).orElse("<Email address>");
+
+        info.append("Source-Organization: " + orgName);
         // ToDo - make configurable
         info.append(CRLF);
 
-        info.append("Organization-Address: " + WordUtils.wrap(
-                BundleUtil.getStringFromBundle("bagit.sourceOrganizationAddress"), 78, CRLF + " ", true));
+        info.append("Organization-Address: " + WordUtils.wrap(orgAddress, 78, CRLF + " ", true));
+
         info.append(CRLF);
 
         // Not a BagIt standard name
-        info.append(
-                "Organization-Email: " + BundleUtil.getStringFromBundle("bagit.sourceOrganizationEmail"));
+        info.append("Organization-Email: " + orgEmail);
         info.append(CRLF);
 
         info.append("External-Description: ");
@@ -812,7 +847,7 @@ private String generateInfoFile() {
         } else {
             info.append(
                     // FixMe - handle description having subfields better
-                    WordUtils.wrap(getSingleValue(aggregation.getAsJsonObject(descriptionTerm.getLabel()),
+                    WordUtils.wrap(getSingleValue(aggregation.get(descriptionTerm.getLabel()),
                             descriptionTextTerm.getLabel()), 78, CRLF + " ", true));
 
             info.append(CRLF);
@@ -836,7 +871,7 @@ private String generateInfoFile() {
         info.append(CRLF);
 
         info.append("Internal-Sender-Identifier: ");
-        String catalog = BundleUtil.getStringFromBundle("bagit.sourceOrganization") + " Catalog";
+        String catalog = orgName + " Catalog";
         if (aggregation.has(JsonLDTerm.schemaOrg("includedInDataCatalog").getLabel())) {
             catalog = aggregation.get(JsonLDTerm.schemaOrg("includedInDataCatalog").getLabel()).getAsString();
         }
@@ -848,32 +883,35 @@ private String generateInfoFile() {
     }
 
     /**
-     * Kludge - handle when a single string is sent as an array of 1 string and, for
-     * cases where multiple values are sent when only one is expected, create a
-     * concatenated string so that information is not lost.
+     * Kludge - compound values (e.g. for descriptions) are sent as an array of
+     * objects containing key/values whereas a single value is sent as one object.
+     * For cases where multiple values are sent, create a concatenated string so
+     * that information is not lost.
      * 
-     * @param jsonObject
+     * @param jsonElement
      *            - the root json object
      * @param key
      *            - the key to find a value(s) for
      * @return - a single string
      */
-    String getSingleValue(JsonObject jsonObject, String key) {
+    String getSingleValue(JsonElement jsonElement, String key) {
         String val = "";
-        if (jsonObject.get(key).isJsonPrimitive()) {
+        if(jsonElement.isJsonObject()) {
+            JsonObject jsonObject=jsonElement.getAsJsonObject();
             val = jsonObject.get(key).getAsString();
-        } else if (jsonObject.get(key).isJsonArray()) {
-            Iterator<JsonElement> iter = jsonObject.getAsJsonArray(key).iterator();
+        } else if (jsonElement.isJsonArray()) {
+            
+            Iterator<JsonElement> iter = jsonElement.getAsJsonArray().iterator();
             ArrayList<String> stringArray = new ArrayList<String>();
             while (iter.hasNext()) {
-                stringArray.add(iter.next().getAsString());
+                stringArray.add(iter.next().getAsJsonObject().getAsJsonPrimitive(key).getAsString());
             }
             if (stringArray.size() > 1) {
-                val = StringUtils.join((String[]) stringArray.toArray(), ",");
+                val = String.join(",", stringArray);
             } else {
                 val = stringArray.get(0);
             }
-            logger.warning("Multiple values found for: " + key + ": " + val);
+            logger.fine("Multiple values found for: " + key + ": " + val);
         }
         return val;
     }
@@ -884,8 +922,8 @@ public void incrementTotalDataSize(long inc) {
         totalDataSize += inc;
     }
 
-    public String getHashtype() {
-        return hashtype.toString();
+    public ChecksumType getHashtype() {
+        return hashtype;
     }
 
     // Get's all "Has Part" children, standardized to send an array with 0,1, or
@@ -970,45 +1008,70 @@ private HttpGet createNewGetRequest(URI url, String returnType) {
         return request;
     }
 
-    InputStreamSupplier getInputStreamSupplier(final String uri) {
+    InputStreamSupplier getInputStreamSupplier(final String uriString) {
 
         return new InputStreamSupplier() {
             public InputStream get() {
-                int tries = 0;
-                while (tries < 5) {
-                    try {
-                        logger.fine("Get # " + tries + " for " + uri);
-                        HttpGet getMap = createNewGetRequest(new URI(uri), null);
-                        logger.finest("Retrieving " + tries + ": " + uri);
-                        CloseableHttpResponse response;
-                        response = client.execute(getMap, localContext);
-                        if (response.getStatusLine().getStatusCode() == 200) {
-                            logger.finest("Retrieved: " + uri);
-                            return response.getEntity().getContent();
-                        }
-                        logger.fine("Status: " + response.getStatusLine().getStatusCode());
-                        tries++;
-
-                    } catch (ClientProtocolException e) {
-                        tries += 5;
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    } catch (IOException e) {
-                        // Retry if this is a potentially temporary error such
-                        // as a timeout
-                        tries++;
-                        logger.log(Level.WARNING,"Attempt# " + tries + " : Unable to retrieve file: " + uri, e);
-                        if (tries == 5) {
-                            logger.severe("Final attempt failed for " + uri);
+                try {
+                    URI uri = new URI(uriString);
+
+                    int tries = 0;
+                    while (tries < 5) {
+
+                        logger.fine("Get # " + tries + " for " + uriString);
+                        HttpGet getFile = createNewGetRequest(uri, null);
+                        logger.finest("Retrieving " + tries + ": " + uriString);
+                        CloseableHttpResponse response = null;
+                        try {
+                            response = client.execute(getFile);
+                            // Note - if we ever need to pass an HttpClientContext, we need a new one per
+                            // thread.
+                            int statusCode = response.getStatusLine().getStatusCode();
+                            if (statusCode == 200) {
+                                logger.finest("Retrieved: " + uri);
+                                return response.getEntity().getContent();
+                            }
+                            logger.warning("Attempt: " + tries + " - Unexpected Status when retrieving " + uriString
+                                    + " : " + statusCode);
+                            if (statusCode < 500) {
+                                logger.fine("Will not retry for 40x errors");
+                                tries += 5;
+                            } else {
+                                tries++;
+                            }
+                            // Error handling
+                            if (response != null) {
+                                try {
+                                    EntityUtils.consumeQuietly(response.getEntity());
+                                    response.close();
+                                } catch (IOException io) {
+                                    logger.warning(
+                                            "Exception closing response after status: " + statusCode + " on " + uri);
+                                }
+                            }
+                        } catch (ClientProtocolException e) {
+                            tries += 5;
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        } catch (IOException e) {
+                            // Retry if this is a potentially temporary error such
+                            // as a timeout
+                            tries++;
+                            logger.log(Level.WARNING, "Attempt# " + tries + " : Unable to retrieve file: " + uriString,
+                                    e);
+                            if (tries == 5) {
+                                logger.severe("Final attempt failed for " + uriString);
+                            }
+                            e.printStackTrace();
                         }
-                        e.printStackTrace();
-                    } catch (URISyntaxException e) {
-                        tries += 5;
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
+
                     }
+
+                } catch (URISyntaxException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
                 }
-                logger.severe("Could not read: " + uri);
+                logger.severe("Could not read: " + uriString);
                 return null;
             }
         };
@@ -1060,4 +1123,9 @@ public void setAuthenticationKey(String tokenString) {
         apiKey = tokenString;
     }
 
+    public void setNumConnections(int numConnections) {
+        this.numConnections = numConnections;
+        logger.fine("BagGenerator will use " + numConnections + " threads");
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidation.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidation.java
new file mode 100644
index 00000000000..172e384432f
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidation.java
@@ -0,0 +1,115 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class BagValidation {
+
+    private final Optional<String> errorMessage;
+    private final Map<Path, FileValidationResult> fileResults;
+
+    public BagValidation(Optional<String> errorMessage) {
+        this.errorMessage = errorMessage == null ? Optional.empty() : errorMessage;
+        this.fileResults = new LinkedHashMap<>();
+    }
+
+    public FileValidationResult addFileResult(Path filePath) {
+        FileValidationResult fileResult = new FileValidationResult(filePath);
+        fileResults.put(filePath, fileResult);
+        return fileResult;
+    }
+
+    public Optional<String> getErrorMessage() {
+        return errorMessage;
+    }
+
+    public Map<Path, FileValidationResult> getFileResults() {
+        return Collections.unmodifiableMap(fileResults);
+    }
+
+    public List<String> getAllErrors() {
+        Stream<String> mainError = getErrorMessage().stream();
+        Stream<String> fileErrors = getFileResults().values().stream().filter(result -> result.isError()).map(result -> result.getMessage());
+        return Stream.concat(mainError, fileErrors).collect(Collectors.toList());
+    }
+
+    public long errors() {
+        return fileResults.values().stream().filter(result -> result.isError()).count();
+    }
+
+    public boolean success() {
+        return errorMessage.isEmpty() && fileResults.values().stream().allMatch(result -> result.isSuccess());
+    }
+
+    public String report() {
+        long fileResultsPending = fileResults.values().stream().filter(result -> result.isPending()).count();
+        long fileResultsSuccess = fileResults.values().stream().filter(result -> result.isSuccess()).count();
+        long fileResultsError = fileResults.values().stream().filter(result -> result.isError()).count();
+        return String.format("BagValidation{success=%s, errorMessage=%s, fileResultsItems=%s, fileResultsSuccess=%s, fileResultsPending=%s, fileResultsError=%s}", success(), errorMessage, fileResults.size(), fileResultsSuccess, fileResultsPending, fileResultsError);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("BagValidation{errorMessage=%s, fileResultsItems=%s}", errorMessage, fileResults.size());
+    }
+
+    public static class FileValidationResult {
+        public static enum Status {
+            PENDING, SUCCESS, ERROR;
+        }
+
+        private final Path filePath;
+        private Status status;
+        private String message;
+
+        public FileValidationResult(Path filePath) {
+            this.filePath = filePath;
+            this.status = Status.PENDING;
+        }
+
+        public Path getFilePath() {
+            return filePath;
+        }
+
+        public void setSuccess() {
+            this.status = Status.SUCCESS;
+        }
+
+        public void setError(String message) {
+            this.status = Status.ERROR;
+            this.message = message;
+        }
+
+        public boolean isPending() {
+            return status.equals(Status.PENDING);
+        }
+
+        public boolean isSuccess() {
+            return status.equals(Status.SUCCESS);
+        }
+
+        public boolean isError() {
+            return status.equals(Status.ERROR);
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("FileValidationResult{filePath=%s, status=%s, message=%s}", filePath, status, message);
+        }
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidationJob.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidationJob.java
index 7a32b96f4a0..7ac9fd701b8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidationJob.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidationJob.java
@@ -25,6 +25,7 @@
 import org.apache.commons.compress.archivers.zip.ZipFile;
 
 import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DataFile.ChecksumType;
 
 import org.apache.commons.compress.utils.IOUtils;
 
@@ -41,13 +42,15 @@ public class BagValidationJob implements Runnable {
 
     private String hash;
     private String name;
-    private static String hashtype;
+    private String basePath;
+    private static ChecksumType hashtype;
 
-    public BagValidationJob(String value, String key) throws IllegalStateException {
+    public BagValidationJob(String bagName, String value, String key) throws IllegalStateException {
         if (zf == null || bagGenerator == null) {
             throw new IllegalStateException(
                     "Static Zipfile and BagGenerator must be set before creating ValidationJobs");
         }
+        basePath=bagName;
         hash = value;
         name = key;
 
@@ -60,11 +63,11 @@ public BagValidationJob(String value, String key) throws IllegalStateException {
      */
     public void run() {
 
-        String realHash = generateFileHash(name, zf);
+        String realHash = generateFileHash(basePath + "/" + name, zf);
         if (hash.equals(realHash)) {
             log.fine("Valid hash for " + name);
         } else {
-            log.severe("Invalid " + bagGenerator.getHashtype() + " for " + name);
+            log.severe("Invalid " + bagGenerator.getHashtype().name() + " for " + name);
             log.fine("As sent: " + hash);
             log.fine("As calculated: " + realHash);
         }
@@ -72,12 +75,16 @@ public void run() {
 
     private String generateFileHash(String name, ZipFile zf) {
 
+        String realHash = null;
+        
         ZipArchiveEntry archiveEntry1 = zf.getEntry(name);
+        
+        if(archiveEntry1 != null) {
         // Error check - add file sizes to compare against supplied stats
-
+        log.fine("Getting stream for " + name);
         long start = System.currentTimeMillis();
         InputStream inputStream = null;
-        String realHash = null;
+        
         try {
             inputStream = zf.getInputStream(archiveEntry1);
             if (hashtype.equals(DataFile.ChecksumType.SHA1)) {
@@ -89,7 +96,7 @@ private String generateFileHash(String name, ZipFile zf) {
             } else if (hashtype.equals(DataFile.ChecksumType.MD5)) {
                 realHash = DigestUtils.md5Hex(inputStream);
             } else {
-                log.warning("Unknown hash type: " + hashtype);
+                log.warning("Unknown hash type: " + hashtype.name());
             }
 
         } catch (ZipException e) {
@@ -104,6 +111,9 @@ private String generateFileHash(String name, ZipFile zf) {
         log.fine("Retrieve/compute time = " + (System.currentTimeMillis() - start) + " ms");
         // Error check - add file sizes to compare against supplied stats
         bagGenerator.incrementTotalDataSize(archiveEntry1.getSize());
+        } else {
+            log.warning("Entry " + name + " not found in zipped bag: not validated");
+        }
         return realHash;
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidator.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidator.java
new file mode 100644
index 00000000000..a9052bf4c80
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidator.java
@@ -0,0 +1,155 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.bagit.BagValidation.FileValidationResult;
+import edu.harvard.iq.dataverse.util.bagit.ManifestReader.ManifestChecksum;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider.InputStreamProvider;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class BagValidator {
+
+    private static final Logger logger = Logger.getLogger(BagValidator.class.getCanonicalName());
+
+    public static enum BagValidatorSettings {
+        JOB_POOL_SIZE(":BagValidatorJobPoolSize", 4),
+        MAX_ERRORS(":BagValidatorMaxErrors", 5),
+        JOB_WAIT_INTERVAL(":BagValidatorJobWaitInterval", 10);
+
+        private String settingsKey;
+        private Integer defaultValue;
+
+        private BagValidatorSettings(String settingsKey, Integer defaultValue) {
+            this.settingsKey = settingsKey;
+            this.defaultValue = defaultValue;
+        }
+
+        public String getSettingsKey() {
+            return settingsKey;
+        }
+
+        public Integer getDefaultValue() {
+            return defaultValue;
+        }
+    }
+
+    private static final String BAGIT_FILE_MARKER = "bagit.txt";
+
+    private final Integer validatorJobPoolSize;
+    private final Integer maxErrors;
+    private final Integer jobWaitIntervalInSeconds;
+    private final ManifestReader manifestReader;
+
+    public BagValidator(ManifestReader manifestReader) {
+        this(BagValidatorSettings.JOB_POOL_SIZE.getDefaultValue(), BagValidatorSettings.MAX_ERRORS.getDefaultValue(), BagValidatorSettings.JOB_WAIT_INTERVAL.getDefaultValue(), manifestReader);
+    }
+
+    public BagValidator(Integer validatorJobPoolSize, Integer maxErrors, Integer jobWaitIntervalInSeconds, ManifestReader manifestReader) {
+        this.validatorJobPoolSize = validatorJobPoolSize == null ? BagValidatorSettings.JOB_POOL_SIZE.getDefaultValue() : validatorJobPoolSize;
+        this.maxErrors = maxErrors == null ? BagValidatorSettings.MAX_ERRORS.getDefaultValue() : maxErrors;
+        this.jobWaitIntervalInSeconds = jobWaitIntervalInSeconds == null ? BagValidatorSettings.JOB_WAIT_INTERVAL.getDefaultValue() : jobWaitIntervalInSeconds;
+        this.manifestReader = manifestReader;
+    }
+
+    public boolean hasBagItPackage(FileDataProvider fileDataProvider) {
+        Optional<Path> bagItFile = getBagItFile(fileDataProvider.getFilePaths());
+        if(bagItFile.isEmpty()) {
+            return false;
+        }
+
+        Path bagRoot = getBagItRoot(bagItFile.get());
+        Optional<Path> supportedManifest = manifestReader.getSupportedManifest(fileDataProvider, bagRoot);
+        return supportedManifest.isPresent();
+    }
+
+    public BagValidation validateChecksums(FileDataProvider fileDataProvider) {
+        Optional<Path> bagItFile = getBagItFile(fileDataProvider.getFilePaths());
+        if (bagItFile.isEmpty()) {
+            logger.warning(String.format("action=validateBag result=bag-marker-file-not-found fileDataProvider=%s", fileDataProvider.getName()));
+            return new BagValidation(Optional.of(getMessage("bagit.validation.bag.file.not.found", fileDataProvider.getName())));
+        }
+
+        Path bagRoot = getBagItRoot(bagItFile.get());
+        Optional<ManifestChecksum> manifestChecksum = manifestReader.getManifestChecksums(fileDataProvider, bagRoot);
+        if (manifestChecksum.isEmpty()) {
+            logger.warning(String.format("action=validateBag result=no-supported-manifest-found fileDataProvider=%s", fileDataProvider.getName()));
+            return new BagValidation(Optional.of(getMessage("bagit.validation.manifest.not.supported", fileDataProvider.getName(), BagChecksumType.asList())));
+        }
+
+        BagValidation bagValidation = validateChecksums(fileDataProvider, manifestChecksum.get());
+        logger.fine(String.format("action=validateBag completed fileDataProvider=%s bagValidation=%s", fileDataProvider.getName(), bagValidation));
+        return bagValidation;
+    }
+
+    private Optional<Path> getBagItFile(List<Path> filePaths) {
+        return filePaths.stream().filter(path -> path.endsWith(BAGIT_FILE_MARKER)).findFirst();
+    }
+
+    private Path getBagItRoot(Path bagItFile) {
+        Path bagRoot = Optional.ofNullable(bagItFile.getParent()).filter(path -> path != null).orElse(Path.of(""));
+        return bagRoot;
+    }
+
+    private BagValidation validateChecksums(FileDataProvider fileDataProvider, ManifestChecksum manifestChecksums) {
+        ExecutorService executor = getExecutorService();
+        BagValidation bagValidationResults = new BagValidation(Optional.empty());
+        logger.fine(String.format("action=validateChecksums start name=%s type=%s files=%s", fileDataProvider.getName(), manifestChecksums.getType(), manifestChecksums.getFileChecksums().size()));
+        for(Map.Entry<Path, String> checksumEntry:  manifestChecksums.getFileChecksums().entrySet()) {
+            Path filePath = checksumEntry.getKey();
+            String fileChecksum = checksumEntry.getValue();
+            FileValidationResult fileValidationResult = bagValidationResults.addFileResult(filePath);
+            Optional<InputStreamProvider> inputStreamProvider = fileDataProvider.getInputStreamProvider(filePath);
+            if(inputStreamProvider.isPresent()) {
+                FileChecksumValidationJob validationJob = new FileChecksumValidationJob(inputStreamProvider.get(), filePath, fileChecksum, manifestChecksums.getType(), fileValidationResult);
+                executor.execute(validationJob);
+            } else {
+                fileValidationResult.setError(getMessage("bagit.validation.file.not.found", filePath, fileDataProvider.getName()));
+            }
+
+        }
+
+        executor.shutdown();
+        try {
+            while (!executor.awaitTermination(jobWaitIntervalInSeconds, TimeUnit.SECONDS)) {
+                logger.fine(String.format("action=validateChecksums result=waiting-completion name=%s type=%s files=%s", fileDataProvider.getName(), manifestChecksums.getType(), manifestChecksums.getFileChecksums().size()));
+                if(bagValidationResults.errors() > maxErrors) {
+                    logger.info(String.format("action=validateChecksums result=max-errors-reached name=%s type=%s files=%s bagValidationResults=%s", fileDataProvider.getName(), manifestChecksums.getType(), manifestChecksums.getFileChecksums().size(), bagValidationResults.report()));
+                    executor.shutdownNow();
+                }
+            }
+        } catch (InterruptedException e) {
+            logger.log(Level.SEVERE, String.format("action=validateChecksums result=error message=unable-to-complete-checksums name=%s type=%s files=%s", fileDataProvider.getName(), manifestChecksums.getType(), manifestChecksums.getFileChecksums().size()), e);
+            executor.shutdownNow();
+            return new BagValidation(Optional.of(getMessage("bagit.validation.exception", fileDataProvider.getName())));
+        }
+
+        logger.fine(String.format("action=validateChecksums completed file=%s name=%s files=%s", fileDataProvider.getName(), manifestChecksums.getType(), manifestChecksums.getFileChecksums().size()));
+        return bagValidationResults;
+    }
+
+    // Visible for testing
+    ExecutorService getExecutorService() {
+        return Executors.newFixedThreadPool(validatorJobPoolSize);
+    }
+
+    // Visible for testing
+    String getMessage(String propertyKey, Object... parameters){
+        List<String> parameterList = Arrays.stream(parameters).map(param -> param.toString()).collect(Collectors.toList());
+        return BundleUtil.getStringFromBundle(propertyKey, parameterList);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/FileChecksumValidationJob.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/FileChecksumValidationJob.java
new file mode 100644
index 00000000000..5bea2fe3ced
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/FileChecksumValidationJob.java
@@ -0,0 +1,61 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.bagit.BagValidation.FileValidationResult;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider.InputStreamProvider;
+import org.apache.commons.compress.utils.IOUtils;
+
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class FileChecksumValidationJob implements Runnable {
+
+    private static final Logger logger = Logger.getLogger(FileChecksumValidationJob.class.getCanonicalName());
+
+    private final InputStreamProvider inputStreamProvider;
+    private final Path filePath;
+    private final String fileChecksum;
+    private final BagChecksumType bagChecksumType;
+    private final FileValidationResult result;
+
+    public FileChecksumValidationJob(InputStreamProvider inputStreamProvider, Path filePath, String fileChecksum, BagChecksumType bagChecksumType, FileValidationResult result) {
+        this.inputStreamProvider = inputStreamProvider;
+        this.filePath = filePath;
+        this.fileChecksum = fileChecksum;
+        this.bagChecksumType = bagChecksumType;
+        this.result = result;
+    }
+
+    public void run() {
+        InputStream inputStream = null;
+        try {
+            inputStream = inputStreamProvider.getInputStream();
+            String calculatedChecksum = bagChecksumType.getInputStreamDigester().digest(inputStream);
+            if (fileChecksum.equals(calculatedChecksum)) {
+                result.setSuccess();
+            } else {
+                result.setError(getMessage("bagit.checksum.validation.error", filePath, bagChecksumType, fileChecksum, calculatedChecksum));
+            }
+        } catch (Exception e) {
+            result.setError(getMessage("bagit.checksum.validation.exception", filePath, bagChecksumType, e.getMessage()));
+            logger.log(Level.WARNING, String.format("action=validate-checksum result=error filePath=%s type=%s", filePath, bagChecksumType), e);
+        } finally {
+            IOUtils.closeQuietly(inputStream);
+        }
+    }
+
+    private String getMessage(String propertyKey, Object... parameters){
+        List<String> parameterList = Arrays.stream(parameters).map(param -> param.toString()).collect(Collectors.toList());
+        return BundleUtil.getStringFromBundle(propertyKey, parameterList);
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/ManifestReader.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/ManifestReader.java
new file mode 100644
index 00000000000..a6f1113c891
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/ManifestReader.java
@@ -0,0 +1,105 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider.InputStreamProvider;
+import org.apache.commons.compress.utils.IOUtils;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class ManifestReader {
+
+    private static final Logger logger = Logger.getLogger(ManifestReader.class.getCanonicalName());
+
+    public Optional<Path> getSupportedManifest(FileDataProvider fileDataProvider, Path bagRoot) {
+        for(BagChecksumType type: BagChecksumType.values()) {
+            Path manifestPath = bagRoot.resolve(type.getFileName());
+            Optional<InputStreamProvider> manifestEntry = fileDataProvider.getInputStreamProvider(manifestPath);
+            if (manifestEntry.isPresent()) {
+                return Optional.of(manifestPath);
+            }
+        }
+
+        return Optional.empty();
+    }
+
+    public Optional<ManifestChecksum> getManifestChecksums(FileDataProvider fileDataProvider, Path bagRoot) {
+        for(BagChecksumType type: BagChecksumType.values()) {
+            Path manifestPath = bagRoot.resolve(type.getFileName());
+            try {
+                Optional<InputStreamProvider> manifestEntry = fileDataProvider.getInputStreamProvider(manifestPath);
+                if (manifestEntry.isPresent()) {
+                    Map<Path, String> checksums = readManifestChecksums(bagRoot, manifestEntry.get().getInputStream());
+                    ManifestChecksum manifestChecksum = new ManifestChecksum(manifestPath, type, checksums);
+                    logger.log(Level.FINE, String.format("action=getManifestChecksums result=success fileDataProvider=%S bagRoot=%s manifestChecksum=%s", fileDataProvider.getName(), bagRoot, manifestChecksum));
+                    return Optional.of(manifestChecksum);
+                }
+            } catch (Exception e) {
+                logger.log(Level.WARNING, String.format("action=getManifestChecksums result=error fileDataProvider=%s bagRoot=%s manifestPath=%s", fileDataProvider.getName(), bagRoot, manifestPath), e);
+                return Optional.empty();
+            }
+        }
+        logger.log(Level.WARNING,String.format("action=getManifestChecksums result=no-supported-manifest-found fileDataProvider=%s bagRoot=%s supportedTypes=%s", fileDataProvider.getName(), bagRoot, BagChecksumType.asList()));
+        return Optional.empty();
+    }
+
+    private Map<Path, String> readManifestChecksums(Path bagRoot, InputStream manifestEntry) throws Exception{
+        final HashMap<Path, String> checksumsMap = new HashMap<>();
+        try {
+            BufferedReader br = new BufferedReader(new InputStreamReader(manifestEntry));
+            String line = br.readLine();
+            while(line != null){
+                final String[] parts = line.split("\\s+", 2);
+                final Path file = bagRoot.resolve(Path.of(parts[1]));
+                final String hash = parts[0];
+                checksumsMap.put(file, hash);
+                line = br.readLine();
+            }
+        } finally {
+            IOUtils.closeQuietly(manifestEntry);
+        }
+
+        return checksumsMap;
+    }
+
+    public static class ManifestChecksum {
+        private final Path manifestFile;
+        private final BagChecksumType type;
+        private final Map<Path, String> fileChecksums;
+
+        public ManifestChecksum(Path manifestFile, BagChecksumType type, Map<Path, String> fileChecksums) {
+            this.manifestFile = manifestFile;
+            this.type = type;
+            this.fileChecksums = fileChecksums != null ? fileChecksums : Collections.emptyMap();
+        }
+
+        public Path getManifestFile() {
+            return manifestFile;
+        }
+
+        public BagChecksumType getType() {
+            return type;
+        }
+
+        public Map<Path, String> getFileChecksums() {
+            return fileChecksums;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("ManifestChecksum{manifestFile=%s, type=%s, fileChecksumItems=%s}", manifestFile, type, fileChecksums.size());
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMap.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMap.java
index 5520de3954e..4cbc2aa7b9a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMap.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMap.java
@@ -1,55 +1,94 @@
 package edu.harvard.iq.dataverse.util.bagit;
 
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetField;
-import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
-import edu.harvard.iq.dataverse.DatasetFieldConstant;
-import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
 import edu.harvard.iq.dataverse.export.OAI_OREExporter;
-import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.util.json.JsonLDNamespace;
 import edu.harvard.iq.dataverse.util.json.JsonLDTerm;
 import edu.harvard.iq.dataverse.util.json.JsonPrinter;
 
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
 import java.util.TreeMap;
 import java.util.Map.Entry;
-
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
-
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
+/**
+ * This class is used to generate a JSON-LD representation of a Dataverse object leveraging the OAI_ORE and other community vocabularies. As of v1.0.0,
+ * the format is being versioned and ANY CHANGES TO THE OUTPUT of this class must be reflected in a version increment (see DATAVERSE_ORE_FORMAT_VERSION).
+ * 
+ * The OREMap class is intended to record ALL the information needed to recreate an existing Dataverse dataset. As of v1.0.0, this is true with the 
+ * exception that auxiliary files are not referenced in the OREMap. While many types of auxiliary files will be regenerated automatically based on datafile
+ *  contents, Dataverse now allows manually uploaded auxiliary files and these cannot be reproduced solely from the dataset/datafile contents. 
+ */
 public class OREMap {
 
+    //Required Services
+    static SettingsServiceBean settingsService;
+    static DatasetFieldServiceBean datasetFieldService;
+    static SystemConfig systemConfig;
+    
+    private static final Logger logger = Logger.getLogger(OREMap.class.getCanonicalName());
+    
     public static final String NAME = "OREMap";
+    
+    //NOTE: Update this value whenever the output of this class is changed
+    private static final String DATAVERSE_ORE_FORMAT_VERSION = "Dataverse OREMap Format v1.0.1";
+    //v1.0.1 - added versionNote
+    private static final String DATAVERSE_SOFTWARE_NAME = "Dataverse";
+    private static final String DATAVERSE_SOFTWARE_URL = "https://github.com/iqss/dataverse";
+    
+    
     private Map<String, String> localContext = new TreeMap<String, String>();
     private DatasetVersion version;
-    private boolean excludeEmail = false;
-    
-    public OREMap(DatasetVersion version, boolean excludeEmail) {
+    private Boolean excludeEmail = null;
+
+    public OREMap(DatasetVersion version) {
         this.version = version;
-        this.excludeEmail = excludeEmail;
+    }
+
+    //Used when the ExcludeEmailFromExport needs to be overriden, i.e. for archiving
+    public OREMap(DatasetVersion dv, boolean exclude) {
+        this.version = dv;
+        this.excludeEmail = exclude;
     }
 
     public void writeOREMap(OutputStream outputStream) throws Exception {
-        outputStream.write(getOREMap().toString().getBytes("UTF8"));
+        outputStream.write(getOREMap().toString().getBytes(StandardCharsets.UTF_8));
         outputStream.flush();
     }
 
-    public JsonObject getOREMap() throws Exception {
+    public JsonObject getOREMap() {
+        return getOREMap(false);
+    }
+    
+    public JsonObject getOREMap(boolean aggregationOnly) {
+        return getOREMapBuilder(aggregationOnly).build();
+    }
+    
+    public JsonObjectBuilder getOREMapBuilder(boolean aggregationOnly) {
 
+        //Set this flag if it wasn't provided
+        if(excludeEmail==null) {
+            excludeEmail = settingsService.isTrueForKey(SettingsServiceBean.Key.ExcludeEmailFromExport, false);
+        }
+        
         // Add namespaces we'll definitely use to Context
         // Additional namespaces are added as needed below
         localContext.putIfAbsent(JsonLDNamespace.ore.getPrefix(), JsonLDNamespace.ore.getUrl());
@@ -58,71 +97,21 @@ public JsonObject getOREMap() throws Exception {
         localContext.putIfAbsent(JsonLDNamespace.schema.getPrefix(), JsonLDNamespace.schema.getUrl());
 
         Dataset dataset = version.getDataset();
-        String id = dataset.getGlobalId().asString();
+        String id = dataset.getGlobalId().asURL();
         JsonArrayBuilder fileArray = Json.createArrayBuilder();
         // The map describes an aggregation
         JsonObjectBuilder aggBuilder = Json.createObjectBuilder();
         List<DatasetField> fields = version.getDatasetFields();
         // That has it's own metadata
+        Map<Long, JsonObject> cvocMap = datasetFieldService.getCVocConf(true);
         for (DatasetField field : fields) {
             if (!field.isEmpty()) {
                 DatasetFieldType dfType = field.getDatasetFieldType();
-                if(excludeEmail && DatasetFieldType.FieldType.EMAIL.equals(dfType.getFieldType())) {
-                    continue;
-                }
-                JsonLDTerm fieldName = getTermFor(dfType);
-                if (fieldName.inNamespace()) {
-                    localContext.putIfAbsent(fieldName.getNamespace().getPrefix(), fieldName.getNamespace().getUrl());
-                } else {
-                    localContext.putIfAbsent(fieldName.getLabel(), fieldName.getUrl());
+                JsonLDTerm fieldName = dfType.getJsonLDTerm();
+                JsonValue jv = getJsonLDForField(field, excludeEmail, cvocMap, localContext);
+                if(jv!=null) {
+                    aggBuilder.add(fieldName.getLabel(), jv);
                 }
-                JsonArrayBuilder vals = Json.createArrayBuilder();
-                if (!dfType.isCompound()) {
-                    for (String val : field.getValues_nondisplay()) {
-                        vals.add(val);
-                    }
-                } else {
-                    // ToDo: Needs to be recursive (as in JsonPrinter?)
-                    for (DatasetFieldCompoundValue dscv : field.getDatasetFieldCompoundValues()) {
-                        // compound values are of different types
-                        JsonObjectBuilder child = Json.createObjectBuilder();
-
-                        for (DatasetField dsf : dscv.getChildDatasetFields()) {
-                            DatasetFieldType dsft = dsf.getDatasetFieldType();
-                            if(excludeEmail && DatasetFieldType.FieldType.EMAIL.equals(dsft.getFieldType())) {
-                                continue;
-                            }
-                            // which may have multiple values
-                            if (!dsf.isEmpty()) {
-                                // Add context entry 
-                                //ToDo - also needs to recurse here?
-                                JsonLDTerm subFieldName = getTermFor(dfType, dsft);
-                                if (subFieldName.inNamespace()) {
-                                    localContext.putIfAbsent(subFieldName.getNamespace().getPrefix(),
-                                            subFieldName.getNamespace().getUrl());
-                                } else {
-                                    localContext.putIfAbsent(subFieldName.getLabel(), subFieldName.getUrl());
-                                }
-
-                                List<String> values = dsf.getValues_nondisplay();
-                                if (values.size() > 1) {
-                                    JsonArrayBuilder childVals = Json.createArrayBuilder();
-
-                                    for (String val : dsf.getValues_nondisplay()) {
-                                        childVals.add(val);
-                                    }
-                                    child.add(subFieldName.getLabel(), childVals);
-                                } else {
-                                    child.add(subFieldName.getLabel(), values.get(0));
-                                }
-                            }
-                        }
-                        vals.add(child);
-                    }
-                }
-                // Add metadata value to aggregation, suppress array when only one value
-                JsonArray valArray = vals.build();
-                aggBuilder.add(fieldName.getLabel(), (valArray.size() != 1) ? valArray : valArray.get(0));
             }
         }
         // Add metadata related to the Dataset/DatasetVersion
@@ -131,25 +120,38 @@ public JsonObject getOREMap() throws Exception {
                         Json.createArrayBuilder().add(JsonLDTerm.ore("Aggregation").getLabel())
                                 .add(JsonLDTerm.schemaOrg("Dataset").getLabel()))
                 .add(JsonLDTerm.schemaOrg("version").getLabel(), version.getFriendlyVersionNumber())
-                .add(JsonLDTerm.schemaOrg("datePublished").getLabel(), dataset.getPublicationDateFormattedYYYYMMDD())
                 .add(JsonLDTerm.schemaOrg("name").getLabel(), version.getTitle())
                 .add(JsonLDTerm.schemaOrg("dateModified").getLabel(), version.getLastUpdateTime().toString());
+        addIfNotNull(aggBuilder, JsonLDTerm.schemaOrg("datePublished"), dataset.getPublicationDateFormattedYYYYMMDD());
+        addIfNotNull(aggBuilder, JsonLDTerm.DVCore("versionNote"), version.getVersionNote());
+        
+        //Add version state info - DRAFT, RELEASED, DEACCESSIONED, ARCHIVED with extra info for DEACCESIONED
+        VersionState vs = version.getVersionState();
+        if(vs.equals(VersionState.DEACCESSIONED)) {
+            JsonObjectBuilder deaccBuilder = Json.createObjectBuilder();
+            deaccBuilder.add(JsonLDTerm.schemaOrg("name").getLabel(), vs.name());
+            deaccBuilder.add(JsonLDTerm.DVCore("reason").getLabel(), version.getDeaccessionNote());
+            addIfNotNull(deaccBuilder, JsonLDTerm.DVCore("forwardUrl"), version.getDeaccessionLink());
+            aggBuilder.add(JsonLDTerm.schemaOrg("creativeWorkStatus").getLabel(), deaccBuilder);
+            
+        } else {
+            aggBuilder.add(JsonLDTerm.schemaOrg("creativeWorkStatus").getLabel(), vs.name());
+        }
 
         TermsOfUseAndAccess terms = version.getTermsOfUseAndAccess();
-        if (terms.getLicense() == TermsOfUseAndAccess.License.CC0) {
+        if (terms.getLicense() != null) {
             aggBuilder.add(JsonLDTerm.schemaOrg("license").getLabel(),
-                    "https://creativecommons.org/publicdomain/zero/1.0/");
+                    terms.getLicense().getUri().toString());
         } else {
             addIfNotNull(aggBuilder, JsonLDTerm.termsOfUse, terms.getTermsOfUse());
+            addIfNotNull(aggBuilder, JsonLDTerm.confidentialityDeclaration, terms.getConfidentialityDeclaration());
+            addIfNotNull(aggBuilder, JsonLDTerm.specialPermissions, terms.getSpecialPermissions());
+            addIfNotNull(aggBuilder, JsonLDTerm.restrictions, terms.getRestrictions());
+            addIfNotNull(aggBuilder, JsonLDTerm.citationRequirements, terms.getCitationRequirements());
+            addIfNotNull(aggBuilder, JsonLDTerm.depositorRequirements, terms.getDepositorRequirements());
+            addIfNotNull(aggBuilder, JsonLDTerm.conditions, terms.getConditions());
+            addIfNotNull(aggBuilder, JsonLDTerm.disclaimer, terms.getDisclaimer());
         }
-        addIfNotNull(aggBuilder, JsonLDTerm.confidentialityDeclaration, terms.getConfidentialityDeclaration());
-        addIfNotNull(aggBuilder, JsonLDTerm.specialPermissions, terms.getSpecialPermissions());
-        addIfNotNull(aggBuilder, JsonLDTerm.restrictions, terms.getRestrictions());
-        addIfNotNull(aggBuilder, JsonLDTerm.citationRequirements, terms.getCitationRequirements());
-        addIfNotNull(aggBuilder, JsonLDTerm.depositorRequirements, terms.getDepositorRequirements());
-        addIfNotNull(aggBuilder, JsonLDTerm.conditions, terms.getConditions());
-        addIfNotNull(aggBuilder, JsonLDTerm.disclaimer, terms.getDisclaimer());
-
         // Add fileTermsofAccess as an object since it is compound
         JsonObjectBuilder fAccess = Json.createObjectBuilder();
         addIfNotNull(fAccess, JsonLDTerm.termsOfAccess, terms.getTermsOfAccess());
@@ -166,101 +168,182 @@ public JsonObject getOREMap() throws Exception {
         }
 
         aggBuilder.add(JsonLDTerm.schemaOrg("includedInDataCatalog").getLabel(),
-                dataset.getDataverseContext().getDisplayName());
+                BrandingUtil.getInstallationBrandName());
 
+        aggBuilder.add(JsonLDTerm.schemaOrg("isPartOf").getLabel(), getDataverseDescription(dataset.getOwner()));
+        String mdl = dataset.getMetadataLanguage();
+        if (DvObjectContainer.isMetadataLanguageSet(mdl)) {
+            aggBuilder.add(JsonLDTerm.schemaOrg("inLanguage").getLabel(), mdl);
+        }
+        
         // The aggregation aggregates aggregatedresources (Datafiles) which each have
         // their own entry and metadata
         JsonArrayBuilder aggResArrayBuilder = Json.createArrayBuilder();
+        if (!aggregationOnly) {
 
-        for (FileMetadata fmd : version.getFileMetadatas()) {
-            DataFile df = fmd.getDataFile();
-            JsonObjectBuilder aggRes = Json.createObjectBuilder();
+            for (FileMetadata fmd : version.getFileMetadatas()) {
+                DataFile df = fmd.getDataFile();
+                JsonObjectBuilder aggRes = Json.createObjectBuilder();
 
-            if (fmd.getDescription() != null) {
-                aggRes.add(JsonLDTerm.schemaOrg("description").getLabel(), fmd.getDescription());
-            } else {
-                addIfNotNull(aggRes, JsonLDTerm.schemaOrg("description"), df.getDescription());
-            }
-            addIfNotNull(aggRes, JsonLDTerm.schemaOrg("name"), fmd.getLabel()); // "label" is the filename
-            addIfNotNull(aggRes, JsonLDTerm.restricted, fmd.isRestricted());
-            addIfNotNull(aggRes, JsonLDTerm.directoryLabel, fmd.getDirectoryLabel());
-            addIfNotNull(aggRes, JsonLDTerm.schemaOrg("version"), fmd.getVersion());
-            addIfNotNull(aggRes, JsonLDTerm.datasetVersionId, fmd.getDatasetVersion().getId());
-            JsonArray catArray = null;
-            if (fmd != null) {
-                List<String> categories = fmd.getCategoriesByName();
-                if (categories.size() > 0) {
-                    JsonArrayBuilder jab = Json.createArrayBuilder();
-                    for (String s : categories) {
-                        jab.add(s);
+                if (fmd.getDescription() != null) {
+                    aggRes.add(JsonLDTerm.schemaOrg("description").getLabel(), fmd.getDescription());
+                } else {
+                    addIfNotNull(aggRes, JsonLDTerm.schemaOrg("description"), df.getDescription());
+                }
+                String fileName = fmd.getLabel();// "label" is the filename
+                long fileSize = df.getFilesize();
+                String mimeType = df.getContentType();
+                String currentIngestedName = null;
+                boolean ingested=df.getOriginalFileName()!= null || df.getOriginalFileSize()!=null || df.getOriginalFileFormat()!=null;
+                if(ingested) {
+                    if(df.getOriginalFileName()!=null) {
+                        currentIngestedName= fileName;
+                        fileName = df.getOriginalFileName();
+                    } else {
+                        logger.warning("Missing Original file name for id: " + df.getId());
+                    }
+                    if(df.getOriginalFileSize()!=null) {
+                        fileSize = df.getOriginalFileSize();
+                    } else {
+                        logger.warning("Missing Original file size for id: " + df.getId());
                     }
-                    catArray = jab.build();
+                    if(df.getOriginalFileFormat()!=null) {
+                        mimeType = df.getOriginalFileFormat();
+                    } else {
+                        logger.warning("Missing Original file format for id: " + df.getId());
+                    }
+
+                    
                 }
+                addIfNotNull(aggRes, JsonLDTerm.schemaOrg("name"), fileName); 
+                addIfNotNull(aggRes, JsonLDTerm.restricted, fmd.isRestricted());
+                Embargo embargo=df.getEmbargo(); 
+                if(embargo!=null) {
+                    String date = embargo.getFormattedDateAvailable();
+                    String reason= embargo.getReason();
+                    JsonObjectBuilder embargoObject = Json.createObjectBuilder();
+                    embargoObject.add(JsonLDTerm.DVCore("dateAvailable").getLabel(), date);
+                    if(reason!=null) {
+                        embargoObject.add(JsonLDTerm.DVCore("reason").getLabel(), reason);
+                    }
+                    aggRes.add(JsonLDTerm.DVCore("embargoed").getLabel(), embargoObject);
+                }
+                Retention retention = df.getRetention();
+                if(retention!=null) {
+                    String date = retention.getFormattedDateUnavailable();
+                    String reason= retention.getReason();
+                    JsonObjectBuilder retentionObject = Json.createObjectBuilder();
+                    retentionObject.add(JsonLDTerm.DVCore("dateUnavailable").getLabel(), date);
+                    if(reason!=null) {
+                        retentionObject.add(JsonLDTerm.DVCore("reason").getLabel(), reason);
+                    }
+                    aggRes.add(JsonLDTerm.DVCore("retained").getLabel(), retentionObject);
+                }
+                addIfNotNull(aggRes, JsonLDTerm.directoryLabel, fmd.getDirectoryLabel());
+                addIfNotNull(aggRes, JsonLDTerm.schemaOrg("version"), fmd.getVersion());
+                addIfNotNull(aggRes, JsonLDTerm.datasetVersionId, fmd.getDatasetVersion().getId());
+                JsonArray catArray = null;
+                if (fmd != null) {
+                    List<String> categories = fmd.getCategoriesByName();
+                    if (categories.size() > 0) {
+                        JsonArrayBuilder jab = Json.createArrayBuilder();
+                        for (String s : categories) {
+                            jab.add(s);
+                        }
+                        catArray = jab.build();
+                    }
+                }
+                addIfNotNull(aggRes, JsonLDTerm.categories, catArray);
+                // File DOI if it exists
+                String fileId = null;
+                String fileSameAs = null;
+                if (df.getGlobalId()!=null) {
+                    fileId = df.getGlobalId().asString();
+                    fileSameAs = SystemConfig.getDataverseSiteUrlStatic()
+                            + "/api/access/datafile/:persistentId?persistentId=" + fileId + (ingested ? "&format=original":"");
+                } else {
+                    fileId = SystemConfig.getDataverseSiteUrlStatic() + "/file.xhtml?fileId=" + df.getId();
+                    fileSameAs = SystemConfig.getDataverseSiteUrlStatic() + "/api/access/datafile/" + df.getId() + (ingested ? "?format=original":"");
+                }
+                aggRes.add("@id", fileId);
+                aggRes.add(JsonLDTerm.schemaOrg("sameAs").getLabel(), fileSameAs);
+                fileArray.add(fileId);
+
+                aggRes.add("@type", JsonLDTerm.ore("AggregatedResource").getLabel());
+                addIfNotNull(aggRes, JsonLDTerm.schemaOrg("fileFormat"), mimeType);
+                addIfNotNull(aggRes, JsonLDTerm.filesize, fileSize);
+                addIfNotNull(aggRes, JsonLDTerm.storageIdentifier, df.getStorageIdentifier());
+                addIfNotNull(aggRes, JsonLDTerm.currentIngestedName, currentIngestedName);
+                addIfNotNull(aggRes, JsonLDTerm.UNF, df.getUnf());
+                addIfNotNull(aggRes, JsonLDTerm.rootDataFileId, df.getRootDataFileId());
+                addIfNotNull(aggRes, JsonLDTerm.previousDataFileId, df.getPreviousDataFileId());
+                JsonObject checksum = null;
+                // Add checksum. RDA recommends SHA-512
+                if (df.getChecksumType() != null && df.getChecksumValue() != null) {
+                    checksum = Json.createObjectBuilder().add("@type", df.getChecksumType().toString())
+                            .add("@value", df.getChecksumValue()).build();
+                    aggRes.add(JsonLDTerm.checksum.getLabel(), checksum);
+                }
+                JsonArray tabTags = null;
+                JsonArrayBuilder jab = JsonPrinter.getTabularFileTags(df);
+                if (jab != null) {
+                    tabTags = jab.build();
+                }
+                addIfNotNull(aggRes, JsonLDTerm.tabularTags, tabTags);
+                // Add latest resource to the array
+                aggResArrayBuilder.add(aggRes.build());
             }
-            addIfNotNull(aggRes, JsonLDTerm.categories, catArray);
-            // File DOI if it exists
-            String fileId = null;
-            String fileSameAs = null;
-            if (df.getGlobalId().asString().length() != 0) {
-                fileId = df.getGlobalId().asString();
-                fileSameAs = SystemConfig.getDataverseSiteUrlStatic()
-                        + "/api/access/datafile/:persistentId?persistentId=" + fileId;
-            } else {
-                fileId = SystemConfig.getDataverseSiteUrlStatic() + "/file.xhtml?fileId=" + df.getId();
-                fileSameAs = SystemConfig.getDataverseSiteUrlStatic() + "/api/access/datafile/" + df.getId();
-            }
-            aggRes.add("@id", fileId);
-            aggRes.add(JsonLDTerm.schemaOrg("sameAs").getLabel(), fileSameAs);
-            fileArray.add(fileId);
-
-            aggRes.add("@type", JsonLDTerm.ore("AggregatedResource").getLabel());
-            addIfNotNull(aggRes, JsonLDTerm.schemaOrg("fileFormat"), df.getContentType());
-            addIfNotNull(aggRes, JsonLDTerm.filesize, df.getFilesize());
-            addIfNotNull(aggRes, JsonLDTerm.storageIdentifier, df.getStorageIdentifier());
-            addIfNotNull(aggRes, JsonLDTerm.originalFileFormat, df.getOriginalFileFormat());
-            addIfNotNull(aggRes, JsonLDTerm.originalFormatLabel, df.getOriginalFormatLabel());
-            addIfNotNull(aggRes, JsonLDTerm.UNF, df.getUnf());
-            addIfNotNull(aggRes, JsonLDTerm.rootDataFileId, df.getRootDataFileId());
-            addIfNotNull(aggRes, JsonLDTerm.previousDataFileId, df.getPreviousDataFileId());
-            JsonObject checksum = null;
-            // Add checksum. RDA recommends SHA-512
-            if (df.getChecksumType() != null && df.getChecksumValue() != null) {
-                checksum = Json.createObjectBuilder().add("@type", df.getChecksumType().toString())
-                        .add("@value", df.getChecksumValue()).build();
-                aggRes.add(JsonLDTerm.checksum.getLabel(), checksum);
-            }
-            JsonArray tabTags = null;
-            JsonArrayBuilder jab = JsonPrinter.getTabularFileTags(df);
-            if (jab != null) {
-                tabTags = jab.build();
-            }
-            addIfNotNull(aggRes, JsonLDTerm.tabularTags, tabTags);
-            //Add latest resource to the array
-            aggResArrayBuilder.add(aggRes.build());
         }
         // Build the '@context' object for json-ld based on the localContext entries
         JsonObjectBuilder contextBuilder = Json.createObjectBuilder();
         for (Entry<String, String> e : localContext.entrySet()) {
             contextBuilder.add(e.getKey(), e.getValue());
         }
-        // Now create the overall map object with it's metadata
-        JsonObject oremap = Json.createObjectBuilder()
-                .add(JsonLDTerm.dcTerms("modified").getLabel(), LocalDate.now().toString())
-                .add(JsonLDTerm.dcTerms("creator").getLabel(),
-                        BundleUtil.getStringFromBundle("institution.name"))
-                .add("@type", JsonLDTerm.ore("ResourceMap").getLabel())
-                // Define an id for the map itself (separate from the @id of the dataset being
-                // described
-                .add("@id",
-                        SystemConfig.getDataverseSiteUrlStatic() + "/api/datasets/export?exporter="
-                                + OAI_OREExporter.NAME + "&persistentId=" + id)
-                // Add the aggregation (Dataset) itself to the map.
-                .add(JsonLDTerm.ore("describes").getLabel(),
-                        aggBuilder.add(JsonLDTerm.ore("aggregates").getLabel(), aggResArrayBuilder.build())
-                                .add(JsonLDTerm.schemaOrg("hasPart").getLabel(), fileArray.build()).build())
-                // and finally add the context
-                .add("@context", contextBuilder.build()).build();
-        return oremap;
+        if (aggregationOnly) {
+            return aggBuilder.add("@context", contextBuilder.build());
+        } else {
+            // Now create the overall map object with it's metadata
+            
+            //Start with a reference to the Dataverse software
+            JsonObjectBuilder dvSoftwareBuilder = Json.createObjectBuilder()
+                    .add("@type", JsonLDTerm.schemaOrg("SoftwareApplication").getLabel())
+                    .add(JsonLDTerm.schemaOrg("name").getLabel(), DATAVERSE_SOFTWARE_NAME)
+                    .add(JsonLDTerm.schemaOrg("version").getLabel(), systemConfig.getVersion(true))
+                    .add(JsonLDTerm.schemaOrg("url").getLabel(), DATAVERSE_SOFTWARE_URL);
+            
+            //Now the OREMAP object itself
+            JsonObjectBuilder oremapBuilder = Json.createObjectBuilder()
+                    .add(JsonLDTerm.dcTerms("modified").getLabel(), LocalDate.now().toString())
+                    .add(JsonLDTerm.dcTerms("creator").getLabel(), BrandingUtil.getInstallationBrandName())
+                    .add("@type", JsonLDTerm.ore("ResourceMap").getLabel())
+                    //Add the version of our ORE format used
+                    .add(JsonLDTerm.schemaOrg("additionalType").getLabel(), DATAVERSE_ORE_FORMAT_VERSION)
+                    //Indicate which Dataverse version created it
+                    .add(JsonLDTerm.DVCore("generatedBy").getLabel(), dvSoftwareBuilder)
+                    // Define an id for the map itself (separate from the @id of the dataset being
+                    // described
+                    .add("@id",
+                            SystemConfig.getDataverseSiteUrlStatic() + "/api/datasets/export?exporter="
+                                    + OAI_OREExporter.NAME + "&persistentId=" + id)
+                    // Add the aggregation (Dataset) itself to the map.
+                    .add(JsonLDTerm.ore("describes").getLabel(),
+                            aggBuilder.add(JsonLDTerm.ore("aggregates").getLabel(), aggResArrayBuilder.build())
+                                    .add(JsonLDTerm.schemaOrg("hasPart").getLabel(), fileArray.build()).build())
+                    // and finally add the context
+                    .add("@context", contextBuilder.build());
+            return oremapBuilder;
+        }
+    }
+
+    private JsonObjectBuilder getDataverseDescription(Dataverse dv) {
+        //Schema.org is already in local context, no updates needed as long as we only use chemaOrg and "@id" here
+        JsonObjectBuilder dvjob = Json.createObjectBuilder().add(JsonLDTerm.schemaOrg("name").getLabel(), dv.getCurrentName()).add("@id", dv.getLocalURL());
+        addIfNotNull(dvjob, JsonLDTerm.schemaOrg("description"), dv.getDescription());
+        Dataverse owner = dv.getOwner();
+        if(owner!=null) {
+            dvjob.add(JsonLDTerm.schemaOrg("isPartOf").getLabel(), getDataverseDescription(owner));
+        }
+        return dvjob;
     }
 
     /*
@@ -307,11 +390,11 @@ public JsonLDTerm getContactTerm() {
     }
 
     public JsonLDTerm getContactNameTerm() {
-        return getTermFor(DatasetFieldConstant.datasetContact, DatasetFieldConstant.datasetContactName);
+        return getTermFor(DatasetFieldConstant.datasetContactName);
     }
 
     public JsonLDTerm getContactEmailTerm() {
-        return getTermFor(DatasetFieldConstant.datasetContact, DatasetFieldConstant.datasetContactEmail);
+        return getTermFor(DatasetFieldConstant.datasetContactEmail);
     }
 
     public JsonLDTerm getDescriptionTerm() {
@@ -319,64 +402,128 @@ public JsonLDTerm getDescriptionTerm() {
     }
 
     public JsonLDTerm getDescriptionTextTerm() {
-        return getTermFor(DatasetFieldConstant.description, DatasetFieldConstant.descriptionText);
+        return getTermFor(DatasetFieldConstant.descriptionText);
     }
 
     private JsonLDTerm getTermFor(String fieldTypeName) {
-        for (DatasetField dsf : version.getDatasetFields()) {
+        //Could call datasetFieldService.findByName(fieldTypeName) - is that faster/prefereable?
+        for (DatasetField dsf : version.getFlatDatasetFields()) {
             DatasetFieldType dsft = dsf.getDatasetFieldType();
             if (dsft.getName().equals(fieldTypeName)) {
-                return getTermFor(dsft);
+                return dsft.getJsonLDTerm();
             }
         }
         return null;
     }
+    
+    public static JsonValue getJsonLDForField(DatasetField field, Boolean excludeEmail, Map<Long, JsonObject> cvocMap,
+            Map<String, String> localContext) {
 
-    private JsonLDTerm getTermFor(DatasetFieldType dsft) {
-        if (dsft.getUri() != null) {
-            return new JsonLDTerm(dsft.getTitle(), dsft.getUri());
-        } else {
-            String namespaceUri = dsft.getMetadataBlock().getNamespaceUri();
-            if (namespaceUri == null) {
-                namespaceUri = SystemConfig.getDataverseSiteUrlStatic() + "/schema/" + dsft.getMetadataBlock().getName()
-                        + "#";
-            }
-            JsonLDNamespace blockNamespace = new JsonLDNamespace(dsft.getMetadataBlock().getName(), namespaceUri);
-            return new JsonLDTerm(blockNamespace, dsft.getTitle());
+        DatasetFieldType dfType = field.getDatasetFieldType();
+        if (excludeEmail && DatasetFieldType.FieldType.EMAIL.equals(dfType.getFieldType())) {
+            return null;
         }
-    }
 
-    private JsonLDTerm getTermFor(DatasetFieldType dfType, DatasetFieldType dsft) {
-        if (dsft.getUri() != null) {
-            return new JsonLDTerm(dsft.getTitle(), dsft.getUri());
+        JsonLDTerm fieldName = dfType.getJsonLDTerm();
+        if (fieldName.inNamespace()) {
+            localContext.putIfAbsent(fieldName.getNamespace().getPrefix(), fieldName.getNamespace().getUrl());
         } else {
-            // Use metadatablock URI or custom URI for this field based on the path
-            String subFieldNamespaceUri = dfType.getMetadataBlock().getNamespaceUri();
-            if (subFieldNamespaceUri == null) {
-                subFieldNamespaceUri = SystemConfig.getDataverseSiteUrlStatic() + "/schema/"
-                        + dfType.getMetadataBlock().getName() + "/";
-            }
-            subFieldNamespaceUri = subFieldNamespaceUri + dfType.getName() + "#";
-            JsonLDNamespace fieldNamespace = new JsonLDNamespace(dfType.getName(), subFieldNamespaceUri);
-            return new JsonLDTerm(fieldNamespace, dsft.getTitle());
+            localContext.putIfAbsent(fieldName.getLabel(), fieldName.getUrl());
         }
-    }
+        JsonArrayBuilder vals = Json.createArrayBuilder();
+        if (!dfType.isCompound()) {
+            for (String val : field.getValues_nondisplay()) {
+                if (cvocMap.containsKey(dfType.getId())) {
+                    addCvocValue(val, vals, cvocMap.get(dfType.getId()), localContext);
+                } else {
+                    vals.add(val);
+                }
+            }
+        } else {
+            // ToDo: Needs to be recursive (as in JsonPrinter?)
+            for (DatasetFieldCompoundValue dscv : field.getDatasetFieldCompoundValues()) {
+                // compound values are of different types
+                JsonObjectBuilder child = Json.createObjectBuilder();
+
+                for (DatasetField dsf : dscv.getChildDatasetFields()) {
+                    DatasetFieldType dsft = dsf.getDatasetFieldType();
+                    JsonLDTerm subFieldName = dsft.getJsonLDTerm();
+
+                    if (dsft.isCompound()) {
+                        JsonValue compoundChildVals = getJsonLDForField(dsf, excludeEmail, cvocMap, localContext);
+                        child.add(subFieldName.getLabel(), compoundChildVals);
+                    } else {
+                        if (excludeEmail && DatasetFieldType.FieldType.EMAIL.equals(dsft.getFieldType())) {
+                            continue;
+                        }
+                        // which may have multiple values
+                        if (!dsf.isEmpty()) {
+                            // Add context entry
+                            // ToDo - also needs to recurse here?
+                            if (subFieldName.inNamespace()) {
+                                localContext.putIfAbsent(subFieldName.getNamespace().getPrefix(),
+                                        subFieldName.getNamespace().getUrl());
+                            } else {
+                                localContext.putIfAbsent(subFieldName.getLabel(), subFieldName.getUrl());
+                            }
 
-    private JsonLDTerm getTermFor(String type, String subType) {
-        for (DatasetField dsf : version.getDatasetFields()) {
-            DatasetFieldType dsft = dsf.getDatasetFieldType();
-            if (dsft.getName().equals(type)) {
-                for (DatasetFieldCompoundValue dscv : dsf.getDatasetFieldCompoundValues()) {
-                    for (DatasetField subField : dscv.getChildDatasetFields()) {
-                        DatasetFieldType subFieldType = subField.getDatasetFieldType();
-                        if (subFieldType.getName().equals(subType)) {
-                            return getTermFor(dsft, subFieldType);
+                            List<String> values = dsf.getValues_nondisplay();
+
+                            JsonArrayBuilder childVals = Json.createArrayBuilder();
+
+                            for (String val : dsf.getValues_nondisplay()) {
+                                logger.fine("Child name: " + dsft.getName());
+                                if (cvocMap.containsKey(dsft.getId())) {
+                                    logger.fine("Calling addcvocval for: " + dsft.getName());
+                                    addCvocValue(val, childVals, cvocMap.get(dsft.getId()), localContext);
+                                } else {
+                                    childVals.add(val);
+                                }
+                            }
+                            if (values.size() > 1) {
+                                child.add(subFieldName.getLabel(), childVals);
+                            } else {
+                                child.add(subFieldName.getLabel(), childVals.build().get(0));
+                            }
                         }
                     }
                 }
+                vals.add(child);
             }
         }
-        return null;
+        // Add metadata value to aggregation, suppress array when only one value
+        JsonArray valArray = vals.build();
+        return (valArray.size() != 1) ? valArray : valArray.get(0);
     }
 
+    private static void addCvocValue(String val, JsonArrayBuilder vals, JsonObject cvocEntry,
+            Map<String, String> localContext) {
+        try {
+            if (cvocEntry.containsKey("retrieval-filtering")) {
+                JsonObject filtering = cvocEntry.getJsonObject("retrieval-filtering");
+                JsonObject context = filtering.getJsonObject("@context");
+                for (String prefix : context.keySet()) {
+                    localContext.putIfAbsent(prefix, context.getString(prefix));
+                }
+                JsonObjectBuilder job = Json.createObjectBuilder(datasetFieldService.getExternalVocabularyValue(val));
+                job.add("@id", val);
+                JsonObject extVal = job.build();
+                logger.fine("Adding: " + extVal);
+                vals.add(extVal);
+            } else {
+                vals.add(val);
+            }
+        } catch (Exception e) {
+            logger.warning("Couldn't interpret value for : " + val + " : " + e.getMessage());
+            logger.log(Level.FINE, ExceptionUtils.getStackTrace(e));
+            vals.add(val);
+        }
+    }
+
+    //These are used to pick up various settings/constants from the application
+    public static void injectServices(SettingsServiceBean settingsSvc, DatasetFieldServiceBean datasetFieldSvc, SystemConfig systemCfg) {
+        settingsService = settingsSvc;
+        datasetFieldService = datasetFieldSvc;
+        systemConfig = systemCfg;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMapHelper.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMapHelper.java
new file mode 100644
index 00000000000..cca1e16b4f8
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMapHelper.java
@@ -0,0 +1,32 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+
+/**
+ * This is a small helper bean 
+ * As it is a singleton and built at application start (=deployment), it will inject the (stateless)
+ * settings service into the OREMap once it's ready.
+ */
+@Singleton
+@Startup
+public class OREMapHelper {
+    @EJB
+    SettingsServiceBean settingsSvc;
+    
+    @EJB
+    DatasetFieldServiceBean datasetFieldSvc;
+    
+    @EJB
+    SystemConfig systemConfig;
+    
+    @PostConstruct
+    public void injectService() {
+        OREMap.injectServices(settingsSvc, datasetFieldSvc, systemConfig);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/DataFileDataProvider.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/DataFileDataProvider.java
new file mode 100644
index 00000000000..fe0433ef676
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/DataFileDataProvider.java
@@ -0,0 +1,81 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author adaybujeda
+ */
+class DataFileDataProvider implements FileDataProvider {
+    private static final Logger logger = Logger.getLogger(DataFileDataProvider.class.getCanonicalName());
+
+    private final FileUtilWrapper fileUtilWrapper;
+    private final String name;
+    private final Map<Path, DataFile> dataFilesIndex;
+
+    public DataFileDataProvider(FileUtilWrapper fileUtilWrapper, String name, List<DataFile> dataFiles) {
+        this.fileUtilWrapper = fileUtilWrapper;
+        this.name = name;
+        this.dataFilesIndex = new LinkedHashMap<>();
+        dataFiles.stream().forEach(dataFile -> {
+            String directory = Optional.ofNullable(dataFile.getDirectoryLabel()).orElse("");
+            String fileName = dataFile.getCurrentName();
+            dataFilesIndex.put(Path.of(directory, fileName), dataFile);
+        });
+    }
+
+    public DataFileDataProvider(String name, List<DataFile> dataFiles) {
+        this(new FileUtilWrapper(), name, dataFiles);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public List<Path> getFilePaths() {
+        return List.copyOf(dataFilesIndex.keySet());
+    }
+
+    @Override
+    public Optional<InputStreamProvider> getInputStreamProvider(Path filePath) {
+        Optional<DataFile> dataFileInfo = Optional.ofNullable(dataFilesIndex.get(filePath));
+
+        if (dataFileInfo.isEmpty()) {
+            logger.fine(String.format("action=getFileInputStream result=file-not-found filePath=%s", filePath));
+            return Optional.empty();
+        }
+
+        String[] storageInfo = DataAccess.getDriverIdAndStorageLocation(dataFileInfo.get().getStorageIdentifier());
+        String driverType = DataAccess.getDriverType(storageInfo[0]);
+        String storageLocation = storageInfo[1];
+        if (!driverType.equals("tmp")) {
+            logger.warning(String.format("action=getFileInputStream result=driver-not-supported driverType=%s filePath=%s", driverType, filePath));
+            return Optional.empty();
+        }
+
+        Path actualFileLocation = Path.of(fileUtilWrapper.getFilesTempDirectory(), storageLocation);
+        if (actualFileLocation.toFile().exists()) {
+            return Optional.of(() ->  fileUtilWrapper.newInputStream(actualFileLocation));
+        }
+
+        logger.fine(String.format("action=getFileInputStream result=file-not-found filePath=%s actualFileLocation=%s", filePath, actualFileLocation));
+        return Optional.empty();
+    }
+
+    @Override
+    public void close() throws IOException {
+        // Intentionally left blank
+        // Nothing to do in this implementation.
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FileDataProvider.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FileDataProvider.java
new file mode 100644
index 00000000000..2799016ffc3
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FileDataProvider.java
@@ -0,0 +1,23 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public interface FileDataProvider extends Closeable {
+
+    public String getName();
+    public List<Path> getFilePaths();
+    public Optional<InputStreamProvider> getInputStreamProvider(Path filePath);
+
+    public static interface InputStreamProvider {
+        public InputStream getInputStream() throws IOException;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FileDataProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FileDataProviderFactory.java
new file mode 100644
index 00000000000..f2386f55320
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FileDataProviderFactory.java
@@ -0,0 +1,28 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import edu.harvard.iq.dataverse.DataFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class FileDataProviderFactory {
+
+    public FileDataProvider getFileDataProvider(File file) throws IOException {
+        return new ZipFileDataProvider(file.getName(), file);
+    }
+
+    public FileDataProvider getFileDataProvider(Path folderLocation) {
+        return new FolderDataProvider(folderLocation);
+    }
+
+    public FileDataProvider getFileDataProvider(String name, List<DataFile> datafiles) {
+        return new DataFileDataProvider(name, datafiles);
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FileUtilWrapper.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FileUtilWrapper.java
new file mode 100644
index 00000000000..ecb34bdcfb5
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FileUtilWrapper.java
@@ -0,0 +1,61 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.datasetutility.FileExceedsMaxSizeException;
+import edu.harvard.iq.dataverse.util.file.FileExceedsStorageQuotaException;
+import edu.harvard.iq.dataverse.util.FileUtil;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+/**
+ * Wrapper around static methods to facilitate testing
+ *
+ * @author adaybujeda
+ */
+public class FileUtilWrapper {
+
+    private static final Logger logger = Logger.getLogger(FileUtilWrapper.class.getCanonicalName());
+
+    public String getFilesTempDirectory() {
+        return FileUtil.getFilesTempDirectory();
+    }
+
+    public InputStream newInputStream(Path path) throws IOException {
+       return Files.newInputStream(path);
+    }
+
+    public Stream<Path> list(Path path) throws IOException {
+        return Files.list(path);
+    }
+
+    public void deleteFile(Path filePath) {
+        try {
+            Files.delete(filePath);
+        } catch (Exception e) {
+            logger.warning(String.format("action=deleteFile result=error filePath=%s message=%s", filePath, e.getMessage()));
+        }
+    }
+
+    public File saveInputStreamInTempFile(InputStream inputStream, Long fileSizeLimit) throws IOException, FileExceedsMaxSizeException {
+        try {
+            return FileUtil.saveInputStreamInTempFile(inputStream, fileSizeLimit);
+        } catch (FileExceedsStorageQuotaException fesqx) {
+            return null; 
+        } 
+    }
+
+    public String determineFileType(File file, String fileName) throws IOException {
+        return FileUtil.determineFileType(file, fileName);
+    }
+
+    public DataFile createSingleDataFile(DatasetVersion datasetVersion, File file, String storageIdentifier, String fileName, String contentType, DataFile.ChecksumType checksumType, String checksum, Boolean addToDataset) {
+        return FileUtil.createSingleDataFile(datasetVersion, file, storageIdentifier, fileName, contentType, checksumType, checksum, addToDataset);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FolderDataProvider.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FolderDataProvider.java
new file mode 100644
index 00000000000..24b50551acd
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/FolderDataProvider.java
@@ -0,0 +1,67 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * @author adaybujeda
+ */
+class FolderDataProvider implements FileDataProvider {
+    private static final Logger logger = Logger.getLogger(FolderDataProvider.class.getCanonicalName());
+
+    private final FileUtilWrapper fileUtilWrapper;
+    private final Path folderLocation;
+
+    public FolderDataProvider(FileUtilWrapper fileUtilWrapper, Path folderLocation) {
+        this.fileUtilWrapper = fileUtilWrapper;
+        this.folderLocation = folderLocation;
+    }
+
+    public FolderDataProvider(Path folderLocation) {
+        this(new FileUtilWrapper(), folderLocation);
+    }
+
+    @Override
+    public String getName() {
+        return folderLocation.toString();
+    }
+
+    @Override
+    public List<Path> getFilePaths() {
+        if(!folderLocation.toFile().exists()) {
+            logger.warning(String.format("action=getFilePaths result=folder-not-found folderLocation=%s", folderLocation));
+            return Collections.emptyList();
+        }
+
+        try {
+            return fileUtilWrapper.list(folderLocation).map(path -> path.getFileName()).collect(Collectors.toList());
+        } catch (Exception e) {
+            logger.log(Level.WARNING, String.format("action=getFilePaths error folderLocation=%s", folderLocation), e);
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public Optional<InputStreamProvider> getInputStreamProvider(Path filePath) {
+        Path actualFileLocation = folderLocation.resolve(filePath);
+        if (actualFileLocation.toFile().exists()) {
+            return Optional.of(() ->  fileUtilWrapper.newInputStream(actualFileLocation));
+        }
+
+        logger.fine(String.format("action=getFileInputStream result=file-not-found filePath=%s", actualFileLocation));
+        return Optional.empty();
+    }
+
+    @Override
+    public void close() throws IOException {
+        // Intentionally left blank
+        // Nothing to do in this implementation.
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/ZipFileDataProvider.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/ZipFileDataProvider.java
new file mode 100644
index 00000000000..ab03cafd8db
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/data/ZipFileDataProvider.java
@@ -0,0 +1,67 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author adaybujeda
+ */
+class ZipFileDataProvider implements FileDataProvider {
+    private static final Logger logger = Logger.getLogger(ZipFileDataProvider.class.getCanonicalName());
+    private final String name;
+    private final ZipFile zipFile;
+
+    public ZipFileDataProvider(String name, ZipFile zipFile) {
+        this.name = name;
+        this.zipFile = zipFile;
+    }
+
+    public ZipFileDataProvider(String name, File file) throws IOException {
+        this(name,  new ZipFile(file));
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public List<Path> getFilePaths() {
+        Enumeration<ZipArchiveEntry> zipEntries = zipFile.getEntries();
+        List<Path> files = new ArrayList<>();
+        while (zipEntries.hasMoreElements()) {
+            ZipArchiveEntry zipEntry = zipEntries.nextElement();
+            if (zipEntry.isDirectory()) {
+                continue;
+            }
+            files.add(Path.of(zipEntry.getName()));
+        }
+        return files;
+    }
+
+    @Override
+    public Optional<InputStreamProvider> getInputStreamProvider(Path filePath) {
+        ZipArchiveEntry fileEntry = zipFile.getEntry(filePath.toString());
+        if (fileEntry != null) {
+            return Optional.of(() -> zipFile.getInputStream(fileEntry));
+        }
+
+        logger.fine(String.format("action=getFileInputStream result=file-not-found filePath=%s", filePath));
+        return Optional.empty();
+    }
+
+    @Override
+    public void close() throws IOException {
+        ZipFile.closeQuietly(zipFile);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/cache/CacheFactoryBean.java b/src/main/java/edu/harvard/iq/dataverse/util/cache/CacheFactoryBean.java
new file mode 100644
index 00000000000..87d4d47c4da
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/cache/CacheFactoryBean.java
@@ -0,0 +1,66 @@
+package edu.harvard.iq.dataverse.util.cache;
+
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.engine.command.Command;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.inject.Inject;
+
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.configuration.CompleteConfiguration;
+import javax.cache.configuration.MutableConfiguration;
+import java.util.logging.Logger;
+
+@Singleton
+@Startup
+public class CacheFactoryBean implements java.io.Serializable {
+    private static final Logger logger = Logger.getLogger(CacheFactoryBean.class.getCanonicalName());
+    // Retrieved from Hazelcast, implements ConcurrentMap and is threadsafe
+    Cache<String, String> rateLimitCache;
+    @EJB
+    SystemConfig systemConfig;
+    @Inject
+    CacheManager manager;
+    public final static String RATE_LIMIT_CACHE = "rateLimitCache";
+
+    @PostConstruct
+    public void init() {
+        rateLimitCache = manager.getCache(RATE_LIMIT_CACHE);
+        if (rateLimitCache == null) {
+            CompleteConfiguration<String, String> config =
+                    new MutableConfiguration<String, String>()
+                            .setTypes( String.class, String.class );
+            rateLimitCache = manager.createCache(RATE_LIMIT_CACHE, config);
+        }
+    }
+
+    /**
+     * Check if user can make this call or if they are rate limited
+     * @param user
+     * @param command
+     * @return true if user is superuser or rate not limited
+     */
+    public boolean checkRate(User user, Command command) {
+        final String action = command.getClass().getSimpleName();
+        int capacity = RateLimitUtil.getCapacity(systemConfig, user, action);
+        if (capacity == RateLimitUtil.NO_LIMIT) {
+            return true;
+        } else if (capacity == RateLimitUtil.RESET_CACHE) {
+            rateLimitCache.clear();
+            return true;
+        } else {
+            String cacheKey = RateLimitUtil.generateCacheKey(user, action);
+            return (!RateLimitUtil.rateLimited(rateLimitCache, cacheKey, capacity));
+        }
+    }
+    public String getStats(String cacheType, String filter) {
+        if (RATE_LIMIT_CACHE.equals(cacheType)) {
+            return RateLimitUtil.getStats(rateLimitCache, filter);
+        }
+        return "";
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/cache/RateLimitSetting.java b/src/main/java/edu/harvard/iq/dataverse/util/cache/RateLimitSetting.java
new file mode 100644
index 00000000000..54da5a46670
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/cache/RateLimitSetting.java
@@ -0,0 +1,40 @@
+package edu.harvard.iq.dataverse.util.cache;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RateLimitSetting {
+
+    private int tier;
+    private int limitPerHour = RateLimitUtil.NO_LIMIT;
+    private List<String> actions = new ArrayList<>();
+
+    private int defaultLimitPerHour;
+
+    public RateLimitSetting() {}
+
+    public void setTier(int tier) {
+        this.tier = tier;
+    }
+    public int getTier() {
+        return this.tier;
+    }
+    public void setLimitPerHour(int limitPerHour) {
+        this.limitPerHour = limitPerHour;
+    }
+    public int getLimitPerHour() {
+        return this.limitPerHour;
+    }
+    public void setActions(List<String> actions) {
+        this.actions = actions;
+    }
+    public List<String> getActions() {
+        return this.actions;
+    }
+    public void setDefaultLimit(int defaultLimitPerHour) {
+        this.defaultLimitPerHour = defaultLimitPerHour;
+    }
+    public int getDefaultLimitPerHour() {
+        return this.defaultLimitPerHour;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/cache/RateLimitUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/cache/RateLimitUtil.java
new file mode 100644
index 00000000000..0b7e936bdff
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/cache/RateLimitUtil.java
@@ -0,0 +1,174 @@
+package edu.harvard.iq.dataverse.util.cache;
+
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbException;
+
+import javax.cache.Cache;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Logger;
+
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+
+public class RateLimitUtil {
+    private static final Logger logger = Logger.getLogger(RateLimitUtil.class.getCanonicalName());
+    static final List<RateLimitSetting> rateLimits = new CopyOnWriteArrayList<>();
+    static final Map<String, Integer> rateLimitMap = new ConcurrentHashMap<>();
+    public static final int NO_LIMIT = -1;
+    public static final int RESET_CACHE = -2;
+    static String settingRateLimitsJson = "";
+
+    static String generateCacheKey(final User user, final String action) {
+        return (user != null ? user.getIdentifier() : GuestUser.get().getIdentifier()) +
+            (action != null ? ":" + action : "");
+    }
+    static int getCapacity(SystemConfig systemConfig, User user, String action) {
+        if (user != null && user.isSuperuser()) {
+            return NO_LIMIT;
+        }
+
+        // If the setting changes then reset the cache
+        if (!settingRateLimitsJson.equals(systemConfig.getRateLimitsJson())) {
+            settingRateLimitsJson = systemConfig.getRateLimitsJson();
+            logger.fine("Setting RateLimitingCapacityByTierAndAction changed (" + settingRateLimitsJson + ").  Resetting cache");
+            rateLimits.clear();
+            return RESET_CACHE;
+        }
+
+        // get the capacity, i.e. calls per hour, from config
+        return (user instanceof AuthenticatedUser authUser) ?
+                getCapacityByTierAndAction(systemConfig, authUser.getRateLimitTier(), action) :
+                getCapacityByTierAndAction(systemConfig, 0, action);
+    }
+    static boolean rateLimited(final Cache<String, String> rateLimitCache, final String key, int capacityPerHour) {
+        if (capacityPerHour == NO_LIMIT) {
+            return false;
+        }
+        long currentTime = System.currentTimeMillis() / 60000L; // convert to minutes
+        double tokensPerMinute = (capacityPerHour / 60.0);
+        // Get the last time this bucket was added to
+        final String keyLastUpdate = String.format("%s:last_update",key);
+        long lastUpdate = longFromKey(rateLimitCache, keyLastUpdate);
+        long deltaTime = currentTime - lastUpdate;
+        // Get the current number of tokens in the bucket
+        long tokens = longFromKey(rateLimitCache, key);
+        long tokensToAdd = (long) (deltaTime * tokensPerMinute);
+        if (tokensToAdd > 0) { // Don't update timestamp if we aren't adding any tokens to the bucket
+            tokens = min(capacityPerHour, tokens + tokensToAdd);
+            rateLimitCache.put(keyLastUpdate, String.valueOf(currentTime));
+        }
+        // Update with any added tokens and decrement 1 token for this call if not rate limited (0 tokens)
+        rateLimitCache.put(key, String.valueOf(max(0, tokens-1)));
+        return tokens < 1;
+    }
+
+    static int getCapacityByTierAndAction(SystemConfig systemConfig, Integer tier, String action) {
+        if (rateLimits.isEmpty()) {
+            init(systemConfig);
+        }
+        
+        if (rateLimitMap.containsKey(getMapKey(tier, action))) {
+            return rateLimitMap.get(getMapKey(tier,action));
+        } else if (rateLimitMap.containsKey(getMapKey(tier))) {
+            return rateLimitMap.get(getMapKey(tier));
+        } else {
+            return getCapacityByTier(systemConfig, tier);
+        }
+    }
+    static int getCapacityByTier(SystemConfig systemConfig, int tier) {
+        int value = NO_LIMIT;
+        String csvString = systemConfig.getRateLimitingDefaultCapacityTiers();
+        try {
+            if (!csvString.isEmpty()) {
+                int[] values = Arrays.stream(csvString.split(",")).mapToInt(Integer::parseInt).toArray();
+                if (tier < values.length) {
+                    value = values[tier];
+                }
+            }
+        } catch (NumberFormatException nfe) {
+            logger.warning(nfe.getMessage());
+        }
+        return value;
+    }
+    static void init(SystemConfig systemConfig) {
+        getRateLimitsFromJson(systemConfig);
+        /* Convert the List of Rate Limit Settings containing a list of Actions to a fast lookup Map where the key is:
+             for default if no action defined: "{tier}:" and the value is the default limit for the tier
+             for each action: "{tier}:{action}" and the value is the limit defined in the setting
+        */
+        rateLimitMap.clear();
+        rateLimits.forEach(r -> {
+            r.setDefaultLimit(getCapacityByTier(systemConfig, r.getTier()));
+            rateLimitMap.put(getMapKey(r.getTier()), r.getDefaultLimitPerHour());
+            r.getActions().forEach(a -> rateLimitMap.put(getMapKey(r.getTier(), a), r.getLimitPerHour()));
+        });
+    }
+    
+    @SuppressWarnings("java:S2133") // <- To enable casting to generic in JSON-B we need a class instance, false positive
+    static void getRateLimitsFromJson(SystemConfig systemConfig) {
+        String setting = systemConfig.getRateLimitsJson();
+        rateLimits.clear();
+        if (!setting.isEmpty()) {
+            try (Jsonb jsonb = JsonbBuilder.create()) {
+                rateLimits.addAll(jsonb.fromJson(setting,
+                        new ArrayList<RateLimitSetting>() {}.getClass().getGenericSuperclass()));
+            } catch (JsonbException e) {
+                logger.warning("Unable to parse Rate Limit Json: " + e.getLocalizedMessage() + "   Json:(" + setting + ")");
+                rateLimits.add(new RateLimitSetting()); // add a default entry to prevent re-initialization
+            // Note: Usually using Exception in a catch block is an antipattern and should be avoided.
+            //       As the JSON-B interface does not specify a non-generic type, we have to use this.
+            } catch (Exception e) {
+                logger.warning("Could not close JSON-B reader");
+            }
+        }
+    }
+    static String getStats(final Cache<String, String> rateLimitCache, String filter) {
+        StringBuilder sb1 = new StringBuilder(); // available tokens list
+        StringBuilder sb2 = new StringBuilder(); // updated cache list
+        long currentTime = System.currentTimeMillis() / 60000L; // convert to minutes
+        Long deltaMinutesFilter = filter != null ? Long.parseLong(filter) : null;
+        Iterator<Cache.Entry<String, String>> iterator = rateLimitCache.iterator();
+        sb1.append("#<username>:<command>, <available tokens>\n");
+        sb2.append("#<username>:<command>, <timestamp>, <delta minutes>");
+        sb2.append(deltaMinutesFilter != null ? " ## deltaMinutesFilter=" + deltaMinutesFilter + "\n" : "\n");
+        int cacheEntries = 0;
+
+        while (iterator.hasNext()) {
+            Cache.Entry<String, String> entry = iterator.next();
+            if (entry.getKey().endsWith(":last_update")) {
+                long deltaMinutes = currentTime - Long.parseLong(String.valueOf(entry.getValue()));
+                if (deltaMinutesFilter == null || deltaMinutes <= deltaMinutesFilter) {
+                    sb2.append(entry.getKey() + ", " + entry.getValue() + ", " + deltaMinutes + "\n");
+                }
+            } else {
+                sb1.append(entry.getKey() + ", " + entry.getValue() + "\n");
+                cacheEntries++;
+            }
+        }
+
+        String header = "# Rate Limit Cache: Total number of cached entries (excluding \":last_update\") " + cacheEntries + "\n";
+        return header + sortString(sb1) + sortString(sb2);
+    }
+    static String getMapKey(int tier) {
+        return getMapKey(tier, null);
+    }
+    static String getMapKey(int tier, String action) {
+        return tier + ":" + (action != null ? action : "");
+    }
+    static long longFromKey(Cache<String, String> cache, String key) {
+        Object l = cache.get(key);
+        return l != null ? Long.parseLong(String.valueOf(l)) : 0L;
+    }
+    static String sortString(StringBuilder sb) {
+        String[] strings = sb.toString().split("\\R");
+        Arrays.sort(strings);
+        return String.join("\n", strings) + "\n";
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/file/BagItFileHandler.java b/src/main/java/edu/harvard/iq/dataverse/util/file/BagItFileHandler.java
new file mode 100644
index 00000000000..6162df049f8
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/file/BagItFileHandler.java
@@ -0,0 +1,159 @@
+package edu.harvard.iq.dataverse.util.file;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.datasetutility.FileExceedsMaxSizeException;
+import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.bagit.BagValidation;
+import edu.harvard.iq.dataverse.util.bagit.BagValidator;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProviderFactory;
+import edu.harvard.iq.dataverse.util.bagit.data.FileUtilWrapper;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class BagItFileHandler {
+
+    private static final Logger logger = Logger.getLogger(BagItFileHandler.class.getCanonicalName());
+
+    public static final String FILE_TYPE = "application/zipped-bagit";
+
+    private final FileUtilWrapper fileUtil;
+    private final FileDataProviderFactory fileDataProviderFactory;
+    private final BagValidator bagValidator;
+    private final BagItFileHandlerPostProcessor postProcessor;
+
+    public BagItFileHandler(FileUtilWrapper fileUtil, FileDataProviderFactory fileDataProviderFactory, BagValidator bagValidator, BagItFileHandlerPostProcessor postProcessor) {
+        this.fileUtil = fileUtil;
+        this.fileDataProviderFactory = fileDataProviderFactory;
+        this.bagValidator = bagValidator;
+        this.postProcessor = postProcessor;
+    }
+
+    public boolean isBagItPackage(String uploadedFilename, File file) throws IOException {
+        try(FileDataProvider fileDataProvider = fileDataProviderFactory.getFileDataProvider(file)) {
+            boolean isBagItPackage = bagValidator.hasBagItPackage(fileDataProvider);
+            logger.fine(String.format("action=isBagItPackage uploadedFilename=%s file=%s isBagItPackage=%s", uploadedFilename, file.getName(), isBagItPackage));
+            return isBagItPackage;
+        }
+    }
+
+    public CreateDataFileResult handleBagItPackage(SystemConfig systemConfig, DatasetVersion datasetVersion, String uploadedFilename, File bagItPackageFile) throws IOException {
+        logger.info(String.format("action=handleBagItPackage start uploadedFilename=%s file=%s", uploadedFilename, bagItPackageFile.getName()));
+        try {
+            List<DataFile> packageDataFiles = processBagItPackage(systemConfig, datasetVersion, uploadedFilename, bagItPackageFile);
+            if(packageDataFiles.isEmpty()) {
+                return CreateDataFileResult.error(uploadedFilename, FILE_TYPE, Collections.emptyList());
+            }
+
+            BagValidation bagValidation = validateBagItPackage(uploadedFilename, packageDataFiles);
+            if(bagValidation.success()) {
+                List<DataFile> finalItems = postProcessor.process(packageDataFiles);
+                logger.info(String.format("action=handleBagItPackage result=success uploadedFilename=%s file=%s", uploadedFilename, bagItPackageFile.getName()));
+                return CreateDataFileResult.success(uploadedFilename, FILE_TYPE, finalItems);
+            }
+
+            // BagIt package has errors
+            // Capture errors and return to caller
+            List<String> errors = bagValidation.getAllErrors();
+            logger.info(String.format("action=handleBagItPackage result=errors uploadedFilename=%s file=%s errors=%s", uploadedFilename, bagItPackageFile.getName(), errors.size()));
+            return CreateDataFileResult.error(uploadedFilename, FILE_TYPE, errors);
+
+        } catch (BagItFileHandlerException e) {
+            logger.severe(String.format("action=handleBagItPackage result=error uploadedFilename=%s file=%s message=%s", uploadedFilename, bagItPackageFile.getName(), e.getMessage()));
+            return CreateDataFileResult.error(uploadedFilename, FILE_TYPE, Arrays.asList(e.getMessage()));
+        } finally {
+            fileUtil.deleteFile(bagItPackageFile.toPath());
+        }
+    }
+
+    private BagValidation validateBagItPackage(String uploadedFilename, List<DataFile> packageDataFiles) throws IOException {
+        try(FileDataProvider fileDataProvider = fileDataProviderFactory.getFileDataProvider(uploadedFilename, packageDataFiles)) {
+            BagValidation bagValidation = bagValidator.validateChecksums(fileDataProvider);
+            logger.info(String.format("action=validateBagItPackage uploadedFilename=%s bagValidation=%s", uploadedFilename, bagValidation.report()));
+            return bagValidation;
+        }
+    }
+
+    private List<DataFile> processBagItPackage(SystemConfig systemConfig, DatasetVersion datasetVersion, String uploadedFilename, File bagItPackageFile) throws IOException, BagItFileHandlerException {
+        int numberOfFilesLimit = systemConfig.getZipUploadFilesLimit();
+        Long sizeOfFilesLimit = systemConfig.getMaxFileUploadSizeForStore(datasetVersion.getDataset().getEffectiveStorageDriverId());
+        DataFile.ChecksumType checksumAlgorithm = systemConfig.getFileFixityChecksumAlgorithm();
+
+        List<DataFile> packageDataFiles = new LinkedList<>();
+
+        try(FileDataProvider fileDataProvider = fileDataProviderFactory.getFileDataProvider(bagItPackageFile)) {
+            List<Path> zipFileEntries = fileDataProvider.getFilePaths();
+            if (zipFileEntries.size() > numberOfFilesLimit) {
+                throw new BagItFileHandlerException(String.format("Zip file: %s exceeds the number of files limit. Total: %s limit: %s", uploadedFilename, zipFileEntries.size(), numberOfFilesLimit));
+            }
+
+            for(Path zipEntry: zipFileEntries) {
+                Optional<FileDataProvider.InputStreamProvider> zipEntryStream = fileDataProvider.getInputStreamProvider(zipEntry);
+
+                if(zipEntryStream.isEmpty()) {
+                    logger.warning(String.format("action=handleBagIt result=no-input-stream file=%s zipEntry=%s", uploadedFilename, zipEntry));
+                    continue;
+                }
+
+                String fileName = zipEntry.getFileName().toString();
+                DataFile datafile = null;
+                try {
+                    File zipEntryAsFile = fileUtil.saveInputStreamInTempFile(zipEntryStream.get().getInputStream(), sizeOfFilesLimit);
+                    datafile = fileUtil.createSingleDataFile(datasetVersion, zipEntryAsFile, null, fileName,
+                            FileUtil.MIME_TYPE_UNDETERMINED_DEFAULT, checksumAlgorithm, null, false);
+                } catch(FileExceedsMaxSizeException e) {
+                    throw new BagItFileHandlerException(String.format("Zip entry: %s for file: %s exceeds the size limit", zipEntry, uploadedFilename), e);
+                }
+
+                if(datafile == null) {
+                    logger.warning(String.format("action=handleBagIt result=null-datafile file=%s zipEntry=%s", uploadedFilename, zipEntry));
+                    continue;
+                }
+
+                if(zipEntry.getParent() != null) {
+                    // Set directory
+                    datafile.getFileMetadata().setDirectoryLabel(zipEntry.getParent().toString());
+                }
+
+                try {
+                    String tempFileLocation = fileUtil.getFilesTempDirectory() + "/" + datafile.getStorageIdentifier();
+                    String contentType = fileUtil.determineFileType(new File(tempFileLocation), fileName);
+                    logger.fine(String.format("action=handleBagIt contentType=%s file=%s zipEntry=%s", contentType, uploadedFilename, zipEntry));
+                    if (StringUtil.nonEmpty(contentType)) {
+                        datafile.setContentType(contentType);
+                    }
+                } catch (Exception e) {
+                    logger.warning(String.format("action=handleBagIt message=unable-to-get-content-type file=%s zipEntry=%s error=%s", uploadedFilename, zipEntry, e.getMessage()));
+                }
+
+                packageDataFiles.add(datafile);
+            }
+        }
+
+        return packageDataFiles;
+    }
+
+    private static class BagItFileHandlerException extends Exception {
+        public BagItFileHandlerException(String message) {
+            super(message);
+        }
+        public BagItFileHandlerException(String message, Throwable e) {
+            super(message, e);
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerFactory.java b/src/main/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerFactory.java
new file mode 100644
index 00000000000..4b0263030dc
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerFactory.java
@@ -0,0 +1,68 @@
+package edu.harvard.iq.dataverse.util.file;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.bagit.BagValidator;
+import edu.harvard.iq.dataverse.util.bagit.BagValidator.BagValidatorSettings;
+import edu.harvard.iq.dataverse.util.bagit.ManifestReader;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProviderFactory;
+import edu.harvard.iq.dataverse.util.bagit.data.FileUtilWrapper;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
+import java.io.Serializable;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author adaybujeda
+ */
+@SessionScoped
+@Named
+public class BagItFileHandlerFactory implements Serializable {
+
+    private static final Logger logger = Logger.getLogger(BagItFileHandlerFactory.class.getCanonicalName());
+
+    public static final String BAGIT_HANDLER_ENABLED_SETTING = ":BagItHandlerEnabled";
+
+    @EJB
+    private SettingsServiceBean settingsService;
+    
+    private BagItFileHandler bagItFileHandler;
+
+    @PostConstruct
+    public void initialize() {
+        boolean bagitHandlerEnabled = settingsService.isTrue(BAGIT_HANDLER_ENABLED_SETTING, false);
+        if(!bagitHandlerEnabled) {
+            logger.info("action=initialize completed message=bagit-file-handler-disabled");
+            bagItFileHandler = null;
+            return;
+        }
+
+        Integer validatorJobPoolSize = getIntegerSetting(BagValidatorSettings.JOB_POOL_SIZE.getSettingsKey(), BagValidatorSettings.JOB_POOL_SIZE.getDefaultValue());
+        Integer maxErrors = getIntegerSetting(BagValidatorSettings.MAX_ERRORS.getSettingsKey(), BagValidatorSettings.JOB_WAIT_INTERVAL.getDefaultValue());
+        Integer jobWaitIntervalInSeconds = getIntegerSetting(BagValidatorSettings.JOB_WAIT_INTERVAL.getSettingsKey(), BagValidatorSettings.JOB_WAIT_INTERVAL.getDefaultValue());
+        BagValidator bagValidator = new BagValidator(validatorJobPoolSize, maxErrors, jobWaitIntervalInSeconds, new ManifestReader());
+        bagItFileHandler = new BagItFileHandler(new FileUtilWrapper(), new FileDataProviderFactory(), bagValidator, new BagItFileHandlerPostProcessor());
+        logger.info(String.format("action=initialize completed validatorJobPoolSize=%s maxErrors=%s jobWaitIntervalInSeconds=%s message=bagit-file-handler-created", validatorJobPoolSize, maxErrors, jobWaitIntervalInSeconds));
+    }
+
+    public Optional<BagItFileHandler> getBagItFileHandler() {
+        return Optional.ofNullable(bagItFileHandler);
+    }
+
+    private Integer getIntegerSetting(String settingsKey, Integer defaultValue) {
+        String settingsValue = settingsService.get(settingsKey);
+        if(settingsValue != null) {
+            try {
+                return Integer.valueOf(settingsValue);
+            } catch (Exception e) {
+                logger.info(String.format("action=initialize message=error-getting-int-setting setting=%s value=%s defaultValue=%s", settingsKey, settingsValue, defaultValue));
+            }
+        }
+
+        return defaultValue;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerPostProcessor.java b/src/main/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerPostProcessor.java
new file mode 100644
index 00000000000..ba233f3f364
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerPostProcessor.java
@@ -0,0 +1,43 @@
+package edu.harvard.iq.dataverse.util.file;
+
+import edu.harvard.iq.dataverse.DataFile;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class BagItFileHandlerPostProcessor {
+
+    private static final Logger logger = Logger.getLogger(BagItFileHandlerPostProcessor.class.getCanonicalName());
+
+    public static final List<String> FILES_TO_IGNORE = Arrays.asList("__", "._", ".DS_Store");
+
+    public List<DataFile> process(List<DataFile> items) {
+        if(items == null) {
+            return null;
+        }
+
+        List<DataFile> filteredItems = new ArrayList<>(items.size());
+
+        for(DataFile item: items) {
+            String fileName = item.getCurrentName();
+            if(fileName == null || fileName.isEmpty()) {
+                continue;
+            }
+
+            if(FILES_TO_IGNORE.stream().anyMatch(prefix -> fileName.startsWith(prefix))) {
+                logger.fine(String.format("action=BagItFileHandlerPostProcessor result=ignore-entry file=%s", fileName));
+                continue;
+            }
+
+            filteredItems.add(item);
+        }
+
+        return filteredItems;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/file/CreateDataFileResult.java b/src/main/java/edu/harvard/iq/dataverse/util/file/CreateDataFileResult.java
new file mode 100644
index 00000000000..4e33ffbc75d
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/file/CreateDataFileResult.java
@@ -0,0 +1,63 @@
+package edu.harvard.iq.dataverse.util.file;
+
+import edu.harvard.iq.dataverse.DataFile;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class CreateDataFileResult {
+
+    private static final String BUNDLE_KEY_PREFIX = "dataset.file.error";
+
+    private final String filename;
+    private final String type;
+    private final List<DataFile> dataFiles;
+    private final List<String> errors;
+
+    public CreateDataFileResult(String filename, String type, List<DataFile> dataFiles, List<String> errors) {
+        this.filename = filename;
+        this.type = type;
+        this.dataFiles = dataFiles == null ? null : Collections.unmodifiableList(dataFiles);
+        this.errors = errors == null ? Collections.emptyList() : Collections.unmodifiableList(errors);
+    }
+
+    public static CreateDataFileResult success(String filename, String type, List<DataFile> dataFiles) {
+        return new CreateDataFileResult(filename, type, dataFiles, null);
+    }
+
+    public static CreateDataFileResult error(String filename, String type) {
+        return new CreateDataFileResult(filename, type, null, Collections.emptyList());
+    }
+
+    public static CreateDataFileResult error(String filename, String type, List<String> errors) {
+        return new CreateDataFileResult(filename, type, null, errors);
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public List<DataFile> getDataFiles() {
+        return dataFiles;
+    }
+
+    public List<String> getErrors() {
+        return errors;
+    }
+
+    public boolean success() {
+        return dataFiles != null;
+    }
+
+    public String getBundleKey() {
+        return String.format("%s.%s", BUNDLE_KEY_PREFIX, type);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/file/FileExceedsStorageQuotaException.java b/src/main/java/edu/harvard/iq/dataverse/util/file/FileExceedsStorageQuotaException.java
new file mode 100644
index 00000000000..29eeca254f7
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/file/FileExceedsStorageQuotaException.java
@@ -0,0 +1,22 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse.util.file;
+
+/**
+ *
+ * @author landreev
+ */
+public class FileExceedsStorageQuotaException extends Exception {
+
+    public FileExceedsStorageQuotaException(String message) {
+        super(message);
+    }
+
+    public FileExceedsStorageQuotaException(String message, Throwable cause) {
+        super(message, cause);
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinter.java
index ee0a882a10d..83b9d341d6d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinter.java
@@ -1,11 +1,10 @@
 package edu.harvard.iq.dataverse.util.json;
 
 import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUser;
 import edu.harvard.iq.dataverse.MetadataBlock;
 import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
 import edu.harvard.iq.dataverse.workflow.Workflow;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonObjectBuilder;
 
 /**
  * A Json printer that prints minimal data on objects. Useful when embedding 
@@ -25,13 +24,14 @@ public JsonObjectBuilder json( DatasetVersion dsv ) {
 	}
     
     public JsonObjectBuilder json( MetadataBlock blk ) {
-		return ( blk==null ) 
-				? null
-				: jsonObjectBuilder().add("id", blk.getId())
-					.add("displayName", blk.getDisplayName())
-					.add("name", blk.getName())
-					;
-	}
+        if (blk == null) return null;
+        boolean displayOnCreate = blk.isDisplayOnCreate();
+        return jsonObjectBuilder().add("id", blk.getId())
+                    .add("displayName", blk.getDisplayName())
+                    .add("displayOnCreate", displayOnCreate)
+                    .add("name", blk.getName())
+                    ;
+    }
     
     public JsonObjectBuilder json( Workflow wf ) {
         return jsonObjectBuilder().add("id", wf.getId())
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinter.java
new file mode 100644
index 00000000000..9a98f3b8413
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinter.java
@@ -0,0 +1,263 @@
+package edu.harvard.iq.dataverse.util.json;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+
+import static edu.harvard.iq.dataverse.dataset.DatasetUtil.getLocaleCurationStatusLabel;
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.jsonRoleAssignments;
+
+/**
+ * A helper class to build a JSON representation of a UserNotification.
+ * <p>
+ * It is responsible for adding the correct fields to a JSON object based on the
+ * notification type.
+ */
+@Stateless
+public class InAppNotificationsJsonPrinter {
+
+    public static final String KEY_ROLE_ASSIGNMENTS = "roleAssignments";
+    public static final String KEY_DATAVERSE_ALIAS = "dataverseAlias";
+    public static final String KEY_DATAVERSE_DISPLAY_NAME = "dataverseDisplayName";
+    public static final String KEY_DATASET_PERSISTENT_ID = "datasetPersistentIdentifier";
+    public static final String KEY_DATASET_DISPLAY_NAME = "datasetDisplayName";
+    public static final String KEY_OWNER_PERSISTENT_ID = "ownerPersistentIdentifier";
+    public static final String KEY_OWNER_ALIAS = "ownerAlias";
+    public static final String KEY_OWNER_DISPLAY_NAME = "ownerDisplayName";
+    public static final String KEY_REQUESTOR_FIRST_NAME = "requestorFirstName";
+    public static final String KEY_REQUESTOR_LAST_NAME = "requestorLastName";
+    public static final String KEY_REQUESTOR_EMAIL = "requestorEmail";
+    public static final String KEY_DATAFILE_ID = "dataFileId";
+    public static final String KEY_DATAFILE_DISPLAY_NAME = "dataFileDisplayName";
+    public static final String KEY_GUIDES_BASE_URL = "userGuidesBaseUrl";
+    public static final String KEY_GUIDES_VERSION = "userGuidesVersion";
+    public static final String KEY_GUIDES_SECTION_PATH = "userGuidesSectionPath";
+    public static final String KEY_CURATION_STATUS = "currentCurationStatus";
+    public static final String KEY_ADDITIONAL_INFO = "additionalInfo";
+    public static final String KEY_OBJECT_DELETED = "objectDeleted";
+    public static final String KEY_INSTALLATION_BRAND_NAME = "installationBrandName";
+
+    public static final String GUIDES_SECTION_PATH_DATAVERSE_MANAGEMENT_HTML = "user/dataverse-management.html";
+    public static final String GUIDES_SECTION_PATH_DATASET_MANAGEMENT_HTML = "user/dataset-management.html";
+    public static final String GUIDES_SECTION_PATH_DATASET_MANAGEMENT_TABULAR_FILES_HTML = "user/dataset-management.html#tabular-data-files";
+    public static final String GUIDES_SECTION_PATH_USER_HTML = "user/index.html";
+
+    @EJB
+    private DataverseServiceBean dataverseService;
+    @EJB
+    private DatasetServiceBean datasetService;
+    @EJB
+    private DatasetVersionServiceBean datasetVersionService;
+    @EJB
+    private DataFileServiceBean dataFileService;
+    @EJB
+    private PermissionServiceBean permissionService;
+    @EJB
+    private SystemConfig systemConfig;
+
+    /**
+     * Populates a JSON builder with fields specific to the notification type.
+     *
+     * @param notificationJson  The JSON builder to add fields to.
+     * @param authenticatedUser The user receiving the notification.
+     * @param userNotification  The notification object containing the details.
+     */
+    public void addFieldsByType(final NullSafeJsonBuilder notificationJson, final AuthenticatedUser authenticatedUser, final UserNotification userNotification) {
+        final AuthenticatedUser requestor = userNotification.getRequestor();
+
+        switch (userNotification.getType()) {
+            case ASSIGNROLE:
+            case REVOKEROLE:
+                addRoleFields(notificationJson, authenticatedUser, userNotification);
+                break;
+            case CREATEDV:
+                addCreateDataverseFields(notificationJson, userNotification);
+                break;
+            case REQUESTFILEACCESS:
+                addRequestFileAccessFields(notificationJson, userNotification, requestor);
+                break;
+            case REQUESTEDFILEACCESS:
+            case GRANTFILEACCESS:
+            case REJECTFILEACCESS:
+                addDataFileFields(notificationJson, userNotification);
+                break;
+            case DATASETCREATED:
+                addDatasetCreatedFields(notificationJson, userNotification, requestor);
+                break;
+            case CREATEDS:
+                addCreateDatasetFields(notificationJson, userNotification);
+                break;
+            case SUBMITTEDDS:
+                addSubmittedDatasetFields(notificationJson, userNotification, requestor);
+                break;
+            case PUBLISHEDDS:
+            case PUBLISHFAILED_PIDREG:
+            case RETURNEDDS:
+            case WORKFLOW_SUCCESS:
+            case WORKFLOW_FAILURE:
+            case PIDRECONCILED:
+            case FILESYSTEMIMPORT:
+            case CHECKSUMIMPORT:
+                addDatasetVersionFields(notificationJson, userNotification);
+                break;
+            case STATUSUPDATED:
+                addDatasetVersionFields(notificationJson, userNotification, true);
+                break;
+            case CREATEACC:
+                addCreateAccountFields(notificationJson);
+                break;
+            case GLOBUSUPLOADCOMPLETED:
+            case GLOBUSDOWNLOADCOMPLETED:
+            case GLOBUSUPLOADCOMPLETEDWITHERRORS:
+            case GLOBUSUPLOADREMOTEFAILURE:
+            case GLOBUSUPLOADLOCALFAILURE:
+            case GLOBUSDOWNLOADCOMPLETEDWITHERRORS:
+            case CHECKSUMFAIL:
+                addDatasetFields(notificationJson, userNotification);
+                break;
+            case INGESTCOMPLETED:
+            case INGESTCOMPLETEDWITHERRORS:
+                addIngestFields(notificationJson, userNotification);
+                break;
+            case DATASETMENTIONED:
+                addDatasetMentionedFields(notificationJson, userNotification);
+                break;
+        }
+    }
+
+    private void addRoleFields(final NullSafeJsonBuilder notificationJson, final AuthenticatedUser authenticatedUser, final UserNotification userNotification) {
+        Dataverse dataverse = dataverseService.find(userNotification.getObjectId());
+        if (dataverse != null) {
+            notificationJson.add(KEY_ROLE_ASSIGNMENTS, jsonRoleAssignments(permissionService.getEffectiveRoleAssignments(authenticatedUser, dataverse)));
+            notificationJson.add(KEY_DATAVERSE_ALIAS, dataverse.getAlias());
+            notificationJson.add(KEY_DATAVERSE_DISPLAY_NAME, dataverse.getDisplayName());
+        } else {
+            Dataset dataset = datasetService.find(userNotification.getObjectId());
+            if (dataset != null) {
+                notificationJson.add(KEY_ROLE_ASSIGNMENTS, jsonRoleAssignments(permissionService.getEffectiveRoleAssignments(authenticatedUser, dataset)));
+                notificationJson.add(KEY_DATASET_PERSISTENT_ID, dataset.getGlobalId().asString());
+                notificationJson.add(KEY_DATASET_DISPLAY_NAME, dataset.getDisplayName());
+            } else {
+                DataFile datafile = dataFileService.find(userNotification.getObjectId());
+                if (datafile != null) {
+                    notificationJson.add(KEY_ROLE_ASSIGNMENTS, jsonRoleAssignments(permissionService.getEffectiveRoleAssignments(authenticatedUser, datafile)));
+                    notificationJson.add(KEY_OWNER_PERSISTENT_ID, datafile.getOwner().getGlobalId().asString());
+                    notificationJson.add(KEY_OWNER_DISPLAY_NAME, datafile.getOwner().getDisplayName());
+                } else {
+                    notificationJson.add(KEY_OBJECT_DELETED, true);
+                }
+            }
+        }
+    }
+
+    private void addCreateDataverseFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification) {
+        final Dataverse dataverse = dataverseService.find(userNotification.getObjectId());
+        if (dataverse != null) {
+            notificationJson.add(KEY_DATAVERSE_ALIAS, dataverse.getAlias());
+            notificationJson.add(KEY_DATAVERSE_DISPLAY_NAME, dataverse.getDisplayName());
+            Dataverse owner = dataverse.getOwner();
+            if (owner != null) {
+                notificationJson.add(KEY_OWNER_ALIAS, owner.getAlias());
+                notificationJson.add(KEY_OWNER_DISPLAY_NAME, owner.getDisplayName());
+            }
+        } else {
+            notificationJson.add(KEY_OBJECT_DELETED, true);
+        }
+        addGuidesFields(notificationJson, GUIDES_SECTION_PATH_DATAVERSE_MANAGEMENT_HTML);
+    }
+
+    private void addCreateAccountFields(final NullSafeJsonBuilder notificationJson) {
+        notificationJson.add(KEY_INSTALLATION_BRAND_NAME, BrandingUtil.getInstallationBrandName());
+        addGuidesFields(notificationJson, GUIDES_SECTION_PATH_USER_HTML);
+    }
+
+    private void addRequestFileAccessFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification, final AuthenticatedUser requestor) {
+        addRequestorFields(notificationJson, requestor);
+        addDataFileFields(notificationJson, userNotification);
+    }
+
+    private void addDataFileFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification) {
+        final DataFile dataFile = dataFileService.find(userNotification.getObjectId());
+        if (dataFile != null) {
+            notificationJson.add(KEY_DATAFILE_ID, dataFile.getId());
+            notificationJson.add(KEY_DATAFILE_DISPLAY_NAME, dataFile.getDisplayName());
+        } else {
+            notificationJson.add(KEY_OBJECT_DELETED, true);
+        }
+    }
+
+    private void addDatasetCreatedFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification, final AuthenticatedUser requestor) {
+        addDatasetFields(notificationJson, userNotification);
+        addRequestorFields(notificationJson, requestor);
+    }
+
+    private void addRequestorFields(final NullSafeJsonBuilder notificationJson, final AuthenticatedUser requestor) {
+        notificationJson.add(KEY_REQUESTOR_FIRST_NAME, requestor.getFirstName());
+        notificationJson.add(KEY_REQUESTOR_LAST_NAME, requestor.getLastName());
+        notificationJson.add(KEY_REQUESTOR_EMAIL, requestor.getEmail());
+    }
+
+    private void addDatasetFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification) {
+        final Dataset dataset = datasetService.find(userNotification.getObjectId());
+        if (dataset != null) {
+            notificationJson.add(KEY_DATASET_PERSISTENT_ID, dataset.getGlobalId().asString());
+            notificationJson.add(KEY_DATASET_DISPLAY_NAME, dataset.getDisplayName());
+            notificationJson.add(KEY_OWNER_ALIAS, dataset.getOwner().getAlias());
+            notificationJson.add(KEY_OWNER_DISPLAY_NAME, dataset.getOwner().getDisplayName());
+        } else {
+            notificationJson.add(KEY_OBJECT_DELETED, true);
+        }
+    }
+
+    private void addCreateDatasetFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification) {
+        addGuidesFields(notificationJson, GUIDES_SECTION_PATH_DATASET_MANAGEMENT_HTML);
+        addDatasetVersionFields(notificationJson, userNotification);
+    }
+
+    private void addGuidesFields(final NullSafeJsonBuilder notificationJson, String guidesSectionPath) {
+        notificationJson.add(KEY_GUIDES_BASE_URL, systemConfig.getGuidesBaseUrl(false));
+        notificationJson.add(KEY_GUIDES_VERSION, systemConfig.getGuidesVersion());
+
+        if (guidesSectionPath != null) {
+            notificationJson.add(KEY_GUIDES_SECTION_PATH, guidesSectionPath);
+        }
+    }
+
+    private void addSubmittedDatasetFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification, final AuthenticatedUser requestor) {
+        addDatasetFields(notificationJson, userNotification);
+        addRequestorFields(notificationJson, requestor);
+    }
+
+    private void addDatasetVersionFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification) {
+        addDatasetVersionFields(notificationJson, userNotification, false);
+    }
+
+    private void addDatasetVersionFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification, final boolean addCurationStatus) {
+        final DatasetVersion datasetVersion = datasetVersionService.find(userNotification.getObjectId());
+        if (datasetVersion != null) {
+            Dataset dataset = datasetVersion.getDataset();
+            notificationJson.add(KEY_DATASET_PERSISTENT_ID, dataset.getGlobalId().asString());
+            notificationJson.add(KEY_DATASET_DISPLAY_NAME, dataset.getDisplayName());
+            notificationJson.add(KEY_OWNER_ALIAS, dataset.getOwner().getAlias());
+            notificationJson.add(KEY_OWNER_DISPLAY_NAME, dataset.getOwner().getDisplayName());
+            if (addCurationStatus) {
+                notificationJson.add(KEY_CURATION_STATUS, getLocaleCurationStatusLabel(datasetVersion.getCurrentCurationStatus()));
+            }
+        } else {
+            notificationJson.add(KEY_OBJECT_DELETED, true);
+        }
+    }
+
+    private void addIngestFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification) {
+        addDatasetFields(notificationJson, userNotification);
+        addGuidesFields(notificationJson, GUIDES_SECTION_PATH_DATASET_MANAGEMENT_TABULAR_FILES_HTML);
+    }
+
+    private void addDatasetMentionedFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification) {
+        addDatasetFields(notificationJson, userNotification);
+        notificationJson.add(KEY_ADDITIONAL_INFO, userNotification.getAdditionalInfo());
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JSONLDUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JSONLDUtil.java
new file mode 100644
index 00000000000..380cef6aa9d
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JSONLDUtil.java
@@ -0,0 +1,904 @@
+package edu.harvard.iq.dataverse.util.json;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+import java.util.logging.Logger;
+
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
+import jakarta.json.JsonValue.ValueType;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.ws.rs.BadRequestException;
+
+import edu.harvard.iq.dataverse.ControlledVocabularyValue;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.DatasetFieldValue;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.MetadataBlockServiceBean;
+import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+import org.apache.commons.lang3.StringUtils;
+
+import com.apicatalog.jsonld.JsonLd;
+import com.apicatalog.jsonld.JsonLdError;
+import com.apicatalog.jsonld.document.JsonDocument;
+
+import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import jakarta.json.JsonReader;
+
+public class JSONLDUtil {
+
+    private static final Logger logger = Logger.getLogger(JSONLDUtil.class.getCanonicalName());
+
+    /*
+     * private static Map<String, String> populateContext(JsonValue json) {
+     * Map<String, String> context = new TreeMap<String, String>(); if (json
+     * instanceof JsonArray) { logger.warning("Array @context not yet supported"); }
+     * else { for (String key : ((JsonObject) json).keySet()) {
+     * context.putIfAbsent(key, ((JsonObject) json).getString(key)); } } return
+     * context; }
+     */
+
+    public static JsonObject getContext(Map<String, String> contextMap) {
+        JsonObjectBuilder contextBuilder = Json.createObjectBuilder();
+        for (Entry<String, String> e : contextMap.entrySet()) {
+            contextBuilder.add(e.getKey(), e.getValue());
+        }
+        return contextBuilder.build();
+    }
+
+    public static Dataset updateDatasetMDFromJsonLD(Dataset ds, String jsonLDBody,
+            MetadataBlockServiceBean metadataBlockSvc, DatasetFieldServiceBean datasetFieldSvc, boolean append,
+            boolean migrating, LicenseServiceBean licenseSvc, DatasetTypeServiceBean datasetTypeSvc) {
+
+        DatasetVersion dsv = new DatasetVersion();
+
+        JsonObject jsonld = decontextualizeJsonLD(jsonLDBody);
+        if (migrating) {
+            Optional<GlobalId> maybePid = PidProvider.parse(jsonld.getString("@id"));
+            if (maybePid.isPresent()) {
+                ds.setGlobalId(maybePid.get());
+            } else {
+                // unparsable PID passed. Terminate.
+                throw new BadRequestException("Cannot parse the @id '" + jsonld.getString("@id")
+                        + "'. Make sure it is in valid form - see Dataverse Native API documentation.");
+            }
+        }
+        
+        //Store the metadatalanguage if sent - the caller needs to check whether it is allowed (as with any GlobalID)
+        ds.setMetadataLanguage(jsonld.getString(JsonLDTerm.schemaOrg("inLanguage").getUrl(),null));
+
+        String datasetTypeIn = jsonld.getString(JsonLDTerm.datasetType.getUrl(), DatasetType.DEFAULT_DATASET_TYPE);
+        DatasetType datasetType = datasetTypeSvc.getByName(datasetTypeIn);
+        if (datasetType != null) {
+            ds.setDatasetType(datasetType);
+        } else {
+            throw new BadRequestException("Invalid dataset type: " + datasetTypeIn);
+        }
+
+        dsv = updateDatasetVersionMDFromJsonLD(dsv, jsonld, metadataBlockSvc, datasetFieldSvc, append, migrating, licenseSvc);
+        dsv.setDataset(ds);
+
+        List<DatasetVersion> versions = new ArrayList<>(1);
+        versions.add(dsv);
+
+        ds.setVersions(versions);
+        if (migrating) {
+            if (jsonld.containsKey(JsonLDTerm.schemaOrg("dateModified").getUrl())) {
+                String dateString = jsonld.getString(JsonLDTerm.schemaOrg("dateModified").getUrl());
+                LocalDateTime dateTime = getDateTimeFrom(dateString);
+                ds.setModificationTime(Timestamp.valueOf(dateTime));
+            }
+        }
+        return ds;
+    }
+
+    public static DatasetVersion updateDatasetVersionMDFromJsonLD(DatasetVersion dsv, String jsonLDBody,
+            MetadataBlockServiceBean metadataBlockSvc, DatasetFieldServiceBean datasetFieldSvc, boolean append, boolean migrating, LicenseServiceBean licenseSvc) {
+        JsonObject jsonld = decontextualizeJsonLD(jsonLDBody);
+        return updateDatasetVersionMDFromJsonLD(dsv, jsonld, metadataBlockSvc, datasetFieldSvc, append, migrating, licenseSvc);
+    }
+
+    /**
+     * 
+     * @param dsv
+     * @param jsonld
+     * @param metadataBlockSvc
+     * @param datasetFieldSvc
+     * @param append           - if append, will add new top level field values for
+     *                         multi-valued fields, if true and field type isn't
+     *                         multiple, will fail. if false will replace all
+     *                         value(s) for fields found in the json-ld.
+     * @return
+     */
+    public static DatasetVersion updateDatasetVersionMDFromJsonLD(DatasetVersion dsv, JsonObject jsonld,
+            MetadataBlockServiceBean metadataBlockSvc, DatasetFieldServiceBean datasetFieldSvc, boolean append, boolean migrating, LicenseServiceBean licenseSvc) {
+
+        //Assume draft to start
+        dsv.setVersionState(VersionState.DRAFT);
+        
+        populateFieldTypeMap(metadataBlockSvc);
+
+        // get existing ones?
+        List<DatasetField> dsfl = dsv.getDatasetFields();
+        Map<DatasetFieldType, DatasetField> fieldByTypeMap = new HashMap<DatasetFieldType, DatasetField>();
+        for (DatasetField dsf : dsfl) {
+            if (fieldByTypeMap.containsKey(dsf.getDatasetFieldType())) {
+                // May have multiple values per field, but not multiple fields of one type?
+                logger.warning("Multiple fields of type " + dsf.getDatasetFieldType().getName());
+            }
+            fieldByTypeMap.put(dsf.getDatasetFieldType(), dsf);
+        }
+
+        TermsOfUseAndAccess terms = (dsv.getTermsOfUseAndAccess() != null) ? dsv.getTermsOfUseAndAccess().copyTermsOfUseAndAccess() : new TermsOfUseAndAccess();
+
+
+        for (String key : jsonld.keySet()) {
+            if (!key.equals("@context")) {
+                if (dsftMap.containsKey(key)) {
+
+                    DatasetFieldType dsft = dsftMap.get(key);
+                    DatasetField dsf = null;
+                    if (fieldByTypeMap.containsKey(dsft)) {
+                        dsf = fieldByTypeMap.get(dsft);
+                        // If there's an existing field, we use it with append and remove it for !append
+                        // unless it's multiple
+                        if (!append && !dsft.isAllowMultiples()) {
+                            dsfl.remove(dsf);
+                            dsf=null;
+                        }
+                    }
+                    if (dsf == null) {
+                        dsf = new DatasetField();
+                        dsfl.add(dsf);
+                        dsf.setDatasetFieldType(dsft);
+                    }
+
+                    JsonArray valArray = getValues(jsonld.get(key), dsft.isAllowMultiples(), dsft.getName());
+
+                    addField(dsf, valArray, dsft, datasetFieldSvc, append);
+
+                } else {
+                    //When migrating, the publication date and version number can be set
+                    if (key.equals(JsonLDTerm.schemaOrg("datePublished").getUrl())&& migrating && !append) {
+                        dsv.setVersionState(VersionState.RELEASED);
+                    } else if (key.equals(JsonLDTerm.schemaOrg("version").getUrl())&& migrating && !append) {
+                        String friendlyVersion = jsonld.getString(JsonLDTerm.schemaOrg("version").getUrl());
+                        int index = friendlyVersion.indexOf(".");
+                        if (index > 0) {
+                            dsv.setVersionNumber(Long.parseLong(friendlyVersion.substring(0, index)));
+                            dsv.setMinorVersionNumber(Long.parseLong(friendlyVersion.substring(index + 1)));
+                        }
+                    }
+                    else if (datasetTerms.contains(key)) {
+                        // Other Dataset-level TermsOfUseAndAccess
+                        if (!append || !isSet(terms, key)) {
+                            if (key.equals(JsonLDTerm.schemaOrg("license").getUrl())) {
+                                if (jsonld.containsKey(JsonLDTerm.termsOfUse.getUrl())) {
+                                    throw new BadRequestException("Cannot specify " + JsonLDTerm.schemaOrg("license").getUrl() + " and " + JsonLDTerm.termsOfUse.getUrl());
+                                }
+                                if (StringUtils.isEmpty(jsonld.getString(key))) {
+                                    setSemTerm(terms, key, licenseSvc.getDefault());
+                                }
+                                else {
+                                        License license = licenseSvc.getByNameOrUri(jsonld.getString(key));
+                                        if (license == null) throw new BadRequestException("Invalid license");
+                                        setSemTerm(terms, key, license);
+                                }
+                            }
+                            else if (key.equals("https://dataverse.org/schema/core#fileRequestAccess")) {
+                                setSemTerm(terms, key, jsonld.getBoolean(key));
+                            }
+                            else {
+                                setSemTerm(terms, key, jsonld.getString(key));
+                            }
+                        }
+                        else {
+                            throw new BadRequestException("Can't append to a single-value field that already has a value: " + key);
+                        }
+                    } else if (key.equals(JsonLDTerm.fileTermsOfAccess.getUrl())) {
+                        // Other DataFile-level TermsOfUseAndAccess
+                        JsonObject fAccessObject = jsonld.getJsonObject(JsonLDTerm.fileTermsOfAccess.getUrl());
+                        for (String fileKey : fAccessObject.keySet()) {
+                            if (datafileTerms.contains(fileKey)) {
+                                if (!append || !isSet(terms, fileKey)) {
+                                    if (fileKey.equals(JsonLDTerm.fileRequestAccess.getUrl())) {
+                                        setSemTerm(terms, fileKey, fAccessObject.getBoolean(fileKey));
+                                    } else {
+                                        setSemTerm(terms, fileKey, fAccessObject.getString(fileKey));
+                                    }
+                                } else {
+                                    throw new BadRequestException(
+                                            "Can't append to a single-value field that already has a value: "
+                                                    + fileKey);
+                                }
+                            }
+                        }
+                    }
+                    // ToDo: support Dataverse location metadata? e.g. move to new dataverse?
+                    // re: JsonLDTerm.schemaOrg("includedInDataCatalog")
+                }
+            }
+        }
+        dsv.setTermsOfUseAndAccess(terms);
+        terms.setDatasetVersion(dsv);
+        dsv.setDatasetFields(dsfl);
+
+        return dsv;
+    }
+    /**
+     * 
+     * @param dsv
+     * @param jsonLDBody
+     * @param metadataBlockService
+     * @param datasetFieldSvc
+     * @param b
+     * @param c
+     * @return
+     */
+    public static DatasetVersion deleteDatasetVersionMDFromJsonLD(DatasetVersion dsv, String jsonLDBody,
+            MetadataBlockServiceBean metadataBlockSvc, LicenseServiceBean licenseSvc) {
+        logger.fine("deleteDatasetVersionMD");
+        JsonObject jsonld = decontextualizeJsonLD(jsonLDBody);
+        //All terms are now URIs
+        //Setup dsftMap - URI to datasetFieldType map
+        populateFieldTypeMap(metadataBlockSvc);
+
+
+        //Another map - from datasetFieldType to an existing field in the dataset
+        List<DatasetField> dsfl = dsv.getDatasetFields();
+        Map<DatasetFieldType, DatasetField> fieldByTypeMap = new HashMap<DatasetFieldType, DatasetField>();
+        for (DatasetField dsf : dsfl) {
+            if (fieldByTypeMap.containsKey(dsf.getDatasetFieldType())) {
+                // May have multiple values per field, but not multiple fields of one type?
+                logger.warning("Multiple fields of type " + dsf.getDatasetFieldType().getName());
+            }
+            fieldByTypeMap.put(dsf.getDatasetFieldType(), dsf);
+        }
+        
+        TermsOfUseAndAccess terms = dsv.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
+
+        //Iterate through input json
+        for (String key : jsonld.keySet()) {
+            //Skip context (shouldn't be present with decontextualize used above)
+            if (!key.equals("@context")) {
+                if (dsftMap.containsKey(key)) {
+                    //THere's a field type with theis URI
+                    DatasetFieldType dsft = dsftMap.get(key);
+                    DatasetField dsf = null;
+                    if (fieldByTypeMap.containsKey(dsft)) {
+                        //There's a field of this type
+                        dsf = fieldByTypeMap.get(dsft);
+
+                        // Todo - normalize object vs. array
+                        JsonArray valArray = getValues(jsonld.get(key), dsft.isAllowMultiples(), dsft.getName());
+                        logger.fine("Deleting: " + key + " : " + valArray.toString());
+                        DatasetField dsf2 = getReplacementField(dsf, valArray);
+                        if(dsf2 == null) {
+                            //Exact match - remove the field
+                            dsfl.remove(dsf);
+                        } else {
+                            //Partial match - some values of a multivalue field match, so keep the remaining values
+                            dsfl.remove(dsf);
+                            dsfl.add(dsf2);
+                        }
+                    }
+                } else {
+                    // Internal/non-metadatablock terms
+                    boolean found=false;
+                    if (key.equals(JsonLDTerm.schemaOrg("license").getUrl())) {
+                        if(licenseSvc.getByNameOrUri(jsonld.getString(key)) != null) {
+                            setSemTerm(terms, key, licenseSvc.getDefault());
+                        } else {
+                            throw new BadRequestException(
+                                    "Term: " + key + " with value: " + jsonld.getString(key) + " not found.");
+                        }
+                        found=true;
+                    } else if (datasetTerms.contains(key)) {
+                        if(!deleteIfSemTermMatches(terms, key, jsonld.get(key))) {
+                            throw new BadRequestException(
+                                    "Term: " + key + " with value: " + jsonld.getString(key) + " not found.");
+                        }
+                        found=true;
+                    } else if (key.equals(JsonLDTerm.fileTermsOfAccess.getUrl())) {
+                        JsonObject fAccessObject = jsonld.getJsonObject(JsonLDTerm.fileTermsOfAccess.getUrl());
+                        for (String fileKey : fAccessObject.keySet()) {
+                            if (datafileTerms.contains(fileKey)) {
+                                if(!deleteIfSemTermMatches(terms, key, jsonld.get(key))) {
+                                    throw new BadRequestException(
+                                            "Term: " + key + " with value: " + jsonld.getString(key) + " not found.");
+                                }
+                                found=true;
+                            }
+                        }
+                    } else if(!found) {
+                        throw new BadRequestException(
+                                "Term: " + key + " not found.");
+                                    }
+                    
+                    dsv.setTermsOfUseAndAccess(terms);
+                }
+            }
+        }
+        dsv.setDatasetFields(dsfl);
+        return dsv;
+    }
+    
+    /**
+     * 
+     * @param dsf
+     * @param valArray
+     * @return null if exact match, otherwise return a field without the value to be deleted
+     */
+    private static DatasetField getReplacementField(DatasetField dsf, JsonArray valArray) {
+        // TODO Parse valArray and remove any matching entries in the dsf
+        // Until then, delete removes all values of a multivalued field
+        // Doing this on a required field will fail.
+        return null;
+    }
+
+    private static void addField(DatasetField dsf, JsonArray valArray, DatasetFieldType dsft,
+            DatasetFieldServiceBean datasetFieldSvc, boolean append) {
+
+        if (append && !dsft.isAllowMultiples()) {
+            if ((dsft.isCompound() && !dsf.getDatasetFieldCompoundValues().isEmpty())
+                    || (dsft.isAllowControlledVocabulary() && !dsf.getControlledVocabularyValues().isEmpty())
+                    || !dsf.getDatasetFieldValues().isEmpty()) {
+                throw new BadRequestException(
+                        "Can't append to a single-value field that already has a value: " + dsft.getName());
+            }
+        }
+        logger.fine("Name: " + dsft.getName());
+        logger.fine("val: " + valArray.toString());
+        logger.fine("Compound: " + dsft.isCompound());
+        logger.fine("CV: " + dsft.isAllowControlledVocabulary());
+
+        Map<Long, JsonObject> cvocMap = datasetFieldSvc.getCVocConf(true);
+        
+        if (dsft.isCompound()) {
+            /*
+             * List<DatasetFieldCompoundValue> vals = parseCompoundValue(type,
+             * jsonld.get(key),testType); for (DatasetFieldCompoundValue dsfcv : vals) {
+             * dsfcv.setParentDatasetField(ret); } dsf.setDatasetFieldCompoundValues(vals);
+             */
+            List<DatasetFieldCompoundValue> cvList = dsf.getDatasetFieldCompoundValues();
+            if (!cvList.isEmpty()) {
+                if (!append) {
+                    cvList.clear();
+                } else if (!dsft.isAllowMultiples() && cvList.size() == 1) {
+                    // Trying to append but only a single value is allowed (and there already is
+                    // one)
+                    // (and we don't currently support appending new fields within a compound value)
+                    throw new BadRequestException(
+                            "Append with compound field with single value not yet supported: " + dsft.getDisplayName());
+                }
+            }
+
+            List<DatasetFieldCompoundValue> vals = new LinkedList<>();
+            for (JsonValue val : valArray) {
+                if (!(val instanceof JsonObject)) {
+                    throw new BadRequestException(
+                            "Compound field values must be JSON objects, field: " + dsft.getName());
+                }
+                DatasetFieldCompoundValue cv = null;
+
+                cv = new DatasetFieldCompoundValue();
+                cv.setDisplayOrder(cvList.size());
+                cvList.add(cv);
+                cv.setParentDatasetField(dsf);
+
+                JsonObject obj = (JsonObject) val;
+                for (String childKey : obj.keySet()) {
+                    if (dsftMap.containsKey(childKey)) {
+                        DatasetFieldType childft = dsftMap.get(childKey);
+                        if (!dsft.getChildDatasetFieldTypes().contains(childft)) {
+                            throw new BadRequestException(
+                                    "Compound field " + dsft.getName() + "can't include term " + childKey);
+                        }
+                        DatasetField childDsf = new DatasetField();
+                        cv.getChildDatasetFields().add(childDsf);
+                        childDsf.setDatasetFieldType(childft);
+                        childDsf.setParentDatasetFieldCompoundValue(cv);
+
+                        JsonArray childValArray = getValues(obj.get(childKey), childft.isAllowMultiples(),
+                                childft.getName());
+                        addField(childDsf, childValArray, childft, datasetFieldSvc, append);
+                    }
+                }
+            }
+
+        } else if (dsft.isControlledVocabulary()) {
+
+            List<ControlledVocabularyValue> vals = dsf.getControlledVocabularyValues();
+            for (JsonString strVal : valArray.getValuesAs(JsonString.class)) {
+                String strValue = strVal.getString();
+                ControlledVocabularyValue cvv = datasetFieldSvc
+                        .findControlledVocabularyValueByDatasetFieldTypeAndStrValue(dsft, strValue, true);
+                if (cvv == null) {
+                    throw new BadRequestException(
+                            "Unknown value for Controlled Vocab Field: " + dsft.getName() + " : " + strValue);
+                }
+                // Only add value to the list if it is not a duplicate
+                if (strValue.equals("Other")) {
+                    logger.fine("vals = " + vals + ", contains: " + vals.contains(cvv));
+                }
+                if (!vals.contains(cvv)) {
+                    if (vals.size() > 0) {
+                        cvv.setDisplayOrder(vals.size());
+                    }
+                    vals.add(cvv);
+                    cvv.setDatasetFieldType(dsft);
+                }
+            }
+            dsf.setControlledVocabularyValues(vals);
+
+        } else {
+
+            boolean extVocab=false;
+            if(cvocMap.containsKey(dsft.getId())) {
+                extVocab=true;
+            }
+            List<DatasetFieldValue> vals = dsf.getDatasetFieldValues();
+
+            for (JsonString strVal : valArray.getValuesAs(JsonString.class)) {
+                String strValue = strVal.getString();
+                if(extVocab) {
+                    if(!datasetFieldSvc.isValidCVocValue(dsft, strValue)) {
+                        throw new BadRequestException("Invalid values submitted for " + dsft.getName() + " which is limited to specific vocabularies.");
+                    }
+                }
+                DatasetFieldValue datasetFieldValue = new DatasetFieldValue();
+
+                datasetFieldValue.setDisplayOrder(vals.size());
+                datasetFieldValue.setValue(strValue.trim());
+                vals.add(datasetFieldValue);
+                datasetFieldValue.setDatasetField(dsf);
+
+            }
+            dsf.setDatasetFieldValues(vals);
+        }
+    }
+
+    private static JsonArray getValues(JsonValue val, boolean allowMultiples, String name) {
+        JsonArray valArray = null;
+        if (val instanceof JsonArray) {
+            if ((((JsonArray) val).size() > 1) && !allowMultiples) {
+                throw new BadRequestException("Array for single value notsupported: " + name);
+            } else {
+                valArray = (JsonArray) val;
+            }
+        } else {
+            valArray = Json.createArrayBuilder().add(val).build();
+        }
+        return valArray;
+    }
+
+    static Map<String, String> localContext = new TreeMap<String, String>();
+    static Map<String, DatasetFieldType> dsftMap = new TreeMap<String, DatasetFieldType>();
+
+    //A map if DatasetFieldTypes by decontextualized URL
+    private static void populateFieldTypeMap(MetadataBlockServiceBean metadataBlockSvc) {
+        if (dsftMap.isEmpty()) {
+            List<MetadataBlock> mdbList = metadataBlockSvc.listMetadataBlocks();
+            for (MetadataBlock mdb : mdbList) {
+                for (DatasetFieldType dsft : mdb.getDatasetFieldTypes()) {
+                    dsftMap.put(dsft.getJsonLDTerm().getUrl(), dsft);
+                }
+            }
+            logger.fine("DSFT Map: " + String.join(", ", dsftMap.keySet()));
+        }
+    }
+
+    public static void populateContext(MetadataBlockServiceBean metadataBlockSvc) {
+        if (localContext.isEmpty()) {
+
+            List<MetadataBlock> mdbList = metadataBlockSvc.listMetadataBlocks();
+            for (MetadataBlock mdb : mdbList) {
+                //Assures the mdb's namespace is in the list checked by JsonLDNamespace.isInNamespace() below
+                mdb.getJsonLDNamespace();
+                for (DatasetFieldType dsft : mdb.getDatasetFieldTypes()) {
+                    if ((dsft.getUri() != null) && !JsonLDNamespace.isInNamespace(dsft.getUri())) {
+                        // Add term if uri exists and it's not in one of the namespaces already defined
+                        localContext.putIfAbsent(dsft.getName(), dsft.getUri());
+                    }
+                }
+            }
+            JsonLDNamespace.addNamespacesToContext(localContext);
+            logger.fine("LocalContext keys: " + String.join(", ", localContext.keySet()));
+        }
+    }
+
+    public static JsonObject decontextualizeJsonLD(String jsonLDString) {
+        logger.fine(jsonLDString);
+        try (StringReader rdr = new StringReader(jsonLDString)) {
+
+            // Use JsonLd to expand/compact to localContext
+            try (JsonReader jsonReader = Json.createReader(rdr)) {
+                JsonObject jsonld = jsonReader.readObject();
+                JsonDocument doc = JsonDocument.of(jsonld);
+                JsonArray array = JsonLd.expand(doc).get();
+                jsonld = JsonLd.compact(JsonDocument.of(array), JsonDocument.of(Json.createObjectBuilder().build())).get();
+                // jsonld = array.getJsonObject(0);
+                logger.fine("Decontextualized object: " + jsonld);
+                return jsonld;
+            } catch (JsonLdError e) {
+                System.out.println(e.getMessage());
+                return null;
+            }
+        }
+    }
+
+    private static JsonObject recontextualizeJsonLD(JsonObject jsonldObj, MetadataBlockServiceBean metadataBlockSvc) {
+
+        populateContext(metadataBlockSvc);
+
+        // Use JsonLd to expand/compact to localContext
+        JsonDocument doc = JsonDocument.of(jsonldObj);
+        JsonArray array = null;
+        try {
+            array = JsonLd.expand(doc).get();
+
+            jsonldObj = JsonLd.compact(JsonDocument.of(array), JsonDocument.of(JSONLDUtil.getContext(localContext)))
+                    .get();
+            logger.fine("Compacted: " + jsonldObj.toString());
+            return jsonldObj;
+        } catch (JsonLdError e) {
+            System.out.println(e.getMessage());
+            return null;
+        }
+    }
+
+    public static String prettyPrint(JsonValue val) {
+        StringWriter sw = new StringWriter();
+        Map<String, Object> properties = new HashMap<>(1);
+        properties.put(JsonGenerator.PRETTY_PRINTING, true);
+        JsonWriterFactory writerFactory = Json.createWriterFactory(properties);
+        JsonWriter jsonWriter = writerFactory.createWriter(sw);
+        jsonWriter.write(val);
+        jsonWriter.close();
+        return sw.toString();
+    }
+
+//Modified from https://stackoverflow.com/questions/3389348/parse-any-date-in-java
+
+    private static final Map<String, String> DATE_FORMAT_REGEXPS = new HashMap<String, String>() {
+        {
+            put("^\\d{8}$", "yyyyMMdd");
+            put("^\\d{1,2}-\\d{1,2}-\\d{4}$", "dd-MM-yyyy");
+            put("^\\d{4}-\\d{1,2}-\\d{1,2}$", "yyyy-MM-dd");
+            put("^\\d{1,2}/\\d{1,2}/\\d{4}$", "MM/dd/yyyy");
+            put("^\\d{4}/\\d{1,2}/\\d{1,2}$", "yyyy/MM/dd");
+            put("^\\d{1,2}\\s[a-z]{3}\\s\\d{4}$", "dd MMM yyyy");
+            put("^\\d{1,2}\\s[a-z]{4,}\\s\\d{4}$", "dd MMMM yyyy");
+        }
+    };
+
+    private static final Map<String, String> DATETIME_FORMAT_REGEXPS = new HashMap<String, String>() {
+        {
+            put("^\\d{12}$", "yyyyMMddHHmm");
+            put("^\\d{8}\\s\\d{4}$", "yyyyMMdd HHmm");
+            put("^\\d{1,2}-\\d{1,2}-\\d{4}\\s\\d{1,2}:\\d{2}$", "dd-MM-yyyy HH:mm");
+            put("^\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{1,2}:\\d{2}$", "yyyy-MM-dd HH:mm");
+            put("^\\d{1,2}/\\d{1,2}/\\d{4}\\s\\d{1,2}:\\d{2}$", "MM/dd/yyyy HH:mm");
+            put("^\\d{4}/\\d{1,2}/\\d{1,2}\\s\\d{1,2}:\\d{2}$", "yyyy/MM/dd HH:mm");
+            put("^\\d{1,2}\\s[a-z]{3}\\s\\d{4}\\s\\d{1,2}:\\d{2}$", "dd MMM yyyy HH:mm");
+            put("^\\d{1,2}\\s[a-z]{4,}\\s\\d{4}\\s\\d{1,2}:\\d{2}$", "dd MMMM yyyy HH:mm");
+            put("^\\d{14}$", "yyyyMMddHHmmss");
+            put("^\\d{8}\\s\\d{6}$", "yyyyMMdd HHmmss");
+            put("^\\d{1,2}-\\d{1,2}-\\d{4}\\s\\d{1,2}:\\d{2}:\\d{2}$", "dd-MM-yyyy HH:mm:ss");
+            put("^\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{1,2}:\\d{2}:\\d{2}$", "yyyy-MM-dd HH:mm:ss");
+            put("^\\d{1,2}/\\d{1,2}/\\d{4}\\s\\d{1,2}:\\d{2}:\\d{2}$", "MM/dd/yyyy HH:mm:ss");
+            put("^\\d{4}/\\d{1,2}/\\d{1,2}\\s\\d{1,2}:\\d{2}:\\d{2}$", "yyyy/MM/dd HH:mm:ss");
+            put("^\\d{1,2}\\s[a-z]{3}\\s\\d{4}\\s\\d{1,2}:\\d{2}:\\d{2}$", "dd MMM yyyy HH:mm:ss");
+            put("^\\d{1,2}\\s[a-z]{4,}\\s\\d{4}\\s\\d{1,2}:\\d{2}:\\d{2}$", "dd MMMM yyyy HH:mm:ss");
+            put("^\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{1,2}:\\d{2}:\\d{2}\\.\\d{3}$", "yyyy-MM-dd HH:mm:ss.SSS");
+            put("^[a-z,A-Z]{3}\\s[a-z,A-Z]{3}\\s\\d{1,2}\\s\\d{1,2}:\\d{2}:\\d{2}\\s[a-z,A-Z]{3}\\s\\d{4}$",
+                    "EEE MMM dd HH:mm:ss zzz yyyy"); // Wed Sep 23 19:33:46 UTC 2020
+
+        }
+    };
+
+    /**
+     * Determine DateTimeFormatter pattern matching with the given date string.
+     * Returns null if format is unknown. You can simply extend DateUtil with more
+     * formats if needed.
+     * 
+     * @param dateString The date string to determine the SimpleDateFormat pattern
+     *                   for.
+     * @return The matching SimpleDateFormat pattern, or null if format is unknown.
+     * @see SimpleDateFormat
+     */
+    public static DateTimeFormatter determineDateTimeFormat(String dateString) {
+        for (String regexp : DATETIME_FORMAT_REGEXPS.keySet()) {
+            if (dateString.toLowerCase().matches(regexp)) {
+                return DateTimeFormatter.ofPattern(DATETIME_FORMAT_REGEXPS.get(regexp));
+            }
+        }
+        logger.warning("Unknown datetime format: " + dateString);
+        return null; // Unknown format.
+    }
+
+    public static DateTimeFormatter determineDateFormat(String dateString) {
+        for (String regexp : DATE_FORMAT_REGEXPS.keySet()) {
+            if (dateString.toLowerCase().matches(regexp)) {
+                return DateTimeFormatter.ofPattern(DATE_FORMAT_REGEXPS.get(regexp));
+            }
+        }
+        logger.warning("Unknown date format: " + dateString);
+        return null; // Unknown format.
+    }
+
+    public static LocalDateTime getDateTimeFrom(String dateString) {
+        DateTimeFormatter dtf = determineDateTimeFormat(dateString);
+        if (dtf != null) {
+            return LocalDateTime.parse(dateString, dtf);
+        } else {
+            dtf = determineDateFormat(dateString);
+            if (dtf != null) {
+                return LocalDate.parse(dateString, dtf).atStartOfDay();
+            }
+        }
+
+        return null;
+    }
+
+    // Convenience methods for TermsOfUseAndAccess
+
+    public static final List<String> datasetTerms = new ArrayList<String>(Arrays.asList(
+            "http://schema.org/license",
+            "https://dataverse.org/schema/core#termsOfUse",
+            "https://dataverse.org/schema/core#confidentialityDeclaration",
+            "https://dataverse.org/schema/core#specialPermissions", "https://dataverse.org/schema/core#restrictions",
+            "https://dataverse.org/schema/core#citationRequirements",
+            "https://dataverse.org/schema/core#depositorRequirements", "https://dataverse.org/schema/core#conditions",
+            "https://dataverse.org/schema/core#disclaimer"));
+    public static final List<String> datafileTerms = new ArrayList<String>(Arrays.asList(
+            "https://dataverse.org/schema/core#termsOfAccess", "https://dataverse.org/schema/core#fileRequestAccess",
+            "https://dataverse.org/schema/core#dataAccessPlace", "https://dataverse.org/schema/core#originalArchive",
+            "https://dataverse.org/schema/core#availabilityStatus",
+            "https://dataverse.org/schema/core#contactForAccess", "https://dataverse.org/schema/core#sizeOfCollection",
+            "https://dataverse.org/schema/core#studyCompletion"));
+
+    public static boolean isSet(TermsOfUseAndAccess terms, String semterm) {
+        switch (semterm) {
+        case "http://schema.org/license":
+            return terms.getLicense() != null;
+        case "https://dataverse.org/schema/core#termsOfUse":
+            return !StringUtils.isBlank(terms.getTermsOfUse());
+        case "https://dataverse.org/schema/core#confidentialityDeclaration":
+            return !StringUtils.isBlank(terms.getConfidentialityDeclaration());
+        case "https://dataverse.org/schema/core#specialPermissions":
+            return !StringUtils.isBlank(terms.getSpecialPermissions());
+        case "https://dataverse.org/schema/core#restrictions":
+            return !StringUtils.isBlank(terms.getRestrictions());
+        case "https://dataverse.org/schema/core#citationRequirements":
+            return !StringUtils.isBlank(terms.getCitationRequirements());
+        case "https://dataverse.org/schema/core#depositorRequirements":
+            return !StringUtils.isBlank(terms.getDepositorRequirements());
+        case "https://dataverse.org/schema/core#conditions":
+            return !StringUtils.isBlank(terms.getConditions());
+        case "https://dataverse.org/schema/core#disclaimer":
+            return !StringUtils.isBlank(terms.getDisclaimer());
+        case "https://dataverse.org/schema/core#termsOfAccess":
+            return !StringUtils.isBlank(terms.getTermsOfAccess());
+        case "https://dataverse.org/schema/core#fileRequestAccess":
+            return !terms.isFileAccessRequest();
+        case "https://dataverse.org/schema/core#dataAccessPlace":
+            return !StringUtils.isBlank(terms.getDataAccessPlace());
+        case "https://dataverse.org/schema/core#originalArchive":
+            return !StringUtils.isBlank(terms.getOriginalArchive());
+        case "https://dataverse.org/schema/core#availabilityStatus":
+            return !StringUtils.isBlank(terms.getAvailabilityStatus());
+        case "https://dataverse.org/schema/core#contactForAccess":
+            return !StringUtils.isBlank(terms.getContactForAccess());
+        case "https://dataverse.org/schema/core#sizeOfCollection":
+            return !StringUtils.isBlank(terms.getSizeOfCollection());
+        case "https://dataverse.org/schema/core#studyCompletion":
+            return !StringUtils.isBlank(terms.getStudyCompletion());
+        default:
+            logger.warning("isSet called for " + semterm);
+            return false;
+        }
+    }
+
+    public static void setSemTerm(TermsOfUseAndAccess terms, String semterm, Object value) {
+        switch (semterm) {
+        case "http://schema.org/license":
+            terms.setLicense((License) value);
+            break;
+        case "https://dataverse.org/schema/core#termsOfUse":
+            terms.setTermsOfUse((String) value);
+            break;
+        case "https://dataverse.org/schema/core#confidentialityDeclaration":
+            terms.setConfidentialityDeclaration((String) value);
+            break;
+        case "https://dataverse.org/schema/core#specialPermissions":
+            terms.setSpecialPermissions((String) value);
+            break;
+        case "https://dataverse.org/schema/core#restrictions":
+            terms.setRestrictions((String) value);
+            break;
+        case "https://dataverse.org/schema/core#citationRequirements":
+            terms.setCitationRequirements((String) value);
+            break;
+        case "https://dataverse.org/schema/core#depositorRequirements":
+            terms.setDepositorRequirements((String) value);
+            break;
+        case "https://dataverse.org/schema/core#conditions":
+            terms.setConditions((String) value);
+            break;
+        case "https://dataverse.org/schema/core#disclaimer":
+            terms.setDisclaimer((String) value);
+            break;
+        case "https://dataverse.org/schema/core#termsOfAccess":
+            terms.setTermsOfAccess((String) value);
+            break;
+        case "https://dataverse.org/schema/core#fileRequestAccess":
+            terms.setFileAccessRequest((boolean) value);
+            break;
+        case "https://dataverse.org/schema/core#dataAccessPlace":
+            terms.setDataAccessPlace((String) value);
+            break;
+        case "https://dataverse.org/schema/core#originalArchive":
+            terms.setOriginalArchive((String) value);
+            break;
+        case "https://dataverse.org/schema/core#availabilityStatus":
+            terms.setAvailabilityStatus((String) value);
+            break;
+        case "https://dataverse.org/schema/core#contactForAccess":
+            terms.setContactForAccess((String) value);
+            break;
+        case "https://dataverse.org/schema/core#sizeOfCollection":
+            terms.setSizeOfCollection((String) value);
+            break;
+        case "https://dataverse.org/schema/core#studyCompletion":
+            terms.setStudyCompletion((String) value);
+            break;
+        default:
+            logger.warning("setSemTerm called for " + semterm);
+            break;
+        }
+    }
+
+    private static boolean deleteIfSemTermMatches(TermsOfUseAndAccess terms, String semterm, JsonValue jsonValue) {
+        boolean foundTerm=false;
+        String val = null;
+        if(jsonValue.getValueType().equals(ValueType.STRING)) {
+            val = ((JsonString)jsonValue).getString();
+        }
+        switch (semterm) {
+        
+        case "https://dataverse.org/schema/core#termsOfUse":
+            if(terms.getTermsOfUse().equals(val)) {
+                terms.setTermsOfUse(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#confidentialityDeclaration":
+            if(terms.getConfidentialityDeclaration().equals(val)) {
+                terms.setConfidentialityDeclaration(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#specialPermissions":
+            if(terms.getSpecialPermissions().equals(val)) {
+                terms.setSpecialPermissions(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#restrictions":
+            if(terms.getRestrictions().equals(val)) {
+                terms.setRestrictions(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#citationRequirements":
+            if(terms.getCitationRequirements().equals(val)) {
+                terms.setCitationRequirements(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#depositorRequirements":
+            if(terms.getDepositorRequirements().equals(val)) {
+                terms.setDepositorRequirements(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#conditions":
+            if(terms.getConditions().equals(val)) {
+                terms.setConditions(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#disclaimer":
+            if(terms.getDisclaimer().equals(val)) {
+                terms.setDisclaimer(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#termsOfAccess":
+            if(terms.getTermsOfAccess().equals(val)) {
+                terms.setTermsOfAccess(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#fileRequestAccess":
+            if(terms.isFileAccessRequest() && (jsonValue.equals(JsonValue.TRUE))) {
+                terms.setFileAccessRequest(false);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#dataAccessPlace":
+            if(terms.getDataAccessPlace().equals(val)) {
+                terms.setDataAccessPlace(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#originalArchive":
+            if(terms.getOriginalArchive().equals(val)) {
+                terms.setOriginalArchive(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#availabilityStatus":
+            if(terms.getAvailabilityStatus().equals(val)) {
+                terms.setAvailabilityStatus(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#contactForAccess":
+            if(terms.getContactForAccess().equals(val)) {
+                terms.setContactForAccess(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#sizeOfCollection":
+            if(terms.getSizeOfCollection().equals(val)) {
+                terms.setSizeOfCollection(null);
+                foundTerm=true;
+            }
+            break;
+        case "https://dataverse.org/schema/core#studyCompletion":
+            if(terms.getStudyCompletion().equals(val)) {
+                terms.setStudyCompletion(null);
+                foundTerm=true;
+            }
+            break;
+        default:
+            logger.warning("deleteIfSemTermMatches called for " + semterm);
+            break;
+        }
+        return foundTerm; 
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDNamespace.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDNamespace.java
index bda4a55d623..904419775c9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDNamespace.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDNamespace.java
@@ -1,5 +1,13 @@
 package edu.harvard.iq.dataverse.util.json;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import edu.harvard.iq.dataverse.DataFile;
+
 public class JsonLDNamespace {
 
 	String prefix;
@@ -12,7 +20,40 @@ public class JsonLDNamespace {
 	public static JsonLDNamespace ore = new JsonLDNamespace("ore","http://www.openarchives.org/ore/terms/");
 	public static JsonLDNamespace schema = new JsonLDNamespace("schema","http://schema.org/");
 
-	public JsonLDNamespace(String prefix, String url) {
+	private static List<JsonLDNamespace> namespaces = new ArrayList<JsonLDNamespace>(Arrays.asList(dvcore, dcterms, ore, schema));
+	
+	public static JsonLDNamespace defineNamespace(String prefix, String url) {
+	    
+	    JsonLDNamespace ns = new JsonLDNamespace(prefix, url);
+	    int i = namespaces.indexOf(ns);
+	    if(i>=0) {
+	        return namespaces.get(i);
+	    } else {
+	      namespaces.add(ns);
+	      return ns;
+	    }
+	}
+	
+	public static void deleteNamespace(JsonLDNamespace ns) {
+        namespaces.remove(ns);
+    }
+    
+	public static boolean isInNamespace(String url) {
+	  for(JsonLDNamespace ns: namespaces) {
+	      if(url.startsWith(ns.getUrl())) {
+	          return true;
+	      }
+	  }
+	  return false;
+	}
+	
+	public static void addNamespacesToContext(Map<String, String> context) {
+	    for(JsonLDNamespace ns: namespaces) {
+	        context.putIfAbsent(ns.getPrefix(), ns.getUrl());
+	    };
+	}
+	
+	private JsonLDNamespace(String prefix, String url) {
 		this.prefix = prefix;
 		this.url = url;
 	}
@@ -24,5 +65,14 @@ public String getPrefix() {
 	public String getUrl() {
 		return url;
 	}
+	
+    @Override
+    public boolean equals(Object object) {
+        if (!(object instanceof JsonLDNamespace)) {
+            return false;
+        }
+        JsonLDNamespace other = (JsonLDNamespace) object;
+        return (other.getPrefix().equals(getPrefix()) && other.getUrl().equals(getUrl()));
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDTerm.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDTerm.java
index 5acb0c437ae..3166fa9dbfa 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDTerm.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDTerm.java
@@ -1,8 +1,5 @@
 package edu.harvard.iq.dataverse.util.json;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class JsonLDTerm {
 
     JsonLDNamespace namespace = null;
@@ -32,13 +29,19 @@ public class JsonLDTerm {
     public static JsonLDTerm studyCompletion = JsonLDTerm.DVCore("studyCompletion");
 
     public static JsonLDTerm restricted = JsonLDTerm.DVCore("restricted");
+    public static JsonLDTerm embargoed = JsonLDTerm.DVCore("embargoed");
+    public static JsonLDTerm embargoDateAvailable = JsonLDTerm.DVCore("dateAvailable");
+    public static JsonLDTerm embargoReason = JsonLDTerm.DVCore("reason");
     public static JsonLDTerm directoryLabel = JsonLDTerm.DVCore("directoryLabel");
     public static JsonLDTerm datasetVersionId = JsonLDTerm.DVCore("datasetVersionId");
     public static JsonLDTerm categories = JsonLDTerm.DVCore("categories");
     public static JsonLDTerm filesize = JsonLDTerm.DVCore("filesize");
     public static JsonLDTerm storageIdentifier = JsonLDTerm.DVCore("storageIdentifier");
+    @Deprecated
     public static JsonLDTerm originalFileFormat = JsonLDTerm.DVCore("originalFileFormat");
+    @Deprecated
     public static JsonLDTerm originalFormatLabel = JsonLDTerm.DVCore("originalFormatLabel");
+    public static JsonLDTerm currentIngestedName= JsonLDTerm.DVCore("currentIngestedName");
     public static JsonLDTerm UNF = JsonLDTerm.DVCore("UNF");
     public static JsonLDTerm rootDataFileId = JsonLDTerm.DVCore("rootDataFileId");
     public static JsonLDTerm previousDataFileId = JsonLDTerm.DVCore("previousDataFileId");
@@ -49,6 +52,8 @@ public class JsonLDTerm {
     public static JsonLDTerm fileCount = JsonLDTerm.DVCore("fileCount");
     public static JsonLDTerm maxFileSize = JsonLDTerm.DVCore("maxFileSize");
 
+    public static JsonLDTerm datasetType = JsonLDTerm.DVCore("datasetType");
+
     public JsonLDTerm(JsonLDNamespace namespace, String term) {
         this.namespace = namespace;
         this.term = term;
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
index 3b8efa17513..bd97bcf4274 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
@@ -18,37 +18,50 @@
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.MetadataBlockServiceBean;
 import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
-import edu.harvard.iq.dataverse.TermsOfUseAndAccess.License;
 import edu.harvard.iq.dataverse.api.Util;
+import edu.harvard.iq.dataverse.api.dto.DataverseDTO;
 import edu.harvard.iq.dataverse.api.dto.FieldDTO;
+import edu.harvard.iq.dataverse.api.dto.UserDTO;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroup;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddressRange;
+import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroup;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
 import edu.harvard.iq.dataverse.datasetutility.OptionalFileParams;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.workflow.Workflow;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepData;
-import java.io.StringReader;
+import org.apache.commons.validator.routines.DomainValidator;
+
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Consumer;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
+import java.util.stream.Collectors;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonValue.ValueType;
 
 /**
  * Parses JSON objects into domain objects.
@@ -62,22 +75,41 @@ public class JsonParser {
     DatasetFieldServiceBean datasetFieldSvc;
     MetadataBlockServiceBean blockService;
     SettingsServiceBean settingsService;
-    
+    LicenseServiceBean licenseService;
+    DatasetTypeServiceBean datasetTypeService;
+    HarvestingClient harvestingClient = null;
+    boolean allowHarvestingMissingCVV = false;
+
     /**
      * if lenient, we will accept alternate spellings for controlled vocabulary values
      */
-    boolean lenient = false;  
+    boolean lenient = false;
 
+    @Deprecated
     public JsonParser(DatasetFieldServiceBean datasetFieldSvc, MetadataBlockServiceBean blockService, SettingsServiceBean settingsService) {
         this.datasetFieldSvc = datasetFieldSvc;
         this.blockService = blockService;
         this.settingsService = settingsService;
     }
 
+    public JsonParser(DatasetFieldServiceBean datasetFieldSvc, MetadataBlockServiceBean blockService, SettingsServiceBean settingsService, LicenseServiceBean licenseService, DatasetTypeServiceBean datasetTypeService) {
+        this(datasetFieldSvc, blockService, settingsService, licenseService, datasetTypeService, null);
+    }
+
+    public JsonParser(DatasetFieldServiceBean datasetFieldSvc, MetadataBlockServiceBean blockService, SettingsServiceBean settingsService, LicenseServiceBean licenseService, DatasetTypeServiceBean datasetTypeService, HarvestingClient harvestingClient) {
+        this.datasetFieldSvc = datasetFieldSvc;
+        this.blockService = blockService;
+        this.settingsService = settingsService;
+        this.licenseService = licenseService;
+        this.datasetTypeService = datasetTypeService;
+        this.harvestingClient = harvestingClient;
+        this.allowHarvestingMissingCVV = harvestingClient != null && harvestingClient.getAllowHarvestingMissingCVV();
+    }
+
     public JsonParser() {
         this( null,null,null );
     }
-    
+
     public boolean isLenient() {
         return lenient;
     }
@@ -102,6 +134,10 @@ public Dataverse parseDataverse(JsonObject jobj) throws JsonParseException {
         dv.setPermissionRoot(jobj.getBoolean("permissionRoot", false));
         dv.setFacetRoot(jobj.getBoolean("facetRoot", false));
         dv.setAffiliation(jobj.getString("affiliation", null));
+        if (jobj.containsKey("datasetFileCountLimit")) {
+            dv.setDatasetFileCountLimit(jobj.getInt("datasetFileCountLimit", -1));
+        }
+
         if (jobj.containsKey("dataverseContacts")) {
             JsonArray dvContacts = jobj.getJsonArray("dataverseContacts");
             int i = 0;
@@ -114,7 +150,7 @@ public Dataverse parseDataverse(JsonObject jobj) throws JsonParseException {
             }
             dv.setDataverseContacts(dvContactList);
         }
-        
+
         if (jobj.containsKey("theme")) {
             DataverseTheme theme = parseDataverseTheme(jobj.getJsonObject("theme"));
             dv.setDataverseTheme(theme);
@@ -122,17 +158,24 @@ public Dataverse parseDataverse(JsonObject jobj) throws JsonParseException {
         }
 
         dv.setDataverseType(Dataverse.DataverseType.UNCATEGORIZED); // default
-        if (jobj.containsKey("dataverseType")) {
-            for (Dataverse.DataverseType dvtype : Dataverse.DataverseType.values()) {
-                if (dvtype.name().equals(jobj.getString("dataverseType"))) {
-                    dv.setDataverseType(dvtype);
-                }
-            }
+        String receivedDataverseType = jobj.getString("dataverseType", null);
+        if (receivedDataverseType != null) {
+            Arrays.stream(Dataverse.DataverseType.values())
+                    .filter(type -> type.name().equals(receivedDataverseType))
+                    .findFirst()
+                    .ifPresent(dv::setDataverseType);
+        }
+
+        if (jobj.containsKey("filePIDsEnabled")) {
+            dv.setFilePIDsEnabled(jobj.getBoolean("filePIDsEnabled"));
+        }
+        if (jobj.containsKey("requireFilesToPublishDataset")) {
+            dv.setRequireFilesToPublishDataset(jobj.getBoolean("requireFilesToPublishDataset"));
         }
 
         /*  We decided that subject is not user set, but gotten from the subject of the dataverse's
             datasets - leavig this code in for now, in case we need to go back to it at some point
-        
+
         if (jobj.containsKey("dataverseSubjects")) {
             List<ControlledVocabularyValue> dvSubjectList = new LinkedList<>();
             DatasetFieldType subjectType = datasetFieldSvc.findByName(DatasetFieldConstant.subject);
@@ -155,10 +198,52 @@ public Dataverse parseDataverse(JsonObject jobj) throws JsonParseException {
             dv.setDataverseSubjects(dvSubjectList);
         }
         */
-                
+
         return dv;
     }
-    
+
+    public DataverseDTO parseDataverseDTO(JsonObject jsonObject) throws JsonParseException {
+        DataverseDTO dataverseDTO = new DataverseDTO();
+
+        setDataverseDTOPropertyIfPresent(jsonObject, "alias", dataverseDTO::setAlias);
+        setDataverseDTOPropertyIfPresent(jsonObject, "name", dataverseDTO::setName);
+        setDataverseDTOPropertyIfPresent(jsonObject, "description", dataverseDTO::setDescription);
+        setDataverseDTOPropertyIfPresent(jsonObject, "affiliation", dataverseDTO::setAffiliation);
+
+        String dataverseType = jsonObject.getString("dataverseType", null);
+        if (dataverseType != null) {
+            Arrays.stream(Dataverse.DataverseType.values())
+                    .filter(type -> type.name().equals(dataverseType))
+                    .findFirst()
+                    .ifPresent(dataverseDTO::setDataverseType);
+        }
+
+        if (jsonObject.containsKey("dataverseContacts")) {
+            JsonArray dvContacts = jsonObject.getJsonArray("dataverseContacts");
+            List<DataverseContact> contacts = new ArrayList<>();
+            for (int i = 0; i < dvContacts.size(); i++) {
+                JsonObject contactObj = dvContacts.getJsonObject(i);
+                DataverseContact contact = new DataverseContact();
+                contact.setContactEmail(getMandatoryString(contactObj, "contactEmail"));
+                contact.setDisplayOrder(i);
+                contacts.add(contact);
+            }
+            dataverseDTO.setDataverseContacts(contacts);
+        }
+        if (jsonObject.containsKey("datasetFileCountLimit")) {
+            dataverseDTO.setDatasetFileCountLimit(Integer.valueOf(jsonObject.getInt("datasetFileCountLimit")));
+        }
+
+        return dataverseDTO;
+    }
+
+    private void setDataverseDTOPropertyIfPresent(JsonObject jsonObject, String key, Consumer<String> setter) {
+        String value = jsonObject.getString(key, null);
+        if (value != null) {
+            setter.accept(value);
+        }
+    }
+
     public DataverseTheme parseDataverseTheme(JsonObject obj) {
 
         DataverseTheme theme = new DataverseTheme();
@@ -209,11 +294,19 @@ public DataverseTheme parseDataverseTheme(JsonObject obj) {
         return theme;
     }
 
-    private static String getMandatoryString(JsonObject jobj, String name) throws JsonParseException {
+    private static <T> T getMandatoryField(JsonObject jobj, String name, Function<String, T> getter) throws JsonParseException {
         if (jobj.containsKey(name)) {
-            return jobj.getString(name);
+            return getter.apply(name);
         }
-        throw new JsonParseException("Field " + name + " is mandatory");
+        throw new JsonParseException("Field '" + name + "' is mandatory");
+    }
+
+    private static String getMandatoryString(JsonObject jobj, String name) throws JsonParseException {
+        return getMandatoryField(jobj, name, jobj::getString);
+    }
+
+    private static Boolean getMandatoryBoolean(JsonObject jobj, String name) throws JsonParseException {
+        return getMandatoryField(jobj, name, jobj::getBoolean);
     }
 
     public IpGroup parseIpGroup(JsonObject obj) {
@@ -246,6 +339,45 @@ public IpGroup parseIpGroup(JsonObject obj) {
         return retVal;
     }
 
+    public MailDomainGroup parseMailDomainGroup(JsonObject obj) throws JsonParseException {
+        MailDomainGroup grp = new MailDomainGroup();
+
+        if (obj.containsKey("id")) {
+            grp.setId(obj.getJsonNumber("id").longValue());
+        }
+        grp.setDisplayName(getMandatoryString(obj, "name"));
+        grp.setDescription(obj.getString("description", null));
+        grp.setPersistedGroupAlias(getMandatoryString(obj, "alias"));
+        grp.setIsRegEx(obj.getBoolean("regex", false));
+        if ( obj.containsKey("domains") ) {
+            List<String> domains =
+                Optional.ofNullable(obj.getJsonArray("domains"))
+                    .orElse(Json.createArrayBuilder().build())
+                    .getValuesAs(JsonString.class)
+                    .stream()
+                    .map(JsonString::getString)
+                    // only validate if this group hasn't regex support enabled
+                    .filter(d -> (grp.isRegEx() || DomainValidator.getInstance().isValid(d)))
+                    .collect(Collectors.toList());
+            if (domains.isEmpty())
+                throw new JsonParseException("Field domains may not be an empty array or contain invalid domains. Enabled regex support?");
+            grp.setEmailDomains(domains);
+        } else {
+            throw new JsonParseException("Field domains is mandatory.");
+        }
+
+        return grp;
+    }
+
+    public static <E extends Enum<E>> List<E> parseEnumsFromArray(JsonArray enumsArray, Class<E> enumClass) throws JsonParseException {
+        final List<E> enums = new LinkedList<>();
+
+        for (String name : enumsArray.getValuesAs(JsonString::getString)) {
+            enums.add(Enum.valueOf(enumClass, name));
+        }
+        return enums;
+    }
+
     public DatasetVersion parseDatasetVersion(JsonObject obj) throws JsonParseException {
         return parseDatasetVersion(obj, new DatasetVersion());
     }
@@ -253,11 +385,26 @@ public DatasetVersion parseDatasetVersion(JsonObject obj) throws JsonParseExcept
     public Dataset parseDataset(JsonObject obj) throws JsonParseException {
         Dataset dataset = new Dataset();
 
-        dataset.setAuthority(obj.getString("authority", null) == null ? settingsService.getValueForKey(SettingsServiceBean.Key.Authority) : obj.getString("authority"));
-        dataset.setProtocol(obj.getString("protocol", null) == null ? settingsService.getValueForKey(SettingsServiceBean.Key.Protocol) : obj.getString("protocol"));
+        dataset.setAuthority(obj.getString("authority", null));
+        dataset.setProtocol(obj.getString("protocol", null));
         dataset.setIdentifier(obj.getString("identifier",null));
+        String mdl = obj.getString("metadataLanguage",null);
+        if(mdl==null || settingsService.getBaseMetadataLanguageMap(new HashMap<String,String>(), true).containsKey(mdl)) {
+          dataset.setMetadataLanguage(mdl);
+        }else {
+            throw new JsonParseException("Specified metadatalanguage not allowed.");
+        }
+        dataset.setDatasetFileCountLimit(obj.getInt("datasetFileCountLimit", -1));
+        String datasetTypeIn = obj.getString("datasetType", DatasetType.DEFAULT_DATASET_TYPE);
+        logger.fine("datasetTypeIn: " + datasetTypeIn);
+        DatasetType datasetType = datasetTypeService.getByName(datasetTypeIn);
+        if (datasetType != null) {
+            dataset.setDatasetType(datasetType);
+        } else {
+            throw new JsonParseException("Invalid dataset type: " + datasetTypeIn);
+        }
 
-        DatasetVersion dsv = new DatasetVersion(); 
+        DatasetVersion dsv = new DatasetVersion();
         dsv.setDataset(dataset);
         dsv = parseDatasetVersion(obj.getJsonObject("datasetVersion"), dsv);
         List<DatasetVersion> versions = new ArrayList<>(1);
@@ -270,12 +417,15 @@ public Dataset parseDataset(JsonObject obj) throws JsonParseException {
     public DatasetVersion parseDatasetVersion(JsonObject obj, DatasetVersion dsv) throws JsonParseException {
         try {
 
-            String archiveNote = obj.getString("archiveNote", null);
-            if (archiveNote != null) {
-                dsv.setArchiveNote(archiveNote);
-            }
-
             dsv.setDeaccessionLink(obj.getString("deaccessionLink", null));
+            String deaccessionNote = obj.getString("deaccessionNote", null);
+            // ToDo - the treatment of null inputs is inconsistent across different fields (either the original value is kept or set to null).
+            // This is moot for most uses of this method, which start from an empty datasetversion, but use through https://github.com/IQSS/dataverse/blob/3e5a516670c42e019338063516a9d93a61833027/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/ContainerManagerImpl.java#L112
+            // starts from an existing version where this inconsistency could be/is a problem.
+            if (deaccessionNote != null) {
+                dsv.setDeaccessionNote(deaccessionNote);
+            }
+            dsv.setVersionNote(obj.getString("versionNote", null));
             int versionNumberInt = obj.getInt("versionNumber", -1);
             Long versionNumber = null;
             if (versionNumberInt !=-1) {
@@ -288,7 +438,7 @@ public DatasetVersion parseDatasetVersion(JsonObject obj, DatasetVersion dsv) th
             if (dsv.getId()==null) {
                  dsv.setId(parseLong(obj.getString("id", null)));
             }
-           
+
             String versionStateStr = obj.getString("versionState", null);
             if (versionStateStr != null) {
                 dsv.setVersionState(DatasetVersion.VersionState.valueOf(versionStateStr));
@@ -300,26 +450,74 @@ public DatasetVersion parseDatasetVersion(JsonObject obj, DatasetVersion dsv) th
             dsv.setUNF(obj.getString("UNF", null));
             // Terms of Use related fields
             TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
-            terms.setTermsOfUse(obj.getString("termsOfUse", null));           
+
+            License license = null;
+
+            try {
+                // This method will attempt to parse the license in the format 
+                // in which it appears in our json exports, as a compound
+                // field, for ex.:
+                // "license": {
+                //    "name": "CC0 1.0",
+                //    "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+                // }
+                license = parseLicense(obj.getJsonObject("license"));
+            } catch (ClassCastException cce) {
+                logger.fine("class cast exception parsing the license section (will try parsing as a string)");
+                // attempt to parse as string: 
+                // i.e. this is for backward compatibility, after the bug in #9155
+                // was fixed, with the old style of encoding the license info 
+                // in input json, for ex.: 
+                // "license" : "CC0 1.0"
+                license = parseLicense(obj.getString("license", null));
+            }
+            
+            //test to see if license exists in dataset type 
+            //if not set it to null - 
+            //only test if Dataset has a type and if it has custom available licenses
+            if (dsv.getDataset() != null) {
+                DatasetType dst = dsv.getDataset().getDatasetType();
+                if (dst != null && dst.getLicenses() != null && !dst.getLicenses().isEmpty() && license != null) {
+                    boolean invalidLicense = true;
+                    for (License testLicense : dst.getLicenses()) {
+                        if (testLicense.equals(license)) {
+                            invalidLicense = false;
+                        }
+                    }
+                    if (invalidLicense) {
+                        license = null;
+                    }
+                }
+            }           
+
+            if (license == null) {
+                terms.setLicense(license);
+                terms.setTermsOfUse(obj.getString("termsOfUse", null));
+                terms.setConfidentialityDeclaration(obj.getString("confidentialityDeclaration", null));
+                terms.setSpecialPermissions(obj.getString("specialPermissions", null));
+                terms.setRestrictions(obj.getString("restrictions", null));
+                terms.setCitationRequirements(obj.getString("citationRequirements", null));
+                terms.setDepositorRequirements(obj.getString("depositorRequirements", null));
+                terms.setConditions(obj.getString("conditions", null));
+                terms.setDisclaimer(obj.getString("disclaimer", null));
+            } else {
+                terms.setLicense(license);
+            }
             terms.setTermsOfAccess(obj.getString("termsOfAccess", null));
-            terms.setConfidentialityDeclaration(obj.getString("confidentialityDeclaration", null));
-            terms.setSpecialPermissions(obj.getString("specialPermissions", null));
-            terms.setRestrictions(obj.getString("restrictions", null));
-            terms.setCitationRequirements(obj.getString("citationRequirements", null));
-            terms.setDepositorRequirements(obj.getString("depositorRequirements", null));
-            terms.setConditions(obj.getString("conditions", null));
-            terms.setDisclaimer(obj.getString("disclaimer", null));
             terms.setDataAccessPlace(obj.getString("dataAccessPlace", null));
             terms.setOriginalArchive(obj.getString("originalArchive", null));
             terms.setAvailabilityStatus(obj.getString("availabilityStatus", null));
             terms.setContactForAccess(obj.getString("contactForAccess", null));
             terms.setSizeOfCollection(obj.getString("sizeOfCollection", null));
             terms.setStudyCompletion(obj.getString("studyCompletion", null));
-            terms.setLicense(parseLicense(obj.getString("license", null)));
             terms.setFileAccessRequest(obj.getBoolean("fileAccessRequest", false));
             dsv.setTermsOfUseAndAccess(terms);
-            
-            dsv.setDatasetFields(parseMetadataBlocks(obj.getJsonObject("metadataBlocks")));
+            terms.setDatasetVersion(dsv);
+            JsonObject metadataBlocks = obj.getJsonObject("metadataBlocks");
+            if (metadataBlocks == null){
+                throw new JsonParseException(BundleUtil.getStringFromBundle("jsonparser.error.metadatablocks.not.found"));
+            }
+            dsv.setDatasetFields(parseMetadataBlocks(metadataBlocks));
 
             JsonArray filesJson = obj.getJsonArray("files");
             if (filesJson == null) {
@@ -329,19 +527,67 @@ public DatasetVersion parseDatasetVersion(JsonObject obj, DatasetVersion dsv) th
                 dsv.setFileMetadatas(parseFiles(filesJson, dsv));
             }
             return dsv;
-
         } catch (ParseException ex) {
-            throw new JsonParseException("Error parsing date:" + ex.getMessage(), ex);
+            throw new JsonParseException(BundleUtil.getStringFromBundle("jsonparser.error.parsing.date", Arrays.asList(ex.getMessage())) , ex);
         } catch (NumberFormatException ex) {
-            throw new JsonParseException("Error parsing number:" + ex.getMessage(), ex);
+            throw new JsonParseException(BundleUtil.getStringFromBundle("jsonparser.error.parsing.number", Arrays.asList(ex.getMessage())), ex);
+        }
+    }
+
+    private edu.harvard.iq.dataverse.license.License parseLicense(String licenseNameOrUri) throws JsonParseException {
+        if (licenseNameOrUri == null){
+            boolean safeDefaultIfKeyNotFound = true;
+            if (settingsService.isTrueForKey(SettingsServiceBean.Key.AllowCustomTermsOfUse, safeDefaultIfKeyNotFound)){
+                return null;
+            } else {
+                return licenseService.getDefault();
+            }
         }
+        License license = licenseService.getByNameOrUri(licenseNameOrUri);
+        if (license == null) throw new JsonParseException("Invalid license: " + licenseNameOrUri);
+        return license;
     }
-    
-    private License parseLicense(String inString) {
-        if (inString != null && inString.equalsIgnoreCase("CC0")) {
-            return TermsOfUseAndAccess.License.CC0;
+
+    private edu.harvard.iq.dataverse.license.License parseLicense(JsonObject licenseObj) throws JsonParseException {
+        if (licenseObj == null){
+            boolean safeDefaultIfKeyNotFound = true;
+            if (settingsService.isTrueForKey(SettingsServiceBean.Key.AllowCustomTermsOfUse, safeDefaultIfKeyNotFound)){
+                return null;
+            } else {
+                return licenseService.getDefault();
+            }
+        }
+
+        String licenseName = licenseObj.getString("name", null);
+        String licenseUri = licenseObj.getString("uri", null);
+
+        License license = null;
+
+        // If uri is provided, we'll try that first. This is an easier lookup
+        // method; the uri is always the same. The name may have been customized
+        // (translated) on this instance, so we may be dealing with such translated
+        // name, if this is exported json that we are processing. Meaning, unlike 
+        // the uri, we cannot simply check it against the name in the License
+        // database table. 
+        if (licenseUri != null) {
+            license = licenseService.getByNameOrUri(licenseUri);
+        }
+
+        if (license != null) {
+            return license;
+        }
+
+        if (licenseName == null) {
+            String exMsg = "Invalid or unsupported license section submitted"
+                    + (licenseUri != null ? ": " + licenseUri : ".");
+            throw new JsonParseException("Invalid or unsupported license section submitted.");
+        }
+
+        license = licenseService.getByPotentiallyLocalizedName(licenseName);
+        if (license == null) {
+            throw new JsonParseException("Invalid or unsupported license: " + licenseName);
         }
-        return TermsOfUseAndAccess.License.NONE;       
+        return license;
     }
 
     public List<DatasetField> parseMetadataBlocks(JsonObject json) throws JsonParseException {
@@ -355,13 +601,17 @@ public List<DatasetField> parseMetadataBlocks(JsonObject json) throws JsonParseE
         }
         return fields;
     }
-    
+
     public List<DatasetField> parseMultipleFields(JsonObject json) throws JsonParseException {
+        return parseMultipleFields(json, false);
+    }
+
+    public List<DatasetField> parseMultipleFields(JsonObject json, boolean replaceData) throws JsonParseException {
         JsonArray fieldsJson = json.getJsonArray("fields");
-        List<DatasetField> fields = parseFieldsFromArray(fieldsJson, false);
+        List<DatasetField> fields = parseFieldsFromArray(fieldsJson, false, replaceData);
         return fields;
     }
-    
+
     public List<DatasetField> parseMultipleFieldsForDelete(JsonObject json) throws JsonParseException {
         List<DatasetField> fields = new LinkedList<>();
         for (JsonObject fieldJson : json.getJsonArray("fields").getValuesAs(JsonObject.class)) {
@@ -369,30 +619,36 @@ public List<DatasetField> parseMultipleFieldsForDelete(JsonObject json) throws J
         }
         return fields;
     }
-    
+
     private List<DatasetField> parseFieldsFromArray(JsonArray fieldsArray, Boolean testType) throws JsonParseException {
+        return parseFieldsFromArray(fieldsArray, testType, false);
+    }
+
+    private List<DatasetField> parseFieldsFromArray(JsonArray fieldsArray, Boolean testType, boolean replaceData) throws JsonParseException {
             List<DatasetField> fields = new LinkedList<>();
             for (JsonObject fieldJson : fieldsArray.getValuesAs(JsonObject.class)) {
                 try {
-                    fields.add(parseField(fieldJson, testType));
+                    DatasetField field = parseField(fieldJson, testType, replaceData);
+                    if (field != null) {
+                        fields.add(field);
+                    }
                 } catch (CompoundVocabularyException ex) {
                     DatasetFieldType fieldType = datasetFieldSvc.findByNameOpt(fieldJson.getString("typeName", ""));
                     if (lenient && (DatasetFieldConstant.geographicCoverage).equals(fieldType.getName())) {
-                        fields.add(remapGeographicCoverage( ex));                       
+                        fields.add(remapGeographicCoverage( ex));
                     } else {
                         // if not lenient mode, re-throw exception
                         throw ex;
                     }
-                } 
+                }
 
             }
         return fields;
-        
+
     }
-    
+
     public List<FileMetadata> parseFiles(JsonArray metadatasJson, DatasetVersion dsv) throws JsonParseException {
         List<FileMetadata> fileMetadatas = new LinkedList<>();
-
         if (metadatasJson != null) {
             for (JsonObject filemetadataJson : metadatasJson.getValuesAs(JsonObject.class)) {
                 String label = filemetadataJson.getString("label");
@@ -404,18 +660,19 @@ public List<FileMetadata> parseFiles(JsonArray metadatasJson, DatasetVersion dsv
                 fileMetadata.setDirectoryLabel(directoryLabel);
                 fileMetadata.setDescription(description);
                 fileMetadata.setDatasetVersion(dsv);
-                
+
                 if ( filemetadataJson.containsKey("dataFile") ) {
                     DataFile dataFile = parseDataFile(filemetadataJson.getJsonObject("dataFile"));
                     dataFile.getFileMetadatas().add(fileMetadata);
                     dataFile.setOwner(dsv.getDataset());
                     fileMetadata.setDataFile(dataFile);
-                    if (dsv.getDataset().getFiles() == null) {
-                        dsv.getDataset().setFiles(new ArrayList<>());
+                    if (dsv.getDataset() != null) {
+                        if (dsv.getDataset().getFiles() == null) {
+                            dsv.getDataset().setFiles(new ArrayList<>());
+                        }
+                        dsv.getDataset().getFiles().add(dataFile);
                     }
-                    dsv.getDataset().getFiles().add(dataFile);
                 }
-                
 
                 fileMetadatas.add(fileMetadata);
                 fileMetadata.setCategories(getCategories(filemetadataJson, dsv.getDataset()));
@@ -424,24 +681,46 @@ public List<FileMetadata> parseFiles(JsonArray metadatasJson, DatasetVersion dsv
 
         return fileMetadatas;
     }
-    
+
     public DataFile parseDataFile(JsonObject datafileJson) {
         DataFile dataFile = new DataFile();
-        
+
         Timestamp timestamp = new Timestamp(new Date().getTime());
         dataFile.setCreateDate(timestamp);
         dataFile.setModificationTime(timestamp);
         dataFile.setPermissionModificationTime(timestamp);
-        
+
         if ( datafileJson.containsKey("filesize") ) {
             dataFile.setFilesize(datafileJson.getJsonNumber("filesize").longValueExact());
         }
-        
+
         String contentType = datafileJson.getString("contentType", null);
         if (contentType == null) {
             contentType = "application/octet-stream";
         }
-        String storageIdentifier = datafileJson.getString("storageIdentifier", " ");
+        String storageIdentifier = null;
+        /**
+         * When harvesting from other Dataverses using this json format, we 
+         * don't want to import their storageidentifiers verbatim. Instead, we 
+         * will modify them to point to the access API location on the remote
+         * archive side.
+         */
+        if (harvestingClient != null && datafileJson.containsKey("id")) {
+            String remoteId = datafileJson.getJsonNumber("id").toString();
+            storageIdentifier = harvestingClient.getArchiveUrl()
+                    + "/api/access/datafile/"
+                    + remoteId;
+            /**
+             * Note that we don't have any practical use for these urls as 
+             * of now. We used to, in the past, perform some tasks on harvested
+             * content that involved trying to access the files. In any event, it
+             * makes more sense to collect these urls, than the storage 
+             * identifiers imported as is, which become completely meaningless 
+             * on the local system.
+             */
+        } else {
+            storageIdentifier = datafileJson.getString("storageIdentifier", null);
+        }
         JsonObject checksum = datafileJson.getJsonObject("checksum");
         if (checksum != null) {
             // newer style that allows for SHA-1 rather than MD5
@@ -477,21 +756,21 @@ public DataFile parseDataFile(JsonObject datafileJson) {
 
         // TODO: 
         // unf (if available)... etc.?
-        
+
         dataFile.setContentType(contentType);
         dataFile.setStorageIdentifier(storageIdentifier);
-        
+
         return dataFile;
     }
     /**
      * Special processing for GeographicCoverage compound field:
      * Handle parsing exceptions caused by invalid controlled vocabulary in the "country" field by
      * putting the invalid data in "otherGeographicCoverage" in a new compound value.
-     * 
+     *
      * @param ex - contains the invalid values to be processed
-     * @return a compound DatasetField that contains the newly created values, in addition to 
+     * @return a compound DatasetField that contains the newly created values, in addition to
      * the original valid values.
-     * @throws JsonParseException 
+     * @throws JsonParseException
      */
     private DatasetField remapGeographicCoverage(CompoundVocabularyException ex) throws JsonParseException{
         List<HashSet<FieldDTO>> geoCoverageList = new ArrayList<>();
@@ -506,8 +785,7 @@ private DatasetField remapGeographicCoverage(CompoundVocabularyException ex) thr
         // convert DTO to datasetField so we can back valid values.
         Gson gson = new Gson();
         String jsonString = gson.toJson(geoCoverageDTO);
-        JsonReader jsonReader = Json.createReader(new StringReader(jsonString));
-        JsonObject obj = jsonReader.readObject();
+        JsonObject obj = JsonUtil.getJsonObject(jsonString);
         DatasetField geoCoverageField = parseField(obj);
 
         // add back valid values
@@ -519,34 +797,38 @@ private DatasetField remapGeographicCoverage(CompoundVocabularyException ex) thr
         }
         return geoCoverageField;
     }
-    
-    
+
+
     public DatasetField parseFieldForDelete(JsonObject json) throws JsonParseException{
         DatasetField ret = new DatasetField();
-        DatasetFieldType type = datasetFieldSvc.findByNameOpt(json.getString("typeName", ""));   
+        DatasetFieldType type = datasetFieldSvc.findByNameOpt(json.getString("typeName", ""));
         if (type == null) {
             throw new JsonParseException("Can't find type '" + json.getString("typeName", "") + "'");
         }
         return ret;
     }
-     
-    
-    public DatasetField parseField(JsonObject json) throws JsonParseException{
-        return parseField(json, true);
+
+
+    public DatasetField parseField(JsonObject json) throws JsonParseException {
+        return parseField(json, true, false);
     }
-    
-    
+
     public DatasetField parseField(JsonObject json, Boolean testType) throws JsonParseException {
+        return parseField(json, testType, false);
+    }
+
+    public DatasetField parseField(JsonObject json, Boolean testType, boolean replaceData) throws JsonParseException {
         if (json == null) {
             return null;
         }
 
         DatasetField ret = new DatasetField();
         DatasetFieldType type = datasetFieldSvc.findByNameOpt(json.getString("typeName", ""));
-    
+
 
         if (type == null) {
-            throw new JsonParseException("Can't find type '" + json.getString("typeName", "") + "'");
+            logger.fine("Can't find type '" + json.getString("typeName", "") + "'");
+            return null;
         }
         if (testType && type.isAllowMultiples() != json.getBoolean("multiple")) {
             throw new JsonParseException("incorrect multiple   for field " + json.getString("typeName", ""));
@@ -560,40 +842,22 @@ public DatasetField parseField(JsonObject json, Boolean testType) throws JsonPar
         if (testType && type.isControlledVocabulary() && !json.getString("typeClass").equals("controlledVocabulary")) {
             throw new JsonParseException("incorrect  typeClass for field " + json.getString("typeName", "") + ", should be controlledVocabulary");
         }
-       
+
+
         ret.setDatasetFieldType(type);
-               
-        if (type.isCompound()) {
-            List<DatasetFieldCompoundValue> vals = parseCompoundValue(type, json, testType);
-            for (DatasetFieldCompoundValue dsfcv : vals) {
-                dsfcv.setParentDatasetField(ret);
-            }
-            ret.setDatasetFieldCompoundValues(vals);
 
+        if (type.isCompound()) {
+            parseCompoundValue(ret, type, json, testType, replaceData);
         } else if (type.isControlledVocabulary()) {
-            List<ControlledVocabularyValue> vals = parseControlledVocabularyValue(type, json);
-            for (ControlledVocabularyValue cvv : vals) {
-                cvv.setDatasetFieldType(type);
-            }
-            ret.setControlledVocabularyValues(vals);
-
+            parseControlledVocabularyValue(ret, type, json, replaceData);
         } else {
-            // primitive
-                List<DatasetFieldValue> values = parsePrimitiveValue(type, json);
-                for (DatasetFieldValue val : values) {
-                    val.setDatasetField(ret);
-                }
-                ret.setDatasetFieldValues(values);
-            }
+            parsePrimitiveValue(ret, type, json);
+        }
 
         return ret;
     }
-    
-     public List<DatasetFieldCompoundValue> parseCompoundValue(DatasetFieldType compoundType, JsonObject json) throws JsonParseException {
-         return parseCompoundValue(compoundType, json, true);
-     }
-    
-    public List<DatasetFieldCompoundValue> parseCompoundValue(DatasetFieldType compoundType, JsonObject json, Boolean testType) throws JsonParseException {
+
+    public void parseCompoundValue(DatasetField dsf, DatasetFieldType compoundType, JsonObject json, Boolean testType, boolean replaceData) throws JsonParseException {
         List<ControlledVocabularyException> vocabExceptions = new ArrayList<>();
         List<DatasetFieldCompoundValue> vals = new LinkedList<>();
         if (compoundType.isAllowMultiples()) {
@@ -610,11 +874,11 @@ public List<DatasetFieldCompoundValue> parseCompoundValue(DatasetFieldType compo
                     JsonObject childFieldJson = obj.getJsonObject(fieldName);
                     DatasetField f=null;
                     try {
-                        f = parseField(childFieldJson, testType);
+                        f = parseField(childFieldJson, testType, replaceData);
                     } catch(ControlledVocabularyException ex) {
                         vocabExceptions.add(ex);
                     }
-                    
+
                     if (f!=null) {
                         if (!compoundType.getChildDatasetFieldTypes().contains(f.getDatasetFieldType())) {
                             throw new JsonParseException("field " + f.getDatasetFieldType().getName() + " is not a child of " + compoundType.getName());
@@ -631,10 +895,10 @@ public List<DatasetFieldCompoundValue> parseCompoundValue(DatasetFieldType compo
                 order++;
             }
 
-           
+
 
         } else {
-            
+
             DatasetFieldCompoundValue cv = new DatasetFieldCompoundValue();
             List<DatasetField> fields = new LinkedList<>();
             JsonObject value = json.getJsonObject("value");
@@ -642,7 +906,7 @@ public List<DatasetFieldCompoundValue> parseCompoundValue(DatasetFieldType compo
                 JsonObject childFieldJson = value.getJsonObject(key);
                 DatasetField f = null;
                 try {
-                    f=parseField(childFieldJson, testType);
+                    f=parseField(childFieldJson, testType, replaceData);
                 } catch(ControlledVocabularyException ex ) {
                     vocabExceptions.add(ex);
                 }
@@ -655,16 +919,22 @@ public List<DatasetFieldCompoundValue> parseCompoundValue(DatasetFieldType compo
                 cv.setChildDatasetFields(fields);
                 vals.add(cv);
             }
-      
+
     }
         if (!vocabExceptions.isEmpty()) {
             throw new CompoundVocabularyException( "Invalid controlled vocabulary in compound field ", vocabExceptions, vals);
         }
-          return vals;
+
+        for (DatasetFieldCompoundValue dsfcv : vals) {
+            dsfcv.setParentDatasetField(dsf);
+        }
+        dsf.setDatasetFieldCompoundValues(vals);
     }
 
-    public List<DatasetFieldValue> parsePrimitiveValue(DatasetFieldType dft , JsonObject json) throws JsonParseException {
+    public void parsePrimitiveValue(DatasetField dsf, DatasetFieldType dft , JsonObject json) throws JsonParseException {
 
+        Map<Long, JsonObject> cvocMap = datasetFieldSvc.getCVocConf(true);
+        boolean extVocab = cvocMap.containsKey(dft.getId());
         List<DatasetFieldValue> vals = new LinkedList<>();
         if (dft.isAllowMultiples()) {
            try {
@@ -673,9 +943,14 @@ public List<DatasetFieldValue> parsePrimitiveValue(DatasetFieldType dft , JsonOb
                 throw new JsonParseException("Invalid values submitted for " + dft.getName() + ". It should be an array of values.");
             }
             for (JsonString val : json.getJsonArray("value").getValuesAs(JsonString.class)) {
-                DatasetFieldValue datasetFieldValue = new DatasetFieldValue();
+                DatasetFieldValue datasetFieldValue = new DatasetFieldValue(dsf);
                 datasetFieldValue.setDisplayOrder(vals.size() - 1);
                 datasetFieldValue.setValue(val.getString().trim());
+                if(extVocab) {
+                    if(!datasetFieldSvc.isValidCVocValue(dft, datasetFieldValue.getValue())) {
+                        throw new JsonParseException("Invalid values submitted for " + dft.getName() + " which is limited to specific vocabularies.");
+                    }
+                }
                 vals.add(datasetFieldValue);
             }
 
@@ -683,15 +958,21 @@ public List<DatasetFieldValue> parsePrimitiveValue(DatasetFieldType dft , JsonOb
             try {json.getString("value");}
             catch (ClassCastException cce) {
                 throw new JsonParseException("Invalid value submitted for " + dft.getName() + ". It should be a single value.");
-            }            
+            }
             DatasetFieldValue datasetFieldValue = new DatasetFieldValue();
             datasetFieldValue.setValue(json.getString("value", "").trim());
+            datasetFieldValue.setDatasetField(dsf);
+            if(extVocab) {
+                if(!datasetFieldSvc.isValidCVocValue(dft, datasetFieldValue.getValue())) {
+                    throw new JsonParseException("Invalid values submitted for " + dft.getName() + " which is limited to specific vocabularies.");
+                }
+            }
             vals.add(datasetFieldValue);
         }
 
-        return vals;
+        dsf.setDatasetFieldValues(vals);
     }
-    
+
     public Workflow parseWorkflow(JsonObject json) throws JsonParseException {
         Workflow retVal = new Workflow();
         validate("", json, "name", ValueType.STRING);
@@ -705,12 +986,12 @@ public Workflow parseWorkflow(JsonObject json) throws JsonParseException {
         retVal.setSteps(steps);
         return retVal;
     }
-    
+
     public WorkflowStepData parseStepData( JsonObject json ) throws JsonParseException {
         WorkflowStepData wsd = new WorkflowStepData();
         validate("step", json, "provider", ValueType.STRING);
         validate("step", json, "stepType", ValueType.STRING);
-        
+
         wsd.setProviderId(json.getString("provider"));
         wsd.setStepType(json.getString("stepType"));
         if ( json.containsKey("parameters") ) {
@@ -727,38 +1008,42 @@ public WorkflowStepData parseStepData( JsonObject json ) throws JsonParseExcepti
         }
         return wsd;
     }
-    
+
     private String jsonValueToString(JsonValue jv) {
         switch ( jv.getValueType() ) {
             case STRING: return ((JsonString)jv).getString();
             default: return jv.toString();
         }
     }
-    
-    public List<ControlledVocabularyValue> parseControlledVocabularyValue(DatasetFieldType cvvType, JsonObject json) throws JsonParseException {
+
+    public void parseControlledVocabularyValue(DatasetField dsf, DatasetFieldType cvvType, JsonObject json, boolean replaceData) throws JsonParseException {
+        List<ControlledVocabularyValue> vals = new LinkedList<>();
         try {
             if (cvvType.isAllowMultiples()) {
                 try {
                     json.getJsonArray("value").getValuesAs(JsonObject.class);
                 } catch (ClassCastException cce) {
                     throw new JsonParseException("Invalid values submitted for " + cvvType.getName() + ". It should be an array of values.");
-                }                
-                List<ControlledVocabularyValue> vals = new LinkedList<>();
+                }
                 for (JsonString strVal : json.getJsonArray("value").getValuesAs(JsonString.class)) {
                     String strValue = strVal.getString();
                     ControlledVocabularyValue cvv = datasetFieldSvc.findControlledVocabularyValueByDatasetFieldTypeAndStrValue(cvvType, strValue, lenient);
                     if (cvv == null) {
-                        throw new ControlledVocabularyException("Value '" + strValue + "' does not exist in type '" + cvvType.getName() + "'", cvvType, strValue);
-                    }
-                    // Only add value to the list if it is not a duplicate 
-                    if (strValue.equals("Other")) {
-                        System.out.println("vals = " + vals + ", contains: " + vals.contains(cvv));
+                        if (allowHarvestingMissingCVV) {
+                            // we need to process these as primitive values
+                            logger.warning("Value '" + strValue + "' does not exist in type '" + cvvType.getName() + "'. Processing as primitive per setting override.");
+                            parsePrimitiveValue(dsf, cvvType, json);
+                            return;
+                        } else {
+                            throw new ControlledVocabularyException("Value '" + strValue + "' does not exist in type '" + cvvType.getName() + "'", cvvType, strValue);
+                        }
                     }
+                    cvv.setDatasetFieldType(cvvType);
+                    // Only add value to the list if it is not a duplicate
                     if (!vals.contains(cvv)) {
                         vals.add(cvv);
                     }
                 }
-                return vals;
 
             } else {
                 try {
@@ -767,15 +1052,30 @@ public List<ControlledVocabularyValue> parseControlledVocabularyValue(DatasetFie
                     throw new JsonParseException("Invalid value submitted for " + cvvType.getName() + ". It should be a single value.");
                 }
                 String strValue = json.getString("value", "");
+
+                if (strValue.isEmpty() && replaceData) {
+                    parsePrimitiveValue(dsf, cvvType, json);
+                    return;
+                }
+
                 ControlledVocabularyValue cvv = datasetFieldSvc.findControlledVocabularyValueByDatasetFieldTypeAndStrValue(cvvType, strValue, lenient);
                 if (cvv == null) {
-                    throw new ControlledVocabularyException("Value '" + strValue + "' does not exist in type '" + cvvType.getName() + "'", cvvType, strValue);
+                    if (allowHarvestingMissingCVV) {
+                        // we need to process this as a primitive value
+                        parsePrimitiveValue(dsf, cvvType , json);
+                        return;
+                    } else {
+                        throw new ControlledVocabularyException("Value '" + strValue + "' does not exist in type '" + cvvType.getName() + "'", cvvType, strValue);
+                    }
                 }
-                return Collections.singletonList(cvv);
+                cvv.setDatasetFieldType(cvvType);
+                vals.add(cvv);
             }
         } catch (ClassCastException cce) {
             throw new JsonParseException("Invalid values submitted for " + cvvType.getName());
         }
+
+        dsf.setControlledVocabularyValues(vals);
     }
 
     Date parseDate(String str) throws ParseException {
@@ -793,18 +1093,25 @@ Long parseLong(String str) throws NumberFormatException {
     int parsePrimitiveInt(String str, int defaultValue) {
         return str == null ? defaultValue : Integer.parseInt(str);
     }
-    
+
     public String parseHarvestingClient(JsonObject obj, HarvestingClient harvestingClient) throws JsonParseException {
-        
+
         String dataverseAlias = obj.getString("dataverseAlias",null);
-        
+
         harvestingClient.setName(obj.getString("nickName",null));
-        harvestingClient.setHarvestType(obj.getString("type",null));
+        harvestingClient.setSourceName(obj.getString("sourceName",null));
+        harvestingClient.setHarvestStyle(obj.getString("style", "default"));
         harvestingClient.setHarvestingUrl(obj.getString("harvestUrl",null));
         harvestingClient.setArchiveUrl(obj.getString("archiveUrl",null));
-        harvestingClient.setArchiveDescription(obj.getString("archiveDescription"));
+        harvestingClient.setArchiveDescription(obj.getString("archiveDescription", null));
         harvestingClient.setMetadataPrefix(obj.getString("metadataFormat",null));
         harvestingClient.setHarvestingSet(obj.getString("set",null));
+        harvestingClient.setCustomHttpHeaders(obj.getString("customHeaders", null));
+        harvestingClient.setAllowHarvestingMissingCVV(obj.getBoolean("allowHarvestingMissingCVV", false));
+        harvestingClient.setUseListrecords(obj.getBoolean("useListRecords", false));
+        harvestingClient.setUseOaiIdentifiersAsPids(obj.getBoolean("useOaiIdentifiersAsPids", false));
+        
+        harvestingClient.readScheduleDescription(obj.getString("schedule", null));
 
         return dataverseAlias;
     }
@@ -830,7 +1137,7 @@ private List<DataFileCategory> getCategories(JsonObject filemetadataJson, Datase
         }
         return dataFileCategories;
     }
-    
+
     /**
      * Validate than a JSON object has a field of an expected type, or throw an
      * inforamtive exception.
@@ -838,12 +1145,29 @@ private List<DataFileCategory> getCategories(JsonObject filemetadataJson, Datase
      * @param jobject
      * @param fieldName
      * @param expectedValueType
-     * @throws JsonParseException 
+     * @throws JsonParseException
      */
     private void validate(String objectName, JsonObject jobject, String fieldName, ValueType expectedValueType) throws JsonParseException {
-        if ( (!jobject.containsKey(fieldName)) 
+        if ( (!jobject.containsKey(fieldName))
               || (jobject.get(fieldName).getValueType()!=expectedValueType) ) {
             throw new JsonParseException( objectName + " missing a field named '"+fieldName+"' of type " + expectedValueType );
         }
     }
+
+    public UserDTO parseUserDTO(JsonObject jobj) throws JsonParseException {
+        UserDTO userDTO = new UserDTO();
+
+        userDTO.setUsername(jobj.getString("username", null));
+        userDTO.setEmailAddress(jobj.getString("emailAddress", null));
+        userDTO.setFirstName(jobj.getString("firstName", null));
+        userDTO.setLastName(jobj.getString("lastName", null));
+        userDTO.setAffiliation(jobj.getString("affiliation", null));
+        userDTO.setPosition(jobj.getString("position", null));
+
+        if (!FeatureFlags.API_BEARER_AUTH_HANDLE_TOS_ACCEPTANCE_IN_IDP.enabled()) {
+            userDTO.setTermsAccepted(getMandatoryBoolean(jobj, "termsAccepted"));
+        }
+
+        return userDTO;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index f8a1246b464..cf4426468db 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -1,27 +1,9 @@
 package edu.harvard.iq.dataverse.util.json;
 
-import edu.harvard.iq.dataverse.ControlledVocabularyValue;
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.DataFileTag;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetDistributor;
-import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.DatasetField;
-import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
-import edu.harvard.iq.dataverse.DatasetFieldValue;
-import edu.harvard.iq.dataverse.DatasetLock;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseContact;
-import edu.harvard.iq.dataverse.DataverseFacet;
-import edu.harvard.iq.dataverse.DataverseTheme;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroup;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUser;
-import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.GlobalId;
-import edu.harvard.iq.dataverse.MetadataBlock;
-import edu.harvard.iq.dataverse.RoleAssignment;
-import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
 import edu.harvard.iq.dataverse.api.Util;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.RoleAssigneeDisplayInfo;
@@ -33,18 +15,36 @@
 import edu.harvard.iq.dataverse.authorization.providers.AuthenticationProviderRow;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
+import edu.harvard.iq.dataverse.datavariable.CategoryMetadata;
+import edu.harvard.iq.dataverse.datavariable.DataVariable;
+import edu.harvard.iq.dataverse.datavariable.SummaryStatistic;
+import edu.harvard.iq.dataverse.datavariable.VarGroup;
+import edu.harvard.iq.dataverse.datavariable.VariableCategory;
+import edu.harvard.iq.dataverse.datavariable.VariableMetadata;
+import edu.harvard.iq.dataverse.datavariable.VariableRange;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.globus.FileDetailsHolder;
+import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.DatasetFieldWalker;
-import edu.harvard.iq.dataverse.util.StringUtil;
 import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
+
+import edu.harvard.iq.dataverse.util.MailUtil;
 import edu.harvard.iq.dataverse.workflow.Workflow;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepData;
 
 import java.util.*;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+
 import java.util.function.BiConsumer;
 import java.util.function.BinaryOperator;
 import java.util.function.Function;
@@ -53,27 +53,52 @@
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import static java.util.stream.Collectors.toList;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 /**
  * Convert objects to Json.
  *
  * @author michael
  */
+@Singleton
 public class JsonPrinter {
 
     private static final Logger logger = Logger.getLogger(JsonPrinter.class.getCanonicalName());
 
-    static SettingsServiceBean settingsService = null;
+    @EJB
+    static SettingsServiceBean settingsService;
+
+    @EJB
+    static DatasetFieldServiceBean datasetFieldService;
+
+    @EJB
+    static DatasetServiceBean datasetService;
 
-    // Passed to DatasetFieldWalker so it can check the :ExcludeEmailFromExport setting
-    public static void setSettingsService(SettingsServiceBean ssb) {
+    @EJB
+    static MailServiceBean mailService;
+
+    @EJB
+    static InAppNotificationsJsonPrinter inAppNotificationsJsonPrinter;
+    
+    public static void injectSettingsService(SettingsServiceBean ssb,
+                                             DatasetFieldServiceBean dfsb,
+                                             DataverseFieldTypeInputLevelServiceBean dfils,
+                                             DatasetServiceBean ds,
+                                             MailServiceBean ms,
+                                             InAppNotificationsJsonPrinter njp) {
             settingsService = ssb;
+            datasetFieldService = dfsb;
+            datasetService = ds;
+            mailService = ms;
+            inAppNotificationsJsonPrinter = njp;
     }
 
     public JsonPrinter() {
-   
+
     }
 
     public static final BriefJsonPrinter brief = new BriefJsonPrinter();
@@ -104,6 +129,8 @@ public static JsonObjectBuilder json(AuthenticatedUser authenticatedUser) {
             .add("lastName", authenticatedUser.getLastName())
             .add("email", authenticatedUser.getEmail())
             .add("superuser", authenticatedUser.isSuperuser())
+            .add("deactivated", authenticatedUser.isDeactivated())
+            .add("deactivatedTime", authenticatedUser.getDeactivatedTime())
             .add("affiliation", authenticatedUser.getAffiliation())
             .add("position", authenticatedUser.getPosition())
             .add("persistentUserId", authenticatedUser.getAuthenticatedUserLookup().getPersistentUserId())
@@ -114,12 +141,19 @@ public static JsonObjectBuilder json(AuthenticatedUser authenticatedUser) {
             .add("authenticationProviderId", authenticatedUser.getAuthenticatedUserLookup().getAuthenticationProviderId());
         return builder;
     }
-    
+
+    public static JsonArrayBuilder jsonRoleAssignments(List<RoleAssignment> roleAssignments) {
+        JsonArrayBuilder bld = Json.createArrayBuilder();
+        roleAssignments.forEach(roleAssignment -> bld.add(json(roleAssignment)));
+        return bld;
+    }
+
     public static JsonObjectBuilder json(RoleAssignment ra) {
         return jsonObjectBuilder()
                 .add("id", ra.getId())
                 .add("assignee", ra.getAssigneeIdentifier())
                 .add("roleId", ra.getRole().getId())
+                .add("roleName", ra.getRole().getName())
                 .add("_roleAlias", ra.getRole().getAlias())
                 .add("privateUrlToken", ra.getPrivateUrlToken())
                 .add("definitionPointId", ra.getDefinitionPoint().getId());
@@ -136,10 +170,10 @@ public static JsonObjectBuilder json(DatasetLock lock) {
                 .add("lockType", lock.getReason().toString())
                 .add("date", lock.getStartTime().toString())
                 .add("user", lock.getUser().getUserIdentifier())
+                .add("dataset", lock.getDataset().getGlobalId().asString())
                 .add("message", lock.getInfo());
-
     }
-    
+
     public static JsonObjectBuilder json( RoleAssigneeDisplayInfo d ) {
         return jsonObjectBuilder()
                 .add("title", d.getTitle())
@@ -163,17 +197,17 @@ public static JsonObjectBuilder json(IpGroup grp) {
                 .add("id", grp.getId() )
                 .add("name", grp.getDisplayName() )
                 .add("description", grp.getDescription() );
-       
+
         if ( ! singles.isEmpty() ) {
             bld.add("addresses", asJsonArray(singles) );
         }
-        
+
         if ( ! ranges.isEmpty() ) {
             JsonArrayBuilder rangesBld = Json.createArrayBuilder();
             ranges.forEach( r -> rangesBld.add( Json.createArrayBuilder().add(r.get(0)).add(r.get(1))) );
             bld.add("ranges", rangesBld );
         }
-        
+
         return bld;
     }
 
@@ -185,6 +219,17 @@ public static JsonObjectBuilder json(ShibGroup grp) {
                 .add("id", grp.getId());
     }
 
+    public static JsonObjectBuilder json(MailDomainGroup grp) {
+        JsonObjectBuilder bld = jsonObjectBuilder()
+            .add("alias", grp.getPersistedGroupAlias() )
+            .add("id", grp.getId() )
+            .add("name", grp.getDisplayName() )
+            .add("description", grp.getDescription() )
+            .add("domains", asJsonArray(grp.getEmailDomainsAsList()) )
+            .add("regex", grp.isRegEx());
+        return bld;
+    }
+
     public static JsonArrayBuilder rolesToJson(List<DataverseRole> role) {
         JsonArrayBuilder bld = Json.createArrayBuilder();
         for (DataverseRole r : role) {
@@ -193,6 +238,22 @@ public static JsonArrayBuilder rolesToJson(List<DataverseRole> role) {
         return bld;
     }
 
+    public static <E extends Enum> JsonArrayBuilder enumsToJson(Collection<E> collection) {
+        JsonArrayBuilder arr = Json.createArrayBuilder();
+        for (E entry : collection) {
+            arr.add(entry.name());
+        }
+        return arr;
+    }
+
+    public static JsonArrayBuilder jsonDataverseRoles(List<DataverseRole> roles) {
+        JsonArrayBuilder jsonArrayOfDataverseRoles = Json.createArrayBuilder();
+        for (DataverseRole role : roles) {
+            jsonArrayOfDataverseRoles.add(json(role));
+        }
+        return jsonArrayOfDataverseRoles;
+    }
+
     public static JsonObjectBuilder json(DataverseRole role) {
         JsonObjectBuilder bld = jsonObjectBuilder()
                 .add("alias", role.getAlias())
@@ -208,14 +269,14 @@ public static JsonObjectBuilder json(DataverseRole role) {
 
         return bld;
     }
-    
+
     public static JsonObjectBuilder json(Workflow wf){
         JsonObjectBuilder bld = jsonObjectBuilder();
         bld.add("name", wf.getName());
         if ( wf.getId() != null ) {
             bld.add("id", wf.getId());
         }
-        
+
         if ( wf.getSteps()!=null && !wf.getSteps().isEmpty()) {
             JsonArrayBuilder arr = Json.createArrayBuilder();
             for ( WorkflowStepData stp : wf.getSteps() ) {
@@ -226,28 +287,32 @@ public static JsonObjectBuilder json(Workflow wf){
             }
             bld.add("steps", arr );
         }
-        
+
         return bld;
     }
-    
+
     public static JsonObjectBuilder json(Dataverse dv) {
-        return json(dv, false);
+        return json(dv, false, false, null);
     }
 
     //TODO: Once we upgrade to Java EE 8 we can remove objects from the builder, and this email removal can be done in a better place.
-    public static JsonObjectBuilder json(Dataverse dv, Boolean hideEmail) {
+    public static JsonObjectBuilder json(Dataverse dv, Boolean hideEmail, Boolean returnOwners, Long childCount) {
         JsonObjectBuilder bld = jsonObjectBuilder()
                 .add("id", dv.getId())
                 .add("alias", dv.getAlias())
                 .add("name", dv.getName())
                 .add("affiliation", dv.getAffiliation());
-        if(!hideEmail) { 
+        if(!hideEmail) {
             bld.add("dataverseContacts", JsonPrinter.json(dv.getDataverseContacts()));
         }
-        
+        if (returnOwners){
+            bld.add("isPartOf", getOwnersFromDvObject(dv));
+        }
         bld.add("permissionRoot", dv.isPermissionRoot())
                 .add("description", dv.getDescription())
-                .add("dataverseType", dv.getDataverseType().name());
+                .add("dataverseType", dv.getDataverseType().name())
+                .add("isMetadataBlockRoot", dv.isMetadataBlockRoot())
+                .add("isFacetRoot", dv.isFacetRoot());
         if (dv.getOwner() != null) {
             bld.add("ownerId", dv.getOwner().getId());
         }
@@ -257,6 +322,24 @@ public static JsonObjectBuilder json(Dataverse dv, Boolean hideEmail) {
         if (dv.getDataverseTheme() != null) {
             bld.add("theme", JsonPrinter.json(dv.getDataverseTheme()));
         }
+        if(dv.getStorageDriverId() != null) {
+        	bld.add("storageDriverLabel", DataAccess.getStorageDriverLabelFor(dv.getStorageDriverId()));
+        }
+        if (dv.getFilePIDsEnabled() != null) {
+            bld.add("filePIDsEnabled", dv.getFilePIDsEnabled());
+        }
+        bld.add("effectiveRequiresFilesToPublishDataset", dv.getEffectiveRequiresFilesToPublishDataset());
+        bld.add("isReleased", dv.isReleased());
+
+        List<DataverseFieldTypeInputLevel> inputLevels = dv.getDataverseFieldTypeInputLevels();
+        if(!inputLevels.isEmpty()) {
+            bld.add("inputLevels", JsonPrinter.jsonDataverseFieldTypeInputLevels(inputLevels));
+        }
+
+        if (childCount != null) {
+            bld.add("childCount", childCount);
+        }
+        addDatasetFileCountLimit(dv, bld);
 
         return bld;
     }
@@ -272,6 +355,57 @@ public static JsonArrayBuilder json(List<DataverseContact> dataverseContacts) {
         return jsonArrayOfContacts;
     }
 
+    public static JsonObjectBuilder getOwnersFromDvObject(DvObject dvObject){
+        return getOwnersFromDvObject(dvObject, null);
+    }
+
+    public static JsonObjectBuilder getOwnersFromDvObject(DvObject dvObject, DatasetVersion dsv) {
+        List <DvObject> ownerList = new ArrayList();
+        dvObject = dvObject.getOwner(); // We're going to ignore the object itself
+        //Get "root" to top of list
+        while (dvObject != null) {
+            ownerList.add(0, dvObject);
+            dvObject = dvObject.getOwner();
+        }
+        //then work "inside out"
+        JsonObjectBuilder saved = null;
+        for (DvObject dvo : ownerList) {
+            saved = addEmbeddedOwnerObject(dvo, saved, dsv);
+        }
+        return saved;
+    }
+
+    private static JsonObjectBuilder addEmbeddedOwnerObject(DvObject dvo, JsonObjectBuilder isPartOf, DatasetVersion dsv ) {
+        JsonObjectBuilder ownerObject = jsonObjectBuilder();
+
+        if (dvo.isInstanceofDataverse()) {
+            ownerObject.add("type", "DATAVERSE");
+            Dataverse in = (Dataverse) dvo;
+            ownerObject.add("identifier", in.getAlias());
+            ownerObject.add("isReleased", in.isReleased());
+        }
+
+        if (dvo.isInstanceofDataset()) {
+            ownerObject.add("type", "DATASET");
+            if (dvo.getGlobalId() != null) {
+                ownerObject.add("persistentIdentifier", dvo.getGlobalId().asString());
+            }
+            ownerObject.add("identifier", dvo.getId());
+            String versionString = dsv == null ? "" : dsv.getFriendlyVersionNumber();
+            if (!versionString.isEmpty()){
+               ownerObject.add("version", versionString);
+            }
+        }
+
+        ownerObject.add("displayName", dvo.getDisplayName());
+
+        if (isPartOf != null) {
+            ownerObject.add("isPartOf", isPartOf);
+        }
+
+        return ownerObject;
+    }
+
     public static JsonObjectBuilder json( DataverseTheme theme ) {
         final NullSafeJsonBuilder baseObject = jsonObjectBuilder()
                 .add("id", theme.getId() )
@@ -295,100 +429,149 @@ public static JsonObjectBuilder json(BuiltinUser user) {
                 .add("userName", user.getUserName());
     }
 
-    public static JsonObjectBuilder json(Dataset ds) {
-        return jsonObjectBuilder()
+    public static JsonObjectBuilder json(Dataset ds){
+       return json(ds, false);
+    }
+
+    public static JsonObjectBuilder json(Dataset ds, Boolean returnOwners) {
+        JsonObjectBuilder bld = jsonObjectBuilder()
                 .add("id", ds.getId())
                 .add("identifier", ds.getIdentifier())
                 .add("persistentUrl", ds.getPersistentURL())
                 .add("protocol", ds.getProtocol())
                 .add("authority", ds.getAuthority())
-                .add("publisher", getRootDataverseNameforCitation(ds))
+                .add("separator", ds.getSeparator())
+                .add("publisher", BrandingUtil.getInstallationBrandName())
                 .add("publicationDate", ds.getPublicationDateFormattedYYYYMMDD())
                 .add("storageIdentifier", ds.getStorageIdentifier());
+        addDatasetFileCountLimit(ds, bld);
+
+        if (DvObjectContainer.isMetadataLanguageSet(ds.getMetadataLanguage())) {
+            bld.add("metadataLanguage", ds.getMetadataLanguage());
+        }
+        if (returnOwners){
+            bld.add("isPartOf", getOwnersFromDvObject(ds));
+        }
+        bld.add("datasetType", ds.getDatasetType().getName());
+        return bld;
     }
 
-    public static JsonObjectBuilder json(DatasetVersion dsv) {
+    private static void addDatasetFileCountLimit(DvObjectContainer dvo, JsonObjectBuilder bld) {
+        Integer effectiveDatasetFileCountLimit = dvo.getEffectiveDatasetFileCountLimit();
+        if (dvo.isDatasetFileCountLimitSet(effectiveDatasetFileCountLimit)) {
+            bld.add("effectiveDatasetFileCountLimit", effectiveDatasetFileCountLimit);
+        }
+        Integer datasetFileCountLimit = dvo.getDatasetFileCountLimit();
+        if (dvo.isDatasetFileCountLimitSet(datasetFileCountLimit)) {
+            bld.add("datasetFileCountLimit", datasetFileCountLimit);
+        }
+        if (dvo.isInstanceofDataset() && dvo.isDatasetFileCountLimitSet(effectiveDatasetFileCountLimit)) {
+            int available = effectiveDatasetFileCountLimit - datasetService.getDataFileCountByOwner(dvo.getId());
+            bld.add("datasetFileUploadsAvailable", Math.max(0, available));
+        }
+    }
+
+    public static JsonObjectBuilder json(FileDetailsHolder ds) {
+        return Json.createObjectBuilder().add(ds.getStorageID() ,
+                Json.createObjectBuilder()
+                .add("id", ds.getStorageID() )
+                .add("hash", ds.getHash())
+                .add("mime",ds.getMime()));
+    }
+
+    public static JsonObjectBuilder json(DatasetVersion dsv, boolean includeFiles) {
+        return json(dsv, null, includeFiles, false,true);
+    }
+    public static JsonObjectBuilder json(DatasetVersion dsv, boolean includeFiles, boolean includeMetadataBlocks) {
+        return json(dsv, null, includeFiles, false, includeMetadataBlocks);
+    }
+    public static JsonObjectBuilder json(DatasetVersion dsv, List<String> anonymizedFieldTypeNamesList,
+                                         boolean includeFiles, boolean returnOwners) {
+        return  json( dsv,  anonymizedFieldTypeNamesList, includeFiles,  returnOwners,true);
+    }
+    public static JsonObjectBuilder json(DatasetVersion dsv, List<String> anonymizedFieldTypeNamesList,
+        boolean includeFiles, boolean returnOwners, boolean includeMetadataBlocks) {
+        Dataset dataset = dsv.getDataset();
         JsonObjectBuilder bld = jsonObjectBuilder()
-                .add("id", dsv.getId())
-                .add("storageIdentifier", dsv.getDataset().getStorageIdentifier())
+                .add("id", dsv.getId()).add("datasetId", dataset.getId())
+                .add("datasetPersistentId", dataset.getGlobalId().asString())
+                .add("datasetType", dataset.getDatasetType().getName())
+                .add("storageIdentifier", dataset.getStorageIdentifier())
                 .add("versionNumber", dsv.getVersionNumber())
+                .add("internalVersionNumber", dsv.getVersion())
                 .add("versionMinorNumber", dsv.getMinorVersionNumber())
                 .add("versionState", dsv.getVersionState().name())
-                .add("versionNote", dsv.getVersionNote())
-                .add("archiveNote", dsv.getArchiveNote())
+                .add("latestVersionPublishingState", dataset.getLatestVersion().getVersionState().name())
+                .add("deaccessionNote", dsv.getDeaccessionNote())
                 .add("deaccessionLink", dsv.getDeaccessionLink())
                 .add("distributionDate", dsv.getDistributionDate())
                 .add("productionDate", dsv.getProductionDate())
-                .add("UNF", dsv.getUNF())
-                .add("archiveTime", format(dsv.getArchiveTime()))
+                .add("UNF", dsv.getUNF()).add("archiveTime", format(dsv.getArchiveTime()))
                 .add("lastUpdateTime", format(dsv.getLastUpdateTime()))
                 .add("releaseTime", format(dsv.getReleaseTime()))
                 .add("createTime", format(dsv.getCreateTime()))
-                .add("license", dsv.getTermsOfUseAndAccess().getLicense() != null ? dsv.getTermsOfUseAndAccess().getLicense().toString() : null)
-                .add("termsOfUse", getLicenseInfo(dsv))
-                .add("confidentialityDeclaration", dsv.getTermsOfUseAndAccess().getConfidentialityDeclaration() != null ? dsv.getTermsOfUseAndAccess().getConfidentialityDeclaration() : null)
-                .add("availabilityStatus", dsv.getTermsOfUseAndAccess().getAvailabilityStatus() != null ? dsv.getTermsOfUseAndAccess().getAvailabilityStatus() : null)
-                .add("specialPermissions", dsv.getTermsOfUseAndAccess().getSpecialPermissions() != null ? dsv.getTermsOfUseAndAccess().getSpecialPermissions() : null)
-                .add("restrictions", dsv.getTermsOfUseAndAccess().getRestrictions() != null ? dsv.getTermsOfUseAndAccess().getRestrictions() : null)
-                .add("citationRequirements", dsv.getTermsOfUseAndAccess().getCitationRequirements() != null ? dsv.getTermsOfUseAndAccess().getCitationRequirements() : null)
-                .add("depositorRequirements", dsv.getTermsOfUseAndAccess().getDepositorRequirements() != null ? dsv.getTermsOfUseAndAccess().getDepositorRequirements() : null)
-                .add("conditions", dsv.getTermsOfUseAndAccess().getConditions() != null ? dsv.getTermsOfUseAndAccess().getConditions() : null)
-                .add("disclaimer", dsv.getTermsOfUseAndAccess().getDisclaimer() != null ? dsv.getTermsOfUseAndAccess().getDisclaimer() : null)
-                .add("termsOfAccess", dsv.getTermsOfUseAndAccess().getTermsOfAccess() != null ? dsv.getTermsOfUseAndAccess().getTermsOfAccess() : null)
-                .add("dataAccessPlace", dsv.getTermsOfUseAndAccess().getDataAccessPlace() != null ? dsv.getTermsOfUseAndAccess().getDataAccessPlace() : null)
-                .add("originalArchive", dsv.getTermsOfUseAndAccess().getOriginalArchive() != null ? dsv.getTermsOfUseAndAccess().getOriginalArchive() : null)
-                .add("availabilityStatus", dsv.getTermsOfUseAndAccess().getAvailabilityStatus() != null ? dsv.getTermsOfUseAndAccess().getAvailabilityStatus() : null)
-                .add("contactForAccess", dsv.getTermsOfUseAndAccess().getContactForAccess() != null ? dsv.getTermsOfUseAndAccess().getContactForAccess() : null)
-                .add("sizeOfCollection", dsv.getTermsOfUseAndAccess().getSizeOfCollection() != null ? dsv.getTermsOfUseAndAccess().getSizeOfCollection() : null)
-                .add("studyCompletion", dsv.getTermsOfUseAndAccess().getStudyCompletion() != null ? dsv.getTermsOfUseAndAccess().getStudyCompletion() : null)
+                .add("alternativePersistentId", dataset.getAlternativePersistentIdentifier())
+                .add("publicationDate", dataset.getPublicationDateFormattedYYYYMMDD())
+                .add("citationDate", dataset.getCitationDateFormattedYYYYMMDD())
+                .add("versionNote", dsv.getVersionNote());
+        addDatasetFileCountLimit(dataset, bld);
+
+        License license = DatasetUtil.getLicense(dsv);
+        if (license != null) {
+            bld.add("license", jsonLicense(dsv));
+        } else {
+            // Custom terms
+            bld.add("termsOfUse", dsv.getTermsOfUseAndAccess().getTermsOfUse())
+                    .add("confidentialityDeclaration", dsv.getTermsOfUseAndAccess().getConfidentialityDeclaration())
+                    .add("specialPermissions", dsv.getTermsOfUseAndAccess().getSpecialPermissions())
+                    .add("restrictions", dsv.getTermsOfUseAndAccess().getRestrictions())
+                    .add("citationRequirements", dsv.getTermsOfUseAndAccess().getCitationRequirements())
+                    .add("depositorRequirements", dsv.getTermsOfUseAndAccess().getDepositorRequirements())
+                    .add("conditions", dsv.getTermsOfUseAndAccess().getConditions())
+                    .add("disclaimer", dsv.getTermsOfUseAndAccess().getDisclaimer());
+        }
+        bld.add("termsOfAccess", dsv.getTermsOfUseAndAccess().getTermsOfAccess())
+                .add("dataAccessPlace", dsv.getTermsOfUseAndAccess().getDataAccessPlace())
+                .add("originalArchive", dsv.getTermsOfUseAndAccess().getOriginalArchive())
+                .add("availabilityStatus", dsv.getTermsOfUseAndAccess().getAvailabilityStatus())
+                .add("contactForAccess", dsv.getTermsOfUseAndAccess().getContactForAccess())
+                .add("sizeOfCollection", dsv.getTermsOfUseAndAccess().getSizeOfCollection())
+                .add("studyCompletion", dsv.getTermsOfUseAndAccess().getStudyCompletion())
                 .add("fileAccessRequest", dsv.getTermsOfUseAndAccess().isFileAccessRequest());
-
-        bld.add("metadataBlocks", jsonByBlocks(dsv.getDatasetFields()));
-
-        bld.add("files", jsonFileMetadatas(dsv.getFileMetadatas()));
+        if(includeMetadataBlocks) {
+            bld.add("metadataBlocks", (anonymizedFieldTypeNamesList != null) ?
+                    jsonByBlocks(dsv.getDatasetFields(), anonymizedFieldTypeNamesList)
+                    : jsonByBlocks(dsv.getDatasetFields())
+            );
+        }
+        if(returnOwners){
+            bld.add("isPartOf", getOwnersFromDvObject(dataset));
+        }
+        if (includeFiles) {
+            bld.add("files", jsonFileMetadatas(dsv.getFileMetadatas()));
+        }
 
         return bld;
     }
-    
-    
+
     public static JsonObjectBuilder jsonDataFileList(List<DataFile> dataFiles){
-    
+
         if (dataFiles==null){
             throw new NullPointerException("dataFiles cannot be null");
         }
-        
+
         JsonObjectBuilder bld = jsonObjectBuilder();
-        
-        
+
+
         List<FileMetadata> dataFileList = dataFiles.stream()
                                     .map(x -> x.getFileMetadata())
                                     .collect(Collectors.toList());
 
-        
+
         bld.add("files", jsonFileMetadatas(dataFileList));
 
         return bld;
     }
-    
-    private static String getRootDataverseNameforCitation(Dataset dataset) {
-        Dataverse root = dataset.getOwner();
-        while (root.getOwner() != null) {
-            root = root.getOwner();
-        }
-        String rootDataverseName = root.getName();
-        if (!StringUtil.isEmpty(rootDataverseName)) {
-            return rootDataverseName;
-        } else {
-            return "";
-        }
-    }
-    
-    private static String getLicenseInfo(DatasetVersion dsv) {
-        if (dsv.getTermsOfUseAndAccess().getLicense() != null && dsv.getTermsOfUseAndAccess().getLicense().equals(TermsOfUseAndAccess.License.CC0)) {
-            return "CC0 Waiver";
-        }
-        return dsv.getTermsOfUseAndAccess().getTermsOfUse();
-    }
 
     /**
      * Export formats such as DDI require the citation to be included. See
@@ -398,8 +581,8 @@ private static String getLicenseInfo(DatasetVersion dsv) {
      * to the regular `json` method for DatasetVersion? Will anything break?
      * Unit tests for that method could not be found.
      */
-    public static JsonObjectBuilder jsonWithCitation(DatasetVersion dsv) {
-        JsonObjectBuilder dsvWithCitation = JsonPrinter.json(dsv);
+    public static JsonObjectBuilder jsonWithCitation(DatasetVersion dsv, boolean includeFiles) {
+        JsonObjectBuilder dsvWithCitation = JsonPrinter.json(dsv, includeFiles);
         dsvWithCitation.add("citation", dsv.getCitation());
         return dsvWithCitation;
     }
@@ -418,7 +601,7 @@ public static JsonObjectBuilder jsonWithCitation(DatasetVersion dsv) {
      */
     public static JsonObjectBuilder jsonAsDatasetDto(DatasetVersion dsv) {
         JsonObjectBuilder datasetDtoAsJson = JsonPrinter.json(dsv.getDataset());
-        datasetDtoAsJson.add("datasetVersion", jsonWithCitation(dsv));
+        datasetDtoAsJson.add("datasetVersion", jsonWithCitation(dsv, true));
         return datasetDtoAsJson;
     }
 
@@ -443,11 +626,15 @@ public static JsonObjectBuilder json(DatasetDistributor dist) {
     }
 
     public static JsonObjectBuilder jsonByBlocks(List<DatasetField> fields) {
+        return jsonByBlocks(fields, null);
+    }
+
+    public static JsonObjectBuilder jsonByBlocks(List<DatasetField> fields, List<String> anonymizedFieldTypeNamesList) {
         JsonObjectBuilder blocksBld = jsonObjectBuilder();
 
         for (Map.Entry<MetadataBlock, List<DatasetField>> blockAndFields : DatasetField.groupByBlock(fields).entrySet()) {
             MetadataBlock block = blockAndFields.getKey();
-            blocksBld.add(block.getName(), JsonPrinter.json(block, blockAndFields.getValue()));
+            blocksBld.add(block.getName(), JsonPrinter.json(block, blockAndFields.getValue(), anonymizedFieldTypeNamesList));
         }
         return blocksBld;
     }
@@ -461,17 +648,35 @@ public static JsonObjectBuilder jsonByBlocks(List<DatasetField> fields) {
      * @return JSON Object builder with the block and fields information.
      */
     public static JsonObjectBuilder json(MetadataBlock block, List<DatasetField> fields) {
+        return json(block, fields, null);
+    }
+
+    public static JsonObjectBuilder json(MetadataBlock block, List<DatasetField> fields, List<String> anonymizedFieldTypeNamesList) {
         JsonObjectBuilder blockBld = jsonObjectBuilder();
 
         blockBld.add("displayName", block.getDisplayName());
-        final JsonArrayBuilder fieldsArray = Json.createArrayBuilder();
+        blockBld.add("name", block.getName());
 
-        DatasetFieldWalker.walk(fields, settingsService, new DatasetFieldsToJson(fieldsArray));
+        final JsonArrayBuilder fieldsArray = Json.createArrayBuilder();
+        Map<Long, JsonObject> cvocMap = (datasetFieldService==null) ? new HashMap<Long, JsonObject>() :datasetFieldService.getCVocConf(true);
+        DatasetFieldWalker.walk(fields, settingsService, cvocMap, new DatasetFieldsToJson(fieldsArray, anonymizedFieldTypeNamesList));
 
         blockBld.add("fields", fieldsArray);
         return blockBld;
     }
 
+    public static JsonArrayBuilder json(List<MetadataBlock> metadataBlocks, boolean returnDatasetFieldTypes, boolean printOnlyDisplayedOnCreateDatasetFieldTypes) {
+        return json(metadataBlocks, returnDatasetFieldTypes, printOnlyDisplayedOnCreateDatasetFieldTypes, null, null);
+    }
+
+    public static JsonArrayBuilder json(List<MetadataBlock> metadataBlocks, boolean returnDatasetFieldTypes, boolean printOnlyDisplayedOnCreateDatasetFieldTypes, Dataverse ownerDataverse, DatasetType datasetType) {
+        JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
+        for (MetadataBlock metadataBlock : metadataBlocks) {
+            arrayBuilder.add(returnDatasetFieldTypes ? json(metadataBlock, printOnlyDisplayedOnCreateDatasetFieldTypes, ownerDataverse, datasetType) : brief.json(metadataBlock));
+        }
+        return arrayBuilder;
+    }
+
     public static String typeClassString(DatasetFieldType typ) {
         if (typ.isControlledVocabulary()) {
             return "controlledVocabulary";
@@ -487,40 +692,124 @@ public static JsonObject json(DatasetField dfv) {
             return null;
         } else {
             JsonArrayBuilder fieldArray = Json.createArrayBuilder();
-            DatasetFieldWalker.walk(dfv, new DatasetFieldsToJson(fieldArray));
+            Map<Long, JsonObject> cvocMap = (datasetFieldService==null) ? new HashMap<Long, JsonObject>() :datasetFieldService.getCVocConf(true);
+            DatasetFieldWalker.walk(dfv, new DatasetFieldsToJson(fieldArray), cvocMap);
             JsonArray out = fieldArray.build();
             return out.getJsonObject(0);
         }
     }
 
-    public static JsonObjectBuilder json(MetadataBlock blk) {
-        JsonObjectBuilder bld = jsonObjectBuilder();
-        bld.add("id", blk.getId());
-        bld.add("name", blk.getName());
-        bld.add("displayName", blk.getDisplayName());
+    public static JsonObjectBuilder json(MetadataBlock metadataBlock) {
+        return json(metadataBlock, false, null, null);
+    }
 
-        JsonObjectBuilder fieldsBld = jsonObjectBuilder();
-        for (DatasetFieldType df : new TreeSet<>(blk.getDatasetFieldTypes())) {
-            fieldsBld.add(df.getName(), JsonPrinter.json(df));
+    public static JsonObjectBuilder json(MetadataBlock metadataBlock, boolean printOnlyDisplayedOnCreateDatasetFieldTypes, Dataverse ownerDataverse, DatasetType datasetType) {
+        JsonObjectBuilder jsonObjectBuilder = jsonObjectBuilder()
+                .add("id", metadataBlock.getId())
+                .add("name", metadataBlock.getName())
+                .add("displayName", metadataBlock.getDisplayName());
+        
+        jsonObjectBuilder.add("displayOnCreate", metadataBlock.isDisplayOnCreate());
+
+        List<DatasetFieldType> datasetFieldTypesList = metadataBlock.getDatasetFieldTypes();
+        Set<DatasetFieldType> datasetFieldTypes = filterOutDuplicateDatasetFieldTypes(datasetFieldTypesList);
+
+        JsonObjectBuilder fieldsBuilder = Json.createObjectBuilder();
+        
+        for (DatasetFieldType datasetFieldType : datasetFieldTypes) {
+            if (!datasetFieldType.isChild()) {
+                DataverseFieldTypeInputLevel level = null;
+                datasetFieldType.setInclude(true);
+                if (ownerDataverse != null) {
+                    level = ownerDataverse.getDatasetFieldTypeInInputLevels(datasetFieldType.getId());
+                    if (level != null) {
+                        datasetFieldType.setLocalDisplayOnCreate(level.getDisplayOnCreate());
+                        datasetFieldType.setRequiredDV(level.isRequired());
+                        datasetFieldType.setInclude(level.isInclude());
+                    }
+                }
+                boolean fieldDisplayOnCreate = datasetFieldType.shouldDisplayOnCreate();
+                if (datasetFieldType.isInclude() && (!printOnlyDisplayedOnCreateDatasetFieldTypes
+                        || fieldDisplayOnCreate || datasetFieldType.isRequired()
+                        || (datasetFieldType.isRequiredDV() && (level != null)))) {
+                    fieldsBuilder.add(datasetFieldType.getName(), json(datasetFieldType, ownerDataverse));
+                }
+            }
         }
+        
+        jsonObjectBuilder.add("fields", fieldsBuilder);
+        return jsonObjectBuilder;
+    }
 
-        bld.add("fields", fieldsBld);
+    // This will remove datasetFieldTypes that are in the list but also a child of another datasetFieldType in the list
+    // Prevents duplicate datasetFieldType information from being returned twice
+    // See: https://github.com/IQSS/dataverse/issues/10472
+    private static Set<DatasetFieldType> filterOutDuplicateDatasetFieldTypes(List<DatasetFieldType> datasetFieldTypesList) {
+        // making a copy of the list as to not damage the original when we remove items
+        List<DatasetFieldType> datasetFieldTypes = new ArrayList<>(datasetFieldTypesList);
+        // exclude/remove datasetFieldTypes if datasetFieldType exists as a child of another datasetFieldType
+        datasetFieldTypesList.forEach(dsft -> dsft.getChildDatasetFieldTypes().forEach(c -> datasetFieldTypes.remove(c)));
+        return new TreeSet<>(datasetFieldTypes);
+    }
 
-        return bld;
+    public static JsonArrayBuilder jsonDatasetFieldTypes(List<DatasetFieldType> fields) {
+        JsonArrayBuilder fieldsJson = Json.createArrayBuilder();
+        for (DatasetFieldType field : fields) {
+            fieldsJson.add(JsonPrinter.json(field));
+        }
+        return fieldsJson;
     }
 
     public static JsonObjectBuilder json(DatasetFieldType fld) {
+        return json(fld, null);
+    }
+
+    public static JsonObjectBuilder json(DatasetFieldType fld, Dataverse ownerDataverse) {
         JsonObjectBuilder fieldsBld = jsonObjectBuilder();
         fieldsBld.add("name", fld.getName());
         fieldsBld.add("displayName", fld.getDisplayName());
+        fieldsBld.add("displayOnCreate", fld.shouldDisplayOnCreate());
         fieldsBld.add("title", fld.getTitle());
         fieldsBld.add("type", fld.getFieldType().toString());
+        fieldsBld.add("typeClass", typeClassString(fld));
         fieldsBld.add("watermark", fld.getWatermark());
         fieldsBld.add("description", fld.getDescription());
+        fieldsBld.add("multiple", fld.isAllowMultiples());
+        fieldsBld.add("isControlledVocabulary", fld.isControlledVocabulary());
+        fieldsBld.add("isAdvancedSearchFieldType", fld.isAdvancedSearchFieldType());
+        fieldsBld.add("displayFormat", fld.getDisplayFormat());
+        fieldsBld.add("displayOrder", fld.getDisplayOrder());
+
+        boolean inLevel= ownerDataverse != null && ownerDataverse.isDatasetFieldTypeInInputLevels(fld.getId());
+        fieldsBld.add("isRequired", (fld.isRequiredDV() && inLevel) || fld.isRequired());
+
+        if (fld.isControlledVocabulary()) {
+            // If the field has a controlled vocabulary,
+            // add all values to the resulting JSON
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+            for (ControlledVocabularyValue cvv : fld.getControlledVocabularyValues()) {
+                jab.add(cvv.getStrValue());
+            }
+            fieldsBld.add("controlledVocabularyValues", jab);
+        }
+
         if (!fld.getChildDatasetFieldTypes().isEmpty()) {
             JsonObjectBuilder subFieldsBld = jsonObjectBuilder();
             for (DatasetFieldType subFld : fld.getChildDatasetFieldTypes()) {
-                subFieldsBld.add(subFld.getName(), JsonPrinter.json(subFld));
+                subFld.setInclude(true);
+                if (ownerDataverse != null) {
+                    DataverseFieldTypeInputLevel childLevel = ownerDataverse
+                            .getDatasetFieldTypeInInputLevels(subFld.getId());
+                    if (childLevel != null) {
+                        subFld.setLocalDisplayOnCreate(childLevel.getDisplayOnCreate());
+                        subFld.setRequiredDV(childLevel.isRequired());
+                        subFld.setInclude(childLevel.isInclude());
+                    }
+                }
+                //This assumes a child have can't be displayOnCreate=false when the parent has it true (i.e. we're not excluding children based on testing displayOnCreate (or required) here.)
+                if(subFld.isInclude()) {
+                  subFieldsBld.add(subFld.getName(), JsonPrinter.json(subFld, ownerDataverse));
+                }
             }
             fieldsBld.add("childFields", subFieldsBld);
         }
@@ -528,28 +817,57 @@ public static JsonObjectBuilder json(DatasetFieldType fld) {
         return fieldsBld;
     }
 
-    public static JsonObjectBuilder json(FileMetadata fmd) {
-        return jsonObjectBuilder()
+    public static JsonObjectBuilder json(FileMetadata fmd){
+        return json(fmd, false, false);
+    }
+
+    public static JsonObjectBuilder json(FileMetadata fmd, boolean returnOwners, boolean printDatasetVersion) {
+        NullSafeJsonBuilder builder = jsonObjectBuilder();
+
                 // deprecated: .add("category", fmd.getCategory())
-                // TODO: uh, figure out what to do here... it's deprecated 
-                // in a sense that there's no longer the category field in the 
-                // fileMetadata object; but there are now multiple, oneToMany file 
+                // TODO: uh, figure out what to do here... it's deprecated
+                // in a sense that there's no longer the category field in the
+                // fileMetadata object; but there are now multiple, oneToMany file
                 // categories - and we probably need to export them too!) -- L.A. 4.5
-                .add("description", fmd.getDescription())
+                // DONE: catgegories by name
+                builder.add("description", fmd.getDescription())
                 .add("label", fmd.getLabel()) // "label" is the filename
-                .add("restricted", fmd.isRestricted()) 
+                .add("restricted", fmd.isRestricted())
                 .add("directoryLabel", fmd.getDirectoryLabel())
                 .add("version", fmd.getVersion())
                 .add("datasetVersionId", fmd.getDatasetVersion().getId())
                 .add("categories", getFileCategories(fmd))
-                .add("dataFile", JsonPrinter.json(fmd.getDataFile(), fmd));
+                .add("dataFile", JsonPrinter.json(fmd.getDataFile(), fmd, false, returnOwners));
+
+        if (printDatasetVersion) {
+            builder.add("datasetVersion", json(fmd.getDatasetVersion(), false));
+        }
+
+        return builder;
+    }
+
+    public static JsonObjectBuilder json(AuxiliaryFile auxFile) {
+        return jsonObjectBuilder()
+               .add("formatTag", auxFile.getFormatTag())
+                .add("formatVersion", auxFile.getFormatVersion()) // "label" is the filename
+                .add("origin", auxFile.getOrigin())
+                .add("isPublic", auxFile.getIsPublic())
+                .add("type", auxFile.getType())
+                .add("contentType", auxFile.getContentType())
+                .add("fileSize", auxFile.getFileSize())
+                .add("checksum", auxFile.getChecksum())
+                .add("dataFile", JsonPrinter.json(auxFile.getDataFile()));
     }
 
     public static JsonObjectBuilder json(DataFile df) {
-        return JsonPrinter.json(df, null);
+        return JsonPrinter.json(df, null, false);
     }
-    
-    public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata) {
+
+    public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata, boolean forExportDataProvider){
+        return json(df, fileMetadata, forExportDataProvider, false);
+    }
+
+    public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata, boolean forExportDataProvider, boolean returnOwners) {
         // File names are no longer stored in the DataFile entity; 
         // (they are instead in the FileMetadata (as "labels") - this way 
         // the filename can change between versions... 
@@ -559,35 +877,41 @@ public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata) {
         // *correct* file name - i.e., that it comes from the right version. 
         // (TODO...? L.A. 4.5, Aug 7 2016)
         String fileName = null;
-        
-        if (fileMetadata != null) {
-            fileName = fileMetadata.getLabel();
-        } else if (df.getFileMetadata() != null) {
+
+        if (fileMetadata == null){
             // Note that this may not necessarily grab the file metadata from the 
             // version *you want*! (L.A.)
-            fileName = df.getFileMetadata().getLabel();
-        }
-        
-        String pidURL = "";
-        
-        if (new GlobalId(df).toURL() != null){
-            pidURL = new GlobalId(df).toURL().toString();
+            fileMetadata = df.getFileMetadata();
         }
-        
-        return jsonObjectBuilder()
+
+        fileName = fileMetadata.getLabel();
+        String directoryLabel = fileMetadata.getDirectoryLabel();
+        GlobalId filePid = df.getGlobalId();
+        String pidURL = (filePid!=null)? filePid.asURL(): null;
+        //For backward compatibility - prior to #8674, asString() returned "" for the value when no PID exists.
+        String pidString = (filePid!=null)? filePid.asString(): "";
+
+        JsonObjectBuilder embargo = df.getEmbargo() != null ? JsonPrinter.json(df.getEmbargo()) : null;
+        JsonObjectBuilder retention = df.getRetention() != null ? JsonPrinter.json(df.getRetention()) : null;
+
+        NullSafeJsonBuilder builder = jsonObjectBuilder()
                 .add("id", df.getId())
-                .add("persistentId", df.getGlobalIdString())
+                .add("persistentId", pidString)
                 .add("pidURL", pidURL)
                 .add("filename", fileName)
-                .add("contentType", df.getContentType())            
-                .add("filesize", df.getFilesize())            
-                .add("description", df.getDescription())    
+                .add("contentType", df.getContentType())
+                .add("friendlyType", df.getFriendlyType())
+                .add("filesize", df.getFilesize())
+                .add("description", fileMetadata.getDescription())
+                .add("categories", getFileCategories(fileMetadata))
+                .add("embargo", embargo)
+                .add("retention", retention)
                 //.add("released", df.isReleased())
-                //.add("restricted", df.isRestricted())
                 .add("storageIdentifier", df.getStorageIdentifier())
                 .add("originalFileFormat", df.getOriginalFileFormat())
                 .add("originalFormatLabel", df.getOriginalFormatLabel())
                 .add ("originalFileSize", df.getOriginalFileSize())
+                .add("originalFileName", df.getOriginalFileName())
                 .add("UNF", df.getUnf())
                 //---------------------------------------------
                 // For file replace: rootDataFileId, previousDataFileId
@@ -601,11 +925,213 @@ public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata) {
                 //---------------------------------------------
                 .add("md5", getMd5IfItExists(df.getChecksumType(), df.getChecksumValue()))
                 .add("checksum", getChecksumTypeAndValue(df.getChecksumType(), df.getChecksumValue()))
+                .add("tabularData", df.isTabularData())
                 .add("tabularTags", getTabularFileTags(df))
-                .add("creationDate",  df.getCreateDateFormattedYYYYMMDD())
+                .add("creationDate", df.getCreateDateFormattedYYYYMMDD())
+                .add("publicationDate",  df.getPublicationDateFormattedYYYYMMDD())
+                .add("directoryLabel", directoryLabel)
+                .add("lastUpdateTime", format(fileMetadata.getDatasetVersion().getLastUpdateTime()));
+        Dataset dfOwner = df.getOwner();
+        if (dfOwner != null) {
+            builder.add("fileAccessRequest", dfOwner.isFileAccessRequest());
+        }
+        /*
+         * The restricted state was not included prior to #9175 so to avoid backward
+         * incompatability, it is now only added when generating json for the
+         * InternalExportDataProvider fileDetails.
+         */
+        if (forExportDataProvider) {
+            builder.add("restricted", df.isRestricted())
+            .add("fileMetadataId", fileMetadata.getId())
+            .add("dataTables", df.getDataTables().isEmpty() ? null : JsonPrinter.jsonDT(df.getDataTables()))
+            .add("varGroups", fileMetadata.getVarGroups().isEmpty()
+                    ? JsonPrinter.jsonVarGroup(fileMetadata.getVarGroups())
+                    : null);
+        }
+        if (returnOwners){
+            builder.add("isPartOf", getOwnersFromDvObject(df, fileMetadata.getDatasetVersion()));
+        }
+        return builder;
+    }
+
+    //Started from https://github.com/RENCI-NRIG/dataverse/, i.e. https://github.com/RENCI-NRIG/dataverse/commit/2b5a1225b42cf1caba85e18abfeb952171c6754a
+    public static JsonArrayBuilder jsonDT(List<DataTable> ldt) {
+        JsonArrayBuilder ldtArr = Json.createArrayBuilder();
+        for(DataTable dt: ldt){
+            ldtArr.add(JsonPrinter.json(dt));
+        }
+        return ldtArr;
+    }
+
+    public static JsonObjectBuilder json(DataTable dt) {
+        return jsonObjectBuilder()
+                .add("varQuantity", dt.getVarQuantity())
+                .add("caseQuantity", dt.getCaseQuantity())
+                .add("recordsPerCase", dt.getRecordsPerCase())
+                .add("UNF", dt.getUnf())
+                .add("dataVariables", JsonPrinter.jsonDV(dt.getDataVariables()))
                 ;
     }
-    
+
+    public static JsonArrayBuilder jsonDV(List<DataVariable> dvl) {
+        JsonArrayBuilder varArr = Json.createArrayBuilder();
+        if(dvl!=null){
+            for (DataVariable dv: dvl){
+                varArr.add(JsonPrinter.json(dv));
+            }
+        }
+        return varArr;
+    }
+
+    // TODO: add sumstat and variable categories, check formats
+    public static JsonObjectBuilder json(DataVariable dv) {
+    return jsonObjectBuilder()
+            .add("id", dv.getId())
+            .add("name", dv.getName())
+            .add("label", dv.getLabel())
+            .add("weighted", dv.isWeighted())
+            .add("variableIntervalType", dv.getIntervalLabel())
+            .add("variableFormatType", dv.getType().name()) // varFormat
+            .add("formatCategory", dv.getFormatCategory())
+            .add("format", dv.getFormat())
+            .add("isOrderedCategorical", dv.isOrderedCategorical())
+            .add("fileOrder", dv.getFileOrder())
+            .add("UNF",dv.getUnf())
+            .add("fileStartPosition", dv.getFileStartPosition())
+            .add("fileEndPosition", dv.getFileEndPosition())
+            .add("recordSegmentNumber", dv.getRecordSegmentNumber())
+            .add("numberOfDecimalPoints",dv.getNumberOfDecimalPoints())
+            .add("variableMetadata",jsonVarMetadata(dv.getVariableMetadatas()))
+            .add("invalidRanges", dv.getInvalidRanges().isEmpty() ? null : JsonPrinter.jsonInvalidRanges(dv.getInvalidRanges()))
+            .add("summaryStatistics", dv.getSummaryStatistics().isEmpty() ? null : JsonPrinter.jsonSumStat(dv.getSummaryStatistics()))
+            .add("variableCategories", dv.getCategories().isEmpty() ? null : JsonPrinter.jsonCatStat(dv.getCategories()))
+            ;
+    }
+
+    private static JsonArrayBuilder jsonInvalidRanges(Collection<VariableRange> invalidRanges) {
+        JsonArrayBuilder invRanges = Json.createArrayBuilder();
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        for (VariableRange vr: invalidRanges){
+            job.add("beginValue", vr.getBeginValue())
+            .add("hasBeginValueType", vr.getBeginValueType()!=null)
+            .add("isBeginValueTypePoint", vr.isBeginValueTypePoint())
+            .add("isBeginValueTypeMin", vr.isBeginValueTypeMin())
+            .add("isBeginValueTypeMinExcl", vr.isBeginValueTypeMinExcl())
+            .add("isBeginValueTypeMax", vr.isBeginValueTypeMax())
+            .add("isBeginValueTypeMaxExcl", vr.isBeginValueTypeMaxExcl())
+            .add("endValue", vr.getEndValue())
+            .add("hasEndValueType", vr.getEndValueType()!=null)
+            .add("endValueTypeMax", vr.isEndValueTypeMax())
+            .add("endValueTypeMaxExcl", vr.isEndValueTypeMaxExcl());
+
+            invRanges.add(job);
+        }
+        return invRanges;
+    }
+
+    private static JsonObjectBuilder jsonSumStat(Collection<SummaryStatistic> sumStat){
+        //JsonArrayBuilder sumStatArr = Json.createArrayBuilder();
+        JsonObjectBuilder sumStatObj = Json.createObjectBuilder();
+        for (SummaryStatistic stat: sumStat){
+            String label = stat.getTypeLabel()==null ? "unknown":stat.getTypeLabel();
+            sumStatObj.add(label, stat.getValue());
+        }
+        return sumStatObj;
+    }
+
+
+    private static JsonArrayBuilder jsonCatStat(Collection<VariableCategory> catStat){
+        JsonArrayBuilder catArr = Json.createArrayBuilder();
+
+        for (VariableCategory stat: catStat){
+            JsonObjectBuilder catStatObj = Json.createObjectBuilder();
+            catStatObj.add("label", stat.getLabel())
+                      .add("value", stat.getValue())
+                      .add("isMissing", stat.isMissing());
+            if(stat.getFrequency()!=null){
+                catStatObj.add("frequency", stat.getFrequency());
+            }
+            catArr.add(catStatObj);
+        }
+        return catArr;
+    }
+
+    private static JsonArrayBuilder jsonVarGroup(List<VarGroup> varGroups) {
+        JsonArrayBuilder vgArr = Json.createArrayBuilder();
+        for (VarGroup vg : varGroups) {
+            JsonObjectBuilder vgJson = jsonObjectBuilder().add("id", vg.getId()).add("label", vg.getLabel());
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+            for (DataVariable dvar : vg.getVarsInGroup()) {
+                jab.add(dvar.getId());
+            }
+            vgJson.add("dataVariableIds", jab);
+            vgArr.add(vgJson);
+        }
+        return vgArr;
+    }
+
+    private static JsonArrayBuilder jsonVarMetadata(Collection<VariableMetadata> varMetadatas) {
+        JsonArrayBuilder vmArr = Json.createArrayBuilder();
+        for (VariableMetadata vm : varMetadatas) {
+            JsonObjectBuilder vmJson = jsonObjectBuilder()
+                    .add("id", vm.getId())
+                    .add("fileMetadataId", vm.getFileMetadata().getId())
+                    .add("label", vm.getLabel())
+                    .add("isWeightVar", vm.isIsweightvar())
+                    .add("isWeighted",vm.isWeighted())
+                    .add("weightVariableId", (vm.getWeightvariable()==null) ? null : vm.getWeightvariable().getId())
+                    .add("literalQuestion", vm.getLiteralquestion())
+                    .add("interviewInstruction", vm.getInterviewinstruction())
+                    .add("postQuestion", vm.getPostquestion())
+                    .add("universe", vm.getUniverse())
+                    .add("notes", vm.getNotes())
+                    .add("categoryMetadatas",json(vm.getCategoriesMetadata()));
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+        }
+        return vmArr;
+    }
+
+    private static JsonArrayBuilder json(Collection<CategoryMetadata> categoriesMetadata) {
+        JsonArrayBuilder cmArr = Json.createArrayBuilder();
+        for(CategoryMetadata cm: categoriesMetadata) {
+            JsonObjectBuilder job = jsonObjectBuilder()
+                    .add("wFreq", cm.getWfreq())
+                    .add("categoryValue", cm.getCategory().getValue());
+            cmArr.add(job);
+        }
+        return cmArr;
+    }
+
+    public static JsonObjectBuilder json(HarvestingClient harvestingClient) {
+        if (harvestingClient == null) {
+            return null;
+        }
+
+        return jsonObjectBuilder().add("nickName", harvestingClient.getName()).
+                add("sourceName", harvestingClient.getSourceName()).
+                add("dataverseAlias", harvestingClient.getDataverse().getAlias()).
+                add("type", harvestingClient.getHarvestType()).
+                add("style", harvestingClient.getHarvestStyle()).
+                add("harvestUrl", harvestingClient.getHarvestingUrl()).
+                add("archiveUrl", harvestingClient.getArchiveUrl()).
+                add("archiveDescription", harvestingClient.getArchiveDescription()).
+                add("metadataFormat", harvestingClient.getMetadataPrefix()).
+                add("set", harvestingClient.getHarvestingSet()).
+                add("schedule", harvestingClient.isScheduled() ? harvestingClient.getScheduleDescription() : "none").
+                add("status", harvestingClient.isHarvestingNow() ? "inProgress" : "inActive").
+                add("customHeaders", harvestingClient.getCustomHttpHeaders()).
+                add("allowHarvestingMissingCVV", harvestingClient.getAllowHarvestingMissingCVV()).
+                add("useListRecords", harvestingClient.isUseListRecords()).
+                add("useOaiIdentifiersAsPids", harvestingClient.isUseOaiIdentifiersAsPids()).
+                add("lastHarvest", harvestingClient.getLastHarvestTime() == null ? null : harvestingClient.getLastHarvestTime().toString()).
+                add("lastResult", harvestingClient.getLastResult()).
+                add("lastSuccessful", harvestingClient.getLastSuccessfulHarvestTime() == null ? null : harvestingClient.getLastSuccessfulHarvestTime().toString()).
+                add("lastNonEmpty", harvestingClient.getLastNonEmptyHarvestTime() == null ? null : harvestingClient.getLastNonEmptyHarvestTime().toString()).
+                add("lastDatasetsHarvested", harvestingClient.getLastHarvestedDatasetCount()). // == null ? "N/A" : harvestingClient.getLastHarvestedDatasetCount().toString()).
+                add("lastDatasetsDeleted", harvestingClient.getLastDeletedDatasetCount()). // == null ? "N/A" : harvestingClient.getLastDeletedDatasetCount().toString()).
+                add("lastDatasetsFailed", harvestingClient.getLastFailedDatasetCount()); // == null ? "N/A" : harvestingClient.getLastFailedDatasetCount().toString());
+    }
+
     public static String format(Date d) {
         return (d == null) ? null : Util.getDateTimeFormat().format(d);
     }
@@ -647,16 +1173,20 @@ private static class DatasetFieldsToJson implements DatasetFieldWalker.Listener
 
         Deque<JsonObjectBuilder> objectStack = new LinkedList<>();
         Deque<JsonArrayBuilder> valueArrStack = new LinkedList<>();
-        JsonObjectBuilder result = null;
-
+        List<String> anonymizedFieldTypeNamesList = null;
         DatasetFieldsToJson(JsonArrayBuilder result) {
             valueArrStack.push(result);
         }
 
+        DatasetFieldsToJson(JsonArrayBuilder result, List<String> anonymizedFieldTypeNamesList) {
+            this(result);
+            this.anonymizedFieldTypeNamesList = anonymizedFieldTypeNamesList;
+        }
+
         @Override
         public void startField(DatasetField f) {
             objectStack.push(jsonObjectBuilder());
-            // Invariant: all values are multiple. Diffrentiation between multiple and single is done at endField.
+            // Invariant: all values are multiple. Differentiation between multiple and single is done at endField.
             valueArrStack.push(Json.createArrayBuilder());
 
             DatasetFieldType typ = f.getDatasetFieldType();
@@ -665,18 +1195,47 @@ public void startField(DatasetField f) {
             objectStack.peek().add("typeClass", typeClassString(typ));
         }
 
+        @Override
+        public void addExpandedValuesArray(DatasetField f) {
+            // Invariant: all values are multiple. Differentiation between multiple and single is done at endField.
+            valueArrStack.push(Json.createArrayBuilder());
+        }
+
         @Override
         public void endField(DatasetField f) {
             JsonObjectBuilder jsonField = objectStack.pop();
+            JsonArray expandedValues = valueArrStack.pop().build();
             JsonArray jsonValues = valueArrStack.pop().build();
             if (!jsonValues.isEmpty()) {
-                jsonField.add("value",
-                        f.getDatasetFieldType().isAllowMultiples() ? jsonValues
-                                : jsonValues.get(0));
+                String datasetFieldName = f.getDatasetFieldType().getName();
+                if (anonymizedFieldTypeNamesList != null && anonymizedFieldTypeNamesList.contains(datasetFieldName)) {
+                    anonymizeField(jsonField);
+                } else {
+                    jsonField.add("value",
+                            f.getDatasetFieldType().isAllowMultiples() ? jsonValues
+                                    : jsonValues.get(0));
+                    if (!expandedValues.isEmpty()) {
+                        jsonField.add("expandedvalue",
+                                f.getDatasetFieldType().isAllowMultiples() ? expandedValues
+                                        : expandedValues.get(0));
+                    }
+                }
                 valueArrStack.peek().add(jsonField);
             }
         }
 
+        @Override
+        public void externalVocabularyValue(DatasetFieldValue dsfv, JsonObject cvocEntry) {
+            if (dsfv.getValue() != null) {
+                if (cvocEntry.containsKey("retrieval-filtering")) {
+                    JsonObject value = datasetFieldService.getExternalVocabularyValue(dsfv.getValue());
+                    if (value!=null) {
+                        valueArrStack.peek().add(value);
+                    }
+                }
+            }
+        }
+
         @Override
         public void primitiveValue(DatasetFieldValue dsfv) {
             if (dsfv.getValue() != null) {
@@ -685,7 +1244,7 @@ public void primitiveValue(DatasetFieldValue dsfv) {
         }
 
         @Override
-        public void controledVocabularyValue(ControlledVocabularyValue cvv) {
+        public void controlledVocabularyValue(ControlledVocabularyValue cvv) {
             valueArrStack.peek().add(cvv.getStrValue());
         }
 
@@ -705,6 +1264,12 @@ public void endCompoundValue(DatasetFieldCompoundValue dsfcv) {
                 valueArrStack.peek().add(jsonField);
             }
         }
+
+        private void anonymizeField(JsonObjectBuilder jsonField) {
+            jsonField.add("typeClass", "primitive");
+            jsonField.add("value", BundleUtil.getStringFromBundle("dataset.anonymized.withheld"));
+            jsonField.add("multiple", false);
+        }
     }
 
     public static JsonObjectBuilder json(AuthenticationProviderRow aRow) {
@@ -739,13 +1304,49 @@ public static JsonObjectBuilder json( ExplicitGroup eg ) {
                     .add("displayName", eg.getDisplayName())
                     .add("containedRoleAssignees", ras);
     }
-    
-    public static JsonObjectBuilder json( DataverseFacet aFacet ) {
+
+    public static JsonArrayBuilder jsonDataverseFacets(List<DataverseFacet> dataverseFacets) {
+        JsonArrayBuilder dataverseFacetsJson = Json.createArrayBuilder();
+        for(DataverseFacet facet: dataverseFacets) {
+            dataverseFacetsJson.add(json(facet));
+        }
+        return dataverseFacetsJson;
+    }
+
+    public static JsonObjectBuilder json(DataverseFacet aFacet) {
         return jsonObjectBuilder()
                     .add("id", String.valueOf(aFacet.getId())) // TODO should just be id I think
-                    .add("name", aFacet.getDatasetFieldType().getDisplayName());
+                    .add("displayName", aFacet.getDatasetFieldType().getDisplayName())
+                    .add("name", aFacet.getDatasetFieldType().getName());
+    }
+
+    public static JsonObjectBuilder json(Embargo embargo) {
+        return jsonObjectBuilder().add("dateAvailable", embargo.getDateAvailable().toString()).add("reason",
+                embargo.getReason());
+    }
+
+    public static JsonObjectBuilder json(Retention retention) {
+        return jsonObjectBuilder().add("dateUnavailable", retention.getDateUnavailable().toString()).add("reason",
+                retention.getReason());
     }
+
+    public static JsonObjectBuilder json(License license) {
         
+        return jsonObjectBuilder()
+            .add("id", license.getId())
+            .add("name", license.getName())
+            .add("shortDescription", license.getShortDescription())
+            .add("uri", license.getUri().toString())
+            .add("iconUrl", license.getIconUrl() == null ? null : license.getIconUrl().toString())
+            .add("active", license.isActive())
+            .add("isDefault", license.isDefault())
+            .add("sortOrder", license.getSortOrder())
+            .add("rightsIdentifier", license.getRightsIdentifier())
+            .add("rightsIdentifierScheme", license.getRightsIdentifierScheme())
+            .add("schemeUri", license.getSchemeUri() == null ? null : license.getSchemeUri().toString())
+            .add("languageCode", license.getLanguageCode());
+    }
+
     public static Collector<String, JsonArrayBuilder, JsonArrayBuilder> stringsToJsonArray() {
         return new Collector<String, JsonArrayBuilder, JsonArrayBuilder>() {
 
@@ -781,6 +1382,30 @@ public Set<Collector.Characteristics> characteristics() {
         };
     }
 
+    public static JsonObjectBuilder json(Map<String, Long> map) {
+        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+        for (Map.Entry<String, Long> mapEntry : map.entrySet()) {
+            jsonObjectBuilder.add(mapEntry.getKey(), mapEntry.getValue());
+        }
+        return jsonObjectBuilder;
+    }
+
+    public static JsonObjectBuilder jsonFileCountPerAccessStatusMap(Map<FileSearchCriteria.FileAccessStatus, Long> map) {
+        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+        for (Map.Entry<FileSearchCriteria.FileAccessStatus, Long> mapEntry : map.entrySet()) {
+            jsonObjectBuilder.add(mapEntry.getKey().toString(), mapEntry.getValue());
+        }
+        return jsonObjectBuilder;
+    }
+
+    public static JsonObjectBuilder jsonFileCountPerTabularTagNameMap(Map<DataFileTag.TagType, Long> map) {
+        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+        for (Map.Entry<DataFileTag.TagType, Long> mapEntry : map.entrySet()) {
+            jsonObjectBuilder.add(mapEntry.getKey().toString(), mapEntry.getValue());
+        }
+        return jsonObjectBuilder;
+    }
+
     public static Collector<JsonObjectBuilder, ArrayList<JsonObjectBuilder>, JsonArrayBuilder> toJsonArray() {
         return new Collector<JsonObjectBuilder, ArrayList<JsonObjectBuilder>, JsonArrayBuilder>() {
 
@@ -835,7 +1460,7 @@ public static JsonObjectBuilder getChecksumTypeAndValue(DataFile.ChecksumType ch
             return null;
         }
     }
-    
+
     /**
      * Takes a map, returns a Json object for this map.
      * If map is {@code null}, returns {@code null}.
@@ -848,4 +1473,197 @@ public static JsonObjectBuilder mapToObject(Map<String,String> in) {
         in.keySet().forEach( k->b.add(k, in.get(k)) );
         return b;
     }
+
+
+    /**
+     * Get signposting from Dataset
+     * @param ds the designated Dataset
+     * @return json linkset
+     */
+    public static JsonObjectBuilder jsonLinkset(Dataset ds) {
+        return jsonObjectBuilder()
+                .add("anchor", ds.getPersistentURL())
+                .add("cite-as", Json.createArrayBuilder().add(jsonObjectBuilder().add("href", ds.getPersistentURL())))
+                .add("type", Json.createArrayBuilder().add(jsonObjectBuilder().add("href", "https://schema.org/AboutPage")))
+                .add("author", ds.getPersistentURL())
+                .add("protocol", ds.getProtocol())
+                .add("authority", ds.getAuthority())
+                .add("publisher", BrandingUtil.getInstallationBrandName())
+                .add("publicationDate", ds.getPublicationDateFormattedYYYYMMDD())
+                .add("storageIdentifier", ds.getStorageIdentifier());
+    }
+
+    private static JsonObjectBuilder jsonLicense(DatasetVersion dsv) {
+        JsonObjectBuilder licenseJsonObjectBuilder = jsonObjectBuilder()
+                .add("name", DatasetUtil.getLicenseName(dsv))
+                .add("uri", DatasetUtil.getLicenseURI(dsv));
+        String licenseIconUri = DatasetUtil.getLicenseIcon(dsv);
+        licenseJsonObjectBuilder.add("iconUri", licenseIconUri);
+        License license = DatasetUtil.getLicense(dsv);
+        if(license != null) {
+            licenseJsonObjectBuilder.add("rightsIdentifier",license.getRightsIdentifier())
+                .add("rightsIdentifierScheme",  license.getRightsIdentifierScheme())
+                .add("schemeUri", license.getSchemeUri())
+                .add("languageCode", license.getLanguageCode());
+        } else {
+            licenseJsonObjectBuilder.add("languageCode", BundleUtil.getDefaultLocale().getLanguage());
+        }
+        return licenseJsonObjectBuilder;
+    }
+
+    public static JsonArrayBuilder jsonDataverseFieldTypeInputLevels(List<DataverseFieldTypeInputLevel> inputLevels) {
+        JsonArrayBuilder jsonArrayOfInputLevels = Json.createArrayBuilder();
+        for (DataverseFieldTypeInputLevel inputLevel : inputLevels) {
+            NullSafeJsonBuilder inputLevelJsonObject = NullSafeJsonBuilder.jsonObjectBuilder();
+            inputLevelJsonObject.add("datasetFieldTypeName", inputLevel.getDatasetFieldType().getName());
+            inputLevelJsonObject.add("required", inputLevel.isRequired());
+            inputLevelJsonObject.add("include", inputLevel.isInclude());
+            inputLevelJsonObject.add("displayOnCreate", inputLevel.getDisplayOnCreate());
+            jsonArrayOfInputLevels.add(inputLevelJsonObject);
+        }
+        return jsonArrayOfInputLevels;
+    }
+
+    public static JsonArrayBuilder jsonDataverseInputLevels(List<DataverseFieldTypeInputLevel> inputLevels) {
+        JsonArrayBuilder inputLevelsArrayBuilder = Json.createArrayBuilder();
+        for (DataverseFieldTypeInputLevel inputLevel : inputLevels) {
+            inputLevelsArrayBuilder.add(jsonDataverseInputLevel(inputLevel));
+        }
+        return inputLevelsArrayBuilder;
+    }
+
+    private static JsonObjectBuilder jsonDataverseInputLevel(DataverseFieldTypeInputLevel inputLevel) {
+        NullSafeJsonBuilder jsonObjectBuilder = NullSafeJsonBuilder.jsonObjectBuilder();
+        jsonObjectBuilder.add("datasetFieldTypeName", inputLevel.getDatasetFieldType().getName());
+        jsonObjectBuilder.add("required", inputLevel.isRequired());
+        jsonObjectBuilder.add("include", inputLevel.isInclude());
+        jsonObjectBuilder.add("displayOnCreate", inputLevel.getDisplayOnCreate());
+        return jsonObjectBuilder;
+    }
+
+    public static JsonArrayBuilder jsonDataverseFeaturedItems(List<DataverseFeaturedItem> dataverseFeaturedItems) {
+        JsonArrayBuilder featuredItemsArrayBuilder = Json.createArrayBuilder();
+        for (DataverseFeaturedItem dataverseFeaturedItem : dataverseFeaturedItems) {
+            featuredItemsArrayBuilder.add(json(dataverseFeaturedItem));
+        }
+        return featuredItemsArrayBuilder;
+    }
+
+    public static JsonObjectBuilder json(DataverseFeaturedItem dataverseFeaturedItem) {
+        NullSafeJsonBuilder job = jsonObjectBuilder()
+                .add("id", dataverseFeaturedItem.getId())
+                .add("content", dataverseFeaturedItem.getContent())
+                .add("imageFileName", dataverseFeaturedItem.getImageFileName())
+                .add("imageFileUrl", dataverseFeaturedItem.getImageFileUrl())
+                .add("displayOrder", dataverseFeaturedItem.getDisplayOrder())
+                .add("type", dataverseFeaturedItem.getType());
+
+        DvObject dvObject = dataverseFeaturedItem.getDvObject();
+        if (dvObject != null) {
+            String identifier = null;
+            String displayName = null;
+    
+            if (dvObject.isInstanceofDataverse()) {
+                identifier = ((Dataverse) dvObject).getAlias();
+                displayName = ((Dataverse) dvObject).getName();
+            } else if (dvObject.isInstanceofDataset()) {
+                identifier = dvObject.getGlobalId() != null ? dvObject.getGlobalId().asString() : String.valueOf(dvObject.getId());
+                displayName = ((Dataset) dvObject).getCurrentName();
+            } else if (dvObject.isInstanceofDataFile()) {
+                identifier = String.valueOf(dvObject.getId());
+                displayName = ((DataFile) dvObject).getDisplayName();
+            }
+    
+            job.add("dvObjectIdentifier", identifier);
+            job.add("dvObjectDisplayName", displayName);
+        }
+        return job;
+    }
+
+    public static JsonArrayBuilder jsonTemplates(List<Template> templates) {
+        JsonArrayBuilder templatesArrayBuilder = Json.createArrayBuilder();
+        for (Template template : templates) {
+            templatesArrayBuilder.add(jsonTemplate(template));
+        }
+        return templatesArrayBuilder;
+    }
+
+    public static JsonObjectBuilder jsonTemplate(Template template) {
+        return jsonObjectBuilder()
+                .add("id", template.getId())
+                .add("name", template.getName())
+                .add("usageCount", template.getUsageCount())
+                .add("createTime", template.getCreateTime().toString())
+                .add("createDate", template.getCreateDate())
+                .add("termsOfUseAndAccess", jsonTermsOfUseAndAccess(template.getTermsOfUseAndAccess()))
+                .add("datasetFields", jsonByBlocks(template.getDatasetFields()))
+                .add("instructions", jsonTemplateInstructions(template.getInstructionsMap()))
+                .add("dataverseAlias", template.getDataverse().getAlias());
+    }
+
+    public static JsonObjectBuilder jsonTermsOfUseAndAccess(TermsOfUseAndAccess termsOfUseAndAccess) {
+        return jsonObjectBuilder()
+                .add("id", termsOfUseAndAccess.getId())
+                .add("license", json(termsOfUseAndAccess.getLicense()))
+                .add("termsOfUse", termsOfUseAndAccess.getTermsOfUse())
+                .add("termsOfAccess", termsOfUseAndAccess.getTermsOfAccess())
+                .add("confidentialityDeclaration", termsOfUseAndAccess.getConfidentialityDeclaration())
+                .add("specialPermissions", termsOfUseAndAccess.getSpecialPermissions())
+                .add("restrictions", termsOfUseAndAccess.getRestrictions())
+                .add("citationRequirements", termsOfUseAndAccess.getCitationRequirements())
+                .add("depositorRequirements", termsOfUseAndAccess.getDepositorRequirements())
+                .add("conditions", termsOfUseAndAccess.getConditions())
+                .add("disclaimer", termsOfUseAndAccess.getDisclaimer())
+                .add("dataAccessPlace", termsOfUseAndAccess.getDataAccessPlace())
+                .add("originalArchive", termsOfUseAndAccess.getOriginalArchive())
+                .add("availabilityStatus", termsOfUseAndAccess.getAvailabilityStatus())
+                .add("sizeOfCollection", termsOfUseAndAccess.getSizeOfCollection())
+                .add("studyCompletion", termsOfUseAndAccess.getStudyCompletion());
+    }
+
+    public static JsonArrayBuilder jsonTemplateInstructions(Map<String, String> templateInstructions) {
+        JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder();
+
+        for (Map.Entry<String, String> entry : templateInstructions.entrySet()) {
+            JsonObjectBuilder instructionObject = Json.createObjectBuilder()
+                    .add("instructionField", entry.getKey())
+                    .add("instructionText", entry.getValue());
+            jsonArrayBuilder.add(instructionObject);
+        }
+
+        return jsonArrayBuilder;
+    }
+
+    public static JsonArrayBuilder json(List<UserNotification> notifications, AuthenticatedUser authenticatedUser, boolean inAppNotificationFormat) {
+        JsonArrayBuilder notificationsArray = Json.createArrayBuilder();
+
+        for (UserNotification notification : notifications) {
+            NullSafeJsonBuilder notificationJson = jsonObjectBuilder();
+            UserNotification.Type type = notification.getType();
+
+            notificationJson.add("id", notification.getId());
+            notificationJson.add("type", type.toString());
+            notificationJson.add("displayAsRead", notification.isReadNotification());
+            notificationJson.add("sentTimestamp", notification.getSendDateTimestamp());
+
+            if (inAppNotificationFormat) {
+                inAppNotificationsJsonPrinter.addFieldsByType(notificationJson, authenticatedUser, notification);
+            } else {
+                Object relatedObject = mailService.getObjectOfNotification(notification);
+                if (relatedObject != null) {
+                    String subjectText = MailUtil.getSubjectTextBasedOnNotification(notification, relatedObject);
+                    String messageText = mailService.getMessageTextBasedOnNotification(
+                            notification, relatedObject, null, notification.getRequestor()
+                    );
+
+                    notificationJson.add("subjectText", subjectText);
+                    notificationJson.add("messageText", messageText);
+                }
+            }
+
+            notificationsArray.add(notificationJson);
+        }
+
+        return notificationsArray;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinterHelper.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinterHelper.java
new file mode 100644
index 00000000000..a9a05f1b699
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinterHelper.java
@@ -0,0 +1,51 @@
+package edu.harvard.iq.dataverse.util.json;
+
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevelServiceBean;
+import edu.harvard.iq.dataverse.MailServiceBean;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+
+/**
+ * This is a small helper bean
+ * As it is a singleton and built at application start (=deployment), it will inject the (stateless)
+ * settings service into the OREMap once it's ready.
+ */
+@Singleton
+@Startup
+public class JsonPrinterHelper {
+    @EJB
+    SettingsServiceBean settingsSvc;
+
+    @EJB
+    DatasetFieldServiceBean datasetFieldSvc;
+
+    @EJB
+    DataverseFieldTypeInputLevelServiceBean datasetFieldInpuLevelSvc;
+
+    @EJB
+    DatasetServiceBean datasetSvc;
+
+    @EJB
+    MailServiceBean mailSvc;
+
+    @EJB
+    InAppNotificationsJsonPrinter inAppNotificationsJsonPrinter;
+
+    @PostConstruct
+    public void injectService() {
+        JsonPrinter.injectSettingsService(
+                settingsSvc,
+                datasetFieldSvc,
+                datasetFieldInpuLevelSvc,
+                datasetSvc,
+                mailSvc,
+                inAppNotificationsJsonPrinter
+        );
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonUtil.java
index ae6935945e8..72a1cd2e1eb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonUtil.java
@@ -1,33 +1,40 @@
 package edu.harvard.iq.dataverse.util.json;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
+import jakarta.json.stream.JsonGenerator;
 
 public class JsonUtil {
 
     private static final Logger logger = Logger.getLogger(JsonUtil.class.getCanonicalName());
 
+    private JsonUtil() {}
+
     /**
      * Make an attempt at pretty printing a String but will return the original
      * string if it isn't JSON or if there is any exception.
      */
     public static String prettyPrint(String jsonString) {
         try {
-            com.google.gson.JsonParser jsonParser = new com.google.gson.JsonParser();
-            JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
-            Gson gson = new GsonBuilder().setPrettyPrinting().create();
-            String prettyJson = gson.toJson(jsonObject);
-            return prettyJson;
+            if (jsonString.trim().startsWith("{")) {
+                return prettyPrint(getJsonObject(jsonString));
+            } else {
+                return prettyPrint(getJsonArray(jsonString));
+            }
         } catch (Exception ex) {
             logger.info("Returning original string due to exception: " + ex);
             return jsonString;
@@ -45,7 +52,7 @@ public static String prettyPrint(JsonArray jsonArray) {
         return stringWriter.toString();
     }
 
-    public static String prettyPrint(javax.json.JsonObject jsonObject) {
+    public static String prettyPrint(JsonObject jsonObject) {
         Map<String, Boolean> config = new HashMap<>();
         config.put(JsonGenerator.PRETTY_PRINTING, true);
         JsonWriterFactory jsonWriterFactory = Json.createWriterFactory(config);
@@ -56,4 +63,72 @@ public static String prettyPrint(javax.json.JsonObject jsonObject) {
         return stringWriter.toString();
     }
 
+    /**
+     * Return the contents of the string as a JSON object.
+     * This method closes its resources when an exception occurs, but does
+     * not catch any exceptions.
+     * @param serializedJson the JSON object serialized as a {@code String}
+     * @throws JsonException when parsing fails.
+     * @see #getJsonObject(InputStream)
+     * @see #getJsonObjectFromFile(String)
+     * @see #getJsonArray(String)
+     */
+    public static JsonObject getJsonObject(String serializedJson) {
+        try (StringReader rdr = new StringReader(serializedJson)) {
+            try (JsonReader jsonReader = Json.createReader(rdr)) {
+                return jsonReader.readObject();
+            }
+        }
+    }
+
+    /**
+     * Return the contents of the {@link InputStream} as a JSON object.
+     *
+     * This method closes its resources when an exception occurs, but does
+     * not catch any exceptions.
+     * The caller of this method is responsible for closing the provided stream.
+     * @param stream the input stream to read from
+     * @throws JsonException when parsing fails.
+     * @see #getJsonObject(String)
+     * @see #getJsonObjectFromFile(String)
+     */
+    public static JsonObject getJsonObject(InputStream stream) {
+        try (JsonReader jsonReader = Json.createReader(stream)) {
+            return jsonReader.readObject();
+        }
+    }
+
+    /**
+     * Return the contents of the file as a JSON object.
+     * This method closes its resources when an exception occurs, but does
+     * not catch any exceptions.
+     * @param fileName the name of the file to read from
+     * @throws FileNotFoundException when the file cannot be opened for reading
+     * @throws JsonException when parsing fails.
+     * @see #getJsonObject(String)
+     * @see #getJsonObject(InputStream)
+     */
+    public static JsonObject getJsonObjectFromFile(String fileName) throws IOException {
+        try (FileReader rdr = new FileReader(fileName)) {
+            try (JsonReader jsonReader = Json.createReader(rdr)) {
+                return jsonReader.readObject();
+            }
+        }
+    }
+
+    /**
+     * Return the contents of the string as a JSON array.
+     * This method closes its resources when an exception occurs, but does
+     * not catch any exceptions.
+     * @param serializedJson the JSON array serialized as a {@code String}
+     * @throws JsonException when parsing fails.
+     * @see #getJsonObject(String)
+     */
+    public static JsonArray getJsonArray(String serializedJson) {
+        try (StringReader rdr = new StringReader(serializedJson)) {
+            try (JsonReader jsonReader = Json.createReader(rdr)) {
+                return jsonReader.readArray();
+            }
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/NullSafeJsonBuilder.java b/src/main/java/edu/harvard/iq/dataverse/util/json/NullSafeJsonBuilder.java
index 59a23a43452..f033e12e532 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/NullSafeJsonBuilder.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/NullSafeJsonBuilder.java
@@ -5,11 +5,11 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Timestamp;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
 
 /**
  * A JSON builder that drops any null values. If we didn't drop'em,
@@ -64,10 +64,14 @@ public NullSafeJsonBuilder add(String name, int value) {
 		return this;
 	}
 
+	public NullSafeJsonBuilder add(String name, Integer value) {
+		return (value != null) ? add(name, value.intValue()) : this;
+	}
+
 	public NullSafeJsonBuilder add(String name, Long value) {
         return ( value != null ) ? add(name, value.longValue()) : this;
     }
-    
+
 	@Override
 	public NullSafeJsonBuilder add(String name, long value) {
 		delegate.add(name, value);
@@ -85,7 +89,10 @@ public NullSafeJsonBuilder add(String name, boolean value) {
 		delegate.add(name, value);
 		return this;
 	}
-    
+	public NullSafeJsonBuilder add(String name, Boolean value) {
+		return (value != null) ? add(name, value.booleanValue()) : this;
+	}
+
 	@Override
 	public NullSafeJsonBuilder addNull(String name) {
 		delegate.addNull(name);
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlPrinter.java
index 7bdfc0dda6c..f253be1437a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlPrinter.java
@@ -1,16 +1,16 @@
 package edu.harvard.iq.dataverse.util.xml;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.util.logging.Logger;
+
+import javax.xml.XMLConstants;
 import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
-import org.xml.sax.InputSource;
+import javax.xml.transform.stream.StreamSource;
 
 public class XmlPrinter {
 
@@ -18,13 +18,29 @@ public class XmlPrinter {
 
     static public String prettyPrintXml(String xml) {
         try {
-            Transformer transformer = SAXTransformerFactory.newInstance().newTransformer();
+            TransformerFactory tf = TransformerFactory.newInstance();
+            // Set secure processing feature
+            tf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+            
+            tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+            Transformer transformer = tf.newTransformer();
+            // pretty print with indentation
             transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            // set amount of whitespace during indent
             transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-            Source source = new SAXSource(new InputSource(new ByteArrayInputStream(xml.getBytes())));
-            StreamResult streamResult = new StreamResult(new ByteArrayOutputStream());
-            transformer.transform(source, streamResult);
-            return new String(((ByteArrayOutputStream) streamResult.getOutputStream()).toByteArray());
+    
+            StreamSource source = new StreamSource(new StringReader(xml));
+            StringWriter output = new StringWriter();
+    
+            transformer.transform(source, new StreamResult(output));
+            
+            // This hacky hack is necessary due to https://bugs.openjdk.java.net/browse/JDK-7150637
+            // which has not been a problem before because of using old xercesImpl 2.8.0 library dated 2006.
+            // That old library contains security flaws, so the change was necessary.
+            return output
+                        .toString()
+                        .replaceFirst("encoding=\"UTF-8\"\\?>",
+                                      "encoding=\"UTF-8\"?>"+System.lineSeparator());
         } catch (IllegalArgumentException | TransformerException ex) {
             logger.info("Returning XML as-is due to problem pretty printing it: " + ex.toString());
             return xml;
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlUtil.java
new file mode 100644
index 00000000000..1dcc4c95499
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlUtil.java
@@ -0,0 +1,122 @@
+package edu.harvard.iq.dataverse.util.xml;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.stream.XMLInputFactory;
+
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+/**
+ * Utility class for XML processing with security settings to prevent XXE attacks.
+ */
+public class XmlUtil {
+    
+    private static final Logger logger = Logger.getLogger(XmlUtil.class.getCanonicalName());
+    
+    /**
+     * Creates and returns a DocumentBuilderFactory with security settings to prevent XXE attacks.
+     * 
+     * @return A secure DocumentBuilderFactory instance
+     */
+    public static DocumentBuilderFactory getSecureDocumentBuilderFactory() {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        
+        try {
+            // Disable DTDs (doctypes)
+            factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+            
+            // Disable external entities
+            factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+            factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+            
+            // Disable entity expansion
+            factory.setExpandEntityReferences(false);
+            factory.setXIncludeAware(false);
+            
+            // Additional security settings
+            factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+            
+        } catch (ParserConfigurationException pce) {
+            // Parser with specified options can't be built
+            logger.log(Level.SEVERE, "Failed to configure secure DocumentBuilderFactory: {0}", pce.getMessage());
+        }
+        
+        return factory;
+    }
+  
+    /**
+     * Creates and returns a DocumentBuilder with security settings to prevent XXE attacks.
+     * 
+     * @return A secure DocumentBuilder instance or null if configuration fails
+     */
+    public static DocumentBuilder getSecureDocumentBuilder() {
+        DocumentBuilderFactory factory = getSecureDocumentBuilderFactory();
+        try {
+            return factory.newDocumentBuilder();
+        } catch (ParserConfigurationException pce) {
+            // Parser with specified options can't be built
+            logger.log(Level.SEVERE, "Failed to create secure DocumentBuilder: {0}", pce.getMessage());
+            return null;
+        }
+    }
+    
+    /**
+     * Creates and returns a secure XMLReader with protection against XXE attacks.
+     * 
+     * @return A secure XMLReader instance
+     * @throws SAXException If there's an error creating the XMLReader
+     * @throws ParserConfigurationException If there's an error configuring the parser
+     */
+    public static XMLReader getSecureXMLReader() throws SAXException, ParserConfigurationException {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        
+        // Configure the parser factory with security features
+        spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        spf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        
+        // Create a secure parser
+        SAXParser parser = spf.newSAXParser();
+        
+        // Get the XMLReader from the parser
+        XMLReader reader = parser.getXMLReader();
+        
+        return reader;
+    }
+    
+    /**
+     * Creates and returns a secure XMLInputFactory with protection against XXE attacks.
+     * 
+     * @return A secure XMLInputFactory instance
+     */
+    public static XMLInputFactory getSecureXMLInputFactory() {
+        XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
+        
+        // Set coalescing to merge CDATA sections with adjacent text nodes
+        xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.TRUE);
+        
+        // Disable DTDs and external entities
+        xmlInputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
+        xmlInputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
+        
+        // Disable entity replacement
+        try {
+            xmlInputFactory.setProperty("javax.xml.stream.isSupportingExternalEntities", Boolean.FALSE);
+            xmlInputFactory.setProperty("javax.xml.stream.supportDTD", Boolean.FALSE);
+        } catch (IllegalArgumentException e) {
+            // Some implementations might not support these exact property names
+            logger.log(Level.FINE, "XMLInputFactory doesn't support some security properties, continuing with defaults", e);
+        }
+        
+        return xmlInputFactory;
+    }
+    
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlValidator.java b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlValidator.java
index 586ca50b6fd..b599c82ce8b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlValidator.java
@@ -24,10 +24,27 @@ public class XmlValidator {
     private static final Logger logger = Logger.getLogger(XmlValidator.class.getCanonicalName());
 
     public static boolean validateXmlSchema(String fileToValidate, URL schemaToValidateAgainst) throws MalformedURLException, SAXException, IOException {
+        
         Source xmlFile = new StreamSource(new File(fileToValidate));
+        return validateXmlSchema(xmlFile, schemaToValidateAgainst);
+    }
+    
+    public static boolean validateXmlSchema(Source xmlFile, URL schemaToValidateAgainst) throws MalformedURLException, SAXException, IOException {
         SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+        
+        try {
+            schemaFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+            // Additional protection
+            schemaFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+            schemaFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+            schemaFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        } catch (SAXException e) {
+            logger.warning("Could not set XML security features: " + e.getMessage());
+        }
+        
         Schema schema = schemaFactory.newSchema(schemaToValidateAgainst);
         Validator validator = schema.newValidator();
+
         try {
             validator.validate(xmlFile);
             logger.info(xmlFile.getSystemId() + " is valid");
@@ -47,7 +64,7 @@ public static boolean validateXmlSchema(String fileToValidate, URL schemaToValid
      * @throws Exception if the XML is not well-formed with a message about why.
      */
     public static boolean validateXmlWellFormed(String filename) throws Exception {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory factory = XmlUtil.getSecureDocumentBuilderFactory();
         factory.setValidating(false);
         factory.setNamespaceAware(true);
         DocumentBuilder builder = factory.newDocumentBuilder();
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java
new file mode 100644
index 00000000000..8ec426ead1f
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java
@@ -0,0 +1,167 @@
+package edu.harvard.iq.dataverse.util.xml;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.commons.lang3.StringUtils;
+
+import edu.harvard.iq.dataverse.ControlledVocabularyValue;
+import edu.harvard.iq.dataverse.DvObjectContainer;
+import edu.harvard.iq.dataverse.api.dto.DatasetVersionDTO;
+import edu.harvard.iq.dataverse.api.dto.FieldDTO;
+import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO;
+
+public class XmlWriterUtil {
+
+    public static void writeFullElementList(XMLStreamWriter xmlw, String name, List<String> values) throws XMLStreamException {
+        // For the simplest Elements we can
+        if (values != null && !values.isEmpty()) {
+            for (String value : values) {
+                xmlw.writeStartElement(name);
+                xmlw.writeCharacters(value);
+                xmlw.writeEndElement(); // labl
+            }
+        }
+    }
+
+    public static void writeI18NElementList(XMLStreamWriter xmlw, String name, List<String> values,
+            String fieldTypeName, String fieldTypeClass, String metadataBlockName, String lang)
+            throws XMLStreamException {
+
+        if (values != null && !values.isEmpty()) {
+            Locale defaultLocale = Locale.getDefault();
+            for (String value : values) {
+                if (fieldTypeClass.equals("controlledVocabulary")) {
+                    String localeVal = ControlledVocabularyValue.getLocaleStrValue(value, fieldTypeName, metadataBlockName, defaultLocale, false);
+                    if (localeVal != null) {
+
+                        value = localeVal;
+                        writeFullElement(xmlw, name, value, defaultLocale.getLanguage());
+                    } else {
+                        writeFullElement(xmlw, name, value);
+                    }
+                } else {
+                    writeFullElement(xmlw, name, value);
+                }
+            }
+            if (lang != null && !defaultLocale.getLanguage().equals(lang)) {
+                // Get values in dataset metadata language
+                // Loop before testing fieldTypeClass to be ready for external CVV
+                for (String value : values) {
+                    if (fieldTypeClass.equals("controlledVocabulary")) {
+                        String localeVal = ControlledVocabularyValue.getLocaleStrValue(value, fieldTypeName, metadataBlockName, new Locale(lang), false);
+                        if (localeVal != null) {
+                            writeFullElement(xmlw, name, localeVal, lang);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public static void writeI18NElement(XMLStreamWriter xmlw, String name, DatasetVersionDTO version,
+            String fieldTypeName, String lang) throws XMLStreamException {
+        // Get the default value
+        String val = dto2Primitive(version, fieldTypeName);
+        Locale defaultLocale = Locale.getDefault();
+        // Get the language-specific value for the default language
+        // A null value is returned if this is not a CVV field
+        String localeVal = dto2Primitive(version, fieldTypeName, defaultLocale);
+        String requestedLocaleVal = null;
+        if (lang != null && localeVal != null && !defaultLocale.getLanguage().equals(lang)) {
+            // Also get the value in the requested locale/lang if that's not the default
+            // lang.
+            requestedLocaleVal = dto2Primitive(version, fieldTypeName, new Locale(lang));
+        }
+        // FWIW locale-specific vals will only be non-null for CVV values (at present)
+        if (localeVal == null && requestedLocaleVal == null) {
+            // Not CVV/no translations so print without lang tag
+            writeFullElement(xmlw, name, val);
+        } else {
+            // Print in either/both languages if we have values
+            if (localeVal != null) {
+                // Print the value for the default locale with it's own lang tag
+                writeFullElement(xmlw, name, localeVal, defaultLocale.getLanguage());
+            }
+            // Also print in the request lang (i.e. the metadata language for the dataset)
+            // if a value exists, print it with a lang tag
+            if (requestedLocaleVal != null) {
+                writeFullElement(xmlw, name, requestedLocaleVal, lang);
+            }
+        }
+    }
+
+    public static String dto2Primitive(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName) {
+        for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
+            MetadataBlockDTO value = entry.getValue();
+            for (FieldDTO fieldDTO : value.getFields()) {
+                if (datasetFieldTypeName.equals(fieldDTO.getTypeName())) {
+                    return fieldDTO.getSinglePrimitive();
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String dto2Primitive(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName, Locale locale) {
+        for (Map.Entry<String, MetadataBlockDTO> entry : datasetVersionDTO.getMetadataBlocks().entrySet()) {
+            MetadataBlockDTO value = entry.getValue();
+            for (FieldDTO fieldDTO : value.getFields()) {
+                if (datasetFieldTypeName.equals(fieldDTO.getTypeName())) {
+                    String rawVal = fieldDTO.getSinglePrimitive();
+                    if (fieldDTO.isControlledVocabularyField()) {
+                        return ControlledVocabularyValue.getLocaleStrValue(rawVal, datasetFieldTypeName, value.getName(),
+                                locale, false);
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    public static void writeFullElement(XMLStreamWriter xmlw, String name, String value) throws XMLStreamException {
+        writeFullElement(xmlw, name, value, null);
+    }
+
+    public static void writeFullElement(XMLStreamWriter xmlw, String name, String value, String lang) throws XMLStreamException {
+        // For the simplest Elements we can
+        if (!StringUtils.isEmpty(value)) {
+            xmlw.writeStartElement(name);
+            if (DvObjectContainer.isMetadataLanguageSet(lang)) {
+                writeAttribute(xmlw, "xml:lang", lang);
+            }
+            xmlw.writeCharacters(value);
+            xmlw.writeEndElement(); // labl
+        }
+    }
+
+    public static void writeAttribute(XMLStreamWriter xmlw, String name, String value) throws XMLStreamException {
+        if (!StringUtils.isEmpty(value)) {
+            xmlw.writeAttribute(name, value);
+        }
+    }
+
+
+    public static void writeFullElementWithAttributes(XMLStreamWriter xmlw, String name, Map<String, String> attributeMap, String value) throws XMLStreamException {
+        if (!StringUtils.isEmpty(value)) {
+            xmlw.writeStartElement(name);
+            for (String key : attributeMap.keySet()) {
+                writeAttribute(xmlw, key, attributeMap.get(key));
+            }
+            xmlw.writeCharacters(value);
+            xmlw.writeEndElement(); // labl
+        }
+    }
+
+    public static boolean writeOpenTagIfNeeded(XMLStreamWriter xmlw, String tag, boolean element_check) throws XMLStreamException {
+        // check if the current tag isn't opened
+        if (!element_check) {
+            xmlw.writeStartElement(tag); // <value of tag>
+        }
+        return true;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/xml/html/HtmlFormatUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/xml/html/HtmlFormatUtil.java
new file mode 100644
index 00000000000..432cf68db53
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/xml/html/HtmlFormatUtil.java
@@ -0,0 +1,133 @@
+/*
+   Copyright (C) 2005-2012, by the President and Fellows of Harvard College.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   Dataverse Network - A web application to share, preserve and analyze research data.
+   Developed at the Institute for Quantitative Social Science, Harvard University.
+   Version 3.0.
+*/
+package edu.harvard.iq.dataverse.util.xml.html;
+
+/**
+ * A simple utility that generates formatted HTML
+ * to avoid hard-coding html tags by hand. 
+ * 
+ * @author leonid@hmdc.harvard.edu
+ */
+public class HtmlFormatUtil  implements java.io.Serializable {
+    public static final String HTML_DOCTYPE_HEADER = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">";
+    public static final String HTML_TAG = "html";
+    public static final String HTML_HEAD = "head";
+    public static final String HTML_BODY = "body";
+    public static final String HTML_TITLE = "title";
+    public static final String HTML_TABLE = "table";
+    public static final String HTML_TABLE_ROW = "tr";
+    public static final String HTML_TABLE_HDR = "th";
+    public static final String HTML_TABLE_CELL = "td";
+    public static final String HTML_LINK = "a";
+    public static final String HTML_HREF = "href";
+    public static final String HTML_H1 = "h1";
+    
+    public static final String HTML_ALIGN_TOP = "valign=\"top\"";
+    public static final String HTML_ALIGN_RIGHT = "align=\"right\""; 
+    
+    public static String formatTable (String tableBody) {
+        return formatTag(tableBody, HTML_TABLE);
+    }
+    
+    public static String formatTableRow (String entry) {
+        return formatTag(entry, HTML_TABLE_ROW);
+    }
+    
+    public static String formatTableCell (String entry) {
+        return formatTag(entry, HTML_TABLE_CELL, null);
+    }
+    
+    public static String formatTableCell (String entry, String attr) {
+        return formatTag(entry, HTML_TABLE_CELL, attr);
+    }
+    
+    public static String formatTableCellValignTop(String entry) {
+        return formatTableCell (entry, HTML_ALIGN_TOP); 
+    }
+    
+    public static String formatTableCellAlignRight(String entry) {
+        return formatTableCell (entry, HTML_ALIGN_RIGHT);
+    }
+    
+    public static String formatLink(String name, String url) {
+        String href = HTML_HREF + "=\"" + url + "\""; 
+        
+        return formatTag(name, HTML_LINK, href);
+    }
+    
+    public static String formatTitle(String title) {
+        return formatTag(title, HTML_TITLE);
+    }
+    
+    public static String formatTag(String entry, String tag) {
+        return formatTag(entry, tag, null);
+    }
+    
+    public static String formatTag(String entry, String tag, String attributes) {
+        StringBuilder sb = new StringBuilder(); 
+        sb.append('<');
+        sb.append(tag);
+        
+        if (attributes != null) {
+            sb.append(" "+attributes);
+        }
+        
+        sb.append('>');
+        sb.append(entry);
+        sb.append("</");
+        sb.append(tag);
+        sb.append('>');
+        
+        return sb.toString();
+    }
+    
+    public static String formatTagOpen(String tag) {
+        StringBuilder sb = new StringBuilder(); 
+        sb.append('<');
+        sb.append(tag);
+        sb.append('>');
+        return sb.toString();
+    }
+    
+    public static String formatTagClose(String tag) {
+        StringBuilder sb = new StringBuilder(); 
+        sb.append("</");
+        sb.append(tag);
+        sb.append('>');
+        return sb.toString();
+    }
+    
+    public static String formatDoc(String header, String body) {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append(HTML_DOCTYPE_HEADER);
+        sb.append("\n");
+        sb.append(formatTagOpen(HTML_TAG));
+        
+        sb.append(formatTag(header, HTML_HEAD));
+        sb.append("\n");
+        sb.append(formatTag(body, HTML_BODY));
+        sb.append("\n");
+        sb.append(formatTagClose(HTML_TAG));
+        sb.append("\n");
+        return sb.toString();
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/EMailValidator.java b/src/main/java/edu/harvard/iq/dataverse/validation/EMailValidator.java
new file mode 100644
index 00000000000..446f55a193f
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/validation/EMailValidator.java
@@ -0,0 +1,35 @@
+package edu.harvard.iq.dataverse.validation;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+import org.apache.commons.validator.routines.EmailValidator;
+
+/**
+ *
+ * @author skraffmi
+ */
+public class EMailValidator implements ConstraintValidator<ValidateEmail, String> {
+    
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext context) {
+        return isEmailValid(value);
+    }
+    
+    /**
+     * Validate an email address in a null safe way (null = valid).
+     * (Null is valid to allow for optional values - use @NotNull to enforce!)
+     * @param value The email address to validate
+     * @return true when valid, false when invalid (null = valid!)
+     */
+    public static boolean isEmailValid(String value) {
+        // Must be looked up here - otherwise changes are not picked up (tests, live config, ...)
+        final boolean mtaSupportsUTF8 = JvmSettings.MAIL_MTA_SUPPORT_UTF8.lookup(Boolean.class);
+        return value == null || (EmailValidator.getInstance().isValid(value) &&
+            // If the MTA isn't able to handle UTF-8 mail addresses following RFC 6530/6531/6532, we can only declare
+            // mail addresses using 7bit ASCII (RFC 821) as valid.
+            // Beyond scope for Apache Commons Validator, see also https://issues.apache.org/jira/browse/VALIDATOR-487
+            (value.codePoints().noneMatch(c -> c > 127) || mtaSupportsUTF8) );
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/JSONDataValidation.java b/src/main/java/edu/harvard/iq/dataverse/validation/JSONDataValidation.java
new file mode 100644
index 00000000000..fb19a14e7de
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/validation/JSONDataValidation.java
@@ -0,0 +1,190 @@
+package edu.harvard.iq.dataverse.validation;
+
+import com.mashape.unirest.http.JsonNode;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.enterprise.inject.spi.CDI;
+import org.everit.json.schema.Schema;
+import org.everit.json.schema.ValidationException;
+import org.json.JSONArray;
+
+import java.util.*;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+public class JSONDataValidation {
+    private static final Logger logger = Logger.getLogger(JSONDataValidation.class.getCanonicalName());
+    private static DatasetFieldServiceBean datasetFieldService = null;
+
+    /**
+     *
+     * @param schema Schema file defining the JSON objects to be validated
+     * @param jsonInput JSON string to validate against the schema
+     * @throws ValidationException
+     */
+    public static void validate(Schema schema, Map<String, Map<String, List<String>>> schemaChildMap, String jsonInput) throws ValidationException {
+        if (datasetFieldService == null) {
+            datasetFieldService = CDI.current().select(DatasetFieldServiceBean.class).get();
+        }
+        JsonNode node = new JsonNode(jsonInput);
+        if (node.isArray()) {
+            JSONArray arrayNode = node.getArray();
+            validateObject(schema, schemaChildMap, "root", arrayNode.toList());
+        } else {
+            node.getObject().toMap().forEach((k,v) -> {
+                validateObject(schema, schemaChildMap, k, (v instanceof JSONArray) ? ((JSONArray) v).toList() : v);
+            });
+        }
+    }
+
+    /*
+     * Validate objects recursively
+     */
+    private static void validateObject(Schema schema, Map<String, Map<String,List<String>>> schemaChildMap, String key, Object value) {
+        if (value instanceof Map<?,?>) {
+            validateSchemaObject(schema, schemaChildMap, key, (Map) value);
+
+            ((Map<?, ?>) value).entrySet().forEach(e -> {
+                validateObject(schema, schemaChildMap, (String) e.getKey(), e.getValue());
+            });
+        } else if (value instanceof List) {
+            ((List<?>) value).listIterator().forEachRemaining(v -> {
+                validateObject(schema, schemaChildMap, key, v);
+            });
+        }
+    }
+
+    /*
+     * Validate objects specific to a type. Currently only validating Datasets
+     */
+    private static void validateSchemaObject(Schema schema, Map<String, Map<String,List<String>>> schemaChildMap, String key, Map valueMap) {
+        if (schema.definesProperty("datasetVersion")) {
+            validateDatasetObject(schema, schemaChildMap, key, valueMap);
+        }
+    }
+
+    /*
+     * Specific validation for Dataset objects
+     */
+    private static void validateDatasetObject(Schema schema, Map<String, Map<String,List<String>>> schemaChildMap, String key, Map valueMap) {
+        if (valueMap != null && valueMap.containsKey("typeClass")) {
+            validateTypeClass(schema, schemaChildMap, key, valueMap, valueMap.get("value"), "dataset");
+        }
+    }
+
+    /*
+     * key: The name of the parent object
+     * valueMap: Map of all the metadata of the object
+     * value: The value field of the object
+     * messageType: Refers to the parent: if this is an object from a dataset the messageType would be 'dataset'
+     *              This needs to match the Bundle.properties for mapping the error messages when an exception occurs
+     *
+     *  Rules for typeClass:
+     *      The contents of value depend on the field attributes
+     *      if single/primitive, value is a String
+     *      if multiple, value is a JsonArray
+     *         multiple/primitive: each JsonArray element will contain String
+     *         multiple/compound: each JsonArray element will contain Set of FieldDTOs
+     */
+    private static void validateTypeClass(Schema schema, Map<String, Map<String,List<String>>> schemaChildMap, String key, Map valueMap, Object value, String messageType) {
+
+        String typeClass = valueMap.containsKey("typeClass") ? valueMap.get("typeClass").toString() : "";
+        String typeName = valueMap.containsKey("typeName") ? valueMap.get("typeName").toString() : "";
+        boolean multiple = Boolean.valueOf(String.valueOf(valueMap.getOrDefault("multiple", "false")));
+
+        // make sure there is a value since 'value' is required
+        if (value == null) {
+            throwValidationException("value.missing", List.of(key, typeName));
+        }
+
+        if (multiple && !(value instanceof List<?>)) {
+            throwValidationException("notlist.multiple", List.of(key, typeName, typeClass));
+        }
+        if (!multiple && value instanceof List<?>) {
+            throwValidationException("list.notmultiple", List.of(key, typeName));
+        }
+        if ("primitive".equals(typeClass) && !multiple && !(value instanceof String)) {
+            throwValidationException("type", List.of(key, typeName, typeClass));
+        }
+        if ("primitive".equals(typeClass) && multiple) {
+            ((List<?>) value).listIterator().forEachRemaining(primitive -> {
+                if (!(primitive instanceof String)) {
+                    throwValidationException("type", List.of(key, typeName, typeClass));
+                }
+            });
+        }
+        if ("compound".equals(typeClass)) {
+            if (multiple && value instanceof List<?>) {
+                ((List<?>) value).listIterator().forEachRemaining(item -> {
+                    if (!(item instanceof Map<?, ?>)) {
+                        throwValidationException("compound", List.of(key, typeName, typeClass));
+                    } else {
+                        ((Map) item).forEach((k,val) -> {
+                            if (!(val instanceof Map<?, ?>)) {
+                                throwValidationException("compound", List.of(key, typeName, typeClass));
+                            }
+                            // validate mismatch between compound object key and typeName in value
+                            String valTypeName = ((Map<?, ?>) val).containsKey("typeName") ? (String) ((Map<?, ?>) val).get("typeName") : "";
+                            if (!k.equals(valTypeName)) {
+                                throwValidationException("compound.mismatch", List.of((String) k, valTypeName));
+                            }
+                        });
+                        validateChildren(schema, schemaChildMap, key, ((Map) item).values(), typeName, messageType);
+                    }
+                });
+            }
+        }
+
+        if ("controlledVocabulary".equals(typeClass)) {
+            DatasetFieldType dsft = datasetFieldService.findByName(typeName);
+            if (value instanceof List<?>) {
+                ((List<?>) value).listIterator().forEachRemaining(cvv -> {
+                    if (datasetFieldService.findControlledVocabularyValueByDatasetFieldTypeAndStrValue(dsft, (String) cvv, true) == null) {
+                        throwValidationException("dataset", "cvv.missing", List.of(key, typeName, (String) cvv));
+                    }
+                });
+            } else {
+                if (datasetFieldService.findControlledVocabularyValueByDatasetFieldTypeAndStrValue(dsft, (String) value, true) == null) {
+                    throwValidationException("dataset", "cvv.missing", List.of(key, typeName, (String) value));
+                }
+            }
+        }
+    }
+
+    // If value is another object or list of objects that need to be further validated then childType refers to the parent
+    // Example: If this is a dsDescriptionValue from a dataset the messageType would be dataset.dsDescriptionValue
+    // This needs to match the Bundle.properties for mapping the error messages when an exception occurs
+    private static void validateChildren(Schema schema, Map<String, Map<String,List<String>>> schemaChildMap, String key, Collection<Object> children, String typeName, String messageType) {
+        if (children == null || children.isEmpty()) {
+            return;
+        }
+        List<String> requiredFields = new ArrayList<>();
+        requiredFields.addAll((List)schemaChildMap.getOrDefault(typeName, Collections.EMPTY_MAP).getOrDefault("required", Collections.EMPTY_LIST));
+        List<String> allowedFields = (List)schemaChildMap.getOrDefault(typeName, Collections.EMPTY_MAP).getOrDefault("allowed", Collections.EMPTY_LIST);
+        children.forEach(child -> {
+            if (child instanceof Map<?, ?>) {
+                String childTypeName = ((Map<?, ?>) child).containsKey("typeName") ? (String)((Map<?, ?>) child).get("typeName") : "";
+                if (!allowedFields.isEmpty() && !allowedFields.contains(childTypeName)) {
+                    throwValidationException(messageType, "invalidType", List.of(typeName, childTypeName, allowedFields.stream().collect(Collectors.joining(", "))));
+                }
+                if (!requiredFields.isEmpty() && requiredFields.contains(childTypeName)) {
+                    requiredFields.remove(childTypeName);
+                }
+            }
+        });
+        if (!requiredFields.isEmpty()) {
+            throwValidationException(messageType, "required.missing", List.of(typeName, requiredFields.stream().collect(Collectors.joining(", ")), typeName));
+        }
+    }
+    private static void throwValidationException(String key, List<String> argList) {
+        throw new ValidationException(BundleUtil.getStringFromBundle("schema.validation.exception." + key, argList));
+    }
+    private static void throwValidationException(String type, String message, List<String> argList) {
+        if (type != null) {
+            throwValidationException(type + "." + message, argList);
+        } else {
+            throwValidationException(message, argList);
+        }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorServiceBean.java
index 468fa7c72e2..bbe7d135e0f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorServiceBean.java
@@ -13,14 +13,15 @@
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.inject.Named;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
 import org.passay.CharacterCharacteristicsRule;
 import org.passay.CharacterRule;
 import org.passay.DictionaryRule;
@@ -83,8 +84,7 @@ private enum ValidatorTypes {
         GoodStrengthValidator, StandardValidator
     }
 
-    @SuppressWarnings("unchecked")
-    private final static LinkedHashMap<ValidatorTypes, PasswordValidator> validators = new LinkedHashMap(2);
+    private static final Map<ValidatorTypes, PasswordValidator> validators = new LinkedHashMap<>(2);
     private int goodStrength;
     private int maxLength;
     private int minLength;
@@ -100,7 +100,7 @@ private enum ValidatorTypes {
     public PasswordValidatorServiceBean() {
         final Properties properties = PropertiesMessageResolver.getDefaultProperties();
         properties.setProperty(GoodStrengthRule.ERROR_CODE_GOODSTRENGTH, GoodStrengthRule.ERROR_MESSAGE_GOODSTRENGTH);
-         messageResolver = new PropertiesMessageResolver(properties);
+        messageResolver = new PropertiesMessageResolver(properties);
     }
 
     public PasswordValidatorServiceBean(List<CharacterRule> characterRules) {
@@ -146,11 +146,9 @@ public List<String> validate(String password, Date passwordModificationTime) {
      * @return A List with error messages. Empty when the password is valid.
      */
     public List<String> validate(String password, Date passwordModificationTime, boolean isHumanReadable) {
-//    public List<String> validate(String password, boolean isHumanReadable) {
 
         init();
-        final PasswordData passwordData = PasswordData.newInstance(password, String.valueOf(passwordModificationTime.getTime()), null);
-//        final PasswordData passwordData = PasswordData.newInstance(password, "username", null);
+        final PasswordData passwordData = new PasswordData(password);
         final RuleResult result = new RuleResult();
 
         for (PasswordValidator currentUser : validators.values()) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtil.java b/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtil.java
index 6d78ab44a5f..9a4f1610e62 100644
--- a/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtil.java
@@ -5,7 +5,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.passay.CharacterRule;
 import org.passay.EnglishCharacterData;
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/URLValidator.java b/src/main/java/edu/harvard/iq/dataverse/validation/URLValidator.java
new file mode 100644
index 00000000000..55f69ee1471
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/validation/URLValidator.java
@@ -0,0 +1,50 @@
+package edu.harvard.iq.dataverse.validation;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import org.apache.commons.validator.routines.UrlValidator;
+
+/**
+ *
+ * @author skraffmi
+ */
+//Not currently used except in tests
+public class URLValidator implements ConstraintValidator<ValidateURL, String> {
+
+    private String[] allowedSchemes;
+    @Override
+    public void initialize(ValidateURL constraintAnnotation) {
+        this.allowedSchemes = constraintAnnotation.schemes();
+    }
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext context) {
+        return isURLValid(value, this.allowedSchemes);
+    }
+    
+    /**
+     * Check if a URL is valid in a nullsafe way. (null = valid to allow optional values).
+     * Empty values are no valid URLs. This variant allows default schemes HTTP, HTTPS and FTP.
+     *
+     * @param value The URL to validate
+     * @return true when valid (null is also valid) or false
+     */
+    public static boolean isURLValid(String value) {
+        // default schemes == ValidateURL schemes() default
+        return isURLValid(value, new String[]{"http", "https", "ftp"});
+    }
+    
+    /**
+     * Check if a URL is valid in a nullsafe way. (null = valid to allow optional values).
+     * Empty values are no valid URLs. This variant allows any schemes you hand over.
+     *
+     * @param value The URL to validate
+     * @param schemes The list of allowed schemes
+     * @return true when valid (null is also valid) or false
+     */
+    public static boolean isURLValid(String value, String[] schemes) {
+        UrlValidator urlValidator = new UrlValidator(schemes, UrlValidator.ALLOW_2_SLASHES);
+        return value == null || urlValidator.isValid(value);
+    }
+
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/UserNameValidator.java b/src/main/java/edu/harvard/iq/dataverse/validation/UserNameValidator.java
new file mode 100644
index 00000000000..873512299ea
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/validation/UserNameValidator.java
@@ -0,0 +1,49 @@
+package edu.harvard.iq.dataverse.validation;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * This class is not implementing the ConstraintValidatorMatcher interface, as this is not necessary any more.
+ * It serves as the storage for the annotation configuration and convenient interface to a programmatic
+ * validation of usernames.
+ */
+public class UserNameValidator {
+    
+    public static final int MIN_CHARS = 2;
+    public static final int MAX_CHARS = 60;
+    
+    // NOTE: the size is checked by either the @Size annotation of @ValidateUserName or programmatically below!
+    public static final String USERNAME_PATTERN = "[a-zA-Z0-9\\_\\-\\.]*";
+    
+    /*
+     * If you would like to support accents or chinese characters in usernames, choose one of the below.
+     *
+     * With support for accents:
+    private static final String USERNAME_PATTERN = "[a-zA-Z0-9\\_\\-\\.À-Ãŋ\\u00C0-\\u017F]";
+     *
+     * With support for chinese characters:
+    private static final String USERNAME_PATTERN = "[a-zA-Z0-9\\_\\-\\.\\x{4e00}-\\x{9fa5}]";
+     */
+    
+    private static final Matcher usernameMatcher = Pattern.compile(USERNAME_PATTERN).matcher("");
+
+    /**
+     * Validate a username against the pattern in {@link #USERNAME_PATTERN}
+     * and check for length: min {@link #MIN_CHARS} chars, max {@link #MAX_CHARS} chars.
+     * Nullsafe - null is considered invalid (as is empty).
+     *
+     * @param username The username to validate
+     * @return true if matching, false otherwise
+     */
+    public static boolean isUserNameValid(final String username) {
+        return username != null &&
+               username.length() >= MIN_CHARS &&
+               username.length() <= MAX_CHARS &&
+               usernameMatcher.reset(username).matches();
+    }
+
+}
+
+
+
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/ValidateEmail.java b/src/main/java/edu/harvard/iq/dataverse/validation/ValidateEmail.java
new file mode 100644
index 00000000000..6ec677bd7a8
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/validation/ValidateEmail.java
@@ -0,0 +1,31 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse.validation;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+/**
+ *
+ * @author skraffmi
+ */
+@Target({FIELD})
+@Retention(RUNTIME)
+@Constraint(validatedBy = {EMailValidator.class})
+@Documented
+public @interface ValidateEmail {
+  String message() default "'${validatedValue}' {email.invalid}";
+
+  Class<?>[] groups() default {};
+
+  Class<? extends Payload>[] payload() default {};
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/ValidateURL.java b/src/main/java/edu/harvard/iq/dataverse/validation/ValidateURL.java
new file mode 100644
index 00000000000..7c368ea3934
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/validation/ValidateURL.java
@@ -0,0 +1,25 @@
+
+package edu.harvard.iq.dataverse.validation;
+
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.FIELD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+@Target({FIELD})
+@Retention(RUNTIME)
+@Constraint(validatedBy = {URLValidator.class})
+@Documented
+//Not currently used except in tests
+public @interface ValidateURL {
+    String message() default "'${validatedValue}' {url.invalid}";
+    String[] schemes() default {"http", "https", "ftp"};
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/ValidateUserName.java b/src/main/java/edu/harvard/iq/dataverse/validation/ValidateUserName.java
new file mode 100644
index 00000000000..6307edd073a
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/validation/ValidateUserName.java
@@ -0,0 +1,41 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package edu.harvard.iq.dataverse.validation;
+
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.FIELD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.Pattern;
+
+/**
+ *
+ * @author sarahferry
+ */
+
+@Target({FIELD})
+@Retention(RUNTIME)
+// This is empty by intention - we are just recombining existing bean validation here.
+// The class UserNameValidator is just for convenience and historic reasons.
+@Constraint(validatedBy = {})
+
+@NotBlank(message = "{user.enterUsername}")
+@Size(min = UserNameValidator.MIN_CHARS, max = UserNameValidator.MAX_CHARS, message = "{user.usernameLength}")
+@Pattern(regexp = UserNameValidator.USERNAME_PATTERN, message = "{user.illegalCharacters}")
+
+@Documented
+public @interface ValidateUserName {
+    String message() default "";
+    
+    Class<?>[] groups() default {};
+    
+    Class<? extends Payload>[] payload() default {};
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/PendingWorkflowInvocation.java b/src/main/java/edu/harvard/iq/dataverse/workflow/PendingWorkflowInvocation.java
index fed77988db3..94fefa9bc13 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/PendingWorkflowInvocation.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/PendingWorkflowInvocation.java
@@ -9,14 +9,14 @@
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
 
 /**
  * A workflow whose current step waits for an external system to complete a
@@ -51,7 +51,11 @@ public class PendingWorkflowInvocation implements Serializable {
     String ipAddress;
     int typeOrdinal;
     boolean datasetExternallyReleased;
+    
+    long lockid;
 
+    public static final String AUTHORIZED= "authorized";
+                
     /** Empty constructor for JPA */
     public PendingWorkflowInvocation(){
         
@@ -68,13 +72,13 @@ public PendingWorkflowInvocation(Workflow wf, WorkflowContext ctxt, Pending resu
         localData = new HashMap<>(result.getData());
         typeOrdinal = ctxt.getType().ordinal();
         datasetExternallyReleased=ctxt.getDatasetExternallyReleased();
+        lockid=ctxt.getLockId();
     }
     
     public WorkflowContext reCreateContext(RoleAssigneeServiceBean roleAssignees) {
         DataverseRequest aRequest = new DataverseRequest((User)roleAssignees.getRoleAssignee(userId), IpAddress.valueOf(ipAddress));
         final WorkflowContext workflowContext = new WorkflowContext(aRequest, dataset, nextVersionNumber, 
-                nextMinorVersionNumber, WorkflowContext.TriggerType.values()[typeOrdinal], null, null, datasetExternallyReleased);
-        workflowContext.setInvocationId(invocationId);
+                nextMinorVersionNumber, WorkflowContext.TriggerType.values()[typeOrdinal], null, null, datasetExternallyReleased, invocationId, lockid);
         return workflowContext;
     }
     
@@ -157,4 +161,11 @@ public int getTypeOrdinal() {
     public void setTypeOrdinal(int typeOrdinal) {
         this.typeOrdinal = typeOrdinal;
     }
+    
+    public long getLockId() {
+        return lockid;
+    }
+    public void setLockId(long lockId) {
+        this.lockid = lockId;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/Workflow.java b/src/main/java/edu/harvard/iq/dataverse/workflow/Workflow.java
index 6c73ed0e64b..bd32c517bc6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/Workflow.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/Workflow.java
@@ -6,16 +6,16 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
 
 /**
  * A list of steps that can be executed with a given context. 
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowContext.java b/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowContext.java
index 6ea87a27013..a0aee4cb4c9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowContext.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowContext.java
@@ -31,6 +31,7 @@ public enum TriggerType {
     private final ApiToken apiToken;
     private final boolean datasetExternallyReleased;
     private Map<String, Object> settings;
+    private Long lockId = null;
     
     private String invocationId = UUID.randomUUID().toString();
 
@@ -40,9 +41,13 @@ public WorkflowContext( DataverseRequest aRequest, Dataset aDataset, TriggerType
                 aDataset.getLatestVersion().getMinorVersionNumber(),
                 aTriggerType, null, null, datasetExternallyReleased);
     }
-    
     public WorkflowContext(DataverseRequest request, Dataset dataset, long nextVersionNumber, 
-                            long nextMinorVersionNumber, TriggerType type, Map<String, Object> settings, ApiToken apiToken, boolean datasetExternallyReleased) {
+            long nextMinorVersionNumber, TriggerType type, Map<String, Object> settings, ApiToken apiToken, boolean datasetExternallyReleased) {
+        this(request, dataset, nextVersionNumber,nextMinorVersionNumber, type, settings, apiToken, datasetExternallyReleased, null, null);
+    }
+
+    public WorkflowContext(DataverseRequest request, Dataset dataset, long nextVersionNumber, 
+                            long nextMinorVersionNumber, TriggerType type, Map<String, Object> settings, ApiToken apiToken, boolean datasetExternallyReleased, String invocationId, Long lockId) {
         this.request = request;
         this.dataset = dataset;
         this.nextVersionNumber = nextVersionNumber;
@@ -51,6 +56,13 @@ public WorkflowContext(DataverseRequest request, Dataset dataset, long nextVersi
         this.settings = settings;
         this.apiToken = apiToken;
         this.datasetExternallyReleased = datasetExternallyReleased;
+        //If null, we'll keep the randomly generated one
+        if(invocationId!=null) {
+            setInvocationId(invocationId);
+        }
+        if(lockId != null) {
+          this.setLockId(lockId);
+        }
     }
 
     public Dataset getDataset() {
@@ -96,5 +108,11 @@ public ApiToken getApiToken() {
     public boolean getDatasetExternallyReleased() {
        return datasetExternallyReleased;
     }
+    public Long getLockId() {
+        return lockId;
+    }
+    public void setLockId(Long lockId) {
+        this.lockId = lockId;
+    }
     
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowServiceBean.java
index 725aa28d09b..757d447b60a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowServiceBean.java
@@ -1,42 +1,48 @@
 package edu.harvard.iq.dataverse.workflow;
 
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetLock;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
+import edu.harvard.iq.dataverse.DvObjectServiceBean;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
 import edu.harvard.iq.dataverse.RoleAssigneeServiceBean;
+import edu.harvard.iq.dataverse.UserNotification;
+import edu.harvard.iq.dataverse.UserNotificationServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.FinalizeDatasetPublicationCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.RemoveLockCommand;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.workflow.WorkflowContext.TriggerType;
 import edu.harvard.iq.dataverse.workflow.internalspi.InternalWorkflowStepSP;
 import edu.harvard.iq.dataverse.workflow.step.Failure;
 import edu.harvard.iq.dataverse.workflow.step.Pending;
+import edu.harvard.iq.dataverse.workflow.step.Success;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStep;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepData;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
+import edu.harvard.iq.dataverse.workflows.WorkflowComment;
 
-import java.util.Date;
+import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.Asynchronous;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 
 /**
  * Service bean for managing and executing {@link Workflow}s
@@ -54,13 +60,22 @@ public class WorkflowServiceBean {
     
     @EJB
     DatasetServiceBean datasets;
+    
+    @EJB
+    DvObjectServiceBean dvObjects;
 
     @EJB
     SettingsServiceBean settings;
 
     @EJB
     RoleAssigneeServiceBean roleAssignees;
+    
+    @EJB 
+    SystemConfig systemConfig;
 
+    @EJB
+    UserNotificationServiceBean userNotificationService;
+    
     @EJB
     EjbDataverseEngine engine;
     
@@ -95,10 +110,50 @@ public WorkflowServiceBean() {
      * @param ctxt the context in which the workflow is executed.
      * @throws CommandException If the dataset could not be locked.
      */
+    //ToDo - should this be @Async? or just the forward() method?
     @Asynchronous
-    public void start(Workflow wf, WorkflowContext ctxt) throws CommandException {
-        ctxt = refresh(ctxt, retrieveRequestedSettings( wf.getRequiredSettings()), getCurrentApiToken(ctxt.getRequest().getAuthenticatedUser()));
-        lockDataset(ctxt);
+    public void start(Workflow wf, WorkflowContext ctxt, boolean findDataset) throws CommandException {
+        /*
+         * Workflows appear to start running prior to the caller's transaction
+         * completing which can result in exceptions in setting the lock below. To avoid
+         * this, there are two work-arounds - wait briefly for that transaction to end,
+         * or refresh the dataset from the db - so the lock is written based on the
+         * current db state. The latter works for pre-publication workflows (since the
+         * only changes to the Dataset in the Publish command are edits to the version
+         * number in the draft version (which aren't valid for the draft anyway)), while
+         * the former is required for post-publication workflows which may need to see
+         * the final version number, update times and other changes made in the Finalize
+         * Publication command. Not waiting saves significant time when many datasets
+         * are processed, so is prefereable when it makes sense.
+         * 
+         * This code should be reconsidered if/when the launching of pre/post
+         * publication workflows is moved to command onSuccess methods (and when
+         * onSuccess methods are guaranteed to be after the transaction completes (see
+         * #7568) or other changes are made that can guarantee the dataset in the
+         * WorkflowContext is up-to-date/usable in further transactions in the workflow.
+         * (e.g. if this method is not asynchronous)
+         * 
+         */
+
+        if (!findDataset) {
+            /*
+             * Sleep here briefly to make sure the database update from the callers
+             * transaction completes which avoids any concurrency/optimistic lock issues.
+             * Note: 1 second appears long enough, but shorter delays may work.
+             * One example:
+             * the Dataverses.importDataset()/importDatasetDDI() calls with release=yes will
+             * trigger a prepublish workflow on a dataset that isn't committed to the
+             * database until the API call completes.
+             */
+            try {
+                Thread.sleep(1000);
+            } catch (Exception ex) {
+                logger.warning("Failed to sleep for a second.");
+            }
+        }
+        //Refresh will only em.find the dataset if findDataset is true. (otherwise the dataset is em.merged)
+        ctxt = refresh(ctxt, retrieveRequestedSettings( wf.getRequiredSettings()), getCurrentApiToken(ctxt.getRequest().getAuthenticatedUser()), findDataset);
+        lockDataset(ctxt, new DatasetLock(DatasetLock.Reason.Workflow, ctxt.getRequest().getAuthenticatedUser()));
         forward(wf, ctxt);
     }
     
@@ -107,7 +162,8 @@ private ApiToken getCurrentApiToken(AuthenticatedUser au) {
         if (au != null) {
             CommandContext ctxt = engine.getContext();
             ApiToken token = ctxt.authentication().findApiTokenByUser(au);
-            if ((token == null) || (token.getExpireTime().before(new Date()))) {
+            if (token == null) {
+                //No un-expired token
                 token = ctxt.authentication().generateApiTokenForUser(au);
             }
             return token;
@@ -170,10 +226,22 @@ private void doResume(PendingWorkflowInvocation pending, String body) {
         final WorkflowContext ctxt = refresh(newCtxt,retrieveRequestedSettings( wf.getRequiredSettings()), getCurrentApiToken(newCtxt.getRequest().getAuthenticatedUser()));
         WorkflowStepResult res = pendingStep.resume(ctxt, pending.getLocalData(), body);
         if (res instanceof Failure) {
+            logger.warning(((Failure) res).getReason());
+            userNotificationService.sendNotification(ctxt.getRequest().getAuthenticatedUser(), Timestamp.from(Instant.now()), UserNotification.Type.WORKFLOW_FAILURE, ctxt.getDataset().getLatestVersion().getId(), ((Failure) res).getMessage());
+            //UserNotification isn't meant to be a long-term record and doesn't store the comment, so we'll also keep it as a workflow comment
+            WorkflowComment wfc = new WorkflowComment(ctxt.getDataset().getLatestVersion(), WorkflowComment.Type.WORKFLOW_FAILURE, ((Failure) res).getMessage(), ctxt.getRequest().getAuthenticatedUser());
+            datasets.addWorkflowComment(wfc);
             rollback(wf, ctxt, (Failure) res, pending.getPendingStepIdx() - 1);
         } else if (res instanceof Pending) {
             pauseAndAwait(wf, ctxt, (Pending) res, pending.getPendingStepIdx());
         } else {
+            if (res instanceof Success) {
+                logger.info(((Success) res).getReason());
+                userNotificationService.sendNotification(ctxt.getRequest().getAuthenticatedUser(), Timestamp.from(Instant.now()), UserNotification.Type.WORKFLOW_SUCCESS, ctxt.getDataset().getLatestVersion().getId(), ((Success) res).getMessage());
+                //UserNotification isn't meant to be a long-term record and doesn't store the comment, so we'll also keep it as a workflow comment
+                WorkflowComment wfc = new WorkflowComment(ctxt.getDataset().getLatestVersion(), WorkflowComment.Type.WORKFLOW_SUCCESS, ((Success) res).getMessage(), ctxt.getRequest().getAuthenticatedUser());
+                datasets.addWorkflowComment(wfc);
+        }
             executeSteps(wf, ctxt, pending.getPendingStepIdx() + 1);
         }
     }
@@ -267,34 +335,40 @@ void rollbackStep( WorkflowStep step, WorkflowContext ctxt, Failure reason ) {
     }
     
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-    void lockDataset( WorkflowContext ctxt ) throws CommandException {
-        final DatasetLock datasetLock = new DatasetLock(DatasetLock.Reason.Workflow, ctxt.getRequest().getAuthenticatedUser());
-        /* Note that this method directly adds a lock to the database rather than adding it via 
-         * engine.submit(new AddLockCommand(ctxt.getRequest(), ctxt.getDataset(), datasetLock));
-         * which would update the dataset's list of locks, etc. 
-         * An em.find() for the dataset would get a Dataset that has an updated list of locks, but this copy would not have any changes
-         * made in a calling command (e.g. for a PostPublication workflow, the fact that the latest version is 'released' is not yet in the 
-         * database. 
+    void lockDataset(WorkflowContext ctxt, DatasetLock datasetLock) throws CommandException {
+        /*
+         * Note that this method directly adds a lock to the database rather than adding
+         * it via engine.submit(new AddLockCommand(ctxt.getRequest(), ctxt.getDataset(),
+         * datasetLock)); which would update the dataset's list of locks, etc. An
+         * em.find() for the dataset would get a Dataset that has an updated list of
+         * locks, but this copy would not have any changes made in a calling command
+         * (e.g. for a PostPublication workflow, the fact that the latest version is
+         * 'released' is not yet in the database.
          */
         datasetLock.setDataset(ctxt.getDataset());
         em.persist(datasetLock);
+        //flush creates the id
         em.flush();
+        ctxt.setLockId(datasetLock.getId());
     }
-    
+
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-    void unlockDataset( WorkflowContext ctxt ) throws CommandException {
-    	/* Since the lockDataset command above directly persists a lock to the database, 
-    	 * the ctxt.getDataset() is not updated and its list of locks can't be used. Using the named query below will find the workflow
-    	 * lock and remove it (actually all workflow locks for this Dataset but only one workflow should be active). 
-    	 */
+    void unlockDataset(WorkflowContext ctxt) throws CommandException {
+        /*
+         * Since the lockDataset command above directly persists a lock to the database,
+         * the ctxt.getDataset() is not updated and its list of locks can't be used.
+         * Using the named query below will find the workflow lock and remove it
+         * (actually all workflow locks for this Dataset but only one workflow should be
+         * active).
+         */
         TypedQuery<DatasetLock> lockCounter = em.createNamedQuery("DatasetLock.getLocksByDatasetId", DatasetLock.class);
         lockCounter.setParameter("datasetId", ctxt.getDataset().getId());
         List<DatasetLock> locks = lockCounter.getResultList();
-        for(DatasetLock lock: locks) {
-        	if(lock.getReason() == DatasetLock.Reason.Workflow) {
-                logger.fine("Removing lock");
-        		em.remove(lock);
-        	}
+        for (DatasetLock lock : locks) {
+            if (lock.getReason() == DatasetLock.Reason.Workflow) {
+                ctxt.getDataset().removeLock(lock);
+                em.remove(lock);
+            }
         }
         em.flush();
     }
@@ -314,7 +388,29 @@ private void workflowCompleted(Workflow wf, WorkflowContext ctxt) {
         
             try {
         if ( ctxt.getType() == TriggerType.PrePublishDataset ) {
+                ctxt = refresh(ctxt);
+                //Now lock for FinalizePublication - this block mirrors that in PublishDatasetCommand
+                AuthenticatedUser user = ctxt.getRequest().getAuthenticatedUser();
+                DatasetLock lock = new DatasetLock(DatasetLock.Reason.finalizePublication, user);
+                Dataset dataset = ctxt.getDataset();
+                lock.setDataset(dataset);
+                boolean registerGlobalIdsForFiles = 
+                        systemConfig.isFilePIDsEnabledForCollection(ctxt.getDataset().getOwner()) &&
+                                dvObjects.getEffectivePidGenerator(dataset).canCreatePidsLike(dataset.getGlobalId());
+                
+                boolean validatePhysicalFiles = systemConfig.isDatafileValidationOnPublishEnabled();
+                String info = "Publishing the dataset; "; 
+                info += registerGlobalIdsForFiles ? "Registering PIDs for Datafiles; " : "";
+                info += validatePhysicalFiles ? "Validating Datafiles Asynchronously" : "";
+                lock.setInfo(info);
+                lockDataset(ctxt, lock);
+                ctxt.getDataset().addLock(lock);
+                
                 unlockDataset(ctxt);
+                ctxt.setLockId(null); //the workflow lock
+                //Refreshing merges the dataset
+                ctxt = refresh(ctxt);
+                //Then call Finalize
                 engine.submit(new FinalizeDatasetPublicationCommand(ctxt.getDataset(), ctxt.getRequest(), ctxt.getDatasetExternallyReleased()));
             } else {
                 logger.fine("Removing workflow lock");
@@ -419,18 +515,40 @@ private WorkflowStep createStep(WorkflowStepData wsd) {
     private WorkflowContext refresh( WorkflowContext ctxt ) {
     	return refresh(ctxt, ctxt.getSettings(), ctxt.getApiToken());
     }
-    
-    private WorkflowContext refresh( WorkflowContext ctxt, Map<String, Object> settings, ApiToken apiToken ) {
-    	/* An earlier version of this class used em.find() to 'refresh' the Dataset in the context. 
-    	 * For a PostPublication workflow, this had the consequence of hiding/removing changes to the Dataset 
-    	 * made in the FinalizeDatasetPublicationCommand (i.e. the fact that the draft version is now released and
-    	 * has a version number). It is not clear to me if the em.merge below is needed or if it handles the case of 
-    	 * resumed workflows. (The overall method is needed to allow the context to be updated in the start() method with the
-    	 * settings and APItoken retrieved by the WorkflowServiceBean) - JM - 9/18.
-    	 */
-        return new WorkflowContext( ctxt.getRequest(), 
-                       em.merge(ctxt.getDataset()), ctxt.getNextVersionNumber(), 
-                       ctxt.getNextMinorVersionNumber(), ctxt.getType(), settings, apiToken, ctxt.getDatasetExternallyReleased());
+
+    private WorkflowContext refresh(WorkflowContext ctxt, Map<String, Object> settings, ApiToken apiToken) {
+        return refresh(ctxt, settings, apiToken, false);
+    }
+
+    private WorkflowContext refresh(WorkflowContext ctxt, Map<String, Object> settings, ApiToken apiToken,
+            boolean findDataset) {
+        /*
+         * An earlier version of this class used em.find() to 'refresh' the Dataset in
+         * the context. For a PostPublication workflow, this had the consequence of
+         * hiding/removing changes to the Dataset made in the
+         * FinalizeDatasetPublicationCommand (i.e. the fact that the draft version is
+         * now released and has a version number). It is not clear to me if the em.merge
+         * below is needed or if it handles the case of resumed workflows. (The overall
+         * method is needed to allow the context to be updated in the start() method
+         * with the settings and APItoken retrieved by the WorkflowServiceBean) - JM -
+         * 9/18.
+         */
+        /*
+         * Introduced the findDataset boolean to optionally revert above change.
+         * Refreshing the Dataset just before trying to set the workflow lock greatly
+         * reduces the number of OptimisticLockExceptions. JvM 2/21
+         */
+        WorkflowContext newCtxt;
+        if (findDataset) {
+            newCtxt = new WorkflowContext(ctxt.getRequest(), datasets.find(ctxt.getDataset().getId()),
+                    ctxt.getNextVersionNumber(), ctxt.getNextMinorVersionNumber(), ctxt.getType(), settings, apiToken,
+                    ctxt.getDatasetExternallyReleased(), ctxt.getInvocationId(), ctxt.getLockId());
+        } else {
+            newCtxt = new WorkflowContext(ctxt.getRequest(), em.merge(ctxt.getDataset()), ctxt.getNextVersionNumber(),
+                    ctxt.getNextMinorVersionNumber(), ctxt.getType(), settings, apiToken,
+                    ctxt.getDatasetExternallyReleased(), ctxt.getInvocationId(), ctxt.getLockId());
+        }
+        return newCtxt;
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/ArchivalSubmissionWorkflowStep.java b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/ArchivalSubmissionWorkflowStep.java
index 105af6a00d8..b0567bff107 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/ArchivalSubmissionWorkflowStep.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/ArchivalSubmissionWorkflowStep.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.workflow.internalspi;
 
-import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.impl.AbstractSubmitToArchiveCommand;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
@@ -10,13 +9,12 @@
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStep;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
 
-import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * A step that submits a BagIT bag of the newly published dataset version via a
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/AuthorizedExternalStep.java b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/AuthorizedExternalStep.java
new file mode 100644
index 00000000000..39ae9a002c9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/AuthorizedExternalStep.java
@@ -0,0 +1,149 @@
+package edu.harvard.iq.dataverse.workflow.internalspi;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.workflow.PendingWorkflowInvocation;
+import edu.harvard.iq.dataverse.workflow.WorkflowContext;
+import edu.harvard.iq.dataverse.workflow.WorkflowContext.TriggerType;
+import edu.harvard.iq.dataverse.workflow.step.Failure;
+import edu.harvard.iq.dataverse.workflow.step.Pending;
+import edu.harvard.iq.dataverse.workflow.step.WorkflowStep;
+import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
+import edu.harvard.iq.dataverse.workflows.WorkflowUtil;
+
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.hc.client5.http.classic.methods.*;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.net.URIBuilder;
+
+/**
+ * A workflow step that sends a HTTP request, and then pauses, waiting for an
+ * application/json response. This step is allowed to act as the user causing
+ * the workflow launch and can make changes to the dataset it is associated
+ * with. To do so, it must send the invocationId in a manner analogous to
+ * sending an api key. See guides.
+ * 
+ */
+public class AuthorizedExternalStep implements WorkflowStep {
+    private static final Logger logger = Logger.getLogger(AuthorizedExternalStep.class.getName());
+    private final Map<String,String> params;
+
+    public AuthorizedExternalStep(Map<String, String> paramSet) {
+        params = new HashMap<>(paramSet);
+    }
+    
+    @Override
+    public WorkflowStepResult run(WorkflowContext context) {
+        try (CloseableHttpClient client = HttpClients.createDefault()) {
+            // build method
+            ClassicHttpRequest request = buildMethod(false, context);
+            // execute
+            return client.execute(request, response -> {
+                int responseStatus = response.getCode();
+                if (responseStatus >= 200 && responseStatus < 300) {
+                    // HTTP OK range
+                    Map<String, String> data = new HashMap<>();
+                    //Allow external client to use invocationId as a key to act on the user's behalf
+                    data.put(PendingWorkflowInvocation.AUTHORIZED, "true");
+                    return new Pending(data);
+                } else {
+                    String responseBody = new String(response.getEntity().getContent().readAllBytes(), StandardCharsets.UTF_8);
+                    return new Failure("Error communicating with server. Server response: " + responseBody + " (" + responseStatus + ").");
+                }
+            });
+        } catch (Exception ex) {
+            logger.log(Level.SEVERE, "Error communicating with remote server: " + ex.getMessage(), ex);
+            return new Failure("Error executing request: " + ex.getLocalizedMessage(), "Cannot communicate with remote server.");
+        }
+    }
+
+    @Override
+    public WorkflowStepResult resume(WorkflowContext context, Map<String, String> internalData, String externalData) {
+        return WorkflowUtil.parseResponse(externalData);
+    }
+
+    @Override
+    public void rollback(WorkflowContext context, Failure reason) {
+        try (CloseableHttpClient client = HttpClients.createDefault()) {
+            // build method
+            ClassicHttpRequest request = buildMethod(true, context);
+            
+            // execute
+            client.execute(request, response -> {
+                int responseStatus = response.getCode();
+                if (responseStatus < 200 || responseStatus >= 300) {
+                    // out of HTTP OK range
+                    String responseBody = new String(response.getEntity().getContent().readAllBytes(), StandardCharsets.UTF_8);
+                    Logger.getLogger(AuthorizedExternalStep.class.getName()).log(Level.WARNING, 
+                            "Bad response from remote server while rolling back step: {0}", responseBody);
+                }
+                return null;
+            });
+        } catch (Exception ex) {
+            Logger.getLogger(AuthorizedExternalStep.class.getName()).log(Level.WARNING, "IO error rolling back step: " + ex.getMessage(), ex);
+        }
+    }
+    
+    ClassicHttpRequest buildMethod(boolean rollback, WorkflowContext ctxt) throws Exception {
+        String methodName = params.getOrDefault("method" + (rollback ? "-rollback":""), "GET").trim().toUpperCase();
+        
+        Map<String,String> templateParams = new HashMap<>();
+        templateParams.put("invocationId", ctxt.getInvocationId());
+        templateParams.put("dataset.id", Long.toString(ctxt.getDataset().getId()));
+        templateParams.put("dataset.identifier", ctxt.getDataset().getIdentifier());
+        templateParams.put("dataset.globalId", ctxt.getDataset().getGlobalId().toString());
+        templateParams.put("dataset.displayName", ctxt.getDataset().getDisplayName());
+        templateParams.put("dataset.citation", ctxt.getDataset().getCitation());
+        templateParams.put("minorVersion", Long.toString(ctxt.getNextMinorVersionNumber()));
+        templateParams.put("majorVersion", Long.toString(ctxt.getNextVersionNumber()));
+        templateParams.put("releaseStatus", (ctxt.getType()==TriggerType.PostPublishDataset) ? "done":"in-progress");
+        templateParams.put("language", BundleUtil.getDefaultLocale().getISO3Language());
+    
+        String urlKey = rollback ? "rollbackUrl" : "url";
+        String urlTemplate = params.get(urlKey);
+        String processedUrl = process(urlTemplate, templateParams);
+        
+        URI uri;
+        try {
+            uri = new URIBuilder(processedUrl).build();
+        } catch (Exception ex) {
+            throw new IllegalStateException("Illegal URL: '" + processedUrl + "'", ex);
+        }
+    
+        ClassicHttpRequest request;
+        switch (methodName) {
+            case "GET":    request = new HttpGet(uri); break;
+            case "POST":   request = new HttpPost(uri); break;
+            case "PUT":    request = new HttpPut(uri); break;
+            case "DELETE": request = new HttpDelete(uri); break;
+            default: throw new IllegalStateException("Unsupported HTTP method: '" + methodName + "'");
+        }
+    
+        request.setHeader("Content-Type", params.getOrDefault("contentType", "text/plain"));
+    
+        return request;
+    }
+    
+    String process(String template, Map<String,String> values ) {
+        String curValue = template;
+        for ( Map.Entry<String, String> ent : values.entrySet() ) {
+            String val = ent.getValue();
+            if ( val == null ) { 
+                val = "" ;
+            }
+            String varRef = "${" + ent.getKey() + "}";
+            while ( curValue.contains(varRef) ) {
+                curValue = curValue.replace(varRef, val);
+            }
+        }
+        
+        return curValue;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/HttpSendReceiveClientStep.java b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/HttpSendReceiveClientStep.java
index 08964c78137..8578be29257 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/HttpSendReceiveClientStep.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/HttpSendReceiveClientStep.java
@@ -7,27 +7,23 @@
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStep;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
 import static edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult.OK;
+
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.URI;
-import org.apache.commons.httpclient.URIException;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.EntityEnclosingMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
 
-/**
- * A workflow step that sends a HTTP request, and then pauses, waiting for a response.
- * 
- * @author michael
- */
+import org.apache.hc.client5.http.classic.methods.*;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+
 public class HttpSendReceiveClientStep implements WorkflowStep {
     private static final Logger logger = Logger.getLogger(HttpSendReceiveClientStep.class.getName());
     private final Map<String,String> params;
@@ -38,21 +34,19 @@ public HttpSendReceiveClientStep(Map<String, String> paramSet) {
     
     @Override
     public WorkflowStepResult run(WorkflowContext context) {
-        HttpClient client = new HttpClient();
-        
-        try {
-            // build method
-            HttpMethodBase mtd = buildMethod(false, context);
+        try (CloseableHttpClient client = HttpClients.createDefault()) {
+            ClassicHttpRequest request = buildRequest(false, context);
             // execute
-            int responseStatus = client.executeMethod(mtd);
-            if (responseStatus>=200 && responseStatus<300 ) {
-                // HTTP OK range
-                return new Pending();
-            } else {
-                String responseBody = mtd.getResponseBodyAsString();
-                return new Failure("Error communicating with server. Server response: " + responseBody + " (" + responseStatus + ").");
-            }
+            return client.execute(request, response -> {
             
+                int responseStatus = response.getCode();
+                if (responseStatus >= 200 && responseStatus < 300) {
+                    return new Pending();
+                } else {
+                    String responseBody = new String(response.getEntity().getContent().readAllBytes());
+                    return new Failure("Error communicating with server. Server response: " + responseBody + " (" + responseStatus + ").");
+                }
+            });
         } catch (Exception ex) {
             logger.log(Level.SEVERE, "Error communicating with remote server: " + ex.getMessage(), ex);
             return new Failure("Error executing request: " + ex.getLocalizedMessage(), "Cannot communicate with remote server.");
@@ -63,92 +57,92 @@ public WorkflowStepResult run(WorkflowContext context) {
     public WorkflowStepResult resume(WorkflowContext context, Map<String, String> internalData, String externalData) {
         Pattern pat = Pattern.compile(params.get("expectedResponse"));
         String response = externalData.trim();
-        if ( pat.matcher(response).matches() ) {
+        if (pat.matcher(response).matches()) {
             return OK;
         } else {
-            logger.log(Level.WARNING, "Remote system returned a bad reposonse: {0}", externalData);
+            logger.log(Level.WARNING, "Remote system returned a bad response: {0}", externalData);
             return new Failure("Response from remote server did not match expected one (response:" + response + ")");
         }
     }
 
     @Override
     public void rollback(WorkflowContext context, Failure reason) {
-        HttpClient client = new HttpClient();
-        
-        try {
-            // build method
-            HttpMethodBase mtd = buildMethod(true, context);
-            
-            // execute
-            int responseStatus = client.executeMethod(mtd);
-            if (responseStatus<200 || responseStatus>=300 ) {
-                // out of HTTP OK range
-                String responseBody = mtd.getResponseBodyAsString();
-                Logger.getLogger(HttpSendReceiveClientStep.class.getName()).log(Level.WARNING, 
-                        "Bad response from remote server while rolling back step: {0}", responseBody);
-            }
+        try (CloseableHttpClient client = HttpClients.createDefault()) {
+            ClassicHttpRequest request = buildRequest(true, context);
             
+            client.execute(request, response -> {
+                int responseStatus = response.getCode();
+                if (responseStatus < 200 || responseStatus >= 300) {
+                    String responseBody = new String(response.getEntity().getContent().readAllBytes());
+                    logger.log(Level.WARNING, "Bad response from remote server while rolling back step: {0}", responseBody);
+                }
+                return null;
+            });
         } catch (Exception ex) {
-            Logger.getLogger(HttpSendReceiveClientStep.class.getName()).log(Level.WARNING, "IO error rolling back step: " + ex.getMessage(), ex);
+            logger.log(Level.WARNING, "IO error rolling back step: " + ex.getMessage(), ex);
         }
     }
     
-    HttpMethodBase buildMethod(boolean rollback, WorkflowContext ctxt) throws Exception {
+    ClassicHttpRequest buildRequest(boolean rollback, WorkflowContext ctxt) throws Exception {
         String methodName = params.getOrDefault("method" + (rollback ? "-rollback":""), "GET").trim().toUpperCase();
-        HttpMethodBase m = null;
-        switch (methodName) {
-            case "GET":    m = new GetMethod(); m.setFollowRedirects(true); break;
-            case "POST":   m = new PostMethod(); break;
-            case "PUT":    m = new PutMethod(); break;
-            case "DELETE": m = new DeleteMethod(); m.setFollowRedirects(true); break;
-            default: throw new IllegalStateException("Unsupported HTTP method: '" + methodName + "'");
-        }
-        
         
         Map<String,String> templateParams = new HashMap<>();
-        templateParams.put( "invocationId", ctxt.getInvocationId() );
-        templateParams.put( "dataset.id", Long.toString(ctxt.getDataset().getId()) );
-        templateParams.put( "dataset.identifier", ctxt.getDataset().getIdentifier() );
-        templateParams.put( "dataset.globalId", ctxt.getDataset().getGlobalIdString() );
-        templateParams.put( "dataset.displayName", ctxt.getDataset().getDisplayName() );
-        templateParams.put( "dataset.citation", ctxt.getDataset().getCitation() );
-        templateParams.put( "minorVersion", Long.toString(ctxt.getNextMinorVersionNumber()) );
-        templateParams.put( "majorVersion", Long.toString(ctxt.getNextVersionNumber()) );
-        templateParams.put( "releaseStatus", (ctxt.getType()==TriggerType.PostPublishDataset) ? "done":"in-progress" );
-        
-        m.addRequestHeader("Content-Type", params.getOrDefault("contentType", "text/plain"));
+        templateParams.put("invocationId", ctxt.getInvocationId());
+        templateParams.put("dataset.id", Long.toString(ctxt.getDataset().getId()));
+        templateParams.put("dataset.identifier", ctxt.getDataset().getIdentifier());
+        templateParams.put("dataset.globalId", ctxt.getDataset().getGlobalId().asString());
+        templateParams.put("dataset.displayName", ctxt.getDataset().getDisplayName());
+        templateParams.put("dataset.citation", ctxt.getDataset().getCitation());
+        templateParams.put("minorVersion", Long.toString(ctxt.getNextMinorVersionNumber()));
+        templateParams.put("majorVersion", Long.toString(ctxt.getNextVersionNumber()));
+        templateParams.put("releaseStatus", (ctxt.getType()==TriggerType.PostPublishDataset) ? "done":"in-progress");
         
         String urlKey = rollback ? "rollbackUrl":"url";
         String url = params.get(urlKey);
+        String processedUrl = process(url, templateParams);
+        
+        ClassicHttpRequest request;
         try {
-            m.setURI(new URI(process(url,templateParams), true) );
-        } catch (URIException ex) {
-            throw new IllegalStateException("Illegal URL: '" + url + "'");
+            URI uri = new URI(processedUrl);
+            switch (methodName) {
+                case "GET":    request = new HttpGet(uri); break;
+                case "POST":   request = new HttpPost(uri); break;
+                case "PUT":    request = new HttpPut(uri); break;
+                case "DELETE": request = new HttpDelete(uri); break;
+                default: throw new IllegalStateException("Unsupported HTTP method: '" + methodName + "'");
+            }
+        } catch (URISyntaxException ex) {
+            throw new IllegalStateException("Illegal URL: '" + processedUrl + "'", ex);
         }
         
+        request.setHeader("Content-Type", params.getOrDefault("contentType", "text/plain"));
+        
         String bodyKey = (rollback ? "rollbackBody" : "body");
-        if ( params.containsKey(bodyKey) && m instanceof EntityEnclosingMethod ) {
+        if (params.containsKey(bodyKey) && (request instanceof HttpPost || request instanceof HttpPut)) {
             String body = params.get(bodyKey);
-            ((EntityEnclosingMethod)m).setRequestEntity(new StringRequestEntity(process( body, templateParams)));
+            request.setEntity(
+                new StringEntity(process(body, templateParams), 
+                    ContentType.create(request.getFirstHeader("Content-Type").getValue())
+                )
+            );
         }
         
-        return m;
+        return request;
     }
     
-    String process(String template, Map<String,String> values ) {
+    String process(String template, Map<String,String> values) {
         String curValue = template;
-        for ( Map.Entry<String, String> ent : values.entrySet() ) {
+        for (Map.Entry<String, String> ent : values.entrySet()) {
             String val = ent.getValue();
-            if ( val == null ) { 
-                val = "" ;
+            if (val == null) { 
+                val = "";
             }
             String varRef = "${" + ent.getKey() + "}";
-            while ( curValue.contains(varRef) ) {
+            while (curValue.contains(varRef)) {
                 curValue = curValue.replace(varRef, val);
             }
         }
         
         return curValue;
     }
-    
-}
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/InternalWorkflowStepSP.java b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/InternalWorkflowStepSP.java
index 76b7bcd7d44..d99e0901d3c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/InternalWorkflowStepSP.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/InternalWorkflowStepSP.java
@@ -17,10 +17,16 @@ public WorkflowStep getStep(String stepType, Map<String, String> stepParameters)
                 return new LoggingWorkflowStep(stepParameters);
             case "pause":
                 return new PauseStep(stepParameters);
+            case "pause/message":
+                return new PauseWithMessageStep(stepParameters);
             case "http/sr":
                 return new HttpSendReceiveClientStep(stepParameters);
+            case "http/authExt":
+                return new AuthorizedExternalStep(stepParameters);
             case "archiver":
                 return new ArchivalSubmissionWorkflowStep(stepParameters);
+            case "ldnannounce":
+                return new LDNAnnounceDatasetVersionStep(stepParameters);
             default:
                 throw new IllegalArgumentException("Unsupported step type: '" + stepType + "'.");
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/LDNAnnounceDatasetVersionStep.java b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/LDNAnnounceDatasetVersionStep.java
new file mode 100644
index 00000000000..124eea801d9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/LDNAnnounceDatasetVersionStep.java
@@ -0,0 +1,279 @@
+package edu.harvard.iq.dataverse.workflow.internalspi;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.bagit.OREMap;
+import edu.harvard.iq.dataverse.util.json.JsonLDTerm;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import edu.harvard.iq.dataverse.workflow.WorkflowContext;
+import edu.harvard.iq.dataverse.workflow.step.Failure;
+import edu.harvard.iq.dataverse.workflow.step.WorkflowStep;
+import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
+import static edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult.OK;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+
+/**
+ * A workflow step that generates and sends an LDN Announcement message to the
+ * inbox of a configured target. THe initial use case is for Dataverse to
+ * anounce new dataset versions to the Harvard DASH preprint repository so that
+ * a DASH admin can create a backlink for any dataset versions that reference a
+ * DASH deposit or a paper with a DOI where DASH has a preprint copy.
+ * 
+ * @author qqmyers
+ */
+
+public class LDNAnnounceDatasetVersionStep implements WorkflowStep {
+    private static final Logger logger = Logger.getLogger(LDNAnnounceDatasetVersionStep.class.getName());
+    private static final String REQUIRED_FIELDS = ":LDNAnnounceRequiredFields";
+    private static final String LDN_TARGET = ":LDNTarget";
+    private static final String RELATED_PUBLICATION = "publication";
+
+    JsonLDTerm publicationIDType = null;
+    JsonLDTerm publicationIDNumber = null;
+    JsonLDTerm publicationURL = null;
+
+    public LDNAnnounceDatasetVersionStep(Map<String, String> paramSet) {
+        new HashMap<>(paramSet);
+    }
+
+    @Override
+    public WorkflowStepResult run(WorkflowContext context) {
+
+        JsonObject target = JsonUtil.getJsonObject((String) context.getSettings().get(LDN_TARGET));
+        if (target != null) {
+            String inboxUrl = target.getString("inbox");
+
+            CloseableHttpClient client = HttpClients.createDefault();
+
+            // build method
+            
+            HttpPost announcement;
+            try {
+                announcement = buildAnnouncement(false, context, target);
+            } catch (URISyntaxException e) {
+                return new Failure("LDNAnnounceDatasetVersion workflow step failed: unable to parse inbox in :LDNTarget setting.");
+            }
+            if(announcement==null) {
+                logger.info(context.getDataset().getGlobalId().asString() + "does not have metadata required to send LDN message. Nothing sent.");
+                return OK;
+            }
+            // execute
+            try (CloseableHttpResponse response = client.execute(announcement)) {
+                int code = response.getStatusLine().getStatusCode();
+                if (code >= 200 && code < 300) {
+                    // HTTP OK range
+                    return OK;
+                } else {
+                    String responseBody = new String(response.getEntity().getContent().readAllBytes(),
+                            StandardCharsets.UTF_8);
+                    ;
+                    return new Failure("Error communicating with " + inboxUrl + ". Server response: " + responseBody
+                            + " (" + response + ").");
+                }
+
+            } catch (Exception ex) {
+                logger.log(Level.SEVERE, "Error communicating with remote server: " + ex.getMessage(), ex);
+                return new Failure("Error executing request: " + ex.getLocalizedMessage(),
+                        "Cannot communicate with remote server.");
+            }
+        }
+        return new Failure("LDNAnnounceDatasetVersion workflow step failed: :LDNTarget setting missing or invalid.");
+    }
+
+    @Override
+    public WorkflowStepResult resume(WorkflowContext context, Map<String, String> internalData, String externalData) {
+        throw new UnsupportedOperationException("Not supported yet."); // This class does not need to resume.
+    }
+
+    @Override
+    public void rollback(WorkflowContext context, Failure reason) {
+        throw new UnsupportedOperationException("Not supported yet."); // This class does not need to resume.
+    }
+
+    HttpPost buildAnnouncement(boolean qb, WorkflowContext ctxt, JsonObject target) throws URISyntaxException {
+
+        // First check that we have what is required
+        DatasetVersion dv = ctxt.getDataset().getReleasedVersion();
+        List<DatasetField> dvf = dv.getDatasetFields();
+        Map<String, DatasetField> fields = new HashMap<String, DatasetField>();
+        String[] requiredFields = ((String) ctxt.getSettings().getOrDefault(REQUIRED_FIELDS, "")).split(",\\s*");
+        for (String field : requiredFields) {
+            fields.put(field, null);
+        }
+        Set<String> reqFields = fields.keySet();
+        for (DatasetField df : dvf) {
+            if(!df.isEmpty() && reqFields.contains(df.getDatasetFieldType().getName())) {
+                fields.put(df.getDatasetFieldType().getName(), df);
+            }
+        }
+        if (fields.containsValue(null)) {
+            logger.fine("DatasetVersion doesn't contain metadata required to trigger announcement");
+            return null;
+        }
+        // We do, so construct the json-ld body and method
+
+        Map<String, String> localContext = new HashMap<String, String>();
+        JsonObjectBuilder coarContext = Json.createObjectBuilder();
+        Map<Long, JsonObject> emptyCvocMap = new HashMap<Long, JsonObject>();
+        boolean includeLocalContext = false;
+        for (Entry<String, DatasetField> entry : fields.entrySet()) {
+            DatasetField field = entry.getValue();
+            DatasetFieldType dft = field.getDatasetFieldType();
+            String dfTypeName = entry.getKey();
+            JsonValue jv = OREMap.getJsonLDForField(field, false, emptyCvocMap, localContext);
+            switch (dfTypeName) {
+            case RELATED_PUBLICATION:
+                JsonArrayBuilder relArrayBuilder = Json.createArrayBuilder();
+                publicationIDType = null;
+                publicationIDNumber = null;
+                publicationURL = null;
+                Collection<DatasetFieldType> childTypes = dft.getChildDatasetFieldTypes();
+                for (DatasetFieldType cdft : childTypes) {
+                    switch (cdft.getName()) {
+                    case "publicationURL":
+                        publicationURL = cdft.getJsonLDTerm();
+                        break;
+                    case "publicationIDType":
+                        publicationIDType = cdft.getJsonLDTerm();
+                        break;
+                    case "publicationIDNumber":
+                        publicationIDNumber = cdft.getJsonLDTerm();
+                        break;
+                    }
+
+                }
+
+                if (jv != null) {
+                    if (jv instanceof JsonArray) {
+                        JsonArray rels = (JsonArray) jv;
+                        for (JsonObject jo : rels.getValuesAs(JsonObject.class)) {
+                            String id = getBestPubId(jo);
+                            relArrayBuilder.add(Json.createObjectBuilder().add("id", id).add("ietf:cite-as", id)
+                                    .add("type", "sorg:ScholaryArticle").build());
+                        }
+                    }
+
+                    else { // JsonObject
+                        String id = getBestPubId((JsonObject) jv);
+                        relArrayBuilder.add(Json.createObjectBuilder().add("id", id).add("ietf:cite-as", id)
+                                .add("type", "sorg:ScholaryArticle").build());
+                    }
+                }
+                coarContext.add("IsSupplementTo", relArrayBuilder);
+                break;
+            default:
+                if (jv != null) {
+                    includeLocalContext = true;
+                    coarContext.add(dft.getJsonLDTerm().getLabel(), jv);
+                }
+
+            }
+        }
+        dvf.get(0).getDatasetFieldType().getName();
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        JsonArrayBuilder context = Json.createArrayBuilder().add("https://purl.org/coar/notify")
+                .add("https://www.w3.org/ns/activitystreams");
+        if (includeLocalContext && !localContext.isEmpty()) {
+            JsonObjectBuilder contextBuilder = Json.createObjectBuilder();
+            for (Entry<String, String> e : localContext.entrySet()) {
+                contextBuilder.add(e.getKey(), e.getValue());
+            }
+            context.add(contextBuilder);
+        }
+        job.add("@context", context);
+        job.add("id", "urn:uuid:" + UUID.randomUUID().toString());
+        job.add("actor", Json.createObjectBuilder().add("id", SystemConfig.getDataverseSiteUrlStatic())
+                .add("name", BrandingUtil.getInstallationBrandName()).add("type", "Service"));
+        job.add("context", coarContext);
+        Dataset d = ctxt.getDataset();
+        job.add("object",
+                Json.createObjectBuilder().add("id", d.getLocalURL())
+                        .add("ietf:cite-as", d.getGlobalId().asURL())
+                        .add("sorg:name", d.getDisplayName()).add("type", "sorg:Dataset"));
+        job.add("origin", Json.createObjectBuilder().add("id", SystemConfig.getDataverseSiteUrlStatic())
+                .add("inbox", SystemConfig.getDataverseSiteUrlStatic() + "/api/inbox").add("type", "Service"));
+        job.add("target", target);
+        job.add("type", Json.createArrayBuilder().add("Announce").add("coar-notify:ReleaseAction"));
+
+        HttpPost annPost = new HttpPost();
+        annPost.setURI(new URI(target.getString("inbox")));
+        String body = JsonUtil.prettyPrint(job.build());
+        logger.fine("Body: " + body);
+        annPost.setEntity(new StringEntity(JsonUtil.prettyPrint(body), "utf-8"));
+        annPost.setHeader("Content-Type", "application/ld+json");
+        return annPost;
+    }
+
+    private String getBestPubId(JsonObject jo) {
+        String id = null;
+        if (jo.containsKey(publicationURL.getLabel())) {
+            id = jo.getString(publicationURL.getLabel());
+        } else if (jo.containsKey(publicationIDType.getLabel())) {
+            if ((jo.containsKey(publicationIDNumber.getLabel()))) {
+                String number = jo.getString(publicationIDNumber.getLabel());
+
+                switch (jo.getString(publicationIDType.getLabel())) {
+                case "doi":
+                    if (number.startsWith("https://doi.org/")) {
+                        id = number;
+                    } else if (number.startsWith("doi:")) {
+                        id = "https://doi.org/" + number.substring(4);
+                    }
+
+                    break;
+                case "DASH-URN":
+                    if (number.startsWith("http")) {
+                        id = number;
+                    }
+                    break;
+                }
+            }
+        }
+        return id;
+    }
+
+    String process(String template, Map<String, String> values) {
+        String curValue = template;
+        for (Map.Entry<String, String> ent : values.entrySet()) {
+            String val = ent.getValue();
+            if (val == null) {
+                val = "";
+            }
+            String varRef = "${" + ent.getKey() + "}";
+            while (curValue.contains(varRef)) {
+                curValue = curValue.replace(varRef, val);
+            }
+        }
+
+        return curValue;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/PauseWithMessageStep.java b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/PauseWithMessageStep.java
new file mode 100644
index 00000000000..f7332611697
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/PauseWithMessageStep.java
@@ -0,0 +1,48 @@
+package edu.harvard.iq.dataverse.workflow.internalspi;
+
+import edu.harvard.iq.dataverse.workflow.WorkflowContext;
+import edu.harvard.iq.dataverse.workflow.step.Failure;
+import edu.harvard.iq.dataverse.workflow.step.Pending;
+import edu.harvard.iq.dataverse.workflow.step.WorkflowStep;
+import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
+import edu.harvard.iq.dataverse.workflows.WorkflowUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+
+
+/**
+ * A sample step that pauses the workflow.
+ * 
+ * @author michael
+ */
+public class PauseWithMessageStep implements WorkflowStep {
+    
+    /** Constant used by testing to simulate a failed step. */
+    public static final String FAILURE_RESPONSE="fail";
+    
+    private final Map<String,String> params = new HashMap<>();
+
+    public PauseWithMessageStep( Map<String,String> paramSet ) {
+        params.putAll(paramSet);
+    }
+    
+    @Override
+    public WorkflowStepResult run(WorkflowContext context) {
+        final Pending result = new Pending();
+        result.getData().putAll(params);
+        return result;
+    }
+
+    @Override
+    public WorkflowStepResult resume(WorkflowContext context, Map<String, String> internalData, String externalData) {
+        return WorkflowUtil.parseResponse(externalData);
+    }
+
+    @Override
+    public void rollback(WorkflowContext context, Failure reason) {
+        // nothing to roll back
+    }
+    
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/step/Failure.java b/src/main/java/edu/harvard/iq/dataverse/workflow/step/Failure.java
index 0487313fd0d..950eed52245 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/step/Failure.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/step/Failure.java
@@ -11,7 +11,7 @@ public class Failure implements WorkflowStepResult {
     private final String message;
     
     public Failure( String reason ) {
-        this(reason, reason);
+        this(reason, null);
     }
     
     /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/step/Success.java b/src/main/java/edu/harvard/iq/dataverse/workflow/step/Success.java
new file mode 100644
index 00000000000..0a00c4f279e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/step/Success.java
@@ -0,0 +1,49 @@
+package edu.harvard.iq.dataverse.workflow.step;
+
+/**
+ * Result returned when step execution succeeds.
+ */
+public class Success implements WorkflowStepResult {
+
+    private final String reason;
+    private final String message;
+
+    public Success(String reason) {
+        this(reason, null);
+    }
+
+    /**
+     * Constructs a new success message.
+     * 
+     * @param reason  Technical comment (for logs etc.).
+     * @param message Human readable comment.
+     */
+    public Success(String reason, String message) {
+        this.reason = reason;
+        this.message = message;
+    }
+
+    /**
+     * Holds a technical comment about the success.
+     * 
+     * @return the technical comment about the processing.
+     */
+    public String getReason() {
+        return reason;
+    }
+
+    /**
+     * Holds the user-friendly message describing what was successfully done.
+     * 
+     * @return user-friendly message for the success.
+     */
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public String toString() {
+        return "WorkflowStepResult.Success{" + "reason=" + reason + ", message=" + message + '}';
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/step/WorkflowStepData.java b/src/main/java/edu/harvard/iq/dataverse/workflow/step/WorkflowStepData.java
index a06531a2666..07bcf247533 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/step/WorkflowStepData.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/step/WorkflowStepData.java
@@ -3,14 +3,14 @@
 import edu.harvard.iq.dataverse.workflow.Workflow;
 import java.io.Serializable;
 import java.util.Map;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 /**
  * A database row describing a step in a workflow. Actual steps can be instantiated
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflows/WorkflowComment.java b/src/main/java/edu/harvard/iq/dataverse/workflows/WorkflowComment.java
index 26ddb9b1573..7cfa226d7ba 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflows/WorkflowComment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflows/WorkflowComment.java
@@ -5,14 +5,14 @@
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
 
 @Entity
 public class WorkflowComment implements Serializable {
@@ -22,7 +22,9 @@ public class WorkflowComment implements Serializable {
     More may be added in future releases,
     */
     public enum Type {
-        RETURN_TO_AUTHOR //, SUBMIT_FOR_REVIEW not available in this release but may be added in the future
+        RETURN_TO_AUTHOR, //, SUBMIT_FOR_REVIEW not available in this release but may be added in the future
+        WORKFLOW_SUCCESS,
+        WORKFLOW_FAILURE
     };
     
     @Id
@@ -61,20 +63,22 @@ public enum Type {
     @Column(nullable = false)
     private Timestamp created;
 
+    private boolean toBeShown;
+    
     // TODO: Consider support editing in the GUI some day, like GitHub issue comments (show "Edited" in the UI). We won't send a second email, however. You only get one shot to prevent spam.
 //    @Transient
 //    private Timestamp modified;
     // TODO: How should we best associate these entries to notifications, which can go to multiple authors and curators?
+    //FWIW: Workflow success/failure messages get shown to the user running the workflow if/when on the relevant dataset version page
 //    @Transient
 //    private List<UserNotification> notifications;
     public WorkflowComment(DatasetVersion version, WorkflowComment.Type type, String message, AuthenticatedUser authenticatedUser) {
         this.type = type;
-        if (this.type.equals(WorkflowComment.Type.RETURN_TO_AUTHOR)) {
-            this.datasetVersion = version;
-        }
+        this.datasetVersion = version;
         this.message = message;
         this.authenticatedUser = authenticatedUser;
         this.created = new Timestamp(new Date().getTime());
+        this.setToBeShown(true);
     }
 
     /**
@@ -123,4 +127,12 @@ public void setDatasetVersion(DatasetVersion dv) {
         datasetVersion=dv;
     }
 
+    public boolean isToBeShown() {
+        return toBeShown;
+    }
+
+    public void setToBeShown(boolean toBeShown) {
+        this.toBeShown = toBeShown;
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflows/WorkflowUtil.java b/src/main/java/edu/harvard/iq/dataverse/workflows/WorkflowUtil.java
index e28f8525c9a..b104f113db2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflows/WorkflowUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflows/WorkflowUtil.java
@@ -2,14 +2,27 @@
 
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.api.Util;
+
 import java.util.List;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+import edu.harvard.iq.dataverse.workflow.step.Failure;
+import edu.harvard.iq.dataverse.workflow.step.Success;
+import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
+
 import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
+import static org.apache.commons.text.StringEscapeUtils.escapeHtml4;
 
 public class WorkflowUtil {
 
+    private static final Logger logger = Logger.getLogger(WorkflowUtil.class.getName());
+    
     public static JsonArrayBuilder getAllWorkflowComments(DatasetVersion datasetVersion) {
         JsonArrayBuilder workflowCommentsAsJson = Json.createArrayBuilder();
         List<WorkflowComment> workflowComments = datasetVersion.getWorkflowComments();
@@ -26,4 +39,49 @@ public static JsonArrayBuilder getAllWorkflowComments(DatasetVersion datasetVers
         }
         return workflowCommentsAsJson;
     }
+
+    public static WorkflowStepResult parseResponse(String externalData) {
+        try {
+            JsonObject response = JsonUtil.getJsonObject(externalData);
+            String status = null;
+            //Lower case is documented, upper case is deprecated
+            if(response.containsKey("status")) {
+                status= response.getString("status");
+            }else if(response.containsKey("Status")) {
+                status= response.getString("Status");
+            }
+            String reason = null;
+            String message = null;
+            if (response.containsKey("reason")) {
+                reason = response.getString("reason");
+            }else if (response.containsKey("Reason")) {
+                reason = response.getString("Reason");
+            }
+            if (response.containsKey("message")) {
+                message = response.getString("message");
+            }else if (response.containsKey("Message")) {
+                message = response.getString("Message");
+            }
+            switch (status) {
+            case "success":
+            case "Success":
+                logger.log(Level.FINE, "AuthExt Worfklow Step Succeeded: " + reason);
+                return new Success(reason, message);
+            case "failure":
+            case "Failure":
+                logger.log(Level.WARNING, "Remote system indicates workflow failed: {0}", reason);
+                return new Failure(reason, message);
+            default:
+                logger.log(Level.WARNING, "Remote system returned a response with no \"status\" key or bad status value: {0}", escapeHtml4(externalData));
+                return new Failure("Workflow failure: Response from remote server doesn't have valid \"status\":" + escapeHtml4(externalData), null);
+            }
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "Remote system returned a bad response: {0}", externalData);
+        }
+        //In general, the remote workflow service creating the response is trusted, but, if it's causing an error, escape the result to avoid issues in the UI
+        return new Failure("Workflow failure: Response from remote server could not be parsed:" + escapeHtml4(externalData), null);
+
+    }
+    
+    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/worldmapauth/TokenApplicationType.java b/src/main/java/edu/harvard/iq/dataverse/worldmapauth/TokenApplicationType.java
deleted file mode 100644
index 2530f9b1285..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/worldmapauth/TokenApplicationType.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package edu.harvard.iq.dataverse.worldmapauth;
-
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.logging.Logger;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.Table;
-
-/**
- *
- * @author raprasad
- */
-@Entity
-@Table(name="worldmapauth_tokentype", indexes = {@Index(name = "application_name",  columnList="name", unique = true)})
-public class TokenApplicationType implements java.io.Serializable {    
-
-    private static final Logger logger = Logger.getLogger(TokenApplicationType.class.getCanonicalName());
-    public static final String DEFAULT_GEOCONNECT_APPLICATION_NAME = "GEOCONNECT";
-    public static final int DEFAULT_TOKEN_TIME_LIMIT_MINUTES = 30;
-    public static final String LOCAL_DEV_MAPIT_LINK = "http://127.0.0.1:8070/shapefile/map-it";  // local GeoConnect
-    public static final String DEV_MAPIT_LINK = "http://geoconnect.datascience.iq.harvard.edu/shapefile/map-it";   // dev GeoConnect
-
-    
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-  
-    @Column(nullable=false)
-    private String name;
-    
-    private String contactEmail;
-    
-    @Column(nullable=true)
-    private String hostname;
-    
-    @Column(nullable=true)
-    private String ipAddress;
-    
-    
-    @Column(nullable=false)
-    private String mapitLink;
-
-    //api_permissions = models.ManyToManyField(APIPermission, blank=True, null=True)
-    @Column(nullable=false, name="timeLimitMinutes", columnDefinition="int default 30")    
-    private int timeLimitMinutes;// = models.IntegerField(default=30, help_text='in minutes')
-    
-    @Column(nullable=false, name="timeLimitSeconds", columnDefinition="bigint default 1800")
-    private long timeLimitSeconds;
-    
-    @Column(nullable=false)
-    private String md5;
-    
-    @Column(nullable=false)
-    private Timestamp created;
-    
-    @Column(nullable=false)
-    private Timestamp modified;
-
-    public TokenApplicationType(){
-        
-        this.name = DEFAULT_GEOCONNECT_APPLICATION_NAME;
-        this.timeLimitMinutes = DEFAULT_TOKEN_TIME_LIMIT_MINUTES;
-        this.setCreated();
-        this.setModified();
-    }
-    
-    /**
-     * Get property id.
-     * @return Long, value of property id.
-     */
-    public Long getId() {
-            return this.id;
-    }
-
-    /**
-     * Set property id.
-     * @param id new value of property id.
-     */
-    public void setId(Long id) {
-            this.id = id;
-    }
-
-
-    /**
-     * Get property name.
-     * @return String, value of property name.
-     */
-    public String getName() {
-            return this.name;
-    }
-
-    /**
-     * Set property name.
-     * @param name new value of property name.
-     */
-    public void setName(String name) {
-            this.name = name;
-    }
-
-
-    /**
-     * Get property contactEmail.
-     * @return String, value of property contactEmail.
-     */
-    public String getContactEmail() {
-            return this.contactEmail;
-    }
-
-    /**
-     * Set property contactEmail.
-     * @param contactEmail new value of property contactEmail.
-     */
-    public void setContactEmail(String contactEmail) {
-            this.contactEmail = contactEmail;
-    }
-
-
-    /**
-     * Get property hostname.
-     * @return String, value of property hostname.
-     */
-    public String getHostname() {
-            return this.hostname;
-    }
-
-    /**
-     * Set property hostname.
-     * @param hostname new value of property hostname.
-     */
-    public void setHostname(String hostname) {
-            this.hostname = hostname;
-    }
-
-
-    /**
-     * Get property ipAddress.
-     * @return String, value of property ipAddress.
-     */
-    public String getIpAddress() {
-            return this.ipAddress;
-    }
-
-    /**
-     * Set property ipAddress.
-     * @param ipAddress new value of property ipAddress.
-     */
-    public void setIpAddress(String ipAddress) {
-            this.ipAddress = ipAddress;
-    }
-
-
-    /**
-     * Get property mapitLink.
-     * @return String, value of property mapitLink.
-     */
-    public String getMapitLink() {
-            return this.mapitLink;
-    }
-
-    /**
-     * Set property mapitLink.
-     * @param mapitLink new value of property mapitLink.
-     */
-    public void setMapitLink(String mapitLink) {
-            this.mapitLink = mapitLink;
-    }
-
-
-    /**
-     * Get property timeLimitMinutes.
-     * @return int, value of property timeLimitMinutes.
-     */
-    public int getTimeLimitMinutes() {
-            return this.timeLimitMinutes;
-    }
-
-    /**
-     * Set property timeLimitMinutes.
-     * @param timeLimitMinutes new value of property timeLimitMinutes.  Also sets timeLimitSeconds
-     */
-    public void setTimeLimitMinutes(int timeLimitMinutes) {
-        if (timeLimitMinutes < 1){
-            logger.warning("Cannot set Token time limit to less than 1 minute");
-            return;
-        }
-        this.timeLimitMinutes = timeLimitMinutes;
-        this.timeLimitSeconds = timeLimitMinutes * 60;
-    }
-
-
-    /**
-     * Get property timeLimitSeconds.
-     * @return long, value of property timeLimitSeconds.
-     */
-    public long getTimeLimitSeconds() {
-            return this.timeLimitSeconds;
-    }
-
-    
-    /**
-     * Get property md5.
-     * @return String, value of property md5.
-     */
-    public String getMd5() {
-            return this.md5;
-    }
-
-    /**
-     * Set property md5.
-     * @param md5 new value of property md5.
-     */
-    public void setMd5(String md5) {
-            this.md5 = md5;
-    }
-
-
-    /**
-     * Get property modified.
-     * @return Timestamp, value of property modified.
-     */
-    public Timestamp getModified() {
-            return this.modified;
-    }
-
-    /**
-     * Set property modified.
-     */
-    public void setModified() {
-        this.modified = new Timestamp(new Date().getTime());
-    }
-
-
-    /**
-     * Get property created.
-     * @return Timestamp, value of property created.
-     */
-    public Timestamp getCreated() {
-            return this.created;
-    }
-
-    /**
-     * Set property created.
-     */
-    public void setCreated() {
-            this.created = new Timestamp(new Date().getTime());
-    }
-
-    
-    @Override
-    public String toString() {
-        return "edu.harvard.iq.dataverse.worldmapauth.TokenApplicationType[id=" + this.id + "]";
-
-        //return "WorldMap Layer: " + this.layerName + " for DataFile: " + this.dataFile.toString();
-    }
-
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/worldmapauth/TokenApplicationTypeServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/worldmapauth/TokenApplicationTypeServiceBean.java
deleted file mode 100644
index 24c2f0c1c1e..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/worldmapauth/TokenApplicationTypeServiceBean.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package edu.harvard.iq.dataverse.worldmapauth;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.List;
-import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-
-/**
- *
- * @author raprasad
- */
-@Stateless
-@Named
-public class TokenApplicationTypeServiceBean {
-    
-    private static final Logger logger = Logger.getLogger(TokenApplicationTypeServiceBean.class.getCanonicalName());
-    
-    @PersistenceContext(unitName = "VDCNet-ejbPU")
-    private EntityManager em;
-    
-    public TokenApplicationType getGeoConnectApplication(){
-        logger.info("--getGeoConnectApplication--");
-        TokenApplicationType tat = this.findByName(TokenApplicationType.DEFAULT_GEOCONNECT_APPLICATION_NAME);
-        if (tat != null){
-            logger.info("-- Got it!!");
-            return tat;
-        }
-        // Make a default application for GeoConnect
-        tat = new TokenApplicationType();
-        tat.setName(TokenApplicationType.DEFAULT_GEOCONNECT_APPLICATION_NAME);
-        tat.setContactEmail("info@iq.harvard.edu");
-        tat.setHostname("geoconnect.datascience.iq.harvard.edu");
-        tat.setIpAddress("140.247.115.127");
-        tat.setTimeLimitMinutes(TokenApplicationType.DEFAULT_TOKEN_TIME_LIMIT_MINUTES);
-        //tat.setMapitLink(TokenApplicationType.LOCAL_DEV_MAPIT_LINK);
-        tat.setMapitLink(TokenApplicationType.DEV_MAPIT_LINK);
-        
-        return this.save(tat);
-        
-        //return null;
-    }
-    public TokenApplicationType find(Object pk) {
-        if (pk==null){
-            return null;
-        }
-        return em.find(TokenApplicationType.class, pk);
-    }
-    
-    /**
-     * 
-     * Convert string to md5 hash
-     * 
-        import hashlib
-        m = hashlib.md5()
-        m.update("Give me python or give me...more time, more time -- c.mena")
-        m.hexdigest()     #'266cf94160a22fe1ef118c907379cd60'
-     * @param stringToHash        
-     * @return         
-    */
-    public String getMD5Hash(String stringToHash){
-        if (stringToHash==null){
-            return null;
-        }
-        MessageDigest md;   
-        try {
-            md = MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException ex) {
-            logger.severe("Failed to set TokenApplicationType for 'Map It' request!!!");
-            return null;
-        }
-        md.update(stringToHash.getBytes());
-          
-        byte[] mdbytes = md.digest();
-        StringBuilder sb = new StringBuilder("");
-        for (int i = 0; i < mdbytes.length; i++) {
-            sb.append(Integer.toString((mdbytes[i] & 0xff) + 0x100, 16).substring(1));
-        }
-        return sb.toString();
-                
-       
-    }
-            
-    public TokenApplicationType save( TokenApplicationType tokenApp ) {
-        
-        if (tokenApp==null){
-            return null;
-        }
-        
-        if (tokenApp.getName()==null){
-            tokenApp.setName(TokenApplicationType.DEFAULT_GEOCONNECT_APPLICATION_NAME);
-        }
-        
-        if (tokenApp.getMapitLink()==null){
-            logger.warning("mapitLink is missing for tokenApp");
-            return null;
-        }
-        
-        // Set time limit minutes
-        Integer time_limit_minutes = tokenApp.getTimeLimitMinutes();
-        if (time_limit_minutes == null){
-            tokenApp.setTimeLimitMinutes(TokenApplicationType.DEFAULT_TOKEN_TIME_LIMIT_MINUTES);
-            // (also sets the time limit seconds)
-        }
-        
-        // set md5
-        tokenApp.setMd5(this.getMD5Hash(tokenApp.getName()));
-        
-        if ( tokenApp.getId() == null ) {
-            tokenApp.setCreated();
-            em.persist(tokenApp);
-            logger.fine("New tokenApp saved");
-            return tokenApp;
-	} else {
-            tokenApp.setModified();
-            logger.fine("Existing tokenApp saved");
-            return em.merge( tokenApp );
-	}
-    }
-	        
-   
-    public TokenApplicationType findByName(String name){
-        if (name == null){
-            return null;
-        }
-        try{
-            return em.createQuery("select m from TokenApplicationType m WHERE m.name=:name", TokenApplicationType.class)
-					.setParameter("name", name)
-					.getSingleResult();
-        } catch ( NoResultException nre ) {
-            return null;
-        }    
-    }
-    
-    
-    public List<TokenApplicationType> getAllTokenApplicationTypes(){
-        String qr = "select object(o) from TokenApplicationType order by o.modified desc";
-        TypedQuery<TokenApplicationType> query = em.createQuery(qr, TokenApplicationType.class);
-        return query.getResultList();
-    }    
-    
-}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapToken.java b/src/main/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapToken.java
deleted file mode 100644
index ccae1d1a920..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapToken.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package edu.harvard.iq.dataverse.worldmapauth;
-
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.Random;
-import java.util.logging.Logger;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-/**
- *
- * @author raprasad
- */
-@Entity
-@Table(name="worldmapauth_token"
-     , indexes = {@Index(name = "token_value",  columnList="token", unique = true)
-                , @Index(columnList="application_id")
-		, @Index(columnList="datafile_id")
-		, @Index(columnList="dataverseuser_id")
-     })
-public class WorldMapToken implements java.io.Serializable {   
-    
-    @Transient
-    public static final String GEOCONNECT_TOKEN_KEY = "GEOCONNECT_TOKEN";
-    @Transient
-    public static final long MAX_HOURS_TOKEN_CAN_BE_USED = 10;
-    
-    private static final Logger logger = Logger.getLogger(WorldMapToken.class.getCanonicalName());
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id; 
-
-    @Column(nullable=true)  
-    private String token;       // save it to get an id, then set token
-
-    @ManyToOne
-    @JoinColumn(nullable=false)
-    private TokenApplicationType application;
-
-    @ManyToOne
-    @JoinColumn(nullable=false)
-    private AuthenticatedUser dataverseUser;
-
-    @ManyToOne
-    @JoinColumn(nullable=false)
-    private DataFile dataFile;
-
-
-    @Column(nullable=false)
-    private boolean hasExpired;
-
-    @Column(nullable=false)
-    private Timestamp lastRefreshTime;
-
-    @Column(nullable=false)
-    private Timestamp modified;
-
-    @Column(nullable=false)
-    private Timestamp created;
-    
-    public WorldMapToken(){
-        this.setLastRefreshTime(this.getCurrentTimestamp());
-        this.setCreated();
-        this.setModified();
-    }
-        /**
-     * Get property token.
-     * @return String, value of property token.
-     */
-    public String getToken() {
-         return this.token;
-    }
-
-    public Long getId(){
-        return this.id;
-    }
-    /**
-     * Set property token.
-     * @param token new value of property token.
-     */
-    public boolean setToken(){
-        if (this.token != null){
-            return false;
-        }
-        if ((this.dataFile==null)||(this.dataverseUser==null)){
-            return false;
-        }
-        MessageDigest md;   
-        try {
-            md = MessageDigest.getInstance("SHA-256");
-        } catch (NoSuchAlgorithmException ex) {
-            logger.severe("Failed to set token for 'Map It' request!!!");
-            return false;
-        }
-        md.update(this.getCurrentTimestamp().toString().getBytes());
-        md.update(this.dataFile.toString().getBytes());
-        md.update(this.dataverseUser.toString().getBytes());
-        Random rand = new Random();
-        Integer rnd_int = rand.nextInt();
-        md.update(rnd_int.byteValue());
-        
-        byte[] mdbytes = md.digest();
-        StringBuilder sb = new StringBuilder("");
-        for (int i = 0; i < mdbytes.length; i++) {
-            sb.append(Integer.toString((mdbytes[i] & 0xff) + 0x100, 16).substring(1));
-        }
-        this.token = sb.toString();
-        //this.token = md.toString();
-        return true;
-    }
-
-
-    /**
-     * Get property application.
-     * @return TokenApplicationType, value of property application.
-     */
-    public TokenApplicationType getApplication() {
-            return this.application;
-    }
-
-    /**
-     * Set property application.
-     * @param application new value of property application.
-     */
-    public void setApplication(TokenApplicationType application) {
-            this.application = application;
-    }
-
-
-    /**
-     * Get property dataverseUser.
-     * @return DataverseUser, value of property dataverseUser.
-     */
-    public AuthenticatedUser getDataverseUser() {
-            return this.dataverseUser;
-    }
-
-    /**
-     * Set property dataverseUser.
-     * @param dataverseUser new value of property dataverseUser.
-     */
-    public void setDataverseUser(AuthenticatedUser dataverseUser) {
-            this.dataverseUser = dataverseUser;
-    }
-
-
-    /**
-     * Get property datafile.
-     * @return DataFile, value of property datafile.
-     */
-    public DataFile getDatafile() {
-            return this.dataFile;
-    }
-
-    /**
-     * Set property datafile.
-     * @param datafile new value of property datafile.
-     */
-    public void setDatafile(DataFile dataFile) {
-            this.dataFile = dataFile;
-    }
-
-
-    /**
-     * Get property hasExpired.
-     * @return boolean, value of property hasExpired.
-     */
-    public boolean getHasExpired() {
-        return this.hasExpired;
-    }
-
-    /**
-     * Set property hasExpired.
-     * @param hasExpired new value of property hasExpired.
-     */
-    public void setHasExpired(boolean hasExpired) {
-        this.hasExpired = hasExpired;
-    }
-
-
-    /**
-     * Get property lastRefreshTime.
-     * @return Timestamp, value of property lastRefreshTime.
-     */
-    public Timestamp getLastRefreshTime() {
-       return this.lastRefreshTime;
-    }
-
-    /**
-     * Set property lastRefreshTime.
-     * @param lastRefreshTime new value of property lastRefreshTime.
-     */
-    public void setLastRefreshTime(Timestamp lastRefreshTime) {
-        this.lastRefreshTime = this.getCurrentTimestamp();
-    }
-
-
-    /**
-     * Get property modified.
-     * @return Timestamp, value of property modified.
-     */
-    public Timestamp getModified() {
-            return this.modified;
-    }
-
-    /**
-     * Set property modified.
-     */
-    public void setModified() {
-        this.modified = this.getCurrentTimestamp();
-    }
-
-
-    /**
-     * Get property created.
-     * @return Timestamp, value of property created.
-     */
-    public Timestamp getCreated() {
-            return this.created;
-    }
-
-
-    /**
-     * Set property created.
-     */
-    public void setCreated() {
-            this.created = this.getCurrentTimestamp();
-    }
-
-    public boolean hasTokenExpired(){
-        logger.fine("hasTokenExpired");
- //       long currentTime = this.getCurrentTimestamp();//new Date().getTime();
-        return this.hasTokenExpired(this.getCurrentTimestamp());
-    }
-    
-    
-  private long getElapsedHours(Timestamp currentTime, Timestamp oldTime){
-       
-       // If values are null, send back an elapsed time
-       if ((currentTime==null)||(oldTime==null)){
-            return this.application.getTimeLimitSeconds() + 100000;
-       }
-       
-        long milliseconds1 = oldTime.getTime();
-        long milliseconds2 = currentTime.getTime();
-
-        long diff = milliseconds2 - milliseconds1;
-        //long diffSeconds = diff / 1000;
-        //long diffMinutes = diff / (60 * 1000);
-        long diffHours = diff / (60 * 60 * 1000);
-        //long diffDays = diff / (24 * 60 * 60 * 1000);
-
-        return diffHours;
-    }
-  
-   private long getElapsedSeconds(Timestamp currentTime, Timestamp oldTime){
-       
-       // If values are null, send back an elapsed time
-       if ((currentTime==null)||(oldTime==null)){
-            return this.application.getTimeLimitSeconds() + 100000;
-       }
-       
-        long milliseconds1 = oldTime.getTime();
-        long milliseconds2 = currentTime.getTime();
-
-        long diff = milliseconds2 - milliseconds1;
-        long diffSeconds = diff / 1000;
-        //long diffMinutes = diff / (60 * 1000);
-        //long diffHours = diff / (60 * 60 * 1000);
-        //long diffDays = diff / (24 * 60 * 60 * 1000);
-
-        return diffSeconds;
-    }
-    
-    public boolean hasTokenExpired(Timestamp currentTimestamp){
-        logger.fine("hasTokenExpired (w/timestamp)");
-
-        if (this.getHasExpired()){
-            return true;
-        }
-        
-        if ((currentTimestamp==null)||(this.lastRefreshTime==null)){            
-            this.expireToken();
-            return true;
-        }
-         logger.fine("currentTimestamp: " + currentTimestamp);
-         logger.fine("lastRefreshTime: " + lastRefreshTime);
-
-        //System.out.println("  ..pre diff: "+ currentTimestamp);
-        long hours = this.getElapsedHours(currentTimestamp, this.created);
-        logger.fine("elapsed hours: " + hours);
-
-        if (hours > MAX_HOURS_TOKEN_CAN_BE_USED){
-            this.expireToken();
-            return true;
-        }
-        
-        long diffSeconds = this.getElapsedSeconds(currentTimestamp, this.lastRefreshTime);
-        //System.out.println("  ..diffSeconds: "+ diffSeconds);
-        //logger.fine("this.application.getTimeLimitSeconds: "+ this.application.getTimeLimitSeconds());
-        if (diffSeconds > this.application.getTimeLimitSeconds()){
-            this.expireToken();
-            return true;
-        }
-        return false;
-                
-    }
-    
-    public void expireToken(){
-        this.setHasExpired(true);
-    }
-    
-    
-    public Timestamp getCurrentTimestamp(){
-        return new Timestamp(new Date().getTime());
-    }
-    
-    public boolean refreshToken(){
-        
-        if (this.getHasExpired()){
-            return false;
-        }
-        Timestamp currentTime = this.getCurrentTimestamp();
-        if (this.hasTokenExpired(currentTime)){
-            return false;
-        }
-        this.setLastRefreshTime(currentTime);
-        return true;
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapTokenServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapTokenServiceBean.java
deleted file mode 100644
index 7ca5c62b1f3..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapTokenServiceBean.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package edu.harvard.iq.dataverse.worldmapauth;
-
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.PermissionServiceBean;
-import edu.harvard.iq.dataverse.authorization.Permission;
-import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-
-/**
- *
- * @author raprasad
- */
-@Stateless
-@Named
-public class WorldMapTokenServiceBean {
-    
-    @EJB
-    PermissionServiceBean permissionService;
-
-    @EJB
-    TokenApplicationTypeServiceBean tokenApplicationService;
-     
-    private static final Logger logger = Logger.getLogger(TokenApplicationTypeServiceBean.class.getCanonicalName());
-
-    @PersistenceContext(unitName = "VDCNet-ejbPU")
-    private EntityManager em;
-    
-    /**
-     * 
-     * Retrieve a fresh token to map a Dataverse file on GeoConnect
-     * 
-     * @param dataFile
-     * @param dvUser
-     * @return WorldMapToken
-     */
-    @TransactionAttribute(REQUIRES_NEW) 
-    public WorldMapToken getNewToken(DataFile dataFile, AuthenticatedUser dvUser){
-        if ((dataFile==null)||(dvUser==null)){
-            logger.severe("dataFile or dvUser is null");
-            return null;
-        }
-        WorldMapToken token = new WorldMapToken();
-        token.setApplication(tokenApplicationService.getGeoConnectApplication());
-        token.setDatafile(dataFile);
-        token.setDataverseUser(dvUser);
-        token.setModified();
-        token.setToken();   
-        return this.save(token);
-    }
-
-    public WorldMapToken find(Object pk) {
-        if (pk==null){
-            return null;
-        }
-        return em.find(WorldMapToken.class, pk);
-    }
-    
-
-    /**
-     * Expire the token, set the "hasExpired" flag to True
-     * 
-     * @param wmToken 
-     */
-    public void expireToken(WorldMapToken wmToken){
-        if (wmToken==null){
-            return;
-        }
-        wmToken.expireToken();
-        em.merge(wmToken);     
-    }
-    
-    /**
-     * Expire and then Delete the token
-     * (The expire is a bit extraneous)
-     * 
-     * @param wmToken 
-     */
-    public void deleteToken(WorldMapToken wmToken){
-    
-        if (wmToken==null){
-            return;
-        }
-        em.remove(em.merge(wmToken));
-    }
-    
-    /*
-        Remove expired tokens from the database
-    */
-    public void deleteExpiredTokens(){
-
-        TypedQuery<WorldMapToken> query = em.createQuery("select object(w) from WorldMapToken as w where w.hasExpired IS TRUE", WorldMapToken.class);// order by o.name");
-        List<WorldMapToken> tokenList = query.getResultList();
-        for (WorldMapToken wmToken : tokenList) {
-           // em.remove(token);
-            em.remove(em.merge(wmToken));
-	}
-    }
-
-     public WorldMapToken save( WorldMapToken dvToken ) {
-        
-         if (dvToken==null){
-            return null;
-        }
-        
-        if (dvToken.getToken()==null){
-            dvToken.setToken();
-        }
-        
-        if (dvToken.getApplication().getMapitLink()==null){
-            logger.warning("mapitLink is missing for token_application");
-            return null;
-        }
-        
-        TokenApplicationType dat = dvToken.getApplication();
-        if (dat==null){
-            logger.warning("TokenApplicationType is null for WorldMapToken");
-            return null;
-        }
-        
-        if ( dvToken.getId()== null ) {            
-            em.persist(dvToken);
-            logger.fine("New token_application saved");
-            return dvToken;
-	} else {
-            logger.fine("Existing token_application saved");
-            return em.merge( dvToken );
-	}
-    }
-	        
-   
-    public WorldMapToken findByName(String token){
-        if (token == null){
-            return null;
-        }
-
-        try{
-            return em.createQuery("select m from WorldMapToken m WHERE m.token=:token", WorldMapToken.class)
-					.setParameter("token", token)
-					.getSingleResult();
-        } catch ( NoResultException nre ) {
-            return null;
-        }    
-    }
-
-    
-    
-    /**
-     * Given a string token, retrieve the related WorldMapToken object
-     * 
-     * @param worldmapTokenParam
-     * @return WorldMapToken object (if it hasn't expired)
-     */
-    public WorldMapToken retrieveAndRefreshValidToken(String worldmapTokenParam){
-        if (worldmapTokenParam==null){
-            logger.warning("worldmapTokenParam is null.  Permission denied.");
-            return null;
-        }
-        WorldMapToken wmToken = this.findByName(worldmapTokenParam);
-        if (wmToken==null){
-            logger.warning("WorldMapToken not found for '" + worldmapTokenParam + "'.  Permission denied.");
-            return null;
-        }
-        if (wmToken.hasTokenExpired()){
-            em.remove(em.merge(wmToken));   // Delete expired token from the database.
-            logger.warning("WorldMapToken has expired.  Permission denied.");
-            return null;
-        }
-        wmToken.refreshToken();
-        
-        logger.info("WorldMapToken refreshed.");
-        this.save(wmToken);
-        
-        return wmToken;
-    }
-    
-    
-    /*
-        Can the user connected to the WorldMapToken still
-            edit the dataset for the file connected to the token?         
-    */
-    public boolean canTokenUserEditFile(WorldMapToken wmToken){
-        if (wmToken==null){
-            return false;
-        }
-        if (permissionService.userOn(wmToken.getDataverseUser(), wmToken.getDatafile()).has(Permission.EditDataset)) { 
-            logger.info("WorldMap token-based auth: Token's User is still authorized to edit the dataset for the datafile.");
-            return true;
-        }
-        return false;
-        
-    }
-
-    /*
-        Can the user connected to the WorldMapToken still
-            download the file connected to the token?         
-    */
-    private boolean canTokenUserDownloadFile(WorldMapToken wmToken){
-        if (wmToken==null){
-            return false;
-        }
-        if (permissionService.userOn(wmToken.getDataverseUser(), wmToken.getDatafile()).has(Permission.DownloadFile)) { 
-            logger.info("WorldMap token-based auth: Token's User is still authorized to download the datafile.");
-            return true;
-        }
-        return false;
-        
-    }
-
-    
-    /*
-        Given a string for a WorldMapToken and DataFile, check:
-    
-            (1) Is this token valid?
-            (2) Does the token correspond to this DataFile?
-    
-        @return boolean if token is valid and corresponds to the given DataFile
-    
-    */
-    public boolean isWorldMapTokenAuthorizedForDataFileDownload(String worldmapTokenParam, DataFile df){
-        logger.info("-- isWorldMapTokenAuthorizedForDataFileworldmapTokenParam " + worldmapTokenParam);
-        
-        if ((worldmapTokenParam == null)||(df == null)){
-            logger.info("nope: worldmapTokenParam or data file is null");
-            return false;
-        }
-        
-        // Check 1:  Is this a valid WorldMap token?
-        //
-        WorldMapToken token = this.retrieveAndRefreshValidToken(worldmapTokenParam);
-        if (token==null){
-            logger.info("WorldMap token-based auth: Token is not invalid.");
-            return false;
-        }
-        
-
-        // Check 2:  Does this WorldMap token's datafile match the requested datafile?
-        //
-        if (!(token.getDatafile().getId().equals(df.getId()))){
-            logger.info("WorldMap token-based auth: Token's datafile does not match the requested datafile.");
-            return false;
-        }
-        
-        // Check 3:  Does this WorldMap token's user have permission for the requested datafile?
-        //
-        if (!(this.canTokenUserDownloadFile(token))){ 
-            logger.info("WorldMap token-based auth: Token's User is not authorized for the requested datafile.");
-            return false;
-        }
-            
-        
-        logger.info("WorldMap token-based auth: Token is valid for the requested datafile");
-        return true;
-        
-    }
-    
-    
-    /*
-        Given a string for a WorldMapToken, check:
-    
-            (1) Is this token valid?
-            (2) Re-verify that can edit the Dataset connected to the token's DataFile
-    
-        @return boolean if token is valid and corresponds to the given DataFile
-    
-    */
-    public boolean isWorldMapTokenAuthorizedForMetadataRetrievalAndUpdates(String worldmapTokenParam){
-        logger.info("-- isWorldMapTokenAuthorizedForDataFile?");
-        if (worldmapTokenParam == null){
-            logger.info("nope: worldmapTokenParam or data file is null");
-            return false;
-        }
-        
-        // Check 1:  Is this a valid WorldMap token?
-        //
-        WorldMapToken token = this.retrieveAndRefreshValidToken(worldmapTokenParam);
-        if (token==null){
-            logger.info("WorldMap token-based auth: Token is not invalid.");
-            return false;
-        }
-        
-               
-   
-        // Check 2:  Does this WorldMap token's user still have edit permission for the requested datafile?
-        //
-        if (!(this.canTokenUserEditFile(token))){ 
-            logger.info("WorldMap token-based auth: Token's User is not authorized for the requested datafile.");
-            return false;
-        }
-            
-        
-        logger.info("WorldMap token-based auth: Token is valid for the requested datafile");
-        return true;
-        
-    }
-} // end of class
diff --git a/src/main/java/propertyFiles/3dobjects.properties b/src/main/java/propertyFiles/3dobjects.properties
new file mode 100644
index 00000000000..97b8b0698dc
--- /dev/null
+++ b/src/main/java/propertyFiles/3dobjects.properties
@@ -0,0 +1,74 @@
+metadatablock.name=3dobjects
+metadatablock.displayName=3D Objects Metadata
+metadatablock.displayFacet=
+datasetfieldtype.3d3DTechnique.title=3D Technique
+datasetfieldtype.3dEquipment.title=Equipment
+datasetfieldtype.3dLightingSetup.title=Lighting Setup
+datasetfieldtype.3dMasterFilePolygonCount.title=Master File Polygon Count
+datasetfieldtype.3dExportedFilePolygonCount.title=Exported File Polygon Count
+datasetfieldtype.3dExportedFileFormat.title=Exported File Format
+datasetfieldtype.3dAltText.title=Alt-Text
+datasetfieldtype.3dMaterialComposition.title=Material Composition
+datasetfieldtype.3dObjectDimensions.title=Object Dimensions
+datasetfieldtype.3dLength.title=Length
+datasetfieldtype.3dWidth.title=Width
+datasetfieldtype.3dHeight.title=Height
+datasetfieldtype.3dWeight.title=Weight
+datasetfieldtype.3dUnit.title=Unit
+datasetfieldtype.3dHandling.title=Instructions
+datasetfieldtype.3d3DTechnique.description=The technique used for capturing the 3D data
+datasetfieldtype.3dEquipment.description=The equipment used for capturing the 3D data
+datasetfieldtype.3dLightingSetup.description=The lighting used while capturing the 3D data
+datasetfieldtype.3dMasterFilePolygonCount.description=The high-resolution polygon count
+datasetfieldtype.3dExportedFilePolygonCount.description=The exported mesh polygon count
+datasetfieldtype.3dExportedFileFormat.description=The format of the exported mesh
+datasetfieldtype.3dAltText.description=A physical description of the object modeled
+datasetfieldtype.3dMaterialComposition.description=The material used to create the object, e.g. stone
+datasetfieldtype.3dObjectDimensions.description=The general measurements of the physical object
+datasetfieldtype.3dLength.description=The rough length of the object
+datasetfieldtype.3dWidth.description=The rough width of the object
+datasetfieldtype.3dHeight.description=The rough height of the object
+datasetfieldtype.3dWeight.description=The rough weight of the object
+datasetfieldtype.3dUnit.description=The unit of measurement used for the object dimensions
+datasetfieldtype.3dHandling.description=Safety and special handling instructions for the object
+datasetfieldtype.3d3DTechnique.watermark=
+datasetfieldtype.3dEquipment.watermark=
+datasetfieldtype.3dLightingSetup.watermark=
+datasetfieldtype.3dMasterFilePolygonCount.watermark=
+datasetfieldtype.3dExportedFilePolygonCount.watermark=
+datasetfieldtype.3dExportedFileFormat.watermark=
+datasetfieldtype.3dAltText.watermark=
+datasetfieldtype.3dMaterialComposition.watermark=
+datasetfieldtype.3dObjectDimensions.watermark=
+datasetfieldtype.3dLength.watermark=
+datasetfieldtype.3dWidth.watermark=
+datasetfieldtype.3dHeight.watermark=
+datasetfieldtype.3dWeight.watermark=
+datasetfieldtype.3dUnit.watermark=
+datasetfieldtype.3dHandling.watermark=
+controlledvocabulary.3d3DTechnique.ir_scanner=IR Scanner
+controlledvocabulary.3d3DTechnique.laser=Laser
+controlledvocabulary.3d3DTechnique.modelled=Modelled
+controlledvocabulary.3d3DTechnique.photogrammetry=Photogrammetry
+controlledvocabulary.3d3DTechnique.rti=RTI
+controlledvocabulary.3d3DTechnique.structured_light=Structured Light
+controlledvocabulary.3d3DTechnique.tomographic=Tomographic
+controlledvocabulary.3d3DTechnique.other=Other
+controlledvocabulary.3dLightingSetup.natural_light=Natural Light
+controlledvocabulary.3dLightingSetup.lightbox=Lightbox
+controlledvocabulary.3dLightingSetup.led=LED
+controlledvocabulary.3dLightingSetup.fluorescent=Fluorescent
+controlledvocabulary.3dLightingSetup.other=Other
+controlledvocabulary.3dUnit.cm=cm
+controlledvocabulary.3dUnit.m=m
+controlledvocabulary.3dUnit.in=in
+controlledvocabulary.3dUnit.ft=ft
+controlledvocabulary.3dUnit.lbs=lbs
+controlledvocabulary.3dExportedFileFormat..fbx=.fbx
+controlledvocabulary.3dExportedFileFormat..glb=.glb
+controlledvocabulary.3dExportedFileFormat..gltf=.gltf
+controlledvocabulary.3dExportedFileFormat..obj=.obj
+controlledvocabulary.3dExportedFileFormat..stl=.stl
+controlledvocabulary.3dExportedFileFormat..usdz=.usdz
+controlledvocabulary.3dExportedFileFormat..x3d=.x3d
+controlledvocabulary.3dExportedFileFormat.other=other
diff --git a/src/main/java/propertyFiles/BuiltInRoles.properties b/src/main/java/propertyFiles/BuiltInRoles.properties
index 3c4b8020002..50dbb1ba80f 100644
--- a/src/main/java/propertyFiles/BuiltInRoles.properties
+++ b/src/main/java/propertyFiles/BuiltInRoles.properties
@@ -1,9 +1,9 @@
 role.admin.name=Admin
-role.admin.description=A person who has all permissions for dataverses, datasets, and files.
-role.editor.name=Contributor
-role.editor.description=For datasets, a person who can edit License + Terms, and then submit them for review.
+role.admin.description=A person who has all permissions for dataverses, datasets, and files, including approving requests for restricted data.
+role.contributor.name=Contributor
+role.contributor.description=For datasets, a person who can edit License + Terms, and then submit them for review.
 role.curator.name=Curator
-role.curator.description=For datasets, a person who can edit License + Terms, edit Permissions, and publish datasets.
+role.curator.description=For datasets, a person who can edit License + Terms, edit Permissions, and publish and link datasets.
 role.dscontributor.name=Dataset Creator
 role.dscontributor.description=A person who can add datasets within a dataverse.
 role.fullcontributor.name=Dataverse + Dataset Creator
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
old mode 100755
new mode 100644
index 5014d2b3b26..486a4e9b7f2
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -3,17 +3,50 @@ newDataverse=New Dataverse
 hostDataverse=Host Dataverse
 dataverses=Dataverses
 passwd=Password
+# BEGIN dataset types
+# `dataset=Dataset` has been here since 4.0 but now that we have dataset types,
+# we need to add the rest of the types here for two reasons. First, we want
+# translators to be able to translate these types. Second, in English it looks
+# weird to have only "Dataset" capitalized in the facet but not "software" and
+# "workflow". This capitalization (looking up here in the bundle) is done by
+# SearchServiceBean near the comment "This is where facets are capitalized".
 dataset=Dataset
+software=Software
+workflow=Workflow
+# END dataset types
 datasets=Datasets
 newDataset=New Dataset
 files=Files
 file=File
+public=Public
 restricted=Restricted
-restrictedaccess=Restricted Access
+restrictedaccess=Restricted with Access Granted
+embargoed=Embargoed
+embargoedaccess=Embargoed with Access
+embargoedandrestricted=Embargoed and then Restricted
+embargoedandrestrictedaccess=Embargoed and then Restricted with Access
+retentionExpired=Retention Period Expired
+incomplete=Incomplete metadata
+valid=Valid
 find=Find
 search=Search
 language=Language
+created=Created
+deposited=Deposited
+published=Published
+metadatareleased=Metadata Released
 unpublished=Unpublished
+embargoed.until=Embargoed until
+embargoed.wasthrough=Was embargoed until
+embargoed.willbeuntil=Draft: will be embargoed until
+embargo.date.invalid=Date is outside the allowed range: ({0} to {1})
+embargo.date.required=An embargo date is required
+retention.after=Was retained until
+retention.isfrom=Is retained until
+retention.willbeafter=Draft: will be retained until
+retention.enddateinfo=after which it will no longer be accessible
+retention.date.invalid=Date is outside the allowed range: ({0} to {1})
+retention.date.required=A retention period end date is required
 cancel=Cancel
 ok=OK
 saveChanges=Save Changes
@@ -30,11 +63,17 @@ description=Description
 subject=Subject
 close=Close
 preview=Preview
+query=Query
 continue=Continue
 name=Name
 institution=Institution
 position=Position
 affiliation=Affiliation
+storage=Storage
+curationLabels=Curation Labels
+metadataLanguage=Dataset Metadata Language
+guestbookEntryOption=Guestbook Mode
+pidProviderOption=PID Provider Option
 createDataverse=Create Dataverse
 remove=Remove
 done=Done
@@ -43,6 +82,7 @@ manager=Manager
 curator=Curator
 explore=Explore
 download=Download
+transfer=Globus Transfer
 downloadOriginal=Original Format
 downloadArchival=Archival Format (.tab)
 deaccession=Deaccession
@@ -53,6 +93,11 @@ harvested=Harvested
 apply=Apply
 add=Add
 delete=Delete
+copyClipboard=Copy to Clipboard
+truncateMoreBtn=Read full {0} [+]
+truncateMoreTip=Click to read the full {0}.
+truncateLessBtn=Collapse {0} [-]
+truncateLessTip=Click to collapse the {0}.
 yes=Yes
 no=No
 previous=Previous
@@ -65,7 +110,9 @@ select=Select...
 selectedFiles=Selected Files
 htmlAllowedTitle=Allowed HTML Tags
 htmlAllowedMsg=This field supports only certain <a class="popoverHTML" tabindex="0" role="button">HTML tags</a>.
-htmlAllowedTags=<a>, <b>, <blockquote>, <br>, <code>, <del>, <dd>, <dl>, <dt>, <em>, <hr>, <h1>-<h3>, <i>, <img>, <kbd>, <li>, <ol>, <p>, <pre>, <s>, <sup>, <sub>, <strong>, <strike>, <ul>
+htmlAllowedTags=&lt;a&gt;, &lt;b&gt;, &lt;blockquote&gt;, &lt;br&gt;, &lt;code&gt;, &lt;del&gt;, &lt;dd&gt;, &lt;dl&gt;, &lt;dt&gt;, &lt;em&gt;, &lt;hr&gt;, &lt;h1&gt;-&lt;h3&gt;, &lt;i&gt;, &lt;img&gt;, &lt;kbd&gt;, &lt;li&gt;, &lt;ol&gt;, &lt;p&gt;, &lt;pre&gt;, &lt;s&gt;, &lt;sup&gt;, &lt;sub&gt;, &lt;strong&gt;, &lt;strike&gt;, &lt;u&gt;, &lt;ul&gt;
+conditionalRequiredMsg=One or more of these fields may become required if you add to one or more of these optional fields.
+conditionalRequiredMsg.tooltip=This field will become required if you choose to enter values in one or more of these optional fields.
 toggleNavigation=Toggle navigation
 defaultBody=Default Body
 loading=Loading...
@@ -121,10 +168,12 @@ contact.header=Contact {0}
 contact.dataverse.header=Email Dataverse Contact
 contact.dataset.header=Email Dataset Contact
 contact.to=To
+contact.cc=CC
 contact.support=Support
 contact.from=From
 contact.from.required=User email is required.
 contact.from.invalid=Email is invalid.
+contact.from.emailPlaceholder=name@email.xyz
 contact.subject=Subject
 contact.subject.required=Subject is required.
 contact.subject.selectTab.top=Select subject...
@@ -134,6 +183,7 @@ contact.msg=Message
 contact.msg.required=Message text is required.
 contact.send=Send Message
 contact.question=Please fill this out to prove you are not a robot.
+contact.sum.title=Human Access Validation Answer
 contact.sum.required=Value is required.
 contact.sum.invalid=Incorrect sum, please try again.
 contact.sum.converterMessage=Please enter a number.
@@ -144,7 +194,7 @@ contact.context.subject.support={0} support request: {1}
 contact.context.dataverse.intro={0}You have just been sent the following message from {1} via the {2} hosted dataverse named "{3}":\n\n---\n\n
 contact.context.dataverse.ending=\n\n---\n\n{0}\n{1}\n\nGo to dataverse {2}/dataverse/{3}\n\nYou received this email because you have been listed as a contact for the dataverse. If you believe this was an error, please contact {4} at {5}. To respond directly to the individual who sent the message, simply reply to this email.
 contact.context.dataverse.noContact=There is no contact address on file for this dataverse so this message is being sent to the system address.\n\n
-contact.context.dataset.greeting.helloFirstLast=Hello {0} {1},
+contact.context.dataset.greeting.helloFirstLast=Hello {0},
 contact.context.dataset.greeting.organization=Attention Dataset Contact:
 contact.context.dataset.intro={0}\n\nYou have just been sent the following message from {1} via the {2} hosted dataset titled "{3}" ({4}):\n\n---\n\n
 contact.context.dataset.ending=\n\n---\n\n{0}\n{1}\n\nGo to dataset {2}/dataset.xhtml?persistentId={3}\n\nYou received this email because you have been listed as a contact for the dataset. If you believe this was an error, please contact {4} at {5}. To respond directly to the individual who sent the message, simply reply to this email.
@@ -153,9 +203,9 @@ contact.context.file.intro={0}\n\nYou have just been sent the following message
 contact.context.file.ending=\n\n---\n\n{0}\n{1}\n\nGo to file {2}/file.xhtml?fileId={3}\n\nYou received this email because you have been listed as a contact for the dataset. If you believe this was an error, please contact {4} at {5}. To respond directly to the individual who sent the message, simply reply to this email.
 contact.context.support.intro={0},\n\nThe following message was sent from {1}.\n\n---\n\n
 contact.context.support.ending=\n\n---\n\nMessage sent from Support contact form.
+contact.sent=Message sent.
 
 # dataverseuser.xhtml
-institution.name=A Dataverse Instance
 account.info=Account Information
 account.edit=Edit Account
 account.apiToken=API Token
@@ -165,6 +215,13 @@ user.helpShibUserMigrateOffShibAfterLink=for assistance.
 user.helpOAuthBeforeLink=Your Dataverse account uses {0} for login. If you are interested in changing login methods, please contact
 user.helpOAuthAfterLink=for assistance.
 user.lostPasswdTip=If you have lost or forgotten your password, please enter your username or email address below and click Submit. We will send you an e-mail with your new password.
+
+user.orcid=ORCID
+user.orcid.link=Link to ORCID profile
+user.orcid.authenticate=Add Authenticated ORCID
+user.orcid.remove=Remove ORCID
+user.orcid.callback.message=<strong>Authentication Error</strong> - Dataverse could not authenticate your login at ORCID and will not add your ORCID to your profile. Please make sure you authorize your account to connect with Dataverse.
+
 user.dataRelatedToMe=My Data
 wasCreatedIn=, was created in
 wasCreatedTo=, was added to
@@ -173,24 +230,31 @@ wasPublished=, was published in
 wasReturnedByReviewer=, was returned by the curator of 
 # TODO: Confirm that "toReview" can be deleted.
 toReview=Don't forget to publish it or send it back to the contributor!
-worldMap.added=dataset had a WorldMap layer data added to it.
 # Bundle file editors, please note that "notification.welcome" is used in a unit test.
-notification.welcome=Welcome to {0}! Get started by adding or finding data. Have questions? Check out the {1}. Want to test out Dataverse features? Use our {2}. Also, check for your welcome email to verify your address.
+notification.welcome=Welcome to {0}! Get started by adding or finding data. Have questions? Check out the {1}. Want to test out Dataverse features? Use our {2}.
+notification.welcomeConfirmEmail=Also, check for your welcome email to verify your address.
 notification.demoSite=Demo Site
 notification.requestFileAccess=File access requested for dataset: {0} was made by {1} ({2}).
+notification.requestedFileAccess=You have requested access to files in dataset: {0}.
 notification.grantFileAccess=Access granted for files in dataset: {0}.
 notification.rejectFileAccess=Access rejected for requested files in dataset: {0}.
 notification.createDataverse={0} was created in {1} . To learn more about what you can do with your dataverse, check out the {2}. 
 notification.dataverse.management.title=Dataverse Management - Dataverse User Guide
 notification.createDataset={0} was created in {1}. To learn more about what you can do with a dataset, check out the {2}.
+notification.datasetCreated={0} was created in {1} by {2}.
 notification.dataset.management.title=Dataset Management - Dataset User Guide
 notification.wasSubmittedForReview={0} was submitted for review to be published in {1}. Don''t forget to publish it or send it back to the contributor, {2} ({3})\!
 notification.wasReturnedByReviewer={0} was returned by the curator of {1}.
 notification.wasPublished={0} was published in {1}.
-notification.ingestCompleted=Dataset <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a> ingest has successfully finished.
-notification.ingestCompletedWithErrors=Dataset <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a> ingest has finished with errors.
-notification.worldMap.added={0}, dataset had WorldMap layer data added to it.
-notification.maplayer.deletefailed=Failed to delete the map layer associated with the restricted file {0} from WorldMap. Please try again, or contact WorldMap and/or Dataverse support. (Dataset: {1})
+notification.publishFailedPidReg={0} in {1} could not be published due to a failure to register, or update the Global Identifier for the dataset or one of the files in it. Contact support if this continues to happen.
+notification.workflowFailed=An external workflow run on {0} in {1} has failed. Check your email and/or view the Dataset page which may have additional details. Contact support if this continues to happen.
+notification.workflowSucceeded=An external workflow run on {0} in {1} has succeeded. Check your email and/or view the Dataset page which may have additional details.
+notification.statusUpdated=The status of dataset {0} has been updated to {1}.
+notification.pidreconciled=The persistent identifier of dataset {0} has been updated to `{1}`.
+notification.datasetMentioned=Announcement Received: Newly released {0} <a href="{1}">{2}</a> {3} Dataset {4}.
+
+notification.ingestCompleted=Dataset <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a> has one or more tabular files that completed the <a href="{2}/{3}/user/dataset-management.html#tabular-data-files" title="Tabular Data Files - Dataverse User Guide" target="_blank" rel="noopener">tabular ingest process</a> and are available in archival formats.
+notification.ingestCompletedWithErrors=Dataset <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a> has one or more tabular files that are available but are not supported for <a href="{2}/{3}/user/dataset-management.html#tabular-data-files" title="Tabular Data Files- Dataverse User Guide" target="_blank" rel="noopener">tabular ingest</a>.
 notification.generic.objectDeleted=The dataverse, dataset, or file for this notification has been deleted.
 notification.access.granted.dataverse=You have been granted the {0} role for {1}.
 notification.access.granted.dataset=You have been granted the {0} role for {1}.
@@ -201,12 +265,64 @@ notification.access.revoked.dataverse=You have been removed from a role in {0}.
 notification.access.revoked.dataset=You have been removed from a role in {0}.
 notification.access.revoked.datafile=You have been removed from a role in {0}.
 notification.checksumfail=One or more files in your upload failed checksum validation for dataset <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a>. Please re-run the upload script. If the problem persists, please contact support.
-notification.ingest.completed=Dataset <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a> ingest process has successfully finished.<br><br>Ingested files:{3}<br>
-notification.ingest.completedwitherrors=Dataset <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a> ingest process has finished with errors.<br><br>Ingested files:{3}<br>
+notification.ingest.completed=Your Dataset <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a> has one or more tabular files that completed the tabular ingest process. These files will be available for download in their original formats and other formats for enhanced archival purposes after you publish the dataset. The archival .tab files are displayed in the file table. Please see <a href="{3}/{4}/user/dataset-management.html#tabular-data-files" title="Tabular Data Files - Dataverse User Guide" target="_blank" rel="noopener">the guides</a> for more information about ingest and support for tabular files.
+notification.ingest.completedwitherrors=Your Dataset <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a> has one or more tabular files that have been uploaded successfully but are not supported for tabular ingest. After you publish the dataset, these files will not have additional archival features. Please see <a href="{3}/{4}/user/dataset-management.html#tabular-data-files" title="Tabular Data Files - Dataverse User Guide" target="_blank" rel="noopener">the guides</a> for more information about ingest and support for tabular files.<br><br>Files with incomplete ingest:{5}
 notification.mail.import.filesystem=Dataset {2} ({0}/dataset.xhtml?persistentId={1}) has been successfully uploaded and verified.
+notification.mail.globus.upload.completed=Globus transfer to Dataset  <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a> was successful. File(s) have been uploaded and verified. <br><br> {3}<br>
+notification.mail.globus.download.completed=Globus transfer of file(s) from the dataset  <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a> was successful. <br><br> {3}<br>
+notification.mail.globus.upload.completedWithErrors=Globus transfer to Dataset  <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a> is complete with errors. <br><br> {3}<br>
+notification.mail.globus.upload.failedRemotely=Remote data transfer between Globus endpoints for Dataset <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a> failed, as reported via Globus API. <br><br> {3}<br>
+notification.mail.globus.upload.failedLocally=Dataverse received a confirmation of a successful Globus data transfer for Dataset <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a>, but failed to add the files to the dataset locally. <br><br> {3}<br>
+notification.mail.globus.download.completedWithErrors=Globus transfer from the dataset  <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a> is complete with errors. <br><br> {3}<br>
 notification.import.filesystem=Dataset <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a> has been successfully uploaded and verified.
+notification.globus.upload.completed=Globus transfer to Dataset <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a> was successful. File(s) have been uploaded and verified.
+notification.globus.download.completed=Globus transfer from the dataset <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a> was successful.
+notification.globus.upload.completedWithErrors=Globus transfer to Dataset <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a> is complete with errors.
+notification.globus.upload.failedRemotely=Remote data transfer between Globus collections for Dataset <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a> failed, reported via Globus API. <br><br> {3}<br>
+notification.globus.upload.failedLocally=Dataverse received a confirmation of a successful Globus data transfer for Dataset <a href="{0}/dataset.xhtml?persistentId={1}" title="{2}">{2}</a>, but failed to add the files to the dataset locally. <br><br> {3}<br>
+
+notification.globus.download.completedWithErrors=Globus transfer from the dataset <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a> is complete with errors.
 notification.import.checksum=<a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a>, dataset had file checksums added via a batch job.
 removeNotification=Remove Notification
+
+# These are the labels of the options where the muted notifications can be selected by the users
+notification.muteOptions=Notification settings
+notification.mutedEmails=Select the email notifications you wish to receive:
+notification.mutedNotifications=Select the in-app notifications you wish to receive:
+
+# Notification types descriptions as presentend to the user. Leave the description empty or leave it out entirely in order to make it not selectable for muting by the user.
+notification.typeDescription.ASSIGNROLE=Role is assigned
+notification.typeDescription.REVOKEROLE=Role is revoked
+notification.typeDescription.CREATEDV=Dataverse collection is created
+notification.typeDescription.CREATEDS=Your dataset is created
+notification.typeDescription.CREATEACC=Account is created
+notification.typeDescription.SUBMITTEDDS=Submitted for review
+notification.typeDescription.RETURNEDDS=Returned from review
+notification.typeDescription.PUBLISHEDDS=Dataset is published
+notification.typeDescription.REQUESTFILEACCESS=Access to file is requested
+notification.typeDescription.GRANTFILEACCESS=Access to file is granted
+notification.typeDescription.REJECTFILEACCESS=Access to file is rejected
+notification.typeDescription.FILESYSTEMIMPORT=Dataset has been successfully uploaded and verified
+notification.typeDescription.CHECKSUMIMPORT=Dataset had file checksums added via a batch job
+notification.typeDescription.CHECKSUMFAIL=Checksum validation failed
+notification.typeDescription.CONFIRMEMAIL=Email Verification
+notification.typeDescription.APIGENERATED=API token is generated
+notification.typeDescription.INGESTCOMPLETED=Ingest is completed
+notification.typeDescription.INGESTCOMPLETEDWITHERRORS=Ingest completed with errors
+notification.typeDescription.PUBLISHFAILED_PIDREG=Publish has failed
+notification.typeDescription.WORKFLOW_SUCCESS=External workflow run has succeeded
+notification.typeDescription.WORKFLOW_FAILURE=External workflow run has failed
+notification.typeDescription.STATUSUPDATED=Status of dataset has been updated
+notification.typeDescription.DATASETCREATED=Dataset was created by user
+notification.typeDescription.DATASETMENTIONED=Dataset was referenced in remote system
+notification.typeDescription.PIDRECONCILED=The Persistent identifier of dataset has been updated
+notification.typeDescription.GLOBUSUPLOADCOMPLETED=Globus upload is completed
+notification.typeDescription.GLOBUSUPLOADCOMPLETEDWITHERRORS=Globus upload completed with errors
+notification.typeDescription.GLOBUSDOWNLOADCOMPLETED=Globus download is completed
+notification.typeDescription.GLOBUSDOWNLOADCOMPLETEDWITHERRORS=Globus download completed with errors
+notification.typeDescription.GLOBUSUPLOADLOCALFAILURE=Globus upload failed, internal error
+notification.typeDescription.GLOBUSUPLOADREMOTEFAILURE=Globus upload failed, remote transfer error
+notification.typeDescription.REQUESTEDFILEACCESS=File access requested
 groupAndRoles.manageTips=Here is where you can access and manage all the groups you belong to, and the roles you have been assigned.
 user.message.signup.label=Create Account
 user.message.signup.tip=Why have a Dataverse account? To create your own dataverse and customize it, add datasets, or request access to restricted files.
@@ -236,8 +352,8 @@ user.acccountterms.tip=The terms and conditions for using the application and se
 user.acccountterms.required=Please check the box to indicate your acceptance of the General Terms of Use.
 user.acccountterms.iagree=I have read and accept the Dataverse General Terms of Use as outlined above.
 user.createBtn=Create Account
-user.updatePassword.welcome=Welcome to Dataverse {0}, {1}
-user.updatePassword.warning=With the release of our new Dataverse 4.0 upgrade, the password requirements and General Terms of Use have updated. As this is the first time you are using Dataverse since the update, you need to create a new password and agree to the new General Terms of Use.
+user.updatePassword.welcome=Welcome to Dataverse {0}
+user.updatePassword.warning=Our terms of use have changed, please check the box below and click Continue.
 user.updatePassword.password={0}
 user.password=Password
 user.newPassword=New Password
@@ -276,12 +392,12 @@ passwdReset.submitRequest=Submit Password Request
 passwdReset.successSubmit.tip=If this email is associated with an account, then an email will be sent with further instructions to {0}.
 passwdReset.debug=DEBUG
 passwdReset.resetUrl=The reset URL is
-passwdReset.noEmail.tip=No email was actually sent because a user could not be found using the provided email address {0} but we don't mention this because we don't malicious users to use the form to determine if there is an account associated with an email address.
+passwdReset.noEmail.tip=No email was actually sent because a user could not be found using the provided email address {0} but we don''t mention this because we don''t malicious users to use the form to determine if there is an account associated with an email address.
 passwdReset.illegalLink.tip=Your password reset link is not valid. If you need to reset your password, {0}click here{1} in order to request that your password to be reset again.
-passwdReset.newPasswd.details={0} Reset Password{1} \u2013 Our password requirements have changed. Please pick a strong password that matches the criteria below.
+passwdReset.newPasswd.details=Please pick a strong password that matches the criteria below.
 passwdReset.newPasswd=New Password
 passwdReset.rePasswd=Retype Password
-passwdReset.resetBtn=Reset Password
+passwdReset.resetBtn=Continue
 
 #loginpage.xhtml
 login.System=Login System
@@ -318,6 +434,9 @@ auth.providers.persistentUserIdTooltip.orcid=ORCID provides a persistent digital
 auth.providers.persistentUserIdTooltip.github=GitHub assigns a unique number to every user.
 auth.providers.insufficientScope=Dataverse was not granted the permission to read user data from {0}.
 auth.providers.exception.userinfo=Error getting the user info record from {0}.
+auth.providers.token.failRetrieveToken=Dataverse could not retrieve an access token.
+auth.providers.token.failParseToken=Dataverse could not parse the access token.
+auth.providers.token.failGetUser=Dataverse could not get your user record. Please consult your administrator.
 auth.providers.orcid.helpmessage1=ORCID is an open, non-profit, community-based effort to provide a registry of unique researcher identifiers and a transparent method of linking research activities and outputs to these identifiers. ORCID is unique in its ability to reach across disciplines, research sectors, and national boundaries and its cooperation with other identifier systems. Find out more at <a href="https://orcid.org/about" title="About ORCID" target="_blank" rel="noopener">orcid.org/about</a>.
 auth.providers.orcid.helpmessage2=This repository uses your ORCID for authentication (so you don't need another username/password combination). Having your ORCID associated with your datasets also makes it easier for people to find the datasets you have published.  
 
@@ -332,10 +451,16 @@ authenticationProvider.name.shib=Shibboleth
 
 #confirmemail.xhtml
 confirmEmail.pageTitle=Email Verification
-confirmEmail.submitRequest=Verify Email
+confirmEmail.submitRequest=Send Verification Email
 confirmEmail.submitRequest.success=A verification email has been sent to {0}. Note, the verify link will expire after {1}.
 confirmEmail.details.success=Email address verified!
-confirmEmail.details.failure=We were unable to verify your email address. Please navigate to your Account Information page and click the "Verify Email" button.
+confirmEmail.details.failure=We were unable to verify your email address: {0}. Please navigate to your Account Information page and click the "Send Verification Email" button.
+confirmEmail.details.failure.invalidToken=Invalid token
+confirmEmail.details.failure.lookupFailed=Lookup by token failed
+confirmEmail.details.failure.tokenExpired=Token expired
+confirmEmail.details.failure.userDeactivated=User deactivated
+confirmEmail.details.failure.noToken=No token provided
+confirmEmail.details.failure.noConfirmEmailDataFromToken=Problem processing token
 confirmEmail.details.goToAccountPageButton=Go to Account Information
 confirmEmail.notVerified=Not Verified
 confirmEmail.verified=Verified
@@ -352,7 +477,7 @@ shib.dataverseUsername=Dataverse Username
 shib.currentDataversePassword=Current Dataverse Password
 shib.accountInformation=Account Information
 shib.offerToCreateNewAccount=This information is provided by your institution and will be used to create your Dataverse account.
-shib.passwordRejected=<strong>Validation Error</strong> - Your account can only be converted if you provide the correct password for your existing account.
+shib.passwordRejected=<strong>Validation Error</strong> - Your account can only be converted if you provide the correct password for your existing account. If your existing account has been deactivated by an administrator, you cannot convert your account.
 
 # oauth2/firstLogin.xhtml
 oauth2.btn.convertAccount=Convert Existing Account
@@ -387,20 +512,32 @@ oauth2.newAccount.emailInvalid=Invalid email address.
 oauth2.convertAccount.explanation=Please enter your {0} account username or email and password to convert your account to the {1} log in option. <a href="{2}/{3}/user/account.html" target="_blank">Learn more</a> about converting your account.
 oauth2.convertAccount.username=Existing username
 oauth2.convertAccount.password=Password
-oauth2.convertAccount.authenticationFailed=Authentication failed - bad username or password.
+oauth2.convertAccount.authenticationFailed=Your account can only be converted if you provide the correct username and password for your existing account. If your existing account has been deactivated by an administrator, you cannot convert your account.
 oauth2.convertAccount.buttonTitle=Convert Account
 oauth2.convertAccount.success=Your Dataverse account is now associated with your {0} account.
+oauth2.convertAccount.failedDeactivated=Your existing account cannot be converted because it has been deactivated.
 
 # oauth2/callback.xhtml
 oauth2.callback.page.title=OAuth Callback
-oauth2.callback.message=<strong>Authentication Error</strong> - Dataverse could not authenticate your ORCID login. Please make sure you authorize your ORCID account to connect with Dataverse. For more details about the information being requested, see the <a href="{0}/{1}/user/account.html#orcid-log-in" title="ORCID Log In - Dataverse User Guide" target="_blank">User Guide</a>.
+oauth2.callback.message=<strong>Authentication Error</strong> - Dataverse could not authenticate your login with the provider that you selected. Please make sure you authorize your account to connect with Dataverse. For more details about the information being requested, see the <a href="{0}/{1}/user/account.html#remote-authentication" title="Remote Authentication - Dataverse User Guide" target="_blank">User Guide</a>.
+oauth2.callback.error.providerDisabled=This authentication method ({0}) is currently disabled. Please log in using one of the supported methods.
+oauth2.callback.error.signupDisabledForProvider=Sorry, signup for new accounts using {0} authentication is currently disabled.
+oauth2.callback.error.accountNotFound=You must be logged in to associate an ORCID with your account.
+oauth2.callback.error.orcidInUse=This ORCID ({0}) is already associated with another user account.
+
+# deactivated user accounts
+deactivated.error=Sorry, your account has been deactivated.
 
 # tab on dataverseuser.xhtml
 apitoken.title=API Token
-apitoken.message=Your API Token is displayed below after it has been created. Check out our {0}API Guide{1} for more information on using your API Token with the Dataverse APIs. 
+apitoken.message=Your API Token is valid for a year. Check out our {0}API Guide{1} for more information on using your API Token with the Dataverse APIs. 
 apitoken.notFound=API Token for {0} has not been created.
+apitoken.expired.warning=This token is about to expire, please generate a new one.
+apitoken.expired.error=This token is expired, please generate a new one.
 apitoken.generateBtn=Create Token
 apitoken.regenerateBtn=Recreate Token
+apitoken.revokeBtn=Revoke Token
+apitoken.expirationDate.label=Expiration Date
 
 #dashboard.xhtml
 dashboard.title=Dashboard
@@ -416,6 +553,9 @@ dashboard.card.harvestingserver.sets={0, choice, 0#Sets|1#Set|2#Sets}
 dashboard.card.harvestingserver.btn.manage=Manage Server
 dashboard.card.metadataexport.header=Metadata Export
 dashboard.card.metadataexport.message=Dataset metadata export is only available through the {0} API. Learn more in the {0} {1}API Guide{2}.
+dashboard.card.move.data=Data
+dashboard.card.move.dataset.manage=Move Dataset
+dashboard.card.move.dataverse.manage=Move Dataverse
 
 #harvestclients.xhtml
 harvestclients.title=Manage Harvesting Clients
@@ -427,12 +567,12 @@ harvestclients.noClients.why.reason2=Harvested metadata records are searchable b
 harvestclients.noClients.how.header=How To Use Harvesting
 harvestclients.noClients.how.tip1=To harvest metadata, a <i>Harvesting Client</i> is created and configured for each remote repository. Note that when creating a client you will need to select an existing local dataverse to host harvested datasets.
 harvestclients.noClients.how.tip2=Harvested records can be kept in sync with the original repository through scheduled incremental updates, for example, daily or weekly. Alternatively, harvests can be run on demand, from this page or via the REST API.
-harvestclients.noClients.getStarted=To get started, click on the Add Client button above. To learn more about Harvesting, visit the <a href="{0}/{1}/user/index.html#index" title="Harvesting - Dataverse User Guide" target="_blank">Harvesting</a> section of the User Guide.
+harvestclients.noClients.getStarted=To get started, click on the Add Client button above. To learn more about Harvesting, visit the <a href="{0}/{1}/admin/dashboard.html#harvesting" title="Harvesting - Dataverse Admin Guide" target="_blank">Harvesting</a> section on the Dashboard page of the Admin Guide.
 harvestclients.btn.add=Add Client
 harvestclients.tab.header.name=Nickname
 harvestclients.tab.header.url=URL
 harvestclients.tab.header.lastrun=Last Run
-harvestclients.tab.header.lastresults=Last Results
+harvestclients.tab.header.lastresults=Last Result
 harvestclients.tab.header.action=Actions
 harvestclients.tab.header.action.btn.run=Run Harvesting
 harvestclients.tab.header.action.btn.edit=Edit
@@ -441,7 +581,7 @@ harvestclients.tab.header.action.btn.delete.dialog.header=Delete Harvesting Clie
 harvestclients.tab.header.action.btn.delete.dialog.warning=Are you sure you want to delete the harvesting client "{0}"? Deleting the client will delete all datasets harvested from this remote server.
 harvestclients.tab.header.action.btn.delete.dialog.tip=Note, this action may take a while to process, depending on the number of harvested datasets.
 harvestclients.tab.header.action.delete.infomessage=Harvesting client is being deleted. Note, that this may take a while, depending on the amount of harvested content.
-harvestclients.actions.runharvest.success=Successfully started an asynchronous harvest for client "{0}" . Please reload the page to check on the harvest results).
+harvestclients.actions.runharvest.success=Successfully started an asynchronous harvest for client "{0}" . Please reload the page to check on the harvest results.
 harvestclients.newClientDialog.step1=Step 1 of 4 - Client Information
 harvestclients.newClientDialog.title.new=Create Harvesting Client
 harvestclients.newClientDialog.help=Configure a client to harvest content from a remote server.
@@ -450,6 +590,12 @@ harvestclients.newClientDialog.nickname.helptext=Consists of letters, digits, un
 harvestclients.newClientDialog.nickname.required=Client nickname cannot be empty!
 harvestclients.newClientDialog.nickname.invalid=Client nickname can contain only letters, digits, underscores (_) and dashes (-); and must be at most 30 characters.
 harvestclients.newClientDialog.nickname.alreadyused=This nickname is already used.
+harvestclients.newClientDialog.sourcename=Source Name
+harvestclients.newClientDialog.sourcename.helptext=When the feature flag "index-harvested-metadata-source" is enabled, the source name will override the nickname in the "Metadata Source" facet. You can group multiple harvesting clients together under that facet by using the same source name.
+harvestclients.newClientDialog.customHeader=Custom HTTP Header
+harvestclients.newClientDialog.customHeader.helptext=(Optional) Custom HTTP header to add to requests, if required by this OAI server.
+harvestclients.newClientDialog.customHeader.watermark=Enter an http header, as in header-name: header-value
+harvestclients.newClientDialog.customHeader.invalid=Client header name can only contain letters, digits, underscores (_) and dashes (-); the entire header string must be in the form of "header-name: header-value"
 harvestclients.newClientDialog.type=Server Protocol
 harvestclients.newClientDialog.type.helptext=Only the OAI server protocol is currently supported.
 harvestclients.newClientDialog.type.OAI=OAI
@@ -474,6 +620,7 @@ harvestclients.newClientDialog.oaiSets.tip=Harvesting sets offered by this OAI s
 harvestclients.newClientDialog.oaiSets.noset=None
 harvestclients.newClientDialog.oaiSets.helptext=Selecting "none" will harvest the default set, as defined by the server. Often this will be the entire body of content across all sub-sets.
 harvestclients.newClientDialog.oaiSets.helptext.noset=This OAI server does not support named sets. The entire body of content offered by the server will be harvested.
+harvestclients.newClientDialog.oaiSets.listTruncated=Please note that the remote server was taking too long to return the full list of available OAI sets, so the list was truncated. Please select a set from the current list (or select the "no set" option), and try again later, if you need to change it. 
 harvestclients.newClientDialog.oaiMetadataFormat=Metadata Format
 harvestclients.newClientDialog.oaiMetadataFormat.tip=Metadata formats offered by the remote server.
 harvestclients.newClientDialog.oaiMetadataFormat.required=Please select the metadata format to harvest from this archive.
@@ -495,6 +642,7 @@ harvestclients.newClientDialog.step4=Step 4 of 4 - Display
 harvestclients.newClientDialog.harvestingStyle=Archive Type
 harvestclients.newClientDialog.harvestingStyle.tip=Type of remote archive.
 harvestclients.newClientDialog.harvestingStyle.helptext=Select the archive type that best describes this remote server in order to properly apply formatting rules and styles to the harvested metadata as they are shown in the search results. Note that improperly selecting the type of the remote archive can result in incomplete entries in the search results, and a failure to redirect the user to the archival source of the data.
+harvestclients.newClientDialog.harvestingStyle.required=Please select one of the values from the menu.
 harvestclients.viewEditDialog.title=Edit Harvesting Client
 harvestclients.viewEditDialog.archiveUrl=Archive URL
 harvestclients.viewEditDialog.archiveUrl.tip=The URL of the archive that serves the data harvested by this client, which is used in search results for links to the original sources of the harvested content.
@@ -504,6 +652,13 @@ harvestclients.viewEditDialog.archiveDescription.tip=Description of the archival
 harvestclients.viewEditDialog.archiveDescription.default.generic=This Dataset is harvested from our partners. Clicking the link will take you directly to the archival source of the data.
 harvestclients.viewEditDialog.btn.save=Save Changes
 harvestclients.newClientDialog.title.edit=Edit Group {0}
+harvestclients.result.completed=Completed
+harvestclients.result.completedWithFailures=Completed with failures
+harvestclients.result.failure=FAILED
+harvestclients.result.inProgess=IN PROGRESS
+harvestclients.result.deleteInProgress=DELETE IN PROGRESS
+harvestclients.result.interrupted=INTERRUPTED
+harvestclients.result.details={0} harvested, {1} deleted, {2} failed.
 
 #harvestset.xhtml
 harvestserver.title=Manage Harvesting Server
@@ -520,7 +675,7 @@ harvestserver.noSets.why.reason2=Only the published, unrestricted datasets in yo
 harvestserver.noSets.how.header=How to run a Harvesting Server?
 harvestserver.noSets.how.tip1=Harvesting server can be enabled or disabled on this page. 
 harvestserver.noSets.how.tip2=Once the service is enabled, you can define collections of local datasets that will be available to remote harvesters as <i>OAI Sets</i>. Sets are defined by search queries (for example, authorName:king; or parentId:1234 - to select all the datasets that belong to the dataverse specified; or dsPersistentId:"doi:1234/" to select all the datasets with the persistent identifier authority specified). Consult the Search API section of the Dataverse User Guide for more information on the search queries.  
-harvestserver.noSets.getStarted=To get started, enable the OAI server and click on the Add Set button. To learn more about Harvesting, visit the <a href="{0}/{1}/user/index.html#index" title="Harvesting - Dataverse User Guide" target="_blank">Harvesting</a> section of the User Guide.
+harvestserver.noSets.getStarted=To get started, enable the OAI server and click on the Add Set button. To learn more about Harvesting, visit the <a href="{0}/{1}/admin/dashboard.html#harvesting" title="Harvesting - Dataverse Admin Guide" target="_blank">Harvesting</a> section on the Dashboard page of the Admin Guide.
 harvestserver.btn.add=Add Set
 harvestserver.tab.header.spec=OAI setSpec
 harvestserver.tab.col.spec.default=DEFAULT
@@ -528,7 +683,7 @@ harvestserver.tab.header.description=Description
 harvestserver.tab.header.definition=Definition Query
 harvestserver.tab.col.definition.default=All Published Local Datasets
 harvestserver.tab.header.stats=Datasets
-harvestserver.tab.col.stats.empty=No records (empty set)
+harvestserver.tab.col.stats.empty=No active records ({2} {2, choice, 0#records|1#record|2#records} marked as deleted)
 harvestserver.tab.col.stats.results={0} {0, choice, 0#datasets|1#dataset|2#datasets} ({1} {1, choice, 0#records|1#record|2#records} exported, {2} marked as deleted)
 harvestserver.tab.header.action=Actions
 harvestserver.tab.header.action.btn.export=Run Export
@@ -545,6 +700,8 @@ harvestserver.newSetDialog.setspec.tip=A unique name (OAI setSpec) identifying t
 harvestserver.newSetDialog.setspec.helptext=Consists of letters, digits, underscores (_) and dashes (-).
 harvestserver.editSetDialog.setspec.helptext=The name can not be changed once the set has been created.
 harvestserver.editSetDialog.setspec.helptext.default=this is the default, unnamed set
+harvestserver.editSetDialog.setspec.notFound=Set for editing not found!
+harvestserver.editSetDialog.setspec.noChanges=Invalid update! You must provide a definition and/or description to be updated.
 harvestserver.newSetDialog.setspec.required=Name (OAI setSpec) cannot be empty!
 harvestserver.newSetDialog.setspec.invalid=Name (OAI setSpec) can contain only letters, digits, underscores (_) and dashes (-).
 harvestserver.newSetDialog.setspec.alreadyused=This set name (OAI setSpec) is already used.
@@ -564,6 +721,7 @@ harvestserver.newSetDialog.btn.create=Create Set
 harvestserver.newSetDialog.success=Successfully created harvesting set "{0}".
 harvestserver.viewEditDialog.title=Edit Harvesting Set
 harvestserver.viewEditDialog.btn.save=Save Changes
+harvestserver.deleteSetDialog.setspec.superUser.required=Only superusers may delete OAI sets.
 
 #dashboard-users.xhtml
 dashboard.card.users=Users
@@ -573,19 +731,34 @@ dashboard.card.users.manage=Manage Users
 dashboard.card.users.message=List and manage users.
 dashboard.list_users.searchTerm.watermark=Search these users...
 dashboard.list_users.tbl_header.userId=ID
+dashboard.list_users.tbl_header.userIdAZ=ID (A-Z)
+dashboard.list_users.tbl_header.userIdZA=ID (Z-A)
 dashboard.list_users.tbl_header.userIdentifier=Username
-dashboard.list_users.tbl_header.name=Name 
-dashboard.list_users.tbl_header.lastName=Last Name 
-dashboard.list_users.tbl_header.firstName=First Name 
+dashboard.list_users.tbl_header.userIdentifierAZ=Username (A-Z)
+dashboard.list_users.tbl_header.userIdentifierZA=Username (Z-A)
+dashboard.list_users.tbl_header.name=Name
+dashboard.list_users.tbl_header.lastName=Last Name
+dashboard.list_users.tbl_header.lastNameAZ=Last Name (A-Z)
+dashboard.list_users.tbl_header.lastNameZA=Last Name (Z-A)
+dashboard.list_users.tbl_header.firstName=First Name
 dashboard.list_users.tbl_header.email=Email
+dashboard.list_users.tbl_header.emailAZ=Email (A-Z)
+dashboard.list_users.tbl_header.emailZA=Email (Z-A)
 dashboard.list_users.tbl_header.affiliation=Affiliation
+dashboard.list_users.tbl_header.affiliationAZ=Affiliation (A-Z)
+dashboard.list_users.tbl_header.affiliationZA=Affiliation (Z-A)
 dashboard.list_users.tbl_header.roles=Roles
 dashboard.list_users.tbl_header.position=Position
 dashboard.list_users.tbl_header.isSuperuser=Superuser
+dashboard.list_users.tbl_header.superuserAZ=Superuser (A-Z)
+dashboard.list_users.tbl_header.superuserZA=Superuser (Z-A)
 dashboard.list_users.tbl_header.authProviderFactoryAlias=Authentication
+dashboard.list_users.tbl_header.authProviderFactoryAliasAZ=Authentication (A-Z)
+dashboard.list_users.tbl_header.authProviderFactoryAliasZA=Authentication (Z-A)
 dashboard.list_users.tbl_header.createdTime=Created Time
 dashboard.list_users.tbl_header.lastLoginTime=Last Login Time
 dashboard.list_users.tbl_header.lastApiUseTime=Last API Use Time
+dashboard.list_users.tbl_header.deactivated=deactivated
 dashboard.list_users.tbl_header.roles.removeAll=Remove All
 dashboard.list_users.tbl_header.roles.removeAll.header=Remove All Roles
 dashboard.list_users.tbl_header.roles.removeAll.confirmationText=Are you sure you want to remove all roles for user {0}?
@@ -597,72 +770,101 @@ dashboard.list_users.toggleSuperuser.confirmationText.remove=Are you sure you wa
 dashboard.list_users.api.auth.invalid_apikey=The API key is invalid.
 dashboard.list_users.api.auth.not_superuser=Forbidden. You must be a superuser.
 
-#dashboard-datamove.xhtml
-dashboard.card.datamove=Data
-dashboard.card.datamove.header=Dashboard - Move Data
-dashboard.card.datamove.manage=Move Data
-dashboard.card.datamove.message=Manage and curate your installation by moving datasets from one host dataverse to another. See also <a href="{0}/{1}/admin/dataverses-datasets.html">Managing Datasets and Dataverses</a> in the Admin Guide.
-dashboard.card.datamove.selectdataset.header=Dataset to Move
-dashboard.card.datamove.newdataverse.header=New Host Dataverse
-dashboard.card.datamove.dataset.label=Dataset
-dashboard.card.datamove.dataverse.label=Dataverse
-dashboard.card.datamove.confirm.dialog=Are you sure want to move this dataset?
-dashboard.card.datamove.confirm.yes=Yes, Move Data
-dashboard.card.datamove.message.success=The dataset "{0}" ({1}) has been successfully moved to {2}.
-dashboard.card.datamove.message.failure.summary=Failed to moved dataset
-dashboard.card.datamove.message.failure.details=The dataset "{0}" ({1}) could not be moved to {2}. {3}{4}
-dashboard.card.datamove.dataverse.placeholder=Enter Dataverse Identifier...
-dashboard.card.datamove.dataverse.menu.header=Dataverse Name (Affiliate), Identifier
-dashboard.card.datamove.dataverse.menu.invalidMsg=No matches found
-dashboard.card.datamove.dataset.placeholder=Enter Dataset Persistent ID, doi:...
-dashboard.card.datamove.dataset.menu.header=Dataset Persistent ID, Title, Host Dataverse Identifier
-dashboard.card.datamove.dataset.menu.invalidMsg=No matches found
-dashboard.card.datamove.dataset.command.error.targetDataverseUnpublishedDatasetPublished=A published dataset may not be moved to an unpublished dataverse. You can retry the move after publishing {0}.
-dashboard.card.datamove.dataset.command.error.targetDataverseSameAsOriginalDataverse=This dataset is already in this dataverse.
-dashboard.card.datamove.dataset.command.error.unforced.datasetGuestbookNotInTargetDataverse=The guestbook would be removed from this dataset if you moved it because the guestbook is not in the new host dataverse. 
-dashboard.card.datamove.dataset.command.error.unforced.linkedToTargetDataverseOrOneOfItsParents=This dataset is linked to the new host dataverse or one of its parents. This move would remove the link to this dataset. 
-dashboard.card.datamove.dataset.command.error.unforced.suggestForce=Forcing this move is currently only available via API. Please see "Move a Dataset" under <a href="{0}/{1}/admin/dataverses-datasets.html">Managing Datasets and Dataverses</a> in the Admin Guide for details.
-dashboard.card.datamove.dataset.command.error.indexingProblem=Dataset could not be moved. Indexing failed.
+#dashboard-movedataset.xhtml
+dashboard.move.dataset.header=Dashboard - Move Data
+dashboard.move.dataset.message=Manage and curate your installation by moving datasets from one host dataverse to another. See also <a href="{0}/{1}/admin/dataverses-datasets.html">Managing Datasets and Dataverses</a> in the Admin Guide.
+dashboard.move.dataset.selectdataset.header=Dataset to move
+dashboard.move.dataset.newdataverse.header=New dataverse collection host
+dashboard.move.dataset.dataset.label=Dataset
+dashboard.move.dataset.dataverse.label=Dataverse
+dashboard.move.dataset.confirm.dialog=Are you sure you want to move this dataset?
+dashboard.move.dataset.confirm.yes=Yes, move this dataset
+dashboard.move.dataset.message.success=The dataset "{0}" ({1}) has been successfully moved to {2}.
+dashboard.move.dataset.message.failure.summary=Failed to moved dataset
+dashboard.move.dataset.message.failure.details=The dataset "{0}" ({1}) could not be moved to {2}. {3}{4}
+dashboard.move.dataset.dataverse.placeholder=Enter Dataverse Identifier...
+dashboard.move.dataset.dataverse.menu.header=Dataverse Name (Affiliate), Identifier
+dashboard.move.dataset.dataverse.menu.invalidMsg=No matches found
+dashboard.move.dataset.placeholder=Enter Dataset Persistent ID, doi:...
+dashboard.move.dataset.menu.header=Dataset Persistent ID, Title, Host Dataverse Identifier
+dashboard.move.dataset.menu.invalidMsg=No matches found
+dashboard.move.dataset.command.error.targetDataverseUnpublishedDatasetPublished=A published dataset may not be moved to an unpublished dataverse. You can retry the move after publishing {0}.
+dashboard.move.dataset.command.error.targetDataverseSameAsOriginalDataverse=This dataset is already in this dataverse.
+dashboard.move.dataset.command.error.unforced.datasetGuestbookNotInTargetDataverse=The guestbook would be removed from this dataset if you moved it because the guestbook is not in the new host dataverse. 
+dashboard.move.dataset.command.error.unforced.linkedToTargetDataverseOrOneOfItsParents=This dataset is linked to the new host dataverse or one of its parents. This move would remove the link to this dataset. 
+dashboard.move.dataset.command.error.unforced.suggestForce=Forcing this move is currently only available via API. Please see "Move a Dataset" under <a href="{0}/{1}/admin/dataverses-datasets.html">Managing Datasets and Dataverses</a> in the Admin Guide for details.
+
+#dashboard-movedataverse.xhtml
+dashboard.move.dataverse.header=Dashboard - Move Data
+dashboard.move.dataverse.message.summary=Move Dataverse Collection
+dashboard.move.dataverse.message.detail=Manage and curate your installation by moving a dataverse collection from one host dataverse collection to another. See also <a href="{0}/{1}/admin/dataverses-datasets.html">Managing Datasets and Dataverses</a> in the Admin Guide.
+dashboard.move.dataverse.selectdataverse.header=Dataverse collection to move
+dashboard.move.dataverse.newdataverse.header=New dataverse collection host
+dashboard.move.dataverse.label=Dataverse
+dashboard.move.dataverse.confirm.dialog=Are you sure you want to move this dataverse collection?
+dashboard.move.dataverse.confirm.yes=Yes, move this collection
+dashboard.move.dataverse.message.success=The dataverse "{0}" has been successfully moved to {1}.
+dashboard.move.dataverse.message.failure.summary=Failed to moved dataverse
+dashboard.move.dataverse.message.failure.details=The dataverse "{0}" could not be moved to {1}. {2}
+dashboard.move.dataverse.placeholder=Enter Dataverse Identifier...
+dashboard.move.dataverse.menu.header=Dataverse Name (Affiliate), Identifier
+dashboard.move.dataverse.menu.invalidMsg=No matches found
 
 #MailServiceBean.java
 notification.email.create.dataverse.subject={0}: Your dataverse has been created
-notification.email.create.dataset.subject={0}: Your dataset has been created
-notification.email.request.file.access.subject={0}: Access has been requested for a restricted file
+notification.email.create.dataset.subject={0}: Dataset "{1}" has been created
+notification.email.dataset.created.subject={0}: Dataset "{1}" has been created
+notification.email.request.file.access.subject={0}: {1} {2} ({3}) requested access to dataset "{4}"
+notification.email.requested.file.access.subject={0}: You have requested access to a restricted file in dataset "{1}"
 notification.email.grant.file.access.subject={0}: You have been granted access to a restricted file
 notification.email.rejected.file.access.subject={0}: Your request for access to a restricted file has been rejected
-notification.email.update.maplayer={0}: WorldMap layer added to dataset
-notification.email.maplayer.deletefailed.subject={0}: Failed to delete WorldMap layer
-notification.email.maplayer.deletefailed.text=We failed to delete the WorldMap layer associated with the restricted file {0}, and any related data that may still be publicly available on the WorldMap site. Please try again, or contact WorldMap and/or Dataverse support. (Dataset: {1})
-notification.email.submit.dataset.subject={0}: Your dataset has been submitted for review
-notification.email.publish.dataset.subject={0}: Your dataset has been published
-notification.email.returned.dataset.subject={0}: Your dataset has been returned
+notification.email.submit.dataset.subject={0}: Dataset "{1}" has been submitted for review
+notification.email.publish.dataset.subject={0}: Dataset "{1}" has been published
+notification.email.publishFailure.dataset.subject={0}: Failed to publish your dataset "{1}"
+notification.email.returned.dataset.subject={0}: Dataset "{1}" has been returned
+notification.email.workflow.success.subject={0}: Dataset "{1}" has been processed
+notification.email.workflow.success=A workflow running on {0} (view at {1} ) succeeded: {2}
+notification.email.workflow.failure.subject={0}: Failed to process your dataset "{1}"
+notification.email.workflow.failure=A workflow running on {0} (view at {1} ) failed: {2}
+notification.email.status.change.subject={0}: Dataset "{1}" Status Change
+notification.email.status.change=The curation status of the dataset named {0} (view at {1} ) in collection {2} ( view at {3} ) has been updated to "{4}".
+notification.email.pid.reconciled.subject={0}: Dataset "{1}" persistent identifier change
+notification.email.pid.reconciled=The persistent identifier of dataset {0} has been updated to `{1}`.
+notification.email.workflow.nullMessage=No additional message sent from the workflow.
 notification.email.create.account.subject={0}: Your account has been created
 notification.email.assign.role.subject={0}: You have been assigned a role
 notification.email.revoke.role.subject={0}: Your role has been revoked
 notification.email.verifyEmail.subject={0}: Verify your email address
-notification.email.ingestCompleted.subject={0}: Your ingest has successfully finished!
-notification.email.ingestCompletedWithErrors.subject={0}: Your ingest has finished with errors!
+notification.email.ingestCompleted.subject={0}: Dataset "{1}" status
+notification.email.ingestCompletedWithErrors.subject={0}: Dataset "{1}" status
 notification.email.greeting=Hello, \n
+notification.email.greeting.html=Hello, <br>
 # Bundle file editors, please note that "notification.email.welcome" is used in a unit test
 notification.email.welcome=Welcome to {0}! Get started by adding or finding data. Have questions? Check out the User Guide at {1}/{2}/user or contact {3} at {4} for assistance.
 notification.email.welcomeConfirmEmailAddOn=\n\nPlease verify your email address at {0} . Note, the verify link will expire after {1}. Send another verification email by visiting your account page.
-notification.email.requestFileAccess=File access requested for dataset: {0} by {1} ({2}). Manage permissions at {3}.
-notification.email.grantFileAccess=Access granted for files in dataset: {0} (view at {1}).
-notification.email.rejectFileAccess=Your request for access was rejected for the requested files in the dataset: {0} (view at {1}). If you have any questions about why your request was rejected, you may reach the dataset owner using the "Contact" link on the upper right corner of the dataset page.
+notification.email.requestFileAccess=File access requested for dataset: {0} by {1} ({2}). Manage permissions at {3} .
+notification.email.requestFileAccess.guestbookResponse=<br><br>Guestbook Response:<br><br>{0}
+notification.email.grantFileAccess=Access granted for files in dataset: {0} (view at {1} ).
+notification.email.rejectFileAccess=Your request for access was rejected for the requested files in the dataset: {0} (view at {1} ). If you have any questions about why your request was rejected, you may reach the dataset owner using the "Contact" link on the upper right corner of the dataset page.
 # Bundle file editors, please note that "notification.email.createDataverse" is used in a unit test
 notification.email.createDataverse=Your new dataverse named {0} (view at {1} ) was created in {2} (view at {3} ). To learn more about what you can do with your dataverse, check out the Dataverse Management - User Guide at {4}/{5}/user/dataverse-management.html .
 # Bundle file editors, please note that "notification.email.createDataset" is used in a unit test
 notification.email.createDataset=Your new dataset named {0} (view at {1} ) was created in {2} (view at {3} ). To learn more about what you can do with a dataset, check out the Dataset Management - User Guide at {4}/{5}/user/dataset-management.html .
-notification.email.wasSubmittedForReview={0} (view at {1}) was submitted for review to be published in {2} (view at {3}). Don''t forget to publish it or send it back to the contributor, {4} ({5})\!
-notification.email.wasReturnedByReviewer={0} (view at {1}) was returned by the curator of {2} (view at {3}).
-notification.email.wasPublished={0} (view at {1}) was published in {2} (view at {3}).
-notification.email.worldMap.added={0} (view at {1}) had WorldMap layer data added to it.
+notification.email.wasSubmittedForReview=Your dataset named {0} (view at {1} ) was submitted for review to be published in {2} (view at {3} ). Don''t forget to publish it or send it back to the contributor, {4} ({5})\!
+notification.email.wasReturnedByReviewer=Your dataset named {0} (view at {1} ) was returned by the curator of {2} (view at {3} ).
+notification.email.wasReturnedByReviewerReason=Here is the curator comment: {0}
+notification.email.wasReturnedByReviewer.collectionContacts=You may contact the collection administrator for more information: {0}
+notification.email.wasPublished=Your dataset named {0} (view at {1} ) was published in {2} (view at {3} ).
+notification.email.publishFailedPidReg=Your dataset named {0} (view at {1} ) in {2} (view at {3} ) could not be published due to a failure to register, or update the Global Identifier for the dataset or one of the files in it. Contact support if this continues to happen. 
 notification.email.closing=\n\nYou may contact us for support at {0}.\n\nThank you,\n{1}
-notification.email.assignRole=You are now {0} for the {1} "{2}" (view at {3}).
-notification.email.revokeRole=One of your roles for the {0} "{1}" has been revoked (view at {2}).
+notification.email.closing.html=<br><br>You may contact us for support at {0}.<br><br>Thank you,<br>{1}
+notification.email.assignRole=You are now {0} for the {1} "{2}" (view at {3} ).
+notification.email.revokeRole=One of your roles for the {0} "{1}" has been revoked (view at {2} ).
 notification.email.changeEmail=Hello, {0}.{1}\n\nPlease contact us if you did not intend this change or if you need assistance.
 notification.email.passwordReset=Hi {0},\n\nSomeone, hopefully you, requested a password reset for {1}.\n\nPlease click the link below to reset your Dataverse account password:\n\n {2} \n\n The link above will only work for the next {3} minutes.\n\n Please contact us if you did not request this password reset or need further help.
 notification.email.passwordReset.subject=Dataverse Password Reset Requested
+notification.email.datasetWasCreated=Dataset "<a href = "{0}">{1}</a>" was just created by {2} in the {3} collection.
+notification.email.requestedFileAccess=You have requested access to a file(s) in dataset "<a href = "{0}">{1}</a>". Your request has been sent to the managers of this dataset who will grant or reject your request. If you have any questions, you may reach the dataset managers using the "Contact" link on the upper right corner of the dataset page.
 hours=hours
 hour=hour
 minutes=minutes
@@ -671,18 +873,35 @@ notification.email.checksumfail.subject={0}: Your upload failed checksum validat
 notification.email.import.filesystem.subject=Dataset {0} has been successfully uploaded and verified
 notification.email.import.checksum.subject={0}: Your file checksum job has completed
 contact.delegation={0} on behalf of {1}
+contact.delegation.default_personal=Dataverse Installation Admin
 notification.email.info.unavailable=Unavailable
 notification.email.apiTokenGenerated=Hello {0} {1},\n\nAPI Token has been generated. Please keep it secure as you would do with a password.
 notification.email.apiTokenGenerated.subject=API Token was generated
-
+notification.email.datasetWasMentioned=Hello {0},<br><br> The {1} has just been notified that the {2}, <a href=''{3}''>{4}</a>, {5} "<a href=''{6}/dataset.xhtml?persistentId={7}''>{8}</a>" in this repository.
+notification.email.datasetWasMentioned.subject={0}: A Dataset Relationship has been reported!
+notification.email.globus.uploadCompleted.subject={0}: Files uploaded successfully via Globus and verified
+notification.email.globus.downloadCompleted.subject={0}: Files downloaded successfully via Globus
+notification.email.globus.downloadCompletedWithErrors.subject={0}: Globus download task completed, errors encountered
+notification.email.globus.uploadCompletedWithErrors.subject={0}: Globus upload task completed with errors
+notification.email.globus.uploadFailedRemotely.subject={0}:  Failed to upload files via Globus
+notification.email.globus.uploadFailedLocally.subject={0}:  Failed to add files uploaded via Globus to dataset
 # dataverse.xhtml
-dataverse.title=The project, department, university, professor, or journal this dataverse will contain data for.
+dataverse.name=Dataverse Name
+dataverse.name.title=The project, department, university, professor, or journal this dataverse will contain data for.
 dataverse.enterName=Enter name...
 dataverse.host.title=The dataverse which contains this data.
+dataverse.host.tip=Changing the host dataverse will clear any fields you may have entered data into.
+dataverse.host.autocomplete.nomatches=No matches
 dataverse.identifier.title=Short name used for the URL of this dataverse.
 dataverse.affiliation.title=The organization with which this dataverse is affiliated.
+dataverse.storage.title=A storage service to be used for datasets in this dataverse.
+dataverse.metadatalanguage.title=Metadata entered for datasets in this dataverse will be assumed to be in the selected language.
+dataverse.curationLabels.title=A set of curation status labels that are used to indicate the curation status of draft datasets.
+dataverse.curationLabels.disabled=Disabled
 dataverse.category=Category
 dataverse.category.title=The type that most closely reflects this dataverse.
+dataverse.guestbookentryatrequest.title=Whether Guestbooks (when configured for a dataset) are displayed to users when they request file access or when they download files.
+dataverse.pidProvider.title=The source of PIDs (DOIs, Handles, etc.) when a new PID is created.
 dataverse.type.selectTab.top=Select one...
 dataverse.type.selectTab.researchers=Researcher
 dataverse.type.selectTab.researchProjects=Research Project
@@ -727,24 +946,21 @@ dataverse.option.deleteDataverse=Delete Dataverse
 dataverse.publish.btn=Publish
 dataverse.publish.header=Publish Dataverse
 dataverse.nopublished=No Published Dataverses
-dataverse.nopublished.tip=In order to use this feature you must have at least one published dataverse.
+dataverse.nopublished.tip=In order to use this feature you must have at least one published or linked dataverse.
 dataverse.contact=Email Dataverse Contact
-dataset.link=Link Dataset
 dataverse.link=Link Dataverse
 dataverse.link.btn.tip=Link to Your Dataverse
 dataverse.link.yourDataverses=Your Dataverse
 dataverse.link.yourDataverses.inputPlaceholder=Enter Dataverse Name
 dataverse.link.save=Save Linked Dataverse
-dataset.link.save=Save Linked Dataset
-dataset.link.not.to.owner=Can't link a dataset to its dataverse
-dataset.link.not.to.parent.dataverse=Can't link a dataset to its parent dataverses
-dataset.link.not.published=Can't link a dataset that has not been published
 dataverse.link.dataverse.choose=Choose which of your dataverses you would like to link this dataverse to.
 dataverse.link.dataset.choose=Enter the name of the dataverse you would like to link this dataset to. If you need to remove this link in the future, please contact {0}.
 dataverse.link.dataset.none=No linkable dataverses available.
 dataverse.link.no.choice=You have one dataverse you can add linked dataverses and datasets in.
 dataverse.link.no.linkable=To be able to link a dataverse or dataset, you need to have your own dataverse. Create a dataverse to get started.
 dataverse.link.no.linkable.remaining=You have already linked all of your eligible dataverses.
+dataverse.unlink.dataset.choose=Enter the name of the dataverse you would like to unlink this dataset from.
+dataverse.unlink.dataset.none=No linked dataverses available.
 dataverse.savedsearch.link=Link Search
 dataverse.savedsearch.searchquery=Search
 dataverse.savedsearch.filterQueries=Facets
@@ -757,6 +973,8 @@ dataverse.saved.search.failure=The saved search was not able to be linked.
 dataverse.linked.success= {0} has been successfully linked to {1}.
 dataverse.linked.success.wait= {0} has been successfully linked to {1}. Please wait for its contents to appear.
 dataverse.linked.internalerror={0} has been successfully linked to {1} but contents will not appear until an internal error has been fixed.
+dataverse.linked.error.alreadyLinked={0} has already been linked to {1}.
+dataverse.unlinked.success= {0} has been successfully unlinked from {1}.
 dataverse.page.pre=Previous
 dataverse.page.next=Next
 dataverse.byCategory=Dataverses by Category
@@ -780,8 +998,38 @@ dataverse.update.failure=This dataverse was not able to be updated.
 dataverse.selected=Selected
 dataverse.listing.error=Fatal error trying to list the contents of the dataverse. Please report this error to the Dataverse administrator.
 dataverse.datasize=Total size of the files stored in this dataverse: {0} bytes
+dataverse.storage.quota.allocation=Total quota allocation for this collection: {0} bytes
+dataverse.storage.quota.notdefined=No quota defined for this collection
+dataverse.storage.quota.updated=Storage quota successfully set for the collection
+dataverse.storage.quota.deleted=Storage quota successfully disabled for the collection
+dataverse.storage.quota.superusersonly=Only superusers can change storage quotas.
+dataverse.storage.use=Total recorded size of the files stored in this collection (user-uploaded files plus the versions in the archival tab-delimited format when applicable): {0} bytes
 dataverse.datasize.ioerror=Fatal IO error while trying to determine the total size of the files stored in the dataverse. Please report this error to the Dataverse administrator.
-
+dataverse.inherited=(inherited from enclosing Dataverse)
+dataverse.default=(Default)
+dataverse.metadatalanguage.setatdatasetcreation=Chosen at Dataset Creation
+dataverse.guestbookentry.atdownload=Guestbook Entry At Download
+dataverse.guestbookentry.atrequest=Guestbook Entry At Access Request
+dataverse.inputlevels.error.invalidfieldtypename=Invalid dataset field type name: {0}
+dataverse.inputlevels.error.cannotberequiredifnotincluded=The input level for the dataset field type {0} cannot be required if it is not included
+dataverse.facets.error.fieldtypenotfound=Can''t find dataset field type ''{0}''
+dataverse.facets.error.fieldtypenotfacetable=Dataset field type ''{0}'' is not facetable
+dataverse.metadatablocks.error.invalidmetadatablockname=Invalid metadata block name: {0}
+dataverse.metadatablocks.error.containslistandinheritflag=Metadata block can not contain both {0} and {1}: true
+dataverse.create.error.jsonparse=Error parsing Json: {0}
+dataverse.create.error.jsonparsetodataverse=Error parsing the POSTed json into a dataverse: {0}
+dataverse.create.featuredItem.error.imageFileProcessing=Error processing featured item file: {0}
+dataverse.create.featuredItem.error.fileSizeExceedsLimit=File exceeds the maximum size of {0}
+dataverse.create.featuredItem.error.invalidFileType=Invalid image file type
+dataverse.create.featuredItem.error.contentShouldBeProvided=Featured item 'content' property should be provided and not empty.
+dataverse.create.featuredItem.error.contentExceedsLengthLimit=Featured item content exceeds the maximum allowed length of {0} characters.
+dataverse.update.featuredItems.error.missingInputParams=All input parameters (id, content, displayOrder, keepFile, fileName) are required.
+dataverse.update.featuredItems.error.inputListsSizeMismatch=All input lists (id, content, displayOrder, keepFile, fileName, type, dvObject) must have the same size.
+dataverse.update.featuredItems.error.invalidTypeAndDvObject=Invalid type and DvObject. 
+dataverse.update.featuredItems.error.invalidType=Unknown 'type' must be one of {0}
+dataverse.update.featuredItems.error.typeAndDvObjectMismatch=The 'type' passed does not match the dvObject type.
+dataverse.delete.featuredItems.success=All featured items of this Dataverse have been successfully deleted.
+dataverse.createTemplate.error.jsonParseMetadataFields=Error parsing the POSTed template dataset fields: {0}
 # rolesAndPermissionsFragment.xhtml
 
 # advanced.xhtml
@@ -794,18 +1042,25 @@ advanced.search.header.datasets=Datasets
 advanced.search.header.files=Files
 advanced.search.files.name.tip=The name given to identify the file.
 advanced.search.files.description.tip=A summary describing the file and its variables.
-advanced.search.files.persistentId.tip=The persistent identifier for the file.
 advanced.search.files.persistentId=Data File Persistent ID
-advanced.search.files.persistentId.tip=The unique persistent identifier for a data file, which can be a Handle or DOI in Dataverse.
+advanced.search.files.persistentId.tip=The unique persistent identifier for the file.
 advanced.search.files.fileType=File Type
 advanced.search.files.fileType.tip=The file type, e.g. Comma Separated Values, Plain Text, R, etc.
 advanced.search.files.variableName=Variable Name
 advanced.search.files.variableName.tip=The name of the variable's column in the data frame.
 advanced.search.files.variableLabel=Variable Label
 advanced.search.files.variableLabel.tip=A short description of the variable.
-advanced.search.datasets.persistentId.tip=The persistent identifier for the dataset.
-advanced.search.datasets.persistentId=Dataset Persistent ID
-advanced.search.datasets.persistentId.tip=The unique persistent identifier for a dataset, which can be a Handle or DOI in Dataverse.
+advanced.search.datasets.persistentId=Persistent Identifier
+advanced.search.datasets.persistentId.tip=The persistent identifier for the Dataset.
+advanced.search.files.fileTags=File Tags
+advanced.search.files.fileTags.tip=Terms such "Documentation", "Data", or "Code" that have been applied to files.
+
+# search 
+search.datasets.literalquestion=Text of the actual, literal question asked.
+search.datasets.interviewinstructions=Specific instructions to the individual conducting an interview.
+search.datasets.postquestion=Text describing what occurs after the literal question has been asked.
+search.datasets.variableuniverse=The group of persons or other elements that are the object of research and to which any analytic results refer.
+search.datasets.variableNotes=For clarifying information/annotation regarding the variable.
 
 # search-include-fragment.xhtml
 dataverse.search.advancedSearch=Advanced Search
@@ -839,6 +1094,10 @@ dataverse.results.empty.link.technicalDetails=More technical details
 dataverse.search.facet.error=There was an error with your search parameters. Please <a href="/dataverse/{0}">clear your search</a> and try again.
 dataverse.results.count.toofresults={0} to {1} of {2} {2, choice, 0#Results|1#Result|2#Results}
 dataverse.results.paginator.current=(Current)
+dataverse.results.paginator.first=First Page
+dataverse.results.paginator.previous=Previous Page
+dataverse.results.paginator.next=Next Page
+dataverse.results.paginator.last=Last Page
 dataverse.results.btn.sort=Sort
 dataverse.results.btn.sort.option.nameAZ=Name (A-Z)
 dataverse.results.btn.sort.option.nameZA=Name (Z-A)
@@ -848,12 +1107,15 @@ dataverse.results.btn.sort.option.relevance=Relevance
 dataverse.results.cards.foundInMetadata=Found in Metadata Fields:
 dataverse.results.cards.files.tabularData=Tabular Data
 dataverse.results.solrIsDown=Please note: Due to an internal error, browsing and searching is not available.
+dataverse.results.solrIsTemporarilyUnavailable=Search Engine service (Solr) is temporarily unavailable because of high load. Please try again later.
+dataverse.results.solrIsTemporarilyUnavailable.extraText=Note that all the datasets that are part of this collection are accessible via direct links and registered DOIs.
+dataverse.results.solrFacetsDisabled=Facets temporarily unavailable.
 dataverse.theme.title=Theme
 dataverse.theme.inheritCustomization.title=For this dataverse, use the same theme as the parent dataverse.
 dataverse.theme.inheritCustomization.label=Inherit Theme
 dataverse.theme.inheritCustomization.checkbox=Inherit theme from {0}
 dataverse.theme.logo=Logo
-dataverse.theme.logo.tip=Supported image types are JPG, TIF, or PNG and should be no larger than 500 KB. The maximum display size for an image file in a dataverse's theme is 940 pixels wide by 120 pixels high.
+dataverse.theme.logo.tip=Supported image types are JPG and PNG, must be no larger than 500 KB. The maximum display size for an image file in a dataverse's theme is 940 pixels wide by 120 pixels high.
 dataverse.theme.logo.format=Logo Format
 dataverse.theme.logo.format.selectTab.square=Square
 dataverse.theme.logo.format.selectTab.rectangle=Rectangle
@@ -872,10 +1134,12 @@ dataverse.theme.success=You have successfully updated the theme for this dataver
 dataverse.theme.failure=The dataverse theme has not been updated.
 dataverse.theme.logo.image=Logo Image
 dataverse.theme.logo.imageFooter=Footer Image
+dataverse.theme.logo.imageThumbnail=Thumbnail Image
 dataverse.theme.logo.image.title=The logo or image file you wish to display in the header of this dataverse.
 dataverse.theme.logo.image.footer=The logo or image file you wish to display in the footer of this dataverse.
+dataverse.theme.logo.image.thumbnail=The logo or image file you wish to display in the featured collection of this dataverse.
 dataverse.theme.logo.image.uploadNewFile=Upload New File
-dataverse.theme.logo.image.invalidMsg=The image could not be uploaded. Please try again with a JPG, TIF, or PNG file.
+dataverse.theme.logo.image.invalidMsg=The image could not be uploaded. Please try again with a JPG or PNG file.
 dataverse.theme.logo.image.uploadImgFile=Upload Image File
 dataverse.theme.logo.format.title=The shape for the logo or image file you upload for this dataverse.
 dataverse.theme.logo.alignment.title=Where the logo or image should display in the header or footer.
@@ -913,6 +1177,9 @@ dataverse.widgets.advanced.url.watermark=http://www.example.com/page-name
 dataverse.widgets.advanced.invalid.message=Please enter a valid URL
 dataverse.widgets.advanced.success.message=Successfully updated your Personal Website URL
 dataverse.widgets.advanced.failure.message=The dataverse Personal Website URL has not been updated.
+facet.collection.label=Toggle Collections
+facet.dataset.label=Toggle Data Projects
+facet.datafile.label=Toggle Files
 
 # permissions-manage.xhtml
 dataverse.permissions.title=Permissions
@@ -935,6 +1202,8 @@ dataverse.permissions.roles.add=Add New Role
 dataverse.permissions.roles.description=All the roles set up in your dataverse, that you can assign to users and groups.
 dataverse.permissions.roles.edit=Edit Role
 dataverse.permissions.roles.copy=Copy Role
+dataverse.permissions.roles.alias.required=Please enter a unique identifier for this role.
+dataverse.permissions.roles.name.required=Please enter a name for this role.
 
 # permissions-manage-files.xhtml
 dataverse.permissionsFiles.title=Restricted File Permissions
@@ -946,6 +1215,8 @@ dataverse.permissionsFiles.usersOrGroups.tabHeader.id=ID
 dataverse.permissionsFiles.usersOrGroups.tabHeader.email=Email
 dataverse.permissionsFiles.usersOrGroups.tabHeader.authentication=Authentication
 dataverse.permissionsFiles.usersOrGroups.tabHeader.files=Files
+dataverse.permissionsFiles.usersOrGroups.tabHeader.accessRequestDate=Date
+dataverse.permissionsFiles.usersOrGroups.tabHeader.accessRequestDateNotAvailable=N/A
 dataverse.permissionsFiles.usersOrGroups.tabHeader.access=Access
 dataverse.permissionsFiles.usersOrGroups.file=File
 dataverse.permissionsFiles.usersOrGroups.files=Files
@@ -968,6 +1239,7 @@ dataverse.permissionsFiles.files.assignBtn=Assign Access
 dataverse.permissionsFiles.files.invalidMsg=There are no restricted files in this dataset.
 dataverse.permissionsFiles.files.requested=Requested Files
 dataverse.permissionsFiles.files.selected=Selecting {0} of {1} {2}
+dataverse.permissionsFiles.files.includeDeleted=Include Deleted Files
 dataverse.permissionsFiles.viewRemoveDialog.header=File Access
 dataverse.permissionsFiles.viewRemoveDialog.removeBtn=Remove Access
 dataverse.permissionsFiles.viewRemoveDialog.removeBtn.confirmation=Are you sure you want to remove access to this file? Once access has been removed, the user or group will no longer be able to download this file.
@@ -1055,7 +1327,7 @@ dataset.manageTemplates.tab.action.btn.makeDefault=Make Default
 dataset.manageTemplates.tab.action.btn.default=Default
 dataset.manageTemplates.tab.action.btn.view=View
 dataset.manageTemplates.tab.action.btn.copy=Copy
-dataset.manageTemplates.tab.action.btn.edit=Edit
+dataset.manageTemplates.tab.action.btn.edit=Edit Template
 dataset.manageTemplates.tab.action.btn.edit.metadata=Metadata
 dataset.manageTemplates.tab.action.btn.edit.terms=Terms
 dataset.manageTemplates.tab.action.btn.delete=Delete
@@ -1070,6 +1342,12 @@ dataset.message.manageTemplates.label=Manage Dataset Templates
 dataset.message.manageTemplates.message=Create a template prefilled with metadata fields standard values, such as Author Affiliation, or add instructions in the metadata fields to give depositors more information on what metadata is expected.
 
 # metadataFragment.xhtml
+dataset.anonymized.withheld=withheld
+
+dataset.metadatalanguage.create.guidance=Please enter metadata in the <b>{0}</b> language, or change the metadata language choice in the parent dataverse before proceeding.
+dataset.metadatalanguage.view.guidance=This dataset has been configured to use <b>{0}</b> as the language for all metadata entries.
+dataset.metadatalanguage.title=Metadata entered for this dataset will be assumed to be in the selected language. Cannot be changed after dataset is created.
+dataset.metadatalanguage.tip=Select the language you wish to use when entering metadata.
 
 # template.xhtml
 dataset.template.name.tip=The name of the dataset template.
@@ -1125,7 +1403,8 @@ dataset.manageGuestbooks.noGuestbooks.why.reason2=You can download the data coll
 dataset.manageGuestbooks.noGuestbooks.how.header=How To Use Guestbooks
 dataset.manageGuestbooks.noGuestbooks.how.tip1=A guestbook can be used for multiple datasets but only one guestbook can be used for a dataset.
 dataset.manageGuestbooks.noGuestbooks.how.tip2=Custom questions can have free form text answers or have a user select an answer from several options.
-dataset.manageGuestbooks.noGuestbooks.getStarted=To get started, click on the Create Dataset Guestbook button above. To learn more about Guestbooks, visit the <a href="{0}/{1}/user/dataverse-management.html#dataset-guestbooks" title="Dataset Guestbook - Dataverse User Guide" target="_blank">Dataset Guestbook</a> section of the User Guide.
+dataset.manageGuestbooks.noGuestbooks.getStarted=To get started, click on the Create Dataset Guestbook button above.
+dataset.manageGuestbooks.noGuestbooks.learnMore=To learn more about guestbooks, visit the <a href="{0}/{1}/user/dataverse-management.html#dataset-guestbooks" title="Dataset Guestbook - Dataverse User Guide" target="_blank">Dataset Guestbook</a> section of the User Guide.
 dataset.manageGuestbooks.tab.header.name=Guestbook Name
 dataset.manageGuestbooks.tab.header.date=Date Created
 dataset.manageGuestbooks.tab.header.usage=Usage
@@ -1186,30 +1465,64 @@ dataset.manageGuestbooks.guestbook.customQuestions.description=Create your own q
 dataset.manageGuestbooks.guestbook.customQuestions.questionType=Question Type
 dataset.manageGuestbooks.guestbook.customQuestions.questionText=Question Text
 dataset.manageGuestbooks.guestbook.customQuestions.responseOptions=Response Options
-dataset.manageGuestbooks.guestbook.customQuestions.questionType.text=Text
+dataset.manageGuestbooks.guestbook.customQuestions.questionType.text=Single Line
+dataset.manageGuestbooks.guestbook.customQuestions.questionType.textarea=Multiple Line
 dataset.manageGuestbooks.guestbook.customQuestions.questionType.multiple=Multiple Choice
 
 # guestbookResponseFragment.xhtml
 dataset.guestbookResponse.guestbook.additionalQuestions=Additional Questions
-dataset.guestbookResponse.guestbook.responseTooLong=Please limit response to 255 characters
+dataset.guestbookResponse.showPreview.errorMessage=Can't show preview.
+dataset.guestbookResponse.showPreview.errorDetail=Couldn't write guestbook response.
+
+#GuestbookResponse
+dataset.guestbookResponse=Guestbook Response
+dataset.guestbookResponse.id=Guestbook Response ID
+dataset.guestbookResponse.date=Response Date
+dataset.guestbookResponse.respondent=Respondent
+dataset.guestbookResponse.question=Q
+dataset.guestbookResponse.answer=A
+dataset.guestbookResponse.noResponse=(No Response)
+dataset.guestbookResponse.requestor.id=authenticatedUserId
+dataset.guestbookResponse.requestor.identifier=authenticatedUserIdentifier
+
 
 # dataset.xhtml
 dataset.configureBtn=Configure
 dataset.pageTitle=Add New Dataset
-dataset.editBtn=Edit
+
+dataset.accessBtn=Access Dataset
+dataset.accessBtn.header.download=Download Options
+dataset.accessBtn.header.explore=Explore Options
+dataset.accessBtn.header.configure=Configure Options
+dataset.accessBtn.header.compute=Compute Options
+dataset.accessBtn.download.size=ZIP ({0})
+dataset.accessBtn.transfer.size=({0})
+dataset.accessBtn.too.big=The dataset is too large to download. Please select the files you need from the files table.
+dataset.accessBtn.original.too.big=The dataset is too large to download in the original format. Please select the files you need from the files table.
+dataset.accessBtn.archival.too.big=The dataset is too large to download in the archival format. Please select the files you need from the files table.
+dataset.linkBtn=Link Dataset
+dataset.unlinkBtn=Unlink Dataset
+dataset.contactBtn=Contact Owner
+dataset.shareBtn=Share
+
+dataset.publishBtn=Publish Dataset
+dataset.editBtn=Edit Dataset
+
+dataset.changestatus=Change Curation Status
+dataset.removestatus=Remove Current Status
 dataset.editBtn.itemLabel.upload=Files (Upload)
 dataset.editBtn.itemLabel.metadata=Metadata
 dataset.editBtn.itemLabel.terms=Terms
 dataset.editBtn.itemLabel.permissions=Permissions
 dataset.editBtn.itemLabel.thumbnailsAndWidgets=Thumbnails + Widgets
-dataset.editBtn.itemLabel.privateUrl=Private URL
+dataset.editBtn.itemLabel.privateUrl=Preview URL
 dataset.editBtn.itemLabel.permissionsDataset=Dataset
 dataset.editBtn.itemLabel.permissionsFile=Restricted Files
 dataset.editBtn.itemLabel.deleteDataset=Delete Dataset
 dataset.editBtn.itemLabel.deleteDraft=Delete Draft Version
 dataset.editBtn.itemLabel.deaccession=Deaccession Dataset
 dataset.exportBtn=Export Metadata
-dataset.exportBtn.itemLabel.ddi=DDI
+dataset.exportBtn.itemLabel.ddi=DDI Codebook v2
 dataset.exportBtn.itemLabel.dublinCore=Dublin Core
 dataset.exportBtn.itemLabel.schemaDotOrg=Schema.org JSON-LD
 dataset.exportBtn.itemLabel.datacite=DataCite
@@ -1217,21 +1530,30 @@ dataset.exportBtn.itemLabel.json=JSON
 dataset.exportBtn.itemLabel.oai_ore=OAI_ORE
 dataset.exportBtn.itemLabel.dataciteOpenAIRE=OpenAIRE
 dataset.exportBtn.itemLabel.html=DDI HTML Codebook
+license.none.chosen=No license or custom terms chosen
+license.none.chosen.description=No custom terms have been entered for this dataset
+license.custom=Custom Dataset Terms
+license.custom.description=Custom terms specific to this dataset
 metrics.title=Metrics
 metrics.title.tip=View more metrics information
 metrics.dataset.title=Dataset Metrics
 metrics.dataset.tip.default=Aggregated metrics for this dataset.
-metrics.dataset.tip.makedatacount=Metrics collected using Make Data Count standards.
-metrics.dataset.views.tip=Dataset views are combined with both aggregated file views and file downloads.
+metrics.dataset.makedatacount.title=Make Data Count (MDC) Metrics
+metrics.dataset.makedatacount.since=since
+metrics.dataset.tip.makedatacount=Metrics collected using <a href="https://makedatacount.org/counter-code-of-practice-for-research-data/" target="_blank" rel="noopener"/>Make Data Count</a> standards.
+metrics.dataset.views.tip=Aggregate of views of the dataset landing page, file views, and file downloads.
 metrics.dataset.downloads.default.tip=Total aggregated downloads of files in this dataset.
 metrics.dataset.downloads.makedatacount.tip=Each file downloaded is counted as 1, and added to the total download count.
+metrics.dataset.downloads.premakedatacount.tip=Downloads prior to enabling MDC. Counts do not have the same filtering and detail as MDC metrics.
 metrics.dataset.citations.tip=Click for a list of citation URLs.
 metrics.file.title=File Metrics
 metrics.file.tip.default=Metrics for this individual file.
 metrics.file.tip.makedatacount=Individual file downloads are tracked in Dataverse but are not reported as part of the Make Data Count standard.
 metrics.file.downloads.tip=Total downloads of this file.
+metrics.file.downloads.nonmdc.tip=Total downloads. Due to differences between MDC and Dataverse's internal tracking, the sum of these for all files in a dataset may be larger than total downloads reported for a dataset.
 metrics.views={0, choice, 0#Views|1#View|2#Views}
 metrics.downloads={0, choice, 0#Downloads|1#Download|2#Downloads}
+metrics.downloads.nonMDC={0, choice, 0#|1# (+ 1 pre-MDC |2< (+ {0} pre-MDC }
 metrics.citations={0, choice, 0#Citations|1#Citation|2#Citations}
 metrics.citations.dialog.header=Dataset Citations
 metrics.citations.dialog.help=Citations for this dataset are retrieved from Crossref via DataCite using Make Data Count standards. For more information about dataset metrics, please refer to the <a href="{0}/{1}/user/dataset-management.html#dataset-metrics-and-make-data-count" title="Dataset Metrics and Make Data Count - Dataverse User Guide" target="_blank">User Guide</a>.
@@ -1248,14 +1570,29 @@ dataset.submit.failure=Dataset Submission Failed - {0}
 dataset.submit.failure.null=Can't submit for review. Dataset is null.
 dataset.submit.failure.isReleased=Latest version of dataset is already released. Only draft versions can be submitted for review.
 dataset.submit.failure.inReview=You cannot submit this dataset for review because it is already in review.
+dataset.curationstatus.failure.notallowed=Status update failed - label not allowed
+dataset.curationstatus.failure.noChange=Status update failed - the dataset already has this status
+dataset.curationstatus.failure.disabled=Status labeling disabled for this dataset
+dataset.curationstatus.failure.isReleased=Latest version of dataset is already released. Status can only be set on draft versions
+dataset.curationstatus.header=Curation Status Changed
+dataset.curationstatus.removed=Curation Status Removed
+dataset.curationstatus.info=Curation Status is now "{0}"
+dataset.curationstatus.none=<none>
+dataset.curationstatus.cantchange=Unable to change Curation Status. Please contact the administrator.
 dataset.rejectMessage=Return this dataset to contributor for modification.
+dataset.rejectMessageReason=The reason for return entered below will be sent by email to the author.
+dataset.rejectMessage.label=Return to Author Reason
 dataset.rejectWatermark=Please enter a reason for returning this dataset to its author(s).
 dataset.reject.enterReason.error=Reason for return to author is required.
 dataset.reject.success=This dataset has been sent back to the contributor.
 dataset.reject.failure=Dataset Submission Return Failed - {0}
 dataset.reject.datasetNull=Cannot return the dataset to the author(s) because it is null.
 dataset.reject.datasetNotInReview=This dataset cannot be return to the author(s) because the latest version is not In Review. The author(s) needs to click Submit for Review first.
+dataset.reject.commentNull=You must enter a reason for returning a dataset to the author(s).
 dataset.publish.tip=Are you sure you want to publish this dataset? Once you do so it must remain published.
+dataset.publish.terms.tip=This version of the dataset will be published with the following terms:
+dataset.publish.terms.help.tip=To change the terms for this version, click the Cancel button and go to the Terms tab for this dataset.
+dataset.publish.terms.description=License Description
 dataset.publishBoth.tip=Once you publish this dataset it must remain published.
 dataset.unregistered.tip= This dataset is unregistered. We will attempt to register it before publishing.
 dataset.republish.tip=Are you sure you want to republish this dataset?
@@ -1269,9 +1606,17 @@ dataset.mayNotPublish.administrator= This dataset cannot be published until {0}
 dataset.mayNotPublish.both= This dataset cannot be published until {0} is published. Would you like to publish both right now?
 dataset.mayNotPublish.twoGenerations= This dataset cannot be published until {0} and {1}  are published.
 dataset.mayNotBePublished.both.button=Yes, Publish Both
+dataset.mayNotPublish.FilesRequired=Published datasets should contain at least one data file.
 dataset.viewVersion.unpublished=View Unpublished Version
 dataset.viewVersion.published=View Published Version
-dataset.email.datasetContactBtn=Email Dataset Contact
+dataset.link.title=Link Dataset
+dataset.link.save=Save Linked Dataset
+dataset.link.not.to.owner=Can't link a dataset to its dataverse
+dataset.link.not.to.parent.dataverse=Can't link a dataset to its parent dataverses
+dataset.link.not.already.linked=Can't link a dataset that has already been linked to this dataverse
+dataset.unlink.title=Unlink Dataset
+dataset.unlink.delete=Remove Linked Dataset
+dataset.email.datasetContactTitle=Contact Dataset Owner
 dataset.email.hiddenMessage= 
 dataset.email.messageSubject=Test Message Subject
 dataset.email.datasetLinkBtn.tip=Link Dataset to Your Dataverse
@@ -1285,13 +1630,23 @@ dataset.locked.ingest.message=The tabular data files uploaded are being processe
 dataset.unlocked.ingest.message=The tabular files have been ingested.
 dataset.locked.editInProgress.message=Edit In Progress
 dataset.locked.editInProgress.message.details=Additional edits cannot be made at this time. Contact {0} if this status persists.
+dataset.locked.pidNotReserved.message=Dataset DOI Not Reserved
+dataset.locked.pidNotReserved.message.details=The DOI displayed in the citation for this dataset has not yet been reserved with DataCite. Please do not share this DOI until it has been reserved.
 dataset.publish.error=This dataset may not be published due to an error when contacting the <a href=\{1} target=\"_blank\"/> {0} </a> Service. Please try again.
 dataset.publish.error.doi=This dataset may not be published because the DOI update failed.
+dataset.publish.file.validation.error.message=Failed to Publish Dataset
+dataset.publish.file.validation.error.details=The dataset could not be published because one or more of the datafiles in the dataset could not be validated (physical file missing, checksum mismatch, etc.) 
+dataset.publish.file.validation.error.contactSupport=The dataset could not be published because one or more of the datafiles in the dataset could not be validated (physical file missing, checksum mismatch, etc.) Please contact support for further assistance. 
+dataset.publish.file.validation.error.noChecksumType=Checksum type not defined for datafile id {0}
+dataset.publish.file.validation.error.failRead=Failed to open datafile id {0} for reading
+dataset.publish.file.validation.error.failCalculateChecksum=Failed to calculate checksum for datafile id {0}
+dataset.publish.file.validation.error.wrongChecksumValue=Checksum mismatch for datafile id {0}
 dataset.compute.computeBatchSingle=Compute Dataset
 dataset.compute.computeBatchList=List Batch
 dataset.compute.computeBatchAdd=Add to Batch
 dataset.compute.computeBatchClear=Clear Batch
 dataset.compute.computeBatchRemove=Remove from Batch
+dataset.compute.computeBatchChange=Change Compute Batch
 dataset.compute.computeBatchCompute=Compute Batch
 dataset.compute.computeBatch.success=The list of datasets in your compute batch has been updated.
 dataset.compute.computeBatch.failure=The list of datasets in your compute batch failed to be updated. Please try again.
@@ -1299,10 +1654,9 @@ dataset.compute.computeBtn=Compute
 dataset.compute.computeBatchListHeader=Compute Batch
 dataset.compute.computeBatchRestricted=This dataset contains restricted files you may not compute on because you have not been granted access.
 dataset.delete.error=Could not deaccession the dataset because the {0} update failed.
-dataset.publish.worldMap.deleteConfirm=Please note that your data and map on WorldMap will be removed due to restricted file access changes in this dataset version which you are publishing. Do you want to continue?
 dataset.publish.workflow.message=Publish in Progress
 dataset.publish.workflow.inprogress=This dataset is locked until publication.
-dataset.pidRegister.workflow.inprogress=This dataset is locked while the file persistent identifiers are being registered or updated.
+dataset.pidRegister.workflow.inprogress=The dataset is locked while the persistent identifiers are being registered or updated, and/or the physical files are being validated.
 dataset.versionUI.draft=Draft
 dataset.versionUI.inReview=In Review
 dataset.versionUI.unpublished=Unpublished
@@ -1312,9 +1666,18 @@ dataset.cite.title.draft=DRAFT VERSION will be replaced in the citation with the
 dataset.cite.title.deassessioned=DEACCESSIONED VERSION has been added to the citation for this version since it is no longer available.
 dataset.cite.standards.tip=Learn about <a href="https://dataverse.org/best-practices/data-citation" title="Data Citation - Dataverse.org" target="_blank">Data Citation Standards</a>.
 dataset.cite.downloadBtn=Cite Dataset
-dataset.cite.downloadBtn.xml=EndNote XML
-dataset.cite.downloadBtn.ris=RIS
-dataset.cite.downloadBtn.bib=BibTeX
+dataset.cite.downloadBtn.xml=Download EndNote XML
+dataset.cite.downloadBtn.ris=Download RIS
+dataset.cite.downloadBtn.bib=Download BibTeX
+dataset.cite.viewCitation=View Styled Citation
+dataset.cite.cslDialog.title=Styled Citation
+dataset.cite.cslDialog.select=Select a CSL style
+dataset.cite.cslDialog.commonStyles=Common Styles
+dataset.cite.cslDialog.otherStyles=More Styles
+dataset.cite.cslDialog.citation=Citation in "{0}" style
+dataset.cite.cslDialog.generating=Generating Citation...
+dataset.cite.cslDialog.copy=Copy Citation to Clipboard
+dataset.cite.cslDialog.close=Close
 dataset.create.authenticatedUsersOnly=Only authenticated users can create datasets.
 dataset.deaccession.reason=Deaccession Reason
 dataset.beAccessedAt=The dataset can now be accessed at:
@@ -1324,30 +1687,46 @@ dataset.subjectDisplay.title=Subject
 dataset.contact.tip=Use email button above to contact.
 dataset.asterisk.tip=Asterisks indicate required fields
 dataset.message.uploadFiles.label=Upload Dataset Files
-dataset.message.uploadFilesSingle.message=For more information about supported file formats, please refer to the <a href="{0}/{1}/user/dataset-management.html#file-handling-and-uploading" title="File Handling and Uploading - Dataverse User Guide" target="_blank">User Guide</a>.
+dataset.message.uploadFilesSingle.message=All file types are supported for upload and download in their original format. If you are uploading Excel, CSV, TSV, RData, Stata, or SPSS files, <a href="{0}/{1}/user/dataset-management.html#tabular-data-files" title="Tabular Data Files - Dataverse User Guide" target="_blank">see the guides</a> for tabular support and limitations.
 dataset.message.uploadFilesMultiple.message=Multiple file upload/download methods are available for this dataset. Once you upload a file using one of these methods, your choice will be locked in for this dataset.
 dataset.message.editMetadata.label=Edit Dataset Metadata
 dataset.message.editMetadata.message=Add more metadata about this dataset to help others easily find it.
+dataset.message.editMetadata.duplicateFilenames=Duplicate filenames: {0}
+dataset.message.editMetadata.invalid.TOUA.message=Datasets with restricted files are required to have Request Access enabled or Terms of Access to help people access the data. Please edit the dataset to confirm Request Access or provide Terms of Access to be in compliance with the policy.
+dataset.message.toua.invalid=Terms of Use and Access are invalid. You must enable request access or add terms of access in datasets with restricted files.
+
 dataset.message.editTerms.label=Edit Dataset Terms
 dataset.message.editTerms.message=Add the terms of use for this dataset to explain how to access and use your data.
 dataset.message.locked.editNotAllowedInReview=Dataset cannot be edited due to In Review dataset lock.
 dataset.message.locked.downloadNotAllowedInReview=Dataset file(s) may not be downloaded due to In Review dataset lock.
 dataset.message.locked.downloadNotAllowed=Dataset file(s) may not be downloaded due to dataset lock.
 dataset.message.locked.editNotAllowed=Dataset cannot be edited due to dataset lock.
-dataset.message.createSuccess=This dataset has been created
+dataset.message.locked.publishNotAllowed=Dataset cannot be published due to dataset lock.
+dataset.message.createSuccess=This dataset has been created.
 dataset.message.createSuccess.failedToSaveFiles=Partial Success: The dataset has been created. But the file(s) could not be saved. Please try uploading the file(s) again.
 dataset.message.createSuccess.partialSuccessSavingFiles=Partial Success: The dataset has been created. But only {0} out of {1} files have been saved. Please try uploading the missing file(s) again.
 dataset.message.linkSuccess= {0} has been successfully linked to {1}.
-dataset.message.metadataSuccess=The metadata for this dataset has been updated.
-dataset.message.termsSuccess=The terms for this dataset has been updated.
-dataset.message.filesSuccess=The files for this dataset have been updated.
+dataset.message.unlinkSuccess= {0} has been successfully unlinked from {1}.
+dataset.message.metadataSuccess=The metadata for this dataset have been updated.
+dataset.message.termsSuccess=The terms for this dataset have been updated.
+dataset.message.filesSuccess=One or more files have been updated.
 dataset.message.addFiles.Failure=Failed to add files to the dataset. Please try uploading the file(s) again.
 dataset.message.addFiles.partialSuccess=Partial success: only {0} files out of {1} have been saved. Please try uploading the missing file(s) again.
+dataset.message.publish.warning=<b>This draft version needs to be published.</b> 
+dataset.message.submit.warning=<b>This draft version needs to be submitted for review.</b>
+dataset.message.incomplete.warning=This draft version has incomplete metadata that needs to be edited before it can be published.
+dataset.message.publish.remind.draft=When ready for sharing, please <b>publish</b> it so that others can see these changes.
+dataset.message.submit.remind.draft=When ready for sharing, please <b>submit it for review</b>.
+dataset.message.publish.remind.draft.filePage=When ready for sharing, please <a href="/dataset.xhtml?persistentId={0}">go to the dataset page</a> to publish it so that others can see these changes.
+dataset.message.submit.remind.draft.filePage=When ready for sharing, please <a href="/dataset.xhtml?persistentId={0}">go to the dataset page</a> to submit it for review.
 dataset.message.publishSuccess=This dataset has been published.
+dataset.message.publishGlobusFailure.details=Could not publish Globus data.
+dataset.message.publishGlobusFailure=Error with publishing data.
+dataset.message.GlobusError=Cannot go to Globus.
 dataset.message.only.authenticatedUsers=Only authenticated users may release Datasets.
 dataset.message.deleteSuccess=This dataset has been deleted.
 dataset.message.bulkFileUpdateSuccess=The selected files have been updated.
-dataset.message.bulkFileDeleteSuccess=The selected files have been deleted.
+dataset.message.bulkFileDeleteSuccess=One or more files have been deleted.
 datasetVersion.message.deleteSuccess=This dataset draft has been deleted.
 datasetVersion.message.deaccessionSuccess=The selected version(s) have been deaccessioned.
 dataset.message.deaccessionSuccess=This dataset has been deaccessioned.
@@ -1360,16 +1739,28 @@ dataset.message.deleteFailure=This dataset draft could not be deleted.
 dataset.message.deaccessionFailure=This dataset could not be deaccessioned.
 dataset.message.createFailure=The dataset could not be created.
 dataset.message.termsFailure=The dataset terms could not be updated.
-dataset.message.label.fileAccess=File Access
-dataset.message.publicInstall=Files are stored on a publicly accessible storage server.
+dataset.message.label.fileAccess=Publicly-accessible storage
+dataset.message.publicInstall=Files in this dataset may be readable outside Dataverse, restricted and embargoed access are disabled
+dataset.message.versionNoteSuccess=Version note successfully updated.
+dataset.message.parallelUpdateError=Changes cannot be saved. This dataset has been edited since this page was opened. To continue, copy your changes, refresh the page to see the recent updates, and re-enter any changes you want to save. 
+dataset.message.parallelPublishError=Publishing is blocked. This dataset has been edited since this page was opened. To publish it, refresh the page to see the recent updates, and publish again.
 dataset.metadata.publicationDate=Publication Date
-dataset.metadata.publicationDate.tip=The publication date of a dataset.
+dataset.metadata.publicationDate.tip=The publication date of a Dataset.
+dataset.metadata.citationDate=Citation Date
+dataset.metadata.citationDate.tip=The citation date of a dataset, determined by the longest embargo on any file in version 1.0.
 dataset.metadata.publicationYear=Publication Year
 dataset.metadata.publicationYear.tip=The publication year of a dataset.
-dataset.metadata.persistentId=Dataset Persistent ID
-dataset.metadata.persistentId.tip=The unique persistent identifier for a dataset, which can be a Handle or DOI in Dataverse.
+dataset.metadata.persistentId=Persistent Identifier
+dataset.metadata.persistentId.tip=The Dataset's unique persistent identifier, either a DOI or Handle
 dataset.metadata.alternativePersistentId=Previous Dataset Persistent ID
-dataset.metadata.alternativePersistentId.tip=A previously used persistent identifier for a dataset, which can be a Handle or DOI in Dataverse.
+dataset.metadata.alternativePersistentId.tip=A previously used persistent identifier for the Dataset, either a DOI or Handle
+dataset.metadata.invalidEntry=is not a valid entry.
+dataset.metadata.invalidDate=is not a valid date. "yyyy" is a supported format.
+dataset.metadata.invalidNumber=is not a valid number.
+dataset.metadata.invalidGeospatialCoordinates=has invalid coordinates. East must be greater than West and North must be greater than South. Missing values are NOT allowed.
+dataset.metadata.invalidInteger=is not a valid integer.
+dataset.metadata.invalidURL=is not a valid URL.
+dataset.metadata.invalidEmail=is not a valid email address.
 file.metadata.preview=Preview
 file.metadata.filetags=File Tags
 file.metadata.persistentId=File Persistent ID
@@ -1381,47 +1772,84 @@ dataset.versionDifferences.field=Field
 dataset.versionDifferences.changed=Changed
 dataset.versionDifferences.from=From
 dataset.versionDifferences.to=To
-file.viewDiffDialog.restricted=Restricted
+file.viewDiffDialog.fileAccess=Access
+dataset.host.tip=Changing the host dataverse will clear any fields you may have entered data into.
 dataset.template.tip=Changing the template will clear any fields you may have entered data into.
 dataset.noTemplate.label=None
 dataset.noSelectedFiles.header=Select File(s)
+dataset.noSelectedFiles=Please select one or more files.
 dataset.noSelectedFilesForDownload=Please select a file or files to be downloaded.
 dataset.noSelectedFilesForRequestAccess=Please select a file or files for access request.
-dataset.noSelectedFilesForDelete=Please select a file or files to be deleted.
-dataset.noSelectedFilesForMetadataEdit=Please select a file or files to be edited.
-dataset.noSelectedFilesForRestrict=Please select unrestricted file(s) to be restricted.
-dataset.noSelectedFilesForUnRestrict=Please select restricted file(s) to be unrestricted.
-dataset.inValidSelectedFilesForDownload=Restricted Files Selected
-dataset.noValidSelectedFilesForDownload=The restricted file(s) selected may not be downloaded because you have not been granted access.
-dataset.mixedSelectedFilesForDownload=The restricted file(s) selected may not be downloaded because you have not been granted access.
+dataset.embargoedSelectedFilesForRequestAccess=Embargoed files cannot be accessed. Please select an unembargoed file or files for your access request.
+dataset.inValidSelectedFilesForDownload=Inaccessible Files Selected
+dataset.inValidSelectedFilesForDownloadWithEmbargo=Inaccessible Files Selected
+dataset.inValidSelectedFilesForTransferWithEmbargo=Inaccessible Files Selected
+dataset.noValidSelectedFilesForDownload=The selected file(s) may not be downloaded because you have not been granted access or the file(s) have a retention period that has expired or the files can only be transferred via Globus.
+dataset.noValidSelectedFilesForTransfer=The selected file(s) may not be transferred because you have not been granted access or the file(s) have a retention period that has expired or the files are not Globus accessible.
+dataset.mixedSelectedFilesForDownload=The selected file(s) may not be downloaded because you have not been granted access or the file(s) have a retention period that has expired.
+dataset.mixedSelectedFilesForDownloadWithEmbargo=Any embargoed and/or restricted file(s) selected may not be downloaded because you have not been granted access. Some files may have a retention period that has expired. Some files may only be accessible via Globus.
+dataset.mixedSelectedFilesForTransfer=Some file(s) cannot be transferred. (They are restricted, embargoed, with an expired retention period, or not Globus accessible.)
+dataset.inValidSelectedFilesForTransfer=Ineligible Files Selected
 dataset.downloadUnrestricted=Click Continue to download the files you have access to download.
-dataset.requestAccessToRestrictedFiles=You may request access to the restricted file(s) by clicking the Request Access button. 
-dataset.privateurl.infoMessageAuthor=Privately share this dataset before it is published: {0}
-dataset.privateurl.infoMessageReviewer=This unpublished dataset is being privately shared. You will not be able to access it when logged into your Dataverse account.
-dataset.privateurl.header=Unpublished Dataset Private URL
-dataset.privateurl.tip=Use a Private URL to allow those without Dataverse accounts to access your unpublished dataset. For more information about the Private URL feature, please refer to the <a href="{0}/{1}/user/dataset-management.html#private-url-for-reviewing-an-unpublished-dataset" title="Private URL for Reviewing an Unpublished Dataset - Dataverse User Guide" target="_blank">User Guide</a>.
-dataset.privateurl.absent=Private URL has not been created.
-dataset.privateurl.createPrivateUrl=Create Private URL
-dataset.privateurl.disablePrivateUrl=Disable Private URL
-dataset.privateurl.disablePrivateUrlConfirm=Yes, Disable Private URL
-dataset.privateurl.disableConfirmationText=Are you sure you want to disable the Private URL? If you have shared the Private URL with others they will no longer be able to use it to access your unpublished dataset.
-dataset.privateurl.cannotCreate=Private URL can only be used with unpublished versions of datasets.
-dataset.privateurl.roleassigeeTitle=Private URL Enabled
+dataset.transferUnrestricted=Click Continue to transfer the elligible files.
+
+dataset.requestAccessToRestrictedFiles=You may request access to any restricted file(s) by clicking the Request Access button.
+dataset.requestAccessToRestrictedFilesWithEmbargo=Embargoed files cannot be accessed during the embargo period. If your selection contains restricted files, you may request access to them by clicking the Request Access button.
+dataset.privateurl.infoMessageAuthor=Privately share this draft dataset before it is published: {0}
+dataset.privateurl.infoMessageReviewer=You are viewing a preview of this unpublished dataset version.
+dataset.privateurl.header=Unpublished Dataset Preview URL
+dataset.privateurl.tip=To cite this data in publications, use the dataset''s persistent ID instead of this URL. For more information about the Preview URL feature, please refer to the <a href="{0}/{1}/user/dataset-management.html#private-url-to-review-unpublished-dataset" title="Preview URL for Reviewing an Unpublished Dataset - Dataverse User Guide" target="_blank">User Guide</a>.
+dataset.privateurl.onlyone=Only one Preview URL can be active for a single draft dataset.
+dataset.privateurl.absent=Preview URL has not been created.
+dataset.privateurl.general.button.label=Create General Preview URL
+dataset.privateurl.general.description=Create a URL that others can use to review this draft dataset version before it is published. They will be able to access all files in the dataset and see all metadata, including metadata that may identify the dataset's authors.
+dataset.privateurl.general.title=General Preview
+dataset.privateurl.anonymous.title=Anonymous Preview
+dataset.privateurl.anonymous.tooltip.preface=The following metadata fields will be hidden from the user of this Anonymous Preview URL: 
+dataset.privateurl.anonymous.button.label=Create Anonymous Preview URL
+dataset.privateurl.anonymous.description=Create a URL that others can use to access an anonymized view of this unpublished dataset version. Metadata that could identify the dataset's author will not be displayed. (See Tool Tip for the list of withheld metadata fields.) Non-identifying metadata will be visible.
+dataset.privateurl.anonymous.description.paragraph.two=The dataset's files are not changed and users of the Anonymous Preview URL will be able to access them. Users of the Anonymous Preview URL will not be able to see the name of the Dataverse that this dataset is in but will be able to see the name of the repository, which might expose the dataset authors' identities.
+dataset.privateurl.anonymous.description.paragraph.three=<b>To verify that all identifying information has been removed or anonymized, it is recommended that you logout and review the dataset as as it would be seen by an Anonymous Preview URL user.</b> See <a href="{2}/{3}/user/dataset-management.html#preview-url-to-review-unpublished-dataset"  target="_blank" rel="noopener">User Guide</a> for more information. 
+dataset.privateurl.createPrivateUrl=Create Preview URL
+dataset.privateurl.introduction=You can create a Preview URL to copy and share with others who will not need a repository account to review this unpublished dataset version. Once the dataset is published or if the URL is disabled, the URL will no longer work and will point to a "Page not found" page.
+dataset.privateurl.createPrivateUrl.anonymized=Create URL for Anonymized Access
+dataset.privateurl.createPrivateUrl.anonymized.unavailable=You won't be able to create an Anonymous Preview URL once a version of this dataset has been published.
+dataset.privateurl.disableGeneralPreviewUrl=Disable General Preview URL
+dataset.privateurl.disableAnonPreviewUrl=Disable Anonymous Preview URL
+dataset.privateurl.disableGeneralPreviewUrlConfirm=Yes, Disable General Preview URL
+dataset.privateurl.disableAnonPreviewUrlConfirm=Yes, Disable Anonymous Preview URL
+dataset.privateurl.disableConfirmationText=Are you sure you want to disable the Preview URL? If you have shared the Preview URL with others they will no longer be able to use it to access your unpublished dataset.
+dataset.privateurl.cannotCreate=Preview URL can only be used with unpublished versions of datasets.
+dataset.privateurl.roleassigeeTitle=Preview URL Enabled
 dataset.privateurl.createdSuccess=Success!
-dataset.privateurl.disabledSuccess=You have successfully disabled the Private URL for this unpublished dataset.
-dataset.privateurl.noPermToCreate=To create a Private URL you must have the following permissions: {0}.
+dataset.privateurl.full=This Preview URL provides full read access to the dataset
+dataset.privateurl.anonymized=This Preview URL provides access to the anonymized dataset
+dataset.privateurl.disabledSuccess=You have successfully disabled the Preview URL for this unpublished dataset.
+dataset.privateurl.noPermToCreate=To create a Preview URL you must have the following permissions: {0}.
 file.display.label=Change View
 file.display.table=Table
 file.display.tree=Tree
+file.count.label=File Count
 file.count.one=1 File
 file.count={0} to {1} of {2} {2, choice, 0#Files|1#File|2#Files}
 file.count.shown={0} {0, choice, 0#Files Selected|1#File|2#Files}
 file.clearSelection=Clear selection.
+file.zip.download.exceeds.limit=The overall size of the files selected ({0}) for download exceeds the zip limit of {1}. Please unselect some files to continue.
+file.zip.download.exceeds.limit.info=The files selected are too large to download as a ZIP.
+file.zip.download.exceeds.limit.detail=You can select individual files that are below the {2} download limit from the files table, or use the <a href="{0}/{1}/api/dataaccess.html" title="Data Access API" target="_blank">Data Access API</a> for programmatic access to the files.
+file.zip.download.exceeds.limit.header=Download Options
 file.numFilesSelected={0} {0, choice, 0#files are|1#file is|2#files are} currently selected.
+file.select.action=Select
+file.select.tooltip=Select Files
 file.selectAllFiles=Select all {0} files in this dataset.
 file.dynamicCounter.filesPerPage=Files Per Page
 file.selectToAddBtn=Select Files to Add
-file.selectToAdd.tipLimit=File upload limit is {0} per file. 
+file.selectToAdd.tipLimit=File upload limit is {0} per file.
+file.selectToAdd.tipQuotaRemaining=Storage quota: {0} remaining. 
+file.selectToAdd.tipMaxNumFiles=Maximum of {0} {0, choice, 0#files|1#file|2#files} per upload.
+file.selectToAdd.tipMaxNumFilesUploadsAvailable=Maximum of {0} {0, choice, 0#files|1#file|2#files} available to upload.
+file.selectToAdd.tipTabularLimit=<a href="{0}/{1}/user/dataset-management.html#tabular-data-files" title="Tabular Data Files - Dataverse User Guide" target="_blank" rel="noopener">Tabular file ingest</a> is limited to {2}.
+file.selectToAdd.tipPerFileTabularLimit=Ingest is limited to the following file sizes based on their format: {0}.
 file.selectToAdd.tipMoreInformation=Select files or drag and drop into the upload widget.
 file.selectToAdd.dragdropMsg=Drag and drop files here.
 file.createUploadDisabled=Upload files using rsync via SSH. This method is recommended for large file transfers. The upload script will be available on the Upload Files page once you save this dataset.
@@ -1429,12 +1857,39 @@ file.fromHTTP=Upload with HTTP via your browser
 file.fromDropbox=Upload from Dropbox
 file.fromDropbox.tip=Select files from Dropbox.
 file.fromRsync=Upload with rsync + SSH via Data Capture Module (DCM)
+file.fromGlobus.tip=Upload files via Globus transfer. This method is recommended for large file transfers. (Using it will cancel any other types of uploads in progress on this page.)
+file.fromGlobusAfterCreate.tip=File upload via Globus transfer will be enabled after this dataset is created.
+file.fromGlobus=Upload with Globus
+file.finishGlobus=Globus Transfer has finished
+file.downloadFromGlobus=Download through Globus
+file.globus.transfer=Globus Transfer
+file.globus.of=of:
+file.fromWebloader.tip=Upload a folder of files. This method retains the relative path structure from your local machine. (Using it will cancel any other types of uploads in progress on this page.)
+file.fromWebloaderAfterCreate.tip=An option to upload a folder of files will be enabled after this dataset is created.
+file.fromWebloader=Upload a Folder
+
 file.api.httpDisabled=File upload via HTTP is not available for this installation of Dataverse.
+file.api.globusUploadDisabled=File upload via Globus is not available for this installation of Dataverse.
 file.api.alreadyHasPackageFile=File upload via HTTP disabled since this dataset already contains a package file.
 file.replace.original=Original File
 file.editFiles=Edit Files
 file.editFilesSelected=Edit
 file.editFile=Edit
+
+file.actionsBlock=File Actions
+file.accessBtn=Access File
+file.accessBtn.header.access=File Access
+file.accessBtn.header.download=Download Options
+file.accessBtn.header.metadata=Download Metadata
+file.optionsBtn=File Options
+file.optionsBtn.header.edit=Edit Options
+file.optionsBtn.header.configure=Configure Options
+file.editBtn=Edit File
+file.contactBtn=Contact Owner
+file.shareBtn=Share
+file.share.title=Share File
+file.share.tip=Share this file on your favorite social media networks.
+file.share.text=View this file.
 file.bulkUpdate=Bulk Update
 file.uploadFiles=Upload Files
 file.replaceFile=Replace File
@@ -1443,14 +1898,16 @@ file.notFound.search=There are no files that match your search. Please change th
 file.noSelectedFiles.tip=There are no selected files to display.
 file.noUploadedFiles.tip=Files you upload will appear here.
 file.replace=Replace
-file.replaced.warning.header=Edit File
-file.replaced.warning.draft.warningMessage=You can not replace a file that has been replaced in a dataset draft. In order to replace it with a different file you must delete the dataset draft. Note that doing so will discard any other changes within this draft.
-file.replaced.warning.previous.warningMessage=You can not edit a file that has been replaced in a previous dataset version. In order to edit it you must go to the most recently published version of the file.
-file.alreadyDeleted.previous.warningMessage=This file has already been deleted in current version. It may not be edited.
+file.alreadyDeleted.warning.header=Edit File
+file.alreadyDeleted.previous.warningMessage=This file has already been deleted (or replaced) in the current version. It may not be edited.
 file.delete=Delete
+file.delete.duplicate.multiple=Delete Duplicate Files
+file.delete.duplicate.single=Delete Duplicate File
 file.metadata=Metadata
 file.deleted.success=Files "{0}" will be permanently deleted from this version of this dataset once you click on the Save Changes button.
 file.deleted.replacement.success=The replacement file has been deleted.
+file.deleted.upload.success.single=File has been deleted and won't be included in this upload.
+file.deleted.upload.success.multiple=Files have been deleted and won't be included in this upload.
 file.editAccess=Edit Access
 file.restrict=Restrict
 file.unrestrict=Unrestrict
@@ -1458,8 +1915,9 @@ file.restricted.success=Files "{0}" will be restricted once you click on the Sav
 file.download.header=Download
 file.download.subset.header=Download Data Subset
 file.preview=Preview:
-file.previewMap=Preview Map:o
 file.fileName=File Name
+file.sizeNotAvailable=Size not available
+file.ingestFailed=Ingest failed. No further information is available.
 file.type.tabularData=Tabular Data
 file.originalChecksumType=Original File {0}
 file.checksum.exists.tip=A file with this checksum already exists in the dataset.
@@ -1485,10 +1943,13 @@ file.rsyncUpload.httpUploadDisabledDueToRsyncFileExisting=HTTP upload is disable
 file.rsyncUpload.httpUploadDisabledDueToRsyncFileExistingAndPublished=HTTP upload is disabled for this dataset because you have already uploaded files via rsync and published the dataset.
 file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttp=Upload with rsync + SSH is disabled for this dataset because you have already uploaded files via HTTP. If you would like to switch to rsync upload, then you must first remove all uploaded files from this dataset. Once this dataset is published, the chosen upload method is permanently locked in.
 file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttpAndPublished=Upload with rsync + SSH is disabled for this dataset because you have already uploaded files via HTTP and published the dataset.
-
+file.globusUpload.inProgressMessage.summary=Globus Transfer in Progress
+file.globusUpload.inProgressMessage.details=This dataset is locked while the data files are being transferred and verified. Large transfers may take significant time. You can check transfer status at  <a href="https://app.globus.org/activity" target="_blank">https://app.globus.org/activity</a>.
+file.metaData.checksum.copy=Click to copy
+file.metaData.dataFile.dataTab.unf=UNF
 file.metaData.dataFile.dataTab.variables=Variables
 file.metaData.dataFile.dataTab.observations=Observations
-file.metaData.viewOnWorldMap=Explore on WorldMap
+file.metaData.fileAccess=File Access: 
 file.addDescription=Add file description...
 file.tags=Tags
 file.editTags=Edit Tags
@@ -1502,6 +1963,34 @@ file.editTagsDialog.newName=Add new file tag...
 dataset.removeUnusedFileTags.label=Delete Tags
 dataset.removeUnusedFileTags.tip=Select to delete Custom File Tags not used by the files in the dataset.
 dataset.removeUnusedFileTags.check=Delete tags not being used
+file.embargo=Embargo
+file.editEmbargo=Edit Embargo
+file.editEmbargo.add=Add or Change
+file.editEmbargo.delete=Remove
+file.editEmbargoDialog.tip=Edit the planned embargo for the selected file or files. Once this dataset version is published, you will need to contact an administrator to change the embargo date or reason of the file or files.
+file.editEmbargoDialog.some.tip=One or more of the selected files have already been published. Contact an administrator to change the embargo date or reason of the file or files.
+file.editEmbargoDialog.none.tip=The selected file or files have already been published. Contact an administrator to change the embargo date or reason of the file or files.
+
+file.editEmbargoDialog.partial.tip=Any changes you make here will not be made to these files.
+
+file.editEmbargoDialog.reason.tip=Enter a short reason why this embargo exists
+file.editEmbargoDialog.newReason=Add a reason...
+file.editEmbargoDialog.newDate=Select the embargo end-date
+file.editEmbargoDialog.remove=Remove existing embargo(es) on selected files
+
+file.retention=Retention Period
+file.editRetention=Edit Retention Period
+file.editRetention.add=Add or Change
+file.editRetention.delete=Remove
+file.editRetentionDialog.tip=Edit the planned retention period for the selected file or files. Once this dataset version is published, you will need to contact an administrator to change the retention period end date or reason of the file or files. \n After the retention period expires the files become unavailable for download.
+file.editRetentionDialog.some.tip=One or more of the selected files have already been published. Contact an administrator to change the retention period date or reason of the file or files.
+file.editRetentionDialog.none.tip=The selected file or files have already been published. Contact an administrator to change the retention period date or reason of the file or files.
+file.editRetentionDialog.partial.tip=Any changes you make here will not be made to these files.
+file.editRetentionDialog.reason.tip=Enter a short reason why this retention period exists
+file.editRetentionDialog.newReason=Add a reason...
+file.editRetentionDialog.newDate=Select the retention period end date
+file.editRetentionDialog.remove=Remove existing retention period(s) on selected files
+
 file.setThumbnail=Set Thumbnail
 file.setThumbnail.header=Set Dataset Thumbnail
 file.datasetThumbnail=Dataset Thumbnail
@@ -1511,7 +2000,9 @@ file.useThisIamge=Use this image as the dataset thumbnail image
 file.advancedOptions=Advanced Options
 file.advancedIngestOptions=Advanced Ingest Options
 file.assignedDataverseImage.success={0} has been saved as the thumbnail for this dataset.
-file.assignedTabFileTags.success=The tag(s) were successfully added for {0}.
+file.assignedTabFileTags.success=The tags were successfully added for {0}.
+file.assignedEmbargo.success=An Embargo was successfully added for {0}.
+file.assignedRetention.success=A Retention Period was successfully added for {0}.
 file.tabularDataTags=Tabular Data Tags
 file.tabularDataTags.tip=Select a tag to describe the type(s) of data this is (survey, time series, geospatial, etc).
 file.spss-savEncoding=Language Encoding
@@ -1520,46 +2011,37 @@ file.spss-savEncoding.current=Current Selection:
 file.spss-porExtraLabels=Variable Labels
 file.spss-porExtraLabels.title=Upload an additional text file with extra variable labels.
 file.spss-porExtraLabels.selectToAddBtn=Select File to Add
-file.ingestFailed.header=Upload Completed with Errors
-file.ingestFailed.message=Tabular data ingest failed.
-file.map=Map
-file.mapData=Map Data
-file.mapData.worldMap=WorldMap
-file.mapData.unpublished.header=Data Not Published
-file.mapData.unpublished.message=In order to map your data with WorldMap, your data must be published. Please publish this dataset, then retry the Map Data feature.
+file.ingest.saveFailed.message=Ingest succeeded, but failed to save the ingested tabular data in the database; no further information is available
+file.ingest.saveFailed.detail.message=Ingest succeeded, but failed to save the ingested tabular data in the database: 
+file.ingestFailed.header=File available in original format only
+file.ingestFailed.message=<a href="{0}/{1}/user/dataset-management.html#tabular-data-files" title="Tabular Data Files - Dataverse User Guide" target="_blank">Tabular ingest</a> was unsuccessful.
 file.downloadBtn.format.all=All File Formats + Information
 file.downloadBtn.format.tab=Tab-Delimited
-file.downloadBtn.format.original=Original File Format ({0})
-file.downloadBtn.format.rdata=RData Format
-file.downloadBtn.format.var=Variable Metadata
+file.downloadBtn.format.original={0} (Original File Format)
+file.downloadBtn.format.rdata=RData
+file.downloadBtn.format.var=DDI Codebook v2
 file.downloadBtn.format.citation=Data File Citation
+file.download.filetype.unknown=Original File Format
 file.more.information.link=Link to more file information for 
 file.requestAccess=Request Access
-file.requestAccess.dialog.msg=You need to <a href="/loginpage.xhtml{0}" target="{2}" title="Log into your Dataverse Account">Log In</a> to request access to this file.
-file.requestAccess.dialog.msg.signup=You need to <a href="{1}" target="{2}" title="Sign Up for a Dataverse Account">Sign Up</a> or <a href="/loginpage.xhtml{0}" target="{2}" title="Log into your Dataverse Account">Log In</a> to request access to this file.
+file.requestAccess.dialog.msg=You need to <a href="/loginpage.xhtml{0}" target="{2}" title="Log into your Dataverse Account">Log In</a> to request access.
+file.requestAccess.dialog.msg.signup=You need to <a href="{1}" target="{2}" title="Sign Up for a Dataverse Account">Sign Up</a> or <a href="/loginpage.xhtml{0}" target="{2}" title="Log into your Dataverse Account">Log In</a> to request access.
 file.accessRequested=Access Requested
-file.restrictions=File Restrictions
-file.restrictions.description=Limit access to published files by marking them as restricted. Provide users Terms of Access and allow them to request access.
-file.restrictions.worldmap.warning=Please note, once your file access changes are published your map on WorldMap will be deleted and the Explore on WorldMap feature will be removed.
+file.accessRequested.success=Your request for access has been submitted. You will receive an email message and notification in the app when access is granted or rejected.
+file.accessRequested.alreadyRequested=Access already available or requested for file: {0}
 file.ingestInProgress=Ingest in progress...
 file.dataFilesTab.metadata.header=Metadata
 file.dataFilesTab.metadata.addBtn=Add + Edit Metadata
 file.dataFilesTab.terms.header=Terms
 file.dataFilesTab.terms.editTermsBtn=Edit Terms Requirements
-file.dataFilesTab.terms.list.termsOfUse.header=Terms of Use
-file.dataFilesTab.terms.list.termsOfUse.waiver=Waiver
-file.dataFilesTab.terms.list.termsOfUse.waiver.title=The waiver informs data downloaders how they can use this dataset.
-file.dataFilesTab.terms.list.termsOfUse.waiver.txt=CC0 - "Public Domain Dedication"
-file.cc0.icon.alttxt=Creative Commons CC0 1.0 Public Domain Dedication icon
-file.dataFilesTab.terms.list.termsOfUse.waiver.description=Datasets will default to a <a href="https://creativecommons.org/publicdomain/zero/1.0/" title="Public Domain Dedication - Creative Commons" target="_blank">CC0 public domain dedication </a>. CC0 facilitates reuse and extensibility of research data. Our <a href="https://dataverse.org/best-practices/dataverse-community-norms" title="Dataverse Community Norms - Dataverse.org" target="_blank">Community Norms</a> as well as good scientific practices expect that proper credit is given via citation. If you are unable to give datasets a CC0 waiver you may enter custom Terms of Use for datasets.
-file.dataFilesTab.terms.list.termsOfUse.no.waiver.txt=No waiver has been selected for this dataset.
-file.dataFilesTab.terms.list.termsOfUse.waiver.txt.description=Our <a href="https://dataverse.org/best-practices/dataverse-community-norms" title="Dataverse Community Norms - Dataverse.org" target="_blank">Community Norms</a> as well as good scientific practices expect that proper credit is given via citation. Please use the data citation above, generated by the Dataverse.
-file.dataFilesTab.terms.list.termsOfUse.waiver.select.CCO=Yes, apply CC0 - "Public Domain Dedication" 
-file.dataFilesTab.terms.list.termsOfUse.waiver.select.notCCO=No, do not apply CC0 - "Public Domain Dedication" 
-file.dataFilesTab.terms.list.termsOfUse.waiver.select.tip=This is what end users will see displayed on this dataset
+file.dataFilesTab.terms.list.termsOfUse.header=Dataset Terms
+file.dataFilesTab.terms.list.license=License/Data Use Agreement
+file.dataFilesTab.terms.list.license.edit.description=This dataset will be published under the terms specified below. Our Community Norms as well as good scientific practices expect that proper credit is given via citation.
+file.dataFilesTab.terms.list.license.customterms.txt=- the following Custom Dataset Terms have been defined for this dataset.
+file.dataFilesTab.terms.list.license.view.description=Our <a href="https://dataverse.org/best-practices/dataverse-community-norms" title="Dataverse Community Norms - Dataverse.org" target="_blank">Community Norms</a> as well as good scientific practices expect that proper credit is given via citation. Please use the data citation shown on the dataset page.
 file.dataFilesTab.terms.list.termsOfUse.termsOfUse=Terms of Use
-file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title=Outlines how this data can be used once downloaded.
-file.dataFilesTab.terms.list.termsOfUse.termsOfUse.description=If you are unable to use CC0 for datasets you are able to set custom terms of use. Here is an example of a <a href="https://dataverse.org/best-practices/sample-dua" title="Sample Data Usage Agreement - Dataverse.org" target="_blank">Data Usage Agreement</a> for datasets that have de-identified human subject data.
+file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title=Outlines how this data can be used once downloaded
+file.dataFilesTab.terms.list.termsOfUse.termsOfUse.description=If you are unable to use one of the pre-defined licenses for datasets you are able to set custom terms of use. Here is an example of a <a href="https://dataverse.org/best-practices/sample-dua" title="Sample Data Usage Agreement - Dataverse.org" target="_blank">Data Usage Agreement</a> for datasets that have de-identified human subject data.
 file.dataFilesTab.terms.list.termsOfUse.addInfo=Additional Information
 file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration=Confidentiality Declaration
 file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title=Indicates whether signing of a confidentiality declaration is needed to access a resource.
@@ -1575,16 +2057,22 @@ file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions=Conditions
 file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title=Any additional information that will assist the user in understanding the access and use conditions of the Dataset.
 file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer=Disclaimer
 file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title=Information regarding responsibility for uses of the Dataset.
-file.dataFilesTab.terms.list.termsOfAccess.header=Restricted Files + Terms of Access
+file.dataFilesTab.terms.list.termsOfAccess.header=Restricted Files + Terms of Access 
+file.dataFilesTab.terms.list.termsOfAccess.description=Restricting limits access to published files. People who want to use the restricted files can request access by default. If you disable request access, you must add information about access to the Terms of Access field. 
+file.dataFilesTab.terms.list.termsOfAccess.description.line.2=Learn about restricting files and dataset access in the <a href="{0}/{1}/user/dataset-management.html#restricted-files-terms-of-access" title="Dataverse User Guide" target="_blank">User Guide</a>.
+
 file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles=Restricted Files
 file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title=The number of restricted files in this dataset.
 file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt=There {0, choice, 0#are|1#is|2#are} {0} restricted {0, choice, 0#files|1#file|2#files} in this dataset.
-file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess=Terms of Access
-file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title=Information on how and if users can gain access to the restricted files in this dataset.
+file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess=Terms of Access for Restricted Files
+file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title=Information on how and if users can access restricted files in this Dataset
 file.dataFilesTab.terms.list.termsOfAccess.requestAccess=Request Access
 file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title=If checked, users can request access to the restricted files in this dataset.
 file.dataFilesTab.terms.list.termsOfAccess.requestAccess.request=Users may request access to files.
 file.dataFilesTab.terms.list.termsOfAccess.requestAccess.notRequest=Users may not request access to files.
+file.dataFilesTab.terms.list.termsOfAccess.requestAccess.warning.outofcompliance=You must enable request access or add terms of access to restrict file access.
+file.dataFilesTab.terms.list.termsOfAccess.embargoed=Files are unavailable during the specified embargo.
+file.dataFilesTab.terms.list.termsOfAccess.embargoedthenrestricted=Files are unavailable during the specified embargo and restricted after that.
 file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn=Enable access request
 file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace=Data Access Place
 file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title=If the data is not only in Dataverse, list the location(s) where the data are currently stored.
@@ -1600,7 +2088,7 @@ file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion=Study Complet
 file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title=Relationship of the data collected to the amount of data coded and stored in the Dataset. Information as to why certain items of collected information were not included in the dataset or a specific data file should be provided.
 file.dataFilesTab.terms.list.guestbook=Guestbook
 file.dataFilesTab.terms.list.guestbook.title=User information (i.e., name, email, institution, and position) will be collected when files are downloaded.
-file.dataFilesTab.terms.list.guestbook.noSelected.tip=No guestbook is assigned to this dataset, you will not be prompted to provide any information on file download.
+file.dataFilesTab.terms.list.guestbook.noSelected.tip=No guestbook is assigned to this dataset so users will not be prompted to provide any information when downloading files.
 file.dataFilesTab.terms.list.guestbook.noSelected.admin.tip=There are no guestbooks available in {0} to assign to this dataset.
 file.dataFilesTab.terms.list.guestbook.inUse.tip=The following guestbook will prompt a user to provide additional information when downloading a file.
 file.dataFilesTab.terms.list.guestbook.viewBtn=Preview Guestbook
@@ -1620,10 +2108,18 @@ file.dataFilesTab.dataAccess.verify.tooltip=This command runs a checksum to veri
 file.dataFilesTab.button.direct=Direct
 
 file.dataFilesTab.versions=Versions
-file.dataFilesTab.versions.headers.dataset=Dataset
+file.dataFilesTab.versions.headers.dataset=Dataset Version
 file.dataFilesTab.versions.headers.summary=Summary
+file.dataFilesTab.versions.headers.versionNote=Version Note
 file.dataFilesTab.versions.headers.contributors=Contributors
-file.dataFilesTab.versions.headers.published=Published
+file.dataFilesTab.versions.headers.contributors.withheld=Contributor name(s) withheld
+file.dataFilesTab.versions.headers.published=Published on
+file.dataFilesTab.versions.headers.archived=Archival Status
+file.dataFilesTab.versions.headers.archived.success=Archived
+file.dataFilesTab.versions.headers.archived.pending=Pending
+file.dataFilesTab.versions.headers.archived.failure=Failed
+file.dataFilesTab.versions.headers.archived.notarchived=Not Archived
+file.dataFilesTab.versions.headers.archived.submit=Submit
 file.dataFilesTab.versions.viewDiffBtn=View Differences
 file.dataFilesTab.versions.citationMetadata=Citation Metadata:
 file.dataFilesTab.versions.added=Added
@@ -1639,8 +2135,13 @@ file.dataFilesTab.versions.description.firstPublished=This is the first publishe
 file.dataFilesTab.versions.description.deaccessionedReason=Deaccessioned Reason:
 file.dataFilesTab.versions.description.beAccessedAt=The dataset can now be accessed at:
 file.dataFilesTab.versions.viewDetails.btn=View Details
+file.dataFilesTab.versions.versionNote.btn=Edit Note
 file.dataFilesTab.versions.widget.viewMoreInfo=To view more information about the versions of this dataset, and to edit it if this is your dataset, please visit the <a href="/dataset.xhtml?persistentId={0}" title="{1}" target="_blank">full version of this dataset</a> at the {2}.
 file.dataFilesTab.versions.preloadmessage=(Loading versions...)
+file.previewTab.externalTools.header=Available Previews
+file.previewTab.button.label=Preview
+file.toolsTab.button.label=File Tools
+file.previewTab.previews.not.available=Public previews are not available for this file.
 file.deleteDialog.tip=Are you sure you want to delete this dataset and all of its files? You cannot undelete this dataset.
 file.deleteDialog.header=Delete Dataset
 file.deleteDraftDialog.tip=Are you sure you want to delete this draft version? Files will be reverted to the most recently published version. You cannot undelete this draft.
@@ -1650,22 +2151,23 @@ file.deleteFileDialog.immediate=The file will be deleted after you click on the
 file.deleteFileDialog.multiple.immediate=The file(s) will be deleted after you click on the Delete button.
 file.deleteFileDialog.header=Delete Files
 file.deleteFileDialog.failed.tip=Files will not be removed from previously published versions of the dataset.
-file.deaccessionDialog.tip=Once you deaccession this dataset it will no longer be viewable by the public.
+file.deaccessionDialog.tip.permanent=Deaccession is <strong>permanent</strong>.
+file.deaccessionDialog.tip=This dataset will no longer be public and a tombstone will display the reason for deaccessioning. <br>Please read the <a href="guides.dataverse.org/en/latest/user/dataset-management.html?highlight=deaccession#dataset-deaccession">documentation</a> if you have any questions.
 file.deaccessionDialog.version=Version
 file.deaccessionDialog.reason.question1=Which version(s) do you want to deaccession?
 file.deaccessionDialog.reason.question2=What is the reason for deaccession?
-file.deaccessionDialog.reason.selectItem.identifiable=There is identifiable data in one or more files
-file.deaccessionDialog.reason.selectItem.beRetracted=The research article has been retracted
-file.deaccessionDialog.reason.selectItem.beTransferred=The dataset has been transferred to another repository
-file.deaccessionDialog.reason.selectItem.IRB=IRB request
-file.deaccessionDialog.reason.selectItem.legalIssue=Legal issue or Data Usage Agreement
-file.deaccessionDialog.reason.selectItem.notValid=Not a valid dataset
+file.deaccessionDialog.reason.selectItem.identifiable=There is identifiable data in one or more files.
+file.deaccessionDialog.reason.selectItem.beRetracted=The research article has been retracted.
+file.deaccessionDialog.reason.selectItem.beTransferred=The dataset has been transferred to another repository.
+file.deaccessionDialog.reason.selectItem.IRB=IRB request.
+file.deaccessionDialog.reason.selectItem.legalIssue=Legal issue or Data Usage Agreement.
+file.deaccessionDialog.reason.selectItem.notValid=Not a valid dataset.
 file.deaccessionDialog.reason.selectItem.other=Other (Please type reason in space provided below)
 file.deaccessionDialog.enterInfo=Please enter additional information about the reason for deaccession.
 file.deaccessionDialog.leaveURL=If applicable, please leave a URL where this dataset can be accessed after deaccessioning.
 file.deaccessionDialog.leaveURL.watermark=Optional dataset site, http://...
-file.deaccessionDialog.deaccession.tip=Are you sure you want to deaccession? The selected version(s) will no longer be viewable by the public.
-file.deaccessionDialog.deaccessionDataset.tip=Are you sure you want to deaccession this dataset? It will no longer be viewable by the public.
+file.deaccessionDialog.deaccession.tip=Are you sure you want to deaccession? This is permanent and the selected version(s) will no longer be viewable by the public.
+file.deaccessionDialog.deaccessionDataset.tip=Are you sure you want to deaccession this dataset? This is permanent an it will no longer be viewable by the public.
 file.deaccessionDialog.dialog.selectVersion.error=Please select version(s) for deaccessioning.
 file.deaccessionDialog.dialog.reason.error=Please select reason for deaccessioning.
 file.deaccessionDialog.dialog.url.error=Please enter valid forwarding URL.
@@ -1676,11 +2178,12 @@ file.viewDiffDialog.dialog.warning=Please select two versions to view the differ
 file.viewDiffDialog.notAvailable=N/A
 file.viewDiffDialog.version=Version
 file.viewDiffDialog.lastUpdated=Last Updated
+file.viewDiffDialog.versionNote=Version Note
 file.viewDiffDialog.fileID=File ID
 file.viewDiffDialog.fileName=Name
 file.viewDiffDialog.fileType=Type
 file.viewDiffDialog.fileSize=Size
-file.viewDiffDialog.category=Tag(s)
+file.viewDiffDialog.category=Tags
 file.viewDiffDialog.description=Description
 file.viewDiffDialog.provDescription=Provenance Description
 file.viewDiffDialog.fileReplaced=File Replaced
@@ -1694,11 +2197,14 @@ file.metadataTip=Metadata Tip: After adding the dataset, click the Edit Dataset
 file.addBtn=Save Dataset
 file.dataset.allFiles=All Files from this Dataset
 file.downloadDialog.header=Dataset Terms
-file.downloadDialog.tip=Please confirm and/or complete the information needed below in order to continue.
+file.downloadDialog.tip=This dataset is made available under the following terms. Please confirm and/or complete the information needed below in order to continue.
 file.requestAccessTermsDialog.tip=Please confirm and/or complete the information needed below in order to request access to files in this dataset.
+file.requestAccessTermsDialog.embargoed.tip=Please confirm and/or complete the information needed below in order to request access to non-embargoed files in this dataset.
+file.requestAccessTermsDialog.embargoed=Note: You have selected some embargoed files, which cannot be accessed. When you make this request, only un-embargoed files will be included.
+
 file.requestAccess.notAllowed=Requests for access are not accepted on the Dataset.
 file.requestAccess.notAllowed.alreadyHasDownloadPermisssion=User already has permission to download this file. Request Access is invalid.
-
+file.requestAccess.notAllowed.embargoed=Access to actively embargoed files not allowed. Request Access is invalid.
 file.search.placeholder=Search this dataset...
 file.results.filter=Filter by
 file.results.filter.type=File Type:
@@ -1712,8 +2218,28 @@ file.results.btn.sort.option.newest=Newest
 file.results.btn.sort.option.oldest=Oldest
 file.results.btn.sort.option.size=Size
 file.results.btn.sort.option.type=Type
+file.results.presort.tag=Group by Tag
+file.results.presort.tag.desc=Datafiles will be grouped by Tag before being sorted.
+file.results.presort.folder=Group by Folder
+file.results.presort.folder.desc=Datafiles will be grouped by Folder before being sorted.
+file.results.presort.change.success=Grouping of Files in File Table updated.
 file.compute.fileAccessDenied=This file is restricted and you may not compute on it because you have not been granted access.
 file.configure.Button=Configure
+
+file.remotelyStored=This file is stored remotely - click for more info 
+
+file.auxfiles.download.header=Download Auxiliary Files
+# These types correspond to the AuxiliaryFile.Type enum.
+file.auxfiles.types.DP=Differentially Private Statistics
+file.auxfiles.types.NcML=XML from NetCDF/HDF5 (NcML)
+# Add more types here
+file.auxfiles.unspecifiedTypes=Other Auxiliary Files
+
+dataset.version.versionNote.addEdit=Version Note
+dataset.version.versionNote.title=The reason this version was created
+dataset.versionNote.header=Add/Edit a Version Note
+dataset.versionNote.tip=Enter the reason this version was created. To learn more about Version Notes, visit the <a href="{0}/{1}/user/dataset-management.html#versionNotes" title="Version Notes - Dataverse User Guide" target="_blank">Version Notes</a> section of the User Guide.
+
 # dataset-widgets.xhtml
 dataset.widgets.title=Dataset Thumbnail + Widgets
 dataset.widgets.notPublished.why.header=Why Use Widgets?
@@ -1743,7 +2269,7 @@ dataset.thumbnailsAndWidget.thumbnails.title=Thumbnail
 dataset.thumbnailsAndWidget.widgets.title=Widgets
 dataset.thumbnailsAndWidget.thumbnailImage=Thumbnail Image
 dataset.thumbnailsAndWidget.thumbnailImage.title=The logo or image file you wish to display as the thumbnail of this dataset.
-dataset.thumbnailsAndWidget.thumbnailImage.tip=Supported image types are JPG, TIF, or PNG and should be no larger than {0} KB. The maximum display size for an image file as a dataset thumbnail is 48 pixels wide by 48 pixels high.
+dataset.thumbnailsAndWidget.thumbnailImage.tip=Supported image types are JPG and PNG, must be no larger than {0} KB. The maximum display size for an image file as a dataset thumbnail is 140 pixels wide by 140 pixels high.
 dataset.thumbnailsAndWidget.thumbnailImage.default=Default Icon
 dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable=Select Available File
 dataset.thumbnailsAndWidget.thumbnailImage.selectThumbnail=Select Thumbnail
@@ -1751,7 +2277,7 @@ dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable.title=Select a thumbn
 dataset.thumbnailsAndWidget.thumbnailImage.uploadNew=Upload New File
 dataset.thumbnailsAndWidget.thumbnailImage.uploadNew.title=Upload an image file as your dataset thumbnail, which will be stored separately from the data files that belong to your dataset.
 dataset.thumbnailsAndWidget.thumbnailImage.upload=Upload Image
-dataset.thumbnailsAndWidget.thumbnailImage.upload.invalidMsg=The image could not be uploaded. Please try again with a JPG, TIF, or PNG file.
+dataset.thumbnailsAndWidget.thumbnailImage.upload.invalidMsg=The image could not be uploaded. Please try again with a JPG or PNG file.
 dataset.thumbnailsAndWidget.thumbnailImage.alt=Thumbnail image selected for dataset
 dataset.thumbnailsAndWidget.success=Dataset thumbnail updated.
 dataset.thumbnailsAndWidget.removeThumbnail=Remove Thumbnail
@@ -1777,6 +2303,22 @@ file.description.label=Description
 file.tags.label=Tags
 file.lastupdated.label=Last Updated
 file.DatasetVersion=Version
+file.accessBtn.header.query=Query Options
+
+file.previewTab.tool.open=Open
+file.previewTab.header=Preview
+file.previewTab.presentation=File Preview Tool
+file.previewTab.openBtn=Open in New Window
+file.previewTab.exploreBtn={0} on {1}
+
+file.queryTab.tool.open=Open
+file.queryTab.header=Query
+file.queryTab.presentation=File Query Tool
+file.queryTab.openBtn=Open in New Window
+file.queryTab.queryBtn={0} on {1}
+
+#if you don't have a tool selected
+file.toolTab.header=File Tools
 
 file.metadataTab.fileMetadata.header=File Metadata
 file.metadataTab.fileMetadata.persistentid.label=Data File Persistent ID
@@ -1787,6 +2329,10 @@ file.metadataTab.fileMetadata.size.label=Size
 file.metadataTab.fileMetadata.type.label=Type
 file.metadataTab.fileMetadata.description.label=Description
 file.metadataTab.fileMetadata.publicationDate.label=Publication Date
+file.metadataTab.fileMetadata.embargoReason.label=Embargo Reason
+file.metadataTab.fileMetadata.retentionDate.label=Retention End Date
+file.metadataTab.fileMetadata.retentionReason.label=Retention Reason
+file.metadataTab.fileMetadata.metadataReleaseDate.label=Metadata Release Date
 file.metadataTab.fileMetadata.depositDate.label=Deposit Date
 file.metadataTab.fileMetadata.hierarchy.label=File Path
 file.metadataTab.fileMetadata.hierarchy.tip=Hierarchical directory structure path used to display file organization and support reproducibility.
@@ -1808,31 +2354,49 @@ file.versionDifferences.fileRestricted=Restricted
 file.versionDifferences.fileUnrestricted=Unrestricted
 file.versionDifferences.fileGroupTitle=File
 
+file.anonymized.authorsWithheld=Author name(s) withheld
 # File Ingest
 ingest.csv.invalidHeader=Invalid header row. One of the cells is empty.
 ingest.csv.lineMismatch=Mismatch between line counts in first and final passes!, {0} found on first pass, but {1} found on second.
 ingest.csv.recordMismatch=Reading mismatch, line {0} of the Data file: {1} delimited values expected, {2} found.
 ingest.csv.nullStream=Stream can't be null.
 
+file.ingest=Ingest
+file.uningest=Uningest
+file.ingest.alreadyIngestedWarning=This file has already been ingested
+file.ingest.ingestInProgressWarning=Ingestion of this file is already in progress
+file.ingest.cantIngestFileWarning=Ingest not supported for this file type
+file.ingest.ingestQueued=Ingestion has been requested
+file.ingest.cantUningestFileWarning=This file cannot be uningested
+file.uningest.complete=Uningestion of this file has been completed
+
 # editdatafile.xhtml
 
 # editFilesFragment.xhtml
+file.tableheader.info=File Info
 file.edit.error.file_exceeds_limit=This file exceeds the size limit.
 # File metadata error
 file.metadata.datafiletag.not_tabular=You cannot add Tabular Data Tags to a non-tabular file.
 file.metadata.filedirectory.invalidCharacters=Directory Name cannot contain invalid characters. Valid characters are a-Z, 0-9, '_', '-', '.', '\\', '/' and ' ' (white space).
 
 # File Edit Success
-file.message.editSuccess=This file has been updated.
+file.message.editSuccess=The file has been updated.
 file.message.deleteSuccess=The file has been deleted.
-file.message.replaceSuccess=This file has been replaced.
+file.message.replaceSuccess=The file has been replaced.
 
 # File Add/Replace operation messages
+file.add.count_exceeds_limit=Number of files can not exceed the maximum number of files allowed for this Dataset ({0}).
+file.dataset.error.set.file.count.limit=Only Superuser can set the Dataset File Count Limit.
 file.addreplace.file_size_ok=File size is in range.
 file.addreplace.error.byte_abrev=B
 file.addreplace.error.file_exceeds_limit=This file size ({0}) exceeds the size limit of {1}.
+file.addreplace.error.quota_exceeded=This file (size {0}) exceeds the remaining storage quota of {1}.
+file.addreplace.error.unzipped.quota_exceeded=Unzipped files exceed the remaining storage quota of {0}.
 file.addreplace.error.dataset_is_null=The dataset cannot be null.
 file.addreplace.error.dataset_id_is_null=The dataset ID cannot be null.
+file.addreplace.error.parsing=Error in parsing provided json
+file.addreplace.warning.unzip.failed=Failed to unzip the file. Saving the file as is.
+file.addreplace.warning.unzip.failed.size=A file contained in this zip file exceeds the size limit of {0}. This Dataverse installation will save and display the zipped file, rather than unpacking and displaying files.
 find.dataset.error.dataset_id_is_null=When accessing a dataset based on Persistent ID, a {0} query parameter must be present.
 find.dataset.error.dataset.not.found.persistentId=Dataset with Persistent ID {0} not found.
 find.dataset.error.dataset.not.found.id=Dataset with ID {0} not found.
@@ -1844,20 +2408,28 @@ find.dataverselinking.error.not.found.bad.ids=Bad dataverse ID number: {0} or da
 find.datafile.error.datafile.not.found.id=File with ID {0} not found.
 find.datafile.error.datafile.not.found.bad.id=Bad file ID number: {0}.
 find.datafile.error.dataset.not.found.persistentId=Datafile with Persistent ID {0} not found.
+find.dataverse.role.error.role.not.found.id=Dataverse Role with ID {0} not found.
+find.dataverse.role.error.role.not.found.bad.id=Bad Dataverse Role ID number: {0}
+find.dataverse.role.error.role.not.found.alias=Dataverse Role with alias {0} not found.
+find.dataverse.role.error.role.builtin.not.allowed=May not delete Built In Role {0}.
+find.dvo.error.dvObjectNotFound=Cant find Collection, Dataset, or Datafile with identifier: {0}.
 file.addreplace.error.dataset_id_not_found=There was no dataset found for ID: 
 file.addreplace.error.no_edit_dataset_permission=You do not have permission to edit this dataset.
 file.addreplace.error.filename_undetermined=The file name cannot be determined.
 file.addreplace.error.file_content_type_undetermined=The file content type cannot be determined.
 file.addreplace.error.file_upload_failed=The file upload failed.
-file.addreplace.error.duplicate_file=This file already exists in the dataset. 
+file.addreplace.warning.duplicate_file=This file has the same content as {0} that is in the dataset. 
+file.addreplace.error.duplicate_file.continue=You may delete if it was not intentional.
 file.addreplace.error.existing_file_to_replace_id_is_null=The ID of the existing file to replace must be provided.
 file.addreplace.error.existing_file_to_replace_not_found_by_id=Replacement file not found. There was no file found for ID: {0}
 file.addreplace.error.existing_file_to_replace_is_null=The file to replace cannot be null.
 file.addreplace.error.existing_file_to_replace_not_in_dataset=The file to replace does not belong to this dataset.
 file.addreplace.error.existing_file_not_in_latest_published_version=You cannot replace a file that is not in the most recently published dataset. (The file is unpublished or was deleted from a previous version.)
 file.addreplace.content_type.header=File Type Different
+file.addreplace.already_exists.header=Duplicate File Uploaded
+file.addreplace.already_exists.header.multiple=Duplicate Files Uploaded
 file.addreplace.error.replace.new_file_has_different_content_type=The original file ({0}) and replacement file ({1}) are different file types.
-file.addreplace.error.replace.new_file_same_as_replacement=You cannot replace a file with the exact same file.
+file.addreplace.error.replace.new_file_same_as_replacement=Error! You may not replace a file with a file that has duplicate content.
 file.addreplace.error.unpublished_file_cannot_be_replaced=You cannot replace an unpublished file. Please delete it instead of replacing it.
 file.addreplace.error.ingest_create_file_err=There was an error when trying to add the new file.
 file.addreplace.error.initial_file_list_empty=An error occurred and the new file was not added.
@@ -1872,6 +2444,8 @@ file.addreplace.success.replace=File successfully replaced!
 file.addreplace.error.auth=The API key is invalid.
 file.addreplace.error.invalid_datafile_tag=Not a valid Tabular Data Tag: 
 
+
+
 # 500.xhtml
 error.500.page.title=500 Internal Server Error
 error.500.message=<strong>Internal Server Error</strong> - An unexpected error was encountered, no more information is available.
@@ -1894,27 +2468,20 @@ citationFrame.banner.closeIcon=Close this message, go to dataset
 citationFrame.banner.countdownMessage= This message will close in 
 citationFrame.banner.countdownMessage.seconds=seconds
 
-# Friendly AuthenticationProvider names
-authenticationProvider.name.builtin=Dataverse
-authenticationProvider.name.null=(provider is unknown)
-authenticationProvider.name.github=GitHub
-authenticationProvider.name.google=Google
-authenticationProvider.name.orcid=ORCiD
-authenticationProvider.name.orcid-sandbox=ORCiD Sandbox
-authenticationProvider.name.shib=Shibboleth
-ingest.csv.invalidHeader=Invalid header row. One of the cells is empty.
-ingest.csv.lineMismatch=Mismatch between line counts in first and final passes!, {0} found on first pass, but {1} found on second.
-ingest.csv.recordMismatch=Reading mismatch, line {0} of the Data file: {1} delimited values expected, {2} found.
-ingest.csv.nullStream=Stream can't be null.
-citationFrame.banner.countdownMessage.seconds=seconds
+#file-edit-popup-fragment.xhtml #editFilesFragment.xhtml
+dataset.access.accessHeader=Restrict Access
+dataset.access.accessHeader.invalid.state=Define Data Access
+dataset.access.description=Restricting limits access to published files. People who want to use the restricted files can request access by default.  
+dataset.access.description.disable=If you disable request access, you must add information about access to the Terms of Access field.
+dataset.access.description.line.2=Learn about restricting files and dataset access in the <a href="{0}/{1}/user/dataset-management.html#restricted-files-terms-of-access" title="Dataverse User Guide" target="_blank">User Guide</a>.
 
-#dataset.xhtml #editFilesFragment.xhtml
-dataset.access.accessHeader=File Restrictions
-
-#dataserFieldForEditFragment.xhtml
+#datasetFieldForEditFragment.xhtml
 dataset.AddReplication=Add "Replication Data for" to Title
 dataset.replicationDataFor=Replication Data for:
+dataset.additionalEntry=Additional Entry
 
+#externaltools
+externaltools.enable.browser.popups=You must enable popups in your browser to open external tools in a new window or tab.
 
 #mydata_fragment.xhtml
 mydataFragment.infoAccess=Here are all the dataverses, datasets, and files you have access to. You can filter through them by publication status and roles.
@@ -1923,6 +2490,7 @@ mydataFragment.publicationStatus=Publication Status
 mydataFragment.roles=Roles
 mydataFragment.resultsByUserName=Results by Username
 mydataFragment.search=Search my data...
+mydataFragment.validity=Metadata validity
 mydata.result=Result
 mydata.results=Results
 mydata.viewnext=View Next
@@ -1983,9 +2551,12 @@ api.prov.error.freeformMissingJsonKey=The JSON object you send must have a key c
 api.prov.error.freeformNoText=No provenance free form text available for this file.
 api.prov.error.noDataFileFound=Could not find a file based on ID.
 
-bagit.sourceOrganization=Dataverse Installation (<Site Url>)
-bagit.sourceOrganizationAddress=<Full address>
-bagit.sourceOrganizationEmail=<Email address>
+bagit.checksum.validation.error=Invalid checksum for file "{0}". Manifest checksum={2}, calculated checksum={3}, type={1}
+bagit.checksum.validation.exception=Error while calculating checksum for file "{0}". Checksum type={1}, error={2}
+bagit.validation.bag.file.not.found=Invalid BagIt package: "{0}"
+bagit.validation.manifest.not.supported=No supported manifest found in BagIt package. Supported types are: {1}
+bagit.validation.file.not.found=The manifest declared a file, "{0}", that is not found in the BagIt package
+bagit.validation.exception=Unable to complete checksums for BagIt package
 
 #Permission.java
 permission.addDataverseDataverse=Add a dataverse within another dataverse
@@ -1993,9 +2564,12 @@ permission.deleteDataset=Delete a dataset draft
 permission.deleteDataverse=Delete an unpublished dataverse
 permission.publishDataset=Publish a dataset
 permission.publishDataverse=Publish a dataverse
+permission.linkDataset=Link a dataset to a dataverse
+permission.linkDataverse=Link a dataverse to another dataverse
+permission.managePermissionsDataFile=Manage permissions for a file
 permission.managePermissionsDataset=Manage permissions for a dataset
 permission.managePermissionsDataverse=Manage permissions for a dataverse
-permission.editDataset=Edit a dataset's metadata
+permission.editDataset=Edit a dataset's metadata, license, terms and add/delete files
 permission.editDataverse=Edit a dataverse's metadata, facets, customization, and templates 
 permission.downloadFile=Download a file
 permission.viewUnpublishedDataset=View an unpublished dataset and its files
@@ -2006,6 +2580,8 @@ permission.addDatasetDataverse=Add a dataset to a dataverse
 userPage.informationUpdated=Your account information has been successfully updated.
 userPage.passwordChanged=Your account password has been successfully changed.
 confirmEmail.changed=Your email address has changed and must be re-verified. Please check your inbox at {0} and follow the link we''ve sent. \n\nAlso, please note that the link will only work for the next {1} before it has expired.
+auth.orcid.notConfigured=ORCID authentication is not configured.
+auth.orcid.error=An error occurred while starting ORCID authentication. Please try again later.
 
 #Dataset.java
 dataset.category.documentation=Documentation
@@ -2022,9 +2598,11 @@ dataset.version.file.changed=Files (Changed File Metadata: {0}
 dataset.version.file.changed2=; Changed File Metadata: {0}
 dataset.version.variablemetadata.changed=Variable Metadata (Changed Variable Metadata: {0}
 dataset.version.variablemetadata.changed2=; Changed Variable Metadata: {0}
+dataset.version.compare.incorrect.order=Compare requires the older dataset version to be listed first.
 
 #DataversePage.java
 dataverse.item.required=Required
+dataverse.item.required.conditional=Conditionally Required
 dataverse.item.optional=Optional
 dataverse.item.hidden=Hidden
 dataverse.edit.msg=Edit Dataverse
@@ -2040,22 +2618,23 @@ dataverse.alias.taken=This Alias is already taken.
 
 #editDatafilesPage.java
 dataset.save.fail=Dataset Save Failed
-dataset.files.exist=The following files already exist in the dataset:
-dataset.file.exist=The following file already exists in the dataset:
-dataset.files.duplicate=The following files are duplicates of (an) already uploaded file(s):
-dataset.file.duplicate=The following file is a duplicate of an already uploaded file:
-dataset.file.skip=(skipping)
-dataset.file.upload=Succesful {0} is uploaded.
+
+dataset.files.exist=Files {0} have the same content as {1} that already exists in the dataset.
+dataset.file.exist=File {0} has the same content as {1} that already exists in the dataset.
+dataset.file.exist.test={0, choice, 1#File |2#Files |} {1} {0, choice, 1#has |2#have |} the same content as {2} that already {0, choice, 1#exist |2#exist |}in the dataset.
+dataset.files.duplicate=Files {0} have the same content as {1} that have already been uploaded.
+dataset.file.duplicate=File {0} has the same content as {1} that has already been uploaded.
+dataset.file.inline.message= This file has the same content as {0}.
+dataset.file.upload=Successful {0} is uploaded.
+dataset.file.upload.setUp.rsync.failed=Rsync upload setup failed!  
+dataset.file.upload.setUp.rsync.failed.detail=Unable to find appropriate storage driver.    
 dataset.file.uploadFailure=upload failure
 dataset.file.uploadFailure.detailmsg=the file {0} failed to upload!
 dataset.file.uploadWarning=upload warning
 dataset.file.uploadWorked=upload worked
+dataset.file.upload.popup.explanation.tip=For more information, please refer to the <a href="{0}/{1}/user/dataset-management.html#duplicate-files" title="Duplicate Files - Dataverse User Guide" target="_blank" rel="noopener">Duplicate Files section of the User Guide</a>.
 
-#EmailValidator.java
-email.invalid=is not a valid email address.
-
-#URLValidator.java
-url.invalid=is not a valid URL.
+dataset.file.error.application/zipped-bagit=BagIt package, "{0}", detected but errors found. These are the errors found until processing stopped:
 
 #HarvestingClientsPage.java
 harvest.start.error=Sorry, harvest could not be started for the selected harvesting client configuration (unknown server error).
@@ -2092,12 +2671,21 @@ dataset.registered=DatasetRegistered
 dataset.registered.msg=Your dataset is now registered.
 dataset.notlinked=DatasetNotLinked
 dataset.notlinked.msg=There was a problem linking this dataset to yours:
+dataset.linking.popop.already.linked.note=Note: This dataset is already linked to the following dataverse(s):  
+dataset.linking.popup.not.linked.note=Note: This dataset is not linked to any of your accessible dataverses
 datasetversion.archive.success=Archival copy of Version successfully submitted
 datasetversion.archive.failure=Error in submitting an archival copy 
 datasetversion.update.failure=Dataset Version Update failed. Changes are still in the DRAFT version.
 datasetversion.update.archive.failure=Dataset Version Update succeeded, but the attempt to update the archival copy failed.
 datasetversion.update.success=The published version of your Dataset has been updated.
 datasetversion.update.archive.success=The published version of your Dataset, and its archival copy, have been updated.
+dataset.license.custom.blankterms=When selecting Custom Dataset Terms, you must provide some Terms of Use.
+dataset.curationStatusMenu=Curation Status
+dataset.viewCurationStatusHistory=View Curation Status History
+dataset.curationStatusHistory=Curation Status History
+dataset.curationStatus=Status
+dataset.curationDate=Date
+dataset.curationAssigner=Assigner
 
 #ThemeWidgetFragment.java
 theme.validateTagline=Tagline must be at most 140 characters.
@@ -2124,6 +2712,7 @@ shib.invalidEmailAddress=The SAML assertion contained an invalid email address:
 shib.emailAddress.error=A single valid address could not be found.
 shib.nullerror=The SAML assertion for &#34;{0}&#34; was null. Please contact support.
 dataverse.shib.success=Your Dataverse account is now associated with your institutional account.
+shib.convert.fail.deactivated=Your existing account cannot be converted because it has been deactivated.
 shib.createUser.fail=Couldn't create user.
 shib.duplicate.email.error=Cannot login, because the e-mail address associated with it has changed since previous login and is already in use by another account.
 
@@ -2134,7 +2723,7 @@ ingest.failed=ingest failed
 permission.roleWasRemoved={0} role for {1} was removed.
 permission.defaultPermissionDataverseUpdated=The default permissions for this dataverse have been updated.
 permission.roleAssignedToFor={0} role assigned to {1} for {2}.
-permission.roleNotAssignedFor={0} role could NOT be assigned to {1} for {2}.
+permission.roleNotAssignedFor={0} role could NOT be assigned to {1} for {2}. It may be assigned already.
 permission.updated=updated
 permission.created=created
 permission.roleWas=The role was {0}. To assign it to a user and/or group, click on the Assign Roles to Users/Groups button in the Users/Groups section of this page.
@@ -2143,6 +2732,8 @@ permission.permissionsMissing=Permissions {0} missing.
 permission.CannotAssigntDefaultPermissions=Cannot assign default permissions.
 permission.default.contributor.role.none.decription=A person who has no permissions on a newly created dataset. Not recommended for dataverses with human contributors. 
 permission.default.contributor.role.none.name=None
+permission.role.must.be.created.by.superuser=Roles can only be created or edited by superusers.
+permission.role.not.created.alias.already.exists=Role with this alias already exists.
 
 #ManageFilePermissionsPage.java
 permission.roleNotAbleToBeRemoved=The role assignment was not able to be removed.
@@ -2169,6 +2760,10 @@ template.delete.error=The dataset template cannot be deleted.
 template.update=Template data updated
 template.update.error=Template update failed
 template.makeDefault.error=The dataset template cannot be made default.
+template.instructions.label=Custom Instructions:
+template.instructions.label.tip=Click to Edit
+template.instructions.empty.label=(None - click to add)
+
 page.copy=Copy of
 
 #RolePermissionFragment.java
@@ -2185,6 +2780,9 @@ pid.allowedCharacters=^[A-Za-z0-9._/:\\-]*
 
 #General Command Exception
 command.exception.only.superusers={1} can only be called by superusers.
+command.exception.user.deactivated={0} failed: User account has been deactivated.
+command.exception.user.deleted={0} failed: User account has been deleted.
+command.exception.user.ratelimited={0} failed: Rate limited due to too many requests.
 
 #Admin-API
 admin.api.auth.mustBeSuperUser=Forbidden. You must be a superuser.
@@ -2193,15 +2791,70 @@ admin.api.migrateHDL.failure.must.be.hdl.dataset=Dataset was not registered as a
 admin.api.migrateHDL.success=Dataset migrate HDL registration complete. Dataset re-registered successfully.
 admin.api.migrateHDL.failure=Failed to migrate Dataset Handle id: {0}
 admin.api.migrateHDL.failureWithException=Failed to migrate Dataset Handle id: {0} Unexpected exception: {1}
+admin.api.deleteUser.failure.prefix=Could not delete Authenticated User {0} because
+admin.api.deleteUser.failure.dvobjects= the user has created Dataverse object(s)
+admin.api.deleteUser.failure.gbResps= the user is associated with file download (Guestbook Response) record(s) 
+admin.api.deleteUser.failure.roleAssignments=the user is associated with role assignment record(s)
+admin.api.deleteUser.failure.versionUser=the user has contributed to dataset version(s)
+admin.api.deleteUser.failure.savedSearches=the user has created saved searches
+admin.api.deleteUser.success=Authenticated User {0} deleted.
+
+#Files.java
+files.api.metadata.update.duplicateFile=Filename already exists at {0}
+files.api.no.draft=No draft available for this file
+files.api.no.draftOrUnauth=Dataset version cannot be found or unauthorized.
+files.api.notFoundInVersion="File metadata for file with id {0} in dataset version {1} not found"
+files.api.only.tabular.supported=This operation is only available for tabular files.
+files.api.fileNotFound=File could not be found.
 
 #Datasets.java
 datasets.api.updatePIDMetadata.failure.dataset.must.be.released=Modify Registration Metadata must be run on a published dataset.
 datasets.api.updatePIDMetadata.auth.mustBeSuperUser=Forbidden. You must be a superuser.
 datasets.api.updatePIDMetadata.success.for.single.dataset=Dataset {0} PID Metadata updated successfully.
-datasets.api.updatePIDMetadata.success.for.update.all=All Dataset PID Metadata update completed successfully.
+datasets.api.updatePIDMetadata.success.for.update.all=All Dataset PID Metadata update completed. See log for any issues.
 datasets.api.moveDataset.error.targetDataverseNotFound=Target dataverse not found.
 datasets.api.moveDataset.error.suggestForce=Use the query parameter forceMove=true to complete the move.
 datasets.api.moveDataset.success=Dataset moved successfully.
+datasets.api.listing.error=Fatal error trying to list the contents of the dataset. Please report this error to the Dataverse administrator.
+datasets.api.datasize.storage=Total size of the files stored in this dataset: {0} bytes
+datasets.api.datasize.download=Total size of the files available for download in this version of the dataset: {0} bytes
+datasets.api.datasize.ioerror=Fatal IO error while trying to determine the total size of the files stored in the dataset. Please report this error to the Dataverse administrator.
+datasets.api.grant.role.not.found.error=Cannot find role named ''{0}'' in dataverse {1}
+datasets.api.grant.role.cant.create.assignment.error=Cannot create assignment: {0}
+datasets.api.grant.role.assignee.not.found.error=Assignee not found
+datasets.api.grant.role.assignee.has.role.error=Role has already been granted.
+datasets.api.revoke.role.not.found.error="Role assignment {0} not found"
+datasets.api.revoke.role.success=Role {0} revoked for assignee {1} in {2}
+datasets.api.privateurl.error.datasetnotfound=Could not find dataset. 
+datasets.api.privateurl.error.alreadyexists=Preview URL already exists for this dataset.
+datasets.api.privateurl.error.notdraft=Can't create Preview URL because the latest version of this dataset is not a draft.
+datasets.api.privateurl.anonymized.error.released=Can't create a URL for anonymized access because this dataset has been published.
+datasets.api.creationdate=Date Created
+datasets.api.modificationdate=Last Modified Date
+datasets.api.curationstatus=Curation Status
+datasets.api.curationstatuscreatetime=Status Set Time
+datasets.api.curationstatussetter=Status Set By
+datasets.api.version.files.invalid.order.criteria=Invalid order criteria: {0}
+datasets.api.version.files.invalid.access.status=Invalid access status: {0}
+datasets.api.deaccessionDataset.invalid.version.identifier.error=Only {0} or a specific version can be deaccessioned
+datasets.api.deaccessionDataset.invalid.forward.url=Invalid deaccession forward URL: {0}
+datasets.api.globusdownloaddisabled=File transfer from Dataverse via Globus is not available for this dataset.
+datasets.api.globusdownloadnotfound=List of files to transfer not found.
+datasets.api.globusuploaddisabled=File transfer to Dataverse via Globus is not available for this dataset.
+datasets.api.pidgenerator.notfound=No PID Generator configured for the give id.
+datasets.api.thumbnail.fileToLarge=File is larger than maximum size: {0}
+datasets.api.thumbnail.nonDatasetFailed=In setNonDatasetFileAsThumbnail could not generate thumbnail from uploaded file.
+datasets.api.thumbnail.notDeleted=User wanted to remove the thumbnail it still has one!
+datasets.api.thumbnail.actionNotSupported=Whatever you are trying to do to the dataset thumbnail is not supported.
+datasets.api.thumbnail.nonDatasetsFileIsNull=In setNonDatasetFileAsThumbnail uploadedFile was null.
+datasets.api.thumbnail.inputStreamToFile.exception=In setNonDatasetFileAsThumbnail caught exception calling inputStreamToFile: {0}
+datasets.api.thumbnail.missing=Dataset thumbnail is unexpectedly absent.
+datasets.api.thumbnail.basedOnWrongFileId=Dataset thumbnail should be based on file id {0} but instead it is {1}
+datasets.api.thumbnail.fileNotFound=Could not find file based on id supplied: {0}
+datasets.api.thumbnail.fileNotSupplied=A file was not selected to be the new dataset thumbnail.
+datasets.api.thumbnail.noChange=No changes to save.
+datasets.api.editMetadata.error.parseUpdate=Error parsing dataset update: {0}
+datasets.api.citation.invalidFormat=Invalid Format Requested.
 
 #Dataverses.java
 dataverses.api.update.default.contributor.role.failure.role.not.found=Role {0} not found.
@@ -2214,10 +2867,18 @@ dataverses.api.move.dataverse.failure.not.published=Published dataverse may not
 dataverses.api.move.dataverse.error.guestbook=Dataset guestbook is not in target dataverse. 
 dataverses.api.move.dataverse.error.template=Dataverse template is not in target dataverse.
 dataverses.api.move.dataverse.error.featured=Dataverse is featured in current dataverse.
+dataverses.api.delete.featured.collections.successful=Featured dataverses have been removed
 dataverses.api.move.dataverse.error.metadataBlock=Dataverse metadata block is not in target dataverse. 
 dataverses.api.move.dataverse.error.dataverseLink=Dataverse is linked to target dataverse or one of its parents. 
 dataverses.api.move.dataverse.error.datasetLink=Dataset is linked to target dataverse or one of its parents.   
-dataverses.api.move.dataverse.error.forceMove=Please use the parameter ?forceMove=true to complete the move. This will remove anything from the dataverse that is not compatible with the target dataverse.
+dataverses.api.move.dataverse.error.forceMove=Please use the API and see "Move a Dataverse Collection" with the parameter ?forceMove=true to complete the move. This will remove anything from the dataverse that is not compatible with the target dataverse.
+dataverses.api.create.dataset.error.mustIncludeVersion=Please provide initial version in the dataset json
+dataverses.api.create.dataset.error.superuserFiles=Only a superuser may add files via this api
+dataverses.api.create.dataset.error.mustIncludeAuthorName=Please provide author name in the dataset json
+dataverses.api.validate.json.succeeded=The Dataset JSON provided is valid for this Dataverse Collection.
+dataverses.api.validate.json.failed=The Dataset JSON provided failed validation with the following error:
+dataverses.api.validate.json.exception=Validation failed with following exception:
+dataverses.api.update.featured.items.error.onlyImageFilesAllowed=Invalid file type. Only image files are allowed.
 
 #Access.java
 access.api.allowRequests.failure.noDataset=Could not find Dataset with id: {0}
@@ -2225,10 +2886,13 @@ access.api.allowRequests.failure.noSave=Problem saving dataset {0}: {1}
 access.api.allowRequests.allows=allows
 access.api.allowRequests.disallows=disallows
 access.api.allowRequests.success=Dataset {0} {1} file access requests.
+access.api.fileAccess.failure.noSave=Could not update Request Access for {0} Error Message {1}
 access.api.fileAccess.failure.noUser=Could not find user to execute command: {0}
 access.api.requestAccess.failure.commandError=Problem trying request access on {0} : {1}
 access.api.requestAccess.failure.requestExists=An access request for this file on your behalf already exists.
 access.api.requestAccess.failure.invalidRequest=You may not request access to this file. It may already be available to you.
+access.api.requestAccess.failure.retentionExpired=You may not request access to this file. It is not available because its retention period has ended.
+
 access.api.requestAccess.noKey=You must provide a key to request access to a file. 
 access.api.requestAccess.fileNotFound=Could not find datafile with id {0}.
 access.api.requestAccess.invalidRequest=This file is already available to you for download or you have a pending request
@@ -2244,8 +2908,11 @@ access.api.revokeAccess.noRoleFound=No File Downloader role found for user {0}
 access.api.revokeAccess.success.for.single.file=File Downloader access has been revoked for user {0} on file {1}
 access.api.requestList.fileNotFound=Could not find datafile with id {0}.
 access.api.requestList.noKey=You must provide a key to get list of access requests for a file. 
-access.api.requestList.noRequestsFound=There are no access requests for this file {0}.
+access.api.requestList.noRequestsFound=There are no access requests for this file: {0}.
 access.api.exception.metadata.not.available.for.nontabular.file=This type of metadata is only available for tabular files.
+access.api.exception.metadata.restricted.no.permission=You do not have permission to download this file.
+access.api.exception.version.not.found=Could not find requested dataset version.
+access.api.exception.dataset.not.found=Could not find requested dataset.
 
 #permission
 permission.AddDataverse.label=AddDataverse
@@ -2259,17 +2926,23 @@ permission.ManageDataversePermissions.label=ManageDataversePermissions
 permission.ManageDatasetPermissions.label=ManageDatasetPermissions
 permission.PublishDataverse.label=PublishDataverse
 permission.PublishDataset.label=PublishDataset
+permission.LinkDataverse.label=LinkDataverse
+permission.LinkDataset.label=LinkDataset
 permission.DeleteDataverse.label=DeleteDataverse
 permission.DeleteDatasetDraft.label=DeleteDatasetDraft
+permission.ManageFilePermissions.label=ManageFilePermissions
 
 permission.AddDataverse.desc=Add a dataverse within another dataverse
 permission.DeleteDatasetDraft.desc=Delete a dataset draft
 permission.DeleteDataverse.desc=Delete an unpublished dataverse
 permission.PublishDataset.desc=Publish a dataset
 permission.PublishDataverse.desc=Publish a dataverse
+permission.LinkDataset.desc=Link a dataset
+permission.LinkDataverse.desc=Link a dataverse
+permission.ManageFilePermissions.desc=Manage permissions for a file
 permission.ManageDatasetPermissions.desc=Manage permissions for a dataset
 permission.ManageDataversePermissions.desc=Manage permissions for a dataverse
-permission.EditDataset.desc=Edit a dataset's metadata
+permission.EditDataset.desc=Edit a dataset's metadata, license, terms and add/delete files
 permission.EditDataverse.desc=Edit a dataverse's metadata, facets, customization, and templates 
 permission.DownloadFile.desc=Download a file
 permission.ViewUnpublishedDataset.desc=View an unpublished dataset and its files
@@ -2350,7 +3023,8 @@ editfilesfragment.label4.item2=Unicode (UTF-16LE)
 editfilesfragment.label4.item3=Unicode (UTF-16BE)
 editfilesfragment.label5=US-ASCII
 
-isrequired=is required.
+isrequired={0} is required.
+isrequired.conditional={0} is required if you choose to enter a value in any of the optional {1} fields.
 draftversion=DRAFT VERSION
 deaccessionedversion=DEACCESSIONED VERSION
 
@@ -2362,7 +3036,22 @@ passwdVal.passwdReq.lowercase=lowercase
 passwdVal.passwdReq.letter=letter
 passwdVal.passwdReq.numeral=numeral
 passwdVal.passwdReq.special=special
+#mydata API (DataRetriverAPI.java and MyDataFinder.java)
 dataretrieverAPI.noMsgResultsFound=Sorry, no results were found.
+dataretrieverAPI.authentication.required=Requires authentication. Please login.
+dataretrieverAPI.authentication.required.opt=retrieveMyDataAsJsonString. User not found! Shouldn't be using this anyway.
+dataretrieverAPI.user.not.found=No user found for: "{0}"
+dataretrieverAPI.solr.error=Sorry! There was an error with the search service.
+dataretrieverAPI.solr.error.opt=Sorry! There was a Solr Error.
+myDataFilterParams.error.no.user=Sorry! No user was found!
+myDataFilterParams.error.result.no.role=No results. Please select at least one Role.
+myDataFilterParams.error.result.no.dvobject=No results. Please select one of Dataverses, Datasets, Files.
+myDataFilterParams.error.result.no.publicationStatus=No results. Please select one of {0}.
+myDataFinder.error.result.null=Sorry, the authenticated user ID could not be retrieved.
+myDataFinder.error.result.no.role=Sorry, you have no assigned roles.
+myDataFinder.error.result.role.empty=Sorry, nothing was found for this role: {0}
+myDataFinder.error.result.roles.empty=Sorry, nothing was found for these roles: {0}
+myDataFinder.error.result.no.dvobject=Sorry, you have no assigned Dataverses, Datasets, or Files.
 
 #xlsxfilereader.java
 xlsxfilereader.ioexception.parse=Could not parse Excel/XLSX spreadsheet. {0}
@@ -2376,24 +3065,17 @@ xlsxfilereader.ioexception.linecount=Mismatch between line counts in first and f
 rtabfileparser.ioexception.failed=Failed to read line {0} of the Data file.
 rtabfileparser.ioexception.mismatch=Reading mismatch, line {0} of the Data file: {1} delimited values expected, {2} found.
 rtabfileparser.ioexception.boolean=Unexpected value for the Boolean variable ({0}): 
-rtabfileparser.ioexception.read=Couldn't read Boolean variable ({0})!
+rtabfileparser.ioexception.read=Couldn''t read Boolean variable ({0})!
 rtabfileparser.ioexception.parser1=R Tab File Parser: Could not obtain varQnty from the dataset metadata.
 rtabfileparser.ioexception.parser2=R Tab File Parser: varQnty=0 in the dataset metadata!
 
+#JsonParser.java
+jsonparser.error.metadatablocks.not.found=Invalid JSON object: metadata blocks not found.
+jsonparser.error.parsing.date=Error parsing date: {0}
+jsonparser.error.parsing.number=Error parsing number: {0}
 #ConfigureFragmentBean.java
 configurefragmentbean.apiTokenGenerated=API Token will be generated. Please keep it secure as you would do with a password.
 
-#FacetCategory - staticSearchFields
-staticSearchFields.dvCategory=Dataverse Category
-staticSearchFields.metadataSource=Metadata Source
-staticSearchFields.publicationDate=Publication Year
-staticSearchFields.fileTypeGroupFacet=File Type
-staticSearchFields.dvObjectType=Type
-staticSearchFields.fileTag=File Tag
-staticSearchFields.fileAccess=Access
-staticSearchFields.publicationStatus=Publication Status
-staticSearchFields.subject_ss=Subject
-
 #dataverse category - Facet Labels
 Researcher=Researcher
 Research\u0020Project=Research Project
@@ -2421,10 +3103,15 @@ Archive=Archive
 Audio=Audio
 Video=Video
 
-#access - Facet Labels
+#access - Facet Labels (Not used as of 5.6)
 Public=Public
 Restricted=Restricted
+EmbargoedThenPublic=Embargoed then Public
+EmbargoedThenRestricted=Embargoed then Restricted
+RetentionPeriodExpired=Retention Period Expired
 
+#metadata source - Facet Label
+Harvested=Harvested
 
 #Shibboleth login
 idp.fatal.divMissing=<div> specified  as &quot;insertAtDiv&quot; could not be located in the HTML
@@ -2446,4 +3133,101 @@ idp.idpList.showList=Allow me to pick from a list
 idp.idpList.showSearch=Allow me to type the name of my institution
 idp.submitButton.label=Continue
 idp.helpText=Help
-idp.defaultLogoAlt=
\ No newline at end of file
+idp.defaultLogoAlt=
+
+#externaltools
+externaltools.dct.displayname=Data Curation Tool
+externaltools.dct.description=Data Curation Tool for curation of variables
+externaltools.explorer.displayname=Data Explorer
+externaltools.explorer.description=The Data Explorer provides a GUI which lists the variables in a tabular data file allowing searching, charting and cross tabulation analysis.
+
+# api/admin/datasetfield/load
+api.admin.datasetfield.load.ArrayIndexOutOfBoundMessage=Error parsing metadata block in {0} part, line #{1}: missing ''{2}'' column (#{3})
+api.admin.datasetfield.load.GeneralErrorMessage=Error parsing metadata block in {0} part, line #{1}: {2}
+
+#PIDs
+pids.api.reservePid.success=PID reserved for {0}
+pids.api.deletePid.success=PID deleted for {0}
+pids.deletePid.failure=Unable to delete PID {0}: {1}
+pids.datacite.errors.noResponseCode=Problem getting HTTP status code from {0}. Is it in DNS? Is doi.dataciterestapiurlstring configured properly?
+pids.datacite.errors.DoiOnly=Only doi: is supported.
+
+#AbstractDatasetCommand
+abstractDatasetCommand.pidNotReserved=Unable to reserve a persistent identifier for the dataset: {0}.
+abstractDatasetCommand.filePidNotReserved=Unable to reserve a persistent identifier for one or more files in the dataset: {0}.
+abstractDatasetCommand.pidReservationRetryExceeded="This dataset may not be registered because its identifier is already in use by another dataset: gave up after {0} attempts. Current (last requested) identifier: {1}"
+
+# APIs
+api.errors.invalidApiToken=Invalid API token.
+api.ldninbox.citation.alert={0},<br><br> The {1} has just been notified that the {2}, <a href=''{3}''>{3}</a>, cites "<a href=''{4}/dataset.xhtml?persistentId={5}''>{6}</a>" in this repository.
+api.ldninbox.citation.subject={0}: A Dataset Citation has been reported!
+
+#Schema Validation
+schema.validation.exception.value.missing=Invalid data for key:{0} typeName:{1}. ''value'' missing.
+schema.validation.exception.list.notmultiple=Invalid data for key:{0} typeName:{1}. Found value as list but ''multiple'' is set to false.
+schema.validation.exception.notlist.multiple=Invalid data for key:{0} typeName:{1}. Fields with ''multiple'' set to true must be a list.
+schema.validation.exception.compound=Compound data type must be accompanied by a value that is either an object (multiple=false) or a list of objects (multiple=true)
+schema.validation.exception.compound.mismatch=Compound value {0} must match typeName of the object. Found {1}
+schema.validation.exception.dataset.cvv.missing=Controlled vocabulary for key:{0} typeName:{1} value:''{2}'' is not valid.
+schema.validation.exception.dataset.invalidType=Invalid data for key:{0} typeName:{1}. Only {2} allowed.
+schema.validation.exception.dataset.required.missing=Invalid data for key:{0}. {1} is(are) required if field type is {2}.
+
+#Info.java
+openapi.exception.invalid.format=Invalid format {0}, currently supported formats are YAML and JSON.
+openapi.exception=Supported format definition not found.
+openapi.exception.unaligned=Unaligned parameters on Headers [{0}] and Request [{1}]
+
+#Users.java
+users.api.errors.bearerAuthFeatureFlagDisabled=This endpoint is only available when bearer authentication feature flag is enabled.
+users.api.errors.bearerTokenRequired=Bearer token required.
+users.api.errors.jsonParseToUserDTO=Error parsing the POSTed User json: {0}
+users.api.userRegistered=User registered.
+
+#RegisterOidcUserCommand.java
+registerOidcUserCommand.errors.userAlreadyRegisteredWithToken=User is already registered with this token.
+registerOidcUserCommand.errors.invalidFields=The provided fields are invalid for registering a new user.
+registerOidcUserCommand.errors.userShouldAcceptTerms=Terms should be accepted.
+registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldAlreadyPresentInProvider=Unable to set {0} because it conflicts with an existing claim from the OIDC identity provider.
+registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldRequired=It is required to include the field {0} in the request JSON for registering the user.
+registerOidcUserCommand.errors.provideMissingClaimsDisabled.unableToSetFieldViaJSON=Unable to set field {0} via JSON because the api-bearer-auth-provide-missing-claims feature flag is disabled.
+registerOidcUserCommand.errors.provideMissingClaimsDisabled.fieldRequired=The OIDC identity provider does not provide the user claim {0}, which is required for user registration. Please contact an administrator.
+registerOidcUserCommand.errors.emailAddressInUse=Email already in use.
+registerOidcUserCommand.errors.usernameInUse=Username already in use.
+
+#BearerTokenAuthMechanism.java
+bearerTokenAuthMechanism.errors.tokenValidatedButNoRegisteredUser=Bearer token is validated, but there is no linked user account.
+
+#AuthenticationServiceBean.java
+authenticationServiceBean.errors.unauthorizedBearerToken=Unauthorized bearer token.
+authenticationServiceBean.errors.invalidBearerToken=Could not parse bearer token.
+authenticationServiceBean.errors.bearerTokenDetectedNoOIDCProviderConfigured=Bearer token detected, no OIDC provider configured.
+
+#SendFeedbackAPI.java
+sendfeedback.request.error.targetNotFound=Feedback target object not found.
+sendfeedback.request.rateLimited=Too many requests to send feedback.
+sendfeedback.body.error.exceedsLength=Body exceeds feedback length: {0} > {1}}.
+sendfeedback.body.error.isEmpty=Body can not be empty.
+sendfeedback.body.error.missingRequiredFields=Body missing required fields.
+sendfeedback.fromEmail.error.missing=Missing fromEmail
+sendfeedback.fromEmail.error.invalid=Invalid fromEmail: {0}
+
+#DataverseFeaturedItems.java
+dataverseFeaturedItems.errors.notFound=Could not find dataverse featured item with identifier {0}
+dataverseFeaturedItems.errors.notPublished={0} must be published to be featured.
+dataverseFeaturedItems.errors.restricted=Datafile must not be restricted to be featured.
+dataverseFeaturedItems.delete.successful=Successfully deleted dataverse featured item with identifier {0}
+
+#DatasetFieldValidator.java
+datasetFieldValidator.error.emptyRequiredMultipleValueForField=Empty multiple required value for field: {0}
+datasetFieldValidator.error.emptyRequiredControlledVocabularyValueForField=Empty controlled vocabulary required value for field: {0}
+datasetFieldValidator.error.emptyRequiredCompoundValueForField=Empty compound required value for field: {0}
+datasetFieldValidator.error.emptyRequiredSingleValueForField=Empty required value for field: {0}
+
+#UpdateDatasetFieldsCommand.java
+updateDatasetFieldsCommand.api.processDatasetUpdate.parseError=Error parsing dataset update: {0}
+
+#AbstractApiBean.java
+abstractApiBean.error.internalVersionTimestampIsOutdated=Internal version timestamp {0} is outdated
+
+#RoleAssigneeServiceBean.java
+roleAssigneeServiceBean.error.dataverseRequestCannotBeNull=DataverseRequest cannot be null.
diff --git a/src/main/java/propertyFiles/License.properties b/src/main/java/propertyFiles/License.properties
new file mode 100644
index 00000000000..6602f408a12
--- /dev/null
+++ b/src/main/java/propertyFiles/License.properties
@@ -0,0 +1,6 @@
+license.cc0_1.0.description=Creative Commons CC0 1.0 Universal Public Domain Dedication. 
+license.cc_by_4.0.description=Creative Commons Attribution 4.0 International License.
+license.cc0_1.0.name=CC0 1.0
+license.cc_by_4.0.name=CC BY 4.0
+license.custom_terms.name=Custom Terms
+
diff --git a/src/main/java/propertyFiles/MimeTypeDetectionByFileExtension.properties b/src/main/java/propertyFiles/MimeTypeDetectionByFileExtension.properties
index 91191d2b588..e9a6c535bc4 100644
--- a/src/main/java/propertyFiles/MimeTypeDetectionByFileExtension.properties
+++ b/src/main/java/propertyFiles/MimeTypeDetectionByFileExtension.properties
@@ -3,7 +3,9 @@ ado=application/x-stata-ado
 dbf=application/dbf
 dcm=application/dicom
 docx=application/vnd.openxmlformats-officedocument.wordprocessingml.document
+eln=application/vnd.eln+zip
 emf=application/x-emf
+geojson=application/geo+json
 h5=application/x-h5
 hdf=application/x-hdf
 hdf5=application/x-hdf5
@@ -13,6 +15,8 @@ m=text/x-matlab
 mat=application/matlab-mat
 md=text/markdown
 mp3=audio/mp3
+m4a=audio/mp4
+vtt=text/vtt
 nii=image/nii
 nc=application/netcdf
 ods=application/vnd.oasis.opendocument.spreadsheet
@@ -30,3 +34,10 @@ smcl=application/x-stata-smcl
 swc=application/x-swc
 xz=application/x-xz
 xlsx=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+wdl=text/x-workflow-description-language
+cwl=text/x-computational-workflow-language
+nf=text/x-nextflow
+Rmd=text/x-r-notebook
+rb=text/x-ruby-script
+dag=text/x-dagman
+glb=model/gltf-binary
diff --git a/src/main/java/propertyFiles/MimeTypeDetectionByFileName.properties b/src/main/java/propertyFiles/MimeTypeDetectionByFileName.properties
new file mode 100644
index 00000000000..5c1a22bfd5f
--- /dev/null
+++ b/src/main/java/propertyFiles/MimeTypeDetectionByFileName.properties
@@ -0,0 +1,6 @@
+Makefile=text/x-makefile
+Snakemake=text/x-snakemake
+Dockerfile=application/x-docker-file
+Vagrantfile=application/x-vagrant-file
+ro-crate-metadata.json=application/ld+json; profile="http://www.w3.org/ns/json-ld#flattened http://www.w3.org/ns/json-ld#compacted https://w3id.org/ro/crate"
+ro-crate-metadata.jsonld=application/ld+json; profile="http://www.w3.org/ns/json-ld#flattened http://www.w3.org/ns/json-ld#compacted https://w3id.org/ro/crate"
diff --git a/src/main/java/propertyFiles/MimeTypeDisplay.properties b/src/main/java/propertyFiles/MimeTypeDisplay.properties
index 29407ccda40..ea1d03283df 100644
--- a/src/main/java/propertyFiles/MimeTypeDisplay.properties
+++ b/src/main/java/propertyFiles/MimeTypeDisplay.properties
@@ -5,6 +5,7 @@ application/pdf=Adobe PDF
 image/pdf=Adobe PDF
 text/pdf=Adobe PDF
 application/x-pdf=Adobe PDF
+application/cnt=Windows Help Contents File
 application/msword=MS Word
 application/vnd.ms-excel=MS Excel Spreadsheet
 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=MS Excel Spreadsheet
@@ -12,8 +13,10 @@ application/vnd.ms-powerpoint=MS Powerpoint
 application/vnd.openxmlformats-officedocument.presentationml.presentation=MS Powerpoint
 application/vnd.openxmlformats-officedocument.wordprocessingml.document=MS Word
 application/vnd.oasis.opendocument.spreadsheet=OpenOffice Spreadsheet
+application/vnd.ms-excel.sheet.macroenabled.12=MS Excel Spreadsheet
 # Text
 text/plain=Plain Text
+text/x-log=Application Log
 text/html=HTML
 application/x-tex=LaTeX
 text/x-tex=LaTeX
@@ -21,6 +24,7 @@ text/markdown=Markdown Text
 text/x-markdown=Markdown Text
 text/x-r-markdown=R Markdown Text
 application/rtf=Rich Text Format
+text/x-rst=reStructuredText
 text/rtf=Rich Text Format
 text/richtext=Rich Text Format
 text/turtle=Turtle RDF
@@ -28,16 +32,26 @@ application/xml=XML
 text/xml=XML
 # Code
 text/x-c=C++ Source
+text/x-c++src=C++ Source
 text/css=Cascading Style Sheet
+text/x-fortran=Fortran Source Code
+application/java-vm=Java Class
+text/x-java-source=Java Source Code
 text/javascript=Javascript Code
 application/javascript=Javascript Code
 application/x-javascript=Javascript Code
 text/x-matlab=MATLAB Source Code
 text/x-mathematica=Mathematica Input
+text/x-objcsrc=Objective-C Source Code
+text/x-pascal=Pascal Source Code
+text/x-perl=Perl Script
+text/x-perl-script=Perl Script
 text/php=PHP Source Code
+application/postscript=Postscript
 text/x-python=Python Source Code
 text/x-python-script=Python Source Code
 text/x-r-source=R Source Code
+text/x-sh=Shell Script
 application/x-sh=Shell Script
 application/x-shellscript=Shell Script
 application/x-sql=SQL Code
@@ -57,13 +71,26 @@ application/x-spss-sps=SPSS Script Syntax
 text/x-sas-syntax=SAS Syntax
 application/x-sas-syntax=SAS Syntax
 type/x-r-syntax=R Syntax
+application/vnd.wolfram.mathematica.package=Wolfram Mathematica Code
+application/vnd.wolfram.mathematica=Wolfram Mathematica Code
+text/x-workflow-description-language=Workflow Description Language
+text/x-computational-workflow-language=Computational Workflow Language
+text/x-nextflow=Nextflow Script
+text/x-r-notebook=R Notebook
+text/x-ruby-script=Ruby Source Code
+text/x-dagman=DAGMan Workflow
+text/x-makefile=Makefile Script
+text/x-snakemake=Snakemake Workflow
 # Ingested Tabular Data
 text/tab-separated-values=Tab-Delimited
 # RawData
 text/tsv=Tab-Separated Values
 text/comma-separated-values=Comma Separated Values
+text/x-comma-separated-values=Comma Separated Values
 text/csv=Comma Separated Values
 text/x-fixed-field=Fixed Field Text Data
+application/vnd.flographit=FloGraphIt Media
+application/x-r-data=R Data
 application/x-rlang-transport=R Data
 application/x-R-2=R Binary
 application/x-stata=Stata Binary
@@ -88,12 +115,14 @@ application/x-emf=Extended Metafile
 application/x-h5=Hierarchical Data Format
 application/x-hdf=Hierarchical Data Format
 application/x-hdf5=Hierarchical Data Format
+application/geo+json=GeoJSON
 application/json=JSON
 application/mathematica=Mathematica
 application/matlab-mat=MATLAB Data
 application/x-matlab-data=MATLAB Data
 application/x-matlab-figure=MATLAB Figure
 application/x-matlab-workspace=MATLAB Workspace
+text/x-vcard=Virtual Contact File
 application/x-xfig=MATLAB Figure
 application/x-msaccess=MS Access
 application/netcdf=Network Common Data Form
@@ -101,6 +130,10 @@ application/x-netcdf=Network Common Data Form
 application/vnd.lotus-notes=Notes Storage Facility
 application/x-nsdstat=NSDstat
 application/vnd.realvnc.bed=PLINK Binary
+application/vnd.ms-pki.stl=STL Format
+application/vnd.isac.fcs=FCS Data
+application/java-serialized-object=Java Serialized Object
+chemical/x-xyz=Co-Ordinate Animation
 # FITS
 image/fits=FITS
 application/fits=FITS
@@ -112,7 +145,9 @@ application/sbn=ESRI Spatial Index
 application/sbx=ESRI Spatial Index
 application/shp=Shape
 application/shx=Shape
-application/zipped-shapefile=Shape
+application/x-esri-shape=ESRI Shapefile
+application/vnd.google-earth.kml+xml=Keyhole Markup Language
+application/zipped-shapefile=Zipped Shapefiles
 # Archive
 application/zip=ZIP Archive
 application/x-zip-compressed=ZIP Archive
@@ -122,15 +157,19 @@ application/x-bzip2=Bzip Archive
 application/vnd.google-earth.kmz=Google Earth Archive
 application/gzip=Gzip Archive
 application/x-gzip=Gzip Archive
+application/x-gzip-compressed=Gzip Archive
 application/rar=RAR Archive
 application/x-rar=RAR Archive
 application/x-rar-compressed=RAR Archive
 application/tar=TAR Archive
 application/x-tar=TAR Archive
+application/x-compressed=Compressed Archive
 application/x-compressed-tar=TAR Archive
 application/x-7z-compressed=7Z Archive
 application/x-xz=XZ Archive
 application/warc=Web Archive
+application/x-iso9660-image=Optical Disc Image
+application/vnd.eln+zip=ELN Archive
 # Image
 image/gif=GIF Image
 image/jpeg=JPEG Image
@@ -151,8 +190,13 @@ image/tiff=TIFF Image
 image/bmp=Bitmap Image
 image/x-xbitmap=Bitmap Image
 image/RAW=Bitmap Image
+image/raw=Bitmap Image
+application/x-tgif=TGIF File
 image/x-xpixmap=Pixmap Image
 image/x-xwindowdump=X Windows Dump
+application/photoshop=Photoshop Image
+image/vnd.adobe.photoshop=Photoshop Image
+application/x-photoshop=Photoshop Image
 # Audio
 audio/x-aiff=AIFF Audio
 audio/mp3=MP3 Audio
@@ -163,6 +207,7 @@ audio/ogg=OGG Audio
 audio/wav=Waveform Audio
 audio/x-wav=Waveform Audio
 audio/x-wave=Waveform Audio
+audio/vnd.wave=Waveform Audio
 # Video
 video/avi=AVI Video
 video/x-msvideo=AVI Video
@@ -172,9 +217,15 @@ video/x-m4v=MPEG-4 Video
 video/ogg=OGG Video
 video/quicktime=Quicktime Video
 video/webm=WebM Video
+text/vtt=Web Video Text Tracks
 # Network Data
 text/xml-graphml=GraphML Network Data
+# 3D Data
+model/gltf-binary=3D Model
 # Other
 application/octet-stream=Unknown
+application/x-docker-file=Docker Image File
+application/x-vagrant-file=Vagrant Image File
+application/ld+json;\u0020profile\u003d\u0022http\u003a//www.w3.org/ns/json-ld#flattened\u0020http\u003a//www.w3.org/ns/json-ld#compacted\u0020https\u003a//w3id.org/ro/crate\u0022=RO-Crate metadata
 # Dataverse-specific
-application/vnd.dataverse.file-package=Dataverse Package
\ No newline at end of file
+application/vnd.dataverse.file-package=Dataverse Package
diff --git a/src/main/java/propertyFiles/MimeTypeFacets.properties b/src/main/java/propertyFiles/MimeTypeFacets.properties
index 54c5e01d317..3f899f79184 100644
--- a/src/main/java/propertyFiles/MimeTypeFacets.properties
+++ b/src/main/java/propertyFiles/MimeTypeFacets.properties
@@ -5,6 +5,7 @@ application/pdf=Document
 image/pdf=Document
 text/pdf=Document
 application/x-pdf=Document
+application/cnt=Document
 application/msword=Document
 application/vnd.ms-excel=Document
 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=Document
@@ -12,32 +13,44 @@ application/vnd.ms-powerpoint=Document
 application/vnd.openxmlformats-officedocument.presentationml.presentation=Document
 application/vnd.openxmlformats-officedocument.wordprocessingml.document=Document
 application/vnd.oasis.opendocument.spreadsheet=Document
+application/vnd.ms-excel.sheet.macroenabled.12=Document
 # Text
 text/plain=Text
+text/x-log=Text
 text/html=Text
 application/x-tex=Text
 text/x-tex=Text
 text/markdown=Text
 text/x-markdown=Text
 text/x-r-markdown=Text
+text/x-rst=Text
 application/rtf=Text
 text/rtf=Text
 text/richtext=Text
 text/turtle=Text
 application/xml=Text
 text/xml=Text
+text/vtt=Text
 # Code
 text/x-c=Code
+text/x-c++src=Code
 text/css=Code
+text/x-objcsrc=Code
+application/java-vm=Code
+text/x-java-source=Code
 text/javascript=Code
 application/javascript=Code
 application/x-javascript=Code
+text/x-perl-script=Code
 text/x-matlab=Code
 text/x-mathematica=Code
 text/php=Code
+text/x-fortran=Code
+text/x-pascal=Code
 text/x-python=Code
 text/x-python-script=Code
 text/x-r-source=Code
+text/x-sh=Code
 application/x-sh=Code
 application/x-shellscript=Code
 application/x-sql=Code
@@ -53,12 +66,27 @@ application/x-spss-syntax=Code
 text/x-sas-syntax=Code
 application/x-sas-syntax=Code
 type/x-r-syntax=Code
+application/postscript=Code
+application/vnd.wolfram.mathematica.package=Code
+application/vnd.wolfram.mathematica=Code
+text/x-workflow-description-language=Code
+text/x-computational-workflow-language=Code
+text/x-nextflow=Code
+text/x-r-notebook=Code
+text/x-ruby-script=Code
+text/x-dagman=Code
+text/x-makefile=Code
+text/x-snakemake=Code
+application/x-docker-file=Code
+application/x-vagrant-file=Code
 # Ingested
 text/tab-separated-values=Tabular Data
 # Data
 text/tsv=Data
 text/comma-separated-values=Data
+text/x-comma-separated-values=Data
 text/csv=Data
+text/x-vcard=Data
 text/x-fixed-field=Data
 application/x-rlang-transport=Data
 application/x-R-2=Data
@@ -81,6 +109,7 @@ application/x-sas-data=Data
 application/x-sas-catalog=Data
 application/x-sas-log=Data
 application/x-sas-output=Data
+application/x-r-data=Data
 application/softgrid-do=Data
 application/x-dvn-csvspss-zip=Data
 application/x-dvn-tabddi-zip=Data
@@ -88,6 +117,7 @@ application/x-emf=Data
 application/x-h5=Data
 application/x-hdf=Data
 application/x-hdf5=Data
+application/geo+json=Data
 application/json=Data
 application/mathematica=Data
 application/matlab-mat=Data
@@ -100,7 +130,12 @@ application/netcdf=Data
 application/x-netcdf=Data
 application/vnd.lotus-notes=Data
 application/x-nsdstat=Data
+application/vnd.flographit=Data
 application/vnd.realvnc.bed=Data
+application/vnd.ms-pki.stl=Data
+application/vnd.isac.fcs=Data
+application/java-serialized-object=Data
+chemical/x-xyz=Data
 # FITS
 image/fits=FITS
 application/fits=FITS
@@ -112,6 +147,8 @@ application/sbn=Shape
 application/sbx=Shape
 application/shp=Shape
 application/shx=Shape
+application/x-esri-shape=Shape
+application/vnd.google-earth.kml+xml=Shape
 application/zipped-shapefile=Shape
 # Archive
 application/zip=Archive
@@ -122,15 +159,19 @@ application/x-bzip2=Archive
 application/vnd.google-earth.kmz=Archive
 application/gzip=Archive
 application/x-gzip=Archive
+application/x-gzip-compressed=Archive
 application/rar=Archive
 application/x-rar=Archive
 application/x-rar-compressed=Archive
 application/tar=Archive
 application/x-tar=Archive
+application/x-compressed=Archive
 application/x-compressed-tar=Archive
 application/x-7z-compressed=Archive
 application/x-xz=Archive
 application/warc=Archive
+application/x-iso9660-image=Archive
+application/vnd.eln+zip=Archive
 # Image
 image/gif=Image
 image/jpeg=Image
@@ -151,8 +192,13 @@ image/tiff=Image
 image/bmp=Image
 image/x-xbitmap=Image
 image/RAW=Image
+image/raw=Image
+application/x-tgif=Image
 image/x-xpixmap=Image
 image/x-xwindowdump=Image
+application/photoshop=Image
+image/vnd.adobe.photoshop=Image
+application/x-photoshop=Image
 # (anything else that looks like image/* will also be indexed as facet type "Image")
 # Audio
 audio/x-aiff=Audio
@@ -164,6 +210,7 @@ audio/ogg=Audio
 audio/wav=Audio
 audio/x-wav=Audio
 audio/x-wave=Audio
+audio/vnd.wave=Audio
 # (anything else that looks like audio/* will also be indexed as facet type "Audio")
 # Video
 video/avi=Video
@@ -177,7 +224,10 @@ video/webm=Video
 # (anything else that looks like image/* will also be indexed as facet type "Video")
 # Network Data
 text/xml-graphml=Network Data
+# 3D Data
+model/gltf-binary=3D Data
 # Other
 application/octet-stream=Unknown
+application/ld+json;\u0020profile\u003d\u0022http\u003a//www.w3.org/ns/json-ld#flattened\u0020http\u003a//www.w3.org/ns/json-ld#compacted\u0020https\u003a//w3id.org/ro/crate\u0022=Metadata
 # Dataverse-specific
-application/vnd.dataverse.file-package=Data
\ No newline at end of file
+application/vnd.dataverse.file-package=Data
diff --git a/src/main/java/propertyFiles/archival.properties b/src/main/java/propertyFiles/archival.properties
new file mode 100644
index 00000000000..cc460e1559e
--- /dev/null
+++ b/src/main/java/propertyFiles/archival.properties
@@ -0,0 +1,22 @@
+metadatablock.name=archival
+metadatablock.displayName=Archival Metadata
+metadatablock.displayFacet=Archival Metadata
+datasetfieldtype.submitToArchivalAppraisal.title=Submit to Archival Appraisal
+datasetfieldtype.archivedFrom.title=Archived from
+datasetfieldtype.holdingArchive.title=Holding Archive
+datasetfieldtype.holdingArchiveName.title=Archived at Holding Archive
+datasetfieldtype.archivedAt.title=Archived at URL
+datasetfieldtype.submitToArchivalAppraisal.description=Your assessment of whether the dataset should be submitted for archival appraisal
+datasetfieldtype.archivedFrom.description=A date (YYYY-MM-DD) from which the dataset is archived
+datasetfieldtype.holdingArchive.description=Information on the holding archive where the dataset is archived
+datasetfieldtype.holdingArchiveName.description=The name of the holding archive
+datasetfieldtype.archivedAt.description=URL to holding archive
+datasetfieldtype.submitToArchivalAppraisal.watermark=
+datasetfieldtype.archivedFrom.watermark=YYYY-MM-DD
+datasetfieldtype.archivedFor.watermark=
+datasetfieldtype.holdingArchive.watermark=
+datasetfieldtype.holdingArchiveName.watermark=
+datasetfieldtype.archivedAt.watermark=URL
+controlledvocabulary.submitToArchivalAppraisal.true=Yes
+controlledvocabulary.submitToArchivalAppraisal.false=No
+controlledvocabulary.submitToArchivalAppraisal.unknown=Unknown
diff --git a/src/main/java/propertyFiles/astrophysics.properties b/src/main/java/propertyFiles/astrophysics.properties
index f91095eca2c..015ca5d43f0 100644
--- a/src/main/java/propertyFiles/astrophysics.properties
+++ b/src/main/java/propertyFiles/astrophysics.properties
@@ -1,5 +1,6 @@
 metadatablock.name=astrophysics
 metadatablock.displayName=Astronomy and Astrophysics Metadata
+metadatablock.displayFacet=Astronomy and Astrophysics
 datasetfieldtype.astroType.title=Type
 datasetfieldtype.astroFacility.title=Facility
 datasetfieldtype.astroInstrument.title=Instrument
@@ -49,9 +50,9 @@ datasetfieldtype.coverage.SkyFraction.description=The fraction of the sky repres
 datasetfieldtype.coverage.Polarization.description=The polarization coverage
 datasetfieldtype.redshiftType.description=RedshiftType string C "Redshift"; or "Optical" or "Radio" definitions of Doppler velocity used in the data object.
 datasetfieldtype.resolution.Redshift.description=The resolution in redshift (unitless) or Doppler velocity (km/s) in the data object.
-datasetfieldtype.coverage.RedshiftValue.description=The value of the redshift (unitless) or Doppler velocity (km/s in the data object.
-datasetfieldtype.coverage.Redshift.MinimumValue.description=The minimum value of the redshift (unitless) or Doppler velocity (km/s in the data object.
-datasetfieldtype.coverage.Redshift.MaximumValue.description=The maximum value of the redshift (unitless) or Doppler velocity (km/s in the data object.
+datasetfieldtype.coverage.RedshiftValue.description=The value of the redshift (unitless) or Doppler velocity (km/s) in the data object.
+datasetfieldtype.coverage.Redshift.MinimumValue.description=The minimum value of the redshift (unitless) or Doppler velocity (km/s) in the data object.
+datasetfieldtype.coverage.Redshift.MaximumValue.description=The maximum value of the redshift (unitless) or Doppler velocity (km/s) in the data object.
 datasetfieldtype.astroType.watermark=
 datasetfieldtype.astroFacility.watermark=
 datasetfieldtype.astroInstrument.watermark=
@@ -101,4 +102,4 @@ controlledvocabulary.astroType.observation=Observation
 controlledvocabulary.astroType.object=Object
 controlledvocabulary.astroType.value=Value
 controlledvocabulary.astroType.valuepair=ValuePair
-controlledvocabulary.astroType.survey=Survey
\ No newline at end of file
+controlledvocabulary.astroType.survey=Survey
diff --git a/src/main/java/propertyFiles/biomedical.properties b/src/main/java/propertyFiles/biomedical.properties
index c3fd3f81bc7..7392ba823c4 100644
--- a/src/main/java/propertyFiles/biomedical.properties
+++ b/src/main/java/propertyFiles/biomedical.properties
@@ -1,31 +1,44 @@
 metadatablock.name=biomedical
 metadatablock.displayName=Life Sciences Metadata
+metadatablock.displayFacet=Life Sciences
 datasetfieldtype.studyDesignType.title=Design Type
+datasetfieldtype.studyOtherDesignType.title=Other Design Type
 datasetfieldtype.studyFactorType.title=Factor Type
+datasetfieldtype.studyOtherFactorType.title=Other Factor Type
 datasetfieldtype.studyAssayOrganism.title=Organism
 datasetfieldtype.studyAssayOtherOrganism.title=Other Organism
 datasetfieldtype.studyAssayMeasurementType.title=Measurement Type
 datasetfieldtype.studyAssayOtherMeasurmentType.title=Other Measurement Type
 datasetfieldtype.studyAssayTechnologyType.title=Technology Type
+datasetfieldtype.studyAssayOtherTechnologyType.title=Other Technology Type
 datasetfieldtype.studyAssayPlatform.title=Technology Platform
+datasetfieldtype.studyAssayOtherPlatform.title=Other Technology Platform
 datasetfieldtype.studyAssayCellType.title=Cell Type
 datasetfieldtype.studyDesignType.description=Design types that are based on the overall experimental design.
+datasetfieldtype.studyOtherDesignType.description=If Other was selected in Design Type, list any other design types that were used in this Dataset.
 datasetfieldtype.studyFactorType.description=Factors used in the Dataset.
+datasetfieldtype.studyOtherFactorType.description=If Other was selected in Factor Type, list any other factor types that were used in this Dataset.
 datasetfieldtype.studyAssayOrganism.description=The taxonomic name of the organism used in the Dataset or from which the  starting biological material derives.
 datasetfieldtype.studyAssayOtherOrganism.description=If Other was selected in Organism, list any other organisms that were used in this Dataset. Terms from the NCBI Taxonomy are recommended.
 datasetfieldtype.studyAssayMeasurementType.description=A term to qualify the endpoint, or what is being measured (e.g. gene expression profiling; protein identification).
 datasetfieldtype.studyAssayOtherMeasurmentType.description=If Other was selected in Measurement Type, list any other measurement types that were used. Terms from NCBO Bioportal are recommended.
 datasetfieldtype.studyAssayTechnologyType.description=A term to identify the technology used to perform the measurement (e.g. DNA microarray; mass spectrometry).
+datasetfieldtype.studyAssayOtherTechnologyType.description=If Other was selected in Technology Type, list any other technology types that were used in this Dataset.
 datasetfieldtype.studyAssayPlatform.description=The manufacturer and name of the technology platform used in the assay (e.g. Bruker AVANCE).
+datasetfieldtype.studyAssayOtherPlatform.description=If Other was selected in Technology Platform, list any other technology platforms that were used in this Dataset.
 datasetfieldtype.studyAssayCellType.description=The name of the cell line from which the source or sample derives.
 datasetfieldtype.studyDesignType.watermark=
+datasetfieldtype.studyOtherDesignType.watermark=
 datasetfieldtype.studyFactorType.watermark=
+datasetfieldtype.studyOtherFactorType.watermark=
 datasetfieldtype.studyAssayOrganism.watermark=
 datasetfieldtype.studyAssayOtherOrganism.watermark=
 datasetfieldtype.studyAssayMeasurementType.watermark=
 datasetfieldtype.studyAssayOtherMeasurmentType.watermark=
 datasetfieldtype.studyAssayTechnologyType.watermark=
+datasetfieldtype.studyAssayOtherTechnologyType.watermark=
 datasetfieldtype.studyAssayPlatform.watermark=
+datasetfieldtype.studyAssayOtherPlatform.watermark=
 datasetfieldtype.studyAssayCellType.watermark=
 controlledvocabulary.studyDesignType.case_control=Case Control
 controlledvocabulary.studyDesignType.cross_sectional=Cross Sectional
@@ -36,6 +49,7 @@ controlledvocabulary.studyDesignType.parallel_group_design=Parallel Group Design
 controlledvocabulary.studyDesignType.perturbation_design=Perturbation Design
 controlledvocabulary.studyDesignType.randomized_controlled_trial=Randomized Controlled Trial
 controlledvocabulary.studyDesignType.technological_design=Technological Design
+controlledvocabulary.studyDesignType.other=Other
 controlledvocabulary.studyFactorType.age=Age
 controlledvocabulary.studyFactorType.biomarkers=Biomarkers
 controlledvocabulary.studyFactorType.cell_surface_markers=Cell Surface Markers
@@ -82,7 +96,6 @@ controlledvocabulary.studyAssayMeasurementType.targeted_sequencing=targeted sequ
 controlledvocabulary.studyAssayMeasurementType.transcription_factor_binding_(chip-seq)=transcription factor binding (ChIP-Seq)
 controlledvocabulary.studyAssayMeasurementType.transcription_factor_binding_site_identification=transcription factor binding site identification
 controlledvocabulary.studyAssayMeasurementType.transcription_profiling=transcription profiling
-controlledvocabulary.studyAssayMeasurementType.transcription_profiling=transcription profiling
 controlledvocabulary.studyAssayMeasurementType.transcription_profiling_(microarray)=transcription profiling (Microarray)
 controlledvocabulary.studyAssayMeasurementType.transcription_profiling_(rna-seq)=transcription profiling (RNA-Seq)
 controlledvocabulary.studyAssayMeasurementType.trap_translational_profiling=TRAP translational profiling
@@ -308,4 +321,4 @@ controlledvocabulary.studyAssayPlatform.xevo_g2_qtof_(waters)=Xevo G2 QTOF (Wate
 controlledvocabulary.studyAssayPlatform.xevo_qtof_ms_(waters)=Xevo QTof MS (Waters)
 controlledvocabulary.studyAssayPlatform.xevo_tq_ms_(waters)=Xevo TQ MS (Waters)
 controlledvocabulary.studyAssayPlatform.xevo_tq-s_(waters)=Xevo TQ-S (Waters)
-controlledvocabulary.studyAssayPlatform.other=Other
\ No newline at end of file
+controlledvocabulary.studyAssayPlatform.other=Other
diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties
index 8f3d8b109f2..00f25740a19 100644
--- a/src/main/java/propertyFiles/citation.properties
+++ b/src/main/java/propertyFiles/citation.properties
@@ -1,18 +1,19 @@
 metadatablock.name=citation
 metadatablock.displayName=Citation Metadata
+metadatablock.displayFacet=Citation
 datasetfieldtype.title.title=Title
 datasetfieldtype.subtitle.title=Subtitle
 datasetfieldtype.alternativeTitle.title=Alternative Title
 datasetfieldtype.alternativeURL.title=Alternative URL
-datasetfieldtype.otherId.title=Other ID
+datasetfieldtype.otherId.title=Other Identifier
 datasetfieldtype.otherIdAgency.title=Agency
 datasetfieldtype.otherIdValue.title=Identifier
 datasetfieldtype.author.title=Author
 datasetfieldtype.authorName.title=Name
 datasetfieldtype.authorAffiliation.title=Affiliation
-datasetfieldtype.authorIdentifierScheme.title=Identifier Scheme
+datasetfieldtype.authorIdentifierScheme.title=Identifier Type
 datasetfieldtype.authorIdentifier.title=Identifier
-datasetfieldtype.datasetContact.title=Contact
+datasetfieldtype.datasetContact.title=Point of Contact
 datasetfieldtype.datasetContactName.title=Name
 datasetfieldtype.datasetContactAffiliation.title=Affiliation
 datasetfieldtype.datasetContactEmail.title=E-mail
@@ -21,50 +22,52 @@ datasetfieldtype.dsDescriptionValue.title=Text
 datasetfieldtype.dsDescriptionDate.title=Date
 datasetfieldtype.subject.title=Subject
 datasetfieldtype.keyword.title=Keyword
+datasetfieldtype.keywordTermURI.title=Term URI
 datasetfieldtype.keywordValue.title=Term
-datasetfieldtype.keywordVocabulary.title=Vocabulary
-datasetfieldtype.keywordVocabularyURI.title=Vocabulary URL
+datasetfieldtype.keywordVocabulary.title=Controlled Vocabulary Name
+datasetfieldtype.keywordVocabularyURI.title=Controlled Vocabulary URL
 datasetfieldtype.topicClassification.title=Topic Classification
 datasetfieldtype.topicClassValue.title=Term
-datasetfieldtype.topicClassVocab.title=Vocabulary
-datasetfieldtype.topicClassVocabURI.title=Vocabulary URL
+datasetfieldtype.topicClassVocab.title=Controlled Vocabulary Name
+datasetfieldtype.topicClassVocabURI.title=Controlled Vocabulary URL
 datasetfieldtype.publication.title=Related Publication
+datasetfieldtype.publicationRelationType.title=Relation Type
 datasetfieldtype.publicationCitation.title=Citation
-datasetfieldtype.publicationIDType.title=ID Type
-datasetfieldtype.publicationIDNumber.title=ID Number
+datasetfieldtype.publicationIDType.title=Identifier Type
+datasetfieldtype.publicationIDNumber.title=Identifier
 datasetfieldtype.publicationURL.title=URL
 datasetfieldtype.notesText.title=Notes
 datasetfieldtype.language.title=Language
 datasetfieldtype.producer.title=Producer
 datasetfieldtype.producerName.title=Name
 datasetfieldtype.producerAffiliation.title=Affiliation
-datasetfieldtype.producerAbbreviation.title=Abbreviation
+datasetfieldtype.producerAbbreviation.title=Abbreviated Name
 datasetfieldtype.producerURL.title=URL
 datasetfieldtype.producerLogoURL.title=Logo URL
 datasetfieldtype.productionDate.title=Production Date
-datasetfieldtype.productionPlace.title=Production Place
+datasetfieldtype.productionPlace.title=Production Location
 datasetfieldtype.contributor.title=Contributor
 datasetfieldtype.contributorType.title=Type
 datasetfieldtype.contributorName.title=Name
-datasetfieldtype.grantNumber.title=Grant Information
-datasetfieldtype.grantNumberAgency.title=Grant Agency
-datasetfieldtype.grantNumberValue.title=Grant Number
+datasetfieldtype.grantNumber.title=Funding Information
+datasetfieldtype.grantNumberAgency.title=Agency
+datasetfieldtype.grantNumberValue.title=Identifier
 datasetfieldtype.distributor.title=Distributor
 datasetfieldtype.distributorName.title=Name
 datasetfieldtype.distributorAffiliation.title=Affiliation
-datasetfieldtype.distributorAbbreviation.title=Abbreviation
+datasetfieldtype.distributorAbbreviation.title=Abbreviated Name
 datasetfieldtype.distributorURL.title=URL
 datasetfieldtype.distributorLogoURL.title=Logo URL
 datasetfieldtype.distributionDate.title=Distribution Date
 datasetfieldtype.depositor.title=Depositor
 datasetfieldtype.dateOfDeposit.title=Deposit Date
-datasetfieldtype.timePeriodCovered.title=Time Period Covered
-datasetfieldtype.timePeriodCoveredStart.title=Start
-datasetfieldtype.timePeriodCoveredEnd.title=End
+datasetfieldtype.timePeriodCovered.title=Time Period
+datasetfieldtype.timePeriodCoveredStart.title=Start Date
+datasetfieldtype.timePeriodCoveredEnd.title=End Date
 datasetfieldtype.dateOfCollection.title=Date of Collection
-datasetfieldtype.dateOfCollectionStart.title=Start
-datasetfieldtype.dateOfCollectionEnd.title=End
-datasetfieldtype.kindOfData.title=Kind of Data
+datasetfieldtype.dateOfCollectionStart.title=Start Date
+datasetfieldtype.dateOfCollectionEnd.title=End Date
+datasetfieldtype.kindOfData.title=Data Type
 datasetfieldtype.series.title=Series
 datasetfieldtype.seriesName.title=Name
 datasetfieldtype.seriesInformation.title=Information
@@ -72,147 +75,151 @@ datasetfieldtype.software.title=Software
 datasetfieldtype.softwareName.title=Name
 datasetfieldtype.softwareVersion.title=Version
 datasetfieldtype.relatedMaterial.title=Related Material
-datasetfieldtype.relatedDatasets.title=Related Datasets
-datasetfieldtype.otherReferences.title=Other References
-datasetfieldtype.dataSources.title=Data Sources
-datasetfieldtype.originOfSources.title=Origin of Sources
-datasetfieldtype.characteristicOfSources.title=Characteristic of Sources Noted
+datasetfieldtype.relatedDatasets.title=Related Dataset
+datasetfieldtype.otherReferences.title=Other Reference
+datasetfieldtype.dataSources.title=Data Source
+datasetfieldtype.originOfSources.title=Origin of Historical Sources
+datasetfieldtype.characteristicOfSources.title=Characteristic of Sources
 datasetfieldtype.accessToSources.title=Documentation and Access to Sources
-datasetfieldtype.title.description=Full title by which the Dataset is known.
-datasetfieldtype.subtitle.description=A secondary title used to amplify or state certain limitations on the main title.
-datasetfieldtype.alternativeTitle.description=A title by which the work is commonly referred, or an abbreviation of the title.
-datasetfieldtype.alternativeURL.description=A URL where the dataset can be viewed, such as a personal or project website.
-datasetfieldtype.otherId.description=Another unique identifier that identifies this Dataset (e.g., producer's or another repository's number).
-datasetfieldtype.otherIdAgency.description=Name of agency which generated this identifier.
-datasetfieldtype.otherIdValue.description=Other identifier that corresponds to this Dataset.
-datasetfieldtype.author.description=The person(s), corporate body(ies), or agency(ies) responsible for creating the work.
-datasetfieldtype.authorName.description=The author's Family Name, Given Name or the name of the organization responsible for this Dataset.
-datasetfieldtype.authorAffiliation.description=The organization with which the author is affiliated.
-datasetfieldtype.authorIdentifierScheme.description=Name of the identifier scheme (ORCID, ISNI).
-datasetfieldtype.authorIdentifier.description=Uniquely identifies an individual author or organization, according to various schemes.
-datasetfieldtype.datasetContact.description=The contact(s) for this Dataset.
-datasetfieldtype.datasetContactName.description=The contact's Family Name, Given Name or the name of the organization.
-datasetfieldtype.datasetContactAffiliation.description=The organization with which the contact is affiliated.
-datasetfieldtype.datasetContactEmail.description=The e-mail address(es) of the contact(s) for the Dataset. This will not be displayed.
-datasetfieldtype.dsDescription.description=A summary describing the purpose, nature, and scope of the Dataset.
-datasetfieldtype.dsDescriptionValue.description=A summary describing the purpose, nature, and scope of the Dataset.
-datasetfieldtype.dsDescriptionDate.description=In cases where a Dataset contains more than one description (for example, one might be supplied by the data producer and another prepared by the data repository where the data are deposited), the date attribute is used to distinguish between the two descriptions. The date attribute follows the ISO convention of YYYY-MM-DD.
-datasetfieldtype.subject.description=Domain-specific Subject Categories that are topically relevant to the Dataset.
-datasetfieldtype.keyword.description=Key terms that describe important aspects of the Dataset.
-datasetfieldtype.keywordValue.description=Key terms that describe important aspects of the Dataset. Can be used for building keyword indexes and for classification and retrieval purposes. A controlled vocabulary can be employed. The vocab attribute is provided for specification of the controlled vocabulary in use, such as LCSH, MeSH, or others. The vocabURI attribute specifies the location for the full controlled vocabulary.
-datasetfieldtype.keywordVocabulary.description=For the specification of the keyword controlled vocabulary in use, such as LCSH, MeSH, or others.
-datasetfieldtype.keywordVocabularyURI.description=Keyword vocabulary URL points to the web presence that describes the keyword vocabulary, if appropriate. Enter an absolute URL where the keyword vocabulary web site is found, such as http://www.my.org.
-datasetfieldtype.topicClassification.description=The classification field indicates the broad important topic(s) and subjects that the data cover. Library of Congress subject terms may be used here.
-datasetfieldtype.topicClassValue.description=Topic or Subject term that is relevant to this Dataset.
-datasetfieldtype.topicClassVocab.description=Provided for specification of the controlled vocabulary in use, e.g., LCSH, MeSH, etc.
-datasetfieldtype.topicClassVocabURI.description=Specifies the URL location for the full controlled vocabulary.
-datasetfieldtype.publication.description=Publications that use the data from this Dataset.
-datasetfieldtype.publicationCitation.description=The full bibliographic citation for this related publication.
-datasetfieldtype.publicationIDType.description=The type of digital identifier used for this publication (e.g., Digital Object Identifier (DOI)).
-datasetfieldtype.publicationIDNumber.description=The identifier for the selected ID type.
-datasetfieldtype.publicationURL.description=Link to the publication web page (e.g., journal article page, archive record page, or other).
-datasetfieldtype.notesText.description=Additional important information about the Dataset.
-datasetfieldtype.language.description=Language of the Dataset
-datasetfieldtype.producer.description=Person or organization with the financial or administrative responsibility over this Dataset
-datasetfieldtype.producerName.description=Producer name
-datasetfieldtype.producerAffiliation.description=The organization with which the producer is affiliated.
-datasetfieldtype.producerAbbreviation.description=The abbreviation by which the producer is commonly known. (ex. IQSS, ICPSR)
-datasetfieldtype.producerURL.description=Producer URL points to the producer's web presence, if appropriate. Enter an absolute URL where the producer's web site is found, such as http://www.my.org.
-datasetfieldtype.producerLogoURL.description=URL for the producer's logo, which points to this  producer's web-accessible logo image. Enter an absolute URL where the producer's logo image is found, such as http://www.my.org/images/logo.gif.
-datasetfieldtype.productionDate.description=Date when the data collection or other materials were produced (not distributed, published or archived).
-datasetfieldtype.productionPlace.description=The location where the data collection and any other related materials were produced.
-datasetfieldtype.contributor.description=The organization or person responsible for either collecting, managing, or otherwise contributing in some form to the development of the resource.
-datasetfieldtype.contributorType.description=The type of contributor of the  resource.
-datasetfieldtype.contributorName.description=The Family Name, Given Name or organization name of the contributor.
-datasetfieldtype.grantNumber.description=Grant Information
-datasetfieldtype.grantNumberAgency.description=Grant Number Agency
-datasetfieldtype.grantNumberValue.description=The grant or contract number of the project that  sponsored the effort.
-datasetfieldtype.distributor.description=The organization designated by the author or producer to generate copies of the particular work including any necessary editions or revisions.
-datasetfieldtype.distributorName.description=Distributor name
-datasetfieldtype.distributorAffiliation.description=The organization with which the distributor contact is affiliated.
-datasetfieldtype.distributorAbbreviation.description=The abbreviation by which this distributor is commonly known (e.g., IQSS, ICPSR).
-datasetfieldtype.distributorURL.description=Distributor URL points to the distributor's web presence, if appropriate. Enter an absolute URL where the distributor's web site is found, such as http://www.my.org.
-datasetfieldtype.distributorLogoURL.description=URL of the distributor's logo, which points to this  distributor's web-accessible logo image. Enter an absolute URL where the distributor's logo image is found, such as http://www.my.org/images/logo.gif.
-datasetfieldtype.distributionDate.description=Date that the work was made available for distribution/presentation.
-datasetfieldtype.depositor.description=The person (Family Name, Given Name) or the name of the organization that deposited this Dataset to the repository.
-datasetfieldtype.dateOfDeposit.description=Date that the Dataset was deposited into the repository.
-datasetfieldtype.timePeriodCovered.description=Time period to which the data refer. This item reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected. Also known as span.
-datasetfieldtype.timePeriodCoveredStart.description=Start date which reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected.
-datasetfieldtype.timePeriodCoveredEnd.description=End date which reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected.
-datasetfieldtype.dateOfCollection.description=Contains the date(s) when the data were collected.
-datasetfieldtype.dateOfCollectionStart.description=Date when the data collection started.
-datasetfieldtype.dateOfCollectionEnd.description=Date when the data collection ended.
-datasetfieldtype.kindOfData.description=Type of data included in the file: survey data, census/enumeration data, aggregate data, clinical data, event/transaction data, program source code, machine-readable text, administrative records data, experimental data, psychological test, textual data, coded textual, coded documents, time budget diaries, observation data/ratings, process-produced data, or other.
-datasetfieldtype.series.description=Information about the Dataset series.
-datasetfieldtype.seriesName.description=Name of the dataset series to which the Dataset belongs.
-datasetfieldtype.seriesInformation.description=History of the series and summary of those features that apply to the series as a whole.
-datasetfieldtype.software.description=Information about the software used to generate the Dataset.
-datasetfieldtype.softwareName.description=Name of software used to generate the Dataset.
-datasetfieldtype.softwareVersion.description=Version of the software used to generate the Dataset.
-datasetfieldtype.relatedMaterial.description=Any material related to this Dataset.
-datasetfieldtype.relatedDatasets.description=Any Datasets that are related to this Dataset, such as previous research on this subject.
-datasetfieldtype.otherReferences.description=Any references that would serve as background or supporting material to this Dataset.
-datasetfieldtype.dataSources.description=List of books, articles, serials, or machine-readable data files that served as the sources of the data collection.
-datasetfieldtype.originOfSources.description=For historical materials, information about the origin of the sources and the rules followed in establishing the sources should be specified.
-datasetfieldtype.characteristicOfSources.description=Assessment of characteristics and source material.
-datasetfieldtype.accessToSources.description=Level of documentation of the original sources.
-datasetfieldtype.title.watermark=Enter title...
+datasetfieldtype.title.description=The main title of the Dataset
+datasetfieldtype.subtitle.description=A secondary title that amplifies or states certain limitations on the main title
+datasetfieldtype.alternativeTitle.description=Either 1) a title commonly used to refer to the Dataset or 2) an abbreviation of the main title
+datasetfieldtype.alternativeURL.description=Another URL where one can view or access the data in the Dataset, e.g. a project or personal webpage
+datasetfieldtype.otherId.description=Another unique identifier for the Dataset (e.g. producer's or another repository's identifier)
+datasetfieldtype.otherIdAgency.description=The name of the agency that generated the other identifier
+datasetfieldtype.otherIdValue.description=Another identifier uniquely identifies the Dataset
+datasetfieldtype.author.description=The entity, e.g. a person or organization, that created the Dataset
+datasetfieldtype.authorName.description=The name of the author, such as the person's name or the name of an organization
+datasetfieldtype.authorAffiliation.description=The name of the entity affiliated with the author, e.g. an organization's name
+datasetfieldtype.authorIdentifierScheme.description=The type of identifier that uniquely identifies the author (e.g. ORCID, ISNI)
+datasetfieldtype.authorIdentifier.description=Uniquely identifies the author when paired with an identifier type
+datasetfieldtype.datasetContact.description=The entity, e.g. a person or organization, that users of the Dataset can contact with questions
+datasetfieldtype.datasetContactName.description=The name of the point of contact, e.g. the person's name or the name of an organization
+datasetfieldtype.datasetContactAffiliation.description=The name of the entity affiliated with the point of contact, e.g. an organization's name
+datasetfieldtype.datasetContactEmail.description=The point of contact's email address
+datasetfieldtype.dsDescription.description=A summary describing the purpose, nature, and scope of the Dataset
+datasetfieldtype.dsDescriptionValue.description=A summary describing the purpose, nature, and scope of the Dataset
+datasetfieldtype.dsDescriptionDate.description=The date when the description was added to the Dataset. If the Dataset contains more than one description, e.g. the data producer supplied one description and the data repository supplied another, this date is used to distinguish between the descriptions
+datasetfieldtype.subject.description=The area of study relevant to the Dataset
+datasetfieldtype.keyword.description=A key term that describes an important aspect of the Dataset and information about any controlled vocabulary used
+datasetfieldtype.keywordTermURI.description=A URI that points to the web presence of the Keyword Term
+datasetfieldtype.keywordValue.description=A key term that describes important aspects of the Dataset
+datasetfieldtype.keywordVocabulary.description=The controlled vocabulary used for the keyword term (e.g. LCSH, MeSH)
+datasetfieldtype.keywordVocabularyURI.description=The URL where one can access information about the term's controlled vocabulary
+datasetfieldtype.topicClassification.description=Indicates a broad, important topic or subject that the Dataset covers and information about any controlled vocabulary used
+datasetfieldtype.topicClassValue.description=A topic or subject term
+datasetfieldtype.topicClassVocab.description=The controlled vocabulary used for the keyword term (e.g. LCSH, MeSH)
+datasetfieldtype.topicClassVocabURI.description=The URL where one can access information about the term's controlled vocabulary
+datasetfieldtype.publication.description=The article or report that uses the data in the Dataset. The full list of related publications will be displayed on the metadata tab
+datasetfieldtype.publicationRelationType.description=The nature of the relationship between this Dataset and the related publication
+datasetfieldtype.publicationCitation.description=The full bibliographic citation for the related publication
+datasetfieldtype.publicationIDType.description=The type of identifier that uniquely identifies a related publication
+datasetfieldtype.publicationIDNumber.description=The identifier for a related publication
+datasetfieldtype.publicationURL.description=The URL form of the identifier entered in the Identifier field, e.g. the DOI URL if a DOI was entered in the Identifier field. Used to display what was entered in the ID Type and ID Number fields as a link. If what was entered in the Identifier field has no URL form, the URL of the publication webpage is used, e.g. a journal article webpage
+datasetfieldtype.notesText.description=Additional information about the Dataset
+datasetfieldtype.language.description=A language that the Dataset's files is written in
+datasetfieldtype.producer.description=The entity, such a person or organization, managing the finances or other administrative processes involved in the creation of the Dataset
+datasetfieldtype.producerName.description=The name of the entity, e.g. the person's name or the name of an organization
+datasetfieldtype.producerAffiliation.description=The name of the entity affiliated with the producer, e.g. an organization's name
+datasetfieldtype.producerAbbreviation.description=The producer's abbreviated name (e.g. IQSS, ICPSR)
+datasetfieldtype.producerURL.description=The URL of the producer's website
+datasetfieldtype.producerLogoURL.description=The URL of the producer's logo
+datasetfieldtype.productionDate.description=The date when the data were produced (not distributed, published, or archived)
+datasetfieldtype.productionPlace.description=The location where the data and any related materials were produced or collected
+datasetfieldtype.contributor.description=The entity, such as a person or organization, responsible for collecting, managing, or otherwise contributing to the development of the Dataset
+datasetfieldtype.contributorType.description=Indicates the type of contribution made to the dataset
+datasetfieldtype.contributorName.description=The name of the contributor, e.g. the person's name or the name of an organization
+datasetfieldtype.grantNumber.description=Information about the Dataset's financial support
+datasetfieldtype.grantNumberAgency.description=The agency that provided financial support for the Dataset
+datasetfieldtype.grantNumberValue.description=The grant identifier or contract identifier of the agency that provided financial support for the Dataset
+datasetfieldtype.distributor.description=The entity, such as a person or organization, designated to generate copies of the Dataset, including any editions or revisions
+datasetfieldtype.distributorName.description=The name of the entity, e.g. the person's name or the name of an organization
+datasetfieldtype.distributorAffiliation.description=The name of the entity affiliated with the distributor, e.g. an organization's name
+datasetfieldtype.distributorAbbreviation.description=The distributor's abbreviated name (e.g. IQSS, ICPSR)
+datasetfieldtype.distributorURL.description=The URL of the distributor's webpage
+datasetfieldtype.distributorLogoURL.description=The URL of the distributor's logo image, used to show the image on the Dataset's page
+datasetfieldtype.distributionDate.description=The date when the Dataset was made available for distribution/presentation
+datasetfieldtype.depositor.description=The entity, such as a person or organization, that deposited the Dataset in the repository
+datasetfieldtype.dateOfDeposit.description=The date when the Dataset was deposited into the repository
+datasetfieldtype.timePeriodCovered.description=The time period that the data refer to. Also known as span. This is the time period covered by the data, not the dates of coding, collecting data, or making documents machine-readable
+datasetfieldtype.timePeriodCoveredStart.description=The start date of the time period that the data refer to
+datasetfieldtype.timePeriodCoveredEnd.description=The end date of the time period that the data refer to
+datasetfieldtype.dateOfCollection.description=The dates when the data were collected or generated
+datasetfieldtype.dateOfCollectionStart.description=The date when the data collection started
+datasetfieldtype.dateOfCollectionEnd.description=The date when the data collection ended
+datasetfieldtype.kindOfData.description=The type of data included in the files (e.g. survey data, clinical data, or machine-readable text)
+datasetfieldtype.series.description=Information about the dataset series to which the Dataset belong
+datasetfieldtype.seriesName.description=The name of the dataset series
+datasetfieldtype.seriesInformation.description=Can include 1) a history of the series and 2) a summary of features that apply to the series
+datasetfieldtype.software.description=Information about the software used to generate the Dataset
+datasetfieldtype.softwareName.description=The name of software used to generate the Dataset
+datasetfieldtype.softwareVersion.description=The version of the software used to generate the Dataset, e.g. 4.11
+datasetfieldtype.relatedMaterial.description=Information, such as a persistent ID or citation, about the material related to the Dataset, such as appendices or sampling information available outside of the Dataset
+datasetfieldtype.relatedDatasets.description=Information, such as a persistent ID or citation, about a related dataset, such as previous research on the Dataset's subject
+datasetfieldtype.otherReferences.description=Information, such as a persistent ID or citation, about another type of resource that provides background or supporting material to the Dataset
+datasetfieldtype.dataSources.description=Information, such as a persistent ID or citation, about sources of the Dataset (e.g. a book, article, serial, or machine-readable data file)
+datasetfieldtype.originOfSources.description=For historical sources, the origin and any rules followed in establishing them as sources
+datasetfieldtype.characteristicOfSources.description=Characteristics not already noted elsewhere
+datasetfieldtype.accessToSources.description=1) Methods or procedures for accessing data sources and 2) any special permissions needed for access
+datasetfieldtype.title.watermark=
 datasetfieldtype.subtitle.watermark=
 datasetfieldtype.alternativeTitle.watermark=
-datasetfieldtype.alternativeURL.watermark=Enter full URL, starting with http://
+datasetfieldtype.alternativeURL.watermark=https://
 datasetfieldtype.otherId.watermark=
 datasetfieldtype.otherIdAgency.watermark=
 datasetfieldtype.otherIdValue.watermark=
 datasetfieldtype.author.watermark=
-datasetfieldtype.authorName.watermark=FamilyName, GivenName or Organization
-datasetfieldtype.authorAffiliation.watermark=
+datasetfieldtype.authorName.watermark=1) Family Name, Given Name or 2) Organization XYZ
+datasetfieldtype.authorAffiliation.watermark=Organization XYZ
 datasetfieldtype.authorIdentifierScheme.watermark=
 datasetfieldtype.authorIdentifier.watermark=
 datasetfieldtype.datasetContact.watermark=
-datasetfieldtype.datasetContactName.watermark=FamilyName, GivenName or Organization
-datasetfieldtype.datasetContactAffiliation.watermark=
-datasetfieldtype.datasetContactEmail.watermark=
+datasetfieldtype.datasetContactName.watermark=1) FamilyName, GivenName or 2) Organization
+datasetfieldtype.datasetContactAffiliation.watermark=Organization XYZ
+datasetfieldtype.datasetContactEmail.watermark=name@email.xyz
 datasetfieldtype.dsDescription.watermark=
 datasetfieldtype.dsDescriptionValue.watermark=
 datasetfieldtype.dsDescriptionDate.watermark=YYYY-MM-DD
 datasetfieldtype.subject.watermark=
 datasetfieldtype.keyword.watermark=
+datasetfieldtype.keywordTermURI.watermark=https://
 datasetfieldtype.keywordValue.watermark=
 datasetfieldtype.keywordVocabulary.watermark=
-datasetfieldtype.keywordVocabularyURI.watermark=Enter full URL, starting with http://
+datasetfieldtype.keywordVocabularyURI.watermark=https://
 datasetfieldtype.topicClassification.watermark=
 datasetfieldtype.topicClassValue.watermark=
 datasetfieldtype.topicClassVocab.watermark=
-datasetfieldtype.topicClassVocabURI.watermark=Enter full URL, starting with http://
+datasetfieldtype.topicClassVocabURI.watermark=https://
 datasetfieldtype.publication.watermark=
+datasetfieldtype.publicationRelationType.watermark=
 datasetfieldtype.publicationCitation.watermark=
 datasetfieldtype.publicationIDType.watermark=
 datasetfieldtype.publicationIDNumber.watermark=
-datasetfieldtype.publicationURL.watermark=Enter full URL, starting with http://
+datasetfieldtype.publicationURL.watermark=https://
 datasetfieldtype.notesText.watermark=
 datasetfieldtype.language.watermark=
 datasetfieldtype.producer.watermark=
-datasetfieldtype.producerName.watermark=FamilyName, GivenName or Organization
-datasetfieldtype.producerAffiliation.watermark=
+datasetfieldtype.producerName.watermark=1) FamilyName, GivenName or 2) Organization
+datasetfieldtype.producerAffiliation.watermark=Organization XYZ
 datasetfieldtype.producerAbbreviation.watermark=
-datasetfieldtype.producerURL.watermark=Enter full URL, starting with http://
-datasetfieldtype.producerLogoURL.watermark=Enter full URL for image, starting with http://
+datasetfieldtype.producerURL.watermark=https://
+datasetfieldtype.producerLogoURL.watermark=https://
 datasetfieldtype.productionDate.watermark=YYYY-MM-DD
 datasetfieldtype.productionPlace.watermark=
 datasetfieldtype.contributor.watermark=
 datasetfieldtype.contributorType.watermark=
-datasetfieldtype.contributorName.watermark=FamilyName, GivenName or Organization
+datasetfieldtype.contributorName.watermark=1) FamilyName, GivenName or 2) Organization
 datasetfieldtype.grantNumber.watermark=
-datasetfieldtype.grantNumberAgency.watermark=
+datasetfieldtype.grantNumberAgency.watermark=Organization XYZ
 datasetfieldtype.grantNumberValue.watermark=
 datasetfieldtype.distributor.watermark=
-datasetfieldtype.distributorName.watermark=FamilyName, GivenName or Organization
-datasetfieldtype.distributorAffiliation.watermark=
+datasetfieldtype.distributorName.watermark=1) FamilyName, GivenName or 2) Organization
+datasetfieldtype.distributorAffiliation.watermark=Organization XYZ
 datasetfieldtype.distributorAbbreviation.watermark=
-datasetfieldtype.distributorURL.watermark=Enter full URL, starting with http://
-datasetfieldtype.distributorLogoURL.watermark=Enter full URL for image, starting with http://
+datasetfieldtype.distributorURL.watermark=https://
+datasetfieldtype.distributorLogoURL.watermark=https://
 datasetfieldtype.distributionDate.watermark=YYYY-MM-DD
-datasetfieldtype.depositor.watermark=
+datasetfieldtype.depositor.watermark=1) FamilyName, GivenName or 2) Organization
 datasetfieldtype.dateOfDeposit.watermark=YYYY-MM-DD
 datasetfieldtype.timePeriodCovered.watermark=
 datasetfieldtype.timePeriodCoveredStart.watermark=YYYY-MM-DD
@@ -250,6 +257,7 @@ controlledvocabulary.subject.social_sciences=Social Sciences
 controlledvocabulary.subject.other=Other
 controlledvocabulary.publicationIDType.ark=ark
 controlledvocabulary.publicationIDType.arxiv=arXiv
+controlledvocabulary.publicationIDType.cstr=cstr
 controlledvocabulary.publicationIDType.bibcode=bibcode
 controlledvocabulary.publicationIDType.doi=doi
 controlledvocabulary.publicationIDType.ean13=ean13
@@ -265,6 +273,13 @@ controlledvocabulary.publicationIDType.purl=purl
 controlledvocabulary.publicationIDType.upc=upc
 controlledvocabulary.publicationIDType.url=url
 controlledvocabulary.publicationIDType.urn=urn
+controlledvocabulary.publicationIDType.dash-nrs=DASH-NRS
+controlledvocabulary.publicationRelationType.iscitedby=Is Cited By
+controlledvocabulary.publicationRelationType.cites=Cites
+controlledvocabulary.publicationRelationType.issupplementto=Is Supplement To
+controlledvocabulary.publicationRelationType.issupplementedby=Is Supplemented By
+controlledvocabulary.publicationRelationType.isreferencedby=Is Referenced By
+controlledvocabulary.publicationRelationType.references=References
 controlledvocabulary.contributorType.data_collector=Data Collector
 controlledvocabulary.contributorType.data_curator=Data Curator
 controlledvocabulary.contributorType.data_manager=Data Manager
@@ -283,193 +298,7927 @@ controlledvocabulary.contributorType.supervisor=Supervisor
 controlledvocabulary.contributorType.work_package_leader=Work Package Leader
 controlledvocabulary.contributorType.other=Other
 controlledvocabulary.authorIdentifierScheme.orcid=ORCID
+controlledvocabulary.authorIdentifierScheme.ror=ROR
 controlledvocabulary.authorIdentifierScheme.isni=ISNI
 controlledvocabulary.authorIdentifierScheme.lcna=LCNA
 controlledvocabulary.authorIdentifierScheme.viaf=VIAF
 controlledvocabulary.authorIdentifierScheme.gnd=GND
-controlledvocabulary.language.abkhaz=Abkhaz
+controlledvocabulary.authorIdentifierScheme.dai=DAI
+controlledvocabulary.authorIdentifierScheme.researcherid=ResearcherID
+controlledvocabulary.authorIdentifierScheme.scopusid=ScopusID
+controlledvocabulary.language.'are'are='Are'are
+controlledvocabulary.language.'auhelawa='Auhelawa
+controlledvocabulary.language.a'ou=A'ou
+controlledvocabulary.language.a-pucikwar=A-Pucikwar
+controlledvocabulary.language.aari=Aari
+controlledvocabulary.language.aasax=AasÃĄx
+controlledvocabulary.language.abadi=Abadi
+controlledvocabulary.language.abaga=Abaga
+controlledvocabulary.language.abai_sungai=Abai Sungai
+controlledvocabulary.language.abanyom=Abanyom
+controlledvocabulary.language.abar=Abar
+controlledvocabulary.language.abau=Abau
+controlledvocabulary.language.abaza=Abaza
+controlledvocabulary.language.abellen_ayta=Abellen Ayta
+controlledvocabulary.language.abidji=Abidji
+controlledvocabulary.language.abinomn=Abinomn
+controlledvocabulary.language.abipon=Abipon
+controlledvocabulary.language.abishira=Abishira
+controlledvocabulary.language.abkhaz=Abkhaz, Abkhazian
+controlledvocabulary.language.abom=Abom
+controlledvocabulary.language.abon=Abon
+controlledvocabulary.language.abron=Abron
+controlledvocabulary.language.abu=Abu
+controlledvocabulary.language.abu'_arapesh=Abu' Arapesh
+controlledvocabulary.language.abua=Abua
+controlledvocabulary.language.abui=Abui
+controlledvocabulary.language.abun=Abun
+controlledvocabulary.language.abure=Abure
+controlledvocabulary.language.abureni=Abureni
+controlledvocabulary.language.abe=AbÊ
+controlledvocabulary.language.acatepec_me'phaa=Acatepec Me'phaa
+controlledvocabulary.language.achagua=Achagua
+controlledvocabulary.language.achang=Achang
+controlledvocabulary.language.ache=Ache
+controlledvocabulary.language.acheron=Acheron
+controlledvocabulary.language.achi=Achi
+controlledvocabulary.language.achinese=Achinese
+controlledvocabulary.language.achterhoeks=Achterhoeks
+controlledvocabulary.language.achuar-shiwiar=Achuar-Shiwiar
+controlledvocabulary.language.achumawi=Achumawi
+controlledvocabulary.language.acoli=Acoli
+controlledvocabulary.language.acroa=AcroÃĄ
+controlledvocabulary.language.adai=Adai
+controlledvocabulary.language.adamawa_fulfulde=Adamawa Fulfulde
+controlledvocabulary.language.adamorobe_sign_language=Adamorobe Sign Language
+controlledvocabulary.language.adang=Adang
+controlledvocabulary.language.adangbe=Adangbe
+controlledvocabulary.language.adangme=Adangme
+controlledvocabulary.language.adara=Adara
+controlledvocabulary.language.adasen=Adasen
+controlledvocabulary.language.adele=Adele
+controlledvocabulary.language.adhola=Adhola
+controlledvocabulary.language.adi=Adi
+controlledvocabulary.language.adilabad_gondi=Adilabad Gondi
+controlledvocabulary.language.adioukrou=Adioukrou
+controlledvocabulary.language.adithinngithigh=Adithinngithigh
+controlledvocabulary.language.adivasi_oriya=Adivasi Oriya
+controlledvocabulary.language.adiwasi_garasia=Adiwasi Garasia
+controlledvocabulary.language.adnyamathanha=Adnyamathanha
+controlledvocabulary.language.adonara=Adonara
+controlledvocabulary.language.aduge=Aduge
+controlledvocabulary.language.adyghe=Adyghe
+controlledvocabulary.language.adzera=Adzera
+controlledvocabulary.language.aeka=Aeka
+controlledvocabulary.language.aekyom=Aekyom
+controlledvocabulary.language.aequian=Aequian
+controlledvocabulary.language.aer=Aer
+controlledvocabulary.language.afade=Afade
 controlledvocabulary.language.afar=Afar
+controlledvocabulary.language.afghan_sign_language=Afghan Sign Language
+controlledvocabulary.language.afitti=Afitti
+controlledvocabulary.language.afrihili=Afrihili
 controlledvocabulary.language.afrikaans=Afrikaans
+controlledvocabulary.language.afro-seminole_creole=Afro-Seminole Creole
+controlledvocabulary.language.agarabi=Agarabi
+controlledvocabulary.language.agariya=Agariya
+controlledvocabulary.language.agatu=Agatu
+controlledvocabulary.language.agavotaguerra=Agavotaguerra
+controlledvocabulary.language.aghem=Aghem
+controlledvocabulary.language.aghu=Aghu
+controlledvocabulary.language.aghu-tharnggala=Aghu-Tharnggala
+controlledvocabulary.language.aghul=Aghul
+controlledvocabulary.language.aghwan=Aghwan
+controlledvocabulary.language.agi=Agi
+controlledvocabulary.language.agob=Agob
+controlledvocabulary.language.agoi=Agoi
+controlledvocabulary.language.aguacateco=Aguacateco
+controlledvocabulary.language.aguano=Aguano
+controlledvocabulary.language.aguaruna=Aguaruna
+controlledvocabulary.language.aguna=Aguna
+controlledvocabulary.language.agusan_manobo=Agusan Manobo
+controlledvocabulary.language.agutaynen=Agutaynen
+controlledvocabulary.language.agwagwune=Agwagwune
+controlledvocabulary.language.ahanta=Ahanta
+controlledvocabulary.language.aheri_gondi=Aheri Gondi
+controlledvocabulary.language.aheu=Aheu
+controlledvocabulary.language.ahirani=Ahirani
+controlledvocabulary.language.ahom=Ahom
+controlledvocabulary.language.ahtena=Ahtena
+controlledvocabulary.language.ahwai=Ahwai
+controlledvocabulary.language.ai-cham=Ai-Cham
+controlledvocabulary.language.aighon=Aighon
+controlledvocabulary.language.aikana=AikanÃŖ
+controlledvocabulary.language.aiklep=Aiklep
+controlledvocabulary.language.aimaq=Aimaq
+controlledvocabulary.language.aimele=Aimele
+controlledvocabulary.language.aimol=Aimol
+controlledvocabulary.language.ainbai=Ainbai
+controlledvocabulary.language.ainu_(china)=Ainu (China)
+controlledvocabulary.language.ainu_(japan)=Ainu (Japan)
+controlledvocabulary.language.aiome=Aiome
+controlledvocabulary.language.airoran=Airoran
+controlledvocabulary.language.aiton=Aiton
+controlledvocabulary.language.aja_(benin)=Aja (Benin)
+controlledvocabulary.language.aja_(south_sudan)=Aja (South Sudan)
+controlledvocabulary.language.ajawa=Ajawa
+controlledvocabulary.language.ajie=AjiÃĢ
+controlledvocabulary.language.ajumbu=Ajumbu
+controlledvocabulary.language.ajyininka_apurucayali=Ajyíninka Apurucayali
+controlledvocabulary.language.ak=Ak
+controlledvocabulary.language.aka=Aka
+controlledvocabulary.language.aka-bea=Aka-Bea
+controlledvocabulary.language.aka-bo=Aka-Bo
+controlledvocabulary.language.aka-cari=Aka-Cari
+controlledvocabulary.language.aka-jeru=Aka-Jeru
+controlledvocabulary.language.aka-kede=Aka-Kede
+controlledvocabulary.language.aka-kol=Aka-Kol
+controlledvocabulary.language.aka-kora=Aka-Kora
 controlledvocabulary.language.akan=Akan
+controlledvocabulary.language.akar-bale=Akar-Bale
+controlledvocabulary.language.akaselem=Akaselem
+controlledvocabulary.language.akawaio=Akawaio
+controlledvocabulary.language.ake=Ake
+controlledvocabulary.language.akebu=Akebu
+controlledvocabulary.language.akei=Akei
+controlledvocabulary.language.akeu=Akeu
+controlledvocabulary.language.akha=Akha
+controlledvocabulary.language.akhvakh=Akhvakh
+controlledvocabulary.language.akkadian=Akkadian
+controlledvocabulary.language.akkala_sami=Akkala Sami
+controlledvocabulary.language.aklanon=Aklanon
+controlledvocabulary.language.akolet=Akolet
+controlledvocabulary.language.akoose=Akoose
+controlledvocabulary.language.akoye=Akoye
+controlledvocabulary.language.akpa=Akpa
+controlledvocabulary.language.akpes=Akpes
+controlledvocabulary.language.akrukay=Akrukay
+controlledvocabulary.language.akukem=Akukem
+controlledvocabulary.language.akuku=Akuku
+controlledvocabulary.language.akum=Akum
+controlledvocabulary.language.akuntsu=Akuntsu
+controlledvocabulary.language.akurio=Akurio
+controlledvocabulary.language.akwa=Akwa
+controlledvocabulary.language.akyaung_ari_naga=Akyaung Ari Naga
+controlledvocabulary.language.al-sayyid_bedouin_sign_language=Al-Sayyid Bedouin Sign Language
+controlledvocabulary.language.alaba-k'abeena=Alaba-K’abeena
+controlledvocabulary.language.alabama=Alabama
+controlledvocabulary.language.alabat_island_agta=Alabat Island Agta
+controlledvocabulary.language.alacatlatzala_mixtec=Alacatlatzala Mixtec
+controlledvocabulary.language.alago=Alago
+controlledvocabulary.language.alagwa=Alagwa
+controlledvocabulary.language.alak=Alak
+controlledvocabulary.language.alamblak=Alamblak
+controlledvocabulary.language.alangan=Alangan
+controlledvocabulary.language.alanic=Alanic
+controlledvocabulary.language.alapmunte=Alapmunte
+controlledvocabulary.language.alawa=Alawa
 controlledvocabulary.language.albanian=Albanian
+controlledvocabulary.language.albanian_sign_language=Albanian Sign Language
+controlledvocabulary.language.albarradas_sign_language=Albarradas Sign Language
+controlledvocabulary.language.alcozauca_mixtec=Alcozauca Mixtec
+controlledvocabulary.language.alege=Alege
+controlledvocabulary.language.alekano=Alekano
+controlledvocabulary.language.aleut=Aleut
+controlledvocabulary.language.algerian_arabic=Algerian Arabic
+controlledvocabulary.language.algerian_jewish_sign_language=Algerian Jewish Sign Language
+controlledvocabulary.language.algerian_saharan_arabic=Algerian Saharan Arabic
+controlledvocabulary.language.algerian_sign_language=Algerian Sign Language
+controlledvocabulary.language.algonquin=Algonquin
+controlledvocabulary.language.ali=Ali
+controlledvocabulary.language.alladian=Alladian
+controlledvocabulary.language.allar=Allar
+controlledvocabulary.language.alngith=Alngith
+controlledvocabulary.language.alo_phola=Alo Phola
+controlledvocabulary.language.alor=Alor
+controlledvocabulary.language.aloapam_zapotec=AloÃĄpam Zapotec
+controlledvocabulary.language.alsea=Alsea
+controlledvocabulary.language.alu_kurumba=Alu Kurumba
+controlledvocabulary.language.alugu=Alugu
+controlledvocabulary.language.alumu-tesu=Alumu-Tesu
+controlledvocabulary.language.alune=Alune
+controlledvocabulary.language.aluo=Aluo
+controlledvocabulary.language.alur=Alur
+controlledvocabulary.language.alutor=Alutor
+controlledvocabulary.language.alviri-vidari=Alviri-Vidari
+controlledvocabulary.language.alyawarr=Alyawarr
+controlledvocabulary.language.ama_(papua_new_guinea)=Ama (Papua New Guinea)
+controlledvocabulary.language.ama_(sudan)=Ama (Sudan)
+controlledvocabulary.language.amahai=Amahai
+controlledvocabulary.language.amahuaca=Amahuaca
+controlledvocabulary.language.amaimon=Amaimon
+controlledvocabulary.language.amal=Amal
+controlledvocabulary.language.amami_koniya_sign_language=Amami Koniya Sign Language
+controlledvocabulary.language.amanab=Amanab
+controlledvocabulary.language.amanaye=AmanayÊ
+controlledvocabulary.language.amara=Amara
+controlledvocabulary.language.amarakaeri=Amarakaeri
+controlledvocabulary.language.amarasi=Amarasi
+controlledvocabulary.language.amatlan_zapotec=AmatlÃĄn Zapotec
+controlledvocabulary.language.amba_(solomon_islands)=Amba (Solomon Islands)
+controlledvocabulary.language.amba_(uganda)=Amba (Uganda)
+controlledvocabulary.language.ambai=Ambai
+controlledvocabulary.language.ambakich=Ambakich
+controlledvocabulary.language.ambala_ayta=Ambala Ayta
+controlledvocabulary.language.ambelau=Ambelau
+controlledvocabulary.language.ambele=Ambele
+controlledvocabulary.language.amblong=Amblong
+controlledvocabulary.language.ambo=Ambo
+controlledvocabulary.language.ambo-pasco_quechua=Ambo-Pasco Quechua
+controlledvocabulary.language.ambonese_malay=Ambonese Malay
+controlledvocabulary.language.ambrak=Ambrak
+controlledvocabulary.language.ambul=Ambul
+controlledvocabulary.language.ambulas=Ambulas
+controlledvocabulary.language.amdang=Amdang
+controlledvocabulary.language.amdo_tibetan=Amdo Tibetan
+controlledvocabulary.language.amele=Amele
+controlledvocabulary.language.american_sign_language=American Sign Language
+controlledvocabulary.language.amganad_ifugao=Amganad Ifugao
 controlledvocabulary.language.amharic=Amharic
+controlledvocabulary.language.ami=Ami
+controlledvocabulary.language.amis=Amis
+controlledvocabulary.language.amo=Amo
+controlledvocabulary.language.amol=Amol
+controlledvocabulary.language.amoltepec_mixtec=Amoltepec Mixtec
+controlledvocabulary.language.ampanang=Ampanang
+controlledvocabulary.language.ampari_dogon=Ampari Dogon
+controlledvocabulary.language.amri_karbi=Amri Karbi
+controlledvocabulary.language.amto=Amto
+controlledvocabulary.language.amundava=Amundava
+controlledvocabulary.language.amurdak=Amurdak
+controlledvocabulary.language.ana_tinga_dogon=Ana Tinga Dogon
+controlledvocabulary.language.anaang=Anaang
+controlledvocabulary.language.anakalangu=Anakalangu
+controlledvocabulary.language.anal=Anal
+controlledvocabulary.language.anam=Anam
+controlledvocabulary.language.anambe=AnambÊ
+controlledvocabulary.language.anamgura=Anamgura
+controlledvocabulary.language.anasi=Anasi
+controlledvocabulary.language.ancient_greek_(to_1453)=Ancient Greek (to 1453)
+controlledvocabulary.language.ancient_hebrew=Ancient Hebrew
+controlledvocabulary.language.ancient_macedonian=Ancient Macedonian
+controlledvocabulary.language.ancient_north_arabian=Ancient North Arabian
+controlledvocabulary.language.ancient_zapotec=Ancient Zapotec
+controlledvocabulary.language.andaandi=Andaandi
+controlledvocabulary.language.andai=Andai
+controlledvocabulary.language.andajin=Andajin
+controlledvocabulary.language.andalusian_arabic=Andalusian Arabic
+controlledvocabulary.language.andaman_creole_hindi=Andaman Creole Hindi
+controlledvocabulary.language.andaqui=Andaqui
+controlledvocabulary.language.andarum=Andarum
+controlledvocabulary.language.andegerebinha=Andegerebinha
+controlledvocabulary.language.andh=Andh
+controlledvocabulary.language.andi=Andi
+controlledvocabulary.language.andio=Andio
+controlledvocabulary.language.andoa=Andoa
+controlledvocabulary.language.andoque=Andoque
+controlledvocabulary.language.andra-hus=Andra-Hus
+controlledvocabulary.language.aneityum=Aneityum
+controlledvocabulary.language.anem=Anem
+controlledvocabulary.language.aneme_wake=Aneme Wake
+controlledvocabulary.language.anfillo=Anfillo
+controlledvocabulary.language.angaataha=Angaataha
+controlledvocabulary.language.angaite=AngaitÊ
+controlledvocabulary.language.angal=Angal
+controlledvocabulary.language.angal_enen=Angal Enen
+controlledvocabulary.language.angal_heneng=Angal Heneng
+controlledvocabulary.language.angami_naga=Angami Naga
+controlledvocabulary.language.angguruk_yali=Angguruk Yali
+controlledvocabulary.language.angika=Angika
+controlledvocabulary.language.angkamuthi=Angkamuthi
+controlledvocabulary.language.anglo-norman=Anglo-Norman
+controlledvocabulary.language.angloromani=Angloromani
+controlledvocabulary.language.angolar=Angolar
+controlledvocabulary.language.angor=Angor
+controlledvocabulary.language.angoram=Angoram
+controlledvocabulary.language.angosturas_tunebo=Angosturas Tunebo
+controlledvocabulary.language.anguthimri=Anguthimri
+controlledvocabulary.language.ani_phowa=Ani Phowa
+controlledvocabulary.language.anii=Anii
+controlledvocabulary.language.animere=Animere
+controlledvocabulary.language.anindilyakwa=Anindilyakwa
+controlledvocabulary.language.aninka=Aninka
+controlledvocabulary.language.anjam=Anjam
+controlledvocabulary.language.ankave=Ankave
+controlledvocabulary.language.anmatyerre=Anmatyerre
+controlledvocabulary.language.anong=Anong
+controlledvocabulary.language.anor=Anor
+controlledvocabulary.language.anserma=Anserma
+controlledvocabulary.language.ansus=Ansus
+controlledvocabulary.language.antakarinya=Antakarinya
+controlledvocabulary.language.antankarana_malagasy=Antankarana Malagasy
+controlledvocabulary.language.antigua_and_barbuda_creole_english=Antigua and Barbuda Creole English
+controlledvocabulary.language.anu-hkongso_chin=Anu-Hkongso Chin
+controlledvocabulary.language.anuak=Anuak
+controlledvocabulary.language.anufo=Anufo
+controlledvocabulary.language.anuki=Anuki
+controlledvocabulary.language.anus=Anus
+controlledvocabulary.language.anuta=Anuta
+controlledvocabulary.language.anyin=Anyin
+controlledvocabulary.language.anyin_morofo=Anyin Morofo
+controlledvocabulary.language.ao_naga=Ao Naga
+controlledvocabulary.language.aoheng=Aoheng
+controlledvocabulary.language.aore=Aore
+controlledvocabulary.language.ap_ma=Ap Ma
+controlledvocabulary.language.apalachee=Apalachee
+controlledvocabulary.language.apalai=Apalaí
+controlledvocabulary.language.apali=Apali
+controlledvocabulary.language.apasco-apoala_mixtec=Apasco-Apoala Mixtec
+controlledvocabulary.language.apatani=Apatani
+controlledvocabulary.language.apiaka=ApiakÃĄ
+controlledvocabulary.language.apinaye=ApinayÊ
+controlledvocabulary.language.apma=Apma
+controlledvocabulary.language.aproumu_aizi=Aproumu Aizi
+controlledvocabulary.language.apurina=ApurinÃŖ
+controlledvocabulary.language.aputai=Aputai
+controlledvocabulary.language.aquitanian=Aquitanian
+controlledvocabulary.language.arabana=Arabana
+controlledvocabulary.language.arabela=Arabela
 controlledvocabulary.language.arabic=Arabic
 controlledvocabulary.language.aragonese=Aragonese
+controlledvocabulary.language.araki=Araki
+controlledvocabulary.language.arakwal=Arakwal
+controlledvocabulary.language.aralle-tabulahan=Aralle-Tabulahan
+controlledvocabulary.language.arammba=Arammba
+controlledvocabulary.language.aranadan=Aranadan
+controlledvocabulary.language.aranama-tamique=Aranama-Tamique
+controlledvocabulary.language.arandai=Arandai
+controlledvocabulary.language.araona=Araona
+controlledvocabulary.language.arapaho=Arapaho
+controlledvocabulary.language.arapaso=Arapaso
+controlledvocabulary.language.ararandewara=ArarandewÃĄra
+controlledvocabulary.language.arawak=Arawak
+controlledvocabulary.language.arawete=ArawetÊ
+controlledvocabulary.language.arawum=Arawum
+controlledvocabulary.language.arbore=Arbore
+controlledvocabulary.language.arbereshe_albanian=ArbÃĢreshÃĢ Albanian
+controlledvocabulary.language.archi=Archi
+controlledvocabulary.language.ardhamagadhi_prakrit=ArdhamāgadhÄĢ Prākrit
+controlledvocabulary.language.are=Are
+controlledvocabulary.language.areba=Areba
+controlledvocabulary.language.arem=Arem
+controlledvocabulary.language.arequipa-la_union_quechua=Arequipa-La UniÃŗn Quechua
+controlledvocabulary.language.argentine_sign_language=Argentine Sign Language
+controlledvocabulary.language.argobba=Argobba
+controlledvocabulary.language.arguni=Arguni
+controlledvocabulary.language.arhuaco=Arhuaco
+controlledvocabulary.language.arha=ArhÃĸ
+controlledvocabulary.language.arho=ArhÃļ
+controlledvocabulary.language.ari=Ari
+controlledvocabulary.language.aribwatsa=Aribwatsa
+controlledvocabulary.language.aribwaung=Aribwaung
+controlledvocabulary.language.arifama-miniafia=Arifama-Miniafia
+controlledvocabulary.language.arigidi=Arigidi
+controlledvocabulary.language.arikapu=ArikapÃē
+controlledvocabulary.language.arikara=Arikara
+controlledvocabulary.language.arikem=Arikem
+controlledvocabulary.language.arin=Arin
+controlledvocabulary.language.aringa=Aringa
+controlledvocabulary.language.armazic=Armazic
 controlledvocabulary.language.armenian=Armenian
+controlledvocabulary.language.armenian_sign_language=Armenian Sign Language
+controlledvocabulary.language.arop-lokep=Arop-Lokep
+controlledvocabulary.language.arop-sissano=Arop-Sissano
+controlledvocabulary.language.arosi=Arosi
+controlledvocabulary.language.arpitan=Arpitan
+controlledvocabulary.language.arritinngithigh=Arritinngithigh
+controlledvocabulary.language.arta=Arta
+controlledvocabulary.language.aruamu=Aruamu
+controlledvocabulary.language.aruek=Aruek
+controlledvocabulary.language.aruop=Aruop
+controlledvocabulary.language.arutani=Arutani
+controlledvocabulary.language.arua_(amazonas_state)=AruÃĄ (Amazonas State)
+controlledvocabulary.language.arua_(rodonia_state)=AruÃĄ (Rodonia State)
+controlledvocabulary.language.arvanitika_albanian=Arvanitika Albanian
+controlledvocabulary.language.as=As
+controlledvocabulary.language.asaro'o=Asaro'o
+controlledvocabulary.language.ashe=Ashe
+controlledvocabulary.language.ashkun=Ashkun
+controlledvocabulary.language.asho_chin=Asho Chin
+controlledvocabulary.language.ashtiani=Ashtiani
+controlledvocabulary.language.ashaninka=AshÃĄninka
+controlledvocabulary.language.asheninka_pajonal=AshÊninka Pajonal
+controlledvocabulary.language.asheninka_perene=AshÊninka PerenÊ
+controlledvocabulary.language.asilulu=Asilulu
+controlledvocabulary.language.askopan=Askopan
+controlledvocabulary.language.asoa=Asoa
 controlledvocabulary.language.assamese=Assamese
+controlledvocabulary.language.assangori=Assangori
+controlledvocabulary.language.assiniboine=Assiniboine
+controlledvocabulary.language.assyrian_neo-aramaic=Assyrian Neo-Aramaic
+controlledvocabulary.language.asturian=Asturian
+controlledvocabulary.language.asu_(nigeria)=Asu (Nigeria)
+controlledvocabulary.language.asu_(tanzania)=Asu (Tanzania)
+controlledvocabulary.language.asue_awyu=Asue Awyu
+controlledvocabulary.language.asumboa=Asumboa
+controlledvocabulary.language.asuncion_mixtepec_zapotec=AsunciÃŗn Mixtepec Zapotec
+controlledvocabulary.language.asuri=Asuri
+controlledvocabulary.language.ata=Ata
+controlledvocabulary.language.ata_manobo=Ata Manobo
+controlledvocabulary.language.atakapa=Atakapa
+controlledvocabulary.language.atampaya=Atampaya
+controlledvocabulary.language.atatlahuca_mixtec=AtatlÃĄhuca Mixtec
+controlledvocabulary.language.atauran=Atauran
+controlledvocabulary.language.atayal=Atayal
+controlledvocabulary.language.atemble=Atemble
+controlledvocabulary.language.athpariya=Athpariya
+controlledvocabulary.language.ati=Ati
+controlledvocabulary.language.atikamekw=Atikamekw
+controlledvocabulary.language.atohwaim=Atohwaim
+controlledvocabulary.language.atong_(cameroon)=Atong (Cameroon)
+controlledvocabulary.language.atong_(india)=Atong (India)
+controlledvocabulary.language.atorada=Atorada
+controlledvocabulary.language.atsahuaca=Atsahuaca
+controlledvocabulary.language.atsam=Atsam
+controlledvocabulary.language.atsugewi=Atsugewi
+controlledvocabulary.language.attapady_kurumba=Attapady Kurumba
+controlledvocabulary.language.attie=AttiÊ
+controlledvocabulary.language.atzingo_matlatzinca=Atzingo Matlatzinca
+controlledvocabulary.language.au=Au
+controlledvocabulary.language.aulua=Aulua
+controlledvocabulary.language.aura=AurÃĄ
+controlledvocabulary.language.aushi=Aushi
+controlledvocabulary.language.aushiri=Aushiri
+controlledvocabulary.language.auslan=Auslan
+controlledvocabulary.language.austral=Austral
+controlledvocabulary.language.australian_aborigines_sign_language=Australian Aborigines Sign Language
+controlledvocabulary.language.austrian_sign_language=Austrian Sign Language
+controlledvocabulary.language.auwe=Auwe
+controlledvocabulary.language.auye=Auye
+controlledvocabulary.language.auyokawa=Auyokawa
 controlledvocabulary.language.avaric=Avaric
+controlledvocabulary.language.avatime=Avatime
+controlledvocabulary.language.avau=Avau
 controlledvocabulary.language.avestan=Avestan
+controlledvocabulary.language.avikam=Avikam
+controlledvocabulary.language.avokaya=Avokaya
+controlledvocabulary.language.ava-canoeiro=AvÃĄ-Canoeiro
+controlledvocabulary.language.awa_(china)=Awa (China)
+controlledvocabulary.language.awa_(papua_new_guinea)=Awa (Papua New Guinea)
+controlledvocabulary.language.awa-cuaiquer=Awa-Cuaiquer
+controlledvocabulary.language.awabakal=Awabakal
+controlledvocabulary.language.awad_bing=Awad Bing
+controlledvocabulary.language.awadhi=Awadhi
+controlledvocabulary.language.awak=Awak
+controlledvocabulary.language.awar=Awar
+controlledvocabulary.language.awara=Awara
+controlledvocabulary.language.awbono=Awbono
+controlledvocabulary.language.aweer=Aweer
+controlledvocabulary.language.awera=Awera
+controlledvocabulary.language.aweti=Awetí
+controlledvocabulary.language.awing=Awing
+controlledvocabulary.language.awiyaana=Awiyaana
+controlledvocabulary.language.awjilah=Awjilah
+controlledvocabulary.language.awngi=Awngi
+controlledvocabulary.language.awngthim=Awngthim
+controlledvocabulary.language.awtuw=Awtuw
+controlledvocabulary.language.awu=Awu
+controlledvocabulary.language.awun=Awun
+controlledvocabulary.language.awutu=Awutu
+controlledvocabulary.language.awyi=Awyi
+controlledvocabulary.language.axamb=Axamb
+controlledvocabulary.language.axi_yi=Axi Yi
+controlledvocabulary.language.ayabadhu=Ayabadhu
+controlledvocabulary.language.ayacucho_quechua=Ayacucho Quechua
+controlledvocabulary.language.ayautla_mazatec=Ayautla Mazatec
+controlledvocabulary.language.ayere=Ayere
+controlledvocabulary.language.ayerrerenge=Ayerrerenge
+controlledvocabulary.language.ayi_(papua_new_guinea)=Ayi (Papua New Guinea)
+controlledvocabulary.language.ayiwo=Ayiwo
+controlledvocabulary.language.ayizi=Ayizi
+controlledvocabulary.language.ayizo_gbe=Ayizo Gbe
 controlledvocabulary.language.aymara=Aymara
+controlledvocabulary.language.ayoquesco_zapotec=Ayoquesco Zapotec
+controlledvocabulary.language.ayoreo=Ayoreo
+controlledvocabulary.language.ayu=Ayu
+controlledvocabulary.language.ayutla_mixtec=Ayutla Mixtec
 controlledvocabulary.language.azerbaijani=Azerbaijani
+controlledvocabulary.language.azha=Azha
+controlledvocabulary.language.azhe=Azhe
+controlledvocabulary.language.azoyu_me'phaa=AzoyÃē Me'phaa
+controlledvocabulary.language.baan=Baan
+controlledvocabulary.language.baangi=Baangi
+controlledvocabulary.language.baatonum=Baatonum
+controlledvocabulary.language.baba=Baba
+controlledvocabulary.language.baba_malay=Baba Malay
+controlledvocabulary.language.babango=Babango
+controlledvocabulary.language.babanki=Babanki
+controlledvocabulary.language.babatana=Babatana
+controlledvocabulary.language.babine=Babine
+controlledvocabulary.language.babuza=Babuza
+controlledvocabulary.language.bacama=Bacama
+controlledvocabulary.language.bacanese_malay=Bacanese Malay
+controlledvocabulary.language.bactrian=Bactrian
+controlledvocabulary.language.bada_(indonesia)=Bada (Indonesia)
+controlledvocabulary.language.bada_(nigeria)=Bada (Nigeria)
+controlledvocabulary.language.badaga=Badaga
+controlledvocabulary.language.bade=Bade
+controlledvocabulary.language.badeshi=Badeshi
+controlledvocabulary.language.badimaya=Badimaya
+controlledvocabulary.language.badjiri=Badjiri
+controlledvocabulary.language.badui=Badui
+controlledvocabulary.language.badyara=Badyara
+controlledvocabulary.language.baeggu=Baeggu
+controlledvocabulary.language.baelelea=Baelelea
+controlledvocabulary.language.baetora=Baetora
+controlledvocabulary.language.bafanji=Bafanji
+controlledvocabulary.language.bafaw-balong=Bafaw-Balong
+controlledvocabulary.language.bafia=Bafia
+controlledvocabulary.language.bafut=Bafut
+controlledvocabulary.language.baga_kaloum=Baga Kaloum
+controlledvocabulary.language.baga_koga=Baga Koga
+controlledvocabulary.language.baga_manduri=Baga Manduri
+controlledvocabulary.language.baga_pokur=Baga Pokur
+controlledvocabulary.language.baga_sitemu=Baga Sitemu
+controlledvocabulary.language.baga_sobane=Baga SobanÊ
+controlledvocabulary.language.bagheli=Bagheli
+controlledvocabulary.language.bagirmi=Bagirmi
+controlledvocabulary.language.bagirmi_fulfulde=Bagirmi Fulfulde
+controlledvocabulary.language.bago-kusuntu=Bago-Kusuntu
+controlledvocabulary.language.bagri=Bagri
+controlledvocabulary.language.bagupi=Bagupi
+controlledvocabulary.language.bagusa=Bagusa
+controlledvocabulary.language.bagvalal=Bagvalal
+controlledvocabulary.language.baha_buyang=Baha Buyang
+controlledvocabulary.language.baham=Baham
+controlledvocabulary.language.bahamas_creole_english=Bahamas Creole English
+controlledvocabulary.language.baharna_arabic=Baharna Arabic
+controlledvocabulary.language.bahau=Bahau
+controlledvocabulary.language.bahinemo=Bahinemo
+controlledvocabulary.language.bahing=Bahing
+controlledvocabulary.language.bahnar=Bahnar
+controlledvocabulary.language.bahonsuai=Bahonsuai
+controlledvocabulary.language.bai_(south_sudan)=Bai (South Sudan)
+controlledvocabulary.language.baibai=Baibai
+controlledvocabulary.language.baikeno=Baikeno
+controlledvocabulary.language.baima=Baima
+controlledvocabulary.language.baimak=Baimak
+controlledvocabulary.language.bainouk-gunyaamolo=Bainouk-Gunyaamolo
+controlledvocabulary.language.bainouk-gunyuno=Bainouk-GunyuÃąo
+controlledvocabulary.language.bainouk-samik=Bainouk-Samik
+controlledvocabulary.language.baiso=Baiso
+controlledvocabulary.language.baissa_fali=Baissa Fali
+controlledvocabulary.language.bajan=Bajan
+controlledvocabulary.language.bajelani=Bajelani
+controlledvocabulary.language.bajjika=Bajjika
+controlledvocabulary.language.baka_(cameroon)=Baka (Cameroon)
+controlledvocabulary.language.baka_(south_sudan)=Baka (South Sudan)
+controlledvocabulary.language.bakairi=Bakairí
+controlledvocabulary.language.bakaka=Bakaka
+controlledvocabulary.language.bakhtiari=Bakhtiari
+controlledvocabulary.language.baki=Baki
+controlledvocabulary.language.bakoko=Bakoko
+controlledvocabulary.language.bakole=Bakole
+controlledvocabulary.language.bakpinka=Bakpinka
+controlledvocabulary.language.bakumpai=Bakumpai
+controlledvocabulary.language.bakwe=BakwÊ
+controlledvocabulary.language.balaesang=Balaesang
+controlledvocabulary.language.balaibalan=Balaibalan
+controlledvocabulary.language.balangao=Balangao
+controlledvocabulary.language.balangingi=Balangingi
+controlledvocabulary.language.balanta-ganja=Balanta-Ganja
+controlledvocabulary.language.balanta-kentohe=Balanta-Kentohe
+controlledvocabulary.language.balantak=Balantak
+controlledvocabulary.language.baldemu=Baldemu
+controlledvocabulary.language.bali_(democratic_republic_of_congo)=Bali (Democratic Republic of Congo)
+controlledvocabulary.language.bali_(nigeria)=Bali (Nigeria)
+controlledvocabulary.language.balinese=Balinese
+controlledvocabulary.language.balinese_malay=Balinese Malay
+controlledvocabulary.language.balkan_gagauz_turkish=Balkan Gagauz Turkish
+controlledvocabulary.language.balkan_romani=Balkan Romani
+controlledvocabulary.language.balo=Balo
+controlledvocabulary.language.baloi=Baloi
+controlledvocabulary.language.balti=Balti
+controlledvocabulary.language.baltic_romani=Baltic Romani
+controlledvocabulary.language.baluan-pam=Baluan-Pam
+controlledvocabulary.language.baluchi=Baluchi
+controlledvocabulary.language.bamako_sign_language=Bamako Sign Language
+controlledvocabulary.language.bamali=Bamali
+controlledvocabulary.language.bambalang=Bambalang
+controlledvocabulary.language.bambam=Bambam
 controlledvocabulary.language.bambara=Bambara
+controlledvocabulary.language.bambassi=Bambassi
+controlledvocabulary.language.bambili-bambui=Bambili-Bambui
+controlledvocabulary.language.bamenyam=Bamenyam
+controlledvocabulary.language.bamu=Bamu
+controlledvocabulary.language.bamukumbit=Bamukumbit
+controlledvocabulary.language.bamun=Bamun
+controlledvocabulary.language.bamunka=Bamunka
+controlledvocabulary.language.bamwe=Bamwe
+controlledvocabulary.language.ban_khor_sign_language=Ban Khor Sign Language
+controlledvocabulary.language.bana=Bana
+controlledvocabulary.language.banao_itneg=Banao Itneg
+controlledvocabulary.language.banaro=Banaro
+controlledvocabulary.language.banda_(indonesia)=Banda (Indonesia)
+controlledvocabulary.language.banda_malay=Banda Malay
+controlledvocabulary.language.banda-bambari=Banda-Bambari
+controlledvocabulary.language.banda-banda=Banda-Banda
+controlledvocabulary.language.banda-mbres=Banda-Mbrès
+controlledvocabulary.language.banda-ndele=Banda-NdÊlÊ
+controlledvocabulary.language.banda-yangere=Banda-Yangere
+controlledvocabulary.language.bandi=Bandi
+controlledvocabulary.language.bandial=Bandial
+controlledvocabulary.language.bandjalang=Bandjalang
+controlledvocabulary.language.bangala=Bangala
+controlledvocabulary.language.bangandu=Bangandu
+controlledvocabulary.language.bangba=Bangba
+controlledvocabulary.language.banggai=Banggai
+controlledvocabulary.language.banggarla=Banggarla
+controlledvocabulary.language.bangi=Bangi
+controlledvocabulary.language.bangime=Bangime
+controlledvocabulary.language.bangka=Bangka
+controlledvocabulary.language.bangolan=Bangolan
+controlledvocabulary.language.bangubangu=Bangubangu
+controlledvocabulary.language.bangwinji=Bangwinji
+controlledvocabulary.language.baniva=Baniva
+controlledvocabulary.language.baniwa=Baniwa
+controlledvocabulary.language.banjar=Banjar
+controlledvocabulary.language.bankagooma=Bankagooma
+controlledvocabulary.language.bankal=Bankal
+controlledvocabulary.language.bankan_tey_dogon=Bankan Tey Dogon
+controlledvocabulary.language.bankon=Bankon
+controlledvocabulary.language.bannoni=Bannoni
+controlledvocabulary.language.bantawa=Bantawa
+controlledvocabulary.language.bantayanon=Bantayanon
+controlledvocabulary.language.bantik=Bantik
+controlledvocabulary.language.bantoanon=Bantoanon
+controlledvocabulary.language.banyjima=Banyjima
+controlledvocabulary.language.baoule=BaoulÊ
+controlledvocabulary.language.bara_malagasy=Bara Malagasy
+controlledvocabulary.language.baraamu=Baraamu
+controlledvocabulary.language.barababaraba=Barababaraba
+controlledvocabulary.language.barai=Barai
+controlledvocabulary.language.barakai=Barakai
+controlledvocabulary.language.baram_kayan=Baram Kayan
+controlledvocabulary.language.barama=Barama
+controlledvocabulary.language.barambu=Barambu
+controlledvocabulary.language.baramu=Baramu
+controlledvocabulary.language.barapasi=Barapasi
+controlledvocabulary.language.baras=Baras
+controlledvocabulary.language.barasana-eduria=Barasana-Eduria
+controlledvocabulary.language.barbaram=Barbaram
+controlledvocabulary.language.barbareno=BarbareÃąo
+controlledvocabulary.language.barclayville_grebo=Barclayville Grebo
+controlledvocabulary.language.bardi=Bardi
+controlledvocabulary.language.barein=Barein
+controlledvocabulary.language.bargam=Bargam
+controlledvocabulary.language.bari=Bari
+controlledvocabulary.language.bariai=Bariai
+controlledvocabulary.language.bariji=Bariji
+controlledvocabulary.language.barikanchi=Barikanchi
+controlledvocabulary.language.barikewa=Barikewa
+controlledvocabulary.language.barok=Barok
+controlledvocabulary.language.barombi=Barombi
+controlledvocabulary.language.barro_negro_tunebo=Barro Negro Tunebo
+controlledvocabulary.language.barrow_point=Barrow Point
+controlledvocabulary.language.baruga=Baruga
+controlledvocabulary.language.baruya=Baruya
+controlledvocabulary.language.barwe=Barwe
+controlledvocabulary.language.barzani_jewish_neo-aramaic=Barzani Jewish Neo-Aramaic
+controlledvocabulary.language.bare=BarÊ
+controlledvocabulary.language.basa_(cameroon)=Basa (Cameroon)
+controlledvocabulary.language.basa_(nigeria)=Basa (Nigeria)
+controlledvocabulary.language.basa-gumna=Basa-Gumna
+controlledvocabulary.language.basa-gurmana=Basa-Gurmana
+controlledvocabulary.language.basap=Basap
+controlledvocabulary.language.basay=Basay
+controlledvocabulary.language.bashkardi=Bashkardi
 controlledvocabulary.language.bashkir=Bashkir
+controlledvocabulary.language.basketo=Basketo
 controlledvocabulary.language.basque=Basque
+controlledvocabulary.language.bassa=Bassa
+controlledvocabulary.language.bassa-kontagora=Bassa-Kontagora
+controlledvocabulary.language.bassari=Bassari
+controlledvocabulary.language.bassossi=Bassossi
+controlledvocabulary.language.bata=Bata
+controlledvocabulary.language.batad_ifugao=Batad Ifugao
+controlledvocabulary.language.batak=Batak
+controlledvocabulary.language.batak_alas-kluet=Batak Alas-Kluet
+controlledvocabulary.language.batak_angkola=Batak Angkola
+controlledvocabulary.language.batak_dairi=Batak Dairi
+controlledvocabulary.language.batak_karo=Batak Karo
+controlledvocabulary.language.batak_mandailing=Batak Mandailing
+controlledvocabulary.language.batak_simalungun=Batak Simalungun
+controlledvocabulary.language.batak_toba=Batak Toba
+controlledvocabulary.language.batanga=Batanga
+controlledvocabulary.language.batek=Batek
+controlledvocabulary.language.bateri=Bateri
+controlledvocabulary.language.bathari=Bathari
+controlledvocabulary.language.bati_(cameroon)=Bati (Cameroon)
+controlledvocabulary.language.bati_(indonesia)=Bati (Indonesia)
+controlledvocabulary.language.batjala=Batjala
+controlledvocabulary.language.bats=Bats
+controlledvocabulary.language.batu=Batu
+controlledvocabulary.language.batui=Batui
+controlledvocabulary.language.batuley=Batuley
+controlledvocabulary.language.bau=Bau
+controlledvocabulary.language.bau_bidayuh=Bau Bidayuh
+controlledvocabulary.language.bauchi=Bauchi
+controlledvocabulary.language.bauni=Bauni
+controlledvocabulary.language.baure=Baure
+controlledvocabulary.language.bauria=Bauria
+controlledvocabulary.language.bauwaki=Bauwaki
+controlledvocabulary.language.bauzi=Bauzi
+controlledvocabulary.language.bavarian=Bavarian
+controlledvocabulary.language.bawm_chin=Bawm Chin
+controlledvocabulary.language.bay_miwok=Bay Miwok
+controlledvocabulary.language.bayali=Bayali
+controlledvocabulary.language.baybayanon=Baybayanon
+controlledvocabulary.language.baygo=Baygo
+controlledvocabulary.language.bayono=Bayono
+controlledvocabulary.language.bayot=Bayot
+controlledvocabulary.language.bayungu=Bayungu
+controlledvocabulary.language.bazigar=Bazigar
+controlledvocabulary.language.beami=Beami
+controlledvocabulary.language.beaver=Beaver
+controlledvocabulary.language.beba=Beba
+controlledvocabulary.language.bebele=Bebele
+controlledvocabulary.language.bebeli=Bebeli
+controlledvocabulary.language.bebil=Bebil
+controlledvocabulary.language.bedjond=Bedjond
+controlledvocabulary.language.bedoanas=Bedoanas
+controlledvocabulary.language.beeke=Beeke
+controlledvocabulary.language.beele=Beele
+controlledvocabulary.language.beembe=Beembe
+controlledvocabulary.language.beezen=Beezen
+controlledvocabulary.language.befang=Befang
+controlledvocabulary.language.beginci=Beginci
+controlledvocabulary.language.beja=Beja
+controlledvocabulary.language.bekati'=Bekati'
+controlledvocabulary.language.bekwarra=Bekwarra
+controlledvocabulary.language.bekwel=Bekwel
+controlledvocabulary.language.belait=Belait
+controlledvocabulary.language.belanda_bor=Belanda Bor
+controlledvocabulary.language.belanda_viri=Belanda Viri
 controlledvocabulary.language.belarusian=Belarusian
+controlledvocabulary.language.belhariya=Belhariya
+controlledvocabulary.language.beli_(papua_new_guinea)=Beli (Papua New Guinea)
+controlledvocabulary.language.beli_(south_sudan)=Beli (South Sudan)
+controlledvocabulary.language.belize_kriol_english=Belize Kriol English
+controlledvocabulary.language.bella_coola=Bella Coola
+controlledvocabulary.language.bellari=Bellari
+controlledvocabulary.language.belning=Belning
+controlledvocabulary.language.bemba_(zambia)=Bemba (Zambia)
+controlledvocabulary.language.bembe=Bembe
+controlledvocabulary.language.ben_tey_dogon=Ben Tey Dogon
+controlledvocabulary.language.bena_(nigeria)=Bena (Nigeria)
+controlledvocabulary.language.bena_(tanzania)=Bena (Tanzania)
+controlledvocabulary.language.benabena=Benabena
+controlledvocabulary.language.benamanga=Benamanga
+controlledvocabulary.language.bench=Bench
+controlledvocabulary.language.bende=Bende
+controlledvocabulary.language.bendi=Bendi
+controlledvocabulary.language.beng=Beng
+controlledvocabulary.language.benga=Benga
 controlledvocabulary.language.bengali,_bangla=Bengali, Bangla
+controlledvocabulary.language.benggoi=Benggoi
+controlledvocabulary.language.bengkala_sign_language=Bengkala Sign Language
+controlledvocabulary.language.bentong=Bentong
+controlledvocabulary.language.benyadu'=Benyadu'
+controlledvocabulary.language.beothuk=Beothuk
+controlledvocabulary.language.bepour=Bepour
+controlledvocabulary.language.berakou=Berakou
+controlledvocabulary.language.berau_malay=Berau Malay
+controlledvocabulary.language.berbice_creole_dutch=Berbice Creole Dutch
+controlledvocabulary.language.berik=Berik
+controlledvocabulary.language.berinomo=Berinomo
+controlledvocabulary.language.berom=Berom
+controlledvocabulary.language.berta=Berta
+controlledvocabulary.language.berti=Berti
+controlledvocabulary.language.besisi=Besisi
+controlledvocabulary.language.besme=Besme
+controlledvocabulary.language.besoa=Besoa
+controlledvocabulary.language.betaf=Betaf
+controlledvocabulary.language.betawi=Betawi
+controlledvocabulary.language.bete=Bete
+controlledvocabulary.language.bete-bendi=Bete-Bendi
+controlledvocabulary.language.beti_(cote_d'ivoire)=Beti (Côte d'Ivoire)
+controlledvocabulary.language.betta_kurumba=Betta Kurumba
+controlledvocabulary.language.bezhta=Bezhta
+controlledvocabulary.language.bhadrawahi=Bhadrawahi
+controlledvocabulary.language.bhalay=Bhalay
+controlledvocabulary.language.bharia=Bharia
+controlledvocabulary.language.bhatri=Bhatri
+controlledvocabulary.language.bhattiyali=Bhattiyali
+controlledvocabulary.language.bhaya=Bhaya
+controlledvocabulary.language.bhele=Bhele
+controlledvocabulary.language.bhilali=Bhilali
+controlledvocabulary.language.bhili=Bhili
+controlledvocabulary.language.bhojpuri=Bhojpuri
+controlledvocabulary.language.bhoti_kinnauri=Bhoti Kinnauri
+controlledvocabulary.language.bhujel=Bhujel
+controlledvocabulary.language.bhunjia=Bhunjia
+controlledvocabulary.language.biafada=Biafada
+controlledvocabulary.language.biage=Biage
+controlledvocabulary.language.biak=Biak
+controlledvocabulary.language.biali=Biali
+controlledvocabulary.language.bian_marind=Bian Marind
+controlledvocabulary.language.biangai=Biangai
+controlledvocabulary.language.biao=Biao
+controlledvocabulary.language.biao_mon=Biao Mon
+controlledvocabulary.language.biao-jiao_mien=Biao-Jiao Mien
+controlledvocabulary.language.biatah_bidayuh=Biatah Bidayuh
+controlledvocabulary.language.bibbulman=Bibbulman
+controlledvocabulary.language.bidhawal=Bidhawal
+controlledvocabulary.language.bidiyo=Bidiyo
+controlledvocabulary.language.bidjara=Bidjara
+controlledvocabulary.language.bidyogo=Bidyogo
+controlledvocabulary.language.biem=Biem
+controlledvocabulary.language.bierebo=Bierebo
+controlledvocabulary.language.bieria=Bieria
+controlledvocabulary.language.biete=Biete
+controlledvocabulary.language.big_nambas=Big Nambas
+controlledvocabulary.language.biga=Biga
+controlledvocabulary.language.bigambal=Bigambal
+controlledvocabulary.language.bih=Bih
 controlledvocabulary.language.bihari=Bihari
+controlledvocabulary.language.bijim=Bijim
+controlledvocabulary.language.bijori=Bijori
+controlledvocabulary.language.bikol=Bikol
+controlledvocabulary.language.bikya=Bikya
+controlledvocabulary.language.bila=Bila
+controlledvocabulary.language.bilakura=Bilakura
+controlledvocabulary.language.bilaspuri=Bilaspuri
+controlledvocabulary.language.bilba=Bilba
+controlledvocabulary.language.bilbil=Bilbil
+controlledvocabulary.language.bile=Bile
+controlledvocabulary.language.bilin=Bilin
+controlledvocabulary.language.bilma_kanuri=Bilma Kanuri
+controlledvocabulary.language.biloxi=Biloxi
+controlledvocabulary.language.bilua=Bilua
+controlledvocabulary.language.bilur=Bilur
+controlledvocabulary.language.bima=Bima
+controlledvocabulary.language.bimin=Bimin
+controlledvocabulary.language.bimoba=Bimoba
+controlledvocabulary.language.bina_(nigeria)=Bina (Nigeria)
+controlledvocabulary.language.bina_(papua_new_guinea)=Bina (Papua New Guinea)
+controlledvocabulary.language.binahari=Binahari
+controlledvocabulary.language.binandere=Binandere
+controlledvocabulary.language.bindal=Bindal
+controlledvocabulary.language.bine=Bine
+controlledvocabulary.language.bini=Bini
+controlledvocabulary.language.binji=Binji
+controlledvocabulary.language.binongan_itneg=Binongan Itneg
+controlledvocabulary.language.bintauna=Bintauna
+controlledvocabulary.language.bintulu=Bintulu
+controlledvocabulary.language.binukid=Binukid
+controlledvocabulary.language.binumarien=Binumarien
+controlledvocabulary.language.bipi=Bipi
+controlledvocabulary.language.bira=Bira
+controlledvocabulary.language.birale=Birale
+controlledvocabulary.language.birao=Birao
+controlledvocabulary.language.birgit=Birgit
+controlledvocabulary.language.birhor=Birhor
+controlledvocabulary.language.biri=Biri
+controlledvocabulary.language.biritai=Biritai
+controlledvocabulary.language.birked=Birked
+controlledvocabulary.language.birri=Birri
+controlledvocabulary.language.birrpayi=Birrpayi
+controlledvocabulary.language.birwa=Birwa
+controlledvocabulary.language.biseni=Biseni
+controlledvocabulary.language.bishnupriya=Bishnupriya
+controlledvocabulary.language.bishuo=Bishuo
+controlledvocabulary.language.bisis=Bisis
 controlledvocabulary.language.bislama=Bislama
+controlledvocabulary.language.bisorio=Bisorio
+controlledvocabulary.language.bissa=Bissa
+controlledvocabulary.language.bisu=Bisu
+controlledvocabulary.language.bit=Bit
+controlledvocabulary.language.bitare=Bitare
+controlledvocabulary.language.bitur=Bitur
+controlledvocabulary.language.biwat=Biwat
+controlledvocabulary.language.biyo=Biyo
+controlledvocabulary.language.biyom=Biyom
+controlledvocabulary.language.blablanga=Blablanga
+controlledvocabulary.language.blafe=Blafe
+controlledvocabulary.language.blagar=Blagar
+controlledvocabulary.language.blang=Blang
+controlledvocabulary.language.blissymbols=Blissymbols
+controlledvocabulary.language.bo_(laos)=Bo (Laos)
+controlledvocabulary.language.bo_(papua_new_guinea)=Bo (Papua New Guinea)
+controlledvocabulary.language.bo-rukul=Bo-Rukul
+controlledvocabulary.language.bo-ung=Bo-Ung
+controlledvocabulary.language.boano_(maluku)=Boano (Maluku)
+controlledvocabulary.language.boano_(sulawesi)=Boano (Sulawesi)
+controlledvocabulary.language.bobongko=Bobongko
+controlledvocabulary.language.bobot=Bobot
+controlledvocabulary.language.bodo_(central_african_republic)=Bodo (Central African Republic)
+controlledvocabulary.language.bodo_(india)=Bodo (India)
+controlledvocabulary.language.bodo_gadaba=Bodo Gadaba
+controlledvocabulary.language.bodo_parja=Bodo Parja
+controlledvocabulary.language.bofi=Bofi
+controlledvocabulary.language.boga=Boga
+controlledvocabulary.language.bogaya=Bogaya
+controlledvocabulary.language.boghom=Boghom
+controlledvocabulary.language.boguru=Boguru
+controlledvocabulary.language.bohtan_neo-aramaic=Bohtan Neo-Aramaic
+controlledvocabulary.language.boikin=Boikin
+controlledvocabulary.language.bokha=Bokha
+controlledvocabulary.language.boko_(benin)=Boko (Benin)
+controlledvocabulary.language.boko_(democratic_republic_of_congo)=Boko (Democratic Republic of Congo)
+controlledvocabulary.language.bokobaru=Bokobaru
+controlledvocabulary.language.bokoto=Bokoto
+controlledvocabulary.language.bokyi=Bokyi
+controlledvocabulary.language.bola=Bola
+controlledvocabulary.language.bolango=Bolango
+controlledvocabulary.language.bole=Bole
+controlledvocabulary.language.bolgarian=Bolgarian
+controlledvocabulary.language.bolgo=Bolgo
+controlledvocabulary.language.bolia=Bolia
+controlledvocabulary.language.bolinao=Bolinao
+controlledvocabulary.language.bolivian_sign_language=Bolivian Sign Language
+controlledvocabulary.language.boloki=Boloki
+controlledvocabulary.language.bolon=Bolon
+controlledvocabulary.language.bolondo=Bolondo
+controlledvocabulary.language.bolongan=Bolongan
+controlledvocabulary.language.bolyu=Bolyu
+controlledvocabulary.language.bom-kim=Bom-Kim
+controlledvocabulary.language.boma=Boma
+controlledvocabulary.language.bomboli=Bomboli
+controlledvocabulary.language.bomboma=Bomboma
+controlledvocabulary.language.bomitaba=Bomitaba
+controlledvocabulary.language.bomu=Bomu
+controlledvocabulary.language.bomwali=Bomwali
+controlledvocabulary.language.bon_gula=Bon Gula
+controlledvocabulary.language.bonan=Bonan
+controlledvocabulary.language.bondei=Bondei
+controlledvocabulary.language.bondo=Bondo
+controlledvocabulary.language.bondoukou_kulango=Bondoukou Kulango
+controlledvocabulary.language.bondum_dom_dogon=Bondum Dom Dogon
+controlledvocabulary.language.bonerate=Bonerate
+controlledvocabulary.language.bonerif=Bonerif
+controlledvocabulary.language.bonggi=Bonggi
+controlledvocabulary.language.bonggo=Bonggo
+controlledvocabulary.language.bongili=Bongili
+controlledvocabulary.language.bongo=Bongo
+controlledvocabulary.language.bongu=Bongu
+controlledvocabulary.language.bonjo=Bonjo
+controlledvocabulary.language.bonkeng=Bonkeng
+controlledvocabulary.language.bonkiman=Bonkiman
+controlledvocabulary.language.bontok=Bontok
+controlledvocabulary.language.bookan=Bookan
+controlledvocabulary.language.boon=Boon
+controlledvocabulary.language.boor=Boor
+controlledvocabulary.language.bora=Bora
+controlledvocabulary.language.borana-arsi-guji_oromo=Borana-Arsi-Guji Oromo
+controlledvocabulary.language.border_kuna=Border Kuna
+controlledvocabulary.language.borei=Borei
+controlledvocabulary.language.borgu_fulfulde=Borgu Fulfulde
+controlledvocabulary.language.boro_(ethiopia)=Boro (Ethiopia)
+controlledvocabulary.language.boro_(ghana)=Boro (Ghana)
+controlledvocabulary.language.borong=Borong
+controlledvocabulary.language.boruca=Boruca
+controlledvocabulary.language.bororo=Borôro
+controlledvocabulary.language.boselewa=Boselewa
+controlledvocabulary.language.bosngun=Bosngun
 controlledvocabulary.language.bosnian=Bosnian
+controlledvocabulary.language.bote-majhi=Bote-Majhi
+controlledvocabulary.language.botlikh=Botlikh
+controlledvocabulary.language.botolan_sambal=Botolan Sambal
+controlledvocabulary.language.bouna_kulango=Bouna Kulango
+controlledvocabulary.language.bouni=Bouni
+controlledvocabulary.language.bouyei=Bouyei
+controlledvocabulary.language.bozaba=Bozaba
+controlledvocabulary.language.bragat=Bragat
+controlledvocabulary.language.brahui=Brahui
+controlledvocabulary.language.braj=Braj
+controlledvocabulary.language.brao=Brao
+controlledvocabulary.language.brazilian_sign_language=Brazilian Sign Language
+controlledvocabulary.language.brem=Brem
+controlledvocabulary.language.breri=Breri
 controlledvocabulary.language.breton=Breton
+controlledvocabulary.language.bribri=Bribri
+controlledvocabulary.language.bribri_sign_language=Bribri Sign Language
+controlledvocabulary.language.brithenig=Brithenig
+controlledvocabulary.language.british_sign_language=British Sign Language
+controlledvocabulary.language.brokkat=Brokkat
+controlledvocabulary.language.brokpake=Brokpake
+controlledvocabulary.language.brokskat=Brokskat
+controlledvocabulary.language.brooke's_point_palawano=Brooke's Point Palawano
+controlledvocabulary.language.broome_pearling_lugger_pidgin=Broome Pearling Lugger Pidgin
+controlledvocabulary.language.brunca_sign_language=Brunca Sign Language
+controlledvocabulary.language.brunei=Brunei
+controlledvocabulary.language.brunei_bisaya=Brunei Bisaya
+controlledvocabulary.language.bruny_island_tasmanian=Bruny Island Tasmanian
+controlledvocabulary.language.bu_(bauchi_state)=Bu (Bauchi State)
+controlledvocabulary.language.bu_(kaduna_state)=Bu (Kaduna State)
+controlledvocabulary.language.bu-nao_bunu=Bu-Nao Bunu
+controlledvocabulary.language.bua=Bua
+controlledvocabulary.language.bualkhaw_chin=Bualkhaw Chin
+controlledvocabulary.language.buamu=Buamu
+controlledvocabulary.language.bube=Bube
+controlledvocabulary.language.bubi=Bubi
+controlledvocabulary.language.bubia=Bubia
+controlledvocabulary.language.budeh_stieng=Budeh Stieng
+controlledvocabulary.language.budibud=Budibud
+controlledvocabulary.language.budong-budong=Budong-Budong
+controlledvocabulary.language.budu=Budu
+controlledvocabulary.language.budukh=Budukh
+controlledvocabulary.language.buduma=Buduma
+controlledvocabulary.language.budza=Budza
+controlledvocabulary.language.bugan=Bugan
+controlledvocabulary.language.bugawac=Bugawac
+controlledvocabulary.language.bughotu=Bughotu
+controlledvocabulary.language.buginese=Buginese
+controlledvocabulary.language.buglere=Buglere
+controlledvocabulary.language.bugun=Bugun
+controlledvocabulary.language.buhi'non_bikol=Buhi'non Bikol
+controlledvocabulary.language.buhid=Buhid
+controlledvocabulary.language.buhutu=Buhutu
+controlledvocabulary.language.bukar-sadung_bidayuh=Bukar-Sadung Bidayuh
+controlledvocabulary.language.bukat=Bukat
+controlledvocabulary.language.bukharic=Bukharic
+controlledvocabulary.language.bukit_malay=Bukit Malay
+controlledvocabulary.language.bukitan=Bukitan
+controlledvocabulary.language.bukiyip=Bukiyip
+controlledvocabulary.language.buksa=Buksa
+controlledvocabulary.language.bukusu=Bukusu
+controlledvocabulary.language.bukwen=Bukwen
 controlledvocabulary.language.bulgarian=Bulgarian
+controlledvocabulary.language.bulgarian_sign_language=Bulgarian Sign Language
+controlledvocabulary.language.bulgebi=Bulgebi
+controlledvocabulary.language.buli=Buli
+controlledvocabulary.language.buli_(ghana)=Buli (Ghana)
+controlledvocabulary.language.buli_(indonesia)=Buli (Indonesia)
+controlledvocabulary.language.bullom_so=Bullom So
+controlledvocabulary.language.bulo_stieng=Bulo Stieng
+controlledvocabulary.language.bulu_(cameroon)=Bulu (Cameroon)
+controlledvocabulary.language.bulu_(papua_new_guinea)=Bulu (Papua New Guinea)
+controlledvocabulary.language.bum=Bum
+controlledvocabulary.language.bumaji=Bumaji
+controlledvocabulary.language.bumang=Bumang
+controlledvocabulary.language.bumbita_arapesh=Bumbita Arapesh
+controlledvocabulary.language.bumthangkha=Bumthangkha
+controlledvocabulary.language.bun=Bun
+controlledvocabulary.language.buna=Buna
+controlledvocabulary.language.bunak=Bunak
+controlledvocabulary.language.bunama=Bunama
+controlledvocabulary.language.bundeli=Bundeli
+controlledvocabulary.language.bung=Bung
+controlledvocabulary.language.bungain=Bungain
+controlledvocabulary.language.bunganditj=Bunganditj
+controlledvocabulary.language.bungku=Bungku
+controlledvocabulary.language.bungu=Bungu
+controlledvocabulary.language.bunoge_dogon=Bunoge Dogon
+controlledvocabulary.language.bunuba=Bunuba
+controlledvocabulary.language.bunun=Bunun
+controlledvocabulary.language.buol=Buol
+controlledvocabulary.language.bura-pabir=Bura-Pabir
+controlledvocabulary.language.burak=Burak
+controlledvocabulary.language.buraka=Buraka
+controlledvocabulary.language.burarra=Burarra
+controlledvocabulary.language.burate=Burate
+controlledvocabulary.language.burduna=Burduna
+controlledvocabulary.language.bure=Bure
+controlledvocabulary.language.buriat=Buriat
+controlledvocabulary.language.burji=Burji
+controlledvocabulary.language.burmbar=Burmbar
 controlledvocabulary.language.burmese=Burmese
-controlledvocabulary.language.catalan,valencian=Catalan,Valencian
+controlledvocabulary.language.burmeso=Burmeso
+controlledvocabulary.language.buru_(indonesia)=Buru (Indonesia)
+controlledvocabulary.language.buru_(nigeria)=Buru (Nigeria)
+controlledvocabulary.language.burui=Burui
+controlledvocabulary.language.burumakok=Burumakok
+controlledvocabulary.language.burun=Burun
+controlledvocabulary.language.burundian_sign_language=Burundian Sign Language
+controlledvocabulary.language.burunge=Burunge
+controlledvocabulary.language.burushaski=Burushaski
+controlledvocabulary.language.burusu=Burusu
+controlledvocabulary.language.buruwai=Buruwai
+controlledvocabulary.language.busa=Busa
+controlledvocabulary.language.busam=Busam
+controlledvocabulary.language.busami=Busami
+controlledvocabulary.language.busang_kayan=Busang Kayan
+controlledvocabulary.language.bushi=Bushi
+controlledvocabulary.language.bushoong=Bushoong
+controlledvocabulary.language.buso=Buso
+controlledvocabulary.language.busoa=Busoa
+controlledvocabulary.language.bussa=Bussa
+controlledvocabulary.language.busuu=Busuu
+controlledvocabulary.language.butbut_kalinga=Butbut Kalinga
+controlledvocabulary.language.butmas-tur=Butmas-Tur
+controlledvocabulary.language.butuanon=Butuanon
+controlledvocabulary.language.buwal=Buwal
+controlledvocabulary.language.buyu=Buyu
+controlledvocabulary.language.buyuan_jinuo=Buyuan Jinuo
+controlledvocabulary.language.bwa=Bwa
+controlledvocabulary.language.bwaidoka=Bwaidoka
+controlledvocabulary.language.bwanabwana=Bwanabwana
+controlledvocabulary.language.bwatoo=Bwatoo
+controlledvocabulary.language.bwe_karen=Bwe Karen
+controlledvocabulary.language.bwela=Bwela
+controlledvocabulary.language.bwile=Bwile
+controlledvocabulary.language.bwisi=Bwisi
+controlledvocabulary.language.byangsi=Byangsi
+controlledvocabulary.language.byep=Byep
+controlledvocabulary.language.badi_kanum=Bädi Kanum
+controlledvocabulary.language.c'lela=C'Lela
+controlledvocabulary.language.caac=Caac
+controlledvocabulary.language.cabiyari=Cabiyarí
+controlledvocabulary.language.cabecar=CabÊcar
+controlledvocabulary.language.cacaloxtepec_mixtec=Cacaloxtepec Mixtec
+controlledvocabulary.language.cacaopera=Cacaopera
+controlledvocabulary.language.cacgia_roglai=Cacgia Roglai
+controlledvocabulary.language.cacua=Cacua
+controlledvocabulary.language.caddo=Caddo
+controlledvocabulary.language.cafundo_creole=Cafundo Creole
+controlledvocabulary.language.cahuarano=Cahuarano
+controlledvocabulary.language.cahuilla=Cahuilla
+controlledvocabulary.language.cajamarca_quechua=Cajamarca Quechua
+controlledvocabulary.language.cajatambo_north_lima_quechua=Cajatambo North Lima Quechua
+controlledvocabulary.language.cajonos_zapotec=Cajonos Zapotec
+controlledvocabulary.language.cajun_french=Cajun French
+controlledvocabulary.language.caka=Caka
+controlledvocabulary.language.cakchiquel-quiche_mixed_language=Cakchiquel-QuichÊ Mixed Language
+controlledvocabulary.language.cakfem-mushere=Cakfem-Mushere
+controlledvocabulary.language.calamian_tagbanwa=Calamian Tagbanwa
+controlledvocabulary.language.calderon_highland_quichua=CalderÃŗn Highland Quichua
+controlledvocabulary.language.callawalla=Callawalla
+controlledvocabulary.language.caluyanun=Caluyanun
+controlledvocabulary.language.calo=CalÃŗ
+controlledvocabulary.language.cambodian_sign_language=Cambodian Sign Language
+controlledvocabulary.language.cameroon_mambila=Cameroon Mambila
+controlledvocabulary.language.cameroon_pidgin=Cameroon Pidgin
+controlledvocabulary.language.camling=Camling
+controlledvocabulary.language.campalagian=Campalagian
+controlledvocabulary.language.campidanese_sardinian=Campidanese Sardinian
+controlledvocabulary.language.camsa=CamsÃĄ
+controlledvocabulary.language.camtho=Camtho
+controlledvocabulary.language.camunic=Camunic
+controlledvocabulary.language.candoshi-shapra=Candoshi-Shapra
+controlledvocabulary.language.canela=Canela
+controlledvocabulary.language.canichana=Canichana
+controlledvocabulary.language.cao_lan=Cao Lan
+controlledvocabulary.language.cao_miao=Cao Miao
+controlledvocabulary.language.capanahua=Capanahua
+controlledvocabulary.language.capiznon=Capiznon
+controlledvocabulary.language.cappadocian_greek=Cappadocian Greek
+controlledvocabulary.language.caquinte=Caquinte
+controlledvocabulary.language.car_nicobarese=Car Nicobarese
+controlledvocabulary.language.cara=Cara
+controlledvocabulary.language.carabayo=Carabayo
+controlledvocabulary.language.caramanta=Caramanta
+controlledvocabulary.language.carapana=Carapana
+controlledvocabulary.language.carian=Carian
+controlledvocabulary.language.caribbean_hindustani=Caribbean Hindustani
+controlledvocabulary.language.caribbean_javanese=Caribbean Javanese
+controlledvocabulary.language.carijona=Carijona
+controlledvocabulary.language.carolina_algonquian=Carolina Algonquian
+controlledvocabulary.language.carolinian=Carolinian
+controlledvocabulary.language.carpathian_romani=Carpathian Romani
+controlledvocabulary.language.carrier=Carrier
+controlledvocabulary.language.cashibo-cacataibo=Cashibo-Cacataibo
+controlledvocabulary.language.cashinahua=Cashinahua
+controlledvocabulary.language.casiguran_dumagat_agta=Casiguran Dumagat Agta
+controlledvocabulary.language.spanish,_castilian=Castilian, Spanish
+controlledvocabulary.language.casuarina_coast_asmat=Casuarina Coast Asmat
+controlledvocabulary.language.catalan_sign_language=Catalan Sign Language
+controlledvocabulary.language.catalan,_valencian=Catalan, Valencian
+controlledvocabulary.language.catawba=Catawba
+controlledvocabulary.language.cavinena=CavineÃąa
+controlledvocabulary.language.cayubaba=Cayubaba
+controlledvocabulary.language.cayuga=Cayuga
+controlledvocabulary.language.cayuse=Cayuse
+controlledvocabulary.language.canar_highland_quichua=CaÃąar Highland Quichua
+controlledvocabulary.language.cahungwarya=CaĖąhungwaĖąryaĖą
+controlledvocabulary.language.cebaara_senoufo=Cebaara Senoufo
+controlledvocabulary.language.cebuano=Cebuano
+controlledvocabulary.language.celtiberian=Celtiberian
+controlledvocabulary.language.cemuhi=CemuhÃŽ
+controlledvocabulary.language.cen=Cen
+controlledvocabulary.language.central_asmat=Central Asmat
+controlledvocabulary.language.central_atlas_tamazight=Central Atlas Tamazight
+controlledvocabulary.language.central_awyu=Central Awyu
+controlledvocabulary.language.central_aymara=Central Aymara
+controlledvocabulary.language.central_bai=Central Bai
+controlledvocabulary.language.central_berawan=Central Berawan
+controlledvocabulary.language.central_bikol=Central Bikol
+controlledvocabulary.language.central_bontok=Central Bontok
+controlledvocabulary.language.central_cagayan_agta=Central Cagayan Agta
+controlledvocabulary.language.central_grebo=Central Grebo
+controlledvocabulary.language.central_hongshuihe_zhuang=Central Hongshuihe Zhuang
+controlledvocabulary.language.central_huasteca_nahuatl=Central Huasteca Nahuatl
+controlledvocabulary.language.central_huishui_hmong=Central Huishui Hmong
+controlledvocabulary.language.central_kanuri=Central Kanuri
+controlledvocabulary.language.central_kurdish=Central Kurdish
+controlledvocabulary.language.central_maewo=Central Maewo
+controlledvocabulary.language.central_malay=Central Malay
+controlledvocabulary.language.central_masela=Central Masela
+controlledvocabulary.language.central_mashan_hmong=Central Mashan Hmong
+controlledvocabulary.language.central_mazahua=Central Mazahua
+controlledvocabulary.language.central_melanau=Central Melanau
+controlledvocabulary.language.central_mnong=Central Mnong
+controlledvocabulary.language.central_nahuatl=Central Nahuatl
+controlledvocabulary.language.central_nicobarese=Central Nicobarese
+controlledvocabulary.language.central_ojibwa=Central Ojibwa
+controlledvocabulary.language.central_okinawan=Central Okinawan
+controlledvocabulary.language.central_palawano=Central Palawano
+controlledvocabulary.language.central_pame=Central Pame
+controlledvocabulary.language.central_pashto=Central Pashto
+controlledvocabulary.language.central_pomo=Central Pomo
+controlledvocabulary.language.central_puebla_nahuatl=Central Puebla Nahuatl
+controlledvocabulary.language.central_sama=Central Sama
+controlledvocabulary.language.central_siberian_yupik=Central Siberian Yupik
+controlledvocabulary.language.central_sierra_miwok=Central Sierra Miwok
+controlledvocabulary.language.central_subanen=Central Subanen
+controlledvocabulary.language.central_tagbanwa=Central Tagbanwa
+controlledvocabulary.language.central_tarahumara=Central Tarahumara
+controlledvocabulary.language.central_tunebo=Central Tunebo
+controlledvocabulary.language.central_yupik=Central Yupik
+controlledvocabulary.language.central-eastern_niger_fulfulde=Central-Eastern Niger Fulfulde
+controlledvocabulary.language.centuum=CentÃēÃēm
+controlledvocabulary.language.cerma=Cerma
+controlledvocabulary.language.cha'ari=Cha'ari
+controlledvocabulary.language.chabu=Chabu
+controlledvocabulary.language.chachapoyas_quechua=Chachapoyas Quechua
+controlledvocabulary.language.chachi=Chachi
+controlledvocabulary.language.chadian_arabic=Chadian Arabic
+controlledvocabulary.language.chadian_sign_language=Chadian Sign Language
+controlledvocabulary.language.chadong=Chadong
+controlledvocabulary.language.chagatai=Chagatai
+controlledvocabulary.language.chaima=Chaima
+controlledvocabulary.language.chak=Chak
+controlledvocabulary.language.chakali=Chakali
+controlledvocabulary.language.chakavian=Chakavian
+controlledvocabulary.language.chakma=Chakma
+controlledvocabulary.language.chala=Chala
+controlledvocabulary.language.chaldean_neo-aramaic=Chaldean Neo-Aramaic
+controlledvocabulary.language.chalikha=Chalikha
+controlledvocabulary.language.chamacoco=Chamacoco
+controlledvocabulary.language.chamalal=Chamalal
+controlledvocabulary.language.chambeali=Chambeali
+controlledvocabulary.language.chambri=Chambri
+controlledvocabulary.language.chamicuro=Chamicuro
 controlledvocabulary.language.chamorro=Chamorro
+controlledvocabulary.language.chang_naga=Chang Naga
+controlledvocabulary.language.changriwa=Changriwa
+controlledvocabulary.language.changthang=Changthang
+controlledvocabulary.language.chantyal=Chantyal
+controlledvocabulary.language.chane=ChanÊ
+controlledvocabulary.language.chara=Chara
+controlledvocabulary.language.chaudangsi=Chaudangsi
+controlledvocabulary.language.chaura=Chaura
+controlledvocabulary.language.chavacano=Chavacano
+controlledvocabulary.language.chayahuita=Chayahuita
+controlledvocabulary.language.chayuco_mixtec=Chayuco Mixtec
+controlledvocabulary.language.chazumba_mixtec=Chazumba Mixtec
+controlledvocabulary.language.che=Che
 controlledvocabulary.language.chechen=Chechen
+controlledvocabulary.language.cheke_holo=Cheke Holo
+controlledvocabulary.language.chemakum=Chemakum
+controlledvocabulary.language.chenapian=Chenapian
+controlledvocabulary.language.chenchu=Chenchu
+controlledvocabulary.language.chenoua=Chenoua
+controlledvocabulary.language.chepang=Chepang
+controlledvocabulary.language.chepya=Chepya
+controlledvocabulary.language.cherepon=Cherepon
+controlledvocabulary.language.cherokee=Cherokee
+controlledvocabulary.language.chesu=Chesu
+controlledvocabulary.language.chetco=Chetco
+controlledvocabulary.language.chewong=Chewong
+controlledvocabulary.language.cheyenne=Cheyenne
+controlledvocabulary.language.chhattisgarhi=Chhattisgarhi
+controlledvocabulary.language.chhintange=Chhintange
+controlledvocabulary.language.chhulung=Chhulung
+controlledvocabulary.language.chiangmai_sign_language=Chiangmai Sign Language
+controlledvocabulary.language.chiapanec=Chiapanec
+controlledvocabulary.language.chibcha=Chibcha
+controlledvocabulary.language.chicahuaxtla_triqui=Chicahuaxtla Triqui
 controlledvocabulary.language.chichewa,_chewa,_nyanja=Chichewa, Chewa, Nyanja
+controlledvocabulary.language.chichicapan_zapotec=Chichicapan Zapotec
+controlledvocabulary.language.chichimeca-jonaz=Chichimeca-Jonaz
+controlledvocabulary.language.chickasaw=Chickasaw
+controlledvocabulary.language.chicomuceltec=Chicomuceltec
+controlledvocabulary.language.chiga=Chiga
+controlledvocabulary.language.chigmecatitlan_mixtec=ChigmecatitlÃĄn Mixtec
+controlledvocabulary.language.chilcotin=Chilcotin
+controlledvocabulary.language.chilean_sign_language=Chilean Sign Language
+controlledvocabulary.language.chilisso=Chilisso
+controlledvocabulary.language.chiltepec_chinantec=Chiltepec Chinantec
+controlledvocabulary.language.chimalapa_zoque=Chimalapa Zoque
+controlledvocabulary.language.chimariko=Chimariko
+controlledvocabulary.language.chimborazo_highland_quichua=Chimborazo Highland Quichua
+controlledvocabulary.language.chimila=Chimila
+controlledvocabulary.language.china_buriat=China Buriat
+controlledvocabulary.language.chinali=Chinali
+controlledvocabulary.language.chinbon_chin=Chinbon Chin
+controlledvocabulary.language.chincha_quechua=Chincha Quechua
 controlledvocabulary.language.chinese=Chinese
+controlledvocabulary.language.chinese_pidgin_english=Chinese Pidgin English
+controlledvocabulary.language.chinese_sign_language=Chinese Sign Language
+controlledvocabulary.language.chinook=Chinook
+controlledvocabulary.language.chinook_jargon=Chinook jargon
+controlledvocabulary.language.chipaya=Chipaya
+controlledvocabulary.language.chipewyan=Chipewyan
+controlledvocabulary.language.chippewa=Chippewa
+controlledvocabulary.language.chiquihuitlan_mazatec=ChiquihuitlÃĄn Mazatec
+controlledvocabulary.language.chiquitano=Chiquitano
+controlledvocabulary.language.chiquian_ancash_quechua=ChiquiÃĄn Ancash Quechua
+controlledvocabulary.language.chiripa=ChiripÃĄ
+controlledvocabulary.language.chiru=Chiru
+controlledvocabulary.language.chitimacha=Chitimacha
+controlledvocabulary.language.chitkuli_kinnauri=Chitkuli Kinnauri
+controlledvocabulary.language.chittagonian=Chittagonian
+controlledvocabulary.language.chitwania_tharu=Chitwania Tharu
+controlledvocabulary.language.choapan_zapotec=Choapan Zapotec
+controlledvocabulary.language.chocangacakha=Chocangacakha
+controlledvocabulary.language.chochotec=Chochotec
+controlledvocabulary.language.choctaw=Choctaw
+controlledvocabulary.language.chodri=Chodri
+controlledvocabulary.language.chokri_naga=Chokri Naga
+controlledvocabulary.language.chokwe=Chokwe
+controlledvocabulary.language.chol=Chol
+controlledvocabulary.language.cholon=CholÃŗn
+controlledvocabulary.language.chong=Chong
+controlledvocabulary.language.choni=Choni
+controlledvocabulary.language.chonyi-dzihana-kauma=Chonyi-Dzihana-Kauma
+controlledvocabulary.language.chopi=Chopi
+controlledvocabulary.language.chorasmian=Chorasmian
+controlledvocabulary.language.chorti=Chortí
+controlledvocabulary.language.chothe_naga=Chothe Naga
+controlledvocabulary.language.chrau=Chrau
+controlledvocabulary.language.chru=Chru
+controlledvocabulary.language.chuanqiandian_cluster_miao=Chuanqiandian Cluster Miao
+controlledvocabulary.language.chuave=Chuave
+controlledvocabulary.language.chug=Chug
+controlledvocabulary.language.chuj=Chuj
+controlledvocabulary.language.chuka=Chuka
+controlledvocabulary.language.chukot=Chukot
+controlledvocabulary.language.chukwa=Chukwa
+controlledvocabulary.language.chulym=Chulym
+controlledvocabulary.language.chumburung=Chumburung
+controlledvocabulary.language.chung=Chung
+controlledvocabulary.language.churahi=Churahi
+controlledvocabulary.language.old_church_slavonic=Church Slavonic, Church Slavic, Old Church Slavonic, Old Bulgarian
+controlledvocabulary.language.chut=Chut
+controlledvocabulary.language.chuukese=Chuukese
+controlledvocabulary.language.chuvantsy=Chuvantsy
 controlledvocabulary.language.chuvash=Chuvash
+controlledvocabulary.language.chuwabu=Chuwabu
+controlledvocabulary.language.chacobo=ChÃĄcobo
+controlledvocabulary.language.ci_gbe=Ci Gbe
+controlledvocabulary.language.cia-cia=Cia-Cia
+controlledvocabulary.language.cibak=Cibak
+controlledvocabulary.language.cicipu=Cicipu
+controlledvocabulary.language.cimbrian=Cimbrian
+controlledvocabulary.language.cinda-regi-tiyal=Cinda-Regi-Tiyal
+controlledvocabulary.language.cineni=Cineni
+controlledvocabulary.language.cinta_larga=Cinta Larga
+controlledvocabulary.language.cisalpine_gaulish=Cisalpine Gaulish
+controlledvocabulary.language.cishingini=Cishingini
+controlledvocabulary.language.citak=Citak
+controlledvocabulary.language.ciwogai=Ciwogai
+controlledvocabulary.language.clallam=Clallam
+controlledvocabulary.language.classical_armenian=Classical Armenian
+controlledvocabulary.language.classical_mandaic=Classical Mandaic
+controlledvocabulary.language.classical_mongolian=Classical Mongolian
+controlledvocabulary.language.classical_nahuatl=Classical Nahuatl
+controlledvocabulary.language.classical_newari=Classical Newari
+controlledvocabulary.language.classical_quechua=Classical Quechua
+controlledvocabulary.language.classical_sanskrit=Classical Sanskrit
+controlledvocabulary.language.classical_syriac=Classical Syriac
+controlledvocabulary.language.classical_tibetan=Classical Tibetan
+controlledvocabulary.language.coahuilteco=Coahuilteco
+controlledvocabulary.language.coast_miwok=Coast Miwok
+controlledvocabulary.language.coastal_konjo=Coastal Konjo
+controlledvocabulary.language.coatecas_altas_zapotec=Coatecas Altas Zapotec
+controlledvocabulary.language.coatepec_nahuatl=Coatepec Nahuatl
+controlledvocabulary.language.coatlan_mixe=CoatlÃĄn Mixe
+controlledvocabulary.language.coatlan_zapotec=CoatlÃĄn Zapotec
+controlledvocabulary.language.coatzospan_mixtec=Coatzospan Mixtec
+controlledvocabulary.language.cocama-cocamilla=Cocama-Cocamilla
+controlledvocabulary.language.cochimi=Cochimi
+controlledvocabulary.language.cocopa=Cocopa
+controlledvocabulary.language.cocos_islands_malay=Cocos Islands Malay
+controlledvocabulary.language.coeur_d'alene=Coeur d'Alene
+controlledvocabulary.language.cofan=CofÃĄn
+controlledvocabulary.language.cogui=Cogui
+controlledvocabulary.language.col=Col
+controlledvocabulary.language.colombian_sign_language=Colombian Sign Language
+controlledvocabulary.language.colonia_tovar_german=Colonia Tovar German
+controlledvocabulary.language.colorado=Colorado
+controlledvocabulary.language.columbia-wenatchi=Columbia-Wenatchi
+controlledvocabulary.language.comaltepec_chinantec=Comaltepec Chinantec
+controlledvocabulary.language.comanche=Comanche
+controlledvocabulary.language.comecrudo=Comecrudo
+controlledvocabulary.language.como_karim=Como Karim
+controlledvocabulary.language.comox=Comox
+controlledvocabulary.language.con=Con
+controlledvocabulary.language.congo_swahili=Congo Swahili
+controlledvocabulary.language.coos=Coos
+controlledvocabulary.language.copainala_zoque=CopainalÃĄ Zoque
+controlledvocabulary.language.copala_triqui=Copala Triqui
+controlledvocabulary.language.coptic=Coptic
+controlledvocabulary.language.coquille=Coquille
+controlledvocabulary.language.cori=Cori
 controlledvocabulary.language.cornish=Cornish
+controlledvocabulary.language.corongo_ancash_quechua=Corongo Ancash Quechua
 controlledvocabulary.language.corsican=Corsican
+controlledvocabulary.language.costa_rican_sign_language=Costa Rican Sign Language
+controlledvocabulary.language.cotabato_manobo=Cotabato Manobo
+controlledvocabulary.language.cotoname=Cotoname
+controlledvocabulary.language.cowlitz=Cowlitz
+controlledvocabulary.language.coyotepec_popoloca=Coyotepec Popoloca
+controlledvocabulary.language.coyutla_totonac=Coyutla Totonac
 controlledvocabulary.language.cree=Cree
-controlledvocabulary.language.croatian=Croatian
+controlledvocabulary.language.creek=Creek
+controlledvocabulary.language.crimean_tatar=Crimean Tatar
+controlledvocabulary.language.croatia_sign_language=Croatia Sign Language
+controlledvocabulary.language.cross_river_mbembe=Cross River Mbembe
+controlledvocabulary.language.crow=Crow
+controlledvocabulary.language.cruzeno=CruzeÃąo
+controlledvocabulary.language.cua=Cua
+controlledvocabulary.language.cuba_sign_language=Cuba Sign Language
+controlledvocabulary.language.cubeo=Cubeo
+controlledvocabulary.language.cuiba=Cuiba
+controlledvocabulary.language.cuitlatec=Cuitlatec
+controlledvocabulary.language.culina=Culina
+controlledvocabulary.language.cumanagoto=Cumanagoto
+controlledvocabulary.language.cumbric=Cumbric
+controlledvocabulary.language.cun=Cun
+controlledvocabulary.language.cuneiform_luwian=Cuneiform Luwian
+controlledvocabulary.language.cupeno=CupeÃąo
+controlledvocabulary.language.curonian=Curonian
+controlledvocabulary.language.curripaco=Curripaco
+controlledvocabulary.language.cusco_quechua=Cusco Quechua
+controlledvocabulary.language.cutchi-swahili=Cutchi-Swahili
+controlledvocabulary.language.cuvok=Cuvok
+controlledvocabulary.language.cuyamecalco_mixtec=Cuyamecalco Mixtec
+controlledvocabulary.language.cuyonon=Cuyonon
+controlledvocabulary.language.cwi_bwamu=Cwi Bwamu
+controlledvocabulary.language.cypriot_arabic=Cypriot Arabic
 controlledvocabulary.language.czech=Czech
+controlledvocabulary.language.czech_sign_language=Czech Sign Language
+controlledvocabulary.language.coong=Côông
+controlledvocabulary.language.da'a_kaili=Da'a Kaili
+controlledvocabulary.language.daai_chin=Daai Chin
+controlledvocabulary.language.daakaka=Daakaka
+controlledvocabulary.language.daantanai'=Daantanai'
+controlledvocabulary.language.daasanach=Daasanach
+controlledvocabulary.language.daatsĘŧiin=DaatsĘŧiĖin
+controlledvocabulary.language.daba=Daba
+controlledvocabulary.language.dabarre=Dabarre
+controlledvocabulary.language.dabe=Dabe
+controlledvocabulary.language.dacian=Dacian
+controlledvocabulary.language.dadi_dadi=Dadi Dadi
+controlledvocabulary.language.dadibi=Dadibi
+controlledvocabulary.language.dadiya=Dadiya
+controlledvocabulary.language.daga=Daga
+controlledvocabulary.language.dagaari_dioula=Dagaari Dioula
+controlledvocabulary.language.dagba=Dagba
+controlledvocabulary.language.dagbani=Dagbani
+controlledvocabulary.language.dagik=Dagik
+controlledvocabulary.language.dagoman=Dagoman
+controlledvocabulary.language.dahalik=Dahalik
+controlledvocabulary.language.dahalo=Dahalo
+controlledvocabulary.language.daho-doo=Daho-Doo
+controlledvocabulary.language.dai=Dai
+controlledvocabulary.language.dai_zhuang=Dai Zhuang
+controlledvocabulary.language.dair=Dair
+controlledvocabulary.language.dakka=Dakka
+controlledvocabulary.language.dakota=Dakota
+controlledvocabulary.language.dakpakha=Dakpakha
+controlledvocabulary.language.dalabon=Dalabon
+controlledvocabulary.language.dalmatian=Dalmatian
+controlledvocabulary.language.daloa_bete=Daloa BÊtÊ
+controlledvocabulary.language.dama=Dama
+controlledvocabulary.language.damakawa=Damakawa
+controlledvocabulary.language.damal=Damal
+controlledvocabulary.language.dambi=Dambi
+controlledvocabulary.language.dameli=Dameli
+controlledvocabulary.language.dampelas=Dampelas
+controlledvocabulary.language.dan=Dan
+controlledvocabulary.language.danaru=Danaru
+controlledvocabulary.language.danau=Danau
+controlledvocabulary.language.dandami_maria=Dandami Maria
+controlledvocabulary.language.dangaleat=DangalÊat
+controlledvocabulary.language.dangaura_tharu=Dangaura Tharu
 controlledvocabulary.language.danish=Danish
-controlledvocabulary.language.divehi,_dhivehi,_maldivian=Divehi, Dhivehi, Maldivian
+controlledvocabulary.language.danish_sign_language=Danish Sign Language
+controlledvocabulary.language.dano=Dano
+controlledvocabulary.language.danu=Danu
+controlledvocabulary.language.dao=Dao
+controlledvocabulary.language.daonda=Daonda
+controlledvocabulary.language.dar_daju_daju=Dar Daju Daju
+controlledvocabulary.language.dar_fur_daju=Dar Fur Daju
+controlledvocabulary.language.dar_sila_daju=Dar Sila Daju
+controlledvocabulary.language.darai=Darai
+controlledvocabulary.language.dargwa=Dargwa
+controlledvocabulary.language.dari=Dari
+controlledvocabulary.language.darkinyung=Darkinyung
+controlledvocabulary.language.darlong=Darlong
+controlledvocabulary.language.darmiya=Darmiya
+controlledvocabulary.language.daro-matu_melanau=Daro-Matu Melanau
+controlledvocabulary.language.dass=Dass
+controlledvocabulary.language.datooga=Datooga
+controlledvocabulary.language.daungwurrung=Daungwurrung
+controlledvocabulary.language.daur=Daur
+controlledvocabulary.language.davawenyo=Davawenyo
+controlledvocabulary.language.dawawa=Dawawa
+controlledvocabulary.language.dawera-daweloor=Dawera-Daweloor
+controlledvocabulary.language.dawik_kui=Dawik Kui
+controlledvocabulary.language.dawro=Dawro
+controlledvocabulary.language.day=Day
+controlledvocabulary.language.dayi=Dayi
+controlledvocabulary.language.daza=Daza
+controlledvocabulary.language.dazaga=Dazaga
+controlledvocabulary.language.deccan=Deccan
+controlledvocabulary.language.dedua=Dedua
+controlledvocabulary.language.defaka=Defaka
+controlledvocabulary.language.defi_gbe=Defi Gbe
+controlledvocabulary.language.deg=Deg
+controlledvocabulary.language.degema=Degema
+controlledvocabulary.language.degenan=Degenan
+controlledvocabulary.language.degexit'an=Degexit'an
+controlledvocabulary.language.dehu=Dehu
+controlledvocabulary.language.dehwari=Dehwari
+controlledvocabulary.language.dek=Dek
+controlledvocabulary.language.dela-oenale=Dela-Oenale
+controlledvocabulary.language.delaware=Delaware
+controlledvocabulary.language.delo=Delo
+controlledvocabulary.language.dem=Dem
+controlledvocabulary.language.dema=Dema
+controlledvocabulary.language.demisa=Demisa
+controlledvocabulary.language.demta=Demta
+controlledvocabulary.language.dendi_(benin)=Dendi (Benin)
+controlledvocabulary.language.dendi_(central_african_republic)=Dendi (Central African Republic)
+controlledvocabulary.language.dengese=Dengese
+controlledvocabulary.language.dengka=Dengka
+controlledvocabulary.language.deno=Deno
+controlledvocabulary.language.denya=Denya
+controlledvocabulary.language.deni=Dení
+controlledvocabulary.language.deori=Deori
+controlledvocabulary.language.dera_(indonesia)=Dera (Indonesia)
+controlledvocabulary.language.dera_(nigeria)=Dera (Nigeria)
+controlledvocabulary.language.desano=Desano
+controlledvocabulary.language.desiya=Desiya
+controlledvocabulary.language.dewas_rai=Dewas Rai
+controlledvocabulary.language.dewoin=Dewoin
+controlledvocabulary.language.dezfuli=Dezfuli
+controlledvocabulary.language.dghwede=Dghwede
+controlledvocabulary.language.dhaiso=Dhaiso
+controlledvocabulary.language.dhalandji=Dhalandji
+controlledvocabulary.language.dhangu-djangu=Dhangu-Djangu
+controlledvocabulary.language.dhanki=Dhanki
+controlledvocabulary.language.dhanwar_(nepal)=Dhanwar (Nepal)
+controlledvocabulary.language.dhao=Dhao
+controlledvocabulary.language.dharawal=Dharawal
+controlledvocabulary.language.dhargari=Dhargari
+controlledvocabulary.language.dharuk=Dharuk
+controlledvocabulary.language.dharumbal=Dharumbal
+controlledvocabulary.language.dhatki=Dhatki
+controlledvocabulary.language.dhimal=Dhimal
+controlledvocabulary.language.dhodia=Dhodia
+controlledvocabulary.language.dhofari_arabic=Dhofari Arabic
+controlledvocabulary.language.dhudhuroa=Dhudhuroa
+controlledvocabulary.language.dhundari=Dhundari
+controlledvocabulary.language.dhungaloo=Dhungaloo
+controlledvocabulary.language.dhurga=Dhurga
+controlledvocabulary.language.dhuwal=Dhuwal
+controlledvocabulary.language.dhuwaya=Dhuwaya
+controlledvocabulary.language.dia=Dia
+controlledvocabulary.language.dibabawon_manobo=Dibabawon Manobo
+controlledvocabulary.language.dibiyaso=Dibiyaso
+controlledvocabulary.language.dibo=Dibo
+controlledvocabulary.language.dibole=Dibole
+controlledvocabulary.language.dicamay_agta=Dicamay Agta
+controlledvocabulary.language.didinga=Didinga
+controlledvocabulary.language.dido=Dido
+controlledvocabulary.language.dieri=Dieri
+controlledvocabulary.language.digaro-mishmi=Digaro-Mishmi
+controlledvocabulary.language.digo=Digo
+controlledvocabulary.language.dii=Dii
+controlledvocabulary.language.dijim-bwilim=Dijim-Bwilim
+controlledvocabulary.language.dilling=Dilling
+controlledvocabulary.language.dima=Dima
+controlledvocabulary.language.dimasa=Dimasa
+controlledvocabulary.language.dimbong=Dimbong
+controlledvocabulary.language.dime=Dime
+controlledvocabulary.language.dimli_(individual_language)=Dimli (individual language)
+controlledvocabulary.language.ding=Ding
+controlledvocabulary.language.dinka=Dinka
+controlledvocabulary.language.dir-nyamzak-mbarimi=Dir-Nyamzak-Mbarimi
+controlledvocabulary.language.dirasha=Dirasha
+controlledvocabulary.language.diri=Diri
+controlledvocabulary.language.diriku=Diriku
+controlledvocabulary.language.dirim=Dirim
+controlledvocabulary.language.disa=Disa
+controlledvocabulary.language.ditammari=Ditammari
+controlledvocabulary.language.ditidaht=Ditidaht
+controlledvocabulary.language.diuwe=Diuwe
+controlledvocabulary.language.diuxi-tilantongo_mixtec=Diuxi-Tilantongo Mixtec
+controlledvocabulary.language.dixon_reef=Dixon Reef
+controlledvocabulary.language.dizin=Dizin
+controlledvocabulary.language.djabugay=Djabugay
+controlledvocabulary.language.djabwurrung=Djabwurrung
+controlledvocabulary.language.djadjawurrung=Djadjawurrung
+controlledvocabulary.language.djambarrpuyngu=Djambarrpuyngu
+controlledvocabulary.language.djamindjung=Djamindjung
+controlledvocabulary.language.djangun=Djangun
+controlledvocabulary.language.djawi=Djawi
+controlledvocabulary.language.djeebbana=Djeebbana
+controlledvocabulary.language.djimini_senoufo=Djimini Senoufo
+controlledvocabulary.language.djinang=Djinang
+controlledvocabulary.language.djinba=Djinba
+controlledvocabulary.language.djiwarli=Djiwarli
+controlledvocabulary.language.dobel=Dobel
+controlledvocabulary.language.dobu=Dobu
+controlledvocabulary.language.doe=Doe
+controlledvocabulary.language.doga=Doga
+controlledvocabulary.language.doghoro=Doghoro
+controlledvocabulary.language.dogoso=Dogoso
+controlledvocabulary.language.dogose=DogosÊ
+controlledvocabulary.language.dogri_(individual_language)=Dogri (individual language)
+controlledvocabulary.language.dogri_(macrolanguage)=Dogri (macrolanguage)
+controlledvocabulary.language.dogul_dom_dogon=Dogul Dom Dogon
+controlledvocabulary.language.doka=Doka
+controlledvocabulary.language.doko-uyanga=Doko-Uyanga
+controlledvocabulary.language.dokshi=Dokshi
+controlledvocabulary.language.dolgan=Dolgan
+controlledvocabulary.language.dolpo=Dolpo
+controlledvocabulary.language.dom=Dom
+controlledvocabulary.language.domaaki=Domaaki
+controlledvocabulary.language.domari=Domari
+controlledvocabulary.language.dombe=Dombe
+controlledvocabulary.language.dominican_sign_language=Dominican Sign Language
+controlledvocabulary.language.dompo=Dompo
+controlledvocabulary.language.domu=Domu
+controlledvocabulary.language.domung=Domung
+controlledvocabulary.language.dondo=Dondo
+controlledvocabulary.language.dong=Dong
+controlledvocabulary.language.dongo=Dongo
+controlledvocabulary.language.dongotono=Dongotono
+controlledvocabulary.language.dongshanba_lalo=Dongshanba Lalo
+controlledvocabulary.language.dongxiang=Dongxiang
+controlledvocabulary.language.donno_so_dogon=Donno So Dogon
+controlledvocabulary.language.doondo=Doondo
+controlledvocabulary.language.dori'o=Dori'o
+controlledvocabulary.language.doromu-koki=Doromu-Koki
+controlledvocabulary.language.dorze=Dorze
+controlledvocabulary.language.doso=Doso
+controlledvocabulary.language.dotyali=Dotyali
+controlledvocabulary.language.doutai=Doutai
+controlledvocabulary.language.doyayo=Doyayo
+controlledvocabulary.language.drents=Drents
+controlledvocabulary.language.drung=Drung
+controlledvocabulary.language.duala=Duala
+controlledvocabulary.language.duano=Duano
+controlledvocabulary.language.duau=Duau
+controlledvocabulary.language.dubli=Dubli
+controlledvocabulary.language.dubu=Dubu
+controlledvocabulary.language.dugun=Dugun
+controlledvocabulary.language.duguri=Duguri
+controlledvocabulary.language.dugwor=Dugwor
+controlledvocabulary.language.duhwa=Duhwa
+controlledvocabulary.language.duke=Duke
+controlledvocabulary.language.dulbu=Dulbu
+controlledvocabulary.language.duli-gey=Duli-Gey
+controlledvocabulary.language.duma=Duma
+controlledvocabulary.language.dumbea=Dumbea
+controlledvocabulary.language.dumi=Dumi
+controlledvocabulary.language.dumpas=Dumpas
+controlledvocabulary.language.dumun=Dumun
+controlledvocabulary.language.duna=Duna
+controlledvocabulary.language.dungan=Dungan
+controlledvocabulary.language.dungmali=Dungmali
+controlledvocabulary.language.dungra_bhil=Dungra Bhil
+controlledvocabulary.language.dungu=Dungu
+controlledvocabulary.language.dupaninan_agta=Dupaninan Agta
+controlledvocabulary.language.dura=Dura
+controlledvocabulary.language.duri=Duri
+controlledvocabulary.language.duriankere=Duriankere
+controlledvocabulary.language.durop=Durop
+controlledvocabulary.language.duruma=Duruma
+controlledvocabulary.language.duruwa=Duruwa
+controlledvocabulary.language.dusner=Dusner
+controlledvocabulary.language.dusun_deyah=Dusun Deyah
+controlledvocabulary.language.dusun_malang=Dusun Malang
+controlledvocabulary.language.dusun_witu=Dusun Witu
 controlledvocabulary.language.dutch=Dutch
+controlledvocabulary.language.dutch_sign_language=Dutch Sign Language
+controlledvocabulary.language.dutton_world_speedwords=Dutton World Speedwords
+controlledvocabulary.language.duungooma=Duungooma
+controlledvocabulary.language.duupa=Duupa
+controlledvocabulary.language.duvle=Duvle
+controlledvocabulary.language.duwai=Duwai
+controlledvocabulary.language.duwet=Duwet
+controlledvocabulary.language.duya=DuĖƒya
+controlledvocabulary.language.dwang=Dwang
+controlledvocabulary.language.dyaberdyaber=Dyaberdyaber
+controlledvocabulary.language.dyan=Dyan
+controlledvocabulary.language.dyangadi=Dyangadi
+controlledvocabulary.language.dyarim=Dyarim
+controlledvocabulary.language.dyirbal=Dyirbal
+controlledvocabulary.language.dyugun=Dyugun
+controlledvocabulary.language.dyula=Dyula
+controlledvocabulary.language.dza=Dza
+controlledvocabulary.language.dzalakha=Dzalakha
+controlledvocabulary.language.dzando=Dzando
+controlledvocabulary.language.dzao_min=Dzao Min
 controlledvocabulary.language.dzongkha=Dzongkha
+controlledvocabulary.language.dzuungoo=DzÚÚngoo
+controlledvocabulary.language.daw=DÃĸw
+controlledvocabulary.language.e=E
+controlledvocabulary.language.e'ma_buyang=E'ma Buyang
+controlledvocabulary.language.e'napa_woromaipu=E'Ãąapa Woromaipu
+controlledvocabulary.language.early_tripuri=Early Tripuri
+controlledvocabulary.language.east_ambae=East Ambae
+controlledvocabulary.language.east_berawan=East Berawan
+controlledvocabulary.language.east_damar=East Damar
+controlledvocabulary.language.east_futuna=East Futuna
+controlledvocabulary.language.east_kewa=East Kewa
+controlledvocabulary.language.east_limba=East Limba
+controlledvocabulary.language.east_makian=East Makian
+controlledvocabulary.language.east_masela=East Masela
+controlledvocabulary.language.east_nyala=East Nyala
+controlledvocabulary.language.east_tarangan=East Tarangan
+controlledvocabulary.language.east_yugur=East Yugur
+controlledvocabulary.language.eastern_abnaki=Eastern Abnaki
+controlledvocabulary.language.eastern_acipa=Eastern Acipa
+controlledvocabulary.language.eastern_apurimac_quechua=Eastern Apurímac Quechua
+controlledvocabulary.language.eastern_arrernte=Eastern Arrernte
+controlledvocabulary.language.eastern_balochi=Eastern Balochi
+controlledvocabulary.language.eastern_bolivian_guarani=Eastern Bolivian Guaraní
+controlledvocabulary.language.eastern_bontok=Eastern Bontok
+controlledvocabulary.language.eastern_bru=Eastern Bru
+controlledvocabulary.language.eastern_canadian_inuktitut=Eastern Canadian Inuktitut
+controlledvocabulary.language.eastern_cham=Eastern Cham
+controlledvocabulary.language.eastern_durango_nahuatl=Eastern Durango Nahuatl
+controlledvocabulary.language.eastern_egyptian_bedawi_arabic=Eastern Egyptian Bedawi Arabic
+controlledvocabulary.language.eastern_frisian=Eastern Frisian
+controlledvocabulary.language.eastern_gorkha_tamang=Eastern Gorkha Tamang
+controlledvocabulary.language.eastern_highland_chatino=Eastern Highland Chatino
+controlledvocabulary.language.eastern_highland_otomi=Eastern Highland Otomi
+controlledvocabulary.language.eastern_hongshuihe_zhuang=Eastern Hongshuihe Zhuang
+controlledvocabulary.language.eastern_huasteca_nahuatl=Eastern Huasteca Nahuatl
+controlledvocabulary.language.eastern_huishui_hmong=Eastern Huishui Hmong
+controlledvocabulary.language.eastern_karaboro=Eastern Karaboro
+controlledvocabulary.language.eastern_katu=Eastern Katu
+controlledvocabulary.language.eastern_kayah=Eastern Kayah
+controlledvocabulary.language.eastern_keres=Eastern Keres
+controlledvocabulary.language.eastern_khumi_chin=Eastern Khumi Chin
+controlledvocabulary.language.eastern_krahn=Eastern Krahn
+controlledvocabulary.language.eastern_lalu=Eastern Lalu
+controlledvocabulary.language.eastern_lawa=Eastern Lawa
+controlledvocabulary.language.eastern_magar=Eastern Magar
+controlledvocabulary.language.eastern_maninkakan=Eastern Maninkakan
+controlledvocabulary.language.eastern_mari=Eastern Mari
+controlledvocabulary.language.eastern_maroon_creole=Eastern Maroon Creole
+controlledvocabulary.language.eastern_meohang=Eastern Meohang
+controlledvocabulary.language.eastern_minyag=Eastern Minyag
+controlledvocabulary.language.eastern_mnong=Eastern Mnong
+controlledvocabulary.language.eastern_muria=Eastern Muria
+controlledvocabulary.language.eastern_ngad'a=Eastern Ngad'a
+controlledvocabulary.language.eastern_nisu=Eastern Nisu
+controlledvocabulary.language.eastern_ojibwa=Eastern Ojibwa
+controlledvocabulary.language.eastern_oromo=Eastern Oromo
+controlledvocabulary.language.eastern_parbate_kham=Eastern Parbate Kham
+controlledvocabulary.language.eastern_penan=Eastern Penan
+controlledvocabulary.language.eastern_pomo=Eastern Pomo
+controlledvocabulary.language.eastern_qiandong_miao=Eastern Qiandong Miao
+controlledvocabulary.language.eastern_subanen=Eastern Subanen
+controlledvocabulary.language.eastern_tamang=Eastern Tamang
+controlledvocabulary.language.eastern_tawbuid=Eastern Tawbuid
+controlledvocabulary.language.eastern_xiangxi_miao=Eastern Xiangxi Miao
+controlledvocabulary.language.eastern_xwla_gbe=Eastern Xwla Gbe
+controlledvocabulary.language.eastern_yiddish=Eastern Yiddish
+controlledvocabulary.language.ebira=Ebira
+controlledvocabulary.language.eblan=Eblan
+controlledvocabulary.language.ebrie=EbriÊ
+controlledvocabulary.language.ebughu=Ebughu
+controlledvocabulary.language.ecuadorian_sign_language=Ecuadorian Sign Language
+controlledvocabulary.language.ede_cabe=Ede Cabe
+controlledvocabulary.language.ede_ica=Ede Ica
+controlledvocabulary.language.ede_idaca=Ede Idaca
+controlledvocabulary.language.ede_ije=Ede Ije
+controlledvocabulary.language.edera_awyu=Edera Awyu
+controlledvocabulary.language.edolo=Edolo
+controlledvocabulary.language.edomite=Edomite
+controlledvocabulary.language.edopi=Edopi
+controlledvocabulary.language.efai=Efai
+controlledvocabulary.language.efe=Efe
+controlledvocabulary.language.efik=Efik
+controlledvocabulary.language.efutop=Efutop
+controlledvocabulary.language.ega=Ega
+controlledvocabulary.language.eggon=Eggon
+controlledvocabulary.language.egypt_sign_language=Egypt Sign Language
+controlledvocabulary.language.egyptian_(ancient)=Egyptian (Ancient)
+controlledvocabulary.language.egyptian_arabic=Egyptian Arabic
+controlledvocabulary.language.ehueun=Ehueun
+controlledvocabulary.language.eipomek=Eipomek
+controlledvocabulary.language.eitiep=Eitiep
+controlledvocabulary.language.ejagham=Ejagham
+controlledvocabulary.language.ejamat=Ejamat
+controlledvocabulary.language.ekai_chin=Ekai Chin
+controlledvocabulary.language.ekajuk=Ekajuk
+controlledvocabulary.language.ekari=Ekari
+controlledvocabulary.language.eki=Eki
+controlledvocabulary.language.ekit=Ekit
+controlledvocabulary.language.ekpeye=Ekpeye
+controlledvocabulary.language.el_alto_zapotec=El Alto Zapotec
+controlledvocabulary.language.el_hugeirat=El Hugeirat
+controlledvocabulary.language.el_molo=El Molo
+controlledvocabulary.language.el_nayar_cora=El Nayar Cora
+controlledvocabulary.language.elamite=Elamite
+controlledvocabulary.language.eleme=Eleme
+controlledvocabulary.language.elepi=Elepi
+controlledvocabulary.language.elfdalian=Elfdalian
+controlledvocabulary.language.elip=Elip
+controlledvocabulary.language.elkei=Elkei
+controlledvocabulary.language.elotepec_zapotec=Elotepec Zapotec
+controlledvocabulary.language.eloyi=Eloyi
+controlledvocabulary.language.elseng=Elseng
+controlledvocabulary.language.elu=Elu
+controlledvocabulary.language.elymian=Elymian
+controlledvocabulary.language.emae=Emae
+controlledvocabulary.language.emai-iuleha-ora=Emai-Iuleha-Ora
+controlledvocabulary.language.eman=Eman
+controlledvocabulary.language.embaloh=Embaloh
+controlledvocabulary.language.embera-baudo=EmberÃĄ-BaudÃŗ
+controlledvocabulary.language.embera-catio=EmberÃĄ-Catío
+controlledvocabulary.language.embera-chami=EmberÃĄ-Chamí
+controlledvocabulary.language.embera-tado=EmberÃĄ-TadÃŗ
+controlledvocabulary.language.embu=Embu
+controlledvocabulary.language.emerillon=Emerillon
+controlledvocabulary.language.emilian=Emilian
+controlledvocabulary.language.emplawas=Emplawas
+controlledvocabulary.language.emumu=Emumu
+controlledvocabulary.language.en=En
+controlledvocabulary.language.enawene-nawe=EnawenÊ-NawÊ
+controlledvocabulary.language.ende=Ende
+controlledvocabulary.language.enga=Enga
+controlledvocabulary.language.engdewu=Engdewu
+controlledvocabulary.language.engenni=Engenni
+controlledvocabulary.language.enggano=Enggano
 controlledvocabulary.language.english=English
+controlledvocabulary.language.enlhet=Enlhet
+controlledvocabulary.language.enrekang=Enrekang
+controlledvocabulary.language.enu=Enu
+controlledvocabulary.language.enwan_(akwa_ibom_state)=Enwan (Akwa Ibom State)
+controlledvocabulary.language.enwan_(edo_state)=Enwan (Edo State)
+controlledvocabulary.language.enxet=Enxet
+controlledvocabulary.language.enya=Enya
+controlledvocabulary.language.epena=Epena
+controlledvocabulary.language.epi-olmec=Epi-Olmec
+controlledvocabulary.language.epie=Epie
+controlledvocabulary.language.epigraphic_mayan=Epigraphic Mayan
+controlledvocabulary.language.eravallan=Eravallan
+controlledvocabulary.language.erave=Erave
+controlledvocabulary.language.ere=Ere
+controlledvocabulary.language.eritai=Eritai
+controlledvocabulary.language.erokwanas=Erokwanas
+controlledvocabulary.language.erre=Erre
+controlledvocabulary.language.erromintxela=Erromintxela
+controlledvocabulary.language.ersu=Ersu
+controlledvocabulary.language.eruwa=Eruwa
+controlledvocabulary.language.erzya=Erzya
+controlledvocabulary.language.esan=Esan
+controlledvocabulary.language.ese=Ese
+controlledvocabulary.language.ese_ejja=Ese Ejja
+controlledvocabulary.language.eshtehardi=Eshtehardi
+controlledvocabulary.language.esimbi=Esimbi
+controlledvocabulary.language.eskayan=Eskayan
 controlledvocabulary.language.esperanto=Esperanto
+controlledvocabulary.language.esselen=Esselen
+controlledvocabulary.language.estado_de_mexico_otomi=Estado de MÊxico Otomi
 controlledvocabulary.language.estonian=Estonian
+controlledvocabulary.language.estonian_sign_language=Estonian Sign Language
+controlledvocabulary.language.esuma=Esuma
+controlledvocabulary.language.etchemin=Etchemin
+controlledvocabulary.language.etebi=Etebi
+controlledvocabulary.language.eten=Eten
+controlledvocabulary.language.eteocretan=Eteocretan
+controlledvocabulary.language.eteocypriot=Eteocypriot
+controlledvocabulary.language.ethiopian_sign_language=Ethiopian Sign Language
+controlledvocabulary.language.etkywan=Etkywan
+controlledvocabulary.language.eton_(cameroon)=Eton (Cameroon)
+controlledvocabulary.language.eton_(vanuatu)=Eton (Vanuatu)
+controlledvocabulary.language.etruscan=Etruscan
+controlledvocabulary.language.etulo=Etulo
+controlledvocabulary.language.eudeve=Eudeve
+controlledvocabulary.language.evant=Evant
+controlledvocabulary.language.even=Even
+controlledvocabulary.language.evenki=Evenki
+controlledvocabulary.language.eviya=Eviya
+controlledvocabulary.language.ewage-notu=Ewage-Notu
 controlledvocabulary.language.ewe=Ewe
+controlledvocabulary.language.ewondo=Ewondo
+controlledvocabulary.language.extremaduran=Extremaduran
+controlledvocabulary.language.eyak=Eyak
+controlledvocabulary.language.ezaa=Ezaa
+controlledvocabulary.language.fa_d'ambu=Fa d'Ambu
+controlledvocabulary.language.fagani=Fagani
+controlledvocabulary.language.faifi=Faifi
+controlledvocabulary.language.faire_atta=Faire Atta
+controlledvocabulary.language.faita=Faita
+controlledvocabulary.language.faiwol=Faiwol
+controlledvocabulary.language.fala=Fala
+controlledvocabulary.language.falam_chin=Falam Chin
+controlledvocabulary.language.fali=Fali
+controlledvocabulary.language.faliscan=Faliscan
+controlledvocabulary.language.fam=Fam
+controlledvocabulary.language.fanagalo=Fanagalo
+controlledvocabulary.language.fanamaket=Fanamaket
+controlledvocabulary.language.fanbak=Fanbak
+controlledvocabulary.language.fang_(cameroon)=Fang (Cameroon)
+controlledvocabulary.language.fang_(equatorial_guinea)=Fang (Equatorial Guinea)
+controlledvocabulary.language.fania=Fania
+controlledvocabulary.language.fanti=Fanti
+controlledvocabulary.language.far_western_muria=Far Western Muria
+controlledvocabulary.language.farefare=Farefare
 controlledvocabulary.language.faroese=Faroese
+controlledvocabulary.language.fas=Fas
+controlledvocabulary.language.fasu=Fasu
+controlledvocabulary.language.fataleka=Fataleka
+controlledvocabulary.language.fataluku=Fataluku
+controlledvocabulary.language.fayu=Fayu
+controlledvocabulary.language.fe'fe'=Fe'fe'
+controlledvocabulary.language.fembe=Fembe
+controlledvocabulary.language.fernando_po_creole_english=Fernando Po Creole English
+controlledvocabulary.language.feroge=Feroge
+controlledvocabulary.language.fiji_hindi=Fiji Hindi
 controlledvocabulary.language.fijian=Fijian
+controlledvocabulary.language.filipino=Filipino
+controlledvocabulary.language.filomena_mata-coahuitlan_totonac=Filomena Mata-CoahuitlÃĄn Totonac
+controlledvocabulary.language.finland-swedish_sign_language=Finland-Swedish Sign Language
 controlledvocabulary.language.finnish=Finnish
+controlledvocabulary.language.finnish_sign_language=Finnish Sign Language
+controlledvocabulary.language.finongan=Finongan
+controlledvocabulary.language.fipa=Fipa
+controlledvocabulary.language.firan=Firan
+controlledvocabulary.language.fiwaga=Fiwaga
+controlledvocabulary.language.flaaitaal=Flaaitaal
+controlledvocabulary.language.flinders_island=Flinders Island
+controlledvocabulary.language.foau=Foau
+controlledvocabulary.language.foi=Foi
+controlledvocabulary.language.foia_foia=Foia Foia
+controlledvocabulary.language.folopa=Folopa
+controlledvocabulary.language.foma=Foma
+controlledvocabulary.language.fon=Fon
+controlledvocabulary.language.fongoro=Fongoro
+controlledvocabulary.language.foodo=Foodo
+controlledvocabulary.language.forak=Forak
+controlledvocabulary.language.fordata=Fordata
+controlledvocabulary.language.fore=Fore
+controlledvocabulary.language.forest_enets=Forest Enets
+controlledvocabulary.language.fortsenal=Fortsenal
+controlledvocabulary.language.francisco_leon_zoque=Francisco LeÃŗn Zoque
+controlledvocabulary.language.frankish=Frankish
 controlledvocabulary.language.french=French
-controlledvocabulary.language.fula,_fulah,_pulaar,_pular=Fula, Fulah, Pulaar, Pular
+controlledvocabulary.language.french_sign_language=French Sign Language
+controlledvocabulary.language.friulian=Friulian
+controlledvocabulary.language.fula,_fulah=Fula, Fulah
+controlledvocabulary.language.fuliiru=Fuliiru
+controlledvocabulary.language.fulnio=Fulniô
+controlledvocabulary.language.fum=Fum
+controlledvocabulary.language.fungwa=Fungwa
+controlledvocabulary.language.fur=Fur
+controlledvocabulary.language.furu=Furu
+controlledvocabulary.language.futuna-aniwa=Futuna-Aniwa
+controlledvocabulary.language.fuyug=Fuyug
+controlledvocabulary.language.fwe=Fwe
+controlledvocabulary.language.fwai=FwÃĸi
+controlledvocabulary.language.fyam=Fyam
+controlledvocabulary.language.fyer=Fyer
+controlledvocabulary.language.ga=Ga
+controlledvocabulary.language.ga'anda=Ga'anda
+controlledvocabulary.language.ga'dang=Ga'dang
+controlledvocabulary.language.gaa=Gaa
+controlledvocabulary.language.gaam=Gaam
+controlledvocabulary.language.gabi-gabi=Gabi-Gabi
+controlledvocabulary.language.gabri=Gabri
+controlledvocabulary.language.gabrielino-fernandeno=Gabrielino-FernandeÃąo
+controlledvocabulary.language.gadang=Gadang
+controlledvocabulary.language.gaddang=Gaddang
+controlledvocabulary.language.gaddi=Gaddi
+controlledvocabulary.language.gade=Gade
+controlledvocabulary.language.gade_lohar=Gade Lohar
+controlledvocabulary.language.gadjerawang=Gadjerawang
+controlledvocabulary.language.gadsup=Gadsup
+controlledvocabulary.language.gaelic,_scottish_gaelic=Gaelic, Scottish Gaelic
+controlledvocabulary.language.gafat=Gafat
+controlledvocabulary.language.gagadu=Gagadu
+controlledvocabulary.language.gagauz=Gagauz
+controlledvocabulary.language.gagnoa_bete=Gagnoa BÊtÊ
+controlledvocabulary.language.gagu=Gagu
+controlledvocabulary.language.gahri=Gahri
+controlledvocabulary.language.gaikundi=Gaikundi
+controlledvocabulary.language.gail=Gail
+controlledvocabulary.language.gaina=Gaina
+controlledvocabulary.language.gal=Gal
+controlledvocabulary.language.galambu=Galambu
+controlledvocabulary.language.galatian=Galatian
+controlledvocabulary.language.galela=Galela
+controlledvocabulary.language.galeya=Galeya
+controlledvocabulary.language.galibi_carib=Galibi Carib
+controlledvocabulary.language.galice=Galice
 controlledvocabulary.language.galician=Galician
+controlledvocabulary.language.galindan=Galindan
+controlledvocabulary.language.gallurese_sardinian=Gallurese Sardinian
+controlledvocabulary.language.galo=Galo
+controlledvocabulary.language.galolen=Galolen
+controlledvocabulary.language.gamale_kham=Gamale Kham
+controlledvocabulary.language.gambera=Gambera
+controlledvocabulary.language.gambian_wolof=Gambian Wolof
+controlledvocabulary.language.gamilaraay=Gamilaraay
+controlledvocabulary.language.gamit=Gamit
+controlledvocabulary.language.gamkonora=Gamkonora
+controlledvocabulary.language.gamo=Gamo
+controlledvocabulary.language.gamo-ningi=Gamo-Ningi
+controlledvocabulary.language.gan_chinese=Gan Chinese
+controlledvocabulary.language.gana=Gana
+controlledvocabulary.language.ganang=Ganang
+controlledvocabulary.language.ganda=Ganda
+controlledvocabulary.language.gane=Gane
+controlledvocabulary.language.ganggalida=Ganggalida
+controlledvocabulary.language.ganglau=Ganglau
+controlledvocabulary.language.gangte=Gangte
+controlledvocabulary.language.gangulu=Gangulu
+controlledvocabulary.language.gants=Gants
+controlledvocabulary.language.ganza=Ganza
+controlledvocabulary.language.ganzi=Ganzi
+controlledvocabulary.language.gao=Gao
+controlledvocabulary.language.gapapaiwa=Gapapaiwa
+controlledvocabulary.language.garhwali=Garhwali
+controlledvocabulary.language.garifuna=Garifuna
+controlledvocabulary.language.garig-ilgar=Garig-Ilgar
+controlledvocabulary.language.garingbal=Garingbal
+controlledvocabulary.language.garlali=Garlali
+controlledvocabulary.language.garo=Garo
+controlledvocabulary.language.garre=Garre
+controlledvocabulary.language.garrwa=Garrwa
+controlledvocabulary.language.garus=Garus
+controlledvocabulary.language.garza=Garza
+controlledvocabulary.language.gata'=Gata'
+controlledvocabulary.language.gavak=Gavak
+controlledvocabulary.language.gavar=Gavar
+controlledvocabulary.language.gaviao_do_jiparana=GaviÃŖo Do JiparanÃĄ
+controlledvocabulary.language.gawar-bati=Gawar-Bati
+controlledvocabulary.language.gawri=Gawri
+controlledvocabulary.language.gawwada=Gawwada
+controlledvocabulary.language.gayil=Gayil
+controlledvocabulary.language.gayo=Gayo
+controlledvocabulary.language.gazi=Gazi
+controlledvocabulary.language.gaɓogbo=Gaɓogbo
+controlledvocabulary.language.gbagyi=Gbagyi
+controlledvocabulary.language.gbanu=Gbanu
+controlledvocabulary.language.gbanziri=Gbanziri
+controlledvocabulary.language.gbari=Gbari
+controlledvocabulary.language.gbaya_(central_african_republic)=Gbaya (Central African Republic)
+controlledvocabulary.language.gbaya_(sudan)=Gbaya (Sudan)
+controlledvocabulary.language.gbaya-bossangoa=Gbaya-Bossangoa
+controlledvocabulary.language.gbaya-bozoum=Gbaya-Bozoum
+controlledvocabulary.language.gbaya-mbodomo=Gbaya-Mbodomo
+controlledvocabulary.language.gbayi=Gbayi
+controlledvocabulary.language.gbesi_gbe=Gbesi Gbe
+controlledvocabulary.language.gbii=Gbii
+controlledvocabulary.language.gbin=Gbin
+controlledvocabulary.language.gbiri-niragu=Gbiri-Niragu
+controlledvocabulary.language.gboloo_grebo=Gboloo Grebo
+controlledvocabulary.language.ge=Ge
+controlledvocabulary.language.geba_karen=Geba Karen
+controlledvocabulary.language.gebe=Gebe
+controlledvocabulary.language.gedaged=Gedaged
+controlledvocabulary.language.gedeo=Gedeo
+controlledvocabulary.language.geez=Geez
+controlledvocabulary.language.geji=Geji
+controlledvocabulary.language.geko_karen=Geko Karen
+controlledvocabulary.language.gela=Gela
+controlledvocabulary.language.geme=Geme
+controlledvocabulary.language.gen=Gen
+controlledvocabulary.language.gende=Gende
+controlledvocabulary.language.gengle=Gengle
 controlledvocabulary.language.georgian=Georgian
+controlledvocabulary.language.gepo=Gepo
+controlledvocabulary.language.gera=Gera
+controlledvocabulary.language.gerai=Gerai
 controlledvocabulary.language.german=German
-controlledvocabulary.language.greek_(modern)=Greek (modern)
-controlledvocabulary.language.guarani=Guaraní
+controlledvocabulary.language.german_sign_language=German Sign Language
+controlledvocabulary.language.geruma=Geruma
+controlledvocabulary.language.geser-gorom=Geser-Gorom
+controlledvocabulary.language.ghadames=Ghadamès
+controlledvocabulary.language.ghanaian_pidgin_english=Ghanaian Pidgin English
+controlledvocabulary.language.ghanaian_sign_language=Ghanaian Sign Language
+controlledvocabulary.language.ghandruk_sign_language=Ghandruk Sign Language
+controlledvocabulary.language.ghanongga=Ghanongga
+controlledvocabulary.language.ghari=Ghari
+controlledvocabulary.language.ghayavi=Ghayavi
+controlledvocabulary.language.gheg_albanian=Gheg Albanian
+controlledvocabulary.language.ghera=Ghera
+controlledvocabulary.language.ghodoberi=Ghodoberi
+controlledvocabulary.language.ghomara=Ghomara
+controlledvocabulary.language.ghomala'=GhomÃĄlÃĄ'
+controlledvocabulary.language.ghotuo=Ghotuo
+controlledvocabulary.language.ghulfan=Ghulfan
+controlledvocabulary.language.giangan=Giangan
+controlledvocabulary.language.gibanawa=Gibanawa
+controlledvocabulary.language.gidar=Gidar
+controlledvocabulary.language.giiwo=Giiwo
+controlledvocabulary.language.gikyode=Gikyode
+controlledvocabulary.language.gilaki=Gilaki
+controlledvocabulary.language.gilbertese=Gilbertese
+controlledvocabulary.language.gilima=Gilima
+controlledvocabulary.language.gilyak=Gilyak
+controlledvocabulary.language.gimi_(eastern_highlands)=Gimi (Eastern Highlands)
+controlledvocabulary.language.gimi_(west_new_britain)=Gimi (West New Britain)
+controlledvocabulary.language.gimme=Gimme
+controlledvocabulary.language.gimnime=Gimnime
+controlledvocabulary.language.ginuman=Ginuman
+controlledvocabulary.language.ginyanga=Ginyanga
+controlledvocabulary.language.girawa=Girawa
+controlledvocabulary.language.girirra=Girirra
+controlledvocabulary.language.giryama=Giryama
+controlledvocabulary.language.githabul=Githabul
+controlledvocabulary.language.gitonga=Gitonga
+controlledvocabulary.language.gitua=Gitua
+controlledvocabulary.language.gitxsan=Gitxsan
+controlledvocabulary.language.giyug=Giyug
+controlledvocabulary.language.gizrra=Gizrra
+controlledvocabulary.language.glaro-twabo=Glaro-Twabo
+controlledvocabulary.language.glavda=Glavda
+controlledvocabulary.language.glio-oubi=Glio-Oubi
+controlledvocabulary.language.gnau=Gnau
+controlledvocabulary.language.goan_konkani=Goan Konkani
+controlledvocabulary.language.goaria=Goaria
+controlledvocabulary.language.gobasi=Gobasi
+controlledvocabulary.language.gobu=Gobu
+controlledvocabulary.language.godie=GodiÊ
+controlledvocabulary.language.godwari=Godwari
+controlledvocabulary.language.goemai=Goemai
+controlledvocabulary.language.gofa=Gofa
+controlledvocabulary.language.gogo=Gogo
+controlledvocabulary.language.gogodala=Gogodala
+controlledvocabulary.language.gokana=Gokana
+controlledvocabulary.language.gola=Gola
+controlledvocabulary.language.golin=Golin
+controlledvocabulary.language.golpa=Golpa
+controlledvocabulary.language.gondi=Gondi
+controlledvocabulary.language.gone_dau=Gone Dau
+controlledvocabulary.language.gongduk=Gongduk
+controlledvocabulary.language.gonja=Gonja
+controlledvocabulary.language.goo=Goo
+controlledvocabulary.language.gooniyandi=Gooniyandi
+controlledvocabulary.language.gor=Gor
+controlledvocabulary.language.gorakor=Gorakor
+controlledvocabulary.language.gorap=Gorap
+controlledvocabulary.language.goreng=Goreng
+controlledvocabulary.language.gorontalo=Gorontalo
+controlledvocabulary.language.gorovu=Gorovu
+controlledvocabulary.language.gorowa=Gorowa
+controlledvocabulary.language.gothic=Gothic
+controlledvocabulary.language.goundo=Goundo
+controlledvocabulary.language.gourmanchema=GourmanchÊma
+controlledvocabulary.language.gowlan=Gowlan
+controlledvocabulary.language.gowli=Gowli
+controlledvocabulary.language.gowro=Gowro
+controlledvocabulary.language.gozarkhani=Gozarkhani
+controlledvocabulary.language.grangali=Grangali
+controlledvocabulary.language.grass_koiari=Grass Koiari
+controlledvocabulary.language.grebo=Grebo
+controlledvocabulary.language.greek_sign_language=Greek Sign Language
+controlledvocabulary.language.green_gelao=Green Gelao
+controlledvocabulary.language.greenlandic,_kalaallisut=Greenlandic, Kalaallisut
+controlledvocabulary.language.grenadian_creole_english=Grenadian Creole English
+controlledvocabulary.language.gresi=Gresi
+controlledvocabulary.language.groma=Groma
+controlledvocabulary.language.gronings=Gronings
+controlledvocabulary.language.gros_ventre=Gros Ventre
+controlledvocabulary.language.gua=Gua
+controlledvocabulary.language.guadeloupean_creole_french=Guadeloupean Creole French
+controlledvocabulary.language.guahibo=Guahibo
+controlledvocabulary.language.guajajara=GuajajÃĄra
+controlledvocabulary.language.guaja=GuajÃĄ
+controlledvocabulary.language.guambiano=Guambiano
+controlledvocabulary.language.guana_(brazil)=Guana (Brazil)
+controlledvocabulary.language.guana_(paraguay)=Guana (Paraguay)
+controlledvocabulary.language.guanano=Guanano
+controlledvocabulary.language.guanche=Guanche
+controlledvocabulary.language.guanyinqiao=Guanyinqiao
+controlledvocabulary.language.guarani=Guarani, Guaraní
+controlledvocabulary.language.guarayu=Guarayu
+controlledvocabulary.language.guarequena=Guarequena
+controlledvocabulary.language.guatemalan_sign_language=Guatemalan Sign Language
+controlledvocabulary.language.guato=GuatÃŗ
+controlledvocabulary.language.guayabero=Guayabero
+controlledvocabulary.language.gudang=Gudang
+controlledvocabulary.language.gudanji=Gudanji
+controlledvocabulary.language.gude=Gude
+controlledvocabulary.language.gudu=Gudu
+controlledvocabulary.language.guduf-gava=Guduf-Gava
+controlledvocabulary.language.guerrero_amuzgo=Guerrero Amuzgo
+controlledvocabulary.language.guerrero_nahuatl=Guerrero Nahuatl
+controlledvocabulary.language.guevea_de_humboldt_zapotec=Guevea De Humboldt Zapotec
+controlledvocabulary.language.gugadj=Gugadj
+controlledvocabulary.language.gugu_badhun=Gugu Badhun
+controlledvocabulary.language.gugu_warra=Gugu Warra
+controlledvocabulary.language.gugubera=Gugubera
+controlledvocabulary.language.guhu-samane=Guhu-Samane
+controlledvocabulary.language.guianese_creole_french=Guianese Creole French
+controlledvocabulary.language.guibei_zhuang=Guibei Zhuang
+controlledvocabulary.language.guiberoua_bete=Guiberoua BÊte
+controlledvocabulary.language.guibian_zhuang=Guibian Zhuang
+controlledvocabulary.language.guinea_kpelle=Guinea Kpelle
+controlledvocabulary.language.guinea-bissau_sign_language=Guinea-Bissau Sign Language
+controlledvocabulary.language.guinean_sign_language=Guinean Sign Language
+controlledvocabulary.language.guiqiong=Guiqiong
 controlledvocabulary.language.gujarati=Gujarati
-controlledvocabulary.language.haitian,_haitian_creole=Haitian, Haitian Creole
+controlledvocabulary.language.gujari=Gujari
+controlledvocabulary.language.gula_(central_african_republic)=Gula (Central African Republic)
+controlledvocabulary.language.gula_(chad)=Gula (Chad)
+controlledvocabulary.language.gula_iro=Gula Iro
+controlledvocabulary.language.gula'alaa=Gula'alaa
+controlledvocabulary.language.gulay=Gulay
+controlledvocabulary.language.gule=Gule
+controlledvocabulary.language.gulf_arabic=Gulf Arabic
+controlledvocabulary.language.gumalu=Gumalu
+controlledvocabulary.language.gumatj=Gumatj
+controlledvocabulary.language.gumawana=Gumawana
+controlledvocabulary.language.gumuz=Gumuz
+controlledvocabulary.language.gun=Gun
+controlledvocabulary.language.gundi=Gundi
+controlledvocabulary.language.gunditjmara=Gunditjmara
+controlledvocabulary.language.gundungurra=Gundungurra
+controlledvocabulary.language.gungabula=Gungabula
+controlledvocabulary.language.gungu=Gungu
+controlledvocabulary.language.guntai=Guntai
+controlledvocabulary.language.gunwinggu=Gunwinggu
+controlledvocabulary.language.gunya=Gunya
+controlledvocabulary.language.gupa-abawa=Gupa-Abawa
+controlledvocabulary.language.gupapuyngu=Gupapuyngu
+controlledvocabulary.language.guramalum=Guramalum
+controlledvocabulary.language.gurani=Gurani
+controlledvocabulary.language.gurdjar=Gurdjar
+controlledvocabulary.language.gureng_gureng=Gureng Gureng
+controlledvocabulary.language.gurgula=Gurgula
+controlledvocabulary.language.guriaso=Guriaso
+controlledvocabulary.language.gurindji=Gurindji
+controlledvocabulary.language.gurindji_kriol=Gurindji Kriol
+controlledvocabulary.language.gurmana=Gurmana
+controlledvocabulary.language.guro=Guro
+controlledvocabulary.language.gurr-goni=Gurr-goni
+controlledvocabulary.language.gurung=Gurung
+controlledvocabulary.language.guruntum-mbaaru=Guruntum-Mbaaru
+controlledvocabulary.language.gusii=Gusii
+controlledvocabulary.language.gusilay=Gusilay
+controlledvocabulary.language.guugu_yimidhirr=Guugu Yimidhirr
+controlledvocabulary.language.guwa=Guwa
+controlledvocabulary.language.guwamu=Guwamu
+controlledvocabulary.language.guya=Guya
+controlledvocabulary.language.guyanese_creole_english=Guyanese Creole English
+controlledvocabulary.language.guyani=Guyani
+controlledvocabulary.language.gvoko=Gvoko
+controlledvocabulary.language.gwa=Gwa
+controlledvocabulary.language.gwahatike=Gwahatike
+controlledvocabulary.language.gwak=Gwak
+controlledvocabulary.language.gwamhi-wuri=Gwamhi-Wuri
+controlledvocabulary.language.gwandara=Gwandara
+controlledvocabulary.language.gweda=Gweda
+controlledvocabulary.language.gweno=Gweno
+controlledvocabulary.language.gwere=Gwere
+controlledvocabulary.language.gwich'in=GwichĘŧin
+controlledvocabulary.language.gyalsumdo=Gyalsumdo
+controlledvocabulary.language.gyele=Gyele
+controlledvocabulary.language.gyem=Gyem
+controlledvocabulary.language.guila_zapotec=GÃŧilÃĄ Zapotec
+controlledvocabulary.language.gandhari=GāndhārÄĢ
+controlledvocabulary.language.ha=Ha
+controlledvocabulary.language.habu=Habu
+controlledvocabulary.language.hadiyya=Hadiyya
+controlledvocabulary.language.hadothi=Hadothi
+controlledvocabulary.language.hadrami=Hadrami
+controlledvocabulary.language.hadrami_arabic=Hadrami Arabic
+controlledvocabulary.language.hadza=Hadza
+controlledvocabulary.language.haeke=Haeke
+controlledvocabulary.language.hahon=Hahon
+controlledvocabulary.language.haida=Haida
+controlledvocabulary.language.haigwai=Haigwai
+controlledvocabulary.language.haiphong_sign_language=Haiphong Sign Language
+controlledvocabulary.language.haisla=Haisla
+controlledvocabulary.language.haitian_creole,_haitian=Haitian Creole, Haitian
+controlledvocabulary.language.haitian_vodoun_culture_language=Haitian Vodoun Culture Language
+controlledvocabulary.language.haiĮom=HaiĮom
+controlledvocabulary.language.haji=Haji
+controlledvocabulary.language.hajong=Hajong
+controlledvocabulary.language.hakha_chin=Hakha Chin
+controlledvocabulary.language.hakka_chinese=Hakka Chinese
+controlledvocabulary.language.hako=HakÃļ
+controlledvocabulary.language.halang=Halang
+controlledvocabulary.language.halang_doan=Halang Doan
+controlledvocabulary.language.halbi=Halbi
+controlledvocabulary.language.halh_mongolian=Halh Mongolian
+controlledvocabulary.language.halia=Halia
+controlledvocabulary.language.halkomelem=Halkomelem
+controlledvocabulary.language.hamap=Hamap
+controlledvocabulary.language.hamba=Hamba
+controlledvocabulary.language.hamer-banna=Hamer-Banna
+controlledvocabulary.language.hamtai=Hamtai
+controlledvocabulary.language.han=Han
+controlledvocabulary.language.hanga=Hanga
+controlledvocabulary.language.hanga_hundi=Hanga Hundi
+controlledvocabulary.language.hangaza=Hangaza
+controlledvocabulary.language.hani=Hani
+controlledvocabulary.language.hano=Hano
+controlledvocabulary.language.hanoi_sign_language=Hanoi Sign Language
+controlledvocabulary.language.hanunoo=Hanunoo
+controlledvocabulary.language.harami=Harami
+controlledvocabulary.language.harari=Harari
+controlledvocabulary.language.harijan_kinnauri=Harijan Kinnauri
+controlledvocabulary.language.haroi=Haroi
+controlledvocabulary.language.harsusi=Harsusi
+controlledvocabulary.language.haruai=Haruai
+controlledvocabulary.language.haruku=Haruku
+controlledvocabulary.language.haryanvi=Haryanvi
+controlledvocabulary.language.harzani=Harzani
+controlledvocabulary.language.hasha=Hasha
+controlledvocabulary.language.hassaniyya=Hassaniyya
+controlledvocabulary.language.hatam=Hatam
+controlledvocabulary.language.hattic=Hattic
 controlledvocabulary.language.hausa=Hausa
-controlledvocabulary.language.hebrew_(modern)=Hebrew (modern)
+controlledvocabulary.language.hausa_sign_language=Hausa Sign Language
+controlledvocabulary.language.havasupai-walapai-yavapai=Havasupai-Walapai-Yavapai
+controlledvocabulary.language.haveke=Haveke
+controlledvocabulary.language.havu=Havu
+controlledvocabulary.language.hawai'i_creole_english=Hawai'i Creole English
+controlledvocabulary.language.hawai'i_sign_language_(hsl)=Hawai'i Sign Language (HSL)
+controlledvocabulary.language.hawaiian=Hawaiian
+controlledvocabulary.language.haya=Haya
+controlledvocabulary.language.hazaragi=Hazaragi
+controlledvocabulary.language.hdi=Hdi
+controlledvocabulary.language.hebrew_(modern)=Hebrew (modern), Hebrew
+controlledvocabulary.language.hehe=Hehe
+controlledvocabulary.language.heiban=Heiban
+controlledvocabulary.language.heiltsuk=Heiltsuk
+controlledvocabulary.language.helong=Helong
+controlledvocabulary.language.hema=Hema
+controlledvocabulary.language.hemba=Hemba
+controlledvocabulary.language.herde=HerdÊ
 controlledvocabulary.language.herero=Herero
+controlledvocabulary.language.hermit=Hermit
+controlledvocabulary.language.hernican=Hernican
+controlledvocabulary.language.hewa=Hewa
+controlledvocabulary.language.heyo=Heyo
+controlledvocabulary.language.hiberno-scottish_gaelic=Hiberno-Scottish Gaelic
+controlledvocabulary.language.hibito=Hibito
+controlledvocabulary.language.hidatsa=Hidatsa
+controlledvocabulary.language.hieroglyphic_luwian=Hieroglyphic Luwian
+controlledvocabulary.language.higaonon=Higaonon
+controlledvocabulary.language.highland_konjo=Highland Konjo
+controlledvocabulary.language.highland_oaxaca_chontal=Highland Oaxaca Chontal
+controlledvocabulary.language.highland_popoluca=Highland Popoluca
+controlledvocabulary.language.highland_puebla_nahuatl=Highland Puebla Nahuatl
+controlledvocabulary.language.highland_totonac=Highland Totonac
+controlledvocabulary.language.hijazi_arabic=Hijazi Arabic
+controlledvocabulary.language.hijuk=Hijuk
+controlledvocabulary.language.hiligaynon=Hiligaynon
+controlledvocabulary.language.himarima=HimarimÃŖ
 controlledvocabulary.language.hindi=Hindi
+controlledvocabulary.language.hinduri=Hinduri
+controlledvocabulary.language.hinukh=Hinukh
 controlledvocabulary.language.hiri_motu=Hiri Motu
+controlledvocabulary.language.hittite=Hittite
+controlledvocabulary.language.hitu=Hitu
+controlledvocabulary.language.hiw=Hiw
+controlledvocabulary.language.hixkaryana=HixkaryÃĄna
+controlledvocabulary.language.hlai=Hlai
+controlledvocabulary.language.hlepho_phowa=Hlepho Phowa
+controlledvocabulary.language.hlersu=Hlersu
+controlledvocabulary.language.hmar=Hmar
+controlledvocabulary.language.hmong=Hmong
+controlledvocabulary.language.hmong_daw=Hmong Daw
+controlledvocabulary.language.hmong_don=Hmong Don
+controlledvocabulary.language.hmong_do=Hmong Dô
+controlledvocabulary.language.hmong_njua=Hmong Njua
+controlledvocabulary.language.hmong_shua=Hmong Shua
+controlledvocabulary.language.hmwaveke=Hmwaveke
+controlledvocabulary.language.ho=Ho
+controlledvocabulary.language.ho_chi_minh_city_sign_language=Ho Chi Minh City Sign Language
+controlledvocabulary.language.ho-chunk=Ho-Chunk
+controlledvocabulary.language.hoava=Hoava
+controlledvocabulary.language.hobyot=HobyÃŗt
+controlledvocabulary.language.hoia_hoia=Hoia Hoia
+controlledvocabulary.language.holikachuk=Holikachuk
+controlledvocabulary.language.holiya=Holiya
+controlledvocabulary.language.holma=Holma
+controlledvocabulary.language.holoholo=Holoholo
+controlledvocabulary.language.holu=Holu
+controlledvocabulary.language.homa=Homa
+controlledvocabulary.language.honduras_sign_language=Honduras Sign Language
+controlledvocabulary.language.hong_kong_sign_language=Hong Kong Sign Language
+controlledvocabulary.language.honi=Honi
+controlledvocabulary.language.hopi=Hopi
+controlledvocabulary.language.horned_miao=Horned Miao
+controlledvocabulary.language.horo=Horo
+controlledvocabulary.language.horom=Horom
+controlledvocabulary.language.horpa=Horpa
+controlledvocabulary.language.hote=Hote
+controlledvocabulary.language.hoti=Hoti
+controlledvocabulary.language.hovongan=Hovongan
+controlledvocabulary.language.hoyahoya=Hoyahoya
+controlledvocabulary.language.hozo=Hozo
+controlledvocabulary.language.hpon=Hpon
+controlledvocabulary.language.hrangkhol=Hrangkhol
+controlledvocabulary.language.hre=Hre
+controlledvocabulary.language.hruso=Hruso
+controlledvocabulary.language.hu=Hu
+controlledvocabulary.language.huachipaeri=Huachipaeri
+controlledvocabulary.language.huallaga_huanuco_quechua=Huallaga HuÃĄnuco Quechua
+controlledvocabulary.language.huamalies-dos_de_mayo_huanuco_quechua=Huamalíes-Dos de Mayo HuÃĄnuco Quechua
+controlledvocabulary.language.huambisa=Huambisa
+controlledvocabulary.language.huarijio=Huarijio
+controlledvocabulary.language.huastec=Huastec
+controlledvocabulary.language.huaulu=Huaulu
+controlledvocabulary.language.huautla_mazatec=Huautla Mazatec
+controlledvocabulary.language.huaxcaleca_nahuatl=Huaxcaleca Nahuatl
+controlledvocabulary.language.huaylas_ancash_quechua=Huaylas Ancash Quechua
+controlledvocabulary.language.huaylla_wanca_quechua=Huaylla Wanca Quechua
+controlledvocabulary.language.huba=Huba
+controlledvocabulary.language.huehuetla_tepehua=Huehuetla Tepehua
+controlledvocabulary.language.huichol=Huichol
+controlledvocabulary.language.huilliche=Huilliche
+controlledvocabulary.language.huitepec_mixtec=Huitepec Mixtec
+controlledvocabulary.language.huizhou_chinese=Huizhou Chinese
+controlledvocabulary.language.hukumina=Hukumina
+controlledvocabulary.language.hula=Hula
+controlledvocabulary.language.hulaula=HulaulÃĄ
+controlledvocabulary.language.huli=Huli
+controlledvocabulary.language.hulung=Hulung
+controlledvocabulary.language.humburi_senni_songhay=Humburi Senni Songhay
+controlledvocabulary.language.humene=Humene
+controlledvocabulary.language.humla=Humla
+controlledvocabulary.language.hunde=Hunde
+controlledvocabulary.language.hung=Hung
+controlledvocabulary.language.hungana=Hungana
 controlledvocabulary.language.hungarian=Hungarian
-controlledvocabulary.language.interlingua=Interlingua
+controlledvocabulary.language.hungarian_sign_language=Hungarian Sign Language
+controlledvocabulary.language.hungu=Hungu
+controlledvocabulary.language.hunjara-kaina_ke=Hunjara-Kaina Ke
+controlledvocabulary.language.hunnic=Hunnic
+controlledvocabulary.language.hunsrik=Hunsrik
+controlledvocabulary.language.hunzib=Hunzib
+controlledvocabulary.language.hupa=Hupa
+controlledvocabulary.language.hupde=HupdÃĢ
+controlledvocabulary.language.hupla=Hupla
+controlledvocabulary.language.hurrian=Hurrian
+controlledvocabulary.language.hutterite_german=Hutterite German
+controlledvocabulary.language.hwana=Hwana
+controlledvocabulary.language.hya=Hya
+controlledvocabulary.language.hyam=Hyam
+controlledvocabulary.language.hyolmo=Hyolmo
+controlledvocabulary.language.hertevin=HÊrtevin
+controlledvocabulary.language.hone=HÃĩne
+controlledvocabulary.language.i-wak=I-Wak
+controlledvocabulary.language.iaai=Iaai
+controlledvocabulary.language.iamalele=Iamalele
+controlledvocabulary.language.iatmul=Iatmul
+controlledvocabulary.language.iau=Iau
+controlledvocabulary.language.ibali_teke=Ibali Teke
+controlledvocabulary.language.ibaloi=Ibaloi
+controlledvocabulary.language.iban=Iban
+controlledvocabulary.language.ibanag=Ibanag
+controlledvocabulary.language.ibani=Ibani
+controlledvocabulary.language.ibatan=Ibatan
+controlledvocabulary.language.iberian=Iberian
+controlledvocabulary.language.ibibio=Ibibio
+controlledvocabulary.language.ibino=Ibino
+controlledvocabulary.language.ibu=Ibu
+controlledvocabulary.language.ibuoro=Ibuoro
+controlledvocabulary.language.icelandic=Icelandic
+controlledvocabulary.language.icelandic_sign_language=Icelandic Sign Language
+controlledvocabulary.language.iceve-maci=Iceve-Maci
+controlledvocabulary.language.ida'an=Ida'an
+controlledvocabulary.language.idakho-isukha-tiriki=Idakho-Isukha-Tiriki
+controlledvocabulary.language.idate=IdatÊ
+controlledvocabulary.language.idere=Idere
+controlledvocabulary.language.idesa=Idesa
+controlledvocabulary.language.idi=Idi
+controlledvocabulary.language.ido=Ido
+controlledvocabulary.language.idoma=Idoma
+controlledvocabulary.language.idon=Idon
+controlledvocabulary.language.idu-mishmi=Idu-Mishmi
+controlledvocabulary.language.iduna=Iduna
+controlledvocabulary.language.ifo=Ifo
+controlledvocabulary.language.ife=Ifè
+controlledvocabulary.language.igala=Igala
+controlledvocabulary.language.igana=Igana
+controlledvocabulary.language.igbo=Igbo
+controlledvocabulary.language.igede=Igede
+controlledvocabulary.language.ignaciano=Ignaciano
+controlledvocabulary.language.igo=Igo
+controlledvocabulary.language.iguta=Iguta
+controlledvocabulary.language.igwe=Igwe
+controlledvocabulary.language.iha=Iha
+controlledvocabulary.language.iha_based_pidgin=Iha Based Pidgin
+controlledvocabulary.language.ihievbe=Ihievbe
+controlledvocabulary.language.ik=Ik
+controlledvocabulary.language.ika=Ika
+controlledvocabulary.language.ikaranggal=Ikaranggal
+controlledvocabulary.language.ikhin-arokho=Ikhin-Arokho
+controlledvocabulary.language.ikizu=Ikizu
+controlledvocabulary.language.iko=Iko
+controlledvocabulary.language.ikobi=Ikobi
+controlledvocabulary.language.ikoma-nata-isenye=Ikoma-Nata-Isenye
+controlledvocabulary.language.ikpeng=Ikpeng
+controlledvocabulary.language.ikpeshi=Ikpeshi
+controlledvocabulary.language.ikposo=Ikposo
+controlledvocabulary.language.iku-gora-ankwa=Iku-Gora-Ankwa
+controlledvocabulary.language.ikulu=Ikulu
+controlledvocabulary.language.ikwere=Ikwere
+controlledvocabulary.language.ikwo=Ikwo
+controlledvocabulary.language.ila=Ila
+controlledvocabulary.language.ile_ape=Ile Ape
+controlledvocabulary.language.ili_turki=Ili Turki
+controlledvocabulary.language.ili'uun=Ili'uun
+controlledvocabulary.language.ilianen_manobo=Ilianen Manobo
+controlledvocabulary.language.illyrian=Illyrian
+controlledvocabulary.language.iloko=Iloko
+controlledvocabulary.language.ilongot=Ilongot
+controlledvocabulary.language.ilue=Ilue
+controlledvocabulary.language.ilwana=Ilwana
+controlledvocabulary.language.imbabura_highland_quichua=Imbabura Highland Quichua
+controlledvocabulary.language.imbongu=Imbongu
+controlledvocabulary.language.imonda=Imonda
+controlledvocabulary.language.imotong=Imotong
+controlledvocabulary.language.imroing=Imroing
+controlledvocabulary.language.inabaknon=Inabaknon
+controlledvocabulary.language.inapang=Inapang
+controlledvocabulary.language.inari_sami=Inari Sami
+controlledvocabulary.language.indian_sign_language=Indian Sign Language
+controlledvocabulary.language.indo-portuguese=Indo-Portuguese
 controlledvocabulary.language.indonesian=Indonesian
+controlledvocabulary.language.indonesian_bajau=Indonesian Bajau
+controlledvocabulary.language.indonesian_sign_language=Indonesian Sign Language
+controlledvocabulary.language.indri=Indri
+controlledvocabulary.language.indus_kohistani=Indus Kohistani
+controlledvocabulary.language.indus_valley_language=Indus Valley Language
+controlledvocabulary.language.inebu_one=Inebu One
+controlledvocabulary.language.ineseno=IneseÃąo
+controlledvocabulary.language.inga=Inga
+controlledvocabulary.language.ingrian=Ingrian
+controlledvocabulary.language.ingush=Ingush
+controlledvocabulary.language.inlaod_itneg=Inlaod Itneg
+controlledvocabulary.language.innu=Innu
+controlledvocabulary.language.inoke-yate=Inoke-Yate
+controlledvocabulary.language.inonhan=Inonhan
+controlledvocabulary.language.inor=Inor
+controlledvocabulary.language.inpui_naga=Inpui Naga
+controlledvocabulary.language.interglossa=Interglossa
+controlledvocabulary.language.interlingua=Interlingua, Interlingua (International Auxiliary Language Association)
 controlledvocabulary.language.interlingue=Interlingue
-controlledvocabulary.language.irish=Irish
-controlledvocabulary.language.igbo=Igbo
+controlledvocabulary.language.international_sign=International Sign
+controlledvocabulary.language.interslavic=Interslavic
+controlledvocabulary.language.intha=Intha
+controlledvocabulary.language.inuinnaqtun=Inuinnaqtun
+controlledvocabulary.language.inuit_sign_language=Inuit Sign Language
+controlledvocabulary.language.inuktitut=Inuktitut
 controlledvocabulary.language.inupiaq=Inupiaq
-controlledvocabulary.language.ido=Ido
-controlledvocabulary.language.icelandic=Icelandic
+controlledvocabulary.language.iowa-oto=Iowa-Oto
+controlledvocabulary.language.ipalapa_amuzgo=Ipalapa Amuzgo
+controlledvocabulary.language.ipiko=Ipiko
+controlledvocabulary.language.ipili=Ipili
+controlledvocabulary.language.ipulo=Ipulo
+controlledvocabulary.language.iquito=Iquito
+controlledvocabulary.language.ir=Ir
+controlledvocabulary.language.iranian_persian=Iranian Persian
+controlledvocabulary.language.iranian_sign_language=Iranian Sign Language
+controlledvocabulary.language.iranun_(malaysia)=Iranun (Malaysia)
+controlledvocabulary.language.iranun_(philippines)=Iranun (Philippines)
+controlledvocabulary.language.iraqw=Iraqw
+controlledvocabulary.language.irarutu=Irarutu
+controlledvocabulary.language.iraya=Iraya
+controlledvocabulary.language.iresim=Iresim
+controlledvocabulary.language.irish=Irish
+controlledvocabulary.language.irish_sign_language=Irish Sign Language
+controlledvocabulary.language.irula=Irula
+controlledvocabulary.language.irantxe=IrÃĄntxe
+controlledvocabulary.language.isabi=Isabi
+controlledvocabulary.language.isanzu=Isanzu
+controlledvocabulary.language.isarog_agta=Isarog Agta
+controlledvocabulary.language.isconahua=Isconahua
+controlledvocabulary.language.isebe=Isebe
+controlledvocabulary.language.isekiri=Isekiri
+controlledvocabulary.language.ishkashimi=Ishkashimi
+controlledvocabulary.language.isinai=Isinai
+controlledvocabulary.language.isirawa=Isirawa
+controlledvocabulary.language.island_carib=Island Carib
+controlledvocabulary.language.islander_creole_english=Islander Creole English
+controlledvocabulary.language.isnag=Isnag
+controlledvocabulary.language.isoko=Isoko
+controlledvocabulary.language.israeli_sign_language=Israeli Sign Language
+controlledvocabulary.language.isthmus_mixe=Isthmus Mixe
+controlledvocabulary.language.isthmus_zapotec=Isthmus Zapotec
+controlledvocabulary.language.isthmus-cosoleacaque_nahuatl=Isthmus-Cosoleacaque Nahuatl
+controlledvocabulary.language.isthmus-mecayapan_nahuatl=Isthmus-Mecayapan Nahuatl
+controlledvocabulary.language.isthmus-pajapan_nahuatl=Isthmus-Pajapan Nahuatl
+controlledvocabulary.language.istriot=Istriot
+controlledvocabulary.language.istro_romanian=Istro Romanian
+controlledvocabulary.language.isu_(fako_division)=Isu (Fako Division)
+controlledvocabulary.language.isu_(menchum_division)=Isu (Menchum Division)
 controlledvocabulary.language.italian=Italian
-controlledvocabulary.language.inuktitut=Inuktitut
+controlledvocabulary.language.italian_sign_language=Italian Sign Language
+controlledvocabulary.language.itawit=Itawit
+controlledvocabulary.language.itelmen=Itelmen
+controlledvocabulary.language.itene=Itene
+controlledvocabulary.language.iteri=Iteri
+controlledvocabulary.language.itik=Itik
+controlledvocabulary.language.ito=Ito
+controlledvocabulary.language.itonama=Itonama
+controlledvocabulary.language.itu_mbon_uzo=Itu Mbon Uzo
+controlledvocabulary.language.itundujia_mixtec=Itundujia Mixtec
+controlledvocabulary.language.itza=ItzÃĄ
+controlledvocabulary.language.iu_mien=Iu Mien
+controlledvocabulary.language.ivatan=Ivatan
+controlledvocabulary.language.ivbie_north-okpela-arhe=Ivbie North-Okpela-Arhe
+controlledvocabulary.language.iwaidja=Iwaidja
+controlledvocabulary.language.iwal=Iwal
+controlledvocabulary.language.iwam=Iwam
+controlledvocabulary.language.iwur=Iwur
+controlledvocabulary.language.ixcatec=Ixcatec
+controlledvocabulary.language.ixcatlan_mazatec=IxcatlÃĄn Mazatec
+controlledvocabulary.language.ixil=Ixil
+controlledvocabulary.language.ixtayutla_mixtec=Ixtayutla Mixtec
+controlledvocabulary.language.ixtenco_otomi=Ixtenco Otomi
+controlledvocabulary.language.iyayu=Iyayu
+controlledvocabulary.language.iyive=Iyive
+controlledvocabulary.language.iyo=Iyo
+controlledvocabulary.language.iyo'wujwa_chorote=Iyo'wujwa Chorote
+controlledvocabulary.language.iyojwa'ja_chorote=Iyojwa'ja Chorote
+controlledvocabulary.language.izere=Izere
+controlledvocabulary.language.izii=Izii
+controlledvocabulary.language.izon=Izon
+controlledvocabulary.language.izora=Izora
+controlledvocabulary.language.inapari=IÃąapari
+controlledvocabulary.language.jabuti=Jabutí
+controlledvocabulary.language.jad=Jad
+controlledvocabulary.language.jadgali=Jadgali
+controlledvocabulary.language.jah_hut=Jah Hut
+controlledvocabulary.language.jahanka=Jahanka
+controlledvocabulary.language.jair_awyu=Jair Awyu
+controlledvocabulary.language.jaitmatang=Jaitmatang
+controlledvocabulary.language.jakati=Jakati
+controlledvocabulary.language.jakattoe=Jakattoe
+controlledvocabulary.language.jakun=Jakun
+controlledvocabulary.language.jalapa_de_diaz_mazatec=Jalapa De Díaz Mazatec
+controlledvocabulary.language.jalkunan=Jalkunan
+controlledvocabulary.language.jamaican_country_sign_language=Jamaican Country Sign Language
+controlledvocabulary.language.jamaican_creole_english=Jamaican Creole English
+controlledvocabulary.language.jamaican_sign_language=Jamaican Sign Language
+controlledvocabulary.language.jamamadi=Jamamadí
+controlledvocabulary.language.jambi_malay=Jambi Malay
+controlledvocabulary.language.jamiltepec_mixtec=Jamiltepec Mixtec
+controlledvocabulary.language.jamsay_dogon=Jamsay Dogon
+controlledvocabulary.language.jandai=Jandai
+controlledvocabulary.language.jandavra=Jandavra
+controlledvocabulary.language.jangkang=Jangkang
+controlledvocabulary.language.jangshung=Jangshung
+controlledvocabulary.language.janji=Janji
 controlledvocabulary.language.japanese=Japanese
+controlledvocabulary.language.japanese_sign_language=Japanese Sign Language
+controlledvocabulary.language.japreria=Japrería
+controlledvocabulary.language.jaqaru=Jaqaru
+controlledvocabulary.language.jara=Jara
+controlledvocabulary.language.jarai=Jarai
+controlledvocabulary.language.jarawa_(india)=Jarawa (India)
+controlledvocabulary.language.jaru=Jaru
+controlledvocabulary.language.jauja_wanca_quechua=Jauja Wanca Quechua
+controlledvocabulary.language.jaunsari=Jaunsari
 controlledvocabulary.language.javanese=Javanese
-controlledvocabulary.language.kalaallisut,_greenlandic=Kalaallisut, Greenlandic
+controlledvocabulary.language.javindo=Javindo
+controlledvocabulary.language.jawe=Jawe
+controlledvocabulary.language.jawoyn=Jawoyn
+controlledvocabulary.language.jaya=Jaya
+controlledvocabulary.language.jebero=Jebero
+controlledvocabulary.language.jeh=Jeh
+controlledvocabulary.language.jehai=Jehai
+controlledvocabulary.language.jejara_naga=Jejara Naga
+controlledvocabulary.language.jejueo=Jejueo
+controlledvocabulary.language.jemez=Jemez
+controlledvocabulary.language.jenaama_bozo=Jenaama Bozo
+controlledvocabulary.language.jennu_kurumba=Jennu Kurumba
+controlledvocabulary.language.jere=Jere
+controlledvocabulary.language.jeri_kuo=Jeri Kuo
+controlledvocabulary.language.jerung=Jerung
+controlledvocabulary.language.jewish_babylonian_aramaic_(ca._200-1200_ce)=Jewish Babylonian Aramaic (ca. 200-1200 CE)
+controlledvocabulary.language.jewish_palestinian_aramaic=Jewish Palestinian Aramaic
+controlledvocabulary.language.jhankot_sign_language=Jhankot Sign Language
+controlledvocabulary.language.jiamao=Jiamao
+controlledvocabulary.language.jiarong=Jiarong
+controlledvocabulary.language.jiba=Jiba
+controlledvocabulary.language.jibu=Jibu
+controlledvocabulary.language.jicarilla_apache=Jicarilla Apache
+controlledvocabulary.language.jiiddu=Jiiddu
+controlledvocabulary.language.jilbe=Jilbe
+controlledvocabulary.language.jilim=Jilim
+controlledvocabulary.language.jimi_(cameroon)=Jimi (Cameroon)
+controlledvocabulary.language.jimi_(nigeria)=Jimi (Nigeria)
+controlledvocabulary.language.jina=Jina
+controlledvocabulary.language.jingulu=Jingulu
+controlledvocabulary.language.jinyu_chinese=Jinyu Chinese
+controlledvocabulary.language.jiongnai_bunu=Jiongnai Bunu
+controlledvocabulary.language.jirel=Jirel
+controlledvocabulary.language.jiru=Jiru
+controlledvocabulary.language.jita=Jita
+controlledvocabulary.language.jju=Jju
+controlledvocabulary.language.joba=Joba
+controlledvocabulary.language.jofotek-bromnya=Jofotek-Bromnya
+controlledvocabulary.language.jogi=Jogi
+controlledvocabulary.language.jola-fonyi=Jola-Fonyi
+controlledvocabulary.language.jola-kasa=Jola-Kasa
+controlledvocabulary.language.jonkor_bourmataguil=Jonkor Bourmataguil
+controlledvocabulary.language.jordanian_sign_language=Jordanian Sign Language
+controlledvocabulary.language.jora=JorÃĄ
+controlledvocabulary.language.jowulu=Jowulu
+controlledvocabulary.language.ju=Ju
+controlledvocabulary.language.juang=Juang
+controlledvocabulary.language.judeo-arabic=Judeo-Arabic
+controlledvocabulary.language.judeo-berber=Judeo-Berber
+controlledvocabulary.language.judeo-georgian=Judeo-Georgian
+controlledvocabulary.language.judeo-iraqi_arabic=Judeo-Iraqi Arabic
+controlledvocabulary.language.judeo-italian=Judeo-Italian
+controlledvocabulary.language.judeo-moroccan_arabic=Judeo-Moroccan Arabic
+controlledvocabulary.language.judeo-persian=Judeo-Persian
+controlledvocabulary.language.judeo-tat=Judeo-Tat
+controlledvocabulary.language.judeo-tripolitanian_arabic=Judeo-Tripolitanian Arabic
+controlledvocabulary.language.judeo-yemeni_arabic=Judeo-Yemeni Arabic
+controlledvocabulary.language.jukun_takum=Jukun Takum
+controlledvocabulary.language.jumjum=Jumjum
+controlledvocabulary.language.jumla_sign_language=Jumla Sign Language
+controlledvocabulary.language.jumli=Jumli
+controlledvocabulary.language.jungle_inga=Jungle Inga
+controlledvocabulary.language.juquila_mixe=Juquila Mixe
+controlledvocabulary.language.jur_modo=Jur Modo
+controlledvocabulary.language.juray=Juray
+controlledvocabulary.language.jurchen=Jurchen
+controlledvocabulary.language.juruna=JurÃēna
+controlledvocabulary.language.jutish=Jutish
+controlledvocabulary.language.juwal=Juwal
+controlledvocabulary.language.juxtlahuaca_mixtec=Juxtlahuaca Mixtec
+controlledvocabulary.language.juĮ€'hoan=JuĮ€Ęŧhoan
+controlledvocabulary.language.jwira-pepesa=Jwira-Pepesa
+controlledvocabulary.language.jerriais=Jèrriais
+controlledvocabulary.language.juma=JÃēma
+controlledvocabulary.language.k'iche'=K'iche'
+controlledvocabulary.language.kaamba=Kaamba
+controlledvocabulary.language.kaan=Kaan
+controlledvocabulary.language.kaang_chin=Kaang Chin
+controlledvocabulary.language.kaansa=Kaansa
+controlledvocabulary.language.kaba=Kaba
+controlledvocabulary.language.kabalai=Kabalai
+controlledvocabulary.language.kabardian=Kabardian
+controlledvocabulary.language.kabatei=Kabatei
+controlledvocabulary.language.kabiye=Kabiyè
+controlledvocabulary.language.kabola=Kabola
+controlledvocabulary.language.kabore_one=Kabore One
+controlledvocabulary.language.kabras=Kabras
+controlledvocabulary.language.kaburi=Kaburi
+controlledvocabulary.language.kabutra=Kabutra
+controlledvocabulary.language.kabuverdianu=Kabuverdianu
+controlledvocabulary.language.kabwa=Kabwa
+controlledvocabulary.language.kabwari=Kabwari
+controlledvocabulary.language.kabyle=Kabyle
+controlledvocabulary.language.kachama-ganjule=Kachama-Ganjule
+controlledvocabulary.language.kachari=Kachari
+controlledvocabulary.language.kachhi=Kachhi
+controlledvocabulary.language.kachi_koli=Kachi Koli
+controlledvocabulary.language.kachin=Kachin
+controlledvocabulary.language.kachok=Kachok
+controlledvocabulary.language.kacipo-bale_suri=Kacipo-Bale Suri
+controlledvocabulary.language.kadai=Kadai
+controlledvocabulary.language.kadar=Kadar
+controlledvocabulary.language.kadaru=Kadaru
+controlledvocabulary.language.kadazan_dusun=Kadazan Dusun
+controlledvocabulary.language.kadiweu=KadiwÊu
+controlledvocabulary.language.kadu=Kadu
+controlledvocabulary.language.kadung=Kadung
+controlledvocabulary.language.kaduo=Kaduo
+controlledvocabulary.language.kaeku=Kaeku
+controlledvocabulary.language.kaera=Kaera
+controlledvocabulary.language.kafa=Kafa
+controlledvocabulary.language.kafoa=Kafoa
+controlledvocabulary.language.kagan_kalagan=Kagan Kalagan
+controlledvocabulary.language.kagate=Kagate
+controlledvocabulary.language.kagayanen=Kagayanen
+controlledvocabulary.language.kagoma=Kagoma
+controlledvocabulary.language.kagoro=Kagoro
+controlledvocabulary.language.kagulu=Kagulu
+controlledvocabulary.language.kahe=Kahe
+controlledvocabulary.language.kahua=Kahua
+controlledvocabulary.language.kaian=Kaian
+controlledvocabulary.language.kaibobo=Kaibobo
+controlledvocabulary.language.kaidipang=Kaidipang
+controlledvocabulary.language.kaiep=Kaiep
+controlledvocabulary.language.kaikadi=Kaikadi
+controlledvocabulary.language.kaikavian_literary_language=Kaikavian Literary Language
+controlledvocabulary.language.kaike=Kaike
+controlledvocabulary.language.kaimbulawa=Kaimbulawa
+controlledvocabulary.language.kaimbe=KaimbÊ
+controlledvocabulary.language.kaingang=Kaingang
+controlledvocabulary.language.kairak=Kairak
+controlledvocabulary.language.kairiru=Kairiru
+controlledvocabulary.language.kairui-midiki=Kairui-Midiki
+controlledvocabulary.language.kais=Kais
+controlledvocabulary.language.kaitag=Kaitag
+controlledvocabulary.language.kaivi=Kaivi
+controlledvocabulary.language.kaiwa=KaiwÃĄ
+controlledvocabulary.language.kaiy=Kaiy
+controlledvocabulary.language.kajakse=Kajakse
+controlledvocabulary.language.kajali=Kajali
+controlledvocabulary.language.kajaman=Kajaman
+controlledvocabulary.language.kakabai=Kakabai
+controlledvocabulary.language.kakabe=Kakabe
+controlledvocabulary.language.kakanda=Kakanda
+controlledvocabulary.language.kaki_ae=Kaki Ae
+controlledvocabulary.language.kako=Kako
+controlledvocabulary.language.kakwa=Kakwa
+controlledvocabulary.language.kala_lagaw_ya=Kala Lagaw Ya
+controlledvocabulary.language.kalaamaya=Kalaamaya
+controlledvocabulary.language.kalabakan=Kalabakan
+controlledvocabulary.language.kalabari=Kalabari
+controlledvocabulary.language.kalabra=Kalabra
+controlledvocabulary.language.kalagan=Kalagan
+controlledvocabulary.language.kalaktang_monpa=Kalaktang Monpa
+controlledvocabulary.language.kalam=Kalam
+controlledvocabulary.language.kalamse=KalamsÊ
+controlledvocabulary.language.kalanadi=Kalanadi
+controlledvocabulary.language.kalanga=Kalanga
+controlledvocabulary.language.kalanguya=Kalanguya
+controlledvocabulary.language.kalao=Kalao
+controlledvocabulary.language.kalapuya=Kalapuya
+controlledvocabulary.language.kalarko=Kalarko
+controlledvocabulary.language.kalasha=Kalasha
+controlledvocabulary.language.kalenjin=Kalenjin
+controlledvocabulary.language.kalispel-pend_d'oreille=Kalispel-Pend d'Oreille
+controlledvocabulary.language.kalkoti=Kalkoti
+controlledvocabulary.language.kalkutung=Kalkutung
+controlledvocabulary.language.kalmyk=Kalmyk
+controlledvocabulary.language.kalo_finnish_romani=Kalo Finnish Romani
+controlledvocabulary.language.kalou=Kalou
+controlledvocabulary.language.kaluli=Kaluli
+controlledvocabulary.language.kalumpang=Kalumpang
+controlledvocabulary.language.kam=Kam
+controlledvocabulary.language.kamakan=Kamakan
+controlledvocabulary.language.kamang=Kamang
+controlledvocabulary.language.kamano=Kamano
+controlledvocabulary.language.kamantan=Kamantan
+controlledvocabulary.language.kamar=Kamar
+controlledvocabulary.language.kamara=Kamara
+controlledvocabulary.language.kamarian=Kamarian
+controlledvocabulary.language.kamaru=Kamaru
+controlledvocabulary.language.kamas=Kamas
+controlledvocabulary.language.kamasa=Kamasa
+controlledvocabulary.language.kamasau=Kamasau
+controlledvocabulary.language.kamayo=Kamayo
+controlledvocabulary.language.kamayura=KamayurÃĄ
+controlledvocabulary.language.kamba_(kenya)=Kamba (Kenya)
+controlledvocabulary.language.kambaata=Kambaata
+controlledvocabulary.language.kambaira=Kambaira
+controlledvocabulary.language.kambera=Kambera
+controlledvocabulary.language.kamberau=Kamberau
+controlledvocabulary.language.kambiwa=KambiwÃĄ
+controlledvocabulary.language.kami_(nigeria)=Kami (Nigeria)
+controlledvocabulary.language.kami_(tanzania)=Kami (Tanzania)
+controlledvocabulary.language.kamo=Kamo
+controlledvocabulary.language.kamoro=Kamoro
+controlledvocabulary.language.kamu=Kamu
+controlledvocabulary.language.kamula=Kamula
+controlledvocabulary.language.kamviri=Kamviri
+controlledvocabulary.language.kamwe=Kamwe
+controlledvocabulary.language.kanakanabu=Kanakanabu
+controlledvocabulary.language.kanamari=Kanamarí
+controlledvocabulary.language.kanan=Kanan
+controlledvocabulary.language.kanashi=Kanashi
+controlledvocabulary.language.kanasi=Kanasi
+controlledvocabulary.language.kanauji=Kanauji
+controlledvocabulary.language.kandas=Kandas
+controlledvocabulary.language.kandawo=Kandawo
+controlledvocabulary.language.kande=Kande
+controlledvocabulary.language.kanembu=Kanembu
+controlledvocabulary.language.kang=Kang
+controlledvocabulary.language.kanga=Kanga
+controlledvocabulary.language.kangean=Kangean
+controlledvocabulary.language.kanggape=Kanggape
+controlledvocabulary.language.kangjia=Kangjia
+controlledvocabulary.language.kango_(bas-uele_district)=Kango (Bas-UÊlÊ District)
+controlledvocabulary.language.kango_(tshopo_district)=Kango (Tshopo District)
+controlledvocabulary.language.kangri=Kangri
+controlledvocabulary.language.kaniet=Kaniet
+controlledvocabulary.language.kanikkaran=Kanikkaran
+controlledvocabulary.language.kaningdon-nindem=Kaningdon-Nindem
+controlledvocabulary.language.kaningi=Kaningi
+controlledvocabulary.language.kaningra=Kaningra
+controlledvocabulary.language.kaninuwa=Kaninuwa
+controlledvocabulary.language.kanite=Kanite
+controlledvocabulary.language.kanjari=Kanjari
+controlledvocabulary.language.kanju=Kanju
+controlledvocabulary.language.kankanaey=Kankanaey
 controlledvocabulary.language.kannada=Kannada
+controlledvocabulary.language.kannada_kurumba=Kannada Kurumba
+controlledvocabulary.language.kanowit-tanjong_melanau=Kanowit-Tanjong Melanau
+controlledvocabulary.language.kanoe=KanoÊ
+controlledvocabulary.language.kansa=Kansa
+controlledvocabulary.language.kantosi=Kantosi
+controlledvocabulary.language.kanu=Kanu
+controlledvocabulary.language.kanufi=Kanufi
 controlledvocabulary.language.kanuri=Kanuri
+controlledvocabulary.language.kanyok=Kanyok
+controlledvocabulary.language.kao=Kao
+controlledvocabulary.language.kaonde=Kaonde
+controlledvocabulary.language.kap=Kap
+controlledvocabulary.language.kapin=Kapin
+controlledvocabulary.language.kapinawa=KapinawÃĄ
+controlledvocabulary.language.kapingamarangi=Kapingamarangi
+controlledvocabulary.language.kapori=Kapori
+controlledvocabulary.language.kapriman=Kapriman
+controlledvocabulary.language.kaptiau=Kaptiau
+controlledvocabulary.language.kapya=Kapya
+controlledvocabulary.language.kaqchikel=Kaqchikel
+controlledvocabulary.language.kara_(central_african_republic)=Kara (Central African Republic)
+controlledvocabulary.language.kara_(korea)=Kara (Korea)
+controlledvocabulary.language.kara_(papua_new_guinea)=Kara (Papua New Guinea)
+controlledvocabulary.language.kara_(tanzania)=Kara (Tanzania)
+controlledvocabulary.language.kara-kalpak=Kara-Kalpak
+controlledvocabulary.language.karachay-balkar=Karachay-Balkar
+controlledvocabulary.language.karagas=Karagas
+controlledvocabulary.language.karaim=Karaim
+controlledvocabulary.language.karajarri=Karajarri
+controlledvocabulary.language.karaja=KarajÃĄ
+controlledvocabulary.language.karakhanid=Karakhanid
+controlledvocabulary.language.karami=Karami
+controlledvocabulary.language.karamojong=Karamojong
+controlledvocabulary.language.karang=Karang
+controlledvocabulary.language.karanga=Karanga
+controlledvocabulary.language.karankawa=Karankawa
+controlledvocabulary.language.karao=Karao
+controlledvocabulary.language.karas=Karas
+controlledvocabulary.language.karata=Karata
+controlledvocabulary.language.karawa=Karawa
+controlledvocabulary.language.karbi=Karbi
+controlledvocabulary.language.kare_(central_african_republic)=Kare (Central African Republic)
+controlledvocabulary.language.kare_(papua_new_guinea)=Kare (Papua New Guinea)
+controlledvocabulary.language.karekare=Karekare
+controlledvocabulary.language.karelian=Karelian
+controlledvocabulary.language.karenggapa=Karenggapa
+controlledvocabulary.language.karey=Karey
+controlledvocabulary.language.kari=Kari
+controlledvocabulary.language.karingani=Karingani
+controlledvocabulary.language.karipuna=Karipuna
+controlledvocabulary.language.karipuna_creole_french=KaripÃēna Creole French
+controlledvocabulary.language.kariri-xoco=Karirí-XocÃŗ
+controlledvocabulary.language.karitiana=KaritiÃĸna
+controlledvocabulary.language.kariya=Kariya
+controlledvocabulary.language.kariyarra=Kariyarra
+controlledvocabulary.language.karkar-yuri=Karkar-Yuri
+controlledvocabulary.language.karkin=Karkin
+controlledvocabulary.language.karko=Karko
+controlledvocabulary.language.karnai=Karnai
+controlledvocabulary.language.karo_(brazil)=Karo (Brazil)
+controlledvocabulary.language.karo_(ethiopia)=Karo (Ethiopia)
+controlledvocabulary.language.karok=Karok
+controlledvocabulary.language.karon=Karon
+controlledvocabulary.language.karon_dori=Karon Dori
+controlledvocabulary.language.karore=Karore
+controlledvocabulary.language.karuwali=Karuwali
+controlledvocabulary.language.kasanga=Kasanga
+controlledvocabulary.language.kasem=Kasem
+controlledvocabulary.language.kashaya=Kashaya
 controlledvocabulary.language.kashmiri=Kashmiri
+controlledvocabulary.language.kashubian=Kashubian
+controlledvocabulary.language.kasiguranin=Kasiguranin
+controlledvocabulary.language.kaska=Kaska
+controlledvocabulary.language.kaskean=Kaskean
+controlledvocabulary.language.kasua=Kasua
+controlledvocabulary.language.katabaga=Katabaga
+controlledvocabulary.language.katawixi=Katawixi
+controlledvocabulary.language.katbol=Katbol
+controlledvocabulary.language.katcha-kadugli-miri=Katcha-Kadugli-Miri
+controlledvocabulary.language.kathoriya_tharu=Kathoriya Tharu
+controlledvocabulary.language.kathu=Kathu
+controlledvocabulary.language.kati=Kati
+controlledvocabulary.language.katkari=Katkari
+controlledvocabulary.language.katla=Katla
+controlledvocabulary.language.kato=Kato
+controlledvocabulary.language.katso=Katso
+controlledvocabulary.language.katua=Katua
+controlledvocabulary.language.katukina=Katukína
+controlledvocabulary.language.kaulong=Kaulong
+controlledvocabulary.language.kaur=Kaur
+controlledvocabulary.language.kaure=Kaure
+controlledvocabulary.language.kaurna=Kaurna
+controlledvocabulary.language.kauwera=Kauwera
+controlledvocabulary.language.kavalan=Kavalan
+controlledvocabulary.language.kavet=Kavet
+controlledvocabulary.language.kawacha=Kawacha
+controlledvocabulary.language.kawaiisu=Kawaiisu
+controlledvocabulary.language.kawe=Kawe
+controlledvocabulary.language.kawi=Kawi
+controlledvocabulary.language.kaxarari=Kaxararí
+controlledvocabulary.language.kaxuiana=KaxuiÃĸna
+controlledvocabulary.language.kayabi=Kayabí
+controlledvocabulary.language.kayagar=Kayagar
+controlledvocabulary.language.kayan=Kayan
+controlledvocabulary.language.kayan_mahakam=Kayan Mahakam
+controlledvocabulary.language.kayan_river_kayan=Kayan River Kayan
+controlledvocabulary.language.kayapo=KayapÃŗ
+controlledvocabulary.language.kayardild=Kayardild
+controlledvocabulary.language.kayaw=Kayaw
+controlledvocabulary.language.kayeli=Kayeli
+controlledvocabulary.language.kayong=Kayong
+controlledvocabulary.language.kayort=Kayort
+controlledvocabulary.language.kaytetye=Kaytetye
+controlledvocabulary.language.kayupulau=Kayupulau
 controlledvocabulary.language.kazakh=Kazakh
+controlledvocabulary.language.kazukuru=Kazukuru
+controlledvocabulary.language.ke'o=Ke'o
+controlledvocabulary.language.keak=Keak
+controlledvocabulary.language.keapara=Keapara
+controlledvocabulary.language.kedah_malay=Kedah Malay
+controlledvocabulary.language.kedang=Kedang
+controlledvocabulary.language.keder=Keder
+controlledvocabulary.language.keerray-woorroong=Keerray-Woorroong
+controlledvocabulary.language.kehu=Kehu
+controlledvocabulary.language.kei=Kei
+controlledvocabulary.language.keiga=Keiga
+controlledvocabulary.language.kein=Kein
+controlledvocabulary.language.keiyo=Keiyo
+controlledvocabulary.language.kekchi=Kekchí
+controlledvocabulary.language.kela_(democratic_republic_of_congo)=Kela (Democratic Republic of Congo)
+controlledvocabulary.language.kela_(papua_new_guinea)=Kela (Papua New Guinea)
+controlledvocabulary.language.kelabit=Kelabit
+controlledvocabulary.language.kele_(democratic_republic_of_congo)=Kele (Democratic Republic of Congo)
+controlledvocabulary.language.kele_(papua_new_guinea)=Kele (Papua New Guinea)
+controlledvocabulary.language.keley-i_kallahan=Keley-I Kallahan
+controlledvocabulary.language.keliko=Keliko
+controlledvocabulary.language.kelo=Kelo
+controlledvocabulary.language.kelon=Kelon
+controlledvocabulary.language.kemak=Kemak
+controlledvocabulary.language.kembayan=Kembayan
+controlledvocabulary.language.kemberano=Kemberano
+controlledvocabulary.language.kembra=Kembra
+controlledvocabulary.language.kemedzung=Kemedzung
+controlledvocabulary.language.kemi_sami=Kemi Sami
+controlledvocabulary.language.kemiehua=Kemiehua
+controlledvocabulary.language.kemtuik=Kemtuik
+controlledvocabulary.language.kenaboi=Kenaboi
+controlledvocabulary.language.kenati=Kenati
+controlledvocabulary.language.kendayan=Kendayan
+controlledvocabulary.language.kendeje=Kendeje
+controlledvocabulary.language.kendem=Kendem
+controlledvocabulary.language.kenga=Kenga
+controlledvocabulary.language.keningau_murut=Keningau Murut
+controlledvocabulary.language.keninjal=Keninjal
+controlledvocabulary.language.kensiu=Kensiu
+controlledvocabulary.language.kenswei_nsei=Kenswei Nsei
+controlledvocabulary.language.kenyan_sign_language=Kenyan Sign Language
+controlledvocabulary.language.kenyang=Kenyang
+controlledvocabulary.language.kenyi=Kenyi
+controlledvocabulary.language.kenzi=Kenzi
+controlledvocabulary.language.keoru-ahia=Keoru-Ahia
+controlledvocabulary.language.kepkiriwat=KepkiriwÃĄt
+controlledvocabulary.language.kepo'=Kepo'
+controlledvocabulary.language.kera=Kera
+controlledvocabulary.language.kerak=Kerak
+controlledvocabulary.language.kereho=Kereho
+controlledvocabulary.language.kerek=Kerek
+controlledvocabulary.language.kerewe=Kerewe
+controlledvocabulary.language.kerewo=Kerewo
+controlledvocabulary.language.kerinci=Kerinci
+controlledvocabulary.language.kesawai=Kesawai
+controlledvocabulary.language.ket=Ket
+controlledvocabulary.language.ketangalan=Ketangalan
+controlledvocabulary.language.kete=Kete
+controlledvocabulary.language.ketengban=Ketengban
+controlledvocabulary.language.ketum=Ketum
+controlledvocabulary.language.keyagana=Keyagana
+controlledvocabulary.language.kgalagadi=Kgalagadi
+controlledvocabulary.language.khah=Khah
+controlledvocabulary.language.khakas=Khakas
+controlledvocabulary.language.khalaj=Khalaj
+controlledvocabulary.language.khaling=Khaling
+controlledvocabulary.language.khamba=Khamba
+controlledvocabulary.language.khamnigan_mongol=Khamnigan Mongol
+controlledvocabulary.language.khams_tibetan=Khams Tibetan
+controlledvocabulary.language.khamti=Khamti
+controlledvocabulary.language.khamyang=Khamyang
+controlledvocabulary.language.khana=Khana
+controlledvocabulary.language.khandesi=Khandesi
+controlledvocabulary.language.khanty=Khanty
+controlledvocabulary.language.khao=Khao
+controlledvocabulary.language.kharam_naga=Kharam Naga
+controlledvocabulary.language.kharia=Kharia
+controlledvocabulary.language.kharia_thar=Kharia Thar
+controlledvocabulary.language.khasi=Khasi
+controlledvocabulary.language.khayo=Khayo
+controlledvocabulary.language.khazar=Khazar
+controlledvocabulary.language.khe=Khe
+controlledvocabulary.language.khehek=Khehek
+controlledvocabulary.language.khengkha=Khengkha
+controlledvocabulary.language.khetrani=Khetrani
+controlledvocabulary.language.khezha_naga=Khezha Naga
+controlledvocabulary.language.khiamniungan_naga=Khiamniungan Naga
+controlledvocabulary.language.khinalugh=Khinalugh
+controlledvocabulary.language.khirwar=Khirwar
+controlledvocabulary.language.khisa=Khisa
+controlledvocabulary.language.khlula=Khlula
 controlledvocabulary.language.khmer=Khmer
+controlledvocabulary.language.khmu=Khmu
+controlledvocabulary.language.kho'ini=Kho'ini
+controlledvocabulary.language.khoekhoe=Khoekhoe
+controlledvocabulary.language.khoibu_naga=Khoibu Naga
+controlledvocabulary.language.kholok=Kholok
+controlledvocabulary.language.khorasani_turkish=Khorasani Turkish
+controlledvocabulary.language.khorezmian=Khorezmian
+controlledvocabulary.language.khotanese=Khotanese
+controlledvocabulary.language.khowar=Khowar
+controlledvocabulary.language.khua=Khua
+controlledvocabulary.language.khuen=Khuen
+controlledvocabulary.language.khumi_chin=Khumi Chin
+controlledvocabulary.language.khunsari=Khunsari
+controlledvocabulary.language.khvarshi=Khvarshi
+controlledvocabulary.language.khang=KhÃĄng
+controlledvocabulary.language.khun=KhÃŧn
+controlledvocabulary.language.kibala=Kibala
+controlledvocabulary.language.kibet=Kibet
+controlledvocabulary.language.kibiri=Kibiri
+controlledvocabulary.language.kickapoo=Kickapoo
+controlledvocabulary.language.kija=Kija
+controlledvocabulary.language.kikai=Kikai
 controlledvocabulary.language.kikuyu,_gikuyu=Kikuyu, Gikuyu
+controlledvocabulary.language.kildin_sami=Kildin Sami
+controlledvocabulary.language.kilivila=Kilivila
+controlledvocabulary.language.kiliwa=Kiliwa
+controlledvocabulary.language.kilmeri=Kilmeri
+controlledvocabulary.language.kim=Kim
+controlledvocabulary.language.kim_mun=Kim Mun
+controlledvocabulary.language.kimaama=Kimaama
+controlledvocabulary.language.kimaragang=Kimaragang
+controlledvocabulary.language.kimbu=Kimbu
+controlledvocabulary.language.kimbundu=Kimbundu
+controlledvocabulary.language.kimki=Kimki
+controlledvocabulary.language.kimre=KimrÊ
+controlledvocabulary.language.kinabalian=Kinabalian
+controlledvocabulary.language.kinalakna=Kinalakna
+controlledvocabulary.language.kinamiging_manobo=Kinamiging Manobo
+controlledvocabulary.language.kinaray-a=Kinaray-A
+controlledvocabulary.language.kinga=Kinga
+controlledvocabulary.language.kinnauri=Kinnauri
+controlledvocabulary.language.kintaq=Kintaq
+controlledvocabulary.language.kinuku=Kinuku
 controlledvocabulary.language.kinyarwanda=Kinyarwanda
-controlledvocabulary.language.kyrgyz=Kyrgyz
+controlledvocabulary.language.kioko=Kioko
+controlledvocabulary.language.kiong=Kiong
+controlledvocabulary.language.kiorr=Kiorr
+controlledvocabulary.language.kiowa=Kiowa
+controlledvocabulary.language.kiowa_apache=Kiowa Apache
+controlledvocabulary.language.kipsigis=Kipsigis
+controlledvocabulary.language.kiput=Kiput
+controlledvocabulary.language.kir-balar=Kir-Balar
+controlledvocabulary.language.kire=Kire
+controlledvocabulary.language.kirghiz=Kirghiz, Kyrgyz
+controlledvocabulary.language.kirike=Kirike
+controlledvocabulary.language.kirikiri=Kirikiri
+controlledvocabulary.language.kirmanjki_(individual_language)=Kirmanjki (individual language)
+controlledvocabulary.language.kirya-konzəl=Kirya-Konzəl
+controlledvocabulary.language.kis=Kis
+controlledvocabulary.language.kisa=Kisa
+controlledvocabulary.language.kisan=Kisan
+controlledvocabulary.language.kisankasa=Kisankasa
+controlledvocabulary.language.kisar=Kisar
+controlledvocabulary.language.kisi=Kisi
+controlledvocabulary.language.kistane=Kistane
+controlledvocabulary.language.kita_maninkakan=Kita Maninkakan
+controlledvocabulary.language.kitan=Kitan
+controlledvocabulary.language.kitsai=Kitsai
+controlledvocabulary.language.kituba_(congo)=Kituba (Congo)
+controlledvocabulary.language.kituba_(democratic_republic_of_congo)=Kituba (Democratic Republic of Congo)
+controlledvocabulary.language.kiunum=Kiunum
+controlledvocabulary.language.kizamani=Kizamani
+controlledvocabulary.language.kla-dan=Kla-Dan
+controlledvocabulary.language.klamath-modoc=Klamath-Modoc
+controlledvocabulary.language.klao=Klao
+controlledvocabulary.language.klias_river_kadazan=Klias River Kadazan
+controlledvocabulary.language.klingon=Klingon
+controlledvocabulary.language.knaanic=Knaanic
+controlledvocabulary.language.ko=Ko
+controlledvocabulary.language.koalib=Koalib
+controlledvocabulary.language.koasati=Koasati
+controlledvocabulary.language.koba=Koba
+controlledvocabulary.language.kobiana=Kobiana
+controlledvocabulary.language.kobo=Kobo
+controlledvocabulary.language.kobol=Kobol
+controlledvocabulary.language.kobon=Kobon
+controlledvocabulary.language.koch=Koch
+controlledvocabulary.language.kochila_tharu=Kochila Tharu
+controlledvocabulary.language.koda=Koda
+controlledvocabulary.language.kodaku=Kodaku
+controlledvocabulary.language.kodava=Kodava
+controlledvocabulary.language.kodeoha=Kodeoha
+controlledvocabulary.language.kodi=Kodi
+controlledvocabulary.language.kodia=Kodia
+controlledvocabulary.language.koenoem=Koenoem
+controlledvocabulary.language.kofa=Kofa
+controlledvocabulary.language.kofei=Kofei
+controlledvocabulary.language.kofyar=Kofyar
+controlledvocabulary.language.koguryo=Koguryo
+controlledvocabulary.language.kohin=Kohin
+controlledvocabulary.language.kohistani_shina=Kohistani Shina
+controlledvocabulary.language.koho=Koho
+controlledvocabulary.language.kohumono=Kohumono
+controlledvocabulary.language.koi=Koi
+controlledvocabulary.language.koireng=Koireng
+controlledvocabulary.language.koitabu=Koitabu
+controlledvocabulary.language.koiwat=Koiwat
+controlledvocabulary.language.kok_borok=Kok Borok
+controlledvocabulary.language.kok-nar=Kok-Nar
+controlledvocabulary.language.kokata=Kokata
+controlledvocabulary.language.koke=Koke
+controlledvocabulary.language.koki_naga=Koki Naga
+controlledvocabulary.language.koko_babangk=Koko Babangk
+controlledvocabulary.language.kokoda=Kokoda
+controlledvocabulary.language.kokola=Kokola
+controlledvocabulary.language.kokota=Kokota
+controlledvocabulary.language.kol_(bangladesh)=Kol (Bangladesh)
+controlledvocabulary.language.kol_(cameroon)=Kol (Cameroon)
+controlledvocabulary.language.kol_(papua_new_guinea)=Kol (Papua New Guinea)
+controlledvocabulary.language.kola=Kola
+controlledvocabulary.language.kolbila=Kolbila
+controlledvocabulary.language.kolibugan_subanon=Kolibugan Subanon
+controlledvocabulary.language.koluwawa=Koluwawa
+controlledvocabulary.language.kom_(cameroon)=Kom (Cameroon)
+controlledvocabulary.language.kom_(india)=Kom (India)
+controlledvocabulary.language.koma=Koma
+controlledvocabulary.language.komba=Komba
+controlledvocabulary.language.kombai=Kombai
+controlledvocabulary.language.kombio=Kombio
+controlledvocabulary.language.komering=Komering
 controlledvocabulary.language.komi=Komi
+controlledvocabulary.language.komi-permyak=Komi-Permyak
+controlledvocabulary.language.komi-zyrian=Komi-Zyrian
+controlledvocabulary.language.kominimung=Kominimung
+controlledvocabulary.language.komo_(democratic_republic_of_congo)=Komo (Democratic Republic of Congo)
+controlledvocabulary.language.komo_(sudan)=Komo (Sudan)
+controlledvocabulary.language.komodo=Komodo
+controlledvocabulary.language.kompane=Kompane
+controlledvocabulary.language.komyandaret=Komyandaret
+controlledvocabulary.language.kon_keu=Kon Keu
+controlledvocabulary.language.konai=Konai
+controlledvocabulary.language.konda=Konda
+controlledvocabulary.language.konda-dora=Konda-Dora
+controlledvocabulary.language.koneraw=Koneraw
 controlledvocabulary.language.kongo=Kongo
+controlledvocabulary.language.konkani_(individual_language)=Konkani (individual language)
+controlledvocabulary.language.konkani_(macrolanguage)=Konkani (macrolanguage)
+controlledvocabulary.language.konkomba=Konkomba
+controlledvocabulary.language.konni=Konni
+controlledvocabulary.language.kono_(guinea)=Kono (Guinea)
+controlledvocabulary.language.kono_(nigeria)=Kono (Nigeria)
+controlledvocabulary.language.kono_(sierra_leone)=Kono (Sierra Leone)
+controlledvocabulary.language.konomala=Konomala
+controlledvocabulary.language.konongo=Konongo
+controlledvocabulary.language.konso=Konso
+controlledvocabulary.language.konyak_naga=Konyak Naga
+controlledvocabulary.language.konyanka_maninka=Konyanka Maninka
+controlledvocabulary.language.konzo=Konzo
+controlledvocabulary.language.koongo=Koongo
+controlledvocabulary.language.koonzime=Koonzime
+controlledvocabulary.language.koorete=Koorete
+controlledvocabulary.language.kopar=Kopar
+controlledvocabulary.language.kopkaka=Kopkaka
+controlledvocabulary.language.korafe-yegha=Korafe-Yegha
+controlledvocabulary.language.korak=Korak
+controlledvocabulary.language.korana=Korana
+controlledvocabulary.language.korandje=Korandje
 controlledvocabulary.language.korean=Korean
+controlledvocabulary.language.korean_sign_language=Korean Sign Language
+controlledvocabulary.language.koreguaje=Koreguaje
+controlledvocabulary.language.koresh-e_rostam=Koresh-e Rostam
+controlledvocabulary.language.korku=Korku
+controlledvocabulary.language.korlai_creole_portuguese=Korlai Creole Portuguese
+controlledvocabulary.language.koro_(cote_d'ivoire)=Koro (Côte d'Ivoire)
+controlledvocabulary.language.koro_(india)=Koro (India)
+controlledvocabulary.language.koro_(papua_new_guinea)=Koro (Papua New Guinea)
+controlledvocabulary.language.koro_(vanuatu)=Koro (Vanuatu)
+controlledvocabulary.language.koro_nulu=Koro Nulu
+controlledvocabulary.language.koro_wachi=Koro Wachi
+controlledvocabulary.language.koro_zuba=Koro Zuba
+controlledvocabulary.language.koromfe=KoromfÊ
+controlledvocabulary.language.koromira=Koromira
+controlledvocabulary.language.koronadal_blaan=Koronadal Blaan
+controlledvocabulary.language.koroni=Koroni
+controlledvocabulary.language.koropo=KoropÃŗ
+controlledvocabulary.language.koroshi=Koroshi
+controlledvocabulary.language.korowai=Korowai
+controlledvocabulary.language.korra_koraga=Korra Koraga
+controlledvocabulary.language.korubo=Korubo
+controlledvocabulary.language.korupun-sela=Korupun-Sela
+controlledvocabulary.language.korwa=Korwa
+controlledvocabulary.language.koryak=Koryak
+controlledvocabulary.language.kosadle=Kosadle
+controlledvocabulary.language.kosarek_yale=Kosarek Yale
+controlledvocabulary.language.kosena=Kosena
+controlledvocabulary.language.koshin=Koshin
+controlledvocabulary.language.kosraean=Kosraean
+controlledvocabulary.language.kota_(gabon)=Kota (Gabon)
+controlledvocabulary.language.kota_(india)=Kota (India)
+controlledvocabulary.language.kota_bangun_kutai_malay=Kota Bangun Kutai Malay
+controlledvocabulary.language.kota_marudu_talantang=Kota Marudu Talantang
+controlledvocabulary.language.kotafon_gbe=Kotafon Gbe
+controlledvocabulary.language.kotava=Kotava
+controlledvocabulary.language.koti=Koti
+controlledvocabulary.language.kott=Kott
+controlledvocabulary.language.kou=Kou
+controlledvocabulary.language.kouya=Kouya
+controlledvocabulary.language.kovai=Kovai
+controlledvocabulary.language.kove=Kove
+controlledvocabulary.language.kowaki=Kowaki
+controlledvocabulary.language.kowiai=Kowiai
+controlledvocabulary.language.koy_sanjaq_surat=Koy Sanjaq Surat
+controlledvocabulary.language.koya=Koya
+controlledvocabulary.language.koyaga=Koyaga
+controlledvocabulary.language.koyo=Koyo
+controlledvocabulary.language.koyra_chiini_songhay=Koyra Chiini Songhay
+controlledvocabulary.language.koyraboro_senni_songhai=Koyraboro Senni Songhai
+controlledvocabulary.language.koyukon=Koyukon
+controlledvocabulary.language.kpagua=Kpagua
+controlledvocabulary.language.kpala=Kpala
+controlledvocabulary.language.kpan=Kpan
+controlledvocabulary.language.kpasam=Kpasam
+controlledvocabulary.language.kpati=Kpati
+controlledvocabulary.language.kpatili=Kpatili
+controlledvocabulary.language.kpeego=Kpeego
+controlledvocabulary.language.kpelle=Kpelle
+controlledvocabulary.language.kpessi=Kpessi
+controlledvocabulary.language.kplang=Kplang
+controlledvocabulary.language.krache=Krache
+controlledvocabulary.language.kraho=Krahô
+controlledvocabulary.language.kraol=Kraol
+controlledvocabulary.language.krenak=Krenak
+controlledvocabulary.language.krevinian=Krevinian
+controlledvocabulary.language.kreye=Kreye
+controlledvocabulary.language.kriang=Kriang
+controlledvocabulary.language.krikati-timbira=Krikati-Timbira
+controlledvocabulary.language.krio=Krio
+controlledvocabulary.language.kriol=Kriol
+controlledvocabulary.language.krisa=Krisa
+controlledvocabulary.language.krobu=Krobu
+controlledvocabulary.language.krongo=Krongo
+controlledvocabulary.language.krung=Krung
+controlledvocabulary.language.krymchak=Krymchak
+controlledvocabulary.language.kryts=Kryts
+controlledvocabulary.language.kua=Kua
+controlledvocabulary.language.kua-nsi=Kua-nsi
+controlledvocabulary.language.kuamasi=Kuamasi
+controlledvocabulary.language.kuan=Kuan
+controlledvocabulary.language.kuanhua=Kuanhua
+controlledvocabulary.language.kuanua=Kuanua
+controlledvocabulary.language.kuanyama,_kwanyama=Kuanyama, Kwanyama
+controlledvocabulary.language.kubachi=Kubachi
+controlledvocabulary.language.kube=Kube
+controlledvocabulary.language.kubi=Kubi
+controlledvocabulary.language.kubo=Kubo
+controlledvocabulary.language.kubu=Kubu
+controlledvocabulary.language.kucong=Kucong
+controlledvocabulary.language.kudiya=Kudiya
+controlledvocabulary.language.kudmali=Kudmali
+controlledvocabulary.language.kudu-camo=Kudu-Camo
+controlledvocabulary.language.kufr_qassem_sign_language_(kqsl)=Kufr Qassem Sign Language (KQSL)
+controlledvocabulary.language.kugama=Kugama
+controlledvocabulary.language.kugbo=Kugbo
+controlledvocabulary.language.kugu-muminh=Kugu-Muminh
+controlledvocabulary.language.kui_(india)=Kui (India)
+controlledvocabulary.language.kui_(indonesia)=Kui (Indonesia)
+controlledvocabulary.language.kuijau=Kuijau
+controlledvocabulary.language.kuikuro-kalapalo=KuikÃēro-KalapÃĄlo
+controlledvocabulary.language.kujarge=Kujarge
+controlledvocabulary.language.kuk=Kuk
+controlledvocabulary.language.kukatja=Kukatja
+controlledvocabulary.language.kuke=Kuke
+controlledvocabulary.language.kukele=Kukele
+controlledvocabulary.language.kukna=Kukna
+controlledvocabulary.language.kuku=Kuku
+controlledvocabulary.language.kuku-mangk=Kuku-Mangk
+controlledvocabulary.language.kuku-mu'inh=Kuku-Mu'inh
+controlledvocabulary.language.kuku-ugbanh=Kuku-Ugbanh
+controlledvocabulary.language.kuku-uwanh=Kuku-Uwanh
+controlledvocabulary.language.kuku-yalanji=Kuku-Yalanji
+controlledvocabulary.language.kula=Kula
+controlledvocabulary.language.kulere=Kulere
+controlledvocabulary.language.kulfa=Kulfa
+controlledvocabulary.language.kulina_pano=Kulina Pano
+controlledvocabulary.language.kulisusu=Kulisusu
+controlledvocabulary.language.kullu_pahari=Kullu Pahari
+controlledvocabulary.language.kulon=Kulon
+controlledvocabulary.language.kulung_(nepal)=Kulung (Nepal)
+controlledvocabulary.language.kulung_(nigeria)=Kulung (Nigeria)
+controlledvocabulary.language.kumalu=Kumalu
+controlledvocabulary.language.kumam=Kumam
+controlledvocabulary.language.kuman_(papua_new_guinea)=Kuman (Papua New Guinea)
+controlledvocabulary.language.kuman_(russia)=Kuman (Russia)
+controlledvocabulary.language.kumaoni=Kumaoni
+controlledvocabulary.language.kumarbhag_paharia=Kumarbhag Paharia
+controlledvocabulary.language.kumba=Kumba
+controlledvocabulary.language.kumbainggar=Kumbainggar
+controlledvocabulary.language.kumbaran=Kumbaran
+controlledvocabulary.language.kumbewaha=Kumbewaha
+controlledvocabulary.language.kumhali=Kumhali
+controlledvocabulary.language.kumiai=Kumiai
+controlledvocabulary.language.kumukio=Kumukio
+controlledvocabulary.language.kumyk=Kumyk
+controlledvocabulary.language.kumzari=Kumzari
+controlledvocabulary.language.kunama=Kunama
+controlledvocabulary.language.kunbarlang=Kunbarlang
+controlledvocabulary.language.kunda=Kunda
+controlledvocabulary.language.kundal_shahi=Kundal Shahi
+controlledvocabulary.language.kunduvadi=Kunduvadi
+controlledvocabulary.language.kung=Kung
+controlledvocabulary.language.kung-ekoka=Kung-Ekoka
+controlledvocabulary.language.kungarakany=Kungarakany
+controlledvocabulary.language.kungardutyi=Kungardutyi
+controlledvocabulary.language.kunggari=Kunggari
+controlledvocabulary.language.kungkari=Kungkari
+controlledvocabulary.language.kuni=Kuni
+controlledvocabulary.language.kuni-boazi=Kuni-Boazi
+controlledvocabulary.language.kunigami=Kunigami
+controlledvocabulary.language.kunimaipa=Kunimaipa
+controlledvocabulary.language.kunja=Kunja
+controlledvocabulary.language.kunjen=Kunjen
+controlledvocabulary.language.kunyi=Kunyi
+controlledvocabulary.language.kunza=Kunza
+controlledvocabulary.language.kuo=Kuo
+controlledvocabulary.language.kuot=Kuot
+controlledvocabulary.language.kupa=Kupa
+controlledvocabulary.language.kupang_malay=Kupang Malay
+controlledvocabulary.language.kupia=Kupia
+controlledvocabulary.language.kupsabiny=Kupsabiny
+controlledvocabulary.language.kur=Kur
+controlledvocabulary.language.kura_ede_nago=Kura Ede Nago
+controlledvocabulary.language.kurama=Kurama
+controlledvocabulary.language.kuranko=Kuranko
 controlledvocabulary.language.kurdish=Kurdish
-controlledvocabulary.language.kwanyama,_kuanyama=Kwanyama, Kuanyama
+controlledvocabulary.language.kuri=Kuri
+controlledvocabulary.language.kuria=Kuria
+controlledvocabulary.language.kurichiya=Kurichiya
+controlledvocabulary.language.kurmukar=Kurmukar
+controlledvocabulary.language.kurnai=Kurnai
+controlledvocabulary.language.kurrama=Kurrama
+controlledvocabulary.language.kurti=Kurti
+controlledvocabulary.language.kurtokha=Kurtokha
+controlledvocabulary.language.kurudu=Kurudu
+controlledvocabulary.language.kurukh=Kurukh
+controlledvocabulary.language.kuruaya=KuruÃĄya
+controlledvocabulary.language.kusaal=Kusaal
+controlledvocabulary.language.kusaghe=Kusaghe
+controlledvocabulary.language.kushi=Kushi
+controlledvocabulary.language.kusu=Kusu
+controlledvocabulary.language.kusunda=Kusunda
+controlledvocabulary.language.kutenai=Kutenai
+controlledvocabulary.language.kutep=Kutep
+controlledvocabulary.language.kuthant=Kuthant
+controlledvocabulary.language.kutong=Kutong
+controlledvocabulary.language.kutto=Kutto
+controlledvocabulary.language.kutu=Kutu
+controlledvocabulary.language.kuturmi=Kuturmi
+controlledvocabulary.language.kuuk_thaayorre=Kuuk Thaayorre
+controlledvocabulary.language.kuuk-yak=Kuuk-Yak
+controlledvocabulary.language.kuuku-ya'u=Kuuku-Ya'u
+controlledvocabulary.language.kuvale=Kuvale
+controlledvocabulary.language.kuvi=Kuvi
+controlledvocabulary.language.kuwaa=Kuwaa
+controlledvocabulary.language.kuwaataay=Kuwaataay
+controlledvocabulary.language.kuwema=Kuwema
+controlledvocabulary.language.kuy=Kuy
+controlledvocabulary.language.kven_finnish=Kven Finnish
+controlledvocabulary.language.kw'adza=Kw'adza
+controlledvocabulary.language.kwa=Kwa
+controlledvocabulary.language.kwa'=Kwa'
+controlledvocabulary.language.kwaami=Kwaami
+controlledvocabulary.language.kwadi=Kwadi
+controlledvocabulary.language.kwaio=Kwaio
+controlledvocabulary.language.kwaja=Kwaja
+controlledvocabulary.language.kwakiutl=Kwakiutl
+controlledvocabulary.language.kwakum=Kwakum
+controlledvocabulary.language.kwalhioqua-tlatskanai=Kwalhioqua-Tlatskanai
+controlledvocabulary.language.kwama=Kwama
+controlledvocabulary.language.kwambi=Kwambi
+controlledvocabulary.language.kwamera=Kwamera
+controlledvocabulary.language.kwami=Kwami
+controlledvocabulary.language.kwamtim_one=Kwamtim One
+controlledvocabulary.language.kwandu=Kwandu
+controlledvocabulary.language.kwang=Kwang
+controlledvocabulary.language.kwanga=Kwanga
+controlledvocabulary.language.kwangali=Kwangali
+controlledvocabulary.language.kwanja=Kwanja
+controlledvocabulary.language.kwara'ae=Kwara'ae
+controlledvocabulary.language.kwasio=Kwasio
+controlledvocabulary.language.kwaya=Kwaya
+controlledvocabulary.language.kwaza=Kwaza
+controlledvocabulary.language.kwegu=Kwegu
+controlledvocabulary.language.kwer=Kwer
+controlledvocabulary.language.kwerba=Kwerba
+controlledvocabulary.language.kwerba_mamberamo=Kwerba Mamberamo
+controlledvocabulary.language.kwere=Kwere
+controlledvocabulary.language.kwerisa=Kwerisa
+controlledvocabulary.language.kwese=Kwese
+controlledvocabulary.language.kwesten=Kwesten
+controlledvocabulary.language.kwini=Kwini
+controlledvocabulary.language.kwinsu=Kwinsu
+controlledvocabulary.language.kwinti=Kwinti
+controlledvocabulary.language.kwoma=Kwoma
+controlledvocabulary.language.kwomtari=Kwomtari
+controlledvocabulary.language.kxoe=Kxoe
+controlledvocabulary.language.kyak=Kyak
+controlledvocabulary.language.kyaka=Kyaka
+controlledvocabulary.language.kyan-karyaw_naga=Kyan-Karyaw Naga
+controlledvocabulary.language.kyanga=Kyanga
+controlledvocabulary.language.kyenele=Kyenele
+controlledvocabulary.language.kyerung=Kyerung
+controlledvocabulary.language.kate=KÃĸte
+controlledvocabulary.language.kele=KÊlÊ
+controlledvocabulary.language.kolsch=KÃļlsch
+controlledvocabulary.language.kɛlɛngaxo_bozo=Kɛlɛngaxo Bozo
+controlledvocabulary.language.la'bi=La'bi
+controlledvocabulary.language.laal=Laal
+controlledvocabulary.language.laari=Laari
+controlledvocabulary.language.laarim=Laarim
+controlledvocabulary.language.laba=Laba
+controlledvocabulary.language.label=Label
+controlledvocabulary.language.labir=Labir
+controlledvocabulary.language.labo=Labo
+controlledvocabulary.language.labo_phowa=Labo Phowa
+controlledvocabulary.language.labu=Labu
+controlledvocabulary.language.labuk-kinabatangan_kadazan=Labuk-Kinabatangan Kadazan
+controlledvocabulary.language.lacandon=Lacandon
+controlledvocabulary.language.lachi=Lachi
+controlledvocabulary.language.lachiguiri_zapotec=Lachiguiri Zapotec
+controlledvocabulary.language.lachixio_zapotec=Lachixío Zapotec
+controlledvocabulary.language.ladakhi=Ladakhi
+controlledvocabulary.language.ladin=Ladin
+controlledvocabulary.language.ladino=Ladino
+controlledvocabulary.language.ladji_ladji=Ladji Ladji
+controlledvocabulary.language.laeko-libuat=Laeko-Libuat
+controlledvocabulary.language.lafofa=Lafofa
+controlledvocabulary.language.laghu=Laghu
+controlledvocabulary.language.laghuu=Laghuu
+controlledvocabulary.language.lagwan=Lagwan
+controlledvocabulary.language.laha_(indonesia)=Laha (Indonesia)
+controlledvocabulary.language.laha_(viet_nam)=Laha (Viet Nam)
+controlledvocabulary.language.lahanan=Lahanan
+controlledvocabulary.language.lahnda=Lahnda
+controlledvocabulary.language.lahta_karen=Lahta Karen
+controlledvocabulary.language.lahu=Lahu
+controlledvocabulary.language.lahu_shi=Lahu Shi
+controlledvocabulary.language.lahul_lohar=Lahul Lohar
+controlledvocabulary.language.laimbue=Laimbue
+controlledvocabulary.language.laitu_chin=Laitu Chin
+controlledvocabulary.language.laiyolo=Laiyolo
+controlledvocabulary.language.lak=Lak
+controlledvocabulary.language.laka_(chad)=Laka (Chad)
+controlledvocabulary.language.lakalei=Lakalei
+controlledvocabulary.language.lake_miwok=Lake Miwok
+controlledvocabulary.language.lakha=Lakha
+controlledvocabulary.language.laki=Laki
+controlledvocabulary.language.lakkia=Lakkia
+controlledvocabulary.language.lakon=Lakon
+controlledvocabulary.language.lakonde=LakondÃĒ
+controlledvocabulary.language.lakota=Lakota
+controlledvocabulary.language.lakota_dida=Lakota Dida
+controlledvocabulary.language.lakurumau=Lakurumau
+controlledvocabulary.language.lala=Lala
+controlledvocabulary.language.lala-bisa=Lala-Bisa
+controlledvocabulary.language.lala-roba=Lala-Roba
+controlledvocabulary.language.lalana_chinantec=Lalana Chinantec
+controlledvocabulary.language.lalia=Lalia
+controlledvocabulary.language.lama_(togo)=Lama (Togo)
+controlledvocabulary.language.lama_bai=Lama Bai
+controlledvocabulary.language.lamaholot=Lamaholot
+controlledvocabulary.language.lamalama=Lamalama
+controlledvocabulary.language.lamalera=Lamalera
+controlledvocabulary.language.lamang=Lamang
+controlledvocabulary.language.lamatuka=Lamatuka
+controlledvocabulary.language.lamba=Lamba
+controlledvocabulary.language.lambadi=Lambadi
+controlledvocabulary.language.lambayeque_quechua=Lambayeque Quechua
+controlledvocabulary.language.lambichhong=Lambichhong
+controlledvocabulary.language.lamboya=Lamboya
+controlledvocabulary.language.lambya=Lambya
+controlledvocabulary.language.lame=Lame
+controlledvocabulary.language.lamenu=Lamenu
+controlledvocabulary.language.lamja-dengsa-tola=Lamja-Dengsa-Tola
+controlledvocabulary.language.lamkang=Lamkang
+controlledvocabulary.language.lamma=Lamma
+controlledvocabulary.language.lamnso'=Lamnso'
+controlledvocabulary.language.lamogai=Lamogai
+controlledvocabulary.language.lampung_api=Lampung Api
+controlledvocabulary.language.lampung_nyo=Lampung Nyo
+controlledvocabulary.language.lamu=Lamu
+controlledvocabulary.language.lanas_lobu=Lanas Lobu
+controlledvocabulary.language.landoma=Landoma
+controlledvocabulary.language.lang'e=Lang'e
+controlledvocabulary.language.langam=Langam
+controlledvocabulary.language.langbashe=Langbashe
+controlledvocabulary.language.langnian_buyang=Langnian Buyang
+controlledvocabulary.language.lango_(south_sudan)=Lango (South Sudan)
+controlledvocabulary.language.lango_(uganda)=Lango (Uganda)
+controlledvocabulary.language.langobardic=Langobardic
+controlledvocabulary.language.langue_des_signes_de_belgique_francophone=Langue des signes de Belgique Francophone
+controlledvocabulary.language.lanima=Lanima
+controlledvocabulary.language.lanoh=Lanoh
+controlledvocabulary.language.lao=Lao
+controlledvocabulary.language.lao_naga=Lao Naga
+controlledvocabulary.language.laomian=Laomian
+controlledvocabulary.language.laopang=Laopang
+controlledvocabulary.language.laos_sign_language=Laos Sign Language
+controlledvocabulary.language.lapaguia-guivini_zapotec=Lapaguía-Guivini Zapotec
+controlledvocabulary.language.laragia=Laragia
+controlledvocabulary.language.larantuka_malay=Larantuka Malay
+controlledvocabulary.language.lardil=Lardil
+controlledvocabulary.language.larevat=Larevat
+controlledvocabulary.language.large_flowery_miao=Large Flowery Miao
+controlledvocabulary.language.lari=Lari
+controlledvocabulary.language.larike-wakasihu=Larike-Wakasihu
+controlledvocabulary.language.laro=Laro
+controlledvocabulary.language.larteh=Larteh
+controlledvocabulary.language.laru=Laru
+controlledvocabulary.language.las_delicias_zapotec=Las Delicias Zapotec
+controlledvocabulary.language.lasalimu=Lasalimu
+controlledvocabulary.language.lasgerdi=Lasgerdi
+controlledvocabulary.language.lashi=Lashi
+controlledvocabulary.language.lasi=Lasi
+controlledvocabulary.language.late_middle_chinese=Late Middle Chinese
+controlledvocabulary.language.latgalian=Latgalian
 controlledvocabulary.language.latin=Latin
-controlledvocabulary.language.luxembourgish,_letzeburgesch=Luxembourgish, Letzeburgesch
-controlledvocabulary.language.ganda=Ganda
-controlledvocabulary.language.limburgish,_limburgan,_limburger=Limburgish, Limburgan, Limburger
+controlledvocabulary.language.latu=Latu
+controlledvocabulary.language.latunde=LatundÃĒ
+controlledvocabulary.language.latvian=Latvian
+controlledvocabulary.language.latvian_sign_language=Latvian Sign Language
+controlledvocabulary.language.lau=Lau
+controlledvocabulary.language.laua=Laua
+controlledvocabulary.language.lauan=Lauan
+controlledvocabulary.language.lauje=Lauje
+controlledvocabulary.language.laura=Laura
+controlledvocabulary.language.laurentian=Laurentian
+controlledvocabulary.language.lautu_chin=Lautu Chin
+controlledvocabulary.language.lavatbura-lamusong=Lavatbura-Lamusong
+controlledvocabulary.language.laven=Laven
+controlledvocabulary.language.lavi=Lavi
+controlledvocabulary.language.lavukaleve=Lavukaleve
+controlledvocabulary.language.lawangan=Lawangan
+controlledvocabulary.language.lawu=Lawu
+controlledvocabulary.language.lawunuia=Lawunuia
+controlledvocabulary.language.layakha=Layakha
+controlledvocabulary.language.laz=Laz
+controlledvocabulary.language.lealao_chinantec=Lealao Chinantec
+controlledvocabulary.language.leco=Leco
+controlledvocabulary.language.ledo_kaili=Ledo Kaili
+controlledvocabulary.language.leelau=Leelau
+controlledvocabulary.language.lefa=Lefa
+controlledvocabulary.language.lega-mwenga=Lega-Mwenga
+controlledvocabulary.language.lega-shabunda=Lega-Shabunda
+controlledvocabulary.language.legbo=Legbo
+controlledvocabulary.language.legenyem=Legenyem
+controlledvocabulary.language.lehali=Lehali
+controlledvocabulary.language.lehalurup=Lehalurup
+controlledvocabulary.language.lehar=Lehar
+controlledvocabulary.language.leinong_naga=Leinong Naga
+controlledvocabulary.language.leipon=Leipon
+controlledvocabulary.language.lelak=Lelak
+controlledvocabulary.language.lele_(chad)=Lele (Chad)
+controlledvocabulary.language.lele_(democratic_republic_of_congo)=Lele (Democratic Republic of Congo)
+controlledvocabulary.language.lele_(guinea)=Lele (Guinea)
+controlledvocabulary.language.lele_(papua_new_guinea)=Lele (Papua New Guinea)
+controlledvocabulary.language.lelemi=Lelemi
+controlledvocabulary.language.lelepa=Lelepa
+controlledvocabulary.language.lembena=Lembena
+controlledvocabulary.language.lemerig=Lemerig
+controlledvocabulary.language.lemio=Lemio
+controlledvocabulary.language.lemnian=Lemnian
+controlledvocabulary.language.lemolang=Lemolang
+controlledvocabulary.language.lemoro=Lemoro
+controlledvocabulary.language.lenakel=Lenakel
+controlledvocabulary.language.lenca=Lenca
+controlledvocabulary.language.lendu=Lendu
+controlledvocabulary.language.lengilu=Lengilu
+controlledvocabulary.language.lengo=Lengo
+controlledvocabulary.language.lengola=Lengola
+controlledvocabulary.language.leningitij=Leningitij
+controlledvocabulary.language.lenje=Lenje
+controlledvocabulary.language.lenkau=Lenkau
+controlledvocabulary.language.lenyima=Lenyima
+controlledvocabulary.language.lepcha=Lepcha
+controlledvocabulary.language.lepki=Lepki
+controlledvocabulary.language.lepontic=Lepontic
+controlledvocabulary.language.lere=Lere
+controlledvocabulary.language.lese=Lese
+controlledvocabulary.language.lesing-gelimi=Lesing-Gelimi
+controlledvocabulary.language.letemboi=Letemboi
+controlledvocabulary.language.leti_(cameroon)=Leti (Cameroon)
+controlledvocabulary.language.leti_(indonesia)=Leti (Indonesia)
+controlledvocabulary.language.levantine_arabic=Levantine Arabic
+controlledvocabulary.language.levuka=Levuka
+controlledvocabulary.language.lewo=Lewo
+controlledvocabulary.language.lewo_eleng=Lewo Eleng
+controlledvocabulary.language.lewotobi=Lewotobi
+controlledvocabulary.language.leyigha=Leyigha
+controlledvocabulary.language.lezghian=Lezghian
+controlledvocabulary.language.lhokpu=Lhokpu
+controlledvocabulary.language.lhomi=Lhomi
+controlledvocabulary.language.li'o=Li'o
+controlledvocabulary.language.liabuku=Liabuku
+controlledvocabulary.language.liana-seti=Liana-Seti
+controlledvocabulary.language.liangmai_naga=Liangmai Naga
+controlledvocabulary.language.lianshan_zhuang=Lianshan Zhuang
+controlledvocabulary.language.liberia_kpelle=Liberia Kpelle
+controlledvocabulary.language.liberian_english=Liberian English
+controlledvocabulary.language.libido=Libido
+controlledvocabulary.language.libinza=Libinza
+controlledvocabulary.language.libon_bikol=Libon Bikol
+controlledvocabulary.language.liburnian=Liburnian
+controlledvocabulary.language.libyan_arabic=Libyan Arabic
+controlledvocabulary.language.libyan_sign_language=Libyan Sign Language
+controlledvocabulary.language.lidzonka=Lidzonka
+controlledvocabulary.language.ligbi=Ligbi
+controlledvocabulary.language.ligenza=Ligenza
+controlledvocabulary.language.ligurian=Ligurian
+controlledvocabulary.language.ligurian_(ancient)=Ligurian (Ancient)
+controlledvocabulary.language.lihir=Lihir
+controlledvocabulary.language.lijili=Lijili
+controlledvocabulary.language.lika=Lika
+controlledvocabulary.language.liki=Liki
+controlledvocabulary.language.likila=Likila
+controlledvocabulary.language.likuba=Likuba
+controlledvocabulary.language.likum=Likum
+controlledvocabulary.language.likwala=Likwala
+controlledvocabulary.language.lilau=Lilau
+controlledvocabulary.language.lillooet=Lillooet
+controlledvocabulary.language.limassa=Limassa
+controlledvocabulary.language.limbu=Limbu
+controlledvocabulary.language.limbum=Limbum
+controlledvocabulary.language.limburgan,_limburger,_limburgish=Limburgan, Limburger, Limburgish
+controlledvocabulary.language.limi=Limi
+controlledvocabulary.language.limilngan=Limilngan
+controlledvocabulary.language.limos_kalinga=Limos Kalinga
+controlledvocabulary.language.linear_a=Linear A
 controlledvocabulary.language.lingala=Lingala
-controlledvocabulary.language.lao=Lao
+controlledvocabulary.language.lingao=Lingao
+controlledvocabulary.language.lingarak=Lingarak
+controlledvocabulary.language.lingua_franca=Lingua Franca
+controlledvocabulary.language.lingua_franca_nova=Lingua Franca Nova
+controlledvocabulary.language.lipan_apache=Lipan Apache
+controlledvocabulary.language.lipo=Lipo
+controlledvocabulary.language.lisabata-nuniali=Lisabata-Nuniali
+controlledvocabulary.language.lisela=Lisela
+controlledvocabulary.language.lish=Lish
+controlledvocabulary.language.lishana_deni=Lishana Deni
+controlledvocabulary.language.lishanid_noshan=Lishanid Noshan
+controlledvocabulary.language.lishan_didan=LishÃĄn DidÃĄn
+controlledvocabulary.language.lisu=Lisu
+controlledvocabulary.language.literary_chinese=Literary Chinese
 controlledvocabulary.language.lithuanian=Lithuanian
+controlledvocabulary.language.lithuanian_sign_language=Lithuanian Sign Language
+controlledvocabulary.language.litzlitz=Litzlitz
+controlledvocabulary.language.liujiang_zhuang=Liujiang Zhuang
+controlledvocabulary.language.liuqian_zhuang=Liuqian Zhuang
+controlledvocabulary.language.liv=Liv
+controlledvocabulary.language.livvi=Livvi
+controlledvocabulary.language.lo-toga=Lo-Toga
+controlledvocabulary.language.loarki=Loarki
+controlledvocabulary.language.lobala=Lobala
+controlledvocabulary.language.lobi=Lobi
+controlledvocabulary.language.lodhi=Lodhi
+controlledvocabulary.language.logba=Logba
+controlledvocabulary.language.logir=Logir
+controlledvocabulary.language.logo=Logo
+controlledvocabulary.language.logol=Logol
+controlledvocabulary.language.logooli=Logooli
+controlledvocabulary.language.logorik=Logorik
+controlledvocabulary.language.croatian=Logudorese Sardinian, Croatian
+controlledvocabulary.language.lohorung=Lohorung
+controlledvocabulary.language.loja_highland_quichua=Loja Highland Quichua
+controlledvocabulary.language.lojban=Lojban
+controlledvocabulary.language.lokaa=Lokaa
+controlledvocabulary.language.loke=Loke
+controlledvocabulary.language.loko=Loko
+controlledvocabulary.language.lokoya=Lokoya
+controlledvocabulary.language.lola=Lola
+controlledvocabulary.language.lolak=Lolak
+controlledvocabulary.language.lole=Lole
+controlledvocabulary.language.lolo=Lolo
+controlledvocabulary.language.loloda=Loloda
+controlledvocabulary.language.lolopo=Lolopo
+controlledvocabulary.language.loma_(cote_d'ivoire)=Loma (Côte d'Ivoire)
+controlledvocabulary.language.loma_(liberia)=Loma (Liberia)
+controlledvocabulary.language.lomaiviti=Lomaiviti
+controlledvocabulary.language.lomavren=Lomavren
+controlledvocabulary.language.lombard=Lombard
+controlledvocabulary.language.lombi=Lombi
+controlledvocabulary.language.lombo=Lombo
+controlledvocabulary.language.lomwe=Lomwe
+controlledvocabulary.language.loncong=Loncong
+controlledvocabulary.language.long_phuri_naga=Long Phuri Naga
+controlledvocabulary.language.long_wat=Long Wat
+controlledvocabulary.language.longgu=Longgu
+controlledvocabulary.language.longto=Longto
+controlledvocabulary.language.longuda=Longuda
+controlledvocabulary.language.loniu=Loniu
+controlledvocabulary.language.lonwolwol=Lonwolwol
+controlledvocabulary.language.lonzo=Lonzo
+controlledvocabulary.language.loo=Loo
+controlledvocabulary.language.lopa=Lopa
+controlledvocabulary.language.lopi=Lopi
+controlledvocabulary.language.lopit=Lopit
+controlledvocabulary.language.lorang=Lorang
+controlledvocabulary.language.lorediakarkar=Lorediakarkar
+controlledvocabulary.language.loreto-ucayali_spanish=Loreto-Ucayali Spanish
+controlledvocabulary.language.lote=Lote
+controlledvocabulary.language.lotha_naga=Lotha Naga
+controlledvocabulary.language.lotud=Lotud
+controlledvocabulary.language.lou=Lou
+controlledvocabulary.language.louisiana_creole=Louisiana Creole
+controlledvocabulary.language.loun=Loun
+controlledvocabulary.language.loup_a=Loup A
+controlledvocabulary.language.loup_b=Loup B
+controlledvocabulary.language.low_german=Low German
+controlledvocabulary.language.lower_burdekin=Lower Burdekin
+controlledvocabulary.language.lower_chehalis=Lower Chehalis
+controlledvocabulary.language.lower_grand_valley_dani=Lower Grand Valley Dani
+controlledvocabulary.language.lower_nossob=Lower Nossob
+controlledvocabulary.language.lower_silesian=Lower Silesian
+controlledvocabulary.language.lower_sorbian=Lower Sorbian
+controlledvocabulary.language.lower_southern_aranda=Lower Southern Aranda
+controlledvocabulary.language.lower_ta'oih=Lower Ta'oih
+controlledvocabulary.language.lower_tanana=Lower Tanana
+controlledvocabulary.language.lowland_oaxaca_chontal=Lowland Oaxaca Chontal
+controlledvocabulary.language.lowland_tarahumara=Lowland Tarahumara
+controlledvocabulary.language.loxicha_zapotec=Loxicha Zapotec
+controlledvocabulary.language.lozi=Lozi
+controlledvocabulary.language.luang=Luang
 controlledvocabulary.language.luba-katanga=Luba-Katanga
-controlledvocabulary.language.latvian=Latvian
-controlledvocabulary.language.manx=Manx
+controlledvocabulary.language.luba-lulua=Luba-Lulua
+controlledvocabulary.language.lubila=Lubila
+controlledvocabulary.language.lubu=Lubu
+controlledvocabulary.language.lubuagan_kalinga=Lubuagan Kalinga
+controlledvocabulary.language.luchazi=Luchazi
+controlledvocabulary.language.lucumi=Lucumi
+controlledvocabulary.language.ludian=Ludian
+controlledvocabulary.language.lufu=Lufu
+controlledvocabulary.language.lugbara=Lugbara
+controlledvocabulary.language.luguru=Luguru
+controlledvocabulary.language.luhu=Luhu
+controlledvocabulary.language.luimbi=Luimbi
+controlledvocabulary.language.luiseno=Luiseno
+controlledvocabulary.language.lukpa=Lukpa
+controlledvocabulary.language.lule=Lule
+controlledvocabulary.language.lule_sami=Lule Sami
+controlledvocabulary.language.lumba-yakkha=Lumba-Yakkha
+controlledvocabulary.language.lumbu=Lumbu
+controlledvocabulary.language.lumun=Lumun
+controlledvocabulary.language.luna=Luna
+controlledvocabulary.language.lunanakha=Lunanakha
+controlledvocabulary.language.lunda=Lunda
+controlledvocabulary.language.lundayeh=Lundayeh
+controlledvocabulary.language.lungalunga=Lungalunga
+controlledvocabulary.language.lungga=Lungga
+controlledvocabulary.language.luo_(cameroon)=Luo (Cameroon)
+controlledvocabulary.language.luo_(kenya_and_tanzania)=Luo (Kenya and Tanzania)
+controlledvocabulary.language.luopohe_hmong=Luopohe Hmong
+controlledvocabulary.language.luri=Luri
+controlledvocabulary.language.lusengo=Lusengo
+controlledvocabulary.language.lushai=Lushai
+controlledvocabulary.language.lushootseed=Lushootseed
+controlledvocabulary.language.lusi=Lusi
+controlledvocabulary.language.lusitanian=Lusitanian
+controlledvocabulary.language.lutos=Lutos
+controlledvocabulary.language.luvale=Luvale
+controlledvocabulary.language.luwati=Luwati
+controlledvocabulary.language.luwo=Luwo
+controlledvocabulary.language.luxembourgish,_letzeburgesch=Luxembourgish, Letzeburgesch
+controlledvocabulary.language.luyana=Luyana
+controlledvocabulary.language.luyia=Luyia
+controlledvocabulary.language.lwalu=Lwalu
+controlledvocabulary.language.lwel=Lwel
+controlledvocabulary.language.lycian=Lycian
+controlledvocabulary.language.lydian=Lydian
+controlledvocabulary.language.lyngngam=Lyngngam
+controlledvocabulary.language.lyele=LyÊlÊ
+controlledvocabulary.language.laadan=LÃĄadan
+controlledvocabulary.language.laa_laa_bwamu=LÃĄÃĄ LÃĄÃĄ Bwamu
+controlledvocabulary.language.lu=LÃŧ
+controlledvocabulary.language.ma_(democratic_republic_of_congo)=Ma (Democratic Republic of Congo)
+controlledvocabulary.language.ma_(papua_new_guinea)=Ma (Papua New Guinea)
+controlledvocabulary.language.ma_manda=Ma Manda
+controlledvocabulary.language.ma'anyan=Ma'anyan
+controlledvocabulary.language.ma'di=Ma'di
+controlledvocabulary.language.ma'ya=Ma'ya
+controlledvocabulary.language.maa=Maa
+controlledvocabulary.language.maaka=Maaka
+controlledvocabulary.language.maasina_fulfulde=Maasina Fulfulde
+controlledvocabulary.language.maay=Maay
+controlledvocabulary.language.maba_(chad)=Maba (Chad)
+controlledvocabulary.language.maba_(indonesia)=Maba (Indonesia)
+controlledvocabulary.language.mabaale=Mabaale
+controlledvocabulary.language.mabaan=Mabaan
+controlledvocabulary.language.mabaka_valley_kalinga=Mabaka Valley Kalinga
+controlledvocabulary.language.mabire=Mabire
+controlledvocabulary.language.maca=Maca
+controlledvocabulary.language.macaguaje=Macaguaje
+controlledvocabulary.language.macaguan=MacaguÃĄn
+controlledvocabulary.language.macanese=Macanese
+controlledvocabulary.language.macedo-romanian=Macedo-Romanian
 controlledvocabulary.language.macedonian=Macedonian
+controlledvocabulary.language.machame=Machame
+controlledvocabulary.language.machiguenga=Machiguenga
+controlledvocabulary.language.machinere=Machinere
+controlledvocabulary.language.machinga=Machinga
+controlledvocabulary.language.maco=Maco
+controlledvocabulary.language.macuna=Macuna
+controlledvocabulary.language.macushi=Macushi
+controlledvocabulary.language.mada_(cameroon)=Mada (Cameroon)
+controlledvocabulary.language.mada_(nigeria)=Mada (Nigeria)
+controlledvocabulary.language.madagascar_sign_language=Madagascar Sign Language
+controlledvocabulary.language.madak=Madak
+controlledvocabulary.language.madhi_madhi=Madhi Madhi
+controlledvocabulary.language.madi=Madi
+controlledvocabulary.language.madurese=Madurese
+controlledvocabulary.language.mae=Mae
+controlledvocabulary.language.maek=Maek
+controlledvocabulary.language.maeng_itneg=Maeng Itneg
+controlledvocabulary.language.mafa=Mafa
+controlledvocabulary.language.mafea=Mafea
+controlledvocabulary.language.mag-indi_ayta=Mag-Indi Ayta
+controlledvocabulary.language.mag-antsi_ayta=Mag-antsi Ayta
+controlledvocabulary.language.magahi=Magahi
+controlledvocabulary.language.magbukun_ayta=Magbukun Ayta
+controlledvocabulary.language.magdalena_penasco_mixtec=Magdalena PeÃąasco Mixtec
+controlledvocabulary.language.magoma=Magoma
+controlledvocabulary.language.magori=Magori
+controlledvocabulary.language.maguindanaon=Maguindanaon
+controlledvocabulary.language.magi_(madang_province)=Magɨ (Madang Province)
+controlledvocabulary.language.magiyi=Magɨyi
+controlledvocabulary.language.mahali=Mahali
+controlledvocabulary.language.mahasu_pahari=Mahasu Pahari
+controlledvocabulary.language.mahican=Mahican
+controlledvocabulary.language.mahongwe=Mahongwe
+controlledvocabulary.language.mahou=Mahou
+controlledvocabulary.language.mai_brat=Mai Brat
+controlledvocabulary.language.maia=Maia
+controlledvocabulary.language.maiadomu=Maiadomu
+controlledvocabulary.language.maiani=Maiani
+controlledvocabulary.language.maii=Maii
+controlledvocabulary.language.mailu=Mailu
+controlledvocabulary.language.maindo=Maindo
+controlledvocabulary.language.mainfrankisch=Mainfränkisch
+controlledvocabulary.language.mainstream_kenyah=Mainstream Kenyah
+controlledvocabulary.language.mairasi=Mairasi
+controlledvocabulary.language.maisin=Maisin
+controlledvocabulary.language.maithili=Maithili
+controlledvocabulary.language.maiwa_(indonesia)=Maiwa (Indonesia)
+controlledvocabulary.language.maiwa_(papua_new_guinea)=Maiwa (Papua New Guinea)
+controlledvocabulary.language.maiwala=Maiwala
+controlledvocabulary.language.majang=Majang
+controlledvocabulary.language.majera=Majera
+controlledvocabulary.language.majhi=Majhi
+controlledvocabulary.language.majhwar=Majhwar
+controlledvocabulary.language.majukayang_kalinga=Majukayang Kalinga
+controlledvocabulary.language.mak_(china)=Mak (China)
+controlledvocabulary.language.mak_(nigeria)=Mak (Nigeria)
+controlledvocabulary.language.makaa=Makaa
+controlledvocabulary.language.makah=Makah
+controlledvocabulary.language.makalero=Makalero
+controlledvocabulary.language.makasae=Makasae
+controlledvocabulary.language.makasar=Makasar
+controlledvocabulary.language.makassar_malay=Makassar Malay
+controlledvocabulary.language.makayam=Makayam
+controlledvocabulary.language.makhuwa=Makhuwa
+controlledvocabulary.language.makhuwa-marrevone=Makhuwa-Marrevone
+controlledvocabulary.language.makhuwa-meetto=Makhuwa-Meetto
+controlledvocabulary.language.makhuwa-moniga=Makhuwa-Moniga
+controlledvocabulary.language.makhuwa-saka=Makhuwa-Saka
+controlledvocabulary.language.makhuwa-shirima=Makhuwa-Shirima
+controlledvocabulary.language.maklew=Maklew
+controlledvocabulary.language.makolkol=Makolkol
+controlledvocabulary.language.makonde=Makonde
+controlledvocabulary.language.maku'a=Maku'a
+controlledvocabulary.language.makuri_naga=Makuri Naga
+controlledvocabulary.language.makurap=MakurÃĄp
+controlledvocabulary.language.makwe=Makwe
+controlledvocabulary.language.makyan_naga=Makyan Naga
+controlledvocabulary.language.mal=Mal
+controlledvocabulary.language.mal_paharia=Mal Paharia
+controlledvocabulary.language.mala_(nigeria)=Mala (Nigeria)
+controlledvocabulary.language.mala_(papua_new_guinea)=Mala (Papua New Guinea)
+controlledvocabulary.language.mala_malasar=Mala Malasar
+controlledvocabulary.language.malaccan_creole_malay=Malaccan Creole Malay
+controlledvocabulary.language.malaccan_creole_portuguese=Malaccan Creole Portuguese
 controlledvocabulary.language.malagasy=Malagasy
-controlledvocabulary.language.malay=Malay
+controlledvocabulary.language.malak_malak=Malak Malak
+controlledvocabulary.language.malalamai=Malalamai
+controlledvocabulary.language.malango=Malango
+controlledvocabulary.language.malankuravan=Malankuravan
+controlledvocabulary.language.malapandaram=Malapandaram
+controlledvocabulary.language.malaryan=Malaryan
+controlledvocabulary.language.malas=Malas
+controlledvocabulary.language.malasar=Malasar
+controlledvocabulary.language.malavedan=Malavedan
+controlledvocabulary.language.malawi_lomwe=Malawi Lomwe
+controlledvocabulary.language.malawi_sena=Malawi Sena
+controlledvocabulary.language.malawian_sign_language=Malawian Sign Language
+controlledvocabulary.language.malay_(individual_language)=Malay (individual language)
+controlledvocabulary.language.malay=Malay, Malay (macrolanguage)
 controlledvocabulary.language.malayalam=Malayalam
+controlledvocabulary.language.malayic_dayak=Malayic Dayak
+controlledvocabulary.language.malaynon=Malaynon
+controlledvocabulary.language.malayo=Malayo
+controlledvocabulary.language.malaysian_sign_language=Malaysian Sign Language
+controlledvocabulary.language.malba_birifor=Malba Birifor
+controlledvocabulary.language.maldivian,_dhivehi,_divehi=Maldivian, Dhivehi, Divehi
+controlledvocabulary.language.male_(ethiopia)=Male (Ethiopia)
+controlledvocabulary.language.male_(papua_new_guinea)=Male (Papua New Guinea)
+controlledvocabulary.language.malecite-passamaquoddy=Malecite-Passamaquoddy
+controlledvocabulary.language.maleng=Maleng
+controlledvocabulary.language.maleu-kilenge=Maleu-Kilenge
+controlledvocabulary.language.malfaxal=Malfaxal
+controlledvocabulary.language.malgana=Malgana
+controlledvocabulary.language.malgbe=Malgbe
+controlledvocabulary.language.mali=Mali
+controlledvocabulary.language.malila=Malila
+controlledvocabulary.language.malimba=Malimba
+controlledvocabulary.language.malimpung=Malimpung
+controlledvocabulary.language.malinaltepec_me'phaa=Malinaltepec Me'phaa
+controlledvocabulary.language.malo=Malo
+controlledvocabulary.language.malol=Malol
 controlledvocabulary.language.maltese=Maltese
-controlledvocabulary.language.maori=M\u0101ori
-controlledvocabulary.language.marathi_(marathi)=Marathi (Mar\u0101\u1E6Dh\u012B)
+controlledvocabulary.language.maltese_sign_language=Maltese Sign Language
+controlledvocabulary.language.malua_bay=Malua Bay
+controlledvocabulary.language.malvi=Malvi
+controlledvocabulary.language.malyangapa=Malyangapa
+controlledvocabulary.language.maleku_jaika=MalÊku Jaíka
+controlledvocabulary.language.mam=Mam
+controlledvocabulary.language.mama=Mama
+controlledvocabulary.language.mamaa=Mamaa
+controlledvocabulary.language.mamainde=MamaindÊ
+controlledvocabulary.language.mamanwa=Mamanwa
+controlledvocabulary.language.mamara_senoufo=Mamara Senoufo
+controlledvocabulary.language.mamasa=Mamasa
+controlledvocabulary.language.mambae=Mambae
+controlledvocabulary.language.mambai=Mambai
+controlledvocabulary.language.mamboru=Mamboru
+controlledvocabulary.language.mambwe-lungu=Mambwe-Lungu
+controlledvocabulary.language.mampruli=Mampruli
+controlledvocabulary.language.mamuju=Mamuju
+controlledvocabulary.language.mamulique=Mamulique
+controlledvocabulary.language.mamusi=Mamusi
+controlledvocabulary.language.mamvu=Mamvu
+controlledvocabulary.language.man_met=Man Met
+controlledvocabulary.language.manado_malay=Manado Malay
+controlledvocabulary.language.manam=Manam
+controlledvocabulary.language.manambu=Manambu
+controlledvocabulary.language.manangba=Manangba
+controlledvocabulary.language.manangkari=Manangkari
+controlledvocabulary.language.manchu=Manchu
+controlledvocabulary.language.manda_(australia)=Manda (Australia)
+controlledvocabulary.language.manda_(india)=Manda (India)
+controlledvocabulary.language.manda_(tanzania)=Manda (Tanzania)
+controlledvocabulary.language.mandahuaca=Mandahuaca
+controlledvocabulary.language.mandaic=Mandaic
+controlledvocabulary.language.mandan=Mandan
+controlledvocabulary.language.mandandanyi=Mandandanyi
+controlledvocabulary.language.mandar=Mandar
+controlledvocabulary.language.mandara=Mandara
+controlledvocabulary.language.mandari=Mandari
+controlledvocabulary.language.mandarin_chinese=Mandarin Chinese
+controlledvocabulary.language.mandaya=Mandaya
+controlledvocabulary.language.mandeali=Mandeali
+controlledvocabulary.language.mander=Mander
+controlledvocabulary.language.mandingo=Mandingo
+controlledvocabulary.language.mandinka=Mandinka
+controlledvocabulary.language.mandjak=Mandjak
+controlledvocabulary.language.mandobo_atas=Mandobo Atas
+controlledvocabulary.language.mandobo_bawah=Mandobo Bawah
+controlledvocabulary.language.manem=Manem
+controlledvocabulary.language.mang=Mang
+controlledvocabulary.language.manga_kanuri=Manga Kanuri
+controlledvocabulary.language.mangala=Mangala
+controlledvocabulary.language.mangareva=Mangareva
+controlledvocabulary.language.mangarrayi=Mangarrayi
+controlledvocabulary.language.mangas=Mangas
+controlledvocabulary.language.mangayat=Mangayat
+controlledvocabulary.language.mangbetu=Mangbetu
+controlledvocabulary.language.mangbutu=Mangbutu
+controlledvocabulary.language.mangerr=Mangerr
+controlledvocabulary.language.mangga_buang=Mangga Buang
+controlledvocabulary.language.manggarai=Manggarai
+controlledvocabulary.language.mango=Mango
+controlledvocabulary.language.mangole=Mangole
+controlledvocabulary.language.mangseng=Mangseng
+controlledvocabulary.language.mangue=Mangue
+controlledvocabulary.language.manichaean_middle_persian=Manichaean Middle Persian
+controlledvocabulary.language.manide=Manide
+controlledvocabulary.language.manikion=Manikion
+controlledvocabulary.language.manipa=Manipa
+controlledvocabulary.language.manipuri=Manipuri
+controlledvocabulary.language.mankanya=Mankanya
+controlledvocabulary.language.mankiyali=Mankiyali
+controlledvocabulary.language.manna-dora=Manna-Dora
+controlledvocabulary.language.mannan=Mannan
+controlledvocabulary.language.mano=Mano
+controlledvocabulary.language.manombai=Manombai
+controlledvocabulary.language.mansaka=Mansaka
+controlledvocabulary.language.mansi=Mansi
+controlledvocabulary.language.mansoanka=Mansoanka
+controlledvocabulary.language.manta=Manta
+controlledvocabulary.language.mantsi=Mantsi
+controlledvocabulary.language.manumanaw_karen=Manumanaw Karen
+controlledvocabulary.language.manx=Manx
+controlledvocabulary.language.manya=Manya
+controlledvocabulary.language.manyawa=Manyawa
+controlledvocabulary.language.manyika=Manyika
+controlledvocabulary.language.manza=Manza
+controlledvocabulary.language.mao_naga=Mao Naga
+controlledvocabulary.language.maonan=Maonan
+controlledvocabulary.language.maore_comorian=Maore Comorian
+controlledvocabulary.language.mape=Mape
+controlledvocabulary.language.mapena=Mapena
+controlledvocabulary.language.mapia=Mapia
+controlledvocabulary.language.mapidian=Mapidian
+controlledvocabulary.language.mapos_buang=Mapos Buang
+controlledvocabulary.language.mapoyo=Mapoyo
+controlledvocabulary.language.mapudungun=Mapudungun
+controlledvocabulary.language.mapun=Mapun
+controlledvocabulary.language.maquiritari=Maquiritari
+controlledvocabulary.language.mara_chin=Mara Chin
+controlledvocabulary.language.marachi=Marachi
+controlledvocabulary.language.maraghei=Maraghei
+controlledvocabulary.language.maragus=Maragus
+controlledvocabulary.language.maram_naga=Maram Naga
+controlledvocabulary.language.marama=Marama
+controlledvocabulary.language.maranao=Maranao
+controlledvocabulary.language.maranunggu=Maranunggu
+controlledvocabulary.language.mararit=Mararit
+controlledvocabulary.language.marathi_(marathi)=Marathi, Marathi (MarāᚭhÄĢ)
+controlledvocabulary.language.marau=Marau
+controlledvocabulary.language.marba=Marba
+controlledvocabulary.language.mardin_sign_language=Mardin Sign Language
+controlledvocabulary.language.maremgi=Maremgi
+controlledvocabulary.language.marenje=Marenje
+controlledvocabulary.language.marfa=Marfa
+controlledvocabulary.language.margany=Margany
+controlledvocabulary.language.marghi_central=Marghi Central
+controlledvocabulary.language.marghi_south=Marghi South
+controlledvocabulary.language.margos-yarowilca-lauricocha_quechua=Margos-Yarowilca-Lauricocha Quechua
+controlledvocabulary.language.margu=Margu
+controlledvocabulary.language.mari_(east_sepik_province)=Mari (East Sepik Province)
+controlledvocabulary.language.mari_(madang_province)=Mari (Madang Province)
+controlledvocabulary.language.mari_(russia)=Mari (Russia)
+controlledvocabulary.language.maria_(india)=Maria (India)
+controlledvocabulary.language.maria_(papua_new_guinea)=Maria (Papua New Guinea)
+controlledvocabulary.language.maricopa=Maricopa
+controlledvocabulary.language.maridan=Maridan
+controlledvocabulary.language.maridjabin=Maridjabin
+controlledvocabulary.language.marik=Marik
+controlledvocabulary.language.marimanindji=Marimanindji
+controlledvocabulary.language.marind=Marind
+controlledvocabulary.language.maring=Maring
+controlledvocabulary.language.maring_naga=Maring Naga
+controlledvocabulary.language.maringarr=Maringarr
+controlledvocabulary.language.marino=Marino
+controlledvocabulary.language.mariri=Mariri
+controlledvocabulary.language.maritime_sign_language=Maritime Sign Language
+controlledvocabulary.language.maritsaua=MaritsauÃĄ
+controlledvocabulary.language.mariyedi=Mariyedi
+controlledvocabulary.language.marka=Marka
+controlledvocabulary.language.markweeta=Markweeta
+controlledvocabulary.language.marma=Marma
+controlledvocabulary.language.marovo=Marovo
+controlledvocabulary.language.marra=Marra
+controlledvocabulary.language.marriammu=Marriammu
+controlledvocabulary.language.marrithiyel=Marrithiyel
+controlledvocabulary.language.marrucinian=Marrucinian
 controlledvocabulary.language.marshallese=Marshallese
+controlledvocabulary.language.marsian=Marsian
+controlledvocabulary.language.martha's_vineyard_sign_language=Martha's Vineyard Sign Language
+controlledvocabulary.language.marti_ke=Marti Ke
+controlledvocabulary.language.martu_wangka=Martu Wangka
+controlledvocabulary.language.martuyhunira=Martuyhunira
+controlledvocabulary.language.maru=Maru
+controlledvocabulary.language.marwari=Marwari
+controlledvocabulary.language.marwari_(india)=Marwari (India)
+controlledvocabulary.language.marwari_(pakistan)=Marwari (Pakistan)
+controlledvocabulary.language.marubo=MarÃēbo
+controlledvocabulary.language.masaaba=Masaaba
+controlledvocabulary.language.masadiit_itneg=Masadiit Itneg
+controlledvocabulary.language.masai=Masai
+controlledvocabulary.language.masalit=Masalit
+controlledvocabulary.language.masana=Masana
+controlledvocabulary.language.masbatenyo=Masbatenyo
+controlledvocabulary.language.mashco_piro=Mashco Piro
+controlledvocabulary.language.mashi_(nigeria)=Mashi (Nigeria)
+controlledvocabulary.language.mashi_(zambia)=Mashi (Zambia)
+controlledvocabulary.language.masikoro_malagasy=Masikoro Malagasy
+controlledvocabulary.language.masimasi=Masimasi
+controlledvocabulary.language.masiwang=Masiwang
+controlledvocabulary.language.maskelynes=Maskelynes
+controlledvocabulary.language.maslam=Maslam
+controlledvocabulary.language.masmaje=Masmaje
+controlledvocabulary.language.massalat=Massalat
+controlledvocabulary.language.massep=Massep
+controlledvocabulary.language.matagalpa=Matagalpa
+controlledvocabulary.language.matal=Matal
+controlledvocabulary.language.matambwe=Matambwe
+controlledvocabulary.language.matbat=Matbat
+controlledvocabulary.language.matengo=Matengo
+controlledvocabulary.language.matepi=Matepi
+controlledvocabulary.language.matigsalug_manobo=Matigsalug Manobo
+controlledvocabulary.language.matipuhy=Matipuhy
+controlledvocabulary.language.matngala=Matngala
+controlledvocabulary.language.mato=Mato
+controlledvocabulary.language.mato_grosso_arara=Mato Grosso ArÃĄra
+controlledvocabulary.language.mator=Mator
+controlledvocabulary.language.matses=MatsÊs
+controlledvocabulary.language.mattole=Mattole
+controlledvocabulary.language.matu_chin=Matu Chin
+controlledvocabulary.language.matukar=Matukar
+controlledvocabulary.language.matumbi=Matumbi
+controlledvocabulary.language.matya_samo=Matya Samo
+controlledvocabulary.language.matis=Matís
+controlledvocabulary.language.maung=Maung
+controlledvocabulary.language.mauritian_sign_language=Mauritian Sign Language
+controlledvocabulary.language.mauwake=Mauwake
+controlledvocabulary.language.mawa_(chad)=Mawa (Chad)
+controlledvocabulary.language.mawa_(nigeria)=Mawa (Nigeria)
+controlledvocabulary.language.mawak=Mawak
+controlledvocabulary.language.mawan=Mawan
+controlledvocabulary.language.mawayana=Mawayana
+controlledvocabulary.language.mawchi=Mawchi
+controlledvocabulary.language.mawes=Mawes
+controlledvocabulary.language.maxakali=Maxakalí
+controlledvocabulary.language.maxi_gbe=Maxi Gbe
+controlledvocabulary.language.maya_samo=Maya Samo
+controlledvocabulary.language.mayaguduna=Mayaguduna
+controlledvocabulary.language.mayangna=Mayangna
+controlledvocabulary.language.mayawali=Mayawali
+controlledvocabulary.language.mayeka=Mayeka
+controlledvocabulary.language.mayi-kulan=Mayi-Kulan
+controlledvocabulary.language.mayi-thakurti=Mayi-Thakurti
+controlledvocabulary.language.mayi-yapi=Mayi-Yapi
+controlledvocabulary.language.mayo=Mayo
+controlledvocabulary.language.mayogo=Mayogo
+controlledvocabulary.language.mayoyao_ifugao=Mayoyao Ifugao
+controlledvocabulary.language.mazagway=Mazagway
+controlledvocabulary.language.mazaltepec_zapotec=Mazaltepec Zapotec
+controlledvocabulary.language.mazanderani=Mazanderani
+controlledvocabulary.language.mazatlan_mazatec=MazatlÃĄn Mazatec
+controlledvocabulary.language.mazatlan_mixe=MazatlÃĄn Mixe
+controlledvocabulary.language.mba=Mba
+controlledvocabulary.language.mbala=Mbala
+controlledvocabulary.language.mbalanhu=Mbalanhu
+controlledvocabulary.language.mbandja=Mbandja
+controlledvocabulary.language.mbangala=Mbangala
+controlledvocabulary.language.mbangi=Mbangi
+controlledvocabulary.language.mbangwe=Mbangwe
+controlledvocabulary.language.mbara_(australia)=Mbara (Australia)
+controlledvocabulary.language.mbara_(chad)=Mbara (Chad)
+controlledvocabulary.language.mbariman-gudhinma=Mbariman-Gudhinma
+controlledvocabulary.language.mbati=Mbati
+controlledvocabulary.language.mbato=Mbato
+controlledvocabulary.language.mbay=Mbay
+controlledvocabulary.language.mbe=Mbe
+controlledvocabulary.language.mbe'=Mbe'
+controlledvocabulary.language.mbelime=Mbelime
+controlledvocabulary.language.mbere=Mbere
+controlledvocabulary.language.mbesa=Mbesa
+controlledvocabulary.language.mbessa=Mbessa
+controlledvocabulary.language.mbo_(cameroon)=Mbo (Cameroon)
+controlledvocabulary.language.mbo_(democratic_republic_of_congo)=Mbo (Democratic Republic of Congo)
+controlledvocabulary.language.mboi=Mboi
+controlledvocabulary.language.mboko=Mboko
+controlledvocabulary.language.mbole=Mbole
+controlledvocabulary.language.mbonga=Mbonga
+controlledvocabulary.language.mbongno=Mbongno
+controlledvocabulary.language.mbosi=Mbosi
+controlledvocabulary.language.mbowe=Mbowe
+controlledvocabulary.language.mbre=Mbre
+controlledvocabulary.language.mbudum=Mbudum
+controlledvocabulary.language.mbugu=Mbugu
+controlledvocabulary.language.mbugwe=Mbugwe
+controlledvocabulary.language.mbuk=Mbuk
+controlledvocabulary.language.mbuko=Mbuko
+controlledvocabulary.language.mbukushu=Mbukushu
+controlledvocabulary.language.mbula=Mbula
+controlledvocabulary.language.mbula-bwazza=Mbula-Bwazza
+controlledvocabulary.language.mbule=Mbule
+controlledvocabulary.language.mbulungish=Mbulungish
+controlledvocabulary.language.mbum=Mbum
+controlledvocabulary.language.mbunda=Mbunda
+controlledvocabulary.language.mbunga=Mbunga
+controlledvocabulary.language.mburku=Mburku
+controlledvocabulary.language.mbwela=Mbwela
+controlledvocabulary.language.mbya_guarani=MbyÃĄ Guaraní
+controlledvocabulary.language.me'en=Me'en
+controlledvocabulary.language.medebur=Medebur
+controlledvocabulary.language.medefaidrin=Medefaidrin
+controlledvocabulary.language.media_lengua=Media Lengua
+controlledvocabulary.language.median=Median
+controlledvocabulary.language.mednyj_aleut=Mednyj Aleut
+controlledvocabulary.language.medumba=Medumba
+controlledvocabulary.language.mefele=Mefele
+controlledvocabulary.language.megam=Megam
+controlledvocabulary.language.megleno_romanian=Megleno Romanian
+controlledvocabulary.language.mehek=Mehek
+controlledvocabulary.language.mehinaku=MehinÃĄku
+controlledvocabulary.language.mehri=Mehri
+controlledvocabulary.language.mekeo=Mekeo
+controlledvocabulary.language.mekmek=Mekmek
+controlledvocabulary.language.mekwei=Mekwei
+controlledvocabulary.language.mel-khaonh=Mel-Khaonh
+controlledvocabulary.language.mele-fila=Mele-Fila
+controlledvocabulary.language.melo=Melo
+controlledvocabulary.language.melpa=Melpa
+controlledvocabulary.language.memoni=Memoni
+controlledvocabulary.language.mendalam_kayan=Mendalam Kayan
+controlledvocabulary.language.mendankwe-nkwen=Mendankwe-Nkwen
+controlledvocabulary.language.mende_(papua_new_guinea)=Mende (Papua New Guinea)
+controlledvocabulary.language.mende_(sierra_leone)=Mende (Sierra Leone)
+controlledvocabulary.language.mengaka=Mengaka
+controlledvocabulary.language.mengen=Mengen
+controlledvocabulary.language.mengisa=Mengisa
+controlledvocabulary.language.menka=Menka
+controlledvocabulary.language.menominee=Menominee
+controlledvocabulary.language.mentawai=Mentawai
+controlledvocabulary.language.menya=Menya
+controlledvocabulary.language.meoswar=Meoswar
+controlledvocabulary.language.mer=Mer
+controlledvocabulary.language.meramera=Meramera
+controlledvocabulary.language.merei=Merei
+controlledvocabulary.language.merey=Merey
+controlledvocabulary.language.meriam_mir=Meriam Mir
+controlledvocabulary.language.merlav=Merlav
+controlledvocabulary.language.meroitic=Meroitic
+controlledvocabulary.language.meru=Meru
+controlledvocabulary.language.merwari=Merwari
+controlledvocabulary.language.mesaka=Mesaka
+controlledvocabulary.language.mescalero-chiricahua_apache=Mescalero-Chiricahua Apache
+controlledvocabulary.language.mese=Mese
+controlledvocabulary.language.meskwaki=Meskwaki
+controlledvocabulary.language.mesme=Mesme
+controlledvocabulary.language.mesmes=Mesmes
+controlledvocabulary.language.mesopotamian_arabic=Mesopotamian Arabic
+controlledvocabulary.language.mesqan=Mesqan
+controlledvocabulary.language.messapic=Messapic
+controlledvocabulary.language.meta'=Meta'
+controlledvocabulary.language.metlatonoc_mixtec=MetlatÃŗnoc Mixtec
+controlledvocabulary.language.mewari=Mewari
+controlledvocabulary.language.mewati=Mewati
+controlledvocabulary.language.mexican_sign_language=Mexican Sign Language
+controlledvocabulary.language.meyah=Meyah
+controlledvocabulary.language.mezontla_popoloca=Mezontla Popoloca
+controlledvocabulary.language.mezquital_otomi=Mezquital Otomi
+controlledvocabulary.language.mfinu=Mfinu
+controlledvocabulary.language.mfumte=Mfumte
+controlledvocabulary.language.mgbolizhia=Mgbolizhia
+controlledvocabulary.language.mi'kmaq=Mi'kmaq
+controlledvocabulary.language.miahuatlan_zapotec=MiahuatlÃĄn Zapotec
+controlledvocabulary.language.miami=Miami
+controlledvocabulary.language.mian=Mian
+controlledvocabulary.language.miani=Miani
+controlledvocabulary.language.michif=Michif
+controlledvocabulary.language.michigamea=Michigamea
+controlledvocabulary.language.michoacan_mazahua=MichoacÃĄn Mazahua
+controlledvocabulary.language.michoacan_nahuatl=MichoacÃĄn Nahuatl
+controlledvocabulary.language.mid_grand_valley_dani=Mid Grand Valley Dani
+controlledvocabulary.language.mid-southern_banda=Mid-Southern Banda
+controlledvocabulary.language.middle_armenian=Middle Armenian
+controlledvocabulary.language.middle_breton=Middle Breton
+controlledvocabulary.language.middle_cornish=Middle Cornish
+controlledvocabulary.language.middle_dutch_(ca._1050-1350)=Middle Dutch (ca. 1050-1350)
+controlledvocabulary.language.middle_english_(1100-1500)=Middle English (1100-1500)
+controlledvocabulary.language.middle_french_(ca._1400-1600)=Middle French (ca. 1400-1600)
+controlledvocabulary.language.middle_high_german_(ca._1050-1500)=Middle High German (ca. 1050-1500)
+controlledvocabulary.language.middle_hittite=Middle Hittite
+controlledvocabulary.language.middle_irish_(900-1200)=Middle Irish (900-1200)
+controlledvocabulary.language.middle_khmer_(1400_to_1850_ce)=Middle Khmer (1400 to 1850 CE)
+controlledvocabulary.language.middle_korean_(10th-16th_cent.)=Middle Korean (10th-16th cent.)
+controlledvocabulary.language.middle_low_german=Middle Low German
+controlledvocabulary.language.middle_mongolian=Middle Mongolian
+controlledvocabulary.language.middle_newar=Middle Newar
+controlledvocabulary.language.middle_watut=Middle Watut
+controlledvocabulary.language.middle_welsh=Middle Welsh
+controlledvocabulary.language.midob=Midob
+controlledvocabulary.language.migaama=Migaama
+controlledvocabulary.language.migabac=Migabac
+controlledvocabulary.language.migum=Migum
+controlledvocabulary.language.miju-mishmi=Miju-Mishmi
+controlledvocabulary.language.mikasuki=Mikasuki
+controlledvocabulary.language.mili=Mili
+controlledvocabulary.language.miltu=Miltu
+controlledvocabulary.language.miluk=Miluk
+controlledvocabulary.language.milyan=Milyan
+controlledvocabulary.language.min_bei_chinese=Min Bei Chinese
+controlledvocabulary.language.min_dong_chinese=Min Dong Chinese
+controlledvocabulary.language.min_nan_chinese=Min Nan Chinese
+controlledvocabulary.language.min_zhong_chinese=Min Zhong Chinese
+controlledvocabulary.language.mina_(cameroon)=Mina (Cameroon)
+controlledvocabulary.language.minaean=Minaean
+controlledvocabulary.language.minang=Minang
+controlledvocabulary.language.minangkabau=Minangkabau
+controlledvocabulary.language.minanibai=Minanibai
+controlledvocabulary.language.minaveha=Minaveha
+controlledvocabulary.language.minderico=Minderico
+controlledvocabulary.language.mindiri=Mindiri
+controlledvocabulary.language.mingang_doso=Mingang Doso
+controlledvocabulary.language.mingrelian=Mingrelian
+controlledvocabulary.language.minica_huitoto=Minica Huitoto
+controlledvocabulary.language.minidien=Minidien
+controlledvocabulary.language.minjungbal=Minjungbal
+controlledvocabulary.language.minkin=Minkin
+controlledvocabulary.language.minoan=Minoan
+controlledvocabulary.language.minokok=Minokok
+controlledvocabulary.language.minriq=Minriq
+controlledvocabulary.language.mintil=Mintil
+controlledvocabulary.language.minz_zhuang=Minz Zhuang
+controlledvocabulary.language.miqie=Miqie
+controlledvocabulary.language.mirandese=Mirandese
+controlledvocabulary.language.miraya_bikol=Miraya Bikol
+controlledvocabulary.language.mirgan=Mirgan
+controlledvocabulary.language.miriti=Miriti
+controlledvocabulary.language.miriwoong=Miriwoong
+controlledvocabulary.language.miriwoong_sign_language=Miriwoong Sign Language
+controlledvocabulary.language.mirning=Mirning
+controlledvocabulary.language.miship=Miship
+controlledvocabulary.language.misima-panaeati=Misima-Panaeati
+controlledvocabulary.language.mising=Mising
+controlledvocabulary.language.mitla_zapotec=Mitla Zapotec
+controlledvocabulary.language.mitlatongo_mixtec=Mitlatongo Mixtec
+controlledvocabulary.language.mittu=Mittu
+controlledvocabulary.language.mituku=Mituku
+controlledvocabulary.language.miu=Miu
+controlledvocabulary.language.miwa=Miwa
+controlledvocabulary.language.mixed_great_andamanese=Mixed Great Andamanese
 controlledvocabulary.language.mixtepec_mixtec=Mixtepec Mixtec
+controlledvocabulary.language.mixtepec_zapotec=Mixtepec Zapotec
+controlledvocabulary.language.miya=Miya
+controlledvocabulary.language.miyako=Miyako
+controlledvocabulary.language.miyakubo_sign_language=Miyakubo Sign Language
+controlledvocabulary.language.miyobe=Miyobe
+controlledvocabulary.language.mlabri=Mlabri
+controlledvocabulary.language.mlahso=MlahsÃļ
+controlledvocabulary.language.mlap=Mlap
+controlledvocabulary.language.mlomp=Mlomp
+controlledvocabulary.language.mmaala=Mmaala
+controlledvocabulary.language.mmen=Mmen
+controlledvocabulary.language.mo'da=Mo'da
+controlledvocabulary.language.moabite=Moabite
+controlledvocabulary.language.moba=Moba
+controlledvocabulary.language.mobilian=Mobilian
+controlledvocabulary.language.mobumrin_aizi=Mobumrin Aizi
+controlledvocabulary.language.mobwa_karen=Mobwa Karen
+controlledvocabulary.language.mochi=Mochi
+controlledvocabulary.language.mochica=Mochica
+controlledvocabulary.language.mocho=Mocho
+controlledvocabulary.language.mocovi=Mocoví
+controlledvocabulary.language.modang=Modang
+controlledvocabulary.language.greek_(modern)=Modern Greek (1453-), Greek (modern)
+controlledvocabulary.language.modole=Modole
+controlledvocabulary.language.moere=Moere
+controlledvocabulary.language.mofu-gudur=Mofu-Gudur
+controlledvocabulary.language.mogholi=Mogholi
+controlledvocabulary.language.mogofin=Mogofin
+controlledvocabulary.language.mogum=Mogum
+controlledvocabulary.language.mohave=Mohave
+controlledvocabulary.language.mohawk=Mohawk
+controlledvocabulary.language.mohegan-pequot=Mohegan-Pequot
+controlledvocabulary.language.moi_(congo)=Moi (Congo)
+controlledvocabulary.language.moi_(indonesia)=Moi (Indonesia)
+controlledvocabulary.language.moikodi=Moikodi
+controlledvocabulary.language.moingi=Moingi
+controlledvocabulary.language.moji=Moji
+controlledvocabulary.language.mok=Mok
+controlledvocabulary.language.mokati=Mokati
+controlledvocabulary.language.moken=Moken
+controlledvocabulary.language.mokerang=Mokerang
+controlledvocabulary.language.mokilese=Mokilese
+controlledvocabulary.language.moklen=Moklen
+controlledvocabulary.language.mokole=Mokole
+controlledvocabulary.language.mokpwe=Mokpwe
+controlledvocabulary.language.moksela=Moksela
+controlledvocabulary.language.moksha=Moksha
+controlledvocabulary.language.molale=Molale
+controlledvocabulary.language.molbog=Molbog
+controlledvocabulary.language.moldova_sign_language=Moldova Sign Language
+controlledvocabulary.language.molengue=Molengue
+controlledvocabulary.language.molima=Molima
+controlledvocabulary.language.molmo_one=Molmo One
+controlledvocabulary.language.molo=Molo
+controlledvocabulary.language.molof=Molof
+controlledvocabulary.language.moloko=Moloko
+controlledvocabulary.language.mom_jango=Mom Jango
+controlledvocabulary.language.moma=Moma
+controlledvocabulary.language.momare=Momare
+controlledvocabulary.language.mombo_dogon=Mombo Dogon
+controlledvocabulary.language.mombum=Mombum
+controlledvocabulary.language.momina=Momina
+controlledvocabulary.language.momuna=Momuna
+controlledvocabulary.language.mon=Mon
+controlledvocabulary.language.monastic_sign_language=Monastic Sign Language
+controlledvocabulary.language.mondropolon=Mondropolon
+controlledvocabulary.language.monde=MondÊ
+controlledvocabulary.language.mongo=Mongo
+controlledvocabulary.language.mongol=Mongol
+controlledvocabulary.language.mongolia_buriat=Mongolia Buriat
 controlledvocabulary.language.mongolian=Mongolian
+controlledvocabulary.language.mongolian_sign_language=Mongolian Sign Language
+controlledvocabulary.language.mongondow=Mongondow
+controlledvocabulary.language.moni=Moni
+controlledvocabulary.language.mono_(cameroon)=Mono (Cameroon)
+controlledvocabulary.language.mono_(democratic_republic_of_congo)=Mono (Democratic Republic of Congo)
+controlledvocabulary.language.mono_(solomon_islands)=Mono (Solomon Islands)
+controlledvocabulary.language.mono_(usa)=Mono (USA)
+controlledvocabulary.language.monom=Monom
+controlledvocabulary.language.monsang_naga=Monsang Naga
+controlledvocabulary.language.montenegrin=Montenegrin
+controlledvocabulary.language.montol=Montol
+controlledvocabulary.language.monumbo=Monumbo
+controlledvocabulary.language.monzombo=Monzombo
+controlledvocabulary.language.moo=Moo
+controlledvocabulary.language.moose_cree=Moose Cree
+controlledvocabulary.language.mopan_maya=MopÃĄn Maya
+controlledvocabulary.language.mor_(bomberai_peninsula)=Mor (Bomberai Peninsula)
+controlledvocabulary.language.mor_(mor_islands)=Mor (Mor Islands)
+controlledvocabulary.language.moraid=Moraid
+controlledvocabulary.language.morawa=Morawa
+controlledvocabulary.language.morelos_nahuatl=Morelos Nahuatl
+controlledvocabulary.language.morerebi=Morerebi
+controlledvocabulary.language.moresada=Moresada
+controlledvocabulary.language.mori_atas=Mori Atas
+controlledvocabulary.language.mori_bawah=Mori Bawah
+controlledvocabulary.language.morigi=Morigi
+controlledvocabulary.language.moriori=Moriori
+controlledvocabulary.language.morisyen=Morisyen
+controlledvocabulary.language.moro=Moro
+controlledvocabulary.language.moroccan_arabic=Moroccan Arabic
+controlledvocabulary.language.moroccan_sign_language=Moroccan Sign Language
+controlledvocabulary.language.morokodo=Morokodo
+controlledvocabulary.language.morom=Morom
+controlledvocabulary.language.moronene=Moronene
+controlledvocabulary.language.morori=Morori
+controlledvocabulary.language.morouas=Morouas
+controlledvocabulary.language.morrobalama=Morrobalama
+controlledvocabulary.language.mortlockese=Mortlockese
+controlledvocabulary.language.moru=Moru
+controlledvocabulary.language.mosimo=Mosimo
+controlledvocabulary.language.moskona=Moskona
+controlledvocabulary.language.mossi=Mossi
+controlledvocabulary.language.mota=Mota
+controlledvocabulary.language.motlav=Motlav
+controlledvocabulary.language.motu=Motu
+controlledvocabulary.language.mouk-aria=Mouk-Aria
+controlledvocabulary.language.moundadan_chetty=Moundadan Chetty
+controlledvocabulary.language.mountain_koiali=Mountain Koiali
+controlledvocabulary.language.mouwase=Mouwase
+controlledvocabulary.language.movima=Movima
+controlledvocabulary.language.moyadan_itneg=Moyadan Itneg
+controlledvocabulary.language.moyon_naga=Moyon Naga
+controlledvocabulary.language.mozambican_sign_language=Mozambican Sign Language
+controlledvocabulary.language.mozarabic=Mozarabic
+controlledvocabulary.language.mpade=Mpade
+controlledvocabulary.language.mpalitjanh=Mpalitjanh
+controlledvocabulary.language.mpi=Mpi
+controlledvocabulary.language.mpiemo=Mpiemo
+controlledvocabulary.language.mpinda=Mpinda
+controlledvocabulary.language.mpoto=Mpoto
+controlledvocabulary.language.mpotovoro=Mpotovoro
+controlledvocabulary.language.mpumpong=Mpumpong
+controlledvocabulary.language.mpuono=Mpuono
+controlledvocabulary.language.mpur=Mpur
+controlledvocabulary.language.mro-khimi_chin=Mro-Khimi Chin
+controlledvocabulary.language.mru=Mru
+controlledvocabulary.language.mser=Mser
+controlledvocabulary.language.mt._iraya_agta=Mt. Iraya Agta
+controlledvocabulary.language.mt._iriga_agta=Mt. Iriga Agta
+controlledvocabulary.language.muak_sa-aak=Muak Sa-aak
+controlledvocabulary.language.mualang=Mualang
+controlledvocabulary.language.mubami=Mubami
+controlledvocabulary.language.mubi=Mubi
+controlledvocabulary.language.muda=Muda
+controlledvocabulary.language.mudburra=Mudburra
+controlledvocabulary.language.mudhili_gadaba=Mudhili Gadaba
+controlledvocabulary.language.mudu_koraga=Mudu Koraga
+controlledvocabulary.language.muduga=Muduga
+controlledvocabulary.language.mufian=Mufian
+controlledvocabulary.language.mugom=Mugom
+controlledvocabulary.language.muinane=Muinane
+controlledvocabulary.language.mukha-dora=Mukha-Dora
+controlledvocabulary.language.mukulu=Mukulu
+controlledvocabulary.language.mulaha=Mulaha
+controlledvocabulary.language.mulam=Mulam
+controlledvocabulary.language.mulao=Mulao
+controlledvocabulary.language.mulgi=Mulgi
+controlledvocabulary.language.mullu_kurumba=Mullu Kurumba
+controlledvocabulary.language.multiple_languages=Multiple languages
+controlledvocabulary.language.muluridyi=Muluridyi
+controlledvocabulary.language.mum=Mum
+controlledvocabulary.language.mumuye=Mumuye
+controlledvocabulary.language.muna=Muna
+controlledvocabulary.language.munda=Munda
+controlledvocabulary.language.mundabli=Mundabli
+controlledvocabulary.language.mundang=Mundang
+controlledvocabulary.language.mundani=Mundani
+controlledvocabulary.language.mundari=Mundari
+controlledvocabulary.language.mundat=Mundat
+controlledvocabulary.language.munduruku=MundurukÃē
+controlledvocabulary.language.mungaka=Mungaka
+controlledvocabulary.language.munggui=Munggui
+controlledvocabulary.language.mungkip=Mungkip
+controlledvocabulary.language.muniche=Muniche
+controlledvocabulary.language.munit=Munit
+controlledvocabulary.language.munji=Munji
+controlledvocabulary.language.munsee=Munsee
+controlledvocabulary.language.muong=Muong
+controlledvocabulary.language.mur_pano=Mur Pano
+controlledvocabulary.language.muratayak=Muratayak
+controlledvocabulary.language.murik_(malaysia)=Murik (Malaysia)
+controlledvocabulary.language.murik_(papua_new_guinea)=Murik (Papua New Guinea)
+controlledvocabulary.language.murkim=Murkim
+controlledvocabulary.language.murle=Murle
+controlledvocabulary.language.murrinh-patha=Murrinh-Patha
+controlledvocabulary.language.mursi=Mursi
+controlledvocabulary.language.murui_huitoto=Murui Huitoto
+controlledvocabulary.language.murupi=Murupi
+controlledvocabulary.language.muruwari=Muruwari
+controlledvocabulary.language.musak=Musak
+controlledvocabulary.language.musar=Musar
+controlledvocabulary.language.musasa=Musasa
+controlledvocabulary.language.musey=Musey
+controlledvocabulary.language.musgu=Musgu
+controlledvocabulary.language.mushungulu=Mushungulu
+controlledvocabulary.language.musi=Musi
+controlledvocabulary.language.muskum=Muskum
+controlledvocabulary.language.muslim_tat=Muslim Tat
+controlledvocabulary.language.musom=Musom
+controlledvocabulary.language.mussau-emira=Mussau-Emira
+controlledvocabulary.language.muthuvan=Muthuvan
+controlledvocabulary.language.mutu=Mutu
+controlledvocabulary.language.muyang=Muyang
+controlledvocabulary.language.muyuw=Muyuw
+controlledvocabulary.language.muzi=Muzi
+controlledvocabulary.language.mvanip=Mvanip
+controlledvocabulary.language.mvuba=Mvuba
+controlledvocabulary.language.mwaghavul=Mwaghavul
+controlledvocabulary.language.mwali_comorian=Mwali Comorian
+controlledvocabulary.language.mwan=Mwan
+controlledvocabulary.language.mwani=Mwani
+controlledvocabulary.language.mwatebu=Mwatebu
+controlledvocabulary.language.mwera_(chimwera)=Mwera (Chimwera)
+controlledvocabulary.language.mwera_(nyasa)=Mwera (Nyasa)
+controlledvocabulary.language.mwimbi-muthambi=Mwimbi-Muthambi
+controlledvocabulary.language.myanmar_sign_language=Myanmar Sign Language
+controlledvocabulary.language.mycenaean_greek=Mycenaean Greek
+controlledvocabulary.language.myene=Myene
+controlledvocabulary.language.mysian=Mysian
+controlledvocabulary.language.mzieme_naga=Mzieme Naga
+controlledvocabulary.language.maghdi=MÃĄghdÃŦ
+controlledvocabulary.language.maku=MÃĄku
+controlledvocabulary.language.menik=MÊnik
+controlledvocabulary.language.miskito=Mískito
+controlledvocabulary.language.mocheno=MÃŗcheno
+controlledvocabulary.language.mun_chin=MÃŧn Chin
+controlledvocabulary.language.mundu=MÃŧndÃŧ
+controlledvocabulary.language.maharastri_prakrit=MāhārāášŖáš­ri Prākrit
+controlledvocabulary.language.maori=Māori, Maori
+controlledvocabulary.language.n'ko=N'Ko
+controlledvocabulary.language.na=Na
+controlledvocabulary.language.na-kara=Na-kara
+controlledvocabulary.language.naaba=Naaba
+controlledvocabulary.language.naami=Naami
+controlledvocabulary.language.naasioi=Naasioi
+controlledvocabulary.language.naba=Naba
+controlledvocabulary.language.nabak=Nabak
+controlledvocabulary.language.nabi=Nabi
+controlledvocabulary.language.nachering=Nachering
+controlledvocabulary.language.nadruvian=Nadruvian
+controlledvocabulary.language.nadeb=NadÃĢb
+controlledvocabulary.language.nafaanra=Nafaanra
+controlledvocabulary.language.nafi=Nafi
+controlledvocabulary.language.nafri=Nafri
+controlledvocabulary.language.nafusi=Nafusi
+controlledvocabulary.language.naga_pidgin=Naga Pidgin
+controlledvocabulary.language.nagarchal=Nagarchal
+controlledvocabulary.language.nage=Nage
+controlledvocabulary.language.nagumi=Nagumi
+controlledvocabulary.language.nahali=Nahali
+controlledvocabulary.language.nahari=Nahari
+controlledvocabulary.language.nai=Nai
+controlledvocabulary.language.najdi_arabic=Najdi Arabic
+controlledvocabulary.language.naka'ela=Naka'ela
+controlledvocabulary.language.nakai=Nakai
+controlledvocabulary.language.nakame=Nakame
+controlledvocabulary.language.nakanai=Nakanai
+controlledvocabulary.language.nake=Nake
+controlledvocabulary.language.naki=Naki
+controlledvocabulary.language.nakwi=Nakwi
+controlledvocabulary.language.nalca=Nalca
+controlledvocabulary.language.nali=Nali
+controlledvocabulary.language.nalik=Nalik
+controlledvocabulary.language.nalu=Nalu
+controlledvocabulary.language.naluo_yi=Naluo Yi
+controlledvocabulary.language.nalogo=NalÃļgo
+controlledvocabulary.language.nama_(papua_new_guinea)=Nama (Papua New Guinea)
+controlledvocabulary.language.namakura=Namakura
+controlledvocabulary.language.namat=Namat
+controlledvocabulary.language.nambo=Nambo
+controlledvocabulary.language.nambya=Nambya
+controlledvocabulary.language.namia=Namia
+controlledvocabulary.language.namiae=Namiae
+controlledvocabulary.language.namibian_sign_language=Namibian Sign Language
+controlledvocabulary.language.namla=Namla
+controlledvocabulary.language.namo=Namo
+controlledvocabulary.language.namonuito=Namonuito
+controlledvocabulary.language.namosi-naitasiri-serua=Namosi-Naitasiri-Serua
+controlledvocabulary.language.namuyi=Namuyi
+controlledvocabulary.language.nanai=Nanai
+controlledvocabulary.language.nancere=Nancere
+controlledvocabulary.language.nande=Nande
+controlledvocabulary.language.nandi=Nandi
+controlledvocabulary.language.nanerige_senoufo=NanerigÊ SÊnoufo
+controlledvocabulary.language.nanga_dama_dogon=Nanga Dama Dogon
+controlledvocabulary.language.nankina=Nankina
+controlledvocabulary.language.nanti=Nanti
+controlledvocabulary.language.nanticoke=Nanticoke
+controlledvocabulary.language.nanubae=Nanubae
+controlledvocabulary.language.napo_lowland_quechua=Napo Lowland Quechua
+controlledvocabulary.language.napu=Napu
+controlledvocabulary.language.nar_phu=Nar Phu
+controlledvocabulary.language.nara=Nara
+controlledvocabulary.language.narak=Narak
+controlledvocabulary.language.narango=Narango
+controlledvocabulary.language.nari_nari=Nari Nari
+controlledvocabulary.language.naro=Naro
+controlledvocabulary.language.narom=Narom
+controlledvocabulary.language.narragansett=Narragansett
+controlledvocabulary.language.narua=Narua
+controlledvocabulary.language.narungga=Narungga
+controlledvocabulary.language.nasal=Nasal
+controlledvocabulary.language.nasarian=Nasarian
+controlledvocabulary.language.naskapi=Naskapi
+controlledvocabulary.language.natanzi=Natanzi
+controlledvocabulary.language.natchez=Natchez
+controlledvocabulary.language.nateni=Nateni
+controlledvocabulary.language.nathembo=Nathembo
+controlledvocabulary.language.natioro=Natioro
+controlledvocabulary.language.natugu=NatÃŧgu
+controlledvocabulary.language.nauete=Nauete
+controlledvocabulary.language.naukan_yupik=Naukan Yupik
+controlledvocabulary.language.nauna=Nauna
+controlledvocabulary.language.nauo=Nauo
 controlledvocabulary.language.nauru=Nauru
 controlledvocabulary.language.navajo,_navaho=Navajo, Navaho
-controlledvocabulary.language.northern_ndebele=Northern Ndebele
-controlledvocabulary.language.nepali=Nepali
+controlledvocabulary.language.navut=Navut
+controlledvocabulary.language.nawaru=Nawaru
+controlledvocabulary.language.nawathinehena=Nawathinehena
+controlledvocabulary.language.nawdm=Nawdm
+controlledvocabulary.language.nawuri=Nawuri
+controlledvocabulary.language.naxi=Naxi
+controlledvocabulary.language.nayi=Nayi
+controlledvocabulary.language.nayini=Nayini
+controlledvocabulary.language.ncane=Ncane
+controlledvocabulary.language.nchumbulu=Nchumbulu
+controlledvocabulary.language.nda'nda'=Nda'nda'
+controlledvocabulary.language.ndai=Ndai
+controlledvocabulary.language.ndaka=Ndaka
+controlledvocabulary.language.ndali=Ndali
+controlledvocabulary.language.ndam=Ndam
+controlledvocabulary.language.ndamba=Ndamba
+controlledvocabulary.language.ndambomo=Ndambomo
+controlledvocabulary.language.ndasa=Ndasa
+controlledvocabulary.language.ndau=Ndau
+controlledvocabulary.language.nde-gbite=Nde-Gbite
+controlledvocabulary.language.nde-nsele-nta=Nde-Nsele-Nta
+controlledvocabulary.language.ndemli=Ndemli
+controlledvocabulary.language.ndendeule=Ndendeule
+controlledvocabulary.language.ndengereko=Ndengereko
+controlledvocabulary.language.nding=Nding
+controlledvocabulary.language.ndo=Ndo
+controlledvocabulary.language.ndobo=Ndobo
+controlledvocabulary.language.ndoe=Ndoe
+controlledvocabulary.language.ndogo=Ndogo
+controlledvocabulary.language.ndolo=Ndolo
+controlledvocabulary.language.ndom=Ndom
+controlledvocabulary.language.ndombe=Ndombe
+controlledvocabulary.language.ndonde_hamba=Ndonde Hamba
 controlledvocabulary.language.ndonga=Ndonga
-controlledvocabulary.language.norwegian_bokmal=Norwegian Bokmål
-controlledvocabulary.language.norwegian_nynorsk=Norwegian Nynorsk
+controlledvocabulary.language.ndoola=Ndoola
+controlledvocabulary.language.ndra'ngith=Ndra'ngith
+controlledvocabulary.language.ndrulo=Ndrulo
+controlledvocabulary.language.nduga=Nduga
+controlledvocabulary.language.ndumu=Ndumu
+controlledvocabulary.language.ndunda=Ndunda
+controlledvocabulary.language.ndunga=Ndunga
+controlledvocabulary.language.ndut=Ndut
+controlledvocabulary.language.ndwewe=Ndwewe
+controlledvocabulary.language.ndyuka-trio_pidgin=Ndyuka-Trio Pidgin
+controlledvocabulary.language.ndzwani_comorian=Ndzwani Comorian
+controlledvocabulary.language.neapolitan=Neapolitan
+controlledvocabulary.language.nedebang=Nedebang
+controlledvocabulary.language.nefamese=Nefamese
+controlledvocabulary.language.negerhollands=Negerhollands
+controlledvocabulary.language.negeri_sembilan_malay=Negeri Sembilan Malay
+controlledvocabulary.language.negidal=Negidal
+controlledvocabulary.language.nehan=Nehan
+controlledvocabulary.language.nek=Nek
+controlledvocabulary.language.nekgini=Nekgini
+controlledvocabulary.language.neko=Neko
+controlledvocabulary.language.neku=Neku
+controlledvocabulary.language.nema=Nema
+controlledvocabulary.language.neme=Neme
+controlledvocabulary.language.nemi=Nemi
+controlledvocabulary.language.nen=Nen
+controlledvocabulary.language.nend=Nend
+controlledvocabulary.language.nenets=Nenets
+controlledvocabulary.language.nengone=Nengone
+controlledvocabulary.language.neo=Neo
+controlledvocabulary.language.neo-hittite=Neo-Hittite
+controlledvocabulary.language.nepalese_sign_language=Nepalese Sign Language
+controlledvocabulary.language.nepali_(individual_language)=Nepali (individual language)
+controlledvocabulary.language.nepali=Nepali (macrolanguage), Nepali
+controlledvocabulary.language.nete=Nete
+controlledvocabulary.language.new_caledonian_javanese=New Caledonian Javanese
+controlledvocabulary.language.new_zealand_sign_language=New Zealand Sign Language
+controlledvocabulary.language.newari=Newari
+controlledvocabulary.language.neyo=Neyo
+controlledvocabulary.language.nez_perce=Nez Perce
+controlledvocabulary.language.ngaanyatjarra=Ngaanyatjarra
+controlledvocabulary.language.ngad'a=Ngad'a
+controlledvocabulary.language.ngadjunmaya=Ngadjunmaya
+controlledvocabulary.language.ngadjuri=Ngadjuri
+controlledvocabulary.language.ngaing=Ngaing
+controlledvocabulary.language.ngaju=Ngaju
+controlledvocabulary.language.ngala=Ngala
+controlledvocabulary.language.ngalakgan=Ngalakgan
+controlledvocabulary.language.ngalum=Ngalum
+controlledvocabulary.language.ngam=Ngam
+controlledvocabulary.language.ngamambo=Ngamambo
+controlledvocabulary.language.ngambay=Ngambay
+controlledvocabulary.language.ngamini=Ngamini
+controlledvocabulary.language.ngamo=Ngamo
+controlledvocabulary.language.ngan'gityemerri=Ngan'gityemerri
+controlledvocabulary.language.nganakarti=Nganakarti
+controlledvocabulary.language.nganasan=Nganasan
+controlledvocabulary.language.ngandi=Ngandi
+controlledvocabulary.language.ngando_(central_african_republic)=Ngando (Central African Republic)
+controlledvocabulary.language.ngando_(democratic_republic_of_congo)=Ngando (Democratic Republic of Congo)
+controlledvocabulary.language.ngandyera=Ngandyera
+controlledvocabulary.language.ngangam=Ngangam
+controlledvocabulary.language.ngantangarra=Ngantangarra
+controlledvocabulary.language.nganyaywana=Nganyaywana
+controlledvocabulary.language.ngardi=Ngardi
+controlledvocabulary.language.ngarigu=Ngarigu
+controlledvocabulary.language.ngarinyin=Ngarinyin
+controlledvocabulary.language.ngarinyman=Ngarinyman
+controlledvocabulary.language.ngarla=Ngarla
+controlledvocabulary.language.ngarluma=Ngarluma
+controlledvocabulary.language.ngarrindjeri=Ngarrindjeri
+controlledvocabulary.language.ngas=Ngas
+controlledvocabulary.language.ngasa=Ngasa
+controlledvocabulary.language.ngatik_men's_creole=Ngatik Men's Creole
+controlledvocabulary.language.ngawn_chin=Ngawn Chin
+controlledvocabulary.language.ngawun=Ngawun
+controlledvocabulary.language.ngayawung=Ngayawung
+controlledvocabulary.language.ngazidja_comorian=Ngazidja Comorian
+controlledvocabulary.language.ngbaka=Ngbaka
+controlledvocabulary.language.ngbaka_ma'bo=Ngbaka Ma'bo
+controlledvocabulary.language.ngbaka_manza=Ngbaka Manza
+controlledvocabulary.language.ngbee=Ngbee
+controlledvocabulary.language.ngbinda=Ngbinda
+controlledvocabulary.language.ngbundu=Ngbundu
+controlledvocabulary.language.ngelima=Ngelima
+controlledvocabulary.language.ngemba=Ngemba
+controlledvocabulary.language.ngen=Ngen
+controlledvocabulary.language.ngendelengo=Ngendelengo
+controlledvocabulary.language.ngete=Ngete
+controlledvocabulary.language.nggem=Nggem
+controlledvocabulary.language.nggwahyi=Nggwahyi
+controlledvocabulary.language.ngie=Ngie
+controlledvocabulary.language.ngiemboon=Ngiemboon
+controlledvocabulary.language.ngile=Ngile
+controlledvocabulary.language.ngindo=Ngindo
+controlledvocabulary.language.ngiti=Ngiti
+controlledvocabulary.language.ngizim=Ngizim
+controlledvocabulary.language.ngkalmpw_kanum=NgkÃĸlmpw Kanum
+controlledvocabulary.language.ngom=Ngom
+controlledvocabulary.language.ngomba=Ngomba
+controlledvocabulary.language.ngombale=Ngombale
+controlledvocabulary.language.ngombe_(central_african_republic)=Ngombe (Central African Republic)
+controlledvocabulary.language.ngombe_(democratic_republic_of_congo)=Ngombe (Democratic Republic of Congo)
+controlledvocabulary.language.ngongo=Ngongo
+controlledvocabulary.language.ngoni_(mozambique)=Ngoni (Mozambique)
+controlledvocabulary.language.ngoni_(tanzania)=Ngoni (Tanzania)
+controlledvocabulary.language.ngoshie=Ngoshie
+controlledvocabulary.language.ngul=Ngul
+controlledvocabulary.language.ngulu=Ngulu
+controlledvocabulary.language.nguluwan=Nguluwan
+controlledvocabulary.language.ngumbarl=Ngumbarl
+controlledvocabulary.language.ngumbi=Ngumbi
+controlledvocabulary.language.ngunawal=Ngunawal
+controlledvocabulary.language.ngundi=Ngundi
+controlledvocabulary.language.ngundu=Ngundu
+controlledvocabulary.language.ngungwel=Ngungwel
+controlledvocabulary.language.ngurimi=Ngurimi
+controlledvocabulary.language.ngurmbur=Ngurmbur
+controlledvocabulary.language.nguon=Nguôn
+controlledvocabulary.language.ngwaba=Ngwaba
+controlledvocabulary.language.ngwe=Ngwe
+controlledvocabulary.language.ngwo=Ngwo
+controlledvocabulary.language.ngabere=Ngäbere
+controlledvocabulary.language.nhanda=Nhanda
+controlledvocabulary.language.nhengatu=Nhengatu
+controlledvocabulary.language.nhirrpi=Nhirrpi
+controlledvocabulary.language.nhuwala=Nhuwala
+controlledvocabulary.language.nias=Nias
+controlledvocabulary.language.nicaragua_creole_english=Nicaragua Creole English
+controlledvocabulary.language.nicaraguan_sign_language=Nicaraguan Sign Language
+controlledvocabulary.language.niellim=Niellim
+controlledvocabulary.language.nigeria_mambila=Nigeria Mambila
+controlledvocabulary.language.nigerian_fulfulde=Nigerian Fulfulde
+controlledvocabulary.language.nigerian_pidgin=Nigerian Pidgin
+controlledvocabulary.language.nigerian_sign_language=Nigerian Sign Language
+controlledvocabulary.language.nihali=Nihali
+controlledvocabulary.language.nii=Nii
+controlledvocabulary.language.niksek=Niksek
+controlledvocabulary.language.nila=Nila
+controlledvocabulary.language.nilamba=Nilamba
+controlledvocabulary.language.nimadi=Nimadi
+controlledvocabulary.language.nimanbur=Nimanbur
+controlledvocabulary.language.nimbari=Nimbari
+controlledvocabulary.language.nimboran=Nimboran
+controlledvocabulary.language.nimi=Nimi
+controlledvocabulary.language.nimo=Nimo
+controlledvocabulary.language.nimoa=Nimoa
+controlledvocabulary.language.ninam=Ninam
+controlledvocabulary.language.nindi=Nindi
+controlledvocabulary.language.ningera=Ningera
+controlledvocabulary.language.ninggerum=Ninggerum
+controlledvocabulary.language.ningil=Ningil
+controlledvocabulary.language.ninia_yali=Ninia Yali
+controlledvocabulary.language.ninzo=Ninzo
+controlledvocabulary.language.nipsan=Nipsan
+controlledvocabulary.language.nisa=Nisa
+controlledvocabulary.language.nisenan=Nisenan
+controlledvocabulary.language.nisga'a=Nisga'a
+controlledvocabulary.language.nisi_(china)=Nisi (China)
+controlledvocabulary.language.niuafo'ou=Niuafo'ou
+controlledvocabulary.language.niuatoputapu=Niuatoputapu
+controlledvocabulary.language.niuean=Niuean
+controlledvocabulary.language.nivacle=NivaclÊ
+controlledvocabulary.language.niwer_mil=Niwer Mil
+controlledvocabulary.language.njalgulgule=Njalgulgule
+controlledvocabulary.language.njebi=Njebi
+controlledvocabulary.language.njen=Njen
+controlledvocabulary.language.njerep=Njerep
+controlledvocabulary.language.njyem=Njyem
+controlledvocabulary.language.nkami=Nkami
+controlledvocabulary.language.nkangala=Nkangala
+controlledvocabulary.language.nkari=Nkari
+controlledvocabulary.language.nkem-nkum=Nkem-Nkum
+controlledvocabulary.language.nkhumbi=Nkhumbi
+controlledvocabulary.language.nkongho=Nkongho
+controlledvocabulary.language.nkonya=Nkonya
+controlledvocabulary.language.nkoroo=Nkoroo
+controlledvocabulary.language.nkoya=Nkoya
+controlledvocabulary.language.nkukoli=Nkukoli
+controlledvocabulary.language.nkutu=Nkutu
+controlledvocabulary.language.nnam=Nnam
+controlledvocabulary.language.no_linguistic_content=No linguistic content
+controlledvocabulary.language.nobiin=Nobiin
+controlledvocabulary.language.nobonob=Nobonob
+controlledvocabulary.language.nocte_naga=Nocte Naga
+controlledvocabulary.language.nogai=Nogai
+controlledvocabulary.language.noipx=Noipx
+controlledvocabulary.language.noiri=Noiri
+controlledvocabulary.language.nokuku=Nokuku
+controlledvocabulary.language.nomaande=Nomaande
+controlledvocabulary.language.nomane=Nomane
+controlledvocabulary.language.nomatsiguenga=Nomatsiguenga
+controlledvocabulary.language.nomlaki=Nomlaki
+controlledvocabulary.language.nomu=Nomu
+controlledvocabulary.language.nong_zhuang=Nong Zhuang
+controlledvocabulary.language.nonuya=Nonuya
+controlledvocabulary.language.nooksack=Nooksack
+controlledvocabulary.language.noon=Noon
+controlledvocabulary.language.noone=Noone
+controlledvocabulary.language.nopala_chatino=Nopala Chatino
+controlledvocabulary.language.noric=Noric
+controlledvocabulary.language.norn=Norn
+controlledvocabulary.language.norra=Norra
+controlledvocabulary.language.north_alaskan_inupiatun=North Alaskan Inupiatun
+controlledvocabulary.language.north_ambrym=North Ambrym
+controlledvocabulary.language.north_asmat=North Asmat
+controlledvocabulary.language.north_awyu=North Awyu
+controlledvocabulary.language.north_azerbaijani=North Azerbaijani
+controlledvocabulary.language.north_babar=North Babar
+controlledvocabulary.language.north_bolivian_quechua=North Bolivian Quechua
+controlledvocabulary.language.north_central_mixe=North Central Mixe
+controlledvocabulary.language.north_efate=North Efate
+controlledvocabulary.language.north_fali=North Fali
+controlledvocabulary.language.north_giziga=North Giziga
+controlledvocabulary.language.north_junin_quechua=North Junín Quechua
+controlledvocabulary.language.north_marquesan=North Marquesan
+controlledvocabulary.language.north_mesopotamian_arabic=North Mesopotamian Arabic
+controlledvocabulary.language.north_midlands_tasmanian=North Midlands Tasmanian
+controlledvocabulary.language.north_mofu=North Mofu
+controlledvocabulary.language.north_moluccan_malay=North Moluccan Malay
+controlledvocabulary.language.north_muyu=North Muyu
+controlledvocabulary.language.north_nuaulu=North Nuaulu
+controlledvocabulary.language.north_picene=North Picene
+controlledvocabulary.language.north_slavey=North Slavey
+controlledvocabulary.language.north_tairora=North Tairora
+controlledvocabulary.language.north_tanna=North Tanna
+controlledvocabulary.language.north_wahgi=North Wahgi
+controlledvocabulary.language.north_watut=North Watut
+controlledvocabulary.language.northeast_kiwai=Northeast Kiwai
+controlledvocabulary.language.northeast_maidu=Northeast Maidu
+controlledvocabulary.language.northeast_pashai=Northeast Pashai
+controlledvocabulary.language.northeastern_dinka=Northeastern Dinka
+controlledvocabulary.language.northeastern_pomo=Northeastern Pomo
+controlledvocabulary.language.northeastern_tasmanian=Northeastern Tasmanian
+controlledvocabulary.language.northeastern_thai=Northeastern Thai
+controlledvocabulary.language.northern_alta=Northern Alta
+controlledvocabulary.language.northern_altai=Northern Altai
+controlledvocabulary.language.northern_amami-oshima=Northern Amami-Oshima
+controlledvocabulary.language.northern_betsimisaraka_malagasy=Northern Betsimisaraka Malagasy
+controlledvocabulary.language.northern_binukidnon=Northern Binukidnon
+controlledvocabulary.language.northern_bobo_madare=Northern Bobo MadarÊ
+controlledvocabulary.language.northern_bontok=Northern Bontok
+controlledvocabulary.language.northern_catanduanes_bikol=Northern Catanduanes Bikol
+controlledvocabulary.language.northern_conchucos_ancash_quechua=Northern Conchucos Ancash Quechua
+controlledvocabulary.language.northern_dagara=Northern Dagara
+controlledvocabulary.language.northern_dong=Northern Dong
+controlledvocabulary.language.northern_east_cree=Northern East Cree
+controlledvocabulary.language.northern_embera=Northern EmberÃĄ
+controlledvocabulary.language.northern_frisian=Northern Frisian
+controlledvocabulary.language.northern_ghale=Northern Ghale
+controlledvocabulary.language.northern_gondi=Northern Gondi
+controlledvocabulary.language.northern_grebo=Northern Grebo
+controlledvocabulary.language.northern_guiyang_hmong=Northern Guiyang Hmong
+controlledvocabulary.language.northern_haida=Northern Haida
+controlledvocabulary.language.northern_hindko=Northern Hindko
+controlledvocabulary.language.northern_huishui_hmong=Northern Huishui Hmong
+controlledvocabulary.language.northern_kalapuya=Northern Kalapuya
+controlledvocabulary.language.northern_kankanay=Northern Kankanay
+controlledvocabulary.language.northern_katang=Northern Katang
+controlledvocabulary.language.northern_khmer=Northern Khmer
+controlledvocabulary.language.northern_kissi=Northern Kissi
+controlledvocabulary.language.northern_kurdish=Northern Kurdish
+controlledvocabulary.language.northern_luri=Northern Luri
+controlledvocabulary.language.northern_mashan_hmong=Northern Mashan Hmong
+controlledvocabulary.language.northern_muji=Northern Muji
+controlledvocabulary.language.northern_nago=Northern Nago
+controlledvocabulary.language.northern_ndebele=Northern Ndebele, North Ndebele
+controlledvocabulary.language.northern_ngbandi=Northern Ngbandi
+controlledvocabulary.language.northern_nisu=Northern Nisu
+controlledvocabulary.language.northern_nuni=Northern Nuni
+controlledvocabulary.language.northern_oaxaca_nahuatl=Northern Oaxaca Nahuatl
+controlledvocabulary.language.northern_ohlone=Northern Ohlone
+controlledvocabulary.language.northern_one=Northern One
+controlledvocabulary.language.northern_paiute=Northern Paiute
+controlledvocabulary.language.northern_pame=Northern Pame
+controlledvocabulary.language.northern_pashto=Northern Pashto
+controlledvocabulary.language.northern_pastaza_quichua=Northern Pastaza Quichua
+controlledvocabulary.language.northern_ping_chinese=Northern Ping Chinese
+controlledvocabulary.language.northern_pomo=Northern Pomo
+controlledvocabulary.language.northern_puebla_nahuatl=Northern Puebla Nahuatl
+controlledvocabulary.language.northern_pumi=Northern Pumi
+controlledvocabulary.language.northern_qiandong_miao=Northern Qiandong Miao
+controlledvocabulary.language.northern_qiang=Northern Qiang
+controlledvocabulary.language.northern_rengma_naga=Northern Rengma Naga
+controlledvocabulary.language.northern_roglai=Northern Roglai
+controlledvocabulary.language.northern_sami=Northern Sami
+controlledvocabulary.language.northern_sierra_miwok=Northern Sierra Miwok
+controlledvocabulary.language.northern_sorsoganon=Northern Sorsoganon
+controlledvocabulary.language.northern_subanen=Northern Subanen
+controlledvocabulary.language.northern_tarahumara=Northern Tarahumara
+controlledvocabulary.language.northern_tasmanian=Northern Tasmanian
+controlledvocabulary.language.northern_tepehuan=Northern Tepehuan
+controlledvocabulary.language.northern_thai=Northern Thai
+controlledvocabulary.language.northern_tidung=Northern Tidung
+controlledvocabulary.language.northern_tiwa=Northern Tiwa
+controlledvocabulary.language.northern_tlaxiaco_mixtec=Northern Tlaxiaco Mixtec
+controlledvocabulary.language.northern_toussian=Northern Toussian
+controlledvocabulary.language.northern_tujia=Northern Tujia
+controlledvocabulary.language.northern_tutchone=Northern Tutchone
+controlledvocabulary.language.northern_uzbek=Northern Uzbek
+controlledvocabulary.language.northern_yukaghir=Northern Yukaghir
+controlledvocabulary.language.northwest_alaska_inupiatun=Northwest Alaska Inupiatun
+controlledvocabulary.language.northwest_gbaya=Northwest Gbaya
+controlledvocabulary.language.northwest_maidu=Northwest Maidu
+controlledvocabulary.language.northwest_oaxaca_mixtec=Northwest Oaxaca Mixtec
+controlledvocabulary.language.northwest_pashai=Northwest Pashai
+controlledvocabulary.language.northwestern_dinka=Northwestern Dinka
+controlledvocabulary.language.northwestern_fars=Northwestern Fars
+controlledvocabulary.language.northwestern_kolami=Northwestern Kolami
+controlledvocabulary.language.northwestern_nisu=Northwestern Nisu
+controlledvocabulary.language.northwestern_ojibwa=Northwestern Ojibwa
+controlledvocabulary.language.northwestern_tasmanian=Northwestern Tasmanian
 controlledvocabulary.language.norwegian=Norwegian
-controlledvocabulary.language.nuosu=Nuosu
-controlledvocabulary.language.southern_ndebele=Southern Ndebele
-controlledvocabulary.language.occitan=Occitan
+controlledvocabulary.language.norwegian_bokmal=Norwegian BokmÃĨl
+controlledvocabulary.language.norwegian_nynorsk=Norwegian Nynorsk
+controlledvocabulary.language.norwegian_sign_language=Norwegian Sign Language
+controlledvocabulary.language.notre=Notre
+controlledvocabulary.language.notsi=Notsi
+controlledvocabulary.language.nottoway=Nottoway
+controlledvocabulary.language.nottoway-meherrin=Nottoway-Meherrin
+controlledvocabulary.language.novial=Novial
+controlledvocabulary.language.noy=Noy
+controlledvocabulary.language.nsenga=Nsenga
+controlledvocabulary.language.nshi=Nshi
+controlledvocabulary.language.nsongo=Nsongo
+controlledvocabulary.language.ntcham=Ntcham
+controlledvocabulary.language.nteng=Nteng
+controlledvocabulary.language.ntomba=Ntomba
+controlledvocabulary.language.nubaca=Nubaca
+controlledvocabulary.language.nubi=Nubi
+controlledvocabulary.language.nubri=Nubri
+controlledvocabulary.language.nuer=Nuer
+controlledvocabulary.language.nugunu_(australia)=Nugunu (Australia)
+controlledvocabulary.language.nugunu_(cameroon)=Nugunu (Cameroon)
+controlledvocabulary.language.nuk=Nuk
+controlledvocabulary.language.nukak_maku=Nukak MakÃē
+controlledvocabulary.language.nukna=Nukna
+controlledvocabulary.language.nukuini=Nukuini
+controlledvocabulary.language.nukumanu=Nukumanu
+controlledvocabulary.language.nukunul=Nukunul
+controlledvocabulary.language.nukuoro=Nukuoro
+controlledvocabulary.language.nukuria=Nukuria
+controlledvocabulary.language.numana=Numana
+controlledvocabulary.language.numanggang=Numanggang
+controlledvocabulary.language.numbami=Numbami
+controlledvocabulary.language.nume=Nume
+controlledvocabulary.language.numidian=Numidian
+controlledvocabulary.language.numee=Numèè
+controlledvocabulary.language.nung_(viet_nam)=Nung (Viet Nam)
+controlledvocabulary.language.nungali=Nungali
+controlledvocabulary.language.nunggubuyu=Nunggubuyu
+controlledvocabulary.language.nungu=Nungu
+controlledvocabulary.language.nupbikha=Nupbikha
+controlledvocabulary.language.nupe-nupe-tako=Nupe-Nupe-Tako
+controlledvocabulary.language.nusa_laut=Nusa Laut
+controlledvocabulary.language.nusu=Nusu
+controlledvocabulary.language.nuu-chah-nulth=Nuu-chah-nulth
+controlledvocabulary.language.nyabwa=Nyabwa
+controlledvocabulary.language.nyaheun=Nyaheun
+controlledvocabulary.language.nyahkur=Nyahkur
+controlledvocabulary.language.nyakyusa-ngonde=Nyakyusa-Ngonde
+controlledvocabulary.language.nyali=Nyali
+controlledvocabulary.language.nyam=Nyam
+controlledvocabulary.language.nyamal=Nyamal
+controlledvocabulary.language.nyambo=Nyambo
+controlledvocabulary.language.nyamusa-molo=Nyamusa-Molo
+controlledvocabulary.language.nyamwanga=Nyamwanga
+controlledvocabulary.language.nyamwezi=Nyamwezi
+controlledvocabulary.language.nyaneka=Nyaneka
+controlledvocabulary.language.nyang'i=Nyang'i
+controlledvocabulary.language.nyanga=Nyanga
+controlledvocabulary.language.nyanga-li=Nyanga-li
+controlledvocabulary.language.nyangatom=Nyangatom
+controlledvocabulary.language.nyangbo=Nyangbo
+controlledvocabulary.language.nyangga=Nyangga
+controlledvocabulary.language.nyangumarta=Nyangumarta
+controlledvocabulary.language.nyankole=Nyankole
+controlledvocabulary.language.nyankpa=Nyankpa
+controlledvocabulary.language.nyarafolo_senoufo=Nyarafolo Senoufo
+controlledvocabulary.language.nyaturu=Nyaturu
+controlledvocabulary.language.nyaw=Nyaw
+controlledvocabulary.language.nyawaygi=Nyawaygi
+controlledvocabulary.language.nyemba=Nyemba
+controlledvocabulary.language.nyengo=Nyengo
+controlledvocabulary.language.nyenkha=Nyenkha
+controlledvocabulary.language.nyeu=Nyeu
+controlledvocabulary.language.nyiha_(malawi)=Nyiha (Malawi)
+controlledvocabulary.language.nyiha_(tanzania)=Nyiha (Tanzania)
+controlledvocabulary.language.nyika_(malawi_and_zambia)=Nyika (Malawi and Zambia)
+controlledvocabulary.language.nyika_(tanzania)=Nyika (Tanzania)
+controlledvocabulary.language.nyikina=Nyikina
+controlledvocabulary.language.nyindrou=Nyindrou
+controlledvocabulary.language.nyindu=Nyindu
+controlledvocabulary.language.nyishi=Nyishi
+controlledvocabulary.language.nyiyaparli=Nyiyaparli
+controlledvocabulary.language.nyokon=Nyokon
+controlledvocabulary.language.nyole=Nyole
+controlledvocabulary.language.nyong=Nyong
+controlledvocabulary.language.nyore=Nyore
+controlledvocabulary.language.nyoro=Nyoro
+controlledvocabulary.language.nyulnyul=Nyulnyul
+controlledvocabulary.language.nyungar=Nyungar
+controlledvocabulary.language.nyungwe=Nyungwe
+controlledvocabulary.language.nyalayu=NyÃĸlayu
+controlledvocabulary.language.nzadi=Nzadi
+controlledvocabulary.language.nzakambay=Nzakambay
+controlledvocabulary.language.nzakara=Nzakara
+controlledvocabulary.language.nzanyi=Nzanyi
+controlledvocabulary.language.nzima=Nzima
+controlledvocabulary.language.na-meo=NÃĄ-Meo
+controlledvocabulary.language.nelemwa-nixumwak=NÃĒlÃĒmwa-Nixumwak
+controlledvocabulary.language.nupode_huitoto=NÃŧpode Huitoto
+controlledvocabulary.language.nĮng=NĮng
+controlledvocabulary.language.o'chi'chi'=O'chi'chi'
+controlledvocabulary.language.o'du=O'du
+controlledvocabulary.language.obanliku=Obanliku
+controlledvocabulary.language.obispeno=ObispeÃąo
+controlledvocabulary.language.oblo=Oblo
+controlledvocabulary.language.obo_manobo=Obo Manobo
+controlledvocabulary.language.obokuitai=Obokuitai
+controlledvocabulary.language.obolo=Obolo
+controlledvocabulary.language.obulom=Obulom
+controlledvocabulary.language.ocaina=Ocaina
+controlledvocabulary.language.occitan=Occitan (post 1500), Occitan
+controlledvocabulary.language.ocotepec_mixtec=Ocotepec Mixtec
+controlledvocabulary.language.ocotlan_zapotec=OcotlÃĄn Zapotec
+controlledvocabulary.language.od=Od
+controlledvocabulary.language.odia=Odia
+controlledvocabulary.language.odiai=Odiai
+controlledvocabulary.language.odoodee=Odoodee
+controlledvocabulary.language.odual=Odual
+controlledvocabulary.language.odut=Odut
+controlledvocabulary.language.ofaye=OfayÊ
+controlledvocabulary.language.official_aramaic_(700-300_bce)=Official Aramaic (700-300 BCE)
+controlledvocabulary.language.ofo=Ofo
+controlledvocabulary.language.ogbah=Ogbah
+controlledvocabulary.language.ogbia=Ogbia
+controlledvocabulary.language.ogbogolo=Ogbogolo
+controlledvocabulary.language.ogbronuagum=Ogbronuagum
+controlledvocabulary.language.ogea=Ogea
+controlledvocabulary.language.oirata=Oirata
 controlledvocabulary.language.ojibwe,_ojibwa=Ojibwe, Ojibwa
-controlledvocabulary.language.old_church_slavonic,church_slavonic,old_bulgarian=Old Church Slavonic,Church Slavonic,Old Bulgarian
+controlledvocabulary.language.ojitlan_chinantec=OjitlÃĄn Chinantec
+controlledvocabulary.language.okanagan=Okanagan
+controlledvocabulary.language.oki-no-erabu=Oki-No-Erabu
+controlledvocabulary.language.okiek=Okiek
+controlledvocabulary.language.oko-eni-osayen=Oko-Eni-Osayen
+controlledvocabulary.language.oko-juwoi=Oko-Juwoi
+controlledvocabulary.language.okobo=Okobo
+controlledvocabulary.language.okodia=Okodia
+controlledvocabulary.language.okolie=Okolie
+controlledvocabulary.language.okolod=Okolod
+controlledvocabulary.language.okpamheri=Okpamheri
+controlledvocabulary.language.okpe_(northwestern_edo)=Okpe (Northwestern Edo)
+controlledvocabulary.language.okpe_(southwestern_edo)=Okpe (Southwestern Edo)
+controlledvocabulary.language.oksapmin=Oksapmin
+controlledvocabulary.language.oku=Oku
+controlledvocabulary.language.old_aramaic_(up_to_700_bce)=Old Aramaic (up to 700 BCE)
+controlledvocabulary.language.old_avar=Old Avar
+controlledvocabulary.language.old_breton=Old Breton
+controlledvocabulary.language.old_burmese=Old Burmese
+controlledvocabulary.language.old_cham=Old Cham
+controlledvocabulary.language.old_chinese=Old Chinese
+controlledvocabulary.language.old_cornish=Old Cornish
+controlledvocabulary.language.old_dutch=Old Dutch
+controlledvocabulary.language.old_english_(ca._450-1100)=Old English (ca. 450-1100)
+controlledvocabulary.language.old_french_(842-ca._1400)=Old French (842-ca. 1400)
+controlledvocabulary.language.old_frisian=Old Frisian
+controlledvocabulary.language.old_georgian=Old Georgian
+controlledvocabulary.language.old_high_german_(ca._750-1050)=Old High German (ca. 750-1050)
+controlledvocabulary.language.old_hittite=Old Hittite
+controlledvocabulary.language.old_hungarian=Old Hungarian
+controlledvocabulary.language.old_irish_(to_900)=Old Irish (to 900)
+controlledvocabulary.language.old_japanese=Old Japanese
+controlledvocabulary.language.old_kentish_sign_language=Old Kentish Sign Language
+controlledvocabulary.language.old_khmer=Old Khmer
+controlledvocabulary.language.old_korean_(3rd-9th_cent.)=Old Korean (3rd-9th cent.)
+controlledvocabulary.language.old_lithuanian=Old Lithuanian
+controlledvocabulary.language.old_malay=Old Malay
+controlledvocabulary.language.old_manipuri=Old Manipuri
+controlledvocabulary.language.old_marathi=Old Marathi
+controlledvocabulary.language.old_mon=Old Mon
+controlledvocabulary.language.old_norse=Old Norse
+controlledvocabulary.language.old_nubian=Old Nubian
+controlledvocabulary.language.old_ossetic=Old Ossetic
+controlledvocabulary.language.old_persian_(ca._600-400_b.c.)=Old Persian (ca. 600-400 B.C.)
+controlledvocabulary.language.old_provencal_(to_1500)=Old Provençal (to 1500)
+controlledvocabulary.language.old_russian=Old Russian
+controlledvocabulary.language.old_saxon=Old Saxon
+controlledvocabulary.language.old_spanish=Old Spanish
+controlledvocabulary.language.old_sundanese=Old Sundanese
+controlledvocabulary.language.old_tamil=Old Tamil
+controlledvocabulary.language.old_tibetan=Old Tibetan
+controlledvocabulary.language.old_turkish=Old Turkish
+controlledvocabulary.language.old_uighur=Old Uighur
+controlledvocabulary.language.old_welsh=Old Welsh
+controlledvocabulary.language.olekha=Olekha
+controlledvocabulary.language.olkol=Olkol
+controlledvocabulary.language.olo=Olo
+controlledvocabulary.language.oloma=Oloma
+controlledvocabulary.language.olrat=Olrat
+controlledvocabulary.language.olu'bo=Olu'bo
+controlledvocabulary.language.olulumo-ikom=Olulumo-Ikom
+controlledvocabulary.language.oluta_popoluca=Oluta Popoluca
+controlledvocabulary.language.omagua=Omagua
+controlledvocabulary.language.omaha-ponca=Omaha-Ponca
+controlledvocabulary.language.omani_arabic=Omani Arabic
+controlledvocabulary.language.ombamba=Ombamba
+controlledvocabulary.language.ombo=Ombo
+controlledvocabulary.language.ometepec_nahuatl=Ometepec Nahuatl
+controlledvocabulary.language.omi=Omi
+controlledvocabulary.language.omok=Omok
+controlledvocabulary.language.omotik=Omotik
+controlledvocabulary.language.omurano=Omurano
+controlledvocabulary.language.ona=Ona
+controlledvocabulary.language.oneida=Oneida
+controlledvocabulary.language.ong=Ong
+controlledvocabulary.language.onin=Onin
+controlledvocabulary.language.onin_based_pidgin=Onin Based Pidgin
+controlledvocabulary.language.onjob=Onjob
+controlledvocabulary.language.ono=Ono
+controlledvocabulary.language.onobasulu=Onobasulu
+controlledvocabulary.language.onondaga=Onondaga
+controlledvocabulary.language.ontenu=Ontenu
+controlledvocabulary.language.ontong_java=Ontong Java
+controlledvocabulary.language.oorlams=Oorlams
+controlledvocabulary.language.opao=Opao
+controlledvocabulary.language.opata=Opata
+controlledvocabulary.language.orang_kanaq=Orang Kanaq
+controlledvocabulary.language.orang_seletar=Orang Seletar
+controlledvocabulary.language.oraon_sadri=Oraon Sadri
+controlledvocabulary.language.orejon=OrejÃŗn
+controlledvocabulary.language.oring=Oring
+controlledvocabulary.language.oriya=Oriya, Oriya (macrolanguage)
+controlledvocabulary.language.orizaba_nahuatl=Orizaba Nahuatl
+controlledvocabulary.language.orma=Orma
+controlledvocabulary.language.ormu=Ormu
+controlledvocabulary.language.ormuri=Ormuri
+controlledvocabulary.language.oro=Oro
+controlledvocabulary.language.oro_win=Oro Win
+controlledvocabulary.language.oroch=Oroch
+controlledvocabulary.language.oroha=Oroha
+controlledvocabulary.language.orok=Orok
+controlledvocabulary.language.orokaiva=Orokaiva
+controlledvocabulary.language.oroko=Oroko
+controlledvocabulary.language.orokolo=Orokolo
 controlledvocabulary.language.oromo=Oromo
-controlledvocabulary.language.oriya=Oriya
+controlledvocabulary.language.oroqen=Oroqen
+controlledvocabulary.language.orowe=Orowe
+controlledvocabulary.language.oruma=Oruma
+controlledvocabulary.language.orya=Orya
+controlledvocabulary.language.osage=Osage
+controlledvocabulary.language.osatu=Osatu
+controlledvocabulary.language.oscan=Oscan
+controlledvocabulary.language.osing=Osing
+controlledvocabulary.language.ososo=Ososo
 controlledvocabulary.language.ossetian,_ossetic=Ossetian, Ossetic
+controlledvocabulary.language.ot_danum=Ot Danum
+controlledvocabulary.language.otank=Otank
+controlledvocabulary.language.oti=Oti
+controlledvocabulary.language.otoro=Otoro
+controlledvocabulary.language.ottawa=Ottawa
+controlledvocabulary.language.ottoman_turkish_(1500-1928)=Ottoman Turkish (1500-1928)
+controlledvocabulary.language.otuho=Otuho
+controlledvocabulary.language.otuke=Otuke
+controlledvocabulary.language.ouma=Ouma
+controlledvocabulary.language.oune=Oune
+controlledvocabulary.language.owa=Owa
+controlledvocabulary.language.owenia=Owenia
+controlledvocabulary.language.owiniga=Owiniga
+controlledvocabulary.language.oy=Oy
+controlledvocabulary.language.oya'oya=Oya'oya
+controlledvocabulary.language.oyda=Oyda
+controlledvocabulary.language.oyster_bay_tasmanian=Oyster Bay Tasmanian
+controlledvocabulary.language.ozolotepec_zapotec=Ozolotepec Zapotec
+controlledvocabulary.language.ozumacin_chinantec=Ozumacín Chinantec
+controlledvocabulary.language.pa_di=Pa Di
+controlledvocabulary.language.pa'a=Pa'a
+controlledvocabulary.language.pa'o_karen=Pa'o Karen
+controlledvocabulary.language.pa-hng=Pa-Hng
+controlledvocabulary.language.paakantyi=Paakantyi
+controlledvocabulary.language.paama=Paama
+controlledvocabulary.language.paasaal=Paasaal
+controlledvocabulary.language.pacahuara=Pacahuara
+controlledvocabulary.language.pacaraos_quechua=Pacaraos Quechua
+controlledvocabulary.language.pacific_gulf_yupik=Pacific Gulf Yupik
+controlledvocabulary.language.pacoh=Pacoh
+controlledvocabulary.language.padoe=Padoe
+controlledvocabulary.language.paekche=Paekche
+controlledvocabulary.language.paelignian=Paelignian
+controlledvocabulary.language.pagi=Pagi
+controlledvocabulary.language.pagibete=Pagibete
+controlledvocabulary.language.pagu=Pagu
+controlledvocabulary.language.pahanan_agta=Pahanan Agta
+controlledvocabulary.language.pahari=Pahari
+controlledvocabulary.language.pahari-potwari=Pahari-Potwari
+controlledvocabulary.language.pahi=Pahi
+controlledvocabulary.language.pahlavani=Pahlavani
+controlledvocabulary.language.pahlavi=Pahlavi
+controlledvocabulary.language.pai_tavytera=Pai Tavytera
+controlledvocabulary.language.paici=PaicÃŽ
+controlledvocabulary.language.paipai=Paipai
+controlledvocabulary.language.paite_chin=Paite Chin
+controlledvocabulary.language.paiwan=Paiwan
+controlledvocabulary.language.pak-tong=Pak-Tong
+controlledvocabulary.language.pakanha=Pakanha
+controlledvocabulary.language.pakaasnovos=PakaÃĄsnovos
+controlledvocabulary.language.pakistan_sign_language=Pakistan Sign Language
+controlledvocabulary.language.paku=Paku
+controlledvocabulary.language.paku_karen=Paku Karen
+controlledvocabulary.language.pal=Pal
+controlledvocabulary.language.palaic=Palaic
+controlledvocabulary.language.palaka_senoufo=Palaka Senoufo
+controlledvocabulary.language.palantla_chinantec=Palantla Chinantec
+controlledvocabulary.language.palauan=Palauan
+controlledvocabulary.language.paleni=Paleni
+controlledvocabulary.language.palenquero=Palenquero
+controlledvocabulary.language.palikur=PalikÃēr
+controlledvocabulary.language.paliyan=Paliyan
+controlledvocabulary.language.pallanganmiddang=Pallanganmiddang
+controlledvocabulary.language.paloor=Paloor
+controlledvocabulary.language.palu'e=Palu'e
+controlledvocabulary.language.paluan=Paluan
+controlledvocabulary.language.palya_bareli=Palya Bareli
+controlledvocabulary.language.pam=Pam
+controlledvocabulary.language.pambia=Pambia
+controlledvocabulary.language.pamona=Pamona
+controlledvocabulary.language.pamosu=Pamosu
+controlledvocabulary.language.pampanga=Pampanga
+controlledvocabulary.language.pamplona_atta=Pamplona Atta
+controlledvocabulary.language.pana_(burkina_faso)=Pana (Burkina Faso)
+controlledvocabulary.language.pana_(central_african_republic)=Pana (Central African Republic)
+controlledvocabulary.language.panamanian_sign_language=Panamanian Sign Language
+controlledvocabulary.language.panamint=Panamint
+controlledvocabulary.language.panao_huanuco_quechua=Panao HuÃĄnuco Quechua
+controlledvocabulary.language.panara=PanarÃĄ
+controlledvocabulary.language.panasuan=Panasuan
+controlledvocabulary.language.panawa=Panawa
+controlledvocabulary.language.pancana=Pancana
+controlledvocabulary.language.panchpargania=Panchpargania
+controlledvocabulary.language.pande=Pande
+controlledvocabulary.language.pangasinan=Pangasinan
+controlledvocabulary.language.pangseng=Pangseng
+controlledvocabulary.language.pangu=Pangu
+controlledvocabulary.language.pangutaran_sama=Pangutaran Sama
+controlledvocabulary.language.pangwa=Pangwa
+controlledvocabulary.language.pangwali=Pangwali
+controlledvocabulary.language.panim=Panim
+controlledvocabulary.language.paniya=Paniya
 controlledvocabulary.language.panjabi,_punjabi=Panjabi, Punjabi
-controlledvocabulary.language.pali=P\u0101li
-controlledvocabulary.language.persian_(farsi)=Persian (Farsi)
-controlledvocabulary.language.polish=Polish
+controlledvocabulary.language.pankarare=PankararÊ
+controlledvocabulary.language.pankararu=PankararÃē
+controlledvocabulary.language.pankhu=Pankhu
+controlledvocabulary.language.pannei=Pannei
+controlledvocabulary.language.pano=Pano
+controlledvocabulary.language.panoan_katukina=Panoan Katukína
+controlledvocabulary.language.panobo=Panobo
+controlledvocabulary.language.panyi_bai=Panyi Bai
+controlledvocabulary.language.papantla_totonac=Papantla Totonac
+controlledvocabulary.language.papapana=Papapana
+controlledvocabulary.language.papar=Papar
+controlledvocabulary.language.papasena=Papasena
+controlledvocabulary.language.papel=Papel
+controlledvocabulary.language.papi=Papi
+controlledvocabulary.language.papiamento=Papiamento
+controlledvocabulary.language.papora=Papora
+controlledvocabulary.language.papua_new_guinean_sign_language=Papua New Guinean Sign Language
+controlledvocabulary.language.papuan_malay=Papuan Malay
+controlledvocabulary.language.papuma=Papuma
+controlledvocabulary.language.parachi=Parachi
+controlledvocabulary.language.paraguayan_guarani=Paraguayan Guaraní
+controlledvocabulary.language.paraguayan_sign_language=Paraguayan Sign Language
+controlledvocabulary.language.parakana=ParakanÃŖ
+controlledvocabulary.language.paranan=Paranan
+controlledvocabulary.language.paranawat=ParanawÃĄt
+controlledvocabulary.language.paraujano=Paraujano
+controlledvocabulary.language.parauk=Parauk
+controlledvocabulary.language.parawen=Parawen
+controlledvocabulary.language.pardhan=Pardhan
+controlledvocabulary.language.pardhi=Pardhi
+controlledvocabulary.language.pare=Pare
+controlledvocabulary.language.parecis=Parecís
+controlledvocabulary.language.parenga=Parenga
+controlledvocabulary.language.parkari_koli=Parkari Koli
+controlledvocabulary.language.parkwa=Parkwa
+controlledvocabulary.language.parsi-dari=Parsi-Dari
+controlledvocabulary.language.parthian=Parthian
+controlledvocabulary.language.parya=Parya
+controlledvocabulary.language.para_arara=ParÃĄ ArÃĄra
+controlledvocabulary.language.para_gaviao=ParÃĄ GaviÃŖo
 controlledvocabulary.language.pashto,_pushto=Pashto, Pushto
+controlledvocabulary.language.pasi=Pasi
+controlledvocabulary.language.pass_valley_yali=Pass Valley Yali
+controlledvocabulary.language.patamona=Patamona
+controlledvocabulary.language.patani=Patani
+controlledvocabulary.language.pataxo_ha-ha-hae=PataxÃŗ HÃŖ-Ha-HÃŖe
+controlledvocabulary.language.patep=Patep
+controlledvocabulary.language.pathiya=Pathiya
+controlledvocabulary.language.patpatar=Patpatar
+controlledvocabulary.language.pattani=Pattani
+controlledvocabulary.language.pattani_malay=Pattani Malay
+controlledvocabulary.language.pattapu=Pattapu
+controlledvocabulary.language.patwin=Patwin
+controlledvocabulary.language.paulohi=Paulohi
+controlledvocabulary.language.paumari=Paumarí
+controlledvocabulary.language.paunaka=Paunaka
+controlledvocabulary.language.pauri_bareli=Pauri Bareli
+controlledvocabulary.language.pauserna=Pauserna
+controlledvocabulary.language.pawaia=Pawaia
+controlledvocabulary.language.pawnee=Pawnee
+controlledvocabulary.language.paynamar=Paynamar
+controlledvocabulary.language.pazeh=Pazeh
+controlledvocabulary.language.pe=Pe
+controlledvocabulary.language.pear=Pear
+controlledvocabulary.language.pech=Pech
+controlledvocabulary.language.pecheneg=Pecheneg
+controlledvocabulary.language.pedi=Pedi
+controlledvocabulary.language.pei=Pei
+controlledvocabulary.language.pekal=Pekal
+controlledvocabulary.language.pela=Pela
+controlledvocabulary.language.pele-ata=Pele-Ata
+controlledvocabulary.language.pelende=Pelende
+controlledvocabulary.language.pemon=Pemon
+controlledvocabulary.language.penang_sign_language=Penang Sign Language
+controlledvocabulary.language.penchal=Penchal
+controlledvocabulary.language.pendau=Pendau
+controlledvocabulary.language.pengo=Pengo
+controlledvocabulary.language.pennsylvania_german=Pennsylvania German
+controlledvocabulary.language.penrhyn=Penrhyn
+controlledvocabulary.language.pentlatch=Pentlatch
+controlledvocabulary.language.perai=Perai
+controlledvocabulary.language.peranakan_indonesian=Peranakan Indonesian
+controlledvocabulary.language.pere=Pere
+controlledvocabulary.language.peripheral_mongolian=Peripheral Mongolian
+controlledvocabulary.language.pero=Pero
+controlledvocabulary.language.persian_(farsi)=Persian, Persian (Farsi)
+controlledvocabulary.language.peruvian_sign_language=Peruvian Sign Language
+controlledvocabulary.language.pesse=Pesse
+controlledvocabulary.language.petapa_zapotec=Petapa Zapotec
+controlledvocabulary.language.petats=Petats
+controlledvocabulary.language.petjo=Petjo
+controlledvocabulary.language.penoles_mixtec=PeÃąoles Mixtec
+controlledvocabulary.language.pfaelzisch=Pfaelzisch
+controlledvocabulary.language.phai=Phai
+controlledvocabulary.language.phake=Phake
+controlledvocabulary.language.phala=Phala
+controlledvocabulary.language.phalura=Phalura
+controlledvocabulary.language.phana'=Phana'
+controlledvocabulary.language.phangduwali=Phangduwali
+controlledvocabulary.language.phende=Phende
+controlledvocabulary.language.philippine_sign_language=Philippine Sign Language
+controlledvocabulary.language.phimbi=Phimbi
+controlledvocabulary.language.phoenician=Phoenician
+controlledvocabulary.language.phola=Phola
+controlledvocabulary.language.pholo=Pholo
+controlledvocabulary.language.phom_naga=Phom Naga
+controlledvocabulary.language.phong-kniang=Phong-Kniang
+controlledvocabulary.language.phrae_pwo_karen=Phrae Pwo Karen
+controlledvocabulary.language.phrygian=Phrygian
+controlledvocabulary.language.phu_thai=Phu Thai
+controlledvocabulary.language.phuan=Phuan
+controlledvocabulary.language.phudagi=Phudagi
+controlledvocabulary.language.phuie=Phuie
+controlledvocabulary.language.phukha=Phukha
+controlledvocabulary.language.phuma=Phuma
+controlledvocabulary.language.phunoi=Phunoi
+controlledvocabulary.language.phuong=Phuong
+controlledvocabulary.language.phupa=Phupa
+controlledvocabulary.language.phupha=Phupha
+controlledvocabulary.language.phuza=Phuza
+controlledvocabulary.language.piamatsina=Piamatsina
+controlledvocabulary.language.piame=Piame
+controlledvocabulary.language.piapoco=Piapoco
+controlledvocabulary.language.piaroa=Piaroa
+controlledvocabulary.language.picard=Picard
+controlledvocabulary.language.pichis_asheninka=Pichis AshÊninka
+controlledvocabulary.language.pictish=Pictish
+controlledvocabulary.language.pidgin_delaware=Pidgin Delaware
+controlledvocabulary.language.piemontese=Piemontese
+controlledvocabulary.language.pijao=Pijao
+controlledvocabulary.language.pije=Pije
+controlledvocabulary.language.pijin=Pijin
+controlledvocabulary.language.pilaga=PilagÃĄ
+controlledvocabulary.language.pileni=Pileni
+controlledvocabulary.language.pima_bajo=Pima Bajo
+controlledvocabulary.language.pimbwe=Pimbwe
+controlledvocabulary.language.pinai-hagahai=Pinai-Hagahai
+controlledvocabulary.language.pindiini=Pindiini
+controlledvocabulary.language.pingelapese=Pingelapese
+controlledvocabulary.language.pinigura=Pinigura
+controlledvocabulary.language.pinjarup=Pinjarup
+controlledvocabulary.language.pinji=Pinji
+controlledvocabulary.language.pinotepa_nacional_mixtec=Pinotepa Nacional Mixtec
+controlledvocabulary.language.pintupi-luritja=Pintupi-Luritja
+controlledvocabulary.language.pinyin=Pinyin
+controlledvocabulary.language.pipil=Pipil
+controlledvocabulary.language.piraha=PirahÃŖ
+controlledvocabulary.language.piratapuyo=Piratapuyo
+controlledvocabulary.language.pirlatapa=Pirlatapa
+controlledvocabulary.language.piro=Piro
+controlledvocabulary.language.pirriya=Pirriya
+controlledvocabulary.language.pisabo=Pisabo
+controlledvocabulary.language.pisaflores_tepehua=Pisaflores Tepehua
+controlledvocabulary.language.piscataway=Piscataway
+controlledvocabulary.language.pisidian=Pisidian
+controlledvocabulary.language.pitcairn-norfolk=Pitcairn-Norfolk
+controlledvocabulary.language.pite_sami=Pite Sami
+controlledvocabulary.language.piti=Piti
+controlledvocabulary.language.pitjantjatjara=Pitjantjatjara
+controlledvocabulary.language.pitta_pitta=Pitta Pitta
+controlledvocabulary.language.piu=Piu
+controlledvocabulary.language.piya-kwonci=Piya-Kwonci
+controlledvocabulary.language.plains_cree=Plains Cree
+controlledvocabulary.language.plains_indian_sign_language=Plains Indian Sign Language
+controlledvocabulary.language.plains_miwok=Plains Miwok
+controlledvocabulary.language.plapo_krumen=Plapo Krumen
+controlledvocabulary.language.plateau_malagasy=Plateau Malagasy
+controlledvocabulary.language.plautdietsch=Plautdietsch
+controlledvocabulary.language.playero=Playero
+controlledvocabulary.language.pnar=Pnar
+controlledvocabulary.language.pochuri_naga=Pochuri Naga
+controlledvocabulary.language.pochutec=Pochutec
+controlledvocabulary.language.podena=Podena
+controlledvocabulary.language.pogolo=Pogolo
+controlledvocabulary.language.pohnpeian=Pohnpeian
+controlledvocabulary.language.pokanga=PokangÃĄ
+controlledvocabulary.language.poke=Poke
+controlledvocabulary.language.pokomo=Pokomo
+controlledvocabulary.language.polabian=Polabian
+controlledvocabulary.language.polari=Polari
+controlledvocabulary.language.polish=Polish
+controlledvocabulary.language.polish_sign_language=Polish Sign Language
+controlledvocabulary.language.polonombauk=Polonombauk
+controlledvocabulary.language.pom=Pom
+controlledvocabulary.language.pomo=Pomo
+controlledvocabulary.language.ponam=Ponam
+controlledvocabulary.language.ponosakan=Ponosakan
+controlledvocabulary.language.pontic=Pontic
+controlledvocabulary.language.ponyo-gongwang_naga=Ponyo-Gongwang Naga
+controlledvocabulary.language.popti'=Popti'
+controlledvocabulary.language.poqomam=Poqomam
+controlledvocabulary.language.poqomchi'=Poqomchi'
+controlledvocabulary.language.porohanon=Porohanon
+controlledvocabulary.language.port_sandwich=Port Sandwich
+controlledvocabulary.language.port_sorell_tasmanian=Port Sorell Tasmanian
+controlledvocabulary.language.port_vato=Port Vato
 controlledvocabulary.language.portuguese=Portuguese
+controlledvocabulary.language.portuguese_sign_language=Portuguese Sign Language
+controlledvocabulary.language.potawatomi=Potawatomi
+controlledvocabulary.language.potiguara=PotiguÃĄra
+controlledvocabulary.language.pottangi_ollar_gadaba=Pottangi Ollar Gadaba
+controlledvocabulary.language.poumei_naga=Poumei Naga
+controlledvocabulary.language.pouye=Pouye
+controlledvocabulary.language.powari=Powari
+controlledvocabulary.language.powhatan=Powhatan
+controlledvocabulary.language.poyanawa=PoyanÃĄwa
+controlledvocabulary.language.prasuni=Prasuni
+controlledvocabulary.language.primitive_irish=Primitive Irish
+controlledvocabulary.language.principense=Principense
+controlledvocabulary.language.providencia_sign_language=Providencia Sign Language
+controlledvocabulary.language.prussian=Prussian
+controlledvocabulary.language.psikye=Psikye
+controlledvocabulary.language.pu-xian_chinese=Pu-Xian Chinese
+controlledvocabulary.language.puare=Puare
+controlledvocabulary.language.pudtol_atta=Pudtol Atta
+controlledvocabulary.language.puebla_mazatec=Puebla Mazatec
+controlledvocabulary.language.puelche=Puelche
+controlledvocabulary.language.puerto_rican_sign_language=Puerto Rican Sign Language
+controlledvocabulary.language.puimei_naga=Puimei Naga
+controlledvocabulary.language.puinave=Puinave
+controlledvocabulary.language.pukapuka=Pukapuka
+controlledvocabulary.language.pulaar=Pulaar
+controlledvocabulary.language.pulabu=Pulabu
+controlledvocabulary.language.pular=Pular
+controlledvocabulary.language.puluwatese=Puluwatese
+controlledvocabulary.language.puma=Puma
+controlledvocabulary.language.pumpokol=Pumpokol
+controlledvocabulary.language.pume=PumÊ
+controlledvocabulary.language.punan_aput=Punan Aput
+controlledvocabulary.language.punan_bah-biau=Punan Bah-Biau
+controlledvocabulary.language.punan_batu_1=Punan Batu 1
+controlledvocabulary.language.punan_merah=Punan Merah
+controlledvocabulary.language.punan_merap=Punan Merap
+controlledvocabulary.language.punan_tubu=Punan Tubu
+controlledvocabulary.language.punic=Punic
+controlledvocabulary.language.puno_quechua=Puno Quechua
+controlledvocabulary.language.punthamara=Punthamara
+controlledvocabulary.language.punu=Punu
+controlledvocabulary.language.puoc=Puoc
+controlledvocabulary.language.puquina=Puquina
+controlledvocabulary.language.puragi=Puragi
+controlledvocabulary.language.purari=Purari
+controlledvocabulary.language.purepecha=Purepecha
+controlledvocabulary.language.puri=Puri
+controlledvocabulary.language.purik=Purik
+controlledvocabulary.language.purisimeno=PurisimeÃąo
+controlledvocabulary.language.puroik=Puroik
+controlledvocabulary.language.purubora=PuruborÃĄ
+controlledvocabulary.language.purum=Purum
+controlledvocabulary.language.putai=Putai
+controlledvocabulary.language.putoh=Putoh
+controlledvocabulary.language.putukwam=Putukwam
+controlledvocabulary.language.puyo=Puyo
+controlledvocabulary.language.puyo-paekche=Puyo-Paekche
+controlledvocabulary.language.puyuma=Puyuma
+controlledvocabulary.language.pwaamei=Pwaamei
+controlledvocabulary.language.pwapwa=PwapwÃĸ
+controlledvocabulary.language.pwo_eastern_karen=Pwo Eastern Karen
+controlledvocabulary.language.pwo_northern_karen=Pwo Northern Karen
+controlledvocabulary.language.pwo_western_karen=Pwo Western Karen
+controlledvocabulary.language.pyapun=Pyapun
+controlledvocabulary.language.pye_krumen=Pye Krumen
+controlledvocabulary.language.pyen=Pyen
+controlledvocabulary.language.pyu_(myanmar)=Pyu (Myanmar)
+controlledvocabulary.language.pyu_(papua_new_guinea)=Pyu (Papua New Guinea)
+controlledvocabulary.language.paez=PÃĄez
+controlledvocabulary.language.paafang=PÃĄÃĄfang
+controlledvocabulary.language.pari=Päri
+controlledvocabulary.language.pemono=PÊmono
+controlledvocabulary.language.peve=PÊvÊ
+controlledvocabulary.language.pokoot=PÃļkoot
+controlledvocabulary.language.pali=Pāli, Pali
+controlledvocabulary.language.q'anjob'al=Q'anjob'al
+controlledvocabulary.language.qabiao=Qabiao
+controlledvocabulary.language.qaqet=Qaqet
+controlledvocabulary.language.qashqa'i=Qashqa'i
+controlledvocabulary.language.qatabanian=Qatabanian
+controlledvocabulary.language.qau=Qau
+controlledvocabulary.language.qawasqar=Qawasqar
+controlledvocabulary.language.qila_muji=Qila Muji
+controlledvocabulary.language.qimant=Qimant
+controlledvocabulary.language.qiubei_zhuang=Qiubei Zhuang
+controlledvocabulary.language.quapaw=Quapaw
+controlledvocabulary.language.quebec_sign_language=Quebec Sign Language
+controlledvocabulary.language.quechan=Quechan
 controlledvocabulary.language.quechua=Quechua
-controlledvocabulary.language.romansh=Romansh
-controlledvocabulary.language.kirundi=Kirundi
+controlledvocabulary.language.quenya=Quenya
+controlledvocabulary.language.queretaro_otomi=QuerÊtaro Otomi
+controlledvocabulary.language.quetzaltepec_mixe=Quetzaltepec Mixe
+controlledvocabulary.language.queyu=Queyu
+controlledvocabulary.language.quiavicuzas_zapotec=Quiavicuzas Zapotec
+controlledvocabulary.language.quileute=Quileute
+controlledvocabulary.language.quinault=Quinault
+controlledvocabulary.language.quinqui=Quinqui
+controlledvocabulary.language.quioquitani-quieri_zapotec=Quioquitani-Quierí Zapotec
+controlledvocabulary.language.quiotepec_chinantec=Quiotepec Chinantec
+controlledvocabulary.language.quiripi=Quiripi
+controlledvocabulary.language.rabha=Rabha
+controlledvocabulary.language.rade=Rade
+controlledvocabulary.language.raetic=Raetic
+controlledvocabulary.language.rahambuu=Rahambuu
+controlledvocabulary.language.rajah_kabunsuwan_manobo=Rajah Kabunsuwan Manobo
+controlledvocabulary.language.rajasthani=Rajasthani
+controlledvocabulary.language.rajbanshi=Rajbanshi
+controlledvocabulary.language.raji=Raji
+controlledvocabulary.language.rajong=Rajong
+controlledvocabulary.language.rajput_garasia=Rajput Garasia
+controlledvocabulary.language.rakahanga-manihiki=Rakahanga-Manihiki
+controlledvocabulary.language.rakhine=Rakhine
+controlledvocabulary.language.ralte=Ralte
+controlledvocabulary.language.rama=Rama
+controlledvocabulary.language.ramoaaina=Ramoaaina
+controlledvocabulary.language.ramopa=Ramopa
+controlledvocabulary.language.rampi=Rampi
+controlledvocabulary.language.rana_tharu=Rana Tharu
+controlledvocabulary.language.rang=Rang
+controlledvocabulary.language.rangi=Rangi
+controlledvocabulary.language.rangkas=Rangkas
+controlledvocabulary.language.ranglong=Ranglong
+controlledvocabulary.language.rangpuri=Rangpuri
+controlledvocabulary.language.rao=Rao
+controlledvocabulary.language.rapa=Rapa
+controlledvocabulary.language.rapanui=Rapanui
+controlledvocabulary.language.rapoisi=Rapoisi
+controlledvocabulary.language.rapting=Rapting
+controlledvocabulary.language.rara_bakati'=Rara Bakati'
+controlledvocabulary.language.rarotongan=Rarotongan
+controlledvocabulary.language.rasawa=Rasawa
+controlledvocabulary.language.ratagnon=Ratagnon
+controlledvocabulary.language.ratahan=Ratahan
+controlledvocabulary.language.rathawi=Rathawi
+controlledvocabulary.language.rathwi_bareli=Rathwi Bareli
+controlledvocabulary.language.raute=Raute
+controlledvocabulary.language.ravula=Ravula
+controlledvocabulary.language.rawa=Rawa
+controlledvocabulary.language.rawang=Rawang
+controlledvocabulary.language.rawat=Rawat
+controlledvocabulary.language.rawngtu_chin=Rawngtu Chin
+controlledvocabulary.language.rawo=Rawo
+controlledvocabulary.language.rayon_zoque=RayÃŗn Zoque
+controlledvocabulary.language.razajerdi=Razajerdi
+controlledvocabulary.language.red_gelao=Red Gelao
+controlledvocabulary.language.reel=Reel
+controlledvocabulary.language.rejang=Rejang
+controlledvocabulary.language.rejang_kayan=Rejang Kayan
+controlledvocabulary.language.reli=Reli
+controlledvocabulary.language.rema=Rema
+controlledvocabulary.language.rembarrnga=Rembarrnga
+controlledvocabulary.language.rembong=Rembong
+controlledvocabulary.language.remo=Remo
+controlledvocabulary.language.remontado_dumagat=Remontado Dumagat
+controlledvocabulary.language.rempi=Rempi
+controlledvocabulary.language.remun=Remun
+controlledvocabulary.language.rendille=Rendille
+controlledvocabulary.language.rengao=Rengao
+controlledvocabulary.language.rennell-bellona=Rennell-Bellona
+controlledvocabulary.language.repanbitip=Repanbitip
+controlledvocabulary.language.rer_bare=Rer Bare
+controlledvocabulary.language.rerau=Rerau
+controlledvocabulary.language.rerep=Rerep
+controlledvocabulary.language.reshe=Reshe
+controlledvocabulary.language.resigaro=Resígaro
+controlledvocabulary.language.retta=Retta
+controlledvocabulary.language.reyesano=Reyesano
+controlledvocabulary.language.riang_(india)=Riang (India)
+controlledvocabulary.language.riang_lai=Riang Lai
+controlledvocabulary.language.riang_lang=Riang Lang
+controlledvocabulary.language.riantana=Riantana
+controlledvocabulary.language.ribun=Ribun
+controlledvocabulary.language.rigwe=Rigwe
+controlledvocabulary.language.rikbaktsa=Rikbaktsa
+controlledvocabulary.language.rinconada_bikol=Rinconada Bikol
+controlledvocabulary.language.rincon_zapotec=RincÃŗn Zapotec
+controlledvocabulary.language.ringgou=Ringgou
+controlledvocabulary.language.ririo=Ririo
+controlledvocabulary.language.rishiwa=Rishiwa
+controlledvocabulary.language.ritharrngu=Ritharrngu
+controlledvocabulary.language.riung=Riung
+controlledvocabulary.language.riverain_sango=Riverain Sango
+controlledvocabulary.language.rmeet=Rmeet
+controlledvocabulary.language.rogo=Rogo
+controlledvocabulary.language.rohingya=Rohingya
+controlledvocabulary.language.roma=Roma
+controlledvocabulary.language.romagnol=Romagnol
+controlledvocabulary.language.romam=Romam
 controlledvocabulary.language.romanian=Romanian
+controlledvocabulary.language.romanian_sign_language=Romanian Sign Language
+controlledvocabulary.language.romano-greek=Romano-Greek
+controlledvocabulary.language.romano-serbian=Romano-Serbian
+controlledvocabulary.language.romanova=Romanova
+controlledvocabulary.language.romansh=Romansh
+controlledvocabulary.language.romany=Romany
+controlledvocabulary.language.romblomanon=Romblomanon
+controlledvocabulary.language.rombo=Rombo
+controlledvocabulary.language.romkun=Romkun
+controlledvocabulary.language.ron=Ron
+controlledvocabulary.language.ronga=Ronga
+controlledvocabulary.language.rongga=Rongga
+controlledvocabulary.language.rongmei_naga=Rongmei Naga
+controlledvocabulary.language.rongpo=Rongpo
+controlledvocabulary.language.ronji=Ronji
+controlledvocabulary.language.roon=Roon
+controlledvocabulary.language.roria=Roria
+controlledvocabulary.language.rotokas=Rotokas
+controlledvocabulary.language.rotuman=Rotuman
+controlledvocabulary.language.roviana=Roviana
+controlledvocabulary.language.ruching_palaung=Ruching Palaung
+controlledvocabulary.language.rudbari=Rudbari
+controlledvocabulary.language.rufiji=Rufiji
+controlledvocabulary.language.ruga=Ruga
+controlledvocabulary.language.rukai=Rukai
+controlledvocabulary.language.ruma=Ruma
+controlledvocabulary.language.rumai_palaung=Rumai Palaung
+controlledvocabulary.language.rumu=Rumu
+controlledvocabulary.language.kirundi=Rundi, Kirundi
+controlledvocabulary.language.runga=Runga
+controlledvocabulary.language.rungtu_chin=Rungtu Chin
+controlledvocabulary.language.rungus=Rungus
+controlledvocabulary.language.rungwa=Rungwa
+controlledvocabulary.language.russia_buriat=Russia Buriat
 controlledvocabulary.language.russian=Russian
-controlledvocabulary.language.sanskrit_(samskrta)=Sanskrit (Sa\u1E41sk\u1E5Bta)
-controlledvocabulary.language.sardinian=Sardinian
-controlledvocabulary.language.sindhi=Sindhi
-controlledvocabulary.language.northern_sami=Northern Sami
+controlledvocabulary.language.russian_sign_language=Russian Sign Language
+controlledvocabulary.language.rusyn=Rusyn
+controlledvocabulary.language.ruthenian=Ruthenian
+controlledvocabulary.language.rutul=Rutul
+controlledvocabulary.language.ruuli=Ruuli
+controlledvocabulary.language.ruund=Ruund
+controlledvocabulary.language.ruwila=Ruwila
+controlledvocabulary.language.rwa=Rwa
+controlledvocabulary.language.rwandan_sign_language=Rwandan Sign Language
+controlledvocabulary.language.reunion_creole_french=RÊunion Creole French
+controlledvocabulary.language.razihi=Rāziá¸ĨÄĢ
+controlledvocabulary.language.s'gaw_karen=S'gaw Karen
+controlledvocabulary.language.sa=Sa
+controlledvocabulary.language.sa'a=Sa'a
+controlledvocabulary.language.sa'ban=Sa'ban
+controlledvocabulary.language.sa'och=Sa'och
+controlledvocabulary.language.saafi-saafi=Saafi-Saafi
+controlledvocabulary.language.saam=Saam
+controlledvocabulary.language.saamia=Saamia
+controlledvocabulary.language.saaroa=Saaroa
+controlledvocabulary.language.saba=Saba
+controlledvocabulary.language.sabaean=Sabaean
+controlledvocabulary.language.sabah_bisaya=Sabah Bisaya
+controlledvocabulary.language.sabah_malay=Sabah Malay
+controlledvocabulary.language.sabane=SabanÃĒ
+controlledvocabulary.language.sabaot=Sabaot
+controlledvocabulary.language.sabine=Sabine
+controlledvocabulary.language.sabu=Sabu
+controlledvocabulary.language.sabum=SabÃŧm
+controlledvocabulary.language.sacapulteco=Sacapulteco
+controlledvocabulary.language.sadri=Sadri
+controlledvocabulary.language.saek=Saek
+controlledvocabulary.language.saep=Saep
+controlledvocabulary.language.safaliba=Safaliba
+controlledvocabulary.language.safeyoka=Safeyoka
+controlledvocabulary.language.safwa=Safwa
+controlledvocabulary.language.sagala=Sagala
+controlledvocabulary.language.sagalla=Sagalla
+controlledvocabulary.language.saho=Saho
+controlledvocabulary.language.sahu=Sahu
+controlledvocabulary.language.saidi_arabic=Saidi Arabic
+controlledvocabulary.language.saint_lucian_creole_french=Saint Lucian Creole French
+controlledvocabulary.language.saisiyat=Saisiyat
+controlledvocabulary.language.sajalong=Sajalong
+controlledvocabulary.language.sajau_basap=Sajau Basap
+controlledvocabulary.language.sakachep=Sakachep
+controlledvocabulary.language.sakalava_malagasy=Sakalava Malagasy
+controlledvocabulary.language.sakao=Sakao
+controlledvocabulary.language.sakata=Sakata
+controlledvocabulary.language.sake=Sake
+controlledvocabulary.language.sakirabia=SakirabiÃĄ
+controlledvocabulary.language.sakizaya=Sakizaya
+controlledvocabulary.language.sala=Sala
+controlledvocabulary.language.salampasu=Salampasu
+controlledvocabulary.language.salar=Salar
+controlledvocabulary.language.salas=Salas
+controlledvocabulary.language.salasaca_highland_quichua=Salasaca Highland Quichua
+controlledvocabulary.language.salawati=Salawati
+controlledvocabulary.language.saleman=Saleman
+controlledvocabulary.language.saliba=Saliba
+controlledvocabulary.language.salinan=Salinan
+controlledvocabulary.language.sallands=Sallands
+controlledvocabulary.language.salt-yui=Salt-Yui
+controlledvocabulary.language.saluan=Saluan
+controlledvocabulary.language.saluma=SalumÃĄ
+controlledvocabulary.language.salvadoran_sign_language=Salvadoran Sign Language
+controlledvocabulary.language.sam=Sam
+controlledvocabulary.language.samaritan=Samaritan
+controlledvocabulary.language.samaritan_aramaic=Samaritan Aramaic
+controlledvocabulary.language.samarokena=Samarokena
+controlledvocabulary.language.samatao=Samatao
+controlledvocabulary.language.samay=Samay
+controlledvocabulary.language.samba=Samba
+controlledvocabulary.language.samba_daka=Samba Daka
+controlledvocabulary.language.samba_leko=Samba Leko
+controlledvocabulary.language.sambal=Sambal
+controlledvocabulary.language.sambalpuri=Sambalpuri
+controlledvocabulary.language.sambe=Sambe
+controlledvocabulary.language.samberigi=Samberigi
+controlledvocabulary.language.samburu=Samburu
+controlledvocabulary.language.samei=Samei
+controlledvocabulary.language.samo=Samo
 controlledvocabulary.language.samoan=Samoan
+controlledvocabulary.language.samogitian=Samogitian
+controlledvocabulary.language.samosa=Samosa
+controlledvocabulary.language.sampang=Sampang
+controlledvocabulary.language.samre=Samre
+controlledvocabulary.language.samtao=Samtao
+controlledvocabulary.language.samvedi=Samvedi
+controlledvocabulary.language.san_agustin_mixtepec_zapotec=San Agustín Mixtepec Zapotec
+controlledvocabulary.language.san_baltazar_loxicha_zapotec=San Baltazar Loxicha Zapotec
+controlledvocabulary.language.san_blas_kuna=San Blas Kuna
+controlledvocabulary.language.san_dionisio_del_mar_huave=San Dionisio Del Mar Huave
+controlledvocabulary.language.san_felipe_otlaltepec_popoloca=San Felipe Otlaltepec Popoloca
+controlledvocabulary.language.san_francisco_del_mar_huave=San Francisco Del Mar Huave
+controlledvocabulary.language.san_francisco_matlatzinca=San Francisco Matlatzinca
+controlledvocabulary.language.san_jeronimo_tecoatl_mazatec=San JerÃŗnimo TecÃŗatl Mazatec
+controlledvocabulary.language.san_juan_atzingo_popoloca=San Juan Atzingo Popoloca
+controlledvocabulary.language.san_juan_colorado_mixtec=San Juan Colorado Mixtec
+controlledvocabulary.language.san_juan_teita_mixtec=San Juan Teita Mixtec
+controlledvocabulary.language.san_luis_temalacayuca_popoloca=San Luís Temalacayuca Popoloca
+controlledvocabulary.language.san_marcos_tlacoyalco_popoloca=San Marcos Tlacoyalco Popoloca
+controlledvocabulary.language.san_martin_itunyoso_triqui=San Martín Itunyoso Triqui
+controlledvocabulary.language.san_martin_quechua=San Martín Quechua
+controlledvocabulary.language.san_mateo_del_mar_huave=San Mateo Del Mar Huave
+controlledvocabulary.language.san_miguel_creole_french=San Miguel Creole French
+controlledvocabulary.language.san_miguel_el_grande_mixtec=San Miguel El Grande Mixtec
+controlledvocabulary.language.san_miguel_piedras_mixtec=San Miguel Piedras Mixtec
+controlledvocabulary.language.san_pedro_amuzgos_amuzgo=San Pedro Amuzgos Amuzgo
+controlledvocabulary.language.san_pedro_quiatoni_zapotec=San Pedro Quiatoni Zapotec
+controlledvocabulary.language.san_salvador_kongo=San Salvador Kongo
+controlledvocabulary.language.san_vicente_coatlan_zapotec=San Vicente CoatlÃĄn Zapotec
+controlledvocabulary.language.sanaani_arabic=Sanaani Arabic
+controlledvocabulary.language.sanapana=SanapanÃĄ
+controlledvocabulary.language.sandawe=Sandawe
+controlledvocabulary.language.sanga_(democratic_republic_of_congo)=Sanga (Democratic Republic of Congo)
+controlledvocabulary.language.sanga_(nigeria)=Sanga (Nigeria)
+controlledvocabulary.language.sanggau=Sanggau
+controlledvocabulary.language.sangil=Sangil
+controlledvocabulary.language.sangir=Sangir
+controlledvocabulary.language.sangisari=Sangisari
+controlledvocabulary.language.sangkong=Sangkong
+controlledvocabulary.language.sanglechi=Sanglechi
 controlledvocabulary.language.sango=Sango
+controlledvocabulary.language.sangtam_naga=Sangtam Naga
+controlledvocabulary.language.sangu_(gabon)=Sangu (Gabon)
+controlledvocabulary.language.sangu_(tanzania)=Sangu (Tanzania)
+controlledvocabulary.language.sani=Sani
+controlledvocabulary.language.sanie=Sanie
+controlledvocabulary.language.saniyo-hiyewe=Saniyo-Hiyewe
+controlledvocabulary.language.sankaran_maninka=Sankaran Maninka
+controlledvocabulary.language.sansi=Sansi
+controlledvocabulary.language.sanskrit_(samskrta)=Sanskrit (Saṁskṛta), Sanskrit
+controlledvocabulary.language.santa_ana_de_tusi_pasco_quechua=Santa Ana de Tusi Pasco Quechua
+controlledvocabulary.language.santa_catarina_albarradas_zapotec=Santa Catarina Albarradas Zapotec
+controlledvocabulary.language.santa_ines_ahuatempan_popoloca=Santa InÊs Ahuatempan Popoloca
+controlledvocabulary.language.santa_ines_yatzechi_zapotec=Santa InÊs Yatzechi Zapotec
+controlledvocabulary.language.santa_lucia_monteverde_mixtec=Santa Lucía Monteverde Mixtec
+controlledvocabulary.language.santa_maria_del_mar_huave=Santa María Del Mar Huave
+controlledvocabulary.language.santa_maria_la_alta_nahuatl=Santa María La Alta Nahuatl
+controlledvocabulary.language.santa_maria_quiegolani_zapotec=Santa María Quiegolani Zapotec
+controlledvocabulary.language.santa_maria_zacatepec_mixtec=Santa María Zacatepec Mixtec
+controlledvocabulary.language.santa_teresa_cora=Santa Teresa Cora
+controlledvocabulary.language.santali=Santali
+controlledvocabulary.language.santiago_xanica_zapotec=Santiago Xanica Zapotec
+controlledvocabulary.language.santiago_del_estero_quichua=Santiago del Estero Quichua
+controlledvocabulary.language.santo_domingo_albarradas_zapotec=Santo Domingo Albarradas Zapotec
+controlledvocabulary.language.sanuma=SanumÃĄ
+controlledvocabulary.language.saparua=Saparua
+controlledvocabulary.language.sapo=Sapo
+controlledvocabulary.language.saponi=Saponi
+controlledvocabulary.language.saposa=Saposa
+controlledvocabulary.language.sapuan=Sapuan
+controlledvocabulary.language.sape=SapÊ
+controlledvocabulary.language.sar=Sar
+controlledvocabulary.language.sara=Sara
+controlledvocabulary.language.sara_kaba=Sara Kaba
+controlledvocabulary.language.sara_kaba_deme=Sara Kaba Deme
+controlledvocabulary.language.sara_kaba_naa=Sara Kaba NÃĄÃ 
+controlledvocabulary.language.saraiki=Saraiki
+controlledvocabulary.language.saramaccan=Saramaccan
+controlledvocabulary.language.sarangani_blaan=Sarangani Blaan
+controlledvocabulary.language.sarangani_manobo=Sarangani Manobo
+controlledvocabulary.language.sarasira=Sarasira
+controlledvocabulary.language.saraveca=Saraveca
+controlledvocabulary.language.sardinian=Sardinian
+controlledvocabulary.language.sari=Sari
+controlledvocabulary.language.sarikoli=Sarikoli
+controlledvocabulary.language.sarli=Sarli
+controlledvocabulary.language.sarsi=Sarsi
+controlledvocabulary.language.sartang=Sartang
+controlledvocabulary.language.sarua=Sarua
+controlledvocabulary.language.sarudu=Sarudu
+controlledvocabulary.language.saruga=Saruga
+controlledvocabulary.language.sasak=Sasak
+controlledvocabulary.language.sasaru=Sasaru
+controlledvocabulary.language.sassarese_sardinian=Sassarese Sardinian
+controlledvocabulary.language.satawalese=Satawalese
+controlledvocabulary.language.saterfriesisch=Saterfriesisch
+controlledvocabulary.language.satere-mawe=SaterÊ-MawÊ
+controlledvocabulary.language.saudi_arabian_sign_language=Saudi Arabian Sign Language
+controlledvocabulary.language.sauraseni_prakrit=Sauraseni Prākrit
+controlledvocabulary.language.saurashtra=Saurashtra
+controlledvocabulary.language.sauri=Sauri
+controlledvocabulary.language.sauria_paharia=Sauria Paharia
+controlledvocabulary.language.sause=Sause
+controlledvocabulary.language.sausi=Sausi
+controlledvocabulary.language.savi=Savi
+controlledvocabulary.language.savosavo=Savosavo
+controlledvocabulary.language.sawai=Sawai
+controlledvocabulary.language.saweru=Saweru
+controlledvocabulary.language.sawi=Sawi
+controlledvocabulary.language.sawila=Sawila
+controlledvocabulary.language.sawknah=Sawknah
+controlledvocabulary.language.saxwe_gbe=Saxwe Gbe
+controlledvocabulary.language.saya=Saya
+controlledvocabulary.language.sayula_popoluca=Sayula Popoluca
+controlledvocabulary.language.scots=Scots
+controlledvocabulary.language.scythian=Scythian
+controlledvocabulary.language.sea_island_creole_english=Sea Island Creole English
+controlledvocabulary.language.seba=Seba
+controlledvocabulary.language.sebat_bet_gurage=Sebat Bet Gurage
+controlledvocabulary.language.seberuang=Seberuang
+controlledvocabulary.language.sebop=Sebop
+controlledvocabulary.language.sechelt=Sechelt
+controlledvocabulary.language.secoya=Secoya
+controlledvocabulary.language.sedang=Sedang
+controlledvocabulary.language.sediq=Sediq
+controlledvocabulary.language.sedoa=Sedoa
+controlledvocabulary.language.seeku=Seeku
+controlledvocabulary.language.segai=Segai
+controlledvocabulary.language.segeju=Segeju
+controlledvocabulary.language.seget=Seget
+controlledvocabulary.language.sehwi=Sehwi
+controlledvocabulary.language.seimat=Seimat
+controlledvocabulary.language.seit-kaitetu=Seit-Kaitetu
+controlledvocabulary.language.sekani=Sekani
+controlledvocabulary.language.sekapan=Sekapan
+controlledvocabulary.language.sekar=Sekar
+controlledvocabulary.language.seke_(nepal)=Seke (Nepal)
+controlledvocabulary.language.seke_(vanuatu)=Seke (Vanuatu)
+controlledvocabulary.language.sekele=Sekele
+controlledvocabulary.language.seki=Seki
+controlledvocabulary.language.seko_padang=Seko Padang
+controlledvocabulary.language.seko_tengah=Seko Tengah
+controlledvocabulary.language.sekpele=Sekpele
+controlledvocabulary.language.selangor_sign_language=Selangor Sign Language
+controlledvocabulary.language.selaru=Selaru
+controlledvocabulary.language.selayar=Selayar
+controlledvocabulary.language.selee=Selee
+controlledvocabulary.language.selepet=Selepet
+controlledvocabulary.language.selian=Selian
+controlledvocabulary.language.selkup=Selkup
+controlledvocabulary.language.selungai_murut=Selungai Murut
+controlledvocabulary.language.seluwasan=Seluwasan
+controlledvocabulary.language.semai=Semai
+controlledvocabulary.language.semandang=Semandang
+controlledvocabulary.language.semaq_beri=Semaq Beri
+controlledvocabulary.language.sembakung_murut=Sembakung Murut
+controlledvocabulary.language.semelai=Semelai
+controlledvocabulary.language.semimi=Semimi
+controlledvocabulary.language.semnam=Semnam
+controlledvocabulary.language.semnani=Semnani
+controlledvocabulary.language.sempan=Sempan
+controlledvocabulary.language.sena=Sena
+controlledvocabulary.language.senara_senoufo=Senara SÊnoufo
+controlledvocabulary.language.senaya=Senaya
+controlledvocabulary.language.sene=Sene
+controlledvocabulary.language.seneca=Seneca
+controlledvocabulary.language.sened=Sened
+controlledvocabulary.language.sengele=Sengele
+controlledvocabulary.language.senggi=Senggi
+controlledvocabulary.language.sengo=Sengo
+controlledvocabulary.language.sengseng=Sengseng
+controlledvocabulary.language.senhaja_de_srair=Senhaja De Srair
+controlledvocabulary.language.sensi=Sensi
+controlledvocabulary.language.sentani=Sentani
+controlledvocabulary.language.senthang_chin=Senthang Chin
+controlledvocabulary.language.sentinel=Sentinel
+controlledvocabulary.language.sepa_(indonesia)=Sepa (Indonesia)
+controlledvocabulary.language.sepa_(papua_new_guinea)=Sepa (Papua New Guinea)
+controlledvocabulary.language.sepik_iwam=Sepik Iwam
+controlledvocabulary.language.sera=Sera
 controlledvocabulary.language.serbian=Serbian
-controlledvocabulary.language.scottish_gaelic,_gaelic=Scottish Gaelic, Gaelic
+controlledvocabulary.language.serbo-croatian=Serbo-Croatian
+controlledvocabulary.language.sere=Sere
+controlledvocabulary.language.serer=Serer
+controlledvocabulary.language.seri=Seri
+controlledvocabulary.language.serili=Serili
+controlledvocabulary.language.seroa=Seroa
+controlledvocabulary.language.serrano=Serrano
+controlledvocabulary.language.serua=Serua
+controlledvocabulary.language.serudung_murut=Serudung Murut
+controlledvocabulary.language.serui-laut=Serui-Laut
+controlledvocabulary.language.seselwa_creole_french=Seselwa Creole French
+controlledvocabulary.language.seta=Seta
+controlledvocabulary.language.setaman=Setaman
+controlledvocabulary.language.seti=Seti
+controlledvocabulary.language.settla=Settla
+controlledvocabulary.language.severn_ojibwa=Severn Ojibwa
+controlledvocabulary.language.sewa_bay=Sewa Bay
+controlledvocabulary.language.seychelles_sign_language=Seychelles Sign Language
+controlledvocabulary.language.seze=Seze
+controlledvocabulary.language.sha=Sha
+controlledvocabulary.language.shabak=Shabak
+controlledvocabulary.language.shahmirzadi=Shahmirzadi
+controlledvocabulary.language.shahrudi=Shahrudi
+controlledvocabulary.language.shall-zwall=Shall-Zwall
+controlledvocabulary.language.shama-sambuga=Shama-Sambuga
+controlledvocabulary.language.shamang=Shamang
+controlledvocabulary.language.shambala=Shambala
+controlledvocabulary.language.shan=Shan
+controlledvocabulary.language.shanenawa=Shanenawa
+controlledvocabulary.language.shanga=Shanga
+controlledvocabulary.language.sharanahua=Sharanahua
+controlledvocabulary.language.shark_bay=Shark Bay
+controlledvocabulary.language.sharwa=Sharwa
+controlledvocabulary.language.shasta=Shasta
+controlledvocabulary.language.shatt=Shatt
+controlledvocabulary.language.shau=Shau
+controlledvocabulary.language.shawnee=Shawnee
+controlledvocabulary.language.she=She
+controlledvocabulary.language.shehri=Shehri
+controlledvocabulary.language.shekhawati=Shekhawati
+controlledvocabulary.language.shekkacho=Shekkacho
+controlledvocabulary.language.sheko=Sheko
+controlledvocabulary.language.shelta=Shelta
+controlledvocabulary.language.shempire_senoufo=Shempire Senoufo
+controlledvocabulary.language.shendu=Shendu
+controlledvocabulary.language.sheni=Sheni
+controlledvocabulary.language.sherbro=Sherbro
+controlledvocabulary.language.sherdukpen=Sherdukpen
+controlledvocabulary.language.sherpa=Sherpa
+controlledvocabulary.language.sheshi_kham=Sheshi Kham
+controlledvocabulary.language.shi=Shi
+controlledvocabulary.language.shihhi_arabic=Shihhi Arabic
+controlledvocabulary.language.shiki=Shiki
+controlledvocabulary.language.shilluk=Shilluk
+controlledvocabulary.language.shina=Shina
+controlledvocabulary.language.shipibo-conibo=Shipibo-Conibo
+controlledvocabulary.language.sholaga=Sholaga
+controlledvocabulary.language.shom_peng=Shom Peng
 controlledvocabulary.language.shona=Shona
+controlledvocabulary.language.shoo-minda-nye=Shoo-Minda-Nye
+controlledvocabulary.language.shor=Shor
+controlledvocabulary.language.shoshoni=Shoshoni
+controlledvocabulary.language.shua=Shua
+controlledvocabulary.language.shuadit=Shuadit
+controlledvocabulary.language.shuar=Shuar
+controlledvocabulary.language.shubi=Shubi
+controlledvocabulary.language.shughni=Shughni
+controlledvocabulary.language.shuhi=Shuhi
+controlledvocabulary.language.shumashti=Shumashti
+controlledvocabulary.language.shumcho=Shumcho
+controlledvocabulary.language.shuswap=Shuswap
+controlledvocabulary.language.shwai=Shwai
+controlledvocabulary.language.shwe_palaung=Shwe Palaung
+controlledvocabulary.language.sialum=Sialum
+controlledvocabulary.language.siamou=Siamou
+controlledvocabulary.language.sian=Sian
+controlledvocabulary.language.siane=Siane
+controlledvocabulary.language.siang=Siang
+controlledvocabulary.language.siar-lak=Siar-Lak
+controlledvocabulary.language.siawi=Siawi
+controlledvocabulary.language.sibe=Sibe
+controlledvocabulary.language.siberian_tatar=Siberian Tatar
+controlledvocabulary.language.sibu_melanau=Sibu Melanau
+controlledvocabulary.language.sicanian=Sicanian
+controlledvocabulary.language.sicel=Sicel
+controlledvocabulary.language.nuosu=Sichuan Yi, Nuosu
+controlledvocabulary.language.sicilian=Sicilian
+controlledvocabulary.language.siculo_arabic=Siculo Arabic
+controlledvocabulary.language.sidamo=Sidamo
+controlledvocabulary.language.sidetic=Sidetic
+controlledvocabulary.language.sie=Sie
+controlledvocabulary.language.sierra_leone_sign_language=Sierra Leone Sign Language
+controlledvocabulary.language.sierra_negra_nahuatl=Sierra Negra Nahuatl
+controlledvocabulary.language.sierra_de_juarez_zapotec=Sierra de JuÃĄrez Zapotec
+controlledvocabulary.language.sighu=Sighu
+controlledvocabulary.language.sihan=Sihan
+controlledvocabulary.language.sihuas_ancash_quechua=Sihuas Ancash Quechua
+controlledvocabulary.language.sika=Sika
+controlledvocabulary.language.sikaiana=Sikaiana
+controlledvocabulary.language.sikaritai=Sikaritai
+controlledvocabulary.language.sikiana=Sikiana
+controlledvocabulary.language.sikkimese=Sikkimese
+controlledvocabulary.language.siksika=Siksika
+controlledvocabulary.language.sikule=Sikule
+controlledvocabulary.language.sila=Sila
+controlledvocabulary.language.silacayoapan_mixtec=Silacayoapan Mixtec
+controlledvocabulary.language.sileibi=Sileibi
+controlledvocabulary.language.silesian=Silesian
+controlledvocabulary.language.silimo=Silimo
+controlledvocabulary.language.siliput=Siliput
+controlledvocabulary.language.silopi=Silopi
+controlledvocabulary.language.silt'e=Silt'e
+controlledvocabulary.language.simaa=Simaa
+controlledvocabulary.language.simba=Simba
+controlledvocabulary.language.simbali=Simbali
+controlledvocabulary.language.simbari=Simbari
+controlledvocabulary.language.simbo=Simbo
+controlledvocabulary.language.simeku=Simeku
+controlledvocabulary.language.simeulue=Simeulue
+controlledvocabulary.language.simte=Simte
+controlledvocabulary.language.sinagen=Sinagen
+controlledvocabulary.language.sinasina=Sinasina
+controlledvocabulary.language.sinaugoro=Sinaugoro
+controlledvocabulary.language.sindarin=Sindarin
+controlledvocabulary.language.sindhi=Sindhi
+controlledvocabulary.language.sindhi_bhil=Sindhi Bhil
+controlledvocabulary.language.sindihui_mixtec=Sindihui Mixtec
+controlledvocabulary.language.singa=Singa
+controlledvocabulary.language.singapore_sign_language=Singapore Sign Language
+controlledvocabulary.language.singpho=Singpho
 controlledvocabulary.language.sinhala,_sinhalese=Sinhala, Sinhalese
+controlledvocabulary.language.sinicahua_mixtec=Sinicahua Mixtec
+controlledvocabulary.language.sininkere=Sininkere
+controlledvocabulary.language.sinte_romani=Sinte Romani
+controlledvocabulary.language.sinyar=Sinyar
+controlledvocabulary.language.sio=Sio
+controlledvocabulary.language.siona=Siona
+controlledvocabulary.language.sipacapense=Sipacapense
+controlledvocabulary.language.sira=Sira
+controlledvocabulary.language.siraya=Siraya
+controlledvocabulary.language.sirenik_yupik=Sirenik Yupik
+controlledvocabulary.language.siri=Siri
+controlledvocabulary.language.siriano=Siriano
+controlledvocabulary.language.siriono=SirionÃŗ
+controlledvocabulary.language.sirmauri=Sirmauri
+controlledvocabulary.language.siroi=Siroi
+controlledvocabulary.language.sissala=Sissala
+controlledvocabulary.language.sissano=Sissano
+controlledvocabulary.language.siuslaw=Siuslaw
+controlledvocabulary.language.sivandi=Sivandi
+controlledvocabulary.language.sivia_sign_language=Sivia Sign Language
+controlledvocabulary.language.siwai=Siwai
+controlledvocabulary.language.siwi=Siwi
+controlledvocabulary.language.siwu=Siwu
+controlledvocabulary.language.siyin_chin=Siyin Chin
+controlledvocabulary.language.skagit=Skagit
+controlledvocabulary.language.skalvian=Skalvian
+controlledvocabulary.language.skepi_creole_dutch=Skepi Creole Dutch
+controlledvocabulary.language.skolt_sami=Skolt Sami
+controlledvocabulary.language.skou=Skou
+controlledvocabulary.language.slave_(athapascan)=Slave (Athapascan)
+controlledvocabulary.language.slavomolisano=Slavomolisano
 controlledvocabulary.language.slovak=Slovak
-controlledvocabulary.language.slovene=Slovene
+controlledvocabulary.language.slovakian_sign_language=Slovakian Sign Language
+controlledvocabulary.language.slovenian=Slovenian, Slovene
+controlledvocabulary.language.small_flowery_miao=Small Flowery Miao
+controlledvocabulary.language.smarky_kanum=Smärky Kanum
+controlledvocabulary.language.snohomish=Snohomish
+controlledvocabulary.language.so_(democratic_republic_of_congo)=So (Democratic Republic of Congo)
+controlledvocabulary.language.so'a=So'a
+controlledvocabulary.language.sobei=Sobei
+controlledvocabulary.language.sochiapam_chinantec=Sochiapam Chinantec
+controlledvocabulary.language.soga=Soga
+controlledvocabulary.language.sogdian=Sogdian
+controlledvocabulary.language.soi=Soi
+controlledvocabulary.language.sokoro=Sokoro
+controlledvocabulary.language.solano=Solano
+controlledvocabulary.language.soli=Soli
+controlledvocabulary.language.solomon_islands_sign_language=Solomon Islands Sign Language
+controlledvocabulary.language.solong=Solong
+controlledvocabulary.language.solos=Solos
+controlledvocabulary.language.som=Som
 controlledvocabulary.language.somali=Somali
+controlledvocabulary.language.somba-siawari=Somba-Siawari
+controlledvocabulary.language.somrai=Somrai
+controlledvocabulary.language.somray=Somray
+controlledvocabulary.language.somyev=Somyev
+controlledvocabulary.language.sonaga=Sonaga
+controlledvocabulary.language.sonde=Sonde
+controlledvocabulary.language.songe=Songe
+controlledvocabulary.language.songlai_chin=Songlai Chin
+controlledvocabulary.language.songo=Songo
+controlledvocabulary.language.songomeno=Songomeno
+controlledvocabulary.language.songoora=Songoora
+controlledvocabulary.language.sonha=Sonha
+controlledvocabulary.language.sonia=Sonia
+controlledvocabulary.language.soninke=Soninke
+controlledvocabulary.language.sonsorol=Sonsorol
+controlledvocabulary.language.soo=Soo
+controlledvocabulary.language.sop=Sop
+controlledvocabulary.language.soqotri=Soqotri
+controlledvocabulary.language.sora=Sora
+controlledvocabulary.language.sori-harengan=Sori-Harengan
+controlledvocabulary.language.sorkhei=Sorkhei
+controlledvocabulary.language.sorothaptic=Sorothaptic
+controlledvocabulary.language.sorsogon_ayta=Sorsogon Ayta
+controlledvocabulary.language.sos_kundi=Sos Kundi
+controlledvocabulary.language.sota_kanum=Sota Kanum
+controlledvocabulary.language.sou=Sou
+controlledvocabulary.language.sou_nama=Sou Nama
+controlledvocabulary.language.sou_upaa=Sou Upaa
+controlledvocabulary.language.south_african_sign_language=South African Sign Language
+controlledvocabulary.language.south_awyu=South Awyu
+controlledvocabulary.language.south_azerbaijani=South Azerbaijani
+controlledvocabulary.language.south_bolivian_quechua=South Bolivian Quechua
+controlledvocabulary.language.south_central_banda=South Central Banda
+controlledvocabulary.language.south_central_dinka=South Central Dinka
+controlledvocabulary.language.south_efate=South Efate
+controlledvocabulary.language.south_fali=South Fali
+controlledvocabulary.language.south_giziga=South Giziga
+controlledvocabulary.language.south_lembata=South Lembata
+controlledvocabulary.language.south_marquesan=South Marquesan
+controlledvocabulary.language.south_muyu=South Muyu
+controlledvocabulary.language.southern_ndebele=South Ndebele, Southern Ndebele
+controlledvocabulary.language.south_nuaulu=South Nuaulu
+controlledvocabulary.language.south_picene=South Picene
+controlledvocabulary.language.south_slavey=South Slavey
+controlledvocabulary.language.south_tairora=South Tairora
+controlledvocabulary.language.south_ucayali_asheninka=South Ucayali AshÊninka
+controlledvocabulary.language.south_watut=South Watut
+controlledvocabulary.language.south_west_bay=South West Bay
+controlledvocabulary.language.southeast_ambrym=Southeast Ambrym
+controlledvocabulary.language.southeast_babar=Southeast Babar
+controlledvocabulary.language.southeast_ijo=Southeast Ijo
+controlledvocabulary.language.southeast_pashai=Southeast Pashai
+controlledvocabulary.language.southeast_tasmanian=Southeast Tasmanian
+controlledvocabulary.language.southeastern_dinka=Southeastern Dinka
+controlledvocabulary.language.southeastern_ixtlan_zapotec=Southeastern IxtlÃĄn Zapotec
+controlledvocabulary.language.southeastern_kolami=Southeastern Kolami
+controlledvocabulary.language.southeastern_nochixtlan_mixtec=Southeastern NochixtlÃĄn Mixtec
+controlledvocabulary.language.southeastern_pomo=Southeastern Pomo
+controlledvocabulary.language.southeastern_puebla_nahuatl=Southeastern Puebla Nahuatl
+controlledvocabulary.language.southeastern_tarahumara=Southeastern Tarahumara
+controlledvocabulary.language.southeastern_tepehuan=Southeastern Tepehuan
+controlledvocabulary.language.southern_alta=Southern Alta
+controlledvocabulary.language.southern_altai=Southern Altai
+controlledvocabulary.language.southern_amami-oshima=Southern Amami-Oshima
+controlledvocabulary.language.southern_aymara=Southern Aymara
+controlledvocabulary.language.southern_bai=Southern Bai
+controlledvocabulary.language.southern_balochi=Southern Balochi
+controlledvocabulary.language.southern_betsimisaraka_malagasy=Southern Betsimisaraka Malagasy
+controlledvocabulary.language.southern_binukidnon=Southern Binukidnon
+controlledvocabulary.language.southern_birifor=Southern Birifor
+controlledvocabulary.language.southern_bobo_madare=Southern Bobo MadarÊ
+controlledvocabulary.language.southern_bontok=Southern Bontok
+controlledvocabulary.language.southern_carrier=Southern Carrier
+controlledvocabulary.language.southern_catanduanes_bikol=Southern Catanduanes Bikol
+controlledvocabulary.language.southern_conchucos_ancash_quechua=Southern Conchucos Ancash Quechua
+controlledvocabulary.language.southern_dagaare=Southern Dagaare
+controlledvocabulary.language.southern_dong=Southern Dong
+controlledvocabulary.language.southern_east_cree=Southern East Cree
+controlledvocabulary.language.southern_ghale=Southern Ghale
+controlledvocabulary.language.southern_grebo=Southern Grebo
+controlledvocabulary.language.southern_guiyang_hmong=Southern Guiyang Hmong
+controlledvocabulary.language.southern_haida=Southern Haida
+controlledvocabulary.language.southern_hindko=Southern Hindko
+controlledvocabulary.language.southern_kalapuya=Southern Kalapuya
+controlledvocabulary.language.southern_kalinga=Southern Kalinga
+controlledvocabulary.language.southern_katang=Southern Katang
+controlledvocabulary.language.southern_kisi=Southern Kisi
+controlledvocabulary.language.southern_kiwai=Southern Kiwai
+controlledvocabulary.language.southern_kurdish=Southern Kurdish
+controlledvocabulary.language.southern_lolopo=Southern Lolopo
+controlledvocabulary.language.southern_luri=Southern Luri
+controlledvocabulary.language.southern_ma'di=Southern Ma'di
+controlledvocabulary.language.southern_mashan_hmong=Southern Mashan Hmong
+controlledvocabulary.language.southern_mnong=Southern Mnong
+controlledvocabulary.language.southern_muji=Southern Muji
+controlledvocabulary.language.southern_nago=Southern Nago
+controlledvocabulary.language.southern_nambikuara=Southern NambikuÃĄra
+controlledvocabulary.language.southern_ngbandi=Southern Ngbandi
+controlledvocabulary.language.southern_nicobarese=Southern Nicobarese
+controlledvocabulary.language.southern_nisu=Southern Nisu
+controlledvocabulary.language.southern_nuni=Southern Nuni
+controlledvocabulary.language.southern_ohlone=Southern Ohlone
+controlledvocabulary.language.southern_one=Southern One
+controlledvocabulary.language.southern_pame=Southern Pame
+controlledvocabulary.language.southern_pashto=Southern Pashto
+controlledvocabulary.language.southern_pastaza_quechua=Southern Pastaza Quechua
+controlledvocabulary.language.southern_ping_chinese=Southern Ping Chinese
+controlledvocabulary.language.southern_pomo=Southern Pomo
+controlledvocabulary.language.southern_puebla_mixtec=Southern Puebla Mixtec
+controlledvocabulary.language.southern_puget_sound_salish=Southern Puget Sound Salish
+controlledvocabulary.language.southern_pumi=Southern Pumi
+controlledvocabulary.language.southern_qiandong_miao=Southern Qiandong Miao
+controlledvocabulary.language.southern_qiang=Southern Qiang
+controlledvocabulary.language.southern_rengma_naga=Southern Rengma Naga
+controlledvocabulary.language.southern_rincon_zapotec=Southern Rincon Zapotec
+controlledvocabulary.language.southern_roglai=Southern Roglai
+controlledvocabulary.language.southern_sama=Southern Sama
+controlledvocabulary.language.southern_sami=Southern Sami
+controlledvocabulary.language.southern_samo=Southern Samo
+controlledvocabulary.language.southern_sierra_miwok=Southern Sierra Miwok
+controlledvocabulary.language.southern_sorsoganon=Southern Sorsoganon
 controlledvocabulary.language.southern_sotho=Southern Sotho
-controlledvocabulary.language.spanish,_castilian=Spanish, Castilian
+controlledvocabulary.language.southern_subanen=Southern Subanen
+controlledvocabulary.language.southern_thai=Southern Thai
+controlledvocabulary.language.southern_tidung=Southern Tidung
+controlledvocabulary.language.southern_tiwa=Southern Tiwa
+controlledvocabulary.language.southern_toussian=Southern Toussian
+controlledvocabulary.language.southern_tujia=Southern Tujia
+controlledvocabulary.language.southern_tutchone=Southern Tutchone
+controlledvocabulary.language.southern_uzbek=Southern Uzbek
+controlledvocabulary.language.southern_yamphu=Southern Yamphu
+controlledvocabulary.language.southern_yukaghir=Southern Yukaghir
+controlledvocabulary.language.southwest_gbaya=Southwest Gbaya
+controlledvocabulary.language.southwest_palawano=Southwest Palawano
+controlledvocabulary.language.southwest_pashai=Southwest Pashai
+controlledvocabulary.language.southwest_tanna=Southwest Tanna
+controlledvocabulary.language.southwestern_bontok=Southwestern Bontok
+controlledvocabulary.language.southwestern_dinka=Southwestern Dinka
+controlledvocabulary.language.southwestern_fars=Southwestern Fars
+controlledvocabulary.language.southwestern_guiyang_hmong=Southwestern Guiyang Hmong
+controlledvocabulary.language.southwestern_huishui_hmong=Southwestern Huishui Hmong
+controlledvocabulary.language.southwestern_nisu=Southwestern Nisu
+controlledvocabulary.language.southwestern_tarahumara=Southwestern Tarahumara
+controlledvocabulary.language.southwestern_tasmanian=Southwestern Tasmanian
+controlledvocabulary.language.southwestern_tepehuan=Southwestern Tepehuan
+controlledvocabulary.language.southwestern_tlaxiaco_mixtec=Southwestern Tlaxiaco Mixtec
+controlledvocabulary.language.sowa=Sowa
+controlledvocabulary.language.sowanda=Sowanda
+controlledvocabulary.language.soyaltepec_mazatec=Soyaltepec Mazatec
+controlledvocabulary.language.soyaltepec_mixtec=Soyaltepec Mixtec
+controlledvocabulary.language.spanish_sign_language=Spanish Sign Language
+controlledvocabulary.language.spiti_bhoti=Spiti Bhoti
+controlledvocabulary.language.spokane=Spokane
+controlledvocabulary.language.squamish=Squamish
+controlledvocabulary.language.sranan_tongo=Sranan Tongo
+controlledvocabulary.language.sri_lankan_creole_malay=Sri Lankan Creole Malay
+controlledvocabulary.language.sri_lankan_sign_language=Sri Lankan Sign Language
+controlledvocabulary.language.standard_arabic=Standard Arabic
+controlledvocabulary.language.standard_estonian=Standard Estonian
+controlledvocabulary.language.standard_latvian=Standard Latvian
+controlledvocabulary.language.standard_malay=Standard Malay
+controlledvocabulary.language.standard_moroccan_tamazight=Standard Moroccan Tamazight
+controlledvocabulary.language.stellingwerfs=Stellingwerfs
+controlledvocabulary.language.stod_bhoti=Stod Bhoti
+controlledvocabulary.language.stoney=Stoney
+controlledvocabulary.language.straits_salish=Straits Salish
+controlledvocabulary.language.suabo=Suabo
+controlledvocabulary.language.suarmin=Suarmin
+controlledvocabulary.language.suau=Suau
+controlledvocabulary.language.suba=Suba
+controlledvocabulary.language.suba-simbiti=Suba-Simbiti
+controlledvocabulary.language.subi=Subi
+controlledvocabulary.language.subiya=Subiya
+controlledvocabulary.language.subtiaba=Subtiaba
+controlledvocabulary.language.sudanese_arabic=Sudanese Arabic
+controlledvocabulary.language.sudanese_creole_arabic=Sudanese Creole Arabic
+controlledvocabulary.language.sudest=Sudest
+controlledvocabulary.language.sudovian=Sudovian
+controlledvocabulary.language.suena=Suena
+controlledvocabulary.language.suga=Suga
+controlledvocabulary.language.suganga=Suganga
+controlledvocabulary.language.sugut_dusun=Sugut Dusun
+controlledvocabulary.language.sui=Sui
+controlledvocabulary.language.suki=Suki
+controlledvocabulary.language.suku=Suku
+controlledvocabulary.language.sukuma=Sukuma
+controlledvocabulary.language.sukur=Sukur
+controlledvocabulary.language.sukurum=Sukurum
+controlledvocabulary.language.sula=Sula
+controlledvocabulary.language.sulka=Sulka
+controlledvocabulary.language.sulod=Sulod
+controlledvocabulary.language.suma=Suma
+controlledvocabulary.language.sumariup=Sumariup
+controlledvocabulary.language.sumau=Sumau
+controlledvocabulary.language.sumbawa=Sumbawa
+controlledvocabulary.language.sumbwa=Sumbwa
+controlledvocabulary.language.sumerian=Sumerian
+controlledvocabulary.language.sumi_naga=Sumi Naga
+controlledvocabulary.language.sumtu_chin=Sumtu Chin
+controlledvocabulary.language.sunam=Sunam
 controlledvocabulary.language.sundanese=Sundanese
-controlledvocabulary.language.swahili=Swahili
+controlledvocabulary.language.sunwar=Sunwar
+controlledvocabulary.language.suoy=Suoy
+controlledvocabulary.language.supyire_senoufo=Supyire Senoufo
+controlledvocabulary.language.sur=Sur
+controlledvocabulary.language.surbakhal=Surbakhal
+controlledvocabulary.language.surgujia=Surgujia
+controlledvocabulary.language.surigaonon=Surigaonon
+controlledvocabulary.language.surjapuri=Surjapuri
+controlledvocabulary.language.sursurunga=Sursurunga
+controlledvocabulary.language.suruaha=SuruahÃĄ
+controlledvocabulary.language.surubu=Surubu
+controlledvocabulary.language.surui=Suruí
+controlledvocabulary.language.surui_do_para=Suruí Do ParÃĄ
+controlledvocabulary.language.susquehannock=Susquehannock
+controlledvocabulary.language.susu=Susu
+controlledvocabulary.language.susuami=Susuami
+controlledvocabulary.language.suundi=Suundi
+controlledvocabulary.language.suwawa=Suwawa
+controlledvocabulary.language.suya=SuyÃĄ
+controlledvocabulary.language.svan=Svan
+controlledvocabulary.language.swabian=Swabian
+controlledvocabulary.language.swahili_(individual_language)=Swahili (individual language)
+controlledvocabulary.language.swahili=Swahili, Swahili (macrolanguage)
+controlledvocabulary.language.swampy_cree=Swampy Cree
 controlledvocabulary.language.swati=Swati
 controlledvocabulary.language.swedish=Swedish
+controlledvocabulary.language.swedish_sign_language=Swedish Sign Language
+controlledvocabulary.language.swiss_german=Swiss German
+controlledvocabulary.language.swiss-french_sign_language=Swiss-French Sign Language
+controlledvocabulary.language.swiss-german_sign_language=Swiss-German Sign Language
+controlledvocabulary.language.swiss-italian_sign_language=Swiss-Italian Sign Language
+controlledvocabulary.language.swo=Swo
+controlledvocabulary.language.syenara_senoufo=Syenara Senoufo
+controlledvocabulary.language.sylheti=Sylheti
+controlledvocabulary.language.syriac=Syriac
+controlledvocabulary.language.sao_paulo_kaingang=SÃŖo Paulo KaingÃĄng
+controlledvocabulary.language.saotomense=SÃŖotomense
+controlledvocabulary.language.sicite_senoufo=SÃŦcÃŦtÊ SÊnoufo
+controlledvocabulary.language.so=Sô
+controlledvocabulary.language.t'apo=T'apo
+controlledvocabulary.language.t'en=T'en
+controlledvocabulary.language.ta'izzi-adeni_arabic=Ta'izzi-Adeni Arabic
+controlledvocabulary.language.taabwa=Taabwa
+controlledvocabulary.language.tabaa_zapotec=Tabaa Zapotec
+controlledvocabulary.language.tabaru=Tabaru
+controlledvocabulary.language.tabasco_chontal=Tabasco Chontal
+controlledvocabulary.language.tabasco_nahuatl=Tabasco Nahuatl
+controlledvocabulary.language.tabasco_zoque=Tabasco Zoque
+controlledvocabulary.language.tabassaran=Tabassaran
+controlledvocabulary.language.tabla=Tabla
+controlledvocabulary.language.tabo=Tabo
+controlledvocabulary.language.tabriak=Tabriak
+controlledvocabulary.language.tacahua_mixtec=Tacahua Mixtec
+controlledvocabulary.language.tacana=Tacana
+controlledvocabulary.language.tachawit=Tachawit
+controlledvocabulary.language.tachelhit=Tachelhit
+controlledvocabulary.language.tachoni=Tachoni
+controlledvocabulary.language.tadaksahak=Tadaksahak
+controlledvocabulary.language.tado=Tado
+controlledvocabulary.language.tadyawan=Tadyawan
+controlledvocabulary.language.tae'=Tae'
+controlledvocabulary.language.tafi=Tafi
+controlledvocabulary.language.tagabawa=Tagabawa
+controlledvocabulary.language.tagakaulo=Tagakaulo
+controlledvocabulary.language.tagal_murut=Tagal Murut
+controlledvocabulary.language.tagalaka=Tagalaka
+controlledvocabulary.language.tagalog=Tagalog
+controlledvocabulary.language.tagargrent=Tagargrent
+controlledvocabulary.language.tagbanwa=Tagbanwa
+controlledvocabulary.language.tagbu=Tagbu
+controlledvocabulary.language.tagdal=Tagdal
+controlledvocabulary.language.tagin=Tagin
+controlledvocabulary.language.tagish=Tagish
+controlledvocabulary.language.tagoi=Tagoi
+controlledvocabulary.language.tagwana_senoufo=Tagwana Senoufo
+controlledvocabulary.language.tahaggart_tamahaq=Tahaggart Tamahaq
+controlledvocabulary.language.tahitian=Tahitian
+controlledvocabulary.language.tahltan=Tahltan
+controlledvocabulary.language.tai=Tai
+controlledvocabulary.language.tai_daeng=Tai Daeng
+controlledvocabulary.language.tai_dam=Tai Dam
+controlledvocabulary.language.tai_do=Tai Do
+controlledvocabulary.language.tai_don=Tai DÃŗn
+controlledvocabulary.language.tai_hongjin=Tai Hongjin
+controlledvocabulary.language.tai_laing=Tai Laing
+controlledvocabulary.language.tai_loi=Tai Loi
+controlledvocabulary.language.tai_long=Tai Long
+controlledvocabulary.language.tai_nua=Tai NÃŧa
+controlledvocabulary.language.tai_pao=Tai Pao
+controlledvocabulary.language.tai_thanh=Tai Thanh
+controlledvocabulary.language.tai_ya=Tai Ya
+controlledvocabulary.language.taiap=Taiap
+controlledvocabulary.language.taikat=Taikat
+controlledvocabulary.language.tainae=Tainae
+controlledvocabulary.language.taino=Taino
+controlledvocabulary.language.tairaha=Tairaha
+controlledvocabulary.language.tairuma=Tairuma
+controlledvocabulary.language.taita=Taita
+controlledvocabulary.language.taivoan=Taivoan
+controlledvocabulary.language.taiwan_sign_language=Taiwan Sign Language
+controlledvocabulary.language.taje=Taje
+controlledvocabulary.language.tajik=Tajik
+controlledvocabulary.language.tajiki_arabic=Tajiki Arabic
+controlledvocabulary.language.tajio=Tajio
+controlledvocabulary.language.tajuasohn=Tajuasohn
+controlledvocabulary.language.takelma=Takelma
+controlledvocabulary.language.takestani=Takestani
+controlledvocabulary.language.takia=Takia
+controlledvocabulary.language.takua=Takua
+controlledvocabulary.language.takuu=Takuu
+controlledvocabulary.language.takwane=Takwane
+controlledvocabulary.language.tal=Tal
+controlledvocabulary.language.tala=Tala
+controlledvocabulary.language.talaud=Talaud
+controlledvocabulary.language.taliabu=Taliabu
+controlledvocabulary.language.talieng=Talieng
+controlledvocabulary.language.talinga-bwisi=Talinga-Bwisi
+controlledvocabulary.language.talise=Talise
+controlledvocabulary.language.talodi=Talodi
+controlledvocabulary.language.taloki=Taloki
+controlledvocabulary.language.talondo'=Talondo'
+controlledvocabulary.language.talossan=Talossan
+controlledvocabulary.language.talu=Talu
+controlledvocabulary.language.talysh=Talysh
+controlledvocabulary.language.tama_(chad)=Tama (Chad)
+controlledvocabulary.language.tama_(colombia)=Tama (Colombia)
+controlledvocabulary.language.tamagario=Tamagario
+controlledvocabulary.language.taman_(indonesia)=Taman (Indonesia)
+controlledvocabulary.language.taman_(myanmar)=Taman (Myanmar)
+controlledvocabulary.language.tamanaku=Tamanaku
+controlledvocabulary.language.tamashek=Tamashek
+controlledvocabulary.language.tamasheq=Tamasheq
+controlledvocabulary.language.tamazola_mixtec=Tamazola Mixtec
+controlledvocabulary.language.tambas=Tambas
+controlledvocabulary.language.tambora=Tambora
+controlledvocabulary.language.tambotalo=Tambotalo
+controlledvocabulary.language.tami=Tami
 controlledvocabulary.language.tamil=Tamil
+controlledvocabulary.language.tamki=Tamki
+controlledvocabulary.language.tamnim_citak=Tamnim Citak
+controlledvocabulary.language.tampias_lobu=Tampias Lobu
+controlledvocabulary.language.tampuan=Tampuan
+controlledvocabulary.language.tampulma=Tampulma
+controlledvocabulary.language.tanacross=Tanacross
+controlledvocabulary.language.tanahmerah=Tanahmerah
+controlledvocabulary.language.tanaina=Tanaina
+controlledvocabulary.language.tanapag=Tanapag
+controlledvocabulary.language.tandaganon=Tandaganon
+controlledvocabulary.language.tandia=Tandia
+controlledvocabulary.language.tandroy-mahafaly_malagasy=Tandroy-Mahafaly Malagasy
+controlledvocabulary.language.tanema=Tanema
+controlledvocabulary.language.tangale=Tangale
+controlledvocabulary.language.tangchangya=Tangchangya
+controlledvocabulary.language.tanggu=Tanggu
+controlledvocabulary.language.tangkhul_naga_(india)=Tangkhul Naga (India)
+controlledvocabulary.language.tangkhul_naga_(myanmar)=Tangkhul Naga (Myanmar)
+controlledvocabulary.language.tangko=Tangko
+controlledvocabulary.language.tanglang=Tanglang
+controlledvocabulary.language.tangoa=Tangoa
+controlledvocabulary.language.tanguat=Tanguat
+controlledvocabulary.language.tangut=Tangut
+controlledvocabulary.language.tanimbili=Tanimbili
+controlledvocabulary.language.tanimuca-retuara=Tanimuca-RetuarÃŖ
+controlledvocabulary.language.tanjijili=Tanjijili
+controlledvocabulary.language.tanosy_malagasy=Tanosy Malagasy
+controlledvocabulary.language.tanudan_kalinga=Tanudan Kalinga
+controlledvocabulary.language.tanzanian_sign_language=Tanzanian Sign Language
+controlledvocabulary.language.tapei=Tapei
+controlledvocabulary.language.tapiete=TapietÊ
+controlledvocabulary.language.tapirape=TapirapÊ
+controlledvocabulary.language.tarao_naga=Tarao Naga
+controlledvocabulary.language.tareng=Tareng
+controlledvocabulary.language.tariana=Tariana
+controlledvocabulary.language.tarifit=Tarifit
+controlledvocabulary.language.tarjumo=Tarjumo
+controlledvocabulary.language.tarok=Tarok
+controlledvocabulary.language.tarpia=Tarpia
+controlledvocabulary.language.tartessian=Tartessian
+controlledvocabulary.language.taruma=Taruma
+controlledvocabulary.language.tasawaq=Tasawaq
+controlledvocabulary.language.tase_naga=Tase Naga
+controlledvocabulary.language.tasmate=Tasmate
+controlledvocabulary.language.tataltepec_chatino=Tataltepec Chatino
+controlledvocabulary.language.tatana=Tatana
+controlledvocabulary.language.tatar=Tatar
+controlledvocabulary.language.tatuyo=Tatuyo
+controlledvocabulary.language.tauade=Tauade
+controlledvocabulary.language.taulil=Taulil
+controlledvocabulary.language.taungyo=Taungyo
+controlledvocabulary.language.taupota=Taupota
+controlledvocabulary.language.tause=Tause
+controlledvocabulary.language.taushiro=Taushiro
+controlledvocabulary.language.tausug=Tausug
+controlledvocabulary.language.tauya=Tauya
+controlledvocabulary.language.taveta=Taveta
+controlledvocabulary.language.tavoyan=Tavoyan
+controlledvocabulary.language.tavringer_romani=Tavringer Romani
+controlledvocabulary.language.tawala=Tawala
+controlledvocabulary.language.tawallammat_tamajaq=Tawallammat Tamajaq
+controlledvocabulary.language.tawande=TawandÃĒ
+controlledvocabulary.language.tawang_monpa=Tawang Monpa
+controlledvocabulary.language.tawara=Tawara
+controlledvocabulary.language.taworta=Taworta
+controlledvocabulary.language.tawoyan=Tawoyan
+controlledvocabulary.language.tawr_chin=Tawr Chin
+controlledvocabulary.language.tay_boi=Tay Boi
+controlledvocabulary.language.tay_khang=Tay Khang
+controlledvocabulary.language.tayart_tamajeq=Tayart Tamajeq
+controlledvocabulary.language.tayo=Tayo
+controlledvocabulary.language.taznatit=Taznatit
+controlledvocabulary.language.tboli=Tboli
+controlledvocabulary.language.tchitchege=Tchitchege
+controlledvocabulary.language.tchumbuli=Tchumbuli
+controlledvocabulary.language.te'un=Te'un
+controlledvocabulary.language.teanu=Teanu
+controlledvocabulary.language.tebul_sign_language=Tebul Sign Language
+controlledvocabulary.language.tebul_ure_dogon=Tebul Ure Dogon
+controlledvocabulary.language.tecpatlan_totonac=TecpatlÃĄn Totonac
+controlledvocabulary.language.tedaga=Tedaga
+controlledvocabulary.language.tedim_chin=Tedim Chin
+controlledvocabulary.language.tee=Tee
+controlledvocabulary.language.tefaro=Tefaro
+controlledvocabulary.language.tegali=Tegali
+controlledvocabulary.language.tehit=Tehit
+controlledvocabulary.language.tehuelche=Tehuelche
+controlledvocabulary.language.tejalapan_zapotec=Tejalapan Zapotec
+controlledvocabulary.language.teke-ebo=Teke-Ebo
+controlledvocabulary.language.teke-fuumu=Teke-Fuumu
+controlledvocabulary.language.teke-kukuya=Teke-Kukuya
+controlledvocabulary.language.teke-laali=Teke-Laali
+controlledvocabulary.language.teke-nzikou=Teke-Nzikou
+controlledvocabulary.language.teke-tege=Teke-Tege
+controlledvocabulary.language.teke-tsaayi=Teke-Tsaayi
+controlledvocabulary.language.teke-tyee=Teke-Tyee
+controlledvocabulary.language.tektiteko=Tektiteko
+controlledvocabulary.language.tela-masbuar=Tela-Masbuar
+controlledvocabulary.language.telefol=Telefol
 controlledvocabulary.language.telugu=Telugu
-controlledvocabulary.language.tajik=Tajik
+controlledvocabulary.language.tem=Tem
+controlledvocabulary.language.temacine_tamazight=Temacine Tamazight
+controlledvocabulary.language.temascaltepec_nahuatl=Temascaltepec Nahuatl
+controlledvocabulary.language.tembo_(kitembo)=Tembo (Kitembo)
+controlledvocabulary.language.tembo_(motembo)=Tembo (Motembo)
+controlledvocabulary.language.tembe=TembÊ
+controlledvocabulary.language.teme=Teme
+controlledvocabulary.language.temein=Temein
+controlledvocabulary.language.temi=Temi
+controlledvocabulary.language.temiar=Temiar
+controlledvocabulary.language.temoaya_otomi=Temoaya Otomi
+controlledvocabulary.language.temoq=Temoq
+controlledvocabulary.language.temuan=Temuan
+controlledvocabulary.language.ten'edn=Ten'edn
+controlledvocabulary.language.tena_lowland_quichua=Tena Lowland Quichua
+controlledvocabulary.language.tenango_otomi=Tenango Otomi
+controlledvocabulary.language.tene_kan_dogon=Tene Kan Dogon
+controlledvocabulary.language.tenggarong_kutai_malay=Tenggarong Kutai Malay
+controlledvocabulary.language.tengger=Tengger
+controlledvocabulary.language.tenharim=Tenharim
+controlledvocabulary.language.tenino=Tenino
+controlledvocabulary.language.tenis=Tenis
+controlledvocabulary.language.tennet=Tennet
+controlledvocabulary.language.teop=Teop
+controlledvocabulary.language.teor=Teor
+controlledvocabulary.language.tepecano=Tepecano
+controlledvocabulary.language.tepetotutla_chinantec=Tepetotutla Chinantec
+controlledvocabulary.language.tepeuxila_cuicatec=Tepeuxila Cuicatec
+controlledvocabulary.language.tepinapa_chinantec=Tepinapa Chinantec
+controlledvocabulary.language.tepo_krumen=Tepo Krumen
+controlledvocabulary.language.ter_sami=Ter Sami
+controlledvocabulary.language.tera=Tera
+controlledvocabulary.language.terebu=Terebu
+controlledvocabulary.language.terei=Terei
+controlledvocabulary.language.tereno=Tereno
+controlledvocabulary.language.teressa=Teressa
+controlledvocabulary.language.tereweng=Tereweng
+controlledvocabulary.language.teribe=Teribe
+controlledvocabulary.language.terik=Terik
+controlledvocabulary.language.termanu=Termanu
+controlledvocabulary.language.ternate=Ternate
+controlledvocabulary.language.ternateno=TernateÃąo
+controlledvocabulary.language.tesaka_malagasy=Tesaka Malagasy
+controlledvocabulary.language.tese=Tese
+controlledvocabulary.language.teshenawa=Teshenawa
+controlledvocabulary.language.teso=Teso
+controlledvocabulary.language.tetela=Tetela
+controlledvocabulary.language.tetelcingo_nahuatl=Tetelcingo Nahuatl
+controlledvocabulary.language.tetete=Tetete
+controlledvocabulary.language.tetserret=Tetserret
+controlledvocabulary.language.tetum=Tetum
+controlledvocabulary.language.tetun_dili=Tetun Dili
+controlledvocabulary.language.teutila_cuicatec=Teutila Cuicatec
+controlledvocabulary.language.tewa_(indonesia)=Tewa (Indonesia)
+controlledvocabulary.language.tewa_(usa)=Tewa (USA)
+controlledvocabulary.language.tewe=Tewe
+controlledvocabulary.language.texcatepec_otomi=Texcatepec Otomi
+controlledvocabulary.language.texistepec_popoluca=Texistepec Popoluca
+controlledvocabulary.language.texmelucan_zapotec=Texmelucan Zapotec
+controlledvocabulary.language.tezoatlan_mixtec=TezoatlÃĄn Mixtec
+controlledvocabulary.language.tha=Tha
+controlledvocabulary.language.thachanadan=Thachanadan
+controlledvocabulary.language.thado_chin=Thado Chin
 controlledvocabulary.language.thai=Thai
+controlledvocabulary.language.thai_sign_language=Thai Sign Language
+controlledvocabulary.language.thai_song=Thai Song
+controlledvocabulary.language.thaiphum_chin=Thaiphum Chin
+controlledvocabulary.language.thakali=Thakali
+controlledvocabulary.language.thangal_naga=Thangal Naga
+controlledvocabulary.language.thangmi=Thangmi
+controlledvocabulary.language.thao=Thao
+controlledvocabulary.language.tharaka=Tharaka
+controlledvocabulary.language.thawa=Thawa
+controlledvocabulary.language.thaypan=Thaypan
+controlledvocabulary.language.thiin=Thiin
+controlledvocabulary.language.tho=Tho
+controlledvocabulary.language.thompson=Thompson
+controlledvocabulary.language.thopho=Thopho
+controlledvocabulary.language.thracian=Thracian
+controlledvocabulary.language.thu_lao=Thu Lao
+controlledvocabulary.language.thulung=Thulung
+controlledvocabulary.language.thur=Thur
+controlledvocabulary.language.thuri=Thuri
+controlledvocabulary.language.tiagbamrin_aizi=Tiagbamrin Aizi
+controlledvocabulary.language.tiale=Tiale
+controlledvocabulary.language.tiang=Tiang
+controlledvocabulary.language.tibea=Tibea
+controlledvocabulary.language.tibetan_sign_language=Tibetan Sign Language
+controlledvocabulary.language.tibetan,_tibetan_standard,_central=Tibetan, Tibetan Standard, Central
+controlledvocabulary.language.tichurong=Tichurong
+controlledvocabulary.language.ticuna=Ticuna
+controlledvocabulary.language.tidaa_mixtec=TidaÃĄ Mixtec
+controlledvocabulary.language.tidikelt_tamazight=Tidikelt Tamazight
+controlledvocabulary.language.tidore=Tidore
+controlledvocabulary.language.tiemacewe_bozo=Tiemacèwè Bozo
+controlledvocabulary.language.tiene=Tiene
+controlledvocabulary.language.tifal=Tifal
+controlledvocabulary.language.tigak=Tigak
+controlledvocabulary.language.tigon_mbembe=Tigon Mbembe
+controlledvocabulary.language.tigre=Tigre
 controlledvocabulary.language.tigrinya=Tigrinya
-controlledvocabulary.language.tibetan_standard,_tibetan,_central=Tibetan Standard, Tibetan, Central
-controlledvocabulary.language.turkmen=Turkmen
-controlledvocabulary.language.tagalog=Tagalog
-controlledvocabulary.language.tswana=Tswana
+controlledvocabulary.language.tii=Tii
+controlledvocabulary.language.tijaltepec_mixtec=Tijaltepec Mixtec
+controlledvocabulary.language.tikar=Tikar
+controlledvocabulary.language.tikopia=Tikopia
+controlledvocabulary.language.tilapa_otomi=Tilapa Otomi
+controlledvocabulary.language.tillamook=Tillamook
+controlledvocabulary.language.tilquiapan_zapotec=Tilquiapan Zapotec
+controlledvocabulary.language.tilung=Tilung
+controlledvocabulary.language.tima=Tima
+controlledvocabulary.language.timbe=Timbe
+controlledvocabulary.language.timne=Timne
+controlledvocabulary.language.timor_pidgin=Timor Pidgin
+controlledvocabulary.language.timucua=Timucua
+controlledvocabulary.language.timugon_murut=Timugon Murut
+controlledvocabulary.language.tinani=Tinani
+controlledvocabulary.language.tindi=Tindi
+controlledvocabulary.language.tingui-boto=Tingui-Boto
+controlledvocabulary.language.tinigua=Tinigua
+controlledvocabulary.language.tinputz=Tinputz
+controlledvocabulary.language.tippera=Tippera
+controlledvocabulary.language.tira=Tira
+controlledvocabulary.language.tirahi=Tirahi
+controlledvocabulary.language.tiranige_diga_dogon=Tiranige Diga Dogon
+controlledvocabulary.language.tiri=Tiri
+controlledvocabulary.language.tirmaga-chai_suri=Tirmaga-Chai Suri
+controlledvocabulary.language.tiruray=Tiruray
+controlledvocabulary.language.tita=Tita
+controlledvocabulary.language.titan=Titan
+controlledvocabulary.language.tiv=Tiv
+controlledvocabulary.language.tiwa=Tiwa
+controlledvocabulary.language.tiwi=Tiwi
+controlledvocabulary.language.tiyaa=Tiyaa
+controlledvocabulary.language.tiefo=TiÊfo
+controlledvocabulary.language.tieyaxo_bozo=TiÊyaxo Bozo
+controlledvocabulary.language.tjungundji=Tjungundji
+controlledvocabulary.language.tjupany=Tjupany
+controlledvocabulary.language.tjurruru=Tjurruru
+controlledvocabulary.language.tlachichilco_tepehua=Tlachichilco Tepehua
+controlledvocabulary.language.tlacoapa_me'phaa=Tlacoapa Me'phaa
+controlledvocabulary.language.tlacoatzintepec_chinantec=Tlacoatzintepec Chinantec
+controlledvocabulary.language.tlacolulita_zapotec=Tlacolulita Zapotec
+controlledvocabulary.language.tlahuitoltepec_mixe=Tlahuitoltepec Mixe
+controlledvocabulary.language.tlamacazapa_nahuatl=Tlamacazapa Nahuatl
+controlledvocabulary.language.tlazoyaltepec_mixtec=Tlazoyaltepec Mixtec
+controlledvocabulary.language.tlicho=Tlicho
+controlledvocabulary.language.tlingit=Tlingit
+controlledvocabulary.language.to=To
+controlledvocabulary.language.to'abaita=To'abaita
+controlledvocabulary.language.toaripi=Toaripi
+controlledvocabulary.language.toba=Toba
+controlledvocabulary.language.toba-maskoy=Toba-Maskoy
+controlledvocabulary.language.tobagonian_creole_english=Tobagonian Creole English
+controlledvocabulary.language.tobanga=Tobanga
+controlledvocabulary.language.tobati=Tobati
+controlledvocabulary.language.tobelo=Tobelo
+controlledvocabulary.language.tobian=Tobian
+controlledvocabulary.language.tobilung=Tobilung
+controlledvocabulary.language.tobo=Tobo
+controlledvocabulary.language.tocantins_asurini=Tocantins Asurini
+controlledvocabulary.language.tocho=Tocho
+controlledvocabulary.language.toda=Toda
+controlledvocabulary.language.todrah=Todrah
+controlledvocabulary.language.tofanma=Tofanma
+controlledvocabulary.language.tofin_gbe=Tofin Gbe
+controlledvocabulary.language.togbo-vara_banda=Togbo-Vara Banda
+controlledvocabulary.language.togoyo=Togoyo
+controlledvocabulary.language.tohono_o'odham=Tohono O'odham
+controlledvocabulary.language.tojolabal=Tojolabal
+controlledvocabulary.language.tok_pisin=Tok Pisin
+controlledvocabulary.language.tokano=Tokano
+controlledvocabulary.language.tokelau=Tokelau
+controlledvocabulary.language.tokharian_a=Tokharian A
+controlledvocabulary.language.tokharian_b=Tokharian B
+controlledvocabulary.language.toki_pona=Toki Pona
+controlledvocabulary.language.toku-no-shima=Toku-No-Shima
+controlledvocabulary.language.tol=Tol
+controlledvocabulary.language.tolaki=Tolaki
+controlledvocabulary.language.tolomako=Tolomako
+controlledvocabulary.language.tolowa=Tolowa
+controlledvocabulary.language.toma=Toma
+controlledvocabulary.language.tomadino=Tomadino
+controlledvocabulary.language.tombelala=Tombelala
+controlledvocabulary.language.tombonuo=Tombonuo
+controlledvocabulary.language.tombulu=Tombulu
+controlledvocabulary.language.tomini=Tomini
+controlledvocabulary.language.tommo_so_dogon=Tommo So Dogon
+controlledvocabulary.language.tomo_kan_dogon=Tomo Kan Dogon
+controlledvocabulary.language.tomoip=Tomoip
+controlledvocabulary.language.tondano=Tondano
+controlledvocabulary.language.tondi_songway_kiini=Tondi Songway Kiini
+controlledvocabulary.language.tonga_(nyasa)=Tonga (Nyasa)
 controlledvocabulary.language.tonga_(tonga_islands)=Tonga (Tonga Islands)
-controlledvocabulary.language.turkish=Turkish
+controlledvocabulary.language.tonga_(zambia)=Tonga (Zambia)
+controlledvocabulary.language.tongwe=Tongwe
+controlledvocabulary.language.tonjon=Tonjon
+controlledvocabulary.language.tonkawa=Tonkawa
+controlledvocabulary.language.tonsawang=Tonsawang
+controlledvocabulary.language.tonsea=Tonsea
+controlledvocabulary.language.tontemboan=Tontemboan
+controlledvocabulary.language.tooro=Tooro
+controlledvocabulary.language.topoiyo=Topoiyo
+controlledvocabulary.language.toposa=Toposa
+controlledvocabulary.language.toraja-sa'dan=Toraja-Sa'dan
+controlledvocabulary.language.toram=Toram
+controlledvocabulary.language.torau=Torau
+controlledvocabulary.language.tornedalen_finnish=Tornedalen Finnish
+controlledvocabulary.language.toro=Toro
+controlledvocabulary.language.toro_so_dogon=Toro So Dogon
+controlledvocabulary.language.toro_tegu_dogon=Toro Tegu Dogon
+controlledvocabulary.language.toromono=Toromono
+controlledvocabulary.language.torona=Torona
+controlledvocabulary.language.torres_strait_creole=Torres Strait Creole
+controlledvocabulary.language.torricelli=Torricelli
+controlledvocabulary.language.torwali=Torwali
+controlledvocabulary.language.tora=TorÃĄ
+controlledvocabulary.language.tosk_albanian=Tosk Albanian
+controlledvocabulary.language.totela=Totela
+controlledvocabulary.language.toto=Toto
+controlledvocabulary.language.totoli=Totoli
+controlledvocabulary.language.totomachapan_zapotec=Totomachapan Zapotec
+controlledvocabulary.language.totontepec_mixe=Totontepec Mixe
+controlledvocabulary.language.totoro=Totoro
+controlledvocabulary.language.touo=Touo
+controlledvocabulary.language.toura_(cote_d'ivoire)=Toura (Côte d'Ivoire)
+controlledvocabulary.language.toura_(papua_new_guinea)=Toura (Papua New Guinea)
+controlledvocabulary.language.towei=Towei
+controlledvocabulary.language.transalpine_gaulish=Transalpine Gaulish
+controlledvocabulary.language.traveller_danish=Traveller Danish
+controlledvocabulary.language.traveller_norwegian=Traveller Norwegian
+controlledvocabulary.language.traveller_scottish=Traveller Scottish
+controlledvocabulary.language.tregami=Tregami
+controlledvocabulary.language.tremembe=TremembÊ
+controlledvocabulary.language.trieng=Trieng
+controlledvocabulary.language.trimuris=Trimuris
+controlledvocabulary.language.tring=Tring
+controlledvocabulary.language.tringgus-sembaan_bidayuh=Tringgus-Sembaan Bidayuh
+controlledvocabulary.language.trinidad_and_tobago_sign_language=Trinidad and Tobago Sign Language
+controlledvocabulary.language.trinidadian_creole_english=Trinidadian Creole English
+controlledvocabulary.language.trinitario=Trinitario
+controlledvocabulary.language.trio=TriÃŗ
+controlledvocabulary.language.truka=TrukÃĄ
+controlledvocabulary.language.trumai=Trumai
+controlledvocabulary.language.ts'un-lao=Ts'Ãŧn-Lao
+controlledvocabulary.language.tsaangi=Tsaangi
+controlledvocabulary.language.tsakhur=Tsakhur
+controlledvocabulary.language.tsakonian=Tsakonian
+controlledvocabulary.language.tsakwambo=Tsakwambo
+controlledvocabulary.language.tsamai=Tsamai
+controlledvocabulary.language.tsat=Tsat
+controlledvocabulary.language.tseku=Tseku
+controlledvocabulary.language.tsetsaut=Tsetsaut
+controlledvocabulary.language.tshangla=Tshangla
+controlledvocabulary.language.tsikimba=Tsikimba
+controlledvocabulary.language.tsimane=TsimanÊ
+controlledvocabulary.language.tsimihety_malagasy=Tsimihety Malagasy
+controlledvocabulary.language.tsimshian=Tsimshian
+controlledvocabulary.language.tsishingini=Tsishingini
+controlledvocabulary.language.tso=Tso
+controlledvocabulary.language.tsoa=Tsoa
+controlledvocabulary.language.tsogo=Tsogo
 controlledvocabulary.language.tsonga=Tsonga
-controlledvocabulary.language.tatar=Tatar
+controlledvocabulary.language.tsotso=Tsotso
+controlledvocabulary.language.tsou=Tsou
+controlledvocabulary.language.tsucuba=Tsucuba
+controlledvocabulary.language.tsum=Tsum
+controlledvocabulary.language.tsuvadi=Tsuvadi
+controlledvocabulary.language.tsuvan=Tsuvan
+controlledvocabulary.language.tswa=Tswa
+controlledvocabulary.language.tswana=Tswana
+controlledvocabulary.language.tswapong=Tswapong
+controlledvocabulary.language.tu=Tu
+controlledvocabulary.language.tuamotuan=Tuamotuan
+controlledvocabulary.language.tubar=Tubar
+controlledvocabulary.language.tucano=Tucano
+controlledvocabulary.language.tugen=Tugen
+controlledvocabulary.language.tugun=Tugun
+controlledvocabulary.language.tugutil=Tugutil
+controlledvocabulary.language.tukang_besi_north=Tukang Besi North
+controlledvocabulary.language.tukang_besi_south=Tukang Besi South
+controlledvocabulary.language.tuki=Tuki
+controlledvocabulary.language.tukpa=Tukpa
+controlledvocabulary.language.tukudede=Tukudede
+controlledvocabulary.language.tukumanfed=TukumanfÊd
+controlledvocabulary.language.tula=Tula
+controlledvocabulary.language.tulai=Tulai
+controlledvocabulary.language.tulehu=Tulehu
+controlledvocabulary.language.tulishi=Tulishi
+controlledvocabulary.language.tulu=Tulu
+controlledvocabulary.language.tulu-bohuai=Tulu-Bohuai
+controlledvocabulary.language.tuma-irumu=Tuma-Irumu
+controlledvocabulary.language.tumak=Tumak
+controlledvocabulary.language.tumari_kanuri=Tumari Kanuri
+controlledvocabulary.language.tumbuka=Tumbuka
+controlledvocabulary.language.tumi=Tumi
+controlledvocabulary.language.tumleo=Tumleo
+controlledvocabulary.language.tumshuqese=Tumshuqese
+controlledvocabulary.language.tumtum=Tumtum
+controlledvocabulary.language.tumulung_sisaala=Tumulung Sisaala
+controlledvocabulary.language.tumzabt=Tumzabt
+controlledvocabulary.language.tundra_enets=Tundra Enets
+controlledvocabulary.language.tunen=Tunen
+controlledvocabulary.language.tungag=Tungag
+controlledvocabulary.language.tunggare=Tunggare
+controlledvocabulary.language.tunia=Tunia
+controlledvocabulary.language.tunica=Tunica
+controlledvocabulary.language.tunisian_arabic=Tunisian Arabic
+controlledvocabulary.language.tunisian_sign_language=Tunisian Sign Language
+controlledvocabulary.language.tunjung=Tunjung
+controlledvocabulary.language.tunni=Tunni
+controlledvocabulary.language.tunzu=Tunzu
+controlledvocabulary.language.tuotomb=Tuotomb
+controlledvocabulary.language.tupari=Tuparí
+controlledvocabulary.language.tupinamba=TupinambÃĄ
+controlledvocabulary.language.tupinikin=Tupinikin
+controlledvocabulary.language.tupuri=Tupuri
+controlledvocabulary.language.turaka=Turaka
+controlledvocabulary.language.turi=Turi
+controlledvocabulary.language.turiwara=TuriwÃĄra
+controlledvocabulary.language.turka=Turka
+controlledvocabulary.language.turkana=Turkana
+controlledvocabulary.language.turkish=Turkish
+controlledvocabulary.language.turkish_sign_language=Turkish Sign Language
+controlledvocabulary.language.turkmen=Turkmen
+controlledvocabulary.language.turks_and_caicos_creole_english=Turks And Caicos Creole English
+controlledvocabulary.language.turoyo=Turoyo
+controlledvocabulary.language.turumsa=Turumsa
+controlledvocabulary.language.turung=Turung
+controlledvocabulary.language.tuscarora=Tuscarora
+controlledvocabulary.language.tutelo=Tutelo
+controlledvocabulary.language.tutong=Tutong
+controlledvocabulary.language.tutsa_naga=Tutsa Naga
+controlledvocabulary.language.tutuba=Tutuba
+controlledvocabulary.language.tututepec_mixtec=Tututepec Mixtec
+controlledvocabulary.language.tututni=Tututni
+controlledvocabulary.language.tuvalu=Tuvalu
+controlledvocabulary.language.tuvinian=Tuvinian
+controlledvocabulary.language.tuwali_ifugao=Tuwali Ifugao
+controlledvocabulary.language.tuwari=Tuwari
+controlledvocabulary.language.tuwuli=Tuwuli
+controlledvocabulary.language.tuxinawa=TuxinÃĄwa
+controlledvocabulary.language.tuxa=TuxÃĄ
+controlledvocabulary.language.tuyuca=Tuyuca
+controlledvocabulary.language.twana=Twana
+controlledvocabulary.language.twendi=Twendi
+controlledvocabulary.language.twents=Twents
 controlledvocabulary.language.twi=Twi
-controlledvocabulary.language.tahitian=Tahitian
-controlledvocabulary.language.uyghur,_uighur=Uyghur, Uighur
+controlledvocabulary.language.tyap=Tyap
+controlledvocabulary.language.tz'utujil=Tz'utujil
+controlledvocabulary.language.tzeltal=Tzeltal
+controlledvocabulary.language.tzotzil=Tzotzil
+controlledvocabulary.language.tay=Tày
+controlledvocabulary.language.tay_sa_pa=Tày Sa Pa
+controlledvocabulary.language.tay_tac=Tày Tac
+controlledvocabulary.language.teen=TÊÊn
+controlledvocabulary.language.tubatulabal=TÃŧbatulabal
+controlledvocabulary.language.u=U
+controlledvocabulary.language.uab_meto=Uab Meto
+controlledvocabulary.language.uamue=UamuÊ
+controlledvocabulary.language.uare=Uare
+controlledvocabulary.language.ubaghara=Ubaghara
+controlledvocabulary.language.ubang=Ubang
+controlledvocabulary.language.ubi=Ubi
+controlledvocabulary.language.ubir=Ubir
+controlledvocabulary.language.ubykh=Ubykh
+controlledvocabulary.language.ucayali-yurua_asheninka=Ucayali-YurÃēa AshÊninka
+controlledvocabulary.language.uda=Uda
+controlledvocabulary.language.udi=Udi
+controlledvocabulary.language.udihe=Udihe
+controlledvocabulary.language.udmurt=Udmurt
+controlledvocabulary.language.uduk=Uduk
+controlledvocabulary.language.ufim=Ufim
+controlledvocabulary.language.ugandan_sign_language=Ugandan Sign Language
+controlledvocabulary.language.ugaritic=Ugaritic
+controlledvocabulary.language.ughele=Ughele
+controlledvocabulary.language.ugong=Ugong
+controlledvocabulary.language.uhami=Uhami
+controlledvocabulary.language.uighur,_uyghur=Uighur, Uyghur
+controlledvocabulary.language.uisai=Uisai
+controlledvocabulary.language.ujir=Ujir
+controlledvocabulary.language.ukaan=Ukaan
+controlledvocabulary.language.ukhwejo=Ukhwejo
+controlledvocabulary.language.ukit=Ukit
+controlledvocabulary.language.ukpe-bayobiri=Ukpe-Bayobiri
+controlledvocabulary.language.ukpet-ehom=Ukpet-Ehom
 controlledvocabulary.language.ukrainian=Ukrainian
+controlledvocabulary.language.ukrainian_sign_language=Ukrainian Sign Language
+controlledvocabulary.language.ukue=Ukue
+controlledvocabulary.language.ukuriguma=Ukuriguma
+controlledvocabulary.language.ukwa=Ukwa
+controlledvocabulary.language.ukwuani-aboh-ndoni=Ukwuani-Aboh-Ndoni
+controlledvocabulary.language.ulau-suain=Ulau-Suain
+controlledvocabulary.language.ulch=Ulch
+controlledvocabulary.language.ulithian=Ulithian
+controlledvocabulary.language.ullatan=Ullatan
+controlledvocabulary.language.ulukwumi=Ulukwumi
+controlledvocabulary.language.ulumanda'=Ulumanda'
+controlledvocabulary.language.ulwa=Ulwa
+controlledvocabulary.language.uma=Uma
+controlledvocabulary.language.uma'_lasan=Uma' Lasan
+controlledvocabulary.language.uma'_lung=Uma' Lung
+controlledvocabulary.language.umanakaina=Umanakaina
+controlledvocabulary.language.umatilla=Umatilla
+controlledvocabulary.language.umbindhamu=Umbindhamu
+controlledvocabulary.language.umbrian=Umbrian
+controlledvocabulary.language.umbu-ungu=Umbu-Ungu
+controlledvocabulary.language.umbugarla=Umbugarla
+controlledvocabulary.language.umbundu=Umbundu
+controlledvocabulary.language.ume_sami=Ume Sami
+controlledvocabulary.language.umeda=Umeda
+controlledvocabulary.language.umiida=Umiida
+controlledvocabulary.language.umiray_dumaget_agta=Umiray Dumaget Agta
+controlledvocabulary.language.umon=Umon
+controlledvocabulary.language.umotina=Umotína
+controlledvocabulary.language.umpila=Umpila
+controlledvocabulary.language.una=Una
+controlledvocabulary.language.unami=Unami
+controlledvocabulary.language.uncoded_languages=Uncoded languages
+controlledvocabulary.language.unde_kaili=Unde Kaili
+controlledvocabulary.language.undetermined=Undetermined
+controlledvocabulary.language.uneapa=Uneapa
+controlledvocabulary.language.uneme=Uneme
+controlledvocabulary.language.unggaranggu=Unggaranggu
+controlledvocabulary.language.unggumi=Unggumi
+controlledvocabulary.language.uni=Uni
+controlledvocabulary.language.unserdeutsch=Unserdeutsch
+controlledvocabulary.language.unua=Unua
+controlledvocabulary.language.unubahe=Unubahe
+controlledvocabulary.language.upper_chehalis=Upper Chehalis
+controlledvocabulary.language.upper_grand_valley_dani=Upper Grand Valley Dani
+controlledvocabulary.language.upper_guinea_crioulo=Upper Guinea Crioulo
+controlledvocabulary.language.upper_kinabatangan=Upper Kinabatangan
+controlledvocabulary.language.upper_kuskokwim=Upper Kuskokwim
+controlledvocabulary.language.upper_necaxa_totonac=Upper Necaxa Totonac
+controlledvocabulary.language.upper_saxon=Upper Saxon
+controlledvocabulary.language.upper_sorbian=Upper Sorbian
+controlledvocabulary.language.upper_ta'oih=Upper Ta'oih
+controlledvocabulary.language.upper_tanana=Upper Tanana
+controlledvocabulary.language.upper_taromi=Upper Taromi
+controlledvocabulary.language.upper_umpqua=Upper Umpqua
+controlledvocabulary.language.ura_(papua_new_guinea)=Ura (Papua New Guinea)
+controlledvocabulary.language.ura_(vanuatu)=Ura (Vanuatu)
+controlledvocabulary.language.uradhi=Uradhi
+controlledvocabulary.language.urak_lawoi'=Urak Lawoi'
+controlledvocabulary.language.urali=Urali
+controlledvocabulary.language.urapmin=Urapmin
+controlledvocabulary.language.urarina=Urarina
+controlledvocabulary.language.urartian=Urartian
+controlledvocabulary.language.urat=Urat
 controlledvocabulary.language.urdu=Urdu
+controlledvocabulary.language.urhobo=Urhobo
+controlledvocabulary.language.uri=Uri
+controlledvocabulary.language.urigina=Urigina
+controlledvocabulary.language.urim=Urim
+controlledvocabulary.language.urimo=Urimo
+controlledvocabulary.language.uripiv-wala-rano-atchin=Uripiv-Wala-Rano-Atchin
+controlledvocabulary.language.urningangg=Urningangg
+controlledvocabulary.language.uru=Uru
+controlledvocabulary.language.uru-eu-wau-wau=Uru-Eu-Wau-Wau
+controlledvocabulary.language.uru-pa-in=Uru-Pa-In
+controlledvocabulary.language.uruangnirin=Uruangnirin
+controlledvocabulary.language.uruava=Uruava
+controlledvocabulary.language.urubu-kaapor=UrubÃē-Kaapor
+controlledvocabulary.language.urubu-kaapor_sign_language=UrubÃē-Kaapor Sign Language
+controlledvocabulary.language.uruguayan_sign_language=Uruguayan Sign Language
+controlledvocabulary.language.urum=Urum
+controlledvocabulary.language.urumi=Urumi
+controlledvocabulary.language.usaghade=Usaghade
+controlledvocabulary.language.usan=Usan
+controlledvocabulary.language.usarufa=Usarufa
+controlledvocabulary.language.ushojo=Ushojo
+controlledvocabulary.language.usila_chinantec=Usila Chinantec
+controlledvocabulary.language.usku=Usku
+controlledvocabulary.language.uspanteco=Uspanteco
+controlledvocabulary.language.usui=Usui
+controlledvocabulary.language.utarmbung=Utarmbung
+controlledvocabulary.language.ute-southern_paiute=Ute-Southern Paiute
+controlledvocabulary.language.utu=Utu
+controlledvocabulary.language.uvbie=Uvbie
+controlledvocabulary.language.uya=Uya
+controlledvocabulary.language.uyajitaya=Uyajitaya
 controlledvocabulary.language.uzbek=Uzbek
+controlledvocabulary.language.uzbeki_arabic=Uzbeki Arabic
+controlledvocabulary.language.uzekwe=Uzekwe
+controlledvocabulary.language.vaagri_booli=Vaagri Booli
+controlledvocabulary.language.vafsi=Vafsi
+controlledvocabulary.language.vaghri=Vaghri
+controlledvocabulary.language.vaghua=Vaghua
+controlledvocabulary.language.vagla=Vagla
+controlledvocabulary.language.vai=Vai
+controlledvocabulary.language.vaiphei=Vaiphei
+controlledvocabulary.language.vale=Vale
+controlledvocabulary.language.valencian_sign_language=Valencian Sign Language
+controlledvocabulary.language.valle_nacional_chinantec=Valle Nacional Chinantec
+controlledvocabulary.language.valley_maidu=Valley Maidu
+controlledvocabulary.language.valman=Valman
+controlledvocabulary.language.valpei=Valpei
+controlledvocabulary.language.vamale=Vamale
+controlledvocabulary.language.vame=Vame
+controlledvocabulary.language.vandalic=Vandalic
+controlledvocabulary.language.vangunu=Vangunu
+controlledvocabulary.language.vanimo=Vanimo
+controlledvocabulary.language.vano=Vano
+controlledvocabulary.language.vanuma=Vanuma
+controlledvocabulary.language.vao=Vao
+controlledvocabulary.language.varhadi-nagpuri=Varhadi-Nagpuri
+controlledvocabulary.language.varisi=Varisi
+controlledvocabulary.language.varli=Varli
+controlledvocabulary.language.vasavi=Vasavi
+controlledvocabulary.language.veddah=Veddah
+controlledvocabulary.language.vedic_sanskrit=Vedic Sanskrit
+controlledvocabulary.language.vehes=Vehes
+controlledvocabulary.language.veluws=Veluws
+controlledvocabulary.language.vemgo-mabas=Vemgo-Mabas
 controlledvocabulary.language.venda=Venda
+controlledvocabulary.language.venetian=Venetian
+controlledvocabulary.language.venetic=Venetic
+controlledvocabulary.language.venezuelan_sign_language=Venezuelan Sign Language
+controlledvocabulary.language.vengo=Vengo
+controlledvocabulary.language.ventureno=VentureÃąo
+controlledvocabulary.language.veps=Veps
+controlledvocabulary.language.vera'a=Vera'a
+controlledvocabulary.language.vestinian=Vestinian
+controlledvocabulary.language.vidunda=Vidunda
+controlledvocabulary.language.viemo=Viemo
 controlledvocabulary.language.vietnamese=Vietnamese
-controlledvocabulary.language.volapuk=Volapük
+controlledvocabulary.language.vilela=Vilela
+controlledvocabulary.language.vili=Vili
+controlledvocabulary.language.villa_viciosa_agta=Villa Viciosa Agta
+controlledvocabulary.language.vincentian_creole_english=Vincentian Creole English
+controlledvocabulary.language.vinmavis=Vinmavis
+controlledvocabulary.language.vinza=Vinza
+controlledvocabulary.language.virgin_islands_creole_english=Virgin Islands Creole English
+controlledvocabulary.language.vishavan=Vishavan
+controlledvocabulary.language.viti=Viti
+controlledvocabulary.language.vitou=Vitou
+controlledvocabulary.language.vitu=Vitu
+controlledvocabulary.language.vlaams=Vlaams
+controlledvocabulary.language.vlaamse_gebarentaal=Vlaamse Gebarentaal
+controlledvocabulary.language.vlax_romani=Vlax Romani
+controlledvocabulary.language.volapuk=VolapÃŧk
+controlledvocabulary.language.volscian=Volscian
+controlledvocabulary.language.vono=Vono
+controlledvocabulary.language.voro=Voro
+controlledvocabulary.language.votic=Votic
+controlledvocabulary.language.vumbu=Vumbu
+controlledvocabulary.language.vunapu=Vunapu
+controlledvocabulary.language.vunjo=Vunjo
+controlledvocabulary.language.vures=VurÃĢs
+controlledvocabulary.language.vute=Vute
+controlledvocabulary.language.vwanji=Vwanji
+controlledvocabulary.language.wa=Wa
+controlledvocabulary.language.wa'ema=Wa'ema
+controlledvocabulary.language.waama=Waama
+controlledvocabulary.language.waamwang=Waamwang
+controlledvocabulary.language.waata=Waata
+controlledvocabulary.language.wab=Wab
+controlledvocabulary.language.wabo=Wabo
+controlledvocabulary.language.waboda=Waboda
+controlledvocabulary.language.waci_gbe=Waci Gbe
+controlledvocabulary.language.wadaginam=Wadaginam
+controlledvocabulary.language.waddar=Waddar
+controlledvocabulary.language.wadi_wadi=Wadi Wadi
+controlledvocabulary.language.wadikali=Wadikali
+controlledvocabulary.language.wadiyara_koli=Wadiyara Koli
+controlledvocabulary.language.wadjabangayi=Wadjabangayi
+controlledvocabulary.language.wadjiginy=Wadjiginy
+controlledvocabulary.language.wadjigu=Wadjigu
+controlledvocabulary.language.wae_rana=Wae Rana
+controlledvocabulary.language.waffa=Waffa
+controlledvocabulary.language.wagawaga=Wagawaga
+controlledvocabulary.language.wagaya=Wagaya
+controlledvocabulary.language.wagdi=Wagdi
+controlledvocabulary.language.wagi=Wagi
+controlledvocabulary.language.wagiman=Wagiman
+controlledvocabulary.language.wahau_kayan=Wahau Kayan
+controlledvocabulary.language.wahau_kenyah=Wahau Kenyah
+controlledvocabulary.language.wahgi=Wahgi
+controlledvocabulary.language.waigali=Waigali
+controlledvocabulary.language.waigeo=Waigeo
+controlledvocabulary.language.wailaki=Wailaki
+controlledvocabulary.language.wailapa=Wailapa
+controlledvocabulary.language.waima=Waima
+controlledvocabulary.language.waima'a=Waima'a
+controlledvocabulary.language.waimaha=Waimaha
+controlledvocabulary.language.waimiri-atroari=Waimiri-Atroari
+controlledvocabulary.language.waioli=Waioli
+controlledvocabulary.language.waiwai=Waiwai
+controlledvocabulary.language.waja=Waja
+controlledvocabulary.language.wajarri=Wajarri
+controlledvocabulary.language.wajuk=Wajuk
+controlledvocabulary.language.waka=Waka
+controlledvocabulary.language.wakabunga=Wakabunga
+controlledvocabulary.language.wakawaka=Wakawaka
+controlledvocabulary.language.wakde=Wakde
+controlledvocabulary.language.wakhi=Wakhi
+controlledvocabulary.language.wakona=WakonÃĄ
+controlledvocabulary.language.wala=Wala
+controlledvocabulary.language.walak=Walak
+controlledvocabulary.language.walangama=Walangama
+controlledvocabulary.language.wali_(ghana)=Wali (Ghana)
+controlledvocabulary.language.wali_(sudan)=Wali (Sudan)
+controlledvocabulary.language.waling=Waling
+controlledvocabulary.language.walio=Walio
+controlledvocabulary.language.walla_walla=Walla Walla
+controlledvocabulary.language.wallisian=Wallisian
 controlledvocabulary.language.walloon=Walloon
+controlledvocabulary.language.walmajarri=Walmajarri
+controlledvocabulary.language.walser=Walser
+controlledvocabulary.language.walungge=Walungge
+controlledvocabulary.language.waluwarra=Waluwarra
+controlledvocabulary.language.wamas=Wamas
+controlledvocabulary.language.wambaya=Wambaya
+controlledvocabulary.language.wambon=Wambon
+controlledvocabulary.language.wambule=Wambule
+controlledvocabulary.language.wamesa=Wamesa
+controlledvocabulary.language.wamey=Wamey
+controlledvocabulary.language.wamin=Wamin
+controlledvocabulary.language.wampanoag=Wampanoag
+controlledvocabulary.language.wampar=Wampar
+controlledvocabulary.language.wampur=Wampur
+controlledvocabulary.language.wan=Wan
+controlledvocabulary.language.wanap=Wanap
+controlledvocabulary.language.wancho_naga=Wancho Naga
+controlledvocabulary.language.wanda=Wanda
+controlledvocabulary.language.wandala=Wandala
+controlledvocabulary.language.wandarang=Wandarang
+controlledvocabulary.language.wandji=Wandji
+controlledvocabulary.language.waneci=Waneci
+controlledvocabulary.language.wanga=Wanga
+controlledvocabulary.language.wangaaybuwan-ngiyambaa=Wangaaybuwan-Ngiyambaa
+controlledvocabulary.language.wanggamala=Wanggamala
+controlledvocabulary.language.wanggom=Wanggom
+controlledvocabulary.language.wangkangurru=Wangkangurru
+controlledvocabulary.language.wangkayutyuru=Wangkayutyuru
+controlledvocabulary.language.wangkumara=Wangkumara
+controlledvocabulary.language.wannu=Wannu
+controlledvocabulary.language.wano=Wano
+controlledvocabulary.language.wantoat=Wantoat
+controlledvocabulary.language.wanukaka=Wanukaka
+controlledvocabulary.language.wanyi=Wanyi
+controlledvocabulary.language.wane=WanÊ
+controlledvocabulary.language.waorani=Waorani
+controlledvocabulary.language.wapan=Wapan
+controlledvocabulary.language.wapishana=Wapishana
+controlledvocabulary.language.wappo=Wappo
+controlledvocabulary.language.war-jaintia=War-Jaintia
+controlledvocabulary.language.wara=Wara WÃĄra
+controlledvocabulary.language.warao=Warao
+controlledvocabulary.language.waray_(australia)=Waray (Australia)
+controlledvocabulary.language.waray_(philippines)=Waray (Philippines)
+controlledvocabulary.language.wardaman=Wardaman
+controlledvocabulary.language.wardandi=Wardandi
+controlledvocabulary.language.warembori=Warembori
+controlledvocabulary.language.wares=Wares
+controlledvocabulary.language.waris=Waris
+controlledvocabulary.language.waritai=Waritai
+controlledvocabulary.language.wariyangga=Wariyangga
+controlledvocabulary.language.warji=Warji
+controlledvocabulary.language.warkay-bipim=Warkay-Bipim
+controlledvocabulary.language.warlmanpa=Warlmanpa
+controlledvocabulary.language.warlpiri=Warlpiri
+controlledvocabulary.language.warnang=Warnang
+controlledvocabulary.language.warnman=Warnman
+controlledvocabulary.language.waropen=Waropen
+controlledvocabulary.language.warrgamay=Warrgamay
+controlledvocabulary.language.warrwa=Warrwa
+controlledvocabulary.language.waru=Waru
+controlledvocabulary.language.warumungu=Warumungu
+controlledvocabulary.language.waruna=Waruna
+controlledvocabulary.language.warungu=Warungu
+controlledvocabulary.language.warwar_feni=Warwar Feni
+controlledvocabulary.language.wasa=Wasa
+controlledvocabulary.language.wasco-wishram=Wasco-Wishram
+controlledvocabulary.language.wasembo=Wasembo
+controlledvocabulary.language.washo=Washo
+controlledvocabulary.language.waskia=Waskia
+controlledvocabulary.language.wasu=Wasu
+controlledvocabulary.language.watakataui=Watakataui
+controlledvocabulary.language.watam=Watam
+controlledvocabulary.language.wathawurrung=Wathawurrung
+controlledvocabulary.language.watiwa=Watiwa
+controlledvocabulary.language.watubela=Watubela
+controlledvocabulary.language.waube=Waube
+controlledvocabulary.language.waura=WaurÃĄ
+controlledvocabulary.language.wauyai=Wauyai
+controlledvocabulary.language.wawa=Wawa
+controlledvocabulary.language.wawonii=Wawonii
+controlledvocabulary.language.waxianghua=Waxianghua
+controlledvocabulary.language.wayampi=Wayampi
+controlledvocabulary.language.wayana=Wayana
+controlledvocabulary.language.wayanad_chetti=Wayanad Chetti
+controlledvocabulary.language.wayoro=WayorÃŗ
+controlledvocabulary.language.wayu=Wayu
+controlledvocabulary.language.wayuu=Wayuu
+controlledvocabulary.language.wedau=Wedau
+controlledvocabulary.language.weh=Weh
+controlledvocabulary.language.wejewa=Wejewa
+controlledvocabulary.language.welaun=Welaun
+controlledvocabulary.language.weliki=Weliki
 controlledvocabulary.language.welsh=Welsh
-controlledvocabulary.language.wolof=Wolof
+controlledvocabulary.language.welsh_romani=Welsh Romani
+controlledvocabulary.language.wemale=Wemale
+controlledvocabulary.language.wemba_wemba=Wemba Wemba
+controlledvocabulary.language.weme_gbe=Weme Gbe
+controlledvocabulary.language.wendat=Wendat
+controlledvocabulary.language.wergaia=Wergaia
+controlledvocabulary.language.weri=Weri
+controlledvocabulary.language.wersing=Wersing
+controlledvocabulary.language.west_albay_bikol=West Albay Bikol
+controlledvocabulary.language.west_ambae=West Ambae
+controlledvocabulary.language.west_bengal_sign_language=West Bengal Sign Language
+controlledvocabulary.language.west_berawan=West Berawan
+controlledvocabulary.language.west_central_banda=West Central Banda
+controlledvocabulary.language.west_central_oromo=West Central Oromo
+controlledvocabulary.language.west_coast_bajau=West Coast Bajau
+controlledvocabulary.language.west_damar=West Damar
+controlledvocabulary.language.west_goodenough=West Goodenough
+controlledvocabulary.language.west_kewa=West Kewa
+controlledvocabulary.language.west_lembata=West Lembata
+controlledvocabulary.language.west_makian=West Makian
+controlledvocabulary.language.west_masela=West Masela
+controlledvocabulary.language.west_tarangan=West Tarangan
+controlledvocabulary.language.west_uvean=West Uvean
+controlledvocabulary.language.west_yugur=West Yugur
+controlledvocabulary.language.west-central_limba=West-Central Limba
+controlledvocabulary.language.western_abnaki=Western Abnaki
+controlledvocabulary.language.western_apache=Western Apache
+controlledvocabulary.language.western_armenian=Western Armenian
+controlledvocabulary.language.western_arrarnta=Western Arrarnta
+controlledvocabulary.language.western_balochi=Western Balochi
+controlledvocabulary.language.western_bolivian_guarani=Western Bolivian Guaraní
+controlledvocabulary.language.western_bru=Western Bru
+controlledvocabulary.language.western_bukidnon_manobo=Western Bukidnon Manobo
+controlledvocabulary.language.western_cham=Western Cham
+controlledvocabulary.language.western_dani=Western Dani
+controlledvocabulary.language.western_durango_nahuatl=Western Durango Nahuatl
+controlledvocabulary.language.western_fijian=Western Fijian
 controlledvocabulary.language.western_frisian=Western Frisian
+controlledvocabulary.language.western_highland_chatino=Western Highland Chatino
+controlledvocabulary.language.western_highland_purepecha=Western Highland Purepecha
+controlledvocabulary.language.western_huasteca_nahuatl=Western Huasteca Nahuatl
+controlledvocabulary.language.western_juxtlahuaca_mixtec=Western Juxtlahuaca Mixtec
+controlledvocabulary.language.western_kanjobal=Western Kanjobal
+controlledvocabulary.language.western_karaboro=Western Karaboro
+controlledvocabulary.language.western_katu=Western Katu
+controlledvocabulary.language.western_kayah=Western Kayah
+controlledvocabulary.language.western_keres=Western Keres
+controlledvocabulary.language.western_krahn=Western Krahn
+controlledvocabulary.language.western_lalu=Western Lalu
+controlledvocabulary.language.western_lawa=Western Lawa
+controlledvocabulary.language.western_magar=Western Magar
+controlledvocabulary.language.western_maninkakan=Western Maninkakan
+controlledvocabulary.language.western_mari=Western Mari
+controlledvocabulary.language.western_mashan_hmong=Western Mashan Hmong
+controlledvocabulary.language.western_meohang=Western Meohang
+controlledvocabulary.language.western_minyag=Western Minyag
+controlledvocabulary.language.western_muria=Western Muria
+controlledvocabulary.language.western_neo-aramaic=Western Neo-Aramaic
+controlledvocabulary.language.western_niger_fulfulde=Western Niger Fulfulde
+controlledvocabulary.language.western_ojibwa=Western Ojibwa
+controlledvocabulary.language.western_panjabi=Western Panjabi
+controlledvocabulary.language.western_parbate_kham=Western Parbate Kham
+controlledvocabulary.language.western_penan=Western Penan
+controlledvocabulary.language.western_sisaala=Western Sisaala
+controlledvocabulary.language.western_subanon=Western Subanon
+controlledvocabulary.language.western_tamang=Western Tamang
+controlledvocabulary.language.western_tawbuid=Western Tawbuid
+controlledvocabulary.language.western_tlacolula_valley_zapotec=Western Tlacolula Valley Zapotec
+controlledvocabulary.language.western_totonac=Western Totonac
+controlledvocabulary.language.western_tunebo=Western Tunebo
+controlledvocabulary.language.western_xiangxi_miao=Western Xiangxi Miao
+controlledvocabulary.language.western_xwla_gbe=Western Xwla Gbe
+controlledvocabulary.language.western_yiddish=Western Yiddish
+controlledvocabulary.language.westphalien=Westphalien
+controlledvocabulary.language.wetamut=Wetamut
+controlledvocabulary.language.wewaw=Wewaw
+controlledvocabulary.language.weyto=Weyto
+controlledvocabulary.language.white_gelao=White Gelao
+controlledvocabulary.language.white_lachi=White Lachi
+controlledvocabulary.language.whitesands=Whitesands
+controlledvocabulary.language.wiarumus=Wiarumus
+controlledvocabulary.language.wichita=Wichita
+controlledvocabulary.language.wichi_lhamtes_guisnay=Wichí LhamtÊs GÃŧisnay
+controlledvocabulary.language.wichi_lhamtes_nocten=Wichí LhamtÊs Nocten
+controlledvocabulary.language.wichi_lhamtes_vejoz=Wichí LhamtÊs Vejoz
+controlledvocabulary.language.wik_ngathan=Wik Ngathan
+controlledvocabulary.language.wik-epa=Wik-Epa
+controlledvocabulary.language.wik-iiyanh=Wik-Iiyanh
+controlledvocabulary.language.wik-keyangan=Wik-Keyangan
+controlledvocabulary.language.wik-me'anha=Wik-Me'anha
+controlledvocabulary.language.wik-mungkan=Wik-Mungkan
+controlledvocabulary.language.wikalkan=Wikalkan
+controlledvocabulary.language.wikngenchera=Wikngenchera
+controlledvocabulary.language.wilawila=Wilawila
+controlledvocabulary.language.wintu=Wintu
+controlledvocabulary.language.winye=WinyÊ
+controlledvocabulary.language.wipi=Wipi
+controlledvocabulary.language.wiradjuri=Wiradjuri
+controlledvocabulary.language.wirafed=WirafÊd
+controlledvocabulary.language.wirangu=Wirangu
+controlledvocabulary.language.wiru=Wiru
+controlledvocabulary.language.wiyot=Wiyot
+controlledvocabulary.language.woccon=Woccon
+controlledvocabulary.language.wogamusin=Wogamusin
+controlledvocabulary.language.wogeo=Wogeo
+controlledvocabulary.language.woi=Woi
+controlledvocabulary.language.woiwurrung=Woiwurrung
+controlledvocabulary.language.wojenaka=Wojenaka
+controlledvocabulary.language.wolane=Wolane
+controlledvocabulary.language.wolani=Wolani
+controlledvocabulary.language.wolaytta=Wolaytta
+controlledvocabulary.language.woleaian=Woleaian
+controlledvocabulary.language.wolio=Wolio
+controlledvocabulary.language.wolof=Wolof
+controlledvocabulary.language.wom_(nigeria)=Wom (Nigeria)
+controlledvocabulary.language.wom_(papua_new_guinea)=Wom (Papua New Guinea)
+controlledvocabulary.language.womo=Womo
+controlledvocabulary.language.wongo=Wongo
+controlledvocabulary.language.woods_cree=Woods Cree
+controlledvocabulary.language.woria=Woria
+controlledvocabulary.language.worimi=Worimi
+controlledvocabulary.language.worodougou=Worodougou
+controlledvocabulary.language.worrorra=Worrorra
+controlledvocabulary.language.wotapuri-katarqalai=Wotapuri-Katarqalai
+controlledvocabulary.language.wotjobaluk=Wotjobaluk
+controlledvocabulary.language.wotu=Wotu
+controlledvocabulary.language.woun_meu=Woun Meu
+controlledvocabulary.language.written_oirat=Written Oirat
+controlledvocabulary.language.wu_chinese=Wu Chinese
+controlledvocabulary.language.wuding-luquan_yi=Wuding-Luquan Yi
+controlledvocabulary.language.wudu=Wudu
+controlledvocabulary.language.wuliwuli=Wuliwuli
+controlledvocabulary.language.wulna=Wulna
+controlledvocabulary.language.wumboko=Wumboko
+controlledvocabulary.language.wumbvu=Wumbvu
+controlledvocabulary.language.wumeng_nasu=Wumeng Nasu
+controlledvocabulary.language.wunai_bunu=Wunai Bunu
+controlledvocabulary.language.wunambal=Wunambal
+controlledvocabulary.language.wunumara=Wunumara
+controlledvocabulary.language.wurrugu=Wurrugu
+controlledvocabulary.language.wusa_nasu=Wusa Nasu
+controlledvocabulary.language.wushi=Wushi
+controlledvocabulary.language.wusi=Wusi
+controlledvocabulary.language.wutung=Wutung
+controlledvocabulary.language.wutunhua=Wutunhua
+controlledvocabulary.language.wuvulu-aua=Wuvulu-Aua
+controlledvocabulary.language.wuzlam=Wuzlam
+controlledvocabulary.language.wyandot=Wyandot
+controlledvocabulary.language.wymysorys=Wymysorys
+controlledvocabulary.language.wapha=WÃŖpha
+controlledvocabulary.language.we_northern=Wè Northern
+controlledvocabulary.language.we_southern=Wè Southern
+controlledvocabulary.language.we_western=Wè Western
+controlledvocabulary.language.xaasongaxango=Xaasongaxango
+controlledvocabulary.language.xadani_zapotec=Xadani Zapotec
+controlledvocabulary.language.xakriaba=XakriabÃĄ
+controlledvocabulary.language.xamtanga=Xamtanga
+controlledvocabulary.language.xanaguia_zapotec=Xanaguía Zapotec
+controlledvocabulary.language.xavante=XavÃĄnte
+controlledvocabulary.language.xerente=XerÊnte
+controlledvocabulary.language.xeta=XetÃĄ
 controlledvocabulary.language.xhosa=Xhosa
+controlledvocabulary.language.xiang_chinese=Xiang Chinese
+controlledvocabulary.language.xibe=Xibe
+controlledvocabulary.language.xicotepec_de_juarez_totonac=Xicotepec De JuÃĄrez Totonac
+controlledvocabulary.language.xinca=Xinca
+controlledvocabulary.language.xingu_asurini=XingÃē Asuriní
+controlledvocabulary.language.xipaya=Xipaya
+controlledvocabulary.language.xiri=Xiri
+controlledvocabulary.language.xiriana=XiriÃĸna
+controlledvocabulary.language.xishanba_lalo=Xishanba Lalo
+controlledvocabulary.language.xokleng=Xokleng
+controlledvocabulary.language.xukuru=XukurÃē
+controlledvocabulary.language.xwela_gbe=Xwela Gbe
+controlledvocabulary.language.xaracuu=XÃĸrÃĸcÚÚ
+controlledvocabulary.language.xaragure=XÃĸrÃĸgurè
+controlledvocabulary.language.yaaku=Yaaku
+controlledvocabulary.language.yabarana=Yabarana
+controlledvocabulary.language.yabaana=YabaÃĸna
+controlledvocabulary.language.yabem=Yabem
+controlledvocabulary.language.yaben=Yaben
+controlledvocabulary.language.yabong=Yabong
+controlledvocabulary.language.yabula_yabula=Yabula Yabula
+controlledvocabulary.language.yace=Yace
+controlledvocabulary.language.yaeyama=Yaeyama
+controlledvocabulary.language.yafi=Yafi
+controlledvocabulary.language.yagara=Yagara
+controlledvocabulary.language.yagaria=Yagaria
+controlledvocabulary.language.yagnobi=Yagnobi
+controlledvocabulary.language.yagomi=Yagomi
+controlledvocabulary.language.yagua=Yagua
+controlledvocabulary.language.yagwoia=Yagwoia
+controlledvocabulary.language.yahadian=Yahadian
+controlledvocabulary.language.yahang=Yahang
+controlledvocabulary.language.yahuna=Yahuna
+controlledvocabulary.language.yaka_(central_african_republic)=Yaka (Central African Republic)
+controlledvocabulary.language.yaka_(congo)=Yaka (Congo)
+controlledvocabulary.language.yaka_(democratic_republic_of_congo)=Yaka (Democratic Republic of Congo)
+controlledvocabulary.language.yakaikeke=Yakaikeke
+controlledvocabulary.language.yakama=Yakama
+controlledvocabulary.language.yakan=Yakan
+controlledvocabulary.language.yakha=Yakha
+controlledvocabulary.language.yakoma=Yakoma
+controlledvocabulary.language.yakut=Yakut
+controlledvocabulary.language.yala=Yala
+controlledvocabulary.language.yalahatan=Yalahatan
+controlledvocabulary.language.yalakalore=Yalakalore
+controlledvocabulary.language.yalarnnga=Yalarnnga
+controlledvocabulary.language.yale=Yale
+controlledvocabulary.language.yaleba=Yaleba
+controlledvocabulary.language.yalunka=Yalunka
+controlledvocabulary.language.yalalag_zapotec=YalÃĄlag Zapotec
+controlledvocabulary.language.yamap=Yamap
+controlledvocabulary.language.yamba=Yamba
+controlledvocabulary.language.yambes=Yambes
+controlledvocabulary.language.yambeta=Yambeta
+controlledvocabulary.language.yamdena=Yamdena
+controlledvocabulary.language.yameo=Yameo
+controlledvocabulary.language.yami=Yami
+controlledvocabulary.language.yaminahua=Yaminahua
+controlledvocabulary.language.yamna=Yamna
+controlledvocabulary.language.yamongeri=Yamongeri
+controlledvocabulary.language.yamphu=Yamphu
+controlledvocabulary.language.yan-nhangu=Yan-nhangu
+controlledvocabulary.language.yan-nhaŋu_sign_language=Yan-nhaŋu Sign Language
+controlledvocabulary.language.yana=Yana
+controlledvocabulary.language.yanahuanca_pasco_quechua=Yanahuanca Pasco Quechua
+controlledvocabulary.language.yanda=Yanda
+controlledvocabulary.language.yanda_dom_dogon=Yanda Dom Dogon
+controlledvocabulary.language.yandjibara=Yandjibara
+controlledvocabulary.language.yandruwandha=Yandruwandha
+controlledvocabulary.language.yanesha'=Yanesha'
+controlledvocabulary.language.yang_zhuang=Yang Zhuang
+controlledvocabulary.language.yangben=Yangben
+controlledvocabulary.language.yangkam=Yangkam
+controlledvocabulary.language.yangman=Yangman
+controlledvocabulary.language.yango=Yango
+controlledvocabulary.language.yangulam=Yangulam
+controlledvocabulary.language.yangum_dey=Yangum Dey
+controlledvocabulary.language.yangum_gel=Yangum Gel
+controlledvocabulary.language.yangum_mon=Yangum Mon
+controlledvocabulary.language.yankunytjatjara=Yankunytjatjara
+controlledvocabulary.language.yanomamo=YanomamÃļ
+controlledvocabulary.language.yanomami=YanomÃĄmi
+controlledvocabulary.language.yansi=Yansi
+controlledvocabulary.language.yanyuwa=Yanyuwa
+controlledvocabulary.language.yao=Yao
+controlledvocabulary.language.yaosakor_asmat=Yaosakor Asmat
+controlledvocabulary.language.yaoure=YaourÊ
+controlledvocabulary.language.yapese=Yapese
+controlledvocabulary.language.yapunda=Yapunda
+controlledvocabulary.language.yaqay=Yaqay
+controlledvocabulary.language.yaqui=Yaqui
+controlledvocabulary.language.yarawata=Yarawata
+controlledvocabulary.language.yardliyawarra=Yardliyawarra
+controlledvocabulary.language.yareba=Yareba
+controlledvocabulary.language.yareni_zapotec=Yareni Zapotec
+controlledvocabulary.language.yarluyandi=Yarluyandi
+controlledvocabulary.language.yaroame=YaroamÃĢ
+controlledvocabulary.language.yarsun=Yarsun
+controlledvocabulary.language.yasa=Yasa
+controlledvocabulary.language.yassic=Yassic
+controlledvocabulary.language.yatay=Yatay
+controlledvocabulary.language.yatee_zapotec=Yatee Zapotec
+controlledvocabulary.language.yatzachi_zapotec=Yatzachi Zapotec
+controlledvocabulary.language.yau_(morobe_province)=Yau (Morobe Province)
+controlledvocabulary.language.yau_(sandaun_province)=Yau (Sandaun Province)
+controlledvocabulary.language.yaul=Yaul
+controlledvocabulary.language.yauma=Yauma
+controlledvocabulary.language.yaur=Yaur
+controlledvocabulary.language.yautepec_zapotec=Yautepec Zapotec
+controlledvocabulary.language.yauyos_quechua=Yauyos Quechua
+controlledvocabulary.language.yavitero=Yavitero
+controlledvocabulary.language.yawa=Yawa
+controlledvocabulary.language.yawalapiti=Yawalapití
+controlledvocabulary.language.yawanawa=Yawanawa
+controlledvocabulary.language.yawarawarga=Yawarawarga
+controlledvocabulary.language.yaweyuha=Yaweyuha
+controlledvocabulary.language.yawijibaya=Yawijibaya
+controlledvocabulary.language.yawiyo=Yawiyo
+controlledvocabulary.language.yawuru=Yawuru
+controlledvocabulary.language.yaygir=Yaygir
+controlledvocabulary.language.yazgulyam=Yazgulyam
+controlledvocabulary.language.yecuatla_totonac=Yecuatla Totonac
+controlledvocabulary.language.yei=Yei
+controlledvocabulary.language.yekhee=Yekhee
+controlledvocabulary.language.yekora=Yekora
+controlledvocabulary.language.yela=Yela
+controlledvocabulary.language.yele=Yele
+controlledvocabulary.language.yelmek=Yelmek
+controlledvocabulary.language.yelogu=Yelogu
+controlledvocabulary.language.yemba=Yemba
+controlledvocabulary.language.yemsa=Yemsa
+controlledvocabulary.language.yendang=Yendang
+controlledvocabulary.language.yeni=Yeni
+controlledvocabulary.language.yeniche=Yeniche
+controlledvocabulary.language.yerakai=Yerakai
+controlledvocabulary.language.yeretuar=Yeretuar
+controlledvocabulary.language.yerong=Yerong
+controlledvocabulary.language.yerukula=Yerukula
+controlledvocabulary.language.yessan-mayo=Yessan-Mayo
+controlledvocabulary.language.yetfa=Yetfa
+controlledvocabulary.language.yevanic=Yevanic
+controlledvocabulary.language.yeyi=Yeyi
 controlledvocabulary.language.yiddish=Yiddish
+controlledvocabulary.language.yidgha=Yidgha
+controlledvocabulary.language.yidiny=Yidiny
+controlledvocabulary.language.yil=Yil
+controlledvocabulary.language.yilan_creole=Yilan Creole
+controlledvocabulary.language.yimas=Yimas
+controlledvocabulary.language.yimchungru_naga=Yimchungru Naga
+controlledvocabulary.language.yinbaw_karen=Yinbaw Karen
+controlledvocabulary.language.yindjibarndi=Yindjibarndi
+controlledvocabulary.language.yindjilandji=Yindjilandji
+controlledvocabulary.language.yine=Yine
+controlledvocabulary.language.yinggarda=Yinggarda
+controlledvocabulary.language.yinhawangka=Yinhawangka
+controlledvocabulary.language.yiningayi=Yiningayi
+controlledvocabulary.language.yintale_karen=Yintale Karen
+controlledvocabulary.language.yinwum=Yinwum
+controlledvocabulary.language.yir_yoront=Yir Yoront
+controlledvocabulary.language.yirandali=Yirandali
+controlledvocabulary.language.yirrk-mel=Yirrk-Mel
+controlledvocabulary.language.yis=Yis
+controlledvocabulary.language.yitha_yitha=Yitha Yitha
+controlledvocabulary.language.yoba=Yoba
+controlledvocabulary.language.yocoboue_dida=YocobouÊ Dida
+controlledvocabulary.language.yogad=Yogad
+controlledvocabulary.language.yoidik=Yoidik
+controlledvocabulary.language.yoke=Yoke
+controlledvocabulary.language.yokuts=Yokuts
+controlledvocabulary.language.yola=Yola
+controlledvocabulary.language.yoloxochitl_mixtec=Yoloxochitl Mixtec
+controlledvocabulary.language.yolŋu_sign_language=Yolŋu Sign Language
+controlledvocabulary.language.yom=Yom
+controlledvocabulary.language.yombe=Yombe
+controlledvocabulary.language.yonaguni=Yonaguni
+controlledvocabulary.language.yong=Yong
+controlledvocabulary.language.yongbei_zhuang=Yongbei Zhuang
+controlledvocabulary.language.yongkom=Yongkom
+controlledvocabulary.language.yongnan_zhuang=Yongnan Zhuang
+controlledvocabulary.language.yopno=Yopno
+controlledvocabulary.language.yora=Yora
+controlledvocabulary.language.yoron=Yoron
+controlledvocabulary.language.yorta_yorta=Yorta Yorta
 controlledvocabulary.language.yoruba=Yoruba
+controlledvocabulary.language.yosondua_mixtec=YosondÃēa Mixtec
+controlledvocabulary.language.yotti=Yotti
+controlledvocabulary.language.youjiang_zhuang=Youjiang Zhuang
+controlledvocabulary.language.youle_jinuo=Youle Jinuo
+controlledvocabulary.language.younuo_bunu=Younuo Bunu
+controlledvocabulary.language.yout_wam=Yout Wam
+controlledvocabulary.language.yoy=Yoy
+controlledvocabulary.language.yuanga=Yuanga
+controlledvocabulary.language.yucatec_maya_sign_language=Yucatec Maya Sign Language
+controlledvocabulary.language.yucateco=Yucateco
+controlledvocabulary.language.yuchi=Yuchi
+controlledvocabulary.language.yucuane_mixtec=YucuaÃąe Mixtec
+controlledvocabulary.language.yucuna=Yucuna
+controlledvocabulary.language.yue_chinese=Yue Chinese
+controlledvocabulary.language.yug=Yug
+controlledvocabulary.language.yugambal=Yugambal
+controlledvocabulary.language.yugoslavian_sign_language=Yugoslavian Sign Language
+controlledvocabulary.language.yugul=Yugul
+controlledvocabulary.language.yuhup=Yuhup
+controlledvocabulary.language.yuki=Yuki
+controlledvocabulary.language.yukpa=Yukpa
+controlledvocabulary.language.yukuben=Yukuben
+controlledvocabulary.language.yulu=Yulu
+controlledvocabulary.language.yuqui=Yuqui
+controlledvocabulary.language.yuracare=Yuracare
+controlledvocabulary.language.yurats=Yurats
+controlledvocabulary.language.yurok=Yurok
+controlledvocabulary.language.yuru=Yuru
+controlledvocabulary.language.yuruti=Yurutí
+controlledvocabulary.language.yutanduchi_mixtec=Yutanduchi Mixtec
+controlledvocabulary.language.yuwana=Yuwana
+controlledvocabulary.language.yuyu=Yuyu
+controlledvocabulary.language.ywom=Ywom
+controlledvocabulary.language.yamana=YÃĄmana
+controlledvocabulary.language.zaachila_zapotec=Zaachila Zapotec
+controlledvocabulary.language.zabana=Zabana
+controlledvocabulary.language.zacatepec_chatino=Zacatepec Chatino
+controlledvocabulary.language.zacatlan-ahuacatlan-tepetzintla_nahuatl=ZacatlÃĄn-AhuacatlÃĄn-Tepetzintla Nahuatl
+controlledvocabulary.language.zaghawa=Zaghawa
+controlledvocabulary.language.zaiwa=Zaiwa
+controlledvocabulary.language.zakhring=Zakhring
+controlledvocabulary.language.zambian_sign_language=Zambian Sign Language
+controlledvocabulary.language.zan_gula=Zan Gula
+controlledvocabulary.language.zanaki=Zanaki
+controlledvocabulary.language.zande_(individual_language)=Zande (individual language)
+controlledvocabulary.language.zangskari=Zangskari
+controlledvocabulary.language.zangwal=Zangwal
+controlledvocabulary.language.zaniza_zapotec=Zaniza Zapotec
+controlledvocabulary.language.zapotec=Zapotec
+controlledvocabulary.language.zaramo=Zaramo
+controlledvocabulary.language.zari=Zari
+controlledvocabulary.language.zarma=Zarma
+controlledvocabulary.language.zarphatic=Zarphatic
+controlledvocabulary.language.zauzou=Zauzou
+controlledvocabulary.language.zay=Zay
+controlledvocabulary.language.zayein_karen=Zayein Karen
+controlledvocabulary.language.zayse-zergulla=Zayse-Zergulla
+controlledvocabulary.language.zaza=Zaza
+controlledvocabulary.language.zazao=Zazao
+controlledvocabulary.language.zeem=Zeem
+controlledvocabulary.language.zeeuws=Zeeuws
+controlledvocabulary.language.zemba=Zemba
+controlledvocabulary.language.zeme_naga=Zeme Naga
+controlledvocabulary.language.zemgalian=Zemgalian
+controlledvocabulary.language.zenag=Zenag
+controlledvocabulary.language.zenaga=Zenaga
+controlledvocabulary.language.zenzontepec_chatino=Zenzontepec Chatino
+controlledvocabulary.language.zerenkel=Zerenkel
+controlledvocabulary.language.zhaba=Zhaba
+controlledvocabulary.language.zhang-zhung=Zhang-Zhung
+controlledvocabulary.language.zhire=Zhire
+controlledvocabulary.language.zhoa=Zhoa
 controlledvocabulary.language.zhuang,_chuang=Zhuang, Chuang
+controlledvocabulary.language.zia=Zia
+controlledvocabulary.language.zialo=Zialo
+controlledvocabulary.language.zigula=Zigula
+controlledvocabulary.language.zimakani=Zimakani
+controlledvocabulary.language.zimba=Zimba
+controlledvocabulary.language.zimbabwe_sign_language=Zimbabwe Sign Language
+controlledvocabulary.language.zinza=Zinza
+controlledvocabulary.language.zire=Zire
+controlledvocabulary.language.zizilivakan=Zizilivakan
+controlledvocabulary.language.zo'e=Zo'Ê
+controlledvocabulary.language.zokhuo=Zokhuo
+controlledvocabulary.language.zoogocho_zapotec=Zoogocho Zapotec
+controlledvocabulary.language.zoroastrian_dari=Zoroastrian Dari
+controlledvocabulary.language.zotung_chin=Zotung Chin
+controlledvocabulary.language.zou=Zou
+controlledvocabulary.language.zul=Zul
+controlledvocabulary.language.zula=Zula
+controlledvocabulary.language.zulgo-gemzek=Zulgo-Gemzek
 controlledvocabulary.language.zulu=Zulu
-controlledvocabulary.language.not_applicable=Not applicable
\ No newline at end of file
+controlledvocabulary.language.zumaya=Zumaya
+controlledvocabulary.language.zumbun=Zumbun
+controlledvocabulary.language.zuni=Zuni
+controlledvocabulary.language.zuojiang_zhuang=Zuojiang Zhuang
+controlledvocabulary.language.zyphe_chin=Zyphe Chin
+controlledvocabulary.language.zaparo=ZÃĄparo
+controlledvocabulary.language.stodsde=sTodsde
+controlledvocabulary.language.us-saare=us-Saare
+controlledvocabulary.language.ut-hun=ut-Hun
+controlledvocabulary.language.ut-ma'in=ut-Ma'in
+controlledvocabulary.language.ahan=Àhàn
+controlledvocabulary.language.anca=ÁncÃĄ
+controlledvocabulary.language.omie=Ömie
+controlledvocabulary.language.onge=Önge
+controlledvocabulary.language.Į€gwi=Į€Gwi
+controlledvocabulary.language.Į€xam=Į€Xam
+controlledvocabulary.language.Įani=ĮAni
+controlledvocabulary.language.Įgana=ĮGana
+controlledvocabulary.language.Įxegwi=ĮXegwi
+controlledvocabulary.language.Į‚hua=Į‚Hua
+controlledvocabulary.language.Į‚ungkue=Į‚Ungkue
+controlledvocabulary.language.Įƒxoo=ĮƒXÃŗÃĩ
+controlledvocabulary.language.not_applicable=Not Applicable
diff --git a/src/main/java/propertyFiles/codeMeta20.properties b/src/main/java/propertyFiles/codeMeta20.properties
new file mode 100644
index 00000000000..4f3eb087aa4
--- /dev/null
+++ b/src/main/java/propertyFiles/codeMeta20.properties
@@ -0,0 +1,86 @@
+metadatablock.name=codeMeta20
+metadatablock.displayName=Software Metadata (CodeMeta v2.0)
+metadatablock.displayFacet=Software
+datasetfieldtype.codeVersion.title=Software Version
+datasetfieldtype.codeVersion.description=Version of the software instance, usually following some convention like SemVer etc.
+datasetfieldtype.codeVersion.watermark=e.g. 0.2.1 or 1.3 or 2021.1 etc
+datasetfieldtype.developmentStatus.title=Development Status
+datasetfieldtype.developmentStatus.description=Description of development status, e.g. work in progress (wip), active, etc. See repostatus.org for more information.
+datasetfieldtype.developmentStatus.watermark=                                                                                                                       Development Status
+datasetfieldtype.codeRepository.title=Code Repository
+datasetfieldtype.codeRepository.description=Link to the repository where the un-compiled, human-readable code and related code is located (SVN, GitHub, CodePlex, institutional GitLab instance, Gitea, etc.).
+datasetfieldtype.codeRepository.watermark=e.g. https://github.com/user/project
+datasetfieldtype.applicationCategory.title=Application Category
+datasetfieldtype.applicationCategory.description=Type of software application, e.g. Simulation, Analysis, Visualisation.
+datasetfieldtype.applicationCategory.watermark=
+datasetfieldtype.applicationSubCategory.title=Application Subcategory
+datasetfieldtype.applicationSubCategory.description=Subcategory of the application, e.g. Arcade Game.
+datasetfieldtype.applicationSubCategory.watermark=
+datasetfieldtype.programmingLanguage.title=Programming Language
+datasetfieldtype.programmingLanguage.description=The programming language(s) used to implement the software (e.g. Python, C++, Matlab, Fortran, Java, Julia,...)
+datasetfieldtype.programmingLanguage.watermark=
+datasetfieldtype.runtimePlatform.title=Runtime Platform
+datasetfieldtype.runtimePlatform.description=Runtime platform or script interpreter dependencies (e.g. Java 11, Python 3.10 or .Net Framework 4.8).
+datasetfieldtype.runtimePlatform.watermark=e.g. Python 3.10
+datasetfieldtype.operatingSystem.title=Operating Systems
+datasetfieldtype.operatingSystem.description=Operating systems supported (e.g. Windows 10, OSX 11.3, Android 11).
+datasetfieldtype.operatingSystem.watermark=
+datasetfieldtype.targetProduct.title=Target Product
+datasetfieldtype.targetProduct.description=Target Operating System / Product to which the code applies. If applies to several versions, just the product name can be used.
+datasetfieldtype.targetProduct.watermark=
+datasetfieldtype.buildInstructions.title=Build Instructions
+datasetfieldtype.buildInstructions.description=Link to installation instructions/documentation
+datasetfieldtype.buildInstructions.watermark=e.g. https://github.com/user/project/blob/main/BUILD.md
+datasetfieldtype.softwareRequirementsItem.title=Software Requirements
+datasetfieldtype.softwareRequirementsItem.description=Required software dependencies
+datasetfieldtype.softwareRequirementsItem.watermark=
+datasetfieldtype.softwareRequirements.title=Name & Version
+datasetfieldtype.softwareRequirements.description=Name and version of the required software/library dependency
+datasetfieldtype.softwareRequirements.watermark=e.g. Pandas 1.4.3
+datasetfieldtype.softwareRequirementsInfoUrl.title=Info URL
+datasetfieldtype.softwareRequirementsInfoUrl.description=Link to required software/library homepage or documentation (ideally also versioned)
+datasetfieldtype.softwareRequirementsInfoUrl.watermark=e.g. https://pandas.pydata.org/pandas-docs/version/1.4.3
+datasetfieldtype.softwareSuggestionsItem.title=Software Suggestions
+datasetfieldtype.softwareSuggestionsItem.description=Optional dependencies, e.g. for optional features, code development, etc.
+datasetfieldtype.softwareSuggestionsItem.watermark=
+datasetfieldtype.softwareSuggestions.title=Name & Version
+datasetfieldtype.softwareSuggestions.description=Name and version of the optional software/library dependency
+datasetfieldtype.softwareSuggestions.watermark=e.g. Sphinx 5.0.2
+datasetfieldtype.softwareSuggestionsInfoUrl.title=Info URL
+datasetfieldtype.softwareSuggestionsInfoUrl.description=Link to optional software/library homepage or documentation (ideally also versioned)
+datasetfieldtype.softwareSuggestionsInfoUrl.watermark=e.g. https://www.sphinx-doc.org
+datasetfieldtype.memoryRequirements.title=Memory Requirements
+datasetfieldtype.memoryRequirements.description=Minimum memory requirements.
+datasetfieldtype.memoryRequirements.watermark=
+datasetfieldtype.processorRequirements.title=Processor Requirements
+datasetfieldtype.processorRequirements.description=Processor architecture or other CPU requirements to run the application (e.g. IA64).
+datasetfieldtype.processorRequirements.watermark=
+datasetfieldtype.storageRequirements.title=Storage Requirements
+datasetfieldtype.storageRequirements.description=Minimum storage requirements (e.g. free space required).
+datasetfieldtype.storageRequirements.watermark=
+datasetfieldtype.permissions.title=Permissions
+datasetfieldtype.permissions.description=Permission(s) required to run the code (for example, a mobile app may require full internet access or may run only on wifi).
+datasetfieldtype.permissions.watermark=
+datasetfieldtype.softwareHelp.title=Software Help/Documentation
+datasetfieldtype.softwareHelp.description=Link to help texts or documentation
+datasetfieldtype.softwareHelp.watermark=e.g. https://user.github.io/project/docs
+datasetfieldtype.readme.title=Readme
+datasetfieldtype.readme.description=Link to the README of the project
+datasetfieldtype.readme.watermark=e.g. https://github.com/user/project/blob/main/README.md
+datasetfieldtype.releaseNotes.title=Release Notes
+datasetfieldtype.releaseNotes.description=Link to release notes
+datasetfieldtype.releaseNotes.watermark=e.g. https://github.com/user/project/blob/main/docs/release-0.1.md
+datasetfieldtype.contIntegration.title=Continuous Integration
+datasetfieldtype.contIntegration.description=Link to continuous integration service
+datasetfieldtype.contIntegration.watermark=e.g. https://github.com/user/project/actions
+datasetfieldtype.issueTracker.title=Issue Tracker
+datasetfieldtype.issueTracker.description=Link to software bug reporting or issue tracking system
+datasetfieldtype.issueTracker.watermark=e.g. https://github.com/user/project/issues
+controlledvocabulary.developmentStatus.concept=Concept
+controlledvocabulary.developmentStatus.wip=WIP
+controlledvocabulary.developmentStatus.active=Active
+controlledvocabulary.developmentStatus.inactive=Inactive
+controlledvocabulary.developmentStatus.unsupported=Unsupported
+controlledvocabulary.developmentStatus.moved=Moved
+controlledvocabulary.developmentStatus.suspended=Suspended
+controlledvocabulary.developmentStatus.abandoned=Abandoned
diff --git a/src/main/java/propertyFiles/computationalworkflow.properties b/src/main/java/propertyFiles/computationalworkflow.properties
new file mode 100644
index 00000000000..eb15ecf9982
--- /dev/null
+++ b/src/main/java/propertyFiles/computationalworkflow.properties
@@ -0,0 +1,27 @@
+metadatablock.name=computationalworkflow
+metadatablock.displayName=Computational Workflow Metadata
+metadatablock.displayFacet=Computational Workflow
+datasetfieldtype.workflowType.title=Workflow Type
+datasetfieldtype.workflowType.description=The kind of Computational Workflow, which is designed to compose and execute a series of computational or data manipulation steps in a scientific application
+datasetfieldtype.workflowType.watermark=
+datasetfieldtype.workflowCodeRepository.title=External Code Repository URL
+datasetfieldtype.workflowCodeRepository.description=A link to another public repository where the un-compiled, human-readable code and related code is also located (e.g., GitHub, GitLab, SVN)
+datasetfieldtype.workflowCodeRepository.watermark=https://...
+datasetfieldtype.workflowDocumentation.title=Documentation
+datasetfieldtype.workflowDocumentation.description=A link (URL) to the documentation or text describing the Computational Workflow and its use
+datasetfieldtype.workflowDocumentation.watermark=
+controlledvocabulary.workflowType.common_workflow_language_(cwl)=Common Workflow Language (CWL)
+controlledvocabulary.workflowType.workflow_description_language_(wdl)=Workflow Description Language (WDL)
+controlledvocabulary.workflowType.nextflow=Nextflow
+controlledvocabulary.workflowType.snakemake=Snakemake
+controlledvocabulary.workflowType.ruffus=Ruffus
+controlledvocabulary.workflowType.jupyter_notebook=Jupyter Notebook
+controlledvocabulary.workflowType.r_notebook=R Notebook
+controlledvocabulary.workflowType.dagman=DAGMan
+controlledvocabulary.workflowType.matlab_script=MATLAB Script
+controlledvocabulary.workflowType.bash_script=Bash Script
+controlledvocabulary.workflowType.makefile=Makefile
+controlledvocabulary.workflowType.other_python-based_workflow=Other Python-based workflow
+controlledvocabulary.workflowType.other_r-based_workflow=Other R-based workflow
+controlledvocabulary.workflowType.other=Other
+
diff --git a/src/main/java/propertyFiles/customARCS.properties b/src/main/java/propertyFiles/customARCS.properties
index e6665b94e64..8a19405208a 100644
--- a/src/main/java/propertyFiles/customARCS.properties
+++ b/src/main/java/propertyFiles/customARCS.properties
@@ -1,5 +1,6 @@
 metadatablock.name=customARCS
 metadatablock.displayName=Alliance for Research on Corporate Sustainability Metadata
+metadatablock.displayFacet=Alliance for Research on Corporate Sustainability
 datasetfieldtype.ARCS1.title=1) Were any of these data sets a) purchased, b) obtained through licensed databases, or c) provided by an organization under a nondisclosure or other agreement?
 datasetfieldtype.ARCS2.title=2) If you responded Yes to Q1, have you ensured that sharing the data does not violate terms of the agreement? If you responded No to Q1, please enter N/A here.
 datasetfieldtype.ARCS3.title=3) Do any of these data sets include individual-level data (either collected or pre-existing in the dataset) that might make them subject to U.S. or international human subjects considerations?
diff --git a/src/main/java/propertyFiles/customCHIA.properties b/src/main/java/propertyFiles/customCHIA.properties
index 0b05e388cee..0d59493da96 100644
--- a/src/main/java/propertyFiles/customCHIA.properties
+++ b/src/main/java/propertyFiles/customCHIA.properties
@@ -1,5 +1,6 @@
 metadatablock.name=customCHIA
 metadatablock.displayName=CHIA Metadata
+metadatablock.displayFacet=CHIA
 datasetfieldtype.sourceCHIA.title=Source
 datasetfieldtype.datesAdditionalInformationCHIA.title=Dates - Additional Information
 datasetfieldtype.variablesCHIA.title=Variables
diff --git a/src/main/java/propertyFiles/customDigaai.properties b/src/main/java/propertyFiles/customDigaai.properties
index 85d7df1f2b7..10bb8f23786 100644
--- a/src/main/java/propertyFiles/customDigaai.properties
+++ b/src/main/java/propertyFiles/customDigaai.properties
@@ -1,5 +1,6 @@
 metadatablock.name=customDigaai
 metadatablock.displayName=Digaai Metadata
+metadatablock.displayFacet=Digaai
 datasetfieldtype.titulo.title=Título
 datasetfieldtype.numero.title=Número
 datasetfieldtype.datadePublicao.title=Data de Publicaįão
@@ -52,4 +53,4 @@ controlledvocabulary.titulo.tc_brazil=TC Brazil
 controlledvocabulary.titulo.texas_magazine=Texas Magazine
 controlledvocabulary.titulo.the_brazilian_journal=The Brazilian Journal
 controlledvocabulary.titulo.today_magazine=Today Magazine
-controlledvocabulary.titulo.viver_magazine=Viver Magazine
\ No newline at end of file
+controlledvocabulary.titulo.viver_magazine=Viver Magazine
diff --git a/src/main/java/propertyFiles/customGSD.properties b/src/main/java/propertyFiles/customGSD.properties
index 15f118c73c4..2375596fe2f 100644
--- a/src/main/java/propertyFiles/customGSD.properties
+++ b/src/main/java/propertyFiles/customGSD.properties
@@ -1,5 +1,6 @@
 metadatablock.name=customGSD
 metadatablock.displayName=Graduate School of Design Metadata
+metadatablock.displayFacet=Graduate School of Design
 datasetfieldtype.gsdStudentName.title=Student Name
 datasetfieldtype.gsdStudentProgram.title=Student's Program of Study
 datasetfieldtype.gsdCourseName.title=Course Name
@@ -160,7 +161,6 @@ controlledvocabulary.gsdFacultyName.mcloskey,_karen=MCloskey, Karen
 controlledvocabulary.gsdFacultyName.mehrotra,_rahul=Mehrotra, Rahul
 controlledvocabulary.gsdFacultyName.menchaca,_alejandra=Menchaca, Alejandra
 controlledvocabulary.gsdFacultyName.menges,_achim=Menges, Achim
-controlledvocabulary.gsdFacultyName.menges,_achim=Menges, Achim
 controlledvocabulary.gsdFacultyName.michalatos,_panagiotis=Michalatos, Panagiotis
 controlledvocabulary.gsdFacultyName.moe,_kiel=Moe, Kiel
 controlledvocabulary.gsdFacultyName.molinsky,_jennifer=Molinsky, Jennifer
@@ -506,7 +506,6 @@ controlledvocabulary.gsdCourseName.06323:_brownfields_practicum=06323: Brownfiel
 controlledvocabulary.gsdCourseName.06333:_aquatic_ecology=06333: Aquatic Ecology
 controlledvocabulary.gsdCourseName.06335:_phytotechnologies=06335: Phytotechnologies
 controlledvocabulary.gsdCourseName.06337:_changing_natural_and_built_coastal_environments=06337: Changing Natural and Built Coastal Environments
-controlledvocabulary.gsdCourseName.06337:_changing_natural_and_built_coastal_environments=06337: Changing Natural and Built Coastal Environments
 controlledvocabulary.gsdCourseName.06338:_introduction_to_computational_design=06338: Introduction to Computational Design
 controlledvocabulary.gsdCourseName.06436:_expanded_mechanisms_/_empirical_materialisms=06436: Expanded Mechanisms / Empirical Materialisms
 controlledvocabulary.gsdCourseName.06450:_high_performance_buildings_and_systems_integration=06450: High Performance Buildings and Systems Integration
diff --git a/src/main/java/propertyFiles/customMRA.properties b/src/main/java/propertyFiles/customMRA.properties
index 8d905d266f0..5a702b980cc 100644
--- a/src/main/java/propertyFiles/customMRA.properties
+++ b/src/main/java/propertyFiles/customMRA.properties
@@ -1,5 +1,6 @@
 metadatablock.name=customMRA
 metadatablock.displayName=MRA Metadata
+metadatablock.displayFacet=MRA
 datasetfieldtype.mraCollection.title=Murray Research Archive Collection
 datasetfieldtype.mraCollection.description=Browse the Murray Research Archive collection with the following terms.
 datasetfieldtype.mraCollection.watermark=
diff --git a/src/main/java/propertyFiles/customPSI.properties b/src/main/java/propertyFiles/customPSI.properties
index e72e4e50222..a88b7409c5a 100644
--- a/src/main/java/propertyFiles/customPSI.properties
+++ b/src/main/java/propertyFiles/customPSI.properties
@@ -1,5 +1,6 @@
 metadatablock.name=customPSI
 metadatablock.displayName=PSI Metadata
+metadatablock.displayFacet=PSI
 datasetfieldtype.psiBehavior.title=Behavior
 datasetfieldtype.psiDonor.title=Donor
 datasetfieldtype.psiHealthArea.title=Health Area
diff --git a/src/main/java/propertyFiles/customPSRI.properties b/src/main/java/propertyFiles/customPSRI.properties
index 61370bb9fd1..9e76b412bd8 100644
--- a/src/main/java/propertyFiles/customPSRI.properties
+++ b/src/main/java/propertyFiles/customPSRI.properties
@@ -1,5 +1,6 @@
 metadatablock.name=customPSRI
 metadatablock.displayName=Political Science Replication Initiative Metadata
+metadatablock.displayFacet=Political Science Replication Initiative
 datasetfieldtype.PSRI1.title=Are the original data publicly available?
 datasetfieldtype.PSRI2.title=Is the original code available?
 datasetfieldtype.PSRI3.title=Where are the original data archived (name and url)?
diff --git a/src/main/java/propertyFiles/custom_hbgdki.properties b/src/main/java/propertyFiles/custom_hbgdki.properties
index 087c706d014..2386b5d00a2 100644
--- a/src/main/java/propertyFiles/custom_hbgdki.properties
+++ b/src/main/java/propertyFiles/custom_hbgdki.properties
@@ -1,5 +1,6 @@
 metadatablock.name=custom_hbgdki
 metadatablock.displayName=HBGDki Custom Metadata
+metadatablock.displayFacet=HBGDki
 datasetfieldtype.hbgdkiStudyName.title=Name of Study
 datasetfieldtype.hbgdkiStudyRegistry.title=Study Registry
 datasetfieldtype.hbgdkiStudyRegistryType.title=ID Type
diff --git a/src/main/java/propertyFiles/geospatial.properties b/src/main/java/propertyFiles/geospatial.properties
index e47982377cb..abfbf252e37 100644
--- a/src/main/java/propertyFiles/geospatial.properties
+++ b/src/main/java/propertyFiles/geospatial.properties
@@ -1,5 +1,6 @@
 metadatablock.name=geospatial
 metadatablock.displayName=Geospatial Metadata
+metadatablock.displayFacet=Geospatial
 datasetfieldtype.geographicCoverage.title=Geographic Coverage
 datasetfieldtype.country.title=Country / Nation
 datasetfieldtype.state.title=State / Province
@@ -7,10 +8,10 @@ datasetfieldtype.city.title=City
 datasetfieldtype.otherGeographicCoverage.title=Other
 datasetfieldtype.geographicUnit.title=Geographic Unit
 datasetfieldtype.geographicBoundingBox.title=Geographic Bounding Box
-datasetfieldtype.westLongitude.title=West Longitude
-datasetfieldtype.eastLongitude.title=East Longitude
-datasetfieldtype.northLongitude.title=North Latitude
-datasetfieldtype.southLongitude.title=South Latitude
+datasetfieldtype.westLongitude.title=Westernmost (Left) Longitude
+datasetfieldtype.eastLongitude.title=Easternmost (Right) Longitude
+datasetfieldtype.northLatitude.title=Northernmost (Top) Latitude
+datasetfieldtype.southLatitude.title=Southernmost (Bottom) Latitude
 datasetfieldtype.geographicCoverage.description=Information on the geographic coverage of the data. Includes the total geographic scope of the data.
 datasetfieldtype.country.description=The country or nation that the Dataset is about.
 datasetfieldtype.state.description=The state or province that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations.
@@ -18,10 +19,10 @@ datasetfieldtype.city.description=The name of the city that the Dataset is about
 datasetfieldtype.otherGeographicCoverage.description=Other information on the geographic coverage of the data.
 datasetfieldtype.geographicUnit.description=Lowest level of geographic aggregation covered by the Dataset, e.g., village, county, region.
 datasetfieldtype.geographicBoundingBox.description=The fundamental geometric description for any Dataset that models geography is the geographic bounding box. It describes the minimum box, defined by west and east longitudes and north and south latitudes, which includes the largest geographic extent of the  Dataset's geographic coverage. This element is used in the first pass of a coordinate-based search. Inclusion of this element in the codebook is recommended, but is required if the bound polygon box is included.
-datasetfieldtype.westLongitude.description=Westernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180,0 <= West  Bounding Longitude Value <= 180,0.
-datasetfieldtype.eastLongitude.description=Easternmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180,0 <= East Bounding Longitude Value <= 180,0.
-datasetfieldtype.northLongitude.description=Northernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90,0 <= North Bounding Latitude Value <= 90,0.
-datasetfieldtype.southLongitude.description=Southernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90,0 <= South Bounding Latitude Value <= 90,0.
+datasetfieldtype.westLongitude.description=Westernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180.0 <= West  Bounding Longitude Value <= 180.0.
+datasetfieldtype.eastLongitude.description=Easternmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180.0 <= East Bounding Longitude Value <= 180.0.
+datasetfieldtype.northLatitude.description=Northernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90.0 <= North Bounding Latitude Value <= 90.0.
+datasetfieldtype.southLatitude.description=Southernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90.0 <= South Bounding Latitude Value <= 90.0.
 datasetfieldtype.geographicCoverage.watermark=
 datasetfieldtype.country.watermark=
 datasetfieldtype.state.watermark=
@@ -31,8 +32,8 @@ datasetfieldtype.geographicUnit.watermark=
 datasetfieldtype.geographicBoundingBox.watermark=
 datasetfieldtype.westLongitude.watermark=
 datasetfieldtype.eastLongitude.watermark=
-datasetfieldtype.northLongitude.watermark=
-datasetfieldtype.southLongitude.watermark=
+datasetfieldtype.northLatitude.watermark=
+datasetfieldtype.southLatitude.watermark=
 controlledvocabulary.country.afghanistan=Afghanistan
 controlledvocabulary.country.albania=Albania
 controlledvocabulary.country.algeria=Algeria
@@ -88,10 +89,10 @@ controlledvocabulary.country.cook_islands=Cook Islands
 controlledvocabulary.country.costa_rica=Costa Rica
 controlledvocabulary.country.croatia=Croatia
 controlledvocabulary.country.cuba=Cuba
-controlledvocabulary.country.curacao=Curaįao
+controlledvocabulary.country.curacao=Curaçao
 controlledvocabulary.country.cyprus=Cyprus
 controlledvocabulary.country.czech_republic=Czech Republic
-controlledvocabulary.country.cote_d'ivoire=Côte d'Ivoire
+controlledvocabulary.country.cote_d'ivoire=Côte d'Ivoire
 controlledvocabulary.country.denmark=Denmark
 controlledvocabulary.country.djibouti=Djibouti
 controlledvocabulary.country.dominica=Dominica
@@ -215,8 +216,8 @@ controlledvocabulary.country.qatar=Qatar
 controlledvocabulary.country.romania=Romania
 controlledvocabulary.country.russian_federation=Russian Federation
 controlledvocabulary.country.rwanda=Rwanda
-controlledvocabulary.country.reunion=Réunion
-controlledvocabulary.country.saint_barthelemy=Saint Barthélemy
+controlledvocabulary.country.reunion=RÊunion
+controlledvocabulary.country.saint_barthelemy=Saint BarthÊlemy
 controlledvocabulary.country.saint_helena,_ascension_and_tristan_da_cunha=Saint Helena, Ascension and Tristan da Cunha
 controlledvocabulary.country.saint_kitts_and_nevis=Saint Kitts and Nevis
 controlledvocabulary.country.saint_lucia=Saint Lucia
@@ -281,4 +282,4 @@ controlledvocabulary.country.western_sahara=Western Sahara
 controlledvocabulary.country.yemen=Yemen
 controlledvocabulary.country.zambia=Zambia
 controlledvocabulary.country.zimbabwe=Zimbabwe
-controlledvocabulary.country.aland_islands=Åland Islands
\ No newline at end of file
+controlledvocabulary.country.aland_islands=Åland Islands
diff --git a/src/main/java/propertyFiles/journal.properties b/src/main/java/propertyFiles/journal.properties
index e17a9bd6d89..753b5895f0a 100644
--- a/src/main/java/propertyFiles/journal.properties
+++ b/src/main/java/propertyFiles/journal.properties
@@ -1,5 +1,6 @@
 metadatablock.name=journal
 metadatablock.displayName=Journal Metadata
+metadatablock.displayFacet=Journal
 datasetfieldtype.journalVolumeIssue.title=Journal
 datasetfieldtype.journalVolume.title=Volume
 datasetfieldtype.journalIssue.title=Issue
diff --git a/src/main/java/propertyFiles/socialscience.properties b/src/main/java/propertyFiles/socialscience.properties
index 91e73fa78b9..3698b32573f 100644
--- a/src/main/java/propertyFiles/socialscience.properties
+++ b/src/main/java/propertyFiles/socialscience.properties
@@ -1,5 +1,6 @@
 metadatablock.name=socialscience
 metadatablock.displayName=Social Science and Humanities Metadata
+metadatablock.displayFacet=Social Science and Humanities
 datasetfieldtype.unitOfAnalysis.title=Unit of Analysis
 datasetfieldtype.universe.title=Universe
 datasetfieldtype.timeMethod.title=Time Method
diff --git a/src/main/java/propertyFiles/staticSearchFields.properties b/src/main/java/propertyFiles/staticSearchFields.properties
new file mode 100644
index 00000000000..5e6f1144ac1
--- /dev/null
+++ b/src/main/java/propertyFiles/staticSearchFields.properties
@@ -0,0 +1,14 @@
+#FacetCategory - staticSearchFields
+staticSearchFields.metadata_type_ss=Dataset Feature
+staticSearchFields.dvCategory=Dataverse Category
+staticSearchFields.metadataSource=Metadata Source
+staticSearchFields.publicationDate=Publication Year
+staticSearchFields.license=License
+staticSearchFields.fileTypeGroupFacet=File Type
+staticSearchFields.dvObjectType=Type
+staticSearchFields.fileTag=File Tag
+staticSearchFields.fileAccess=Access
+staticSearchFields.publicationStatus=Publication Status
+staticSearchFields.subject_ss=Subject
+staticSearchFields.datasetType=Dataset Type
+staticSearchFields.curationStatus=Curation Status
diff --git a/src/main/resources/META-INF/batch-jobs/FileSystemImportJob.xml b/src/main/resources/META-INF/batch-jobs/FileSystemImportJob.xml
index 167fbdbec5d..0294f15e967 100644
--- a/src/main/resources/META-INF/batch-jobs/FileSystemImportJob.xml
+++ b/src/main/resources/META-INF/batch-jobs/FileSystemImportJob.xml
@@ -34,14 +34,14 @@
             </writer>
             <skippable-exception-classes>
                 <!-- To skip all the exceptions -->
-                <include class="javax.transaction.RollbackException"/>
+                <include class="jakarta.transaction.RollbackException"/>
                 <include class="java.lang.NullPointerException"/>
                 <include class="java.lang.Exception"/>
                 <include class="java.lang.Throwable"/>
             </skippable-exception-classes>
             <no-rollback-exception-classes>
                 <!-- To skip all the exceptions -->
-                <include class="javax.transaction.RollbackException"/>
+                <include class="jakarta.transaction.RollbackException"/>
                 <include class="java.lang.NullPointerException"/>
                 <include class="java.lang.Exception"/>
                 <include class="java.lang.Throwable"/>
diff --git a/src/main/resources/META-INF/ext-search-get/edu.harvard.iq.dataverse.search.SearchService b/src/main/resources/META-INF/ext-search-get/edu.harvard.iq.dataverse.search.SearchService
new file mode 100644
index 00000000000..b0b6850b89b
--- /dev/null
+++ b/src/main/resources/META-INF/ext-search-get/edu.harvard.iq.dataverse.search.SearchService
@@ -0,0 +1 @@
+edu.harvard.iq.dataverse.search.GetExternalSearchServiceBean
\ No newline at end of file
diff --git a/src/main/resources/META-INF/ext-search-post/edu.harvard.iq.dataverse.search.SearchService b/src/main/resources/META-INF/ext-search-post/edu.harvard.iq.dataverse.search.SearchService
new file mode 100644
index 00000000000..44a15f45f6d
--- /dev/null
+++ b/src/main/resources/META-INF/ext-search-post/edu.harvard.iq.dataverse.search.SearchService
@@ -0,0 +1 @@
+edu.harvard.iq.dataverse.search.PostExternalSearchServiceBean
\ No newline at end of file
diff --git a/src/main/resources/META-INF/javamail.default.address.map b/src/main/resources/META-INF/javamail.default.address.map
new file mode 100644
index 00000000000..b1115c9dc8c
--- /dev/null
+++ b/src/main/resources/META-INF/javamail.default.address.map
@@ -0,0 +1,2 @@
+# See https://jakartaee.github.io/mail-api/docs/api/jakarta.mail/jakarta/mail/Session.html
+rfc822=smtp
diff --git a/src/main/resources/META-INF/microprofile-aliases.properties b/src/main/resources/META-INF/microprofile-aliases.properties
new file mode 100644
index 00000000000..ebde2910d52
--- /dev/null
+++ b/src/main/resources/META-INF/microprofile-aliases.properties
@@ -0,0 +1,5 @@
+# NOTE
+# This file is a placeholder for future aliases of deprecated config settings.
+# Format:
+# dataverse.new.config.option=dataverse.old.deprecated.option
+dataverse.export.distributor.excludeinstallationifset=dataverse.settings.fromdb.ExportInstallationAsDistributorOnlyWhenNotSet
\ No newline at end of file
diff --git a/src/main/resources/META-INF/microprofile-config.properties b/src/main/resources/META-INF/microprofile-config.properties
new file mode 100644
index 00000000000..95f30b6ba1d
--- /dev/null
+++ b/src/main/resources/META-INF/microprofile-config.properties
@@ -0,0 +1,62 @@
+# GENERAL
+# Will be replaced by Maven property in /target via filtering (see <build><resources><resource>)
+dataverse.version=${project.version}
+dataverse.build=
+
+# Default only for containers! (keep mimicking the current behaviour -
+# changing that is part of https://github.com/IQSS/dataverse/issues/6636)
+%ct.dataverse.fqdn=localhost
+%ct.dataverse.siteUrl=http://${dataverse.fqdn}:8080
+
+# FILES
+# NOTE: The following uses STORAGE_DIR for both containers and classic installations. When defaulting to
+#       "com.sun.aas.instanceRoot" if not present, it equals the hardcoded default "." in glassfish-web.xml
+#       (which is relative to the domain root folder).
+#       Also, be aware that this props file cannot provide any value for lookups in glassfish-web.xml during servlet
+#       initialization, as this file will not have been read yet! The names and their values are in sync here and over
+#       there to ensure the config checker is able to check for the directories (exist + writeable).
+dataverse.files.directory=${STORAGE_DIR:/tmp/dataverse}
+dataverse.files.uploads=${STORAGE_DIR:${com.sun.aas.instanceRoot}}/uploads
+dataverse.files.docroot=${STORAGE_DIR:${com.sun.aas.instanceRoot}}/docroot
+dataverse.files.globus-cache-maxage=5
+dataverse.files.featured-items.image-maxsize=1000000
+dataverse.files.featured-items.image-uploads=featuredItems
+
+# SEARCH INDEX
+dataverse.solr.host=localhost
+# Activating mp config profile -Dmp.config.profile=ct changes default to "solr" as DNS name
+%ct.dataverse.solr.host=solr
+dataverse.solr.port=8983
+dataverse.solr.protocol=http
+dataverse.solr.core=collection1
+dataverse.solr.path=/solr/${dataverse.solr.core}
+
+# DATABASE
+dataverse.db.host=localhost
+dataverse.db.port=5432
+dataverse.db.user=dataverse
+dataverse.db.name=dataverse
+
+# RSERVE
+dataverse.rserve.host=localhost
+dataverse.rserve.port=6311
+dataverse.rserve.user=rserve
+dataverse.rserve.password=rserve
+dataverse.rserve.tempdir=/tmp/Rserv
+
+# MAIL
+dataverse.mail.debug=false
+dataverse.mail.mta.auth=false
+dataverse.mail.mta.allow-utf8-addresses=true
+
+# OAI SERVER
+dataverse.oai.server.maxidentifiers=100
+dataverse.oai.server.maxrecords=10
+dataverse.oai.server.maxsets=100
+# the OAI repository name, as shown by the Identify verb,
+# can be customized via the setting below:
+#dataverse.oai.server.repositoryname=
+
+# AUTHENTICATION
+dataverse.auth.oidc.pkce.max-cache-size=10000
+dataverse.auth.oidc.pkce.max-cache-age=300
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 8b4e33858ac..151410c04c2 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+<persistence version="3.0" xmlns="https://jakarta.ee/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
     <persistence-unit name="VDCNet-ejbPU" transaction-type="JTA">
-        <!-- provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider-->
         <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <jta-data-source>jdbc/VDCNetDS</jta-data-source>
+        <jta-data-source>java:app/jdbc/dataverse</jta-data-source>
         <properties>
-            <!--property name="toplink.logging.level" value="FINE"/-->
 	    <!-- disabling weaving, as an experiment: - L.A. -->
 	    <property name="eclipselink.weaving" value="false"/>
 	    <!-- comment out the line below to make the app NOT build 
@@ -18,17 +18,19 @@
             <!-- Uncomment next lines to show all SQL queries in the log -->
             <!--<property name="eclipselink.logging.level.sql" value="FINE"/>-->
             <!--<property name="eclipselink.logging.parameters" value="true"/>-->
+                 <!-- Cache configuration for DataFile entity -->
+        <property name="eclipselink.cache.size.edu.harvard.iq.dataverse.DataFile" value="5000"/>
+        <property name="eclipselink.cache.size.edu.harvard.iq.dataverse.FileMetadata" value="5000"/>
+        <property name="eclipselink.cache.type.edu.harvard.iq.dataverse.DataFile" value="WEAK"/>
+        <property name="eclipselink.cache.type.edu.harvard.iq.dataverse.FileMetadata" value="WEAK"/>
+        
+        
+        <!-- Default cache size for other entities -->
+        <property name="eclipselink.cache.size.default" value="1000"/>
+        
+        <!-- Cache type configuration -->
+        <property name="eclipselink.cache.type.default" value="SOFT"/>
+        
         </properties>
     </persistence-unit>
-    <!-- the persistence unit below is no longer necessary; needs to be removed 
-	 from gnrs/TestNRS and from here: - L.A. 
-    <persistence-unit name="VDCNet-test" transaction-type="RESOURCE_LOCAL">
-        <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
-        <properties>
-            <property name="toplink.jdbc.url" value="jdbc:postgresql://localhost:5432/VDCNet-dev"/>
-            <property name="toplink.jdbc.user" value="vdcApp"/>
-            <property name="toplink.jdbc.driver" value="org.postgresql.jdbc3.Jdbc3PoolingDataSource"/>
-            <property name="toplink.jdbc.password" value="secret"/>
-        </properties>
-    </persistence-unit -->
 </persistence>
diff --git a/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider b/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
new file mode 100644
index 00000000000..796f03d7ce3
--- /dev/null
+++ b/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
@@ -0,0 +1 @@
+edu.harvard.iq.dataverse.settings.spi.AliasConfigSourceProvider
diff --git a/src/main/resources/META-INF/trivial-search/edu.harvard.iq.dataverse.search.SearchService b/src/main/resources/META-INF/trivial-search/edu.harvard.iq.dataverse.search.SearchService
new file mode 100644
index 00000000000..ef4c2e97ca4
--- /dev/null
+++ b/src/main/resources/META-INF/trivial-search/edu.harvard.iq.dataverse.search.SearchService
@@ -0,0 +1,2 @@
+edu.harvard.iq.dataverse.search.OddlyEnoughSearchServiceBean
+edu.harvard.iq.dataverse.search.GoldenOldiesSearchServiceBean
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V1__flyway_schema_baseline.sql b/src/main/resources/db/migration/V1__flyway_schema_baseline.sql
index e69de29bb2d..d1caa63cd71 100644
--- a/src/main/resources/db/migration/V1__flyway_schema_baseline.sql
+++ b/src/main/resources/db/migration/V1__flyway_schema_baseline.sql
@@ -0,0 +1,2 @@
+-- TODO: we still should add the real base line here, too. That would avoid conflicts between EclipseLink
+--       trying to create new tables on existing databases. See https://github.com/IQSS/dataverse/issues/5871
diff --git a/src/main/resources/db/migration/V4.17.0.2__3578-file-page-preview.sql b/src/main/resources/db/migration/V4.17.0.2__3578-file-page-preview.sql
new file mode 100644
index 00000000000..152700ed96c
--- /dev/null
+++ b/src/main/resources/db/migration/V4.17.0.2__3578-file-page-preview.sql
@@ -0,0 +1,5 @@
+ALTER TABLE externalTool
+ADD COLUMN IF NOT EXISTS hasPreviewMode BOOLEAN;
+UPDATE externaltool SET hasPreviewMode = false;
+ALTER TABLE externaltool ALTER COLUMN hasPreviewMode SET NOT NULL;
+
diff --git a/src/main/resources/db/migration/V4.18.1.1__6459-contenttype-nullable.sql b/src/main/resources/db/migration/V4.18.1.1__6459-contenttype-nullable.sql
new file mode 100644
index 00000000000..79eab8583f0
--- /dev/null
+++ b/src/main/resources/db/migration/V4.18.1.1__6459-contenttype-nullable.sql
@@ -0,0 +1,2 @@
+-- contenttype can be null because dataset tools do not require it
+ALTER TABLE externaltool ALTER contenttype DROP NOT NULL;
diff --git a/src/main/resources/db/migration/V4.19.0.1__6485_multistore.sql b/src/main/resources/db/migration/V4.19.0.1__6485_multistore.sql
new file mode 100644
index 00000000000..84364169614
--- /dev/null
+++ b/src/main/resources/db/migration/V4.19.0.1__6485_multistore.sql
@@ -0,0 +1,3 @@
+ALTER TABLE dataverse
+ADD COLUMN IF NOT EXISTS storagedriver TEXT;
+UPDATE dvobject set storageidentifier=CONCAT('file://', storageidentifier) where storageidentifier not like '%://%' and dtype='DataFile';
diff --git a/src/main/resources/db/migration/V4.19.0.2__6644-update-editor-role-alias.sql b/src/main/resources/db/migration/V4.19.0.2__6644-update-editor-role-alias.sql
new file mode 100644
index 00000000000..7eccdb5f3c4
--- /dev/null
+++ b/src/main/resources/db/migration/V4.19.0.2__6644-update-editor-role-alias.sql
@@ -0,0 +1,2 @@
+
+update dataverserole set alias = 'contributor' where alias = 'editor';
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V4.20.0.1__2734-alter-data-table-add-orig-file-name.sql b/src/main/resources/db/migration/V4.20.0.1__2734-alter-data-table-add-orig-file-name.sql
new file mode 100644
index 00000000000..edde8821045
--- /dev/null
+++ b/src/main/resources/db/migration/V4.20.0.1__2734-alter-data-table-add-orig-file-name.sql
@@ -0,0 +1,2 @@
+
+ALTER TABLE datatable ADD COLUMN  IF NOT EXISTS originalfilename character varying(255);
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V4.20.0.2__6748-configure-dropdown-toolname.sql b/src/main/resources/db/migration/V4.20.0.2__6748-configure-dropdown-toolname.sql
new file mode 100644
index 00000000000..e360b0adfb6
--- /dev/null
+++ b/src/main/resources/db/migration/V4.20.0.2__6748-configure-dropdown-toolname.sql
@@ -0,0 +1,2 @@
+ALTER TABLE externaltool
+ADD COLUMN IF NOT EXISTS  toolname VARCHAR(255);
diff --git a/src/main/resources/db/migration/V4.20.0.3__6558-file-validation.sql b/src/main/resources/db/migration/V4.20.0.3__6558-file-validation.sql
new file mode 100644
index 00000000000..3e5e742968c
--- /dev/null
+++ b/src/main/resources/db/migration/V4.20.0.3__6558-file-validation.sql
@@ -0,0 +1,4 @@
+-- the lock type "pidRegister" has been removed in 4.20, replaced with "finalizePublication" type
+-- (since this script is run as the application is being deployed, any background pid registration 
+-- job is definitely no longer running - so we do want to remove any such locks left behind)
+DELETE FROM DatasetLock WHERE reason='pidRegister';
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V4.20.0.4__6936-maildomain-groups.sql b/src/main/resources/db/migration/V4.20.0.4__6936-maildomain-groups.sql
new file mode 100644
index 00000000000..8c89b66fdec
--- /dev/null
+++ b/src/main/resources/db/migration/V4.20.0.4__6936-maildomain-groups.sql
@@ -0,0 +1 @@
+ALTER TABLE persistedglobalgroup ADD COLUMN IF NOT EXISTS emaildomains text;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V4.20.0.5__6505-zipdownload-jobs.sql b/src/main/resources/db/migration/V4.20.0.5__6505-zipdownload-jobs.sql
new file mode 100644
index 00000000000..484d5dd0784
--- /dev/null
+++ b/src/main/resources/db/migration/V4.20.0.5__6505-zipdownload-jobs.sql
@@ -0,0 +1,2 @@
+-- maybe temporary? - work in progress
+CREATE TABLE IF NOT EXISTS CUSTOMZIPSERVICEREQUEST (KEY VARCHAR(63), STORAGELOCATION VARCHAR(255), FILENAME VARCHAR(255), ISSUETIME TIMESTAMP);
diff --git a/src/main/resources/db/migration/V5.0.0.1__6872-assign-storage-drivers-to-datasets.sql b/src/main/resources/db/migration/V5.0.0.1__6872-assign-storage-drivers-to-datasets.sql
new file mode 100644
index 00000000000..453b2054c43
--- /dev/null
+++ b/src/main/resources/db/migration/V5.0.0.1__6872-assign-storage-drivers-to-datasets.sql
@@ -0,0 +1 @@
+ALTER TABLE dataset ADD COLUMN  IF NOT EXISTS storagedriver VARCHAR(255);
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V5.1.1.1__7344-maildomaingroups-add-regex-flag.sql b/src/main/resources/db/migration/V5.1.1.1__7344-maildomaingroups-add-regex-flag.sql
new file mode 100644
index 00000000000..c19e40d605c
--- /dev/null
+++ b/src/main/resources/db/migration/V5.1.1.1__7344-maildomaingroups-add-regex-flag.sql
@@ -0,0 +1 @@
+ALTER TABLE persistedglobalgroup ADD COLUMN  IF NOT EXISTS isRegEx BOOLEAN NOT NULL DEFAULT FALSE;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V5.1.1.2__6919-preview-tools.sql b/src/main/resources/db/migration/V5.1.1.2__6919-preview-tools.sql
new file mode 100644
index 00000000000..e12acaed452
--- /dev/null
+++ b/src/main/resources/db/migration/V5.1.1.2__6919-preview-tools.sql
@@ -0,0 +1,22 @@
+-- #6919 is about making preview tools first class instead a dimension of
+-- explore tools. Toward that end, we are dropping the "hasPreviewMode" column
+-- that was used to indicate that an explore tool had a preview mode. We are
+-- also moving the "type" column to a new dedicated table called
+-- "externaltooltype".
+DO $$
+BEGIN
+-- Migrate existing external tools into to new schema. This is for upgrades,
+-- which have a "type" column from when the entity had a "type" field.
+IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='externaltool' AND column_name='type') THEN
+  -- For each explore tool that has preview, make an EXPLORE row.
+  insert into externaltooltype(externaltool_id,type) select id,'EXPLORE' from externaltool where haspreviewmode = true and type = 'EXPLORE';
+  -- For each explore tool that has preview, make a PREVIEW row.
+  insert into externaltooltype(externaltool_id,type) select id,'PREVIEW' from externaltool where haspreviewmode = true and type = 'EXPLORE';
+  -- For all the other tools, make a row.
+  insert into externaltooltype(externaltool_id,type) select id,type from externaltool where haspreviewmode = false or type != 'EXPLORE';
+END IF;
+-- Drop "type" and "haspreviewmode" from externaltool.
+alter table externaltool drop column if exists type;
+alter table externaltool drop column if exists haspreviewmode;
+END
+$$
diff --git a/src/main/resources/db/migration/V5.10.1.1__8533-semantic-updates.sql b/src/main/resources/db/migration/V5.10.1.1__8533-semantic-updates.sql
new file mode 100644
index 00000000000..b42aebc3ff6
--- /dev/null
+++ b/src/main/resources/db/migration/V5.10.1.1__8533-semantic-updates.sql
@@ -0,0 +1,11 @@
+DO $$
+BEGIN
+
+  BEGIN
+    ALTER TABLE datasetfieldtype ADD CONSTRAINT datasetfieldtype_name_key UNIQUE(name);
+  EXCEPTION
+    WHEN duplicate_table THEN RAISE NOTICE 'Table unique constraint datasetfieldtype_name_key already exists';
+  END;
+
+END $$;
+
diff --git a/src/main/resources/db/migration/V5.10.1.2__7492-muting-notifications.sql b/src/main/resources/db/migration/V5.10.1.2__7492-muting-notifications.sql
new file mode 100644
index 00000000000..7f3944b57ff
--- /dev/null
+++ b/src/main/resources/db/migration/V5.10.1.2__7492-muting-notifications.sql
@@ -0,0 +1,5 @@
+ALTER TABLE authenticateduser
+ADD COLUMN IF NOT EXISTS mutedemails TEXT;
+
+ALTER TABLE authenticateduser
+ADD COLUMN IF NOT EXISTS mutednotifications TEXT;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V5.10.1.3__8599-legacy-templates.sql b/src/main/resources/db/migration/V5.10.1.3__8599-legacy-templates.sql
new file mode 100644
index 00000000000..5027c48df59
--- /dev/null
+++ b/src/main/resources/db/migration/V5.10.1.3__8599-legacy-templates.sql
@@ -0,0 +1,10 @@
+-- this script finds legacy templates that do not hava an associated termsofuseandaccess 
+-- and creates / links a termsofuseandaccess to them
+with  _update as 
+(
+update template set termsofuseandaccess_id =  nextval('termsofuseandaccess_id_seq' )
+where termsofuseandaccess_id is null
+returning termsofuseandaccess_id
+)
+insert into termsofuseandaccess (id, fileaccessrequest, license_id) (select termsofuseandaccess_id, false, 1 from _update)
+
diff --git a/src/main/resources/db/migration/V5.11.1.1__8605-support-archival-status.sql b/src/main/resources/db/migration/V5.11.1.1__8605-support-archival-status.sql
new file mode 100644
index 00000000000..cf708ad0ea9
--- /dev/null
+++ b/src/main/resources/db/migration/V5.11.1.1__8605-support-archival-status.sql
@@ -0,0 +1,2 @@
+UPDATE datasetversion SET archivalCopyLocation = CONCAT('{"status":"success", "message":"', archivalCopyLocation,'"}') where archivalCopyLocation is not null and not archivalCopyLocation='Attempted';
+UPDATE datasetversion SET archivalCopyLocation = CONCAT('{"status":"failure", "message":"Attempted"}') where archivalCopyLocation='Attempted';
diff --git a/src/main/resources/db/migration/V5.11.1.3__hdc-3b.sql b/src/main/resources/db/migration/V5.11.1.3__hdc-3b.sql
new file mode 100644
index 00000000000..af8143a97d6
--- /dev/null
+++ b/src/main/resources/db/migration/V5.11.1.3__hdc-3b.sql
@@ -0,0 +1 @@
+ALTER TABLE usernotification ADD COLUMN IF NOT EXISTS additionalinfo VARCHAR;
diff --git a/src/main/resources/db/migration/V5.11.1.4__hdc-3b2-template-instructions.sql b/src/main/resources/db/migration/V5.11.1.4__hdc-3b2-template-instructions.sql
new file mode 100644
index 00000000000..df1d3068159
--- /dev/null
+++ b/src/main/resources/db/migration/V5.11.1.4__hdc-3b2-template-instructions.sql
@@ -0,0 +1,14 @@
+ALTER TABLE template ADD COLUMN IF NOT EXISTS instructions TEXT;
+
+ALTER TABLE dataset ADD COLUMN IF NOT EXISTS template_id BIGINT;
+
+DO $$
+BEGIN
+
+  BEGIN
+    ALTER TABLE dataset ADD CONSTRAINT fx_dataset_template_id FOREIGN KEY (template_id) REFERENCES template(id);
+  EXCEPTION
+    WHEN duplicate_object THEN RAISE NOTICE 'Table constraint fk_dataset_template_id already exists';
+  END;
+
+END $$;
diff --git a/src/main/resources/db/migration/V5.11.1.5__8536-metadata-block-facet.sql b/src/main/resources/db/migration/V5.11.1.5__8536-metadata-block-facet.sql
new file mode 100644
index 00000000000..47435004b6d
--- /dev/null
+++ b/src/main/resources/db/migration/V5.11.1.5__8536-metadata-block-facet.sql
@@ -0,0 +1,11 @@
+ALTER TABLE dataverse
+    ADD COLUMN IF NOT EXISTS metadatablockfacetroot BOOLEAN;
+
+UPDATE dataverse SET metadatablockfacetroot = false;
+
+CREATE TABLE IF NOT EXISTS dataversemetadatablockfacet (
+    id  SERIAL NOT NULL,
+    dataverse_id BIGINT NOT NULL,
+    metadatablock_id BIGINT NOT NULL,
+    PRIMARY KEY (ID)
+);
diff --git a/src/main/resources/db/migration/V5.11.1.6__storageconstraint.sql b/src/main/resources/db/migration/V5.11.1.6__storageconstraint.sql
new file mode 100644
index 00000000000..c2629213e98
--- /dev/null
+++ b/src/main/resources/db/migration/V5.11.1.6__storageconstraint.sql
@@ -0,0 +1,10 @@
+DO $$
+BEGIN
+
+  BEGIN
+    ALTER TABLE dvobject ADD CONSTRAINT chk_dvobject_storageidentifier check (strpos(storageidentifier,'..') = 0);
+  EXCEPTION
+    WHEN duplicate_object THEN RAISE NOTICE 'Table constraint chk_dvobject_storageidentifier already exists';
+  END;
+
+END $$;
diff --git a/src/main/resources/db/migration/V5.12.1.1__8671-sorting_licenses.sql b/src/main/resources/db/migration/V5.12.1.1__8671-sorting_licenses.sql
new file mode 100644
index 00000000000..6fe3f1142c2
--- /dev/null
+++ b/src/main/resources/db/migration/V5.12.1.1__8671-sorting_licenses.sql
@@ -0,0 +1,5 @@
+ALTER TABLE license
+ADD COLUMN IF NOT EXISTS sortorder BIGINT NOT NULL DEFAULT 0;
+
+CREATE INDEX IF NOT EXISTS license_sortorder_id
+ON license (sortorder, id);
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V5.12.1.2__7715-signed-urls-for-tools.sql b/src/main/resources/db/migration/V5.12.1.2__7715-signed-urls-for-tools.sql
new file mode 100644
index 00000000000..5e13de057dd
--- /dev/null
+++ b/src/main/resources/db/migration/V5.12.1.2__7715-signed-urls-for-tools.sql
@@ -0,0 +1 @@
+ALTER TABLE externaltool ADD COLUMN IF NOT EXISTS allowedapicalls TEXT;
diff --git a/src/main/resources/db/migration/V5.12.1.3__8840-improve-guestbook-estimates.sql b/src/main/resources/db/migration/V5.12.1.3__8840-improve-guestbook-estimates.sql
new file mode 100644
index 00000000000..91ab5253f9c
--- /dev/null
+++ b/src/main/resources/db/migration/V5.12.1.3__8840-improve-guestbook-estimates.sql
@@ -0,0 +1 @@
+ALTER TABLE guestbookresponse SET (autovacuum_analyze_scale_factor = 0.01);
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V5.12.1.4__9153-extract-metadata.sql b/src/main/resources/db/migration/V5.12.1.4__9153-extract-metadata.sql
new file mode 100644
index 00000000000..48230d21032
--- /dev/null
+++ b/src/main/resources/db/migration/V5.12.1.4__9153-extract-metadata.sql
@@ -0,0 +1 @@
+ALTER TABLE externaltool ADD COLUMN IF NOT EXISTS requirements TEXT;
diff --git a/src/main/resources/db/migration/V5.12.1.5__9231_custom_headers_oai_requests.sql b/src/main/resources/db/migration/V5.12.1.5__9231_custom_headers_oai_requests.sql
new file mode 100644
index 00000000000..fe6d717b2a3
--- /dev/null
+++ b/src/main/resources/db/migration/V5.12.1.5__9231_custom_headers_oai_requests.sql
@@ -0,0 +1 @@
+ALTER TABLE harvestingclient ADD COLUMN IF NOT EXISTS customhttpheaders TEXT;
diff --git a/src/main/resources/db/migration/V5.13.0.1__8092-timestamp-of-data-access-request.sql b/src/main/resources/db/migration/V5.13.0.1__8092-timestamp-of-data-access-request.sql
new file mode 100644
index 00000000000..603b69bf47f
--- /dev/null
+++ b/src/main/resources/db/migration/V5.13.0.1__8092-timestamp-of-data-access-request.sql
@@ -0,0 +1,24 @@
+-- remove multiple File access requests which are
+-- in violation of the new key
+CREATE TABLE tmp_fileaccessrequests (datafile_id bigint NOT NULL, authenticated_user_id INT);
+
+insert into tmp_fileaccessrequests 
+select distinct datafile_id, authenticated_user_id from fileaccessrequests;
+
+DROP TABLE fileaccessrequests;
+
+ALTER TABLE tmp_fileaccessrequests 
+    RENAME TO fileaccessrequests;
+
+ALTER TABLE fileaccessrequests
+ADD COLUMN IF NOT EXISTS creation_time TIMESTAMP WITHOUT TIME ZONE DEFAULT now();
+
+ALTER TABLE  fileaccessrequests ADD  CONSTRAINT fileaccessrequests_pkey PRIMARY KEY (authenticated_user_id, datafile_id);
+ALTER TABLE  fileaccessrequests ADD  CONSTRAINT fk_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id)
+        REFERENCES public.authenticateduser (id) MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE NO ACTION;
+ALTER TABLE  fileaccessrequests ADD     CONSTRAINT fk_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id)
+        REFERENCES public.dvobject (id) MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE NO ACTION
diff --git a/src/main/resources/db/migration/V5.13.0.2__8889-filepids-in-collections.sql b/src/main/resources/db/migration/V5.13.0.2__8889-filepids-in-collections.sql
new file mode 100644
index 00000000000..5e6ce945fe2
--- /dev/null
+++ b/src/main/resources/db/migration/V5.13.0.2__8889-filepids-in-collections.sql
@@ -0,0 +1 @@
+ALTER TABLE dataverse ADD COLUMN IF NOT EXISTS filePIDsEnabled bool;
diff --git a/src/main/resources/db/migration/V5.2.0.1__7256-purge-referencedata.sql b/src/main/resources/db/migration/V5.2.0.1__7256-purge-referencedata.sql
new file mode 100644
index 00000000000..176629f9abb
--- /dev/null
+++ b/src/main/resources/db/migration/V5.2.0.1__7256-purge-referencedata.sql
@@ -0,0 +1,17 @@
+-- #5361 and #7256 is about faster deployments, especially during development, sitting on an empty database.
+--
+-- This script has been part of  scripts/database/reference_data.sql that had to be executed manually on every new
+-- deployment (manually in the sense of Flyway didn't, the outside installer or an admin took care of it).
+--
+-- While this is pretty old stuff and should have been done earlier (baseline...), it will be a nice migration
+-- and behave like nothing happened if this is an existing installation. All new installation have an empty database
+-- on first app boot and benefit from this Flyway-based management.
+
+-- This is unsupported by JPA, as it is PostgreSQL specific. Has to be done here, cannot be done in code.
+-- (Only other option would be a lowercase copy of the data as a separate column, automatically filled py JPA)
+CREATE UNIQUE INDEX IF NOT EXISTS dataverse_alias_unique_idx on dataverse (LOWER(alias));
+CREATE UNIQUE INDEX IF NOT EXISTS index_authenticateduser_lower_email ON authenticateduser (lower(email));
+
+-- Edit Dataset: Investigate and correct multiple draft issue: https://github.com/IQSS/dataverse/issues/2132
+-- This unique index will prevent the multiple draft issue, yet it cannot be done in JPA code.
+CREATE UNIQUE INDEX IF NOT EXISTS one_draft_version_per_dataset ON datasetversion (dataset_id) WHERE versionstate='DRAFT';
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V5.3.0.1__7409-remove-worldmap-geoconnect.sql b/src/main/resources/db/migration/V5.3.0.1__7409-remove-worldmap-geoconnect.sql
new file mode 100644
index 00000000000..c42a9e3c081
--- /dev/null
+++ b/src/main/resources/db/migration/V5.3.0.1__7409-remove-worldmap-geoconnect.sql
@@ -0,0 +1,6 @@
+-- psql:src/main/resources/db/migration/V5.3.0.1__7409-remove-worldmap-geoconnect.sql:5: ERROR:  cannot drop table worldmapauth_tokentype because other objects depend on it
+-- DETAIL:  constraint fk_worldmapauth_token_application_id on table worldmapauth_token depends on table worldmapauth_tokentype
+-- HINT:  Use DROP ... CASCADE to drop the dependent objects too.
+drop table if exists worldmapauth_tokentype cascade;
+drop table if exists worldmapauth_token;
+drop table if exists maplayermetadata;
diff --git a/src/main/resources/db/migration/V5.3.0.2__7512-update-notification-types.sql b/src/main/resources/db/migration/V5.3.0.2__7512-update-notification-types.sql
new file mode 100644
index 00000000000..c063aba38f8
--- /dev/null
+++ b/src/main/resources/db/migration/V5.3.0.2__7512-update-notification-types.sql
@@ -0,0 +1,6 @@
+--In support of removing world map we are deleting notifications related to world map
+--and updating notifications to reflect the current enumeration of types on UserNotification
+
+delete from usernotification where type = 5 or type = 6;
+
+update usernotification set type = type - 2 where type > 6;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V5.3.0.3__7551-expanded-compound-datasetfield-validation.sql b/src/main/resources/db/migration/V5.3.0.3__7551-expanded-compound-datasetfield-validation.sql
new file mode 100644
index 00000000000..f9cb9d0e526
--- /dev/null
+++ b/src/main/resources/db/migration/V5.3.0.3__7551-expanded-compound-datasetfield-validation.sql
@@ -0,0 +1,16 @@
+-- update required attribute of parents of compound fields where a subfield is required
+UPDATE datasetfieldtype SET required=true 
+WHERE id IN 
+(SELECT parentdatasetfieldtype_id FROM datasetfieldtype WHERE required=true);
+
+
+-- add input level rows for parents of compound fields  where a subfield has required input level
+-- (first run a delete to clear out any possible existing parent values)
+DELETE FROM dataversefieldtypeinputlevel WHERE datasetfieldtype_id in (
+SELECT parentdatasetfieldtype_id FROM datasetfieldtype dsft);
+  
+INSERT INTO dataversefieldtypeinputlevel (include,required,datasetfieldtype_id,dataverse_id)
+SELECT DISTINCT true, true, parentdatasetfieldtype_id, dataverse_id FROM
+dataversefieldtypeinputlevel dsftil, datasetfieldtype dsft
+WHERE dsftil.datasetfieldtype_id = dsft.id
+AND parentdatasetfieldtype_id IS NOT null;
diff --git a/src/main/resources/db/migration/V5.3.0.4__7563-workflow.sql b/src/main/resources/db/migration/V5.3.0.4__7563-workflow.sql
new file mode 100644
index 00000000000..085a2e4bba3
--- /dev/null
+++ b/src/main/resources/db/migration/V5.3.0.4__7563-workflow.sql
@@ -0,0 +1,2 @@
+ALTER TABLE pendingworkflowinvocation
+ADD COLUMN IF NOT EXISTS lockid bigint;
diff --git a/src/main/resources/db/migration/V5.3.0.5__7564-workflow.sql b/src/main/resources/db/migration/V5.3.0.5__7564-workflow.sql
new file mode 100644
index 00000000000..d2a8d48726e
--- /dev/null
+++ b/src/main/resources/db/migration/V5.3.0.5__7564-workflow.sql
@@ -0,0 +1,2 @@
+ALTER TABLE workflowcomment
+ADD COLUMN IF NOT EXISTS tobeshown boolean;
diff --git a/src/main/resources/db/migration/V5.3.0.6__2419-deactivate-users.sql b/src/main/resources/db/migration/V5.3.0.6__2419-deactivate-users.sql
new file mode 100644
index 00000000000..a5e4b69e00b
--- /dev/null
+++ b/src/main/resources/db/migration/V5.3.0.6__2419-deactivate-users.sql
@@ -0,0 +1,6 @@
+-- Users can be deactivated.
+ALTER TABLE authenticateduser ADD COLUMN IF NOT EXISTS deactivated BOOLEAN;
+-- Prevent old users from having null for deactivated.
+UPDATE authenticateduser SET deactivated = false WHERE deactivated IS NULL;
+-- A timestamp of when the user was deactivated.
+ALTER TABLE authenticateduser ADD COLUMN IF NOT EXISTS deactivatedtime timestamp without time zone;
diff --git a/src/main/resources/db/migration/V5.4.1.1__7400-opendp-download.sql b/src/main/resources/db/migration/V5.4.1.1__7400-opendp-download.sql
new file mode 100644
index 00000000000..de1a18b1e01
--- /dev/null
+++ b/src/main/resources/db/migration/V5.4.1.1__7400-opendp-download.sql
@@ -0,0 +1 @@
+ALTER TABLE auxiliaryfile ADD COLUMN IF NOT EXISTS type character varying(255);
diff --git a/src/main/resources/db/migration/V5.5.0.1__7826-set-deactivated-not-null.sql b/src/main/resources/db/migration/V5.5.0.1__7826-set-deactivated-not-null.sql
new file mode 100644
index 00000000000..2f2877a6d59
--- /dev/null
+++ b/src/main/resources/db/migration/V5.5.0.1__7826-set-deactivated-not-null.sql
@@ -0,0 +1,7 @@
+/* 
+Add not null constraint to deactivated column of authenticated user
+ */
+
+ALTER TABLE authenticateduser
+ALTER COLUMN deactivated SET NOT NULL;
+
diff --git a/src/main/resources/db/migration/V5.5.0.2__7177-newmetrics.sql b/src/main/resources/db/migration/V5.5.0.2__7177-newmetrics.sql
new file mode 100644
index 00000000000..6779e45d86a
--- /dev/null
+++ b/src/main/resources/db/migration/V5.5.0.2__7177-newmetrics.sql
@@ -0,0 +1,13 @@
+
+alter table metric add column if not exists dataverse_id bigint;
+
+DO $$
+BEGIN
+
+  BEGIN
+    alter table metric add constraint fk_metric_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES dataverse(id);
+  EXCEPTION
+    WHEN duplicate_object THEN RAISE NOTICE 'Table constraint fk_metric_dataverse_id already exists';
+  END;
+
+END $$;
diff --git a/src/main/resources/db/migration/V5.5.0.3__1724-anonymizedaccess.sql b/src/main/resources/db/migration/V5.5.0.3__1724-anonymizedaccess.sql
new file mode 100644
index 00000000000..da016361596
--- /dev/null
+++ b/src/main/resources/db/migration/V5.5.0.3__1724-anonymizedaccess.sql
@@ -0,0 +1,2 @@
+ALTER TABLE roleassignment ADD COLUMN IF NOT EXISTS privateurlanonymizedaccess boolean;
+
diff --git a/src/main/resources/db/migration/V5.5.0.4__7451-unique-constraint-storageidentifier.sql b/src/main/resources/db/migration/V5.5.0.4__7451-unique-constraint-storageidentifier.sql
new file mode 100644
index 00000000000..93104da27a6
--- /dev/null
+++ b/src/main/resources/db/migration/V5.5.0.4__7451-unique-constraint-storageidentifier.sql
@@ -0,0 +1,10 @@
+-- ALTER TABLE dvobject ADD CONSTRAINT unq_dvobject_storageidentifier UNIQUE(owner_id, storageidentifier);
+-- Instead of a uniform constraint on all dvobjects (as above), force a 
+-- conditional unique constraint on datafiles only:
+CREATE UNIQUE INDEX IF NOT EXISTS unq_dvobject_storageidentifier ON dvobject (owner_id, storageidentifier) WHERE dtype='DataFile';
+-- This is not going to have any effect on new databases (since v4.20+), 
+-- where the table was created with the full constraint; but for legacy 
+-- installations it would spare them having to clean up any dataset-level 
+-- storageidentifiers. We know that some old installations have datasets 
+-- with junk values in that column (like "file" - ??) that are meaningless,
+-- but otherwise harmless.   
diff --git a/src/main/resources/db/migration/V5.5.0.5__7548-stored-procedure-update.sql b/src/main/resources/db/migration/V5.5.0.5__7548-stored-procedure-update.sql
new file mode 100644
index 00000000000..6377f2ddec2
--- /dev/null
+++ b/src/main/resources/db/migration/V5.5.0.5__7548-stored-procedure-update.sql
@@ -0,0 +1,33 @@
+-- If the installation is using a stored procedure for generating
+-- sequential numeric identifiers, create a wrapper function that
+-- works with the new framework (the stored procedure now needs to
+-- return a string) and update the database setting
+DO $BODY$
+BEGIN
+  UPDATE setting SET content='storedProcGenerated' 
+    WHERE name=':IdentifierGenerationStyle'
+    AND content='sequentialNumber';
+  BEGIN
+    PERFORM generateIdentifierAsSequentialNumber();
+  EXCEPTION
+    -- If the above function does not exist, we can stop executing this script
+    WHEN undefined_function THEN
+      RETURN;
+  END;
+  BEGIN
+    PERFORM generateIdentifierFromStoredProcedure();
+  EXCEPTION
+    -- We only create this function if it doesn't already exist,
+    -- to avoid overwriting user modifications 
+    WHEN undefined_function THEN
+      CREATE FUNCTION generateIdentifierFromStoredProcedure()
+      RETURNS varchar AS $$
+      DECLARE
+          identifier varchar;
+      BEGIN
+          identifier := generateIdentifierAsSequentialNumber()::varchar;
+          RETURN identifier;
+      END;
+      $$ LANGUAGE plpgsql IMMUTABLE;
+  END;
+END $BODY$;
diff --git a/src/main/resources/db/migration/V5.5.0.6__7388_i18n_metadata.sql b/src/main/resources/db/migration/V5.5.0.6__7388_i18n_metadata.sql
new file mode 100644
index 00000000000..0b4ee97c78d
--- /dev/null
+++ b/src/main/resources/db/migration/V5.5.0.6__7388_i18n_metadata.sql
@@ -0,0 +1,4 @@
+ALTER TABLE dataverse
+ADD COLUMN IF NOT EXISTS metadatalanguage TEXT;
+ALTER TABLE dataset
+ADD COLUMN IF NOT EXISTS metadatalanguage TEXT;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V5.6.0.1__7967_external-curation-labels.sql b/src/main/resources/db/migration/V5.6.0.1__7967_external-curation-labels.sql
new file mode 100644
index 00000000000..0f2c799482a
--- /dev/null
+++ b/src/main/resources/db/migration/V5.6.0.1__7967_external-curation-labels.sql
@@ -0,0 +1,4 @@
+ALTER TABLE datasetversion ADD COLUMN IF NOT EXISTS externalstatuslabel varchar(32);
+ALTER TABLE dataverse ADD COLUMN IF NOT EXISTS externallabelsetname varchar(32);
+ALTER TABLE dataset ADD COLUMN IF NOT EXISTS externallabelsetname varchar(32);
+
diff --git a/src/main/resources/db/migration/V5.7.0.1__7743-add-embargo-fk-to-datafiles.sql b/src/main/resources/db/migration/V5.7.0.1__7743-add-embargo-fk-to-datafiles.sql
new file mode 100644
index 00000000000..413aa9412fb
--- /dev/null
+++ b/src/main/resources/db/migration/V5.7.0.1__7743-add-embargo-fk-to-datafiles.sql
@@ -0,0 +1 @@
+ALTER TABLE datafile ADD COLUMN IF NOT EXISTS embargo_id BIGINT;
diff --git a/src/main/resources/db/migration/V5.8.0.1__8109-add-manage-files-permission.sql b/src/main/resources/db/migration/V5.8.0.1__8109-add-manage-files-permission.sql
new file mode 100644
index 00000000000..2fae7f4d8df
--- /dev/null
+++ b/src/main/resources/db/migration/V5.8.0.1__8109-add-manage-files-permission.sql
@@ -0,0 +1,25 @@
+/* We're adding a new permission at bit 10 (512 ManageFilePermissions) that should be set for any role that has the permission
+ in bit 9 (256 ManageDatasetPermissions).
+That means that any roles with current bits 10-13 (512+1024+2048+4096 = 7680) needs to have the corresponding bits 11-14 set 
+after the update, which can be accomplished by adding permissionbits & 7680 to the original value. (So a role with just bit 10 
+set (512) would have 512&7680 (=512) added to it and become bit 11 (1024). The same logic also shifts any values in bits 11-13 
+into bits 12-14.
+
+In addition, any role wite permission for bit 9 set now should also have bit 10 set after the update 
+(any current role with ManageDatasetPermissions gets ManageDatasetPermissions and ManageFilePermissions after the update).
+To do this we just add an addition bit 10 (512) if permissionbits&256!=0
+
+Finally, to make this idempotent, at least under the assumption that the standard admin role with all permissions 
+(or some role with current permission bit 13 set), we check to make sure no role has bit 14+ set - max(permissionsbits) <8192. 
+With the IF statement, running this script more than once will only cause an update on the first pass.
+
+*/
+DO
+$do$
+BEGIN
+   IF (SELECT MAX(permissionbits) FROM dataverserole) < 8192 THEN
+     UPDATE dataverserole SET permissionbits=permissionbits + (permissionbits & 7680)  WHERE (permissionbits & 256 =0);
+     UPDATE dataverserole SET permissionbits=permissionbits + (permissionbits & 7680) +512 WHERE (permissionbits & 256 !=0);
+   END IF;
+END
+$do$;
diff --git a/src/main/resources/db/migration/V5.8.0.2__8018-invalid-characters.sql b/src/main/resources/db/migration/V5.8.0.2__8018-invalid-characters.sql
new file mode 100644
index 00000000000..359a3092278
--- /dev/null
+++ b/src/main/resources/db/migration/V5.8.0.2__8018-invalid-characters.sql
@@ -0,0 +1,14 @@
+DO $$
+BEGIN
+-- Run on UTF8 only. It's known to fail on SQL_ASCII encoding.
+IF EXISTS (SELECT 1 FROM information_schema.character_sets WHERE character_set_name='UTF8') THEN
+  -- This list of characters also appears in DatasetFieldValidator.java
+  -- Remove character: form feed (\f)
+  UPDATE datasetfieldvalue SET value = regexp_replace(value, E'\f', '', 'g');
+  -- Remove character: start of text (\u0002)
+  UPDATE datasetfieldvalue SET value = regexp_replace(value, U&'\0002', '', 'g');
+  -- Remove character: not a character (\ufffe)
+  UPDATE datasetfieldvalue SET value = regexp_replace(value, U&'\FFFE', '', 'g');
+END IF;
+END
+$$
diff --git a/src/main/resources/db/migration/V5.8.0.3__7804-optimizations.sql b/src/main/resources/db/migration/V5.8.0.3__7804-optimizations.sql
new file mode 100644
index 00000000000..810f6220d94
--- /dev/null
+++ b/src/main/resources/db/migration/V5.8.0.3__7804-optimizations.sql
@@ -0,0 +1,30 @@
+-- This creates a function that ESTIMATES the size of the
+-- GuestbookResponse table (for the metrics display), instead
+-- of relying on straight "SELECT COUNT(*) ..."
+-- Significant potential savings for an active installation.
+
+CREATE OR REPLACE FUNCTION estimateGuestBookResponseTableSize()
+RETURNS bigint AS $$
+DECLARE
+  estimatedsize bigint;
+BEGIN
+  SELECT CASE WHEN relpages=0 THEN 0
+       	      ELSE ((reltuples / relpages)
+	           * (pg_relation_size('public.guestbookresponse') / current_setting('block_size')::int))::bigint
+         END
+	 FROM   pg_class
+	 WHERE  oid = 'public.guestbookresponse'::regclass INTO estimatedsize;
+
+     if estimatedsize = 0 then
+     SELECT COUNT(id) FROM guestbookresponse INTO estimatedsize;
+     END if;   
+
+  RETURN estimatedsize;
+END;
+$$ LANGUAGE plpgsql IMMUTABLE;
+
+-- Extra indexes for the DatasetVersion table
+CREATE INDEX index_datasetversion_termsofuseandaccess_id ON datasetversion (termsofuseandaccess_id);
+-- TODO: what else?
+
+
diff --git a/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql b/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql
new file mode 100644
index 00000000000..a8f7f41e2ef
--- /dev/null
+++ b/src/main/resources/db/migration/V5.9.0.1__7440-configurable-license-list.sql
@@ -0,0 +1,82 @@
+ALTER TABLE termsofuseandaccess ADD COLUMN IF NOT EXISTS license_id BIGINT;
+
+DO $$
+BEGIN
+  BEGIN
+    ALTER TABLE termsofuseandaccess ADD CONSTRAINT fk_termsofuseandcesss_license_id foreign key (license_id) REFERENCES license(id);
+  EXCEPTION
+    WHEN duplicate_object THEN RAISE NOTICE 'Table constraint fk_termsofuseandcesss_license_id already exists';
+  END;
+
+  BEGIN
+      INSERT INTO license (uri, name, shortdescription, active, isDefault, iconurl) VALUES ('http://creativecommons.org/publicdomain/zero/1.0', 'CC0','You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.',true, true, '/resources/images/cc0.png');
+  EXCEPTION
+    WHEN unique_violation THEN RAISE NOTICE 'CC0 has already been added to the license table';
+  END;
+
+  BEGIN
+      UPDATE termsofuseandaccess
+        SET license_id = (SELECT license.id FROM license WHERE license.name = 'CC0')
+        WHERE license = 'CC0'
+          AND license_id IS NULL
+          AND termsofuse IS null
+          AND confidentialitydeclaration IS null
+          AND specialpermissions IS null
+          AND restrictions IS null
+          AND citationrequirements IS null
+          AND depositorrequirements IS null
+          AND conditions IS null
+          AND disclaimer IS null;
+
+      UPDATE termsofuseandaccess
+        SET termsofuse=CONCAT('This dataset is made available under a Creative Commons CC0 license with the following additional/modified terms and conditions: ', termsofuse)
+        WHERE license = 'CC0'
+          AND license_id IS NULL
+          AND NOT (termsofuse IS null
+          AND confidentialitydeclaration IS null
+          AND specialpermissions IS null
+          AND restrictions IS null
+          AND citationrequirements IS null
+          AND depositorrequirements IS null
+          AND conditions IS null
+          AND disclaimer IS null);
+
+      UPDATE termsofuseandaccess
+        SET termsofuse='This dataset is made available with limited information on how it can be used. You may wish to communicate with the Contact(s) specified before use.'
+        WHERE license = 'NONE'
+          AND license_id IS NULL
+          AND termsofuse IS null
+          AND NOT (confidentialitydeclaration IS null
+          AND specialpermissions IS null
+          AND restrictions IS null
+          AND citationrequirements IS null
+          AND depositorrequirements IS null
+          AND conditions IS null
+          AND disclaimer IS null);
+
+      UPDATE termsofuseandaccess
+        SET termsofuse='This dataset is made available without information on how it can be used. You should communicate with the Contact(s) specified before use.'
+        WHERE license = 'NONE'
+          AND license_id IS NULL
+          AND termsofuse IS null
+          AND confidentialitydeclaration IS null
+          AND specialpermissions IS null
+          AND restrictions IS null
+          AND citationrequirements IS null
+          AND depositorrequirements IS null
+          AND conditions IS null
+          AND disclaimer IS null;
+
+  EXCEPTION
+    WHEN undefined_column THEN RAISE NOTICE 'license is not in table - new instance';
+  END;
+  
+  -- This section updates the db of those who ran the develop branch and does not make changes for new installs or upgrades from v5.9
+  BEGIN
+    UPDATE license SET shortdescription='Creative Commons CC0 1.0 Universal Public Domain Dedication.' WHERE name='CC0';
+    UPDATE license SET iconurl='https://licensebuttons.net/p/zero/1.0/88x31.png' WHERE name='CC0';
+    UPDATE license SET name='CC0 1.0' WHERE name='CC0';
+  END;
+
+END $$;
+ALTER TABLE termsofuseandaccess DROP COLUMN IF EXISTS license;
diff --git a/src/main/resources/db/migration/V6.0.0.1__9599-guestbook-at-request.sql b/src/main/resources/db/migration/V6.0.0.1__9599-guestbook-at-request.sql
new file mode 100644
index 00000000000..c90ee4a5329
--- /dev/null
+++ b/src/main/resources/db/migration/V6.0.0.1__9599-guestbook-at-request.sql
@@ -0,0 +1,63 @@
+ALTER TABLE fileaccessrequests ADD COLUMN IF NOT EXISTS request_state VARCHAR(64);
+ALTER TABLE fileaccessrequests ADD COLUMN IF NOT EXISTS id SERIAL;
+ALTER TABLE fileaccessrequests DROP CONSTRAINT IF EXISTS fileaccessrequests_pkey;
+ALTER TABLE fileaccessrequests ADD CONSTRAINT fileaccessrequests_pkey PRIMARY KEY (id);
+ALTER TABLE fileaccessrequests ADD COLUMN IF NOT EXISTS guestbookresponse_id INT;
+ALTER TABLE fileaccessrequests DROP CONSTRAINT IF EXISTS fk_fileaccessrequests_guestbookresponse;
+ALTER TABLE fileaccessrequests ADD CONSTRAINT fk_fileaccessrequests_guestbookresponse FOREIGN KEY (guestbookresponse_id) REFERENCES guestbookresponse(id);
+DROP INDEX IF EXISTS created_requests;
+CREATE UNIQUE INDEX created_requests ON fileaccessrequests (datafile_id, authenticated_user_id) WHERE request_state='CREATED';
+
+ALTER TABLE dataverse ADD COLUMN IF NOT EXISTS guestbookatrequest bool;
+ALTER TABLE dataset ADD COLUMN IF NOT EXISTS guestbookatrequest bool;
+
+ALTER TABLE guestbookresponse ADD COLUMN IF NOT EXISTS eventtype VARCHAR(255);
+ALTER TABLE guestbookresponse ADD COLUMN IF NOT EXISTS sessionid VARCHAR(255);
+
+DO $$
+    BEGIN 
+        IF EXISTS (select 1 from pg_class where relname='filedownload') THEN 
+
+            UPDATE guestbookresponse g 
+                SET eventtype = (SELECT downloadtype FROM filedownload f where f.guestbookresponse_id = g.id), 
+                    sessionid = (SELECT sessionid FROM filedownload f where f.guestbookresponse_id=g.id);
+            DROP TABLE filedownload;
+        END IF;
+    END
+   $$ ;
+   
+   
+-- This creates a function that ESTIMATES the size of the
+-- GuestbookResponse table (for the metrics display), instead
+-- of relying on straight "SELECT COUNT(*) ..."
+-- It uses statistics to estimate the number of guestbook entries
+-- and the fraction of them related to downloads,
+-- i.e. those that weren't created for 'AccessRequest' events.
+-- Significant potential savings for an active installation.
+-- See https://github.com/IQSS/dataverse/issues/8840 and 
+-- https://github.com/IQSS/dataverse/pull/8972 for more details
+
+CREATE OR REPLACE FUNCTION estimateGuestBookResponseTableSize()
+RETURNS bigint AS $$
+DECLARE
+  estimatedsize bigint;
+BEGIN
+  SELECT CASE WHEN relpages<10 THEN 0
+              ELSE ((reltuples / relpages)
+               * (pg_relation_size('public.guestbookresponse') / current_setting('block_size')::int))::bigint
+               * (SELECT CASE WHEN ((select count(*) from pg_stats where tablename='guestbookresponse') = 0 
+                   OR (select array_position(most_common_vals::text::text[], 'AccessRequest') 
+                       FROM pg_stats WHERE tablename='guestbookresponse' AND attname='eventtype') IS NULL) THEN 1
+                   ELSE 1 - (SELECT (most_common_freqs::text::text[])[array_position(most_common_vals::text::text[], 'AccessRequest')]::bigint
+                       FROM pg_stats WHERE tablename='guestbookresponse' and attname='eventtype') END)
+         END
+     FROM   pg_class
+     WHERE  oid = 'public.guestbookresponse'::regclass INTO estimatedsize;
+
+     if estimatedsize = 0 then
+     SELECT COUNT(id) FROM guestbookresponse WHERE eventtype!= 'AccessRequest' INTO estimatedsize;
+     END if;   
+
+  RETURN estimatedsize;
+END;
+$$ LANGUAGE plpgsql IMMUTABLE;
diff --git a/src/main/resources/db/migration/V6.0.0.2__9763-embargocitationdate.sql b/src/main/resources/db/migration/V6.0.0.2__9763-embargocitationdate.sql
new file mode 100644
index 00000000000..536798015ba
--- /dev/null
+++ b/src/main/resources/db/migration/V6.0.0.2__9763-embargocitationdate.sql
@@ -0,0 +1,14 @@
+-- An aggregated timestamp which is the latest of the availability dates of any embargoed files in the first published version, if present 
+ALTER TABLE dataset ADD COLUMN IF NOT EXISTS embargoCitationDate timestamp without time zone;
+-- ... and an update query that will populate this column for all the published datasets with embargoed files in the first released version:
+UPDATE dataset SET embargocitationdate=o.embargocitationdate
+FROM (SELECT d.id, MAX(e.dateavailable) AS embargocitationdate
+FROM embargo e, dataset d, datafile f, datasetversion v, filemetadata m
+WHERE v.dataset_id = d.id
+AND v.versionstate = 'RELEASED'
+AND v.versionnumber = 1
+AND v.minorversionnumber = 0
+AND f.embargo_id = e.id
+AND m.datasetversion_id = v.id
+AND m.datafile_id = f.id GROUP BY d.id) o WHERE o.id = dataset.id;
+-- (the query follows the logic that used to be in the method Dataset.getCitationDate() that calculated this adjusted date in real time). 
diff --git a/src/main/resources/db/migration/V6.0.0.3__10095-guestbook-at-request2.sql b/src/main/resources/db/migration/V6.0.0.3__10095-guestbook-at-request2.sql
new file mode 100644
index 00000000000..b6157e6a782
--- /dev/null
+++ b/src/main/resources/db/migration/V6.0.0.3__10095-guestbook-at-request2.sql
@@ -0,0 +1,34 @@
+-- This creates a function that ESTIMATES the size of the
+-- GuestbookResponse table (for the metrics display), instead
+-- of relying on straight "SELECT COUNT(*) ..."
+-- It uses statistics to estimate the number of guestbook entries
+-- and the fraction of them related to downloads,
+-- i.e. those that weren't created for 'AccessRequest' events.
+-- Significant potential savings for an active installation.
+-- See https://github.com/IQSS/dataverse/issues/8840 and 
+-- https://github.com/IQSS/dataverse/pull/8972 for more details
+
+CREATE OR REPLACE FUNCTION estimateGuestBookResponseTableSize()
+RETURNS bigint AS $$
+DECLARE
+  estimatedsize bigint;
+BEGIN
+  SELECT CASE WHEN relpages<10 THEN 0
+              ELSE ((reltuples / relpages)
+               * (pg_relation_size('public.guestbookresponse') / current_setting('block_size')::int))::bigint
+               * (SELECT CASE WHEN ((select count(*) from pg_stats where tablename='guestbookresponse') = 0 
+                   OR (select array_position(most_common_vals::text::text[], 'AccessRequest') 
+                       FROM pg_stats WHERE tablename='guestbookresponse' AND attname='eventtype') IS NULL) THEN 1
+                   ELSE 1 - (SELECT (most_common_freqs::text::text[])[array_position(most_common_vals::text::text[], 'AccessRequest')]::float
+                       FROM pg_stats WHERE tablename='guestbookresponse' and attname='eventtype') END)
+         END
+     FROM   pg_class
+     WHERE  oid = 'public.guestbookresponse'::regclass INTO estimatedsize;
+
+     if estimatedsize = 0 then
+     SELECT COUNT(id) FROM guestbookresponse WHERE eventtype!= 'AccessRequest' INTO estimatedsize;
+     END if;   
+
+  RETURN estimatedsize;
+END;
+$$ LANGUAGE plpgsql IMMUTABLE;
diff --git a/src/main/resources/db/migration/V6.0.0.4__10093-privateurluser_id_update.sql b/src/main/resources/db/migration/V6.0.0.4__10093-privateurluser_id_update.sql
new file mode 100644
index 00000000000..260f191f557
--- /dev/null
+++ b/src/main/resources/db/migration/V6.0.0.4__10093-privateurluser_id_update.sql
@@ -0,0 +1 @@
+ update roleassignment set assigneeidentifier=replace(assigneeidentifier, '#','!') where assigneeidentifier like '#%';
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V6.0.0.5__8549-collection-quotas.sql b/src/main/resources/db/migration/V6.0.0.5__8549-collection-quotas.sql
new file mode 100644
index 00000000000..d6c067056ec
--- /dev/null
+++ b/src/main/resources/db/migration/V6.0.0.5__8549-collection-quotas.sql
@@ -0,0 +1,91 @@
+-- The somewhat convoluted queries below populate the storage sizes for the entire
+-- DvObject tree, fast. It IS possible, to do it all with one recursive PostgresQL
+-- query, that will crawl the tree from the leaves (DataFiles) up and add up the
+-- sizes for all the Datasets/Collections above. Unfortunately, that appears to take
+-- some hours on a database the size of the one at IQSS. So what we are doing
+-- instead is first compute the total sizes of all the *directly* linked objects,
+-- with a couple of linear queries. This will correctly calculate the sizes of all the
+-- Datasets (since they can only contain DataFiles, without any other hierarchy) and
+-- those Collections that only contain Datasets; but not the sizes of Collections that
+-- have sub-collections. To take any sub-collections into account we will then run
+-- a recursive query - but we only need to run it on the tree of Collections only,
+-- which makes it reasonably fast on any real life instance. 
+-- *Temporarily* add this "tempstoragesize" column to the DvObject table.
+-- It will be used to calculate the storage sizes of all the DvObjectContainers
+-- (Datasets and Collections), as a matter of convenience. Once calculated, the values
+-- will will be moved to the permanent StorageUse table. 
+ALTER TABLE dvobject ADD COLUMN IF NOT EXISTS tempStorageSize BIGINT;
+-- First we calculate the storage size of each individual dataset (a simple sum
+-- of the storage sizes of all the files in the dataset). 
+-- For datafiles, the storage size = main file size by default
+-- (we are excluding any harvested files and datasets):
+UPDATE dvobject SET tempStorageSize=o.combinedStorageSize
+FROM (SELECT datasetobject.id, SUM(file.filesize) AS combinedStorageSize
+FROM dvobject fileobject, dataset datasetobject, datafile file
+WHERE fileobject.owner_id = datasetobject.id
+AND fileobject.id = file.id
+AND datasetobject.harvestingclient_id IS null
+GROUP BY datasetobject.id) o, dataset ds WHERE o.id = dvobject.id AND dvobject.dtype='Dataset' AND dvobject.id = ds.id AND ds.harvestingclient_id IS null;
+
+-- ... but for ingested tabular files the size of the saved original needs to be added, since
+-- those also take space:
+-- (should be safe to assume that there are no *harvested ingested* files)
+UPDATE dvobject SET tempStorageSize=tempStorageSize+o.combinedStorageSize
+FROM (SELECT datasetobject.id, COALESCE(SUM(dt.originalFileSize),0) AS combinedStorageSize
+FROM dvobject fileobject, dvobject datasetobject, datafile file, datatable dt
+WHERE fileobject.owner_id = datasetobject.id
+AND fileobject.id = file.id
+AND dt.datafile_id = file.id
+GROUP BY datasetobject.id) o, dataset ds WHERE o.id = dvobject.id AND dvobject.dtype='Dataset' AND dvobject.id = ds.id AND ds.harvestingclient_id IS null;
+
+-- there may also be some auxiliary files registered in the database, such as
+-- the content generated and deposited by external tools - diff. privacy stats
+-- being one of the example. These are also considered the "payload" files that
+-- we want to count for the purposes of calculating storage use.
+UPDATE dvobject SET tempStorageSize=tempStorageSize+o.combinedStorageSize
+FROM (SELECT datasetobject.id, COALESCE(SUM(aux.fileSize),0) AS combinedStorageSize
+FROM dvobject fileobject, dvobject datasetobject, datafile file, auxiliaryFile aux
+WHERE fileobject.owner_id = datasetobject.id
+AND fileobject.id = file.id
+AND aux.datafile_id = file.id
+GROUP BY datasetobject.id) o, dataset ds WHERE o.id = dvobject.id AND dvobject.dtype='Dataset' AND dvobject.id = ds.id AND ds.harvestingclient_id IS null;
+
+
+-- ... and then we can repeat the same for collections, by setting the storage size
+-- to the sum of the storage sizes of the datasets *directly* in each collection:
+-- (no attemp is made yet to recursively count the sizes all the chilld sub-collections)
+UPDATE dvobject SET tempStorageSize=o.combinedStorageSize
+FROM (SELECT collectionobject.id, SUM(datasetobject.tempStorageSize) AS combinedStorageSize
+FROM dvobject datasetobject, dvobject collectionobject
+WHERE datasetobject.owner_id = collectionobject.id
+AND datasetobject.tempStorageSize IS NOT null 
+GROUP BY collectionobject.id) o WHERE o.id = dvobject.id AND dvobject.dtype='Dataverse';
+
+-- And now we will update the storage sizes of all the Collection ("Dataverse") objects
+-- that contain sub-collections, *recursively*, to add their sizes to the totals:
+WITH RECURSIVE treestorage (id, owner_id, tempStorageSize, dtype) AS
+(
+    -- All dataverses:
+    SELECT id, owner_id, tempStorageSize, dtype
+    FROM dvobject
+    WHERE dtype = 'Dataverse'
+
+    UNION ALL
+
+    -- Recursive Member:
+    SELECT dvobject.id, treestorage.owner_id, dvobject.tempStorageSize, treestorage.dtype
+    FROM treestorage, dvobject
+    WHERE treestorage.id = dvobject.owner_id
+    AND dvobject.dtype = 'Dataverse'
+)
+UPDATE dvobject SET tempStorageSize=tempStorageSize+(SELECT COALESCE(SUM(tempStorageSize),0)
+FROM treestorage WHERE owner_id=dvobject.id)
+WHERE dvobject.dtype = 'Dataverse'
+AND dvobject.id IN (SELECT owner_id FROM treestorage WHERE owner_id IS NOT null);
+
+-- And, finally, we can move these calculated storage sizes of datasets and
+-- collection to the dedicated new table StorageUse:
+INSERT INTO storageuse (dvobjectcontainer_id,sizeinbytes) (SELECT id, tempstoragesize FROM dvobject WHERE dtype = 'Dataverse');
+INSERT INTO storageuse (dvobjectcontainer_id,sizeinbytes) (SELECT d.id, o.tempstoragesize FROM dvobject o, dataset d WHERE o.id = d.id AND d.harvestingclient_id IS NULL);
+-- ... and drop the temporary column we added to DvObject earlier:
+ALTER TABLE dvobject DROP column tempStorageSize
diff --git a/src/main/resources/db/migration/V6.0.0.6__9506-track-thumb-failures.sql b/src/main/resources/db/migration/V6.0.0.6__9506-track-thumb-failures.sql
new file mode 100644
index 00000000000..156960d2011
--- /dev/null
+++ b/src/main/resources/db/migration/V6.0.0.6__9506-track-thumb-failures.sql
@@ -0,0 +1 @@
+ALTER TABLE dvobject ADD COLUMN IF NOT EXISTS previewimagefail BOOLEAN DEFAULT FALSE;
diff --git a/src/main/resources/db/migration/V6.1.0.1__9728-universe-variablemetadata.sql b/src/main/resources/db/migration/V6.1.0.1__9728-universe-variablemetadata.sql
new file mode 100644
index 00000000000..8e311c06b32
--- /dev/null
+++ b/src/main/resources/db/migration/V6.1.0.1__9728-universe-variablemetadata.sql
@@ -0,0 +1,2 @@
+-- increase field universe from 255 to text
+ALTER TABLE variablemetadata ALTER COLUMN universe TYPE text;
diff --git a/src/main/resources/db/migration/V6.1.0.2__8524-store-tabular-files-with-varheaders.sql b/src/main/resources/db/migration/V6.1.0.2__8524-store-tabular-files-with-varheaders.sql
new file mode 100644
index 00000000000..7c52a00107a
--- /dev/null
+++ b/src/main/resources/db/migration/V6.1.0.2__8524-store-tabular-files-with-varheaders.sql
@@ -0,0 +1 @@
+ALTER TABLE datatable ADD COLUMN IF NOT EXISTS storedWithVariableHeader BOOLEAN DEFAULT FALSE;
diff --git a/src/main/resources/db/migration/V6.1.0.3__9983-missing-unique-constraints.sql b/src/main/resources/db/migration/V6.1.0.3__9983-missing-unique-constraints.sql
new file mode 100644
index 00000000000..6cb3a455e4e
--- /dev/null
+++ b/src/main/resources/db/migration/V6.1.0.3__9983-missing-unique-constraints.sql
@@ -0,0 +1,16 @@
+DO $$
+BEGIN
+
+  BEGIN
+    ALTER TABLE externalvocabularyvalue ADD CONSTRAINT externalvocabularvalue_uri_key UNIQUE(uri);
+  EXCEPTION
+    WHEN duplicate_table THEN RAISE NOTICE 'Table unique constraint externalvocabularvalue_uri_key already exists';
+  END;
+  
+  BEGIN
+    ALTER TABLE oaiset ADD CONSTRAINT oaiset_spec_key UNIQUE(spec);
+  EXCEPTION
+    WHEN duplicate_table THEN RAISE NOTICE 'Table unique constraint oaiset_spec_key already exists';
+  END;
+
+END $$;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V6.1.0.4__5645-geospatial-fieldname-fix.sql b/src/main/resources/db/migration/V6.1.0.4__5645-geospatial-fieldname-fix.sql
new file mode 100644
index 00000000000..2ab8cbc802e
--- /dev/null
+++ b/src/main/resources/db/migration/V6.1.0.4__5645-geospatial-fieldname-fix.sql
@@ -0,0 +1,7 @@
+UPDATE datasetfieldtype
+SET name = 'northLatitude'
+WHERE name = 'northLongitude';
+
+UPDATE datasetfieldtype
+SET name = 'southLatitude'
+WHERE name = 'southLongitude';
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V6.1.0.5__3623-multiple-pid-providers.sql b/src/main/resources/db/migration/V6.1.0.5__3623-multiple-pid-providers.sql
new file mode 100644
index 00000000000..1d11e178abf
--- /dev/null
+++ b/src/main/resources/db/migration/V6.1.0.5__3623-multiple-pid-providers.sql
@@ -0,0 +1,2 @@
+ALTER TABLE dataverse ADD COLUMN IF NOT EXISTS pidgeneratorspecs TEXT;
+ALTER TABLE dataset ADD COLUMN IF NOT EXISTS pidgeneratorspecs TEXT;
diff --git a/src/main/resources/db/migration/V6.1.0.6.sql b/src/main/resources/db/migration/V6.1.0.6.sql
new file mode 100644
index 00000000000..c9942fb8480
--- /dev/null
+++ b/src/main/resources/db/migration/V6.1.0.6.sql
@@ -0,0 +1,2 @@
+-- Add flag to allow harvesting client to handle missing CVV values
+ALTER TABLE harvestingclient ADD COLUMN IF NOT EXISTS allowharvestingmissingcvv BOOLEAN;
diff --git a/src/main/resources/db/migration/V6.1.0.7.sql b/src/main/resources/db/migration/V6.1.0.7.sql
new file mode 100644
index 00000000000..470483e2bf4
--- /dev/null
+++ b/src/main/resources/db/migration/V6.1.0.7.sql
@@ -0,0 +1 @@
+ALTER TABLE authenticateduser ADD COLUMN IF NOT EXISTS ratelimittier int DEFAULT 1;
diff --git a/src/main/resources/db/migration/V6.2.0.1.sql b/src/main/resources/db/migration/V6.2.0.1.sql
new file mode 100644
index 00000000000..cb23d589542
--- /dev/null
+++ b/src/main/resources/db/migration/V6.2.0.1.sql
@@ -0,0 +1 @@
+ALTER TABLE datafile ADD COLUMN IF NOT EXISTS retention_id BIGINT;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V6.3.0.1.sql b/src/main/resources/db/migration/V6.3.0.1.sql
new file mode 100644
index 00000000000..fd9cd823868
--- /dev/null
+++ b/src/main/resources/db/migration/V6.3.0.1.sql
@@ -0,0 +1,10 @@
+UPDATE termsofuseandaccess SET license_id = (SELECT license.id FROM license WHERE license.name = 'CC0 1.0'), termsofuse = NULL
+WHERE termsofuse = 'This dataset is made available under a Creative Commons CC0 license with the following additional/modified terms and conditions: CC0 Waiver'
+  AND license_id IS null
+  AND confidentialitydeclaration IS null
+  AND specialpermissions IS null
+  AND restrictions IS null
+  AND citationrequirements IS null
+  AND depositorrequirements IS null
+  AND conditions IS null
+  AND disclaimer IS null;
diff --git a/src/main/resources/db/migration/V6.3.0.2.sql b/src/main/resources/db/migration/V6.3.0.2.sql
new file mode 100644
index 00000000000..7cf96538c95
--- /dev/null
+++ b/src/main/resources/db/migration/V6.3.0.2.sql
@@ -0,0 +1,2 @@
+-- Add thumbnail logo for featured dataverses
+ALTER TABLE dataversetheme ADD COLUMN IF NOT EXISTS logothumbnail VARCHAR(255);
diff --git a/src/main/resources/db/migration/V6.3.0.3.sql b/src/main/resources/db/migration/V6.3.0.3.sql
new file mode 100644
index 00000000000..ece87767bcb
--- /dev/null
+++ b/src/main/resources/db/migration/V6.3.0.3.sql
@@ -0,0 +1,30 @@
+-- Dataset types have been added. See #10517 and #10694
+--
+-- Insert the default dataset type: dataset (if not present).
+-- Inspired by https://stackoverflow.com/questions/4069718/postgres-insert-if-does-not-exist-already/13342031#13342031
+INSERT INTO datasettype
+  (name)
+SELECT 'dataset'
+WHERE
+  NOT EXISTS (
+    SELECT name FROM datasettype WHERE name = 'dataset'
+  );
+--
+-- Add the new column (if it doesn't exist).
+ALTER TABLE dataset ADD COLUMN IF NOT EXISTS datasettype_id bigint;
+--
+-- Add the foreign key.
+DO $$
+BEGIN
+  BEGIN
+    ALTER TABLE dataset ADD CONSTRAINT fk_dataset_datasettype_id FOREIGN KEY (datasettype_id) REFERENCES datasettype(id);
+  EXCEPTION
+    WHEN duplicate_object THEN RAISE NOTICE 'Table constraint fk_dataset_datasettype_id already exists';
+  END;
+END $$;
+--
+-- Give existing datasets a type of "dataset".
+UPDATE dataset SET datasettype_id = (SELECT id FROM datasettype WHERE name = 'dataset');
+--
+-- Make the column non-null.
+ALTER TABLE dataset ALTER COLUMN datasettype_id SET NOT NULL;
diff --git a/src/main/resources/db/migration/V6.4.0.1.sql b/src/main/resources/db/migration/V6.4.0.1.sql
new file mode 100644
index 00000000000..0bcd87dd736
--- /dev/null
+++ b/src/main/resources/db/migration/V6.4.0.1.sql
@@ -0,0 +1,4 @@
+-- Adding a case-insensitive index related to #11003
+--
+
+CREATE UNIQUE INDEX IF NOT EXISTS INDEX_DVOBJECT_authority_protocol_upper_identifier ON dvobject (authority, protocol, UPPER(identifier));
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V6.4.0.2.sql b/src/main/resources/db/migration/V6.4.0.2.sql
new file mode 100644
index 00000000000..bc4a85b278f
--- /dev/null
+++ b/src/main/resources/db/migration/V6.4.0.2.sql
@@ -0,0 +1,2 @@
+-- #10118
+ALTER TABLE customquestion ALTER COLUMN questionstring TYPE text;
diff --git a/src/main/resources/db/migration/V6.4.0.3.sql b/src/main/resources/db/migration/V6.4.0.3.sql
new file mode 100644
index 00000000000..307d8ed206c
--- /dev/null
+++ b/src/main/resources/db/migration/V6.4.0.3.sql
@@ -0,0 +1,2 @@
+-- Add this boolean flag to accommodate a new harvesting client feature
+ALTER TABLE harvestingclient ADD COLUMN IF NOT EXISTS useOaiIdAsPid BOOLEAN DEFAULT FALSE;
diff --git a/src/main/resources/db/migration/V6.5.0.1.sql b/src/main/resources/db/migration/V6.5.0.1.sql
new file mode 100644
index 00000000000..661924b54af
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.1.sql
@@ -0,0 +1,2 @@
+-- files are required to publish datasets
+ALTER TABLE dataverse ADD COLUMN IF NOT EXISTS requirefilestopublishdataset bool;
diff --git a/src/main/resources/db/migration/V6.5.0.10.sql b/src/main/resources/db/migration/V6.5.0.10.sql
new file mode 100644
index 00000000000..a04517c5eb8
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.10.sql
@@ -0,0 +1 @@
+ALTER TABLE makedatacountprocessstate ADD COLUMN IF NOT EXISTS server character varying(255) DEFAULT '';
diff --git a/src/main/resources/db/migration/V6.5.0.11.sql b/src/main/resources/db/migration/V6.5.0.11.sql
new file mode 100644
index 00000000000..13b554ca54c
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.11.sql
@@ -0,0 +1,4 @@
+-- Store authenticated orcid in URL form
+ALTER TABLE authenticateduser ADD COLUMN IF NOT EXISTS authenticatedorcid VARCHAR(45);
+ALTER TABLE authenticateduser DROP CONSTRAINT IF EXISTS orcid_unique;
+ALTER TABLE authenticateduser ADD CONSTRAINT orcid_unique UNIQUE (authenticatedorcid);
diff --git a/src/main/resources/db/migration/V6.5.0.12.sql b/src/main/resources/db/migration/V6.5.0.12.sql
new file mode 100644
index 00000000000..c1b21624c8e
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.12.sql
@@ -0,0 +1 @@
+CREATE INDEX IF NOT EXISTS index_dataversefieldtypeinputlevel_displayoncreate ON dataversefieldtypeinputlevel (displayoncreate);
diff --git a/src/main/resources/db/migration/V6.5.0.2.sql b/src/main/resources/db/migration/V6.5.0.2.sql
new file mode 100644
index 00000000000..804ce3c1ea8
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.2.sql
@@ -0,0 +1,10 @@
+-- Fixes File Access Requests when upgrading from Dataverse 6.0
+-- See: https://github.com/IQSS/dataverse/issues/10714
+DELETE FROM fileaccessrequests
+WHERE creation_time <> (SELECT MIN(creation_time)
+                        FROM fileaccessrequests far2
+                        WHERE far2.datafile_id  = fileaccessrequests.datafile_id
+                          AND far2.authenticated_user_id  = fileaccessrequests.authenticated_user_id
+                          AND far2.request_state is NULL);
+
+UPDATE fileaccessrequests SET request_state='CREATED' WHERE request_state is NULL;
diff --git a/src/main/resources/db/migration/V6.5.0.3.sql b/src/main/resources/db/migration/V6.5.0.3.sql
new file mode 100644
index 00000000000..e2814139e3d
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.3.sql
@@ -0,0 +1,2 @@
+-- #8739 map publisher tag to distributorName when harvesting
+update foreignmetadatafieldmapping set datasetfieldname = 'distributorName' where foreignfieldxpath = ':publisher';
diff --git a/src/main/resources/db/migration/V6.5.0.4.sql b/src/main/resources/db/migration/V6.5.0.4.sql
new file mode 100644
index 00000000000..9c3b24712e1
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.4.sql
@@ -0,0 +1,3 @@
+ALTER TABLE dvobject ADD COLUMN IF NOT EXISTS separator character varying(255) DEFAULT '';
+
+UPDATE dvobject SET separator='/' WHERE protocol = 'doi' OR protocol = 'hdl';
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V6.5.0.5.sql b/src/main/resources/db/migration/V6.5.0.5.sql
new file mode 100644
index 00000000000..d2b03040df8
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.5.sql
@@ -0,0 +1,70 @@
+ALTER TABLE license 
+ADD COLUMN IF NOT EXISTS rights_identifier  VARCHAR(255),
+ADD COLUMN IF NOT EXISTS rights_identifier_scheme VARCHAR(255),
+ADD COLUMN IF NOT EXISTS scheme_uri VARCHAR(255),
+ADD COLUMN IF NOT EXISTS language_code VARCHAR(5);
+
+-- Update existing entries
+
+UPDATE license SET 
+    rights_identifier = 'Apache-2.0',
+    rights_identifier_scheme = 'SPDX',
+    scheme_uri = 'https://spdx.org/licenses/',
+    language_code = 'en'
+WHERE uri = 'https://www.apache.org/licenses/LICENSE-2.0';
+
+UPDATE license SET 
+    rights_identifier = 'CC0-1.0',
+    rights_identifier_scheme = 'SPDX',
+    scheme_uri = 'https://spdx.org/licenses/',
+    language_code = 'en'
+WHERE uri = 'http://creativecommons.org/publicdomain/zero/1.0';
+
+UPDATE license SET 
+    rights_identifier = 'CC-BY-4.0',
+    rights_identifier_scheme = 'SPDX',
+    scheme_uri = 'https://spdx.org/licenses/',
+    language_code = 'en'
+WHERE uri = 'https://creativecommons.org/licenses/by/4.0/';
+
+UPDATE license SET 
+    rights_identifier = 'CC-BY-NC-4.0',
+    rights_identifier_scheme = 'SPDX',
+    scheme_uri = 'https://spdx.org/licenses/',
+    language_code = 'en'
+WHERE uri = 'https://creativecommons.org/licenses/by-nc/4.0/';
+
+UPDATE license SET 
+    rights_identifier = 'CC-BY-NC-ND-4.0',
+    rights_identifier_scheme = 'SPDX',
+    scheme_uri = 'https://spdx.org/licenses/',
+    language_code = 'en'
+WHERE uri = 'https://creativecommons.org/licenses/by-nc-nd/4.0/';
+
+UPDATE license SET 
+    rights_identifier = 'CC-BY-NC-SA-4.0',
+    rights_identifier_scheme = 'SPDX',
+    scheme_uri = 'https://spdx.org/licenses/',
+    language_code = 'en'
+WHERE uri = 'https://creativecommons.org/licenses/by-nc-sa/4.0/';
+
+UPDATE license SET 
+    rights_identifier = 'CC-BY-ND-4.0',
+    rights_identifier_scheme = 'SPDX',
+    scheme_uri = 'https://spdx.org/licenses/',
+    language_code = 'en'
+WHERE uri = 'https://creativecommons.org/licenses/by-nd/4.0/';
+
+UPDATE license SET 
+    rights_identifier = 'CC-BY-SA-4.0',
+    rights_identifier_scheme = 'SPDX',
+    scheme_uri = 'https://spdx.org/licenses/',
+    language_code = 'en'
+WHERE uri = 'https://creativecommons.org/licenses/by-sa/4.0/';
+
+UPDATE license SET 
+    rights_identifier = 'MIT',
+    rights_identifier_scheme = 'SPDX',
+    scheme_uri = 'https://spdx.org/licenses/',
+    language_code = 'en'
+WHERE uri = 'https://opensource.org/licenses/MIT';
diff --git a/src/main/resources/db/migration/V6.5.0.6.sql b/src/main/resources/db/migration/V6.5.0.6.sql
new file mode 100644
index 00000000000..9227ec2d83b
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.6.sql
@@ -0,0 +1,3 @@
+--add column - should have been part of 10476/ PR #11224
+
+ALTER TABLE DataverseFieldTypeInputLevel ADD COLUMN IF NOT EXISTS displayOnCreate bool;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V6.5.0.7.sql b/src/main/resources/db/migration/V6.5.0.7.sql
new file mode 100644
index 00000000000..d7d4404fb66
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.7.sql
@@ -0,0 +1,2 @@
+-- Add this text will help to customized name in metadata source facet
+ALTER TABLE harvestingclient ADD COLUMN IF NOT EXISTS sourcename TEXT;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V6.5.0.8.sql b/src/main/resources/db/migration/V6.5.0.8.sql
new file mode 100644
index 00000000000..d7cb24855b4
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.8.sql
@@ -0,0 +1,3 @@
+-- Add a new boolean flag, and make the harvesting set field free text, in order to accommodate DataCite harvesting
+ALTER TABLE harvestingclient ADD COLUMN IF NOT EXISTS useListRecords BOOLEAN DEFAULT FALSE;
+ALTER TABLE harvestingclient ALTER COLUMN harvestingSet TYPE TEXT;
diff --git a/src/main/resources/db/migration/V6.5.0.9.sql b/src/main/resources/db/migration/V6.5.0.9.sql
new file mode 100644
index 00000000000..5d00cd88ade
--- /dev/null
+++ b/src/main/resources/db/migration/V6.5.0.9.sql
@@ -0,0 +1,22 @@
+-- Add deaccessionnote column
+--
+
+ALTER TABLE datasetversion ADD COLUMN IF NOT EXISTS deaccessionnote VARCHAR(1000);
+ALTER TABLE datasetversion ALTER COLUMN deaccessionlink TYPE varchar(1260);
+
+-- Move/merge archivenote contents and remove archivenote column (on existing DBs that have this column)
+DO $$
+BEGIN
+IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'datasetversion' AND COLUMN_NAME = 'archivenote') THEN
+UPDATE datasetversion set deaccessionlink = CONCAT_WS(' ', deaccessionlink, archivenote);
+ALTER TABLE datasetversion DROP COLUMN archivenote;
+
+-- Update deaccessionnote for existing datasetversions
+-- Only do this once - if archivenote hasn't been deleted is a convenient trigger
+
+UPDATE datasetversion set deaccessionnote = versionnote;
+UPDATE datasetversion set versionnote = null;
+
+END IF;
+END
+$$
diff --git a/src/main/resources/db/migration/V6.6.0.1.sql b/src/main/resources/db/migration/V6.6.0.1.sql
new file mode 100644
index 00000000000..5861a870d93
--- /dev/null
+++ b/src/main/resources/db/migration/V6.6.0.1.sql
@@ -0,0 +1,2 @@
+ALTER TABLE DATASET ADD COLUMN IF NOT EXISTS datasetfilecountlimit bigint;
+ALTER TABLE DATAVERSE ADD COLUMN IF NOT EXISTS datasetfilecountlimit bigint;
diff --git a/src/main/resources/db/migration/V6.6.0.2.sql b/src/main/resources/db/migration/V6.6.0.2.sql
new file mode 100644
index 00000000000..4fa384dfe8d
--- /dev/null
+++ b/src/main/resources/db/migration/V6.6.0.2.sql
@@ -0,0 +1,3 @@
+ALTER TABLE DATAVERSEFEATUREDITEM ADD COLUMN IF NOT EXISTS type VARCHAR(45) default 'custom';
+ALTER TABLE DATAVERSEFEATUREDITEM ADD COLUMN IF NOT EXISTS dvobject_id bigint;
+ALTER TABLE DATAVERSEFEATUREDITEM ALTER COLUMN content DROP NOT NULL;
diff --git a/src/main/resources/db/migration/V6.6.0.3.sql b/src/main/resources/db/migration/V6.6.0.3.sql
new file mode 100644
index 00000000000..24d360aa467
--- /dev/null
+++ b/src/main/resources/db/migration/V6.6.0.3.sql
@@ -0,0 +1,32 @@
+-- Create the curationstatus table if it doesn't exist
+CREATE TABLE IF NOT EXISTS curationstatus (
+    id BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+    label VARCHAR(255),
+    datasetversion_id BIGINT NOT NULL,
+    authenticateduser_id BIGINT NULL,
+    createtime TIMESTAMP,
+    CONSTRAINT fk_curationstatus_datasetversion FOREIGN KEY (datasetversion_id) REFERENCES datasetversion(id),
+    CONSTRAINT fk_curationstatus_authenticateduser FOREIGN KEY (authenticateduser_id) REFERENCES authenticateduser(id)
+);
+
+CREATE INDEX IF NOT EXISTS index_curationstatus_datasetversion ON curationstatus (datasetversion_id);
+
+-- Migrate existing data from datasetversion.externalstatuslabel to curationstatus if it hasn't been done already
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'datasetversion' AND column_name = 'externalstatuslabel') THEN
+        INSERT INTO curationstatus (label, datasetversion_id, authenticateduser_id, createtime)
+        SELECT DISTINCT ON (externalstatuslabel, id) externalstatuslabel, id, NULL, NULL
+        FROM datasetversion
+        WHERE externalstatuslabel IS NOT NULL AND externalstatuslabel != ''
+        AND NOT EXISTS (
+            SELECT 1 FROM curationstatus
+            WHERE curationstatus.label = datasetversion.externalstatuslabel
+            AND curationstatus.datasetversion_id = datasetversion.id
+        );
+
+        -- Drop the externalstatuslabel column from datasetversion
+        ALTER TABLE datasetversion DROP COLUMN IF EXISTS externalstatuslabel;
+    END IF;
+END
+$$;
diff --git a/src/main/resources/db/migration/V6.7.1.1.sql b/src/main/resources/db/migration/V6.7.1.1.sql
new file mode 100644
index 00000000000..3d7a9b103c2
--- /dev/null
+++ b/src/main/resources/db/migration/V6.7.1.1.sql
@@ -0,0 +1,39 @@
+/* We're adding new permissions at bit 13 (4096 LinkDataverse) and bit 14 (8192 LinkDataset).
+They should be set for any role that has the permission in bit 11 (1024 PublishDataverse) and bit 12 (2048 PublishDataset),
+respectively.
+We also need to move the permissions with current bits 13-14 to bits 15-16 to make room for the new permissions.
+
+Finally, to make this idempotent, at least under the assumption that the standard admin role with all permissions exists
+(or some role with current permission bit 13 (DeleteDataverse) or 14 (DeleteDatasetDraft) set), we check to make sure no
+role already has bit 15-16 set before applying the migration.
+
+*/
+DO
+$do$
+    BEGIN
+        -- Skip if migration already applied (i.e., bits 15-16 in use)
+        IF (SELECT MAX(permissionbits) FROM dataverserole) < 16384 THEN
+
+            -- If bit 13 is set, move it to bit 15 and clear it
+            UPDATE dataverserole
+            SET permissionbits = (permissionbits | 16384) & ~4096
+            WHERE (permissionbits & 4096) != 0;
+
+            -- If bit 14 is set, move it to bit 16 and clear it
+            UPDATE dataverserole
+            SET permissionbits = (permissionbits | 32768) & ~8192
+            WHERE (permissionbits & 8192) != 0;
+
+            -- Set bit 13 (4096 LinkDataverse) if bit 11 (1024 PublishDataverse) is set
+            UPDATE dataverserole
+            SET permissionbits = permissionbits | 4096
+            WHERE (permissionbits & 1024) != 0;
+
+            -- Set bit 14 (8192 LinkDataset) if bit 12 (2048 PublishDataset) is set
+            UPDATE dataverserole
+            SET permissionbits = permissionbits | 8192
+            WHERE (permissionbits & 2048) != 0;
+
+        END IF;
+    END
+$do$;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V6.7.1.2.sql b/src/main/resources/db/migration/V6.7.1.2.sql
new file mode 100644
index 00000000000..3ef3c6483e8
--- /dev/null
+++ b/src/main/resources/db/migration/V6.7.1.2.sql
@@ -0,0 +1,2 @@
+-- remove dataversesubjects entries with a controlledvocabularyvalue_id matching "N/A"
+DELETE FROM dataversesubjects WHERE controlledvocabularyvalue_id = 1 ;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/afterMigrate__1-7256-upsert-referenceData.sql b/src/main/resources/db/migration/afterMigrate__1-7256-upsert-referenceData.sql
new file mode 100644
index 00000000000..f63fedba02f
--- /dev/null
+++ b/src/main/resources/db/migration/afterMigrate__1-7256-upsert-referenceData.sql
@@ -0,0 +1,41 @@
+-- #5361 and #7256 is about faster deployments, especially during development, sitting on an empty database.
+--
+-- This script has been part of  scripts/database/reference_data.sql that had to be executed manually on every new
+-- deployment (manually in the sense of Flyway didn't, the outside installer or an admin took care of it).
+--
+-- This script will load some initial, common data if not present (so only once, when booting for the first time).
+
+-- using http://dublincore.org/schemas/xmls/qdc/dcterms.xsd because at http://dublincore.org/schemas/xmls/ it's the
+-- schema location for http://purl.org/dc/terms/ which is referenced in http://swordapp.github.io/SWORDv2-Profile/SWORDProfile.html
+INSERT INTO foreignmetadataformatmapping (id, name, startelement, displayName, schemalocation)
+       VALUES
+              (1, 'http://purl.org/dc/terms/', 'entry', 'dcterms: DCMI Metadata Terms', 'http://dublincore.org/schemas/xmls/qdc/dcterms.xsd')
+       ON CONFLICT DO NOTHING;
+
+INSERT INTO foreignmetadatafieldmapping (id, foreignfieldxpath, datasetfieldname, isattribute, parentfieldmapping_id, foreignmetadataformatmapping_id)
+       VALUES
+              (1, ':title', 'title', FALSE, NULL, 1 ),
+              (2, ':identifier', 'otherIdValue', FALSE, NULL, 1 ),
+              (3, ':creator', 'authorName', FALSE, NULL, 1 ),
+              (4, ':date', 'productionDate', FALSE, NULL, 1 ),
+              (5, ':subject', 'keywordValue', FALSE, NULL, 1 ),
+              (6, ':description', 'dsDescriptionValue', FALSE, NULL, 1 ),
+              (7, ':relation', 'relatedMaterial', FALSE, NULL, 1 ),
+              (8, ':isReferencedBy', 'publicationCitation', FALSE, NULL, 1 ),
+              (9, 'holdingsURI', 'publicationURL', TRUE, 8, 1 ),
+              (10, 'agency', 'publicationIDType', TRUE, 8, 1 ),
+              (11, 'IDNo', 'publicationIDNumber', TRUE, 8, 1 ),
+              (12, ':coverage', 'otherGeographicCoverage', FALSE, NULL, 1 ),
+              (13, ':type', 'kindOfData', FALSE, NULL, 1 ),
+              (14, ':source', 'dataSources', FALSE, NULL, 1 ),
+              (15, 'affiliation', 'authorAffiliation', TRUE, 3, 1 ),
+              (16, ':contributor', 'contributorName', FALSE, NULL, 1 ),
+              (17, 'type', 'contributorType', TRUE, 16, 1 ),
+              (18, ':publisher', 'distributorName', FALSE, NULL, 1 ),
+              (19, ':language', 'language', FALSE, NULL, 1 )
+       ON CONFLICT DO NOTHING;
+
+-- Simple trick: WHERE NOT EXISTS (SELECT id FROM table) is only true if the table is empty.
+INSERT INTO guestbook (emailrequired, enabled, institutionrequired, createtime, name, namerequired, positionrequired, dataverse_id)
+       SELECT false, true, false, now(), 'Default', false, false, null
+       WHERE NOT EXISTS (SELECT id FROM guestbook);
diff --git a/src/main/resources/edu/harvard/iq/dataverse/codebook2-0.xsl b/src/main/resources/edu/harvard/iq/dataverse/codebook2-0.xsl
index 5941e3712d0..b913874398b 100644
--- a/src/main/resources/edu/harvard/iq/dataverse/codebook2-0.xsl
+++ b/src/main/resources/edu/harvard/iq/dataverse/codebook2-0.xsl
@@ -177,7 +177,7 @@ font-size: 10pt;
             </head>
             <body bgcolor="#ffffff" lang="en-US">
                 <h1>
-                    <xsl:value-of select="stdyDscr/citation/titlStmt/titl"/> (ICPSR <xsl:value-of
+                    <xsl:value-of select="stdyDscr/citation/titlStmt/titl"/> (<xsl:value-of
                         select="stdyDscr/citation/titlStmt/IDNo"/>)<xsl:if test="stdyDscr/citation/titlStmt/altTitl">
                         <br/>(<xsl:value-of select="stdyDscr/citation/titlStmt/altTitl"/>)</xsl:if>
                 </h1>
diff --git a/src/main/resources/edu/harvard/iq/dataverse/datacite_metadata_template.xml b/src/main/resources/edu/harvard/iq/dataverse/datacite_metadata_template.xml
deleted file mode 100644
index abe7ce79972..00000000000
--- a/src/main/resources/edu/harvard/iq/dataverse/datacite_metadata_template.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resource xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4/metadata.xsd"
-          xmlns="http://datacite.org/schema/kernel-4"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <identifier identifierType="DOI">${identifier}</identifier>
-    <creators>${creators}</creators>
-    <titles>
-        <title>${title}</title>
-    </titles>
-    <publisher>${publisher}</publisher>
-    <publicationYear>${publisherYear}</publicationYear>
-    <resourceType resourceTypeGeneral="Dataset"/>
-    ${relatedIdentifiers}
-    <descriptions>
-        <description descriptionType="Abstract">${description}</description>
-    </descriptions>
-    <contributors>{$contributors}</contributors>
-</resource>
diff --git a/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref_metadata_template.xml b/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref_metadata_template.xml
new file mode 100644
index 00000000000..f37ed63cfff
--- /dev/null
+++ b/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref_metadata_template.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doi_batch xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.crossref.org/schema/5.3.0 https://www.crossref.org/schemas/crossref5.3.0.xsd"
+           xmlns="http://www.crossref.org/schema/5.3.0" xmlns:jats="http://www.ncbi.nlm.nih.gov/JATS1"
+           xmlns:fr="http://www.crossref.org/fundref.xsd" xmlns:ai="http://www.crossref.org/AccessIndicators.xsd"
+           xmlns:mml="http://www.w3.org/1998/Math/MathML" version="5.3.0">
+    <head>
+        <doi_batch_id>${batchId}</doi_batch_id>
+        <timestamp>${timestamp}</timestamp>
+        <depositor>
+            <depositor_name>${depositor}</depositor_name>
+            <email_address>${depositorEmail}</email_address>
+        </depositor>
+        <registrant>Crossref</registrant>
+    </head>
+    <body>
+        <database>
+            <database_metadata language="en">
+                <titles>
+                    <title>${title}</title>
+                </titles>
+                <institution>
+                    <institution_name>${institution}</institution_name>
+                </institution>
+            </database_metadata>
+            ${datasets}
+        </database>
+    </body>
+</doi_batch>
diff --git a/src/main/webapp/404static.xhtml b/src/main/webapp/404static.xhtml
new file mode 100644
index 00000000000..dabcb299aa5
--- /dev/null
+++ b/src/main/webapp/404static.xhtml
@@ -0,0 +1,118 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" lang="en">
+    <head>
+        <title>#{bundle['error.404.page.title']}</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <meta http-equiv="Content-Language" content="en" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <meta name="description" content="Share, archive, and get credit for your data. Find and cite data across all research fields." />
+        
+        <link type="image/png" rel="icon" href="https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/images/favicondataverse.png.xhtml" />
+
+        <link type="image/png" rel="image_src" href="https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/images/dataverseproject.png.xhtml" />
+        
+        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" />
+
+        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css" />
+
+        <link rel="stylesheet" href="https://cdn.rawgit.com/IQSS/dataverse/develop/src/main/webapp/resources/css/structure.css" />
+
+        <style type="text/css">
+            /* FontCustom CSS */
+            @font-face {
+              font-family: "fontcustom";
+              src: url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.eot");
+              src: url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.eot?#iefix") format("embedded-opentype"),
+                   url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.woff") format("woff"),
+                   url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.ttf") format("truetype"),
+                   url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.svg#fontcustom") format("svg");
+              font-weight: normal;
+              font-style: normal;
+            }
+
+            @media screen and (-webkit-min-device-pixel-ratio:0) {
+              @font-face {
+                font-family: "fontcustom";
+                src: url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.svg#fontcustom") format("svg");
+              }
+            }
+            
+            [data-icon]:before { content: attr(data-icon); }
+
+            [data-icon]:before,
+            .icon-dataverse:before {
+              display: inline-block;
+              font-family: "fontcustom";
+              font-style: normal;
+              font-weight: normal;
+              font-variant: normal;
+              line-height: 1;
+              text-decoration: inherit;
+              text-rendering: optimizeLegibility;
+              text-transform: none;
+              -moz-osx-font-smoothing: grayscale;
+              -webkit-font-smoothing: antialiased;
+              font-smoothing: antialiased;
+            }
+
+            .icon-dataverse:before { content: "\f100"; }
+
+            /* Custom CSS */
+            #navbarFixed div.navbar-header img.navbar-brand.custom-logo {height:50px !important;}
+            #dataverseDesc span > span > span > h3 {font-weight: 300 !important;}
+
+            nav.navbar.navbar-default {background: #ececec !important;}
+        </style>
+    </head>
+    <body>
+        <div id="dataverse-header-block">
+            <!-- Navbar Panel -->
+            <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" role="navigation">
+                <div class="container">
+                    <div class="navbar-header">
+                        <h:outputFormat class="navbar-brand custom-logo" value="#{bundle['footer.dataverseProject']}"/>
+                    </div>
+                    <div class="collapse navbar-collapse" id="topNavBar">
+                        <ul class="nav navbar-nav navbar-right">
+                            <li>
+                                &#160;
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </nav>
+        </div>
+        <div class="container" id="content">
+            <div class="alert alert-danger" role="alert" style="margin-top:3em;">
+                <h:outputFormat value="#{bundle['error.404.message']}" escape="false" />
+            </div>
+        </div>
+        <div id="footer">
+            <div class="container">
+                <div class="row">
+                    <div class="col-sm-8 small">
+                        <p>Copyright &#169;<span id="current-year"></span>, The President &#38; Fellows of Harvard College | <a href="http://best-practices.dataverse.org/harvard-policies/harvard-privacy-policy.html" target="_blank">Privacy Policy</a>
+                        </p>
+                    </div>
+                    <div class="col-sm-4 text-right">
+                        <div class="poweredbylogo">
+                            <span>Powered by</span> 
+                            <a href="http://dataverse.org/" title="The Dataverse Project" target="_blank"><img src="https://cdn.rawgit.com/IQSS/dataverse/develop/src/main/webapp/resources/images/dataverseproject_logo.png" alt="The Dataverse Project" /></a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </body>
+
+    <script>
+        //<![CDATA[
+        const d = new Date();
+        let year = d.getFullYear();
+        document.getElementById("current-year").innerHTML = " " + d.getFullYear();
+        //]]>
+    </script>
+
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/ThemeAndWidgets.xhtml b/src/main/webapp/ThemeAndWidgets.xhtml
index fd8d7c7cf12..cde8b720aef 100644
--- a/src/main/webapp/ThemeAndWidgets.xhtml
+++ b/src/main/webapp/ThemeAndWidgets.xhtml
@@ -15,12 +15,14 @@
             <ui:param name="dataverse" value="#{themeWidgetFragment.editDv}"/>  
            
             <ui:param name="showMessagePanel" value="#{true}"/>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewParam name="id" value="#{themeWidgetFragment.editDv.id}"/>
                     <f:viewAction action="#{themeWidgetFragment.initEditDv}"/>
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(themeWidgetFragment.editDv, bundle['dataverse.option.themeAndWidgets'])}"/>
                 </f:metadata>
+            </ui:define>
+            <ui:define name="body">
                 <h:form id="themeWidgetsForm">
                     <ui:include src="themeAndWidgetsFragment.xhtml"/>
                 </h:form>
diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml
index 4ca8195bea5..f6c5b8cbbc4 100644
--- a/src/main/webapp/WEB-INF/beans.xml
+++ b/src/main/webapp/WEB-INF/beans.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       bean-discovery-mode="all">
+    <!-- 2023-06: Note that if you change bean-discovery-mode from "all" to "allocated", SWORD APIs do not work. -->
 </beans>
diff --git a/src/main/webapp/WEB-INF/faces-config.xml b/src/main/webapp/WEB-INF/faces-config.xml
index 2015ca55f5f..6eeb5a65baf 100644
--- a/src/main/webapp/WEB-INF/faces-config.xml
+++ b/src/main/webapp/WEB-INF/faces-config.xml
@@ -1,8 +1,7 @@
-<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"
-              version="2.2">
+              xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
+              version="4.0">
     <application>
         <resource-bundle>
             <base-name>edu.harvard.iq.dataverse.util.LocalBundle</base-name>
diff --git a/src/main/webapp/WEB-INF/glassfish-resources.xml b/src/main/webapp/WEB-INF/glassfish-resources.xml
new file mode 100644
index 00000000000..3fbbf4c3586
--- /dev/null
+++ b/src/main/webapp/WEB-INF/glassfish-resources.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE resources PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Resource Definitions//EN" "http://glassfish.org/dtds/glassfish-resources_1_5.dtd">
+<resources>
+    <!-- This executor is used in edu.harvard.iq.dataverse.dataaccess.S3AccessIO to support asynchronous operations -->
+    <custom-resource res-type="javax.enterprise.concurrent.ManagedExecutorService" 
+                     jndi-name="java:app/env/concurrent/s3UploadExecutor" 
+                     factory-class="org.glassfish.resources.custom.factory.ManagedExecutorServiceFactory">
+        <property name="threadPriority" value="5"/>
+        <property name="corePoolSize" value="10"/>
+        <property name="maximumPoolSize" value="50"/>
+        <property name="keepAliveTime" value="300"/>
+        <property name="threadLifeTime" value="3600"/>
+    </custom-resource>
+</resources>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml
index ecd3ba15c40..015a309fd6b 100644
--- a/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -8,9 +8,20 @@
       <description>Keep a copy of the generated servlet class' java code.</description>
     </property>
   </jsp-config>
-  <property name="alternatedocroot_1" value="from=/guides/* dir=./docroot"/>
-  <property name="alternatedocroot_2" value="from=/dataexplore/* dir=./docroot"/>
-  <property name="alternatedocroot_logos" value="from=/logos/* dir=./docroot"/>
-  <property name="alternatedocroot_sitemap" value="from=/sitemap/* dir=./docroot"/>
   <parameter-encoding default-charset="UTF-8"/>
+  <!-- Find a list of properties here: https://docs.oracle.com/cd/E19798-01/821-1750/beayb/index.html -->
+  <!-- NOTE: relative paths given will be relative to com.sun.aas.instanceRoot (usually domain1 folder) -->
+  <!-- NOTE: As we cannot use variables in defaults of ${MPCONFIG}, there is a workaround for containers necessary;
+             see src/main/docker/Dockerfile. Once Payara upstream fixes this, we can use STORAGE_DIR here. -->
+  <property name="alternatedocroot_1" value="from=/guides/* dir=${MPCONFIG=dataverse.files.docroot:./docroot}"/>
+  <property name="alternatedocroot_2" value="from=/dataexplore/* dir=${MPCONFIG=dataverse.files.docroot:./docroot}"/>
+  <property name="alternatedocroot_3" value="from=/logos/* dir=${MPCONFIG=dataverse.files.docroot:./docroot}"/>
+  <property name="alternatedocroot_4" value="from=/sitemap/* dir=${MPCONFIG=dataverse.files.docroot:./docroot}"/>
+  <!--
+    This folder is not only holding compiled JSP pages but also the place where file streams are stored
+    during uploads. As Dataverse does not use any JSP, there will only be uploads stored here.
+  -->
+  <!-- NOTE: As we cannot use variables in defaults of ${MPCONFIG}, there is a workaround for containers necessary;
+             see src/main/docker/Dockerfile. Once Payara upstream fixes this, we can use STORAGE_DIR here. -->
+  <property name="tempdir" value="${MPCONFIG=dataverse.files.uploads:./uploads}"/>
 </glassfish-web-app>
diff --git a/src/main/webapp/WEB-INF/pretty-config.xml b/src/main/webapp/WEB-INF/pretty-config.xml
index ab5f37a1051..5f8f4877af8 100644
--- a/src/main/webapp/WEB-INF/pretty-config.xml
+++ b/src/main/webapp/WEB-INF/pretty-config.xml
@@ -27,4 +27,9 @@
         <view-id value="/sitemap/sitemap.xml" />
     </url-mapping>
 
+    <url-mapping id="sitemapindex">
+        <pattern value="/sitemap_index.xml" />
+        <view-id value="/sitemap/sitemap_index.xml" />
+    </url-mapping>
+
 </pretty-config>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c37cfdcc3d9..78e5a5f104f 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee  http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
     <display-name>Dataverse</display-name>
     <!-- Error page -->
     <error-page>
         <error-code>404</error-code>
-        <location>/404.xhtml</location>
+        <location>/404static.xhtml</location>
     </error-page>
     <error-page>
         <error-code>500</error-code>
@@ -22,16 +25,19 @@
         <param-name>org.jboss.weld.context.conversation.lazy</param-name>
         <param-value>false</param-value>
     </context-param>
-    <!-- UI warnings that can be enabled setting to Develop or another level. 
-            See https://docs.oracle.com/javaee/6/tutorial/doc/bnaxj.html#giqxl -->
+    <!--
+        The following parameters can be changed quickly using MicroProfile Config API.
+        See also dev guide: https://guides.dataverse.org/en/latest/developers/debugging.html
+     -->
     <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
-<!--        <param-value>Development</param-value>-->
-        <param-value>Production</param-value>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
+        <!-- Uses Microprofile Config to replace at runtime. Not standardized, Payara App Server specific. -->
+        <param-value>${MPCONFIG=dataverse.jsf.project-stage:Production}</param-value>
     </context-param>
     <context-param>
         <param-name>primefaces.THEME</param-name>
-        <param-value>bootstrap</param-value>
+        <!-- Uses Microprofile Config to replace at runtime. Not standardized, Payara App Server specific. -->
+        <param-value>${MPCONFIG=dataverse.jsf.primefaces.theme:bootstrap}</param-value>
     </context-param>
     <!-- example of a hard-coded PrimePush configuration: -->
     <!-- context-param -->
@@ -40,53 +46,32 @@
     <!-- /context-param -->
     <context-param>
         <param-name>
-            javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL
+            jakarta.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL
         </param-name>
-        <param-value>true</param-value>
+        <!-- Uses Microprofile Config to replace at runtime. Not standardized, Payara App Server specific. -->
+        <param-value>${MPCONFIG=dataverse.jsf.empty-string-null:true}</param-value>
     </context-param>
     <context-param>
-        <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
-        <param-value>true</param-value>
+        <param-name>jakarta.faces.FACELETS_SKIP_COMMENTS</param-name>
+        <!-- Uses Microprofile Config to replace at runtime. Not standardized, Payara App Server specific. -->
+        <param-value>${MPCONFIG=dataverse.jsf.skip-comments:true}</param-value>
     </context-param>
     <context-param>
-        <param-name>javax.faces.FACELETS_BUFFER_SIZE</param-name>
-        <param-value>102400</param-value>
+        <param-name>jakarta.faces.FACELETS_BUFFER_SIZE</param-name>
+        <!-- Uses Microprofile Config to replace at runtime. Not standardized, Payara App Server specific. -->
+        <param-value>${MPCONFIG=dataverse.jsf.buffer-size:102400}</param-value>
     </context-param>
     <context-param>
-        <param-name>javax.faces.FACELETS_REFRESH_PERIOD</param-name>
-        <param-value>-1</param-value>
+        <param-name>jakarta.faces.FACELETS_REFRESH_PERIOD</param-name>
+        <!-- Uses Microprofile Config to replace at runtime. Not standardized, Payara App Server specific. -->
+        <param-value>${MPCONFIG=dataverse.jsf.refresh-period:-1}</param-value>
     </context-param>
     <!-- JSF mapping -->
-    <filter>
-        <filter-name>Router</filter-name>
-        <filter-class>edu.harvard.iq.dataverse.api.ApiRouter</filter-class>
-    </filter>
-    <filter>
-        <filter-name>Blocker</filter-name>
-        <filter-class>edu.harvard.iq.dataverse.api.ApiBlockingFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>Router</filter-name>
-        <url-pattern>/api/*</url-pattern>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>FORWARD</dispatcher>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>Blocker</filter-name>
-        <url-pattern>/api/*</url-pattern>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>FORWARD</dispatcher>
-    </filter-mapping>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <servlet>
-        <servlet-name>Push Servlet</servlet-name>
-        <servlet-class>org.primefaces.push.PushServlet</servlet-class>
-        <async-supported>true</async-supported>
-    </servlet>
     <!-- Map these files with JSF -->
     <servlet>
         <servlet-name>OAIServlet</servlet-name>
@@ -96,10 +81,6 @@
         <servlet-name>Citation Servlet</servlet-name>
         <servlet-class>edu.harvard.iq.dataverse.CitationServlet</servlet-class>
     </servlet>
-    <servlet>
-        <servlet-name>Homepage Servlet</servlet-name>
-        <servlet-class>edu.harvard.iq.dataverse.HomepageServlet</servlet-class>
-    </servlet>
     <servlet>
         <servlet-name>HomepageServlet</servlet-name>
         <servlet-class>edu.harvard.iq.dataverse.HomepageServlet</servlet-class>
@@ -125,10 +106,6 @@
         <servlet-name>Faces Servlet</servlet-name>
         <url-pattern>*.xhtml</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Push Servlet</servlet-name>
-        <url-pattern>/primepush/*</url-pattern>
-    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>OAIServlet</servlet-name>
         <url-pattern>/oai</url-pattern>
@@ -152,7 +129,7 @@
         <!-- Uncomment the line below to disble `;jsessionid=` in URLs -->
 	<!-- tracking-mode>COOKIE</tracking-mode -->
     </session-config>
-    <!-- web fonts -->
+    <!-- web fonts, bootstrap css map, favicon -->
     <mime-mapping>
         <extension>eot</extension>
         <mime-type>application/vnd.ms-fontobject</mime-type>
@@ -173,6 +150,10 @@
         <extension>woff2</extension>
         <mime-type>application/font-woff2</mime-type>
     </mime-mapping>
+    <mime-mapping>
+        <extension>map</extension>
+        <mime-type>application/json</mime-type>
+    </mime-mapping>
     <mime-mapping>
         <extension>svg</extension>
         <mime-type>image/svg+xml</mime-type>
@@ -181,6 +162,11 @@
         <extension>webmanifest</extension>
         <mime-type>application/manifest+json</mime-type>
     </mime-mapping>
+    <mime-mapping>
+        <extension>xhtml</extension>
+        <mime-type>text/html</mime-type>
+    </mime-mapping>
+    
     <!-- BEGIN Data Deposit API (SWORD v2) -->
     <!-- See also SwordConfigurationImpl for how deprecation warnings are configured -->
     <context-param>
@@ -267,5 +253,13 @@
         <servlet-name>edu.harvard.iq.dataverse.api.datadeposit.SWORDv2ContainerServlet</servlet-name>
         <url-pattern>/dvn/api/data-deposit/v1.1/swordv2/edit/*</url-pattern>
     </servlet-mapping>
+    <filter>
+        <filter-name>edu.harvard.iq.dataverse.api.datadeposit.SwordFilter</filter-name>
+        <filter-class>edu.harvard.iq.dataverse.api.datadeposit.SwordFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>edu.harvard.iq.dataverse.api.datadeposit.SwordFilter</filter-name>
+        <url-pattern>/dvn/api/data-deposit/v1.1/swordv2/edit-media/*</url-pattern>
+    </filter-mapping>
     <!-- END Data Deposit API (SWORD v2) -->
 </web-app>
diff --git a/src/main/webapp/addDataFormFragment.xhtml b/src/main/webapp/addDataFormFragment.xhtml
new file mode 100644
index 00000000000..69987ab78c9
--- /dev/null
+++ b/src/main/webapp/addDataFormFragment.xhtml
@@ -0,0 +1,19 @@
+<ui:composition xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:p="http://primefaces.org/ui"
+    xmlns:jsf="http://xmlns.jcp.org/jsf">
+    <!-- Add Data Form - not logged in... -->
+    <p:dialog id="addDataGuest" header="#{bundle['dataverse.results.dialog.addDataGuest.header']}" widgetVar="addData_popup" modal="true">
+        <p class="help-block">
+            <h:outputText value="#{dataverseHeaderFragment.signupAllowed ? bundle['dataverse.results.dialog.addDataGuest.msg.signup'] : bundle['dataverse.results.dialog.addDataGuest.msg']}" escape="false"></h:outputText>
+        </p>
+        <div class="button-block">
+            <ui:fragment rendered="#{dataverseHeaderFragment.signupAllowed}">
+                <a class="btn btn-default" href="#{dataverseHeaderFragment.getSignupUrl(navigationWrapper.redirectPage)}" title="#{bundle['dataverse.results.dialog.addDataGuest.signup.title']}">#{bundle['signup']}</a>
+            </ui:fragment>
+            <a class="btn btn-default" href="/loginpage.xhtml#{navigationWrapper.redirectPage}" title="#{bundle['dataverse.results.dialog.addDataGuest.login.title']}">#{bundle['login']}</a>
+        </div>
+    </p:dialog>
+</ui:composition>
diff --git a/src/main/webapp/confirmemail.xhtml b/src/main/webapp/confirmemail.xhtml
index 2a071c83817..8eac2d8db00 100644
--- a/src/main/webapp/confirmemail.xhtml
+++ b/src/main/webapp/confirmemail.xhtml
@@ -14,12 +14,14 @@
             <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/>
             <ui:param name="showDataverseHeader" value="false"/>
             <ui:param name="loginRedirectPage" value="dataverse.xhtml"/>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewParam name="token" value="#{ConfirmEmailPage.token}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                     <f:viewAction action="#{ConfirmEmailPage.init}" />
                 </f:metadata>
+            </ui:define>
+            <ui:define name="body">
 
                 <!--This is just the button. The error message is added via addErrorMessage in the backing bean.-->
                 <h:form styleClass="form-horizontal" rendered="#{ConfirmEmailPage.invalidToken}">
diff --git a/src/main/webapp/contactFormFragment.xhtml b/src/main/webapp/contactFormFragment.xhtml
index 04300983572..470a137e6cf 100644
--- a/src/main/webapp/contactFormFragment.xhtml
+++ b/src/main/webapp/contactFormFragment.xhtml
@@ -16,6 +16,12 @@
                         <p id="messageTo" class="form-control-static">#{sendFeedbackDialog.getMessageTo()}</p>
                     </div>
                 </div>
+                <div class="form-group" jsf:rendered="#{sendFeedbackDialog.ccSupport()}">
+                    <label for="messageCC" class="col-sm-3 control-label">#{bundle['contact.cc']}</label>
+                    <div class="col-sm-9">
+                        <p id="messageCC" class="form-control-static">#{sendFeedbackDialog.getMessageCC()}</p>
+                    </div>
+                </div>
                 <ui:fragment rendered="#{sendFeedbackDialog.isLoggedIn()}">
                 <!-- from email (logged in + auto-filled) -->
                     <div class="form-group">
@@ -28,17 +34,17 @@
                 <ui:fragment rendered="#{!sendFeedbackDialog.isLoggedIn()}">
                 <!-- from email (not logged in) -->
                     <div class="form-group">
-                        <label for="userEmail" class="col-sm-3 control-label">#{bundle['contact.from']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
+                        <label jsf:for="userEmail" class="col-sm-3 control-label">#{bundle['contact.from']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
                         <div class="col-sm-9">
                             <p:inputText id="userEmail" styleClass="form-control" size="30" value="#{sendFeedbackDialog.userEmail}"
-                                         validator="#{sendFeedbackDialog.validateUserEmail}" validatorMessage="#{bundle['contact.from.invalid']}" requiredMessage="#{bundle['contact.from.required']}" required="#{param['DO_VALIDATION']}"/>
-                        <h:message for="userEmail" styleClass="bg-danger text-danger"/>
+                                         validator="#{sendFeedbackDialog.validateUserEmail}" validatorMessage="#{bundle['contact.from.invalid']}" requiredMessage="#{bundle['contact.from.required']}" required="#{param['DO_VALIDATION']}" placeholder="#{bundle['contact.from.emailPlaceholder']}"/>
+                            <h:message for="userEmail" styleClass="bg-danger text-danger"/>
                         </div>
                     </div>
                 </ui:fragment>
                 <!-- subject -->
                 <div class="form-group">
-                    <label for="messageSubject" class="col-sm-3 control-label">#{bundle['contact.subject']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
+                    <label jsf:for="messageSubject" class="col-sm-3 control-label">#{bundle['contact.subject']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
                     <div class="col-sm-9">
                         <p:inputText id="messageSubject" styleClass="form-control" value="#{sendFeedbackDialog.messageSubject}"
                                      requiredMessage="#{bundle['contact.subject.required']}" required="#{param['DO_VALIDATION']}"/>                        
@@ -47,9 +53,9 @@
                 </div>   
                 <!-- message -->
                 <div class="form-group">
-                    <label for="userMessage" class="col-sm-3 control-label">#{bundle['contact.msg']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
+                    <label jsf:for="userMessage" class="col-sm-3 control-label">#{bundle['contact.msg']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
                     <div class="col-sm-9">
-                        <p:inputTextarea id="userMessage" styleClass="form-control" value="#{sendFeedbackDialog.userMessage}"
+                        <p:inputTextarea id="userMessage" styleClass="form-control" value="#{sendFeedbackDialog.userMessage}" title="#{bundle['contact.msg']}"
                             required="#{param['DO_VALIDATION']}" requiredMessage="#{bundle['contact.msg.required']}" autoResize="false" rows="10"/>
                         <h:message for="userMessage" styleClass="bg-danger text-danger"/>
                     </div>
@@ -60,10 +66,13 @@
                         <p>
                             <h:outputText styleClass="highlightBold" value="#{bundle['contact.question']}"/> <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                         </p>
-                        <h:outputFormat value="#{sendFeedbackDialog.op1} + #{sendFeedbackDialog.op2} = "/>
+                        <label for="emailForm:messageSum">
+                            <h:outputFormat value="#{sendFeedbackDialog.op1} + #{sendFeedbackDialog.op2} = "/>
+                        </label>
                         <p:inputText id="messageSum" label="Sum" size="4" value="#{sendFeedbackDialog.userSum}" converterMessage="#{bundle['contact.sum.converterMessage']}"
                                      required="#{param['DO_VALIDATION']}" requiredMessage="#{bundle['contact.sum.required']}"
-                                     validatorMessage="#{bundle['contact.sum.invalid']}" validator="#{sendFeedbackDialog.validateUserSum}">
+                                     validatorMessage="#{bundle['contact.sum.invalid']}" validator="#{sendFeedbackDialog.validateUserSum}"
+                                     title="#{bundle['contact.sum.title']}">
                             <f:convertNumber integerOnly="true" type="number"/>
                         </p:inputText>
                         <h:message for="messageSum" styleClass="bg-danger text-danger"/>
@@ -72,7 +81,7 @@
                 <!-- send | cancel buttons -->
                 <div class="button-block">
                     <p:commandButton styleClass="btn btn-default" value="#{bundle['contact.send']}"
-                                   update="@form" oncomplete="if (args &amp;&amp; !args.validationFailed) PF('contactForm').hide();" actionListener="#{sendFeedbackDialog.sendMessage}">
+                                   update="@form,messagePanel" oncomplete="if (args &amp;&amp; !args.validationFailed) PF('contactForm').hide();" actionListener="#{sendFeedbackDialog.sendMessage}">
                         <f:param name="DO_VALIDATION" value="true"/>
                     </p:commandButton>
                     <button class="btn btn-link" onclick="PF('contactForm').hide()" type="button">
diff --git a/src/main/webapp/dashboard-datamove.xhtml b/src/main/webapp/dashboard-datamove.xhtml
deleted file mode 100644
index 9bf8be4fe85..00000000000
--- a/src/main/webapp/dashboard-datamove.xhtml
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:jsf="http://xmlns.jcp.org/jsf"
-      xmlns:p="http://primefaces.org/ui"
-      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-    <h:head>
-    </h:head>
-
-    <h:body>
-        <f:metadata>
-            <f:viewParam name="dataverseId" value="#{dataverseServiceBean.findRootDataverse().id}"/>
-            <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
-            <f:viewAction action="#{DashboardDatamovePage.init}"/>
-            <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse())}"/>
-            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb('/dashboard.xhtml?dataverseId='.concat(dataverse.id), bundle['dashboard.title'])}"/> 
-            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb(bundle['dashboard.card.datamove.manage'])}"/>
-        </f:metadata>
-
-        <ui:composition template="/dataverse_template.xhtml">
-            <ui:param name="pageTitle" value="#{bundle['dashboard.card.datamove.header']} - #{dataverseServiceBean.findRootDataverse().name} #{bundle.dataverse}"/>
-            <ui:param name="showDataverseHeader" value="false"/>
-            <ui:define name="body">
-                <h:form id="datamove-form" class="form-horizontal">
-                    <p:focus for="sourceDatasetMenu"/>
-                    <div class="col-md-6">
-                        <div class="panel panel-default">
-                            <div class="panel-heading text-info">#{bundle['dashboard.card.datamove.selectdataset.header']}</div>
-                            <div class="panel-body">
-
-                                <!-- dataset to move: -->
-                                <div class="col-xs-12 form-group">
-                                    <label for="sourceDataset" class="col-xs-3 control-label">
-                                        #{bundle['dashboard.card.datamove.dataset.label']}
-                                    </label>
-                                    <div class="col-xs-9">
-                                        <p:autoComplete id="sourceDatasetMenu"
-                                                        required="true"
-                                                        requiredMessage="#{bundle['requiredField']}"
-                                                        binding="#{DashboardDatamovePage.selectedDatasetMenu}"
-                                                        placeholder="#{bundle['dashboard.card.datamove.dataset.placeholder']}"
-                                                        multiple="false" scrollHeight="180" forceSelection="true"
-                                                        minQueryLength="2" queryDelay="1000" size="36"
-                                                        groupBy="#{bundle['dashboard.card.datamove.dataset.menu.header']}"
-                                                        emptyMessage="#{bundle['dashboard.card.datamove.dataset.menu.invalidMsg']}"
-                                                        value="#{DashboardDatamovePage.selectedSourceDataset}"
-                                                        completeMethod="#{DashboardDatamovePage.completeSelectedDataset}"
-                                                        var="srcDS" styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
-                                                        itemLabel="#{srcDS.globalId}" itemValue="#{srcDS}" converter="datasetConverter">
-                                            <p:column>
-                                                <h:outputText value="#{srcDS.globalId}"/>
-                                            </p:column>
-                                            <p:column>
-                                                <h:outputText value="#{srcDS.displayName}"/>
-                                            </p:column>
-                                            <p:column>
-                                                <h:outputText value="#{srcDS.owner.alias}"/>
-                                            </p:column>
-                                            <p:ajax process="@this" event="itemSelect" />
-                                            <p:ajax process="@this" event="itemUnselect" />
-                                        </p:autoComplete>
-                                        <script>
-                                            handle_dropdown_popup_scroll();
-                                        </script>
-                                        <p:message for="sourceDatasetMenu"/>
-                                    </div>
-                                </div>
-
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="panel panel-default">
-                            <div class="panel-heading text-info">#{bundle['dashboard.card.datamove.newdataverse.header']}</div>
-                            <div class="panel-body">
-                                
-                                <!-- dataverse to move to: -->
-                                <div class="col-xs-12 form-group">
-                                    <label for="destinationDataverse" class="col-xs-3 control-label">
-                                        #{bundle['dashboard.card.datamove.dataverse.label']}
-                                    </label>
-                                    <div class="col-xs-9">
-                                        <p:autoComplete id="destinationDataverseMenu"
-                                                        required="true"
-                                                        requiredMessage="#{bundle['requiredField']}"
-                                                        binding="#{DashboardDatamovePage.selectedDataverseMenu}"
-                                                        placeholder="#{bundle['dashboard.card.datamove.dataverse.placeholder']}"
-                                                        multiple="false" scrollHeight="180" forceSelection="true"
-                                                        minQueryLength="2" queryDelay="1000" size="36"
-                                                        groupBy="#{bundle['dashboard.card.datamove.dataverse.menu.header']}"
-                                                        emptyMessage="#{bundle['dashboard.card.datamove.dataverse.menu.invalidMsg']}"
-                                                        value="#{DashboardDatamovePage.selectedDestinationDataverse}"
-                                                        completeMethod="#{DashboardDatamovePage.completeSelectedDataverse}"
-                                                        var="destDV" styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
-                                                        itemLabel="#{destDV.alias}" itemValue="#{destDV}" converter="dataverseConverter">
-                                            <p:column>
-                                                <h:outputText value="#{destDV.name}"/>
-                                                <h:outputText value=" (#{destDV.affiliation})" rendered="#{!empty destDV.affiliation}"/>
-                                            </p:column>
-                                            <p:column>
-                                                <h:outputText value="#{destDV.alias}"/>
-                                            </p:column>
-                                            <p:ajax process="@this" event="itemSelect" />
-                                            <p:ajax process="@this" event="itemUnselect" />
-                                        </p:autoComplete>
-                                        <script>
-                                            handle_dropdown_popup_scroll();
-                                        </script>
-                                        <p:message for="destinationDataverseMenu"/>
-                                    </div>
-                                </div>             
-                                
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="col-sm-12 button-block">
-                        <p:commandButton id="move" styleClass="btn btn-default" 
-                                       value="#{bundle['saveChanges']}"
-                                       update="datamove-form"
-                                       validateClient="true"
-                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('datamoveConfirmation').show();">
-                            <!-- if (args &amp;&amp; !args.validationFailed) 
-                             prevents the confirm dialog to pop up (client side) if validation fails -->
-                            <f:param name="DO_DATAMOVE_VALIDATION" value="true"/>
-                        </p:commandButton>
-                        <p:button styleClass="btn btn-link" outcome="dashboard" value="#{bundle['cancel']}">
-                            <!-- dataverse.id resolves to null !
-                                 <f:param name="dataverseId" value="#{dataverse.id}" />
-                            -->
-                        </p:button>
-                    </div>
-                    
-                    <p:dialog id="datamoveConfirmation" header="#{bundle['dashboard.card.datamove.manage']}" widgetVar="datamoveConfirmation" modal="true">
-                        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['dashboard.card.datamove.confirm.dialog']}</p>
-                        <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dashboard.card.datamove.confirm.yes']}"
-                                             onclick="PF('datamoveConfirmation').hide();" 
-                                             action="#{DashboardDatamovePage.move()}"
-                                             update="@form,:messagePanel" partialSubmit="true"/>
-                            <button class="btn btn-link" onclick="PF('datamoveConfirmation').hide();" type="button">
-                                #{bundle.no}
-                            </button>
-                        </div>
-                    </p:dialog>
-                </h:form>
-            </ui:define>
-        </ui:composition>
-
-    </h:body>
-</html>
diff --git a/src/main/webapp/dashboard-movedataset.xhtml b/src/main/webapp/dashboard-movedataset.xhtml
new file mode 100644
index 00000000000..d41a5ee74a8
--- /dev/null
+++ b/src/main/webapp/dashboard-movedataset.xhtml
@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jsf="http://xmlns.jcp.org/jsf"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+    <h:head>
+    </h:head>
+
+    <h:body>
+        <f:metadata>
+            <f:viewParam name="dataverseId" value="#{dataverseServiceBean.findRootDataverse().id}"/>
+            <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
+            <f:viewAction action="#{DashboardMoveDatasetPage.init}"/>
+            <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse())}"/>
+            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb('/dashboard.xhtml'.concat(empty param.dataverseId ? '': '?dataverseId='.concat(param.dataverseId)), bundle['dashboard.title'])}"/> 
+            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb(bundle['dashboard.card.move.dataset.manage'])}"/>
+        </f:metadata>
+
+        <ui:composition template="/dataverse_template.xhtml">
+            <ui:param name="pageTitle" value="#{bundle['dashboard.move.dataset.header']} - #{dataverseServiceBean.findRootDataverse().name} #{bundle.dataverse}"/>
+            <ui:param name="showDataverseHeader" value="false"/>
+            <ui:define name="body">
+                <h:form id="movedataset-form" class="form-horizontal">
+                    <p:focus for="sourceDatasetMenu"/>
+                    <div class="col-md-6">
+                        <div class="panel panel-default">
+                            <div class="panel-heading text-info">#{bundle['dashboard.move.dataset.selectdataset.header']}</div>
+                            <div class="panel-body">
+
+                                <!-- dataset to move: -->
+                                <div class="col-xs-12 form-group">
+                                    <label for="sourceDataset" class="col-xs-3 control-label">
+                                        #{bundle['dashboard.move.dataset.dataset.label']}
+                                    </label>
+                                    <div class="col-xs-9">
+                                        <p:autoComplete id="sourceDatasetMenu"
+                                                        required="true"
+                                                        requiredMessage="#{bundle['requiredField']}"
+                                                        binding="#{DashboardMoveDatasetPage.selectedDatasetMenu}"
+                                                        placeholder="#{bundle['dashboard.move.dataset.placeholder']}"
+                                                        multiple="false" scrollHeight="180" forceSelection="true"
+                                                        minQueryLength="2" queryDelay="1000" size="36"
+                                                        groupBy="#{bundle['dashboard.move.dataset.menu.header']}"
+                                                        emptyMessage="#{bundle['dashboard.move.dataset.menu.invalidMsg']}"
+                                                        value="#{DashboardMoveDatasetPage.selectedSourceDataset}"
+                                                        completeMethod="#{DashboardMoveDatasetPage.completeSelectedDataset}"
+                                                        var="srcDS" styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                        itemLabel="#{srcDS.globalId}" itemValue="#{srcDS}" converter="datasetConverter">
+                                            <p:column>
+                                                <h:outputText value="#{srcDS.globalId}"/>
+                                            </p:column>
+                                            <p:column>
+                                                <h:outputText value="#{srcDS.displayName}"/>
+                                            </p:column>
+                                            <p:column>
+                                                <h:outputText value="#{srcDS.owner.alias}"/>
+                                            </p:column>
+                                            <p:ajax process="@this" event="itemSelect" />
+                                            <p:ajax process="@this" event="itemUnselect" />
+                                        </p:autoComplete>
+                                        <p:message for="sourceDatasetMenu"/>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="panel panel-default">
+                            <div class="panel-heading text-info">#{bundle['dashboard.move.dataset.newdataverse.header']}</div>
+                            <div class="panel-body">
+                                
+                                <!-- dataverse to move to: -->
+                                <div class="col-xs-12 form-group">
+                                    <label for="destinationDataverse" class="col-xs-3 control-label">
+                                        #{bundle['dashboard.move.dataset.dataverse.label']}
+                                    </label>
+                                    <div class="col-xs-9">
+                                        <p:autoComplete id="destinationDataverseMenu"
+                                                        required="true"
+                                                        requiredMessage="#{bundle['requiredField']}"
+                                                        binding="#{DashboardMoveDatasetPage.selectedDataverseMenu}"
+                                                        placeholder="#{bundle['dashboard.move.dataset.dataverse.placeholder']}"
+                                                        multiple="false" scrollHeight="180" forceSelection="true"
+                                                        minQueryLength="2" queryDelay="1000" size="36"
+                                                        groupBy="#{bundle['dashboard.move.dataset.dataverse.menu.header']}"
+                                                        emptyMessage="#{bundle['dashboard.move.dataset.dataverse.menu.invalidMsg']}"
+                                                        value="#{DashboardMoveDatasetPage.selectedDestinationDataverse}"
+                                                        completeMethod="#{DashboardMoveDatasetPage.completeSelectedDataverse}"
+                                                        var="destDV" styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                        itemLabel="#{destDV.alias}" itemValue="#{destDV}" converter="dataverseConverter">
+                                            <p:column>
+                                                <h:outputText value="#{destDV.name}"/>
+                                                <h:outputText value=" (#{destDV.affiliation})" rendered="#{!empty destDV.affiliation}"/>
+                                            </p:column>
+                                            <p:column>
+                                                <h:outputText value="#{destDV.alias}"/>
+                                            </p:column>
+                                            <p:ajax process="@this" event="itemSelect" />
+                                            <p:ajax process="@this" event="itemUnselect" />
+                                        </p:autoComplete>
+                                        <p:message for="destinationDataverseMenu"/>
+                                    </div>
+                                </div>             
+                                
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="col-sm-12 button-block">
+                        <p:commandButton id="move" styleClass="btn btn-default" 
+                                       value="#{bundle['saveChanges']}"
+                                       update="movedataset-form"
+                                       validateClient="true"
+                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('moveDatasetConfirmation').show();">
+                            <!-- if (args &amp;&amp; !args.validationFailed) 
+                             prevents the confirm dialog to pop up (client side) if validation fails -->
+                            <f:param name="DO_MOVE_DATASET_VALIDATION" value="true"/>
+                        </p:commandButton>
+                        <p:button styleClass="btn btn-link" outcome="dashboard" value="#{bundle['cancel']}">
+                            <!-- dataverse.id resolves to null !
+                                 <f:param name="dataverseId" value="#{dataverse.id}" />
+                            -->
+                        </p:button>
+                    </div>
+                    
+                    <p:dialog id="moveDatasetConfirmation" header="#{bundle['dashboard.card.move.dataset.manage']}" widgetVar="moveDatasetConfirmation" modal="true">
+                        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['dashboard.move.dataset.confirm.dialog']}</p>
+                        <div class="button-block">
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dashboard.move.dataset.confirm.yes']}"
+                                             onclick="PF('moveDatasetConfirmation').hide();" 
+                                             action="#{DashboardMoveDatasetPage.move()}"
+                                             update="@form,:messagePanel" partialSubmit="true"/>
+                            <button class="btn btn-link" onclick="PF('moveDatasetConfirmation').hide();" type="button">
+                                #{bundle.no}
+                            </button>
+                        </div>
+                    </p:dialog>
+                </h:form>
+            </ui:define>
+        </ui:composition>
+
+    </h:body>
+</html>
diff --git a/src/main/webapp/dashboard-movedataverse.xhtml b/src/main/webapp/dashboard-movedataverse.xhtml
new file mode 100644
index 00000000000..0780da22c3c
--- /dev/null
+++ b/src/main/webapp/dashboard-movedataverse.xhtml
@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jsf="http://xmlns.jcp.org/jsf"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+    <h:head>
+    </h:head>
+
+    <h:body>
+        <f:metadata>
+            <f:viewParam name="dataverseId" value="#{dataverseServiceBean.findRootDataverse().id}"/>
+            <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
+            <f:viewAction action="#{DashboardMoveDataversePage.init}"/>
+            <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse())}"/>
+            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb('/dashboard.xhtml'.concat(empty param.dataverseId ? '': '?dataverseId='.concat(param.dataverseId)), bundle['dashboard.title'])}"/> 
+            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb(bundle['dashboard.move.dataverse.message.summary'])}"/>
+        </f:metadata>
+
+        <ui:composition template="/dataverse_template.xhtml">
+            <ui:param name="pageTitle" value="#{bundle['dashboard.move.dataverse.header']} - #{dataverseServiceBean.findRootDataverse().name} #{bundle.dataverse}"/>
+            <ui:param name="showDataverseHeader" value="false"/>
+            <ui:define name="body">
+                <h:form id="movedataverse-form" class="form-horizontal">
+                    <p:focus for="sourceDataverseMenu"/>
+                    <div class="col-md-6">
+                        <div class="panel panel-default">
+                            <div class="panel-heading text-info">#{bundle['dashboard.move.dataverse.selectdataverse.header']}</div>
+                            <div class="panel-body">
+
+                                <!-- dataverse to move: -->
+                                <div class="col-xs-12 form-group">
+                                    <label for="sourceDataverse" class="col-xs-3 control-label">
+                                        #{bundle['dashboard.move.dataverse.label']}
+                                    </label>
+                                    <div class="col-xs-9">
+                                        <p:autoComplete id="sourceDataverseMenu"
+                                                        required="true"
+                                                        requiredMessage="#{bundle['requiredField']}"
+                                                        binding="#{DashboardMoveDataversePage.selectedSourceDataverseMenu}"
+                                                        placeholder="#{bundle['dashboard.move.dataverse.placeholder']}"
+                                                        multiple="false" scrollHeight="180" forceSelection="true"
+                                                        minQueryLength="2" queryDelay="1000" size="36"
+                                                        groupBy="#{bundle['dashboard.move.dataverse.menu.header']}"
+                                                        emptyMessage="#{bundle['dashboard.move.dataverse.menu.invalidMsg']}"
+                                                        value="#{DashboardMoveDataversePage.selectedSourceDataverse}"
+                                                        completeMethod="#{DashboardMoveDataversePage.completeSelectedDataverse}"
+                                                        var="srcDV" styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                        itemLabel="#{srcDV.alias}" itemValue="#{srcDV}" converter="dataverseConverter">
+                                            <p:column>
+                                                <h:outputText value="#{srcDV.name}"/>
+                                                <h:outputText value=" (#{srcDV.affiliation})" rendered="#{!empty srcDV.affiliation}"/>
+                                            </p:column>
+                                            <p:column>
+                                                <h:outputText value="#{srcDV.alias}"/>
+                                            </p:column>
+                                            <p:ajax process="@this" event="itemSelect" />
+                                            <p:ajax process="@this" event="itemUnselect" />
+                                        </p:autoComplete>
+                                        <p:message for="sourceDataverseMenu"/>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="panel panel-default">
+                            <div class="panel-heading text-info">#{bundle['dashboard.move.dataverse.newdataverse.header']}</div>
+                            <div class="panel-body">
+                                
+                                <!-- dataverse to move to: -->
+                                <div class="col-xs-12 form-group">
+                                    <label for="destinationDataverse" class="col-xs-3 control-label">
+                                        #{bundle['dashboard.move.dataverse.label']}
+                                    </label>
+                                    <div class="col-xs-9">
+                                        <p:autoComplete id="destinationDataverseMenu"
+                                                        required="true"
+                                                        requiredMessage="#{bundle['requiredField']}"
+                                                        binding="#{DashboardMoveDataversePage.selectedDataverseMenu}"
+                                                        placeholder="#{bundle['dashboard.move.dataverse.placeholder']}"
+                                                        multiple="false" scrollHeight="180" forceSelection="true"
+                                                        minQueryLength="2" queryDelay="1000" size="36"
+                                                        groupBy="#{bundle['dashboard.move.dataverse.menu.header']}"
+                                                        emptyMessage="#{bundle['dashboard.move.dataverse.menu.invalidMsg']}"
+                                                        value="#{DashboardMoveDataversePage.selectedDestinationDataverse}"
+                                                        completeMethod="#{DashboardMoveDataversePage.completeSelectedDataverse}"
+                                                        var="destDV" styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                        itemLabel="#{destDV.alias}" itemValue="#{destDV}" converter="dataverseConverter">
+                                            <p:column>
+                                                <h:outputText value="#{destDV.name}"/>
+                                                <h:outputText value=" (#{destDV.affiliation})" rendered="#{!empty destDV.affiliation}"/>
+                                            </p:column>
+                                            <p:column>
+                                                <h:outputText value="#{destDV.alias}"/>
+                                            </p:column>
+                                            <p:ajax process="@this" event="itemSelect" />
+                                            <p:ajax process="@this" event="itemUnselect" />
+                                        </p:autoComplete>
+                                        <p:message for="destinationDataverseMenu"/>
+                                    </div>
+                                </div>             
+                                
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="col-sm-12 button-block">
+                        <p:commandButton id="move" styleClass="btn btn-default" 
+                                       value="#{bundle['saveChanges']}"
+                                       update="movedataverse-form"
+                                       validateClient="true"
+                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('moveDataverseConfirmation').show();">
+                            <!-- if (args &amp;&amp; !args.validationFailed) 
+                             prevents the confirm dialog to pop up (client side) if validation fails -->
+                        </p:commandButton>
+                        <p:button styleClass="btn btn-link" outcome="dashboard" value="#{bundle['cancel']}" />
+                    </div>
+                    
+                    <p:dialog id="moveDataverseConfirmation" header="#{bundle['dashboard.move.dataverse.message.summary']}" widgetVar="moveDataverseConfirmation" modal="true">
+                        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['dashboard.move.dataverse.confirm.dialog']}</p>
+                        <div class="button-block">
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dashboard.move.dataverse.confirm.yes']}"
+                                             onclick="PF('moveDataverseConfirmation').hide();" 
+                                             action="#{DashboardMoveDataversePage.move()}"
+                                             update="@form,:messagePanel" partialSubmit="true"/>
+                            <button class="btn btn-link" onclick="PF('moveDataverseConfirmation').hide();" type="button">
+                                #{bundle.no}
+                            </button>
+                        </div>
+                    </p:dialog>
+                </h:form>
+            </ui:define>
+        </ui:composition>
+
+    </h:body>
+</html>
diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml
index 7a824435bf7..9f2f60c113c 100644
--- a/src/main/webapp/dashboard-users.xhtml
+++ b/src/main/webapp/dashboard-users.xhtml
@@ -15,7 +15,7 @@
             <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
             <f:viewAction action="#{DashboardUsersPage.init}"/>
             <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse())}"/>
-            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb('/dashboard.xhtml?dataverseId='.concat(dataverse.id), bundle['dashboard.title'])}"/> 
+            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb('/dashboard.xhtml'.concat(empty param.dataverseId ? '': '?dataverseId='.concat(param.dataverseId)), bundle['dashboard.title'])}"/> 
             <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb(bundle['dashboard.card.users.manage'])}"/>
         </f:metadata>
 
@@ -34,14 +34,33 @@
                                 <p:watermark for="searchFiles" value="#{bundle['dashboard.list_users.searchTerm.watermark']}"/>
                                 <p:remoteCommand name="submitsearch" action="#{DashboardUsersPage.runUserSearch()}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true"/>
                                 <span class="input-group-btn">
-                                    <p:commandLink styleClass="btn btn-default" action="#{DashboardUsersPage.runUserSearch()}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true">
-                                        <span class="glyphicon glyphicon-search"></span> #{bundle['dataverse.search.btn.find']}
+                                    <p:commandLink title="#{bundle['dataverse.search.btn.find']}" styleClass="btn btn-default bootstrap-button-tooltip" action="#{DashboardUsersPage.runUserSearch()}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true">
+                                        <span class="glyphicon glyphicon-search no-text"/>
                                     </p:commandLink>
                                 </span>
                             </div>
                         </div>
                     </div>
 
+                    <div class="row">
+                        <div class="col-xs-12" style="margin-bottom: 1em;">
+                            <div class="btn-group pull-right">
+                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                                    <span class="glyphicon glyphicon-sort"></span> #{bundle['dataverse.results.btn.sort']} <span class="caret"></span>
+                                </button>
+                                <ul class="dropdown-menu pull-right text-left">
+                                    <ui:repeat value="#{DashboardUsersPage.getSortingMap().entrySet()}" var="sortFieldEntry">
+                                        <li>
+                                            <p:commandLink action="#{DashboardUsersPage.runUserSearchWithSort(sortFieldEntry.key)}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true">
+                                                <h:outputText value="#{bundle[sortFieldEntry.value]}" styleClass="#{DashboardUsersPage.isSortedBy(sortFieldEntry.key) ? 'highlightBold' : ''}"/>
+                                            </p:commandLink>
+                                        </li>
+                                    </ui:repeat>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+
                     <ui:include src="dashboard-users-pager.xhtml">
                         <ui:param name="listPager" value="#{DashboardUsersPage.pager}" />
                     </ui:include>
@@ -65,6 +84,7 @@
                         </p:column>
                         <p:column width="12%" headerText="#{bundle['dashboard.list_users.tbl_header.authProviderFactoryAlias']}">
                             <h:outputText value="#{DashboardUsersPage.getAuthProviderFriendlyName(user.authProviderId)}" />
+                            <h:outputText rendered="#{user.deactivated}" value=" (#{bundle['dashboard.list_users.tbl_header.deactivated']})" />
                         </p:column>
                         <p:column headerText="#{bundle['dashboard.list_users.tbl_header.roles']}">
                             <h:outputText value="#{user.roles}" />
@@ -84,7 +104,8 @@
                             <!-- Uses our standard approach, of showing a confirmation popup ("are you sure you want to toggle this? ...") first,  -->
                             <!-- before saving the toggled value. -->
                             <!-- The current user, the admin user viewing the dashboard, should not be allowed to toggle the superuser status on him- or herself: -->
-                            <p:selectBooleanCheckbox id="superUserCheckbox" value="#{user.superuser}" valueChangeListener="#{DashboardUsersPage.setUserToToggleSuperuserStatus(user)}"  disabled="#{user.id == dataverseSession.user.id}">
+                            <!-- Additionally, deactivated users cannot become superusers so we disable the checkbox. -->
+                            <p:selectBooleanCheckbox id="superUserCheckbox" value="#{user.superuser}" valueChangeListener="#{DashboardUsersPage.setUserToToggleSuperuserStatus(user)}"  disabled="#{user.id == dataverseSession.user.id or user.deactivated}">
                                 <p:ajax event="change" process="@this" oncomplete="PF('toggleSuperuserConfirmation').show();"  update=":dashboardUsersForm:toggleSuperuserConfirmation"/>
                             </p:selectBooleanCheckbox>
                         </p:column>
diff --git a/src/main/webapp/dashboard.xhtml b/src/main/webapp/dashboard.xhtml
index c5b6a507a92..577d8c67f63 100644
--- a/src/main/webapp/dashboard.xhtml
+++ b/src/main/webapp/dashboard.xhtml
@@ -12,13 +12,15 @@
         <ui:composition template="/dataverse_template.xhtml">
             <ui:param name="pageTitle" value="#{bundle['dashboard.title']} - #{dataverseServiceBean.findRootDataverse().name}"/>
             <ui:param name="showDataverseHeader" value="false"/>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewParam name="dataverseId" value="#{dashboardPage.dataverseId}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                     <f:viewAction action="#{dashboardPage.init}"/>
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse(), bundle['dashboard.title'])}"/>
                 </f:metadata>
+            </ui:define>
+            <ui:define name="body">
                
                 <div id="dashboard-block" class="content">
                     <div class="container">
@@ -42,7 +44,7 @@
                                             #{dashboardPage.numberOfHarvestedDatasets}
                                             <p class="small text-muted">
                                                 <h:outputFormat value="#{bundle['dashboard.card.harvestingclients.datasets']}">
-                                                    <f:param value="#{dashboardPage.numberOfOaiSets}"/>
+                                                    <f:param value="#{dashboardPage.numberOfHarvestedDatasets}"/>
                                                 </h:outputFormat>
                                             </p>
                                         </div>
@@ -126,21 +128,26 @@
 
                             <div class="col-md-4">
                                 <div class="card-box">
-                                    <h4 class="header-title">#{bundle['dashboard.card.datamove']}</h4>
+                                    <h4 class="header-title">#{bundle['dashboard.card.move.data']}</h4>
                                     <div class="row text-center">
                                         <div class="col-xs-6">
-                                            <h:outputText value="#{DashboardDatamovePage.getDataverseCount()}"/>
-                                            <p class="small text-muted">#{bundle['dataverses']}</p>
+                                            <h:outputText value="#{DashboardMoveDatasetPage.getDatasetCount()}"/>
+                                            <p class="small text-muted">#{bundle['datasets']}</p>
                                         </div>
                                         <div class="col-xs-6">
-                                            <h:outputText value="#{DashboardDatamovePage.getDatasetCount()}"/>
-                                            <p class="small text-muted">#{bundle['datasets']}</p>
+                                            <h:outputText value="#{DashboardMoveDataversePage.getDataverseCount()}"/>
+                                            <p class="small text-muted">#{bundle['dataverses']}</p>
                                         </div>
                                     </div>
                                     <div class="row text-center">
-                                        <div  class="col-xs-12">
+                                        <div  class="col-xs-6">
+                                            <p>
+                                                <a href="/dashboard-movedataset.xhtml" class="btn btn-primary" role="button">#{bundle['dashboard.card.move.dataset.manage']}</a>
+                                            </p>
+                                        </div>
+                                        <div  class="col-xs-6">
                                             <p>
-                                                <a href="/dashboard-datamove.xhtml" class="btn btn-primary" role="button">#{bundle['dashboard.card.datamove.manage']}</a>
+                                                <a href="/dashboard-movedataverse.xhtml" class="btn btn-primary" role="button">#{bundle['dashboard.card.move.dataverse.manage']}</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml
index 84dcf4d6849..26bc9dca65e 100644
--- a/src/main/webapp/dataset-citation.xhtml
+++ b/src/main/webapp/dataset-citation.xhtml
@@ -1,51 +1,54 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-     xmlns:h="http://java.sun.com/jsf/html"
-     xmlns:f="http://java.sun.com/jsf/core"
-     xmlns:ui="http://java.sun.com/jsf/facelets"
-     xmlns:c="http://java.sun.com/jsp/jstl/core"
-     xmlns:p="http://primefaces.org/ui"
-     xmlns:o="http://omnifaces.org/ui"
-     xmlns:jsf="http://xmlns.jcp.org/jsf">
-    
-    <div class="#{widgetWrapper.widgetView ? 'col-sm-12' : 'col-sm-9'} citation-block">
-        <div class="col-sm-12 #{DatasetPage.workingVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
-            <div class="row ">
-                <div class="col-sm-12 citation">
-                    <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
-                        <h:outputText value="#{DatasetPage.displayCitation}" escape="false"/>
-                    </span>
-                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!DatasetPage.dataset.released}" 
-                          data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
-                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.dataset.released and DatasetPage.workingVersion.draft}" 
-                          data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
-                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}" 
-                          data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:c="http://java.sun.com/jsp/jstl/core"
+        xmlns:p="http://primefaces.org/ui"
+        xmlns:o="http://omnifaces.org/ui"
+        xmlns:jsf="http://xmlns.jcp.org/jsf">
+    <div class="citation-block">
+        <div class="clearfix #{DatasetPage.workingVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
+            <div class="citation #{DatasetPage.workingVersion.deaccessioned ? '' : 'margin-bottom'}">
+                <div class="pull-left preview-icon-block">
+                    <img src="#{DatasetPage.thumbnailString}" 
+                        class="img-responsive" 
+                        jsf:rendered="#{!empty DatasetPage.thumbnailString and !DatasetPage.workingVersion.deaccessioned}" 
+                        alt="#{DatasetPage.datasetVersionUI.title.value}"/>
+                    <span class="icon-dataset" jsf:rendered="#{empty DatasetPage.thumbnailString or DatasetPage.workingVersion.deaccessioned}"/>
                 </div>
-                <div class="col-sm-6 citation-download vcenter" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
-                    <div class="dropdown">
-                        <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
-                            <span class="glyphicon glyphicon-list"/> #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
-                        </button>
-                        <ul class="dropdown-menu" role="menu">
-                            <li>
-                                <a jsf:id="endNoteLink" jsf:action="#{DatasetPage.fileDownloadService.downloadDatasetCitationXML(DatasetPage.dataset)}" >
-                                    #{bundle['dataset.cite.downloadBtn.xml']}
-                                </a>
-                            </li>
-                            <li>
-                                <a jsf:id="risLink" jsf:actionListener="#{DatasetPage.fileDownloadService.downloadDatasetCitationRIS(DatasetPage.dataset)}">
-                                    #{bundle['dataset.cite.downloadBtn.ris']}
-                                </a>
-                            </li>
-                            <li>
-                                <a jsf:id="bibLink" jsf:actionListener="#{DatasetPage.fileDownloadService.downloadDatasetCitationBibtex(DatasetPage.dataset)}" target="_blank">
-                                    #{bundle['dataset.cite.downloadBtn.bib']}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
+                <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
+                    <h:outputText value="#{DatasetPage.displayCitation}" escape="false"/>
+                </span>
+                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!DatasetPage.dataset.released}" 
+                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
+                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.dataset.released and DatasetPage.workingVersion.draft}" 
+                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
+                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}" 
+                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
+            </div>
+            <div class="pull-left row col-sm-9 padding-none" jsf:rendered="#{!DatasetPage.anonymizedAccess}">
+                <div class="col-sm-3 col-md-4 col-lg-3 btn-group margin-bottom citation-download" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
+                    <button type="button" class="btn btn-link dropdown-toggle padding-none downloadCitation" data-toggle="dropdown">
+                        #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li>
+                            <h:commandLink id="endNoteLink" value="#{bundle['dataset.cite.downloadBtn.xml']}" action="#{DatasetPage.fileDownloadService.downloadDatasetCitationXML(DatasetPage.workingVersion)}"/>
+                        </li>
+                        <li>
+                            <h:commandLink id="risLink" value="#{bundle['dataset.cite.downloadBtn.ris']}" action="#{DatasetPage.fileDownloadService.downloadDatasetCitationRIS(DatasetPage.workingVersion)}"/>
+                        </li>
+                        <li>
+                            <h:commandLink id="bibLink" value="#{bundle['dataset.cite.downloadBtn.bib']}" action="#{DatasetPage.fileDownloadService.downloadDatasetCitationBibtex(DatasetPage.workingVersion)}" target="_blank"/>
+                        </li>
+                        <li>
+                        <button class="btn btn-link" onclick="PF('cslCitationDialog').show();" type="button">
+                                #{bundle['dataset.cite.viewCitation']}
+                            </button>
+                        </li>
+                    </ul>
                 </div>
-                <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
+                <div class="col-sm-9 col-md-8 col-lg-9 text-muted margin-bottom citation-standards" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
                     <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
                 </div>
             </div>
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 0d109f73f06..af055b13899 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -1,20 +1,27 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-     xmlns:h="http://java.sun.com/jsf/html"
-     xmlns:f="http://java.sun.com/jsf/core"
-     xmlns:ui="http://java.sun.com/jsf/facelets"
-     xmlns:c="http://java.sun.com/jsp/jstl/core"
-     xmlns:p="http://primefaces.org/ui"
-     xmlns:o="http://omnifaces.org/ui"
-     xmlns:jsf="http://xmlns.jcp.org/jsf">
-<!-- TERMS -->
-   <div class="text-right margin-bottom" 
-        jsf:rendered="#{dataverseSession.user.authenticated and empty editMode and !widgetWrapper.widgetView
-                        and permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset)}">
-       <p:commandLink styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('LICENSE')}" 
-                      update="@form,:messagePanel" oncomplete="javascript:bind_bsui_components();" disabled="#{DatasetPage.lockedFromEdits}">
-           <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
-           <span class="glyphicon glyphicon-briefcase"/> #{bundle['file.dataFilesTab.terms.editTermsBtn']}
-       </p:commandLink>
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:o="http://omnifaces.org/ui"
+                xmlns:jsf="http://xmlns.jcp.org/jsf">
+    <!-- TERMS -->
+    <ui:param name="toaNotEmpty" value="#{!empty termsOfUseAndAccess.termsOfAccess
+                                        or !empty termsOfUseAndAccess.dataAccessPlace 
+                                        or !empty termsOfUseAndAccess.originalArchive or !empty termsOfUseAndAccess.availabilityStatus 
+                                        or !empty termsOfUseAndAccess.contactForAccess or !empty termsOfUseAndAccess.sizeOfCollection 
+                                        or !empty termsOfUseAndAccess.studyCompletion
+                                        }"/>
+    
+    <div class="text-right margin-bottom" 
+         jsf:rendered="#{dataverseSession.user.authenticated and empty editMode and !widgetWrapper.widgetView
+                         and permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset)}">
+        <p:commandLink styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('LICENSE')}" 
+                       update="@form,:messagePanel" disabled="#{DatasetPage.lockedFromEdits}">
+            <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+            <span class="glyphicon glyphicon-briefcase"/> #{bundle['file.dataFilesTab.terms.editTermsBtn']}
+        </p:commandLink>
     </div>
     <div class="panel-group">
        <div class="panel panel-default">
@@ -24,127 +31,153 @@
            <div id="panelCollapseTOU" class="collapse in">
                <p:fragment id="touFragment">
                    <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker"/>
-                   <o:importFunctions type="org.apache.commons.lang.StringEscapeUtils" />
+                   <o:importFunctions type="org.apache.commons.text.StringEscapeUtils" />
+                   <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
                    <div class="panel-body">
                        <div class="form-group">
-                           <label for="metadata_Terms" class="col-sm-3 control-label">
-                               #{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver']}
-                               <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.title']}"></span>
+                           <label for="datasetForm:tabView:metadata_Terms" class="col-sm-3 control-label">
+                               #{bundle['file.dataFilesTab.terms.list.license']}
                            </label>
                            <div class="col-sm-9">
                                <ui:fragment rendered="#{empty editMode}">
                                    <p class="help-block">
-                                       <h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.txt.description']}" escape="false"/>
+                                       <h:outputText value="#{bundle['file.dataFilesTab.terms.list.license.view.description']}" escape="false"/>
                                    </p>
                                </ui:fragment>
-                               <ui:fragment rendered="#{empty editMode and termsOfUseAndAccess.license == 'NONE'}">
-                                   <p><h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfUse.no.waiver.txt']}" escape="false"/></p>
+                               <ui:fragment rendered="#{datasetPage == true and empty editMode and empty termsOfUseAndAccess.license}">
+                                   <p>
+                                       <h:outputText value="#{DatasetUtil:getLicenseName(DatasetPage.workingVersion).concat(' ')}" escape="false"/>
+                                       <h:outputText rendered="#{!datasetVersionServiceBean.isVersionDefaultCustomTerms(DatasetPage.workingVersion)}" value="#{bundle['file.dataFilesTab.terms.list.license.customterms.txt']}" escape="false"/>
+                                   </p>
                                </ui:fragment>
                                <ui:fragment rendered="#{!empty editMode}">
-                                   <p class="help-block"><h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.description']}" escape="false"/></p>
-                                   <p:selectOneRadio id="options" value="#{termsOfUseAndAccess.license}">
-                                       <f:selectItem itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.select.CCO']}" itemValue="CC0" />
-                                       <f:selectItem itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.select.notCCO']}" itemValue="NONE" />
-                                       <p:ajax update="touFragment" oncomplete="javascript:bind_bsui_components();" />
-                                   </p:selectOneRadio>
-                               </ui:fragment>
-                               <ui:fragment rendered="#{termsOfUseAndAccess.license == 'CC0'}">
-                                   <p>#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.txt']} <img src="/resources/images/cc0.png" alt="#{bundle['file.cc0.icon.alttxt']}" class="waiver-CC0-inline"/></p>
+                                   <p class="help-block"><h:outputText value="#{bundle['file.dataFilesTab.terms.list.license.edit.description']}" escape="false"/></p>
+
+                                   <p:selectOneMenu id="licenses" value="#{termsOfUseAndAccess.license}" style="width: 40%" converter="licenseConverter">
+                                       <c:if test="#{!datasetPage}">
+                                       <f:selectItems value="#{licenseServiceBean.listAllActive()}" 
+                                                   var="license" itemLabel="#{DatasetUtil:getLocalizedLicenseDetails(license, 'NAME')}" itemValue="#{license}"/>
+                                       </c:if>
+                                       <c:if test="#{datasetPage}">
+                                       <f:selectItems value="#{DatasetPage.availableLicenses}" 
+                                                   var="license" itemLabel="#{DatasetUtil:getLocalizedLicenseDetails(license, 'NAME')}" itemValue="#{license}"/>
+                                       </c:if>
+                                       <c:if test="#{settingsWrapper.customLicenseAllowed}">
+                                           <f:selectItem itemLabel="#{bundle['license.custom']}" itemValue="#{null}"/>
+                                       </c:if>
+                                       <p:ajax update="touFragment" />
+                                       <f:passThroughAttribute name="aria-label" value="#{bundle['file.dataFilesTab.terms.list.license']}"/>
+                                   </p:selectOneMenu>
                                </ui:fragment>
-                           </div>
-                       </div>
-                       <div class="form-group" jsf:rendered="#{termsOfUseAndAccess.license != 'CC0'}">
-                           <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                               #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
-                               <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title']}"></span>
-                           </label>
-                           <div class="col-sm-9">
-                               <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfUse)}" escape="false" rendered="#{empty editMode}"/>
-                               <ui:fragment rendered="#{!empty editMode}">
-                                   <p class="help-block"><h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse.description']}" escape="false"/></p>
-                                   <p:inputTextarea value="#{termsOfUseAndAccess.termsOfUse}" rows="5" cols="60" styleClass="form-control" />
+                               <ui:fragment rendered="#{!empty termsOfUseAndAccess.license}">
+                                   <p>
+                                       <img src="#{termsOfUseAndAccess.license.iconUrl}" title="#{DatasetUtil:getLocalizedLicenseDetails(termsOfUseAndAccess.license, 'DESCRIPTION')}"  style="display:none"  onload="this.style.display='inline'" />
+                                       <a href="#{termsOfUseAndAccess.license.uri}" title="#{DatasetUtil:getLocalizedLicenseDetails(termsOfUseAndAccess.license,'DESCRIPTION')}" target="_blank">#{DatasetUtil:getLocalizedLicenseDetails(termsOfUseAndAccess.license,'NAME')}</a>
+                                   </p>
                                </ui:fragment>
                            </div>
                        </div>
 
                        <!-- Additional Information -->
-                        <ui:fragment rendered="#{empty editMode}">
+                        <ui:fragment rendered="#{empty editMode and empty termsOfUseAndAccess.license}">
+                            <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfUse}">
+                                <label for="datasetForm:tabView:metadata_TermsUse" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfUse)}" escape="false"/>
+                               </div>
+                            </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.confidentialityDeclaration}">
-                                <label for="confidentialityDeclaration" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:confidentialityDeclarationText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.confidentialityDeclaration)}" escape="false"/>
+                                    <h:outputText id="confidentialityDeclarationText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.confidentialityDeclaration)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.specialPermissions}">
-                                <label for="specialPermissions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:specialPermissionsText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.specialPermissions)}" escape="false"/>
+                                    <h:outputText id="specialPermissionsText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.specialPermissions)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.restrictions}">
-                                <label for="restrictions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:restrictionsText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.restrictions)}" escape="false"/>
+                                    <h:outputText id="restrictionsText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.restrictions)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.citationRequirements}">
-                                <label for="citationRequirements" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:citationRequirementsText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.citationRequirements)}" escape="false"/>
+                                    <h:outputText id="citationRequirementsText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.citationRequirements)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.depositorRequirements}">
-                                <label for="depositorRequirements" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:depositorRequirementsText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.depositorRequirements)}" escape="false"/>
+                                    <h:outputText id="depositorRequirementsText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.depositorRequirements)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.conditions}">
-                                <label for="conditions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:conditionsText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.conditions)}" escape="false"/>
+                                    <h:outputText id="conditionsText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.conditions)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.disclaimer}">
-                                <label for="disclaimer" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:disclaimerText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.disclaimer)}" escape="false"/>
+                                    <h:outputText id="disclaimerText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.disclaimer)}" escape="false"/>
                                 </div>
                             </div>
                         </ui:fragment>
-                        <ui:fragment rendered="#{!empty editMode}">
+                        <ui:fragment rendered="#{!empty editMode and termsOfUseAndAccess.license == null}">
                             <div class="form-group">
-                                <label for="confidentialityDeclaration" class="col-sm-3 control-label">
+                                <label jsf:for="dlTermsdOfUse" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
+                                    <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <p:inputTextarea id="dlTermsdOfUse" value="#{termsOfUseAndAccess.termsOfUse}" rows="5" cols="60" styleClass="form-control" title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}" 
+                                                     validator="#{DatasetPage.validateTerms}">
+                                    </p:inputTextarea>
+                                    <h:message for="metadata_TermsUse" styleClass="bg-danger text-danger"/>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="datasetForm:tabView:confidentialityDeclaration" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
@@ -154,7 +187,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="specialPermissions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:specialPermissions" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
@@ -164,7 +197,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="restrictions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:restrictions" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
@@ -174,7 +207,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="citationRequirements" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:citationRequirements" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
@@ -184,7 +217,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="depositorRequirements" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:depositorRequirements" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
@@ -194,7 +227,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="conditions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:conditions" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
@@ -204,7 +237,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="disclaimer" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:disclaimer" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
@@ -214,26 +247,22 @@
                                 </div>
                             </div>
                         </ui:fragment>
-                       <!-- END: Additional Information -->
-                   </div>
-               </p:fragment>
-           </div>
-       </div>
-
-       <div class="panel panel-default" jsf:rendered="#{!empty editMode or empty editMode and (!empty termsOfUseAndAccess.termsOfAccess
-                                                        or !empty termsOfUseAndAccess.dataAccessPlace 
-                                        or !empty termsOfUseAndAccess.originalArchive or !empty termsOfUseAndAccess.availabilityStatus 
-                                        or !empty termsOfUseAndAccess.contactForAccess or !empty termsOfUseAndAccess.sizeOfCollection 
-                                        or !empty termsOfUseAndAccess.studyCompletion)}">
+                        <!-- END: Additional Information -->
+                    </div>
+                </p:fragment>
+            </div>
+        </div>
+       <div class="panel panel-default" jsf:rendered="#{managePage==true or !empty editMode or (datasetPage == true and DatasetPage.restrictedFileCount > 0) 
+                                                        or toaNotEmpty}">
            <div data-toggle="collapse" data-target="#panelCollapseTOA" class="panel-heading text-info">
-               <h:outputText value="#{settingsWrapper.publicInstall ? bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess'] : bundle['file.dataFilesTab.terms.list.termsOfAccess.header']}"/>
+               <h:outputText value="#{publicStore ? bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess'] : bundle['file.dataFilesTab.terms.list.termsOfAccess.header']}"/>
                &#160;<span class="glyphicon glyphicon-chevron-up"/>
            </div>
-           <div id="panelCollapseTOA" class="collapse in">
+           <div id="panelCollapseTOA" class="panel-collapse #{!empty editMode or (datasetPage == false and toaNotEmpty )  or (datasetPage == true and DatasetPage.hasValidTermsOfAccess) ? 'collapse in' : 'collapse'}">
                <div class="panel-body">
                    <ui:fragment rendered="#{empty editMode}">
-                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
-                           <label for="metadata_RestrictedFiles" class="col-sm-3 control-label">
+                       <div class="form-group" jsf:rendered="#{!publicStore  and datasetPage== true and DatasetPage.hasRestrictedFiles}">
+                           <label for="datasetForm:tabView:metadata_RestrictedFiles" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title']}"></span>
@@ -241,213 +270,248 @@
                            <ui:fragment rendered="#{datasetPage == true}">
                                <div class="col-sm-9">
                                    <p>
-                                       <h:outputFormat value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt']}">
+                                       <h:outputFormat id="metadata_RestrictedFiles" value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt']}">
                                            <f:param value="#{DatasetPage.restrictedFileCount}"/>
                                        </h:outputFormat>
                                    </p>
                                </div>
                            </ui:fragment>
                        </div>
-                       <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess}">
-                           <label for="metadata_TermsAccess" class="col-sm-3 control-label">
+                       <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess and (DatasetPage.restrictedFileCount > 0 or managePage==true)}">
+                           <label for="datasetForm:tabView:metadata_TermsAccessText" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
-                               <p><h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfAccess)}" escape="false"/></p>
+                               <p><h:outputText id="metadata_TermsAccessText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfAccess)}" escape="false"/></p>
                            </div>
                        </div>
-                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and ( datasetPage == true and DatasetPage.restrictedFileCount > 0)}">
-                           <label for="metadata_RequestAccess" class="col-sm-3 control-label">
+                       <div class="form-group" jsf:rendered="#{!publicStore and ((datasetPage == true and DatasetPage.hasRestrictedFiles) or managePage==true)}">
+                           <label for="datasetForm:tabView:metadata_RequestAccessSelected" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                            </label>
-                           <div class="col-sm-9">
-                               <p jsf:rendered="#{!DatasetPage.workingVersion.draft}">
+                           <div id="metadata_RequestAccessSelected" class="col-sm-9">
+                               <p jsf:rendered="#{datasetPage == true and !DatasetPage.workingVersion.draft}">
                                    <h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.request']}" rendered="#{DatasetPage.dataset.fileAccessRequest}"/>
                                    <h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.notRequest']}" rendered="#{!DatasetPage.dataset.fileAccessRequest}"/>
                                </p>
-                               <p jsf:rendered="#{DatasetPage.workingVersion.draft}">
-                                   <h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.request']}" rendered="#{DatasetPage.workingVersion.termsOfUseAndAccess.fileAccessRequest}"/>
-                                   <h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.notRequest']}" rendered="#{!DatasetPage.workingVersion.termsOfUseAndAccess.fileAccessRequest}"/>
+                               <p jsf:rendered="#{(datasetPage == true and DatasetPage.workingVersion.draft) or managePage==true}">
+                                   <h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.request']}" rendered="#{termsOfUseAndAccess.fileAccessRequest}"/>
+                                   <h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.notRequest']}" rendered="#{!termsOfUseAndAccess.fileAccessRequest}"/>
                                </p>
                            </div>
                        </div>
                    </ui:fragment>
                    <ui:fragment rendered="#{!empty editMode}">
-                       <div class="form-group">
-                           <label for="metadata_TermsAccess" class="col-sm-3 control-label">
-                               #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
+                        <div class="form-group" jsf:rendered="#{!publicStore}"> 
+                            <p:fragment id="termsOfAccessHelp">
+                                <ui:fragment rendered="#{datasetPage == true and DatasetPage.hasRestrictedFiles}">
+                                    <div class="alert alert-info">
+                                        <span class="glyphicon glyphicon-info-sign"></span>&#160;<strong>#{bundle['messages.info']}</strong> –
+                                        <h:outputText value=" #{bundle['file.dataFilesTab.terms.list.termsOfAccess.description']}"/>
+                                        <h:outputFormat value=" #{bundle['file.dataFilesTab.terms.list.termsOfAccess.description.line.2']}" escape="false">
+                                            <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                            <f:param value="#{systemConfig.guidesVersion}"/>
+                                        </h:outputFormat>
+                                    </div>
+                                </ui:fragment>
+                            </p:fragment>    
+                           <label for="datasetForm:tabView:requestAccess" class="col-sm-3 control-label">
+                               #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
+                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
-                               <p:inputTextarea value="#{termsOfUseAndAccess.termsOfAccess}" rows="5" styleClass="form-control" />
-                       </div>
+                                <p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" 
+                                                        value="#{termsOfUseAndAccess.fileAccessRequest}" disabled="#{datasetPage == true and !DatasetPage.hasRestrictedFiles}">
+                                   <p:ajax event="change" update="termsOfAccessHelp" />
+                               </p:selectBooleanCheckbox>                                                          
+                           </div>
                        </div>
-                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
-                           <label for="metadata_RequestAccess" class="col-sm-3 control-label">
-                               #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
+                       <p:fragment id="toaValidation">
+                           <div  class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{datasetPage == true and DatasetPage.hasRestrictedFiles and empty termsOfUseAndAccess.termsOfAccess  and !termsOfUseAndAccess.fileAccessRequest}">
+                               <span class="ui-message-error-detail">#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.warning.outofcompliance']}</span>          
+                           </div>
+                       </p:fragment>
+                       <div class="form-group">
+                           <label for="datasetForm:tabView:metadata_TermsAccess" class="col-sm-3 control-label">
+                               #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
+                                     data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
-                               <p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" value="#{termsOfUseAndAccess.fileAccessRequest}"/>
+                                <p:inputTextarea  id="metadata_TermsAccess" value="#{termsOfUseAndAccess.termsOfAccess}" 
+                                                  rows="5" styleClass="form-control" disabled="#{datasetPage == true and !DatasetPage.hasRestrictedFiles}" />
+
                            </div>
                        </div>
+                    <p:fragment>
+                        <p:autoUpdate/>
+                        <o:inputHidden id="termsofAccessHiddenLT" value="#{termsOfUseAndAccess.termsOfAccess}" />
+                        <o:inputHidden id="fileAccessRequestHiddenLT" value="#{termsOfUseAndAccess.fileAccessRequest}" />
+                     </p:fragment>
+
                    </ui:fragment>
 
-                   <!-- Additional Information -->
+                    <!-- Additional Information -->
                     <ui:fragment rendered="#{empty editMode}">
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.dataAccessPlace}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:dataAccessPlaceText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.dataAccessPlace)}" escape="false"/>
+                                <h:outputText id="dataAccessPlaceText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.dataAccessPlace)}" escape="false"/>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.originalArchive}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:originalArchiveText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.originalArchive)}" escape="false"/>
+                                <h:outputText id="originalArchiveText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.originalArchive)}" escape="false"/>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.availabilityStatus}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:availabilityStatusText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.availabilityStatus)}" escape="false"/>
+                                <h:outputText id="availabilityStatusText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.availabilityStatus)}" escape="false"/>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.contactForAccess}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:contactForAccessText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.contactForAccess)}" escape="false"/>
+                                <h:outputText id="contactForAccessText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.contactForAccess)}" escape="false"/>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.sizeOfCollection}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:collectionSizeText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.sizeOfCollection)}" escape="false"/>
+                                <h:outputText id="collectionSizeText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.sizeOfCollection)}" escape="false"/>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.studyCompletion}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:studyCompletionText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.studyCompletion)}" escape="false"/>
+                                <h:outputText id="studyCompletionText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.studyCompletion)}" escape="false"/>
                             </div>
                         </div>
                     </ui:fragment>
                     <ui:fragment rendered="#{!empty editMode}">
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:dataAccessPlace" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.dataAccessPlace}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="dataAccessPlace" value="#{termsOfUseAndAccess.dataAccessPlace}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:originalArchive" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.originalArchive}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="originalArchive" value="#{termsOfUseAndAccess.originalArchive}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:availabilityStatus" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.availabilityStatus}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="availabilityStatus" value="#{termsOfUseAndAccess.availabilityStatus}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:contactForAccess" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.contactForAccess}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="contactForAccess" value="#{termsOfUseAndAccess.contactForAccess}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:sizeOfCollection" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.sizeOfCollection}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="sizeOfCollection" value="#{termsOfUseAndAccess.sizeOfCollection}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:studyCompletion" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.studyCompletion}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="studyCompletion" value="#{termsOfUseAndAccess.studyCompletion}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                     </ui:fragment>
-                   <!-- END: Additional Information -->
-               </div>
-           </div>
-       </div>
+                    <!-- END: Additional Information -->
+                </div>
+            </div>
+        </div>
 
-        <div class="panel panel-default" jsf:rendered="#{!settingsWrapper.rsyncOnly and (managePage==false or datasetPage == true)}">
+        <div class="panel panel-default" jsf:rendered="#{!settingsWrapper.rsyncOnly and (managePage==false or datasetPage == true)
+                                                         and (!empty DatasetPage.dataset.guestbook or (dataverseSession.user.authenticated and permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset)))}">
            <div data-toggle="collapse" data-target="#panelCollapseGuestbook" class="panel-heading text-info">
-               #{bundle['file.dataFilesTab.terms.list.guestbook']} &#160;<span class="glyphicon glyphicon-chevron-up"/>
+               #{bundle['file.dataFilesTab.terms.list.guestbook']} &#160;<span class="glyphicon glyphicon-chevron-down"/>
            </div>
-           <div id="panelCollapseGuestbook" class="collapse in">
+           <div id="panelCollapseGuestbook" class="collapse">
                <div class="panel-body">
                    <div class="form-group">
-                       <label for="metadata_Guestbook" class="col-sm-3 control-label">
+                       <label for="datasetForm:tabView:metadata_Guestbook" class="col-sm-3 control-label">
                            #{bundle['file.dataFilesTab.terms.list.guestbook']}
                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.guestbook.title']}"></span>
                        </label>
-                       <div class="col-sm-9">
+                       <div id="metadata_Guestbook" class="col-sm-9">
                            <ui:fragment rendered="#{empty editMode}">
                                <ui:fragment rendered="#{ datasetPage and empty DatasetPage.dataset.guestbook 
                                                         and ((!dataverseSession.user.authenticated or !permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset))
                                                         or ((dataverseSession.user.authenticated and permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset) 
                                                            and !empty DatasetPage.dataset.dataverseContext.availableGuestbooks)))}">
-                                   <p>#{bundle['file.dataFilesTab.terms.list.guestbook.noSelected.tip']}</p>
+                                   <p class="help-block">
+                                       #{bundle['file.dataFilesTab.terms.list.guestbook.noSelected.tip']}
+                                       <h:outputFormat value="#{bundle['dataset.manageGuestbooks.noGuestbooks.learnMore']}" escape="false">
+                                           <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                           <f:param value="#{systemConfig.guidesVersion}"/>
+                                       </h:outputFormat>
+                                   </p>
                                </ui:fragment>
                                <ui:fragment rendered="#{empty DatasetPage.dataset.guestbook 
                                                  and (dataverseSession.user.authenticated and permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset))
@@ -467,27 +531,33 @@
                                            <p:commandButton styleClass="btn btn-default pull-right"
                                                           value="#{bundle['file.dataFilesTab.terms.list.guestbook.viewBtn']}"
                                                           action="#{DatasetPage.viewSelectedGuestbook(DatasetPage.dataset.guestbook)}"
-                                                          update=":datasetForm" oncomplete="PF('viewGuestbook').show();bind_bsui_components();"/>
+                                                          update=":datasetForm:previewGuestbook" oncomplete="PF('viewGuestbook').show();"/>
                                        </div>
                                    </div>
                                </ui:fragment>
                            </ui:fragment>
                            <ui:fragment rendered="#{!empty editMode and datasetPage}">
-                               <p class="help-block">#{bundle['file.dataFilesTab.terms.list.guestbook.select.tip']}</p>
+                               <p class="help-block">
+                                   #{bundle['file.dataFilesTab.terms.list.guestbook.select.tip']}
+                                       <h:outputFormat value=" #{bundle['dataset.manageGuestbooks.noGuestbooks.learnMore']}" escape="false">
+                                            <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                            <f:param value="#{systemConfig.guidesVersion}"/>
+                                        </h:outputFormat>
+                               </p>
 
-                               <ui:fragment rendered="#{empty DatasetPage.dataset.dataverseContext.availableGuestbooks}">
-                                   <p class="help-block">
-                                       <h:outputFormat value="#{bundle['file.dataFilesTab.terms.list.guestbook.noAvailable.tip']}">
-                                           <f:param value="#{DatasetPage.dataset.owner.name}"/>
-                                       </h:outputFormat>
-                                   </p>
-                               </ui:fragment>
+                                <ui:fragment rendered="#{empty DatasetPage.dataset.dataverseContext.availableGuestbooks}">
+                                    <p class="help-block">
+                                        <h:outputFormat value="#{bundle['file.dataFilesTab.terms.list.guestbook.noAvailable.tip']}">
+                                            <f:param value="#{DatasetPage.dataset.owner.name}"/>
+                                        </h:outputFormat>
+                                    </p>
+                                </ui:fragment>
 
                                <ui:fragment rendered="#{!empty DatasetPage.dataset.dataverseContext.availableGuestbooks}">
                                    <p:commandButton styleClass="btn btn-default"
                                                     value="#{bundle['file.dataFilesTab.terms.list.guestbook.clearBtn']}" 
                                                     rendered="#{!empty DatasetPage.dataset.guestbook}"
-                                                    update="guestbookTable" process="@this" actionListener="#{DatasetPage.reset}"/>
+                                                    update="guestbookTable" process="@this" oncomplete="PF('guestbookTable').unselectAllRows();" actionListener="#{DatasetPage.reset}"/>
                                    <p:dataTable id="guestbookTable" styleClass="headerless-table margin-top"
                                                 value="#{DatasetPage.dataset.dataverseContext.availableGuestbooks}" var="guestbook" widgetVar="guestbookTable"
                                                 rendered="#{!empty DatasetPage.dataset.dataverseContext.availableGuestbooks}"
@@ -500,7 +570,7 @@
                                            <p:commandButton styleClass="btn btn-default pull-right"
                                                           value="#{bundle['file.dataFilesTab.terms.list.guestbook.viewBtn']}"
                                                           action="#{DatasetPage.viewSelectedGuestbook(guestbook)}"
-                                                          update=":datasetForm" oncomplete="PF('viewGuestbook').show();bind_bsui_components();"/>
+                                                          update=":datasetForm:previewGuestbook" oncomplete="PF('viewGuestbook').show();"/>
                                        </p:column>
                                    </p:dataTable>
                                </ui:fragment>
@@ -513,70 +583,6 @@
     </div>
     <!-- / TERMS -->
 
-    <!-- Preview Guestbook -->
-    <p:dialog id="previewGuestbook" styleClass="largePopUp" header="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.header']}" widgetVar="viewGuestbook" modal="true">
-        <div class="form-horizontal">
-            <p class="help-block">
-                #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook.title']}
-            </p>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">
-                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook']}
-                </label>
-                <div class="col-sm-8">
-                    <p class="form-control-static">
-                        #{DatasetPage.selectedGuestbook.name}
-                    </p>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">
-                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
-                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
-                </label>
-                <div class="col-sm-8">
-                    <p class="form-control-static">
-                        <h:outputText value="#{bundle['dataset.manageGuestbooks.guestbook.accountInformation']}"/>
-                        <ul>
-                            <ui:repeat value="#{DatasetPage.selectedGuestbook.requiredAccountInformation}" var="ai">
-                                <li>
-                                    <h:outputText value="#{ai} #{bundle['dataset.manageGuestbooks.guestbook.required']}"/>
-                                </li>
-                            </ui:repeat>
-                            <ui:repeat value="#{DatasetPage.selectedGuestbook.optionalAccountInformation}" var="ai">
-                                <li>
-                                    <h:outputText value="#{ai} #{bundle['dataset.manageGuestbooks.guestbook.optional']}"/>
-                                </li>
-                            </ui:repeat>
-                        </ul>
-                    </p>
-                    
-                    <ui:fragment rendered="#{!empty DatasetPage.selectedGuestbook.requiredQuestionsList or !empty DatasetPage.selectedGuestbook.optionalQuestionsList}">
-                    <p class="form-control-static">
-                        <h:outputText value="#{bundle['dataset.manageGuestbooks.guestbook.customQuestions']}"/>
-                        <ul>
-                            <ui:repeat value="#{DatasetPage.selectedGuestbook.requiredQuestionsList}" var="q">
-                                <li>
-                                    <h:outputText value="#{q} #{bundle['dataset.manageGuestbooks.guestbook.required']}"/>
-                                </li>
-                            </ui:repeat>
-                            <ui:repeat value="#{DatasetPage.selectedGuestbook.optionalQuestionsList}" var="q">
-                                <li>
-                                    <h:outputText value="#{q} #{bundle['dataset.manageGuestbooks.guestbook.optional']}"/>
-                                </li>
-                            </ui:repeat>
-                        </ul>
-                    </p>
-                    </ui:fragment>
-                </div>
-            </div>
-        </div>
-        <div class="button-block">
-            <button class="btn btn-default" onclick="PF('viewGuestbook').hide()" type="button">
-                #{bundle.close}
-            </button>
-        </div>
-    </p:dialog>
+
     <!-- / Preview Guestbook -->
-</ui:composition>
\ No newline at end of file
+</ui:composition>
diff --git a/src/main/webapp/dataset-versions.xhtml b/src/main/webapp/dataset-versions.xhtml
index e06445a9105..9e5f0a9b24d 100644
--- a/src/main/webapp/dataset-versions.xhtml
+++ b/src/main/webapp/dataset-versions.xhtml
@@ -11,7 +11,7 @@
 <ui:fragment rendered="#{widgetWrapper.widgetView}">
     <p class="help-block">
         <h:outputFormat value="#{bundle['file.dataFilesTab.versions.widget.viewMoreInfo']}" escape="false">
-            <f:param value="#{DatasetPage.dataset.globalIdString}"/>
+            <f:param value="#{DatasetPage.dataset.globalId.asString()}"/>
             <f:param value="#{DatasetPage.dataset.displayName}"/>
             <f:param value="#{dataverseServiceBean.findRootDataverse().displayName}"/>
         </h:outputFormat>
@@ -59,11 +59,11 @@
             <ui:fragment rendered="#{versionTab.released 
                                      or ((versionTab.deaccessioned or versionTab.draft) and permissionServiceBean.on(DatasetPage.dataset).has('ViewUnpublishedDataset'))}">
                 <ui:fragment rendered="#{!(versionTab.released or versionTab.deaccessioned)}">
-                    <a id="versionLink" href="/dataset.xhtml?persistentId=#{versionTab.dataset.globalIdString}&#38;version=#{versionTab.versionState}" class="ui-commandlink ui-widget">
+                    <a href="/dataset.xhtml?persistentId=#{versionTab.dataset.globalId.asString()}&#38;version=#{versionTab.versionState}" class="ui-commandlink ui-widget">
                         <h:outputText rendered="#{!(versionTab.released or versionTab.deaccessioned)}" value="#{versionTab.versionState}" /></a>
                 </ui:fragment>
                 <ui:fragment rendered="#{(versionTab.released or versionTab.deaccessioned)}">
-                    <a id="versionLink" href="/dataset.xhtml?persistentId=#{versionTab.dataset.globalIdString}&#38;version=#{versionTab.versionNumber}.#{versionTab.minorVersionNumber}" class="ui-commandlink ui-widget">
+                    <a href="/dataset.xhtml?persistentId=#{versionTab.dataset.globalId.asString()}&#38;version=#{versionTab.versionNumber}.#{versionTab.minorVersionNumber}" class="ui-commandlink ui-widget">
                         <h:outputText rendered="#{versionTab.released or versionTab.deaccessioned}" value="#{versionTab.versionNumber}.#{versionTab.minorVersionNumber}" /></a>
                 </ui:fragment>
             </ui:fragment>
@@ -77,28 +77,28 @@
                 <ui:fragment rendered="#{!empty(versionTab.defaultVersionDifference.summaryDataForNote)}">
                     <h:outputText styleClass="highlightBold" value="#{bundle['file.dataFilesTab.versions.citationMetadata']} " />
                     <ui:repeat value="#{versionTab.defaultVersionDifference.summaryDataForNote}" var="summaryNote">
-                        <h:outputText value=" #{summaryNote[0].datasetFieldType.displayName} (" />
-                        <h:outputText rendered="#{(summaryNote[1]) > 0 and summaryNote[0].datasetFieldType.allowMultiples}" value="#{summaryNote[1]} #{bundle['file.dataFilesTab.versions.added']}" />
-                        <h:outputText rendered="#{(summaryNote[1]) > 0 and !(summaryNote[0].datasetFieldType.allowMultiples)}"  value="#{bundle['file.dataFilesTab.versions.added']}" />
-                        <h:outputText rendered="#{(summaryNote[1]) > 0 and (summaryNote[2] + summaryNote[3]) > 0}" value=", " />
-                        <h:outputText rendered="#{(summaryNote[2]) > 0 and summaryNote[0].datasetFieldType.allowMultiples}" value="#{summaryNote[2]} #{bundle['file.dataFilesTab.versions.removed']}" />
-                        <h:outputText rendered="#{(summaryNote[2]) > 0 and !(summaryNote[0].datasetFieldType.allowMultiples)}" value="#{bundle['file.dataFilesTab.versions.removed']}" />
-                        <h:outputText rendered="#{(summaryNote[2]) > 0 and (summaryNote[3]) > 0}" value=", " />
-                        <h:outputText rendered="#{(summaryNote[3]) > 0 and summaryNote[0].datasetFieldType.allowMultiples}" value="#{summaryNote[3]} #{bundle['file.dataFilesTab.versions.changed']}" />
-                        <h:outputText rendered="#{(summaryNote[3]) > 0 and !(summaryNote[0].datasetFieldType.allowMultiples)}" value="#{bundle['file.dataFilesTab.versions.changed']}" />
+                        <h:outputText value=" #{summaryNote.datasetField.datasetFieldType.displayName} (" />
+                        <h:outputText rendered="#{(summaryNote.added) > 0 and summaryNote.datasetField.datasetFieldType.allowMultiples}" value="#{summaryNote.added} #{bundle['file.dataFilesTab.versions.added']}" />
+                        <h:outputText rendered="#{(summaryNote.added) > 0 and !(summaryNote.datasetField.datasetFieldType.allowMultiples)}"  value="#{bundle['file.dataFilesTab.versions.added']}" />
+                        <h:outputText rendered="#{(summaryNote.added) > 0 and (summaryNote.deleted + summaryNote.changed) > 0}" value=", " />
+                        <h:outputText rendered="#{(summaryNote.deleted) > 0 and summaryNote.datasetField.datasetFieldType.allowMultiples}" value="#{summaryNote.deleted} #{bundle['file.dataFilesTab.versions.removed']}" />
+                        <h:outputText rendered="#{(summaryNote.deleted) > 0 and !(summaryNote.datasetField.datasetFieldType.allowMultiples)}" value="#{bundle['file.dataFilesTab.versions.removed']}" />
+                        <h:outputText rendered="#{(summaryNote.deleted) > 0 and (summaryNote.changed) > 0}" value=", " />
+                        <h:outputText rendered="#{(summaryNote.changed) > 0 and summaryNote.datasetField.datasetFieldType.allowMultiples}" value="#{summaryNote.changed} #{bundle['file.dataFilesTab.versions.changed']}" />
+                        <h:outputText rendered="#{(summaryNote.changed) > 0 and !(summaryNote.datasetField.datasetFieldType.allowMultiples)}" value="#{bundle['file.dataFilesTab.versions.changed']}" />
                         <h:outputText value="); " />
                     </ui:repeat>
                 </ui:fragment>
                 <ui:fragment rendered="#{!empty(versionTab.defaultVersionDifference.blockDataForNote)}">
                     <ui:repeat value="#{versionTab.defaultVersionDifference.blockDataForNote}" var="blockNote">
-                        <h:outputText styleClass="highlightBold" rendered="#{blockNote[0].datasetFieldType.metadataBlock.displayName == 'Citation Metadata'}" value="#{bundle['file.dataFilesTab.versions.additionalCitationMetadata']} " />
-                        <h:outputText styleClass="highlightBold" rendered="#{!(blockNote[0].datasetFieldType.metadataBlock.displayName == 'Citation Metadata')}" value=" #{blockNote[0].datasetFieldType.metadataBlock.displayName}: " />
+                        <h:outputText styleClass="highlightBold" rendered="#{blockNote.datasetField.datasetFieldType.metadataBlock.displayName == 'Citation Metadata'}" value="#{bundle['file.dataFilesTab.versions.additionalCitationMetadata']} " />
+                        <h:outputText styleClass="highlightBold" rendered="#{!(blockNote.datasetField.datasetFieldType.metadataBlock.displayName == 'Citation Metadata')}" value=" #{blockNote.datasetField.datasetFieldType.metadataBlock.localeDisplayName}: " />
                         <h:outputText value=" (" />
-                        <h:outputText rendered="#{blockNote[1] > 0}" value="#{blockNote[1]} #{bundle['file.dataFilesTab.versions.added']}" />
-                        <h:outputText rendered="#{(blockNote[1]) > 0 and (blockNote[2] + blockNote[3]) > 0}" value=", " />
-                        <h:outputText rendered="#{(blockNote[2]) > 0}" value="#{blockNote[2]} #{bundle['file.dataFilesTab.versions.removed']}" />
-                        <h:outputText rendered="#{(blockNote[2]) > 0 and (blockNote[3]) > 0}" value=", " />
-                        <h:outputText rendered="#{(blockNote[3]) > 0}" value="#{blockNote[3]} #{bundle['file.dataFilesTab.versions.changed']}" />
+                        <h:outputText rendered="#{blockNote.added > 0}" value="#{blockNote.added} #{bundle['file.dataFilesTab.versions.added']}" />
+                        <h:outputText rendered="#{(blockNote.added) > 0 and (blockNote.changed + blockNote.deleted) > 0}" value=", " />
+                        <h:outputText rendered="#{(blockNote.deleted) > 0}" value="#{blockNote.deleted} #{bundle['file.dataFilesTab.versions.removed']}" />
+                        <h:outputText rendered="#{(blockNote.deleted) > 0 and (blockNote.changed) > 0}" value=", " />
+                        <h:outputText rendered="#{(blockNote.changed) > 0}" value="#{blockNote.changed} #{bundle['file.dataFilesTab.versions.changed']}" />
                         <h:outputText value="); " />
                     </ui:repeat>
                 </ui:fragment>
@@ -120,7 +120,11 @@
                     #{bundle['file.dataFilesTab.versions.description.firstPublished']}
                 </ui:fragment>
                 <ui:fragment rendered="#{versionTab.deaccessioned}">
-                    #{bundle['file.dataFilesTab.versions.description.deaccessionedReason']} #{versionTab.versionNote} <ui:fragment rendered="#{!empty versionTab.archiveNote}">#{bundle['file.dataFilesTab.versions.description.beAccessedAt']} <a href="#{versionTab.archiveNote}" target="_blank">#{versionTab.archiveNote}</a></ui:fragment>
+                    #{bundle['file.dataFilesTab.versions.description.deaccessionedReason']} #{versionTab.deaccessionNote} 
+                    <ui:fragment rendered="#{!empty versionTab.deaccessionLink}">#{bundle['file.dataFilesTab.versions.description.beAccessedAt']}
+                        <h:outputLink rendered="#{versionTab.deaccessionLinkAsURLString ne null}" value="#{versionTab.deaccessionLinkAsURLString}" target="_blank">#{versionTab.deaccessionLink}</h:outputLink>
+                        <h:outputText rendered="#{versionTab.deaccessionLinkAsURLString eq null}" value="#{versionTab.deaccessionLink}"/>
+                    </ui:fragment>
                 </ui:fragment>
             </ui:fragment>
             <p:commandLink rendered="#{(!empty(versionTab.defaultVersionDifference)) and DatasetPage.versionTabListForPostLoad.size() > (rowNum + 1)}"
@@ -129,20 +133,52 @@
                            update=":datasetForm"
                            value="#{bundle['file.dataFilesTab.versions.viewDetails.btn']}"></p:commandLink>
         </p:column><!-- end: description column -->
+        
+        <!-- start: versionNote column -->
+        <p:column headerText="#{bundle['file.dataFilesTab.versions.headers.versionNote']}" class="col-sm-2" rendered="#{versionNoteEnabled}">
+            <ui:fragment rendered="#{versionNoteEnabled}">
+                <div><h:outputText value="#{versionTab.versionNote}" /></div>
+            </ui:fragment>
+            <p:commandLink rendered="#{versionNoteEnabled and versionTab.draft and (workingVersion.id==versionTab.id)}"
+                           oncomplete="PF('editVersionNoteDialog').show();"
+                           value="#{bundle['file.dataFilesTab.versions.versionNote.btn']}"></p:commandLink>
+        </p:column><!-- end: versionNote column -->
 
         <!-- contributor column -->
-        <p:column headerText="#{bundle['file.dataFilesTab.versions.headers.contributors']}" class="col-sm-3">
-            <ui:fragment rendered="#{!empty(versionTab.contributorNames)}">
+        <p:column headerText="#{bundle['file.dataFilesTab.versions.headers.contributors']}" class="col-sm-2">
+            <ui:fragment rendered="#{!empty(versionTab.contributorNames) and !anonymized}">
                 <h:outputText value="#{versionTab.contributorNames}" />
             </ui:fragment>
+            <ui:fragment rendered="#{!empty(versionTab.contributorNames) and anonymized}">
+                <h:outputText value="#{bundle['file.dataFilesTab.versions.headers.contributors.withheld']}" />
+            </ui:fragment>
+            
         </p:column><!-- end: contributor column -->
 
         <!-- date column -->
         <p:column headerText="#{bundle['file.dataFilesTab.versions.headers.published']}" class="col-sm-2">
-            <ui:fragment><!-- rendered="#{ !empty(versionTab) and !empty(versionTab.versionDate) }"-->
-                <h:outputText id="versionDate" value="#{versionTab.versionDate}" />
+            <ui:fragment><!-- rendered="#{ !empty(versionTab) and !empty(versionTab.releaseDate) }"-->
+                <h:outputText id="versionDate" value="#{versionTab.publicationDateAsString}" />
             </ui:fragment>
         </p:column><!-- end: date column -->
+        <p:column headerText="#{bundle['file.dataFilesTab.versions.headers.archived']}" class="col-sm-1"  rendered="#{!empty(DatasetPage.dataset.id) and permissionServiceBean.on(DatasetPage.dataset).has('ViewUnpublishedDataset') and !versionTab.isDraft() and (DatasetPage.archivable  or DatasetPage.someVersionArchived or not empty(versionTab.archivalCopyLocation))}">
+            <ui:fragment>
+              <ui:fragment rendered="#{'success' eq versionTab.archivalCopyLocationStatus}">
+                <h:outputLink id="archived" value="#{versionTab.archivalCopyLocationMessage}" target="_blank" rendered="#{DatasetPage.isSuperUser()}">
+                    <h:outputText  value="#{bundle['file.dataFilesTab.versions.headers.archived.success']}" />
+                </h:outputLink>
+                <h:outputText  value="#{bundle['file.dataFilesTab.versions.headers.archived.success']}" rendered="#{!DatasetPage.isSuperUser()}"/>
+              </ui:fragment>
+              <h:outputText  value="#{bundle['file.dataFilesTab.versions.headers.archived.pending']}" rendered="#{'pending' eq versionTab.archivalCopyLocationStatus}" title="#{DatasetPage.isSuperUser() ? versionTab.archivalCopyLocationMessage : ''}"/>
+              <h:outputText  value="#{bundle['file.dataFilesTab.versions.headers.archived.failure']}" rendered="#{'failure' eq versionTab.archivalCopyLocationStatus}" title="#{DatasetPage.isSuperUser() ? versionTab.archivalCopyLocationMessage : ''}"/>
+              <p:commandLink rendered="#{DatasetPage.isSuperUser() and DatasetPage.versionArchivable and empty(versionTab.archivalCopyLocation)}" update="#{p:resolveClientId('datasetForm:tabView:versionsTable', view)},:messagePanel" 
+                                                   action="#{DatasetPage.archiveVersion(versionTab.id)}">
+                  <h:outputText value="#{bundle['file.dataFilesTab.versions.headers.archived.submit']}"/>
+              </p:commandLink>
+              <h:outputText  value="#{bundle['file.dataFilesTab.versions.headers.archived.notarchived']}" rendered="#{ empty(versionTab.archivalCopyLocation) and ((not DatasetPage.isSuperUser() and DatasetPage.someVersionArchived) or (DatasetPage.isSuperUser() and not DatasetPage.versionArchivable))}"/>
+              
+            </ui:fragment>
+        </p:column><!-- end: archivalCopy column -->
     </p:dataTable>
 <!-- / VERSIONS -->
 </ui:fragment>
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index f74f10cbd72..6ab1751ebd1 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -15,16 +15,19 @@
             <ui:param name="dataverse" value="#{DatasetWidgetsPage.dataset.owner}"/>
             <ui:param name="dataset" value="#{DatasetWidgetsPage.dataset}"/>
             <ui:param name="showMessagePanel" value="#{true}"/>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewParam name="datasetId" value="#{DatasetWidgetsPage.datasetId}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                     <f:viewAction action="#{DatasetWidgetsPage.init}" />
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(DatasetWidgetsPage.dataset, bundle['dataset.thumbnailsAndWidget.breadcrumbs.title'])}"/>
                 </f:metadata>
+            </ui:define>
+            <ui:define name="body">
+                <h:form id="themeWidgetsForm" styleClass="row form-horizontal">
                 <p:tabView rendered="#{themeWidgetFragment.editDv!=null}" id="themeWidgetsTabView" widgetVar="content">
                     <p:tab id="thumbnailsTab" title="#{bundle['dataset.thumbnailsAndWidget.thumbnails.title']}">
-                        <h:form id="themeWidgetsForm" styleClass="row form-horizontal">
+
                             <div class="form-group" jsf:rendered="#{true or themeWidgetFragment.editDv.themeRoot}">
                                 <label class="col-sm-3 control-label" for="logoFormat">
                                     #{bundle['dataset.thumbnailsAndWidget.thumbnailImage']}
@@ -37,13 +40,14 @@
                                             <f:param value="#{systemConfig.uploadLogoSizeLimit/1000}"/>
                                         </h:outputFormat>
                                     </p>
-                                    <div id="thumbnailPreview" class="col-sm-2 text-center">
-                                        <p>
-                                            <span class="icon-dataset text-info" style="font-size: 2.8em;" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail == null}"/>
-                                            <h:graphicImage value="#{DatasetWidgetsPage.datasetThumbnail.base64image}" alt="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.alt']}" rendered="#{DatasetWidgetsPage.datasetThumbnail != null}"/>
-                                        </p>
-                                        <span class="text-muted" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail == null}"><em>#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.default']}</em></span>
-                                        <p:commandButton update="@form" value="#{bundle.remove}" action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}" rendered="#{DatasetWidgetsPage.datasetThumbnail != null and DatasetWidgetsPage.datasetThumbnail.fromDataFile != true}" oncomplete="bind_bsui_components();"/>
+                                    <div id="thumbnailPreview" class="col-sm-3 text-center">
+                                        <span class="icon-dataset text-primary" style="font-size:7em !important;color:#428BCA;line-height:1.2;" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail == null}"/>
+                                        <div class="text-muted" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail == null}"><em>#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.default']}</em></div>
+                                        
+                                        <img class="margin-bottom-half" src="#{DatasetWidgetsPage.datasetThumbnail.base64image}" alt="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.alt']}" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail != null}"/>
+                                        
+                                        <p:commandButton update="@form" value="#{bundle.remove}" action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}" rendered="#{DatasetWidgetsPage.datasetThumbnail != null and DatasetWidgetsPage.datasetThumbnail.fromDataFile != true}"/>
+                                        
                                         <div jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail.fromDataFile == true}">
                                             <button class="btn btn-default" onclick="PF('confrmRemove').show()" type="button">
                                                 #{bundle.remove}
@@ -70,9 +74,10 @@
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew.title']}"></span>
                                             </label>
                                             <p:fileUpload invalidFileMessage="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update="@form" 
-                                                          sizeLimit="#{systemConfig.uploadLogoSizeLimit}" 
-                                                          oncomplete="bind_bsui_components();" dragDropSupport="true" auto="true" multiple="false" 
-                                                          fileUploadListener="#{DatasetWidgetsPage.handleImageFileUpload}" label="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload']}"/>
+                                                          sizeLimit="#{systemConfig.uploadLogoSizeLimit}"
+                                                          invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}"
+                                                          dragDropSupport="true" auto="true" multiple="false" 
+                                                          listener="#{DatasetWidgetsPage.handleImageFileUpload}" label="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload']}"/>
                                         </div>
                                     </div>
                                 </div>
@@ -81,48 +86,6 @@
                                 <p:commandButton styleClass="btn btn-default" update="@form" value="#{bundle.saveChanges}" action="#{DatasetWidgetsPage.save()}"/>
                                 <p:commandButton styleClass="btn btn-link" update="@form" value="#{bundle.cancel}" action="#{DatasetWidgetsPage.cancel()}"/>
                             </div>
-
-                            <p:dialog id="confrmRemove" header="#{bundle['dataset.thumbnailsAndWidget.removeThumbnail']}" widgetVar="confrmRemove" modal="true">
-                                <p class="help-block">
-                                    <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.thumbnailsAndWidget.removeThumbnail.tip']}</span>
-                                </p>
-                                <div class="button-block">
-                                    <p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confrmRemove').hide()"
-                                                   action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}"
-                                                   update="@form"/>
-                                    <button class="btn btn-link" onclick="PF('confrmRemove').hide()" type="button">
-                                        #{bundle.cancel}
-                                    </button>
-                                </div> 
-                            </p:dialog>
-                            <p:dialog id="selectFileThumbnail" header="#{bundle['dataset.thumbnailsAndWidget.availableThumbnails']}" widgetVar="selectFileThumbnail" modal="true">
-                                <div class="form-horizontal col-sm-12">
-                                    <div class="form-group">
-                                        <p class="help-block">#{bundle['dataset.thumbnailsAndWidget.availableThumbnails.tip']}</p>
-                                        <p:outputPanel id="customPanel">
-                                            <p:selectOneRadio id="selectDatasetThumbnail" value="#{DatasetWidgetsPage.datasetFileThumbnailToSwitchTo}" layout="custom" converter="dataFileConverter">
-                                                <f:selectItems value="#{DatasetWidgetsPage.datasetThumbnails}" var="thumb" itemLabel="#{thumb}" itemValue="#{thumb.dataFile}"/>
-                                            </p:selectOneRadio>
-                                            <c:forEach items="#{DatasetWidgetsPage.datasetThumbnails}" var="thumbnail" varStatus="loop">
-                                                <div class="col-xs-4 text-center radio">
-                                                    <p:radioButton for="selectDatasetThumbnail" id="opt#{loop.index}" itemIndex="#{loop.index}" />
-                                                    <h:outputLabel for="opt#{loop.index}" style="padding:4px;">
-                                                        <div style="height:48px;"><img src="#{thumbnail.base64image}" alt="#{thumbnail.filename}"/></div>
-                                                        <h:outputText value="#{thumbnail.filename}"/>
-                                                    </h:outputLabel>
-                                                </div>
-                                            </c:forEach>
-                                        </p:outputPanel>
-                                    </div>
-                                </div>
-                                <div class="button-block">
-                                    <p:commandButton styleClass="btn btn-default" update="@form" value="#{bundle.continue}" action="#{DatasetWidgetsPage.setDataFileAsThumbnail()}"/>
-                                    <button class="btn btn-link" onclick="PF('selectFileThumbnail').hide()" type="button">
-                                        #{bundle.cancel}
-                                    </button>
-                                </div>
-                            </p:dialog>
-                        </h:form>
                     </p:tab>
                     <p:tab id="widgetsTab" title="#{bundle['dataset.thumbnailsAndWidget.widgets.title']}">
                         <div id="no-widgets-message" class="panel panel-default" jsf:rendered="#{DatasetWidgetsPage.dataset.id.intValue() > 0 and !DatasetWidgetsPage.dataset.released}">
@@ -151,7 +114,6 @@
                                 </p>
                             </div>
                         </div>
-
                         <ui:fragment rendered="#{DatasetWidgetsPage.dataset.released}">
                             <p class="help-block">
                                 <h:outputFormat value="#{bundle['dataset.widgets.tip']}" escape="false">
@@ -166,7 +128,7 @@
                                 <p class="help-block">#{bundle['dataset.widgets.citation.tip']}</p>
                             </div>
                             <div>
-                                <textarea rows="3" cols="54" class="form-control">&lt;script src=&quot;#{systemConfig.dataverseSiteUrl}/resources/js/widgets.js?persistentId=#{dataset.globalId}&amp;amp;dvUrl=#{systemConfig.dataverseSiteUrl}&amp;amp;widget=citation&amp;amp;heightPx=150&quot;&gt;&lt;/script&gt;</textarea>
+                                <textarea rows="3" cols="54" class="form-control">&lt;script id=&quot;dataverse-widget-js&quot; src=&quot;#{systemConfig.dataverseSiteUrl}/resources/js/widgets.js?persistentId=#{dataset.globalId}&amp;amp;dvUrl=#{systemConfig.dataverseSiteUrl}&amp;amp;widget=citation&amp;amp;heightPx=150&quot;&gt;&lt;/script&gt;</textarea>
                             </div>
                             <div>
                                 <h5>
@@ -175,16 +137,57 @@
                                 <p class="help-block">#{bundle['dataset.widgets.datasetFull.tip']}</p>
                             </div>
                             <div>
-                                <textarea rows="3" cols="54" class="form-control">&lt;script src=&quot;#{systemConfig.dataverseSiteUrl}/resources/js/widgets.js?persistentId=#{dataset.globalId}&amp;amp;dvUrl=#{systemConfig.dataverseSiteUrl}&amp;amp;widget=iframe&amp;amp;heightPx=500&quot;&gt;&lt;/script&gt;</textarea>
+                                <textarea rows="3" cols="54" class="form-control">&lt;script id=&quot;dataverse-widget-js&quot; src=&quot;#{systemConfig.dataverseSiteUrl}/resources/js/widgets.js?persistentId=#{dataset.globalId}&amp;amp;dvUrl=#{systemConfig.dataverseSiteUrl}&amp;amp;widget=iframe&amp;amp;heightPx=500&quot;&gt;&lt;/script&gt;</textarea>
                             </div>
                         </ui:fragment>
                         <div class="button-block">
-                            <h:outputLink class="btn btn-default" value="/dataset.xhtml?persistentId=#{DatasetWidgetsPage.dataset.globalIdString}">
+                            <h:outputLink class="btn btn-default" value="/dataset.xhtml?persistentId=#{DatasetWidgetsPage.dataset.globalId.asString()}">
                                 <h:outputText value="#{bundle.done}"/></h:outputLink>
                         </div>
                     </p:tab>
                 </p:tabView>
+                <p:dialog id="confrmRemove" header="#{bundle['dataset.thumbnailsAndWidget.removeThumbnail']}" widgetVar="confrmRemove" modal="true">
+                    <p class="help-block">
+                        <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.thumbnailsAndWidget.removeThumbnail.tip']}</span>
+                    </p>
+                    <div class="button-block">
+                        <p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confrmRemove').hide()"
+                                         action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}"
+                                         update="@form"/>
+                        <button class="btn btn-link" onclick="PF('confrmRemove').hide()" type="button">
+                                    #{bundle.cancel}
+                        </button>
+                    </div> 
+                </p:dialog>
+                <p:dialog id="selectFileThumbnail" header="#{bundle['dataset.thumbnailsAndWidget.availableThumbnails']}" widgetVar="selectFileThumbnail" modal="true">
+                    <div class="form-horizontal col-sm-12">
+                        <div class="form-group">
+                            <p class="help-block">#{bundle['dataset.thumbnailsAndWidget.availableThumbnails.tip']}</p>
+                            <p:outputPanel id="customPanel">
+                                <p:selectOneRadio id="selectDatasetThumbnail" value="#{DatasetWidgetsPage.datasetFileThumbnailToSwitchTo}" layout="custom" converter="dataFileConverter">
+                                    <f:selectItems value="#{DatasetWidgetsPage.datasetThumbnails}" var="thumb" itemLabel="#{thumb}" itemValue="#{thumb.dataFile}"/>
+                                </p:selectOneRadio>
+                                <c:forEach items="#{DatasetWidgetsPage.datasetThumbnails}" var="thumbnail" varStatus="loop">
+                                    <div class="col-xs-4 text-center radio">
+                                        <p:radioButton for="selectDatasetThumbnail" id="opt#{loop.index}" itemIndex="#{loop.index}" />
+                                        <h:outputLabel for="opt#{loop.index}" style="padding:4px;">
+                                            <div><img src="#{thumbnail.base64image}" alt="#{thumbnail.filename}"/></div>
+                                            <h:outputText value="#{thumbnail.filename}"/>
+                                        </h:outputLabel>
+                                    </div>
+                                </c:forEach>
+                            </p:outputPanel>
+                        </div>
+                    </div>
+                    <div class="button-block">
+                        <p:commandButton styleClass="btn btn-default" update="@form" value="#{bundle.continue}" action="#{DatasetWidgetsPage.setDataFileAsThumbnail()}"/>
+                        <button class="btn btn-link" onclick="PF('selectFileThumbnail').hide()" type="button">
+                                    #{bundle.cancel}
+                        </button>
+                    </div>
+                </p:dialog>
+               </h:form>
             </ui:define>
         </ui:composition>
     </h:body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 7e893dd3dc3..f1f72b50634 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -10,7 +10,7 @@
       xmlns:pt="http://java.sun.com/jsf/passthrough"
       xmlns:cc="http://java.sun.com/jsf/composite"
       xmlns:o="http://omnifaces.org/ui"
-      xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
+      xmlns:of="http://omnifaces.org/functions">
     <h:head>
     </h:head>
     <h:body>
@@ -19,512 +19,820 @@
             <ui:param name="dataverse" value="#{DatasetPage.dataset.owner}"/>
             <ui:param name="dataset" value="#{DatasetPage.dataset}"/>
             <ui:param name="version" value="#{DatasetPage.workingVersion}"/>
+            <ui:param name="deaccessioned" value="#{version.deaccessioned}"/>
             <ui:param name="locked" value="#{DatasetPage.locked}"/>
-	    <ui:param name="showMessagePanel" value="#{true}"/>
-	    <ui:define name="meta_header">
-            <meta name="description" content="#{DatasetPage.description}"/>
+            <ui:param name="anonymizedAccess" value="#{DatasetPage.anonymizedAccess}"/>
+            <ui:param name="anonymizedAccessEnabled" value="#{DatasetPage.anonymizedAccessEnabled}"/>
+            <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
+            <ui:param name="canDownloadFiles" value="#{DatasetPage.canDownloadFiles()}"/>
+            <ui:param name="canIssuePublishDatasetCommand" value="#{permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}"/>
+            <ui:param name="showPublishLink" value="#{version == DatasetPage.dataset.latestVersion 
+                                                      and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
+                                                      and canIssuePublishDatasetCommand}"/>
+            <ui:param name="versionHasTabular" value="#{DatasetPage.versionHasTabular}"/>
+            <ui:param name="versionHasGlobus" value="#{DatasetPage.versionHasGlobus}"/>
+            <ui:param name="tooLargeToDownload" value="#{DatasetPage.tooLargeToDownload}"/>
+            <ui:param name="tooLargeToDownloadOriginal" value="#{DatasetPage.tooLargeToDownloadOriginal}"/>
+            <ui:param name="tooLargeToDownloadArchival" value="#{DatasetPage.tooLargeToDownloadArchival}"/>
+            <ui:param name="sizeOfDataset" value="#{DatasetPage.sizeOfDataset}"/>
+            <ui:param name="sizeOfDatasetOrig" value="#{DatasetPage.sizeOfDatasetOrig}"/>
+            <ui:param name="datasetExploreToolsSize" value="#{DatasetPage.datasetExploreTools.size()}"/>
+            <ui:param name="sessionUserAuthenticated" value="#{DatasetPage.sessionUserAuthenticated}"/>
+            <ui:param name="showComputeButton" value="#{DatasetPage.showComputeButton()}"/>
+            <ui:param name="canSeeCurationStatus" value="#{DatasetPage.canSeeCurationStatus()}"/>
+            <ui:param name="signpostingLinkHeader" value="#{DatasetPage.getSignpostingLinkHeader()}"/>
+            <ui:param name="displayCitation" value="#{DatasetPage.displayCitation}"/>
+            <ui:param name="description" value="#{DatasetPage.description}"/>
+            <ui:param name="title" value="#{DatasetPage.title}"/>
+            <ui:param name="datasetAuthors" value="#{DatasetPage.datasetAuthors}"/>
+            <ui:param name="dataverseSiteUrl" value="#{DatasetPage.dataverseSiteUrl}"/>
+            <ui:param name="thumbnailString" value="#{DatasetPage.thumbnailString}"/>
+            <ui:param name="jsonLd" value="#{DatasetPage.jsonLd}"/>
+            <ui:param name="croissant" value="#{DatasetPage.croissant}"/>
+            <ui:param name="latestVersionInReview" value="#{DatasetPage.dataset.latestVersion.inReview}"/>
+            <ui:param name="showSubmitForReviewLink" value="#{DatasetPage.editMode != 'CREATE' and version == DatasetPage.dataset.latestVersion
+                                                              and !DatasetPage.datasetLockedInWorkflow
+                                                              and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
+                                                              and canUpdateDataset
+                                                              and !canIssuePublishDatasetCommand}"/>
+            <ui:param name="showReturnToAuthorLink" value="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and latestVersionInReview
+                                                             and canIssuePublishDatasetCommand}"/>
+            <ui:param name="showAccessDatasetButtonGroup" value="#{(canDownloadFiles or versionHasGlobus)
+                                                                   and (!deaccessioned
+                                                                   or (deaccessioned and canUpdateDataset))}"/>
+            <!-- TO-DO FIX RSYNC LOGIC !fileMetadata.dataFile.filePackage or
+                                                    fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload -->
+            <!-- NOTE removed fileAccessRequest logic in order to always display the file access btn -->
+            <ui:param name="showAccessFileButtonGroup" value="#{!deaccessioned
+                                                                or (deaccessioned
+                                                                and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset))}"/>
+            <ui:param name="publishDataset" value="#{DatasetPage.publishDatasetPopup()}"/>
+            <ui:param name="releaseDraft" value="#{DatasetPage.releaseDraftPopup()}"/>
+            <ui:param name="releaseBoth" value="#{DatasetPage.publishBothPopup()}"/>
+            <ui:param name="valid" value="#{DatasetPage.valid}"/>
+            <ui:define name="meta_header">
+                <ui:fragment rendered="#{!anonymizedAccess}">
+                    <meta name="description" content="#{description}"/>
+                </ui:fragment>
             </ui:define>
             <ui:define name="dc_meta_header">
-	    <meta name="DC.identifier" content="#{DatasetPage.persistentId}"/>
-	    <meta name="DC.type" content="Dataset"/>
-	    <meta name="DC.title" content="#{DatasetPage.title}"/>
-            <meta name="DC.date" content="#{DatasetPage.workingVersion.publicationDateAsString}"/>
-	    <meta name="DC.publisher" content="#{DatasetPage.publisher}" />
-            <meta name="DC.description" content="#{DatasetPage.description}" />
-	    <ui:repeat var="author" value="#{DatasetPage.datasetAuthors}">
-            <meta name="DC.creator" content="#{author}"/>
-	    </ui:repeat>
-            <ui:repeat var="subject" value="#{DatasetPage.workingVersion.datasetSubjects}">
-            <meta name="DC.subject" content="#{subject}"/>
-	    </ui:repeat>
-	    </ui:define>
-	    <ui:define name="jsonld_header">
-                <script type="application/ld+json">
-                    <h:outputText value="#{DatasetPage.jsonLd}"/>
-                </script>
-	    </ui:define>
-	    <ui:define name="og_header">
-                <meta property="og:title" content="#{DatasetPage.title}" />
-                <meta property="og:type" content="article" />
-                <meta property="og:url" content="#{DatasetPage.dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" />
-                <meta property="og:image" content="#{DatasetPage.dataverseSiteUrl.concat(resource['images/dataverse-icon-1200.png'])}" />
-                <meta property="og:site_name" content="#{DatasetPage.publisher}" />
-                <meta property="og:description" content="#{(DatasetPage.description.length()>150 ? DatasetPage.description.substring(0,147).concat('...') : DatasetPage.description)}" />
-                <ui:repeat var="author" value="#{DatasetPage.datasetAuthors}">
-                    <meta property="article:author" content="#{author}" />
-                </ui:repeat>
-                <meta property="article:published_time" content="#{DatasetPage.workingVersion.publicationDateAsString}" />
-	    </ui:define>
-            <ui:define name="body">
-                <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
+                <ui:fragment rendered="#{!anonymizedAccess}">
+                    <meta name="DC.identifier" content="#{DatasetPage.persistentId}"/>
+                    <meta name="DC.type" content="Dataset"/>
+                    <meta name="DC.title" content="#{title}"/>
+                    <meta name="DC.date" content="#{version.publicationDateAsString}"/>
+                    <meta name="DC.publisher" content="#{DatasetPage.publisher}" />
+                    <meta name="DC.description" content="#{description}" />
+                    <ui:repeat var="author" value="#{datasetAuthors}">
+                        <meta name="DC.creator" content="#{author}"/>
+                    </ui:repeat>
+                    <ui:repeat var="subject" value="#{version.datasetSubjects}">
+                        <meta name="DC.subject" content="#{subject}"/>
+                    </ui:repeat>
+                </ui:fragment>
+            </ui:define>
+                
+            <ui:define name="jsonld_header">
+                <ui:fragment rendered="#{!anonymizedAccess}">
+                    <script type="application/ld+json">
+                        <ui:fragment rendered="#{croissant == null}">
+                            <h:outputText value="#{jsonLd}"/>
+                        </ui:fragment>
+                        <ui:fragment rendered="#{croissant != null}">
+                            <h:outputText value="#{croissant}"/>
+                        </ui:fragment>
+                    </script>
+                </ui:fragment>
+            </ui:define>
+            <ui:define name="og_header">
+                <ui:fragment rendered="#{!anonymizedAccess}">
+                    <meta property="og:title" content="#{title}" />
+                    <meta property="og:type" content="article" />
+                    <meta property="og:url" content="#{dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" />
+                    <meta property="og:image" content="#{empty thumbnailString ? dataverseSiteUrl.concat(resource['images/dataverse-icon-1200.png']): dataverseSiteUrl.concat('/api/datasets/:persistentId/thumbnail?persistentId=').concat(DatasetPage.dataset.getGlobalId().asString())}" />
+                    <meta property="og:site_name" content="#{DatasetPage.publisher}" />
+                    <meta property="og:description" content="#{(description.length()>150 ? description.substring(0,147).concat('...') : description)}" />
+                    <ui:repeat var="author" value="#{datasetAuthors}">
+                        <meta property="article:author" content="#{author}" />
+                    </ui:repeat>
+                    <meta property="article:published_time" content="#{version.publicationDateAsString}" />
+                </ui:fragment>
+            </ui:define>
+            <ui:define name="metadata">
                 <f:metadata>
-                    <f:viewParam name="id" value="#{DatasetPage.dataset.id}"/>
-                    <f:viewParam name="ownerId" value="#{DatasetPage.ownerId}"/>
-                    <f:viewParam name="version" value="#{DatasetPage.version}"/>
-                    <f:viewParam name="versionId" value="#{DatasetPage.versionId}"/>
-                    <f:viewParam name="persistentId" value="#{DatasetPage.persistentId}"/>
-                    <f:viewParam name="showIngestSuccess" value="#{DatasetPage.showIngestSuccess}"/>
-                    <f:viewParam name="fileSortField" value="#{DatasetPage.fileSortField}"/>
-                    <f:viewParam name="fileSortOrder" value="#{DatasetPage.fileSortOrder}"/>
-                    <f:viewParam name="q" value="#{DatasetPage.fileLabelSearchTerm}"/>
-                    <f:viewParam name="fileTypeGroupFacet" value="#{DatasetPage.fileTypeFacet}"/>
-                    <f:viewParam name="fileAccess" value="#{DatasetPage.fileAccessFacet}"/>
-                    <f:viewParam name="fileTag" value="#{DatasetPage.fileTagsFacet}"/>
-                    <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
-                    <f:viewAction action="#{DatasetPage.init}" rendered="true"/>
-                    <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(DatasetPage.dataset)}"/>
-                    <f:viewAction action="#{EditDatafilesPage.initCreateMode(DatasetPage.editMode, DatasetPage.workingVersion, DatasetPage.newFiles, DatasetPage.selectedFiles)}"/>
+                  <f:viewParam name="id" value="#{DatasetPage.id}"/>
+                  <o:viewParam name="ownerId" value="#{DatasetPage.ownerId}"/>
+                  <f:viewParam name="version" value="#{DatasetPage.version}"/>
+                  <f:viewParam name="versionId" value="#{DatasetPage.versionId}"/>
+                  <f:viewParam name="persistentId" value="#{DatasetPage.persistentId}"/>
+                  <f:viewParam name="showIngestSuccess" value="#{DatasetPage.showIngestSuccess}"/>
+                  <f:viewParam name="fileSortField" value="#{DatasetPage.fileSortField}"/>
+                  <f:viewParam name="fileSortOrder" value="#{DatasetPage.fileSortOrder}"/>
+                  <o:viewParam name="tagPresort" value="#{DatasetPage.tagPresort}" default="true"/>
+                  <o:viewParam name="folderPresort" value="#{DatasetPage.folderPresort}" default="true"/>
+                  <f:viewParam name="q" value="#{DatasetPage.fileLabelSearchTerm}"/>
+                  <f:viewParam name="fileTypeGroupFacet" value="#{DatasetPage.fileTypeFacet}"/>
+                  <f:viewParam name="fileAccess" value="#{DatasetPage.fileAccessFacet}"/>
+                  <f:viewParam name="fileTag" value="#{DatasetPage.fileTagsFacet}"/>
+                  <o:viewParam name="selectTab" value="#{DatasetPage.selectTab}" default="dataFilesTab"/>
+                  <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
+                  <f:viewAction action="#{DatasetPage.init}" rendered="true"/>
+                  <f:viewAction action="#{DatasetPage.viewActionInitBreadcrumbs()}"/> 
+                  <f:viewAction action="#{EditDatafilesPage.initCreateMode(DatasetPage.editMode, DatasetPage.workingVersion, DatasetPage.uploadInProgress, DatasetPage.newFiles, DatasetPage.uploadedFiles, DatasetPage.selectedFiles)}"/>
                 </f:metadata>
+            </ui:define>
+            <ui:define name="body">
+                <!-- Add Signposting-->
+                <c:if test="#{not empty DatasetPage.getSignpostingLinkHeader()}">
+                    <f:event type="preRenderView" listener="#{facesContext.externalContext.response.setHeader('Link', DatasetPage.getSignpostingLinkHeader())}" />
+                </c:if>
+                <!-- End add Signposting-->
+                <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
+                <o:importConstants type="edu.harvard.iq.dataverse.settings.FeatureFlags" />
+                <ui:param name="versionNoteEnabled" value="#{FeatureFlags.VERSION_NOTE.enabled()}"/>
+                
                 <h:form id="datasetForm">
-                    <!-- Header / Button Panel -->
-                    <!-- View editMode -->
+                    <h:inputHidden id="validateFilesOutcome" value="#{DatasetPage.validateFilesOutcome}" />
+                    <h:inputHidden id="validTermsofAccess" value="#{DatasetPage.hasValidTermsOfAccess}" />
+
+                    <!-- View infoMode -->
+                    <!-- Top Button/Citation Blocks -->
                     <p:fragment id="topDatasetBlockFragment">
-                    <div id="topDatasetBlock" class="row" jsf:rendered="#{empty DatasetPage.editMode}">
-                        <div id="actionButtonBlock" class="button-block clearfix" jsf:rendered="#{!widgetWrapper.widgetView}">
-                            <div class="btn-group pull-right" jsf:rendered="#{DatasetPage.sessionUserAuthenticated
-                                                                              and !DatasetPage.dataset.deaccessioned
-                                                                              and DatasetPage.showComputeButton()}">
-                                <!-- Compute Button Group -->
-                                <button type="button" id="computeBatch" class="btn btn-default btn-compute dropdown-toggle" data-toggle="dropdown">
-                                    <span class="glyphicon glyphicon-flash"/> #{bundle['dataset.compute.computeBtn']} <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu pull-left text-left" role="menu">
-                                    <li>
-                                        <!-- Compute dataset link -->
-                                        <h:commandLink action="#{DatasetPage.canComputeAllFiles(false)}">
-                                            <h:outputText value="#{bundle['dataset.compute.computeBatchSingle']}"/>
-                                        </h:commandLink>
-                                    </li>
-                                    <li jsf:rendered="#{!DatasetPage.isCartEmpty()}" class="divider"></li>
-                                    <li jsf:rendered="#{!DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
-                                        <!-- Add link -->
-                                        <p:commandLink action="#{DatasetPage.addItemtoCart(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}"
-                                            disabled="#{DatasetPage.locked}" value="#{bundle['dataset.compute.computeBatchAdd']}" update=":datasetForm,:messagePanel">
-                                            <h:outputText value="#{bundle['dataset.compute.computeBatchAdd']}"/>
-                                        </p:commandLink>
-                                    </li>
-                                    <ui:fragment rendered="#{!DatasetPage.isCartEmpty()}">
-                                        <li jsf:rendered="#{DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
-                                            <!-- Remove link -->
-                                            <p:commandLink value="#{bundle['dataset.compute.computeBatchRemove']}" action="#{DatasetPage.removeCartItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}" update=":datasetForm,:messagePanel">  
-                                                <h:outputText value="#{bundle['dataset.compute.computeBatchRemove']}"/>
-                                            </p:commandLink>
-                                        </li>
-                                        <li>
-                                            <!-- List link -->
-                                            <p:commandLink title="#{bundle['dataset.compute.computeBatchList']}"
-                                                           value="#{bundle['dataset.compute.computeBatchList']}"
-                                                           oncomplete="PF('computeBatchListPopup').show();bind_bsui_components();"
-                                                           update="computeBatchListPopup">
-                                                <h:outputText value="#{bundle['dataset.compute.computeBatchList']}"/>
-                                            </p:commandLink>
-                                        </li>
-                                        <li>
-                                            <!-- Clear link -->
-                                            <p:commandLink value="#{bundle['dataset.compute.computeBatchClear']}" action="#{DatasetPage.clearCart()}" update=":datasetForm,:messagePanel">  
-                                                <h:outputText value="#{bundle['dataset.compute.computeBatchClear']}"/>
-                                            </p:commandLink>
-                                        </li>
-                                        <li>
-                                            <!-- Compute batch link -->
-                                            <h:outputLink value="#{DatasetPage.cartComputeUrl}" target="_blank">
-                                                <h:outputText id="compute-batch-button" value="#{bundle['dataset.compute.computeBatchCompute']}" />
-                                            </h:outputLink>
-                                        </li>
-                                    </ui:fragment>
-                                </ul>
-                            </div>
-                            <div class="btn-group pull-right" jsf:rendered="#{!DatasetPage.dataset.deaccessioned}">
-                                <!-- Explore Button Group -->
-                                <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()==1}">
-                                    <button type="button" class="btn btn-default btn-explore" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
-                                        <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
-                                    </button>
-                                </ui:fragment>
-                                <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()>1}">
-                                    <button type="button" class="btn btn-default btn-explore dropdown-toggle" data-toggle="dropdown">
-                                        <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"></span>
-                                    </button>
-                                </ui:fragment>
-                                <ul class="dropdown-menu pull-left text-left" role="menu">
-                                    <!-- Explore tool links -->
-                                    <ui:repeat var="tool" value="#{DatasetPage.datasetExploreTools}">
-                                        <li>
-                                            <h:commandLink action="#{DatasetPage.explore(tool)}">
-                                                <h:outputText value="#{tool.displayName}"/>
-                                            </h:commandLink>
-                                        </li>
-                                    </ui:repeat>
-                                </ul>
-                            </div>
-                            <div class="btn-group pull-right" role="group">
-                                <!-- Edit/Publish Button Group -->
-                                <!-- Publish/Submit for Review/Return to Author Button Group -->
-                                <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
-                                                            and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
-                                                            or (DatasetPage.dataset.latestVersion.versionState=='DRAFT'
-                                                            and DatasetPage.canUpdateDataset()
-                                                            and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset))}">
-                                    <!-- Publish Buttons -->
-                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishConfirm').show()"
-                                                   rendered="#{!DatasetPage.dataset.released
-                                                               and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                    </p:commandLink>
-                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('releaseDraft').show()"
-                                                   rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                    </p:commandLink>
-                                    <!-- 4.2.1:  replaced permissionServiceBean.on(DatasetPage.dataset.owner).has('PublishDataverse') with DatasetPage.canPublishDataverse() -->
-                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('mayNotRelease').show()"
-                                                   rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
-                                                               and !DatasetPage.canPublishDataverse()}">
-                                        <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                    </p:commandLink>
-                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishParent').show()"
-                                                   rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
-                                                               and DatasetPage.canPublishDataverse()
-                                                               and (DatasetPage.dataset.owner.owner == null or (DatasetPage.dataset.owner.owner != null and DatasetPage.dataset.owner.owner.released))
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                    </p:commandLink>
-                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}"
-                                                   rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
-                                                               and DatasetPage.canPublishDataverse()
-                                                               and (DatasetPage.dataset.owner.owner != null and !DatasetPage.dataset.owner.owner.released)
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}"
-                                                   onclick="PF('maynotPublishParent').show()">
-                                        <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                    </p:commandLink>
-                                    <!-- END: Publish Buttons -->
-                                    <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <!-- Return to Author Button -->
-                                        <button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}" 
-                                                              onclick="PF('sendBackToContributor').show()">
-                                            <span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
-                                        </button>
-                                        <!-- END: Return to Author Button -->
-                                    </ui:fragment>
-                                    <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
-                                                            and !DatasetPage.datasetLockedInWorkflow
-                                                            and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
-                                                            and DatasetPage.canUpdateDataset()
-                                                            and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <!-- Submit for Review Button -->
-                                        <button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" 
-                                                              onclick="PF('inreview').show()">
-                                            <span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
-                                        </button>
-                                        <!-- End: Submit for Review Button -->
-                                    </ui:fragment>
-                                </ui:fragment>
-                                <!-- END: Publish/Submit for Review/Return to Author Button Group -->
-                                <p:commandLink rendered="#{dataverseSession.user.authenticated and !DatasetPage.workingVersion.deaccessioned and DatasetPage.dataset.released}"
-                                               styleClass="btn btn-default btn-access"   
-                                               action="#{DatasetPage.setShowLinkingPopup(true)}"
-                                               oncomplete="PF('linkDatasetForm').show();bind_bsui_components();"
-                                               update="@form">
-                                    <span class="glyphicon glyphicon-link"/> #{bundle['link']}
-                                </p:commandLink>
-                                <!-- Edit Button -->
-                                <ui:fragment rendered="#{DatasetPage.sessionUserAuthenticated
-                                                                                  and DatasetPage.canUpdateDataset()
-                                                                                  and !DatasetPage.dataset.deaccessioned}">
-                                    <button type="button" id="editDataSet" class="btn btn-default btn-access dropdown-toggle #{DatasetPage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown">
-                                        <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu pull-right text-left" role="menu">
-                                        <li>                                           
-                                            <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD">
-                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.upload']}"/>
-                                            </h:outputLink>
-                                        </li>
-                                        <li>
-                                            <p:commandLink id="editMetadata" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
-                                                <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
-                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.metadata']}" />
-                                            </p:commandLink>
-                                        </li>
-                                        <li>
-                                            <p:commandLink id="editTerms" actionListener="#{DatasetPage.edit('LICENSE')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
-                                                <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
-                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.terms']}" />
-                                            </p:commandLink>
-                                        </li>
-                                        <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DatasetPage.dataset)}">
-                                            <li class="#{settingsWrapper.publicInstall ? '' : 'dropdown-submenu pull-left'}">
-                                                <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
-                                                    <a tabindex="-1" href="#">#{bundle['dataset.editBtn.itemLabel.permissions']}</a>
-                                                    <ul class="dropdown-menu">
+                        <div class="row" jsf:rendered="#{empty DatasetPage.editMode}">
+                            <div class="col-xs-12">
+                                <div id="datasetVersionBlock" class="row">
+                                    <div id="title-block" class="col-xs-12 margin-bottom-half" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
+                                        <h1 id="title">#{DatasetPage.datasetVersionUI.title.value}</h1>
+                                        <div id="title-label-block" class="margin-top-half">
+                                            <!-- DATASET Publication Status -->
+                                            <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{version.draft}"/>
+                                            <h:outputText value="#{bundle['embargoed']}" styleClass="label label-primary" rendered="#{DatasetPage.isActivelyEmbargoed(version.fileMetadatas)}"/>
+                                            <h:outputText value="#{bundle['retentionExpired']}" styleClass="label label-warning" rendered="#{DatasetPage.isRetentionExpired(version.fileMetadatas)}"/>
+                                            <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{version.inReview}"/>
+                                            <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!DatasetPage.dataset.released}"/>
+                                            <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{deaccessioned}"/>
+                                            <h:outputText value="#{bundle['incomplete']}" styleClass="label label-danger" rendered="#{!valid}"/>
+                                            <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
+                                            <h:outputText value="#{DatasetUtil:getLocaleCurationStatusLabel(version.currentCurationStatus)}" styleClass="label curation-status label-info" rendered="#{canSeeCurationStatus}"/>
+                                            <!-- DATASET VERSION NUMBER -->
+                                            <h:outputText styleClass="label label-default" rendered="#{version.released and !(version.draft or version.inReview or deaccessioned)}"
+                                                          value="#{bundle['file.DatasetVersion']} #{version.versionNumber}.#{version.minorVersionNumber}"/>
+                                            <h:outputText styleClass="label label-default" rendered="#{!version.released and !(version.draft or version.inReview or deaccessioned)}"
+                                                          value="#{bundle['file.DatasetVersion']} #{version.versionState}"/>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <!-- START: NEW RESPONSIVE ABOVE FOLD BLOCK -->
+                                <div id="datasetCitationActionSummaryBlock" class="row">
+                                    <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9">
+                                        <!-- CITATION BLOCK -->
+                                        <ui:fragment rendered="#{!empty displayCitation}">
+                                            <ui:include src="dataset-citation.xhtml">
+                                                <ui:param name="datasetPage" value="true"/>
+                                                <ui:param name="anonymized" value="anonymizedAccess"/>
+                                            </ui:include>
+                                        </ui:fragment>
+                                        <!-- END: CITATION BLOCK -->
+                                    </div>
+
+                                    <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom">
+                                        <!-- ActionButtonBlock -->
+                                        <div id="actionButtonBlock" jsf:rendered="#{!widgetWrapper.widgetView}">
+                                            <!-- DOWNLOAD/ACCESS DATASET -->
+                                            <div class="btn-group btn-group-justified" 
+                                                 jsf:rendered="#{showAccessDatasetButtonGroup}">
+                                                <div class="btn-group">
+                                                    <button type="button" class="btn btn-primary btn-access-dataset dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                        #{bundle['dataset.accessBtn']} <span class="caret"></span>
+                                                    </button>
+                                                    <ul class="dropdown-menu pull-right text-left" style="padding-left:1em; padding-right:1em;" >
+                                                        <!-- DOWNLOAD -->
+                                                        <ui:fragment rendered="#{canDownloadFiles}">
+                                                            <ui:fragment rendered="#{!tooLargeToDownload}">
+                                                                <li class="dropdown-header">#{bundle['dataset.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
+                                                                <!-- NORMAL DOWNLOAD BUTTON (NO TABULAR FILES) -->
+                                                                <li jsf:rendered="#{!  versionHasTabular}">
+                                                                    <p:commandLink update="@form" actionListener="#{DatasetPage.startDownloadAllOriginal()}" styleClass="btn-download" 
+                                                                                   oncomplete="showPopup(false);">
+                                                                    #{bundle.download}
+                                                                        <h:outputFormat value="#{bundle['dataset.accessBtn.download.size']}">
+                                                                            <f:param value="#{sizeOfDataset}" />
+                                                                        </h:outputFormat>
+                                                                        <f:actionListener binding="#{DatasetPage.setTermsGuestbookPopupAction(bundle.download)}"/>
+                                                                    </p:commandLink>
+                                                                </li>
+
+                                                                <!-- DOWNLOAD Options (TABULAR FILES PRESENT) -->
+                                                                <ui:fragment rendered="#{  versionHasTabular}">
+                                                                    <!-- DOWNLOAD ORIGINAL BUTTON (TABULAR FILES PRESENT) -->
+                                                                    <li jsf:rendered="#{ sizeOfDatasetOrig != '0 B'  and !(tooLargeToDownloadOriginal) }">
+                                                                        <p:commandLink update="@form" actionListener="#{DatasetPage.startDownloadAllOriginal()}" 
+                                                                                       oncomplete="showPopup(false);"
+                                                                                       styleClass="btn-download">
+                                                                            #{bundle.downloadOriginal}
+                                                                            <h:outputFormat value="#{bundle['dataset.accessBtn.download.size']}">
+                                                                                <f:param value="#{sizeOfDatasetOrig}" />
+                                                                            </h:outputFormat>
+                                                                            <f:actionListener binding="#{DatasetPage.setTermsGuestbookPopupAction(bundle.download)}"/>
+                                                                        </p:commandLink>
+                                                                    </li>
+                                                                    <!-- Original Format too big -->
+                                                                    <ui:fragment rendered="#{tooLargeToDownloadOriginal}">                                                                                                                               
+                                                                        <h:outputText value="#{bundle['dataset.accessBtn.original.too.big']}">                                           
+                                                                        </h:outputText>                                                            
+                                                                    </ui:fragment>
+                                                                    <!-- DOWNLOAD ARCHIVAL FILES (TABULAR FILES PRESENT) -->
+                                                                    <li jsf:rendered="#{!tooLargeToDownloadArchival}">
+                                                                        <p:commandLink update="@form" oncomplete="showPopup(false);" 
+                                                                                       actionListener="#{DatasetPage.startDownloadAllArchival()}" styleClass="btn-download">
+                                                                                #{bundle.downloadArchival}
+                                                                            <h:outputFormat value="#{bundle['dataset.accessBtn.download.size']}">
+                                                                                <f:param value="#{sizeOfDataset}" />
+                                                                            </h:outputFormat>
+                                                                        </p:commandLink>
+                                                                    </li>
+                                                                    <!-- Archival Format too big -->
+                                                                    <ui:fragment rendered="#{tooLargeToDownloadArchival}">                                                                                                                               
+                                                                        <h:outputText value="#{bundle['dataset.accessBtn.archival.too.big']}">                                           
+                                                                        </h:outputText>                                                            
+                                                                    </ui:fragment>
+                                                                </ui:fragment>
+                                                            </ui:fragment>
+                                                            <!-- Can Download, but Download either format too big-->
+                                                            <ui:fragment rendered="#{tooLargeToDownload}">                                                                                                                               
+                                                                <h:outputText value="#{bundle['dataset.accessBtn.too.big']}">                                           
+                                                                </h:outputText>                                                            
+                                                            </ui:fragment>
+                                                        </ui:fragment>
+                                                        <ui:fragment rendered="#{versionHasGlobus}">
+                                                            <li>
+                                                                <p:commandLink update="@form" oncomplete="showPopup(true);" 
+                                                                                   actionListener="#{DatasetPage.startGlobusTransfer(true, false)}" styleClass="btn-download">
+                                                                            #{bundle.transfer}
+                                                                    <h:outputFormat value="#{bundle['dataset.accessBtn.transfer.size']}">
+                                                                        <f:param value="#{sizeOfDataset}" />
+                                                                    </h:outputFormat>
+                                                                    <f:actionListener binding="#{DatasetPage.setTermsGuestbookPopupAction(bundle.download)}"/>
+                                                                    </p:commandLink>
+                                                            </li>
+                                                        </ui:fragment>
+                                                            
+
+                                                                                                            
+                                                        <!-- END: DOWNLOAD -->
+                                                       
+                                                        <!-- EXPLORE -->
+                                                        <ui:fragment rendered="#{datasetExploreToolsSize >= 1}">
+                                                            <li class="dropdown-header">#{bundle['dataset.accessBtn.header.explore']} <span class="glyphicon glyphicon-equalizer"/></li>
+                                                            <!-- Explore tool links -->
+                                                            <ui:repeat var="tool" value="#{DatasetPage.datasetExploreTools}">
+                                                                <li>
+                                                                    <h:commandLink styleClass="btn-explore" action="#{DatasetPage.explore(tool)}">
+                                                                        <h:outputText value="#{tool.getDisplayNameLang()}"/>
+                                                                    </h:commandLink>
+                                                                </li>
+                                                            </ui:repeat>
+                                                        </ui:fragment>
+                                                        <!-- END: EXPLORE -->
+
+                                                        <!-- COMPUTE -->
+                                                        <ui:fragment rendered="#{sessionUserAuthenticated
+                                                                                    and showComputeButton}">
+                                                            <li class="dropdown-header">#{bundle['dataset.accessBtn.header.compute']} <span class="glyphicon glyphicon-flash"/></li>
+                                                            <li>
+                                                                <a tabindex="0" id="computeBatch" class="btn-compute">#{bundle['dataset.compute.computeBtn']}</a>
+                                                                <ul class="dropdown-menu">
+                                                                    <li>
+                                                                        <!-- Compute dataset link -->
+                                                                        <h:commandLink action="#{DatasetPage.canComputeAllFiles(false)}">
+                                                                            <h:outputText value="#{bundle['dataset.compute.computeBatchSingle']}"/>
+                                                                        </h:commandLink>
+                                                                    </li>
+                                                                    <li jsf:rendered="#{!DatasetPage.isCartEmpty()}" class="divider"></li>
+                                                                    <li jsf:rendered="#{!DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
+                                                                        <!-- Add link -->
+                                                                        <p:commandLink action="#{DatasetPage.addItemtoCart(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}"
+                                                                                       disabled="#{DatasetPage.locked}" value="#{bundle['dataset.compute.computeBatchAdd']}" update=":datasetForm,:messagePanel">
+                                                                            <h:outputText value="#{bundle['dataset.compute.computeBatchAdd']}"/>
+                                                                        </p:commandLink>
+                                                                    </li>
+                                                                    <ui:fragment rendered="#{!DatasetPage.isCartEmpty()}">
+                                                                        <li jsf:rendered="#{DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
+                                                                            <!-- Remove link -->
+                                                                            <p:commandLink value="#{bundle['dataset.compute.computeBatchRemove']}" action="#{DatasetPage.removeCartItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}" update=":datasetForm,:messagePanel">
+                                                                                <h:outputText value="#{bundle['dataset.compute.computeBatchRemove']}"/>
+                                                                            </p:commandLink>
+                                                                        </li>
+                                                                        <li>
+                                                                            <!-- List link -->
+                                                                            <p:commandLink title="#{bundle['dataset.compute.computeBatchList']}"
+                                                                                           value="#{bundle['dataset.compute.computeBatchList']}"
+                                                                                           oncomplete="PF('computeBatchListPopup').show();"
+                                                                                           update="computeBatchListPopup">
+                                                                                <h:outputText value="#{bundle['dataset.compute.computeBatchList']}"/>
+                                                                            </p:commandLink>
+                                                                        </li>
+                                                                        <li>
+                                                                            <!-- Clear link -->
+                                                                            <p:commandLink value="#{bundle['dataset.compute.computeBatchClear']}" action="#{DatasetPage.clearCart()}" update=":datasetForm,:messagePanel">
+                                                                                <h:outputText value="#{bundle['dataset.compute.computeBatchClear']}"/>
+                                                                            </p:commandLink>
+                                                                        </li>
+                                                                        <li>
+                                                                            <!-- Compute batch link -->
+                                                                            <h:outputLink value="#{DatasetPage.cartComputeUrl}" target="_blank">
+                                                                                <h:outputText id="compute-batch-button" value="#{bundle['dataset.compute.computeBatchCompute']}" />
+                                                                            </h:outputLink>
+                                                                        </li>
+                                                                    </ui:fragment>
+                                                                </ul>
+                                                            </li>
+                                                        </ui:fragment>
+                                                        <!-- END: COMPUTE -->
+                                                    </ul>
+                                                </div>
+                                            </div>
+                                            <!-- END: DOWNLOAD/ACCESS DATASET -->
+
+                                            <!-- PUBLISH DATASET -->
+                                            <div class="btn-group btn-group-justified" jsf:rendered="#{showPublishLink or showSubmitForReviewLink}">
+                                                <div class="btn-group">
+                                                    <!-- Publish BTN -->
+                                                    <h:outputLink value="#" disabled="#{DatasetPage.lockedFromPublishing or !DatasetPage.hasValidTermsOfAccess or !valid}">
+                                                        <c:if test="#{!((showSubmitForReviewLink or showReturnToAuthorLink) and showPublishLink )}">
+                                                            <f:passThroughAttribute name="class" value="btn btn-default btn-access btn-publish #{DatasetPage.lockedFromPublishing or !DatasetPage.hasValidTermsOfAccess or !valid ? 'disabled' : ''}"/>
+                                                            <f:passThroughAttribute name="onclick" value="$(this).parent().find( 'li > a' ).trigger( 'click' );"/>
+                                                        </c:if>
+                                                        <c:if test="#{(showSubmitForReviewLink or showReturnToAuthorLink) and showPublishLink}">
+                                                            <f:passThroughAttribute name="class" value="btn btn-default btn-access btn-publish dropdown-toggle #{DatasetPage.lockedFromPublishing or !DatasetPage.hasValidTermsOfAccess  or !valid ? 'disabled' : ''}"/>
+                                                            <f:passThroughAttribute name="data-toggle" value="dropdown"/>
+                                                            <f:passThroughAttribute name="aria-haspopup" value="true"/>
+                                                            <f:passThroughAttribute name="aria-expanded" value="false"/>
+                                                        </c:if>
+                                                        #{showPublishLink ? bundle['dataset.publishBtn'] : (latestVersionInReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn'])} <span jsf:rendered="#{(showSubmitForReviewLink or showReturnToAuthorLink) and showPublishLink}" class="caret"></span>
+                                                    </h:outputLink>
+                                                    <!-- Publish BTN DROPDOWN-MENU OPTIONS -->
+                                                    <ul class="dropdown-menu pull-right text-left">
+                                                        <li jsf:rendered="#{showPublishLink}" class="#{!DatasetPage.hasValidTermsOfAccess or ( DatasetPage.locked and !latestVersionInReview) ? 'disabled' : ''}">
+                                                            <!-- Publish LINK -->
+                                                            <p:commandLink styleClass="#{!DatasetPage.hasValidTermsOfAccess or (DatasetPage.locked and !latestVersionInReview) ? 'disabled' : ''}" 
+                                                                           disabled="#{!DatasetPage.hasValidTermsOfAccess or (DatasetPage.locked and !latestVersionInReview)}"
+                                                                           action="#{DatasetPage.processPublishButton()}">
+                                                                #{bundle['dataset.publish.btn']}
+                                                            </p:commandLink>
+                                                        </li>
+                                                        <li jsf:rendered="#{showSubmitForReviewLink}" class="#{latestVersionInReview or DatasetPage.dataset.locked ? 'disabled' : ''}">
+                                                            <!-- Submit for Review LINK -->
+                                                            <p:commandLink class="#{latestVersionInReview or DatasetPage.dataset.locked ? 'disabled' : ''}" 
+                                                                           disabled="#{latestVersionInReview or DatasetPage.dataset.locked}"
+                                                                           onclick="PF('inreview').show()">
+                                                                #{latestVersionInReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
+                                                            </p:commandLink>
+                                                        </li>
+                                                        <li jsf:rendered="#{showReturnToAuthorLink}" class="#{(DatasetPage.locked and !latestVersionInReview) ? 'disabled' : ''}">
+                                                            <!-- Return to Author LINK -->
+                                                            <p:commandLink class="#{(DatasetPage.locked and !latestVersionInReview) ? 'disabled' : ''}" 
+                                                                           disabled="#{DatasetPage.locked and !latestVersionInReview}"
+                                                                           onclick="PF('sendBackToContributor').show()">
+                                                                #{bundle['dataset.rejectBtn']}
+                                                            </p:commandLink>
+                                                        </li>
+                                                    </ul>
+                                                </div>
+                                            </div>
+                                            <!-- END: Publish -->
+
+                                            <!-- Edit Dataset -->
+                                            <div class="btn-group btn-group-justified" jsf:rendered="#{sessionUserAuthenticated
+                                                                                                        and canUpdateDataset}">
+                                                <div class="btn-group">
+                                                    <button type="button" id="editDataSet" class="btn btn-default btn-access btn-edit dropdown-toggle #{DatasetPage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                                                            disabled="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
+                                                        #{bundle['dataset.editBtn']} <span class="caret"></span>
+                                                    </button>
+                                                    <ul class="dropdown-menu pull-right text-left">
+                                                        <li>
+                                                            <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD" rendered="#{DatasetPage.hasValidTermsOfAccess}">
+                                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.upload']}"/>
+                                                            </h:outputLink>
+                                                        </li>
+                                                        <li style="margin-left:20px;margin-bottom:2px;">
+                                                            <p:commandLink rendered="#{!DatasetPage.hasValidTermsOfAccess}" disabled="#{!DatasetPage.hasValidTermsOfAccess}" >
+                                                                <h:outputText  value="#{bundle['dataset.editBtn.itemLabel.upload']}" />
+                                                            </p:commandLink>
+                                                        </li>                                                    
+                                                        <li style="margin-left:20px;">
+                                                            <p:commandLink id="editMetadataDisabled" onclick="editMetadata()" rendered="#{!DatasetPage.hasValidTermsOfAccess}" disabled="#{!DatasetPage.hasValidTermsOfAccess}" >
+                                                                <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+                                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.metadata']}"  />
+                                                            </p:commandLink>
+                                                        </li> 
                                                         <li>
-                                                            <h:link id="manageDatasetPermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
-                                                                <h:outputText value="#{bundle['dataset']}" />
-                                                                <f:param name="id" value="#{DatasetPage.dataset.id}" />
-                                                            </h:link>
+                                                            <p:commandLink id="editMetadata" onclick="editMetadata()" rendered="#{DatasetPage.hasValidTermsOfAccess}">
+                                                                <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+                                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.metadata']}"  />
+                                                            </p:commandLink>
                                                         </li>
                                                         <li>
-                                                            <h:link id="manageFilePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage-files">
-                                                                <h:outputText value="#{bundle['file']}" />
-                                                                <f:param name="id" value="#{DatasetPage.dataset.id}" />
-                                                            </h:link>
+                                                            <p:commandLink id="editTerms" actionListener="#{DatasetPage.edit('LICENSE')}" update="@form,:datasetForm,:messagePanel">
+                                                                <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+                                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.terms']}" />
+                                                            </p:commandLink>
                                                         </li>
+                                                        <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DatasetPage.dataset) || permissionsWrapper.canManageFilesOnDataset(DatasetPage.dataset)}">
+                                                            <li class="#{DatasetPage.hasPublicStore ? '' : 'dropdown-submenu pull-left'}">
+                                                                <ui:fragment rendered="#{!DatasetPage.hasPublicStore}">
+                                                                <a tabindex="0">#{bundle['dataset.editBtn.itemLabel.permissions']}</a>
+                                                                    <ul class="dropdown-menu">
+                                                                        <li jsf:rendered="#{permissionsWrapper.canManagePermissions(DatasetPage.dataset)}">
+                                                                            <h:link id="manageDatasetPermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
+                                                                                <h:outputText value="#{bundle['dataset']}" />
+                                                                                <f:param name="id" value="#{DatasetPage.dataset.id}" />
+                                                                            </h:link>
+                                                                        </li>
+                                                                        <li jsf:rendered="#{permissionsWrapper.canManageFilesOnDataset(DatasetPage.dataset)}">
+                                                                            <h:link id="manageFilePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage-files">
+                                                                                <h:outputText value="#{bundle['file']}" />
+                                                                                <f:param name="id" value="#{DatasetPage.dataset.id}" />
+                                                                            </h:link>
+                                                                        </li>
+                                                                    </ul>
+                                                                </ui:fragment>
+                                                                <h:link id="managePermissions" rendered="#{DatasetPage.hasPublicStore}"
+                                                                        styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
+                                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.permissions']}" />
+                                                                    <f:param name="id" value="#{DatasetPage.dataset.id}" />
+                                                                </h:link>
+                                                            </li>
+                                                            <li>
+                                                                <p:commandLink id="privateUrl" oncomplete="PF('privateUrlConfirmation').show()" action="#{DatasetPage.initPrivateUrlPopUp()}" update="privateUrlPanel">
+                                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.privateUrl']}" />
+                                                                </p:commandLink>
+                                                            </li>
+                                                        </ui:fragment>
+                                                        <li>
+                                                            <h:outputLink value="/dataset-widgets.xhtml?datasetId=#{DatasetPage.dataset.id}">
+                                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.thumbnailsAndWidgets']}"/>
+                                                            </h:outputLink>
+                                                        </li>
+                                                        <ui:fragment rendered="#{DatasetPage.datasetConfigureTools.size() >= 1}">
+                                                            <li class="dropdown-header">#{bundle['dataset.accessBtn.header.configure']} <span class="glyphicon glyphicon-cog"/></li>
+                                                            <!-- Configure tool links -->
+                                                            <ui:repeat var="tool" value="#{DatasetPage.datasetConfigureTools}">
+                                                                <li>
+                                                                    <p:commandLink styleClass="btn-explore" actionListener="#{DatasetPage.setDatasetConfigureTool(tool)}" process="@this" update="datasetForm:configureToolDialog" oncomplete="PF('configureToolDialog').show();">
+                                                                        <h:outputText value="#{tool.getDisplayNameLang()}"/>
+                                                                    </p:commandLink>
+                                                                </li>
+                                                            </ui:repeat>
+                                                        </ui:fragment>
+                                                        <ui:fragment rendered="#{!DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
+                                                            <li role="separator" class="divider"></li>
+                                                            <li>
+                                                                <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
+                                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDataset']}" />
+                                                                </p:commandLink>
+                                                            </li>
+                                                        </ui:fragment>
+                                                        <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
+                                                            <li role="separator" class="divider"></li>
+                                                            <li>
+                                                                <p:commandLink id="deleteVersion" onclick="PF('deleteVersionConfirmation').show()">
+                                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDraft']}" />
+                                                                </p:commandLink>
+                                                            </li>
+                                                        </ui:fragment>
+                                                        <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.existReleasedVersion and canIssuePublishDatasetCommand}">
+                                                            <li role="separator" class="divider"></li>
+                                                            <li>
+                                                                <p:commandLink id="deaccessionDatasetLink" 
+                                                                               action="#{DatasetPage.clickDeaccessionDataset}"
+                                                                               oncomplete="PF('deaccessionBlock').show();"
+                                                                               update="deaccessionBlock">
+                                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deaccession']}" />
+                                                                </p:commandLink>
+                                                            </li>
+                                                        </ui:fragment>
                                                     </ul>
-                                                </ui:fragment>                                            
-                                                <h:link id="managePermissions" rendered="#{settingsWrapper.publicInstall}"
-                                                        styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.permissions']}" />
-                                                    <f:param name="id" value="#{DatasetPage.dataset.id}" />
-                                                </h:link>
-                                            </li>
-                                            <li>
-                                                <p:commandLink id="privateUrl" oncomplete="PF('privateUrlConfirmation').show()" action="#{DatasetPage.initPrivateUrlPopUp()}" update="privateUrlPanel">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.privateUrl']}" />
+                                                </div>
+                                            </div>
+                                            <!-- END: Edit Dataset -->
+                                            <!-- Curation Status -->
+                                            <div class="btn-group btn-group-justified" jsf:rendered="#{canSeeCurationStatus and not empty DatasetPage.allowedCurationStatuses}">
+                                              <div class="btn-group">
+                                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                                    #{bundle['dataset.curationStatusMenu']} <span class="caret"></span>
+                                                </button>
+                                                <ul class="dropdown-menu multi-level pull-right text-left">
+                                                    <ui:fragment rendered="#{(not empty DatasetPage.allowedCurationStatuses) and DatasetPage.canPublishDataset()}">
+                                                    <li class="dropdown-submenu pull-left">
+                                                        <a tabindex="0">#{bundle['dataset.changestatus']}</a>
+                                                        <ul class="dropdown-menu">
+                                                            <ui:repeat value="#{DatasetPage.allowedCurationStatuses}" var="status">
+                                                                <li>
+                                                                    <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
+                                                                    <p:commandLink action="#{DatasetPage.setCurationStatus(status)}" update=":datasetForm:topDatasetBlockFragment,:messagePanel">
+                                                                        #{DatasetUtil:getLocaleCurationStatusLabelFromString(status)}
+                                                                    </p:commandLink>
+                                                                </li>
+                                                            </ui:repeat>
+                                                            <p:separator/>
+                                                            <li>
+                                                                <p:commandLink action="#{DatasetPage.setCurationStatus(null)}" update=":datasetForm:topDatasetBlockFragment,:messagePanel">
+                                                                    #{bundle['dataset.removestatus']}
+                                                                </p:commandLink>
+                                                            </li>
+                                                        </ul>
+                                                    </li>
+                                                    </ui:fragment>
+                                                    <li>
+                                                        <p:commandLink oncomplete="PF('curationStatusHistoryDialog').show()"
+                                                            update=":datasetForm:curationStatusHistoryDialog"
+                                                            rendered="#{canSeeCurationStatus}">
+                                                            #{bundle['dataset.viewCurationStatusHistory']}
+                                                        </p:commandLink>
+                                                     </li>
+                                                </ul>
+                                              </div>
+                                            </div>
+                                            <!-- END: Curation Status -->
+                                            <!-- LINK -->
+                                            <div class="btn-group btn-group-justified" jsf:rendered="#{dataverseSession.user.authenticated and !deaccessioned}">
+                                                <p:commandLink styleClass="btn btn-default btn-access btn-xs btn-block btn-link-dataset"
+                                                               action="#{DatasetPage.setShowLinkingPopup(true)}"
+                                                               oncomplete="PF('linkDatasetForm').show();"
+                                                               update="@form">
+                                                    #{bundle['dataset.linkBtn']}
                                                 </p:commandLink>
-                                            </li>
-                                        </ui:fragment>
-                                        <li>
-                                            <h:outputLink value="/dataset-widgets.xhtml?datasetId=#{DatasetPage.dataset.id}">
-                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.thumbnailsAndWidgets']}"/>
-                                            </h:outputLink>
-                                        </li>
-                                        <ui:fragment rendered="#{!DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
-                                            <li class="divider"></li>
-                                            <li>
-                                                <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDataset']}" />
+                                            </div>
+                                            <!-- END: LINK -->
+                                            <!-- UNLINK -->
+                                            <div class="btn-group btn-group-justified" jsf:rendered="#{dataverseSession.user.authenticated and !deaccessioned and !empty DatasetPage.dataset.datasetLinkingDataverses}">
+                                                <p:commandLink styleClass="btn btn-default btn-access btn-xs btn-block btn-link-dataset"
+                                                               action="#{DatasetPage.setShowUnLinkingPopup(true)}"
+                                                               oncomplete="PF('unlinkDatasetForm').show();"
+                                                               update="@form">
+                                                    #{bundle['dataset.unlinkBtn']}
                                                 </p:commandLink>
-                                            </li>
-                                        </ui:fragment>
-                                        <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
-                                            <li class="divider"></li>
-                                            <li>
-                                                <p:commandLink id="deleteVersion" onclick="PF('deleteVersionConfirmation').show()">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDraft']}" />
+                                            </div>
+                                            <!-- END: UNLINK -->
+
+                                            <!-- Contact/Share Button Group -->
+                                            <div class="btn-group btn-group-justified">
+                                                <p:commandLink styleClass="btn btn-default btn-xs btn-contact" title="#{bundle['dataset.email.datasetContactTitle']}"
+                                                               update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DatasetPage.dataset}"/>
+                                                    #{bundle['dataset.contactBtn']}
                                                 </p:commandLink>
-                                            </li>
-                                        </ui:fragment>
-                                        <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.existReleasedVersion and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                            <li class="divider"></li>
-                                            <li>
-                                                <p:commandLink id="deaccessionDatasetLink" 
-                                                               action="#{DatasetPage.clickDeaccessionDataset}"
-                                                               oncomplete="PF('deaccessionBlock').show();bind_bsui_components();"
-                                                               update="deaccessionBlock">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deaccession']}" />
+                                                <p:commandLink styleClass="btn btn-default btn-xs btn-share" rendered="#{!deaccessioned}"
+                                                               title="#{bundle['dataset.share.datasetShare']}"
+                                                               oncomplete="PF('shareDialog').show();sharrre();">
+                                                    #{bundle['dataset.shareBtn']}
                                                 </p:commandLink>
-                                            </li>
-                                        </ui:fragment>
-                                    </ul>
-                                </ui:fragment>
-                                <!-- END: Edit Button -->
-                                <!-- END: Edit/Link/Publish Button Group -->
-                            </div>
-                            <!-- Contact/Share Button Group -->
-                            <div class="btn-group pull-right" id="datasetButtonBar" role="group">
-                                <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
-                                               update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DatasetPage.dataset}"/>
-                                    <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                </p:commandLink>
-                                <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!DatasetPage.workingVersion.deaccessioned}"
-                                               title="#{bundle['dataset.share.datasetShare']}"
-                                               oncomplete="PF('shareDialog').show();sharrre();">
-                                    <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                </p:commandLink>
-                            </div>
-                            <!-- END: Contact/Share Button Group -->
-                        </div>
-                        <div id="datasetVersionBlock" class="col-sm-12">
-                            <div id="title-block" class="row margin-bottom-half" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
-                                <div class="col-xs-1 vcenter title-preview-icon-block">
-                                    <img src="#{DatasetPage.thumbnailString}" jsf:rendered="#{!empty DatasetPage.thumbnailString}" alt="#{DatasetPage.datasetVersionUI.title.value}"/>
-                                    <span class="icon-dataset" jsf:rendered="#{empty DatasetPage.thumbnailString}"/>
-                                </div>
-                                <div class="col-xs-11 vcenter">
-                                    <span id="title">#{DatasetPage.datasetVersionUI.title.value}</span>
-                                    <div id="title-label-block" class="margin-top-half">
-                                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{DatasetPage.workingVersion.draft}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{DatasetPage.workingVersion.inReview}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!DatasetPage.dataset.released}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{DatasetPage.workingVersion.deaccessioned}"/>
-                                        <!-- DATASET VERSION NUMBER -->
-                                        <h:outputText styleClass="label label-default" rendered="#{DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
-                                                      value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionNumber}.#{DatasetPage.workingVersion.minorVersionNumber}" /> 
-                                        <h:outputText styleClass="label label-default" rendered="#{!DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
-                                                      value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionState}"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <!-- CITATION BLOCK -->
-                                <ui:fragment rendered="#{!empty DatasetPage.displayCitation}">
-                                    <ui:include src="dataset-citation.xhtml">
-                                        <ui:param name="datasetPage" value="true"/>
-                                    </ui:include>
-                                </ui:fragment>
-                                <!-- END: CITATION BLOCK -->
-                                <div id="deaccession-reason-block" class="bg-danger" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}">
-                                    <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
-                                    <p>#{DatasetPage.workingVersion.versionNote}</p>
-                                    <ui:fragment rendered="#{!empty DatasetPage.workingVersion.archiveNote}">
-                                        <p>#{bundle['dataset.beAccessedAt']} <a href="#{DatasetPage.workingVersion.archiveNote}" target="_blank">#{DatasetPage.workingVersion.archiveNote}</a></p>
-                                    </ui:fragment>
-                                </div>
-                                <!-- Metrics -->
-                                <div id="metrics-block" class="col-sm-3" jsf:rendered="#{!(settingsWrapper.rsyncDownload or DatasetPage.workingVersion.deaccessioned)}">
-                                    <div id="metrics-heading">
-                                        #{bundle['metrics.dataset.title']}
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
-                                                data-original-title="#{settingsWrapper.makeDataCountDisplayEnabled ? bundle['metrics.dataset.tip.makedatacount'] : bundle['metrics.dataset.tip.default']}"></span>
-                                    </div>
-                                    <div id="metrics-body">
-                                        <!-- Classic downloads -->
-                                        <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
-                                            <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
-                                                <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDatasetId(DatasetPage.dataset.id)}"/>
-                                            </h:outputFormat>
-                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                    data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.default.tip']}"></span>
+                                            </div>
+                                            <!-- END: Contact/Share Button Group -->
                                         </div>
-                                        <!-- Make Data Count views -->
-                                        <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
-                                            <h:outputFormat value="{0} #{bundle['metrics.views']}">
-                                                <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getViewsTotal()}"/>
-                                            </h:outputFormat>
-                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                    data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.views.tip']}"></span>
-                                        </div>
-                                        <!-- Make Data Count downloads -->
-                                        <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
-                                            <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
-                                                <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getDownloadsTotal()}"/>
-                                            </h:outputFormat>
-                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                    data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.makedatacount.tip']}"></span>
+                                        <!-- END: ActionButtonBlock -->
+                                    </div>
+
+                                    <div style="clear:right;" class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom" 
+                                         jsf:rendered="#{!(settingsWrapper.rsyncDownload or deaccessioned)}">
+                                        <!-- Metrics -->
+                                        <div id="metrics-block">
+                                            <div id="metrics-heading">
+                                                #{settingsWrapper.makeDataCountDisplayEnabled ? bundle['metrics.dataset.makedatacount.title'] : bundle['metrics.dataset.title']}
+                                                <ui:fragment rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
+                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
+                                                          data-trigger="hover" data-original-title="#{bundle['metrics.dataset.tip.default']}"></span>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                    <a tabindex="0" role="button" class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="popover" data-placement="auto top" 
+                                                       data-trigger="focus" data-html="true" data-content="#{bundle['metrics.dataset.tip.makedatacount']}"></a>
+                                                        <div id="metrics-heading-subtitle">#{bundle['metrics.dataset.makedatacount.since']} #{settingsWrapper.getMDCStartDate().toString()}</div>
+                                                </ui:fragment>
+                                                
+                                            </div>
+                                            <div id="metrics-body">
+                                                <!-- Classic downloads -->
+                                                <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
+                                                    <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
+                                                        <f:param value="#{guestbookResponseServiceBean.getDownloadCountByDatasetId(DatasetPage.dataset.id)}"/>
+                                                    </h:outputFormat>
+                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                          data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.default.tip']}"></span>
+                                                </div>
+                                                <!-- Make Data Count views -->
+                                                <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                    <h:outputFormat value="{0} #{bundle['metrics.views']}">
+                                                        <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getViewsTotal()}"/>
+                                                    </h:outputFormat>
+                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                          data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.views.tip']}"></span>
+                                                </div>
+                                                <!-- Make Data Count downloads -->
+                                                <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                    <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
+                                                        <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getDownloadsTotal()}"/>
+                                                    </h:outputFormat>
+                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                          data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.makedatacount.tip']}"></span>
+                                                    <span jsf:rendered="#{settingsWrapper.getMDCStartDate()!=null and guestbookResponseServiceBean.getDownloadCountByDatasetId(DatasetPage.dataset.id, settingsWrapper.getMDCStartDate()) > 0 }">        
+                                                        <h:outputFormat value="#{bundle['metrics.downloads.nonMDC']}">
+                                                            <f:param value="#{guestbookResponseServiceBean.getDownloadCountByDatasetId(DatasetPage.dataset.id, settingsWrapper.getMDCStartDate())}"/>
+                                                        </h:outputFormat>
+                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                            data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.premakedatacount.tip']}"></span>)
+                                                    </span>
+                                                </div>
+                                                <!-- Make Data Count citations (DOIs only, not Handles) -->
+                                                <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled and DatasetPage.DOI}">
+                                                    <p:commandLink oncomplete="PF('citationsDialog').show();">
+                                                        <h:outputFormat value="{0} #{bundle['metrics.citations']}">
+                                                            <f:param value="#{fn:length(datasetExternalCitationsServiceBean.getDatasetExternalCitationsByDataset(DatasetPage.dataset))}"/>
+                                                        </h:outputFormat>
+                                                    </p:commandLink>
+                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                          data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.citations.tip']}"></span>
+                                                </div>
+                                            </div>
                                         </div>
-                                        <!-- Make Data Count citations (DOIs only, not Handles) -->
-                                        <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled and settingsWrapper.doiInstallation}">
-                                            <p:commandLink oncomplete="PF('citationsDialog').show();">
-                                                <h:outputFormat value="{0} #{bundle['metrics.citations']}">
-                                                    <f:param value="#{fn:length(datasetExternalCitationsServiceBean.getDatasetExternalCitationsByDataset(DatasetPage.dataset))}"/>
-                                                </h:outputFormat>
-                                            </p:commandLink>
-                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                    data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.citations.tip']}"></span>
+                                        <!-- END: Metrics -->
+                                    </div>
+
+                                    <!-- RESPONSIVE ORDER HACK BOOTSTRAP 3 https://stackoverflow.com/a/24834574 -->
+                                    <div id="dataset-colorder-block" class="visible-md-block visible-lg-block col-md-8 col-lg-9"><!--Hack--></div>
+                                    <!-- END: RESPONSIVE ORDER HACK BOOTSTRAP 3 -->
+
+                                    <!-- DEACCESSION REASON -->
+                                   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9 margin-bottom" jsf:rendered="#{deaccessioned}">
+                                        <div id="deaccession-reason-block" class="col-xs-12 bg-danger">
+                                            <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
+                                            <p>#{version.deaccessionNote}</p>
+                                            <ui:fragment rendered="#{!empty version.deaccessionLink}">
+                                                <p>#{bundle['dataset.beAccessedAt']}
+                                                    <h:outputLink rendered="#{version.deaccessionLinkAsURLString ne null}" value="#{version.deaccessionLinkAsURLString}" target="_blank">#{version.deaccessionLink}</h:outputLink>
+                                                    <h:outputText rendered="#{version.deaccessionLinkAsURLString eq null}" value="#{version.deaccessionLink}"/>
+                                                </p>
+                                            </ui:fragment>
                                         </div>
                                     </div>
-                                </div>
-                                <!-- END: Metrics -->
-                            </div>
-                            <!-- BEGIN: DATASET SUMMARY -->
-                            <div id="dataset-summary-metadata" class="row"
-                                 jsf:rendered="#{!widgetWrapper.widgetView and !DatasetPage.workingVersion.deaccessioned and 
-                                                 (!empty DatasetPage.datasetVersionUI.descriptionDisplay
-                                                 or !empty DatasetPage.datasetVersionUI.keywordDisplay
-                                                 or !empty DatasetPage.datasetVersionUI.subject.value
-                                                 or !empty DatasetPage.datasetVersionUI.relPublicationCitation
-                                                 or !empty DatasetPage.datasetVersionUI.notes.value) and !empty DatasetPage.datasetSummaryFields}">
-                                <div class="col-sm-12 metadata-container">
-                                    <table class="metadata">
-                                        <tbody>
-                                            <ui:repeat value="#{DatasetPage.datasetSummaryFields}" var="dsf">
-                                                <tr id="keywords" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.keywordDisplay and dsf.datasetFieldType.id==DatasetPage.datasetVersionUI.keyword.datasetFieldType.id}">
-                                                    <th scope="row">
-                                                        #{bundle['dataset.keywordDisplay.title']}
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.keyword.datasetFieldType.localeDescription}"></span>
-                                                    </th>
-                                                    <td>#{DatasetPage.datasetVersionUI.keywordDisplay}</td>
-                                                </tr>
-                                                <tr id="publication" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.relPublicationCitation and dsf.datasetFieldType.name=='publication'}">
-                                                    <th scope="row">
-                                                        #{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).title}
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}"></span>
-                                                    </th>
-                                                    <td>
-                                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetVersionUI.relPublicationCitation)}" escape="false"/>
-                                                        <a href="#{DatasetPage.datasetVersionUI.relPublicationUrl}" title="#{DatasetPage.datasetVersionUI.relPublicationUrl}" target="_blank" rel="noopener">#{DatasetPage.datasetVersionUI.relPublicationId}</a>
-                                                    </td>
-                                                </tr>
-                                                <tr id="#{dsf.datasetFieldType.name}" jsf:rendered="#{dsf.datasetFieldType.name!='publication' and dsf.datasetFieldType.name!='keyword'}">
+                                    <!-- END: DEACCESSION REASON -->
+
+                                    <!-- BEGIN: DATASET SUMMARY -->
+                                    <div id="dataset-summary-metadata" class="col-xs-12 col-sm-12 col-md-8 col-lg-9 metadata-container padding-none margin-bottom">
+                                        <table class="metadata">
+                                            <tbody>
+                                                <ui:repeat value="#{DatasetPage.datasetSummaryFields}" var="dsf">
+                                                    <tr id="keywords" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.keywordDisplay and dsf.datasetFieldType.id==DatasetPage.datasetVersionUI.keyword.datasetFieldType.id}">
+                                                        <th scope="row">
+                                                            #{bundle['dataset.keywordDisplay.title']}
+                                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.keyword.datasetFieldType.localeDescription}"></span>
+                                                        </th>
+                                                        <td>#{DatasetPage.datasetVersionUI.keywordDisplay}</td>
+                                                    </tr>
+                                                    <tr id="publication" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.relPublicationCitation and dsf.datasetFieldType.name=='publication'}">
+                                                        <th scope="row">
+                                                            #{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).title}
+                                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}"></span>
+                                                        </th>
+                                                        <td jsf:rendered="#{!anonymizedAccess or !settingsWrapper.shouldBeAnonymized(dsf)}">
+                                                          <h:outputText value="#{DatasetPage.datasetVersionUI.relPublicationRelationType}#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetVersionUI.relPublicationCitation)}" escape="false"/>
+                                                        
+                                                          <span jsf:rendered="#{!empty DatasetPage.datasetVersionUI.relPublicationUrl}"><a href="#{DatasetPage.datasetVersionUI.relPublicationUrl}" title="#{DatasetPage.datasetVersionUI.relPublicationUrl}" target="_blank" rel="noopener">#{empty DatasetPage.datasetVersionUI.relPublicationId ?  DatasetPage.datasetVersionUI.relPublicationUrl:DatasetPage.datasetVersionUI.relPublicationId}</a></span>
+                                                          <h:outputText rendered="#{empty DatasetPage.datasetVersionUI.relPublicationUrl}" value="#{DatasetPage.datasetVersionUI.relPublicationId}"/>
+                                                        </td>
+                                                        <td jsf:rendered="#{anonymizedAccess and settingsWrapper.shouldBeAnonymized(dsf)}">
+                                                            <h:outputText value="#{bundle['dataset.anonymized.withheld']}"/>
+                                                        </td>
+                                                    </tr>
+                                                    <tr id="#{dsf.datasetFieldType.name}" jsf:rendered="#{dsf.datasetFieldType.name!='publication' and dsf.datasetFieldType.name!='keyword'}">
+                                                        <th scope="row">
+                                                            #{dsf.datasetFieldType.localeTitle}
+                                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
+                                                        </th>
+                                                        <td jsf:rendered="#{!anonymizedAccess or !settingsWrapper.shouldBeAnonymized(dsf)}">
+                                                            <!-- Primitive datasetFields -->
+                                                            <ui:fragment rendered="#{dsf.datasetFieldType.primitive}">
+                                                                <h:outputText value="#{dsf.displayValue}" rendered="#{!dsf.datasetFieldType.allowMultiples}"
+                                                                              escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
+                                                                <ui:repeat value="#{dsf.values}" var="value" varStatus="loop" rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                                    <h:outputText value="#{loop.first?'':'; '}#{ value }"
+                                                                                  escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
+                                                                </ui:repeat>
+                                                            </ui:fragment>
+                                                            <!-- Compound datasetFields -->
+                                                            <ui:fragment rendered="#{dsf.datasetFieldType.compound}">
+                                                                <ui:fragment rendered="#{dsf.datasetFieldType.name == 'datasetContact'}">
+                                                                    <p class="help-block">
+                                                                        <h:outputText value="#{bundle['dataset.contact.tip']}"/>
+                                                                    </p>
+                                                                </ui:fragment>
+                                                                <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue">
+                                                                    <div>
+                                                                        <ui:repeat value="#{compoundValue.displayValueMap.entrySet().toArray()}" var="cvPart" varStatus="partStatus">
+                                                                            <h:outputText value="#{dsf.datasetFieldType.displayFormat} " rendered="${!partStatus.first}"/>
+                                                                            <h:outputText value="#{cvPart.value}"
+                                                                                          escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}"/>
+                                                                        </ui:repeat>
+                                                                    </div>
+                                                                </ui:repeat>
+                                                            </ui:fragment>
+                                                        </td>
+                                                        <td jsf:rendered="#{anonymizedAccess and settingsWrapper.shouldBeAnonymized(dsf)}">
+                                                            <h:outputText value="#{bundle['dataset.anonymized.withheld']}"/>
+                                                        </td>
+                                                    </tr>
+                                                </ui:repeat>
+                                                <tr>
                                                     <th scope="row">
-                                                        #{dsf.datasetFieldType.localeTitle}
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
+                                                        #{bundle['file.dataFilesTab.terms.list.license']}
                                                     </th>
                                                     <td>
-                                                        <!-- Primitive datasetFields -->
-                                                        <ui:fragment rendered="#{dsf.datasetFieldType.primitive}">
-                                                            <h:outputText value="#{dsf.displayValue}" rendered="#{!dsf.datasetFieldType.allowMultiples}"
-                                                                          escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
-                                                            <ui:repeat value="#{dsf.values}" var="value" varStatus="loop" rendered="#{dsf.datasetFieldType.allowMultiples}">
-                                                                <h:outputText value="#{loop.first?'':'; '}#{ value }"
-                                                                              escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
-                                                            </ui:repeat>
-                                                        </ui:fragment>
-                                                        <!-- Compound datasetFields -->
-                                                        <ui:fragment rendered="#{dsf.datasetFieldType.compound}">
-                                                            <ui:fragment rendered="#{dsf.datasetFieldType.name == 'datasetContact'}">
-                                                                <p class="help-block">
-                                                                    <h:outputText value="#{bundle['dataset.contact.tip']}"/>
-                                                                </p>
-                                                            </ui:fragment>
-                                                            <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue">
-                                                                <div>
-                                                                    <ui:repeat value="#{compoundValue.displayValueMap.entrySet().toArray()}" var="cvPart" varStatus="partStatus">
-                                                                        <h:outputText value="#{dsf.datasetFieldType.displayFormat} " rendered="${!partStatus.first}"/>
-                                                                        <h:outputText value="#{cvPart.value}"
-                                                                                      escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}"/>
-                                                                    </ui:repeat>
-                                                                </div>
-                                                            </ui:repeat>
-                                                        </ui:fragment>
+                                                        <p>
+                                                            <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
+                                                            <img src="#{DatasetUtil:getLicenseIcon(version)}" title="#{DatasetUtil:getLicenseDescription(version)}" style="display:none"  onload="this.style.display='inline'" />
+                                                            <a href="#{DatasetUtil:getLicenseURI(version)}" title="#{DatasetUtil:getLicenseDescription(version)}" target="_blank">#{DatasetUtil:getLicenseName(version)}</a>
+                                                        </p>
                                                     </td>
                                                 </tr>
-                                            </ui:repeat>
-                                        </tbody>
-                                    </table>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <!-- END: DATASET SUMMARY -->
                                 </div>
+                                <!-- END: NEW RESPONSIVE ABOVE FOLD BLOCK -->
                             </div>
-                            <!-- END: DATASET SUMMARY -->
                         </div>
-                    </div>
                     </p:fragment>
-                    <!-- END View editMode -->
+                    <!-- END Top Button/Citation Blocks -->
+                    <!-- END View infoMode -->
+
                     <!-- Create/Edit editMode -->
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
                         <p:focus context="datasetForm"/>
                         <div class="form-group">
-                            <label for="select_HostDataverse" class="col-sm-2 control-label">
+                            <label jsf:for="#{DatasetPage.editMode == 'CREATE' ? 'selectHostDataverse_input' : 'select_HostDataverse_Static'}" class="col-md-3 control-label">
                                 #{bundle.hostDataverse}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
                             </label>
-                            <div class="col-sm-10">
-                                <h:outputText styleClass="highlightBold" value="#{DatasetPage.dataset.owner.name}"/>
-                                <h:inputHidden value="#{DatasetPage.ownerId}" id="select_HostDataverse" />
-                                <ui:remove><!-- removed for beta -->
-                                    <p:selectOneMenu id="select_HostDataverse" value="#{DatasetPage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                        <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"/>
-                                    </p:selectOneMenu>
-                                </ui:remove>
+                            <div class="col-md-7">
+                                <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA'}">
+                                    <p jsf:id="select_HostDataverse_Static" class="form-control-static">#{DatasetPage.dataset.owner.name}</p>
+                                    <h:inputHidden value="#{DatasetPage.ownerId}" id="select_HostDataverseStatic"/>
+                                </ui:fragment>
+                                <ui:fragment rendered="#{DatasetPage.editMode == 'CREATE'}">
+                                    <p class="help-block">
+                                        #{bundle['dataset.host.tip']}
+                                    </p>
+                                    <div class="form-group">
+                                        <p:fragment id="hostDataverseContent">
+                                            <p:autoComplete id="selectHostDataverse"
+                                                            placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
+                                                            emptyMessage="#{bundle['dataverse.host.autocomplete.nomatches']}"
+                                                            scrollHeight="180" forceSelection="true" 
+                                                            minQueryLength="1" queryDelay="1000"
+                                                            value="#{DatasetPage.selectedHostDataverse}" 
+                                                            multiple="false"
+                                                            completeMethod="#{DatasetPage.completeHostDataverseMenuList}"
+                                                            required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
+                                                            styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                            var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter">
+                                                <p:column>
+                                                    <h:outputText value="#{hostDataverse.displayName}"/>
+                                                </p:column>
+                                                <p:column>
+                                                    <h:outputText value="#{hostDataverse.alias}"/>
+                                                </p:column>
+                                                <p:ajax process="@this" event="itemSelect" oncomplete="updateOwnerDataverse()"/>
+                                                <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()"/>
+                                            </p:autoComplete>
+                                            <p:message for="selectHostDataverse"/>
+                                            <p:commandButton id="updateOwnerDataverse"
+                                                             style="display:none"
+                                                             process="@this :datasetForm:hostDataverseContent"
+                                                             update="@form,:breadCrumbPanel"
+                                                             action="#{DatasetPage.updateOwnerDataverse()}">
+                                            </p:commandButton>
+                                        </p:fragment>
+                                    </div>
+                                </ui:fragment>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">
-                            <label for="select_DatasetTemplate" class="col-sm-2 control-label">
+                            <label jsf:for="select_DatasetTemplate" class="col-md-3 control-label">
                                 #{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate.title']}"></span>
                             </label>
-                            <div class="col-sm-6">
+                            <div class="col-md-7">
                                 <p class="help-block">
                                     #{bundle['dataset.template.tip']}
                                 </p>
@@ -539,49 +847,62 @@
                                 <p:commandButton value="#{bundle['file.dataFilesTab.button.direct']}" id="updateTemplate"
                                                  style="display:none"
                                                  update=":datasetForm,accessPopup"
-                                                 action="#{DatasetPage.handleChangeButton}" oncomplete="javascript:bind_bsui_components();">
+                                                 action="#{DatasetPage.handleChangeButton}">
                                 </p:commandButton>
                             </div>
                         </div>
-                        <div class="form-group">
-                            <div class="col-sm-12">
-                                <span class="glyphicon glyphicon-asterisk text-danger"/> <h:outputText value="#{bundle['dataset.asterisk.tip']}"/>
-                            </div>
-                        </div>
+
                     </ui:fragment>
                     <ui:fragment rendered="#{DatasetPage.editMode == 'CREATE'}">
                         <ui:include src="metadataFragment.xhtml">
                             <ui:param name="datasetPage" value="true"/>
+                            <ui:param name="template" value="#{DatasetPage.dataset.template}"/>
                             <ui:param name="editMode" value="#{!empty DatasetPage.editMode ? DatasetPage.editMode : ''}"/>
                             <ui:param name="metadataBlocks" value="#{!empty DatasetPage.editMode ? DatasetPage.datasetVersionUI.metadataBlocksForEdit.entrySet().toArray(): DatasetPage.datasetVersionUI.metadataBlocksForView.entrySet().toArray()}"/>
-                            <ui:param name="publicationDate" value="#{DatasetPage.dataset.publicationDateFormattedYYYYMMDD}"/>
-                            <ui:param name="globalId" value="#{DatasetPage.dataset.globalIdString}"/>
+                            <!-- ui:param name="publicationDate" value="#{DatasetPage.dataset.publicationDateFormattedYYYYMMDD}"/-->
+                            <ui:param name="globalId" value="#{DatasetPage.dataset.globalId.asString()}"/>
+                            <ui:param name="mdLang" value="#{DatasetPage.getLocaleDisplayName(DatasetPage.getEffectiveMetadataLanguage(true))}"/>
+                            <ui:param name="mdLangCode" value="#{DatasetPage.getEffectiveMetadataLanguage(true)}"/>
                         </ui:include>
                     </ui:fragment>
-                    <!-- END Create/Edit editMode -->
-                    <!-- Edit editMode -->
+                    <!-- Create/Save Dataset Button Panel TOP editMode -->
                     <div class="button-block form-top" jsf:rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'LICENSE'}">
-                        <p:commandButton id="saveTop" styleClass="btn btn-default" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();"/>
-                        <p:commandButton id="cancelTop" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();">
+                        <p:commandButton id="saveTop" styleClass="btn btn-default" value="#{bundle.saveChanges}" rendered="#{DatasetPage.editMode == 'METADATA'}"
+                                         onclick="PF('blockDatasetForm').show();"
+                                         update=":datasetForm,:messagePanel"
+                                         oncomplete="$(document).scrollTop(0);"
+                                         action="#{DatasetPage.save}"
+                                         />
+                        <p:commandButton id="saveTopTOA" styleClass="btn btn-default" value="#{bundle.saveChanges}" rendered="#{DatasetPage.editMode == 'LICENSE'}"
+                                         onclick="testTOADatasetPage();"
+                                         oncomplete="$(document).scrollTop(0);"
+                        />
+                        <p:commandButton id="cancelTop" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form">
                             <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="#{DatasetPage.editMode == 'METADATA' ? 1 : DatasetPage.selectedTabIndex}"/>
                         </p:commandButton>
                     </div>
-                    <!-- END Header / Button Panel -->
+                    <!-- END Create/Save Dataset Button Panel TOP editMode -->
+                    <!-- END Create/Edit editMode -->
                     <!-- View/Tabs infoMode -->
-                    <!-- Tabs -->
                     <div id="contentTabs" jsf:rendered="#{DatasetPage.editMode != 'INFO'}">
                         <p:fragment id="pageRefreshFragment"> <!-- rendered="_{empty DatasetPage.editMode}" -->
                             <h:inputHidden value="#{DatasetPage.lockedForAnyReason}" id="datasetLockedForAnyReasonVariable" />
                             <h:inputHidden value="#{DatasetPage.stateChanged}" id="datasetStateChangedVariable" />
-                            <p:remoteCommand name="refreshAllLocksCommand" process="@this" update=":#{p:resolveClientId('datasetForm:pageRefreshFragment', view)}" actionListener="#{DatasetPage.refreshAllLocks()}"/>
+                            <p:remoteCommand name="refreshAllLocksCommand" process="@this" update=":#{p:resolveClientId('datasetForm:pageRefreshFragment', view)},:messagePanel" actionListener="#{DatasetPage.refreshAllLocks()}"/>
                             <p:remoteCommand name="refreshAllCommand" process="@this" update=":datasetForm:topDatasetBlockFragment,:datasetForm:tabView:filesTable,:messagePanel" action="#{DatasetPage.refresh()}"/>
                             <!-- see the comment in the javascript below that explains what this button is for -->
                             <p:commandButton id="refreshButton" process="@this" widgetVar="refreshButton" update=":datasetForm:topDatasetBlockFragment,:datasetForm:tabView:filesTable" style="display:none"/>
                             <script>
                                 //<![CDATA[
+                                // javascript for refreshing page when locks
                                 $(this).ready(function () {
                                     refreshIfStillLocked();
                                 });
+                            
+                                var initialInterval = 5000; // 5 seconds
+                                var maxInterval = 300000; // 5 minutes
+                                var currentInterval = initialInterval;
+                                var backoffFactor = 1.2; // Exponential factor
                                 function refreshIfStillLocked() {
                                     if ($('input[id$="datasetLockedForAnyReasonVariable"]').val() === 'true') {
                                         // if dataset is locked, instruct the page to
@@ -606,89 +927,111 @@
                                                 $('button[id$="refreshButton"]').trigger('click');
                                                 //refreshAllCommand();
                                             }, 1500);
+                                        } else {
+                                          // Reset the interval if the dataset is unlocked
+                                          currentInterval = initialInterval;
                                         }
                                     }
                                 }
+                            
                                 function waitAndCheckLockAgain() {
                                     setTimeout(function () {
                                         // refresh the lock in the
                                         // backing bean; i.e., check, if the ingest has
                                         // already completed in the background:
-                                        //$('button[id$="refreshButton"]').trigger('click');
-                                        //refreshLockCommand();
                                         refreshAllLocksCommand();
-                                    }, 10000);
+                                        // Increase the interval exponentially for the next check
+                                        currentInterval = Math.min((currentInterval * backoffFactor) + 2, maxInterval);
+                                    }, currentInterval);
                                 }
                                 //]]>
                             </script>
                         </p:fragment>
-                        <ui:fragment id="uploadFilesOnCreateTab" rendered="#{!DatasetPage.workingVersion.deaccessioned and (DatasetPage.editMode == 'CREATE')}">
+                        <ui:fragment id="uploadFilesOnCreateTab" rendered="#{!deaccessioned and (DatasetPage.editMode == 'CREATE')}">
                             <ui:include src="editFilesFragment.xhtml">
                                 <ui:param name="datasetPage" value="true"/>
-                                <ui:param name="editDatafilesPage" value="false"/>                                   
+                                <ui:param name="editDatafilesPage" value="false"/>
+                                <ui:param name="rsyncSupported" value="#{DatasetPage.rsyncUploadSupported()}"/>
+                                <ui:param name="globusUploadSupported" value="#{DatasetPage.globusUploadSupported()}"/>
+                                <ui:param name="webloaderUploadSupported" value="#{DatasetPage.webloaderUploadSupported()}"/>
                                 <ui:param name="dataverse" value="#{DatasetPage.dataset.owner}"/>
                                 <ui:param name="dataset" value="#{DatasetPage.dataset}"/>
-                                <ui:param name="version" value="#{DatasetPage.workingVersion}"/>
+                                <ui:param name="version" value="#{version}"/>
                                 <ui:param name="createDataset" value="true"/>
                             </ui:include>
                         </ui:fragment>
                         <p:tabView id="tabView" widgetVar="content" activeIndex="#{DatasetPage.selectedTabIndex}"
                                    rendered="#{empty DatasetPage.editMode or (DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'LICENSE')}">
-                            <p:ajax event="tabChange" listener="#{DatasetPage.tabChanged}" oncomplete="bind_bsui_components();" update="@this" />
-                            <p:tab id="dataFilesTab" title="#{bundle.files}" rendered="#{(!DatasetPage.workingVersion.deaccessioned or 
-                                                              (DatasetPage.workingVersion.deaccessioned and DatasetPage.canUpdateDataset()))  and
-                                                              (empty DatasetPage.editMode)}">
-                                <ui:include src="filesFragment.xhtml">
-                                    <ui:param name="fileDownloadHelper" value="#{DatasetPage.fileDownloadHelper}"/>
-                                </ui:include>
+                            <p:ajax event="tabChange" listener="#{DatasetPage.tabChanged}" update="@this" />
+                            <p:tab id="dataFilesTab" title="#{bundle.files}" 
+                                   rendered="#{(!deaccessioned 
+                                                or (deaccessioned and canUpdateDataset)) 
+                                               and (empty DatasetPage.editMode)}">
+                                <ui:include src="filesFragment.xhtml"/>
                             </p:tab>
                             <!-- 4.2.1: the 3 tabs below - metadata, terms and versions: these account for ~100 queries total -->
                             <!-- a lot of these however, are repeated queries on AuthenticatedUser and RoleAssignment; once these are optimized, the tabs will become very cheap. -->
                             <p:tab id="metadataMapTab" title="#{bundle['file.dataFilesTab.metadata.header']}"
-                                        rendered="#{(!DatasetPage.workingVersion.deaccessioned or (DatasetPage.workingVersion.deaccessioned and DatasetPage.canUpdateDataset())) 
-                                             and (empty DatasetPage.editMode or DatasetPage.editMode == 'METADATA')}">
+                                   rendered="#{(!deaccessioned or (deaccessioned and canUpdateDataset)) 
+                                               and (empty DatasetPage.editMode or DatasetPage.editMode == 'METADATA')}">
                                 <div class="button-block tab-header margin-bottom text-right" jsf:rendered="#{empty DatasetPage.editMode}">
-                                    <p:commandLink styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:messagePanel" oncomplete="javascript:bind_bsui_components();" 
-                                                   disabled="#{DatasetPage.locked}" rendered="#{!widgetWrapper.widgetView and (DatasetPage.sessionUserAuthenticated and empty DatasetPage.editMode and !widgetWrapper.widgetView
-                                                               and DatasetPage.canUpdateDataset() and !DatasetPage.dataset.deaccessioned)}">
+                                    <p:commandLink styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:messagePanel" 
+                                                   disabled="#{DatasetPage.lockedFromEdits or !DatasetPage.hasValidTermsOfAccess}" 
+                                                   rendered="#{!widgetWrapper.widgetView 
+                                                               and (sessionUserAuthenticated 
+                                                               and empty DatasetPage.editMode and !widgetWrapper.widgetView
+                                                               and canUpdateDataset)}"><!-- and !DatasetPage.dataset.deaccessioned -->
                                         <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0"/>
                                         <span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
                                     </p:commandLink>
-                                    <div class="btn-group" jsf:rendered="#{DatasetPage.dataset.released and !DatasetPage.dataset.deaccessioned}">
+                                    <div class="btn-group" jsf:rendered="#{DatasetPage.dataset.released 
+                                                                           and (!DatasetPage.dataset.deaccessioned
+                                                                           or (deaccessioned and canUpdateDataset))
+                                                                           and !anonymizedAccess}">
                                         <button class="btn btn-default btn-export dropdown-toggle" type="button" data-toggle="dropdown">
-                                            <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"/></button>
-                                        <ul class="dropdown-menu" role="menu">
+                                            <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu pull-right text-left">
                                             <ui:repeat var="exporter" value="#{DatasetPage.exporters}">
                                                 <li>
                                                     <h:outputLink value="#{exporter[1]}" target="_blank">
                                                         <h:outputText value="#{exporter[0]}"/>
                                                     </h:outputLink>
-                                                </li>  
+                                                </li>
                                             </ui:repeat>
                                         </ul>
                                     </div>
                                 </div>
                                 <ui:include src="metadataFragment.xhtml">
                                     <ui:param name="datasetPage" value="true"/>
+                                    <ui:param name="template" value="#{DatasetPage.dataset.template}"/>
                                     <ui:param name="editMode" value="#{!empty DatasetPage.editMode ? DatasetPage.editMode : ''}"/>
                                     <ui:param name="metadataBlocks" value="#{!empty DatasetPage.editMode ? DatasetPage.datasetVersionUI.metadataBlocksForEdit.entrySet().toArray(): DatasetPage.datasetVersionUI.metadataBlocksForView.entrySet().toArray()}"/>
                                     <ui:param name="publicationDate" value="#{DatasetPage.dataset.publicationDate != null ? DatasetPage.dataset.publicationDateFormattedYYYYMMDD : ''}"/>
-                                    <ui:param name="globalId" value="#{DatasetPage.dataset.globalIdString}"/>
+                                    <ui:param name="citationDate" value="#{DatasetPage.dataset.citationDate != null ? DatasetPage.dataset.citationDateFormattedYYYYMMDD : ''}"/>
+                                    <ui:param name="globalId" value="#{DatasetPage.dataset.globalId.asString()}"/>
                                     <ui:param name="altPID" value="#{DatasetPage.dataset.alternativePersistentIdentifier}"/>
+                                    <ui:param name="mdLang" value="#{DatasetPage.getLocaleDisplayName(DatasetPage.effectiveMetadataLanguage)}"/>
+                                    <ui:param name="mdLangCode" value="#{DatasetPage.effectiveMetadataLanguage}"/>
+                                    <ui:param name="anonymized" value="#{anonymizedAccess}"/>
                                 </ui:include>
                             </p:tab>
                             <!-- 4.2.1: see comment above -->
                             <p:tab id="termsTab" title="#{bundle['file.dataFilesTab.terms.header']}"
-                                   rendered="#{!DatasetPage.workingVersion.deaccessioned and (empty DatasetPage.editMode or DatasetPage.editMode == 'LICENSE')}">
+                                   rendered="#{!deaccessioned and (empty DatasetPage.editMode or DatasetPage.editMode == 'LICENSE')}">
                                 <ui:include src="dataset-license-terms.xhtml">
                                     <ui:param name="editMode" value="#{!empty DatasetPage.editMode ? 'LICENSE': ''}"/>
-                                    <ui:param name="termsOfUseAndAccess" value="#{DatasetPage.workingVersion.termsOfUseAndAccess}"/>
+                                    <ui:param name="termsOfUseAndAccess" value="#{version.termsOfUseAndAccess}"/>
                                     <ui:param name="datasetPage" value="true"/>
+                                    <ui:param name="publicStore" value="DatasetPage.hasPublicStore"/>
                                 </ui:include>
                             </p:tab>
                             <!-- 4.2.1: see above -->
                             <p:tab id="versionsTab" title="#{bundle['file.dataFilesTab.versions']}" rendered="#{empty DatasetPage.editMode}">
-                                <ui:include src="dataset-versions.xhtml"></ui:include>
+                                <ui:include src="dataset-versions.xhtml">
+                                    <ui:param name="anonymized" value="#{anonymizedAccess}"/>
+                                    <ui:param name="workingVersion" value="#{version}"/>
+                                </ui:include>
                             </p:tab>
                         </p:tabView>
                     </div>
@@ -697,31 +1040,60 @@
                     <div class="alert alert-info margin-top" jsf:rendered="#{DatasetPage.editMode == 'CREATE'}">
                         #{bundle['file.metadataTip']}
                     </div>
-                    <!-- Create/Save Dataset Button Panel -->
+                    <!-- Create/Save Dataset Button Panel BTM editMode -->
                     <div class="button-block" jsf:rendered="#{!empty DatasetPage.editMode}">
-                        <p:commandButton id="save" styleClass="btn btn-default" value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();"/>
-                        <p:commandButton id="cancel" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" rendered="#{DatasetPage.editMode != 'CREATE'}" oncomplete="javascript:bind_bsui_components();">
+                        <p:commandButton id="saveBottomTerms" styleClass="btn btn-default" rendered="#{DatasetPage.editMode == 'LICENSE'}"
+                                         value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" 
+                                         onclick="testTOADatasetPage();" 
+                                         oncomplete="$(document).scrollTop(0);"/>
+                        <p:commandButton id="saveBottom" styleClass="btn btn-default" value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" rendered="#{DatasetPage.editMode == 'CREATE' or DatasetPage.editMode == 'METADATA'}"
+                                         onclick="PF('blockDatasetForm').show();"
+                                         update=":datasetForm,:messagePanel"
+                                         oncomplete="$(document).scrollTop(0);"
+                                         action="#{DatasetPage.save}"
+                                         />
+                        <p:commandButton id="cancel" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" rendered="#{DatasetPage.editMode != 'CREATE'}">
                             <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="#{DatasetPage.editMode == 'METADATA' ? 1 : DatasetPage.selectedTabIndex}"/>
                         </p:commandButton>
-                        <p:button id="cancelCreate" styleClass="btn btn-link" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DatasetPage.dataset.owner.alias}" rendered="#{DatasetPage.editMode == 'CREATE'}"/>
-                        <p:commandButton value="Direct" id="datasetSave"
-                                         style="display:none"
-                                         update=":datasetForm,:messagePanel"
-                                         oncomplete="javascript:bind_bsui_components();$(document).scrollTop(0);"
-                                         action="#{DatasetPage.save}"/>
+                        <button id="cancelCreate" class="btn btn-link" value="#{bundle.cancel}" onclick="cancelDatasetCreate();return false;" jsf:rendered="#{DatasetPage.editMode == 'CREATE'}">#{bundle.cancel}</button>
+                        <p:remoteCommand name="cancelCreateCommand" process="@this" partialSubmit="true" async="true" update="" action="#{DatasetPage.cancelCreate}" rendered="#{DatasetPage.editMode == 'CREATE'}"/>     
                     </div>
-                    <!-- END: Create/Save Dataset Button Panel -->
+                    <!-- END: Create/Save Dataset Button Panel BTM editMode -->
                     <p:blockUI block="datasetForm" widgetVar="blockDatasetForm"/>
-                    <!-- Popups -->
-                    <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true" rendered="#{!DatasetPage.workingVersion.deaccessioned}">
+                    <!-- POPUPS -->
+                    <ui:include src="file-edit-popup-fragment.xhtml">
+                        <ui:param name="datasetVersion" value="#{version}"/>
+                        <ui:param name="fileMetadataForAction" value="#{DatasetPage.fileMetadataForAction}"/>
+                        <ui:param name="bean" value="#{DatasetPage}"/>
+                        <ui:param name="restrictFileAction" value="restrictFiles"/>
+                        <ui:param name="deleteFileAction" value="deleteFiles"/>
+                        <ui:param name="saveEmbargoAction" value="saveEmbargo"/>
+                        <ui:param name="saveRetentionAction" value="saveRetention"/>
+                        <ui:param name="updateElements" value=":datasetForm:embargoInputs"/>
+                        <ui:param name="updateRetentionElements" value=":datasetForm:retentionInputs"/>
+                    </ui:include>
+                    <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true" rendered="#{!deaccessioned}">
                         <p class="help-block">#{bundle['dataset.share.datasetShare.tip']}</p>
-                        <div id="sharrre-widget" data-url="#{DatasetPage.dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
+                        <div id="sharrre-widget" data-url="#{dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
                         <div class="button-block">
                             <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
                                 #{bundle.close}
                             </button>
                         </div>
                     </p:dialog>
+                    <p:dialog id="configureToolDialog" styleClass="smallPopUp" header="#{DatasetPage.datasetConfigureTool.displayNameLang}" widgetVar="configureToolDialog" modal="true">
+                        <p class="help-block">
+                            <h:outputFormat value="#{DatasetPage.datasetConfigureTool.description}" escape="false"/>
+                        </p>
+                        <div class="button-block">
+                            <p:commandLink styleClass="btn btn-default" action="#{DatasetPage.configure(DatasetPage.datasetConfigureTool)}" oncomplete="PF('configureToolDialog').hide();">
+                                <h:outputFormat value="#{bundle['continue']}"/>
+                            </p:commandLink>
+                            <button class="btn btn-link" onclick="PF('configureToolDialog').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
+                        </div>
+                    </p:dialog>
                     <p:dialog id="citationsDialog" styleClass="smallPopUp" header="#{bundle['metrics.citations.dialog.header']}" widgetVar="citationsDialog" modal="true">
                         <p class="help-block">
                             <h:outputFormat value="#{bundle['metrics.citations.dialog.help']}" escape="false">
@@ -747,10 +1119,10 @@
                             </button>
                         </div>
                     </p:dialog>
-                    <p:dialog id="downloadInvalid" styleClass="smallPopUp" header="#{bundle['dataset.inValidSelectedFilesForDownload']}" widgetVar="downloadInvalid" modal="true">
+                    <p:dialog id="downloadInvalid" styleClass="smallPopUp" header="#{DatasetPage.cantDownloadDueToEmbargoOrDVAccess ? bundle['dataset.inValidSelectedFilesForDownloadWithEmbargo'] : bundle['dataset.inValidSelectedFilesForDownload']}" widgetVar="downloadInvalid" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noValidSelectedFilesForDownload']}</p>
                         <ui:fragment rendered="#{DatasetPage.dataset.fileAccessRequest}">
-                            <p class="help-block">#{bundle['dataset.requestAccessToRestrictedFiles']}</p>
+                            <p class="help-block">#{DatasetPage.cantDownloadDueToEmbargoOrDVAccess ? bundle['dataset.requestAccessToRestrictedFilesWithEmbargo'] : bundle['dataset.requestAccessToRestrictedFiles']}</p>
                         </ui:fragment>
                         <div class="button-block">
                             <button class="btn btn-default" onclick="PF('downloadInvalid').hide();" type="button">
@@ -758,8 +1130,40 @@
                             </button>
                         </div>
                     </p:dialog>
-                    <p:dialog id="downloadMixed" styleClass="smallPopUp" header="#{bundle['dataset.inValidSelectedFilesForDownload']}" widgetVar="downloadMixed" modal="true">
-                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.mixedSelectedFilesForDownload']}</p>
+                    <p:dialog id="transferInvalid" styleClass="smallPopUp" header="#{bundle['dataset.inValidSelectedFilesForTransfer']}" widgetVar="transferInvalid" modal="true">
+                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noValidSelectedFilesForTransfer']}</p>
+                        <ui:fragment rendered="#{DatasetPage.dataset.fileAccessRequest}">
+                            <p class="help-block">#{DatasetPage.cantDownloadDueToEmbargoOrDVAccess ? bundle['dataset.requestAccessToRestrictedFilesWithEmbargo'] : bundle['dataset.requestAccessToRestrictedFiles']}</p>
+                        </ui:fragment>
+                        <div class="button-block">
+                            <button class="btn btn-default" onclick="PF('transferInvalid').hide();" type="button">
+                                #{bundle.close}
+                            </button>
+                        </div>
+                    </p:dialog>
+                    <p:dialog id="downloadTooLarge" styleClass="smallPopUp" header="#{bundle['file.zip.download.exceeds.limit.header']}" widgetVar="downloadTooLarge" modal="true">
+                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/>  #{bundle['file.zip.download.exceeds.limit.info']}</p>
+  
+                        <p class="help-block">
+                            <h:outputFormat value="#{bundle['file.zip.download.exceeds.limit.detail']}" escape="false">
+                                <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                <f:param value="#{systemConfig.guidesVersion}"/>
+                                <f:param value="#{DatasetPage.zipDownloadLimitAsString}"/>
+                            </h:outputFormat>
+                        </p>
+
+                    </p:dialog>
+                    <p:dialog id="selectFilesForDownload" styleClass="smallPopUp"
+                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDownload" modal="true">
+                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForDownload']}</p>
+                        <div class="button-block">
+                            <button class="btn btn-default" onclick="PF('selectFilesForDownload').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
+                        </div>
+                    </p:dialog>
+                    <p:dialog id="downloadMixed" styleClass="smallPopUp" header="#{DatasetPage.cantDownloadDueToEmbargoOrDVAccess ? bundle['dataset.inValidSelectedFilesForDownloadWithEmbargo'] : bundle['dataset.inValidSelectedFilesForDownload']}" widgetVar="downloadMixed" modal="true">
+                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{DatasetPage.cantDownloadDueToEmbargoOrDVAccess ? bundle['dataset.mixedSelectedFilesForDownloadWithEmbargo'] : bundle['dataset.mixedSelectedFilesForDownload']}</p>
                         <table>
                             <ui:repeat var="resFile" value="#{DatasetPage.selectedNonDownloadableFiles}" >
                                 <tr>
@@ -770,16 +1174,38 @@
                         <div class="button-block">
                             <p class="help-block">#{bundle['dataset.downloadUnrestricted']}</p>
                             <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('downloadMixed').hide()" 
-                                             rendered="#{!DatasetPage.downloadPopupRequired}"
+                                             rendered="#{!DatasetPage.guestbookAndTermsPopupRequired}"
                                              action="#{DatasetPage.startMultipleFileDownload()}"/>
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('downloadMixed').hide()"
-                                             rendered="#{DatasetPage.downloadPopupRequired and !settingsWrapper.rsyncDownload}"
-                                             action="#{DatasetPage.openDownloadPopupForMultipleFileDownload()}" update="@form"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('downloadMixed').hide();"
+                                             rendered="#{DatasetPage.guestbookAndTermsPopupRequired and !settingsWrapper.rsyncDownload}"
+                                             oncomplete="PF('guestbookAndTermsPopup').show();" />
                             <button class="btn btn-link" onclick="PF('downloadMixed').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
                     </p:dialog>
+                    <p:dialog id="globusTransferMixed" styleClass="smallPopUp" header="#{bundle['dataset.inValidSelectedFilesForTransfer']}" widgetVar="globusTransferMixed" modal="true">
+                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.mixedSelectedFilesForTransfer']}</p>
+                        <table>
+                            <ui:repeat var="resFile" value="#{DatasetPage.selectedNonGlobusTransferableFiles}" >
+                                <tr>
+                                    <td>#{resFile.label}</td>
+                                </tr>
+                            </ui:repeat>
+                        </table>
+                        <div class="button-block">
+                            <p class="help-block">#{bundle['dataset.transferUnrestricted']}</p>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('globusTransferMixed').hide()" 
+                                             rendered="#{!DatasetPage.guestbookAndTermsPopupRequired}"
+                                             action="#{DatasetPage.startGlobusTransfer(false, true)}"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('globusTransferMixed').hide();"
+                                             rendered="#{DatasetPage.guestbookAndTermsPopupRequired and !settingsWrapper.rsyncDownload}"
+                                             oncomplete="PF('guestbookAndTermsPopup').show();" />
+                            <button class="btn btn-link" onclick="PF('globusTransferMixed').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
+                        </div>
+                    </p:dialog>
                     <p:dialog id="deleteConfirmation" styleClass="smallPopUp" header="#{bundle['file.deleteDialog.header']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteDialog.tip']}</p>
                         <div class="button-block">
@@ -801,11 +1227,93 @@
                     <p:dialog id="privateUrlId" styleClass="smallPopUp" header="#{bundle['dataset.privateurl.header']}" widgetVar="privateUrlConfirmation" modal="true">
                         <p:fragment id="privateUrlPanel" rendered="#{DatasetPage.userCanCreatePrivateURL}">
                             <p class="help-block">
+                                <p>#{bundle['dataset.privateurl.introduction']}
+                                #{bundle['dataset.privateurl.onlyone']}   </p>
+                                <p>
                                 <h:outputFormat value="#{bundle['dataset.privateurl.tip']}" escape="false">
                                     <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                     <f:param value="#{systemConfig.guidesVersion}"/>
                                 </h:outputFormat>
+                                </p>                                                                   
+                            </p>
+                            
+                            <p>
+                            <p>
+                            <h:outputText   styleClass="highlightBold" value="#{bundle['dataset.privateurl.general.title']}"></h:outputText></p>   
+                            <p>#{bundle['dataset.privateurl.general.description']}</p>     
+                            <p:commandButton styleClass="btn btn-default" 
+                                             value="#{bundle['dataset.privateurl.general.button.label']}" 
+                                             action="#{DatasetPage.createPrivateUrl(false)}" update="privateUrlPanel,:messagePanel,disablePrivateUrlConfirmation" 
+                                             disabled="#{(!empty(DatasetPage.privateUrl) and DatasetPage.anonymizedPrivateUrl)}"
+                                             rendered="#{empty(DatasetPage.privateUrl)  or (!empty(DatasetPage.privateUrl) and DatasetPage.anonymizedPrivateUrl) }"/>    
+                            <p:fragment rendered="#{!empty(DatasetPage.privateUrl) and !DatasetPage.anonymizedPrivateUrl}">
+                            <div>
+                                <div class="highlight" jsf:rendered="#{!empty(DatasetPage.privateUrl)}" onclick="if (event.target) {
+                                            selectText(event.target);
+                                        } else {
+                                            selectText(this);
+                                        }">
+                                   <ui:param name="privateUrlLink" value="#{DatasetPage.getPrivateUrlLink(DatasetPage.privateUrl)}" />
+                                    <p class="no-margin-bottom">
+                                        <span>#{privateUrlLink}</span>
+                                    </p>
+                                </div>
+                            </div>    
+                            <div class="button-block">
+                               <button class="btn btn-default btn-copy" data-clipboard-text="#{DatasetPage.getPrivateUrlLink(DatasetPage.privateUrl)}" jsf:rendered="#{!empty(DatasetPage.privateUrl)}" type="button">
+                                    #{bundle['copyClipboard']}
+                                </button>
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disableGeneralPreviewUrl']}" action="#{DatasetPage.setPrivateUrlJustCreatedToFalse()}" oncomplete="PF('privateUrlConfirmation').hide();PF('disablePrivateUrlConfirmation').show()" rendered="#{!empty(DatasetPage.privateUrl)}" update="privateUrlPanel,:messagePanel,disablePrivateUrlConfirmation"/>
+                            </div>
+                            </p:fragment>    
+                                
+                            </p>
+                            <p:fragment rendered="#{anonymizedAccessEnabled}">
+                            <p>
+                             <p>
+                                 <h:outputText  styleClass="highlightBold" value="#{bundle['dataset.privateurl.anonymous.title']}"></h:outputText>
+                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.privateurl.anonymous.tooltip.preface']} #{DatasetPage.getAnonymizedFieldTypeNames()} "></span>
+                             </p>   
+                            <p>#{bundle['dataset.privateurl.anonymous.description']}</p>  
+                            <p>#{bundle['dataset.privateurl.anonymous.description.paragraph.two']}</p>
+                                 <h:outputFormat value="#{bundle['dataset.privateurl.anonymous.description.paragraph.three']}" escape="false">
+                                    <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                    <f:param value="#{systemConfig.guidesVersion}"/>
+                                </h:outputFormat>
+                            <p>#{bundle['dataset.privateurl.createPrivateUrl.anonymized.unavailable']}</p>
+
+                               
+                            <p:commandButton styleClass="btn btn-default disabledTitle" 
+                                             value="#{bundle['dataset.privateurl.anonymous.button.label']}" 
+                                             action="#{DatasetPage.createPrivateUrl(true)}" 
+                                             update="privateUrlPanel,:messagePanel" 
+                                             rendered="#{anonymizedAccessEnabled and (empty(DatasetPage.privateUrl) or (!empty(DatasetPage.privateUrl) and !DatasetPage.anonymizedPrivateUrl))}" 
+                                             disabled="#{DatasetPage.dataset.released or ((!empty(DatasetPage.privateUrl) and !DatasetPage.anonymizedPrivateUrl))}" 
+                                             title="#{DatasetPage.dataset.released ? bundle['dataset.privateurl.createPrivateUrl.anonymized.unavailable']:'' }"/>
+                                  
                             </p>
+                            <p:fragment rendered="#{!empty(DatasetPage.privateUrl) and DatasetPage.anonymizedPrivateUrl}">
+                             <div>
+                                <div class="highlight" jsf:rendered="#{!empty(DatasetPage.privateUrl)}" onclick="if (event.target) {
+                                            selectText(event.target);
+                                        } else {
+                                            selectText(this);
+                                        }">
+                                   <ui:param name="privateUrlLink" value="#{DatasetPage.getPrivateUrlLink(DatasetPage.privateUrl)}" />
+                                    <p class="no-margin-bottom">
+                                        <span>#{privateUrlLink}</span>
+                                    </p>
+                                </div>
+                            </div>    
+                            <div class="button-block">
+                               <button class="btn btn-default btn-copy" data-clipboard-text="#{DatasetPage.getPrivateUrlLink(DatasetPage.privateUrl)}" jsf:rendered="#{!empty(DatasetPage.privateUrl)}" type="button">
+                                    #{bundle['copyClipboard']}
+                                </button>
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disableAnonPreviewUrl']}" action="#{DatasetPage.setPrivateUrlJustCreatedToFalse()}" oncomplete="PF('privateUrlConfirmation').hide();PF('disablePrivateUrlConfirmation').show()" rendered="#{!empty(DatasetPage.privateUrl)}" update="privateUrlPanel,:messagePanel,disablePrivateUrlConfirmation"/>
+                            </div>    
+                            </p:fragment>
+                            <ui:remove>   
                             <div>
                                 <div class="highlight" jsf:rendered="#{empty(DatasetPage.privateUrl)}">
                                     <p class="no-margin-bottom">#{bundle['dataset.privateurl.absent']}</p>
@@ -815,20 +1323,19 @@
                                         } else {
                                             selectText(this);
                                         }">
-                                    <p class="text-success highlightBold" jsf:rendered="#{DatasetPage.privateUrlWasJustCreated}"><span class="glyphicon glyphicon glyphicon-ok"/> #{bundle['dataset.privateurl.createdSuccess']}</p>
+                                    <p class="highlight" jsf:rendered="#{DatasetPage.anonymizedPrivateUrl}">#{bundle['dataset.privateurl.anonymized']}</p>
+                                    <p class="highlight" jsf:rendered="#{!DatasetPage.anonymizedPrivateUrl}">#{bundle['dataset.privateurl.full']}</p>
                                     <ui:param name="privateUrlLink" value="#{DatasetPage.getPrivateUrlLink(DatasetPage.privateUrl)}" />
                                     <p class="no-margin-bottom">
                                         <span>#{privateUrlLink}</span>
                                     </p>
                                 </div>
                             </div>
-                            <div class="button-block">
-                                <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.createPrivateUrl']}" action="#{DatasetPage.createPrivateUrl()}" update="privateUrlPanel,:messagePanel" rendered="#{empty(DatasetPage.privateUrl)}"/>
-                                <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disablePrivateUrl']}" action="#{DatasetPage.setPrivateUrlJustCreatedToFalse()}" onclick="PF('privateUrlConfirmation').hide();PF('disablePrivateUrlConfirmation').show()" rendered="#{!empty(DatasetPage.privateUrl)}" update="privateUrlPanel"/>
-                                <button class="btn btn-link" onclick="PF('privateUrlConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
+                            </ui:remove>    
+                        </p:fragment>
+                            <button class="btn btn-link" onclick="PF('privateUrlConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
                                     #{bundle.close}
-                                </button>
-                            </div>
+                            </button> 
                         </p:fragment>
                         <p:fragment id="privateUrlPanelCannotCreate" rendered="#{!DatasetPage.userCanCreatePrivateURL}">
                             <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.privateurl.cannotCreate']}</p>
@@ -842,7 +1349,10 @@
                     <p:dialog id="disablePrivateUrlConfirmation" styleClass="smallPopUp" header="#{bundle['dataset.privateurl.header']}" widgetVar="disablePrivateUrlConfirmation" modal="true" closable="false">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.privateurl.disableConfirmationText']}</p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disablePrivateUrlConfirm']}" action="#{DatasetPage.disablePrivateUrl()}" update="privateUrlPanel,:messagePanel" onclick="PF('disablePrivateUrlConfirmation').hide();"/>
+                            
+                            <p:commandButton rendered="#{DatasetPage.anonymizedPrivateUrl}" styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disableAnonPreviewUrlConfirm']}" action="#{DatasetPage.disablePrivateUrl()}" update="privateUrlPanel,:messagePanel" onclick="PF('disablePrivateUrlConfirmation').hide();"/>
+                            <p:commandButton rendered="#{!DatasetPage.anonymizedPrivateUrl}" styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disableGeneralPreviewUrlConfirm']}" action="#{DatasetPage.disablePrivateUrl()}" update="privateUrlPanel,:messagePanel" onclick="PF('disablePrivateUrlConfirmation').hide();"/>
+
                             <button class="btn btn-link" onclick="PF('disablePrivateUrlConfirmation').hide();PF('privateUrlConfirmation').show();" type="button">
                                 #{bundle.cancel}
                             </button>
@@ -874,9 +1384,14 @@
                         <p:outputPanel>
                             <p:dialog id="deaccessionBlock" rendered="#{DatasetPage.renderDeaccessionPopup}" header="#{bundle['dataset.editBtn.itemLabel.deaccession']}" widgetVar="deaccessionBlock" modal="true" visible="#{facesContext.validationFailed}">
                                 <p:focus for="selectVersionChk"/>
-                                <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deaccessionDialog.tip']}</p>
+                                <div class="alert alert-warning">
+                                    <span class="glyphicon glyphicon-warning-sign">&#160;</span><h:outputFormat value="#{bundle['file.deaccessionDialog.tip.permanent']}" escape="false" />
+                                    <p><br/>
+                                        <h:outputFormat value="#{bundle['file.deaccessionDialog.tip']}" escape="false" />
+                                    </p>
+                                </div>
                                 <div class="form-group" jsf:rendered="#{DatasetPage.releasedVersionTabList.size() > 1}">
-                                    <label for="selectVersionChk">#{bundle['file.deaccessionDialog.reason.question1']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>                           
+                                    <label for="selectVersionChk">#{bundle['file.deaccessionDialog.reason.question1']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
                                     <p:selectManyCheckbox id="selectVersionChk" value="#{DatasetPage.selectedDeaccessionVersions}" converter="datasetVersionConverter"
                                                           layout="pageDirection" required="#{param['DO_DEACCESSION_VALIDATION']}" requiredMessage="#{bundle['file.deaccessionDialog.dialog.selectVersion.error']}" widgetVar="selectVersionChk">
                                         <f:selectItems value="#{DatasetPage.releasedVersionTabList}" var="versionTab" itemLabel="#{bundle['file.deaccessionDialog.version']} #{versionTab.versionNumber}.#{versionTab.minorVersionNumber}, #{versionTab.versionDate}"  itemValue="#{versionTab}" />
@@ -900,17 +1415,17 @@
                                 </div>
                                 <div class="form-group">
                                     <label for="reasonForDeaccession">
-                                    #{bundle['file.deaccessionDialog.enterInfo']}
+                                        #{bundle['file.deaccessionDialog.enterInfo']}
                                     </label>
-                                    <p:inputTextarea id="reasonForDeaccession" styleClass="form-control"  autoResize="false" rows="2" cols="40"                                           
-                                                     value="#{DatasetPage.deaccessionReasonText}" widgetVar="reasonForDeaccession" validator="#{DatasetPage.validateDeaccessionReason}"> 
+                                    <p:inputTextarea id="reasonForDeaccession" styleClass="form-control" autoResize="false" rows="2" cols="40" title="#{bundle['file.deaccessionDialog.enterInfo']}"
+                                                     value="#{DatasetPage.deaccessionReasonText}" widgetVar="reasonForDeaccession" validator="#{DatasetPage.validateDeaccessionReason}">
                                         <f:attribute name="reasonRadio" value="#{reasonRadio}" />
                                     </p:inputTextarea>
                                     <p:message for="reasonForDeaccession"/>
                                 </div>
                                 <div class="form-group">
                                     <label for="forwardURLForDeaccession">
-                                    #{bundle['file.deaccessionDialog.leaveURL']}
+                                        #{bundle['file.deaccessionDialog.leaveURL']}
                                     </label>
                                     <p:inputText id="forwardURLForDeaccession" styleClass="form-control" value="#{DatasetPage.deaccessionForwardURLFor}" widgetVar="forwardURLForDeaccession"
                                                  validator="#{DatasetPage.validateForwardURL}"/>
@@ -941,14 +1456,13 @@
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deaccessionDialog.deaccessionDataset.tip']}</p>
                         <div class="button-block">
                             <h:commandButton styleClass="btn btn-default" value="#{bundle.yes}" 
-                                            onclick="PF('deaccessionAllConfirmation').hide();PF('deaccessionBlock').hide();PF('blockDatasetForm').hide();" 
-                                            action="#{DatasetPage.deaccessionVersions}"/>
+                                             onclick="PF('deaccessionAllConfirmation').hide();PF('deaccessionBlock').hide();PF('blockDatasetForm').hide();" 
+                                             action="#{DatasetPage.deaccessionVersions}"/>
                             <button class="btn btn-link" onclick="PF('deaccessionAllConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.no}
                             </button>
                         </div>
                     </p:dialog>
-                    <p:inputText id="hiddenReasonInput" style="display:none" widgetVar="hiddenReasonInput"/>
                     <p:dialog id="compareTwo" header="#{bundle['file.viewDiffDialog.header']}" widgetVar="compareTwo" modal="true">
                         <p class="help-block"><span class="glyphicon glyphicon-exclamation-sign text-danger"/> <span class="text-danger">#{bundle['file.viewDiffDialog.dialog.warning']}</span></p>
                         <div class="button-block">
@@ -965,11 +1479,13 @@
                             </div>
                             <div class="pull-left">
                                 #{bundle['file.viewDiffDialog.version']}: #{DatasetPage.datasetVersionDifference.originalVersion.semanticVersion}<br/>
-                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.originalVersion.localeLastUpdateTime}
+                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.originalVersion.localeLastUpdateTime}<br/>
+                                <p:fragment rendered="#{versionNoteEnabled}">#{bundle['file.viewDiffDialog.versionNote']}: #{DatasetPage.datasetVersionDifference.originalVersion.versionNote}</p:fragment>
                             </div>
                             <div class="pull-left">
                                 #{bundle['file.viewDiffDialog.version']}: #{DatasetPage.datasetVersionDifference.newVersion.semanticVersion}<br/>
-                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.newVersion.localeLastUpdateTime}
+                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.newVersion.localeLastUpdateTime}<br/>
+                                <p:fragment rendered="#{versionNoteEnabled}">#{bundle['file.viewDiffDialog.versionNote']}: #{DatasetPage.datasetVersionDifference.newVersion.versionNote}</p:fragment>
                             </div>
                         </div>
                         <ui:fragment rendered="#{!empty(DatasetPage.datasetVersionDifference.detailDataByBlock)}">
@@ -1002,8 +1518,9 @@
                                          rendered="#{!empty(DatasetPage.datasetVersionDifference.datasetFilesDiffList)}">
                                 <p:column styleClass="versionValue">
                                     <h:outputText value="#{bundle['file.viewDiffDialog.fileID']} #{fileDiff.fileId}"/>
-                                    <br></br>
-                                    <h:outputText value="#{fileDiff.fileChecksumType} #{fileDiff.fileChecksumValue}"/>
+                                    <div class="checksum-block">
+                                        <h:outputText value="#{fileDiff.fileChecksumType} #{fileDiff.fileChecksumValue}"/>
+                                    </div>
                                 </p:column>
                                 <p:column styleClass="versionDetails" rendered="#{! fileDiff.file1Empty}">
                                     <h:outputText value="#{bundle['file.viewDiffDialog.fileName']}: #{fileDiff.fileName1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileName1 != null}"/>
@@ -1012,7 +1529,7 @@
                                     <h:outputText value="#{bundle['file.viewDiffDialog.category']}: #{fileDiff.fileCat1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileCat1 != null}"/>
                                     <h:outputText value="#{bundle['file.viewDiffDialog.description']}: #{fileDiff.fileDesc1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileDesc1 != null}"/>
                                     <h:outputText value="#{bundle['file.viewDiffDialog.provDescription']}: #{fileDiff.fileProvFree1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileProvFree1 != null}"/>
-                                    <h:outputText value="#{bundle['file.viewDiffDialog.restricted']}: #{fileDiff.fileRest1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileRest1 != null}"/>
+                                    <h:outputText value="#{bundle['file.viewDiffDialog.fileAccess']}: #{fileDiff.fileRest1}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileRest1 != null}"/>
                                 </p:column>
                                 <p:column styleClass="versionDetails" rendered="#{fileDiff.file1Empty}">
                                     &#160;
@@ -1024,7 +1541,7 @@
                                     <h:outputText value="#{bundle['file.viewDiffDialog.category']}: #{fileDiff.fileCat2}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileCat2 != null}"/>
                                     <h:outputText value="#{bundle['file.viewDiffDialog.description']}: #{fileDiff.fileDesc2}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileDesc2 != null}"/>
                                     <h:outputText value="#{bundle['file.viewDiffDialog.provDescription']}: #{fileDiff.fileProvFree2}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileProvFree2 != null}"/>
-                                    <h:outputText value="#{bundle['file.viewDiffDialog.restricted']}: #{fileDiff.fileRest2}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileRest2 != null}"/>
+                                    <h:outputText value="#{bundle['file.viewDiffDialog.fileAccess']}: #{fileDiff.fileRest2}" styleClass="diffDetailBlock" rendered="#{fileDiff.fileRest2 != null}"/>
                                 </p:column>
                                 <p:column styleClass="versionDetails" rendered="#{fileDiff.file2Empty}">
                                     &#160;
@@ -1044,7 +1561,7 @@
                                     <h:outputText value="#{bundle['file.viewDiffDialog.category']}: #{fileReplace.fdi.fileCat1}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileCat1 != null}"/>
                                     <h:outputText value="#{bundle['file.viewDiffDialog.description']}: #{fileReplace.fdi.fileDesc1}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileDesc1 != null}"/>
                                     <h:outputText value="#{bundle['file.viewDiffDialog.provDescription']}: #{fileReplace.fdi.fileProvFree1}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileProvFree1 != null}"/>
-                                    <h:outputText value="#{bundle['file.viewDiffDialog.restricted']}: #{fileReplace.fdi.fileRest1}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileRest1 != null}"/>
+                                    <h:outputText value="#{bundle['file.viewDiffDialog.fileAccess']}: #{fileReplace.fdi.fileRest1}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileRest1 != null}"/>
                                 </p:column>
                                 <p:column styleClass="versionDetails" rendered="#{fileReplace.fdi.file1Empty}">
                                     &#160;
@@ -1058,7 +1575,7 @@
                                     <h:outputText value="#{bundle['file.viewDiffDialog.category']}: #{fileReplace.fdi.fileCat2}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileCat2 != null}"/>
                                     <h:outputText value="#{bundle['file.viewDiffDialog.description']}: #{fileReplace.fdi.fileDesc2}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileDesc2 != null}"/>
                                     <h:outputText value="#{bundle['file.viewDiffDialog.provDescription']}: #{fileReplace.fdi.fileProvFree2}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileProvFree2 != null}"/>
-                                    <h:outputText value="#{bundle['file.viewDiffDialog.restricted']}: #{fileReplace.fdi.fileRest2}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileRest2 != null}"/>
+                                    <h:outputText value="#{bundle['file.viewDiffDialog.fileAccess']}: #{fileReplace.fdi.fileRest2}" styleClass="diffDetailBlock" rendered="#{fileReplace.fdi.fileRest2 != null}"/>
                                 </p:column>
                                 <p:column styleClass="versionDetails" rendered="#{fileReplace.fdi.file2Empty}">
                                     &#160;
@@ -1087,15 +1604,6 @@
                             </button>
                         </div>
                     </p:dialog>
-                    <p:dialog id="selectFilesForDownload" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDownload" modal="true">
-                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForDownload']}</p>
-                        <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('selectFilesForDownload').hide();PF('blockDatasetForm').hide();" type="button">
-                                #{bundle.close}
-                            </button>
-                        </div>
-                    </p:dialog>
                     <p:dialog id="selectFilesForRequestAccess" styleClass="smallPopUp"
                               header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForRequestAccess" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForRequestAccess']}</p>
@@ -1105,56 +1613,15 @@
                             </button>
                         </div>
                     </p:dialog>
-                    <p:dialog id="selectFilesForDelete" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDelete" modal="true">
-                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForDelete']}</p>
-                        <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('selectFilesForDelete').hide();PF('blockDatasetForm').hide();" type="button">
-                                #{bundle.close}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <p:dialog id="selectFilesForRestrict" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForRestrict" modal="true">
-                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForRestrict']}</p>
-                        <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('selectFilesForRestrict').hide();PF('blockDatasetForm').hide();" type="button">
-                                #{bundle.close}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <p:dialog id="selectFilesForUnRestrict" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForUnRestrict" modal="true">
-                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForUnRestrict']}</p>
-                        <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('selectFilesForUnRestrict').hide();PF('blockDatasetForm').hide();" type="button">
-                                #{bundle.close}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <p:dialog id="selectFilesForEditMetadata" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForEditMetadata" modal="true">
-                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForMetadataEdit']}</p>
+                    <p:dialog id="selectEmbargoedFilesForRequestAccess" styleClass="smallPopUp"
+                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectEmbargoedFilesForRequestAccess" modal="true">
+                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.embargoedSelectedFilesForRequestAccess']}</p>
                         <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('selectFilesForEditMetadata').hide();PF('blockDatasetForm').hide();" type="button">
+                            <button class="btn btn-default" onclick="PF('selectEmbargoedFilesForRequestAccess').hide();PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.close}
                             </button>
                         </div>
                     </p:dialog>
-                    <p:dialog id="selectFilesForEditTags" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForEditTags" modal="true">
-                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForMetadataEdit']}</p>
-                        <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('selectFilesForEditTags').hide();PF('blockDatasetForm').hide();" type="button">
-                                #{bundle.close}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <p:remoteCommand name="refreshTagsCommand" action="#{DatasetPage.refreshTagsPopUp()}" update=":datasetForm:fileTagsPopup"
-                                     oncomplete="PF('fileTagsPopup').show();"/>
-                    <!-- We no longer need this remoteCommand; see my comments in the javascript method testFilesSelectedForEditMetadata() -->
-                    <!-- for more info. - L.A. 4.2.1 -->
-                    <!-- p:remoteCommand  name="openEditFilesPageCommand" action=" {DatasetPage.editFileMetadata()}"  / -->
                     <p:dialog id="fileTagsPopup" styleClass="smallPopUp" header="#{bundle['file.editTags']}" widgetVar="fileTagsPopup" modal="true">
                         <p:focus for="fileTagsMenuDS"/>
                         <p class="help-block">#{bundle['file.editTagsDialog.tip']}</p>
@@ -1201,7 +1668,9 @@
                                             <p:inputText id="fileTagAddNewDS" styleClass="form-control"
                                                          type="text" value="#{DatasetPage.newCategoryName}"
                                                          placeholder="#{bundle['file.editTagsDialog.newName']}"
-                                                         onkeypress="if (event.keyCode == 13) {return false;}"/>
+                                                         onkeypress="if (event.keyCode == 13) {
+                                                                     return false;
+                                                                 }"/>
                                             <p:commandButton styleClass="btn btn-default" style="margin-left:.5em;" value="#{bundle.apply}" action="#{DatasetPage.saveNewCategory}" update="selectedTagsList, fileTagAddNewDS, fileTagsMenuDS"/>
                                         </div>
                                     </div>
@@ -1236,9 +1705,11 @@
                         </div>
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" id="fileTagsPopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('fileTagsPopup').hide()" update=":datasetForm:tabView:filesTable, :datasetForm" action="#{DatasetPage.saveFileTagsAndCategories()}"/>
-                            <p:commandButton styleClass="btn btn-link" id="fileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('fileTagsPopup').hide();PF('blockDatasetForm').hide();" actionListener="#{DatasetPage.clearFileMetadataSelectedForTagsPopup()}"/>
+                            <p:commandButton styleClass="btn btn-link" id="fileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('fileTagsPopup').hide();
+                                    PF('blockDatasetForm').hide();" actionListener="#{DatasetPage.clearFileMetadataSelectedForTagsPopup()}"/>
                         </div>
                     </p:dialog>
+                    
                     <!-- Request Access Sign Up/Log In Button -->
                     <p:dialog id="accessSignUpLogIn" header="#{bundle['file.requestAccess']}" widgetVar="accessSignUpLogIn_popup" modal="true">
                         <p class="help-block">
@@ -1250,46 +1721,60 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('accessSignUpLogIn_popup').hide();PF('blockDatasetForm').hide();" type="button">
+                            <button class="btn btn-default" onclick="PF('accessSignUpLogIn_popup').hide();
+                                    PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.close}
                             </button>
                         </div>
                     </p:dialog>
                     <!-- END: Request Access Sign Up/Log In Button -->
-                    <p:dialog id="configureToolPopup" styleClass="smallPopUp" header="#{configureFragmentBean.configurePopupToolHandler.externalTool.displayName}" widgetVar="configureToolPopup" modal="true">
-                        <ui:include src="file-configure-popup-fragment.xhtml">
-                            <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
-                        </ui:include>
-                    </p:dialog>
-                    <p:dialog id="downloadPopup" styleClass="largePopUp" header="#{bundle['file.downloadDialog.header']}" widgetVar="downloadPopup" modal="true">
+                    <p:dialog id="guestbookAndTermsPopup" styleClass="largePopUp" header="#{bundle['file.downloadDialog.header']}" widgetVar="guestbookAndTermsPopup" modal="true">
                         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
-                        <ui:include src="file-download-popup-fragment.xhtml">
-                            <ui:param name="workingVersion" value="#{DatasetPage.workingVersion}"/>
-                            <ui:param name="downloadPopupRequired" value="#{DatasetPage.downloadPopupRequired}"/>
-                            <ui:param name="guestbookResponse" value="#{DatasetPage.fileDownloadHelper.guestbookResponse}" rendered="#{!settingsWrapper.rsyncDownload}"/>
+                        <ui:include src="guestbook-terms-popup-fragment.xhtml">
+                            <ui:param name="popupContext" value="downloadDataset"/>
+                            <ui:param name="workingVersion" value="#{version}"/>
+                            <ui:param name="guestbookAndTermsPopupRequired" value="#{DatasetPage.guestbookAndTermsPopupRequired}"/>
+                            <ui:param name="guestbookPopupRequired" value="#{DatasetPage.guestbookPopupRequired}"/>
+                            <ui:param name="fileMetadataForAction" value="#{DatasetPage.fileMetadataForAction}"/>
+                            <ui:param name="hasRestrictedFile" value="#{DatasetPage.downloadingRestrictedFiles()}"/>
+                            <ui:param name="guestbookResponse" value="#{DatasetPage.guestbookResponse}" rendered="#{!settingsWrapper.rsyncDownload}"/>
                             <ui:param name="fileDownloadHelper" value="#{DatasetPage.fileDownloadHelper}"/>
                             <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
+                            <ui:param name="termsGuestbookPopupAction" value="#{DatasetPage.termsGuestbookPopupAction}"/>
+                            <ui:param name="guestbookPopupRequiredAtDownload" value="#{DatasetPage.guestbookPopupRequiredAtDownload}"/>
+                            <ui:param name="isGlobusTransfer" value="#{DatasetPage.globusTransferRequested}"/>
                         </ui:include>
                     </p:dialog>
-                    <p:dialog id="downloadPackagePopup" styleClass="smallPopUp" header="#{bundle['packageDownload.title']}" widgetVar="downloadPackagePopup" modal="true">
-                        <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
-                        <ui:include src="package-download-popup-fragment.xhtml">
-                            <ui:param name="workingVersion" value="#{DatasetPage.workingVersion}"/>
-                            <ui:param name="downloadPopupRequired" value="#{DatasetPage.downloadPopupRequired}"/>
-                            <ui:param name="guestbookResponse" value="#{DatasetPage.fileDownloadHelper.guestbookResponse}" rendered="#{!settingsWrapper.rsyncDownload}"/>
-                            <ui:param name="fileDownloadHelper" value="#{DatasetPage.fileDownloadHelper}"/>
+                    <!-- Preview Guestbook -->
+                    <p:dialog id="previewGuestbook" styleClass="largePopUp" header="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.header']}" widgetVar="viewGuestbook" modal="true">
+                        <ui:include src="guestbook-preview-popup-fragment.xhtml">
+                            <ui:param name="selectedGuestbook" value="#{DatasetPage.selectedGuestbook}"/>
+                            <ui:param name="enableEdit" value="false"/>
+                        </ui:include>
+                    </p:dialog>
+                    <p:dialog id="rsyncDataAccessPopup" styleClass="smallPopUp" header="#{bundle['file.dataFilesTab.dataAccess']}" widgetVar="rsyncDataAccessPopup" modal="true"
+                              rendered="#{fileMetadata.dataFile.filePackage and systemConfig.rsyncDownload 
+                                          and !version.getDataset().getStorageIdentifier().startsWith('s3://')}">
+                        <!-- Data Access for Rsync Download -->
+                        <ui:include src="file-data-access-fragment.xhtml">
+                            <ui:param name="fileMetadata" value="#{fileMetadata}"/>
+                            <ui:param name="datasetVersion" value="#{version}"/>
                             <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
                         </ui:include>
+                        <button class="btn btn-default" onclick="PF('rsyncDataAccessPopup').hide();">
+                            #{bundle.done}
+                        </button>
                     </p:dialog>
-                    <p:dialog id="requestAccessPopup" styleClass="largePopUp" header="#{bundle['file.requestAccess']}" widgetVar="requestAccessPopup" modal="true">
+                    <p:dialog id="downloadPackagePopup" styleClass="smallPopUp" header="#{bundle['packageDownload.title']}" widgetVar="downloadPackagePopup" modal="true">
                         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
-                        <ui:include src="file-request-access-popup-fragment.xhtml">
-                            <ui:param name="workingVersion" value="#{DatasetPage.workingVersion}"/>
-                            <ui:param name="fileDownloadHelper" value="#{DatasetPage.fileDownloadHelper}"/>
+                        <ui:include src="package-download-popup-fragment.xhtml">
+                            <ui:param name="workingVersion" value="#{version}"/>
+                            <ui:param name="guestbookAndTermsPopupRequired" value="#{DatasetPage.guestbookAndTermsPopupRequired}"/>
+                            <ui:param name="guestbookResponse" value="#{DatasetPage.guestbookResponse}" rendered="#{!settingsWrapper.rsyncDownload}"/>
                             <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
                         </ui:include>
                     </p:dialog>
-                    <p:dialog id="linkDatasetForm" styleClass="largePopUp" header="#{bundle['dataset.link']}" widgetVar="linkDatasetForm" modal="true" rendered="#{DatasetPage.showLinkingPopup}">
+                    <p:dialog id="linkDatasetForm" styleClass="largePopUp" header="#{bundle['dataset.link.title']}" widgetVar="linkDatasetForm" modal="true" rendered="#{DatasetPage.showLinkingPopup}">
                         <p:focus for="dataverseLinkName"/>
                         <div class="form-horizontal">
                             <p class="help-block">
@@ -1300,7 +1785,7 @@
                                             <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
                                             <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
                                             <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                        </p:commandLink>                                
+                                        </p:commandLink>
                                     </o:param>
                                 </h:outputFormat>
                             </p>
@@ -1310,8 +1795,7 @@
                                 </label>
                                 <div class="col-xs-8">
                                     <p:fragment id="linkNameContent">
-                                        <p:autoComplete id="dataverseLinkName" style="width:75%;"
-                                                        binding="#{DatasetPage.selectedDataverseMenu}"
+                                        <p:autoComplete id="dataverseLinkName"
                                                         placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
                                                         emptyMessage="#{bundle['dataverse.link.dataset.none']}"
                                                         scrollHeight="180" forceSelection="true" 
@@ -1323,10 +1807,10 @@
                                                         styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
                                                         var="dataverseLk" itemLabel="#{dataverseLk.displayName}" itemValue="#{dataverseLk}" converter="dataverseConverter">
                                             <p:column>
-                                                <h:outputText value="#{dataverseLk.displayName}"/> 
+                                                <h:outputText value="#{dataverseLk.displayName}"/>
                                             </p:column>
                                             <p:column>
-                                                <h:outputText value="#{dataverseLk.alias}"/> 
+                                                <h:outputText value="#{dataverseLk.alias}"/>
                                             </p:column>
                                             <p:ajax process="@this" event="itemSelect" />
                                             <p:ajax process="@this" event="itemUnselect" />
@@ -1336,19 +1820,92 @@
                                 </div>
                             </div>
                         </div>
+                        <div>
+                            <p:fragment rendered="#{!empty DatasetPage.alreadyLinkedDataverses}"> 
+                            <h:outputLabel  value="#{bundle['dataset.linking.popop.already.linked.note']}"/>&#160;
+                            <h:outputText rendered="#{!empty DatasetPage.alreadyLinkedDataverses }" value="#{DatasetPage.alreadyLinkedDataverses}"/>
+                            </p:fragment>
+                        </div>
                         <div class="button-block">
                             <p:commandButton id="saveLinkButton" styleClass="btn btn-default"    
-                                           update="linkNameContent @([id$=Messages])" 
-                                           oncomplete="if (args &amp;&amp; !args.validationFailed) linkDatasetCommand();"
-                                           value="#{bundle['dataset.link.save']}">  
+                                             update="linkNameContent @([id$=Messages])" 
+                                             oncomplete="if (args &amp;&amp; !args.validationFailed) linkDatasetCommand();"
+                                             value="#{bundle['dataset.link.save']}">
                                 <f:param name="DO_DS_LINK_VALIDATION" value="true"/>
                             </p:commandButton>
-                            <button class="btn btn-link" onclick="PF('linkDatasetForm').hide();PF('blockDatasetForm').hide();" type="button">                              
+                            <button class="btn btn-link" onclick="PF('linkDatasetForm').hide();
+                                    PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
                     </p:dialog>
                     <p:remoteCommand name="linkDatasetCommand" oncomplete="PF('linkDatasetForm').hide();" update=":messagePanel  @([id$=Messages])" actionListener="#{DatasetPage.saveLinkingDataverses}"/>
+                    <p:dialog id="unlinkDatasetForm" styleClass="largePopUp" header="#{bundle['dataset.unlink.title']}" widgetVar="unlinkDatasetForm" modal="true" rendered="#{DatasetPage.showUnLinkingPopup}">
+                        <p:focus for="dataverseUnLinkName"/>
+                        <div class="form-horizontal">
+                            <p class="help-block">
+                                <h:outputFormat value="#{bundle['dataverse.unlink.dataset.choose']}" escape="false">
+                                    <o:param>
+                                        <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('unlinkDatasetForm').hide();PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                        </p:commandLink>
+                                    </o:param>
+                                </h:outputFormat>
+                            </p>
+                            <div class="form-group">
+                                <label class="col-xs-3 control-label">
+                                    <h:outputText value="#{bundle['dataverse.link.yourDataverses']}"/>
+                                </label>
+                                <div class="col-xs-8">
+                                    <p:fragment id="unlinkNameContent">
+                                        <p:autoComplete id="dataverseUnLinkName"
+                                                        placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
+                                                        emptyMessage="#{bundle['dataverse.unlink.dataset.none']}"
+                                                        scrollHeight="180" forceSelection="true"
+                                                        minQueryLength="1" queryDelay="1000"
+                                                        value="#{DatasetPage.selectedDataverseForLinking}"
+                                                        multiple="false"
+                                                        completeMethod="#{DatasetPage.completeUnLinkingDataverse}"
+                                                        required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
+                                                        styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                        var="dataverseLk" itemLabel="#{dataverseLk.displayName}" itemValue="#{dataverseLk}" converter="dataverseConverter">
+                                            <p:column>
+                                                <h:outputText value="#{dataverseLk.displayName}"/>
+                                            </p:column>
+                                            <p:column>
+                                                <h:outputText value="#{dataverseLk.alias}"/>
+                                            </p:column>
+                                            <p:ajax process="@this" event="itemSelect" />
+                                            <p:ajax process="@this" event="itemUnselect" />
+                                        </p:autoComplete>
+                                        <p:message for="dataverseUnLinkName"/>
+                                    </p:fragment>
+                                </div>
+                            </div>
+                        </div>
+                        <div>
+                            <p:fragment rendered="#{empty DatasetPage.alreadyLinkedDataverses}">
+                                <h:outputLabel value="#{bundle['dataset.linking.popup.not.linked.note']}"/>&#160;
+                                <h:outputText value=""/>
+                            </p:fragment>
+                        </div>
+                        <div class="button-block">
+                            <p:commandButton id="deleteLinkButton" styleClass="btn btn-default"
+                                             update="linkNameContent @([id$=Messages])"
+                                             oncomplete="if (args &amp;&amp; !args.validationFailed) unlinkDatasetCommand();"
+                                             value="#{bundle['dataset.unlink.delete']}">
+                                <f:param name="DO_DS_LINK_VALIDATION" value="true"/>
+                            </p:commandButton>
+                            <button class="btn btn-link" onclick="PF('unlinkDatasetForm').hide();
+                                    PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
+                        </div>
+                    </p:dialog>
+                    <p:remoteCommand name="unlinkDatasetCommand" oncomplete="PF('unlinkDatasetForm').hide();" update=":messagePanel  @([id$=Messages])" actionListener="#{DatasetPage.deleteLinkingDataverses}"/>
                     <p:dialog id="computeBatchListPopup" header="#{bundle['dataset.compute.computeBatchListHeader']}" widgetVar="computeBatchListPopup" modal="true">
                         <div class="text-right">
                             <!-- Clear link -->
@@ -1366,6 +1923,7 @@
                                 <h:outputText value="#{computeCartDatasetList.value}"/>
                             </h:column>
                             <h:column>
+                                <f:facet name="header">#{bundle['dataset.compute.computeBatchChange']}</f:facet>
                                 <p:commandButton value="#{bundle['dataset.compute.computeBatchRemove']}" action="#{DatasetPage.removeCartItem(computeCartDatasetList.key, computeCartDatasetList.value)}" update=":datasetForm,:messagePanel"/>
                             </h:column>
                         </h:dataTable>
@@ -1373,134 +1931,110 @@
                             <h:outputLink styleClass="btn btn-default" value="#{DatasetPage.cartComputeUrl}" onclick="PF('computeBatchListPopup').hide()" target="_blank">
                                 <h:outputText value="#{bundle['dataset.compute.computeBatchCompute']}"/>
                             </h:outputLink>
-                            <button class="btn btn-link" onclick="PF('computeBatchListPopup').hide();" type="button">                              
+                            <button class="btn btn-link" onclick="PF('computeBatchListPopup').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
                     </p:dialog>
-                    <p:dialog id="accessPopup" header="#{bundle['dataset.access.accessHeader']}"  widgetVar="accessPopup" modal="true">
-                        <ui:fragment rendered="#{DatasetPage.editMode == 'CREATE' or empty DatasetPage.editMode }">
-                            <p:focus for="termsAccessInput"/>
-                            <div class="form-horizontal">
-                                <div class="form-group">
-                                    <label for="metadata_TermsAccess" class="col-sm-3 control-label">
-                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
-                                    </label>
-                                    <div class="col-sm-9">
-                                        <p:inputTextarea id="termsAccessInput" value="#{DatasetPage.workingVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="metadata_RequestAccess" class="col-sm-3 control-label">
-                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
-                                    </label>
-                                    <div class="col-sm-9">
-                                        <p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}"
-                                                                 value="#{DatasetPage.workingVersion.termsOfUseAndAccess.fileAccessRequest}" widgetVar="inputfar"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="button-block">
-                                <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" rendered="#{DatasetPage.editMode != 'CREATE'}"
-                                                    onclick="PF('accessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.restrictSelectedFiles(true)}"/>
-                                <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" rendered="#{DatasetPage.editMode == 'CREATE'}"
-                                                    onclick="PF('accessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.save()}"/>
-                                <button class="btn btn-link" onclick="PF('accessPopup').hide();PF('blockDatasetForm').hide();" type="button">                              
-                                    #{bundle.cancel}
-                                </button>
-                            </div>
-                        </ui:fragment>
-                    </p:dialog>
                     <p:dialog id="inreview" header="#{bundle['dataset.submitBtn']}" widgetVar="inreview" modal="true">
                         <p class="text-warning">
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.submitMessage']}
                         </p>
+                        <p jsf:rendered="#{!valid}" class="text-warning">
+                            <span class="glyphicon glyphicon-warning-sign"/><b style="color:red;"> #{bundle['dataset.message.incomplete.warning']}</b>
+                        </p>
+                        <c:if test="#{showSubmitForReviewLink}">
+                            <ui:include src="datasetLicenseInfoFragment.xhtml"/>
+                        </c:if>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.submit}" 
-                                             onclick="PF('inreview').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.submitDataset}" immediate="true"/>
-                            <button class="btn btn-link" onclick="PF('inreview').hide();PF('blockDatasetForm').hide();" type="button">                              
+                            <p:commandButton rendered="#{DatasetPage.validOrCanReviewIncomplete}" styleClass="btn btn-default" value="#{bundle.submit}" 
+                                             onclick="PF('inreview').hide();
+                                                     PF('blockDatasetForm').hide();" action="#{DatasetPage.submitDataset}" immediate="true"/>
+                            <button class="btn btn-link" onclick="PF('inreview').hide();PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
                     </p:dialog>
                     <!-- Publish/Submit for Review Dialogs -->
-                    <p:dialog id="publishConfirm" width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="publishConfirm" modal="true">
-                        <p class="text-warning">
-                            <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.publish.tip']}
-                        </p>
-                        <div id="terms-agreement-block" class="well" jsf:rendered="#{DatasetPage.datasetPublishCustomText.length() > 0}">
+                    <p:dialog id="publishDataset" width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="publishDataset" modal="true">
+                        <ui:fragment rendered="#{publishDataset}">
+                            <div class="form-group">
+                                <p jsf:rendered="#{valid}" class="col-sm-12 text-warning">#{bundle['dataset.publish.tip']}</p>
+                                <p jsf:rendered="#{!valid}" class="col-sm-12 text-warning"><b style="color:red;">#{bundle['dataset.message.incomplete.warning']}</b></p>
+                                <p class="col-sm-12 help-block">#{bundle['dataset.publish.terms.tip']}</p>
+                            </div>
+                        </ui:fragment>
+                        <ui:fragment rendered="#{releaseBoth}">
+                            <p class="text-warning">
+                                <span class="glyphicon glyphicon-warning-sign"/>
+                                <h:outputFormat value="#{bundle['dataset.mayNotPublish.both']}" escape="false">
+                                    <o:param>
+                                        <a href="/dataverse/#{DatasetPage.dataset.owner.alias}" title="#{DatasetPage.dataset.owner.displayName}">
+                                            <h:outputText value="#{DatasetPage.dataset.owner.displayName}"/>
+                                        </a>
+                                    </o:param>
+                                </h:outputFormat>
+                            </p>
+                        </ui:fragment>
+                        <ui:fragment rendered="#{releaseDraft}">
+                            <p:focus for="options"/>
+                            <p class="text-warning">
+                                <span class="glyphicon glyphicon-warning-sign" /> #{bundle['dataset.republish.tip']}
+                            </p>
+                        </ui:fragment>
+                        <ui:fragment rendered="#{releaseBoth}">
+                            <div class="form-group">
+                                <p class="help-block">
+                                    #{bundle['dataset.publishBoth.tip']}
+                                </p>
+                            </div>
+                        </ui:fragment>
+                        <div class="well terms-agreement-block" jsf:rendered="#{DatasetPage.displayPublishPopupCustomText}">
                             <h:outputText value="#{DatasetPage.datasetPublishCustomText}" escape="false"/>
                         </div>
-                        <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" 
-                                             onclick="PF('publishConfirm').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseDataset}" immediate="true"/>
-                            <button class="btn btn-link" onclick="PF('publishConfirm').hide();PF('blockDatasetForm').hide();" type="button">                              
-                                #{bundle.cancel}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <p:dialog id="publishParent" width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="publishParent" modal="true">
-                        <p class="text-warning">
-                            <span class="glyphicon glyphicon-warning-sign"/>
-                            <h:outputFormat value="#{bundle['dataset.mayNotPublish.both']}" escape="false">
-                                <o:param>
-                                    <a href="/dataverse/#{DatasetPage.dataset.owner.alias}" title="#{DatasetPage.dataset.owner.displayName}">
-                                        <h:outputText value="#{DatasetPage.dataset.owner.displayName}"/>
-                                    </a>
-                                </o:param>
-                            </h:outputFormat>
-                        </p>
-                        <div id="terms-agreement-block" class="well" jsf:rendered="#{DatasetPage.datasetPublishCustomText.length() > 0}">
-                            <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetPublishCustomText)}" escape="false"/>
-                        </div>
-                        <p class="help-block">
-                            #{bundle['dataset.publishBoth.tip']}
-                        </p>
-                        <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.mayNotBePublished.both.button']}" 
-                                             onclick="PF('publishParent').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseParentDVAndDataset}" immediate="true"/>
-                            <button class="btn btn-link" onclick="PF('publishParent').hide();PF('blockDatasetForm').hide();" type="button">                              
-                                #{bundle.cancel}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <p:dialog id="releaseDraft" width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="releaseDraft" modal="true">
-                        <p:focus for="options"/>
-                        <p class="text-warning">
-                            <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.republish.tip']}
-                        </p>
-                        <div id="terms-agreement-block" class="well" jsf:rendered="#{DatasetPage.datasetPublishCustomText.length() > 0 and DatasetPage.isDatasetPublishPopupCustomTextOnAllVersions()}">
-                            <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetPublishCustomText)}" escape="false"/>
-                        </div>
-                        <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.minorUpdate}">
-                            <p class="help-block">
-                                #{bundle['dataset.selectVersionNumber']}
+                        <ui:fragment rendered="#{releaseDraft}">
+                            <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.minorUpdate}">
+                                <p class="help-block">
+                                    #{bundle['dataset.selectVersionNumber']}
+                                </p>
+                                <p:selectOneRadio id="options" value="#{DatasetPage.releaseRadio}">
+                                    <f:selectItem itemLabel="#{bundle['dataset.minorRelease']} (#{DatasetPage.datasetNextMinorVersion})" itemValue="1" />
+                                    <f:selectItem itemLabel="#{bundle['dataset.majorRelease']} (#{DatasetPage.datasetNextMajorVersion})" itemValue="2" />
+                                    <c:if test="#{dataverseSession.user.isSuperuser()}">
+                                        <f:selectItem rendered="#" itemLabel="#{bundle['dataset.updateRelease']}" itemValue="3" />
+                                    </c:if>
+                                </p:selectOneRadio>
+                            </ui:fragment>
+                            <p>
+                                <h:outputFormat value="#{bundle['dataset.majorRelease.tip']}" rendered="#{!DatasetPage.dataset.latestVersion.minorUpdate}">
+                                    <f:param value="#{DatasetPage.datasetNextMajorVersion}"/>
+                                </h:outputFormat>
                             </p>
-                            <p:selectOneRadio id="options" value="#{DatasetPage.releaseRadio}">
-                                <f:selectItem itemLabel="#{bundle['dataset.minorRelease']} (#{DatasetPage.datasetNextMinorVersion})" itemValue="1" />
-                                <f:selectItem itemLabel="#{bundle['dataset.majorRelease']} (#{DatasetPage.datasetNextMajorVersion})" itemValue="2" />
-                                <c:if test="#{dataverseSession.user.isSuperuser()}">
-                                    <f:selectItem rendered="#" itemLabel="#{bundle['dataset.updateRelease']}" itemValue="3" />
-                                </c:if>
-                            </p:selectOneRadio>
                         </ui:fragment>
-                        <p>
-                            <h:outputFormat value="#{bundle['dataset.majorRelease.tip']}" rendered="#{!DatasetPage.dataset.latestVersion.minorUpdate}">
-                                <f:param value="#{DatasetPage.datasetNextMajorVersion}"/>
-                            </h:outputFormat>
-                        </p>
+                        <c:if test="#{showPublishLink}">
+                            <ui:include src="datasetLicenseInfoFragment.xhtml" />
+                        </c:if>
+                        <ui:fragment  rendered="#{versionNoteEnabled}">
+                            <div class="form-group">
+                                <label for="versionNote" class="col-sm-3 control-label">
+                                    #{bundle['dataset.version.versionNote.addEdit']}
+                                </label>
+                                <p:inputTextarea styleClass="col-sm-9" id="versionNote" rows="4" value="#{DatasetPage.publishDialogVersionNote}" title="#{bundle['dataset.version.versionNote.title']}" maxlength="1000" widgetVar="versionNote"
+                                             cols="70" counter="display" counterTemplate="{0} characters remaining." autoResize="false"
+                                             required="false"/>
+                            </div>
+                        </ui:fragment>
+                        <ui:fragment  rendered="#{publishDataset}">
+                            <div class="form-group">
+                                <p class="col-sm-12 help-block">#{bundle['dataset.publish.terms.help.tip']}</p>
+                            </div>
+                        </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" 
-                                             rendered="#{DatasetPage.dataset.latestVersion.minorUpdate}"
-                                             onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseDraft}"/>
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" 
-                                             rendered="#{!DatasetPage.dataset.latestVersion.minorUpdate}"
-                                             onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseMajor}" immediate="true"/>
-                            <button class="btn btn-link" onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" type="button">                              
+                            <p:commandButton rendered="#{valid}" styleClass="btn btn-default" value="#{bundle.continue}" 
+                                             onclick="PF('publishDataset').hide();
+                                                     PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseDataset}" />
+                            <button class="btn btn-link" onclick="PF('publishDataset').hide();
+                                    PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
@@ -1517,12 +2051,13 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('mayNotRelease').hide();PF('blockDatasetForm').hide();" type="button">                              
+                            <button class="btn btn-default" onclick="PF('mayNotRelease').hide();
+                                    PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.close}
                             </button>
                         </div>
                     </p:dialog>
-                    <p:dialog id="maynotPublishParent" header="#{bundle['dataset.publish.header']}" widgetVar="maynotPublishParent" modal="true">
+                    <p:dialog id="maynotPublishParent" header="#{bundle['dataset.publish.header']}" widgetVar="maynotPublishParent" modal="true"  rendered="#{DatasetPage.dataset.owner.owner != null}">
                         <p class="text-danger">
                             <span class="glyphicon glyphicon-exclamation-sign"/>
                             <h:outputFormat value="#{bundle['dataset.mayNotPublish.twoGenerations']}" escape="false">
@@ -1539,48 +2074,187 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('maynotPublishParent').hide();PF('blockDatasetForm').hide();" type="button">                              
+                            <button class="btn btn-default" onclick="PF('maynotPublishParent').hide();
+                                    PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.close}
                             </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="sendBackToContributor" header="#{bundle['dataset.rejectBtn']}" widgetVar="sendBackToContributor" modal="true">
+                    <ui:param name="disableReasonField" value="#{FeatureFlags.DISABLE_RETURN_TO_AUTHOR_REASON.enabled()}"/>
                         <p class="text-warning">
-                            <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.rejectMessage']}
+                            <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.rejectMessage']} #{disableReasonField ? '':bundle['dataset.rejectMessageReason']}
                         </p>
-                        <ui:remove>
-                        <!--FIXME update for new comments table -->
-                        <p:inputTextarea id="returnReason" rows="3" value="#{DatasetPage.workingVersion.returnReason}" maxlength="200" widgetVar="returnReason"
-                                         cols="70" counter="display" counterTemplate="{0} characters remaining." autoResize="false"
-                                         requiredMessage="#{bundle['dataset.reject.enterReason.error']}"/>
-                        <!--FIXME validation error msg for returnReason was in confirmDialog using testReturnReason() in commandButton below but all that was removed
-                                  as it did not look like the usual validation method, added preferred requiredMessage attribute to inputTextarea above, need wiring #5717-->
-                        <p>
-                            <h:outputText id="display"/>
-                        </p>
-                        <p:watermark for="returnReason" value="#{bundle['dataset.rejectWatermark']}" id="returnReasonwatermark"/>
-                        </ui:remove>
+                        
+                        <ui:fragment  rendered="#{!disableReasonField}">
+                            <p:inputTextarea id="returnReason" rows="4" value="#{DatasetPage.returnReason}" title="#{bundle['dataset.rejectMessage.label']}" maxlength="2000" widgetVar="returnReason"
+                                             cols="70" counter="display" counterTemplate="{0} characters remaining." autoResize="false"
+                                             required="#{param['DO_RETURN_TO_AUTHOR_VALIDATION']}"
+                                             requiredMessage="#{bundle['dataset.reject.enterReason.error']}"/>
+                            <p>
+                                <h:outputText id="display"/>
+                            </p>
+                            <p:watermark for="returnReason" value="#{bundle['dataset.rejectWatermark']}" id="returnReasonWatermark"/>
+                            <h:message for="returnReason" styleClass="bg-danger text-danger"/>
+                        </ui:fragment>
+                        
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('sendBackToContributor').hide()" action="#{DatasetPage.sendBackToContributor}"/>
-                            <button class="btn btn-link" onclick="PF('sendBackToContributor').hide();PF('blockDatasetForm').hide();" type="button">                              
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}"
+                                             update="@form"
+                                             oncomplete="PF('sendBackToContributor').show();if (args &amp;&amp; !args.validationFailed) returnToAuthorCommand();">
+                                <f:param name="DO_RETURN_TO_AUTHOR_VALIDATION" value="true"/>
+                            </p:commandButton>
+                            <button class="btn btn-link" onclick="PF('sendBackToContributor').hide();
+                                    PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
                     </p:dialog>
-                    <p:remoteCommand name="returnToAuthorCommand" action="#{DatasetPage.sendBackToContributor}"/>                  
+                    <p:dialog id="curationStatusHistoryDialog" header="#{bundle['dataset.curationStatusHistory']}"
+                            widgetVar="curationStatusHistoryDialog" modal="true" responsive="true">
+                        <p:dataTable value="#{version.curationStatuses}" var="status"
+                                 styleClass="margin-bottom-half" rowIndexVar="index">
+                            <p:column headerText="#{bundle['dataset.curationStatus']}">
+                                <h:outputText value="#{status.label}"/>
+                            </p:column>
+                            <p:column headerText="#{bundle['dataset.curationDate']}">
+                                <h:outputText value="#{status.createTime}">
+                                    <f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss" timeZone="#{TimeZone.default}"/>
+                                </h:outputText>
+                            </p:column>
+                            <p:column headerText="#{bundle['dataset.curationAssigner']}">
+                                <h:outputText value="#{status.authenticatedUser.name}"/>
+                            </p:column>
+                        </p:dataTable>
+                    </p:dialog>
+                    <p:dialog id="versionNoteId" styleClass="smallPopUp" header="#{bundle['dataset.versionNote.header']}" widgetVar="editVersionNoteDialog" modal="true">
+                        <p:fragment id="noteHelpPanel" rendered="#{versionNoteEnabled}">
+                            <p class="help-block">
+                                <h:outputFormat value="#{bundle['dataset.versionNote.tip']}" escape="false">
+                                    <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                    <f:param value="#{systemConfig.guidesVersion}"/>
+                                </h:outputFormat>
+                            </p>
+                            <div class="form-group">
+                                <label for="versionNoteInTable" class="col-sm-3 control-label">
+                                    #{bundle['dataset.version.versionNote.addEdit']}
+                                </label>
+                                <p:inputTextarea styleClass="col-sm-9" id="versionNoteInTable" rows="4" value="#{version.versionNote}" title="#{bundle['dataset.version.versionNote.title']}" maxlength="1000" widgetVar="versionNoteInTable"
+                                             cols="70" counter="display" counterTemplate="{0} characters remaining." autoResize="false"
+                                             required="false"/>
+                            </div>
+                            <div class="button-block">
+                                <p:commandButton rendered="#{valid}" styleClass="btn btn-default" value="#{bundle.saveChanges}"
+                                             onclick="PF('editVersionNoteDialog').hide();
+                                                     PF('blockDatasetForm').hide();" action="#{DatasetPage.saveVersionNote()}" update=":datasetForm,:messagePanel"/>
+                                <button class="btn btn-link" onclick="PF('editVersionNoteDialog').hide();
+                                        PF('blockDatasetForm').hide();" type="button">
+                                    #{bundle.cancel}
+                                </button>
+                            </div>
+                        </p:fragment>
+                    </p:dialog>
+                    <ui:fragment rendered="#{empty DatasetPage.editMode}">
+                      <script src="https://cdn.jsdelivr.net/npm/citation-js"
+                          type="text/javascript"></script>
+                      <script>
+                          const Cite = require('citation-js');
+                          let cite = new Cite(#{version.getCitation("CSL", true, false)});
+                      </script>
+                      <p:dialog id="cslCitation" header="#{bundle['dataset.cite.cslDialog.title']}"
+                          widgetVar="cslCitationDialog" dynamic="true" modal="true">
+                        <ui:param name="requestedCSL" value="#{DatasetPage.requestedCSL}"/>
+                        <o:importFunctions type="edu.harvard.iq.dataverse.util.CSLUtil" />
+                        <o:importFunctions type="de.undercouch.citeproc.CSL" />
+                        <o:importFunctions
+                            type="edu.harvard.iq.dataverse.pidproviders.PidUtil" />
+                        <p:outputLabel for="@next" value="#{bundle['dataset.cite.cslDialog.select']}"/>
+                        <p:selectOneMenu value="#{requestedCSL}"
+                            onchange="updateCSLCitation()" id="select_CSL_Style"
+                            styleClass="form-control"
+                            style="width:auto !important; max-width:100%; min-width:200px;"
+                            filter="true" filterMatchMode="contains">
+                            <f:selectItems value="#{CSLUtil:getSupportedStyles(dataverseSession.localeCode)}"
+                                var="cslStyle" itemLabel="#{cslStyle}" itemValue="#{cslStyle}" />
+                        </p:selectOneMenu>
+                        <p:outputLabel id="cslLabel" for="@next" value="#{bundle['dataset.cite.cslDialog.citation'].replace('{0}', requestedCSL)}"/>
+                        <p:outputPanel id="cslOutput">
+                            <script>
+                                Cite.CSL.register.addTemplate("#{requestedCSL}",
+                                        "#{CSLUtil:getCitationFormat((requestedCSL == '') ? 'apa' : requestedCSL)}");
+                                
+                                document.getElementById('datasetForm:cslOutput').innerHTML = cite.format("bibliography", {
+                                    format: "html",
+                                    template: "#{requestedCSL}",
+                                    lang: "#{dataverseSession.localeCode}"
+                                })
+                            </script>
+                            <h:outputText value="#{bundle['dataset.cite.cslDialog.generating']}"/>
+                        </p:outputPanel>
+                        <span class="glyphicon glyphicon-copy btn-copy"
+                                    data-toggle="tooltip" data-placement="top" data-html="true"
+                                    data-clipboard-action="copy"
+                                    data-clipboard-target=".csl-entry"
+                                    title="#{bundle['dataset.cite.cslDialog.copy']}"></span>
+                        <p:commandButton
+                            value="#{bundle['file.dataFilesTab.button.direct']}"
+                            id="updateCSL" style="display:none" update=":datasetForm:cslOutput, :datasetForm:cslLabel">
+                        </p:commandButton>
+                        <div class="button-block">
+                            <button class="btn btn-link" onclick="PF('cslCitationDialog').hide();"
+                                type="button">#{bundle['dataset.cite.cslDialog.close']}</button>
+                        </div>
+                      </p:dialog>
+                    </ui:fragment>
+                    <p:remoteCommand name="returnToAuthorCommand" oncomplete="PF('sendBackToContributor').hide();" update=":messagePanel" actionListener="#{DatasetPage.sendBackToContributor}"/>
+                    <p:remoteCommand name="linkEditTerms"   actionListener="#{DatasetPage.edit('LICENSE')}" update="@form,:datasetForm,:messagePanel">
+                        <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+                    </p:remoteCommand>
+                    <p:remoteCommand name="editMedatdataCommand"   actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:datasetForm,:messagePanel">
+                        <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+                    </p:remoteCommand>
+                    <p:remoteCommand name="datasetSaveCommand" action="#{DatasetPage.save()}" update=":datasetForm,:messagePanel"/>
                     <!-- END: Publish/Submit for Review Dialogs -->
                 </h:form>
+                <c:set var="descriptionText" value="#{DatasetPage.datasetVersionUI.description.datasetFieldType.localeTitle}" />
                 <script>
                     //<![CDATA[
                     $(document).ready(function () {
-                        popoverHTML('#{bundle.htmlAllowedTitle}');
+                        popoverHTML('#{bundle.htmlAllowedTitle}', '#{bundle.htmlAllowedTags}');
+                        summaryDescTruncation();
                     });
+                    function summaryDescTruncation() {
+                        // truncate summary description, contentTruncate function in dv_rebind_bootstrap_ui.js
+                        // add summary desc row id to pass as selector param
+                        var descId = 'dsDescription td > div';
+                        // add metadata dynamic label text, tooltip text from bundle as param
+                        var truncMoreBtn = '#{of:format1(bundle.truncateMoreBtn, descriptionText)}';
+                        var truncMoreTip = '#{of:format1(bundle.truncateMoreTip, descriptionText)}';
+                        var truncLessBtn = '#{of:format1(bundle.truncateLessBtn, descriptionText)}';
+                        var truncLessTip = '#{of:format1(bundle.truncateLessTip, descriptionText)}';
+
+                        // pass bundle text variabls as params to function
+                        contentTruncate(descId, truncMoreBtn, truncMoreTip, truncLessBtn, truncLessTip);
+                    }
                     function openDialog() {
                         PF('details').show();
                     }
                     function openCompareTwo() {
                         PF('compareTwo').show();
                     }
+                    function editTerms(){  
+                        linkEditTerms();
+                    }
+                    function editMetadata(){                         
+                        var validTOA = document.getElementById("datasetForm:validTermsofAccess").value;
+                        if (validTOA === 'false'){                            
+                            PF('blockDatasetForm').show();
+                            PF('accessPopup').show();
+                        } else {
+                            editMedatdataCommand();
+                        }                            
+                    }
+                    
                     function testCheckBoxes() {
                         var count = PF('versionsTable').getSelectedRowsCount();
                         if (count !== 2) {
@@ -1589,67 +2263,84 @@
                             $('button[id$="compareVersions"]').trigger('click');
                         }
                     }
-                    function testFilesSelectedForRestriction() {
+                    function testFilesSelected() {
                         var count = PF('filesTable').getSelectedRowsCount();
-                        if (count === 0) {
-                            PF('selectFilesForRestrict').show();
+                        if (count == 0) {
+                            PF('selectFiles').show();
                         } else {
-                            PF('accessPopup').show();
+                            return true;
                         }
                     }
-                    function testFilesSelectedForTags() {
-                        var count = PF('filesTable').getSelectedRowsCount();
-                        if (count === 0) {
-                            PF('selectFilesForEditTags').show();
-                        } else {
-                            refreshTagsCommand();
-                        }
-                    }
-                    function testFilesSelectedForDelete() {
-                        var count = PF('filesTable').getSelectedRowsCount();
-                        if (count === 0) {
-                            PF('selectFilesForDelete').show();
+                    function testTermsOfAccess() {
+                        var valid = document.getElementById("datasetForm:validTermsofAccess").value;
+                        if (valid === false) {
+                            PF('accessPopup').show();
+                            return false;
                         } else {
-                            PF('deleteSelectedFileConfirmation').show();
+                            return true;
                         }
                     }
-                    function testFilesSelectedForEditMetadata() {
-                        var count = PF('filesTable').getSelectedRowsCount();
-                        if (count === 0) {
-                            PF('selectFilesForEditMetadata').show();
-                        } //else {
-                        // I commented out the code below; if there's
-                        // 1 or more file selected, I don't want this
-                        // method to activate the p:remoteCommand that
-                        // issues the redirect to the edit page (or
-                        // do anything else for that matter). Doing
-                        // it this way was, for some reason, causing
-                        // this page to still try to render (??), in
-                        // some partial, half-baked state - with no
-                        // workingVersion present, etc. - that resulted
-                        // in some NULL pointers in the logs... So,
-                        // instead, the redirect will be done by the
-                        // direct action= attribute in the original
-                        // commandButton. -- L.A. 4.2.1
-                        //openEditFilesPageCommand();
-                        //}
-                    }
                     function updateTemplate() {
                         $('button[id$="updateTemplate"]').trigger('click');
                     }
-                    function checkNewlyRestricted() {
-                        if ($('input[id$="showAccessPopup"]').val() === 'true') {
-                            PF('accessPopup').show();
-                        } else {
-                            $('button[id$="datasetSave"]').trigger('click');
+                    function updateCSLCitation() {
+                        $('button[id$="updateCSL"]').trigger('click');
+                    }
+                    function updateOwnerDataverse() {
+                        $('button[id$="updateOwnerDataverse"]').trigger('click');
+                    }
+                    
+                    function showPopup(isTransfer) {
+                        var outcome = document.getElementById("datasetForm:validateFilesOutcome").value;
+                        if (outcome ==='Mixed'){
+                            if(isTransfer) {
+                               PF('globusTransferMixed').show();
+                            } else {
+                                PF('downloadMixed').show();
+                            }
+                        }
+                        if (outcome ==='FailEmpty'){
+                            PF('selectFilesForDownload').show();
+                        }
+                        if (outcome ==='FailSize'){
+                            PF('downloadTooLarge').show();
+                        }
+                        if (outcome ==='FailRestricted'){
+                            if(isTransfer) {
+                                PF('transferInvalid').show();
+                             } else {
+                                PF('downloadInvalid').show();
+                             }
+                        }
+                        if (outcome ==='GuestbookRequired'){
+                            PF('guestbookAndTermsPopup').show();
                         }
                     }
-                    function updateHiddenReason(textArea) {
-                        $('input[id$="hiddenReasonInput"]').val(textArea.value);
+                    
+                    function testTOADatasetPage() {
+                        var termsofAccessHidden, fileAccessRequestHidden;
+                        try{
+                            termsofAccessHidden = document.getElementById("datasetForm:tabView:termsofAccessHiddenLT").value;
+                            fileAccessRequestHidden  = document.getElementById("datasetForm:tabView:fileAccessRequestHiddenLT").value;
+
+                            if ('#{DatasetPage.isHasRestrictedFiles()}' === 'true' && fileAccessRequestHidden === 'false' && termsofAccessHidden === '') {
+                                //Not compliant show error keep page open...
+                            } else {
+                                PF('blockDatasetForm').show();
+                                datasetSaveCommand();
+                            }
+                        }
+                        catch (error){
+                            //terms not present so save...
+                            PF('blockDatasetForm').show();
+                            datasetSaveCommand();                        
+                        }                         
+
                     }
+                                        
                     //]]>
                 </script>
             </ui:define>
         </ui:composition>
     </h:body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/webapp/datasetFieldForEditFragment.xhtml b/src/main/webapp/datasetFieldForEditFragment.xhtml
index aa6ff0b9d59..d09a247c7a8 100644
--- a/src/main/webapp/datasetFieldForEditFragment.xhtml
+++ b/src/main/webapp/datasetFieldForEditFragment.xhtml
@@ -1,30 +1,83 @@
-<div
-    xmlns:h="http://java.sun.com/jsf/html"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:c="http://java.sun.com/jsp/jstl/core"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:jsf="http://xmlns.jcp.org/jsf">
+<ui:composition
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:c="http://java.sun.com/jsp/jstl/core"
+        xmlns:p="http://primefaces.org/ui"
+        xmlns:pt="http://java.sun.com/jsf/passthrough"
+        xmlns:jsf="http://xmlns.jcp.org/jsf">
 
-    <!-- input text start -->
-    <span id="pre-input-#{dsf.datasetFieldType.name}" class="pre-input-tag"/>
-
-    <p:inputText value="#{dsfv.valueForEdit}" id="inputText"
+    <ui:remove>
+        <!-- input text start UPDATE: UI:REMOVE applied due to duplicate ID errors, left code as reference in case test scripts complain -->
+        <span id="pre-input-#{dsf.datasetFieldType.name}" class="pre-input-tag"/></ui:remove>
+    <ui:fragment rendered="#{cvoc==null}">
+        <p:inputText value="#{dsfv.valueForEdit}" id="inputText" pt:aria-required="#{dsf.required}"
                  styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE'  ? 'datasetfield-title' : ''}"
                  rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
                              and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'STRING'
                              or dsfv.datasetField.datasetFieldType.fieldType == 'INT'
                              or dsfv.datasetField.datasetFieldType.fieldType == 'FLOAT'
                              or dsfv.datasetField.datasetFieldType.fieldType == 'URL'
                              or dsfv.datasetField.datasetFieldType.fieldType == 'DATE'
-                             or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}"/>
-
-    <p:watermark for="inputText" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
-
-    <p:inputTextarea value="#{dsfv.valueForEdit}" id="description"
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}"
+                 onkeypress="return event.keyCode !== 13;" >
+            <c:if test="#{dsfvIndex!=0}">
+                <f:passThroughAttribute name="aria-label" value="#{bundle['dataset.additionalEntry']}" />
+            </c:if>
+        </p:inputText>
+        <p:watermark for="inputText" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
+    </ui:fragment>
+    <ui:fragment rendered="#{cvoc!=null and cvoc.getString('term-uri-field').equals(dsfv.datasetField.datasetFieldType.name)}">
+        <p:inputText value="#{dsfv.valueForEdit}" id="cvocInputText" pt:aria-required="#{dsf.required}"
+                 styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE'  ? 'datasetfield-title' : ''}"
+                 rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
+                             and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'STRING'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'INT'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'FLOAT'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'URL'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'DATE'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}">
+            <c:if test="#{dsfvIndex!=0}">
+                <f:passThroughAttribute name="aria-label" value="#{bundle['dataset.additionalEntry']}" />
+            </c:if>
+            <f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvoc.getString('languages'))}"/>
+            <f:passThroughAttribute name="data-cvoc-service-url" value="#{cvoc.getString('cvoc-url','')}"/>
+            <f:passThroughAttribute name="data-cvoc-headers" value="#{cvoc.containsKey('headers') ? cvoc.get('headers').toString() : '{}'}"/>
+            <f:passThroughAttribute name="data-cvoc-protocol" value="#{cvoc.getString('protocol','')}"/>
+            <f:passThroughAttribute name="data-cvoc-filter" value="#{cvoc.getString('term-parent-uri','')}"/>
+            <f:passThroughAttribute name="data-cvoc-vocabs" value="#{cvoc.get('vocabs').toString()}"/>
+            <f:passThroughAttribute name="data-cvoc-allowfreetext" value="#{cvoc.getBoolean('allow-free-text', false)}"/>
+            <f:passThroughAttribute name="data-cvoc-parent" value="#{cvoc.getString('field-name','')}"/>
+            <f:passThroughAttribute name="data-cvoc-managedfields" value="#{cvoc.get('managed-fields').toString()}"/>
+        </p:inputText>
+    </ui:fragment>
+    <ui:fragment rendered="#{cvoc!=null and !cvoc.getString('term-uri-field').equals(dsfv.datasetField.datasetFieldType.name)}">
+        <p:inputText value="#{dsfv.valueForEdit}" id="cvocInputText2" pt:aria-required="#{dsf.required}"
+                 styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE'  ? 'datasetfield-title' : ''}"
+                 rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
+                             and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'STRING'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'INT'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'FLOAT'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'URL'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'DATE'
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}">
+            <c:if test="#{dsfvIndex!=0}">
+                <f:passThroughAttribute name="aria-label" value="#{bundle['dataset.additionalEntry']}" />
+            </c:if>
+            <f:passThroughAttribute name="data-cvoc-managed-field" value="#{dsfv.datasetField.datasetFieldType.name}"/>
+        </p:inputText>
+    </ui:fragment>
+    
+    <p:inputTextarea value="#{dsfv.valueForEdit}" id="description" pt:aria-required="#{dsf.required}"
                      rows="5" cols="60" styleClass="form-control"
-                     rendered="#{dsfv.datasetField.datasetFieldType.fieldType == 'TEXTBOX'}"/>
-
+                     rendered="#{dsfv.datasetField.datasetFieldType.fieldType == 'TEXTBOX'}">
+        <c:if test="#{dsfvIndex!=0}">
+            <f:passThroughAttribute name="aria-label" value="#{bundle['dataset.additionalEntry']}" />
+        </c:if>
+        </p:inputTextarea>
     <p:watermark for="description" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
 
     <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{dsfvIndex eq 0 and !empty dsfv.datasetField.validationMessage}">
@@ -40,7 +93,6 @@
         <input type="button" id="replicationDataButton"
                class="btn btn-default" value="#{bundle['dataset.AddReplication']}"
                onclick="replicationFor();return false;"/>
-
         <script>
             //<![CDATA[
             function replicationFor() {
@@ -50,4 +102,4 @@
             //]]>
         </script>
     </ui:fragment>
-</div>
\ No newline at end of file
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/datasetLicenseInfoFragment.xhtml b/src/main/webapp/datasetLicenseInfoFragment.xhtml
new file mode 100644
index 00000000000..a1bd604aa6a
--- /dev/null
+++ b/src/main/webapp/datasetLicenseInfoFragment.xhtml
@@ -0,0 +1,124 @@
+<ui:composition 
+xmlns="http://www.w3.org/1999/xhtml"
+xmlns:h="http://java.sun.com/jsf/html"
+xmlns:ui="http://java.sun.com/jsf/facelets"
+xmlns:pt="http://java.sun.com/jsf/passthrough"
+xmlns:o="http://omnifaces.org/ui"
+xmlns:jsf="http://xmlns.jcp.org/jsf">
+    <!-- START license info -->
+    <div class="form-group terms">
+        <div class="form-group">
+            <label for="metadata_Terms" class="col-sm-3 control-label">
+                #{bundle['file.dataFilesTab.terms.list.license']}
+            </label>
+            <div class="col-sm-9">
+                <p>
+                    <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
+                    <img src="#{DatasetUtil:getLicenseIcon(DatasetPage.workingVersion)}"
+                        title="#{DatasetUtil:getLicenseDescription(DatasetPage.workingVersion)}" style="display: none"
+                        onload="this.style.display='inline'" />
+                    <a href="#{DatasetUtil:getLicenseURI(DatasetPage.workingVersion)}"
+                        title="#{DatasetUtil:getLicenseDescription(DatasetPage.workingVersion)}"
+                        target="_blank">#{DatasetUtil:getLicenseName(DatasetPage.workingVersion)}
+                    </a>
+                    <ui:fragment rendered="#{empty DatasetPage.workingVersion.termsOfUseAndAccess.license}">
+                        <h:outputText rendered="#{!datasetVersionServiceBean.isVersionDefaultCustomTerms(DatasetPage.workingVersion)}" value="#{bundle['file.dataFilesTab.terms.list.license.customterms.txt']}"
+                            escape="false" />
+                    </ui:fragment>
+                </p>
+            </div>
+        </div>
+        <ui:fragment rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.license}">
+            <div class="form-group"
+                jsf:rendered="#{!empty DatasetUtil:getLocalizedLicenseDetails(DatasetPage.workingVersion.termsOfUseAndAccess.license,'DESCRIPTION')} }">
+                <label for="metadata_Terms" class="col-sm-3 control-label">
+                    #{bundle['dataset.publish.terms.description']}
+                </label>
+                <div class="col-sm-9">
+                    <h:outputText value="#{DatasetUtil:getLocalizedLicenseDetails(DatasetPage.workingVersion.termsOfUseAndAccess.license,'DESCRIPTION')}" />
+                </div>
+            </div>
+        </ui:fragment>
+        <ui:fragment rendered="#{empty DatasetPage.workingVersion.termsOfUseAndAccess.license}">
+            <div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.termsOfUse}">
+                <label for="termsOfUse" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
+                </label>
+                <h:outputText id="termsOfUse" class="col-sm-9"
+                    value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.termsOfUse)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.confidentialityDeclaration}">
+                <label for="confidentialityDeclaration" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
+                </label>
+                <h:outputText id="confidentialityDeclaration" class="col-sm-9"
+                    value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.confidentialityDeclaration)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.specialPermissions}">
+                <label for="specialPermissions" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
+                </label>
+                <h:outputText id="specialPermissions" class="col-sm-9"
+                    value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.specialPermissions)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.restrictions}">
+                <label for="restrictions" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
+                </label>
+                <h:outputText id="restrictions" class="col-sm-9"
+                    value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.restrictions)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.citationRequirements}">
+                <label for="citationRequirements" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
+                </label>
+                <h:outputText id="citationRequirements" class="col-sm-9"
+                    value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.citationRequirements)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.depositorRequirements}">
+                <label for="depositorRequirements" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
+                </label>
+                <h:outputText id="depositorRequirements" class="col-sm-9"
+                    value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.depositorRequirements)}"
+                    escape="false" />
+            </div>
+            <div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.conditions}">
+                <label for="conditions" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
+                </label>
+                <h:outputText id="conditions" class="col-sm-9"
+                    value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.conditions)}"
+                    escape="false" />
+            </div>
+            <div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.disclaimer}">
+                <label for="disclaimer" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
+                </label>
+                <h:outputText id="disclaimer" class="col-sm-9"
+                    value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.disclaimer)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfAccess and DatasetPage.hasRestrictedFile()}">
+                <label jsf:for="termsOfAccess" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
+                </label>
+                <h:outputText id="termsOfAccess" class="col-sm-6"
+                    value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfAccess)}"
+                    escape="false" />
+            </div>
+        </ui:fragment>
+    </div>
+    <!-- END license info -->
+</ui:composition>
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 6d264f84415..4ffac1c24b3 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -10,20 +10,20 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf">
     <h:head>
     </h:head>
-
     <h:body>
         <ui:composition template="/dataverse_template.xhtml">
             <ui:param name="pageTitle" value="#{empty DataversePage.dataverse.name ? bundle.new : DataversePage.dataverse.name}"/>
             <ui:param name="dataverse" value="#{DataversePage.dataverse}"/>
+            <ui:param name="editModeDataverse" value="#{DataversePage.editMode}"/>
             <ui:define name="meta_header">
             <meta name="description" content="#{MarkupChecker:stripAllTags(DataversePage.dataverse.description)}"/>
             </ui:define>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
-                    <f:viewParam name="id" value="#{DataversePage.dataverse.id}"/>
-                    <f:viewParam name="alias" value="#{DataversePage.dataverse.alias}"/>
+                    <f:viewParam name="id" value="#{DataversePage.id}"/>
+                    <f:viewParam name="alias" value="#{DataversePage.alias}"/>
                     <f:viewParam name="ownerId" value="#{DataversePage.ownerId}"/>
-                    <f:viewParam name="editMode" value="#{DataversePage.editMode}"/>
+                    <o:viewParam name="editMode" value="#{DataversePage.editMode}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                     <f:viewAction action="#{DataversePage.init}"/>
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(DataversePage.dataverse)}"/>
@@ -43,182 +43,283 @@
                     <f:viewParam name="sort" value="#{SearchIncludeFragment.sortField}"/>
                     <f:viewParam name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                     <f:viewParam name="page" value="#{SearchIncludeFragment.page}"/>
-                    <f:viewParam name="debug" value="#{SearchIncludeFragment.debug}"/>
+                    <f:viewParam name="debug" value="#{dataverseSession.debug}"/>
                     <f:viewParam name="adjustFacetName" value="#{SearchIncludeFragment.adjustFacetName}"/>
                     <f:viewParam name="adjustFacetNumber" value="#{SearchIncludeFragment.adjustFacetNumber}"/>
                     <f:viewAction action="#{SearchIncludeFragment.search()}" />
                 </f:metadata>
-
+            </ui:define>
+            <ui:define name="body">
+                <f:loadBundle basename="ValidationMessages" var="valMsg"/>
                 <h:form id="dataverseForm">
                     <!-- Edit Mode -->
                     <ui:fragment rendered="#{DataversePage.editMode == 'INFO' or DataversePage.editMode == 'CREATE'}">
                         <p:focus context="dataverseForm"/>
-                        <!-- Sample Block -->
-                        <!-- Name Panel -->
+                        <div class="row">
+                            <div class="col-xs-6 form-group">
+                                <span class="glyphicon glyphicon-asterisk text-danger"/> <h:outputText value="#{bundle['dataset.asterisk.tip']}"/>
+                            </div>
+                        </div>
                         <!-- Edit Info Panel -->
+                        <div class="row" jsf:rendered="#{DataversePage.ownerId != null}">
+                            <div class="col-md-6 form-group">
+                                <p:outputLabel for="#{DataversePage.editMode == 'CREATE' ? 'selectHostDataverse' : 'hostDataverseStatic'}" styleClass="control-label">
+                                    #{bundle.hostDataverse}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
+                                </p:outputLabel>
+                                <div class="form-col-container">
+                                    <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
+                                        <p jsf:id="hostDataverseStatic" class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
+                                        <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic_hidden"/>
+                                    </ui:fragment>
+                                    <p:autoComplete id="selectHostDataverse"
+                                                    rendered="#{DataversePage.editMode == 'CREATE'}"
+                                                    placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
+                                                    emptyMessage="#{bundle['dataverse.host.autocomplete.nomatches']}"
+                                                    scrollHeight="180" forceSelection="true" 
+                                                    minQueryLength="1" queryDelay="1000"
+                                                    value="#{DataversePage.dataverse.owner}" 
+                                                    multiple="false"
+                                                    completeMethod="#{DataversePage.completeHostDataverseMenuList}"
+                                                    required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
+                                                    styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                    var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter">
+                                        <p:column>
+                                            <h:outputText value="#{hostDataverse.displayName}"/> 
+                                        </p:column>
+                                        <p:column>
+                                            <h:outputText value="#{hostDataverse.alias}"/> 
+                                        </p:column>
+                                        <p:ajax process="@this" event="itemSelect" oncomplete="updateOwnerDataverse()"/>
+                                        <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()"/>
+                                    </p:autoComplete>
+                                    <p:message for="selectHostDataverse"/>
+                                    <p:commandButton id="updateOwnerDataverse"
+                                                     style="display:none"
+                                                     process="@this :dataverseForm:selectHostDataverse"
+                                                     update=":dataverseForm,:breadCrumbPanel"
+                                                     action="#{DataversePage.updateOwnerDataverse()}">
+                                    </p:commandButton>
+                                </div>
+                            </div>
+                        </div>
                         <div class="row">
-                            <div class="col-xs-6 form-group form-col-container">
-                                <label class="col-sm-3 control-label" for="name">
-                                    #{bundle.dataverse} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                            <div class="col-md-6 form-group">
+                                <h:outputLabel for="name" styleClass="control-label">
+                                    #{bundle['dataverse.name']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.title']}"></span>
-                                </label>
-                                <div class="col-sm-9 form-col-container">
-                                    <p:inputText id="name" tabindex="1" styleClass="form-control" value="#{DataversePage.dataverse.name}"/>
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.name.title']}"></span>
+                                </h:outputLabel>
+                                <div class="form-col-container">
+                                    <p:inputText id="name" styleClass="form-control" 
+                                                 value="#{DataversePage.dataverse.name}" required="true" 
+                                                 requiredMessage="#{valMsg['dataverse.name']}"/>
+                                    <p:message for="name" display="text"/>
                                 </div>
                             </div>
-                            <div class="col-xs-6 form-group form-col-container">
-                                <label class="col-sm-3 control-label" for="affiliation">
+                            <div class="col-md-6 form-group">
+                                <h:outputLabel for="affiliation" styleClass="control-label">
                                     #{bundle.affiliation}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.affiliation.title']}"></span>
-                                </label>
-                                <div class="col-sm-9 form-col-container">
-                                    <p:inputText id="affiliation" tabindex="2" styleClass="form-control" value="#{DataversePage.dataverse.affiliation}"/>
+                                </h:outputLabel>
+                                <div class="form-col-container">
+                                    <p:inputText id="affiliation" styleClass="form-control" value="#{DataversePage.dataverse.affiliation}"/>
                                     <p:message for="affiliation" display="text"/>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-xs-6 form-group form-col-container">
-                                <label class="col-sm-3 control-label" for="identifier">
+                            <div class="col-md-6 form-group">
+                                <h:outputLabel for="identifier" styleClass="control-label">
                                     #{bundle.identifier} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.identifier.title']}"></span>
-                                </label>
-                                <div class="col-sm-9 form-col-container">
+                                </h:outputLabel>
+                                <div class="form-col-container">
                                     <div class="input-group">
-                                        <div class="input-group-addon"><span class="small">#{systemConfig.dataverseSiteUrl}/dataverse/</span></div>
-                                        <p:inputText id="identifier" tabindex="3" styleClass="form-control" validator="#{DataversePage.validateAlias}" value="#{DataversePage.dataverse.alias}"/>
+                                        <div class="input-group-addon"><span class="small">#{settingsWrapper.dataverseSiteUrl}/dataverse/</span></div>
+                                        <p:inputText id="identifier" styleClass="form-control" 
+                                                     validator="#{DataversePage.validateAlias}" 
+                                                     value="#{DataversePage.dataverse.alias}" 
+                                                    required ="true" requiredMessage="#{valMsg['dataverse.alias']}"/>
                                     </div>
                                     <p:message for="identifier" display="text"/>
                                 </div>
                             </div>
-                            <div class="col-xs-6 form-group" jsf:rendered="#{DataversePage.ownerId != null}">
-                                <label class="col-sm-3 control-label" for="hostDataverse">
-                                    #{bundle.hostDataverse}
+                            <div class="col-md-6 form-group" jsf:rendered="#{dataverseSession.user.superuser}">
+                                <h:outputLabel for="dataverseStorage" styleClass="control-label">
+                                    #{bundle.storage} 
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
-                                </label>
-                                <div class="col-sm-9 form-col-container">
-                                    <p class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
-                                    <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverse" />
-                                    <ui:remove><!-- removed for beta -->
-                                        <p:selectOneMenu id="hostDataverse" tabindex="2" value="#{DataversePage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                            <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"
-                                                           itemDisabled="#{dv eq DataversePage.dataverse or dv.owners.contains(DataversePage.dataverse)}" />
-                                        </p:selectOneMenu>
-                                    </ui:remove>
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.storage.title']}"></span>
+                                </h:outputLabel>
+                                <div class="form-col-container">
+                                            <h:selectOneMenu id="dataverseStorage" styleClass="form-control" value="#{DataversePage.dataverse.storageDriverId}">
+                                              <f:selectItems value="#{DataversePage.getStorageDriverOptions()}" var="driver" itemLabel="#{driver.getKey()}" itemValue="#{driver.getValue()}"/>
+                                            </h:selectOneMenu>
+                                            <p:message for="dataverseStorage" display="text"/>
+                                </div>
+                            </div>
+                            <div class="col-md-6 form-group" jsf:rendered="#{dataverseSession.user.superuser and DataversePage.getCurationLabelSetOptions().size() >0}">
+                                <h:outputLabel for="dataverseCurationLabels" styleClass="control-label">
+                                    #{bundle.curationLabels} 
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.curationLabels.title']}"></span>
+                                </h:outputLabel>
+                                <div class="form-col-container">
+                                            <h:selectOneMenu id="dataverseCurationLabels" styleClass="form-control" value="#{DataversePage.dataverse.curationLabelSetName}">
+                                              <f:selectItems value="#{DataversePage.getCurationLabelSetOptions()}" var="setName" itemLabel="#{setName.getKey()}" itemValue="#{setName.getValue()}"/>
+                                            </h:selectOneMenu>
+                                            <p:message for="dataverseCurationLabels" display="text"/>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-xs-6 form-group form-col-container">
-                                <div class="form-group clearfix">
-                                    <label class="col-sm-3 control-label" for="dataverseCategory">
-                                        #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
-                                    </label>
-                                    <div class="col-sm-9 form-col-container">
-                                        <h:selectOneMenu id="dataverseCategory" tabindex="5" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
-                                            <f:selectItem id="dvSelect" itemLabel="#{bundle['dataverse.type.selectTab.top']}" itemValue="" />
-                                            <f:selectItem id="dvDepartment" itemLabel="#{bundle['dataverse.type.selectTab.department']}" itemValue="DEPARTMENT" />
-                                            <f:selectItem id="dvJournals" itemLabel="#{bundle['dataverse.type.selectTab.journals']}" itemValue="JOURNALS" />
-                                            <f:selectItem id="dvLab" itemLabel="#{bundle['dataverse.type.selectTab.laboratory']}" itemValue="LABORATORY" />
-                                            <f:selectItem id="dvOrgInst" itemLabel="#{bundle['dataverse.type.selectTab.organizationsAndInsitutions']}" itemValue="ORGANIZATIONS_INSTITUTIONS" />
-                                            <f:selectItem id="dvResearch" itemLabel="#{bundle['dataverse.type.selectTab.researchers']}" itemValue="RESEARCHERS" />
-                                            <f:selectItem id="dvResearchGrp" itemLabel="#{bundle['dataverse.type.selectTab.researchGroup']}" itemValue="RESEARCH_GROUP" />
-                                            <f:selectItem id="dvResearchProj" itemLabel="#{bundle['dataverse.type.selectTab.researchProjects']}" itemValue="RESEARCH_PROJECTS" />
-                                            <f:selectItem id="dvTeaching" itemLabel="#{bundle['dataverse.type.selectTab.teachingCourses']}" itemValue="TEACHING_COURSES" />
-                                            <f:selectItem id="dvUncategorized" itemLabel="#{bundle['dataverse.type.selectTab.uncategorized']}" itemValue="UNCATEGORIZED" />
-                                        </h:selectOneMenu>
-                                        <p:message for="dataverseCategory" display="text"/>
-                                    </div>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <p:fragment>
-                                       <p:autoUpdate />
-                                        <label class="col-sm-3 control-label" for="contactEmail">
-                                            #{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                            <div class="col-md-6 form-group">
+                                <div class="row">
+                                    <div class="col-xs-12 form-group">
+                                        <h:outputLabel for="dataverseCategory" styleClass="control-label">
+                                            #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.email.title']}"></span>
-                                        </label>
-                                        <div class="col-sm-9 form-col-container edit-compound-field">
-                                            <ui:repeat value="#{DataversePage.dataverse.dataverseContacts}" var="contacts" varStatus="valCount">
-                                                <div class="form-group">
-                                                    <div class="col-sm-8 form-col-container">
-                                                        <p:inputText id="contactEmail" tabindex="7" styleClass="form-control" value="#{contacts.contactEmail}">
-                                                            <f:validateBean disabled="#{param['SKIP_VALIDATION']}"/>
-                                                        </p:inputText>
-                                                        <p:message for="contactEmail" display="text"/>
-                                                    </div>
-                                                    <!-- Add / Remove buttons -->
-                                                    <div class="col-sm-4 form-col-container field-add-delete">
-                                                        <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.add}"
-                                                                         actionListener="#{DataversePage.dataverse.addDataverseContact(valCount.index + 1)}"
-                                                                         oncomplete="javascript:bind_bsui_components();">
-                                                            <f:param name="SKIP_VALIDATION" value="true"/>
-                                                            <h:outputText styleClass="glyphicon glyphicon-plus no-text"/>
-                                                        </p:commandLink>
-                                                        <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.delete}"
-                                                                         rendered="#{DataversePage.dataverse.dataverseContacts.size() > 1}"
-                                                                         actionListener="#{DataversePage.dataverse.removeDataverseContact(valCount.index)}"
-                                                                         oncomplete="javascript:bind_bsui_components();">
-                                                            <f:param name="SKIP_VALIDATION" value="true"/>
-                                                            <h:outputText styleClass="glyphicon glyphicon-minus no-text"/>
-                                                        </p:commandLink>
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
+                                        </h:outputLabel>
+                                        <div class="form-col-container">
+                                            <h:selectOneMenu id="dataverseCategory" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}" required="true"
+                                                             requiredMessage="#{valMsg['dataverse.category']}">
+                                                <f:selectItem id="dvSelect" itemLabel="#{bundle['dataverse.type.selectTab.top']}" itemValue="" />
+                                                <f:selectItem id="dvDepartment" itemLabel="#{bundle['dataverse.type.selectTab.department']}" itemValue="DEPARTMENT" />
+                                                <f:selectItem id="dvJournals" itemLabel="#{bundle['dataverse.type.selectTab.journals']}" itemValue="JOURNALS" />
+                                                <f:selectItem id="dvLab" itemLabel="#{bundle['dataverse.type.selectTab.laboratory']}" itemValue="LABORATORY" />
+                                                <f:selectItem id="dvOrgInst" itemLabel="#{bundle['dataverse.type.selectTab.organizationsAndInsitutions']}" itemValue="ORGANIZATIONS_INSTITUTIONS" />
+                                                <f:selectItem id="dvResearch" itemLabel="#{bundle['dataverse.type.selectTab.researchers']}" itemValue="RESEARCHERS" />
+                                                <f:selectItem id="dvResearchGrp" itemLabel="#{bundle['dataverse.type.selectTab.researchGroup']}" itemValue="RESEARCH_GROUP" />
+                                                <f:selectItem id="dvResearchProj" itemLabel="#{bundle['dataverse.type.selectTab.researchProjects']}" itemValue="RESEARCH_PROJECTS" />
+                                                <f:selectItem id="dvTeaching" itemLabel="#{bundle['dataverse.type.selectTab.teachingCourses']}" itemValue="TEACHING_COURSES" />
+                                                <f:selectItem id="dvUncategorized" itemLabel="#{bundle['dataverse.type.selectTab.uncategorized']}" itemValue="UNCATEGORIZED" />
+                                            </h:selectOneMenu>
+                                            <p:message for="dataverseCategory" display="text"/>
+                                        </div>
+                                    </div>
+                                    <div class="col-xs-12 form-group">
+                                        <p:fragment>
+                                            <p:autoUpdate/>
+                                            <p:outputLabel id="contactEmailLabel" styleClass="control-label">
+                                                #{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.email.title']}"></span>
+                                            </p:outputLabel>
+                                            <div class="form-col-container edit-compound-field">
+                                                <ui:repeat value="#{DataversePage.dataverse.dataverseContacts}" var="contacts" varStatus="valCount">
+                                                    <div class="row col-xs-12 form-group">
+                                                        <div class="col-xs-9 form-col-container">
+                                                            <p:inputText id="contactEmail" styleClass="form-control" value="#{contacts.contactEmail}" required="#{param['DO_VALIDATION']}">
+                                                                <f:validateBean disabled="#{param['SKIP_VALIDATION']}"/>
+                                                                <f:passThroughAttribute name="aria-labelledby" value="dataverseForm:contactEmailLabel"/>
+                                                            </p:inputText>
+                                                            <p:message for="contactEmail" display="text"/>
+                                                        </div>
+                                                        <!-- Add / Remove buttons -->
+                                                        <div class="col-xs-3 form-col-container field-add-delete">
+                                                            <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.add}"
+                                                                             actionListener="#{DataversePage.dataverse.addDataverseContact(valCount.index + 1)}">
+                                                                <f:param name="SKIP_VALIDATION" value="true"/>
+                                                                <h:outputText styleClass="glyphicon glyphicon-plus no-text"/>
+                                                            </p:commandLink>
+                                                            <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.delete}"
+                                                                             rendered="#{DataversePage.dataverse.dataverseContacts.size() > 1}"
+                                                                             actionListener="#{DataversePage.dataverse.removeDataverseContact(valCount.index)}">
+                                                                <f:param name="SKIP_VALIDATION" value="true"/>
+                                                                <h:outputText styleClass="glyphicon glyphicon-minus no-text"/>
+                                                            </p:commandLink>
+                                                        </div>
                                                     </div>
-                                                </div>
-                                            </ui:repeat>
+                                                </ui:repeat>
+                                            </div>
+                                        </p:fragment>
+                                    </div>
+                                    <div class="col-md-6 form-group" jsf:rendered="#{DataversePage.getMetadataLanguages().size()>2}">
+                                        <h:outputLabel for="dsMetadataLanguage" styleClass="control-label">
+                                            #{bundle.metadataLanguage} 
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.metadatalanguage.title']}"></span>
+                                        </h:outputLabel>
+                                        <div class="form-col-container">
+                                            <h:selectOneMenu id="dsMetadataLanguage" styleClass="form-control" value="#{DataversePage.dataverse.metadataLanguage}">
+                                                <f:selectItems value="#{DataversePage.getMetadataLanguages()}" var="lang" itemLabel="#{lang.getValue()}" itemValue="#{lang.getKey()}"/>
+                                            </h:selectOneMenu>
+                                            <p:message for="dsMetadataLanguage" display="text"/>
                                         </div>
-                                    </p:fragment>
+                                    </div>
                                 </div>
                             </div>
-                            <div class="col-xs-6 form-group form-col-container">
-                                <label class="col-sm-3 control-label" for="description">
+                            <div class="col-md-6 form-group">
+                                <div class="row">
+                                    <div class="col-xs-12 form-group">
+                                <h:outputLabel for="description" styleClass="control-label">
                                     #{bundle.description}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.description.title']}"></span>
-                                </label>
-                                <div class="col-sm-9 form-col-container">
+                                </h:outputLabel>
+                                <div class="form-col-container">
                                     <p class="help-block">
-                                        <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
-                                            <f:param value="#{bundle.htmlAllowedTags}"/>
-                                        </h:outputFormat>
+                                        <h:outputText value="#{bundle.htmlAllowedMsg}" escape="false"/>
                                     </p>
-                                    <p:inputTextarea id="description" tabindex="6" styleClass="form-control" value="#{DataversePage.dataverse.description}"
+                                    <p:inputTextarea id="description" styleClass="form-control" value="#{DataversePage.dataverse.description}"
                                                     rows="6" cols="50"
                                                     autoResize="false">
                                     </p:inputTextarea>
                                     <p:message for="description" display="text"/>
                                 </div>
+                                </div>
+                                    <div class="col-xs-12 form-group" jsf:rendered="#{DataversePage.getGuestbookEntryOptions().size()>2}">
+                                        <h:outputLabel for="dsGuestbookEntryOption" styleClass="control-label">
+                                            #{bundle.guestbookEntryOption} 
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.guestbookentryatrequest.title']}"></span>
+                                        </h:outputLabel>
+                                        <div class="form-col-container">
+                                            <h:selectOneMenu id="dsGuestbookEntryOption" styleClass="form-control" value="#{DataversePage.dataverse.guestbookEntryAtRequest}">
+                                                <f:selectItems value="#{DataversePage.getGuestbookEntryOptions()}" var="option" itemLabel="#{option.getValue()}" itemValue="#{option.getKey()}"/>
+                                            </h:selectOneMenu>
+                                            <p:message for="dsGuestbookEntryOption" display="text"/>
+                                        </div>
+                                    </div>
+                                    <div class="col-xs-12 form-group" jsf:rendered="#{dataverseSession.user.superuser and DataversePage.getPidProviderOptions().size()>2}">
+                                        <h:outputLabel for="dsPidProviderOption" styleClass="control-label">
+                                            #{bundle.pidProviderOption} 
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.pidProvider.title']}"></span>
+                                        </h:outputLabel>
+                                        <div class="form-col-container">
+                                            <h:selectOneMenu id="dsPidProviderOption" styleClass="form-control" value="#{DataversePage.dataverse.pidGeneratorId}">
+                                                <f:selectItems value="#{DataversePage.getPidProviderOptions()}" var="option" itemLabel="#{option.getValue()}" itemValue="#{option.getKey()}"/>
+                                            </h:selectOneMenu>
+                                            <p:message for="dsPidProviderOption" display="text"/>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
-
                         <hr class="margin-top-half margin-bottom-half"/>
-
                         <!-- Metadata Panel -->
-                        <p:panel styleClass="panelLayoutBlock"  widgetVar="optionBlock" id="optionBlock">
+                        <p:panel id="optionBlock" styleClass="panelLayoutBlock padding-none margin-bottom-half" widgetVar="optionBlock">
                             <p:commandButton id="hiddenRefresh" value="back" style="display:none"
                                              actionListener="#{DataversePage.refresh}"
-                                             update="@widgetVar(optionBlock)" />
-
+                                             update="@widgetVar(optionBlock)"/>
                             <div class="row">
-                                <div class="col-sm-12 form-group">
-                                    <label class="col-sm-3 control-label" for="mdbSelect">#{bundle['dataverse.metadataElements']}</label>
-                                    <div class="col-sm-9">
+                                <div class="col-sm-12 form-group padding-none">
+                                    <div class="col-md-3 control-label highlightBold">#{bundle['dataverse.metadataElements']}</div>
+                                    <div class="col-md-9">
                                         <p class="help-block">#{bundle['dataverse.metadataElements.tip']}</p>
-
-                                        <label class="metadata-blocks-default" for="metadataRoot" jsf:rendered="#{DataversePage.dataverse.owner != null}">
-                                            <h:selectBooleanCheckbox id="metadataRoot" tabindex="7" styleClass="metadata-blocks-default"
+                                        <h:outputLabel styleClass="metadata-blocks-default" for="metadataRoot" rendered="#{DataversePage.dataverse.owner != null}">
+                                            <h:selectBooleanCheckbox id="metadataRoot" styleClass="metadata-blocks-default"
                                                                      value="#{DataversePage.inheritMetadataBlockFromParent}" onclick="updateMetadata(this);">
                                             </h:selectBooleanCheckbox>
                                             <h:outputFormat value="#{bundle['dataverse.metadataElements.from.tip']}">
                                                 <f:param value="#{DataversePage.dataverse.metadataRootDataverseName}"/>
                                             </h:outputFormat>
-                                        </label>
-
+                                        </h:outputLabel>
                                         <p:commandButton value="Direct" id="updateMetadataButton"
                                                          style="display:none"
                                                          update="@widgetVar(optionBlock)"
@@ -227,10 +328,10 @@
                                         </p:commandButton>
                                         <p:commandButton value="Direct" id="resetToInherit"
                                                          style="display:none"
-                                                         update="@all"
+                                                         update="@widgetVar(optionBlock)" 
+                                                         process="@this @widgetVar(optionBlock)"
                                                          action="#{DataversePage.resetToInherit()}">
                                         </p:commandButton>
-
                                         <ui:repeat value="#{DataversePage.allMetadataBlocks}" var="mdb">
                                             <div class="checkbox">
                                                 <label for="#{mdb.idString}">
@@ -241,31 +342,28 @@
                                                         <p:ajax update="@widgetVar(optionBlock)" />
                                                     </input>
                                                     <input type="checkbox" jsf:itemValue="#{mdb}" id="#{mdb.idString}" jsf:value="#{mdb.selected}"
+                                                           jsf:disabled="#{DataversePage.editInputLevel == true}"
                                                            name="mdbSelectOptional" jsf:rendered="#{!mdb.required and !DataversePage.inheritMetadataBlockFromParent}">
                                                         <p:ajax update="@widgetVar(optionBlock)" />
                                                     </input>
-
                                                     <h:outputText value="#{mdb.localeDisplayName} #{mdb.required ? bundle['dataverse.field.required']: ''}"
                                                                   styleClass="#{DataversePage.inheritMetadataBlockFromParent ? 'text-muted' : ''}"/>
                                                     <p:commandLink id="showDSFT" style="margin-left:1em;"
                                                                    update="@widgetVar(optionBlock)"
                                                                    process="@this"
                                                                    rendered="#{!mdb.showDatasetFieldTypes and (mdb.selected or mdb.required) and !DataversePage.openMetadataBlock and !DataversePage.inheritMetadataBlockFromParent}"
-                                                                   actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id)}"
-                                                                   oncomplete="javascript:bind_bsui_components();">
+                                                                   actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id)}">
                                                          <h:outputText value="#{bundle['dataverse.field.set.tip']}" />
                                                      </p:commandLink>
                                                      <p:commandLink id="viewDSFT" style="margin-left:1em;"
                                                                     update="@widgetVar(optionBlock)"
                                                                     process="@this"
                                                                     rendered="#{!mdb.showDatasetFieldTypes and (!mdb.selected or DataversePage.inheritMetadataBlockFromParent)   and !DataversePage.openMetadataBlock}"
-                                                                    actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id, false)}"
-                                                                    oncomplete="javascript:bind_bsui_components();">
+                                                                    actionListener="#{DataversePage.showDatasetFieldTypes(mdb.id, false)}">
                                                          <h:outputText value="#{bundle['dataverse.field.set.view']}" />
                                                      </p:commandLink>
                                                 </label>
                                             </div>
-
                                             <div id="metadataFieldOptionsPanel-Block" jsf:rendered="#{mdb.showDatasetFieldTypes}">
                                                 <div class="panel panel-default">
                                                     <div id="metadataFieldOptionsPanel-Body" class="panel-body">
@@ -287,11 +385,10 @@
                                                                         </td>
                                                                         <td>
                                                                             <p:selectOneRadio id="OptionsRadio#{dsft.id}" value="#{dsft.requiredDV}" widgetVar="OptButton#{dsft.id}" disabled ="#{DataversePage.editInputLevel == false}"
-                                                                                              rendered="#{!dsft.hasChildren and !((!dsft.hasChildren  and dsft.required) or (dsft.hasChildren and dsft.hasRequiredChildren))}">
+                                                                                              rendered="#{!dsft.hasChildren and (!dsft.required or (dsft.hasParent and !dsft.parentDatasetFieldType.required))}">
                                                                                 <f:selectItems value="#{dsft.optionSelectItems}"/>
-                                                                            </p:selectOneRadio>
-
-                                                                            <span class="text-muted" jsf:rendered="#{(!dsft.hasChildren and dsft.required) or (dsft.hasChildren and dsft.hasRequiredChildren)}">
+                                                                            </p:selectOneRadio>                                           
+                                                                            <span class="text-muted" jsf:rendered="#{dsft.required and (!dsft.hasParent or dsft.parentDatasetFieldType.required)}">
                                                                                 #{bundle['dataverse.field.requiredByDataverse']}
                                                                             </span>
                                                                         </td>
@@ -302,8 +399,8 @@
                                                     </div>
                                                 </div>
                                                 <p:commandLink id="hideDSFT" styleClass="btn btn-default" 
+                                                               process="@this @widgetVar(optionBlock)"
                                                                update="@widgetVar(optionBlock)" actionListener="#{DataversePage.hideDatasetFieldTypes(mdb.id)}" 
-                                                               oncomplete="javascript:bind_bsui_components();"
                                                                rendered="#{mdb.showDatasetFieldTypes}">
                                                     <h:outputText value="#{bundle.done}" />
                                                 </p:commandLink>
@@ -314,23 +411,21 @@
                             </div>
                         </p:panel>
                         <!-- Facets Panel -->
-                        <p:panel id="editFacets" styleClass="panelLayoutBlock" widgetVar="editFacets">
+                        <p:panel id="editFacets" styleClass="panelLayoutBlock padding-none" widgetVar="editFacets">
                             <div class="row">
-                                <div class="col-sm-12 form-group">
-                                    <label class="col-sm-3 control-label" for="facetPickListCreate">#{bundle['dataverse.facetPickList.text']}</label>
-                                    <div class="col-sm-9">
+                                <div class="col-sm-12 form-group padding-none">
+                                    <div class="col-md-3 control-label highlightBold">#{bundle['dataverse.facetPickList.text']}</div>
+                                    <div class="col-md-9">
                                         <p class="help-block">#{bundle['dataverse.facetPickList.tip']}</p>
-
-                                        <label class="metadata-blocks-default" for="facetsRoot" jsf:rendered="#{DataversePage.dataverse.owner != null}">
-                                            <h:selectBooleanCheckbox id="facetsRoot" tabindex="8" styleClass="facets-blocks-default"
+                                        <h:outputLabel styleClass="metadata-blocks-default" for="facetsRoot" rendered="#{DataversePage.dataverse.owner != null}">
+                                            <h:selectBooleanCheckbox id="facetsRoot" styleClass="facets-blocks-default"
                                                                      value="#{DataversePage.inheritFacetFromParent}">
                                                 <p:ajax update="editFacets" listener="#{DataversePage.toggleFacetRoot}"/>
                                             </h:selectBooleanCheckbox>
                                             <h:outputFormat value="#{bundle['dataverse.facetPickList.facetsFromHost.text']}">
                                                 <f:param value="#{DataversePage.dataverse.facetRootDataverseName}"/>
                                             </h:outputFormat>
-                                        </label>
-
+                                        </h:outputLabel>
                                         <p:pickList id="facetPickListCreate" value="#{DataversePage.facets}" var="facet" converter="facetConverter"
                                                     itemLabel="#{facet.displayName}" itemValue="#{facet}"
                                                     disabled="#{!DataversePage.dataverse.facetRoot and DataversePage.dataverse.owner != null}"
@@ -346,208 +441,208 @@
                                             </f:facet>
                                             <f:facet name="targetCaption">#{bundle['dataverse.selected']}</f:facet>
                                             <p:ajax event="transfer" listener="#{DataversePage.onFacetTransfer}" update="editFacets" />
+                                            <f:passThroughAttribute name="aria-disabled" value="#{!DataversePage.dataverse.facetRoot and DataversePage.dataverse.owner != null}"/>
                                         </p:pickList>
                                     </div>
                                 </div>
                             </div>
                         </p:panel>
+                        <!-- Save / Cancel Button Panel -->
+                        <div class="button-block">
+                            <p:commandButton id="save" styleClass="btn btn-default" value="#{DataversePage.dataverse.id == null ? bundle.createDataverse : bundle.saveChanges}" action="#{DataversePage.save}" update=":dataverseForm, :messagePanel">
+                                <f:ajax onerror="window.scrollTo(0, 0)" />
+                            </p:commandButton>
+                            <p:commandButton id="cancel" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DataversePage.cancel}" rendered="#{DataversePage.dataverse.id != null}"/>
+                            <p:button id="cancelCreate" styleClass="btn btn-link" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DataversePage.dataverse.owner.alias}" rendered="#{DataversePage.dataverse.id == null and DataversePage.ownerId != null}"/>
+                        </div>
                     </ui:fragment>
                     <!-- END Edit Mode -->
                     <!-- View Mode / Description Panel -->
                     <ui:fragment rendered="#{empty DataversePage.editMode}">
-                        <div id="actionButtonBlock" class="button-block clearfix" jsf:rendered="#{!widgetWrapper.widgetView}">
-                            <!-- Edit/Publish Button Group -->
-                            <div class="btn-group pull-right" jsf:rendered="#{dataverseSession.user.authenticated and
-                                                     (permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)
-                                                     or permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse))}">
-                                    <!-- Publish Button -->
-                                    <ui:fragment rendered="#{permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse)}">
-                                        <button type="button" class="btn btn-default btn-access" onclick="PF('confirmation').show()"
-                                                jsf:rendered="#{!DataversePage.dataverse.released and (empty DataversePage.dataverse.owner or DataversePage.dataverse.owner.released)}">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
-                                        </button>
-                                        <button type="button" class="btn btn-default btn-access" onclick="PF('mayNotRelease').show()"
-                                                jsf:rendered="#{!DataversePage.dataverse.released and (!empty DataversePage.dataverse.owner and !DataversePage.dataverse.owner.released)}">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
-                                        </button>
-                                    </ui:fragment>
-                                    <!-- END: Publish Button -->
-                                    <div class="btn-group" jsf:rendered="#{dataverseSession.user.superuser and (SearchIncludeFragment.mode == 'search' or DataversePage.dataverse.owner != null)}">
-                                        <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                                            <span class="glyphicon glyphicon-link"/> #{bundle['link']} <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu pull-right text-left" role="menu">
-                                            <li class="#{DataversePage.dataverse.owner != null ? '' : 'disabled'}">
-                                                <p:commandLink action="#{DataversePage.setupLinkingPopup('link')}"
-                                                               oncomplete="PF('linkDataverseForm').show()"
-                                                               update=":linkDataverseForm"
-                                                               disabled="#{DataversePage.dataverse.owner == null}">
-                                                    #{bundle['dataverse.link']}
-                                                </p:commandLink>
-                                            </li>
-                                            <li class="#{SearchIncludeFragment.mode == 'search' ? '' : 'disabled'}">
-                                                <p:commandLink action="#{DataversePage.setupLinkingPopup('savedSearch')}"
-                                                               oncomplete="PF('linkDataverseForm').show()"
-                                                               update=":linkDataverseForm"
-                                                               disabled="#{SearchIncludeFragment.mode != 'search'}">
-                                                    #{bundle['dataverse.savedsearch.link']}
-                                                </p:commandLink>
-                                            </li>
-                                        </ul>
+                        <div id="actionButtonBlock" class="col-xs-12 button-block margin-bottom" jsf:rendered="#{!widgetWrapper.widgetView}">
+                            <div class="row">
+                                <!-- Metrics for Root Dataverse -->
+                                <div id="metrics-block1" class="col-xs-4" jsf:rendered="#{DataversePage.isRootDataverse() and !settingsWrapper.rsyncOnly}">
+                                    <div id="metrics-label" class="col-xs-4 small text-center">
+                                        <h:outputLink value="#{settingsWrapper.metricsUrl}" target="_blank" title="#{bundle['metrics.title.tip']}" rendered="#{settingsWrapper.metricsUrl != null}">
+                                            <span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
+                                        </h:outputLink>
+                                        <ui:fragment rendered="#{settingsWrapper.metricsUrl == null}">
+                                            <span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
+                                        </ui:fragment>
                                     </div>
-                                    <!-- Edit Button -->
-                                    <div class="btn-group" jsf:rendered="#{permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)}">
-                                        <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
-                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataverse.edit']} <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu pull-right text-left" role="menu">
-                                            <li>
-                                                <div id="dataverse-info-dropdown">
-                                                    <div class="dataverse-info-logo-icon">
-                                                        <span class="icon-dataverse text-brand"></span>
-                                                    </div>
-                                                    <div class="dataverse-info-general">
-                                                        <div><h:outputText value="#{DataversePage.dataverse.name}" styleClass="highlightBold"/> <h:outputText value=" (#{DataversePage.dataverse.affiliation})" styleClass="text-muted" rendered="#{!empty DataversePage.dataverse.affiliation}"/></div>
-                                                        <div class="text-muted">#{DataversePage.dataverse.alias}</div>
-                                                    </div>
-                                                </div>
-                                            </li>
-                                            <li class="divider" role="presentation"></li>
-                                            <li>
-                                                <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update="@form,:dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:bind_bsui_components();">
-                                                    <h:outputText value="#{bundle['dataverse.option.generalInfo']}" />
-                                                </p:commandLink>
-                                            </li>
-                                            <li>
-                                                <h:link outcome="ThemeAndWidgets" id="themeWidgetsOpts">
-                                                    <f:param name="id" value="#{DataversePage.dataverse.id}" />
-                                                    <h:outputText value="#{bundle['dataverse.option.themeAndWidgets']}" />
-                                                </h:link>
-                                            </li>
-                                            <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
-                                                <li>
-                                                    <h:link id="managePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
-                                                        <h:outputText value="#{bundle['dataverse.option.permissions']}" />
-                                                        <f:param name="id" value="#{DataversePage.dataverse.id}" />
-                                                    </h:link>
-                                                </li>
-                                            </ui:fragment>
-                                            <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
-                                                <li>
-                                                    <h:link id="manageGroups" styleClass="ui-commandlink ui-widget" outcome="manage-groups">
-                                                        <h:outputText value="#{bundle['dataverse.option.dataverseGroups']}" />
-                                                        <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
-                                                    </h:link>
-                                                </li>
+                                    <div id="metrics-content" class="col-xs-8 small text-center">
+                                        <h:outputFormat styleClass="metrics-downloads" value="{0} #{bundle['metrics.downloads']}">
+                                            <f:param value="#{guestbookResponseServiceBean.getTotalDownloadCount()}"/>
+                                        </h:outputFormat>
+                                    </div>
+                                </div>
+                                <!-- END: Metrics for Root Dataverse-->
+                                <!-- ActionButtonBlock -->
+                                <div class="#{DataversePage.isRootDataverse() ? 'col-xs-8' : 'col-xs-12'} text-right padding-none">
+                                    <!-- Email/Link/Share Button Group -->
+                                    <div class="btn-group" role="group">
+                                        <p:commandLink type="button" styleClass="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataverse.contact']}"
+                                                       update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                            <f:param name="DO_VALIDATION" value="false"/>
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DataversePage.dataverse}"/>
+                                                <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
+                                        </p:commandLink>
+                                        <p:commandLink type="button" styleClass="text-button btn-share bootstrap-button-tooltip"
+                                           title="#{bundle['dataverse.share.dataverseShare']}"
+                                           oncomplete="PF('shareDialog').show();sharrre();">
+                                            <span class="glyphicon glyphicon-share"/> #{bundle['share']}
+                                        </p:commandLink>
+                                    </div>
+                                    <!-- END: Email/Link/Share Button Group -->
+                                    <!-- Edit/Publish Button Group -->
+                                    <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated and
+                                                             (permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)
+                                                             or permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse))}">
+                                            <!-- Publish Button -->
+                                            <ui:fragment rendered="#{permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse)}">
+                                                <button type="button" class="btn btn-default btn-access" onclick="PF('confirmation').show()"
+                                                        jsf:rendered="#{!DataversePage.dataverse.released and (empty DataversePage.dataverse.owner or DataversePage.dataverse.owner.released)}">
+                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
+                                                </button>
+                                                <button type="button" class="btn btn-default btn-access" onclick="PF('mayNotRelease').show()"
+                                                        jsf:rendered="#{!DataversePage.dataverse.released and (!empty DataversePage.dataverse.owner and !DataversePage.dataverse.owner.released)}">
+                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
+                                                </button>
                                             </ui:fragment>
-                                            <li>
-                                                <h:link id="manageTemplates" styleClass="ui-commandlink ui-widget" outcome="manage-templates">
-                                                    <h:outputText value="#{bundle['dataverse.option.datasetTemplates']}" />
-                                                    <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
-                                                </h:link>
-                                            </li>
-                                            <li jsf:rendered="#{!settingsWrapper.rsyncOnly}">
-                                                <h:link id="manageGuestbooks" styleClass="ui-commandlink ui-widget" outcome="manage-guestbooks">
-                                                    <h:outputText value="#{bundle['dataverse.option.datasetGuestbooks']}" />
-                                                    <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
-                                                </h:link>
-                                            </li>
-                                            <li>
-                                                <p:commandLink id="browseOpts" actionListener="#{DataversePage.edit('FEATURED')}" oncomplete="PF('browseOptsForm').show()"
-                                                               update="dataverseForm:browseOptsForm">
-                                                    <h:outputText value="#{bundle['dataverse.option.featuredDataverse']}" />
-                                                </p:commandLink>
-                                            </li>
-                                            <ui:fragment rendered="#{DataversePage.isEmptyDataverse() and !(DataversePage.dataverse.owner == null)
-                                                                     and permissionsWrapper.canIssueDeleteDataverseCommand(DataversePage.dataverse)}">
-                                                <li class="divider"></li>
-                                                <li>
-                                                    <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
-                                                        <h:outputText value="#{bundle['dataverse.option.deleteDataverse']}" />
-                                                    </p:commandLink>
-                                                </li>
+                                            <!-- END: Publish Button -->
+                                            <ui:fragment rendered="#{DataversePage.showLinkingPopup()}">
+                                            <div class="btn-group" >
+                                                <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                                                    <span class="glyphicon glyphicon-link"/> #{bundle['link']} <span class="caret"></span>
+                                                </button>
+                                                <ul class="dropdown-menu pull-right text-left">
+                                                    <li class="#{DataversePage.dataverse.owner != null ? '' : 'disabled'}">
+                                                        <p:commandLink action="#{DataversePage.setupLinkingPopup('link')}"
+                                                                       oncomplete="PF('linkDataverseForm').show()"
+                                                                       update=":linkDataverseForm"
+                                                                       >
+                                                            #{bundle['dataverse.link']}
+                                                        </p:commandLink>
+                                                    </li>
+                                                    <li class="#{SearchIncludeFragment.mode == 'search' ? '' : 'disabled'}">
+                                                        <p:commandLink action="#{DataversePage.setupLinkingPopup('savedSearch')}"
+                                                                       oncomplete="PF('linkDataverseForm').show()"
+                                                                       update=":linkDataverseForm"
+                                                                       >
+                                                            #{bundle['dataverse.savedsearch.link']}
+                                                        </p:commandLink>
+                                                    </li>
+                                                </ul>
+                                            </div>
                                             </ui:fragment>
-                                        </ul>
+                                            <!-- Edit Button -->
+                                            <div class="btn-group" jsf:rendered="#{permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)}">
+                                                <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
+                                                    <span class="glyphicon glyphicon-pencil"/> #{bundle['dataverse.edit']} <span class="caret"></span>
+                                                </button>
+                                                <ul class="dropdown-menu pull-right text-left">
+                                                    <li>
+                                                        <div id="dataverse-info-dropdown">
+                                                            <div class="dataverse-info-logo-icon">
+                                                                <span class="icon-dataverse text-brand"></span>
+                                                            </div>
+                                                            <div class="dataverse-info-general">
+                                                                <div><h:outputText value="#{DataversePage.dataverse.name}" styleClass="highlightBold"/> <h:outputText value=" (#{DataversePage.dataverse.affiliation})" styleClass="text-muted" rendered="#{!empty DataversePage.dataverse.affiliation}"/></div>
+                                                                <div class="text-muted">#{DataversePage.dataverse.alias}</div>
+                                                            </div>
+                                                        </div>
+                                                    </li>
+                                                    <li class="divider" role="presentation"></li>
+                                                    <li>
+                                                        <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update=":dataverseForm,:searchResults,:messagePanel">
+                                                            <h:outputText value="#{bundle['dataverse.option.generalInfo']}" />
+                                                        </p:commandLink>
+                                                    </li>
+                                                    <li>
+                                                        <h:link outcome="ThemeAndWidgets" id="themeWidgetsOpts">
+                                                            <f:param name="id" value="#{DataversePage.dataverse.id}" />
+                                                            <h:outputText value="#{bundle['dataverse.option.themeAndWidgets']}" />
+                                                        </h:link>
+                                                    </li>
+                                                    <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
+                                                        <li>
+                                                            <h:link id="managePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
+                                                                <h:outputText value="#{bundle['dataverse.option.permissions']}" />
+                                                                <f:param name="id" value="#{DataversePage.dataverse.id}" />
+                                                            </h:link>
+                                                        </li>
+                                                    </ui:fragment>
+                                                    <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
+                                                        <li>
+                                                            <h:link id="manageGroups" styleClass="ui-commandlink ui-widget" outcome="manage-groups">
+                                                                <h:outputText value="#{bundle['dataverse.option.dataverseGroups']}" />
+                                                                <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
+                                                            </h:link>
+                                                        </li>
+                                                    </ui:fragment>
+                                                    <li>
+                                                        <h:link id="manageTemplates" styleClass="ui-commandlink ui-widget" outcome="manage-templates">
+                                                            <h:outputText value="#{bundle['dataverse.option.datasetTemplates']}" />
+                                                            <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
+                                                        </h:link>
+                                                    </li>
+                                                    <li jsf:rendered="#{!settingsWrapper.rsyncOnly}">
+                                                        <h:link id="manageGuestbooks" styleClass="ui-commandlink ui-widget" outcome="manage-guestbooks">
+                                                            <h:outputText value="#{bundle['dataverse.option.datasetGuestbooks']}" />
+                                                            <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
+                                                        </h:link>
+                                                    </li>
+                                                    <li>
+                                                        <p:commandLink id="browseOpts" actionListener="#{DataversePage.edit('FEATURED')}" oncomplete="PF('browseOptsForm').show()"
+                                                                       update="dataverseForm:browseOptsForm">
+                                                            <h:outputText value="#{bundle['dataverse.option.featuredDataverse']}" />
+                                                        </p:commandLink>
+                                                    </li>
+                                                    <ui:fragment rendered="#{DataversePage.isEmptyDataverse() and !(DataversePage.dataverse.owner == null)
+                                                                             and permissionsWrapper.canIssueDeleteDataverseCommand(DataversePage.dataverse)}">
+                                                        <li class="divider"></li>
+                                                        <li>
+                                                            <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
+                                                                <h:outputText value="#{bundle['dataverse.option.deleteDataverse']}" />
+                                                            </p:commandLink>
+                                                        </li>
+                                                    </ui:fragment>
+                                                </ul>
+                                            </div>
+                                            <!-- END: Edit Button -->
                                     </div>
-                                    <!-- END: Edit Button -->
-                            </div>
-
-                            <!-- END: Edit/Publish Button Group -->
-                            <!-- Email/Link/Share Button Group -->
-                            <div class="btn-group pull-right" role="group">
-                                <p:commandLink type="button" styleClass="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataverse.contact']}"
-                                               update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                    <f:param name="DO_VALIDATION" value="false"/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DataversePage.dataverse}"/>
-                                        <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                </p:commandLink>
-                                <p:commandLink type="button" styleClass="text-button btn-share bootstrap-button-tooltip"
-                                   title="#{bundle['dataverse.share.dataverseShare']}"
-                                   oncomplete="PF('shareDialog').show();sharrre();">
-                                    <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                </p:commandLink>
-                            </div>
-                            <p:dialog id="shareDialog" header="#{bundle['dataverse.share.dataverseShare']}" widgetVar="shareDialog" modal="true">
-                                <p class="help-block">#{bundle['dataverse.share.dataverseShare.tip']}</p>
-
-                                <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataverse/#{DataversePage.dataverse.alias}" data-text="#{bundle['dataverse.share.dataverseShare.shareText']}"></div>
-
-                                <div class="button-block">
-                                    <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
-                                        #{bundle.close}
-                                    </button>
-                                </div>
-                            </p:dialog>
-                            <!-- END: Email/Link/Share Button Group -->
-                            <!-- Metrics for Root Dataverse -->
-                            <div id="metrics-block" class="col-xs-3" jsf:rendered="#{DataversePage.isRootDataverse() and !settingsWrapper.rsyncOnly}">
-                                <div id="metrics-label" class="col-xs-4 small text-center">
-                                    <h:outputLink value="#{systemConfig.metricsUrl}" target="_blank" title="#{bundle['metrics.title.tip']}" rendered="#{systemConfig.metricsUrl != null}">
-                                        <span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
-                                    </h:outputLink>
-                                    <ui:fragment rendered="#{systemConfig.metricsUrl == null}">
-                                        <span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
-                                    </ui:fragment>
-                                </div>
-                                <div id="metrics-content" class="col-xs-8 small text-center">
-                                    <h:outputFormat styleClass="metrics-downloads" value="{0} #{bundle['metrics.downloads']}">
-                                        <f:param value="#{guestbookResponseServiceBean.getCountOfAllGuestbookResponses()}"/>
-                                    </h:outputFormat>
+                                    <!-- END: Edit/Publish Button Group -->
                                 </div>
                             </div>
-                            <!-- END: Metrics for Root Dataverse-->
+                            <!-- END: ActionButtonBlock -->
                         </div>
-
                         <ui:fragment rendered="#{SearchIncludeFragment.filterQueries.size() == 0 and SearchIncludeFragment.mode != SearchIncludeFragment.searchModeString}">
                             <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
-                            <ui:fragment rendered="#{!empty DataversePage.dataverse.description and !widgetWrapper.widgetView}">
-                                <div id="dataverseDesc" style="margin-bottom:1em;">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DataversePage.dataverse.description)}" escape="false"/>
+                            <div class="row margin-bottom" jsf:rendered="#{!empty DataversePage.dataverse.description and !widgetWrapper.widgetView}">
+                                <div id="dataverseDesc" class="col-xs-12">
+                                   <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DataversePage.dataverse.description)}" escape="false"/>
                                 </div>
-                                <div class="clearfix"/>
-                            </ui:fragment>
+                            </div>
                             <!-- Featured Dataverses Carousel -->
-                            <div id="carouselBlocksWrapper" jsf:rendered="#{!empty DataversePage.carouselFeaturedDataverses}">
-                                <div id="featuredDataversesBlock">
+                            <div id="carouselBlocksWrapper" class="row" jsf:rendered="#{!empty DataversePage.carouselFeaturedDataverses}">
+                                <div id="featuredDataversesBlock" class="col-xs-12">
                                     <div class="customNavigation">
                                         <a class="btn prev1" title="#{bundle['dataverse.page.pre']}"><span class="glyphicon glyphicon-chevron-left"/></a>
                                     </div>
                                     <div id="featuredDataversesList" class="owl-carousel owl-theme">
                                         <ui:repeat value="#{DataversePage.carouselFeaturedDataverses}" var="dv" varStatus="status">
-                                            <div class="item">
-                                                <div style="vertical-align:middle;">
-                                                    <c:set var="dvFeatUrl" value="/dataverse/#{dv.alias}"/>
-                                                    <a href="#{widgetWrapper.wrapURL(dvFeatUrl)}" title="#{dv.name}">
-                                                        <img src="/logos/#{dv.logoOwnerId}/#{dv.dataverseTheme.logo}" alt="#{of:format1(bundle['alt.logo'], dv.name)}" jsf:rendered="#{!empty dv.dataverseTheme.logo}"/>
-                                                        <span class="icon-dataverse" jsf:rendered="#{empty dv.dataverseTheme.logo}"></span>
-                                                    </a>
-                                                    <a href="#{widgetWrapper.wrapURL(dvFeatUrl)}" title="#{dv.name}">
-                                                        <h:outputText value="#{dv.name}"/>
-                                                    </a>
-                                                </div>
+                                            <div class="item" style="vertical-align:middle;">
+                                                <c:set var="dvFeatUrl" value="/dataverse/#{dv.alias}"/>
+                                                <a href="#{widgetWrapper.wrapURL(dvFeatUrl)}">
+                                                    <img src="/logos/#{dv.logoOwnerId}/#{dv.dataverseTheme.logo}" alt="#{of:format1(bundle['alt.logo'], dv.name)}" jsf:rendered="#{!empty dv.dataverseTheme.logo and empty dv.dataverseTheme.logoThumbnail}"/>
+                                                    <img src="/logos/#{dv.logoOwnerId}/#{dv.dataverseTheme.logoThumbnail}" alt="#{of:format1(bundle['alt.logo'], dv.name)}" jsf:rendered="#{!empty dv.dataverseTheme.logoThumbnail}"/>
+                                                    <span class="icon-dataverse" jsf:rendered="#{empty dv.dataverseTheme.logo and empty dv.dataverseTheme.logoThumbnail}"></span>
+                                                    <h:outputText styleClass="show" value="#{dv.name}"/>
+                                                </a>
                                             </div>
                                         </ui:repeat>
                                     </div>
@@ -559,16 +654,6 @@
                             <!-- END: Featured Dataverses Carousel -->
                         </ui:fragment>
                     </ui:fragment>
-
-                    <!-- Save / Cancel Button Panel -->
-                    <div class="button-block" jsf:rendered="#{!empty DataversePage.editMode}">
-                        <p:commandButton id="save" styleClass="btn btn-default" tabindex="9" value="#{DataversePage.dataverse.id == null ? bundle.createDataverse : bundle.saveChanges}" action="#{DataversePage.save}" update="@all">
-                            <f:ajax onerror="window.scrollTo(0, 0)" />
-                        </p:commandButton>
-                        <p:commandButton id="cancel" styleClass="btn btn-link" tabindex="10" value="#{bundle.cancel}" action="#{DataversePage.cancel}"  rendered="#{DataversePage.dataverse.id != null}"/>
-                        <p:button id="cancelCreate" styleClass="btn btn-link" tabindex="10" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DataversePage.dataverse.owner.alias}" rendered="#{DataversePage.dataverse.id == null and DataversePage.ownerId != null}"/>
-                    </div>
-
                     <!-- POPUPS -->
                     <!-- Featured Dataverses Popup -->
                     <p:dialog id="browseOptsForm" header="#{bundle['dataverse.option.featuredDataverse']}" widgetVar="browseOptsForm" modal="true">
@@ -599,7 +684,6 @@
                             </div>
                         </ui:fragment>
                     </p:dialog>
-
                     <!-- Publish Confirmation Popup -->
                     <p:dialog id="publishDvConfirm" header="#{bundle['dataverse.publish.header']}" widgetVar="confirmation" modal="true">
                         <p class="text-warning">
@@ -612,7 +696,6 @@
                             </button>
                         </div>
                     </p:dialog>
-
                     <p:dialog id="mayNotRelease" header="#{bundle['dataverse.publish.header']}" widgetVar="mayNotRelease" modal="true">
                         <p class="text-danger">
                             <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.publish.failed.tip']}
@@ -623,7 +706,6 @@
                             </button>
                         </div>
                     </p:dialog>
-
                     <p:dialog id="deleteDvConfirm" header="#{bundle['dataverse.delete']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="text-warning">
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataverse.delete.tip']}
@@ -636,119 +718,132 @@
                         </div>
                     </p:dialog>
                 </h:form>
-
                 <!-- Search/Browse Facets Panel -->
                 <p:fragment id="searchResults">
                     <ui:fragment rendered="#{empty DataversePage.editMode}">
                         <ui:include src="search-include-fragment.xhtml"/>
                     </ui:fragment>
                 </p:fragment>
-
-                <!-- Link Dataverse Popup -->
-                <p:dialog id="linkDataverseForm" header="#{DataversePage.linkMode == 'SAVEDSEARCH' ? bundle['dataverse.savedsearch.link'] : bundle['dataverse.link']}" widgetVar="linkDataverseForm" modal="true">
-                    <h:form styleClass="form-horizontal" rendered="#{DataversePage.dataversesForLinking.size() > 1}">
-                        <p:focus for="dvNameSelect"/>
-                        <ui:fragment rendered="#{DataversePage.linkMode == 'LINKDATAVERSE'}">
-                            <p class="help-block">#{bundle['dataverse.link.dataverse.choose']}</p>
-                        </ui:fragment>
-                        <ui:fragment rendered="#{DataversePage.linkMode == 'SAVEDSEARCH'}">
-                            <p class="help-block">#{bundle['dataverse.savedsearch.dataverse.choose']}</p>
-                        </ui:fragment>
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label">
-                                <h:outputFormat value="#{bundle['dataverse.link.yourDataverses']}">
-                                    <f:param value="#{DataversePage.dataversesForLinking.size()}"/>
-                                </h:outputFormat>
-                            </label>
-                            <div class="col-sm-7">
-                                <h:selectOneMenu id="dvNameSelect" styleClass="form-control" value="#{DataversePage.linkingDataverseId}">
-                                    <f:selectItems value="#{DataversePage.linkingDVSelectItems}" />
-                                </h:selectOneMenu>
-                                <ui:remove>
-                                <p:autoComplete id="dvName"
-                                                value="#{DataversePage.dataversesForLinking}"
-                                                queryDelay="1000"
-                                                var="u"
-                                                itemLabel="#{u.id}"
-                                                itemValue="#{u.id}">
-                                    <f:facet name="itemtip">
-                                        <div>
-                                            <strong>#{u.id}</strong><br/>
-                                            <em>#{u.affiliation}</em>
-
-                                        </div>
-                                    </f:facet>
-                                </p:autoComplete>
-                                </ui:remove>
-                            </div>
-                        </div>
-                        <ui:fragment rendered="#{DataversePage.linkMode == 'SAVEDSEARCH'}">
-                            <div class="form-group" jsf:rendered="#{!empty SearchIncludeFragment.query}">
-                                <label class="col-sm-4 control-label">
-                                     #{bundle['dataverse.savedsearch.searchquery']}
-                                </label>
-                                <div class="col-sm-7">
-                                    <p class="form-control-static">
-                                        #{SearchIncludeFragment.query}
-                                    </p>
-                                </div>
-                            </div>
-                            <div class="form-group" jsf:rendered="#{!empty SearchIncludeFragment.filterQueriesDebug}">
-                                <label class="col-sm-4 control-label">
-                                     #{bundle['dataverse.savedsearch.filterQueries']}
-                                </label>
-                                <div class="col-sm-7">
-                                    <ui:repeat value="#{SearchIncludeFragment.filterQueriesDebug}" var="fq">
-                                        <p class="form-control-static"><h:outputText value="#{fq}"/></p>
-                                    </ui:repeat>
-                                </div>
-                            </div>
-                        </ui:fragment>
+                <!-- END Search/Browse Facets Panel -->
+                <!-- POPUPS -->
+                    <p:dialog id="shareDialog" header="#{bundle['dataverse.share.dataverseShare']}" widgetVar="shareDialog" modal="true">
+                        <h:form styleClass="form-horizontal"> 
+                        <p class="help-block">#{bundle['dataverse.share.dataverseShare.tip']}</p>
+                        <div id="sharrre-widget" data-url="#{settingsWrapper.dataverseSiteUrl}/dataverse/#{DataversePage.dataverse.alias}" data-text="#{bundle['dataverse.share.dataverseShare.shareText']}"></div>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.link.save']}" action="#{DataversePage.saveLinkedDataverse}"
-                                              rendered="#{DataversePage.linkMode == 'LINKDATAVERSE'}"/>
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.savedsearch.save']}" action="#{DataversePage.saveSavedSearch}"
-                                             rendered="#{DataversePage.linkMode == 'SAVEDSEARCH'}"/>
-                            <button class="btn btn-link" onclick="PF('linkDataverseForm').hide();" type="button">                              
-                                #{bundle.cancel}
-                            </button>
-                        </div>
-                    </h:form>
-                    <ui:fragment rendered="#{DataversePage.dataversesForLinking.size() == 1}">
-                        <p class="help-block">#{bundle['dataverse.link.no.choice']}</p>
-                        <div class="form-horizontal">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">
-                                    <h:outputFormat value="#{bundle['dataverse.link.yourDataverses']}">
-                                        <f:param value="#{DataversePage.dataversesForLinking.size()}"/>
-                                    </h:outputFormat>
-                                </label>
-                                <div class="col-sm-7">
-                                    <p class="form-control-static">#{DataversePage.linkingDataverse.displayName}</p>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.link.save']}" onclick="PF('linkDataverseForm').hide()" actionListener="#{DataversePage.saveLinkedDataverse()}"/>
-                            <button class="btn btn-link" onclick="PF('linkDataverseForm').hide();" type="button">                              
-                                #{bundle.cancel}
-                            </button>
-                        </div>
-                    </ui:fragment>
-                    <ui:fragment rendered="#{DataversePage.dataversesForLinking.size() == 0}">
-                        <p class="text-danger">
-                            <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.link.no.linkable']}
-                        </p>
-                        <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('linkDataverseForm').hide();" type="button">                              
+                            <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
                                 #{bundle.close}
                             </button>
                         </div>
-                    </ui:fragment>
-                </p:dialog>
+                        </h:form>
+                    </p:dialog>
+                    <!-- Link Dataverse Popup -->
+                    <p:dialog id="linkDataverseForm" header="#{DataversePage.linkMode == 'SAVEDSEARCH' ? bundle['dataverse.savedsearch.link'] : bundle['dataverse.link']}" widgetVar="linkDataverseForm" modal="true">
+                        <h:form styleClass="form-horizontal"> 
+                            <ui:fragment rendered="#{DataversePage.dataversesForLinking.size() > 1}">
+                                <p:focus for="dvNameSelect"/>
+                                <ui:fragment rendered="#{DataversePage.linkMode == 'LINKDATAVERSE'}">
+                                    <p class="help-block">#{bundle['dataverse.link.dataverse.choose']}</p>
+                                </ui:fragment>
+                                <ui:fragment rendered="#{DataversePage.linkMode == 'SAVEDSEARCH'}">
+                                    <p class="help-block">#{bundle['dataverse.savedsearch.dataverse.choose']}</p>
+                                </ui:fragment>
+                                <div class="form-group">
+                                    <label class="col-sm-4 control-label">
+                                        <h:outputFormat value="#{bundle['dataverse.link.yourDataverses']}">
+                                            <f:param value="#{DataversePage.dataversesForLinking.size()}"/>
+                                        </h:outputFormat>
+                                    </label>
+                                    <div class="col-sm-7">
+                                        <h:selectOneMenu id="dvNameSelect" styleClass="form-control" value="#{DataversePage.linkingDataverseId}">
+                                            <f:selectItems value="#{DataversePage.linkingDVSelectItems}" />
+                                        </h:selectOneMenu>
+                                        <ui:remove>
+                                            <p:autoComplete id="dvName"
+                                                            value="#{DataversePage.dataversesForLinking}"
+                                                            queryDelay="1000"
+                                                            var="u"
+                                                            itemLabel="#{u.id}"
+                                                            itemValue="#{u.id}">
+                                                <f:facet name="itemtip">
+                                                    <div>
+                                                        <strong>#{u.id}</strong><br/>
+                                                        <em>#{u.affiliation}</em>
+                                                    </div>
+                                                </f:facet>
+                                            </p:autoComplete>
+                                        </ui:remove>
+                                    </div>
+                                </div>
+                                <ui:fragment rendered="#{DataversePage.linkMode == 'SAVEDSEARCH'}">
+                                    <div class="form-group" jsf:rendered="#{!empty SearchIncludeFragment.query}">
+                                        <label class="col-sm-4 control-label">
+                                         #{bundle['dataverse.savedsearch.searchquery']}
+                                        </label>
+                                        <div class="col-sm-7">
+                                            <p class="form-control-static">
+                                            #{SearchIncludeFragment.query.toString()}
+                                            </p>
+                                        </div>
+                                    </div>
+                                    <div class="form-group" jsf:rendered="#{!empty SearchIncludeFragment.filterQueriesDebug}">
+                                        <label class="col-sm-4 control-label">
+                                         #{bundle['dataverse.savedsearch.filterQueries']}
+                                        </label>
+                                        <div class="col-sm-7">
+                                            <ui:repeat value="#{SearchIncludeFragment.filterQueriesDebug}" var="fq">
+                                                <p class="form-control-static"><h:outputText value="#{fq}"/></p>
+                                            </ui:repeat>
+                                        </div>
+                                    </div>
+                                </ui:fragment>
+                                <div class="button-block">
+                                    <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.link.save']}" action="#{DataversePage.saveLinkedDataverse}"
+                                                     rendered="#{DataversePage.linkMode == 'LINKDATAVERSE'}"/>
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.savedsearch.save']}" action="#{DataversePage.saveSavedSearch}"
+                                                     rendered="#{DataversePage.linkMode == 'SAVEDSEARCH'}"/>
+                                    <button class="btn btn-link" onclick="PF('linkDataverseForm').hide();" type="button">                              
+                                    #{bundle.cancel}
+                                    </button>
+                                </div>
+                            </ui:fragment>
 
+                            <ui:fragment rendered="#{DataversePage.dataversesForLinking.size() == 1}">
+                                <p class="help-block">#{bundle['dataverse.link.no.choice']}</p>
+                                <div class="form-horizontal">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label">
+                                            <h:outputFormat value="#{bundle['dataverse.link.yourDataverses']}">
+                                                <f:param value="#{DataversePage.dataversesForLinking.size()}"/>
+                                            </h:outputFormat>
+                                        </label>
+                                        <div class="col-sm-7">
+                                            <p class="form-control-static">#{DataversePage.linkingDataverse.displayName}</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="button-block">
+                                    <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.link.save']}" onclick="PF('linkDataverseForm').hide()" actionListener="#{DataversePage.saveLinkedDataverse()}"/>
+                                    <button class="btn btn-link" onclick="PF('linkDataverseForm').hide();" type="button">                              
+                                    #{bundle.cancel}
+                                    </button>
+                                </div>
+                            </ui:fragment>
+                            <ui:fragment rendered="#{DataversePage.dataversesForLinking.size() == 0}">
+                                <p class="text-danger">
+                                    <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.link.no.linkable']}
+                                </p>
+                                <div class="button-block">
+                                    <button class="btn btn-default" onclick="PF('linkDataverseForm').hide();" type="button">                              
+                                    #{bundle.close}
+                                    </button>
+                                </div>
+                            </ui:fragment>
+                        </h:form>
+                    </p:dialog>
                 <!-- Metadata Resest Modifications Popup -->
                 <p:dialog id="resetModifications" header="#{bundle['dataverse.resetModifications']}" widgetVar="resetModifications" modal="true" closable="false">
+                    <h:form styleClass="form-horizontal">
                     <p class="text-warning">
                         <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataverse.resetModifications.text']}
                     </p>
@@ -758,20 +853,19 @@
                             #{bundle.cancel}
                         </button>
                     </div>
+                    </h:form>
                 </p:dialog>
-
+                <c:set var="descriptionText" value="#{bundle.description}" />
                 <script>
                     //<![CDATA[
                     var scrollPos=0;
-
                     $(document).ready(function () {
                         initCarousel();
-                        popoverHTML('#{bundle.htmlAllowedTitle}');
+                        popoverHTML('#{bundle.htmlAllowedTitle}','#{bundle.htmlAllowedTags}');
+                        summarizeDesc();
                     });
-
                     function initCarousel() {
                         var owl1 = $("#featuredDataversesList");
-
                         owl1.owlCarousel({
                             pagination: false,
                             navigation: false,
@@ -794,20 +888,28 @@
                         }
                         $('#featuredDataversesList .item').matchHeight();
                     }
-
+                    function summarizeDesc() {
+                        // truncate summary description, contentTruncate function in dv_rebind_bootstrap_ui.js
+                        // add id to pass as selector param
+                        var descId = 'dataverseDesc';
+                        // add metadata dynamic label text, tooltip text from bundle as param
+                        var truncMoreBtn = '#{of:format1(bundle.truncateMoreBtn, descriptionText)}';
+                        var truncMoreTip = '#{of:format1(bundle.truncateMoreTip, descriptionText)}';
+                        var truncLessBtn = '#{of:format1(bundle.truncateLessBtn, descriptionText)}';
+                        var truncLessTip = '#{of:format1(bundle.truncateLessTip, descriptionText)}';
+                        // pass bundle text variables as params to function
+                        contentTruncate(descId, truncMoreBtn, truncMoreTip, truncLessBtn, truncLessTip);
+                    }
                     function callOnError(){
-                        alert("in js");
                         window.scrollTo(0, 0);
                     }
-
                     function updateInclude() {
                         $('button[id$="hiddenRefresh"]').trigger('click');
                     }
-                    
                     function scrollAfterUpdate() {
                         document.getElementById('metadataFieldOptionsPanel-Body').scrollTop = scrollPos;
                     }
-
+                    
                     function updateMetadata(checkbox) {
                         var checked = checkbox.checked;
                         if (checked === false){
@@ -816,17 +918,17 @@
                             PF('resetModifications').show();
                         }
                     }
-
                     function check() {
                         $('button[id$="resetToInherit"]').trigger('click');
                     }
-
                     function uncheck() {
                         $('input:checkbox[id$="metadataRoot"]').prop('checked', false);
                     }
+                    function updateOwnerDataverse() {
+                        $('button[id$="updateOwnerDataverse"]').trigger('click');
+                    }
                     //]]>                                     
                 </script>
-
             </ui:define>
         </ui:composition>
     </h:body>
diff --git a/src/main/webapp/dataverse_footer.xhtml b/src/main/webapp/dataverse_footer.xhtml
index 36a524af196..185b43bf7fb 100644
--- a/src/main/webapp/dataverse_footer.xhtml
+++ b/src/main/webapp/dataverse_footer.xhtml
@@ -9,8 +9,7 @@
                 xmlns:o="http://omnifaces.org/ui"
                 xmlns:of="http://omnifaces.org/functions"
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
-    <div id="dataverseFooter" jsf:rendered="#{!widgetWrapper.widgetView and !dataverseHeaderFragment.isRootDataverseThemeDisabled(dataverse) and !empty dataverse.dataverseTheme.logoFooter}">
+    <div id="dataverseFooter" jsf:rendered="#{!widgetView and !dataverseHeaderFragment.isRootDataverseThemeDisabled(dataverse) and !empty dataverse.dataverseTheme.logoFooter}">
         <div class="container">
             <div class="row">
                 <div class="dataverseFooterLogo col-xs-12" style="text-align:#{!empty dataverse.dataverseTheme.logoFooterAlignment ? dataverse.dataverseTheme.logoFooterAlignment : 'center'};background:##{!empty dataverse.dataverseTheme.logoFooterBackgroundColor ? dataverse.dataverseTheme.logoFooterBackgroundColor : 'FFFFFF'};">
@@ -19,40 +18,39 @@
             </div>
         </div>
     </div>
-    <div id="footer" class="#{widgetView ? 'widget-view' : ''}">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-8 small" jsf:rendered="#{!widgetView}">
-                    <p>
-                        <h:outputText value="#{systemConfig.footerCopyrightAndYear}#{settingsWrapper.get(':FooterCopyright')}" escape="false"/> <ui:fragment rendered="#{!empty settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}">&#160;|&#160; <h:outputLink value="#{settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}" target="_blank">#{bundle['footer.privacyPolicy']}</h:outputLink></ui:fragment>
-                    </p>
-                </div>
-                <div class="col-xs-7 small" jsf:rendered="#{widgetView}">
-                    <span class="widgetBrandMsg">
-                        <h:outputFormat value="#{bundle['footer.widget.datastored']}" escape="false">
-                            <o:param>
-                                <a href="/" target="_blank" title="#{dataverseServiceBean.findRootDataverse().displayName}">#{dataverseServiceBean.findRootDataverse().displayName}</a>
-                            </o:param>
-                        </h:outputFormat>
-
-                        <ui:fragment rendered="#{!dataverseSession.user.authenticated}">
-                            <h:outputLink styleClass="margin-sides highlightBold" value="/loginpage.xhtml?#{loginRedirectPage}" target="_blank" title="#{bundle['footer.widget.login']} #{dataverseServiceBean.findRootDataverse().displayName}">
-                                #{bundle.login}
-                            </h:outputLink>
-                        </ui:fragment>
-                    </span>
-                </div>
-                <div class="#{widgetView ? 'col-xs-5' : 'col-sm-4'} text-right">
-                    <div class="poweredbylogo">
-                        <span>#{bundle['footer.poweredby']}</span>
-                        <a href="http://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank"><img src="/resources/images/dataverse_project_logo.svg" width="118" height="40" onerror="this.src='/resources/images/dataverseproject_logo.png'" alt="#{of:format1(bundle['alt.logo'], bundle['footer.dataverseProject'])}"/></a>
-                        <h:outputText class="version" value="v. #{systemConfig.getVersion(true)}" rendered="#{!widgetView}"/>
+    <footer>
+        <div id="dvfooter" class="#{widgetView ? 'widget-view' : ''}">
+            <div class="container">
+                <div class="row">
+                    <div class="col-sm-8 small" jsf:rendered="#{!widgetView}">
+                        <p>
+                            <h:outputText value="#{settingsWrapper.footerCopyrightAndYear}#{settingsWrapper.get(':FooterCopyright')}" escape="false"/> <ui:fragment rendered="#{!empty settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}">&#160;|&#160; <h:outputLink value="#{settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}" target="_blank" rel="noopener">#{bundle['footer.privacyPolicy']}</h:outputLink></ui:fragment>
+                        </p>
+                    </div>
+                    <div class="col-xs-7 small" jsf:rendered="#{widgetView}">
+                        <span class="widgetBrandMsg">
+                            <h:outputFormat value="#{bundle['footer.widget.datastored']}" escape="false">
+                                <o:param>
+                                    <a href="/" target="_blank" rel="noopener" title="#{settingsWrapper.rootDataverse.displayName}">#{settingsWrapper.rootDataverse.displayName}</a>
+                                </o:param>
+                            </h:outputFormat>
+                            <ui:fragment rendered="#{!dataverseSession.user.authenticated}">
+                                <h:outputLink styleClass="margin-sides highlightBold" value="/loginpage.xhtml?#{loginRedirectPage}" target="_blank" rel="noopener" title="#{bundle['footer.widget.login']} #{settingsWrapper.rootDataverse.displayName}">
+                                    #{bundle.login}
+                                </h:outputLink>
+                            </ui:fragment>
+                        </span>
+                    </div>
+                    <div class="#{widgetView ? 'col-xs-5' : 'col-sm-4'} text-right">
+                        <div class="poweredbylogo">
+                            <span>#{bundle['footer.poweredby']}</span>
+                            <a href="https://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank" rel="noopener"><img src="/resources/images/dataverse_project_logo.svg" width="118" height="40" onerror="this.src='/resources/images/dataverseproject_logo.png'" alt="#{of:format1(bundle['alt.logo'], bundle['footer.dataverseProject'])}"/></a>
+                            <h:outputText class="version" value="v. #{settingsWrapper.appVersionWithBuildNumber}" rendered="#{!widgetView}"/>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-    
-    <o:resourceInclude path="/CustomizationFilesServlet?customFileType=footer" rendered="#{!widgetWrapper.widgetView}"/>
-    
-</ui:composition>
+    <o:resourceInclude path="/CustomizationFilesServlet?customFileType=footer" rendered="#{!widgetView}"/>
+    </footer>
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 6a91f8e1136..8b77b719917 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -9,12 +9,15 @@
                 xmlns:o="http://omnifaces.org/ui"
                 xmlns:of="http://omnifaces.org/functions"
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
     <o:resourceInclude path="/CustomizationFilesServlet?customFileType=header" rendered="#{!widgetWrapper.widgetView}"/>
-    
-    <div id="dataverse-header-block">
+    <o:importFunctions type="edu.harvard.iq.dataverse.authorization.groups.impl.builtin.AuthenticatedUsers" />
+    <ui:param name="showAddDataverseLink" value="#{permissionsWrapper.authUsersCanCreateDataversesInDataverse(settingsWrapper.rootDataverse)}"/>
+    <ui:param name="showAddDatasetLink" value="#{permissionsWrapper.authUsersCanCreateDatasetsInDataverse(settingsWrapper.rootDataverse)}"/>
+    <ui:param name="showAddDataGroup" value="#{showAddDataverseLink or showAddDatasetLink}"/>
+
+    <nav id="dataverse-header-block">
         <!-- Navbar Panel -->
-        <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" jsf:rendered="#{!widgetWrapper.widgetView}" role="navigation">
+        <div id="navbarFixed" class="navbar navbar-default navbar-fixed-top" jsf:rendered="#{!widgetWrapper.widgetView}">
             <div class="container">
                 <div class="navbar-header">
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#topNavBar" aria-pressed="false">
@@ -22,86 +25,90 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
-                    </button>                       
+                    </button>
                     <a href="/">
                         <ui:fragment rendered="#{empty settingsWrapper.get(':LogoCustomizationFile')}">
-                            <span class="navbar-brand" tabindex="1"><span id="icon-dataverse" class="icon-dataverse"></span> #{bundle.dataverse}</span>
+                            <span class="navbar-brand"><span id="icon-dataverse" class="icon-dataverse"></span> #{bundle.dataverse}</span>
                         </ui:fragment>
                         <h:graphicImage rendered="#{!empty settingsWrapper.get(':LogoCustomizationFile')}"
-                            url="#{settingsWrapper.get(':LogoCustomizationFile')}" styleClass="navbar-brand custom-logo" alt="#{of:format1(bundle['alt.homepage'], dataverseServiceBean.findRootDataverse().name)}"/>
+                            url="#{settingsWrapper.get(':LogoCustomizationFile')}" styleClass="navbar-brand custom-logo" alt="#{of:format1(bundle['alt.homepage'], settingsWrapper.rootDataverse.name)}"/>
                     </a>
                 </div>
                 <div class="collapse navbar-collapse" id="topNavBar">
                     <ul class="nav navbar-nav navbar-right">
+                        <li class="dropdown" jsf:rendered="#{showAddDataGroup}">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle['dataverse.results.btn.addData']} <b class="caret"></b></a>
+                            <ul class="dropdown-menu">
+                                <li jsf:rendered="#{showAddDataverseLink}">
+                                    <h:outputLink value="/dataverse.xhtml?ownerId=#{settingsWrapper.rootDataverse.id}">
+                                        <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataverse']}"/>
+                                    </h:outputLink>
+                                </li>
+                                <li jsf:rendered="#{showAddDatasetLink}">
+                                    <h:outputLink value="/dataset.xhtml?ownerId=#{settingsWrapper.rootDataverse.id}">
+                                        <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataset']}"/>
+                                    </h:outputLink>
+                                </li>
+                            </ul>
+                        </li>
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle.search} <b class="caret"></b></a>
-                            <ul class="dropdown-menu" style="padding:12px;min-width:350px;">
-                                <form class="form-inline" role="search">
-                                    <label class="sr-only" for="navbarsearch">#{bundle.search}</label>
-                                    <div class="input-group">
-                                        <input id="navbarsearch" type="text" class="form-control" size="28" value="" placeholder="#{bundle['header.search.title']}"/>
-                                        <span class="input-group-btn">
-                                            <button type="submit" class="btn btn-default" onclick="window.location = '/dataverse/#{dataverseServiceBean.findRootDataverse().alias}&#63;q=' + document.getElementById('navbarsearch').value;
-                                                    return false;">
-                                                <span class="glyphicon glyphicon-search"/> #{bundle.find}
-                                            </button>
-                                        </span>
-                                    </div>
-                                </form>
+                            <ul class="dropdown-menu navbar-search">
+                                <li>
+                                    <form class="form-inline" role="search">
+                                        <label id="searchNavLabel" class="sr-only" for="navbarsearch">#{bundle.search}</label>
+                                        <div class="input-group">
+                                            <input id="navbarsearch" type="text" class="form-control" size="28" value="" placeholder="#{bundle['header.search.title']}" />
+                                            <span class="input-group-btn">
+                                                <button type="submit" title="#{bundle.find}" class="btn btn-default bootstrap-button-tooltip" aria-labelledby="searchNavLabel" onclick="window.location='/dataverse/#{settingsWrapper.rootDataverse.alias}&#63;q=' + document.getElementById('navbarsearch').value;return false;">
+                                                    <span class="glyphicon glyphicon-search no-text"/>
+                                                </button>
+                                            </span>
+                                        </div>
+                                    </form>
+                                </li>
                             </ul>
                         </li>
-                        
                         <li jsf:rendered="#{!empty settingsWrapper.get(':NavbarAboutUrl')}">
-                            <h:outputLink value="#{settingsWrapper.get(':NavbarAboutUrl')}" target="_blank">
+                            <h:outputLink value="#{settingsWrapper.get(':NavbarAboutUrl')}" target="_blank" rel="noopener">
                                 <h:outputText value="#{bundle['header.about']}"/>
                             </h:outputLink>
                         </li>
-
                         <li>
-                            <h:outputLink value="#{settingsWrapper.guidesBaseUrl}/#{systemConfig.guidesVersion}/user" target="_blank">
+                            <h:outputLink value="#{settingsWrapper.get(':NavbarGuidesUrl', settingsWrapper.guidesBaseUrl.concat('/').concat(settingsWrapper.guidesVersion).concat('/user'))}" target="_blank" rel="noopener">
                                 <h:outputText value="#{bundle['header.guides.user']}"/>
                             </h:outputLink>
                         </li>
-                        
                         <li jsf:rendered="#{!empty settingsWrapper.get(':NavbarSupportUrl')}">
-                            <h:outputLink value="#{settingsWrapper.get(':NavbarSupportUrl')}" target="_blank">
+                            <h:outputLink value="#{settingsWrapper.get(':NavbarSupportUrl')}" target="_blank" rel="noopener">
                                 <h:outputText value="#{bundle['header.support']}"/>
                             </h:outputLink>
                         </li>
-                        
                         <ui:fragment rendered="#{empty settingsWrapper.get(':NavbarSupportUrl')}">
-                            <o:form useRequestURI="true" class="navbar-form navbar-left navbar-form-link">
-                                <p:commandLink oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                    <h:outputText value="#{bundle['header.support']}"/>
-                                </p:commandLink>
-                            </o:form>
+                            <li>
+                                <o:form useRequestURI="true" class="navbar-form navbar-left navbar-form-link">
+                                    <p:commandLink oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}" id="headerSupportLink">
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                        <h:outputText value="#{bundle['header.support']}"/>
+                                    </p:commandLink>
+                                </o:form>
+                            </li>
                         </ui:fragment>
-                        
                         <li class="dropdown" jsf:rendered="#{settingsWrapper.localesConfigured}">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="#{bundle.language}">#{dataverseSession.localeTitle} <b class="caret"></b></a>
-                            <ul class="dropdown-menu">
+                            <ul class="dropdown-menu navbar-language">
                                 <h:form class="form-inline">
                                     <ui:repeat value="#{settingsWrapper.configuredLocales.entrySet().toArray()}" var="language">
                                         <li class="#{dataverseSession.localeTitle == language.value ? 'active' : ''}">
-                                            <h:commandLink value="#{language.value}" actionListener="#{dataverseSession.updateLocaleInViewRootAndRedirect(language.key)}" action="submit()"
-                                                           style="padding: 3px 20px;
-                                                                    clear: both;
-                                                                    font-weight: 400;
-                                                                    line-height: 1.42857143;
-                                                                    color: rgb(51, 51, 51);
-                                                                    white-space: nowrap;
-                                                                    text-decoration: none;
-                                                                    display: block;"/>
+                                            <h:commandLink value="#{language.value}" styleClass="language-menu-link" actionListener="#{dataverseSession.updateLocaleInViewRootAndRedirect(language.key)}" action="submit()"/>
                                         </li>
                                     </ui:repeat>
                                 </h:form>
                             </ul>
                         </li>
-
                         <ui:fragment rendered="#{!dataverseSession.user.authenticated}">
                             <li>
                                 <h:outputLink rendered="#{dataverseHeaderFragment.signupAllowed}"
@@ -115,16 +122,16 @@
                                 </h:outputLink>
                             </li>
                         </ui:fragment>
-                        
                         <ui:fragment rendered="#{dataverseSession.user.authenticated}">
                             <li class="dropdown accountName">
-                                <a href="#" id="lnk_header_account_dropdown" class="dropdown-toggle" data-toggle="dropdown" role="menu" aria-haspopup="true" aria-expanded="false">
+                                <a href="#" id="lnk_header_account_dropdown" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-labelledby="userDisplayInfoTitle" aria-expanded="false">
                                     <ui:fragment rendered="#{dataverseSession.user.superuser}">
                                         <span class="glyphicon glyphicon-user text-danger"></span>
                                     </ui:fragment>
                                     <h:outputText styleClass="#{dataverseSession.user.superuser ? 'text-danger' : ''}" value="#{dataverseSession.user.displayInfo.title}" id="userDisplayInfoTitle"/>
                                     <h:outputText styleClass="label label-danger" rendered="#{ dataverseHeaderFragment.getUnreadNotificationCount(dataverseSession.user.id) > 0 }"
-                                                  value="#{ dataverseHeaderFragment.getUnreadNotificationCount(dataverseSession.user.id) }" />                                    <b class="caret"></b>
+                                                  value="#{dataverseHeaderFragment.getUnreadNotificationCount(dataverseSession.user.id)}"/>
+                                    <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu">
                                     <li tabindex="-1">
@@ -163,7 +170,7 @@
                                     </li>
                                     <li class="divider"></li>
                                     <li jsf:rendered="#{dataverseSession.user.superuser}" tabindex="-1">
-                                        <h:outputLink value="/dashboard.xhtml?dataverseId=#{dataverseServiceBean.findRootDataverse().id}">
+                                        <h:outputLink value="/dashboard.xhtml?dataverseId=#{settingsWrapper.rootDataverse.id}">
                                             <h:outputText value="#{bundle['header.dashboard']}" />
                                         </h:outputLink>
                                     </li>
@@ -181,7 +188,7 @@
                     </ul>
                 </div>
             </div>
-        </nav>
+        </div>
         <!-- Noscript Error -->
         <noscript>
             <div id="noscript-alert" class="bg-danger">
@@ -190,22 +197,26 @@
                 </div>
             </div>
         </noscript>
-        <!-- Status Alert -->
+        <!-- Banner Message -->
         <o:form class="form-inline">
-            <div id="status-alert" class="bg-warning" jsf:rendered="#{!empty settingsWrapper.get(':StatusMessageText') and !empty settingsWrapper.get(':StatusMessageHeader') and !dataverseSession.isStatusDismissed()}">
-                <div class="alert alert-dismissible container text-warning">
-                    <p:commandButton class="close" id="closeButton" actionListener="#{dataverseSession.setStatusDismissed(true)}" update="@form" value="&#215;"/>
-                    <h:outputText styleClass="highlightBold" value="#{!empty settingsWrapper.get(':StatusMessageHeader') ? settingsWrapper.get(':StatusMessageHeader') : bundle['header.status.header']}"/>
-                    <h:outputText rendered="#{!empty settingsWrapper.get(':StatusMessageText')}" value=" – #{settingsWrapper.get(':StatusMessageText')}" escape="false"/>
-                </div>
-            </div>
+            <ui:fragment rendered="#{!empty dataverseHeaderFragment.bannerMessages}">
+                <ui:repeat value="#{dataverseHeaderFragment.bannerMessages}" var="message" varStatus="status">                
+                    <div id="status-alert" class="bg-warning" jsf:rendered="#{!empty message.displayValue }">
+                        <div class="alert alert-dismissible container text-warning">
+                            <p:commandButton class="close" id="closeButton" actionListener="#{dataverseSession.dismissMessage(message)}" update="@form" value="&#215;"/>
+                            <h:outputText rendered="#{!empty message.displayValue }" value=" #{message.displayValue }" escape="false"/>
+                        </div>
+                    </div>
+                </ui:repeat>
+            </ui:fragment>
         </o:form>
+        
         <!-- Header Panel -->
         <!-- FIXME: Rather than hard-coding "FFFFFF", get it from the backend (ThemeWidgetFragment.DEFAULT_BACKGROUND_COLOR). -->
         <div id="dataverseHeader" class="container bg-muted"
                 style="background:##{!empty dataverse.dataverseTheme.backgroundColor ? dataverse.dataverseTheme.backgroundColor : 'FFFFFF'};"
                 jsf:rendered="#{showDataverseHeader and !widgetWrapper.widgetView and !dataverseHeaderFragment.isRootDataverseThemeDisabled(dataverse)}">
-             <o:importFunctions type="org.apache.commons.lang.StringEscapeUtils"/>
+             <o:importFunctions type="org.apache.commons.text.StringEscapeUtils"/>
             <!-- FIXME: Rather than hard-coding "FFFFFF", get it from the backend (ThemeWidgetFragment.DEFAULT_LOGO_BACKGROUND_COLOR). -->
             <div class="dataverseHeaderLogo" style="text-align:#{!empty dataverse.dataverseTheme.logoAlignment ? dataverse.dataverseTheme.logoAlignment : 'center'};background:##{!empty dataverse.dataverseTheme.logoBackgroundColor ? dataverse.dataverseTheme.logoBackgroundColor : 'FFFFFF'};"
                  jsf:rendered="#{!empty dataverse.dataverseTheme.logo and dataverse.dataverseTheme.logoFormat == 'RECTANGLE'}">
@@ -215,30 +226,33 @@
                 <div class="dataverseHeaderCell dataverseHeaderLogo" jsf:rendered="#{!empty dataverse.dataverseTheme.logo and dataverse.dataverseTheme.logoFormat == 'SQUARE'}">
                     <img src="/logos/#{dataverse.logoOwnerId}/#{dataverse.dataverseTheme.logo}" alt="#{of:format1(bundle['alt.logo'], dataverse.name)}"/>
                 </div>
-                <div class="dataverseHeaderCell dataverseHeaderName" jsf:rendered="#{!empty dataverse.name}">
-                    <a href="/dataverse/#{dataverse.alias}" class="dataverseHeaderDataverseName" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};">#{dataverse.name}</a>
-                    <h:outputText style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '888888'};" value=" (#{dataverse.affiliation})" rendered="#{!empty dataverse.affiliation}"/>
-                    <h:outputText value="#{bundle.unpublished}" styleClass="label label-warning label-unpublished" rendered="#{!dataverse.released}"/>
-                </div>
-                <div class="dataverseHeaderCell dataverseHeaderName" jsf:rendered="#{empty dataverse.name}">
+                <div class="dataverseHeaderCell dataverseHeaderName" jsf:rendered="#{editModeDataverse == 'CREATE'}">
                     <h:outputText styleClass="dataverseHeaderDataverseName" value="#{bundle.newDataverse}"/>
                 </div>
+                <div class="dataverseHeaderCell dataverseHeaderName" jsf:rendered="#{editModeDataverse != 'CREATE'}">
+                    <a href="/dataverse/#{dataverse.alias}" class="dataverseHeaderDataverseName" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};"><h1>#{dataverse.name}</h1></a>
+                    <h:outputText style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '666666'};" value=" (#{dataverse.affiliation})" rendered="#{!empty dataverse.affiliation}"/>
+                    <h:outputText value="#{bundle.unpublished}" styleClass="label label-warning label-unpublished" rendered="#{!dataverse.released}"/>
+                </div>
                 <div class="dataverseHeaderCell dataverseHeaderTagline" jsf:rendered="#{!empty dataverse.dataverseTheme.tagline and empty dataverse.dataverseTheme.linkUrl}">
-                    <h:outputText escape="false" style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '888888'};" value="#{StringEscapeUtils:escapeHtml(dataverse.dataverseTheme.tagline)}" />
+                    <h:outputText escape="false" style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '666666'};" value="#{StringEscapeUtils:escapeHtml4(dataverse.dataverseTheme.tagline)}" />
                 </div>
                 <div class="dataverseHeaderCell dataverseHeaderLink" jsf:rendered="#{!empty dataverse.dataverseTheme.tagline and !empty dataverse.dataverseTheme.linkUrl}">
-                    <h:outputLink value="#{dataverse.dataverseTheme.linkUrl}" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};" target="_blank">
-                        <h:outputText value="#{StringEscapeUtils:escapeHtml(dataverse.dataverseTheme.tagline)}" escape="false"/>
+                    <h:outputLink value="#{dataverse.dataverseTheme.linkUrl}" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};" target="_blank" rel="noopener">
+                        <h:outputText value="#{StringEscapeUtils:escapeHtml4(dataverse.dataverseTheme.tagline)}" escape="false"/>
                     </h:outputLink>
                 </div>
             </div>
         </div>
-
+        <p:fragment id="breadCrumbPanel" rendered="#{dataverseHeaderFragment.breadcrumbs.size() > 1 and showDataverseHeader}">
         <div id="breadcrumbNavBlock" class="container" jsf:rendered="#{dataverseHeaderFragment.breadcrumbs.size() > 1}">
             <ui:repeat value="#{dataverseHeaderFragment.breadcrumbs}" var="breadcrumb" varStatus="status">
                 <h:outputText value=" > " styleClass="breadcrumbCarrot" rendered="#{!status.first}"/>
                 <div class="breadcrumbBlock">
-                    <h:outputText value="#{breadcrumb.breadcrumbText}" styleClass="#{'breadcrumbActive'}" rendered="#{status.last}"/>
+                    
+                    <!-- TO-DO, REMOVED HIGHLIGHTED CURRENT PAGE TITLE WITH false RENDER, NEED TO MOVE TO PGS...??? -->
+                    <h:outputText value="#{breadcrumb.breadcrumbText}" styleClass="#{'breadcrumbActive'}" rendered="#{false}"/>
+                    
                     <ui:fragment rendered="#{!status.last}">
                         <h:outputText value="#{breadcrumb.breadcrumbText}" rendered="#{!breadcrumb.dvObject.instanceofDataverse and !breadcrumb.dvObject.instanceofDataset and !breadcrumb.dvObject.instanceofDataFile and empty breadcrumb.url}"/>
                         <ui:fragment rendered="#{breadcrumb.dvObject == null and !empty breadcrumb.url}">
@@ -249,19 +263,19 @@
                         </ui:fragment>
                         <ui:fragment rendered="#{breadcrumb.dvObject.instanceofDataverse}">
                             <c:set var="dvUrl" value="/dataverse/#{breadcrumb.dvObject.alias}"/>
-                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dvUrl) : dvUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}">
+                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dvUrl) : dvUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}" rel="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : 'noopener'}">
                                 <h:outputText value="#{breadcrumb.breadcrumbText}"/>
                             </a>
                         </ui:fragment>
                         <ui:fragment rendered="#{breadcrumb.dvObject.instanceofDataset}">
-                            <c:set var="dsUrl" value="/dataset.xhtml?persistentId=#{breadcrumb.dvObject.globalIdString}#{breadcrumb.optionalUrlExtension }"/>
-                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dsUrl) : dsUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}">
+                            <c:set var="dsUrl" value="/dataset.xhtml?persistentId=#{breadcrumb.dvObject.globalId.asString()}#{breadcrumb.optionalUrlExtension }"/>
+                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dsUrl) : dsUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}" rel="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : 'noopener'}">
                                 <h:outputText value="#{breadcrumb.breadcrumbText}"/>
                             </a>
                         </ui:fragment>
                         <ui:fragment rendered="#{breadcrumb.dvObject.instanceofDataFile}">
                             <c:set var="dsUrl" value="/file.xhtml?fileId=#{breadcrumb.dvObject.id}#{breadcrumb.optionalUrlExtension }"/>
-                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dsUrl) : dsUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}">
+                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dsUrl) : dsUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}" rel="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : 'noopener'}">
                                 <h:outputText value="#{breadcrumb.breadcrumbText}"/>
                             </a>
                         </ui:fragment>
@@ -269,7 +283,7 @@
                 </div>
             </ui:repeat>
         </div>
-
+	</p:fragment>
         <ui:remove>
             <!-- Removing this temporarily until we can fix the performance issues with it;
                  replaced with generic bookmarks; will have to see how to best make this work
@@ -283,14 +297,13 @@
                         <h:outputText value="#{dv.name}"/>
                     </a>
                 </ui:fragment>
-
                 <ui:fragment rendered="#{dataverseHeaderFragment.hasVisibleChildren(dv)}">
                     <a id="dataverse" styleClass="#{dataverse.id == dv.id ? 'breadcrumbActive' : ''}" role="button">
                         <span class="glyphicon glyphicon-chevron-down"></span>
                     </a>
                 </ui:fragment>
             </div>
-            <div class="dropdown-menu" role="menu" aria-labelledby="breadcrumbLnk#{status.index}" rendered="#{dataverseHeaderFragment.hasVisibleChildren(dv)}">
+            <div class="dropdown-menu" aria-labelledby="breadcrumbLnk#{status.index}" rendered="#{dataverseHeaderFragment.hasVisibleChildren(dv)}">
                 <p:tree value="#{dataverseHeaderFragment.getDataverseTree(dv)}" var="node"  cache="true" id="tree">
                     <p:treeNode>
                         <h:outputText value="#{node.name}" styleClass="breadcrumbActive" rendered="#{dataverse.id == node.id and dataset == null}"/>
@@ -301,10 +314,6 @@
                 </p:tree>
             </div>
         </ui:remove>
-
-        
-
-        
         <!-- Message Panel -->
         <p:fragment id="messagePanel" rendered="#{showMessagePanel}">
             <div class="container messagePanel">
@@ -314,5 +323,5 @@
                 <iqbs:messages id="messages" collapsible="true" />
             </div>
         </p:fragment>
-    </div>
-</ui:composition>
+    </nav>
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/dataverse_homepage.xhtml b/src/main/webapp/dataverse_homepage.xhtml
index bbf03ea22ad..f12fb40ae68 100644
--- a/src/main/webapp/dataverse_homepage.xhtml
+++ b/src/main/webapp/dataverse_homepage.xhtml
@@ -14,12 +14,14 @@
         <ui:composition template="/dataverse_template.xhtml">
             <ui:param name="pageTitle" value="#{empty DataversePage.dataverse.name ? bundle.new : DataversePage.dataverse.name}"/>
             <ui:param name="dataverse" value="#{DataversePage.dataverse}"/>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewParam name="showDataverseHeader" value="false"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                     <f:viewAction action="#{DataversePage.init}"/>
                 </f:metadata>
+            </ui:define>
+            <ui:define name="body">
                 
                 <o:resourceInclude path="/CustomizationFilesServlet?customFileType=homePage" />
 
diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
index 51ca1c79539..719a59674a9 100644
--- a/src/main/webapp/dataverse_template.xhtml
+++ b/src/main/webapp/dataverse_template.xhtml
@@ -11,8 +11,9 @@
       lang="#{dataverseSession.localeCode}"
       xml:lang="#{dataverseSession.localeCode}">
     <f:view locale="#{dataverseSession.localeCode}">
+    <ui:insert name="metadata" />
     <h:head>
-	<o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
+        <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
         <f:facet name="first">
             <o:resourceInclude path="/CustomizationFilesServlet?customFileType=analytics" />
             <title><h:outputText value="#{pageTitle}"/></title>
@@ -25,26 +26,20 @@
 	    <ui:insert name="jsonld_header"></ui:insert>
         </f:facet>
         <link rel="apple-touch-icon" sizes="180x180" href="#{resource['images/fav/apple-touch-icon.png']}"/>
-        <link rel="icon" type="image/png" sizes="32x32" href="#{resource['images/fav/favicon-32x32.png']}"/>
         <link rel="icon" type="image/png" sizes="16x16" href="#{resource['images/fav/favicon-16x16.png']}"/>
+        <link rel="icon" type="image/png" sizes="32x32" href="#{resource['images/fav/favicon-32x32.png']}"/>
         <link rel="manifest" href="#{resource['images/fav/site.webmanifest']}"/>
         <link rel="mask-icon" href="#{resource['images/fav/safari-pinned-tab.svg']}" color="#da532c"/>
         <meta name="msapplication-TileColor" content="#da532c"/>
         <meta name="theme-color" content="#ffffff"/>
         <link type="image/png" rel="image_src" href="#{resource['images/dataverseproject.png']}" />
-        <link type="text/css" rel="stylesheet" href="#{resource['bs/css/bootstrap.min.css']}?version=#{systemConfig.getVersion()}" />
-        <link type="text/css" rel="stylesheet" href="#{resource['bs/css/bootstrap-theme.min.css']}?version=#{systemConfig.getVersion()}" />
-        <link type="text/css" rel="stylesheet" href="#{resource['css/ie-compat.css']}?version=#{systemConfig.getVersion()}" />
-        <link type="text/css" rel="stylesheet" href="#{resource['css/owl.carousel.css']}?version=#{systemConfig.getVersion()}" />
-        <link type="text/css" rel="stylesheet" href="#{resource['css/fontcustom.css']}?version=#{systemConfig.getVersion()}" />
-        <link type="text/css" rel="stylesheet" href="#{resource['css/socicon.css']}?version=#{systemConfig.getVersion()}" />
-        <link type="text/css" rel="stylesheet" href="#{resource['css/structure.css']}?version=#{systemConfig.getVersion()}" />
-        <ui:fragment rendered="#{!widgetWrapper.widgetView}">
-            <script>
-                // Break out of iframe
-                if (window !== top) top.location = window.location;
-            </script>
-        </ui:fragment>
+        <link type="text/css" rel="stylesheet" href="#{resource['bs/css/bootstrap.min.css']}?version=#{settingsWrapper.appVersion}" />
+        <link type="text/css" rel="stylesheet" href="#{resource['bs/css/bootstrap-theme.min.css']}?version=#{settingsWrapper.appVersion}" />
+        <link type="text/css" rel="stylesheet" href="#{resource['css/ie-compat.css']}?version=#{settingsWrapper.appVersion}" />
+        <link type="text/css" rel="stylesheet" href="#{resource['css/owl.carousel.css']}?version=#{settingsWrapper.appVersion}" />
+        <link type="text/css" rel="stylesheet" href="#{resource['css/fontcustom.css']}?version=#{settingsWrapper.appVersion}" />
+        <link type="text/css" rel="stylesheet" href="#{resource['css/socicon.css']}?version=#{settingsWrapper.appVersion}" />
+        <link type="text/css" rel="stylesheet" href="#{resource['css/structure.css']}?version=#{settingsWrapper.appVersion}" />
 	<ui:fragment rendered="#{!empty settingsWrapper.get(':StyleCustomizationFile')}">
             <style>
                 /* Custom CSS */
@@ -56,12 +51,13 @@
         <f:loadBundle basename="propertyFiles.Bundle" var="bundle"/>
 	<a href="#content" class="sr-only">#{bundle['body.skip']}</a>                
         <ui:include src="dataverse_header.xhtml">
-            <ui:param name="dataverse" value="#{dataverse != null ? dataverse : dataverseServiceBean.findRootDataverse()}"/>
+            <ui:param name="dataverse" value="#{dataverse != null ? dataverse : settingsWrapper.rootDataverse}"/>
+            <ui:param name="editModeDataverse" value="#{editModeDataverse}"/>
             <ui:param name="showDataverseHeader" value="#{showDataverseHeader != null ? showDataverseHeader : true}"/>
             <ui:param name="showMessagePanel" value="#{showMessagePanel != null ? showMessagePanel : true}"/>
             <ui:param name="loginRedirectPage" value="#{loginRedirectPage != null ? '?redirectPage='.concat(loginRedirectPage) : navigationWrapper.redirectPage}"/>
         </ui:include>
-        <div class="container" id="content">
+        <div class="container" id="content" role="main">
             <ui:insert name="body">#{bundle.defaultBody}</ui:insert>
         </div>
         <!-- FOOTER BLOCK -->
@@ -75,17 +71,22 @@
             </f:facet>
             <f:facet name="complete">
                 <!-- DO NOTHING -->
-            </f:facet>
+            </f:facet> 
         </p:ajaxStatus>
         <ui:include src="contactFormFragment.xhtml"></ui:include>
-        <script defer="defer" src="#{resource['bs/js/bootstrap.min.js']}?version=#{systemConfig.getVersion()}"></script>
-        <script defer="defer" src="#{resource['js/ie-compat.js']}?version=#{systemConfig.getVersion()}"></script>
-        <script defer="defer" src="#{resource['js/dv_rebind_bootstrap_ui.js']}?version=#{systemConfig.getVersion()}"></script>
-        <script defer="defer" src="#{resource['js/owl.carousel.js']}?version=#{systemConfig.getVersion()}"></script>
-        <script defer="defer" src="#{resource['js/jquery.matchHeight.js']}?version=#{systemConfig.getVersion()}"></script>
-        <script defer="defer" src="#{resource['js/jquery.sharrre.js']}?version=#{systemConfig.getVersion()}"></script>  
-        <script defer="defer" src="#{resource['js/clipboard.min.js']}?version=#{systemConfig.getVersion()}"></script>          
-        <ui:fragment rendered="#{systemConfig.isShibPassiveLoginEnabled()}">
+        <script src="#{resource['js/dv_rebind_bootstrap_ui.js']}?version=#{settingsWrapper.appVersion}"></script>
+        <script src="#{resource['bs/js/bootstrap.min.js']}?version=#{settingsWrapper.appVersion}"></script>
+        <script defer="defer" src="#{resource['js/ie-compat.js']}?version=#{settingsWrapper.appVersion}"></script>
+        <script defer="defer" src="#{resource['js/owl.carousel.js']}?version=#{settingsWrapper.appVersion}"></script>
+        <script defer="defer" src="#{resource['js/jquery.matchHeight.js']}?version=#{settingsWrapper.appVersion}"></script>
+        <script src="#{resource['js/jquery.sharrre.js']}?version=#{settingsWrapper.appVersion}"></script>
+        <script src="#{resource['js/clipboard.min.js']}?version=#{settingsWrapper.appVersion}"></script>
+        <o:onloadScript>bind_bsui_components();</o:onloadScript>
+        <ui:fragment rendered="#{settingsWrapper.getCVocConf(false).size() > 0}">
+            <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
+            <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
+        </ui:fragment> 
+        <ui:fragment rendered="#{settingsWrapper.shibPassiveLoginEnabled}">
             <script defer="defer" src="#{resource['js/shib/isPassive.js']}"></script>
         </ui:fragment>
         <script>
@@ -103,10 +104,10 @@
                     }
                     ;
                 });
-
-                // Rebind bootstrap UI components
-                bind_bsui_components();
             });
+            function clickSupportLink() {
+                $("[id$='headerSupportLink']").click();
+            }
             //]]>
         </script>
     </h:body>
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index e35acbb73cf..6c7826783d7 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -15,10 +15,28 @@
             <ui:param name="pageTitle" value="#{bundle.account} - #{dataverseServiceBean.findRootDataverse().name}"/>
             <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/>
             <ui:param name="showDataverseHeader" value="false"/>
+            <ui:param name="showMessagePanel" value="#{true}"/>
             <ui:param name="loginRedirectPage" value="dataverseuser.xhtml"/>
+            <ui:define name="metadata">
+                <f:metadata>
+                    <f:event type="preRenderView" listener="#{facesContext.externalContext.response.setHeader('Cache-Control', 'no-cache, no-store')}"/>
+                    <o:viewParam name="editMode" value="#{DataverseUserPage.editMode}"/>
+                    <f:viewParam name="redirectPage" value="#{DataverseUserPage.redirectPage}"/>
+                    <o:viewParam name="selectTab" value="#{DataverseUserPage.selectTab}" default="dataRelatedToMe"/>
+                    <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
+                    <f:viewAction action="#{DataverseUserPage.init}" />
+                    <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse(), (DataverseUserPage.editMode == 'CREATE' ? bundle['user.createBtn'] : bundle.account))}"/>
+                </f:metadata>
+            </ui:define>
             <ui:define name="body">
+                <!-- 
+                 The following script is needed to protect a user's personal data 
+                from being seen if they log out of their DV account and the next person who
+                sits at their computer hits the back button. (see ticket #3965)
+                -->
                 <script>
-                    //<![CDATA[
+
+                    //<![CDATA[                   
                     window.onpageshow = function(event) {
                         if (event.persisted) {
                             window.location.reload();
@@ -26,59 +44,62 @@
                     };
                     //]]>
                 </script>
+
                 <f:loadBundle basename="propertyFiles.Bundle" var="bundle"/>
-                <f:metadata>
-                    <f:event type="preRenderView" listener="#{facesContext.externalContext.response.setHeader('Cache-Control', 'no-cache, no-store')}"/>
-                    <f:viewParam name="editMode" value="#{DataverseUserPage.editMode}"/>
-                    <f:viewParam name="redirectPage" value="#{DataverseUserPage.redirectPage}"/>
-                    <f:viewParam name="selectTab" value="#{DataverseUserPage.selectTab}"/>
-                    <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
-                    <f:viewAction action="#{DataverseUserPage.init}" />
-                    <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse(), (DataverseUserPage.editMode == 'CREATE' ? bundle['user.createBtn'] : bundle.account))}"/>
-                </f:metadata>
+
+                <h1>#{pageTitle}</h1>
                 <h:form id="dataverseUserForm">
 
                     <p:focus context="dataverseUserForm"/>
-                    <div class="clearfix" jsf:rendered="#{empty DataverseUserPage.editMode}">
-                        <div class="btn-group pull-right" jsf:rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
-                            <button type="button" id="editAccount" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                <ui:fragment rendered="#{DataverseUserPage.accountDetailsEditable}">
-                                    <span class="glyphicon glyphicon-pencil"/> #{bundle['account.edit']}
-                                </ui:fragment>
-                                <ui:fragment rendered="#{! DataverseUserPage.accountDetailsEditable}">
-                                    #{bundle['account.info']}
-                                </ui:fragment>
-                                <span class="caret"></span>
-                            </button>
-                            <ul class="dropdown-menu pull-right text-left" role="menu">
-                                <ui:fragment rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
-                                    <li>
-                                        <p:commandLink id="editAccount" rendered="#{DataverseUserPage.accountDetailsEditable}"
-                                                       actionListener="#{DataverseUserPage.edit}" update="@form" oncomplete="javascript:bind_bsui_components();">
-                                            <h:outputText value="#{bundle['account.info']}" />
-                                        </p:commandLink>
-                                    </li>
-                                    <li>
-                                        <p:commandLink id="changePassword" rendered="#{DataverseUserPage.passwordEditable}" 
-                                                       actionListener="#{DataverseUserPage.changePassword}" update="@form" oncomplete="javascript:bind_bsui_components();">
-                                            <h:outputText value="#{bundle.passwd}" />
-                                        </p:commandLink>
-                                    </li>
-                                </ui:fragment>
-                            </ul>
-                        </div>
-                    </div>
-
+                    
                     <p:panel rendered="#{DataverseUserPage.editMode == 'FORGOT'}">
                         <h:outputText value="#{bundle['user.lostPasswdTip']}" />
                     </p:panel>
 
-                    <p:tabView id="dataRelatedToMeView" activeIndex="#{DataverseUserPage.activeIndex}" dynamic="true" rendered="#{empty DataverseUserPage.editMode}">
-                        <p:ajax event="tabChange" listener="#{DataverseUserPage.onTabChange}" update="@all" oncomplete="javascript:bind_bsui_components();" />
+                    <p:tabView id="dataRelatedToMeView" activeIndex="#{DataverseUserPage.activeIndex}" dynamic="true" cache="false" rendered="#{empty DataverseUserPage.editMode}">
+                        <p:ajax event="tabChange" listener="#{DataverseUserPage.onTabChange}" update="@all"  />
                         <p:tab id="myData" title="#{bundle['user.dataRelatedToMe']}">
                             <ui:include src="mydata_fragment.xhtml"></ui:include>
                         </p:tab>
                         <p:tab id="notifications" title="#{bundle['header.user.selectTab.notifications']}">
+                            <div class="panel panel-default" jsf:rendered="#{settingsWrapper.showMuteOptions}">
+                                <div data-toggle="collapse" data-target="#muteCollapse" aria-expanded="false" class="panel-heading text-info" role="button" aria-controls="muteCollapse">
+                                    #{bundle['notification.muteOptions']} <span class="glyphicon glyphicon-chevron-down" />
+                                </div>
+                                <div id="muteCollapse" class="collapse">
+                                    <div class="panel-body">
+                                        <div class="form-group text-left">
+                                            <label for="mutedEmails" class="col-sm-4 control-label">
+                                                #{bundle['notification.mutedEmails']}
+                                            </label>
+                                            <div class="col-sm-8">
+                                                <p:selectManyCheckbox id="mutedEmails" value="#{DataverseUserPage.toReceiveEmails}"
+                                                    styleClass="grid-checkbox" layout="grid" columns="1">
+                                                    <f:selectItems value="#{DataverseUserPage.notificationTypeList}" var="t"
+                                                        itemLabel="#{t.description}" itemValue="#{t}"
+                                                        itemDisabled="#{DataverseUserPage.isDisabled(t)}" />
+                                                </p:selectManyCheckbox>
+                                            </div>
+                                        </div>
+                                        <div class="form-group text-left">
+                                            <label for="mutedNotifications" class="col-sm-4 control-label">
+                                                #{bundle['notification.mutedNotifications']}
+                                            </label>
+                                            <div class="col-sm-8">
+                                                <p:selectManyCheckbox id="mutedNotifications" value="#{DataverseUserPage.toReceiveNotifications}"
+                                                    styleClass="grid-checkbox" layout="grid" columns="1">
+                                                    <f:selectItems value="#{DataverseUserPage.notificationTypeList}" var="t"
+                                                        itemLabel="#{t.description}" itemValue="#{t}"
+                                                        itemDisabled="#{DataverseUserPage.isDisabled(t)}" />
+                                                </p:selectManyCheckbox>
+                                            </div>
+                                        </div>
+                                        <p:commandButton id="save" styleClass="btn btn-default" value="#{bundle.saveChanges}"
+                                            action="#{DataverseUserPage.save}" onclick="PF('muteCollapse').collapse('hide')" update="@form"/>
+                                    </div>
+                                </div>
+                            </div>
+                            <hr/>
                             <div class="table-container">
                                 <ui:repeat value="#{DataverseUserPage.notificationsList}" var="item">
                                     <div class="notification-item #{item.displayAsRead ? '' : 'bg-warning'}">
@@ -100,6 +121,8 @@
                                                             <a href="https://demo.dataverse.org">#{bundle['notification.demoSite']}</a>
                                                         </o:param>
                                                     </h:outputFormat>
+                                                    <!--Only show message about an email confirmation link to non-Shib users (Shib users can't edit their accounts)-->
+                                                    <h:outputFormat value=" #{bundle['notification.welcomeConfirmEmail']}" rendered="#{DataverseUserPage.accountDetailsEditable}"/>
                                                 </ui:fragment>
                                                 <ui:fragment rendered="#{item.type == 'CREATEDV'}">
                                                     <span class="icon-dataverse text-icon-inline text-muted"></span>
@@ -129,6 +152,20 @@
                                                         </o:param>
                                                     </h:outputFormat>
                                                 </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'DATASETCREATED'}">
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.datasetCreated']}" escape="false">
+                                                        <o:param>
+                                                            <a href="/dataset.xhtml?persistentId=#{item.theObject.getGlobalId()}" title="#{item.theObject.getDisplayName()}">#{item.theObject.getDisplayName()}</a>
+                                                        </o:param>
+                                                        <o:param>
+                                                            <a href="/dataverse/#{item.theObject.getOwner().getAlias()}" title="#{item.theObject.getOwner().getDisplayName()}">#{item.theObject.getOwner().getDisplayName()}</a>
+                                                        </o:param>
+                                                        <o:param>
+                                                            #{item.requestor.name}
+                                                        </o:param>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
                                                 <ui:fragment rendered="#{item.type == 'SUBMITTEDDS'}">
                                                     <span class="icon-dataset text-icon-inline text-muted"></span>
                                                     <h:outputFormat value="#{bundle['notification.wasSubmittedForReview']}" escape="false">
@@ -144,9 +181,6 @@
                                                         <o:param>
                                                             #{DataverseUserPage.getRequestorEmail(item)}
                                                         </o:param>
-                                                        <o:param>
-                                                            #{DataverseUserPage.getReasonForReturn(item.theObject)}
-                                                        </o:param>
                                                     </h:outputFormat>
                                                 </ui:fragment>
                                                 <ui:fragment rendered="#{item.type == 'RETURNEDDS'}">
@@ -169,6 +203,17 @@
                                                 <ui:fragment rendered="#{item.type == 'PUBLISHEDDS'}">
                                                     <span class="icon-dataset text-icon-inline text-muted"></span>
                                                     <h:outputFormat value="#{bundle['notification.wasPublished']}" escape="false">
+                                                        <o:param>
+                                                            <a href="/dataset.xhtml?persistentId=#{item.theObject.getDataset().getGlobalId()}&amp;faces-redirect=true" title="#{item.theObject.getDataset().getDisplayName()}">#{item.theObject.getDataset().getDisplayName()}</a>
+                                                        </o:param>
+                                                        <o:param>
+                                                            <a href="/dataverse/#{item.theObject.getDataset().getOwner().getAlias()}" title="#{item.theObject.getDataset().getOwner().getDisplayName()}">#{item.theObject.getDataset().getOwner().getDisplayName()}</a>
+                                                        </o:param>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'PUBLISHFAILED_PIDREG'}">
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.publishFailedPidReg']}" escape="false">
                                                         <o:param>
                                                             <a href="/dataset.xhtml?persistentId=#{item.theObject.getDataset().getGlobalId()}&amp;version=DRAFT&amp;faces-redirect=true" title="#{item.theObject.getDataset().getDisplayName()}">#{item.theObject.getDataset().getDisplayName()}</a>
                                                         </o:param>
@@ -191,36 +236,27 @@
                                                         </o:param>
                                                     </h:outputFormat>
                                                 </ui:fragment>
-                                                <ui:fragment rendered="#{item.type == 'GRANTFILEACCESS'}">
+                                                <ui:fragment rendered="#{item.type == 'REQUESTEDFILEACCESS'}">
                                                     <span class="icon-dataset text-icon-inline text-muted"></span>
-                                                    <h:outputFormat value="#{bundle['notification.grantFileAccess']}" escape="false">
+                                                    <h:outputFormat value="#{bundle['notification.requestedFileAccess']}" escape="false">
                                                         <o:param>
                                                             <a href="/dataset.xhtml?persistentId=#{item.theObject.getGlobalId()}" title="#{item.theObject.displayName}">#{item.theObject.displayName}</a>
                                                         </o:param>
                                                     </h:outputFormat>
                                                 </ui:fragment>
-                                                <ui:fragment rendered="#{item.type == 'REJECTFILEACCESS'}">
+                                                <ui:fragment rendered="#{item.type == 'GRANTFILEACCESS'}">
                                                     <span class="icon-dataset text-icon-inline text-muted"></span>
-                                                    <h:outputFormat value="#{bundle['notification.rejectFileAccess']}" escape="false">
+                                                    <h:outputFormat value="#{bundle['notification.grantFileAccess']}" escape="false">
                                                         <o:param>
                                                             <a href="/dataset.xhtml?persistentId=#{item.theObject.getGlobalId()}" title="#{item.theObject.displayName}">#{item.theObject.displayName}</a>
                                                         </o:param>
                                                     </h:outputFormat>
                                                 </ui:fragment>
-                                                <ui:fragment rendered="#{item.type == 'MAPLAYERUPDATED'}">
-                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
-                                                    <h:outputFormat value="#{bundle['notification.worldMap.added']}" escape="false">
-                                                        <o:param>
-                                                            <a href="/dataset.xhtml?persistentId=#{item.theObject.getDataset().getGlobalId()}" title="#{item.theObject.getDataset().getDisplayName()}">#{item.theObject.getDataset().getDisplayName()}</a>
-                                                        </o:param>
-                                                    </h:outputFormat>
-                                                </ui:fragment>
-                                                <ui:fragment rendered="#{item.type == 'MAPLAYERDELETEFAILED'}">
+                                                <ui:fragment rendered="#{item.type == 'REJECTFILEACCESS'}">
                                                     <span class="icon-dataset text-icon-inline text-muted"></span>
-                                                    <h:outputFormat value="#{bundle['notification.maplayer.deletefailed']}" escape="false">
-                                                        <o:param value="#{item.theObject.getLabel()}"/>
+                                                    <h:outputFormat value="#{bundle['notification.rejectFileAccess']}" escape="false">
                                                         <o:param>
-                                                            <a href="/dataset.xhtml?persistentId=#{item.theObject.getDatasetVersion().getDataset().getGlobalId()}" title="#{item.theObject.getDatasetVersion().getDataset().getDisplayName()}">#{item.theObject.getDatasetVersion().getDataset().getDisplayName()}</a>
+                                                            <a href="/dataset.xhtml?persistentId=#{item.theObject.getGlobalId()}" title="#{item.theObject.displayName}">#{item.theObject.displayName}</a>
                                                         </o:param>
                                                     </h:outputFormat>
                                                 </ui:fragment>
@@ -313,6 +349,48 @@
                                                         <f:param value="#{item.theObject.getDataset().getDisplayName()}"/>
                                                     </h:outputFormat>
                                                 </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'GLOBUSUPLOADCOMPLETED'}">
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.globus.upload.completed']}" escape="false">
+                                                        <f:param value="#{item.theObject.getGlobalId()}"/>
+                                                        <f:param value="#{item.theObject.getDisplayName()}"/>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'GLOBUSDOWNLOADCOMPLETED'}">
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.globus.download.completed']}" escape="false">
+                                                        <f:param value="#{item.theObject.getGlobalId()}"/>
+                                                        <f:param value="#{item.theObject.getDisplayName()}"/>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'GLOBUSUPLOADCOMPLETEDWITHERRORS'}">
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.globus.upload.completedWithErrors']}" escape="false">
+                                                        <f:param value="#{item.theObject.getGlobalId()}"/>
+                                                        <f:param value="#{item.theObject.getDisplayName()}"/>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'GLOBUSUPLOADREMOTEFAILURE'}">
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.globus.upload.failedRemotely']}" escape="false">
+                                                        <f:param value="#{item.theObject.getGlobalId()}"/>
+                                                        <f:param value="#{item.theObject.getDisplayName()}"/>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'GLOBUSUPLOADLOCALFAILURE'}">
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.globus.upload.failedRemotely']}" escape="false">
+                                                        <f:param value="#{item.theObject.getGlobalId()}"/>
+                                                        <f:param value="#{item.theObject.getDisplayName()}"/>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'GLOBUSDOWNLOADCOMPLETEDWITHERRORS'}">
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.globus.download.completedWithErrors']}" escape="false">
+                                                        <f:param value="#{item.theObject.getGlobalId()}"/>
+                                                        <f:param value="#{item.theObject.getDisplayName()}"/>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
                                                 <ui:fragment rendered="#{item.type == 'CHECKSUMIMPORT'}">
                                                     <span class="icon-dataset text-icon-inline text-muted"></span>
                                                     <h:outputFormat value="#{bundle['notification.import.checksum']}" escape="false">
@@ -330,6 +408,8 @@
                                                     <h:outputFormat value="#{bundle['notification.ingestCompleted']}" escape="false">
                                                         <f:param value="#{item.theObject.getGlobalId()}"/>
                                                         <f:param value="#{item.theObject.getDisplayName()}"/>
+                                                        <f:param value="#{settingsWrapper.guidesBaseUrl}"/>
+                                                        <f:param value="#{settingsWrapper.guidesVersion}"/>
                                                     </h:outputFormat>
                                                 </ui:fragment>
                                                 <ui:fragment rendered="#{item.type == 'INGESTCOMPLETEDWITHERRORS'}">
@@ -337,16 +417,73 @@
                                                     <h:outputFormat value="#{bundle['notification.ingestCompletedWithErrors']}" escape="false">
                                                         <f:param value="#{item.theObject.getGlobalId()}"/>
                                                         <f:param value="#{item.theObject.getDisplayName()}"/>
+                                                        <f:param value="#{settingsWrapper.guidesBaseUrl}"/>
+                                                        <f:param value="#{settingsWrapper.guidesVersion}"/>
                                                     </h:outputFormat>
                                                 </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'WORKFLOW_FAILURE'}">
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.workflowFailed']}" escape="false">
+                                                        <o:param>
+                                                            <a href="/dataset.xhtml?persistentId=#{item.theObject.getDataset().getGlobalId()}&amp;version=DRAFT&amp;faces-redirect=true" title="#{item.theObject.getDataset().getDisplayName()}">#{item.theObject.getDataset().getDisplayName()}</a>
+                                                        </o:param>
+                                                        <o:param>
+                                                            <a href="/dataverse/#{item.theObject.getDataset().getOwner().getAlias()}" title="#{item.theObject.getDataset().getOwner().getDisplayName()}">#{item.theObject.getDataset().getOwner().getDisplayName()}</a>
+                                                        </o:param>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'WORKFLOW_SUCCESS'}">
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.workflowSucceeded']}" escape="false">
+                                                        <o:param>
+                                                            <a href="/dataset.xhtml?persistentId=#{item.theObject.getDataset().getGlobalId()}&amp;version=DRAFT&amp;faces-redirect=true" title="#{item.theObject.getDataset().getDisplayName()}">#{item.theObject.getDataset().getDisplayName()}</a>
+                                                        </o:param>
+                                                        <o:param>
+                                                            <a href="/dataverse/#{item.theObject.getDataset().getOwner().getAlias()}" title="#{item.theObject.getDataset().getOwner().getDisplayName()}">#{item.theObject.getDataset().getOwner().getDisplayName()}</a>
+                                                        </o:param>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'STATUSUPDATED'}">
+                                                    <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.statusUpdated']}" escape="false">
+                                                        <o:param>
+                                                            <a href="/dataset.xhtml?persistentId=#{item.theObject.getDataset().getGlobalId()}&amp;version=DRAFT&amp;faces-redirect=true" title="#{item.theObject.getDataset().getDisplayName()}">#{item.theObject.getDataset().getDisplayName()}</a>
+                                                        </o:param>
+                                                        <f:param value="#{DatasetUtil:getLocaleCurationStatusLabel(item.theObject.currentCurationStatus)}"/>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'PIDRECONCILED'}">
+                                                    <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.pidreconciled']}" escape="false">
+                                                        <o:param>
+                                                            <a href="/dataset.xhtml?persistentId=#{item.theObject.getDataset().getGlobalId()}&amp;version=DRAFT&amp;faces-redirect=true" title="#{item.theObject.getDataset().getDisplayName()}">#{item.theObject.getDataset().getDisplayName()}</a>
+                                                        </o:param>
+                                                        <f:param value="#{item.theObject.getDataset().getGlobalId()}"/>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{item.type == 'DATASETMENTIONED'}">
+                                                <o:importFunctions type="edu.harvard.iq.dataverse.util.json.JsonUtil" />
+                                                    <span class="icon-dataset text-icon-inline text-muted"></span>
+                                                    <h:outputFormat value="#{bundle['notification.datasetMentioned']}" escape="false">
+                                                    <f:param value="#{JsonUtil:getJsonObject(item.additionalInfo).getString('@type')}"/>
+                                                    <f:param value="#{JsonUtil:getJsonObject(item.additionalInfo).getString('@id')}"/>
+                                                    <f:param value="#{JsonUtil:getJsonObject(item.additionalInfo).getString('name')}"/>
+                                                    <f:param value="#{JsonUtil:getJsonObject(item.additionalInfo).getString('relationship', 'isRelatedTo')}"/>
+                                                        <o:param>
+                                                            <a href="/dataset.xhtml?persistentId=#{item.theObject.getGlobalId()}&amp;version=DRAFT&amp;faces-redirect=true" title="#{item.theObject.getDisplayName()}">#{item.theObject.getDisplayName()}</a>
+                                                        </o:param>
+                                                    </h:outputFormat>
+                                                </ui:fragment>
+                                                
 
                                             </ui:fragment>
                                             <h:outputText value="#{item.localeSendDate}" styleClass="text-muted small"/>
                                         </div>
                                         <div class="notification-item-cell">
                                             <p:commandLink title="#{bundle.removeNotification}" styleClass="bootstrap-button-tooltip"
-                                                           action="#{DataverseUserPage.remove(item.id)}" update="@form"
-                                                           oncomplete="bind_bsui_components();">
+                                                           action="#{DataverseUserPage.remove(item.id)}" update="@form">
                                                 <span class="glyphicon glyphicon-remove"></span>
                                             </p:commandLink>
                                         </div>
@@ -355,124 +492,167 @@
                             </div>
                         </p:tab>
                         <p:tab id="accountInfo" title="#{bundle['header.user.selectTab.accountInfo']}">
-                            <div class="form-horizontal" jsf:rendered="#{!empty DataverseUserPage.currentUser}">
-                                <div class="form-group" jsf:rendered="#{not DataverseUserPage.accountDetailsEditable}">
-                                    <div class="col-sm-12">
-                                        <p class="help-block">
-                                            <h:outputText value="#{bundle['user.isShibUser']}" />
-                                            <h:outputText value=" #{bundle['user.helpShibUserMigrateOffShibBeforeLink']} " />
-                                            <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                            </p:commandLink>
-                                            <h:outputText value=" #{bundle['user.helpShibUserMigrateOffShibAfterLink']}" />
-                                        </p>
-                                    </div>
-                                </div>
-                                <div class="form-group" jsf:rendered="#{DataverseUserPage.userAuthProvider.OAuthProvider}">
-                                    <div class="col-sm-12">
-                                        <p class="help-block">
-                                            <h:outputFormat value="#{bundle['user.helpOAuthBeforeLink']} ">
-                                                <f:param value="#{DataverseUserPage.userAuthProvider.info.title}"/>
-                                            </h:outputFormat>
-                                            <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                            </p:commandLink>
-                                            <h:outputText value=" #{bundle['user.helpOAuthAfterLink']}" />
-                                        </p>
-                                    </div>
-                                </div>
-                                <!-- Username -->
-                                <div class="form-group">
-                                    <label for="userNameEmail" class="col-sm-3 control-label">
-                                        #{bundle['user.username']}
-                                    </label>
-                                    <div class="col-sm-9">
-                                        <p class="form-control-static">#{DataverseUserPage.currentUser.identifier.replaceFirst("@", "")}</p>
-                                    </div>
-                                </div>
-                                <!-- First Name -->
-                                <div class="form-group">
-                                    <label for="firstName" class="col-sm-3 control-label">
-                                        #{bundle['user.firstName']}
-                                    </label>
-                                    <div class="col-sm-9">
-                                        <p class="form-control-static">#{DataverseUserPage.currentUser.firstName}</p>
-                                    </div>
-                                </div>
-                                <!-- Last Name -->
-                                <div class="form-group">
-                                    <label for="lastName" class="col-sm-3 control-label">
-                                        #{bundle['user.lastName']}
-                                    </label>
-                                    <div class="col-sm-9">
-                                        <p class="form-control-static">#{DataverseUserPage.currentUser.lastName}</p>
-                                    </div>
-                                </div>
-                                <!-- Email -->
-                                <div class="form-group">
-                                    <label for="email" class="col-sm-3 control-label">
-                                        #{bundle.email}
-                                    </label>
-                                    <div class="col-sm-9 form-col-container">
-                                        <div class="col-sm-4 form-col-container">
-                                            <p class="form-control-static">#{DataverseUserPage.currentUser.email}</p>
-                                        </div>
-                                        <div class="col-sm-2 form-col-container">
-                                            <p class="form-control-static #{DataverseUserPage.emailIsVerified ? 'text-success' : 'text-danger'}">
-                                                <ui:fragment rendered="#{DataverseUserPage.emailNotVerified}">
-                                                    <span class="glyphicon glyphicon-ban-circle"/> #{bundle['confirmEmail.notVerified']}
-                                                </ui:fragment>
-                                                <ui:fragment rendered="#{!DataverseUserPage.emailNotVerified}">
-                                                    <span class="glyphicon glyphicon-ok"/> #{bundle['confirmEmail.verified']}
-                                                </ui:fragment>
-                                            </p>
-                                        </div>
-                                        <div class="col-sm-1">
-                                            <h:commandLink rendered="#{DataverseUserPage.showVerifyEmailButton()}" styleClass="btn btn-default" action="#{DataverseUserPage.sendConfirmEmail()}">
-                                                <span class="glyphicon glyphicon-ok"></span> #{bundle['confirmEmail.submitRequest']}
-                                            </h:commandLink>
-                                        </div>
-                                    </div>
-                                </div>
-                                <!-- ORCID iD, for example -->
-                                <div class="form-group" jsf:rendered="#{DataverseUserPage.userAuthProvider.displayIdentifier}">
-                                    <label for="userPersistentId" class="col-sm-3 control-label">
-                                        #{DataverseUserPage.userAuthProvider.persistentIdName}
-                                    </label>
-                                    <div class="col-sm-9">
-                                        <p class="form-control-static">
-                                            <h:graphicImage value="#{DataverseUserPage.userAuthProvider.logo}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], DataverseUserPage.userAuthProvider.persistentIdName)}"/>&#160;
-                                            <h:outputLink value="#{DataverseUserPage.userAuthProvider.persistentIdUrlPrefix}#{DataverseUserPage.currentUser.authenticatedUserLookup.persistentUserId}" title="#{DataverseUserPage.userAuthProvider.persistentIdName}" target="_blank">
-                                                <h:outputText value="#{DataverseUserPage.userAuthProvider.persistentIdUrlPrefix}#{DataverseUserPage.currentUser.authenticatedUserLookup.persistentUserId}"/>
-                                            </h:outputLink>
-                                        </p>
-                                    </div>
-                                </div>
-                                <!-- Affiliation -->
-                                <div class="form-group" jsf:rendered="#{!empty DataverseUserPage.currentUser.affiliation}">
-                                    <label for="affiliation" class="col-sm-3 control-label">
-                                        #{bundle.affiliation}
-                                    </label>
-                                    <div class="col-sm-9">
-                                        <p class="form-control-static">#{DataverseUserPage.currentUser.affiliation}</p>
-                                    </div>
-                                </div>
-                                <!-- Position (not populated for Shibboleth users) -->
-                                <div class="form-group" jsf:rendered="#{!empty DataverseUserPage.currentUser.position}">
-                                    <label for="position" class="col-sm-3 control-label">
-                                        #{bundle['user.position']}
-                                    </label>
-                                    <div class="col-sm-9">
-                                        <p class="form-control-static">#{DataverseUserPage.currentUser.position}</p>
-                                    </div>
+                            <div class="button-block tab-header margin-bottom text-right" jsf:rendered="#{empty DataverseUserPage.editMode and (DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable)}">
+                                <div class="btn-group">
+                                    <button type="button" id="editAccount" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                        <ui:fragment rendered="#{DataverseUserPage.accountDetailsEditable}">
+                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['account.edit']}
+                                        </ui:fragment>
+                                        <span class="caret"></span>
+                                    </button>
+                                    <ul class="dropdown-menu pull-right text-left">
+                                        <ui:fragment rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
+                                            <li>
+                                                <p:commandLink id="editAccount" rendered="#{DataverseUserPage.accountDetailsEditable}"
+                                                               actionListener="#{DataverseUserPage.edit}" update="@form">
+                                                    <h:outputText value="#{bundle['account.info']}" />
+                                                </p:commandLink>
+                                            </li>
+                                            <li>
+                                                <p:commandLink id="changePassword" rendered="#{DataverseUserPage.passwordEditable}" 
+                                                               actionListener="#{DataverseUserPage.changePassword}" update="@form">
+                                                    <h:outputText value="#{bundle.passwd}" />
+                                                </p:commandLink>
+                                            </li>
+                                            <li>
+                                                <p:commandLink id="removeOrcid" rendered="#{!(of:isInstance('edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP', DataverseUserPage.userAuthProvider)) and !empty DataverseUserPage.currentUser.authenticatedOrcid}" 
+                                                               actionListener="#{DataverseUserPage.removeOrcid}" update="@form">
+                                                    <h:outputText value="#{bundle['user.orcid.remove']}" />
+                                                </p:commandLink>
+                                            </li>
+                                        </ui:fragment>
+                                    </ul>
                                 </div>
                             </div>
+                            <div class="metadata-container" jsf:rendered="#{!empty DataverseUserPage.currentUser}">
+                                <!-- Shib -->
+                                <p class="help-block" id="userShib" jsf:rendered="#{not DataverseUserPage.accountDetailsEditable}">
+                                    <h:outputText value="#{bundle['user.isShibUser']}" />
+                                    <h:outputText value=" #{bundle['user.helpShibUserMigrateOffShibBeforeLink']} " />
+                                    <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                    </p:commandLink>
+                                    <h:outputText value=" #{bundle['user.helpShibUserMigrateOffShibAfterLink']}" />
+                                </p>
+                                <!-- OAuth -->
+                                <p class="help-block" id="userOAuth" jsf:rendered="#{DataverseUserPage.userAuthProvider.OAuthProvider}">
+                                    <h:outputFormat value="#{bundle['user.helpOAuthBeforeLink']} ">
+                                        <f:param value="#{DataverseUserPage.userAuthProvider.info.title}"/>
+                                    </h:outputFormat>
+                                    <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                    </p:commandLink>
+                                    <h:outputText value=" #{bundle['user.helpOAuthAfterLink']}" />
+                                </p>
+                                <table class="metadata">
+                                    <tbody>
+                                        <!-- Username -->
+                                        <tr id="userIdentifier">
+                                            <th scope="row">
+                                                #{bundle['user.username']}
+                                            </th>
+                                            <td>
+                                                #{DataverseUserPage.currentUser.identifier.replaceFirst("@", "")}
+                                            </td>
+                                        </tr>
+                                        <!-- First Name -->
+                                        <tr id="userFirstName">
+                                            <th scope="row">
+                                                #{bundle['user.firstName']}
+                                            </th>
+                                            <td>
+                                                #{DataverseUserPage.currentUser.firstName}
+                                            </td>
+                                        </tr>
+                                        <!-- Last Name -->
+                                        <tr id="userLastName">
+                                            <th scope="row">
+                                                #{bundle['user.lastName']}
+                                            </th>
+                                            <td>
+                                                #{DataverseUserPage.currentUser.lastName}
+                                            </td>
+                                        </tr>
+                                        <!-- Email -->
+                                        <tr id="userEmail">
+                                            <th scope="row">
+                                                #{bundle.email}
+                                            </th>
+                                            <td>
+                                                <p class="form-control-static" style="display:inline-block;">
+                                                    <span class="form-control-static">#{DataverseUserPage.currentUser.email}</span>
+                                                    &#160;
+                                                    <span class="text-danger" jsf:rendered="#{DataverseUserPage.emailNotVerified}">
+                                                        <span class="glyphicon glyphicon-ban-circle"/> #{bundle['confirmEmail.notVerified']}
+                                                    </span>
+                                                    <span class="text-success" jsf:rendered="#{!DataverseUserPage.emailNotVerified}">
+                                                        <span class="glyphicon glyphicon-ok"/> #{bundle['confirmEmail.verified']}
+                                                    </span>
+                                                </p>
+                                                &#160;
+                                                <p:commandLink rendered="#{DataverseUserPage.showVerifyEmailButton()}" styleClass="btn btn-default" 
+                                                                id="verifyEmailButton"
+                                                                action="#{DataverseUserPage.sendConfirmEmail()}"
+                                                                update="@([id$=verifyEmailButton]), :messagePanel"
+                                                               >
+                                                    <span class="glyphicon glyphicon-ok"></span> #{bundle['confirmEmail.submitRequest']}
+                                                </p:commandLink>
+                                            </td>
+                                        </tr>
+                                        <!-- PersistentId, ORCID iD -->
+                                        <tr id="orcid" jsf:rendered="#{DataverseUserPage.currentUser.authenticatedOrcid != null}">
+                                            <th scope="row">
+                                                #{bundle['user.orcid']}
+                                            </th>
+                                            <td>
+                                                <o:importFunctions type="edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP" />
+                                                <h:graphicImage value="#{OrcidOAuth2AP:getLogo()}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], bundle['user.orcid'])}"/>&#160;
+                                                <h:outputLink value="#{DataverseUserPage.currentUser.authenticatedOrcid}" title="#{bundle['user.orcid.link']}" target="_blank">
+                                                    <h:outputText value="#{DataverseUserPage.orcidForDisplay}"/>
+                                                </h:outputLink>
+                                            </td>
+                                        </tr>
+                                        <!-- New row for ORCID authentication button -->
+                                        <tr id="orcidAuthentication" jsf:rendered="#{(DataverseUserPage.currentUser.authenticatedOrcid == null) and DataverseUserPage.orcidEnabled}">
+                                            <th scope="row">
+                                                #{bundle['user.orcid']}
+                                            </th>
+                                            <td>
+                                                <p:commandButton value="#{bundle['user.orcid.authenticate']}"
+                                                                 action="#{DataverseUserPage.startOrcidAuthentication()}"
+                                                                 styleClass="btn btn-default"
+                                                                 update="@form">
+                                                    <span class="glyphicon glyphicon-link"></span>
+                                                </p:commandButton>
+                                            </td>
+                                        </tr>
+                                        <!-- Affiliation -->
+                                        <tr id="userAffiliation" jsf:rendered="#{!empty DataverseUserPage.currentUser.affiliation}">
+                                            <th scope="row">
+                                                #{bundle.affiliation}
+                                            </th>
+                                            <td>
+                                                #{DataverseUserPage.currentUser.affiliation}
+                                            </td>
+                                        </tr>
+                                        <!-- Position (not populated for Shibboleth users) -->
+                                        <tr id="userPosition" jsf:rendered="#{!empty DataverseUserPage.currentUser.position}">
+                                            <th scope="row">
+                                                #{bundle['user.position']}
+                                            </th>
+                                            <td>
+                                                #{DataverseUserPage.currentUser.position}
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
                         </p:tab>
                         <p:tab id="apiTokenTab" title="#{bundle['apitoken.title']}">
                             <p class="help-block">
@@ -481,10 +661,33 @@
                                     <f:param value="&lt;/a&gt;"/>
                                 </h:outputFormat>
                             </p>
+                            <div class="metadata-container margin-bottom-half" jsf:rendered="#{ApiTokenPage.apiTokenExpiration != ''}">
+                                <table class="metadata">
+                                    <tbody>
+                                        <tr>
+                                            <th scope="row">
+                                                <h:outputText value="#{bundle['apitoken.expirationDate.label']}"/>
+                                            </th>
+                                            <td>
+                                                <h:outputText value="#{ApiTokenPage.apiTokenExpiration}"/>
+                                            </td>
+                                            <td class="text-warning" jsf:rendered="#{ApiTokenPage.tokenIsExpired()}">
+                                                <span class="glyphicon glyphicon-warning-sign"></span>
+                                                <h:outputText value=" #{bundle['apitoken.expired.error']}"/>
+                                            </td>
+                                            <!-- leaving warning off for now -->
+                                            <td class="text-danger" jsf:rendered="#{false}">
+                                                <span class="glyphicon glyphicon-exclamation-sign"></span>
+                                                <h:outputText value=" #{bundle['apitoken.expired.warning']}"/>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
                             <div id="apiToken" class="highlight hidden">
-                                 <pre>
-                                    <code class="language-html" data-lang="html">${ApiTokenPage.apiToken}</code>
-                                 </pre>
+                                <pre>
+                                    <code class="language-html" data-lang="html">#{ApiTokenPage.apiToken}</code>
+                                </pre>
                             </div>
                             <!--Script removes "hidden" class from div containing API token to stop javascript browser exploits-->
                             <script>
@@ -498,10 +701,16 @@
                                 });
                                 //]]>
                             </script>
-                            <div>
+                            <div class="btn-toolbar" role="toolbar">
+                                <button class="btn btn-default btn-copy" data-clipboard-action="copy" data-clipboard-text="#{ApiTokenPage.apiToken}" type="button" jsf:rendered="#{ApiTokenPage.checkForApiToken() and !ApiTokenPage.tokenIsExpired()}">
+                                    #{bundle['copyClipboard']}
+                                </button>
                                 <button class="btn btn-default" jsf:action="#{ApiTokenPage.generate()}">
                                     #{ApiTokenPage.checkForApiToken() ? bundle['apitoken.regenerateBtn'] : bundle['apitoken.generateBtn']}
                                 </button>
+                                <button class="btn btn-default" jsf:action="#{ApiTokenPage.revoke()}" jsf:rendered="#{ApiTokenPage.apiTokenExpiration != ''}">
+                                    #{bundle['apitoken.revokeBtn']}
+                                </button>
                             </div>
                         </p:tab>
                         <ui:remove>
@@ -520,21 +729,25 @@
                             </ui:fragment>
                             <div class="form-horizontal">
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
-                                <!-- Username -->
-                                    <label for="userNameEmail" class="col-sm-3 control-label">
-                                        #{bundle['user.username']} <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                    <!-- Username -->                                   
+                                    <h:outputLabel value="#{bundle['user.username']}" for="userName" class="col-sm-3 control-label">
+                                        <span class="glyphicon glyphicon-asterisk text-danger"/>
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.username.illegal.tip']}"></span>
-                                    </label>
+                                    </h:outputLabel> 
+                                                                       
                                     <div class="col-sm-9">
-                                        <p class="help-block">#{bundle['user.username.valid']}</p>
+                                        <div class="help-block">
+                                            <h:outputText value="#{bundle['user.username.valid']}" escape="false">
+                                            </h:outputText>
+                                        </div>
                                     </div>
                                     <div class="col-sm-4 col-sm-offset-3">
                                         <p:inputText id="userName" styleClass="form-control"
-                                                        validator="#{DataverseUserPage.validateUserName}"
-                                                        value="#{DataverseUserPage.username}"
-                                                        disabled="#{DataverseUserPage.editMode != 'CREATE'}"
-                                                        binding="#{DataverseUserPage.usernameField}"/>
+                                                     validator="#{DataverseUserPage.validateUserName}"
+                                                     value="#{DataverseUserPage.username}"
+                                                     disabled="#{DataverseUserPage.editMode != 'CREATE'}"
+                                                     binding="#{DataverseUserPage.usernameField}"/>
                                         <p:message for="userName" display="text" />
                                     </div>
                                 </div>
@@ -552,12 +765,11 @@
                                 </div>
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == DataverseUserPage.changePasswordMode}">
                                 <!-- Password -->
-                                    <label for="inputPassword" class="col-sm-3 control-label">
-                                        <h:outputText value="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.password'] : bundle['user.newPassword']}" />
-                                        <span class="glyphicon glyphicon-asterisk text-danger"></span>
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.passwd.illegal.tip']}"></span>
-                                    </label>
+                                <h:outputLabel value="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.password'] : bundle['user.newPassword']}"   for="inputPassword"  class="col-sm-3 control-label" >
+                                    <span class="glyphicon glyphicon-asterisk text-danger"></span>
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.passwd.illegal.tip']}"></span>
+                                </h:outputLabel>      
                                     <div class="col-sm-9">
                                         <div class="help-block">
                                             <h:outputFormat value="#{bundle['user.updatePassword.password']}" escape="false">
@@ -572,23 +784,21 @@
                                 </div>
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == DataverseUserPage.changePasswordMode}">
                                     <!-- Retype Password -->
-                                    <label for="retypePassword" class="col-sm-3 control-label">
-                                        #{bundle['user.rePasswd']} <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                    <h:outputLabel value="#{bundle['user.rePasswd']}" for="retypePassword" class="col-sm-3 control-label"> <span class="glyphicon glyphicon-asterisk text-danger"/>
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.rePasswd.tip']}"></span>
-                                    </label>
+                                    </h:outputLabel>
                                     <div class="col-sm-4">
                                         <p:password id="retypePassword" label="#{bundle['user.rePasswd']}" styleClass="form-control" value="#{DataverseUserPage.inputPassword}" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
                                         <p:message for="retypePassword" display="text" />
                                     </div>
                                 </div>
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
-                                <!-- First Name -->
-                                    <label for="firstName" class="col-sm-3 control-label">
-                                        #{bundle['user.firstName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.firstName.tip']}"></span>
-                                    </label>
+                                <!-- First Name -->                                       
+                                <h:outputLabel value="#{bundle['user.firstName']}" for="firstName" class="col-sm-3 control-label" > <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.firstName.tip']}"></span>
+                                </h:outputLabel>
                                     <div class="col-sm-4">
                                         <p:inputText id="firstName" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.firstName}" />
                                         <p:message for="firstName" display="text" />
@@ -596,11 +806,10 @@
                                 </div>
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                     <!-- Last Name -->
-                                    <label for="lastName" class="col-sm-3 control-label">
-                                        #{bundle['user.lastName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                    <h:outputLabel value="#{bundle['user.lastName']}" for="lastName" class="col-sm-3 control-label" >  <span class="glyphicon glyphicon-asterisk text-danger"/>
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.lastName.tip']}"></span>
-                                    </label>
+                                    </h:outputLabel>
                                     <div class="col-sm-4">
                                         <p:inputText id="lastName" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.lastName}" />
                                         <p:message for="lastName" display="text" />
@@ -608,11 +817,10 @@
                                 </div>
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                     <!-- Email -->
-                                    <label for="email" class="col-sm-3 control-label">
-                                        #{bundle.email} <span class="glyphicon glyphicon-asterisk text-danger"/>
+                                    <h:outputLabel value="#{bundle['email']}" for="email" class="col-sm-3 control-label">   <span class="glyphicon glyphicon-asterisk text-danger"/>
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.email.tip']}"></span>
-                                    </label>
+                                    </h:outputLabel>
                                     <div class="col-sm-4">
                                         <p:inputText id="email" styleClass="form-control"
                                                      validator="#{DataverseUserPage.validateUserEmail}"
@@ -621,29 +829,12 @@
                                     </div>
                                 </div>
                                 <!--FIXME: refactor to remove need for EDIT? userAuthProvider is null on CREATE-->
-                                <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'EDIT' and DataverseUserPage.userAuthProvider.displayIdentifier}">
-                                    <!-- ORCID iD, for example -->
-                                    <label for="userPersistentId" class="col-sm-3 control-label">
-                                        #{DataverseUserPage.userAuthProvider.persistentIdName}
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{DataverseUserPage.userAuthProvider.persistentIdDescription}"></span>
-                                    </label>
-                                    <div class="col-sm-4">
-                                        <p class="form-control-static">
-                                            <h:graphicImage value="#{DataverseUserPage.userAuthProvider.logo}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], DataverseUserPage.userAuthProvider.persistentIdName)}"/>&#160;
-                                            <h:outputLink value="#{DataverseUserPage.userAuthProvider.persistentIdUrlPrefix}#{DataverseUserPage.currentUser.authenticatedUserLookup.persistentUserId}" title="#{DataverseUserPage.userAuthProvider.persistentIdName}" target="_blank">
-                                                <h:outputText value="#{DataverseUserPage.userAuthProvider.persistentIdUrlPrefix}#{DataverseUserPage.currentUser.authenticatedUserLookup.persistentUserId}"/>
-                                            </h:outputLink>
-                                        </p>
-                                    </div>
-                                </div>
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                     <!-- Affiliation -->
-                                    <label for="affiliation" class="col-sm-3 control-label">
-                                        #{bundle.affiliation}
+                                    <h:outputLabel value="#{bundle.affiliation}" for="affiliation" class="col-sm-3 control-label">
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.affiliation.tip']}"></span>
-                                    </label>
+                                    </h:outputLabel>
                                     <div class="col-sm-4">
                                         <p:inputText id="affiliation" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.affiliation}" />
                                         <p:message for="affiliation" display="text" />
@@ -651,11 +842,10 @@
                                 </div>
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                 <!-- Position -->
-                                    <label for="position" class="col-sm-3 control-label">
-                                        #{bundle['user.position']}
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.position.tip']}"></span>
-                                    </label>
+                                <h:outputLabel value="#{bundle.position}" for="position" class="col-sm-3 control-label">
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.position.tip']}"></span>
+                                </h:outputLabel>
                                     <div class="col-sm-4">
                                         <p:inputText id="position" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.position}" />
                                         <p:message for="position" display="text" />
@@ -682,6 +872,5 @@
                 </h:form>
             </ui:define>
         </ui:composition>
-
     </h:body>
 </html>
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 4593d43cd1c..3cfa2ca487d 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -9,9 +9,37 @@
     xmlns:pt="http://java.sun.com/jsf/passthrough"
     xmlns:cc="http://java.sun.com/jsf/composite"
     xmlns:o="http://omnifaces.org/ui"
+    xmlns:fn="http://java.sun.com/jsp/jstl/functions"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
 
-    <script src="#{resource['js/fileupload.js']}"></script>
+
+    <!-- Create variables for frequently accessed values -->
+    <ui:param name="useDirectUpload" value="#{systemConfig.directUploadEnabled(dataset)}"/>
+    <ui:param name="checksumAlgName" value="#{systemConfig.getFileFixityChecksumAlgorithm().toString()}"/>
+    <ui:param name="hasPackageFile" value="#{EditDatafilesPage.workingVersion.hasPackageFile}"/>
+    <ui:param name="hasNonPackageFile" value="#{EditDatafilesPage.workingVersion.hasNonPackageFile}"/>
+    <ui:param name="isDatasetReleased" value="#{EditDatafilesPage.dataset.released}"/>
+    <ui:param name="hasRsyncScript" value="#{EditDatafilesPage.isHasRsyncScript()}"/>
+    <ui:param name="fileMetadatas" value="#{EditDatafilesPage.fileMetadatas}"/>
+    <ui:param name="hasFileMetadatas" value="#{!empty fileMetadatas}"/>
+    <ui:param name="showFileUploadComponent" value="#{datasetPage || EditDatafilesPage.showFileUploadComponent()}"/>
+    <ui:param name="showFileUploadFragment" value="#{datasetPage || EditDatafilesPage.showFileUploadFragment()}"/>
+    <ui:param name="isQuotaExceeded" value="#{EditDatafilesPage.isQuotaExceeded()}"/>
+    <ui:param name="isFileUploadCountExceeded" value="#{EditDatafilesPage.isFileUploadCountExceeded()}"/>
+    <ui:param name="maxFileUploadSize" value="#{EditDatafilesPage.getMaxFileUploadSizeInBytes()}"/>
+    <ui:param name="maxNumberOfFiles" value="#{EditDatafilesPage.getMaxNumberOfFiles()}"/>
+    <ui:param name="fileUploadsAvailable" value="#{EditDatafilesPage.getFileUploadsAvailable()}"/>
+    
+    <h:outputScript name='js/fileupload.js?version=#{systemConfig.getVersion()}' />
+    <ui:fragment rendered = '#{useDirectUpload}'>
+    <h:outputScript name='js/crypto-js/4.0.0/core.js'  />
+    <h:outputScript name='js/crypto-js/4.0.0/x64-core.js' rendered='#{(checksumAlgName eq "SHA-512")}'/>
+    <h:outputScript name='js/crypto-js/4.0.0/md5.js' rendered='#{true or checksumAlgName eq "MD5"}'/>
+    <h:outputScript name='js/crypto-js/4.0.0/sha1.js'  rendered='#{checksumAlgName eq "SHA-1"}'/>
+    <h:outputScript name='js/crypto-js/4.0.0/sha256.js'  rendered='#{checksumAlgName eq "SHA-256"}'/>
+    <h:outputScript name='js/crypto-js/4.0.0/sha512.js' rendered='#{checksumAlgName eq "SHA-512"}'/>
+    </ui:fragment>
+
     <!-- Static Tab Layout -->
     <div data-widget="content" class="ui-tabs ui-widget ui-widget-content ui-corner-all ui-hidden-container ui-tabs-top" id="datasetForm:tabView">
         <ul role="tablist" class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
@@ -22,7 +50,7 @@
         <div class="ui-tabs-panels">
             <div aria-hidden="false" role="tabpanel" class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="datasetForm:tabView:dataFilesTab">
                 <!-- Create dataset workflow info msg + user guide link -->
-                <ui:fragment rendered="#{createDataset}">
+                <ui:fragment>
                     <p class="help-block">
                         <h:outputFormat value="#{bundle['dataset.message.uploadFilesSingle.message']}" escape="false"
                                         rendered="#{settingsWrapper.uploadMethodsCount == 1}">
@@ -36,14 +64,14 @@
                 </ui:fragment>
                 <!-- Upload -->
                 <div class="panel-group" role="tablist" aria-multiselectable="true"
-                      id="fileUploadFragment" jsf:rendered="#{datasetPage || EditDatafilesPage.showFileUploadFragment()}">
+                      id="fileUploadFragment" jsf:rendered="#{showFileUploadFragment}">
                     
                     <div jsf:id="httpPanel" jsf:rendered="#{settingsWrapper.HTTPUpload}" class="panel panel-default">
                         <div role="tab" id="headingHTTP" data-toggle="collapse" data-target="#panelCollapseHTTP" class="panel-heading text-info" aria-expanded="true" aria-controls="panelCollapseHTTP">
                             #{bundle['file.fromHTTP']} &#160;<span class="glyphicon glyphicon-chevron-up"/>
                         </div>
                         <div id="panelCollapseHTTP" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingHTTP">
-                            <div class="panel-body" jsf:id="httpUploadDisabledDueToExistingRsyncPackage" jsf:rendered="#{EditDatafilesPage.workingVersion.hasPackageFile and !EditDatafilesPage.dataset.released}">
+                            <div class="panel-body" jsf:id="httpUploadDisabledDueToExistingRsyncPackage" jsf:rendered="#{hasPackageFile and !isDatasetReleased}">
                                 <p class="help-block">
                                     <span class="glyphicon glyphicon-warning-sign text-warning"></span>
                                     <h:outputFormat class="text-warning" value=" #{bundle['file.rsyncUpload.httpUploadDisabledDueToRsyncFileExisting']}" escape="false">
@@ -58,21 +86,44 @@
                                     </h:outputFormat>
                                 </p>
                             </div>
-                            <div class="panel-body" jsf:id="httpUploadDisabledDueToExistingRsyncPackagePublished" jsf:rendered="#{EditDatafilesPage.workingVersion.hasPackageFile and EditDatafilesPage.dataset.released}">
+                            <div class="panel-body" jsf:id="httpUploadDisabledDueToExistingRsyncPackagePublished" jsf:rendered="#{hasPackageFile and isDatasetReleased}">
                                 <p class="help-block">
                                     <span class="glyphicon glyphicon-warning-sign text-warning"></span>
                                     <h:outputText class="text-warning" value=" #{bundle['file.rsyncUpload.httpUploadDisabledDueToRsyncFileExistingAndPublished']}"/>
                                 </p>
                             </div>
-                            <div class="panel-body" jsf:id="contentOfHttpPanel" jsf:rendered="#{!EditDatafilesPage.workingVersion.hasPackageFile}">
+                            <div class="panel-body" jsf:id="contentOfHttpPanel" jsf:rendered="#{!hasPackageFile}">
                                 <p class="help-block">
                                     <h:outputFormat value="#{bundle['file.selectToAdd.tipMoreInformation']}" escape="false">
                                         <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                         <f:param value="#{systemConfig.guidesVersion}"/>
                                     </h:outputFormat>
-                                    <h:outputFormat value=" #{bundle['file.selectToAdd.tipLimit']}" escape="false" 
-                                                    rendered="#{systemConfig.maxFileUploadSize !=null and !empty systemConfig.maxFileUploadSize}">
-                                        <f:param value="#{systemConfig.humanMaxFileUploadSize}"/>
+                                    <h:outputFormat value=" #{bundle['file.selectToAdd.tipMaxNumFiles']}" escape="false"
+                                                    rendered="#{EditDatafilesPage.maxNumberOfFiles > 0}">
+                                        <f:param value="#{EditDatafilesPage.maxNumberOfFiles}"/>
+                                    </h:outputFormat>
+                                    <h:outputFormat value=" #{bundle['file.selectToAdd.tipMaxNumFilesUploadsAvailable']}" escape="false"
+                                                    rendered="#{EditDatafilesPage.fileUploadsAvailable > -1}">
+                                        <f:param value="#{EditDatafilesPage.fileUploadsAvailable}"/>
+                                    </h:outputFormat>
+                                    <h:outputFormat value=" #{bundle['file.selectToAdd.tipLimit']}" escape="false"
+                                                    rendered="#{!EditDatafilesPage.isUnlimitedUploadFileSize()}">
+                                        <f:param value="#{EditDatafilesPage.getHumanMaxFileUploadSizeInBytes()}"/>
+                                    </h:outputFormat>
+                                    
+                                    <h:outputFormat value=" #{bundle['file.selectToAdd.tipQuotaRemaining']}" escape="false" 
+                                                    rendered="#{EditDatafilesPage.isStorageQuotaEnforced()}">
+                                        <f:param value="#{EditDatafilesPage.getHumanMaxTotalUploadSizeInBytes()}"/>
+                                    </h:outputFormat>
+                                    <h:outputFormat value=" #{bundle['file.selectToAdd.tipTabularLimit']}" escape="false"
+                                                    rendered="#{EditDatafilesPage.maxIngestSizeInBytes != -1}">
+                                        <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                        <f:param value="#{systemConfig.guidesVersion}"/>
+                                        <f:param value="#{EditDatafilesPage.humanMaxIngestSizeInBytes}"/>
+                                    </h:outputFormat>
+                                    <h:outputFormat value=" #{bundle['file.selectToAdd.tipPerFileTabularLimit']}"
+                                                    rendered="#{not empty EditDatafilesPage.humanPerFormatTabularLimits}">
+                                        <f:param value="#{fn:replace(EditDatafilesPage.humanPerFormatTabularLimits, ' 1 B', ' disabled')}"/>
                                     </h:outputFormat>
                                 </p>
                     
@@ -90,8 +141,10 @@
                         function uploadWidgetDropRemoveMsg() {
                             $('div[id$="fileUpload"] div.ui-fileupload-content div#dragdropMsg').remove();
                         }
+                        
                         $(document).ready(function () {
                             uploadWidgetDropMsg();
+                             #{useDirectUpload ? 'setupDirectUpload(true);':''}
                         });
                         //]]>
                     </script>
@@ -123,37 +176,51 @@
 
                     <p:fileUpload id="fileUpload" 
                                   dragDropSupport="true"
-                                  auto="true"
+                                  auto="#{!(systemConfig.directUploadEnabled(EditDatafilesPage.dataset))}"
                                   multiple="#{datasetPage || EditDatafilesPage.allowMultipleFileUpload()}"
-                                  disabled="#{lockedFromEdits ||  !(datasetPage || EditDatafilesPage.showFileUploadComponent()) }"
-                                  fileUploadListener="#{EditDatafilesPage.handleFileUpload}" 
+                                  disabled="#{lockedFromEdits ||  !(showFileUploadComponent) || isQuotaExceeded || isFileUploadCountExceeded}"
+                                  listener="#{EditDatafilesPage.handleFileUpload}" 
                                   process="filesTable" 
                                   update=":datasetForm:filesTable, @([id$=filesButtons])"
                                   label="#{bundle['file.selectToAddBtn']}"
-                                  oncomplete="javascript:bind_bsui_components();uploadFinished(PF('fileUploadWidget'));"
+                                  oncomplete="uploadFinished(PF('fileUploadWidget'));"
                                   onstart="javascript:uploadWidgetDropRemoveMsg();uploadStarted();"
                                   onerror="javascript:uploadFailure();"
-                                  sizeLimit="#{EditDatafilesPage.getMaxFileUploadSizeInBytes()}"
-                                  fileLimit="#{EditDatafilesPage.getMaxNumberOfFiles()}" 
+                                  sizeLimit="#{maxFileUploadSize}"
+                                  fileLimit="#{maxNumberOfFiles}"
+                                  fileLimitAvailable="#{fileUploadsAvailable}"
                                   invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}" 
                                   sequential="true"
-                                  widgetVar="fileUploadWidget"/>
-                                
-                                <div jsf:id="dropboxBlock" jsf:rendered="#{settingsWrapper.isHasDropBoxKey() and !lockedFromEdits }"  class="margin-top">
+                                  previewWidth="-1"
+                                  widgetVar="fileUploadWidget">
+                        <f:passThroughAttribute name="aria-label" value="#{bundle['file.uploadFiles']}"/>
+                    </p:fileUpload>
+                              <ui:fragment rendered="#{!lockedFromEdits}">
+                                <div jsf:id="webloaderBlock" jsf:rendered="#{webloaderUploadSupported}"  class="ui-fileupload-buttonbar ui-widget-header ui-corner-top">
+                                    <p class="help-block" jsf:rendered="#{!createDataset}">#{bundle['file.fromWebloader.tip']}</p>
+                                    <p class="help-block" jsf:rendered="#{createDataset}">#{bundle['file.fromWebloaderAfterCreate.tip']}</p>
+                                    <p:button target="_blank" rendered="#{!createDataset}" onclick="cancelDatasetEdit();window.open('#{(datasetPage==true) ? DatasetPage.getWebloaderUrlForDataset(dataset):EditDatafilesPage.getWebloaderUrlForDataset(dataset)}');return false;" value="#{bundle['file.fromWebloader']}"  icon="ui-icon-plusthick" />
+                                </div>
+                                <div jsf:id="dropboxBlock" jsf:rendered="#{settingsWrapper.isHasDropBoxKey()}"  class="margin-top">
                                     <!-- Dropbox upload widget -->
                                     <p class="help-block">#{bundle['file.fromDropbox.tip']}</p>
                                     <h:inputText id="dropBoxSelectionInput" style="display:none" value="#{EditDatafilesPage.dropBoxSelection}"/>
                                     <p:commandButton id="dropBoxButton" actionListener="#{EditDatafilesPage.handleDropBoxUpload}" oncomplete="javascript:dropBoxUploadFinished();" update="@none" style="display:none;" />
-                                    <p:commandButton id="dropBoxUserButton" disabled="#{!(datasetPage || EditDatafilesPage.showFileUploadComponent())}" value="#{bundle['file.fromDropbox']}" onclick="openDropboxChooser();" icon="dropin-btn-status" />
+                                    <p:commandButton id="dropBoxUserButton" disabled="#{!(showFileUploadComponent)}" value="#{bundle['file.fromDropbox']}" onclick="openDropboxChooser();" icon="dropin-btn-status" />
                                     <p:message for="dropBoxButton" id="dropBoxUploadMessage" display="text" redisplay="false" />
                                 </div>
-                    
+                                <div jsf:id="globusBlock" jsf:rendered="#{globusUploadSupported}"  class="margin-top">
+                                    <p class="help-block" jsf:rendered="#{!createDataset}">#{bundle['file.fromGlobus.tip']}</p>
+                                    <p class="help-block" jsf:rendered="#{createDataset}">#{bundle['file.fromGlobusAfterCreate.tip']}</p>
+                                    <p:button target="_blank" rendered="#{!createDataset}" onclick="cancelDatasetEdit();window.open('#{GlobusServiceBean.getGlobusAppUrlForDataset(dataset)}');return false;" value="#{bundle['file.fromGlobus']}"  icon="globus-btn" />
+                                </div>
+                              </ui:fragment>
                             </div>
                         </div>
                     
                     </div>
                     
-                    <div jsf:id="rsyncPanel" jsf:rendered="#{settingsWrapper.rsyncUpload and !EditDatafilesPage.fileReplaceOperation}" class="panel panel-default">
+                    <div jsf:id="rsyncPanel" jsf:rendered="#{rsyncSupported and !EditDatafilesPage.fileReplaceOperation}" class="panel panel-default">
                         <!-- NOTE: conditional logic for 'glyphicon-chevron-up' icon in rsync header if HTTP is off, but isn't scalable when a third upload mode is added -->
                         <div role="tab" id="headingRsync" data-toggle="collapse" data-target="#panelCollapseRsync" class="panel-heading text-info" aria-expanded="true" aria-controls="panelCollapseRsync">
                             #{bundle['file.fromRsync']} &#160;<span class="glyphicon #{!settingsWrapper.HTTPUpload ? 'glyphicon-chevron-up' : 'glyphicon-chevron-down'}"/>
@@ -162,12 +229,12 @@
                         <div id="panelCollapseRsync" class="panel-collapse collapse #{!settingsWrapper.HTTPUpload ? 'in' : ''}" role="tabpanel" aria-labelledby="headingRsync">
                             <div class="panel-body">
                                 <ui:fragment rendered="#{createDataset}">
-                                    <ui:fragment rendered="#{empty EditDatafilesPage.fileMetadatas}">
+                                    <ui:fragment rendered="#{!hasFileMetadatas}">
                                         <p class="help-block">
                                             #{bundle['file.createUploadDisabled']}
                                         </p>
                                     </ui:fragment>
-                                    <ui:fragment rendered="#{!empty EditDatafilesPage.fileMetadatas}">
+                                    <ui:fragment rendered="#{hasFileMetadatas}">
                                         <p class="help-block">
                                             <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttp']}</span>
                                         </p>
@@ -175,7 +242,7 @@
                                 </ui:fragment>
                                 <ui:fragment rendered="#{!createDataset}"> 
                                     <!-- NO RSYNC/PACKAGE FILE YET. PROVIDE INSTRUCTIONS: DOWNLOAD TO UPLOAD. -->
-                                    <ui:fragment rendered="#{empty EditDatafilesPage.fileMetadatas and EditDatafilesPage.isHasRsyncScript()}">
+                                    <ui:fragment rendered="#{!hasFileMetadatas and hasRsyncScript}">
                                         <p class="help-block">
                                             <h:outputFormat value="#{bundle['file.rsyncUpload.info']}" escape="false">
                                                 <f:param value="#{systemConfig.guidesBaseUrl}"/>
@@ -203,7 +270,7 @@
                                         </ol>
                                     </ui:fragment>
                                     <!-- RSYNC/PACKAGE FILE ALREADY EXISTS. THERE CAN BE ONLY ONE. -->
-                                    <ui:fragment rendered="#{EditDatafilesPage.workingVersion.hasPackageFile}">
+                                    <ui:fragment rendered="#{hasPackageFile}">
                                         <p class="help-block">
                                             <span class="glyphicon glyphicon-warning-sign text-warning"></span>
                                             <h:outputFormat class="text-warning" value=" #{bundle['file.rsyncUpload.filesExist']}" escape="false">
@@ -218,26 +285,26 @@
                                             </h:outputFormat>
                                         </p>
                                     </ui:fragment>
-                                    <ui:fragment rendered="#{EditDatafilesPage.workingVersion.hasNonPackageFile and !EditDatafilesPage.workingVersion.dataset.released}">
+                                    <ui:fragment rendered="#{hasNonPackageFile and !EditDatafilesPage.workingVersion.dataset.released}">
                                         <p class="help-block">
                                             <span class="glyphicon glyphicon-warning-sign text-warning"></span>
                                             <h:outputText class="text-warning" value=" #{bundle['file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttp']}"/>
                                         </p>
                                     </ui:fragment>
-                                    <ui:fragment rendered="#{EditDatafilesPage.workingVersion.hasNonPackageFile and EditDatafilesPage.workingVersion.dataset.released}">
+                                    <ui:fragment rendered="#{hasNonPackageFile and EditDatafilesPage.workingVersion.dataset.released}">
                                         <p class="help-block">
                                             <span class="glyphicon glyphicon-warning-sign text-warning"></span>
                                             <h:outputText class="text-warning" value=" #{bundle['file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttpAndPublished']}"/>
                                         </p>
                                     </ui:fragment>
                                     <!-- HTTP FILE ALREADY EXISTS. THERE CAN BE ONLY ONE. -->
-                                    <ui:fragment rendered="#{!empty EditDatafilesPage.fileMetadatas}">
+                                    <ui:fragment rendered="#{hasFileMetadatas}">
                                         <p class="help-block">
                                             <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttp']}</span>
                                         </p>
                                     </ui:fragment>
                                     <!-- CAN'T DOWNLOAD RSYNC SCRIPT DUE to DCM BACKEND BROKEN. -->
-                                    <ui:fragment rendered="#{empty EditDatafilesPage.workingVersion.fileMetadatas and !EditDatafilesPage.isHasRsyncScript()}">
+                                    <ui:fragment rendered="#{empty EditDatafilesPage.workingVersion.fileMetadatas and !hasRsyncScript}">
                                         <p class="help-block">
                                             <span class="glyphicon glyphicon-exclamation-sign text-danger"></span>
                                             <h:outputFormat class="text-danger" value=" #{bundle['file.rsyncUpload.noScriptBroken']}" escape="false">
@@ -272,15 +339,15 @@
                                 </ui:fragment>
                             </div>
                         </div>
-                    </div>               
+                    </div>
                     
-                    <p:message for="fileUpload" id="uploadMessage" display="text" />
+                    <p:message for="fileUpload" id="uploadMessage" display="text" escape="false"/>
                     
                     <p:commandButton id="updateEditDataFilesButtonsForUpload" action="#{EditDatafilesPage.uploadFinished()}" update="datasetForm:editDataFilesButtons" rendered="#{showFileButtonUpdate}" style="display:none"/>
                     <p:commandButton id="updateEditDataFilesButtonsForDelete" action="#{EditDatafilesPage.deleteFilesCompleted()}" update="datasetForm:editDataFilesButtons" rendered="#{showFileButtonUpdate}" style="display:none"/>
-                    <p:commandButton id="AllUploadsFinished" action="#{EditDatafilesPage.uploadFinished()}" update="@form,datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:uploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" oncomplete="javascript:uploadWidgetDropMsg();" style="display:none"/> 
-                    <p:commandButton id="dropBoxUploadFinished" action="#{EditDatafilesPage.uploadFinished()}" update="datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:dropBoxUploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" style="display:none"/>
-                    <p:commandButton id="allDeletesFinished" action="#{EditDatafilesPage.deleteFilesCompleted()}" update="datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:uploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" oncomplete="javascript:uploadWidgetDropMsg();" style="display:none"/> 
+                    <p:commandButton id="AllUploadsFinished" action="#{EditDatafilesPage.uploadFinished()}" update="@([id$=filesButtons]),datasetForm:contentOfHttpPanel,datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:uploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" oncomplete="javascript:uploadWidgetDropMsg();" style="display:none"/> 
+                    <p:commandButton id="dropBoxUploadFinished" action="#{EditDatafilesPage.uploadFinished()}" update="@([id$=filesButtons]),datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:dropBoxUploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" style="display:none"/>
+                    <p:commandButton id="allDeletesFinished" action="#{EditDatafilesPage.deleteFilesCompleted()}" update="@([id$=filesButtons]),datasetForm:fileUpload,datasetForm:dropBoxUserButton,datasetForm:uploadMessage,datasetForm:rsyncPanel,datasetForm:filesCounts,datasetForm:filesTable" oncomplete="javascript:uploadWidgetDropMsg();" style="display:none"/> 
                     <!-- ????? TODO: How scalable are all these hidden update buttons ????? -->
                     <!-- ????? 
                     datasetForm:fileUpload,
@@ -302,122 +369,141 @@
                     <p:autoUpdate />
                     <p:outputPanel >
                         <p:dataTable id="filesTable" 
-                                     value="#{EditDatafilesPage.fileMetadatas}"
-                                     rendered="#{!empty EditDatafilesPage.fileMetadatas or !EditDatafilesPage.showFileUploadFragment()}"
+                                     value="#{fileMetadatas}"
+                                     rendered="#{hasFileMetadatas or !EditDatafilesPage.showFileUploadFragment()}"
                                      rowIndexVar="rowNum" 
                                      rowKey="#{fileMetadata.dataFile.storageIdentifier}"
                                      selection="#{EditDatafilesPage.selectedFiles}" 
                                      var="fileMetadata" 
                                      widgetVar="filesTable"
-                                     emptyMessage="#{datasetPage || EditDatafilesPage.showFileUploadFragment() ? bundle['file.noUploadedFiles.tip'] : bundle['file.noSelectedFiles.tip']}">
+                                     emptyMessage="#{showFileUploadFragment ? bundle['file.noUploadedFiles.tip'] : bundle['file.noSelectedFiles.tip']}"
+                                     ariaRowLabel="#{bundle['file.select.action']} #{fileMetadata.label}">
                             <f:facet name="header">
                                 <div jsf:id="filesHeaderBlock" class="row">
-                                    <h:inputHidden id="showAccessPopup" value="#{EditDatafilesPage.showAccessPopup}"/>
                                     <div id="filesHeaderCount" class="col-xs-6 text-left">
                                         <!-- Files Count -->
-                                        <h:outputFormat value="#{datasetPage ? bundle['file.count.shown'] : bundle['file.count.shown']}" styleClass="highlightBold" rendered="#{!empty EditDatafilesPage.fileMetadatas}">
-                                            <f:param value="#{EditDatafilesPage.fileMetadatas.size()}"/>
+                                        <h:outputFormat value="#{datasetPage ? bundle['file.count.shown'] : bundle['file.count.shown']}" styleClass="highlightBold" rendered="#{!empty hasFileMetadatas}">
+                                            <f:param value="#{fileMetadatas.size()}"/>
                                         </h:outputFormat>
                                     </div>
                                 </div>
                             </f:facet>
-                            <p:column selectionMode="multiple" class="col-select-width text-center" style="width:40px !important;"/>
-                            <p:column class="col-file-thumb text-center" style="width:73px !important;padding:4px 10px;">
-                                <div class="thumbnail-block">
-                                    <!-- Thumbnail Preview -->
-                                    <span class="file-thumbnail-preview-img" jsf:rendered="#{!empty fileMetadata.dataFile.id and dataFileServiceBean.isThumbnailAvailable(fileMetadata.dataFile)}"
-                                          data-container="body" data-toggle="popover" data-placement="top" data-trigger="hover" data-html="true" data-content="&lt;img src=&#34;/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=400&#34; alt=&#34;#{bundle['file.preview']} #{fileMetadata.label}&#34; /&gt;">
-                                        <p:graphicImage value="/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=true" alt="#{fileMetadata.label}"/>
-                                    </span>
-                                    <!-- Default Icon -->
-                                    <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(fileMetadata.dataFile)} file-thumbnail-icon text-muted" jsf:rendered="#{(!empty fileMetadata.dataFile.id and !dataFileServiceBean.isThumbnailAvailable(fileMetadata.dataFile)) or (empty fileMetadata.dataFile.id and !fileMetadata.dataFile.previewImageAvailable)}"/>
-                                    <ui:fragment rendered="#{empty fileMetadata.dataFile.id and !empty fileMetadata.dataFile.storageIdentifier and fileMetadata.dataFile.previewImageAvailable}">
-                                        <h:graphicImage value="#{EditDatafilesPage.getTemporaryPreviewAsBase64(fileMetadata.dataFile.storageIdentifier)}" alt="#{fileMetadata.label}"/>
-                                        <h:outputText id="imgPreview" value="#{bundle['preview']}" styleClass="bg-info text-info text-center show"/>
-                                    </ui:fragment>
-                                    <!-- Restricted File Icon -->
-                                    <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted}">
-                                        <span class="icon-unlock text-success"/>
-                                    </div>
-                                    <!-- Dataset Thumbnail -->
-                                    <span id="datasetThumbnail" class="bg-info text-info text-center small show"
-                                          jsf:rendered="#{EditDatafilesPage.isDesignatedDatasetThumbnail(fileMetadata)}"
-                                          data-toggle="tooltip" data-placement="bottom" title="#{bundle['file.selectedThumbnail.tip']}">
-                                #{bundle['file.selectedThumbnail']}
-                                    </span>
-                                </div>
-                            </p:column>
+                            <p:column selectionMode="multiple" class="col-select-width text-center" style="width:40px !important;" ariaHeaderText="#{bundle['file.select.tooltip']}"/>
                             <p:column class="col-file-metadata">
-                                <label class="control-label" for="fileName" style="margin-right:1em;margin-bottom:.5em;">
-                                #{bundle['file.fileName']}
-                                </label>
-                                <p:inputText id="fileName" value="#{fileMetadata.label}" style="width:60%; margin-bottom:.5em;" disabled="#{fileMetadata.dataFile.filePackage}"/>
-                                <p:message for="fileName"/>
+                                <f:facet name="header">
+                                    <h:outputText styleClass="sr-only" value="#{bundle['file.tableheader.info']}"/>
+                                </f:facet>
+                                <div id="fileInfoInclude-filesTable-#{fileMetadata.label}" class="col-sm-12 row">
+                                    <div class="pull-left col-file-thumb">
+                                        <div class="thumbnail-block text-center">
+                                            <!-- Thumbnail Preview -->
+                                            <span class="file-thumbnail-preview-img" jsf:rendered="#{!empty fileMetadata.dataFile.id and thumbnailServiceWrapper.isThumbnailAvailable(fileMetadata.dataFile)}"
+                                                  data-container="body" data-toggle="popover" data-placement="top" data-trigger="hover" data-html="true" data-content="&lt;img src=&#34;/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=400&#34; alt=&#34;#{bundle['file.preview']} #{fileMetadata.label}&#34; /&gt;"
+                                                  data-template='&lt;div class="popover thumb-preview" role="tooltip"&gt;&lt;div class="arrow"&gt;&lt;/div&gt;&lt;h3 class="popover-title"&gt;&lt;/h3&gt;&lt;div class="popover-content"&gt;&lt;/div&gt;&lt;/div&gt;'>
+                                                <p:graphicImage value="/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=true" alt="#{fileMetadata.label}"/>
+                                            </span>
+                                            <!-- Default Icon -->
+                                            <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(fileMetadata.dataFile)} file-thumbnail-icon text-muted" jsf:rendered="#{(!empty fileMetadata.dataFile.id and !thumbnailServiceWrapper.isThumbnailAvailable(fileMetadata.dataFile)) or (empty fileMetadata.dataFile.id and !fileMetadata.dataFile.previewImageAvailable)}"/>
+                                            <ui:fragment rendered="#{empty fileMetadata.dataFile.id and !empty fileMetadata.dataFile.storageIdentifier and fileMetadata.dataFile.previewImageAvailable}">
+                                                <img src="#{EditDatafilesPage.getTemporaryPreviewAsBase64(fileMetadata.dataFile.storageIdentifier)}" alt="#{fileMetadata.label}"/>
+                                                <h:outputText id="imgPreview" value="#{bundle['preview']}" styleClass="bg-info text-info text-center show"/>
+                                            </ui:fragment>
+                                            <!-- Restricted File Icon -->
+                                            <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted}">
+                                                <span class="icon-unlock text-success"/>
+                                            </div>
+                                            <!-- Dataset Thumbnail -->
+                                            <span id="datasetThumbnail" class="bg-info text-info text-center small show"
+                                                  jsf:rendered="#{EditDatafilesPage.isDesignatedDatasetThumbnail(fileMetadata)}"
+                                                  data-toggle="tooltip" data-placement="bottom" title="#{bundle['file.selectedThumbnail.tip']}">
+                                                #{bundle['file.selectedThumbnail']}
+                                            </span>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-10 file-metadata-block">
+                                        <label class="control-label" for="datasetForm:filesTable:#{rowNum}:fileName" style="margin-right:1em;margin-bottom:.5em;">
+                                            #{bundle['file.fileName']}
+                                        </label>
+                                        <p:inputText id="fileName" value="#{fileMetadata.label}" style="width:60%; margin-bottom:.5em;" disabled="#{fileMetadata.dataFile.filePackage}"/>
+                                        <p:message for="datasetForm:filesTable:#{rowNum}:fileName"/>
 
-                                <label class="control-label" for="fileDirectoryLabel" style="margin-right:1em;margin-bottom:.5em;">
-                                #{bundle['file.metadataTab.fileMetadata.hierarchy.label']}    
-                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.metadataTab.fileMetadata.hierarchy.tip']}"></span>
-                                </label>
-                                <p:inputText id="fileDirectoryName" value="#{fileMetadata.directoryLabel}"                                            
-                                             style="width:60%; margin-bottom:.5em;" disabled="#{fileMetadata.dataFile.filePackage}" widgetVar="fileDirectoryName"/>                        
-                                <p:message for="fileDirectoryName"/>
+                                        <label class="control-label" for="datasetForm:filesTable:#{rowNum}:fileDirectoryName" style="margin-right:1em;margin-bottom:.5em;">
+                                            #{bundle['file.metadataTab.fileMetadata.hierarchy.label']}    
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.metadataTab.fileMetadata.hierarchy.tip']}"></span>
+                                        </label>
+                                        <p:inputText id="fileDirectoryName" value="#{fileMetadata.directoryLabel}"                                            
+                                                     style="width:60%; margin-bottom:.5em;" disabled="#{fileMetadata.dataFile.filePackage}" widgetVar="fileDirectoryName"/>                        
+                                        <p:message for="datasetForm:filesTable:#{rowNum}:fileDirectoryName"/>
 
-                                <!-- TYPE + SIZE + DATE + CHECKSUM -->
-                                <div class="text-muted small">
-                                    <h:outputText id="fileTypeOutputRegular" value="#{fileMetadata.dataFile.friendlyType}" rendered="#{!(fileMetadata.dataFile.tabularData)}"/>
-                                    <h:outputText id="fileTypeOutputTabular" value="#{bundle['file.type.tabularData']}" rendered="#{fileMetadata.dataFile.tabularData}"/>
-                                    <h:outputText id="fileCreatePublishDate" value=" - #{fileMetadata.getFileDateToDisplay()}" rendered="#{!(empty fileMetadata.id)}"/>
-                                    <div class="checksum-block">
-                                        <h:outputText id="fileChecksum" value="#{fileMetadata.dataFile.tabularData ? fileMetadata.dataFile.originalChecksumType : fileMetadata.dataFile.checksumType}: #{fileMetadata.dataFile.checksumValue};" rendered="#{!(empty fileMetadata.dataFile.checksumValue)}"/>
+                                        <div class="text-muted small">
+                                            <!-- TYPE + SIZE + DATE + CHECKSUM -->
+                                            <h:outputText id="fileTypeOutputRegular" value="#{fileMetadata.dataFile.friendlyType}" rendered="#{!(fileMetadata.dataFile.tabularData)}"/>
+                                            <h:outputText id="fileTypeOutputTabular" value="#{bundle['file.type.tabularData']}" rendered="#{fileMetadata.dataFile.tabularData}"/>
+                                            <h:outputText id="fileCreatePublishDate" value=" - #{fileMetadata.getFileDateToDisplay()}" rendered="#{!(empty fileMetadata.id)}"/>
+                                            <div class="checksum-block">
+                                                <h:outputText id="fileChecksum" value="#{fileMetadata.dataFile.tabularData ? fileMetadata.dataFile.originalChecksumType : fileMetadata.dataFile.checksumType}: #{fileMetadata.dataFile.checksumValue}"/>
+                                            </div>
+                                            <!-- UNF + Variables, Obsersvations -->
+                                            <div class="unf-block" style="word-break: break-all;" jsf:rendered="#{fileMetadata.dataFile.tabularData}">
+                                                <h:outputText id="fileNumVars" value="#{fileMetadata.dataFile.dataTable.varQuantity} #{bundle['file.metaData.dataFile.dataTab.variables']}, " rendered="#{fileMetadata.dataFile.tabularData}"/>
+                                                <h:outputText id="fileNumObs" value="#{fileMetadata.dataFile.dataTable.caseQuantity} #{bundle['file.metaData.dataFile.dataTab.observations']} #{!empty fileMetadata.dataFile.unf ? ' - ' : ''}" rendered="#{fileMetadata.dataFile.tabularData}"/>
+                                                <h:outputText id="fileUNF" value="#{fileMetadata.dataFile.unf}" rendered="#{!empty fileMetadata.dataFile.unf}"/>
+                                            </div>
+                                        </div>
+                                        <div class="file-description-block">
+                                            <label class="control-label" for="fileDescription" style="margin-right:1em; margin-top:.5em; vertical-align:top;">
+                                                #{bundle.description}
+                                            </label>
+                                            <p:inputTextarea id="fileDescription" rows="2" cols="40" value="#{fileMetadata.description}" style="width:60%; margin-top:.5em;"/> 
+                                            <p:watermark for="fileDescription" value="#{bundle['file.addDescription']}"/>
+                                            <p:message for="fileDescription"/>
+                                        </div>
+                                        <div class="file-tags-block margin-top-half">
+                                            <ui:fragment rendered="#{!(empty fileMetadata.categories)}">
+                                                <ui:repeat value="#{fileMetadata.categories}" var="cat">
+                                                    <h:outputText value="#{cat.name}" styleClass="label label-default"/>
+                                                </ui:repeat>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{!(empty fileMetadata.dataFile.tags)}">
+                                                <ui:repeat value="#{fileMetadata.dataFile.tags}" var="tag">
+                                                    <h:outputText value="#{tag.typeLabel}" styleClass="label label-info"/>
+                                                </ui:repeat>
+                                            </ui:fragment>
+                                        </div>
                                     </div>
                                 </div>
-                                <!-- UNF + Variables, Obsersvations -->
-                                <div class="text-muted small" jsf:rendered="#{fileMetadata.dataFile.tabularData}">
-                                    <h:outputText id="fileNumVars" value="#{fileMetadata.dataFile.dataTable.varQuantity} #{bundle['file.metaData.dataFile.dataTab.variables']}, " rendered="#{fileMetadata.dataFile.tabularData}"/>
-                                    <h:outputText id="fileNumObs" value="#{fileMetadata.dataFile.dataTable.caseQuantity} #{bundle['file.metaData.dataFile.dataTab.observations']} #{!empty fileMetadata.dataFile.unf ? ' - ' : ''}" rendered="#{fileMetadata.dataFile.tabularData}"/>
-                                    <h:outputText id="fileUNF" value="#{fileMetadata.dataFile.unf}" rendered="#{!empty fileMetadata.dataFile.unf}"/>
-                                </div>
-                                <div class="fileDescription">
-                                    <label class="control-label" for="fileDescription" style="margin-right:1em; margin-top:.5em; vertical-align:top;">
-                                    #{bundle.description}
-                                    </label>
-                                    <p:inputTextarea id="fileDescription" rows="2" cols="40" value="#{fileMetadata.description}" style="width:60%; margin-top:.5em;"/> 
-                                    <p:watermark for="fileDescription" value="#{bundle['file.addDescription']}"/>
-                                    <p:message for="fileDescription"/>
-                                </div>
-                                <div class="file-tags-block margin-top-half">
-                                    <ui:fragment rendered="#{!(empty fileMetadata.categories)}">
-                                        <ui:repeat value="#{fileMetadata.categories}" var="cat">
-                                            <h:outputText value="#{cat.name}" styleClass="label label-default"/>
-                                        </ui:repeat>
-                                    </ui:fragment>
-                                    <ui:fragment rendered="#{!(empty fileMetadata.dataFile.tags)}">
-                                        <ui:repeat value="#{fileMetadata.dataFile.tags}" var="tag">
-                                            <h:outputText value="#{tag.typeLabel}" styleClass="label label-info"/>
-                                        </ui:repeat>
-                                    </ui:fragment>
-                                </div>
                             </p:column>
-                            <p:column class="col-file-action text-right">
+                            <p:column class="col-file-action button-block text-right" style="width:30%;" ariaHeaderText="#{bundle['file.actionsBlock']}">
                                 <f:facet name="header" class="col-file-action text-right">
-                                    <div jsf:id="editFilesRestrictDeletePanel" style="margin-right:14px;" class="btn-group" jsf:rendered="#{!empty EditDatafilesPage.fileMetadatas and !EditDatafilesPage.workingVersion.hasPackageFile}">
+                                    <div jsf:id="editFilesRestrictDeletePanel" style="margin-right:14px;" class="btn-group" jsf:rendered="#{hasFileMetadatas and !hasPackageFile}">
                                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                             <span class="glyphicon glyphicon-pencil"/> #{bundle['file.editFilesSelected']} <span class="caret"></span>
                                         </button>
-                                        <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
+                                        <ul class="dropdown-menu multi-level pull-right text-left">
                                             <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
-                                                <p:commandLink  onclick="checkFilesSelected();" > 
-                                                    <h:outputText value="#{bundle['file.delete']}"/> 
+                                                <p:commandLink  onclick="if (!testFilesSelected2()) return false;" 
+                                                                oncomplete="PF('deleteFileConfirmation').show();">                                                  
+                                                    <h:outputText value="#{bundle['file.delete']}"/>  
+                                                    <f:setPropertyActionListener target="#{DatasetPage.workingVersion.fileMetadatas}" value="#{fileMetadatas}" /> 
+                                                    <f:setPropertyActionListener target="#{DatasetPage.selectedFiles}" value="#{EditDatafilesPage.selectedFiles}" /> 
                                                 </p:commandLink>
                                             </li>
-                                            <li>
-                                                <p:commandLink update="filesTable,:messagePanel" oncomplete="toggle_dropdown();" actionListener="#{EditDatafilesPage.restrictFiles(true)}">
+                                            <li jsf:rendered="#{!DatasetPage.hasPublicStore}">
+                                                <p:commandLink  onclick="if (!testFilesSelected2()) return false;"
+                                                                update="@([id$=accessPopup])" 
+                                                                oncomplete="PF('accessPopup').show();">                                                               
                                                     <h:outputText value="#{bundle['file.restrict']}"/>
+                                                    <f:setPropertyActionListener target="#{EditDatafilesPage.termsOfAccess}" value="#{version.termsOfUseAndAccess.termsOfAccess}" />
+                                                    <f:setPropertyActionListener target="#{EditDatafilesPage.fileAccessRequest}" value="#{version.termsOfUseAndAccess.fileAccessRequest}" />                        
+                                                    <f:setPropertyActionListener target="#{DatasetPage.selectedFiles}" value="#{EditDatafilesPage.selectedFiles}" /> 
                                                 </p:commandLink>
                                             </li>
-                                            <li>
-                                                <p:commandLink update="filesTable,:messagePanel" oncomplete="toggle_dropdown();" actionListener="#{EditDatafilesPage.restrictFiles(false)}">
+                                            <li jsf:rendered="#{!DatasetPage.hasPublicStore}">
+                                                <p:commandLink  onclick="if (!testFilesSelected2()) return false;"
+                                                                actionListener="#{EditDatafilesPage.restrictFiles(false)}"
+                                                                update="filesTable,:messagePanel" 
+                                                                oncomplete="javascript:toggle_dropdown();" >
                                                     <h:outputText value="#{bundle['file.unrestrict']}"/>
                                                 </p:commandLink>
                                             </li>
@@ -425,55 +511,64 @@
                                                 <p:commandLink id="fileCategoriesButton2"
                                                                actionListener="#{EditDatafilesPage.refreshTagsPopUp(fileMetadata)}"
                                                                update=":datasetForm:editFileTagsPopup"
-                                                               oncomplete="PF('editFileTagsPopup').show();bind_bsui_components();">
+                                                               >
                                                     #{bundle['file.tags']} 
                                                 </p:commandLink>    
                                             </li>     
                                         </ul>
                                     </div>
                                 </f:facet>
-                                <div style="margin-right:14px;" class="btn-group" >
-                                    <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown"
+                                
+                                <!-- FILE LEVEL MSGs -->
+                                <div class="bg-warning text-warning text-center margin-bottom-half" jsf:rendered="#{!(empty fileMetadata.dataFile.duplicateFilename)}">
+                                    <!-- Duplicate file name -->
+                                    <span class="glyphicon glyphicon-warning-sign"/> #{fileMetadata.dataFile.duplicateFilename}
+                                </div>
+                                <!-- END: FILE LEVEL MSGs -->
+                                
+                                <div style="margin-right:14px;" class="btn-group">
+                                    <button class="btn-file-options btn btn-link bootstrap-button-tooltip dropdown-toggle" title="#{bundle['file.optionsBtn']}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
                                             disabled="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
-                                        <span class="glyphicon glyphicon-pencil"/> #{bundle['file.editFile']} <span class="caret"></span>
+                                        <span class="glyphicon glyphicon-option-vertical"/><span class="sr-only">#{bundle['file.optionsBtn']}</span><span class="caret"></span>
                                     </button>
-                                    <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
+                                    <ul class="dropdown-menu multi-level pull-right text-left">
+                                        <!-- Edit Options -->
+                                        <li class="dropdown-header">#{bundle['file.optionsBtn.header.edit']} <span class="glyphicon glyphicon-pencil"/></li>
                                         <ui:fragment rendered="#{systemConfig.provCollectionEnabled}">
-                                            <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
+                                            <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
                                                 <p:commandLink id="fileProvenanceButton"
                                                                update=":datasetForm:editProvenancePopup"
-                                                               oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
-                                                    <f:actionListener binding="#{provPopupFragmentBean.updatePopupStateAndDataset(fileMetadata, EditDatafilesPage.dataset)}" />
+                                                               oncomplete="PF('editProvenancePopup').show();">
+                                                    <f:actionListener binding="#{provPopupFragmentBean.updatePopupStateAndDataset(fileMetadata, EditDatafilesPage.dataset)}"/>
                                                     #{bundle['file.provenance']} 
                                                 </p:commandLink>    
                                             </li> 
                                         </ui:fragment>
-
                                         <ui:fragment rendered="#{false and !settingsWrapper.publicInstall}">
-                                            <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
+                                            <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
                                                 <p:commandLink oncomplete="toggle_dropdown();" 
                                                                onclick="testFilesSelectedForRestriction()">
                                                     <h:outputText value="#{bundle['file.restrict']}"/>
                                                 </p:commandLink>
                                             </li>
-                                            <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
+                                            <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
                                                 <p:commandLink update=":datasetForm,,:messagePanel" oncomplete="toggle_dropdown();" 
                                                                action="#{DatasetPage.restrictSelectedFiles(false)}">
                                                     <h:outputText value="#{bundle['file.unrestrict']}"/>
                                                 </p:commandLink>
                                             </li>
                                         </ui:fragment>
-                                        <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
+                                        <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
                                             <p:commandLink id="fileCategoriesButton"
                                                            actionListener="#{EditDatafilesPage.refreshTagsPopUp(fileMetadata)}"
                                                            update=":datasetForm:editFileTagsPopup"
-                                                           oncomplete="PF('editFileTagsPopup').show();bind_bsui_components();">
+                                                           oncomplete="PF('editFileTagsPopup').show();">
                                                 #{bundle['file.tags']} 
-                                            </p:commandLink>    
+                                            </p:commandLink>
                                         </li>        
                                         <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}" jsf:rendered="#{false}">
-                                            <p:commandLink onclick="testFilesSelectedForDelete();" id="deleteSelectedFile"> 
-                                                <h:outputText value="#{bundle['file.delete']}"/> 
+                                            <p:commandLink onclick="testFilesSelectedForDelete();" id="deleteSelectedFile">
+                                                <h:outputText value="#{bundle['file.delete']}"/>
                                             </p:commandLink>
                                         </li>
                                         <li>
@@ -482,7 +577,7 @@
                                                            actionListener="#{EditDatafilesPage.setFileMetadataSelectedForThumbnailPopup(fileMetadata)}"
                                                            update=":datasetForm:fileSetThumbnail"
                                                            oncomplete="PF('fileSetThumbnail').show()">
-                                        #{bundle['file.setThumbnail']}
+                                                #{bundle['file.setThumbnail']}
                                             </p:commandLink>
                                         </li>
                                         <li>
@@ -490,7 +585,7 @@
                                                            rendered="#{!empty fileMetadata.dataFile.id and fileMetadata.dataFile.image and EditDatafilesPage.thumbnailIsFromDatasetLogoRatherThanDatafile}"
                                                            actionListener="#{EditDatafilesPage.setFileMetadataSelectedForThumbnailPopup(fileMetadata)}"
                                                            oncomplete="PF('fileThumbnailConfirm').show()">
-                                        #{bundle['file.setThumbnail']}
+                                                #{bundle['file.setThumbnail']}
                                             </p:commandLink>
                                         </li>
                                         <li>
@@ -500,7 +595,7 @@
                                                            actionListener="#{EditDatafilesPage.setFileMetadataSelectedForIngestOptionsPopup(fileMetadata)}"
                                                            update=":datasetForm:fileAdvancedOptions"
                                                            oncomplete="PF('fileAdvancedOptions').show()">
-                                        #{bundle['file.advancedIngestOptions']}
+                                                #{bundle['file.advancedIngestOptions']}
                                             </p:commandLink>
                                         </li>
                                     </ul>
@@ -517,75 +612,42 @@
     </div>
     <!-- END: Static Tab Layout -->
     <p:remoteCommand  name="returnToDatasetPage" partialSubmit="true" async="true" update="" action="#{EditDatafilesPage.returnToDatasetOnly()}"  />
+    <p:remoteCommand  name="requestDirectUploadUrls" partialSubmit="true" async="true" update="@none" action="#{EditDatafilesPage.requestDirectUploadUrls()}" onerror="javascript:uploadFailure();" />
+    <p:remoteCommand  name="handleExternalUpload" partialSubmit="true" async="true"  update="@none" action="#{EditDatafilesPage.handleExternalUpload()}" oncomplete="directUploadFinished();" onerror="javascript:uploadFailure();" />
     <!-- TODO: a message panel informing the unauthorized, or unauthenticated user that they don't have permission - should it be here? L.A. 4.2 -->
 
     <!-- Popups -->
     <p:dialog id="fileTypeDifferentPopup" styleClass="smallPopUp" header="#{bundle['file.addreplace.content_type.header']}" widgetVar="fileTypeDifferentPopup" modal="true">
-        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{EditDatafilesPage.warningMessageForPopUp}</p>
+        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{EditDatafilesPage.warningMessageForFileTypeDifferentPopUp}</p>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" value="#{bundle['file.delete']}" onclick="PF('fileTypeDifferentPopup').hide()" 
+            <p:commandButton styleClass="btn btn-default" value="#{bundle['file.delete']}" onclick="PF('fileTypeDifferentPopup').hide()" oncomplete="uploadWidgetDropMsg();
+                                   #{useDirectUpload ? 'setupDirectUpload(true);': ''}"
                              action="#{EditDatafilesPage.deleteFiles()}"
                              update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage"/>
-            <button class="btn btn-default" onclick="PF('fileTypeDifferentPopup').hide();" type="button">                              
+            <button class="btn btn-default" onclick="PF('fileTypeDifferentPopup').hide();" type="button">
                 #{bundle.continue}
             </button>
         </div>
     </p:dialog>
-    <p:dialog id="selectFilesForDeleteFragment" styleClass="smallPopUp"
-              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDeleteFragment" modal="true">
-        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForDelete']}</p>
-        <div class="button-block">
-            <button class="btn btn-default" onclick="PF('selectFilesForDeleteFragment').hide();" type="button">                              
-                #{bundle.close}
-            </button>
-        </div>
-    </p:dialog>
-    <p:dialog id="deleteFileConfirmDialog" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteFileConfirmation" modal="true">
-        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.tip']}</p>
-        <ui:fragment rendered="#{EditDatafilesPage.dataset.released}">
-            <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.failed.tip']}</p>
-        </ui:fragment>
-        <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);deleteFinished();"
-                             update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage" action="#{EditDatafilesPage.deleteFiles()}"/>
-            <button class="btn btn-link" onclick="PF('deleteFileConfirmation').hide();" type="button">                              
-                #{bundle.cancel}
-            </button>
-        </div>
-    </p:dialog>
-    <p:dialog id="editFileAccessPopup" header="#{bundle['dataset.access.accessHeader']}" widgetVar="editFileAccessPopup" modal="true">
-        <p:focus context="editFileAccessPopup"/>
-        <div class="form-horizontal">
-            <div class="form-group">
-                <label for="metadata_TermsAccess" class="col-sm-3 control-label">
-                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                          data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
-                </label>
-                <div class="col-sm-9">
-                    <p:inputTextarea styleClass="form-control" rendered="#{!empty version.termsOfUseAndAccess}"
-                                     value="#{version.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5"/>
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="metadata_RequestAccess" class="col-sm-3 control-label">
-                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                          data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
-                </label>
-                <div class="col-sm-9">
-                    <p:selectBooleanCheckbox id="editFileRequestAccess" rendered="#{!empty version.termsOfUseAndAccess}"
-                                             itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" value="#{version.termsOfUseAndAccess.fileAccessRequest}"/>
-                </div>
-            </div>
-        </div>
+    
+    <p:dialog id="fileAlreadyExistsPopup" styleClass="smallPopUp" header="#{EditDatafilesPage.headerForAlreadyExistsPopUp}" widgetVar="fileAlreadyExistsPopup" modal="true">
+        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{EditDatafilesPage.warningMessageForAlreadyExistsPopUp}</p>
+            <p class="help-block no-margin-top">                                           
+                <h:outputFormat value="#{bundle['dataset.file.upload.popup.explanation.tip']}" escape="false">
+                    <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                    <f:param value="#{systemConfig.guidesVersion}"/>
+                </h:outputFormat>
+            </p>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('editFileAccessPopup').hide()" update=":datasetForm,:messagePanel" action="#{EditDatafilesPage.saveWithTermsOfUse()}"/>
-            <button class="btn btn-link" onclick="PF('editFileAccessPopup').hide();PF('blockFileForm').hide();" type="button">                              
-                #{bundle.cancel}
+            <p:commandButton  styleClass="btn btn-default" value="#{EditDatafilesPage.labelForDeleteFilesPopup}" onclick="PF('fileAlreadyExistsPopup').hide()" oncomplete="uploadWidgetDropMsg();"
+                              action="#{EditDatafilesPage.deleteDuplicateFiles()}"
+                             update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage,@([id$=filesButtons])"/>
+            <button class="btn btn-default" onclick="PF('fileAlreadyExistsPopup').hide();" type="button">
+                #{bundle.continue}
             </button>
         </div>
     </p:dialog>
+    
     <p:dialog id="fileAdvancedOptions" styleClass="dialog-submenu smallPopUp" header="#{bundle['file.advancedIngestOptions']}" widgetVar="fileAdvancedOptions" modal="true">
         <p:focus context="fileAdvancedOptions"/>
         <div class="form-horizontal">
@@ -759,13 +821,13 @@
                 <div class="col-sm-8">
                     <p class="help-block">#{bundle['file.spss-porExtraLabels.title']}</p>
                     <p:growl id="messageForLabelsFileUpload" showDetail="true" />
-                    <p:fileUpload id="labelsFileUpload" label="#{bundle['file.spss-porExtraLabels.selectToAddBtn']}" update="messageForLabelsFileUpload" mode="advanced" auto="true" fileUploadListener="#{EditDatafilesPage.handleLabelsFileUpload}"/>
+                    <p:fileUpload id="labelsFileUpload" label="#{bundle['file.spss-porExtraLabels.selectToAddBtn']}" update="messageForLabelsFileUpload" mode="advanced" auto="true" listener="#{EditDatafilesPage.handleLabelsFileUpload}"/>
                 </div>
             </div>
         </div>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" id="fileAdvancedOptionsSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('fileAdvancedOptions').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAdvancedOptions()}"/>
-            <p:commandButton styleClass="btn btn-link" id="fileAdvancedOptionsCancelButton" value="#{bundle.cancel}" onclick="PF('fileAdvancedOptions').hide();PF('blockFileForm').hide();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForIngestOptionsPopup()}"/>
+            <p:commandButton styleClass="btn btn-default" id="fileAdvancedOptionsSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('fileAdvancedOptions').hide();" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAdvancedOptions()}"/>
+            <p:commandButton styleClass="btn btn-link" id="fileAdvancedOptionsCancelButton" value="#{bundle.cancel}" onclick="PF('fileAdvancedOptions').hide();PF('blockFileForm').hide();"  actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForIngestOptionsPopup()}"/>
         </div>
     </p:dialog>
     <!-- end of "advanced options" dialogue -->
@@ -773,7 +835,7 @@
         <p:focus context="fileSetThumbnail"/>
         <div class="form-horizontal">
             <div class="form-group">
-                <label for="datasetThumbnailImage" class="col-sm-4 control-label">
+                <label jsf:for="datasetThumbnailImage_input" class="col-sm-4 control-label">
                     #{bundle['file.datasetThumbnail']}
                 </label>
                 <div class="col-sm-8">
@@ -785,8 +847,8 @@
             </div>
         </div>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" id="fileSetThumbnailSaveBtn" value="#{bundle.saveChanges}" oncomplete="PF('fileSetThumbnail').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAsDesignatedThumbnail()}"/>
-            <p:commandButton styleClass="btn btn-link" id="fileSetThumbnailCancelBtn" value="#{bundle.cancel}" onclick="PF('fileSetThumbnail').hide();PF('blockFileForm').hide();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForThumbnailPopup()}"/>
+            <p:commandButton styleClass="btn btn-default" id="fileSetThumbnailSaveBtn" value="#{bundle.saveChanges}" oncomplete="PF('fileSetThumbnail').hide();" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAsDesignatedThumbnail()}"/>
+            <p:commandButton styleClass="btn btn-link" id="fileSetThumbnailCancelBtn" value="#{bundle.cancel}" onclick="PF('fileSetThumbnail').hide();PF('blockFileForm').hide();"  actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForThumbnailPopup()}"/>
         </div>
     </p:dialog>
     <p:dialog id="fileThumbnailConfirm" styleClass="smallPopUp" header="#{bundle['file.setThumbnail.header']}" widgetVar="fileThumbnailConfirm" modal="true">
@@ -796,7 +858,7 @@
             </p>
         </div>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" id="fileThumbnailConfirmCntBtn" value="#{bundle.continue}" oncomplete="PF('fileThumbnailConfirm').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.deleteDatasetLogoAndUseThisDataFileAsThumbnailInstead()}"/>
+            <p:commandButton styleClass="btn btn-default" id="fileThumbnailConfirmCntBtn" value="#{bundle.continue}" oncomplete="PF('fileThumbnailConfirm').hide();" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.deleteDatasetLogoAndUseThisDataFileAsThumbnailInstead()}"/>
             <button class="btn btn-link" onclick="PF('fileThumbnailConfirm').hide();PF('blockFileForm').hide();" type="button">                              
                 #{bundle.cancel}
             </button>
@@ -867,7 +929,7 @@
                                           filter="false">
                         <f:selectItems value="#{EditDatafilesPage.tabFileTags}" />
                         <p:ajax event="toggleSelect" listener="#{EditDatafilesPage.handleTabularTagsSelection}" update="tabularDataTags" />
-                        <p:ajax event="change" listener="#{EditDatafilesPage.TabularTagsSelection}" update="tabularDataTags" />
+                        <p:ajax event="change" listener="#{EditDatafilesPage.handleTabularTagsSelection}" update="tabularDataTags" />
                     </p:selectCheckboxMenu>
                     <p:message for="tabularDataTags" display="text" />
                 </div>
@@ -883,10 +945,20 @@
             </div> -->
         </div>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" id="editFileTagsPopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('editFileTagsPopup').hide()" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.saveFileTagsAndCategories()}"/>
+            <p:commandButton styleClass="btn btn-default" id="editFileTagsPopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('editFileTagsPopup').hide();" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.saveFileTagsAndCategories()}"/>
             <p:commandButton styleClass="btn btn-link" id="editFileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('editFileTagsPopup').hide();PF('blockFileForm').hide();" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForTagsPopup()}"/>
         </div>
-    </p:dialog>
+    </p:dialog>     
+    <!-- Simple Popup For Select Files-->
+    <p:dialog id="selectFiles2" styleClass="smallPopUp"
+              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFiles2" modal="true">
+        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFiles']}</p>
+        <div class="button-block">
+            <button class="btn btn-default" onclick="PF('selectFiles2').hide();" type="button">
+                #{bundle.close}
+            </button>
+        </div>
+    </p:dialog> 
     <script src="/resources/js/dropins.js" id="dropboxjs" data-app-key="#{EditDatafilesPage.dropBoxKey}"/>
     <script>
         //<![CDATA[
@@ -905,14 +977,6 @@
             $('button[id$="updateEditDataFilesButtonsForDelete"]').trigger('click');
             $('button[id$="allDeletesFinished"]').trigger('click');
         }
-        function checkFilesSelected() {
-            var count = PF('filesTable').getSelectedRowsCount();
-            if (count > 0) {
-                PF('deleteFileConfirmation').show();
-            } else {
-                PF('selectFilesForDeleteFragment').show();              
-            }
-        }
         function openDropboxChooser() {
             options = {
                 // Required. Called when a user selects an item in the Chooser.
@@ -930,6 +994,15 @@
             };
             Dropbox.choose(options);
         }
+        
+        function testFilesSelected2() {
+            var count = PF('filesTable').getSelectedRowsCount();
+            if (count == 0) {
+                PF("selectFiles2").show();
+            } else {
+                return true;
+            }                        
+        }
         //]]>
     </script>
 </ui:composition>
diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml
index 2830052ee74..b2192089bf3 100644
--- a/src/main/webapp/editdatafiles.xhtml
+++ b/src/main/webapp/editdatafiles.xhtml
@@ -15,98 +15,98 @@
 
     <h:body>
         <ui:composition template="/dataverse_template.xhtml">
-            <ui:param name="pageTitle" value="#{datasetPage || EditDatafilesPage.showFileUploadFragment() ? (EditDatafilesPage.mode == 'SINGLE_REPLACE' ? bundle['file.replaceFile'] : bundle['file.uploadFiles']) : bundle['file.editFiles']} - #{EditDatafilesPage.workingVersion.title}"/>
+            <ui:param name="pageTitle" value="#{datasetPage || EditDatafilesPage.showFileUploadFragment() ? (EditDatafilesPage.mode == 'REPLACE' ? bundle['file.replaceFile'] : bundle['file.uploadFiles']) : bundle['file.editFiles']} - #{EditDatafilesPage.workingVersion.title}"/>
             <ui:param name="dataverse" value="#{EditDatafilesPage.dataset.owner}"/>
             <ui:param name="dataset" value="#{EditDatafilesPage.dataset}"/>
             <ui:param name="version" value="#{EditDatafilesPage.workingVersion}"/>
             <ui:param name="fileMetadatas" value="#{EditDatafilesPage.fileMetadatas}"/>
             <ui:param name="showMessagePanel" value="#{true}"/>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewParam name="datasetId" value="#{EditDatafilesPage.dataset.id}"/>
-                    <f:viewParam name="mode" value="#{EditDatafilesPage.mode}"/>
+                    <o:viewParam name="mode" value="#{EditDatafilesPage.mode}"/>
+                    <o:viewParam name="referrer" value="#{EditDatafilesPage.referrer}" default="DATASET"/>
                     <f:viewParam name="selectedFileIds" value="#{EditDatafilesPage.selectedFileIds}"/>
                     <f:viewParam name="versionString" value="#{EditDatafilesPage.versionString}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                     <f:viewAction action="#{EditDatafilesPage.init}" />
-                    <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(EditDatafilesPage.dataset, (datasetPage || EditDatafilesPage.showFileUploadFragment() ? (EditDatafilesPage.mode == 'SINGLE_REPLACE' ? bundle['file.replaceFile'] : bundle['file.uploadFiles']) : bundle['file.editFiles']))}"
-                                  if="#{!(param.mode == 'SINGLE' || param.mode == 'SINGLE_REPLACE')}" />
-                    <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbsForFileMetadata(EditDatafilesPage.singleFile, (EditDatafilesPage.mode == 'SINGLE_REPLACE' ? bundle['file.replaceFile'] : bundle['file.editFiles']))}"
-                                  if="#{(param.mode == 'SINGLE' || param.mode == 'SINGLE_REPLACE')  }" />
+                    <o:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(EditDatafilesPage.dataset, (datasetPage || EditDatafilesPage.showFileUploadFragment() ? (EditDatafilesPage.mode == 'REPLACE' ? bundle['file.replaceFile'] : bundle['file.uploadFiles']) : bundle['file.editFiles']))}"
+                                  if="#{EditDatafilesPage.referrer == 'DATASET'}" />
+                    <o:viewAction action="#{dataverseHeaderFragment.initBreadcrumbsForFileMetadata(EditDatafilesPage.singleFile, (EditDatafilesPage.mode == 'REPLACE' ? bundle['file.replaceFile'] : bundle['file.editFiles']))}"
+                                  if="#{EditDatafilesPage.referrer == 'FILE'}" />
                 </f:metadata>
+            </ui:define>
+            <ui:define name="body">
                 <h:form id="datasetForm">
                     <!-- BEGIN: file replace original -->
-                    <ui:fragment rendered="#{EditDatafilesPage.fileReplaceOperation}">
+                    <div class="row" jsf:rendered="#{EditDatafilesPage.fileReplaceOperation}">
                         <div id="file-replace-original-block" class="col-sm-12">
                             <label class="col-sm-2 control-label">
                                 <span>#{bundle['file.replace.original']}</span>
                             </label>
-                            <div class="col-sm-10">
+                            <div class="col-sm-8 col-lg-6">
                                 <ui:include src="file-info-fragment.xhtml">
+                                    <ui:param name="editDatafilesPage" value="true"/>
                                     <c:if test="#{EditDatafilesPage.getFileToReplace().fileMetadata != null}">
                                         <ui:param name="fileMetadata" value="#{EditDatafilesPage.getFileToReplace().fileMetadata}" />
                                     </c:if>
                                 </ui:include>
                             </div>
                         </div>
-                    </ui:fragment>
+                    </div>
                     <!-- END: file replace original -->
 
-                    <ui:fragment id="uploadFilesOnCreateTab" rendered="#{EditDatafilesPage.mode == 'SINGLE' or                          
-                            EditDatafilesPage.mode == 'SINGLE_REPLACE' or EditDatafilesPage.mode == 'EDIT'
-                            or EditDatafilesPage.mode == 'UPLOAD'}">
+                    <ui:fragment id="uploadFilesOnCreateTab" rendered="#{EditDatafilesPage.mode == 'UPLOAD' or                    
+                            EditDatafilesPage.mode == 'REPLACE' or EditDatafilesPage.mode == 'EDIT'}">
                         <div id="contentTabs">
                             <ui:include src="editFilesFragment.xhtml">
                                 <ui:param name="editDatafilesPage" value="true"/>
                                 <ui:param name="createDataset" value="false"/>
                                 <ui:param name="showFileButtonUpdate" value="true"/>
-                                <ui:param name="lockedFromEdits" value="#{EditDatafilesPage.lockedFromEdits}"/>                             
+                                <ui:param name="rsyncSupported" value="#{EditDatafilesPage.rsyncUploadSupported()}"/>
+                                <ui:param name="globusUploadSupported" value="#{EditDatafilesPage.globusUploadSupported()}"/>
+                                <ui:param name="webloaderUploadSupported" value="#{EditDatafilesPage.webloaderUploadSupported()}"/>
+                                <ui:param name="lockedFromEdits" value="#{EditDatafilesPage.lockedFromEdits}"/>
                             </ui:include>
                         </div>
-                    </ui:fragment>  
+                    </ui:fragment> 
+                    <p:blockUI block="datasetForm" widgetVar="blockDatasetForm"/>
+                    <ui:include src="file-edit-popup-fragment.xhtml">
+                        <ui:param name="datasetVersion" value="#{EditDatafilesPage.workingVersion}"/>   
+                        <ui:param name="fileMetadataForAction" value="#{EditDatafilesPage.fileMetadataForAction}"/>
+                        <ui:param name="bean" value="#{EditDatafilesPage}"/>
+                        <ui:param name="restrictFileAction" value="restrictFiles"/>
+                        <ui:param name="deleteFileAction" value="deleteFiles"/>
+                        <ui:param name="saveEmbargoAction" value="saveEmbargo"/>
+                        <ui:param name="saveRetentionAction" value="saveRetention"/>
+                        <ui:param name="updateElements" value=":datasetForm:embargoInputs"/>
+                        <ui:param name="updateRetentionElements" value=":datasetForm:retentionInputs"/>
+                    </ui:include>
                     
                     <!-- Create/Save Dataset Button Panel -->
                     <ui:fragment id="editDataFilesButtons">
                         <div class="button-block">
                             <p:outputPanel id="filesButtons">
                                 <div jsf:rendered="#{!(empty EditDatafilesPage.fileMetadatas and (datasetPage || EditDatafilesPage.showFileUploadFragment()))}">
-                                    <button id="savebutton" class="btn btn-default" onclick="checkNewlyRestricted();" type='button'>
-                                        #{bundle.saveChanges}
-                                    </button>
-                                    <p:commandButton styleClass="btn btn-link" id="cancelbutton" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="bind_bsui_components();"/>
+                                    <p:commandButton id="savebutton" class="btn btn-default" value="#{bundle.saveChanges}"
+                                                     update=":datasetForm,:messagePanel"
+                                                     onclick="PF('blockFileForm').show();"
+                                                     oncomplete="$(document).scrollTop(0);"
+                                                     action="#{EditDatafilesPage.save}"/>
+                                    <p:commandButton styleClass="btn btn-link" id="cancelbutton" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form"/>
                                 </div>
                                 <div jsf:rendered="#{empty EditDatafilesPage.fileMetadatas and (datasetPage || EditDatafilesPage.showFileUploadFragment())}">
-                                    <p:commandButton styleClass="btn btn-default" id="doneFilesButtonnop" value="#{bundle.done}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="bind_bsui_components();"/>
+                                    <button id="doneFilesButtonnop" class="btn btn-default" value="#{bundle.done}" onclick="cancelDatasetEdit();return false;">#{bundle.done}</button>
+                                    <p:remoteCommand name="cancelEditCommand" process="@this" partialSubmit="true" async="true" update="" action="#{EditDatafilesPage.cancel}"/>     
+ 
                                 </div>
-                                <p:commandButton value="Direct" id="datasetSave"
-                                                 style="display:none"
-                                                 update=":datasetForm,:messagePanel"
-                                                 onclick="PF('blockFileForm').show();"
-                                                 oncomplete="javascript:bind_bsui_components();$(document).scrollTop(0);"
-                                                 action="#{EditDatafilesPage.save}"/>
                             </p:outputPanel>
                         </div>
                     </ui:fragment>
-                    <!-- END: Create/Save Dataset Button Panel -->
+                    <!-- END: Create/Save Dataset Button Panel -->      
                 </h:form>
                 
                 <p:blockUI block="datasetForm" widgetVar="blockFileForm"/>
-
-                <script>
-                    //<![CDATA[
-                    function clickSave(){
-                        $('button[id$="datasetSave"]').trigger('click');
-                    }
-                    function checkNewlyRestricted() {
-                        if ($('input[id$="showAccessPopup"]').val() === 'true') {
-                            PF('editFileAccessPopup').show();
-                        }
-                        else {
-                            $('button[id$="datasetSave"]').trigger('click');
-                        }
-                    }
-                    //]]>
-                </script>
             </ui:define>
         </ui:composition>
     </h:body>
diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml
index 1a55d96c1a5..96c78969ca1 100644
--- a/src/main/webapp/explicitGroup-new-dialog.xhtml
+++ b/src/main/webapp/explicitGroup-new-dialog.xhtml
@@ -22,7 +22,8 @@
                         <p:panelGrid columns="2" styleClass="noBorders">
                             <p:inputText id="explicitGroupName" styleClass="form-control" value="#{manageGroupsPage.explicitGroupName}"
                                          required="#{param['DO_GROUP_VALIDATION']}"
-                                         requiredMessage="#{bundle['dataverse.permissions.explicitGroupEditDialog.groupName.required']}"/>
+                                         requiredMessage="#{bundle['dataverse.permissions.explicitGroupEditDialog.groupName.required']}"
+                                         onkeypress="return event.keyCode !== 13;"/>
                             <p:message for="explicitGroupName"/>
                         </p:panelGrid>
                     </div>
@@ -41,7 +42,8 @@
                                          required="#{param['DO_GROUP_VALIDATION']}"
                                          requiredMessage="#{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier.required']}"
                                          validator="#{manageGroupsPage.validateGroupIdentifier}"
-										binding="#{manageGroupsPage.explicitGroupIdentifierField}"/>
+										binding="#{manageGroupsPage.explicitGroupIdentifierField}"
+                                                                                onkeypress="return event.keyCode !== 13;"/>
                             <p:message for="explicitGroupIdentifier"/>
                         </p:panelGrid>
                         <p class="help-block">#{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier.helpText']}</p>
@@ -59,7 +61,7 @@
                     <label for="roleAssigneeName" class="col-sm-3 control-label">
                         #{bundle['dataverse.permissions.explicitGroupEditDialog.roleAssigneeNames']}
                     </label>
-                    <div class="col-sm-9">
+                    <div class="col-sm-6">
                         <p:autoComplete id="roleAssigneeName" placeholder="#{bundle['dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.enterName']}"
                                         multiple="true" scrollHeight="180" forceSelection="true" 
                                         minQueryLength="2" queryDelay="1000"                                      
@@ -67,6 +69,7 @@
                                         emptyMessage="#{bundle['dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.invalidMsg']}"
                                         value="#{manageGroupsPage.newExplicitGroupRoleAssignees}"
                                         completeMethod="#{manageGroupsPage.completeRoleAssignee}"
+                                        onkeypress="return event.keyCode !== 13;"
                                         var="roleAssignee" 
                                         itemLabel="#{roleAssignee.displayInfo.title}" itemValue="#{roleAssignee}" converter="roleAssigneeConverter">
                             <p:column>
@@ -79,7 +82,6 @@
                             <p:ajax process="@this" event="itemSelect" />
                             <p:ajax process="@this" event="itemUnselect" />
                         </p:autoComplete>
-                        <!-- tried handle_dropdown_popup_scroll() fix here, conflicts -->
                     </div>
                 </div>
             </div>
diff --git a/src/main/webapp/file-configure-dropdown-fragment.xhtml b/src/main/webapp/file-configure-dropdown-fragment.xhtml
index b26f04d0314..e7b774a2ae3 100644
--- a/src/main/webapp/file-configure-dropdown-fragment.xhtml
+++ b/src/main/webapp/file-configure-dropdown-fragment.xhtml
@@ -10,45 +10,19 @@
     xmlns:cc="http://java.sun.com/jsf/composite"
     xmlns:o="http://omnifaces.org/ui"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
-        <div class="btn-group">
-            <button type="button" id="editFile" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
-                <span class="glyphicon glyphicon-cog"/> #{bundle['dataset.configureBtn']} <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu pull-right text-left" role="menu">
-                <!-- Worldmap unpublished -->
-                <li jsf:rendered="#{worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata)}">
-                    <a onclick="PF('mapData_popup').show()" href="javascript:void(0);">#{bundle['file.map']}</a>
-                </li>
-                <!-- Worldmap published -->
-                <li jsf:rendered="#{worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata)}">
-                    <a href="#{fileMetadata.dataFile.getMapItURL(dataverseSession.user.id)}">#{bundle['file.map']}</a>
-                </li>
-                <ui:repeat value="#{configureTools}" var="tool" rendered="#{dataverseSession.user.authenticated and canUpdateDataset and (fileMetadata.dataFile.tabularData or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
-                    <li>
-                        <p:commandLink
-                            update="@([id$=configureToolPopup])"
-                            action="#{configureFragmentBean.setConfigurePopupTool(tool)}"
-                            oncomplete="PF('configureToolPopup').show()">
-                            <f:actionListener binding="#{configureFragmentBean.setConfigureIds(fileId,fileMetadata.id)}" />
-                            #{tool.displayName}
-                        </p:commandLink>
-                    </li>
-                </ui:repeat>
-            </ul>
-        </div>
         
-        <!-- Configure popup MOVED TO file configure popup fragment -->
-
-          <p:dialog id="mapDataDialog" header="#{bundle['file.mapData.unpublished.header']}" widgetVar="mapData_popup" modal="true" rendered="#{(worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
-              <p class="help-block">
-                  <span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.mapData.unpublished.message']}</span>
-              </p>
-              <div class="button-block">
-                  <button type="button" class="btn btn-default" onclick="PF('mapData_popup').hide();PF('blockDatasetForm').hide();">
-                      #{bundle.close}
-                  </button>
-              </div>
-          </p:dialog>
+        <!-- Configure Options -->
+        <li class="dropdown-header">#{bundle['file.optionsBtn.header.configure']} <span class="glyphicon glyphicon-cog"/></li>
+        <ui:repeat value="#{configureTools}" var="tool">
+            <li>
+                <p:commandLink update="@([id$=configureToolPopup])"
+                                action="#{configureFragmentBean.setConfigurePopupTool(tool)}"
+                                oncomplete="PF('configureToolPopup').show()">
+                        <f:actionListener binding="#{configureFragmentBean.setConfigureIds(fileId,fileMetadata.id)}"/>
+                        #{tool.displayName}
+                </p:commandLink>
+            </li>
+        </ui:repeat>
+        <!-- END: Configure Options -->
 
 </ui:composition>
diff --git a/src/main/webapp/file-configure-popup-fragment.xhtml b/src/main/webapp/file-configure-popup-fragment.xhtml
index 4ce38ce129b..639245e8086 100644
--- a/src/main/webapp/file-configure-popup-fragment.xhtml
+++ b/src/main/webapp/file-configure-popup-fragment.xhtml
@@ -9,7 +9,7 @@
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
 
         <p class="help-block">
-            <h:outputText styleClass="text-left" value=" #{configureFragmentBean.configurePopupTool.description}&lt;br/&gt;#{configureFragmentBean.getMessageApi()}" escape="false"/>
+            <h:outputText styleClass="text-left" value=" #{configureFragmentBean.configurePopupTool.getDescriptionLang()}&lt;br/&gt;#{configureFragmentBean.getMessageApi()}" escape="false"/>
         </p>
         
         <div class="button-block">
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 70759561aa3..cd6a6b06523 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -10,300 +10,369 @@
     xmlns:cc="http://java.sun.com/jsf/composite"
     xmlns:o="http://omnifaces.org/ui"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
-    <ui:fragment rendered="#{fileMetadata.dataFile.ingestProblem and canUpdateDataset}">
-        <!-- Ingest Problem - this is the infamous "red triangle" error. As of 4.2, we only want to show it to the owner of the dataset: -->
-        <span class="ingest-warning" data-toggle="popover" data-container="body" data-trigger="hover" data-placement="left" data-html="true" data-title="&lt;span class='text-danger h5'&gt;#{bundle['file.ingestFailed.header']}&lt;/span&gt;" data-content="&lt;span class='text-danger'&gt;#{bundle['file.ingestFailed.message']} #{fileMetadata.dataFile.ingestReportMessage}&lt;/span&gt;">
-            <span class="glyphicon glyphicon-warning-sign text-danger"/>
-        </span>
-    </ui:fragment>
     
-    <ui:fragment rendered="#{worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata)}">
-        <button type="button" 
-                style="border-right:0;" 
-                class="btn btn-default btn-preview" 
-                data-target="#map-modal-#{fileMetadata.id}"
-                data-toggle="modal">
-            <span class="glyphicon glyphicon-map-marker"/> #{bundle['preview']}
-        </button>
-        <div class="modal fade" id="map-modal-#{fileMetadata.id}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <!-- WorldMap Preview -->
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header text-left">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="#{bundle['close']}"><span aria-hidden="true">&#215;</span></button>
-                        <h4 class="modal-title" id="myModalLabel"><span style="color:#c75b1d;">#{bundle['file.previewMap']}</span> #{fileMetadata.label}</h4>
-                    </div>
-                    <div class="modal-body">
-                        <iframe id="id_iframe_map" height="300" width="100%" src="#{ worldMapPermissionHelper.getMapLayerMetadata(fileMetadata.dataFile).getEmbedMapLink() }"></iframe>
-                    </div>
-                    <div class="modal-footer clearfix">
-                        <a href="#{ worldMapPermissionHelper.getMapLayerMetadata(fileMetadata.dataFile).getLayerLink() }" target="_blank"><img src="https://worldmap.harvard.edu/static/theme/img/WorldMap-Logo_26px.png" alt="#{bundle['file.mapData.worldMap']}" class="pull-left" style="margin-top:5px;" /></a>
-                        <a href="#{ worldMapPermissionHelper.getMapLayerMetadata(fileMetadata.dataFile).getLayerLink() }" class="btn btn-default" target="_blank"><span class="glyphicon glyphicon-equalizer"/> #{bundle['file.metaData.viewOnWorldMap']}</a>
-                        <button type="button" class="btn btn-default" data-dismiss="modal">#{bundle['close']}</button>
-                    </div>
-                </div>
-            </div>
-        </div>
+    <!-- Access Status -->
+    <li class="dropdown-header">#{bundle['file.accessBtn.header.access']} <span class="glyphicon glyphicon-file"/></li>
+    <li><span class="dropdown-item-text">
+            <span class="#{dataFileServiceBean.isRetentionExpired(fileMetadata) ? 'glyphicon glyphicon-lock text-danger' : !fileMetadata.restricted ?
+                           'glyphicon glyphicon-globe text-success' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'glyphicon glyphicon-lock text-danger' : 'icon-unlock text-success')}"/>
+            
+            <!-- TODO - add Embargo state -->
+            <h:outputText 
+                value=" #{dataFileServiceBean.isRetentionExpired(fileMetadata) ? bundle['retentionExpired'] : !fileDownloadHelper.isRestrictedOrEmbargoed(fileMetadata) ? bundle['public'] : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? (!dataFileServiceBean.isActivelyEmbargoed(fileMetadata) ? bundle['restricted'] : bundle['embargoed']) : (!dataFileServiceBean.isActivelyEmbargoed(fileMetadata) ? bundle['restrictedaccess'] : bundle['embargoed']) )}"
+                styleClass="#{dataFileServiceBean.isRetentionExpired(fileMetadata) ? 'text-danger' : !fileDownloadHelper.isRestrictedOrEmbargoed(fileMetadata) ? 'text-success' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'text-danger' : 'text-success')}"/>
+        </span></li>
+    <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
+                             and fileMetadata.dataFile.owner.fileAccessRequest
+                             and !dataFileServiceBean.isActivelyEmbargoed(fileMetadata)
+                             and !dataFileServiceBean.isRetentionExpired(fileMetadata)}">
+        <p:outputPanel id="requestPanel" styleClass="iq-dropdown-list-item #{fileMetadata.dataFile.containsActiveFileAccessRequestFromUser(dataverseSession.user) ? 'disabled' : ''}"
+                       rendered="#{fileDownloadHelper.session.user.authenticated}">
+            <p:commandLink styleClass="btn-request #{fileMetadata.dataFile.containsActiveFileAccessRequestFromUser(dataverseSession.user) ? 'italic'  : ''}"
+                        actionListener="#{fileDownloadHelper.handleCommandLinkClick(fileMetadata)}"
+                        update="@([id$=requestAccessConsolidated]), @([id$=requestPanel]),  @([id$=filesTable]), @([id$=messagePanel]), @([id$=guestbookAndTermsPopup])"
+                        id="requestAccessConsolidated"
+                        disabled="#{fileMetadata.dataFile.containsActiveFileAccessRequestFromUser(dataverseSession.user)}">
+                 <f:actionListener binding="#{bean.setTermsGuestbookPopupAction(bundle['file.requestAccess'])}"/>
+                #{fileMetadata.dataFile.containsActiveFileAccessRequestFromUser(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
+            </p:commandLink>
+        </p:outputPanel>
+        <li jsf:rendered="#{!fileDownloadHelper.session.user.authenticated}">
+            <p:commandLink styleClass="btn-request" 
+                        process="@this"
+                        onclick="PF('accessSignUpLogIn_popup').show()">
+                #{bundle['file.requestAccess']}
+            </p:commandLink>
+        </li>
     </ui:fragment>
-
-    <!--"Explore" button (dropdown of tools)-->
-    <!--exploreTools is set as a ui:param by the file and dataset pages-->
-    <!--Note that "WorldMap Explore" is not an explore tool (external tool)-->
-    <div class="btn-group" jsf:rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools or (worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
-        <ui:fragment rendered="#{(exploreTools.size()==1 and !worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))  or (exploreTools.size()==0 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
-            <button type="button" class="btn btn-default btn-explore"  onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
-                <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
-            </button>
-        </ui:fragment>
-        <ui:fragment rendered="#{exploreTools.size()>1 or (exploreTools.size()>=1 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
-            <button type="button" class="btn btn-default btn-explore dropdown-toggle" data-toggle="dropdown">
-                <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span  class="caret"/>
-            </button>
-        </ui:fragment>
-        <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
-            <!--external tools-->
-            <ui:repeat var="tool" value="#{exploreTools}">
-                <li>
-                    <h:commandLink rendered="#{!downloadPopupRequired}"
-                                   styleClass="#{(fileMetadata.dataFile.ingestInProgress) ? 'disabled' : ''}"
-                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
-                                   action="#{fileDownloadService.explore(guestbookResponse, fileMetadata, tool )}">
-                        #{tool.displayName}
-                    </h:commandLink>
-                    <!--The modifyDatafileAndFormat method below was added because on the dataset page, "tool" is null in the popup so we store it in the guestbookResponse because we know we'll need it later in the popup.-->
-                    <p:commandLink rendered="#{downloadPopupRequired}"
-                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'externalTool', tool)}"
-                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
-                                   process="@this"
-                                   update="@widgetVar(downloadPopup)"
-                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-                        #{tool.displayName}
-                    </p:commandLink>
-                </li>
-            </ui:repeat>
-            <!--WorldMap Explore-->
-            <li jsf:rendered="#{worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata)}">
-                <h:commandLink rendered="#{!downloadPopupRequired}"
-                               styleClass="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}"
-                               
-                               action="#{fileDownloadService.startWorldMapDownloadLink(guestbookResponse, fileMetadata )}" target="_blank">
-                    #{bundle['file.mapData.worldMap']}
-                </h:commandLink>
-                <p:commandLink rendered="#{downloadPopupRequired}"
-                               styleClass="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}"
-                               disabled="#{fileMetadata.dataFile.ingestInProgress  or lockedFromDownload}"
-                               process="@this"
-                               action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'worldMap' )}"
-                               update="@widgetVar(downloadPopup)"
-                               oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-                    #{bundle['file.mapData.worldMap']}
-                </p:commandLink>
-            </li>                       
-        </ul>
-    </div>
-    
-    <!-- Compute Button *File pg only*: -->
-    <h:outputLink value="#{FilePage.computeUrl}" class="btn btn-default btn-compute" target="_blank" rendered="#{isFilePg and FilePage.showComputeButton() and fileDownloadHelper.canDownloadFile(fileMetadata)}"> 
-        <span class="glyphicon glyphicon-flash"/> #{bundle['file.compute']}
-    </h:outputLink>
-    <!-- Compute Button *Dataset pg only*: -->
-    <h:outputLink value="#{DatasetPage.getComputeUrl(fileMetadata)}" class="btn btn-default btn-compute" target="_blank" rendered="#{!isFilePg and DatasetPage.showComputeButton(fileMetadata) and fileDownloadHelper.canDownloadFile(fileMetadata)}"> 
-        <span class="glyphicon glyphicon-flash"/> #{bundle['file.compute']}
-    </h:outputLink>
+    <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
+                             and !fileMetadata.dataFile.owner.fileAccessRequest and !dataFileServiceBean.isActivelyEmbargoed(fileMetadata)}">
+        <li><span class="dropdown-item-text">#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.notRequest']}</span></li>
+    </ui:fragment>
+    <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
+                             and dataFileServiceBean.isActivelyEmbargoed(fileMetadata)}">
+        <li><span class="dropdown-item-text">#{fileMetadata.restricted ? bundle['file.dataFilesTab.terms.list.termsOfAccess.embargoedthenrestricted'] : bundle['file.dataFilesTab.terms.list.termsOfAccess.embargoed']}</span></li>
+    </ui:fragment>
+    <!-- END: Request Access Options -->
     
-    <p:commandLink rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
-                              and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
-                   styleClass="btn btn-default btn-download" process="@this"
-                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                   update="@widgetVar(downloadPackagePopup)" oncomplete="PF('downloadPackagePopup').show();handleResizeDialog('downloadPackagePopup');">
-        <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" />
-        <f:actionListener binding="#{fileDownloadService.writeGuestbookResponseRecord(guestbookResponse, fileMetadata, 'package')}" />
-        <!-- package data file: -->
-        <!-- no guest book/terms of use/etc. - straight package popup -->
-        <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
-    </p:commandLink>
-
-    <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and (downloadPopupRequired) 
-                              and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
-                   styleClass="btn btn-default btn-download"
-                   process="@this"
-                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'package')}"
-                   update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-        <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" /> 
-        <!-- package data file: -->
-        <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-        <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
-    </p:commandLink>
-
-    <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
-                                and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
-                   styleClass="btn btn-default btn-download"
-                   process="@this"
-                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'Download')}">
-        <!-- non-tabular data file: -->
-        <!-- no guest book/terms of use/etc. - straight to the download API url: -->
-        <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
-    </p:commandLink>
-
-    <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and downloadPopupRequired 
-                                and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
-                   styleClass="btn btn-default btn-download"
-                   process="@this"
-                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                   action="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}"
-                   update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-        <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-        <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
-    </p:commandLink>
-
-    <div class="btn-group" jsf:rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and fileMetadata.dataFile.tabularData }">
-        <!-- Download Dropdown -->
-        <button type="button" class="btn btn-default btn-download dropdown-toggle" data-toggle="dropdown">
-            <span class="glyphicon glyphicon-download-alt"/> #{bundle.download} <span class="caret"/>
-        </button>
-        <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
+    <!-- CAN DOWNLOAD ACCESS Options -->
+    <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata)}">
+        <!-- Download Options -->
+        <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
+        
+        <!-- GlobusTransfer, orig file only  -->
+         <o:importFunctions type="edu.harvard.iq.dataverse.dataaccess.DataAccess" />
+        <li jsf:rendered="#{settingsWrapper.globusFileDownload and settingsWrapper.isGlobusTransferable(fileMetadata)}">
+            <p:commandLink rendered="#{!(guestbookAndTermsPopupRequired) 
+                                      and !(fileMetadata.dataFile.filePackage)}"
+                         styleClass="btn-download"
+                         process="@this"
+                         disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                         actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'GlobusTransfer')}">
+                <!-- non-tabular data file: -->
+                <!-- no guest book/terms of use/etc. - straight to the download API url: -->
+                <span class="globus-btn ui-icon" title="#{bundle['file.globus.transfer']}"/> #{bundle['file.globus.of']} #{fileMetadata.dataFile.friendlyType == 'Unknown' ? bundle['file.download.filetype.unknown'] : fileMetadata.dataFile.friendlyType}
+            </p:commandLink>
+            <p:commandLink rendered="#{guestbookAndTermsPopupRequired and !fileMetadata.dataFile.filePackage}"
+                         styleClass="btn-download"
+                         process="@this"
+                         disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                         actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'GlobusTransfer')}"
+                         update="@widgetVar(guestbookAndTermsPopup)" oncomplete="PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');">
+                         <f:actionListener binding="#{bean.setTermsGuestbookPopupAction(bundle.download)}"/>
+                <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
+                <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
+                <span class="globus-btn ui-icon" title="#{bundle['file.globus.transfer']}"/> #{bundle['file.globus.of']} #{fileMetadata.dataFile.friendlyType == 'Unknown' ? bundle['file.download.filetype.unknown'] : fileMetadata.dataFile.friendlyType}
+            </p:commandLink>
+        </li>
+        
+        
+        <!-- NON-TABULAR + PACKAGE DOWNLOAD OPTIONS -->
+        <li jsf:rendered="#{!fileMetadata.dataFile.tabularData}">
+            <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(guestbookAndTermsPopupRequired) 
+                                    and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
+                         styleClass="btn-download" process="@this"
+                         disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                         update="@widgetVar(downloadPackagePopup)" oncomplete="PF('downloadPackagePopup').show();handleResizeDialog('downloadPackagePopup');">
+                <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" />
+                <f:actionListener binding="#{fileDownloadService.writeGuestbookResponseRecord(guestbookResponse, fileMetadata, 'package')}" />
+                <!-- package data file: -->
+                <!-- no guest book/terms of use/etc. - straight package popup -->
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? bundle['file.download.filetype.unknown'] : fileMetadata.dataFile.friendlyType}
+            </p:commandLink>
+            <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and (guestbookAndTermsPopupRequired) 
+                                    and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
+                         styleClass="btn-download"
+                         process="@this"
+                         disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                         actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'package')}"
+                         update="@widgetVar(guestbookAndTermsPopup)" oncomplete="PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');">
+                         <f:actionListener binding="#{bean.setTermsGuestbookPopupAction(bundle.download)}"/>
+                <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" /> 
+                <!-- package data file: -->
+                <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? bundle['file.download.filetype.unknown'] : fileMetadata.dataFile.friendlyType}
+            </p:commandLink>
+            <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(guestbookAndTermsPopupRequired) 
+                                      and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload) and settingsWrapper.isDownloadable(fileMetadata)}"
+                         styleClass="btn-download"
+                         process="@this"
+                         disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                         actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'Download')}">
+                <!-- non-tabular data file: -->
+                <!-- no guest book/terms of use/etc. - straight to the download API url: -->
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? bundle['file.download.filetype.unknown'] : fileMetadata.dataFile.friendlyType}
+            </p:commandLink>
+            <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and guestbookAndTermsPopupRequired 
+                                      and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload) and settingsWrapper.isDownloadable(fileMetadata)}"
+                         styleClass="btn-download"
+                         process="@this"
+                         disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                         actionListener="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}"
+                         update="@widgetVar(guestbookAndTermsPopup)" oncomplete="PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');">
+                <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
+                <f:actionListener binding="#{bean.setTermsGuestbookPopupAction(bundle.download)}"/>
+                <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
+                #{fileMetadata.dataFile.friendlyType == 'Unknown' ? bundle['file.download.filetype.unknown'] : fileMetadata.dataFile.friendlyType}
+            </p:commandLink>
+        </li>
+        <!-- TABULAR DOWNLOAD OPTIONS -->
+        <ui:fragment rendered="#{fileMetadata.dataFile.tabularData}">
             <ui:remove>
-                <li>
-                    <p:commandLink styleClass="highlightBold" rendered="#{!(downloadPopupRequired)}"
-                                   process="@this"
-                                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'bundle')}">
-                        #{bundle['file.downloadBtn.format.all']}
-                    </p:commandLink>
-                    <p:commandLink styleClass="highlightBold" rendered="#{downloadPopupRequired}"
-                                   process="@this"
-                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'bundle' )}"
-                                   update="@widgetVar(downloadPopup)"
-                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-                        #{bundle['file.downloadBtn.format.all']}
-                    </p:commandLink>
-                </li>
-                <li role="presentation" class="divider"></li>
+            <li>
+                <p:commandLink styleClass="highlightBold btn-download" rendered="#{!(guestbookAndTermsPopupRequired)}"
+                               process="@this"
+                               actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'bundle')}">
+                    #{bundle['file.downloadBtn.format.all']}
+                </p:commandLink>
+                <p:commandLink styleClass="highlightBold btn-download" rendered="#{guestbookAndTermsPopupRequired}"
+                               process="@this"
+                               actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'bundle' )}"
+                               update="@widgetVar(guestbookAndTermsPopup)"
+                               oncomplete="PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');">
+                               <f:actionListener binding="#{bean.setTermsGuestbookPopupAction(bundle.download)}"/>
+                    #{bundle['file.downloadBtn.format.all']}
+                </p:commandLink>
+            </li>
+            <li role="presentation" class="divider"></li>
             </ui:remove>
             <li>
-                <p:commandLink rendered="#{!downloadPopupRequired and !(fileMetadata.dataFile.originalFormatLabel == 'UNKNOWN')}"
+                <p:commandLink styleClass="btn-download" rendered="#{!guestbookAndTermsPopupRequired and !(fileMetadata.dataFile.originalFormatLabel == 'UNKNOWN')}"
                                process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
+                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
                                actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'original')}">
                     <h:outputFormat value="#{bundle['file.downloadBtn.format.original']}">
                         <f:param value="#{fileMetadata.dataFile.originalFormatLabel}"/>
                     </h:outputFormat>
                 </p:commandLink>
-                <p:commandLink rendered="#{downloadPopupRequired and !(fileMetadata.dataFile.originalFormatLabel == 'UNKNOWN')}"
+                <p:commandLink styleClass="btn-download" rendered="#{guestbookAndTermsPopupRequired and !(fileMetadata.dataFile.originalFormatLabel == 'UNKNOWN')}"
                                process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                               action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'original' )}"
-                               update="@widgetVar(downloadPopup)"
-                               oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                               actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'original' )}"
+                               update="@widgetVar(guestbookAndTermsPopup)"
+                               oncomplete="PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');">
+                    <f:actionListener binding="#{bean.setTermsGuestbookPopupAction(bundle.download)}"/>
+                    <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
                     <h:outputFormat value="#{bundle['file.downloadBtn.format.original']}">
                         <f:param value="#{fileMetadata.dataFile.originalFormatLabel}"/>
                     </h:outputFormat>
                 </p:commandLink>
             </li>
             <li>
-                <p:commandLink rendered="#{!downloadPopupRequired}"
+                <p:commandLink styleClass="btn-download" rendered="#{!guestbookAndTermsPopupRequired}"
                                process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
+                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
                                actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'tab')}">
                     #{bundle['file.downloadBtn.format.tab']}
                 </p:commandLink>
-                <p:commandLink rendered="#{downloadPopupRequired}"
-                               action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'tab' )}"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                               update="@widgetVar(downloadPopup)"
-                               oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                <p:commandLink styleClass="btn-download" rendered="#{guestbookAndTermsPopupRequired}"
+                               actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'tab' )}"
+                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                               update="@widgetVar(guestbookAndTermsPopup)"
+                               oncomplete="PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');">
+                    <f:actionListener binding="#{bean.setTermsGuestbookPopupAction(bundle.download)}"/>
+                    <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
                     #{bundle['file.downloadBtn.format.tab']}
                 </p:commandLink>
             </li>
             <ui:fragment rendered="#{!(fileMetadata.dataFile.originalFormatLabel == 'RData')}">
                 <li>
-                    <p:commandLink rendered="#{!downloadPopupRequired}"
+                    <p:commandLink styleClass="btn-download" rendered="#{!guestbookAndTermsPopupRequired}"
                                    process="@this"
-                                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
                                    actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'RData')}">
                         #{bundle['file.downloadBtn.format.rdata']}
                     </p:commandLink>
-                    <p:commandLink rendered="#{downloadPopupRequired}"
+                    <p:commandLink styleClass="btn-download" rendered="#{guestbookAndTermsPopupRequired}"
                                    process="@this"
-                                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'RData' )}"
-                                   update="@widgetVar(downloadPopup)"
-                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'RData' )}"
+                                   update="@widgetVar(guestbookAndTermsPopup)"
+                                   oncomplete="PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');">
+                        <f:actionListener binding="#{bean.setTermsGuestbookPopupAction(bundle.download)}"/>
+                        <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
                         #{bundle['file.downloadBtn.format.rdata']}
                     </p:commandLink>
                 </li>
             </ui:fragment>
+        </ui:fragment>
+        <!-- END: TABULAR DOWNLOAD OPTIONS -->
+    </ui:fragment>
+    <!-- END: CAN DOWNLOAD ACCESS Options -->
+    
+    <!-- Download Metadata -->
+    <li class="dropdown-header">#{bundle['file.accessBtn.header.metadata']} <span class="glyphicon glyphicon-download-alt"/></li>
+    
+    <ui:fragment rendered="#{fileMetadata.dataFile.tabularData and fileDownloadHelper.canDownloadFile(fileMetadata)}">
+        <li>
+            <p:commandLink styleClass="btn-download" rendered="#{!guestbookAndTermsPopupRequired}"
+                           process="@this"
+                           disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                           actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'var')}">
+                #{bundle['file.downloadBtn.format.var']}
+            </p:commandLink>
+            <p:commandLink styleClass="btn-download" rendered="#{guestbookAndTermsPopupRequired}"
+                           process="@this"
+                           disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                           actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'var' )}"
+                           update="@widgetVar(guestbookAndTermsPopup)"
+                           oncomplete="PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');">
+                           <f:actionListener binding="#{bean.setTermsGuestbookPopupAction(bundle.download)}"/>
+                #{bundle['file.downloadBtn.format.var']}
+            </p:commandLink>
+        </li>
+    </ui:fragment>
+    
+    <!-- CITATION FILES DOWNLOAD OPTIONS -->
+    <li class="dropdown-submenu pull-left" jsf:rendered="#{!anonymized}">
+            <a tabindex="0">#{bundle['file.downloadBtn.format.citation']}</a>
+        <ul class="dropdown-menu">
             <li>
-                <p:commandLink rendered="#{!downloadPopupRequired}"
+                <h:commandLink styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationXML(fileMetadata)}">
+                    <h:outputText value="#{bundle['dataset.cite.downloadBtn.xml']}" />
+                </h:commandLink>
+            </li>
+            <li>
+                <h:commandLink styleClass="btn-download" actionListener="#{fileDownloadService.downloadDatafileCitationRIS(fileMetadata)}">
+                    <h:outputText value="#{bundle['dataset.cite.downloadBtn.ris']}" />
+                </h:commandLink>
+            </li>
+            <li>
+                <h:commandLink styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationBibtex(fileMetadata)}">
+                    <h:outputText value="#{bundle['dataset.cite.downloadBtn.bib']}" />
+                </h:commandLink>
+            </li>
+        </ul>
+    </li>
+    <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
+    <li role="presentation" class="clearfix"></li>
+    <!-- END: CITATION FILES DOWNLOAD OPTIONS -->
+    
+    <!-- TODO - looks like this shows Aux files regardless of whether you can download them but the redirect to the API will check permissions downloads related to unreleased files and non-public aux files on files that are restricted/embargoed. Should the menu indicate the restrictions?  -->
+    <!-- AUX FILES DOWNLOAD OPTIONS -->
+    <ui:fragment rendered="#{not empty auxiliaryFileServiceBean.findAuxiliaryFiles(fileMetadata.dataFile)}">
+        <!-- Download Auxiliary Files -->
+        <li class="dropdown-header">#{bundle['file.auxfiles.download.header']} <span class="glyphicon glyphicon-download-alt"/></li>
+        <!-- Aux Files in Bundle (DP, etc.)-->
+        <ui:repeat var="auxFileType" value="#{auxiliaryFileServiceBean.findAuxiliaryFileTypes(fileMetadata.dataFile, true)}">
+            <li class="dropdown-submenu pull-left">
+                <a tabindex="0">#{auxiliaryFileServiceBean.getFriendlyNameForType(auxFileType)}</a>
+                <ul class="dropdown-menu">
+                    <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findAuxiliaryFilesByType(fileMetadata.dataFile, auxFileType)}">
+                        <li>
+                            <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, auxFile.formatTag, auxFile.formatVersion)}">
+                                <h:outputText value="#{auxFile.formatTag} (#{auxFile.formatVersion})"/>
+                            </p:commandLink>
+                        </li>
+                    </ui:repeat>
+                </ul>
+            </li>
+        </ui:repeat>
+        <!--Other Aux Files (not in bundle)-->
+        <li class="dropdown-submenu pull-left" jsf:rendered="#{not empty auxiliaryFileServiceBean.findOtherAuxiliaryFiles(fileMetadata.dataFile)}">
+            <a tabindex="0">#{bundle['file.auxfiles.unspecifiedTypes']}</a>
+            <ul class="dropdown-menu">
+                <ui:repeat var="auxFile" value="#{auxiliaryFileServiceBean.findOtherAuxiliaryFiles(fileMetadata.dataFile)}">
+                    <li>
+                        <p:commandLink styleClass="btn-download" action="#{fileDownloadService.redirectToAuxFileDownloadAPI(fileMetadata.dataFile.id, auxFile.formatTag, auxFile.formatVersion)}">
+                            <h:outputText value="#{auxFile.formatTag} (#{auxFile.formatVersion})"/>
+                        </p:commandLink>
+                    </li>
+                </ui:repeat>
+            </ul>
+        </li>
+        <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
+        <li role="presentation" class="clearfix"></li>
+    </ui:fragment>
+    <!-- END: Download Auxiliary Files -->
+    <!-- END: AUX FILES DOWNLOAD OPTIONS -->
+    
+    <!-- Explore Options -->
+    <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools}">
+        <!--exploreTools is set as a ui:param by the file and dataset pages-->
+        <li class="dropdown-header">#{bundle['dataset.accessBtn.header.explore']} <span class="glyphicon glyphicon-equalizer"/></li>
+        <!-- externalTools -->
+        <ui:repeat var="tool" value="#{exploreTools}">
+            <li>
+                <p:commandLink rendered="#{!guestbookAndTermsPopupRequired}"
+                               styleClass="btn-explore #{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                               action="#{fileDownloadService.explore(guestbookResponse, fileMetadata, tool )}">
+                    #{tool.getDisplayNameLang()}
+                </p:commandLink>
+                <!--The modifyDatafileAndFormat method below was added because on the dataset page, "tool" is null in the popup so we store it in the guestbookResponse because we know we'll need it later in the popup.-->
+                <p:commandLink rendered="#{guestbookAndTermsPopupRequired}"
+                               actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'externalTool', tool)}"
+                               styleClass="btn-explore #{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload)}"
                                process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                               actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'var')}">
-                    #{bundle['file.downloadBtn.format.var']}
+                               update="@widgetVar(guestbookAndTermsPopup)"
+                               oncomplete="PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');">
+                               <f:actionListener binding="#{bean.setTermsGuestbookPopupAction(bundle.download)}"/>
+                    #{tool.getDisplayNameLang()}
                 </p:commandLink>
+            </li>
+        </ui:repeat>
+        <!-- END: externalTools -->
+    </ui:fragment>
+    
+    
+    <!-- Query Options -->
+    <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty queryTools}">
+        <!--query Tools is set as a ui:param by the file and dataset pages-->
+        <li class="dropdown-header">#{bundle['file.accessBtn.header.query']} <span class="glyphicon glyphicon-equalizer"/></li>
+        <!-- query Tools -->
+        <ui:repeat var="tool" value="#{queryTools}">
+            <li>
+                <p:commandLink rendered="#{!downloadPopupRequired}"
+                               styleClass="btn-query #{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                               action="#{fileDownloadService.explore(guestbookResponse, fileMetadata, tool )}">
+                    #{tool.getDisplayNameLang()}
+                </p:commandLink>
+                <!--The modifyDatafileAndFormat method below was added because on the dataset page, "tool" is null in the popup so we store it in the guestbookResponse because we know we'll need it later in the popup.-->
                 <p:commandLink rendered="#{downloadPopupRequired}"
+                               actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'externalTool', tool)}"
+                               styleClass="btn-query #{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload)}"
                                process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                               action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'var' )}"
                                update="@widgetVar(downloadPopup)"
                                oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-                    #{bundle['file.downloadBtn.format.var']}
+                    #{tool.getDisplayNameLang()}
                 </p:commandLink>
             </li>
-            <li class="dropdown-submenu pull-left">
-                <a tabindex="-1" href="javascript:void(0);">#{bundle['file.downloadBtn.format.citation']}</a>
-                <ul class="dropdown-menu">
-                    <li>
-                        <h:commandLink id="risLinkFile" actionListener="#{fileDownloadService.downloadDatafileCitationRIS(fileMetadata)}">
-                            <h:outputText value="#{bundle['dataset.cite.downloadBtn.ris']}" />
-                        </h:commandLink>
-                    </li>
-                    <li>
-                        <h:commandLink id="endNoteLinkFile" action="#{fileDownloadService.downloadDatafileCitationXML(fileMetadata)}">
-                            <h:outputText value="#{bundle['dataset.cite.downloadBtn.xml']}" />
-                        </h:commandLink>
-                    </li>
-                    <li>
-                        <h:commandLink id="bibLinkFile" action="#{fileDownloadService.downloadDatafileCitationBibtex(fileMetadata)}">
-                            <h:outputText value="#{bundle['dataset.cite.downloadBtn.bib']}" />
-                        </h:commandLink>
-                    </li>
-                </ul>
-            </li>
-        </ul>
-    </div>        
-    <p:commandLink styleClass="btn btn-default btn-request" rendered="#{(fileDownloadHelper.session.user.authenticated 
-                                                                          and !fileMetadata.datasetVersion.deaccessioned
-                                                                          and fileMetadata.dataFile.owner.fileAccessRequest 
-                                                                          and !(fileDownloadHelper.canDownloadFile(fileMetadata)))
-                                                                          and !requestAccessPopupRequired}"
-                   process="@this"
-                   actionListener="#{fileDownloadHelper.requestAccess(fileMetadata.dataFile)}"
-                   update="@this"
-                   disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
-        <span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
-    </p:commandLink>
-    <p:commandLink styleClass="btn btn-default btn-request" rendered="#{fileDownloadHelper.session.user.authenticated 
-                                                                          and !fileMetadata.datasetVersion.deaccessioned
-                                                                          and fileMetadata.dataFile.owner.fileAccessRequest 
-                                                                          and !(fileDownloadHelper.canDownloadFile(fileMetadata))
-                                                                          and requestAccessPopupRequired}"
-                   process="@this"
-                   actionListener="#{fileDownloadHelper.addFileForRequestAccess(fileMetadata.dataFile)}"
-                   onclick="PF('requestAccessPopup').show()"
-                   id="requestAccessPopupButton"
-                   disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
-        <span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
-    </p:commandLink>
-    <p:commandLink styleClass="btn btn-default btn-request" rendered="#{!fileDownloadHelper.session.user.authenticated 
-                                                                          and !fileMetadata.datasetVersion.deaccessioned
-                                                                          and fileMetadata.dataFile.owner.fileAccessRequest 
-                                                                          and !(fileDownloadHelper.canDownloadFile(fileMetadata))}"
-                   process="@this"
-                   onclick="PF('accessSignUpLogIn_popup').show()">
-        <!-- 4.2.1 - TODO: retest this on a dataset with fileRequest enabled and with some files restricted to the user -->
-        <span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
-    </p:commandLink>
+        </ui:repeat>
+        <!-- END: externalTools -->
+    </ui:fragment>
+    <!-- Compute Options -->
+    <ui:fragment rendered="#{(isFilePg ? FilePage.showComputeButton() : DatasetPage.showComputeButton(fileMetadata)) and fileDownloadHelper.canDownloadFile(fileMetadata)}">
+        <li class="dropdown-header">#{bundle['dataset.accessBtn.header.compute']} <span class="glyphicon glyphicon-flash"/></li>
+        <li>
+            <h:outputLink value="#{isFilePg ? FilePage.computeUrl : DatasetPage.getComputeUrl(fileMetadata)}" styleClass="btn-compute" 
+                          target="_blank" rel="noopener">
+                #{bundle['file.compute']}
+            </h:outputLink>
+        </li>
+    </ui:fragment>
+    <!-- END: Compute Options -->
 </ui:composition>
diff --git a/src/main/webapp/file-download-popup-fragment.xhtml b/src/main/webapp/file-download-popup-fragment.xhtml
deleted file mode 100644
index 11f3b211ac2..00000000000
--- a/src/main/webapp/file-download-popup-fragment.xhtml
+++ /dev/null
@@ -1,178 +0,0 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:h="http://java.sun.com/jsf/html"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
-                xmlns:p="http://primefaces.org/ui"
-                xmlns:o="http://omnifaces.org/ui"
-                xmlns:jsf="http://xmlns.jcp.org/jsf"
-                xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
-
-        <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
-        <p:focus context="downloadPopup"/>
-        <p class="help-block">
-            #{bundle['file.downloadDialog.tip']}
-        </p>
-        <p:fragment id="guestbookMessages">
-            <div class="container messagePanel">
-                <iqbs:messages collapsible="true" />
-            </div>
-        </p:fragment>
-        
-        <div class="form-horizontal">
-            <div class="form-group" jsf:rendered="#{workingVersion.termsOfUseAndAccess.license != 'CC0' and !empty workingVersion.termsOfUseAndAccess.termsOfUse}">
-                <label class="col-sm-3 control-label" for="guestbook_tou">
-                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
-                </label>
-                <div class="col-sm-6">
-                    <div class="panel panel-default">
-                        <div class="panel-body read-terms">
-                            <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfUse)}" escape="false" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group" jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfAccess}">
-                <label class="col-sm-3 control-label" for="guestbook_toa">
-                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                </label>
-                <div class="col-sm-6">
-                    <div class="panel panel-default">
-                        <div class="panel-body read-terms">
-                            <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfAccess)}" escape="false" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <p:fragment rendered="#{workingVersion.dataset.guestbook != null and workingVersion.dataset.guestbook.enabled and downloadPopupRequired}" id="guestbookUIFragment">
-                <p:fragment>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label" for="guestbookuser_nameText">
-                            #{bundle.name}
-                            <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{workingVersion.dataset.guestbook.nameRequired}" />
-                        </label>
-                        <div class="col-sm-6">
-                            <p:inputText id="guestbookuser_nameText" 
-                                         required="#{param['DO_GB_VALIDATION'] and workingVersion.dataset.guestbook.nameRequired}"
-                                         styleClass="form-control" value="#{guestbookResponse.name}"
-                                         requiredMessage="#{bundle['requiredField']}"                                       
-                                         binding="#{fileDownloadHelper.nameField}">
-                                <p:ajax listener="#{fileDownloadHelper.nameValueChangeListener}" />
-                              </p:inputText>  
-                            <p:message id="nameMessages" for="guestbookuser_nameText" display="text"/>
-                        </div>
-                    </div>
-                </p:fragment>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label" for="guestbookuser_email">
-                        #{bundle.email}
-                        <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{workingVersion.dataset.guestbook.emailRequired}" />
-                    </label>
-                    <div class="col-sm-6">
-                        <p:inputText id="guestbookuser_email" required="#{param['DO_GB_VALIDATION'] and workingVersion.dataset.guestbook.emailRequired}"
-                                     styleClass="form-control" value="#{guestbookResponse.email}"
-                                     requiredMessage="#{bundle['requiredField']}"
-                                     binding="#{fileDownloadHelper.emailField}">
-                        <p:ajax listener="#{fileDownloadHelper.emailValueChangeListener}" />
-                        </p:inputText>  
-                        <p:message id="emailMessages" for="guestbookuser_email" display="text"/>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label" for="guestbookuser_institution">
-                        #{bundle.institution}
-                        <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{workingVersion.dataset.guestbook.institutionRequired}" />
-                    </label>
-                    <div class="col-sm-6">
-                        <p:inputText id="guestbookuser_institution" required="#{param['DO_GB_VALIDATION'] and workingVersion.dataset.guestbook.institutionRequired}"
-                                     styleClass="form-control" value="#{guestbookResponse.institution}"
-                                     requiredMessage="#{bundle['requiredField']}"
-                                     binding="#{fileDownloadHelper.institutionField}">
-                        <p:ajax listener="#{fileDownloadHelper.institutionValueChangeListener}" />
-                        </p:inputText>
-                        <p:message id="institutionMessages" for="guestbookuser_institution" display="text"/>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label" for="guestbookuser_position">
-                        #{bundle.position}
-                        <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{workingVersion.dataset.guestbook.positionRequired}" />
-                    </label>
-                    <div class="col-sm-6">
-                        <p:inputText id="guestbookuser_position"  required="#{param['DO_GB_VALIDATION'] and workingVersion.dataset.guestbook.positionRequired}"
-                                     styleClass="form-control" value="#{guestbookResponse.position}"
-                                     requiredMessage="#{bundle['requiredField']}"
-                                     binding="#{fileDownloadHelper.positionField}">
-                        <p:ajax listener="#{fileDownloadHelper.positionValueChangeListener}" />
-                        </p:inputText>
-                        <p:message id="positionMessages" for="guestbookuser_position" display="text"/>
-                    </div>
-                </div>
-                <div class="form-group" jsf:rendered="#{!empty workingVersion.dataset.guestbook.customQuestions}">
-                    <label class="col-sm-3 control-label" for="guestbookuser_questions">
-                        #{bundle['dataset.guestbookResponse.guestbook.additionalQuestions']}
-                    </label>
-                    <div class="col-sm-6">
-                        <ui:repeat value="#{guestbookResponse.customQuestionResponses}" var="customQuestionResponse">
-                            <div class="text-left">
-                                <label class="control-label">
-                                    <h:outputText value="#{customQuestionResponse.customQuestion.questionString} "/>
-                                    <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{customQuestionResponse.customQuestion.required}" />
-                                </label>
-                                <p:inputText id="customQuestionResponse"
-                                             styleClass="form-control" value="#{customQuestionResponse.response}"
-                                             required="#{param['DO_GB_VALIDATION'] and customQuestionResponse.customQuestion.required}"
-                                             rendered="#{customQuestionResponse.customQuestion.questionType=='text'}"
-                                             requiredMessage="#{bundle['requiredField']}">
-                                    <p:ajax listener="#{fileDownloadHelper.customQuestionValueChangeListener}"/>
-                                </p:inputText>
-                                <p:message id="cqMessages" for="customQuestionResponse" display="text"/>
-                                <p:selectOneMenu id="customQuestionResponseSelect"
-                                                 styleClass="form-control" value="#{customQuestionResponse.response}"
-                                                 required="#{param['DO_GB_VALIDATION'] and customQuestionResponse.customQuestion.required}"
-                                                 rendered="#{customQuestionResponse.customQuestion.questionType=='options'}"
-                                                 requiredMessage="#{bundle['requiredField']}">
-                                    <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true" />
-                                    <f:selectItems value="#{customQuestionResponse.responseSelectItems}" />
-                                    <p:ajax listener="#{fileDownloadHelper.customQuestionValueChangeListener}"/>
-                                </p:selectOneMenu>
-                            </div>
-                                <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty customQuestionResponse.validationMessage}">
-                                    <span class="ui-message-error-detail">#{customQuestionResponse.validationMessage}</span>
-                                </div>
-                        </ui:repeat>
-                    </div>
-                </div>
-            </p:fragment>
-        </div>
-        <div class="button-block">
-            <!--Note: the guestbookResponse.fileFormat is being set in xhtml via the initial download buttons in file-download-button-fragment.xhtml -->
-            <p:commandButton styleClass="btn btn-default" process="@this" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat != 'externalTool'
-                                                                                                                            and guestbookResponse.fileFormat != 'worldMap'
-                                                                                                                            and guestbookResponse.fileFormat != 'package'}"
-                           actionListener="#{fileDownloadHelper.writeGuestbookAndStartDownload(guestbookResponse)}"
-                           update="guestbookUIFragment">
-                <f:param name="DO_GB_VALIDATION" value="true"/>
-            </p:commandButton>
-            <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat == 'worldMap'}"
-                            actionListener="#{fileDownloadHelper.startWorldMapDownloadLink(guestbookResponse, null)}" 
-                            update="guestbookUIFragment">
-                <f:param name="DO_GB_VALIDATION" value="true"/> 
-            </p:commandButton>
-            <!--On the dataset page (but not the file page), "tool" is null so we get the tool from the guestbookResponse.-->
-            <p:commandButton styleClass="btn btn-default" process="@this" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat == 'externalTool'}"
-                           action="#{fileDownloadHelper.writeGuestbookAndLaunchExploreTool(guestbookResponse, fileMetadata, tool)}"
-                           update="guestbookUIFragment">
-                <f:param name="DO_GB_VALIDATION" value="true"/>
-            </p:commandButton>
-            <p:commandButton styleClass="btn btn-default" process="@this" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat == 'package'}"
-                           update="guestbookUIFragment @form @widgetVar(downloadPackagePopup)">
-                <f:actionListener binding="#{fileDownloadHelper.writeGuestbookAndLaunchPackagePopup(guestbookResponse)}"/>
-                <f:param name="DO_GB_VALIDATION" value="true"/>
-            </p:commandButton>
-            <button class="btn btn-link" onclick="PF('downloadPopup').hide();PF('blockDatasetForm').hide();" type="button">
-                #{bundle.cancel}
-            </button>
-        </div>
-</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/file-edit-button-fragment.xhtml b/src/main/webapp/file-edit-button-fragment.xhtml
new file mode 100644
index 00000000000..8b07aa50929
--- /dev/null
+++ b/src/main/webapp/file-edit-button-fragment.xhtml
@@ -0,0 +1,165 @@
+<ui:composition
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:p="http://primefaces.org/ui"
+    xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+    xmlns:jsf="http://xmlns.jcp.org/jsf"
+    xmlns:pt="http://java.sun.com/jsf/passthrough"
+    xmlns:cc="http://java.sun.com/jsf/composite"
+    xmlns:o="http://omnifaces.org/ui"
+    xmlns:of="http://omnifaces.org/functions"
+    xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
+    
+    <ui:remove>
+    <!--
+    If you include this fragment, you must also include file-edit-popup-fragment.xhtml
+    
+    This can be used for a single, specific file (passing "fileMetadata") or a group of selected files.
+    
+    Parameters:
+    dataserVersion - the datasetversion object to associate with this view
+    fileMetadata - for single file, the fileMetadata object of that file
+    fileMetadataForAction - used by DatasetPage popups to identify single file (also clears for selected file)
+    configureTools - for single file, list of configureTools for the file
+    bean - the named value of the backing bean for the below method(s), also used by isFilePg param
+    unrestrictFileAction - name of the method on the above bean to call for unrestrict (method must take a boolean)    
+    refreshTagsPopoupAction - for selected files, name of method on the above bean to refresh tags popup
+    -->            
+    </ui:remove>
+    
+    <ui:param name="isFilePg" value="#{of:isInstance('edu.harvard.iq.dataverse.FilePage', bean)}"/>
+
+
+    <!-- Edit Options -->
+    <li>
+        <p:commandLink onclick="if (!(#{fileMetadata!=null} || testFilesSelected()))
+                    return false;"                        
+                       oncomplete="if(#{fileMetadata!=null}) window.location.assign('/editdatafiles.xhtml?selectedFileIds=#{fileMetadata.dataFile.id}&#38;datasetId=#{fileMetadata.datasetVersion.dataset.id}#{isFilePg?'&#38;referrer=FILE':''}&#38;version=#{fileMetadata.datasetVersion.version}')"
+                       action="#{bean.editFileMetadata()}">
+            <h:outputText value="#{bundle['file.metadata']}"/>
+        </p:commandLink>
+    </li>
+
+    <ui:fragment rendered="#{!bean.hasPublicStore}">
+        <ui:fragment rendered="#{fileMetadata == null or !fileMetadata.restricted}">
+            <li>
+                <p:commandLink  onclick="if (!(#{fileMetadata!=null} || testFilesSelected()))
+                                            return false;" 
+                                update="@([id$=accessPopup])"            
+                                oncomplete="PF('accessPopup').show();">
+                    <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
+                    <f:setPropertyActionListener target="#{bean.termsOfAccess}" value="#{datasetVersion.termsOfUseAndAccess.termsOfAccess}" />
+                    <f:setPropertyActionListener target="#{bean.fileAccessRequest}" value="#{datasetVersion.termsOfUseAndAccess.fileAccessRequest}" />                     
+                    <h:outputText value="#{bundle['file.restrict']}"/>                                                                
+                </p:commandLink>
+            </li>
+        </ui:fragment>
+        <ui:fragment rendered="#{fileMetadata == null or fileMetadata.restricted}">
+            <li>
+                <p:commandLink  
+                    onclick="if (!(#{fileMetadata!=null} || testFilesSelected()))
+                                return false;" 
+                    action="#{bean[unrestrictFileAction](false)}">
+                    <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
+                    <h:outputText value="#{bundle['file.unrestrict']}"/>
+                </p:commandLink>
+            </li>         
+        </ui:fragment>   
+    </ui:fragment>
+
+    <!-- Replace is only available for single file actions-->
+    <ui:fragment rendered="#{fileMetadata!=null}">                                   
+        <li>
+            <h:outputLink value="/editdatafiles.xhtml?mode=REPLACE#{isFilePg?'&#38;referrer=FILE':''}&#38;datasetId=#{fileMetadata.datasetVersion.dataset.id}&#38;fid=#{fileMetadata.dataFile.id}&#38;version=#{fileMetadata.datasetVersion.version}">
+                <h:outputText value="#{bundle['file.replace']}"/>
+            </h:outputLink>
+        </li>
+    </ui:fragment>
+    
+    <!-- Single file uningest/reingest -->
+    <ui:fragment rendered="#{isFilePg and (dataverseSession.user.superuser and FilePage.fileMetadata.dataFile.isTabularData()) or (FilePage.fileMetadata.dataFile.isIngestProblem() and FilePage.canPublishDataset())}">
+        <li>
+            <p:commandLink update="@form,:messagePanel" action="#{FilePage.uningestFile()}">
+                <h:outputText value="#{bundle['file.uningest']}"/>
+            </p:commandLink>
+        </li>
+    </ui:fragment>
+    <ui:fragment rendered="#{isFilePg and dataverseSession.user.superuser and FilePage.isIngestable()}">
+        <li>
+            <p:commandLink update="@form,:messagePanel" actionListener="#{FilePage.ingestFile()}">
+                <h:outputText value="#{bundle['file.ingest']}"/>
+            </p:commandLink>
+        </li>
+    </ui:fragment>
+
+    <!-- TO-DO #3488 - ADD FILE TAGS FOR FILE PG AND SINGLE FILE-->    
+    <ui:fragment rendered="#{fileMetadata==null}">    
+        <li>
+            <p:commandLink      update="@([id$=fileTagsPopup])" 
+                                onclick="if (!testTermsOfAccess() || !(#{fileMetadata!=null} || testFilesSelected()))
+                                            return false;"                                 
+                                action="#{bean[refreshTagsPopoupAction]()}">            
+                <h:outputText value="#{bundle['file.tags']}"/>
+            </p:commandLink>    
+        </li>  
+    </ui:fragment> 
+    
+    <ui:fragment rendered="#{settingsWrapper.embargoAllowed}">
+        <li>
+            <p:commandLink      update="@([id$=fileEmbargoPopup])" 
+                                onclick="if (!(#{fileMetadata!=null} || testFilesSelected()))
+                                            return false;" 
+                                oncomplete="PF('fileEmbargoPopup').show();">
+                                <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
+                <h:outputText value="#{bundle['file.embargo']}"/>
+            </p:commandLink> 
+        </li>
+    </ui:fragment>
+
+    <ui:fragment rendered="#{settingsWrapper.retentionAllowed}">
+        <li>
+            <p:commandLink      update="@([id$=fileRetentionPopup])"
+                                onclick="if (!(#{fileMetadata!=null} || testFilesSelected()))
+                                            return false;"
+                                oncomplete="PF('fileRetentionPopup').show();">
+                <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
+                <h:outputText value="#{bundle['file.retention']}"/>
+            </p:commandLink>
+        </li>
+    </ui:fragment>
+
+    <!-- TO-DO #7342 - ADD PROVENANCE FOR SINGLE FILE-->    
+    <ui:fragment rendered="#{isFilePg and systemConfig.provCollectionEnabled}">
+        <li>
+            <p:commandLink
+                update="@([id$=editProvenancePopup])"
+                oncomplete="PF('editProvenancePopup').show();">
+                <f:actionListener binding="#{provPopupFragmentBean.updatePopupState(fileMetadata, true)}" /> <!--clearProvenanceUpdates() -->
+                #{bundle['file.provenance']} 
+            </p:commandLink>
+        </li> 
+    </ui:fragment>     
+
+    <li>
+        <p:commandLink title="#{bundle['file.delete']}" update="@([id$=deleteFileConfirm])" 
+                       onclick="if (!(#{fileMetadata!=null} || testFilesSelected()))
+                                   return false;" 
+                       oncomplete="PF('deleteFileConfirmation').show();">
+            <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />                
+            <h:outputText value= "#{bundle['file.delete']}"/>
+        </p:commandLink>
+    </li>
+
+
+    <!---Modular configure-->
+    <ui:fragment rendered="#{configureTools.size() > 0}">		
+        <ui:include src="file-configure-dropdown-fragment.xhtml">
+            <ui:param name="configureTools" value="#{configureTools}"/>
+            <ui:param name="fileId" value="#{fileMetadata.dataFile.id}"/>
+            <ui:param name="fileMetadata" value="#{fileMetadata}"/>				
+        </ui:include>		
+    </ui:fragment>
+  
+</ui:composition>
diff --git a/src/main/webapp/file-edit-popup-fragment.xhtml b/src/main/webapp/file-edit-popup-fragment.xhtml
new file mode 100644
index 00000000000..3b1141816c8
--- /dev/null
+++ b/src/main/webapp/file-edit-popup-fragment.xhtml
@@ -0,0 +1,300 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:o="http://omnifaces.org/ui"
+                xmlns:jsf="http://xmlns.jcp.org/jsf">
+    
+    <ui:remove>
+    <!--       
+    Parameters:
+    dataserVersion - the datasetversion object to associate with this view
+    fileMetadataForAction - used by DatasetPage popups to identify single file (also clears for selected files)
+    bean - the named value of the backing bean for the below method(s)
+    restrictFileAction - name of the method on the above bean to call for restrict (method must take a boolean)    
+    deleteFileAction - name of method on the above bean to delete files
+    -->            
+    </ui:remove>
+    
+    <p:dialog id="fileAlreadyDeletedPrevious" styleClass="smallPopUp"
+              header="#{bundle['file.alreadyDeleted.warning.header']}" widgetVar="fileAlreadyDeletedPrevious" modal="true">
+        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.alreadyDeleted.previous.warningMessage']}</p>
+        <div class="button-block">
+            <button class="btn btn-default" onclick="PF('fileAlreadyDeletedPrevious').hide();" type="button">
+                #{bundle.close}
+            </button>
+        </div>
+    </p:dialog>     
+
+    <p:dialog id="accessPopup" height="350px" width="700px" 
+              header="#{bean.hasValidTermsOfAccess ? bundle['dataset.access.accessHeader'] : bundle['dataset.access.accessHeader.invalid.state'] }" 
+              widgetVar="accessPopup" modal="true">
+        <p:focus context="accessPopup"/>
+        <p class="help-block">
+            <h:outputText styleClass="text-muted" value="#{bundle['dataset.access.description']}"/>
+            <h:outputText  style="font-weight:bold" value="#{bundle['dataset.access.description.disable']}"/>
+            <p></p>
+            <h:outputFormat styleClass="text-muted"  value="#{bundle['dataset.access.description.line.2']}" escape="false">
+                <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                <f:param value="#{systemConfig.guidesVersion}"/>
+            </h:outputFormat>
+        </p>
+        <p:fragment>
+            <p:autoUpdate/>
+            <o:inputHidden id="termsofAccessHidden" value="#{bean.termsOfAccess}" />
+            <o:inputHidden id="fileAccessRequestHidden" value="#{bean.fileAccessRequest}" />
+        </p:fragment>
+        <div class="form-horizontal">
+            <div class="form-group">
+                <label for="datasetForm:requestAccess2" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
+                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
+                </label>
+                <div class="col-sm-9">
+                    <p:selectBooleanCheckbox id="requestAccess2"  
+                                             itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}"
+                                             value="#{bean.fileAccessRequest}" widgetVar="inputfar">
+                    <p:ajax event="change" update="restrictFileButton" />
+                    </p:selectBooleanCheckbox>
+                </div>
+            </div>
+            <p:fragment id="popupWarning">
+                
+            <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{empty bean.termsOfAccess  and !bean.fileAccessRequest}">
+                           <span class="ui-message-error-detail">#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.warning.outofcompliance']}</span>          
+            </div>
+            </p:fragment>
+            <div class="form-group">
+                <label for="termsAccessInput" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
+                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
+                </label>
+                <div class="col-sm-9">
+                    <p:inputTextarea id="termsAccessInput" 
+                                     value="#{bean.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa">
+                     <p:ajax event="keyup" update="restrictFileButton"/>
+                      <f:passThroughAttribute name="aria-label" value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}"/>
+                    </p:inputTextarea> 
+                </div>
+            </div>
+        </div>
+
+        <div class="button-block">
+            <p:commandLink id="restrictFileButton"  styleClass="btn btn-default" value="#{bundle.saveChanges}"                             
+                             onclick="testTOA();"
+                             update="popupWarning" />
+            <button class="btn btn-link" onclick="PF('accessPopup').hide();PF('blockDatasetForm').hide();" type="button">
+                #{bundle.cancel}
+            </button> 
+
+        </div>
+    </p:dialog>  
+
+    <!-- Embargo Dialog-->
+    <p:dialog id="fileEmbargoPopup" styleClass="smallPopUp" resizable="false" header="#{bundle['file.editEmbargo']}" widgetVar="fileEmbargoPopup" modal="true" rendered="#{bean != EditDatafilesPage}">
+        <p:focus for="fileEmbargoDate"/>
+        <p class="help-block" jsf:rendered="#{bean.validEmbargoSelection}">#{bundle['file.editEmbargoDialog.tip']}</p>
+        <p class="text-warning embargo" jsf:rendered="#{bean.validEmbargoSelection and !bean.embargoForWholeSelection}"><span class="glyphicon glyphicon-warning-sign"/>#{bundle['file.editEmbargoDialog.some.tip']} #{bundle['file.editEmbargoDialog.partial.tip']}</p>
+        <p class="text-danger embargo" jsf:rendered="#{!bean.validEmbargoSelection}"><span class="glyphicon glyphicon-exclamation-sign"/>#{bundle['file.editEmbargoDialog.none.tip']}</p>
+
+        <h:panelGroup id="embargoInputs">
+            <div class="embargo">
+
+                <div class="form-horizontal"
+                    jsf:rendered="#{bean.validEmbargoSelection}">
+                    <div class="col-lg-3">
+                        <h:outputText class="embargolabel"
+                            value="#{bundle[ 'file.editEmbargo.add']}" />
+                    </div>
+                    <div class="col-lg-9">
+                        <div>
+                            <label class="help-block" for="datasetForm:fileEmbargoDate_input">
+                                #{bundle['file.editEmbargoDialog.newDate']} <span
+                                    class="glyphicon glyphicon-asterisk text-danger"
+                                    jsf:rendered="#{!bean.removeEmbargo}" />
+                            </label>
+                            <p:datePicker id="fileEmbargoDate"
+                                value="#{bean.selectionEmbargo.dateAvailable}"
+                                locale="#{dataverseSession.localeCode}"
+                                mindate="#{settingsWrapper.minEmbargoDate}" pattern="yyyy-MM-dd"
+                                maxdate="#{settingsWrapper.maxEmbargoDate}"
+                                disabled="#{bean.removeEmbargo}"
+                                validator="#{settingsWrapper.validateEmbargoDate}" >
+                                <p:ajax process="#{updateElements}"
+                                    update="#{updateElements}"
+                                    />
+                                </p:datePicker>
+                            <div>
+                                <h:message for="fileEmbargoDate"
+                                    styleClass="bg-danger text-danger" />
+                            </div>
+                        </div>
+                        <div class="p-field p-col-12 p-md-4">
+                            <p class="help-block">#{bundle['file.editEmbargoDialog.reason.tip']}</p>
+                            <p:inputText id="fileEmbargoAddReason" styleClass="form-control"
+                                disabled="#{bean.removeEmbargo}" type="text"
+                                value="#{bean.selectionEmbargo.reason}"
+                                placeholder="#{bundle['file.editEmbargoDialog.newReason']}"
+                                onkeypress="if (event.keyCode == 13) { return false;}" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="embargo">
+                <div jsf:rendered="#{bean.existingEmbargo}" class="embargocheckbox">
+                    <div class="col-lg-3">
+                        <h:outputText class="embargolabel"
+                            value="#{bundle[ 'file.editEmbargo.delete']}" />
+                    </div>
+                    <div class="col-lg-9">
+                        <p:selectBooleanCheckbox value="#{bean.removeEmbargo}" id="embargoCheckbox"
+                            itemLabel="#{bundle['file.editEmbargoDialog.remove']}"
+                            disabled="#{facesContext.validationFailed}">
+                            <p:ajax process="#{updateElements}"
+                                update="#{updateElements}"
+                                />
+                        </p:selectBooleanCheckbox>
+                    </div>
+                </div>
+            </div>
+        </h:panelGroup>
+        <div class="button-block">
+            <p:commandButton rendered="#{bean.validEmbargoSelection}" styleClass="btn btn-default" id="fileEmbargoPopupSaveButton" value="#{bundle.saveChanges}" 
+            oncomplete="if (args &amp;&amp; !args.validationFailed) PF('fileEmbargoPopup').hide();return false;" update="#{updateElements}" action="#{bean[saveEmbargoAction]}"/>
+            <p:commandButton styleClass="btn btn-link" id="fileEmbargoPopupCancelButton" value="#{bundle.cancel}" onclick="PF('fileEmbargoPopup').hide();
+                    PF('blockDatasetForm').hide();" action="#{bean.clearEmbargoPopup()}" update="#{updateElements}" immediate="true"/>
+        </div>
+    </p:dialog>
+
+    <!-- Retention Period Dialog-->
+    <p:dialog id="fileRetentionPopup" styleClass="smallPopUp" resizable="false" header="#{bundle['file.editRetention']}" widgetVar="fileRetentionPopup" modal="true" rendered="#{bean != EditDatafilesPage}">
+        <p:focus for="fileRetentionDate"/>
+        <p class="help-block" jsf:rendered="#{bean.validRetentionSelection}">#{bundle['file.editRetentionDialog.tip']}</p>
+        <p class="text-warning retention" jsf:rendered="#{bean.validRetentionSelection and !bean.retentionForWholeSelection}"><span class="glyphicon glyphicon-warning-sign"/>#{bundle['file.editRetentionDialog.some.tip']} #{bundle['file.editRetentionDialog.partial.tip']}</p>
+        <p class="text-danger retention" jsf:rendered="#{!bean.validRetentionSelection}"><span class="glyphicon glyphicon-exclamation-sign"/>#{bundle['file.editRetentionDialog.none.tip']}</p>
+
+        <h:panelGroup id="retentionInputs">
+            <div class="retention">
+
+                <div class="form-horizontal"
+                     jsf:rendered="#{bean.validRetentionSelection}">
+                    <div class="col-lg-3">
+                        <h:outputText class="retentionlabel"
+                                      value="#{bundle[ 'file.editRetention.add']}" />
+                    </div>
+                    <div class="col-lg-9">
+                        <div>
+                            <label class="help-block" for="datasetForm:fileRetentionDate_input">
+                                #{bundle['file.editRetentionDialog.newDate']} <span
+                                    class="glyphicon glyphicon-asterisk text-danger"
+                                    jsf:rendered="#{!bean.removeRetention}" />
+                            </label>
+                            <p:datePicker id="fileRetentionDate"
+                                          value="#{bean.selectionRetention.dateUnavailable}"
+                                          locale="#{dataverseSession.localeCode}"
+                                          mindate="#{settingsWrapper.minRetentionDate}" pattern="yyyy-MM-dd"
+                                          maxdate="#{settingsWrapper.maxRetentionDate}"
+                                          disabled="#{bean.removeRetention}"
+                                          validator="#{settingsWrapper.validateRetentionDate}" >
+                                <p:ajax process="#{updateRetentionElements}"
+                                        update="#{updateRetentionElements}"
+                                />
+                            </p:datePicker>
+                            <div>
+                                <h:message for="fileRetentionDate"
+                                           styleClass="bg-danger text-danger" />
+                            </div>
+                        </div>
+                        <div class="p-field p-col-12 p-md-4">
+                            <p class="help-block">#{bundle['file.editRetentionDialog.reason.tip']}</p>
+                            <p:inputText id="fileRetentionAddReason" styleClass="form-control"
+                                         disabled="#{bean.removeRetention}" type="text"
+                                         value="#{bean.selectionRetention.reason}"
+                                         placeholder="#{bundle['file.editRetentionDialog.newReason']}"
+                                         onkeypress="if (event.keyCode == 13) { return false;}" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="retention">
+                <div jsf:rendered="#{bean.existingRetention}" class="retentioncheckbox">
+                    <div class="col-lg-3">
+                        <h:outputText class="retentionlabel"
+                                      value="#{bundle[ 'file.editRetention.delete']}" />
+                    </div>
+                    <div class="col-lg-9">
+                        <p:selectBooleanCheckbox value="#{bean.removeRetention}" id="retentionCheckbox"
+                                                 itemLabel="#{bundle['file.editRetentionDialog.remove']}"
+                                                 disabled="#{facesContext.validationFailed}">
+                            <p:ajax process="#{updateRetentionElements}"
+                                    update="#{updateRetentionElements}"
+                            />
+                        </p:selectBooleanCheckbox>
+                    </div>
+                </div>
+            </div>
+        </h:panelGroup>
+        <div class="button-block">
+            <p:commandButton rendered="#{bean.validRetentionSelection}" styleClass="btn btn-default" id="fileRetentionPopupSaveButton" value="#{bundle.saveChanges}"
+                             oncomplete="if (args &amp;&amp; !args.validationFailed) PF('fileRetentionPopup').hide();return false;" update="#{updateRetentionElements}" action="#{bean[saveRetentionAction]}"/>
+            <p:commandButton styleClass="btn btn-link" id="fileRetentionPopupCancelButton" value="#{bundle.cancel}" onclick="PF('fileRetentionPopup').hide();
+                    PF('blockDatasetForm').hide();" action="#{bean.clearRetentionPopup()}" update="#{updateRetentionElements}" immediate="true"/>
+        </div>
+    </p:dialog>
+
+    <p:dialog id="deleteFileConfirm" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteFileConfirmation" modal="true">
+        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.immediate']}</p>
+        <ui:fragment rendered="#{datasetVersion.dataset.released}">
+            <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.failed.tip']}</p>
+        </ui:fragment>
+        <div class="button-block">
+            <p:commandButton styleClass="btn btn-default" value="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').hide()" 
+                             action="#{bean[deleteFileAction]}"/>
+            <button class="btn btn-link" onclick="PF('deleteFileConfirmation').hide()" type="button">
+                #{bundle.cancel}
+            </button>
+        </div>
+    </p:dialog>
+
+    <p:dialog id="configureToolPopup" styleClass="smallPopUp" header="#{configureFragmentBean.configurePopupToolHandler.externalTool.getDisplayNameLang()}" widgetVar="configureToolPopup" modal="true">
+        <ui:include src="file-configure-popup-fragment.xhtml" />
+    </p:dialog>
+    
+  
+
+    <!-- Simple Popup For Select Files-->
+    <p:dialog id="selectFiles" styleClass="smallPopUp"
+              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFiles" modal="true">
+        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFiles']}</p>
+        <div class="button-block">
+            <button class="btn btn-default" onclick="PF('selectFiles').hide();" type="button">
+                #{bundle.close}
+            </button>
+        </div>
+    </p:dialog> 
+    <p:remoteCommand name="restrictFileCommand" action="#{bean[restrictFileAction](true)}" update=":messagePanel"/>
+        <script>
+        //<![CDATA[
+            function testTOA() {
+                var termsofAccessHidden, fileAccessRequestHidden;
+                    try{
+                        termsofAccessHidden  = document.getElementById("datasetForm:termsofAccessHidden").value;
+                        fileAccessRequestHidden  =   document.getElementById("datasetForm:fileAccessRequestHidden").value;                                                    
+                    } catch (error){
+                        termsofAccessHidden  = document.getElementById("fileForm:termsofAccessHidden").value;
+                        fileAccessRequestHidden  =   document.getElementById("fileForm:fileAccessRequestHidden").value;
+                    }
+                        if (fileAccessRequestHidden === 'false' && termsofAccessHidden === '') {
+                           //Not compliant show error keep popup open...
+                        } else {
+                            PF('accessPopup').hide();
+                            restrictFileCommand();
+                        }
+                    }                    
+        //]]>
+    </script>
+       
+</ui:composition>
diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
index 830f7ceaa0c..18d7d0e5230 100644
--- a/src/main/webapp/file-info-fragment.xhtml
+++ b/src/main/webapp/file-info-fragment.xhtml
@@ -10,51 +10,127 @@
     xmlns:cc="http://java.sun.com/jsf/composite"
     xmlns:o="http://omnifaces.org/ui"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-    <p:outputPanel>
-        <div id="fileInfoInclude-filesTable" class="col-sm-12 row">
-            <div class="pull-left col-file-thumb">
-                <div class="thumbnail-block text-center">  
-                    <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(fileMetadata.dataFile)} file-thumbnail-icon text-muted" jsf:rendered="#{!EditDatafilesPage.isThumbnailAvailable(fileMetadata)}"/>
-                    <span class="file-thumbnail-preview-img" jsf:rendered="#{EditDatafilesPage.isThumbnailAvailable(fileMetadata)}"
-                          data-container="body" data-toggle="popover" data-placement="top" data-trigger="hover" data-html="true" data-content="&lt;img src=&#34;/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=400&#34; alt=&#34;#{bundle['file.preview']} #{fileMetadata.label}&#34; /&gt;">
-                        <p:graphicImage value="/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=true" alt="#{fileMetadata.label}"/>
-                    </span>
-                    <!-- Restricted File Icon -->
-                    <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">                  
-                        <span class="glyphicon glyphicon-lock text-danger"/>
-                    </div>
-                    <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata) }">
-                        <span class="icon-unlock text-success"/>
-                    </div>
+    
+    <ui:remove>
+    <!--
+    This fragment is included on... 
+    
+    - dataset pg, filesFragment, empty editMode render logic
+    - dataset pg AND file pg, (s3) package-download-popup-fragment
+    - editdatafiles (replace files) pg
+    
+    Parameters:
+    fileMetadata - object from containing page backing bean
+    editDatafilesPage - true if included on editdatafiles pg
+    -->            
+    </ui:remove>
+    
+    <ui:param name="dataFile" value="#{fileMetadata.dataFile}" />
+    <ui:param name="hasFileId" value="#{!(empty fileMetadata.id)}" />
+    <ui:param name="hasDescription" value="#{!(empty fileMetadata.description)}" />
+    <ui:param name="hasDirectoryLabel" value="#{!empty fileMetadata.directoryLabel}" />
+    <ui:param name="isTabularData" value="#{dataFile.tabularData}" />
+    <ui:param name="isReleased" value="#{dataFile.released}" />
+    <ui:param name="hasEmbargo" value="#{!(empty dataFile.embargo)}" />
+    <ui:param name="hasRetention" value="#{!(empty dataFile.retention)}" />
+    <ui:param name="canDownloadFile" value="#{fileDownloadHelper.canDownloadFile(fileMetadata)}" />
+    <ui:param name="hasThumbnail" value="#{thumbnailServiceWrapper.isThumbnailAvailable(dataFile)}" />
+    <ui:param name="showThumbnail" value="#{canDownloadFile and hasThumbnail}" />
+    <ui:param name="hasCategories" value="#{!(empty fileMetadata.categories)}" />
+    <ui:param name="hasTags" value="#{!(empty dataFile.tags)}" />
+    <ui:param name="hasGlobalId" value="#{!empty dataFile.globalId}" />
+    <ui:param name="fileIdParam" value="#{hasGlobalId ? 'persistentId=' : 'fileId='}" />
+    <ui:param name="fileIdValue" value="#{hasGlobalId ? dataFile.globalId.asString() : dataFile.id}" />
+    <ui:param name="checksumValue" value="#{dataFile.checksumValue}" />
+    <ui:param name="unfValue" value="#{dataFile.unf}" />
+    
+    <p:outputPanel id="fileInfoInclude-filesTable" styleClass="media" rendered="#{fileMetadata != null}">
+        <div class="media-left col-file-thumb" style="padding-top:4px;">
+            <div class="media-object thumbnail-block text-center">
+                <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(dataFile)} file-thumbnail-icon text-muted" jsf:rendered="#{!canDownloadFile or !hasThumbnail}"/>
+                <span class="file-thumbnail-preview-img" jsf:rendered="#{showThumbnail}"
+                      data-toggle="popover" data-placement="auto top" data-trigger="hover" data-html="true" data-content="&lt;img src=&#34;/api/access/datafile/#{dataFile.id}?imageThumb=400&#34; alt=&#34;#{bundle['file.preview']} #{fileMetadata.label}&#34; /&gt;"
+                      data-template='&lt;div class="popover thumb-preview" role="tooltip"&gt;&lt;div class="arrow"&gt;&lt;/div&gt;&lt;h3 class="popover-title"&gt;&lt;/h3&gt;&lt;div class="popover-content"&gt;&lt;/div&gt;&lt;/div&gt;'>
+                    <p:graphicImage value="/api/access/datafile/#{dataFile.id}?imageThumb=true" alt="#{fileMetadata.label}"/>
+                </span>
+                <!-- Restricted File Icon -->
+                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.fileAccess']}#{bundle['restricted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and !canDownloadFile}">
+                    <span class="glyphicon glyphicon-lock text-danger"/>
+                </div>
+                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.fileAccess']}#{bundle['restrictedaccess']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and canDownloadFile}">
+                    <span class="icon-unlock text-success"/>
                 </div>
             </div>
-            <div class="col-sm-10 col-file-metadata">
-                <div class="fileNameOriginal">
+        </div>
+        <div class="media-body col-file-metadata">
+            <div class="fileNameOriginal">
+                <ui:fragment rendered="#{!editDatafilesPage}">
+                    <!-- conditional render in file page links, if file has global id, use that; if not, we use database id -->
+                    <a href="#{widgetWrapper.wrapURL('/file.xhtml?'.concat(fileIdParam).concat(fileIdValue).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber))}">
+                        #{fileMetadata.label}
+                    </a>
+                </ui:fragment>
+                <ui:fragment rendered="#{editDatafilesPage}">
                     <span>#{fileMetadata.label}</span>
+                </ui:fragment>
+            </div>
+            <!-- HIERARCHY + TYPE + SIZE + DATE + CHECKSUM -->
+            <div class="text-muted small">
+                <!-- id:#{dataFile.id} -->
+                <h:outputText id="fileHierarchy" styleClass="show" value="#{fileMetadata.directoryLabel}/" rendered="#{hasDirectoryLabel}"/>
+                <h:outputText id="fileType" value="#{dataFile.tabularData ? bundle['file.type.tabularData'] : dataFile.friendlyType}"/>
+                <h:outputText id="fileSize" value=" - #{dataFile.friendlySize}"/>
+                <div class="dateCreatePublish-block">
+                    <h:outputText id="fileCreatePublishDate" value="#{isReleased ? ((dataFile.embargo!=null) ? bundle['metadatareleased'] : bundle['published']) : bundle['deposited']} #{fileMetadata.getFileDateToDisplay()}" rendered="#{hasFileId}"/>
+                    <h:outputText id="embargoDate" class="embargoright" value="#{isReleased ? ((dataFileServiceBean.isActivelyEmbargoed(fileMetadata)) ? bundle['embargoed.until'] : bundle['embargoed.wasthrough']):bundle['embargoed.willbeuntil']} #{dataFile.embargo.formattedDateAvailable}" rendered="#{hasEmbargo}"/>
+                    <h:outputText id="retentionDate" class="retentionright" value="#{isReleased ? ((dataFileServiceBean.isRetentionExpired(fileMetadata)) ? bundle['retention.after'] : bundle['retention.isfrom']):bundle['retention.willbeafter']} #{dataFile.retention.formattedDateUnavailable}, #{bundle['retention.enddateinfo']}" rendered="#{hasRetention}"/>
                 </div>
-                <div class="text-muted small">
-                    <span id="static:fileTypeOutputRegular">#{fileMetadata.dataFile.friendlyType}</span>
-                    <span id="static:fileSize"> - #{fileMetadata.dataFile.friendlySize}</span>
-                    <span id="static:fileCreatePublishDate"> - #{fileMetadata.fileDateToDisplay}</span>
-                    <div class="checksum-block"><span id="static:file-checksum">#{fileMetadata.dataFile.checksumType}: #{fileMetadata.dataFile.checksumValue}</span></div>
+                <div class="downloads-block" jsf:rendered="#{!editDatafilesPage and !(settingsWrapper.rsyncOnly) and isReleased}">
+                    <h:outputFormat styleClass="visible-xs-block visible-sm-block visible-md-inline visible-lg-inline" id="fileDownloadCount" value="{0} #{bundle['metrics.downloads']}">
+                        <f:param value="#{guestbookResponseServiceBean.getDownloadCountByDataFileId(dataFile.id)}"/>
+                    </h:outputFormat>
                 </div>
-                <div class="fileDescription small" jsf:rendered="#{!(empty fileMetadata.description)}">
-                    <h:outputText id="fileDescNonEmpty" value="#{fileMetadata.description}"/>
+                <!-- CHECKSUM -->
+                <div class="checksum-block" jsf:rendered="#{!dataFile.tabularData and !(empty dataFile.checksumValue)}">
+                    <span class="#{!editDatafilesPage ? 'checksum-truncate checksum-tooltip' : ''}" style="margin-right:3px;"
+                                  data-toggle="tooltip" data-placement="top" data-html="true"
+                                  data-clipboard-action="copy"
+                                  data-clipboard-text="#{checksumValue}"
+                                  title="#{bundle['file.metaData.checksum.copy']}&lt;br/&gt;#{checksumValue}">#{dataFile.checksumType}: #{checksumValue}</span>
+                    <span class="glyphicon glyphicon-copy btn-copy checksum-tooltip" 
+                                  data-toggle="tooltip" data-placement="top" data-html="true"
+                                  data-clipboard-action="copy"
+                                  data-clipboard-text="#{checksumValue}" 
+                                  title="#{bundle['file.metaData.checksum.copy']}&lt;br/&gt;#{checksumValue}"></span>
                 </div>
-
-                <div class="file-tags-block" jsf:rendered="#{!(empty fileMetadata.categories) or !(empty fileMetadata.dataFile.tags)}">
-                    <ui:fragment rendered="#{!(empty fileMetadata.categories)}">
-                        <ui:repeat value="#{fileMetadata.categories}" var="cat">
-                            <h:outputText value="#{cat.name}" styleClass="label label-default"/>
-                        </ui:repeat> 
-                    </ui:fragment>
-                    <ui:fragment>
-                        <ui:repeat value="#{fileMetadata.dataFile.tags}" var="tag">
-                            <h:outputText value="#{tag.typeLabel}" styleClass="label label-info"/>
-                        </ui:repeat>
-                    </ui:fragment>
+                <!-- TABULAR VARIABLES, OBSERVATIONS + UNF -->
+                <div class="unf-block" jsf:rendered="#{isTabularData}">
+                    <h:outputText id="fileNumVars" value="#{dataFile.dataTable.varQuantity} #{bundle['file.metaData.dataFile.dataTab.variables']}, "/>
+                    <h:outputText id="fileNumObs" value="#{dataFile.dataTable.caseQuantity} #{bundle['file.metaData.dataFile.dataTab.observations']} "/>
+                    <span jsf:id="fileUNF" class="#{!editDatafilesPage ? 'checksum-truncate checksum-tooltip' : ''}" style="margin-right:3px;"
+                                  jsf:rendered="#{!(empty unfValue)}"
+                                  data-toggle="tooltip" data-placement="top" data-html="true"
+                                  data-clipboard-action="copy"
+                                  data-clipboard-text="#{unfValue}"
+                                  title="#{bundle['file.metaData.checksum.copy']}&lt;br/&gt;#{unfValue}">#{unfValue}</span>
+                    <span class="glyphicon glyphicon-copy btn-copy checksum-tooltip" jsf:rendered="#{!(empty unfValue)}" 
+                                  data-toggle="tooltip" data-placement="top" data-html="true"
+                                  data-clipboard-action="copy"
+                                  data-clipboard-text="#{unfValue}" 
+                                  title="#{bundle['file.metaData.checksum.copy']}&lt;br/&gt;#{unfValue}"></span>
                 </div>
             </div>
+            <div class="fileDescription small" jsf:rendered="#{hasDescription}">
+                <h:outputText id="fileDescNonEmpty" value="#{fileMetadata.description}"/>
+            </div>
+            <div class="file-tags-block" jsf:rendered="#{hasCategories or hasTags}">
+                <ui:repeat value="#{fileMetadata.categories}" var="cat">
+                    <h:outputText value="#{cat.name}" styleClass="label label-default"/>
+                </ui:repeat>
+                <ui:repeat value="#{dataFile.tags}" var="tag">
+                    <h:outputText value="#{tag.typeLabel}" styleClass="label label-info"/>
+                </ui:repeat>
+            </div>
         </div>
     </p:outputPanel>
-</ui:composition>
\ No newline at end of file
+</ui:composition>
diff --git a/src/main/webapp/file-request-access-popup-fragment.xhtml b/src/main/webapp/file-request-access-popup-fragment.xhtml
deleted file mode 100644
index f9e3154978d..00000000000
--- a/src/main/webapp/file-request-access-popup-fragment.xhtml
+++ /dev/null
@@ -1,52 +0,0 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:h="http://java.sun.com/jsf/html"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
-                xmlns:p="http://primefaces.org/ui"
-                xmlns:o="http://omnifaces.org/ui"
-                xmlns:jsf="http://xmlns.jcp.org/jsf"
-                xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
-
-        <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
-        <p class="help-block">
-            #{bundle['file.requestAccessTermsDialog.tip']}
-        </p>
-        
-        <div class="form-horizontal">
-            <div class="form-group" jsf:rendered="#{workingVersion.termsOfUseAndAccess.license != 'CC0' and !empty workingVersion.termsOfUseAndAccess.termsOfUse}">
-                <label class="col-sm-3 control-label" for="guestbook_tou">
-                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
-                </label>
-                <div class="col-sm-6">
-                    <div class="panel panel-default">
-                        <div class="panel-body read-terms">
-                            <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfUse)}" escape="false" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group" jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfAccess}">
-                <label class="col-sm-3 control-label" for="guestbook_toa">
-                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                </label>
-                <div class="col-sm-6">
-                    <div class="panel panel-default">
-                        <div class="panel-body read-terms">
-                            <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfAccess)}" escape="false" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}" 
-                           action="#{fileDownloadHelper.requestAccessIndirect()}"    
-                           update="@([id$=requestAccessPopupButton])" oncomplete="PF('requestAccessPopup').hide();">
-            </p:commandButton>
-            <button class="btn btn-link" onclick="PF('requestAccessPopup').hide();PF('blockDatasetForm').hide();" type="button">
-                #{bundle.cancel}
-            </button>
-        </div>
-</ui:composition>
diff --git a/src/main/webapp/file-versions.xhtml b/src/main/webapp/file-versions.xhtml
index be67ee21623..89f7d61333b 100644
--- a/src/main/webapp/file-versions.xhtml
+++ b/src/main/webapp/file-versions.xhtml
@@ -8,17 +8,24 @@
     xmlns:o="http://omnifaces.org/ui"
     xmlns:jsf="http://xmlns.jcp.org/jsf">
 
-<ui:fragment rendered="#{widgetWrapper.widgetView}">
+<ui:param name="isWidgetView" value="#{widgetWrapper.widgetView}" />
+<ui:param name="currentFileMetadata" value="#{FilePage.fileMetadata}" />
+<ui:param name="currentDatasetVersion" value="#{currentFileMetadata.datasetVersion}" />
+<ui:param name="currentDataset" value="#{currentDatasetVersion.dataset}" />
+<ui:param name="rootDataverseName" value="#{dataverseServiceBean.findRootDataverse().displayName}" />
+<ui:param name="compareVersionsCount" value="#{FilePage.compareVersionsCount}" />
+
+<ui:fragment rendered="#{isWidgetView}">
     <p class="help-block">
         <h:outputFormat value="#{bundle['file.dataFilesTab.versions.widget.viewMoreInfo']}" escape="false">
-            <f:param value="#{FilePage.fileMetadata.datasetVersion.dataset.globalIdString}"/>
-            <f:param value="#{FilePage.fileMetadata.datasetVersion.dataset.displayName}"/>
-            <f:param value="#{dataverseServiceBean.findRootDataverse().displayName}"/>
+            <f:param value="#{currentDataset.globalId.asString()}"/>
+            <f:param value="#{currentDataset.displayName}"/>
+            <f:param value="#{rootDataverseName}"/>
         </h:outputFormat>
     </p>
 </ui:fragment>
 
-<ui:fragment rendered="#{!widgetWrapper.widgetView}">
+<ui:fragment rendered="#{!isWidgetView}">
     <!-- VERSIONS -->
     <script>
         //<![CDATA[
@@ -35,7 +42,7 @@
         -->
         <div class="text-right margin-bottom">
             <p:commandLink styleClass="btn btn-default" onclick="testCheckBoxes();"
-                           rendered="#{FilePage.compareVersionsCount > 2}">
+                           rendered="#{compareVersionsCount > 2}">
                 <span class="glyphicon glyphicon-transfer"/> #{bundle['file.dataFilesTab.versions.viewDiffBtn']}
             </p:commandLink>
             <p:commandButton value="#{bundle['file.dataFilesTab.button.direct']}" id="compareVersions"
@@ -55,7 +62,7 @@
         </ui:remove>
         <!-- start: version number column -->
         <p:column headerText="#{bundle['file.dataFilesTab.versions.headers.dataset']}" class="col-sm-1 text-center">
-            <ui:fragment rendered="#{versionTab.datasetVersion != FilePage.fileMetadata.datasetVersion }">
+            <ui:fragment rendered="#{versionTab.datasetVersion != currentDatasetVersion }">
                 <ui:fragment rendered="#{versionTab.datasetVersion.released or ((versionTab.datasetVersion.deaccessioned or versionTab.datasetVersion.draft)
                                      and permissionServiceBean.on(versionTab.datasetVersion.dataset).has('ViewUnpublishedDataset'))}">
                     <h:outputLink rendered="#{!(versionTab.datasetVersion.released or versionTab.datasetVersion.deaccessioned) and versionTab.dataFile != null }"
@@ -75,7 +82,7 @@
                                      and !permissionServiceBean.on(versionTab.datasetVersion.dataset).has('ViewUnpublishedDataset')}"
                               value="#{versionTab.datasetVersion.versionNumber}.#{versionTab.datasetVersion.minorVersionNumber}" />
             </ui:fragment>
-            <ui:fragment rendered="#{versionTab.datasetVersion == FilePage.fileMetadata.datasetVersion }">
+            <ui:fragment rendered="#{versionTab.datasetVersion == currentDatasetVersion }">
                 <h:outputText rendered="#{!versionTab.datasetVersion.draft}" styleClass="highlightBold"
                               value="#{versionTab.datasetVersion.versionNumber}.#{versionTab.datasetVersion.minorVersionNumber}" /> 
                 <h:outputText rendered="#{versionTab.datasetVersion.draft}" styleClass="highlightBold"
@@ -126,16 +133,17 @@
                 </ui:remove>
             </ui:fragment>
             <h:outputText rendered="#{versionTab.datasetVersion.deaccessioned}"
-                value="#{bundle['file.dataFilesTab.versions.description.deaccessionedReason']} #{versionTab.datasetVersion.versionNote}" escape="false"/>
+                value="#{bundle['file.dataFilesTab.versions.description.deaccessionedReason']} #{versionTab.datasetVersion.deaccessionNote}" escape="false"/>
         </p:column>
         <!-- contributor column -->
         <p:column headerText="#{bundle['file.dataFilesTab.versions.headers.contributors']}" class="col-sm-3">
-            <h:outputText value="#{versionTab.contributorNames}" />
+            <h:outputText value="#{versionTab.contributorNames}" rendered="#{!anonymized}" />
+            <h:outputText value="#{bundle['file.dataFilesTab.versions.headers.contributors.withheld']}" rendered="#{anonymized}" />
         </p:column>
         <!-- end: contributor column -->
         <!-- date column -->
         <p:column headerText="#{bundle['file.dataFilesTab.versions.headers.published']}" class="col-sm-2">
-            <h:outputText id="versionDate" value="#{versionTab.datasetVersion.versionDate}" />
+            <h:outputText id="versionDate" value="#{versionTab.datasetVersion.publicationDateAsString}" />
         </p:column>
         <!-- end: date column -->
     </p:dataTable>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 219c4e8f5ac..8a5c2709e5d 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -17,599 +17,677 @@
         <ui:composition template="/dataverse_template.xhtml">
             <ui:param name="pageTitle" value="#{FilePage.fileMetadata.dataFile.displayName} - #{FilePage.file.owner.owner.displayName}"/>
             <ui:param name="dataverse" value="#{FilePage.file.owner.owner}"/>
+            <ui:param name="showDataverseHeader" value="#{!FilePage.isAnonymizedAccess()}"/>
             <ui:param name="showMessagePanel" value="#{true}"/>
+            <!-- NOTE removed fileAccessRequest logic in order to always display the file access btn -->
+            <ui:param name="showAccessFileButtonGroup" value="#{!FilePage.fileMetadata.datasetVersion.deaccessioned
+                                                                or (FilePage.fileMetadata.datasetVersion.deaccessioned
+                                                                and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset))}"/>
             <ui:define name="meta_header">
             <meta name="description" content="#{FilePage.fileMetadata.description}"/>
             </ui:define>
-            <ui:remove><!-- We might want dc_meta_header/og_header/jsonld_header at the file level some day.--></ui:remove>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
-                    <f:viewParam name="fileId" value="#{FilePage.fileId}"/>
+                    <o:viewParam name="fileId" value="#{FilePage.fileId}"/>
                     <f:viewParam name="version" value="#{FilePage.version}"/>
+                    <o:viewParam name="toolType" value="#{FilePage.toolType}"/>
                     <f:viewParam name="persistentId" value="#{FilePage.persistentId}"/>
+                    <f:viewParam name="datasetVersionId" value="#{FilePage.datasetVersionId}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
-                    <f:viewAction action="#{FilePage.init}" />
+                    <f:viewAction action="#{FilePage.init}"/>
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbsForFileMetadata(FilePage.fileMetadata)}"/>
                 </f:metadata>
+            </ui:define>
+            <ui:define name="body">
                 <h:form id="fileForm">
-                    <div id="topDatasetBlock" class="row">
-                        <div id="actionButtonBlock" class="col-xs-12">
-                            <div class="button-block pull-right">
-                                <!-- Email/Share Button Group -->
-                                <div class="btn-group" id="datasetButtonBar" role="group" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                    <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
-                                                   update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{FilePage.fileMetadata.dataFile}"/>
-                                        <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                    </p:commandLink>
-                                    <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}"
-                                                   title="#{bundle['dataset.share.datasetShare']}"
-                                                   oncomplete="PF('shareDialog').show();sharrre();">
-                                        <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                    </p:commandLink>
-                                </div>
-                                <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true"  rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                    <p class="help-block">#{bundle['dataset.share.datasetShare.tip']}</p>
-
-                                    <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataset.xhtml?persistentId=#{FilePage.fileMetadata.datasetVersion.dataset.globalIdString}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
-
-                                    <div class="button-block">
-                                        <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
-                                            #{bundle.close}
-                                        </button>
-                                    </div>
-                                </p:dialog>
-                                <!-- END: Email/Share Button Group -->
-                                
-                                <div class="button-container btn-group" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                    <!-- Map Data/Set Up Button Block -->
-                                    <ui:fragment rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset() 
-                                                             and (FilePage.getConfigureTools().size() > 0
-                                                             or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">		
-                                        <ui:include src="file-configure-dropdown-fragment.xhtml">
-                                            <ui:param name="configureTools" value="#{FilePage.getConfigureTools()}"/>
-                                            <ui:param name="fileId" value="#{FilePage.fileMetadata.dataFile.id}"/>
-                                            <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>		
-                                            <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>		
-                                        </ui:include>		
-                                    </ui:fragment>
-                                    <!-- END: Map Data/Set Up Button Block -->
-                                    
-                                    <!-- Edit Button Group -->
-                                    <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
-                                                             and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset) 
-                                                             and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
-                                        <p:commandLink styleClass="btn btn-default btn-access" onclick="PF('fileAlreadyReplacedPrevious').show()">
-                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']}
-                                        </p:commandLink>
-                                    </div>
-                                    <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
-                                                             and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
-                                                             and !FilePage.lockedFromEdits
-                                                             and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
-                                        <button type="button" id="editFile" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
-                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu pull-right text-left" role="menu">
-                                            <ui:fragment rendered="#{systemConfig.provCollectionEnabled}">
-                                            <!--  Should be FilePage.isLockedFromEdits() ? -->
-                                                <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
-                                                    <p:commandLink id="fileProvenanceButton"
-                                                               update="editProvenancePopup"
-                                                               oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
-                                                               <f:actionListener binding="#{provPopupFragmentBean.updatePopupState(fileMetadata, true)}" /> <!--clearProvenanceUpdates() -->
-                                                                #{bundle['file.provenance']} 
-                                                    </p:commandLink>
-                                                </li> 
-                                            </ui:fragment>
-                                            <li>
-                                                <h:outputLink value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE&#38;version=#{FilePage.version}">
-                                                    <h:outputText id="editFile-Multi-Link" value="#{bundle['file.dataFilesTab.metadata.header']}"/>
-                                                </h:outputLink>
-                                            </li>
-                                            <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
-                                                <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and !FilePage.fileMetadata.restricted}">
-                                                    <li>
-                                                        <p:commandLink onclick="PF('accessPopup').show()">
-                                                            <h:outputText value="#{bundle['file.restrict']}"/>
-                                                        </p:commandLink>
-                                                    </li>
-                                                </ui:fragment>
-                                                <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and FilePage.fileMetadata.restricted}">
-                                                    <li>
-                                                        <p:commandLink update="@form" actionListener="#{FilePage.restrictFile(false)}">
-                                                            <h:outputText value="#{bundle['file.unrestrict']}"/>
-                                                        </p:commandLink>
-                                                    </li>
-                                                </ui:fragment>     
-                                            </ui:fragment>
-                                            <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == false and !FilePage.fileMetadata.dataFile.filePackage}">                                        
-                                            <li><!-- start: replace file link -->
-                                                <h:outputLink value="/editdatafiles.xhtml?mode=SINGLE_REPLACE&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;fid=#{FilePage.fileMetadata.dataFile.id}&#38;version=#{FilePage.version}">
-                                                     <h:outputText value="#{bundle['file.replace']}"/>
-                                                </h:outputLink>
-                                            <!-- end replace file link --></li>
-                                            </ui:fragment>
-                                            <ui:fragment rendered="#{ !FilePage.fileMetadata.dataFile.filePackage and ((FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == true) or (!FilePage.fileMetadata.dataFile.released and FilePage.fileMetadata.datasetVersion.dataset.released)) }">                                        
-                                            <li><!-- start: already replaced replace file link -->
-                                                <p:commandLink title="#{bundle['file.delete']}" onclick="PF('fileAlreadyReplacedDraft').show();">
-                                                    <h:outputText value="#{bundle['file.replace']}"/>
-                                                </p:commandLink>
-                                            <!-- end replace file link --></li>
-                                            </ui:fragment>  
-                                            <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.released or !FilePage.fileMetadata.dataFile.filePackage}"> 
-                                                <li>
-                                                    <p:commandLink title="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').show();">
-                                                        <h:outputText value= "#{bundle['file.delete']}"/>
-                                                    </p:commandLink>
-                                                </li>
-                                            </ui:fragment>
-                                            <ui:fragment rendered="#{!widgetWrapper.widgetView and (worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">
-                                            <li>
-                                            </li>
-                                            </ui:fragment>
-                                        </ul>
-                                    </div>
-                                    <!-- END: Edit Button Group -->
-                                </div>
-                                
-                                <!-- Explore/Download/Request Button Block -->
-                                <div class="button-container btn-group" jsf:rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
-                                                                                            (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset())) 
-                                                                                             and (!FilePage.fileMetadata.dataFile.filePackage or
-                                                                                                   FilePage.fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}">
-                                    <ui:include src="file-download-button-fragment.xhtml">
-                                        <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>
-                                        <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>
-                                        <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
-                                        <ui:param name="requestAccessPopupRequired" value="#{FilePage.requestAccessPopupRequired}"/>
-                                        <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
-                                        <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
-                                        <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
-                                        <ui:param name="isFilePg" value="true"/>
-                                        <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
-                                        <ui:param name="exploreTools" value="#{FilePage.exploreTools}"/>
-                                    </ui:include>
-                                </div>
-                                <!-- END: Explore/Download/Request Button Block -->
-                            </div>
-                        </div>
-                    </div>
-                    <!-- END topDatasetBlock -->
-                    <div id="fileImageTitle" class="row">
+                    <!-- Top Button/Citation Blocks -->
+                    <div id="fileVersionBlock" class="row">
                         <div class="col-xs-12">
                             <div class="row">
                                 <div id="file-title-block" class="col-xs-12 margin-bottom-half">
-                                    <!-- Restricted File Icon -->
-                                    <span class="glyphicon glyphicon-lock text-danger" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}" />
-                                    <span class="icon-unlock text-success" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }" />
+                                    <span class="file-title-label">#{FilePage.fileMetadata.label}</span>
+
+                                    <!-- FILE LEVEL MSGs -->
+                                    <div class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{FilePage.fileMetadata.dataFile.ingestProblem and FilePage.canUpdateDataset()}">
+                                        <!-- Ingest failed -->
+                                        <span class="glyphicon glyphicon-info-sign"/>
+                                        <span> #{bundle['file.ingestFailed.header']}&#160;</span>
+                                        <span>
+                                            <a tabindex="0" role="button" class="glyphicon glyphicon-question-sign tooltip-icon"
+                                               data-toggle="popover" data-placement="auto top" data-trigger="focus" data-html="true"
+                                               data-content="#{FilePage.ingestMessage} #{FilePage.fileMetadata.dataFile.ingestReportMessage}"/>
+                                        </span>
+                                    </div>
+                                    <!-- END: FILE LEVEL MSGs -->
+
+                                    <p class="help-block">
+                                        <h:outputFormat value="#{bundle['file.citation.notice']}" escape="false">
+                                            <o:param value="#{FilePage.fileMetadata.datasetVersion.dataset.displayName}"/>
+                                        </h:outputFormat>
+                                    </p>
 
-                                    <!-- Title/Label -->
-                                    <h:outputText value="#{FilePage.fileMetadata.label}" styleClass="file-title-label"/>
-                                    
                                     <div id="title-label-block" class="margin-top-half">
+
+                                        <!-- Restricted File Icon -->
+                                        <span class="glyphicon glyphicon-lock text-danger" title="#{bundle['restricted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}"/>
+                                        <span class="icon-unlock text-success" title="#{bundle['restrictedaccess']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
+                                        <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
+                                        
+                                        <!-- DATASET Publication Status -->
                                         <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
+                                        <h:outputText value="#{bundle['embargoed']}" styleClass="label label-primary" rendered="#{dataFileServiceBean.isActivelyEmbargoed(FilePage.fileMetadata)}"/>
+                                        <h:outputText value="#{bundle['retentionExpired']}" styleClass="label label-danger" rendered="#{dataFileServiceBean.isRetentionExpired(FilePage.fileMetadata)}"/>
                                         <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"/>   
+                                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"/>
                                         <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"/>
+                                        <h:outputText value="#{DatasetUtil:getLocaleCurationStatusLabel(FilePage.fileMetadata.datasetVersion.currentCurationStatus)}" styleClass="label label-info curation-status" rendered="#{FilePage.canSeeCurationStatus()}"/>
+                                        <h:outputText value="#{bundle['incomplete']}" styleClass="label label-danger" rendered="#{!FilePage.valid}"/>
                                         <!-- DATASET VERSION NUMBER -->
                                         <h:outputText styleClass="label label-default" rendered="#{FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
-                                                      value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionNumber}.#{FilePage.fileMetadata.datasetVersion.minorVersionNumber}" /> 
+                                                      value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionNumber}.#{FilePage.fileMetadata.datasetVersion.minorVersionNumber}"/>
                                         <h:outputText styleClass="label label-default" rendered="#{!FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
                                                       value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionState}"/>
                                     </div>
                                 </div>
-                                
-                                <div class="col-xs-12">
-                                    <div class="row">
-                                        <div class="col-sm-9">
-                                            <div class="row">
-                                                <div class="col-sm-12">
-                                                    <h:outputFormat styleClass="h5" value="#{bundle['file.citation.datafile']}" escape="false" />
+                            </div>
+
+                            <!-- START: NEW RESPONSIVE ABOVE FOLD BLOCK -->
+                            <div class="row">
+                                <!-- CITATION BLOCK -->
+                                <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9">
+                                    <!-- FILE CITATION -->
+                                    <h:outputFormat styleClass="h5" value="#{bundle['file.citation.datafile']}" escape="false" />
+                                    <div class="citation-block">
+                                        <div class="clearfix #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation bg-citation-file'}">
+                                            <div class="citation #{FilePage.fileMetadata.datasetVersion.deaccessioned ? '' : 'margin-bottom'}">
+                                                <span id="citation-select-2" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
+                                                    <h:outputText value="#{FilePage.fileMetadata.dataFile.isIdentifierRegistered() ? FilePage.fileMetadata.getDirectFileCitation(true, FilePage.anonymizedAccess) : FilePage.fileMetadata.getFileCitation(true, FilePage.anonymizedAccess)}" escape="false"/>
+                                                </span>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}"
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
+                                            </div>
+                                            <div class="pull-left row col-sm-9 padding-none" jsf:rendered="#{!FilePage.anonymizedAccess}">
+                                                <div class="col-sm-3 col-md-4 col-lg-3 btn-group margin-bottom citation-download" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                    <button type="button" class="btn btn-link dropdown-toggle padding-none downloadCitation" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                         #{bundle['file.cite.file.downloadBtn']} <span class="caret"></span>
+                                                    </button>
+                                                    <ul class="dropdown-menu">
+                                                        <li>
+                                                            <h:commandLink
+                                                                id="endNoteLink-2" value="#{bundle['dataset.cite.downloadBtn.xml']}"
+                                                                action="#{FilePage.fileDownloadService.downloadCitationXML(FilePage.fileMetadata, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}"
+                                                            />
+                                                        </li>
+                                                        <li>
+                                                            <h:commandLink
+                                                                id="risLink-2" value="#{bundle['dataset.cite.downloadBtn.ris']}"
+                                                                action="#{FilePage.fileDownloadService.downloadCitationRIS(FilePage.fileMetadata, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}"
+                                                            />
+                                                        </li>
+                                                        <li>
+                                                            <h:commandLink
+                                                                id="bibLink-2" value="#{bundle['dataset.cite.downloadBtn.bib']}" target="_blank"
+                                                                action="#{FilePage.fileDownloadService.downloadCitationBibtex(FilePage.fileMetadata, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}"
+                                                            />
+                                                        </li>
+                                                    </ul>
                                                 </div>
-                                                <div class="col-sm-12 citation-block">
-                                                     <div class="col-sm-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation bg-citation-file'}">
-                                                        <div class="row">
-                                                            <div class="col-sm-12 citation">
-                                                                <span id="citation-select-2" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
-                                                                    <h:outputText value="#{FilePage.fileMetadata.dataFile.isIdentifierRegistered() ? FilePage.fileMetadata.getDirectFileCitation(true) : FilePage.fileMetadata.getFileCitation(true)}" escape="false"/>
-                                                                </span>
-                                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" 
-                                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
-                                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" 
-                                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
-                                                            </div>
-                                                            <div class="col-sm-6 citation-download vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                                                <div class="dropdown">
-                                                                    <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
-                                                                        <span class="glyphicon glyphicon-list"/> #{bundle['file.cite.file.downloadBtn']} <span class="caret"></span>
-                                                                    </button>
-                                                                    <ul class="dropdown-menu" role="menu">
-                                                                        <li>
-                                                                            <a jsf:id="endNoteLink-2" jsf:action="#{FilePage.fileDownloadService.downloadCitationXML(FilePage.fileMetadata, null, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}" >
-                                                                                #{bundle['dataset.cite.downloadBtn.xml']}
-                                                                            </a>
-                                                                        </li>
-                                                                        <li>
-                                                                            <a jsf:id="risLink-2" jsf:actionListener="#{FilePage.fileDownloadService.downloadCitationRIS(FilePage.fileMetadata, null, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}">
-                                                                                #{bundle['dataset.cite.downloadBtn.ris']}
-                                                                            </a>
-                                                                        </li>
-                                                                        <li>
-                                                                            <a jsf:id="bibLink-2" jsf:actionListener="#{FilePage.fileDownloadService.downloadCitationBibtex(FilePage.fileMetadata, null, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}" target="_blank">
-                                                                                #{bundle['dataset.cite.downloadBtn.bib']}
-                                                                            </a>
-                                                                        </li>
-                                                                    </ul>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
-                                                                <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
-                                                            </div>
-                                                        </div>
-                                                    </div>
+                                                <div class="col-sm-9 col-md-8 col-lg-9 text-muted margin-bottom citation-standards" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                    <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
                                                 </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!-- END: FILE CITATION -->
 
-                                                <div class="col-sm-12">
-                                                    <p class="help-block">
-                                                        <h:outputFormat value="#{bundle['file.citation.notice']}" escape="false">
-                                                            <o:param value="#{FilePage.fileMetadata.datasetVersion.dataset.displayName}"/>
-                                                        </h:outputFormat>
-                                                    </p>
-                                                    <h:outputFormat styleClass="h5" value="#{bundle['file.citation.dataset']}" escape="false" />
+                                    <!-- DATASET CITATION -->
+                                    <h:outputFormat styleClass="h5" value="#{bundle['file.citation.dataset']}" escape="false" />
+                                    <div class="citation-block no-margin-bottom">
+                                        <div class="clearfix #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
+                                            <div class="citation #{FilePage.fileMetadata.datasetVersion.deaccessioned ? '' : 'margin-bottom'}">
+                                                <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
+                                                    <h:outputText value="#{FilePage.fileMetadata.datasetVersion.getCitation(true, FilePage.anonymizedAccess)}" escape="false"/>
+                                                </span>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}"
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
+                                            </div>
+                                            <div class="pull-left row col-sm-9 padding-none"  jsf:rendered="#{!FilePage.anonymizedAccess}">
+                                                <div class="col-sm-3 col-md-4 col-lg-3 btn-group margin-bottom citation-download" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                    <button type="button" class="btn btn-link dropdown-toggle padding-none downloadCitation" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                        #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
+                                                    </button>
+                                                    <ul class="dropdown-menu">
+                                                        <li>
+                                                            <h:commandLink
+                                                                id="endNoteLink" value="#{bundle['dataset.cite.downloadBtn.xml']}"
+                                                                action="#{FilePage.fileDownloadService.downloadDatasetCitationXML(FilePage.fileMetadata.datasetVersion)}"
+                                                            />
+                                                        </li>
+                                                        <li>
+                                                            <h:commandLink
+                                                                id="risLink" value="#{bundle['dataset.cite.downloadBtn.ris']}"
+                                                                action="#{FilePage.fileDownloadService.downloadDatasetCitationRIS(FilePage.fileMetadata.datasetVersion)}"
+                                                            />
+                                                        </li>
+                                                        <li>
+                                                            <h:commandLink
+                                                                id="bibLink" value="#{bundle['dataset.cite.downloadBtn.bib']}" target="_blank"
+                                                                action="#{FilePage.fileDownloadService.downloadDatasetCitationBibtex(FilePage.fileMetadata.datasetVersion)}"
+                                                            />
+                                                        </li>
+                                                    </ul>
                                                 </div>
-                                                <div class="col-sm-12 citation-block no-margin-bottom">
-                                                    <div class="col-sm-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
-                                                        <div class="row">
-                                                            <div class="col-sm-12 citation">
-                                                                <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
-                                                                    <h:outputText value="#{FilePage.fileMetadata.datasetVersion.getCitation(true)}" escape="false"/>
-                                                                </span>
-                                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" 
-                                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
-                                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" 
-                                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
-                                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}" 
-                                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
-                                                            </div>
-                                                            <div class="col-sm-6 citation-download vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                                                <div class="dropdown">
-                                                                    <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
-                                                                        <span class="glyphicon glyphicon-list"/> #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
-                                                                    </button>
-                                                                    <ul class="dropdown-menu" role="menu">
-                                                                        <li>
-                                                                            <a jsf:id="endNoteLink" jsf:action="#{FilePage.fileDownloadService.downloadDatasetCitationXML(FilePage.fileMetadata.datasetVersion.dataset)}" >
-                                                                                #{bundle['dataset.cite.downloadBtn.xml']}
-                                                                            </a>
-                                                                        </li>
-                                                                        <li>
-                                                                            <a jsf:id="risLink" jsf:actionListener="#{FilePage.fileDownloadService.downloadDatasetCitationRIS(FilePage.fileMetadata.datasetVersion.dataset)}">
-                                                                                #{bundle['dataset.cite.downloadBtn.ris']}
-                                                                            </a>
-                                                                        </li>
-                                                                        <li>
-                                                                            <a jsf:id="bibLink" jsf:actionListener="#{FilePage.fileDownloadService.downloadDatasetCitationBibtex(FilePage.fileMetadata.datasetVersion.dataset)}" target="_blank">
-                                                                                #{bundle['dataset.cite.downloadBtn.bib']}
-                                                                            </a>
-                                                                        </li>
-                                                                    </ul>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
-                                                                <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
-                                                            </div>
-                                                        </div>
-                                                    </div>
+                                                <div class="col-sm-9 col-md-8 col-lg-9 text-muted margin-bottom citation-standards" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                    <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
                                                 </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!-- END: DATASET CITATION -->
+                                </div>
+                                <!-- END: CITATION BLOCK -->
 
-                                                <div id="deaccession-reason-block" class="col-xs-12" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                                    <div class="col-xs-12 bg-danger">
-                                                        <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
-                                                        <p>#{FilePage.fileMetadata.datasetVersion.versionNote}</p>
-                                                        <ui:fragment rendered="#{!empty FilePage.fileMetadata.datasetVersion.archiveNote}">
-                                                            <p>#{bundle['dataset.beAccessedAt']} <a href="#{FilePage.fileMetadata.datasetVersion.archiveNote}" target="_blank">#{FilePage.fileMetadata.datasetVersion.archiveNote}</a></p>
+                                <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom">
+                                    <!-- ActionButtonBlock -->
+                                    <div id="actionButtonBlock">
+                                            <!-- DOWNLOAD/ACCESS DATASET -->
+                                            <div class="btn-group btn-group-justified"
+                                                 jsf:rendered="#{showAccessFileButtonGroup}">
+                                                <div class="btn-group">
+                                                    <button type="button" class="btn btn-primary btn-access-file dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                        #{bundle['file.accessBtn']} <span class="caret"></span>
+                                                    </button>
+                                                    <ul class="dropdown-menu pull-right text-left">
+                                                        <!-- Explore/Download/Request Button Block -->
+                                                        <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage
+                                                                                   or FilePage.fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}">
+                                                            <ui:include src="file-download-button-fragment.xhtml">
+                                                                <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>
+                                                                <ui:param name="guestbookAndTermsPopupRequired" value="#{FilePage.guestbookAndTermsPopupRequired}"/>
+                                                                <ui:param name="requestAccessPopupRequired" value="#{FilePage.requestAccessPopupRequired}"/>
+                                                                <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
+                                                                <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
+                                                                <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
+                                                                <ui:param name="isFilePg" value="true"/>
+                                                                <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
+                                                                <ui:param name="exploreTools" value="#{FilePage.exploreTools}"/>
+                                                                <ui:param name="queryTools" value="#{FilePage.queryTools}"/>
+                                                                <ui:param name="anonymized" value="#{FilePage.anonymizedAccess}"/>
+                                                                <ui:param name="bean" value="#{FilePage}"/>
+                                                            </ui:include>
                                                         </ui:fragment>
-                                                    </div>
+                                                        <!-- END: Explore/Download/Request Button Block -->
+                                                    </ul>
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="col-sm-3">
-                                            <!-- Metrics -->
-                                            <div id="metrics-block" jsf:rendered="#{!(widgetWrapper.widgetView or FilePage.fileMetadata.dataFile.filePackage or FilePage.fileMetadata.datasetVersion.deaccessioned)}">
-                                                <div id="metrics-heading">
-                                                    #{bundle['metrics.file.title']}
-                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
-                                                            data-original-title="#{settingsWrapper.makeDataCountDisplayEnabled ? bundle['metrics.file.tip.makedatacount'] : bundle['metrics.file.tip.default']}"></span>
+
+                                            <!-- Edit/Map Button Block -->
+                                            <div class="btn-group btn-group-justified" jsf:rendered="#{!widgetWrapper.widgetView}">
+
+                                                <!-- Edit Button Group -->
+                                                <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
+                                                                         and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
+                                                                         and FilePage.deletedFile}">
+                                                    <p:commandLink styleClass="btn btn-default btn-access btn-edit" onclick="PF('fileAlreadyDeletedPrevious').show()"
+                                                                   title="#{bundle['file.editBtn']}">
+                                                        #{bundle['file.editBtn']}
+                                                    </p:commandLink>
                                                 </div>
-                                                <div id="metrics-body">
-                                                    <!-- Classic downloads -->
-                                                    <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
-                                                        <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
-                                                            <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDataFileId(FilePage.fileId)}"/>
-                                                        </h:outputFormat>
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                              data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.file.downloads.tip']}"></span>
-                                                    </div>
-                                                    <!-- Make Data Count downloads -->
-                                                    <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
-                                                        <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
-                                                            <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDataFileId(FilePage.fileId)}"/>
-                                                        </h:outputFormat>
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                                data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.file.downloads.tip']}"></span>
-                                                    </div>
+                                                <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
+                                                                         and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
+                                                                         and FilePage.hasValidTermsOfAccess
+                                                                         and !FilePage.deletedFile}">
+                                                    <button type="button" id="editFile" class="btn btn-default btn-access btn-edit dropdown-toggle #{FilePage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                                                            disabled="#{FilePage.lockedFromEdits ? 'disabled' : ''}">
+                                                        #{bundle['file.editBtn']} <span class="caret"></span>
+                                                    </button>
+                                                    <ul class="dropdown-menu pull-right text-left">
+                                                        <ui:include src="file-edit-button-fragment.xhtml">
+                                                            <ui:param name="datasetVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
+                                                            <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>
+                                                            <ui:param name="configureTools" value="#{FilePage.configureTools}"/>
+                                                            <ui:param name="bean" value="#{FilePage}"/>
+                                                            <ui:param name="unrestrictFileAction" value="restrictFile"/>
+                                                        </ui:include>
+                                                    </ul>
                                                 </div>
+                                                <!-- END: Edit Button Group -->
+
+                                            </div>
+                                            <!-- END: Map/Edit Button Block -->
+
+                                            <!-- Contact/Share Button Group -->
+                                            <div class="btn-group btn-group-justified" jsf:rendered="#{!widgetWrapper.widgetView}">
+                                                <p:commandLink class="btn btn-default btn-xs btn-contact" title="#{bundle['dataset.email.datasetContactTitle']}"
+                                                               update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{FilePage.fileMetadata.dataFile}"/>
+                                                    #{bundle['file.contactBtn']}
+                                                </p:commandLink>
+                                                <p:commandLink styleClass="btn btn-default btn-xs btn-share" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}"
+                                                               title="#{bundle['file.share.fileShare']}"
+                                                               oncomplete="PF('shareDialog').show();sharrre();">
+                                                    #{bundle['file.shareBtn']}
+                                                </p:commandLink>
+                                            </div>
+                                            <!-- END: Contact/Share Button Group -->
+                                    </div>
+                                    <!-- END: ActionButtonBlock -->
+                                </div>
+
+                                <div style="clear:right;" class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom"
+                                     jsf:rendered="#{!(widgetWrapper.widgetView or FilePage.fileMetadata.dataFile.filePackage or FilePage.fileMetadata.datasetVersion.deaccessioned)}">
+                                    <!-- Metrics -->
+                                    <div id="metrics-block">
+                                        <div id="metrics-heading">
+                                            #{bundle['metrics.file.title']}
+                                            <ui:fragment rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top"
+                                                    data-trigger="hover" data-original-title="#{bundle['metrics.file.tip.default']}"></span>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <a tabindex="0" role="button" class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="popover" data-placement="auto top"
+                                                    data-trigger="focus" data-html="true" data-content="#{bundle['metrics.file.tip.makedatacount']}"></a>
+                                            </ui:fragment>
+                                        </div>
+                                        <!-- END DATASET CITATION -->
+                                        <div id="metrics-body">
+                                            <!-- Classic downloads -->
+                                            <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
+                                                    <f:param value="#{guestbookResponseServiceBean.getDownloadCountByDataFileId(FilePage.fileId)}"/>
+                                                </h:outputFormat>
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                      data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.file.downloads.tip']}"></span>
+                                            </div>
+                                            <!-- Make Data Count downloads -->
+                                            <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
+                                                    <f:param value="#{guestbookResponseServiceBean.getDownloadCountByDataFileId(FilePage.fileId)}"/>
+                                                </h:outputFormat>
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                        data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.file.downloads.nonmdc.tip']}"></span>
                                             </div>
-                                            <!-- END: Metrics -->
                                         </div>
                                     </div>
+                                    <!-- END: Metrics -->
                                 </div>
+
+                                <!-- DEACCESSION ONLY?? NO SUMMARY BLOCK?? RESPONSIVE ORDER HACK BOOTSTRAP 3 https://stackoverflow.com/a/24834574 -->
+                                <div jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"
+                                     id="dataset-colorder-block" class="visible-md-block visible-lg-block col-md-8 col-lg-9"><!--Hack--></div>
+                                <!-- END: RESPONSIVE ORDER HACK BOOTSTRAP 3 -->
+
+                                <!-- DEACCESSION REASON -->
+                                <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9 margin-bottom" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                    <div id="deaccession-reason-block" class="col-xs-12 bg-danger">
+                                        <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
+                                        <p>#{FilePage.fileMetadata.datasetVersion.deaccessionNote}</p>
+                                        <ui:fragment rendered="#{!empty FilePage.fileMetadata.datasetVersion.deaccessionLink}">
+                                            <p>#{bundle['dataset.beAccessedAt']} 
+                                                <h:outputLink rendered="#{FilePage.fileMetadata.datasetVersion.deaccessionLinkAsURLString ne null}" value="#{FilePage.fileMetadata.datasetVersion.deaccessionLinkAsURLString}" target="_blank">#{FilePage.fileMetadata.datasetVersion.deaccessionLink}</h:outputLink>
+                                                <h:outputText rendered="#{FilePage.fileMetadata.datasetVersion.deaccessionLinkAsURLString eq null}" value="#{FilePage.fileMetadata.datasetVersion.deaccessionLink}"/>
+                                                
+                                            </p>
+                                        </ui:fragment>
+                                    </div>
+                                </div>
+                                <!-- END DEACCESSION REASON -->
                             </div>
+                            <!-- END: NEW RESPONSIVE ABOVE FOLD BLOCK -->
                         </div>
                     </div>
-
+                    <!-- END Top Button/Citation Blocks -->
                     <div id="contentTabs">
-                        <!-- Metadata -->
                         <p:tabView id="tabView" widgetVar="content" activeIndex="#{FilePage.selectedTabIndex}">
-                            <p:ajax event="tabChange" listener="#{FilePage.tabChanged}" oncomplete="bind_bsui_components();" update="@this" />
+                            <p:ajax event="tabChange" listener="#{FilePage.tabChanged}" update="@this" />
                             <p:tab id="accessTab" class="padding-none" title="#{bundle['file.dataFilesTab.dataAccess']}"
                                    rendered="#{settingsWrapper.rsyncDownload and FilePage.fileMetadata.dataFile.filePackage and systemConfig.rsyncDownload
                                         and !FilePage.fileMetadata.getDataFile().getOwner().getStorageIdentifier().startsWith('s3://') }">
+                                <!-- Access -->
                                 <ui:include src="file-data-access-fragment.xhtml">
                                     <ui:param name="fileMetadata" value="#{fileMetadata}"/>
                                     <ui:param name="datasetVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
                                     <!--  Should be FilePage.fileDownloadService ? -->
-                                    <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
+                                    <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
                                 </ui:include>
                             </p:tab>
+                            <p:tab id="previewTab" title="#{FilePage.toolTabTitle}"
+                                   rendered="#{(FilePage.toolsWithPreviews.size() > 0 or FilePage.queryTools.size() > 0) and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata)}">
+                                <!-- PREVIEW TERMS/GUESTBOOK FORM -->
+                                <ui:fragment rendered="#{FilePage.guestbookAndTermsPopupRequired and !FilePage.termsMet and (FilePage.getSelectedTool().previewTool or FilePage.getSelectedTool().queryTool)}">
+                                    <ui:include id="previewGB" src="guestbook-terms-popup-fragment.xhtml">
+                                        <ui:param name="popupContext" value="previewTab"/>
+                                        <ui:param name="workingVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
+                                        <ui:param name="guestbookAndTermsPopupRequired" value="#{FilePage.guestbookAndTermsPopupRequired}"/>
+                                        <ui:param name="hasRestrictedFile" value="#{FilePage.fileMetadata.restricted}"/>
+                                        <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
+                                        <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
+                                        <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
+                                        <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
+                                        <ui:param name="termsGuestbookPopupAction" value="#{bundle.download}"/>
+                                        <ui:param name="guestbookPopupRequiredAtDownload" value="#{FilePage.guestbookPopupRequiredAtDownload}"/>
+                                    </ui:include>
+                                </ui:fragment>
+                                <!-- PREVIEW EXTERNAL TOOL -->
+                                <ui:fragment rendered="#{(!FilePage.guestbookAndTermsPopupRequired) or FilePage.termsMet}">
+                                <div class="btn-toolbar margin-bottom" role="toolbar" aria-label="#{bundle['file.previewTab.button.label']}">
+                                    <!-- Preview Button Group -->
+                                    <div class="btn-group" jsf:rendered="#{FilePage.allAvailableTools.size() > 1 and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata)}">
+                                        <button type="button" id="selectTool" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                             #{bundle['file.toolsTab.button.label']} <span class="caret"></span>
+                                        </button>
+
+                                        <ui:fragment rendered="#{FilePage.allAvailableTools.size() > 1}">
+                                        <ul class="dropdown-menu">
+                                            <ui:repeat value="#{FilePage.allAvailableTools}" var="tool">
+                                                <li>
+                                                    <h:commandLink action="#{FilePage.setSelectedTool(tool)}">
+                                                        <h:outputText value="#{tool.getDisplayNameLang()}"/>
+                                                    </h:commandLink>
+                                                </li>
+                                            </ui:repeat>
+                                        </ul>
+                                        </ui:fragment>
+                                    </div>
+                                    <!-- END: Preview Button Group -->
+                                    <div class="btn-group" jsf:rendered="#{(FilePage.toolsWithPreviews.size() > 0 or FilePage.queryTools.size() > 0) and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata)}">
+                                        <!-- Modular/Configured Explore Tool -->
+                                        <ui:remove><!-- Not sure this div will ever be rendered when terms are required and FilePage.termsMet isn't true. Leaving this logic in in case that is incorrect or changes going forward --></ui:remove>
+
+                                        <h:commandLink rendered="#{(!FilePage.guestbookAndTermsPopupRequired) or FilePage.termsMet}"
+                                                         type="submit"
+                                                         styleClass="btn btn-default #{(FilePage.fileMetadata.dataFile.ingestInProgress) ? 'disabled' : ''}"
+                                                         disabled="#{(FilePage.fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                                         action="#{FilePage.fileDownloadService.explore(FilePage.guestbookResponse, FilePage.fileMetadata, FilePage.selectedTool)}">
+                                            <span class="glyphicon glyphicon-#{FilePage.selectedTool.exploreTool ? 'equalizer' : 'new-window'}"></span>
+                                            <h:outputFormat value="#{FilePage.selectedTool.exploreTool ? bundle['file.previewTab.exploreBtn'] : bundle['file.previewTab.openBtn']}">
+                                                <f:param value="#{bundle.explore}"/>
+                                                <f:param value="#{FilePage.selectedTool.getDisplayNameLang()}"/>
+                                            </h:outputFormat>
+                                        </h:commandLink>
+                                        <p:commandLink rendered="#{FilePage.guestbookAndTermsPopupRequired and !FilePage.termsMet}"
+                                                         action="#{FilePage.guestbookResponseService.modifyDatafileAndFormat(FilePage.guestbookResponse, FilePage.fileMetadata, 'externalTool', FilePage.selectedTool)}"
+                                                         styleClass="btn btn-default"
+                                                         disabled="#{(FilePage.fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                                         type="submit"
+                                                         process="@this"
+                                                         update="@widgetVar(guestbookAndTermsPopup)"
+                                                         oncomplete="PF('guestbookAndTermsPopup').show();handleResizeDialog('guestbookAndTermsPopup');">
+                                            <f:actionListener binding="#{FilePage.setTermsGuestbookPopupAction(bundle.download)}"/>
+                                            <span class="glyphicon glyphicon-#{FilePage.selectedTool.exploreTool ? 'equalizer' : 'new-window'}"></span>
+                                            <h:outputFormat value="#{FilePage.selectedTool.exploreTool ? bundle['file.previewTab.exploreBtn'] : bundle['file.previewTab.openBtn']}">
+                                                <f:param value="#{bundle.explore}"/>
+                                                <f:param value="#{FilePage.selectedTool.getDisplayNameLang()}"/>
+                                            </h:outputFormat>
+                                        </p:commandLink>
+                                    </div>
+                                </div>
+                                <!-- FRAME EXTERNAL TOOL EMBED -->
+                                <div id="previewPresentation" class="embed-responsive embed-responsive-16by9" jsf:rendered="#{(FilePage.toolsWithPreviews.size() > 0  or FilePage.queryTools.size() > 0) and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata)}">
+                                    <iframe role="presentation" title="#{bundle['file.previewTab.presentation']}" src="#{FilePage.preview(FilePage.selectedTool)}"></iframe>
+                                </div>
+                                </ui:fragment>
+                            </p:tab>
                             <p:tab id="metadataMapTab" class="padding-none" title="#{bundle['file.dataFilesTab.metadata.header']}"
-                                   rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
+                                   rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or
                                                               (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset()))}">
-                                
-                                <!-- Add + Edit Metadata Button -->
+                                <!-- Metadata -->
                                 <div class="button-block tab-header margin-bottom text-right">
-                                    <h:outputLink styleClass="btn btn-default btn-access #{(FilePage.lockedFromEdits) ? 'disabled' : ''}"
-                                                  value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE"
+                                    <!-- Add + Edit Metadata Button -->
+                                    <h:outputLink styleClass="btn btn-default btn-access #{FilePage.lockedFromEdits ? 'disabled' : ''}"
+                                                  value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;referrer=FILE"
                                                   rendered="#{!widgetWrapper.widgetView and (dataverseSession.user.authenticated
                                                      and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
-                                                     and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile)))}"
-                                                  disabled="#{FilePage.lockedFromEdits}">
+                                                     and !FilePage.deletedFile)}"
+                                                  disabled="#{FilePage.lockedFromEdits ? 'disabled' : ''}">
                                         <span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
                                     </h:outputLink>
                                     <div class="btn-group" jsf:rendered="#{!widgetWrapper.widgetView and (dataverseSession.user.authenticated
-                                                         and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset) 
-                                                         and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile)))}">
-                                        <button class="btn btn-default btn-access" onclick="PF('fileAlreadyReplacedPrevious').show()" type="button" disabled="#{FilePage.lockedFromEdits}">
-                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']}
+                                                         and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
+                                                         and (FilePage.deletedFile))}">
+                                        <button class="btn btn-default btn-access #{FilePage.lockedFromEdits ? 'disabled' : ''}" onclick="PF('fileAlreadyDeletedPrevious').show()" type="button"
+                                                disabled="#{FilePage.lockedFromEdits ? 'disabled' : ''}">
+                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
                                         </button>
                                     </div>
-
                                     <!-- Export Button -->
                                     <div class="btn-group" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released}">
                                         <button class="btn btn-default btn-export dropdown-toggle" type="button" data-toggle="dropdown">
-                                            <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"/></button>
-                                        <ul class="dropdown-menu" role="menu">
+                                            <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"/>
+                                        </button>
+                                        <ul class="dropdown-menu pull-right text-left">
                                             <ui:repeat var="exporter" value="#{FilePage.getExporters()}">
                                                 <li>
                                                     <h:outputLink value="#{exporter[1]}" target="_blank">
                                                         <h:outputText value="#{exporter[0]}"/>
                                                     </h:outputLink>
-                                                </li>  
+                                                </li>
                                             </ui:repeat>
                                         </ul>
                                     </div>
                                 </div>
-                                <!-- END: Add + Edit Metadata Button -->
-                                
                                 <div class="panel panel-default">
                                     <div data-toggle="collapse" data-target="#panelCollapseFMD" class="panel-heading text-info">
                                         #{bundle['file.metadataTab.fileMetadata.header']} &#160;<span class="glyphicon glyphicon-chevron-up"/>
                                     </div>
                                     <div id="panelCollapseFMD" class="collapse in">
-                                        <div class="panel-body">
-                                            <div class="form-group">
-                                                <label for="preview-square" class="col-sm-3 control-label">
-                                                    #{bundle['file.metadata.preview']}
-                                                </label>
-                                                <div id="file-preview-icon-block" class="col-sm-9">
-                                                    <div id="border-block" style="border:0;">
-                                                        <div id="preview-square">
-                                                            <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(FilePage.fileMetadata.dataFile)} text-muted" jsf:rendered="#{!FilePage.isThumbnailAvailable(FilePage.fileMetadata)}"/>
-                                                            <p:graphicImage styleClass="img-responsive" value="/api/access/datafile/#{FilePage.fileId}?imageThumb=400" 
-                                                                            alt="#{FilePage.fileMetadata.label}" rendered="#{FilePage.isThumbnailAvailable(FilePage.fileMetadata)}"/>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div id="fileCategoriesBlock" class="form-group" jsf:rendered="#{!(empty FilePage.fileMetadata.categoriesByName) or !(empty FilePage.fileMetadata.dataFile.tags)}">
-                                                <label for="file-tags" class="col-sm-3 control-label">
-                                                    #{bundle['file.metadata.filetags']}
-                                                </label>
-                                                <div id="file-tags" class="col-sm-9">
-                                                    <ui:repeat value="#{FilePage.fileMetadata.categoriesByName}" var="tag" rendered="#{!(empty FilePage.fileMetadata.categoriesByName)}">
-                                                        <h:outputText value="#{tag}" styleClass="label label-default"/>
-                                                    </ui:repeat>
-                                                    <ui:repeat value="#{FilePage.fileMetadata.dataFile.tags}" var="tag">
-                                                        <h:outputText value="#{tag.typeLabel}" styleClass="label label-info"/>
-                                                    </ui:repeat>
-                                                </div>
-                                            </div>
-                                            <div class="form-group" jsf:rendered="#{FilePage.file.identifier != null}">
-                                                <label for="metadata_persistentId" class="col-sm-3 control-label">
-                                                    #{bundle['file.metadata.persistentId']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    #{FilePage.file.getGlobalId()}
-                                                </div>
-                                            </div>
-                                            <!--Only show Public download url if identifier is available -->
-                                            <div class="form-group" jsf:rendered="#{FilePage.publiclyDownloadable and !FilePage.fileMetadata.dataFile.filePackage}">
-                                                <label class="col-sm-3 control-label">                                                   
-                                                   #{bundle['file.metadataTab.fileMetadata.downloadUrl.label']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <p class="help-block">
-                                                        <h:outputFormat value="#{bundle['file.metadataTab.fileMetadata.downloadUrl.info']}" escape="false">
-                                                            <f:param value="#{systemConfig.guidesBaseUrl}"/>
-                                                            <f:param value="#{systemConfig.guidesVersion}"/>
-                                                        </h:outputFormat>
-                                                    </p>
-                                                    <code><h:outputText value="#{FilePage.publicDownloadUrl}"/></code>
-                                                </div>
-                                            </div>
-                                            <div class="form-group" jsf:rendered="#{!(empty FilePage.file.unf)}">
-                                                <label class="col-sm-3 control-label">
-                                                   #{bundle['file.metadataTab.fileMetadata.unf.label']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <h:outputText value="#{FilePage.file.unf}"/>
-                                                </div>
-                                            </div>
-                                            <div class="form-group" jsf:rendered="#{!(empty FilePage.file.checksumValue)}">
-                                                <label class="col-sm-3 control-label">                                                   
-                                                   #{FilePage.file.tabularData ? FilePage.file.originalChecksumType : FilePage.file.checksumType}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <h:outputText value="#{FilePage.file.checksumValue}"/>
-                                                </div>
-                                            </div>
-                                            <div class="form-group" jsf:rendered="#{FilePage.file.released}">
-                                                <label class="col-sm-3 control-label">
-                                                   #{bundle['file.metadataTab.fileMetadata.publicationDate.label']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <h:outputText value="#{FilePage.file.publicationDateFormattedYYYYMMDD}"/>
-                                                </div>
-                                            </div>
-                                            <div class="form-group" jsf:rendered="#{!(empty FilePage.file.friendlySize)}">
-                                                <label class="col-sm-3 control-label">
-                                                   #{bundle['file.metadataTab.fileMetadata.size.label']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <h:outputText value="#{FilePage.file.friendlySize}"/>
-                                                </div>
-                                            </div>
-                                            <div class="form-group" jsf:rendered="#{!(empty FilePage.file.friendlyType)}">
-                                                <label class="col-sm-3 control-label">
-                                                   #{bundle['file.metadataTab.fileMetadata.type.label']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <h:outputText value="#{FilePage.file.friendlyType}"/>
-                                                </div>
-                                            </div>
-                                            <div class="form-group" jsf:rendered="#{!(empty FilePage.file.dataTable.varQuantity)}">
-                                                <label class="col-sm-3 control-label">
-                                                   #{bundle['file.metaData.dataFile.dataTab.variables']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <h:outputText value="#{FilePage.file.dataTable.varQuantity}"/>
-                                                </div>
-                                            </div>
-                                            <div class="form-group" jsf:rendered="#{!(empty FilePage.file.dataTable.caseQuantity)}">
-                                                <label class="col-sm-3 control-label">
-                                                   #{bundle['file.metaData.dataFile.dataTab.observations']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <h:outputText value="#{FilePage.file.dataTable.caseQuantity}"/>
-                                                </div>
-                                            </div>
-                                            <div class="form-group" jsf:rendered="#{!empty FilePage.fileMetadata.directoryLabel}">
-                                                <label class="col-sm-3 control-label">
-                                                   #{bundle['file.metadataTab.fileMetadata.hierarchy.label']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <h:outputText value="#{FilePage.fileMetadata.directoryLabel}/"/>
-                                                </div>
-                                            </div>
-                                            <div class="form-group" jsf:rendered="#{!(empty FilePage.fileMetadata.description)}">
-                                                <label class="col-sm-3 control-label">
-                                                   #{bundle['file.metadataTab.fileMetadata.description.label']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <h:outputText value="#{FilePage.fileMetadata.description}"/>
-                                                </div>
-                                            </div>
-                                            <div class="form-group">
-                                                <label class="col-sm-3 control-label">
-                                                   #{bundle['file.metadataTab.fileMetadata.depositDate.label']}
-                                                </label>
-                                                <div class="col-sm-9">
-                                                    <h:outputText value="#{FilePage.file.createDateFormattedYYYYMMDD}"/> 
-                                                </div>
-                                            </div>
+                                        <div class="panel-body metadata-container">
+                                            <table class="metadata">
+                                                <tbody>
+                                                    <tr id="filePreviewBlock">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadata.preview']}
+                                                        </th>
+                                                        <td>
+                                                            <div id="file-preview-icon-block">
+                                                                <div id="border-block" style="border:0;">
+                                                                    <div id="preview-square">
+                                                                        <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(FilePage.fileMetadata.dataFile)} text-muted" jsf:rendered="#{!FilePage.isThumbnailAvailable(FilePage.fileMetadata)}"/>
+                                                                        <p:graphicImage styleClass="img-responsive" value="/api/access/datafile/#{FilePage.fileId}?imageThumb=400"
+                                                                                        alt="#{FilePage.fileMetadata.label}" rendered="#{FilePage.isThumbnailAvailable(FilePage.fileMetadata)}"/>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr id="fileCategoriesBlock" jsf:rendered="#{!(empty FilePage.fileMetadata.categoriesByName) or !(empty FilePage.fileMetadata.dataFile.tags)}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadata.filetags']}
+                                                        </th>
+                                                        <td id="fileCategoriesList"   >
+                                                            <div id="file-tags" >
+                                                                <ui:repeat value="#{FilePage.fileMetadata.categoriesByName}" var="tag">
+                                                                    <h:outputText value="#{tag}" styleClass="label label-default" />
+                                                                </ui:repeat>
+                                                                <ui:repeat value="#{FilePage.fileMetadata.dataFile.tagLabels}" var="tag" varStatus="loop" >
+                                                                    <h:outputText value="#{loop.first ? '&lt;br/&gt;': '' }" escape="false"/>
+                                                                    <h:outputText value="#{tag}" styleClass="label label-info"/>
+                                                                </ui:repeat>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr id="filePersistentIdBlock" jsf:rendered="#{FilePage.file.identifier != null}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadata.persistentId']}
+                                                        </th>
+                                                        <td>#{FilePage.file.getGlobalId()}</td>
+                                                    </tr>
+                                                    <tr id="fileDownloadUrlBlock" jsf:rendered="#{FilePage.publiclyDownloadable and !FilePage.fileMetadata.dataFile.filePackage}">
+                                                        <!--Only show Public download url if identifier is available -->
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.downloadUrl.label']}
+                                                        </th>
+                                                        <td>
+                                                            <p class="help-block">
+                                                                <h:outputFormat value="#{bundle['file.metadataTab.fileMetadata.downloadUrl.info']}" escape="false">
+                                                                    <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                                                    <f:param value="#{systemConfig.guidesVersion}"/>
+                                                                </h:outputFormat>
+                                                            </p>
+                                                            <code><h:outputText value="#{FilePage.publicDownloadUrl}"/></code>
+                                                        </td>
+                                                    </tr>
+                                                    <tr id="fileUnfBlock" jsf:rendered="#{!(empty FilePage.file.unf)}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.unf.label']}
+                                                        </th>
+                                                        <td>#{FilePage.file.unf}</td>
+                                                    </tr>
+                                                    <tr id="fileChecksumBlock" jsf:rendered="#{!(empty FilePage.file.checksumValue)}">
+                                                        <th scope="row">
+                                                            #{FilePage.file.tabularData ? FilePage.file.originalChecksumType : FilePage.file.checksumType}
+                                                        </th>
+                                                        <td class="checksum-block">#{FilePage.file.checksumValue}</td>
+                                                    </tr>
+                                                    <tr id="fileDepositDateBlock">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.depositDate.label']}
+                                                        </th>
+                                                        <td>#{FilePage.file.createDateFormattedYYYYMMDD}</td>
+                                                    </tr>
+                                                    <tr id="metadataReleaseDateBlock" jsf:rendered="#{FilePage.file.released}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.metadataReleaseDate.label']}
+                                                        </th>
+                                                        <td>#{FilePage.file.publicationDateFormattedYYYYMMDD}
+                                                        </td>
+                                                    </tr>
+                                                    <tr id="fileEPublicationDateBlock" jsf:rendered="#{FilePage.file.released or !(empty FilePage.file.embargo) or !(empty FilePage.file.retention)}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.publicationDate.label']}
+                                                        </th>
+                                                        <td>#{(empty FilePage.file.embargo) and !(empty FilePage.file.released) and !(empty FilePage.file.retention) ? ''.concat(FilePage.file.publicationDateFormattedYYYYMMDD).concat('; ') : ''}
+                                                            #{!(empty FilePage.file.embargo) ? ''.concat(FilePage.embargoPhrase).concat(' ').concat(FilePage.file.embargo.dateAvailable) : ''}
+                                                            #{!(empty FilePage.file.embargo) and !(empty FilePage.file.retention) ? '; ': ''}
+                                                            #{!(empty FilePage.file.retention) ? ''.concat(FilePage.retentionPhrase)
+                                                              .concat(' ').concat(FilePage.file.retention.dateUnavailable)
+                                                              .concat(', ').concat(bundle['retention.enddateinfo'])
+                                                            : ''}
+                                                            #{(empty FilePage.file.embargo and empty FilePage.file.retention)? FilePage.file.publicationDateFormattedYYYYMMDD : ''}
+                                                        </td>
+                                                    </tr>
+                                                    <tr id="fileEmbargoBlock" jsf:rendered="#{!(empty FilePage.file.embargo) and ! (empty FilePage.file.embargo.reason)}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.embargoReason.label']}
+                                                        </th>
+                                                        <td>#{FilePage.file.embargo.reason}
+                                                        </td>
+                                                    </tr>
+                                                    <tr id="fileRetentionBlock" jsf:rendered="#{!(empty FilePage.file.retention) and ! (empty FilePage.file.retention.reason)}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.retentionReason.label']}
+                                                        </th>
+                                                        <td>#{FilePage.file.retention.reason}
+                                                        </td>
+                                                    </tr>
+                                                    <tr id="fileSizeBlock" jsf:rendered="#{!(empty FilePage.file.friendlySize)}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.size.label']}
+                                                        </th>
+                                                        <td>#{FilePage.file.friendlySize}</td>
+                                                    </tr>
+                                                    <tr id="fileTypeBlock" jsf:rendered="#{!(empty FilePage.file.friendlyType)}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.type.label']}
+                                                        </th>
+                                                        <td>#{FilePage.file.friendlyType}</td>
+                                                    </tr>
+                                                    <tr id="fileVariablesBlock" jsf:rendered="#{!(empty FilePage.file.dataTable.varQuantity)}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metaData.dataFile.dataTab.variables']}
+                                                        </th>
+                                                        <td>#{FilePage.file.dataTable.varQuantity}</td>
+                                                    </tr>
+                                                    <tr id="fileObservationsBlock" jsf:rendered="#{!(empty FilePage.file.dataTable.caseQuantity)}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metaData.dataFile.dataTab.observations']}
+                                                        </th>
+                                                        <td>#{FilePage.file.dataTable.caseQuantity}</td>
+                                                    </tr>
+                                                    <tr id="filePathBlock" jsf:rendered="#{!empty FilePage.fileMetadata.directoryLabel}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.hierarchy.label']}
+                                                        </th>
+                                                        <td>#{FilePage.fileMetadata.directoryLabel}/</td>
+                                                    </tr>
+                                                    <tr id="fileDescriptionBlock" jsf:rendered="#{!(empty FilePage.fileMetadata.description)}">
+                                                        <th scope="row">
+                                                            #{bundle['file.metadataTab.fileMetadata.description.label']}
+                                                        </th>
+                                                        <td>#{FilePage.fileMetadata.description}</td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
                                         </div>
                                     </div>
                                 </div>
                             </p:tab>
-                            <ui:remove>
-                                <p:tab id="provenanceTab" title="Provenance" rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
-                                                              (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset()))}">
-                                    <!-- Placeholder -->
-                                    <em>Coming soon...</em>
-                                </p:tab>
-                            </ui:remove>
                             <p:tab id="versionsTab" title="#{bundle['file.dataFilesTab.versions']}">
-                                <ui:include src="file-versions.xhtml"></ui:include>
+                                <!-- Versions -->
+                                <ui:include src="file-versions.xhtml">
+                                  <ui:param name="anonymized" value="#{FilePage.anonymizedAccess}"/>
+                                </ui:include>
                             </p:tab>
                         </p:tabView>
                     </div>
+                    <!-- POPUPS -->
+                    <ui:include src="file-edit-popup-fragment.xhtml" rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset()}">
+                        <ui:param name="datasetVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
+                        <ui:param name="bean" value="#{FilePage}"/>
+                        <ui:param name="restrictFileAction" value="restrictFile"/>
+                        <ui:param name="deleteFileAction" value="deleteFile"/>
+                        <ui:param name="saveEmbargoAction" value="saveEmbargo"/>
+                        <ui:param name="saveRetentionAction" value="saveRetention"/>
+                        <ui:param name="updateElements" value=":fileForm:embargoInputs"/>
+                        <ui:param name="updateRetentionElements" value=":fileForm:retentionInputs"/>
 
-                    <p:dialog id="deleteFileConfirm" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteFileConfirmation" modal="true">
-                        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.immediate']}</p>
-                        <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.owner.released}">
-                            <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.failed.tip']}</p>
-                        </ui:fragment>
+                    </ui:include>
+                    <p:dialog id="shareDialog" header="#{bundle['file.share.title']}" widgetVar="shareDialog" modal="true" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                        <p class="help-block">#{bundle['file.share.tip']}</p>
+                        <div id="sharrre-widget" data-text="#{bundle['file.share.text']}" data-url="#{systemConfig.dataverseSiteUrl}/file.xhtml?#{empty FilePage.fileMetadata.dataFile.globalId ? 'fileId' : 'persistentId'}=#{empty FilePage.fileMetadata.dataFile.globalId ? FilePage.fileMetadata.dataFile.id : FilePage.fileMetadata.dataFile.globalId.asString()}&amp;version=#{FilePage.fileMetadata.datasetVersion.friendlyVersionNumber}"></div>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').hide()" 
-                                             action="#{FilePage.deleteFile()}"/>
-                            <button class="btn btn-link" onclick="PF('deleteFileConfirmation').hide()" type="button">
-                                #{bundle.cancel}
+                            <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
+                                #{bundle.close}
                             </button>
                         </div>
                     </p:dialog>
-                    <p:dialog id="downloadPopup" styleClass="largePopUp" header="#{bundle['file.downloadDialog.header']}" widgetVar="downloadPopup" modal="true">
-                         <ui:include src="file-download-popup-fragment.xhtml">
-                            <ui:param name="workingVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
-                            <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
-                            <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
-                            <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
-                            <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
-                            <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
-                        </ui:include>
-                    </p:dialog>
+
                     <p:dialog id="downloadPackagePopup" styleClass="smallPopUp" header="#{bundle['packageDownload.title']}" widgetVar="downloadPackagePopup" modal="true">
                          <ui:include src="package-download-popup-fragment.xhtml">
                             <ui:param name="workingVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
-                            <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
+                            <ui:param name="guestbookAndTermsPopupRequired" value="#{FilePage.guestbookAndTermsPopupRequired}"/>
                             <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
                             <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
                             <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
                             <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
                         </ui:include>
                     </p:dialog>
-                    <p:dialog id="requestAccessPopup" styleClass="largePopUp" header="#{bundle['file.requestAccess']}" widgetVar="requestAccessPopup" modal="true">
+                    <p:dialog id="guestbookAndTermsPopup" styleClass="largePopUp" header="#{bundle['file.downloadDialog.header']}" widgetVar="guestbookAndTermsPopup" modal="true">
                         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
-                        <ui:include src="file-request-access-popup-fragment.xhtml">
+                        <ui:include src="guestbook-terms-popup-fragment.xhtml">
                             <ui:param name="workingVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
+                            <ui:param name="someActivelyEmbargoedFiles" value="#{FilePage.cantRequestDueToEmbargo}"/>
+                            <ui:param name="guestbookAndTermsPopupRequired" value="#{FilePage.guestbookAndTermsPopupRequired}"/>
+                            <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
+                            <ui:param name="fileDownloadHelper" value="#{FilePage.fileDownloadHelper}"/>
                             <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
+                            <ui:param name="termsGuestbookPopupAction" value="#{FilePage.termsGuestbookPopupAction}"/>
+                            <ui:param name="guestbookPopupRequiredAtDownload" value="#{FilePage.guestbookPopupRequiredAtDownload}"/>
+
                         </ui:include>
                     </p:dialog>
-                    <p:dialog id="configureToolPopup" styleClass="smallPopUp" header="#{configureFragmentBean.configurePopupToolHandler.externalTool.displayName}" widgetVar="configureToolPopup" modal="true" 
-                                rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset()}">
-                        <ui:include src="file-configure-popup-fragment.xhtml">
-                            <ui:param name="externalTools" value="#{FilePage.getExternalTools()}"/>
-                            <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>
-                        </ui:include>
-                    </p:dialog>
-                    
                     <ui:include rendered="#{systemConfig.provCollectionEnabled}" src="provenance-popups-fragment.xhtml">
-                            <ui:param name="saveInPopup" value="true"/>
+                        <ui:param name="saveInPopup" value="true"/>
                     </ui:include>
-                    
                     <!-- Request Access Sign Up/Log In Button -->
                     <p:dialog id="accessGuest" header="#{bundle['file.requestAccess']}" widgetVar="accessSignUpLogIn_popup" modal="true">
                         <p class="help-block">
@@ -621,70 +699,7 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('accessSignUpLogIn_popup').hide();PF('blockDatasetForm').hide();" type="button">
-                                #{bundle.close}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <p:dialog id="accessPopup" styleClass="smallPopUp" header="#{bundle['file.restrictions']}" widgetVar="accessPopup" modal="true">
-                        <p:focus context="accessPopup"/>
-                        <p class="help-block">
-                            #{bundle['file.restrictions.description']}
-                        </p>
-                        <ui:fragment rendered="#{FilePage.worldMapPermissionHelper.hasMapLayerMetadata(FilePage.fileMetadata)}">
-                        <p class="help-block">
-                            <span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> #{bundle['file.restrictions.worldmap.warning']}</span>
-                        </p>
-                        </ui:fragment>
-                        <div class="form-horizontal">
-                            <div class="form-group">
-                                <label for="metadata_TermsAccess" class="col-sm-3 control-label">
-                                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
-                                </label>
-                                <div class="col-sm-9">
-                                    <p:inputTextarea value="#{FilePage.fileMetadata.datasetVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa"/>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="metadata_RequestAccess" class="col-sm-3 control-label">
-                                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                         data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
-                                </label>
-                                <div class="col-sm-9">
-                                    <p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}"
-                                                             value="#{FilePage.fileMetadata.datasetVersion.termsOfUseAndAccess.fileAccessRequest}" widgetVar="inputfar"/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('accessPopup').hide();" update=":messagePanel" action="#{FilePage.restrictFile(true)}"/>
-                            <button class="btn btn-link" onclick="PF('accessPopup').hide();" type="button">
-                                #{bundle.cancel}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <p:dialog id="fileAlreadyReplacedDraft" styleClass="smallPopUp"
-                              header="#{bundle['file.replaced.warning.header']}" widgetVar="fileAlreadyReplacedDraft" modal="true">
-                        <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.replaced.warning.draft.warningMessage']}</p>
-                        <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('fileAlreadyReplacedDraft').hide();" type="button">
-                                #{bundle.close}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <p:dialog id="fileAlreadyReplacedPrevious" styleClass="smallPopUp"
-                              header="#{bundle['file.replaced.warning.header']}" widgetVar="fileAlreadyReplacedPrevious" modal="true">
-                        <ui:fragment rendered="#{dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) }">
-                            <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.replaced.warning.previous.warningMessage']}</p>
-                        </ui:fragment>
-                        <ui:fragment rendered="#{!dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile)}">
-                            <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.alreadyDeleted.previous.warningMessage']}</p>
-                        </ui:fragment>
-                        <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('fileAlreadyReplacedPrevious').hide();" type="button">
+                            <button class="btn btn-default" onclick="PF('accessSignUpLogIn_popup').hide();" type="button">
                                 #{bundle.close}
                             </button>
                         </div>
@@ -698,6 +713,13 @@
                         </div>
                     </p:dialog>
                 </h:form>
+                <script>
+                    //<![CDATA[
+                    function editTerms(){
+                        PF('accessPopup').show();
+                    }
+                    //]]>
+                </script>
             </ui:define>
         </ui:composition>
     </h:body>
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index f8359f19fcf..6eb8737091d 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -13,6 +13,19 @@
     <o:importFunctions type="java.lang.Math" />
     <p:remoteCommand name="refreshPaginator" action="#{DatasetPage.refreshPaginator()}" process="@this" update="@form" />
     
+    <ui:param name="hasFileMetadata" value="#{!empty DatasetPage.workingVersion.fileMetadatas}" />
+    <ui:param name="fileMetadataCount" value="#{DatasetPage.workingVersion.fileMetadatas.size()}" />
+    <ui:param name="lockedFromEdits" value="#{DatasetPage.lockedFromEdits}" />
+    <ui:param name="hasValidTermsOfAccess" value="#{DatasetPage.hasValidTermsOfAccess}" />
+    <ui:param name="uploadButtonDisabled" value="#{lockedFromEdits or !hasValidTermsOfAccess ? 'disabled' : ''}" />
+    <ui:param name="canUpdateAndAuthenticated" value="#{DatasetPage.sessionUserAuthenticated and DatasetPage.canUpdateDataset() and !widgetWrapper.widgetView}" />
+
+    <ui:remove>
+    <!--
+    This fragment is included only on the dataset pg, empty editMode render logic
+    -->            
+    </ui:remove>
+
     <!-- Toggle Files Display Components -->
     <div jsf:id="filesDisplayToggleBlock" jsf:rendered="#{DatasetPage.fileTreeViewRequired}" class="row">
         <div class="form-group col-xs-12">
@@ -26,32 +39,37 @@
                     <f:selectItem itemLabel="#{bundle['file.display.tree']}" itemValue="Tree" />
 
                     <!-- AJAX UPDATES TO TOGGLE p:dataTable widgetVar="filesTable" AND p:tree widgetVar="filesTree" COMPONENTS BELOW -->
-                    <p:ajax update=":datasetForm" process="@this" oncomplete="bind_bsui_components();"/> 
+                    <p:ajax update=":datasetForm" process="@this"/> 
                 </p:selectOneButton>
             </div>
         </div>
     </div>
-    
-    <p:remoteCommand name="rebindCommand" process="@this" update="filesTable" oncomplete="javascript:bind_bsui_components();"/>
-    
+
+    <p:remoteCommand name="rebindCommand" process="@this" update="filesTable"/>
+
     <!-- Files Table -->
+    <!-- TABLESTYLE + WIDTH:AUTO FIX COL WIDTH OVERFLOW HIDDEN, MIN-WIDTH 100% ADDED FOR TABLE CONTENT LESS THAN 100% https://stackoverflow.com/a/38582318 -->
+    <ui:remove>
+        <!--TODO - consider moving the validateFilesOutcome param here/ other refactoring to simplify managing selection state - see issue #8180/PR #8182 -->
+    </ui:remove>
     <p:dataTable id="filesTable" 
                  rows="10" paginator="#{DatasetPage.fileMetadatasSearch.size() gt 10}" paginatorPosition="bottom"
                  paginatorTemplate="{FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} #{bundle['file.dynamicCounter.filesPerPage']} {RowsPerPageDropdown}"
                  rowsPerPageTemplate="10,25,50"
-                 style="margin-right:1px;"
+                 style="margin-right:1px;" tableStyle="min-width:100%;width:auto;"
                  value="#{DatasetPage.fileMetadatasSearch}"
                  rowIndexVar="rowNum" rowKey="#{fileMetadata.dataFile.storageIdentifier}"
-                 selection="#{DatasetPage.selectedFiles}" var="fileMetadata" widgetVar="filesTable"
-                 rendered="#{DatasetPage.fileDisplayTable and empty DatasetPage.editMode and (DatasetPage.workingVersion != null)}"
-                 emptyMessage="#{DatasetPage.workingVersion.fileMetadatas.size() == 0 ? bundle['file.notFound.tip'] : bundle['file.notFound.search']}">
+                 rowSelectMode="checkbox" selection="#{DatasetPage.selectedFiles}" var="fileMetadata" widgetVar="filesTable"
+                 rendered="#{DatasetPage.fileDisplayTable and (DatasetPage.workingVersion != null)}"
+                 emptyMessage="#{fileMetadataCount == 0 ? bundle['file.notFound.tip'] : bundle['file.notFound.search']}"
+                 ariaRowLabel="#{bundle['file.select.action']} #{fileMetadata.label}">
         <p:ajax event="page" listener="#{DatasetPage.fileListingPaginatorListener}" update="filesTable" process="@this"  oncomplete="refreshPaginator(),rebindCommand()"  immediate="true"/>
-        <p:ajax event="toggleSelect" listener="#{DatasetPage.toggleAllSelected()}" update="filesTable"  process="@this" oncomplete="rebindCommand()"  /> 
-        <p:ajax event="rowUnselectCheckbox" listener="#{DatasetPage.setSelectAllFiles(false)}" update="filesTable" process="@this" oncomplete="rebindCommand()"  />
-        <p:ajax event="rowSelect" listener="#{DatasetPage.setSelectAllFiles(false)}" update="filesTable" process="@this" oncomplete="rebindCommand()" />
-        <p:ajax event="rowSelectCheckbox" listener="#{DatasetPage.setSelectAllFiles(false)}" update="filesTable" process="@this" oncomplete="rebindCommand()"  />
-        <p:ajax event="rowUnselect" listener="#{DatasetPage.setSelectAllFiles(false)}" update="filesTable" process="@this" oncomplete="rebindCommand()" />
-        <p:ajax event="rowDblselect" listener="#{DatasetPage.setSelectAllFiles(false)}" update="filesTable" process="@this" oncomplete="rebindCommand()" />
+        <p:ajax event="toggleSelect" listener="#{DatasetPage.toggleAllSelected()}" update="@form:validateFilesOutcome, filesTable"  process="@this" oncomplete="rebindCommand()"  /> 
+        <p:ajax event="rowUnselectCheckbox" listener="#{DatasetPage.setSelectAllFiles(false)}" update="@form:validateFilesOutcome, filesTable" process="@this" oncomplete="rebindCommand()"  />
+        <p:ajax event="rowSelect" listener="#{DatasetPage.setSelectAllFiles(false)}" update="@form:validateFilesOutcome, filesTable" process="@this" oncomplete="rebindCommand()" />
+        <p:ajax event="rowSelectCheckbox" listener="#{DatasetPage.setSelectAllFiles(false)}" update="@form:validateFilesOutcome, filesTable" process="@this" oncomplete="rebindCommand()"  />
+        <p:ajax event="rowUnselect" listener="#{DatasetPage.setSelectAllFiles(false)}" update="@form:validateFilesOutcome, filesTable" process="@this" oncomplete="rebindCommand()" />
+        <p:ajax event="rowDblselect" listener="#{DatasetPage.setSelectAllFiles(false)}" update="@form:validateFilesOutcome, filesTable" process="@this" oncomplete="rebindCommand()" />
 
         <f:facet name="header">
             <div class="row form-inline" jsf:id="cloudStorageBlock" jsf:rendered="#{DatasetPage.showComputeButton()}">
@@ -75,87 +93,65 @@
                         <div id="copy-input" class="form-control">#{DatasetPage.swiftContainerName}</div>
                         <span class="input-group-btn">
                             <button class="btn btn-default btn-copy" type="button" id="copy-button" data-clipboard-action="copy" data-clipboard-target="#copy-input">
-                              <span class="glyphicon glyphicon-copy"></span> #{bundle['file.copy']}
+                                <span class="glyphicon glyphicon-copy"></span> #{bundle['file.copy']}
                             </button>
                         </span>
-                        <script>
-                            //<![CDATA[
-                            $(document).ready(function () {
-                                // clipboard.js > cloud storage copy btn
-                                var clipboard = new Clipboard('button.btn-copy');
-
-                                clipboard.on('success', function(e) {
-                                    console.log(e);
-                                });
-                                clipboard.on('error', function(e) {
-                                    console.log(e);
-                                });
-                            });
-                            //]]>
-                        </script>
                     </div>
                 </div>
             </div>
             <div jsf:id="filesHeaderBlock" class="row">
                 <div class="col-xs-5">
                     <!-- FILE SEARCH -->
-                    <div class="input-group" jsf:rendered="#{DatasetPage.workingVersion.fileMetadatas.size() gt 1}">
-                        <p:inputText id="searchFiles" styleClass="form-control" value="#{DatasetPage.fileLabelSearchTerm}" widgetVar="inputSearchTerm"
-                                     onkeypress="if (event.keyCode == 13) { submitsearch(); return false; }"/>
+                    <div class="input-group" jsf:rendered="#{fileMetadataCount gt 1}">
+                        <label id="searchLabel" class="sr-only" jsf:for="searchFiles">#{bundle.search}</label>
+                        <p:inputText id="searchFiles" title="#{bundle.search}" styleClass="form-control" value="#{DatasetPage.fileLabelSearchTerm}" widgetVar="inputSearchTerm"
+                                     onkeypress="if (event.keyCode == 13) {
+                                                 submitsearch();
+                                                 return false;
+                                             }">
+                            <f:passThroughAttribute name="aria-labelledby" value="searchLabel"/>
+                        </p:inputText>
                         <p:watermark for="searchFiles" value="#{bundle['file.search.placeholder']}"/>
-                        <h:inputHidden id="showAccessPopup" value="#{DatasetPage.showAccessPopup}"/>
                         <p:remoteCommand name="submitsearch" action="#{DatasetPage.updateFileSearch()}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true"/>
-                        
+
                         <span class="input-group-btn">
-                            <p:commandLink styleClass="btn btn-default" action="#{DatasetPage.updateFileSearch()}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true">
-                                <span class="glyphicon glyphicon-search"></span> #{bundle['dataverse.search.btn.find']}
+                            <p:commandLink title="#{bundle['dataverse.search.btn.find']}" styleClass="btn btn-default bootstrap-button-tooltip" action="#{DatasetPage.updateFileSearch()}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true"  ariaLabel="#{bundle['dataverse.search.btn.find']}">
+                                <span class="glyphicon glyphicon-search no-text"/>
                             </p:commandLink>
                         </span>
                     </div>
                 </div>
                 <div class="col-xs-7 text-right">
-                    <p:outputPanel id="filesButtons">
-                        <!-- 4.2.1: replaced permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset) with DatasetPage.canUpdateDataset() -->
-                        <!-- tab-header pull-right -->
-                        <div jsf:id="uploadComputeBlock" class="button-block pull-right no-margin-top"
-                              jsf:rendered="#{!(DatasetPage.editMode == 'FILE' or DatasetPage.editMode == 'CREATE')
-                                             and (DatasetPage.canUpdateDataset()
-                                             or (!(empty DatasetPage.workingVersion.fileMetadatas) and DatasetPage.workingVersion.fileMetadatas.size() > 1))}">
-
-                            <!-- DOWNLOAD DCM SCRIPT BUTTON -->
-                            <h:commandLink id="rsyncDLFF" actionListener="#{DatasetPage.downloadRsyncScript()}" styleClass="btn btn-default"
-                                           rendered="#{DatasetPage.sessionUserAuthenticated
-                                                                                        and DatasetPage.canUpdateDataset() and empty DatasetPage.workingVersion.fileMetadatas
-                                                                                        and !widgetWrapper.widgetView and DatasetPage.lockedDueToDcmUpload}">
-                                <span class="glyphicon glyphicon-download-alt"/> <h:outputText value=" #{bundle['file.rsyncUpload.step2.downloadScriptButton']}"/>
-                            </h:commandLink>
-
-                            <!-- UPLOAD FILES BUTTON -->
-                            <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD"
-                                          type="button" styleClass="btn btn-default btn-access #{DatasetPage.lockedFromEdits ? 'ui-state-disabled' : ''}"
-                                          disabled="#{DatasetPage.lockedFromEdits}" rendered="#{DatasetPage.sessionUserAuthenticated 
-                                                                                        and DatasetPage.canUpdateDataset()
-                                                                                        and !widgetWrapper.widgetView}">
-                                <span class="glyphicon #{DatasetPage.lockedFromEdits ? 'glyphicon-ban-circle' : 'glyphicon-plus'}"/> <h:outputText id="uploadFile-s-Link" value="#{bundle['file.uploadFiles']}"/>
-                            </h:outputLink>
-                        </div>
+                    <p:outputPanel id="filesButtons" class="button-block no-margin-top"
+                                    rendered="#{canUpdateAndAuthenticated}">
+                        <!-- DOWNLOAD DCM SCRIPT BUTTON -->
+                        <h:commandLink id="rsyncDLFF" actionListener="#{DatasetPage.downloadRsyncScript()}" styleClass="btn btn-default"
+                                       rendered="#{  hasFileMetadata and DatasetPage.lockedDueToDcmUpload}">
+                            <span class="glyphicon glyphicon-download-alt"/> <h:outputText value=" #{bundle['file.rsyncUpload.step2.downloadScriptButton']}"/>
+                        </h:commandLink>
+                        <!-- UPLOAD FILES BUTTON -->
+                        <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD"
+                                      type="button" styleClass="btn btn-default btn-access #{uploadButtonDisabled}"
+                                      disabled="#{lockedFromEdits}">
+                            <span class="glyphicon glyphicon-plus"/> <h:outputText id="uploadFile-s-Link" value="#{bundle['file.uploadFiles']}"/>
+                        </h:outputLink>
                     </p:outputPanel>
                 </div>
             </div>
-            
+
             <!-- FILES FILTER FACETS -->
-            <div class="row" style="margin-bottom:10px;" jsf:rendered="#{(DatasetPage.workingVersion.fileMetadatas.size() gt 1)}">
-                <div class="col-xs-9 text-left" jsf:rendered="#{DatasetPage.indexedVersion}">
+            <div class="row" style="margin-bottom:10px;" jsf:rendered="#{(fileMetadataCount gt 1)}">
+                <div class="col-xs-7 text-left" jsf:rendered="#{DatasetPage.indexedVersion}">
                     <div class="text-muted small" style="font-weight:normal;" jsf:rendered="#{(DatasetPage.fileMetadatasSearch.size() gt 0)}">#{bundle['file.results.filter']}</div>
                     <!-- FACET: TYPE -->
                     <div class="btn-group" style="margin-right:20px;" jsf:rendered="#{!(empty DatasetPage.fileTypeFacetLabels)}">
                         <button type="button" class="btn btn-link dropdown-toggle" style="padding:0;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             #{bundle['file.results.filter.type']} <h:outputText value="#{(empty DatasetPage.fileTypeFacet) ? bundle['file.results.filter.all'] : DatasetPage.fileTypeFacet}"
-                                                     styleClass="#{!empty DatasetPage.fileTypeFacet ? 'highlightBold' : ''}"/> <span class="caret"></span>
+                                          styleClass="#{!empty DatasetPage.fileTypeFacet ? 'highlightBold' : ''}"/> <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu">
                             <!-- link for "All" - all file types: -->
-                            <li><h:outputLink value="/dataset.xhtml">
+                            <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
                                     <h:outputText styleClass="#{empty DatasetPage.fileTypeFacet ? 'highlightBold' : ''}" value="#{bundle['file.results.filter.all']}"/>
                                     <f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
                                     <f:param name="version" value="#{DatasetPage.version}"/>
@@ -164,10 +160,12 @@
                                     <f:param name="fileTag" value="#{DatasetPage.fileTagsFacet}"/>
                                     <f:param name="fileSortField" value="#{DatasetPage.fileSortField}"/>
                                     <f:param name="fileSortOrder" value="#{DatasetPage.fileSortOrder}"/>
+                                    <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
+                                    <f:param name="folderPresort" value="#{DatasetPage.folderPresort}"/>
                                 </h:outputLink></li>
                             <li role="separator" class="divider"></li>
                             <ui:repeat value="#{DatasetPage.fileTypeFacetLabels}" var="facetLabel">
-                                <li><h:outputLink value="/dataset.xhtml">
+                                <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
                                         <h:outputFormat styleClass="#{facetLabel.name == DatasetPage.fileTypeFacet ? 'highlightBold' : ''}" value="#{facetLabel.name} &#40;{0}&#41;">
                                             <f:param value="#{facetLabel.count}"/>
                                         </h:outputFormat>
@@ -179,6 +177,8 @@
                                         <f:param name="fileTag" value="#{DatasetPage.fileTagsFacet}"/>
                                         <f:param name="fileSortField" value="#{DatasetPage.fileSortField}"/>
                                         <f:param name="fileSortOrder" value="#{DatasetPage.fileSortOrder}"/>
+                                        <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
+                                        <f:param name="folderPresort" value="#{DatasetPage.folderPresort}"/>
                                     </h:outputLink></li>
                             </ui:repeat>
                         </ul>
@@ -188,11 +188,11 @@
                     <div class="btn-group" style="margin-right:20px;" jsf:rendered="#{!(empty DatasetPage.fileAccessFacetLabels)}">
                         <button type="button" class="btn btn-link dropdown-toggle" style="padding:0;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             #{bundle['file.results.filter.access']} <h:outputText value="#{(empty DatasetPage.fileAccessFacet) ? bundle['file.results.filter.all'] : DatasetPage.fileAccessFacet}"
-                                                  styleClass="#{!empty DatasetPage.fileAccessFacet ? 'highlightBold' : ''}"/> <span class="caret"></span>
+                                          styleClass="#{!empty DatasetPage.fileAccessFacet ? 'highlightBold' : ''}"/> <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu">
                             <!-- link for "All" - i.e., all (both) types of access: -->
-                            <li><h:outputLink value="/dataset.xhtml">
+                            <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
                                     <h:outputText styleClass="#{empty DatasetPage.fileAccessFacet ? 'highlightBold' : ''}" value="#{bundle['file.results.filter.all']}"/>
                                     <f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
                                     <f:param name="version" value="#{DatasetPage.version}"/>
@@ -201,10 +201,12 @@
                                     <f:param name="fileTag" value="#{DatasetPage.fileTagsFacet}"/>
                                     <f:param name="fileSortField" value="#{DatasetPage.fileSortField}"/>
                                     <f:param name="fileSortOrder" value="#{DatasetPage.fileSortOrder}"/>
+                                    <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
+                                    <f:param name="folderPresort" value="#{DatasetPage.folderPresort}"/>
                                 </h:outputLink></li>
                             <li role="separator" class="divider"></li>
                             <ui:repeat value="#{DatasetPage.fileAccessFacetLabels}" var="facetLabel">
-                                <li><h:outputLink value="/dataset.xhtml">
+                                <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
                                         <h:outputFormat styleClass="#{facetLabel.name == DatasetPage.fileAccessFacet ? 'highlightBold' : ''}" value="#{facetLabel.name} &#40;{0}&#41;">
                                             <f:param value="#{facetLabel.count}"/>
                                         </h:outputFormat>
@@ -216,6 +218,8 @@
                                         <f:param name="fileTag" value="#{DatasetPage.fileTagsFacet}"/>
                                         <f:param name="fileSortField" value="#{DatasetPage.fileSortField}"/>
                                         <f:param name="fileSortOrder" value="#{DatasetPage.fileSortOrder}"/>
+                                        <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
+                                        <f:param name="folderPresort" value="#{DatasetPage.folderPresort}"/>
                                     </h:outputLink></li>
                             </ui:repeat>
                         </ul>
@@ -225,11 +229,11 @@
                     <div class="btn-group" style="margin-right:20px;" jsf:rendered="#{!(empty DatasetPage.fileTagsFacetLabels)}">
                         <button type="button" class="btn btn-link dropdown-toggle" style="padding:0;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             #{bundle['file.results.filter.tag']} <h:outputText value="#{(empty DatasetPage.fileTagsFacet) ? bundle['file.results.filter.all'] : DatasetPage.fileTagsFacet}"
-                                                    styleClass="#{!empty DatasetPage.fileTagsFacet ? 'highlightBold' : ''}"/> <span class="caret"></span>
+                                          styleClass="#{!empty DatasetPage.fileTagsFacet ? 'highlightBold' : ''}"/> <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu">
                             <!-- link for "All" - i.e., all file tags: -->
-                            <li><h:outputLink value="/dataset.xhtml">
+                            <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
                                     <h:outputText styleClass="#{empty DatasetPage.fileTagsFacet ? 'highlightBold' : ''}" value="#{bundle['file.results.filter.all']}"/>
                                     <f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
                                     <f:param name="version" value="#{DatasetPage.version}"/>
@@ -238,10 +242,12 @@
                                     <f:param name="fileAccess" value="#{DatasetPage.fileAccessFacet}"/>
                                     <f:param name="fileSortField" value="#{DatasetPage.fileSortField}"/>
                                     <f:param name="fileSortOrder" value="#{DatasetPage.fileSortOrder}"/>
+                                    <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
+                                    <f:param name="folderPresort" value="#{DatasetPage.folderPresort}"/>
                                 </h:outputLink></li>
                             <li role="separator" class="divider"></li>
                             <ui:repeat value="#{DatasetPage.fileTagsFacetLabels}" var="facetLabel">
-                                <li><h:outputLink value="/dataset.xhtml">
+                                <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
                                         <h:outputFormat styleClass="#{facetLabel.name == DatasetPage.fileTagsFacet ? 'highlightBold' : ''}" value="#{facetLabel.name} &#40;{0}&#41;">
                                             <f:param value="#{facetLabel.count}"/>
                                         </h:outputFormat>
@@ -253,28 +259,43 @@
                                         <f:param name="fileTag" value='"#{facetLabel.name}"'/>
                                         <f:param name="fileSortField" value="#{DatasetPage.fileSortField}"/>
                                         <f:param name="fileSortOrder" value="#{DatasetPage.fileSortOrder}"/>
+                                        <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
+                                        <f:param name="folderPresort" value="#{DatasetPage.folderPresort}"/>
                                     </h:outputLink></li>
                             </ui:repeat>
                         </ul>
                     </div>
                 </div>
+
+                    
+
                 
-                <div class="col-xs-3 text-right #{DatasetPage.indexedVersion ? '' : 'col-xs-offset-9'}">
+                <div class="file-sort col-xs-5 text-right #{DatasetPage.indexedVersion ? '' : 'col-xs-offset-7'}">
+                    <div class="file-group-by col-xs-7 text-left text-muted small" style="font-weight:normal;" jsf:rendered="#{DatasetPage.allowUserManagementOfOrder()}">
+                                    <p:selectBooleanCheckbox id="fps" value="#{DatasetPage.folderPresort}" itemLabel="#{bundle['file.results.presort.folder']}" title="#{bundle['file.results.presort.folder.desc']} rendered='#{DatasetPage.orderByFolder()}'">
+                        <p:ajax update="filesTable, messagePanel" process="fps, tps" listener="#{DatasetPage.sort()}"/>
+                    </p:selectBooleanCheckbox>
+                    <p:selectBooleanCheckbox id="tps" value="#{DatasetPage.tagPresort}" itemLabel="#{bundle['file.results.presort.tag']}" title="#{bundle['file.results.presort.tag.desc']}"  rendered='#{null != DatasetPage.getSortOrder()}'>
+                        <p:ajax update="filesTable, messagePanel" process="fps, tps" listener="#{DatasetPage.sort()}"/>
+                    </p:selectBooleanCheckbox>
+                </div>                
                     <!-- FILES SORT -->
                     <div class="btn-group">
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="glyphicon glyphicon-sort"></span> #{bundle['file.results.btn.sort']} <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu pull-right text-left">
-                            <li><h:outputLink value="/dataset.xhtml">
+                            <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
                                     <h:outputText styleClass="#{((empty DatasetPage.fileSortField) or DatasetPage.fileSortField == 'name') and (empty DatasetPage.fileSortOrder) ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.nameAZ']}"/>
                                     <f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
                                     <f:param name="version" value="#{DatasetPage.version}"/>
                                     <f:param name="q" value="#{DatasetPage.fileLabelSearchTerm}"/>
                                     <f:param name="fileTypeGroupFacet" value="#{DatasetPage.fileTypeFacet}"/>
                                     <f:param name="fileAccess" value="#{DatasetPage.fileAccessFacet}"/>
+                                    <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
+                                    <f:param name="folderPresort" value="#{DatasetPage.folderPresort}"/>
                                 </h:outputLink></li>
-                            <li><h:outputLink value="/dataset.xhtml">
+                            <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
                                     <h:outputText styleClass="#{(DatasetPage.fileSortField == 'name' and DatasetPage.fileSortOrder == 'desc') ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.nameZA']}"/>
                                     <f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
                                     <f:param name="version" value="#{DatasetPage.version}"/>
@@ -283,27 +304,31 @@
                                     <f:param name="fileAccess" value="#{DatasetPage.fileAccessFacet}"/>
                                     <f:param name="fileSortField" value="name"/>
                                     <f:param name="fileSortOrder" value="desc"/>
+                                    <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
+                                    <f:param name="folderPresort" value="#{DatasetPage.folderPresort}"/>
                                 </h:outputLink></li>
-                            <li><h:outputLink value="/dataset.xhtml">
-                                    <h:outputText styleClass="#{(DatasetPage.fileSortField == 'date' and (empty DatasetPage.fileSortOrder)) ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.newest']}"/>
+                            <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
+                                    <h:outputText styleClass="#{(DatasetPage.fileSortField == 'date' and DatasetPage.fileSortOrder == 'desc') ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.newest']}"/>
                                     <f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
                                     <f:param name="version" value="#{DatasetPage.version}"/>
                                     <f:param name="q" value="#{DatasetPage.fileLabelSearchTerm}"/>
                                     <f:param name="fileTypeGroupFacet" value="#{DatasetPage.fileTypeFacet}"/>
                                     <f:param name="fileAccess" value="#{DatasetPage.fileAccessFacet}"/>
                                     <f:param name="fileSortField" value="date"/>
+                                    <f:param name="fileSortOrder" value="desc"/>
+                                    <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
                                 </h:outputLink></li>
-                            <li><h:outputLink value="/dataset.xhtml">
-                                    <h:outputText styleClass="#{(DatasetPage.fileSortField == 'date' and DatasetPage.fileSortOrder == 'desc') ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.oldest']}"/>
+                            <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
+                                    <h:outputText styleClass="#{(DatasetPage.fileSortField == 'date' and (empty DatasetPage.fileSortOrder)) ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.oldest']}"/>
                                     <f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
                                     <f:param name="version" value="#{DatasetPage.version}"/>
                                     <f:param name="q" value="#{DatasetPage.fileLabelSearchTerm}"/>
                                     <f:param name="fileTypeGroupFacet" value="#{DatasetPage.fileTypeFacet}"/>
                                     <f:param name="fileAccess" value="#{DatasetPage.fileAccessFacet}"/>
                                     <f:param name="fileSortField" value="date"/>
-                                    <f:param name="fileSortOrder" value="desc"/>
+                                    <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
                                 </h:outputLink></li>
-                            <li><h:outputLink value="/dataset.xhtml">
+                            <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
                                     <h:outputText styleClass="#{DatasetPage.fileSortField == 'size' ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.size']}"/>
                                     <f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
                                     <f:param name="version" value="#{DatasetPage.version}"/>
@@ -311,8 +336,9 @@
                                     <f:param name="fileTypeGroupFacet" value="#{DatasetPage.fileTypeFacet}"/>
                                     <f:param name="fileAccess" value="#{DatasetPage.fileAccessFacet}"/>
                                     <f:param name="fileSortField" value="size"/>
+                                    <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
                                 </h:outputLink></li>
-                            <li><h:outputLink value="/dataset.xhtml">
+                            <li><h:outputLink rel="nofollow" value="/dataset.xhtml">
                                     <h:outputText styleClass="#{DatasetPage.fileSortField == 'type' ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.type']}"/>
                                     <f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
                                     <f:param name="version" value="#{DatasetPage.version}"/>
@@ -320,36 +346,46 @@
                                     <f:param name="fileTypeGroupFacet" value="#{DatasetPage.fileTypeFacet}"/>
                                     <f:param name="fileAccess" value="#{DatasetPage.fileAccessFacet}"/>
                                     <f:param name="fileSortField" value="type"/>
+                                    <f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
                                 </h:outputLink></li>
                         </ul>
                     </div>
                 </div>
             </div>
-            
-            <div class="row" jsf:rendered="#{DatasetPage.workingVersion.fileMetadatas.size() gt 10 and (DatasetPage.selectedFiles.size() gt 0)}">
+
+            <div class="row" jsf:rendered="#{fileMetadataCount gt 10 and (DatasetPage.selectedFiles.size() gt 0)}">
                 <div class="col-xs-12 bg-warning text-left" style="font-weight:normal;padding-top:.5em;">
                     <!-- SELECTION MESSAGE -->
                     <p>
                         <h:outputFormat value="#{bundle['file.numFilesSelected']}">
                             <f:param value="#{DatasetPage.selectedFiles.size()}"/>
                         </h:outputFormat>
-                        <ui:fragment rendered="#{DatasetPage.selectedFiles.size() lt DatasetPage.workingVersion.fileMetadatas.size()}">
-                        &#160;
-                        <p:commandLink action="#{DatasetPage.selectAllFiles}" update="@form">
-                            <h:outputFormat value="#{bundle['file.selectAllFiles']}">
-                                <f:param value="#{DatasetPage.fileMetadatasSearch.size()}"/>
-                            </h:outputFormat>
-                        </p:commandLink>
+                        <ui:fragment rendered="#{DatasetPage.selectedFiles.size() lt fileMetadataCount}">
+                            &#160;
+                            <p:commandLink action="#{DatasetPage.selectAllFiles}" update="@form">
+                                <h:outputFormat value="#{bundle['file.selectAllFiles']}">
+                                    <f:param value="#{DatasetPage.fileMetadatasSearch.size()}"/>
+                                </h:outputFormat>
+                            </p:commandLink>
                         </ui:fragment>
                         &#160;
                         <p:commandLink value="#{bundle['file.clearSelection']}" action="#{DatasetPage.clearSelection}" update="@form"/>
                     </p>
                 </div>
             </div>
+            <div class="row" jsf:rendered="#{(!DatasetPage.isVersionHasGlobus()) and (DatasetPage.sizeOfSelectedMaxNumeric gt settingsWrapper.zipDownloadLimit)
+                                             and DatasetPage.selectedFiles.size() > 1}">
+                <div class="col-xs-12 bg-warning text-left" style="font-weight:normal;padding-top:.5em;">
+                    <h:outputFormat value="#{bundle['file.zip.download.exceeds.limit']}">
+                        <f:param value="#{DatasetPage.sizeOfSelectedMaxAsString}"/>
+                        <f:param value="#{DatasetPage.zipDownloadLimitAsString}"/>
+                    </h:outputFormat>
+                </div>
+            </div>
         </f:facet>
-        
-        <p:column selectionMode="multiple" class="text-center" style="width:20px !important;"  />
-        
+
+        <p:column selectionMode="multiple" class="text-center" ariaHeaderText="#{bundle['file.select.tooltip']}"/>
+
         <p:column class="col-file-metadata">
             <f:facet name="header">
                 <div jsf:id="filesHeaderCount">
@@ -361,141 +397,42 @@
                     </h:outputFormat>
                 </div>
             </f:facet>
-            <div class="col-file-flexbox">
-                <div class="col-file-thumb pull-left">
-                    <div class="thumbnail-block text-center">
-                        <!-- Thumbnail Preview -->
-                        <span class="file-thumbnail-preview-img" jsf:rendered="#{!empty fileMetadata.dataFile.id and DatasetPage.isThumbnailAvailable(fileMetadata)}"
-                              data-container="body" data-toggle="popover" data-placement="top" data-trigger="hover" data-html="true" data-content="&lt;img src=&#34;/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=400&#34; alt=&#34;#{bundle['file.preview']} #{fileMetadata.label}&#34; /&gt;">
-                            <img src="#{DatasetPage.getDataFileThumbnailAsBase64(fileMetadata)}" alt="#{fileMetadata.label}"/>
-                        </span>
-
-                        <!-- Default Icon -->
-                        <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(fileMetadata.dataFile)} file-thumbnail-icon text-muted" jsf:rendered="#{(!empty fileMetadata.dataFile.id and !DatasetPage.isThumbnailAvailable(fileMetadata)) or (empty fileMetadata.dataFile.id and !dataFileServiceBean.isTemporaryPreviewAvailable(fileMetadata.dataFile.storageIdentifier, fileMetadata.dataFile.contentType))}"/>
-
-                        <!-- the "temp preview" is for new, not yet saved files; these should never appear on this page - as we now have the editfilespage for that, correct? -->
-                        <ui:fragment rendered="#{empty fileMetadata.dataFile.id and !empty fileMetadata.dataFile.storageIdentifier and dataFileServiceBean.isTemporaryPreviewAvailable(fileMetadata.dataFile.storageIdentifier, fileMetadata.dataFile.contentType)}">
-                            <img src="/api/access/tempPreview/#{fileMetadata.dataFile.storageIdentifier}?mimetype=#{fileMetadata.dataFile.contentType}" alt="#{fileMetadata.label}"/>
-                            <h:outputText id="imgPreview" value="#{bundle['preview']}" styleClass="bg-info text-info text-center show"/>
-                        </ui:fragment>
-
-                        <!-- Restricted File Icon -->
-                        <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">                  
-                            <span class="glyphicon glyphicon-lock text-danger"/>
-                        </div>
-                        <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata) }">
-                            <span class="icon-unlock text-success"/>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="file-metadata-block">
-                    <ui:fragment rendered="#{!empty fileMetadata.dataFile.globalIdString}">
-                        <!-- rendered="# {!(fileMetadata.datasetVersion.released or fileMetadata.datasetVersion.deaccessioned)}" -->
-                        <a href="#{widgetWrapper.wrapURL('/file.xhtml?persistentId='.concat(fileMetadata.dataFile.globalIdString).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber))}">
-                            #{fileMetadata.label}
-                        </a>
-                    </ui:fragment>
-                    <ui:fragment rendered="#{empty fileMetadata.dataFile.globalIdString}">
-                        <a href="#{widgetWrapper.wrapURL('/file.xhtml?fileId='.concat(fileMetadata.dataFile.id).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber))}">
-                            #{fileMetadata.label}
-                        </a>
-                    </ui:fragment>
-
-                    <!-- HIERARCHY + TYPE + SIZE + DATE + CHECKSUM -->
-                    <div class="text-muted small">
-                        <!-- id:#{fileMetadata.dataFile.id} -->
-                        <div jsf:rendered="#{!empty fileMetadata.directoryLabel}">
-                            <h:outputText id="fileHierarchy" value="#{fileMetadata.directoryLabel}/"/>
-                        </div>
-                        <h:outputText id="fileTypeOutputRegular" value="#{fileMetadata.dataFile.friendlyType}" rendered="#{!(fileMetadata.dataFile.tabularData)}"/>
-                        <h:outputText id="fileTypeOutputTabular" value="#{bundle['file.type.tabularData']}" rendered="#{fileMetadata.dataFile.tabularData}"/>
-                        <h:outputText id="fileSize" value=" - #{fileMetadata.dataFile.friendlySize}" rendered="#{!(DatasetPage.editMode == 'FILE' or DatasetPage.editMode == 'CREATE')}"/>
-
-                        <h:outputText id="fileCreatePublishDate" value=" - #{fileMetadata.getFileDateToDisplay()}" rendered="#{!(empty fileMetadata.id)}"/>
-
-                        <h:outputFormat id="fileDownloadCount" value=" - {0} #{bundle['metrics.downloads']}" rendered="#{!(DatasetPage.editMode == 'FILE' or DatasetPage.editMode == 'CREATE' or settingsWrapper.rsyncOnly)}">
-                            <f:param value="#{DatasetPage.getGuestbookResponseCount(fileMetadata)}"/>
-                        </h:outputFormat>
-
-                        <div class="checksum-block" style="word-break: break-all;" jsf:rendered="#{!fileMetadata.dataFile.tabularData}">
-                            <h:outputText id="file-checksum" value="#{fileMetadata.dataFile.checksumType}: #{fileMetadata.dataFile.checksumValue}" rendered="#{!(empty fileMetadata.dataFile.checksumValue) and ((DatasetPage.editMode != 'FILE' and DatasetPage.editMode != 'CREATE') or !DatasetPage.isDuplicate(fileMetadata))}"/>
-                        </div>
-                    </div>
-                    <!-- UNF + Variables, Obsersvations -->
-                    <div class="text-muted small" style="word-break: break-all;" jsf:rendered="#{fileMetadata.dataFile.tabularData}">
-                        <h:outputText id="fileNumVars" value="#{fileMetadata.dataFile.dataTable.varQuantity} #{bundle['file.metaData.dataFile.dataTab.variables']}, " rendered="#{fileMetadata.dataFile.tabularData}"/>
-                        <h:outputText id="fileNumObs" value="#{fileMetadata.dataFile.dataTable.caseQuantity} #{bundle['file.metaData.dataFile.dataTab.observations']} #{!empty fileMetadata.dataFile.unf ? ' - ' : ''}" rendered="#{fileMetadata.dataFile.tabularData}"/>
-                        <h:outputText id="fileUNF" value="#{fileMetadata.dataFile.unf}" rendered="#{!empty fileMetadata.dataFile.unf}"/>
-                    </div>
-
-                    <div class="fileDescription small" jsf:rendered="#{!(empty fileMetadata.description)}">
-                        <h:outputText id="fileDescNonEmpty" value="#{fileMetadata.description}" rendered="#{!(DatasetPage.editMode == 'FILE' or DatasetPage.editMode == 'CREATE') and !(empty fileMetadata.description)}"/>
-                    </div>
-
-                    <div class="file-tags-block #{DatasetPage.editMode == 'FILE' or DatasetPage.editMode == 'CREATE' ? 'margin-top-half' : ''}" jsf:rendered="#{!(empty fileMetadata.categories) or !(empty fileMetadata.dataFile.tags)}">
-                        <ui:fragment rendered="#{!(empty fileMetadata.categories)}">
-                            <ui:repeat value="#{fileMetadata.categories}" var="cat">
-                                <h:outputText value="#{cat.name}" styleClass="label label-default"/>
-                            </ui:repeat> 
-                        </ui:fragment>
-                        <ui:fragment >
-                            <ui:repeat value="#{fileMetadata.dataFile.tags}" var="tag">
-                                <h:outputText value="#{tag.typeLabel}" styleClass="label label-info"/>
-                            </ui:repeat>
-                        </ui:fragment>
-                    </div>
-                </div>
-            </div>
+            <ui:include src="file-info-fragment.xhtml">
+                <c:if test="#{fileMetadata != null}">
+                    <ui:param name="fileMetadata" value="#{fileMetadata}" />
+                </c:if>
+            </ui:include>
         </p:column>
 
-        <p:column class="col-file-action text-right #{settingsWrapper.rsyncOnly ? 'col-file-access' : ''}" rendered="#{!(DatasetPage.editMode == 'FILE' or DatasetPage.editMode == 'CREATE')}">
-            <f:facet name="header" class="col-file-action text-right">
+        <p:column class="col-file-action button-block text-right" style="width:40%;" ariaHeaderText="#{bundle['file.actionsBlock']}">
+            <f:facet name="header">
+                <script type="text/javascript">
+                    function downloadFiles(url, filelist) {
+                        filelist = filelist + ','; //Prevents last file from being dropped on server
+                        var form = $('<form></form>').attr('action', url).attr('method', 'post').attr('enctype', 'text/plain');
+                        form.append($("<input></input>").attr('type', 'hidden').attr('name', 'fileIds').attr('value', filelist));
+                        //Submit and then remove form
+                        form.appendTo('body').submit().remove();
+                    }
+                </script>
                 <!-- EDIT -->
                 <div style="margin-right:14px;" class="btn-group" jsf:rendered="#{DatasetPage.sessionUserAuthenticated
-                                             and DatasetPage.canUpdateDataset() and !widgetWrapper.widgetView and (DatasetPage.fileMetadatasSearch.size() gt 0)}">
+                                                                                  and DatasetPage.canUpdateDataset() and !widgetWrapper.widgetView and (DatasetPage.fileMetadatasSearch.size() gt 0)}">
                     <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown"
-                            disabled="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
+                            disabled="#{uploadButtonDisabled}">
                         <span class="glyphicon glyphicon-pencil"/> #{bundle['file.editFiles']} <span class="caret"></span>
                     </button>
-                    <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
-                        <ui:fragment rendered="#{!DatasetPage.dataset.released or !DatasetPage.workingVersion.hasPackageFile}">
-                            <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
-                                <p:commandLink onclick="testFilesSelectedForDelete();" id="deleteSelectedFile"> 
-                                    <h:outputText value="#{bundle['file.delete']}"/> 
-                                </p:commandLink>
-                            </li>
-                        </ui:fragment>    
-                            <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
-                                <p:commandLink onclick="testFilesSelectedForEditMetadata();" id="editMetadataSelectedFile" action="#{DatasetPage.editFileMetadata()}">                                         
-                                    <h:outputText value="#{bundle['file.metadata']}"/>
-                                </p:commandLink>
-                            </li>
-                            <!--no restrict on non-s3 package file -->
-                            <ui:fragment rendered="#{!settingsWrapper.publicInstall and (!DatasetPage.workingVersion.hasPackageFile or DatasetPage.workingVersion.getDataset().getStorageIdentifier().startsWith('s3://')) }">
-                                <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}"> 
-                                    <p:commandLink oncomplete="toggle_dropdown();" 
-                                                   onclick="testFilesSelectedForRestriction()">
-                                        <h:outputText value="#{bundle['file.restrict']}"/>
-                                    </p:commandLink>
-                                </li>
-                                <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
-                                    <p:commandLink update=":datasetForm,,:messagePanel" oncomplete="toggle_dropdown();" 
-                                                   action="#{DatasetPage.restrictSelectedFiles(false)}">
-                                        <h:outputText value="#{bundle['file.unrestrict']}"/>
-                                    </p:commandLink>
-                                </li>
-                            </ui:fragment>
-                            <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
-                                <p:commandLink id="fileCategoriesLinkTwo"    
-                                               onclick="testFilesSelectedForTags()">
-                                            #{bundle['file.tags']} 
-                                </p:commandLink>    
-                            </li>   
+                    <ul class="dropdown-menu multi-level pull-right text-left">
+                        <ui:include src="file-edit-button-fragment.xhtml">
+                            <ui:param name="datasetVersion" value="#{DatasetPage.workingVersion}"/>
+                            <ui:param name="fileMetadataForAction" value="#{DatasetPage.fileMetadataForAction}"/>
+                            <ui:param name="bean" value="#{DatasetPage}"/>
+                            <ui:param name="unrestrictFileAction" value="restrictFiles"/>
+                            <ui:param name="refreshTagsPopoupAction" value="refreshTagsPopUp"/>                          
+                        </ui:include>  
                     </ul>
-                    <p:remoteCommand  name="openEditFilesPageCommand2" partialSubmit="true" async="true" update="" action="#{DatasetPage.editFileMetadata()}"  />
                 </div>
-                
+
                 <!-- NOTE the disabled="{_datasetPage.lockedFromDownload}" attributes on the 6 batch download buttons below. -->
                 <!-- it looks like they were put there in order to disable downloads while the dataset is locked. -->
                 <!-- Nobody appears to remember why we would ever want to do that... especially since individual downloads -->
@@ -505,149 +442,229 @@
                 <!-- so I have replaced them with {false && DatasetPage.lockedFromDownload}. - L.A. Aug. 2018 -->
                 <div jsf:id="downloadButtonBlockNormal" class="btn-group" 
                      jsf:rendered="#{(!(empty DatasetPage.workingVersion.fileMetadatas) 
-                                    and DatasetPage.workingVersion.fileMetadatas.size() > 1) and DatasetPage.downloadButtonAvailable
-                                    and !DatasetPage.isHasTabular()}">
-                    <p:commandLink rendered="#{!(DatasetPage.downloadPopupRequired)}"
-                                    styleClass="btn btn-default btn-download"
-                                    disabled="#{false and DatasetPage.lockedFromDownload}"
-                                    update="@form"
-                                    actionListener="#{DatasetPage.validateFilesForDownload(false, false)}">
-                        <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
-                    </p:commandLink>
-                    <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-                    <p:commandLink rendered="#{DatasetPage.downloadPopupRequired}"
-                                    styleClass="btn btn-default btn-download"
-                                    disabled="#{false and DatasetPage.lockedFromDownload}"
-                                    action="#{DatasetPage.validateFilesForDownload(true, false)}"
-                                    update="@form" oncomplete="">
+                                     and fileMetadataCount > 1) and DatasetPage.downloadButtonAvailable
+                                     and  !(DatasetPage.isVersionHasTabular()||DatasetPage.isVersionHasGlobus())}">
+                    <p:commandLink 
+                                   styleClass="btn btn-default btn-download"
+                                   disabled="#{false and DatasetPage.lockedFromDownload}"
+                                   onclick="if (!testFilesSelected()) return false;" 
+                                   action="#{DatasetPage.startDownloadSelectedOriginal()}"
+                                   update="@form" oncomplete="showPopup(false);">
+                        <f:actionListener binding="#{DatasetPage.setTermsGuestbookPopupAction(bundle.download)}"/>
+                        <f:setPropertyActionListener target="#{DatasetPage.fileMetadataForAction}" value="#{null}"/>
                         <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
                     </p:commandLink>
                 </div>
-                <div jsf:id="downloadButtonBlockTabular" class="btn-group" 
+                <div jsf:id="downloadButtonBlockMultiple" class="btn-group" 
                      jsf:rendered="#{(!(empty DatasetPage.workingVersion.fileMetadatas) 
-                                    and DatasetPage.workingVersion.fileMetadatas.size() > 1) and DatasetPage.downloadButtonAvailable
-                                    and DatasetPage.isHasTabular()}">
-                        <button type="button" class="btn btn-default btn-download dropdown-toggle" data-toggle="dropdown">  
-                            <span class="glyphicon glyphicon-download-alt"/> #{bundle.download} <span class="caret"/>
-                        </button>
-                        <ul jsf:id="downloadDropdownOptions" class="dropdown-menu multi-level pull-right text-left" role="menu">
-                            <li >
-                                <p:commandLink rendered="#{!(DatasetPage.downloadPopupRequired)}"
-                                                disabled="#{false and DatasetPage.lockedFromDownload}"
-                                                update="@form"
-                                                actionListener="#{DatasetPage.validateFilesForDownload(false, true)}">
-                                    #{bundle.downloadOriginal}
-                                </p:commandLink>
-                                <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-                                <p:commandLink rendered="#{DatasetPage.downloadPopupRequired}"
-                                                disabled="#{false and DatasetPage.lockedFromDownload}"
-                                                action="#{DatasetPage.validateFilesForDownload(true, true)}"
-                                                update="@form" oncomplete="">
-                                    #{bundle.downloadOriginal}
-                                </p:commandLink>
-                            </li>
-                            <li> <!--jsf:rendered="# {DatasetPage.isTabularDataSelected()}"-->
-                                <p:commandLink rendered="#{!(DatasetPage.downloadPopupRequired)}"
-                                                disabled="#{false and DatasetPage.lockedFromDownload}"
-                                                update="@form"
-                                                actionListener="#{DatasetPage.validateFilesForDownload(false, false)}">
-                                    #{bundle.downloadArchival}
-                                </p:commandLink>
-                                <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-                                <p:commandLink rendered="#{DatasetPage.downloadPopupRequired}"
-                                                disabled="#{false and DatasetPage.lockedFromDownload}"
-                                                action="#{DatasetPage.validateFilesForDownload(true, false)}"
-                                                update="@form" oncomplete="">
-                                    #{bundle.downloadArchival}
-                                </p:commandLink>
-                            </li>
-                        </ul>
+                                     and fileMetadataCount > 1) and DatasetPage.downloadButtonAvailable
+                                     and (DatasetPage.isVersionHasTabular()||DatasetPage.isVersionHasGlobus())}">
+                    <button type="button" class="btn btn-default btn-download dropdown-toggle" data-toggle="dropdown">  
+                        <span class="glyphicon glyphicon-download-alt"/> #{bundle.download} <span class="caret"></span>
+                    </button>
+                    <ul jsf:id="downloadDropdownOptions" class="dropdown-menu multi-level pull-right text-left">
+                        <li jsf:rendered="#{DatasetPage.canDownloadFiles()}">
+                            <p:commandLink
+                                           disabled="#{false and DatasetPage.lockedFromDownload}"
+                                           update="@form" oncomplete="showPopup(false);"
+                                           onclick="if (!testFilesSelected()) return false;" 
+                                           actionListener="#{DatasetPage.startDownloadSelectedOriginal()}">
+                                <f:actionListener binding="#{DatasetPage.setTermsGuestbookPopupAction(bundle.download)}"/>
+                                <f:setPropertyActionListener target="#{DatasetPage.fileMetadataForAction}" value="#{null}"/>
+                                #{bundle.downloadOriginal}
+                            </p:commandLink>
+                        </li>
+                        <li jsf:rendered="#{DatasetPage.isVersionHasTabular() and DatasetPage.canDownloadFiles()}">
+                            <p:commandLink
+                                           disabled="#{false and DatasetPage.lockedFromDownload}"
+                                           update="@form" oncomplete="showPopup(false);"
+                                           onclick="if (!testFilesSelected()) return false;" 
+                                           actionListener="#{DatasetPage.startDownloadSelectedArchival()}">
+                            <f:actionListener binding="#{DatasetPage.setTermsGuestbookPopupAction(bundle.download)}"/>
+                            <f:setPropertyActionListener target="#{DatasetPage.fileMetadataForAction}" value="#{null}"/>
+                                #{bundle.downloadArchival}
+                            </p:commandLink>
+                        </li>
+                        <li  jsf:rendered="#{DatasetPage.isVersionHasGlobus()}"> 
+                            <p:commandLink
+                                           disabled="#{false and DatasetPage.lockedFromDownload}"
+                                           update="@form" oncomplete="showPopup(true);"
+                                           onclick="if (!testFilesSelected()) return false;" 
+                                           actionListener="#{DatasetPage.startGlobusTransfer(false, false)}">
+                            <f:actionListener binding="#{DatasetPage.setTermsGuestbookPopupAction(bundle.download)}"/>
+                            <f:setPropertyActionListener target="#{DatasetPage.fileMetadataForAction}" value="#{null}"/>
+                                #{bundle['file.globus.transfer']}
+                            </p:commandLink>
+                        </li>
+                    </ul>
                 </div>
 
                 <p:commandLink rendered="#{DatasetPage.fileAccessRequestMultiButtonRequired}"
-                                styleClass="btn btn-default btn-request"                                   
-                                update="@form" action="#{DatasetPage.requestAccessMultipleFiles()}"
-                                disabled="#{DatasetPage.locked}">
+                               styleClass="btn btn-default btn-request"
+                               update="@form, @([id$=messagePanel])" 
+                               action="#{DatasetPage.validateFilesForRequestAccess()}"
+                               disabled="#{DatasetPage.locked or !DatasetPage.fileAccessRequestMultiButtonEnabled}">
+                    <f:actionListener binding="#{DatasetPage.setTermsGuestbookPopupAction(bundle['file.requestAccess'])}"/>
                     <span class="glyphicon glyphicon-bullhorn"/> #{bundle['file.requestAccess']}
                 </p:commandLink>
                 <p:commandLink rendered="#{DatasetPage.fileAccessRequestMultiSignUpButtonRequired}"
-                                styleClass="btn btn-default btn-request"
-                                onclick="PF('accessSignUpLogIn_popup').show()"
-                                disabled="#{DatasetPage.locked}">
+                               styleClass="btn btn-default btn-request"
+                               onclick="PF('accessSignUpLogIn_popup').show()"
+                               disabled="#{DatasetPage.locked}">
                     <span class="glyphicon glyphicon-bullhorn"/> #{bundle['file.requestAccess']}
                 </p:commandLink>
-            </f:facet>          
-            <div id="txtInprogess" class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{fileMetadata.dataFile.ingestInProgress}">
+            </f:facet>
+
+            <!-- FILE LEVEL MSGs -->
+            <div class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{fileMetadata.dataFile.ingestInProgress}">
                 <!-- Ingest in progress... -->
-                #{bundle['file.ingestInProgress']}
+                <span class="glyphicon glyphicon-info-sign"/> #{bundle['file.ingestInProgress']}
             </div>
-            
-            <!---Modular configure-->
-            <ui:fragment rendered="#{!widgetWrapper.widgetView and DatasetPage.sessionUserAuthenticated and DatasetPage.canUpdateDataset() and (DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile.id).size() > 0 or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
-                <ui:include src="file-configure-dropdown-fragment.xhtml">
-                    <ui:param name="configureTools" value="#{DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile.id)}"/>
-                    <ui:param name="fileId" value="#{fileMetadata.dataFile.id}"/>
-                    <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
-                </ui:include>
-            </ui:fragment>
 
-            <div class="btn-group" jsf:rendered="#{!fileMetadata.dataFile.filePackage or
-                fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}">
-                <ui:include src="file-download-button-fragment.xhtml">
-                    <ui:param name="fileMetadata" value="#{fileMetadata}"/>
-                    <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
-                    <ui:param name="downloadPopupRequired" value="#{DatasetPage.downloadPopupRequired}"/>
-                    <ui:param name="requestAccessPopupRequired" value="#{DatasetPage.requestAccessPopupRequired}"/>
-                    <ui:param name="guestbookResponse" value="#{DatasetPage.guestbookResponse}"/>
-                    <ui:param name="guestbookResponseService" value="#{DatasetPage.guestbookResponseService}"/>
-                    <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
-                    <ui:param name="lockedFromDownload" value="#{DatasetPage.lockedFromDownload}"/>
-                    <ui:param name="exploreTools" value="#{DatasetPage.getExploreToolsForDataFile(fileMetadata.dataFile.id)}"/>
-                </ui:include>
+            <div class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{fileMetadata.dataFile.ingestProblem and DatasetPage.canUpdateDataset()}">
+                <!-- Ingest failed -->
+                <span class="glyphicon glyphicon-info-sign"/>
+                <span> #{bundle['file.ingestFailed.header']}&#160;</span>
+                <span>
+                    <a tabindex="0" role="button" class="glyphicon glyphicon-question-sign tooltip-icon"
+                       data-toggle="popover" data-placement="auto top" data-trigger="focus" data-html="true"
+                       data-content="#{DatasetPage.ingestMessage} #{fileMetadata.dataFile.ingestReportMessage}"/>
+                </span>
+            </div>
+            <div class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{fileMetadata.dataFile.containsActiveFileAccessRequestFromUser(dataverseSession.user)}">
+                <!-- Access Requested -->
+                <span class="glyphicon glyphicon-info-sign"/>
+                <span> #{bundle['file.accessRequested']}&#160;</span>
             </div>
-            <div class="col-xs-12 text-left small" jsf:rendered="#{fileMetadata.dataFile.filePackage and systemConfig.rsyncDownload 
-                and !DatasetPage.workingVersion.getDataset().getStorageIdentifier().startsWith('s3://') 
-                }">
-                <!-- Data Access for Rsync Download -->
-                <ui:include src="file-data-access-fragment.xhtml">
-                    <ui:param name="fileMetadata" value="#{fileMetadata}"/>
-                    <ui:param name="datasetVersion" value="#{DatasetPage.workingVersion}"/>
-                    <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
-                </ui:include>
+            <div class="label label-info remote-info" jsf:rendered="#{not empty fileMetadata.dataFile.storageIO.remoteStoreName}" 
+              title="#{bundle['file.remotelyStored']}">
+              <div jsf:rendered="#{not empty fileMetadata.dataFile.storageIO.remoteStoreUrl}">
+                  <a href="#{fileMetadata.dataFile.storageIO.remoteStoreUrl.toString()}" target="_blank" rel="noopener">#{fileMetadata.dataFile.storageIO.remoteStoreName}</a>
+              </div>
+              <span jsf:rendered="#{empty fileMetadata.dataFile.storageIO.remoteStoreUrl}">#{fileMetadata.dataFile.storageIO.remoteStoreName}</span>
+            </div>
+            <!-- END: FILE LEVEL MSGs -->
+                       
+            <div class="btn-group" role="group" aria-label="#{bundle['file.actionsBlock']}" jsf:rendered="#{showAccessFileButtonGroup}">
+                <!-- Access File - Download, Explore, Compute -->
+                <div class="btn-group" jsf:rendered="#{showAccessFileButtonGroup}">
+                    
+                    <!-- TO-DO FIX RSYNC LOGIC !fileMetadata.dataFile.filePackage or
+                                                    fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload -->
+                    <ui:fragment rendered="#{DatasetPage.isShowQueryButton(fileMetadata.dataFile)
+                                             and fileDownloadHelper.canDownloadFile(fileMetadata)}">                         
+                        <a class="btn-preview btn btn-link bootstrap-button-tooltip" title="#{DatasetPage.getQueryToolsForDataFile(fileMetadata.dataFile).get(0).getDisplayNameLang()}"
+                            href="#{widgetWrapper.wrapURL('/file.xhtml?'.concat(!empty fileMetadata.dataFile.globalId ? 'persistentId=' : 'fileId=').concat(!empty fileMetadata.dataFile.globalId ? fileMetadata.dataFile.globalId.asString() : fileMetadata.dataFile.id).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber)).concat('&amp;toolType=QUERY')}">
+                            <img src="#{resource['images/Robot-Icon_2.png']}"  width="32" height="32" /><span class="sr-only">#{bundle.preview} "#{empty(fileMetadata.directoryLabel) ? "":fileMetadata.directoryLabel.concat("/")}#{fileMetadata.label}"</span>
+                        </a>                       
+                     </ui:fragment>
+                                   
+                    <ui:fragment rendered="#{DatasetPage.isShowPreviewButton(fileMetadata.dataFile) and fileDownloadHelper.canDownloadFile(fileMetadata)}">
+                        <a class="btn-preview btn btn-link bootstrap-button-tooltip" title="#{DatasetPage.getPreviewToolsForDataFile(fileMetadata.dataFile).get(0).getDisplayNameLang()}"
+                            href="#{widgetWrapper.wrapURL('/file.xhtml?'.concat(!empty fileMetadata.dataFile.globalId ? 'persistentId=' : 'fileId=').concat(!empty fileMetadata.dataFile.globalId ? fileMetadata.dataFile.globalId.asString() : fileMetadata.dataFile.id).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber)).concat('&amp;toolType=PREVIEW')}">
+                            <span style="margin-top: 10px;"  class="glyphicon glyphicon-eye-open"/><span class="sr-only">#{bundle.preview} "#{empty(fileMetadata.directoryLabel) ? "":fileMetadata.directoryLabel.concat("/")}#{fileMetadata.label}"</span>
+                        </a>
+                    </ui:fragment>
+                    <a type="button" style="padding:6px 8px;" class="btn-access-file btn btn-link bootstrap-button-tooltip dropdown-toggle" 
+                       title="#{bundle['file.accessBtn']}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" tabindex="0">
+                        <span style="margin-top: 10px;" class="glyphicon glyphicon-download-alt"/><span class="sr-only">#{bundle['file.accessBtn']}</span><span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu pull-right text-left">
+                        <!-- Explore/Download/Request Button Block -->
+                        <ui:include src="file-download-button-fragment.xhtml">
+                            <ui:param name="fileMetadata" value="#{fileMetadata}"/>
+                            <ui:param name="fileMetadataForAction" value="#{DatasetPage.fileMetadataForAction}"/>
+                            <ui:param name="termsPopupRequired" value="#{DatasetPage.termsPopupRequired}"/>
+                            <ui:param name="guestbookPopupRequiredAtDownload" value="#{DatasetPage.guestbookPopupRequiredAtDownload}"/>        
+                            <ui:param name="guestbookResponse" value="#{DatasetPage.guestbookResponse}"/>
+                            <ui:param name="guestbookAndTermsPopupRequired" value="#{DatasetPage.guestbookAndTermsPopupRequired}"/>
+                            <ui:param name="guestbookResponseService" value="#{DatasetPage.guestbookResponseService}"/>
+                            <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
+                            <ui:param name="lockedFromDownload" value="#{DatasetPage.lockedFromDownload}"/>
+                            <ui:param name="exploreTools" value="#{DatasetPage.getExploreToolsForDataFile(fileMetadata.dataFile)}"/>
+                            <ui:param name="anonymized" value="#{DatasetPage.anonymizedAccess}"/>
+                            <ui:param name="bean" value="#{DatasetPage}"/>
+                        </ui:include>
+                        <!-- END: Explore/Download/Request Button Block -->
+
+                        <!-- Data Access for Rsync Download -->
+                        <ui:fragment rendered="#{fileMetadata.dataFile.filePackage and systemConfig.rsyncDownload 
+                                                 and !DatasetPage.workingVersion.getDataset().getStorageIdentifier().startsWith('s3://')}">
+                            <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
+                            <li>
+                                <p:commandLink onclick="PF('rsyncDataAccessPopup').show()">
+                                    #{bundle['file.dataFilesTab.dataAccess']}
+                                </p:commandLink>
+                            </li>
+                        </ui:fragment>
+                        <!-- END: Data Access for Rsync Download -->
+                    </ul>
+                </div>
+
+                <!-- File Options -->
+                <div class="btn-group" jsf:rendered="#{!widgetWrapper.widgetView 
+                                                        and DatasetPage.sessionUserAuthenticated 
+                                                        and DatasetPage.canUpdateDataset()
+                                                        and hasValidTermsOfAccess
+                                                        and DatasetPage.isFileDeleted(fileMetadata.dataFile)}">
+                    <a type="button" class="btn-file-options btn btn-link bootstrap-button-tooltip dropdown-toggle #{lockedFromEdits ? 'disabled' : ''}" 
+                       disabled="#{lockedFromEdits ? 'disabled' : ''}"
+                       title="#{bundle['file.optionsBtn']}" onclick="PF('fileAlreadyDeletedPrevious').show()"
+                       tabindex="0">
+                        <span class="glyphicon glyphicon-option-vertical"/><span class="sr-only">#{bundle['file.optionsBtn']}</span>
+                    </a>                    
+                </div>                
+                <div class="btn-group" jsf:rendered="#{!widgetWrapper.widgetView 
+                                                        and DatasetPage.sessionUserAuthenticated 
+                                                        and DatasetPage.canUpdateDataset()
+                                                        and hasValidTermsOfAccess
+                                                        and !DatasetPage.isFileDeleted(fileMetadata.dataFile)}">
+                    <!-- Kebab / Edit / File Options Dropdown -->
+                    <a type="button" class="btn-file-options btn btn-link bootstrap-button-tooltip dropdown-toggle #{lockedFromEdits ? 'disabled' : ''}" 
+                       disabled="#{lockedFromEdits ? 'disabled' : ''}"
+                       title="#{bundle['file.optionsBtn']}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                       tabindex="0">
+                        <span class="glyphicon glyphicon-option-vertical"/><span class="sr-only">#{bundle['file.optionsBtn']}</span><span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu multi-level pull-right text-left">
+                        <li class="dropdown-header">#{bundle['file.optionsBtn.header.edit']} <span class="glyphicon glyphicon-pencil"/></li>                           
+                        <!-- TO-DO NEW FILE-LEVEL EDIT OPTIONS... RENDER LOGIC, LINKS, DISABLED LOGIC -->
+                        <!-- Edit Options -->
+                        <ui:include src="file-edit-button-fragment.xhtml">
+                            <ui:param name="datasetVersion" value="#{DatasetPage.workingVersion}"/>
+                            <ui:param name="fileMetadata" value="#{fileMetadata}"/>
+                            <ui:param name="fileMetadataForAction" value="#{DatasetPage.fileMetadataForAction}"/>
+                            <ui:param name="isDraftReplacementFile" value="#{false}"/>
+                            <ui:param name="hasPackageFile" value="#{fileMetadata.dataFile.filePackage}"/>                                
+                            <ui:param name="configureTools" value="#{DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile)}"/>
+                            <ui:param name="bean" value="#{DatasetPage}"/>
+                            <ui:param name="unrestrictFileAction" value="restrictFiles"/>
+                        </ui:include>
+                    </ul>
+                </div>
+                <!-- END: File Options -->
             </div>
         </p:column>
     </p:dataTable>
-    
+
     <!-- Files Tree -->
     <p:tree id="filesTree" style="width:100%;"
             rendered="#{DatasetPage.fileDisplayTree}"
             widgetVar="filesTree"
             value="#{DatasetPage.filesTreeRoot}"
             var="node">
-        
         <p:treeNode expandedIcon="ui-icon ui-icon-folder-open" collapsedIcon="ui-icon ui-icon-folder-collapsed">
             <!-- For a folder, the node payload is just its name as a String object, that we display here: -->
-            <h:outputText value="#{node}" />
+            <h:outputText value="#{node}"/>
         </p:treeNode>
-
         <p:treeNode type="customFileNode">
             <!-- For a file, the payload data ("node") is the corresponding FileMetadata object: -->
-            <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(node.dataFile)} text-muted" />
-            
-            <!-- same approach to rendering file page links, as in the file table above: -->
-            <!-- if the file has the global id, we use that; if not, we use the database id in the url. -->
-            <ui:fragment rendered="#{!empty node.dataFile.globalIdString}">
-                <a href="#{widgetWrapper.wrapURL('/file.xhtml?persistentId='.concat(node.dataFile.globalIdString).concat('&amp;version=').concat(DatasetPage.workingVersion.friendlyVersionNumber))}">
-                    #{node.label}
-                </a>
-            </ui:fragment>
-            <ui:fragment rendered="#{empty node.dataFile.globalIdString}">
-                <a href="#{widgetWrapper.wrapURL('/file.xhtml?fileId='.concat(node.dataFile.id).concat('&amp;version=').concat(DatasetPage.workingVersion.friendlyVersionNumber))}">
-                    #{node.label}
-                </a>
-            </ui:fragment>
-            
+            <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(node.dataFile)} text-muted"/>
+            <!-- conditional render in file page links, if file has global id, use that; if not, we use database id -->
+            <a href="#{widgetWrapper.wrapURL('/file.xhtml?'.concat(!empty node.dataFile.globalId ? 'persistentId=' : 'fileId=').concat(!empty node.dataFile.globalId ? node.dataFile.globalId.asString() : node.dataFile.id).concat('&amp;version=').concat(DatasetPage.workingVersion.friendlyVersionNumber))}">
+                #{node.label}
+            </a>
             <span class="text-muted">(#{node.dataFile.friendlySize})</span>
         </p:treeNode>
-    </p:tree>
+    </p:tree>      
 </ui:composition>
diff --git a/src/main/webapp/guestbook-preview-popup-fragment.xhtml b/src/main/webapp/guestbook-preview-popup-fragment.xhtml
new file mode 100644
index 00000000000..5a873d88107
--- /dev/null
+++ b/src/main/webapp/guestbook-preview-popup-fragment.xhtml
@@ -0,0 +1,82 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:o="http://omnifaces.org/ui"
+                xmlns:jsf="http://xmlns.jcp.org/jsf"
+                xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
+        
+        <ui:fragment rendered="#{enableEdit}">
+            <div class="text-right">
+                <h:outputLink styleClass="btn btn-default"                             
+                              value="/guestbook.xhtml?id=#{selectedGuestbook.id}&#38;ownerId=#{ownerId}">
+                    <span class="glyphicon glyphicon-pencil"></span> #{bundle['dataset.manageGuestbooks.tab.action.btn.edit']}
+                </h:outputLink>
+            </div>
+        </ui:fragment>
+    
+        <div class="form-horizontal">
+            <p class="help-block">
+                #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook.title']}
+            </p>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">
+                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook']}
+                </label>
+                <div class="col-sm-8">
+                    <p class="form-control-static">
+                        #{selectedGuestbook.name}
+                    </p>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">
+                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
+                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
+                </label>
+                <div class="col-sm-8">
+                    <p class="form-control-static">
+                        <h:outputText value="#{bundle['dataset.manageGuestbooks.guestbook.accountInformation']}"/>
+                        <ul>
+                            <ui:repeat value="#{selectedGuestbook.requiredAccountInformation}" var="ai">
+                                <li>
+                                    <h:outputText value="#{ai} #{bundle['dataset.manageGuestbooks.guestbook.required']}"/>
+                                </li>
+                            </ui:repeat>
+                            <ui:repeat value="#{selectedGuestbook.optionalAccountInformation}" var="ai">
+                                <li>
+                                    <h:outputText value="#{ai} #{bundle['dataset.manageGuestbooks.guestbook.optional']}"/>
+                                </li>
+                            </ui:repeat>
+                        </ul>
+                    </p>
+                    
+                    <ui:fragment rendered="#{!empty selectedGuestbook.requiredQuestionsList or !empty selectedGuestbook.optionalQuestionsList}">
+                    <p class="form-control-static">
+                        <h:outputText value="#{bundle['dataset.manageGuestbooks.guestbook.customQuestions']}"/>
+                        <ul>
+                            <ui:repeat value="#{selectedGuestbook.requiredQuestionsList}" var="q">
+                                <li>
+                                    <h:outputText value="#{q} #{bundle['dataset.manageGuestbooks.guestbook.required']}"/>
+                                </li>
+                            </ui:repeat>
+                            <ui:repeat value="#{selectedGuestbook.optionalQuestionsList}" var="q">
+                                <li>
+                                    <h:outputText value="#{q} #{bundle['dataset.manageGuestbooks.guestbook.optional']}"/>
+                                </li>
+                            </ui:repeat>
+                        </ul>
+                    </p>
+                    </ui:fragment>
+                </div>
+            </div>
+        </div>
+        <div class="button-block">
+            <button class="btn btn-default" onclick="PF('viewGuestbook').hide()" type="button">
+                #{bundle.close}
+            </button>
+        </div>
+</ui:composition>
diff --git a/src/main/webapp/guestbook-responses.xhtml b/src/main/webapp/guestbook-responses.xhtml
index d09de393bf5..bb158fef6d9 100644
--- a/src/main/webapp/guestbook-responses.xhtml
+++ b/src/main/webapp/guestbook-responses.xhtml
@@ -20,7 +20,8 @@
         </f:metadata>
         <ui:composition template="/dataverse_template.xhtml">
             <ui:param name="pageTitle" value="#{bundle['dataset.guestbookResponses.pageTitle']}"/>
-
+            <ui:param name="dataverse" value="#{guestbookResponsesPage.dataverse}"/>
+            <ui:param name="showMessagePanel" value="#{true}"/>
             <ui:define name="body">
                 <h:form id="manageGuestbooksForm">
                     <p:fragment id="tooManyEntries" rendered="#{guestbookResponsesPage.guestbook.responseCount gt systemConfig.guestbookResponsesPageDisplayLimit}">
@@ -85,8 +86,12 @@
                             <h:outputText value="#{response[4]}"/>
                         </p:column>
                         <p:column headerText="#{bundle['dataset.guestbooksResponses.customQuestions']}" >
-                            <ui:repeat value="#{response[5]}" var="customQResponse"><b>#{customQResponse[0]}: </b>#{customQResponse[1]} <br></br></ui:repeat>
-                        </p:column> 
+                            <ui:repeat value="#{response[5]}" var="customQResponse">
+                            <b><h:outputText value="#{customQResponse[0]}"/>: </b>
+                            <h:outputText escape="false" value="#{customQResponse[1]}"/>
+                            <br />
+                            </ui:repeat>
+                        </p:column>
                     </p:dataTable>
                 </h:form>
             </ui:define>
diff --git a/src/main/webapp/guestbook-terms-popup-fragment.xhtml b/src/main/webapp/guestbook-terms-popup-fragment.xhtml
new file mode 100644
index 00000000000..7d157fcb72c
--- /dev/null
+++ b/src/main/webapp/guestbook-terms-popup-fragment.xhtml
@@ -0,0 +1,335 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:o="http://omnifaces.org/ui"
+                xmlns:jsf="http://xmlns.jcp.org/jsf"
+                xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
+                
+    <ui:fragment rendered="#{DatasetPage.editMode != 'CREATE'}">
+        <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
+        <p:focus context="guestbookUIFragment"/>
+        <ui:fragment rendered="#{termsGuestbookPopupAction != bundle.download}">
+            <p class="help-block">
+                #{someActivelyEmbargoedFiles ? bundle['file.requestAccessTermsDialog.embargoed.tip'] : bundle['file.requestAccessTermsDialog.tip']}
+            </p>
+            <p class="help-block" jsf:rendered="#{someActivelyEmbargoedFiles}">
+                #{bundle['file.requestAccessTermsDialog.embargoed']}
+            </p>
+        </ui:fragment>
+        <ui:fragment rendered="#{termsGuestbookPopupAction != bundle.download}">
+            <p class="help-block">
+                #{bundle['file.downloadDialog.tip']}
+            </p>
+        </ui:fragment>
+        <div class="form-horizontal terms">
+        <div class="form-group">
+            <label jsf:for="fdLicense" class="col-sm-3 control-label">
+                #{bundle['file.dataFilesTab.terms.list.license']} </label>
+            <div class="col-sm-9">
+                <p class="help-block">
+                    <h:outputText
+                        value="#{bundle['file.dataFilesTab.terms.list.license.view.description']}"
+                        escape="false" />
+                </p>
+                <p>
+                    <o:importFunctions
+                        type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
+                    <img
+                        src="#{DatasetUtil:getLicenseIcon(workingVersion)}"
+                        title="#{DatasetUtil:getLicenseDescription(workingVersion)}"
+                        style="display: none" onload="this.style.display='inline'" />
+                    <a
+                        href="#{DatasetUtil:getLicenseURI(workingVersion)}"
+                        title="#{DatasetUtil:getLicenseDescription(workingVersion)}"
+                        target="_blank">#{DatasetUtil:getLicenseName(workingVersion)}
+                    </a>
+                    <ui:fragment
+                        rendered="#{empty workingVersion.termsOfUseAndAccess.license}">
+                        <h:outputText rendered="#{!datasetVersionServiceBean.isVersionDefaultCustomTerms(workingVersion)}"
+                            value="#{bundle['file.dataFilesTab.terms.list.license.customterms.txt']}"
+                            escape="false" />
+                    </ui:fragment>
+                </p>
+            </div>
+        </div>
+
+        <ui:fragment rendered="#{empty workingVersion.termsOfUseAndAccess.license}">
+            <div class="form-group"
+                jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfUse}">
+                <label jsf:for="fdTermsOfuse" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
+                </label>
+                <h:outputText id="fdTermsOfUse" class="col-sm-6"
+                    value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfUse)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.confidentialityDeclaration}">
+                <label jsf:for="fdConfidentialityDeclaration"
+                    class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
+                </label>
+                <h:outputText id="fdConfidentialityDeclaration" class="col-sm-6"
+                    value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.confidentialityDeclaration)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.specialPermissions}">
+                <label jsf:for="fdSpecialPermissions" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
+                </label>
+                <h:outputText id="fdSpecialPermissions" class="col-sm-6"
+                    value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.specialPermissions)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.restrictions}">
+                <label jsf:for="fdRestrictions" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
+                </label>
+                <h:outputText id="fdRestrictions" class="col-sm-6"
+                    value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.restrictions)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.citationRequirements}">
+                <label jsf:for="fdCitationRequirements"
+                    class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
+                </label>
+                <h:outputText id="fdCitationRequirements" class="col-sm-6"
+                    value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.citationRequirements)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.depositorRequirements}">
+                <label jsf:for="fdDepositorRequirements"
+                    class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
+                </label>
+                <h:outputText id="fdDepositorRequirements" class="col-sm-6"
+                    value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.depositorRequirements)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.conditions}">
+                <label jsf:for="fdConditions" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
+                </label>
+                <h:outputText id="fdConditions" class="col-sm-6"
+                    value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.conditions)}"
+                    escape="false" />
+            </div>
+            <div class="form-group"
+                jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.disclaimer}">
+                <label jsf:for="fdDisclaimer" class="col-sm-3 control-label">
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
+                </label>
+                <h:outputText id="fdDisclaimer" class="col-sm-6"
+                    value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.disclaimer)}"
+                    escape="false" />
+            </div>
+        </ui:fragment>
+        <div class="form-group"
+            jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfAccess and (hasRestrictedFile or !empty fileDownloadHelper.filesForRequestAccess)}">
+            <label jsf:for="fdTermsOfAccess" class="col-sm-3 control-label">
+                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
+            </label>
+            <h:outputText id="fdTermsOfAccess" class="col-sm-6"
+                value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfAccess)}"
+                escape="false" />
+        </div>
+            <p:fragment rendered="#{guestbookAndTermsPopupRequired and guestbookPopupRequired}" id="guestbookUIFragment">
+                <div class="container messagePanel">
+                    <iqbs:messages collapsible="true" />
+                </div>
+                <!--
+                Only validate the active context. For example, the user might be filling out
+                the guestbook on the Preview tab rather than after clicking the "download file"
+                button, even though the form is the same and on the same page. Without this boolean
+                in place, invalid fields on the other form (the non-active form) are checked, leading
+                to a validation failure.
+                -->
+                <ui:param name="validateThisContext" value="DO_GB_VALIDATION_#{popupContext}"/>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label" for="guestbookuser_nameText">
+                            #{bundle.name}
+                        <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{workingVersion.dataset.guestbook.nameRequired}" />
+                    </label>
+                    <div class="col-sm-6">
+                        <p:inputText id="guestbookuser_nameText"
+                                     required="#{param[validateThisContext] and workingVersion.dataset.guestbook.nameRequired}"
+                                     styleClass="form-control" value="#{guestbookResponse.name}"
+                                     requiredMessage="#{bundle['requiredField']}"
+                                     >
+                        </p:inputText>
+                        <p:message id="nameMessages" for="guestbookuser_nameText" display="text"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label" for="guestbookuser_email">
+                        #{bundle.email}
+                        <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{workingVersion.dataset.guestbook.emailRequired}" />
+                    </label>
+                    <div class="col-sm-6">
+                        <p:inputText id="guestbookuser_email" required="#{param[validateThisContext] and workingVersion.dataset.guestbook.emailRequired}"
+                                     styleClass="form-control" value="#{guestbookResponse.email}"
+                                     requiredMessage="#{bundle['requiredField']}"
+                                     >
+                        </p:inputText>
+                        <p:message id="emailMessages" for="guestbookuser_email" display="text"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label" for="guestbookuser_institution">
+                        #{bundle.institution}
+                        <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{workingVersion.dataset.guestbook.institutionRequired}" />
+                    </label>
+                    <div class="col-sm-6">
+                        <p:inputText id="guestbookuser_institution" required="#{param[validateThisContext] and workingVersion.dataset.guestbook.institutionRequired}"
+                                     styleClass="form-control" value="#{guestbookResponse.institution}"
+                                     requiredMessage="#{bundle['requiredField']}"
+                                     >
+                        </p:inputText>
+                        <p:message id="institutionMessages" for="guestbookuser_institution" display="text"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label" for="guestbookuser_position">
+                        #{bundle.position}
+                        <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{workingVersion.dataset.guestbook.positionRequired}" />
+                    </label>
+                    <div class="col-sm-6">
+                        <p:inputText id="guestbookuser_position"  required="#{param[validateThisContext] and workingVersion.dataset.guestbook.positionRequired}"
+                                     styleClass="form-control" value="#{guestbookResponse.position}"
+                                     requiredMessage="#{bundle['requiredField']}"
+                                     >
+                        </p:inputText>
+                        <p:message id="positionMessages" for="guestbookuser_position" display="text"/>
+                    </div>
+                </div>
+                <div class="form-group" jsf:rendered="#{!empty workingVersion.dataset.guestbook.customQuestions}">
+                    <label class="col-sm-3 control-label">
+                        #{bundle['dataset.guestbookResponse.guestbook.additionalQuestions']}
+                    </label>
+                    <div class="col-sm-6">
+                        <ui:repeat value="#{guestbookResponse.customQuestionResponses}" var="customQuestionResponse">
+                            <div class="text-left">
+                                <label class="control-label">
+                                    <h:outputText value="#{customQuestionResponse.customQuestion.questionString} "/>
+                                    <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{customQuestionResponse.customQuestion.required}" />
+                                </label>
+                                <p:inputText id="customQuestionResponse"
+                                             styleClass="form-control" value="#{customQuestionResponse.response}"
+                                             required="#{param[validateThisContext] and customQuestionResponse.customQuestion.required}"
+                                             rendered="#{customQuestionResponse.customQuestion.questionType=='text'}"
+                                             requiredMessage="#{bundle['requiredField']}">
+                                </p:inputText>
+                                <p:message id="cqMessages" for="customQuestionResponse" display="text"/>
+                                <p:inputTextarea id="customQuestionResponseTextArea" rows="8" autoResize="true"
+                                             styleClass="form-control"
+                                             value="#{customQuestionResponse.response}"
+                                             required="#{param['DO_GB_VALIDATION'] and customQuestionResponse.customQuestion.required}"
+                                             rendered="#{customQuestionResponse.customQuestion.questionType=='textarea'}"
+                                             requiredMessage="#{bundle['requiredField']}"/>
+                                <p:message id="cqMessagesTA" for="customQuestionResponseTextArea" display="text"/>
+                                <p:selectOneMenu id="customQuestionResponseSelect"
+                                                 styleClass="form-control" value="#{customQuestionResponse.response}"
+                                                 required="#{param[validateThisContext] and customQuestionResponse.customQuestion.required}"
+                                                 rendered="#{customQuestionResponse.customQuestion.questionType=='options'}"
+                                                 requiredMessage="#{bundle['requiredField']}">
+                                    <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true" />
+                                    <f:selectItems value="#{customQuestionResponse.responseSelectItems}" />
+                                </p:selectOneMenu>
+                                <p:message id="cqrsMessages" for="customQuestionResponseSelect" display="text"/>
+                            </div>
+                        </ui:repeat>
+                    </div>
+                </div>
+            </p:fragment>
+        </div>
+        <div class="button-block" jsf:rendered="#{termsGuestbookPopupAction == bundle.download}">
+        <!--
+            The "process" directive below is very important. Without it, the
+            setters on the GuestbookResponse object can be called twice leading
+            to form values (name, email, etc) to be overwritten by the object in
+            the other context. For example, "name" in the Preview tab could get
+            overwritten by "name" in the download popup with either a blank
+            value or a prefilled value, leading to a botched guestbook entry.
+            
+            Experimentation was done with adding process="downloadPopup" to the
+            non-Preview tab buttons but this caused a ComponentNotFoundException
+            and didn't solve any problems. If you add logging to print out
+            setName from Guestbook response, you can see that the setters are
+            called on the GuestbookResponse object from the Preview tab but they
+            are later overwritten by the setters on the GuestbookResponse object
+            from the Download popup.
+            -->
+            <!--REGULAR DOWNLOAD BUTTON, NO EXTERNAL TOOL, NOT THE PREVIEW TAB-->
+            <!--Note: the guestbookResponse.fileFormat is being set in xhtml via the initial download buttons in file-download-button-fragment.xhtml -->
+            
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}"
+                             rendered="#{guestbookResponse.fileFormat != 'externalTool' and
+                                         guestbookResponse.fileFormat != 'package' and
+                                         popupContext != 'previewTab' and not isGlobusTransfer}"
+                             actionListener="#{fileDownloadHelper.writeGuestbookAndStartDownload(guestbookResponse, false)}"
+                             update="guestbookUIFragment">
+                <f:param name="DO_GB_VALIDATION_#{popupContext}" value="true"/>
+            </p:commandButton>
+            <!--  REGULAR GLOBUS TRANSFER -->
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}"
+                             rendered="#{guestbookResponse.fileFormat != 'externalTool' and
+                                         guestbookResponse.fileFormat != 'package' and
+                                         popupContext != 'previewTab' and isGlobusTransfer}"
+                             actionListener="#{fileDownloadHelper.writeGuestbookAndStartDownload(guestbookResponse, true)}"
+                             update="guestbookUIFragment">
+                <f:param name="DO_GB_VALIDATION_#{popupContext}" value="true"/>
+            </p:commandButton>
+                        <!--PREVIEW TAB BUTTON-->
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}"
+                             rendered="#{popupContext == 'previewTab'}"
+                             actionListener="#{FilePage.showPreview(guestbookResponse)}"
+                             process="previewTab"
+                             update="fileForm:tabView">
+                <f:param name="DO_GB_VALIDATION_#{popupContext}" value="true"/>
+            </p:commandButton>
+            <!--EXTERNAL TOOL BUTTON-->
+            <!--On the dataset page (but not the file page), "tool" is null so we get the tool from the guestbookResponse.-->
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat == 'externalTool'}"
+                             action="#{fileDownloadHelper.writeGuestbookAndLaunchExploreTool(guestbookResponse, fileMetadata, tool)}"
+                             update="guestbookUIFragment">
+                <f:param name="DO_GB_VALIDATION_#{popupContext}" value="true"/>
+            </p:commandButton>
+            <!--PACKAGE FILE BUTTON-->
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat == 'package'}"
+                             actionListener="#{fileDownloadHelper.writeGuestbookAndLaunchPackagePopup(guestbookResponse)}"
+                             update="guestbookUIFragment">
+                <f:param name="DO_GB_VALIDATION_#{popupContext}" value="true"/>
+            </p:commandButton>
+            <button class="btn btn-link" onclick="PF('guestbookAndTermsPopup').hide();PF('blockDatasetForm').hide();" type="button">
+                #{bundle.cancel}
+            </button>
+        </div>
+        <div class="button-block" jsf:rendered="#{termsGuestbookPopupAction == bundle['file.requestAccess']}">
+        <!--TODO - add "Accept and" if ToA exist?-->
+            <p:commandLink type="button" styleClass="btn btn-default" rendered="#{!guestbookPopupRequiredAtDownload}" value="#{bundle['file.requestAccess']}"
+                    actionListener="#{fileDownloadHelper.writeGuestbookResponseAndRequestAccess(guestbookResponse)}"
+                    update="guestbookUIFragment"
+                    oncomplete="if (!args || (args &amp;&amp; !args.validationFailed)){PF('guestbookAndTermsPopup').hide();window.location.replace(window.location.href);}">
+                    <f:param name="DO_GB_VALIDATION_#{popupContext}" value="true"/>
+            </p:commandLink>
+
+            <p:commandLink type="button" styleClass="btn btn-default" rendered="#{guestbookPopupRequiredAtDownload}" value="#{bundle['file.requestAccess']}"
+                    actionListener="#{fileDownloadHelper.requestAccessIndirect()}"
+                    update="guestbookUIFragment"
+                    oncomplete="if (!args || (args &amp;&amp; !args.validationFailed)){PF('guestbookAndTermsPopup').hide();window.location.replace(window.location.href);}">
+                    <f:param name="DO_GB_VALIDATION_#{popupContext}" value="true"/>
+            </p:commandLink>
+
+            <button type="button" class="btn btn-default" onclick="PF('guestbookAndTermsPopup').hide();PF('blockDatasetForm').hide();" value="#{bundle.cancel}">#{bundle.cancel}</button>
+        </div>
+    </ui:fragment>
+</ui:composition>
diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
index 7528e4057c3..04bf30614fe 100644
--- a/src/main/webapp/guestbook.xhtml
+++ b/src/main/webapp/guestbook.xhtml
@@ -15,17 +15,17 @@
             <ui:param name="dataverse" value="#{GuestbookPage.guestbook.dataverse}"/>
             <ui:param name="guestbook" value="#{GuestbookPage.guestbook}"/>
             <ui:param name="showMessagePanel" value="#{true}"/>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewParam name="id" value="#{GuestbookPage.guestbookId}"/>
                     <f:viewParam name="ownerId" value="#{GuestbookPage.ownerId}"/>
                     <f:viewParam name="sourceId" value="#{GuestbookPage.sourceId}"/>
-                    <f:viewParam name="editMode" value="#{GuestbookPage.editMode}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                     <f:viewAction action="#{GuestbookPage.init}" />
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(GuestbookPage.dataverse, (GuestbookPage.editMode == 'CREATE' ? bundle['dataset.manageGuestbooks.createBtn'] : GuestbookPage.guestbook.name))}"/>
                 </f:metadata>
-
+            </ui:define>
+            <ui:define name="body">
                 <h:form id="guestbookForm">
                     <p:focus context="guestbookForm"/>
                     <!-- Header / Button Panel -->
@@ -45,6 +45,14 @@
                         </div>
                     </ui:fragment>
 
+                    <div class="alert alert-info">
+                        <span class="glyphicon glyphicon-info-sign"></span>
+                        <h:outputFormat value=" #{bundle['dataset.manageGuestbooks.noGuestbooks.learnMore']}" escape="false">
+                            <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                            <f:param value="#{systemConfig.guidesVersion}"/>
+                        </h:outputFormat>
+                    </div>
+
                     <!-- Tabs -->
                     <div class="form-horizontal" jsf:rendered="#{!empty GuestbookPage.editMode}">
                         <div class="form-group">
@@ -110,6 +118,7 @@
                                                             <h:selectOneMenu id="questionOptions" styleClass="form-control" value="#{cq.questionType}"
                                                                              onchange="#{GuestbookPage.toggleQuestionType(cq)}">
                                                                 <f:selectItem itemLabel="#{bundle['dataset.manageGuestbooks.guestbook.customQuestions.questionType.text']}" itemValue="text" />
+                                                                <f:selectItem itemLabel="#{bundle['dataset.manageGuestbooks.guestbook.customQuestions.questionType.textarea']}" itemValue="textarea" />
                                                                 <f:selectItem itemLabel="#{bundle['dataset.manageGuestbooks.guestbook.customQuestions.questionType.multiple']}" itemValue="options" />
                                                                 <p:ajax update=":guestbookForm:customQuestions" />
                                                                 <f:param name="SKIP_VALIDATION" value="true"/>
@@ -145,13 +154,13 @@
                                                             <div class="col-sm-4 field-add-delete">
                                                                 <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip nolabel-field-btn" 
                                                                                title="#{bundle.add}">
-                                                                    <p:ajax update=":guestbookForm:customQuestions" oncomplete="javascript:bind_bsui_components();" listener="#{GuestbookPage.addCustomQuestionValue(cq, resCount.index + 1)}" />
+                                                                    <p:ajax update=":guestbookForm:customQuestions" listener="#{GuestbookPage.addCustomQuestionValue(cq, resCount.index + 1)}" />
                                                                     <f:param name="SKIP_VALIDATION" value="true"/>
                                                                     <span class="glyphicon glyphicon-plus no-text"/>
                                                                 </p:commandLink>
                                                                 <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip nolabel-field-btn" 
                                                                                title="#{bundle.delete}" rendered="#{cq.customQuestionValues.size() > 1}">
-                                                                    <p:ajax update=":guestbookForm:customQuestions" oncomplete="javascript:bind_bsui_components();" listener="#{GuestbookPage.removeCustomQuestionValue(cq, resCount.index)}" />
+                                                                    <p:ajax update=":guestbookForm:customQuestions" listener="#{GuestbookPage.removeCustomQuestionValue(cq, resCount.index)}" />
                                                                     <f:param name="SKIP_VALIDATION" value="true"/>
                                                                     <span class="glyphicon glyphicon-minus no-text"/>
                                                                 </p:commandLink>
@@ -168,13 +177,13 @@
                                             <div class="col-sm-3 field-add-delete">
                                                 <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip compound-field-btn"
                                                                title="#{bundle.add}">
-                                                    <p:ajax update=":guestbookForm:customQuestions" oncomplete="javascript:bind_bsui_components();" listener="#{GuestbookPage.addCustomQuestion(valCount.index + 1 )}" />
+                                                    <p:ajax update=":guestbookForm:customQuestions" listener="#{GuestbookPage.addCustomQuestion(valCount.index + 1 )}" />
                                                     <f:param name="SKIP_VALIDATION" value="true"/>
                                                     <span class="glyphicon glyphicon-plus no-text"/>
                                                 </p:commandLink>
                                                 <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip compound-field-btn" rendered="#{GuestbookPage.guestbook.customQuestions.size() > 1}"
                                                                title="#{bundle.delete}">
-                                                    <p:ajax update=":guestbookForm:customQuestions" oncomplete="javascript:bind_bsui_components();" listener="#{GuestbookPage.removeCustomQuestion(valCount.index)}" />
+                                                    <p:ajax update=":guestbookForm:customQuestions" listener="#{GuestbookPage.removeCustomQuestion(valCount.index)}" />
                                                     <f:param name="SKIP_VALIDATION" value="true"/>
                                                     <span class="glyphicon glyphicon-minus no-text"/>
                                                 </p:commandLink>
@@ -197,4 +206,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/webapp/guestbookResponseFragment.xhtml b/src/main/webapp/guestbookResponseFragment.xhtml
index baa9eab92ef..08fdf63ea5a 100644
--- a/src/main/webapp/guestbookResponseFragment.xhtml
+++ b/src/main/webapp/guestbookResponseFragment.xhtml
@@ -12,7 +12,7 @@
                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
                 </label>
                 <div class="col-sm-6">
-                    <textarea class="form-control" rows="4" readonly="readonly">#{DatasetPage.workingVersion.termsOfUse}</textarea>
+                    <textarea id="guestbook_tou" class="form-control" rows="4" readonly="readonly">#{DatasetPage.workingVersion.termsOfUse}</textarea>
                 </div>
             </div>
             <div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfAccess}">
@@ -20,7 +20,7 @@
                     #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
                 </label>
                 <div class="col-sm-6">
-                    <textarea class="form-control" rows="4" readonly="readonly">#{DatasetPage.workingVersion.termsOfAccess}</textarea>
+                    <textarea id="guestbook_toa" class="form-control" rows="4" readonly="readonly">#{DatasetPage.workingVersion.termsOfAccess}</textarea>
                 </div>
             </div>
             <ui:fragment rendered="#{DatasetPage.dataset.guestbook != null}">
@@ -30,7 +30,7 @@
                         <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{DatasetPage.dataset.guestbook.nameRequired}" />
                     </label>
                     <div class="col-sm-6">
-                        <h:inputText styleClass="form-control" value="#{DatasetPage.guestbookResponse.name}"/>
+                        <h:inputText id="guestbookuser_name" styleClass="form-control" value="#{DatasetPage.guestbookResponse.name}"/>
                     </div>
                 </div>
                 <div class="form-group">
@@ -39,7 +39,7 @@
                         <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{DatasetPage.dataset.guestbook.emailRequired}" />
                     </label>
                     <div class="col-sm-6">
-                        <h:inputText styleClass="form-control" value="#{DatasetPage.guestbookResponse.email}"/>
+                        <h:inputText id="guestbookuser_email" styleClass="form-control" value="#{DatasetPage.guestbookResponse.email}"/>
                     </div>
                 </div>
                 <div class="form-group">
@@ -48,7 +48,7 @@
                         <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{DatasetPage.dataset.guestbook.institutionRequired}" />
                     </label>
                     <div class="col-sm-6">
-                        <h:inputText styleClass="form-control" value="#{DatasetPage.guestbookResponse.institution}"/>
+                        <h:inputText id="guestbookuser_institution" styleClass="form-control" value="#{DatasetPage.guestbookResponse.institution}"/>
                     </div>
                 </div>
                 <div class="form-group">
@@ -57,11 +57,11 @@
                         <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{DatasetPage.dataset.guestbook.positionRequired}" />
                     </label>
                     <div class="col-sm-6">
-                        <h:inputText styleClass="form-control" value="#{DatasetPage.guestbookResponse.position}"/>
+                        <h:inputText id="guestbookuser_position" styleClass="form-control" value="#{DatasetPage.guestbookResponse.position}"/>
                     </div>
                 </div>
                 <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataset.guestbook.customQuestions}">
-                    <label class="col-sm-3 control-label" for="guestbookuser_questions">
+                    <label class="col-sm-3 control-label">
                         #{bundle['dataset.guestbookResponse.guestbook.additionalQuestions']}
                     </label>
                     <div class="col-sm-6">
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index 4190cb313d0..4b5736566c2 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -15,7 +15,7 @@
             <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
             <f:viewAction action="#{harvestingClientsPage.init}"/>
             <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse())}"/>
-            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb('/dashboard.xhtml?dataverseId='.concat(dataverse.id), bundle['dashboard.title'])}"/>
+            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb('/dashboard.xhtml'.concat(empty param.dataverseId ? '': '?dataverseId='.concat(param.dataverseId)), bundle['dashboard.title'])}"/>
             <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb(bundle['harvestclients.title'])}"/>
         </f:metadata>
         <ui:composition template="/dataverse_template.xhtml">
@@ -31,7 +31,7 @@
                                 <p:commandLink type="button" id="addClientEmpty" styleClass="btn btn-default margin-bottom"
                                                actionListener="#{harvestingClientsPage.initNewClient}"
                                                update=":harvestingClientsForm:newHarvestingClientDialog"
-                                               oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');bind_bsui_components();">
+                                               oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');">
                                     <span class="glyphicon glyphicon-plus"/> #{bundle['harvestclients.btn.add']}
                                 </p:commandLink>
                             </div>
@@ -88,7 +88,7 @@
                                         <p:commandLink style="margin-left:1em;" id="addClient" styleClass="btn btn-default"
                                                         actionListener="#{harvestingClientsPage.initNewClient}"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');bind_bsui_components();">
+                                                        oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');">
                                              <span class="glyphicon glyphicon-plus"/> #{bundle['harvestclients.btn.add']}
                                          </p:commandLink>
                                     </div>
@@ -125,7 +125,7 @@
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{harvestClient.harvestingNow or harvestClient.deleteInProgress}"
                                                    action="#{harvestingClientsPage.editClient(harvestClient)}"
-                                                   oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');bind_bsui_components();"
+                                                   oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');"
                                                    update=":harvestingClientsForm,:harvestingClientsForm:newHarvestingClientDialog"
                                                    title="#{bundle['harvestclients.tab.header.action.btn.edit']}">
                                         <span class="glyphicon glyphicon-pencil no-text"></span>
@@ -133,7 +133,7 @@
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{harvestClient.harvestingNow or harvestClient.deleteInProgress}"
                                                    action="#{harvestingClientsPage.setClientForDelete(harvestClient)}"
-                                                   oncomplete="PF('deleteConfirmation').show();bind_bsui_components();"
+                                                   oncomplete="PF('deleteConfirmation').show();"
                                                    update=":harvestingClientsForm, :messagePanel,:harvestingClientsForm:clientsTable, :harvestingClientsForm:deleteConfirmation, :harvestingClientsForm:newHarvestingClientDialog"
                                                    title="#{bundle['harvestclients.tab.header.action.btn.delete']}">
                                         <span class="glyphicon glyphicon-trash no-text"></span>
@@ -203,6 +203,20 @@
                                         <p class="help-block" jsf:rendered="#{harvestingClientsPage.createMode}">#{bundle['harvestclients.newClientDialog.nickname.helptext']}</p>
                                     </div>
                                 </div>
+                                <!-- sourcename: -->
+                                <div class="form-group">
+                                    <label for="sourcename" class="col-sm-2 control-label">
+                                        <span>
+                                            #{bundle['harvestclients.newClientDialog.sourcename']}
+                                        </span>
+                                    </label>
+                                    <div class="col-sm-9">
+                                        <p:inputText id="sourcename" styleClass="form-control"
+                                                     value="#{harvestingClientsPage.sourceName}" />
+                                        <p:message for="sourcename"/>
+                                        <p class="help-block">#{bundle['harvestclients.newClientDialog.sourcename.helptext']}</p>
+                                    </div>
+                                </div>
 
                                 <!-- harvest type: (only oai, presently) -->
                                 <div class="form-group">
@@ -274,19 +288,33 @@
                                             <p:ajax process="@this" event="itemSelect" />
                                             <p:ajax process="@this" event="itemUnselect" />
                                         </p:autoComplete>
-                                        <script>
-                                            handle_dropdown_popup_scroll();
-                                        </script>
                                         <p:message for="destinationDataverseMenu"/>
                                     </div>
                                 </div>
+                                
+                                <!-- (optional): custom header -->
+                                <div class="form-group">
+                                    <label for="customHeader" class="col-sm-2 control-label">
+                                        <span>
+                                            #{bundle['harvestclients.newClientDialog.customHeader']} 
+                                        </span>
+                                    </label>
+                                    <div class="col-sm-9">
+                                        <p:inputText id="customHeader" styleClass="form-control"
+                                                     value="#{harvestingClientsPage.newCustomHeader}"
+                                                     binding="#{harvestingClientsPage.newClientCustomHeaderInputField}"/>
+                                        <p:watermark for="customHeader" value="#{bundle['harvestclients.newClientDialog.customHeader.watermark']}" id="watermark1" />
+                                        <p:message for="customHeader"/>
+                                        <p class="help-block" jsf:rendered="#{harvestingClientsPage.createMode}">#{bundle['harvestclients.newClientDialog.customHeader.helptext']}</p>
+                                    </div>
+                                </div>
 
                                 <div class="form-group">
                                     <div class="col-sm-9 col-sm-offset-2 button-block">
                                         <p:commandLink rendered="#{!harvestingClientsPage.initialSettingsValidated}"
                                                         id="validateInitialSettingsBtn"
                                                         styleClass="btn btn-default"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
                                                         action="#{harvestingClientsPage.validateInitialSettings()}">
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
@@ -320,13 +348,18 @@
                                             <f:selectItems value="#{harvestingClientsPage.oaiSetsSelectItems}" />
                                         </p:selectOneMenu>
                                         <p:message for="serverOaiSets"/>
-                                        <!-- a readonly label, in "edit existing client" mode: -->
+                                        <!-- a readonly label, in "edit existing client" mode: (No longer needed, since we now allow editing sets in existing clients! -->
                                         <p:inputText rendered="#{false}"
                                                      readonly="true"
                                                      styleClass="form-control"
                                                      value="#{harvestingClientsPage.newOaiSet}"/>
                                         <p class="help-block" jsf:rendered="#{harvestingClientsPage.createMode and !empty harvestingClientsPage.oaiSetsSelectItems}">#{bundle['harvestclients.newClientDialog.oaiSets.helptext']}</p>
                                         <p class="help-block" jsf:rendered="#{harvestingClientsPage.createMode and empty harvestingClientsPage.oaiSetsSelectItems}">#{bundle['harvestclients.newClientDialog.oaiSets.helptext.noset']}</p>
+                                        
+                                        <p class="help-block" jsf:rendered="#{harvestingClientsPage.setListTruncated}">
+                                            <span class="glyphicon glyphicon-warning-sign text-warning"/>
+                                            #{bundle['harvestclients.newClientDialog.oaiSets.listTruncated']}
+                                        </p>
                                     </div>
                                 </div>
 
@@ -339,7 +372,7 @@
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['harvestclients.newClientDialog.oaiMetadataFormat.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
-                                        <!-- select menu, shown in "create new client" mode, after the server has been contacted and we got the list of available metadata formats: -->
+                                        <!-- select menu; it's populated by contacting the remote server and obtaining the list of available metadata formats: -->
                                         <p:selectOneMenu id="oaiMetadataFormat"
                                                          binding="#{harvestingClientsPage.metadataFormatMenu}"
                                                          styleClass="form-control"
@@ -350,11 +383,11 @@
                                             <f:selectItems value="#{harvestingClientsPage.oaiMetadataFormatSelectItems}" />
                                         </p:selectOneMenu>
                                         <p:message for="oaiMetadataFormat"/>
-                                        <!-- a readonly label, in "edit existing client" mode: -->
-                                        <p:inputText rendered="#{harvestingClientsPage.editMode}"
-                                                     readonly="true"
+                                        <!-- a readonly label, in "edit existing client" mode: (No longer needed! - since we now allow formats to be edited) -->
+                                        <!-- p:inputText rendered="#{harvestingClientsPage.editMode}"
+                                                     readonly="false" 
                                                      styleClass="form-control"
-                                                     value="#{harvestingClientsPage.selectedClient.metadataPrefix}"/>
+                                                     value="#{harvestingClientsPage.selectedClient.metadataPrefix}"/ -->
                                     </div>
                                 </div>
 
@@ -363,14 +396,14 @@
                                         <p:commandLink id="createStepTwoPrevious"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         action="#{harvestingClientsPage.backToStepOne()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                         </p:commandLink>
                                         <p:commandLink id="createStepTwoNext"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         action="#{harvestingClientsPage.goToStepThree()}">
                                             <f:param name="DO_VALIDATION" value="true"/>
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
@@ -457,14 +490,14 @@
                                         <p:commandLink id="createStepThreePrevious"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         action="#{harvestingClientsPage.backToStepTwo()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                         </p:commandLink>
                                         <p:commandLink id="createStepThreeNext"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         action="#{harvestingClientsPage.goToStepFour()}">
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
                                         </p:commandLink>
@@ -487,8 +520,12 @@
                                     </label>
                                     <div class="col-sm-6">
                                         <p:selectOneMenu id="harvestingStyle"
-                                                         styleClass="form-control" value="#{harvestingClientsPage.newHarvestingStyle}"
-                                                         rendered="#{harvestingClientsPage.initialSettingsValidated}">
+                                                         binding="#{harvestingClientsPage.remoteArchiveStyleMenu}"
+                                                         styleClass="form-control" 
+                                                         value="#{harvestingClientsPage.newHarvestingStyle}"
+                                                         rendered="#{harvestingClientsPage.initialSettingsValidated}"
+                                                         validator="#{harvestingClientsPage.validateRemoteArchiveStyle}">
+                                            <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true" />
                                             <f:selectItems value="#{harvestingClientsPage.harvestingStylesSelectItems}" />
                                         </p:selectOneMenu>
                                         <p:message for="harvestingStyle"/>
@@ -529,7 +566,7 @@
                                         <p:commandLink id="createStepFourPrevious"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
-                                                        oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newHarvestingClientForm').show();"
                                                         action="#{harvestingClientsPage.backToStepThree()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                         </p:commandLink>
@@ -539,7 +576,7 @@
                                                        value="#{bundle['harvestclients.newClientDialog.btn.create']}"
                                                        update="newHarvestingClientDialogContent :messagePanel :harvestingClientsForm clientsTable emptyClientsTable"
                                                        actionListener="#{harvestingClientsPage.createClient}"
-                                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();bind_bsui_components();">
+                                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();">
                                             <f:param name="DO_VALIDATION" value="true"/>
                                         </p:commandLink>
                                         <p:commandLink styleClass="btn btn-default"
@@ -547,7 +584,9 @@
                                                        value="#{bundle['harvestclients.viewEditDialog.btn.save']}"
                                                        update="newHarvestingClientDialogContent :messagePanel :harvestingClientsForm clientsTable emptyClientsTable"
                                                        actionListener="#{harvestingClientsPage.saveClient}"
-                                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();bind_bsui_components();"/>
+                                                       oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();">
+                                            <f:param name="DO_VALIDATION" value="true"/>
+                                        </p:commandLink>
                                         <button class="btn btn-link" jsf:rendered="#{harvestingClientsPage.initialSettingsValidated}" onclick="PF('newHarvestingClientForm').hide()" type="button">
                                             #{bundle.cancel}
                                         </button>
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index 908512f6b63..a9f4ab2fd71 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -15,7 +15,7 @@
             <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
             <f:viewAction action="#{harvestingSetsPage.init}"/>
             <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse())}"/>
-            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb('/dashboard.xhtml?dataverseId='.concat(dataverse.id), bundle['dashboard.title'])}"/>   
+            <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb('/dashboard.xhtml'.concat(empty param.dataverseId ? '': '?dataverseId='.concat(param.dataverseId)), bundle['dashboard.title'])}"/>   
             <f:viewAction action="#{dataverseHeaderFragment.addBreadcrumb(bundle['harvestserver.title'])}"/>
         </f:metadata>
         <ui:composition template="/dataverse_template.xhtml">
@@ -57,7 +57,7 @@
                                 <p:commandLink id="addSetEmpty" styleClass="btn btn-default margin-bottom"
                                                actionListener="#{harvestingSetsPage.initNewSet}"
                                                update=":harvestingSetsForm:newOAISetDialog"
-                                               oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');bind_bsui_components();">
+                                               oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');">
                                     <span class="glyphicon glyphicon-plus"/> #{bundle['harvestserver.btn.add']}
                                 </p:commandLink>
                             </div>
@@ -111,7 +111,7 @@
                                         <p:commandLink id="addSet" styleClass="btn btn-default"
                                                        actionListener="#{harvestingSetsPage.initNewSet}"
                                                        update=":harvestingSetsForm:newOAISetDialog"
-                                                       oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');bind_bsui_components();">
+                                                       oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');">
                                             <span class="glyphicon glyphicon-plus"/> #{bundle['harvestserver.btn.add']}
                                         </p:commandLink>
                                     </div>
@@ -157,7 +157,7 @@
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{oaiSet.updateInProgress or oaiSet.deleteInProgress}"
                                                    action="#{harvestingSetsPage.editSet(oaiSet)}"
-                                                   oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');bind_bsui_components();"
+                                                   oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');"
                                                    update=":harvestingSetsForm:newOAISetDialog"
                                                    title="#{bundle['harvestserver.tab.header.action.btn.edit']}">
                                         <span class="glyphicon glyphicon-pencil no-text"></span>
@@ -165,7 +165,7 @@
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{oaiSet.defaultSet or oaiSet.updateInProgress or oaiSet.deleteInProgress}"
                                                    action="#{harvestingSetsPage.setSelectedSet(oaiSet)}"
-                                                   oncomplete="PF('deleteConfirmation').show();bind_bsui_components();"
+                                                   oncomplete="PF('deleteConfirmation').show();"
                                                    update=":harvestingSetsForm,:harvestingSetsForm:deleteConfirmation,:harvestingSetsForm:newOAISetDialog"
                                                    title="#{bundle['harvestserver.tab.header.action.btn.delete']}">
                                         <span class="glyphicon glyphicon-trash no-text"></span>
@@ -244,7 +244,7 @@
                                     <div class="col-sm-8 col-sm-offset-3 button-block">
                                         <p:commandLink id="validateSetQueryBtn"
                                                          styleClass="btn btn-default"
-                                                         oncomplete="PF('newOAISetForm').show();bind_bsui_components();"
+                                                         oncomplete="PF('newOAISetForm').show();"
                                                          update=":harvestingSetsForm:newOAISetDialog"
                                                          action="#{harvestingSetsPage.validateSetQuery()}">
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
@@ -296,7 +296,7 @@
                                             <p:commandLink id="backToQuery"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingSetsForm:newOAISetDialog"
-                                                        oncomplete="PF('newOAISetForm').show();bind_bsui_components();"
+                                                        oncomplete="PF('newOAISetForm').show();"
                                                         action="#{harvestingSetsPage.backToQuery()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                             </p:commandLink>
@@ -305,7 +305,7 @@
                                                            value="#{bundle['harvestserver.newSetDialog.btn.create']}"
                                                            update="newOAISetDialogContent :messagePanel :harvestingSetsForm setsTable emptySetsTable"
                                                            actionListener="#{harvestingSetsPage.createSet}"
-                                                           oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();bind_bsui_components();">
+                                                           oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();">
                                                 <f:param name="DO_VALIDATION" value="true"/>
                                             </p:commandLink>
                                             <p:commandLink styleClass="btn btn-default"
@@ -313,7 +313,7 @@
                                                            value="#{bundle['harvestserver.viewEditDialog.btn.save']}"
                                                            update="newOAISetDialogContent :messagePanel :harvestingSetsForm setsTable emptySetsTable"
                                                            actionListener="#{harvestingSetsPage.saveSet}"
-                                                           oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();bind_bsui_components();"/>
+                                                           oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();"/>
                                             <button class="btn btn-link" jsf:rendered="#{harvestingSetsPage.setQueryValidated}" onclick="PF('newOAISetForm').hide()" type="button">
                                                 #{bundle.cancel}
                                             </button>
diff --git a/src/main/webapp/iframe.xhtml b/src/main/webapp/iframe.xhtml
index 735de3bc23d..1c5c1397ed2 100644
--- a/src/main/webapp/iframe.xhtml
+++ b/src/main/webapp/iframe.xhtml
@@ -59,7 +59,7 @@
             //]]>
         </script>
     </h:head>
-    <h:body>
+    <h:body styleClass="widget-view">
         <f:loadBundle basename="propertyFiles.Bundle" var="bundle"/>
         <f:metadata>
             <f:viewParam name="persistentId" value="#{DatasetPage.persistentId}"/>
diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
index 12312bc0a0b..d2b0ec5e434 100644
--- a/src/main/webapp/loginpage.xhtml
+++ b/src/main/webapp/loginpage.xhtml
@@ -40,7 +40,7 @@
 
                     <div class="col-md-12">
                         <div class="col-md-6 col-md-offset-3">
-                            <h2><span class="glyphicon glyphicon-log-in" /> #{bundle.login}</h2>
+                            <h1><span class="glyphicon glyphicon-log-in" /> #{bundle.login}</h1>
 
                             <div id="builtinProvider" jsf:rendered="#{LoginPage.authProvider.id == 'builtin'}">
                                 <h:form id="loginForm" styleClass="form-horizontal">
@@ -61,14 +61,14 @@
                                             </div>
                                         </ui:fragment>
                                     </ui:remove>
-                                    <ui:repeat id="credentialsContainer" value="#{LoginPage.filledCredentials}" var="fc">
+                                    <ui:repeat id="credentialsContainer" value="#{LoginPage.filledCredentials}" var="fc" varStatus="fcCount">
                                         <div class="form-group text-left">
-                                            <label class="col-sm-4 control-label" for="credValue">
+                                            <label class="col-sm-4 control-label" for="loginForm:credentialsContainer:#{fcCount.index}:#{fc.credential.secret ? 'sC':'c'}redValue">
                                                 #{bundle[fc.credential.key]}
                                             </label>
                                             <div class="col-sm-8">
                                                 <h:inputText rendered="#{not fc.credential.secret}" value="#{fc.value}" id="credValue" styleClass="form-control"/>
-                                                <p:message rendered="#{not fc.credential.secret}" for="credValue" display="text"/>
+                                                <p:message rendered="#{not fc.credential.secret}" for="loginForm:credentialsContainer:1:sCredValue" display="text"/>
 						<h:inputSecret rendered="#{fc.credential.secret}" value="#{fc.value}" id="sCredValue" styleClass="form-control" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
                                                 <p:message rendered="#{fc.credential.secret}" for="sCredValue" display="text"/>
                                             </div>
@@ -113,13 +113,9 @@
                                             <f:param value="#{systemConfig.guidesVersion}"/>
                                         </h:outputFormat>
                                         <h:outputFormat value="#{bundle['login.institution.support.blurbwithLink']}" escape="false">
-                                            <o:param>
-                                                <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
-                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                                </p:commandLink>                               
+                                            <o:param>      
+                                                <p:commandLink value="#{settingsWrapper.supportTeamName}" onclick ="clickSupportLink();" >
+                                                </p:commandLink>
                                             </o:param>
                                         </h:outputFormat>
                                     </p>
@@ -189,9 +185,10 @@
                                 <div class="form-group text-left">
                                     <div class="col-sm-12">
                                         <h:outputLink styleClass="btn btn-default" value="#{OAuth2Page.linkFor(LoginPage.authProvider.id, LoginPage.redirectPage)}">
-                                            <h:graphicImage rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value="/resources/images/orcid_16x16.png" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], bundle['auth.providers.title.orcid'])}"/>
-					    <h:outputText rendered="#{not fn:contains(LoginPage.authProvider.id, 'orcid')}" value="#{LoginPage.getLoginButtonText()}"/>
-					    <h:outputText rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value=" #{bundle['login.button.orcid']}"/>
+                                            <o:importFunctions type="edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP" />
+                                            <h:graphicImage rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value="#{OrcidOAuth2AP:getLogo()}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], bundle['auth.providers.title.orcid'])}"/>
+                                            <h:outputText rendered="#{not fn:contains(LoginPage.authProvider.id, 'orcid')}" value="#{LoginPage.getLoginButtonText()}"/>
+                                            <h:outputText rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value=" #{bundle['login.button.orcid']}"/>
                                         </h:outputLink>
                                         <ui:fragment rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}">
                                             <p class="help-block small" style="margin-top:1em;">
@@ -206,7 +203,7 @@
                             </div>
 
                             <div id="otherProviders" jsf:rendered="#{LoginPage.listAuthenticationProviders().size() > 1}">
-                                <h4>#{bundle['auth.providers.title']}</h4>
+                                <h3>#{bundle['auth.providers.title']}</h3>
                                 <h:form>
                                     <ui:repeat value="#{LoginPage.listAuthenticationProviders()}" var="provider">
                                         <p:commandLink rendered="#{provider.id != LoginPage.authProvider.id}" styleClass="btn btn-default" actionListener="#{LoginPage.setAuthProviderById(provider.id)}" update="login-container">
@@ -224,7 +221,7 @@
                                 </div>
                             </div>
                             
-                            <div id="signUpLink">
+                            <div id="signUpLink" jsf:rendered="#{dataverseHeaderFragment.signupAllowed}">
                                 <p class="help-block margin-top">
                                     <h:outputFormat value="#{bundle['login.signup.blurb']}" escape="false">
                                         <f:param value="#{dataverseHeaderFragment.getSignupUrl(navigationWrapper.redirectPage)}"/>
diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml
index 706c8f7ea74..ed63540cf96 100644
--- a/src/main/webapp/manage-groups.xhtml
+++ b/src/main/webapp/manage-groups.xhtml
@@ -24,7 +24,7 @@
                         <div class="pull-right">
                             <p:commandLink id="createGroup" styleClass="btn btn-default"
                                            actionListener="#{manageGroupsPage.initExplicitGroupDialog}"
-                                           update="explicitGroupNewDialog" oncomplete="PF('explicitGroupForm').show();handleResizeDialog('explicitGroupNewDialog');bind_bsui_components();">
+                                           update="explicitGroupNewDialog" oncomplete="PF('explicitGroupForm').show();handleResizeDialog('explicitGroupNewDialog');">
                                 <span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.manageGroups.createBtn']}
                             </p:commandLink>
                         </div>
@@ -70,13 +70,13 @@
                                     <div class="btn-group" role="group">
                                         <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGroupsPage.viewSelectedGroup(explicitGroup)}"
-                                                       oncomplete="PF('viewGroup').show();bind_bsui_components();"
+                                                       oncomplete="PF('viewGroup').show();"
                                                        update=":manageGroupsForm"
                                                        title="#{bundle['dataverse.manageGroups.tab.action.btn.edit']}">
                                             <span class="glyphicon glyphicon-edit"></span>
                                         </p:commandLink>
                                         <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
-                                                       action="#{manageGroupsPage.setSelectedGroup(explicitGroup)}"
+                                                       action="#{manageGroupsPage.clickDeleteGroup(explicitGroup)}"
                                                        update="@form"
                                                        oncomplete="PF('deleteConfirmation').show()"
                                                        title="#{bundle['dataverse.manageGroups.tab.action.btn.delete']}">
@@ -87,13 +87,13 @@
                             </p:column>
                         </p:dataTable>
                     </div>
-                    <p:dialog id="deleteGroupConfirm" rendered="#{manageGroupsPage.showDeletePopup}" header="#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.header']}" widgetVar="deleteConfirmation" modal="true">
+                    <p:dialog id="deleteGroupConfirm" header="#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.header']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="help-block">
                             <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.tip']}</span>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.deleteGroup()}" update="@all"/>
-                            <p:commandButton styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.unrenderDeletePopup()}" update="@all"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" rendered="#{manageGroupsPage.renderDeletePopup}"  onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.deleteGroup()}" update="manageGroupsForm,messagePanel"/>
+                            <p:commandButton styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()"/>
                         </div>
                     </p:dialog>
                     <p:dialog id="viewGroup" styleClass="largePopUp" header="#{bundle['dataverse.manageGroups.tab.action.btn.view.dialog.header']}" widgetVar="viewGroup" modal="true">
@@ -122,6 +122,7 @@
                                                     value="#{manageGroupsPage.selectedGroupAddRoleAssignees}"
                                                     completeMethod="#{manageGroupsPage.completeRoleAssignee}"
                                                     var="roleAssignee"
+                                                    onkeypress="return event.keyCode !== 13;"
                                                     styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
                                                     itemLabel="#{roleAssignee.displayInfo.title}" itemValue="#{roleAssignee}" converter="roleAssigneeConverter">
                                         <p:column>
@@ -134,15 +135,13 @@
                                         <p:ajax process="@this" event="itemSelect" />
                                         <p:ajax process="@this" event="itemUnselect" />
                                     </p:autoComplete>
-                                    <script>
-                                        handle_dropdown_popup_scroll();
-                                    </script>
                                     <!-- <p:message for="roleAssigneeName" display="text"/> -->
                                 </div>
                             </div>
                         </div>
                         <p:dataTable id="groupMembers"
                                      var="groupMember"
+                                     rendered="#{manageGroupsPage.selectedGroup != null}"
                                      value="#{manageGroupsPage.getExplicitGroupMembers(manageGroupsPage.selectedGroup)}">
                             <!-- Member Name -->
                             <p:column width="31%"
@@ -168,10 +167,10 @@
                         </p:dataTable>
                         <!-- Add Group Members -->
                         <div class="button-block">
-                            <p:commandButton id="saveGroup" styleClass="btn btn-default"
+                            <p:commandButton id="saveGroup" styleClass="btn btn-default" rendered="#{manageGroupsPage.getSelectedGroup()!=null}"
                                            actionListener="#{manageGroupsPage.saveExplicitGroup}"
                                            value="#{bundle.saveChanges}"
-                                           update="@all">
+                                           update="manageGroupsForm,messagePanel">
                             </p:commandButton>
                             <button class="btn btn-link" onclick="PF('viewGroup').hide()" type="button">
                                 #{bundle.cancel}
diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
index 97cbe97ccb6..21d808147d2 100644
--- a/src/main/webapp/manage-guestbooks.xhtml
+++ b/src/main/webapp/manage-guestbooks.xhtml
@@ -20,7 +20,7 @@
             <ui:param name="dataverse" value="#{manageGuestbooksPage.dataverse}"/>
             <ui:param name="showMessagePanel" value="#{true}"/>
             <ui:define name="body">
-                <o:importFunctions type="org.apache.commons.lang.StringEscapeUtils" />
+                <o:importFunctions type="org.apache.commons.text.StringEscapeUtils" />
                 <h:form id="manageGuestbooksForm">
                     <div class="row" id="resultsCountPaginatorBlock">
                         <div class="col-xs-6" jsf:rendered="#{manageGuestbooksPage.dataverse.owner ne null}">
@@ -67,7 +67,8 @@
                                     </li>
                                 </ul>
                                 <p>
-                                    <h:outputFormat value="#{bundle['dataset.manageGuestbooks.noGuestbooks.getStarted']}" escape="false">
+                                    <h:outputText value="#{bundle['dataset.manageGuestbooks.noGuestbooks.getStarted']} "/>
+                                    <h:outputFormat value="#{bundle['dataset.manageGuestbooks.noGuestbooks.learnMore']}" escape="false">
                                         <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                         <f:param value="#{systemConfig.guidesVersion}"/>
                                     </h:outputFormat>
@@ -102,18 +103,16 @@
                                                    value="#{bundle['dataset.manageGuestbooks.tab.action.btn.enable']}"
                                                    rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and !guestbook.enabled}"
                                                    action="#{manageGuestbooksPage.enableGuestbook(guestbook)}"
-                                                   update="@form,:messagePanel"
-                                                   oncomplete="bind_bsui_components();"/>
+                                                   update="@form,:messagePanel"/>
                                     <p:commandLink styleClass="btn btn-default"
                                                    value="#{bundle['dataset.manageGuestbooks.tab.action.btn.disable']}"
                                                    rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and guestbook.enabled}"
                                                    action="#{manageGuestbooksPage.disableGuestbook(guestbook)}"
-                                                   update="@form,:messagePanel"
-                                                   oncomplete="bind_bsui_components();"/>
+                                                   update="@form,:messagePanel"/>
                                     <div class="btn-group" role="group">
                                         <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGuestbooksPage.viewSelectedGuestbook(guestbook)}"
-                                                       oncomplete="PF('viewGuestbook').show();bind_bsui_components();"
+                                                       oncomplete="PF('viewGuestbook').show();"
                                                        update=":manageGuestbooksForm"
                                                        title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view']}">
                                             <span class="glyphicon glyphicon-eye-open no-text"></span>
@@ -129,10 +128,14 @@
                                                       title="#{bundle['dataset.manageGuestbooks.tab.action.btn.edit']}">
                                             <span class="glyphicon glyphicon-pencil no-text"></span>
                                         </h:outputLink>
+                                        <button class="btn btn-default" data-toggle="tooltip" title="#{bundle['dataset.manageGuestbooks.download.responses']}"
+                                                jsf:id="downloadResponsesByDvAndGuestbook" jsf:action="#{manageGuestbooksPage.streamResponsesByDataverseAndGuestbook(guestbook.id)}">
+                                            <span class="glyphicon glyphicon-download-alt"/>
+                                        </button>
                                         <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGuestbooksPage.setSelectedGuestbook(guestbook)}"
                                                        rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and guestbook.deletable}"
-                                                       oncomplete="PF('deleteConfirmation').show();bind_bsui_components();"
+                                                       oncomplete="PF('deleteConfirmation').show();"
                                                        title="#{bundle['dataset.manageGuestbooks.tab.action.btn.delete']}">
                                             <span class="glyphicon glyphicon-trash no-text"></span>
                                         </p:commandLink>
@@ -150,82 +153,18 @@
                             <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.tip']}</span>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGuestbooksPage.deleteGuestbook()}" update="@all"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGuestbooksPage.deleteGuestbook()}" update="@form,:messagePanel"/>
                             <button class="btn btn-link" onclick="PF('deleteConfirmation').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="previewGuestbook" styleClass="largePopUp" header="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.header']}" widgetVar="viewGuestbook" modal="true">
-                        <div class="text-right">
-                            <h:outputLink styleClass="btn btn-default"
-                                          rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id}"
-                                          value="/guestbook.xhtml?id=#{manageGuestbooksPage.selectedGuestbook.id}&#38;ownerId=#{manageGuestbooksPage.dataverse.id}">
-                                <span class="glyphicon glyphicon-pencil"></span> #{bundle['dataset.manageGuestbooks.tab.action.btn.edit']}
-                            </h:outputLink>
-                        </div>
-                        <div class="form-horizontal">
-                            <p class="help-block">
-                                #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook.title']}
-                            </p>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">
-                                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook']}
-                                </label>
-                                <div class="col-sm-8">
-                                    <p class="form-control-static">
-                                        #{manageGuestbooksPage.selectedGuestbook.name}
-                                    </p>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">
-                                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
-                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
-                                </label>
-                                <div class="col-sm-8">
-                                    <p class="form-control-static">
-                                        <h:outputText value="#{bundle['dataset.manageGuestbooks.guestbook.accountInformation']}"/>
-                                        <ul>
-                                            <ui:repeat value="#{manageGuestbooksPage.selectedGuestbook.requiredAccountInformation}" var="ai">
-                                                <li>
-                                                    <h:outputText value="#{ai} #{bundle['dataset.manageGuestbooks.guestbook.required']}"/>
-                                                </li>
-                                            </ui:repeat>
-                                            <ui:repeat value="#{manageGuestbooksPage.selectedGuestbook.optionalAccountInformation}" var="ai">
-                                                <li>
-                                                    <h:outputText value="#{ai} #{bundle['dataset.manageGuestbooks.guestbook.optional']}"/>
-                                                </li>
-                                            </ui:repeat>
-                                        </ul>
-                                    </p>
-                                    
-                                    <ui:fragment rendered="#{!empty manageGuestbooksPage.selectedGuestbook.requiredQuestionsList or !empty manageGuestbooksPage.selectedGuestbook.optionalQuestionsList}">
-                                    <p class="form-control-static">
-                                        <h:outputText value="#{bundle['dataset.manageGuestbooks.guestbook.customQuestions']}"/>
-                                        <ul>
-                                            <ui:repeat value="#{manageGuestbooksPage.selectedGuestbook.requiredQuestionsList}" var="q">
-                                                <li>
-                                                    <h:outputText value="#{q} #{bundle['dataset.manageGuestbooks.guestbook.required']}"/>
-                                                </li>
-                                            </ui:repeat>
-                                            <ui:repeat value="#{manageGuestbooksPage.selectedGuestbook.optionalQuestionsList}" var="q">
-                                                <li>
-                                                    <h:outputText value="#{q} #{bundle['dataset.manageGuestbooks.guestbook.optional']}"/>
-                                                </li>
-                                            </ui:repeat>
-                                        </ul>
-                                    </p>
-                                    </ui:fragment>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="button-block">
-                            <button class="btn btn-default" onclick="PF('viewGuestbook').hide()" type="button">
-                                #{bundle.close}
-                            </button>
-                        </div>
+                        <ui:include src="guestbook-preview-popup-fragment.xhtml">
+                            <ui:param name="selectedGuestbook" value="#{manageGuestbooksPage.selectedGuestbook}"/>
+                            <ui:param name="enableEdit" value="#{manageGuestbooksPage.dataverse.id eq manageGuestbooksPage.selectedGuestbook.dataverse.id}"/>
+                            <ui:param name="ownerId" value="#{manageGuestbooksPage.dataverse.id}"/>
+                        </ui:include>
                     </p:dialog>
                 </h:form>
             </ui:define>
diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml
index 3d19494c177..879cf9e55c2 100644
--- a/src/main/webapp/manage-templates.xhtml
+++ b/src/main/webapp/manage-templates.xhtml
@@ -87,34 +87,31 @@
                                                value="#{bundle['dataset.manageTemplates.tab.action.btn.makeDefault']}"
                                                rendered="#{manageTemplatesPage.dataverse.defaultTemplate != template}"
                                                actionListener="#{manageTemplatesPage.makeDefault(template)}"
-                                               update="@form,:messagePanel"
-                                               oncomplete="bind_bsui_components();"/>
+                                               update="@form,:messagePanel"/>
                                 <p:commandLink styleClass="btn btn-default"
                                                value="#{bundle['dataset.manageTemplates.tab.action.btn.default']}"
                                                rendered="#{manageTemplatesPage.dataverse.defaultTemplate == template}"
                                                actionListener="#{manageTemplatesPage.unselectDefault(template)}"
-                                               update="@form,:messagePanel"
-                                               oncomplete="bind_bsui_components();">
+                                               update="@form,:messagePanel">
                                     <span class="glyphicon glyphicon-eye-open"></span>
                                 </p:commandLink>
                                 <div class="btn-group" role="group">
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    title="#{bundle['dataset.manageTemplates.tab.action.btn.view']}"
                                                    action="#{manageTemplatesPage.viewSelectedTemplate(template)}"
-                                                   oncomplete="PF('viewTemplate').show();bind_bsui_components();"
+                                                   oncomplete="PF('viewTemplate').show();"
                                                    update=":manageTemplatesForm">
                                         <span class="glyphicon glyphicon-eye-open"></span>
                                     </p:commandLink>
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    title="#{bundle['dataset.manageTemplates.tab.action.btn.copy']}"
                                                    action="#{manageTemplatesPage.cloneTemplate(template)}"
-                                                   update="@form"
-                                                   oncomplete="bind_bsui_components();">
+                                                   update="@form">
                                         <span class="glyphicon glyphicon-duplicate"></span>
                                     </p:commandLink>
                                     <div class="btn-group" jsf:rendered="#{manageTemplatesPage.dataverse.id eq template.dataverse.id}">
-                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
+                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
+                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.manageTemplates.tab.action.btn.edit']} <span class="caret"></span>
                                         </button>
                                         <ul class="dropdown-menu">
                                             <li>
@@ -134,7 +131,7 @@
                                                    update="@form,:messagePanel"
                                                    action="#{manageTemplatesPage.setSelectedTemplate(template)}"
                                                    rendered="#{manageTemplatesPage.dataverse.id eq template.dataverse.id}"
-                                                   oncomplete="PF('deleteConfirmation').show();bind_bsui_components();">
+                                                   oncomplete="PF('deleteConfirmation').show();">
                                         <span class="glyphicon glyphicon-trash"></span>
                                     </p:commandLink>
                                 </div>
@@ -142,7 +139,7 @@
                         </p:dataTable>
                     </div>
                     <p:dialog id="deleteTemplateConfirm" header="#{bundle['dataset.manageTemplates.tab.action.btn.delete.dialog.header']}" 
-                              widgetVar="deleteConfirmation" modal="true" focus="contDeleteTemplateBtn">
+                              styleClass="largePopUp" widgetVar="deleteConfirmation" modal="true" focus="contDeleteTemplateBtn">
                         <p class="help-block">
                             <span class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> &#160;<h:outputText value="#{bundle['dataset.manageTemplates.tab.action.btn.delete.dialog.tip']}" /></span>
                         </p>
@@ -159,7 +156,7 @@
                             </ul>
                         </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton id="contDeleteTemplateBtn" styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageTemplatesPage.deleteTemplate()}" update="@all"/>
+                            <p:commandButton id="contDeleteTemplateBtn" styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageTemplatesPage.deleteTemplate()}" update="@form,:messagePanel"/>
                             <button class="btn btn-link" onclick="PF('deleteConfirmation').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
@@ -181,10 +178,12 @@
                         <ui:include src="metadataFragment.xhtml">
                             <ui:param name="managePage" value="true"/>
                             <ui:param name="metadataBlocks" value="#{TemplatePage.template.metadataBlocksForView.entrySet().toArray()}"/>
+                            <ui:param name="template" value="#{TemplatePage.template}"/>
                         </ui:include>
                         <ui:include src="dataset-license-terms.xhtml">
                             <ui:param name="managePage" value="true"/>
-                            <ui:param name="datasetPage" value="false"/> 
+                            <ui:param name="datasetPage" value="false"/>
+                            <ui:param name="publicStore" value="settingsWrapper.publicInstall"/>
                             <ui:param name="termsOfUseAndAccess" value="#{TemplatePage.template.termsOfUseAndAccess}" />
                         </ui:include>
                         <div class="button-block">
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 3193a7f1c36..df497e890e8 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -3,12 +3,25 @@
                 xmlns:f="http://java.sun.com/jsf/core"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:fn="http://java.sun.com/jsp/jstl/functions"
                 xmlns:p="http://primefaces.org/ui"
                 xmlns:o="http://omnifaces.org/ui"
                 xmlns:jsf="http://xmlns.jcp.org/jsf">
+        <p:fragment>
+           <p:autoUpdate/>
+        <ui:repeat value="#{DatasetPage.vocabScripts}" var="vocabScriptUrl">
+           <script src="#{vocabScriptUrl}?version=#{systemConfig.getVersion()}"/>
+        </ui:repeat>
+        </p:fragment>
+        <c:set var="cvocConf" value="#{settingsWrapper.getCVocConf(false)}"/>
     <!-- View Mode -->
     <div class="panel-group" jsf:rendered="${empty editMode  or managePage}">
         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
+        <p>
+            <h:outputFormat rendered="#{!(empty mdLang and mdlangCode!='undefined')}" value="#{bundle['dataset.metadatalanguage.view.guidance']}" escape="false">
+                <f:param value="#{mdLang}"/>
+            </h:outputFormat>
+        </p>
         <ui:repeat value="#{metadataBlocks}"
                    var="metadataBlockVal" varStatus="block">
             <div class="panel panel-default">
@@ -44,6 +57,14 @@
                                         </th>
                                         <td>#{publicationDate}</td>
                                     </tr>
+                                    <tr id="metadata_citationDate" jsf:rendered="#{!empty citationDate and (publicationDate ne citationDate)}">
+                                        <th scope="row">
+                                            #{bundle['dataset.metadata.citationDate']}
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.citationDate.tip']}"></span>
+                                        </th>
+                                        <td>#{citationDate}</td>
+                                    </tr>
                                 </ui:fragment>
                                 <ui:repeat value="#{metadataBlockVal.value}" var="dsf">
                                     <tr id="metadata_#{dsf.datasetFieldType.name}">
@@ -52,12 +73,40 @@
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                         </th>
-                                        <td>
+                                        <c:set var="cvocOnDsf" value="#{cvocConf.containsKey(dsf.datasetFieldType.id)}"/>
+                                        <td jsf:rendered="#{!anonymized or !settingsWrapper.shouldBeAnonymized(dsf)}">
                                             <!-- Primitive datasetFields -->
-                                            <ui:fragment rendered="#{dsf.datasetFieldType.primitive}">   
-                                                <h:outputText value="#{dsf.displayValue}" rendered="#{!dsf.datasetFieldType.allowMultiples}"
-                                                              escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
-                                                <ui:repeat value="#{dsf.values}" var="value" varStatus="loop" rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                            <ui:fragment rendered="#{dsf.datasetFieldType.primitive}">
+                                                <ui:fragment rendered="#{managePage or templatePage}">
+                                                  <div>
+                                                    <h:outputLabel for="instr_view" value="#{bundle['template.instructions.label']}" class="italic normal-text margin-right"/>
+                                                    <h:outputText id="instr_view" value="#{template.getInstructionsFor(dsf.datasetFieldType.name)}"/>
+                                                  </div>
+                                                </ui:fragment>
+                                                <h:outputText value="#{dsf.value}"
+                                                    rendered="#{!dsf.datasetFieldType.allowMultiples and cvocOnDsf}"
+                                                    escape="#{dsf.datasetFieldType.isEscapeOutputText()}">
+                                                    <f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(dsf.datasetFieldType.id).getString('languages'))}" />
+                                                    <f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(dsf.datasetFieldType.id).getString('cvoc-url','')}" />
+                                                    <f:passThroughAttribute name="data-cvoc-headers" value="#{cvocConf.get(dsf.datasetFieldType.id).containsKey('headers') ? cvocConf.get(dsf.datasetFieldType.id).get('headers').toString() : '{}'}"/>
+                                                    <f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(dsf.datasetFieldType.id).getString('protocol','')}" />
+                                                    <f:passThroughAttribute name="data-cvoc-managedfields" value="#{cvocConf.get(dsf.datasetFieldType.id).get('managed-fields').toString()}" />
+                                                </h:outputText>
+                                                <h:outputText value="#{dsf.getDisplayValue(mdLangCode)}"
+                                                    rendered="#{!dsf.datasetFieldType.allowMultiples and !cvocOnDsf}"
+                                                    escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
+                                                <ui:repeat value="#{dsf.getValues_nondisplay()}" var="value" varStatus="loop" rendered="#{dsf.datasetFieldType.allowMultiples and cvocOnDsf}">
+                                                    <h:outputText value="#{loop.first?'':'; '}"/>
+                                                    <h:outputText value="#{ value }"
+                                                                  escape="#{dsf.datasetFieldType.isEscapeOutputText()}">
+                                                        <f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(dsf.datasetFieldType.id).getString('languages'))}" />
+                                                        <f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(dsf.datasetFieldType.id).getString('cvoc-url','')}" />
+                                                        <f:passThroughAttribute name="data-cvoc-headers" value="#{cvocConf.get(dsf.datasetFieldType.id).containsKey('headers') ? cvocConf.get(dsf.datasetFieldType.id).get('headers').toString() : '{}'}"/>
+                                                        <f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(dsf.datasetFieldType.id).getString('protocol','')}" />
+                                                        <f:passThroughAttribute name="data-cvoc-managedfields" value="#{cvocConf.get(dsf.datasetFieldType.id).get('managed-fields').toString()}" />
+                                                    </h:outputText>
+                                                </ui:repeat>
+                                                <ui:repeat value="#{dsf.getValues(mdLangCode)}" var="value" varStatus="loop" rendered="#{dsf.datasetFieldType.allowMultiples and !cvocOnDsf}">
                                                     <h:outputText value="#{loop.first?'':'; '}#{ value }"
                                                                   escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
                                                 </ui:repeat>
@@ -69,16 +118,74 @@
                                                         <h:outputText value="#{bundle['dataset.contact.tip']}"/>
                                                     </p>
                                                 </ui:fragment>
-                                                <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue">
-                                                    <ui:repeat value="#{compoundValue.displayValueMap.entrySet().toArray()}" var="cvPart" varStatus="partStatus">                                           
-                                                        <h:outputText value="#{dsf.datasetFieldType.displayFormat} " rendered="${!partStatus.first}"/>
-                                                        <h:outputText value="#{cvPart.value}"
-                                                                      escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}"/>
+                                                <ui:fragment rendered="#{managePage or templatePage}">
+                                                  <div>
+                                                    <h:outputLabel for="compinstr_view" value="#{bundle['template.instructions.label']} " class="italic normal-text margin-right"/>
+                                                    <h:outputText id="compinstr_view" value="#{template.getInstructionsFor(dsf.datasetFieldType.name)}"/>
+                                                  </div>
+                                                </ui:fragment>
+          
+                                                <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue" varStatus="compoundValuesStatus">
+                                                    <c:set var="cvocOnDsfApplies" value="#{compoundValue.hasChildOfType(cvocConf.get(dsf.datasetFieldType.id).getString('term-uri-field'))}"/>
+                                                    <ui:repeat value="#{compoundValue.displayValueMap.entrySet().toArray()}" var="cvPart" varStatus="partStatus">
+                                                        <c:set var="cvocOnCvPart" value="#{cvocConf.containsKey(cvPart.key.datasetFieldType.id)}"/>
+                                                        <h:outputText value="#{dsf.datasetFieldType.displayFormat} " rendered="${!partStatus.first and !settingsWrapper.isCvocField(cvPart.key.datasetFieldType.id)}"/>
+                                                        <ui:fragment rendered="#{!cvocOnCvPart and !cvocOnDsfApplies or !settingsWrapper.isCvocField(cvPart.key.datasetFieldType.id)}">
+                                                            <ui:fragment rendered="#{compoundValue.isLink(cvPart.key)}">
+                                                                <h:outputLink value="#{compoundValue.getLink()}" target="_blank">
+                                                                    <h:outputText value="#{cvPart.value}"
+                                                                                  escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}"/>
+                                                                </h:outputLink>
+                                                            </ui:fragment>
+                                                            <ui:fragment rendered="#{not compoundValue.isLink(cvPart.key)}">
+                                                                <h:outputText value="#{cvPart.value}"
+                                                                              escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}"/>
+                                                            </ui:fragment>
+                                                        </ui:fragment>
+                                                        <!--  Cvoc for single child field -->
+                                                        <h:outputText value="#{cvPart.key.value}"
+                                                                      escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}" 
+                                                                      rendered="${cvocOnCvPart and cvPart.key.datasetFieldType.name.equals(cvocConf.get(cvPart.key.datasetFieldType.id).getString('term-uri-field'))}">
+                                                                      <f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(cvPart.key.datasetFieldType.id).getString('languages'))}" />
+                                                                      <f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(cvPart.key.datasetFieldType.id).getString('cvoc-url','')}" />
+                                                                      <f:passThroughAttribute name="data-cvoc-headers" value="#{cvocConf.get(cvPart.key.datasetFieldType.id).containsKey('headers') ? cvocConf.get(cvPart.key.datasetFieldType.id).get('headers').toString() : '{}'}"/>
+                                                                      <f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(cvPart.key.datasetFieldType.id).getString('protocol','')}" />
+                                                                      <!-- unlikely to be used in this case -->
+                                                                      <f:passThroughAttribute name="data-cvoc-managedfields" value="#{cvocConf.get(cvPart.key.datasetFieldType.id).get('managed-fields').toString()}" />
+                                                                      <f:passThroughAttribute name="data-cvoc-index" value="#{compoundValuesStatus.index}" />
+                                                        </h:outputText>
+                                                        <!--  Cvoc on parent field -->
+                                                        <h:outputText value="#{cvPart.key.value}"
+                                                                      escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}" 
+                                                                      rendered="${cvocOnDsf and cvPart.key.datasetFieldType.name.equals(cvocConf.get(dsf.datasetFieldType.id).getString('term-uri-field'))}">
+                                                                      <f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(dsf.datasetFieldType.id).getString('languages'))}" />
+                                                                      <f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(dsf.datasetFieldType.id).getString('cvoc-url','')}" />
+                                                                      <f:passThroughAttribute name="data-cvoc-headers" value="#{cvocConf.get(dsf.datasetFieldType.id).containsKey('headers') ? cvocConf.get(dsf.datasetFieldType.id).get('headers').toString() : '{}'}"/>
+                                                                      <f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(dsf.datasetFieldType.id).getString('protocol','')}" />
+                                                                      <f:passThroughAttribute name="data-cvoc-managedfields" value="#{cvocConf.get(dsf.datasetFieldType.id).get('managed-fields').toString()}" />
+                                                                      <f:passThroughAttribute name="data-cvoc-index" value="#{compoundValuesStatus.index}" />
+                                                        </h:outputText>
+                                                        <!-- Cvoc for others fields -->
+                                                        <h:outputText value="#{cvPart.key.value}"
+                                                                      escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}"
+                                                                      rendered="#{(cvocOnDsfApplies or cvocOnCvPart) and not (
+                                                                            cvPart.key.datasetFieldType.name.equals(cvocConf.get(cvPart.key.datasetFieldType.id).getString('term-uri-field'))
+                                                                            or cvPart.key.datasetFieldType.name.equals(cvocConf.get(dsf.datasetFieldType.id).getString('term-uri-field')))}"
+                                                                      styleClass="hidden">
+                                                            <f:passThroughAttribute name="hidden" value="hidden" />
+                                                            <f:passThroughAttribute name="data-cvoc-metadata-name" value="#{cvPart.key.datasetFieldType.name}" />
+                                                            <f:passThroughAttribute name="data-cvoc-index" value="#{compoundValuesStatus.index}" />
+                                                        </h:outputText>
                                                     </ui:repeat>
-                                                    <br/>
+                                                    <ui:fragment rendered="#{not compoundValuesStatus.last}">
+                                                        <br/>
+                                                    </ui:fragment>
                                                 </ui:repeat>
                                             </ui:fragment>
                                         </td>
+                                        <td jsf:rendered="#{anonymized and settingsWrapper.shouldBeAnonymized(dsf)}">
+                                            <h:outputText value="#{bundle['dataset.anonymized.withheld']}"/>
+                                        </td>
                                     </tr>
                                 </ui:repeat>
                             </tbody>
@@ -93,154 +200,237 @@
         <p:fragment id="editMetadataFragement">
         <o:importFunctions type="java.util.Collections" />
         <div class="panel-group">
-            <ui:repeat value="#{metadataBlocks}" var="metadataBlockVal" varStatus="block">
+                <p>
+                    <h:outputFormat
+                        rendered="#{(!empty(mdLang) and mdLangCode!='undefined') and ((editMode == 'CREATE') or (editMode == 'METADATA'))}"
+                        value="#{bundle['dataset.metadatalanguage.create.guidance']}"
+                        escape="false">
+                        <f:param value="#{mdLang}" />
+                    </h:outputFormat>
+                </p>
+                <div class="form-group"
+                    jsf:rendered="#{(empty mdLang and mdLangCode=='undefined')}">
+                    <h:outputLabel for="dsMetadataLanguage"
+                        styleClass="col-md-3 control-label">
+                                            #{bundle.metadataLanguage}
+                                            <span
+                            class="glyphicon glyphicon-question-sign tooltip-icon"
+                            data-toggle="tooltip" data-placement="auto right"
+                            data-original-title="#{bundle['dataset.metadatalanguage.title']}"></span>
+                    </h:outputLabel>
+                    <div class="col-md-7 form-col-container">
+                        <p class="help-block">
+                            #{bundle['dataset.metadatalanguage.tip']}</p>
+                        <p:selectOneMenu id="dsMetadataLanguage" styleClass="form-control"
+                            value="#{DatasetPage.dataset.metadataLanguage}">
+                            <f:selectItems value="#{DatasetPage.getMetadataLanguages()}"
+                                var="lang" itemLabel="#{lang.getValue()}"
+                                itemValue="#{lang.getKey()}" />
+                        </p:selectOneMenu>
+                        <p:message for="dsMetadataLanguage" display="text" />
+                    </div>
+                </div>
+                <div class="form-group">
+                    <span class="glyphicon glyphicon-asterisk text-danger"/> <h:outputText value="#{bundle['dataset.asterisk.tip']}"/>
+                </div>
+                <ui:repeat value="#{metadataBlocks}" var="metadataBlockVal" varStatus="block">
                 <div class="panel panel-default" jsf:rendered="#{(editMode == 'METADATA' or metadataBlockVal.key.displayOnCreate or !metadataBlockVal.key.isEmpty()
                                                                  or metadataBlockVal.key.isHasRequired())
                                                                  or (!datasetPage)}">
                     <div data-toggle="collapse" data-target="#panelCollapse#{block.index}" class="panel-heading text-info">
-                        #{metadataBlockVal.key.localeDisplayName} <span class="glyphicon #{block.first || editMode == 'CREATE'  ? 'glyphicon-chevron-up' : 'glyphicon-chevron-down'}"/>
+                        #{metadataBlockVal.key.localeDisplayName} <span class="glyphicon #{block.first or editMode == 'CREATE' or !cvocConf.isEmpty() ? 'glyphicon-chevron-up' : 'glyphicon-chevron-down'}"/>
                     </div>
-                    <div id="panelCollapse#{block.index}" class="collapse #{block.first || editMode == 'CREATE' ? 'in' : ''}">
+                    <div id="panelCollapse#{block.index}" class="collapse #{block.first or editMode == 'CREATE' or !cvocConf.isEmpty() ? 'in' : ''}">
                         <div class="panel-body">
-                            <ui:repeat value="#{metadataBlockVal.value}" var="dsf">
-                                <ui:fragment rendered="#{((editMode == 'METADATA'
-                                                         or dsf.datasetFieldType.displayOnCreate or !dsf.isEmpty() or dsf.required or dsf.datasetFieldType.hasRequiredChildren) and dsf.include)
-                                                         or (!datasetPage and dsf.include)}">
-                                    <div class="form-group">
-                                        <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
+                            <ui:repeat value="#{metadataBlockVal.value}" var="dsf" varStatus="curField">
+                                <div class="form-group" role="group"
+                                     jsf:rendered="#{((editMode == 'METADATA' or dsf.datasetFieldType.shouldDisplayOnCreate() or !dsf.isEmpty() or dsf.required or dsf.hasRequiredChildren)) or (!datasetPage and dsf.include)}">
+                                    <!-- Primitive fields -->
+                                    <p:fragment id="editPrimitiveValueFragment" rendered="#{dsf.datasetFieldType.primitive}">
+                                        <p:autoUpdate/>
+                                        <div>
+                                          <h:outputLabel for="#{dsf.datasetFieldType.controlledVocabulary ? (!dsf.datasetFieldType.allowMultiples ? 'unique1_focus' : 'unique2_focus') : ('fieldvaluelist:0:'.concat(((dsf.datasetFieldType.fieldType == 'TEXTBOX') ? 'description' : cvocConf.containsKey(dsf.datasetFieldType.id)? 'cvocInputText': 'inputText')))}" styleClass="col-sm-3 control-label">
                                             #{dsf.datasetFieldType.localeTitle}
-                                            <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{dsf.required  or dsf.datasetFieldType.hasRequiredChildren }" />
+                                            <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{dsf.required}"/>
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
-                                        </label>
-                                        <!-- Primitive fields -->
-                                        <p:fragment id="editPrimitiveValueFragment" rendered="#{dsf.datasetFieldType.primitive}">
-                                            <p:autoUpdate/>
-                                            <div class="form-group">
-                                                <ui:remove><!-- There is an issue with the dynamic +/- and the primefaces autoupdate where they are not working
-                                                    well together for the primitive fields, but are for the compound fields. So as a workaround for the primitive,
-                                                    we wrap them in a ui:repeat that iterates on a single list. Note: dummyVar is never used--></ui:remove>
-                                                <ui:repeat value="#{Collections:singletonList('')}" var="dummyVar">
-                                                    <div class="form-col-container col-sm-12">
-                                                        <ui:repeat value="#{dsf.datasetFieldValues}" var="dsfv" varStatus="valCount">
-                                                            <div class="form-group dataset-field-values">
-                                                                <div class="form-col-container col-sm-9 edit-field">
-                                                                    <ui:include src="datasetFieldForEditFragment.xhtml">
-                                                                        <ui:param name="dsfv" value="#{dsfv}"/>
-                                                                        <ui:param name="dsfvIndex" value="#{valCount.index}"/>
-                                                                    </ui:include>
-                                                                </div>
-                                                                <!-- Add / Remove buttons -->
-                                                                <div class="col-xs-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
-                                                                    <p:commandLink title="#{bundle.add}"
-                                                                                   styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                                   actionListener="#{dsf.addDatasetFieldValue(valCount.index + 1)}"
-                                                                                   update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
-                                                                                   oncomplete="javascript:bind_bsui_components();">
-                                                                        <span class="glyphicon glyphicon-plus no-text"/>
-                                                                    </p:commandLink>
-                                                                    <p:commandLink title="#{bundle.delete}"
-                                                                                   styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                                   rendered="#{dsf.datasetFieldValues.size() > 1}"
-                                                                                   actionListener="#{dsf.removeDatasetFieldValue(valCount.index)}"
-                                                                                   update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
-                                                                                   oncomplete="javascript:bind_bsui_components();">
-                                                                        <span class="glyphicon glyphicon-minus no-text"/>
-                                                                    </p:commandLink>
-                                                                </div>
-                                                            </div>
-                                                        </ui:repeat>
-                                                        <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
+                                          </h:outputLabel>
+                                          <ui:fragment rendered="#{templatePage}">
+                                            <div class="col-sm-7">
+                                              <h:outputLabel for="instr" value="#{bundle['template.instructions.label']} " title="#{bundle['template.instructions.label.tip']}" class="italic normal-text margin-right"/>
+                                                <p:inplace id="instr" label="#{TemplatePage.getInstructionsLabelFor(dsf.datasetFieldType.name)}" editor="true">
+                                                  <p:inputText value="#{TemplatePage.template.instructionsMap[dsf.datasetFieldType.name]}"/>
+                                                </p:inplace>
+                                              </div>
+                                          </ui:fragment>
+                                          <h:outputText class="col-sm-7" value="#{template.getInstructionsFor(dsf.datasetFieldType.name)}" rendered="#{!templatePage and template!=null and not empty template.getInstructionsFor(dsf.datasetFieldType.name)}"/>
+                                        </div>
+                                        <div class="col-sm-3"/>
+                                        <div class="col-sm-9" style="padding-left:2px">
+                                          <div class="form-group">
+                                            <div class="form-col-container col-sm-12">
+                                                <p:repeat value="#{dsf.datasetFieldValues}" var="dsfv" varStatus="valCount" id="fieldvaluelist">
+                                                    <div class="form-group dataset-field-values">
+                                                        <div class="form-col-container col-sm-9 edit-field">
+                                                            <ui:include src="datasetFieldForEditFragment.xhtml">
+                                                                <ui:param name="dsfv" value="#{dsfv}"/>
+                                                                <ui:param name="dsfvIndex" value="#{valCount.index}"/>
+                                                                <ui:param name="cvoc" value="#{cvocConf.containsKey(dsf.datasetFieldType.id)? cvocConf.get(dsf.datasetFieldType.id): null}"/>
+                                                            </ui:include>
+                                                        </div>
+                                                        <!-- Add / Remove buttons -->
+                                                        <div class="col-xs-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
+                                                            <p:commandLink title="#{bundle.add}"
+                                                                           styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                           actionListener="#{dsf.addDatasetFieldValue(valCount.index + 1)}"
+                                                                           update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}">
+                                                                <span class="glyphicon glyphicon-plus no-text"/>
+                                                            </p:commandLink>
+                                                            <p:commandLink title="#{bundle.delete}"
+                                                                           styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                           rendered="#{dsf.datasetFieldValues.size() > 1}"
+                                                                           actionListener="#{dsf.removeDatasetFieldValue(valCount.index)}"
+                                                                           update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}">
+                                                                <span class="glyphicon glyphicon-minus no-text"/>
+                                                            </p:commandLink>
+                                                        </div>
+                                                    </div>
+                                                </p:repeat>
+                                                <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
+                                                    <div class="form-group dataset-field-values">
+                                                        <div class="form-col-container col-sm-9 edit-field">
                                                             <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
-                                                                             rendered="#{!dsf.datasetFieldType.allowMultiples}">
+                                                                             id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples}" filter="#{(dsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains">
                                                                 <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
-                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
+                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
                                                             </p:selectOneMenu>
-                                                            <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{dsf.datasetFieldType.allowMultiples}">
-                                                                <p:selectManyCheckbox value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                      layout="pageDirection">
-                                                                    <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
-                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
-                                                                </p:selectManyCheckbox>
-                                                            </div>
-                                                            <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
-                                                                <strong>#{dsf.validationMessage}</strong>
+                                                            <!--
+                                                            <p:outputPanel id="selectedValsList" style="padding-top:.5em;">
+                                                                <ui:repeat value="#{dsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty dsf.controlledVocabularyValues}">
+                                                                   <h:outputText value="#{cvv.getLocaleStrValue(mdLangCode)}"  style="margin-right:.5em;display:inline-block;"/>
+                                                                </ui:repeat>
+                                                            </p:outputPanel>
+                                                            -->
+                                                            <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
+                                                                                  filter="#{(dsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains" label="#{bundle.select}"  multiple="true" showHeader="#{(dsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" 
+                                                                                  id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
+                                                            </p:selectCheckboxMenu>
+                                                            <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
+                                                                <span class="ui-message-error-detail">#{dsf.validationMessage}</span>
                                                             </div>
-                                                        </ui:fragment>
+                                                        </div>
                                                     </div>
-                                                </ui:repeat>
+                                                </ui:fragment>
                                             </div>
-                                        </p:fragment>
-                                        <!-- Compound fields -->
-                                        <p:fragment id="editCompoundValueFragment" rendered="#{dsf.datasetFieldType.compound}">
-                                            <p:autoUpdate/>
-                                            <div class="form-group form-col-container col-sm-9 dataset-field-values">
-                                                <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue" varStatus="valCount">
-                                                    <div class="form-group form-col-container col-sm-9 edit-compound-field">
-                                                        <!-- Sub Fields -->
-                                                        <ui:repeat value="#{compoundValue.childDatasetFields}" var="subdsf">
-                                                            <div class="form-col-container #{(subdsf.datasetFieldType.fieldType == 'TEXTBOX') ? 'col-sm-12' : 'col-sm-6'}">
-                                                                <ui:fragment rendered="#{subdsf.datasetFieldType.name == 'dsDescriptionValue'}">
-                                                                    <p class="help-block">
-                                                                        <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
-                                                                            <f:param value="#{bundle.htmlAllowedTags}"/>
-                                                                        </h:outputFormat>
-                                                                    </p>
-                                                                </ui:fragment>
-                                                                <label class="control-label" for="metadata_#{subdsf.datasetFieldType.name}">
-                                                                    #{subdsf.datasetFieldType.localeTitle}
-                                                                    <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{subdsf.required}" />
-                                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{subdsf.datasetFieldType.localeDescription}"></span>
-                                                                </label>
-                                                                <ui:fragment rendered="#{!subdsf.datasetFieldType.controlledVocabulary}">
-                                                                    <ui:include src="datasetFieldForEditFragment.xhtml">
-                                                                        <ui:param name="dsfv" value="#{subdsf.singleValue}"/>
-                                                                        <ui:param name="dsfvIndex" value="0"/>
-                                                                    </ui:include>
-                                                                </ui:fragment>
-                                                                <!-- MOVED SELECT ONE TO dataFieldForEdit -->
-                                                                <div jsf:rendered="#{subdsf.datasetFieldType.controlledVocabulary}">
-                                                                    <p:selectOneMenu value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
-                                                                                     rendered="#{!subdsf.datasetFieldType.allowMultiples}">
-                                                                        <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
-                                                                        <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
-                                                                    </p:selectOneMenu>
-                                                                    <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{subdsf.datasetFieldType.allowMultiples}">
-                                                                        <p:selectManyCheckbox value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                              layout="pageDirection">
-                                                                            <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
-                                                                        </p:selectManyCheckbox>
-                                                                    </div>
-                                                                    <div class="alert-danger" jsf:rendered="#{!empty subdsf.validationMessage}">
-                                                                        <strong>#{subdsf.validationMessage}</strong>
-                                                                    </div>
+                                          </div>
+                                        </div>
+                                    </p:fragment>
+                                    <!-- Compound fields -->
+                                    <p:fragment id="editCompoundValueFragment" rendered="#{dsf.datasetFieldType.compound}">
+                                        <p:autoUpdate/>
+                                        <div>
+                                          <div id="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label highlightBold">
+                                            #{dsf.datasetFieldType.localeTitle}
+                                            <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{dsf.required}"/>
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
+                                          </div>
+                                          
+                                          <div class="col-sm-7">
+                                            <ui:fragment rendered="#{templatePage}">
+                                              <h:outputLabel for="compinstr" value="#{bundle['template.instructions.label']} " title="#{bundle['template.instructions.label.tip']}" class="italic normal-text margin-right"/>
+                                                <p:inplace id="compinstr" label="#{TemplatePage.getInstructionsLabelFor(dsf.datasetFieldType.name)}" editor="true">
+                                                  <p:inputText value="#{TemplatePage.template.instructionsMap[dsf.datasetFieldType.name]}"/>
+                                                </p:inplace>
+                                            </ui:fragment>
+                                           <h:outputText value="#{template.getInstructionsFor(dsf.datasetFieldType.name)}" rendered="#{!templatePage and template != null and ! empty template.getInstructionsFor(dsf.datasetFieldType.name)}"/>
+                                          </div>
+                                        </div> 
+                                        <div class="col-sm-3"/>
+                                        <div class="form-group form-col-container col-sm-9 dataset-field-values">
+                                            <ui:fragment rendered="#{!dsf.required and dsf.hasRequiredChildren}">
+                                                <p class="help-block">
+                                                    <h:outputText value="#{bundle.conditionalRequiredMsg}"/>
+                                                </p>
+                                            </ui:fragment>
+                                            <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue" varStatus="valCount">
+                                                <div class="form-group form-col-container col-sm-9 edit-compound-field"  data-cvoc-parentfield="#{cvocConf.containsKey(dsf.datasetFieldType.id)?cvocConf.get(dsf.datasetFieldType.id).getString('field-name'):''}">
+                                                    <!-- Sub Fields -->
+                                                    <ui:repeat value="#{compoundValue.childDatasetFields}" var="subdsf">
+                                                        <div class="form-col-container #{subdsf.datasetFieldType.fieldType == 'TEXTBOX' ? 'col-sm-12' : 'col-sm-6'}">
+                                                            <ui:fragment rendered="#{subdsf.datasetFieldType.name == 'dsDescriptionValue'}">
+                                                                <p class="help-block">
+                                                                    <h:outputText value="#{bundle.htmlAllowedMsg}" escape="false"/>
+                                                                </p>
+                                                            </ui:fragment>
+                                                            <label jsf:for="#{subdsf.datasetFieldType.controlledVocabulary ? 'cvv_focus' : subdsf.datasetFieldType.fieldType == 'TEXTBOX' ? 'description' : cvocConf.containsKey(subdsf.datasetFieldType.id) ? 'cvocInputText' : cvocConf.containsKey(dsf.datasetFieldType.id) ? 'cvocInputText2' : 'inputText'}" class="control-label">
+                                                                #{subdsf.datasetFieldType.localeTitle}
+                                                                <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{subdsf.required and dsf.required}"/>
+                                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                                      data-toggle="tooltip" data-placement="auto right" 
+                                                                      data-original-title="#{subdsf.datasetFieldType.localeDescription}#{subdsf.required and !dsf.required?' – '.concat(bundle['conditionalRequiredMsg.tooltip']) : ''}"></span>
+                                                            </label>
+                                                            <ui:fragment rendered="#{!subdsf.datasetFieldType.controlledVocabulary}">
+                                                                <ui:include src="datasetFieldForEditFragment.xhtml">
+                                                                    <ui:param name="dsfv" value="#{subdsf.singleValue}"/>
+                                                                    <ui:param name="dsfvIndex" value="0"/>
+                                                                    <ui:param name="cvoc" value="#{cvocConf.containsKey(subdsf.datasetFieldType.id) ? cvocConf.get(subdsf.datasetFieldType.id) : cvocConf.containsKey(dsf.datasetFieldType.id)? cvocConf.get(dsf.datasetFieldType.id): cvocConf.containsKey(dsfv.datasetField.datasetFieldType.id)? cvocConf.get(dsfv.datasetField.datasetFieldType.id): null}"/>
+                                                                </ui:include>
+                                                            </ui:fragment>
+                                                            <!-- MOVED SELECT ONE TO dataFieldForEdit -->
+                                                            <div jsf:rendered="#{subdsf.datasetFieldType.controlledVocabulary}" data-cvoc-managed-field="#{settingsWrapper.isCvocField(subdsf.datasetFieldType.id)? subdsf.datasetFieldType.name : ''}">
+                                                                <p:selectOneMenu id="cvv" value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
+                                                                                 rendered="#{!subdsf.datasetFieldType.allowMultiples}" filter="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains" >
+                                                                    <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
+                                                                    <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}" />
+                                                                </p:selectOneMenu>
+                                                                <!--
+                                                                <p:outputPanel id="selectedValsListCompound" style="padding-top:.5em;">
+                                                                    <ui:repeat value="#{subdsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty subdsf.controlledVocabularyValues}">
+                                                                        <h:outputText value="#{cvv.getLocaleStrValue(mdLangCode)}"  style="margin-right:.5em;display:inline-block;"/>
+                                                                    </ui:repeat>
+                                                                </p:outputPanel>
+                                                                -->
+                                                                <ui:remove>
+                                                                <!-- Todo: If there are instances of multi-val cvv in a compound field, some addition will probably be needed for accessibility -
+                                                                     to associate this field with the label above (as was done in this commit for the single value cvv in a compound field case).
+                                                                     I did that by inspecting the html source produced, so skipping this unless/until I find an example. 
+                                                                -->
+                                                                </ui:remove> 
+                                                                    <p:selectCheckboxMenu value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
+                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples}" label="#{bundle.select}" multiple="true"
+                                                                                          filter="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains" 
+                                                                                          showHeader="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}">
+                                                                        <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}" />
+                                                                    </p:selectCheckboxMenu>
+
+                                                                <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty subdsf.validationMessage}">
+                                                                    <span class="ui-message-error-detail">#{subdsf.validationMessage}</span>
                                                                 </div>
                                                             </div>
-                                                        </ui:repeat>
-                                                    </div>
-                                                    <div class="col-sm-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
-                                                        <p:commandLink title="#{bundle.add}"
-                                                                       styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                       actionListener="#{dsf.addDatasetFieldCompoundValue(valCount.index + 1)}"   
-                                                                       update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}"
-                                                                       oncomplete="javascript:bind_bsui_components();">
-                                                            <span class="glyphicon glyphicon-plus no-text"/>
-                                                        </p:commandLink>
-                                                        <p:commandLink title="#{bundle.delete}"
-                                                                       styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                       rendered="#{dsf.datasetFieldCompoundValues.size() > 1}"
-                                                                       actionListener="#{dsf.removeDatasetFieldCompoundValue(valCount.index)}"
-                                                                       update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}"
-                                                                       oncomplete="javascript:bind_bsui_components();">
-                                                            <span class="glyphicon glyphicon-minus no-text"/>
-                                                        </p:commandLink>
-                                                    </div>
-                                                </ui:repeat>
-                                            </div>
-                                        </p:fragment>
-                                    </div>
-                                </ui:fragment>
+                                                        </div>
+                                                    </ui:repeat>
+                                                </div>
+                                                <div class="col-sm-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
+                                                    <p:commandLink title="#{bundle.add}"
+                                                                   styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                   actionListener="#{dsf.addDatasetFieldCompoundValue(valCount.index + 1)}"   
+                                                                   update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}">
+                                                        <span class="glyphicon glyphicon-plus no-text"/>
+                                                    </p:commandLink>
+                                                    <p:commandLink title="#{bundle.delete}"
+                                                                   styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                   rendered="#{dsf.datasetFieldCompoundValues.size() > 1}"
+                                                                   actionListener="#{dsf.removeDatasetFieldCompoundValue(valCount.index)}"
+                                                                   update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}">
+                                                        <span class="glyphicon glyphicon-minus no-text"/>
+                                                    </p:commandLink>
+                                                </div>
+                                            </ui:repeat>
+                                        </div>
+                                    </p:fragment>
+                                </div>
                             </ui:repeat>
                         </div>
                     </div>
@@ -249,4 +439,17 @@
         </div>
         </p:fragment>
     </ui:fragment>
-</ui:composition>
\ No newline at end of file
+ <script>
+    //<![CDATA[
+    $(document).ready(function() {
+      //The select2 widget used in external vocab scripts has trouble determining the width of an input field if it is initially hidden
+      //Starting with the metadatablocks displayed and collapsing them here is a work-around to fix that.
+      if(#{(editMode != 'CREATE') && !cvocConf.isEmpty()}) {
+        for(let i=1;i< #{fn:length(metadataBlocks)};i++) {
+          $('#panelCollapse'+i).collapse('hide');
+        }
+      }
+    });
+    //]]>
+    </script>
+</ui:composition>
diff --git a/src/main/webapp/mydata_fragment.xhtml b/src/main/webapp/mydata_fragment.xhtml
index 6ade2184137..d9e55b2eef2 100644
--- a/src/main/webapp/mydata_fragment.xhtml
+++ b/src/main/webapp/mydata_fragment.xhtml
@@ -16,20 +16,11 @@
         </div>
     </div>
     
-    <div class="row" id="my_data_filter_column2">
-        <div class="col-xs-7"  style="padding:10px 30px;">
+    <div class="row margin-bottom" id="my_data_filter_column2">
+        <div class="col-xs-7">
             <input type="text" size="40" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all search-input" name="mydata_search_term" id="mydata_search_term" placeholder="#{bundle['mydataFragment.search']}" />
-            
             &#160; <a id="btn_find_my_data" class="btn btn-default"><span class="glyphicon glyphicon-search"></span>#{bundle['find']}</a>
-            <!-- &#160; <a target="_self" href="/dataverse/root/search" >Advanced Search </a> -->
-        </div>
-        <ui:fragment rendered="#{MyDataPage.isSuperuser()}">
-        <div class="col-xs-4 pull-right text-right" style="margin-right:30px;margin-bottom:0;padding:8px 6px;background:none;">
-            #{bundle['mydataFragment.resultsByUserName']}
-            <input type="text" name="userIdentifier" id="userIdentifier" value="#{MyDataPage.getAuthUserIdentifier()}" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all" />
-           
         </div>
-        </ui:fragment>
     </div>
 <!-- start: panel --><div class="panel panel-default">
 <!-- start: panel body --><div class="panel-body clearfix">
@@ -88,12 +79,32 @@
                 </div>    
             </ui:repeat>
             </div>
-           <!-- end: role states -->
+            <!-- end: role states -->
+            <!-- start: metadata validity -->
+            <div jsf:rendered="#{MyDataPage.showValidityFilter()}">
+                <input type="hidden" name="filter_validities" id="filter_validities" value="true" />
+                <b>#{bundle['mydataFragment.validity']}</b>
+                <div id="div_dataset_valid" style="border-bottom:1px solid #ddd; padding-bottom:8px; margin-bottom:0.5em;">
+                    <ui:repeat value="#{MyDataPage.validityInfoForCheckboxes}" var="validityInfoList">
+                        <div class="checkbox" style="margin-top:3px;margin-bottom:0;">
+                            <input style="margin-left:0;" name="dataset_valid" id="id_cbox_#{validityInfoList[1]}" type="checkbox" value="#{validityInfoList[0]}" checked="checked" />
+                            <label>
+                                <a class="mydata_validity_label">#{validityInfoList[2]} <span id="id_#{validityInfoList[1]}_count"></span></a>
+                            </label>                    
+                        </div>    
+                    </ui:repeat>
+                </div>
+            </div>
+           <!-- end: metadata validity -->
              <!--/form>-->
             <div id="div-search-params" class="well" style="display:none;"></div>
         </div><!-- end: filter column -->
         <!-- start: workspace column -->
-        <div class="col-xs-9">
+        <div class="col-xs-9" id="my_data_filter_column3">
+            <div class="text-right" style="" jsf:rendered="#{MyDataPage.isSuperuser()}">
+                #{bundle['mydataFragment.resultsByUserName']}
+                <input type="text" name="userIdentifier" id="userIdentifier" value="#{MyDataPage.getAuthUserIdentifier()}" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all search-input"/>
+            </div>
             <div id="div-pagination"></div>
             <!--<div id="div-test-json" class="well">(pagination)</div>-->
             <div id="div-result-message"></div>
@@ -117,17 +128,18 @@
     <script>
         //<![CDATA[
         // bundle text variables
-        var mydataresult = '#{bundle['mydata.result']}';
-        var mydataresults = '#{bundle['mydata.results']}';
-        var mydataviewnext = '#{bundle['mydata.viewnext']}';
-        var mydatamore = '#{bundle['mydata.more']}';
-        var draft = '#{bundle['Draft']}';
-        var inreview = '#{bundle['In Review']}';
-        var unpublished = '#{bundle['Unpublished']}';
-        var published = '#{bundle['Published']}';
-        var deaccessioned = '#{bundle['Deaccessioned']}';
-        var mydatato = '#{bundle['to']}';
-        var mydataof = '#{bundle['of']}';
+        var mydataresult = "#{bundle['mydata.result']}";
+        var mydataresults = "#{bundle['mydata.results']}";
+        var mydataviewnext = "#{bundle['mydata.viewnext']}";
+        var mydatamore = "#{bundle['mydata.more']}";
+        var draft = "#{bundle['Draft']}";
+        var inreview = "#{bundle['In Review']}";
+        var unpublished = "#{bundle['Unpublished']}";
+        var published = "#{bundle['Published']}";
+        var deaccessioned = "#{bundle['Deaccessioned']}";
+        var mydatato = "#{bundle['to']}";
+        var mydataof = "#{bundle['of']}";
+        var incomplete = "#{bundle['incomplete']}";
             
         $(document).ready(function() {
               
@@ -138,4 +150,4 @@
     </script>
 </div><!-- end panel body -->
 </div><!-- end panel -->
-</ui:composition>
\ No newline at end of file
+</ui:composition>
diff --git a/src/main/webapp/mydata_page.xhtml b/src/main/webapp/mydata_page.xhtml
index b8c70f16079..084a482f0f7 100644
--- a/src/main/webapp/mydata_page.xhtml
+++ b/src/main/webapp/mydata_page.xhtml
@@ -15,11 +15,13 @@
     <ui:composition template="/dataverse_template.xhtml">
       <ui:param name="pageTitle" value="Role/Permission Relationships - #{dataverseServiceBean.findRootDataverse().name}"/>
       <ui:param name="showDataverseHeader" value="false"/>
-      <ui:define name="body">
+      <ui:define name="metadata">
           <f:metadata>   
                 <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                 <f:viewAction action="#{MyDataPage.init}" />
           </f:metadata>
+      </ui:define>
+      <ui:define name="body">
           <ui:include src="mydata_fragment.xhtml"></ui:include>
     </ui:define>
     </ui:composition>
diff --git a/src/main/webapp/mydata_templates/cards_minimum.html b/src/main/webapp/mydata_templates/cards_minimum.html
index 88027b62ca8..d1a6ebec600 100644
--- a/src/main/webapp/mydata_templates/cards_minimum.html
+++ b/src/main/webapp/mydata_templates/cards_minimum.html
@@ -18,9 +18,13 @@
             <span class="icon-dataverse text-brand pull-right" title="Dataverse"></span>
             <a href="/dataverse/{{ card_info.identifier }}"><span style="padding:4px 0;">{{ card_info.name }}</span></a>
            {# <span class="text-muted">(<em>Affiliation</em>)</span>#}
- {% elif card_info.type == "dataset" %}
+  {% elif card_info.type == "dataset" %}
             <span class="icon-dataset text-info pull-right" title="Dataset"></span>
+        {% if card_info.is_draft_state %}
+            <a href="/dataset.xhtml?persistentId={{ card_info.global_id }}&version=DRAFT"><span style="padding:4px 0;">{{ card_info.name }}</span></a>
+        {% else %}
             <a href="/dataset.xhtml?persistentId={{ card_info.global_id }}"><span style="padding:4px 0;">{{ card_info.name }}</span></a>
+        {% endif %}
  {% elif card_info.type == "file" %}
             <span class="icon-file text-muted pull-right" title="File"></span>
             <a href="/file.xhtml?fileId={{ card_info.entity_id }}"><span style="padding:4px 0;">{{ card_info.name }}</span></a>
@@ -31,6 +35,7 @@
         {% if card_info.is_unpublished_state %}<span class="label label-warning unpublished"></span> {% endif %}
         {% if card_info.is_published %} <span class="label label-warning published"></span> {% endif %}
         {% if card_info.is_deaccesioned %} <span class="label label-danger deaccessioned"></span> {% endif %}
+        {% if not card_info.is_valid %} <span class="label label-danger incomplete"></span> {% endif %}
         
         <!-- roles -->
         {% for role_name in card_info.user_roles %}
@@ -56,7 +61,11 @@
 
  {% elif card_info.type == "dataset" %}
             <div class="card-preview-icon-block text-center">
+                {% if card_info.is_draft_state %}
+                <a href="/dataset.xhtml?persistentId={{ card_info.global_id }}&version=DRAFT"><span class="icon-dataset text-info"></span></a>
+                {% else %}
                 <a href="/dataset.xhtml?persistentId={{ card_info.global_id }}"><span class="icon-dataset text-info"></span></a>
+                {% endif %}
             </div>
             <span class="text-muted">{{ card_info.date_to_display_on_card }}
                 - <a href="/dataverse/{{ card_info.parent_alias }}">{{ card_info.parentName }}</a>
@@ -89,7 +98,7 @@
     {% else %}
         {% if card_info.description %}
         
-            {{ card_info.description|truncate(250)|safe }}
+            {{ card_info.description|truncate(250) }}
         {% endif %}
     {% endif %}
             
diff --git a/src/main/webapp/oauth2/callback.xhtml b/src/main/webapp/oauth2/callback.xhtml
index f0d66b2fa74..8d09f06da2d 100644
--- a/src/main/webapp/oauth2/callback.xhtml
+++ b/src/main/webapp/oauth2/callback.xhtml
@@ -21,14 +21,18 @@
             <ui:define name="body">
 	    <div class="alert alert-danger" role="alert" style="margin-top:3em;">
 		    <p>
-                    <h:outputFormat value="#{bundle['oauth2.callback.message']}" escape="false">
+                            <!-- This first, generic error message from the bundle should be displayed when something went wrong, 
+                                 but we are not sure what exactly has happened. There is no need to show it however when we know
+                                 exactly what it is, such as when new signups are disabled for this authentication method. Then the 
+                                 second error message provided by the page, below, will be specific enough. Hence the rendering rules: -->
+                            <h:outputFormat value="#{bundle['oauth2.callback.message']}" escape="false" rendered="#{(!OAuth2Page.disabled) and (!OAuth2Page.signUpDisabled)}">
                                     <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                     <f:param value="#{systemConfig.guidesVersion}"/>
 				    </h:outputFormat>
-				    </p>
-				    <p>
-				    <h:outputText value="#{OAuth2Page.error.message}"/>
-				    </p>
+                    </p>
+                    <p>
+                            <h:outputText value="#{OAuth2Page.error.message}"/>
+                    </p>
                     <h:outputFormat value="#{bundle['error.support.message']}" escape="false">
                             <o:param>
                                 <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml
index 6310a0b49da..07b1631d6cb 100644
--- a/src/main/webapp/oauth2/firstLogin.xhtml
+++ b/src/main/webapp/oauth2/firstLogin.xhtml
@@ -5,6 +5,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
+      xmlns:o="http://omnifaces.org/ui"
       xmlns:of="http://omnifaces.org/functions">
     <h:head>
     </h:head>
@@ -95,19 +96,19 @@
                                     <p:message for="selectedEmailMoreThanOneToPickFrom" display="text"/>
                                 </div>
                             </div>
-                            <div class="form-group" jsf:rendered="#{OAuth2FirstLoginPage.authProvider.displayIdentifier}">
-                                <label for="persistentUserId" class="col-sm-3 control-label">
-                                    #{OAuth2FirstLoginPage.authProvider.persistentIdName}
+                            <div class="form-group" jsf:rendered="#{OAuth2FirstLoginPage.newUser.displayInfo.orcid != null}">
+                                <label for="authenticatedOrcid" class="col-sm-3 control-label">
+                                    #{bundle['user.orcid']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{OAuth2FirstLoginPage.authProvider.persistentIdDescription}"></span>
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="ORCID"></span>
                                 </label>
-                                <div class="col-sm-4">
+                                <div class="col-sm-4" id="authenticatedOrcid">
                                     <p class="form-control-static">
-                                        <h:graphicImage value="#{OAuth2FirstLoginPage.authProvider.logo}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], OAuth2FirstLoginPage.authProvider.persistentIdName)}" rendered="#{OAuth2FirstLoginPage.authProvider.logo != null}"/>&#160;
-                                        <h:outputLink value="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix}#{OAuth2FirstLoginPage.newUser.idInService}" title="#{OAuth2FirstLoginPage.authProvider.persistentIdName}" target="_blank" rendered="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix != null}">
-                                            <h:outputText value="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix}#{OAuth2FirstLoginPage.newUser.idInService}"/>
+                                        <o:importFunctions type="edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP" />
+                                        <h:graphicImage value="#{OrcidOAuth2AP:getLogo()}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], bundle['user.orcid'])}"/>&#160;
+                                        <h:outputLink value="#{OAuth2FirstLoginPage.newUser.displayInfo.orcid}" title="#{bundle['user.orcid.link']}" target="_blank">
+                                            <h:outputText value="#{OAuth2FirstLoginPage.newUser.displayInfo.orcidForDisplay}"/>
                                         </h:outputLink>
-                                        <h:outputText value="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix}#{OAuth2FirstLoginPage.newUser.idInService}" rendered="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix == null}"/>
                                     </p>
                                 </div>
                             </div>
diff --git a/src/main/webapp/oauth2/orcidConfirm.xhtml b/src/main/webapp/oauth2/orcidConfirm.xhtml
new file mode 100644
index 00000000000..6138f14ea29
--- /dev/null
+++ b/src/main/webapp/oauth2/orcidConfirm.xhtml
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui"
+    xmlns:jsf="http://xmlns.jcp.org/jsf">
+<h:head>
+</h:head>
+
+<h:body>
+    <f:metadata>
+        <f:viewAction action="#{OAuth2Page.setOrcidInProfile()}" />
+    </f:metadata>
+    <ui:composition template="/dataverse_template.xhtml">
+        <ui:param name="pageTitle"
+            value="#{bundle['oauth2.callback.page.title']} - #{dataverseServiceBean.findRootDataverse().name}" />
+        <ui:param name="showDataverseHeader" value="false" />
+        <ui:param name="loginRedirectPage" value="dataverse.xhtml" />
+        <ui:param name="showMessagePanel" value="true" />
+        <ui:define name="body">
+            <div class="alert alert-danger" role="alert" style="margin-top: 3em;">
+                <p>
+                    <!-- This first, generic error message from the bundle should be displayed when something went wrong, 
+                                 but we are not sure what exactly has happened. There is no need to show it however when we know
+                                 exactly what it is, such as when new signups are disabled for this authentication method. Then the 
+                                 second error message provided by the page, below, will be specific enough. Hence the rendering rules: -->
+                    <h:outputFormat value="#{bundle['user.orcid.callback.message']}"
+                        escape="false">
+                    </h:outputFormat>
+                </p>
+                <p>
+                    <h:outputText value="#{OAuth2Page.error.message}" />
+                </p>
+                <h:outputFormat value="#{bundle['error.support.message']}"
+                    escape="false">
+                    <o:param>
+                        <p:commandLink value="#{settingsWrapper.supportTeamName}"
+                            oncomplete="PF('contactForm').show()" update=":contactDialog"
+                            actionListener="#{sendFeedbackDialog.initUserInput}">
+                            <f:setPropertyActionListener
+                                target="#{sendFeedbackDialog.messageSubject}" value="" />
+                            <f:setPropertyActionListener
+                                target="#{sendFeedbackDialog.recipient}" value="#{null}" />
+                            <f:setPropertyActionListener
+                                target="#{sendFeedbackDialog.userMessage}" value="" />
+                            <f:setPropertyActionListener
+                                target="#{sendFeedbackDialog.userEmail}" value="" />
+                        </p:commandLink>
+                    </o:param>
+                </h:outputFormat>
+            </div>
+
+            <ui:remove>
+                <p>
+                    Http Return Code:
+                    <code>#{OAuth2Page.error.httpReturnCode}</code>
+                </p>
+
+                <p>Raw message body:</p>
+
+                <pre>
+                    <code>
+                    #{OAuth2Page.error.messageBody}
+                </code>
+                </pre>
+            </ui:remove>
+
+        </ui:define>
+    </ui:composition>
+</h:body>
+</html>
diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml
index 2b8a4cac1c1..e475f870394 100644
--- a/src/main/webapp/passwordreset.xhtml
+++ b/src/main/webapp/passwordreset.xhtml
@@ -14,13 +14,15 @@
             <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/>
             <ui:param name="showDataverseHeader" value="false"/>
             <ui:param name="loginRedirectPage" value="dataverse.xhtml"/>
-            <ui:define name="body">
+
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewParam name="token" value="#{PasswordResetPage.token}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                     <f:viewAction action="#{PasswordResetPage.init}" />
                 </f:metadata>
-
+            </ui:define>
+            <ui:define name="body">
                 <ui:fragment id="debugVariables" rendered="false">
                     <div style="background-color: lightgray; margin-top:3em;">
                         <tt>
@@ -30,7 +32,7 @@
                         </tt>
                     </div>
                 </ui:fragment>
-                
+                <h1>#{pageTitle}</h1>
                 <ui:fragment rendered="#{empty PasswordResetPage.token}">
                     <div jsf:rendered="#{empty PasswordResetPage.emailAddress}">
                         <div class="alert alert-info">
@@ -53,7 +55,7 @@
                             </div>
                             <div class="form-group col-sm-11">
                                 <div class="col-sm-offset-3 col-sm-9 button-block">
-                                    <p:commandButton styleClass="btn btn-default" action="#{PasswordResetPage.sendPasswordResetLink()}" update="@all" value="#{bundle['passwdReset.submitRequest']}"/>
+                                    <p:commandButton styleClass="btn btn-default" action="#{PasswordResetPage.sendPasswordResetLink()}" update="passwordReset,:messagePanel" value="#{bundle['passwdReset.submitRequest']}"/>
                                     <p:button styleClass="btn btn-link" value="#{bundle.cancel}" outcome="/loginpage.xhtml"/>
                                 </div>
                             </div>
@@ -92,7 +94,7 @@
                     <ui:fragment rendered="#{not empty PasswordResetPage.user}">
                         <div class="alert alert-info">
                             <span class="glyphicon glyphicon-info-sign"></span>
-                            <h:outputFormat value="#{PasswordResetPage.customPasswordResetAlertMessage}" escape="false"> 
+                            <h:outputFormat value="#{PasswordResetPage.customPasswordResetAlertMessage}" escape="false">
                                 <f:param value="&lt;strong&gt;"/>
                                 <f:param value="&lt;/strong&gt;"/>
                             </h:outputFormat>
@@ -101,7 +103,6 @@
                             <div class="col-sm-12">
                                 <h:outputFormat styleClass="h2 text-info show" value="#{bundle['user.updatePassword.welcome']}">
                                     <f:param value="#{systemConfig.getVersion(true)}"/>
-                                    <f:param value="#{PasswordResetPage.user.displayInfo.title}"/>
                                 </h:outputFormat>
                                 <p class="help-block"><span class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['user.updatePassword.warning']}</span></p>
                             </div>
@@ -109,7 +110,7 @@
                         <div>
                             <h:form id="passwordResetForm" styleClass="form-horizontal">
                                 <p:focus context="passwordResetForm"/>
-                                <div class="form-group col-sm-11">
+                                <div class="form-group col-sm-11" jsf:rendered="#{PasswordResetPage.failedValidation}">
                                     <label for="inputPassword" class="col-sm-3 control-label">
                                         #{bundle['passwdReset.newPasswd']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"></span>
                                     </label>
@@ -125,7 +126,7 @@
 					<p:message for="inputPassword"/>
                                     </div>
                                 </div>
-                                <div class="form-group col-sm-11">
+                                <div class="form-group col-sm-11" jsf:rendered="#{PasswordResetPage.failedValidation}">
                                     <label for="retypePassword" class="col-sm-3 control-label">
                                         #{bundle['passwdReset.rePasswd']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"></span>
                                     </label>
@@ -140,7 +141,7 @@
                                 </ui:fragment>
                                 <div class="form-group col-sm-11">
                                     <div class="col-sm-10 button-block">
-                                        <p:commandButton styleClass="btn btn-default" action="#{PasswordResetPage.resetPassword()}" update="@all" value="#{bundle['passwdReset.resetBtn']}"/>
+                                        <p:commandButton styleClass="btn btn-default" action="#{PasswordResetPage.resetPassword()}" update="passwordResetForm,:messagePanel" value="#{bundle['passwdReset.resetBtn']}"/>
                                     </div>
                                 </div>
                             </h:form>
diff --git a/src/main/webapp/permissions-configure.xhtml b/src/main/webapp/permissions-configure.xhtml
index 3e8f55ba0a6..dc42e928a3b 100644
--- a/src/main/webapp/permissions-configure.xhtml
+++ b/src/main/webapp/permissions-configure.xhtml
@@ -26,7 +26,7 @@
         </label>
         <div class="col-sm-offset-1">
             <p:selectOneRadio id="defaultContributorRoleRadio" value="#{managePermissionsPage.defaultContributorRoleAlias}" layout="custom" >
-                <f:selectItem itemLabel="#{bundle.editor}" itemValue="editor" /> 
+                <f:selectItem itemLabel="#{bundle.editor}" itemValue="contributor" /> 
                 <f:selectItem itemLabel="#{bundle.curator}" itemValue="curator" /> 
                 <f:selectItem itemLabel="#{managePermissionsPage.customDefaultContributorRoleName}" itemValue="#{managePermissionsPage.customDefaultContributorRoleAlias}" /> #{managePermissionsPage.customDefaultContributorRoleAlias}               
             </p:selectOneRadio>
diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml
index 0cc2e36720a..4e4e56f2051 100644
--- a/src/main/webapp/permissions-manage-files.xhtml
+++ b/src/main/webapp/permissions-manage-files.xhtml
@@ -30,7 +30,7 @@
                         <div class="panel panel-default">
                             <div data-toggle="collapse" data-target="#panelCollapseUsersGroups" class="panel-heading text-info">
                                 #{bundle['dataverse.permissionsFiles.usersOrGroups']} <span class="glyphicon glyphicon-chevron-up"/>
-                                
+
                                 <span class="text-muted small pull-right">#{bundle['dataverse.permissionsFiles.usersOrGroups.description']}</span>
                             </div>
                             <div id="panelCollapseUsersGroups" class="collapse in">
@@ -40,98 +40,110 @@
                                             <iqbs:messages collapsible="true" rendered="#{manageFilePermissionsPage.renderUserGroupMessages}"/>
                                         </div>
                                     </p:fragment>
-                                    <div class="margin-bottom text-right">
-                                        <p:commandLink id="userGroupsAdd" styleClass="btn btn-default"
-                                                       actionListener="#{manageFilePermissionsPage.initAssignDialog}"
-                                                       update="assignDialog"
-                                                       oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');bind_bsui_components();">
-                                            <span class="glyphicon glyphicon-user"/> #{bundle['dataverse.permissionsFiles.usersOrGroups.assignBtn']}
-                                        </p:commandLink>
-                                    </div>
-                                    <div>
-                                        <p:fragment id="userGroupsRequests" rendered="#{!empty manageFilePermissionsPage.fileAccessRequestMap.entrySet().toArray()}">
-                                            <p>
-                                                <span class="highlightBold">#{manageFilePermissionsPage.fileAccessRequestMap.size()} #{bundle['dataverse.permissions.requests']} </span>
-                                            </p>
-                                            
-                                            <p:dataTable id="fileAccessRequests" styleClass="margin-bottom" var="access" value="#{manageFilePermissionsPage.fileAccessRequestMap.entrySet().toArray()}">
-                                                <p:column width="25%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.userOrGroup']}" >
-                                                    <h:outputText value="#{access.key.displayInfo.title}"/>
-                                                    <h:outputText value=" (#{access.key.displayInfo.affiliation})" rendered="#{!empty access.key.displayInfo.affiliation}"/>
-                                                </p:column>
-                                                <p:column width="10%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.id']}">
-                                                    <h:outputText value="#{access.key.identifier}"/>
-                                                </p:column>
-                                                <p:column width="15%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.authentication']}">
-                                                    <h:outputText value="#{manageFilePermissionsPage.getAuthProviderFriendlyName(access.key.authProviderId)}"/>
-                                                </p:column>
-                                                <p:column width="15%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.email']}">
-                                                    <h:outputText value="#{access.key.email}" rendered="#{!empty access.key.email}"/>
-                                                </p:column>
-                                                <p:column width="10%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.files']}">
-                                                    <p:commandLink id="viewUserGroups"
-                                                                   actionListener="#{manageFilePermissionsPage.initAssignDialogForFileRequester(access.key)}"
-                                                                   update=":#{p:resolveClientId('rolesPermissionsForm:assignDialog', view)}"
-                                                                   oncomplete="PF('assignWidget').show();">
-                                                        <h:outputText value="#{access.value.size()} #{access.value.size() eq 1 ?  bundle['dataverse.permissionsFiles.usersOrGroups.file'] : bundle['dataverse.permissionsFiles.usersOrGroups.files']}"/>
-                                                    </p:commandLink>
-                                                </p:column>
-                                                <p:column width="25%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.access']}">
-                                                    <div class="btn-group" role="group" aria-label="access">
-                                                        <p:commandLink styleClass="btn btn-default"
-                                                                       actionListener="#{manageFilePermissionsPage.grantAccessToAllRequests(access.key)}"
-                                                                       update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} :#{p:resolveClientId('rolesPermissionsForm:fileAccessRequests', view)}                                                                       
-                                                                       :#{p:resolveClientId('rolesPermissionsForm:userGroupsRequests', view)}
-                                                                       :#{p:resolveClientId('rolesPermissionsForm:userGroupMessages', view)} @([id$=Messages])"
-                                                                       oncomplete="bind_bsui_components();">
-                                                            <span class="glyphicon glyphicon-ok"/> #{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']}
+                                    <p:fragment id="usersGroups">
+                                        <div class="margin-bottom text-right">
+                                            <p:commandLink id="userGroupsAdd" styleClass="btn btn-default"
+                                                           actionListener="#{manageFilePermissionsPage.initAssignDialog}"
+                                                           update="assignDialog, filesFragment, usersGroups"
+                                                           oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');">
+                                                <span class="glyphicon glyphicon-user"/> #{bundle['dataverse.permissionsFiles.usersOrGroups.assignBtn']}
+                                            </p:commandLink>
+                                        </div>
+                                        <div class="panel-group">
+                                            <p:selectBooleanCheckbox value="#{manageFilePermissionsPage.showDeleted}" itemLabel="#{bundle['dataverse.permissionsFiles.files.includeDeleted']}"  onchange="#{manageFilePermissionsPage.showDeletedCheckboxChange()}">
+                                                <p:ajax update="filesFragment, usersGroups"/>
+                                            </p:selectBooleanCheckbox>
+                                        </div>
+                                        <div>
+                                            <p:fragment id="userGroupsRequests" rendered="#{!empty manageFilePermissionsPage.fileAccessRequestMap.entrySet().toArray()}">
+                                                <p>
+                                                    <span class="highlightBold">#{manageFilePermissionsPage.fileAccessRequestMap.size()} #{bundle['dataverse.permissions.requests']} </span>
+                                                </p>
+                                                <p:dataTable id="fileAccessRequests" styleClass="margin-bottom" var="access" value="#{manageFilePermissionsPage.fileAccessRequestMap.entrySet().toArray()}">
+                                                    <p:column width="20%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.userOrGroup']}" >
+                                                        <h:outputText value="#{access.key.displayInfo.title}"/>
+                                                        <h:outputText value=" (#{access.key.displayInfo.affiliation})" rendered="#{!empty access.key.displayInfo.affiliation}"/>
+                                                    </p:column>
+                                                    <p:column width="10%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.id']}">
+                                                        <h:outputText value="#{access.key.identifier}"/>
+                                                    </p:column>
+                                                    <p:column width="15%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.authentication']}">
+                                                        <h:outputText value="#{manageFilePermissionsPage.getAuthProviderFriendlyName(access.key.authProviderId)}" />
+                                                    </p:column>
+                                                    <p:column width="15%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.email']}">
+                                                        <h:outputText value="#{access.key.email}" rendered="#{!empty access.key.email}"/>
+                                                    </p:column>
+                                                    <p:column width="10%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.files']}">
+                                                        <p:commandLink id="viewUserGroups"
+                                                                       actionListener="#{manageFilePermissionsPage.initAssignDialogForFileRequester(access.key)}"
+                                                                       update=":#{p:resolveClientId('rolesPermissionsForm:assignDialog', view)}"
+                                                                       oncomplete="PF('assignWidget').show();">
+                                                            <h:outputText value="#{access.value.size()} #{access.value.size() eq 1 ?  bundle['dataverse.permissionsFiles.usersOrGroups.file'] : bundle['dataverse.permissionsFiles.usersOrGroups.files']}"/>
+                                                        </p:commandLink>
+                                                    </p:column>
+                                                    <p:column width="10%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.accessRequestDate']}">
+                                                        <h:outputText value="#{manageFilePermissionsPage.formatAccessRequestDate(access.value)}"
+                                                                      title="#{manageFilePermissionsPage.formatAccessRequestTimestamp(access.value)}"
+                                                            rendered="#{manageFilePermissionsPage.formatAccessRequestDate(access.value) != null}" />
+                                                        <h:outputText value="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.accessRequestDateNotAvailable']}"
+                                                            rendered="#{manageFilePermissionsPage.formatAccessRequestDate(access.value) == null}" />
+                                                    </p:column>
+                                                    <p:column width="20%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.access']}">
+                                                        <div class="btn-group" role="group" aria-label="access">
+                                                            <p:commandLink styleClass="btn btn-default"
+                                                                           actionListener="#{manageFilePermissionsPage.grantAccessToAllRequests(access.key)}"
+                                                                           update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)}
+                                                                           :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)}
+                                                                           #{p:resolveClientId('rolesPermissionsForm:usersGroups', view)}
+                                                                           @([id$=Messages])">
+                                                                <span class="glyphicon glyphicon-ok"/> #{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']}
+                                                            </p:commandLink>
+                                                            <p:commandLink styleClass="btn btn-default"
+                                                                           actionListener="#{manageFilePermissionsPage.rejectAccessToAllRequests(access.key)}"
+                                                                           update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)}
+                                                                           :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)}
+                                                                           #{p:resolveClientId('rolesPermissionsForm:usersGroups', view)}
+                                                                           @([id$=Messages])">
+                                                                <span class="glyphicon glyphicon-ban-circle"/> #{bundle['dataverse.permissionsFiles.assignDialog.rejectBtn']}
+                                                            </p:commandLink>
+                                                        </div>
+                                                    </p:column>
+                                                </p:dataTable>
+                                            </p:fragment>
+                                            <p:fragment id="userGroups">
+                                                <p>
+                                                    <span class="highlightBold">#{manageFilePermissionsPage.roleAssigneeMap.size()} #{bundle['dataverse.permissions.usersOrGroups']}</span>
+                                                </p>
+                                                <p:dataTable id="userGroupsAccess" var="ra" value="#{manageFilePermissionsPage.roleAssigneeMap.entrySet().toArray()}"
+                                                             emptyMessage="#{bundle['dataverse.permissionsFiles.usersOrGroups.invalidMsg']}">
+                                                    <p:column width="35%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.userOrGroup']}">
+                                                        <h:outputText value="#{ra.key.displayInfo.title}"/>
+                                                        <h:outputText value=" (#{ra.key.displayInfo.affiliation})" rendered="#{!empty ra.key.displayInfo.affiliation}"/>
+                                                    </p:column>
+                                                    <p:column width="15%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.id']}">
+                                                        <h:outputText value="#{ra.key.identifier}"/>
+                                                    </p:column>
+                                                    <p:column width="20%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.files']}">
+                                                        <p:commandLink id="viewUserGroups" styleClass="btn btn-default"
+                                                                       actionListener="#{manageFilePermissionsPage.initViewRemoveDialogByRoleAssignee(ra.key, ra.value)}"
+                                                                       update=":#{p:resolveClientId('rolesPermissionsForm:viewRemoveDialog', view)}"
+                                                                       oncomplete="PF('viewRemoveWidget').show();">
+                                                            <h:outputText value="#{ra.value.size()} #{ra.value.size() eq 1 ?  bundle['dataverse.permissionsFiles.usersOrGroups.file'] : bundle['dataverse.permissionsFiles.usersOrGroups.files']}"/>
                                                         </p:commandLink>
+                                                    </p:column>
+                                                    <p:column width="30%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.access']}">
                                                         <p:commandLink styleClass="btn btn-default"
-                                                                       actionListener="#{manageFilePermissionsPage.rejectAccessToAllRequests(access.key)}"
-                                                                       update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} :#{p:resolveClientId('rolesPermissionsForm:fileAccessRequests', view)}                                                                       
-                                                                       :#{p:resolveClientId('rolesPermissionsForm:userGroupsRequests', view)}
-                                                                       :#{p:resolveClientId('rolesPermissionsForm:userGroupMessages', view)} @([id$=Messages])"
-                                                                       oncomplete="bind_bsui_components();">
-                                                            <span class="glyphicon glyphicon-ban-circle"/> #{bundle['dataverse.permissionsFiles.assignDialog.rejectBtn']}
+                                                                       update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} @([id$=Messages])"
+                                                                       actionListener="#{manageFilePermissionsPage.showUserGroupMessages}"
+                                                                       onclick="PF('confirmation').show()">
+                                                            <f:setPropertyActionListener value="#{ra.value}" target="#{manageFilePermissionsPage.selectedRoleAssignmentRows}" />
+                                                            <span class="glyphicon glyphicon-remove"/> #{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn']}
                                                         </p:commandLink>
-                                                    </div>
-                                                </p:column>
-                                            </p:dataTable>
-                                        </p:fragment>
-                                        <p:fragment id="userGroups">
-                                            <p>
-                                                <span class="highlightBold">#{manageFilePermissionsPage.roleAssigneeMap.size()} #{bundle['dataverse.permissions.usersOrGroups']}</span>
-                                            </p>
-                                            
-                                            <p:dataTable id="userGroupsAccess" var="ra" value="#{manageFilePermissionsPage.roleAssigneeMap.entrySet().toArray()}"
-                                                         emptyMessage="#{bundle['dataverse.permissionsFiles.usersOrGroups.invalidMsg']}">
-                                                <p:column width="35%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.userOrGroup']}">
-                                                    <h:outputText value="#{ra.key.displayInfo.title}"/>
-                                                    <h:outputText value=" (#{ra.key.displayInfo.affiliation})" rendered="#{!empty ra.key.displayInfo.affiliation}"/>
-                                                </p:column>
-                                                <p:column width="15%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.id']}">
-                                                    <h:outputText value="#{ra.key.identifier}"/>
-                                                </p:column>
-                                                <p:column width="20%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.files']}">
-                                                    <p:commandLink id="viewUserGroups" styleClass="btn btn-default"
-                                                                   actionListener="#{manageFilePermissionsPage.initViewRemoveDialogByRoleAssignee(ra.key, ra.value)}"
-                                                                   update=":#{p:resolveClientId('rolesPermissionsForm:viewRemoveDialog', view)}"
-                                                                   oncomplete="PF('viewRemoveWidget').show(); bind_bsui_components();">
-                                                        <h:outputText value="#{ra.value.size()} #{ra.value.size() eq 1 ?  bundle['dataverse.permissionsFiles.usersOrGroups.file'] : bundle['dataverse.permissionsFiles.usersOrGroups.files']}"/>
-                                                    </p:commandLink>
-                                                </p:column>
-                                                <p:column width="30%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.access']}">
-                                                    <p:commandLink styleClass="btn btn-default"
-                                                                   update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} @([id$=Messages])"
-                                                                   actionListener="#{manageFilePermissionsPage.showUserGroupMessages}"
-                                                                   onclick="PF('confirmation').show()">
-                                                        <f:setPropertyActionListener value="#{ra.value}" target="#{manageFilePermissionsPage.selectedRoleAssignmentRows}" />
-                                                        <span class="glyphicon glyphicon-remove"/> #{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn']}
-                                                    </p:commandLink>
-                                                </p:column>
-                                            </p:dataTable>
-                                        </p:fragment>
-                                    </div>
+                                                    </p:column>
+                                                </p:dataTable>
+                                            </p:fragment>
+                                        </div>
+                                    </p:fragment>
                                 </div>
                             </div>
                         </div>
@@ -139,7 +151,7 @@
                         <div class="panel panel-default">
                             <div data-toggle="collapse" data-target="#panelCollapseFiles" class="panel-heading text-info">
                                 #{bundle['dataverse.permissionsFiles.files']} <span class="glyphicon glyphicon-chevron-down"/>
-                                
+
                                 <span class="text-muted small pull-right">#{bundle['dataverse.permissionsFiles.files.description']}</span>
                             </div>
                             <div id="panelCollapseFiles" class="collapse">
@@ -149,53 +161,59 @@
                                             <iqbs:messages  collapsible="true" rendered="#{manageFilePermissionsPage.renderFileMessages}"/>
                                         </div>
                                     </p:fragment>
-                                    
-                                    <p>
-                                        <h:outputFormat styleClass="highlightBold" value="#{manageFilePermissionsPage.fileMap.size()} #{bundle['dataverse.permissionsFiles.files.label']}">
-                                            <f:param value="#{manageFilePermissionsPage.fileMap.size()}"/>
-                                        </h:outputFormat>
-                                    </p>
-                                    
-                                    <p:dataTable id="restrictedFiles" var="fileEntry" value="#{manageFilePermissionsPage.fileMap.entrySet().toArray()}"
-                                                 emptyMessage="#{bundle['dataverse.permissionsFiles.files.invalidMsg']}">
-                                        <p:column width="40%" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.fileName']}">
-                                            <h:outputText value="#{fileEntry.key.displayName}"/>
-                                        </p:column>
-                                        <p:column width="10%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.publishedRestrictedState']}" rendered="#{manageFilePermissionsPage.dataset.released}">
-                                            <c:set var="fileVersionCount" value="#{fileEntry.key.fileMetadatas.size()}" />
-                                            <c:set var="fileVersion" value="#{fileEntry.key.fileMetadata.datasetVersion.id}" />
-                                            <c:set var="dsPublishedVersion" value="#{manageFilePermissionsPage.dataset.releasedVersion.id}" />
-                                            <c:set var="fileRestricted" value="#{fileEntry.key.restricted}" />
-                                            <h:outputText value="#{bundle['dataverse.permissionsFiles.files.deleted']}" rendered="#{fileVersion lt dsPublishedVersion}"/>
-                                            <h:outputText value="#{bundle['dataverse.permissionsFiles.files.restricted']}" rendered="#{fileRestricted and fileVersion ge dsPublishedVersion}"/>
-                                            <h:outputText value="#{bundle['dataverse.permissionsFiles.files.public']}" rendered="#{!fileRestricted and fileVersionCount ne 1}"/>
-                                        </p:column>
-                                        <p:column width="10%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.draftRestrictedState']}" rendered="#{manageFilePermissionsPage.dataset.latestVersion.draft}">
-                                            <c:set var="fileVersion" value="#{fileEntry.key.fileMetadata.datasetVersion.id}" />
-                                            <c:set var="dsPublishedVersion" value="#{manageFilePermissionsPage.dataset.releasedVersion.id}" />
-                                            <c:set var="dsLatestVersion" value="#{manageFilePermissionsPage.dataset.latestVersion.id}" />
-                                            <c:set var="latestVersionRestricted" value="#{fileEntry.key.fileMetadata.restricted}" />
-                                            <h:outputText value="#{bundle['dataverse.permissionsFiles.files.deleted']}" rendered="#{fileVersion eq dsPublishedVersion}"/>
-                                            <h:outputText value="#{bundle['dataverse.permissionsFiles.files.restricted']}" rendered="#{fileVersion eq dsLatestVersion and latestVersionRestricted}"/>
-                                            <h:outputText value="#{bundle['dataverse.permissionsFiles.files.public']}" rendered="#{fileVersion eq dsLatestVersion and !latestVersionRestricted}"/>
-                                        </p:column>
-                                        <p:column width="18%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.roleAssignees']}">
-                                            <p:commandLink id="viewUserGroups" styleClass="btn btn-default"
-                                                           rendered="#{fileEntry.value.size() > 0}"
-                                                           actionListener="#{manageFilePermissionsPage.initViewRemoveDialogByFile(fileEntry.key, fileEntry.value)}"
-                                                           update=":#{p:resolveClientId('rolesPermissionsForm:viewRemoveDialog', view)}"
-                                                           oncomplete="PF('viewRemoveWidget').show();">
-                                                <h:outputText value="#{fileEntry.value.size()} #{fileEntry.value.size() eq 1 ?  bundle['dataverse.permissionsFiles.files.roleAssignee'] : bundle['dataverse.permissionsFiles.files.roleAssignees']}"/>
-                                            </p:commandLink>
-                                            <h:outputText rendered="#{fileEntry.value.size() == 0}" value="#{fileEntry.value.size()} #{bundle['dataverse.permissionsFiles.files.roleAssignees']}"/>
-                                        </p:column>
-                                        <p:column width="22%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.access']}">
-                                            <p:commandLink styleClass="btn btn-default"
-                                                           actionListener="#{manageFilePermissionsPage.initAssignDialogByFile(fileEntry.key)}"
-                                                           update=":#{p:resolveClientId('rolesPermissionsForm:assignDialog', view)}"
-                                                           oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');bind_bsui_components();"><span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.permissionsFiles.files.assignBtn']}</p:commandLink>
-                                        </p:column>
-                                    </p:dataTable>
+                                    <p:fragment id="filesFragment">
+                                        <div class="panel-group">
+                                            <p:selectBooleanCheckbox value="#{manageFilePermissionsPage.showDeleted}" itemLabel="#{bundle['dataverse.permissionsFiles.files.includeDeleted']}" onchange="#{manageFilePermissionsPage.showDeletedCheckboxChange()}">
+                                                <p:ajax update="filesFragment, usersGroups"/>
+                                            </p:selectBooleanCheckbox>
+                                        </div>
+                                        <p>
+                                            <h:outputFormat styleClass="highlightBold" value="#{manageFilePermissionsPage.fileMap.size()} #{bundle['dataverse.permissionsFiles.files.label']}">
+                                                <f:param value="#{manageFilePermissionsPage.fileMap.size()}"/>
+                                            </h:outputFormat>
+                                        </p>
+                                        <p:dataTable id="restrictedFiles" var="fileEntry" value="#{manageFilePermissionsPage.fileMap.entrySet().toArray()}"
+                                                     emptyMessage="#{bundle['dataverse.permissionsFiles.files.invalidMsg']}">
+                                            <p:column width="40%" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.fileName']}">
+                                                <h:outputText rendered="#{!empty fileEntry.key.directoryLabel}" value="#{fileEntry.key.directoryLabel}/" styleClass="text-muted"/>
+                                                <h:outputText value="#{fileEntry.key.displayName}"/>
+                                            </p:column>
+                                            <p:column width="10%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.publishedRestrictedState']}" rendered="#{manageFilePermissionsPage.dataset.released}">
+                                                <c:set var="fileVersionCount" value="#{fileEntry.key.fileMetadatas.size()}" />
+                                                <c:set var="fileVersion" value="#{fileEntry.key.fileMetadata.datasetVersion.id}" />
+                                                <c:set var="dsPublishedVersion" value="#{manageFilePermissionsPage.dataset.releasedVersion.id}" />
+                                                <c:set var="fileRestricted" value="#{fileEntry.key.restricted}" />
+                                                <h:outputText value="#{bundle['dataverse.permissionsFiles.files.deleted']}" rendered="#{fileVersion lt dsPublishedVersion}"/>
+                                                <h:outputText value="#{bundle['dataverse.permissionsFiles.files.restricted']}" rendered="#{fileRestricted and fileVersion ge dsPublishedVersion}"/>
+                                                <h:outputText value="#{bundle['dataverse.permissionsFiles.files.public']}" rendered="#{!fileRestricted and fileVersionCount ne 1}"/>
+                                            </p:column>
+                                            <p:column width="10%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.draftRestrictedState']}" rendered="#{manageFilePermissionsPage.dataset.latestVersion.draft}">
+                                                <c:set var="fileVersion" value="#{fileEntry.key.fileMetadata.datasetVersion.id}" />
+                                                <c:set var="dsPublishedVersion" value="#{manageFilePermissionsPage.dataset.releasedVersion.id}" />
+                                                <c:set var="dsLatestVersion" value="#{manageFilePermissionsPage.dataset.latestVersion.id}" />
+                                                <c:set var="latestVersionRestricted" value="#{fileEntry.key.fileMetadata.restricted}" />
+                                                <h:outputText value="#{bundle['dataverse.permissionsFiles.files.deleted']}" rendered="#{fileVersion eq dsPublishedVersion}"/>
+                                                <h:outputText value="#{bundle['dataverse.permissionsFiles.files.restricted']}" rendered="#{fileVersion eq dsLatestVersion and latestVersionRestricted}"/>
+                                                <h:outputText value="#{bundle['dataverse.permissionsFiles.files.public']}" rendered="#{fileVersion eq dsLatestVersion and !latestVersionRestricted}"/>
+                                            </p:column>
+                                            <p:column width="18%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.roleAssignees']}">
+                                                <p:commandLink id="viewUserGroups" styleClass="btn btn-default"
+                                                               rendered="#{fileEntry.value.size() > 0}"
+                                                               actionListener="#{manageFilePermissionsPage.initViewRemoveDialogByFile(fileEntry.key, fileEntry.value)}"
+                                                               update=":#{p:resolveClientId('rolesPermissionsForm:viewRemoveDialog', view)}"
+                                                               oncomplete="PF('viewRemoveWidget').show();">
+                                                    <h:outputText value="#{fileEntry.value.size()} #{fileEntry.value.size() eq 1 ?  bundle['dataverse.permissionsFiles.files.roleAssignee'] : bundle['dataverse.permissionsFiles.files.roleAssignees']}"/>
+                                                </p:commandLink>
+                                                <h:outputText rendered="#{fileEntry.value.size() == 0}" value="#{fileEntry.value.size()} #{bundle['dataverse.permissionsFiles.files.roleAssignees']}"/>
+                                            </p:column>
+                                            <p:column width="22%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.access']}">
+                                                <p:commandLink styleClass="btn btn-default" rendered="#{!fileEntry.key.deleted}"
+                                                               actionListener="#{manageFilePermissionsPage.initAssignDialogByFile(fileEntry.key)}"
+                                                               update=":#{p:resolveClientId('rolesPermissionsForm:assignDialog', view)}, :#{p:resolveClientId('rolesPermissionsForm:filesFragment', view)}, :#{p:resolveClientId('rolesPermissionsForm:usersGroups', view)}"
+                                                               oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');"><span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.permissionsFiles.files.assignBtn']}</p:commandLink>
+                                            </p:column>
+                                        </p:dataTable>
+                                    </p:fragment>
                                 </div>
                             </div>
                         </div>
@@ -212,22 +230,24 @@
                                     </h:outputFormat>
                                 </p>
                             </p:outputPanel>
-                            
+
                             <p:dataTable id="assignedRoles" var="roleAssignment" value="#{manageFilePermissionsPage.roleAssignments}"
-                                         selection="#{manageFilePermissionsPage.selectedRoleAssignmentRows}" rowKey="#{roleAssignment.id}" 
+                                         selection="#{manageFilePermissionsPage.selectedRoleAssignmentRows}" rowKey="#{roleAssignment.id}"
                                          sortBy="#{!empty manageFilePermissionsPage.selectedFile ? roleAssignment.assigneeDisplayInfo.title : roleAssignment.definitionPoint.displayName}"
                                          scrollable="true" scrollHeight="300" disabledSelection="#{!roleAssignment.definitionPoint.instanceofDataFile}">
-                                
+
                                 <p:ajax event="rowSelectCheckbox"  update=":rolesPermissionsForm:selectionRemoveCounter" />
                                 <p:ajax event="rowUnselectCheckbox"  update=":rolesPermissionsForm:selectionRemoveCounter" />
                                 <p:ajax event="toggleSelect"  update=":rolesPermissionsForm:selectionRemoveCounter" />
-                                
+
                                 <p:column selectionMode="multiple" style="width:2%;text-align:center"/>
                                 <p:column width="98%" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.userOrGroup']}" rendered="#{!empty manageFilePermissionsPage.selectedFile}">
                                     <h:outputText value="#{roleAssignment.assigneeDisplayInfo.title}"/> <h:outputText value=" (#{roleAssignment.assigneeDisplayInfo.affiliation})" rendered="#{!empty roleAssignment.assigneeDisplayInfo.affiliation}"/>
                                 </p:column>
                                 <p:column width="98%" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.fileName']}" rendered="#{!empty manageFilePermissionsPage.selectedRoleAssignee}">
+                                    <h:outputText rendered="#{!empty roleAssignment.definitionPoint.directoryLabel}" value="#{roleAssignment.definitionPoint.directoryLabel}/" styleClass="text-muted"/>
                                     <h:outputText value="#{roleAssignment.definitionPoint.displayName}"/>
+                                    <h:outputText value=" (#{bundle['dataverse.permissionsFiles.files.deleted']}) " rendered="#{roleAssignment.deleted}"/>
                                 </p:column>
                             </p:dataTable>
                         </div>
@@ -259,17 +279,17 @@
                                     </label>
                                     <div class="col-sm-5">
                                         <p:autoComplete id="userGroupNameAssign" placeholder="#{bundle['dataverse.permissionsFiles.assignDialog.userOrGroup.enterName']}"
-                                                        multiple="true" scrollHeight="180" forceSelection="true" 
-                                                        minQueryLength="2" queryDelay="1000"                                      
-                                                        groupBy="#{roleAssignee.identifier.startsWith('@')?'Users':'Groups'}"                                              
+                                                        multiple="true" scrollHeight="180" forceSelection="true"
+                                                        minQueryLength="2" queryDelay="1000"
+                                                        groupBy="#{roleAssignee.identifier.startsWith('@')?'Users':'Groups'}"
                                                         emptyMessage="#{bundle['dataverse.permissionsFiles.assignDialog.userOrGroup.invalidMsg']}"
-                                                        value="#{manageFilePermissionsPage.selectedRoleAssignees}"  
+                                                        value="#{manageFilePermissionsPage.selectedRoleAssignees}"
                                                         completeMethod="#{manageFilePermissionsPage.completeRoleAssignee}"
                                                         required="#{param['DO_VALIDATION']}" requiredMessage="#{bundle['dataverse.permissionsFiles.assignDialog.userOrGroup.requiredMsg']}"
                                                         styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
                                                         var="roleAssignee" itemLabel="#{roleAssignee.displayInfo.title}" itemValue="#{roleAssignee}" converter="roleAssigneeConverter">
                                             <p:column>
-                                                <h:outputText value="#{roleAssignee.displayInfo.title}"/> 
+                                                <h:outputText value="#{roleAssignee.displayInfo.title}"/>
                                                 <h:outputText value=" (#{roleAssignee.displayInfo.affiliation})" rendered="#{!empty roleAssignee.displayInfo.affiliation}"/>
                                             </p:column>
                                             <p:column>
@@ -278,9 +298,6 @@
                                             <p:ajax process="@this" event="itemSelect" />
                                             <p:ajax process="@this" event="itemUnselect" />
                                         </p:autoComplete>
-                                        <script>
-                                            handle_dropdown_popup_scroll();
-                                        </script>
                                         <p:message for="userGroupNameAssign" display="text"/>
                                     </div>
                                 </div>
@@ -290,11 +307,11 @@
                                     <p>
                                         <h:outputFormat styleClass="highlightBold" value="#{bundle['dataverse.permissionsFiles.files.selected']}">
                                             <f:param value="#{manageFilePermissionsPage.selectedFiles.size()}"/>
-                                            <f:param value="#{!empty manageFilePermissionsPage.fileRequester ? 
+                                            <f:param value="#{!empty manageFilePermissionsPage.fileRequester ?
                                                         manageFilePermissionsPage.fileAccessRequestMap.get(manageFilePermissionsPage.fileRequester).size()
                                                         :
                                                         manageFilePermissionsPage.fileMap.size()}"/>
-                                            <f:param value="#{!empty manageFilePermissionsPage.fileRequester ? 
+                                            <f:param value="#{!empty manageFilePermissionsPage.fileRequester ?
                                                         bundle['dataverse.permissionsFiles.files.requested']
                                                         :
                                                         bundle['dataverse.permissionsFiles.files']}"/>
@@ -305,7 +322,7 @@
                                 <o:importFunctions type="java.util.Arrays" />
                                 <p:dataTable id="restrictedFilesForAccess" var="file"
                                              value="#{empty manageFilePermissionsPage.fileRequester ? Arrays:asList(manageFilePermissionsPage.fileMap.keySet().toArray()) :
-                                                      manageFilePermissionsPage.fileAccessRequestMap.get(manageFilePermissionsPage.fileRequester)}"
+                                                      manageFilePermissionsPage.dataFilesForRequestor}"
                                              selection="#{manageFilePermissionsPage.selectedFiles}" rowKey="#{file.id}" sortBy="#{file.displayName}"
                                              scrollable="true" scrollHeight="300">
 
@@ -314,8 +331,10 @@
                                     <p:ajax event="toggleSelect"  update=":rolesPermissionsForm:selectionCounter" />
 
                                     <p:column selectionMode="multiple" style="width:2%;text-align:center"/>
-                                    <p:column headerText="#{bundle['dataverse.permissionsFiles.assignDialog.fileName']}">
+                                    <p:column width="98%"  headerText="#{bundle['dataverse.permissionsFiles.assignDialog.fileName']}">
+                                        <h:outputText rendered="#{!empty file.directoryLabel}" value="#{file.directoryLabel}/" styleClass="text-muted"/>
                                         <h:outputText value="#{file.displayName}"/>
+                                        <h:outputText value=" (#{bundle['dataverse.permissionsFiles.files.deleted']}) " rendered="#{file.deleted}"/>
                                     </p:column>
                                 </p:dataTable>
                             </div>
diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml
index f75a5471f93..b328e4abc81 100644
--- a/src/main/webapp/permissions-manage.xhtml
+++ b/src/main/webapp/permissions-manage.xhtml
@@ -68,7 +68,7 @@
                                                     </label>
                                                     <div class="col-sm-offset-1">
                                                         <p class="form-control-static">
-                                                            <ui:fragment rendered="#{managePermissionsPage.defaultContributorRoleAlias eq 'editor'}">
+                                                            <ui:fragment rendered="#{managePermissionsPage.defaultContributorRoleAlias eq 'contributor'}">
                                                                 #{bundle.editor} <span class="text-muted">#{bundle['dataverse.permissions.Q2.answer.editor.description']}</span>
                                                             </ui:fragment>
                                                             <ui:fragment rendered="#{managePermissionsPage.defaultContributorRoleAlias eq 'curator'}">
@@ -105,7 +105,7 @@
                                         <p:commandLink id="userGroupsAdd" styleClass="btn btn-default"
                                                        actionListener="#{managePermissionsPage.initAssigneeDialog}"
                                                        update="userGroupDialog"
-                                                       oncomplete="PF('userGroupsForm').show();handleResizeDialog('userGroupDialog');bind_bsui_components();">
+                                                       oncomplete="PF('userGroupsForm').show();handleResizeDialog('userGroupDialog');">
                                             <span class="glyphicon glyphicon-user"/> #{bundle['dataverse.permissions.usersOrGroups.assignBtn']}
                                         </p:commandLink>
                                     </div>
@@ -163,7 +163,7 @@
                                                        rendered="#{managePermissionsPage.dvObject.instanceofDataverse and permissionsWrapper.canManagePermissions(managePermissionsPage.dvObject)
                                                                     and dataverseSession.user.superuser}"
                                                        actionListener="#{managePermissionsPage.createNewRole}"
-                                                       oncomplete="PF('roleForm').show();handleResizeDialog('rolesPermissionsDialog');bind_bsui_components();"
+                                                       oncomplete="PF('roleForm').show();handleResizeDialog('rolesPermissionsDialog');"
                                                        update=":#{p:resolveClientId('rolesPermissionsForm:editRolePanel', view)}">
                                             <span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.permissions.roles.add']}
                                         </p:commandLink>
diff --git a/src/main/webapp/previewurl.xhtml b/src/main/webapp/previewurl.xhtml
new file mode 100644
index 00000000000..c9e2ffeedfa
--- /dev/null
+++ b/src/main/webapp/previewurl.xhtml
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:jsf="http://xmlns.jcp.org/jsf"
+      xmlns:p="http://primefaces.org/ui">
+    <h:head>
+    </h:head>
+
+    <h:body>
+        <ui:composition template="/dataverse_template.xhtml">
+            <ui:param name="pageTitle" value="#{bundle['dataset.privateurl.header']}"/>
+            <ui:param name="showDataverseHeader" value="false"/>
+            <ui:define name="metadata">
+                <f:metadata>
+                    <f:viewParam name="token" value="#{PrivateUrlPage.token}"/>
+                    <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
+                    <f:viewAction action="#{PrivateUrlPage.init}" />
+                </f:metadata>
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/privateurl.xhtml b/src/main/webapp/privateurl.xhtml
index 5ca90112a84..a1bac00534e 100644
--- a/src/main/webapp/privateurl.xhtml
+++ b/src/main/webapp/privateurl.xhtml
@@ -12,7 +12,7 @@
         <ui:composition template="/dataverse_template.xhtml">
             <ui:param name="pageTitle" value="#{bundle['dataset.privateurl.header']}"/>
             <ui:param name="showDataverseHeader" value="false"/>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewParam name="token" value="#{PrivateUrlPage.token}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
diff --git a/src/main/webapp/provenance-popups-fragment.xhtml b/src/main/webapp/provenance-popups-fragment.xhtml
index 58931f2e75c..92f109b11d0 100644
--- a/src/main/webapp/provenance-popups-fragment.xhtml
+++ b/src/main/webapp/provenance-popups-fragment.xhtml
@@ -7,7 +7,10 @@
                 xmlns:o="http://omnifaces.org/ui"
                 xmlns:jsf="http://xmlns.jcp.org/jsf"
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-    <script src="#{resource['js/fileupload.js']}"></script>
+
+
+    <h:outputScript name='js/fileupload.js?version=#{systemConfig.getVersion()}' />
+
     <p:dialog id="editProvenancePopup" styleClass="smallPopUp" header="#{bundle['file.editProvenanceDialog']}" widgetVar="editProvenancePopup" modal="true" >
         <p:fragment id="assignMessages">
             <div class="popupMessagePanel">
@@ -25,7 +28,7 @@
                         
                     </p>
                 </div>
-                <label for="provenanceBundle" class="col-sm-3 control-label">
+                <label jsf:for="provUpload_input" class="col-sm-3 control-label">
                     #{bundle['file.editProvenanceDialog.bundleFile']}
                 </label>
                 <div class="col-sm-9">
@@ -46,12 +49,11 @@
                                           auto="true"
                                           multiple="false"
                                           allowTypes="/(\.|\/)(json)$/"
-                                          fileUploadListener="#{provPopupFragmentBean.handleFileUpload}" 
+                                          listener="#{provPopupFragmentBean.handleFileUpload}" 
                                           update="provPopupOutput,assignMessages" 
                                           label="#{bundle['file.editProvenanceDialog.selectToAddBtn']}"
                                           onstart="javascript:uploadStarted();"
                                           onerror="javascript:uploadFailure();"
-                                          oncomplete="bind_bsui_components();"
                                           fileLimit="1" 
                                           invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}"/>
                         </ui:fragment>
@@ -94,9 +96,7 @@
                             forceSelection="true" 
                             converter="provEntityFileDataConverter"
                             styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
-                            onkeypress="if (event.keyCode == 13) {
-                                return false;
-                            }">
+                            onkeypress="if (event.keyCode == 13) {return false;}">
                             <p:column headerText="#{bundle['file.editProvenanceDialog.bundleEntity.nameHeader']}">
                                 <h:outputText value="#{provEntityFileData.fileName}" />
                             </p:column>
@@ -107,9 +107,6 @@
                                 <h:outputText value="#{provEntityFileData.entityName}" />
                             </p:column>
                         </p:autoComplete>
-                        <script>
-                            handle_dropdown_popup_scroll();
-                        </script>
                         <p:message for="provJsonNameDropdown" display="text"/>
                     </div>
                 </div>
@@ -121,7 +118,7 @@
                 </div>
             </div>
             <div class="form-group text-left">
-                <label for="provenanceAddDescription" class="col-sm-3 control-label">
+                <label jsf:for="provenanceFreeform" class="col-sm-3 control-label">
                     #{bundle['file.editProvenanceDialog.description']}
                 </label>
                 <div class="col-sm-9">
@@ -172,8 +169,11 @@
             </div>
         </div>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" id="confirmProvenancePopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('confirmProvenancePopup').hide();" action="#{provPopupFragmentBean.stagePopupChanges(saveInPopup == 'true')}" update=":messagePanel"/>
-            <button jsf:id="confirmProvenancePopupCancelButton" class="btn btn-link" onclick="PF('editProvenancePopup').show();PF('confirmProvenancePopup').hide();" type="button">
+            <p:commandButton styleClass="btn btn-default" id="confirmProvenancePopupSaveButton" 
+                             value="#{bundle.saveChanges}" oncomplete="PF('confirmProvenancePopup').hide();" 
+                             action="#{provPopupFragmentBean.stagePopupChanges(saveInPopup == 'true')}" update=":messagePanel"/>
+            <button type="button" jsf:id="confirmProvenancePopupCancelButton" class="btn btn-link" 
+                    onclick="PF('editProvenancePopup').show();PF('confirmProvenancePopup').hide();">
                 #{bundle.cancel}
             </button>
         </div>
diff --git a/src/main/webapp/resources/css/fontcustom.css b/src/main/webapp/resources/css/fontcustom.css
index 5e4a5bb5cbc..08b3e68450b 100644
--- a/src/main/webapp/resources/css/fontcustom.css
+++ b/src/main/webapp/resources/css/fontcustom.css
@@ -4,12 +4,12 @@
 
 @font-face {
   font-family: "fontcustom";
-  src: url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.eot");
-  src: url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.eot?#iefix") format("embedded-opentype"),
-       url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff2") format("woff2"),
-       url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff") format("woff"),
-       url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.ttf") format("truetype"),
-       url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.svg#fontcustom") format("svg");
+  src: url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot");
+  src: url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot?#iefix") format("embedded-opentype"),
+       url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff2") format("woff2"),
+       url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff") format("woff"),
+       url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.ttf") format("truetype"),
+       url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg#fontcustom") format("svg");
   font-weight: normal;
   font-style: normal;
 }
@@ -17,7 +17,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: "fontcustom";
-    src: url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.svg#fontcustom") format("svg");
+    src: url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg#fontcustom") format("svg");
   }
 }
 
@@ -53,18 +53,18 @@
   font-smoothing: antialiased;
 }
 
-.icon-astro:before { content: "\f104"; }
-.icon-audio:before { content: "\f105"; }
-.icon-code:before { content: "\f10b"; }
-.icon-dataset:before { content: "\f102"; }
-.icon-dataverse:before { content: "\f100"; }
-.icon-document:before { content: "\f106"; }
-.icon-file:before { content: "\f10a"; }
+.icon-astro:before { content: "\f100"; }
+.icon-audio:before { content: "\f101"; }
+.icon-code:before { content: "\f102"; }
+.icon-dataset:before { content: "\f103"; }
+.icon-dataverse:before { content: "\f104"; }
+.icon-document:before { content: "\f105"; }
+.icon-file:before { content: "\f106"; }
 .icon-geodata:before { content: "\f107"; }
-.icon-image:before { content: "\f103"; }
-.icon-network:before { content: "\f10c"; }
-.icon-other:before { content: "\f10d"; }
-.icon-package:before { content: "\f10f"; }
-.icon-tabular:before { content: "\f108"; }
-.icon-unlock:before { content: "\f10e"; }
-.icon-video:before { content: "\f109"; }
+.icon-image:before { content: "\f108"; }
+.icon-network:before { content: "\f109"; }
+.icon-other:before { content: "\f10a"; }
+.icon-package:before { content: "\f10b"; }
+.icon-tabular:before { content: "\f10c"; }
+.icon-unlock:before { content: "\f10d"; }
+.icon-video:before { content: "\f10e"; }
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 7a5d96f886c..4d83ddd489d 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -8,7 +8,7 @@ body {
   /* Sticky footer Margin bottom by footer height */
   margin-bottom:160px;
 }
-body.widget-view {margin-bottom:54px;}
+body.widget-view {margin-bottom:44px;}
 body .ui-widget {font-size: inherit;}
 .ui-widget-content a {color: #337AB7;}
 .ui-widget-content a:hover, .ui-widget-content a:focus {color: #23527C;}
@@ -18,27 +18,27 @@ body .ui-widget {font-size: inherit;}
 .panelgridHeaderTable .ui-widget-content, .panelgridHeaderTable .ui-widget-content > td {border:0; background:none;}
 .panelgridHeaderTable .ui-widget-content > td:last-child table {margin-left:auto;}
 
-.bg-dataverse, bg-brand {background:#C55B28;}
-.bg-dataset {background:#337AB7;}
-.bg-file {background:#777777;}
-.bg-muted {background:#f5f5f5;}
-.text-dataverse, .text-brand {color:#C55B28;}
-.text-dataset {color:#31708F;}
-.text-file {color:#777777;}
-
-#navbarFixed {margin-bottom:0;}
-.navbar-fixed-top, .navbar-fixed-bottom {
-    z-index: 930;
-}
+#navbarFixed.navbar-fixed-top {margin-bottom:0; z-index:9999;}
 #navbarFixed .navbar-brand {color:#C55B28; padding-left:32px;}
 #navbarFixed .navbar-brand.custom-logo {height:auto; padding:0;}
 #navbarFixed .icon-dataverse {color:#C55B28; font-size:28px; margin: -4px 0 0 -27px; position: absolute;}
-
 #navbarFixed .dropdown.accountName a:focus {outline: -webkit-focus-ring-color 5px auto;}
 #navbarFixed form.navbar-form.navbar-form-link {margin:0; padding:0;}
 #navbarFixed form.navbar-form-link a.ui-commandlink, #navbarFixed ul.navbar-nav li.dropdown span.dropdown-toggle {display:block; padding:15px; color: #777;}
 #navbarFixed form.navbar-form-link a.ui-commandlink:hover, #navbarFixed form.navbar-form-link a.ui-commandlink:focus,
 #navbarFixed ul.navbar-nav li.dropdown span.dropdown-toggle:hover, #navbarFixed ul.navbar-nav li.dropdown span.dropdown-toggle:focus {color: #262626; text-decoration: none;}
+#navbarFixed .dropdown-menu.navbar-search {padding:12px; min-width:350px;}
+#navbarFixed .dropdown-menu.navbar-language a.language-menu-link {display: block; clear: both; padding: 3px 20px; font-weight: 400; line-height: 1.42857143; color: rgb(51, 51, 51); white-space: nowrap; text-decoration: none;}
+#navbarFixed .dropdown-menu.navbar-language a.language-menu-link:hover,
+#navbarFixed .dropdown-menu.navbar-language a.language-menu-link:focus {color: #262626;text-decoration: none;background-color: #f5f5f5;}
+#navbarFixed .dropdown-menu.navbar-language .active a.language-menu-link,
+#navbarFixed .dropdown-menu.navbar-language .active a.language-menu-link:hover,
+#navbarFixed .dropdown-menu.navbar-language .active a.language-menu-link:focus {/*color: #fff;text-decoration: none;background-color: #337ab7;outline: 0;*/}
+#navbarFixed .dropdown-menu.navbar-language .disabled a.language-menu-link,
+#navbarFixed .dropdown-menu.navbar-language .disabled a.language-menu-link:hover,
+#navbarFixed .dropdown-menu.navbar-language .disabled a.language-menu-link:focus {color: #777777;}
+#navbarFixed .dropdown-menu.navbar-language .disabled a.language-menu-link:hover,
+#navbarFixed .dropdown-menu.navbar-language .disabled a.language-menu-link:focus {text-decoration: none; cursor: not-allowed; background-color: transparent; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);}
 #navbarFixed #navbar-search-toggle, #navbarFixed #dataverseSupportLink, #navbarFixed #lnk_header_account_dropdown {cursor: pointer; cursor: hand;}
 #navbarFixed .dropdown.accountName #lnk_header_account_dropdown span.glyphicon {margin-right:8px;}
 #navbarFixed .dropdown.accountName .label.label-danger {margin-left:.5em; line-height:normal; vertical-align:text-top;}
@@ -49,43 +49,16 @@ body .ui-widget {font-size: inherit;}
 #status-alert {margin-top:0; margin-bottom:0;}
 #status-alert div.alert {border:0; box-shadow:none;}
 
-#footer {position:absolute; bottom:0; margin-top:3em; padding-bottom:100px; width:100%; height:60px; color:#808080;}
-#footer.widget-view {position:fixed; left:0; bottom:0; margin:0; padding:4px 0 0 0; min-height:44px; background:#fff;}
-#footer .poweredbylogo {text-align:right;}
-#footer .poweredbylogo span {font-size:.85em;margin-right:.3em;}
-#footer .version {vertical-align:bottom;white-space:nowrap;}
-#footer.widget-view .widgetBrandMsg {line-height:42px;}
+footer {height:0px; color:#767676;}
+#dvfooter {padding-top:60px;}
+#dvfooter.widget-view {position:fixed; left:0; bottom:0; margin:0; padding:4px 0 0 0; min-height:44p; height:auto; background:#fff;}
+#dvfooter .poweredbylogo {text-align:right;}
+#dvfooter .poweredbylogo span {font-size:.85em;margin-right:.3em;}
+#dvfooter .version {vertical-align:bottom;white-space:nowrap;}
+#dvfooter.widget-view .widgetBrandMsg {line-height:42px;}
 
-.panelLayoutBlock, .panelLayoutTitleBlock, .panelLayoutButtonBlock {border:0;}
-.panelLayoutBlock .ui-panelgrid.panelgridLayoutTable .ui-widget-content, .panelLayoutBlock .ui-panelgrid.panelgridLayoutTable .ui-widget-content > td {border:0;}
 .form-group table.noBorders tr.ui-widget-content, .form-group table.noBorders td {border:0; padding-left:0;}
 
-.panelgridLayoutTable, .panelgridFormTable {width:100%;}
-.panelgridFormTable > tbody > tr.ui-widget-content > td:first-child {width:20%;}
-.panelgridFormTable.ui-panelgrid td table.ui-picklist td {border: 0; padding:0;}
-.panelgridFormTable.ui-panelgrid td table.ui-picklist td ul.ui-widget-content.ui-corner-all {border:1px solid #DDDDDD; border-radius: 4px;}
-
-.panelLayoutButtonBlock button {/*margin-right:2em;*/}
-
-.panelLayoutBlock > .ui-widget-content {border-bottom:1px solid #DDDDDD;}
-.panelLayoutBlock.breadcrumbNavBlock > .ui-widget-content {border-bottom:0;}
-.panelLayoutTitleBlock > .ui-widget-content {border:0;}
-
-.panelLayoutBlock .ui-panelgrid.panelgridLayoutTable .ui-widget-content .ui-panelgrid {margin-bottom: 1em;}
-.panelLayoutBlock .ui-panelgrid.panelgridLayoutTable .ui-widget-content .ui-panelgrid .ui-widget-content .ui-panelgrid {margin-bottom: 0}
-.panelLayoutBlock .ui-panelgrid.panelgridLayoutTable .ui-widget-content .ui-panelgrid .ui-widget-content .ui-panelgrid td:first-child {padding-left:0;}
-
-.btn span.glyphicon {margin-right:.3em;}
-.btn span.glyphicon.no-text {margin:0;}
-.btn-group .btn span.glyphicon.no-text {margin-left:10px;margin-right:10px;}
-.col-manage-action .btn-group .btn span.glyphicon.no-text {margin:0;}
-.icon-inline-action {margin-left:.3em;}
-.icon-inline-action:first-of-type {margin-left:1em;}
-
-.btn-group .text-button {display:inline-block;padding:6px;}
-
-.text-icon-inline {font-size:1.3em;line-height:1.1em;margin-right:4px;}
-
 #messagePanel div.messagePanel {margin-top:1em;}
 .messagePanel .glyphicon {font-size: 1.5em; vertical-align: bottom;}
 
@@ -94,13 +67,30 @@ tr.ui-state-highlight, .ui-widget-content tr.ui-state-highlight, .ui-widget-head
 tr.ui-state-highlight label, .ui-widget-content tr.ui-state-highlight label, .ui-widget-header tr.ui-state-highlight label {color: #333333;}
 tr.ui-state-highlight a:not(.btn), .ui-widget-content tr.ui-state-highlight a:not(.btn), .ui-widget-header tr.ui-state-highlight a:not(.btn) {color: #428bca;}
 tr.ui-state-highlight .ui-icon {
-    background-image: url("/javax.faces.resource/images/ui-icons_333333_256x240.png.xhtml?ln=primefaces-bootstrap");
+    background-image: url("/jakarta.faces.resource/images/ui-icons_333333_256x240.png.xhtml?ln=primefaces-bootstrap");
 }
 td.col-select-width, th.col-select-width {width:36px;}
 
+/* FILE TABLE ROW SELECTED ICON BTN COLOR PF HACK */
+.ui-state-highlight a.btn-link, .ui-widget-content .ui-state-highlight a.btn-link, .ui-widget-header .ui-state-highlight a.btn-link {
+    color: #337AB7;
+}
+.ui-state-highlight a.btn-link:focus, .ui-widget-content .ui-state-highlight a.btn-link:focus, .ui-widget-header .ui-state-highlight a.btn-link:focus, 
+.ui-state-highlight a.btn-link:hover, .ui-widget-content .ui-state-highlight a.btn-link:hover, .ui-widget-header .ui-state-highlight a.btn-link:hover {
+    color: #23527C;
+}
+
 #ajaxStatusPanel_start {width:31px;height:31px;position:fixed;right:50%;bottom:50%;z-index:111111;}
 #ajaxStatusPanel_complete {position:absolute;top:-9999px;left:-9999px;}
 
+.bg-dataverse, bg-brand {background:#C55B28;}
+.bg-dataset {background:#337AB7;}
+.bg-file {background:#777777;}
+.bg-muted {background:#f5f5f5;}
+.text-dataverse, .text-brand {color:#C55B28;}
+.text-dataset {color:#31708F;}
+.text-file {color:#777777;}
+
 .italic {font-style: italic;}
 .margin-top {margin-top:1em;}
 .margin-top-half {margin-top:.5em;}
@@ -109,7 +99,9 @@ td.col-select-width, th.col-select-width {width:36px;}
 .no-margin-top {margin-top:0 !important;}
 .no-margin-bottom {margin-bottom:0 !important;}
 .margin-sides {margin-left:1em; margin-right:1em;}
+.margin-right {margin-right:.5em;}
 .padding-12 {padding: 12px;}
+.padding-6 {padding: 6px;}
 .padding-none {padding: 0 !important;}
 .clear-both {clear:both;}
 
@@ -120,14 +112,29 @@ table.selectManyCheckboxBlock label {font-weight:normal;}
 
 hr {border-color: #ddd;}
 
+.btn span.glyphicon {margin-right:.3em;}
+.btn.btn-link.bootstrap-button-tooltip span.glyphicon {margin:0;} /* OR JUST USE NO-TEXT... */
+.btn.btn-link.bootstrap-button-tooltip span.caret {margin-left:6px;}
+.btn span.glyphicon.no-text {margin:0;}
+.btn-group .btn span.glyphicon.no-text {margin-left:10px;margin-right:10px;}
+.col-manage-action .btn-group .btn span.glyphicon.no-text {margin:0;}
+.icon-inline-action {margin-left:.3em;}
+.icon-inline-action:first-of-type {margin-left:1em;}
+.btn-group .text-button {display:inline-block;padding:6px;}
+.text-icon-inline {font-size:1.3em;line-height:1.1em;margin-right:4px;}
 span.glyphicon[data-toggle='tooltip'] {cursor: default;}
 span.glyphicon-question-sign.tooltip-icon {color: #99bcdb !important;}
 span.glyphicon-question-sign.tooltip-icon:hover {color: #337AB7 !important;}
+a.tooltip-icon {color: #99bcdb !important;}
+a.tooltip-icon:hover, a.tool-tip:focus, a.tool-tip:active {text-decoration: none; color: #337AB7 !important;}
 
 /* Dropdown submenu */
 .dropdown-submenu {
     position: relative;
 }
+#manageTemplatesForm\:allTemplates .ui-datatable-tablewrapper {
+    overflow: visible;
+}
 .dropdown-submenu.pull-left {
     width: 100%;
 }
@@ -145,6 +152,7 @@ span.glyphicon-question-sign.tooltip-icon:hover {color: #337AB7 !important;}
     min-width: 100%;
 }
 
+/*Open/Close is now handled by javascript (provides a delay on close for accessibility) - leaving this to work when javascript is disabled*/
 .dropdown-submenu:hover>.dropdown-menu {
     display: block;
 }
@@ -220,7 +228,12 @@ body.widget-view #dataverse-header-block {padding-top:0px;}
 #dataverseHeader .dataverseHeaderName span.label.label-unpublished {vertical-align:text-top; line-height: normal; margin-left:1em;}
 #dataverseHeader .dataverseHeaderTagline {padding-left:2em; font-size:1.3em;}
 #dataverseHeader .dataverseHeaderLink {padding-left:2em;}
-
+#dataverseHeader .dataverseHeaderName .dataverseHeaderDataverseName h1 {
+    font-weight: inherit;
+    margin-top: 5px;
+    font-size: 18px;
+    margin-bottom: 10px;
+}
 /* -------- FOOTER -------- */
 #dataverseFooter {margin-top:15px;}
 #dataverseFooter .dataverseFooterLogo img {max-width:940px; max-height:120px;}
@@ -231,17 +244,11 @@ body.widget-view #dataverse-header-block {padding-top:0px;}
 #breadcrumbNavBlock .breadcrumbActive {font-weight:bold;}
 #breadcrumbNavBlock a[id^='breadcrumbLnkTree'] {cursor: pointer; cursor: hand;}
 #breadcrumbNavBlock a[id^='breadcrumbLnkTree'] span.glyphicon-chevron-down {vertical-align:middle;padding-bottom:2px;}
-
 #breadcrumbNavBlock > .ui-panel-content {overflow:hidden;}
-        
 #breadcrumbNavBlock.panelLayoutBlock > .ui-widget-content {border-bottom: 0;}
-
-#breadcrumbNavBlock .breadcrumbCarrot {float:left; margin:0 .4em; color:#B3B3B3;}
-
+#breadcrumbNavBlock .breadcrumbCarrot {float:left; margin:0 .4em; color:#757575;}
 #breadcrumbNavBlock div.dropdown-menu {padding-right:.5em; min-width:280px;}
-
 #breadcrumbNavBlock .ui-tree {width: auto;}
-
 #breadcrumbNavBlock div.ui-tree.ui-widget-content {border:0;}
 #breadcrumbNavBlock div.ui-tree.ui-widget-content span.ui-treenode-content span.ui-icon.ui-tree-toggler {background-size: auto 284px; height:20px; width:20px;}
 #breadcrumbNavBlock div.ui-tree.ui-widget-content span.ui-treenode-content span.ui-icon.ui-tree-toggler.ui-icon-triangle-1-s {background-position: -72px -16px;}
@@ -322,9 +329,9 @@ ul.IdPSelectDropDown > li.disabled:hover, ul.IdPSelectDropDown > li.disabled:foc
 #dashboard-block div.card-box > .row {margin-top: 20px}
 
 /* -------- USER -------- */
-#terms-agreement-block {max-height:200px; margin-bottom: .5em; padding: 12px; overflow-y:scroll; box-shadow:none; background-image: none; background-color: #f5f5f5;}
-#terms-agreement-block h1, #terms-agreement-block h2, #terms-agreement-block h3, 
-#terms-agreement-block h4, #terms-agreement-block h5, #terms-agreement-block h6 {margin-top:0;}
+.well.terms-agreement-block {max-height:200px; margin-bottom: .5em; padding: 12px; overflow-y:scroll; box-shadow:none; background-image: none; background-color: #f5f5f5;}
+.well.terms-agreement-block h1, .well.terms-agreement-block h2, .well.terms-agreement-block h3, 
+.well.terms-agreement-block h4, .well.terms-agreement-block h5, .well.terms-agreement-block h6 {margin-top:0;}
 div[id$='notifications'].ui-tabs-panel div.table-container {display:table;}
 div[id$='notifications'].ui-tabs-panel div.notification-item {display:table-row;}
 div[id$='notifications'].ui-tabs-panel div.notification-item-cell {display:table-cell; border-bottom:1px solid #DDDDDD; padding:5px;}
@@ -351,7 +358,7 @@ table.ui-selectmanycheckbox.metadata-blocks-select label.ui-state-disabled {back
 div.ui-state-focus span.ui-chkbox-icon {outline: -webkit-focus-ring-color auto 5px;}
 
 /* Buttons */
-#actionButtonBlock {margin-bottom:1em; margin-top:0;}
+#actionButtonBlock {/*margin-bottom:1em; margin-top:0;*/}
 #dataverse-info-dropdown {padding:.5em 1em .25em 1em; overflow:hidden; width:400px;}
 #dataverse-info-dropdown .dataverse-info-logo-icon {width:40px; float:left; margin-right:12px;}
 #dataverse-info-dropdown .dataverse-info-logo-icon .icon-dataverse {font-size:40px; line-height:40px;}
@@ -361,12 +368,11 @@ div.ui-state-focus span.ui-chkbox-icon {outline: -webkit-focus-ring-color auto 5
 .form-group > .button-block, 
 .panel-body > .button-block, 
 td.col-file-action > .button-block, .col-manage-action > .button-block,
-div.ui-datatable-header > .button-block, .button-block.tab-header, #topDatasetBlock > #actionButtonBlock > .button-block, .inline-buttons > .button-block {margin-top:0;}
+div.ui-datatable-header > .button-block, .button-block.tab-header, #actionButtonBlock > .button-block, .inline-buttons > .button-block {margin-top:0;}
 th.col-file-action.text-right {text-align: right;}
 form.btn-form {display:inline-block;}
-.button-block button, .button-block a.btn, .button-block input.btn, .button-block div.btn-group, .button-block span.btn.ui-state-disabled, .button-block .button-container {margin-right:1em;}
-
-td.col-file-action span.ingest-warning, .button-block span.ingest-warning {margin-left:.5em;}
+.button-block button, .button-block a.btn, .button-block input.btn, .button-block div.btn-group, .button-block .button-container,
+.button-block span.btn.ui-state-disabled, .button-block span.btn.disabled {margin-right:1em;}
 
 .btn.btn-default.btn-access {background-color: #fff;background-image:none;}
 .btn.btn-default.btn-access:focus, .btn.btn-default.btn-access:hover,.btn.btn-default.btn-access:active {background-color: #e6e6e6;background-image:none;}
@@ -380,11 +386,22 @@ td.col-file-action span.ingest-warning, .button-block span.ingest-warning {margi
 .button-block span.ui-state-disabled:last-child, .button-block.pull-right .btn:last-child, 
 .button-block .btn:only-child, .button-block div.btn-group:only-child {margin-right:0;}
 
-.button-block ul.dropdown-menu li.disabled span.ui-commandlink.ui-state-disabled {display: block; padding: 3px 20px; color: #777; background: none; opacity:1.0;}
+.disabledTitle {
+  pointer-events: auto;
+}
+/* DIASABLED LINK-BTN TITLE PF COMMANDLINK HACK */
+/* TODO - REVIEW DISABLED CLASS LINKS WHICH 
+          ARE NOW FUNCTIONAL DUE TO HACK?? 
+          "This class uses pointer-events: none to try to disable the link functionality"
+html .ui-state-disabled {
+    pointer-events: all;
+} */
+div.btn-group ul.dropdown-menu li.disabled span.ui-commandlink.ui-state-disabled {display: block; padding: 3px 20px; color: #777; background: none; opacity:1.0;}
 .button-single {display: block; padding: 3px 3px; color: #777; background: none; opacity:1.0;}
 div.field-add-delete a.btn {margin:0 1em 0 0;}
 div.field-add-delete a.btn:last-child {margin-right:0;}
 div.field-add-delete a.btn.compound-field-btn {margin-top:1.8em;}
+div[data-cvoc-parentfield] ~ div.field-add-delete a.btn.compound-field-btn {margin-top:0px;}
 div.field-add-delete a.btn.nolabel-field-btn {margin-top:0;}
 
 /* Featured Dataverses*/
@@ -409,18 +426,12 @@ div.field-add-delete a.btn.nolabel-field-btn {margin-top:0;}
 
 /* -------- SEARCH -------- */
 div.panelSearchForm {margin-bottom: 15px;}
-div.panelSearchForm input.search-input {margin-right:1em; padding:4px; display: inline-block; vertical-align: middle; width: auto;}
-a[id$='advsearchlink'] {margin-left:1em;}
+div.panelSearchForm .input-group {margin-right:1em;}
 
 #search-row-panel {border:1px solid #ddd; border-radius: 4px; padding: 15px 0;}
-#dv-sidebar {}
-#dv-main {}
 #dv-main.nofacets {width:100%;float:none;}
 
-/*
- * Off Canvas
- * --------------------------------------------------
- */
+/* Off Canvas */
 @media screen and (max-width: 767px) {
   .row-offcanvas {
     position: relative;
@@ -444,13 +455,12 @@ a[id$='advsearchlink'] {margin-left:1em;}
     margin-left: 10px;
   }
   
-  #footer .poweredbylogo {text-align:center;}
-  #footer.widget-view .poweredbylogo {text-align:right;}
+  #dvfooter .poweredbylogo {text-align:center;}
+  #dvfooter.widget-view .poweredbylogo {text-align:right;}
 }
 
 .searchTypeButton {display:block; border:1px solid #DDD; padding:4px 0; margin-bottom: .5em;}
 
-/*#resultsCountPaginatorBlock {overflow:hidden;}*/
 #resultsCountPaginatorBlock div.results-count {padding:6px 12px; font-weight:bold;}
 #resultsCountPaginatorBlock div.results-sort-pagination {}
 #resultsCountPaginatorBlock .pagination {margin:0;}
@@ -473,23 +483,16 @@ span.search-term-match {font-weight: bold;}
 [id$='resultsTable'] div.card-title-icon-block span.label {vertical-align:15%}
 [id$='resultsTable'] div.card-preview-icon-block {width:48px; float:left; margin:4px 12px 6px 0;}
 [id$='resultsTable'] div.card-preview-icon-block a {display:block; height:48px; line-height:48px;}
-[id$='resultsTable'] div.card-preview-icon-block img {vertical-align:middle;}
+[id$='resultsTable'] div.card-preview-icon-block img {vertical-align:middle; max-width: 64px; max-height: 48px; padding-right: 10px;}
 [id$='resultsTable'] div.card-preview-icon-block span[class^='icon'],
 [id$='resultsTable'] div.card-preview-icon-block span[class^='glyphicon'] {font-size:2.8em;}
 
-[id$='title-block'] div[class^='col'].vcenter {display:inline-block; vertical-align:middle; float:none; /*-- padding:0; --*/}
-[id$='title-block'] div.title-preview-icon-block {width:48px; font-size:110%; color:#428BCA;}
-[id$='title-block'] div.title-preview-icon-block img {margin:6px 0;}
-[id$='title-block'] div.title-preview-icon-block span[class^='icon'] {font-size:2.8em;}
-
 form[id$='facetType'] > div.clearfix {margin-bottom:4px;}
 form[id$='facetType'] > div.clearfix:last-child {margin-bottom:0;}
 form[id$='facetType'] > div.clearfix .facetTypeChBox {display:block; float:left;}
 form[id$='facetType'] > div.clearfix .facetTypeChBox > div.ui-chkbox {padding-top:2px;padding-right:4px;}
 form[id$='facetType'] > div.clearfix a.facetTypeLink {display:block; float:left; text-decoration:none;}
-
 form[id$='facetType'] > div.clearfix a.facetTypeLink span {padding:4px 0px;}
-
 form[id$='facetCategoryForm'] {margin-top:1em;}
 div[id$='facetCategoryList'] ul, div[id$='facetCategoryList'] li, div[id$='facetCategoryList'] div {margin:0; padding:0; list-style: none; border:0;}
 div[id$='facetCategoryList'] > div > ul > li {border-bottom:1px solid #DDD; margin-bottom:.5em;}
@@ -498,7 +501,6 @@ div[id$='facetCategoryList'] div li div {padding:4px 0px;}
 div[id$='facetCategoryList'] div li div.ui-datalist-empty-message {padding:4px 0px; font-style:italic; color:#AAA;}
 div[id$='facetCategoryList'] div.ui-datalist, div[id$='facetCategoryList'] div.ui-datalist div.ui-datalist-content {padding-top:0;}
 .facetCategoryName {font-weight:bold;}
-
 .facetCategoryName, .facetLink {
 -ms-word-break: break-all;
 
@@ -548,7 +550,7 @@ div.ui-dialog.smallPopUp {max-width:600px;}
 div.ui-dialog.largePopUp {min-width:60%; max-width:80%; max-height:80%; overflow-y:scroll;}
 div.ui-dialog .ui-datatable-scrollable table {table-layout: auto !important;}
 div.ui-dialog .ui-datatable-scrollable table colgroup col {max-width:1000px;}
-
+.ui-dialog.ui-widget.ui-widget-content {min-width:600px;}
 div.ui-dialog div.highlight {
     background-color: #f7f7f9;
     border: 1px solid #e1e1e8;
@@ -559,29 +561,24 @@ div.ui-dialog div.highlight {
 .ui-dialog.dialog-submenu, .ui-dialog.dialog-submenu .ui-dialog-content, .ui-dialog.dialog-submenu .form-inline, .ui-dialog.dialog-submenu .form-group {overflow:visible !important;}
 .ui-dialog.dialog-submenu .ui-menu-list.ui-menu-child {z-index: 9999 !important; width: auto; min-width: 12.5em;}
 
-.ui-dialog.ui-widget.ui-widget-content {min-width:600px;}
-
 /* -------- SUBTABS -------- */
 div.popupSubTabParent > div.ui-tabs-panels > div.ui-tabs-panel.ui-widget-content {padding-left:0; padding-right:0;}
 div.ui-tabs-panels .ui-tabs .ui-tabs-nav.ui-widget-header li {border:0;}
 div.ui-tabs-panels .ui-tabs.ui-tabs-top .ui-tabs-nav.ui-widget-header {border-bottom:0;}
 
-/* -------- ADVANCED -------- */
-
 /* -------- PERMISSIONS -------- */
 div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:inline-block; margin-bottom:4px;}
 
 /* -------- METRICS -------- */
-#metrics-block {margin-bottom:20px;}
-
-/* -- OLD LAYOUT -- */
-#metrics-block.col-xs-3 {border:1px solid #eee;padding:0;}
+/* -- OLD LAYOUT, DATAVERSE -- */
+#metrics-block1 {border:1px solid #eee; padding:0;}
 #metrics-label {color:#333;background:#eee;padding:8px 10px;}
 #metrics-label a {color:#333;display:block;}
 #metrics-label a:hover {text-decoration:none;}
 #metrics-content {color:#333;background:#fff;padding:8px 10px;}
-
-#metrics-heading {font-weight:bold;color:#333;background:#eee;padding:8px 10px;}
+/* -- NEW LAYOUT, DATASET + FILE -- */
+#metrics-block {border:0; margin-top:6px;}
+#metrics-heading-subtitle {font-weight:normal;font-size:smaller;}
 #metrics-body {border:1px solid #EEE;border-top-width:0;padding:8px 10px;}
 #metrics-block .metrics-count-block:not(:last-child) {margin-bottom:.5em;padding-bottom:.5em;border-bottom:1px solid #EEE}
 
@@ -600,29 +597,45 @@ div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:in
 #datasetVersionBlock span.label {vertical-align:text-top; line-height:normal; margin-left: .5em;}
 #title-label-block span:first-of-type {margin-left:0 !important;}
 
-#title {font-size:1.5em;font-weight:bold;}
+#title {font-size:36px !important;line-height:1.1;font-weight:bold;margin-top:0px;margin-bottom:0px;}
 #author, #contact {display:block; margin-bottom:.5em;}
-.citation-block {/*-- margin-bottom:.5em; padding-right:0; --*/}
-.bg-citation {background:#ECF6FB;}
-.bg-citation-file {background:#f5f5f5; border: 1px solid #DDD;}
-div.alert-info.bg-citation, div.alert-danger.bg-danger {padding-top:4px; padding-bottom:4px; border-radius:0; color:#333;}
-.citation-block > div.alert-info.bg-citation, .citation-block > div.alert-danger.bg-danger {padding-top:0; padding-bottom:0;}
-.citation-select {/*-- display:inline-block; --*/}
-.citation, .citation-download, .citation-standards {padding:.5em;}
+
+/* #11053 */
+#publication span {
+    margin: 0px 5px 0px 5px;
+}
+
+/* RESPONSIVE ORDER HACK BOOTSTRAP 3 https://stackoverflow.com/a/24834574 */
+#dataset-colorder-block {height: 50px;}
+@media(min-width:992px){
+    #dataset-colorder-block + div {margin-top: -50px;}
+}
+
+.bg-citation {background:#ECF6FB; border: 0;}
+#iframeForm div.alert.bg-citation {margin-bottom:0 !important;}
+.bg-citation-file {background:#f5f5f5; border: 0;}
+.alert-danger.bg-danger {background:#F2DEDE; border: 0;}
+div.alert-info.bg-citation, div.alert-danger.bg-danger {border-radius:0; color:#333;}
 .citation span.glyphicon-question-sign {margin-left:.5em; margin-bottom:2px; vertical-align: middle;}
-.citation-block .vcenter {display: inline-block; vertical-align: middle; float: none;}
-.waiver-CC0-inline {display:inline-block; margin-left:1em;}
+div.citation-block div.alert {padding:10px 10px 0px 10px;}
+div.citation-block div.preview-icon-block {padding-right:10px;padding-bottom:10px; min-height:140px;} /* min-height needed for colorder bootstrap layout hack */
+div.citation-block div.preview-icon-block img {max-width:140px; max-height:140px;}
+div.citation-block div.preview-icon-block span[class^='icon'] {font-size:7.5em; line-height:1.1; color:#428BCA;}
+@media(max-width:767px){
+    div.citation-block div.preview-icon-block img {max-width:100px; max-height:100px;}
+    div.citation-block div.preview-icon-block span[class^='icon'] {font-size:6em;}
+}
+div.citation-block div.citation span.citation-select a {word-break: break-all;}
+div.citation-block div.citation-download.margin-bottom {margin-bottom:10px;}
+div.citation-block div.citation-standards.margin-bottom {margin-bottom:10px;padding-top:1px;padding-bottom:1px;}
 
 div.panel-body div.form-group:last-child, div.panel-body div.form-group:last-child label {margin-bottom:0 !important;}
-div.panel-body.read-terms{max-height:220px; overflow-y:scroll; width:100%; background-color:#eeeeee;}
 
 /* Buttons */
 .button-block.form-top {border-top: 1px solid #dddddd; padding:1em 0;}
 span[id$='editDataSet'] .ui-button-text {white-space: nowrap;}
 #replicationDataButton {margin-top:5px;}
 
-#deaccession-reason-block {padding:4px; margin-bottom:.5em;}
-
 div.form-group .glyphicon.glyphicon-asterisk {font-size:.5em; vertical-align:text-top;}
 #datasetForm .form-group, #templateForm .form-group {overflow: hidden;}
 div.form-col-container div.form-col-container {padding-left:0;}
@@ -632,16 +645,55 @@ div.form-col-container.edit-compound-field div.form-col-container {margin-bottom
 div.panel-group div.panel {margin-bottom:1em;}
 div.panel div.panel-body div.form-group {overflow: hidden;}
 div.edit-field div.ui-message {margin:6px 0;}
-.metadata-container table.metadata {border-collapse:separate;margin:0 4px;}
-.metadata-container table.metadata th {width:25%;vertical-align:top;padding:6px 12px 12px 12px;}
-.metadata-container table.metadata td {padding:6px 12px;}
+.metadata-container table.metadata {border-collapse:separate;margin:0 4px;width:100%;}
+.metadata-container table.metadata th {width:25%;vertical-align:top;padding:6px 12px;}
+.metadata-container table.metadata td {padding:6px 12px;vertical-align:top;}
+
+
+
+/* STACK METADATA TABLE LABELS + VALUES FOR SM, XS */
 @media(max-width:767px){
-    .metadata-container table.metadata th, .metadata-container table.metadata td {display:block;width:100%;}
-    .metadata-container table.metadata th {padding-bottom:0;}
-    .metadata-container table.metadata td {padding-left:30px;}
+    .metadata-container:not(#dataset-summary-metadata) table.metadata th, .metadata-container:not(#dataset-summary-metadata) table.metadata td {display:block;width:100%;}
+    .metadata-container:not(#dataset-summary-metadata) table.metadata th {padding-bottom:0;}
+    .metadata-container:not(#dataset-summary-metadata) table.metadata td {padding-left:30px;}
+}
+/* STACK METADATA TABLE LABELS + VALUES FOR MD, SM, XS ... DATASET-SUMMARY-BLOCK ONLY */
+@media(max-width:1199px){
+    #dataset-summary-metadata.metadata-container table.metadata th, #dataset-summary-metadata.metadata-container table.metadata td {display:block;width:100%;}
+    #dataset-summary-metadata.metadata-container table.metadata th {padding-bottom:0;}
+    #dataset-summary-metadata.metadata-container table.metadata td {padding-left:30px;}
 }
 .panel-body.metadata-container {padding:15px 0;}
 .metadata-logo {max-width:180px;max-height:40px;}
+.metadata-container .truncate-more-link, .metadata-container .collapse-less-link {color: #337AB7; cursor: pointer; cursor: hand;}
+
+/* METADATA LONG STRINGS */
+.metadata-container table.metadata td > div {
+    /* TO-DO #6685 #6578 #1634 #1249 */
+}
+/* METADATA HTML */
+.metadata-container pre {
+    white-space: pre-wrap !important;
+}
+
+
+img[alt='ORCID logo'], img[alt='ROR logo'] {
+        vertical-align: text-top;
+        margin-right:1px;
+        margin-left: 3px;
+}
+
+img.ror {
+  vertical-align: middle;
+}
+.expanded.parenthetical[data-cvoc-protocol='ror'] span {
+  margin: 0px 5px 0px 5px;
+}
+
+/* TRUNCATION */
+div.more-block {text-align:center; padding-top:250px; width:100%; position:absolute; bottom:0; background:linear-gradient(180deg,hsla(0,0%,100%,0),#fff 80%);}
+button.desc-more-link {margin:0; padding:0;}
+div.less-block {text-align:center;}
 
 /* Primefaces vs Bootstrap selectOneMenu fix */
 div.ui-selectonemenu.form-control {padding:0px;}
@@ -653,7 +705,7 @@ div.ui-selectonemenu.form-control {padding:0px;}
 table.ui-selectoneradio {border-collapse:separate;}
 table.ui-selectoneradio td {padding:1px;}
 table.ui-selectoneradio span.ui-icon-bullet, .ui-radiobutton-box span.ui-icon-bullet {background-position: -81.3px -145.1px;}
-table.ui-selectoneradio label {font-weight: normal; margin-right:1em;}
+table.ui-selectoneradio label {font-weight: normal; margin-right:1em; word-break:break-all; /* BREAK ALL LONG STRING RESPONSIVE FIX */}
 .ui-radiobutton-box span.ui-radiobutton-icon {height: 16px; width: 16px; display: block; overflow: hidden;}
 
 div.ui-radiobutton {margin:0; vertical-align:text-bottom;}
@@ -693,18 +745,19 @@ div.panel-heading.text-info[data-toggle="collapse"] {color: #31708F;}
 
 .btn-sm.ui-button {padding: 5px 10px;}
 
-#dragdropMsg {padding:20px;font-size:1.3em;color:#808080;text-align:center;}
-
-div.popover.fade.top.in {max-width: none;}
-div.popover.fade.top.in div.popover-content {text-align:center; vertical-align: middle; display:table-cell; width:428px; height:418px;}
+div.popover.thumb-preview.fade.top.in, div.popover.thumb-preview.fade.bottom.in {max-width: none;}
+div.popover.thumb-preview.fade.top.in div.popover-content, div.popover.thumb-preview.fade.bottom.in div.popover-content {text-align:center; vertical-align: middle; display:table-cell; width:428px; height:418px;}
 a.popoverHTML {display:inline-block;}
 
-/*div[id$="filesTable"] .ui-datatable-tablewrapper thead {display:none;}*/
-/*div[id$="versionsTable"] .ui-datatable-tablewrapper thead {display:none;}*/
-div[id$="versionsTable"] th.col-select-width * {display:none;}
+/* TERMS */
+.waiver-CC0-inline {display:inline-block; margin-left:1em;}
 
-div[id$="filesTable"].ui-datatable.ui-widget div.ui-datatable-tablewrapper {overflow:visible;}
+/* CURATION STATUS HISTORY */
+div[id$="curationStatusHistoryDialog"] {max-width:800px;}
+div[id$="curationStatusHistoryDialog"] th span {color:white;text-shadow:none;}
 
+/* FILES */
+div[id$="filesTable"].ui-datatable.ui-widget div.ui-datatable-tablewrapper {overflow:visible;}
 div[id$="filesTable"].ui-datatable.ui-widget {margin-bottom:20px;}
 div[id$="filesTable"].ui-datatable.ui-widget table {table-layout: fixed;}
 div[id$="filesTable"].ui-datatable.ui-widget table th,
@@ -712,60 +765,67 @@ div[id$="filesTable"].ui-datatable.ui-widget table td {box-sizing: content-box;}
 div[id$="filesTable"] div.ui-datatable-header.ui-widget-header {padding:0; background:none; border:0;}
 div[id$="filesHeaderCount"] {padding:6px 12px;}
 div[id$="filesHeaderCount"] span.highlightBold {display:block; padding:0; line-height:1.65;}
-
-
-
-
+div[id$="filesTable"] .ui-selection-column {width:20px !important;}
 div[id$="filesTable"] .col-file-metadata {padding-left:0; padding-right:0; border-left:0; border-right:0; text-align:left; font-weight:normal;}
-
-
-
-/*div[id$="filesTable"] .col-file-thumb {border-right:0;}*/
-
-div[id$="filesTable"] .col-file-flexbox {display:flex; width:100%;}
-
-div[id$="filesTable"] .col-file-thumb {padding:4px 10px; width:84px;}
-
-
 div[id$="filesTable"] .col-file-thumb div.thumbnail-block {position:relative;width:64px;height:64px;margin:0 auto;}
 div[id$="filesTable"] .col-file-thumb div.thumbnail-block span.file-thumbnail-icon {font-size:62px;line-height:1.05;}
 div[id$="filesTable"] .col-file-thumb div.thumbnail-block span.file-thumbnail-preview-img {display:block;}
 div[id$="filesTable"] .col-file-thumb div.thumbnail-block div.file-icon-restricted-block {display:block;position:absolute;bottom:-4px;right:-1px;}
-
-
-
-div[id$="filesTable"] .file-metadata-block {-webkit-flex: 1 100%;
-	-moz-flex: 1 100%;
-	-ms-flex: 1 100%; flex: 1 100%;}
-
-
 div[id$="filesTable"] div.file-tags-block {padding-bottom:2px;}
 div[id$="filesTable"] div.file-tags-block a.ui-commandlink {font-size:12px;}
 div[id$="filesTable"] div.file-tags-block span.label {display:inline-block;}
 div[id$="filesTable"] div.file-tags-block span.label, div[id$="filesTable"] div.file-tags-block a.ui-commandlink {margin-right:.5em;}
 div[id$="filesTable"] div.file-tags-block span.label:last-of-type {margin-right:0;}
-
-
 div[id$="filesTable"] td.col-file-action {padding-left:0; border-left:0;}
-div[id$="filesTable"] td.col-file-access {width:50%;}
-
-
+div[id$="filesTable"] td.col-file-action .btn-group .btn-link {font-size:2em !important;}
 div[id$="filesTable"] div.ui-datatable-header.ui-widget-header {padding:0 10px;}
 div[id$="filesHeaderBlock"] {margin-bottom:10px;}
 div[id$="cloudStorageBlock"] {margin-bottom:12px;}
 div[id$="cloudStorageBlock"] div.form-group.col-xs-12 {border-bottom:1px solid #ddd;margin:0;padding:0 0 12px 0;}
-
 div[id$="filesTable"] thead[id$="filesTable_head"] th.ui-state-default {border:0; box-shadow:none; border-radius:0; background-image:none; border-top: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;}
 div[id$="filesTable"] thead[id$="filesTable_head"] th.ui-state-default:first-of-type {border-left:1px solid #e6e6e6; border-top-left-radius:4px;}
 div[id$="filesTable"] thead[id$="filesTable_head"] th.ui-state-default:last-of-type {border-right: 1px solid #e6e6e6; border-top-right-radius: 4px;}
 div[id$="filesTable"] thead[id$="filesTable_head"] tr {background-color: #f5f5f5; background-image: -moz-linear-gradient(center top , #ffffff, #e6e6e6); background-repeat: repeat-x;}
-
 div[id$="filesTable"] thead[id$="filesTable_head"] th.ui-selection-column {/*width:40px !important;*/ padding:4px 10px;}
 div[id$="filesTable"] thead[id$="filesTable_head"] th.ui-selection-column .ui-chkbox-box.ui-widget {margin-top:0 !important;}
-
 #file-replace-original-block div[id$="filesTable"].col-sm-10 {border:1px solid #ddd;padding:0;}
 #file-replace-original-block div[id$="filesTable"] .col-file-thumb {width:74px !important;padding:4px 10px;}
 #file-replace-original-block div[id$="filesTable"] .col-file-metadata {padding:4px 10px;}
+.checksum-block {
+    -ms-word-break: break-all;
+    /* Be VERY careful with this, breaks normal words wh_erever */
+    word-break: break-all;
+    /* Non standard for webkit */
+    word-break: break-word;
+}
+/*Remote Store Branding*/
+.remote-info {
+    width: fit-content;
+    margin-left: auto;
+    margin-right: 10px;
+    display: block;
+    padding:5px;
+}
+.remote-info > a {
+    color:white;
+}
+
+/* REQUEST ACCESS DOWNLOAD OPTION LINK */
+div[id$="requestPanel"].iq-dropdown-list-item {display:list-item !important;}
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink:focus,
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active,
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active:focus,
+div[id$="requestPanel"].iq-dropdown-list-item>a.ui-commandlink.active:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;white-space:nowrap}
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled,
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:focus,
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:hover{background-color:transparent;color:#777;}
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:focus,
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled:hover{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}
+div[id$="requestPanel"].iq-dropdown-list-item.disabled{cursor:not-allowed;}
+div[id$="requestPanel"].iq-dropdown-list-item.disabled>span.ui-commandlink.ui-state-disabled{pointer-events:none;}
 
 /* PAGINATION */
 div[id$="filesTable"] .ui-paginator {
@@ -825,13 +885,35 @@ div[id$="filesTable"] .ui-paginator .ui-paginator-pages .ui-state-active {
 /* FILES TREE */
 div[id$="filesTree"] span.ui-treenode-label span[class^='icon'] {margin-left: -2px;}
 
-span.ingest-warning {display:inline-block; font-size:24px; line-height:1; vertical-align: middle;}
-span.ingest-warning span.glyphicon {top:3px} 
+/* PUBLISH, REQUEST ACCESS, AND DOWNLOAD POPUPS */
+div.panel-body.read-terms{max-height:220px; overflow-y:scroll; width:100%; background-color:#eeeeee;}
+.terms {
+    margin-top:20px;
+}
+.terms .form-group label, .terms .form-group p {
+    padding-top:3px;
+    padding-bottom: 3px;
+}
+.terms .form-group span.col-sm-6, .terms .form-group span.col-sm-9 {
+    padding-top: 3px;
+    padding-bottom: 3px;
+    overflow-y: auto;
+    max-height: 86px;
+    border: 1px;
+    border-style: solid;
+    border-color: lightgray;
+}
 
+/* UPLOAD FILES */
+#dragdropMsg {padding:20px;font-size:1.3em;color:#808080;text-align:center;}
+.dropin-btn-status.ui-icon {background: url("https://www.dropbox.com/static/images/widgets/dbx-saver-status.png") no-repeat;}
+.globus-btn.ui-icon {background: url("https://docs.globus.org/images/home/transfer.png") no-repeat;background-size:contain;display:inline-block;}
+
+/* VERSIONS */
+div[id$="versionsTable"] th.col-select-width * {display:none;}
 #version-details-block > div {width:35%; padding:4px 10px; border: 1px solid #DDDDDD;}
 #version-details-block > div:first-of-type {width:30%; border:0;}
 #version-details-block > div:last-of-type {border-left-width:0;}
-
 div.dvnDifferanceTable > div.ui-datatable-tablewrapper > table > thead {display:none;}
 div.dvnDifferanceTable > div.ui-datatable-tablewrapper > table, div.dvnDifferanceTable > div.ui-datatable-tablewrapper > table > tbody {border:0;}
 div.dvnDifferanceTable > div.ui-datatable-tablewrapper > table > tbody > tr:first-child, div.dvnDifferanceTable > div.ui-datatable-tablewrapper > table > tbody > tr:first-child > td {border-top-width:0;}
@@ -840,22 +922,23 @@ div.dvnDifferanceTable > div.ui-datatable-tablewrapper > table > tbody > tr, div
 div.dvnDifferanceTable > div.ui-datatable-tablewrapper > table > tbody > tr, div.dvnDifferanceTable > div.ui-datatable-tablewrapper > table > tbody > tr > td:last-child {border-right-width:0;}
 div.dvnDifferanceTable div.ui-datatable-tablewrapper table td.versionValue {width:30%;}
 div.dvnDifferanceTable div.ui-datatable-tablewrapper table td.versionDetails {width:35%;}
+div.dvnDifferanceTable .diffDetailBlock {
+    display:block;
+    word-break:break-all;
+}
 
-div.dvnDifferanceTable .diffDetailBlock {display:block;}
+div.dvnDifferanceTable .versionValue {
+    word-break:break-all;
+}
+div[id$="versionsTable"] tbody {word-break:break-word;}
 
-.dropin-btn-status.ui-icon {background: url("https://www.dropbox.com/static/images/widgets/dbx-saver-status.png") no-repeat;}
 
-/* MANAGE TABLE + DROPDOWN BUTTON */
-div.manageTable.ui-datatable div.ui-datatable-tablewrapper, div.manageTable.ui-datatable td.col-manage-action {overflow:visible;}
-div[id$="filesTable"].ui-datatable thead th.col-file-action, div[id$="filesTable"].ui-datatable tbody td.col-file-action {overflow:visible !important;}
+/* DATATABLE + DROPDOWN BUTTON + OVERFLOW VISIBLE */
 thead.ui-datatable-scrollable-theadclone {display:none}
+.ui-datatable thead th, .ui-datatable tbody td, .ui-datatable tfoot td, .ui-datatable tfoot th {overflow:visible !important;}
 
 /* FILE */
-#fileImageTitle {margin-bottom: 12px;}
-#file-preview-icon-block > #border-block {/*border:1px solid #DDD;border-radius:4px; padding: 10px;*/}
-#file-preview-icon-block > #border-block > #preview-square {/*position: relative; overflow:hidden; padding-bottom:100%;*/}
-#file-preview-icon-block > #border-block > #preview-square > span.text-muted {font-size:6.5em; line-height:1 !important; /*text-align: center; position: absolute; width: 100%; height: 100%; margin:0;*/}
-#file-preview-icon-block > #border-block > #preview-square > img.img-responsive {/*position: absolute; max-width: 100%; max-height: 100%; top: 50%; left: 50%; transform: translateX(-50%) translateY(-50%);*/}
+#file-preview-icon-block > #border-block > #preview-square > span.text-muted {font-size:6.5em; line-height:1 !important;}
 @media(min-width:768px){
     #file-preview-icon-block > #border-block > #preview-square > span.text-muted {
         font-size: 9.5em;
@@ -872,23 +955,29 @@ thead.ui-datatable-scrollable-theadclone {display:none}
     }
 }
 
-#fileImageTitle span.glyphicon-lock, #fileImageTitle span.icon-unlock {font-size:1.5em;}
-#fileImageTitle #file-title-block span.file-title-label {font-size:1.5em;font-weight:bold;margin-right:.5em;}
-#fileImageTitle #file-title-block span.label {margin-right:.5em;vertical-align: text-top;}
+#file-title-block span.file-title-label {font-size:36px !important;line-height:1.1;font-weight:bold;margin-right:.5em;}
+#file-title-block span.label {vertical-align: text-top;}
+#file-title-block span.label, #file-title-block span.glyphicon-lock, #file-title-block span.icon-unlock {margin-right:.5em;}
+#file-title-block span.glyphicon-lock, #file-title-block span.icon-unlock {top:1px;}
+#file-title-block span.ingest-warning {vertical-align:text-bottom;font-size:30px;}
 #fileCategoriesBlock span.label {margin-right: 0.5em;}
-#fileImageTitle #deaccession-reason-block.col-xs-12 {padding-left:15px;padding-right:15px;}
+#file-tags .label {
+    display:inline-block;
+}
 
 /* BLOCK UI */
 .ui-blockui.ui-widget-overlay {background:#fff; opacity:.6;}
 div.ui-dialog.ui-widget-content {z-index:100001 !important;}
 
 /* POPUP DROPDOWN MENUS + TOOLTIPS + BLOCK UI */
-div.ui-selectcheckboxmenu-panel, div.ui-selectonemenu-panel, div.ui-autocomplete-panel,
-.ui-selectonemenu-list, .ui-selectcheckboxmenu-list, div.tooltip, div.popover {z-index:100002 !important;}
+.ui-selectcheckboxmenu-panel, .ui-selectonemenu-panel, .ui-autocomplete-panel,
+.ui-selectonemenu-list, .ui-selectcheckboxmenu-list, .tooltip, .popover {z-index:100002 !important;}
 
 /* Overwrite Primefaces */
+.ui-tabs.ui-widget.ui-widget-content {position:relative; z-index:999;}
 .ui-tabs.ui-widget-content .ui-tabs-nav li.ui-tabs-selected a {color: #555555;}
 button.btn-default.ui-button-text-only .ui-button-text {padding:0; font-size:14px;}
+button.btn-default span.ui-button-text {line-height:inherit !important;}
 div.ui-widget-overlay {background:#ccc; opacity:.6;}
 .ui-confirm-dialog-severity {margin-top:3px;}
 .ui-widget-content a.btn-default {color:#333;}
@@ -899,15 +988,18 @@ div.ui-widget-overlay {background:#ccc; opacity:.6;}
 .ui-button.btn-link:hover, .ui-button.btn-link:focus {color: #23527c; text-decoration: underline !important; background-color: transparent;}
 .ui-button.btn-link[disabled]:hover, fieldset[disabled] .ui-button.btn-link:hover, .ui-button.btn-link[disabled]:focus, fieldset[disabled] .ui-button.btn-link:focus {color: #777;text-decoration: none;}
 .ui-widget-header .form-group {font-weight:normal;}
-/* .ui-messages-info-detail, .ui-messages-warn-detail, .ui-messages-error-detail, .ui-messages-fatal-detail, .ui-message-info-detail, .ui-message-warn-detail, .ui-message-error-detail, .ui-message-fatal-detail {
-    margin-left: 0px;
-} */
+
 .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled {background: #e0e0e0; border-color: #ccc; opacity: 0.65;}
-.ui-autocomplete-input-token input, .ui-autocomplete-input-token {width:100%;}
-.ui-autocomplete-panel {z-index:100002 !important;}
-.ui-autocomplete input.ui-autocomplete-input {width:calc(100% - 34px);}
+div.ui-autocomplete {width:100%;}
+div.ui-autocomplete > ul, div.ui-autocomplete > ul > li > input {width:100%;} /* FIX WIDTH FOR AUTOCOMPLETE WITHOUT P:FRAGMENT */
+span.ui-autocomplete {width:100%;} /* FIX WIDTH FOR AUTOCOMPLETE IN P:FRAGMENT */
+span.ui-autocomplete input.ui-autocomplete-input {width:100%;}
+.ui-autocomplete input {padding:6px 12px; margin:0;}
 
 /* Overwrite Bootstrap */
+.btn, .input-group-btn {white-space: normal !important;}
+.dropdown-item-text {display: block;padding: 3px 20px;color: #212529;}
+
 @media print {
     a[href]:after {
       content: none;
@@ -920,8 +1012,261 @@ div.ui-widget-overlay {background:#ccc; opacity:.6;}
         display:none;
     }
 }
+/* COLLAPSE-NAVBAR */
+@media (max-width: 992px) {
+    .navbar-header {
+        float: none;
+    }
+    .navbar-left,.navbar-right {
+        float: none !important;
+    }
+    .navbar-toggle {
+        display: block;
+        margin-right: 0px;
+    }
+    .navbar-collapse {
+        border-top: 1px solid transparent;
+        box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
+    }
+    .navbar-fixed-top {
+        top: 0;
+        border-width: 0 0 1px;
+    }
+    .navbar-collapse.collapse {
+        display: none !important;
+    }
+    .navbar-nav {
+        float: none!important;
+        margin-top: 7.5px;
+    }
+    .navbar-nav>li {
+        float: none;
+    }
+    .navbar-nav>li>a {
+        padding-top: 10px;
+        padding-bottom: 10px;
+    }
+    .collapse.in{
+        display: block !important;
+    }
+    .navbar-right .dropdown-menu {
+        left: 0;
+        right: auto;
+    }
+    /* LANGUAGE STYLES */
+    #navbarFixed .dropdown-menu.navbar-language a.language-menu-link {
+        color: #777;
+        line-height: 20px;
+        padding: 5px 15px 5px 25px;
+    }
+    #navbarFixed .dropdown-menu.navbar-language a.language-menu-link:hover,
+    #navbarFixed .dropdown-menu.navbar-language a.language-menu-link:focus {
+        color: #333;
+        background-color: transparent;
+    }
+}
 
 /* CITATION-FRAME */
 #citation-banner {width:100%; height:45px; position: absolute; z-index: 999999; border-radius: 0; border-width: 0 0 1px 0;}
 #citation-banner a.close, #citation-banner a.close span.glyphicon {line-height:.2;}
 #citation-forward {position: absolute; top:45px; height: calc(100% - 65px); border:0; background:url(/resources/images/ajax-loading.gif) no-repeat 50% 50%;}
+
+/*Direct upload progress bar*/
+progress::-webkit-progress-bar {
+  background-color:white;
+}
+
+progress::-webkit-progress-value {
+  background-color:green;
+}
+
+.curation-status {
+  background-color: #CE15D1
+}
+
+/*External vocabulary support*/
+
+.select2-container {
+    display:block!important;
+}
+
+.select2-container .select2-selection--single {
+        border:1px solid #cccccc;
+        border-radius: 3px;
+        height:34px;
+        display:inline;
+        background:#ffffff;
+}
+
+.select2-container .select2-selection--single .select2-selection__rendered {
+        display:inline-block!important;
+        max-width:80%;
+        padding-right:5px!important;
+}
+.select2-selection__clear, .select2-selection__rendered {
+        vertical-align: -webkit-baseline-middle;
+}
+.select2-results ul > li {
+        font-weight:400;
+        font-size:14px;
+}
+.select2-rendered__match {
+        font-weight:600;
+}
+.cvoc-vocab {
+padding-left:0px;
+padding-right:0px;
+}
+.cvoc-term {
+padding-right:0px;
+}
+
+/*EMBARGO*/
+.ui-datepicker {
+  z-index: 100001!important;
+}
+.embargoright {
+  margin-left:10px;
+}
+.embargocheckbox {
+  margin-top: 20px;
+  padding-bottom: 30px;
+}
+.embargomsg {
+  display:block;
+}
+.embargo {
+        display:flex;
+        flex-direction:column;
+}
+.embargo.text-warning, .embargo.text-danger {
+        flex-direction:row;
+}
+.embargo span {
+        margin-right: 10px;
+}
+.embargo span.glyphicon-asterisk {
+            font-size: .5em;
+                vertical-align: top;
+}
+
+.embargo .col-lg-3 {
+    padding-left:0px;
+}
+
+.embargolabel {
+    font-weight: 700;
+}
+
+/*RETENTION*/
+.retentionright {
+  margin-left:10px;
+}
+.retentioncheckbox {
+  margin-top: 20px;
+  padding-bottom: 30px;
+}
+.retentionmsg {
+  display:block;
+}
+.retention {
+        display:flex;
+        flex-direction:column;
+}
+.retention.text-warning, .retention.text-danger {
+        flex-direction:row;
+}
+.retention span {
+        margin-right: 10px;
+}
+.retention span.glyphicon-asterisk {
+            font-size: .5em;
+                vertical-align: top;
+}
+
+.retention .col-lg-3 {
+    padding-left:0px;
+}
+
+.retentionlabel {
+    font-weight: 700;
+}
+
+/*Accessibility*/
+.text-muted {
+    color: #707070;
+}
+a {
+    color:#3174AF;
+}
+
+.label-warning a, .bg-citation a, .terms .help-block a, #panelCollapseTOU .help-block a,  #dataset-summary-metadata a {
+  text-decoration: underline;
+}
+.pagination>.disabled>a {
+    color:#767676;
+}
+span.label-warning { background-color: #A4660E }
+span.label-danger { background-color: #D3413C }
+span.label-default { background-color: #757575 }
+.dropdown-header { color:#757575 }
+
+.login-container h1 { font-size:30px; }
+#embargoInputs label { font-weight: normal; }
+
+/*Template Instructions Editing*/
+.ui-inplace .ui-inputfield {
+    width:60%
+}
+/*File sorting*/
+#datasetForm .file-sort {
+	max-width: 255px;
+	float: right;
+	padding-right:21px;
+}
+
+#datasetForm .file-sort .btn-group {
+	padding-top: 4px;
+}
+
+#datasetForm .file-group-by {
+	min-width: 130px;
+	padding: 0px;
+}
+
+
+/*CSL Citations*/
+#datasetForm .csl-entry {
+    border-style: outset;
+    border-radius: 5px;
+    border-color: #757575;
+    margin: 10px 0px 10px 0px;
+    padding: 10px;
+    display: inline;
+    }
+
+#datasetForm\:cslLabel {
+    margin-top:30px;
+    display:block;
+}
+
+#datasetForm\:cslOutput, .csl-bib-body, .csl-right-inline {
+    display:inline;
+}
+
+#datasetForm\:cslCitation .glyphicon-copy{
+    font-size: x-large;
+    display: inline;
+    vertical-align: bottom;
+    margin-left: 5px;
+}
+    
+/* Suppress the number in some styles indication this references ordinal position in a larger bibliography (which is always 1 in our dialog)*/ 
+.csl-left-margin {
+    display:none;
+}
+
+/*Align menu items*/
+.citation-download .btn {
+    margin-left: 8px;
+}
\ No newline at end of file
diff --git a/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot
new file mode 100644
index 00000000000..86533efdae4
Binary files /dev/null and b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot differ
diff --git a/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg
new file mode 100644
index 00000000000..57ac72f6f8f
--- /dev/null
+++ b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2021-7-23: Created with FontForge (http://fontforge.org)
+-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata>
+Created by FontForge 20201107 at Fri Jul 23 16:58:42 2021
+ By Philip Durbin
+
+</metadata>
+<defs>
+<font id="fontcustom" horiz-adv-x="512" >
+  <font-face 
+    font-family="fontcustom"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="512"
+    panose-1="2 0 5 3 0 0 0 0 0 0"
+    ascent="448"
+    descent="-64"
+    bbox="38 -64 476 448.377"
+    underline-thickness="25.6"
+    underline-position="-51.2"
+    unicode-range="U+0020-F10E"
+  />
+    <missing-glyph />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
+ />
+    <glyph glyph-name="astro" unicode="&#xf100;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM391 262c11.3333 -11.3333 6.33333 -34.3333 -15 -69c-6 -8.66667 -12.6667 -18 -20 -28c4.66667 -11.3333 7 -23.3333 7 -36c0 -19.3333 -4.83333 -37 -14.5 -53s-22.5 -28.6667 -38.5 -38s-33.6667 -14 -53 -14c-12 0 -24 2 -36 6
+c-10 -7.33333 -19.3333 -14 -28 -20c-12 -7.33333 -22.3333 -12.6667 -31 -16c-8.66667 -3.33333 -16.3333 -5 -23 -5s-12 2 -16 6c-4.66667 4.66667 -6.33333 11.3333 -5 20c0.666667 6.66667 3 14.6667 7 24c7.33333 15.3333 18.6667 33 34 53
+c-4.66667 12 -7 24.3333 -7 37c0 29.3333 10.3333 54.1667 31 74.5s45.3333 30.5 74 30.5c13.3333 0 25.6667 -2 37 -6c20.6667 15.3333 38.6667 26.3333 54 33c8.66667 4 16.3333 6.33333 23 7c8.66667 1.33333 15.3333 -0.666667 20 -6zM183 27
+c6 3.33333 12.3333 7.33333 19 12c-14 8.66667 -25.3333 20 -34 34c-11.3333 -16 -19.6667 -29.6667 -25 -41c-6.66667 -13.3333 -8.66667 -21.3333 -6 -24c1.33333 -1.33333 5.33333 -1 12 1c9.33333 3.33333 20.6667 9.33333 34 18zM347 184
+c4.66667 6.66667 8.66667 12.6667 12 18c8.66667 14 14.3333 25.3333 17 34c2.66667 7.33333 3.33333 11.6667 2 13c-2.66667 2 -10.3333 0.333333 -23 -5c-12 -6 -26 -14.6667 -42 -26c14 -8.66667 25.3333 -20 34 -34z" />
+    <glyph glyph-name="audio" unicode="&#xf101;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM371 265v-190c-0.666667 -7.33333 -3.33333 -14 -8 -20s-10.8333 -10.8333 -18.5 -14.5s-16.1667 -5.5 -25.5 -5.5c-14 0 -26 4 -36 12s-15 17.6667 -15 29s5 21 15 29s22 12 36 12c10 0 19.3333 -2 28 -6v100l-111 -26v-148
+c0.666667 -1.33333 1 -2.66667 1 -4c0 -11.3333 -5.16667 -21 -15.5 -29s-22.5 -12 -36.5 -12s-26.1667 4 -36.5 12s-15.5 17.6667 -15.5 29s5.16667 21 15.5 29s22.5 12 36.5 12c10 0 19 -2 27 -6v158z" />
+    <glyph glyph-name="code" unicode="&#xf102;" 
+d="M334 448l118 -116v-377c0 -5.2998 -1.7998 -9.7998 -5.5 -13.5s-8.2002 -5.5 -13.5 -5.5h-334c-5.2998 0 -9.7998 1.7998 -13.5 5.5s-5.5 8.2002 -5.5 13.5v474c0 5.2998 1.7998 9.7998 5.5 13.5s8.2002 5.5 13.5 5.5h235zM329 422v-93h96zM101 -43h330v351h-123v119
+h-207v-470zM218.1 90.2002c0 -2.60059 -0.0996094 -4.7002 -0.299805 -6.10059c-0.200195 -1.5 -0.5 -2.5 -1 -3.19922c-0.5 -0.600586 -1 -0.900391 -1.7002 -0.800781c-0.699219 0.100586 -1.5 0.400391 -2.59961 0.800781l-81.2002 40.5
+c-1 0.599609 -1.7002 1.69922 -2.2002 3.5c-0.5 1.7998 -0.699219 4.5 -0.699219 8.09961c0 1.7998 0.0996094 3.40039 0.199219 4.7998c0.100586 1.40039 0.300781 2.5 0.5 3.40039c0.200195 0.899414 0.5 1.59961 0.900391 2.09961s0.799805 0.900391 1.2998 1.2002
+l81.1006 40.2002c2 1 3.5 0.799805 4.2998 -0.600586c0.799805 -1.39941 1.2998 -4.19922 1.2998 -8.39941c0 -2.90039 -0.0996094 -5.2002 -0.200195 -6.90039c-0.0996094 -1.7002 -0.299805 -3 -0.599609 -4s-0.700195 -1.7002 -1.2002 -2.09961
+c-0.5 -0.400391 -1.2002 -0.799805 -2 -1.2998l-61 -28.6006l59.7998 -27.7998c1.10059 -0.5 1.90039 -1 2.60059 -1.5c0.699219 -0.5 1.19922 -1.2998 1.5 -2.2998c0.399414 -1 0.599609 -2.40039 0.699219 -4.10059c0.400391 -1.59961 0.5 -3.89941 0.5 -6.89941z
+M247.2 44.4004c-0.400391 -0.900391 -0.799805 -1.7002 -1.40039 -2.2002c-0.599609 -0.600586 -1.39941 -1 -2.39941 -1.40039c-1 -0.399414 -2.30078 -0.599609 -3.80078 -0.799805s-3.39941 -0.299805 -5.7998 -0.299805c-2.89941 0 -5.2998 0.0996094 -7.09961 0.399414
+c-1.7998 0.300781 -3.2002 0.700195 -4.2002 1.30078c-1 0.599609 -1.5 1.2998 -1.59961 2.19922c-0.100586 0.900391 0 1.90039 0.399414 3.10059l63.2998 177.8c0.300781 0.900391 0.700195 1.7002 1.30078 2.2998c0.599609 0.600586 1.2998 1.10059 2.2998 1.40039
+c1 0.399414 2.2998 0.599609 3.89941 0.799805c1.60059 0.200195 3.5 0.299805 5.80078 0.299805c3 0 5.2998 -0.0996094 7.09961 -0.399414c1.7998 -0.300781 3.2002 -0.700195 4.09961 -1.30078c0.900391 -0.599609 1.40039 -1.2998 1.60059 -2.19922
+c0.0996094 -0.900391 0 -1.90039 -0.299805 -3.10059zM405.7 132.7c0 -1.7998 -0.100586 -3.40039 -0.200195 -4.7998c-0.0996094 -1.30078 -0.299805 -2.5 -0.599609 -3.40039c-0.200195 -0.900391 -0.600586 -1.59961 -1 -2.2002
+c-0.400391 -0.5 -0.800781 -0.899414 -1.30078 -1.09961l-81.2998 -40.2002c-1 -0.5 -1.7998 -0.700195 -2.5 -0.599609c-0.700195 0.0996094 -1.2998 0.5 -1.7002 1.19922c-0.5 0.700195 -0.799805 1.7002 -1 3.10059
+c-0.199219 1.39941 -0.299805 3.09961 -0.299805 5.2002c0 2.89941 0.100586 5.19922 0.200195 6.89941s0.299805 3 0.599609 4c0.300781 1 0.700195 1.7002 1.2002 2.2002s1.2002 0.900391 2 1.2002l61 28.5996l-59.7998 27.7998c-1.09961 0.5 -2 1 -2.7002 1.5
+s-1.2002 1.30078 -1.5 2.30078c-0.399414 1 -0.599609 2.39941 -0.700195 4.09961c-0.0996094 1.7002 -0.199219 4.09961 -0.199219 7c0 2.59961 0.0996094 4.7002 0.299805 6.09961c0.200195 1.5 0.5 2.5 1 3.2002c0.5 0.600586 1 0.900391 1.7002 0.799805
+c0.699219 -0.0996094 1.59961 -0.399414 2.5 -0.799805l81.2998 -40.5996c0.899414 -0.400391 1.59961 -1.60059 2.2002 -3.40039c0.5 -1.7998 0.799805 -4.5 0.799805 -8.09961z" />
+    <glyph glyph-name="dataset" unicode="&#xf103;" 
+d="M207.6 366.2c-2.39941 1.09961 -4.09961 3.5 -4.09961 6.39941v3.10059c0 3.89941 3.09961 7 7 6h105.1c3.90039 1 7 -2.10059 7 -6v-3.10059c0 -3.89941 -3.09961 -7 -7 -7h-12.5996h-92.5c-1.09961 0 -2 0.200195 -2.90039 0.600586zM405.4 257.5
+c3.89941 0 7 -3.09961 7 -7v-2.40039c0 -3.89941 -3.10059 -7 -7 -7h-0.100586h-194.8c-3.90039 0 -7 3.10059 -7 7v2.40039c0 3.90039 3.09961 7 7 6zM405.4 139.8c3.89941 0 7 -3.09961 7 -7v-3.09961c0 -3.90039 -3.10059 -7 -7 -7h-0.100586h-194.8
+c-3.90039 -0.100586 -7 3.09961 -7 7v3.09961c0 3.90039 3.09961 7 7 6zM362.2 447.8l89.7998 -88.2998v-286.9c0 -4 -1.40039 -7.5 -4.2002 -10.2998s-6.2002 -4.2002 -10.2998 -4.2002h-15.5996v-27c0 -4 -1.40039 -7.5 -4.2002 -10.2998
+s-6.2002 -4.2002 -10.2998 -4.2002h-15.1006v-25.6992c0 -4 -1.39941 -7.5 -4.2002 -10.3008c-2.7998 -2.7998 -6.19922 -4.19922 -10.2998 -4.19922h-14.5996v-25.7002c0 -4 -1.40039 -7.5 -4.2002 -10.2998c-2.7998 -2.80078 -6.2002 -4.2002 -10.2998 -4.2002h-254.2
+c-4 0 -7.5 1.39941 -10.2998 4.2002c-2.7998 2.7998 -4.2002 6.19922 -4.2002 10.2998v360.8c0 4 1.40039 7.5 4.2002 10.2998s6.2002 4.2002 10.2998 4.2002h14.7002v25.7002c0 4 1.39941 7.5 4.2002 10.2998c2.7998 2.7998 6.19922 4.2002 10.2998 4.2002h15.0996v25.7002
+c0 4 1.40039 7.5 4.2002 10.2998s6.2002 4.2002 10.2998 4.2002h15.6006v26.8994c0 4 1.39941 7.5 4.19922 10.2998c2.80078 2.80078 6.2002 4.2002 10.3008 4.2002h178.8zM358.1 428.9l-0.5 -72.8008l74.5 -0.5zM346.5 -47.7002v24.1006h-222.8
+c-4 0 -7.5 1.39941 -10.2998 4.19922c-2.80078 2.80078 -4.2002 6.2002 -4.2002 10.3008v319h-13.7998v-357.601h251.1zM375.7 -7.5v24.0996h-222.4c-4 0 -7.5 1.40039 -10.2998 4.2002s-4.2002 6.2002 -4.2002 10.2998v319h-14.2998v-357.6h251.2zM405.3 32.7002v25.3994
+h-221.899c-4 0 -7.5 1.40039 -10.3008 4.2002c-2.7998 2.7998 -4.19922 6.2002 -4.19922 10.2998v317.7h-14.8008v-357.6h251.2zM435.3 74.2002v267.1h-93.5996v90.5h-157.5v-357.6h251.1zM203.5 289.9c0 3.89941 3.09961 7 7 6l194.9 1c3.89941 0 7 -3.10059 7 -7v-2.40039
+c0 -3.90039 -3.10059 -7 -7 -7h-0.100586h-194.8c-3.90039 0 -7 3.09961 -7 7v2.40039zM405.4 179.4c3.89941 0 7 -3.10059 7 -7v-3.10059c0 -3.89941 -3.10059 -7 -7 -7h-0.100586h-194.8c-3.90039 -0.0996094 -7 3.10059 -7 7v3.10059c0 3.89941 3.09961 7 7 6z
+M405.4 218.8c3.89941 0 7 -3.09961 7 -7v-2.39941c0 -3.90039 -3.10059 -7 -7 -7l-194.9 -1c-3.90039 1 -7 4.19922 -7 8v2.39941c0 3.90039 3.09961 7 7 7h194.8h0.100586z" />
+    <glyph glyph-name="dataverse" unicode="&#xf104;" 
+d="M267 -64c-36 0 -65.3333 12 -88 36c-24 26 -36 55.3333 -36 88c0 34 12 63 36 87c15.3333 14.6667 33 25 53 31l-22 99h-1h-2c-23.3333 0 -43.5 8.33333 -60.5 25s-25.5 36.8333 -25.5 60.5s8.5 43.8333 25.5 60.5s37.3333 25 61 25s43.8333 -8.33333 60.5 -25
+c16.6667 -16.6667 25 -36.8333 25 -60.5s-8.33333 -43.8333 -25 -60.5c-6.66667 -6.66667 -14.6667 -12.3333 -24 -17l23 -102c34 0 63.1667 -12 87.5 -36s36.5 -53 36.5 -87s-12.1667 -63.1667 -36.5 -87.5c-24.3333 -24.3333 -53.5 -36.5 -87.5 -36.5zM147 362.5
+c0 -16.3333 5.83333 -30.3333 17.5 -42s25.8333 -17.5 42.5 -17.5s30.8333 5.83333 42.5 17.5c11.6667 11.6667 17.5 25.6667 17.5 42s-5.83333 30.3333 -17.5 42c-11.6667 11.6667 -25.8333 17.5 -42.5 17.5s-30.8333 -5.83333 -42.5 -17.5s-17.5 -25.6667 -17.5 -42z
+M330 -3c17.3333 17.3333 26 38.1667 26 62.5s-8.66667 45.1667 -26 62.5c-17.3333 17.3333 -38.3333 26 -63 26c-24.6667 0 -45.6667 -8.66667 -63 -26c-17.3333 -17.3333 -26 -38.1667 -26 -62.5s8.66667 -45.1667 26 -62.5s38.3333 -26 63 -26
+c24.6667 0 45.6667 8.66667 63 26z" />
+    <glyph glyph-name="document" unicode="&#xf105;" 
+d="M334 448l118 -116v-377c0 -5.2998 -1.7998 -9.7998 -5.5 -13.5s-8.2002 -5.5 -13.5 -5.5h-334c-5.2998 0 -9.7998 1.7998 -13.5 5.5s-5.5 8.2002 -5.5 13.5v474c0 5.2998 1.7998 9.7998 5.5 13.5s8.2002 5.5 13.5 5.5h235zM307.1 308v119h-207v-470h330v351zM328.7 423.2
+l97.0996 -96.2998l-97.8994 0.5zM125.4 347.9v4.09961c0 5.09961 4.09961 9.2002 9.19922 9.2002h138.101c5.09961 0 9.2002 -4.10059 9.2002 -9.2002v-4.09961c0 -5.10059 -4.10059 -9.2002 -9.2002 -9.2002h-138.101c-5.09961 -0.100586 -9.19922 4.09961 -9.19922 9.2002
+zM125.4 236v3.09961c0 5.10059 4.09961 9.2002 9.19922 9.2002h256.2c5.10059 0 9.2002 -4.09961 9.2002 -9.2002v-3.09961c0 -5.09961 -4.09961 -9.2002 -9.2002 -9.2002h-256.2c-5.09961 0 -9.19922 4.10059 -9.19922 9.2002zM125.4 184.3v3.10059
+c0 5.09961 4.09961 9.19922 9.19922 9.19922h256.2c5.10059 0 9.2002 -4.09961 9.2002 -9.19922v-3.10059c0 -5.09961 -4.09961 -9.2002 -9.2002 -9.2002h-256.2c-5.09961 -0.0996094 -9.19922 4.10059 -9.19922 9.2002zM125.4 133.4v3.09961
+c0 5.09961 4.09961 9.2002 9.19922 9.2002h256.2c5.10059 0 9.2002 -4.10059 9.2002 -9.2002v-3.09961c0 -5.10059 -4.09961 -9.2002 -9.2002 -9.2002h-256.2c-5.09961 0 -9.19922 4.09961 -9.19922 9.2002zM125.4 80.7002v4.09961c0 5.10059 4.09961 9.2002 9.19922 9.2002
+h256.2c5.10059 0 9.2002 -4.09961 9.2002 -9.2002v-4.09961c0 -5.10059 -4.09961 -9.2002 -9.2002 -9.2002h-256.2c-5.09961 -0.0996094 -9.19922 4.09961 -9.19922 9.2002zM125.4 28.5996v4.10059c0 5.09961 4.09961 9.2002 9.19922 9.2002h256.2
+c5.10059 0 9.2002 -4.10059 9.2002 -9.2002v-4.10059c0 -5.09961 -4.09961 -9.19922 -9.2002 -9.19922h-256.2c-5.09961 0 -9.19922 4.09961 -9.19922 9.19922z" />
+    <glyph glyph-name="file" unicode="&#xf106;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM116 230h281v-200h-281v200zM218 157h76v36h-76v-36zM294 140h-76v-41h76v41zM132 193v-36h69v36h-69zM132 140v-41h69v41h-69zM132 47h69v36h-69v-36zM218 47h76v36h-76v-36zM380 47v36h-69v-36h69zM380 99v41h-69v-41h69zM311 157h69v36h-69v-36z" />
+    <glyph glyph-name="geodata" unicode="&#xf107;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM255.5 -11c37.6667 0 70 13.5 97 40.5s40.5 59.3333 40.5 97s-13.5 70 -40.5 97s-59.3333 40.5 -97 40.5c-37.6667 0 -70 -13.5 -97 -40.5s-40.5 -59.3333 -40.5 -97s13.5 -70 40.5 -97s59.3333 -40.5 97 -40.5zM264 6v17h-17v-17
+c-30 2 -55.6667 13.6667 -77 35c-21.3333 21.3333 -33 47 -35 77h23v17h-23c2 30 13.6667 55.6667 35 77s47 33 77 35v-23h17v23c30 -2 55.6667 -13.6667 77 -35s33 -47 35 -77h-23v-17h23c-2 -30 -13.6667 -55.6667 -35 -77c-21.3333 -21.3333 -47 -33 -77 -35zM255.5 263
+c37.6667 0 69.8333 -13.3333 96.5 -40s40 -58.8333 40 -96.5s-13.3333 -69.8333 -40 -96.5c-26.6667 -26.6667 -58.8333 -40 -96.5 -40c-37.6667 0 -69.8333 13.3333 -96.5 40c-26.6667 26.6667 -40 58.8333 -40 96.5s13.3333 69.8333 40 96.5s58.8333 40 96.5 40zM263 225
+h-15v22v1h-1c-30 -2.66667 -55.6667 -14.6667 -77 -36s-33.3333 -47 -36 -77v-1h1h22v-15h-22h-1v-1c2.66667 -30 14.6667 -55.6667 36 -77c21.3333 -21.3333 47 -33.3333 77 -36h1v1v16h15v-16v-1h1c30 2.66667 55.6667 14.6667 77 36c21.3333 21.3333 33.3333 47 36 77v1
+h-1h-22v15h22h1v1c-2.66667 30 -14.6667 55.6667 -36 77s-47 33.3333 -77 36h-1v-1v-22zM255.5 264c38.3333 0 70.8333 -13.3333 97.5 -40s40 -59.1667 40 -97.5s-13.3333 -70.8333 -40 -97.5c-26.6667 -26.6667 -59.1667 -40 -97.5 -40
+c-38.3333 0 -70.8333 13.3333 -97.5 40c-26.6667 26.6667 -40 59.1667 -40 97.5s13.3333 70.8333 40 97.5s59.1667 40 97.5 40zM247 224v23c-30 -2.66667 -55.5 -14.5 -76.5 -35.5s-32.8333 -46.5 -35.5 -76.5h23v-17h-23c2.66667 -30 14.5 -55.5 35.5 -76.5
+s46.5 -32.8333 76.5 -35.5v17h17v-17c30 2.66667 55.5 14.5 76.5 35.5s32.8333 46.5 35.5 76.5h-23v17h23c-2.66667 30 -14.5 55.5 -35.5 76.5s-46.5 32.8333 -76.5 35.5v-23h-17zM223 159l-49 -114l114 49l49 114zM201 72l61 27l-34 34zM336 207l-49 -112l-112 -49l49 112z
+M200 71l2 3l25 59l1 1l1 -1l33 -33l1 -1l-1 -1l-59 -26zM338 209l-50 -115l-115 -50l50 115zM202 73l60 26l-34 34z" />
+    <glyph glyph-name="image" unicode="&#xf108;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM155 219c0 12 4.33333 22.3333 13 31c8.66667 8.66667 19.1667 13 31.5 13s22.8333 -4.33333 31.5 -13c8.66667 -8.66667 13 -19 13 -31s-4.33333 -22.3333 -13 -31s-19.1667 -13 -31.5 -13s-22.8333 4.33333 -31.5 13s-13 19 -13 31zM337 229l60 -105
+v-119v-7h-281v98l14 12l33 27l56 -55l59 110zM204 58l5 12l-47 45l-32 -27l2 -24l14 17l24 -29l24 17zM360 93l15 28l-45 81l-46 -31l-25 -49l25 11l34 -34l28 38z" />
+    <glyph glyph-name="network" unicode="&#xf109;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM114 197.5c0 14.3333 5 26.5 15 36.5s22.1667 15 36.5 15s26.5 -5 36.5 -15s15 -22.1667 15 -36.5s-5 -26.5 -15 -36.5s-22.1667 -15 -36.5 -15s-26.5 5 -36.5 15s-15 22.1667 -15 36.5zM155 41.5c0 14.3333 5 26.6667 15 37s22.1667 15.5 36.5 15.5
+s26.6667 -5.16667 37 -15.5s15.5 -22.6667 15.5 -37s-5.16667 -26.5 -15.5 -36.5s-22.6667 -15 -37 -15s-26.5 5 -36.5 15s-15 22.1667 -15 36.5zM270 214c0 14.6667 5 27 15 37s22.1667 15 36.5 15s26.5 -5 36.5 -15s15 -22.1667 15 -36.5s-5 -26.6667 -15 -37
+s-22 -15.5 -36 -15.5c-6 0 -11.6667 1 -17 3s-10 4.5 -14 7.5s-7.66667 6.66667 -11 11s-5.83333 9.16667 -7.5 14.5s-2.5 10.6667 -2.5 16zM296 78.5c0 14.3333 5 26.5 15 36.5s22.1667 15 36.5 15s26.5 -5 36.5 -15s15 -22.1667 15 -36.5s-5 -26.6667 -15 -37
+s-22.1667 -15.5 -36.5 -15.5s-26.5 5.16667 -36.5 15.5s-15 22.6667 -15 37zM223 44c-0.666667 -0.666667 -1.33333 -1.16667 -2 -1.5s-1.66667 -0.5 -3 -0.5h-4l-6 1l-6.5 2l-3.5 2.5l-1 2.5l1 3l107 156c0 0.666667 0.333333 1.16667 1 1.5s1.5 0.5 2.5 0.5h4l6.5 -1
+l6.5 -2l3.5 -2.5l1 -2.5l-1 -3zM154 194l184 -130c1.33333 -0.666667 2.5 -1.16667 3.5 -1.5s2 -0.166667 3 0.5s2 1.83333 3 3.5s1.83333 3.83333 2.5 6.5c0.666667 2 1.16667 3.83333 1.5 5.5s0.5 3 0.5 4s-0.166667 2 -0.5 3s-1.16667 1.5 -2.5 1.5l-184 131
+c-1.33333 0.666667 -2.5 1.16667 -3.5 1.5s-2 0.166667 -3 -0.5s-2 -1.83333 -3 -3.5s-1.83333 -3.83333 -2.5 -6.5l-2 -5.5v-4c0 -1 0.166667 -2 0.5 -3s1.16667 -1.83333 2.5 -2.5zM227 28l-55 180c-0.666667 1.33333 -1.33333 2.16667 -2 2.5s-1.5 0.5 -2.5 0.5
+s-2.33333 -0.333333 -4 -1s-3.83333 -2 -6.5 -4c-1.33333 -1.33333 -2.66667 -2.5 -4 -3.5s-2.33333 -2 -3 -3s-1 -1.83333 -1 -2.5s0.333333 -1.66667 1 -3l55 -180c0 -1.33333 0.333333 -2.33333 1 -3s1.66667 -0.833333 3 -0.5s2.83333 0.833333 4.5 1.5s3.5 2 5.5 4
+l4.5 3.5l2.5 3l1 2.5v3zM361 92c0.666667 -0.666667 0.833333 -1.33333 0.5 -2s-0.833333 -1.5 -1.5 -2.5s-1.5 -2 -2.5 -3l-3.5 -3.5l-6 -4.5l-3.5 -2h-2.5l-1 1.5l-36 139v2l1 2.5l2.5 3l4.5 3.5c2 2 3.83333 3.5 5.5 4.5s2.83333 1.66667 3.5 2s1.33333 0.333333 2 0
+s1 -0.833333 1 -1.5z" />
+    <glyph glyph-name="other" unicode="&#xf10a;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470z" />
+    <glyph glyph-name="package" unicode="&#xf10b;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM392 217v-178c0 -4.66667 -2 -7.33333 -6 -8l-129 -38v0h-1v0h-1.5h-0.5v0h-1v0l-129 38c-4.66667 0.666667 -7 3.33333 -7 8v178v0v1l1 1v0v1v0v1v0l1 1v0v1h1v0v1h1v0v0l1 1v0h1v0h1v1l132 35h5l125 -36h1v0h1v0c0.666667 0 1 -0.333333 1 -1v0h1v-1
+v0h1v-1v0l1 -1v0v-1v0v-1v0v-1v-1zM246 13v161l-111 32v-161zM255 189l40 12l58 16l-95 27l-100 -27l64 -19zM375 45v161l-111 -32v-161z" />
+    <glyph glyph-name="tabular" unicode="&#xf10c;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM116 230h281v-200h-281v200zM218 157h76v36h-76v-36zM294 140h-76v-41h76v41zM132 193v-36h69v36h-69zM132 140v-41h69v41h-69zM132 47h69v36h-69v-36zM218 47h76v36h-76v-36zM380 47v36h-69v-36h69zM380 99v41h-69v-41h69zM311 157h69v36h-69v-36z" />
+    <glyph glyph-name="unlock" unicode="&#xf10d;" 
+d="M476 -26c0 -10.6667 -3.66667 -19.6667 -11 -27s-16.3333 -11 -27 -11h-362c-10 0 -18.8333 3.66667 -26.5 11s-11.5 16.3333 -11.5 27v242c0 10.6667 3.83333 19.8333 11.5 27.5s16.5 11.5 26.5 11.5h362c10.6667 0 19.6667 -3.83333 27 -11.5s11 -16.8333 11 -27.5
+v-242zM366 397c-8.66667 20.6667 -23.1667 35.5 -43.5 44.5s-40.8333 9.16667 -61.5 0.5l-109 -43c-20.6667 -8 -35.5 -22.1667 -44.5 -42.5s-9.5 -40.8333 -1.5 -61.5l70 -178l74 30l-62 159c-2.66667 5.33333 -2.83333 10.6667 -0.5 16s6.5 9 12.5 11l72 29
+c6 2 11.6667 1.83333 17 -0.5s9 -6.16667 11 -11.5l13 -34l73 29z" />
+    <glyph glyph-name="video" unicode="&#xf10e;" 
+d="M324 448l118 -116v-377c0 -5.33333 -1.83333 -9.83333 -5.5 -13.5s-8.16667 -5.5 -13.5 -5.5h-334c-5.33333 0 -9.83333 1.83333 -13.5 5.5s-5.5 8.16667 -5.5 13.5v474c0 5.33333 1.83333 9.83333 5.5 13.5s8.16667 5.5 13.5 5.5h235zM319 422v-93h96zM91 -43h330v351
+h-123v119h-207v-470zM393 155v-136l-80 46v-54h-194v141h25c-18 8.66667 -27 23 -27 43c0 13.3333 4.83333 24.6667 14.5 34c9.66667 9.33333 21.1667 14 34.5 14s24.6667 -4.66667 34 -14s14 -20.6667 14 -34c0 -20 -8.66667 -34.3333 -26 -43h57
+c-17.3333 8.66667 -26 23 -26 43c0 13.3333 4.66667 24.6667 14 34s20.6667 14 34 14c13.3333 0 24.8333 -4.66667 34.5 -14s14.5 -20.6667 14.5 -34c0 -20 -9 -34.3333 -27 -43h24v-43z" />
+  </font>
+</defs></svg>
diff --git a/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.ttf b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.ttf
new file mode 100644
index 00000000000..e6bdae2f414
Binary files /dev/null and b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.ttf differ
diff --git a/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff
new file mode 100644
index 00000000000..ad488443904
Binary files /dev/null and b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff differ
diff --git a/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff2 b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff2
new file mode 100644
index 00000000000..1c64fffa1e6
Binary files /dev/null and b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff2 differ
diff --git a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.eot b/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.eot
deleted file mode 100644
index e092c9b1c55..00000000000
Binary files a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.eot and /dev/null differ
diff --git a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.svg b/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.svg
deleted file mode 100644
index a935291017a..00000000000
--- a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.svg
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<!--
-2017-8-29: Created with FontForge (http://fontforge.org)
--->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
-<metadata>
-Created by FontForge 20141215 at Tue Aug 29 11:31:31 2017
- By Michael Heppler 
-
-</metadata>
-<defs>
-<font id="fontcustom" horiz-adv-x="512" >
-  <font-face 
-    font-family="fontcustom"
-    font-weight="400"
-    font-stretch="normal"
-    units-per-em="512"
-    panose-1="2 0 5 3 0 0 0 0 0 0"
-    ascent="448"
-    descent="-64"
-    bbox="38.2715 -64 475.929 448.001"
-    underline-thickness="25.6"
-    underline-position="-51.2"
-    unicode-range="U+0020-F10F"
-  />
-    <missing-glyph />
-    <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
- />
-    <glyph glyph-name="tabular" unicode="&#xf108;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM115.707 229.528l280.893 -0.000976562v-199.242h-280.893v199.243zM217.554 156.534l76.8027 -0.000976562v36.7969h-76.8027v-36.7959zM294.356 139.839l-76.8027 0.000976562v-40.5293h76.8027v40.5283z
-M132.402 193.33v-36.7959h68.4561v36.7959h-68.4561zM132.402 139.84v-40.5293h68.4561v40.5293h-68.4561zM132.402 46.9814h68.4561v35.6348h-68.4561v-35.6348zM217.554 46.9814h76.8027v35.6348h-76.8027v-35.6348zM379.905 46.9814h-0.000976562v35.6348h-68.8535
-v-35.6348h68.8545zM379.905 99.3105h-0.000976562v40.5283h-68.8535v-40.5283h68.8545zM311.051 156.533h68.8535v36.7969h-68.8535v-36.7969z" />
-    <glyph glyph-name="document" unicode="&#xf106;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM115.578 390.442v22.5859h169.49v-22.5859h-169.49zM115.578 344.247v22.5859h169.489v-22.5859h-169.489zM115.578 298.051v22.5859h169.49v-22.5859h-169.49zM115.578 251.854v22.5859h280.844v-22.5859h-280.844z
-M115.578 204.896v22.5859h280.844v-22.5859h-280.844zM115.578 158.699v22.5859h280.844v-22.5859h-280.844zM115.578 112.504v22.5859h280.844v-22.5859h-280.844zM115.578 66.3076v22.5859h280.844v-22.5859h-280.844zM115.578 19.0879v22.5859h280.844v-22.5859h-280.844
-zM115.578 -27.1084v22.5859h280.844v-22.5859h-280.844z" />
-    <glyph glyph-name="file" unicode="&#xf10a;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM115.707 229.528l280.893 -0.000976562v-199.242h-280.893v199.243zM217.554 156.534l76.8027 -0.000976562v36.7969h-76.8027v-36.7959zM294.356 139.839l-76.8027 0.000976562v-40.5293h76.8027v40.5283z
-M132.402 193.33v-36.7959h68.4561v36.7959h-68.4561zM132.402 139.84v-40.5293h68.4561v40.5293h-68.4561zM132.402 46.9814h68.4561v35.6348h-68.4561v-35.6348zM217.554 46.9814h76.8027v35.6348h-76.8027v-35.6348zM379.905 46.9814h-0.000976562v35.6348h-68.8535
-v-35.6348h68.8545zM379.905 99.3105h-0.000976562v40.5283h-68.8535v-40.5283h68.8545zM311.051 156.533h68.8535v36.7969h-68.8535v-36.7969z" />
-    <glyph glyph-name="package" unicode="&#xf10f;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM392.499 217.293v0v-178.433c0 -3.83984 -2.55957 -7.16797 -6.19531 -8.24316l-128.819 -37.2734c-0.0507812 0 -0.15332 -0.0507812 -0.204102 -0.0507812c-0.102539 0 -0.154297 -0.0517578 -0.255859 -0.0517578
-c-0.154297 -0.0507812 -0.256836 -0.101562 -0.410156 -0.101562c-0.102539 0 -0.15332 -0.0517578 -0.255859 -0.0517578c-0.15332 0 -0.307617 -0.0507812 -0.460938 -0.0507812h-0.205078c-0.255859 -0.0517578 -0.459961 -0.0517578 -0.665039 -0.0517578
-c-0.255859 0 -0.460938 0.0517578 -0.666016 0.0517578h-0.204102c-0.154297 0 -0.307617 0.0507812 -0.460938 0.0507812c-0.102539 0 -0.154297 0.0517578 -0.255859 0.0517578c-0.154297 0.0507812 -0.256836 0.0507812 -0.410156 0.101562
-c-0.102539 0 -0.15332 0.0517578 -0.255859 0.0517578c-0.0507812 0 -0.15332 0.0507812 -0.205078 0.0507812l-128.973 37.2734c-3.68652 1.0752 -6.19531 4.45508 -6.19531 8.24316v178.433v0.0507812v0.0517578v0.102539
-c0.0517578 0.15332 0.0517578 0.358398 0.0517578 0.511719v0.205078c0.0507812 0.204102 0.0507812 0.40918 0.102539 0.614258v0.102539c0 0.15332 0.0507812 0.358398 0.101562 0.511719c0 0.0507812 0.0517578 0.15332 0.0517578 0.205078
-c0.0507812 0.15332 0.102539 0.306641 0.15332 0.459961c0 0.0517578 0.0517578 0.102539 0.0517578 0.154297c0.0507812 0.204102 0.101562 0.40918 0.204102 0.5625c0.0517578 0.0517578 0.0517578 0.102539 0.102539 0.154297
-c0.0517578 0.15332 0.15332 0.255859 0.205078 0.40918c0.0507812 0.0517578 0.0507812 0.102539 0.102539 0.15332c0.102539 0.154297 0.204102 0.358398 0.306641 0.512695l0.0517578 0.0507812c0.102539 0.102539 0.204102 0.255859 0.306641 0.410156
-c0.0517578 0.0507812 0.0517578 0.101562 0.102539 0.15332c0.102539 0.102539 0.205078 0.255859 0.307617 0.358398l0.102539 0.102539c0.101562 0.15332 0.255859 0.255859 0.40918 0.40918c0.0507812 0 0.102539 0.0517578 0.15332 0.102539
-c0.154297 0.102539 0.255859 0.205078 0.358398 0.307617c0.0517578 0.0507812 0.102539 0.101562 0.154297 0.15332c0.0507812 0 0.0507812 0.0507812 0.101562 0.0507812c0.102539 0.0517578 0.205078 0.154297 0.307617 0.205078
-c0.0507812 0 0.0507812 0.0507812 0.102539 0.0507812c0.15332 0.102539 0.358398 0.205078 0.511719 0.307617c0.102539 0.0507812 0.15332 0.0507812 0.205078 0.102539c0.15332 0.0507812 0.255859 0.15332 0.40918 0.205078
-c0.0517578 0 0.102539 0.0507812 0.154297 0.0507812c0.204102 0.0507812 0.358398 0.15332 0.5625 0.205078c0.0517578 0 0.102539 0.0507812 0.154297 0.0507812c0.204102 0.0517578 0.358398 0.102539 0.511719 0.15332
-c0.0507812 0.0517578 0.0507812 0.0517578 0.102539 0.0517578l132.557 35.123c1.48438 0.358398 3.02051 0.358398 4.50586 -0.0507812l125.439 -35.124h0.0517578c0.204102 -0.0507812 0.40918 -0.15332 0.614258 -0.204102h0.0507812
-c0.15332 -0.0517578 0.358398 -0.102539 0.511719 -0.205078c0.0517578 -0.0507812 0.102539 -0.0507812 0.154297 -0.102539c0.15332 -0.0507812 0.255859 -0.15332 0.40918 -0.205078c0.0517578 0 0.102539 0 0.15332 -0.0507812
-c0.205078 -0.102539 0.358398 -0.205078 0.512695 -0.307617c0.0507812 -0.0507812 0.102539 -0.0507812 0.15332 -0.101562c0.0507812 -0.0517578 0.15332 -0.102539 0.205078 -0.154297c0.0507812 0 0.102539 -0.0507812 0.15332 -0.102539
-c0.0507812 -0.0507812 0.102539 -0.101562 0.15332 -0.15332c0.154297 -0.102539 0.255859 -0.255859 0.410156 -0.358398l0.0507812 -0.0507812c0.15332 -0.154297 0.255859 -0.307617 0.410156 -0.460938c0.0507812 0 0.0507812 -0.0517578 0.101562 -0.102539
-c0.102539 -0.102539 0.205078 -0.255859 0.307617 -0.358398c0.0507812 0 0.0507812 -0.0507812 0.102539 -0.102539c0.15332 -0.15332 0.255859 -0.358398 0.358398 -0.511719c0 -0.0517578 0.0507812 -0.0517578 0.0507812 -0.102539
-c0.102539 -0.15332 0.154297 -0.307617 0.255859 -0.460938c0.0517578 -0.0507812 0.0517578 -0.102539 0.102539 -0.15332c0.0517578 -0.15332 0.154297 -0.307617 0.205078 -0.460938c0 0 0.0507812 -0.0507812 0.0507812 -0.102539
-c0.0517578 -0.205078 0.154297 -0.358398 0.205078 -0.563477c0 -0.101562 0.0517578 -0.15332 0.0517578 -0.204102c0 -0.102539 0.0507812 -0.255859 0.101562 -0.410156c0 -0.102539 0.0517578 -0.15332 0.0517578 -0.204102
-c0 -0.154297 0.0507812 -0.358398 0.102539 -0.563477v-0.102539c0 -0.15332 0.0507812 -0.358398 0.0507812 -0.511719v-0.205078v-0.563477v-0.0507812zM246.374 12.9531v160.615l-111.872 32.3066v-160.563zM254.925 188.877l40.3965 11.6738l57.3447 16.5889
-l-94.2598 26.3672l-100.403 -26.5723l63.8975 -18.4834zM375.398 45.3115v160.615l-111.872 -32.3584v-160.666z" />
-    <glyph glyph-name="image" unicode="&#xf103;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM155.146 219.049c0 24.5439 19.8975 44.4404 44.4414 44.4404s44.4414 -19.8965 44.4414 -44.4404c0 -24.5449 -19.8975 -44.4414 -44.4414 -44.4414s-44.4414 19.8965 -44.4414 44.4414zM337.292 229.049
-l59.3076 -105.122v-119.061h-0.0273438v-6.91602h-280.865v98.5039l13.832 11.0566v-0.000976562l33.2598 27.4824l55.8594 -55.3271l59.0508 110.654zM203.555 58.1465l5.6709 11.9092l-47.0703 45.3682l-32.0762 -27.248l2.01953 -24.3584l13.6113 17.0137
-l23.8184 -28.9229l24.3857 17.5801zM360.41 93.1396l14.1836 28.3125l-44.8008 80.5283l-45.4492 -30.8574l-24.8623 -49.3389l24.9473 11.2832l34.0186 -34.1289l27.2168 38.4795z" />
-    <glyph glyph-name="dataset" unicode="&#xf102;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM115.578 390.442v22.5859h169.49v-22.5859h-169.49zM115.578 344.247v22.5859h169.489v-22.5859h-169.489zM115.578 298.051v22.5859h169.49v-22.5859h-169.49zM115.578 251.854v22.5859h280.844v-22.5859h-280.844z
-M115.578 204.896v22.5859h280.844v-22.5859h-280.844zM115.578 158.699v22.5859h280.844v-22.5859h-280.844zM115.578 112.504v22.5859h280.844v-22.5859h-280.844zM115.578 66.3076v22.5859h280.844v-22.5859h-280.844zM115.578 19.0879v22.5859h280.844v-22.5859h-280.844
-zM115.578 -27.1084v22.5859h280.844v-22.5859h-280.844z" />
-    <glyph glyph-name="astro" unicode="&#xf104;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.369v350.35h-122.69v118.652h-206.679v-469.002zM391.215 262.411c11.5938 -11.5947 6.47559 -34.2588 -15.6455 -69.2871c-5.60742 -8.88086 -12.1367 -18.2422 -19.4346 -27.9131c4.13086 -11.2793 6.38379 -23.4639 6.38379 -36.1738
-c0 -58.1104 -47.1074 -105.22 -105.218 -105.22c-12.666 0 -24.8096 2.23926 -36.0566 6.3418c-9.90332 -7.49902 -19.4893 -14.1963 -28.5703 -19.9307c-22.9121 -14.4688 -40.5381 -21.6641 -53.2314 -21.665c-6.71191 -0.000976562 -12.0449 2.01074 -16.0547 6.02051
-c-4.83789 4.83984 -6.7627 11.7695 -5.71973 20.5986c0.783203 6.62402 3.31445 14.6055 7.52441 23.7236c6.91895 14.9814 18.4443 33.2529 33.5459 53.2275c-4.30176 11.4834 -6.65625 23.918 -6.65625 36.9033c0 58.1094 47.1084 105.218 105.22 105.218
-c13.0293 0 25.5039 -2.36816 37.0195 -6.69824c20.1035 15.1475 38.4668 26.6494 53.4287 33.4414c8.91797 4.04785 16.7324 6.46094 23.2285 7.17285c8.65723 0.949219 15.4648 -0.989258 20.2363 -5.75977zM183.484 26.7207
-c5.99414 3.81348 12.2236 8.07129 18.627 12.7158c-13.749 8.48438 -25.3965 20.0449 -33.9854 33.7217c-11.2783 -15.5518 -19.9834 -29.6807 -25.5049 -41.4551c-8.75781 -18.6748 -5.94531 -23.7559 -5.91113 -23.7949
-c0.463867 -0.397461 3.97656 -1.33203 12.6104 1.42676c8.99023 2.87109 20.8037 8.88379 34.1641 17.3857zM346.835 184.338c4.45801 6.17285 8.55762 12.1826 12.2422 17.9717c8.50293 13.3594 14.5146 25.1738 17.3877 34.1641
-c2.75684 8.63672 1.82324 12.1494 1.42285 12.6172c-0.0351562 0.0283203 -4.96387 2.77148 -23.04 -5.56641c-11.7383 -5.41406 -25.915 -14.0859 -41.5566 -25.3838c13.5928 -8.55762 25.0879 -20.1406 33.5439 -33.8027z" />
-    <glyph glyph-name="unlock" unicode="&#xf10e;" 
-d="M475.929 -25.8672c0 -21.0557 -16.9902 -38.125 -37.9463 -38.125h-361.764c-20.958 0 -37.9473 17.0693 -37.9473 38.125v242.271c0 21.0547 16.9893 38.125 37.9473 38.125h361.763c20.957 0 37.9473 -17.0703 37.9473 -38.125v-242.271v0zM365.643 397.034
-l20.6064 -52.3926l-73.0195 -28.7412l-13.3633 33.9902c-4.25781 10.8203 -16.5273 16.1201 -27.4043 11.8389l-72.8105 -28.6602c-10.8779 -4.28125 -16.2432 -16.5225 -11.9844 -27.3418l62.624 -159.1l-74.207 -29.208l-69.8672 177.501
-c-16.2607 41.3125 4.04688 87.9824 45.3584 104.243l109.825 43.2295c41.3105 16.2598 87.9814 -4.04688 104.242 -45.3594z" />
-    <glyph glyph-name="code" unicode="&#xf10b;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM206.965 90.2354c0 -2.6084 -0.105469 -4.65234 -0.316406 -6.13281c-0.211914 -1.48145 -0.546875 -2.53809 -1.00488 -3.17188c-0.458984 -0.634766 -1.02246 -0.916992 -1.69141 -0.845703
-c-0.670898 0.0693359 -1.5332 0.351562 -2.59082 0.845703l-81.1055 40.3936c-0.988281 0.564453 -1.71094 1.74512 -2.16797 3.54297c-0.458984 1.79785 -0.6875 4.49414 -0.6875 8.08984c0 1.83203 0.0693359 3.43652 0.211914 4.81055
-c0.139648 1.375 0.317383 2.50195 0.52832 3.38379c0.211914 0.880859 0.510742 1.58691 0.898438 2.11523c0.386719 0.52832 0.828125 0.932617 1.32227 1.21582l81 40.1826c2.04395 0.986328 3.48926 0.792969 4.33594 -0.582031
-c0.845703 -1.375 1.26855 -4.17676 1.26855 -8.40723c0 -2.89062 -0.0527344 -5.18164 -0.158203 -6.87305c-0.106445 -1.69141 -0.300781 -3.03125 -0.582031 -4.01855c-0.282227 -0.987305 -0.670898 -1.69141 -1.16309 -2.11426
-c-0.494141 -0.422852 -1.16211 -0.845703 -2.00879 -1.26953l-60.9082 -28.5508l59.7451 -27.7051c1.05664 -0.494141 1.91992 -0.988281 2.59082 -1.48047c0.668945 -0.494141 1.17969 -1.25293 1.5332 -2.27344c0.352539 -1.02246 0.597656 -2.39746 0.740234 -4.12402
-c0.139648 -1.72656 0.209961 -4.07031 0.209961 -7.03125zM236.053 44.4492c-0.352539 -0.916016 -0.811523 -1.65625 -1.37402 -2.22168c-0.56543 -0.563477 -1.3584 -1.02051 -2.37988 -1.375c-1.02246 -0.351562 -2.29199 -0.616211 -3.80664 -0.792969
-c-1.5166 -0.174805 -3.43652 -0.264648 -5.7627 -0.264648c-2.8916 0 -5.25195 0.142578 -7.08496 0.422852c-1.83398 0.283203 -3.22461 0.705078 -4.17676 1.26953c-0.952148 0.56543 -1.49902 1.28711 -1.63965 2.16797c-0.141602 0.881836 0 1.9209 0.423828 3.11914
-l63.2344 177.544c0.28125 0.916016 0.703125 1.67383 1.26953 2.27344c0.5625 0.597656 1.33789 1.07422 2.32617 1.42773c0.986328 0.351562 2.27344 0.616211 3.85938 0.792969c1.58594 0.174805 3.50684 0.263672 5.76367 0.263672
-c2.95996 0 5.33984 -0.141602 7.1377 -0.422852c1.79785 -0.282227 3.15332 -0.705078 4.07031 -1.26855c0.915039 -0.56543 1.44434 -1.28711 1.58594 -2.16797c0.140625 -0.882812 0.0351562 -1.9209 -0.317383 -3.11914zM394.254 132.64
-c0 -1.83398 -0.0712891 -3.4209 -0.211914 -4.75879c-0.140625 -1.33984 -0.333984 -2.46875 -0.581055 -3.38379c-0.24707 -0.916992 -0.564453 -1.63867 -0.951172 -2.16699c-0.388672 -0.529297 -0.830078 -0.899414 -1.32227 -1.11035l-81.1055 -40.1826
-c-0.988281 -0.494141 -1.83496 -0.705078 -2.53809 -0.634766c-0.705078 0.0703125 -1.28711 0.458008 -1.74512 1.16309c-0.458008 0.704102 -0.775391 1.74512 -0.951172 3.12012c-0.176758 1.37402 -0.263672 3.11914 -0.263672 5.23438
-c0 2.88965 0.0527344 5.18066 0.158203 6.87305s0.298828 3.03027 0.582031 4.01855c0.28125 0.987305 0.669922 1.70801 1.16309 2.16797c0.491211 0.458008 1.16309 0.861328 2.00879 1.21582l60.9092 28.5508l-59.7461 27.7051
-c-1.12793 0.492188 -2.02637 0.986328 -2.69629 1.48047c-0.670898 0.492188 -1.18164 1.25 -1.5332 2.27344c-0.353516 1.02051 -0.582031 2.39551 -0.6875 4.12402c-0.105469 1.72656 -0.158203 4.07031 -0.158203 7.03125c0 2.60742 0.0869141 4.65332 0.263672 6.13379
-c0.175781 1.47949 0.493164 2.53711 0.951172 3.17188c0.458984 0.633789 1.04004 0.915039 1.74512 0.845703c0.703125 -0.0712891 1.5498 -0.353516 2.53809 -0.845703l81.2109 -40.5c0.915039 -0.423828 1.63965 -1.55176 2.16797 -3.38379
-c0.52832 -1.83398 0.792969 -4.54785 0.792969 -8.14258z" />
-    <glyph glyph-name="video" unicode="&#xf109;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM393.035 155.245h0.000976562v-136.743l-80.1689 46.2861v-54.1758h-193.78v141.273h24.5869c-15.6006 8.04688 -26.2744 24.3066 -26.2744 43.0693c0 26.7549 21.6895 48.4443 48.4453 48.4443
-c26.7549 0 48.4453 -21.6895 48.4453 -48.4443c0 -18.7627 -10.6748 -35.0225 -26.2754 -43.0693h56.9707c-15.6006 8.04688 -26.2734 24.3066 -26.2734 43.0693c0 26.7549 21.6885 48.4443 48.4443 48.4443c26.7549 0 48.4453 -21.6895 48.4453 -48.4443
-c0 -18.7627 -10.6748 -35.0225 -26.2754 -43.0693h23.541v-42.9268z" />
-    <glyph glyph-name="dataverse" unicode="&#xf100;" 
-d="M266.787 -63.7441c-34.1826 0 -63.501 10.5283 -87.6299 36.1436c-24.1299 25.6182 -36.3027 53.2461 -36.2842 87.2793c-0.0175781 34.0371 13.877 65.0029 36.2842 87.2861c14.4639 14.4277 32.6104 25.2881 52.8447 31.1895l-22.0381 98.7832
-c-0.977539 -0.0371094 -1.90625 -0.142578 -2.88477 -0.142578c-23.6602 -0.0136719 -45.1855 9.58691 -60.6836 25.0381c-15.5146 15.417 -25.1621 36.8779 -25.1387 60.4395c-0.0234375 23.5586 9.62402 45.0039 25.1387 60.4355
-c15.4971 15.4355 37.0234 25.0361 60.6836 25.0361c23.6699 0 45.1748 -9.60059 60.6846 -25.0361c15.498 -15.4326 25.1416 -36.8896 25.1416 -60.4355c0 -23.5615 -9.6416 -45.0225 -25.1416 -60.4395c-6.86328 -6.84082 -14.9756 -12.4639 -23.8604 -16.6787
-l22.7598 -102.048c0.0478516 0 0.0761719 0.0146484 0.124023 0.0146484c34.1836 0.0126953 65.2773 -13.8594 87.6484 -36.1553c22.3984 -22.2734 36.3086 -53.249 36.3086 -87.2861c0 -34.0332 -13.9102 -64.9814 -36.3086 -87.2803
-c-22.373 -22.2979 -53.4658 -36.1436 -87.6484 -36.1436zM147.449 362.272c0 -16.4385 6.66211 -31.2129 17.4727 -41.9951c10.8281 -10.7734 25.6445 -17.3965 42.1572 -17.4082c16.5215 0.0107422 31.3281 6.63379 42.1582 17.3926
-c10.8086 10.7979 17.4521 25.5596 17.4521 42.0107c0 16.4336 -6.64355 31.1895 -17.4521 41.9785c-10.8301 10.7754 -25.6357 17.3867 -42.1582 17.3975c-16.5127 -0.0117188 -31.3291 -6.62207 -42.1572 -17.3975c-10.8398 -10.7891 -17.4727 -25.5449 -17.4727 -41.9785z
-M329.748 -3.00293c16.1152 16.0977 26.041 38.1455 26.0713 62.6836c-0.0302734 24.541 -9.95605 46.5889 -26.0713 62.6914c-16.1611 16.0684 -38.3037 25.9434 -62.9609 25.9551c-24.6387 -0.00878906 -46.752 -9.88574 -62.9141 -25.9551
-c-16.1445 -16.1025 -26.0713 -38.1523 -26.0713 -62.6914c0 -24.5371 9.92676 -46.585 26.0713 -62.6836c16.1611 -16.0693 38.2754 -25.9424 62.9141 -25.957c24.6572 0.0126953 46.7988 9.88672 62.9609 25.957z" />
-    <glyph glyph-name="geodata" unicode="&#xf107;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM255.517 -10.7539c-36.6543 0 -71.1143 14.2744 -97.0322 40.1924c-25.9189 25.9199 -40.1934 60.3799 -40.1934 97.0332s14.2744 71.1133 40.1934 97.0332c25.918 25.9189 60.3779 40.1924 97.0322 40.1924
-c36.6533 0 71.1143 -14.2734 97.0332 -40.1924c25.918 -25.9199 40.1924 -60.3799 40.1924 -97.0332s-14.2744 -71.1133 -40.1924 -97.0332c-25.9199 -25.918 -60.3799 -40.1924 -97.0332 -40.1924zM263.665 5.82031l0.548828 0.0390625
-c28.9033 2.06348 56.167 14.5459 76.7676 35.1465s33.083 47.8643 35.1475 76.7686l0.0390625 0.547852h-22.708v16.2979h22.708l-0.0390625 0.547852c-2.06445 28.9043 -14.5469 56.167 -35.1475 76.7686c-20.6006 20.5996 -47.8633 33.083 -76.7676 35.1465
-l-0.548828 0.0390625v-22.707h-16.2969v22.707l-0.548828 -0.0390625c-28.9043 -2.06445 -56.167 -14.5469 -76.7686 -35.1465c-20.6006 -20.6016 -33.083 -47.8643 -35.1465 -76.7686l-0.0390625 -0.547852h22.708v-16.2979h-22.708l0.0390625 -0.547852
-c2.06445 -28.9043 14.5469 -56.168 35.1465 -76.7686c20.6016 -20.6006 47.8643 -33.083 76.7686 -35.1465l0.548828 -0.0390625v17.1553h16.2969v-17.1553zM255.517 263.185c-36.5176 0 -70.8486 -14.2207 -96.6709 -40.042
-c-25.8213 -25.8232 -40.042 -60.1543 -40.042 -96.6719c0 -36.5166 14.2207 -70.8477 40.042 -96.6709c25.8223 -25.8213 60.1533 -40.042 96.6709 -40.042c36.5166 0 70.8486 14.2207 96.6709 40.042c25.8223 25.8232 40.042 60.1543 40.042 96.6709
-c0 36.5176 -14.2197 70.8486 -40.042 96.6719c-25.8223 25.8213 -60.1543 40.042 -96.6709 40.042zM263.153 224.928v21.6455v1.09961l1.09668 -0.078125c29.0264 -2.07324 56.4062 -14.6084 77.0938 -35.2959s33.2227 -48.0674 35.2959 -77.0938l0.0791016 -1.09766
-h-1.10059h-21.6455v-15.2725h21.6455h1.10059l-0.0791016 -1.09766c-2.07324 -29.0264 -14.6084 -56.4062 -35.2959 -77.0928c-20.6875 -20.6885 -48.0674 -33.2236 -77.0938 -35.2969l-1.09668 -0.078125v1.09961v16.0947h-15.2734v-16.0947v-1.09961l-1.09766 0.078125
-c-29.0264 2.07324 -56.4053 14.6084 -77.0928 35.2969c-20.6885 20.6865 -33.2227 48.0664 -35.2959 77.0928l-0.078125 1.09766h1.09961h21.6465v15.2725h-21.6465h-1.09961l0.078125 1.09766c2.07324 29.0273 14.6074 56.4062 35.2959 77.0938
-c20.6875 20.6875 48.0664 33.2227 77.0928 35.2959l1.09766 0.078125v-1.09961v-21.6455h15.2734zM255.517 264.208v0c36.79 0 71.3799 -14.3271 97.3945 -40.3418c26.0156 -26.0156 40.3428 -60.6045 40.3428 -97.3955c0 -36.79 -14.3271 -71.3789 -40.3428 -97.3945
-c-26.0146 -26.0146 -60.6045 -40.3418 -97.3945 -40.3418c-36.791 0 -71.3789 14.3271 -97.3945 40.3418c-26.0156 26.0156 -40.3428 60.6045 -40.3428 97.3945c0 36.792 14.3271 71.3799 40.3428 97.3955c26.0146 26.0146 60.6035 40.3418 97.3945 40.3418z
-M246.855 223.903v0v22.6699c-59.5088 -4.25 -107.191 -51.9316 -111.44 -111.441h22.6699v-17.3203h-22.6699c4.25 -59.5088 51.9316 -107.191 111.44 -111.441v17.1182h17.3213v-17.1182c59.5088 4.25 107.19 51.9316 111.441 111.441h-22.6699v17.3203h22.6699
-c-4.25098 59.5098 -51.9326 107.191 -111.441 111.441v-22.6699h-17.3213zM223.457 158.531l113.237 49.1191l-49.1201 -113.237l-113.236 -49.1201zM201.481 72.4375l60.9619 26.4434l-34.5176 34.5176zM335.709 206.665l-111.862 -48.5234l-48.5234 -111.863
-l111.862 48.5244zM200.496 71.4521l1.03125 2.37891l25.6289 59.0811l0.598633 1.38086l1.06445 -1.06445l33.4531 -33.4531l1.06445 -1.06445l-1.38086 -0.599609l-59.0811 -25.627zM337.681 208.636v0l-49.7168 -114.611l-114.612 -49.7168l49.7168 114.613z
-M202.468 73.4238v0l59.0811 25.627l-33.4531 33.4531z" />
-    <glyph glyph-name="audio" unicode="&#xf105;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM371.032 265.229l0.0410156 -190.561h-0.0859375c-1.10156 -21.9277 -23.7656 -39.4336 -51.5654 -39.4336c-28.5068 0 -51.6133 18.4014 -51.6133 41.1035c0 22.6992 23.1064 41.1035 51.6133 41.1035
-c10.0078 0 19.3486 -2.27246 27.2607 -6.19922v100.195l-110.433 -26.915v-147.39c0.197266 -1.46191 0.301758 -2.94629 0.301758 -4.4502c0 -22.7021 -23.1084 -41.1035 -51.6123 -41.1035s-51.6104 18.4014 -51.6104 41.1035c0 22.7012 23.1064 41.1035 51.6104 41.1035
-c9.86523 0 19.083 -2.20508 26.9209 -6.0293l-0.106445 158.653z" />
-    <glyph glyph-name="other" unicode="&#xf10d;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002z" />
-    <glyph glyph-name="network" unicode="&#xf10c;" 
-d="M324.106 448l118.077 -115.579v-376.978c0 -10.7373 -8.70605 -19.4434 -19.4443 -19.4434h-333.479c-10.7393 0 -19.4434 8.70605 -19.4434 19.4434v473.113c0 10.7373 8.7041 19.4434 19.4434 19.4434h234.847zM319.493 422.432v-93.084h95.0947zM91.3154 -42.501
-h329.368v350.35h-122.689v118.652h-206.679v-469.002zM113.53 197.376c0 28.6289 23.209 51.8379 51.8379 51.8379s51.8369 -23.209 51.8369 -51.8379s-23.208 -51.8379 -51.8369 -51.8379s-51.8379 23.209 -51.8379 51.8379zM155.128 41.6895
-c0 28.6289 23.208 51.8369 51.8369 51.8369c28.6299 0 51.8379 -23.208 51.8379 -51.8369s-23.208 -51.8379 -51.8379 -51.8379c-28.6289 0 -51.8369 23.209 -51.8369 51.8379zM269.815 214.272c0 28.6289 23.209 51.8379 51.8379 51.8379s51.8369 -23.209 51.8369 -51.8379
-s-23.208 -51.8369 -51.8369 -51.8369s-51.8379 23.208 -51.8379 51.8369zM295.542 78.2793c0 28.6289 23.209 51.8369 51.8379 51.8369s51.8369 -23.208 51.8369 -51.8369s-23.208 -51.8379 -51.8369 -51.8379s-51.8379 23.209 -51.8379 51.8379zM222.548 44.2441
-c-0.575195 -0.795898 -1.20703 -1.39551 -1.89453 -1.79883c-0.69043 -0.400391 -1.57324 -0.641602 -2.65137 -0.723633c-1.07812 -0.0800781 -2.37305 -0.0126953 -3.88281 0.201172c-1.51172 0.216797 -3.3916 0.619141 -5.64062 1.21094
-c-2.7959 0.735352 -5.04395 1.47363 -6.74414 2.21094c-1.70215 0.739258 -2.94043 1.50195 -3.7168 2.29004c-0.776367 0.789062 -1.12207 1.62598 -1.03418 2.51367c0.0878906 0.888672 0.489258 1.8584 1.20312 2.9082l106.321 155.616
-c0.504883 0.814453 1.10547 1.44043 1.80566 1.87598c0.696289 0.435547 1.56738 0.699219 2.61328 0.789062c1.04395 0.0898438 2.35547 0.0185547 3.93457 -0.213867c1.57812 -0.234375 3.45801 -0.636719 5.64062 -1.21094
-c2.86328 -0.75293 5.12891 -1.49609 6.79492 -2.22461c1.66699 -0.730469 2.87109 -1.48438 3.61426 -2.2627c0.741211 -0.779297 1.06934 -1.6123 0.982422 -2.5c-0.0888672 -0.888672 -0.454102 -1.86719 -1.10059 -2.93555zM153.63 194.42
-c-0.941406 0.699219 -1.64746 1.42773 -2.11621 2.18359c-0.46582 0.758789 -0.735352 1.69141 -0.811523 2.79785c-0.0732422 1.10645 0.0351562 2.41211 0.324219 3.91406c0.291992 1.50391 0.814453 3.35449 1.57227 5.55371
-c0.941406 2.7334 1.875 4.90918 2.79688 6.53027c0.922852 1.62109 1.86328 2.76855 2.8252 3.44434c0.962891 0.674805 1.97363 0.904297 3.03711 0.686523c1.06348 -0.21582 2.21777 -0.763672 3.46289 -1.64062l184.372 -130.411
-c0.964844 -0.629883 1.70215 -1.33105 2.21094 -2.10449c0.504883 -0.770508 0.803711 -1.69238 0.889648 -2.76758c0.0849609 -1.07324 -0.0292969 -2.39453 -0.342773 -3.96387c-0.3125 -1.56836 -0.835938 -3.41992 -1.57129 -5.55371
-c-0.963867 -2.7998 -1.9043 -4.99219 -2.81348 -6.58105c-0.912109 -1.58691 -1.8418 -2.7002 -2.79004 -3.34375c-0.951172 -0.639648 -1.95801 -0.853516 -3.01953 -0.636719c-1.06543 0.21875 -2.23145 0.730469 -3.49805 1.54102zM226.966 27.6621
-c0.262695 -0.945312 0.336914 -1.8125 0.222656 -2.60254c-0.117188 -0.788086 -0.480469 -1.62988 -1.08789 -2.52246c-0.610352 -0.892578 -1.4707 -1.8623 -2.58105 -2.9082c-1.1123 -1.04688 -2.59961 -2.26465 -4.46582 -3.65332
-c-2.31934 -1.72656 -4.29883 -3.02051 -5.93652 -3.88965c-1.63965 -0.868164 -3.00781 -1.36035 -4.10938 -1.47559c-1.10059 -0.114258 -1.96973 0.137695 -2.6084 0.760742c-0.639648 0.62207 -1.14648 1.54199 -1.52246 2.75488l-55.251 180.189
-c-0.321289 0.902344 -0.435547 1.7627 -0.338867 2.58203c0.0947266 0.81543 0.431641 1.66016 1.01367 2.53418c0.582031 0.871094 1.45605 1.85156 2.62305 2.94043c1.16797 1.08691 2.65527 2.30469 4.46582 3.65137c2.375 1.76758 4.36914 3.07422 5.97949 3.92188
-c1.61133 0.84668 2.95117 1.31641 4.02246 1.41211c1.07227 0.0927734 1.92773 -0.170898 2.56641 -0.792969c0.639648 -0.624023 1.17578 -1.51953 1.60742 -2.69238zM361.474 91.7939c0.163086 -0.733398 0.166016 -1.43848 0.00683594 -2.11621
-c-0.163086 -0.676758 -0.548828 -1.44531 -1.15625 -2.30566c-0.609375 -0.860352 -1.44727 -1.83203 -2.51172 -2.91699c-1.06836 -1.08496 -2.48242 -2.38477 -4.24609 -3.90137c-2.19336 -1.88477 -4.05078 -3.34473 -5.57324 -4.38477
-c-1.52441 -1.04004 -2.77832 -1.71582 -3.7666 -2.02539c-0.989258 -0.308594 -1.74414 -0.269531 -2.26758 0.12207c-0.523438 0.392578 -0.90625 1.05664 -1.15137 1.99023l-35.8848 138.773c-0.220703 0.685547 -0.257812 1.37793 -0.112305 2.07617
-c0.144531 0.695312 0.507812 1.46191 1.09082 2.30078c0.582031 0.835938 1.43262 1.82031 2.55176 2.95215c1.12012 1.12988 2.53516 2.42969 4.24609 3.90137c2.24512 1.92969 4.11816 3.40234 5.61328 4.41992c1.49707 1.0166 2.72559 1.66797 3.68555 1.95605
-c0.961914 0.286133 1.7041 0.234375 2.22656 -0.157227c0.523438 -0.393555 0.935547 -1.0332 1.23242 -1.9209z" />
-  </font>
-</defs></svg>
diff --git a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.ttf b/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.ttf
deleted file mode 100644
index ffb69c47bc5..00000000000
Binary files a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.ttf and /dev/null differ
diff --git a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff b/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff
deleted file mode 100644
index 715a3d68703..00000000000
Binary files a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff and /dev/null differ
diff --git a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff2 b/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff2
deleted file mode 100644
index 5a84475d119..00000000000
Binary files a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff2 and /dev/null differ
diff --git a/src/main/webapp/resources/images/Robot-Icon_2.png b/src/main/webapp/resources/images/Robot-Icon_2.png
new file mode 100644
index 00000000000..42a5e01c406
Binary files /dev/null and b/src/main/webapp/resources/images/Robot-Icon_2.png differ
diff --git a/src/main/webapp/resources/iqbs/messages.xhtml b/src/main/webapp/resources/iqbs/messages.xhtml
index fc8b0ab8281..f8e1f5e8e9d 100644
--- a/src/main/webapp/resources/iqbs/messages.xhtml
+++ b/src/main/webapp/resources/iqbs/messages.xhtml
@@ -25,16 +25,12 @@
                     <h:outputText value="#{flash['errorMsg']} " escape="false"/>
                     <h:outputFormat value="#{bundle['error.support.message']}" escape="false">
                         <o:param>
-                            <p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
-                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                            <p:commandLink value="#{settingsWrapper.supportTeamName}" onclick ="clickSupportLink();" >
                             </p:commandLink>                                
                         </o:param>
                     </h:outputFormat>
                 </o:form>
-            </div>
+            </div>           
         </ui:fragment>
         <ui:fragment rendered="#{not empty flash['infoMsg']}">
             <div class="alert alert-info">
@@ -67,7 +63,7 @@
                         <f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss" type="date" />
                     </h:outputText>
                     <strong>Server: </strong>
-                    #{systemConfig.dataverseServer}
+                    #{systemConfig.dataverseSiteUrl}
                 </ui:fragment>
             </div>
             #{msg.rendered()}
diff --git a/src/main/webapp/resources/js/clipboard.min.js b/src/main/webapp/resources/js/clipboard.min.js
old mode 100755
new mode 100644
index 1993676f992..1103f811ed8
--- a/src/main/webapp/resources/js/clipboard.min.js
+++ b/src/main/webapp/resources/js/clipboard.min.js
@@ -1,7 +1,7 @@
 /*!
- * clipboard.js v1.6.1
- * https://zenorocha.github.io/clipboard.js
+ * clipboard.js v2.0.11
+ * https://clipboardjs.com/
  *
  * Licensed MIT Š Zeno Rocha
  */
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.Clipboard=e()}}(function(){var e,t,n;return function e(t,n,o){function i(a,c){if(!n[a]){if(!t[a]){var l="function"==typeof require&&require;if(!c&&l)return l(a,!0);if(r)return r(a,!0);var u=new Error("Cannot find module '"+a+"'");throw u.code="MODULE_NOT_FOUND",u}var s=n[a]={exports:{}};t[a][0].call(s.exports,function(e){var n=t[a][1][e];return i(n?n:e)},s,s.exports,e,t,n,o)}return n[a].exports}for(var r="function"==typeof require&&require,a=0;a<o.length;a++)i(o[a]);return i}({1:[function(e,t,n){function o(e,t){for(;e&&e.nodeType!==i;){if(e.matches(t))return e;e=e.parentNode}}var i=9;if("undefined"!=typeof Element&&!Element.prototype.matches){var r=Element.prototype;r.matches=r.matchesSelector||r.mozMatchesSelector||r.msMatchesSelector||r.oMatchesSelector||r.webkitMatchesSelector}t.exports=o},{}],2:[function(e,t,n){function o(e,t,n,o,r){var a=i.apply(this,arguments);return e.addEventListener(n,a,r),{destroy:function(){e.removeEventListener(n,a,r)}}}function i(e,t,n,o){return function(n){n.delegateTarget=r(n.target,t),n.delegateTarget&&o.call(e,n)}}var r=e("./closest");t.exports=o},{"./closest":1}],3:[function(e,t,n){n.node=function(e){return void 0!==e&&e instanceof HTMLElement&&1===e.nodeType},n.nodeList=function(e){var t=Object.prototype.toString.call(e);return void 0!==e&&("[object NodeList]"===t||"[object HTMLCollection]"===t)&&"length"in e&&(0===e.length||n.node(e[0]))},n.string=function(e){return"string"==typeof e||e instanceof String},n.fn=function(e){var t=Object.prototype.toString.call(e);return"[object Function]"===t}},{}],4:[function(e,t,n){function o(e,t,n){if(!e&&!t&&!n)throw new Error("Missing required arguments");if(!c.string(t))throw new TypeError("Second argument must be a String");if(!c.fn(n))throw new TypeError("Third argument must be a Function");if(c.node(e))return i(e,t,n);if(c.nodeList(e))return r(e,t,n);if(c.string(e))return a(e,t,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}function i(e,t,n){return e.addEventListener(t,n),{destroy:function(){e.removeEventListener(t,n)}}}function r(e,t,n){return Array.prototype.forEach.call(e,function(e){e.addEventListener(t,n)}),{destroy:function(){Array.prototype.forEach.call(e,function(e){e.removeEventListener(t,n)})}}}function a(e,t,n){return l(document.body,e,t,n)}var c=e("./is"),l=e("delegate");t.exports=o},{"./is":3,delegate:2}],5:[function(e,t,n){function o(e){var t;if("SELECT"===e.nodeName)e.focus(),t=e.value;else if("INPUT"===e.nodeName||"TEXTAREA"===e.nodeName){var n=e.hasAttribute("readonly");n||e.setAttribute("readonly",""),e.select(),e.setSelectionRange(0,e.value.length),n||e.removeAttribute("readonly"),t=e.value}else{e.hasAttribute("contenteditable")&&e.focus();var o=window.getSelection(),i=document.createRange();i.selectNodeContents(e),o.removeAllRanges(),o.addRange(i),t=o.toString()}return t}t.exports=o},{}],6:[function(e,t,n){function o(){}o.prototype={on:function(e,t,n){var o=this.e||(this.e={});return(o[e]||(o[e]=[])).push({fn:t,ctx:n}),this},once:function(e,t,n){function o(){i.off(e,o),t.apply(n,arguments)}var i=this;return o._=t,this.on(e,o,n)},emit:function(e){var t=[].slice.call(arguments,1),n=((this.e||(this.e={}))[e]||[]).slice(),o=0,i=n.length;for(o;o<i;o++)n[o].fn.apply(n[o].ctx,t);return this},off:function(e,t){var n=this.e||(this.e={}),o=n[e],i=[];if(o&&t)for(var r=0,a=o.length;r<a;r++)o[r].fn!==t&&o[r].fn._!==t&&i.push(o[r]);return i.length?n[e]=i:delete n[e],this}},t.exports=o},{}],7:[function(t,n,o){!function(i,r){if("function"==typeof e&&e.amd)e(["module","select"],r);else if("undefined"!=typeof o)r(n,t("select"));else{var a={exports:{}};r(a,i.select),i.clipboardAction=a.exports}}(this,function(e,t){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var i=n(t),r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),c=function(){function e(t){o(this,e),this.resolveOptions(t),this.initSelection()}return a(e,[{key:"resolveOptions",value:function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};this.action=t.action,this.emitter=t.emitter,this.target=t.target,this.text=t.text,this.trigger=t.trigger,this.selectedText=""}},{key:"initSelection",value:function e(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"selectFake",value:function e(){var t=this,n="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return t.removeFake()},this.fakeHandler=document.body.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[n?"right":"left"]="-9999px";var o=window.pageYOffset||document.documentElement.scrollTop;this.fakeElem.style.top=o+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,document.body.appendChild(this.fakeElem),this.selectedText=(0,i.default)(this.fakeElem),this.copyText()}},{key:"removeFake",value:function e(){this.fakeHandler&&(document.body.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(document.body.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function e(){this.selectedText=(0,i.default)(this.target),this.copyText()}},{key:"copyText",value:function e(){var t=void 0;try{t=document.execCommand(this.action)}catch(e){t=!1}this.handleResult(t)}},{key:"handleResult",value:function e(t){this.emitter.emit(t?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function e(){this.target&&this.target.blur(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function e(){this.removeFake()}},{key:"action",set:function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"copy";if(this._action=t,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function e(){return this._action}},{key:"target",set:function e(t){if(void 0!==t){if(!t||"object"!==("undefined"==typeof t?"undefined":r(t))||1!==t.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&t.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(t.hasAttribute("readonly")||t.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=t}},get:function e(){return this._target}}]),e}();e.exports=c})},{select:5}],8:[function(t,n,o){!function(i,r){if("function"==typeof e&&e.amd)e(["module","./clipboard-action","tiny-emitter","good-listener"],r);else if("undefined"!=typeof o)r(n,t("./clipboard-action"),t("tiny-emitter"),t("good-listener"));else{var a={exports:{}};r(a,i.clipboardAction,i.tinyEmitter,i.goodListener),i.clipboard=a.exports}}(this,function(e,t,n,o){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function c(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function l(e,t){var n="data-clipboard-"+e;if(t.hasAttribute(n))return t.getAttribute(n)}var u=i(t),s=i(n),f=i(o),d=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),h=function(e){function t(e,n){r(this,t);var o=a(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return o.resolveOptions(n),o.listenClick(e),o}return c(t,e),d(t,[{key:"resolveOptions",value:function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText}},{key:"listenClick",value:function e(t){var n=this;this.listener=(0,f.default)(t,"click",function(e){return n.onClick(e)})}},{key:"onClick",value:function e(t){var n=t.delegateTarget||t.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new u.default({action:this.action(n),target:this.target(n),text:this.text(n),trigger:n,emitter:this})}},{key:"defaultAction",value:function e(t){return l("action",t)}},{key:"defaultTarget",value:function e(t){var n=l("target",t);if(n)return document.querySelector(n)}},{key:"defaultText",value:function e(t){return l("text",t)}},{key:"destroy",value:function e(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}],[{key:"isSupported",value:function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:["copy","cut"],n="string"==typeof t?[t]:t,o=!!document.queryCommandSupported;return n.forEach(function(e){o=o&&!!document.queryCommandSupported(e)}),o}}]),t}(s.default);e.exports=h})},{"./clipboard-action":7,"good-listener":4,"tiny-emitter":6}]},{},[8])(8)});
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return n={686:function(t,e,n){"use strict";n.d(e,{default:function(){return b}});var e=n(279),i=n.n(e),e=n(370),u=n.n(e),e=n(817),r=n.n(e);function c(t){try{return document.execCommand(t)}catch(t){return}}var a=function(t){t=r()(t);return c("cut"),t};function o(t,e){var n,o,t=(n=t,o="rtl"===document.documentElement.getAttribute("dir"),(t=document.createElement("textarea")).style.fontSize="12pt",t.style.border="0",t.style.padding="0",t.style.margin="0",t.style.position="absolute",t.style[o?"right":"left"]="-9999px",o=window.pageYOffset||document.documentElement.scrollTop,t.style.top="".concat(o,"px"),t.setAttribute("readonly",""),t.value=n,t);return e.container.appendChild(t),e=r()(t),c("copy"),t.remove(),e}var f=function(t){var e=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{container:document.body},n="";return"string"==typeof t?n=o(t,e):t instanceof HTMLInputElement&&!["text","search","url","tel","password"].includes(null==t?void 0:t.type)?n=o(t.value,e):(n=r()(t),c("copy")),n};function l(t){return(l="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var s=function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},e=t.action,n=void 0===e?"copy":e,o=t.container,e=t.target,t=t.text;if("copy"!==n&&"cut"!==n)throw new Error('Invalid "action" value, use either "copy" or "cut"');if(void 0!==e){if(!e||"object"!==l(e)||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===n&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===n&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes')}return t?f(t,{container:o}):e?"cut"===n?a(e):f(e,{container:o}):void 0};function p(t){return(p="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function d(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function y(t,e){return(y=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function h(n){var o=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(t){return!1}}();return function(){var t,e=v(n);return t=o?(t=v(this).constructor,Reflect.construct(e,arguments,t)):e.apply(this,arguments),e=this,!(t=t)||"object"!==p(t)&&"function"!=typeof t?function(t){if(void 0!==t)return t;throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}(e):t}}function v(t){return(v=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function m(t,e){t="data-clipboard-".concat(t);if(e.hasAttribute(t))return e.getAttribute(t)}var b=function(){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&y(t,e)}(r,i());var t,e,n,o=h(r);function r(t,e){var n;return function(t){if(!(t instanceof r))throw new TypeError("Cannot call a class as a function")}(this),(n=o.call(this)).resolveOptions(e),n.listenClick(t),n}return t=r,n=[{key:"copy",value:function(t){var e=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{container:document.body};return f(t,e)}},{key:"cut",value:function(t){return a(t)}},{key:"isSupported",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:["copy","cut"],t="string"==typeof t?[t]:t,e=!!document.queryCommandSupported;return t.forEach(function(t){e=e&&!!document.queryCommandSupported(t)}),e}}],(e=[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===p(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=u()(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget,n=this.action(e)||"copy",t=s({action:n,container:this.container,target:this.target(e),text:this.text(e)});this.emit(t?"success":"error",{action:n,text:t,trigger:e,clearSelection:function(){e&&e.focus(),window.getSelection().removeAllRanges()}})}},{key:"defaultAction",value:function(t){return m("action",t)}},{key:"defaultTarget",value:function(t){t=m("target",t);if(t)return document.querySelector(t)}},{key:"defaultText",value:function(t){return m("text",t)}},{key:"destroy",value:function(){this.listener.destroy()}}])&&d(t.prototype,e),n&&d(t,n),r}()},828:function(t){var e;"undefined"==typeof Element||Element.prototype.matches||((e=Element.prototype).matches=e.matchesSelector||e.mozMatchesSelector||e.msMatchesSelector||e.oMatchesSelector||e.webkitMatchesSelector),t.exports=function(t,e){for(;t&&9!==t.nodeType;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}},438:function(t,e,n){var u=n(828);function i(t,e,n,o,r){var i=function(e,n,t,o){return function(t){t.delegateTarget=u(t.target,n),t.delegateTarget&&o.call(e,t)}}.apply(this,arguments);return t.addEventListener(n,i,r),{destroy:function(){t.removeEventListener(n,i,r)}}}t.exports=function(t,e,n,o,r){return"function"==typeof t.addEventListener?i.apply(null,arguments):"function"==typeof n?i.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return i(t,e,n,o,r)}))}},879:function(t,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},370:function(t,e,n){var f=n(879),l=n(438);t.exports=function(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!f.string(e))throw new TypeError("Second argument must be a String");if(!f.fn(n))throw new TypeError("Third argument must be a Function");if(f.node(t))return c=e,a=n,(u=t).addEventListener(c,a),{destroy:function(){u.removeEventListener(c,a)}};if(f.nodeList(t))return o=t,r=e,i=n,Array.prototype.forEach.call(o,function(t){t.addEventListener(r,i)}),{destroy:function(){Array.prototype.forEach.call(o,function(t){t.removeEventListener(r,i)})}};if(f.string(t))return t=t,e=e,n=n,l(document.body,t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList");var o,r,i,u,c,a}},817:function(t){t.exports=function(t){var e,n="SELECT"===t.nodeName?(t.focus(),t.value):"INPUT"===t.nodeName||"TEXTAREA"===t.nodeName?((e=t.hasAttribute("readonly"))||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),e||t.removeAttribute("readonly"),t.value):(t.hasAttribute("contenteditable")&&t.focus(),n=window.getSelection(),(e=document.createRange()).selectNodeContents(t),n.removeAllRanges(),n.addRange(e),n.toString());return n}},279:function(t){function e(){}e.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var o=this;function r(){o.off(t,r),e.apply(n,arguments)}return r._=e,this.on(t,r,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;o<r;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],r=[];if(o&&e)for(var i=0,u=o.length;i<u;i++)o[i].fn!==e&&o[i].fn._!==e&&r.push(o[i]);return r.length?n[t]=r:delete n[t],this}},t.exports=e,t.exports.TinyEmitter=e}},r={},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,{a:e}),e},o.d=function(t,e){for(var n in e)o.o(e,n)&&!o.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o(686).default;function o(t){if(r[t])return r[t].exports;var e=r[t]={exports:{}};return n[t](e,e.exports,o),e.exports}var n,r});
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/crypto-js/4.0.0/core.js b/src/main/webapp/resources/js/crypto-js/4.0.0/core.js
new file mode 100644
index 00000000000..0ef552baa5b
--- /dev/null
+++ b/src/main/webapp/resources/js/crypto-js/4.0.0/core.js
@@ -0,0 +1,797 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory();
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define([], factory);
+	}
+	else {
+		// Global (browser)
+		root.CryptoJS = factory();
+	}
+}(this, function () {
+
+	/*globals window, global, require*/
+
+	/**
+	 * CryptoJS core components.
+	 */
+	var CryptoJS = CryptoJS || (function (Math, undefined) {
+
+	    var crypto;
+
+	    // Native crypto from window (Browser)
+	    if (typeof window !== 'undefined' && window.crypto) {
+	        crypto = window.crypto;
+	    }
+
+	    // Native (experimental IE 11) crypto from window (Browser)
+	    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
+	        crypto = window.msCrypto;
+	    }
+
+	    // Native crypto from global (NodeJS)
+	    if (!crypto && typeof global !== 'undefined' && global.crypto) {
+	        crypto = global.crypto;
+	    }
+
+	    // Native crypto import via require (NodeJS)
+	    if (!crypto && typeof require === 'function') {
+	        try {
+	            crypto = require('crypto');
+	        } catch (err) {}
+	    }
+
+	    /*
+	     * Cryptographically secure pseudorandom number generator
+	     *
+	     * As Math.random() is cryptographically not safe to use
+	     */
+	    var cryptoSecureRandomInt = function () {
+	        if (crypto) {
+	            // Use getRandomValues method (Browser)
+	            if (typeof crypto.getRandomValues === 'function') {
+	                try {
+	                    return crypto.getRandomValues(new Uint32Array(1))[0];
+	                } catch (err) {}
+	            }
+
+	            // Use randomBytes method (NodeJS)
+	            if (typeof crypto.randomBytes === 'function') {
+	                try {
+	                    return crypto.randomBytes(4).readInt32LE();
+	                } catch (err) {}
+	            }
+	        }
+
+	        throw new Error('Native crypto module could not be used to get secure random number.');
+	    };
+
+	    /*
+	     * Local polyfill of Object.create
+
+	     */
+	    var create = Object.create || (function () {
+	        function F() {}
+
+	        return function (obj) {
+	            var subtype;
+
+	            F.prototype = obj;
+
+	            subtype = new F();
+
+	            F.prototype = null;
+
+	            return subtype;
+	        };
+	    }())
+
+	    /**
+	     * CryptoJS namespace.
+	     */
+	    var C = {};
+
+	    /**
+	     * Library namespace.
+	     */
+	    var C_lib = C.lib = {};
+
+	    /**
+	     * Base object for prototypal inheritance.
+	     */
+	    var Base = C_lib.Base = (function () {
+
+
+	        return {
+	            /**
+	             * Creates a new object that inherits from this object.
+	             *
+	             * @param {Object} overrides Properties to copy into the new object.
+	             *
+	             * @return {Object} The new object.
+	             *
+	             * @static
+	             *
+	             * @example
+	             *
+	             *     var MyType = CryptoJS.lib.Base.extend({
+	             *         field: 'value',
+	             *
+	             *         method: function () {
+	             *         }
+	             *     });
+	             */
+	            extend: function (overrides) {
+	                // Spawn
+	                var subtype = create(this);
+
+	                // Augment
+	                if (overrides) {
+	                    subtype.mixIn(overrides);
+	                }
+
+	                // Create default initializer
+	                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
+	                    subtype.init = function () {
+	                        subtype.$super.init.apply(this, arguments);
+	                    };
+	                }
+
+	                // Initializer's prototype is the subtype object
+	                subtype.init.prototype = subtype;
+
+	                // Reference supertype
+	                subtype.$super = this;
+
+	                return subtype;
+	            },
+
+	            /**
+	             * Extends this object and runs the init method.
+	             * Arguments to create() will be passed to init().
+	             *
+	             * @return {Object} The new object.
+	             *
+	             * @static
+	             *
+	             * @example
+	             *
+	             *     var instance = MyType.create();
+	             */
+	            create: function () {
+	                var instance = this.extend();
+	                instance.init.apply(instance, arguments);
+
+	                return instance;
+	            },
+
+	            /**
+	             * Initializes a newly created object.
+	             * Override this method to add some logic when your objects are created.
+	             *
+	             * @example
+	             *
+	             *     var MyType = CryptoJS.lib.Base.extend({
+	             *         init: function () {
+	             *             // ...
+	             *         }
+	             *     });
+	             */
+	            init: function () {
+	            },
+
+	            /**
+	             * Copies properties into this object.
+	             *
+	             * @param {Object} properties The properties to mix in.
+	             *
+	             * @example
+	             *
+	             *     MyType.mixIn({
+	             *         field: 'value'
+	             *     });
+	             */
+	            mixIn: function (properties) {
+	                for (var propertyName in properties) {
+	                    if (properties.hasOwnProperty(propertyName)) {
+	                        this[propertyName] = properties[propertyName];
+	                    }
+	                }
+
+	                // IE won't copy toString using the loop above
+	                if (properties.hasOwnProperty('toString')) {
+	                    this.toString = properties.toString;
+	                }
+	            },
+
+	            /**
+	             * Creates a copy of this object.
+	             *
+	             * @return {Object} The clone.
+	             *
+	             * @example
+	             *
+	             *     var clone = instance.clone();
+	             */
+	            clone: function () {
+	                return this.init.prototype.extend(this);
+	            }
+	        };
+	    }());
+
+	    /**
+	     * An array of 32-bit words.
+	     *
+	     * @property {Array} words The array of 32-bit words.
+	     * @property {number} sigBytes The number of significant bytes in this word array.
+	     */
+	    var WordArray = C_lib.WordArray = Base.extend({
+	        /**
+	         * Initializes a newly created word array.
+	         *
+	         * @param {Array} words (Optional) An array of 32-bit words.
+	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.lib.WordArray.create();
+	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
+	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
+	         */
+	        init: function (words, sigBytes) {
+	            words = this.words = words || [];
+
+	            if (sigBytes != undefined) {
+	                this.sigBytes = sigBytes;
+	            } else {
+	                this.sigBytes = words.length * 4;
+	            }
+	        },
+
+	        /**
+	         * Converts this word array to a string.
+	         *
+	         * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
+	         *
+	         * @return {string} The stringified word array.
+	         *
+	         * @example
+	         *
+	         *     var string = wordArray + '';
+	         *     var string = wordArray.toString();
+	         *     var string = wordArray.toString(CryptoJS.enc.Utf8);
+	         */
+	        toString: function (encoder) {
+	            return (encoder || Hex).stringify(this);
+	        },
+
+	        /**
+	         * Concatenates a word array to this word array.
+	         *
+	         * @param {WordArray} wordArray The word array to append.
+	         *
+	         * @return {WordArray} This word array.
+	         *
+	         * @example
+	         *
+	         *     wordArray1.concat(wordArray2);
+	         */
+	        concat: function (wordArray) {
+	            // Shortcuts
+	            var thisWords = this.words;
+	            var thatWords = wordArray.words;
+	            var thisSigBytes = this.sigBytes;
+	            var thatSigBytes = wordArray.sigBytes;
+
+	            // Clamp excess bits
+	            this.clamp();
+
+	            // Concat
+	            if (thisSigBytes % 4) {
+	                // Copy one byte at a time
+	                for (var i = 0; i < thatSigBytes; i++) {
+	                    var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                    thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
+	                }
+	            } else {
+	                // Copy one word at a time
+	                for (var i = 0; i < thatSigBytes; i += 4) {
+	                    thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2];
+	                }
+	            }
+	            this.sigBytes += thatSigBytes;
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Removes insignificant bits.
+	         *
+	         * @example
+	         *
+	         *     wordArray.clamp();
+	         */
+	        clamp: function () {
+	            // Shortcuts
+	            var words = this.words;
+	            var sigBytes = this.sigBytes;
+
+	            // Clamp
+	            words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
+	            words.length = Math.ceil(sigBytes / 4);
+	        },
+
+	        /**
+	         * Creates a copy of this word array.
+	         *
+	         * @return {WordArray} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = wordArray.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+	            clone.words = this.words.slice(0);
+
+	            return clone;
+	        },
+
+	        /**
+	         * Creates a word array filled with random bytes.
+	         *
+	         * @param {number} nBytes The number of random bytes to generate.
+	         *
+	         * @return {WordArray} The random word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.lib.WordArray.random(16);
+	         */
+	        random: function (nBytes) {
+	            var words = [];
+
+	            for (var i = 0; i < nBytes; i += 4) {
+	                words.push(cryptoSecureRandomInt());
+	            }
+
+	            return new WordArray.init(words, nBytes);
+	        }
+	    });
+
+	    /**
+	     * Encoder namespace.
+	     */
+	    var C_enc = C.enc = {};
+
+	    /**
+	     * Hex encoding strategy.
+	     */
+	    var Hex = C_enc.Hex = {
+	        /**
+	         * Converts a word array to a hex string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The hex string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var hexChars = [];
+	            for (var i = 0; i < sigBytes; i++) {
+	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                hexChars.push((bite >>> 4).toString(16));
+	                hexChars.push((bite & 0x0f).toString(16));
+	            }
+
+	            return hexChars.join('');
+	        },
+
+	        /**
+	         * Converts a hex string to a word array.
+	         *
+	         * @param {string} hexStr The hex string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Hex.parse(hexString);
+	         */
+	        parse: function (hexStr) {
+	            // Shortcut
+	            var hexStrLength = hexStr.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < hexStrLength; i += 2) {
+	                words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
+	            }
+
+	            return new WordArray.init(words, hexStrLength / 2);
+	        }
+	    };
+
+	    /**
+	     * Latin1 encoding strategy.
+	     */
+	    var Latin1 = C_enc.Latin1 = {
+	        /**
+	         * Converts a word array to a Latin1 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The Latin1 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var latin1Chars = [];
+	            for (var i = 0; i < sigBytes; i++) {
+	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                latin1Chars.push(String.fromCharCode(bite));
+	            }
+
+	            return latin1Chars.join('');
+	        },
+
+	        /**
+	         * Converts a Latin1 string to a word array.
+	         *
+	         * @param {string} latin1Str The Latin1 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
+	         */
+	        parse: function (latin1Str) {
+	            // Shortcut
+	            var latin1StrLength = latin1Str.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < latin1StrLength; i++) {
+	                words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
+	            }
+
+	            return new WordArray.init(words, latin1StrLength);
+	        }
+	    };
+
+	    /**
+	     * UTF-8 encoding strategy.
+	     */
+	    var Utf8 = C_enc.Utf8 = {
+	        /**
+	         * Converts a word array to a UTF-8 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The UTF-8 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            try {
+	                return decodeURIComponent(escape(Latin1.stringify(wordArray)));
+	            } catch (e) {
+	                throw new Error('Malformed UTF-8 data');
+	            }
+	        },
+
+	        /**
+	         * Converts a UTF-8 string to a word array.
+	         *
+	         * @param {string} utf8Str The UTF-8 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
+	         */
+	        parse: function (utf8Str) {
+	            return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
+	        }
+	    };
+
+	    /**
+	     * Abstract buffered block algorithm template.
+	     *
+	     * The property blockSize must be implemented in a concrete subtype.
+	     *
+	     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
+	     */
+	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
+	        /**
+	         * Resets this block algorithm's data buffer to its initial state.
+	         *
+	         * @example
+	         *
+	         *     bufferedBlockAlgorithm.reset();
+	         */
+	        reset: function () {
+	            // Initial values
+	            this._data = new WordArray.init();
+	            this._nDataBytes = 0;
+	        },
+
+	        /**
+	         * Adds new data to this block algorithm's buffer.
+	         *
+	         * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
+	         *
+	         * @example
+	         *
+	         *     bufferedBlockAlgorithm._append('data');
+	         *     bufferedBlockAlgorithm._append(wordArray);
+	         */
+	        _append: function (data) {
+	            // Convert string to WordArray, else assume WordArray already
+	            if (typeof data == 'string') {
+	                data = Utf8.parse(data);
+	            }
+
+	            // Append
+	            this._data.concat(data);
+	            this._nDataBytes += data.sigBytes;
+	        },
+
+	        /**
+	         * Processes available data blocks.
+	         *
+	         * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
+	         *
+	         * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
+	         *
+	         * @return {WordArray} The processed data.
+	         *
+	         * @example
+	         *
+	         *     var processedData = bufferedBlockAlgorithm._process();
+	         *     var processedData = bufferedBlockAlgorithm._process(!!'flush');
+	         */
+	        _process: function (doFlush) {
+	            var processedWords;
+
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+	            var dataSigBytes = data.sigBytes;
+	            var blockSize = this.blockSize;
+	            var blockSizeBytes = blockSize * 4;
+
+	            // Count blocks ready
+	            var nBlocksReady = dataSigBytes / blockSizeBytes;
+	            if (doFlush) {
+	                // Round up to include partial blocks
+	                nBlocksReady = Math.ceil(nBlocksReady);
+	            } else {
+	                // Round down to include only full blocks,
+	                // less the number of blocks that must remain in the buffer
+	                nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
+	            }
+
+	            // Count words ready
+	            var nWordsReady = nBlocksReady * blockSize;
+
+	            // Count bytes ready
+	            var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
+
+	            // Process blocks
+	            if (nWordsReady) {
+	                for (var offset = 0; offset < nWordsReady; offset += blockSize) {
+	                    // Perform concrete-algorithm logic
+	                    this._doProcessBlock(dataWords, offset);
+	                }
+
+	                // Remove processed words
+	                processedWords = dataWords.splice(0, nWordsReady);
+	                data.sigBytes -= nBytesReady;
+	            }
+
+	            // Return processed words
+	            return new WordArray.init(processedWords, nBytesReady);
+	        },
+
+	        /**
+	         * Creates a copy of this object.
+	         *
+	         * @return {Object} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = bufferedBlockAlgorithm.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+	            clone._data = this._data.clone();
+
+	            return clone;
+	        },
+
+	        _minBufferSize: 0
+	    });
+
+	    /**
+	     * Abstract hasher template.
+	     *
+	     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
+	     */
+	    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
+	        /**
+	         * Configuration options.
+	         */
+	        cfg: Base.extend(),
+
+	        /**
+	         * Initializes a newly created hasher.
+	         *
+	         * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
+	         *
+	         * @example
+	         *
+	         *     var hasher = CryptoJS.algo.SHA256.create();
+	         */
+	        init: function (cfg) {
+	            // Apply config defaults
+	            this.cfg = this.cfg.extend(cfg);
+
+	            // Set initial values
+	            this.reset();
+	        },
+
+	        /**
+	         * Resets this hasher to its initial state.
+	         *
+	         * @example
+	         *
+	         *     hasher.reset();
+	         */
+	        reset: function () {
+	            // Reset data buffer
+	            BufferedBlockAlgorithm.reset.call(this);
+
+	            // Perform concrete-hasher logic
+	            this._doReset();
+	        },
+
+	        /**
+	         * Updates this hasher with a message.
+	         *
+	         * @param {WordArray|string} messageUpdate The message to append.
+	         *
+	         * @return {Hasher} This hasher.
+	         *
+	         * @example
+	         *
+	         *     hasher.update('message');
+	         *     hasher.update(wordArray);
+	         */
+	        update: function (messageUpdate) {
+	            // Append
+	            this._append(messageUpdate);
+
+	            // Update the hash
+	            this._process();
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Finalizes the hash computation.
+	         * Note that the finalize operation is effectively a destructive, read-once operation.
+	         *
+	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
+	         *
+	         * @return {WordArray} The hash.
+	         *
+	         * @example
+	         *
+	         *     var hash = hasher.finalize();
+	         *     var hash = hasher.finalize('message');
+	         *     var hash = hasher.finalize(wordArray);
+	         */
+	        finalize: function (messageUpdate) {
+	            // Final message update
+	            if (messageUpdate) {
+	                this._append(messageUpdate);
+	            }
+
+	            // Perform concrete-hasher logic
+	            var hash = this._doFinalize();
+
+	            return hash;
+	        },
+
+	        blockSize: 512/32,
+
+	        /**
+	         * Creates a shortcut function to a hasher's object interface.
+	         *
+	         * @param {Hasher} hasher The hasher to create a helper for.
+	         *
+	         * @return {Function} The shortcut function.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
+	         */
+	        _createHelper: function (hasher) {
+	            return function (message, cfg) {
+	                return new hasher.init(cfg).finalize(message);
+	            };
+	        },
+
+	        /**
+	         * Creates a shortcut function to the HMAC's object interface.
+	         *
+	         * @param {Hasher} hasher The hasher to use in this HMAC helper.
+	         *
+	         * @return {Function} The shortcut function.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
+	         */
+	        _createHmacHelper: function (hasher) {
+	            return function (message, key) {
+	                return new C_algo.HMAC.init(hasher, key).finalize(message);
+	            };
+	        }
+	    });
+
+	    /**
+	     * Algorithm namespace.
+	     */
+	    var C_algo = C.algo = {};
+
+	    return C;
+	}(Math));
+
+
+	return CryptoJS;
+
+}));
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/crypto-js/4.0.0/md5.js b/src/main/webapp/resources/js/crypto-js/4.0.0/md5.js
new file mode 100644
index 00000000000..12b0fdd4b4f
--- /dev/null
+++ b/src/main/webapp/resources/js/crypto-js/4.0.0/md5.js
@@ -0,0 +1,268 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Constants table
+	    var T = [];
+
+	    // Compute constants
+	    (function () {
+	        for (var i = 0; i < 64; i++) {
+	            T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
+	        }
+	    }());
+
+	    /**
+	     * MD5 hash algorithm.
+	     */
+	    var MD5 = C_algo.MD5 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0x67452301, 0xefcdab89,
+	                0x98badcfe, 0x10325476
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Swap endian
+	            for (var i = 0; i < 16; i++) {
+	                // Shortcuts
+	                var offset_i = offset + i;
+	                var M_offset_i = M[offset_i];
+
+	                M[offset_i] = (
+	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
+	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
+	                );
+	            }
+
+	            // Shortcuts
+	            var H = this._hash.words;
+
+	            var M_offset_0  = M[offset + 0];
+	            var M_offset_1  = M[offset + 1];
+	            var M_offset_2  = M[offset + 2];
+	            var M_offset_3  = M[offset + 3];
+	            var M_offset_4  = M[offset + 4];
+	            var M_offset_5  = M[offset + 5];
+	            var M_offset_6  = M[offset + 6];
+	            var M_offset_7  = M[offset + 7];
+	            var M_offset_8  = M[offset + 8];
+	            var M_offset_9  = M[offset + 9];
+	            var M_offset_10 = M[offset + 10];
+	            var M_offset_11 = M[offset + 11];
+	            var M_offset_12 = M[offset + 12];
+	            var M_offset_13 = M[offset + 13];
+	            var M_offset_14 = M[offset + 14];
+	            var M_offset_15 = M[offset + 15];
+
+	            // Working varialbes
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+
+	            // Computation
+	            a = FF(a, b, c, d, M_offset_0,  7,  T[0]);
+	            d = FF(d, a, b, c, M_offset_1,  12, T[1]);
+	            c = FF(c, d, a, b, M_offset_2,  17, T[2]);
+	            b = FF(b, c, d, a, M_offset_3,  22, T[3]);
+	            a = FF(a, b, c, d, M_offset_4,  7,  T[4]);
+	            d = FF(d, a, b, c, M_offset_5,  12, T[5]);
+	            c = FF(c, d, a, b, M_offset_6,  17, T[6]);
+	            b = FF(b, c, d, a, M_offset_7,  22, T[7]);
+	            a = FF(a, b, c, d, M_offset_8,  7,  T[8]);
+	            d = FF(d, a, b, c, M_offset_9,  12, T[9]);
+	            c = FF(c, d, a, b, M_offset_10, 17, T[10]);
+	            b = FF(b, c, d, a, M_offset_11, 22, T[11]);
+	            a = FF(a, b, c, d, M_offset_12, 7,  T[12]);
+	            d = FF(d, a, b, c, M_offset_13, 12, T[13]);
+	            c = FF(c, d, a, b, M_offset_14, 17, T[14]);
+	            b = FF(b, c, d, a, M_offset_15, 22, T[15]);
+
+	            a = GG(a, b, c, d, M_offset_1,  5,  T[16]);
+	            d = GG(d, a, b, c, M_offset_6,  9,  T[17]);
+	            c = GG(c, d, a, b, M_offset_11, 14, T[18]);
+	            b = GG(b, c, d, a, M_offset_0,  20, T[19]);
+	            a = GG(a, b, c, d, M_offset_5,  5,  T[20]);
+	            d = GG(d, a, b, c, M_offset_10, 9,  T[21]);
+	            c = GG(c, d, a, b, M_offset_15, 14, T[22]);
+	            b = GG(b, c, d, a, M_offset_4,  20, T[23]);
+	            a = GG(a, b, c, d, M_offset_9,  5,  T[24]);
+	            d = GG(d, a, b, c, M_offset_14, 9,  T[25]);
+	            c = GG(c, d, a, b, M_offset_3,  14, T[26]);
+	            b = GG(b, c, d, a, M_offset_8,  20, T[27]);
+	            a = GG(a, b, c, d, M_offset_13, 5,  T[28]);
+	            d = GG(d, a, b, c, M_offset_2,  9,  T[29]);
+	            c = GG(c, d, a, b, M_offset_7,  14, T[30]);
+	            b = GG(b, c, d, a, M_offset_12, 20, T[31]);
+
+	            a = HH(a, b, c, d, M_offset_5,  4,  T[32]);
+	            d = HH(d, a, b, c, M_offset_8,  11, T[33]);
+	            c = HH(c, d, a, b, M_offset_11, 16, T[34]);
+	            b = HH(b, c, d, a, M_offset_14, 23, T[35]);
+	            a = HH(a, b, c, d, M_offset_1,  4,  T[36]);
+	            d = HH(d, a, b, c, M_offset_4,  11, T[37]);
+	            c = HH(c, d, a, b, M_offset_7,  16, T[38]);
+	            b = HH(b, c, d, a, M_offset_10, 23, T[39]);
+	            a = HH(a, b, c, d, M_offset_13, 4,  T[40]);
+	            d = HH(d, a, b, c, M_offset_0,  11, T[41]);
+	            c = HH(c, d, a, b, M_offset_3,  16, T[42]);
+	            b = HH(b, c, d, a, M_offset_6,  23, T[43]);
+	            a = HH(a, b, c, d, M_offset_9,  4,  T[44]);
+	            d = HH(d, a, b, c, M_offset_12, 11, T[45]);
+	            c = HH(c, d, a, b, M_offset_15, 16, T[46]);
+	            b = HH(b, c, d, a, M_offset_2,  23, T[47]);
+
+	            a = II(a, b, c, d, M_offset_0,  6,  T[48]);
+	            d = II(d, a, b, c, M_offset_7,  10, T[49]);
+	            c = II(c, d, a, b, M_offset_14, 15, T[50]);
+	            b = II(b, c, d, a, M_offset_5,  21, T[51]);
+	            a = II(a, b, c, d, M_offset_12, 6,  T[52]);
+	            d = II(d, a, b, c, M_offset_3,  10, T[53]);
+	            c = II(c, d, a, b, M_offset_10, 15, T[54]);
+	            b = II(b, c, d, a, M_offset_1,  21, T[55]);
+	            a = II(a, b, c, d, M_offset_8,  6,  T[56]);
+	            d = II(d, a, b, c, M_offset_15, 10, T[57]);
+	            c = II(c, d, a, b, M_offset_6,  15, T[58]);
+	            b = II(b, c, d, a, M_offset_13, 21, T[59]);
+	            a = II(a, b, c, d, M_offset_4,  6,  T[60]);
+	            d = II(d, a, b, c, M_offset_11, 10, T[61]);
+	            c = II(c, d, a, b, M_offset_2,  15, T[62]);
+	            b = II(b, c, d, a, M_offset_9,  21, T[63]);
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+
+	            var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
+	            var nBitsTotalL = nBitsTotal;
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
+	                (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)
+	            );
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+	                (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)
+	            );
+
+	            data.sigBytes = (dataWords.length + 1) * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Shortcuts
+	            var hash = this._hash;
+	            var H = hash.words;
+
+	            // Swap endian
+	            for (var i = 0; i < 4; i++) {
+	                // Shortcut
+	                var H_i = H[i];
+
+	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
+	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
+	            }
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    function FF(a, b, c, d, x, s, t) {
+	        var n = a + ((b & c) | (~b & d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function GG(a, b, c, d, x, s, t) {
+	        var n = a + ((b & d) | (c & ~d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function HH(a, b, c, d, x, s, t) {
+	        var n = a + (b ^ c ^ d) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function II(a, b, c, d, x, s, t) {
+	        var n = a + (c ^ (b | ~d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.MD5('message');
+	     *     var hash = CryptoJS.MD5(wordArray);
+	     */
+	    C.MD5 = Hasher._createHelper(MD5);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacMD5(message, key);
+	     */
+	    C.HmacMD5 = Hasher._createHmacHelper(MD5);
+	}(Math));
+
+
+	return CryptoJS.MD5;
+
+}));
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/crypto-js/4.0.0/sha1.js b/src/main/webapp/resources/js/crypto-js/4.0.0/sha1.js
new file mode 100644
index 00000000000..669114962a3
--- /dev/null
+++ b/src/main/webapp/resources/js/crypto-js/4.0.0/sha1.js
@@ -0,0 +1,150 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Reusable object
+	    var W = [];
+
+	    /**
+	     * SHA-1 hash algorithm.
+	     */
+	    var SHA1 = C_algo.SHA1 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0x67452301, 0xefcdab89,
+	                0x98badcfe, 0x10325476,
+	                0xc3d2e1f0
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var H = this._hash.words;
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+	            var e = H[4];
+
+	            // Computation
+	            for (var i = 0; i < 80; i++) {
+	                if (i < 16) {
+	                    W[i] = M[offset + i] | 0;
+	                } else {
+	                    var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
+	                    W[i] = (n << 1) | (n >>> 31);
+	                }
+
+	                var t = ((a << 5) | (a >>> 27)) + e + W[i];
+	                if (i < 20) {
+	                    t += ((b & c) | (~b & d)) + 0x5a827999;
+	                } else if (i < 40) {
+	                    t += (b ^ c ^ d) + 0x6ed9eba1;
+	                } else if (i < 60) {
+	                    t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
+	                } else /* if (i < 80) */ {
+	                    t += (b ^ c ^ d) - 0x359d3e2a;
+	                }
+
+	                e = d;
+	                d = c;
+	                c = (b << 30) | (b >>> 2);
+	                b = a;
+	                a = t;
+	            }
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	            H[4] = (H[4] + e) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Return final computed hash
+	            return this._hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA1('message');
+	     *     var hash = CryptoJS.SHA1(wordArray);
+	     */
+	    C.SHA1 = Hasher._createHelper(SHA1);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA1(message, key);
+	     */
+	    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
+	}());
+
+
+	return CryptoJS.SHA1;
+
+}));
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/crypto-js/4.0.0/sha256.js b/src/main/webapp/resources/js/crypto-js/4.0.0/sha256.js
new file mode 100644
index 00000000000..de2d7fca101
--- /dev/null
+++ b/src/main/webapp/resources/js/crypto-js/4.0.0/sha256.js
@@ -0,0 +1,199 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Initialization and round constants tables
+	    var H = [];
+	    var K = [];
+
+	    // Compute constants
+	    (function () {
+	        function isPrime(n) {
+	            var sqrtN = Math.sqrt(n);
+	            for (var factor = 2; factor <= sqrtN; factor++) {
+	                if (!(n % factor)) {
+	                    return false;
+	                }
+	            }
+
+	            return true;
+	        }
+
+	        function getFractionalBits(n) {
+	            return ((n - (n | 0)) * 0x100000000) | 0;
+	        }
+
+	        var n = 2;
+	        var nPrime = 0;
+	        while (nPrime < 64) {
+	            if (isPrime(n)) {
+	                if (nPrime < 8) {
+	                    H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
+	                }
+	                K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
+
+	                nPrime++;
+	            }
+
+	            n++;
+	        }
+	    }());
+
+	    // Reusable object
+	    var W = [];
+
+	    /**
+	     * SHA-256 hash algorithm.
+	     */
+	    var SHA256 = C_algo.SHA256 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init(H.slice(0));
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var H = this._hash.words;
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+	            var e = H[4];
+	            var f = H[5];
+	            var g = H[6];
+	            var h = H[7];
+
+	            // Computation
+	            for (var i = 0; i < 64; i++) {
+	                if (i < 16) {
+	                    W[i] = M[offset + i] | 0;
+	                } else {
+	                    var gamma0x = W[i - 15];
+	                    var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^
+	                                  ((gamma0x << 14) | (gamma0x >>> 18)) ^
+	                                   (gamma0x >>> 3);
+
+	                    var gamma1x = W[i - 2];
+	                    var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^
+	                                  ((gamma1x << 13) | (gamma1x >>> 19)) ^
+	                                   (gamma1x >>> 10);
+
+	                    W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
+	                }
+
+	                var ch  = (e & f) ^ (~e & g);
+	                var maj = (a & b) ^ (a & c) ^ (b & c);
+
+	                var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
+	                var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));
+
+	                var t1 = h + sigma1 + ch + K[i] + W[i];
+	                var t2 = sigma0 + maj;
+
+	                h = g;
+	                g = f;
+	                f = e;
+	                e = (d + t1) | 0;
+	                d = c;
+	                c = b;
+	                b = a;
+	                a = (t1 + t2) | 0;
+	            }
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	            H[4] = (H[4] + e) | 0;
+	            H[5] = (H[5] + f) | 0;
+	            H[6] = (H[6] + g) | 0;
+	            H[7] = (H[7] + h) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Return final computed hash
+	            return this._hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA256('message');
+	     *     var hash = CryptoJS.SHA256(wordArray);
+	     */
+	    C.SHA256 = Hasher._createHelper(SHA256);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA256(message, key);
+	     */
+	    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
+	}(Math));
+
+
+	return CryptoJS.SHA256;
+
+}));
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/crypto-js/4.0.0/sha512.js b/src/main/webapp/resources/js/crypto-js/4.0.0/sha512.js
new file mode 100644
index 00000000000..d274ab0de38
--- /dev/null
+++ b/src/main/webapp/resources/js/crypto-js/4.0.0/sha512.js
@@ -0,0 +1,326 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Hasher = C_lib.Hasher;
+	    var C_x64 = C.x64;
+	    var X64Word = C_x64.Word;
+	    var X64WordArray = C_x64.WordArray;
+	    var C_algo = C.algo;
+
+	    function X64Word_create() {
+	        return X64Word.create.apply(X64Word, arguments);
+	    }
+
+	    // Constants
+	    var K = [
+	        X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
+	        X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
+	        X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
+	        X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
+	        X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
+	        X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
+	        X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
+	        X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
+	        X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
+	        X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
+	        X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
+	        X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
+	        X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
+	        X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
+	        X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
+	        X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
+	        X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
+	        X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
+	        X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
+	        X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
+	        X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
+	        X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
+	        X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
+	        X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
+	        X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
+	        X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
+	        X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
+	        X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
+	        X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
+	        X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
+	        X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
+	        X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
+	        X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
+	        X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
+	        X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
+	        X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
+	        X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
+	        X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
+	        X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
+	        X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
+	    ];
+
+	    // Reusable objects
+	    var W = [];
+	    (function () {
+	        for (var i = 0; i < 80; i++) {
+	            W[i] = X64Word_create();
+	        }
+	    }());
+
+	    /**
+	     * SHA-512 hash algorithm.
+	     */
+	    var SHA512 = C_algo.SHA512 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new X64WordArray.init([
+	                new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
+	                new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
+	                new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
+	                new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcuts
+	            var H = this._hash.words;
+
+	            var H0 = H[0];
+	            var H1 = H[1];
+	            var H2 = H[2];
+	            var H3 = H[3];
+	            var H4 = H[4];
+	            var H5 = H[5];
+	            var H6 = H[6];
+	            var H7 = H[7];
+
+	            var H0h = H0.high;
+	            var H0l = H0.low;
+	            var H1h = H1.high;
+	            var H1l = H1.low;
+	            var H2h = H2.high;
+	            var H2l = H2.low;
+	            var H3h = H3.high;
+	            var H3l = H3.low;
+	            var H4h = H4.high;
+	            var H4l = H4.low;
+	            var H5h = H5.high;
+	            var H5l = H5.low;
+	            var H6h = H6.high;
+	            var H6l = H6.low;
+	            var H7h = H7.high;
+	            var H7l = H7.low;
+
+	            // Working variables
+	            var ah = H0h;
+	            var al = H0l;
+	            var bh = H1h;
+	            var bl = H1l;
+	            var ch = H2h;
+	            var cl = H2l;
+	            var dh = H3h;
+	            var dl = H3l;
+	            var eh = H4h;
+	            var el = H4l;
+	            var fh = H5h;
+	            var fl = H5l;
+	            var gh = H6h;
+	            var gl = H6l;
+	            var hh = H7h;
+	            var hl = H7l;
+
+	            // Rounds
+	            for (var i = 0; i < 80; i++) {
+	                var Wil;
+	                var Wih;
+
+	                // Shortcut
+	                var Wi = W[i];
+
+	                // Extend message
+	                if (i < 16) {
+	                    Wih = Wi.high = M[offset + i * 2]     | 0;
+	                    Wil = Wi.low  = M[offset + i * 2 + 1] | 0;
+	                } else {
+	                    // Gamma0
+	                    var gamma0x  = W[i - 15];
+	                    var gamma0xh = gamma0x.high;
+	                    var gamma0xl = gamma0x.low;
+	                    var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
+	                    var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
+
+	                    // Gamma1
+	                    var gamma1x  = W[i - 2];
+	                    var gamma1xh = gamma1x.high;
+	                    var gamma1xl = gamma1x.low;
+	                    var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
+	                    var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
+
+	                    // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
+	                    var Wi7  = W[i - 7];
+	                    var Wi7h = Wi7.high;
+	                    var Wi7l = Wi7.low;
+
+	                    var Wi16  = W[i - 16];
+	                    var Wi16h = Wi16.high;
+	                    var Wi16l = Wi16.low;
+
+	                    Wil = gamma0l + Wi7l;
+	                    Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
+	                    Wil = Wil + gamma1l;
+	                    Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
+	                    Wil = Wil + Wi16l;
+	                    Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
+
+	                    Wi.high = Wih;
+	                    Wi.low  = Wil;
+	                }
+
+	                var chh  = (eh & fh) ^ (~eh & gh);
+	                var chl  = (el & fl) ^ (~el & gl);
+	                var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
+	                var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
+
+	                var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
+	                var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
+	                var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
+	                var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
+
+	                // t1 = h + sigma1 + ch + K[i] + W[i]
+	                var Ki  = K[i];
+	                var Kih = Ki.high;
+	                var Kil = Ki.low;
+
+	                var t1l = hl + sigma1l;
+	                var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
+	                var t1l = t1l + chl;
+	                var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
+	                var t1l = t1l + Kil;
+	                var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
+	                var t1l = t1l + Wil;
+	                var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
+
+	                // t2 = sigma0 + maj
+	                var t2l = sigma0l + majl;
+	                var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
+
+	                // Update working variables
+	                hh = gh;
+	                hl = gl;
+	                gh = fh;
+	                gl = fl;
+	                fh = eh;
+	                fl = el;
+	                el = (dl + t1l) | 0;
+	                eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
+	                dh = ch;
+	                dl = cl;
+	                ch = bh;
+	                cl = bl;
+	                bh = ah;
+	                bl = al;
+	                al = (t1l + t2l) | 0;
+	                ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
+	            }
+
+	            // Intermediate hash value
+	            H0l = H0.low  = (H0l + al);
+	            H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
+	            H1l = H1.low  = (H1l + bl);
+	            H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
+	            H2l = H2.low  = (H2l + cl);
+	            H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
+	            H3l = H3.low  = (H3l + dl);
+	            H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
+	            H4l = H4.low  = (H4l + el);
+	            H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
+	            H5l = H5.low  = (H5l + fl);
+	            H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
+	            H6l = H6.low  = (H6l + gl);
+	            H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
+	            H7l = H7.low  = (H7l + hl);
+	            H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Convert hash to 32-bit word array before returning
+	            var hash = this._hash.toX32();
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        },
+
+	        blockSize: 1024/32
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA512('message');
+	     *     var hash = CryptoJS.SHA512(wordArray);
+	     */
+	    C.SHA512 = Hasher._createHelper(SHA512);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA512(message, key);
+	     */
+	    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
+	}());
+
+
+	return CryptoJS.SHA512;
+
+}));
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/crypto-js/4.0.0/x64-core.js b/src/main/webapp/resources/js/crypto-js/4.0.0/x64-core.js
new file mode 100644
index 00000000000..57dcc144b04
--- /dev/null
+++ b/src/main/webapp/resources/js/crypto-js/4.0.0/x64-core.js
@@ -0,0 +1,304 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (undefined) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var X32WordArray = C_lib.WordArray;
+
+	    /**
+	     * x64 namespace.
+	     */
+	    var C_x64 = C.x64 = {};
+
+	    /**
+	     * A 64-bit word.
+	     */
+	    var X64Word = C_x64.Word = Base.extend({
+	        /**
+	         * Initializes a newly created 64-bit word.
+	         *
+	         * @param {number} high The high 32 bits.
+	         * @param {number} low The low 32 bits.
+	         *
+	         * @example
+	         *
+	         *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
+	         */
+	        init: function (high, low) {
+	            this.high = high;
+	            this.low = low;
+	        }
+
+	        /**
+	         * Bitwise NOTs this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after negating.
+	         *
+	         * @example
+	         *
+	         *     var negated = x64Word.not();
+	         */
+	        // not: function () {
+	            // var high = ~this.high;
+	            // var low = ~this.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise ANDs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to AND with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after ANDing.
+	         *
+	         * @example
+	         *
+	         *     var anded = x64Word.and(anotherX64Word);
+	         */
+	        // and: function (word) {
+	            // var high = this.high & word.high;
+	            // var low = this.low & word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise ORs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to OR with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after ORing.
+	         *
+	         * @example
+	         *
+	         *     var ored = x64Word.or(anotherX64Word);
+	         */
+	        // or: function (word) {
+	            // var high = this.high | word.high;
+	            // var low = this.low | word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise XORs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to XOR with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after XORing.
+	         *
+	         * @example
+	         *
+	         *     var xored = x64Word.xor(anotherX64Word);
+	         */
+	        // xor: function (word) {
+	            // var high = this.high ^ word.high;
+	            // var low = this.low ^ word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Shifts this word n bits to the left.
+	         *
+	         * @param {number} n The number of bits to shift.
+	         *
+	         * @return {X64Word} A new x64-Word object after shifting.
+	         *
+	         * @example
+	         *
+	         *     var shifted = x64Word.shiftL(25);
+	         */
+	        // shiftL: function (n) {
+	            // if (n < 32) {
+	                // var high = (this.high << n) | (this.low >>> (32 - n));
+	                // var low = this.low << n;
+	            // } else {
+	                // var high = this.low << (n - 32);
+	                // var low = 0;
+	            // }
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Shifts this word n bits to the right.
+	         *
+	         * @param {number} n The number of bits to shift.
+	         *
+	         * @return {X64Word} A new x64-Word object after shifting.
+	         *
+	         * @example
+	         *
+	         *     var shifted = x64Word.shiftR(7);
+	         */
+	        // shiftR: function (n) {
+	            // if (n < 32) {
+	                // var low = (this.low >>> n) | (this.high << (32 - n));
+	                // var high = this.high >>> n;
+	            // } else {
+	                // var low = this.high >>> (n - 32);
+	                // var high = 0;
+	            // }
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Rotates this word n bits to the left.
+	         *
+	         * @param {number} n The number of bits to rotate.
+	         *
+	         * @return {X64Word} A new x64-Word object after rotating.
+	         *
+	         * @example
+	         *
+	         *     var rotated = x64Word.rotL(25);
+	         */
+	        // rotL: function (n) {
+	            // return this.shiftL(n).or(this.shiftR(64 - n));
+	        // },
+
+	        /**
+	         * Rotates this word n bits to the right.
+	         *
+	         * @param {number} n The number of bits to rotate.
+	         *
+	         * @return {X64Word} A new x64-Word object after rotating.
+	         *
+	         * @example
+	         *
+	         *     var rotated = x64Word.rotR(7);
+	         */
+	        // rotR: function (n) {
+	            // return this.shiftR(n).or(this.shiftL(64 - n));
+	        // },
+
+	        /**
+	         * Adds this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to add with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after adding.
+	         *
+	         * @example
+	         *
+	         *     var added = x64Word.add(anotherX64Word);
+	         */
+	        // add: function (word) {
+	            // var low = (this.low + word.low) | 0;
+	            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
+	            // var high = (this.high + word.high + carry) | 0;
+
+	            // return X64Word.create(high, low);
+	        // }
+	    });
+
+	    /**
+	     * An array of 64-bit words.
+	     *
+	     * @property {Array} words The array of CryptoJS.x64.Word objects.
+	     * @property {number} sigBytes The number of significant bytes in this word array.
+	     */
+	    var X64WordArray = C_x64.WordArray = Base.extend({
+	        /**
+	         * Initializes a newly created word array.
+	         *
+	         * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
+	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create();
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create([
+	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+	         *     ]);
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create([
+	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+	         *     ], 10);
+	         */
+	        init: function (words, sigBytes) {
+	            words = this.words = words || [];
+
+	            if (sigBytes != undefined) {
+	                this.sigBytes = sigBytes;
+	            } else {
+	                this.sigBytes = words.length * 8;
+	            }
+	        },
+
+	        /**
+	         * Converts this 64-bit word array to a 32-bit word array.
+	         *
+	         * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
+	         *
+	         * @example
+	         *
+	         *     var x32WordArray = x64WordArray.toX32();
+	         */
+	        toX32: function () {
+	            // Shortcuts
+	            var x64Words = this.words;
+	            var x64WordsLength = x64Words.length;
+
+	            // Convert
+	            var x32Words = [];
+	            for (var i = 0; i < x64WordsLength; i++) {
+	                var x64Word = x64Words[i];
+	                x32Words.push(x64Word.high);
+	                x32Words.push(x64Word.low);
+	            }
+
+	            return X32WordArray.create(x32Words, this.sigBytes);
+	        },
+
+	        /**
+	         * Creates a copy of this word array.
+	         *
+	         * @return {X64WordArray} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = x64WordArray.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+
+	            // Clone "words" array
+	            var words = clone.words = this.words.slice(0);
+
+	            // Clone each X64Word object
+	            var wordsLength = words.length;
+	            for (var i = 0; i < wordsLength; i++) {
+	                words[i] = words[i].clone();
+	            }
+
+	            return clone;
+	        }
+	    });
+	}());
+
+
+	return CryptoJS;
+
+}));
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index 67006bbcc7c..7a16bc3386d 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -2,10 +2,9 @@
  * Rebind bootstrap UI components after Primefaces ajax calls
  */
 function bind_bsui_components(){
-    // Breadcrumb Tree Keep Open
-    $(document).on('click', '.dropdown-menu', function (e) {
-        $(this).hasClass('keep-open'),
-        e.stopPropagation();
+    // Facet panel Filter Results btn toggle
+    $(document).on('click', '[data-toggle=offcanvas]', function() {
+        $('.row-offcanvas').toggleClass('active', 200);
     });
     
     // Collapse Header Icons
@@ -30,17 +29,26 @@ function bind_bsui_components(){
     // Disabled pagination links
     disabledLinks();
     
+    // Truncate checksums
+    checksumTruncate();
+    
     // Sharrre
     sharrre();
     
-    // Custom Popover with HTML content
-    popoverHTML();
+    // clipboard.js click to copy
+    clickCopyClipboard();
+    
+    // Scrolling autoComplete dropdown in popups
+    handle_dropdown_popup_scroll();
     
     // Dialog Listener For Calling handleResizeDialog
     PrimeFaces.widget.Dialog.prototype.postShow = function() {
         var dialog_id = this.jq.attr('id').split(/[:]+/).pop();
         handleResizeDialog(dialog_id);
     }
+    
+    //Fly-out sub-menu accessibility
+    enableSubMenus();
 }
 
 function bind_tooltip_popover(){
@@ -86,18 +94,14 @@ function disabledLinks(){
 /*
 * Custom Popover with HTML code snippet
 */
-function popoverHTML(popoverTitleHTML) {
+function popoverHTML(popoverTitleHTML, popoverTagsHTML) {
    var popoverTemplateHTML = ['<div class="popover">',
        '<div class="arrow"></div>',
        '<h3 class="popover-title"></h3>',
        '<div class="popover-content">',
        '</div>',
        '</div>'].join('');
-
-   var popoverContentHTML = ['<code>',
-       '&lt;a&gt;, &lt;b&gt;, &lt;blockquote&gt;, &lt;br&gt;, &lt;code&gt;, &lt;del&gt;, &lt;dd&gt;, &lt;dl&gt;, &lt;dt&gt;, &lt;em&gt;, &lt;hr&gt;, &lt;h1&gt;-&lt;h3&gt;, &lt;i&gt;, &lt;img&gt;, &lt;kbd&gt;, &lt;li&gt;, &lt;ol&gt;, &lt;p&gt;, &lt;pre&gt;, &lt;s&gt;, &lt;sup&gt;, &lt;sub&gt;, &lt;strong&gt;, &lt;strike&gt;, &lt;ul&gt;',
-       '</code>'].join('');
-
+   var popoverContentHTML = ['<code>', popoverTagsHTML, '</code>'].join('');
    $('body').popover({
        selector: 'a.popoverHTML',
        title: popoverTitleHTML,
@@ -132,9 +136,9 @@ function sharrre(){
         },
         template: '<div id="sharrre-block" class="clearfix">\n\
                     <input type="hidden" id="sharrre-total" name="sharrre-total" value="{total}"/> \n\
-                    <a href="#" class="sharrre-facebook"><span class="socicon socicon-facebook"/></a> \n\
-                    <a href="#" class="sharrre-twitter"><span class="socicon socicon-twitter"/></a> \n\
-                    <a href="#" class="sharrre-linkedin"><span class="socicon socicon-linkedin"/></a>\n\
+                    <a href="#" class="sharrre-facebook" title="FaceBook"><span class="socicon socicon-facebook"/></a> \n\
+                    <a href="#" class="sharrre-twitter" title="Twitter"><span class="socicon socicon-twitter"/></a> \n\
+                    <a href="#" class="sharrre-linkedin" title="LinkedIn"><span class="socicon socicon-linkedin"/></a>\n\
                     </div>',
         enableHover: false,
         enableTracking: true,
@@ -157,6 +161,113 @@ function sharrre(){
     });
 }
 
+/*
+ * Truncate dataset description content
+ */
+function contentTruncate(truncSelector, truncMoreBtn, truncMoreTip, truncLessBtn, truncLessTip){
+    // SELECTOR ID FROM PARAMETERS
+    $('#' + truncSelector).each(function () {
+        
+        // add responsive img class to limit width to that of container
+        $(this).find('img').attr('class', 'img-responsive');
+        
+        // find container height
+        var containerHeight = $(this).outerHeight();
+        
+        if (containerHeight > 250) {
+            // ADD A MAX-HEIGHT TO CONTAINER
+            $(this).css({'max-height':'250px','overflow-y':'hidden', 'overflow-x':'hidden', 'position':'relative'});
+
+            // BTN LABEL TEXT, ARIA ATTR'S, FROM BUNDLE VIA PARAMETERS
+            var readMoreBtn = '<button class="btn btn-link desc-more-link" type="button" data-toggle="tooltip" data-original-title="' + truncMoreTip + '" aria-expanded="false" aria-controls="#' + truncSelector + '">' + truncMoreBtn + '</button>';
+            var moreBlock = '<div class="more-block">' + readMoreBtn + '</div>';
+            var readLessBtn = '<button class="btn btn-link desc-less-link" type="button" data-toggle="tooltip" data-original-title="' + truncLessTip + '" aria-expanded="true" aria-controls="#' + truncSelector + '">' + truncLessBtn + '</button>';
+            var lessBlock = '<div class="less-block">' + readLessBtn + '</div>';
+
+            // add "Read full desc [+]" btn, background fade
+            $(this).append(moreBlock);
+
+            // show full description in summary block on "Read full desc [+]" btn click
+            $(document).on('click', 'button.desc-more-link', function() {
+                $(this).tooltip('hide').parent('div').parent('div').css({'max-height':'none','overflow-y':'visible','position':'relative'});
+                $(this).parent('div.more-block').replaceWith(lessBlock);
+                $('.less-block button').tooltip();
+            });
+            
+            // trucnate description in summary block on "Collapse desc [-]" btn click
+            $(document).on('click', 'button.desc-less-link', function() {
+                $(this).tooltip('hide').parent('div').parent('div').css({'max-height':'250px','overflow-y':'hidden','position':'relative'});
+                $(this).parent('div.less-block').replaceWith(moreBlock);
+                $('html, body').animate({scrollTop: $('#' + truncSelector).offset().top - 60}, 500);
+                $('.more-block button').tooltip();
+            });
+        }
+    });
+}
+
+/*
+ * Truncate file checksums
+ */
+function checksumTruncate(){
+    $('span.checksum-truncate').each(function () {
+        var checksumText = $(this).text();
+        var checksumLength = checksumText.length;
+        if (checksumLength > 25) {
+            // COUNT " " IN TYPE LABEL, UNF HAS NONE
+            var prefixCount = (checksumText.match(/ /g) || []).length;
+            
+            // INDEX OF LAST ":" IN TYPE LABEL, UNF HAS MORE THAN ONE
+            var labelIndex = checksumText.lastIndexOf(':');
+            
+            // COUNT "=" IN UNF SUFFIX
+            var suffixCount = (checksumText.match(/=/g) || []).length;
+            
+            // TRUNCATE MIDDLE W/ "..." + FIRST/LAST 3 CHARACTERS
+            // CHECK IF UNF LABEL, LESS THAN ONE " "
+            if (prefixCount < 0) {
+                $(this).text(checksumText.substr(0,(labelIndex + 3)) + '...' + checksumText.substr((checksumLength - suffixCount - 3),checksumLength));
+            }
+            else {
+                $(this).text(checksumText.substr(0,(labelIndex + 5)) + '...' + checksumText.substr((checksumLength - suffixCount - 3),checksumLength));
+            }
+        }
+    });
+    $('span.checksum-tooltip').on('inserted.bs.tooltip', function () {
+        $("body div.tooltip-inner").css("word-break", "break-all");
+    });
+}
+
+function clickCopyClipboard(){
+    // clipboard.js click to copy
+    // pass selector to clipboard
+    var clipboard = new ClipboardJS('button.btn-copy, span.checksum-truncate, span.btn-copy');
+
+    clipboard.on('success', (e)=> {
+        // DEV TOOL DEBUG
+        // console.log(e);
+
+        // check which selector was clicked
+        // swap icon for success ok
+        if ($(e.trigger).hasClass('glyphicon')) {
+            $(e.trigger).removeClass('glyphicon-copy').addClass('glyphicon-ok text-success');
+            // then swap icon back to clipboard
+            // https://stackoverflow.com/a/54270499
+            setTimeout(()=> { // use arrow function
+                $(e.trigger).removeClass('glyphicon-ok text-success').addClass('glyphicon-copy')
+            }, 2000);
+        }
+        else {
+            $(e.trigger).next('.btn-copy.glyphicon').removeClass('glyphicon-copy').addClass('glyphicon-ok text-success');
+            setTimeout(()=> {
+                $(e.trigger).next('.btn-copy.glyphicon').removeClass('glyphicon-ok text-success').addClass('glyphicon-copy')
+            }, 2000);
+        }
+    });
+    clipboard.on('error', (e)=> {
+        console.log(e);
+    });
+}
+
 /*
  * Select dataset/file citation onclick event
  */
@@ -247,4 +358,52 @@ function handle_dropdown_popup_scroll(){
             });
         }
     });
-}
\ No newline at end of file
+}
+
+function enableSubMenus() {
+    $('.dropdown-submenu>a').off('keydown').keydown(toggleSubMenu);
+    $('.dropdown-submenu>.dropdown-menu>li:last-of-type>a').off('keydown').keydown(closeOnTab);
+    $('.dropdown-submenu>.dropdown-menu>li:first-of-type>a').off('keydown').keydown(closeOnShiftTab);
+    addMenuDelays();
+}
+
+function toggleSubMenu(event) {
+if ( event.key == ' ' || event.key == 'Enter' ) {
+      event.target.parentElement.classList.toggle('open');
+    }
+}
+
+function closeOnTab(event) {
+        console.log(event.key);
+        if ( event.key == 'Tab') {
+        $(this).parent().parent().parent().removeClass('open');
+        }
+}
+
+function closeOnShiftTab(event) {
+        console.log(event.key);
+        if ( event.key == 'Tab' && event.shiftKey) {
+        $(this).parent().parent().parent().removeClass('open');
+        }
+}
+
+function addMenuDelays() {
+    $('.dropdown-submenu>a').each(function() {
+        var obj =$( this ).parent();
+        //First time - add open class upon mouseover
+        $(this).off('mouseover').mouseover(function() {
+            obj.addClass('open');
+        });
+        var closeMenuTimer;
+        //And add a mouseout function that will 
+        // a) remove that class after a delay, and 
+        // b) update the mouseover to remove the timer if it hasn't run yet (and re-add the open class if it has)
+        $(this).off('mouseout').mouseout(function() {
+            closeMenuTimer = setTimeout(function() {obj.removeClass('open');}, 1000);
+            $(this).off('mouseover').mouseover(function() {
+                obj.addClass('open');
+                clearTimeout(closeMenuTimer);
+            });
+        });
+    });
+}
diff --git a/src/main/webapp/resources/js/fileupload.js b/src/main/webapp/resources/js/fileupload.js
index f26218913f3..03ec82f214b 100644
--- a/src/main/webapp/resources/js/fileupload.js
+++ b/src/main/webapp/resources/js/fileupload.js
@@ -1,100 +1,693 @@
-
-function removeErrors() {
-                       	  var errors = document.getElementsByClassName("ui-fileupload-error");
-  for(i=errors.length-1; i >=0; i--) {
-    errors[i].parentNode.removeChild(errors[i]);
-  }
-}
-var observer=null;
-function uploadStarted() {
-                       	  	// If this is not the first upload, remove error messages since 
-  	// the upload of any files that failed will be tried again.
-  	removeErrors();
-  	var curId=0;
-  	//Find the upload table body
-  	var files =  $('.ui-fileupload-files .ui-fileupload-row');
-  	//Add an id attribute to each entry so we can later match errors with the right entry
-  	for(i=0;i< files.length;i++) {
-    	files[i].setAttribute('upid', curId);
-    	curId = curId+1;
-  	}
-  	//Setup an observer to watch for additional rows being added
-  	var config={childList: true};
-  	var callback = function(mutations) {
-		//Add an id attribute to all new entries  
-    	mutations.forEach(function(mutation) {
-    	for(i=0; i<mutation.addedNodes.length;i++) {
-      		mutation.addedNodes[i].setAttribute('upid',curId);
-      		curId=curId+1;
-    	}
-    	//Remove existing error messages since adding a new entry appears to cause a retry on previous entries
-    	removeErrors();
-  		});
-	};
-	//uploadStarted appears to be called only once, but, if not, we should stop any current observer
-	if(observer !=null) {
-  	  observer.disconnect();
-	}
-	observer = new MutationObserver(callback);
-	observer.observe(files[0].parentElement,config);
-}
-
-function uploadFinished(fileupload) {
-    if (fileupload.files.length === 0) {
-        $('button[id$="AllUploadsFinished"]').trigger('click');
-        //stop observer when we're done
-        if(observer !=null) {
-          observer.disconnect();
-          observer=null;
-        }
-    }
-}
-
-function uploadFailure(fileUpload) {
-	// This handles HTTP errors (non-20x reponses) such as 0 (no connection at all), 413 (Request too large),
-	// and 504 (Gateway timeout) where the upload call to the server fails (the server doesn't receive the request)
-	// It notifies the user and provides info about the error (status, statusText)
-	// On some browsers, the status is available in an event: window.event.srcElement.status
-	// but others, (Firefox) don't support this. The calls below retrieve the status and other info 
-	// from the call stack instead (arguments to the fail() method that calls onerror() that calls this function
-	
-	//Retrieve the error number (status) and related explanation (statusText)
-	var status = arguments.callee.caller.caller.arguments[1].jqXHR.status;
-    var statusText = arguments.callee.caller.caller.arguments[1].jqXHR.statusText;
-    //statusText for error 0 is the unhelpful 'error'
-    if(status == 0) statusText='Network Error';
-    
-    // There are various metadata available about which file the error pertains to
-    // including the name and size. 
-    // However, since the table rows created by PrimeFaces only show name and approximate size, 
-    // these may not uniquely identify the affected file. Therefore, we set a unique upid attribute
-    // in uploadStarted (and the MutationObserver there) and look for that here. The files array has
-    // only one element and that element includes a description of the row involved, including it's upid.
-    
-    var name = arguments.callee.caller.caller.arguments[1].files[0].name;
-	var id = arguments.callee.caller.caller.arguments[1].files[0].row[0].attributes.upid.value;
-	//Log the error 
-	console.log('Upload error:' + name + ' upid=' + id + ', Error ' + status + ': ' + statusText );
-    //Find the table
-    var rows  =  $('.ui-fileupload-files .ui-fileupload-row');
-    //Create an error element
-    var node = document.createElement("TD");
-    //Add a class to make finding these errors easy
-    node.classList.add('ui-fileupload-error');
-    //Add the standard error message class for formatting purposes
-    node.classList.add('ui-message-error');
-    var textnode = document.createTextNode("Upload unsuccessful (" + status + ": " + statusText + ").");
-    node.appendChild(textnode);
-    //Add the error message to the correct row
-    for(i=0;i<rows.length;i++) {
-       	if(rows[i].getAttribute('upid') == id) {
-       		//Remove any existing error message/only show last error (have seen two error 0 from one network disconnect)
-       		var err = rows[i].getElementsByClassName('ui-fileupload-error');
-       		if(err.length != 0) {
-       			err[0].remove();
-       		}
-         	rows[i].appendChild(node);
-         	break;
-       	}
-    }
-}
+var fileList = [];
+var observer2 = null;
+var numDone = 0;
+var delay = 100; //milliseconds
+var UploadState = {
+        QUEUED: 'queued',
+        REQUESTING: 'requesting',
+        UPLOADING: 'uploading',
+        UPLOADED: 'uploaded',
+        HASHED: 'hashed',
+        FINISHED: 'finished',
+        FAILED: 'failed'
+};
+//true indicates direct upload is being used, but cancel may set it back to false at which point direct upload functions should not do further work
+var directUploadEnabled = false;
+
+var directUploadReport = true;
+
+var checksumAlgName;
+
+//How many files have started being processed but aren't yet being uploaded
+var filesInProgress = 0;
+//The # of the current file being processed (total number of files for which upload has at least started)
+var curFile = 0;
+//The number of upload ids that have been assigned in the files table
+var getUpId = (function() {
+        var counter = -1;
+    return function () {
+        counter += 1;
+        return counter;
+    };
+})();
+//How many files are completely done
+var finishFile = (function() {
+        var counter = 0;
+    return function () {
+        counter += 1;
+        return counter;
+    };
+})();
+
+
+function setupDirectUpload(enabled) {
+    if (enabled) {
+        directUploadEnabled = true;
+        //An indicator as to which version is being used - should keep updated.
+        console.log('Dataverse Direct Upload for v5.0');
+        $('.ui-fileupload-upload').hide();
+        $('.ui-fileupload-cancel').hide();
+
+        fetch("api/files/fixityAlgorithm")
+            .then((response) => {
+                if (!response.ok) {
+                    console.log("Did not get fixityAlgorithm from Dataverse, using MD5");
+                    return null;
+                } else {
+                    return response.json();
+                }
+            }).then(checksumAlgJson => {
+                checksumAlgName = "MD5";
+                if (checksumAlgJson != null) {
+                    checksumAlgName = checksumAlgJson.data.message;
+                }
+            })
+            .then(() => {
+                //Catch files entered via upload dialog box. Since this 'select' widget is replaced by PF, we need to add a listener again when it is replaced
+                var fileInput = document.getElementById('datasetForm:fileUpload_input');
+                if (fileInput !== null) {
+                    fileInput.addEventListener('change', function(event) {
+                        fileList = [];
+                        for (var i = 0; i < fileInput.files.length; i++) {
+                            queueFileForDirectUpload(fileInput.files[i]);
+                        }
+                    }, { once: false });
+                }
+                //Add support for drag and drop. Since the fileUploadForm is not replaced by PF, catching changes with a mutationobserver isn't needed
+                var fileDropWidget = document.getElementById('datasetForm:fileUpload');
+                fileDropWidget.addEventListener('drop', function(event) {
+                    fileList = [];
+                    for (var i = 0; i < event.dataTransfer.files.length; i++) {
+                        queueFileForDirectUpload(event.dataTransfer.files[i]);
+                    }
+                }, { once: false });
+
+                var config = { childList: true };
+                var callback = function(mutations) {
+                    mutations.forEach(function(mutation) {
+                        for (i = 0; i < mutation.addedNodes.length; i++) {
+                            //Add a listener on any replacement file 'select' widget
+                    if (mutation.addedNodes[i].id === 'datasetForm:fileUpload_input') {
+                                fileInput = mutation.addedNodes[i];
+                                mutation.addedNodes[i].addEventListener('change', function(event) {
+                                    for (var j = 0; j < mutation.addedNodes[i].files.length; j++) {
+                                        queueFileForDirectUpload(mutation.addedNodes[i].files[j]);
+                                    }
+                                }, { once: false });
+                            }
+                        }
+                    });
+                };
+        if (observer2 !== null) {
+                    observer2.disconnect();
+                }
+                observer2 = new MutationObserver(callback);
+                observer2.observe(document.getElementById('datasetForm:fileUpload'), config);
+            });
+    }//else ?
+}
+
+function sleep(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+async function cancelDatasetCreate() {
+        //Page is going away - don't upload any more files, finish reporting current uploads, and then call cancelCreateCommand to clean up temp files
+        if (directUploadEnabled) {
+                fileList = [];
+                directUploadEnabled = false;
+                directUploadReport = false;
+        while (curFile !== numDone) {
+                        $("#cancelCreate").prop('onclick', null).text("Cancel In Progress...").prop('disabled', true);
+                        $("#datasetForm\\:save").prop('disabled', true);
+                        await sleep(1000);
+                }
+                cancelCreateCommand();
+        } else {
+                cancelCreateCommand();
+        }
+}
+
+
+async function cancelDatasetEdit() {
+        //Don't upload any more files and don't send any more file entries to Dataverse, report any direct upload files that didn't get handled
+        if (directUploadEnabled) {
+                fileList = [];
+                directUploadEnabled = false;
+                directUploadReport = false;
+        while (curFile !== numDone) {
+                        $("#doneFilesButtonnop").prop('onclick', null).text("Cancel In Progress...").prop('disabled', true);
+                        await sleep(1000);
+                }
+                cancelEditCommand();
+        } else {
+                cancelEditCommand();
+        }
+}
+
+
+var inDataverseCall = false;
+
+var fileUpload = class fileUploadClass {
+        constructor(file) {
+                this.file = file;
+                this.state = UploadState.QUEUED;
+        }
+        async startRequestForDirectUploadUrl() {
+                this.state=UploadState.REQUESTING;
+                //Wait for each call to finish and update the DOM
+                while (inDataverseCall === true) {
+                        await sleep(delay);
+                }
+                inDataverseCall = true;
+                //storageId is not the location - has a : separator and no path elements from dataset
+                //(String uploadComponentId, String fullStorageIdentifier, String fileName, String contentType, String checksumType, String checksumValue)
+                requestDirectUploadUrls([{ name: 'fileSize', value: this.file.size }]);
+        }
+
+        async doUpload() {
+                this.state = UploadState.UPLOADING;
+                var thisFile = curFile-1;
+                this.id=thisFile;
+                //This appears to be the earliest point when the file table has been populated, and, since we don't know how many table entries have had ids added already, we check
+                var filerows = $('.ui-fileupload-files .ui-fileupload-row');
+                //Add an id attribute to each entry so we can later match progress and errors with the right entry
+                for (i = 0; i < filerows.length; i++) {
+                        var upid = filerows[i].getAttribute('upid');
+                        if (typeof upid === "undefined" || upid === null || upid === '') {
+                                var newUpId = getUpId();
+                                filerows[i].setAttribute('upid', newUpId);
+                        }
+                }
+                //Get the list of files to upload
+                var files = $('.ui-fileupload-files');
+                //Find the corresponding row (assumes that the file order and the order of rows is the same)
+                var fileNode = files.find("[upid='" + thisFile + "']");
+                //Decrement number queued for processing
+                filesInProgress = filesInProgress - 1;
+                var progBar = fileNode.find('.ui-fileupload-progress');
+                var cancelButton = fileNode.find('.ui-fileupload-cancel');
+                 var cancelled=false;
+                  $(cancelButton).click(function() {cancelled=true});
+                progBar.html('');
+                progBar.append($('<progress/>').attr('class', 'ui-progressbar ui-widget ui-widget-content ui-corner-all'));
+                if(this.urls.hasOwnProperty("url")) {
+                        const url = this.urls.url;
+                        const request = {
+                                url: url,
+                                type: 'PUT',
+                                data: this.file,
+                                context:this,
+                                cache: false,
+                                processData: false,
+                                success: function() {
+                                        //ToDo - cancelling abandons the file. It is marked as temp so can be cleaned up later, but would be good to remove now (requires either sending a presigned delete URL or adding a callback to delete only a temp file
+                                        if(!cancelled) {
+                                            this.reportUpload();
+                                        }
+                                },
+                                error: function(jqXHR, textStatus, errorThrown) {
+                                        console.log('Failure: ' + jqXHR.status);
+                                        console.log('Failure: ' + errorThrown);
+                                        uploadFailure(jqXHR, thisFile);
+                                },
+                                xhr: function() {
+                                        var myXhr = $.ajaxSettings.xhr();
+                                        if (myXhr.upload) {
+                                                myXhr.upload.addEventListener('progress', function(e) {
+                                                        if (e.lengthComputable) {
+                                                                var doublelength = 2 * e.total;
+                                                                progBar.children('progress').attr({
+                                                                        value: e.loaded,
+                                                                        max: doublelength
+                                                                });
+                                                        }
+                                                });
+                                        }
+                                        return myXhr;
+                                }
+                        };
+                        if (url.includes("x-amz-tagging")) {
+                                request.headers = { "x-amz-tagging": "dv-state=temp" };
+                        }
+                        $.ajax(request);
+                } else {
+                  var loaded=[];
+                  this.etags=[];
+                  this.numEtags=0;
+                  var doublelength = 2* this.file.size;
+                  var partSize= this.urls.partSize;
+                  var started=0;
+                  console.log('Num parts: ' + Object.keys(this.urls.urls).length);
+                  loaded[thisFile]=[];
+                  for (const [key, value] of Object.entries(this.urls.urls)) {
+                    if(!directUploadEnabled || cancelled) {
+                      //Direct upload has been cancelled - quit uploading new parts and abort this mp upload
+                      //once the parts in progress are done
+                      while((started-this.numEtags)>0) {
+                        await sleep(delay);
+                      }
+                      this.cancelMPUpload();
+                      directUploadFinished();
+                      break;
+                    }
+                    started=started+1;
+                    //Don't queue more than 10 parts at a time
+                    while((started-this.numEtags)>10) {
+                      await sleep(delay);
+                    }
+                if (typeof this.etags[key] === 'undefined' || this.etags[key] == -1) {
+                       this.etags[key]=-1;
+                       var size = Math.min(partSize, this.file.size-(key-1)*partSize);
+                       var offset=(key-1)*partSize;
+                       var blob=this.file.slice(offset, offset + size);
+                       $.ajax({
+                        url: value,
+  //                      headers: { "x-amz-tagging": "dv-state=temp" },
+                        type: 'PUT',
+                        data: blob,
+                        context:this,
+                        cache: false,
+                        processData: false,
+                        success: function(data, status, response) {
+                                console.log('Successful upload of part ' + key + ' of ' + Object.keys(this.urls.urls).length);
+                                //The header has quotes around the eTag
+                                this.etags[key]=response.getResponseHeader('ETag').replace(/["]+/g, '');
+                                this.numEtags = this.numEtags+1;
+                            if (this.numEtags === Object.keys(this.urls.urls).length) {
+                                  this.multipartComplete();
+                                }
+                        },
+                        error: function(jqXHR, textStatus, errorThrown) {
+                                console.log('Failure: ' + jqXHR.status);
+                                console.log('Failure: ' + errorThrown);
+                                console.log(thisFile + ' : part' + key);
+                                this.numEtags = this.numEtags+1;
+                                this.etags[key]=-1;
+                            if (this.numEtags === Object.keys(this.urls.urls).length) {
+                                  this.multipartComplete();
+                                }
+                        },
+                        xhr: function() {
+                                var myXhr = $.ajaxSettings.xhr();
+                                if (myXhr.upload) {
+                                        myXhr.upload.addEventListener('progress', function(e) {
+                                                if (e.lengthComputable) {
+                                                        loaded[thisFile][key-1]=e.loaded;
+                                                        var total=0;
+                                                        for(let val of loaded[thisFile].values()) {
+                                                          //if parts with lower keys haven't reported yet, there could be undefined values in the array = skip those
+                                                          if(typeof val !== 'undefined') {
+                                                            total = total+val;
+                                                          }
+                                                        }
+                                                        progBar.children('progress').attr({
+                                                                value: total ,
+                                                                max: doublelength
+                                                        });
+                                                }
+                                        });
+                                }
+                                return myXhr;
+                        }
+                });
+              }
+            }
+          }
+        }
+
+        //All of the multipart part uploads have succeeded or failed. Here we decide whether to finish, retry, or cancel/abort 
+        multipartComplete() {
+          console.log('reporting file ' + this.file.name);
+          var allGood=true;
+          //Safety check - verify that all eTags were set
+          for (let val in this.etags.values()) {
+            if (val == -1) {
+              allGood=false;
+              break;
+            }
+          }
+          if(!allGood) {
+            if(this.alreadyRetried) {
+              console.log('Error after retrying ' + this.file.name);
+              uploadFailure(jqXHR, thisFile);
+              this.cancelMPUpload();
+            } else {
+              this.alreadyRetried=true;
+              this.doUpload();
+            }
+          } else {
+            this.finishMPUpload();
+          }
+        }
+        
+        reportUpload() {
+                this.state = UploadState.UPLOADED;
+                console.log('S3 Upload complete for ' + this.file.name + ' : ' + this.storageId);
+                if (directUploadReport) {
+                        getChecksum(this.file, prog => {
+                                var current = 1 + prog;
+                                $('[upid="' + this.id + '"] progress').attr({
+                                        value: current,
+                                        max: 2
+                                });
+                        }).then(checksum => {
+                                this.handleDirectUpload(checksum);
+                        }).catch(err => console.error(err));
+                }
+                else {
+                        console.log("Abandoned: " + this.storageId);
+                }
+        }
+        async cancelMPUpload() {
+               $.ajax({
+                        url: this.urls.abort,
+                        type: 'DELETE',
+                        context:this,
+                        cache: false,
+                        processData: false,
+                        success: function() {
+                          console.log('Successfully cancelled upload of ' + this.file.name);
+                        },
+                        error: function(jqXHR, textStatus, errorThrown) {
+                                console.log('Failure: ' + jqXHR.status);
+                                console.log('Failure: ' + errorThrown);
+
+                        }
+            });
+         }
+        async finishMPUpload() {
+          var eTagsObject={};
+          for(var i=1;i<=this.numEtags;i++) {
+             eTagsObject[i]=this.etags[i];
+          }
+               $.ajax({
+                        url: this.urls.complete,
+                        type: 'PUT',
+                        context:this,
+                        data: JSON.stringify(eTagsObject),
+                        cache: false,
+                        processData: false,
+                        success: function() {
+                          console.log('Successfully completed upload of ' + this.file.name);
+                          this.reportUpload();
+                        },
+                        error: function(jqXHR, textStatus, errorThrown) {
+                                console.log('Failure: ' + jqXHR.status);
+                                console.log('Failure: ' + errorThrown);
+
+                        }
+            });        }
+
+        async handleDirectUpload(checksum) {
+                this.state = UploadState.HASHED;
+                //Wait for each call to finish and update the DOM
+                while (inDataverseCall === true) {
+                        await sleep(delay);
+                }
+                inDataverseCall = true;
+                //storageId is not the location - has a : separator and no path elements from dataset
+                //(String uploadComponentId, String fullStorageIdentifier, String fileName, String contentType, String checksumType, String checksumValue)
+                handleExternalUpload([{ name: 'uploadComponentId', value: 'datasetForm:fileUpload' }, { name: 'fullStorageIdentifier', value: this.storageId }, { name: 'fileName', value: this.file.name }, { name: 'contentType', value: this.file.type }, { name: 'checksumType', value: checksumAlgName }, { name: 'checksumValue', value: checksum }]);
+        }
+}
+
+function queueFileForDirectUpload(file) {
+        if (fileList.length === 0) { uploadWidgetDropRemoveMsg(); }
+        var fUpload = new fileUpload(file);
+        fileList.push(fUpload);
+        //Fire off the first 4 to start (0,1,2,3)
+        if (filesInProgress < 4) {
+                filesInProgress = filesInProgress + 1;
+                fUpload.startRequestForDirectUploadUrl();
+        }
+}
+
+async function uploadFileDirectly(urls, storageId, filesize) {
+        await sleep(delay);
+        inDataverseCall = false;
+
+        if (directUploadEnabled) {
+                var upload = null;
+
+                //As long as we have the right file size, we're OK
+                for (i = 0; i < fileList.length; i++) {
+                    if (fileList[i].file.size == filesize) {
+                        upload = fileList.splice(i,1)[0];
+                        break;
+                    }
+                }
+                upload.urls = JSON.parse(urls);
+                upload.storageId = storageId;
+
+                //Increment count of files being processed
+                curFile = curFile + 1;
+                console.log('Uploading ' + upload.file.name + ' as ' + storageId + ' to ' + urls);
+
+                upload.doUpload();
+        }
+}
+
+
+
+
+function removeErrors() {
+        var errors = document.getElementsByClassName("ui-fileupload-error");
+        for (i = errors.length - 1; i >= 0; i--) {
+                errors[i].parentNode.removeChild(errors[i]);
+        }
+}
+
+var observer = null;
+
+// uploadStarted and uploadFinished are not related to direct upload.
+// They deal with clearing old errors and watching for new ones and then signaling when all uploads are done
+function uploadStarted() {
+        // If this is not the first upload, remove error messages since
+        // the upload of any files that failed will be tried again.
+        removeErrors();
+        var curId = 0;
+        //Find the upload table body
+        var files = $('.ui-fileupload-files .ui-fileupload-row');
+        //Add an id attribute to each entry so we can later match errors with the right entry
+        for (i = 0; i < files.length; i++) {
+                files[i].setAttribute('upid', curId);
+                curId = curId + 1;
+        }
+        //Setup an observer to watch for additional rows being added
+        var config = { childList: true };
+        var callback = function(mutations) {
+                //Add an id attribute to all new entries
+                mutations.forEach(function(mutation) {
+                        for (i = 0; i < mutation.addedNodes.length; i++) {
+                                mutation.addedNodes[i].setAttribute('upid', curId);
+                                curId = curId + 1;
+                        }
+                        //Remove existing error messages since adding a new entry appears to cause a retry on previous entries
+                        removeErrors();
+                });
+        };
+        //uploadStarted appears to be called only once, but, if not, we should stop any current observer
+    if (observer !== null) {
+                observer.disconnect();
+        }
+        observer = new MutationObserver(callback);
+        observer.observe(files[0].parentElement, config);
+}
+
+function uploadFinished(fileupload) {
+        if (fileupload.files.length === 0) {
+                $('button[id$="AllUploadsFinished"]').trigger('click');
+                //stop observer when we're done
+        if (observer !== null) {
+                        observer.disconnect();
+                        observer = null;
+                }
+        }
+}
+
+async function directUploadFinished() {
+
+        numDone = finishFile();
+        var total = curFile;
+        var inProgress = filesInProgress;
+        var inList = fileList.length;
+        console.log(inList + ' : ' + numDone + ' : ' + total + ' : ' + inProgress);
+        if (directUploadEnabled) {
+                if (inList === 0) {
+                        if (total === numDone) {
+                                $('button[id$="AllUploadsFinished"]').trigger('click');
+                                //stop observer when we're done
+                if (observer !== null) {
+                                        observer.disconnect();
+                                        observer = null;
+                                }
+                        }
+                } else {
+                        if ((inProgress < 4) && (inProgress < inList)) {
+                                filesInProgress = filesInProgress + 1;
+                                for (i = 0; i < fileList.length; i++) {
+                    if (fileList[i].state === UploadState.QUEUED) {
+                                    fileList[i].startRequestForDirectUploadUrl();
+                                    break;
+                                  }
+                                 }
+                        }
+                }
+        }
+        await sleep(delay);
+
+        inDataverseCall = false;
+}
+
+async function uploadFailure(jqXHR, upid, filename) {
+        // This handles HTTP errors (non-20x reponses) such as 0 (no connection at all), 413 (Request too large),
+        // and 504 (Gateway timeout) where the upload call to the server fails (the server doesn't receive the request)
+        // It notifies the user and provides info about the error (status, statusText)
+        // On some browsers, the status is available in an event: window.event.srcElement.status
+        // but others, (Firefox) don't support this. The calls below retrieve the status and other info
+        // from the call stack instead (arguments to the fail() method that calls onerror() that calls this function
+
+        if (directUploadEnabled) {
+                await sleep(delay);
+        }
+        inDataverseCall = false;
+
+        //Retrieve the error number (status) and related explanation (statusText)
+        var status = 0;
+        var statusText = null;
+
+        // There are various metadata available about which file the error pertains to
+        // including the name and size.
+        // However, since the table rows created by PrimeFaces only show name and approximate size,
+        // these may not uniquely identify the affected file. Therefore, we set a unique upid attribute
+        // in uploadStarted (and the MutationObserver there) and look for that here. The files array has
+        // only one element and that element includes a description of the row involved, including it's upid.
+
+        var name = null;
+        var id = null;
+        if(jqXHR=== null) {
+          status=1;  //made up
+          statusText='Aborting';
+        } else if ((typeof jqXHR !== 'undefined')) {
+                status = jqXHR.status;
+                statusText = jqXHR.statusText;
+                id = upid;
+                name = filename;
+        } else {
+                try {
+                        name = arguments.callee.caller.caller.arguments[1].files[0].name;
+                        id = arguments.callee.caller.caller.arguments[1].files[0].row[0].attributes.upid.value;
+                        status = arguments.callee.caller.caller.arguments[1].jqXHR.status;
+                        statusText = arguments.callee.caller.caller.arguments[1].jqXHR.statusText;
+                } catch(err) {
+                        console.log("Unable to determine status for error - assuming network issue");
+                        console.log("Exception: " + err.message);
+                }
+        }
+
+        //statusText for error 0 is the unhelpful 'error'
+    if (status == 0)
+        statusText = 'Network Error';
+        //Log the error
+        console.log('Upload error:' + name + ' upid=' + id + ', Error ' + status + ': ' + statusText);
+        //Find the table
+        var rows = $('.ui-fileupload-files .ui-fileupload-row');
+        //Create an error element
+        var node = document.createElement("TD");
+        //Add a class to make finding these errors easy
+        node.classList.add('ui-fileupload-error');
+        //Add the standard error message class for formatting purposes
+        node.classList.add('ui-message-error');
+        var textnode = document.createTextNode("Upload unsuccessful (" + status + ": " + statusText + ").");
+        node.appendChild(textnode);
+        //Add the error message to the correct row
+        for (i = 0; i < rows.length; i++) {
+        if (rows[i].getAttribute('upid') === id) {
+            //Remove any existing error message/only show last error (have seen two error 0 from one network disconnect)
+            var err = rows[i].getElementsByClassName('ui-fileupload-error');
+            if (err.length !== 0) {
+                err[0].remove();
+            }
+                rows[i].appendChild(node);
+                break;
+            }
+        }
+        if (directUploadEnabled) {
+                //Mark this file as processed and keep processing further files
+                directUploadFinished();
+        }
+}
+//MD5 Hashing functions
+
+function readChunked(file, chunkCallback, endCallback) {
+        var fileSize = file.size;
+        var chunkSize = 64 * 1024 * 1024; // 64MB
+        var offset = 0;
+
+        var reader = new FileReader();
+        reader.onload = function() {
+                if (reader.error) {
+                        endCallback(reader.error || {});
+                        return;
+                }
+                offset += reader.result.length;
+                // callback for handling read chunk
+                // TODO: handle errors
+                chunkCallback(reader.result, offset, fileSize);
+                if (offset >= fileSize) {
+                        endCallback(null);
+                        return;
+                }
+                readNext();
+        };
+
+        reader.onerror = function(err) {
+                endCallback(err || {});
+        };
+
+        function readNext() {
+                var fileSlice = file.slice(offset, offset + chunkSize);
+                reader.readAsBinaryString(fileSlice);
+        }
+        readNext();
+}
+function getChecksum(blob, cbProgress) {
+        return new Promise((resolve, reject) => {
+
+
+        var checksumAlg; 
+                        switch (checksumAlgName) {
+                    case 'MD5':
+                        checksumAlg = CryptoJS.algo.MD5.create();
+                        break;
+                    case 'SHA-1':
+                        checksumAlg = CryptoJS.algo.SHA1.create();
+                        break;
+                    case 'SHA-256':
+                        checksumAlg = CryptoJS.algo.SHA256.create();
+                        break;
+                    case 'SHA-512':
+                        checksumAlg = CryptoJS.algo.SHA512.create();
+                        break;
+                    default:
+                        console.log('$(checksumAlgName) is not supported, using MD5 as the checksumAlg checksum Algorithm');
+                                checksumAlg = CryptoJS.algo.MD5.create();
+                }
+                readChunked(blob, (chunk, offs, total) => {
+                        checksumAlg.update(CryptoJS.enc.Latin1.parse(chunk));
+                        if (cbProgress) {
+                                cbProgress(offs / total);
+                        }
+                }, err => {
+                        if (err) {
+                                reject(err);
+                        } else {
+                                // TODO: Handle errors
+                                var hash = checksumAlg.finalize();
+                                var hashHex = hash.toString(CryptoJS.enc.Hex);
+                                resolve(hashHex);
+                        }
+                });
+        });
+}
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/mydata.js b/src/main/webapp/resources/js/mydata.js
index 182df7cc62f..c731d6772ac 100644
--- a/src/main/webapp/resources/js/mydata.js
+++ b/src/main/webapp/resources/js/mydata.js
@@ -27,6 +27,7 @@ function bind_checkbox_labels(){
     bind_checkbox_labels_by_names('mydata_dvobject_label', 'div_dvobject_types');
     bind_checkbox_labels_by_names('mydata_pubstate_label', 'div_published_states');
     bind_checkbox_labels_by_names('mydata_role_label', 'div_role_states');
+    bind_checkbox_labels_by_names('mydata_validity_label', 'div_dataset_valid');
 
 }
 
@@ -390,7 +391,7 @@ function submit_my_data_search(){
     // --------------------------------
     // ah, but with the horribly coded xhtml page, we can't use form tags...
     //var formData = $('#mydata_filter_form').serialize();
-    var formData = $("#my_data_filter_column :input").serialize() + '&' + $("#my_data_filter_column2 :input").serialize() ;
+    var formData = $("#my_data_filter_column :input").serialize() + '&' + $("#my_data_filter_column3 :input").serialize()+ '&' + $("#my_data_filter_column2 :input").serialize() ;
 
     // For debugging, show the search params
     if (MYDATA_DEBUG_ON){
@@ -493,6 +494,12 @@ function submit_my_data_search(){
                     y[i].innerHTML = deaccessioned;
                 }
             }
+            if ($("span.label.incomplete")) {
+                var y = $("span.label.incomplete");
+                for (var i = 0; i < y.length; i++) {
+                    y[i].innerHTML = incomplete;
+                }
+            }
 
 
             // --------------------------------
diff --git a/src/main/webapp/resources/js/widgets.js b/src/main/webapp/resources/js/widgets.js
index 1f7f9a1a3dd..bbd6500e29c 100644
--- a/src/main/webapp/resources/js/widgets.js
+++ b/src/main/webapp/resources/js/widgets.js
@@ -1,64 +1,121 @@
-/* 
- * Javascript to create the necessary HTML, CSS and JS for our widgets
- */
+document.addEventListener('DOMContentLoaded', function() {
+    // Function to find the script source
+    function findScriptSource() {
+        const widgetScript = document.getElementById('dataverse-widget-js');
+        if (widgetScript && widgetScript.src) {
+            return widgetScript.src;
+        }
+        
+        const scripts = document.getElementsByTagName('script');
+        for (const script of scripts) {
+            if (script.src && script.src.includes('widgets.js')) {
+                return script.src;
+            }
+        }
+        
+        console.error('Could not find the widgets.js script source');
+        return null;
+    }
 
-var scriptSource = (function() {
-    var scripts = document.getElementsByTagName('script');
-    return scripts[scripts.length - 1].src;
-}());
+    // Function to parse query string
+    function parseQueryString(queryString) {
+        const params = {};
+        if (queryString) {
+            const keyValues = queryString.split('&');
+            for (const keyValue of keyValues) {
+                const [key, value] = keyValue.split('=');
+                params[key] = decodeURIComponent(value.replace(/\+/g, " "));
+            }
+        }
+        return params;
+    }
 
-var params = parseQueryString(scriptSource.split('?')[1]);
+    // Function to create and append elements
+    function appendElement(tag, attributes = {}, textContent = '') {
+        const element = document.createElement(tag);
+        Object.assign(element, attributes);
+        if (textContent) element.textContent = textContent;
+        scriptTag.parentNode.insertBefore(element, scriptTag.nextSibling);
+        return element;
+    }
 
-params.widget; // Widget type
-params.alias; // Dataverse Alias
-params.persistentId; // persistentId
-params.dvUrl; // Dataverse Installation URL
-params.heightPx; // iframe height in pixels
-params.text; // search input placeholder text
+    // Find the script source
+    const scriptSource = findScriptSource();
+    if (!scriptSource) return;
 
-// Utility function to convert "a=b&c=d" into { a:'b', c:'d' }
-function parseQueryString(queryString) {
-    var params = {};
-    var pl     = /\+/g;
-    if (queryString) {
-        var keyValues = queryString.split('&');
-        for (var i=0; i < keyValues.length; i++) {
-            var pair = keyValues[i].split('=');
-            params[pair[0]] = pair[1].replace(pl, " ");
-        }
+    // Find the script tag in the document
+    const scriptTag = Array.from(document.getElementsByTagName('script'))
+        .find(script => script.src === scriptSource);
+    if (!scriptTag) {
+        console.error('Could not find the widgets.js script tag in the document');
+        return;
     }
-    return params;
-};
 
-if (!window.jQuery) {
-  // Path to jquery.js file, eg. Google hosted version
-  document.write('<script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>');
-}
+    // Parse parameters
+    const params = parseQueryString(scriptSource.split('?')[1]);
 
-if(params.widget === 'search') {
-    /*
-    * Dataverse Search Box
-    */
-   document.write('<input type="text" placeholder="' + params.text + '..." onkeydown="if (event.keyCode == 13) document.getElementById(\'btnDataverseSearch\').click()" style="background:#fff; border:1px solid #ccc; border-radius:3px; box-shadow:0 1px 1px rgba(0, 0, 0, 0.075) inset; padding:4px; min-width:180px;"/>&#160;<input id="btnDataverseSearch" value="Find" type="button" onclick="window.open(&#39;' + params.dvUrl + '/dataverse.xhtml?alias=' + params.alias + '&amp;q=&#39; + this.previousSibling.previousSibling.value + &#39;&#39;, &#39;_blank&#39;);" style="-moz-border-bottom-colors:none; -moz-border-left-colors:none; -moz-border-right-colors:none; -moz-border-top-colors:none; background-color:#f5f5f5; background-image:-moz-linear-gradient(center top , #ffffff, #e6e6e6); background-repeat:repeat-x; border:1px solid #ccc; border-color:#e6e6e6 #e6e6e6 #b3b3b3; border-image:none; border-radius:4px; box-shadow:0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); color:#333; cursor:pointer; text-shadow:0 1px 1px rgba(255, 255, 255, 0.75); padding:0.3em 1em; line-height:1.4;" />');
-}
+    // Load jQuery if not present
+    if (!window.jQuery) {
+        const jqueryScript = appendElement('script', {
+            src: "https://code.jquery.com/jquery-3.6.0.min.js",
+            integrity: "sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=",
+            crossOrigin: "anonymous"
+        });
+        jqueryScript.onload = initializeWidget;
+    } else {
+        initializeWidget();
+    }
+
+    function initializeWidget() {
+        if (params.widget === 'search') {
+            const input = appendElement('input', {
+                type: "text",
+                placeholder: params.text + "...",
+                style: "background:#fff; border:1px solid #ccc; border-radius:3px; box-shadow:0 1px 1px rgba(0, 0, 0, 0.075) inset; padding:4px; min-width:180px;"
+            });
+            input.addEventListener('keydown', function(event) {
+                if (event.keyCode === 13) {
+                    document.getElementById('btnDataverseSearch').click();
+                }
+            });
+
+            appendElement('span', {}, ' ');
 
-if(params.widget === 'iframe' && params.alias) {
-    /*
-     * Dataverse Listing iFrame
-     */
-    document.write('<iframe id="dataverse-widget" src="' + params.dvUrl + '/dataverse/' + params.alias + '?widget=dataverse@' + params.alias + '" width="100%" height="' + params.heightPx + '" style="border:0; background:url(' + params.dvUrl + '/resources/images/ajax-loading.gif) no-repeat 50% 50%;"></iframe><script>var widgetScope = "' + params.alias + '"; var dvUrl = "' + params.dvUrl + '";</script><script src="' + params.dvUrl + '/resources/js/widgets-host.js"></script>');
-}
+            const button = appendElement('input', {
+                id: "btnDataverseSearch",
+                type: "button",
+                value: "Find",
+                style: "-moz-border-bottom-colors:none; -moz-border-left-colors:none; -moz-border-right-colors:none; -moz-border-top-colors:none; background-color:#f5f5f5; background-image:-moz-linear-gradient(center top , #ffffff, #e6e6e6); background-repeat:repeat-x; border:1px solid #ccc; border-color:#e6e6e6 #e6e6e6 #b3b3b3; border-image:none; border-radius:4px; box-shadow:0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); color:#333333; cursor:pointer; display:inline-block; font-size:14px; line-height:20px; margin-bottom:0; padding:4px 12px; text-align:center; text-shadow:0 1px 1px rgba(255, 255, 255, 0.75); vertical-align:middle;"
+            });
+            button.addEventListener('click', function() {
+                window.open(params.dvUrl + '/dataverse.xhtml?alias=' + params.alias + '&q=' + input.value, '_blank');
+            });
+        } else if (params.widget === 'iframe') {
+            const iframeUrl = params.persistentId 
+                ? params.dvUrl + '/dataset.xhtml?persistentId=' + params.persistentId + '&widget=dataset@' + params.persistentId
+                : params.dvUrl + '/dataverse/' + params.alias + '?widget=dataverse@' + params.alias;
 
-if(params.widget === 'iframe' && params.persistentId) {
-    /*
-     * Dataset 'Full' iFrame
-     */
-    document.write('<iframe id="dataset-widget" src="' + params.dvUrl + '/dataset.xhtml?persistentId=' + params.persistentId + '&widget=dataset@' + params.persistentId + '" width="100%" height="' + params.heightPx + '" style="border:0; background:url(' + params.dvUrl + '/resources/images/ajax-loading.gif) no-repeat 50% 50%;"></iframe><script>var widgetScope = "' + params.alias + '"; var dvUrl = "' + params.dvUrl + '";</script><script src="' + params.dvUrl + '/resources/js/widgets-host.js"></script>');
-}
+            appendElement('iframe', {
+                id: params.persistentId ? "dataset-widget" : "dataverse-widget",
+                src: iframeUrl,
+                width: "100%",
+                height: params.heightPx,
+                style: "border:0; background:url(" + params.dvUrl + "/resources/images/ajax-loading.gif) no-repeat 50% 50%;"
+            });
 
-if(params.widget === 'citation') {
-    /*
-    * Dataset Citation iFrame
-    */
-   document.write('<iframe id="citation-widget" src="' + params.dvUrl + '/iframe.xhtml?persistentId=' + params.persistentId + '" width="100%" height="' + params.heightPx + '" style="border:0; background:url(' + params.dvUrl + '/resources/images/ajax-loading.gif) no-repeat 50% 50%;"></iframe><script>var widgetScope = "' + params.persistentId + '"; var dvUrl = "' + params.dvUrl + '";</script><script src="' + params.dvUrl + '/resources/js/widgets-host.js"></script>');
-}
+            appendElement('script', {}, 'var widgetScope = "' + (params.persistentId || params.alias) + '"; var dvUrl = "' + params.dvUrl + '";');
+            appendElement('script', { src: params.dvUrl + '/resources/js/widgets-host.js' });
+        } else if (params.widget === 'citation') {
+            appendElement('iframe', {
+                id: "citation-widget",
+                src: params.dvUrl + '/iframe.xhtml?persistentId=' + params.persistentId,
+                width: "100%",
+                height: params.heightPx,
+                style: "border:0; background:url(" + params.dvUrl + "/resources/images/ajax-loading.gif) no-repeat 50% 50%;"
+            });
+
+            appendElement('script', {}, 'var widgetScope = "' + params.persistentId + '"; var dvUrl = "' + params.dvUrl + '";');
+            appendElement('script', { src: params.dvUrl + '/resources/js/widgets-host.js' });
+        }
+    }
+});
\ No newline at end of file
diff --git a/src/main/webapp/resources/primefaces/jquery/jquery.js b/src/main/webapp/resources/primefaces/jquery/jquery.js
deleted file mode 100644
index a1c07fd803b..00000000000
--- a/src/main/webapp/resources/primefaces/jquery/jquery.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
diff --git a/src/main/webapp/role_permission_helper.xhtml b/src/main/webapp/role_permission_helper.xhtml
index 88430a8ad81..cd2504089cf 100644
--- a/src/main/webapp/role_permission_helper.xhtml
+++ b/src/main/webapp/role_permission_helper.xhtml
@@ -12,7 +12,7 @@
     <ui:composition template="/dataverse_template.xhtml">
       <ui:param name="pageTitle" value="Role/Permission Relationships - #{dataverseServiceBean.findRootDataverse().name}"/>
       <ui:param name="showDataverseHeader" value="false"/>
-      <ui:define name="body">
+      <ui:define name="metadata">
           <f:metadata>
                 <ui:remove>
                     <f:viewParam name="id" value="#{DatasetPage.dataset.id}"/>
@@ -24,6 +24,8 @@
                 <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                 <f:viewAction action="#{RolePermissionHelperPage.init}" />
           </f:metadata>
+      </ui:define>
+      <ui:define name="body">
           <div>
         
               <h4>Related roles for each DvObject type</h4>
diff --git a/src/main/webapp/roles-assign.xhtml b/src/main/webapp/roles-assign.xhtml
index a3f73793d7b..93b9862c55d 100644
--- a/src/main/webapp/roles-assign.xhtml
+++ b/src/main/webapp/roles-assign.xhtml
@@ -16,10 +16,10 @@
             <div class="form-horizontal">
                 <p class="help-block">#{bundle['dataverse.permissions.usersOrGroups.assignDialog.description']}</p>
                 <div class="form-group">
-                    <label for="userGroupAccessInput" class="col-sm-2 control-label">
+                    <label for="userGroupAccessInput" class="col-md-2 control-label">
                         #{bundle['dataverse.permissions.usersOrGroups.assignDialog.userOrGroup']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                     </label>
-                    <div class="col-sm-9">
+                    <div class="col-md-9">
                         <p:autoComplete id="userGroupNameAssign" placeholder="#{bundle['dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.enterName']}"
                                         multiple="true" scrollHeight="180" forceSelection="true"
                                         minQueryLength="2" queryDelay="1000"                                      
@@ -31,7 +31,7 @@
                                         styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
                                         var="roleAssignee" itemLabel="#{roleAssignee.displayInfo.title}" itemValue="#{roleAssignee}" converter="roleAssigneeConverter">
                             <p:column>
-                                <h:outputText value="#{roleAssignee.displayInfo.title}"/> 
+                                <h:outputText value="#{roleAssignee.displayInfo.title}"/>
                                 <h:outputText value=" (#{roleAssignee.displayInfo.affiliation})" rendered="#{!empty roleAssignee.displayInfo.affiliation}"/>
                             </p:column>
                             <p:column>
@@ -40,18 +40,15 @@
                             <p:ajax process="@this" event="itemSelect" />
                             <p:ajax process="@this" event="itemUnselect" />
                         </p:autoComplete>
-                        <script>
-                            handle_dropdown_popup_scroll();
-                        </script>
                         <p:message for="userGroupNameAssign" display="text"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="assignRoleRadios" class="col-sm-2 control-label">
+                    <label for="assignRoleRadios" class="col-md-2 control-label">
                         #{bundle['dataverse.permissions.usersOrGroups.tabHeader.role']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                     </label>
-                    <div class="col-sm-10 form-group">
-                        <div class="col-sm-5">
+                    <div class="col-md-9">
+                        <div class="col-xs-6">
                             <p:fragment id="availableRoles">
                                 <p:selectOneRadio id="assignRoleRadios" layout="pageDirection"
                                                   value="#{managePermissionsPage.selectedRoleId}"
@@ -63,7 +60,7 @@
                                 <p:message for="assignRoleRadios" display="text"/>
                             </p:fragment>
                         </div>
-                        <div class="col-sm-7 bg-muted">
+                        <div class="col-xs-6 bg-muted">
                             <p:fragment id="roleDetails">
                                 <div id="assignRolePermissionLabels">
                                     <p class="help-block">#{bundle['dataverse.permissions.usersOrGroups.assignDialog.role.description']}</p>
@@ -75,7 +72,7 @@
                                                 <span class="label label-default">#{bundle['permission.'.concat(prm).concat('.label')]}</span>
                                             </ui:repeat>
                                         </div>
-                                        <p class="help-block">
+                                        <p class="help-block" jsf:rendered="#{!empty managePermissionsPage.assignedRoleObjectTypes}">
                                             <span class="glyphicon glyphicon-warning-sign text-warning"/>
                                             <h:outputFormat styleClass="text-warning" value=" #{bundle['dataverse.permissions.usersOrGroups.assignDialog.role.warning']}">
                                                 <f:param value="#{managePermissionsPage.assignedRole.name}"/>
diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml
index a59d53bcdae..e236ef180b3 100644
--- a/src/main/webapp/roles-edit.xhtml
+++ b/src/main/webapp/roles-edit.xhtml
@@ -8,28 +8,37 @@
             <p:panel id="editRolePropertiesPanel" styleClass="panelLayoutBlock" widgetVar="roleProperties">
                 <p:focus context="rolesPermissionsDialog"/>
                 <div class="row form-horizontal">
+                <p:fragment id="roleInputTextFragment">    
                     <div class="col-sm-6 form-group">
                         <label class="control-label" for="roleName">
                             #{bundle['dataverse.permissions.roles.name']}
+                            <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/> 
                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                   data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.name.title']}"></span>
                         </label>
                         <p:panelGrid columns="2" styleClass="noBorders" style="width:100%;">
-                            <p:inputText id="roleName" styleClass="form-control" value="#{managePermissionsPage.role.name}"/>
-                            <p:message for="roleName"/>
+                            <p:inputText id="roleName" styleClass="form-control" value="#{managePermissionsPage.role.name}"
+                                         required="#{param['ROLE_VALIDATION']}" requiredMessage="#{bundle['dataverse.permissions.roles.name.required']}"
+                                         />       
                         </p:panelGrid>
+                        <p:message for="roleName" display="text"/>
                     </div>
                     <div class="col-sm-6 form-group">
                         <label class="control-label" for="roleName">
                             #{bundle['dataverse.permissions.roles.id']}
+                            <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/> 
                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                  data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.id.title']}"></span>
+                                  data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.id.title']}"></span>      
                         </label>
+                        
                         <p:panelGrid columns="2" styleClass="noBorders" style="width:100%;">
-                            <p:inputText id="roleAlias" styleClass="form-control" value="#{managePermissionsPage.role.alias}"/>
-                            <p:message for="roleAlias"/>
+                            <p:inputText id="roleAlias" styleClass="form-control" value="#{managePermissionsPage.role.alias}"
+                                         required="#{param['ROLE_VALIDATION']}" requiredMessage="#{bundle['dataverse.permissions.roles.alias.required']}"/>
+                            
                         </p:panelGrid>
+                        <p:message for="roleAlias" display="text"/>    
                     </div>
+                </p:fragment>    
                 </div>
                 <div class="row form-horizontal">
                     <div class="col-sm-6 form-group">
@@ -65,9 +74,12 @@
             <div id="editRoleButtonPanel" class="button-block">
                 <p:commandButton styleClass="btn btn-default" 
                                value="#{bundle.saveChanges}" 
-                               oncomplete="PF('roleForm').hide()"
-                               update="roleDisplay availableRoles @([id$=Messages])"
-                               actionListener="#{managePermissionsPage.updateRole}"/>
+                               oncomplete="if (args &amp;&amp; !args.validationFailed) addRoleCommand();"  
+                               update="roleInputTextFragment @([id$=Messages])"
+                               >
+                <f:param name="ROLE_VALIDATION" value="true"/>
+                </p:commandButton>
+                <p:remoteCommand name="addRoleCommand" oncomplete="PF('roleForm').hide();" update="roleDisplay availableRoles @([id$=Messages])" actionListener="#{managePermissionsPage.updateRole}"/>
                 <button class="btn btn-link" onclick="PF('roleForm').hide()" type="button">
                     #{bundle.cancel}
                 </button>
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 4ad7ad24e8d..ffb503bce08 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -9,30 +9,47 @@
      xmlns:jsf="http://xmlns.jcp.org/jsf">
 
     <c:set var="page" value="/dataverse/#{DataversePage.dataverse.alias}"/>
-
+    <c:set var="cvocConf" value="#{settingsWrapper.getCVocConf(true)}"/>
+    <p:fragment>
+        <p:autoUpdate/>
+        <ui:repeat value="#{DatasetPage.vocabScripts}" var="vocabScriptUrl">
+            <script defer="defer" src="#{vocabScriptUrl}?version=#{settingsWrapper.appVersion}"/>
+        </ui:repeat>
+    </p:fragment>
     <!-- Search Form + Add Data Button -->
     <div class="row panelSearchForm" jsf:rendered="#{!SearchIncludeFragment.solrIsDown}">
-        <div class="#{widgetWrapper.widgetView ? 'col-sm-12' : 'col-sm-8'}">
-            <h:form>
-                <p:inputText id="searchBasic" styleClass="search-input" size="40" value="#{SearchIncludeFragment.query}" onkeypress="if (event.keyCode == 13) { submitsearch(); return false; }"/>
-                <p:watermark for="searchBasic" value="#{dataverseRedirectPage == 'dataverseuser.xhtml' ? bundle['account.search.input.watermark'] : bundle['dataverse.search.input.watermark']}"/>
-                <p:commandLink id="searchbutton" styleClass="btn btn-default" action="#{SearchIncludeFragment.searchRedirect(dataverseRedirectPage, DataversePage.dataverse)}">
-                    <span class="glyphicon glyphicon-search"/> #{bundle['dataverse.search.btn.find']}
-                </p:commandLink>
-                <p:remoteCommand name="submitsearch" action="#{SearchIncludeFragment.searchRedirect(dataverseRedirectPage, DataversePage.dataverse)}"/>
-                <h:outputLink id="advsearchlink" value="#{widgetWrapper.wrapURL('/search/advanced.xhtml')}">
-                    <f:param name="dataverseIdentifier" value="#{SearchIncludeFragment.dataverse.alias}"/>
-                    <h:outputText value="#{bundle['dataverse.search.advancedSearch']}"/>
-                    <!--<f:param name="q" value="#{SearchIncludeFragment.query}" disable="#{empty SearchIncludeFragment.query}"/>-->
-                </h:outputLink>
+        <div class="#{widgetWrapper.widgetView ? 'col-xs-12' : 'col-sm-9'}">
+            <h:form styleClass="form-inline">
+                <div class="form-group">
+                    <div class="input-group">
+                        <p:inputText id="searchBasic" title="#{bundle.search}" styleClass="form-control search-input" size="35" value="#{SearchIncludeFragment.query}" onkeypress="if (event.keyCode == 13) { submitsearch(); return false; }">
+                            <f:passThroughAttribute name="aria-label" value="#{bundle.search}"/>
+                        </p:inputText>
+                        <p:watermark for="searchBasic" value="#{dataverseRedirectPage == 'dataverseuser.xhtml' ? bundle['account.search.input.watermark'] : bundle['dataverse.search.input.watermark']}"/>
+
+                        <span class="input-group-btn">
+                            <p:commandLink id="searchbutton" title="#{bundle['dataverse.search.btn.find']}" ariaLabel="#{bundle['dataverse.search.btn.find']}" styleClass="btn btn-default bootstrap-button-tooltip" 
+                                           action="#{SearchIncludeFragment.searchRedirect(dataverseRedirectPage, DataversePage.dataverse)}">
+                                <span class="glyphicon glyphicon-search no-text"/>
+                            </p:commandLink>
+                        </span>
+
+                        <p:remoteCommand name="submitsearch" action="#{SearchIncludeFragment.searchRedirect(dataverseRedirectPage, DataversePage.dataverse)}"/>
+                    </div>
+                    <h:outputLink rel="nofollow" id="advsearchlink" value="#{widgetWrapper.wrapURL('/search/advanced.xhtml')}">
+                        <f:param name="dataverseIdentifier" value="#{SearchIncludeFragment.dataverse.alias}"/>
+                        <h:outputText value="#{bundle['dataverse.search.advancedSearch']}"/>
+                        <!--<f:param name="q" value="#{SearchIncludeFragment.query}" disable="#{empty SearchIncludeFragment.query}"/>-->
+                    </h:outputLink>
+                </div>
             </h:form>
         </div>
-        <div class="col-sm-4 text-right col-manage-action" jsf:rendered="#{!widgetWrapper.widgetView}">
-            <div class="button-block pull-right">
+        <div class="col-sm-3 text-right col-manage-action" jsf:rendered="#{!widgetWrapper.widgetView}">
+            <div class="button-block">
                 <!-- ADD DATA -->
                 <o:importFunctions type="edu.harvard.iq.dataverse.authorization.groups.impl.builtin.AuthenticatedUsers" />
-                <ui:fragment rendered="#{!dataverseSession.user.authenticated and (permissionServiceBean.userOn(AuthenticatedUsers:get(),SearchIncludeFragment.dataverse).canIssueCommand('CreateDataverseCommand')
-                                         or permissionServiceBean.userOn(AuthenticatedUsers:get(),SearchIncludeFragment.dataverse).canIssueCommand('CreateNewDatasetCommand'))}">
+                <ui:fragment rendered="#{!dataverseSession.user.authenticated and (permissionsWrapper.authUsersCanCreateDataversesInDataverse(SearchIncludeFragment.dataverse)
+                                         or permissionsWrapper.authUsersCanCreateDatasetsInDataverse(SearchIncludeFragment.dataverse))}">
                     <button type="button" class="btn btn-default btn-access" onclick="PF('addData_popup').show()">
                         <span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.results.btn.addData']}
                     </button>
@@ -44,7 +61,7 @@
                         <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
                             <span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.results.btn.addData']} <span class="caret"></span>
                         </button>
-                        <ul class="dropdown-menu pull-right text-left" role="menu">
+                        <ul class="dropdown-menu pull-right text-left">
                             <ui:fragment rendered="#{permissionsWrapper.canIssueCreateDataverseCommand(SearchIncludeFragment.dataverse) }">
                                 <li><a href="/dataverse.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}">#{bundle['dataverse.results.btn.addData.newDataverse']}</a></li>
                             </ui:fragment>
@@ -71,15 +88,26 @@
             <pre><h:outputText value="#{SearchIncludeFragment.searchException.cause.message}"/></pre>
         </div>
     </div>
+    
+    
+    <!-- ... And the message block for when SOLR IS DOWN *TEMPORARILY* -->
+    <div class="row" jsf:rendered="#{SearchIncludeFragment.solrTemporarilyUnavailable}">
+        <div class="col-sm-12">
+            <div class="bg-danger padding-12 margin-bottom">
+                <h:outputText value="#{bundle['dataverse.results.solrIsTemporarilyUnavailable']}" styleClass="highlightBold"/>
+            </div>
+            <pre><h:outputText value="#{bundle['dataverse.results.solrIsTemporarilyUnavailable.extraText']}"/></pre>
+        </div>
+    </div>
 
     <!-- Search Results / SOLR IS UP -->
-    <div id="search-row-panel" class="row row-offcanvas row-offcanvas-left" jsf:rendered="#{!SearchIncludeFragment.solrIsDown}">
+    <div id="search-row-panel" class="row row-offcanvas row-offcanvas-left" jsf:rendered="#{!(SearchIncludeFragment.solrIsDown or SearchIncludeFragment.solrTemporarilyUnavailable)}">
         <div id="dv-sidebar" class="col-sm-4 col-md-3 sidebar-offcanvas">
             <!--TYPE FACET (DATAVERSES, DATASETS, FILES)-->
-            <h:form id="facetType">
+            <h:form id="facetType" rendered="#{!SearchIncludeFragment.facetsDisabled}">
                 <!--DATAVERSE TOGGLE-->
                 <div class="clearfix">
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" styleClass="facetTypeChBox facetLink #{SearchIncludeFragment.selectedTypesList.contains('dataverses') ? 'facetSelected': ''}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('dataverses') == null}">
+                    <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}" styleClass="facetTypeChBox facetLink #{SearchIncludeFragment.selectedTypesList.contains('dataverses') ? 'facetSelected': ''}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('dataverses') == null}">
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                         <f:param name="types" value="#{SearchIncludeFragment.getNewSelectedTypes('dataverses')}"/>
                         <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -88,10 +116,11 @@
                         <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                         <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                         <f:param name="page" value="1"/>
-                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('dataverses') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('dataverses') == null ? true : false}"/>
+                        <f:passThroughAttribute name="aria-label" value="#{bundle['facet.collection.label']}"/>
+                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('dataverses') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('dataverses') == null ? true : false}" ariaLabel="#{bundle['facet.collection.label']}"/>
                     </h:outputLink>
                     <!--DATAVERSES ONLY-->
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" disabled="#{false}" styleClass="facetTypeLink chkbox-label-margin #{SearchIncludeFragment.selectedTypesList.contains('dataverses') ? 'facetSelected': ''}">
+                    <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}" disabled="#{false}" styleClass="facetTypeLink chkbox-label-margin #{SearchIncludeFragment.selectedTypesList.contains('dataverses') ? 'facetSelected': ''}">
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                         <f:param name="types" value="dataverses"/>
                         <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -103,14 +132,15 @@
 
                         <span class="icon-dataverse text-icon-inline"></span>
 
-                        <h:outputFormat styleClass="facetTypeDataverse" value="#{bundle['dataverse.results.types.dataverses']} &#40;{0}&#41;">
+                        <h:outputFormat rendered="#{!SearchIncludeFragment.uncheckedTypesFacetDisabled or SearchIncludeFragment.selectedTypesList.contains('dataverses')}" styleClass="facetTypeDataverse" value="#{bundle['dataverse.results.types.dataverses']} &#40;{0}&#41;">
                             <f:param value="#{SearchIncludeFragment.facetCountDataverses}"/>
                         </h:outputFormat>
+                        <h:outputText rendered="#{SearchIncludeFragment.uncheckedTypesFacetDisabled and !SearchIncludeFragment.selectedTypesList.contains('dataverses')}" value="#{bundle['dataverse.results.types.dataverses']}" styleClass="facetTypeDataverse"/>
                     </h:outputLink>
                 </div>
                 <!--DATASETS TOGGLE-->
                 <div class="clearfix">
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" styleClass="facetTypeChBox facetLink #{SearchIncludeFragment.selectedTypesList.contains('datasets') ? 'facetSelected': ''}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('datasets') == null}">
+                    <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}" styleClass="facetTypeChBox facetLink #{SearchIncludeFragment.selectedTypesList.contains('datasets') ? 'facetSelected': ''}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('datasets') == null}">
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                         <f:param name="types" value="#{SearchIncludeFragment.getNewSelectedTypes('datasets')}"/>
                         <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -119,10 +149,11 @@
                         <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                         <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                         <f:param name="page" value="1"/>
-                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('datasets') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('datasets') == null ? true : false}"/>
+                        <f:passThroughAttribute name="aria-label" value="#{bundle['facet.dataset.label']}"/>
+                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('datasets') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('datasets') == null ? true : false}" ariaLabel="#{bundle['facet.dataset.label']}"/>
                     </h:outputLink>
                     <!--DATASETS ONLY-->
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" disabled="#{false}" styleClass="facetTypeLink chkbox-label-margin #{SearchIncludeFragment.selectedTypesList.contains('datasets') ? 'facetSelected': ''}">
+                    <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}" disabled="#{false}" styleClass="facetTypeLink chkbox-label-margin #{SearchIncludeFragment.selectedTypesList.contains('datasets') ? 'facetSelected': ''}">
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                         <f:param name="types" value="datasets"/>
                         <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -134,14 +165,15 @@
 
                         <span class="icon-dataset text-icon-inline"></span>
 
-                        <h:outputFormat styleClass="facetTypeDataset" value="#{bundle['dataverse.results.types.datasets']} &#40;{0}&#41;">
+                        <h:outputFormat rendered="#{!SearchIncludeFragment.uncheckedTypesFacetDisabled or SearchIncludeFragment.selectedTypesList.contains('datasets')}" styleClass="facetTypeDataset" value="#{bundle['dataverse.results.types.datasets']} &#40;{0}&#41;">
                             <f:param value="#{SearchIncludeFragment.facetCountDatasets}"/>
                         </h:outputFormat>
+                        <h:outputText rendered="#{SearchIncludeFragment.uncheckedTypesFacetDisabled and !SearchIncludeFragment.selectedTypesList.contains('datasets')}" value="#{bundle['dataverse.results.types.datasets']}" styleClass="facetTypeDataset"/>
                     </h:outputLink>
                 </div>
                 <!--FILES TOGGLE-->
                 <div class="clearfix">
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" styleClass="facetTypeChBox facetLink #{SearchIncludeFragment.selectedTypesList.contains('files') ? 'facetSelected': ''}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('files') == null}">
+                    <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}" styleClass="facetTypeChBox facetLink #{SearchIncludeFragment.selectedTypesList.contains('files') ? 'facetSelected': ''}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('files') == null}">
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                         <f:param name="types" value="#{SearchIncludeFragment.getNewSelectedTypes('files')}"/>
                         <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -150,10 +182,11 @@
                         <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                         <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                         <f:param name="page" value="1"/>
-                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('files') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('files') == null ? true : false}"/>
+                        <f:passThroughAttribute name="aria-label" value="#{bundle['facet.datafile.label']}"/>
+                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('files') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('files') == null ? true : false}" ariaLabel="#{bundle['facet.datafile.label']}"/>
                     </h:outputLink>
                     <!--FILES ONLY-->
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" disabled="#{false}" styleClass="facetTypeLink chkbox-label-margin #{SearchIncludeFragment.selectedTypesList.contains('files') ? 'facetSelected': ''}">
+                    <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}" disabled="#{false}" styleClass="facetTypeLink chkbox-label-margin #{SearchIncludeFragment.selectedTypesList.contains('files') ? 'facetSelected': ''}">
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                         <f:param name="types" value="files"/>
                         <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -165,21 +198,29 @@
 
                         <span class="icon-file text-icon-inline"></span>
 
-                        <h:outputFormat styleClass="facetTypeFile" value="#{bundle['dataverse.results.types.files']} &#40;{0}&#41;">
+                        <h:outputFormat rendered="#{!SearchIncludeFragment.uncheckedTypesFacetDisabled or SearchIncludeFragment.selectedTypesList.contains('files')}" styleClass="facetTypeFile" value="#{bundle['dataverse.results.types.files']} &#40;{0}&#41;">
                             <f:param value="#{SearchIncludeFragment.facetCountFiles}"/>
                         </h:outputFormat>
+                        <h:outputText rendered="#{SearchIncludeFragment.uncheckedTypesFacetDisabled and !SearchIncludeFragment.selectedTypesList.contains('files')}" value="#{bundle['dataverse.results.types.files']}" styleClass="facetTypeFile"/>
                     </h:outputLink>
                 </div>
             </h:form>
 
             <!--NON-TYPE FACETS-->
-            <h:form id="facetCategoryForm" rendered="#{DataversePage.searchResultsCount > 0}">
+            <h:form id="facetCategoryForm" rendered="#{(DataversePage.searchResultsCount > 0) and !SearchIncludeFragment.facetsDisabled}">
                 <p:dataList id="facetCategoryList" value="#{DataversePage.facetCategoryList}" var="facetCategory">
                     <h:outputText value="#{facetCategory.friendlyName}" styleClass="facetCategoryName"/>
                     <p:dataList value="#{facetCategory.facetLabel}" var="facetLabel" rows="#{DataversePage.getNumberOfFacets(facetCategory.name,5)}">
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" rendered="#{!DataversePage.filterQueries.contains(facetLabel.filterQuery)}" styleClass="facetLink">
-                            <h:outputFormat value="{0} &#40;{1}&#41;">
-                                <f:param value="#{facetLabel.name}"/>
+                        <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}" rendered="#{!DataversePage.filterQueries.contains(facetLabel.filterQuery)}" styleClass="facetLink">
+                            <h:outputText value="#{facetLabel.name}">
+                                <c:if test="#{!cvocConf.isEmpty()}">
+                                    <f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(facetCategory.datasetFieldTypeId).getString('languages'))}" />
+                                    <f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('cvoc-url','')}" />
+                                    <f:passThroughAttribute name="data-cvoc-headers" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).containsKey('headers') ? cvocConf.get(facetCategory.datasetFieldTypeId).get('headers').toString() : '{}'}"/>
+                                    <f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('protocol','')}" />
+                                </c:if>
+                            </h:outputText>
+                            <h:outputFormat value=" &#40;{0}&#41;">
                                 <f:param value="#{facetLabel.count}"/>
                             </h:outputFormat>
                             <f:param name="q" value="#{DataversePage.query}"/>
@@ -192,9 +233,16 @@
                             <f:param name="order" value="#{DataversePage.sortOrder}"/>
                         </h:outputLink>
 
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" rendered="#{DataversePage.filterQueries.contains(facetLabel.filterQuery)}" styleClass="facetLink facetSelected">
-                            <h:outputFormat value="{0} &#40;{1}&#41;">
-                                <f:param value="#{facetLabel.name}"/>
+                        <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}" rendered="#{DataversePage.filterQueries.contains(facetLabel.filterQuery)}" styleClass="facetLink facetSelected">
+                            <h:outputText value="#{facetLabel.name}">
+                                <c:if test="#{!cvocConf.isEmpty()}">
+                                    <f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(facetCategory.datasetFieldTypeId).getString('languages'))}" />
+                                    <f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('cvoc-url','')}" />
+                                    <f:passThroughAttribute name="data-cvoc-headers" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).containsKey('headers') ? cvocConf.get(facetCategory.datasetFieldTypeId).get('headers').toString() : '{}'}"/>
+                                    <f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('protocol','')}" />
+                                </c:if>
+                            </h:outputText>
+                            <h:outputFormat value=" &#40;{0}&#41;">
                                 <f:param value="#{facetLabel.count}"/>
                             </h:outputFormat>
                             <span class="glyphicon glyphicon-remove"></span>
@@ -219,10 +267,16 @@
                     </ui:fragment>
                 </p:dataList>
             </h:form>
+            <!-- "facets temporarily unavailable" message: -->
+            <h:form id="facetsUnavailable" rendered="#{SearchIncludeFragment.facetsDisabled}">
+                <div class="clearfix">
+                    <h:outputText value="#{bundle['dataverse.results.solrFacetsDisabled']}" styleClass="facetTypeLink"/>
+                </div>
+            </h:form>
         </div>
         <div id="dv-main" class="col-sm-8 col-md-9">
             <!--DEBUG BEGIN-->
-            <div jsf:rendered="#{SearchIncludeFragment.debug}" style="background-color: lightgray">
+            <div jsf:rendered="#{dataverseSession.debug}" style="background-color: lightgray">
                 <tt>
                     <h:outputText value="mode:#{SearchIncludeFragment.mode} "/>
                     <h:outputText value="sort=#{SearchIncludeFragment.sortField}:#{SearchIncludeFragment.sortOrder}"/><br/>
@@ -246,19 +300,19 @@
                         <!--SEARCH ZERO COUNTS-->
                         <p><h:outputFormat value="#{bundle['dataverse.results.empty.zero']}" escape="false">
                                 <f:param value="#{settingsWrapper.guidesBaseUrl}"/>
-                                <f:param value="#{systemConfig.guidesVersion}"/>
+                                <f:param value="#{settingsWrapper.guidesVersion}"/>
                             </h:outputFormat></p>
                     </ui:fragment>
                     <ui:fragment rendered="#{SearchIncludeFragment.facetCountDataverses gt 0 or SearchIncludeFragment.facetCountDatasets gt 0 or SearchIncludeFragment.facetCountFiles gt 0}">
                         <!--SEARCH HIDDEN-->
                         <p><h:outputFormat value="#{bundle['dataverse.results.empty.hidden']}" escape="false">
                                 <f:param value="#{settingsWrapper.guidesBaseUrl}"/>
-                                <f:param value="#{systemConfig.guidesVersion}"/>
+                                <f:param value="#{settingsWrapper.guidesVersion}"/>
                             </h:outputFormat></p>
                     </ui:fragment>
                     <ui:fragment rendered="#{SearchIncludeFragment.errorFromSolr != null}">
                         <p>
-                            <a data-toggle="collapse" data-parent="#emptyResults" href="#technicalDetails" aria-expanded="true" aria-controls="technicalDetails">[+] #{bundle['dataverse.results.empty.link.technicalDetails']}</a>
+                            <a rel="nofollow" data-toggle="collapse" data-parent="#emptyResults" href="#technicalDetails" aria-expanded="true" aria-controls="technicalDetails">[+] #{bundle['dataverse.results.empty.link.technicalDetails']}</a>
                         </p>
                         <div id="technicalDetails" class="collapse">
                             <pre><h:outputText value="#{SearchIncludeFragment.errorFromSolr}"/></pre>
@@ -302,7 +356,7 @@
                         <p>
                             <h:outputFormat value="#{dataverseRedirectPage == 'dataverseuser.xhtml' ? bundle['account.results.empty.browse.loggedin.perms.zero'] : bundle['dataverse.results.empty.browse.loggedin.perms.zero']}" escape="false">
                                 <f:param value="#{settingsWrapper.guidesBaseUrl}"/>
-                                <f:param value="#{systemConfig.guidesVersion}"/>
+                                <f:param value="#{settingsWrapper.guidesVersion}"/>
                             </h:outputFormat>
                         </p>
                     </ui:fragment>
@@ -328,8 +382,17 @@
 
                 <ui:repeat value="#{SearchIncludeFragment.filterQueries}" var="filterQuery" rendered="#{!SearchIncludeFragment.wasSolrErrorEncountered()}">
                     <ui:param name="friendlyNames" value="#{SearchIncludeFragment.getFriendlyNamesFromFilterQuery(filterQuery)}"/>
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" styleClass="facetLink facetSelected" rendered="#{not empty friendlyNames}">
-                        <h:outputText value="#{friendlyNames.get(0)}: #{friendlyNames.get(1)}"/> <span class="glyphicon glyphicon-remove"></span>
+                    <ui:param name="filterType" value="#{SearchIncludeFragment.getTypeFromFilterQuery(filterQuery)}"/>
+                    <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}" styleClass="facetLink facetSelected" rendered="#{not empty friendlyNames
+                                and filterType != DataversePage.searchFieldType and filterType != DataversePage.searchFieldSubtree}">
+                        <h:outputText value="#{friendlyNames.get(0)}: "/>
+                        <h:outputText value="#{friendlyNames.get(1)}">
+                                <f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(SearchIncludeFragment.getFieldTypeId(friendlyNames.get(0))).getString('languages'))}" />
+                                <f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(SearchIncludeFragment.getFieldTypeId(friendlyNames.get(0))).getString('cvoc-url','')}" />
+                                <f:passThroughAttribute name="data-cvoc-headers" value="#{cvocConf.get(SearchIncludeFragment.getFieldTypeId(friendlyNames.get(0))).containsKey('headers') ? cvocConf.get(SearchIncludeFragment.getFieldTypeId(friendlyNames.get(0))).get('headers').toString() : '{}'}"/>
+                                <f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(SearchIncludeFragment.getFieldTypeId(friendlyNames.get(0))).getString('protocol','')}" />
+                        </h:outputText>
+                        <span class="glyphicon glyphicon-remove"></span>
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                         <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
                             <f:param name="fq#{status.index}" value='#{clickedFilterQuery}' disable="#{clickedFilterQuery == filterQuery}"/>
@@ -357,9 +420,9 @@
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                             <span class="glyphicon glyphicon-sort"/> #{bundle['dataverse.results.btn.sort']} <span class="caret"/>
                         </button>
-                        <ul class="dropdown-menu pull-right text-left" role="menu">
+                        <ul class="dropdown-menu pull-right text-left">
                             <li>
-                                <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
+                                <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}">
                                     <h:outputText value="#{bundle['dataverse.results.btn.sort.option.nameAZ']}" styleClass="#{SearchIncludeFragment.sortedByNameAsc ? 'highlightBold' : ''}"/>
                                     <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                                     <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -372,7 +435,7 @@
                                 </h:outputLink>
                             </li>
                             <li>
-                                <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
+                                <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}">
                                     <h:outputText value="#{bundle['dataverse.results.btn.sort.option.nameZA']}" styleClass="#{SearchIncludeFragment.sortedByNameDesc ? 'highlightBold' : ''}"/>
                                     <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                                     <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -385,7 +448,7 @@
                                 </h:outputLink>
                             </li>
                             <li>
-                                <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
+                                <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}">
                                     <h:outputText value="#{bundle['dataverse.results.btn.sort.option.newest']}" styleClass="#{SearchIncludeFragment.sortedByReleaseDateDesc? 'highlightBold' : ''}"/>
                                     <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                                     <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -398,7 +461,7 @@
                                 </h:outputLink>
                             </li>
                             <li>
-                                <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
+                                <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}">
                                     <h:outputText value="#{bundle['dataverse.results.btn.sort.option.oldest']}" styleClass="#{SearchIncludeFragment.sortedByReleaseDateAsc? 'highlightBold' : ''}"/>
                                     <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                                     <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -412,7 +475,7 @@
                             </li>
                             <ui:fragment rendered="#{SearchIncludeFragment.mode == SearchIncludeFragment.searchModeString}">
                                 <li>
-                                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
+                                    <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}">
                                         <h:outputText value="#{bundle['dataverse.results.btn.sort.option.relevance']}" styleClass="#{SearchIncludeFragment.sortedByRelevance ? 'highlightBold' : ''}"/>
                                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                                         <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -431,12 +494,12 @@
             </div>
 
             <o:importFunctions type="org.omnifaces.el.functions.Strings" />
-            <ui:param name="descriptionAbbreviationThreshold" value="280"/>
+            <ui:param name="descriptionAbbreviationThreshold" value="350"/>
             <!--CARDS-->
             <h:dataTable id="resultsTable" styleClass="#{SearchIncludeFragment.searchResultsCount > 0 ? '' : 'resultsNone'}" value="#{SearchIncludeFragment.searchResultsList}" var="result"
                          rendered="#{SearchIncludeFragment.searchResultsList.size() > 0}">
                 <h:column>
-                    <ui:fragment rendered="#{SearchIncludeFragment.debug == true}">
+                    <ui:fragment rendered="#{dataverseSession.debug}">
                         <h:outputText value="score: #{result.score}" rendered="#{SearchIncludeFragment.mode == SearchIncludeFragment.searchModeString}"/>
                     </ui:fragment>
                     <!--DATAVERSE CARDS-->
@@ -449,7 +512,7 @@
                             <h:outputLink value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvUrl : widgetWrapper.wrapURL(dvUrl)}" target="#{!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}">
                                 <h:outputText value="#{result.name}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet == null}"/>
                                 <h:outputText value="#{result.nameHighlightSnippet}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet != null}" escape="false"/>
-                                <h:outputText value=" (#{result.entityId})" style="padding:4px 0;" rendered="#{SearchIncludeFragment.debug == true}"/>
+                                <h:outputText value=" (#{result.entityId})" style="padding:4px 0;" rendered="#{dataverseSession.debug}"/>
                             </h:outputLink>
                             <h:outputText value="(#{result.dataverseAffiliation})" styleClass="text-muted" style="margin-left: .5em;" rendered="#{!empty result.dataverseAffiliation and result.dataverseAffiliationHighlightSnippet == null}"/>
                             <h:outputText value="(#{result.dataverseAffiliationHighlightSnippet})" styleClass="text-muted" style="margin-left: .5em;" rendered="#{result.dataverseAffiliationHighlightSnippet != null}" escape="false"/>
@@ -458,16 +521,17 @@
                             <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{result.unpublishedState}"/>
                         </div>
                         <div class="card-preview-icon-block text-center">
-                            <h:outputLink value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvUrl : widgetWrapper.wrapURL(dvUrl)}" target="#{!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}">
-                                <h:graphicImage value="#{result.imageUrl}" rendered="#{!empty result.imageUrl}" alt="#{of:format1(bundle['alt.logo'], result.name)}"/>
+                            <h:outputLink rel="nofollow" value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvUrl : widgetWrapper.wrapURL(dvUrl)}" target="#{!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}">
+                                <img src="#{result.imageUrl}" jsf:rendered="#{!empty result.imageUrl}" alt="#{of:format1(bundle['alt.logo'], result.name)}"/>
                                 <span class="icon-dataverse text-brand" jsf:rendered="#{empty result.imageUrl}"/>
+                                <f:passThroughAttribute name="aria-label" value="#{of:format1(bundle['alt.logo'], result.name)}"/>
                             </h:outputLink>
                         </div>
 
                         <h:outputText value="#{result.dateToDisplayOnCard}" styleClass="text-muted" style="margin-right:.5em;"/>
 
                         <c:set var="dvParentUrl" value="/dataverse/#{result.dataverseParentAlias}"/>
-                        <h:outputLink value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvParentUrl : widgetWrapper.wrapURL(dvParentUrl)}" target="#{!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
+                        <h:outputLink rel="nofollow" value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvParentUrl : widgetWrapper.wrapURL(dvParentUrl)}" target="#{!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
                             <h:outputText value="#{result.parent.get('name')}"/>
                         </h:outputLink>
 
@@ -501,24 +565,29 @@
                     <!--DATASET CARDS-->
                     <div class="datasetResult clearfix" jsf:rendered="#{result.type == 'datasets'}">
                         <div class="card-title-icon-block">
+                            <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
                             <span class="glyphicon glyphicon-link text-info pull-right" title="#{bundle.linked}" jsf:rendered="#{!SearchIncludeFragment.rootDv and !result.isInTree}"/>
                             <span class="glyphicon glyphicon-new-window text-info pull-right" title="#{bundle.harvested}" jsf:rendered="#{result.harvested}"/>
                             <span class="icon-dataset text-info pull-right" title="#{bundle.dataset}"/>
                             <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? result.datasetUrl : widgetWrapper.wrapURL(result.datasetUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">
                                 <h:outputText value="#{result.title}" style="padding:4px 0;" rendered="#{result.titleHighlightSnippet == null}"/>
                                 <h:outputText value="#{result.titleHighlightSnippet}" style="padding:4px 0;" rendered="#{result.titleHighlightSnippet != null}" escape="false"/>
-                                <h:outputText value=" (#{result.entityId})" style="padding:4px 0;" rendered="#{SearchIncludeFragment.debug == true}"/></a>
+                                <h:outputText value=" (#{result.entityId})" style="padding:4px 0;" rendered="#{dataverseSession.debug}"/></a>
 
                             <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{result.draftState}"/>
                             <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{result.inReviewState}"/>
                             <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{result.unpublishedState}"/>
                             <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{result.deaccessionedState}"/>
+                            <h:outputText value="#{bundle['embargoed']}" styleClass="label label-primary" rendered="#{SearchIncludeFragment.isActivelyEmbargoed(result)}"/>
+                            <h:outputText value="#{bundle['retentionExpired']}" styleClass="label label-warning" rendered="#{SearchIncludeFragment.isRetentionExpired(result)}"/>
+                            <h:outputText value="#{DatasetUtil:getLocaleCurationStatusLabelFromString(result.curationStatus)}" styleClass="label label-info curation-status" rendered="#{SearchIncludeFragment.canSeeCurationStatus(result.entityId)}"/>
                             <h:outputText value="#{result.userRole}" styleClass="label label-primary" rendered="#{!empty result.userRole}"/>
+                            <h:outputText value="#{bundle['incomplete']}" styleClass="label label-danger" rendered="#{!result.harvested and !SearchIncludeFragment.isValid(result)}"/>
                         </div>
                         <div class="card-preview-icon-block text-center">
-                            <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? result.datasetUrl : widgetWrapper.wrapURL(result.datasetUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">                               
-                                <h:graphicImage value="#{result.imageUrl}" rendered="#{!empty result.imageUrl}" alt="#{result.title}"/>                               
-                                <span class="icon-dataset" jsf:rendered="#{empty result.imageUrl}"/>
+                            <a rel="nofollow" href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? result.datasetUrl : widgetWrapper.wrapURL(result.datasetUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" aria-label="#{result.title}">
+                                <img src="#{result.imageUrl}" jsf:rendered="#{!empty result.imageUrl and !result.deaccessionedState}" alt="#{result.title}"/>
+                                <span class="icon-dataset" jsf:rendered="#{empty result.imageUrl or result.deaccessionedState}"/>
                             </a>
                         </div>
 
@@ -527,7 +596,7 @@
                         <h:outputText styleClass="text-muted" value=" - " rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}"/>
                         
                         <c:set var="dvParentAlias" value="/dataverse/#{result.dataverseAlias}"/>
-                        <h:outputLink value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvParentAlias : widgetWrapper.wrapURL(dvParentAlias)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
+                        <h:outputLink rel="nofollow" value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvParentAlias : widgetWrapper.wrapURL(dvParentAlias)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
                             <h:outputText value="#{result.parent.get('name')}"/>
                         </h:outputLink>
 
@@ -553,7 +622,16 @@
                         <ui:repeat value="#{result.highlightsAsList}" var="highlight" rendered="#{result.highlightsAsList.size() > 0}">
                             <ui:repeat value="#{highlight.snippets}" var="snippet">
                                 <div>
-                                    <h:outputText value="#{highlight.displayName}: #{snippet}" escape="false"/>
+                                    <h:outputText value='#{highlight.displayName}: '/>
+                                    <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
+                                    <h:outputText value="#{covcConf.isEmpty() ? snippet: MarkupChecker:stripAllTags(snippet)}" escape="false">
+                                        <c:if test="#{!cvocConf.isEmpty()}">
+                                            <f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(datasetFieldServiceBean.findByName(highlight.solrField.nameSearchable).id).getString('languages'))}" />
+                                            <f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(datasetFieldServiceBean.findByName(highlight.solrField.nameSearchable).id).getString('cvoc-url','')}" />
+                                            <f:passThroughAttribute name="data-cvoc-headers" value="#{cvocConf.get(datasetFieldServiceBean.findByName(highlight.solrField.nameSearchable).id).containsKey('headers') ? cvocConf.get(datasetFieldServiceBean.findByName(highlight.solrField.nameSearchable).id).get('headers').toString() : '{}'}"/>
+                                            <f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(datasetFieldServiceBean.findByName(highlight.solrField.nameSearchable).id).getString('protocol','')}" />
+                                        </c:if>
+                                    </h:outputText>
                                 </div>
                             </ui:repeat>
                         </ui:repeat>
@@ -569,44 +647,65 @@
                             <span class="glyphicon glyphicon-new-window text-muted pull-right" title="#{bundle.harvested}" jsf:rendered="#{result.harvested}"/>
                             <span class="icon-file text-muted pull-right" title="#{bundle.file}"/>
 
-                            <span class="text-danger glyphicon glyphicon-lock" title="#{bundle.restricted}" jsf:rendered="#{result.entity.restricted and !permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
-                            <span class="text-success icon-unlock" title="#{bundle.restrictedaccess}" jsf:rendered="#{result.entity.restricted and permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
-                            <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">
+                            <span class="text-danger glyphicon glyphicon-lock" data-toggle="tooltip" title="#{bundle.restricted}" jsf:rendered="#{result.entity.restricted and !permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
+                            <span class="text-success icon-unlock" data-toggle="tooltip" title="#{bundle.restrictedaccess}" jsf:rendered="#{result.entity.restricted and permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
+                            <a rel="nofollow" href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">
                                 <h:outputText value="#{result.name}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet == null}"/>
                                 <h:outputText value="#{result.nameHighlightSnippet}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet != null}" escape="false"/>
-                                <h:outputText value=" (#{result.entityId})" style="padding:4px 0;" rendered="#{SearchIncludeFragment.debug == true}"/></a>
+                                <h:outputText value=" (#{result.entityId})" style="padding:4px 0;" rendered="#{dataverseSession.debug}"/></a>
                             <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{result.draftState}"/>
                             <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{result.inReviewState}"/>
                             <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{result.unpublishedState}"/>
+                            <h:outputText value="#{bundle['embargoed']}" styleClass="label label-primary" rendered="#{SearchIncludeFragment.isActivelyEmbargoed(result)}"/>
+                            <h:outputText value="#{bundle['retentionExpired']}" styleClass="label label-danger" rendered="#{SearchIncludeFragment.isRetentionExpired(result)}"/>
                             <h:outputText value="#{result.userRole}" styleClass="label label-primary" rendered="#{!empty result.userRole}"/>
                         </div>
 
                         <div class="card-preview-icon-block text-center">
-                            <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">
-                                <h:graphicImage value="#{result.imageUrl}" rendered="#{!empty result.imageUrl}" alt="#{result.name}"/>
+                            <a rel="nofollow" href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" aria-label="#{result.name}">
+                                <img src="#{result.imageUrl}" jsf:rendered="#{!empty result.imageUrl}" alt="#{result.name}"/>
                                 <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(result.entity)} text-muted h1"
                                       jsf:rendered="#{empty result.imageUrl}"/>
                             </a>
                         </div>
 
-                        <div>
-                            <h:outputText styleClass="text-muted" value="#{result.dateToDisplayOnCard} - "/>
-                            <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? result.fileDatasetUrl : widgetWrapper.wrapURL(result.fileDatasetUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">
+                        <div class="text-muted">
+                            <h:outputText value="#{result.dateToDisplayOnCard} - "/>
+                            <a rel="nofollow" href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? result.fileDatasetUrl : widgetWrapper.wrapURL(result.fileDatasetUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">
                                 <h:outputText value="#{result.parent.get('name')}"/></a>
                         </div>
 
-                        <div>
-                            <h:outputText value="#{bundle['dataverse.results.cards.files.tabularData']}" styleClass="text-muted" rendered="#{!empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"/>
-                            <h:outputText value="#{result.filetype}" styleClass="text-muted" rendered="#{empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity) and result.fileTypeHighlightSnippet == null}"/>
-                            <h:outputText value="#{result.fileTypeHighlightSnippet}" styleClass="text-muted" rendered="#{empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity) and result.fileTypeHighlightSnippet != null}" escape="false"/>
-
-                            <h:outputText styleClass="text-muted" value=" - #{SearchIncludeFragment.dataFileSizeDisplay(result.entity)}" rendered="#{!result.harvested}" />
-
-                            <h:outputText styleClass="text-muted" value=" - #{SearchIncludeFragment.dataFileChecksumDisplay(result.entity)}" rendered="#{!result.harvested and !SearchIncludeFragment.isTabular(result.entity) and !(empty SearchIncludeFragment.dataFileChecksumDisplay(result.entity))}"/>
-
-                            <!-- if this is a tabular data file, extra information, such as the numbers of variables and observations and the unf, is displayed: -->
-                            <h:outputText styleClass="text-muted" value=" - #{SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"
-                                            rendered="#{!empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"/>
+                        <div class="text-muted">
+                            <h:outputText value="#{bundle['dataverse.results.cards.files.tabularData']}" rendered="#{!empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"/>
+                            <h:outputText value="#{result.filetype}" rendered="#{empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity) and result.fileTypeHighlightSnippet == null}"/>
+                            <h:outputText value="#{result.fileTypeHighlightSnippet}" rendered="#{empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity) and result.fileTypeHighlightSnippet != null}" escape="false"/>
+                            <h:outputText value=" - #{SearchIncludeFragment.dataFileSizeDisplay(result.entity)}" rendered="#{!result.harvested}"/>
+                            <h:outputText value=" - " rendered="#{!result.harvested and !SearchIncludeFragment.isTabular(result.entity) and !(empty result.fileChecksumValue)}"/>
+                            <span class="checksum-block" jsf:rendered="#{!result.harvested and !SearchIncludeFragment.isTabular(result.entity) and !(empty result.fileChecksumValue)}">
+                                <span class="checksum-truncate checksum-tooltip" style="margin-right:3px;"
+                                          data-toggle="tooltip" data-placement="top" data-html="true"
+                                          data-clipboard-action="copy"
+                                          data-clipboard-text="#{result.fileChecksumValue}"
+                                          title="#{bundle['file.metaData.checksum.copy']}&lt;br/&gt;#{result.fileChecksumValue}">#{result.fileChecksumType}: #{result.fileChecksumValue}</span>
+                                <span class="glyphicon glyphicon-copy btn-copy checksum-tooltip"
+                                        data-toggle="tooltip" data-placement="top" data-html="true"
+                                        data-clipboard-action="copy"
+                                        data-clipboard-text="#{result.fileChecksumValue}" title="#{bundle['file.metaData.checksum.copy']}&lt;br/&gt;#{result.fileChecksumValue}"></span>
+                            </span>
+                            <!-- if tabular data file, display number of variables and observations, and unf -->
+                            <span class="unf-block" jsf:rendered="#{!empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}">
+                                <h:outputText value=" - #{SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"/>
+                                <h:outputText value=" - " rendered="#{!empty SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}"/>
+                                <span class="checksum-truncate checksum-tooltip" style="margin-right:3px;" jsf:rendered="#{!empty SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}"
+                                          data-toggle="tooltip" data-placement="top" data-html="true"
+                                          data-clipboard-action="copy"
+                                          data-clipboard-text="#{SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}"
+                                          title="#{bundle['file.metaData.checksum.copy']}&lt;br/&gt;#{SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}">#{SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}</span>
+                                <span class="glyphicon glyphicon-copy btn-copy checksum-tooltip" jsf:rendered="#{!empty SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}"
+                                        data-toggle="tooltip" data-placement="top" data-html="true"
+                                        data-clipboard-action="copy"
+                                        data-clipboard-text="#{SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}" title="#{bundle['file.metaData.checksum.copy']}&lt;br/&gt;#{SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}"></span>
+                            </span>
                         </div>
 
                         <div class="file-tags-block" jsf:rendered="#{(!empty result.fileCategories) or (!empty result.tabularDataTags)}">
@@ -656,42 +755,6 @@
                          actionListener="#{SearchIncludeFragment.setDisplayCardValues()}" />
     </h:form>
 
-    <p:dialog id="addDataGuest" header="#{bundle['dataverse.results.dialog.addDataGuest.header']}" widgetVar="addData_popup" modal="true">
-        <p class="help-block">
-            <h:outputText value="#{dataverseHeaderFragment.signupAllowed ? bundle['dataverse.results.dialog.addDataGuest.msg.signup'] : bundle['dataverse.results.dialog.addDataGuest.msg']}" escape="false"></h:outputText>
-        </p>
-        <div class="button-block">
-            <ui:fragment rendered="#{dataverseHeaderFragment.signupAllowed}">
-                <a class="btn btn-default" href="#{dataverseHeaderFragment.getSignupUrl(navigationWrapper.redirectPage)}" title="#{bundle['dataverse.results.dialog.addDataGuest.signup.title']}">#{bundle['signup']}</a>
-            </ui:fragment>
-            <a class="btn btn-default" href="/loginpage.xhtml#{navigationWrapper.redirectPage}" title="#{bundle['dataverse.results.dialog.addDataGuest.login.title']}">#{bundle['login']}</a>
-        </div>
-    </p:dialog>
-    <script>
-        <ui:remove>
-        // The javascript below would be called once the page finished 
-        // the initial rendering, and trigger an extra partial submit that 
-        // displayed the extra cosmetic features of the page - the thumbnails
-        // primarily - thus making the initial load happen faster. 
-        // We have decided to disable this feature (at least for now) in order 
-        // to be able to change SearchIncludeFragment and ThumbnailServiceWrapper 
-        // to @RequestScoped (to eliminate the objects in memory associated with the 
-        // @View scope).
-        // For postLoad() see: https://github.com/IQSS/dataverse/issues/2004
-        //<![CDATA[
-        //$(document).ready(function () {
-            // Calls the p:remoteCommand postLoad.
-            // Posted at end of fragment to work correctly with Account information
-        //    postLoad();
-
-        //    $('[data-toggle=offcanvas]').click(function() {
-        //        $('.row-offcanvas').toggleClass('active', 200);
-        //    });
-        //});
-        //]]>
-        </ui:remove>
-
-        
-        
-    </script>
+    <ui:include src="addDataFormFragment.xhtml"></ui:include>
+
 </ui:composition>
diff --git a/src/main/webapp/search-include-pager.xhtml b/src/main/webapp/search-include-pager.xhtml
index 5b89b1629cd..88714099c00 100644
--- a/src/main/webapp/search-include-pager.xhtml
+++ b/src/main/webapp/search-include-pager.xhtml
@@ -15,7 +15,7 @@
                 <ul class="pagination">
                     <!--should take you to page 1-->
                     <li class="#{SearchIncludeFragment.page == '1' ? 'disabled' : ''}">
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
+                        <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}">
                             <h:outputText value="&#171;"/>
                             <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                             <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -25,10 +25,11 @@
                             <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                             <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                             <f:param name="page" value="1"/>
+                            <f:passThroughAttribute name="title" value="#{bundle['dataverse.results.paginator.first']}"/>
                         </h:outputLink>
                     </li>
                     <li class="#{SearchIncludeFragment.page == '1' ? 'disabled' : ''}">
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
+                        <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}">
                             <h:outputText value="&lt; #{bundle.previous}"/>
                             <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                             <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -38,13 +39,14 @@
                             <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                             <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                             <f:param name="page" value="#{Math:max(1,SearchIncludeFragment.page-1).intValue()}"/>
+                            <f:passThroughAttribute name="title" value="#{bundle['dataverse.results.paginator.previous']}"/>
                         </h:outputLink>
                     </li>
                     <c:forEach begin="#{Math:max(1,SearchIncludeFragment.page-Math:max(2,SearchIncludeFragment.page-SearchIncludeFragment.totalPages+4))}"
                                end="#{Math:min(SearchIncludeFragment.totalPages,SearchIncludeFragment.page+Math:max(2,5-SearchIncludeFragment.page))}"
                                varStatus="pageStatus">
                         <li class="#{SearchIncludeFragment.page == pageStatus.index ? 'active' : ''}">
-                            <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
+                            <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}">
                                 <h:outputText value="#{pageStatus.index}">
                                     <f:convertNumber pattern="###,###" />
                                 </h:outputText>
@@ -63,7 +65,7 @@
                         </li>
                     </c:forEach>
                     <li class="#{SearchIncludeFragment.page == SearchIncludeFragment.totalPages ? 'disabled' : ''}">
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
+                        <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}">
                             <h:outputText value="#{bundle.next} &gt;"/>
                             <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                             <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -73,10 +75,11 @@
                             <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                             <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                             <f:param name="page" value="#{Math:min(SearchIncludeFragment.page+1,SearchIncludeFragment.totalPages).intValue()}"/>
+                            <f:passThroughAttribute name="title" value="#{bundle['dataverse.results.paginator.next']}"/>
                         </h:outputLink>
                     </li>
                     <li class="#{SearchIncludeFragment.page == SearchIncludeFragment.totalPages ? 'disabled' : ''}">
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
+                        <h:outputLink rel="nofollow" value="#{widgetWrapper.wrapURL(page)}">
                             <h:outputText value="&#187;"/>
                             <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                             <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
@@ -86,6 +89,7 @@
                             <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                             <f:param name="page" value="#{SearchIncludeFragment.totalPages}"/>
                             <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
+                            <f:passThroughAttribute name="title" value="#{bundle['dataverse.results.paginator.last']}"/>
                         </h:outputLink>
                     </li>
                 </ul>
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index 2b67877fe4a..c921fe930d5 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:h="http://java.sun.com/jsf/html"
       xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
@@ -14,13 +15,22 @@
             <ui:param name="pageTitle" value="#{thisPageTitle}"/>
             <ui:param name="dataverse" value="#{AdvancedSearchPage.dataverse}"/>
             <ui:param name="ownerId" value="#{DataversePage.ownerId}"/>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                     <f:viewAction action="#{AdvancedSearchPage.init}"/>
                     <f:viewParam name="dataverseIdentifier" value="#{AdvancedSearchPage.dataverseIdentifier}"/>
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(AdvancedSearchPage.dataverse, bundle['dataverse.search.advancedSearch'])}"/>
                 </f:metadata>
+            </ui:define>
+            <ui:define name="body">
+                <p:fragment>
+                    <p:autoUpdate/>
+                    <ui:repeat value="#{AdvancedSearchPage.vocabScripts}" var="vocabScriptUrl">
+                        <script src="#{vocabScriptUrl}?version=#{systemConfig.getVersion()}"/>
+                    </ui:repeat>
+                </p:fragment>
+                <c:set var="cvocConf" value="#{AdvancedSearchPage.getCVocConf()}"/>
                 <!-- Search Panel -->
                 <div class="panel-group">
                     <h:form id="advancedSearchForm">
@@ -34,7 +44,7 @@
                             </div>
                             <div id="panelCollapseDataversesFieldList" class="panel-body form-horizontal collapse in">
                                 <div class="form-group">
-                                    <label class="col-sm-4 control-label">
+                                    <label for="advancedSearchForm:dvFieldName" class="col-sm-4 control-label">
                                         #{bundle.name}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.name.tip']}"></span>
@@ -44,7 +54,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="col-sm-4 control-label">
+                                    <label for="advancedSearchForm:dvFieldAlias" class="col-sm-4 control-label">
                                         #{bundle.identifier}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.identifier.title']}"></span>
@@ -54,7 +64,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="col-sm-4 control-label">
+                                    <label for="advancedSearchForm:dvFieldAffiliation" class="col-sm-4 control-label">
                                         #{bundle.affiliation}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.affiliation.tip']}"></span>
@@ -64,7 +74,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="col-sm-4 control-label">
+                                    <label for="advancedSearchForm:dvFieldDescription" class="col-sm-4 control-label">
                                         #{bundle.description}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.description.tip']}"></span>
@@ -91,21 +101,38 @@
                             </div>
                         </div>
 
-                        <ui:repeat value="#{AdvancedSearchPage.metadataBlocks}" var="mdb" varStatus="status">
+                        <ui:repeat id="block" value="#{AdvancedSearchPage.metadataBlocks}" var="mdb" varStatus="status">
                             <div class="panel panel-default" jsf:rendered="#{not empty AdvancedSearchPage.metadataFieldMap.get(mdb.getId())}">
                                 <div data-toggle="collapse" data-target="#panelCollapseCitationFieldList#{mdb.id}" class="panel-heading">
-                                    <h:outputText value="#{bundle['advanced.search.header.datasets']}: #{mdb.localeDisplayName}"/> &#160;<span class="glyphicon #{status.first?'glyphicon-chevron-up':'glyphicon-chevron-down'}"/>
+                                    <h:outputText value="#{bundle['advanced.search.header.datasets']}: #{mdb.localeDisplayName}"/> &#160;<span class="glyphicon glyphicon-chevron-down"/>
                                 </div>
-                                <div id="panelCollapseCitationFieldList#{mdb.id}" class="collapse #{status.first?'in':''} panel-body form-horizontal">
-                                    <ui:repeat value="#{AdvancedSearchPage.metadataFieldMap.get(mdb.getId())}" var="item">
+                                <div id="panelCollapseCitationFieldList#{mdb.id}" class="collapse in panel-body form-horizontal">
+                                    <ui:repeat id="field" value="#{AdvancedSearchPage.metadataFieldMap.get(mdb.getId())}" var="item" varStatus="fieldStatus">
                                         <div class="form-group">
-                                            <label class="col-sm-4 control-label">
+                                            <label for="advancedSearchForm:block:#{status.index}:field:#{fieldStatus.index}:#{cvoc==null ? 'searchValue':'searchValue2'}" class="col-sm-4 control-label">
                                                 #{item.displayName}
                                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{item.localeDescription}"></span>
                                             </label>
                                             <div class="col-sm-6">
-                                                <p:inputText id="searchValue" styleClass="form-control" value="#{item.searchValue}" rendered="#{empty item.controlledVocabularyValues}"/>
+                                                <ui:param name="cvoc" value="#{cvocConf.containsKey(item.id)? cvocConf.get(item.id): null}"/>
+                                                <ui:fragment rendered="#{cvoc==null}">
+                                                    <p:inputText id="searchValue" styleClass="form-control" value="#{item.searchValue}" rendered="#{empty item.controlledVocabularyValues}"/>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{cvoc!=null and cvoc.getString('term-uri-field').equals(item.name)}">
+                                                    <p:inputText id="searchValue2" styleClass="form-control" value="#{item.searchValue}" rendered="#{empty item.controlledVocabularyValues}">
+                                                        <f:passThroughAttribute name="lang" value="#{AdvancedSearchPage.getFieldLanguage(cvoc.getString('languages'))}"/>
+                                                        <f:passThroughAttribute name="data-cvoc-service-url" value="#{cvoc.getString('cvoc-url','')}"/>
+                                                        <f:passThroughAttribute name="data-cvoc-headers" value="#{cvoc.containsKey('headers') ? cvoc.get('headers').toString() : '{}'}"/>
+                                                        <f:passThroughAttribute name="data-cvoc-protocol" value="#{cvoc.getString('protocol','')}"/>
+                                                        <f:passThroughAttribute name="data-cvoc-filter" value="#{cvoc.getString('term-parent-uri','')}"/>
+                                                        <f:passThroughAttribute name="data-cvoc-vocabs" value="#{cvoc.get('vocabs').toString()}"/>
+                                                        <f:passThroughAttribute name="data-cvoc-allowfreetext" value="#{cvoc.getBoolean('allow-free-text', false)}"/>
+                                                        <f:passThroughAttribute name="data-cvoc-parent" value="#{cvoc.getString('field-name','')}"/>
+                                                        <f:passThroughAttribute name="data-cvoc-managedfields" value="#{cvoc.get('managed-fields').toString()}"/>
+                                                        <f:passThroughAttribute name="data-cvoc-placeholder" value=""/>
+                                                    </p:inputText>
+                                                </ui:fragment>
                                                 <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{!empty item.controlledVocabularyValues}">
                                                     <p:selectManyCheckbox value="#{item.listValues}" layout="pageDirection">
                                                         <f:selectItems value="#{item.controlledVocabularyValues}" var="cvs"
@@ -117,7 +144,7 @@
                                     </ui:repeat>
                                     <ui:fragment rendered="#{mdb.id == '1'}">
                                         <div class="form-group">
-                                            <label class="col-sm-4 control-label">
+                                            <label for="advancedSearchForm:block:0:dvFieldNamez" class="col-sm-4 control-label">
                                                 #{bundle['dataset.metadata.publicationYear']}
                                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.publicationYear.tip']}"></span>
@@ -127,7 +154,7 @@
                                             </div>
                                         </div>
                                         <div class="form-group">
-                                            <label class="col-sm-4 control-label">
+                                            <label for="advancedSearchForm:block:0:dsPersistentIdentifier" class="col-sm-4 control-label">
                                                 #{bundle['dataset.metadata.persistentId']}
                                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.metadata.persistentId.tip']}"></span>
@@ -147,7 +174,7 @@
                             </div>
                             <div id="panelCollapseFilesFieldList" class="panel-body form-horizontal collapse in">
                                 <div class="form-group">
-                                    <label class="col-sm-4 control-label">
+                                    <label for="advancedSearchForm:fileFieldName" class="col-sm-4 control-label">
                                         #{bundle.name}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.name.tip']}"></span>
@@ -157,7 +184,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="col-sm-4 control-label">
+                                    <label for="advancedSearchForm:fileFieldDescription" class="col-sm-4 control-label">
                                         #{bundle.description}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.description.tip']}"></span>
@@ -167,7 +194,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="col-sm-4 control-label">
+                                    <label for="advancedSearchForm:fileFieldFiletype" class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.fileType']}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.fileType.tip']}"></span>
@@ -177,7 +204,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="col-sm-4 control-label">
+                                    <label for="advancedSearchForm:fileFieldPersistentId" class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.persistentId']}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.persistentId.tip']}"></span>
@@ -187,7 +214,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="col-sm-4 control-label">
+                                    <label for="advancedSearchForm:fileFieldVariableName" class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.variableName']}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.variableName.tip']}"></span>
@@ -197,7 +224,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="col-sm-4 control-label">
+                                    <label for="advancedSearchForm:fileFieldVariableLabel" class="col-sm-4 control-label">
                                         #{bundle['advanced.search.files.variableLabel']}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.variableLabel.tip']}"></span>
@@ -206,6 +233,16 @@
                                         <p:inputText id="fileFieldVariableLabel" styleClass="form-control" value="#{AdvancedSearchPage.fileFieldVariableLabel}"/>
                                     </div>
                                 </div>
+                                <div class="form-group">
+                                    <label for="advancedSearchForm:fileFieldFileTags" class="col-sm-4 control-label">
+                                        #{bundle['advanced.search.files.fileTags']}
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.fileTags.tip']}"></span>
+                                    </label>
+                                    <div class="col-sm-6">
+                                        <p:inputText id="fileFieldFileTags" styleClass="form-control" value="#{AdvancedSearchPage.fileFieldFileTags}"/>
+                                    </div>
+                                </div>
                             </div>
                         </div>
 
@@ -214,6 +251,18 @@
                         </div>
                     </h:form>
                 </div>
+                <script>
+                    //<![CDATA[
+                    $(document).ready(function() {
+                        //The select2 widget used in external vocab scripts has trouble determining the width of an input field if it is initially hidden
+                        //Starting with the metadatablocks displayed and collapsing them here is a work-around to fix that.
+                        //Note - putting defer='defer' on the included ext vocab scripts (~line 28) would make them run after this which doesn't work.
+                        if(#{!cvocConf.isEmpty()}) {
+                            $("div[id^='panelCollapseCitationFieldList']").collapse('hide');
+                        }
+                    });
+                    //]]>
+                </script>
             </ui:define>
         </ui:composition>
     </h:body>
diff --git a/src/main/webapp/superuser.xhtml b/src/main/webapp/superuser.xhtml
index bc7426948b7..3c4212dcf92 100644
--- a/src/main/webapp/superuser.xhtml
+++ b/src/main/webapp/superuser.xhtml
@@ -13,11 +13,13 @@
     <ui:composition template="/dataverse_template.xhtml">
       <ui:param name="pageTitle" value="Superuser - #{dataverseServiceBean.findRootDataverse().name}"/>
       <ui:param name="showDataverseHeader" value="false"/>
-      <ui:define name="body">
+      <ui:define name="metadata">
           <f:metadata>
               <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
               <f:viewAction action="#{SuperUserPage.init}"/>
           </f:metadata>
+      </ui:define>
+      <ui:define name="body">
         <h:form id="indexAllForm">
           <div>
             <button class="btn btn-default" jsf:action="#{SuperUserPage.startIndexAll()}">
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index a8a6ae2a685..5f1e6592971 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -5,6 +5,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:o="http://omnifaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
     <h:head>
     </h:head>
@@ -15,15 +16,17 @@
             <ui:param name="dataverse" value="#{TemplatePage.template.dataverse}"/>
             <ui:param name="template" value="#{TemplatePage.template}"/>
             <ui:param name="showMessagePanel" value="#{true}"/>
-            <ui:define name="body">
+            <ui:define name="metadata">
                 <f:metadata>
                     <f:viewParam name="id" value="#{TemplatePage.templateId}"/>
                     <f:viewParam name="ownerId" value="#{TemplatePage.ownerId}"/>
-                    <f:viewParam name="editMode" value="#{TemplatePage.editMode}"/>
+                    <o:viewParam name="editMode" value="#{TemplatePage.editMode}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
                     <f:viewAction action="#{TemplatePage.init}"/>
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(TemplatePage.template.dataverse, (TemplatePage.editMode == 'CREATE' ? bundle['dataset.manageTemplates.createBtn'] : TemplatePage.template.name))}"/>
                 </f:metadata>
+            </ui:define>
+            <ui:define name="body">
                 <h:form id="templateForm">
                     <p:focus context="templateForm"/>
                     <!-- Header / Button Panel -->
@@ -46,13 +49,13 @@
                             <h:outputText value="#{bundle['dataset.template.returnBtn']}"/>
                         </h:outputLink>
                         
-                        <h:outputText value="#{TeplatePage.template.name}"/>
                         <p:tabView id="tabView" widgetVar="content" activeIndex="#{TemplatePage.selectedTabIndex}">
                             <p:tab id="metadataMapTab" title="#{bundle['file.dataFilesTab.metadata.header']}"
                                    rendered="#{empty TemplatePage.editMode or TemplatePage.editMode == 'METADATA'}">
                                 <ui:include src="metadataFragment.xhtml">
                                     <ui:param name="datasetPage" value="false"/>
                                     <ui:param name="templatePage" value="true"/>
+                                    <ui:param name="template" value="#{TemplatePage.template}"/>
                                     <ui:param name="editMode" value="#{!empty TemplatePage.editMode ? 'METADATA' : ''}"/>
                                     <ui:param name="metadataBlocks" value="#{!empty TemplatePage.editMode ? TemplatePage.template.metadataBlocksForEdit.entrySet().toArray() : TemplatePage.template.metadataBlocksForView.entrySet().toArray()}"/>   
                                 </ui:include>
@@ -62,7 +65,8 @@
                                     <ui:include src="dataset-license-terms.xhtml" >
                                         <ui:param name="editMode" value="#{!empty TemplatePage.editMode ? 'LICENSE': ''}"/>
                                         <ui:param name="termsOfUseAndAccess" value="#{TemplatePage.template.termsOfUseAndAccess}"/>
-                                        <ui:param name="datasetPage" value="false"/>               
+                                        <ui:param name="datasetPage" value="false"/>
+                                        <ui:param name="publicStore" value="settingsWrapper.publicInstall"/>
                                     </ui:include>
                                 </p:tab>                           
                         </p:tabView>
@@ -91,10 +95,11 @@
                                 </div>
                             </div>
                         </div>
-                        <ui:fragment rendered="#{TemplatePage.editMode == 'METADATA' or TemplatePage.editMode == 'CREATE'}">
+                        <ui:fragment rendered="#{TemplatePage.editMode == 'METADATA' or TemplatePage.editMode == 'CLONE' or TemplatePage.editMode == 'CREATE'}">
                             <ui:include src="metadataFragment.xhtml" >
                                 <ui:param name="datasetPage" value="false"/>
                                 <ui:param name="templatePage" value="true"/>
+                                <ui:param name="template" value="#{TemplatePage.template}"/>
                                 <ui:param name="editMode" value="#{!empty TemplatePage.editMode ? 'METADATA' : ''}"/>
                                 <ui:param name="metadataBlocks" value="#{!empty TemplatePage.editMode ? TemplatePage.template.metadataBlocksForEdit.entrySet().toArray() : TemplatePage.template.metadataBlocksForView.entrySet().toArray()}"/>   
                             </ui:include>  
@@ -104,27 +109,36 @@
                                 <ui:param name="datasetPage" value="false"/>
                                 <ui:param name="templatePage" value="true"/>
                                 <ui:param name="editMode" value="#{!empty TemplatePage.editMode ? 'LICENSE' : ''}"/>
-                                <ui:param name="termsOfUseAndAccess" value="#{TemplatePage.template.termsOfUseAndAccess}"/>   
+                                <ui:param name="termsOfUseAndAccess" value="#{TemplatePage.template.termsOfUseAndAccess}"/>
+                                <ui:param name="publicStore" value="settingsWrapper.publicInstall"/>
                             </ui:include> 
                         </ui:fragment>
                     </ui:fragment>
                     <!-- Create/Save Dataset Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty TemplatePage.editMode}">
-                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('Terms')}" update="@all"
+                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('Terms')}" update="@form,messagePanel"
                                          value="#{bundle['dataset.create.add.terms']}"
                                          rendered="#{TemplatePage.editMode == 'CREATE'}">  
                              <f:ajax onerror="window.scrollTo(0, 0)"/>
                         </p:commandButton>
-                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('')}" update="@all"
+                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('')}" update="@form,messagePanel"
                                          value="#{TemplatePage.editMode == 'LICENSEADD' ? bundle['dataset.manageTemplates.saveNewTerms'] : bundle.saveChanges}"
-                                         rendered="#{TemplatePage.editMode == 'METADATA' or TemplatePage.editMode == 'LICENSE' or TemplatePage.editMode == 'LICENSEADD'}">
+                                         rendered="#{TemplatePage.editMode == 'METADATA'  or TemplatePage.editMode == 'CLONE' or TemplatePage.editMode == 'LICENSE' or TemplatePage.editMode == 'LICENSEADD'}">
                             <f:ajax onerror="window.scrollTo(0, 0)"/>
                         </p:commandButton>
-                        <h:button styleClass="btn btn-link" value="#{bundle.cancel}" 
+                        <h:button styleClass="btn btn-link" value="#{bundle.cancel}" rendered="#{TemplatePage.editMode != 'CLONE'}"
                                   outcome="/manage-templates.xhtml?dataverseId=#{TemplatePage.dataverse.id}"></h:button>
+                        <p:commandButton styleClass="btn btn-link" value="#{bundle.cancel}" rendered="#{TemplatePage.editMode == 'CLONE'}"
+                                         action="#{TemplatePage.deleteTemplate(TemplatePage.templateId)}"    ></p:commandButton>          
                     </div>
                 </h:form>
+                <script>
+                    //<![CDATA[
+                      $(document).ready(function () {
+                        popoverHTML('#{bundle.htmlAllowedTitle}', '#{bundle.htmlAllowedTags}');
+                    //]]>
+                </script>
             </ui:define>
         </ui:composition>
     </h:body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/webapp/termsofuse.xhtml b/src/main/webapp/termsofuse.xhtml
index 72090bf6802..28657d52be9 100644
--- a/src/main/webapp/termsofuse.xhtml
+++ b/src/main/webapp/termsofuse.xhtml
@@ -5,13 +5,13 @@
      xmlns:p="http://primefaces.org/ui">
     
     <div class="form-group">
-        <label for="position" class="col-sm-3 control-label">
+        <label class="col-sm-3 control-label">
             #{bundle['user.acccountterms']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.acccountterms.tip']}"></span>
         </label>
         <div class="col-sm-9">
-            <div id="terms-agreement-block" class="well">
+            <div class="well terms-agreement-block">
                 <h:outputText value="#{systemConfig.applicationTermsOfUse}" escape="false"/>
             </div>
             <div class="checkbox">
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index aba5f1808c1..89bfd2b43d6 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -25,7 +25,7 @@
                                         <h:selectBooleanCheckbox id="themeRoot" tabindex="7" styleClass="metadata-blocks-default" 
                                                                  rendered="#{themeWidgetFragment.editDv.owner != null}"
                                                                  value="#{themeWidgetFragment.inheritCustomization}" >
-                                            <p:ajax update="@widgetVar(content)" oncomplete="javascript:bind_bsui_components();" listener="#{themeWidgetFragment.checkboxListener()}"/>
+                                            <p:ajax update="@widgetVar(content)" listener="#{themeWidgetFragment.checkboxListener()}"/>
                                         </h:selectBooleanCheckbox>
                                         <h:outputFormat value="#{bundle['dataverse.theme.inheritCustomization.checkbox']}">
                                             <f:param value="#{themeWidgetFragment.editDv.themeRootDataverseName}"/>
@@ -48,14 +48,14 @@
                                             <img jsf:rendered="#{themeWidgetFragment.uploadExists()}" class="logoPreview" src="/logos/temp/#{themeWidgetFragment.tempDirName}/#{themeWidgetFragment.editDv.dataverseTheme.logo}" alt="#{of:format1(bundle['alt.logo'], themeWidgetFragment.editDv.name)}"/>
                                             <img jsf:rendered="#{not themeWidgetFragment.uploadExists()}" class="logoPreview" src="/logos/#{themeWidgetFragment.editDv.id}/#{themeWidgetFragment.editDv.dataverseTheme.logo}" alt="#{of:format1(bundle['alt.logo'], themeWidgetFragment.editDv.name)}"/>
                                         </p>
-                                        <p:commandButton update=":themeWidgetsForm:themeWidgetsTabView" value="#{bundle.remove}" action="#{themeWidgetFragment.removeLogo()}" oncomplete="bind_bsui_components();"/>
+                                        <p:commandButton update=":themeWidgetsForm:themeWidgetsTabView" value="#{bundle.remove}" action="#{themeWidgetFragment.removeLogo()}"/>
                                     </p:column>                              
-                                    <p:fileUpload invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" oncomplete="bind_bsui_components();" dragDropSupport="true" auto="true" multiple="false"
-                                                  fileUploadListener="#{themeWidgetFragment.handleImageFileUpload}" label="#{bundle['dataverse.theme.logo.image.upload']}"/>
+                                    <p:fileUpload invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
+                                                  listener="#{themeWidgetFragment.handleImageFileUpload}" label="#{bundle['dataverse.theme.logo.image.upload']}"/>
                                 </p:panelGrid>
                                 <p:panelGrid rendered="#{empty themeWidgetFragment.editDv.dataverseTheme.logo}" columns="2" styleClass="noBorders">
-                                    <p:fileUpload id="uploadlogo" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" oncomplete="bind_bsui_components();" dragDropSupport="true" auto="true" multiple="false"
-                                                  fileUploadListener="#{themeWidgetFragment.handleImageFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}"/>
+                                    <p:fileUpload id="uploadlogo" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
+                                                  listener="#{themeWidgetFragment.handleImageFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}" invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}"/>
                                 </p:panelGrid>
                                 <ui:fragment rendered="#{not empty themeWidgetFragment.editDv.dataverseTheme.logo}">
                                     <div class="form-col-container col-sm-4">
@@ -68,7 +68,7 @@
                                             <p:selectOneRadio id="logoFormat" value="#{themeWidgetFragment.editDv.dataverseTheme.logoFormat}">
                                                 <f:selectItem itemLabel="#{bundle['dataverse.theme.logo.format.selectTab.square']}" itemValue="SQUARE"/>
                                                 <f:selectItem itemLabel="#{bundle['dataverse.theme.logo.format.selectTab.rectangle']}" itemValue="RECTANGLE"/>
-                                                <p:ajax update="@widgetVar(content)" oncomplete="bind_bsui_components();" />
+                                                <p:ajax update="@widgetVar(content)"/>
                                             </p:selectOneRadio>
                                             <p:message for="logoFormat" display="text"/>
                                         </div>
@@ -104,6 +104,31 @@
                                 </ui:fragment>
                             </div>
                         </div>
+                        <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.themeRoot}">
+                            <label class="col-sm-3 control-label" for="thumbnailFormat">
+                                #{bundle['dataverse.theme.logo.imageThumbnail']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.image.thumbnail']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <p class="help-block">#{bundle['dataverse.theme.logo.tip']}</p>
+                                <p:panelGrid rendered="#{not empty themeWidgetFragment.editDv.dataverseTheme.logoThumbnail}" columns="2" styleClass="noBorders" columnClasses="text-center,uploadNewLogo">
+                                    <p:column>
+                                        <p>
+                                            <img jsf:rendered="#{themeWidgetFragment.uploadExistsThumbnail()}" class="logoPreview" src="/logos/temp/#{themeWidgetFragment.tempDirName}/#{themeWidgetFragment.editDv.dataverseTheme.logoThumbnail}" alt="#{of:format1(bundle['alt.logo'], themeWidgetFragment.editDv.name)}"/>
+                                            <img jsf:rendered="#{not themeWidgetFragment.uploadExistsThumbnail()}" class="logoPreview" src="/logos/#{themeWidgetFragment.editDv.id}/#{themeWidgetFragment.editDv.dataverseTheme.logoThumbnail}" alt="#{of:format1(bundle['alt.logo'], themeWidgetFragment.editDv.name)}"/>
+                                        </p>
+                                        <p:commandButton update=":themeWidgetsForm:themeWidgetsTabView" value="#{bundle.remove}" action="#{themeWidgetFragment.removeLogoThumbnail()}"/>
+                                    </p:column>
+                                    <p:fileUpload invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" id="changelogothumbnail" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
+                                                  listener="#{themeWidgetFragment.handleImageThumbnailFileUpload}" label="#{bundle['dataverse.theme.logo.image.upload']}"/>
+                                </p:panelGrid>
+                                <p:panelGrid rendered="#{empty themeWidgetFragment.editDv.dataverseTheme.logoThumbnail}" columns="2" styleClass="noBorders">
+                                    <p:fileUpload id="uploadlogoThumbnail" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
+                                                  listener="#{themeWidgetFragment.handleImageThumbnailFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}" invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}"/>
+                                </p:panelGrid>
+                            </div>
+                        </div>
                     </div>
                     <ui:fragment rendered="#{themeWidgetFragment.editDv.themeRoot}">
                         <div class="row form-horizontal">
@@ -181,7 +206,7 @@
                             </div>
                             <!-- Dataverse footer logo -->
                             <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.themeRoot}">
-                                <label class="col-sm-3 control-label" for="logoFormat">
+                                <label class="col-sm-3 control-label">
                                     #{bundle['dataverse.theme.logo.imageFooter']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.theme.logo.image.footer']}"></span>
@@ -194,14 +219,14 @@
                                                 <img jsf:rendered="#{themeWidgetFragment.uploadExistsFooter()}" class="logoPreview" src="/logos/temp/#{themeWidgetFragment.tempDirName}/#{themeWidgetFragment.editDv.dataverseTheme.logoFooter}" alt="#{themeWidgetFragment.editDv.name}"/>
                                                 <img jsf:rendered="#{not themeWidgetFragment.uploadExistsFooter()}" class="logoPreview" src="/logos/#{themeWidgetFragment.editDv.id}/#{themeWidgetFragment.editDv.dataverseTheme.logoFooter}" alt="#{themeWidgetFragment.editDv.name}"/>
                                             </p>
-                                            <p:commandButton update=":themeWidgetsForm:themeWidgetsTabView" value="#{bundle.remove}" action="#{themeWidgetFragment.removeLogoFooter()}" oncomplete="bind_bsui_components();"/>
+                                            <p:commandButton update=":themeWidgetsForm:themeWidgetsTabView" value="#{bundle.remove}" action="#{themeWidgetFragment.removeLogoFooter()}"/>
                                         </p:column>
-                                        <p:fileUpload invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" id="changelogoFooter" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" oncomplete="bind_bsui_components();" dragDropSupport="true" auto="true" multiple="false"
-                                                      fileUploadListener="#{themeWidgetFragment.handleImageFooterFileUpload}" label="#{bundle['dataverse.theme.logo.image.upload']}"/>
+                                        <p:fileUpload invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" id="changelogoFooter" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
+                                                      listener="#{themeWidgetFragment.handleImageFooterFileUpload}" label="#{bundle['dataverse.theme.logo.image.upload']}"/>
                                     </p:panelGrid>
                                     <p:panelGrid rendered="#{empty themeWidgetFragment.editDv.dataverseTheme.logoFooter}" columns="2" styleClass="noBorders">
-                                        <p:fileUpload id="uploadlogoFooter" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" oncomplete="bind_bsui_components();" dragDropSupport="true" auto="true" multiple="false"
-                                                      fileUploadListener="#{themeWidgetFragment.handleImageFooterFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}"/>
+                                        <p:fileUpload id="uploadlogoFooter" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
+                                                      listener="#{themeWidgetFragment.handleImageFooterFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}" invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}"/>
                                     </p:panelGrid>
                                     <ui:fragment rendered="#{not empty themeWidgetFragment.editDv.dataverseTheme.logoFooter}">
                                         <div class="form-col-container col-sm-3">
@@ -237,7 +262,7 @@
                     </ui:fragment>
                 </p:fragment>
                 <div class="button-block">
-                    <p:commandButton class="btn btn-default" value="#{bundle.saveChanges}" update=":#{p:resolveClientId('messagePanel', view)}, :themeWidgetsForm" action="#{themeWidgetFragment.save()}" oncomplete="bind_bsui_components();"/>
+                    <p:commandButton class="btn btn-default" value="#{bundle.saveChanges}" update=":#{p:resolveClientId('messagePanel', view)}, :themeWidgetsForm" action="#{themeWidgetFragment.save()}"/>
                     <p:commandButton id="themeCancel" class="btn btn-link" value="#{bundle.cancel}" action="#{themeWidgetFragment.cancel()}" immediate="true"/>
                 </div>
             </p:tab>
@@ -289,7 +314,7 @@
                         <p class="help-block">#{bundle['dataverse.widgets.searchBox.tip']}</p>
                     </div>
                     <div>
-                        <textarea rows="3" cols="54" class="form-control">&lt;script src=&quot;#{systemConfig.dataverseSiteUrl}/resources/js/widgets.js?alias=#{themeWidgetFragment.editDv.alias}&amp;amp;dvUrl=#{systemConfig.dataverseSiteUrl}&amp;amp;widget=search&amp;amp;text=Search&#43;my&#43;dataverse&quot;&gt;&lt;/script&gt;</textarea>
+                        <textarea rows="3" cols="54" class="form-control">&lt;script id=&quot;dataverse-widget-js&quot; src=&quot;#{systemConfig.dataverseSiteUrl}/resources/js/widgets.js?alias=#{themeWidgetFragment.editDv.alias}&amp;amp;dvUrl=#{systemConfig.dataverseSiteUrl}&amp;amp;widget=search&amp;amp;text=Search&#43;my&#43;dataverse&quot;&gt;&lt;/script&gt;</textarea>
                     </div>
                     <div>
                         <h5>
@@ -298,7 +323,7 @@
                         <p class="help-block">#{bundle['dataverse.widgets.dataverseListing.tip']}</p>
                     </div>
                     <div>
-                        <textarea rows="3" cols="54" class="form-control">&lt;script src=&quot;#{systemConfig.dataverseSiteUrl}/resources/js/widgets.js?alias=#{themeWidgetFragment.editDv.alias}&amp;amp;dvUrl=#{systemConfig.dataverseSiteUrl}&amp;amp;widgetScope=#{themeWidgetFragment.editDv.alias}&amp;amp;widget=iframe&amp;amp;heightPx=500&quot;&gt;&lt;/script&gt;</textarea>
+                        <textarea rows="3" cols="54" class="form-control">&lt;script id=&quot;dataverse-widget-js&quot; src=&quot;#{systemConfig.dataverseSiteUrl}/resources/js/widgets.js?alias=#{themeWidgetFragment.editDv.alias}&amp;amp;dvUrl=#{systemConfig.dataverseSiteUrl}&amp;amp;widgetScope=#{themeWidgetFragment.editDv.alias}&amp;amp;widget=iframe&amp;amp;heightPx=500&quot;&gt;&lt;/script&gt;</textarea>
                     </div>
                     <div class="button-block">
                         <p:commandButton id="widgetsDone" class="btn btn-default" value="#{bundle.done}" action="#{themeWidgetFragment.cancel()}" immediate="true"/>
diff --git a/src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java
new file mode 100644
index 00000000000..30bd260eb1b
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/AuxiliaryFileServiceBeanTest.java
@@ -0,0 +1,61 @@
+package edu.harvard.iq.dataverse;
+
+import java.util.Arrays;
+import java.util.List;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentMatchers;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class AuxiliaryFileServiceBeanTest {
+
+    EntityManager em;
+    AuxiliaryFileServiceBean svc;
+    TypedQuery<String> query;
+    List<String> types;
+    DataFile dataFile;
+
+    @BeforeEach
+    public void setup() {
+        svc = new AuxiliaryFileServiceBean();
+        svc.em = mock(EntityManager.class);
+        query = mock(TypedQuery.class);
+        types = Arrays.asList("DP", "GEOSPATIAL", "NEXT_BIG_THING", "FUTURE_FUN");
+        dataFile = new DataFile();
+        dataFile.setId(42l);
+    }
+
+    @Test
+    public void testFindAuxiliaryFileTypesInBundleFalse() {
+        System.out.println("testFindAuxiliaryFileTypesInBundleFalse");
+        boolean inBundle = false;
+        when(this.svc.em.createNamedQuery(ArgumentMatchers.anyString(),ArgumentMatchers.<Class<String>>any())).thenReturn(query);
+        when(query.getResultList()).thenReturn(types);
+        List<String> result = svc.findAuxiliaryFileTypes(dataFile, inBundle);
+        // None of these are in the bundle.
+        List<String> expected = Arrays.asList("GEOSPATIAL", "NEXT_BIG_THING", "FUTURE_FUN");
+        assertEquals(expected, result);
+    }
+
+    @Test
+    public void testFindAuxiliaryFileTypesInBundleTrue() {
+        System.out.println("testFindAuxiliaryFileTypesInBundleTrue");
+        boolean inBundle = true;
+        when(this.svc.em.createNamedQuery(ArgumentMatchers.anyString(),ArgumentMatchers.<Class<String>>any())).thenReturn(query);
+        when(query.getResultList()).thenReturn(types);
+        List<String> result = svc.findAuxiliaryFileTypes(dataFile, inBundle);
+        // DP is in the bundle.
+        List<String> expected = Arrays.asList("DP");
+        assertEquals(expected, result);
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/CartTest.java b/src/test/java/edu/harvard/iq/dataverse/CartTest.java
index 7b7ea3331a9..e847cfb3346 100644
--- a/src/test/java/edu/harvard/iq/dataverse/CartTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/CartTest.java
@@ -1,15 +1,15 @@
 package edu.harvard.iq.dataverse;
 
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.util.List;
 import java.util.Map.Entry;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class CartTest {
 
@@ -17,14 +17,14 @@ public class CartTest {
     private String title;
     private String persistentId;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         this.cart = new Cart();
         this.title = "title";
         this.persistentId = "persistentId";
     }
 
-    @After
+    @AfterEach
     public void tearDwon() {
         this.cart = null;
         this.title = null;
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java b/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java
index a2abf573e46..25831992dbd 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java
@@ -1,24 +1,51 @@
 package edu.harvard.iq.dataverse;
 
-import org.apache.commons.lang.StringUtils;
-import org.junit.Test;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.branding.BrandingUtilTest;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.xmlunit.assertj3.XmlAssert;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
-import static junit.framework.TestCase.assertNull;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * Testing DataCitation class
  * @author pkiraly@gwdg.de
  */
 public class DataCitationTest {
-
+    
+    /**
+     * This test relies on {@link BrandingUtil}. We need to provide mocks for it.
+     */
+    @BeforeAll
+    static void setup() {
+        BrandingUtilTest.setupMocks();
+    }
+    /**
+     * After this test is done, the mocks should be turned of
+     * (so we keep atomicity and no one relies on them being present).
+     */
+    @AfterAll
+    static void tearDown() {
+        BrandingUtilTest.tearDownMocks();
+    }
+    
     /**
      * Test the public properties of DataCitation class via their getters
      * @throws ParseException
@@ -72,7 +99,7 @@ public void testWriteAsBibtexCitation() throws ParseException, IOException {
                 "@data{LK0D1H_1955,\r\n"
                 + "author = {First Last},\r\n"
                 + "publisher = {LibraScholar},\r\n"
-                + "title = \"{Dataset Title}\",\r\n"
+                + "title = {{Dataset Title}},\r\n"
                 + "year = {1955},\r\n"
                 + "version = {V1},\r\n"
                 + "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -95,7 +122,7 @@ public void testToBibtexString() throws ParseException {
                 "@data{LK0D1H_1955,\r\n"
                 + "author = {First Last},\r\n"
                 + "publisher = {LibraScholar},\r\n"
-                + "title = \"{Dataset Title}\",\r\n"
+                + "title = {{Dataset Title}},\r\n"
                 + "year = {1955},\r\n"
                 + "version = {V1},\r\n"
                 + "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -119,7 +146,7 @@ public void testToBibtexString_withoutAuthor() throws ParseException {
                 "@data{LK0D1H_1955,\r\n"
                 + "author = {},\r\n"
                 + "publisher = {LibraScholar},\r\n"
-                + "title = \"{Dataset Title}\",\r\n"
+                + "title = {{Dataset Title}},\r\n"
                 + "year = {1955},\r\n"
                 + "version = {V1},\r\n"
                 + "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -144,7 +171,7 @@ public void testToBibtexString_withoutTitle() throws ParseException {
                 "@data{LK0D1H_1955,\r\n"
                 + "author = {First Last},\r\n"
                 + "publisher = {LibraScholar},\r\n"
-                + "title = \"{}\",\r\n"
+                + "title = {{}},\r\n"
                 + "year = {1955},\r\n"
                 + "version = {V1},\r\n"
                 + "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -169,7 +196,7 @@ public void testToBibtexString_withoutTitleAndAuthor() throws ParseException {
                 "@data{LK0D1H_1955,\r\n"
                 + "author = {},\r\n"
                 + "publisher = {LibraScholar},\r\n"
-                + "title = \"{}\",\r\n"
+                + "title = {{}},\r\n"
                 + "year = {1955},\r\n"
                 + "version = {V1},\r\n"
                 + "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -225,27 +252,29 @@ public void testToRISString_withoutTitleAndAuthor() throws ParseException {
     public void testToEndNoteString_withTitleAndAuthor() throws ParseException {
         DatasetVersion datasetVersion = createATestDatasetVersion("Dataset Title", true);
         DataCitation dataCitation = new DataCitation(datasetVersion);
-        assertEquals(
-           "<?xml version='1.0' encoding='UTF-8'?>" +
-           "<xml>" +
-           "<records>" +
-           "<record>" +
-           "<ref-type name=\"Dataset\">59</ref-type>" +
-           "<contributors>" +
-           "<authors><author>First Last</author></authors>" +
-           "</contributors>" +
-           "<titles><title>Dataset Title</title></titles>" +
-           "<section>1955-11-05</section>" +
-           "<dates><year>1955</year></dates>" +
-           "<edition>V1</edition>" +
-           "<publisher>LibraScholar</publisher>" +
-           "<urls><related-urls><url>https://doi.org/10.5072/FK2/LK0D1H</url></related-urls></urls>" +
-           "<electronic-resource-num>doi/10.5072/FK2/LK0D1H</electronic-resource-num>" +
-           "</record>" +
-           "</records>" +
-           "</xml>",
-           dataCitation.toEndNoteString()
-        );
+        String expected = "<?xml version='1.0' encoding='UTF-8'?>" +
+            "<xml>" +
+            "<records>" +
+            "<record>" +
+            "<ref-type name=\"Dataset\">59</ref-type>" +
+            "<contributors>" +
+            "<authors><author>First Last</author></authors>" +
+            "</contributors>" +
+            "<titles><title>Dataset Title</title></titles>" +
+            "<section>1955-11-05</section>" +
+            "<dates><year>1955</year></dates>" +
+            "<edition>V1</edition>" +
+            "<publisher>LibraScholar</publisher>" +
+            "<urls><related-urls><url>https://doi.org/10.5072/FK2/LK0D1H</url></related-urls></urls>" +
+            "<electronic-resource-num>10.5072/FK2/LK0D1H</electronic-resource-num>" +
+            "</record>" +
+            "</records>" +
+            "</xml>";
+    
+        // similar = the content of the nodes in the documents are the same, but minor differences exist
+        //           e.g. sequencing of sibling elements, values of namespace prefixes, use of implied attribute values
+        // https://www.xmlunit.org/api/java/2.8.2/org/custommonkey/xmlunit/Diff.html
+        XmlAssert.assertThat(dataCitation.toEndNoteString()).and(expected).areSimilar();
     }
 
     @Test
@@ -253,7 +282,7 @@ public void testToEndNoteString_withoutTitleAndAuthor() throws ParseException {
         String nullDatasetTitle = null;
         DatasetVersion datasetVersion = createATestDatasetVersion(nullDatasetTitle, false);
         DataCitation dataCitation = new DataCitation(datasetVersion);
-        assertEquals(
+        String expected =
            "<?xml version='1.0' encoding='UTF-8'?>" +
            "<xml>" +
            "<records>" +
@@ -266,12 +295,15 @@ public void testToEndNoteString_withoutTitleAndAuthor() throws ParseException {
            "<edition>V1</edition>" +
            "<publisher>LibraScholar</publisher>" +
            "<urls><related-urls><url>https://doi.org/10.5072/FK2/LK0D1H</url></related-urls></urls>" +
-           "<electronic-resource-num>doi/10.5072/FK2/LK0D1H</electronic-resource-num>" +
+           "<electronic-resource-num>10.5072/FK2/LK0D1H</electronic-resource-num>" +
            "</record>" +
            "</records>" +
-           "</xml>",
-           dataCitation.toEndNoteString()
-        );
+           "</xml>";
+    
+        // similar = the content of the nodes in the documents are the same, but minor differences exist
+        //           e.g. sequencing of sibling elements, values of namespace prefixes, use of implied attribute values
+        // https://www.xmlunit.org/api/java/2.8.2/org/custommonkey/xmlunit/Diff.html
+        XmlAssert.assertThat(dataCitation.toEndNoteString()).and(expected).areSimilar();
     }
 
     @Test
@@ -335,7 +367,7 @@ public void testTitleWithQuotes() throws ParseException {
                 "@data{LK0D1H_1955,\r\n"
                 + "author = {First Last},\r\n"
                 + "publisher = {LibraScholar},\r\n"
-                + "title = \"{This Title ``Has Quotes'' In It}\",\r\n"
+                + "title = {{This Title ``Has Quotes'' In It}},\r\n"
                 + "year = {1955},\r\n"
                 + "version = {V1},\r\n"
                 + "doi = {10.5072/FK2/LK0D1H},\r\n"
@@ -346,7 +378,38 @@ public void testTitleWithQuotes() throws ParseException {
 
     }
 
+    @Test
+    public void testFileCitationToStringHtml() throws ParseException {
+        DatasetVersion dsv = createATestDatasetVersion("Dataset Title", true);
+        FileMetadata fileMetadata = new FileMetadata();
+        fileMetadata.setLabel("foo.txt");
+        fileMetadata.setDataFile(new DataFile());
+        dsv.setVersionState(DatasetVersion.VersionState.RELEASED);
+        fileMetadata.setDatasetVersion(dsv);
+        dsv.setDataset(dsv.getDataset());
+        DataCitation fileCitation = new DataCitation(fileMetadata, false);
+        assertEquals("First Last, 1955, \"Dataset Title\", <a href=\"https://doi.org/10.5072/FK2/LK0D1H\" target=\"_blank\">https://doi.org/10.5072/FK2/LK0D1H</a>, LibraScholar, V1; foo.txt [fileName]", fileCitation.toString(true));
+    }
+
+    @Test
+    public void testFileCitationToStringHtmlFilePid() throws ParseException {
+        DatasetVersion dsv = createATestDatasetVersion("Dataset Title", true);
+        FileMetadata fileMetadata = new FileMetadata();
+        fileMetadata.setLabel("foo.txt");
+        DataFile dataFile = new DataFile();
+        dataFile.setProtocol("doi");
+        dataFile.setAuthority("10.42");
+        dataFile.setIdentifier("myFilePid");
+        fileMetadata.setDataFile(dataFile);
+        dsv.setVersionState(DatasetVersion.VersionState.RELEASED);
+        fileMetadata.setDatasetVersion(dsv);
+        dsv.setDataset(dsv.getDataset());
+        DataCitation fileCitation = new DataCitation(fileMetadata, true);
+        assertEquals("First Last, 1955, \"foo.txt\", <em>Dataset Title</em>, <a href=\"https://doi.org/10.42/myFilePid\" target=\"_blank\">https://doi.org/10.42/myFilePid</a>, LibraScholar, V1", fileCitation.toString(true));
+    }
+
     private DatasetVersion createATestDatasetVersion(String withTitle, boolean withAuthor) throws ParseException {
+        
         Dataverse dataverse = new Dataverse();
         dataverse.setName("LibraScholar");
 
@@ -367,6 +430,7 @@ private DatasetVersion createATestDatasetVersion(String withTitle, boolean withA
             fields.add(createTitleField(withTitle));
         }
         if (withAuthor) {
+            // TODO: "Last, First" would make more sense.
             fields.add(createAuthorField("First Last"));
         }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataFileCategoryServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/DataFileCategoryServiceBeanTest.java
new file mode 100644
index 00000000000..53add343f4f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DataFileCategoryServiceBeanTest.java
@@ -0,0 +1,157 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 
+ * @author adaybujeda
+ */
+@ExtendWith(MockitoExtension.class)
+public class DataFileCategoryServiceBeanTest {
+
+    @Mock
+    private SettingsServiceBean settingsServiceBean;
+    @InjectMocks
+    private DataFileCategoryServiceBean target;
+
+    @Test
+    public void getFileCategories_should_return_default_file_categories_in_expected_order_when_no_override_configured() {
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn(null);
+
+        List<String> result = target.getFileCategories();
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(3));
+        MatcherAssert.assertThat(result.get(0), Matchers.is("Documentation"));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("Data"));
+        MatcherAssert.assertThat(result.get(2), Matchers.is("Code"));
+    }
+
+    @Test
+    public void getFileCategories_should_return_default_file_categories_in_expected_order_when_empty_override_is_configured() {
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn("  ");
+
+        List<String> result = target.getFileCategories();
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(3));
+        MatcherAssert.assertThat(result.get(0), Matchers.is("Documentation"));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("Data"));
+        MatcherAssert.assertThat(result.get(2), Matchers.is("Code"));
+    }
+
+    @Test
+    public void getFileCategories_should_return_override_file_categories_from_settings_service() {
+        setup_override("Override01, Override02");
+
+        List<String> result = target.getFileCategories();
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(2));
+        MatcherAssert.assertThat(result.get(0), Matchers.is("Override01"));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("Override02"));
+    }
+
+    @Test
+    public void getFileCategories_should_trim_override_values() {
+        setup_override(" Test Value 01  , Test Value 02  ");
+
+        List<String> result = target.getFileCategories();
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(2));
+        MatcherAssert.assertThat(result.get(0), Matchers.is("Test Value 01"));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("Test Value 02"));
+    }
+
+    @Test
+    public void getFileCategories_should_ignore_empty_override_values() {
+        setup_override(",value01,,value02,,value03,,");
+
+        List<String> result = target.getFileCategories();
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(3));
+        MatcherAssert.assertThat(result.get(0), Matchers.is("value01"));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("value02"));
+        MatcherAssert.assertThat(result.get(2), Matchers.is("value03"));
+    }
+
+    @Test
+    public void mergeDatasetFileCategories_should_handle_null_datafile_categories() {
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn(null);
+
+        List<String> result = target.mergeDatasetFileCategories(null);
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(3));
+        MatcherAssert.assertThat(result.get(0), Matchers.is("Documentation"));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("Data"));
+        MatcherAssert.assertThat(result.get(2), Matchers.is("Code"));
+    }
+
+    @Test
+    public void mergeDatasetFileCategories_should_add_dataset_values_first_then_default_categories() {
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn(null);
+
+        List<String> result = target.mergeDatasetFileCategories(setup_data_file_categories("dataset01", "dataset02"));
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(5));
+        MatcherAssert.assertThat(result.get(0), Matchers.is("dataset01"));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("dataset02"));
+        MatcherAssert.assertThat(result.get(2), Matchers.is("Documentation"));
+        MatcherAssert.assertThat(result.get(3), Matchers.is("Data"));
+        MatcherAssert.assertThat(result.get(4), Matchers.is("Code"));
+    }
+
+    @Test
+    public void mergeDatasetFileCategories_should_add_dataset_values_first_then_override_categories() {
+        setup_override("override01, override02");
+
+        List<String> result = target.mergeDatasetFileCategories(setup_data_file_categories("dataset01", "dataset02"));
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(4));
+        MatcherAssert.assertThat(result.get(0), Matchers.is("dataset01"));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("dataset02"));
+        MatcherAssert.assertThat(result.get(2), Matchers.is("override01"));
+        MatcherAssert.assertThat(result.get(3), Matchers.is("override02"));
+    }
+
+    @Test
+    public void mergeDatasetFileCategories_should_ignore_duplicates() {
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn(null);
+
+        List<String> result = target.mergeDatasetFileCategories(setup_data_file_categories("Code", "Data", "Custom"));
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(4));
+        MatcherAssert.assertThat(result.get(0), Matchers.is("Code"));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("Data"));
+        MatcherAssert.assertThat(result.get(2), Matchers.is("Custom"));
+        MatcherAssert.assertThat(result.get(3), Matchers.is("Documentation"));
+    }
+
+    private void setup_override(String overrideValue) {
+        String currentLang = BundleUtil.getCurrentLocale().getLanguage();
+
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn(overrideValue);
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY, currentLang, overrideValue)).thenReturn(overrideValue);
+    }
+
+    private List<DataFileCategory> setup_data_file_categories(String... names) {
+        return Arrays.stream(names).map(name -> {
+            DataFileCategory dataFileCategory = new DataFileCategory();
+            dataFileCategory.setName(name);
+            return dataFileCategory;
+        }).collect(Collectors.toList());
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataFileServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/DataFileServiceBeanTest.java
index 136916cf449..ab3d0f8ef55 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DataFileServiceBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DataFileServiceBeanTest.java
@@ -1,8 +1,9 @@
 package edu.harvard.iq.dataverse;
 
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Test that the DataFileServiceBean classifies DataFiles correctly.
@@ -27,7 +28,7 @@ public DataFileServiceBeanTest() {
     private DataFileServiceBean dataFileServiceBean;
             
     
-    @Before
+    @BeforeEach
     public void setUp() {
         fileWoContentType = createDataFile(null);
         fileWithBogusContentType = createDataFile("foo/bar");
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetAuthorTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetAuthorTest.java
index 5b943448fca..fa225de18ba 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DatasetAuthorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetAuthorTest.java
@@ -1,42 +1,26 @@
 package edu.harvard.iq.dataverse;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
-import java.util.Arrays;
-import java.util.Collection;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
 public class DatasetAuthorTest {
 
-    public String idType;
-    public String idValue;
-    public String expectedIdentifierAsUrl;
-
-    public DatasetAuthorTest(String idType, String idValue, String expectedIdentifierAsUrl) {
-        this.idType = idType;
-        this.idValue = idValue;
-        this.expectedIdentifierAsUrl = expectedIdentifierAsUrl;
-    }
-
-    @Parameters
-    public static Collection<String[]> parameters() {
-        return Arrays.asList(new String[][] {
-            { "ORCID", "0000-0002-1825-0097", "https://orcid.org/0000-0002-1825-0097" },
-            { "ISNI", "0000000121032683", "http://www.isni.org/isni/0000000121032683"},
-            { "LCNA", "n82058243", "http://id.loc.gov/authorities/names/n82058243" },
-            { "VIAF", "172389567", "https://viaf.org/viaf/172389567" },
-            { "GND", "4079154-3", "https://d-nb.info/gnd/4079154-3" },
-            { null, null, null, },
-        });
-    }
-
-    @Test
-    public void getIdentifierAsUrl() {
+    @ParameterizedTest
+    @CsvSource(value = {
+        "ORCID,0000-0002-1825-0097,https://orcid.org/0000-0002-1825-0097",
+        "ISNI,0000000121032683,http://www.isni.org/isni/0000000121032683",
+        "LCNA,n82058243,http://id.loc.gov/authorities/names/n82058243",
+        "VIAF,172389567,https://viaf.org/viaf/172389567",
+        "GND,4079154-3,https://d-nb.info/gnd/4079154-3",
+        "ResearcherID,634082,https://publons.com/researcher/634082/",
+        "ResearcherID,AAW-9289-2021,https://publons.com/researcher/AAW-9289-2021/",
+        "ResearcherID,J-9733-2013,https://publons.com/researcher/J-9733-2013/",
+        "ScopusID,6602344670,https://www.scopus.com/authid/detail.uri?authorId=6602344670",
+        "NULL,NULL,NULL"
+    }, nullValues = "NULL")
+    void getIdentifierAsUrl(String idType, String idValue, String expectedIdentifierAsUrl) {
         DatasetAuthor datasetAuthor = new DatasetAuthor();
         if (idType !=null && idValue != null) {
             datasetAuthor.setIdType(idType);
@@ -44,5 +28,4 @@ public void getIdentifierAsUrl() {
         }
         assertEquals(expectedIdentifierAsUrl, datasetAuthor.getIdentifierAsUrl());
     }
-
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValueTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValueTest.java
new file mode 100644
index 00000000000..999fadaae06
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValueTest.java
@@ -0,0 +1,47 @@
+package edu.harvard.iq.dataverse;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public class DatasetFieldDefaultValueTest {
+    private DatasetFieldDefaultValue dataverseContact;
+
+    @BeforeEach
+    public void before() {
+        this.dataverseContact = new DatasetFieldDefaultValue();
+        this.dataverseContact.setId(1L);
+    }
+
+    @Test
+    public void testEqualsWithNull() {
+        assertFalse(this.dataverseContact.equals(null));
+    }
+
+    @Test
+    public void testEqualsWithDifferentClass() {
+        DatasetField datasetField = new DatasetField();
+
+        assertFalse(this.dataverseContact.equals(datasetField));
+    }
+
+    @Test
+    public void testEqualsWithSameClassSameId() {
+        DatasetFieldDefaultValue dataverseContact1 = new DatasetFieldDefaultValue();
+        dataverseContact1.setId(1L);
+
+        assertTrue(this.dataverseContact.equals(dataverseContact1));
+    }
+
+    @Test
+    public void testEqualsWithSameClassDifferentId() {
+        DatasetFieldDefaultValue dataverseContact1 = new DatasetFieldDefaultValue();
+        dataverseContact1.setId(2L);
+
+        assertFalse(this.dataverseContact.equals(dataverseContact1));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldServiceBeanFilterResponseTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldServiceBeanFilterResponseTest.java
new file mode 100644
index 00000000000..5a20188bbab
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldServiceBeanFilterResponseTest.java
@@ -0,0 +1,292 @@
+package edu.harvard.iq.dataverse;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DatasetFieldServiceBeanFilterResponseTest {
+
+    private DatasetFieldServiceBean datasetFieldServiceBean;
+
+    @BeforeEach
+    void setUp() {
+        this.datasetFieldServiceBean = new DatasetFieldServiceBean();
+
+// for debugging purposes
+//
+//        Logger rootLogger = Logger.getLogger(DatasetFieldServiceBean.class.getCanonicalName());
+//        rootLogger.setLevel(Level.FINE);
+//
+//        // Ensure all handlers respect the FINE level
+//        for (var handler : rootLogger.getHandlers()) {
+//            handler.setLevel(Level.FINE);
+//        }
+//
+//        // Add a ConsoleHandler if none exists
+//        if (rootLogger.getHandlers().length == 0) {
+//            ConsoleHandler consoleHandler = new ConsoleHandler();
+//            rootLogger.addHandler(consoleHandler);
+//        }
+    }
+
+    @AfterEach
+    void tearDown() {
+      this.datasetFieldServiceBean = null;
+    }
+
+    @Test
+    void audience() throws Exception {
+        String termURI = "https://www.narcis.nl/classification/D13700";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/audience.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/audience.json");
+        // https://vocabs.datastations.nl/NARCIS/en/page/D13700
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(getValue("nl", result.get("vocabularyName"))).startsWith("Classificatiecodes van de wetenschapsportal Narcis (www.narcis.nl).");
+        assertThat(getValue("nl", result.get("termName"))).startsWith("Theoretische chemie, kwantumchemie");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void collection() throws Exception {
+        String termURI = "https://vocabularies.dans.knaw.nl/collections/archaeology/ArcheoDepot";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/collection.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/collection.json");
+        // https://vocabs.datastations.nl/rest/v1/DansCollections/data?uri=https://vocabularies.dans.knaw.nl/collections/archaeology/ArcheoDepot&format=application/json
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(getValue("nl", result.get("vocabularyName"))).isEqualTo("DansCollections");
+        assertThat(getValue("nl", result.get("termName"))).isEqualTo("ArcheoDepot");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void aatClassification() throws Exception {
+        String termURI = "http://vocab.getty.edu/aat/300187008";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/AATClassification.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/AATClassification.json");
+        // https://vocabs.datastations.nl/AATC/en/page/300187008
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(getValue("en", result.get("vocabularyName"))).isEqualTo("The Art and Architecture Thesaurus Concepts");
+        assertThat(getValue("nl", result.get("termName"))).isEqualTo("Abnakee kleden");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void abrPeriod() throws Exception {
+        String termURI = "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/abrPeriod.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/abrPeriod.json");
+        // https://vocabs.datastations.nl/ABR/en/page/?uri=https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f&clang=nl
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("ABR perioden");
+        assertThat(getValue("nl", result.get("termName"))).isEqualTo("Vroege Middeleeuwen D");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void abrArtifact() throws Exception {
+        String termURI = "https://data.cultureelerfgoed.nl/term/id/abr/db8feb21-8ddc-432f-8062-a3a15f7f7cf4";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/abrArtifact.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/abrArtifact.json");
+        // https://vocabs.datastations.nl/ABR/en/page/?uri=https://data.cultureelerfgoed.nl/term/id/abr/db8feb21-8ddc-432f-8062-a3a15f7f7cf4&clang=nl
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("ABR artifact");
+        assertThat(getValue("nl", result.get("termName"))).isEqualTo("steen");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void abrVerwervingswijze() throws Exception {
+        String termURI = "https://data.cultureelerfgoed.nl/term/id/abr/b7f4fe13-d7b4-4fb9-a7a8-c25ef74b612d";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/abrVerwervingswijze.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/abrVerwervingswijze.json");
+        // https://vocabs.datastations.nl/ABR/en/page/?uri=https://data.cultureelerfgoed.nl/term/id/abr/e06a84fa-62e8-42ff-8f38-0ddfe9485a15&clang=nl
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("ABR verwervingswijzen");
+        assertThat(getValue("nl", result.get("termName"))).isEqualTo("archeologisch: booronderzoek");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void abrRapportType() throws Exception {
+        String termURI = "https://data.cultureelerfgoed.nl/term/id/abr/5701cb3d-0ffd-4663-98e0-fab808448109";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/abrRapportType.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/abrRapportType.json");
+        // https://vocabs.datastations.nl/ABR/en/page/?uri=https://data.cultureelerfgoed.nl/term/id/abr/5701cb3d-0ffd-4663-98e0-fab808448109
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("ABR rapporten");
+        assertThat(getValue("nl", result.get("termName"))).isEqualTo("Achterhoekse Archeologische Publicaties");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void abrComplex() throws Exception {
+        String termURI = "https://data.cultureelerfgoed.nl/term/id/abr/1b5b4dd1-f4f8-4e4c-9108-a6fb2c606cde";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/abrComplex.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/abrComplex.json");
+        // https://vocabs.datastations.nl/ABR/en/page/?uri=https://data.cultureelerfgoed.nl/term/id/abr/1b5b4dd1-f4f8-4e4c-9108-a6fb2c606cde
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("ABR complextypen");
+        assertThat(getValue("nl", result.get("termName"))).isEqualTo("(ring)walburg");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void cessda() throws Exception {
+        String termURI = "https://vocabularies.cessda.eu/vocabulary/TopicClassification?v=4.2#TradeIndustryAndMarkets.AgricultureAndRuralIndustry";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/cessdaClassification.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/cessdaClassification.json");
+        // https://vocabs.datastations.nl/TopicClassification_4_2/en/page/?uri=https://vocabularies.cessda.eu/vocabulary/TopicClassification?v=4.2#TradeIndustryAndRuralIndustry
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("CESSDA Topis classification 4.2");
+        assertThat(getValue("en", result.get("termName"))).isEqualTo("Agriculture and rural industry");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void collectionMode() throws Exception {
+        String termURI = "http://rdf-vocabulary.ddialliance.org/cv/ModeOfCollection/4.0/#AutomatedDataExtraction.WebScraping";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/collectionMode.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/collectionMode.json");
+        // https://vocabs.datastations.nl/ModeOfCollection_4_0/en/page/?uri=http://rdf-vocabulary.ddialliance.org/cv/ModeOfCollection/4.0/#AutomatedDataExtraction.WebScraping
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("DDI Alliance Controlled Vocabulary for Analysis Unit 2.1");
+        assertThat(getValue("en", result.get("termName"))).isEqualTo("Automated data extraction: Web scraping");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void elsstClassification() throws Exception {
+        String termURI = "https://elsst.cessda.eu/id/4/bf0d664a-e89a-4ec3-80d2-04f664b359ab";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/elsstClassification.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/elsstClassification.json");
+        // https://vocabs.datastations.nl/ELSST_R4/en/page/bf0d664a-e89a-4ec3-80d2-04f664b359ab
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("ELSST Thesaurus Version 4");
+        assertThat(getValue("nl", result.get("termName"))).isEqualTo("ACADEMISCHE VAARDIGHEDEN");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void researchInstrument() throws Exception {
+        String termURI = "http://rdf-vocabulary.ddialliance.org/cv/TypeOfInstrument/1.1/#Questionnaire.Semistructured";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/researchInstrument.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/researchInstrument.json");
+        // https://vocabs.datastations.nl/TypeOfInstrument_1_1/en/page/?uri=http://rdf-vocabulary.ddialliance.org/cv/TypeOfInstrument/1.1/#Questionnaire.Semistructured
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("DDI Alliance Controlled Vocabulary for Type of Instrument 1.1");
+        assertThat(getValue("en", result.get("termName"))).isEqualTo("Semi-structured questionnaire");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void samplingProcedureCV() throws Exception {
+        String termURI = "http://rdf-vocabulary.ddialliance.org/cv/SamplingProcedure/1.1/#MixedProbabilityNonprobability";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/samplingProcedureCV.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/samplingProcedureCV.json");
+        // https://vocabs.datastations.nl/SamplingProcedure_1_1/en/page/?uri=http://rdf-vocabulary.ddialliance.org/cv/SamplingProcedure/1.1/#MixedProbabilityNonprobability
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("DDI Alliance Controlled Vocabulary for Sampling Procedure 1.1");
+        assertThat(getValue("en", result.get("termName"))).isEqualTo("Mixed probability and non-probability");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void timeMethod() throws Exception {
+        String termURI = "http://rdf-vocabulary.ddialliance.org/cv/TimeMethod/1.2/#TimeSeries.Discrete";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/timeMethod.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/timeMethod.json");
+        // https://vocabs.datastations.nl/TimeMethod_1_2/en/page/?uri=http://rdf-vocabulary.ddialliance.org/cv/TimeMethod/1.2/#TimeSeries.Discrete
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("DDI Alliance Controlled Vocabulary for Time Method 1.2");
+        assertThat(getValue("en", result.get("termName"))).isEqualTo("Time series: Discrete");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    @Test
+    void unitOfAnalysis() throws Exception {
+        String termURI = "http://rdf-vocabulary.ddialliance.org/cv/AnalysisUnit/2.1/#EventOrProcessOrActivity";
+        JsonObject cvocEntry = readObject("src/test/resources/json/cvoc-dans-config/unitOfAnalysys.json");
+        JsonObject readObject = readObject("src/test/resources/json/cvoc-dans-value/unitOfAnalysis.json");
+        // https://vocabs.datastations.nl/AnalysisUnit_2_1/en/page/?uri=http://rdf-vocabulary.ddialliance.org/cv/AnalysisUnit/2.1/#EventOrProcessOrActivity
+
+        JsonObject result = callFilterResponse(cvocEntry, readObject, termURI);
+        assertThat(result.getString("@id")).isEqualTo(termURI);
+        assertThat(result.getString("vocabularyName")).isEqualTo("DDI Alliance Controlled Vocabulary for Analysis Unit 2.1");
+        assertThat(getValue("en", result.get("termName"))).isEqualTo("Event/Process/Activity");
+        assertThat(result.keySet()).containsExactlyInAnyOrder("@id", "termName", "vocabularyUri", "vocabularyName");
+    }
+
+    private String getValue(String nl, JsonValue values) {
+        if (values instanceof JsonArray) {
+            for (var item : (JsonArray) values) {
+                JsonObject obj = item.asJsonObject();
+                if (nl.equals(obj.getString("lang", ""))) {
+                    return obj.getString("value");
+                }
+            }
+        } else if (values instanceof JsonObject obj) {
+            if (nl.equals(obj.getString("lang", ""))) {
+                return obj.getString("value");
+            }
+        }
+        return null; // Return null if no match is found
+    }
+
+    private JsonObject readObject(String pathname) throws FileNotFoundException {
+        var reader = new FileReader(pathname);
+        return Json.createReader(reader).readObject();
+    }
+
+    private @NotNull JsonObject callFilterResponse(JsonObject cvocEntry, JsonObject readObject, String termURI) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        Method filterResponseMethod = DatasetFieldServiceBean.class.getDeclaredMethod("filterResponse", JsonObject.class, JsonObject.class, String.class);
+        filterResponseMethod.setAccessible(true);
+        return (JsonObject) filterResponseMethod.invoke(datasetFieldServiceBean, cvocEntry, readObject, termURI);
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldServiceBeanTest.java
new file mode 100644
index 00000000000..873d417131d
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldServiceBeanTest.java
@@ -0,0 +1,179 @@
+package edu.harvard.iq.dataverse;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.Set;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.AdditionalMatchers;
+import org.mockito.Mockito;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+
+public class DatasetFieldServiceBeanTest {
+
+    private DatasetFieldServiceBean datasetFieldServiceBean;
+
+    static String getCvocJson(String pathToJsonFile) throws IOException {
+        final File datasetVersionJson = new File(pathToJsonFile);
+        return new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
+    }
+
+    @BeforeEach
+    void setUp() {
+      this.datasetFieldServiceBean = Mockito.spy(new DatasetFieldServiceBean());
+    }
+
+    @AfterEach
+    void tearDown() {
+      this.datasetFieldServiceBean = null;
+    }
+
+    @Test
+    void getIndexableStringsByTermUriSkosmos() throws IOException {
+        String fieldName = "keyword";
+        String termURI = "http://aims.fao.org/aos/agrovoc/c_2389";
+
+        JsonObject cvocEntry = prepare(fieldName, "src/test/resources/json/cvoc-skosmos.json");
+
+        JsonObject getExtVocabValueReturnedValue = Json.createObjectBuilder()
+                .add("@id", termURI)
+                .add("termName", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("lang", "fr")
+                                .add("value", "faux bourdon"))
+                        .add(Json.createObjectBuilder()
+                                .add("lang", "en")
+                                .add("value", "drone (insects)")))
+                .add("vocabularyUri", "http://aims.fao.org/aos/agrovoc")
+                .add("synonyms", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("lang", "fr")
+                                .add("value", "Abeille mÃĸle"))
+                        .add(Json.createObjectBuilder()
+                                .add("lang", "en")
+                                .add("value", "drone honey bees")))
+                .add("genericTerm", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("lang", "fr")
+                                .add("value", "Colonie d'abeilles"))
+                        .add(Json.createObjectBuilder()
+                                .add("lang", "en")
+                                .add("value", "bee colonies")))
+                .build();
+        Mockito.doReturn(getExtVocabValueReturnedValue).when(datasetFieldServiceBean).getExternalVocabularyValue(termURI);
+        Mockito.doReturn(null).when(datasetFieldServiceBean).getExternalVocabularyValue(AdditionalMatchers.not(Mockito.eq(termURI)));
+
+        // keywordTermURL
+        Set<String> result = datasetFieldServiceBean.getIndexableStringsByTermUri(termURI, cvocEntry, "keywordTermURL");
+        assertEquals(Set.of("faux bourdon", "drone (insects)"), result);
+
+        // keywordValue
+        result = datasetFieldServiceBean.getIndexableStringsByTermUri(termURI, cvocEntry, "keywordValue");
+        assertEquals(Collections.emptySet(), result, "Only 'keywordTermURL' must return values for Skosmos");
+
+        // Any others field
+        result = datasetFieldServiceBean.getIndexableStringsByTermUri(termURI, cvocEntry, "");
+        assertEquals(Collections.emptySet(), result, "Only 'keywordTermURL' must return values for Skosmos");
+
+        // Another termURI not in database
+        result = datasetFieldServiceBean.getIndexableStringsByTermUri("http://example.org/uuid", cvocEntry, "keywordTermURL");
+        assertEquals(Collections.emptySet(), result);
+    }
+
+    @Test
+    void getIndexableStringsByTermUriAgroportal() throws IOException {
+        String fieldName = "keyword";
+        String termURI = "http://aims.fao.org/aos/agrovoc/c_50265";
+
+        JsonObject cvocEntry = prepare(fieldName, "src/test/resources/json/cvoc-agroportal.json");
+
+        JsonObject getExtVocabValueReturnedValue = Json.createObjectBuilder()
+                .add("@id", termURI)
+                .add("termName", Json.createObjectBuilder()
+                        .add("fr", "association de quartier")
+                        .add("en", "neighborhood associations"))
+                .add("vocabularyName", "https://data.agroportal.lirmm.fr/ontologies/AGROVOC")
+                .add("vocabularyUri", "https://data.agroportal.lirmm.fr/ontologies/AGROVOC")
+                .add("synonyms", Json.createObjectBuilder()
+                        .add("en", Json.createArrayBuilder().add("neighborhood societies")))
+                .build();
+        Mockito.doReturn(getExtVocabValueReturnedValue).when(datasetFieldServiceBean).getExternalVocabularyValue(termURI);
+        Mockito.doReturn(null).when(datasetFieldServiceBean).getExternalVocabularyValue(AdditionalMatchers.not(Mockito.eq(termURI)));
+
+        // keywordValue
+        Set<String> result = datasetFieldServiceBean.getIndexableStringsByTermUri(termURI, cvocEntry, "keywordValue");
+        assertEquals(Set.of("association de quartier", "neighborhood associations", "neighborhood societies"), result);
+
+        // keywordTermURL
+        result = datasetFieldServiceBean.getIndexableStringsByTermUri(termURI, cvocEntry, "keywordTermURL");
+        assertEquals(Collections.emptySet(), result, "Only 'keywordValue' must return values for Agroportal");
+
+        // Any others field
+        result = datasetFieldServiceBean.getIndexableStringsByTermUri(termURI, cvocEntry, "");
+        assertEquals(Collections.emptySet(), result, "Only 'keywordValue' must return values for Agroportal");
+
+        // Another termURI not in database
+        result = datasetFieldServiceBean.getIndexableStringsByTermUri("http://example.org/uuid", cvocEntry, "keywordValue");
+        assertEquals(Collections.emptySet(), result);
+    }
+
+    @Test
+    void getIndexableStringsByTermUriOrcid() throws IOException {
+        String fieldName = "creator";
+        String termURI = "https://orcid.org/0000-0003-4217-153X";
+
+        JsonObject cvocEntry = prepare(fieldName, "src/test/resources/json/cvoc-orcid.json");
+
+        JsonObject getExtVocabValueReturnedValue = Json.createObjectBuilder()
+                .add("@id", termURI)
+                .add("scheme", "ORCID")
+                .add("@type", "https://schema.org/Person")
+                .add("personName", "Doe, John")
+                .build();
+        Mockito.doReturn(getExtVocabValueReturnedValue).when(datasetFieldServiceBean).getExternalVocabularyValue(termURI);
+        Mockito.doReturn(null).when(datasetFieldServiceBean).getExternalVocabularyValue(AdditionalMatchers.not(Mockito.eq(termURI)));
+
+        // ORCID match with "personName" field into "getIndexableStringsByTermUri" method
+        Set<String> result = datasetFieldServiceBean.getIndexableStringsByTermUri(termURI, cvocEntry, "");
+        assertEquals(Set.of("Doe, John"), result);
+
+        // Another termURI not in database
+        result = datasetFieldServiceBean.getIndexableStringsByTermUri("http://example.org/uuid", cvocEntry, fieldName);
+        assertEquals(Collections.emptySet(), result);
+    }
+
+    /**
+     * Prepare unit tests with mock methods.
+     *
+     * @param fieldName "field-name" into cvoc configuration file
+     * @param jsonPath path of the JSON configuration file: src/test/resources/json/...
+     * @return {@link JsonObject} representing the configuration file
+     * @throws IOException in case on read error on configuration file
+     */
+    JsonObject prepare(String fieldName, String jsonPath) throws IOException {
+        Long dftId = Long.parseLong("1");
+        // DatasetFieldType name corresponding to "field-name" into cvoc configuration file
+        DatasetFieldType dft = new DatasetFieldType(fieldName, DatasetFieldType.FieldType.NONE, true);
+        dft.setId(dftId);
+
+        Mockito.doReturn(dft).when(datasetFieldServiceBean).findByNameOpt(fieldName);
+        Mockito.doReturn(null).when(datasetFieldServiceBean).findByNameOpt(AdditionalMatchers.not(Mockito.eq(fieldName)));
+
+        SettingsServiceBean settingsService = Mockito.mock(SettingsServiceBean.class);
+        Mockito.when(settingsService.getValueForKey(SettingsServiceBean.Key.CVocConf)).thenReturn(getCvocJson(jsonPath));
+        datasetFieldServiceBean.settingsService = settingsService;
+
+        return datasetFieldServiceBean.getCVocConf(false).get(dftId);
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldTest.java
new file mode 100644
index 00000000000..97999af3244
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldTest.java
@@ -0,0 +1,64 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+
+class DatasetFieldTest {
+    @Test
+    void testCreateNewEmptyDatasetField_withEmptyTemplate() {
+        Template template = new Template();
+        
+        DatasetField field = DatasetField.createNewEmptyDatasetField(new DatasetFieldType("subject", FieldType.TEXT, false), template);
+        assertTrue(field.getTemplate() == template);
+        assertTrue(template.getDatasetFields().isEmpty());
+    }
+
+    @Test
+    void testNotEqualDatasetFields() {
+        DatasetFieldType type1 = new DatasetFieldType("subject", FieldType.TEXT, false);
+        Template template1 = new Template();
+        DatasetField field1 = DatasetField.createNewEmptyDatasetField(type1, template1);
+        field1.setId(MocksFactory.nextId());
+        DatasetFieldType type2 = new DatasetFieldType("subject", FieldType.TEXT, false);
+        Template template2 = new Template();
+        DatasetField field2 = DatasetField.createNewEmptyDatasetField(type2, template2);
+        field2.setId(MocksFactory.nextId());
+
+        assertNotEquals(field1, field2);
+        assertNotEquals(field1, template2);
+    }
+
+    @Test
+    void testEqualDatasetFields() {
+        DatasetField field1 = DatasetField.createNewEmptyDatasetField(new DatasetFieldType("subject", FieldType.TEXT, false), new Template());
+        field1.setId(100L);
+        DatasetField field2 = DatasetField.createNewEmptyDatasetField(new DatasetFieldType("subject", FieldType.TEXT, false), new Template());
+
+        // Fields are not equal before both have IDs set
+        assertNotEquals(field1, field2);
+        
+        field2.setId(100L);
+
+        assertEquals(field1, field2);
+    }
+
+    @Test
+    void testCopyDatasetFields() {
+        DatasetField field1 = DatasetField.createNewEmptyDatasetField(new DatasetFieldType("subject", FieldType.TEXT, false), new Template());
+        field1.setId(100L);
+        DatasetField field2 = field1.copy(field1.getTemplate());
+
+        assertNull(field2.getId());
+        // A copy of a field should not be equal
+        assertNotEquals(field1, field2);
+
+        assertEquals(field2.getDatasetFieldType(), field1.getDatasetFieldType());
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldTypeTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldTypeTest.java
index ed17bd229d9..588bf5294e5 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldTypeTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldTypeTest.java
@@ -6,16 +6,13 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.search.SolrField;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import javax.faces.model.SelectItem;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -26,19 +23,19 @@ public class DatasetFieldTypeTest {
     public DatasetFieldTypeTest() {
     }
     
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
     
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
     
-    @Before
+    @BeforeEach
     public void setUp() {
     }
     
-    @After
+    @AfterEach
     public void tearDown() {
     }
 
@@ -66,17 +63,17 @@ public void testIsSanitizeHtml() {
         //if textbox then sanitize - allow tags
         instance.setFieldType(DatasetFieldType.FieldType.TEXTBOX);
         result = instance.isSanitizeHtml();
-        assertEquals(true, result);
+        assertTrue(result);
         
         //if textbox then don't sanitize - allow tags
         instance.setFieldType(DatasetFieldType.FieldType.EMAIL);
         result = instance.isSanitizeHtml();
-        assertEquals(false, result);
+        assertFalse(result);
         
         //URL, too
         instance.setFieldType(DatasetFieldType.FieldType.URL);
         result = instance.isSanitizeHtml();
-        assertEquals(true, result);
+        assertTrue(result);
     }
     
     @Test
@@ -105,7 +102,7 @@ public void testIsEscapeOutputText(){
         //URL, too
         instance.setFieldType(DatasetFieldType.FieldType.URL);
         result = instance.isEscapeOutputText();
-        assertEquals(false, result);
+        assertFalse(result);
         
     }
     
@@ -124,7 +121,7 @@ public void testGetSolrField(){
         parent.setAllowMultiples(true);
         instance.setParentDatasetFieldType(parent);
         solrField = instance.getSolrField();
-        assertEquals(true, solrField.isAllowedToBeMultivalued());
+        assertTrue(solrField.isAllowedToBeMultivalued());
         
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValidatorTest.java
index 9369c1b6930..659e42a68c4 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValidatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValidatorTest.java
@@ -5,13 +5,14 @@
  */
 package edu.harvard.iq.dataverse;
 
-import javax.validation.ConstraintValidatorContext;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import jakarta.validation.ConstraintValidatorContext;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
 import org.mockito.Mockito;
 
 /**
@@ -25,65 +26,133 @@ public class DatasetFieldValidatorTest {
     public DatasetFieldValidatorTest() {
     }
     
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
     
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
     
-    @Before
+    @BeforeEach
     public void setUp() {
     }
     
-    @After
+    @AfterEach
     public void tearDown() {
     }
 
 
     /**
      * Test of isValid method, of class DatasetFieldValidator.
+     * TODO: this should be converted into one or two ParameterizedTest methods, potentially including a DisplayNameGenerator
      */
     @Test
     public void testIsValid() {
-        DatasetField dataSetField = new DatasetField();
+        
+        Dataverse dataverse = new Dataverse();
+        Dataset dataset = new Dataset();
+        dataset.setOwner(dataverse);
+        DatasetVersion datasetVersion = new DatasetVersion();        
+        datasetVersion.setDataset(dataset);        
+           
+        testPrimitiveDatasetField("test isValid() on template field", true, "", null, true);
+        testPrimitiveDatasetField("test isValid() for required primitive with empty value", true, "", datasetVersion, false);
+        testPrimitiveDatasetField("test isValid() for required primitive with nonempty value",  true, "test", datasetVersion, true);
+        testPrimitiveDatasetField("test isValid() for not required primitive", false, "", datasetVersion, true);
+
+        // the compound tests are defined by parent/child1 required and child1/child2 values
+        testCompoundDatasetField("test isValid() for false/false compound with empty/empty children", false, false, "", "", datasetVersion, true);
+        testCompoundDatasetField("test isValid() for true/true compound with empty/empty children", true, true, "", "", datasetVersion, false);
+        testCompoundDatasetField("test isValid() for true/true compound with empty/nonempty children", true, true, "", "test", datasetVersion, false);
+        testCompoundDatasetField("test isValid() for true/true compound with nonempty/empty children", true, true, "test", "", datasetVersion, true);
+        testCompoundDatasetField("test isValid() for false/true compound with empty/empty children", false, true, "", "", datasetVersion, true);
+        testCompoundDatasetField("test isValid() for false/true compound with empty/nonempty children", false, true, "", "test", datasetVersion, false);
+        testCompoundDatasetField("test isValid() for false/true compound with nonempty/empty children", false, true, "test", "", datasetVersion, true);        
+    }
+    
+    private void testPrimitiveDatasetField(String test, boolean required, String value,
+        DatasetVersion dsv, boolean expectedOutcome) {
+        DatasetFieldType primitiveDSFType = new DatasetFieldType("primitive", DatasetFieldType.FieldType.TEXT, false);
+        primitiveDSFType.setRequired(required); 
+        
+        DatasetField testDatasetField = new DatasetField();
+        if (dsv != null) {
+            testDatasetField.setDatasetVersion(dsv);
+        } else {
+            testDatasetField.setTemplate(new Template());
+        }
+        testDatasetField.setDatasetFieldType(primitiveDSFType);
+        testDatasetField.setSingleValue(value);
+        
         DatasetFieldValidator datasetFieldValidator = new DatasetFieldValidator();
+        assertEquals(expectedOutcome, datasetFieldValidator.isValid(testDatasetField, constraintValidatorContext), test);
+       
+    }
+      
+    private void testCompoundDatasetField(String test, boolean requiredParent, boolean requiredChild1,
+            String valueChild1, String valueChild2, DatasetVersion dsv, boolean expectedOutcome) {    
 
-        // if it is a template field it is always valid
-        dataSetField.setTemplate(new Template());
-        boolean expResult = true;
-        boolean result = datasetFieldValidator.isValid(dataSetField, constraintValidatorContext);
-        assertEquals("test isValid() on template field", expResult, result);
+        DatasetFieldType parentDSFType = new DatasetFieldType("parent", DatasetFieldType.FieldType.TEXT, false);
+        DatasetFieldType child1DSFType = new DatasetFieldType("child1", DatasetFieldType.FieldType.TEXT, false);
+        DatasetFieldType child2DSFType = new DatasetFieldType("child2", DatasetFieldType.FieldType.TEXT, false);
 
-        // if not a template field and required
-        dataSetField.setTemplate(null);
-        DatasetVersion datasetVersion = new DatasetVersion();
-        Dataset dataset = new Dataset();
+        parentDSFType.setRequired(requiredParent); 
+        child1DSFType.setRequired(requiredChild1); 
+        child2DSFType.setRequired(false);        
+        
+        DatasetField parentDatasetField = new DatasetField();
+        parentDatasetField.setDatasetVersion(dsv);
+        parentDatasetField.setDatasetFieldType(parentDSFType);
+        
+        DatasetFieldCompoundValue compound = new DatasetFieldCompoundValue();
+        compound.setParentDatasetField(parentDatasetField);
+
+        DatasetField child1DatasetField = new DatasetField();
+        child1DatasetField.setParentDatasetFieldCompoundValue(compound);
+        compound.getChildDatasetFields().add(child1DatasetField);
+        child1DatasetField.setDatasetFieldType(child1DSFType);
+        child1DatasetField.setSingleValue(valueChild1);    
+
+        DatasetField child2DatasetField = new DatasetField();
+        child2DatasetField.setParentDatasetFieldCompoundValue(compound);
+        compound.getChildDatasetFields().add(child2DatasetField);        
+        child2DatasetField.setDatasetFieldType(child2DSFType);
+        child2DatasetField.setSingleValue(valueChild2);   
+        
+
+        DatasetFieldValidator datasetFieldValidator = new DatasetFieldValidator();
+        assertEquals(expectedOutcome, datasetFieldValidator.isValid(child1DatasetField, constraintValidatorContext), test);
+    }
+    
+    @Test
+    public void testRemoveInvalidCharacters() {
+        assertEquals("test", removeInvalidPrimitive("test"));
+        assertEquals("test", removeInvalidPrimitive("te\fst"));
+        assertEquals("test", removeInvalidPrimitive("te\u0002st"));
+        assertEquals("test", removeInvalidPrimitive("\fte\u0002st\f"));
+        assertEquals("test", removeInvalidPrimitive("te\ufffest"));
+    }
+
+    private String removeInvalidPrimitive(String value) {
         Dataverse dataverse = new Dataverse();
+        Dataset dataset = new Dataset();
         dataset.setOwner(dataverse);
-        datasetVersion.setDataset(dataset);
-        dataSetField.setDatasetVersion(datasetVersion);
-
-        DatasetFieldValue datasetFieldValue = new DatasetFieldValue();
-        DatasetFieldType datasetFieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, false);
-        datasetFieldType.setRequired(true);
-        dataSetField.setDatasetFieldType(datasetFieldType);
-        dataSetField.setSingleValue("");
-        datasetFieldValue.setValue("");
-        result = datasetFieldValidator.isValid(dataSetField, constraintValidatorContext);
-        assertEquals("test isValid() if not template field and required with empty DataSetField", false, result);
-
-        // fill in a value - the required constraint is satisfied now
-        dataSetField.setSingleValue("value");
-        result = datasetFieldValidator.isValid(dataSetField, constraintValidatorContext);
-        assertEquals("test isValid() if not template field and required with non-empty DataSetField", true, result);
-
-        // if not required the field can be blank
-        datasetFieldType.setRequired(false);
-        dataSetField.setSingleValue("");
-        result = datasetFieldValidator.isValid(dataSetField, constraintValidatorContext);
-        assertEquals("test isValid() if not template field and not required", true, result);
+        DatasetVersion dsv = new DatasetVersion();
+        dsv.setDataset(dataset);
+
+        DatasetFieldType primitiveDSFType = new DatasetFieldType("primitive", DatasetFieldType.FieldType.TEXT, false);
+        boolean required = false;
+        primitiveDSFType.setRequired(required);
+
+        DatasetField testDatasetField = new DatasetField();
+        testDatasetField.setDatasetVersion(dsv);
+        testDatasetField.setDatasetFieldType(primitiveDSFType);
+        testDatasetField.setSingleValue(value);
+
+        DatasetFieldValidator datasetFieldValidator = new DatasetFieldValidator();
+        datasetFieldValidator.isValid(testDatasetField, constraintValidatorContext);
+        return testDatasetField.getValue();
     }
-    
+
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValueValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValueValidatorTest.java
index dedafe7722e..3221949384e 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValueValidatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValueValidatorTest.java
@@ -5,42 +5,27 @@
  */
 package edu.harvard.iq.dataverse;
 
+import java.util.Set;
 import java.util.regex.Pattern;
-import javax.validation.ConstraintValidatorContext;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.Mockito;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
 /**
  *
  * @author skraffmi
  */
 public class DatasetFieldValueValidatorTest {
-    
-    
-    public DatasetFieldValueValidatorTest() {
-    }
-    
-    @BeforeClass
-    public static void setUpClass() {
-    }
-    
-    @AfterClass
-    public static void tearDownClass() {
-    }
-    
-    @Before
-    public void setUp() {
-    }
-    
-    @After
-    public void tearDown() {
-    }
-
 
     /**
      * Test of isValid method, of class DatasetFieldValueValidator.
@@ -67,121 +52,134 @@ public void testIsValid() {
         //Make string too long - should fail.
         value.setValue("asdfgX");
         result = instance.isValid(value, ctx);
-        assertEquals(false, result);
+        assertFalse(result);
         
         //Make string too long - should fail.
         value.setValue("asdf");
         result = instance.isValid(value, ctx);
-        assertEquals(false, result);
+        assertFalse(result);
         
         //Now lets try Dates
         dft.setFieldType(DatasetFieldType.FieldType.DATE);   
         dft.setValidationFormat(null);
         value.setValue("1999AD");
         result = instance.isValid(value, ctx);
-        assertEquals(true, result); 
+        assertTrue(result); 
         
         value.setValue("44BCE");
         result = instance.isValid(value, ctx);
-        assertEquals(true, result); 
+        assertTrue(result); 
         
         value.setValue("2004-10-27");
         result = instance.isValid(value, ctx);
-        assertEquals(true, result); 
+        assertTrue(result); 
         
         value.setValue("2002-08");
         result = instance.isValid(value, ctx);
-        assertEquals(true, result);  
+        assertTrue(result);  
         
         value.setValue("[1999?]");
         result = instance.isValid(value, ctx);
-        assertEquals(true, result); 
+        assertTrue(result); 
         
         value.setValue("Blergh");
         result = instance.isValid(value, ctx);
-        assertEquals(false, result);  
+        assertFalse(result);  
         
         //Float
         dft.setFieldType(DatasetFieldType.FieldType.FLOAT); 
         value.setValue("44");
         result = instance.isValid(value, ctx);
-        assertEquals(true, result);
+        assertTrue(result);
         
         value.setValue("44 1/2");
         result = instance.isValid(value, ctx);
-        assertEquals(false, result);
+        assertFalse(result);
         
         //Integer
         dft.setFieldType(DatasetFieldType.FieldType.INT); 
         value.setValue("44");
         result = instance.isValid(value, ctx);
-        assertEquals(true, result);
+        assertTrue(result);
         
         value.setValue("-44");
         result = instance.isValid(value, ctx);
-        assertEquals(true, result);
+        assertTrue(result);
         
         value.setValue("12.14");
         result = instance.isValid(value, ctx);
-        assertEquals(false, result);
-        
-        //URL
-        dft.setFieldType(DatasetFieldType.FieldType.URL); 
-        value.setValue("http://cnn.com");
-        result = instance.isValid(value, ctx);
-        assertEquals(true, result);
-        
-        
-        value.setValue("espn.com");
-        result = instance.isValid(value, ctx);
-        assertEquals(false, result);
-        
+        assertFalse(result);
     }
 
-    @Test
-    public void testIsValidAuthorIdentifierOrcid() {
-        DatasetFieldValueValidator validator = new DatasetFieldValueValidator();
-        Pattern pattern = DatasetAuthor.getValidPattern(DatasetAuthor.REGEX_ORCID);
-        assertTrue(validator.isValidAuthorIdentifier("0000-0002-1825-0097", pattern));
-        // An "X" at the end of an ORCID is less common but still valid.
-        assertTrue(validator.isValidAuthorIdentifier("0000-0002-1694-233X", pattern));
-        assertFalse(validator.isValidAuthorIdentifier("0000 0002 1825 0097", pattern));
-        assertFalse(validator.isValidAuthorIdentifier(" 0000-0002-1825-0097", pattern));
-        assertFalse(validator.isValidAuthorIdentifier("0000-0002-1825-0097 ", pattern));
-        assertFalse(validator.isValidAuthorIdentifier("junk", pattern));
-    }
-
-    @Test
-    public void testIsValidAuthorIdentifierIsni() {
-        DatasetFieldValueValidator validator = new DatasetFieldValueValidator();
-        Pattern pattern = DatasetAuthor.getValidPattern(DatasetAuthor.REGEX_ISNI);
-        assertTrue(validator.isValidAuthorIdentifier("0000000121032683", pattern));
-        assertFalse(validator.isValidAuthorIdentifier("junk", pattern));
+    final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
+    
+    @ParameterizedTest
+    @CsvSource(
+        {
+            "true, https://www.google.com",
+            "true, http://google.com",
+            "true, https://do-not-exist-123-123.com/",
+            "true, ftp://somesite.com",
+            "false, google.com",
+            "false, git@github.com:IQSS/dataverse.git"
+        }
+    )
+    public void testInvalidURL(boolean expected, String url) {
+        // given
+        String fieldName = "testField";
+        
+        DatasetField field = new DatasetField();
+        field.setDatasetFieldType(new DatasetFieldType(fieldName, DatasetFieldType.FieldType.URL, false));
+        DatasetFieldValue sut = new DatasetFieldValue(field);
+        sut.setValue(url);
+        
+        // when
+        Set<ConstraintViolation<DatasetFieldValue>> violations = validator.validate(sut);
+        
+        // then
+        assertEquals(expected, violations.size() < 1);
+        violations.stream().findFirst().ifPresent(c -> {
+            assertTrue(c.getMessage().startsWith(fieldName + " " + url + " "));
+            assertTrue(c.getMessage().contains("not"));
+            assertTrue(c.getMessage().contains("URL"));
+        });
     }
-
+    
     @Test
-    public void testIsValidAuthorIdentifierLcna() {
-        DatasetFieldValueValidator validator = new DatasetFieldValueValidator();
-        Pattern pattern = DatasetAuthor.getValidPattern(DatasetAuthor.REGEX_LCNA);
-        assertTrue(validator.isValidAuthorIdentifier("n82058243", pattern));
-        assertTrue(validator.isValidAuthorIdentifier("foobar123", pattern));
-        assertFalse(validator.isValidAuthorIdentifier("junk", pattern));
+    public void testInvalidEmail() {
+        // given
+        String fieldName = "testField";
+        String invalidMail = "myinvalidmail";
+        
+        DatasetField field = new DatasetField();
+        field.setDatasetFieldType(new DatasetFieldType(fieldName, DatasetFieldType.FieldType.EMAIL, false));
+        DatasetFieldValue sut = new DatasetFieldValue(field);
+        sut.setValue(invalidMail);
+        
+        // when
+        Set<ConstraintViolation<DatasetFieldValue>> violations = validator.validate(sut);
+        
+        // then
+        assertTrue(violations.size() == 1);
+        violations.stream().findFirst().ifPresent(c -> {
+            assertTrue(c.getMessage().startsWith(fieldName + " " + invalidMail + " "));
+            assertTrue(c.getMessage().contains("not"));
+            assertTrue(c.getMessage().contains("email"));
+        });
     }
-
     @Test
-    public void testIsValidAuthorIdentifierViaf() {
-        DatasetFieldValueValidator validator = new DatasetFieldValueValidator();
-        Pattern pattern = DatasetAuthor.getValidPattern(DatasetAuthor.REGEX_VIAF);
-        assertTrue(validator.isValidAuthorIdentifier("172389567", pattern));
-        assertFalse(validator.isValidAuthorIdentifier("junk", pattern));
-    }
+    public void testBoundingBoxValidity() {
+        // valid tests
+        assertTrue(DatasetFieldValueValidator.validateBoundingBox("-180", "180", "90", "-90"));
+        assertTrue(DatasetFieldValueValidator.validateBoundingBox("0", "0", "0", "0"));
 
-    @Test
-    public void testIsValidAuthorIdentifierGnd() {
-        DatasetFieldValueValidator validator = new DatasetFieldValueValidator();
-        Pattern pattern = DatasetAuthor.getValidPattern(DatasetAuthor.REGEX_GND);
-        assertTrue(validator.isValidAuthorIdentifier("4079154-3", pattern));
-        assertFalse(validator.isValidAuthorIdentifier("junk", pattern));
+        // invalid tests
+        assertTrue(!DatasetFieldValueValidator.validateBoundingBox("-180", null, "90", null));
+        assertTrue(!DatasetFieldValueValidator.validateBoundingBox(null, "180", null, "90"));
+        assertTrue(!DatasetFieldValueValidator.validateBoundingBox("-180", "180", "90", "junk"));
+        assertTrue(!DatasetFieldValueValidator.validateBoundingBox("45", "40", "90", "0"));
+        assertTrue(!DatasetFieldValueValidator.validateBoundingBox("360", "0", "90", "-90"));
+        assertTrue(!DatasetFieldValueValidator.validateBoundingBox("", "", "", ""));
+        assertTrue(!DatasetFieldValueValidator.validateBoundingBox(null, null, null, null));
     }
-
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetTest.java
index 45e47460ffe..687e0af5b81 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DatasetTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetTest.java
@@ -3,12 +3,14 @@
 import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,38 +25,38 @@ public class DatasetTest {
     @Test
     public void testIsLockedFor() {
         Dataset sut = new Dataset();
-        assertFalse( "Initially verify that the dataset is not locked because data being ingested", sut.isLockedFor(DatasetLock.Reason.Ingest) );
+        assertFalse(sut.isLockedFor(DatasetLock.Reason.Ingest), "Initially verify that the dataset is not locked because data being ingested");
 
         DatasetLock dl = new DatasetLock(DatasetLock.Reason.Ingest, MocksFactory.makeAuthenticatedUser("jane", "doe"));
         sut.addLock(dl);
-        assertTrue( "Verify that the dataset now has an ingest lock", sut.isLockedFor(DatasetLock.Reason.Ingest) );
-        assertFalse( "Verify that the dataset does not have a workflow lock", sut.isLockedFor(DatasetLock.Reason.Workflow) );
+        assertTrue(sut.isLockedFor(DatasetLock.Reason.Ingest), "Verify that the dataset now has an ingest lock");
+        assertFalse(sut.isLockedFor(DatasetLock.Reason.Workflow), "Verify that the dataset does not have a workflow lock");
     }
     
     @Test
     public void testLocksManagement() {
         Dataset sut = new Dataset();
-        assertFalse( "Initially verify that the dataset is not locked", sut.isLocked() );
+        assertFalse(sut.isLocked(), "Initially verify that the dataset is not locked");
         
         DatasetLock dlIngest = new DatasetLock(DatasetLock.Reason.Ingest, MocksFactory.makeAuthenticatedUser("jane", "doe"));
         dlIngest.setId(MocksFactory.nextId());
         sut.addLock(dlIngest);
-        assertTrue( "After adding an ingest lock, verify that the dataset is locked", sut.isLocked() );
+        assertTrue(sut.isLocked(), "After adding an ingest lock, verify that the dataset is locked");
 
         final DatasetLock dlInReview = new DatasetLock(DatasetLock.Reason.InReview, MocksFactory.makeAuthenticatedUser("jane", "doe"));
         dlInReview.setId(MocksFactory.nextId());
         sut.addLock(dlInReview);
-        assertEquals( "After adding a review lock, verify that the dataset is locked by two locks", 2, sut.getLocks().size() );
+        assertEquals(2, sut.getLocks().size(), "After adding a review lock, verify that the dataset is locked by two locks");
         
         DatasetLock retrievedDl = sut.getLockFor(DatasetLock.Reason.Ingest);
         assertEquals( dlIngest, retrievedDl );
         sut.removeLock(dlIngest);
-        assertNull( "After removing the ingest lock, verify that the dataset does not have any ingest locks", sut.getLockFor(DatasetLock.Reason.Ingest) );
+        assertNull(sut.getLockFor(DatasetLock.Reason.Ingest), "After removing the ingest lock, verify that the dataset does not have any ingest locks");
         
-        assertTrue( "After removing the ingest lock, verify that the dataset is still locked (review lock)", sut.isLocked() );
+        assertTrue(sut.isLocked(), "After removing the ingest lock, verify that the dataset is still locked (review lock)");
         
         sut.removeLock(dlInReview);
-        assertFalse( "After removing the review lock, verify that the dataset is not locked anymore", sut.isLocked() );
+        assertFalse(sut.isLocked(), "After removing the review lock, verify that the dataset is not locked anymore");
         
     }
 
@@ -78,7 +80,7 @@ public void testLocksManagement() {
     private DatasetVersion draftVersion;
     private DatasetVersion releasedVersion;
 
-    @Before
+    @BeforeEach
     public void before() {
         this.archivedVersion = new DatasetVersion();
         this.archivedVersion.setVersionState(VersionState.ARCHIVED);
@@ -93,7 +95,7 @@ public void before() {
         this.releasedVersion.setVersionState(VersionState.RELEASED);
     }
 
-    @After
+    @AfterEach
     public void after() {
         this.archivedVersion = null;
         this.deaccessionedVersion = null;
@@ -239,5 +241,41 @@ public void datasetShouldBeDeaccessionedWithDeaccessionedAndDeaccessionedVersion
 
         assertTrue(dataset.isDeaccessioned());
     }
- 
+
+    @Test
+    public void testGetMostRecentMajorVersionReleaseDateWithDeaccessionedVersions() {
+        List<DatasetVersion> versionList = new ArrayList<DatasetVersion>();
+
+        long ver = 5;
+        // 5.2
+        DatasetVersion relVersion = new DatasetVersion();
+        relVersion.setVersionState(VersionState.RELEASED);
+        relVersion.setMinorVersionNumber(2L);
+        relVersion.setVersionNumber(ver);
+        versionList.add(relVersion);
+
+        // 5.1
+        relVersion = new DatasetVersion();
+        relVersion.setVersionState(VersionState.DEACCESSIONED);
+        relVersion.setMinorVersionNumber(1L);
+        relVersion.setVersionNumber(ver);
+        versionList.add(relVersion);
+
+        // 5.0, 4.0, 3.0, 2.0, 1.0
+        while  (ver > 0) {
+            DatasetVersion deaccessionedVersion = new DatasetVersion();
+            deaccessionedVersion.setVersionState(VersionState.DEACCESSIONED);
+            // only add an actual date to v5.0 so the assertNotNull will only pass if this version's date is returned
+            deaccessionedVersion.setReleaseTime((ver == 5) ? new Date() : null);
+            deaccessionedVersion.setMinorVersionNumber(0L);
+            deaccessionedVersion.setVersionNumber(ver--);
+            versionList.add(deaccessionedVersion);
+        }
+
+        Dataset dataset = new Dataset();
+        dataset.setVersions(versionList);
+
+        Date releaseDate = dataset.getMostRecentMajorVersionReleaseDate();
+        assertNotNull(releaseDate);
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionDifferenceTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionDifferenceTest.java
new file mode 100644
index 00000000000..ed4c0e565b5
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionDifferenceTest.java
@@ -0,0 +1,514 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.branding.BrandingUtilTest;
+import edu.harvard.iq.dataverse.datavariable.VariableMetadata;
+import edu.harvard.iq.dataverse.datavariable.VariableMetadataUtil;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+import java.net.URI;
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.logging.Logger;
+
+import static org.assertj.core.util.DateUtil.now;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import io.restassured.path.json.JsonPath;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+
+public class DatasetVersionDifferenceTest {
+
+    private static final Logger logger = Logger.getLogger(DatasetVersion.class.getCanonicalName());
+
+    private static List<FileMetadata> addedFiles;
+    private static List<FileMetadata> removedFiles;
+    private static List<FileMetadata> changedFileMetadata;
+    private static List<FileMetadata> changedVariableMetadata;
+    private static List<FileMetadata[]> replacedFiles;
+    private static Long fileId = Long.valueOf(0);
+
+    @BeforeAll
+    public static void setUp() {
+        BrandingUtilTest.setupMocks();
+    }
+
+    @AfterAll
+    public static void tearDown() {
+        BrandingUtilTest.setupMocks();
+    }
+
+    @Test
+    public void testDifferencing() {
+        Dataset dataset = new Dataset();
+        License license = new License("CC0 1.0",
+                "You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.",
+                URI.create("http://creativecommons.org/publicdomain/zero/1.0"), URI.create("/resources/images/cc0.png"),
+                true, 1l);
+        license.setDefault(true);
+        dataset.setProtocol("doi");
+        dataset.setAuthority("10.5072/FK2");
+        dataset.setIdentifier("LK0D1H");
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setDataset(dataset);
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+        datasetVersion.setVersionNumber(1L);
+        datasetVersion.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+        DatasetVersion datasetVersion2 = new DatasetVersion();
+        datasetVersion2.setDataset(dataset);
+        datasetVersion2.setVersionState(DatasetVersion.VersionState.DRAFT);
+
+        // Published version's two files
+        DataFile dataFile = new DataFile();
+        dataFile.setId(1L);
+        DataFile dataFile2 = new DataFile();
+        dataFile2.setId(2L);
+
+        FileMetadata fileMetadata1 = createFileMetadata(10L, datasetVersion, dataFile, "file1.txt");
+        fileMetadata1.setLabel("file1.txt");
+
+        FileMetadata fileMetadata2 = createFileMetadata(20L, datasetVersion, dataFile2, "file2.txt");
+
+        // Draft version - same two files with one label change
+        FileMetadata fileMetadata3 = fileMetadata1.createCopy();
+        fileMetadata3.setId(30L);
+
+        FileMetadata fileMetadata4 = fileMetadata2.createCopy();
+        fileMetadata4.setLabel("file3.txt");
+        fileMetadata4.setId(40L);
+
+        List<FileMetadata> fileMetadatas = new ArrayList<>(Arrays.asList(fileMetadata1, fileMetadata2));
+        datasetVersion.setFileMetadatas(fileMetadatas);
+        List<FileMetadata> fileMetadatas2 = new ArrayList<>(Arrays.asList(fileMetadata3, fileMetadata4));
+        datasetVersion2.setFileMetadatas(fileMetadatas2);
+
+        SimpleDateFormat dateFmt = new SimpleDateFormat("yyyyMMdd");
+        Date publicationDate;
+        try {
+            publicationDate = dateFmt.parse("19551105");
+            datasetVersion.setReleaseTime(publicationDate);
+            dataset.setPublicationDate(new Timestamp(publicationDate.getTime()));
+        } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        List<DatasetVersion> versionList = new ArrayList<>(Arrays.asList(datasetVersion, datasetVersion2));
+        dataset.setVersions(versionList);
+
+        // One file has a changed label
+        List<FileMetadata> expectedAddedFiles = new ArrayList<>();
+        List<FileMetadata> expectedRemovedFiles = new ArrayList<>();
+        ;
+        List<FileMetadata> expectedChangedFileMetadata = Arrays.asList(fileMetadata2, fileMetadata4);
+        List<FileMetadata> expectedChangedVariableMetadata = new ArrayList<>();
+        List<FileMetadata[]> expectedReplacedFiles = new ArrayList<>();
+        List<String[]> changedTerms = new ArrayList<>();
+
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+        // change label for first file as well
+        fileMetadata3.setLabel("file1_updated.txt");
+        expectedChangedFileMetadata = Arrays.asList(fileMetadata1, fileMetadata3, fileMetadata2, fileMetadata4);
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+        // Add one change to variable metadata
+        fileMetadata3.setVariableMetadatas(Arrays.asList(new VariableMetadata()));
+        expectedChangedVariableMetadata = Arrays.asList(fileMetadata1, fileMetadata3);
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+        // Replaced File
+        DataFile replacingFile = new DataFile();
+        replacingFile.setId(3L);
+        replacingFile.setPreviousDataFileId(1L);
+        fileMetadata3.setDataFile(replacingFile);
+        expectedChangedFileMetadata = Arrays.asList(fileMetadata2, fileMetadata4);
+        expectedChangedVariableMetadata = new ArrayList<>();
+
+        FileMetadata[] filePair = new FileMetadata[2];
+        filePair[0] = fileMetadata1;
+        filePair[1] = fileMetadata3;
+        expectedReplacedFiles = new ArrayList<>();
+        expectedReplacedFiles.add(filePair);
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+
+        // Add a new file
+        DataFile newFile = new DataFile();
+        newFile.setId(3L);
+        FileMetadata fileMetadata5 = createFileMetadata(50L, datasetVersion2, newFile, "newFile.txt");
+        datasetVersion2.getFileMetadatas().add(fileMetadata5);
+        expectedAddedFiles = Arrays.asList(fileMetadata5);
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+
+        // Remove a file
+        datasetVersion2.getFileMetadatas().remove(fileMetadata4);
+        expectedRemovedFiles = Arrays.asList(fileMetadata2);
+        expectedChangedFileMetadata = new ArrayList<>();
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+
+        // Set the published version's TermsOfUseAndAccess to a non-null value
+        TermsOfUseAndAccess termsOfUseAndAccess = new TermsOfUseAndAccess();
+        datasetVersion.setTermsOfUseAndAccess(termsOfUseAndAccess);
+
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+
+        // Set the draft version's TermsOfUseAndAccess to a non-null value
+
+        datasetVersion2.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+
+        // Set a term field
+
+        datasetVersion2.getTermsOfUseAndAccess().setTermsOfUse("Terms o' Use");
+        String[] termField = new String[] {
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.header"), "", "Terms o' Use" };
+        changedTerms.add(termField);
+
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+
+        // Set a term field in the original version
+
+        datasetVersion.getTermsOfUseAndAccess().setDisclaimer("Not our fault");
+        String[] termField2 = new String[] {
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer"),
+                "Not our fault", "" };
+        changedTerms.add(termField2);
+
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+
+    }
+
+    private FileMetadata createFileMetadata(long id, DatasetVersion datasetVersion, DataFile dataFile, String label) {
+        FileMetadata fileMetadata = new FileMetadata();
+        fileMetadata.setId(id);
+        fileMetadata.setDatasetVersion(datasetVersion);
+        fileMetadata.setDataFile(dataFile);
+        fileMetadata.setLabel(label);
+        fileMetadata.setCategories(new ArrayList<>());
+        return fileMetadata;
+    }
+
+    /**
+     * CompareResults is currently testing the output of the
+     * DatasetVersionDifference class with the manually created expected results
+     * included as parameters and with the results of the less efficient algorithm
+     * it is replacing. Once we're collectively convinced that the tests here are
+     * correct (i.e. the manually created expected* parameters are set correctly for
+     * each use case), we could drop running the originalCalculateDifference method
+     * and just compare with the expected* results.
+     * 
+     * @param changedTerms
+     */
+    private void compareResults(DatasetVersion datasetVersion, DatasetVersion datasetVersion2,
+            List<FileMetadata> expectedAddedFiles, List<FileMetadata> expectedRemovedFiles,
+            List<FileMetadata> expectedChangedFileMetadata, List<FileMetadata> expectedChangedVariableMetadata,
+            List<FileMetadata[]> expectedReplacedFiles, List<String[]> changedTerms) {
+        DatasetVersionDifference diff = new DatasetVersionDifference(datasetVersion2, datasetVersion);
+        // Run the original algorithm
+        originalCalculateDifference(datasetVersion2, datasetVersion);
+        // Compare the old and new algorithms
+        assertEquals(addedFiles, diff.getAddedFiles());
+        assertEquals(removedFiles, diff.getRemovedFiles());
+        assertEquals(changedFileMetadata, diff.getChangedFileMetadata());
+        assertEquals(changedVariableMetadata, diff.getChangedVariableMetadata());
+        assertEquals(replacedFiles.size(), diff.getReplacedFiles().size());
+        for (int i = 0; i < replacedFiles.size(); i++) {
+            assertEquals(replacedFiles.get(i)[0], diff.getReplacedFiles().get(i)[0]);
+            assertEquals(replacedFiles.get(i)[1], diff.getReplacedFiles().get(i)[1]);
+        }
+
+        // Also compare the new algorithm with the manually created expected* values for
+        // the test cases
+        assertEquals(expectedAddedFiles, diff.getAddedFiles());
+        assertEquals(expectedRemovedFiles, diff.getRemovedFiles());
+        assertEquals(expectedChangedFileMetadata, diff.getChangedFileMetadata());
+        assertEquals(expectedChangedVariableMetadata, diff.getChangedVariableMetadata());
+        assertEquals(expectedReplacedFiles.size(), diff.getReplacedFiles().size());
+        for (int i = 0; i < expectedReplacedFiles.size(); i++) {
+            assertEquals(expectedReplacedFiles.get(i)[0], diff.getReplacedFiles().get(i)[0]);
+            assertEquals(expectedReplacedFiles.get(i)[1], diff.getReplacedFiles().get(i)[1]);
+        }
+
+        assertEquals(changedTerms.size(), diff.getChangedTermsAccess().size());
+        for (int i = 0; i < changedTerms.size(); i++) {
+            String[] diffArray = diff.getChangedTermsAccess().get(i);
+            assertEquals(changedTerms.get(i)[0], diffArray[0]);
+            assertEquals(changedTerms.get(i)[1], diffArray[1]);
+            assertEquals(changedTerms.get(i)[2], diffArray[2]);
+        }
+    }
+
+    @Deprecated
+    // This is the "Original" difference calculation from DatasetVersionDifference
+    // It is included here to help verify that the new implementation is the same as
+    // the original
+    private static void originalCalculateDifference(DatasetVersion newVersion, DatasetVersion originalVersion) {
+
+        addedFiles = new ArrayList<>();
+        removedFiles = new ArrayList<>();
+        changedFileMetadata = new ArrayList<>();
+        changedVariableMetadata = new ArrayList<>();
+        replacedFiles = new ArrayList<>();
+        long startTime = System.currentTimeMillis();
+        // TODO: ?
+        // It looks like we are going through the filemetadatas in both versions,
+        // *sequentially* (i.e. at the cost of O(N*M)), to select the lists of
+        // changed, deleted and added files between the 2 versions... But why
+        // are we doing it, if we are doing virtually the same thing inside
+        // the initDatasetFilesDifferenceList(), below - but in a more efficient
+        // way (sorting both lists, then goint through them in parallel, at the
+        // cost of (N+M) max.?
+        // -- 4.6 Nov. 2016
+
+        for (FileMetadata fmdo : originalVersion.getFileMetadatas()) {
+            boolean deleted = true;
+            for (FileMetadata fmdn : newVersion.getFileMetadatas()) {
+                if (fmdo.getDataFile().equals(fmdn.getDataFile())) {
+                    deleted = false;
+                    if (!DatasetVersionDifference.compareFileMetadatas(fmdo, fmdn).isEmpty()) {
+                        changedFileMetadata.add(fmdo);
+                        changedFileMetadata.add(fmdn);
+                    }
+                    if (!VariableMetadataUtil.compareVariableMetadata(fmdo, fmdn)
+                            || !DatasetVersionDifference.compareVarGroup(fmdo, fmdn)) {
+                        changedVariableMetadata.add(fmdo);
+                        changedVariableMetadata.add(fmdn);
+                    }
+                    break;
+                }
+            }
+            if (deleted) {
+                removedFiles.add(fmdo);
+            }
+        }
+        for (FileMetadata fmdn : newVersion.getFileMetadatas()) {
+            boolean added = true;
+            for (FileMetadata fmdo : originalVersion.getFileMetadatas()) {
+                if (fmdo.getDataFile().equals(fmdn.getDataFile())) {
+                    added = false;
+                    break;
+                }
+            }
+            if (added) {
+                addedFiles.add(fmdn);
+            }
+        }
+
+        getReplacedFiles();
+        logger.info("Difference Loop Execution time: " + (System.currentTimeMillis() - startTime) + " ms");
+
+    }
+
+    @Deprecated
+    // This is used only in the original algorithm and was removed from
+    // DatasetVersionDifference
+    private static void getReplacedFiles() {
+        if (addedFiles.isEmpty() || removedFiles.isEmpty()) {
+            return;
+        }
+        List<FileMetadata> addedToReplaced = new ArrayList<>();
+        List<FileMetadata> removedToReplaced = new ArrayList<>();
+        for (FileMetadata added : addedFiles) {
+            DataFile addedDF = added.getDataFile();
+            Long replacedId = addedDF.getPreviousDataFileId();
+            if (added.getDataFile().getPreviousDataFileId() != null) {
+            }
+            for (FileMetadata removed : removedFiles) {
+                DataFile test = removed.getDataFile();
+                if (test.getId().equals(replacedId)) {
+                    addedToReplaced.add(added);
+                    removedToReplaced.add(removed);
+                    FileMetadata[] replacedArray = new FileMetadata[2];
+                    replacedArray[0] = removed;
+                    replacedArray[1] = added;
+                    replacedFiles.add(replacedArray);
+                }
+            }
+        }
+        if (addedToReplaced.isEmpty()) {
+        } else {
+            addedToReplaced.stream().forEach((delete) -> {
+                addedFiles.remove(delete);
+            });
+            removedToReplaced.stream().forEach((delete) -> {
+                removedFiles.remove(delete);
+            });
+        }
+    }
+
+    @Test
+    public void testCompareVersionsAsJson() {
+
+        Dataverse dv = new Dataverse();
+        Dataset ds = new Dataset();
+        ds.setOwner(dv);
+        ds.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL,"10.5072","FK2/BYM3IW", "/", AbstractDOIProvider.DOI_RESOLVER_URL, null));
+
+        DatasetVersion dv1 = initDatasetVersion(0L, ds, DatasetVersion.VersionState.RELEASED);
+        DatasetVersion dv2 = initDatasetVersion(1L, ds, DatasetVersion.VersionState.DRAFT);
+        ds.setVersions(List.of(dv1, dv2));
+
+        TermsOfUseAndAccess toa = new TermsOfUseAndAccess();
+        toa.setDisclaimer("disclaimer");
+        dv2.setTermsOfUseAndAccess(toa);
+        DatasetField dsf = new DatasetField();
+        dsf.setDatasetFieldType(new DatasetFieldType("Author", DatasetFieldType.FieldType.TEXT, true));
+        MetadataBlock mb = new MetadataBlock();
+        mb.setDisplayName("testMetadataBlock");
+        dsf.getDatasetFieldType().setMetadataBlock(mb);
+        dsf.setSingleValue("TEST");
+        dv2.getDatasetFields().add(dsf);
+        // modify file at index 0
+        dv2.getFileMetadatas().get(0).setRestricted(!dv2.getFileMetadatas().get(2).isRestricted());
+
+        FileMetadata addedFile = initFile(dv2); // add a new file
+        FileMetadata removedFile = dv2.getFileMetadatas().get(1); // remove the second file
+        dv2.getFileMetadatas().remove(1);
+        FileMetadata replacedFile = dv2.getFileMetadatas().get(1); // the third file is now at index 1 since the second file was removed
+        FileMetadata replacementFile = initFile(dv2, replacedFile.getDataFile().getId()); // replace the third file with a new file
+        dv2.getFileMetadatas().remove(1);
+
+        DatasetVersionDifference dvd  = new DatasetVersionDifference(dv2, dv1);
+
+        JsonObjectBuilder json = dvd.compareVersionsAsJson();
+        JsonObject obj = json.build();
+        System.out.println(JsonUtil.prettyPrint(obj));
+
+        JsonPath dataFile = JsonPath.from(JsonUtil.prettyPrint(obj));
+        assertTrue("TEST".equalsIgnoreCase(dataFile.getString("metadataChanges[0].changed[0].newValue")));
+        assertTrue(addedFile.getLabel().equalsIgnoreCase(dataFile.getString("filesAdded[0].fileName")));
+        assertTrue(removedFile.getLabel().equalsIgnoreCase(dataFile.getString("filesRemoved[0].fileName")));
+        assertTrue(replacedFile.getLabel().equalsIgnoreCase(dataFile.getString("filesReplaced[0].oldFile.fileName")));
+        assertTrue(replacementFile.getLabel().equalsIgnoreCase(dataFile.getString("filesReplaced[0].newFile.fileName")));
+        assertTrue("true".equalsIgnoreCase(dataFile.getString("fileChanges[0].changed[0].newValue")));
+        assertTrue("disclaimer".equalsIgnoreCase(dataFile.getString("TermsOfAccess.changed[0].newValue")));
+    }
+    
+    @Test
+    public void testGetSummaryAsJson(){
+                
+        Dataverse dv = new Dataverse();
+        Dataset ds = new Dataset();
+        ds.setOwner(dv);
+        ds.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL,"10.5072","FK2/S1E7K3", "/", AbstractDOIProvider.DOI_RESOLVER_URL, null));
+
+        DatasetVersion dv1 = initDatasetVersion(0L, ds, DatasetVersion.VersionState.RELEASED);
+        dv1.setId(Long.valueOf(1));
+        DatasetVersion dv2 = initDatasetVersion(1L, ds, DatasetVersion.VersionState.DRAFT);
+        dv2.setId(Long.valueOf(2));
+        ds.setVersions(List.of(dv2, dv1));
+
+        TermsOfUseAndAccess toa = new TermsOfUseAndAccess();
+        toa.setDisclaimer("disclaimer");
+        dv2.setTermsOfUseAndAccess(toa);
+        DatasetField dsf = new DatasetField();
+        dsf.setDatasetFieldType(new DatasetFieldType("Author", DatasetFieldType.FieldType.TEXT, true));
+        MetadataBlock mb = new MetadataBlock();
+        mb.setDisplayName("testMetadataBlock");
+        mb.setName("testMetadataBlock");
+        dsf.getDatasetFieldType().setMetadataBlock(mb);
+        dsf.setSingleValue("TEST");
+        dv2.getDatasetFields().add(dsf);
+        // modify file at index 0
+        dv2.getFileMetadatas().get(0).setRestricted(!dv2.getFileMetadatas().get(2).isRestricted());
+
+        FileMetadata addedFile = initFile(dv2); // add a new file
+        FileMetadata removedFile = dv2.getFileMetadatas().get(1); // remove the second file
+        dv2.getFileMetadatas().remove(1);
+        FileMetadata replacedFile = dv2.getFileMetadatas().get(1); // the third file is now at index 1 since the second file was removed
+        FileMetadata replacementFile = initFile(dv2, replacedFile.getDataFile().getId()); // replace the third file with a new file
+        dv2.getFileMetadatas().remove(1);
+
+        DatasetVersionDifference dvd  = dv2.getDefaultVersionDifference();
+        
+
+
+        JsonObjectBuilder json = dvd.getSummaryDifferenceAsJson();
+        JsonObject obj = json.build();
+        JsonPath dataFile = JsonPath.from(JsonUtil.prettyPrint(obj));
+                
+        assertTrue("true".equalsIgnoreCase(dataFile.getString("termsAccessChanged")));
+        assertEquals(2,(Long.parseLong(dataFile.getString("files.changedFileMetaData"))));
+        assertEquals(0,(Long.parseLong(dataFile.getString("testMetadataBlock.deleted"))));
+        assertEquals(1, (int) (Long.parseLong(dataFile.getString("testMetadataBlock.added"))));
+        assertEquals(1,(Long.parseLong(dataFile.getString("files.added"))));
+
+        
+    }
+    
+    
+    private DatasetVersion initDatasetVersion(Long id, Dataset ds, DatasetVersion.VersionState vs) {
+        DatasetVersion dv = new DatasetVersion();
+        dv.setDataset(ds);
+        dv.setVersion(1L);
+        dv.setVersionState(vs);
+        dv.setMinorVersionNumber(0L);
+        if (vs == DatasetVersion.VersionState.RELEASED) {
+            dv.setVersionNumber(1L);
+            dv.setVersion(1L);
+            dv.setReleaseTime(now());
+        }
+        dv.setId(id);
+        dv.setCreateTime(now());
+        dv.setLastUpdateTime(now());
+        dv.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+        dv.setFileMetadatas(initFiles(dv));
+        return dv;
+    }
+    private List<FileMetadata> initFiles(DatasetVersion dsv) {
+        List<FileMetadata> fileMetadatas = new ArrayList<>();
+        fileId = 0L;
+        for (int i=0; i < 10; i++) {
+            FileMetadata fm = initFile(dsv);
+            fileMetadatas.add(fm);
+        }
+        return fileMetadatas;
+    }
+    private FileMetadata initFile(DatasetVersion dsv) {
+        return initFile(dsv, null);
+    }
+    private FileMetadata initFile(DatasetVersion dsv, Long prevId) {
+        Long id = fileId++;
+        FileMetadata fm = new FileMetadata();
+        DataFile df = new DataFile();
+        fm.setDatasetVersion(dsv);
+        DataTable dt = new DataTable();
+        dt.setOriginalFileName("filename"+id+".txt");
+        df.setId(id);
+        df.setDescription("Desc"+id);
+        df.setRestricted(false);
+        df.setFilesize(100 + id);
+        df.setChecksumType(DataFile.ChecksumType.MD5);
+        df.setChecksumValue("value"+id);
+        df.setDataTable(dt);
+        df.setOwner(dsv.getDataset());
+        df.getFileMetadatas().add(fm);
+        df.setPreviousDataFileId(prevId);
+        fm.setId(id);
+        fm.setDataFile(df);
+        fm.setLabel("Label"+id);
+        fm.setDirectoryLabel("/myFilePath/");
+        fm.setDescription("Desc"+id);
+        dsv.getFileMetadatas().add(fm);
+        return fm;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionServiceBeanTest.java
index 7c608888b7b..424ff54fe02 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionServiceBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionServiceBeanTest.java
@@ -1,13 +1,13 @@
 package edu.harvard.iq.dataverse;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
 import java.util.Arrays;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
@@ -18,13 +18,13 @@ public class DatasetVersionServiceBeanTest {
 
   private DatasetVersionServiceBean datasetVersionServiceBean;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     this.datasetVersionServiceBean = new DatasetVersionServiceBean();
     
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.datasetVersionServiceBean = null;
   }
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java
index 3ca69fa71d2..fe2bca1a109 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java
@@ -1,8 +1,11 @@
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.branding.BrandingUtilTest;
+import edu.harvard.iq.dataverse.license.License;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import java.io.StringReader;
+import java.net.URI;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -10,44 +13,32 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import org.junit.After;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.util.logging.Logger;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 
-/**
- *
- * @author michael
- */
 public class DatasetVersionTest {
-
-    public DatasetVersionTest() {
-    }
     
-    @BeforeClass
-    public static void setUpClass() {
-    }
+    private static final Logger logger = Logger.getLogger(DatasetVersion.class.getCanonicalName());
     
-    @AfterClass
-    public static void tearDownClass() {
+    @BeforeAll
+    public static void setUp() {
+        BrandingUtilTest.setupMocks();
     }
     
-    @Before
-    public void setUp() {
+    @AfterAll
+    public static void tearDown() {
+        BrandingUtilTest.setupMocks();
     }
     
-    @After
-    public void tearDown() {
-    }
-
     @Test
     public void testComparator() {
         DatasetVersion ds1_0 = new DatasetVersion();
@@ -82,14 +73,14 @@ public void testComparator() {
     public void testIsInReview() {
         Dataset ds = MocksFactory.makeDataset();
         
-        DatasetVersion draft = ds.getCreateVersion();
+        DatasetVersion draft = ds.getCreateVersion(null);
         draft.setVersionState(DatasetVersion.VersionState.DRAFT);
         ds.addLock(new DatasetLock(DatasetLock.Reason.InReview, MocksFactory.makeAuthenticatedUser("Lauren", "Ipsumowitch")));
         assertTrue(draft.isInReview());
 
         DatasetVersion nonDraft = new DatasetVersion();
         nonDraft.setVersionState(DatasetVersion.VersionState.RELEASED);
-        assertEquals(false, nonDraft.isInReview());
+        assertFalse(nonDraft.isInReview());
         
         ds.addLock(null);
         assertFalse(nonDraft.isInReview());
@@ -101,15 +92,13 @@ public void testIsInReview() {
     @Test
     public void testGetJsonLd() throws ParseException {
         Dataset dataset = new Dataset();
+        License license = new License("CC0 1.0", "You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.", URI.create("http://creativecommons.org/publicdomain/zero/1.0"), URI.create("/resources/images/cc0.png"), true, 1l);
+        license.setDefault(true);
         dataset.setProtocol("doi");
         dataset.setAuthority("10.5072/FK2");
         dataset.setIdentifier("LK0D1H");
         DatasetVersion datasetVersion = new DatasetVersion();
         datasetVersion.setDataset(dataset);
-        datasetVersion.setVersionState(DatasetVersion.VersionState.DRAFT);
-        assertEquals("", datasetVersion.getPublicationDateAsString());
-        // Only published datasets return any JSON.
-        assertEquals("", datasetVersion.getJsonLd());
         datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
         datasetVersion.setVersionNumber(1L);
         SimpleDateFormat dateFmt = new SimpleDateFormat("yyyyMMdd");
@@ -120,10 +109,10 @@ public void testGetJsonLd() throws ParseException {
         dataverse.setName("LibraScholar");
         dataset.setOwner(dataverse);
         TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
-        terms.setLicense(TermsOfUseAndAccess.License.CC0);
+        terms.setLicense(license);
         datasetVersion.setTermsOfUseAndAccess(terms);
         String jsonLd = datasetVersion.getJsonLd();
-        System.out.println("jsonLd: " + JsonUtil.prettyPrint(jsonLd));
+        logger.fine("jsonLd: " + JsonUtil.prettyPrint(jsonLd));
         JsonReader jsonReader = Json.createReader(new StringReader(jsonLd));
         JsonObject obj = jsonReader.readObject();
         assertEquals("http://schema.org", obj.getString("@context"));
@@ -131,9 +120,7 @@ public void testGetJsonLd() throws ParseException {
         assertEquals("https://doi.org/10.5072/FK2/LK0D1H", obj.getString("@id"));
         assertEquals("https://doi.org/10.5072/FK2/LK0D1H", obj.getString("identifier"));
         assertEquals(null, obj.getString("schemaVersion", null));
-        assertEquals("Dataset", obj.getJsonObject("license").getString("@type"));
-        assertEquals("CC0", obj.getJsonObject("license").getString("text"));
-        assertEquals("https://creativecommons.org/publicdomain/zero/1.0/", obj.getJsonObject("license").getString("url"));
+        assertEquals("http://creativecommons.org/publicdomain/zero/1.0", obj.getString("license"));
         assertEquals("1955-11-05", obj.getString("dateModified"));
         assertEquals("1955-11-05", obj.getString("datePublished"));
         assertEquals("1", obj.getString("version"));
@@ -162,10 +149,9 @@ public void testGetJsonLdNonCC0License() throws ParseException {
         datasetVersion.setDataset(dataset);
         datasetVersion.setVersionState(DatasetVersion.VersionState.DRAFT);
         assertEquals("", datasetVersion.getPublicationDateAsString());
-        // Only published datasets return any JSON.
-        assertEquals("", datasetVersion.getJsonLd());
         datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
         datasetVersion.setVersionNumber(1L);
+        datasetVersion.setMinorVersionNumber(0L);
         SimpleDateFormat dateFmt = new SimpleDateFormat("yyyyMMdd");
         Date publicationDate = dateFmt.parse("19551105");
         datasetVersion.setReleaseTime(publicationDate);
@@ -175,12 +161,12 @@ public void testGetJsonLdNonCC0License() throws ParseException {
         dataset.setOwner(dataverse);
 
         TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
-        terms.setLicense(TermsOfUseAndAccess.License.NONE);
+        terms.setLicense(null);
         terms.setTermsOfUse("Call me maybe");
         datasetVersion.setTermsOfUseAndAccess(terms);
 
         String jsonLd = datasetVersion.getJsonLd();
-        System.out.println("jsonLd: " + JsonUtil.prettyPrint(jsonLd));
+        logger.fine("jsonLd: " + JsonUtil.prettyPrint(jsonLd));
         JsonReader jsonReader = Json.createReader(new StringReader(jsonLd));
         JsonObject obj = jsonReader.readObject();
         assertEquals("http://schema.org", obj.getString("@context"));
@@ -188,8 +174,7 @@ public void testGetJsonLdNonCC0License() throws ParseException {
         assertEquals("https://doi.org/10.5072/FK2/LK0D1H", obj.getString("@id"));
         assertEquals("https://doi.org/10.5072/FK2/LK0D1H", obj.getString("identifier"));
         assertEquals(null, obj.getString("schemaVersion", null));
-        assertEquals("Dataset", obj.getJsonObject("license").getString("@type"));
-        assertEquals("Call me maybe", obj.getJsonObject("license").getString("text"));
+        assertTrue(obj.getString("license").contains("/api/datasets/:persistentId/versions/1.0/customlicense?persistentId=doi:10.5072/FK2/LK0D1H"));
         assertEquals("1955-11-05", obj.getString("dateModified"));
         assertEquals("1955-11-05", obj.getString("datePublished"));
         assertEquals("1", obj.getString("version"));
@@ -208,4 +193,24 @@ public void testGetJsonLdNonCC0License() throws ParseException {
         assertEquals("LibraScholar", obj.getJsonObject("includedInDataCatalog").getString("name"));
     }
 
+    @Test
+    public void testGetJsonLdDraft() throws ParseException {
+        Dataset dataset = new Dataset();
+        License license = new License("CC0 1.0", "You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.", URI.create("http://creativecommons.org/publicdomain/zero/1.0"), URI.create("/resources/images/cc0.png"), true, 1l);
+        license.setDefault(true);
+        dataset.setProtocol("doi");
+        dataset.setAuthority("10.5072/FK2");
+        dataset.setIdentifier("LK0D1H");
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setDataset(dataset);
+        datasetVersion.setVersionState(DatasetVersion.VersionState.DRAFT);
+        assertEquals("", datasetVersion.getPublicationDateAsString());
+        String jsonLd = datasetVersion.getJsonLd();
+        logger.fine("jsonLd: " + JsonUtil.prettyPrint(jsonLd));
+        JsonReader jsonReader = Json.createReader(new StringReader(jsonLd));
+        JsonObject obj = jsonReader.readObject();
+        assertEquals("http://schema.org", obj.getString("@context"));
+        assertEquals("DRAFT", obj.getString("version"));
+    }
+
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataverseContactTest.java b/src/test/java/edu/harvard/iq/dataverse/DataverseContactTest.java
new file mode 100644
index 00000000000..2abb10a485d
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DataverseContactTest.java
@@ -0,0 +1,47 @@
+package edu.harvard.iq.dataverse;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public class DataverseContactTest {
+    private DataverseContact dataverseContact;
+
+    @BeforeEach
+    public void before() {
+        this.dataverseContact = new DataverseContact();
+        this.dataverseContact.setId(1L);
+    }
+
+    @Test
+    public void testEqualsWithNull() {
+        assertFalse(this.dataverseContact.equals(null));
+    }
+
+    @Test
+    public void testEqualsWithDifferentClass() {
+        DatasetFieldType datasetFieldType = new DatasetFieldType();
+
+        assertFalse(this.dataverseContact.equals(datasetFieldType));
+    }
+
+    @Test
+    public void testEqualsWithSameClassSameId() {
+        DataverseContact dataverseContact1 = new DataverseContact();
+        dataverseContact1.setId(1L);
+
+        assertTrue(this.dataverseContact.equals(dataverseContact1));
+    }
+
+    @Test
+    public void testEqualsWithSameClassDifferentId() {
+        DataverseContact dataverseContact1 = new DataverseContact();
+        dataverseContact1.setId(2L);
+
+        assertFalse(this.dataverseContact.equals(dataverseContact1));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataverseFacetTest.java b/src/test/java/edu/harvard/iq/dataverse/DataverseFacetTest.java
new file mode 100644
index 00000000000..7ae50439c10
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DataverseFacetTest.java
@@ -0,0 +1,47 @@
+package edu.harvard.iq.dataverse;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public class DataverseFacetTest {
+    private DataverseFacet dataverseFacet;
+
+    @BeforeEach
+    public void before() {
+        this.dataverseFacet = new DataverseFacet();
+        this.dataverseFacet.setId(1L);
+    }
+
+    @Test
+    public void testEqualsWithNull() {
+        assertFalse(this.dataverseFacet.equals(null));
+    }
+
+    @Test
+    public void testEqualsWithDifferentClass() {
+        DatasetFieldType datasetFieldType = new DatasetFieldType();
+
+        assertFalse(this.dataverseFacet.equals(datasetFieldType));
+    }
+
+    @Test
+    public void testEqualsWithSameClassSameId() {
+        DataverseFacet dataverseFacet1 = new DataverseFacet();
+        dataverseFacet1.setId(1L);
+
+        assertTrue(this.dataverseFacet.equals(dataverseFacet1));
+    }
+
+    @Test
+    public void testEqualsWithSameClassDifferentId() {
+        DataverseFacet dataverseFacet1 = new DataverseFacet();
+        dataverseFacet1.setId(2L);
+
+        assertFalse(this.dataverseFacet.equals(dataverseFacet1));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataverseFeaturedDataverseTest.java b/src/test/java/edu/harvard/iq/dataverse/DataverseFeaturedDataverseTest.java
new file mode 100644
index 00000000000..b024dc3bfd3
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DataverseFeaturedDataverseTest.java
@@ -0,0 +1,47 @@
+package edu.harvard.iq.dataverse;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public class DataverseFeaturedDataverseTest {
+    private DataverseFeaturedDataverse dataverseFeaturedDataverse;
+
+    @BeforeEach
+    public void before() {
+        this.dataverseFeaturedDataverse = new DataverseFeaturedDataverse();
+        this.dataverseFeaturedDataverse.setId(1L);
+    }
+
+    @Test
+    public void testEqualsWithNull() {
+        assertFalse(this.dataverseFeaturedDataverse.equals(null));
+    }
+
+    @Test
+    public void testEqualsWithDifferentClass() {
+        DatasetFieldType datasetFieldType = new DatasetFieldType();
+
+        assertFalse(this.dataverseFeaturedDataverse.equals(datasetFieldType));
+    }
+
+    @Test
+    public void testEqualsWithSameClassSameId() {
+        DataverseFeaturedDataverse dataverseFeaturedDataverse1 = new DataverseFeaturedDataverse();
+        dataverseFeaturedDataverse1.setId(1L);
+
+        assertTrue(this.dataverseFeaturedDataverse.equals(dataverseFeaturedDataverse1));
+    }
+
+    @Test
+    public void testEqualsWithSameClassDifferentId() {
+        DataverseFeaturedDataverse dataverseFeaturedDataverse1 = new DataverseFeaturedDataverse();
+        dataverseFeaturedDataverse1.setId(2L);
+
+        assertFalse(this.dataverseFeaturedDataverse.equals(dataverseFeaturedDataverse1));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataverseMetadataBlockFacetTest.java b/src/test/java/edu/harvard/iq/dataverse/DataverseMetadataBlockFacetTest.java
new file mode 100644
index 00000000000..e0bcfb2369d
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DataverseMetadataBlockFacetTest.java
@@ -0,0 +1,45 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class DataverseMetadataBlockFacetTest {
+
+    @Test
+    public void equals_should_be_based_on_id() {
+        Long sameId = MocksFactory.nextId();
+        DataverseMetadataBlockFacet target1 = new DataverseMetadataBlockFacet();
+        target1.setId(sameId);
+        target1.setDataverse(new Dataverse());
+        target1.setMetadataBlock(new MetadataBlock());
+
+        DataverseMetadataBlockFacet target2 = new DataverseMetadataBlockFacet();
+        target2.setId(sameId);
+        target2.setDataverse(new Dataverse());
+        target2.setMetadataBlock(new MetadataBlock());
+
+        MatcherAssert.assertThat(target1.equals(target2), Matchers.is(true));
+
+
+        Dataverse sameDataverse = new Dataverse();
+        MetadataBlock sameMetadataBlock = new MetadataBlock();
+        target1 = new DataverseMetadataBlockFacet();
+        target1.setId(MocksFactory.nextId());
+        target1.setDataverse(sameDataverse);
+        target1.setMetadataBlock(sameMetadataBlock);
+
+        target2 = new DataverseMetadataBlockFacet();
+        target2.setId(MocksFactory.nextId());
+        target2.setDataverse(sameDataverse);
+        target2.setMetadataBlock(sameMetadataBlock);
+
+        MatcherAssert.assertThat(target1.equals(target2), Matchers.is(false));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataverseTest.java b/src/test/java/edu/harvard/iq/dataverse/DataverseTest.java
new file mode 100644
index 00000000000..f4d6eaa6ad5
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DataverseTest.java
@@ -0,0 +1,79 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ *
+ * @author adaybujeda
+ */
+@LocalJvmSettings
+public class DataverseTest {
+
+    private Dataverse OWNER;
+    private List<DataverseMetadataBlockFacet> OWNER_METADATABLOCKFACETS;
+
+    @BeforeEach
+    public void beforeEachTest() {
+        OWNER = new Dataverse();
+        OWNER.setId(MocksFactory.nextId());
+        OWNER.setMetadataBlockRoot(true);
+
+        DataverseMetadataBlockFacet metadataBlockFacet = new DataverseMetadataBlockFacet();
+        metadataBlockFacet.setId(MocksFactory.nextId());
+        OWNER_METADATABLOCKFACETS = Arrays.asList(metadataBlockFacet);
+        OWNER.setMetadataBlockFacets(OWNER_METADATABLOCKFACETS);
+    }
+
+    @Test
+    public void getMetadataBlockFacets_should_return_internal_metadatablockfacets_when_metadatablockfacetroot_is_true() {
+        Dataverse target = new Dataverse();
+        target.setId(MocksFactory.nextId());
+        target.setMetadataBlockFacetRoot(true);
+        target.setOwner(OWNER);
+
+        DataverseMetadataBlockFacet metadataBlockFacet = new DataverseMetadataBlockFacet();
+        metadataBlockFacet.setId(MocksFactory.nextId());
+        List<DataverseMetadataBlockFacet> internalMetadataBlockFacets = Arrays.asList(metadataBlockFacet);
+        target.setMetadataBlockFacets(internalMetadataBlockFacets);
+        List<DataverseMetadataBlockFacet> result = target.getMetadataBlockFacets();
+
+        MatcherAssert.assertThat(result, Matchers.is(internalMetadataBlockFacets));
+    }
+
+    @Test
+    public void getMetadataBlockFacets_should_return_owner_metadatablockfacets_when_metadatablockfacetroot_is_false() {
+        Dataverse target = new Dataverse();
+        target.setId(MocksFactory.nextId());
+        target.setMetadataBlockFacetRoot(false);
+        target.setOwner(OWNER);
+
+        DataverseMetadataBlockFacet metadataBlockFacet = new DataverseMetadataBlockFacet();
+        metadataBlockFacet.setId(MocksFactory.nextId());
+        List<DataverseMetadataBlockFacet> internalMetadataBlockFacets = Arrays.asList(metadataBlockFacet);
+        target.setMetadataBlockFacets(internalMetadataBlockFacets);
+        List<DataverseMetadataBlockFacet> result = target.getMetadataBlockFacets();
+
+        MatcherAssert.assertThat(result, Matchers.is(OWNER_METADATABLOCKFACETS));
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.DEFAULT_DATASET_FILE_COUNT_LIMIT, value = "23")
+    public void testDatasetFileCountLimit() {
+        OWNER.setDatasetFileCountLimit(1);
+        MatcherAssert.assertThat(OWNER.getEffectiveDatasetFileCountLimit(), Matchers.is(1));
+        OWNER.setDatasetFileCountLimit(null);
+        MatcherAssert.assertThat(OWNER.getEffectiveDatasetFileCountLimit(), Matchers.is(23));
+        OWNER.setDatasetFileCountLimit(-1);
+        MatcherAssert.assertThat(OWNER.getEffectiveDatasetFileCountLimit(), Matchers.is(23));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataverseThemeTest.java b/src/test/java/edu/harvard/iq/dataverse/DataverseThemeTest.java
new file mode 100644
index 00000000000..e6721e34c6f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DataverseThemeTest.java
@@ -0,0 +1,47 @@
+package edu.harvard.iq.dataverse;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public class DataverseThemeTest {
+    private DataverseTheme dataverseTheme;
+
+    @BeforeEach
+    public void before() {
+        this.dataverseTheme = new DataverseTheme();
+        this.dataverseTheme.setId(1L);
+    }
+
+    @Test
+    public void testEqualsWithNull() {
+        assertFalse(this.dataverseTheme.equals(null));
+    }
+
+    @Test
+    public void testEqualsWithDifferentClass() {
+        DatasetFieldType datasetFieldType = new DatasetFieldType();
+
+        assertFalse(this.dataverseTheme.equals(datasetFieldType));
+    }
+
+    @Test
+    public void testEqualsWithSameClassSameId() {
+        DataverseTheme dataverseTheme1 = new DataverseTheme();
+        dataverseTheme1.setId(1L);
+
+        assertTrue(this.dataverseTheme.equals(dataverseTheme1));
+    }
+
+    @Test
+    public void testEqualsWithSameClassDifferentId() {
+        DataverseTheme dataverseTheme1 = new DataverseTheme();
+        dataverseTheme1.setId(2L);
+
+        assertFalse(this.dataverseTheme.equals(dataverseTheme1));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/EMailValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/EMailValidatorTest.java
deleted file mode 100644
index ba3d3f74ec7..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/EMailValidatorTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package edu.harvard.iq.dataverse;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- *
- * @author philip durbin
- * @author oscardssmith
- * @author rohit bhattacharjee
- * @author stephen kraffmiller
- * @author alex scheitlin
- */
-@RunWith(Parameterized.class)
-public class EMailValidatorTest {
-
-    public boolean isValid;
-    public String email;
-
-    public EMailValidatorTest(boolean isValid, String email) {
-        this.isValid = isValid;
-        this.email = email;
-    }
-
-    @Parameters
-    public static Collection<Object[]> parameters() {
-        return Arrays.asList(new Object[][] {
-            { true, "pete@mailinator.com" },
-
-            // @todo How can this be a valid email address?
-            { true, " leadingWhitespace@mailinator.com" },
-
-            // @todo How can this be a valid email address?
-            { true, "trailingWhitespace@mailinator.com " },
-
-            { false, "elisah.da mota@example.com" },
-            { false, "pete1@mailinator.com;pete2@mailinator.com" },
-
-            /**
-             * These examples are all from https://randomuser.me and seem to be
-             * valid according to
-             * http://sphinx.mythic-beasts.com/~pdw/cgi-bin/emailvalidate (except
-             * ØąŲˆŲ†ÛŒÚŠØ§.Ų…Ø­Ų…د؎اŲ†@example.com).
-             */
-            { true, "michÊlle.pereboom@example.com" },
-            { true, "begÃŧm.vriezen@example.com" },
-            { true, "lÃŗtus.gonçalves@example.com" },
-            { true, "lÃŗtus.gonçalves@Êxample.com" },
-            { true, "begÃŧm.vriezen@example.cologne" },
-            { true, "ØąŲˆŲ†ÛŒÚŠØ§.Ų…Ø­Ų…د؎اŲ†@example.com" },
-            { false, "lÃŗtus.gonçalves@example.cÃŗm" },
-            { false, "dora@.com" },
-            { false, "" },
-            { false, null },
-
-            // add tests for 4601
-            { true, "blah@wiso.uni-unc.de" },
-            { true, "foo@essex.co.uk" },
-            { true, "jack@bu.cloud" },
-        });
-    }
-    @Test
-    public void testIsEmailValid() {
-        assertEquals(isValid, EMailValidator.isEmailValid(email, null));
-    }
-    
-}
diff --git a/src/test/java/edu/harvard/iq/dataverse/EditDataFilesPageHelperTest.java b/src/test/java/edu/harvard/iq/dataverse/EditDataFilesPageHelperTest.java
new file mode 100644
index 00000000000..39d43fec191
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/EditDataFilesPageHelperTest.java
@@ -0,0 +1,108 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.util.file.CreateDataFileResult;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ *
+ * @author adaybujeda
+ */
+@ExtendWith(MockitoExtension.class)
+public class EditDataFilesPageHelperTest {
+
+    private static final String FILENAME = UUID.randomUUID().toString();
+    private static final String TYPE = UUID.randomUUID().toString();
+
+    @Mock
+    private SettingsWrapper settingsWrapper;
+
+    @InjectMocks
+    private EditDataFilesPageHelper target;
+
+    @Test
+    public void getHtmlErrorMessage_should_return_null_when_no_error_messages() {
+        CreateDataFileResult createDataFileResult = new CreateDataFileResult(FILENAME, TYPE, Collections.emptyList(), Collections.emptyList());
+
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.nullValue());
+    }
+
+    @Test
+    public void getHtmlErrorMessage_should_return_null_when_max_errors_is_0() {
+        Mockito.when(settingsWrapper.getInteger(EditDataFilesPageHelper.MAX_ERRORS_TO_DISPLAY_SETTING, EditDataFilesPageHelper.MAX_ERRORS_TO_DISPLAY)).thenReturn(0);
+        CreateDataFileResult createDataFileResult = CreateDataFileResult.error(FILENAME, TYPE, Arrays.asList("error1"));
+
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.nullValue());
+    }
+
+    @Test
+    public void getHtmlErrorMessage_should_return_message_when_there_are_errors() {
+        Mockito.when(settingsWrapper.getInteger(EditDataFilesPageHelper.MAX_ERRORS_TO_DISPLAY_SETTING, EditDataFilesPageHelper.MAX_ERRORS_TO_DISPLAY)).thenReturn(10);
+        CreateDataFileResult createDataFileResult = CreateDataFileResult.error(FILENAME, TYPE, Arrays.asList("error1"));
+
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.notNullValue());
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.containsString("error1"));
+    }
+
+    @Test
+    public void getHtmlErrorMessage_should_return_message_with_MAX_ERRORS_TO_DISPLAY_when_there_are_more_errors() {
+        Mockito.when(settingsWrapper.getInteger(EditDataFilesPageHelper.MAX_ERRORS_TO_DISPLAY_SETTING, EditDataFilesPageHelper.MAX_ERRORS_TO_DISPLAY)).thenReturn(2);
+        CreateDataFileResult createDataFileResult = CreateDataFileResult.error(FILENAME, TYPE, Arrays.asList("error1", "error2", "error3", "error4"));
+
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.notNullValue());
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.containsString("error1"));
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.containsString("error2"));
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.not(Matchers.containsString("error3")));
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.not(Matchers.containsString("error4")));
+    }
+
+    @Test
+    public void getHtmlErrorMessage_should_escape_html_from_error_messages() {
+        Mockito.when(settingsWrapper.getInteger(EditDataFilesPageHelper.MAX_ERRORS_TO_DISPLAY_SETTING, EditDataFilesPageHelper.MAX_ERRORS_TO_DISPLAY)).thenReturn(5);
+        CreateDataFileResult createDataFileResult = CreateDataFileResult.error(FILENAME, TYPE, Arrays.asList("<script>alert('hello');</script>"));
+
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.notNullValue());
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.not(Matchers.containsString("<script>")));
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.not(Matchers.containsString("</script>")));
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.containsString("&lt;script&gt;"));
+        MatcherAssert.assertThat(target.getHtmlErrorMessage(createDataFileResult), Matchers.containsString("&lt;/script&gt;"));
+    }
+
+    @Test
+    public void consolidateHtmlErrorMessages_should_return_null_when_null_or_no_errors() {
+        MatcherAssert.assertThat(target.consolidateHtmlErrorMessages(null), Matchers.nullValue());
+        MatcherAssert.assertThat(target.consolidateHtmlErrorMessages(Collections.emptyList()), Matchers.nullValue());
+    }
+
+    @Test
+    public void consolidateHtmlErrorMessages_should_not_add_anything_when_only_one_error() {
+        List<String> errorMessages = Arrays.asList("error1");
+
+        String result = target.consolidateHtmlErrorMessages(errorMessages);
+
+        MatcherAssert.assertThat(result, Matchers.notNullValue());
+        MatcherAssert.assertThat(result, Matchers.containsString("error1"));
+    }
+
+    @Test
+    public void consolidateHtmlErrorMessages_should_add_HTML_break_line_between_errors() {
+        List<String> errorMessages = Arrays.asList("error1", "error2");
+
+        String result = target.consolidateHtmlErrorMessages(errorMessages);
+
+        MatcherAssert.assertThat(result, Matchers.notNullValue());
+        MatcherAssert.assertThat(result, Matchers.containsString("error1</br>error2"));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/ExternalIdentifierTest.java b/src/test/java/edu/harvard/iq/dataverse/ExternalIdentifierTest.java
new file mode 100644
index 00000000000..2440d4ae240
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/ExternalIdentifierTest.java
@@ -0,0 +1,160 @@
+package edu.harvard.iq.dataverse;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ExternalIdentifierTest {
+
+  @Test
+  public void testIsValidAuthorIdentifierOrcid() {
+      ExternalIdentifier identifier = ExternalIdentifier.valueOf("ORCID");
+      assertTrue(identifier.isValidIdentifier("0000-0002-1825-0097"));
+      // An "X" at the end of an ORCID is less common but still valid.
+      assertTrue(identifier.isValidIdentifier("0000-0002-1694-233X"));
+      assertFalse(identifier.isValidIdentifier("0000 0002 1825 0097"));
+      assertFalse(identifier.isValidIdentifier(" 0000-0002-1825-0097"));
+      assertFalse(identifier.isValidIdentifier("0000-0002-1825-0097 "));
+      assertFalse(identifier.isValidIdentifier("junk"));
+      
+      // Test ORCID with https://orcid.org/ prefix
+      assertTrue(identifier.isValidIdentifier("https://orcid.org/0000-0002-1825-0097"));
+      assertTrue(identifier.isValidIdentifier("https://orcid.org/0000-0002-1694-233X"));
+      
+      // Test format command
+      assertEquals("https://orcid.org/0000-0002-1825-0097", identifier.format("0000-0002-1825-0097"));
+      assertEquals("https://orcid.org/0000-0002-1694-233X", identifier.format("0000-0002-1694-233X"));
+      assertEquals("https://orcid.org/0000-0002-1825-0097", identifier.format("https://orcid.org/0000-0002-1825-0097"));
+  }
+
+  @Test
+  public void testIsValidAuthorIdentifierRor() {
+      ExternalIdentifier identifier = ExternalIdentifier.valueOf("ROR");
+      assertTrue(identifier.isValidIdentifier("01h6qyw18"));
+      assertTrue(identifier.isValidIdentifier("02mhbdp49"));
+      assertFalse(identifier.isValidIdentifier("01h6qyw1"));  // Too short
+      assertFalse(identifier.isValidIdentifier("01h6qyw18a")); // Too long
+      assertFalse(identifier.isValidIdentifier(" 01h6qyw18"));
+      assertFalse(identifier.isValidIdentifier("01h6qyw18 "));
+      assertFalse(identifier.isValidIdentifier("junk"));
+      
+      // Test ROR with https://ror.org/ prefix
+      assertTrue(identifier.isValidIdentifier("https://ror.org/01h6qyw18"));
+      assertTrue(identifier.isValidIdentifier("https://ror.org/02mhbdp49"));
+      
+      // Test format command
+      assertEquals("https://ror.org/01h6qyw18", identifier.format("01h6qyw18"));
+      assertEquals("https://ror.org/02mhbdp49", identifier.format("02mhbdp49"));
+      assertEquals("https://ror.org/01h6qyw18", identifier.format("https://ror.org/01h6qyw18"));
+  }
+  
+  @Test
+  public void testIsValidAuthorIdentifierIsni() {
+      ExternalIdentifier identifier = ExternalIdentifier.valueOf("ISNI");
+      assertTrue(identifier.isValidIdentifier("0000000121032683"));
+      assertTrue(identifier.isValidIdentifier("000000012150090X"));
+      assertTrue(identifier.isValidIdentifier("http://www.isni.org/isni/0000000121032683"));
+      assertTrue(identifier.isValidIdentifier("http://www.isni.org/isni/000000012150090X"));
+      assertFalse(identifier.isValidIdentifier("junk"));
+      assertFalse(identifier.isValidIdentifier("000000012103268")); // Too short
+      assertFalse(identifier.isValidIdentifier("00000001210326831")); // Too long
+  
+      // Test format command
+      assertEquals("http://www.isni.org/isni/0000000121032683", identifier.format("0000000121032683"));
+      assertEquals("http://www.isni.org/isni/0000000121032683", identifier.format("http://www.isni.org/isni/0000000121032683"));
+  }
+  
+  @Test
+  public void testIsValidAuthorIdentifierLcna() {
+      ExternalIdentifier identifier = ExternalIdentifier.valueOf("LCNA");
+      assertTrue(identifier.isValidIdentifier("n82058243"));
+      assertTrue(identifier.isValidIdentifier("foobar123"));
+      assertTrue(identifier.isValidIdentifier("http://id.loc.gov/authorities/names/n82058243"));
+      assertFalse(identifier.isValidIdentifier("junk"));
+      assertFalse(identifier.isValidIdentifier("123")); // Too short (assuming minimum length)
+  
+      // Test format command
+      assertEquals("http://id.loc.gov/authorities/names/n82058243", identifier.format("n82058243"));
+      assertEquals("http://id.loc.gov/authorities/names/n82058243", identifier.format("http://id.loc.gov/authorities/names/n82058243"));
+  }
+  
+  @Test
+  public void testIsValidAuthorIdentifierViaf() {
+      ExternalIdentifier identifier = ExternalIdentifier.valueOf("VIAF");
+      assertTrue(identifier.isValidIdentifier("172389567"));
+      assertTrue(identifier.isValidIdentifier("https://viaf.org/viaf/172389567"));
+      assertFalse(identifier.isValidIdentifier("junk"));
+      
+      assertEquals("https://viaf.org/viaf/172389567", identifier.format("172389567"));
+      assertEquals("https://viaf.org/viaf/172389567", identifier.format("https://viaf.org/viaf/172389567"));
+
+  }
+  
+  @Test
+  public void testIsValidAuthorIdentifierGnd() {
+      ExternalIdentifier identifier = ExternalIdentifier.valueOf("GND");
+      assertTrue(identifier.isValidIdentifier("4079154-3"));
+      assertTrue(identifier.isValidIdentifier("118540238"));
+      assertTrue(identifier.isValidIdentifier("https://d-nb.info/gnd/4079154-3"));
+      assertTrue(identifier.isValidIdentifier("https://d-nb.info/gnd/118540238"));
+      assertFalse(identifier.isValidIdentifier("junk"));
+      assertFalse(identifier.isValidIdentifier("123")); // Too short
+      
+      assertEquals("https://d-nb.info/gnd/4079154-3", identifier.format("4079154-3"));
+      assertEquals("https://d-nb.info/gnd/4079154-3", identifier.format("https://d-nb.info/gnd/4079154-3"));
+
+  }
+  
+  @Test
+  public void testIsValidAuthorIdentifierResearcherId() {
+      ExternalIdentifier identifier = ExternalIdentifier.valueOf("ResearcherID");
+      assertTrue(identifier.isValidIdentifier("A-1234-5678"));
+      assertTrue(identifier.isValidIdentifier("J-9876-2018"));
+      assertTrue(identifier.isValidIdentifier("AAA-1234-2020"));
+      assertTrue(identifier.isValidIdentifier("Z9999-2021"));
+      assertTrue(identifier.isValidIdentifier("https://publons.com/researcher/A-1234-5678/"));
+      assertTrue(identifier.isValidIdentifier("https://publons.com/researcher/J-9876-2018/"));
+      assertFalse(identifier.isValidIdentifier("a-1234-5678")); // Lowercase start
+      assertFalse(identifier.isValidIdentifier("A-1234-5678-")); // Ends with hyphen
+      assertFalse(identifier.isValidIdentifier("-A-1234-5678")); // Starts with hyphen
+      assertFalse(identifier.isValidIdentifier("junk"));
+      
+      assertEquals("https://publons.com/researcher/A-1234-5678/", identifier.format("A-1234-5678"));
+      assertEquals("https://publons.com/researcher/A-1234-5678/", identifier.format("https://publons.com/researcher/A-1234-5678/"));
+
+  }
+  
+  @Test
+  public void testIsValidAuthorIdentifierScopusId() {
+      ExternalIdentifier identifier = ExternalIdentifier.valueOf("ScopusID");
+      assertTrue(identifier.isValidIdentifier("12345678"));
+      assertTrue(identifier.isValidIdentifier("87654321"));
+      assertTrue(identifier.isValidIdentifier("00000000"));
+      assertTrue(identifier.isValidIdentifier("https://www.scopus.com/authid/detail.uri?authorId=12345678"));
+      assertTrue(identifier.isValidIdentifier("https://www.scopus.com/authid/detail.uri?authorId=87654321"));
+      assertFalse(identifier.isValidIdentifier("A12345678")); // Contains a letter
+      assertFalse(identifier.isValidIdentifier("junk"));
+      
+      assertEquals("https://www.scopus.com/authid/detail.uri?authorId=12345678", identifier.format("12345678"));
+      assertEquals("https://www.scopus.com/authid/detail.uri?authorId=12345678", identifier.format("https://www.scopus.com/authid/detail.uri?authorId=12345678"));
+
+  }
+  
+  @Test
+  public void testIsValidAuthorIdentifierDai() {
+      ExternalIdentifier identifier = ExternalIdentifier.valueOf("DAI");
+      assertTrue(identifier.isValidIdentifier("123456789"));
+      assertTrue(identifier.isValidIdentifier("987654321X"));
+      assertTrue(identifier.isValidIdentifier("info:eu-repo/dai/nl/123456789"));
+      assertTrue(identifier.isValidIdentifier("info:eu-repo/dai/nl/987654321X"));
+      assertFalse(identifier.isValidIdentifier("12345678")); // Too short
+      assertFalse(identifier.isValidIdentifier("12345678901")); // Too long
+      assertFalse(identifier.isValidIdentifier("A23456789")); // Contains a letter
+      assertFalse(identifier.isValidIdentifier("junk"));
+      
+      assertEquals("info:eu-repo/dai/nl/123456789", identifier.format("123456789"));
+      assertEquals("info:eu-repo/dai/nl/123456789", identifier.format("info:eu-repo/dai/nl/123456789"));
+  }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/FileDirectoryNameValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/FileDirectoryNameValidatorTest.java
index 9d49dcdb070..5ff74aea603 100644
--- a/src/test/java/edu/harvard/iq/dataverse/FileDirectoryNameValidatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/FileDirectoryNameValidatorTest.java
@@ -1,39 +1,25 @@
 package edu.harvard.iq.dataverse;
 
-import java.util.Arrays;
-import java.util.Collection;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
-@RunWith(Parameterized.class)
-public class FileDirectoryNameValidatorTest {
-
-    public boolean isValid;
-    public String fileDirectoryName;
-
-    public FileDirectoryNameValidatorTest(boolean isValid, String fileDirectoryName) {
-        this.isValid = isValid;
-        this.fileDirectoryName = fileDirectoryName;
-    }
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-    @Parameterized.Parameters
-    public static Collection<Object[]> parameters() {
-        return Arrays.asList(new Object[][]{
-            {true, "foobar"},
-            // The leading "-" gets stripped.
-            {true, "-foobar"},
-            {true, "_foobar"},
-            {true, "foobar_"},
-            {true, "folder/sub"},
-            {true, "folder///sub"},
-            {true, "folder///sub/third"},
-            {false, "f**bar"},});
-    }
+public class FileDirectoryNameValidatorTest {
 
-    @Test
-    public void testIsFileDirectoryNameValid() {
+    @ParameterizedTest
+    @CsvSource({
+        "true,foobar",
+        // The leading "-" gets stripped.
+        "true,-foobar",
+        "true,_foobar",
+        "true,foobar_",
+        "true,folder/sub",
+        "true,folder///sub",
+        "true,folder///sub/third",
+        "false,f**bar"
+    })
+    public void testIsFileDirectoryNameValid(boolean isValid, String fileDirectoryName) {
         assertEquals(isValid, FileDirectoryNameValidator.isFileDirectoryNameValid(fileDirectoryName, null));
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/FileDownloadHelperTest.java b/src/test/java/edu/harvard/iq/dataverse/FileDownloadHelperTest.java
index aea26f42bab..e1e0f6d153a 100644
--- a/src/test/java/edu/harvard/iq/dataverse/FileDownloadHelperTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/FileDownloadHelperTest.java
@@ -14,6 +14,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.time.LocalDate;
+
 @ExtendWith(MockitoExtension.class)
 class FileDownloadHelperTest {
 
@@ -170,6 +172,94 @@ void testCanDownloadFile_forUnrestrictedReleasedFile() {
         assertTrue(fileDownloadHelper.canDownloadFile(fileMetadata));
     }
 
+    @Test
+    void testCanDownloadFile_forUnrestrictedReleasedActiveEmbargoFile() {
+        DataFile dataFile = new DataFile();
+        dataFile.setId(2L);
+
+        // With an embargo, an unrestricted file should only be accessible if the embargo has ended
+
+        Embargo emb = new Embargo(LocalDate.now().plusDays(3), "Still embargoed");
+        dataFile.setEmbargo(emb);
+        
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+
+        FileMetadata fileMetadata = new FileMetadata();
+        fileMetadata.setId(1L);
+        fileMetadata.setRestricted(false);
+        fileMetadata.setDataFile(dataFile);
+        fileMetadata.setDatasetVersion(datasetVersion);
+        mockPermissionResponseRequestOn(Permission.DownloadFile, false);
+        assertFalse(fileDownloadHelper.canDownloadFile(fileMetadata));
+    }
+
+    @Test
+    void testCanDownloadFile_forUnrestrictedReleasedExpiredEmbargoFile() {
+        DataFile dataFile = new DataFile();
+        dataFile.setId(2L);
+
+        // With an embargo, an unrestricted file should only be accessible if the embargo has ended
+
+        Embargo emb = new Embargo(LocalDate.now().minusDays(3), "Was embargoed");
+        dataFile.setEmbargo(emb);
+        
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+
+        FileMetadata fileMetadata = new FileMetadata();
+        fileMetadata.setId(1L);
+        fileMetadata.setRestricted(false);
+        fileMetadata.setDataFile(dataFile);
+        fileMetadata.setDatasetVersion(datasetVersion);
+        
+        assertTrue(fileDownloadHelper.canDownloadFile(fileMetadata));
+    }
+
+    @Test
+    void testCanNotDownloadFile_forExpiredRetentionFile() {
+        DataFile dataFile = new DataFile();
+        dataFile.setId(2L);
+
+        // With an expired retention end date, an unrestricted file should not be accessible
+
+        Retention ret = new Retention(LocalDate.now().minusDays(1), "Retention period expired");
+        dataFile.setRetention(ret);
+
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+
+        FileMetadata fileMetadata = new FileMetadata();
+        fileMetadata.setId(1L);
+        fileMetadata.setRestricted(false);
+        fileMetadata.setDataFile(dataFile);
+        fileMetadata.setDatasetVersion(datasetVersion);
+
+        assertFalse(fileDownloadHelper.canDownloadFile(fileMetadata));
+    }
+
+    @Test
+    void testCanDownloadFile_forUnrestrictedReleasedNotExpiredRetentionFile() {
+        DataFile dataFile = new DataFile();
+        dataFile.setId(2L);
+
+        // With a retention end date in the future, an unrestricted file should be accessible
+
+        Retention ret = new Retention(LocalDate.now(), "Retention period NOT expired");
+        dataFile.setRetention(ret);
+
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+
+        FileMetadata fileMetadata = new FileMetadata();
+        fileMetadata.setId(1L);
+        fileMetadata.setRestricted(false);
+        fileMetadata.setDataFile(dataFile);
+        fileMetadata.setDatasetVersion(datasetVersion);
+
+        assertTrue(fileDownloadHelper.canDownloadFile(fileMetadata));
+    }
+
     @ParameterizedTest
     @CsvSource({"false", "true"})
     void testCanDownloadFile_forRestrictedReleasedFile(boolean hasPermission) {
@@ -193,6 +283,62 @@ void testCanDownloadFile_forRestrictedReleasedFile(boolean hasPermission) {
         assertEquals(hasPermission, fileDownloadHelper.canDownloadFile(fileMetadata), "Cached response does not match initial response!");
     }
 
+    @ParameterizedTest
+    @CsvSource({"false", "true"})
+    void testCanDownloadFile_forRestrictedReleasedFileWithActiveEmbargo(boolean hasPermission) {
+        DataFile dataFile = new DataFile();
+        dataFile.setId(2L);
+
+        // With an active embargo, a restricted file should have the same access regardless of
+        // embargo state (with an active embargo, there's no way to request permissions,
+        // so the hasPermission=true case primarily applies to the original dataset
+        // creators)
+
+        Embargo emb = new Embargo(LocalDate.now().plusDays(3), "Still embargoed");
+        dataFile.setEmbargo(emb);
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+
+        FileMetadata fileMetadata = new FileMetadata();
+        fileMetadata.setId(1L);
+        fileMetadata.setRestricted(true);
+        fileMetadata.setDataFile(dataFile);
+        fileMetadata.setDatasetVersion(datasetVersion);
+
+        mockPermissionResponseRequestOn(Permission.DownloadFile, hasPermission);
+        
+        assertEquals(hasPermission, fileDownloadHelper.canDownloadFile(fileMetadata), "Initial response does not match expectation!");
+    }
+    
+    @ParameterizedTest
+    @CsvSource({"false", "true"})
+    void testCanDownloadFile_forRestrictedReleasedFileWithExpiredEmbargo(boolean hasPermission) {
+        DataFile dataFile = new DataFile();
+        dataFile.setId(2L);
+
+        // With an embargo, a restricted file should have the same access regardless of
+        // embargo state (with an active embargo, there's no way to request permissions,
+        // so the hasPermission=true case primarily applies to the original dataset
+        // creators)
+
+        Embargo emb = new Embargo(LocalDate.now().minusDays(3), "No longer embargoed");
+        dataFile.setEmbargo(emb);
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+
+        FileMetadata fileMetadata = new FileMetadata();
+        fileMetadata.setId(1L);
+        fileMetadata.setRestricted(true);
+        fileMetadata.setDataFile(dataFile);
+        fileMetadata.setDatasetVersion(datasetVersion);
+
+        mockPermissionResponseRequestOn(Permission.DownloadFile, hasPermission);
+
+        assertEquals(hasPermission, fileDownloadHelper.canDownloadFile(fileMetadata), "Initial response does not match expectation!");
+
+    }
+
+
     private void mockPermissionResponseUserOn(Permission permission, boolean response) {
         PermissionServiceBean.StaticPermissionQuery staticPermissionQuery = mock(PermissionServiceBean.StaticPermissionQuery.class);
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/FileMetadataTest.java b/src/test/java/edu/harvard/iq/dataverse/FileMetadataTest.java
index e9e9ea4a051..69de7a2900d 100644
--- a/src/test/java/edu/harvard/iq/dataverse/FileMetadataTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/FileMetadataTest.java
@@ -1,10 +1,15 @@
 package edu.harvard.iq.dataverse;
 
 import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.time.Instant;
+import java.util.Date;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileMetadataTest {
@@ -35,7 +40,7 @@ void testGetFileDateToDisplay_fileWithoutPublicationDate() {
     datafile.setPublicationDate(null);
     datafile.setCreateDate(Timestamp.valueOf("2019-01-01 00:00:00"));
     metadata.setDataFile(datafile);
-    assertEquals("Jan 1, 2019", metadata.getFileDateToDisplay());
+    assertEquals(DateFormat.getDateInstance(DateFormat.DEFAULT, BundleUtil.getCurrentLocale()).format(Date.from(Instant.parse("2019-01-01T00:00:00.00Z"))), metadata.getFileDateToDisplay());
   }
 
   @Test
@@ -44,6 +49,6 @@ void testGetFileDateToDisplay_fileWithPublicationDate() {
     datafile.setPublicationDate(Timestamp.valueOf("2019-02-02 00:00:00"));
     datafile.setCreateDate(Timestamp.valueOf("2019-01-02 00:00:00"));
     metadata.setDataFile(datafile);
-    assertEquals("Feb 2, 2019", metadata.getFileDateToDisplay());
+    assertEquals(DateFormat.getDateInstance(DateFormat.DEFAULT, BundleUtil.getCurrentLocale()).format(Date.from(Instant.parse("2019-02-02T00:00:00.00Z"))), metadata.getFileDateToDisplay());
   }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/GlobalIdTest.java b/src/test/java/edu/harvard/iq/dataverse/GlobalIdTest.java
index 023121f5cb2..7065e9689e1 100644
--- a/src/test/java/edu/harvard/iq/dataverse/GlobalIdTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/GlobalIdTest.java
@@ -1,9 +1,16 @@
 package edu.harvard.iq.dataverse;
 
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Rule;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
@@ -11,13 +18,10 @@
  */
 public class GlobalIdTest {
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
     @Test
     public void testValidDOI() {
         System.out.println("testValidDOI");
-        GlobalId instance = new GlobalId("doi:10.5072/FK2/BYM3IW");
+        GlobalId instance = new GlobalId(AbstractDOIProvider.DOI_PROTOCOL,"10.5072","FK2/BYM3IW", "/", AbstractDOIProvider.DOI_RESOLVER_URL, null);
 
         assertEquals("doi", instance.getProtocol());
         assertEquals("10.5072", instance.getAuthority());
@@ -28,7 +32,7 @@ public void testValidDOI() {
     @Test
     public void testValidHandle() {
         System.out.println("testValidDOI");
-        GlobalId instance = new GlobalId("hdl:1902.1/111012");
+        GlobalId instance = new GlobalId(HandlePidProvider.HDL_PROTOCOL, "1902.1","111012", "/", HandlePidProvider.HDL_RESOLVER_URL, null);
 
         assertEquals("hdl", instance.getProtocol());
         assertEquals("1902.1", instance.getAuthority());
@@ -43,7 +47,7 @@ public void testContructFromDataset() {
         testDS.setAuthority("10.5072");
         testDS.setIdentifier("FK2/BYM3IW");
 
-        GlobalId instance = new GlobalId(testDS);
+        GlobalId instance = testDS.getGlobalId();
 
         assertEquals("doi", instance.getProtocol());
         assertEquals("10.5072", instance.getAuthority());
@@ -54,53 +58,53 @@ public void testContructFromDataset() {
     public void testInject() {
         System.out.println("testInject (weak test)");
 
-        String badProtocol = "hdl:'Select value from datasetfieldvalue';/ha";
+        // String badProtocol = "hdl:'Select value from datasetfieldvalue';/ha";
+        GlobalId instance = PidUtil.parseAsGlobalID(HandlePidProvider.HDL_PROTOCOL, "'Select value from datasetfieldvalue';", "ha");
+        assertNull(instance); 
 
-        GlobalId instance = new GlobalId(badProtocol);
-
-        assertEquals("hdl", instance.getProtocol());
-        assertEquals("Selectvaluefromdatasetfieldvalue", instance.getAuthority());
-        assertEquals("ha", instance.getIdentifier());
         //exception.expect(IllegalArgumentException.class);
         //exception.expectMessage("Failed to parse identifier: " + badProtocol);
         //new GlobalId(badProtocol);
     }
 
     @Test
+    @Disabled /* Could now add a 'doy' protocol so the test would have to check against registered PIDProviders (currently Beans)*/
     public void testUnknownProtocol() {
         System.out.println("testUnknownProtocol");
 
         String badProtocol = "doy:10.5072/FK2/BYM3IW";
-
-        exception.expect(IllegalArgumentException.class);
-        exception.expectMessage("Failed to parse identifier: " + badProtocol);
-        new GlobalId(badProtocol);
+        
+        //exception.expect(IllegalArgumentException.class);
+        //exception.expectMessage("Failed to parse identifier: " + badProtocol);
+        //new GlobalId(badProtocol);
     }
 
     @Test
+    @Disabled /* Could now change parsing rules so the test would have to check against registered PIDProviders (currently Beans)*/
     public void testBadIdentifierOnePart() {
         System.out.println("testBadIdentifierOnePart");
 
-        exception.expect(IllegalArgumentException.class);
-        exception.expectMessage("Failed to parse identifier: 1part");
-        new GlobalId("1part");
+        //exception.expect(IllegalArgumentException.class);
+        //exception.expectMessage("Failed to parse identifier: 1part");
+        //new GlobalId("1part");
     }
 
     @Test
+    @Disabled /* Could now change parsing rules so the test would have to check against registered PIDProviders (currently Beans)*/
     public void testBadIdentifierTwoParts() {
         System.out.println("testBadIdentifierTwoParts");
 
-        exception.expect(IllegalArgumentException.class);
-        exception.expectMessage("Failed to parse identifier: doi:2part/blah");
-        new GlobalId("doi:2part/blah");
+        //exception.expect(IllegalArgumentException.class);
+        //exception.expectMessage("Failed to parse identifier: doi:2part/blah");
+        //new GlobalId("doi:2part/blah");
     }
 
     @Test
     public void testIsComplete() {
-        assertFalse(new GlobalId("doi", "10.123", null).isComplete());
-        assertFalse(new GlobalId("doi", null, "123").isComplete());
-        assertFalse(new GlobalId(null, "10.123", "123").isComplete());
-        assertTrue(new GlobalId("doi", "10.123", "123").isComplete());
+        assertFalse(new GlobalId("doi", "10.123", null, null, null, null).isComplete());
+        assertFalse(new GlobalId("doi", null, "123", null, null, null).isComplete());
+        assertFalse(new GlobalId(null, "10.123", "123", null, null, null).isComplete());
+        assertTrue(new GlobalId("doi", "10.123", "123", null, null, null).isComplete());
     }
 
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/LocaleTest.java b/src/test/java/edu/harvard/iq/dataverse/LocaleTest.java
new file mode 100644
index 00000000000..1ca43cde138
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/LocaleTest.java
@@ -0,0 +1,30 @@
+package edu.harvard.iq.dataverse;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Locale;
+import java.util.TimeZone;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+public class LocaleTest {
+    
+    /**
+     * Many of our tests require setting the locale and timezone appropriately
+     * as formating dates, numbers, etc are based on it. Ensure consistency.
+     */
+    @Test
+    void ensureLocale() {
+        Locale l = Locale.getDefault();
+        TimeZone tz = TimeZone.getDefault();
+    
+        System.out.println("user.language="+l.getLanguage());
+        System.out.println("user.region="+l.getCountry());
+        System.out.println("user.timezone="+tz.getDefault().getID());
+        
+        assertThat(l.getLanguage(), equalTo("en"));
+        assertThat(l.getCountry(), equalTo("US"));
+        assertThat(tz.getID(), equalTo("UTC"));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/MailServiceBeanIT.java b/src/test/java/edu/harvard/iq/dataverse/MailServiceBeanIT.java
new file mode 100644
index 00000000000..1e81ae33f60
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/MailServiceBeanIT.java
@@ -0,0 +1,143 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.MailSessionProducer;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import edu.harvard.iq.dataverse.util.testing.Tags;
+import io.restassured.RestAssured;
+import jakarta.mail.Session;
+import jakarta.mail.internet.AddressException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.util.List;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * An integration test using a fake SMTP MTA to check for outgoing mails.
+ * LIMITATION: This test cannot possibly check if the production and injection of the session via CDI
+ *             works, as it is not running within a servlet container. This would require usage of Arquillian
+ *             or and end-to-end API test with a deployed application.
+ */
+
+@Tag(Tags.INTEGRATION_TEST)
+@Tag(Tags.USES_TESTCONTAINERS)
+@Testcontainers(disabledWithoutDocker = true)
+@ExtendWith(MockitoExtension.class)
+@LocalJvmSettings
+@JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, method = "tcSmtpHost", varArgs = "host")
+@JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, method = "tcSmtpPort", varArgs = "port")
+class MailServiceBeanIT {
+    
+    private static final Integer PORT_SMTP = 1025;
+    private static final Integer PORT_HTTP = 1080;
+    
+    static MailServiceBean mailer;
+    static Session session;
+    static SettingsServiceBean settingsServiceBean = Mockito.mock(SettingsServiceBean.class);
+    static DataverseServiceBean dataverseServiceBean = Mockito.mock(DataverseServiceBean.class);
+    
+    @BeforeAll
+    static void setUp() {
+        // Setup mocks behavior, inject as deps
+        Mockito.when(settingsServiceBean.getValueForKey(SettingsServiceBean.Key.SystemEmail)).thenReturn("noreply@example.org");
+        BrandingUtil.injectServices(dataverseServiceBean, settingsServiceBean);
+        
+        // Must happen here, as we need Testcontainers to start the container first...
+        session = new MailSessionProducer().getSession();
+        mailer = new MailServiceBean(session, settingsServiceBean);
+    }
+    
+    /*
+        Cannot use maildev/maildev here. Also MailCatcher doesn't provide official support for SMTPUTF8.
+        Also maildev does advertise the feature and everything is fine over the wire, both JSON API and Web UI
+        of maildev have an encoding problem - UTF-8 mail addresses following RFC 6530/6531/6532 are botched.
+        Neither MailCatcher nor MailHog have this problem, yet the API of MailCatcher is much simpler
+        to use during testing, which is why we are going with it.
+     */
+    @Container
+    static GenericContainer<?> maildev = new GenericContainer<>("dockage/mailcatcher")
+        .withExposedPorts(PORT_HTTP, PORT_SMTP)
+        .waitingFor(Wait.forHttp("/").forPort(PORT_HTTP));
+    
+    static String tcSmtpHost() {
+        return maildev.getHost();
+    }
+    
+    static String tcSmtpPort() {
+        return maildev.getMappedPort(PORT_SMTP).toString();
+    }
+    
+    @BeforeAll
+    static void setup() {
+        RestAssured.baseURI = "http://" + tcSmtpHost();
+        RestAssured.port = maildev.getMappedPort(PORT_HTTP);
+    }
+    
+    static List<String> mailTo() {
+        return List.of(
+            "pete@mailinator.com", // one example using ASCII only, make sure it works
+            "michÊlle.pereboom@example.com",
+            "begÃŧm.vriezen@example.com",
+            "lÃŗtus.gonçalves@example.com",
+            "lÃŗtus.gonçalves@Êxample.com",
+            "begÃŧm.vriezen@example.cologne",
+            "ØąŲˆŲ†ÛŒÚŠØ§.Ų…Ø­Ų…د؎اŲ†@example.com",
+            "lÃŗtus.gonçalves@example.cÃŗm"
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("mailTo")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SUPPORT_UTF8, value = "true")
+    void sendEmailIncludingUTF8(String mailAddress) {
+        given().when().get("/messages")
+            .then()
+            .statusCode(200);
+        
+        // given
+        Session session = new MailSessionProducer().getSession();
+        MailServiceBean mailer = new MailServiceBean(session, settingsServiceBean);
+        
+        // when
+        boolean sent = mailer.sendSystemEmail(mailAddress, "Test", "Test ÃŧÃŧÃŧ", false);
+        
+        // then
+        assertTrue(sent);
+        //RestAssured.get("/messages").body().prettyPrint();
+        given().when().get("/messages")
+            .then()
+            .statusCode(200)
+            .body("last().recipients.first()", equalTo("<" + mailAddress + ">"));
+    }
+    
+    @Test
+    @JvmSetting(key = JvmSettings.SYSTEM_EMAIL, value = "test@example.org")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SUPPORT_UTF8, value = "false")
+    void mailRejectedWhenUTF8AddressButNoSupport() throws AddressException {
+        // given
+        Session session = new MailSessionProducer().getSession();
+        MailServiceBean mailer = new MailServiceBean(session, settingsServiceBean);
+        String to = "michÊlle.pereboom@example.com";
+        
+        assertFalse(mailer.sendSystemEmail(to, "Test", "Test", false));
+    }
+    
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/MailServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/MailServiceBeanTest.java
new file mode 100644
index 00000000000..afcc12949d6
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/MailServiceBeanTest.java
@@ -0,0 +1,151 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.branding.BrandingUtilTest;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.UnsupportedEncodingException;
+
+import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@ExtendWith(MockitoExtension.class)
+class MailServiceBeanTest {
+    
+    @Nested
+    class Delegation {
+        /**
+         * We need to reset the BrandingUtil mocks for every test, as we rely on them being set to default.
+         */
+        @BeforeEach
+        void setup() {
+            BrandingUtilTest.setupMocks();
+        }
+        @AfterAll
+        static void tearDown() {
+            BrandingUtilTest.tearDownMocks();
+        }
+        
+        @ParameterizedTest
+        @CsvSource(value  = {
+            // with name in admin mail address
+            "Foo Bar <foo@bar.org>, NULL, NULL, Foo Bar",
+            // without name, but installation branding name set
+            "dataverse@dataverse.org, NULL, LibraScholar Dataverse, LibraScholar Dataverse",
+            // without name, but root dataverse name available
+            "dataverse@dataverse.org, NotLibraScholar, NULL, NotLibraScholar",
+            // without name, without root dataverse name, without installation name -> default to bundle string.
+            "dataverse@dataverse.org, NULL, NULL, Dataverse Installation Admin"
+        }, nullValues = {"NULL"})
+        void setContactDelegation(String fromMail, String rootDataverseName, String installationName, String expectedStartsWith) throws AddressException {
+            BrandingUtilTest.setRootDataverseName(rootDataverseName);
+            BrandingUtilTest.setInstallationName(installationName);
+            
+            InternetAddress fromAddress = new InternetAddress(fromMail);
+            MailServiceBean mailServiceBean = new MailServiceBean();
+            try {
+                mailServiceBean.setContactDelegation("user@example.edu", fromAddress);
+                assertTrue(fromAddress.getPersonal().startsWith(expectedStartsWith));
+                assertTrue(fromAddress.getPersonal().endsWith(" on behalf of user@example.edu"));
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+    @Nested
+    @LocalJvmSettings
+    class LookupMailAddresses {
+        
+        @Mock
+        SettingsServiceBean settingsServiceBean;
+        
+        @InjectMocks
+        MailServiceBean mailServiceBean = new MailServiceBean();
+        
+        private static final String email = "test@example.org";
+        
+        @Test
+        void lookupSystemWithoutAnySetting() {
+            assertTrue(mailServiceBean.getSystemAddress().isEmpty());
+        }
+        
+        @Test
+        void lookupSystemWithDBOnly() {
+            Mockito.when(settingsServiceBean.getValueForKey(Key.SystemEmail)).thenReturn(email);
+            assertEquals(email, mailServiceBean.getSystemAddress().get().getAddress());
+        }
+        
+        @Test
+        @JvmSetting(key = JvmSettings.SYSTEM_EMAIL, value = email)
+        void lookupSystemWithMPConfig() {
+            assertEquals(email, mailServiceBean.getSystemAddress().get().getAddress());
+        }
+        
+        @Test
+        @JvmSetting(key = JvmSettings.SYSTEM_EMAIL, value = email)
+        void lookupSystemWhereMPConfigTakesPrecedenceOverDB() {
+            Mockito.lenient().when(settingsServiceBean.getValueForKey(Key.SystemEmail)).thenReturn("foobar@example.org");
+            assertEquals(email, mailServiceBean.getSystemAddress().get().getAddress());
+        }
+        
+        @Test
+        void lookupSupportWithoutAnySetting() {
+            assertTrue(mailServiceBean.getSupportAddress().isEmpty());
+        }
+        
+        @Test
+        @JvmSetting(key = JvmSettings.SYSTEM_EMAIL, value = email)
+        void lookupSupportNotSetButWithSystemPresent() {
+            assertEquals(email, mailServiceBean.getSupportAddress().get().getAddress());
+        }
+        
+        @Test
+        @JvmSetting(key = JvmSettings.SUPPORT_EMAIL, value = email)
+        void lookupSupportWithoutSystemSet() {
+            assertTrue(mailServiceBean.getSystemAddress().isEmpty());
+            assertEquals(email, mailServiceBean.getSupportAddress().get().getAddress());
+        }
+        
+        @Test
+        @JvmSetting(key = JvmSettings.SYSTEM_EMAIL, value = email)
+        @JvmSetting(key = JvmSettings.SUPPORT_EMAIL, value = "support@example.org")
+        void lookupSupportSetWithSystemPresent() {
+            assertEquals(email, mailServiceBean.getSystemAddress().get().getAddress());
+            assertEquals("support@example.org", mailServiceBean.getSupportAddress().get().getAddress());
+        }
+    }
+    
+    @Nested
+    @LocalJvmSettings
+    class SendSystemMail {
+        @Mock
+        SettingsServiceBean settingsServiceBean;
+        @InjectMocks
+        MailServiceBean mailServiceBean = new MailServiceBean();
+        
+        @Test
+        @JvmSetting(key = JvmSettings.SYSTEM_EMAIL, value = "")
+        void skipIfNoSystemAddress() {
+            assertFalse(mailServiceBean.sendSystemEmail("target@example.org", "Test", "Test", false));
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java b/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java
new file mode 100644
index 00000000000..18c703a71cb
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java
@@ -0,0 +1,126 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class MetadataBlockTest {
+
+    private static final String PROPERTIES_FILE_NAME = "metadataBlockTest";
+
+    @Test
+    public void equals_should_be_based_on_id_only() {
+        Long id = MocksFactory.nextId();
+        MetadataBlock metadataBlock1 = new MetadataBlock();
+        metadataBlock1.setId(id);
+        metadataBlock1.setName(UUID.randomUUID().toString());
+        MetadataBlock metadataBlock2 = new MetadataBlock();
+        metadataBlock2.setId(id);
+        metadataBlock1.setName(UUID.randomUUID().toString());
+
+        MatcherAssert.assertThat(metadataBlock1.equals(metadataBlock2), Matchers.is(true));
+
+        metadataBlock1 = new MetadataBlock();
+        metadataBlock1.setId(MocksFactory.nextId());
+        metadataBlock1.setName("EQUAL");
+        metadataBlock2 = new MetadataBlock();
+        metadataBlock2.setId(MocksFactory.nextId());
+        metadataBlock1.setName("EQUAL");
+
+        MatcherAssert.assertThat(metadataBlock1.equals(metadataBlock2), Matchers.is(false));
+    }
+
+    @Test
+    public void getLocaleDisplayName_should_default_value_from_displayName_when_bundle_not_found() {
+        MetadataBlock target = Mockito.spy(new MetadataBlock());
+        target.setName(UUID.randomUUID().toString());
+        target.setDisplayName(UUID.randomUUID().toString());
+
+        //Value when no resource file found with metadata block name
+        MatcherAssert.assertThat(target.getLocaleDisplayName(), Matchers.is(target.getDisplayName()));
+        Mockito.verify(target).getLocaleValue("metadatablock.displayName");
+    }
+
+    @Test
+    public void getLocaleDisplayName_should_get_value_from_properties_based_on_name() {
+        MetadataBlock target = Mockito.spy(new MetadataBlock());
+        target.setName(PROPERTIES_FILE_NAME);
+        target.setDisplayName(UUID.randomUUID().toString());
+
+        // Values is coming from the metadataBlockTest.properties file
+        MatcherAssert.assertThat(target.getLocaleDisplayName(), Matchers.is("property_value_for_displayName"));
+        Mockito.verify(target).getLocaleValue("metadatablock.displayName");
+    }
+
+    @Test
+    public void getLocaleDisplayFacet_should_default_value_from_displayName_when_bundle_not_found() {
+        MetadataBlock target = Mockito.spy(new MetadataBlock());
+        target.setName(UUID.randomUUID().toString());
+        target.setDisplayName(UUID.randomUUID().toString());
+
+        MatcherAssert.assertThat(target.getLocaleDisplayFacet(), Matchers.is(target.getDisplayName()));
+        Mockito.verify(target).getLocaleValue("metadatablock.displayFacet");
+    }
+
+    @Test
+    public void getLocaleDisplayFacet_should_get_value_from_properties_based_on_name() {
+        MetadataBlock target = Mockito.spy(new MetadataBlock());
+        target.setName(PROPERTIES_FILE_NAME);
+        target.setDisplayName(UUID.randomUUID().toString());
+
+        // Values is coming from the metadataBlockTest.properties file
+        MatcherAssert.assertThat(target.getLocaleDisplayFacet(), Matchers.is("property_value_for_displayFacet"));
+        Mockito.verify(target).getLocaleValue("metadatablock.displayFacet");
+    }
+
+    @Test
+    public void testLanguageBundle() throws Exception {
+        String fileName = "scripts/api/data/metadatablocks/citation.tsv";
+        Set<String> languages = BundleUtil.getResourceBundle("citation").keySet();
+        try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) {
+            String line;
+            String bundleKey = "";
+            int missingCount = 0;
+            AtomicInteger unusedCount = new AtomicInteger();
+            while ((line = reader.readLine()) != null) {
+                if (line.startsWith("#controlledVocabulary")) {
+                    while ((line = reader.readLine()) != null) {
+                        if (line.startsWith("\tlanguage")) {
+                            String[] values = line.split("\t");
+                            String key = values[2];
+                            bundleKey = StringUtils.stripAccents("controlledvocabulary.language." + key.toLowerCase().replace(" ", "_"));
+                            if (languages.contains(bundleKey)) {
+                                languages.remove(bundleKey);
+                            } else {
+                                missingCount++;
+                                System.out.println("Missing key:" + key.toLowerCase().replace(" ", "_") + " " + bundleKey);
+                            }
+                        }
+                    }
+                    languages.forEach(l -> {
+                        if (l.startsWith("controlledvocabulary.language")) {
+                            unusedCount.getAndIncrement();
+                            System.out.println("Unused key:" + l);
+                        }
+                    });
+                    System.out.println("Missing count:"+missingCount);
+                    System.out.println("Unused Count:" + unusedCount.get());
+                }
+            }
+            assertEquals(0, missingCount);
+            assertEquals(0, unusedCount.get());
+        }
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/NonEssentialTests.java b/src/test/java/edu/harvard/iq/dataverse/NonEssentialTests.java
deleted file mode 100644
index 612904cbd26..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/NonEssentialTests.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.harvard.iq.dataverse;
-
-/**
- * Tests annotated as non-essential will not be run by default on developers'
- * laptops but they will run on continuous integration platforms like Travis CI.
- * To work on one of these tests, you have to comment out the annotation.
- */
-public interface NonEssentialTests {
-
-}
diff --git a/src/test/java/edu/harvard/iq/dataverse/PermissionsWrapperTest.java b/src/test/java/edu/harvard/iq/dataverse/PermissionsWrapperTest.java
index 7ebc7e3c807..751a90fb447 100644
--- a/src/test/java/edu/harvard/iq/dataverse/PermissionsWrapperTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/PermissionsWrapperTest.java
@@ -1,12 +1,12 @@
 package edu.harvard.iq.dataverse;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
@@ -19,14 +19,14 @@ public class PermissionsWrapperTest {
 
     private PermissionsWrapper permissionWrapper;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         this.permissionWrapper = new PermissionsWrapper();
         this.permissionWrapper.permissionService = mock(PermissionServiceBean.class);
         this.permissionWrapper.dvRequestService = mock(DataverseRequestServiceBean.class);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         this.permissionWrapper = null;
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/PersistentIdentifierServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/PersistentIdentifierServiceBeanTest.java
deleted file mode 100644
index b49c1cfadc7..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/PersistentIdentifierServiceBeanTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-import edu.harvard.iq.dataverse.engine.TestCommandContext;
-import edu.harvard.iq.dataverse.engine.command.CommandContext;
-import edu.harvard.iq.dataverse.pidproviders.FakePidProviderServiceBean;
-import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import java.util.List;
-import java.util.Map;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author michael
- */
-public class PersistentIdentifierServiceBeanTest {
-    
-    
-    DOIEZIdServiceBean ezidServiceBean = new DOIEZIdServiceBean();
-    DOIDataCiteServiceBean dataCiteServiceBean = new DOIDataCiteServiceBean();
-    FakePidProviderServiceBean fakePidProviderServiceBean = new FakePidProviderServiceBean();
-    HandlenetServiceBean hdlServiceBean = new HandlenetServiceBean();
-    
-    CommandContext ctxt;
-    
-    @Before
-    public void setup() {
-        ctxt = new TestCommandContext(){
-            @Override
-            public HandlenetServiceBean handleNet() {
-                return hdlServiceBean;
-            }
-
-            @Override
-            public DOIDataCiteServiceBean doiDataCite() {
-                return dataCiteServiceBean;
-            }
-
-            @Override
-            public DOIEZIdServiceBean doiEZId() {
-                return ezidServiceBean;
-            }
-
-            @Override
-            public FakePidProviderServiceBean fakePidProvider() {
-                return fakePidProviderServiceBean;
-            }
-            
-        };
-    }
-    
-    /**
-     * Test of getBean method, of class PersistentIdentifierServiceBean.
-     */
-    @Test
-    public void testGetBean_String_CommandContext_OK() {
-        ctxt.settings().setValueForKey( SettingsServiceBean.Key.DoiProvider, "EZID");
-        assertEquals(ezidServiceBean, 
-                     GlobalIdServiceBean.getBean("doi", ctxt));
-        
-        ctxt.settings().setValueForKey( SettingsServiceBean.Key.DoiProvider, "DataCite");
-        assertEquals(dataCiteServiceBean, 
-                     GlobalIdServiceBean.getBean("doi", ctxt));
-
-        ctxt.settings().setValueForKey(SettingsServiceBean.Key.DoiProvider, "FAKE");
-        assertEquals(fakePidProviderServiceBean,
-                GlobalIdServiceBean.getBean("doi", ctxt));
-
-        assertEquals(hdlServiceBean, 
-                     GlobalIdServiceBean.getBean("hdl", ctxt));
-    }
-    
-     @Test
-    public void testGetBean_String_CommandContext_BAD() {
-        ctxt.settings().setValueForKey( SettingsServiceBean.Key.DoiProvider, "non-existent-provider");
-        assertNull(GlobalIdServiceBean.getBean("doi", ctxt));
-        
-        
-        assertNull(GlobalIdServiceBean.getBean("non-existent-protocol", ctxt));
-    }
-
-    /**
-     * Test of getBean method, of class PersistentIdentifierServiceBean.
-     */
-    @Test
-    public void testGetBean_CommandContext() {
-        ctxt.settings().setValueForKey( SettingsServiceBean.Key.Protocol, "doi");
-        ctxt.settings().setValueForKey( SettingsServiceBean.Key.DoiProvider, "EZID");
-        
-        assertEquals(ezidServiceBean, 
-                     GlobalIdServiceBean.getBean("doi", ctxt));
-        
-        ctxt.settings().setValueForKey( SettingsServiceBean.Key.Protocol, "hdl");
-        assertEquals(hdlServiceBean, 
-                     GlobalIdServiceBean.getBean("hdl", ctxt));
-    }
-
-   
-}
diff --git a/src/test/java/edu/harvard/iq/dataverse/RoleAssignmentTest.java b/src/test/java/edu/harvard/iq/dataverse/RoleAssignmentTest.java
index e4b33b83930..f8138537cd7 100644
--- a/src/test/java/edu/harvard/iq/dataverse/RoleAssignmentTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/RoleAssignmentTest.java
@@ -1,18 +1,18 @@
 package edu.harvard.iq.dataverse;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 public class RoleAssignmentTest {
 
@@ -22,7 +22,7 @@ public class RoleAssignmentTest {
     private Dataset dataset;
     private String privateUrlToken;
 
-    @Before
+    @BeforeEach
     public void before() {
         this.dataverseRole = new DataverseRole();
         this.roleAssignee = GuestUser.get();
@@ -30,7 +30,7 @@ public void before() {
         this.privateUrlToken = "some-token";
     }
 
-    @After
+    @AfterEach
     public void after() {
         this.dataverseRole = null;
         this.roleAssignee = null;
diff --git a/src/test/java/edu/harvard/iq/dataverse/URLValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/URLValidatorTest.java
deleted file mode 100644
index 292eeeab0e8..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/URLValidatorTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-
-package edu.harvard.iq.dataverse;
-
-import static org.junit.Assert.assertEquals;
-
-import javax.validation.ConstraintValidatorContext;
-
-import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorContextImpl;
-import org.hibernate.validator.internal.engine.path.PathImpl;
-import org.junit.Test;
-
-/**
- *
- * @author skraffmi
- */
-public class URLValidatorTest {
-
-    @Test
-    public void testIsURLValid() {
-        assertEquals(true, URLValidator.isURLValid(null));
-        assertEquals(true, URLValidator.isURLValid(""));
-        assertEquals(true, URLValidator.isURLValid("https://twitter.com/"));
-
-        assertEquals(false, URLValidator.isURLValid("cnn.com"));
-
-    }
-
-    @Test
-    public void testIsValidWithUnspecifiedContext() {
-        String value = "https://twitter.com/";
-        ConstraintValidatorContext context = null;
-        assertEquals(true, new URLValidator().isValid(value, context));
-    }
-
-    @Test
-    public void testIsValidWithContextAndValidURL() {
-        String value = "https://twitter.com/";
-        ConstraintValidatorContext context = new ConstraintValidatorContextImpl(null, PathImpl.createPathFromString(""), null);
-
-        assertEquals(true, new URLValidator().isValid(value, context));
-    }
-
-    @Test
-    public void testIsValidWithContextButInvalidURL() {
-        String value = "cnn.com";
-        ConstraintValidatorContext context = new ConstraintValidatorContextImpl(null, PathImpl.createPathFromString(""), null);
-
-        assertEquals(false, new URLValidator().isValid(value, context));
-    }
-
-}
diff --git a/src/test/java/edu/harvard/iq/dataverse/UserNameValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/UserNameValidatorTest.java
deleted file mode 100644
index 90726c9420e..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/UserNameValidatorTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package edu.harvard.iq.dataverse;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- *
- * @author sarahferry
- * @author alexscheitlin
- */
-@RunWith(Parameterized.class)
-public class UserNameValidatorTest {
-
-    public boolean isValid;
-    public String userName;
-
-    public UserNameValidatorTest(boolean isValid, String userName) {
-        this.isValid = isValid;
-        this.userName = userName;
-    }
-
-    @Parameters
-    public static Collection<Object[]> parameters() {
-        return Arrays.asList(new Object[][] {
-            // good usernames
-            { true, "sarah" },
-            { true, ".-_5Arah_-." },
-
-            // dont allow accents
-            { false, "àèÃŦÃ˛ÃšÃ€ÃˆÃŒÃ’Ã™ÃĄÃŠÃ­ÃŗÃēÃŊÁÉÍÓÚÝÃĸÃĒÎôÃģÂÊÎÔÛÃŖÃąÃĩÃÑÕäÃĢïÃļÃŧÃŋÄËÏÖÜŸçÇßØøÅÃĨÆÃĻœ" },
-
-            // dont allow chinese characters
-            { false, "谁æ—Ĩ吧įˆ¸åĨŊ" },
-
-            // dont allow middle white space
-            { false, "sarah f" },
-
-            // dont allow leading white space
-            { false, " sarah" },
-
-            // dont allow trailing white space
-            { false, "sarah " },
-
-            // dont allow symbols
-            { false, "sarah!" },
-            { false, "sarah?" },
-            { false, "sarah:(" },
-            { false, "💲🅰ī¸ÂŽī¸đŸ…°ī¸đŸš§" },
-
-            // only allow between 2 and 60 characters
-            { false, "q" },
-            { true, "q2" },
-            { false, "q2jsalfhjopiwurtiosfhkdhasjkdhfgkfhkfrhnefcn4cqonroclmooi4oiqwhrfq4jrlqhaskdalwehrlwhflhklasdjfglq0kkajfelirhilwhakjgv" },
-            { false, "" },
-            { false, null }
-        });
-    }
-
-    @Test
-    public void testIsUserNameValid() {
-        assertEquals(isValid, UserNameValidator.isUserNameValid(userName, null));
-    }
-}
diff --git a/src/test/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecordTest.java b/src/test/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecordTest.java
index 1726ea70114..6a965b17a16 100644
--- a/src/test/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecordTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecordTest.java
@@ -1,13 +1,13 @@
 package edu.harvard.iq.dataverse.actionlogging;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Date;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord.ActionType;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord.Result;
@@ -16,7 +16,7 @@ public class ActionLogRecordTest {
 
     private ActionLogRecord referenceRecord;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         this.referenceRecord = new ActionLogRecord(ActionType.Admin, "subType1");
         this.referenceRecord.setEndTime(new Date());
@@ -25,7 +25,7 @@ public void setUp() {
         this.referenceRecord.setInfo("info1");
     }
 
-    @After
+    @AfterEach
     public void tearDwon() {
         this.referenceRecord = null;
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AbstractApiBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/api/AbstractApiBeanTest.java
index 3e088c184ad..c67dfeeadfa 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AbstractApiBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AbstractApiBeanTest.java
@@ -1,24 +1,22 @@
 package edu.harvard.iq.dataverse.api;
 
-import edu.harvard.iq.dataverse.util.MockResponse;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
-import javax.json.stream.JsonGenerator;
-import javax.ws.rs.core.Response;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.ws.rs.core.Response;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class AbstractApiBeanTest {
 
@@ -26,7 +24,7 @@ public class AbstractApiBeanTest {
 
     AbstractApiBeanImpl sut;
 
-    @Before
+    @BeforeEach
     public void before() {
         sut = new AbstractApiBeanImpl();
     }
@@ -40,15 +38,15 @@ public void testParseBooleanOrDie_ok() throws Exception {
         assertFalse(sut.parseBooleanOrDie("0"));
         assertFalse(sut.parseBooleanOrDie("no"));
     }
-
-    @Test(expected = Exception.class)
-    public void testParseBooleanOrDie_invalid() throws Exception {
-        sut.parseBooleanOrDie("I'm not a boolean value!");
+    
+    @Test
+    void testParseBooleanOrDie_invalid() {
+        assertThrows(Exception.class, () -> sut.parseBooleanOrDie("I'm not a boolean value!"));
     }
 
     @Test
-    public void testFailIfNull_ok() throws Exception {
-        sut.failIfNull(sut, "");
+    void testFailIfNull_ok() {
+        assertDoesNotThrow(() -> sut.failIfNull(sut, ""));
     }
 
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
index 7a69793ebb3..dd8ddd2d315 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
@@ -5,34 +5,32 @@
  */
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import java.io.IOException;
 import java.util.zip.ZipInputStream;
-import static javax.ws.rs.core.Response.Status.OK;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+
+import jakarta.json.Json;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import java.util.zip.ZipEntry;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.hamcrest.collection.IsMapContaining;
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -47,7 +45,8 @@ public class AccessIT {
     public static String apiToken;
     public static String dataverseAlias;
     public static Integer datasetId;
-    
+    public static String persistentId; 
+
     public static Integer basicFileId;
     public static Integer tabFile1Id;
     public static Integer tabFile2Id;
@@ -82,9 +81,8 @@ public class AccessIT {
     private static String testFileFromZipUploadWithFoldersChecksum1 = "8f326944be21361ad8219bc3269bc9eb";
     private static String testFileFromZipUploadWithFoldersChecksum2 = "0fe4efd85229bad6e587fd3f1a6c8e05";
     private static String testFileFromZipUploadWithFoldersChecksum3 = "00433ccb20111f9d40f0e5ab6fa8396f";
-
     
-    @BeforeClass
+    @BeforeAll
     public static void setUp() throws InterruptedException {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
         
@@ -105,6 +103,11 @@ public static void setUp() throws InterruptedException {
         Response createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
         createDatasetResponse.prettyPrint();
         datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        persistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+
+        Response allowAccessRequests = UtilIT.allowAccessRequests(datasetId.toString(), true, apiToken);
+        allowAccessRequests.prettyPrint();
+        allowAccessRequests.then().assertThat().statusCode(200);
         
         basicFileName = "004.txt";
         String basicPathToFile = "scripts/search/data/replace_test/" + basicFileName;
@@ -121,6 +124,9 @@ public static void setUp() throws InterruptedException {
         tabFile2Name = "stata13-auto.dta";
         tabFile2NameConvert = tabFile2Name.substring(0, tabFile2Name.indexOf(".dta")) + ".tab";
         String tab2PathToFile = "scripts/search/data/tabular/" + tabFile2Name;
+
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + tabFile2Name);
+
         Response tab2AddResponse = UtilIT.uploadFileViaNative(datasetId.toString(), tab2PathToFile, apiToken);
         tabFile2Id = JsonPath.from(tab2AddResponse.body().asString()).getInt("data.files[0].dataFile.id");
         
@@ -128,13 +134,13 @@ public static void setUp() throws InterruptedException {
         tabFile3NameRestrictedConvert = tabFile3NameRestricted.substring(0, tabFile3NameRestricted.indexOf(".dta")) + ".tab";
         String tab3PathToFile = "scripts/search/data/tabular/" + tabFile3NameRestricted;
 
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + tabFile3NameRestricted , UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));     
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + tabFile3NameRestricted);
         
         Response tab3AddResponse = UtilIT.uploadFileViaNative(datasetId.toString(), tab3PathToFile, apiToken);
 
         tabFile3IdRestricted = JsonPath.from(tab3AddResponse.body().asString()).getInt("data.files[0].dataFile.id");
         
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + tabFile3NameRestricted , UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + tabFile3NameRestricted);
         
         Response restrictResponse = UtilIT.restrictFile(tabFile3IdRestricted.toString(), true, apiToken);
         restrictResponse.prettyPrint();
@@ -153,10 +159,11 @@ public static void setUp() throws InterruptedException {
         String tab4PathToFile = "scripts/search/data/tabular/" + tabFile4NameUnpublished;
         Response tab4AddResponse = UtilIT.uploadFileViaNative(datasetId.toString(), tab4PathToFile, apiToken);
         tabFile4IdUnpublished = JsonPath.from(tab4AddResponse.body().asString()).getInt("data.files[0].dataFile.id");
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + tabFile2Name);
                         
     }
     
-    @AfterClass
+    @AfterAll
     public static void tearDown() {   
 
         Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
@@ -169,6 +176,24 @@ public static void tearDown() {
     }
     
 
+    @Test
+    public void testSaveAuxiliaryFileWithVersion() throws IOException {
+        System.out.println("Add aux file with update");
+        String mimeType = null;
+        String pathToFile = "scripts/search/data/tabular/1char";
+        String formatTag = "dpJSON";
+        String formatVersion = "v1";
+
+        Response uploadResponse = UtilIT.uploadAuxFile(tabFile3IdRestricted.longValue(), pathToFile, formatTag, formatVersion, mimeType, true, null, apiToken);
+        uploadResponse.prettyPrint();
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        System.out.println("Downloading Aux file that was just added");
+        Response downloadResponse = UtilIT.downloadAuxFile(tabFile3IdRestricted.longValue(), formatTag, formatVersion, apiToken);
+        downloadResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String dataStr = downloadResponse.prettyPrint();
+        assertEquals(dataStr, "a\n");
+    }
     
     //This test does a lot of testing of non-original downloads as well
     @Test
@@ -176,6 +201,8 @@ public void testDownloadSingleFile() {
         //Not logged in non-restricted
         Response anonDownloadOriginal = UtilIT.downloadFileOriginal(tabFile1Id);
         Response anonDownloadConverted = UtilIT.downloadFile(tabFile1Id);
+        Response anonDownloadConvertedNullKey = UtilIT.downloadFile(tabFile1Id, null);
+
         // ... and download the same tabular data file, but without the variable name header added:
         Response anonDownloadTabularNoHeader = UtilIT.downloadTabularFileNoVarHeader(tabFile1Id);
         // ... and download the same tabular file, this time requesting the "format=tab" explicitly:
@@ -184,6 +211,8 @@ public void testDownloadSingleFile() {
         assertEquals(OK.getStatusCode(), anonDownloadConverted.getStatusCode());
         assertEquals(OK.getStatusCode(), anonDownloadTabularNoHeader.getStatusCode());
         assertEquals(OK.getStatusCode(), anonDownloadTabularWithFormatName.getStatusCode());
+        assertEquals(UNAUTHORIZED.getStatusCode(), anonDownloadConvertedNullKey.getStatusCode());
+        
         int origSizeAnon = anonDownloadOriginal.getBody().asByteArray().length;
         int convertSizeAnon = anonDownloadConverted.getBody().asByteArray().length;
         int tabularSizeNoVarHeader = anonDownloadTabularNoHeader.getBody().asByteArray().length;
@@ -259,7 +288,27 @@ public void testDownloadMultipleFiles_NonLoggedInOpen() throws IOException {
         assertThat(files2, IsMapContaining.hasKey(tabFile2NameConvert));
         
         System.out.println("origSize: " + origSizeAnon + " | convertSize: " + convertSizeAnon);
-        assertThat(origSizeAnon, is(not(convertSizeAnon)));  
+        assertThat(origSizeAnon, is(not(convertSizeAnon))); 
+        
+        // Finally, verify that the multi-file bundle produced by the API  
+        // is properly named (as of v6.7 this should be a pretty name based on 
+        // the persistent Id of the dataset). 
+        
+        String contentDispositionHeader = anonDownloadConverted.getHeader("Content-disposition");
+        System.out.println("Response header: "+contentDispositionHeader);
+        
+        Pattern regexPattern = Pattern.compile("attachment; filename=\"([a-z0-9\\.-]*\\.zip)\"");
+        Matcher regexMatcher = regexPattern.matcher(contentDispositionHeader);
+        boolean regexMatch = regexMatcher.find();
+        assertTrue(regexMatch);
+        
+        String expectedPrettyName = persistentId.replaceAll("[:/]", "-").toLowerCase() + ".zip";
+        System.out.println("expected \"pretty\" file name of the zipped multi-file bundle: " + expectedPrettyName);
+        
+        String fileBundleName = regexMatcher.group(1);
+        System.out.println("file name found in the header: "+fileBundleName);
+        
+        assertEquals(fileBundleName, expectedPrettyName);
     }
     
     @Test
@@ -401,10 +450,7 @@ private HashMap<String,ByteArrayOutputStream> readZipResponse(InputStream iStrea
                 }
 
                 String name = entry.getName(); 
-//                String s = String.format("Entry: %s len %d added %TD",
-//                                entry.getName(), entry.getSize(),
-//                                new Date(entry.getTime()));
-//                System.out.println(s);
+
 
                 // Once we get the entry from the zStream, the zStream is
                 // positioned read to read the raw data, and we keep
@@ -444,7 +490,7 @@ private HashMap<String,ByteArrayOutputStream> readZipResponse(InputStream iStrea
     
     @Test
     public void testRequestAccess() throws InterruptedException {
-
+    
         String pathToJsonFile = "scripts/api/data/dataset-create-new.json";
         Response createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
         createDatasetResponse.prettyPrint();
@@ -453,14 +499,14 @@ public void testRequestAccess() throws InterruptedException {
         basicFileName = "004.txt";
         String basicPathToFile = "scripts/search/data/replace_test/" + basicFileName;
         Response basicAddResponse = UtilIT.uploadFileViaNative(datasetIdNew.toString(), basicPathToFile, apiToken);
-        basicFileId = JsonPath.from(basicAddResponse.body().asString()).getInt("data.files[0].dataFile.id");
+        Integer basicFileIdNew = JsonPath.from(basicAddResponse.body().asString()).getInt("data.files[0].dataFile.id");
 
         String tabFile3NameRestrictedNew = "stata13-auto-withstrls.dta";
         String tab3PathToFile = "scripts/search/data/tabular/" + tabFile3NameRestrictedNew;
         Response tab3AddResponse = UtilIT.uploadFileViaNative(datasetIdNew.toString(), tab3PathToFile, apiToken);
         Integer tabFile3IdRestrictedNew = JsonPath.from(tab3AddResponse.body().asString()).getInt("data.files[0].dataFile.id");
 
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + tab3PathToFile , UtilIT.sleepForLock(datasetIdNew.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        assertTrue(UtilIT.sleepForLock(datasetIdNew.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + tab3PathToFile);
         
         Response restrictResponse = UtilIT.restrictFile(tabFile3IdRestrictedNew.toString(), true, apiToken);
         restrictResponse.prettyPrint();
@@ -496,7 +542,7 @@ public void testRequestAccess() throws InterruptedException {
 
         listAccessRequestResponse = UtilIT.getAccessRequestList(tabFile3IdRestrictedNew.toString(), apiTokenRando);
         listAccessRequestResponse.prettyPrint();
-        assertEquals(400, listAccessRequestResponse.getStatusCode());
+        assertEquals(403, listAccessRequestResponse.getStatusCode());
 
         Response rejectFileAccessResponse = UtilIT.rejectFileAccessRequest(tabFile3IdRestrictedNew.toString(), "@" + apiIdentifierRando, apiToken);
         assertEquals(200, rejectFileAccessResponse.getStatusCode());
@@ -511,7 +557,7 @@ public void testRequestAccess() throws InterruptedException {
         assertEquals(400, requestFileAccessResponse.getStatusCode());
         
         //if you make a request of a public file you should also get a command exception
-        requestFileAccessResponse = UtilIT.requestFileAccess(basicFileId.toString(), apiTokenRando);
+        requestFileAccessResponse = UtilIT.requestFileAccess(basicFileIdNew.toString(), apiTokenRando);
         assertEquals(400, requestFileAccessResponse.getStatusCode());
         
 
@@ -524,7 +570,7 @@ public void testRequestAccess() throws InterruptedException {
         assertEquals(200, revokeFileAccessResponse.getStatusCode());
 
         listAccessRequestResponse = UtilIT.getAccessRequestList(tabFile3IdRestrictedNew.toString(), apiToken);
-        assertEquals(400, listAccessRequestResponse.getStatusCode());
+        assertEquals(404, listAccessRequestResponse.getStatusCode());
     }
 
     // This is a round trip test of uploading a zipped archive, with some folder
@@ -605,7 +651,50 @@ public void testZipUploadAndDownload() throws IOException {
         System.out.println("MD5 checksums of the unzipped file streams are correct.");
         
         System.out.println("Zip upload-and-download round trip test: success!");
-        
     }
 
+    @Test
+    public void testGetUserFileAccessRequested() {
+        // Create new user
+        Response createUserResponse = UtilIT.createRandomUser();
+        createUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String newUserApiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        String dataFileId = Integer.toString(tabFile3IdRestricted);
+
+        // Call with new user and unrequested access file
+        Response getUserFileAccessRequestedResponse = UtilIT.getUserFileAccessRequested(dataFileId, newUserApiToken);
+        getUserFileAccessRequestedResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        boolean userFileAccessRequested = JsonPath.from(getUserFileAccessRequestedResponse.body().asString()).getBoolean("data");
+        assertFalse(userFileAccessRequested);
+
+        // Request file access for the new user
+        Response requestFileAccessResponse = UtilIT.requestFileAccess(dataFileId, newUserApiToken);
+        requestFileAccessResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Call with new user and requested access file
+        getUserFileAccessRequestedResponse = UtilIT.getUserFileAccessRequested(dataFileId, newUserApiToken);
+        getUserFileAccessRequestedResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        userFileAccessRequested = JsonPath.from(getUserFileAccessRequestedResponse.body().asString()).getBoolean("data");
+        assertTrue(userFileAccessRequested);
+    }
+
+    @Test
+    public void testGetUserPermissionsOnFile() {
+        // Call with valid file id
+        Response getUserPermissionsOnFileResponse = UtilIT.getUserPermissionsOnFile(Integer.toString(basicFileId), apiToken);
+        getUserPermissionsOnFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+        boolean canDownloadFile = JsonPath.from(getUserPermissionsOnFileResponse.body().asString()).getBoolean("data.canDownloadFile");
+        assertTrue(canDownloadFile);
+        boolean canEditOwnerDataset = JsonPath.from(getUserPermissionsOnFileResponse.body().asString()).getBoolean("data.canEditOwnerDataset");
+        assertTrue(canEditOwnerDataset);
+        boolean canManageFilePermissions = JsonPath.from(getUserPermissionsOnFileResponse.body().asString()).getBoolean("data.canManageFilePermissions");
+        assertTrue(canManageFilePermissions);
+
+        // Call with invalid file id
+        Response getUserPermissionsOnFileInvalidIdResponse = UtilIT.getUserPermissionsOnFile("testInvalidId", apiToken);
+        getUserPermissionsOnFileInvalidIdResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
index 46f0410789c..b48c5507a54 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
@@ -1,49 +1,58 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GitHubOAuth2AP;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import org.junit.Test;
-import org.junit.BeforeClass;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+
+
+import java.util.Map;
 import java.util.UUID;
+import java.util.logging.Logger;
 
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
-import static junit.framework.Assert.assertEquals;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertTrue;
-import org.junit.Ignore;
+import static jakarta.ws.rs.core.Response.Status.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AdminIT {
 
-    @BeforeClass
+    private static final Logger logger = Logger.getLogger(AdminIT.class.getCanonicalName());
+
+    private final String testNonSuperuserApiToken = createTestNonSuperuserApiToken();
+
+    @BeforeAll
     public static void setUp() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
 
     @Test
     public void testListAuthenticatedUsers() throws Exception {
-        Response anon = UtilIT.listAuthenticatedUsers("");
+        Response anon = UtilIT.listAuthenticatedUsers(testNonSuperuserApiToken);
         anon.prettyPrint();
         anon.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
 
-        Response createNonSuperuser = UtilIT.createRandomUser();
-        
-        String nonSuperuserUsername = UtilIT.getUsernameFromResponse(createNonSuperuser);
-        String nonSuperuserApiToken = UtilIT.getApiTokenFromResponse(createNonSuperuser);
-
-        Response nonSuperuser = UtilIT.listAuthenticatedUsers(nonSuperuserApiToken);
+        Response nonSuperuser = UtilIT.listAuthenticatedUsers(testNonSuperuserApiToken);
         nonSuperuser.prettyPrint();
         nonSuperuser.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
         
@@ -58,14 +67,15 @@ public void testListAuthenticatedUsers() throws Exception {
         superuser.prettyPrint();
         superuser.then().assertThat().statusCode(OK.getStatusCode());
 
+        Response createNonSuperuser = UtilIT.createRandomUser();
+        String nonSuperuserUsername = UtilIT.getUsernameFromResponse(createNonSuperuser);
+
         Response deleteNonSuperuser = UtilIT.deleteUser(nonSuperuserUsername);
         assertEquals(200, deleteNonSuperuser.getStatusCode());
 
         Response deleteSuperuser = UtilIT.deleteUser(superuserUsername);
         assertEquals(200, deleteSuperuser.getStatusCode());
-
     }
-
     
     @Test
     public void testFilterAuthenticatedUsersForbidden() throws Exception {
@@ -73,9 +83,9 @@ public void testFilterAuthenticatedUsersForbidden() throws Exception {
         // --------------------------------------------
         // Forbidden: Try *without* an API token
         // --------------------------------------------
-        Response anon = UtilIT.filterAuthenticatedUsers("", null, null, null);
+        Response anon = UtilIT.filterAuthenticatedUsers("", null, null, null, null);
         anon.prettyPrint();
-        anon.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+        anon.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
 
         // --------------------------------------------
         // Forbidden: Try with a regular user--*not a superuser*
@@ -86,7 +96,7 @@ public void testFilterAuthenticatedUsersForbidden() throws Exception {
         String nonSuperuserApiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
         String nonSuperUsername = UtilIT.getUsernameFromResponse(createUserResponse);
         
-        Response filterResponseBadToken = UtilIT.filterAuthenticatedUsers(nonSuperuserApiToken, null, null, null);
+        Response filterResponseBadToken = UtilIT.filterAuthenticatedUsers(nonSuperuserApiToken, null, null, null, null);
         filterResponseBadToken.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
          
         // delete user
@@ -132,7 +142,7 @@ public void testFilterAuthenticatedUsers() throws Exception {
         // --------------------------------------------
         // Search for the 11 new users and verify results
         // --------------------------------------------        
-        Response filterReponse01 = UtilIT.filterAuthenticatedUsers(superuserApiToken, randUserNamePrefix, null, 100);
+        Response filterReponse01 = UtilIT.filterAuthenticatedUsers(superuserApiToken, randUserNamePrefix, null, 100, null);
         filterReponse01.then().assertThat().statusCode(OK.getStatusCode());
         filterReponse01.prettyPrint();
 
@@ -143,10 +153,10 @@ public void testFilterAuthenticatedUsers() throws Exception {
                 .body("data.pagination.pageCount", equalTo(1))
                 .body("data.pagination.numResults", equalTo(numResults));
         
-        String userIdentifer;
+        String userIdentifier;
         for (int i=0; i < numResults; i++){
-            userIdentifer = JsonPath.from(filterReponse01.getBody().asString()).getString("data.users[" + i + "].userIdentifier");
-            assertEquals(randomUsernames.contains(userIdentifer), true);
+            userIdentifier = JsonPath.from(filterReponse01.getBody().asString()).getString("data.users[" + i + "].userIdentifier");
+            assertTrue(randomUsernames.contains(userIdentifier));
         }
 
         List<Object> userList1 = JsonPath.from(filterReponse01.body().asString()).getList("data.users");
@@ -156,7 +166,7 @@ public void testFilterAuthenticatedUsers() throws Exception {
         // Search for the 11 new users, but only return 5 per page
         // --------------------------------------------        
         int numUsersReturned = 5;
-        Response filterReponse02 = UtilIT.filterAuthenticatedUsers(superuserApiToken, randUserNamePrefix, 1, numUsersReturned);
+        Response filterReponse02 = UtilIT.filterAuthenticatedUsers(superuserApiToken, randUserNamePrefix, 1, numUsersReturned, null);
         filterReponse02.then().assertThat().statusCode(OK.getStatusCode());
         filterReponse02.prettyPrint();
 
@@ -167,10 +177,10 @@ public void testFilterAuthenticatedUsers() throws Exception {
                 .body("data.pagination.pageCount", equalTo(3))
                 .body("data.pagination.numResults", equalTo(numResults));
         
-        String userIdentifer2;
+        String userIdentifier2;
         for (int i=0; i < numUsersReturned; i++){
-            userIdentifer2 = JsonPath.from(filterReponse02.getBody().asString()).getString("data.users[" + i + "].userIdentifier");
-            assertEquals(randomUsernames.contains(userIdentifer2), true);
+            userIdentifier2 = JsonPath.from(filterReponse02.getBody().asString()).getString("data.users[" + i + "].userIdentifier");
+            assertTrue(randomUsernames.contains(userIdentifier2));
         }
         
         List<Object> userList2 = JsonPath.from(filterReponse02.body().asString()).getList("data.users");
@@ -180,7 +190,7 @@ public void testFilterAuthenticatedUsers() throws Exception {
         // --------------------------------------------
         // Search for the 11 new users, return 5 per page, and start on NON-EXISTENT 4th page -- should revert to 1st page
         // --------------------------------------------        
-        Response filterReponse02a = UtilIT.filterAuthenticatedUsers(superuserApiToken, randUserNamePrefix, 4, numUsersReturned);
+        Response filterReponse02a = UtilIT.filterAuthenticatedUsers(superuserApiToken, randUserNamePrefix, 4, numUsersReturned, null);
         filterReponse02a.then().assertThat().statusCode(OK.getStatusCode());
         filterReponse02a.prettyPrint();
 
@@ -197,7 +207,7 @@ public void testFilterAuthenticatedUsers() throws Exception {
         // --------------------------------------------
         // Search for the 11 new users, return 5 per page, start on 3rd page
         // --------------------------------------------     
-        Response filterReponse03 = UtilIT.filterAuthenticatedUsers(superuserApiToken, randUserNamePrefix, 3, 5);
+        Response filterReponse03 = UtilIT.filterAuthenticatedUsers(superuserApiToken, randUserNamePrefix, 3, 5, null);
         filterReponse03.then().assertThat().statusCode(OK.getStatusCode());
         filterReponse03.prettyPrint();
         
@@ -215,7 +225,7 @@ public void testFilterAuthenticatedUsers() throws Exception {
         // --------------------------------------------
         // Run search that returns no users
         // --------------------------------------------     
-        Response filterReponse04 = UtilIT.filterAuthenticatedUsers(superuserApiToken, "zzz" + randUserNamePrefix, 1, 50);
+        Response filterReponse04 = UtilIT.filterAuthenticatedUsers(superuserApiToken, "zzz" + randUserNamePrefix, 1, 50, null);
         filterReponse04.then().assertThat().statusCode(OK.getStatusCode());
         filterReponse04.prettyPrint();
         
@@ -231,7 +241,7 @@ public void testFilterAuthenticatedUsers() throws Exception {
         // Run search that returns 1 user
         // --------------------------------------------     
         String singleUsername = randomUsernames.get(0);
-        Response filterReponse05 = UtilIT.filterAuthenticatedUsers(superuserApiToken, singleUsername, 1, 50);
+        Response filterReponse05 = UtilIT.filterAuthenticatedUsers(superuserApiToken, singleUsername, 1, 50, null);
         filterReponse05.then().assertThat().statusCode(OK.getStatusCode());
         filterReponse05.prettyPrint();
         
@@ -276,7 +286,7 @@ public void testConvertShibUserToBuiltin() throws Exception {
         String newEmailAddressToUse = "builtin2shib." + UUID.randomUUID().toString().substring(0, 8) + "@mailinator.com";
         String data = emailOfUserToConvert + ":" + password + ":" + newEmailAddressToUse;
 
-        Response builtinToShibAnon = UtilIT.migrateBuiltinToShib(data, "");
+        Response builtinToShibAnon = UtilIT.migrateBuiltinToShib(data, testNonSuperuserApiToken);
         builtinToShibAnon.prettyPrint();
         builtinToShibAnon.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
 
@@ -306,11 +316,11 @@ public void testConvertShibUserToBuiltin() throws Exception {
          * the Shib user has an invalid email address:
          * https://github.com/IQSS/dataverse/issues/2998
          */
-        Response shibToBuiltinAnon = UtilIT.migrateShibToBuiltin(Long.MAX_VALUE, "", "");
+        Response shibToBuiltinAnon = UtilIT.migrateShibToBuiltin(Long.MAX_VALUE, "", testNonSuperuserApiToken);
         shibToBuiltinAnon.prettyPrint();
         shibToBuiltinAnon.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
 
-        Response nonSuperuser = UtilIT.migrateShibToBuiltin(Long.MAX_VALUE, "", "");
+        Response nonSuperuser = UtilIT.migrateShibToBuiltin(Long.MAX_VALUE, "", testNonSuperuserApiToken);
         nonSuperuser.prettyPrint();
         nonSuperuser.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
 
@@ -347,6 +357,63 @@ public void testConvertShibUserToBuiltin() throws Exception {
 
     }
 
+    /**
+     * Here we are asserting that deactivated users cannot be converted into
+     * shib users.
+     */
+    @Test
+    public void testConvertDeactivateUserToShib() {
+
+        Response createUserToConvert = UtilIT.createRandomUser();
+        createUserToConvert.then().assertThat().statusCode(OK.getStatusCode());
+        createUserToConvert.prettyPrint();
+
+        long idOfUserToConvert = createUserToConvert.body().jsonPath().getLong("data.authenticatedUser.id");
+        String emailOfUserToConvert = createUserToConvert.body().jsonPath().getString("data.authenticatedUser.email");
+        String usernameOfUserToConvert = UtilIT.getUsernameFromResponse(createUserToConvert);
+
+        Response deactivateUser = UtilIT.deactivateUser(usernameOfUserToConvert);
+        deactivateUser.prettyPrint();
+        deactivateUser.then().assertThat().statusCode(OK.getStatusCode());
+
+        String password = usernameOfUserToConvert;
+        String newEmailAddressToUse = "builtin2shib." + UUID.randomUUID().toString().substring(0, 8) + "@mailinator.com";
+        String data = emailOfUserToConvert + ":" + password + ":" + newEmailAddressToUse;
+
+        Response builtinToShibAnon = UtilIT.migrateBuiltinToShib(data, testNonSuperuserApiToken);
+        builtinToShibAnon.prettyPrint();
+        builtinToShibAnon.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response getAuthProviders = UtilIT.getAuthProviders(superuserApiToken);
+        getAuthProviders.prettyPrint();
+        if (!getAuthProviders.body().asString().contains(BuiltinAuthenticationProvider.PROVIDER_ID)) {
+            System.out.println("Can't proceed with test without builtin provider.");
+            return;
+        }
+
+        Response makeShibUser = UtilIT.migrateBuiltinToShib(data, superuserApiToken);
+        makeShibUser.prettyPrint();
+        makeShibUser.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("[\"builtin account has been deactivated\"]"));
+
+        Response userIsStillBuiltin = UtilIT.getAuthenticatedUser(usernameOfUserToConvert, superuserApiToken);
+        userIsStillBuiltin.prettyPrint();
+        userIsStillBuiltin.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.id", equalTo(Long.valueOf(idOfUserToConvert).intValue()))
+                .body("data.identifier", equalTo("@" + usernameOfUserToConvert))
+                .body("data.authenticationProviderId", equalTo("builtin"));
+
+    }
+
     @Test
     public void testConvertOAuthUserToBuiltin() throws Exception {
 
@@ -368,7 +435,7 @@ public void testConvertOAuthUserToBuiltin() throws Exception {
         String data = emailOfUserToConvert + ":" + password + ":" + newEmailAddressToUse + ":" + providerIdToConvertTo + ":" + newPersistentUserIdInLookupTable;
 
         System.out.println("data: " + data);
-        Response builtinToOAuthAnon = UtilIT.migrateBuiltinToOAuth(data, "");
+        Response builtinToOAuthAnon = UtilIT.migrateBuiltinToOAuth(data, testNonSuperuserApiToken);
         builtinToOAuthAnon.prettyPrint();
         builtinToOAuthAnon.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
 
@@ -399,11 +466,7 @@ public void testConvertOAuthUserToBuiltin() throws Exception {
          * the OAuth user has an invalid email address:
          * https://github.com/IQSS/dataverse/issues/2998
          */
-        Response oauthToBuiltinAnon = UtilIT.migrateOAuthToBuiltin(Long.MAX_VALUE, "", "");
-        oauthToBuiltinAnon.prettyPrint();
-        oauthToBuiltinAnon.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
-
-        Response nonSuperuser = UtilIT.migrateOAuthToBuiltin(Long.MAX_VALUE, "", "");
+        Response nonSuperuser = UtilIT.migrateOAuthToBuiltin(Long.MAX_VALUE, "", testNonSuperuserApiToken);
         nonSuperuser.prettyPrint();
         nonSuperuser.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
 
@@ -464,7 +527,7 @@ public void testConvertOAuthUserToBuiltin() throws Exception {
 
     @Test
     public void testCreateNonBuiltinUserViaApi() {
-        Response createUser = UtilIT.createRandomAuthenticatedUser(OrcidOAuth2AP.PROVIDER_ID_PRODUCTION);
+        Response createUser = UtilIT.createRandomAuthenticatedUser(OrcidOAuth2AP.PROVIDER_ID);
         createUser.prettyPrint();
         assertEquals(200, createUser.getStatusCode());
 
@@ -542,7 +605,7 @@ public void testRecalculateDataFileHash() {
         String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
         UtilIT.makeSuperUser(superuserUsername);
 
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + origFileId, UtilIT.sleepForLock(datasetId.longValue(), "Ingest", superuserApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", superuserApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + origFileId);
 
         //Bad file id         
         Response computeDataFileHashResponse = UtilIT.computeDataFileHashValue("BadFileId", DataFile.ChecksumType.MD5.toString(), superuserApiToken);
@@ -607,7 +670,7 @@ public void testRecalculateDataFileHash() {
     }
     
     @Test
-    @Ignore
+    @Disabled
     public void testMigrateHDLToDOI() {
         /*
         This test is set to ignore because it requires a setup that will
@@ -671,4 +734,231 @@ public void testMigrateHDLToDOI() {
                 .statusCode(OK.getStatusCode());
     }
 
+    /**
+     * Disabled because once there are new fields in the database that Solr
+     * doesn't know about, dataset creation could be prevented, or at least
+     * subsequent search operations could fail because the dataset can't be
+     * indexed.
+     */
+    @Disabled
+    @Test
+    public void testLoadMetadataBlock_NoErrorPath() {
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        byte[] updatedContent = null;
+        try {
+            updatedContent = Files.readAllBytes(Paths.get("scripts/api/data/metadatablocks/citation.tsv"));
+        } catch (IOException e) {
+            logger.warning(e.getMessage());
+            assertEquals(0,1);
+        }
+
+        Response response = UtilIT.loadMetadataBlock(apiToken, updatedContent);
+        assertEquals(200, response.getStatusCode());
+        response.then().assertThat().statusCode(OK.getStatusCode());
+
+        String body = response.getBody().asString();
+        String status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+
+        Map<String, List<Map<String, String>>> data = JsonPath.from(body).getMap("data");
+        assertEquals(1, data.size());
+        List<Map<String, String>> addedElements = data.get("added");
+        //Note -test depends on the number of elements in the production citation block, so any changes to the # of elements there can break this test
+        assertEquals(323, addedElements.size());
+
+        Map<String, Integer> statistics = new HashMap<>();
+        for (Map<String, String> unit : addedElements) {
+            assertEquals(2, unit.size());
+            assertTrue(unit.containsKey("name"));
+            assertTrue(unit.containsKey("type"));
+            String type = unit.get("type");
+            if (!statistics.containsKey(type))
+                statistics.put(type, 0);
+            statistics.put(type, statistics.get(type) + 1);
+        }
+
+        assertEquals(3, statistics.size());
+        assertEquals(1, (int) statistics.get("MetadataBlock"));
+        assertEquals(78, (int) statistics.get("DatasetField"));
+        assertEquals(244, (int) statistics.get("Controlled Vocabulary"));
+    }
+
+    /**
+     * Disabled because once there are new fields in the database that Solr
+     * doesn't know about, dataset creation could be prevented, or at least
+     * subsequent search operations could fail because the dataset can't be
+     * indexed.
+     */
+    @Disabled
+    @Test
+    public void testLoadMetadataBlock_ErrorHandling() {
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        byte[] updatedContent = null;
+        try {
+            updatedContent = Files.readAllBytes(Paths.get("src/test/resources/tsv/test.tsv"));
+        } catch (IOException e) {
+            logger.warning(e.getMessage());
+            assertEquals(0,1);
+        }
+        Response response = UtilIT.loadMetadataBlock(apiToken, updatedContent);
+        assertEquals(500, response.getStatusCode());
+        response.then().assertThat().statusCode(INTERNAL_SERVER_ERROR.getStatusCode());
+
+        String body = response.getBody().asString();
+        String status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+
+        String message = JsonPath.from(body).getString("message");
+        assertEquals(
+          "Error parsing metadata block in DATASETFIELD part, line #5: missing 'watermark' column (#5)",
+          message
+        );
+    }
+    @Test
+    public void testClearThumbnailFailureFlag(){
+        Response nonExistentFile = UtilIT.clearThumbnailFailureFlag(Long.MAX_VALUE);
+        nonExistentFile.prettyPrint();
+        nonExistentFile.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+        
+        Response clearAllFlags = UtilIT.clearThumbnailFailureFlags();
+        clearAllFlags.prettyPrint();
+        clearAllFlags.then().assertThat().statusCode(OK.getStatusCode());
+    }
+    
+    @Test
+    public void testBannerMessages(){
+
+        //We check for existing banner messages and get the number of existing messages
+        Response getBannerMessageResponse = UtilIT.getBannerMessages();
+        getBannerMessageResponse.prettyPrint();
+        getBannerMessageResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Integer numBannerMessages =
+                JsonPath.from(getBannerMessageResponse.getBody().asString()).getInt("data.size()");
+
+        //We add a banner message with an error in the json file
+        String pathToJsonFile = "scripts/api/data/bannerMessageError.json";       
+        Response addBannerMessageErrorResponse  = UtilIT.addBannerMessage(pathToJsonFile);
+        addBannerMessageErrorResponse.prettyPrint();
+        addBannerMessageErrorResponse.then().assertThat()
+                        .statusCode(BAD_REQUEST.getStatusCode())
+                        .body("status", equalTo("ERROR"));
+        
+        //We add a banner message with a correct json file
+        pathToJsonFile = "scripts/api/data/bannerMessageTest.json";
+        Response addBannerMessageResponse = UtilIT.addBannerMessage(pathToJsonFile);
+        addBannerMessageResponse.prettyPrint();
+        addBannerMessageResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("status", equalTo("OK"))
+                .body("data.message", equalTo("Banner Message added successfully."));
+        Long addedBanner = Long.valueOf(
+                        JsonPath.from(addBannerMessageResponse.getBody().asString()).getLong("data.id"));                
+        
+        //We get the banner messages and check that the number of messages has increased by 1
+        getBannerMessageResponse = UtilIT.getBannerMessages();
+        getBannerMessageResponse.prettyPrint();
+        getBannerMessageResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(numBannerMessages + 1));
+
+        //We delete the banner message
+        Response deleteBannerMessageResponse = UtilIT.deleteBannerMessage(addedBanner);
+        deleteBannerMessageResponse.prettyPrint();
+        deleteBannerMessageResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("status", equalTo("OK"));
+        
+    }
+
+    /**
+     * For a successful download from /tmp, see BagIT. Here we are doing error
+     * checking.
+     */
+    @Test
+    public void testDownloadTmpFile() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response tryToDownloadAsNonSuperuser = UtilIT.downloadTmpFile("/tmp/foo", apiToken);
+        tryToDownloadAsNonSuperuser.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+
+        Response toggleSuperuser = UtilIT.makeSuperUser(username);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response tryToDownloadEtcPasswd = UtilIT.downloadTmpFile("/etc/passwd", apiToken);
+        tryToDownloadEtcPasswd.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("status", equalTo("ERROR"))
+                .body("message", equalTo("Path must begin with '/tmp' but after normalization was '/etc/passwd'."));
+    }
+
+    @Test
+    public void testFindMissingFiles() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        createUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUserResponse);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        UtilIT.setSuperuserStatus(username, true);
+
+        String dataverseAlias = ":root";
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        String datasetPersistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+
+        // Upload file
+        Response uploadResponse = UtilIT.uploadRandomFile(datasetPersistentId, apiToken);
+        uploadResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        // Audit files
+        Response resp = UtilIT.auditFiles(apiToken, null, 100L, null);
+        resp.prettyPrint();
+        JsonArray emptyArray = Json.createArrayBuilder().build();
+        resp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.lastId", equalTo(100));
+
+        // Audit files with invalid parameters
+        resp = UtilIT.auditFiles(apiToken, 100L, 0L, null);
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("status", equalTo("ERROR"))
+                .body("message", equalTo("Invalid Parameters: lastId must be equal to or greater than firstId"));
+
+        // Audit files with list of dataset identifiers parameter
+        resp = UtilIT.auditFiles(apiToken, 1L, null, "bad/id, " + datasetPersistentId);
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.failures[0].datasetIdentifier", equalTo("bad/id"))
+                .body("data.failures[0].reason", equalTo("Not Found"));
+    }
+
+    private String createTestNonSuperuserApiToken() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        createUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        return UtilIT.getApiTokenFromResponse(createUserResponse);
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans={true,false})
+    public void testSetSuperUserStatus(Boolean status) {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        Response toggleSuperuser = UtilIT.setSuperuserStatus(username, status);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
new file mode 100644
index 00000000000..754350e93db
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AuxiliaryFilesIT.java
@@ -0,0 +1,323 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import static jakarta.ws.rs.core.Response.Status.CONFLICT;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class AuxiliaryFilesIT {
+
+    @BeforeAll
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testUploadAuxFiles() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        Path pathToDataFile = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.csv");
+        String contentOfCsv = ""
+                + "name,pounds,species\n"
+                + "Marshall,40,dog\n"
+                + "Tiger,17,cat\n"
+                + "Panther,21,cat\n";
+        java.nio.file.Files.write(pathToDataFile, contentOfCsv.getBytes());
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToDataFile.toString(), apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("data.csv"));
+
+        Long fileId = JsonPath.from(uploadFile.body().asString()).getLong("data.files[0].dataFile.id");
+
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToDataFile);
+
+        Response restrictFile = UtilIT.restrictFile(fileId.toString(), true, apiToken);
+        restrictFile.prettyPrint();
+        restrictFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        String dpType = "DP";
+
+        // JSON aux file
+        Path pathToAuxFileJson = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.json");
+        String contentOfJson = "{}";
+        java.nio.file.Files.write(pathToAuxFileJson, contentOfJson.getBytes());
+        String formatTagJson = "dpJson";
+        String formatVersionJson = "0.1";
+        String mimeTypeJson = "application/json";
+        Response uploadAuxFileJson = UtilIT.uploadAuxFile(fileId, pathToAuxFileJson.toString(), formatTagJson, formatVersionJson, mimeTypeJson, true, dpType, apiToken);
+        uploadAuxFileJson.prettyPrint();
+        uploadAuxFileJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo("DP"))
+                .body("data.contentType", equalTo("application/json"));
+        Response uploadAuxFileJsonAgain = UtilIT.uploadAuxFile(fileId, pathToAuxFileJson.toString(), formatTagJson, formatVersionJson, mimeTypeJson, true, dpType, apiToken);
+        uploadAuxFileJsonAgain.prettyPrint();
+        uploadAuxFileJsonAgain.then().assertThat()
+                .statusCode(CONFLICT.getStatusCode());
+
+        // XML aux file
+        Path pathToAuxFileXml = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.xml");
+        String contentOfXml = "<foo></foo>";
+        java.nio.file.Files.write(pathToAuxFileXml, contentOfXml.getBytes());
+        String formatTagXml = "dpXml";
+        String formatVersionXml = "0.1";
+        String mimeTypeXml = "application/xml";
+        Response uploadAuxFileXml = UtilIT.uploadAuxFile(fileId, pathToAuxFileXml.toString(), formatTagXml, formatVersionXml, mimeTypeXml, true, dpType, apiToken);
+        uploadAuxFileXml.prettyPrint();
+        uploadAuxFileXml.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo("DP"))
+                .body("data.contentType", equalTo("application/xml"));
+
+        // PDF aux file
+        Path pathToAuxFilePdf = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.pdf");
+        // PDF content from https://stackoverflow.com/questions/17279712/what-is-the-smallest-possible-valid-pdf/32142316#32142316
+        String contentOfPdf = "%PDF-1.2 \n"
+                + "9 0 obj\n"
+                + "<<\n"
+                + ">>\n"
+                + "stream\n"
+                + "BT/ 9 Tf(Test)' ET\n"
+                + "endstream\n"
+                + "endobj\n"
+                + "4 0 obj\n"
+                + "<<\n"
+                + "/Type /Page\n"
+                + "/Parent 5 0 R\n"
+                + "/Contents 9 0 R\n"
+                + ">>\n"
+                + "endobj\n"
+                + "5 0 obj\n"
+                + "<<\n"
+                + "/Kids [4 0 R ]\n"
+                + "/Count 1\n"
+                + "/Type /Pages\n"
+                + "/MediaBox [ 0 0 99 9 ]\n"
+                + ">>\n"
+                + "endobj\n"
+                + "3 0 obj\n"
+                + "<<\n"
+                + "/Pages 5 0 R\n"
+                + "/Type /Catalog\n"
+                + ">>\n"
+                + "endobj\n"
+                + "trailer\n"
+                + "<<\n"
+                + "/Root 3 0 R\n"
+                + ">>\n"
+                + "%%EOF";
+        java.nio.file.Files.write(pathToAuxFilePdf, contentOfPdf.getBytes());
+        String formatTagPdf = "dpPdf";
+        String formatVersionPdf = "0.1";
+        String mimeTypePdf = "application/pdf";
+        Response uploadAuxFilePdf = UtilIT.uploadAuxFile(fileId, pathToAuxFilePdf.toString(), formatTagPdf, formatVersionPdf, mimeTypePdf, true, dpType, apiToken);
+        uploadAuxFilePdf.prettyPrint();
+        uploadAuxFilePdf.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo("DP"))
+                .body("data.contentType", equalTo(mimeTypePdf));
+
+        // Non-DP aux file, no type specified
+        Path pathToAuxFileMd = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "README.md");
+        String contentOfMd = "This is my README.";
+        java.nio.file.Files.write(pathToAuxFileMd, contentOfMd.getBytes());
+        String formatTagMd = "README";
+        String formatVersionMd = "0.1";
+        String mimeTypeMd = "text/markdown";
+        Response uploadAuxFileMd = UtilIT.uploadAuxFile(fileId, pathToAuxFileMd.toString(), formatTagMd, formatVersionMd, mimeTypeMd, true, null, apiToken);
+        uploadAuxFileMd.prettyPrint();
+        uploadAuxFileMd.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo(null))
+                .body("data.contentType", equalTo("text/markdown"));
+
+        // Unknown type
+        Path pathToAuxFileTxt = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "nbt.txt");
+        String contentOfTxt = "It's gonna be huge.";
+        java.nio.file.Files.write(pathToAuxFileTxt, contentOfTxt.getBytes());
+        String formatTagTxt = "gonnaBeHuge";
+        String formatVersionTxt = "0.1";
+        String mimeTypeTxt = "text/plain";
+        String typeTxt = "NEXT_BIG_THING";
+        Response uploadAuxFileTxt = UtilIT.uploadAuxFile(fileId, pathToAuxFileTxt.toString(), formatTagTxt, formatVersionTxt, mimeTypeTxt, true, typeTxt, apiToken);
+        uploadAuxFileTxt.prettyPrint();
+        uploadAuxFileTxt.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                //                .body("data.type", equalTo("Other Auxiliary Files"));
+                .body("data.type", equalTo("NEXT_BIG_THING"));
+
+        // Another Unknown type
+        Path pathToAuxFileTxt2 = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "future.txt");
+        String contentOfTxt2 = "The future's so bright I have to wear shades.";
+        java.nio.file.Files.write(pathToAuxFileTxt2, contentOfTxt2.getBytes());
+        String formatTagTxt2 = "soBright";
+        String formatVersionTxt2 = "0.1";
+        String mimeTypeTxt2 = "text/plain";
+        String typeTxt2 = "FUTURE_FUN";
+        Response uploadAuxFileTxt2 = UtilIT.uploadAuxFile(fileId, pathToAuxFileTxt2.toString(), formatTagTxt2, formatVersionTxt2, mimeTypeTxt2, true, typeTxt2, apiToken);
+        uploadAuxFileTxt2.prettyPrint();
+        uploadAuxFileTxt2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                //                .body("data.type", equalTo("Other Auxiliary Files"));
+                .body("data.type", equalTo("FUTURE_FUN"));
+
+        // rst aux file with public=false
+        Path pathToAuxFileRst = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "nonpublic.rst");
+        String contentOfRst = "Nonpublic stuff in here.";
+        java.nio.file.Files.write(pathToAuxFileRst, contentOfRst.getBytes());
+        String formatTagRst = "nonPublic";
+        String formatVersionRst = "0.1";
+        String mimeTypeRst = "text/plain";
+        Response uploadAuxFileRst = UtilIT.uploadAuxFile(fileId, pathToAuxFileRst.toString(), formatTagRst, formatVersionRst, mimeTypeRst, false, null, apiToken);
+        uploadAuxFileRst.prettyPrint();
+        uploadAuxFileRst.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo(null))
+                .body("data.contentType", equalTo("text/plain"));
+
+        // file with an origin
+        Path pathToAuxFileOrigin1 = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "file1.txt");
+        String contentOfOrigin1 = "This file has an origin.";
+        java.nio.file.Files.write(pathToAuxFileOrigin1, contentOfOrigin1.getBytes());
+        String formatTagOrigin1 = "origin1";
+        String formatVersionOrigin1 = "0.1";
+        String mimeTypeOrigin1 = "text/plain";
+        String typeOrigin1 = "someType";
+        String origin1 = "myApp";
+        Response uploadAuxFileOrigin1 = UtilIT.uploadAuxFile(fileId, pathToAuxFileOrigin1.toString(), formatTagOrigin1, formatVersionOrigin1, mimeTypeOrigin1, true, typeOrigin1, origin1, apiToken);
+        uploadAuxFileOrigin1.prettyPrint();
+        uploadAuxFileOrigin1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo("someType"))
+                .body("data.contentType", equalTo("text/plain"));
+
+        // file with no MIME type
+        Path pathToAuxFileNoMimeType1 = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "file1.md");
+        String contentOfNoMimeType1 = "This file has no MIME type (content type).";
+        java.nio.file.Files.write(pathToAuxFileNoMimeType1, contentOfNoMimeType1.getBytes());
+        String formatTagNoMimeType1 = "noMimeType1";
+        String formatVersionNoMimeType1 = "0.1";
+        String mimeTypeNoMimeType1 = null;
+        String typeNoMimeType1 = "someType";
+        Response uploadAuxFileNoMimeType1 = UtilIT.uploadAuxFile(fileId, pathToAuxFileNoMimeType1.toString(), formatTagNoMimeType1, formatVersionNoMimeType1, mimeTypeNoMimeType1, true, typeNoMimeType1, null, apiToken);
+        uploadAuxFileNoMimeType1.prettyPrint();
+        uploadAuxFileNoMimeType1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.type", equalTo("someType"))
+                // "text/plain" was detected by Tika
+                .body("data.contentType", equalTo("text/plain"));
+
+        // Download JSON aux file.
+        Response downloadAuxFileJson = UtilIT.downloadAuxFile(fileId, formatTagJson, formatVersionJson, apiToken);
+        downloadAuxFileJson.then().assertThat().statusCode(OK.getStatusCode());
+        assertEquals("attachment; filename=\"data.tab.dpJson_0.1.json\"", downloadAuxFileJson.header("Content-disposition"));
+
+        // Download XML aux file.
+        Response downloadAuxFileXml = UtilIT.downloadAuxFile(fileId, formatTagXml, formatVersionXml, apiToken);
+        downloadAuxFileXml.then().assertThat().statusCode(OK.getStatusCode());
+        assertEquals("attachment; filename=\"data.tab.dpXml_0.1.xml\"", downloadAuxFileXml.header("Content-disposition"));
+
+        // Download PDF aux file.
+        Response downloadAuxFilePdf = UtilIT.downloadAuxFile(fileId, formatTagPdf, formatVersionPdf, apiToken);
+        downloadAuxFilePdf.then().assertThat().statusCode(OK.getStatusCode());
+        assertEquals("attachment; filename=\"data.tab.dpPdf_0.1.pdf\"", downloadAuxFilePdf.header("Content-disposition"));
+
+        // Download Markdown aux file.
+        Response downloadAuxFileMd = UtilIT.downloadAuxFile(fileId, formatTagMd, formatVersionMd, apiToken);
+        downloadAuxFileMd.then().assertThat().statusCode(OK.getStatusCode());
+        // No file extenstion here because Tika's getDefaultMimeTypes doesn't include "text/markdown".
+        // Note: browsers seem to add ".bin" ("myfile.bin") rather than no extension ("myfile").
+        assertEquals("attachment; filename=\"data.tab.README_0.1\"", downloadAuxFileMd.header("Content-disposition"));
+
+        // Download Markdown aux file with no MIME type given
+        Response downloadAuxFileNoMime1 = UtilIT.downloadAuxFile(fileId, formatTagNoMimeType1, formatVersionNoMimeType1, apiToken);
+        downloadAuxFileNoMime1.then().assertThat().statusCode(OK.getStatusCode());
+        assertEquals("attachment; filename=\"data.tab.noMimeType1_0.1.txt\"", downloadAuxFileNoMime1.header("Content-disposition"));
+
+        Response createUserNoPrivs = UtilIT.createRandomUser();
+        createUserNoPrivs.then().assertThat().statusCode(OK.getStatusCode());
+        String apiTokenNoPrivs = UtilIT.getApiTokenFromResponse(createUserNoPrivs);
+
+        // This fails because the dataset hasn't been published.
+        Response failToDownloadAuxFileJson = UtilIT.downloadAuxFile(fileId, formatTagJson, formatVersionJson, apiTokenNoPrivs);
+        failToDownloadAuxFileJson.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+
+        Response failToDownloadAuxFileRstBeforePublish = UtilIT.downloadAuxFile(fileId, formatTagRst, formatVersionRst, apiTokenNoPrivs);
+        failToDownloadAuxFileRstBeforePublish.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        // isPublic=false so publishing the dataset doesn't let a "no privs" account download the file.
+        Response failToDownloadAuxFileRstAfterPublish = UtilIT.downloadAuxFile(fileId, formatTagRst, formatVersionRst, apiTokenNoPrivs);
+        failToDownloadAuxFileRstAfterPublish.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+
+        Response creatorCanDownloadNonPublicAuxFile = UtilIT.downloadAuxFile(fileId, formatTagRst, formatVersionRst, apiToken);
+        creatorCanDownloadNonPublicAuxFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        // This succeeds now that the dataset has been published.
+        Response failToDownloadAuxFileJsonPostPublish = UtilIT.downloadAuxFile(fileId, formatTagJson, formatVersionJson, apiTokenNoPrivs);
+        failToDownloadAuxFileJsonPostPublish.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response listAuxFilesOrigin1 = UtilIT.listAuxFilesByOrigin(fileId, origin1, apiToken);
+        listAuxFilesOrigin1.prettyPrint();
+        listAuxFilesOrigin1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].formatTag", equalTo("origin1"))
+                .body("data[0].formatVersion", equalTo("0.1"))
+                .body("data[0].fileSize", equalTo(24))
+                .body("data[0].contentType", equalTo("text/plain"))
+                .body("data[0].isPublic", equalTo(true))
+                .body("data[0].type", equalTo("someType"));
+        
+        Response listAllAuxFiles = UtilIT.listAllAuxFiles(fileId, apiToken);
+        listAllAuxFiles.prettyPrint();
+        listAllAuxFiles.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(9));
+
+
+        Response deleteAuxFileOrigin1 = UtilIT.deleteAuxFile(fileId, formatTagOrigin1, formatVersionOrigin1, apiToken);
+        deleteAuxFileOrigin1.prettyPrint();
+        deleteAuxFileOrigin1.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response listAuxFilesOrigin1NowGone = UtilIT.listAuxFilesByOrigin(fileId, origin1, apiToken);
+        listAuxFilesOrigin1NowGone.prettyPrint();
+        listAuxFilesOrigin1NowGone.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/BagIT.java b/src/test/java/edu/harvard/iq/dataverse/api/BagIT.java
new file mode 100644
index 00000000000..c80e321b228
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/BagIT.java
@@ -0,0 +1,165 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.engine.command.impl.LocalSubmitToArchiveCommand;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import io.restassured.RestAssured;
+import static io.restassured.RestAssured.given;
+import io.restassured.response.Response;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.Enumeration;
+import java.util.Scanner;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class BagIT {
+
+    static String bagitExportDir = "/tmp";
+
+    @BeforeAll
+    public static void setUpClass() {
+
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+
+        Response setArchiverClassName = UtilIT.setSetting(SettingsServiceBean.Key.ArchiverClassName, LocalSubmitToArchiveCommand.class.getCanonicalName());
+        setArchiverClassName.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response setArchiverSettings = UtilIT.setSetting(SettingsServiceBean.Key.ArchiverSettings, ":BagItLocalPath, :BagGeneratorThreads");
+        setArchiverSettings.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response setBagItLocalPath = UtilIT.setSetting(":BagItLocalPath", bagitExportDir);
+        setBagItLocalPath.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+    }
+
+    @Test
+    public void testBagItExport() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response makeSuperuser = UtilIT.setSuperuserStatus(username, true);
+        makeSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken);
+        publishDataset.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response archiveDataset = UtilIT.archiveDataset(datasetPid, "1.0", apiToken);
+        archiveDataset.prettyPrint();
+        archiveDataset.then().assertThat().statusCode(OK.getStatusCode());
+
+        // spaceName comes from LocalSubmitToArchiveCommand
+        String spaceName = datasetPid.replace(':', '-').replace('/', '-')
+                .replace('.', '-').toLowerCase();
+        // spacename: doi-10-5072-fk2-fosg5q
+
+        String pathToZip = bagitExportDir + "/" + spaceName + "v1.0" + ".zip";
+
+        try {
+            // give the bag time to generate
+            Thread.sleep(3000);
+        } catch (InterruptedException ex) {
+        }
+
+        // A bag could look like this:
+        //doi-10-5072-FK2-DKUTDUv-1-0/data/
+        //doi-10-5072-FK2-DKUTDUv-1-0/data/Darwin's Finches/
+        //doi-10-5072-FK2-DKUTDUv-1-0/metadata/
+        //doi-10-5072-FK2-DKUTDUv-1-0/metadata/pid-mapping.txt
+        //doi-10-5072-FK2-DKUTDUv-1-0/manifest-md5.txt
+        //doi-10-5072-FK2-DKUTDUv-1-0/bagit.txt
+        //doi-10-5072-FK2-DKUTDUv-1-0/metadata/oai-ore.jsonld
+        //doi-10-5072-FK2-DKUTDUv-1-0/metadata/datacite.xml
+        //doi-10-5072-FK2-DKUTDUv-1-0/bag-info.txt
+        // ---
+        // bag-info.txt could look like this:
+        //Contact-Name: Finch, Fiona
+        //Contact-Email: finch@mailinator.com
+        //Source-Organization: Dataverse Installation (<Site Url>)
+        //Organization-Address: <Full address>
+        //Organization-Email: <Email address>
+        //External-Description: Darwin's finches (also known as the GalÃĄpagos finches) are a group of about
+        // fifteen species of passerine birds.
+        //Bagging-Date: 2023-11-14
+        //External-Identifier: https://doi.org/10.5072/FK2/LZIGBC
+        //Bag-Size: 0 bytes
+        //Payload-Oxum: 0.0
+        //Internal-Sender-Identifier: Root:Darwin's Finches
+        Response downloadBag = UtilIT.downloadTmpFile(pathToZip, apiToken);
+        downloadBag.then().assertThat().statusCode(OK.getStatusCode());
+        Path outputPath = Paths.get("/tmp/foo.zip");
+        java.nio.file.Files.copy(downloadBag.getBody().asInputStream(), outputPath, StandardCopyOption.REPLACE_EXISTING);
+
+        ZipFile zipFile = new ZipFile(outputPath.toString());
+        Enumeration<? extends ZipEntry> entries = zipFile.entries();
+        String sourceOrg = null;
+        String orgAddress = null;
+        String orgEmail = null;
+        while (entries.hasMoreElements()) {
+            ZipEntry entry = entries.nextElement();
+            String name = entry.getName();
+            System.out.println("name: " + name);
+            if (name.endsWith("bag-info.txt")) {
+                InputStream stream = zipFile.getInputStream(entry);
+                Scanner s = new Scanner(stream).useDelimiter("\\A");
+                String result = s.hasNext() ? s.next() : "";
+                System.out.println("result: " + result);
+                String[] lines = result.split("\n");
+                for (String line : lines) {
+                    if (line.startsWith("Source-Organization")) {
+                        sourceOrg = line;
+                    } else if (line.startsWith("Organization-Address")) {
+                        orgAddress = line;
+                    } else if (line.startsWith("Organization-Email")) {
+                        orgEmail = line;
+                    } else {
+                    }
+                }
+            }
+        }
+        assertEquals("Source-Organization: Dataverse Installation (<Site Url>)", sourceOrg.trim());
+        assertEquals("Organization-Address: <Full address>", orgAddress.trim());
+        assertEquals("Organization-Email: <Email address>", orgEmail.trim());
+    }
+
+    @AfterAll
+    public static void tearDownClass() {
+
+        // Not checking if delete happened. Hopefully, it did.
+        UtilIT.deleteSetting(SettingsServiceBean.Key.ArchiverClassName);
+        UtilIT.deleteSetting(SettingsServiceBean.Key.ArchiverSettings);
+        UtilIT.deleteSetting(":BagItLocalPath");
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/BatchImportIT.java b/src/test/java/edu/harvard/iq/dataverse/api/BatchImportIT.java
index 89ad79817d8..c72fe19e494 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/BatchImportIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/BatchImportIT.java
@@ -1,15 +1,15 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
 import java.io.File;
-import com.jayway.restassured.response.Response;
+import io.restassured.response.Response;
 import java.util.logging.Logger;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static javax.ws.rs.core.Response.Status.ACCEPTED;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.CREATED;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static jakarta.ws.rs.core.Response.Status.ACCEPTED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
 import org.hamcrest.CoreMatchers;
 
 public class BatchImportIT {
@@ -21,7 +21,7 @@ public class BatchImportIT {
     public BatchImportIT() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/BuiltinUsersIT.java b/src/test/java/edu/harvard/iq/dataverse/api/BuiltinUsersIT.java
index 7c8034eb703..3fa15657483 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/BuiltinUsersIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/BuiltinUsersIT.java
@@ -1,10 +1,11 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import static com.jayway.restassured.RestAssured.given;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import static io.restassured.RestAssured.given;
+import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import edu.harvard.iq.dataverse.api.auth.ApiKeyAuthMechanism;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import java.util.AbstractMap;
 import java.util.Arrays;
@@ -14,17 +15,16 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static junit.framework.Assert.assertEquals;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertTrue;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class BuiltinUsersIT {
 
@@ -35,7 +35,7 @@ public class BuiltinUsersIT {
     private static final String usernameKey = "userName";
     private static final String emailKey = "email";
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
 
@@ -72,6 +72,31 @@ public void testCreateTimeAndApiLastUse() {
                 .statusCode(OK.getStatusCode());
 
     }
+    
+        @Test
+    public void testFindByToken() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response getUserAsJsonByToken = UtilIT.getAuthenticatedUserByToken(apiToken);
+
+        getUserAsJsonByToken.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        getUserAsJsonByToken = UtilIT.getAuthenticatedUserByToken("badcode");
+        getUserAsJsonByToken.then().assertThat()
+                .body("status", equalTo("ERROR"))
+                .body("message", equalTo(ApiKeyAuthMechanism.RESPONSE_MESSAGE_BAD_API_KEY))
+                .statusCode(UNAUTHORIZED.getStatusCode());
+
+    }
+
 
     @Test
     public void testLastApiUse() {
@@ -363,13 +388,6 @@ private Response createUser(String username, String firstName, String lastName,
         return response;
     }
 
-    private Response getApiTokenUsingEmail(String email, String password) {
-        Response response = given()
-                .contentType(ContentType.JSON)
-                .get("/api/builtin-users/" + email + "/api-token?username=" + email + "&password=" + password);
-        return response;
-    }
-
     private Response getUserFromDatabase(String username) {
         Response getUserResponse = given()
                 .get("/api/admin/authenticatedUsers/" + username + "/");
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/ConfirmEmailIT.java b/src/test/java/edu/harvard/iq/dataverse/api/ConfirmEmailIT.java
index e00dba2263b..0fef3d7166e 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/ConfirmEmailIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/ConfirmEmailIT.java
@@ -1,13 +1,13 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import static com.jayway.restassured.RestAssured.given;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import static io.restassured.RestAssured.given;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
 import java.util.logging.Logger;
-import static junit.framework.Assert.assertEquals;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.Matchers.startsWith;
 
@@ -18,7 +18,7 @@ public class ConfirmEmailIT {
 
     private static final Logger logger = Logger.getLogger(ConfirmEmailIT.class.getCanonicalName());
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/CustomizationIT.java b/src/test/java/edu/harvard/iq/dataverse/api/CustomizationIT.java
new file mode 100644
index 00000000000..24dddc5c556
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/CustomizationIT.java
@@ -0,0 +1,79 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import io.restassured.response.Response;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.hamcrest.CoreMatchers.*;
+
+public class CustomizationIT {
+
+    static String docroot;
+    @BeforeAll
+    public static void setup() {
+        // setup docroot for running test either in docker or in Jenkins
+        if (Files.exists(Paths.get("docker-dev-volumes"))) {
+            docroot = "./appserver/glassfish/domains/domain1/docroot/";
+        } else {
+            docroot = "../docroot/";
+        }
+    }
+    @AfterEach
+    public void after() {
+        UtilIT.deleteSetting(SettingsServiceBean.Key.WebAnalyticsCode);
+    }
+
+    @Test
+    public void testGetCustomAnalytics() {
+        String setting = docroot + "index.html";
+        UtilIT.setSetting(SettingsServiceBean.Key.WebAnalyticsCode, setting).prettyPrint();
+
+        Response getResponse = UtilIT.getCustomizationFile("analytics");
+        getResponse.then().assertThat()
+                .statusCode(200)
+                .body(containsString("<!doctype html>"));
+
+        assert (getResponse.getHeaders().get("Content-Type").getValue().startsWith("text/html"));
+
+        UtilIT.deleteSetting(SettingsServiceBean.Key.WebAnalyticsCode).prettyPrint();
+
+        getResponse = UtilIT.getCustomizationFile("analytics");
+        getResponse.then().assertThat()
+                .statusCode(404)
+                .body(containsString("not found."));
+    }
+
+    @Test
+    public void testGetCustomLogo() {
+        String setting = docroot + "img/logo.png";
+        UtilIT.setSetting(SettingsServiceBean.Key.LogoCustomizationFile, setting).prettyPrint();
+
+        Response getResponse = UtilIT.getCustomizationFile("logo");
+        getResponse.then().assertThat()
+                .statusCode(200)
+                .body(containsString("PNG"));
+
+        assert (getResponse.getHeaders().get("Content-Type").getValue().startsWith("image/png"));
+
+        UtilIT.deleteSetting(SettingsServiceBean.Key.LogoCustomizationFile).prettyPrint();
+
+        getResponse = UtilIT.getCustomizationFile("logo");
+        getResponse.prettyPrint();
+        getResponse.then().assertThat()
+                .statusCode(404)
+                .body(containsString("not found."));
+    }
+
+    @Test
+    public void testGetCustomUnknown() {
+        Response getResponse = UtilIT.getCustomizationFile("unknownType");
+        getResponse.then().assertThat()
+                .statusCode(400)
+                .body(containsString("Customization type unknown or missing. Must be one of the following: [homePage, header"));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataCiteIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataCiteIT.java
index 86c3eed4297..bb4c64dedcf 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DataCiteIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataCiteIT.java
@@ -1,10 +1,10 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
-import static junit.framework.Assert.assertEquals;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.hamcrest.CoreMatchers.equalTo;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * These tests will only work if you are using "DataCite" rather than "EZID" for
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataRetrieverApiIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataRetrieverApiIT.java
new file mode 100644
index 00000000000..c3bfdb80e6e
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataRetrieverApiIT.java
@@ -0,0 +1,290 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import edu.harvard.iq.dataverse.api.auth.ApiKeyAuthMechanism;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+import io.restassured.path.json.JsonPath;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class DataRetrieverApiIT {
+
+    private static final String ERR_MSG_FORMAT = "{\n    \"success\": false,\n    \"error_message\": \"%s\"\n}";
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testRetrieveMyDataAsJsonString() {
+        // Call with bad API token
+        ArrayList<Long> emptyRoleIdsList = new ArrayList<>();
+        Response badApiTokenResponse = UtilIT.retrieveMyDataAsJsonString("bad-token", "dummy-user-identifier", emptyRoleIdsList);
+        badApiTokenResponse.then().assertThat().body("status", equalTo(ApiConstants.STATUS_ERROR)).body("message", equalTo(ApiKeyAuthMechanism.RESPONSE_MESSAGE_BAD_API_KEY)).statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Call as superuser with invalid user identifier
+        Response createUserResponse = UtilIT.createRandomUser();
+        Response makeSuperUserResponse = UtilIT.makeSuperUser(UtilIT.getUsernameFromResponse(createUserResponse));
+        assertEquals(OK.getStatusCode(), makeSuperUserResponse.getStatusCode());
+        String superUserApiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        String badUserIdentifier = "bad-identifier";
+        Response invalidUserIdentifierResponse = UtilIT.retrieveMyDataAsJsonString(superUserApiToken, badUserIdentifier, emptyRoleIdsList);
+        assertEquals(prettyPrintError("dataretrieverAPI.user.not.found", Arrays.asList(badUserIdentifier)), invalidUserIdentifierResponse.prettyPrint());
+        assertEquals(OK.getStatusCode(), invalidUserIdentifierResponse.getStatusCode());
+
+        // Call as superuser with valid user identifier and no roles
+        Response createSecondUserResponse = UtilIT.createRandomUser();
+        String userIdentifier = UtilIT.getUsernameFromResponse(createSecondUserResponse);
+        Response validUserIdentifierResponse = UtilIT.retrieveMyDataAsJsonString(superUserApiToken, userIdentifier, emptyRoleIdsList);
+        assertEquals(prettyPrintError("myDataFinder.error.result.no.role", null), validUserIdentifierResponse.prettyPrint());
+        assertEquals(OK.getStatusCode(), validUserIdentifierResponse.getStatusCode());
+
+        // Call as normal user with one valid role and no results
+        Response createNormalUserResponse = UtilIT.createRandomUser();
+        String normalUserUsername = UtilIT.getUsernameFromResponse(createNormalUserResponse);
+        String normalUserApiToken = UtilIT.getApiTokenFromResponse(createNormalUserResponse);
+        Response noResultwithOneRoleResponse = UtilIT.retrieveMyDataAsJsonString(normalUserApiToken, "", new ArrayList<>(Arrays.asList(5L)));
+        assertEquals(prettyPrintError("myDataFinder.error.result.role.empty", Arrays.asList("Dataset Creator")), noResultwithOneRoleResponse.prettyPrint());
+        assertEquals(OK.getStatusCode(), noResultwithOneRoleResponse.getStatusCode());
+
+        // Call as normal user with multiple valid roles and no results
+        Response noResultWithMultipleRoleResponse = UtilIT.retrieveMyDataAsJsonString(normalUserApiToken, "", new ArrayList<>(Arrays.asList(5L, 6L)));
+        assertEquals(prettyPrintError("myDataFinder.error.result.roles.empty", Arrays.asList("Dataset Creator, Contributor")), noResultWithMultipleRoleResponse.prettyPrint());
+        assertEquals(OK.getStatusCode(), noResultWithMultipleRoleResponse.getStatusCode());
+
+        // Call as normal user with one valid dataset role and one dataset result
+        Response createDataverseResponse = UtilIT.createRandomDataverse(normalUserApiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, normalUserApiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        UtilIT.sleepForReindex(datasetId.toString(), normalUserApiToken, 4);
+        Response oneDatasetResponse = UtilIT.retrieveMyDataAsJsonString(normalUserApiToken, "", new ArrayList<>(Arrays.asList(6L)));
+        assertEquals(OK.getStatusCode(), oneDatasetResponse.getStatusCode());
+        JsonPath jsonPathOneDataset = oneDatasetResponse.getBody().jsonPath();
+        assertEquals(1, jsonPathOneDataset.getInt("data.total_count"));
+        assertEquals(datasetId, jsonPathOneDataset.getInt("data.items[0].entity_id"));
+
+        // Call as normal user with one valid dataverse role and one dataverse result
+        UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR.toString(),
+                "@" + normalUserUsername, superUserApiToken);
+        Response oneDataverseResponse = UtilIT.retrieveMyDataAsJsonString(normalUserApiToken, "", new ArrayList<>(Arrays.asList(5L)));
+        assertEquals(OK.getStatusCode(), oneDataverseResponse.getStatusCode());
+        JsonPath jsonPathOneDataverse = oneDataverseResponse.getBody().jsonPath();
+        assertEquals(1, jsonPathOneDataverse.getInt("data.total_count"));
+        assertEquals(dataverseAlias, jsonPathOneDataverse.getString("data.items[0].name"));
+
+        // Clean up
+        Response deleteDatasetResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, normalUserApiToken);
+        deleteDatasetResponse.prettyPrint();
+        assertEquals(200, deleteDatasetResponse.getStatusCode());
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, normalUserApiToken);
+        deleteDataverseResponse.prettyPrint();
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(normalUserUsername);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
+    }
+
+    @Test
+    public void testRetrieveMyDataAsJsonStringSortOrder() {
+        // Create superuser
+        Response createSuperUserResponse = UtilIT.createRandomUser();
+        String superUserIdentifier = UtilIT.getUsernameFromResponse(createSuperUserResponse);
+        String superUserApiToken = UtilIT.getApiTokenFromResponse(createSuperUserResponse);
+        Response makeSuperUserResponse = UtilIT.setSuperuserStatus(superUserIdentifier, true);
+        assertEquals(OK.getStatusCode(), makeSuperUserResponse.getStatusCode());
+
+        // Create regular user
+        Response createUserResponse = UtilIT.createRandomUser();
+        String userApiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        String userIdentifier = UtilIT.getUsernameFromResponse(createUserResponse);
+
+        // Call as regular user with no result
+        Response myDataEmptyResponse = UtilIT.retrieveMyDataAsJsonString(userApiToken, "", new ArrayList<>(Arrays.asList(6L)));
+        assertEquals(prettyPrintError("myDataFinder.error.result.role.empty", Arrays.asList("Contributor")), myDataEmptyResponse.prettyPrint());
+        assertEquals(OK.getStatusCode(), myDataEmptyResponse.getStatusCode());
+
+        // Create and publish a dataverse
+        Response createDataverseResponse = UtilIT.createRandomDataverse(superUserApiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, superUserApiToken);
+        publishDataverse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Allow user to create datasets in dataverse
+        Response grantRole = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR, "@" + userIdentifier, superUserApiToken);
+        grantRole.prettyPrint();
+        assertEquals(OK.getStatusCode(), grantRole.getStatusCode());
+
+        // As user, create two datasets and submit them for review
+        Response createDatasetOneResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, userApiToken);
+        createDatasetOneResponse.prettyPrint();
+        Integer datasetOneId = UtilIT.getDatasetIdFromResponse(createDatasetOneResponse);
+        String datasetOnePid = UtilIT.getDatasetPersistentIdFromResponse(createDatasetOneResponse);
+        UtilIT.sleepForReindex(datasetOneId.toString(), userApiToken, 4);
+
+        Response createDatasetTwoResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, userApiToken);
+        createDatasetTwoResponse.prettyPrint();
+        Integer datasetTwoId = UtilIT.getDatasetIdFromResponse(createDatasetTwoResponse);
+        String datasetTwoPid = UtilIT.getDatasetPersistentIdFromResponse(createDatasetTwoResponse);
+        UtilIT.sleepForReindex(datasetTwoId.toString(), userApiToken, 4);
+
+        // Request datasets belonging to user
+        Response twoDatasetsInReviewResponse = UtilIT.retrieveMyDataAsJsonString(userApiToken, "", new ArrayList<>(Arrays.asList(6L)));
+        twoDatasetsInReviewResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), twoDatasetsInReviewResponse.getStatusCode());
+        JsonPath jsonPathTwoDatasetsInReview = twoDatasetsInReviewResponse.getBody().jsonPath();
+        assertEquals(2, jsonPathTwoDatasetsInReview.getInt("data.total_count"));
+        // Expect newest dataset (dataset 2) first
+        assertEquals(datasetTwoId, jsonPathTwoDatasetsInReview.getInt("data.items[0].entity_id"));
+        assertEquals("DRAFT", jsonPathTwoDatasetsInReview.getString("data.items[0].versionState"));
+        assertEquals(datasetOneId, jsonPathTwoDatasetsInReview.getInt("data.items[1].entity_id"));
+        assertEquals("DRAFT", jsonPathTwoDatasetsInReview.getString("data.items[1].versionState"));
+
+        // Publish dataset 1
+        Response publishDatasetOne = UtilIT.publishDatasetViaNativeApi(datasetOneId, "major", superUserApiToken);
+        publishDatasetOne.prettyPrint();
+        publishDatasetOne.then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.sleepForReindex(datasetOneId.toString(), userApiToken, 4);
+
+        // Publish dataset 2
+        Response publishDatasetTwo = UtilIT.publishDatasetViaNativeApi(datasetTwoId, "major", superUserApiToken);
+        publishDatasetTwo.prettyPrint();
+        publishDatasetTwo.then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.sleepForReindex(datasetTwoId.toString(), userApiToken, 4);
+
+        // Request datasets belonging to user
+        Response twoPublishedDatasetsResponse = UtilIT.retrieveMyDataAsJsonString(userApiToken, "", new ArrayList<>(Arrays.asList(6L)));
+        twoPublishedDatasetsResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), twoPublishedDatasetsResponse.getStatusCode());
+        JsonPath jsonPathTwoPublishedDatasets = twoPublishedDatasetsResponse.getBody().jsonPath();
+        assertEquals(2, jsonPathTwoPublishedDatasets.getInt("data.total_count"));
+        // Expect newest dataset (dataset 2) first
+        assertEquals(datasetTwoId, jsonPathTwoPublishedDatasets.getInt("data.items[0].entity_id"));
+        assertEquals("RELEASED", jsonPathTwoPublishedDatasets.getString("data.items[0].versionState"));
+        assertEquals(datasetOneId, jsonPathTwoPublishedDatasets.getInt("data.items[1].entity_id"));
+        assertEquals("RELEASED", jsonPathTwoPublishedDatasets.getString("data.items[1].versionState"));
+
+        // Create new draft version of dataset 1 by updating metadata
+        String pathToJsonFilePostPub= "doc/sphinx-guides/source/_static/api/dataset-add-metadata-after-pub.json";
+        Response addDataToPublishedVersion = UtilIT.addDatasetMetadataViaNative(datasetOnePid, pathToJsonFilePostPub, userApiToken);
+        addDataToPublishedVersion.prettyPrint();
+        addDataToPublishedVersion.then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.sleepForReindex(datasetOneId.toString(), userApiToken, 4);
+
+        // Request datasets belonging to user
+        Response twoPublishedDatasetsOneDraftResponse = UtilIT.retrieveMyDataAsJsonString(userApiToken, "", new ArrayList<>(Arrays.asList(6L)));
+        twoPublishedDatasetsOneDraftResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), twoPublishedDatasetsOneDraftResponse.getStatusCode());
+        JsonPath jsonPathTwoPublishedDatasetsOneDraft = twoPublishedDatasetsOneDraftResponse.getBody().jsonPath();
+        assertEquals(3, jsonPathTwoPublishedDatasetsOneDraft.getInt("data.total_count"));
+
+        // Expect newest dataset version (draft of dataset 1) first
+        assertEquals(datasetOneId, jsonPathTwoPublishedDatasetsOneDraft.getInt("data.items[0].entity_id"));
+        assertEquals("DRAFT", jsonPathTwoPublishedDatasetsOneDraft.getString("data.items[0].versionState"));
+        // ...followed by dataset 2 (created after dataset 1)
+        assertEquals(datasetTwoId, jsonPathTwoPublishedDatasetsOneDraft.getInt("data.items[1].entity_id"));
+        assertEquals("RELEASED", jsonPathTwoPublishedDatasetsOneDraft.getString("data.items[1].versionState"));
+        // ...followed by dataset 1 (oldest, created before dataset 2)
+        assertEquals(datasetOneId, jsonPathTwoPublishedDatasetsOneDraft.getInt("data.items[2].entity_id"));
+        assertEquals("RELEASED", jsonPathTwoPublishedDatasetsOneDraft.getString("data.items[2].versionState"));
+
+        // Create new draft version of dataset 2 by uploading a file
+        String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
+        Response uploadImage = UtilIT.uploadFileViaNative(datasetTwoId.toString(), pathToFile, userApiToken);
+        uploadImage.prettyPrint();
+        uploadImage.then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.sleepForReindex(datasetTwoId.toString(), userApiToken, 4);
+
+        // Request datasets belonging to user
+        Response twoPublishedDatasetsTwoDraftsResponse = UtilIT.retrieveMyDataAsJsonString(userApiToken, "", new ArrayList<>(Arrays.asList(6L)));
+        twoPublishedDatasetsTwoDraftsResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), twoPublishedDatasetsTwoDraftsResponse.getStatusCode());
+        JsonPath jsonPathTwoPublishedDatasetsTwoDrafts = twoPublishedDatasetsTwoDraftsResponse.getBody().jsonPath();
+        assertEquals(4, jsonPathTwoPublishedDatasetsTwoDrafts.getInt("data.total_count"));
+
+        // Expect newest dataset version (draft of dataset 2) first
+        assertEquals(datasetTwoId, jsonPathTwoPublishedDatasetsTwoDrafts.getInt("data.items[0].entity_id"));
+        assertEquals("DRAFT", jsonPathTwoPublishedDatasetsTwoDrafts.getString("data.items[0].versionState"));
+        assertEquals(datasetOneId, jsonPathTwoPublishedDatasetsTwoDrafts.getInt("data.items[1].entity_id"));
+        assertEquals("DRAFT", jsonPathTwoPublishedDatasetsTwoDrafts.getString("data.items[1].versionState"));
+        assertEquals(datasetTwoId, jsonPathTwoPublishedDatasetsTwoDrafts.getInt("data.items[2].entity_id"));
+        assertEquals("RELEASED", jsonPathTwoPublishedDatasetsTwoDrafts.getString("data.items[2].versionState"));
+        assertEquals(datasetOneId, jsonPathTwoPublishedDatasetsTwoDrafts.getInt("data.items[3].entity_id"));
+        assertEquals("RELEASED", jsonPathTwoPublishedDatasetsTwoDrafts.getString("data.items[3].versionState"));
+
+        // Publish minor version of dataset 1
+        Response publishDatasetOneMinor = UtilIT.publishDatasetViaNativeApi(datasetOneId, "minor", superUserApiToken);
+        publishDatasetOneMinor.prettyPrint();
+        publishDatasetOneMinor.then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.sleepForReindex(datasetOneId.toString(), userApiToken, 4);
+
+        // Request datasets belonging to user
+        Response oneMinorOneMajorOneDraftDatasetResponse = UtilIT.retrieveMyDataAsJsonString(userApiToken, "", new ArrayList<>(Arrays.asList(6L)));
+        oneMinorOneMajorOneDraftDatasetResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), oneMinorOneMajorOneDraftDatasetResponse.getStatusCode());
+        JsonPath jsonPathOneMinorOneMajorOneDraftDataset = oneMinorOneMajorOneDraftDatasetResponse.getBody().jsonPath();
+        assertEquals(3, jsonPathOneMinorOneMajorOneDraftDataset.getInt("data.total_count"));
+
+        // Expect minor version of dataset 1 to be sorted last (based on release date of major version)
+        assertEquals(datasetTwoId, jsonPathOneMinorOneMajorOneDraftDataset.getInt("data.items[0].entity_id"));
+        assertEquals("DRAFT", jsonPathOneMinorOneMajorOneDraftDataset.getString("data.items[0].versionState"));
+
+        assertEquals(datasetTwoId, jsonPathOneMinorOneMajorOneDraftDataset.getInt("data.items[1].entity_id"));
+        assertEquals("RELEASED", jsonPathOneMinorOneMajorOneDraftDataset.getString("data.items[1].versionState"));
+
+        assertEquals(datasetOneId, jsonPathOneMinorOneMajorOneDraftDataset.getInt("data.items[2].entity_id"));
+        assertEquals("RELEASED", jsonPathOneMinorOneMajorOneDraftDataset.getString("data.items[2].versionState"));
+        assertEquals(1, jsonPathOneMinorOneMajorOneDraftDataset.getInt("data.items[2].majorVersion"));
+        assertEquals(1, jsonPathOneMinorOneMajorOneDraftDataset.getInt("data.items[2].minorVersion"));
+
+        // Clean up
+        Response deleteDatasetOneResponse = UtilIT.destroyDataset(datasetOneId, superUserApiToken);
+        deleteDatasetOneResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), deleteDatasetOneResponse.getStatusCode());
+        Response deleteDatasetTwoResponse = UtilIT.destroyDataset(datasetTwoId, superUserApiToken);
+        deleteDatasetTwoResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), deleteDatasetTwoResponse.getStatusCode());
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, superUserApiToken);
+        deleteDataverseResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(userIdentifier);
+        deleteUserResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), deleteUserResponse.getStatusCode());
+
+        Response deleteSuperUserResponse = UtilIT.deleteUser(superUserIdentifier);
+        deleteSuperUserResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), deleteSuperUserResponse.getStatusCode());
+    }
+
+    private static String prettyPrintError(String resourceBundleKey, List<String> params) {
+        final String errorMessage;
+        if (params == null || params.isEmpty()) {
+            errorMessage = BundleUtil.getStringFromBundle(resourceBundleKey);
+        } else {
+            errorMessage = BundleUtil.getStringFromBundle(resourceBundleKey, params);
+        }
+        return String.format(ERR_MSG_FORMAT, errorMessage.replaceAll("\"", "\\\\\""));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApiTest.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApiTest.java
new file mode 100644
index 00000000000..5f00d34b276
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApiTest.java
@@ -0,0 +1,145 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.ControlledVocabularyValueServiceBean;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.MetadataBlockServiceBean;
+import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.File;
+import java.io.StringReader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@ExtendWith(MockitoExtension.class)
+public class DatasetFieldServiceApiTest {
+
+    @Mock
+    private ActionLogServiceBean actionLogSvc;
+
+    @Mock
+    private MetadataBlockServiceBean metadataBlockService;
+
+    @Mock
+    private DataverseServiceBean dataverseService;
+
+    @Mock
+    private DatasetFieldServiceBean datasetFieldService;
+
+    @Mock
+    private ControlledVocabularyValueServiceBean controlledVocabularyValueService;
+
+    private DatasetFieldServiceApi api;
+
+    @BeforeEach
+    public void setup(){
+        api = new DatasetFieldServiceApi();
+        api.actionLogSvc = actionLogSvc;
+        api.metadataBlockService = metadataBlockService;
+        api.dataverseService = dataverseService;
+        api.datasetFieldService = datasetFieldService;
+        api.controlledVocabularyValueService = controlledVocabularyValueService;
+    }
+
+    @Test
+    public void testArrayIndexOutOfBoundMessageBundle() {
+        List<String> arguments = new ArrayList<>();
+        arguments.add("DATASETFIELD");
+        arguments.add(String.valueOf(5));
+        arguments.add("watermark");
+        arguments.add(String.valueOf(4 + 1));
+
+        String bundle = "api.admin.datasetfield.load.ArrayIndexOutOfBoundMessage";
+        String message = BundleUtil.getStringFromBundle(bundle, arguments);
+        assertEquals(
+            "Error parsing metadata block in DATASETFIELD part, line #5: missing 'watermark' column (#5)",
+            message
+        );
+    }
+
+    @Test
+    public void testGeneralErrorMessageBundle() {
+        List<String> arguments = new ArrayList<>();
+        arguments.add("DATASETFIELD");
+        arguments.add(String.valueOf(5));
+        arguments.add("some error message");
+        String bundle = "api.admin.datasetfield.load.GeneralErrorMessage";
+        String message = BundleUtil.getStringFromBundle(bundle, arguments);
+        assertEquals(
+            "Error parsing metadata block in DATASETFIELD part, line #5: some error message",
+            message
+        );
+    }
+
+    @Test
+    public void testGetArrayIndexOutOfBoundMessage() {
+        DatasetFieldServiceApi api = new DatasetFieldServiceApi();
+        String message = api.getArrayIndexOutOfBoundMessage(DatasetFieldServiceApi.HeaderType.DATASETFIELD, 5, 4);
+        assertEquals(
+            "Error parsing metadata block in DATASETFIELD part, line #5: missing 'watermark' column (#5)",
+            message
+        );
+    }
+
+    @Test
+    public void testGetGeneralErrorMessage() {
+        DatasetFieldServiceApi api = new DatasetFieldServiceApi();
+        String message = api.getGeneralErrorMessage(DatasetFieldServiceApi.HeaderType.DATASETFIELD, 5, "some error");
+        assertEquals(
+            "Error parsing metadata block in DATASETFIELD part, line #5: some error",
+            message
+        );
+    }
+
+    @Test
+    public void testGetGeneralErrorMessageEmptyHeader() {
+        DatasetFieldServiceApi api = new DatasetFieldServiceApi();
+        String message = api.getGeneralErrorMessage(null, 5, "some error");
+        assertEquals(
+            "Error parsing metadata block in unknown part, line #5: some error",
+            message
+        );
+    }
+
+    @Test
+    public void testLoadDatasetFieldsWhitespaceTrimming() {
+
+        Path resourceDirectory = Paths.get("src/test/resources/tsv/whitespace-test.tsv");
+        File testfile = new File(resourceDirectory.toFile().getAbsolutePath());
+        JsonReader jsonReader;
+        try (Response response = api.loadDatasetFields(testfile)) {
+            assertEquals(200, response.getStatus());
+            jsonReader = Json.createReader(new StringReader(response.getEntity().toString()));
+        }
+        JsonObject jsonObject = jsonReader.readObject();
+
+        final List<String> metadataNames = jsonObject.getJsonObject("data").getJsonArray("added")
+            .getValuesAs(e -> e.asJsonObject().getString("name"));
+        assertThat(metadataNames).contains("whitespaceDemo")
+            .contains("whitespaceDemoOne")
+            .contains("whitespaceDemoTwo")
+            .contains("whitespaceDemoThree")
+            .contains("CV1")
+            .contains("CV2")
+            .contains("CV3");
+        assertThat(metadataNames).doesNotContain(" whitespaceDemo")
+            .doesNotContain("whitespaceDemoOne ")
+            .doesNotContain("CV1 ")
+            .doesNotContain(" CV2");
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetFieldsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetFieldsIT.java
new file mode 100644
index 00000000000..b70ef04d4c0
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetFieldsIT.java
@@ -0,0 +1,29 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+public class DatasetFieldsIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    void testListAllFacetableDatasetFields() {
+        Response listAllFacetableDatasetFieldsResponse = UtilIT.listAllFacetableDatasetFields();
+        listAllFacetableDatasetFieldsResponse.then().assertThat().statusCode(OK.getStatusCode());
+        int expectedNumberOfFacetableDatasetFields = 64;
+        listAllFacetableDatasetFieldsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", equalTo("authorName"))
+                .body("data[0].displayName", equalTo("Author Name"))
+                .body("data.size()", equalTo(expectedNumberOfFacetableDatasetFields));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java
new file mode 100644
index 00000000000..205725822ff
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java
@@ -0,0 +1,716 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import java.util.UUID;
+import org.hamcrest.CoreMatchers;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class DatasetTypesIT {
+
+    final static String INSTRUMENT = "instrument";
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.setSuperuserStatus(username, true).then().assertThat().statusCode(OK.getStatusCode());
+
+        ensureDatasetTypeIsPresent(DatasetType.DATASET_TYPE_SOFTWARE, apiToken);
+        ensureDatasetTypeIsPresent(INSTRUMENT, apiToken);
+    }
+
+    @AfterAll
+    public static void afterClass() {
+        // Other tests make assertions about displayOnCreate so revert it back to how it was.
+        UtilIT.setDisplayOnCreate("astroInstrument", false);
+    }
+
+    private static void ensureDatasetTypeIsPresent(String datasetType, String apiToken) {
+        Response getDatasetType = UtilIT.getDatasetType(datasetType);
+        getDatasetType.prettyPrint();
+        String typeFound = JsonPath.from(getDatasetType.getBody().asString()).getString("data.name");
+        System.out.println("type found: " + typeFound);
+        if (datasetType.equals(typeFound)) {
+            return;
+        }
+        System.out.println("The " + datasetType + "type wasn't found. Create it.");
+        String jsonIn = Json.createObjectBuilder().add("name", datasetType).build().toString();
+        Response typeAdded = UtilIT.addDatasetType(jsonIn, apiToken);
+        typeAdded.prettyPrint();
+        typeAdded.then().assertThat().statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testCreateSoftwareDatasetNative() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+
+        String jsonIn = UtilIT.getDatasetJson("doc/sphinx-guides/source/_static/api/dataset-create-software.json");
+
+        Response createSoftware = UtilIT.createDataset(dataverseAlias, jsonIn, apiToken);
+        createSoftware.prettyPrint();
+
+        createSoftware.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createSoftware);
+        String datasetPid = JsonPath.from(createSoftware.getBody().asString()).getString("data.persistentId");
+
+        Response getDatasetJson = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJson.prettyPrint();
+        getDatasetJson.then().assertThat().statusCode(OK.getStatusCode());
+        String datasetType = JsonPath.from(getDatasetJson.getBody().asString()).getString("data.datasetType");
+        System.out.println("datasetType: " + datasetType);
+        assertEquals("software", datasetType);
+
+        Response searchDraft = UtilIT.searchAndShowFacets("id:dataset_" + datasetId + "_draft", apiToken);
+        searchDraft.prettyPrint();
+        searchDraft.then().assertThat()
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                // No "Dataset Type" or count for "Software" because we hide the facet if there is only one type.
+                .body("data.facets[0].datasetType.friendly", CoreMatchers.nullValue())
+                .body("data.facets[0].datasetType.labels[0].Software", CoreMatchers.nullValue())
+                .statusCode(OK.getStatusCode());
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        String dataset2Pid = JsonPath.from(createDataset.getBody().asString()).getString("data.persistentId");
+
+        UtilIT.publishDatasetViaNativeApi(dataset2Pid, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+        //An explicit sleep is needed here because the searchAndShowFacets won't sleep for the query used here
+        UtilIT.sleepForReindex(dataset2Pid, apiToken, 5);
+        Response searchCollection = UtilIT.searchAndShowFacets("parentName:" + dataverseAlias, null);
+        searchCollection.prettyPrint();
+        searchCollection.then().assertThat()
+                .body("data.total_count", CoreMatchers.is(2))
+                .body("data.count_in_response", CoreMatchers.is(2))
+                .body("data.facets[0].datasetType.friendly", CoreMatchers.is("Dataset Type"))
+                .body("data.facets[0].datasetType.labels[0].Dataset", CoreMatchers.is(1))
+                .body("data.facets[0].datasetType.labels[1].Software", CoreMatchers.is(1))
+                .statusCode(OK.getStatusCode());
+
+//        Response searchAsGuest = UtilIT.search(SearchFields.DATASET_TYPE + ":software", null);
+//        searchAsGuest.prettyPrint();
+//        searchAsGuest.then().assertThat()
+//                .body("data.total_count", CoreMatchers.is(1))
+//                .body("data.count_in_response", CoreMatchers.is(1))
+//                .body("data.facets[0].datasetType.friendly", CoreMatchers.is("Dataset Type"))
+//                .body("data.facets[0].datasetType.labels[0].software", CoreMatchers.is(1))
+//                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testCreateDatasetSemantic() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+
+        String jsonIn = UtilIT.getDatasetJson("doc/sphinx-guides/source/_static/api/dataset-create-software.jsonld");
+
+        Response createSoftware = UtilIT.createDatasetSemantic(dataverseAlias, jsonIn, apiToken);
+        createSoftware.prettyPrint();
+
+        createSoftware.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createSoftware);
+        String datasetPid = JsonPath.from(createSoftware.getBody().asString()).getString("data.persistentId");
+
+        Response getDatasetJson = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJson.prettyPrint();
+        getDatasetJson.then().assertThat().statusCode(OK.getStatusCode());
+        String datasetType = JsonPath.from(getDatasetJson.getBody().asString()).getString("data.datasetType");
+        System.out.println("datasetType: " + datasetType);
+
+        assertEquals("software", datasetType);
+
+    }
+
+    @Test
+    public void testImportJson() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        UtilIT.setSuperuserStatus(username, true).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+
+        String jsonIn = UtilIT.getDatasetJson("doc/sphinx-guides/source/_static/api/dataset-create-software.json");
+
+        String randomString = UtilIT.getRandomString(6);
+
+        Response importJson = UtilIT.importDatasetNativeJson(apiToken, dataverseAlias, jsonIn, "doi:10.5072/FK2/" + randomString, "no");
+        importJson.prettyPrint();
+
+        importJson.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = JsonPath.from(importJson.getBody().asString()).getInt("data.id");
+        String datasetPid = JsonPath.from(importJson.getBody().asString()).getString("data.persistentId");
+
+        Response getDatasetJson = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJson.prettyPrint();
+        getDatasetJson.then().assertThat().statusCode(OK.getStatusCode());
+        String datasetType = JsonPath.from(getDatasetJson.getBody().asString()).getString("data.datasetType");
+        System.out.println("datasetType: " + datasetType);
+        assertEquals("software", datasetType);
+
+    }
+
+    @Test
+    public void testGetDatasetTypes() {
+        Response getTypes = UtilIT.getDatasetTypes();
+        getTypes.prettyPrint();
+        getTypes.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // non-null because types were added by a Flyway script
+                .body("data", CoreMatchers.not(equalTo(null)));
+    }
+
+    @Test
+    public void testGetDefaultDatasetType() {
+        Response getType = UtilIT.getDatasetType(DatasetType.DEFAULT_DATASET_TYPE);
+        getType.prettyPrint();
+        getType.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.name", equalTo(DatasetType.DEFAULT_DATASET_TYPE));
+    }
+
+    @Test
+    public void testDeleteDefaultDatasetType() {
+        Response getType = UtilIT.getDatasetType(DatasetType.DEFAULT_DATASET_TYPE);
+        getType.prettyPrint();
+        getType.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.name", equalTo(DatasetType.DEFAULT_DATASET_TYPE));
+
+        Long doomed = JsonPath.from(getType.getBody().asString()).getLong("data.id");
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.setSuperuserStatus(username, true).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deleteType = UtilIT.deleteDatasetTypes(doomed, apiToken);
+        deleteType.prettyPrint();
+        deleteType.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode());
+    }
+
+    @Test
+    public void testAddAndDeleteDatasetType() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.setSuperuserStatus(username, true).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response badJson = UtilIT.addDatasetType("this isn't even JSON", apiToken);
+        badJson.prettyPrint();
+        badJson.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+
+        String numbersOnlyIn = Json.createObjectBuilder().add("name", "12345").build().toString();
+        Response numbersOnly = UtilIT.addDatasetType(numbersOnlyIn, apiToken);
+        numbersOnly.prettyPrint();
+        numbersOnly.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+
+        //Avoid all-numeric names (which are not allowed)
+        String randomName = "A" + UUID.randomUUID().toString().substring(0, 8);
+        String jsonIn = Json.createObjectBuilder().add("name", randomName).build().toString();
+
+        System.out.println("adding type with name " + randomName);
+        Response typeAdded = UtilIT.addDatasetType(jsonIn, apiToken);
+        typeAdded.prettyPrint();
+
+        typeAdded.then().assertThat().statusCode(OK.getStatusCode());
+
+        Long doomed = JsonPath.from(typeAdded.getBody().asString()).getLong("data.id");
+
+        System.out.println("doomed: " + doomed);
+        Response getTypeById = UtilIT.getDatasetType(doomed.toString());
+        getTypeById.prettyPrint();
+        getTypeById.then().assertThat().statusCode(OK.getStatusCode());
+
+        System.out.println("deleting type with id " + doomed);
+        Response typeDeleted = UtilIT.deleteDatasetTypes(doomed, apiToken);
+        typeDeleted.prettyPrint();
+        typeDeleted.then().assertThat().statusCode(OK.getStatusCode());
+
+    }
+    
+    @Test
+    public void testAddDatasetTypeWithMDBLicense(){
+        
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.setSuperuserStatus(username, true).then().assertThat().statusCode(OK.getStatusCode());
+
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("name", "testDatasetType");
+        job.add("linkedMetadataBlocks", Json.createArrayBuilder().add("geospatial"));
+        job.add("availableLicenses", Json.createArrayBuilder().add("CC0 1.0"));
+
+        Response typeAdded = UtilIT.addDatasetType(job.build(), apiToken);
+        typeAdded.prettyPrint();
+
+        typeAdded.then().assertThat().statusCode(OK.getStatusCode());
+
+        Long doomed = JsonPath.from(typeAdded.getBody().asString()).getLong("data.id");
+
+        System.out.println("doomed: " + doomed);
+        Response getTypeById = UtilIT.getDatasetType(doomed.toString());
+        getTypeById.prettyPrint();
+        getTypeById.then().assertThat().statusCode(OK.getStatusCode());
+
+        System.out.println("deleting type with id " + doomed);
+        Response typeDeleted = UtilIT.deleteDatasetTypes(doomed, apiToken);
+        typeDeleted.prettyPrint();
+        typeDeleted.then().assertThat().statusCode(OK.getStatusCode());
+        
+        //bad metadatablock name 
+        job = Json.createObjectBuilder();
+        job.add("name", "testDatasetType");
+        job.add("linkedMetadataBlocks", Json.createArrayBuilder().add("geospatialXXX"));
+        job.add("availableLicenses", Json.createArrayBuilder().add("CC0 1.0"));
+        
+        typeAdded = UtilIT.addDatasetType(job.build(), apiToken);
+        typeAdded.prettyPrint();
+
+        typeAdded.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", containsString("Metadata block not found:"));
+        
+        job = Json.createObjectBuilder();
+        job.add("name", "testDatasetType");
+        job.add("linkedMetadataBlocks", Json.createArrayBuilder().add("geospatial"));
+        job.add("availableLicenses", Json.createArrayBuilder().add("CC0 12.0"));
+
+        typeAdded = UtilIT.addDatasetType(job.build(), apiToken); 
+        typeAdded.prettyPrint();
+        typeAdded.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", containsString("License not found:"));
+
+    }
+    
+    @Test
+    public void testUpdateDatasetTypeWithLicense(){
+        
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.setSuperuserStatus(username, true).then().assertThat().statusCode(OK.getStatusCode());
+
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("name", "testDatasetType");
+
+        Response typeAdded = UtilIT.addDatasetType(job.build(), apiToken);
+        typeAdded.prettyPrint();
+
+        typeAdded.then().assertThat().statusCode(OK.getStatusCode());
+        
+                String availableLicenseArray = """
+            ["CC0 1.0"]
+""";
+        
+        Response addCC0 = UtilIT.updateDatasetTypeAvailableLicense("testDatasetType", availableLicenseArray, apiToken);
+        addCC0.prettyPrint();
+        addCC0.then().assertThat().
+                statusCode(OK.getStatusCode())
+                .body("data.availableLicenses.after[0]", CoreMatchers.is("CC0 1.0"));
+        
+        
+                        String badAvailableLicenseArray = """
+            ["CC0 xx.0"]
+""";
+
+        addCC0 = UtilIT.updateDatasetTypeAvailableLicense("testDatasetType", badAvailableLicenseArray, apiToken);
+        addCC0.prettyPrint();
+        addCC0.then().assertThat().
+                statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", containsString("License not found:"));
+        
+                        
+        Long doomed = JsonPath.from(typeAdded.getBody().asString()).getLong("data.id");
+
+        System.out.println("doomed: " + doomed);
+        Response getTypeById = UtilIT.getDatasetType(doomed.toString());
+        getTypeById.prettyPrint();
+        getTypeById.then().assertThat().statusCode(OK.getStatusCode());
+
+        System.out.println("deleting type with id " + doomed);
+        Response typeDeleted = UtilIT.deleteDatasetTypes(doomed, apiToken);
+        typeDeleted.prettyPrint();
+        typeDeleted.then().assertThat().statusCode(OK.getStatusCode());
+
+    }
+
+    @Test
+    public void testUpdateDatasetTypeLinksWithMetadataBlocks() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.setSuperuserStatus(username, true).then().assertThat().statusCode(OK.getStatusCode());
+
+        System.out.println("listing root collection blocks with display on create: only citation");
+        Response listBlocks = UtilIT.listMetadataBlocks(":root", true, false, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", nullValue());
+
+        System.out.println("listing root collection blocks without display on create: only citation");
+        listBlocks = UtilIT.listMetadataBlocks(":root", false, false, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", nullValue());
+
+        //Avoid all-numeric names (which are not allowed)
+        String randomName = "zzz" + UUID.randomUUID().toString().substring(0, 8);
+        String jsonIn = Json.createObjectBuilder().add("name", randomName).build().toString();
+
+        System.out.println("adding type with name " + randomName);
+        Response typeAdded = UtilIT.addDatasetType(jsonIn, apiToken);
+        typeAdded.prettyPrint();
+        typeAdded.then().assertThat().statusCode(OK.getStatusCode());
+
+        Long typeId = JsonPath.from(typeAdded.getBody().asString()).getLong("data.id");
+
+        System.out.println("id of type: " + typeId);
+        Response getTypeById = UtilIT.getDatasetType(typeId.toString());
+        getTypeById.prettyPrint();
+        getTypeById.then().assertThat().statusCode(OK.getStatusCode());
+
+        String metadataBlockToLink = """
+            ["geospatial"]
+""";
+
+        Response linkDatasetType1ToGeospatial = UtilIT.updateDatasetTypeLinksWithMetadataBlocks(randomName, metadataBlockToLink, apiToken);
+        linkDatasetType1ToGeospatial.prettyPrint();
+        linkDatasetType1ToGeospatial.then().assertThat().
+                statusCode(OK.getStatusCode())
+                .body("data.linkedMetadataBlocks.after[0]", CoreMatchers.is("geospatial"));
+
+        getTypeById = UtilIT.getDatasetType(typeId.toString());
+        getTypeById.prettyPrint();
+        getTypeById.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.linkedMetadataBlocks[0]", CoreMatchers.is("geospatial"));
+
+        System.out.println("listing root collection blocks with display on create");
+        listBlocks = UtilIT.listMetadataBlocks(":root", true, false, randomName, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", is("geospatial"))
+                .body("data[2].name", nullValue());
+
+        System.out.println("listing root collection blocks without display on create");
+        listBlocks = UtilIT.listMetadataBlocks(":root", false, false, randomName, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", is("geospatial"))
+                .body("data[2].name", nullValue());
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        System.out.println("listing " + dataverseAlias + " collection blocks with display on create using dataset type " + randomName);
+        listBlocks = UtilIT.listMetadataBlocks(dataverseAlias, true, false, randomName, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", is("geospatial"))
+                .body("data[2].name", nullValue());
+
+        System.out.println("listing " + dataverseAlias + " collection blocks without display on create using dataset type " + randomName);
+        listBlocks = UtilIT.listMetadataBlocks(dataverseAlias, false, false, randomName, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", is("geospatial"))
+                .body("data[2].name", nullValue());
+
+        System.out.println("listing " + dataverseAlias + " collection blocks and inner dataset field types, without display on create and return dataset field types set to true using dataset type " + randomName);
+        listBlocks = UtilIT.listMetadataBlocks(dataverseAlias, false, true, randomName, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", is("geospatial"))
+                .body("data[0].fields.size()", is(35))
+                .body("data[1].fields.size()", is(3));
+
+        System.out.println("listing " + dataverseAlias + " collection blocks and inner dataset field types, with display on create and return dataset field types set to true using dataset type " + randomName);
+        listBlocks = UtilIT.listMetadataBlocks(dataverseAlias, true, true, randomName, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", is("geospatial"))
+                .body("data[0].fields.size()", is(10))
+                .body("data[1].fields.size()", is(0)); // There are no fields required or with displayOnCreate=true in geospatial.tsv
+
+        // We send an empty array to mean "delete or clear all"
+        String emptyJsonArray = "[]";
+        Response removeDatasetTypeLinks = UtilIT.updateDatasetTypeLinksWithMetadataBlocks(randomName, emptyJsonArray, apiToken);
+        removeDatasetTypeLinks.prettyPrint();
+        removeDatasetTypeLinks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.linkedMetadataBlocks.after[0]", CoreMatchers.nullValue());
+
+        listBlocks = UtilIT.listMetadataBlocks(dataverseAlias, true, false, randomName, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .body("data[0].name", is("citation"));
+        
+        //Cleanup objects 
+
+        
+        Long doomed = JsonPath.from(typeAdded.getBody().asString()).getLong("data.id");
+
+        System.out.println("doomed: " + doomed);
+
+        getTypeById.prettyPrint();
+        getTypeById.then().assertThat().statusCode(OK.getStatusCode());
+
+        System.out.println("deleting type with id " + doomed);
+        Response typeDeleted = UtilIT.deleteDatasetTypes(doomed, apiToken);
+        typeDeleted.prettyPrint();
+        typeDeleted.then().assertThat().statusCode(OK.getStatusCode());
+        
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteDataverseResponse.prettyPrint();
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
+        
+        
+    }
+
+    @Test
+    public void testLinkInstrumentToAstro() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.setSuperuserStatus(username, true).then().assertThat().statusCode(OK.getStatusCode());
+
+        String metadataBlockLink = """
+            ["astrophysics"]
+//""";
+
+        String datasetType = "instrument";
+        Response linkInstrumentToAstro = UtilIT.updateDatasetTypeLinksWithMetadataBlocks(datasetType, metadataBlockLink, apiToken);
+        linkInstrumentToAstro.prettyPrint();
+        linkInstrumentToAstro.then().assertThat().
+                statusCode(OK.getStatusCode())
+                .body("data.linkedMetadataBlocks.after[0]", CoreMatchers.is("astrophysics"));
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        // displayOnCreate will only be true for fields that are set this way in the database.
+        // We set it here so we can make assertions below.
+        UtilIT.setDisplayOnCreate("astroInstrument", true);
+
+        Response listBlocks = null;
+        System.out.println("listing root collection blocks with display on create using dataset type " + datasetType);
+        listBlocks = UtilIT.listMetadataBlocks(":root", true, true, datasetType, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", is("astrophysics"))
+                .body("data[2].name", nullValue())
+                .body("data[0].fields.title.displayOnCreate", equalTo(true))
+                .body("data[1].fields.astroInstrument.displayOnCreate", equalTo(true));
+
+        System.out.println("listing root collection blocks with all fields (not display on create) using dataset type " + datasetType);
+        listBlocks = UtilIT.listMetadataBlocks(":root", false, true, datasetType, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", is("astrophysics"))
+                .body("data[2].name", nullValue())
+                .body("data[0].fields.title.displayOnCreate", equalTo(true))
+                .body("data[0].fields.subtitle.displayOnCreate", equalTo(false))
+                .body("data[1].fields.astroInstrument.displayOnCreate", equalTo(true))
+                .body("data[1].fields.astroObject.displayOnCreate", equalTo(false));
+
+        System.out.println("listing " + dataverseAlias + " collection blocks with display on create using dataset type " + datasetType);
+        listBlocks = UtilIT.listMetadataBlocks(dataverseAlias, true, true, datasetType, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", is("astrophysics"))
+                .body("data[2].name", nullValue())
+                .body("data[0].fields.title.displayOnCreate", equalTo(true))
+                // subtitle is hidden because it is not "display on create"
+                .body("data[0].fields.subtitle", nullValue())
+                .body("data[1].fields.astroInstrument.displayOnCreate", equalTo(true))
+                // astroObject is hidden because it is not "display on create"
+                .body("data[1].fields.astroObject", nullValue());
+
+        System.out.println("listing " + dataverseAlias + " collection blocks with all fields (not display on create) using dataset type " + datasetType);
+        listBlocks = UtilIT.listMetadataBlocks(dataverseAlias, false, true, datasetType, apiToken);
+        listBlocks.prettyPrint();
+        listBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].name", is("citation"))
+                .body("data[1].name", is("astrophysics"))
+                .body("data[2].name", nullValue())
+                .body("data[0].fields.title.displayOnCreate", equalTo(true))
+                .body("data[0].fields.subtitle.displayOnCreate", equalTo(false))
+                .body("data[1].fields.astroInstrument.displayOnCreate", equalTo(true))
+                .body("data[1].fields.astroObject.displayOnCreate", equalTo(false));
+
+    }
+    
+    @Test
+    public void testCreateDatasetWithCustomType() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+       
+        UtilIT.setSuperuserStatus(username, true).then().assertThat().statusCode(OK.getStatusCode());
+   
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("name", "testDatasetType");
+        job.add("linkedMetadataBlocks", Json.createArrayBuilder().add("geospatial"));
+        job.add("availableLicenses", Json.createArrayBuilder().add("CC0 1.0"));
+        
+        Response typeAdded = UtilIT.addDatasetType(job.build(), apiToken);
+        typeAdded.prettyPrint();
+
+        typeAdded.then().assertThat().statusCode(OK.getStatusCode());
+        Response getTypes = UtilIT.getDatasetTypes();   
+        getTypes = UtilIT.getDatasetTypes();
+        getTypes.prettyPrint();
+
+        String pathToJsonFile = "scripts/api/data/dataset-create-new-with-type.json";
+        
+        Response createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+        
+        createDatasetResponse.prettyPrint();
+        
+
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPid = JsonPath.from(createDatasetResponse.getBody().asString()).getString("data.persistentId");
+
+        Response getDatasetJson = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJson.prettyPrint();
+        getDatasetJson.then().assertThat().statusCode(OK.getStatusCode());
+        String datasetType = JsonPath.from(getDatasetJson.getBody().asString()).getString("data.datasetType");
+        System.out.println("datasetType: " + datasetType);
+        assertEquals("testDatasetType", datasetType);
+        String datasetVerstionState = JsonPath.from(getDatasetJson.getBody().asString()).getString("data.latestVersion.versionState");
+        assertEquals("DRAFT", datasetVerstionState);
+        String datasetLicense = JsonPath.from(getDatasetJson.getBody().asString()).getString("data.latestVersion.license");
+        //License is null because the one in the dataset json does not correspond to the 
+        // available licenses in the dataset type.
+        assertNull(datasetLicense);
+        Response deleteDatasetResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
+        deleteDatasetResponse.prettyPrint();
+        assertEquals(200, deleteDatasetResponse.getStatusCode());
+        
+        Long doomed = JsonPath.from(typeAdded.getBody().asString()).getLong("data.id");
+
+        System.out.println("doomed: " + doomed);
+        Response getTypeById = UtilIT.getDatasetType(doomed.toString());
+        getTypeById.prettyPrint();
+        getTypeById.then().assertThat().statusCode(OK.getStatusCode());
+
+        System.out.println("deleting type with id " + doomed);
+        Response typeDeleted = UtilIT.deleteDatasetTypes(doomed, apiToken);
+        typeDeleted.prettyPrint();
+        typeDeleted.then().assertThat().statusCode(OK.getStatusCode());
+        
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteDataverseResponse.prettyPrint();
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
+
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java
index 619a11bc2e0..b273502e6ed 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java
@@ -1,58 +1,78 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import static com.jayway.restassured.RestAssured.given;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.response.Response;
-import java.util.logging.Logger;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.Ignore;
-import com.jayway.restassured.path.json.JsonPath;
-
-import java.util.List;
-import java.util.Map;
-import javax.json.JsonObject;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.METHOD_NOT_ALLOWED;
-import edu.harvard.iq.dataverse.DataFile;
-import static edu.harvard.iq.dataverse.api.UtilIT.API_TOKEN_HTTP_HEADER;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import edu.harvard.iq.dataverse.authorization.groups.impl.builtin.AuthenticatedUsers;
 import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.dataaccess.AbstractRemoteOverlayAccessIO;
+import edu.harvard.iq.dataverse.dataaccess.GlobusOverlayAccessIOTest;
+import edu.harvard.iq.dataverse.datavariable.VarGroup;
+import edu.harvard.iq.dataverse.datavariable.VariableMetadata;
+import edu.harvard.iq.dataverse.datavariable.VariableMetadataDDIParser;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import java.util.UUID;
-import static javax.ws.rs.core.Response.Status.NO_CONTENT;
-import org.apache.commons.lang.StringUtils;
-import com.jayway.restassured.parsing.Parser;
-import static com.jayway.restassured.path.json.JsonPath.with;
-import com.jayway.restassured.path.xml.XmlPath;
-import static edu.harvard.iq.dataverse.api.UtilIT.equalToCI;
-import edu.harvard.iq.dataverse.authorization.groups.impl.builtin.AuthenticatedUsers;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.json.*;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.parsing.Parser;
+import io.restassured.path.json.JsonPath;
+import io.restassured.path.xml.XmlPath;
+import io.restassured.response.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.ws.rs.core.Response.Status;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObjectBuilder;
-import static junit.framework.Assert.assertEquals;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.nullValue;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.logging.Logger;
+
+import static edu.harvard.iq.dataverse.DatasetVersion.DEACCESSION_LINK_MAX_LENGTH;
+import static edu.harvard.iq.dataverse.api.ApiConstants.*;
+import static edu.harvard.iq.dataverse.api.UtilIT.API_TOKEN_HTTP_HEADER;
+import static edu.harvard.iq.dataverse.api.UtilIT.equalToCI;
+import static io.restassured.RestAssured.given;
+import static io.restassured.path.json.JsonPath.with;
+import static jakarta.ws.rs.core.Response.Status.*;
+import static java.lang.Thread.sleep;
+import java.time.Year;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.Matchers.contains;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DatasetsIT {
 
     private static final Logger logger = Logger.getLogger(DatasetsIT.class.getCanonicalName());
-
-    @BeforeClass
+    
+    @BeforeAll
     public static void setUpClass() {
+        
+        
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
 
         Response removeIdentifierGenerationStyle = UtilIT.deleteSetting(SettingsServiceBean.Key.IdentifierGenerationStyle);
@@ -62,6 +82,13 @@ public static void setUpClass() {
         Response removeExcludeEmail = UtilIT.deleteSetting(SettingsServiceBean.Key.ExcludeEmailFromExport);
         removeExcludeEmail.then().assertThat()
                 .statusCode(200);
+
+        Response removeAnonymizedFieldTypeNames = UtilIT.deleteSetting(SettingsServiceBean.Key.AnonymizedFieldTypeNames);
+        removeAnonymizedFieldTypeNames.then().assertThat()
+                .statusCode(200);
+
+        UtilIT.deleteSetting(SettingsServiceBean.Key.MaxEmbargoDurationInMonths);
+
         /* With Dual mode, we can no longer mess with upload methods since native is now required for anything to work
                
         Response removeDcmUrl = UtilIT.deleteSetting(SettingsServiceBean.Key.DataCaptureModuleUrl);
@@ -74,7 +101,8 @@ public static void setUpClass() {
          */
     }
 
-    @AfterClass
+
+    @AfterAll
     public static void afterClass() {
 
         Response removeIdentifierGenerationStyle = UtilIT.deleteSetting(SettingsServiceBean.Key.IdentifierGenerationStyle);
@@ -84,6 +112,13 @@ public static void afterClass() {
         Response removeExcludeEmail = UtilIT.deleteSetting(SettingsServiceBean.Key.ExcludeEmailFromExport);
         removeExcludeEmail.then().assertThat()
                 .statusCode(200);
+
+        Response removeAnonymizedFieldTypeNames = UtilIT.deleteSetting(SettingsServiceBean.Key.AnonymizedFieldTypeNames);
+        removeAnonymizedFieldTypeNames.then().assertThat()
+                .statusCode(200);
+
+        UtilIT.deleteSetting(SettingsServiceBean.Key.MaxEmbargoDurationInMonths);
+
         /* See above
         Response removeDcmUrl = UtilIT.deleteSetting(SettingsServiceBean.Key.DataCaptureModuleUrl);
         removeDcmUrl.then().assertThat()
@@ -94,6 +129,143 @@ public static void afterClass() {
                 .statusCode(200);
          */
     }
+    
+    @Test
+    public void testCollectionSchema(){
+        
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        
+        Response getCollectionSchemaResponse =  UtilIT.getCollectionSchema(dataverseAlias, apiToken);
+        getCollectionSchemaResponse.prettyPrint();
+        getCollectionSchemaResponse.then().assertThat()
+                .statusCode(200);
+
+        JsonObject expectedSchema = null;
+        try {
+            expectedSchema = JsonUtil.getJsonObjectFromFile("doc/sphinx-guides/source/_static/api/dataset-schema.json");
+        } catch (IOException ex) {
+        }
+
+        assertEquals(JsonUtil.prettyPrint(expectedSchema), JsonUtil.prettyPrint(getCollectionSchemaResponse.body().asString()));
+        
+        String expectedJson = UtilIT.getDatasetJson("scripts/search/tests/data/dataset-finch1.json");
+        
+        Response validateDatasetJsonResponse = UtilIT.validateDatasetJson(dataverseAlias, expectedJson, apiToken);
+        validateDatasetJsonResponse.prettyPrint();
+        validateDatasetJsonResponse.then().assertThat()
+                .statusCode(200);
+        
+        
+        String pathToJsonFile = "scripts/search/tests/data/datasetMissingReqFields.json"; 
+        
+        String jsonIn = UtilIT.getDatasetJson(pathToJsonFile);
+        
+        Response validateBadDatasetJsonResponse = UtilIT.validateDatasetJson(dataverseAlias, jsonIn, apiToken);
+        validateBadDatasetJsonResponse.prettyPrint();
+        validateBadDatasetJsonResponse.then().assertThat()
+                .statusCode(200);
+
+        
+        validateBadDatasetJsonResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body(containsString("failed validation"));
+        
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteDataverseResponse.prettyPrint();
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+        
+    }
+
+    @Test
+    public void testDatasetSchemaValidation() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response getCollectionSchemaResponse =  UtilIT.getCollectionSchema(dataverseAlias, apiToken);
+        getCollectionSchemaResponse.prettyPrint();
+        getCollectionSchemaResponse.then().assertThat()
+                .statusCode(200);
+
+        JsonObject expectedSchema = null;
+        try {
+            expectedSchema = JsonUtil.getJsonObjectFromFile("doc/sphinx-guides/source/_static/api/dataset-schema.json");
+        } catch (IOException ex) {
+        }
+
+        assertEquals(JsonUtil.prettyPrint(expectedSchema), JsonUtil.prettyPrint(getCollectionSchemaResponse.body().asString()));
+
+        // add a language that is not in the Controlled vocabulary
+        testDatasetSchemaValidationHelper(dataverseAlias, apiToken,
+                "\"aar\"",
+                "\"aar\",\"badlang\"",
+                BundleUtil.getStringFromBundle("schema.validation.exception.dataset.cvv.missing", List.of("fields", "language", "badlang"))
+        );
+
+        // change multiple to true on value that is a not a List
+        testDatasetSchemaValidationHelper(dataverseAlias, apiToken,
+                "multiple\": false,\n" +
+                        "            \"typeName\": \"title",
+                "multiple\": true,\n" +
+                        "            \"typeName\": \"title",
+                BundleUtil.getStringFromBundle("schema.validation.exception.notlist.multiple", List.of("fields", "title"))
+        );
+
+        // change multiple to false on value that is a List
+        testDatasetSchemaValidationHelper(dataverseAlias, apiToken,
+                "typeName\": \"language\",\n" +
+                        "            \"multiple\": true",
+                "typeName\": \"language\",\n" +
+                        "            \"multiple\": false",
+                BundleUtil.getStringFromBundle("schema.validation.exception.list.notmultiple", List.of("fields", "language"))
+        );
+
+        // add a mismatched typeName
+        testDatasetSchemaValidationHelper(dataverseAlias, apiToken,
+                "\"typeName\": \"datasetContactName\",",
+                "\"typeName\": \"datasetContactNme\",",
+                BundleUtil.getStringFromBundle("schema.validation.exception.compound.mismatch", List.of("datasetContactName", "datasetContactNme"))
+        );
+
+        // add a typeName which is not allowed
+        testDatasetSchemaValidationHelper(dataverseAlias, apiToken,
+                "\"datasetContactEmail\": {\n" +
+                        "                  \"typeClass\": \"primitive\",\n" +
+                        "                  \"multiple\": false,\n" +
+                        "                  \"typeName\": \"datasetContactEmail\",",
+                "\"datasetContactNotAllowed\": {\n" +
+                        "                  \"typeClass\": \"primitive\",\n" +
+                        "                  \"multiple\": false,\n" +
+                        "                  \"typeName\": \"datasetContactNotAllowed\",",
+                BundleUtil.getStringFromBundle("schema.validation.exception.dataset.invalidType", List.of("datasetContact", "datasetContactNotAllowed", "datasetContactName, datasetContactAffiliation, datasetContactEmail"))
+        );
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteDataverseResponse.prettyPrint();
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+    }
+    private void testDatasetSchemaValidationHelper(String dataverseAlias, String apiToken, String origString, String replacementString, String expectedError) {
+        String json = UtilIT.getDatasetJson("scripts/search/tests/data/dataset-finch3.json");
+        json = json.replace(origString, replacementString);
+        Response validateDatasetJsonResponse = UtilIT.validateDatasetJson(dataverseAlias, json, apiToken);
+        validateDatasetJsonResponse.prettyPrint();
+        validateDatasetJsonResponse.then().assertThat()
+                .statusCode(200)
+                .body(containsString(expectedError));
+    }
 
     @Test
     public void testCreateDataset() {
@@ -112,6 +284,7 @@ public void testCreateDataset() {
         Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
 
         Response datasetAsJson = UtilIT.nativeGet(datasetId, apiToken);
+        datasetAsJson.prettyPrint();
         datasetAsJson.then().assertThat()
                 .statusCode(OK.getStatusCode());
        
@@ -128,7 +301,13 @@ public void testCreateDataset() {
         Response grantRole = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR, AuthenticatedUsers.get().getIdentifier(), apiToken);
         grantRole.prettyPrint();
         assertEquals(OK.getStatusCode(), grantRole.getStatusCode());
-        
+        // Test duplicate grant
+        grantRole = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR, AuthenticatedUsers.get().getIdentifier(), apiToken);
+        grantRole.prettyPrint();
+        grantRole.then().assertThat()
+                .body("message", containsString(BundleUtil.getStringFromBundle("datasets.api.grant.role.assignee.has.role.error")))
+                .statusCode(FORBIDDEN.getStatusCode());
+
         // Create another random user: 
         
         Response createRandomUser = UtilIT.createRandomUser();
@@ -184,7 +363,122 @@ public void testCreateDataset() {
         assertEquals(200, deleteUserResponse.getStatusCode());
 
     }
-    
+
+    @Test
+    public void testCreateUpdateDatasetFileCountLimit() throws JsonParseException {
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String adminApiToken = getSuperuserToken();
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        JsonObject data = JsonUtil.getJsonObject(createDataverseResponse.getBody().asString());
+        JsonParser parser = new JsonParser();
+        Dataverse dv = parser.parseDataverse(data.getJsonObject("data"));
+        dv.setDatasetFileCountLimit(500);
+        Response updateDataverseResponse = UtilIT.updateDataverse(dataverseAlias, dv, adminApiToken);
+        updateDataverseResponse.prettyPrint();
+
+        JsonArrayBuilder metadataBlocks = Json.createArrayBuilder();
+        metadataBlocks.add("citation");
+        metadataBlocks.add("journal");
+        metadataBlocks.add("socialscience");
+        Response setMetadataBlocksResponse = UtilIT.setMetadataBlocks(dataverseAlias, metadataBlocks, apiToken);
+        setMetadataBlocksResponse.prettyPrint();
+        setMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        Integer datasetId1 = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        // Dataset defaults to owner dataverse's datasetFileCountLimit
+        Response datasetAsJson = UtilIT.nativeGet(datasetId1, apiToken);
+        datasetAsJson.prettyPrint();
+        datasetAsJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(500))
+                .body("data.datasetFileCountLimit", equalTo(null));
+
+        // create dataset with datasetFileCountLimit = 100
+        String pathToJsonFile = "scripts/search/tests/data/dataset-finch1-fileLimit.json";
+        createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId2 = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        datasetAsJson = UtilIT.nativeGet(datasetId2, apiToken);
+        datasetAsJson.prettyPrint();
+        datasetAsJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(100))
+                .body("data.datasetFileCountLimit", equalTo(100));
+        String persistentId = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.latestVersion.datasetPersistentId");
+
+        // Update dataset with datasetFileCountLimit = 1
+        Response updateDatasetResponse = UtilIT.updateDatasetFilesLimits(persistentId, 1, adminApiToken);
+        updateDatasetResponse.prettyPrint();
+        updateDatasetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        datasetAsJson = UtilIT.nativeGet(datasetId2, apiToken);
+        datasetAsJson.prettyPrint();
+        datasetAsJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(1))
+                .body("data.datasetFileCountLimit", equalTo(1));
+
+        // Update/reset dataset with datasetFileCountLimit = -1 and expect the value from the owner dataverse
+        updateDatasetResponse = UtilIT.deleteDatasetFilesLimits(persistentId, adminApiToken);
+        updateDatasetResponse.prettyPrint();
+        updateDatasetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        datasetAsJson = UtilIT.nativeGet(datasetId2, apiToken);
+        datasetAsJson.prettyPrint();
+        datasetAsJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(500))
+                .body("data.datasetFileCountLimit", equalTo(null));
+
+        // test clear limits and test that datasetFileCountLimit is not returned in json
+        dv.setDatasetFileCountLimit(null);
+        updateDataverseResponse = UtilIT.updateDataverse(dataverseAlias, dv, adminApiToken);
+        updateDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        datasetAsJson = UtilIT.nativeGet(datasetId2, apiToken);
+        datasetAsJson.prettyPrint();
+        datasetAsJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(null))
+                .body("data.datasetFileCountLimit", equalTo(null));
+    }
+
+    @Test
+    public void testMultipleFileUploadOverCountLimit() throws JsonParseException {
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String adminApiToken = getSuperuserToken();
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        JsonObject data = JsonUtil.getJsonObject(createDataverseResponse.getBody().asString());
+        JsonParser parser = new JsonParser();
+        Dataverse dv = parser.parseDataverse(data.getJsonObject("data"));
+        dv.setDatasetFileCountLimit(1);
+        Response updateDataverseResponse = UtilIT.updateDataverse(dataverseAlias, dv, adminApiToken);
+        updateDataverseResponse.prettyPrint();
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        String json = "[{\"id\":0},{\"id\":1},{\"id\":2}]"; // simple array since we only need an array size
+        Response addFilesResponse = UtilIT.addFiles(datasetId.toString(), json, apiToken);
+        addFilesResponse.prettyPrint();
+        addFilesResponse.then().assertThat()
+                .body("message", containsString(BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", Collections.singletonList("1"))))
+                .statusCode(BAD_REQUEST.getStatusCode());
+    }
+
     @Test
     public void testAddUpdateDatasetViaNativeAPI() {
 
@@ -192,11 +486,19 @@ public void testAddUpdateDatasetViaNativeAPI() {
         createUser.prettyPrint();
         String username = UtilIT.getUsernameFromResponse(createUser);
         String apiToken = UtilIT.getApiTokenFromResponse(createUser);
-        
+
         Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
         createDataverseResponse.prettyPrint();
         String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
 
+        JsonArrayBuilder metadataBlocks = Json.createArrayBuilder();
+        metadataBlocks.add("citation");
+        metadataBlocks.add("journal");
+        metadataBlocks.add("socialscience");
+        Response setMetadataBlocksResponse = UtilIT.setMetadataBlocks(dataverseAlias, metadataBlocks, apiToken);
+        setMetadataBlocksResponse.prettyPrint();
+        setMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+
         Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
         createDatasetResponse.prettyPrint();
         Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
@@ -204,58 +506,67 @@ public void testAddUpdateDatasetViaNativeAPI() {
         Response datasetAsJson = UtilIT.nativeGet(datasetId, apiToken);
         datasetAsJson.then().assertThat()
                 .statusCode(OK.getStatusCode());
-       
+
         String identifier = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
-        
+
         //Test Add Data
-        
-        
+
         Response getDatasetJsonBeforePublishing = UtilIT.nativeGet(datasetId, apiToken);
         getDatasetJsonBeforePublishing.prettyPrint();
         String protocol = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.protocol");
         String authority = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.authority");
-        
+
         String datasetPersistentId = protocol + ":" + authority + "/" + identifier;
         String pathToJsonFile = "doc/sphinx-guides/source/_static/api/dataset-add-metadata.json";
         Response addSubjectViaNative = UtilIT.addDatasetMetadataViaNative(datasetPersistentId, pathToJsonFile, apiToken);
         addSubjectViaNative.prettyPrint();
         addSubjectViaNative.then().assertThat()
                 .statusCode(OK.getStatusCode());
-        
 
-        
         RestAssured.registerParser("text/plain", Parser.JSON);
         Response exportDatasetAsJson = UtilIT.exportDataset(datasetPersistentId, "dataverse_json", apiToken);
         exportDatasetAsJson.prettyPrint();
-        
+
         pathToJsonFile = "doc/sphinx-guides/source/_static/api/dataset-add-subject-metadata.json";
         addSubjectViaNative = UtilIT.addDatasetMetadataViaNative(datasetPersistentId, pathToJsonFile, apiToken);
         addSubjectViaNative.prettyPrint();
         addSubjectViaNative.then().assertThat()
-                .statusCode(OK.getStatusCode());
-        
+                .statusCode(OK.getStatusCode()).body(containsString("Mathematical Sciences"));
 
         String pathToJsonFileSingle = "doc/sphinx-guides/source/_static/api/dataset-simple-update-metadata.json";
         Response addSubjectSingleViaNative = UtilIT.updateFieldLevelDatasetMetadataViaNative(datasetPersistentId, pathToJsonFileSingle, apiToken);
-        addSubjectSingleViaNative.prettyPrint();
+        String responseString = addSubjectSingleViaNative.prettyPrint();
         addSubjectSingleViaNative.then().assertThat()
+                .statusCode(OK.getStatusCode()).body(containsString("Mathematical Sciences")).body(containsString("Social Sciences"));
+
+        String pathToJsonFileSingleCvoc = "doc/sphinx-guides/source/_static/api/dataset-add-single-cvoc-field-metadata.json";
+        Response addSingleCvocViaNative = UtilIT.updateFieldLevelDatasetMetadataViaNative(datasetPersistentId, pathToJsonFileSingleCvoc, apiToken);
+        addSingleCvocViaNative.prettyPrint();
+        addSingleCvocViaNative.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
+        String pathToJsonFileSingleCompound = "doc/sphinx-guides/source/_static/api/dataset-add-single-compound-field-metadata.json";
+        Response addSingleCompoundViaNative = UtilIT.updateFieldLevelDatasetMetadataViaNative(datasetPersistentId, pathToJsonFileSingleCompound, apiToken);
+        addSingleCompoundViaNative.prettyPrint();
+        addSingleCompoundViaNative.then().assertThat()
+                .statusCode(OK.getStatusCode());
 
         //Trying to blank out required field should fail...
         String pathToJsonFileBadData = "doc/sphinx-guides/source/_static/api/dataset-update-with-blank-metadata.json";
         Response deleteTitleViaNative = UtilIT.updateFieldLevelDatasetMetadataViaNative(datasetPersistentId, pathToJsonFileBadData, apiToken);
         deleteTitleViaNative.prettyPrint();
-        deleteTitleViaNative.then().assertThat().body("message", equalTo("Error parsing dataset update: Empty value for field: Title "));
+        String emptyRequiredFieldError = BundleUtil.getStringFromBundle("datasetFieldValidator.error.emptyRequiredSingleValueForField", List.of("Title"));
+        deleteTitleViaNative.then().assertThat().body("message", equalTo(BundleUtil.getStringFromBundle("updateDatasetFieldsCommand.api.processDatasetUpdate.parseError", List.of(emptyRequiredFieldError))));
 
 
         Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
-        
+
         Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken);
         assertEquals(200, publishDataset.getStatusCode());
+        UtilIT.sleepForLock(datasetPersistentId, "finalizePublication", apiToken, UtilIT.MAXIMUM_PUBLISH_LOCK_DURATION);
         //post publish update
         String pathToJsonFilePostPub= "doc/sphinx-guides/source/_static/api/dataset-add-metadata-after-pub.json";
-       Response addDataToPublishedVersion = UtilIT.addDatasetMetadataViaNative(datasetPersistentId, pathToJsonFilePostPub, apiToken);
+        Response addDataToPublishedVersion = UtilIT.addDatasetMetadataViaNative(datasetPersistentId, pathToJsonFilePostPub, apiToken);
         addDataToPublishedVersion.prettyPrint();
         addDataToPublishedVersion.then().assertThat().statusCode(OK.getStatusCode());
 
@@ -265,34 +576,34 @@ public void testAddUpdateDatasetViaNativeAPI() {
         String pathToJsonFileBadDataSubtitle = "doc/sphinx-guides/source/_static/api/dataset-edit-metadata-subtitle.json";
         Response addDataToBadData = UtilIT.updateFieldLevelDatasetMetadataViaNative(datasetPersistentId, pathToJsonFileBadDataSubtitle, apiToken);
         addDataToBadData.prettyPrint();
-        
+
         addDataToBadData.then().assertThat()
                 .body("message", equalToCI("Error parsing dataset update: Invalid value submitted for Subtitle. It should be a single value."))
                 .statusCode(400);
-        
-                addSubjectViaNative = UtilIT.addDatasetMetadataViaNative(datasetPersistentId, pathToJsonFile, apiToken);
+
+        addSubjectViaNative = UtilIT.addDatasetMetadataViaNative(datasetPersistentId, pathToJsonFile, apiToken);
         addSubjectViaNative.prettyPrint();
         addSubjectViaNative.then().assertThat()
                 .statusCode(OK.getStatusCode());
-        
-               String pathToJsonDeleteFile = "doc/sphinx-guides/source/_static/api/dataset-delete-subject-metadata.json";
+
+        String pathToJsonDeleteFile = "doc/sphinx-guides/source/_static/api/dataset-delete-subject-metadata.json";
         addSubjectViaNative = UtilIT.deleteDatasetMetadataViaNative(datasetPersistentId, pathToJsonDeleteFile, apiToken);
         addSubjectViaNative.prettyPrint();
         addSubjectViaNative.then().assertThat()
                 .statusCode(OK.getStatusCode());
-        
+
         pathToJsonDeleteFile = "doc/sphinx-guides/source/_static/api/dataset-delete-author-metadata.json";
         addSubjectViaNative = UtilIT.deleteDatasetMetadataViaNative(datasetPersistentId, pathToJsonDeleteFile, apiToken);
         addSubjectViaNative.prettyPrint();
         addSubjectViaNative.then().assertThat()
                 .statusCode(OK.getStatusCode());
-        
+
         pathToJsonDeleteFile = "doc/sphinx-guides/source/_static/api/dataset-delete-author-no-match.json";
         addSubjectViaNative = UtilIT.deleteDatasetMetadataViaNative(datasetPersistentId, pathToJsonDeleteFile, apiToken);
         addSubjectViaNative.prettyPrint();
         addSubjectViaNative.then().assertThat().body("message", equalTo("Delete metadata failed: Author: Spruce, Sabrina not found."))
                 .statusCode(400);
-        
+
         publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken);
         assertEquals(200, publishDataset.getStatusCode());
         //6078
@@ -300,9 +611,233 @@ public void testAddUpdateDatasetViaNativeAPI() {
         Response editPublishedVersion = UtilIT.updateFieldLevelDatasetMetadataViaNative(datasetPersistentId, pathToJsonFileEditPostPub, apiToken);
         editPublishedVersion.prettyPrint();
         editPublishedVersion.then().assertThat().statusCode(OK.getStatusCode());
-        
+
         publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken);
         //"Delete metadata failed: " + updateField.getDatasetFieldType().getDisplayName() + ": " + displayValue + " not found."
+
+        // Test controlled vocabulary optional field removal
+
+        // Step 1 - Set controlled vocabulary field
+
+        String jsonString = """
+        {
+          "fields": [
+            {
+              "typeName": "author",
+              "value": [
+                {
+                  "authorName": {
+                    "typeName": "authorName",
+                    "value": "Belicheck, Bill"
+                  },
+                  "authorAffiliation": {
+                    "typeName": "authorIdentifierScheme",
+                    "value": "ORCID"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+        """;
+
+        Response updateMetadataAddAuthorWithOptionalCvv = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
+        updateMetadataAddAuthorWithOptionalCvv.then().assertThat()
+                .body("data.metadataBlocks.citation.fields[2].value[0].authorIdentifierScheme.value", equalTo("ORCID"))
+                .statusCode(OK.getStatusCode());
+
+        // Step 2 - Remove controlled vocabulary field
+
+        jsonString = """
+        {
+          "fields": [
+            {
+              "typeName": "author",
+              "value": [
+                {
+                  "authorName": {
+                    "typeName": "authorName",
+                    "value": "Belicheck, Bill"
+                  },
+                  "authorAffiliation": {
+                    "typeName": "authorIdentifierScheme",
+                    "value": ""
+                  }
+                }
+              ]
+            }
+          ]
+        }
+        """;
+
+        Response updateMetadataRemoveOptionalCvv = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
+        updateMetadataRemoveOptionalCvv.then().assertThat()
+                .body("data.metadataBlocks.citation.fields[2].value[0].authorIdentifierScheme", equalTo(null))
+                .statusCode(OK.getStatusCode());
+
+        // Test optional compound field entire removal
+
+        // Step 1 - Set optional compound field
+
+        jsonString = """
+        {
+          "fields": [
+            {
+              "typeName": "distributor",
+              "multiple": true,
+              "typeClass": "compound",
+              "value": [
+                {
+                  "distributorName": {
+                    "typeName": "distributorName",
+                    "multiple": false,
+                    "typeClass": "primitive",
+                    "value": "LastDistributor1, FirstDistributor1"
+                  },
+                  "distributorAffiliation": {
+                    "typeName": "distributorAffiliation",
+                    "multiple": false,
+                    "typeClass": "primitive",
+                    "value": "DistributorAffiliation1"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+        """;
+
+        Response updateMetadataAddDistributor = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
+        updateMetadataAddDistributor.then().assertThat()
+                .body("data.metadataBlocks.citation.fields[7].typeName", equalTo("distributor"))
+                .body("data.metadataBlocks.citation.fields[7].value[0].distributorAffiliation.value", equalTo("DistributorAffiliation1"))
+                .statusCode(OK.getStatusCode());
+
+        // Step 2 - Remove optional compound field
+
+        jsonString = """
+        {
+          "fields": [
+            {
+              "typeName": "distributor",
+              "multiple": true,
+              "typeClass": "compound",
+              "value": [
+                {
+                  "distributorName": {
+                    "typeName": "distributorName",
+                    "multiple": false,
+                    "typeClass": "primitive",
+                    "value": ""
+                  },
+                  "distributorAffiliation": {
+                    "typeName": "distributorAffiliation",
+                    "multiple": false,
+                    "typeClass": "primitive",
+                    "value": ""
+                  }
+                }
+              ]
+            }
+          ]
+        }
+        """;
+
+        Response updateMetadataRemoveDistributor = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
+        updateMetadataRemoveDistributor.then().assertThat()
+                .body("data.metadataBlocks.citation.fields[7].typeName", not(equalTo("distributor")))
+                .statusCode(OK.getStatusCode());
+
+        // Test multiple field removal
+
+        // Step 1 - Set optional multiple field
+
+        jsonString = """
+        {
+          "fields": [
+            {
+              "typeName": "alternativeTitle",
+              "multiple": true,
+              "typeClass": "primitive",
+              "value": ["Alternative1","Alternative2"]
+            }
+          ]
+        }
+        """;
+
+        Response updateMetadataAddAlternativeTitles = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
+        updateMetadataAddAlternativeTitles.then().assertThat()
+                .body("data.metadataBlocks.citation.fields[2].typeName", equalTo("alternativeTitle"))
+                .statusCode(OK.getStatusCode());
+
+        // Step 2 - Remove optional multiple field
+
+        jsonString = """
+        {
+          "fields": [
+            {
+              "typeName": "alternativeTitle",
+              "multiple": true,
+              "typeClass": "primitive",
+              "value": []
+            }
+          ]
+        }
+        """;
+
+        Response updateMetadataRemoveAlternativeTitles = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken);
+        updateMetadataRemoveAlternativeTitles.prettyPrint();
+        updateMetadataRemoveAlternativeTitles.then().assertThat()
+                .body("data.metadataBlocks.citation.fields[2].typeName", not(equalTo("alternativeTitle")))
+                .statusCode(OK.getStatusCode());
+
+        // Test sourceLastUpdateTime optional query parameter
+        String sourceLastUpdateTime =  updateMetadataRemoveAlternativeTitles.then().extract().path("data.lastUpdateTime");
+        assertNotNull(sourceLastUpdateTime);
+        String oldTimestamp = "2025-04-25T13:58:28Z";
+
+        // Case 1 - Pass outdated internal version number
+
+        Response updateMetadataWithOutdatedInternalVersionNumber = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken, oldTimestamp);
+        updateMetadataWithOutdatedInternalVersionNumber.then().assertThat()
+                .body("message", equalTo(BundleUtil.getStringFromBundle("abstractApiBean.error.internalVersionTimestampIsOutdated", Collections.singletonList(oldTimestamp))))
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // Case 2 - Pass latest internal version number
+
+        Response updateMetadataWithLatestInternalVersionNumber = UtilIT.editVersionMetadataFromJsonStr(datasetPersistentId, jsonString, apiToken, sourceLastUpdateTime);
+        updateMetadataWithLatestInternalVersionNumber.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+    
+    @Test
+    public void testAddEmptyDatasetViaNativeAPI() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);        
+        
+        String pathToJsonFile = "scripts/search/tests/data/emptyDataset.json";
+        Response createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+        createDatasetResponse.prettyPrint();
+
+        createDatasetResponse.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", startsWith("Validation Failed: "));  
+        
+        pathToJsonFile = "scripts/search/tests/data/datasetMissingReqFields.json";        
+        createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+        createDatasetResponse.prettyPrint();
+        
+        createDatasetResponse.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", startsWith("Validation Failed: "));
+ 
     }
 
     /**
@@ -406,6 +941,13 @@ public void testCreatePublishDestroyDataset() {
         assertTrue(datasetContactFromExport.toString().contains("finch@mailinator.com"));
         assertTrue(firstValue.toString().contains("finch@mailinator.com"));
 
+        Response getDatasetVersion = UtilIT.getDatasetVersion(datasetPersistentId, DS_VERSION_LATEST_PUBLISHED, apiToken);
+        getDatasetVersion.prettyPrint();
+        getDatasetVersion.then().assertThat()
+                .body("data.datasetId", equalTo(datasetId))
+                .body("data.datasetPersistentId", equalTo(datasetPersistentId))
+                .statusCode(OK.getStatusCode());
+
         Response citationBlock = UtilIT.getMetadataBlockFromDatasetVersion(datasetPersistentId, null, null, apiToken);
         citationBlock.prettyPrint();
         citationBlock.then().assertThat()
@@ -421,8 +963,7 @@ public void testCreatePublishDestroyDataset() {
         Response exportDatasetAsDublinCore = UtilIT.exportDataset(datasetPersistentId, "oai_dc", apiToken);
         exportDatasetAsDublinCore.prettyPrint();
         exportDatasetAsDublinCore.then().assertThat()
-                // FIXME: Get this working. See https://github.com/rest-assured/rest-assured/wiki/Usage#example-3---complex-parsing-and-validation
-                //                .body("oai_dc:dc.find { it == 'dc:title' }.item", hasItems("Darwin's Finches"))
+                .body("oai_dc.title", is("Darwin's Finches"))
                 .statusCode(OK.getStatusCode());
 
         Response exportDatasetAsDdi = UtilIT.exportDataset(datasetPersistentId, "ddi", apiToken);
@@ -437,16 +978,82 @@ public void testCreatePublishDestroyDataset() {
          */
         boolean nameRequiredForContactToAppear = true;
         if (nameRequiredForContactToAppear) {
-            assertEquals("Finch, Fiona", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact"));
+            assertEquals("Finch, Fiona", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.citation.distStmt.contact"));
         } else {
-            assertEquals("finch@mailinator.com", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact.@email"));
+            assertEquals("finch@mailinator.com", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.citation.distStmt.contact.@email"));
         }
         assertEquals(datasetPersistentId, XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.docDscr.citation.titlStmt.IDNo"));
 
+        // Test includeDeaccessioned option
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // includeDeaccessioned false
+        getDatasetVersion = UtilIT.getDatasetVersion(datasetPersistentId, DS_VERSION_LATEST_PUBLISHED, apiToken, false, false);
+        getDatasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // includeDeaccessioned true
+        getDatasetVersion = UtilIT.getDatasetVersion(datasetPersistentId, DS_VERSION_LATEST_PUBLISHED, apiToken, false, true);
+        getDatasetVersion.then().assertThat().statusCode(OK.getStatusCode());
+
         Response deleteDatasetResponse = UtilIT.destroyDataset(datasetId, apiToken);
         deleteDatasetResponse.prettyPrint();
         assertEquals(200, deleteDatasetResponse.getStatusCode());
 
+        // Start of test of deleting a file from a deaccessioned version.
+
+        // Create Dataset for deaccession test.
+        Response deaccessionTestDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        deaccessionTestDataset.prettyPrint();
+        deaccessionTestDataset.then().assertThat().statusCode(CREATED.getStatusCode());
+        Integer deaccessionTestDatasetId = UtilIT.getDatasetIdFromResponse(deaccessionTestDataset);
+        
+        // File upload for deaccession test.
+        String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";   
+        Response uploadResponse = UtilIT.uploadFileViaNative(deaccessionTestDatasetId.toString(), pathToFile, apiToken);
+        uploadResponse.prettyPrint();
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+        Integer deaccessionTestFileId = JsonPath.from(uploadResponse.body().asString()).getInt("data.files[0].dataFile.id");
+
+        // Publish Dataset for deaccession test.
+        Response deaccessionTestPublishResponse = UtilIT.publishDatasetViaNativeApi(deaccessionTestDatasetId, "major", apiToken);
+        deaccessionTestPublishResponse.prettyPrint();
+
+        // Deaccession Dataset for deaccession test.
+        Response deaccessionTestDatasetResponse = UtilIT.deaccessionDataset(deaccessionTestDatasetId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionTestDatasetResponse.prettyPrint();
+        deaccessionTestDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Version check for deaccession test - Deaccessioned.
+        Response deaccessionTestVersions = UtilIT.getDatasetVersions(deaccessionTestDatasetId.toString(), apiToken);
+        deaccessionTestVersions.prettyPrint();
+        deaccessionTestVersions.then().assertThat()
+                .body("data[0].latestVersionPublishingState", equalTo("DEACCESSIONED"))
+                .statusCode(OK.getStatusCode());
+
+        // File deletion / Draft creation due diligence check for deaccession test.
+        Response deaccessionTestDeleteFile =  UtilIT.deleteFileInDataset(deaccessionTestFileId, apiToken);
+        deaccessionTestDeleteFile.prettyPrint();
+        deaccessionTestDeleteFile
+                .then().assertThat()
+                .statusCode(OK.getStatusCode());
+                
+        // Version check for deaccession test - Draft.
+        deaccessionTestVersions = UtilIT.getDatasetVersions(deaccessionTestDatasetId.toString(), apiToken);
+        deaccessionTestVersions.prettyPrint();
+        deaccessionTestVersions.then().assertThat()
+                .body("data[0].latestVersionPublishingState", equalTo("DRAFT"))
+                .statusCode(OK.getStatusCode());
+
+        // Deleting Dataset for deaccession test.
+        Response deaccessionTestDelete = UtilIT.destroyDataset(deaccessionTestDatasetId, apiToken);
+        deaccessionTestDelete.prettyPrint();
+        deaccessionTestDelete.then()
+                .assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        //  End of deaccession test.
+
         Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
         deleteDataverseResponse.prettyPrint();
         assertEquals(200, deleteDataverseResponse.getStatusCode());
@@ -457,19 +1064,468 @@ public void testCreatePublishDestroyDataset() {
 
     }
 
-    /**
-     * This test requires the root dataverse to be published to pass.
-     */
     @Test
-    @Ignore
-    public void testExport() {
+    public void testHideMetadataBlocksInDatasetVersionsAPI() {
 
-        Response createUser = UtilIT.createRandomUser();
-        createUser.prettyPrint();
-        assertEquals(200, createUser.getStatusCode());
-        String username = UtilIT.getUsernameFromResponse(createUser);
-        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
-        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        // Create user
+        String apiToken = UtilIT.createRandomUserGetToken();
+
+        // Create user with no permission
+        String apiTokenNoPerms = UtilIT.createRandomUserGetToken();
+
+        // Create Collection
+        String collectionAlias = UtilIT.createRandomCollectionGetAlias(apiToken);
+
+        // Create Dataset
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(collectionAlias, apiToken);
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        // Now check that the metadata is NOT shown, when we ask the versions api to dos o.
+        boolean excludeMetadata = true;
+        Response unpublishedDraft = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiToken, true,excludeMetadata, false);
+        unpublishedDraft.prettyPrint();
+        unpublishedDraft.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.metadataBlocks", equalTo(null));
+
+        // Now check that the metadata is shown, when we ask the versions api to dos o.
+        excludeMetadata = false;
+        unpublishedDraft = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiToken,true, excludeMetadata, false);
+        unpublishedDraft.prettyPrint();
+        unpublishedDraft.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.metadataBlocks", notNullValue() );
+    }
+    /**
+     * The apis (/api/datasets/{id}/versions and /api/datasets/{id}/versions/{vid}
+     * are already called from other RestAssured tests, in this class and also in FilesIT. 
+     * But this test is dedicated to this api specifically, and focuses on the 
+     * functionality added to it in 6.1. 
+    */
+    @Test
+    public void testDatasetVersionsAPI() {
+        
+        // Create user
+        String apiToken = UtilIT.createRandomUserGetToken();
+
+        // Create user with no permission
+        String apiTokenNoPerms = UtilIT.createRandomUserGetToken();
+
+        // Create Collection
+        String collectionAlias = UtilIT.createRandomCollectionGetAlias(apiToken);
+
+        // Create Dataset
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(collectionAlias, apiToken);
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        // Upload file
+        String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+        
+        // Check that the file we just uploaded is shown by the versions api:
+        Response unpublishedDraft = UtilIT.getDatasetVersion(datasetPid, ":draft", apiToken);
+        unpublishedDraft.prettyPrint();
+        unpublishedDraft.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        // Now check that the file is NOT shown, when we ask the versions api to 
+        // skip files: 
+        boolean excludeFiles = true; 
+        unpublishedDraft = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiToken, excludeFiles, false);
+        unpublishedDraft.prettyPrint();
+        unpublishedDraft.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files", equalTo(null));
+
+        unpublishedDraft = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiTokenNoPerms, excludeFiles, false);
+        unpublishedDraft.prettyPrint();
+        unpublishedDraft.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode());
+        
+        excludeFiles = false; 
+        unpublishedDraft = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiToken, excludeFiles, false);
+        unpublishedDraft.prettyPrint();
+        unpublishedDraft.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files.size()", equalTo(1));
+
+        unpublishedDraft = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiTokenNoPerms, excludeFiles, false);
+        unpublishedDraft.prettyPrint();
+        unpublishedDraft.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode());
+
+
+        // Publish collection and dataset
+        UtilIT.publishDataverseViaNativeApi(collectionAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        //Set of tests on non-deaccesioned dataset 
+        String specificVersion = "1.0";        
+        boolean includeDeaccessioned = false;
+        Response datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.versionState", equalTo("RELEASED"))
+                .body("data.latestVersionPublishingState", equalTo("RELEASED"));
+
+        // Upload another file: 
+        String pathToFile2 = "src/main/webapp/resources/images/cc0.png";
+        Response uploadResponse2 = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile2, apiToken);
+        uploadResponse2.prettyPrint();
+        uploadResponse2.then().assertThat().statusCode(OK.getStatusCode());
+
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.versionState", equalTo("DRAFT"))
+                .body("data.latestVersionPublishingState", equalTo("DRAFT"));
+
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.versionState", equalTo("RELEASED"))
+                .body("data.latestVersionPublishingState", equalTo("DRAFT"));
+       
+        // We should now have a published version, and a draft. 
+        
+        // Call /versions api, *with the owner api token*, make sure both 
+        // versions are listed; also check that the correct numbers of files 
+        // are shown in each version (2 in the draft, 1 in the published). 
+        Response versionsResponse = UtilIT.getDatasetVersions(datasetPid, apiToken);
+        versionsResponse.prettyPrint();
+        versionsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(2))
+                .body("data[0].files.size()", equalTo(2))
+                .body("data[1].files.size()", equalTo(1));
+
+
+        // Now call this api with the new (as of 6.1) pagination parameters
+        Integer offset = 0;
+        Integer howmany = 1;
+        versionsResponse = UtilIT.getDatasetVersions(datasetPid, apiToken, offset, howmany);
+        // (the above should return only one version, the draft)
+        versionsResponse.prettyPrint();
+        versionsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(1))
+                .body("data.versionState[0]", equalTo("DRAFT"))
+                .body("data[0].files.size()", equalTo(2));
+                
+        // And now call it with an un-privileged token, to make sure only one 
+        // (the published) version is shown:    
+        versionsResponse = UtilIT.getDatasetVersions(datasetPid, apiTokenNoPerms);
+        versionsResponse.prettyPrint();
+        versionsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.versionState[0]", not("DRAFT"))
+                .body("data.size()", equalTo(1));
+        
+        // And now call the "short", no-files version of the same api
+        excludeFiles = true;
+        versionsResponse = UtilIT.getDatasetVersions(datasetPid, apiTokenNoPerms, excludeFiles);
+        versionsResponse.prettyPrint();
+        versionsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].files", equalTo(null));
+
+
+        
+
+        
+        
+        excludeFiles = true;
+        //Latest published authorized token
+        //Latest published requested, draft exists and user has access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("RELEASED"))
+            .body("data.files", equalTo(null));
+
+        //Latest published unauthorized token
+        //Latest published requested, draft exists but user doesn't have access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("RELEASED"))
+            .body("data.files", equalTo(null));
+
+        //Latest authorized token
+        //Latest requested, draft exists and user has access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DRAFT"))
+            .body("data.files", equalTo(null));
+
+        //Latest unauthorized token
+        //Latest requested, draft exists but user doesn't have access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("RELEASED"))
+            .body("data.files", equalTo(null));
+
+        //Specific version authorized token
+        //Specific version requested, draft exists and user has access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("RELEASED"))
+            .body("data.files", equalTo(null));
+
+        //Specific version unauthorized token
+        //Specific version requested, draft exists but user doesn't have access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("RELEASED"))
+            .body("data.files", equalTo(null));
+
+        excludeFiles = false;
+        
+        //Latest published authorized token
+        //Latest published requested, draft exists and user has access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("RELEASED"))
+            .body("data.files.size()", equalTo(1));
+
+        //Latest published unauthorized token
+        //Latest published requested, draft exists but user doesn't have access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("RELEASED"))
+            .body("data.files.size()", equalTo(1));
+
+        //Latest authorized token, user is authenticated should get the Draft version
+        //Latest requested, draft exists and user has access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DRAFT"))
+            .body("data.files.size()", equalTo(2));
+
+        //Latest unauthorized token, user has no permissions should get the latest Published version
+        //Latest requested, draft exists but user doesn't have access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("RELEASED"))
+            .body("data.files.size()", equalTo(1));
+
+        //Specific version authorized token
+        //Specific version requested, draft exists and user has access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("RELEASED"))
+            .body("data.files.size()", equalTo(1));
+
+        //Specific version unauthorized token
+        //Specific version requested, draft exists but user doesn't have access to draft
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("RELEASED"))
+            .body("data.files.size()", equalTo(1));
+
+        //We deaccession the dataset
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        //Set of tests on deaccesioned dataset, only 3/9 should return OK message
+
+        includeDeaccessioned = true;
+        excludeFiles = false;
+
+        //Latest published authorized token with deaccessioned dataset
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DEACCESSIONED"))
+            .body("data.files.size()", equalTo(1));
+
+        //Latest published requesting files, one version is DEACCESSIONED the second is DRAFT so shouldn't get any datasets
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Latest authorized token should get the DRAFT version
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DRAFT"))
+            .body("data.files.size()", equalTo(2));
+
+        //Latest unauthorized token requesting files, one version is DEACCESSIONED the second is DRAFT so shouldn't get any datasets
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Specific version authorized token
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DEACCESSIONED"))
+            .body("data.files.size()", equalTo(1));
+
+        //Specific version unauthorized token requesting files, one version is DEACCESSIONED the second is DRAFT so shouldn't get any datasets.
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        excludeFiles = true;
+
+        //Latest published exclude files authorized token with deaccessioned dataset
+        //Latest published requested, that version was deaccessioned but a draft exist and the user has access to it.
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DEACCESSIONED"))
+            .body("data.files", equalTo(null));
+
+        //Latest published exclude files, should get the DEACCESSIONED version
+        //Latest published requested, that version was deaccessioned but a draft exist but the user doesn't have access to it.
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DEACCESSIONED"))
+            .body("data.files", equalTo(null));
+
+        //Latest authorized token should get the DRAFT version with no files
+        //Latest requested there is a draft and the user has access to it.
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DRAFT"))
+            .body("data.files", equalTo(null));
+
+        //Latest unauthorized token excluding files, one version is DEACCESSIONED the second is DRAFT so shouldn't get any datasets
+        //Latest requested and latest version is deaccessioned and the user doesn't have access to the draft.
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DEACCESSIONED"))
+            .body("data.files", equalTo(null));
+
+        //Specific version authorized token
+        //Specific version requested (deaccesioned), the latest version is on draft amd the user has access to it.
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DEACCESSIONED"))
+            .body("data.files", equalTo(null));
+
+        //Specific version unauthorized token requesting files, one version is DEACCESSIONED the second is DRAFT so shouldn't get any datasets.
+        //Specific version requested (deaccesioned), the latest version is on draft but the user doesn't have access to it.
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DEACCESSIONED"))
+            .body("data.files", equalTo(null));
+
+        //Set of test when we have a deaccessioned dataset but we don't include deaccessioned
+        includeDeaccessioned = false;
+        excludeFiles = false;
+
+        //Latest published authorized token with deaccessioned dataset not included
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Latest published unauthorized token with deaccessioned dataset not included
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Latest authorized token should get the DRAFT version
+        //Latest version requested, the user has access to the draft.
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DRAFT"))
+            .body("data.files.size()", equalTo(2));
+
+        //Latest unauthorized token one version is DEACCESSIONED the second is DRAFT so shouldn't get any datasets
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Specific version authorized token, the version is DEACCESSIONED so shouldn't get any datasets
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Specific version unauthorized token, the version is DEACCESSIONED so shouldn't get any datasets
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        excludeFiles = true;
+
+        //Latest published authorized token with deaccessioned dataset not included
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Latest published unauthorized token with deaccessioned dataset not included
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Latest authorized token should get the DRAFT version
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(OK.getStatusCode())
+            .body("data.versionState", equalTo("DRAFT"))
+            .body("data.files", equalTo(null));
+
+        //Latest unauthorized token one version is DEACCESSIONED the second is DRAFT so shouldn't get any datasets
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_LATEST, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Specific version authorized token, the version is DEACCESSIONED so shouldn't get any datasets
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiToken, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Specific version unauthorized token, the version is DEACCESSIONED so shouldn't get any datasets
+        datasetVersion = UtilIT.getDatasetVersion(datasetPid, specificVersion, apiTokenNoPerms, excludeFiles, includeDeaccessioned);
+        datasetVersion.prettyPrint();
+        datasetVersion.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+       
+    }
+
+    
+    /**
+     * This test requires the root dataverse to be published to pass.
+     */
+    @Test
+    public void testExport() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        assertEquals(200, createUser.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
         assertEquals(200, makeSuperUser.getStatusCode());
 
         Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
@@ -561,8 +1617,7 @@ public void testExport() {
         Response exportDatasetAsDublinCore = UtilIT.exportDataset(datasetPersistentId, "oai_dc", apiToken);
         exportDatasetAsDublinCore.prettyPrint();
         exportDatasetAsDublinCore.then().assertThat()
-                // FIXME: Get this working. See https://github.com/rest-assured/rest-assured/wiki/Usage#example-3---complex-parsing-and-validation
-                //                .body("oai_dc:dc.find { it == 'dc:title' }.item", hasItems("Darwin's Finches"))
+                .body("oai_dc.title", is("Dataset One"))
                 .statusCode(OK.getStatusCode());
 
         Response exportDatasetAsDdi = UtilIT.exportDataset(datasetPersistentId, "ddi", apiToken);
@@ -570,9 +1625,17 @@ public void testExport() {
         exportDatasetAsDdi.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        assertEquals("sammi@sample.com", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact.@email"));
+        assertEquals(null, XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact.@email"));
         assertEquals(datasetPersistentId, XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.docDscr.citation.titlStmt.IDNo"));
 
+        Response reexportAllFormats = UtilIT.reexportDatasetAllFormats(datasetPersistentId);
+        reexportAllFormats.prettyPrint();
+        reexportAllFormats.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response reexportAllFormatsUsingId = UtilIT.reexportDatasetAllFormats(datasetId.toString());
+        reexportAllFormatsUsingId.prettyPrint();
+        reexportAllFormatsUsingId.then().assertThat().statusCode(OK.getStatusCode());
+
         Response deleteDatasetResponse = UtilIT.destroyDataset(datasetId, apiToken);
         deleteDatasetResponse.prettyPrint();
         assertEquals(200, deleteDatasetResponse.getStatusCode());
@@ -650,10 +1713,10 @@ public void testExcludeEmail() {
         exportDatasetAsDdi.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        assertEquals("Dataverse, Admin", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact"));
+        assertEquals("Dataverse, Admin", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.citation.distStmt.contact"));
         // no "sammi@sample.com" to be found https://github.com/IQSS/dataverse/issues/3443
-        assertEquals("[]", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact.@email"));
-        assertEquals("Sample Datasets, inc.", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact.@affiliation"));
+        assertEquals(null, XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.citation.distStmt.contact.@email"));
+        assertEquals("Sample Datasets, inc.", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.citation.distStmt.contact.@affiliation"));
         assertEquals(datasetPersistentId, XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.docDscr.citation.titlStmt.IDNo"));
 
         List<JsonObject> datasetContactsFromNativeGet = with(getDatasetJsonAfterPublishing.body().asString()).param("datasetContact", "datasetContact")
@@ -701,9 +1764,24 @@ public void testExcludeEmail() {
 
     }
 
+    @Disabled
+    /*The identifier generation style is no longer a global, dynamically changeable setting. To make this test work after PR #10234,
+     * will require configuring a PidProvider that uses this style and creating a collection/dataset that uses that provider.
+     */
     @Test
-    public void testSequentialNumberAsIdentifierGenerationStyle() {
-
+    public void testStoredProcGeneratedAsIdentifierGenerationStyle() {
+        // Please note that this test only works if the stored procedure
+        // named generateIdentifierFromStoredProcedure() has been created in the 
+        // database (see the documentation for the "IdentifierGenerationStyle" option
+        // in the Configuration section of the Installation guide).
+        // Furthermore, the test below expects the identifier generated by the stored
+        // procedure to be a numeric string. The "sequential numerical values" procedure, 
+        // documented as the first example in the guide above, will satisfy the test. 
+        // If your installation is using a stored procedure that generates the identifiers
+        // in any other format, the test below will fail. 
+        // (The test is mainly used by the Dataverse Project's automated API test system 
+        // to verify the integrity of this framework for generating the identifiers on the 
+        // database side). 
         Response createUser = UtilIT.createRandomUser();
         createUser.prettyPrint();
         String username = UtilIT.getUsernameFromResponse(createUser);
@@ -713,8 +1791,8 @@ public void testSequentialNumberAsIdentifierGenerationStyle() {
         createDataverseResponse.prettyPrint();
         String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
 
-        Response setSequentialNumberAsIdentifierGenerationStyle = UtilIT.setSetting(SettingsServiceBean.Key.IdentifierGenerationStyle, "sequentialNumber");
-        setSequentialNumberAsIdentifierGenerationStyle.then().assertThat()
+        Response setStoredProcGeneratedAsIdentifierGenerationStyle = UtilIT.setSetting(SettingsServiceBean.Key.IdentifierGenerationStyle, "storedProcGenerated");
+        setStoredProcGeneratedAsIdentifierGenerationStyle.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
         Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
@@ -765,7 +1843,7 @@ public void testPrivateUrl() {
         String username = UtilIT.getUsernameFromResponse(createUser);
         String apiToken = UtilIT.getApiTokenFromResponse(createUser);
 
-        Response failToCreateWhenDatasetIdNotFound = UtilIT.privateUrlCreate(Integer.MAX_VALUE, apiToken);
+        Response failToCreateWhenDatasetIdNotFound = UtilIT.privateUrlCreate(Integer.MAX_VALUE, apiToken, false);
         failToCreateWhenDatasetIdNotFound.prettyPrint();
         assertEquals(NOT_FOUND.getStatusCode(), failToCreateWhenDatasetIdNotFound.getStatusCode());
 
@@ -795,7 +1873,7 @@ public void testPrivateUrl() {
         grantRole.prettyPrint();
         assertEquals(OK.getStatusCode(), grantRole.getStatusCode());
         UtilIT.getRoleAssignmentsOnDataverse(dataverseAlias, apiToken).prettyPrint();
-        Response contributorDoesNotHavePermissionToCreatePrivateUrl = UtilIT.privateUrlCreate(datasetId, contributorApiToken);
+        Response contributorDoesNotHavePermissionToCreatePrivateUrl = UtilIT.privateUrlCreate(datasetId, contributorApiToken, false);
         contributorDoesNotHavePermissionToCreatePrivateUrl.prettyPrint();
         assertEquals(UNAUTHORIZED.getStatusCode(), contributorDoesNotHavePermissionToCreatePrivateUrl.getStatusCode());
 
@@ -823,7 +1901,7 @@ public void testPrivateUrl() {
         pristine.prettyPrint();
         assertEquals(NOT_FOUND.getStatusCode(), pristine.getStatusCode());
 
-        Response createPrivateUrl = UtilIT.privateUrlCreate(datasetId, apiToken);
+        Response createPrivateUrl = UtilIT.privateUrlCreate(datasetId, apiToken, false);
         createPrivateUrl.prettyPrint();
         assertEquals(OK.getStatusCode(), createPrivateUrl.getStatusCode());
 
@@ -958,7 +2036,7 @@ public void testPrivateUrl() {
         Response downloadFile = UtilIT.downloadFile(fileId, tokenForPrivateUrlUser);
         assertEquals(OK.getStatusCode(), downloadFile.getStatusCode());
         Response downloadFileBadToken = UtilIT.downloadFile(fileId, "junk");
-        assertEquals(FORBIDDEN.getStatusCode(), downloadFileBadToken.getStatusCode());
+        assertEquals(UNAUTHORIZED.getStatusCode(), downloadFileBadToken.getStatusCode());
         Response notPermittedToListRoleAssignment = UtilIT.getRoleAssignmentsOnDataset(datasetId.toString(), null, userWithNoRolesApiToken);
         assertEquals(UNAUTHORIZED.getStatusCode(), notPermittedToListRoleAssignment.getStatusCode());
         Response roleAssignments = UtilIT.getRoleAssignmentsOnDataset(datasetId.toString(), null, apiToken);
@@ -967,7 +2045,7 @@ public void testPrivateUrl() {
         List<JsonObject> assignments = with(roleAssignments.body().asString()).param("member", "member").getJsonObject("data.findAll { data -> data._roleAlias == member }");
         assertEquals(1, assignments.size());
         PrivateUrlUser privateUrlUser = new PrivateUrlUser(datasetId);
-        assertEquals("Private URL Enabled", privateUrlUser.getDisplayInfo().getTitle());
+        assertEquals("Preview URL Enabled", privateUrlUser.getDisplayInfo().getTitle());
         List<JsonObject> assigneeShouldExistForPrivateUrlUser = with(roleAssignments.body().asString()).param("assigneeString", privateUrlUser.getIdentifier()).getJsonObject("data.findAll { data -> data.assignee == assigneeString }");
         logger.info(assigneeShouldExistForPrivateUrlUser + " found for " + privateUrlUser.getIdentifier());
         assertEquals(1, assigneeShouldExistForPrivateUrlUser.size());
@@ -983,11 +2061,11 @@ public void testPrivateUrl() {
         shouldNoLongerExist.prettyPrint();
         assertEquals(NOT_FOUND.getStatusCode(), shouldNoLongerExist.getStatusCode());
 
-        Response createPrivateUrlUnauth = UtilIT.privateUrlCreate(datasetId, userWithNoRolesApiToken);
+        Response createPrivateUrlUnauth = UtilIT.privateUrlCreate(datasetId, userWithNoRolesApiToken, false);
         createPrivateUrlUnauth.prettyPrint();
         assertEquals(UNAUTHORIZED.getStatusCode(), createPrivateUrlUnauth.getStatusCode());
 
-        Response createPrivateUrlAgain = UtilIT.privateUrlCreate(datasetId, apiToken);
+        Response createPrivateUrlAgain = UtilIT.privateUrlCreate(datasetId, apiToken, false);
         createPrivateUrlAgain.prettyPrint();
         assertEquals(OK.getStatusCode(), createPrivateUrlAgain.getStatusCode());
 
@@ -1003,11 +2081,11 @@ public void testPrivateUrl() {
         tryToDeleteAlreadyDeletedPrivateUrl.prettyPrint();
         assertEquals(NOT_FOUND.getStatusCode(), tryToDeleteAlreadyDeletedPrivateUrl.getStatusCode());
 
-        Response createPrivateUrlOnceAgain = UtilIT.privateUrlCreate(datasetId, apiToken);
+        Response createPrivateUrlOnceAgain = UtilIT.privateUrlCreate(datasetId, apiToken, false);
         createPrivateUrlOnceAgain.prettyPrint();
         assertEquals(OK.getStatusCode(), createPrivateUrlOnceAgain.getStatusCode());
 
-        Response tryToCreatePrivateUrlWhenExisting = UtilIT.privateUrlCreate(datasetId, apiToken);
+        Response tryToCreatePrivateUrlWhenExisting = UtilIT.privateUrlCreate(datasetId, apiToken, false);
         tryToCreatePrivateUrlWhenExisting.prettyPrint();
         assertEquals(FORBIDDEN.getStatusCode(), tryToCreatePrivateUrlWhenExisting.getStatusCode());
 
@@ -1026,7 +2104,7 @@ public void testPrivateUrl() {
         List<JsonObject> noAssignmentsForPrivateUrlUser = with(publishingShouldHaveRemovedRoleAssignmentForPrivateUrlUser.body().asString()).param("member", "member").getJsonObject("data.findAll { data -> data._roleAlias == member }");
         assertEquals(0, noAssignmentsForPrivateUrlUser.size());
 
-        Response tryToCreatePrivateUrlToPublishedVersion = UtilIT.privateUrlCreate(datasetId, apiToken);
+        Response tryToCreatePrivateUrlToPublishedVersion = UtilIT.privateUrlCreate(datasetId, apiToken, false);
         tryToCreatePrivateUrlToPublishedVersion.prettyPrint();
         assertEquals(FORBIDDEN.getStatusCode(), tryToCreatePrivateUrlToPublishedVersion.getStatusCode());
 
@@ -1035,12 +2113,12 @@ public void testPrivateUrl() {
         updatedMetadataResponse.prettyPrint();
         assertEquals(OK.getStatusCode(), updatedMetadataResponse.getStatusCode());
 
-        Response createPrivateUrlForPostVersionOneDraft = UtilIT.privateUrlCreate(datasetId, apiToken);
+        Response createPrivateUrlForPostVersionOneDraft = UtilIT.privateUrlCreate(datasetId, apiToken, false);
         createPrivateUrlForPostVersionOneDraft.prettyPrint();
         assertEquals(OK.getStatusCode(), createPrivateUrlForPostVersionOneDraft.getStatusCode());
 
         // A Contributor has DeleteDatasetDraft
-        Response deleteDraftVersionAsContributor = UtilIT.deleteDatasetVersionViaNativeApi(datasetId, ":draft", contributorApiToken);
+        Response deleteDraftVersionAsContributor = UtilIT.deleteDatasetVersionViaNativeApi(datasetId, DS_VERSION_DRAFT, contributorApiToken);
         deleteDraftVersionAsContributor.prettyPrint();
         deleteDraftVersionAsContributor.then().assertThat()
                 .statusCode(OK.getStatusCode())
@@ -1048,7 +2126,7 @@ public void testPrivateUrl() {
 
         Response privateUrlRoleAssignmentShouldBeGoneAfterDraftDeleted = UtilIT.getRoleAssignmentsOnDataset(datasetId.toString(), null, apiToken);
         privateUrlRoleAssignmentShouldBeGoneAfterDraftDeleted.prettyPrint();
-        assertEquals(false, privateUrlRoleAssignmentShouldBeGoneAfterDraftDeleted.body().asString().contains(privateUrlUser.getIdentifier()));
+        assertFalse(privateUrlRoleAssignmentShouldBeGoneAfterDraftDeleted.body().asString().contains(privateUrlUser.getIdentifier()));
 
         String newTitleAgain = "I am changing the title again";
         Response draftCreatedAgainPostPub = UtilIT.updateDatasetTitleViaSword(dataset1PersistentId, newTitleAgain, apiToken);
@@ -1062,7 +2140,7 @@ public void testPrivateUrl() {
          * a dataset is destroy. Still, we'll keep this test in here in case we
          * switch Private URL back to being its own table in the future.
          */
-        Response createPrivateUrlToMakeSureItIsDeletedWithDestructionOfDataset = UtilIT.privateUrlCreate(datasetId, apiToken);
+        Response createPrivateUrlToMakeSureItIsDeletedWithDestructionOfDataset = UtilIT.privateUrlCreate(datasetId, apiToken, false);
         createPrivateUrlToMakeSureItIsDeletedWithDestructionOfDataset.prettyPrint();
         assertEquals(OK.getStatusCode(), createPrivateUrlToMakeSureItIsDeletedWithDestructionOfDataset.getStatusCode());
 
@@ -1094,6 +2172,202 @@ public void testPrivateUrl() {
          * @todo Should the Search API work with the Private URL token?
          */
     }
+    
+    @Test
+    public void testAddRoles(){
+        
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        Response datasetAsJson = UtilIT.nativeGet(datasetId, apiToken);
+        datasetAsJson.then().assertThat()
+                .statusCode(OK.getStatusCode());
+       
+        String identifier = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
+        assertEquals(10, identifier.length());
+        
+        String protocol1 = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.protocol");
+        String authority1 = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.authority");
+        String identifier1 = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
+        String datasetPersistentId = protocol1 + ":" + authority1 + "/" + identifier1;
+
+       
+        
+        // Create another random user: 
+        
+        Response createRandomUser = UtilIT.createRandomUser();
+        createRandomUser.prettyPrint();
+        String randomUsername = UtilIT.getUsernameFromResponse(createRandomUser);
+        String randomUserApiToken = UtilIT.getApiTokenFromResponse(createRandomUser);
+        
+
+        //Give that random user permission
+        //(String definitionPoint, String role, String roleAssignee, String apiToken)
+        //Can't give yourself permission
+        Response giveRandoPermission = UtilIT.grantRoleOnDataset(datasetPersistentId, "fileDownloader", "@" + randomUsername, randomUserApiToken);
+                giveRandoPermission.prettyPrint();
+        assertEquals(401, giveRandoPermission.getStatusCode());
+        
+        giveRandoPermission = UtilIT.grantRoleOnDataset(datasetPersistentId, "fileDownloader", "@" + randomUsername, apiToken);
+                giveRandoPermission.prettyPrint();
+        assertEquals(200, giveRandoPermission.getStatusCode());
+
+        //Asserting same role creation is covered
+        validateAssignExistingRole(datasetPersistentId,randomUsername,apiToken, "fileDownloader");
+
+        // Create another random user to become curator:
+
+        Response createCuratorUser = UtilIT.createRandomUser();
+        createCuratorUser.prettyPrint();
+        String curatorUsername = UtilIT.getUsernameFromResponse(createCuratorUser);
+        String curatorUserApiToken = UtilIT.getApiTokenFromResponse(createCuratorUser);
+
+        Response giveCuratorPermission = UtilIT.grantRoleOnDataset(datasetPersistentId, "curator", "@" + curatorUsername, apiToken);
+        giveCuratorPermission.prettyPrint();
+        assertEquals(200, giveCuratorPermission.getStatusCode());
+
+        // Test if privilege escalation is possible: curator should not be able to assign admin rights
+        Response giveTooMuchPermission = UtilIT.grantRoleOnDataset(datasetPersistentId, "admin", "@" + curatorUsername, curatorUserApiToken);
+        giveTooMuchPermission.prettyPrint();
+        assertEquals(401, giveTooMuchPermission.getStatusCode());
+
+        giveTooMuchPermission = UtilIT.grantRoleOnDataset(datasetPersistentId, "admin", "@" + randomUsername, curatorUserApiToken);
+        giveTooMuchPermission.prettyPrint();
+        assertEquals(401, giveTooMuchPermission.getStatusCode());
+        
+        String idToDelete = JsonPath.from(giveRandoPermission.getBody().asString()).getString("data.id");                
+
+        giveRandoPermission = UtilIT.grantRoleOnDataset(datasetPersistentId, "designatedHitter", "@" + randomUsername, apiToken);
+                giveRandoPermission.prettyPrint();
+                        giveRandoPermission.then().assertThat()
+                .contentType(ContentType.JSON)
+                .body("message", containsString("Cannot find role named 'designatedHitter' in dataverse "))
+                .statusCode(400);
+        assertEquals(400, giveRandoPermission.getStatusCode());
+        
+        //Try to delete Role with Id saved above
+        //Fails for lack of perms
+        Response deleteGrantedAccess = UtilIT.revokeRoleOnDataset(datasetPersistentId, new Long(idToDelete), randomUserApiToken);
+        deleteGrantedAccess.prettyPrint();
+        assertEquals(401, deleteGrantedAccess.getStatusCode());
+        
+        //Should be able to delete with proper apiToken
+        deleteGrantedAccess = UtilIT.revokeRoleOnDataset(datasetPersistentId, new Long(idToDelete), apiToken);
+        deleteGrantedAccess.prettyPrint();
+        assertEquals(200, deleteGrantedAccess.getStatusCode());
+        
+        Response deleteDatasetResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
+        deleteDatasetResponse.prettyPrint();
+        assertEquals(200, deleteDatasetResponse.getStatusCode());
+        
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteDataverseResponse.prettyPrint();
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
+
+        deleteUserResponse = UtilIT.deleteUser(randomUsername);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
+
+        deleteUserResponse = UtilIT.deleteUser(curatorUsername);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
+        
+    }
+
+    @Test
+    public void testListRoleAssignments() {
+        Response createAdminUser = UtilIT.createRandomUser();
+        String adminUsername = UtilIT.getUsernameFromResponse(createAdminUser);
+        String adminApiToken = UtilIT.getApiTokenFromResponse(createAdminUser);
+        UtilIT.makeSuperUser(adminUsername);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(adminApiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Now, let's allow anyone with a Dataverse account (any "random user")
+        // to create datasets in this dataverse:
+
+        Response grantRole = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR, AuthenticatedUsers.get().getIdentifier(), adminApiToken);
+        grantRole.prettyPrint();
+        assertEquals(OK.getStatusCode(), grantRole.getStatusCode());
+
+        Response createContributorUser = UtilIT.createRandomUser();
+        String contributorUsername = UtilIT.getUsernameFromResponse(createContributorUser);
+        String contributorApiToken = UtilIT.getApiTokenFromResponse(createContributorUser);
+
+        // First, we test listing role assignments on a dataverse which requires "ManageDataversePermissions"
+
+        Response notPermittedToListRoleAssignmentOnDataverse = UtilIT.getRoleAssignmentsOnDataverse(dataverseAlias, contributorApiToken);
+        assertEquals(UNAUTHORIZED.getStatusCode(), notPermittedToListRoleAssignmentOnDataverse.getStatusCode());
+
+        Response roleAssignmentsOnDataverse = UtilIT.getRoleAssignmentsOnDataverse(dataverseAlias, adminApiToken);
+        roleAssignmentsOnDataverse.prettyPrint();
+        assertEquals(OK.getStatusCode(), roleAssignmentsOnDataverse.getStatusCode());
+
+        // Second, we test listing role assignments on a dataset which requires "ManageDatasetPermissions"
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, contributorApiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        logger.info("dataset id: " + datasetId);
+
+        Response datasetAsJson = UtilIT.nativeGet(datasetId, adminApiToken);
+        datasetAsJson.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        String identifier = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
+        assertEquals(10, identifier.length());
+
+        String protocol1 = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.protocol");
+        String authority1 = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.authority");
+        String identifier1 = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
+        String datasetPersistentId = protocol1 + ":" + authority1 + "/" + identifier1;
+
+        Response notPermittedToListRoleAssignmentOnDataset = UtilIT.getRoleAssignmentsOnDataset(datasetId.toString(), null, contributorApiToken);
+        assertEquals(UNAUTHORIZED.getStatusCode(), notPermittedToListRoleAssignmentOnDataset.getStatusCode());
+
+        // We assign the curator role to the contributor user
+        // (includes "ManageDatasetPermissions" which are required for listing role assignments of a dataset, but not
+        // "ManageDataversePermissions")
+
+        Response giveRandoPermission = UtilIT.grantRoleOnDataset(datasetPersistentId, "curator", "@" + contributorUsername, adminApiToken);
+        giveRandoPermission.prettyPrint();
+        assertEquals(200, giveRandoPermission.getStatusCode());
+
+        // Contributor user should now be able to list dataset role assignments as well
+
+        Response roleAssignmentsOnDataset = UtilIT.getRoleAssignmentsOnDataset(datasetId.toString(), null, contributorApiToken);
+        roleAssignmentsOnDataset.prettyPrint();
+        assertEquals(OK.getStatusCode(), roleAssignmentsOnDataset.getStatusCode());
+
+        // ...but not dataverse role assignments
+
+        notPermittedToListRoleAssignmentOnDataverse = UtilIT.getRoleAssignmentsOnDataverse(dataverseAlias, contributorApiToken);
+        assertEquals(UNAUTHORIZED.getStatusCode(), notPermittedToListRoleAssignmentOnDataverse.getStatusCode());
+    }
+
+    private static void validateAssignExistingRole(String datasetPersistentId, String randomUsername, String apiToken, String role) {
+        final Response failedGrantPermission = UtilIT.grantRoleOnDataset(datasetPersistentId, role, "@" + randomUsername, apiToken);
+        failedGrantPermission.prettyPrint();
+        failedGrantPermission.then().assertThat()
+                .body("message", containsString(BundleUtil.getStringFromBundle("datasets.api.grant.role.assignee.has.role.error")))
+                .statusCode(FORBIDDEN.getStatusCode());
+    }
 
     @Test
     public void testFileChecksum() {
@@ -1203,6 +2477,46 @@ public void testDeleteDatasetWhileFileIngesting() {
                 .statusCode(FORBIDDEN.getStatusCode());
 
     }
+    
+    @Test
+    public void testGetDatasetOwners() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        String persistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+        logger.info("Dataset created with id " + datasetId + " and persistent id " + persistentId);
+
+        Response getDatasetWithOwners = UtilIT.getDatasetWithOwners(persistentId, apiToken, true);
+        getDatasetWithOwners.prettyPrint();
+        getDatasetWithOwners.then().assertThat().body("data.isPartOf.identifier", equalTo(dataverseAlias));
+        getDatasetWithOwners.then().assertThat().body("data.isPartOf.isReleased", equalTo(false));
+        getDatasetWithOwners.then().assertThat().body("data.isPartOf.isPartOf.identifier", equalTo("root"));
+        getDatasetWithOwners.then().assertThat().body("data.isPartOf.isPartOf.isReleased", equalTo(true));
+
+        Response destroyDatasetResponse = UtilIT.destroyDataset(datasetId, apiToken);
+        assertEquals(200, destroyDatasetResponse.getStatusCode());
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        assertEquals(200, deleteUserResponse.getStatusCode());        
+    }
 
     /**
      * In order for this test to pass you must have the Data Capture Module (
@@ -1297,7 +2611,7 @@ public void testCreateDatasetWithDcmDependency() {
         getRsyncScriptPermErrorGuest.then().assertThat()
                 .statusCode(UNAUTHORIZED.getStatusCode())
                 .contentType(ContentType.JSON)
-                .body("message", equalTo("Please provide a key query parameter (?key=XXX) or via the HTTP header X-Dataverse-key"));
+                .body("message", equalTo(AbstractApiBean.RESPONSE_MESSAGE_AUTHENTICATED_USER_REQUIRED));
 
         Response createNoPermsUser = UtilIT.createRandomUser();
         String noPermsUsername = UtilIT.getUsernameFromResponse(createNoPermsUser);
@@ -1591,13 +2905,19 @@ public void testDcmChecksumValidationMessages() throws IOException, InterruptedE
     
     @Test
     public void testCreateDeleteDatasetLink() {
+        // Create superuser
         Response createUser = UtilIT.createRandomUser();
         createUser.prettyPrint();
         String username = UtilIT.getUsernameFromResponse(createUser);
         String apiToken = UtilIT.getApiTokenFromResponse(createUser);
-        
         Response superuserResponse = UtilIT.makeSuperUser(username);
 
+        // Create another user that doesn't have permission to create/delete links
+        Response createUser2 = UtilIT.createRandomUser();
+        createUser2.prettyPrint();
+        String username2 = UtilIT.getUsernameFromResponse(createUser2);
+        String apiToken2 = UtilIT.getApiTokenFromResponse(createUser2);
+
         Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
         createDataverseResponse.prettyPrint();
         String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
@@ -1605,6 +2925,7 @@ public void testCreateDeleteDatasetLink() {
         Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
         createDatasetResponse.prettyPrint();
         Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
         
         // This should fail, because we are attempting to link the dataset 
         // to its own dataverse:
@@ -1632,23 +2953,108 @@ public void testCreateDeleteDatasetLink() {
         publishDatasetForLinking.prettyPrint();
         publishTargetDataverse.then().assertThat()
                 .statusCode(OK.getStatusCode());
-        
-        // And link the dataset to this new dataverse:
+
+        // Try to link the dataset to the new dataverse without LinkDataset permissions
+        createLinkingDatasetResponse = UtilIT.createDatasetLink(datasetId.longValue(), dataverseAlias, apiToken2);
+        createLinkingDatasetResponse.prettyPrint();
+        createLinkingDatasetResponse.then().assertThat()
+                .body("message", equalTo("User @" + username2 + " is not permitted to perform requested action."))
+                .statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Link the dataset to the new dataverse
         createLinkingDatasetResponse = UtilIT.createDatasetLink(datasetId.longValue(), dataverseAlias, apiToken);
         createLinkingDatasetResponse.prettyPrint();
         createLinkingDatasetResponse.then().assertThat()
                 .body("data.message", equalTo("Dataset " + datasetId +" linked successfully to " + dataverseAlias))
                 .statusCode(200);
-        
-        // And now test deleting it:
-        Response deleteLinkingDatasetResponse = UtilIT.deleteDatasetLink(datasetId.longValue(), dataverseAlias, apiToken);
+
+        // Try to delete the link without LinkDataset permissions
+        Response deleteLinkingDatasetResponse = UtilIT.deleteDatasetLink(datasetId.longValue(), dataverseAlias, apiToken2);
+        deleteLinkingDatasetResponse.prettyPrint();
+        deleteLinkingDatasetResponse.then().assertThat()
+                .body("message", equalTo("User @" + username2 + " is not permitted to perform requested action."))
+                .statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Give the user curator rights for the target dataverse to show that they can add and delete the link later
+        // (Timing issues if you try to add or delete right after giving permission)
+        Response givePermissionResponse = UtilIT.grantRoleOnDataverse(dataverseAlias, "curator", "@" + username2, apiToken);
+        givePermissionResponse.prettyPrint();
+        givePermissionResponse.then().assertThat()
+                .statusCode(200);
+
+        // And now test deleting it as superuser:
+        deleteLinkingDatasetResponse = UtilIT.deleteDatasetLink(datasetId.longValue(), dataverseAlias, apiToken);
+        deleteLinkingDatasetResponse.prettyPrint();
+
+        deleteLinkingDatasetResponse.then().assertThat()
+                .body("data.message", equalTo("Link from Dataset " + datasetId + " to linked Dataverse " + dataverseAlias + " deleted"))
+                .statusCode(200);
+
+        // And now test linking the dataset as user2 with new role as curator (link permissions):
+        createLinkingDatasetResponse = UtilIT.createDatasetLink(datasetId.longValue(), dataverseAlias, apiToken2);
+        createLinkingDatasetResponse.prettyPrint();
+        createLinkingDatasetResponse.then().assertThat()
+                .body("data.message", equalTo("Dataset " + datasetId +" linked successfully to " + dataverseAlias))
+                .statusCode(200);
+
+        // And now test deleting it as user2 with new role as curator (link permissions):
+        deleteLinkingDatasetResponse = UtilIT.deleteDatasetLink(datasetId.longValue(), dataverseAlias, apiToken2);
         deleteLinkingDatasetResponse.prettyPrint();
-        
         deleteLinkingDatasetResponse.then().assertThat()
                 .body("data.message", equalTo("Link from Dataset " + datasetId + " to linked Dataverse " + dataverseAlias + " deleted"))
                 .statusCode(200);
     }
     
+    @Test
+    @Disabled
+    public void testApiErrors() {
+
+        /*
+        Issue 8859
+        This test excerises the issue where the update apis fail when the dataset is out of compliance with
+        the requirement that datasets containing restricted files must allow reuest access or have terms of access.
+        It's impossible to get a dataset into this state via the version 5.11.1 or later so if you needc to
+        run this test you must set it up manually by setting requestAccess on TermsOfUseAccess to false 
+        with an update query.
+        Update the decalarations below with values from your test environment
+         */
+        String datasetPid = "doi:10.5072/FK2/7LDIUU";
+        String apiToken = "1fab5406-0f03-47de-9a5b-d36d1d683a50";
+        Long datasetId = 902L;
+
+        String newDescription = "{\"citation:dsDescription\": {\"citation:dsDescriptionValue\": \"New description\"},  \"@context\":{\"citation\": \"https://dataverse.org/schema/citation/\"}}";
+        Response response = UtilIT.updateDatasetJsonLDMetadata(datasetId.intValue(), apiToken, newDescription, false);
+        response.then().assertThat().statusCode(CONFLICT.getStatusCode());
+        assertTrue(response.prettyPrint().contains("You must enable request access or add terms of access in datasets with restricted files"));
+
+
+        String pathToJsonFile = "doc/sphinx-guides/source/_static/api/dataset-update-metadata.json";
+        Response updateTitle = UtilIT.updateDatasetMetadataViaNative(datasetPid, pathToJsonFile, apiToken);
+        updateTitle.prettyPrint();
+        assertEquals(CONFLICT.getStatusCode(), updateTitle.getStatusCode());
+        assertTrue(updateTitle.prettyPrint().contains("You must enable request access or add terms of access in datasets with restricted files"));
+
+        String basicFileName = "004.txt";
+
+        String basicPathToFile = "scripts/search/data/replace_test/" + basicFileName;
+
+        Response basicAddResponse = UtilIT.uploadFileViaNative(datasetId.toString(), basicPathToFile, apiToken);
+        basicAddResponse.prettyPrint();
+        assertEquals(CONFLICT.getStatusCode(), basicAddResponse.getStatusCode());
+        assertTrue(basicAddResponse.prettyPrint().contains("You must enable request access or add terms of access in datasets with restricted files"));
+
+        Response deleteFile = UtilIT.deleteFile(907, apiToken);
+        deleteFile.prettyPrint();
+        assertEquals(BAD_REQUEST.getStatusCode(), deleteFile.getStatusCode());
+        
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken);
+        publishDataset.prettyPrint();
+        assertEquals(409, publishDataset.getStatusCode());
+        assertTrue(publishDataset.prettyPrint().contains("You must enable request access or add terms of access in datasets with restricted files"));
+
+    }
+
+    
     @Test
     public void testDatasetLocksApi() {
         Response createUser = UtilIT.createRandomUser();
@@ -1665,6 +3071,7 @@ public void testDatasetLocksApi() {
         Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
         createDatasetResponse.prettyPrint();
         Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String persistentIdentifier = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
         
         // This should return an empty list, as the dataset should have no locks just yet:
         Response checkDatasetLocks = UtilIT.checkDatasetLocks(datasetId.longValue(), null, apiToken);
@@ -1696,7 +3103,97 @@ public void testDatasetLocksApi() {
         lockDatasetResponse.then().assertThat()
                 .body("message", equalTo("dataset already locked with lock type Ingest"))
                 .statusCode(FORBIDDEN.getStatusCode());
-             
+        
+        // Let's also test the new (as of 5.10) API that lists the locks 
+        // present across all datasets. 
+        
+        // First, we'll try listing ALL locks currently in the system, and make sure that the ingest lock 
+        // for this dataset is on the list:
+        checkDatasetLocks = UtilIT.listAllLocks(apiToken);
+        checkDatasetLocks.prettyPrint();
+        checkDatasetLocks.then().assertThat()
+                .statusCode(200);
+        
+        boolean lockListedCorrectly = false;
+        List<Map<String, String>> listedLockEntries = checkDatasetLocks.body().jsonPath().getList("data");
+        for (int i = 0; i < listedLockEntries.size(); i++) {
+            if ("Ingest".equals(listedLockEntries.get(i).get("lockType"))
+                    && username.equals(listedLockEntries.get(i).get("user"))
+                    && persistentIdentifier.equals(listedLockEntries.get(i).get("dataset"))) {
+                lockListedCorrectly = true; 
+                break;
+            } 
+        }
+        assertTrue(lockListedCorrectly, "Lock missing from the output of /api/datasets/locks");
+        
+        // Try the same, but with an api token of a random, non-super user 
+        // (this should get rejected):
+        createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String wrongApiToken = UtilIT.getApiTokenFromResponse(createUser);
+        checkDatasetLocks = UtilIT.listAllLocks(wrongApiToken);
+        checkDatasetLocks.prettyPrint();
+        checkDatasetLocks.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode());
+        
+        // Try to narrow the listing down to the lock of type=Ingest specifically; 
+        // verify that the lock in question is still being listed:
+        checkDatasetLocks = UtilIT.listLocksByType("Ingest", apiToken);
+        checkDatasetLocks.prettyPrint();
+        // We'll again assume that it's possible that the API is going to list 
+        // *multiple* locks; i.e. that there are other datasets with the lock 
+        // of type "Ingest" on them. So we'll go through the list and look for the
+        // lock for this specific dataset again. 
+        lockListedCorrectly = false;
+        listedLockEntries = checkDatasetLocks.body().jsonPath().getList("data");
+        for (int i = 0; i < listedLockEntries.size(); i++) {
+            if ("Ingest".equals(listedLockEntries.get(i).get("lockType"))
+                    && username.equals(listedLockEntries.get(i).get("user"))
+                    && persistentIdentifier.equals(listedLockEntries.get(i).get("dataset"))) {
+                lockListedCorrectly = true; 
+                break;
+            } 
+        }
+        assertTrue(lockListedCorrectly, "Lock missing from the output of /api/datasets/locks?type=Ingest");
+
+        
+        // Try to list locks of an invalid type:
+        checkDatasetLocks = UtilIT.listLocksByType("BadLockType", apiToken);
+        checkDatasetLocks.prettyPrint();
+        checkDatasetLocks.then().assertThat()
+                .body("message", startsWith("Invalid lock type value: BadLockType"))
+                .statusCode(BAD_REQUEST.getStatusCode());
+       
+        // List the locks owned by the current user; verify that the lock above 
+        // is still listed:
+        checkDatasetLocks = UtilIT.listLocksByUser(username, apiToken);
+        checkDatasetLocks.prettyPrint();
+        // Safe to assume there should be only one:
+        checkDatasetLocks.then().assertThat()
+                .body("data[0].lockType", equalTo("Ingest"))
+                .body("data[0].user", equalTo(username))
+                .body("data[0].dataset", equalTo(persistentIdentifier))
+                .statusCode(200);
+        
+        // Further narrow down the listing to both the type AND user: 
+        checkDatasetLocks = UtilIT.listLocksByTypeAndUser("Ingest", username, apiToken);
+        checkDatasetLocks.prettyPrint();
+        // Even safer to assume there should be only one:
+        checkDatasetLocks.then().assertThat()
+                .statusCode(200)
+                .body("data[0].lockType", equalTo("Ingest"))
+                .body("data[0].user", equalTo(username))
+                .body("data[0].dataset", equalTo(persistentIdentifier));
+                
+        
+        // Finally, try asking for the locks owned by this user AND of type "InReview". 
+        // This should produce an empty list:
+        checkDatasetLocks = UtilIT.listLocksByTypeAndUser("InReview", username, apiToken);
+        checkDatasetLocks.prettyPrint();
+        checkDatasetLocks.then().assertThat()
+                .statusCode(200)
+                .body("data", equalTo(emptyArray));
+        
         // And now test deleting the lock:
         Response unlockDatasetResponse = UtilIT.unlockDataset(datasetId.longValue(), "Ingest", apiToken);
         unlockDatasetResponse.prettyPrint();
@@ -1718,7 +3215,7 @@ public void testDatasetLocksApi() {
      * This test requires the root dataverse to be published to pass.
      */
     @Test
-    @Ignore
+    @Disabled
     public void testUpdatePIDMetadataAPI() {
 
         Response createUser = UtilIT.createRandomUser();
@@ -1776,4 +3273,3643 @@ public void testUpdatePIDMetadataAPI() {
 
     }
     
+    @Test
+    public void testUpdateDatasetVersionWithFiles() throws InterruptedException {
+        Response createCurator = UtilIT.createRandomUser();
+        createCurator.prettyPrint();
+        createCurator.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String curatorUsername = UtilIT.getUsernameFromResponse(createCurator);
+        String curatorApiToken = UtilIT.getApiTokenFromResponse(createCurator);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(curatorApiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createAuthor = UtilIT.createRandomUser();
+        createAuthor.prettyPrint();
+        createAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String authorUsername = UtilIT.getUsernameFromResponse(createAuthor);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createAuthor);
+
+ 
+        Response grantAuthorAddDataset = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR.toString(), "@" + authorUsername, curatorApiToken);
+        grantAuthorAddDataset.prettyPrint();
+        grantAuthorAddDataset.then().assertThat()
+                .body("data.assignee", equalTo("@" + authorUsername))
+                .body("data._roleAlias", equalTo("dsContributor"))
+                .statusCode(OK.getStatusCode());
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        // FIXME: have the initial create return the DOI or Handle to obviate the need for this call.
+        Response getDatasetJsonBeforePublishing = UtilIT.nativeGet(datasetId, authorApiToken);
+        getDatasetJsonBeforePublishing.prettyPrint();
+        String protocol = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.protocol");
+        String authority = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.authority");
+        String identifier = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.identifier");
+
+        String datasetPersistentId = protocol + ":" + authority + "/" + identifier;
+        System.out.println("datasetPersistentId: " + datasetPersistentId);
+
+       String pathToJsonFile = "src/test/resources/json/update-dataset-version-with-files.json";
+
+        Response updateMetadataAddFilesViaNative = UtilIT.updateDatasetMetadataViaNative(datasetPersistentId, pathToJsonFile, authorApiToken);
+        updateMetadataAddFilesViaNative.prettyPrint();
+        updateMetadataAddFilesViaNative.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // These println's are here in case you want to log into the GUI to see what notifications look like.
+        System.out.println("Curator username/password: " + curatorUsername);
+        System.out.println("Author username/password: " + authorUsername);
+
+    }
+    
+    @Test
+    public void testLinkingDatasets() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createSuperUser = UtilIT.createRandomUser();
+        createSuperUser.prettyPrint();
+        createSuperUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperUser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperUser);
+        Response makeSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        makeSuperuser.prettyPrint();
+        makeSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createDataverse1 = UtilIT.createRandomDataverse(apiToken);
+        createDataverse1.prettyPrint();
+        createDataverse1.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverse1Alias = UtilIT.getAliasFromResponse(createDataverse1);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverse1Alias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        Response createDataverse2 = UtilIT.createRandomDataverse(apiToken);
+        createDataverse2.prettyPrint();
+        createDataverse2.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverse2Alias = UtilIT.getAliasFromResponse(createDataverse2);
+        Integer dataverse2Id = UtilIT.getDatasetIdFromResponse(createDataverse2);
+        String dataverse2Name = JsonPath.from(createDataverse2.asString()).getString("data.name");
+
+        UtilIT.publishDataverseViaNativeApi(dataverse1Alias, apiToken).then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Link dataset to second dataverse
+        // Should succeed even though dataset is not published
+        Response linkDataset = UtilIT.linkDataset(datasetPid, dataverse2Alias, superuserApiToken);
+        linkDataset.prettyPrint();
+        linkDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken).then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Linking again to the same dataverse should fail
+        linkDataset = UtilIT.linkDataset(datasetPid, dataverse2Alias, superuserApiToken);
+        linkDataset.prettyPrint();
+        linkDataset.then().assertThat()
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataset.link.not.already.linked")))
+                .statusCode(FORBIDDEN.getStatusCode());
+
+        // Link another to test the list of linked datasets
+        Response createDataverse3 = UtilIT.createRandomDataverse(apiToken);
+        createDataverse3.prettyPrint();
+        createDataverse3.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverse3Alias = UtilIT.getAliasFromResponse(createDataverse3);
+        Integer dataverse3Id = UtilIT.getDatasetIdFromResponse(createDataverse3);
+        linkDataset = UtilIT.linkDataset(datasetPid, dataverse3Alias, superuserApiToken);
+        linkDataset.prettyPrint();
+        linkDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        // get the list in Json format
+        Response linkDatasetsResponse = UtilIT.getDatasetLinks(datasetPid, superuserApiToken);
+        linkDatasetsResponse.prettyPrint();
+        linkDatasetsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        JsonObject linkDatasets = Json.createReader(new StringReader(linkDatasetsResponse.asString())).readObject();
+        JsonArray lst = linkDatasets.getJsonObject("data").getJsonArray("linked-dataverses");
+        List<Integer> ids = List.of(dataverse2Id, dataverse3Id);
+        List<Integer> uniqueids = new ArrayList<>();
+        assertEquals(ids.size(), lst.size());
+        for (int i = 0; i < lst.size(); i++) {
+            int id = lst.getJsonObject(i).getInt("id");
+            assertTrue(ids.contains(id));
+            assertFalse(uniqueids.contains(id));
+            uniqueids.add(id);
+        }
+
+//Experimental code for trying to trick test into thinking the dataset has been harvested
+/*
+createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverse1Alias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId2 = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid2 = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+        
+        linkDataset = UtilIT.linkDataset(datasetPid2, dataverse2Alias, superuserApiToken);
+        linkDataset.prettyPrint();
+        linkDataset.then().assertThat()
+                .body("message", equalTo( BundleUtil.getStringFromBundle("dataset.link.not.available")))
+                .statusCode(FORBIDDEN.getStatusCode());
+                EntityManager entityManager = entityManagerFactory.createEntityManager();
+        entityManager.getTransaction().begin();
+        // Do stuff...
+        entityManager.createNativeQuery("UPDATE dataset SET harvestingclient_id=1 WHERE id="+datasetId2).executeUpdate();
+        entityManager.getTransaction().commit();
+        entityManager.close();
+
+        
+        UtilIT.linkDataset(datasetId2.toString(), dataverse2Alias, superuserApiToken);
+        linkDataset.prettyPrint();
+        linkDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+         */
+    }
+
+    /**
+     * This tests the "DDI export" and verifies that variable metadata is included for an unrestricted file.
+     */
+    @Test
+    public void testUnrestrictedFileExportDdi() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String authorUsername = UtilIT.getUsernameFromResponse(createUser);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(authorApiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        Path pathToFile = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.csv");
+        String contentOfCsv = ""
+                + "name,pounds,species\n"
+                + "Marshall,40,dog\n"
+                + "Tiger,17,cat\n"
+                + "Panther,21,cat\n";
+        java.nio.file.Files.write(pathToFile, contentOfCsv.getBytes());
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile.toString(), authorApiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("data.csv"));
+
+        String fileId = JsonPath.from(uploadFile.body().asString()).getString("data.files[0].dataFile.id");
+
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", authorApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, authorApiToken);
+        publishDataverse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", authorApiToken);
+        publishDataset.then().assertThat().statusCode(OK.getStatusCode());
+
+        // We're testing export here, which is at dataset level.
+        // Guest/public version
+        Response exportByGuest = UtilIT.exportDataset(datasetPid, "ddi");
+        exportByGuest.prettyPrint();
+        exportByGuest.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("codeBook.fileDscr.fileTxt.fileName", equalTo("data.tab"))
+                .body("codeBook.fileDscr.fileTxt.dimensns.caseQnty", equalTo("3"))
+                .body("codeBook.fileDscr.fileTxt.dimensns.varQnty", equalTo("3"))
+                .body("codeBook.dataDscr", CoreMatchers.not(equalTo(null)))
+                .body("codeBook.dataDscr.var[0].@name", equalTo("name"))
+                .body("codeBook.dataDscr.var[1].@name", equalTo("pounds"))
+                // This is an example of a summary stat (max) that should be visible.
+                .body("codeBook.dataDscr.var[1].sumStat.find { it.@type == 'max' }", equalTo("40.0"))
+                .body("codeBook.dataDscr.var[2].@name", equalTo("species"));
+    }
+        
+    /**
+     * In this test we are restricting a file and testing "export DDI" at the
+     * dataset level as well as getting the DDI at the file level.
+     *
+     * Export at the dataset level is always the public version.
+     *
+     * At the file level, you can still get summary statistics (and friends,
+     * "dataDscr") if you have access to download the file. If you don't have
+     * access, you get an error.
+     */
+    @Test
+    public void testRestrictFileExportDdi() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String authorUsername = UtilIT.getUsernameFromResponse(createUser);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(authorApiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        Path pathToFile = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.csv");
+        String contentOfCsv = ""
+                + "name,pounds,species\n"
+                + "Marshall,40,dog\n"
+                + "Tiger,17,cat\n"
+                + "Panther,21,cat\n";
+        java.nio.file.Files.write(pathToFile, contentOfCsv.getBytes());
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile.toString(), authorApiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("data.csv"));
+
+        String fileId = JsonPath.from(uploadFile.body().asString()).getString("data.files[0].dataFile.id");
+
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", authorApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        Response restrictFile = UtilIT.restrictFile(fileId, true, authorApiToken);
+        restrictFile.prettyPrint();
+        restrictFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, authorApiToken);
+        publishDataverse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", authorApiToken);
+        publishDataset.then().assertThat().statusCode(OK.getStatusCode());
+
+        // We're testing export here, which is at dataset level.
+        // Guest/public version
+        Response exportByGuest = UtilIT.exportDataset(datasetPid, "ddi");
+        exportByGuest.prettyPrint();
+        exportByGuest.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("codeBook.fileDscr.fileTxt.fileName", equalTo("data.tab"));
+
+        // Here we are asserting that dataDscr is empty. TODO: Do this in REST Assured.
+        String dataDscrForGuest = XmlPath.from(exportByGuest.asString()).getString("codeBook.dataDscr");
+        assertEquals("", dataDscrForGuest);
+
+        // Author export (has access)
+        Response exportByAuthor = UtilIT.exportDataset(datasetPid, "ddi", authorApiToken);
+        exportByAuthor.prettyPrint();
+        exportByAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("codeBook.fileDscr.fileTxt.fileName", equalTo("data.tab"));
+
+        // Here we are asserting that dataDscr is empty. TODO: Do this in REST Assured.
+        String dataDscrForAuthor = XmlPath.from(exportByAuthor.asString()).getString("codeBook.dataDscr");
+        assertEquals("", dataDscrForAuthor);
+
+        // Now we are testing file-level retrieval.
+        // The author has access to a restricted file and gets all the metadata.
+        Response fileMetadataDdiAuthor = UtilIT.getFileMetadata(fileId, "ddi", authorApiToken);
+        fileMetadataDdiAuthor.prettyPrint();
+        fileMetadataDdiAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("codeBook.fileDscr.fileTxt.fileName", equalTo("data.tab"))
+                //                .body("codeBook", containsString("dataDscr"))
+                // The names of all these variables (name, pounds, species) should be visible.
+                .body("codeBook.dataDscr", CoreMatchers.not(equalTo(null)))
+                //                .body("codeBook.dataDscr", equalTo(null))
+                .body("codeBook.dataDscr.var[0].@name", equalTo("name"))
+                .body("codeBook.dataDscr.var[1].@name", equalTo("pounds"))
+                // This is an example of a summary stat (max) that should be visible.
+                .body("codeBook.dataDscr.var[1].sumStat.find { it.@type == 'max' }", equalTo("40.0"))
+                .body("codeBook.dataDscr.var[2].@name", equalTo("species"));
+
+        Response createUserNoAuth = UtilIT.createRandomUser();
+        createUserNoAuth.prettyPrint();
+        String usernameNoAuth = UtilIT.getUsernameFromResponse(createUserNoAuth);
+        String apiTokenNoAuth = UtilIT.getApiTokenFromResponse(createUserNoAuth);
+
+        // Users with no access to the restricted file are blocked.
+        Response fileMetadataDdiUserNoAuth = UtilIT.getFileMetadata(fileId, "ddi", apiTokenNoAuth);
+        fileMetadataDdiUserNoAuth.prettyPrint();
+        fileMetadataDdiUserNoAuth.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("You do not have permission to download this file."));
+
+        // Guest users (not logged in) are also blocked.
+        Response fileMetadataDdiGuest = UtilIT.getFileMetadata(fileId, "ddi");
+        fileMetadataDdiGuest.prettyPrint();
+        fileMetadataDdiGuest.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("You do not have permission to download this file."));
+    }
+
+    @Test
+    public void testSemanticMetadataAPIs() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Create a dataset using native api
+        // (this test requires that we create a dataset without the license set; note the extra boolean arg.:)
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken, true);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        // Get the metadata with the semantic api
+        Response response = UtilIT.getDatasetJsonLDMetadata(datasetId, apiToken);
+        response.then().assertThat().statusCode(OK.getStatusCode());
+        // Compare the metadata with an expected value - the metadatablock entries
+        // should be the same but there will be additional fields with values related to
+        // the dataset's creation (e.g. new id)
+        String jsonLDString = getData(response.getBody().asString());
+        JsonObject jo = null;
+        try {
+            jo = JSONLDUtil.decontextualizeJsonLD(jsonLDString);
+        } catch (NoSuchMethodError e) {
+            logger.info(ExceptionUtils.getStackTrace(e));
+        }
+        
+
+        String expectedJsonLD = UtilIT.getDatasetJson("scripts/search/tests/data/dataset-finch1.jsonld");
+        jo = Json.createObjectBuilder(jo).remove("@id").remove("http://schema.org/dateModified").build();
+        String jsonLD = jo.toString();
+
+        // ToDo: Are the static pars as expected
+        JSONAssert.assertEquals(expectedJsonLD, jsonLD, false);
+        // Now change the title
+        response = UtilIT.updateDatasetJsonLDMetadata(datasetId, apiToken,
+                "{\"title\": \"New Title\", \"@context\":{\"title\": \"http://purl.org/dc/terms/title\"}}", true);
+        response.then().assertThat().statusCode(OK.getStatusCode());
+
+        response = UtilIT.getDatasetJsonLDMetadata(datasetId, apiToken);
+        response.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Check that the semantic api returns the new title
+        jsonLDString = getData(response.getBody().asString());
+        JsonObject jsonLDObject = JSONLDUtil.decontextualizeJsonLD(jsonLDString);
+        assertEquals("New Title", jsonLDObject.getString("http://purl.org/dc/terms/title"));
+
+        // Add an additional description (which is multi-valued and compound)
+        // Also add new terms of use (single value so would fail with replace false if a
+        // value existed)
+        String newDescription = "{\"citation:dsDescription\": {\"citation:dsDescriptionValue\": \"New description\"}, \"https://dataverse.org/schema/core#termsOfUse\": \"New terms\", \"@context\":{\"citation\": \"https://dataverse.org/schema/citation/\"}}";
+        response = UtilIT.updateDatasetJsonLDMetadata(datasetId, apiToken, newDescription, false);
+        response.then().assertThat().statusCode(OK.getStatusCode());
+
+        response = UtilIT.getDatasetJsonLDMetadata(datasetId, apiToken);
+        response.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Look for a second description
+        jsonLDString = getData(response.getBody().asString());
+        jsonLDObject = JSONLDUtil.decontextualizeJsonLD(jsonLDString);
+        assertEquals("New description",
+                ((JsonObject) jsonLDObject.getJsonArray("https://dataverse.org/schema/citation/dsDescription").get(1))
+                        .getString("https://dataverse.org/schema/citation/dsDescriptionValue"));
+
+        // Can't add terms of use with replace=false and a value already set (single
+        // valued field)
+        String badTerms = "{\"https://dataverse.org/schema/core#termsOfUse\": \"Bad terms\"}}";
+        response = UtilIT.updateDatasetJsonLDMetadata(datasetId, apiToken, badTerms, false);
+        response.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+
+        
+        //We publish the dataset and dataverse      
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());    
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+        
+        //We check the version is published
+        response = UtilIT.getDatasetJsonLDMetadata(datasetId, apiToken);
+        response.prettyPrint();
+        jsonLDString = getData(response.getBody().asString());
+        jsonLDObject = JSONLDUtil.decontextualizeJsonLD(jsonLDString);
+        String publishedVersion = jsonLDObject.getString("http://schema.org/version");
+        assertNotEquals("DRAFT", publishedVersion);
+
+        // Upload a file so a draft version is created
+        String pathToFile = "src/main/webapp/resources/images/cc0.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadResponse.prettyPrint();
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+        int fileID = uploadResponse.jsonPath().getInt("data.files[0].dataFile.id");
+        
+        //We check the authenticated user gets DRAFT
+        response = UtilIT.getDatasetJsonLDMetadata(datasetId, apiToken);
+        response.prettyPrint(); 
+        jsonLDString = getData(response.getBody().asString());
+        jsonLDObject = JSONLDUtil.decontextualizeJsonLD(jsonLDString);
+        assertEquals("DRAFT", jsonLDObject.getString("http://schema.org/version"));
+        
+        // Create user with no permission and check they get published version
+        String apiTokenNoPerms = UtilIT.createRandomUserGetToken();
+        response = UtilIT.getDatasetJsonLDMetadata(datasetId, apiTokenNoPerms);
+        response.prettyPrint();
+        jsonLDString = getData(response.getBody().asString());
+        jsonLDObject = JSONLDUtil.decontextualizeJsonLD(jsonLDString);
+        assertNotEquals("DRAFT", jsonLDObject.getString("http://schema.org/version"));
+        
+        // Delete the file
+        Response deleteFileResponse = UtilIT.deleteFileInDataset(fileID, apiToken);
+        deleteFileResponse.prettyPrint();
+        deleteFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Delete the terms of use
+        response = UtilIT.deleteDatasetJsonLDMetadata(datasetId, apiToken,
+                "{\"https://dataverse.org/schema/core#termsOfUse\": \"New terms\"}");
+        response.then().assertThat().statusCode(OK.getStatusCode());
+
+        response = UtilIT.getDatasetJsonLDMetadata(datasetId, apiToken);
+        response.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Verify that they're gone
+        jsonLDString = getData(response.getBody().asString());
+        jsonLDObject = JSONLDUtil.decontextualizeJsonLD(jsonLDString);
+        assertTrue(!jsonLDObject.containsKey("https://dataverse.org/schema/core#termsOfUse"));
+
+        //Delete the DRAFT dataset
+        Response deleteDraftResponse = UtilIT.deleteDatasetVersionViaNativeApi(datasetId, DS_VERSION_DRAFT, apiToken);
+        deleteDraftResponse.prettyPrint();
+        deleteDraftResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        //We set the user as superuser so we can delete the published dataset
+        Response superUserResponse = UtilIT.makeSuperUser(username);
+        superUserResponse.prettyPrint();
+        deleteDraftResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        //Delete the published dataset
+        Response deletePublishedResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
+        deletePublishedResponse.prettyPrint();
+        deleteDraftResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        //Delete the dataverse
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteDataverseResponse.prettyPrint();
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        //Delete the user
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
+
+    }
+    
+    @Test
+    public void testReCreateDataset() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Create a dataset using native API
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        // Get the semantic metadata
+        Response response = UtilIT.getDatasetJsonLDMetadata(datasetId, apiToken);
+        response.then().assertThat().statusCode(OK.getStatusCode());
+        response.prettyPeek();
+        String expectedString = getData(response.getBody().asString());
+        
+        // Delete the dataset via native API
+        Response deleteDatasetResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
+        deleteDatasetResponse.prettyPrint();
+        assertEquals(200, deleteDatasetResponse.getStatusCode());
+
+        
+        logger.info("SENDING to reCreate Dataset: " + expectedString);
+        // Now use the migrate API to recreate the dataset
+        // Now use the migrate API to recreate the dataset
+        response = UtilIT.recreateDatasetJsonLD(apiToken, dataverseAlias, expectedString);
+        response.prettyPeek();
+        String body = response.getBody().asString();
+        response.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        try (StringReader rdr = new StringReader(body)) {
+            datasetId = Json.createReader(rdr).readObject().getJsonObject("data").getInt("id");
+        }
+        // Get the jsonLD metadata for what we recreated
+        response = UtilIT.getDatasetJsonLDMetadata(datasetId, apiToken);
+        response.then().assertThat().statusCode(OK.getStatusCode());
+
+        String jsonLDString = getData(response.getBody().asString());
+        JsonObject jsonLD = JSONLDUtil.decontextualizeJsonLD(jsonLDString);
+
+        JsonObject expectedJsonLD = JSONLDUtil.decontextualizeJsonLD(expectedString);
+        expectedJsonLD = Json.createObjectBuilder(expectedJsonLD).remove("@id").remove("http://schema.org/dateModified")
+                .build();
+        // ToDo: Assert that the semantic api response is the same (everything in the
+        // expected version is in the new one - deleting the @id and dateModified means
+        // those won't be compared (with last param = false)
+        JSONAssert.assertEquals(expectedJsonLD.toString(), jsonLD.toString(), false);
+
+        // Now cleanup
+        deleteDatasetResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
+        deleteDatasetResponse.prettyPrint();
+        assertEquals(200, deleteDatasetResponse.getStatusCode());
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteDataverseResponse.prettyPrint();
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
+    }
+
+    @Test
+    public void testCurationStatusAPIs() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response setCurationLabelSets = UtilIT.setSetting(SettingsServiceBean.Key.AllowedCurationLabels, "{\"StandardProcess\":[\"Author contacted\", \"Privacy Review\", \"Awaiting paper publication\", \"Final Approval\"],\"AlternateProcess\":[\"State 1\",\"State 2\",\"State 3\"]}");
+        setCurationLabelSets.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        
+        //Set curation label set on dataverse
+        //Valid option, bad user
+        Response setDataverseCurationLabelSetResponse = UtilIT.setDataverseCurationLabelSet(dataverseAlias, apiToken, "AlternateProcess");
+        setDataverseCurationLabelSetResponse.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+        
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+
+        //Non-existent option
+        Response setDataverseCurationLabelSetResponse2 = UtilIT.setDataverseCurationLabelSet(dataverseAlias, apiToken, "OddProcess");
+        setDataverseCurationLabelSetResponse2.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+        //Valid option, superuser
+        Response setDataverseCurationLabelSetResponse3 = UtilIT.setDataverseCurationLabelSet(dataverseAlias, apiToken, "AlternateProcess");
+        setDataverseCurationLabelSetResponse3.then().assertThat().statusCode(OK.getStatusCode());
+
+        
+        // Create a dataset using native api
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        // Get the curation label set in use
+        Response response = UtilIT.getDatasetCurationLabelSet(datasetId, apiToken);
+        response.then().assertThat().statusCode(OK.getStatusCode());
+        //Verify that the set name is what was set on the dataverse
+        String labelSetName = getData(response.getBody().asString());
+        // full should be {"message":"AlternateProcess"}
+        assertTrue(labelSetName.contains("AlternateProcess"));
+    
+        // Set curation statuses and verify history
+        Response setStatus1 = UtilIT.setDatasetCurationLabel(datasetId, apiToken, "State 1");
+        setStatus1.then().assertThat().statusCode(OK.getStatusCode());
+    
+        Response setStatus2 = UtilIT.setDatasetCurationLabel(datasetId, apiToken, "State 2");
+        setStatus2.then().assertThat().statusCode(OK.getStatusCode());
+    
+        Response setStatus3 = UtilIT.setDatasetCurationLabel(datasetId, apiToken, "State 3");
+        setStatus3.then().assertThat().statusCode(OK.getStatusCode());
+    
+        // Get curation status with history
+        Response getStatusWithHistory = UtilIT.getDatasetCurationStatus(datasetId, apiToken, true);
+        getStatusWithHistory.then().assertThat().statusCode(OK.getStatusCode());
+        JsonArray history = getDataAsJsonArray(getStatusWithHistory.body().asString());
+    
+        // Verify history
+        assertEquals(3, history.size());
+        assertEquals("State 3", history.getJsonObject(0).getString("label"));
+        assertEquals("State 2", history.getJsonObject(1).getString("label"));
+        assertEquals("State 1", history.getJsonObject(2).getString("label"));
+    
+        // Reset status to null
+        Response resetStatus = UtilIT.deleteDatasetCurationLabel(datasetId, apiToken);
+        resetStatus.then().assertThat().statusCode(OK.getStatusCode());
+    
+        // Verify null status
+        Response getStatusAfterReset = UtilIT.getDatasetCurationStatus(datasetId, apiToken, false);
+        getStatusAfterReset.then().assertThat().statusCode(OK.getStatusCode());
+    
+        JsonObject statusAfterReset = Json.createReader(new StringReader(getStatusAfterReset.body().asString())).readObject();
+        assertFalse(statusAfterReset.containsKey("label"));
+    
+        // Attempt to set invalid status
+        Response setInvalidStatus = UtilIT.setDatasetCurationLabel(datasetId, apiToken, "Invalid Status");
+        setInvalidStatus.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+    
+        // Clean up
+        Response deleteDatasetResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
+        assertEquals(200, deleteDatasetResponse.getStatusCode());
+    
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+    
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        assertEquals(200, deleteUserResponse.getStatusCode());
+    }
+
+    private JsonArray getDataAsJsonArray(String body) {
+        try (StringReader rdr = new StringReader(body)) {
+            return Json.createReader(rdr).readObject().getJsonArray("data");
+        }
+    }
+    
+    private JsonObject getDataAsJsonObject(String body) {
+        try (StringReader rdr = new StringReader(body)) {
+            return Json.createReader(rdr).readObject().getJsonObject("data");
+        }
+    }
+    private String getData(String body) {
+            return getDataAsJsonObject(body).toString();
+    }
+
+    @Test
+    public void testFilesUnchangedAfterDatasetMetadataUpdate() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+        Integer datasetId = JsonPath.from(createDataset.asString()).getInt("data.id");
+
+        Path pathtoScript = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "run.sh");
+        java.nio.file.Files.write(pathtoScript, "#!/bin/bash\necho hello".getBytes());
+
+        JsonObjectBuilder json1 = Json.createObjectBuilder()
+                .add("description", "A script to reproduce results.")
+                .add("directoryLabel", "code");
+
+        Response uploadReadme1 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoScript.toString(), json1.build(), apiToken);
+        uploadReadme1.prettyPrint();
+        uploadReadme1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("run.sh"))
+                .body("data.files[0].directoryLabel", equalTo("code"));
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getDatasetJsonBeforeUpdate = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJsonBeforeUpdate.prettyPrint();
+        getDatasetJsonBeforeUpdate.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.files[0].label", equalTo("run.sh"))
+                .body("data.latestVersion.files[0].directoryLabel", equalTo("code"));
+        
+        String pathToJsonFile = "doc/sphinx-guides/source/_static/api/dataset-update-metadata.json";
+        Response updateTitle = UtilIT.updateDatasetMetadataViaNative(datasetPid, pathToJsonFile, apiToken);
+        updateTitle.prettyPrint();
+        updateTitle.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        Response getDatasetJsonAfterUpdate = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJsonAfterUpdate.prettyPrint();
+        getDatasetJsonAfterUpdate.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.files[0].label", equalTo("run.sh"))
+                .body("data.latestVersion.files[0].directoryLabel", equalTo("code"));
+        
+    }
+
+
+    
+    @Test
+    public void testCuratePublishedDatasetVersionCommand() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        
+        
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+        Integer datasetId = JsonPath.from(createDataset.asString()).getInt("data.id");
+
+        Path pathtoScript = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "run.sh");
+        java.nio.file.Files.write(pathtoScript, "#!/bin/bash\necho hello".getBytes());
+
+        JsonObjectBuilder json1 = Json.createObjectBuilder()
+                .add("description", "A script to reproduce results.")
+                .add("directoryLabel", "code");
+
+        
+        
+
+        String pathToFileThatGoesThroughIngest = "src/test/resources/sav/dct.sav";
+        Response uploadIngestableFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFileThatGoesThroughIngest, apiToken);
+        uploadIngestableFile.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        uploadIngestableFile.prettyPrint();
+
+        String origFileId = JsonPath.from(uploadIngestableFile.body().asString()).getString("data.files[0].dataFile.id");
+
+        System.out.println("Orig file id " + origFileId);
+
+        logger.fine("Orig file id: " + origFileId);
+        assertNotNull(origFileId);
+        assertNotEquals("",origFileId);
+
+        // Give file time to ingest
+        
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFileThatGoesThroughIngest);
+        
+        Response origXml = UtilIT.getFileMetadata(origFileId, null, apiToken);
+        assertEquals(200, origXml.getStatusCode());
+
+
+        String stringOrigXml = origXml.getBody().prettyPrint();
+
+        InputStream variableData = origXml.body().asInputStream();
+
+        Map<Long, VariableMetadata> mapVarToVarMet = new HashMap<Long, VariableMetadata>();
+        Map<Long,VarGroup> varGroupMap = new HashMap<Long, VarGroup>();
+        try {
+            XMLInputFactory factory = XmlUtil.getSecureXMLInputFactory();
+            XMLStreamReader xmlr = factory.createXMLStreamReader(variableData);
+            VariableMetadataDDIParser vmdp = new VariableMetadataDDIParser();
+
+            vmdp.processDataDscr(xmlr, mapVarToVarMet, varGroupMap);
+
+        } catch (XMLStreamException e) {
+            logger.warning(e.getMessage());
+            assertEquals(0,1);
+        }
+
+
+        //Test here
+        String updatedContent = "";
+        try {
+            updatedContent = new String(Files.readAllBytes(Paths.get("src/test/resources/xml/dct.xml")));
+        } catch (IOException e) {
+            logger.warning(e.getMessage());
+            assertEquals(0,1);
+        }
+        Long replV1168 = 0L;
+        Long replV1169 = 0L;
+        Long replV1170 = 0L;
+        int numberVariables = 0;
+        for (VariableMetadata var : mapVarToVarMet.values()) {
+            if (var.getLabel().equals("gender")) {
+                replV1170 = var.getDataVariable().getId();
+                numberVariables = numberVariables +1;
+            } else if (var.getLabel().equals("weight")) {
+                replV1168 = var.getDataVariable().getId();
+                numberVariables = numberVariables +1;
+            } else if (var.getLabel().equals("age_rollup")) {
+                replV1169 = var.getDataVariable().getId();
+                numberVariables = numberVariables +1;
+            }
+        }
+        assertEquals(3, numberVariables);
+
+        updatedContent = updatedContent.replaceAll("v1168", "v" + replV1168 );
+        updatedContent = updatedContent.replaceAll("v1169", "v" + replV1169 );
+        updatedContent = updatedContent.replaceAll("v1170", "v" + replV1170 );
+
+        //edit draft vesrsion
+        Response editDDIResponse = UtilIT.editDDI(updatedContent, origFileId, apiToken);
+
+        editDDIResponse.prettyPrint();
+        assertEquals(200, editDDIResponse.getStatusCode());
+
+
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getDatasetJsonBeforeUpdate = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJsonBeforeUpdate.prettyPrint();
+        getDatasetJsonBeforeUpdate.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.files[0].label", equalTo("dct.tab"));
+        
+        String pathToJsonFile = "doc/sphinx-guides/source/_static/api/dataset-update-metadata.json";
+        Response updateTitle = UtilIT.updateDatasetMetadataViaNative(datasetPid, pathToJsonFile, apiToken);
+        updateTitle.prettyPrint();
+        updateTitle.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        // shouldn't be able to update current unless you're a super user
+
+        UtilIT.publishDatasetViaNativeApi(datasetId, "updatecurrent", apiToken).then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+        
+        Response makeSuperUser = UtilIT.setSuperuserStatus(username, true);
+                
+        //should work after making super user
+        
+        UtilIT.publishDatasetViaNativeApi(datasetId, "updatecurrent", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+        
+        //Check that the dataset contains the updated metadata (which includes the name Spruce)
+        Response getDatasetJsonAfterUpdate = UtilIT.nativeGet(datasetId, apiToken);
+        assertTrue(getDatasetJsonAfterUpdate.prettyPrint().contains("Spruce"));
+        getDatasetJsonAfterUpdate.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        //Check that the draft version is gone
+        Response getDraft1 = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiToken);
+        getDraft1.then().assertThat()
+        .statusCode(NOT_FOUND.getStatusCode());
+
+        
+        //Also test a terms change
+        String jsonLDTerms = "{\"https://dataverse.org/schema/core#fileTermsOfAccess\":{\"https://dataverse.org/schema/core#dataAccessPlace\":\"Somewhere\"}}";
+        Response updateTerms = UtilIT.updateDatasetJsonLDMetadata(datasetId, apiToken, jsonLDTerms, true);
+        updateTerms.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        //Run Update-Current Version again
+        
+        UtilIT.publishDatasetViaNativeApi(datasetId, "updatecurrent", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        
+        //Verify the new term is there
+        Response jsonLDResponse = UtilIT.getDatasetJsonLDMetadata(datasetId, apiToken);
+        assertTrue(jsonLDResponse.prettyPrint().contains("Somewhere"));
+        jsonLDResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        //And that the draft is gone
+        Response getDraft2 = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiToken);
+        getDraft2.then().assertThat()
+        .statusCode(NOT_FOUND.getStatusCode());
+       
+        
+    }
+    
+    /**
+     * In this test we are restricting a file and testing that terms of accees
+     * or request access is required
+     *
+     * Export at the dataset level is always the public version.
+     *
+     */
+    @Test
+    public void testRestrictFileTermsOfUseAndAccess() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String authorUsername = UtilIT.getUsernameFromResponse(createUser);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(authorApiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        Path pathToFile = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.csv");
+        String contentOfCsv = ""
+                + "name,pounds,species\n"
+                + "Marshall,40,dog\n"
+                + "Tiger,17,cat\n"
+                + "Panther,21,cat\n";
+        java.nio.file.Files.write(pathToFile, contentOfCsv.getBytes());
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile.toString(), authorApiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("data.csv"));
+
+        String fileId = JsonPath.from(uploadFile.body().asString()).getString("data.files[0].dataFile.id");
+
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", authorApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        Response restrictFile = UtilIT.restrictFile(fileId, true, authorApiToken);
+        restrictFile.prettyPrint();
+        restrictFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, authorApiToken);
+        publishDataverse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", authorApiToken);
+        publishDataset.then().assertThat().statusCode(OK.getStatusCode());
+        
+        
+        //not allowed to remove request access if there are retricted files
+        
+        Response disallowRequestAccess = UtilIT.allowAccessRequests(datasetPid, false, authorApiToken);
+        disallowRequestAccess.prettyPrint();
+        disallowRequestAccess.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+        
+    }
+    
+    /**
+     * In this test we are removing request access and showing that
+     * files cannot be restricted
+     * Not testing legacy datasets that are out of compliance 
+     * cannot be published or upload files 
+     * or have metadata updated -
+     */
+    @Test
+    public void testRestrictFilesWORequestAccess() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String authorUsername = UtilIT.getUsernameFromResponse(createUser);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(authorApiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+        
+        //should be allowed to remove Request access before restricting file
+        Response disallowRequestAccess = UtilIT.allowAccessRequests(datasetPid, false, authorApiToken);
+        disallowRequestAccess.prettyPrint();
+        disallowRequestAccess.then().assertThat().statusCode(OK.getStatusCode());
+
+        Path pathToFile = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.csv");
+        String contentOfCsv = ""
+                + "name,pounds,species\n"
+                + "Marshall,40,dog\n"
+                + "Tiger,17,cat\n"
+                + "Panther,21,cat\n";
+        java.nio.file.Files.write(pathToFile, contentOfCsv.getBytes());
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile.toString(), authorApiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("data.csv"));
+
+        String fileId = JsonPath.from(uploadFile.body().asString()).getString("data.files[0].dataFile.id");
+
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", authorApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        Response restrictFile = UtilIT.restrictFile(fileId, true, authorApiToken);
+        restrictFile.prettyPrint();
+        //shouldn't be able to restrict a file
+        restrictFile.then().assertThat().statusCode(CONFLICT.getStatusCode());
+        
+        // OK, let's delete this dataset as well, and then delete the dataverse...
+        
+        Response deleteDatasetResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, authorApiToken);
+        deleteDatasetResponse.prettyPrint();
+        assertEquals(200, deleteDatasetResponse.getStatusCode());
+        
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, authorApiToken);
+        deleteDataverseResponse.prettyPrint();
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(authorUsername);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
+
+    }
+
+    /**
+     * In this test we do CRUD of archivalStatus (Note this and other archiving
+     * related tests are part of
+     * https://github.com/harvard-lts/hdc-integration-tests)
+     *
+     * This test requires the root dataverse to be published to pass.
+     */
+    @Test
+    public void testArchivalStatusAPI() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        assertEquals(200, createUser.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+
+        Response createNoAccessUser = UtilIT.createRandomUser();
+        createNoAccessUser.prettyPrint();
+        String apiTokenNoAccess = UtilIT.getApiTokenFromResponse(createNoAccessUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        Response getDatasetJsonBeforePublishing = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJsonBeforePublishing.prettyPrint();
+        String protocol = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.protocol");
+        String authority = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString())
+                .getString("data.authority");
+        String identifier = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString())
+                .getString("data.identifier");
+        String datasetPersistentId = protocol + ":" + authority + "/" + identifier;
+
+        Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        assertEquals(200, publishDataverse.getStatusCode());
+
+        logger.info("Attempting to publish a major version");
+        // Return random sleep 9/13/2019
+        // Without it we've seen some DB deadlocks
+        // 3 second sleep, to allow the indexing to finish:
+
+        try {
+            Thread.sleep(3000l);
+        } catch (InterruptedException iex) {
+        }
+
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken);
+        assertEquals(200, publishDataset.getStatusCode());
+
+        String pathToJsonFileSingle = "doc/sphinx-guides/source/_static/api/dataset-simple-update-metadata.json";
+        Response addSubjectSingleViaNative = UtilIT.updateFieldLevelDatasetMetadataViaNative(datasetPersistentId, pathToJsonFileSingle, apiToken);
+        addSubjectSingleViaNative.prettyPrint();
+        addSubjectSingleViaNative.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        
+        // Now change the title
+//        Response response = UtilIT.updateDatasetJsonLDMetadata(datasetId, apiToken,
+//                "{\"title\": \"New Title\", \"@context\":{\"title\": \"http://purl.org/dc/terms/title\"}}", true);
+//        response.then().assertThat().statusCode(OK.getStatusCode());
+
+        int status = Status.CONFLICT.getStatusCode();
+        while (status == Status.CONFLICT.getStatusCode()) {
+
+            Response publishV2 = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken);
+            status = publishV2.thenReturn().statusCode();
+        }
+        assertEquals(OK.getStatusCode(), status);
+
+        if (!UtilIT.sleepForReindex(datasetPersistentId, apiToken, 3)) {
+            logger.info("Still indexing after 3 seconds");
+        }
+
+        //Verify the status is empty
+        Response nullStatus = UtilIT.getDatasetVersionArchivalStatus(datasetId, "1.0", apiToken);
+        nullStatus.prettyPrint();
+        nullStatus.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        //Set it
+        Response setStatus = UtilIT.setDatasetVersionArchivalStatus(datasetId, "1.0", apiToken, "pending",
+                "almost there");
+        setStatus.then().assertThat().statusCode(OK.getStatusCode());
+
+        //Get it
+        Response getStatus = UtilIT.getDatasetVersionArchivalStatus(datasetId, "1.0", apiToken);
+        getStatus.then().assertThat().body("data.status", equalTo("pending")).body("data.message",
+                equalTo("almost there"));
+
+        //Delete it
+        Response deleteStatus = UtilIT.deleteDatasetVersionArchivalStatus(datasetId, "1.0", apiToken);
+        deleteStatus.then().assertThat().statusCode(OK.getStatusCode());
+
+        //Make sure it's gone
+        Response nullStatus2 = UtilIT.getDatasetVersionArchivalStatus(datasetId, "1.0", apiToken);
+        nullStatus2.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+    }
+
+    @Test
+    public void testGetDatasetSummaryFieldNames() {
+        Response summaryFieldNamesResponse = UtilIT.getDatasetSummaryFieldNames();
+        summaryFieldNamesResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // check for any order
+                .body("data", hasItems("dsDescription", "subject", "keyword", "publication", "notesText"))
+                // check for exact order
+                .body("data", contains("dsDescription", "subject", "keyword", "publication", "notesText"));
+    }
+
+    @Test
+    public void getPrivateUrlDatasetVersion() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Non-anonymized test
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        UtilIT.privateUrlCreate(datasetId, apiToken, false).then().assertThat().statusCode(OK.getStatusCode());
+        Response privateUrlGet = UtilIT.privateUrlGet(datasetId, apiToken);
+        privateUrlGet.then().assertThat().statusCode(OK.getStatusCode());
+        String tokenForPrivateUrlUser = JsonPath.from(privateUrlGet.body().asString()).getString("data.token");
+
+        // We verify that the response contains the dataset associated to the private URL token
+        Response getPrivateUrlDatasetVersionResponse = UtilIT.getPrivateUrlDatasetVersion(tokenForPrivateUrlUser);
+        getPrivateUrlDatasetVersionResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.datasetId", equalTo(datasetId));
+
+        // Test anonymized
+        Response setAnonymizedFieldsSettingResponse = UtilIT.setSetting(SettingsServiceBean.Key.AnonymizedFieldTypeNames, "author");
+        setAnonymizedFieldsSettingResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        UtilIT.privateUrlCreate(datasetId, apiToken, true).then().assertThat().statusCode(OK.getStatusCode());
+        privateUrlGet = UtilIT.privateUrlGet(datasetId, apiToken);
+        privateUrlGet.then().assertThat().statusCode(OK.getStatusCode());
+        tokenForPrivateUrlUser = JsonPath.from(privateUrlGet.body().asString()).getString("data.token");
+
+        Response getPrivateUrlDatasetVersionAnonymizedResponse = UtilIT.getPrivateUrlDatasetVersion(tokenForPrivateUrlUser);
+        getPrivateUrlDatasetVersionAnonymizedResponse.prettyPrint();
+
+        // We verify that the response is anonymized for the author field
+        getPrivateUrlDatasetVersionAnonymizedResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.datasetId", equalTo(datasetId))
+                .body("data.metadataBlocks.citation.fields[1].value", equalTo(BundleUtil.getStringFromBundle("dataset.anonymized.withheld")))
+                .body("data.metadataBlocks.citation.fields[1].typeClass", equalTo("primitive"))
+                .body("data.metadataBlocks.citation.fields[1].multiple", equalTo(false));
+
+        // Similar to the check above but doesn't rely on fields[1]
+        List<JsonObject> authors = with(getPrivateUrlDatasetVersionAnonymizedResponse.body().asString()).param("fieldToFind", "author")
+                .getJsonObject("data.metadataBlocks.citation.fields.findAll { fields -> fields.typeName == fieldToFind }");
+        Map firstAuthor = authors.get(0);
+        String value = (String) firstAuthor.get("value");
+        assertEquals(BundleUtil.getStringFromBundle("dataset.anonymized.withheld"), value);
+
+        UtilIT.deleteSetting(SettingsServiceBean.Key.AnonymizedFieldTypeNames);
+
+        // Test invalid token
+        getPrivateUrlDatasetVersionAnonymizedResponse = UtilIT.getPrivateUrlDatasetVersion("invalidToken");
+        getPrivateUrlDatasetVersionAnonymizedResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    public void getPrivateUrlDatasetVersionCitation() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        UtilIT.privateUrlCreate(datasetId, apiToken, false).then().assertThat().statusCode(OK.getStatusCode());
+        Response privateUrlGet = UtilIT.privateUrlGet(datasetId, apiToken);
+        String tokenForPrivateUrlUser = JsonPath.from(privateUrlGet.body().asString()).getString("data.token");
+
+        Response getPrivateUrlDatasetVersionCitation = UtilIT.getPrivateUrlDatasetVersionCitation(tokenForPrivateUrlUser);
+        getPrivateUrlDatasetVersionCitation.prettyPrint();
+
+        getPrivateUrlDatasetVersionCitation.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // We check that the returned message contains information expected for the citation string
+                .body("data.message", containsString("DRAFT VERSION"));
+    }
+
+    @Test
+    public void getDatasetVersionCitation() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        Response getDatasetVersionCitationResponse = UtilIT.getDatasetVersionCitation(datasetId, DS_VERSION_DRAFT, false, apiToken);
+        getDatasetVersionCitationResponse.prettyPrint();
+
+        getDatasetVersionCitationResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // We check that the returned message contains information expected for the citation string
+                .body("data.message", containsString("DRAFT VERSION"));
+
+        // Test Deaccessioned
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionDatasetResponse.prettyPrint();
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .assertThat().body("data.message", containsString(String.valueOf(datasetId)));
+
+        // includeDeaccessioned false
+        Response getDatasetVersionCitationNotDeaccessioned = UtilIT.getDatasetVersionCitation(datasetId, DS_VERSION_LATEST_PUBLISHED, false, apiToken);
+        getDatasetVersionCitationNotDeaccessioned.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // includeDeaccessioned true
+        Response getDatasetVersionCitationDeaccessioned =  UtilIT.getDatasetVersionCitation(datasetId, DS_VERSION_LATEST_PUBLISHED, true, apiToken);
+        getDatasetVersionCitationDeaccessioned.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", containsString("DEACCESSIONED VERSION"));
+
+        publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.prettyPrint();
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        String persistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+
+        deaccessionDatasetResponse = UtilIT.deaccessionDataset(persistentId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionDatasetResponse.prettyPrint();
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .assertThat().body("data.message", containsString(String.valueOf(persistentId)));
+    }
+
+    @Test
+    public void testCitationDate() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.then().assertThat().statusCode(CREATED.getStatusCode());
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.getBody().asString()).getString("data.persistentId");
+        String pidIdentifierOnly = datasetPid.substring(datasetPid.length() - 6);
+
+        Path pathToAddDateOfDepositJson = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "dateOfDeposit.json");
+        String dateOfDeposit = """
+{
+  "fields": [
+    {
+      "typeName": "dateOfDeposit",
+      "value": "1999-12-31"
+    }
+  ]
+}
+""";
+        java.nio.file.Files.write(pathToAddDateOfDepositJson, dateOfDeposit.getBytes());
+
+        Response addDateOfDeposit = UtilIT.addDatasetMetadataViaNative(datasetPid, pathToAddDateOfDepositJson.toString(), apiToken);
+        addDateOfDeposit.prettyPrint();
+        addDateOfDeposit.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.metadataBlocks.citation.fields[5].value", equalTo("1999-12-31"));
+
+        Response setCitationDate = UtilIT.setDatasetCitationDateField(datasetPid, "dateOfDeposit", apiToken);
+        setCitationDate.prettyPrint();
+        setCitationDate.then().assertThat().statusCode(OK.getStatusCode());
+
+        String today = LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE);
+        String currentYear = Year.now().getValue() + "";
+
+        Response getExportFormats = UtilIT.getExportFormats();
+        getExportFormats.prettyPrint();
+        getExportFormats.then().assertThat().statusCode(OK.getStatusCode());
+
+        // It would be nice to be able to use .getJsonObject(). See https://github.com/rest-assured/rest-assured/pull/1257
+        Map<String, Object> exporters = JsonPath.from(getExportFormats.body().asString()).getMap("data");
+
+        if (exporters.containsKey("croissant")) {
+            Response exportDraftCroissant = UtilIT.exportDataset(datasetPid, "croissant", false, DS_VERSION_DRAFT, apiToken);
+            exportDraftCroissant.prettyPrint();
+            exportDraftCroissant.then().assertThat()
+                    .statusCode(OK.getStatusCode())
+                    .body("version", equalTo("DRAFT"));
+        }
+
+        Response exportDraftDatacite = UtilIT.exportDataset(datasetPid, "Datacite", false, DS_VERSION_DRAFT, apiToken);
+        exportDraftDatacite.prettyPrint();
+        exportDraftDatacite.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("resource.dates.date", CoreMatchers.equalTo("1999-12-31"))
+                .body("resource.version", equalTo("DRAFT"));
+
+        Response exportDraftNativeJson = UtilIT.exportDataset(datasetPid, "dataverse_json", false, DS_VERSION_DRAFT, apiToken);
+        exportDraftNativeJson.prettyPrint();
+        exportDraftNativeJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("datasetVersion.versionState", equalTo("DRAFT"))
+                .body("datasetVersion.latestVersionPublishingState", equalTo("DRAFT"))
+                .body("datasetVersion.citation", equalTo("Finch, Fiona, 1999, \"Darwin's Finches\", https://doi.org/10.5072/FK2/" + pidIdentifierOnly + ", Root, DRAFT VERSION"));
+
+        Response exportDraftDcterms = UtilIT.exportDataset(datasetPid, "dcterms", false, DS_VERSION_DRAFT, apiToken);
+        exportDraftDcterms.prettyPrint();
+        exportDraftDcterms.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("metadata.dateSubmitted", CoreMatchers.equalTo("1999-12-31"));
+
+        Response exportDraftDdi = UtilIT.exportDataset(datasetPid, "ddi", false, DS_VERSION_DRAFT, apiToken);
+        exportDraftDdi.prettyPrint();
+        exportDraftDdi.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("codeBook.docDscr.citation.titlStmt.titl", CoreMatchers.equalTo("Darwin's Finches"))
+                // TODO figure out how to say that distDate is absent
+                //                .body("codeBook.docDscr.citation.distStmt.distDate", CoreMatchers.equalTo(null))
+                // TODO figure out how to say that version is like this: <version type="DRAFT"/> (e.g. no content, no "1" between tags)
+                //                .body("codeBook.docDscr.citation.verStmt.version", Matchers.empty())
+                .body("codeBook.docDscr.citation.verStmt.version.@date", CoreMatchers.equalTo(null))
+                .body("codeBook.docDscr.citation.verStmt.version.@type", CoreMatchers.equalTo("DRAFT"));
+
+        Response exportDraftHtml = UtilIT.exportDataset(datasetPid, "html", false, DS_VERSION_DRAFT, apiToken);
+        exportDraftHtml.prettyPrint();
+        exportDraftHtml.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("html.head.title", equalTo("Darwin's Finches"));
+
+        // aka OpenAire
+        Response exportDraftOaiDatacite = UtilIT.exportDataset(datasetPid, "oai_datacite", false, DS_VERSION_DRAFT, apiToken);
+        exportDraftOaiDatacite.prettyPrint();
+        exportDraftOaiDatacite.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("resource.dates.date", CoreMatchers.equalTo("1999-12-31"))
+                .body("resource.publicationYear", CoreMatchers.equalTo("1999"));
+
+        Response exportDraftOaiDc = UtilIT.exportDataset(datasetPid, "oai_dc", false, DS_VERSION_DRAFT, apiToken);
+        exportDraftOaiDc.prettyPrint();
+        exportDraftOaiDc.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("oai_dc.type", equalTo("Dataset"))
+                .body("oai_dc.date", equalTo("1999-12-31"));
+
+        Response exportDraftOaiDdi = UtilIT.exportDataset(datasetPid, "oai_ddi", false, DS_VERSION_DRAFT, apiToken);
+        exportDraftOaiDdi.prettyPrint();
+        exportDraftOaiDdi.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("codeBook.docDscr.citation.titlStmt.titl", CoreMatchers.equalTo("Darwin's Finches"))
+                // TODO figure out how to say that distDate is absent
+                //                .body("codeBook.docDscr.citation.distStmt.distDate", CoreMatchers.equalTo(null))
+                // TODO figure out how to say that version is like this: <version type="DRAFT"/> (e.g. no content, no "1" between tags)
+                //                .body("codeBook.docDscr.citation.verStmt.version", Matchers.empty())
+                .body("codeBook.docDscr.citation.verStmt.version.@date", CoreMatchers.equalTo(null))
+                .body("codeBook.docDscr.citation.verStmt.version.@type", CoreMatchers.equalTo("DRAFT"));
+
+        Response exportDraftOaiOre = UtilIT.exportDataset(datasetPid, "OAI_ORE", false, DS_VERSION_DRAFT, apiToken);
+        exportDraftOaiOre.prettyPrint();
+        exportDraftOaiOre.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("'dcterms:modified'", equalTo(today))
+                .body("'ore:describes'.dateOfDeposit", equalTo("1999-12-31"))
+                .body("'ore:describes'.'schema:dateModified'", endsWith(currentYear))
+                .body("'ore:describes'.'schema:creativeWorkStatus'", equalTo("DRAFT"));
+
+        Response exportDraftSchemaDotOrg = UtilIT.exportDataset(datasetPid, "schema.org", false, DS_VERSION_DRAFT, apiToken);
+        exportDraftSchemaDotOrg.prettyPrint();
+        exportDraftSchemaDotOrg.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("version", equalTo("DRAFT"))
+                .body("datePublished", equalTo(null))
+                .body("dateModified", equalTo(""));
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getCitationAfter = UtilIT.getDatasetVersionCitation(datasetId, DS_VERSION_LATEST_PUBLISHED, true, apiToken);
+        getCitationAfter.prettyPrint();
+
+        String doi = datasetPid.substring(4);
+
+        // Note that the year 1999 appears in the citation because we
+        // set the citation date field to a field that has that year.
+        String expectedCitation = "Finch, Fiona, 1999, \"Darwin's Finches\", <a href=\"https://doi.org/" + doi + "\" target=\"_blank\">https://doi.org/" + doi + "</a>, Root, V1";
+
+        getCitationAfter.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", is(expectedCitation));
+
+        Response exportDatacite = UtilIT.exportDataset(datasetPid, "Datacite");
+        exportDatacite.prettyPrint();
+        exportDatacite.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("resource.dates.date[0].@dateType", CoreMatchers.equalTo("Submitted"))
+                .body("resource.dates.date[0]", CoreMatchers.equalTo("1999-12-31"))
+                .body("resource.dates.date[1].@dateType", CoreMatchers.equalTo("Available"))
+                .body("resource.dates.date[1]", CoreMatchers.equalTo(today))
+                .body("resource.version", equalTo("1.0"));
+
+        Response exportNativeJson = UtilIT.exportDataset(datasetPid, "dataverse_json");
+        exportNativeJson.prettyPrint();
+        exportNativeJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("datasetVersion.versionNumber", equalTo(1))
+                .body("datasetVersion.versionMinorNumber", equalTo(0))
+                .body("datasetVersion.versionState", equalTo("RELEASED"))
+                .body("datasetVersion.latestVersionPublishingState", equalTo("RELEASED"))
+                .body("datasetVersion.citation", equalTo("Finch, Fiona, 1999, \"Darwin's Finches\", https://doi.org/10.5072/FK2/" + pidIdentifierOnly + ", Root, V1"));
+
+        Response exportDcterms = UtilIT.exportDataset(datasetPid, "dcterms");
+        exportDcterms.prettyPrint();
+        exportDcterms.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("metadata.date", CoreMatchers.equalTo(today))
+                .body("metadata.dateSubmitted", CoreMatchers.equalTo("1999-12-31"));
+
+        Response exportDdi = UtilIT.exportDataset(datasetPid, "ddi");
+        exportDdi.prettyPrint();
+        exportDdi.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("codeBook.docDscr.citation.titlStmt.titl", CoreMatchers.equalTo("Darwin's Finches"))
+                .body("codeBook.docDscr.citation.distStmt.distDate", CoreMatchers.equalTo(today))
+                .body("codeBook.docDscr.citation.verStmt.version", CoreMatchers.equalTo("1"))
+                .body("codeBook.docDscr.citation.verStmt.version.@date", CoreMatchers.equalTo(today))
+                .body("codeBook.docDscr.citation.verStmt.version.@type", CoreMatchers.equalTo("RELEASED"));
+
+        Response exportHtml = UtilIT.exportDataset(datasetPid, "html");
+        exportHtml.prettyPrint();
+        exportHtml.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // HTML is too hard to parse. Just confirm we're getting some content we expect.
+                .body("html.head.title", equalTo("Darwin's Finches"));
+
+        // aka OpenAire
+        Response exportOaiDatacite = UtilIT.exportDataset(datasetPid, "oai_datacite");
+        exportOaiDatacite.prettyPrint();
+        exportOaiDatacite.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("resource.dates.date[0].@dateType", CoreMatchers.equalTo("Submitted"))
+                .body("resource.dates.date[0]", CoreMatchers.equalTo("1999-12-31"))
+                .body("resource.dates.date[1].@dateType", CoreMatchers.equalTo("Updated"))
+                .body("resource.dates.date[1]", CoreMatchers.equalTo(today))
+                .body("resource.publicationYear", CoreMatchers.equalTo("2025"));
+
+        Response exportDatasetOaiDc = UtilIT.exportDataset(datasetPid, "oai_dc", apiToken, true);
+        exportDatasetOaiDc.prettyPrint();
+        exportDatasetOaiDc.then().assertThat()
+                .body("oai_dc.type", equalTo("Dataset"))
+                .body("oai_dc.date", equalTo("1999-12-31"))
+                .statusCode(OK.getStatusCode());
+
+        Response exportOaiDDi = UtilIT.exportDataset(datasetPid, "oai_ddi");
+        exportOaiDDi.prettyPrint();
+        exportOaiDDi.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("codeBook.docDscr.citation.titlStmt.titl", CoreMatchers.equalTo("Darwin's Finches"))
+                .body("codeBook.docDscr.citation.distStmt.distDate", CoreMatchers.equalTo(today))
+                .body("codeBook.docDscr.citation.verStmt.version", CoreMatchers.equalTo("1"))
+                .body("codeBook.docDscr.citation.verStmt.version.@date", CoreMatchers.equalTo(today))
+                .body("codeBook.docDscr.citation.verStmt.version.@type", CoreMatchers.equalTo("RELEASED"));
+
+        Response exportOaiOre = UtilIT.exportDataset(datasetPid, "OAI_ORE");
+        exportOaiOre.prettyPrint();
+        exportOaiOre.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("'dcterms:modified'", equalTo(today))
+                .body("'ore:describes'.dateOfDeposit", equalTo("1999-12-31"))
+                .body("'ore:describes'.'schema:dateModified'", startsWith(currentYear))
+                .body("'ore:describes'.'schema:datePublished'", equalTo(today))
+                .body("'ore:describes'.'schema:creativeWorkStatus'", equalTo("RELEASED"));
+
+        Response exportSchemaDotOrg = UtilIT.exportDataset(datasetPid, "schema.org");
+        exportSchemaDotOrg.prettyPrint();
+        exportSchemaDotOrg.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("version", equalTo("1"))
+                .body("datePublished", equalTo(today))
+                .body("dateModified", equalTo(today));
+
+        Response clearDateField = UtilIT.clearDatasetCitationDateField(datasetPid, apiToken);
+        clearDateField.prettyPrint();
+        clearDateField.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Clearing not enough. You have to reexport because the previous date is cached.
+        Response rexport = UtilIT.reexportDatasetAllFormats(datasetPid);
+        rexport.prettyPrint();
+        rexport.then().assertThat().statusCode(OK.getStatusCode());
+
+        String todayDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        Response exportPostClear = UtilIT.exportDataset(datasetPid, "oai_dc", apiToken, true);
+        exportPostClear.prettyPrint();
+        exportPostClear.then().assertThat()
+                .body("oai_dc.type", equalTo("Dataset"))
+                .body("oai_dc.date", equalTo(todayDate))
+                .statusCode(OK.getStatusCode());
+
+        String newTitle = "A Post-1.0 Version";
+        Response updateTitle = UtilIT.updateDatasetTitleViaSword(datasetPid, newTitle, apiToken);
+        updateTitle.prettyPrint();
+        updateTitle.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("entry.treatment", equalTo("no treatment information available"));
+
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response exportDatacitePreviouslyPublishedVersion = UtilIT.exportDataset(datasetPid, "Datacite", false, "1.0", apiToken);
+        exportDatacitePreviouslyPublishedVersion.prettyPrint();
+        exportDatacitePreviouslyPublishedVersion.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Non-draft version requested (1.0) but for published versions only the latest (:latest-published) is supported."));
+
+        Response exportDataciteJunkVersion = UtilIT.exportDataset(datasetPid, "Datacite", false, "junk", apiToken);
+        exportDataciteJunkVersion.prettyPrint();
+        exportDataciteJunkVersion.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Unable to look up dataset based on version. Try :latest-published or :draft."));
+
+        Response deaccessionV20 = UtilIT.deaccessionDataset(datasetPid, "2.0", "retracted", null, apiToken);
+        deaccessionV20.prettyPrint();
+        deaccessionV20.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response exportDataciteV20Deaccessioned = UtilIT.exportDataset(datasetPid, "Datacite", false, "2.0", apiToken);
+        exportDataciteV20Deaccessioned.prettyPrint();
+        exportDataciteV20Deaccessioned.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Unable to look up dataset based on version. Try :latest-published or :draft."));
+
+        Response exportDataciteV10NotDeaccessioned = UtilIT.exportDataset(datasetPid, "Datacite", false, "1.0", apiToken);
+        exportDataciteV10NotDeaccessioned.prettyPrint();
+        exportDataciteV10NotDeaccessioned.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("resource.dates.date[0].@dateType", CoreMatchers.equalTo("Submitted"))
+                .body("resource.dates.date[0]", CoreMatchers.equalTo("1999-12-31"))
+                .body("resource.dates.date[1].@dateType", CoreMatchers.equalTo("Available"))
+                .body("resource.dates.date[1]", CoreMatchers.equalTo(today))
+                .body("resource.version", equalTo("1.0"));
+
+        Response exportDataciteLatestPublishedNotDeaccessioned = UtilIT.exportDataset(datasetPid, "Datacite", false, DS_VERSION_LATEST_PUBLISHED, apiToken);
+        exportDataciteLatestPublishedNotDeaccessioned.prettyPrint();
+        exportDataciteLatestPublishedNotDeaccessioned.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("resource.dates.date[0].@dateType", CoreMatchers.equalTo("Submitted"))
+                .body("resource.dates.date[0]", CoreMatchers.equalTo("1999-12-31"))
+                .body("resource.dates.date[1].@dateType", CoreMatchers.equalTo("Available"))
+                .body("resource.dates.date[1]", CoreMatchers.equalTo(today))
+                .body("resource.version", equalTo("1.0"));
+
+        Response deaccessionV10 = UtilIT.deaccessionDataset(datasetPid, "1.0", "retracted", null, apiToken);
+        deaccessionV10.prettyPrint();
+        deaccessionV10.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response exportDataciteV10IsDeaccessioned = UtilIT.exportDataset(datasetPid, "Datacite", false, "1.0", apiToken);
+        exportDataciteV10IsDeaccessioned.prettyPrint();
+        exportDataciteV10IsDeaccessioned.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Unable to look up dataset based on version. Try :latest-published or :draft."));
+
+        Response exportDataciteLatestPublishedIsDeaccessioned = UtilIT.exportDataset(datasetPid, "Datacite", false, DS_VERSION_LATEST_PUBLISHED, apiToken);
+        exportDataciteLatestPublishedIsDeaccessioned.prettyPrint();
+        exportDataciteLatestPublishedIsDeaccessioned.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Unable to look up dataset based on version. Try :latest-published or :draft."));
+    }
+
+    @Test
+    public void testDataCiteExport() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+
+        JsonObjectBuilder datasetJson = Json.createObjectBuilder()
+                .add("datasetVersion", Json.createObjectBuilder()
+                        .add("license", Json.createObjectBuilder()
+                                .add("name", "CC0 1.0")
+                                .add("uri", "http://creativecommons.org/publicdomain/zero/1.0")
+                        )
+                        .add("metadataBlocks", Json.createObjectBuilder()
+                                .add("citation", Json.createObjectBuilder()
+                                        .add("fields", Json.createArrayBuilder()
+                                                .add(Json.createObjectBuilder()
+                                                        .add("typeName", "title")
+                                                        .add("value", "Test dataset")
+                                                        .add("typeClass", "primitive")
+                                                        .add("multiple", false)
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("authorName",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "Simpson, Homer")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "authorName")
+                                                                        )
+                                                                        .add("authorAffiliation",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "https://ror.org/03vek6s52")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "authorAffiliation")
+                                                                        )
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "author")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("datasetContactEmail",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "hsimpson@mailinator.com")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "datasetContactEmail"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "datasetContact")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("dsDescriptionValue",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "Just a test dataset.")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "dsDescriptionValue"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "dsDescription")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add("Other")
+                                                        )
+                                                        .add("typeClass", "controlledVocabulary")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "subject")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("authorName",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "https://ror.org/01cwqze88") // NIH
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "grantNumberAgency")
+                                                                        )
+                                                                        .add("authorAffiliation",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "12345")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "grantNumberValue")
+                                                                        )
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "grantNumber")
+                                                )
+                                        )
+                                )
+                        ));
+
+        Response createDatasetResponse = UtilIT.createDataset(dataverseAlias, datasetJson, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPid = JsonPath.from(createDatasetResponse.getBody().asString()).getString("data.persistentId");
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverse.prettyPrint();
+        publishDataverse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDataset.prettyPrint();
+        publishDataset.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response exportDatasetAsDataCite = UtilIT.exportDataset(datasetPid, "Datacite", apiToken, true);
+        exportDatasetAsDataCite.prettyPrint();
+        exportDatasetAsDataCite.then().assertThat()
+                .body("resource.creators.creator[0].creatorName", equalTo("Simpson, Homer"))
+                // see below for additional affiliation assertions, which can vary
+                .body("resource.creators.creator[0].affiliation.@schemeURI", equalTo("https://ror.org"))
+                .body("resource.creators.creator[0].affiliation.@affiliationIdentifierScheme", equalTo("ROR"))
+                // see below for additional fundingReference assertions, which can vary
+                .body("resource.fundingReferences.fundingReference[0].awardNumber", equalTo("12345"))
+                .statusCode(OK.getStatusCode());
+
+        // Out of the box :CVocConf is not set. If you set it with
+        // https://github.com/gdcc/dataverse-external-vocab-support/blob/de011d239254ff7d651212c565f8604808dcd7e9/examples/config/grantNumberAgencyRor.json
+        // you can expect different results.
+        boolean authorsOrcidAndRorEnabled = false;
+        if (authorsOrcidAndRorEnabled) {
+            exportDatasetAsDataCite.then().assertThat()
+                    .body("resource.creators.creator[0].affiliation", equalTo("Harvard University"))
+                    // Once https://github.com/IQSS/dataverse/pull/11175 is merged the equalTo bellow
+                    // should be "https://ror.org/03vek6s52" instead of "Harvard University".
+                    .body("resource.creators.creator[0].affiliation.@affiliationIdentifier", equalTo("Harvard University"));
+        } else {
+            exportDatasetAsDataCite.then().assertThat()
+                    .body("resource.creators.creator[0].affiliation", equalTo("https://ror.org/03vek6s52"))
+                    .body("resource.creators.creator[0].affiliation.@affiliationIdentifier", equalTo("https://ror.org/03vek6s52"));
+        }
+
+        // Out of the box :CVocConf is not set. If you set it with
+        // https://github.com/gdcc/dataverse-external-vocab-support/blob/de011d239254ff7d651212c565f8604808dcd7e9/examples/config/grantNumberAgencyRor.json
+        // you can expect different results.
+        boolean grantNumberAgencyRorEnabled = false;
+        if (grantNumberAgencyRorEnabled) {
+            exportDatasetAsDataCite.then().assertThat()
+                    .body("resource.fundingReferences.fundingReference[0].funderName", equalTo("National Institutes of Health"))
+                    .body("resource.fundingReferences.fundingReference[0].funderIdentifier.@funderIdentifierType", equalTo("ROR"))
+                    .body("resource.fundingReferences.fundingReference[0].funderIdentifier.@schemeURI", equalTo("https://ror.org"))
+                    .body("resource.fundingReferences.fundingReference[0].funderIdentifier", equalTo("https://ror.org/01cwqze88"));
+        } else {
+            exportDatasetAsDataCite.then().assertThat()
+                    .body("resource.fundingReferences.fundingReference[0].funderName", equalTo("https://ror.org/01cwqze88"))
+                    .body("resource.fundingReferences.fundingReference[0].awardNumber", equalTo("12345"));
+        }
+    }
+
+    @Test
+    public void getVersionFiles() throws IOException, InterruptedException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String datasetPersistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        String testFileName1 = "test_1.txt";
+        String testFileName2 = "test_2.txt";
+        String testFileName3 = "test_3.txt";
+        String testFileName4 = "test_4.txt";
+        String testFileName5 = "test_5.png";
+
+        UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName1, new byte[50], apiToken);
+        UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName2, new byte[200], apiToken);
+        UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName3, new byte[100], apiToken);
+        UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName5, new byte[300], apiToken);
+        UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName4, new byte[400], apiToken);
+
+        String testDatasetVersion = ":latest";
+
+        // Test pagination and NameAZ order criteria (the default criteria)
+        int testPageSize = 2;
+
+        // Test page 1
+        Response getVersionFilesResponsePaginated = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, testPageSize, null, null, null, null, null, null, null, false, apiToken);
+
+        getVersionFilesResponsePaginated.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName1))
+                .body("data[1].label", equalTo(testFileName2))
+                .body("totalCount", equalTo(5));
+
+        int fileMetadatasCount = getVersionFilesResponsePaginated.jsonPath().getList("data").size();
+        assertEquals(testPageSize, fileMetadatasCount);
+
+        String testFileId1 = JsonPath.from(getVersionFilesResponsePaginated.body().asString()).getString("data[0].dataFile.id");
+        String testFileId2 = JsonPath.from(getVersionFilesResponsePaginated.body().asString()).getString("data[1].dataFile.id");
+
+        // Test page 2
+        getVersionFilesResponsePaginated = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, testPageSize, testPageSize, null, null, null, null, null, null, false, apiToken);
+
+        getVersionFilesResponsePaginated.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName3))
+                .body("data[1].label", equalTo(testFileName4))
+                .body("totalCount", equalTo(5));
+
+        fileMetadatasCount = getVersionFilesResponsePaginated.jsonPath().getList("data").size();
+        assertEquals(testPageSize, fileMetadatasCount);
+
+        // Test page 3 (last)
+        getVersionFilesResponsePaginated = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, testPageSize, testPageSize * 2, null, null, null, null, null, null, false, apiToken);
+
+        getVersionFilesResponsePaginated.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName5));
+
+        fileMetadatasCount = getVersionFilesResponsePaginated.jsonPath().getList("data").size();
+        assertEquals(1, fileMetadatasCount);
+
+        // Test NameZA order criteria
+        Response getVersionFilesResponseNameZACriteria = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, null, null, null, null, DatasetVersionFilesServiceBean.FileOrderCriteria.NameZA.toString(), false, apiToken);
+
+        getVersionFilesResponseNameZACriteria.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName5))
+                .body("data[1].label", equalTo(testFileName4))
+                .body("data[2].label", equalTo(testFileName3))
+                .body("data[3].label", equalTo(testFileName2))
+                .body("data[4].label", equalTo(testFileName1));
+
+        // Test Newest order criteria
+        Response getVersionFilesResponseNewestCriteria = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, null, null, null, null, DatasetVersionFilesServiceBean.FileOrderCriteria.Newest.toString(), false, apiToken);
+
+        getVersionFilesResponseNewestCriteria.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName4))
+                .body("data[1].label", equalTo(testFileName5))
+                .body("data[2].label", equalTo(testFileName3))
+                .body("data[3].label", equalTo(testFileName2))
+                .body("data[4].label", equalTo(testFileName1));
+
+        // Test Oldest order criteria
+        Response getVersionFilesResponseOldestCriteria = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, null, null, null, null, DatasetVersionFilesServiceBean.FileOrderCriteria.Oldest.toString(), false, apiToken);
+
+        getVersionFilesResponseOldestCriteria.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName1))
+                .body("data[1].label", equalTo(testFileName2))
+                .body("data[2].label", equalTo(testFileName3))
+                .body("data[3].label", equalTo(testFileName5))
+                .body("data[4].label", equalTo(testFileName4));
+
+        // Test Size order criteria
+        Response getVersionFilesResponseSizeCriteria = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, null, null, null, null, DatasetVersionFilesServiceBean.FileOrderCriteria.Size.toString(), false, apiToken);
+
+        getVersionFilesResponseSizeCriteria.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName1))
+                .body("data[1].label", equalTo(testFileName3))
+                .body("data[2].label", equalTo(testFileName2))
+                .body("data[3].label", equalTo(testFileName5))
+                .body("data[4].label", equalTo(testFileName4));
+
+        // Test Type order criteria
+        Response getVersionFilesResponseTypeCriteria = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, null, null, null, null, DatasetVersionFilesServiceBean.FileOrderCriteria.Type.toString(), false, apiToken);
+
+        getVersionFilesResponseTypeCriteria.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName5))
+                .body("data[1].label", equalTo(testFileName1))
+                .body("data[2].label", equalTo(testFileName2))
+                .body("data[3].label", equalTo(testFileName3))
+                .body("data[4].label", equalTo(testFileName4));
+
+        // Test invalid order criteria
+        String invalidOrderCriteria = "invalidOrderCriteria";
+        Response getVersionFilesResponseInvalidOrderCriteria = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, null, null, null, null, invalidOrderCriteria, false, apiToken);
+        getVersionFilesResponseInvalidOrderCriteria.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Invalid order criteria: " + invalidOrderCriteria));
+
+        // Test Content Type
+        Response getVersionFilesResponseContentType = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, "image/png", null, null, null, null, null, false, apiToken);
+
+        getVersionFilesResponseContentType.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName5));
+
+        fileMetadatasCount = getVersionFilesResponseContentType.jsonPath().getList("data").size();
+        assertEquals(1, fileMetadatasCount);
+
+        // Test Category Name
+        String testCategory = "testCategory";
+        Response setFileCategoriesResponse = UtilIT.setFileCategories(testFileId1, apiToken, List.of(testCategory));
+        setFileCategoriesResponse.then().assertThat().statusCode(OK.getStatusCode());
+        setFileCategoriesResponse = UtilIT.setFileCategories(testFileId2, apiToken, List.of(testCategory));
+        setFileCategoriesResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getVersionFilesResponseCategoryName = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, null, testCategory, null, null, null, false, apiToken);
+
+        getVersionFilesResponseCategoryName.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName1))
+                .body("data[1].label", equalTo(testFileName2));
+
+        fileMetadatasCount = getVersionFilesResponseCategoryName.jsonPath().getList("data").size();
+        assertEquals(2, fileMetadatasCount);
+
+        // Test Access Status Restricted
+        Response restrictFileResponse = UtilIT.restrictFile(String.valueOf(testFileId1), true, apiToken);
+        restrictFileResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response getVersionFilesResponseRestricted = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, FileSearchCriteria.FileAccessStatus.Restricted.toString(), null, null, null, null, false, apiToken);
+
+        getVersionFilesResponseRestricted.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName1));
+
+        fileMetadatasCount = getVersionFilesResponseRestricted.jsonPath().getList("data").size();
+        assertEquals(1, fileMetadatasCount);
+
+        // Test Access Status Embargoed
+        UtilIT.setSetting(SettingsServiceBean.Key.MaxEmbargoDurationInMonths, "12");
+        String activeEmbargoDate = LocalDate.now().plusMonths(6).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+
+        // Create embargo for test file 1 (Embargoed and Restricted)
+        Response createActiveFileEmbargoResponse = UtilIT.createFileEmbargo(datasetId, Integer.parseInt(testFileId1), activeEmbargoDate, apiToken);
+
+        createActiveFileEmbargoResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Create embargo for test file 2 (Embargoed and Public)
+        createActiveFileEmbargoResponse = UtilIT.createFileEmbargo(datasetId, Integer.parseInt(testFileId2), activeEmbargoDate, apiToken);
+
+        createActiveFileEmbargoResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response getVersionFilesResponseEmbargoedThenPublic = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, FileSearchCriteria.FileAccessStatus.EmbargoedThenPublic.toString(), null, null, null, null, false, apiToken);
+
+        getVersionFilesResponseEmbargoedThenPublic.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName2));
+
+        fileMetadatasCount = getVersionFilesResponseEmbargoedThenPublic.jsonPath().getList("data").size();
+        assertEquals(1, fileMetadatasCount);
+
+        Response getVersionFilesResponseEmbargoedThenRestricted = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, FileSearchCriteria.FileAccessStatus.EmbargoedThenRestricted.toString(), null, null, null, null, false, apiToken);
+
+        getVersionFilesResponseEmbargoedThenRestricted.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName1));
+
+        fileMetadatasCount = getVersionFilesResponseEmbargoedThenRestricted.jsonPath().getList("data").size();
+        assertEquals(1, fileMetadatasCount);
+
+
+        // Test Access Status Retention
+        UtilIT.setSetting(SettingsServiceBean.Key.MinRetentionDurationInMonths, "-1");
+        String retentionEndDate = LocalDate.now().plusMonths(240).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+
+        // Create retention for test file 2 (Retention and Public)
+        Response createFileRetentionResponse = UtilIT.createFileRetention(datasetId, Integer.parseInt(testFileId2), retentionEndDate, apiToken);
+        createFileRetentionResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response getVersionFilesResponseRetentionPeriodExpired = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, FileSearchCriteria.FileAccessStatus.RetentionPeriodExpired.toString(), null, null, null, null, false, apiToken);
+        getVersionFilesResponseRetentionPeriodExpired.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("totalCount", equalTo(0));
+
+        // Test Access Status Public
+        Response getVersionFilesResponsePublic = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, FileSearchCriteria.FileAccessStatus.Public.toString(), null, null, null, null, false, apiToken);
+
+        getVersionFilesResponsePublic.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName3))
+                .body("data[1].label", equalTo(testFileName4))
+                .body("data[2].label", equalTo(testFileName5));
+
+        fileMetadatasCount = getVersionFilesResponsePublic.jsonPath().getList("data").size();
+        assertEquals(3, fileMetadatasCount);
+
+        // Test invalid access status
+        String invalidStatus = "invalidStatus";
+        Response getVersionFilesResponseInvalidStatus = UtilIT.getVersionFiles(datasetId, testDatasetVersion, null, null, null, invalidStatus, null, null, null, null, false, apiToken);
+        getVersionFilesResponseInvalidStatus.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("datasets.api.version.files.invalid.access.status", List.of(invalidStatus))));
+
+        // Test Search Text
+        Response getVersionFilesResponseSearchText = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, null, null, null, "test_1", null, false, apiToken);
+
+        getVersionFilesResponseSearchText.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName1));
+
+        fileMetadatasCount = getVersionFilesResponseSearchText.jsonPath().getList("data").size();
+        assertEquals(1, fileMetadatasCount);
+        
+        // Test search for file metadata description
+
+        // Update file metadata
+        String updateDescription = "Updated description. Again";
+
+        String updateJsonString = "{\"description\":\""+updateDescription+"\"}";
+        Response updateMetadataResponse = UtilIT.updateFileMetadata(testFileId2, updateJsonString, apiToken);
+        updateMetadataResponse.prettyPrint();
+        updateMetadataResponse.then().assertThat().statusCode(OK.getStatusCode());
+        
+        Response getVersionFilesResponseSearchTextDescription = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST, null, null, null, null, null, null, "again", null, false, apiToken);
+        
+        getVersionFilesResponseSearchTextDescription.prettyPrint();
+
+        getVersionFilesResponseSearchTextDescription.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName2));
+
+        fileMetadatasCount = getVersionFilesResponseSearchText.jsonPath().getList("data").size();
+        assertEquals(1, fileMetadatasCount);
+
+
+
+        // Test Deaccessioned
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // includeDeaccessioned false
+        Response getVersionFilesResponseNoDeaccessioned = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, null, null, null, false, apiToken);
+        getVersionFilesResponseNoDeaccessioned.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // includeDeaccessioned true
+        Response getVersionFilesResponseDeaccessioned = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, null, null, null, true, apiToken);
+        getVersionFilesResponseDeaccessioned.then().assertThat().statusCode(OK.getStatusCode());
+
+        getVersionFilesResponseDeaccessioned.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo(testFileName1))
+                .body("data[1].label", equalTo(testFileName2))
+                .body("data[2].label", equalTo(testFileName3))
+                .body("data[3].label", equalTo(testFileName4))
+                .body("data[4].label", equalTo(testFileName5));
+
+        // Test Tabular Tag Name
+        String pathToTabularTestFile = "src/test/resources/tab/test.tab";
+        Response uploadTabularFileResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTabularTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadTabularFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        String tabularFileId = uploadTabularFileResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+
+        // Ensure tabular file is ingested
+        sleep(2000);
+
+        String tabularTagName = "Survey";
+        Response setFileTabularTagsResponse = UtilIT.setFileTabularTags(tabularFileId, apiToken, List.of(tabularTagName));
+        setFileTabularTagsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getVersionFilesResponseTabularTagName = UtilIT.getVersionFiles(datasetId, testDatasetVersion, null, null, null, null, null, tabularTagName, null, null, false, apiToken);
+
+        getVersionFilesResponseTabularTagName.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].label", equalTo("test.tab"));
+
+        fileMetadatasCount = getVersionFilesResponseTabularTagName.jsonPath().getList("data").size();
+        assertEquals(1, fileMetadatasCount);
+
+        // Test that the dataset files for a deaccessioned dataset cannot be accessed by a guest
+        // By latest published version
+        Response getDatasetVersionResponse = UtilIT.getVersionFiles(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, null, null, null, true, null);
+        getDatasetVersionResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+        // By specific version 1.0
+        getDatasetVersionResponse = UtilIT.getVersionFiles(datasetId, "1.0", null, null, null, null, null, null, null, null, true, null);
+        getDatasetVersionResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    public void getVersionFileCounts() throws IOException, InterruptedException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String datasetPersistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // Creating test files
+        String testFileName1 = "test_1.txt";
+        String testFileName2 = "test_2.txt";
+        String testFileName3 = "test_3.png";
+
+        UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName1, new byte[50], apiToken);
+        UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName2, new byte[200], apiToken);
+        UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName3, new byte[100], apiToken);
+
+        // Creating a categorized test file
+        String pathToTestFile = "src/test/resources/images/coffeeshop.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String dataFileId = uploadResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+        String testCategory = "testCategory";
+        Response setFileCategoriesResponse = UtilIT.setFileCategories(dataFileId, apiToken, List.of(testCategory));
+        setFileCategoriesResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Setting embargo for file (Embargo and Public)
+        UtilIT.setSetting(SettingsServiceBean.Key.MaxEmbargoDurationInMonths, "12");
+        String activeEmbargoDate = LocalDate.now().plusMonths(6).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        Response createFileEmbargoResponse = UtilIT.createFileEmbargo(datasetId, Integer.parseInt(dataFileId), activeEmbargoDate, apiToken);
+        createFileEmbargoResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Getting the file counts and assert each count
+        Response getVersionFileCountsResponse = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST, null, null, null, null, null, false, apiToken);
+
+        getVersionFileCountsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        JsonPath responseJsonPath = getVersionFileCountsResponse.jsonPath();
+        LinkedHashMap<String, Integer> responseCountPerContentTypeMap = responseJsonPath.get("data.perContentType");
+        LinkedHashMap<String, Integer> responseCountPerCategoryNameMap = responseJsonPath.get("data.perCategoryName");
+        LinkedHashMap<String, Integer> responseCountPerTabularTagNameMap = responseJsonPath.get("data.perTabularTagName");
+        LinkedHashMap<String, Integer> responseCountPerAccessStatusMap = responseJsonPath.get("data.perAccessStatus");
+
+        assertEquals(4, (Integer) responseJsonPath.get("data.total"));
+        assertEquals(2, responseCountPerContentTypeMap.get("image/png"));
+        assertEquals(2, responseCountPerContentTypeMap.get("text/plain"));
+        assertEquals(2, responseCountPerContentTypeMap.size());
+        assertEquals(1, responseCountPerCategoryNameMap.get(testCategory));
+        assertEquals(0, responseCountPerTabularTagNameMap.size());
+        assertEquals(2, responseCountPerAccessStatusMap.size());
+        assertEquals(3, responseCountPerAccessStatusMap.get(FileSearchCriteria.FileAccessStatus.Public.toString()));
+        assertEquals(1, responseCountPerAccessStatusMap.get(FileSearchCriteria.FileAccessStatus.EmbargoedThenPublic.toString()));
+
+        // Test content type criteria
+        getVersionFileCountsResponse = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST, "image/png", null, null, null, null, false, apiToken);
+        getVersionFileCountsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        responseJsonPath = getVersionFileCountsResponse.jsonPath();
+        responseCountPerContentTypeMap = responseJsonPath.get("data.perContentType");
+        responseCountPerCategoryNameMap = responseJsonPath.get("data.perCategoryName");
+        responseCountPerTabularTagNameMap = responseJsonPath.get("data.perTabularTagName");
+        responseCountPerAccessStatusMap = responseJsonPath.get("data.perAccessStatus");
+
+        assertEquals(2, (Integer) responseJsonPath.get("data.total"));
+        assertEquals(2, responseCountPerContentTypeMap.get("image/png"));
+        assertEquals(1, responseCountPerContentTypeMap.size());
+        assertEquals(1, responseCountPerCategoryNameMap.size());
+        assertEquals(1, responseCountPerCategoryNameMap.get(testCategory));
+        assertEquals(0, responseCountPerTabularTagNameMap.size());
+        assertEquals(2, responseCountPerAccessStatusMap.size());
+        assertEquals(1, responseCountPerAccessStatusMap.get(FileSearchCriteria.FileAccessStatus.Public.toString()));
+        assertEquals(1, responseCountPerAccessStatusMap.get(FileSearchCriteria.FileAccessStatus.EmbargoedThenPublic.toString()));
+
+        // Test access status criteria
+        getVersionFileCountsResponse = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST, null, FileSearchCriteria.FileAccessStatus.Public.toString(), null, null, null, false, apiToken);
+
+        getVersionFileCountsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        responseJsonPath = getVersionFileCountsResponse.jsonPath();
+        responseCountPerContentTypeMap = responseJsonPath.get("data.perContentType");
+        responseCountPerCategoryNameMap = responseJsonPath.get("data.perCategoryName");
+        responseCountPerTabularTagNameMap = responseJsonPath.get("data.perTabularTagName");
+        responseCountPerAccessStatusMap = responseJsonPath.get("data.perAccessStatus");
+
+        assertEquals(3, (Integer) responseJsonPath.get("data.total"));
+        assertEquals(1, responseCountPerContentTypeMap.get("image/png"));
+        assertEquals(2, responseCountPerContentTypeMap.get("text/plain"));
+        assertEquals(2, responseCountPerContentTypeMap.size());
+        assertEquals(0, responseCountPerCategoryNameMap.size());
+        assertEquals(0, responseCountPerTabularTagNameMap.size());
+        assertEquals(1, responseCountPerAccessStatusMap.size());
+        assertEquals(3, responseCountPerAccessStatusMap.get(FileSearchCriteria.FileAccessStatus.Public.toString()));
+
+        // Test invalid access status
+        String invalidStatus = "invalidStatus";
+        Response getVersionFilesResponseInvalidStatus = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST, null, invalidStatus, null, null, null, false, apiToken);
+        getVersionFilesResponseInvalidStatus.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("datasets.api.version.files.invalid.access.status", List.of(invalidStatus))));
+
+        // Test category name criteria
+        getVersionFileCountsResponse = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST, null, null, testCategory, null, null, false, apiToken);
+
+        getVersionFileCountsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        responseJsonPath = getVersionFileCountsResponse.jsonPath();
+        responseCountPerContentTypeMap = responseJsonPath.get("data.perContentType");
+        responseCountPerCategoryNameMap = responseJsonPath.get("data.perCategoryName");
+        responseCountPerTabularTagNameMap = responseJsonPath.get("data.perTabularTagName");
+        responseCountPerAccessStatusMap = responseJsonPath.get("data.perAccessStatus");
+
+        assertEquals(1, (Integer) responseJsonPath.get("data.total"));
+        assertEquals(1, responseCountPerContentTypeMap.get("image/png"));
+        assertEquals(1, responseCountPerContentTypeMap.size());
+        assertEquals(1, responseCountPerCategoryNameMap.size());
+        assertEquals(1, responseCountPerCategoryNameMap.get(testCategory));
+        assertEquals(0, responseCountPerTabularTagNameMap.size());
+        assertEquals(1, responseCountPerAccessStatusMap.size());
+        assertEquals(1, responseCountPerAccessStatusMap.get(FileSearchCriteria.FileAccessStatus.EmbargoedThenPublic.toString()));
+
+        // Test search text criteria
+        getVersionFileCountsResponse = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST, null, null, null, null, "test", false, apiToken);
+
+        getVersionFileCountsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        responseJsonPath = getVersionFileCountsResponse.jsonPath();
+        responseCountPerContentTypeMap = responseJsonPath.get("data.perContentType");
+        responseCountPerCategoryNameMap = responseJsonPath.get("data.perCategoryName");
+        responseCountPerTabularTagNameMap = responseJsonPath.get("data.perTabularTagName");
+        responseCountPerAccessStatusMap = responseJsonPath.get("data.perAccessStatus");
+
+        assertEquals(3, (Integer) responseJsonPath.get("data.total"));
+        assertEquals(1, responseCountPerContentTypeMap.get("image/png"));
+        assertEquals(2, responseCountPerContentTypeMap.get("text/plain"));
+        assertEquals(2, responseCountPerContentTypeMap.size());
+        assertEquals(0, responseCountPerCategoryNameMap.size());
+        assertEquals(0, responseCountPerTabularTagNameMap.size());
+        assertEquals(1, responseCountPerAccessStatusMap.size());
+        assertEquals(3, responseCountPerAccessStatusMap.get(FileSearchCriteria.FileAccessStatus.Public.toString()));
+
+        // Test tabular tag name criteria
+        String pathToTabularTestFile = "src/test/resources/tab/test.tab";
+        Response uploadTabularFileResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTabularTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadTabularFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        String tabularFileId = uploadTabularFileResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+
+        // Ensure tabular file is ingested
+        sleep(2000);
+
+        String tabularTagName = "Survey";
+        Response setFileTabularTagsResponse = UtilIT.setFileTabularTags(tabularFileId, apiToken, List.of(tabularTagName));
+        setFileTabularTagsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        getVersionFileCountsResponse = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST, null, null, null, tabularTagName, null, false, apiToken);
+
+        getVersionFileCountsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        responseJsonPath = getVersionFileCountsResponse.jsonPath();
+        responseCountPerContentTypeMap = responseJsonPath.get("data.perContentType");
+        responseCountPerCategoryNameMap = responseJsonPath.get("data.perCategoryName");
+        responseCountPerTabularTagNameMap = responseJsonPath.get("data.perTabularTagName");
+        responseCountPerAccessStatusMap = responseJsonPath.get("data.perAccessStatus");
+
+        assertEquals(1, (Integer) responseJsonPath.get("data.total"));
+        assertEquals(1, responseCountPerContentTypeMap.get("text/tab-separated-values"));
+        assertEquals(1, responseCountPerContentTypeMap.size());
+        assertEquals(0, responseCountPerCategoryNameMap.size());
+        assertEquals(1, responseCountPerTabularTagNameMap.size());
+        assertEquals(1, responseCountPerTabularTagNameMap.get(tabularTagName));
+        assertEquals(1, responseCountPerAccessStatusMap.size());
+        assertEquals(1, responseCountPerAccessStatusMap.get(FileSearchCriteria.FileAccessStatus.Public.toString()));
+
+        // Test Deaccessioned
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // includeDeaccessioned false
+        Response getVersionFileCountsResponseNoDeaccessioned = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, false, apiToken);
+        getVersionFileCountsResponseNoDeaccessioned.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // includeDeaccessioned true
+        Response getVersionFileCountsResponseDeaccessioned = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, true, apiToken);
+        getVersionFileCountsResponseDeaccessioned.then().assertThat().statusCode(OK.getStatusCode());
+
+        responseJsonPath = getVersionFileCountsResponseDeaccessioned.jsonPath();
+        assertEquals(5, (Integer) responseJsonPath.get("data.total"));
+
+        // Test that the dataset file counts for a deaccessioned dataset can be accessed by a guest
+        // By latest published version
+        Response getDatasetVersionResponse = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, true, null);
+        getDatasetVersionResponse.then().assertThat().statusCode(OK.getStatusCode());
+        assertEquals(5, (Integer) responseJsonPath.get("data.total"));
+        // By specific version 1.0
+        getDatasetVersionResponse = UtilIT.getVersionFileCounts(datasetId, "1.0", null, null, null, null, null, true, null);
+        getDatasetVersionResponse.then().assertThat().statusCode(OK.getStatusCode());
+        assertEquals(5, (Integer) responseJsonPath.get("data.total"));
+        // By specific version 1.0
+        getDatasetVersionResponse = UtilIT.getVersionFileCounts(datasetId, "1.0", null, null, null, null, null, true, null);
+        getDatasetVersionResponse.then().assertThat().statusCode(OK.getStatusCode());
+        assertEquals(5, (Integer) responseJsonPath.get("data.total"));
+        // By latest published version not including deaccessioned
+        getDatasetVersionResponse = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, false, null);
+        getDatasetVersionResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+    }
+    
+    @Test
+    public void getAvailableDatasetFileCategories() throws IOException, InterruptedException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        //for cleanup
+        Response makeSuperUser = UtilIT.setSuperuserStatus(username, true);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String datasetPersistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // Creating a categorized test file
+        String pathToTestFile = "src/test/resources/images/coffeeshop.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String dataFileId = uploadResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+        String testCategory = "testCategory";
+        Response setFileCategoriesResponse = UtilIT.setFileCategories(dataFileId, apiToken, List.of(testCategory));
+        setFileCategoriesResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        //Test that custom tag is now available
+        Response getDatasetAvailableCategories = UtilIT.getDatasetAvailableCategories(datasetPersistentId);
+        getDatasetAvailableCategories.then().assertThat().statusCode(OK.getStatusCode());
+        getDatasetAvailableCategories.prettyPrint();                
+        assertTrue(getDatasetAvailableCategories.prettyPrint().contains("testCategory"));
+        assertTrue(getDatasetAvailableCategories.prettyPrint().contains("Documentation"));
+        assertTrue(getDatasetAvailableCategories.prettyPrint().contains("Data"));
+        assertTrue(getDatasetAvailableCategories.prettyPrint().contains("Code"));
+        
+        // Clean up
+        Response destroyDatasetResponse = UtilIT.destroyDataset(datasetId, apiToken);
+        assertEquals(200, destroyDatasetResponse.getStatusCode());
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+        
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        assertEquals(200, deleteUserResponse.getStatusCode());
+       
+
+    }
+
+    @Test
+    public void deaccessionDataset() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        String testDeaccessionReason = "Test deaccession reason.";
+        String testDeaccessionForwardURL = "http://demo.dataverse.org";
+
+        // Test that draft and latest version constants are not allowed and a bad request error is received
+        String expectedInvalidVersionIdentifierError = BundleUtil.getStringFromBundle("datasets.api.deaccessionDataset.invalid.version.identifier.error", List.of(DS_VERSION_LATEST_PUBLISHED));
+
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_DRAFT, testDeaccessionReason, testDeaccessionForwardURL, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(expectedInvalidVersionIdentifierError));
+
+        deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST, testDeaccessionReason, testDeaccessionForwardURL, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(expectedInvalidVersionIdentifierError));
+
+        // Test that a not found error occurs when there is no published version available
+        deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, testDeaccessionReason, testDeaccessionForwardURL, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // Publish test dataset
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Test that a bad request error is received when the forward URL exceeds DEACCESSION_LINK_MAX_LENGTH
+        String testInvalidDeaccessionForwardURL = RandomStringUtils.randomAlphabetic(DEACCESSION_LINK_MAX_LENGTH + 1);
+
+        deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, testDeaccessionReason, testInvalidDeaccessionForwardURL, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", containsString(testInvalidDeaccessionForwardURL));
+
+        // Test that the dataset is successfully deaccessioned when published and valid deaccession params are sent
+        deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, testDeaccessionReason, testDeaccessionForwardURL, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Test that a not found error occurs when the only published version has already been deaccessioned
+        deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, testDeaccessionReason, testDeaccessionForwardURL, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // Test that a dataset can be deaccessioned without forward URL
+        createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, testDeaccessionReason, null, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void getDownloadSize() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String datasetPersistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // Creating test text files
+        String testFileName1 = "test_1.txt";
+        String testFileName2 = "test_2.txt";
+
+        int testFileSize1 = 50;
+        int testFileSize2 = 200;
+
+        UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName1, new byte[testFileSize1], apiToken);
+        UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName2, new byte[testFileSize2], apiToken);
+
+        int expectedTextFilesStorageSize = testFileSize1 + testFileSize2;
+
+        // Get the total size when there are no tabular files
+        Response getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), false, apiToken);
+        getDownloadSizeResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.storageSize", equalTo(expectedTextFilesStorageSize));
+
+        // Upload test tabular file
+        String pathToTabularTestFile = "src/test/resources/tab/test.tab";
+        Response uploadTabularFileResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTabularTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadTabularFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        int tabularOriginalSize = 157;
+
+        // Ensure tabular file is ingested
+        UtilIT.sleepForLock(datasetId, null, apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION);
+
+        // Get the total size ignoring the original tabular file sizes
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.Archival.toString(), false, apiToken);
+        getDownloadSizeResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        int actualSizeIgnoringOriginalTabularSizes = Integer.parseInt(getDownloadSizeResponse.getBody().jsonPath().getString("data.storageSize"));
+
+        // Assert that the size has been incremented with the last uploaded file
+        assertTrue(actualSizeIgnoringOriginalTabularSizes > expectedTextFilesStorageSize);
+
+        // Get the total size including only original sizes and ignoring archival sizes for tabular files
+        int expectedSizeIncludingOnlyOriginalForTabular = tabularOriginalSize + expectedTextFilesStorageSize;
+
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.Original.toString(), false, apiToken);
+        getDownloadSizeResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.storageSize", equalTo(expectedSizeIncludingOnlyOriginalForTabular));
+
+        // Get the total size including both the original and archival tabular file sizes
+        int tabularArchivalSize = actualSizeIgnoringOriginalTabularSizes - expectedTextFilesStorageSize;
+        int expectedSizeIncludingAllSizes = tabularArchivalSize + tabularOriginalSize + expectedTextFilesStorageSize;
+
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), false, apiToken);
+        getDownloadSizeResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.storageSize", equalTo(expectedSizeIncludingAllSizes));
+
+        // Get the total size sending invalid file download size mode
+        String invalidMode = "invalidMode";
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST, null, null, null, null, null, invalidMode, false, apiToken);
+        getDownloadSizeResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Invalid mode: " + invalidMode));
+
+        // Upload second test tabular file (same source as before)
+        uploadTabularFileResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTabularTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadTabularFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Ensure tabular file is ingested
+        UtilIT.sleepForLock(datasetId, null, apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION);
+
+        // Get the total size including only original sizes and ignoring archival sizes for tabular files
+        expectedSizeIncludingOnlyOriginalForTabular = tabularOriginalSize + expectedSizeIncludingOnlyOriginalForTabular;
+
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.Original.toString(), false, apiToken);
+        getDownloadSizeResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.storageSize", equalTo(expectedSizeIncludingOnlyOriginalForTabular));
+
+        // Get the total size including both the original and archival tabular file sizes
+        expectedSizeIncludingAllSizes = tabularArchivalSize + tabularOriginalSize + expectedSizeIncludingAllSizes;
+
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), false, apiToken);
+        getDownloadSizeResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.storageSize", equalTo(expectedSizeIncludingAllSizes));
+
+        // Get the total size including both the original and archival tabular file sizes with search criteria
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST, "text/plain", FileSearchCriteria.FileAccessStatus.Public.toString(), null, null, "test_", DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), false, apiToken);
+        // We exclude tabular sizes from the expected result since the search criteria filters by content type "text/plain" and search text "test_"
+        int expectedSizeIncludingAllSizesAndApplyingCriteria = testFileSize1 + testFileSize2;
+        getDownloadSizeResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.storageSize", equalTo(expectedSizeIncludingAllSizesAndApplyingCriteria));
+        // Test Deaccessioned
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Auth User Tests:
+        // includeDeaccessioned false
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), false, apiToken);
+        getDownloadSizeResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+        // includeDeaccessioned true
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), true, apiToken);
+        getDownloadSizeResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Test that the dataset file counts for a deaccessioned dataset can be accessed by a guest
+        // By latest published version
+        Response getVersionFileCountsGuestUserResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), true, null);
+        getVersionFileCountsGuestUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        // By specific version 1.0
+        getVersionFileCountsGuestUserResponse = UtilIT.getDownloadSize(datasetId, "1.0", null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), true, null);
+        getVersionFileCountsGuestUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Guest User Tests:
+        // By latest published version includeDeaccessioned true
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), true, null);
+        getDownloadSizeResponse.prettyPrint();
+        getDownloadSizeResponse.then().assertThat().statusCode(OK.getStatusCode());
+        // By specific version 1.0 includeDeaccessioned true
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, "1.0", null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), true, null);
+        getDownloadSizeResponse.prettyPrint();
+        getDownloadSizeResponse.then().assertThat().statusCode(OK.getStatusCode());
+        // includeDeaccessioned false
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), false, null);
+        getDownloadSizeResponse.prettyPrint();
+        getDownloadSizeResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // Create new dataset with no files and deaccession
+        createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+        deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionDatasetResponse.prettyPrint();
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // includeDeaccessioned guest gets deaccessioned download size
+        getDownloadSizeResponse = UtilIT.getDownloadSize(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, DatasetVersionFilesServiceBean.FileDownloadSizeMode.All.toString(), true, null);
+        getDownloadSizeResponse.prettyPrint();
+        getDownloadSizeResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.storageSize", equalTo(0));
+        // includeDeaccessioned guest gets deaccessioned version file counts
+        Response getDatasetVersionFileResponse = UtilIT.getVersionFileCounts(datasetId, DS_VERSION_LATEST_PUBLISHED, null, null, null, null, null, true, null);
+        getDatasetVersionFileResponse.prettyPrint();
+        getDatasetVersionFileResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total", equalTo(0));
+    }
+
+    @Test
+    public void testGetDownloadCount() {
+        Response createUser1 = UtilIT.createRandomUser();
+        createUser1.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser1);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String datasetPersistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(String.valueOf(datasetId), "scripts/search/data/replace_test/004.txt", apiToken);
+        uploadFileResponse.prettyPrint();
+        Integer fileId = Integer.parseInt(JsonPath.from(uploadFileResponse.body().asString()).getString("data.files[0].dataFile.id"));
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+
+        Response createUser2 = UtilIT.createRandomUser();
+        createUser2.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken2 = UtilIT.getApiTokenFromResponse(createUser2);
+        UtilIT.downloadFile(fileId, apiToken2);
+
+        UtilIT.setSetting(":MDCStartDate", "2019-10-01");
+        Response countResponse = UtilIT.getDownloadCountByDatasetId(datasetId, apiToken2, null);
+        countResponse.prettyPrint();
+        countResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("downloadCount", equalTo(0))
+                .body("MDCStartDate", equalTo("2019-10-01"));
+        countResponse = UtilIT.getDownloadCountByDatasetId(datasetId, apiToken2, true);
+        countResponse.prettyPrint();
+        countResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("downloadCount", equalTo(1));
+    }
+
+    @Test
+    public void testGetUserPermissionsOnDataset() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // Call with valid dataset id
+        Response getUserPermissionsOnDatasetResponse = UtilIT.getUserPermissionsOnDataset(Integer.toString(datasetId), apiToken);
+        getUserPermissionsOnDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+        boolean canViewUnpublishedDataset = JsonPath.from(getUserPermissionsOnDatasetResponse.body().asString()).getBoolean("data.canViewUnpublishedDataset");
+        assertTrue(canViewUnpublishedDataset);
+        boolean canEditDataset = JsonPath.from(getUserPermissionsOnDatasetResponse.body().asString()).getBoolean("data.canEditDataset");
+        assertTrue(canEditDataset);
+        boolean canPublishDataset = JsonPath.from(getUserPermissionsOnDatasetResponse.body().asString()).getBoolean("data.canPublishDataset");
+        assertTrue(canPublishDataset);
+        boolean canManageDatasetPermissions = JsonPath.from(getUserPermissionsOnDatasetResponse.body().asString()).getBoolean("data.canManageDatasetPermissions");
+        assertTrue(canManageDatasetPermissions);
+        boolean canDeleteDatasetDraft = JsonPath.from(getUserPermissionsOnDatasetResponse.body().asString()).getBoolean("data.canDeleteDatasetDraft");
+        assertTrue(canDeleteDatasetDraft);
+
+        // Call with invalid dataset id
+        Response getUserPermissionsOnDatasetInvalidIdResponse = UtilIT.getUserPermissionsOnDataset("testInvalidId", apiToken);
+        getUserPermissionsOnDatasetInvalidIdResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+    }
+
+    //Requires that a Globus remote store be set up as with the parameters in the GlobusOverlayAccessIOTest class
+    //Tests whether the API call succeeds and has some of the expected parameters
+    @Test
+    @Disabled
+    public void testGetGlobusUploadParameters() {
+        //Creates managed and remote Globus stores
+        GlobusOverlayAccessIOTest.setUp();
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+
+        Response setDriver = UtilIT.setDatasetStorageDriver(datasetId, System.getProperty("dataverse.files.globusr.label"), apiToken);
+        assertEquals(200, setDriver.getStatusCode());
+
+        Response getUploadParams = UtilIT.getDatasetGlobusUploadParameters(datasetId, "en_us", apiToken);
+        assertEquals(200, getUploadParams.getStatusCode());
+        JsonObject data = JsonUtil.getJsonObject(getUploadParams.getBody().asString());
+        JsonObject queryParams = data.getJsonObject("queryParameters");
+        assertEquals("en_us", queryParams.getString("dvLocale"));
+        assertEquals("false", queryParams.getString("managed"));
+        //Assumes only one reference endpoint with a basepath is configured
+        assertTrue(queryParams.getJsonArray("referenceEndpointsWithPaths").get(0).toString().indexOf(System.getProperty("dataverse.files.globusr." + AbstractRemoteOverlayAccessIO.REFERENCE_ENDPOINTS_WITH_BASEPATHS)) > -1);
+        JsonArray signedUrls = data.getJsonArray("signedUrls");
+        boolean found = false;
+        for (int i = 0; i < signedUrls.size(); i++) {
+            JsonObject signedUrl = signedUrls.getJsonObject(i);
+            if (signedUrl.getString("name").equals("requestGlobusReferencePaths")) {
+                found=true;
+                break;
+            }
+        }
+        assertTrue(found);
+        //Removes managed and remote Globus stores
+        GlobusOverlayAccessIOTest.tearDown();
+    }
+
+    @Test
+    public void testGetCanDownloadAtLeastOneFile() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        createUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        String datasetPersistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+
+        // Upload file
+        String pathToTestFile = "src/test/resources/images/coffeeshop.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        String fileId = JsonPath.from(uploadResponse.body().asString()).getString("data.files[0].dataFile.id");
+
+        // Publish dataset version
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Create a second user to call the getCanDownloadAtLeastOneFile method
+        Response createSecondUserResponse = UtilIT.createRandomUser();
+        createSecondUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String secondUserApiToken = UtilIT.getApiTokenFromResponse(createSecondUserResponse);
+        String secondUserUsername = UtilIT.getUsernameFromResponse(createSecondUserResponse);
+
+        // Call when a file is released
+        Response canDownloadAtLeastOneFileResponse = UtilIT.getCanDownloadAtLeastOneFile(Integer.toString(datasetId), DS_VERSION_LATEST, secondUserApiToken);
+        canDownloadAtLeastOneFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+        boolean canDownloadAtLeastOneFile = JsonPath.from(canDownloadAtLeastOneFileResponse.body().asString()).getBoolean("data");
+        assertTrue(canDownloadAtLeastOneFile);
+
+        // Restrict file
+        Response restrictFileResponse = UtilIT.restrictFile(fileId, true, apiToken);
+        restrictFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Publish dataset version
+        publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Call when a file is restricted and the user does not have access
+        canDownloadAtLeastOneFileResponse = UtilIT.getCanDownloadAtLeastOneFile(Integer.toString(datasetId), DS_VERSION_LATEST, secondUserApiToken);
+        canDownloadAtLeastOneFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+        canDownloadAtLeastOneFile = JsonPath.from(canDownloadAtLeastOneFileResponse.body().asString()).getBoolean("data");
+        assertFalse(canDownloadAtLeastOneFile);
+
+        // Grant restricted file access to the user
+        Response grantFileAccessResponse = UtilIT.grantFileAccess(fileId, "@" + secondUserUsername, apiToken);
+        grantFileAccessResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Call when a file is restricted and the user has access
+        canDownloadAtLeastOneFileResponse = UtilIT.getCanDownloadAtLeastOneFile(Integer.toString(datasetId), DS_VERSION_LATEST, secondUserApiToken);
+        canDownloadAtLeastOneFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+        canDownloadAtLeastOneFile = JsonPath.from(canDownloadAtLeastOneFileResponse.body().asString()).getBoolean("data");
+        assertTrue(canDownloadAtLeastOneFile);
+
+        // Create a third user to call the getCanDownloadAtLeastOneFile method
+        Response createThirdUserResponse = UtilIT.createRandomUser();
+        createThirdUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String thirdUserApiToken = UtilIT.getApiTokenFromResponse(createThirdUserResponse);
+        String thirdUserUsername = UtilIT.getUsernameFromResponse(createThirdUserResponse);
+
+        // Call when a file is restricted and the user does not have access
+        canDownloadAtLeastOneFileResponse = UtilIT.getCanDownloadAtLeastOneFile(Integer.toString(datasetId), DS_VERSION_LATEST, thirdUserApiToken);
+        canDownloadAtLeastOneFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+        canDownloadAtLeastOneFile = JsonPath.from(canDownloadAtLeastOneFileResponse.body().asString()).getBoolean("data");
+        assertFalse(canDownloadAtLeastOneFile);
+
+        // Grant fileDownloader role on the dataset to the user
+        Response grantDatasetFileDownloaderRoleOnDatasetResponse = UtilIT.grantRoleOnDataset(datasetPersistentId, "fileDownloader", "@" + thirdUserUsername, apiToken);
+        grantDatasetFileDownloaderRoleOnDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Call when a file is restricted and the user has fileDownloader role on the dataset
+        canDownloadAtLeastOneFileResponse = UtilIT.getCanDownloadAtLeastOneFile(Integer.toString(datasetId), DS_VERSION_LATEST, thirdUserApiToken);
+        canDownloadAtLeastOneFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+        canDownloadAtLeastOneFile = JsonPath.from(canDownloadAtLeastOneFileResponse.body().asString()).getBoolean("data");
+        assertTrue(canDownloadAtLeastOneFile);
+
+        // Create a fourth user to call the getCanDownloadAtLeastOneFile method
+        Response createFourthUserResponse = UtilIT.createRandomUser();
+        createFourthUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String fourthUserApiToken = UtilIT.getApiTokenFromResponse(createFourthUserResponse);
+        String fourthUserUsername = UtilIT.getUsernameFromResponse(createFourthUserResponse);
+
+        // Call when a file is restricted and the user does not have access
+        canDownloadAtLeastOneFileResponse = UtilIT.getCanDownloadAtLeastOneFile(Integer.toString(datasetId), DS_VERSION_LATEST, fourthUserApiToken);
+        canDownloadAtLeastOneFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+        canDownloadAtLeastOneFile = JsonPath.from(canDownloadAtLeastOneFileResponse.body().asString()).getBoolean("data");
+        assertFalse(canDownloadAtLeastOneFile);
+
+        // Grant fileDownloader role on the collection to the user
+        Response grantDatasetFileDownloaderRoleOnCollectionResponse = UtilIT.grantRoleOnDataverse(dataverseAlias, "fileDownloader", "@" + fourthUserUsername, apiToken);
+        grantDatasetFileDownloaderRoleOnCollectionResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Call when a file is restricted and the user has fileDownloader role on the collection
+        canDownloadAtLeastOneFileResponse = UtilIT.getCanDownloadAtLeastOneFile(Integer.toString(datasetId), DS_VERSION_LATEST, fourthUserApiToken);
+        canDownloadAtLeastOneFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+        canDownloadAtLeastOneFile = JsonPath.from(canDownloadAtLeastOneFileResponse.body().asString()).getBoolean("data");
+        assertTrue(canDownloadAtLeastOneFile);
+
+        // Call with invalid dataset id
+        Response getUserPermissionsOnDatasetInvalidIdResponse = UtilIT.getCanDownloadAtLeastOneFile("testInvalidId", DS_VERSION_LATEST, secondUserApiToken);
+        getUserPermissionsOnDatasetInvalidIdResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+    }
+
+    @Test
+    public void testCompareDatasetVersionsAPI() throws InterruptedException {
+
+        Response createUser = UtilIT.createRandomUser();
+        assertEquals(200, createUser.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        Response getDatasetJsonBeforePublishing = UtilIT.nativeGet(datasetId, apiToken);
+        String protocol = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.protocol");
+        String authority = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.authority");
+        String identifier = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.identifier");
+        String datasetPersistentId = protocol + ":" + authority + "/" + identifier;
+        // used for all added files
+        JsonObjectBuilder json = Json.createObjectBuilder()
+                .add("description", "my description")
+                .add("directoryLabel", "/data/subdir1/")
+                .add("categories", Json.createArrayBuilder()
+                        .add("Data")
+                );
+        JsonObject jsonObj = json.build();
+        String pathToFile = "src/main/webapp/resources/images/dataverse-icon-1200.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(String.valueOf(datasetId), pathToFile, jsonObj, apiToken);
+        uploadResponse.prettyPrint();
+        uploadResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Integer modifyFileId = UtilIT.getDataFileIdFromResponse(uploadResponse);
+        pathToFile = "src/main/webapp/resources/images/dataverseproject_logo.jpg";
+        uploadResponse = UtilIT.uploadFileViaNative(String.valueOf(datasetId), pathToFile, jsonObj, apiToken);
+        uploadResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Integer deleteFileId = UtilIT.getDataFileIdFromResponse(uploadResponse);
+
+        pathToFile = "src/main/webapp/resources/images/fav/favicon-16x16.png";
+        uploadResponse = UtilIT.uploadFileViaNative(String.valueOf(datasetId), pathToFile, jsonObj, apiToken);
+        uploadResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Integer replaceFileId = UtilIT.getDataFileIdFromResponse(uploadResponse);
+
+        Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        assertEquals(200, publishDataverse.getStatusCode());
+
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken);
+        assertEquals(200, publishDataset.getStatusCode());
+
+        // post publish update to create DRAFT version
+        String pathToJsonFilePostPub = "doc/sphinx-guides/source/_static/api/dataset-add-metadata-after-pub.json";
+        Response addDataToPublishedVersion = UtilIT.addDatasetMetadataViaNative(datasetPersistentId, pathToJsonFilePostPub, apiToken);
+        addDataToPublishedVersion.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Test adding a file
+        pathToFile = "src/test/resources/tab/test.tab";
+        Response uploadTabularFileResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToFile, jsonObj, apiToken);
+        uploadTabularFileResponse.prettyPrint();
+        uploadTabularFileResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Integer addedFileId = UtilIT.getDataFileIdFromResponse(uploadTabularFileResponse);
+
+        // Ensure tabular file is ingested
+        sleep(2000);
+
+        String tabularTagName = "Survey";
+        Response setFileTabularTagsResponse = UtilIT.setFileTabularTags(String.valueOf(addedFileId), apiToken, List.of(tabularTagName));
+        setFileTabularTagsResponse.prettyPrint();
+        setFileTabularTagsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Test removing a file
+        uploadResponse = UtilIT.deleteFile(deleteFileId, apiToken);
+        uploadResponse.prettyPrint();
+        uploadResponse.then().assertThat()
+                .statusCode(NO_CONTENT.getStatusCode());
+
+        // Test Replacing a file
+        Response replaceResponse = UtilIT.replaceFile(String.valueOf(replaceFileId), "src/main/webapp/resources/images/fav/favicon-32x32.png", jsonObj, apiToken);
+        replaceResponse.prettyPrint();
+        replaceResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Test modify by restricting the file
+        Response restrictResponse = UtilIT.restrictFile(modifyFileId.toString(), true, apiToken);
+        restrictResponse.prettyPrint();
+        restrictResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Also test a terms of access change
+        String jsonLDTerms = "{\"https://dataverse.org/schema/core#fileTermsOfAccess\":{\"https://dataverse.org/schema/core#dataAccessPlace\":\"Somewhere\"}}";
+        Response updateTerms = UtilIT.updateDatasetJsonLDMetadata(datasetId, apiToken, jsonLDTerms, true);
+        updateTerms.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response compareResponse = UtilIT.compareDatasetVersions(datasetPersistentId, ":latest-published", ":draft", apiToken);
+        compareResponse.prettyPrint();
+        compareResponse.then().assertThat()
+                .body("data.oldVersion.versionNumber", CoreMatchers.equalTo("1.0"))
+                .body("data.oldVersion.versionState", CoreMatchers.equalTo("RELEASED"))
+                .body("data.newVersion.versionNumber", CoreMatchers.equalTo("DRAFT"))
+                .body("data.newVersion.versionState", CoreMatchers.equalTo("DRAFT"))
+                .body("data.metadataChanges[0].blockName", CoreMatchers.equalTo("Citation Metadata"))
+                .body("data.metadataChanges[0].changed[0].fieldName", CoreMatchers.equalTo("Author"))
+                .body("data.metadataChanges[0].changed[0].oldValue", CoreMatchers.containsString("Finch, Fiona; (Birds Inc.)"))
+                .body("data.metadataChanges[1].blockName", CoreMatchers.equalTo("Life Sciences Metadata"))
+                .body("data.metadataChanges[1].changed[0].fieldName", CoreMatchers.equalTo("Design Type"))
+                .body("data.metadataChanges[1].changed[0].oldValue", CoreMatchers.containsString(""))
+                .body("data.metadataChanges[1].changed[0].newValue", CoreMatchers.containsString("Nested Case Control Design"))
+                .body("data.metadataChanges[1].changed[0].newValue", CoreMatchers.containsString("Parallel Group Design"))
+                .body("data.filesAdded[0].fileName", CoreMatchers.equalTo("test.tab"))
+                .body("data.filesAdded[0].filePath", CoreMatchers.equalTo("data/subdir1"))
+                .body("data.filesAdded[0].description", CoreMatchers.equalTo("my description"))
+                .body("data.filesAdded[0].tags[0]", CoreMatchers.equalTo("Survey"))
+                .body("data.filesRemoved[0].fileName", CoreMatchers.equalTo("dataverseproject_logo.jpg"))
+                .body("data.fileChanges[0].fileName", CoreMatchers.equalTo("dataverse-icon-1200.png"))
+                .body("data.fileChanges[0].changed[0].newValue", CoreMatchers.equalTo("true"))
+                .body("data.filesReplaced[0].oldFile.fileName", CoreMatchers.equalTo("favicon-16x16.png"))
+                .body("data.filesReplaced[0].newFile.fileName", CoreMatchers.equalTo("favicon-32x32.png"))
+                .body("data.TermsOfAccess", CoreMatchers.notNullValue())
+                .statusCode(OK.getStatusCode());
+
+        compareResponse = UtilIT.compareDatasetVersions(datasetPersistentId, ":draft", ":latest-published", apiToken);
+        compareResponse.prettyPrint();
+        compareResponse.then().assertThat()
+                .body("message", CoreMatchers.equalTo(BundleUtil.getStringFromBundle("dataset.version.compare.incorrect.order")))
+                .statusCode(BAD_REQUEST.getStatusCode());
+        
+        
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+        
+        compareResponse = UtilIT.compareDatasetVersions(datasetPersistentId, ":latest-published", ":draft", apiToken, false);
+        compareResponse.prettyPrint();
+        compareResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        compareResponse = UtilIT.compareDatasetVersions(datasetPersistentId,  ":latest-published", ":draft", apiToken, true);
+        compareResponse.prettyPrint();
+        compareResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        
+        
+    }
+    
+    @Test
+    public void testSummaryDatasetVersionsDifferencesAPI() throws InterruptedException {
+
+        Response createUser = UtilIT.createRandomUser();
+        assertEquals(200, createUser.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        Response getDatasetJsonBeforePublishing = UtilIT.nativeGet(datasetId, apiToken);
+        String protocol = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.protocol");
+        String authority = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.authority");
+        String identifier = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.identifier");
+        String datasetPersistentId = protocol + ":" + authority + "/" + identifier;
+        // used for all added files
+        JsonObjectBuilder json = Json.createObjectBuilder()
+                .add("description", "my description")
+                .add("directoryLabel", "/data/subdir1/")
+                .add("categories", Json.createArrayBuilder()
+                        .add("Data")
+                );
+        JsonObject jsonObj = json.build();
+        String pathToFile = "src/main/webapp/resources/images/dataverse-icon-1200.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(String.valueOf(datasetId), pathToFile, jsonObj, apiToken);
+        uploadResponse.prettyPrint();
+        uploadResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Integer modifyFileId = UtilIT.getDataFileIdFromResponse(uploadResponse);
+        pathToFile = "src/main/webapp/resources/images/dataverseproject_logo.jpg";
+        uploadResponse = UtilIT.uploadFileViaNative(String.valueOf(datasetId), pathToFile, jsonObj, apiToken);
+        uploadResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Integer deleteFileId = UtilIT.getDataFileIdFromResponse(uploadResponse);
+
+        pathToFile = "src/main/webapp/resources/images/fav/favicon-16x16.png";
+        uploadResponse = UtilIT.uploadFileViaNative(String.valueOf(datasetId), pathToFile, jsonObj, apiToken);
+        uploadResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Integer replaceFileId = UtilIT.getDataFileIdFromResponse(uploadResponse);
+
+        Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        assertEquals(200, publishDataverse.getStatusCode());
+
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken);
+        assertEquals(200, publishDataset.getStatusCode());
+
+        // post publish update to create DRAFT version
+        String pathToJsonFilePostPub = "doc/sphinx-guides/source/_static/api/dataset-add-metadata-after-pub.json";
+        Response addDataToPublishedVersion = UtilIT.addDatasetMetadataViaNative(datasetPersistentId, pathToJsonFilePostPub, apiToken);
+        addDataToPublishedVersion.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Test adding a file
+        pathToFile = "src/test/resources/tab/test.tab";
+        Response uploadTabularFileResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToFile, jsonObj, apiToken);
+        uploadTabularFileResponse.prettyPrint();
+        uploadTabularFileResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Integer addedFileId = UtilIT.getDataFileIdFromResponse(uploadTabularFileResponse);
+
+        // Ensure tabular file is ingested
+        sleep(2000);
+
+        String tabularTagName = "Survey";
+        Response setFileTabularTagsResponse = UtilIT.setFileTabularTags(String.valueOf(addedFileId), apiToken, List.of(tabularTagName));
+        setFileTabularTagsResponse.prettyPrint();
+        setFileTabularTagsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Test removing a file
+        uploadResponse = UtilIT.deleteFile(deleteFileId, apiToken);
+        uploadResponse.prettyPrint();
+        uploadResponse.then().assertThat()
+                .statusCode(NO_CONTENT.getStatusCode());
+
+        // Test Replacing a file
+        Response replaceResponse = UtilIT.replaceFile(String.valueOf(replaceFileId), "src/main/webapp/resources/images/fav/favicon-32x32.png", jsonObj, apiToken);
+        replaceResponse.prettyPrint();
+        replaceResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Test modify by restricting the file
+        Response restrictResponse = UtilIT.restrictFile(modifyFileId.toString(), true, apiToken);
+        restrictResponse.prettyPrint();
+        restrictResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Also test a terms of access change
+        String jsonLDTerms = "{\"https://dataverse.org/schema/core#fileTermsOfAccess\":{\"https://dataverse.org/schema/core#dataAccessPlace\":\"Somewhere\"}}";
+        Response updateTerms = UtilIT.updateDatasetJsonLDMetadata(datasetId, apiToken, jsonLDTerms, true);
+        updateTerms.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        
+
+        Response compareResponse = UtilIT.summaryDatasetVersionDifferences(datasetPersistentId, apiToken);
+        compareResponse.prettyPrint(); 
+
+        compareResponse.then().assertThat()
+                .body("data[1].versionNumber", equalTo("1.0"))
+                .body("data[1].summary", equalTo("firstPublished"))
+                .body("data[0].versionNumber", equalTo("DRAFT"))
+                .body("data[0].summary.'Citation Metadata'.Author.added", equalTo(2))
+                .body("data[0].summary.'Citation Metadata'.Subject.added", equalTo(2))
+                .body("data[0].summary.'Additional Citation Metadata'.changed", equalTo(0))
+                .body("data[0].summary.'Additional Citation Metadata'.added", equalTo(2))
+                .body("data[0].summary.'Life Sciences Metadata'.added", equalTo(2))
+                .body("data[0].summary.'Life Sciences Metadata'.deleted", equalTo(0))
+                .body("data[0].summary.files.added", equalTo(1))
+                .body("data[0].summary.files.changedFileMetaData", equalTo(2))
+                .statusCode(OK.getStatusCode());
+
+        //user with no privileges will only see the published version
+        
+        Response createUsernoPriv = UtilIT.createRandomUser();
+        assertEquals(200, createUsernoPriv.getStatusCode());
+        String apiTokenNoPriv = UtilIT.getApiTokenFromResponse(createUsernoPriv);
+        
+        Response compareResponse2 = UtilIT.summaryDatasetVersionDifferences(datasetPersistentId, apiTokenNoPriv);
+        compareResponse2.prettyPrint();
+        compareResponse2.then().assertThat()
+                .body("data[0].versionNumber", CoreMatchers.equalTo("1.0"))
+                .body("data[0].summary", CoreMatchers.equalTo("firstPublished"))
+                .statusCode(OK.getStatusCode());
+        
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, DS_VERSION_LATEST_PUBLISHED, "Test deaccession reason.", null, apiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+        
+        compareResponse = UtilIT.summaryDatasetVersionDifferences(datasetPersistentId, apiToken);
+        compareResponse.prettyPrint(); 
+        
+        compareResponse.then().assertThat()
+                .body("data[1].versionNumber", equalTo("1.0"))
+                .body("data[1].summary.deaccessioned.reason", equalTo("Test deaccession reason."))
+                .body("data[0].versionNumber", equalTo("DRAFT"))
+                .body("data[0].summary.", equalTo("previousVersionDeaccessioned"))
+                .statusCode(OK.getStatusCode());
+        
+        
+    }
+    
+    @Test
+    public void testRequireFilesToPublishDatasets() {
+        // Create superuser and regular user
+        Response createUserResponse = UtilIT.createRandomUser();
+        createUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String usernameAdmin = UtilIT.getUsernameFromResponse(createUserResponse);
+        String apiTokenAdmin = UtilIT.getApiTokenFromResponse(createUserResponse);
+        Response makeSuperUser = UtilIT.makeSuperUser(usernameAdmin);
+        assertEquals(200, makeSuperUser.getStatusCode());
+
+        createUserResponse = UtilIT.createRandomUser();
+        createUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        // Create and publish a top level Dataverse (under root) with a requireFilesToPublishDataset set to true
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String ownerAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        // Only admin can set this attribute
+        Response setDataverseAttributeResponse = UtilIT.setCollectionAttribute(ownerAlias, "requireFilesToPublishDataset", "true", apiToken);
+        setDataverseAttributeResponse.prettyPrint();
+        setDataverseAttributeResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+        setDataverseAttributeResponse = UtilIT.setCollectionAttribute(ownerAlias, "requireFilesToPublishDataset", "true", apiTokenAdmin);
+        setDataverseAttributeResponse.prettyPrint();
+        setDataverseAttributeResponse.then().assertThat().statusCode(OK.getStatusCode());
+        setDataverseAttributeResponse.then().assertThat().body("data.effectiveRequiresFilesToPublishDataset", equalTo(true));
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(ownerAlias, apiTokenAdmin);
+        publishDataverseResponse.prettyPrint();
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Create and publish a new Dataverse under the above Dataverse with requireFilesToPublishDataset not set (default null)
+        String alias = "dv2-" + UtilIT.getRandomIdentifier();
+        createDataverseResponse = UtilIT.createSubDataverse(alias, null, apiToken, ownerAlias);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(alias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Create a Dataset under the 2nd level Dataverse
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(alias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        Integer id = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        // Try to publish with no files (minimum is 1 file from the top level Dataverse)
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(String.valueOf(id), "major", apiToken);
+        publishDatasetResponse.prettyPrint();
+        publishDatasetResponse.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+        publishDatasetResponse.then().assertThat().body("message", containsString(
+                BundleUtil.getStringFromBundle("dataset.mayNotPublish.FilesRequired")
+        ));
+
+        // Upload 1 file and try to publish again
+        String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(String.valueOf(id), pathToFile, apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(String.valueOf(id), "major", apiToken);
+        publishDatasetResponse.prettyPrint();
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+    }
+    
+    @Test
+    public void testDeleteFiles() {
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        // Add files to the dataset
+        String pathToFile1 = "scripts/api/data/licenses/licenseCC0-1.0.json";
+        String pathToFile2 = "scripts/api/data/licenses/licenseCC-BY-4.0.json";
+        String pathToFile3 = "scripts/api/data/licenses/licenseCC-BY-NC-4.0.json";
+        String pathToFile4 = "scripts/api/data/licenses/licenseCC-BY-NC-ND-4.0.json";
+        String pathToFile5 = "scripts/api/data/licenses/licenseCC-BY-ND-4.0.json";
+
+        JsonObjectBuilder json = Json.createObjectBuilder();
+        json.add("description", "File 1");
+        Response addFile1Response = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile1, json.build(), apiToken);
+        Long file1Id = JsonPath.from(addFile1Response.body().asString()).getLong("data.files[0].dataFile.id");
+
+        json.add("description", "File 2");
+        Response addFile2Response = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile2, json.build(), apiToken);
+        Long file2Id = JsonPath.from(addFile2Response.body().asString()).getLong("data.files[0].dataFile.id");
+
+        json.add("description", "File 3");
+        Response addFile3Response = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile3, json.build(), apiToken);
+        Long file3Id = JsonPath.from(addFile3Response.body().asString()).getLong("data.files[0].dataFile.id");
+
+        json.add("description", "File 4");
+        Response addFile4Response = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile4, json.build(), apiToken);
+        Long file4Id = JsonPath.from(addFile4Response.body().asString()).getLong("data.files[0].dataFile.id");
+
+        json.add("description", "File 5");
+        Response addFile5Response = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile5, json.build(), apiToken);
+        Long file5Id = JsonPath.from(addFile5Response.body().asString()).getLong("data.files[0].dataFile.id");
+
+        // Delete files 1 and 2
+        JsonArrayBuilder fileIdsToDelete = Json.createArrayBuilder();
+        fileIdsToDelete.add(file1Id);
+        fileIdsToDelete.add(file2Id);
+
+        Response deleteFilesResponse = UtilIT.deleteDatasetFiles(datasetId.toString(), fileIdsToDelete.build(), apiToken);
+        deleteFilesResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", startsWith("2"));
+
+        // Verify files were deleted
+        Response getDatasetResponse = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.files.findAll { it.dataFile.id == " + file1Id + " }.size()", equalTo(0))
+                .body("data.latestVersion.files.findAll { it.dataFile.id == " + file2Id + " }.size()", equalTo(0))
+                .body("data.latestVersion.files.findAll { it.dataFile.id == " + file3Id + " }.size()", equalTo(1))
+                .body("data.latestVersion.files.findAll { it.dataFile.id == " + file4Id + " }.size()", equalTo(1))
+                .body("data.latestVersion.files.findAll { it.dataFile.id == " + file5Id + " }.size()", equalTo(1));
+
+        
+        // Test deleting after dataset publication
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Publish the dataset
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Delete files 3 and 4 from the published dataset
+        fileIdsToDelete = Json.createArrayBuilder();
+        fileIdsToDelete.add(file3Id);
+        fileIdsToDelete.add(file4Id);
+
+        deleteFilesResponse = UtilIT.deleteDatasetFiles(datasetId.toString(), fileIdsToDelete.build(), apiToken);
+        deleteFilesResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", startsWith("2"));
+
+        // Verify files were deleted
+        getDatasetResponse = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.files.findAll { it.dataFile.id == " + file3Id + " }.size()", equalTo(0))
+                .body("data.latestVersion.files.findAll { it.dataFile.id == " + file4Id + " }.size()", equalTo(0))
+                .body("data.latestVersion.files.findAll { it.dataFile.id == " + file5Id + " }.size()", equalTo(1));
+
+        // Test error conditions
+
+        // Try to delete a non-existent file
+        fileIdsToDelete = Json.createArrayBuilder();
+        fileIdsToDelete.add(999999L);
+
+        deleteFilesResponse = UtilIT.deleteDatasetFiles(datasetId.toString(), fileIdsToDelete.build(), apiToken);
+        deleteFilesResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", containsString("No files"));
+
+        // Try to delete files from a non-existent dataset
+        deleteFilesResponse = UtilIT.deleteDatasetFiles("999999", fileIdsToDelete.build(), apiToken);
+        deleteFilesResponse.then().assertThat()
+                .statusCode(NOT_FOUND.getStatusCode());
+
+        // Try to delete files without proper permissions
+        // Create a second user
+        Response createSecondUser = UtilIT.createRandomUser();
+        String unauthorizedUsername = UtilIT.getUsernameFromResponse(createSecondUser);
+        String unauthorizedUserApiToken = UtilIT.getApiTokenFromResponse(createSecondUser);
+
+        //Reset to a valid file id
+        fileIdsToDelete = Json.createArrayBuilder();
+        fileIdsToDelete.add(file5Id);
+        deleteFilesResponse = UtilIT.deleteDatasetFiles(datasetId.toString(), fileIdsToDelete.build(), unauthorizedUserApiToken);
+        deleteFilesResponse.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode());
+
+        // Make the user a superuser to destroy dataset
+        Response makeSuperUserResponse = UtilIT.setSuperuserStatus(username, true);
+        makeSuperUserResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        // Clean up
+        Response destroyDatasetResponse = UtilIT.destroyDataset(datasetId, apiToken);
+        assertEquals(200, destroyDatasetResponse.getStatusCode());
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUnauthorizedUserResponse = UtilIT.deleteUser(unauthorizedUsername);
+        assertEquals(200, deleteUnauthorizedUserResponse.getStatusCode());
+        
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        assertEquals(200, deleteUserResponse.getStatusCode());
+    }
+    
+    @Test
+    public void testUpdateMultipleFileMetadata() {
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        // Create and publish a top level Dataverse (under root)
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String ownerAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        
+        // Create a dataset with multiple files
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(ownerAlias, apiToken);
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+
+        String pathToFile1 = "scripts/api/data/licenses/licenseCC0-1.0.json";
+        String pathToFile2 = "scripts/api/data/licenses/licenseCC-BY-4.0.json";
+        String pathToFile3 = "scripts/search/ds.tsv";
+
+        JsonObjectBuilder json = Json.createObjectBuilder();
+        json.add("description", "File 1");
+        Response addFile1Response = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile1, json.build(), apiToken);
+        Integer file1Id = UtilIT.getDataFileIdFromResponse(addFile1Response);
+
+        json = Json.createObjectBuilder();
+        json.add("description", "File 2");
+        Response addFile2Response = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile2, json.build(), apiToken);
+        Integer file2Id = UtilIT.getDataFileIdFromResponse(addFile2Response);
+
+        json = Json.createObjectBuilder();
+        json.add("description", "File 3");
+        Response addFile3Response = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile3, json.build(), apiToken);
+        Integer file3Id = UtilIT.getDataFileIdFromResponse(addFile3Response);
+
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration for " + pathToFile3);
+        
+        // Prepare JSON for updating file metadata
+        JsonArrayBuilder filesArrayBuilder = Json.createArrayBuilder();
+        filesArrayBuilder.add(Json.createObjectBuilder()
+                .add("dataFileId", file1Id)
+                .add("label", "Updated File 1")
+                .add("directoryLabel", "dir1/")
+                .add("description", "Updated description for File 1")
+                .add("categories", Json.createArrayBuilder().add("Category 1").add("Category 2"))
+                .add("provFreeForm", "Updated provenance for File 1")
+                .add("restrict", true));
+
+        filesArrayBuilder.add(Json.createObjectBuilder()
+                .add("dataFileId", file2Id)
+                .add("label", "Updated File 2")
+                .add("directoryLabel", "dir2/")
+                .add("description", "Updated description for File 2")
+                .add("categories", Json.createArrayBuilder().add("Category 3"))
+                .add("provFreeForm", "Updated provenance for File 2"));
+
+        // Test updating file metadata
+        Response updateResponse = UtilIT.updateDatasetFilesMetadata(datasetId.toString(), filesArrayBuilder.build(), apiToken);
+        updateResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Verify the changes
+        Response getDatasetResponse = UtilIT.getDatasetVersion(datasetPersistentId, ":draft", apiToken);
+        getDatasetResponse.then().assertThat()
+        .statusCode(OK.getStatusCode());
+        JsonObject data = getDataAsJsonObject(getDatasetResponse.getBody().asString());
+        JsonArray files = data.getJsonArray("files");
+        JsonUtil.prettyPrint(files);
+        for (JsonValue fileValue : files) {
+            JsonObject file = (JsonObject) fileValue;
+            JsonObject dataFile = file.getJsonObject("dataFile");
+            if (dataFile.getInt("id") == file1Id) {
+                assertEquals("Updated File 1", file.getString("label"));
+                assertEquals("dir1", file.getString("directoryLabel"));
+                assertEquals("Updated description for File 1", dataFile.getString("description"));
+                assertTrue(dataFile.getJsonArray("categories").contains(Json.createValue("Category 1")));
+                assertTrue(dataFile.getJsonArray("categories").contains(Json.createValue("Category 2")));
+                assertTrue(file.getBoolean("restricted"));
+                
+                // Check provFreeForm for file1
+                Response provResponse = UtilIT.getProvFreeForm(file1Id.toString(), apiToken);
+                provResponse.then().assertThat()
+                    .statusCode(OK.getStatusCode())
+                    .body("data.text", equalTo("Updated provenance for File 1"));
+            } else if (dataFile.getInt("id") == file2Id) {
+                assertEquals("Updated File 2", file.getString("label"));
+                assertEquals("dir2", file.getString("directoryLabel"));
+                assertEquals("Updated description for File 2", dataFile.getString("description"));
+                assertTrue(dataFile.getJsonArray("categories").contains(Json.createValue("Category 3")));
+                
+                // Check provFreeForm for file2
+                Response provResponse = UtilIT.getProvFreeForm(file2Id.toString(), apiToken);
+                provResponse.then().assertThat()
+                    .statusCode(OK.getStatusCode())
+                    .body("data.text", equalTo("Updated provenance for File 2"));
+            }
+        }
+
+        // Test updating the same file with the same restrict value
+        JsonArrayBuilder sameRestrictValueArrayBuilder = Json.createArrayBuilder();
+        sameRestrictValueArrayBuilder.add(Json.createObjectBuilder()
+                .add("dataFileId", file1Id)
+                .add("restrict", true));
+
+        Response sameRestrictUpdateResponse = UtilIT.updateDatasetFilesMetadata(datasetPersistentId, sameRestrictValueArrayBuilder.build(), apiToken);
+        sameRestrictUpdateResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", containsString("is already restricted"));
+
+        // Test updating a file not in the dataset
+        JsonArrayBuilder invalidFilesArrayBuilder = Json.createArrayBuilder();
+        invalidFilesArrayBuilder.add(Json.createObjectBuilder()
+                .add("dataFileId", 999999)
+                .add("label", "Invalid File"));
+
+        Response invalidUpdateResponse = UtilIT.updateDatasetFilesMetadata(datasetId.toString(), invalidFilesArrayBuilder.build(), apiToken);
+        invalidUpdateResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // Test updating after dataset publication
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(ownerAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        JsonArrayBuilder postPublishFilesArrayBuilder = Json.createArrayBuilder();
+        postPublishFilesArrayBuilder.add(Json.createObjectBuilder()
+                .add("dataFileId", file3Id)
+                .add("label", "Updated File 3 After Publication")
+                .add("description", "Updated description for File 3 after publication"));
+
+        Response postPublishUpdateResponse = UtilIT.updateDatasetFilesMetadata(datasetId.toString(), postPublishFilesArrayBuilder.build(), apiToken);
+        postPublishUpdateResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Verify the changes after publication
+        Response getUpdatedDatasetResponse = UtilIT.getDatasetVersion(datasetPersistentId, ":latest", apiToken);
+        JsonObject updatedData = getDataAsJsonObject(getUpdatedDatasetResponse.getBody().asString());
+        JsonArray updatedFiles = updatedData.getJsonArray("files");
+
+        for (JsonValue fileValue : updatedFiles) {
+            JsonObject file = (JsonObject) fileValue;
+            JsonObject dataFile = file.getJsonObject("dataFile");
+            if (dataFile.getInt("id") == file3Id) {
+                assertEquals("Updated File 3 After Publication", file.getString("label"));
+                assertEquals("Updated description for File 3 after publication", dataFile.getString("description"));
+            }
+        }
+
+     // Test adding dataFileTags to a non-tabular file (should fail)
+        JsonArrayBuilder nonTabularTagsArrayBuilder = Json.createArrayBuilder();
+        nonTabularTagsArrayBuilder.add(Json.createObjectBuilder()
+                .add("dataFileId", file1Id)
+                .add("dataFileTags", Json.createArrayBuilder().add("Survey")));
+
+        Response nonTabularTagsResponse = UtilIT.updateDatasetFilesMetadata(datasetId.toString(), nonTabularTagsArrayBuilder.build(), apiToken);
+        nonTabularTagsResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", containsString(BundleUtil.getStringFromBundle("file.metadata.datafiletag.not_tabular")));
+
+        // Test adding valid dataFileTags to a tabular file (file3 is ds.tsv, which is tabular)
+        JsonArrayBuilder validTagsArrayBuilder = Json.createArrayBuilder();
+        validTagsArrayBuilder.add(Json.createObjectBuilder()
+                .add("dataFileId", file3Id)
+                .add("dataFileTags", Json.createArrayBuilder().add(DataFileTag.TagType.Survey.toString()).add(DataFileTag.TagType.Survey.toString())));
+
+        Response validTagsResponse = UtilIT.updateDatasetFilesMetadata(datasetId.toString(), validTagsArrayBuilder.build(), apiToken);
+        validTagsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Verify the valid tags were added
+        Response getUpdatedFile3Response = UtilIT.getDatasetVersion(datasetPersistentId, ":latest", apiToken);
+        JsonObject updatedFile3Data = getDataAsJsonObject(getUpdatedFile3Response.getBody().asString());
+        JsonArray updatedFile3Files = updatedFile3Data.getJsonArray("files");
+
+        boolean foundValidTags = false;
+        for (JsonValue fileValue : updatedFile3Files) {
+            JsonObject file = (JsonObject) fileValue;
+            JsonObject dataFile = file.getJsonObject("dataFile");
+            if (dataFile.getInt("id") == file3Id) {
+                JsonArray tabularTags = dataFile.getJsonArray("tabularTags");
+                if (tabularTags != null && tabularTags.contains(Json.createValue(DataFileTag.TagType.Survey.toString())) && tabularTags.contains(Json.createValue(DataFileTag.TagType.Survey.toString()))) {
+                    foundValidTags = true;
+                    break;
+                }
+            }
+        }
+        assertTrue(foundValidTags);
+
+        // Test adding an invalid dataFileTag to a tabular file
+        JsonArrayBuilder invalidTagsArrayBuilder = Json.createArrayBuilder();
+        invalidTagsArrayBuilder.add(Json.createObjectBuilder()
+                .add("dataFileId", file3Id)
+                .add("dataFileTags", Json.createArrayBuilder().add("InvalidTag")));
+
+        Response invalidTagsResponse = UtilIT.updateDatasetFilesMetadata(datasetId.toString(), invalidTagsArrayBuilder.build(), apiToken);
+        invalidTagsResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", containsString(BundleUtil.getStringFromBundle("file.addreplace.error.invalid_datafile_tag")));
+        
+        // Create a second user
+        Response createSecondUser = UtilIT.createRandomUser();
+        String secondUsername = UtilIT.getUsernameFromResponse(createSecondUser);
+        String secondApiToken = UtilIT.getApiTokenFromResponse(createSecondUser);
+
+        // Attempt to update file metadata with the second user
+        JsonArrayBuilder unauthorizedFilesArrayBuilder = Json.createArrayBuilder();
+        unauthorizedFilesArrayBuilder.add(Json.createObjectBuilder()
+                .add("dataFileId", file3Id)
+                .add("label", "Unauthorized Update")
+                .add("description", "This update should not be allowed"));
+
+        Response unauthorizedUpdateResponse = UtilIT.updateDatasetFilesMetadata(datasetId.toString(), unauthorizedFilesArrayBuilder.build(), secondApiToken);
+        unauthorizedUpdateResponse.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", containsString("You do not have permission to edit this dataset"));
+
+        // Make the user a superuser to destroy dataset
+        Response makeSuperUserResponse = UtilIT.setSuperuserStatus(username, true);
+        makeSuperUserResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        // Clean up
+        Response destroyDatasetResponse = UtilIT.destroyDataset(datasetId, apiToken);
+        destroyDatasetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        // Delete the dataverse
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(ownerAlias, apiToken);
+        deleteDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        deleteUserResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        // Delete the second user
+        Response deleteSecondUserResponse = UtilIT.deleteUser(secondUsername);
+        deleteSecondUserResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    private String getSuperuserToken() {
+        Response createResponse = UtilIT.createRandomUser();
+        String adminApiToken = UtilIT.getApiTokenFromResponse(createResponse);
+        String username = UtilIT.getUsernameFromResponse(createResponse);
+        UtilIT.makeSuperUser(username);
+        return adminApiToken;
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetsTest.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsTest.java
new file mode 100644
index 00000000000..58aa366c9e5
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsTest.java
@@ -0,0 +1,58 @@
+package edu.harvard.iq.dataverse.api;
+
+import org.junit.jupiter.api.Test;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DatasetsTest {
+
+    /**
+     * Test cleanup filter
+     */
+    @Test
+    public void testCleanup() {
+        Set<String> datasetFiles = new HashSet<>() {
+            {
+                add("1837fda0b6c-90779481d439");
+                add("1837fda0e17-4b0926f6d44e");
+                add("1837fda1b80-46a899909269");
+            }
+        };
+        Set<String> filesOnDrive = new HashSet<>() {
+            {
+                add("1837fda0b6c-90779481d439");
+                add("1837fda0e17-4b0926f6d44e");
+                add("1837fda1b80-46a899909269");
+                add("prefix_1837fda0b6c-90779481d439");
+                add("1837fda0e17-4b0926f6d44e_suffix");
+                add("1837fda1b80-extra-46a899909269");
+                add("1837fda0e17-4b0926f6d44e.aux");
+                add("1837fda1994-5f74d57e6e47");
+                add("1837fda17ce-d7b9987fc6e9");
+                add("18383198c49-aeda08ccffff");
+                add("prefix_1837fda1994-5f74d57e6e47");
+                add("1837fda17ce-d7b9987fc6e9_suffix");
+                add("18383198c49-extra-aeda08ccffff");
+                add("some_other_file");
+                add("1837fda17ce-d7b9987fc6e9.aux");
+                add("18383198c49.aeda08ccffff");
+                add("1837fda17ce-d7b9987fc6xy");
+            }
+        };
+
+        Predicate<String> toDeleteFilesFilter = Datasets.getToDeleteFilesFilter(datasetFiles);
+        Set<String> deleted = filesOnDrive.stream().filter(toDeleteFilesFilter).collect(Collectors.toSet());
+
+        assertEquals(5, deleted.size());
+        assertTrue(deleted.contains("1837fda1994-5f74d57e6e47"));
+        assertTrue(deleted.contains("1837fda17ce-d7b9987fc6e9"));
+        assertTrue(deleted.contains("18383198c49-aeda08ccffff"));
+        assertTrue(deleted.contains("1837fda17ce-d7b9987fc6e9_suffix"));
+        assertTrue(deleted.contains("1837fda17ce-d7b9987fc6e9.aux"));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataverseFeaturedItemsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataverseFeaturedItemsIT.java
new file mode 100644
index 00000000000..744d16243b5
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataverseFeaturedItemsIT.java
@@ -0,0 +1,419 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.text.MessageFormat;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DataverseFeaturedItemsIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testCreateFeaturedItemWithDvOdbject() {
+        // Set up a new published dataverse and dataset
+        String apiToken = createUserAndGetApiToken();
+        String dataverseAlias = createDataverseAndGetAlias(apiToken);
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        // Upload a file
+        String fileName = "50by1000.dta";
+        String pathToFile = "scripts/search/data/tabular/" + fileName;
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFileResponse.prettyPrint();
+        JsonPath uploadedFile = JsonPath.from(uploadFileResponse.body().asString());
+        String fileId = String.valueOf(uploadedFile.getInt("data.files[0].dataFile.id"));
+        assertTrue(UtilIT.sleepForLock(datasetId, "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration");
+
+        // Publish Dataverse and Dataset with Datafile
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).prettyPrint();
+
+        // Get the created dataset so we can get the title
+        Response getDatasetResponse = UtilIT.getDatasetVersion(datasetPersistentId, "1", apiToken);
+        getDatasetResponse.prettyPrint();
+        JsonPath createdDataset = JsonPath.from(getDatasetResponse.body().asString());
+        String datasetTitle = createdDataset.getString("data.metadataBlocks.citation.fields[0].value");
+
+        // Test creating a featured item of type Dataset with good persistent id. Returns OK
+        Response createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "dataset", datasetPersistentId);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat().statusCode(OK.getStatusCode());
+        JsonPath createdFeaturedItem = JsonPath.from(createFeatureItemResponse.body().asString());
+        String dvObjectIdentifier = createdFeaturedItem.getString("data.dvObjectIdentifier");
+        assertEquals(datasetPersistentId, dvObjectIdentifier);
+        String dvObjectDisplayName = createdFeaturedItem.getString("data.dvObjectDisplayName");
+        assertEquals(datasetTitle, dvObjectDisplayName);
+
+        // Test creating a featured item of type Dataverse with good dataverse alias. Returns OK
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "dataverse", dataverseAlias);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat().statusCode(OK.getStatusCode());
+        createdFeaturedItem = JsonPath.from(createFeatureItemResponse.body().asString());
+        dvObjectIdentifier = createdFeaturedItem.getString("data.dvObjectIdentifier");
+        assertEquals(dataverseAlias, dvObjectIdentifier);
+        dvObjectDisplayName = createdFeaturedItem.getString("data.dvObjectDisplayName");
+        assertEquals(dataverseAlias, dvObjectDisplayName); // create dataverse sets the name = alias
+
+        // Test creating a featured item of type Datafile with good file id. Returns OK
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "datafile", fileId);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat().statusCode(OK.getStatusCode());
+        createdFeaturedItem = JsonPath.from(createFeatureItemResponse.body().asString());
+        dvObjectIdentifier = createdFeaturedItem.getString("data.dvObjectIdentifier");
+        assertEquals(fileId, dvObjectIdentifier);
+        dvObjectDisplayName = createdFeaturedItem.getString("data.dvObjectDisplayName");
+        String tabFileNameConvert = fileName.substring(0, fileName.indexOf(".dta")) + ".tab";
+        assertEquals(tabFileNameConvert, dvObjectDisplayName);
+    }
+
+    @Test
+    public void testCreateFeaturedItemWithBadDvOdbjectIds() {
+        // Set up a new published dataverse and dataset
+        String apiToken = createUserAndGetApiToken();
+        String dataverseAlias = createDataverseAndGetAlias(apiToken);
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse) + "BAD";
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).prettyPrint();
+        String datasetPersistentIdBad = datasetPersistentId + "BAD";
+        String dataverseAliasBad = dataverseAlias + "BAD";
+        String fieldIdBad = "999";
+
+        // Test with bad Dataset id should return bad request with not found message
+        Response createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "dataset", datasetPersistentIdBad);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("find.dvo.error.dvObjectNotFound", List.of(datasetPersistentIdBad))));
+
+        // Test with bad dataverse alias should return bad request with not found message
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "dataverse", dataverseAliasBad);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("find.dvo.error.dvObjectNotFound", List.of(dataverseAliasBad))));
+
+        String pathToFile = "scripts/search/data/tabular/50by1000.dta";
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFileResponse.prettyPrint();
+        JsonPath uploadedFile = JsonPath.from(uploadFileResponse.body().asString());
+
+        // Test with bad Datafile id should return bad request with not found message
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "datafile", fieldIdBad);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("find.dvo.error.dvObjectNotFound", List.of(fieldIdBad))));
+    }
+
+    @Test
+    public void testUnpublishedPublishedDatasetFeatureItem() {
+        // Set up a new dataverse and dataset without publishing
+        String apiToken = createUserAndGetApiToken();
+        String dataverseAlias = createDataverseAndGetAlias(apiToken);
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        String datasetId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+
+        // Test creating a featured item of type Dataset with good persistent id. Returns Bad request due to the dataset not being published
+        Response createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "dataset", datasetId);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notPublished", List.of("Dataset"))));
+
+        // Publish the Dataset
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).prettyPrint();
+
+        // Test creating a featured item of type Dataset with good persistent id. Returns OK due to the dataset being published
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "dataset", datasetId);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testUnpublishedPublishedDataFileFeatureItem() {
+        // Set up a new dataverse and dataset without publishing
+        String apiToken = createUserAndGetApiToken();
+        String dataverseAlias = createDataverseAndGetAlias(apiToken);
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        // Upload a file to be a Featured Item
+        String fileName = "50by1000.dta";
+        String pathToFile = "scripts/search/data/tabular/" + fileName;
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFileResponse.prettyPrint();
+        JsonPath uploadedFile = JsonPath.from(uploadFileResponse.body().asString());
+        String fileId = String.valueOf(uploadedFile.getInt("data.files[0].dataFile.id"));
+        assertTrue(UtilIT.sleepForLock(datasetId, "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration");
+
+        // Test creating a featured item of type Datafile. Returns Bad request due to the dataset not being published
+        Response createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "datafile", fileId);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notPublished", List.of("Dataset"))));
+
+        // Publish the Dataset
+        UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken).prettyPrint();
+
+        // Test creating a featured item of type DataFile. Returns OK due to the dataset being published
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "datafile", fileId);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testRestrictedUnrestrictedDatafileFeatureItem() {
+        // Set up a new dataverse and dataset without publishing
+        String apiToken = createUserAndGetApiToken();
+        String dataverseAlias = createDataverseAndGetAlias(apiToken);
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        String datasetId = String.valueOf(UtilIT.getDatasetIdFromResponse(createDatasetResponse));
+
+        // Upload a file
+        String pathToFile = "scripts/search/data/tabular/50by1000.dta";
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(datasetId, pathToFile, apiToken);
+        uploadFileResponse.prettyPrint();
+        JsonPath uploadedFile = JsonPath.from(uploadFileResponse.body().asString());
+        String fileId = String.valueOf(uploadedFile.getInt("data.files[0].dataFile.id"));
+        assertTrue(UtilIT.sleepForLock(datasetId, "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration");
+
+        // Restrict the file
+        UtilIT.restrictFile(fileId, true, apiToken).prettyPrint();
+
+        // Publish the Dataset with the uploaded file
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).prettyPrint();
+
+        // Test creating a featured item of type Datafile with good file id. Returns Bad request due to the datafile being restricted
+        Response createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "datafile", fileId);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.restricted")));
+
+        // Un-restrict the file
+        UtilIT.restrictFile(fileId, false, apiToken).prettyPrint();
+        // Publish the Dataset with the unrestricted file
+        UtilIT.publishDatasetViaNativeApi(datasetId, "minor", apiToken).prettyPrint();
+
+        // Test creating a featured item of type Datafile with good file id. Returns OK request due to the datafile being un-restricted
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, null, "datafile", fileId);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+    @Test
+    public void testDeleteFeaturedItem() {
+        String apiToken = createUserAndGetApiToken();
+        String dataverseAlias = createDataverseAndGetAlias(apiToken);
+        Long featuredItemId = createFeaturedItemAndGetId(dataverseAlias, apiToken, "src/test/resources/images/coffeeshop.png");
+
+        // Should return not found when passing incorrect item id
+        Response deleteFeatureItemResponse = UtilIT.deleteDataverseFeaturedItem(100000L, apiToken);
+        deleteFeatureItemResponse.then()
+                .body("message", equalTo(MessageFormat.format(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notFound"), 100000L)))
+                .assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // Should return unauthorized when passing correct id and user does not have permissions
+        String randomUserApiToken = createUserAndGetApiToken();
+        deleteFeatureItemResponse = UtilIT.deleteDataverseFeaturedItem(featuredItemId, randomUserApiToken);
+        deleteFeatureItemResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Should delete featured item when passing correct id and user has permissions
+        deleteFeatureItemResponse = UtilIT.deleteDataverseFeaturedItem(featuredItemId, apiToken);
+        deleteFeatureItemResponse.then()
+                .body("data.message", equalTo(MessageFormat.format(BundleUtil.getStringFromBundle("dataverseFeaturedItems.delete.successful"), featuredItemId)))
+                .assertThat().statusCode(OK.getStatusCode());
+
+        // Show there are no featured items as they have been deleted
+        Response listFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, apiToken);
+        listFeaturedItemsResponse.then()
+                .body("data.size()", equalTo(0))
+                .assertThat().statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testUpdateFeaturedItem() {
+        String apiToken = createUserAndGetApiToken();
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        String dataverseName = dataverseAlias; // createRandomDataverse sets name = alias
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        Long featuredItemId = createFeaturedItemAndGetId(dataverseAlias, apiToken, "src/test/resources/images/coffeeshop.png");
+
+        // Should return not found when passing incorrect item id
+        Response updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(100000L, "updatedTitle", 1, false, null, apiToken);
+        updateFeatureItemResponse.then()
+                .body("message", equalTo(MessageFormat.format(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notFound"), 100000L)))
+                .assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // Should return unauthorized when passing correct id and user does not have permissions
+        String randomUserApiToken = createUserAndGetApiToken();
+        updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(featuredItemId, "updatedTitle", 1, false, null, randomUserApiToken);
+        updateFeatureItemResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Update featured item: keep image file
+        updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(featuredItemId, "updatedTitle1", 1, true, null, apiToken);
+        verifyUpdatedFeaturedItem(updateFeatureItemResponse, "updatedTitle1", "coffeeshop.png", 1,"custom", null, null);
+
+        // Update featured item: remove image file
+        updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(featuredItemId, "updatedTitle1", 2, false, null, apiToken);
+        verifyUpdatedFeaturedItem(updateFeatureItemResponse, "updatedTitle1", null, 2,"custom", null, null);
+
+        // Update featured item: set new image file
+        updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(featuredItemId, "updatedTitle1", 2, false, "src/test/resources/images/coffeeshop.png", apiToken);
+        verifyUpdatedFeaturedItem(updateFeatureItemResponse, "updatedTitle1", "coffeeshop.png", 2,"custom", null, null);
+
+        // Update featured item: set malicious content which should be sanitized
+        String unsafeContent = "<h1 class=\"rte-heading\">A title</h1><a target=\"_blank\" class=\"rte-link\" href=\"https://test.com\">link</a>";
+        String sanitizedContent = "<h1 class=\"rte-heading\">A title</h1><a target=\"_blank\" class=\"rte-link\" href=\"https://test.com\" rel=\"noopener noreferrer nofollow\">link</a>";
+        updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(featuredItemId, unsafeContent, 2, false, "src/test/resources/images/coffeeshop.png", apiToken);
+        verifyUpdatedFeaturedItem(updateFeatureItemResponse, sanitizedContent, "coffeeshop.png", 2,"custom", null, null);
+
+        // Update featured item: set dataverse type
+        updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(featuredItemId, "updatedTitle2", 3, false, null, "dataverse", dataverseAlias, apiToken);
+        updateFeatureItemResponse.prettyPrint();
+        verifyUpdatedFeaturedItem(updateFeatureItemResponse, null, null, 3, "dataverse", dataverseAlias, dataverseName);
+
+        // Test mismatch between type and dvObject
+        updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(featuredItemId, "updatedTitle2", 3, false, null, "dataset", dataverseAlias, apiToken);
+        updateFeatureItemResponse.prettyPrint();
+        updateFeatureItemResponse.then()
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataverse.update.featuredItems.error.typeAndDvObjectMismatch")))
+                .assertThat().statusCode(BAD_REQUEST.getStatusCode());
+    }
+
+    @Test
+    public void testUpdateFeaturedItemUnicode() {
+        String apiToken = createUserAndGetApiToken();
+        String dataverseAlias = createDataverseAndGetAlias(apiToken);
+
+        String coffeeShopEnglish = "src/test/resources/images/coffeeshop.png";
+        String coffeeShopGreek = System.getProperty("java.io.tmpdir") + File.separator + "ÎēÎąĪ†ÎĩÎŊÎĩίÎŋ.png";
+        Path pathToCoffeeShopGreek = java.nio.file.Paths.get(coffeeShopGreek);
+        System.out.println("path to coffee show in Greek: " + pathToCoffeeShopGreek);
+        try {
+            java.nio.file.Files.copy(java.nio.file.Paths.get(coffeeShopEnglish), pathToCoffeeShopGreek, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException ex) {
+            Logger.getLogger(DataverseFeaturedItemsIT.class.getName()).log(Level.SEVERE, null, ex);
+        }
+
+        Response createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, "test", 0, coffeeShopGreek);
+        createFeatureItemResponse.prettyPrint();
+        /**
+         * TODO: Fix this REST Assured test. Sending unicode works fine in curl
+         * (see scripts/issues/11429/add-featured-items.sh) and we suspect we
+         * aren't sending Unicode properly through REST Assured (or Unicode
+         * isn't supported, which isn't likely). For now we assert
+         * "????????.png" but once we fix the test, "ÎēÎąĪ†ÎĩÎŊÎĩίÎŋ.png" should be
+         * asserted.
+         */
+        verifyUpdatedFeaturedItem(createFeatureItemResponse, "test", "????????.png", 0,"custom", null, null);
+
+        long featuredItemId = JsonPath.from(createFeatureItemResponse.body().asString()).getLong("data.id");
+
+        // test getting /api/access/dataverseFeaturedItemImage/
+        Response itemImageResponse = UtilIT.getDataverseFeaturedItemImage(featuredItemId, apiToken);
+        itemImageResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // update content
+        Response updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(featuredItemId, "updatedTitle1", 1, true, null, apiToken);
+        updateFeatureItemResponse.prettyPrint();
+        // TODO: Fix this REST Assured assertion too (see above).
+        // The equivalent curl command: scripts/issues/11429/update-featured-item.sh
+        verifyUpdatedFeaturedItem(updateFeatureItemResponse, "updatedTitle1", "????????.png", 1,"custom", null, null);
+
+        // remove image
+        updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(featuredItemId, "updatedTitle1", 2, false, null, apiToken);
+        verifyUpdatedFeaturedItem(updateFeatureItemResponse, "updatedTitle1", null, 2,"custom", null, null);
+
+        // add non-unicode image
+        updateFeatureItemResponse = UtilIT.updateDataverseFeaturedItem(featuredItemId, "updatedTitle1", 2, false, coffeeShopEnglish, apiToken);
+        verifyUpdatedFeaturedItem(updateFeatureItemResponse, "updatedTitle1", "coffeeshop.png", 2,"custom", null, null);
+
+        updateFeatureItemResponse = UtilIT.deleteDataverseFeaturedItem(featuredItemId, apiToken);
+        updateFeatureItemResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        List<Long> ids = Arrays.asList(0L);
+        List<String> contents = Arrays.asList("Greek filename");
+        List<Integer> orders = Arrays.asList(0);
+        List<Boolean> keepFiles = Arrays.asList(false);
+        List<String> pathsToFiles = Arrays.asList(coffeeShopGreek);
+
+        Response updateDataverseFeaturedItemsResponse = UtilIT.updateDataverseFeaturedItems(dataverseAlias, ids, contents, orders, keepFiles, pathsToFiles, apiToken);
+        updateDataverseFeaturedItemsResponse.prettyPrint();
+        updateDataverseFeaturedItemsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].content", equalTo("Greek filename"))
+                // TODO: Fix this REST Assured assertion too (see above).
+                // The equivalent curl command: scripts/issues/11429/update-featured-items.sh
+                .body("data[0].imageFileName", equalTo("????????.png"))
+                .body("data[0].imageFileUrl", containsString("/api/access/dataverseFeaturedItemImage/"))
+                .body("data[0].displayOrder", equalTo(0));
+    }
+
+    private String createUserAndGetApiToken() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        return UtilIT.getApiTokenFromResponse(createUserResponse);
+    }
+
+    private String createDataverseAndGetAlias(String apiToken) {
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        return UtilIT.getAliasFromResponse(createDataverseResponse);
+    }
+
+    private Long createFeaturedItemAndGetId(String dataverseAlias, String apiToken, String pathToTestFile) {
+        Response createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, "test", 0, pathToTestFile);
+        createFeatureItemResponse.then().assertThat().statusCode(OK.getStatusCode());
+        JsonPath createdFeaturedItem = JsonPath.from(createFeatureItemResponse.body().asString());
+        return createdFeaturedItem.getLong("data.id");
+    }
+
+    private void verifyUpdatedFeaturedItem(Response response, String expectedContent, String expectedImageFileName, int expectedDisplayOrder, String type, String dvObject, String dvObjectDisplayName) {
+        response.prettyPrint();
+        response.then().assertThat()
+                .body("data.content", equalTo(expectedContent))
+                .body("data.imageFileName", equalTo(expectedImageFileName))
+                .body("data.displayOrder", equalTo(expectedDisplayOrder))
+                .body("data.type", equalTo(type))
+                .body("data.dvObjectIdentifier", equalTo(dvObject))
+                .body("data.dvObjectDisplayName", equalTo(dvObjectDisplayName))
+                .statusCode(OK.getStatusCode());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
index 89b4eae4592..3e1a160c9f2 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -1,43 +1,61 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.path.json.JsonPath.with;
-import com.jayway.restassured.response.Response;
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
+import edu.harvard.iq.dataverse.util.json.JsonParser;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import io.restassured.RestAssured;
+
+import static io.restassured.RestAssured.given;
+import static io.restassured.path.json.JsonPath.with;
+
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
-import javax.ws.rs.core.Response.Status;
-import static javax.ws.rs.core.Response.Status.OK;
-import static junit.framework.Assert.assertEquals;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.hamcrest.CoreMatchers.equalTo;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.core.Response.Status;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasItemInArray;
+import static org.hamcrest.Matchers.hasKey;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.nio.file.Files;
+
+import io.restassured.path.json.JsonPath;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matchers;
 
 public class DataversesIT {
 
     private static final Logger logger = Logger.getLogger(DataversesIT.class.getCanonicalName());
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
-    
-    @AfterClass
+
+    @AfterAll
     public static void afterClass() {
         Response removeExcludeEmail = UtilIT.deleteSetting(SettingsServiceBean.Key.ExcludeEmailFromExport);
     }
@@ -123,19 +141,105 @@ public void testDataverseCategory() {
     public void testMinimalDataverse() throws FileNotFoundException {
         Response createUser = UtilIT.createRandomUser();
         createUser.prettyPrint();
-        String username = UtilIT.getUsernameFromResponse(createUser);
         String apiToken = UtilIT.getApiTokenFromResponse(createUser);
         JsonObject dvJson;
         FileReader reader = new FileReader("doc/sphinx-guides/source/_static/api/dataverse-minimal.json");
         dvJson = Json.createReader(reader).readObject();
         Response create = UtilIT.createDataverse(dvJson, apiToken);
         create.prettyPrint();
-        create.then().assertThat().statusCode(CREATED.getStatusCode());
+        create.then().assertThat()
+                .body("data.isMetadataBlockRoot", equalTo(false))
+                .body("data.isFacetRoot", equalTo(false))
+                .statusCode(CREATED.getStatusCode());
         Response deleteDataverse = UtilIT.deleteDataverse("science", apiToken);
         deleteDataverse.prettyPrint();
         deleteDataverse.then().assertThat().statusCode(OK.getStatusCode());
     }
 
+    @Test
+    public void testGetDataverseOwners() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response createDataverse1Response = UtilIT.createRandomDataverse(apiToken);
+        
+        createDataverse1Response.prettyPrint();
+        createDataverse1Response.then().assertThat().statusCode(CREATED.getStatusCode());
+        
+        String first = UtilIT.getAliasFromResponse(createDataverse1Response);
+        
+        Response getWithOwnersFirst = UtilIT.getDataverseWithOwners(first, apiToken, true);
+        getWithOwnersFirst.prettyPrint();
+        
+        Response createLevel1a = UtilIT.createSubDataverse(UtilIT.getRandomDvAlias() + "-level1a", null, apiToken, first);
+        createLevel1a.prettyPrint();
+        String level1a = UtilIT.getAliasFromResponse(createLevel1a);
+        
+        Response getWithOwners = UtilIT.getDataverseWithOwners(level1a, apiToken, true);
+        getWithOwners.prettyPrint();
+        
+        getWithOwners.then().assertThat().body("data.isPartOf.identifier", equalTo(first));
+    }
+
+    @Test
+    public void testGetDataverseChildCount() {
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        Response getDataverseWithChildCount = UtilIT.getDataverseWithChildCount(dataverseAlias, apiToken, true);
+        getDataverseWithChildCount.then().assertThat().body("data.childCount", equalTo(1));
+
+        Response getDataverseWithoutChildCount = UtilIT.getDataverseWithChildCount(dataverseAlias, apiToken, false);
+        getDataverseWithoutChildCount.then().assertThat().body("data.childCount", equalTo(null));
+    }
+
+    /**
+     * A regular user can create a Dataverse Collection and access its
+     * GuestbookResponses by DV alias or ID.
+     * A request for a non-existent Dataverse's GuestbookResponses returns
+     * Not Found.
+     * A regular user cannot access the guestbook responses for a Dataverse
+     * that they do not have permissions for, like the root Dataverse.
+     */
+    @Test
+    public void testGetGuestbookResponses() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response create = UtilIT.createRandomDataverse(apiToken);
+        create.prettyPrint();
+        create.then().assertThat().statusCode(CREATED.getStatusCode());
+        String alias = UtilIT.getAliasFromResponse(create);
+        Integer dvId = UtilIT.getDataverseIdFromResponse(create);
+
+        logger.info("Request guestbook responses for non-existent Dataverse");
+        Response getResponsesByBadAlias = UtilIT.getGuestbookResponses("-1", null, apiToken);
+        getResponsesByBadAlias.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        logger.info("Request guestbook responses for existent Dataverse by alias");
+        Response getResponsesByAlias = UtilIT.getGuestbookResponses(alias, null, apiToken);
+        getResponsesByAlias.then().assertThat().statusCode(OK.getStatusCode());
+
+        logger.info("Request guestbook responses for existent Dataverse by ID");
+        Response getResponsesById = UtilIT.getGuestbookResponses(dvId.toString(), null, apiToken);
+        getResponsesById.then().assertThat().statusCode(OK.getStatusCode());
+
+        logger.info("Request guestbook responses for root Dataverse by alias");
+        getResponsesById = UtilIT.getGuestbookResponses("root", null, apiToken);
+        getResponsesById.prettyPrint();
+        getResponsesById.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+    }
+
     @Test
     public void testNotEnoughJson() {
         Response createUser = UtilIT.createRandomUser();
@@ -340,12 +444,13 @@ public void testMoveDataverse() {
         Response superuserResponse = UtilIT.makeSuperUser(username);
         
         Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
-        createDataverseResponse.prettyPrint();
+        assertTrue(createDataverseResponse.prettyPrint().contains("isReleased\": false"));
         String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
         Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverseResponse);
         
         Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);//.publishDataverseViaSword(dataverseAlias, apiToken);
         assertEquals(200, publishDataverse.getStatusCode());
+        assertTrue(publishDataverse.prettyPrint().contains("isReleased\": true"));
         
         Response createDataverseResponse2 = UtilIT.createRandomDataverse(apiToken);
         createDataverseResponse2.prettyPrint();
@@ -358,46 +463,32 @@ public void testMoveDataverse() {
         moveResponse.prettyPrint();
         moveResponse.then().assertThat().statusCode(OK.getStatusCode());
         
-        Response search = UtilIT.search("id:dataverse_" + dataverseId + "&subtree=" + dataverseAlias2, apiToken);
-        search.prettyPrint();
-        search.then().assertThat()
-                .body("data.total_count", equalTo(1))
-                .statusCode(200);
-    }
-    
-    @Test
-    public void testCreateDeleteDataverseLink() {
-        Response createUser = UtilIT.createRandomUser();
-        
-        createUser.prettyPrint();
-        String username = UtilIT.getUsernameFromResponse(createUser);
-        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
-        
-        Response superuserResponse = UtilIT.makeSuperUser(username);
-        
-        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
-        createDataverseResponse.prettyPrint();
-        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
-        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverseResponse);
-        
-        Response createDataverseResponse2 = UtilIT.createRandomDataverse(apiToken);
-        createDataverseResponse2.prettyPrint();
-        String dataverseAlias2 = UtilIT.getAliasFromResponse(createDataverseResponse2);
-        
-        Response createLinkingDataverseResponse = UtilIT.createDataverseLink(dataverseAlias, dataverseAlias2, apiToken);
-        createLinkingDataverseResponse.prettyPrint();
-        
-        createLinkingDataverseResponse.then().assertThat()
-                .body("data.message", equalTo("Dataverse " + dataverseAlias + " linked successfully to " + dataverseAlias2))
-                .statusCode(200);
-        
-        Response deleteLinkingDataverseResponse = UtilIT.deleteDataverseLink(dataverseAlias, dataverseAlias2, apiToken);
-        deleteLinkingDataverseResponse.prettyPrint();
-        deleteLinkingDataverseResponse.then().assertThat()
-                .body("data.message", equalTo("Link from Dataverse " + dataverseAlias + " to linked Dataverse " + dataverseAlias2 + " deleted"))
-                .statusCode(200);
+        // because indexing happens asynchronously, we'll wait first, and then retry a few times, before failing
+        int numberofAttempts = 0;
+        boolean checkIndex = true;
+        while (checkIndex) {
+            try {   
+                    try {
+                        Thread.sleep(6000);
+                    } catch (InterruptedException ex) {
+                    }                
+                Response search = UtilIT.search("id:dataverse_" + dataverseId + "&subtree=" + dataverseAlias2, apiToken);
+                search.prettyPrint();
+                search.then().assertThat()
+                        .body("data.total_count", equalTo(1))
+                        .statusCode(200);
+                checkIndex = false;
+            } catch (AssertionError ae) {
+                if (numberofAttempts++ > 5) {
+                    throw ae;
+                }
+            }
+        }
+
     }
-    
+
+    // testCreateDeleteDataverseLink was here but is now in LinkIT
+
     @Test
     public void testUpdateDefaultContributorRole() {
         Response createUser = UtilIT.createRandomUser();
@@ -453,4 +544,1838 @@ public void testUpdateDefaultContributorRole() {
 
     }
     
+    @Test
+    public void testDataFileAPIPermissions() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        String pathToJsonFile = "src/test/resources/json/complete-dataset-with-files.json";
+        Response createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+        
+        //should fail if non-super user and attempting to
+        //create a dataset with files
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+        
+        //should be ok to create a dataset without files...
+        pathToJsonFile = "scripts/api/data/dataset-create-new.json";
+        createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+        
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        
+        //As non-super user should be able to add a real file
+        String pathToFile1 = "src/main/webapp/resources/images/cc0.png";
+        Response authorAttemptsToAddFileViaNative = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile1, apiToken);
+
+        authorAttemptsToAddFileViaNative.prettyPrint();
+        authorAttemptsToAddFileViaNative.then().assertThat()
+                .statusCode(OK.getStatusCode());
+ 
+    }
+
+    @Test
+    public void testImportDDI() throws IOException, InterruptedException {
+
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        assertEquals(200, publishDataverse.getStatusCode());
+
+        // This XML is a full DDI export without a PID.
+        String xml = new String(Files.readAllBytes(Paths.get("doc/sphinx-guides/source/_static/api/ddi_dataset.xml")));
+
+        Response importDDI = UtilIT.importDatasetDDIViaNativeApi(apiToken, dataverseAlias, xml,  null, "no");
+        logger.info(importDDI.prettyPrint());
+        assertEquals(201, importDDI.getStatusCode());
+
+        // Under normal conditions, you shouldn't need to destroy these datasets.
+        // Uncomment if they're still around from a previous failed run.
+//        Response destroy1 = UtilIT.destroyDataset("doi:10.5072/FK2/ABCD11", apiToken);
+//        destroy1.prettyPrint();
+//        Response destroy2 = UtilIT.destroyDataset("doi:10.5072/FK2/ABCD22", apiToken);
+//        destroy2.prettyPrint();
+
+        Response importDDIPid = UtilIT.importDatasetDDIViaNativeApi(apiToken, dataverseAlias, xml,  "doi:10.5072/FK2/ABCD11", "no");
+        logger.info(importDDIPid.prettyPrint());
+        assertEquals(201, importDDIPid.getStatusCode());
+
+        Response importDDIPidRel = UtilIT.importDatasetDDIViaNativeApi(apiToken, dataverseAlias, xml,  "doi:10.5072/FK2/ABCD22", "yes");
+        logger.info(importDDIPidRel.prettyPrint());
+        assertEquals(201, importDDIPidRel.getStatusCode());
+
+
+        Response importDDIRelease = UtilIT.importDatasetDDIViaNativeApi(apiToken, dataverseAlias, xml, null, "yes");
+        logger.info( importDDIRelease.prettyPrint());
+        assertEquals(201, importDDIRelease.getStatusCode());
+
+        Integer datasetIdInt = JsonPath.from(importDDI.body().asString()).getInt("data.id");
+
+        Response search1 = UtilIT.search("id:dataset_" + datasetIdInt + "_draft", apiToken); // santity check, can find it
+        search1.prettyPrint();
+        search1.then().assertThat()
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].name", CoreMatchers.is("Replication Data for: Title"))
+                .statusCode(OK.getStatusCode());
+
+        Response search2 = UtilIT.search("id:dataset_" + datasetIdInt + "_draft", apiToken, "&geo_point=35,15&geo_radius=5"); // should find it
+        search2.prettyPrint();
+        search2.then().assertThat()
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].name", CoreMatchers.is("Replication Data for: Title"))
+                .statusCode(OK.getStatusCode());
+
+        Response search3 = UtilIT.search("id:dataset_" + datasetIdInt + "_draft", apiToken, "&geo_point=0,0&geo_radius=5"); // should not find it
+        search3.prettyPrint();
+        search3.then().assertThat()
+                .body("data.total_count", CoreMatchers.is(0))
+                .body("data.count_in_response", CoreMatchers.is(0))
+                .body("data.items", Matchers.empty())
+                .statusCode(OK.getStatusCode());
+
+        //cleanup
+
+        Response destroyDatasetResponse = UtilIT.destroyDataset(datasetIdInt, apiToken);
+        assertEquals(200, destroyDatasetResponse.getStatusCode());
+
+        Integer datasetIdIntPid = JsonPath.from(importDDIPid.body().asString()).getInt("data.id");
+        Response destroyDatasetResponsePid = UtilIT.destroyDataset(datasetIdIntPid, apiToken);
+        assertEquals(200, destroyDatasetResponsePid.getStatusCode());
+
+        Integer datasetIdIntPidRel = JsonPath.from(importDDIPidRel.body().asString()).getInt("data.id");
+        Response destroyDatasetResponsePidRel = UtilIT.destroyDataset(datasetIdIntPidRel, apiToken);
+        assertEquals(200, destroyDatasetResponsePidRel.getStatusCode());
+        
+        UtilIT.sleepForDeadlock(UtilIT.MAXIMUM_IMPORT_DURATION);
+
+        Integer datasetIdIntRelease = JsonPath.from(importDDIRelease.body().asString()).getInt("data.id");
+        Response destroyDatasetResponseRelease = UtilIT.destroyDataset(datasetIdIntRelease, apiToken);
+        assertEquals(200, destroyDatasetResponseRelease.getStatusCode());
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        assertEquals(200, deleteUserResponse.getStatusCode());
+    }
+
+    @Test
+    public void testImport() throws IOException, InterruptedException {
+
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        assertEquals(200, publishDataverse.getStatusCode());
+
+        JsonObjectBuilder datasetJson = Json.createObjectBuilder()
+                .add("datasetVersion", Json.createObjectBuilder()
+                        .add("license", Json.createObjectBuilder()
+                                .add("name", "CC0 1.0")
+                        )
+                        .add("metadataBlocks", Json.createObjectBuilder()
+                                .add("citation", Json.createObjectBuilder()
+                                        .add("fields", Json.createArrayBuilder()
+                                                .add(Json.createObjectBuilder()
+                                                        .add("typeName", "title")
+                                                        .add("value", "Test Dataset")
+                                                        .add("typeClass", "primitive")
+                                                        .add("multiple", false)
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("authorName",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "Simpson, Homer")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "authorName"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "author")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("datasetContactEmail",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "hsimpson@mailinator.com")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "datasetContactEmail"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "datasetContact")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("dsDescriptionValue",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "This a test dataset.")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "dsDescriptionValue"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "dsDescription")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add("Other")
+                                                        )
+                                                        .add("typeClass", "controlledVocabulary")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "subject")
+                                                )
+                                        )
+                                )
+                        ));
+
+        String json = datasetJson.build().toString();
+
+        Response importJSONNoPid = UtilIT.importDatasetViaNativeApi(apiToken, dataverseAlias, json,  null, "no");
+        logger.info(importJSONNoPid.prettyPrint());
+        assertEquals(400, importJSONNoPid.getStatusCode());
+
+        String body = importJSONNoPid.getBody().asString();
+        String status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+
+        String message = JsonPath.from(body).getString("message");
+        assertEquals(
+                "Please provide a persistent identifier, either by including it in the JSON, or by using the pid query parameter.",
+                message
+        );
+
+        Response importJSONNoPidRelease = UtilIT.importDatasetViaNativeApi(apiToken, dataverseAlias, json, null, "yes");
+        logger.info( importJSONNoPidRelease.prettyPrint());
+        assertEquals(400, importJSONNoPidRelease.getStatusCode());
+
+        body = importJSONNoPidRelease.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+
+        message = JsonPath.from(body).getString("message");
+        assertEquals(
+                "Please provide a persistent identifier, either by including it in the JSON, or by using the pid query parameter.",
+                message
+        );
+
+        Response importJSONUnmanagedPid = UtilIT.importDatasetViaNativeApi(apiToken, dataverseAlias, json, "doi:10.5073/FK2/ABCD11", "no");
+        logger.info(importJSONUnmanagedPid.prettyPrint());
+        assertEquals(400, importJSONUnmanagedPid.getStatusCode());
+
+        body = importJSONUnmanagedPid.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+
+        message = JsonPath.from(body).getString("message");
+        assertEquals(
+                "Cannot import a dataset that has a PID that doesn't match the server's settings",
+                message
+        );
+
+        // Under normal conditions, you shouldn't need to destroy these datasets.
+        // Uncomment if they're still around from a previous failed run.
+//        Response destroy1 = UtilIT.destroyDataset("doi:10.5072/FK2/ABCD11", apiToken);
+//        destroy1.prettyPrint();
+//        Response destroy2 = UtilIT.destroyDataset("doi:10.5072/FK2/ABCD22", apiToken);
+//        destroy2.prettyPrint();
+
+        Response importJSONPid = UtilIT.importDatasetViaNativeApi(apiToken, dataverseAlias, json,  "doi:10.5072/FK2/ABCD11", "no");
+        logger.info(importJSONPid.prettyPrint());
+        assertEquals(201, importJSONPid.getStatusCode());
+
+        Response importJSONPidRel = UtilIT.importDatasetViaNativeApi(apiToken, dataverseAlias, json,  "doi:10.5072/FK2/ABCD22", "yes");
+        logger.info(importJSONPidRel.prettyPrint());
+        assertEquals(201, importJSONPidRel.getStatusCode());
+
+        Integer datasetIdInt = JsonPath.from(importJSONPid.body().asString()).getInt("data.id");
+
+        Response search1 = UtilIT.search("id:dataset_" + datasetIdInt + "_draft", apiToken); // santity check, can find it
+        search1.prettyPrint();
+        search1.then().assertThat()
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].name", CoreMatchers.is("Test Dataset"))
+                .statusCode(OK.getStatusCode());
+
+        //cleanup
+
+        Response destroyDatasetResponse = UtilIT.destroyDataset(datasetIdInt, apiToken);
+        assertEquals(200, destroyDatasetResponse.getStatusCode());
+
+        Integer datasetIdIntPidRel = JsonPath.from(importJSONPidRel.body().asString()).getInt("data.id");
+        Response destroyDatasetResponsePidRel = UtilIT.destroyDataset(datasetIdIntPidRel, apiToken);
+        assertEquals(200, destroyDatasetResponsePidRel.getStatusCode());
+
+        UtilIT.sleepForDeadlock(UtilIT.MAXIMUM_IMPORT_DURATION);
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        assertEquals(200, deleteUserResponse.getStatusCode());
+    }
+
+    @Test
+    public void testAttributesApi() {
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        if (createDataverseResponse.getStatusCode() != 201) {
+            System.out.println("A workspace for testing (a dataverse) couldn't be created in the root dataverse. The output was:\n\n" + createDataverseResponse.body().asString());
+            System.out.println("\nPlease ensure that users can created dataverses in the root in order for this test to run.");
+        } else {
+            createDataverseResponse.prettyPrint();
+        }
+        assertEquals(201, createDataverseResponse.getStatusCode());
+
+        String collectionAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        String newCollectionAlias = collectionAlias + "RENAMED";
+
+        // Change the name of the collection:
+
+        String newCollectionName = "Renamed Name";
+        Response changeAttributeResp = UtilIT.setCollectionAttribute(collectionAlias, "name", newCollectionName, apiToken);
+        changeAttributeResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("message.message", equalTo("Update successful"));
+
+        // Change the description of the collection:
+
+        String newDescription = "Renamed Description";
+        changeAttributeResp = UtilIT.setCollectionAttribute(collectionAlias, "description", newDescription, apiToken);
+        changeAttributeResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("message.message", equalTo("Update successful"));
+
+        // Change the affiliation of the collection:
+
+        String newAffiliation = "Renamed Affiliation";
+        changeAttributeResp = UtilIT.setCollectionAttribute(collectionAlias, "affiliation", newAffiliation, apiToken);
+        changeAttributeResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("message.message", equalTo("Update successful"));
+
+        // Cannot update filePIDsEnabled from a regular user:
+
+        changeAttributeResp = UtilIT.setCollectionAttribute(collectionAlias, "filePIDsEnabled", "true", apiToken);
+        changeAttributeResp.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Change the alias of the collection:
+
+        changeAttributeResp = UtilIT.setCollectionAttribute(collectionAlias, "alias", newCollectionAlias, apiToken);
+        changeAttributeResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("message.message", equalTo("Update successful"));
+
+        // Check on the collection, under the new alias:
+
+        Response collectionInfoResponse = UtilIT.exportDataverse(newCollectionAlias, apiToken);
+        collectionInfoResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.alias", equalTo(newCollectionAlias))
+                .body("data.name", equalTo(newCollectionName))
+                .body("data.description", equalTo(newDescription))
+                .body("data.affiliation", equalTo(newAffiliation));
+
+        // Delete the collection (again, using its new alias):
+
+        Response deleteCollectionResponse = UtilIT.deleteDataverse(newCollectionAlias, apiToken);
+        assertEquals(OK.getStatusCode(), deleteCollectionResponse.getStatusCode());
+
+        // Cannot update root collection from a regular user:
+
+        changeAttributeResp = UtilIT.setCollectionAttribute("root", "name", newCollectionName, apiToken);
+        changeAttributeResp.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode());
+
+        collectionInfoResponse = UtilIT.exportDataverse("root", apiToken);
+
+        collectionInfoResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.name", equalTo("Root"));
+    }
+
+    @Test
+    public void testListMetadataBlocks() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // New Dataverse should return just the citation block and its displayOnCreate fields when onlyDisplayedOnCreate=true and returnDatasetFieldTypes=true
+        Response listMetadataBlocks = UtilIT.listMetadataBlocks(dataverseAlias, true, true, apiToken);
+        listMetadataBlocks.prettyPrint();
+        listMetadataBlocks.then().assertThat().statusCode(OK.getStatusCode());
+        listMetadataBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(1))
+                .body("data[0].name", is("citation"))
+                .body("data[0].fields.title.displayOnCreate", equalTo(true))
+                .body("data[0].fields.size()", is(10)) // 28 - 18 child duplicates
+                .body("data[0].fields.author.childFields.size()", is(4));
+
+        Response setMetadataBlocksResponse = UtilIT.setMetadataBlocks(dataverseAlias, Json.createArrayBuilder().add("citation").add("astrophysics"), apiToken);
+        setMetadataBlocksResponse.prettyPrint();
+        setMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        String[] testInputLevelNames = {"geographicCoverage", "country", "city", "notesText"};
+        boolean[] testRequiredInputLevels = {false, true, false, false};
+        boolean[] testIncludedInputLevels = {false, true, true, false};
+        Response updateDataverseInputLevelsResponse = UtilIT.updateDataverseInputLevels(dataverseAlias, testInputLevelNames, testRequiredInputLevels, testIncludedInputLevels, apiToken);
+        updateDataverseInputLevelsResponse.prettyPrint();
+        updateDataverseInputLevelsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Dataverse not found
+        Response listMetadataBlocksResponse = UtilIT.listMetadataBlocks("-1", false, false, apiToken);
+        listMetadataBlocksResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // Existent dataverse and no optional params
+        String[] expectedAllMetadataBlockDisplayNames = {"Astronomy and Astrophysics Metadata", "Citation Metadata", "Geospatial Metadata"};
+
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(dataverseAlias, false, false, apiToken);
+        listMetadataBlocksResponse.prettyPrint();
+        listMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fields", equalTo(null))
+                .body("data[1].fields", equalTo(null))
+                .body("data[2].fields", equalTo(null))
+                .body("data.size()", equalTo(3));
+
+        String actualMetadataBlockDisplayName1 = listMetadataBlocksResponse.then().extract().path("data[0].displayName");
+        String actualMetadataBlockDisplayName2 = listMetadataBlocksResponse.then().extract().path("data[1].displayName");
+        String actualMetadataBlockDisplayName3 = listMetadataBlocksResponse.then().extract().path("data[2].displayName");
+        assertNotEquals(actualMetadataBlockDisplayName1, actualMetadataBlockDisplayName2);
+        assertNotEquals(actualMetadataBlockDisplayName1, actualMetadataBlockDisplayName3);
+        assertNotEquals(actualMetadataBlockDisplayName2, actualMetadataBlockDisplayName3);
+        assertThat(expectedAllMetadataBlockDisplayNames, hasItemInArray(actualMetadataBlockDisplayName1));
+        assertThat(expectedAllMetadataBlockDisplayNames, hasItemInArray(actualMetadataBlockDisplayName2));
+        assertThat(expectedAllMetadataBlockDisplayNames, hasItemInArray(actualMetadataBlockDisplayName3));
+
+        // Existent dataverse and onlyDisplayedOnCreate=true
+        String[] expectedOnlyDisplayedOnCreateMetadataBlockDisplayNames = {"Citation Metadata", "Geospatial Metadata"};
+
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(dataverseAlias, true, false, apiToken);
+        listMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fields", equalTo(null))
+                .body("data[1].fields", equalTo(null))
+                .body("data.size()", equalTo(2));
+
+        actualMetadataBlockDisplayName1 = listMetadataBlocksResponse.then().extract().path("data[0].displayName");
+        actualMetadataBlockDisplayName2 = listMetadataBlocksResponse.then().extract().path("data[1].displayName");
+        assertNotEquals(actualMetadataBlockDisplayName1, actualMetadataBlockDisplayName2);
+        assertThat(expectedOnlyDisplayedOnCreateMetadataBlockDisplayNames, hasItemInArray(actualMetadataBlockDisplayName1));
+        assertThat(expectedOnlyDisplayedOnCreateMetadataBlockDisplayNames, hasItemInArray(actualMetadataBlockDisplayName2));
+
+        // Existent dataverse and returnDatasetFieldTypes=true
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(dataverseAlias, false, true, apiToken);
+        listMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fields", not(equalTo(null)))
+                .body("data[1].fields", not(equalTo(null)))
+                .body("data[2].fields", not(equalTo(null)))
+                .body("data.size()", equalTo(3));
+
+        actualMetadataBlockDisplayName1 = listMetadataBlocksResponse.then().extract().path("data[0].displayName");
+        actualMetadataBlockDisplayName2 = listMetadataBlocksResponse.then().extract().path("data[1].displayName");
+        actualMetadataBlockDisplayName3 = listMetadataBlocksResponse.then().extract().path("data[2].displayName");
+        assertNotEquals(actualMetadataBlockDisplayName1, actualMetadataBlockDisplayName2);
+        assertNotEquals(actualMetadataBlockDisplayName1, actualMetadataBlockDisplayName3);
+        assertNotEquals(actualMetadataBlockDisplayName2, actualMetadataBlockDisplayName3);
+        assertThat(expectedAllMetadataBlockDisplayNames, hasItemInArray(actualMetadataBlockDisplayName1));
+        assertThat(expectedAllMetadataBlockDisplayNames, hasItemInArray(actualMetadataBlockDisplayName2));
+        assertThat(expectedAllMetadataBlockDisplayNames, hasItemInArray(actualMetadataBlockDisplayName3));
+
+        // Check dataset fields for the updated input levels are retrieved
+        int geospatialMetadataBlockIndex = actualMetadataBlockDisplayName1.equals("Geospatial Metadata") ? 0 : actualMetadataBlockDisplayName2.equals("Geospatial Metadata") ? 1 : 2;
+
+        // Since the included property of notesText is set to false, we should retrieve the total number of fields minus one
+        int citationMetadataBlockIndex = geospatialMetadataBlockIndex == 0 ? 1 : 0;
+        listMetadataBlocksResponse.then().assertThat()
+                .body(String.format("data[%d].fields.size()", citationMetadataBlockIndex), equalTo(34)); // 79 minus 45 child duplicates
+
+        // Since the included property of geographicCoverage is set to false, we should retrieve the total number of fields minus one
+        listMetadataBlocksResponse.then().assertThat()
+                .body(String.format("data[%d].fields.size()", geospatialMetadataBlockIndex), equalTo(2));
+
+        listMetadataBlocksResponse = UtilIT.getMetadataBlock("geospatial");
+        String actualGeospatialMetadataField1 = listMetadataBlocksResponse.then().extract().path(String.format("data.fields['geographicCoverage'].name"));
+        String actualGeospatialMetadataField2 = listMetadataBlocksResponse.then().extract().path(String.format("data.fields['geographicCoverage'].childFields['country'].name"));
+        String actualGeospatialMetadataField3 = listMetadataBlocksResponse.then().extract().path(String.format("data.fields['geographicCoverage'].childFields['city'].name"));
+        
+        listMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode())
+        .body("data.fields['geographicCoverage'].childFields.size()", equalTo(4))
+        .body("data.fields['geographicBoundingBox'].childFields.size()", equalTo(4));
+
+        assertNotNull(actualGeospatialMetadataField1);
+        assertNotNull(actualGeospatialMetadataField2);
+        assertNotNull(actualGeospatialMetadataField3);
+
+        // Existent dataverse and onlyDisplayedOnCreate=true and returnDatasetFieldTypes=true
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(dataverseAlias, true, true, apiToken);
+        listMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fields", not(equalTo(null)))
+                .body("data[1].fields", not(equalTo(null)))
+                .body("data.size()", equalTo(2));
+
+        actualMetadataBlockDisplayName1 = listMetadataBlocksResponse.then().extract().path("data[0].displayName");
+        actualMetadataBlockDisplayName2 = listMetadataBlocksResponse.then().extract().path("data[1].displayName");
+        assertNotEquals(actualMetadataBlockDisplayName1, actualMetadataBlockDisplayName2);
+        assertThat(expectedOnlyDisplayedOnCreateMetadataBlockDisplayNames, hasItemInArray(actualMetadataBlockDisplayName1));
+        assertThat(expectedOnlyDisplayedOnCreateMetadataBlockDisplayNames, hasItemInArray(actualMetadataBlockDisplayName2));
+
+        // Check dataset fields for the updated input levels are retrieved
+        geospatialMetadataBlockIndex = actualMetadataBlockDisplayName2.equals("Geospatial Metadata") ? 1 : 0;
+
+        listMetadataBlocksResponse.then().assertThat()
+                .body(String.format("data[%d].fields.size()", geospatialMetadataBlockIndex), equalTo(0));
+
+//        actualGeospatialMetadataField1 = listMetadataBlocksResponse.then().extract().path(String.format("data[%d].fields.geographicCoverage.name", geospatialMetadataBlockIndex));
+//        actualGeospatialMetadataField2 = listMetadataBlocksResponse.then().extract().path(String.format("data[%d].fields.geographicCoverage.childFields['country'].name", geospatialMetadataBlockIndex));
+//        actualGeospatialMetadataField3 = listMetadataBlocksResponse.then().extract().path(String.format("data[%d].fields.geographicCoverage.childFields['city'].name", geospatialMetadataBlockIndex));
+
+//        assertNull(actualGeospatialMetadataField1);
+//        assertNotNull(actualGeospatialMetadataField2);
+//        assertNull(actualGeospatialMetadataField3);
+
+        citationMetadataBlockIndex = geospatialMetadataBlockIndex == 0 ? 1 : 0;
+
+        // notesText has displayOnCreate=true but has include=false, so should not be retrieved
+        String notesTextCitationMetadataField = listMetadataBlocksResponse.then().extract().path(String.format("data[%d].fields.notesText.name", citationMetadataBlockIndex));
+        assertNull(notesTextCitationMetadataField);
+
+        // producerName is a conditionally required field, so should not be retrieved
+        String producerNameCitationMetadataField = listMetadataBlocksResponse.then().extract().path(String.format("data[%d].fields.producerName.name", citationMetadataBlockIndex));
+        assertNull(producerNameCitationMetadataField);
+
+        // author is a required field, so should be retrieved
+        String authorCitationMetadataField = listMetadataBlocksResponse.then().extract().path(String.format("data[%d].fields.author.name", citationMetadataBlockIndex));
+        assertNotNull(authorCitationMetadataField);
+
+        // User has no permissions on the requested dataverse
+        Response createSecondUserResponse = UtilIT.createRandomUser();
+        String secondApiToken = UtilIT.getApiTokenFromResponse(createSecondUserResponse);
+
+        createDataverseResponse = UtilIT.createRandomDataverse(secondApiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String secondDataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(secondDataverseAlias, true, true, apiToken);
+        listMetadataBlocksResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        // List metadata blocks from Root
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks("root", true, true, apiToken);
+        listMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].displayName", equalTo("Citation Metadata"))
+                .body("data[0].fields", not(equalTo(null)))
+                .body("data.size()", equalTo(1));
+        
+        // Checking child / parent logic
+        listMetadataBlocksResponse = UtilIT.getMetadataBlock("citation");
+        listMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.displayName", equalTo("Citation Metadata"))
+                .body("data.fields", not(equalTo(null)))
+                .body("data.fields.otherIdAgency", equalTo(null))
+                .body("data.fields.otherId.childFields.size()", equalTo(2));
+    }
+
+    @Test
+    public void testFeatureDataverse() throws Exception {
+
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        assertEquals(200, publishDataverse.getStatusCode());
+
+
+        Response createSubDVToBeFeatured = UtilIT.createSubDataverse(UtilIT.getRandomDvAlias() + "-feature", null, apiToken, dataverseAlias);
+        String subDataverseAlias = UtilIT.getAliasFromResponse(createSubDVToBeFeatured);
+
+        //publish a sub dataverse so that the owner will have something to feature
+        Response createSubDVToBePublished = UtilIT.createSubDataverse(UtilIT.getRandomDvAlias() + "-pub", null, apiToken, dataverseAlias);
+        assertEquals(201, createSubDVToBePublished.getStatusCode());
+        String subDataverseAliasPub = UtilIT.getAliasFromResponse(createSubDVToBePublished);
+        publishDataverse = UtilIT.publishDataverseViaNativeApi(subDataverseAliasPub, apiToken);
+        assertEquals(200, publishDataverse.getStatusCode());
+
+        //can't feature a dataverse that is unpublished
+        Response featureSubDVResponseUnpublished = UtilIT.addFeaturedDataverse(dataverseAlias, subDataverseAlias, apiToken);
+        featureSubDVResponseUnpublished.prettyPrint();
+        assertEquals(400, featureSubDVResponseUnpublished.getStatusCode());
+        featureSubDVResponseUnpublished.then().assertThat()
+                .body(containsString("may not be featured"));
+
+        //can't feature a dataverse you don't own
+        Response featureSubDVResponseNotOwned = UtilIT.addFeaturedDataverse(dataverseAlias, "root", apiToken);
+        featureSubDVResponseNotOwned.prettyPrint();
+        assertEquals(400, featureSubDVResponseNotOwned.getStatusCode());
+        featureSubDVResponseNotOwned.then().assertThat()
+                .body(containsString("may not be featured"));
+
+        //can't feature a dataverse that doesn't exist
+        Response featureSubDVResponseNotExist = UtilIT.addFeaturedDataverse(dataverseAlias, "dummy-alias-sek-foobar-333", apiToken);
+        featureSubDVResponseNotExist.prettyPrint();
+        assertEquals(400, featureSubDVResponseNotExist.getStatusCode());
+        featureSubDVResponseNotExist.then().assertThat()
+                .body(containsString("Can't find dataverse collection"));
+
+        publishDataverse = UtilIT.publishDataverseViaNativeApi(subDataverseAlias, apiToken);
+        assertEquals(200, publishDataverse.getStatusCode());
+
+        //once published it should work
+        Response featureSubDVResponse = UtilIT.addFeaturedDataverse(dataverseAlias, subDataverseAlias, apiToken);
+        featureSubDVResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), featureSubDVResponse.getStatusCode());
+
+
+        Response getFeaturedDataverseResponse = UtilIT.getFeaturedDataverses(dataverseAlias, apiToken);
+        getFeaturedDataverseResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), getFeaturedDataverseResponse.getStatusCode());
+        getFeaturedDataverseResponse.then().assertThat()
+                .body("data[0]", equalTo(subDataverseAlias));
+
+        Response deleteFeaturedDataverseResponse = UtilIT.deleteFeaturedDataverses(dataverseAlias, apiToken);
+        deleteFeaturedDataverseResponse.prettyPrint();
+
+        assertEquals(OK.getStatusCode(), deleteFeaturedDataverseResponse.getStatusCode());
+        deleteFeaturedDataverseResponse.then().assertThat()
+                .body(containsString("Featured dataverses have been removed"));
+
+        Response deleteSubCollectionResponse = UtilIT.deleteDataverse(subDataverseAlias, apiToken);
+        deleteSubCollectionResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), deleteSubCollectionResponse.getStatusCode());
+
+        Response deleteSubCollectionPubResponse = UtilIT.deleteDataverse(subDataverseAliasPub, apiToken);
+        deleteSubCollectionResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), deleteSubCollectionPubResponse.getStatusCode());
+
+        Response deleteCollectionResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteCollectionResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), deleteCollectionResponse.getStatusCode());
+    }
+
+    @Test
+    public void testUpdateInputLevels() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Update valid input levels
+        String[] testInputLevelNames = {"geographicCoverage", "country"};
+        boolean[] testRequiredInputLevels = {true, false};
+        boolean[] testIncludedInputLevels = {true, false};
+        Response updateDataverseInputLevelsResponse = UtilIT.updateDataverseInputLevels(dataverseAlias, testInputLevelNames, testRequiredInputLevels, testIncludedInputLevels, apiToken);
+        String actualInputLevelName = updateDataverseInputLevelsResponse.then().extract().path("data.inputLevels[0].datasetFieldTypeName");
+        int geographicCoverageInputLevelIndex = actualInputLevelName.equals("geographicCoverage") ? 0 : 1;
+        updateDataverseInputLevelsResponse.then().assertThat()
+                .body(String.format("data.inputLevels[%d].include", geographicCoverageInputLevelIndex), equalTo(true))
+                .body(String.format("data.inputLevels[%d].required", geographicCoverageInputLevelIndex), equalTo(true))
+                .body(String.format("data.inputLevels[%d].include", 1 - geographicCoverageInputLevelIndex), equalTo(false))
+                .body(String.format("data.inputLevels[%d].required", 1 - geographicCoverageInputLevelIndex), equalTo(false))
+                .statusCode(OK.getStatusCode());
+        String actualFieldTypeName1 = updateDataverseInputLevelsResponse.then().extract().path("data.inputLevels[0].datasetFieldTypeName");
+        String actualFieldTypeName2 = updateDataverseInputLevelsResponse.then().extract().path("data.inputLevels[1].datasetFieldTypeName");
+        assertNotEquals(actualFieldTypeName1, actualFieldTypeName2);
+        assertThat(testInputLevelNames, hasItemInArray(actualFieldTypeName1));
+        assertThat(testInputLevelNames, hasItemInArray(actualFieldTypeName2));
+
+        // Update input levels with an invalid field type name
+        String[] testInvalidInputLevelNames = {"geographicCoverage", "invalid1"};
+        updateDataverseInputLevelsResponse = UtilIT.updateDataverseInputLevels(dataverseAlias, testInvalidInputLevelNames, testRequiredInputLevels, testIncludedInputLevels, apiToken);
+        updateDataverseInputLevelsResponse.then().assertThat()
+                .body("message", equalTo("Invalid dataset field type name: invalid1"))
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // Update input levels with invalid configuration (field required but not included)
+        testIncludedInputLevels = new boolean[]{false, false};
+        updateDataverseInputLevelsResponse = UtilIT.updateDataverseInputLevels(dataverseAlias, testInputLevelNames, testRequiredInputLevels, testIncludedInputLevels, apiToken);
+        updateDataverseInputLevelsResponse.then().assertThat()
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataverse.inputlevels.error.cannotberequiredifnotincluded", List.of("geographicCoverage"))))
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // Update invalid empty input levels
+        testInputLevelNames = new String[]{};
+        updateDataverseInputLevelsResponse = UtilIT.updateDataverseInputLevels(dataverseAlias, testInputLevelNames, testRequiredInputLevels, testIncludedInputLevels, apiToken);
+        updateDataverseInputLevelsResponse.then().assertThat()
+                .body("message", equalTo("Error while updating dataverse input levels: Input level list cannot be null or empty"))
+                .statusCode(INTERNAL_SERVER_ERROR.getStatusCode());
+    }
+
+    @Test
+    public void testAddDataverse() {
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String testAliasSuffix = "-add-dataverse";
+
+        // Without optional input levels and facet ids
+        String testDataverseAlias = UtilIT.getRandomDvAlias() + testAliasSuffix;
+        Response createSubDataverseResponse = UtilIT.createSubDataverse(testDataverseAlias, null, apiToken, "root");
+        createSubDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        Response listMetadataBlocksResponse = UtilIT.listMetadataBlocks(testDataverseAlias, false, false, apiToken);
+        listMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String actualMetadataBlockName = listMetadataBlocksResponse.then().extract().path("data[0].name");
+        assertEquals(actualMetadataBlockName, "citation");
+
+        // Assert root facets are configured
+        String[] expectedRootFacetIds = {"authorName", "subject", "keywordValue", "dateOfDeposit"};
+        Response listDataverseFacetsResponse = UtilIT.listDataverseFacets(testDataverseAlias, apiToken);
+        List<String> actualFacetNames = listDataverseFacetsResponse.then().extract().path("data");
+        assertThat("Facet names should match expected root facet ids", actualFacetNames, containsInAnyOrder(expectedRootFacetIds));
+
+        // With optional input levels and facet ids
+        String[] testInputLevelNames = {"geographicCoverage", "country"};
+        String[] testFacetIds = {"language", "contributorName"};
+        String[] testMetadataBlockNames = {"citation", "geospatial"};
+        testDataverseAlias = UtilIT.getRandomDvAlias() + testAliasSuffix;
+        createSubDataverseResponse = UtilIT.createSubDataverse(testDataverseAlias, null, apiToken, "root", testInputLevelNames, testFacetIds, testMetadataBlockNames);
+        createSubDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        // Assert custom facets are configured
+        listDataverseFacetsResponse = UtilIT.listDataverseFacets(testDataverseAlias, apiToken);
+        String actualFacetName1 = listDataverseFacetsResponse.then().extract().path("data[0]");
+        String actualFacetName2 = listDataverseFacetsResponse.then().extract().path("data[1]");
+        assertNotEquals(actualFacetName1, actualFacetName2);
+        assertThat(testFacetIds, hasItemInArray(actualFacetName1));
+        assertThat(testFacetIds, hasItemInArray(actualFacetName2));
+
+        // Assert input levels are configured
+        Response listDataverseInputLevelsResponse = UtilIT.listDataverseInputLevels(testDataverseAlias, apiToken);
+        String actualInputLevelName1 = listDataverseInputLevelsResponse.then().extract().path("data[0].datasetFieldTypeName");
+        String actualInputLevelName2 = listDataverseInputLevelsResponse.then().extract().path("data[1].datasetFieldTypeName");
+        assertNotEquals(actualFacetName1, actualFacetName2);
+        assertThat(testInputLevelNames, hasItemInArray(actualInputLevelName1));
+        assertThat(testInputLevelNames, hasItemInArray(actualInputLevelName2));
+
+        // Assert metadata blocks are configured
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(testDataverseAlias, false, false, apiToken);
+        listMetadataBlocksResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String actualMetadataBlockName1 = listMetadataBlocksResponse.then().extract().path("data[0].name");
+        String actualMetadataBlockName2 = listMetadataBlocksResponse.then().extract().path("data[1].name");
+        assertNotEquals(actualMetadataBlockName1, actualMetadataBlockName2);
+        assertThat(testMetadataBlockNames, hasItemInArray(actualMetadataBlockName1));
+        assertThat(testMetadataBlockNames, hasItemInArray(actualMetadataBlockName2));
+
+        // Setting metadata blocks without citation
+        testDataverseAlias = UtilIT.getRandomDvAlias() + testAliasSuffix;
+        String[] testMetadataBlockNamesWithoutCitation = {"geospatial"};
+        createSubDataverseResponse = UtilIT.createSubDataverse(testDataverseAlias, null, apiToken, "root", null, null, testMetadataBlockNamesWithoutCitation);
+        createSubDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        // Assert metadata blocks including citation are configured
+        String[] testExpectedBlockNames = {"citation", "geospatial"};
+        actualMetadataBlockName1 = listMetadataBlocksResponse.then().extract().path("data[0].name");
+        actualMetadataBlockName2 = listMetadataBlocksResponse.then().extract().path("data[1].name");
+        assertNotEquals(actualMetadataBlockName1, actualMetadataBlockName2);
+        assertThat(testExpectedBlockNames, hasItemInArray(actualMetadataBlockName1));
+        assertThat(testExpectedBlockNames, hasItemInArray(actualMetadataBlockName2));
+
+        // Should return error when an invalid facet id is sent
+        String invalidFacetId = "invalidFacetId";
+        String[] testInvalidFacetIds = {"authorName", invalidFacetId};
+        testDataverseAlias = UtilIT.getRandomDvAlias() + testAliasSuffix;
+        createSubDataverseResponse = UtilIT.createSubDataverse(testDataverseAlias, null, apiToken, "root", testInputLevelNames, testInvalidFacetIds, testMetadataBlockNames);
+        createSubDataverseResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataverse.facets.error.fieldtypenotfound",  Arrays.asList(invalidFacetId))));
+
+        // Should return error when an invalid input level is sent
+        String invalidInputLevelName = "wrongInputLevel";
+        String[] testInvalidInputLevelNames = {"geographicCoverage", invalidInputLevelName};
+        testDataverseAlias = UtilIT.getRandomDvAlias() + testAliasSuffix;
+        createSubDataverseResponse = UtilIT.createSubDataverse(testDataverseAlias, null, apiToken, "root", testInvalidInputLevelNames, testFacetIds, testMetadataBlockNames);
+        createSubDataverseResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Invalid dataset field type name: " + invalidInputLevelName));
+
+        // Should return error when an invalid metadata block name is sent
+        String invalidMetadataBlockName = "invalidMetadataBlockName";
+        String[] testInvalidMetadataBlockNames = {"citation", invalidMetadataBlockName};
+        testDataverseAlias = UtilIT.getRandomDvAlias() + testAliasSuffix;
+        createSubDataverseResponse = UtilIT.createSubDataverse(testDataverseAlias, null, apiToken, "root", testInputLevelNames, testInvalidFacetIds, testInvalidMetadataBlockNames);
+        createSubDataverseResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Invalid metadata block name: \"" + invalidMetadataBlockName + "\""));
+    }
+
+    @Test
+    public void testUpdateDataverse() throws JsonParseException {
+        String adminApiToken = getSuperuserToken();
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String testAliasSuffix = "-update-dataverse";
+
+        String testDataverseAlias = UtilIT.getRandomDvAlias() + testAliasSuffix;
+        Response createSubDataverseResponse = UtilIT.createSubDataverse(testDataverseAlias, null, apiToken, "root");
+        createSubDataverseResponse.prettyPrint();
+        createSubDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(null))
+                .body("data.datasetFileCountLimit", equalTo(null));
+
+        // Update the dataverse with a datasetFileCountLimit of 500
+        JsonObject data = JsonUtil.getJsonObject(createSubDataverseResponse.getBody().asString());
+        JsonParser parser = new JsonParser();
+        Dataverse dv = parser.parseDataverse(data.getJsonObject("data"));
+        dv.setDatasetFileCountLimit(500);
+        Response updateDataverseResponse = UtilIT.updateDataverse(testDataverseAlias, dv, adminApiToken);
+        updateDataverseResponse.prettyPrint();
+        updateDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(500))
+                .body("data.datasetFileCountLimit", equalTo(500));
+
+        String newAlias = UtilIT.getRandomDvAlias() + testAliasSuffix;
+        String newName = "New Test Dataverse Name";
+        String newAffiliation = "New Test Dataverse Affiliation";
+        String newDataverseType = Dataverse.DataverseType.TEACHING_COURSES.toString();
+        String[] newContactEmails = new String[]{"new_email@dataverse.com"};
+        String[] newInputLevelNames = new String[]{"geographicCoverage"};
+        String[] newFacetIds = new String[]{"contributorName"};
+        String[] newMetadataBlockNames = new String[]{"citation", "geospatial", "biomedical"};
+
+        // Assert that the error is returned for having both MetadataBlockNames and inheritMetadataBlocksFromParent
+        updateDataverseResponse = UtilIT.updateDataverse(
+                testDataverseAlias, newAlias, newName, newAffiliation, newDataverseType, newContactEmails, newInputLevelNames,
+                null, newMetadataBlockNames, apiToken,
+                Boolean.TRUE, Boolean.TRUE, null
+        );
+        updateDataverseResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.metadatablocks.error.containslistandinheritflag"), "metadataBlockNames", "inheritMetadataBlocksFromParent")));
+
+        // Assert that the error is returned for having both facetIds and inheritFacetsFromParent
+        updateDataverseResponse = UtilIT.updateDataverse(
+                testDataverseAlias, newAlias, newName, newAffiliation, newDataverseType, newContactEmails, newInputLevelNames,
+                newFacetIds, null, apiToken,
+                Boolean.TRUE, Boolean.TRUE, null
+        );
+        updateDataverseResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.metadatablocks.error.containslistandinheritflag"), "facetIds", "inheritFacetsFromParent")));
+
+        // Assert dataverse properties are updated
+        updateDataverseResponse = UtilIT.updateDataverse(
+                testDataverseAlias, newAlias, newName, newAffiliation, newDataverseType, newContactEmails, newInputLevelNames,
+                newFacetIds, newMetadataBlockNames, apiToken
+        );
+        updateDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String actualDataverseAlias = updateDataverseResponse.then().extract().path("data.alias");
+        assertEquals(newAlias, actualDataverseAlias);
+        String actualDataverseName = updateDataverseResponse.then().extract().path("data.name");
+        assertEquals(newName, actualDataverseName);
+        String actualDataverseAffiliation = updateDataverseResponse.then().extract().path("data.affiliation");
+        assertEquals(newAffiliation, actualDataverseAffiliation);
+        String actualDataverseType = updateDataverseResponse.then().extract().path("data.dataverseType");
+        assertEquals(newDataverseType, actualDataverseType);
+        String actualContactEmail = updateDataverseResponse.then().extract().path("data.dataverseContacts[0].contactEmail");
+        assertEquals("new_email@dataverse.com", actualContactEmail);
+
+        // Assert metadata blocks are updated
+        Response listMetadataBlocksResponse = UtilIT.listMetadataBlocks(newAlias, false, false, apiToken);
+        String actualDataverseMetadataBlock1 = listMetadataBlocksResponse.then().extract().path("data[0].name");
+        String actualDataverseMetadataBlock2 = listMetadataBlocksResponse.then().extract().path("data[1].name");
+        String actualDataverseMetadataBlock3 = listMetadataBlocksResponse.then().extract().path("data[2].name");
+        assertThat(newMetadataBlockNames, hasItemInArray(actualDataverseMetadataBlock1));
+        assertThat(newMetadataBlockNames, hasItemInArray(actualDataverseMetadataBlock2));
+        assertThat(newMetadataBlockNames, hasItemInArray(actualDataverseMetadataBlock3));
+
+        // Assert custom facets are updated
+        Response listDataverseFacetsResponse = UtilIT.listDataverseFacets(newAlias, apiToken);
+        String actualFacetName = listDataverseFacetsResponse.then().extract().path("data[0]");
+        assertThat(newFacetIds, hasItemInArray(actualFacetName));
+
+        // Assert input levels are updated
+        Response listDataverseInputLevelsResponse = UtilIT.listDataverseInputLevels(newAlias, apiToken);
+        String actualInputLevelName = listDataverseInputLevelsResponse.then().extract().path("data[0].datasetFieldTypeName");
+        assertThat(newInputLevelNames, hasItemInArray(actualInputLevelName));
+
+        // The alias has been changed, so we should not be able to do any operation using the old one
+        String oldDataverseAlias = testDataverseAlias;
+        Response getDataverseResponse = UtilIT.listDataverseFacets(oldDataverseAlias, apiToken);
+        getDataverseResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(newAlias, false, false, apiToken);
+        listMetadataBlocksResponse.prettyPrint();
+        updateDataverseResponse = UtilIT.updateDataverse(
+                newAlias, newAlias, newName, newAffiliation, newDataverseType, newContactEmails,
+                null,
+                null,
+                null,
+                apiToken
+        );
+        updateDataverseResponse.prettyPrint();
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(newAlias, false, false, apiToken);
+        listMetadataBlocksResponse.prettyPrint();
+
+
+        // Update the dataverse without including metadata blocks, facets, or input levels
+        // ignore the missing data so the metadata blocks, facets, and input levels are NOT deleted and inherited from the parent
+        updateDataverseResponse = UtilIT.updateDataverse(
+                newAlias, newAlias, newName, newAffiliation, newDataverseType, newContactEmails,
+                null,
+                null,
+                null,
+                apiToken
+        );
+        updateDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Assert that the metadata blocks are untouched and NOT inherited from the parent
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(newAlias, false, false, apiToken);
+        listMetadataBlocksResponse.prettyPrint();
+        listMetadataBlocksResponse
+                .then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(3))
+                .body("data[0].name", equalTo(actualDataverseMetadataBlock1))
+                .body("data[1].name", equalTo(actualDataverseMetadataBlock2))
+                .body("data[2].name", equalTo(actualDataverseMetadataBlock3));
+        // Assert that the dataverse should still have its input level(s)
+        listDataverseInputLevelsResponse = UtilIT.listDataverseInputLevels(newAlias, apiToken);
+        listDataverseInputLevelsResponse.prettyPrint();
+        listDataverseInputLevelsResponse
+                .then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(1))
+                .body("data[0].datasetFieldTypeName", equalTo("geographicCoverage"));
+        // Assert that the dataverse should still have its Facets
+        listDataverseFacetsResponse = UtilIT.listDataverseFacets(newAlias, apiToken);
+        listDataverseFacetsResponse.prettyPrint();
+        listDataverseFacetsResponse
+                .then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(1))
+                .body("data", hasItem("contributorName"));
+
+        // Update the dataverse without setting metadata blocks, facets, or input levels
+        // Do NOT ignore the missing data so the metadata blocks, facets, and input levels are deleted and inherited from the parent
+        updateDataverseResponse = UtilIT.updateDataverse(
+                newAlias,
+                newAlias,
+                newName,
+                newAffiliation,
+                newDataverseType,
+                newContactEmails,
+                null,
+                null,
+                null,
+                apiToken,
+                Boolean.TRUE, Boolean.TRUE, null
+        );
+        updateDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Assert that the metadata blocks are inherited from the parent
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(newAlias, false, false, apiToken);
+        listMetadataBlocksResponse.prettyPrint();
+        listMetadataBlocksResponse
+                .then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(1))
+                .body("data[0].name", equalTo("citation"));
+
+        // Assert that the facets are inherited from the parent
+        String[] rootFacetIds = new String[]{"authorName", "subject", "keywordValue", "dateOfDeposit"};
+        listDataverseFacetsResponse = UtilIT.listDataverseFacets(newAlias, apiToken);
+        String actualFacetName1 = listDataverseFacetsResponse.then().extract().path("data[0]");
+        String actualFacetName2 = listDataverseFacetsResponse.then().extract().path("data[1]");
+        String actualFacetName3 = listDataverseFacetsResponse.then().extract().path("data[2]");
+        String actualFacetName4 = listDataverseFacetsResponse.then().extract().path("data[3]");
+        assertThat(rootFacetIds, hasItemInArray(actualFacetName1));
+        assertThat(rootFacetIds, hasItemInArray(actualFacetName2));
+        assertThat(rootFacetIds, hasItemInArray(actualFacetName3));
+        assertThat(rootFacetIds, hasItemInArray(actualFacetName4));
+
+        // Assert that the dataverse should not have any input level
+        listDataverseInputLevelsResponse = UtilIT.listDataverseInputLevels(newAlias, apiToken);
+        listDataverseInputLevelsResponse
+                .then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(0));
+
+        // Should return error when the dataverse to edit does not exist
+        updateDataverseResponse = UtilIT.updateDataverse(
+                "unexistingDataverseAlias",
+                newAlias,
+                newName,
+                newAffiliation,
+                newDataverseType,
+                newContactEmails,
+                newInputLevelNames,
+                newFacetIds,
+                newMetadataBlockNames,
+                apiToken
+        );
+        updateDataverseResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // User with unprivileged API token cannot update Root dataverse
+        updateDataverseResponse = UtilIT.updateDataverse(
+                "root",
+                newAlias,
+                newName,
+                newAffiliation,
+                newDataverseType,
+                newContactEmails,
+                newInputLevelNames,
+                newFacetIds,
+                newMetadataBlockNames,
+                apiToken
+        );
+        updateDataverseResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        Response rootCollectionInfoResponse = UtilIT.exportDataverse("root", apiToken);
+        rootCollectionInfoResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.name", equalTo("Root"));
+
+
+        updateDataverseResponse = UtilIT.updateDataverse(
+                testDataverseAlias, newAlias, newName, newAffiliation, newDataverseType, newContactEmails, newInputLevelNames,
+                newFacetIds, newMetadataBlockNames, apiToken);
+    }
+
+    @Test
+    public void testListFacets() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        String[] expectedFacetNames = {"authorName", "subject", "keywordValue", "dateOfDeposit"};
+
+        // returnDetails is false
+        Response listFacetsResponse = UtilIT.listDataverseFacets(dataverseAlias, false, apiToken);
+        listFacetsResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String actualFacetName = listFacetsResponse.then().extract().path("data[0]");
+        assertThat(expectedFacetNames, hasItemInArray(actualFacetName));
+
+        // returnDetails is true
+        String[] expectedDisplayNames = {"Author Name", "Subject", "Keyword Term", "Deposit Date"};
+        listFacetsResponse = UtilIT.listDataverseFacets(dataverseAlias, true, apiToken);
+        listFacetsResponse.then().assertThat().statusCode(OK.getStatusCode());
+        actualFacetName = listFacetsResponse.then().extract().path("data[0].name");
+        assertThat(expectedFacetNames, hasItemInArray(actualFacetName));
+        String actualDisplayName = listFacetsResponse.then().extract().path("data[0].displayName");
+        assertThat(expectedDisplayNames, hasItemInArray(actualDisplayName));
+        String actualId = listFacetsResponse.then().extract().path("data[0].id");
+        assertNotNull(actualId);
+
+        // Dataverse with custom facets
+        String dataverseWithCustomFacetsAlias = UtilIT.getRandomDvAlias() + "customFacets";
+
+        String[] testFacetNames = {"authorName", "authorAffiliation"};
+        String[] testMetadataBlockNames = {"citation", "geospatial"};
+
+        Response createSubDataverseResponse = UtilIT.createSubDataverse(dataverseWithCustomFacetsAlias, null, apiToken, "root", null, testFacetNames, testMetadataBlockNames);
+        createSubDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        listFacetsResponse = UtilIT.listDataverseFacets(dataverseWithCustomFacetsAlias, true, apiToken);
+        listFacetsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        String actualFacetName1 = listFacetsResponse.then().extract().path("data[0].name");
+        String actualFacetName2 = listFacetsResponse.then().extract().path("data[1].name");
+        assertNotEquals(actualFacetName1, actualFacetName2);
+        assertThat(testFacetNames, hasItemInArray(actualFacetName1));
+        assertThat(testFacetNames, hasItemInArray(actualFacetName2));
+
+        String[] testFacetExpectedDisplayNames = {"Author Name", "Author Affiliation"};
+        String actualFacetDisplayName1 = listFacetsResponse.then().extract().path("data[0].displayName");
+        String actualFacetDisplayName2 = listFacetsResponse.then().extract().path("data[1].displayName");
+        assertNotEquals(actualFacetDisplayName1, actualFacetDisplayName2);
+        assertThat(testFacetExpectedDisplayNames, hasItemInArray(actualFacetDisplayName1));
+        assertThat(testFacetExpectedDisplayNames, hasItemInArray(actualFacetDisplayName2));
+    }
+
+    @Test
+    public void testGetUserPermissionsOnDataverse() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Call for dataverse created by the user
+        Response getUserPermissionsOnDataverseResponse = UtilIT.getUserPermissionsOnDataverse(dataverseAlias, apiToken);
+        getUserPermissionsOnDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        boolean canAddDataverse = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canAddDataverse");
+        assertTrue(canAddDataverse);
+        boolean canAddDataset = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canAddDataset");
+        assertTrue(canAddDataset);
+        boolean canViewUnpublishedDataverse = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canViewUnpublishedDataverse");
+        assertTrue(canViewUnpublishedDataverse);
+        boolean canEditDataverse = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canEditDataverse");
+        assertTrue(canEditDataverse);
+        boolean canManageDataversePermissions = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canManageDataversePermissions");
+        assertTrue(canManageDataversePermissions);
+        boolean canPublishDataverse = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canPublishDataverse");
+        assertTrue(canPublishDataverse);
+        boolean canDeleteDataverse = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canDeleteDataverse");
+        assertTrue(canDeleteDataverse);
+
+        // Call for root dataverse
+        getUserPermissionsOnDataverseResponse = UtilIT.getUserPermissionsOnDataverse("root", apiToken);
+        getUserPermissionsOnDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        canAddDataverse = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canAddDataverse");
+        assertTrue(canAddDataverse);
+        canAddDataset = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canAddDataset");
+        assertTrue(canAddDataset);
+        canViewUnpublishedDataverse = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canViewUnpublishedDataverse");
+        assertFalse(canViewUnpublishedDataverse);
+        canEditDataverse = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canEditDataverse");
+        assertFalse(canEditDataverse);
+        canManageDataversePermissions = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canManageDataversePermissions");
+        assertFalse(canManageDataversePermissions);
+        canPublishDataverse = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canPublishDataverse");
+        assertFalse(canPublishDataverse);
+        canDeleteDataverse = JsonPath.from(getUserPermissionsOnDataverseResponse.body().asString()).getBoolean("data.canDeleteDataverse");
+        assertFalse(canDeleteDataverse);
+
+        // Call with invalid dataverse alias
+        Response getUserPermissionsOnDataverseInvalidIdResponse = UtilIT.getUserPermissionsOnDataverse("testInvalidAlias", apiToken);
+        getUserPermissionsOnDataverseInvalidIdResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    public void testCreateFeaturedItem() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String pathToFile1 = "src/main/webapp/resources/images/cc0.png";
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile1, apiToken);
+        uploadFileResponse.prettyPrint();
+        String datafileId = String.valueOf(UtilIT.getDataFileIdFromResponse(uploadFileResponse));
+        assertTrue(UtilIT.sleepForLock(datasetId, "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration");
+
+        // Publish Dataverse and Dataset with Datafile
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).prettyPrint();
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).prettyPrint();
+
+        // Should not return any error when not passing a file
+
+        Response createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, "test", 0, null);
+        createFeatureItemResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.content", equalTo("test"))
+                .body("data.type", equalTo("custom"))
+                .body("data.imageFileName", equalTo(null))
+                .body("data.displayOrder", equalTo(0));
+
+        // Should not return any error when passing correct file and data
+
+        String pathToTestFile = "src/test/resources/images/coffeeshop.png";
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, "test", 1, pathToTestFile);
+        createFeatureItemResponse.then().assertThat()
+                .body("data.content", equalTo("test"))
+                .body("data.imageFileName", equalTo("coffeeshop.png"))
+                .body("data.displayOrder", equalTo(1))
+                .statusCode(OK.getStatusCode());
+
+        // Should return bad request error when passing incorrect file type
+
+        pathToTestFile = "src/test/resources/tab/test.tab";
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, "test", 0, pathToTestFile);
+        createFeatureItemResponse.then().assertThat()
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataverse.create.featuredItem.error.invalidFileType")))
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // Should return unauthorized error when user has no permissions
+
+        Response createRandomUser = UtilIT.createRandomUser();
+        String randomUserApiToken = UtilIT.getApiTokenFromResponse(createRandomUser);
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, randomUserApiToken, "test", 0, pathToTestFile);
+        createFeatureItemResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Should return not found error when dataverse does not exist
+
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem("thisDataverseDoesNotExist", apiToken, "test", 0, pathToTestFile);
+        createFeatureItemResponse.then().assertThat()
+                .body("message", equalTo("Can't find dataverse with identifier='thisDataverseDoesNotExist'"))
+                .statusCode(NOT_FOUND.getStatusCode());
+
+        // Testing new dvobject-type featured items
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 10, null, "dataset", datasetPersistentId);
+        createFeatureItemResponse.prettyPrint();
+        createFeatureItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 11, null, "datafile", datafileId);
+        createFeatureItemResponse.prettyPrint();
+        Response listDataverseFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, apiToken);
+        listDataverseFeaturedItemsResponse.prettyPrint();
+        listDataverseFeaturedItemsResponse.then().assertThat()
+                .body("data[2].dvObjectIdentifier", equalTo(datasetPersistentId))
+                .body("data[2].type", equalTo("dataset"))
+                .body("data[3].dvObjectIdentifier", equalTo(datafileId))
+                .body("data[3].type", equalTo("datafile"));
+    }
+
+    @Test
+    public void testListFeaturedItems() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Create test items
+
+        List<Long> ids = Arrays.asList(0L, 0L, 0L);
+        List<String> contents = Arrays.asList("Content 1", "Content 2", "Content 3");
+        List<Integer> orders = Arrays.asList(2, 1, 0);
+        List<Boolean> keepFiles = Arrays.asList(false, false, false);
+        List<String> pathsToFiles = Arrays.asList("src/test/resources/images/coffeeshop.png", null, null);
+
+        Response updateDataverseFeaturedItemsResponse = UtilIT.updateDataverseFeaturedItems(dataverseAlias, ids, contents, orders, keepFiles, pathsToFiles, apiToken);
+        updateDataverseFeaturedItemsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Items should be retrieved with all their properties and sorted by displayOrder
+
+        Response listDataverseFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, apiToken);
+        listDataverseFeaturedItemsResponse.prettyPrint();
+        listDataverseFeaturedItemsResponse.then().assertThat()
+                .body("data.size()", equalTo(3))
+                .body("data[0].content", equalTo("Content 3"))
+                .body("data[0].imageFileName", equalTo(null))
+                .body("data[0].imageFileUrl", equalTo(null))
+                .body("data[0].displayOrder", equalTo(0))
+                .body("data[0].type", equalTo("custom"))
+                .body("data[1].content", equalTo("Content 2"))
+                .body("data[1].imageFileName", equalTo(null))
+                .body("data[1].imageFileUrl", equalTo(null))
+                .body("data[1].displayOrder", equalTo(1))
+                .body("data[1].type", equalTo("custom"))
+                .body("data[2].content", equalTo("Content 1"))
+                .body("data[2].imageFileName", equalTo("coffeeshop.png"))
+                .body("data[2].imageFileUrl", containsString("/api/access/dataverseFeaturedItemImage/"))
+                .body("data[2].displayOrder", equalTo(2))
+                .body("data[2].type", equalTo("custom"))
+                .statusCode(OK.getStatusCode());
+
+        // Should return not found error when dataverse does not exist
+
+        listDataverseFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems("thisDataverseDoesNotExist", apiToken);
+        listDataverseFeaturedItemsResponse.then().assertThat()
+                .body("message", equalTo("Can't find dataverse with identifier='thisDataverseDoesNotExist'"))
+                .statusCode(NOT_FOUND.getStatusCode());
+
+    }
+
+    @Test
+    public void testUpdateFeaturedItems() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        String baseUri = UtilIT.getRestAssuredBaseUri();
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).prettyPrint();
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).prettyPrint();
+
+        // Create new items
+
+        List<Long> ids = Arrays.asList(0L, 0L, 0L);
+        List<String> contents = Arrays.asList("Content 1", "Content 2", "Content 3");
+        List<Integer> orders = Arrays.asList(0, 1, 2);
+        List<Boolean> keepFiles = Arrays.asList(false, false, false);
+        List<String> pathsToFiles = Arrays.asList("src/test/resources/images/coffeeshop.png", null, null);
+
+        Response updateDataverseFeaturedItemsResponse = UtilIT.updateDataverseFeaturedItems(dataverseAlias, ids, contents, orders, keepFiles, pathsToFiles, apiToken);
+        updateDataverseFeaturedItemsResponse.prettyPrint();
+        updateDataverseFeaturedItemsResponse.then().assertThat()
+                .body("data.size()", equalTo(3))
+                .body("data[0].content", equalTo("Content 1"))
+                .body("data[0].imageFileName", equalTo("coffeeshop.png"))
+                .body("data[0].imageFileUrl", containsString("/api/access/dataverseFeaturedItemImage/"))
+                .body("data[0].displayOrder", equalTo(0))
+                .body("data[0].type", equalTo("custom"))
+                .body("data[1].content", equalTo("Content 2"))
+                .body("data[1].imageFileName", equalTo(null))
+                .body("data[1].imageFileUrl", equalTo(null))
+                .body("data[1].displayOrder", equalTo(1))
+                .body("data[1].type", equalTo("custom"))
+                .body("data[2].content", equalTo("Content 3"))
+                .body("data[2].imageFileName", equalTo(null))
+                .body("data[2].imageFileUrl", equalTo(null))
+                .body("data[2].displayOrder", equalTo(2))
+                .body("data[2].type", equalTo("custom"))
+                .statusCode(OK.getStatusCode());
+
+        Long firstItemId = JsonPath.from(updateDataverseFeaturedItemsResponse.body().asString()).getLong("data[0].id");
+        Long secondItemId = JsonPath.from(updateDataverseFeaturedItemsResponse.body().asString()).getLong("data[1].id");
+        Long thirdItemId = JsonPath.from(updateDataverseFeaturedItemsResponse.body().asString()).getLong("data[2].id");
+
+        // Update first item (content, order, and keeping image), delete the rest and create new items
+
+        ids = Arrays.asList(firstItemId, 0L, 0L);
+        contents = Arrays.asList("Content 1 updated", "Content 2", "Content 3");
+        orders = Arrays.asList(1, 0, 2);
+        keepFiles = Arrays.asList(true, false, false);
+        pathsToFiles = Arrays.asList(null, null, null);
+        List<String> types = Arrays.asList("custom", "custom", "dataset");
+        List<String> dvObjects = Arrays.asList("", "", String.valueOf(datasetId));
+
+        updateDataverseFeaturedItemsResponse = UtilIT.updateDataverseFeaturedItems(dataverseAlias, ids, contents, orders, keepFiles, pathsToFiles, types, dvObjects, apiToken);
+        updateDataverseFeaturedItemsResponse.prettyPrint();
+        updateDataverseFeaturedItemsResponse.then().assertThat()
+                .body("data.size()", equalTo(3))
+                .body("data[0].content", equalTo("Content 2"))
+                .body("data[0].imageFileName", equalTo(null))
+                .body("data[0].imageFileUrl", equalTo(null))
+                .body("data[0].displayOrder", equalTo(0))
+                .body("data[0].type", equalTo("custom"))
+                .body("data[1].content", equalTo("Content 1 updated"))
+                .body("data[1].imageFileName", equalTo("coffeeshop.png"))
+                .body("data[1].imageFileUrl", containsString("/api/access/dataverseFeaturedItemImage/"))
+                .body("data[1].displayOrder", equalTo(1))
+                .body("data[1].type", equalTo("custom"))
+                .body("data[2].content", equalTo(null))
+                .body("data[2].imageFileName", equalTo(null))
+                .body("data[2].imageFileUrl", equalTo(null))
+                .body("data[2].displayOrder", equalTo(2))
+                .body("data[2].type", equalTo("dataset"))
+                .body("data[2].dvObjectIdentifier", equalTo(datasetPersistentId))
+                .statusCode(OK.getStatusCode());
+
+        Long firstItemIdAfterUpdate = JsonPath.from(updateDataverseFeaturedItemsResponse.body().asString()).getLong("data[1].id");
+        Long secondItemIdAfterUpdate = JsonPath.from(updateDataverseFeaturedItemsResponse.body().asString()).getLong("data[0].id");
+        Long thirdItemIdAfterUpdate = JsonPath.from(updateDataverseFeaturedItemsResponse.body().asString()).getLong("data[2].id");
+
+        assertEquals(firstItemId, firstItemIdAfterUpdate);
+        assertNotEquals(secondItemId, secondItemIdAfterUpdate);
+        assertNotEquals(thirdItemId, thirdItemIdAfterUpdate);
+
+        // Update first item (removing image), update second item (adding image), delete the third item and create a new item
+
+        ids = Arrays.asList(firstItemId, secondItemIdAfterUpdate, 0L);
+        contents = Arrays.asList("Content 1 updated", "Content 2", "Content 3");
+        orders = Arrays.asList(1, 0, 2);
+        keepFiles = Arrays.asList(false, false, false);
+        pathsToFiles = Arrays.asList(null, "src/test/resources/images/coffeeshop.png", null);
+
+        updateDataverseFeaturedItemsResponse = UtilIT.updateDataverseFeaturedItems(dataverseAlias, ids, contents, orders, keepFiles, pathsToFiles, apiToken);
+        updateDataverseFeaturedItemsResponse.then().assertThat()
+                .body("data.size()", equalTo(3))
+                .body("data[0].content", equalTo("Content 2"))
+                .body("data[0].imageFileName", equalTo("coffeeshop.png"))
+                .body("data[0].imageFileUrl", containsString("/api/access/dataverseFeaturedItemImage/"))
+                .body("data[0].displayOrder", equalTo(0))
+                .body("data[0].type", equalTo("custom"))
+                .body("data[1].content", equalTo("Content 1 updated"))
+                .body("data[1].imageFileName", equalTo(null))
+                .body("data[1].imageFileUrl", equalTo(null))
+                .body("data[1].displayOrder", equalTo(1))
+                .body("data[1].type", equalTo("custom"))
+                .body("data[2].content", equalTo("Content 3"))
+                .body("data[2].imageFileName", equalTo(null))
+                .body("data[2].imageFileUrl", equalTo(null))
+                .body("data[2].displayOrder", equalTo(2))
+                .body("data[2].type", equalTo("custom"))
+                .statusCode(OK.getStatusCode());
+
+        Long firstItemIdAfterSecondUpdate = JsonPath.from(updateDataverseFeaturedItemsResponse.body().asString()).getLong("data[1].id");
+        Long secondItemIdAfterSecondUpdate = JsonPath.from(updateDataverseFeaturedItemsResponse.body().asString()).getLong("data[0].id");
+        Long thirdItemIdAfterSecondUpdate = JsonPath.from(updateDataverseFeaturedItemsResponse.body().asString()).getLong("data[2].id");
+
+        assertEquals(firstItemId, firstItemIdAfterSecondUpdate);
+        assertEquals(secondItemIdAfterUpdate, secondItemIdAfterSecondUpdate);
+        assertNotEquals(thirdItemIdAfterUpdate, thirdItemIdAfterSecondUpdate);
+
+        // Only keep first featured item
+
+        ids = List.of(firstItemId);
+        contents = List.of("Content 1 updated");
+        orders = List.of(0);
+        keepFiles = List.of(false);
+        pathsToFiles = null;
+
+        updateDataverseFeaturedItemsResponse = UtilIT.updateDataverseFeaturedItems(dataverseAlias, ids, contents, orders, keepFiles, pathsToFiles, apiToken);
+        updateDataverseFeaturedItemsResponse.then().assertThat()
+                .body("data.size()", equalTo(1))
+                .body("data[0].content", equalTo("Content 1 updated"))
+                .body("data[0].imageFileName", equalTo(null))
+                .body("data[0].imageFileUrl", equalTo(null))
+                .body("data[0].displayOrder", equalTo(0))
+                .body("data[0].type", equalTo("custom"))
+                .statusCode(OK.getStatusCode());
+
+        // Should return unauthorized error when user has no permissions
+
+        Response createRandomUser = UtilIT.createRandomUser();
+        String randomUserApiToken = UtilIT.getApiTokenFromResponse(createRandomUser);
+        updateDataverseFeaturedItemsResponse = UtilIT.updateDataverseFeaturedItems(dataverseAlias, ids, contents, orders, keepFiles, pathsToFiles, randomUserApiToken);
+        updateDataverseFeaturedItemsResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Should return not found error when dataverse does not exist
+
+        updateDataverseFeaturedItemsResponse = UtilIT.updateDataverseFeaturedItems("thisDataverseDoesNotExist", ids, contents, orders, keepFiles, pathsToFiles, apiToken);
+        updateDataverseFeaturedItemsResponse.then().assertThat()
+                .body("message", equalTo("Can't find dataverse with identifier='thisDataverseDoesNotExist'"))
+                .statusCode(NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    public void testDeleteFeaturedItemWithDvObject() {
+        // test when featuring a datafile and the file is either deleted or restricted
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        // Upload a file
+        String pathToFile1 = "src/main/webapp/resources/images/cc0.png";
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile1, apiToken);
+        uploadFileResponse.prettyPrint();
+        Integer datafileId = UtilIT.getDataFileIdFromResponse(uploadFileResponse);
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile1);
+
+        // Publish the Dataverse and Dataset
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).prettyPrint();
+        UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken).prettyPrint();
+
+        Response createDataverseFeaturedItemResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, pathToFile1, "datafile", String.valueOf(datafileId));
+        createDataverseFeaturedItemResponse.prettyPrint();
+        int featuredItemId = UtilIT.getDatasetIdFromResponse(createDataverseFeaturedItemResponse);
+
+        Response listFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, apiToken);
+        listFeaturedItemsResponse.prettyPrint();
+        listFeaturedItemsResponse.then()
+                .body("data.size()", equalTo(1))
+                .assertThat().statusCode(OK.getStatusCode());
+
+        // delete the file creates a new DRAFT version of the Dataset but the File still exists in the latest published version
+        UtilIT.deleteFile(datafileId,apiToken).prettyPrint();
+        listFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, apiToken);
+        listFeaturedItemsResponse.prettyPrint();
+        listFeaturedItemsResponse.then()
+                .body("data.size()", equalTo(1))
+                .assertThat().statusCode(OK.getStatusCode());
+
+        // publish the draft version with the file deleted will cause the featured item to be deleted
+        UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken).prettyPrint();
+        listFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, apiToken);
+        listFeaturedItemsResponse.prettyPrint();
+        listFeaturedItemsResponse.then()
+                .body("data.size()", equalTo(0))
+                .assertThat().statusCode(OK.getStatusCode());
+
+        // try to delete the featured item if it's already deleted should be NOT FOUND
+        Response deleteItemResponse = UtilIT.deleteDataverseFeaturedItem(featuredItemId, apiToken);
+        deleteItemResponse.prettyPrint();
+        deleteItemResponse.then()
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notFound", List.of(String.valueOf(featuredItemId)))))
+                .assertThat().statusCode(NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    public void testRestrictFeaturedItemWithDvObject() {
+        // first create a superuser
+        Response createResponse = UtilIT.createRandomUser();
+        String adminApiToken = UtilIT.getApiTokenFromResponse(createResponse);
+        String username = UtilIT.getUsernameFromResponse(createResponse);
+        UtilIT.makeSuperUser(username);
+
+        // Create the owner of the dataverse/dataset/datafile
+        createResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createResponse);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).prettyPrint();
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+
+        // Upload a file
+        String pathToFile1 = "src/main/webapp/resources/images/cc0.png";
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile1, apiToken);
+        uploadFileResponse.prettyPrint();
+        Integer datafileId = UtilIT.getDataFileIdFromResponse(uploadFileResponse);
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile1);
+
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        Response createDatafileResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, pathToFile1, "datafile", String.valueOf(datafileId));
+        createDatafileResponse.prettyPrint();
+
+        // test when featuring a datafile and the file is either deleted or restricted
+        Response createUserResponse = UtilIT.createRandomUser();
+        createUserResponse.prettyPrint();
+        String userToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        username = UtilIT.getUsernameFromResponse(createUserResponse);
+
+        // Test restrict datafile
+        UtilIT.restrictFile(String.valueOf(datafileId), true, apiToken);
+        UtilIT.publishDatasetViaNativeApi(datasetId, "minor", apiToken);
+        Response listFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, userToken);
+        listFeaturedItemsResponse.prettyPrint();
+        listFeaturedItemsResponse.then()
+                .body("data.size()", equalTo(0))
+                .assertThat().statusCode(OK.getStatusCode());
+
+        // un-restrict
+        UtilIT.restrictFile(String.valueOf(datafileId), false, apiToken);
+        UtilIT.publishDatasetViaNativeApi(datasetId, "minor", apiToken);
+        listFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, userToken);
+        listFeaturedItemsResponse.prettyPrint();
+        listFeaturedItemsResponse.then()
+                .body("data.size()", equalTo(0))
+                .assertThat().statusCode(OK.getStatusCode());
+
+        // Test deaccessioned dataset.
+        createDatasetResponse = UtilIT.createDataverseFeaturedItem(dataverseAlias, apiToken, null, 0, pathToFile1, "dataset", String.valueOf(datasetId));
+        createDatasetResponse.prettyPrint();
+        listFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, userToken);
+        listFeaturedItemsResponse.prettyPrint();
+        listFeaturedItemsResponse.then()
+                .body("data.size()", equalTo(1))
+                .assertThat().statusCode(OK.getStatusCode());
+
+        for (int i=0; i < 3; i++) { // deaccession all versions
+            Response datasetResponse = UtilIT.deaccessionDataset(datasetId, "1." + i, "Test reason", null, apiToken);
+            datasetResponse.prettyPrint();
+            datasetResponse.then()
+                    .assertThat().statusCode(OK.getStatusCode());
+        }
+
+        // All featuredItems are now gone
+        listFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, userToken);
+        listFeaturedItemsResponse.prettyPrint();
+        listFeaturedItemsResponse.then()
+                .body("data.size()", equalTo(0))
+                .assertThat().statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testDeleteFeaturedItems() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Create test featured items
+
+        List<Long> ids = Arrays.asList(0L, 0L, 0L);
+        List<String> contents = Arrays.asList("Content 1", "Content 2", "Content 3");
+        List<Integer> orders = Arrays.asList(0, 1, 2);
+        List<Boolean> keepFiles = Arrays.asList(false, false, false);
+        List<String> pathsToFiles = Arrays.asList("src/test/resources/images/coffeeshop.png", null, null);
+
+        Response updateDataverseFeaturedItemsResponse = UtilIT.updateDataverseFeaturedItems(dataverseAlias, ids, contents, orders, keepFiles, pathsToFiles, apiToken);
+        updateDataverseFeaturedItemsResponse.then().assertThat()
+                .body("data.size()", equalTo(3))
+                .statusCode(OK.getStatusCode());
+
+        // Check that the featured items are successfully deleted when calling the delete endpoint
+
+        Response deleteDataverseFeaturedItemsResponse = UtilIT.deleteDataverseFeaturedItems(dataverseAlias, apiToken);
+        deleteDataverseFeaturedItemsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response listFeaturedItemsResponse = UtilIT.listDataverseFeaturedItems(dataverseAlias, apiToken);
+        listFeaturedItemsResponse.then()
+                .body("data.size()", equalTo(0))
+                .assertThat().statusCode(OK.getStatusCode());
+
+        // Should return unauthorized error when user has no permissions
+
+        Response createRandomUser = UtilIT.createRandomUser();
+        String randomUserApiToken = UtilIT.getApiTokenFromResponse(createRandomUser);
+        deleteDataverseFeaturedItemsResponse = UtilIT.deleteDataverseFeaturedItems(dataverseAlias, randomUserApiToken);
+        deleteDataverseFeaturedItemsResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Should return not found error when dataverse does not exist
+
+        deleteDataverseFeaturedItemsResponse = UtilIT.deleteDataverseFeaturedItems("thisDataverseDoesNotExist", apiToken);
+        deleteDataverseFeaturedItemsResponse.then().assertThat()
+                .body("message", equalTo("Can't find dataverse with identifier='thisDataverseDoesNotExist'"))
+                .statusCode(NOT_FOUND.getStatusCode());
+    }
+
+    @Test
+    public void testUpdateInputLevelDisplayOnCreate() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Configure metadata blocks - disable inherit from root and set specific blocks
+        Response setMetadataBlocksResponse = UtilIT.setMetadataBlocks(
+                dataverseAlias, 
+                Json.createArrayBuilder().add("socialscience"), 
+                apiToken);
+        setMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Verify initial state
+        Response listMetadataBlocks = UtilIT.listMetadataBlocks(dataverseAlias, false, true, apiToken);
+        listMetadataBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(1))
+                .body("data[0].name", equalTo("socialscience"));
+
+        // Update displayOnCreate for a field
+        Response updateResponse = UtilIT.updateDataverseInputLevelDisplayOnCreate(
+            dataverseAlias, "unitOfAnalysis", true, apiToken);
+        updateResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.inputLevels[0].displayOnCreate", equalTo(true))
+                .body("data.inputLevels[0].datasetFieldTypeName", equalTo("unitOfAnalysis"));
+        
+        // Update an inputlevel w/o displayOnCreate set
+        Response updateResponse2 = UtilIT.updateDataverseInputLevelDisplayOnCreate(
+            dataverseAlias, "unitOfAnalysis", null, apiToken);
+        updateResponse2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.inputLevels[0]", not(hasKey("displayOnCreate")))
+                .body("data.inputLevels[0].datasetFieldTypeName", equalTo("unitOfAnalysis"));
+    }
+    
+    @Test
+    public void testUpdateInputLevelDisplayOnCreateOverride() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Configure metadata blocks - disable inherit from root and set specific blocks
+        Response setMetadataBlocksResponse = UtilIT.setMetadataBlocks(
+                dataverseAlias, 
+                Json.createArrayBuilder().add("citation"), 
+                apiToken);
+        setMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+
+        Response listMetadataBlocks = UtilIT.listMetadataBlocks(dataverseAlias, false, true, apiToken);
+        listMetadataBlocks.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(1))
+                .body("data[0].name", equalTo("citation"));
+
+
+        // Update displayOnCreate for a field
+      
+               
+        Response updateResponse = UtilIT.updateDataverseInputLevelDisplayOnCreate(
+            dataverseAlias, "notesText", false, apiToken);
+        updateResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.inputLevels[0].displayOnCreate", equalTo(false))
+                .body("data.inputLevels[0].datasetFieldTypeName", equalTo("notesText"));  
+        
+        Response listMetadataBlocksResponse = UtilIT.listMetadataBlocks(dataverseAlias, true, true, apiToken);
+        listMetadataBlocksResponse.prettyPrint();
+         int expectedNumberOfMetadataFields = 9; // 28 - 18 - notes child duplicates
+        int  expectedOnlyDisplayedOnCreateNumberOfMetadataBlocks = 1;
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fields", not(equalTo(null)))
+                .body("data[0].fields.size()", equalTo(expectedNumberOfMetadataFields))
+                .body("data[0].displayName", equalTo("Citation Metadata"))
+                .body("data.size()", equalTo(expectedOnlyDisplayedOnCreateNumberOfMetadataBlocks))
+                .body("data[0].fields.author.childFields.size()", is(4));
+        //set it back just in case
+        updateResponse = UtilIT.updateDataverseInputLevelDisplayOnCreate(
+            dataverseAlias, "notesText", true, apiToken);
+        updateResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.inputLevels[0].displayOnCreate", equalTo(true))
+                .body("data.inputLevels[0].datasetFieldTypeName", equalTo("notesText"));
+        
+        updateResponse = UtilIT.updateDataverseInputLevelDisplayOnCreate(
+            dataverseAlias, "subtitle", true, apiToken);
+        updateResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.inputLevels[0].displayOnCreate", equalTo(true))
+                .body("data.inputLevels[0].datasetFieldTypeName", equalTo("subtitle"));
+        
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(dataverseAlias, true, true, apiToken);
+        listMetadataBlocksResponse.prettyPrint();
+        expectedNumberOfMetadataFields = 11; // 28 - 18 + subtitle child duplicates
+        expectedOnlyDisplayedOnCreateNumberOfMetadataBlocks = 1;
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fields", not(equalTo(null)))
+                .body("data[0].fields.size()", equalTo(expectedNumberOfMetadataFields))
+                .body("data[0].displayName", equalTo("Citation Metadata"))
+                .body("data.size()", equalTo(expectedOnlyDisplayedOnCreateNumberOfMetadataBlocks))
+                .body("data[0].fields.author.childFields.size()", is(4));
+        
+        updateResponse = UtilIT.updateDataverseInputLevelDisplayOnCreate(
+            dataverseAlias, "subtitle", false, apiToken);
+        updateResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.inputLevels[0].displayOnCreate", equalTo(false))
+                .body("data.inputLevels[0].datasetFieldTypeName", equalTo("subtitle"));
+        
+    }
+
+    @Test
+    public void testCreateAndGetTemplates() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        Response createSecondUserResponse = UtilIT.createRandomUser();
+        String secondApiToken = UtilIT.getApiTokenFromResponse(createSecondUserResponse);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Create a template
+
+        String jsonString = """
+                {
+                  "name": "Dataverse template",
+                  "isDefault": true,
+                  "fields": [
+                    {
+                      "typeName": "author",
+                      "value": [
+                        {
+                          "authorName": {
+                            "typeName": "authorName",
+                            "value": "Belicheck, Bill"
+                          },
+                          "authorAffiliation": {
+                            "typeName": "authorIdentifierScheme",
+                            "value": "ORCID"
+                          }
+                        }
+                      ]
+                    }
+                  ],
+                  "instructions": [
+                    {
+                        "instructionField": "author",
+                        "instructionText": "The author data"
+                    }
+                  ]
+                }
+                """;
+
+        Response createTemplateResponse = UtilIT.createTemplate(
+                dataverseAlias,
+                jsonString,
+                apiToken
+        );
+        createTemplateResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.name", equalTo("Dataverse template"))
+                .body("data.usageCount", equalTo(0))
+                .body("data.termsOfUseAndAccess.license.name", equalTo("CC0 1.0"))
+                .body("data.datasetFields.citation.fields.size()", equalTo(1))
+                .body("data.instructions.size()", equalTo(1))
+                .body("data.instructions[0].instructionField", equalTo("author"))
+                .body("data.instructions[0].instructionText", equalTo("The author data"))
+                .body("data.dataverseAlias", equalTo(dataverseAlias));
+
+        // Template creation should fail if the user lacks dataverse edit permissions
+
+        createTemplateResponse = UtilIT.createTemplate(
+                dataverseAlias,
+                jsonString,
+                secondApiToken
+        );
+        createTemplateResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Get templates
+
+        Response getTemplateResponse = UtilIT.getTemplates(dataverseAlias, apiToken);
+        getTemplateResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(1))
+                .body("data[0].name", equalTo("Dataverse template"))
+                .body("data[0].usageCount", equalTo(0))
+                .body("data[0].termsOfUseAndAccess.license.name", equalTo("CC0 1.0"))
+                .body("data[0].datasetFields.citation.fields.size()", equalTo(1))
+                .body("data[0].instructions.size()", equalTo(1))
+                .body("data[0].instructions[0].instructionField", equalTo("author"))
+                .body("data[0].instructions[0].instructionText", equalTo("The author data"))
+                .body("data[0].dataverseAlias", equalTo(dataverseAlias));
+
+        // Templates retrieval should fail if the user lacks dataverse edit permissions
+        getTemplateResponse = UtilIT.getTemplates(dataverseAlias, secondApiToken);
+        getTemplateResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+    }
+
+    private String getSuperuserToken() {
+        Response createResponse = UtilIT.createRandomUser();
+        String adminApiToken = UtilIT.getApiTokenFromResponse(createResponse);
+        String username = UtilIT.getUsernameFromResponse(createResponse);
+        UtilIT.makeSuperUser(username);
+        return adminApiToken;
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataversesTest.java b/src/test/java/edu/harvard/iq/dataverse/api/DataversesTest.java
new file mode 100644
index 00000000000..512b07912dd
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesTest.java
@@ -0,0 +1,243 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseMetadataBlockFacet;
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.EjbDataverseEngine;
+import edu.harvard.iq.dataverse.GuestbookResponseServiceBean;
+import edu.harvard.iq.dataverse.GuestbookServiceBean;
+import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.MetadataBlockServiceBean;
+import edu.harvard.iq.dataverse.api.datadeposit.SwordServiceBean;
+import edu.harvard.iq.dataverse.api.dto.DataverseMetadataBlockFacetDTO;
+import edu.harvard.iq.dataverse.api.imports.ImportServiceBean;
+import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.engine.command.impl.ListMetadataBlockFacetsCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.UpdateMetadataBlockFacetRootCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.UpdateMetadataBlockFacetsCommand;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Response;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ *
+ * @author adaybujeda
+ */
+@ExtendWith(MockitoExtension.class)
+public class DataversesTest {
+    // From AbstractApiBean class
+    @Mock
+    private EjbDataverseEngine engineSvc;
+    @Mock
+    private MetadataBlockServiceBean metadataBlockSvc;
+    @Mock
+    private PrivateUrlServiceBean privateUrlSvc;
+    @Mock
+    private HttpServletRequest httpRequest;
+
+    // From Dataverses class
+    @Mock
+    private ExplicitGroupServiceBean explicitGroupSvc;
+    @Mock
+    private ImportServiceBean importService;
+    @Mock
+    private SettingsServiceBean settingsService;
+    @Mock
+    private GuestbookResponseServiceBean guestbookResponseService;
+    @Mock
+    private GuestbookServiceBean guestbookService;
+    @Mock
+    private DataverseServiceBean dataverseService;
+    @Mock
+    private SwordServiceBean swordService;
+    @Mock
+    private ContainerRequestContext containerRequestContext;
+
+    @InjectMocks
+    private Dataverses target;
+
+    private Dataverse VALID_DATAVERSE;
+
+    @BeforeEach
+    public void beforeEachTest() {
+        VALID_DATAVERSE = new Dataverse();
+        VALID_DATAVERSE.setId(MocksFactory.nextId());
+        VALID_DATAVERSE.setAlias(UUID.randomUUID().toString());
+        VALID_DATAVERSE.setMetadataBlockFacetRoot(true);
+
+        Mockito.lenient().when(dataverseService.findByAlias(VALID_DATAVERSE.getAlias())).thenReturn(VALID_DATAVERSE);
+        Mockito.lenient().when(httpRequest.getHeader("X-Dataverse-key")).thenReturn(UUID.randomUUID().toString());
+        Mockito.lenient().when(privateUrlSvc.getPrivateUrlUserFromToken(Mockito.anyString())).thenReturn(new PrivateUrlUser(0));
+        Mockito.lenient().when(containerRequestContext.getProperty(ApiConstants.CONTAINER_REQUEST_CONTEXT_USER)).thenReturn(new AuthenticatedUser());
+    }
+
+    @Test
+    public void listMetadataBlockFacets_should_return_404_when_dataverse_is_not_found() {
+        String dataverseAlias = UUID.randomUUID().toString();
+        Mockito.when(dataverseService.findByAlias(dataverseAlias)).thenReturn(null);
+        Response result = target.listMetadataBlockFacets(containerRequestContext, dataverseAlias);
+
+        MatcherAssert.assertThat(result.getStatus(), Matchers.is(404));
+        Mockito.verifyNoMoreInteractions(engineSvc);
+    }
+
+    @Test
+    public void listMetadataBlockFacets_should_return_the_list_of_metadataBlockFacetDTOs() throws Exception{
+        MetadataBlock metadataBlock = Mockito.mock(MetadataBlock.class);
+        Mockito.when(metadataBlock.getName()).thenReturn("test_metadata_block_name");
+        Mockito.when(metadataBlock.getLocaleDisplayFacet()).thenReturn("test_metadata_facet_name");
+        DataverseMetadataBlockFacet dataverseMetadataBlockFacet = new DataverseMetadataBlockFacet();
+        dataverseMetadataBlockFacet.setDataverse(VALID_DATAVERSE);
+        dataverseMetadataBlockFacet.setMetadataBlock(metadataBlock);
+        Mockito.when(engineSvc.submit(Mockito.any(ListMetadataBlockFacetsCommand.class))).thenReturn(Arrays.asList(dataverseMetadataBlockFacet));
+
+        Response response = target.listMetadataBlockFacets(containerRequestContext, VALID_DATAVERSE.getAlias());
+
+        MatcherAssert.assertThat(response.getStatus(), Matchers.is(200));
+        MatcherAssert.assertThat(response.getEntity(), Matchers.notNullValue());
+        DataverseMetadataBlockFacetDTO result = (DataverseMetadataBlockFacetDTO)response.getEntity();
+        MatcherAssert.assertThat(result.getDataverseId(), Matchers.is(VALID_DATAVERSE.getId()));
+        MatcherAssert.assertThat(result.getDataverseAlias(), Matchers.is(VALID_DATAVERSE.getAlias()));
+        MatcherAssert.assertThat(result.isMetadataBlockFacetRoot(), Matchers.is(VALID_DATAVERSE.isMetadataBlockFacetRoot()));
+        MatcherAssert.assertThat(result.getMetadataBlocks().size(), Matchers.is(1));
+        MatcherAssert.assertThat(result.getMetadataBlocks().get(0).getMetadataBlockName(), Matchers.is("test_metadata_block_name"));
+        MatcherAssert.assertThat(result.getMetadataBlocks().get(0).getMetadataBlockFacet(), Matchers.is("test_metadata_facet_name"));
+
+        Mockito.verify(engineSvc).submit(Mockito.any(ListMetadataBlockFacetsCommand.class));
+    }
+
+    @Test
+    public void listMetadataBlockFacets_should_return_empty_list_when_metadata_block_facet_is_null() throws Exception{
+        Mockito.when(engineSvc.submit(Mockito.any(ListMetadataBlockFacetsCommand.class))).thenReturn(null);
+
+        Response response = target.listMetadataBlockFacets(containerRequestContext, VALID_DATAVERSE.getAlias());
+
+        MatcherAssert.assertThat(response.getStatus(), Matchers.is(200));
+        DataverseMetadataBlockFacetDTO result = (DataverseMetadataBlockFacetDTO)response.getEntity();
+        MatcherAssert.assertThat(result.getDataverseId(), Matchers.is(VALID_DATAVERSE.getId()));
+        MatcherAssert.assertThat(result.getDataverseAlias(), Matchers.is(VALID_DATAVERSE.getAlias()));
+        MatcherAssert.assertThat(result.isMetadataBlockFacetRoot(), Matchers.is(VALID_DATAVERSE.isMetadataBlockFacetRoot()));
+        MatcherAssert.assertThat(result.getMetadataBlocks(), Matchers.is(Collections.emptyList()));
+
+        Mockito.verify(engineSvc).submit(Mockito.any(ListMetadataBlockFacetsCommand.class));
+    }
+
+    @Test
+    public void setMetadataBlockFacets_should_return_404_when_dataverse_is_not_found() {
+        String dataverseAlias = UUID.randomUUID().toString();
+        Mockito.when(dataverseService.findByAlias(dataverseAlias)).thenReturn(null);
+        Response result = target.setMetadataBlockFacets(containerRequestContext, dataverseAlias, Collections.emptyList());
+
+        MatcherAssert.assertThat(result.getStatus(), Matchers.is(404));
+        Mockito.verifyNoMoreInteractions(engineSvc);
+    }
+
+    @Test
+    public void setMetadataBlockFacets_should_return_400_when_dataverse_has_metadata_facet_root_set_to_false() {
+        String dataverseAlias = UUID.randomUUID().toString();
+        Dataverse dataverse = Mockito.mock(Dataverse.class);
+        Mockito.when(dataverse.isMetadataBlockFacetRoot()).thenReturn(false);
+        Mockito.when(dataverseService.findByAlias(dataverseAlias)).thenReturn(dataverse);
+
+        Response result = target.setMetadataBlockFacets(containerRequestContext, dataverseAlias, Collections.emptyList());
+
+        MatcherAssert.assertThat(result.getStatus(), Matchers.is(400));
+        Mockito.verifyNoMoreInteractions(engineSvc);
+    }
+
+    @Test
+    public void setMetadataBlockFacets_should_return_400_when_invalid_metadata_block() {
+        Mockito.when(metadataBlockSvc.findByName("valid_block")).thenReturn(new MetadataBlock());
+        Mockito.when(metadataBlockSvc.findByName("invalid_block")).thenReturn(null);
+        List<String> metadataBlocks = Arrays.asList("valid_block", "invalid_block");
+        Response result = target.setMetadataBlockFacets(containerRequestContext, VALID_DATAVERSE.getAlias(), metadataBlocks);
+
+        MatcherAssert.assertThat(result.getStatus(), Matchers.is(400));
+        Mockito.verifyNoMoreInteractions(engineSvc);
+    }
+
+    @Test
+    public void setMetadataBlockFacets_should_return_200_when_update_is_successful() throws Exception {
+        MetadataBlock validBlock = new MetadataBlock();
+        Mockito.when(metadataBlockSvc.findByName("valid_block")).thenReturn(validBlock);
+        List<String> metadataBlocks = Arrays.asList("valid_block");
+        Response result = target.setMetadataBlockFacets(containerRequestContext, VALID_DATAVERSE.getAlias(), metadataBlocks);
+
+        MatcherAssert.assertThat(result.getStatus(), Matchers.is(200));
+        ArgumentCaptor<UpdateMetadataBlockFacetsCommand> updateCommand = ArgumentCaptor.forClass(UpdateMetadataBlockFacetsCommand.class);
+        Mockito.verify(engineSvc).submit(updateCommand.capture());
+
+        MatcherAssert.assertThat(updateCommand.getValue().getEditedDataverse(), Matchers.is(VALID_DATAVERSE));
+        MatcherAssert.assertThat(updateCommand.getValue().getMetadataBlockFacets().size(), Matchers.is(1));
+        MatcherAssert.assertThat(updateCommand.getValue().getMetadataBlockFacets().get(0).getDataverse(), Matchers.is(VALID_DATAVERSE));
+        MatcherAssert.assertThat(updateCommand.getValue().getMetadataBlockFacets().get(0).getMetadataBlock(), Matchers.is(validBlock));
+    }
+
+    @Test
+    public void setMetadataBlockFacets_should_support_empty_metadatablock_list() throws Exception{
+        Response result = target.setMetadataBlockFacets(containerRequestContext, VALID_DATAVERSE.getAlias(), Collections.emptyList());
+
+        MatcherAssert.assertThat(result.getStatus(), Matchers.is(200));
+        Mockito.verify(engineSvc).submit(Mockito.any(UpdateMetadataBlockFacetsCommand.class));
+    }
+
+    @Test
+    public void updateMetadataBlockFacetsRoot_should_return_404_when_dataverse_is_not_found() {
+        String dataverseAlias = UUID.randomUUID().toString();
+        Mockito.when(dataverseService.findByAlias(dataverseAlias)).thenReturn(null);
+        Response result = target.updateMetadataBlockFacetsRoot(containerRequestContext, dataverseAlias, "true");
+
+        MatcherAssert.assertThat(result.getStatus(), Matchers.is(404));
+        Mockito.verifyNoMoreInteractions(engineSvc);
+    }
+
+    @Test
+    public void updateMetadataBlockFacetsRoot_should_return_400_when_invalid_boolean() throws Exception{
+        Response result = target.updateMetadataBlockFacetsRoot(containerRequestContext, VALID_DATAVERSE.getAlias(), "invalid");
+
+        MatcherAssert.assertThat(result.getStatus(), Matchers.is(400));
+        Mockito.verifyNoMoreInteractions(engineSvc);
+    }
+
+    @Test
+    public void updateMetadataBlockFacetsRoot_should_return_200_and_make_no_update_when_dataverse_is_found_and_facet_root_has_not_changed() {
+        // VALID_DATAVERSE.metadataBlockFacetRoot is true
+        Response result = target.updateMetadataBlockFacetsRoot(containerRequestContext, VALID_DATAVERSE.getAlias(), "true");
+
+        MatcherAssert.assertThat(result.getStatus(), Matchers.is(200));
+        Mockito.verifyNoInteractions(engineSvc);
+    }
+
+    @Test
+    public void updateMetadataBlockFacetsRoot_should_return_200_and_execute_command_when_dataverse_is_found_and_facet_root_has_changed() throws Exception {
+        // VALID_DATAVERSE.metadataBlockFacetRoot is true
+        Response result = target.updateMetadataBlockFacetsRoot(containerRequestContext, VALID_DATAVERSE.getAlias(), "false");
+
+        MatcherAssert.assertThat(result.getStatus(), Matchers.is(200));
+        ArgumentCaptor<UpdateMetadataBlockFacetRootCommand> updateRootCommand = ArgumentCaptor.forClass(UpdateMetadataBlockFacetRootCommand.class);
+        Mockito.verify(engineSvc).submit(updateRootCommand.capture());
+
+        MatcherAssert.assertThat(updateRootCommand.getValue().getEditedDataverse(), Matchers.is(VALID_DATAVERSE));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java
new file mode 100644
index 00000000000..2b29de3e447
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java
@@ -0,0 +1,282 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.startsWith;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class DeactivateUsersIT {
+
+    @BeforeAll
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testDeactivateUser() {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        createSuperuser.then().assertThat().statusCode(OK.getStatusCode());
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createDataverse = UtilIT.createRandomDataverse(superuserApiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, superuserApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response grantRoleBeforeDeactivate = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.ADMIN.toString(), "@" + username, superuserApiToken);
+        grantRoleBeforeDeactivate.prettyPrint();
+        grantRoleBeforeDeactivate.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.assignee", equalTo("@" + username))
+                .body("data._roleAlias", equalTo("admin"));
+
+        String aliasInOwner = "groupFor" + dataverseAlias;
+        String displayName = "Group for " + dataverseAlias;
+        String user2identifier = "@" + username;
+        Response createGroup = UtilIT.createGroup(dataverseAlias, aliasInOwner, displayName, superuserApiToken);
+        createGroup.prettyPrint();
+        createGroup.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String groupIdentifier = JsonPath.from(createGroup.asString()).getString("data.identifier");
+
+        List<String> roleAssigneesToAdd = new ArrayList<>();
+        roleAssigneesToAdd.add(user2identifier);
+        Response addToGroup = UtilIT.addToGroup(dataverseAlias, aliasInOwner, roleAssigneesToAdd, superuserApiToken);
+        addToGroup.prettyPrint();
+        addToGroup.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response userTracesBeforeDeactivate = UtilIT.getUserTraces(username, superuserApiToken);
+        userTracesBeforeDeactivate.prettyPrint();
+        userTracesBeforeDeactivate.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.traces.roleAssignments.items[0].definitionPointName", equalTo(dataverseAlias))
+                .body("data.traces.roleAssignments.items[0].definitionPointId", equalTo(dataverseId))
+                .body("data.traces.explicitGroups.items[0].name", equalTo("Group for " + dataverseAlias));
+
+        Response deactivateUser = UtilIT.deactivateUser(username);
+        deactivateUser.prettyPrint();
+        deactivateUser.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getUser = UtilIT.getAuthenticatedUser(username, superuserApiToken);
+        getUser.prettyPrint();
+        getUser.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.deactivated", equalTo(true));
+
+        Response findUser = UtilIT.filterAuthenticatedUsers(superuserApiToken, username, null, 100, null);
+        findUser.prettyPrint();
+        findUser.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.users[0].userIdentifier", equalTo(username))
+                .body("data.users[0].deactivated", equalTo(true))
+                .body("data.users[0].deactivatedTime", startsWith("2"));
+
+        Response getUserDeactivated = UtilIT.getAuthenticatedUserByToken(apiToken);
+        getUserDeactivated.prettyPrint();
+        getUserDeactivated.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        Response userTracesAfterDeactivate = UtilIT.getUserTraces(username, superuserApiToken);
+        userTracesAfterDeactivate.prettyPrint();
+        userTracesAfterDeactivate.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                /**
+                 * Here we are showing the the following were deleted:
+                 *
+                 * - role assignments
+                 *
+                 * - membership in explict groups.
+                 */
+                .body("data.traces", equalTo(Collections.EMPTY_MAP));
+
+        Response grantRoleAfterDeactivate = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.ADMIN.toString(), "@" + username, superuserApiToken);
+        grantRoleAfterDeactivate.prettyPrint();
+        grantRoleAfterDeactivate.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", equalTo("User " + username + " is deactivated and cannot be given a role."));
+
+        Response addToGroupAfter = UtilIT.addToGroup(dataverseAlias, aliasInOwner, roleAssigneesToAdd, superuserApiToken);
+        addToGroupAfter.prettyPrint();
+        addToGroupAfter.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", equalTo("User " + username + " is deactivated and cannot be added to a group."));
+
+        Response grantRoleOnDataset = UtilIT.grantRoleOnDataset(datasetPersistentId, DataverseRole.ADMIN.toString(), "@" + username, superuserApiToken);
+        grantRoleOnDataset.prettyPrint();
+        grantRoleOnDataset.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", equalTo("User " + username + " is deactivated and cannot be given a role."));
+
+    }
+
+    @Test
+    public void testDeactivateUserById() {
+        
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        
+        Long userId = JsonPath.from(createUser.body().asString()).getLong("data.authenticatedUser.id");
+        Response deactivateUser = UtilIT.deactivateUser(userId);
+        deactivateUser.prettyPrint();
+        deactivateUser.then().assertThat().statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testMergeDeactivatedIntoNonDeactivatedUser() {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUserMergeTarget = UtilIT.createRandomUser();
+        createUserMergeTarget.prettyPrint();
+        String usernameMergeTarget = UtilIT.getUsernameFromResponse(createUserMergeTarget);
+
+        Response createUserToMerge = UtilIT.createRandomUser();
+        createUserToMerge.prettyPrint();
+        String usernameToMerge = UtilIT.getUsernameFromResponse(createUserToMerge);
+
+        Response deactivateUser = UtilIT.deactivateUser(usernameToMerge);
+        deactivateUser.prettyPrint();
+        deactivateUser.then().assertThat().statusCode(OK.getStatusCode());
+
+        // User accounts can only be merged if they are either both active or both deactivated.
+        Response mergeAccounts = UtilIT.mergeAccounts(usernameMergeTarget, usernameToMerge, superuserApiToken);
+        mergeAccounts.prettyPrint();
+        mergeAccounts.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+    }
+
+    @Test
+    public void testMergeNonDeactivatedIntoDeactivatedUser() {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUserMergeTarget = UtilIT.createRandomUser();
+        createUserMergeTarget.prettyPrint();
+        String usernameMergeTarget = UtilIT.getUsernameFromResponse(createUserMergeTarget);
+
+        Response createUserToMerge = UtilIT.createRandomUser();
+        createUserToMerge.prettyPrint();
+        String usernameToMerge = UtilIT.getUsernameFromResponse(createUserToMerge);
+
+        Response deactivateUser = UtilIT.deactivateUser(usernameMergeTarget);
+        deactivateUser.prettyPrint();
+        deactivateUser.then().assertThat().statusCode(OK.getStatusCode());
+
+        // User accounts can only be merged if they are either both active or both deactivated.
+        Response mergeAccounts = UtilIT.mergeAccounts(usernameMergeTarget, usernameToMerge, superuserApiToken);
+        mergeAccounts.prettyPrint();
+        mergeAccounts.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+    }
+
+    @Test
+    public void testMergeDeactivatedIntoDeactivatedUser() {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUserMergeTarget = UtilIT.createRandomUser();
+        createUserMergeTarget.prettyPrint();
+        String usernameMergeTarget = UtilIT.getUsernameFromResponse(createUserMergeTarget);
+
+        Response createUserToMerge = UtilIT.createRandomUser();
+        createUserToMerge.prettyPrint();
+        String usernameToMerge = UtilIT.getUsernameFromResponse(createUserToMerge);
+
+        Response deactivatedUserMergeTarget = UtilIT.deactivateUser(usernameMergeTarget);
+        deactivatedUserMergeTarget.prettyPrint();
+        deactivatedUserMergeTarget.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deactivatedUserToMerge = UtilIT.deactivateUser(usernameToMerge);
+        deactivatedUserToMerge.prettyPrint();
+        deactivatedUserToMerge.then().assertThat().statusCode(OK.getStatusCode());
+
+        // User accounts can only be merged if they are either both active or both deactivated.
+        Response mergeAccounts = UtilIT.mergeAccounts(usernameMergeTarget, usernameToMerge, superuserApiToken);
+        mergeAccounts.prettyPrint();
+        mergeAccounts.then().assertThat().statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testMergeUserIntoSelf() {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUserToMerge = UtilIT.createRandomUser();
+        createUserToMerge.prettyPrint();
+        String usernameToMerge = UtilIT.getUsernameFromResponse(createUserToMerge);
+
+        String usernameMergeTarget = usernameToMerge;
+
+        Response mergeAccounts = UtilIT.mergeAccounts(usernameMergeTarget, usernameToMerge, superuserApiToken);
+        mergeAccounts.prettyPrint();
+        mergeAccounts.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+    }
+
+    @Test
+    public void testTurnDeactivatedUserIntoSuperuser() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+
+        Response deactivateUser = UtilIT.deactivateUser(username);
+        deactivateUser.prettyPrint();
+        deactivateUser.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response toggleSuperuser = UtilIT.makeSuperUser(username);
+        toggleSuperuser.prettyPrint();
+        toggleSuperuser.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DeleteUsersIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DeleteUsersIT.java
new file mode 100644
index 00000000000..13f48f9b854
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DeleteUsersIT.java
@@ -0,0 +1,701 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.CoreMatchers.equalTo;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * The following query has been helpful in discovering places where user ids
+ * appear throughout the database. Here's a summary of how user deletion affects
+ * these tables.
+ *
+ * - apitoken: Not a concern. Tokens are deleted.
+ *
+ * - authenticateduserlookup: Not a concern. Rows are deleted.
+ *
+ * - confirmemaildata: Not a concern. Rows are deleted.
+ *
+ * - datasetlock: Not a concern, locks are deleted.
+ *
+ * - datasetversionuser: Definitely a concern. This table is what feeds the
+ * "Contributors" list under the "Version" tab on the dataset page. You can't
+ * delete the user. You can merge the user but the name under "Contributors"
+ * will change to the user you merged into. There is talk of implementing the
+ * concept of disabling users to handle this.
+ *
+ * - dvobject (creator_id): Definitely a concern. You can't delete a user. You
+ * have to merge instead.
+ *
+ * - dvobject (releaseuser_id): Definitely a concern. You can't delete a user.
+ * You have to merge instead. It seems that for files, releaseuser_id is not
+ * populated.
+ *
+ * - explicitgroup: Not a concern. Group membership is deleted.
+ *
+ * - fileaccessrequests: Not a concern. File requests are deleted.
+ *
+ * - guestbookresponse: Definitely a concern but it's possible to null out the
+ * user id. You can't delete a user but you can merge instead. There is talk of
+ * deactivate which would probably null out the id. In all cases the name and
+ * email address in the rows are left alone.
+ *
+ * - oauth2tokendata: Not a concern. Rows are deleted.
+ *
+ * - savedsearch: Definitely a concern. You can't delete a user. You have to
+ * merge.
+ *
+ * - userbannermessage: Not a concern. Rows are deleted.
+ *
+ * - usernotification (user_id): Not a concern. Deleted by a cascade.
+ *
+ * - usernotification (requestor_id): Not a big concern because of other
+ * constraints. This is only populated by "submit for review" (so that the
+ * curator has the name and email address of the author). All these
+ * notifications would be deleted by a cascade but deleting the user itself is
+ * prevented because the user recorded in the datasetversionuser table. (Both
+ * "submit for review" and "return to author" add you to that table.) So the
+ * bottom line is that the user can't be deleted. It has to be merged.
+ *
+ * - workflowcomment: Not a big concern because of other constraints. A workflow
+ * comment is optionally added as part of "return to author" but this also
+ * creates a row in the datasetversionuser table which means the user can't be
+ * deleted. It has to be merged instead.
+ *
+ *
+ * The tables that aren't captured above are actionlogrecord and roleassignment
+ * because the relationship is to the identifier (username) rather than the id.
+ * So we'll list them separately:
+ *
+ * - actionlogrecord: Not a concern. Delete can go through. On merge, they are
+ * changed from one user identifier to another.
+ *
+ * - roleassignment: Not a concern. Delete can go through. On merge, they are
+ * changed from one user identifier to another.
+ */
+/*
+           table_name            |                        constraint_name                         
+---------------------------------+----------------------------------------------------------------
+ apitoken                        | fk_apitoken_authenticateduser_id
+ authenticateduserlookup         | fk_authenticateduserlookup_authenticateduser_id
+ confirmemaildata                | fk_confirmemaildata_authenticateduser_id
+ datasetlock                     | fk_datasetlock_user_id
+ datasetversionuser              | fk_datasetversionuser_authenticateduser_id
+ dvobject                        | fk_dvobject_creator_id
+ dvobject                        | fk_dvobject_releaseuser_id
+ explicitgroup_authenticateduser | explicitgroup_authenticateduser_containedauthenticatedusers_id
+ fileaccessrequests              | fk_fileaccessrequests_authenticated_user_id
+ guestbookresponse               | fk_guestbookresponse_authenticateduser_id
+ oauth2tokendata                 | fk_oauth2tokendata_user_id
+ savedsearch                     | fk_savedsearch_creator_id
+ userbannermessage               | fk_userbannermessage_user_id
+ usernotification                | fk_usernotification_user_id
+ usernotification                | fk_usernotification_requestor_id
+ workflowcomment                 | fk_workflowcomment_authenticateduser_id
+(16 rows)
+
+-- https://stackoverflow.com/questions/5347050/postgresql-sql-script-to-get-a-list-of-all-tables-that-has-a-particular-column
+select R.TABLE_NAME, R.CONSTRAINT_NAME
+from INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE u
+inner join INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS FK
+    on U.CONSTRAINT_CATALOG = FK.UNIQUE_CONSTRAINT_CATALOG
+    and U.CONSTRAINT_SCHEMA = FK.UNIQUE_CONSTRAINT_SCHEMA
+    and U.CONSTRAINT_NAME = FK.UNIQUE_CONSTRAINT_NAME
+inner join INFORMATION_SCHEMA.KEY_COLUMN_USAGE R
+    ON R.CONSTRAINT_CATALOG = FK.CONSTRAINT_CATALOG
+    AND R.CONSTRAINT_SCHEMA = FK.CONSTRAINT_SCHEMA
+    AND R.CONSTRAINT_NAME = FK.CONSTRAINT_NAME
+WHERE U.COLUMN_NAME = 'id'
+--  AND U.TABLE_CATALOG = 'b'
+--  AND U.TABLE_SCHEMA = 'c'
+  AND U.TABLE_NAME = 'authenticateduser'
+ORDER BY R.TABLE_NAME;
+ */
+public class DeleteUsersIT {
+
+    @BeforeAll
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testDeleteRolesAndUnpublishedDataverse() {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String usernameForCreateDV = UtilIT.getUsernameFromResponse(createUser);
+        String normalApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response getTraces1 = UtilIT.getUserTraces(usernameForCreateDV, superuserApiToken);
+        getTraces1.prettyPrint();
+        getTraces1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.user.identifier", equalTo("@" + usernameForCreateDV))
+                // traces is {} when user hasn't left a trace
+                .body("data.traces", equalTo(Collections.emptyMap()));
+
+        Response createDataverse = UtilIT.createRandomDataverse(normalApiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response getTraces2 = UtilIT.getUserTraces(usernameForCreateDV, superuserApiToken);
+        getTraces2.prettyPrint();
+        getTraces2.then().assertThat().statusCode(OK.getStatusCode());
+
+        if (true) {
+            return;
+        }
+
+        createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String usernameForAssignedRole = UtilIT.getUsernameFromResponse(createUser);
+        String roleApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response assignRole = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.EDITOR.toString(),
+                "@" + usernameForAssignedRole, superuserApiToken);
+
+        // Shouldn't be able to delete user with a role
+        Response deleteUserRole = UtilIT.deleteUser(usernameForAssignedRole);
+
+        deleteUserRole.prettyPrint();
+        deleteUserRole.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Could not delete Authenticated User @" + usernameForAssignedRole + " because the user is associated with role assignment record(s)."));
+
+        // Now remove that role
+        Response removeRoles1 = UtilIT.deleteUserRoles(usernameForAssignedRole, superuserApiToken);
+        removeRoles1.prettyPrint();
+        removeRoles1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Roles removed for user " + usernameForAssignedRole + "."));
+
+        // Now the delete should work
+        Response deleteUserRole2 = UtilIT.deleteUser(usernameForAssignedRole);
+        deleteUserRole2.prettyPrint();
+        deleteUserRole2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("AuthenticatedUser @" + usernameForAssignedRole + " deleted. "));
+
+        // The owner of the dataverse that was just created is dataverseAdmin because it created the parent dataverse (root).
+        Response getTraces3 = UtilIT.getUserTraces(usernameForCreateDV, superuserApiToken);
+        getTraces3.prettyPrint();
+        getTraces3.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Removing roles here but could equally just delete the dataverse.
+        Response removeRoles2 = UtilIT.deleteUserRoles(usernameForCreateDV, superuserApiToken);
+        removeRoles2.prettyPrint();
+        removeRoles2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Shouldn't be able to delete a user who has created a DV
+        Response deleteUserCreateDV = UtilIT.deleteUser(usernameForCreateDV);
+        deleteUserCreateDV.prettyPrint();
+        deleteUserCreateDV.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Could not delete Authenticated User @" + usernameForCreateDV + " because the user has created Dataverse object(s)."));
+
+        Response deleteDataverse = UtilIT.deleteDataverse(dataverseAlias, superuserApiToken);
+        deleteDataverse.prettyPrint();
+        deleteDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Should be able to delete user after dv is deleted
+        Response deleteUserAfterDeleteDV = UtilIT.deleteUser(usernameForCreateDV);
+        deleteUserAfterDeleteDV.prettyPrint();
+        deleteUserAfterDeleteDV.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response deleteSuperuser = UtilIT.deleteUser(superuserUsername);
+        deleteSuperuser.prettyPrint();
+        assertEquals(200, deleteSuperuser.getStatusCode());
+
+    }
+
+    @Test
+    public void testDeleteUserWithUnPublishedDataverse() {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response removeRoles1 = UtilIT.deleteUserRoles(username, superuserApiToken);
+        removeRoles1.prettyPrint();
+        removeRoles1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Roles removed for user " + username + "."));
+
+        Response deleteUser1 = UtilIT.deleteUser(username);
+        deleteUser1.prettyPrint();
+        deleteUser1.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Could not delete Authenticated User @" + username + " because the user has created Dataverse object(s)."));
+
+        Response traces = UtilIT.getUserTraces(username, superuserApiToken);
+        traces.prettyPrint();
+        traces.then().assertThat().statusCode(OK.getStatusCode());
+
+        // You can't delete. You have to merge.
+        Response mergeAccounts = UtilIT.mergeAccounts(superuserUsername, username, superuserApiToken);
+        mergeAccounts.prettyPrint();
+        mergeAccounts.then().assertThat().statusCode(OK.getStatusCode());
+    }
+
+    /**
+     * You can't delete an account with guestbook entries so you have to merge
+     * it instead.
+     */
+    @Test
+    public void testDeleteUserWithGuestbookEntries() throws IOException {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String authorUsername = UtilIT.getUsernameFromResponse(createUser);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response downloader = UtilIT.createRandomUser();
+        downloader.prettyPrint();
+        String downloaderUsername = UtilIT.getUsernameFromResponse(downloader);
+        String downloaderApiToken = UtilIT.getApiTokenFromResponse(downloader);
+
+        Response createDataverse = UtilIT.createRandomDataverse(authorApiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        Path pathtoReadme = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "README.md");
+        java.nio.file.Files.write(pathtoReadme, "In the beginning...".getBytes());
+
+        Response uploadReadme = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme.toString(), authorApiToken);
+        uploadReadme.prettyPrint();
+        uploadReadme.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        int fileId = JsonPath.from(uploadReadme.body().asString()).getInt("data.files[0].dataFile.id");
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, authorApiToken);
+        publishDataverse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", authorApiToken);
+        publishDataset.then().assertThat().statusCode(OK.getStatusCode());
+        // This download creates a guestbook entry.
+        Response downloadFile = UtilIT.downloadFile(fileId, downloaderApiToken);
+        downloadFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        // We can't delete the downloader because a guestbook record (a download) has been created.
+        Response deleteDownloaderFail = UtilIT.deleteUser(downloaderUsername);
+        deleteDownloaderFail.prettyPrint();
+        deleteDownloaderFail.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // Let's see why we can't download.
+        Response getTraces = UtilIT.getUserTraces(downloaderUsername, superuserApiToken);
+        getTraces.prettyPrint();
+        getTraces.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.traces.guestbookEntries.count", equalTo(1));
+
+        // We can't delete so we do a merge instead.
+        Response mergeAccounts = UtilIT.mergeAccounts(superuserUsername, downloaderUsername, superuserApiToken);
+        mergeAccounts.prettyPrint();
+        mergeAccounts.then().assertThat().statusCode(OK.getStatusCode());
+
+    }
+
+    @Test
+    public void testDatasetLocks() throws IOException {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String authorUsername = UtilIT.getUsernameFromResponse(createUser);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response downloader = UtilIT.createRandomUser();
+        downloader.prettyPrint();
+        String downloaderUsername = UtilIT.getUsernameFromResponse(downloader);
+        String downloaderApiToken = UtilIT.getApiTokenFromResponse(downloader);
+
+        Response createDataverse = UtilIT.createRandomDataverse(authorApiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        Response lockDatasetResponse = UtilIT.lockDataset(datasetId.longValue(), "Ingest", superuserApiToken);
+        lockDatasetResponse.prettyPrint();
+        lockDatasetResponse.then().assertThat()
+                .body("data.message", equalTo("dataset locked with lock type Ingest"))
+                .statusCode(200);
+
+        Response checkDatasetLocks = UtilIT.checkDatasetLocks(datasetId.longValue(), "Ingest", superuserApiToken);
+        checkDatasetLocks.prettyPrint();
+        checkDatasetLocks.then().assertThat()
+                .body("data[0].lockType", equalTo("Ingest"))
+                .statusCode(200);
+        Response deleteUserWhoCreatedLock = UtilIT.deleteUser(superuserUsername);
+        deleteUserWhoCreatedLock.prettyPrint();
+        deleteUserWhoCreatedLock.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testDeleteUserWhoIsMemberOfGroup() throws IOException {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String authorUsername = UtilIT.getUsernameFromResponse(createUser);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response downloader = UtilIT.createRandomUser();
+        downloader.prettyPrint();
+        String downloaderUsername = UtilIT.getUsernameFromResponse(downloader);
+        String downloaderApiToken = UtilIT.getApiTokenFromResponse(downloader);
+
+        Response createDataverse = UtilIT.createRandomDataverse(authorApiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createGroupMember = UtilIT.createRandomUser();
+        createGroupMember.prettyPrint();
+        String groupMemberUsername = UtilIT.getUsernameFromResponse(createGroupMember);
+        String groupMemberApiToken = UtilIT.getApiTokenFromResponse(createGroupMember);
+
+        String aliasInOwner = "groupFor" + dataverseAlias;
+        String displayName = "Group for " + dataverseAlias;
+        String user2identifier = "@" + groupMemberUsername;
+        Response createGroup = UtilIT.createGroup(dataverseAlias, aliasInOwner, displayName, superuserApiToken);
+        createGroup.prettyPrint();
+        createGroup.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String groupIdentifier = JsonPath.from(createGroup.asString()).getString("data.identifier");
+
+        List<String> roleAssigneesToAdd = new ArrayList<>();
+        roleAssigneesToAdd.add(user2identifier);
+        Response addToGroup = UtilIT.addToGroup(dataverseAlias, aliasInOwner, roleAssigneesToAdd, superuserApiToken);
+        addToGroup.prettyPrint();
+        addToGroup.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response getTraces = UtilIT.getUserTraces(groupMemberUsername, superuserApiToken);
+        getTraces.prettyPrint();
+        getTraces.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deleteUserInGroup = UtilIT.deleteUser(groupMemberUsername);
+        deleteUserInGroup.prettyPrint();
+        deleteUserInGroup.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+    }
+
+    @Test
+    public void testDeleteUserWithFileAccessRequests() throws IOException {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String authorUsername = UtilIT.getUsernameFromResponse(createUser);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response fileRequester = UtilIT.createRandomUser();
+        fileRequester.prettyPrint();
+        String fileRequesterUsername = UtilIT.getUsernameFromResponse(fileRequester);
+        String fileRequesterApiToken = UtilIT.getApiTokenFromResponse(fileRequester);
+
+        Response createDataverse = UtilIT.createRandomDataverse(authorApiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        Path pathtoReadme = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "README.md");
+        java.nio.file.Files.write(pathtoReadme, "In the beginning...".getBytes());
+
+        Response uploadReadme = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme.toString(), authorApiToken);
+        uploadReadme.prettyPrint();
+        uploadReadme.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        Integer fileId = JsonPath.from(uploadReadme.body().asString()).getInt("data.files[0].dataFile.id");
+
+        Response restrictResponse = UtilIT.restrictFile(fileId.toString(), true, authorApiToken);
+        restrictResponse.prettyPrint();
+        restrictResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        //Update Dataset to allow requests
+        Response allowAccessRequestsResponse = UtilIT.allowAccessRequests(datasetPid, true, authorApiToken);
+        allowAccessRequestsResponse.prettyPrint();
+        allowAccessRequestsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, authorApiToken);
+        publishDataverse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", authorApiToken);
+        publishDataset.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response requestFileAccessResponse = UtilIT.requestFileAccess(fileId.toString(), fileRequesterApiToken);
+        requestFileAccessResponse.prettyPrint();
+        requestFileAccessResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Let's see why we can't download.
+        Response getTraces = UtilIT.getUserTraces(fileRequesterUsername, superuserApiToken);
+        getTraces.prettyPrint();
+        getTraces.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Even if users have outstanding file requests, they can be deleted.
+        Response deleteDownloaderSuccess = UtilIT.deleteUser(fileRequesterUsername);
+        deleteDownloaderSuccess.prettyPrint();
+        deleteDownloaderSuccess.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createCurator1 = UtilIT.createRandomUser();
+        createCurator1.prettyPrint();
+        createCurator1.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String curator1Username = UtilIT.getUsernameFromResponse(createCurator1);
+        String curator1ApiToken = UtilIT.getApiTokenFromResponse(createCurator1);
+
+        Response createCurator2 = UtilIT.createRandomUser();
+        createCurator2.prettyPrint();
+        createCurator2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String curator2Username = UtilIT.getUsernameFromResponse(createCurator2);
+        String curator2ApiToken = UtilIT.getApiTokenFromResponse(createCurator2);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(curator1ApiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response makeCurator2Admin = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.ADMIN.toString(), "@" + curator2Username, curator1ApiToken);
+        makeCurator2Admin.prettyPrint();
+        makeCurator2Admin.then().assertThat()
+                .body("data.assignee", equalTo("@" + curator2Username))
+                .body("data._roleAlias", equalTo("admin"))
+                .statusCode(OK.getStatusCode());
+
+        Response createAuthor1 = UtilIT.createRandomUser();
+        createAuthor1.prettyPrint();
+        createAuthor1.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String author1Username = UtilIT.getUsernameFromResponse(createAuthor1);
+        String author1ApiToken = UtilIT.getApiTokenFromResponse(createAuthor1);
+
+        Response createAuthor2 = UtilIT.createRandomUser();
+        createAuthor2.prettyPrint();
+        createAuthor2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String author2Username = UtilIT.getUsernameFromResponse(createAuthor2);
+        String author2ApiToken = UtilIT.getApiTokenFromResponse(createAuthor2);
+
+        Response grantAuthor1AddDataset = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR.toString(), "@" + author1Username, curator1ApiToken);
+        grantAuthor1AddDataset.prettyPrint();
+        grantAuthor1AddDataset.then().assertThat()
+                .body("data.assignee", equalTo("@" + author1Username))
+                .body("data._roleAlias", equalTo("dsContributor"))
+                .statusCode(OK.getStatusCode());
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, author1ApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        // FIXME: have the initial create return the DOI or Handle to obviate the need for this call.
+        Response getDatasetJsonBeforePublishing = UtilIT.nativeGet(datasetId, author1ApiToken);
+        getDatasetJsonBeforePublishing.prettyPrint();
+        String protocol = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.protocol");
+        String authority = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.authority");
+        String identifier = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.identifier");
+
+        String datasetPersistentId = protocol + ":" + authority + "/" + identifier;
+        System.out.println("datasetPersistentId: " + datasetPersistentId);
+
+//        Response grantAuthor2ContributorOnDataset = UtilIT.grantRoleOnDataset(datasetPersistentId, DataverseRole.DS_CONTRIBUTOR.toString(), "@" + author2Username, curatorApiToken);
+        // TODO: Tighten this down to something more realistic than ADMIN.
+        Response grantAuthor2ContributorOnDataset = UtilIT.grantRoleOnDataset(datasetPersistentId, DataverseRole.ADMIN.toString(), "@" + author2Username, curator1ApiToken);
+        grantAuthor2ContributorOnDataset.prettyPrint();
+        grantAuthor2ContributorOnDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.assignee", equalTo("@" + author2Username))
+                .body("data._roleAlias", equalTo("admin"));
+
+//        // Whoops, the author tries to publish but isn't allowed. The curator will take a look.
+//        Response noPermToPublish = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", author1ApiToken);
+//        noPermToPublish.prettyPrint();
+//        noPermToPublish.then().assertThat()
+//                .body("message", equalTo("User @" + author1Username + " is not permitted to perform requested action."))
+//                .statusCode(UNAUTHORIZED.getStatusCode());
+        Response submitForReview = UtilIT.submitDatasetForReview(datasetPersistentId, author2ApiToken);
+        submitForReview.prettyPrint();
+        submitForReview.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // curator2 returns dataset to author. This makes curator2 a contributor.
+        String comments = "You forgot to upload any files.";
+        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+        jsonObjectBuilder.add("reasonForReturn", comments);
+        Response returnToAuthor = UtilIT.returnDatasetToAuthor(datasetPersistentId, jsonObjectBuilder.build(), curator2ApiToken);
+        returnToAuthor.prettyPrint();
+        returnToAuthor.then().assertThat()
+                .body("data.inReview", equalTo(false))
+                .statusCode(OK.getStatusCode());
+
+        Response getTracesForCurator2 = UtilIT.getUserTraces(curator2Username, superuserApiToken);
+        getTracesForCurator2.prettyPrint();
+        getTracesForCurator2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response removeRolesFromCurator2 = UtilIT.deleteUserRoles(curator2Username, superuserApiToken);
+        removeRolesFromCurator2.prettyPrint();
+        removeRolesFromCurator2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Roles removed for user " + curator2Username + "."));
+
+        // Because curator2 returned the dataset to the authors, curator2 is now a contributor
+        // and cannot be deleted.
+        Response deleteCurator2Fail = UtilIT.deleteUser(curator2Username);
+        deleteCurator2Fail.prettyPrint();
+        deleteCurator2Fail.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Could not delete Authenticated User @" + curator2Username
+                        + " because the user has contributed to dataset version(s)."));
+
+        // What should we do with curator2 instead of deleting? The only option is to merge
+        // curator2 into some other account. Once implemented, we'll deactivate curator2's account
+        // so that curator2 continues to be displayed as a contributor.
+        //
+        // TODO: deactivate curator2 here
+        //
+        // Show the error if you don't have permission.
+        Response failToRemoveRole = UtilIT.deleteUserRoles(author2Username, curator2ApiToken);
+        failToRemoveRole.prettyPrint();
+        failToRemoveRole.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
+                .body("message", equalTo("User @" + curator2Username + " is not permitted to perform requested action."));
+
+        Response removeRolesFromAuthor2 = UtilIT.deleteUserRoles(author2Username, superuserApiToken);
+        removeRolesFromAuthor2.prettyPrint();
+        removeRolesFromAuthor2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Roles removed for user " + author2Username + "."));
+
+        // Similarly, we can't delete author2 because author2 submitted
+        // the dataset for review, which makes one a contributor.
+        Response deleteAuthor2Fail = UtilIT.deleteUser(author2Username);
+        deleteAuthor2Fail.prettyPrint();
+        deleteAuthor2Fail.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Could not delete Authenticated User @" + author2Username
+                        + " because the user has contributed to dataset version(s)."));
+
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DownloadFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DownloadFilesIT.java
new file mode 100644
index 00000000000..927efb0b142
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DownloadFilesIT.java
@@ -0,0 +1,470 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.http.Headers;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+import static edu.harvard.iq.dataverse.api.ApiConstants.DS_VERSION_DRAFT;
+import static edu.harvard.iq.dataverse.api.ApiConstants.DS_VERSION_LATEST_PUBLISHED;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class DownloadFilesIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    /**
+     * This test is focused on downloading all files by their version. All files
+     * are public.
+     */
+    @Test
+    public void downloadAllFilesByVersion() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        Path pathtoReadme = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathtoReadme, "In the beginning...".getBytes());
+
+        Response uploadReadme = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme.toString(), apiToken);
+        uploadReadme.prettyPrint();
+        uploadReadme.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        Path pathtoContribFile = Paths.get(Files.createTempDirectory(null) + File.separator + "CONTRIBUTING.md");
+        Files.write(pathtoContribFile, "Patches welcome!".getBytes());
+
+        Response uploadContribFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoContribFile.toString(), apiToken);
+        uploadContribFile.prettyPrint();
+        uploadContribFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("CONTRIBUTING.md"));
+
+        // The creator gets the files from the draft.
+        Response downloadFiles1 = UtilIT.downloadFiles(datasetPid, apiToken);
+        downloadFiles1.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        HashSet<String> filenamesFound1 = gatherFilenames(downloadFiles1.getBody().asInputStream());
+
+        // Note that a MANIFEST.TXT file is added.
+        HashSet<String> expectedFiles1 = new HashSet<>(Arrays.asList("MANIFEST.TXT", "README.md", "CONTRIBUTING.md"));
+        assertEquals(expectedFiles1, filenamesFound1);
+
+        // A guest user can't download unpublished files.
+        // (a guest user cannot even see that the draft version actually exists;
+        // so they are going to get a "BAD REQUEST", not "UNAUTHORIZED":)
+        Response downloadFiles2 = UtilIT.downloadFiles(datasetPid, null);
+        downloadFiles2.prettyPrint();
+        downloadFiles2.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("status", equalTo("ERROR"));
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken)
+                .then().assertThat().statusCode(OK.getStatusCode());
+
+        // Publishing version 1.0.
+        UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken)
+                .then().assertThat().statusCode(OK.getStatusCode());
+
+        // Now a guest user can download files (published now)
+        Response downloadFiles3 = UtilIT.downloadFiles(datasetPid, null);
+        downloadFiles3.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Path pathtoLicenseFile = Paths.get(Files.createTempDirectory(null) + File.separator + "LICENSE.md");
+        Files.write(pathtoLicenseFile, "Apache".getBytes());
+
+        Response uploadLicenseFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoLicenseFile.toString(), apiToken);
+        uploadLicenseFile.prettyPrint();
+        uploadLicenseFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("LICENSE.md"));
+
+        Response downloadFiles4 = UtilIT.downloadFiles(datasetPid, apiToken);
+        downloadFiles4.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        HashSet<String> filenamesFound2 = gatherFilenames(downloadFiles4.getBody().asInputStream());
+
+        // The creator gets the draft version with an extra file.
+        HashSet<String> expectedFiles2 = new HashSet<>(Arrays.asList("LICENSE.md", "MANIFEST.TXT", "README.md", "CONTRIBUTING.md"));
+        assertEquals(expectedFiles2, filenamesFound2);
+
+        Response downloadFiles5 = UtilIT.downloadFiles(datasetPid, null);
+        downloadFiles5.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        HashSet<String> filenamesFound3 = gatherFilenames(downloadFiles5.getBody().asInputStream());
+
+        // A guest user gets the 1.0 version with only 3 files.
+        HashSet<String> expectedFiles3 = new HashSet<>(Arrays.asList("MANIFEST.TXT", "README.md", "CONTRIBUTING.md"));
+        assertEquals(expectedFiles3, filenamesFound3);
+
+        // Publishing version 2.0
+        UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken)
+                .then().assertThat().statusCode(OK.getStatusCode());
+
+        Response downloadFiles6 = UtilIT.downloadFiles(datasetPid, apiToken);
+        downloadFiles6.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        HashSet<String> filenamesFound4 = gatherFilenames(downloadFiles6.getBody().asInputStream());
+
+        // By not specifying a version, the creator gets the latest version. In this case, 2.0 (published) with 4 files.
+        HashSet<String> expectedFiles4 = new HashSet<>(Arrays.asList("LICENSE.md", "MANIFEST.TXT", "README.md", "CONTRIBUTING.md"));
+        assertEquals(expectedFiles4, filenamesFound4);
+
+        String datasetVersion = "1.0";
+        Response downloadFiles7 = UtilIT.downloadFiles(datasetPid, datasetVersion, apiToken);
+        downloadFiles7.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        HashSet<String> filenamesFound5 = gatherFilenames(downloadFiles7.getBody().asInputStream());
+
+        // Creator specifies the 1.0 version and gets the expected 3 files.
+        HashSet<String> expectedFiles5 = new HashSet<>(Arrays.asList("MANIFEST.TXT", "README.md", "CONTRIBUTING.md"));
+        assertEquals(expectedFiles5, filenamesFound5);
+
+        // Add Code of Conduct file
+        Path pathtoCocFile = Paths.get(Files.createTempDirectory(null) + File.separator + "CODE_OF_CONDUCT.md");
+        Files.write(pathtoCocFile, "Be excellent to each other.".getBytes());
+
+        // This Code of Conduct file will be in version 3.0 once it's published. For now it's a draft.
+        Response uploadCocFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoCocFile.toString(), apiToken);
+        uploadCocFile.prettyPrint();
+        uploadCocFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("CODE_OF_CONDUCT.md"));
+
+        Response downloadFiles8 = UtilIT.downloadFiles(datasetPid, apiToken);
+        downloadFiles8.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        HashSet<String> filenamesFound6 = gatherFilenames(downloadFiles8.getBody().asInputStream());
+
+        // If the creator doesn't specify a version, they get the latest draft with 5 files.
+        HashSet<String> expectedFiles6 = new HashSet<>(Arrays.asList("CODE_OF_CONDUCT.md", "LICENSE.md", "MANIFEST.TXT", "README.md", "CONTRIBUTING.md"));
+        assertEquals(expectedFiles6, filenamesFound6);
+
+        Response downloadFiles9 = UtilIT.downloadFiles(datasetPid, DS_VERSION_LATEST_PUBLISHED, apiToken);
+        downloadFiles9.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        HashSet<String> filenamesFound7 = gatherFilenames(downloadFiles9.getBody().asInputStream());
+
+        // The contributor requested "latest published" and got version 3 with 4 files.
+        HashSet<String> expectedFiles7 = new HashSet<>(Arrays.asList("LICENSE.md", "MANIFEST.TXT", "README.md", "CONTRIBUTING.md"));
+        assertEquals(expectedFiles7, filenamesFound7);
+
+        // Guests cannot download draft versions.
+        Response downloadFiles10 = UtilIT.downloadFiles(datasetPid, DS_VERSION_DRAFT, null);
+        downloadFiles10.prettyPrint();
+        downloadFiles10.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
+                .body("status", equalTo("ERROR"));
+
+        // Users are told about bad API tokens.
+        Response downloadFiles11 = UtilIT.downloadFiles(datasetPid, "junkToken");
+        downloadFiles11.prettyPrint();
+        downloadFiles11.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
+                .body("status", equalTo("ERROR"));
+
+    }
+
+    /**
+     * This test is focused on downloading all files that are restricted.
+     */
+    @Test
+    public void downloadAllFilesRestricted() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        Path pathToSecrets = Paths.get(Files.createTempDirectory(null) + File.separator + "secrets.md");
+        Files.write(pathToSecrets, "The Nobel Prize will be mine.".getBytes());
+
+        Response uploadSecrets = UtilIT.uploadFileViaNative(datasetId.toString(), pathToSecrets.toString(), apiToken);
+        uploadSecrets.prettyPrint();
+        uploadSecrets.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("secrets.md"));
+
+        Long origFileId = JsonPath.from(uploadSecrets.body().asString()).getLong("data.files[0].dataFile.id");
+
+        Response restrictResponse = UtilIT.restrictFile(origFileId.toString(), true, apiToken);
+        restrictResponse.prettyPrint();
+        restrictResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("File secrets.md restricted."));
+
+        Response downloadFiles1 = UtilIT.downloadFiles(datasetPid, apiToken);
+        downloadFiles1.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // The creator can download a restricted file from a draft.
+        assertEquals(new HashSet<>(Arrays.asList("secrets.md", "MANIFEST.TXT")), gatherFilenames(downloadFiles1.getBody().asInputStream()));
+
+        Response downloadFiles2 = UtilIT.downloadFiles(datasetPid, apiToken);
+        downloadFiles2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // The creator can download a restricted file and an unrestricted file from a draft.
+        assertEquals(new HashSet<>(Arrays.asList("secrets.md", "MANIFEST.TXT")), gatherFilenames(downloadFiles2.getBody().asInputStream()));
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken)
+                .then().assertThat().statusCode(OK.getStatusCode());
+
+        UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken)
+                .then().assertThat().statusCode(OK.getStatusCode());
+
+        // A guest user can't download the only file because it's restricted.
+        Response downloadFiles3 = UtilIT.downloadFiles(datasetPid, null);
+        downloadFiles3.prettyPrint();
+        downloadFiles3.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("status", equalTo("ERROR"));
+
+        // The creator uploads a README that will be public.
+        Path pathToReadme = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathToReadme, "My findings.".getBytes());
+
+        Response uploadReadme = UtilIT.uploadFileViaNative(datasetId.toString(), pathToReadme.toString(), apiToken);
+        uploadReadme.prettyPrint();
+        uploadReadme.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken)
+                .then().assertThat().statusCode(OK.getStatusCode());
+
+        // Now a guest user can download files and get the public one.
+        Response downloadFiles4 = UtilIT.downloadFiles(datasetPid, null);
+        downloadFiles4.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // The guest can only get the unrestricted file (and the manifest).
+        assertEquals(new HashSet<>(Arrays.asList("README.md", "MANIFEST.TXT")), gatherFilenames(downloadFiles4.getBody().asInputStream()));
+
+        Response downloadFiles5 = UtilIT.downloadFiles(datasetPid, apiToken);
+        downloadFiles5.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // The creator can download both files (and the manifest).
+        assertEquals(new HashSet<>(Arrays.asList("secrets.md", "README.md", "MANIFEST.TXT")), gatherFilenames(downloadFiles5.getBody().asInputStream()));
+
+    }
+
+    /**
+     * This test is focused on downloading all files when tabular files are
+     * present (original vs archival).
+     */
+    @Test
+    public void downloadAllFilesTabular() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        String pathToFile = "scripts/search/data/tabular/50by1000.dta";
+
+        Response uploadTabular = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadTabular.prettyPrint();
+        uploadTabular.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("50by1000.dta"));
+
+        // UtilIT.MAXIMUM_INGEST_LOCK_DURATION is 3 but not long enough.
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION + 3), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        Response downloadFiles1 = UtilIT.downloadFiles(datasetPid, apiToken);
+        downloadFiles1.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // By default we get the archival version (.tab).
+        assertEquals(new HashSet<>(Arrays.asList("50by1000.tab", "MANIFEST.TXT")), gatherFilenames(downloadFiles1.getBody().asInputStream()));
+
+        Response downloadFiles2 = UtilIT.downloadFiles(datasetPid, UtilIT.DownloadFormat.original, apiToken);
+        downloadFiles2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // By passing format=original we get the original version, Stata (.dta) in this case.
+        assertEquals(new HashSet<>(Arrays.asList("50by1000.dta", "MANIFEST.TXT")), gatherFilenames(downloadFiles2.getBody().asInputStream()));
+    }
+
+    /**
+     * Download a file with a UTF-8 filename with a space.
+     */
+    @Test
+    public void downloadFilenameUtf8() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        // Put a filename with an en-dash ("MY READ–ME.md") into a zip file.
+        StringBuilder sb = new StringBuilder();
+        sb.append("This is my README.");
+        Path pathtoTempDir = Paths.get(Files.createTempDirectory(null).toString());
+        String pathToZipFile = pathtoTempDir + File.separator + "test.zip";
+        File f = new File(pathToZipFile);
+        ZipOutputStream out = new ZipOutputStream(new FileOutputStream(f));
+        ZipEntry e = new ZipEntry("MY READ–ME.md");
+        out.putNextEntry(e);
+        byte[] data = sb.toString().getBytes();
+        out.write(data, 0, data.length);
+        out.closeEntry();
+        out.close();
+
+        // We upload via SWORD (as a zip) because the native API gives this error:
+        // "Constraint violation found in FileMetadata. File Name cannot contain any
+        // of the following characters: / : * ? " < > | ; # . The invalid value is "READ?ME.md"."
+        // This error probably has something to do with the way REST Assured sends the filename
+        // to the native API. The en-dash is turned into question mark, which is disallowed.
+        Response uploadViaSword = UtilIT.uploadZipFileViaSword(datasetPid, pathToZipFile, apiToken);
+        uploadViaSword.prettyPrint();
+        uploadViaSword.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Response getDatasetJson = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJson.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        int fileId = JsonPath.from(getDatasetJson.getBody().asString()).getInt("data.latestVersion.files[0].dataFile.id");
+
+        // Download the file individually and assert READ–ME.md has an en-dash.
+        Response downloadFile = UtilIT.downloadFile(new Integer(fileId), apiToken);
+        downloadFile.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Headers headers = downloadFile.getHeaders();
+        // In "MY READ–ME.md" below the space is %20 and the en-dash ("–") is "%E2%80%93" (e2 80 93 in hex).
+        assertEquals("attachment; filename=\"MY%20READ%E2%80%93ME.md\"", headers.getValue("Content-disposition"));
+        assertEquals("text/markdown; name=\"MY%20READ%E2%80%93ME.md\";charset=UTF-8", headers.getValue("Content-Type"));
+
+        // Download all files as a zip and assert "MY READ–ME.md" has an en-dash.
+        Response downloadFiles = UtilIT.downloadFiles(datasetPid, apiToken);
+        downloadFiles.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        HashSet<String> filenamesFound = gatherFilenames(downloadFiles.getBody().asInputStream());
+
+        // Note that a MANIFEST.TXT file is added.
+        // "MY READ–ME.md" (with an en-dash) is correctly extracted from the downloaded zip
+        HashSet<String> expectedFiles = new HashSet<>(Arrays.asList("MANIFEST.TXT", "MY READ–ME.md"));
+        assertEquals(expectedFiles, filenamesFound);
+    }
+
+    private HashSet<String> gatherFilenames(InputStream inputStream) throws IOException {
+        HashSet<String> filenamesFound = new HashSet<>();
+        try (ZipInputStream zipStream = new ZipInputStream(inputStream)) {
+            ZipEntry entry = null;
+            while ((entry = zipStream.getNextEntry()) != null) {
+                String entryName = entry.getName();
+                filenamesFound.add(entryName);
+                zipStream.closeEntry();
+            }
+        }
+        return filenamesFound;
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriterTest.java b/src/test/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriterTest.java
new file mode 100644
index 00000000000..f7f61d18a51
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriterTest.java
@@ -0,0 +1,148 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.dataaccess.Range;
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class DownloadInstanceWriterTest {
+
+    DownloadInstanceWriter diw;
+
+    @BeforeEach
+    public void setUpClass() {
+        diw = new DownloadInstanceWriter();
+    }
+
+    // Get first 10 bytes.
+    @Test
+    public void testGetRange0to9of100() {
+        List<Range> ranges = diw.getRanges("bytes=0-9", 100);
+        assertEquals(0, ranges.get(0).getStart());
+        assertEquals(9, ranges.get(0).getEnd());
+        assertEquals(10, ranges.get(0).getLength());
+    }
+
+    // Don't start reading until 90th byte, get rest.
+    @Test
+    public void testGetRange90toNullof100() {
+        List<Range> ranges = diw.getRanges("bytes=90-", 100);
+        assertEquals(90, ranges.get(0).getStart());
+        assertEquals(99, ranges.get(0).getEnd());
+        assertEquals(10, ranges.get(0).getLength());
+    }
+
+    // Get last 10 bytes.
+    @Test
+    public void testGetRangeNullto5of10() {
+        List<Range> ranges = diw.getRanges("bytes=-10", 100);
+        assertEquals(90, ranges.get(0).getStart());
+        assertEquals(99, ranges.get(0).getEnd());
+        assertEquals(10, ranges.get(0).getLength());
+    }
+
+    // Get last byte
+    @Test
+    public void testGetRange100toNullof101() {
+        List<Range> ranges = diw.getRanges("bytes=100-", 101);
+        assertEquals(100, ranges.get(0).getStart());
+        assertEquals(100, ranges.get(0).getEnd());
+        assertEquals(1, ranges.get(0).getLength());
+    }
+
+    // When you request a range beyond the size of the file we just
+    // give you what we can (rather than throwing an error). 
+    @Test
+    public void testGetRangeBeyondFilesize() {
+        List<Range> ranges = diw.getRanges("bytes=100-149", 120);
+        assertEquals(100, ranges.get(0).getStart());
+        assertEquals(119, ranges.get(0).getEnd());
+        assertEquals(20, ranges.get(0).getLength());
+    }
+
+    // Attempt to get invalid range (start larger than end).
+    @Test
+    public void testGetRangeInvalidStartLargerThanEnd() {
+        Exception expectedException = null;
+        try {
+            List<Range> ranges = diw.getRanges("bytes=20-10", 100);
+        } catch (Exception ex) {
+            // "Start is larger than end or size of file."
+            System.out.println("exception: " + ex);
+            expectedException = ex;
+        }
+        assertNotNull(expectedException);
+    }
+
+    // Attempt to get invalid range (multiple ranges).
+    @Test
+    public void testGetRangeInvalidMultipleRanges() {
+        Exception expectedException = null;
+        try {
+            List<Range> ranges = diw.getRanges("bytes=0-9,90-99", 100);
+        } catch (Exception ex) {
+            // "Only one range is allowed."
+            System.out.println("exception: " + ex);
+            expectedException = ex;
+        }
+        assertNotNull(expectedException);
+    }
+
+    // Attempt to get invalid range (multiple ranges, beyond file size).
+    @Test
+    public void testGetRangeInvalidMultipleRangesBeyondFileSize() {
+        Exception expectedException = null;
+        try {
+            List<Range> ranges = diw.getRanges("bytes=0-9,90-99", 40);
+        } catch (Exception ex) {
+            // "Only one range is allowed."
+            // We report the multiple ranges error before reporting the "beyond filesize" error.
+            System.out.println("exception: " + ex);
+            expectedException = ex;
+        }
+        assertNotNull(expectedException);
+    }
+
+    // Test "junk" instead of "bytes=0-10"
+    @Test
+    public void testGetRangeInvalidJunk() {
+        Exception expectedException = null;
+        try {
+            List<Range> ranges = diw.getRanges("junk", 100);
+        } catch (Exception ex) {
+            // "The format is bytes=<range-start>-<range-end> where start and end are optional."
+            System.out.println("exception: " + ex);
+            expectedException = ex;
+        }
+        assertNotNull(expectedException);
+    }
+
+    // Get first 10 bytes and last 10 bytes. Not currently supported.
+    @Test
+    public void testGetRanges0to0and90toNull() {
+        Exception expectedException = null;
+        try {
+            List<Range> ranges = diw.getRanges("bytes=0-9,-10", 100);
+            // These asserts on start, end, etc. don't actually
+            // run because we throw an expection that multiple
+            // ranges are not supported.
+            //
+            // first range
+            assertEquals(0, ranges.get(0).getStart());
+            assertEquals(9, ranges.get(0).getEnd());
+            assertEquals(10, ranges.get(0).getLength());
+            // second range
+            assertEquals(90, ranges.get(1).getStart());
+            assertEquals(99, ranges.get(1).getEnd());
+            assertEquals(10, ranges.get(1).getLength());
+        } catch (Exception ex) {
+            // Only one range is allowed.
+            System.out.println("exception: " + ex);
+            expectedException = ex;
+        }
+        assertNotNull(expectedException);
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DuplicateFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DuplicateFilesIT.java
new file mode 100644
index 00000000000..32b949fad25
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DuplicateFilesIT.java
@@ -0,0 +1,496 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.parsing.Parser;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Make assertions about duplicate file names (and maybe in the future,
+ * duplicate MD5s).
+ */
+public class DuplicateFilesIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void uploadTwoFilesWithSameNameSameDirectory() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        Path pathtoReadme1 = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathtoReadme1, "File 1".getBytes());
+        System.out.println("README: " + pathtoReadme1);
+
+        Response uploadReadme1 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme1.toString(), apiToken);
+        uploadReadme1.prettyPrint();
+        uploadReadme1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        Path pathtoReadme2 = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathtoReadme2, "File 2".getBytes());
+        System.out.println("README: " + pathtoReadme2);
+
+        Response uploadReadme2 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme2.toString(), apiToken);
+        uploadReadme2.prettyPrint();
+        uploadReadme2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // Note that "README.md" was changed to "README-1.md". This is a feature. It's what the GUI does.
+                .body("data.files[0].label", equalTo("README-1.md"));
+
+    }
+
+    @Test
+    public void uploadTwoFilesWithSameNameDifferentDirectories() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        Path pathtoReadme1 = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathtoReadme1, "File 1".getBytes());
+        System.out.println("README: " + pathtoReadme1);
+
+        JsonObjectBuilder json1 = Json.createObjectBuilder()
+                .add("description", "Description of the whole project.");
+
+        Response uploadReadme1 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme1.toString(), json1.build(), apiToken);
+        uploadReadme1.prettyPrint();
+        uploadReadme1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        Path pathtoReadme2 = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathtoReadme2, "File 2".getBytes());
+        System.out.println("README: " + pathtoReadme2);
+
+        JsonObjectBuilder json2 = Json.createObjectBuilder()
+                .add("description", "Docs for the code.")
+                .add("directoryLabel", "code");
+
+        Response uploadReadme2 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme2.toString(), json2.build(), apiToken);
+        uploadReadme2.prettyPrint();
+        uploadReadme2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // The file name is still "README.md" (wasn't renamed)
+                // because the previous file was in a different directory.
+                .body("data.files[0].label", equalTo("README.md"));
+
+    }
+
+    @Test
+    public void renameFileToSameName() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        Path pathtoReadme1 = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathtoReadme1, "File 1".getBytes());
+        System.out.println("README: " + pathtoReadme1);
+
+        Response uploadReadme1 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme1.toString(), apiToken);
+        uploadReadme1.prettyPrint();
+        uploadReadme1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        Integer idOfReadme1 = JsonPath.from(uploadReadme1.getBody().asString()).getInt("data.files[0].dataFile.id");
+        System.out.println("id: " + idOfReadme1);
+
+        Path pathtoReadme2 = Paths.get(Files.createTempDirectory(null) + File.separator + "README2.md");
+        Files.write(pathtoReadme2, "File 2".getBytes());
+        System.out.println("README: " + pathtoReadme2);
+
+        Response uploadReadme2 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme2.toString(), apiToken);
+        uploadReadme2.prettyPrint();
+        uploadReadme2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README2.md"));
+
+        Long idOfReadme2 = JsonPath.from(uploadReadme2.getBody().asString()).getLong("data.files[0].dataFile.id");
+        System.out.println("id: " + idOfReadme2);
+
+        JsonObjectBuilder renameFile = Json.createObjectBuilder()
+                .add("label", "README.md");
+        Response renameFileResponse = UtilIT.updateFileMetadata(String.valueOf(idOfReadme2), renameFile.build().toString(), apiToken);
+        renameFileResponse.prettyPrint();
+        renameFileResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Filename already exists at README.md"));
+
+        // This "registerParser" is to avoid this error: Expected response body to be verified as JSON, HTML or XML but content-type 'text/plain' is not supported out of the box.
+        RestAssured.registerParser("text/plain", Parser.JSON);
+        Response getMetadataResponse = UtilIT.getDataFileMetadataDraft(idOfReadme2, apiToken);
+        getMetadataResponse.prettyPrint();
+        getMetadataResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // The rename was rejected. It's still README2.md.
+                .body("label", equalTo("README2.md"));
+    }
+
+    @Test
+    public void moveFileToDirectoryContainingSameFileName() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        Path pathtoReadme1 = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathtoReadme1, "File 1".getBytes());
+        System.out.println("README: " + pathtoReadme1);
+
+        JsonObjectBuilder json = Json.createObjectBuilder()
+                .add("description", "Docs for the code.")
+                .add("directoryLabel", "code");
+
+        Response uploadReadme1 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme1.toString(), json.build(), apiToken);
+        uploadReadme1.prettyPrint();
+        uploadReadme1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        Integer idOfReadme1 = JsonPath.from(uploadReadme1.getBody().asString()).getInt("data.files[0].dataFile.id");
+        System.out.println("id: " + idOfReadme1);
+
+        Path pathtoReadme2 = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathtoReadme2, "File 2".getBytes());
+        System.out.println("README: " + pathtoReadme2);
+
+        Response uploadReadme2 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme2.toString(), apiToken);
+        uploadReadme2.prettyPrint();
+        uploadReadme2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        Long idOfReadme2 = JsonPath.from(uploadReadme2.getBody().asString()).getLong("data.files[0].dataFile.id");
+        System.out.println("id: " + idOfReadme2);
+
+        JsonObjectBuilder moveFile = Json.createObjectBuilder()
+                .add("directoryLabel", "code");
+        Response moveFileResponse = UtilIT.updateFileMetadata(String.valueOf(idOfReadme2), moveFile.build().toString(), apiToken);
+        moveFileResponse.prettyPrint();
+        moveFileResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Filename already exists at code/README.md"));
+
+    }
+
+    /**
+     * In this test we make sure that other changes in the absence of label and
+     * directoryLabel go through, such as changing a file description.
+     */
+    @Test
+    public void modifyFileDescription() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        Path pathtoReadme1 = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathtoReadme1, "File 1".getBytes());
+        System.out.println("README: " + pathtoReadme1);
+
+        Response uploadReadme1 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme1.toString(), apiToken);
+        uploadReadme1.prettyPrint();
+        uploadReadme1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        Integer idOfReadme1 = JsonPath.from(uploadReadme1.getBody().asString()).getInt("data.files[0].dataFile.id");
+        System.out.println("id: " + idOfReadme1);
+
+        JsonObjectBuilder updateFileMetadata = Json.createObjectBuilder()
+                .add("description", "This file is awesome.");
+        Response updateFileMetadataResponse = UtilIT.updateFileMetadata(String.valueOf(idOfReadme1), updateFileMetadata.build().toString(), apiToken);
+        updateFileMetadataResponse.prettyPrint();
+        updateFileMetadataResponse.then().statusCode(OK.getStatusCode());
+
+    }
+
+    /**
+     * In this test we make sure that that if you keep the label the same, you
+     * are still able to change other metadata such as file description.
+     */
+    @Test
+    public void modifyFileDescriptionSameLabel() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        Path pathtoReadme1 = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md");
+        Files.write(pathtoReadme1, "File 1".getBytes());
+        System.out.println("README: " + pathtoReadme1);
+
+        JsonObjectBuilder json1 = Json.createObjectBuilder()
+                .add("directoryLabel", "code");
+
+        Response uploadReadme1 = UtilIT.uploadFileViaNative(datasetId.toString(), pathtoReadme1.toString(), json1.build(), apiToken);
+        uploadReadme1.prettyPrint();
+        uploadReadme1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("README.md"));
+
+        Integer idOfReadme1 = JsonPath.from(uploadReadme1.getBody().asString()).getInt("data.files[0].dataFile.id");
+        System.out.println("id: " + idOfReadme1);
+
+        JsonObjectBuilder updateFileMetadata = Json.createObjectBuilder()
+                .add("label", "README.md")
+                .add("directoryLabel", "code")
+                .add("description", "This file is awesome.");
+        Response updateFileMetadataResponse = UtilIT.updateFileMetadata(String.valueOf(idOfReadme1), updateFileMetadata.build().toString(), apiToken);
+        updateFileMetadataResponse.prettyPrint();
+        updateFileMetadataResponse.then().statusCode(OK.getStatusCode());
+
+    }
+
+    /**
+     * What if the directory for the file exists and you pass the filename
+     * (label) while changing the description? This should be allowed.
+     */
+    @Test
+    public void existingDirectoryPassLabelChangeDescription() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        Path pathToFile = Paths.get(Files.createTempDirectory(null) + File.separator + "label");
+        Files.write(pathToFile, "File 1".getBytes());
+        System.out.println("file: " + pathToFile);
+
+        JsonObjectBuilder json1 = Json.createObjectBuilder()
+                .add("directory", "code");
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile.toString(), json1.build(), apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("label"));
+
+        Integer idOfFile = JsonPath.from(uploadFile.getBody().asString()).getInt("data.files[0].dataFile.id");
+        System.out.println("id: " + idOfFile);
+
+        JsonObjectBuilder updateFileMetadata = Json.createObjectBuilder()
+                .add("label", "label")
+                .add("description", "This file is awesome.");
+        Response updateFileMetadataResponse = UtilIT.updateFileMetadata(String.valueOf(idOfFile), updateFileMetadata.build().toString(), apiToken);
+        updateFileMetadataResponse.prettyPrint();
+        updateFileMetadataResponse.then().statusCode(OK.getStatusCode());
+
+    }
+
+    /**
+     * This test is for the following scenario.
+     *
+     * What if the database has null for the directoryLabel? What if you pass in
+     * directory as “” (because you don’t realize you can just not pass it).
+     * when it check and compares, the old directory is null. so will that mean
+     * labelChange = true and it will fail even though you didn’t really change
+     * the directory?
+     *
+     * While "labelChange" does end up being true,
+     * IngestUtil.conflictsWithExistingFilenames returns false, so the change is
+     * allowed to go through. The description is allowed to be changed and the
+     * directoryLabel remains null even though the user passed in an empty
+     * string, which is what we want.
+     */
+    @Test
+    public void existingDirectoryNullPassEmptyStringChangeDescription() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        Path pathToFile = Paths.get(Files.createTempDirectory(null) + File.separator + "file1.txt");
+        Files.write(pathToFile, "File 1".getBytes());
+        System.out.println("file: " + pathToFile);
+
+        JsonObjectBuilder json1 = Json.createObjectBuilder()
+                .add("description", "This is my file.");
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile.toString(), json1.build(), apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("file1.txt"));
+
+        Integer idOfFile = JsonPath.from(uploadFile.getBody().asString()).getInt("data.files[0].dataFile.id");
+        System.out.println("id: " + idOfFile);
+
+        JsonObjectBuilder updateFileMetadata = Json.createObjectBuilder()
+                // It doesn't make sense to pass "" as a directoryLabel.
+                .add("directoryLabel", "")
+                .add("description", "This file is awesome.");
+        Response updateFileMetadataResponse = UtilIT.updateFileMetadata(String.valueOf(idOfFile), updateFileMetadata.build().toString(), apiToken);
+        updateFileMetadataResponse.prettyPrint();
+        updateFileMetadataResponse.then().statusCode(OK.getStatusCode());
+
+        Response datasetJson = UtilIT.nativeGet(datasetId, apiToken);
+        datasetJson.prettyPrint();
+        datasetJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.files[0].label", equalTo("file1.txt"))
+                .body("data.latestVersion.files[0].description", equalTo("This file is awesome."))
+                // Even though we tried to set directoryValue to "" above, it's correctly null in the database.
+                .body("data.latestVersion.files[0].directoryLabel", nullValue());
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/EditDDIIT.java b/src/test/java/edu/harvard/iq/dataverse/api/EditDDIIT.java
index 1775649c3dd..6f5ee03aa92 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/EditDDIIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/EditDDIIT.java
@@ -1,18 +1,17 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
-import static edu.harvard.iq.dataverse.api.AccessIT.apiToken;
-import static edu.harvard.iq.dataverse.api.AccessIT.datasetId;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
 
 
 import edu.harvard.iq.dataverse.datavariable.VarGroup;
 import edu.harvard.iq.dataverse.datavariable.VariableMetadata;
 import edu.harvard.iq.dataverse.datavariable.VariableMetadataDDIParser;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 
 import java.nio.file.Paths;
@@ -28,20 +27,21 @@
 import javax.xml.stream.XMLStreamException;
 
 
-import static javax.ws.rs.core.Response.Status.OK;
-import static junit.framework.Assert.assertEquals;
+import static jakarta.ws.rs.core.Response.Status.OK;
 
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
 import java.nio.file.Files;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class EditDDIIT {
 
     private static final Logger logger = Logger.getLogger(EditDDIIT.class.getCanonicalName());
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
@@ -81,7 +81,7 @@ public void testUpdateVariableMetadata() throws InterruptedException {
 
         // Give file time to ingest
         
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + pathToFileThatGoesThroughIngest , UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFileThatGoesThroughIngest);
         
         Response origXml = UtilIT.getFileMetadata(origFileId, null, apiToken);
         assertEquals(200, origXml.getStatusCode());
@@ -94,7 +94,7 @@ public void testUpdateVariableMetadata() throws InterruptedException {
         Map<Long, VariableMetadata> mapVarToVarMet = new HashMap<Long, VariableMetadata>();
         Map<Long,VarGroup> varGroupMap = new HashMap<Long, VarGroup>();
         try {
-            XMLInputFactory factory = XMLInputFactory.newInstance();
+            XMLInputFactory factory = XmlUtil.getSecureXMLInputFactory();
             XMLStreamReader xmlr = factory.createXMLStreamReader(variableData);
             VariableMetadataDDIParser vmdp = new VariableMetadataDDIParser();
 
@@ -150,12 +150,25 @@ public void testUpdateVariableMetadata() throws InterruptedException {
         assertEquals(200, publishDataset.getStatusCode());
 
         Response editDDIResponseNewDraft = UtilIT.editDDI(stringOrigXml, origFileId, apiToken);
+        editDDIResponseNewDraft.prettyPrint();
         assertEquals(200, editDDIResponseNewDraft.getStatusCode());
 
         //not authorized
         Response editDDINotAuthResponse = UtilIT.editDDI(updatedContent, origFileId, null);
         assertEquals(401, editDDINotAuthResponse.getStatusCode());
 
+        //bad request
+        String updatedContentBadFreq = updatedContent.replace("<catStat type=\"freq\">0</catStat>",
+                "<catStat type=\"freq\"/>");
+        Response editDDIBadRequestFreq = UtilIT.editDDI(updatedContentBadFreq, origFileId, apiToken);
+        assertEquals(400, editDDIBadRequestFreq.getStatusCode());
+
+        //bad request
+        String updatedContentBadWFreq = updatedContent.replace("<catStat wgtd=\"wgtd\" type=\"freq\">0</catStat>",
+                "<catStat wgtd=\"wgtd\" type=\"freq\"></catStat>");
+        Response editDDIBadRequestWFreq = UtilIT.editDDI(updatedContentBadWFreq, origFileId, apiToken);
+        assertEquals(400, editDDIBadRequestWFreq.getStatusCode());
+
 
         //cleanup
         Response makeSuperUser = UtilIT.makeSuperUser(username);
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java
index 6c85b8d4269..1956e0eb8df 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java
@@ -1,26 +1,32 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.OK;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Disabled;
 
 public class ExternalToolsIT {
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
@@ -32,22 +38,109 @@ public void testGetExternalTools() {
     }
 
     @Test
-    public void testFileLevelTool1() {
+    public void testExternalToolsNonAdminEndpoint() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.setSuperuserStatus(username, true);
 
-        // Delete all external tools before testing.
-        Response getTools = UtilIT.getExternalTools();
-        getTools.prettyPrint();
-        getTools.then().assertThat()
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = JsonPath.from(createDataset.getBody().asString()).getInt("data.id");
+        String datasetPid = JsonPath.from(createDataset.getBody().asString()).getString("data.persistentId");
+
+        String toolManifest = """
+{
+   "displayName": "Dataset Configurator",
+   "description": "Slices! Dices! <a href='https://docs.datasetconfigurator.com' target='_blank'>More info</a>.",
+   "types": [
+     "configure"
+   ],
+   "scope": "dataset",
+   "toolUrl": "https://datasetconfigurator.com",
+   "toolParameters": {
+     "queryParameters": [
+       {
+         "datasetPid": "{datasetPid}"
+       },
+       {
+         "localeCode": "{localeCode}"
+       }
+     ]
+   }
+ }
+""";
+
+        Response addExternalTool = UtilIT.addExternalTool(JsonUtil.getJsonObject(toolManifest), apiToken);
+        addExternalTool.prettyPrint();
+        addExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.displayName", CoreMatchers.equalTo("Dataset Configurator"));
+
+        Long toolId = JsonPath.from(addExternalTool.getBody().asString()).getLong("data.id");
+        Response getExternalToolsByDatasetId = UtilIT.getExternalToolForDatasetById(datasetId.toString(), "configure", apiToken, toolId.toString());
+        getExternalToolsByDatasetId.prettyPrint();
+        getExternalToolsByDatasetId.then().assertThat()
+                .body("data.displayName", CoreMatchers.equalTo("Dataset Configurator"))
+                .body("data.scope", CoreMatchers.equalTo("dataset"))
+                .body("data.types[0]", CoreMatchers.equalTo("configure"))
+                .body("data.toolUrlWithQueryParams", CoreMatchers.equalTo("https://datasetconfigurator.com?datasetPid=" + datasetPid))
                 .statusCode(OK.getStatusCode());
-        String body = getTools.getBody().asString();
-        JsonReader bodyObject = Json.createReader(new StringReader(body));
-        JsonArray tools = bodyObject.readObject().getJsonArray("data");
-        for (int i = 0; i < tools.size(); i++) {
-            JsonObject tool = tools.getJsonObject(i);
-            int id = tool.getInt("id");
-            Response deleteExternalTool = UtilIT.deleteExternalTool(id);
-            deleteExternalTool.prettyPrint();
-        }
+
+        Response getExternalTools = UtilIT.getExternalTools(apiToken);
+        getExternalTools.prettyPrint();
+        getExternalTools.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Response getExternalTool = UtilIT.getExternalTool(toolId, apiToken);
+        getExternalTool.prettyPrint();
+        getExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // non superuser can only view tools
+        UtilIT.setSuperuserStatus(username, false);
+        getExternalTools = UtilIT.getExternalTools(apiToken);
+        getExternalTools.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        getExternalToolsByDatasetId = UtilIT.getExternalToolForDatasetById(datasetId.toString(), "configure", apiToken, toolId.toString());
+        getExternalToolsByDatasetId.prettyPrint();
+        getExternalToolsByDatasetId.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //Add by non-superuser will fail
+        addExternalTool = UtilIT.addExternalTool(JsonUtil.getJsonObject(toolManifest), apiToken);
+        addExternalTool.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", CoreMatchers.equalTo("Superusers only."));
+
+        //Delete by non-superuser will fail
+        Response deleteExternalTool = UtilIT.deleteExternalTool(toolId, apiToken);
+        deleteExternalTool.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", CoreMatchers.equalTo("Superusers only."));
+
+        //Delete the tool added by this test...
+        UtilIT.setSuperuserStatus(username, true);
+        deleteExternalTool = UtilIT.deleteExternalTool(toolId, apiToken);
+        deleteExternalTool.prettyPrint();
+        deleteExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testFileLevelTool1() {
 
         Response createUser = UtilIT.createRandomUser();
         createUser.prettyPrint();
@@ -84,12 +177,13 @@ public void testFileLevelTool1() {
         uploadTabularFile.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToTabularFile);
         Integer tabularFileId = JsonPath.from(uploadTabularFile.getBody().asString()).getInt("data.files[0].dataFile.id");
 
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
         job.add("description", "This tool is awesome.");
-        job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "file");
         job.add("contentType", "text/tab-separated-values");
         job.add("toolUrl", "http://awesometool.com");
@@ -106,10 +200,10 @@ public void testFileLevelTool1() {
         Response addExternalTool = UtilIT.addExternalTool(job.build());
         addExternalTool.prettyPrint();
         addExternalTool.then().assertThat()
-                .body("data.displayName", CoreMatchers.equalTo("AwesomeTool"))
-                .statusCode(OK.getStatusCode());
+                .statusCode(OK.getStatusCode())
+                .body("data.displayName", CoreMatchers.equalTo("AwesomeTool"));
 
-        long toolId = JsonPath.from(addExternalTool.getBody().asString()).getLong("data.id");
+        Long toolId = JsonPath.from(addExternalTool.getBody().asString()).getLong("data.id");
 
         Response getTool = UtilIT.getExternalTool(toolId);
         getTool.prettyPrint();
@@ -121,16 +215,19 @@ public void testFileLevelTool1() {
         getExternalToolsForFileInvalidType.prettyPrint();
         getExternalToolsForFileInvalidType.then().assertThat()
                 .statusCode(BAD_REQUEST.getStatusCode())
-                .body("message", CoreMatchers.equalTo("Type must be one of these values: [explore, configure]."));
+                .body("message", CoreMatchers.equalTo("Type must be one of these values: [explore, configure, preview, query]."));
 
-        Response getExternalToolsForTabularFiles = UtilIT.getExternalToolsForFile(tabularFileId.toString(), "explore", apiToken);
+       // Getting tool by tool Id to avoid issue where there are existing tools
+        String toolIdString = toolId.toString();
+        Response getExternalToolsForTabularFiles = UtilIT.getExternalToolForFileById(tabularFileId.toString(), "explore", apiToken, toolIdString);
         getExternalToolsForTabularFiles.prettyPrint();
+        
         getExternalToolsForTabularFiles.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                .body("data[0].displayName", CoreMatchers.equalTo("AwesomeTool"))
-                .body("data[0].scope", CoreMatchers.equalTo("file"))
-                .body("data[0].contentType", CoreMatchers.equalTo("text/tab-separated-values"))
-                .body("data[0].toolUrlWithQueryParams", CoreMatchers.equalTo("http://awesometool.com?fileid=" + tabularFileId + "&key=" + apiToken));
+                .body("data.displayName", CoreMatchers.equalTo("AwesomeTool"))
+                .body("data.scope", CoreMatchers.equalTo("file"))
+                .body("data.contentType", CoreMatchers.equalTo("text/tab-separated-values"))
+                .body("data.toolUrlWithQueryParams", CoreMatchers.equalTo("http://awesometool.com?fileid=" + tabularFileId + "&key=" + apiToken));
 
         Response getExternalToolsForJuptyerNotebooks = UtilIT.getExternalToolsForFile(jupyterNotebookFileId.toString(), "explore", apiToken);
         getExternalToolsForJuptyerNotebooks.prettyPrint();
@@ -138,26 +235,16 @@ public void testFileLevelTool1() {
                 .statusCode(OK.getStatusCode())
                 // No tools for this file type.
                 .body("data", Matchers.hasSize(0));
+        
+        //Delete the tool added by this test...
+        Response deleteExternalTool = UtilIT.deleteExternalTool(toolId);
+        deleteExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode());
     }
 
     @Test
     public void testDatasetLevelTool1() {
 
-        // Delete all external tools before testing.
-        Response getTools = UtilIT.getExternalTools();
-        getTools.prettyPrint();
-        getTools.then().assertThat()
-                .statusCode(OK.getStatusCode());
-        String body = getTools.getBody().asString();
-        JsonReader bodyObject = Json.createReader(new StringReader(body));
-        JsonArray tools = bodyObject.readObject().getJsonArray("data");
-        for (int i = 0; i < tools.size(); i++) {
-            JsonObject tool = tools.getJsonObject(i);
-            int id = tool.getInt("id");
-            Response deleteExternalTool = UtilIT.deleteExternalTool(id);
-            deleteExternalTool.prettyPrint();
-        }
-
         Response createUser = UtilIT.createRandomUser();
         createUser.prettyPrint();
         createUser.then().assertThat()
@@ -177,7 +264,6 @@ public void testDatasetLevelTool1() {
         createDataset.then().assertThat()
                 .statusCode(CREATED.getStatusCode());
 
-//        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
         Integer datasetId = JsonPath.from(createDataset.getBody().asString()).getInt("data.id");
         String datasetPid = JsonPath.from(createDataset.getBody().asString()).getString("data.persistentId");
 
@@ -194,7 +280,7 @@ public void testDatasetLevelTool1() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "DatasetTool1");
         job.add("description", "This tool is awesome.");
-        job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "dataset");
         job.add("toolUrl", "http://datasettool1.com");
         job.add("toolParameters", Json.createObjectBuilder()
@@ -210,21 +296,96 @@ public void testDatasetLevelTool1() {
         Response addExternalTool = UtilIT.addExternalTool(job.build());
         addExternalTool.prettyPrint();
         addExternalTool.then().assertThat()
-                .body("data.displayName", CoreMatchers.equalTo("DatasetTool1"))
-                .statusCode(OK.getStatusCode());
+                .statusCode(OK.getStatusCode())
+                .body("data.displayName", CoreMatchers.equalTo("DatasetTool1"));
+        
+        Long toolId = JsonPath.from(addExternalTool.getBody().asString()).getLong("data.id");
 
         Response getExternalToolsByDatasetIdInvalidType = UtilIT.getExternalToolsForDataset(datasetId.toString(), "invalidType", apiToken);
         getExternalToolsByDatasetIdInvalidType.prettyPrint();
         getExternalToolsByDatasetIdInvalidType.then().assertThat()
                 .statusCode(BAD_REQUEST.getStatusCode())
-                .body("message", CoreMatchers.equalTo("Type must be one of these values: [explore, configure]."));
+                .body("message", CoreMatchers.equalTo("Type must be one of these values: [explore, configure, preview, query]."));
+
+        Response getExternalToolsByDatasetId = UtilIT.getExternalToolForDatasetById(datasetId.toString(), "explore", apiToken, toolId.toString());
+        getExternalToolsByDatasetId.prettyPrint();
+        getExternalToolsByDatasetId.then().assertThat()
+                .body("data.displayName", CoreMatchers.equalTo("DatasetTool1"))
+                .body("data.scope", CoreMatchers.equalTo("dataset"))
+                .body("data.toolUrlWithQueryParams", CoreMatchers.equalTo("http://datasettool1.com?datasetPid=" + datasetPid + "&key=" + apiToken))
+                .statusCode(OK.getStatusCode());
+        
+        //Delete the tool added by this test...
+        Response deleteExternalTool = UtilIT.deleteExternalTool(toolId);
+        deleteExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testDatasetLevelToolConfigure() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
 
-        Response getExternalToolsByDatasetId = UtilIT.getExternalToolsForDataset(datasetId.toString(), "explore", apiToken);
+        Integer datasetId = JsonPath.from(createDataset.getBody().asString()).getInt("data.id");
+        String datasetPid = JsonPath.from(createDataset.getBody().asString()).getString("data.persistentId");
+
+        String toolManifest = """
+{
+   "displayName": "Dataset Configurator",
+   "description": "Slices! Dices! <a href='https://docs.datasetconfigurator.com' target='_blank'>More info</a>.",
+   "types": [
+     "configure"
+   ],
+   "scope": "dataset",
+   "toolUrl": "https://datasetconfigurator.com",
+   "toolParameters": {
+     "queryParameters": [
+       {
+         "datasetPid": "{datasetPid}"
+       },
+       {
+         "localeCode": "{localeCode}"
+       }
+     ]
+   }
+ }
+""";
+
+        Response addExternalTool = UtilIT.addExternalTool(JsonUtil.getJsonObject(toolManifest));
+        addExternalTool.prettyPrint();
+        addExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.displayName", CoreMatchers.equalTo("Dataset Configurator"));
+        
+        Long toolId = JsonPath.from(addExternalTool.getBody().asString()).getLong("data.id");
+        Response getExternalToolsByDatasetId = UtilIT.getExternalToolForDatasetById(datasetId.toString(), "configure", apiToken, toolId.toString());
         getExternalToolsByDatasetId.prettyPrint();
         getExternalToolsByDatasetId.then().assertThat()
-                .body("data[0].displayName", CoreMatchers.equalTo("DatasetTool1"))
-                .body("data[0].scope", CoreMatchers.equalTo("dataset"))
-                .body("data[0].toolUrlWithQueryParams", CoreMatchers.equalTo("http://datasettool1.com?datasetPid=" + datasetPid + "&key=" + apiToken))
+                .body("data.displayName", CoreMatchers.equalTo("Dataset Configurator"))
+                .body("data.scope", CoreMatchers.equalTo("dataset"))
+                .body("data.types[0]", CoreMatchers.equalTo("configure"))
+                .body("data.toolUrlWithQueryParams", CoreMatchers.equalTo("https://datasetconfigurator.com?datasetPid=" + datasetPid))
+                .statusCode(OK.getStatusCode());
+        
+        //Delete the tool added by this test...
+        Response deleteExternalTool = UtilIT.deleteExternalTool(toolId);
+        deleteExternalTool.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
     }
@@ -303,4 +464,266 @@ public void testAddExternalToolNonReservedWord() throws IOException {
                 .statusCode(BAD_REQUEST.getStatusCode());
     }
 
+    @Disabled
+    @Test
+    public void deleteTools() {
+
+        // Delete all external tools before testing.
+        Response getTools = UtilIT.getExternalTools();
+        getTools.prettyPrint();
+        getTools.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String body = getTools.getBody().asString();
+        JsonReader bodyObject = Json.createReader(new StringReader(body));
+        JsonArray tools = bodyObject.readObject().getJsonArray("data");
+        /*
+        for (int i = 0; i < tools.size(); i++) {
+            JsonObject tool = tools.getJsonObject(i);
+            int id = tool.getInt("id");
+            Response deleteExternalTool = UtilIT.deleteExternalTool(id);
+            deleteExternalTool.prettyPrint();
+        }*/
+    }
+
+    // preview only
+    @Disabled
+    @Test
+    public void createToolShellScript() {
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("displayName", "View Code");
+        job.add("description", "");
+        job.add("types", Json.createArrayBuilder().add("preview"));
+        job.add("scope", "file");
+        job.add("hasPreviewMode", "true");
+        job.add("contentType", "application/x-sh");
+        job.add("toolUrl", "http://localhost:8000/dataverse-previewers/previewers/TextPreview.html");
+        job.add("toolParameters", Json.createObjectBuilder()
+                .add("queryParameters", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("fileid", "{fileId}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("siteUrl", "{siteUrl}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("key", "{apiToken}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("datasetid", "{datasetId}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("datasetversion", "{datasetVersion}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("locale", "{localeCode}")
+                                .build())
+                        .build())
+                .build());
+        Response addExternalTool = UtilIT.addExternalTool(job.build());
+        addExternalTool.prettyPrint();
+        addExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        long toolId = JsonPath.from(addExternalTool.getBody().asString()).getLong("data.id");
+        
+        //Delete the tool added by this test...
+        Response deleteExternalTool = UtilIT.deleteExternalTool(toolId);
+        deleteExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    // explore only
+    @Disabled
+    @Test
+    public void createToolDataExplorer() {
+    /*    
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("displayName", "Data Explorer");
+        job.add("description", "");
+        job.add("types", Json.createArrayBuilder().add("explore"));
+        job.add("scope", "file");
+        job.add("contentType", "text/tab-separated-values");
+        job.add("toolUrl", "https://scholarsportal.github.io/Dataverse-Data-Explorer-v2/");
+        job.add("toolParameters", Json.createObjectBuilder()
+                .add("queryParameters", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("fileId", "{fileId}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("siteUrl", "{siteUrl}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("key", "{apiToken}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("dvLocale", "{localeCode}")
+                                .build())
+                        .build())
+                .build());
+        Response addExternalTool = UtilIT.addExternalTool(job.build());
+        addExternalTool.prettyPrint();
+        addExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        long toolId = JsonPath.from(addExternalTool.getBody().asString()).getLong("data.id");
+        
+        //Delete the tool added by this test...
+        Response deleteExternalTool = UtilIT.deleteExternalTool(toolId);
+        deleteExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        */
+    }
+
+    // both preview and explore
+    @Disabled
+    @Test
+    public void createToolSpreadsheetViewer() {
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("displayName", "View Data");
+        job.add("description", "");
+        job.add("types", Json.createArrayBuilder()
+                .add("preview")
+                .add("explore")
+        );
+        job.add("scope", "file");
+        job.add("hasPreviewMode", "true");
+        job.add("contentType", "text/tab-separated-values");
+        job.add("toolUrl", "http://localhost:8000/dataverse-previewers/previewers/SpreadsheetPreview.html");
+        job.add("toolParameters", Json.createObjectBuilder()
+                .add("queryParameters", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("fileid", "{fileId}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("siteUrl", "{siteUrl}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("key", "{apiToken}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("datasetid", "{datasetId}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("datasetversion", "{datasetVersion}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("locale", "{localeCode}")
+                                .build())
+                        .build())
+                .build());
+        Response addExternalTool = UtilIT.addExternalTool(job.build());
+        addExternalTool.prettyPrint();
+        addExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testFileLevelToolWithAuxFileReq() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        // Not really an HDF5 file. Just random bytes. But the file extension makes it detected as HDF5.
+        Path pathToFalseHdf5 = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "false.hdf5");
+        byte[] bytes = {1, 2, 3, 4, 5};
+        java.nio.file.Files.write(pathToFalseHdf5, bytes);
+
+        Response uploadFalseHdf5 = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFalseHdf5.toString(), apiToken);
+        uploadFalseHdf5.prettyPrint();
+        uploadFalseHdf5.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Integer falseHdf5 = JsonPath.from(uploadFalseHdf5.getBody().asString()).getInt("data.files[0].dataFile.id");
+
+        String pathToTrueHdf5 = "src/test/resources/hdf/hdf5/vlen_string_dset";
+        Response uploadTrueHdf5 = UtilIT.uploadFileViaNative(datasetId.toString(), pathToTrueHdf5, apiToken);
+        uploadTrueHdf5.prettyPrint();
+        uploadTrueHdf5.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Integer trueHdf5 = JsonPath.from(uploadTrueHdf5.getBody().asString()).getInt("data.files[0].dataFile.id");
+
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("displayName", "HDF5 Tool");
+        job.add("description", "Operates on HDF5 files");
+        job.add("types", Json.createArrayBuilder().add("preview"));
+        job.add("scope", "file");
+        job.add("contentType", "application/x-hdf5");
+        job.add("toolUrl", "/dataexplore/dataverse-previewers/previewers/v1.3/TextPreview.html");
+        job.add("toolParameters", Json.createObjectBuilder()
+                .add("queryParameters", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("fileid", "{fileId}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("siteUrl", "{siteUrl}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("key", "{apiToken}")
+                                .build())
+                        .build())
+                .build());
+        job.add("requirements", Json.createObjectBuilder()
+                .add("auxFilesExist", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("formatTag", "NcML")
+                                .add("formatVersion", "0.1")
+                        )
+                )
+        );
+        Response addExternalTool = UtilIT.addExternalTool(job.build());
+        addExternalTool.prettyPrint();
+        addExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.displayName", CoreMatchers.equalTo("HDF5 Tool"));
+
+        Long toolId = JsonPath.from(addExternalTool.getBody().asString()).getLong("data.id");
+
+        Response getTool = UtilIT.getExternalTool(toolId);
+        getTool.prettyPrint();
+        getTool.then().assertThat()
+                .body("data.scope", CoreMatchers.equalTo("file"))
+                .statusCode(OK.getStatusCode());
+
+        // No tools for false HDF5 file. Aux file couldn't be extracted. Doesn't meet requirements.
+        Response getToolsForFalseHdf5 = UtilIT.getExternalToolsForFile(falseHdf5.toString(), "preview", apiToken);
+        getToolsForFalseHdf5.prettyPrint();
+        getToolsForFalseHdf5.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data", Matchers.hasSize(0));
+
+        // The tool shows for a true HDF5 file. The NcML aux file is available. Requirements met.
+        Response getToolsForTrueHdf5 = UtilIT.getExternalToolForFileById(trueHdf5.toString(), "preview", apiToken, toolId.toString());
+        getToolsForTrueHdf5.prettyPrint();
+        getToolsForTrueHdf5.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.displayName", CoreMatchers.equalTo("HDF5 Tool"))
+                .body("data.scope", CoreMatchers.equalTo("file"))
+                .body("data.contentType", CoreMatchers.equalTo("application/x-hdf5"));
+        
+        //Delete the tool added by this test...
+        Response deleteExternalTool = UtilIT.deleteExternalTool(toolId);
+        deleteExternalTool.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+    }
+
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/FeedbackApiIT.java b/src/test/java/edu/harvard/iq/dataverse/api/FeedbackApiIT.java
index bfe4a58abbf..220d386e28e 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/FeedbackApiIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/FeedbackApiIT.java
@@ -1,19 +1,19 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.OK;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import org.hamcrest.CoreMatchers;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class FeedbackApiIT {
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/FileMetadataIT.java b/src/test/java/edu/harvard/iq/dataverse/api/FileMetadataIT.java
index 321c6c45676..619a7594244 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/FileMetadataIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/FileMetadataIT.java
@@ -1,22 +1,23 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.response.Response;
 import org.apache.commons.io.IOUtils;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.util.UUID;
 
-import static com.jayway.restassured.RestAssured.given;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.fail;
+import static io.restassured.RestAssured.given;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class FileMetadataIT {
 
@@ -32,16 +33,18 @@ public class FileMetadataIT {
     private static int dsId;
     private static int dsIdFirst;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
 
-    @Before
+    @BeforeEach
     public void setUpDataverse() {
         try {
             // create random test name
-            testName = UUID.randomUUID().toString().substring(0, 8);
+            // "abc" added so the name/alias isn't an integer, a requirement for dataverse creation.
+            // Longer term, consider switching to UtilIT.getRandomDvAlias (and rewriting these tests).
+            testName = "abc" + UUID.randomUUID().toString().substring(0, 8);
             // create user and set token
             token = given()
                     .body("{"
@@ -77,17 +80,16 @@ public void setUpDataverse() {
                     .then().assertThat().statusCode(201);
             System.out.println("DATAVERSE: " + RestAssured.baseURI + "/dataverse/" + testName);
         } catch (Exception e) {
-            System.out.println("Error setting up test dataverse: " + e.getMessage());
-            fail();
+            fail("Error setting up test dataverse: " + e.getMessage(), e);
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
         RestAssured.reset();
     }
 
-    @After
+    @AfterEach
     public void tearDownDataverse() {
         try {
             // delete dataset
@@ -118,6 +120,8 @@ public void tearDownDataverse() {
     @Test
     public void testJsonParserWithDirectoryLabels() {
         try {
+            //SEK 4/14/2020 need to be super user to add a dataset with files
+            UtilIT.makeSuperUser(testName).then().assertThat().statusCode(OK.getStatusCode());
 
             // try to create a dataset with directory labels that contain both leading and trailing file separators
             //Should work now
@@ -161,9 +165,7 @@ public void testJsonParserWithDirectoryLabels() {
                     .statusCode(200);
 
         } catch (Exception e) {
-            System.out.println("Error testJsonParserWithDirectoryLabels: " + e.getMessage());
-            e.printStackTrace();
-            fail();
+            fail("Error testJsonParserWithDirectoryLabels: " + e.getMessage(), e);
         }
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/FileTypeDetectionIT.java b/src/test/java/edu/harvard/iq/dataverse/api/FileTypeDetectionIT.java
index 10ac9192205..989688b0af6 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/FileTypeDetectionIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/FileTypeDetectionIT.java
@@ -1,21 +1,21 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.nullValue;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class FileTypeDetectionIT {
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
index b890f1d62b1..38d89f782dd 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
@@ -1,55 +1,70 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Response;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import edu.harvard.iq.dataverse.datasetutility.OptionalFileParams;
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
+import edu.harvard.iq.dataverse.util.json.JsonParser;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+
+import java.util.*;
 import java.util.logging.Logger;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.path.xml.XmlPath;
-import static edu.harvard.iq.dataverse.api.AccessIT.apiToken;
+
+import edu.harvard.iq.dataverse.api.auth.ApiKeyAuthMechanism;
+import jakarta.json.JsonObject;
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+import io.restassured.path.json.JsonPath;
+
+import static edu.harvard.iq.dataverse.api.ApiConstants.*;
+import static io.restassured.path.json.JsonPath.with;
+import io.restassured.path.xml.XmlPath;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import java.io.File;
+import java.io.IOException;
+
 import static java.lang.Thread.sleep;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.ResourceBundle;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.METHOD_NOT_ALLOWED;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.NO_CONTENT;
-import static javax.ws.rs.core.Response.Status.OK;
-import static junit.framework.Assert.assertEquals;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.time.Year;
 import org.hamcrest.CoreMatchers;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.hamcrest.CoreMatchers.nullValue;
 import org.hamcrest.Matchers;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.AfterAll;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class FilesIT {
 
     private static final Logger logger = Logger.getLogger(FilesIT.class.getCanonicalName());
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
 
-        Response removeSearchApiNonPublicAllowed = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        removeSearchApiNonPublicAllowed.prettyPrint();
-        removeSearchApiNonPublicAllowed.then().assertThat()
-                .statusCode(200);
+        Response removePublicInstall = UtilIT.deleteSetting(SettingsServiceBean.Key.PublicInstall);
+        removePublicInstall.then().assertThat().statusCode(200);
+
+    }
 
+    @AfterAll
+    public static void tearDownClass() {
+        UtilIT.deleteSetting(SettingsServiceBean.Key.PublicInstall);
     }
 
     /**
@@ -68,7 +83,7 @@ private String createUserGetToken(){
         
         String username = UtilIT.getUsernameFromResponse(createUser);
         String apiToken = UtilIT.getApiTokenFromResponse(createUser);
-        
+        System.out.println(apiToken);
         return apiToken;
     }
     
@@ -121,20 +136,17 @@ public void test_001_AddFileGood() {
         //addResponse.prettyPrint();
         msgt("Here it is: " + addResponse.prettyPrint());
         String successMsg = BundleUtil.getStringFromBundle("file.addreplace.success.add");
-
       
         addResponse.then().assertThat()
                 /**
                  * @todo We have a need to show human readable success messages
                  * via API in a consistent location.
                  */
-                //                .body("message", equalTo(successMsg))
-                .body("status", equalTo(AbstractApiBean.STATUS_OK))
+                .body("status", equalTo(ApiConstants.STATUS_OK))
                 .body("data.files[0].categories[0]", equalTo("Data"))
                 .body("data.files[0].dataFile.contentType", equalTo("image/png"))
                 .body("data.files[0].dataFile.description", equalTo("my description"))
                 .body("data.files[0].directoryLabel", equalTo("data/subdir1"))
-//                .body("data.files[0].dataFile.tags", nullValue())
                 .body("data.files[0].dataFile.tabularTags", nullValue())
                 .body("data.files[0].label", equalTo("dataverseproject.png"))
                 // not sure why description appears in two places
@@ -143,18 +155,20 @@ public void test_001_AddFileGood() {
         
         
         //------------------------------------------------
-        // Try to add the same file again -- and fail
+        // Try to add the same file again -- and get warning
         //------------------------------------------------
         Response addTwiceResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
 
         msgt("2nd requests: " + addTwiceResponse.prettyPrint());    //addResponse.prettyPrint();
         
-        String errMsg = BundleUtil.getStringFromBundle("file.addreplace.error.duplicate_file");
-                
+        String dupeName = "dataverseproject.png";
+
+        String errMsg = BundleUtil.getStringFromBundle("file.addreplace.warning.duplicate_file",
+                Arrays.asList(dupeName));
+        String errMsgFromResponse = JsonPath.from(addTwiceResponse.body().asString()).getString("message");
         addTwiceResponse.then().assertThat()
-                .body("message", Matchers.startsWith(errMsg))
-                .body("status", equalTo(AbstractApiBean.STATUS_ERROR))
-                .statusCode(BAD_REQUEST.getStatusCode());
+                .statusCode(OK.getStatusCode());
+        assertTrue(errMsgFromResponse.contains(errMsg));
     }
 
     
@@ -199,7 +213,7 @@ public void test_003_AddFileNonExistentDatasetId() {
         String errMsg = BundleUtil.getStringFromBundle("find.dataset.error.dataset.not.found.id", Collections.singletonList(datasetId));
                 
          addResponse.then().assertThat()
-                .body("status", equalTo(AbstractApiBean.STATUS_ERROR))
+                .body("status", equalTo(ApiConstants.STATUS_ERROR))
                 .body("message", equalTo(errMsg))
                 .statusCode(NOT_FOUND.getStatusCode());
     }
@@ -220,12 +234,11 @@ public void test_004_AddFileBadToken() {
 
         msgt("Here it is: " + addResponse.prettyPrint());
 
-        String errMsg = BundleUtil.getStringFromBundle("file.addreplace.error.auth");
-        
+
         addResponse.then().assertThat()
-                .body("status", equalTo(AbstractApiBean.STATUS_ERROR))
-                .body("message", equalTo(errMsg))
-                .statusCode(FORBIDDEN.getStatusCode());
+                .body("status", equalTo(ApiConstants.STATUS_ERROR))
+                .body("message", equalTo(ApiKeyAuthMechanism.RESPONSE_MESSAGE_BAD_API_KEY))
+                .statusCode(UNAUTHORIZED.getStatusCode());
     }
 
     @Test
@@ -246,16 +259,12 @@ public void testAddFileBadJson() {
 
         Response addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, junkJson, apiToken);
 
+        String parseError = BundleUtil.getStringFromBundle("file.addreplace.error.parsing");
+        
         addResponse.then().assertThat()
-                .body("status", equalTo(AbstractApiBean.STATUS_OK))
-                .body("data.files[0].categories", nullValue())
-                .body("data.files[0].dataFile.contentType", equalTo("image/png"))
-                .body("data.files[0].dataFile.description", equalTo(""))
-                .body("data.files[0].dataFile.tabularTags", nullValue())
-                .body("data.files[0].label", equalTo("dataverseproject.png"))
-                // not sure why description appears in two places
-                .body("data.files[0].description", equalTo(""))
-                .statusCode(OK.getStatusCode());
+        .statusCode(BAD_REQUEST.getStatusCode())
+        .body("status", equalTo(ApiConstants.STATUS_ERROR))
+        .body("message", equalTo(parseError));
     }
     
     @Test
@@ -287,7 +296,7 @@ public void test_005_AddFileBadPermissions() {
       
         addResponse.then().assertThat()
                 .body("message", equalTo(errMsg))
-                .body("status", equalTo(AbstractApiBean.STATUS_ERROR))
+                .body("status", equalTo(ApiConstants.STATUS_ERROR))
                 .statusCode(FORBIDDEN.getStatusCode());
     }
 
@@ -362,7 +371,7 @@ public void test_006_ReplaceFileGood() throws InterruptedException {
         replaceRespWrongCtype.prettyPrint();
         replaceRespWrongCtype.then().assertThat()
                 .statusCode(BAD_REQUEST.getStatusCode())
-                .body("status", equalTo(AbstractApiBean.STATUS_ERROR))
+                .body("status", equalTo(ApiConstants.STATUS_ERROR))
                 .body("message", equalTo(errMsgCtype));
                 //.body("data.rootDataFileId", equalTo(origFileId))    
         
@@ -377,12 +386,25 @@ public void test_006_ReplaceFileGood() throws InterruptedException {
                 .add("categories", Json.createArrayBuilder()
                         .add("Data")
                 );
+        
+        /*
+         * ToDo: When the dataset is still locked, the replaceFile call below returns an
+         * 'OK' status with an empty 'data' array The sleepForLock avoids that so this
+         * test tests the normal replace functionality directly, but a new test to check
+         * that, when the dataset is locked, the call fails instead of returning OK
+         * would be useful (along with making the replace call do that)
+         */
+        /*
+         * ToDo: make sleep time shorter for this? Add sleepForLock before subsequent
+         * calls as well? (Or is it only needed here because it is still locked from the
+         * publish call above?)
+         */
+
+        UtilIT.sleepForLock(datasetId, null, apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION);
         Response replaceResp = UtilIT.replaceFile(origFileId.toString(), pathToFile2, json.build(), apiToken);
         
         msgt(replaceResp.prettyPrint());
         
-        String successMsg2 = BundleUtil.getStringFromBundle("file.addreplace.success.replace");
-
         replaceResp.then().assertThat()
                 /**
                  * @todo We have a need to show human readable success messages
@@ -431,7 +453,7 @@ public void test_006_ReplaceFileGood() throws InterruptedException {
                  */
                 //                .body("message", equalTo(successMsg2))
                 .statusCode(OK.getStatusCode())
-                .body("status", equalTo(AbstractApiBean.STATUS_OK))
+                .body("status", equalTo(ApiConstants.STATUS_OK))
                 .body("data.files[0].label", equalTo("005.txt"))
                 // yes, replacing a file blanks out the description (and categories)
                 .body("data.files[0].description", equalTo(""))
@@ -498,7 +520,7 @@ public void test_006_ReplaceFileGoodTabular() throws InterruptedException {
 
         // give file time to ingest
        // sleep(10000);
-       assertTrue("Failed test if Ingest Lock exceeds max duration " + pathToFile , UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+       assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
 
         Response ddi = UtilIT.getFileMetadata(origFileId.toString(), "ddi", apiToken);
 //        ddi.prettyPrint();
@@ -626,6 +648,9 @@ public void testForceReplaceAndUpdate() {
                 .add("categories", Json.createArrayBuilder()
                         .add("Data")
                 );
+        
+        UtilIT.sleepForLock(datasetId, null, apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION);
+        
         Response replaceResp = UtilIT.replaceFile(origFileId.toString(), pathToFile2, json.build(), apiToken);
 
         replaceResp.prettyPrint();
@@ -637,7 +662,7 @@ public void testForceReplaceAndUpdate() {
                 .statusCode(OK.getStatusCode());
         
         Long newDfId = JsonPath.from(replaceResp.body().asString()).getLong("data.files[0].dataFile.id");
-        
+        System.out.print("newDfId: " + newDfId);
         //Adding an additional fileMetadata update tests after this to ensure updating replaced files works
         msg("Update file metadata for old file, will error");
         String updateDescription = "New description.";
@@ -645,13 +670,18 @@ public void testForceReplaceAndUpdate() {
         //"junk" passed below is to test that it is discarded
         String updateJsonString = "{\"description\":\""+updateDescription+"\",\"categories\":[\""+updateCategory+"\"],\"forceReplace\":false ,\"junk\":\"junk\"}";
         Response updateMetadataFailResponse = UtilIT.updateFileMetadata(origFileId.toString(), updateJsonString, apiToken);
-        assertEquals(BAD_REQUEST.getStatusCode(), updateMetadataFailResponse.getStatusCode());  
-        
+        updateMetadataFailResponse.prettyPrint();
+        updateMetadataFailResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+
+        UtilIT.sleepForLock(datasetId, null, apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION);
+
         //Adding an additional fileMetadata update tests after this to ensure updating replaced files works
         msg("Update file metadata for new file");
         //"junk" passed below is to test that it is discarded
+        System.out.print("params: " +  String.valueOf(newDfId) + " " + updateJsonString + " " + apiToken);
         Response updateMetadataResponse = UtilIT.updateFileMetadata(String.valueOf(newDfId), updateJsonString, apiToken);
-        assertEquals(OK.getStatusCode(), updateMetadataResponse.getStatusCode());  
+        updateMetadataResponse.prettyPrint();
+        updateMetadataResponse.then().assertThat().statusCode(OK.getStatusCode());
         //String updateMetadataResponseString = updateMetadataResponse.body().asString();
         Response getUpdatedMetadataResponse = UtilIT.getDataFileMetadataDraft(newDfId, apiToken);
         String getUpMetadataResponseString = getUpdatedMetadataResponse.body().asString();
@@ -737,14 +767,11 @@ public void test_007_ReplaceFileUnpublishedAndBadIds() {
         String pathToFile2 = "src/main/webapp/resources/images/cc0.png";
         Response replaceResp = UtilIT.replaceFile(origFileId.toString(), pathToFile2, apiToken);
 
-        String errMsgUnpublished = BundleUtil.getStringFromBundle("file.addreplace.error.unpublished_file_cannot_be_replaced");
-        
         replaceResp.then().assertThat()
-               .statusCode(BAD_REQUEST.getStatusCode())
-               .body("status", equalTo(AbstractApiBean.STATUS_ERROR))
-               .body("message", Matchers.startsWith(errMsgUnpublished))
-               ;
-       
+        .body("data.files[0].dataFile.contentType", equalTo("image/png"))
+        .body("data.files[0].label", equalTo("cc0.png"))
+        .statusCode(OK.getStatusCode());
+        
         // -------------------------
         // Publish dataset
         // -------------------------
@@ -765,7 +792,7 @@ public void test_007_ReplaceFileUnpublishedAndBadIds() {
         replaceResp2.then().assertThat()
                 // TODO: Some day, change this from BAD_REQUEST to NOT_FOUND and expect the standard error message.
                .statusCode(BAD_REQUEST.getStatusCode())
-               .body("status", equalTo(AbstractApiBean.STATUS_ERROR))
+               .body("status", equalTo(ApiConstants.STATUS_ERROR))
                .body("message", Matchers.equalTo(BundleUtil.getStringFromBundle("file.addreplace.error.existing_file_to_replace_not_found_by_id", Arrays.asList(fakeFileId + ""))))
                ;
 
@@ -851,7 +878,7 @@ public void test_008_ReplaceFileAlreadyDeleted() {
         
         replaceResp.then().assertThat()
                .statusCode(BAD_REQUEST.getStatusCode())
-               .body("status", equalTo(AbstractApiBean.STATUS_ERROR))
+               .body("status", equalTo(ApiConstants.STATUS_ERROR))
                .body("message", Matchers.startsWith(errMsgDeleted))
                ;       
         
@@ -907,10 +934,11 @@ public void testReplaceFileBadJson() {
         Response replaceResp = UtilIT.replaceFile(origFileId.toString(), pathToFile2, jsonAsString, apiToken);
 
         msgt("replace resp: " + replaceResp.prettyPrint());
-
+        String parseError = BundleUtil.getStringFromBundle("file.addreplace.error.parsing");
         replaceResp.then().assertThat()
-                .statusCode(OK.getStatusCode())
-                .body("status", equalTo(AbstractApiBean.STATUS_OK));
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("status", equalTo(ApiConstants.STATUS_ERROR))
+                .body("message", equalTo(parseError));
 
     }
 
@@ -1003,20 +1031,43 @@ public void testRestrictFile() {
                 .body("message", equalTo("Problem trying to update restriction status on dataverseproject.png: File dataverseproject.png is already restricted"))
                 .statusCode(BAD_REQUEST.getStatusCode());
 
-        //unrestrict file
-        restrict = false;
-        Response unrestrictResponse = UtilIT.restrictFile(origFileId.toString(), restrict, apiToken);
+        //unrestrict file using json with missing "restrict"
+        String restrictJson = "{}";
+        Response unrestrictResponse = UtilIT.restrictFile(origFileId.toString(), restrictJson, apiToken);
+        unrestrictResponse.prettyPrint();
+        unrestrictResponse.then().assertThat()
+                .body("message", equalTo("Error parsing Json: 'restrict' is required."))
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        //unrestrict file using json
+        restrictJson = "{\"restrict\":false}";
+        unrestrictResponse = UtilIT.restrictFile(origFileId.toString(), restrictJson, apiToken);
         unrestrictResponse.prettyPrint();
         unrestrictResponse.then().assertThat()
                 .body("data.message", equalTo("File dataverseproject.png unrestricted."))
                 .statusCode(OK.getStatusCode());
 
+        //restrict file using json with enableAccessRequest false and missing TOA
+        restrictJson = "{\"restrict\":true, \"enableAccessRequest\":false}";
+        restrictResponse = UtilIT.restrictFile(origFileId.toString(), restrictJson, apiToken);
+        restrictResponse.prettyPrint();
+        restrictResponse.then().assertThat()
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataset.message.toua.invalid")))
+                .statusCode(CONFLICT.getStatusCode());
+        //restrict file using json
+        restrictJson = "{\"restrict\":true, \"enableAccessRequest\":false, \"termsOfAccess\":\"Testing terms of access\"}";
+        restrictResponse = UtilIT.restrictFile(origFileId.toString(), restrictJson, apiToken);
+        restrictResponse.prettyPrint();
+        restrictResponse.then().assertThat()
+                .body("data.message", equalTo("File dataverseproject.png restricted. Access Request is disabled. Terms of Access for restricted files: Testing terms of access"))
+                .statusCode(OK.getStatusCode());
+
         //reset public install
         UtilIT.setSetting(SettingsServiceBean.Key.PublicInstall, publicInstall);
 
     }
     
-        @Test
+    @Test
     public void testRestrictAddedFile() {
         msgt("testRestrictAddedFile");
         
@@ -1085,6 +1136,9 @@ public void testAccessFacet() {
         msg("Add initial file");
         String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
         Response addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        
+        // Wait a little while for the index to pick up the file, otherwise timing issue with searching for it.
+        UtilIT.sleepForReindex(datasetId.toString(), apiToken, 4);
 
         String successMsgAdd = BundleUtil.getStringFromBundle("file.addreplace.success.add");
 
@@ -1095,15 +1149,10 @@ public void testAccessFacet() {
 
         long fileId = JsonPath.from(addResponse.body().asString()).getLong("data.files[0].dataFile.id");
 
-        Response searchShouldFindNothingBecauseUnpublished = UtilIT.search("id:datafile_" + fileId + "_draft", apiToken);
-        searchShouldFindNothingBecauseUnpublished.prettyPrint();
-        searchShouldFindNothingBecauseUnpublished.then().assertThat()
-                // This is normal. "limited to published data" http://guides.dataverse.org/en/4.7/api/search.html
-                .body("data.total_count", equalTo(0))
-                .statusCode(OK.getStatusCode());
-        // Let's temporarily allow searching of drafts.
-        Response enableNonPublicSearch = UtilIT.enableSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        enableNonPublicSearch.then().assertThat()
+        Response searchShouldFindBecauseAuthorApiTokenSupplied = UtilIT.search("id:datafile_" + fileId + "_draft", apiToken);
+        searchShouldFindBecauseAuthorApiTokenSupplied.prettyPrint();
+        searchShouldFindBecauseAuthorApiTokenSupplied.then().assertThat()
+                .body("data.total_count", equalTo(1))
                 .statusCode(OK.getStatusCode());
 
         Response searchResponse = UtilIT.searchAndShowFacets("id:datafile_" + fileId + "_draft", apiToken);
@@ -1119,18 +1168,10 @@ public void testAccessFacet() {
                 .body("data.facets[0].publicationStatus", CoreMatchers.not(equalTo(null)))
                 .statusCode(OK.getStatusCode());
 
-        Response removeSearchApiNonPublicAllowed = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        removeSearchApiNonPublicAllowed.prettyPrint();
-        removeSearchApiNonPublicAllowed.then().assertThat()
-                .statusCode(200);
-
         //reset public install
         UtilIT.setSetting(SettingsServiceBean.Key.PublicInstall, "false");
 
     }
-    
-
-    
 
     @Test
     public void test_AddFileBadUploadFormat() {
@@ -1203,7 +1244,7 @@ public void testUningestFileViaApi() throws InterruptedException {
         assertNotNull(origFileId);    // If checkOut fails, display message
        // sleep(10000);
         
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + pathToFile , UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
         Response uningestFileResponse = UtilIT.uningestFile(origFileId, apiToken);
         assertEquals(200, uningestFileResponse.getStatusCode());       
     }
@@ -1237,7 +1278,7 @@ public void testFileMetaDataGetUpdateRoundTrip() throws InterruptedException {
         Long origFileId = JsonPath.from(addResponse.body().asString()).getLong("data.files[0].dataFile.id");
         
         //sleep(2000); //ensure tsv is consumed
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + pathToFile , UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
         msg("Publish dataverse and dataset");
         Response publishDataversetResp = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
         publishDataversetResp.then().assertThat()
@@ -1279,8 +1320,8 @@ public void testFileMetaDataGetUpdateRoundTrip() throws InterruptedException {
         assertEquals(updateCategory, JsonPath.from(getUpMetadataResponseString).getString("categories[0]"));
         assertNull(JsonPath.from(getUpMetadataResponseString).getString("provFreeform")); //unupdated fields are not persisted
         assertEquals(updateDataFileTag, JsonPath.from(getUpMetadataResponseString).getString("dataFileTags[0]"));
-        
-        //We haven't published so the non-draft call should still give the pre-edit metadata
+
+//We haven't published so the non-draft call should still give the pre-edit metadata
         Response getOldMetadataResponse = UtilIT.getDataFileMetadata(origFileId, apiToken);
         String getOldMetadataResponseString = getOldMetadataResponse.body().asString();
         msg("Old Published (shouldn't be updated):");
@@ -1294,6 +1335,26 @@ public void testFileMetaDataGetUpdateRoundTrip() throws InterruptedException {
         String updateInvalidJsonString = "{\"dataFileTags\":false}";
         Response updateInvalidMetadataResponse = UtilIT.updateFileMetadata(origFileId.toString(), updateInvalidJsonString, apiToken);
         assertEquals(BAD_REQUEST.getStatusCode(), updateInvalidMetadataResponse.getStatusCode());  
+        
+        //adding a publish here to test the error seen in #11208
+        UtilIT.sleepForLock(datasetId, null, apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION);
+        publishDatasetResp = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResp.prettyPrint();
+        publishDatasetResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        String updateDescription2 = "update after publish";
+        String updateJsonString2 = "{\"description\":\"" + updateDescription2 + "\",\"label\":\"" + updateLabel + "\",\"categories\":[\"" + updateCategory + "\"],\"dataFileTags\":[\"" + updateDataFileTag + "\"],\"forceReplace\":false ,\"junk\":\"junk\"}";
+        Response updateMetadataResponse2 = UtilIT.updateFileMetadata(origFileId.toString(), updateJsonString2, apiToken);
+
+        updateMetadataResponse2.prettyPrint();
+
+        updateMetadataResponse2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        getUpdatedMetadataResponse = UtilIT.getDataFileMetadataDraft(origFileId, apiToken);
+        String getUpdateMetadataResponseString = getUpdatedMetadataResponse.body().asString();
+        msg(getUpdateMetadataResponseString);
+        assertEquals(updateDescription2, JsonPath.from(getUpdateMetadataResponseString).getString("description"));
 
     }
     
@@ -1335,8 +1396,21 @@ public void testDataSizeInDataverse() throws InterruptedException {
                 .statusCode(OK.getStatusCode());
         
         // wait for it to ingest... 
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + pathToFile , UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, 5), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
      //   sleep(10000);
+     
+        Response publishDataversetResp = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        publishDataversetResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String apiTokenRando = createUserGetToken();
+        
+        Response datasetStorageSizeResponseDraft = UtilIT.findDatasetDownloadSize(datasetId.toString(), DS_VERSION_DRAFT, apiTokenRando);
+        datasetStorageSizeResponseDraft.prettyPrint();
+        assertEquals(UNAUTHORIZED.getStatusCode(), datasetStorageSizeResponseDraft.getStatusCode());  
+        Response publishDatasetResp = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        //msg(publishDatasetResp.body().asString());
+        publishDatasetResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
         
         // This is the magic number - the number of bytes in the 2 files uploaded
         // above, plus the size of the tab-delimited file generated by the ingest
@@ -1349,6 +1423,485 @@ public void testDataSizeInDataverse() throws InterruptedException {
         dvStorageSizeResponse.prettyPrint();
                 
         assertEquals(magicControlString, JsonPath.from(dvStorageSizeResponse.body().asString()).getString("data.message"));
+        
+        magicControlString = MessageFormat.format(BundleUtil.getStringFromBundle("datasets.api.datasize.storage"), magicSizeNumber);
+        
+        //no perms
+
+        Response datasetStorageSizeResponse = UtilIT.findDatasetStorageSize(datasetId.toString(), apiTokenRando);
+        datasetStorageSizeResponse.prettyPrint();
+        assertEquals(UNAUTHORIZED.getStatusCode(), datasetStorageSizeResponse.getStatusCode());  
+                
+        //has perms
+        datasetStorageSizeResponse = UtilIT.findDatasetStorageSize(datasetId.toString(), apiToken);
+        datasetStorageSizeResponse.prettyPrint();
+
+        assertEquals(magicControlString, JsonPath.from(datasetStorageSizeResponse.body().asString()).getString("data.message"));
+        
+        magicControlString = MessageFormat.format(BundleUtil.getStringFromBundle("datasets.api.datasize.download"), magicSizeNumber);
+        
+        Response datasetDownloadSizeResponse = UtilIT.findDatasetDownloadSize(datasetId.toString());
+        datasetDownloadSizeResponse.prettyPrint();
+                
+        assertEquals(magicControlString, JsonPath.from(datasetDownloadSizeResponse.body().asString()).getString("data.message"));
+        
+    }
+
+    @Test
+    public void GetFileVersionDifferences() {
+        // Create superuser and regular user
+        Response createUser = UtilIT.createRandomUser();
+        String superUserUsername = UtilIT.getUsernameFromResponse(createUser);
+        String superUserApiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.makeSuperUser(superUserUsername);
+        createUser = UtilIT.createRandomUser();
+        String regularUsername = UtilIT.getUsernameFromResponse(createUser);
+        String regularApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        // Create dataverse and dataset. Upload 1 file
+        String dataverseAlias = createDataverseGetAlias(superUserApiToken);
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, superUserApiToken);
+        Integer datasetId = createDatasetGetId(dataverseAlias, superUserApiToken);
+        String pathToFile = "scripts/search/data/binary/trees.png";
+        Response addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, superUserApiToken);
+        addResponse.prettyPrint();
+        String dataFileId = addResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+
+        // Superuser can see the draft version
+        Response getFileDataResponse = UtilIT.getFileVersionDifferences(dataFileId, superUserApiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("status", equalTo("OK"))
+                .body("data[0].datasetVersion", equalTo("DRAFT"))
+                .body("data[0].fileDifferenceSummary.file", equalTo("Added"))
+                .statusCode(OK.getStatusCode());
+
+        // Regular user can not see the draft version
+        getFileDataResponse = UtilIT.getFileVersionDifferences(dataFileId, regularApiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("status", equalTo("ERROR"))
+                .body("message", containsString("is not permitted to perform requested action."))
+                .statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Publish the dataset with 1 file
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", superUserApiToken);
+
+        // Regular user can see latest version now
+        getFileDataResponse = UtilIT.getFileVersionDifferences(dataFileId, regularApiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("status", equalTo("OK"))
+                .body("data[0].datasetVersion", equalTo("1.0"))
+                .body("data[0].fileDifferenceSummary.file", equalTo("Added"))
+                .statusCode(OK.getStatusCode());
+
+        // Add another file to create a new draft
+        pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
+        addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, superUserApiToken);
+        addResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+
+        // Regular user can only see the published version
+        getFileDataResponse = UtilIT.getFileVersionDifferences(dataFileId, regularApiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("status", equalTo("OK"))
+                .body("data[0].datasetVersion", equalTo("1.0"))
+                .body("data[0].fileDifferenceSummary.file", equalTo("Added"))
+                .statusCode(OK.getStatusCode());
+
+        // Give permission to view the draft version
+        Response assignRole = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.CURATOR.toString(),
+                "@" + regularUsername, superUserApiToken);
+        assertEquals(200, assignRole.getStatusCode());
+
+        // Regular user can see the draft and released versions now
+        getFileDataResponse = UtilIT.getFileVersionDifferences(dataFileId, regularApiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("status", equalTo("OK"))
+                .body("data[0].datasetVersion", equalTo("DRAFT"))
+                .body("data[1].datasetVersion", equalTo("1.0"))
+                .body("data[1].fileDifferenceSummary.file", equalTo("Added"))
+                .statusCode(OK.getStatusCode());
+
+        // test replace file
+        pathToFile = "src/test/resources/images/coffeeshop.png";
+        Response replaceFileResponse = UtilIT.replaceFile(dataFileId, pathToFile, superUserApiToken);
+        replaceFileResponse.prettyPrint();
+        replaceFileResponse.then().assertThat()
+                .body("status", equalTo("OK"));
+        String replacedDataFileId = replaceFileResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+        getFileDataResponse = UtilIT.getFileVersionDifferences(replacedDataFileId, regularApiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("status", equalTo("OK"))
+                .body("data[0].datasetVersion", equalTo("DRAFT"))
+                .body("data[0].fileDifferenceSummary.file", equalTo("Replaced"))
+                .body("data[0].datafileId", equalTo(Integer.parseInt(replacedDataFileId)))
+                .body("data[1].datasetVersion", equalTo("1.0"))
+                .body("data[1].fileDifferenceSummary.file", equalTo("Added"))
+                .body("data[1].datafileId", equalTo(Integer.parseInt(dataFileId)))
+                .statusCode(OK.getStatusCode());
+        getFileDataResponse = UtilIT.getFileVersionDifferences(dataFileId, regularApiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("status", equalTo("OK"))
+                .body("data[0].datasetVersion", equalTo("DRAFT"))
+                .body("data[0].fileDifferenceSummary.file", equalTo("Replaced"))
+                .body("data[0].datafileId", equalTo(Integer.parseInt(replacedDataFileId)))
+                .body("data[1].datasetVersion", equalTo("1.0"))
+                .body("data[1].fileDifferenceSummary.file", equalTo("Added"))
+                .body("data[1].datafileId", equalTo(Integer.parseInt(dataFileId)))
+                .statusCode(OK.getStatusCode());
+
+        // The following tests cover cases where the dataset version is deaccessioned
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, "1.0", "Test reason", null, superUserApiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+        getFileDataResponse = UtilIT.getFileVersionDifferences(replacedDataFileId, regularApiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("status", equalTo("OK"))
+                .body("data[1].datasetVersion", equalTo("1.0"))
+                .body("data[1].fileDifferenceSummary.deaccessionedReason", equalTo("Test reason"))
+                .body("data[1].fileDifferenceSummary.file", equalTo("Added"))
+                .statusCode(OK.getStatusCode());
+    }
+    @Test
+    public void testGetFileInfo() {
+        Response createUser = UtilIT.createRandomUser();
+        String superUserUsername = UtilIT.getUsernameFromResponse(createUser);
+        String superUserApiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.makeSuperUser(superUserUsername);
+        String dataverseAlias = createDataverseGetAlias(superUserApiToken);
+        Integer datasetId = createDatasetGetId(dataverseAlias, superUserApiToken);
+
+        createUser = UtilIT.createRandomUser();
+        String regularUsername = UtilIT.getUsernameFromResponse(createUser);
+        String regularApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        msg("Add a non-tabular file");
+        String pathToFile = "scripts/search/data/binary/trees.png";
+        Response addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, superUserApiToken);
+
+        // The following tests cover cases where no version ID is specified in the endpoint
+        // Superuser should get to see draft file data
+        String dataFileId = addResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+        Response getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken);
+        String newFileName = "trees.png";
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileName))
+                .body("data.dataFile.filename", equalTo(newFileName))
+                .body("data.dataFile.contentType", equalTo("image/png"))
+                .body("data.dataFile.filesize", equalTo(8361))
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should not get to see draft file data
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken);
+        getFileDataResponse.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Publish dataverse and dataset
+        Response publishDataverseResp = UtilIT.publishDataverseViaSword(dataverseAlias, superUserApiToken);
+        publishDataverseResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response publishDatasetResp = UtilIT.publishDatasetViaNativeApi(datasetId, "major", superUserApiToken);
+        publishDatasetResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should get to see published file data
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken);
+        getFileDataResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.label", equalTo(newFileName));
+
+        // The following tests cover cases where a version ID is specified in the endpoint
+        // Superuser should not get to see draft file data when no draft version exists
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, DS_VERSION_DRAFT);
+        getFileDataResponse.then().assertThat()
+                .statusCode(NOT_FOUND.getStatusCode());
+
+        // Regular user should get to see file data from specific version filtering by tag
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, "1.0");
+        getFileDataResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.label", equalTo(newFileName));
+
+        // Update the file metadata
+        String newFileNameFirstUpdate = "trees_2.png";
+        JsonObjectBuilder updateFileMetadata = Json.createObjectBuilder()
+                .add("label", newFileNameFirstUpdate);
+        Response updateFileMetadataResponse = UtilIT.updateFileMetadata(dataFileId, updateFileMetadata.build().toString(), superUserApiToken);
+        updateFileMetadataResponse.then().statusCode(OK.getStatusCode());
+
+        // Superuser should get to see draft file data
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, DS_VERSION_DRAFT);
+        getFileDataResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should not get to see draft file data
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, DS_VERSION_DRAFT);
+        getFileDataResponse.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Publish dataset once again
+        publishDatasetResp = UtilIT.publishDatasetViaNativeApi(datasetId, "major", superUserApiToken);
+        publishDatasetResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Update the file metadata once again
+        String newFileNameSecondUpdate = "trees_3.png";
+        updateFileMetadata = Json.createObjectBuilder()
+                .add("label", newFileNameSecondUpdate);
+        updateFileMetadataResponse = UtilIT.updateFileMetadata(dataFileId, updateFileMetadata.build().toString(), superUserApiToken);
+        updateFileMetadataResponse.then().statusCode(OK.getStatusCode());
+
+        // Regular user should get to see latest published file data
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, DS_VERSION_LATEST_PUBLISHED);
+        getFileDataResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.label", equalTo(newFileNameFirstUpdate));
+
+        // Regular user should get to see latest published file data if latest is requested
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, DS_VERSION_LATEST);
+        getFileDataResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.label", equalTo(newFileNameFirstUpdate));
+
+        // Superuser should get to see draft file data if latest is requested
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, DS_VERSION_LATEST);
+        getFileDataResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.label", equalTo(newFileNameSecondUpdate));
+
+        // Publish dataset once again
+        publishDatasetResp = UtilIT.publishDatasetViaNativeApi(datasetId, "major", superUserApiToken);
+        publishDatasetResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should get to see file data by specific version number
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, "2.0");
+        getFileDataResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.label", equalTo(newFileNameFirstUpdate));
+
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, "3.0");
+        getFileDataResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.label", equalTo(newFileNameSecondUpdate));
+
+        // The following tests cover cases where the dataset version is deaccessioned
+        
+        Response deaccessionDatasetResponse = UtilIT.deaccessionDataset(datasetId, "3.0", "Test reason", null, superUserApiToken);
+        deaccessionDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Superuser should get to see file data if the latest version is deaccessioned filtering by latest and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, DS_VERSION_LATEST, true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameSecondUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Superuser should get to see file data if the latest version is deaccessioned filtering by latest published and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, DS_VERSION_LATEST_PUBLISHED, true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameSecondUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Superuser should get to see version 2.0 file data if the latest version is deaccessioned filtering by latest and includeDeaccessioned is false
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, DS_VERSION_LATEST, false, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameFirstUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Superuser should get to see version 2.0 file data if the latest version is deaccessioned filtering by latest published and includeDeaccessioned is false
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, DS_VERSION_LATEST_PUBLISHED, false, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameFirstUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Superuser should get to see file data from specific deaccessioned version filtering by tag and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, "3.0", true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameSecondUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Superuser should not get to see file data from specific deaccessioned version filtering by tag and includeDeaccessioned is false
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, "3.0", false, false);
+        getFileDataResponse.then().assertThat()
+                .statusCode(NOT_FOUND.getStatusCode());
+
+        // Regular user should get to see version 2.0 file data if the latest version is deaccessioned filtering by latest and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, DS_VERSION_LATEST, true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameFirstUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should get to see version 2.0 file data if the latest version is deaccessioned filtering by latest published and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, DS_VERSION_LATEST_PUBLISHED, true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameFirstUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should get to see version 2.0 file data if the latest version is deaccessioned filtering by latest published and includeDeaccessioned is false
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, DS_VERSION_LATEST_PUBLISHED, false, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameFirstUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should not get to see file data from specific deaccessioned version filtering by tag and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, "3.0", true, false);
+        getFileDataResponse.then().assertThat()
+                .statusCode(NOT_FOUND.getStatusCode());
+
+        // Regular user should not get to see file data from specific deaccessioned version filtering by tag and includeDeaccessioned is false
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, "3.0", false, false);
+        getFileDataResponse.then().assertThat()
+                .statusCode(NOT_FOUND.getStatusCode());
+
+        // Update the file metadata
+        String newFileNameThirdUpdate = "trees_4.png";
+        updateFileMetadata = Json.createObjectBuilder()
+                .add("label", newFileNameThirdUpdate);
+        updateFileMetadataResponse = UtilIT.updateFileMetadata(dataFileId, updateFileMetadata.build().toString(), superUserApiToken);
+        updateFileMetadataResponse.then().statusCode(OK.getStatusCode());
+
+        // Superuser should get to see draft file data if draft exists filtering by latest and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, DS_VERSION_LATEST, true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameThirdUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Superuser should get to see latest published file data if draft exists filtering by latest published and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, superUserApiToken, DS_VERSION_LATEST_PUBLISHED, true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameSecondUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should get to see version 2.0 file data if the latest version is deaccessioned and draft exists filtering by latest and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, DS_VERSION_LATEST, true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameFirstUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should get to see version 2.0 file data if the latest version is deaccessioned and draft exists filtering by latest published and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, DS_VERSION_LATEST_PUBLISHED, true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameFirstUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Publish dataset once again
+        publishDatasetResp = UtilIT.publishDatasetViaNativeApi(datasetId, "major", superUserApiToken);
+        publishDatasetResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should get to see file data if the latest version is not deaccessioned filtering by latest and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, DS_VERSION_LATEST, true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameThirdUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // Regular user should get to see file data if the latest version is not deaccessioned filtering by latest published and includeDeaccessioned is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, DS_VERSION_LATEST_PUBLISHED, true, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo(newFileNameThirdUpdate))
+                .statusCode(OK.getStatusCode());
+
+        // The following tests cover cases where the user requests to include the dataset version information in the response
+        // User should get to see dataset version info in the response if returnDatasetVersion is true
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, "1.0", false, true);
+        getFileDataResponse.then().assertThat()
+                .body("data.datasetVersion.versionState", equalTo("RELEASED"))
+                .statusCode(OK.getStatusCode());
+
+        // User should not get to see dataset version info in the response if returnDatasetVersion is false
+        getFileDataResponse = UtilIT.getFileData(dataFileId, regularApiToken, "1.0", false, false);
+        getFileDataResponse.then().assertThat()
+                .body("data.datasetVersion", equalTo(null))
+                .statusCode(OK.getStatusCode());
+
+        // Cleanup
+        Response destroyDatasetResponse = UtilIT.destroyDataset(datasetId, superUserApiToken);
+        destroyDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, superUserApiToken);
+        deleteDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(superUserUsername);
+        deleteUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        deleteUserResponse = UtilIT.deleteUser(regularUsername);
+        deleteUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+    }
+    
+    @Test 
+    public void testGetFileOwners() {
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        String dataverseAlias = createDataverseGetAlias(apiToken);
+       
+        
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+
+        createUser = UtilIT.createRandomUser();
+        String apiTokenRegular = UtilIT.getApiTokenFromResponse(createUser);
+
+        msg("Add a non-tabular file");
+        String pathToFile = "scripts/search/data/binary/trees.png";
+        Response addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+
+        String dataFileId = addResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+        msgt("datafile id: " + dataFileId);
+
+        addResponse.prettyPrint();
+
+        Response getFileDataResponse = UtilIT.getFileWithOwners(dataFileId, apiToken, true);
+
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("data.label", equalTo("trees.png"))
+                .body("data.dataFile.filename", equalTo("trees.png"))
+                .body("data.dataFile.contentType", equalTo("image/png"))
+                .body("data.dataFile.filesize", equalTo(8361))
+                .statusCode(OK.getStatusCode());
+        
+        getFileDataResponse.then().assertThat().body("data.dataFile.isPartOf.identifier", equalTo(datasetId));
+        getFileDataResponse.then().assertThat().body("data.dataFile.isPartOf.persistentIdentifier", equalTo(datasetPid));
+
+        // -------------------------
+        // Publish dataverse and dataset
+        // -------------------------
+        msg("Publish dataverse and dataset");
+        Response publishDataversetResp = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        publishDataversetResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response publishDatasetResp = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        //regular user should get to see file data
+        getFileDataResponse = UtilIT.getFileData(dataFileId, apiTokenRegular);
+        getFileDataResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //cleanup
+
+        Response destroyDatasetResponse = UtilIT.destroyDataset(datasetId, apiToken);
+        assertEquals(200, destroyDatasetResponse.getStatusCode());
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        assertEquals(200, deleteUserResponse.getStatusCode());
+
+        
     }
     
     @Test
@@ -1381,7 +1934,7 @@ public void testValidateDDI_issue6027() throws InterruptedException {
                 .statusCode(OK.getStatusCode());
 
         // give file time to ingest
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + pathToFile , UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
        // sleep(10000);
 
         Response ddi = UtilIT.getFileMetadata(origFileId.toString(), "ddi", apiToken);
@@ -1393,8 +1946,154 @@ public void testValidateDDI_issue6027() throws InterruptedException {
 
     }
     
-    private void msg(String m){
-        System.out.println(m);
+    /*
+        A very simple test for shape file package processing. 
+    */    
+    @Test
+    public void test_ProcessShapeFilePackage() {
+        msgt("test_ProcessShapeFilePackage");
+         // Create user
+        String apiToken = createUserGetToken();
+
+        // Create Dataverse
+        String dataverseAlias = createDataverseGetAlias(apiToken);
+
+        // Create Dataset
+        Integer datasetId = createDatasetGetId(dataverseAlias, apiToken);
+       
+        // This archive contains 4 files that constitute a valid 
+        // shape file. We want to check that these files were properly 
+        // recognized and re-zipped as a shape package, preserving the 
+        // folder structure found in the uploaded zip. 
+        String pathToFile = "scripts/search/data/shape/shapefile.zip";
+        
+        String suppliedDescription = "file extracted from a shape bundle";
+        String extractedFolderName = "subfolder";
+        String extractedShapeName = "boston_public_schools_2012_z1l.zip"; 
+        String extractedShapeType = "application/zipped-shapefile";
+
+        JsonObjectBuilder json = Json.createObjectBuilder()
+                .add("description", suppliedDescription);
+
+        Response addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, json.build(), apiToken);
+
+        msgt("Server response: " + addResponse.prettyPrint());
+      
+        // We are checking the following: 
+        // - that the upload succeeded;
+        // - that a shape file with the name specified above has been repackaged and added
+        //   to the dataset as a single file;
+        // - that the mime type has been properly identified;
+        // - that the description supplied via the API has been added; 
+        // - that the subfolder found inside the uploaded zip file has been properly
+        //   preserved in the FileMetadata. 
+        // 
+        // Feel free to expand the checks further - we can also verify the 
+        // checksum, the size of the resulting file, add more files to the uploaded
+        // zip archive etc. etc. - but this should be a good start. 
+        // -- L.A. 2020/09
+        addResponse.then().assertThat()
+                .body("status", equalTo(ApiConstants.STATUS_OK))
+                .body("data.files[0].dataFile.contentType", equalTo(extractedShapeType))
+                .body("data.files[0].label", equalTo(extractedShapeName))
+                .body("data.files[0].directoryLabel", equalTo(extractedFolderName))
+                .body("data.files[0].description", equalTo(suppliedDescription))
+                .statusCode(OK.getStatusCode());
+    }
+    
+    /*
+        First test for the new "crawlable file access" API (#7084)
+    */    
+    @Test
+    public void test_CrawlableAccessToDatasetFiles() {
+        msgt("test_test_CrawlableAccessToDatasetFiles");
+         // Create user
+        String apiToken = createUserGetToken();
+
+        // Create Dataverse
+        String dataverseAlias = createDataverseGetAlias(apiToken);
+
+        // Create Dataset
+        String datasetId = createDatasetGetId(dataverseAlias, apiToken).toString();
+        
+        msgt("dataset id: "+datasetId);
+       
+        String testFileName = "dataverseproject.png";
+        String pathToFile = "src/main/webapp/resources/images/" + testFileName;
+        String description = "test file 1";
+        String folderName = "subfolder";
+
+        JsonObjectBuilder json = Json.createObjectBuilder()
+                .add("description", description)
+                .add("directoryLabel", folderName);
+
+        Response addResponse = UtilIT.uploadFileViaNative(datasetId, pathToFile, json.build(), apiToken);
+
+        msgt("Server response: " + addResponse.prettyPrint());
+      
+        addResponse.then().assertThat()
+                .body("status", equalTo(ApiConstants.STATUS_OK))
+                .body("data.files[0].label", equalTo(testFileName))
+                .body("data.files[0].directoryLabel", equalTo(folderName))
+                .body("data.files[0].description", equalTo(description))
+                .statusCode(OK.getStatusCode());
+        
+        String dataFileId = addResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+        //msgt("datafile id: "+dataFileId);
+        
+        // TODO: (potentially?)
+        // maybe upload a few more files, in more folders, 
+        // and try an actual recursive crawl of a full tree - ?
+                
+        // Make some calls to the "/dirindex API:
+        // (note that this API outputs HTML!)
+        
+        // Expected values in the output: 
+        String expectedTitleTopFolder = "Index of folder /";
+        String expectedLinkTopFolder = folderName + "/";
+        String expectedLinkAhrefTopFolder = "/api/datasets/"+datasetId+"/dirindex/?version=" + DS_VERSION_DRAFT + "&folder=subfolder";
+        
+        String expectedTitleSubFolder = "Index of folder /" + folderName;
+        String expectedLinkAhrefSubFolder = "/api/access/datafile/" + folderName + "/" + dataFileId;
+        
+        // ... with no folder specified: 
+        // (with just the one file above, this should show one folder only - "subfolder", and no files)
+        Response fileAccessResponse = UtilIT.getCrawlableFileAccess(datasetId, "", apiToken);
+        fileAccessResponse.then().assertThat().statusCode(OK.getStatusCode()).contentType("text/html");
+
+        String htmlTitle = fileAccessResponse.getBody().htmlPath().getString("html.head.title");
+        assertEquals(expectedTitleTopFolder, htmlTitle);
+        
+        String htmlCrawlLink = fileAccessResponse.getBody().htmlPath().getString("html.body.table.tr[2].td[0]");
+        //msgt("html crawl link: "+htmlCrawlLink);
+        assertEquals(expectedLinkTopFolder, htmlCrawlLink);
+        
+        String htmlCrawlLinkAhref = fileAccessResponse.getBody().htmlPath().get("html.body.table.tr[2].td[0].a.@href").toString();
+        //msgt("html crawl link href: "+htmlCrawlLinkAhref);
+        assertEquals(expectedLinkAhrefTopFolder, htmlCrawlLinkAhref);
+
+        
+        // ... and with the folder name "subfolder" specified: 
+        // (should result in being shown one access link to the file above, no folders)
+        fileAccessResponse = UtilIT.getCrawlableFileAccess(datasetId.toString(), folderName, apiToken);
+        fileAccessResponse.then().assertThat().statusCode(OK.getStatusCode()).contentType("text/html");
+
+        htmlTitle = fileAccessResponse.getBody().htmlPath().getString("html.head.title");
+        assertEquals(expectedTitleSubFolder, htmlTitle);
+        
+        htmlCrawlLink = fileAccessResponse.getBody().htmlPath().getString("html.body.table.tr[2].td[0]");
+        //msgt("html crawl link: "+htmlCrawlLink);
+        // this should be the name of the test file above:
+        assertEquals(testFileName, htmlCrawlLink);
+        
+        htmlCrawlLinkAhref = fileAccessResponse.getBody().htmlPath().get("html.body.table.tr[2].td[0].a.@href").toString();
+        //msgt("html crawl link href: "+htmlCrawlLinkAhref);
+        assertEquals(expectedLinkAhrefSubFolder, htmlCrawlLinkAhref);
+
+    }
+    
+    private void msg(String m){
+        System.out.println(m);
     }
     private void dashes(){
         msg("----------------");
@@ -1402,5 +2101,1330 @@ private void dashes(){
     private void msgt(String m){
         dashes(); msg(m); dashes();
     }
+
+    @Test
+    public void testRange() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+//        createUser.prettyPrint();
+        String authorUsername = UtilIT.getUsernameFromResponse(createUser);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(authorApiToken);
+//        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+//        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        Path pathToTxt = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "file.txt");
+        String contentOfTxt = ""
+                + "first is the worst\n"
+                + "second is the best\n"
+                + "third is the one with the hairy chest\n";
+        java.nio.file.Files.write(pathToTxt, contentOfTxt.getBytes());
+
+        Response uploadFileTxt = UtilIT.uploadFileViaNative(datasetId.toString(), pathToTxt.toString(), authorApiToken);
+//        uploadFileTxt.prettyPrint();
+        uploadFileTxt.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("file.txt"));
+
+        Integer fileIdTxt = JsonPath.from(uploadFileTxt.body().asString()).getInt("data.files[0].dataFile.id");
+
+        // Download the whole file.
+        Response downloadTxtNoArgs = UtilIT.downloadFile(fileIdTxt, null, null, null, authorApiToken);
+        downloadTxtNoArgs.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body(equalTo("first is the worst\n"
+                        + "second is the best\n"
+                        + "third is the one with the hairy chest\n"));
+
+        // Download the first 10 bytes.
+        Response downloadTxtFirst10 = UtilIT.downloadFile(fileIdTxt, "0-9", null, null, authorApiToken);
+        downloadTxtFirst10.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("first is t"));
+
+        // Download the last 6 bytes.
+        Response downloadTxtLast6 = UtilIT.downloadFile(fileIdTxt, "-6", null, null, authorApiToken);
+        downloadTxtLast6.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("chest\n"));
+
+        // Download some bytes from the middle.
+        Response downloadTxtMiddle = UtilIT.downloadFile(fileIdTxt, "09-19", null, null, authorApiToken);
+        downloadTxtMiddle.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("the worst\ns"));
+
+        // Skip the first 10 bytes and download the rest.
+        Response downloadTxtSkipFirst10 = UtilIT.downloadFile(fileIdTxt, "9-", null, null, authorApiToken);
+        downloadTxtSkipFirst10.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("the worst\n"
+                        + "second is the best\n"
+                        + "third is the one with the hairy chest\n"));
+
+        Path pathToCsv = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.csv");
+        String contentOfCsv = ""
+                + "name,pounds,species\n"
+                + "Marshall,40,dog\n"
+                + "Tiger,17,cat\n"
+                + "Panther,21,cat\n";
+        java.nio.file.Files.write(pathToCsv, contentOfCsv.getBytes());
+
+        Response uploadFileCsv = UtilIT.uploadFileViaNative(datasetId.toString(), pathToCsv.toString(), authorApiToken);
+//        uploadFileCsv.prettyPrint();
+        uploadFileCsv.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("data.csv"));
+
+        Integer fileIdCsv = JsonPath.from(uploadFileCsv.body().asString()).getInt("data.files[0].dataFile.id");
+
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", authorApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToCsv);
+
+        // Just the tabular file, not the original, no byte range. Vanilla.
+        Response downloadFileNoArgs = UtilIT.downloadFile(fileIdCsv, null, null, null, authorApiToken);
+        downloadFileNoArgs.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body(equalTo("name\tpounds\tspecies\n"
+                        + "\"Marshall\"\t40\t\"dog\"\n"
+                        + "\"Tiger\"\t17\t\"cat\"\n"
+                        + "\"Panther\"\t21\t\"cat\"\n"));
+
+        // first 10 bytes of tabular format
+        Response downloadTabFirstTen = UtilIT.downloadFile(fileIdCsv, "0-9", null, null, authorApiToken);
+        downloadTabFirstTen.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("name\tpound"));
+
+        // first 30 bytes of tabular format
+        Response downloadTabFirst30 = UtilIT.downloadFile(fileIdCsv, "0-29", null, null, authorApiToken);
+        downloadTabFirst30.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("name\tpounds\tspecies\n"
+                        + "\"Marshall\""));
+
+        // last 16 bytes of tabular format
+        Response downloadTabLast16 = UtilIT.downloadFile(fileIdCsv, "-16", null, null, authorApiToken);
+        downloadTabLast16.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("nther\"\t21\t\"cat\"\n"));
+
+        Response downloadTabMiddleBytesHeader = UtilIT.downloadFile(fileIdCsv, "1-7", null, null, authorApiToken);
+        downloadTabMiddleBytesHeader.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("ame\tpou"));
+
+        Response downloadTabMiddleBytesBody = UtilIT.downloadFile(fileIdCsv, "31-43", null, null, authorApiToken);
+        downloadTabMiddleBytesBody.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("40\t\"dog\"\n"
+                        + "\"Tig"));
+
+        // Original version of tabular file (CSV in this case).
+        Response downloadOrig = UtilIT.downloadFile(fileIdCsv, null, "original", null, authorApiToken);
+        downloadOrig.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body(equalTo("name,pounds,species\n"
+                        + "Marshall,40,dog\n"
+                        + "Tiger,17,cat\n"
+                        + "Panther,21,cat\n"));
+
+        // first ten bytes
+        Response downloadOrigFirstTen = UtilIT.downloadFile(fileIdCsv, "0-9", "original", null, authorApiToken);
+        downloadOrigFirstTen.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("name,pound"));
+
+        // last ten bytes
+        Response downloadOrigLastTen = UtilIT.downloadFile(fileIdCsv, "-10", "original", null, authorApiToken);
+        downloadOrigLastTen.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("er,21,cat\n"));
+
+        // middle bytes
+        Response downloadOrigMiddle = UtilIT.downloadFile(fileIdCsv, "29-39", "original", null, authorApiToken);
+        downloadOrigMiddle.then().assertThat()
+                .statusCode(PARTIAL_CONTENT.getStatusCode())
+                .body(equalTo("40,dog\nTige"));
+
+        String pathToZipWithImage = "scripts/search/data/binary/trees.zip";
+        Response uploadFileZipWithImage = UtilIT.uploadFileViaNative(datasetId.toString(), pathToZipWithImage, authorApiToken);
+//        uploadFileZipWithImage.prettyPrint();
+        uploadFileZipWithImage.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("trees.png"));
+
+        Integer fileIdPng = JsonPath.from(uploadFileZipWithImage.body().asString()).getInt("data.files[0].dataFile.id");
+
+        String trueOrWidthInPixels = "true";
+        Response getFileThumbnailImageA = UtilIT.getFileThumbnail(fileIdPng.toString(), trueOrWidthInPixels, authorApiToken);
+        getFileThumbnailImageA.then().assertThat()
+                .contentType("image/png")
+                .statusCode(OK.getStatusCode());
+
+        // Yes, you can get a range of bytes from a thumbnail.
+        String imageThumbPixels = "true";
+        Response downloadThumbnail = UtilIT.downloadFile(fileIdPng, "0-149", null, imageThumbPixels, authorApiToken);
+//        downloadThumbnail.prettyPrint();
+        downloadThumbnail.then().assertThat().statusCode(PARTIAL_CONTENT.getStatusCode());
+
+        Response multipleRangesNotSupported = UtilIT.downloadFile(fileIdTxt, "0-9,20-29", null, null, authorApiToken);
+        // "Error due to Range header: Only one range is allowed."
+        multipleRangesNotSupported.prettyPrint();
+        multipleRangesNotSupported.then().assertThat().statusCode(REQUESTED_RANGE_NOT_SATISFIABLE.getStatusCode());
+
+        Response startLargerThanEndError = UtilIT.downloadFile(fileIdTxt, "20-10", null, null, authorApiToken);
+        // "Error due to Range header: Start is larger than end or size of file."
+        startLargerThanEndError.prettyPrint();
+        startLargerThanEndError.then().assertThat().statusCode(REQUESTED_RANGE_NOT_SATISFIABLE.getStatusCode());
+
+        Response rangeBeyondFileSize = UtilIT.downloadFile(fileIdTxt, "88888-99999", null, null, authorApiToken);
+        // "Error due to Range header: Start is larger than end or size of file."
+        rangeBeyondFileSize.prettyPrint();
+        rangeBeyondFileSize.then().assertThat().statusCode(REQUESTED_RANGE_NOT_SATISFIABLE.getStatusCode());
+
+//        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, authorApiToken);
+//        publishDataverse.then().assertThat().statusCode(OK.getStatusCode());
+//        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", authorApiToken);
+//        publishDataset.then().assertThat().statusCode(OK.getStatusCode());
+
+    }
+
+    @Test
+    public void testAddFileToDatasetSkipTabIngest() throws IOException, InterruptedException {
+
+        Response createUser = UtilIT.createRandomUser();
+        assertEquals(200, createUser.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        assertEquals(201, createDataverseResponse.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        assertEquals(201, createDatasetResponse.getStatusCode());
+        Integer datasetIdInt = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        String pathToFile = "src/test/resources/sav/dct.sav";
+        String jsonAsString = "{\"description\":\"My description.\",\"directoryLabel\":\"data/subdir1\",\"categories\":[\"Data\"], \"restrict\":\"false\", \"tabIngest\":\"false\"}";
+        Response r = UtilIT.uploadFileViaNative(datasetIdInt.toString(), pathToFile, jsonAsString, apiToken);
+        logger.info(r.prettyPrint());
+        assertEquals(200, r.getStatusCode());
+
+        assertTrue(UtilIT.sleepForLock(datasetIdInt, "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        Long dataFileId = JsonPath.from(r.body().asString()).getLong("data.files[0].dataFile.id");
+        Response fileMeta = UtilIT.getDataFileMetadataDraft(dataFileId, apiToken);
+        String label = JsonPath.from(fileMeta.body().asString()).getString("label");
+        assertEquals("dct.sav", label);
+
+        pathToFile = "src/test/resources/sav/frequency-test.sav";
+        jsonAsString = "{\"description\":\"My description.\",\"directoryLabel\":\"data/subdir1\",\"categories\":[\"Data\"], \"restrict\":\"false\"  }";
+        Response rTabIngest = UtilIT.uploadFileViaNative(datasetIdInt.toString(), pathToFile, jsonAsString, apiToken);
+        logger.info(rTabIngest.prettyPrint());
+        assertEquals(200, rTabIngest.getStatusCode());
+
+        assertTrue(UtilIT.sleepForLock(datasetIdInt, "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        Long ingDataFileId = JsonPath.from(rTabIngest.body().asString()).getLong("data.files[0].dataFile.id");
+        Response ingFileMeta = UtilIT.getDataFileMetadataDraft(ingDataFileId, apiToken);
+        String ingLabel = JsonPath.from(ingFileMeta.body().asString()).getString("label");
+        assertEquals("frequency-test.tab", ingLabel);
+
+        //cleanup
+        Response destroyDatasetResponse = UtilIT.destroyDataset(datasetIdInt, apiToken);
+        assertEquals(200, destroyDatasetResponse.getStatusCode());
+
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        assertEquals(200, deleteDataverseResponse.getStatusCode());
+
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        assertEquals(200, deleteUserResponse.getStatusCode());
+
+    }
+
+    @Test
+    public void testDeleteFile() {
+        msgt("testDeleteFile");
+        // Create user
+        String apiToken = createUserGetToken();
+
+        // Create user with no permission
+        String apiTokenNoPerms = createUserGetToken();
+
+        // Create Dataverse
+        String dataverseAlias = createDataverseGetAlias(apiToken);
+
+        // Create Dataset
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        // Upload file 1
+        String pathToFile1 = "src/main/webapp/resources/images/dataverseproject.png";
+        JsonObjectBuilder json1 = Json.createObjectBuilder()
+                .add("description", "my description1")
+                .add("directoryLabel", "data/subdir1")
+                .add("categories", Json.createArrayBuilder().add("Data"));
+        Response uploadResponse1 = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile1, json1.build(), apiToken);
+        uploadResponse1.then().assertThat().statusCode(OK.getStatusCode());
+
+        Integer fileId1 = JsonPath.from(uploadResponse1.body().asString()).getInt("data.files[0].dataFile.id");
+
+        // Check file uploaded
+        Response downloadResponse1 = UtilIT.downloadFile(fileId1, null, null, null, apiToken);
+        downloadResponse1.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Delete file 1
+        Response deleteResponseFail = UtilIT.deleteFileApi(fileId1, apiTokenNoPerms);
+        deleteResponseFail.prettyPrint();
+        deleteResponseFail.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+
+        Response deleteResponse1 = UtilIT.deleteFileApi(fileId1, apiToken);
+        deleteResponse1.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Check file 1 deleted for good because it was in a draft
+        Response downloadResponse1notFound = UtilIT.downloadFile(fileId1, null, null, null, apiToken);
+        downloadResponse1notFound.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        // Upload file 2
+        String pathToFile2 = "src/main/webapp/resources/images/cc0.png";
+        JsonObjectBuilder json2 = Json.createObjectBuilder()
+                .add("description", "my description2")
+                .add("directoryLabel", "data/subdir1")
+                .add("categories", Json.createArrayBuilder().add("Data"));
+        Response uploadResponse2 = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile2, json2.build(), apiToken);
+        uploadResponse2.then().assertThat().statusCode(OK.getStatusCode());
+
+        Integer fileId2 = JsonPath.from(uploadResponse2.body().asString()).getInt("data.files[0].dataFile.id");
+
+        // Upload file 3
+        String pathToFile3 = "src/main/webapp/resources/images/orcid_16x16.png";
+        JsonObjectBuilder json3 = Json.createObjectBuilder()
+                .add("description", "my description3")
+                .add("directoryLabel", "data/subdir1")
+                .add("categories", Json.createArrayBuilder().add("Data"));
+        Response uploadResponse3 = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile3, json3.build(), apiToken);
+        uploadResponse3.then().assertThat().statusCode(OK.getStatusCode());
+
+        Integer fileId3 = JsonPath.from(uploadResponse3.body().asString()).getInt("data.files[0].dataFile.id");
+
+        // Publish collection and dataset
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deleteResponse2 = UtilIT.deleteFileApi(fileId2, apiToken);
+        deleteResponse2.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Check file 2 deleted from post v1.0 draft
+        Response postv1draft = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiToken);
+        postv1draft.prettyPrint();
+        postv1draft.then().assertThat()
+                .body("data.files.size()", equalTo(1))
+                .statusCode(OK.getStatusCode());
+
+        // Check file 2 still in v1.0
+        Response v1 = UtilIT.getDatasetVersion(datasetPid, "1.0", apiToken);
+        v1.prettyPrint();
+        v1.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        Map<String, Object> v1files1 = with(v1.body().asString()).param("fileToFind", "cc0.png")
+                .getJsonObject("data.files.find { files -> files.label == fileToFind }");
+        assertEquals("cc0.png", v1files1.get("label"));
+
+        // Check file 2 still downloadable (published in in v1.0)
+        Response downloadResponse2 = UtilIT.downloadFile(fileId2, null, null, null, apiToken);
+        downloadResponse2.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Check file 3 still in post v1.0 draft
+        Response postv1draft2 = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiToken);
+        postv1draft2.prettyPrint();
+        postv1draft2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        Map<String, Object> v1files2 = with(postv1draft2.body().asString()).param("fileToFind", "orcid_16x16.png")
+                .getJsonObject("data.files.find { files -> files.label == fileToFind }");
+        assertEquals("orcid_16x16.png", v1files2.get("label"));
+
+        // Delete file 3, the current version is still draft
+        Response deleteResponse3 = UtilIT.deleteFileApi(fileId3, apiToken);
+        deleteResponse3.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Check file 3 deleted from post v1.0 draft
+        Response postv1draft3 = UtilIT.getDatasetVersion(datasetPid, DS_VERSION_DRAFT, apiToken);
+        postv1draft3.prettyPrint();
+        postv1draft3.then().assertThat()
+                .body("data.files[0]", equalTo(null))
+                .statusCode(OK.getStatusCode());
+    }
+    
+    // The following specifically tests file-level PIDs configuration in 
+    // individual collections (#8889/#9614)
+    @Test
+    public void testFilePIDsBehavior() {
+        // Create user
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(username);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        try {
+            UtilIT.enableSetting(SettingsServiceBean.Key.FilePIDsEnabled);
+
+            // Create Dataverse
+            String collectionAlias = createDataverseGetAlias(apiToken);
+
+            // Create Initial Dataset with 1 file:
+            Integer datasetId = createDatasetGetId(collectionAlias, apiToken);
+            String pathToFile = "scripts/search/data/replace_test/003.txt";
+            Response addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+
+            addResponse.then().assertThat().body("data.files[0].dataFile.contentType", equalTo("text/plain"))
+                    .body("data.files[0].label", equalTo("003.txt")).statusCode(OK.getStatusCode());
+
+            Long origFileId = JsonPath.from(addResponse.body().asString()).getLong("data.files[0].dataFile.id");
+
+            // -------------------------
+            // Publish dataverse and dataset
+            // -------------------------
+            msg("Publish dataverse and dataset");
+            Response publishCollectionResp = UtilIT.publishDataverseViaSword(collectionAlias, apiToken);
+            publishCollectionResp.then().assertThat().statusCode(OK.getStatusCode());
+
+            Response publishDatasetResp = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+            publishDatasetResp.then().assertThat().statusCode(OK.getStatusCode());
+
+            // The file in this dataset should have been assigned a PID when it was
+            // published:
+            Response fileInfoResponse = UtilIT.getFileData(origFileId.toString(), apiToken);
+            fileInfoResponse.then().assertThat().statusCode(OK.getStatusCode());
+            String fileInfoResponseString = fileInfoResponse.body().asString();
+            msg(fileInfoResponseString);
+
+            String origFilePersistentId = JsonPath.from(fileInfoResponseString).getString("data.dataFile.persistentId");
+            assertNotNull(
+                    "The file did not get a persistent identifier assigned (check that file PIDs are enabled instance-wide!)",
+                    origFilePersistentId);
+
+            // Now change the file PIDs registration configuration for the collection:
+            UtilIT.enableSetting(SettingsServiceBean.Key.AllowEnablingFilePIDsPerCollection);
+            Response changeAttributeResp = UtilIT.setCollectionAttribute(collectionAlias, "filePIDsEnabled", "false",
+                    apiToken);
+
+            // ... And do the whole thing with creating another dataset with a file:
+
+            datasetId = createDatasetGetId(collectionAlias, apiToken);
+            addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+            addResponse.then().assertThat().statusCode(OK.getStatusCode());
+            Long newFileId = JsonPath.from(addResponse.body().asString()).getLong("data.files[0].dataFile.id");
+
+            // And publish this dataset:
+            msg("Publish second dataset");
+
+            publishDatasetResp = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+            publishDatasetResp.then().assertThat().statusCode(OK.getStatusCode());
+
+            // And confirm that the file didn't get a PID:
+
+            fileInfoResponse = UtilIT.getFileData(newFileId.toString(), apiToken);
+            fileInfoResponse.then().assertThat().statusCode(OK.getStatusCode());
+            fileInfoResponseString = fileInfoResponse.body().asString();
+            msg(fileInfoResponseString);
+
+            assertEquals("", JsonPath.from(fileInfoResponseString).getString("data.dataFile.persistentId"),
+                "The file was NOT supposed to be issued a PID");
+        } finally {
+            UtilIT.deleteSetting(SettingsServiceBean.Key.FilePIDsEnabled);
+            UtilIT.deleteSetting(SettingsServiceBean.Key.AllowEnablingFilePIDsPerCollection);
+        }
+    }
+
+    @Test
+    public void testGetFileDownloadCount() throws InterruptedException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // Upload test file
+        String pathToTestFile = "src/test/resources/images/coffeeshop.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Publish collection and dataset
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        // Download test file
+        int testFileId = JsonPath.from(uploadResponse.body().asString()).getInt("data.files[0].dataFile.id");
+
+        Response downloadResponse = UtilIT.downloadFile(testFileId, apiToken);
+        downloadResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Ensure download count is updated
+        sleep(2000);
+
+        // Get download count and assert it is 1
+        Response getFileDownloadCountResponse = UtilIT.getFileDownloadCount(Integer.toString(testFileId), apiToken);
+        getFileDownloadCountResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("1"));
+
+        // Call with invalid file id
+        Response getFileDownloadCountInvalidIdResponse = UtilIT.getFileDownloadCount("testInvalidId", apiToken);
+        getFileDownloadCountInvalidIdResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+    }
+
+    @Test
+    public void testGetFileDataTables() throws InterruptedException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // Upload non-tabular file
+        String pathToNonTabularTestFile = "src/test/resources/images/coffeeshop.png";
+        Response uploadNonTabularFileResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToNonTabularTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadNonTabularFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Assert that getting data tables for non-tabular file fails
+        int testNonTabularFileId = JsonPath.from(uploadNonTabularFileResponse.body().asString()).getInt("data.files[0].dataFile.id");
+        Response getFileDataTablesForNonTabularFileResponse = UtilIT.getFileDataTables(Integer.toString(testNonTabularFileId), apiToken);
+        getFileDataTablesForNonTabularFileResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+
+        // Upload tabular file
+        String pathToTabularTestFile = "src/test/resources/tab/test.tab";
+        Response uploadTabularFileResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTabularTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadTabularFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Ensure tabular file is ingested
+        sleep(2000);
+
+        String testTabularFileId = Integer.toString(JsonPath.from(uploadTabularFileResponse.body().asString()).getInt("data.files[0].dataFile.id"));
+
+        // Get file data tables for the tabular file and assert data is obtained
+        Response getFileDataTablesForTabularFileResponse = UtilIT.getFileDataTables(testTabularFileId, apiToken);
+        getFileDataTablesForTabularFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+        int dataTablesNumber = JsonPath.from(getFileDataTablesForTabularFileResponse.body().asString()).getList("data").size();
+        assertTrue(dataTablesNumber > 0);
+
+        // Get file data tables for a restricted tabular file as the owner and assert data is obtained
+        Response restrictFileResponse = UtilIT.restrictFile(testTabularFileId, true, apiToken);
+        restrictFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+        getFileDataTablesForTabularFileResponse = UtilIT.getFileDataTables(testTabularFileId, apiToken);
+        getFileDataTablesForTabularFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Get file data tables for a restricted tabular file as other user and assert forbidden error is thrown
+        Response createRandomUser = UtilIT.createRandomUser();
+        createRandomUser.then().assertThat().statusCode(OK.getStatusCode());
+        String randomUserApiToken = UtilIT.getApiTokenFromResponse(createRandomUser);
+        getFileDataTablesForTabularFileResponse = UtilIT.getFileDataTables(testTabularFileId, randomUserApiToken);
+        getFileDataTablesForTabularFileResponse.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+    }
+
+    @Test
+    public void testSetFileCategories() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // Upload test file
+        String pathToTestFile = "src/test/resources/images/coffeeshop.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        String dataFileId = uploadResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+
+        // Set categories
+        String testCategory0 = "testCategory0";
+        List<String> testCategories = List.of(testCategory0);
+        Response setFileCategoriesResponse = UtilIT.setFileCategories(dataFileId, apiToken, testCategories);
+        setFileCategoriesResponse.then().assertThat().statusCode(OK.getStatusCode());
+        // Get file data and check for new categories
+        Response getFileDataResponse = UtilIT.getFileData(dataFileId, apiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("data.categories", hasItem(testCategory0))
+                .statusCode(OK.getStatusCode());
+        // Set categories
+        String testCategory1 = "testCategory1";
+        String testCategory2 = "testCategory2";
+        testCategories = List.of(testCategory1, testCategory2);
+        setFileCategoriesResponse = UtilIT.setFileCategories(dataFileId, apiToken, testCategories);
+        setFileCategoriesResponse.then().assertThat().statusCode(OK.getStatusCode());
+        // Get file data and check for new categories + original category
+        getFileDataResponse = UtilIT.getFileData(dataFileId, apiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("data.categories", hasItem(testCategory0))
+                .body("data.categories", hasItem(testCategory1))
+                .body("data.categories", hasItem(testCategory2))
+                .statusCode(OK.getStatusCode());
+        // test replace categories
+        testCategories = List.of(testCategory1, testCategory2);
+        setFileCategoriesResponse = UtilIT.setFileCategories(dataFileId, apiToken, testCategories, true);
+        setFileCategoriesResponse.then().assertThat().statusCode(OK.getStatusCode());
+        // Get file data and check for new categories only
+        getFileDataResponse = UtilIT.getFileData(dataFileId, apiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("data.categories", not(hasItem(testCategory0)))
+                .body("data.categories", hasItem(testCategory1))
+                .body("data.categories", hasItem(testCategory2))
+                .statusCode(OK.getStatusCode());
+        // Test clear all categories by passing empty list
+        setFileCategoriesResponse = UtilIT.setFileCategories(dataFileId, apiToken, Lists.emptyList(), true);
+        setFileCategoriesResponse.then().assertThat().statusCode(OK.getStatusCode());
+        getFileDataResponse = UtilIT.getFileData(dataFileId, apiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("data.dataFile", not(hasItem("categories")))
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testSetFileTabularTags() throws InterruptedException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // Upload tabular file
+        String pathToTabularTestFile = "src/test/resources/tab/test.tab";
+        Response uploadTabularFileResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTabularTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadTabularFileResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        String tabularFileId = uploadTabularFileResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+
+        // Ensure tabular file is ingested
+        sleep(2000);
+
+        // Set tabular tags
+        String testTabularTag1 = "Survey";
+        String testTabularTag2 = "Genomics";
+        // We repeat one to test that it is not duplicated
+        String testTabularTag3 = "Genomics";
+        List<String> testTabularTags = List.of(testTabularTag1, testTabularTag2, testTabularTag3);
+        Response setFileTabularTagsResponse = UtilIT.setFileTabularTags(tabularFileId, apiToken, testTabularTags);
+        setFileTabularTagsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Get file data and check for new tabular tags
+        Response getFileDataResponse = UtilIT.getFileData(tabularFileId, apiToken);
+        getFileDataResponse.then().assertThat()
+                .body("data.dataFile.tabularTags", hasItem(testTabularTag1))
+                .body("data.dataFile.tabularTags", hasItem(testTabularTag2))
+                .statusCode(OK.getStatusCode());
+
+        int actualTabularTagsCount = getFileDataResponse.jsonPath().getList("data.dataFile.tabularTags").size();
+        assertEquals(2, actualTabularTagsCount);
+
+        // Set invalid tabular tag
+        String testInvalidTabularTag = "Invalid";
+        setFileTabularTagsResponse = UtilIT.setFileTabularTags(tabularFileId, apiToken, List.of(testInvalidTabularTag));
+        setFileTabularTagsResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+
+        // Get file data and check tabular tags are unaltered
+        getFileDataResponse = UtilIT.getFileData(tabularFileId, apiToken);
+        getFileDataResponse.then().assertThat()
+                .body("data.dataFile.tabularTags", hasItem(testTabularTag1))
+                .body("data.dataFile.tabularTags", hasItem(testTabularTag2))
+                .statusCode(OK.getStatusCode());
+
+        actualTabularTagsCount = getFileDataResponse.jsonPath().getList("data.dataFile.tabularTags").size();
+        assertEquals(2, actualTabularTagsCount);
+
+        // Should receive an error when calling the endpoint for a non-tabular file
+        String pathToTestFile = "src/test/resources/images/coffeeshop.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        String nonTabularFileId = uploadResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+
+        setFileTabularTagsResponse = UtilIT.setFileTabularTags(nonTabularFileId, apiToken, List.of(testInvalidTabularTag));
+        setFileTabularTagsResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+
+        // Test set with replaceData = true to show that the list is replaced and not added to
+        setFileTabularTagsResponse = UtilIT.setFileTabularTags(tabularFileId, apiToken, List.of("Geospatial"), true);
+        setFileTabularTagsResponse.then().assertThat().statusCode(OK.getStatusCode());
+        getFileDataResponse = UtilIT.getFileData(tabularFileId, apiToken);
+        actualTabularTagsCount = getFileDataResponse.jsonPath().getList("data.dataFile.tabularTags").size();
+        assertEquals(1, actualTabularTagsCount);
+        // Test clear all tags by passing empty list
+        setFileTabularTagsResponse = UtilIT.setFileTabularTags(tabularFileId, apiToken, Lists.emptyList(), true);
+        setFileTabularTagsResponse.then().assertThat().statusCode(OK.getStatusCode());
+        getFileDataResponse = UtilIT.getFileData(tabularFileId, apiToken);
+        getFileDataResponse.prettyPrint();
+        getFileDataResponse.then().assertThat()
+                .body("data.dataFile", not(hasItem("tabularTags")))
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testGetHasBeenDeleted() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // Upload test file
+        String pathToTestFile = "src/test/resources/images/coffeeshop.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        String dataFileId = uploadResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
+
+        // Publish dataverse and dataset
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Assert that the file has not been deleted
+        Response getHasBeenDeletedResponse = UtilIT.getHasBeenDeleted(dataFileId, apiToken);
+        getHasBeenDeletedResponse.then().assertThat().statusCode(OK.getStatusCode());
+        boolean fileHasBeenDeleted = JsonPath.from(getHasBeenDeletedResponse.body().asString()).getBoolean("data");
+        assertFalse(fileHasBeenDeleted);
+
+        // Delete test file
+        Response deleteFileInDatasetResponse = UtilIT.deleteFileInDataset(Integer.parseInt(dataFileId), apiToken);
+        deleteFileInDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Assert that the file has been deleted
+        getHasBeenDeletedResponse = UtilIT.getHasBeenDeleted(dataFileId, apiToken);
+        getHasBeenDeletedResponse.then().assertThat().statusCode(OK.getStatusCode());
+        fileHasBeenDeleted = JsonPath.from(getHasBeenDeletedResponse.body().asString()).getBoolean("data");
+        assertTrue(fileHasBeenDeleted);
+    }
+    
+    @Test
+    public void testCollectionStorageQuotas() {
+        // A minimal storage quota functionality test: 
+        // - We create a collection and define a storage quota
+        // - We configure Dataverse to enforce it 
+        // - We confirm that we can upload a file with the size under the quota
+        // - We confirm that we cannot upload a file once the quota is reached
+        // - We disable the quota on the collection via the API
+        
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        
+        System.out.println("dataset id: "+datasetId);
+        
+        Response checkQuotaResponse = UtilIT.checkCollectionQuota(dataverseAlias, apiToken);
+        checkQuotaResponse.then().assertThat().statusCode(OK.getStatusCode());
+        // This brand new collection shouldn't have any quota defined yet: 
+        assertEquals(BundleUtil.getStringFromBundle("dataverse.storage.quota.notdefined"), JsonPath.from(checkQuotaResponse.body().asString()).getString("data.message"));
+        
+        // Set quota to 1K:
+        Response setQuotaResponse = UtilIT.setCollectionQuota(dataverseAlias, 1024, apiToken);
+        setQuotaResponse.then().assertThat().statusCode(OK.getStatusCode());
+        assertEquals(BundleUtil.getStringFromBundle("dataverse.storage.quota.updated"), JsonPath.from(setQuotaResponse.body().asString()).getString("data.message"));
+        
+        // Check again:
+        checkQuotaResponse = UtilIT.checkCollectionQuota(dataverseAlias, apiToken);
+        checkQuotaResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String expectedApiMessage = BundleUtil.getStringFromBundle("dataverse.storage.quota.allocation", Arrays.asList("1,024"));
+        assertEquals(expectedApiMessage, JsonPath.from(checkQuotaResponse.body().asString()).getString("data.message"));
+
+        System.out.println(expectedApiMessage);
+        
+        UtilIT.enableSetting(SettingsServiceBean.Key.UseStorageQuotas);
+                
+        String pathToFile306bytes = "src/test/resources/FileRecordJobIT.properties"; 
+        String pathToFile1787bytes = "src/test/resources/datacite.xml";
+
+        // Upload a small file: 
+        
+        Response uploadResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToFile306bytes, Json.createObjectBuilder().build(), apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+        
+        // Check the recorded storage use: 
+        
+        Response checkStorageUseResponse = UtilIT.checkCollectionStorageUse(dataverseAlias, apiToken);
+        checkStorageUseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        expectedApiMessage = BundleUtil.getStringFromBundle("dataverse.storage.use", Arrays.asList("306"));
+        assertEquals(expectedApiMessage, JsonPath.from(checkStorageUseResponse.body().asString()).getString("data.message"));
+
+        System.out.println(expectedApiMessage);
+        
+        // Attempt to upload the second file - this should get us over the quota, 
+        // so it should be rejected:
+        
+        uploadResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToFile1787bytes, Json.createObjectBuilder().build(), apiToken);
+        uploadResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+        // We should get this error message made up from 2 Bundle strings:
+        expectedApiMessage = BundleUtil.getStringFromBundle("file.addreplace.error.ingest_create_file_err");
+        expectedApiMessage = expectedApiMessage + " " + BundleUtil.getStringFromBundle("file.addreplace.error.quota_exceeded", Arrays.asList("1.7 KB", "718 B"));
+        assertEquals(expectedApiMessage, JsonPath.from(uploadResponse.body().asString()).getString("message"));
+        
+        System.out.println(expectedApiMessage);
+        
+        // Check Storage Use again - should be unchanged: 
+        
+        checkStorageUseResponse = UtilIT.checkCollectionStorageUse(dataverseAlias, apiToken);
+        checkStorageUseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        expectedApiMessage = BundleUtil.getStringFromBundle("dataverse.storage.use", Arrays.asList("306"));
+        assertEquals(expectedApiMessage, JsonPath.from(checkStorageUseResponse.body().asString()).getString("data.message"));
+
+        // Disable the quota on the collection; try again:
+        
+        Response disableQuotaResponse = UtilIT.disableCollectionQuota(dataverseAlias, apiToken);
+        disableQuotaResponse.then().assertThat().statusCode(OK.getStatusCode());
+        expectedApiMessage = BundleUtil.getStringFromBundle("dataverse.storage.quota.deleted");
+        assertEquals(expectedApiMessage, JsonPath.from(disableQuotaResponse.body().asString()).getString("data.message"));
+
+        // Check again: 
+        
+        checkQuotaResponse = UtilIT.checkCollectionQuota(dataverseAlias, apiToken);
+        checkQuotaResponse.then().assertThat().statusCode(OK.getStatusCode());
+        // ... should say "no quota", again: 
+        assertEquals(BundleUtil.getStringFromBundle("dataverse.storage.quota.notdefined"), JsonPath.from(checkQuotaResponse.body().asString()).getString("data.message"));
+        
+        // And try to upload the larger file again:
+        
+        uploadResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToFile1787bytes, Json.createObjectBuilder().build(), apiToken);
+        // ... should work this time around:
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+            
+        // Let's confirm that the total storage use has been properly implemented:
+
+        //try {sleep(1000);}catch(InterruptedException ie){}
+        
+        checkStorageUseResponse = UtilIT.checkCollectionStorageUse(dataverseAlias, apiToken);
+        checkStorageUseResponse.then().assertThat().statusCode(OK.getStatusCode());
+        expectedApiMessage = BundleUtil.getStringFromBundle("dataverse.storage.use", Arrays.asList("2,093"));
+        assertEquals(expectedApiMessage, JsonPath.from(checkStorageUseResponse.body().asString()).getString("data.message"));
+
+        System.out.println(expectedApiMessage);
+        
+        // @todo: a test for the storage use hierarchy? - create a couple of 
+        // sub-collections, upload a file into a dataset in the farthest branch 
+        // collection, make sure the usage has been incremented all the way up 
+        // to the root? 
+        
+        UtilIT.deleteSetting(SettingsServiceBean.Key.UseStorageQuotas);
+    }
+    
+    @Test
+    public void testIngestWithAndWithoutVariableHeader() throws NoSuchAlgorithmException {
+        msgt("testIngestWithAndWithoutVariableHeader");
+        
+        // The compact Stata file we'll be using for this test: 
+        // (this file is provided by Stata inc. - it's genuine quality)
+        String pathToFile = "scripts/search/data/tabular/stata13-auto.dta";
+        // The pre-calculated MD5 signature of the *complete* tab-delimited 
+        // file as seen by the final Access API user (i.e., with the variable 
+        // header line in it):
+        String tabularFileMD5 = "f298c2567cc8eb544e36ad83edf6f595";
+        // Expected byte sizes of the generated tab-delimited file as stored, 
+        // with and without the header:
+        int tabularFileSizeWoutHeader = 4026; 
+        int tabularFileSizeWithHeader = 4113; 
+
+        String apiToken = createUserGetToken();
+        String dataverseAlias = createDataverseGetAlias(apiToken);
+        Integer datasetIdA = createDatasetGetId(dataverseAlias, apiToken);
+        
+        // Before we do anything else, make sure that the instance is configured 
+        // the "old" way, i.e., to store ingested files without the headers:
+        UtilIT.deleteSetting(SettingsServiceBean.Key.StoreIngestedTabularFilesWithVarHeaders);
+        
+        Response addResponse = UtilIT.uploadFileViaNative(datasetIdA.toString(), pathToFile, apiToken);
+        addResponse.prettyPrint();
+
+        addResponse.then().assertThat()
+                .body("data.files[0].dataFile.contentType", equalTo("application/x-stata-13"))
+                .body("data.files[0].label", equalTo("stata13-auto.dta"))
+                .statusCode(OK.getStatusCode());
+
+        Long fileIdA = JsonPath.from(addResponse.body().asString()).getLong("data.files[0].dataFile.id");
+        assertNotNull(fileIdA);
+
+        // Give file time to ingest
+        assertTrue(UtilIT.sleepForLock(datasetIdA.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile + "(A)");
+
+        // Check the metadata to confirm that the file has ingested: 
+
+        Response fileDataResponse = UtilIT.getFileData(fileIdA.toString(), apiToken);
+        fileDataResponse.prettyPrint();
+        fileDataResponse.then().assertThat()
+                .body("data.dataFile.filename", equalTo("stata13-auto.tab"))
+                .body("data.dataFile.contentType", equalTo("text/tab-separated-values"))
+                .body("data.dataFile.filesize", equalTo(tabularFileSizeWoutHeader))
+                .statusCode(OK.getStatusCode());
+        
+
+        // Download the file, verify the checksum: 
+
+        Response fileDownloadResponse = UtilIT.downloadFile(fileIdA.intValue(), apiToken);
+        fileDownloadResponse.then().assertThat()
+                .statusCode(OK.getStatusCode()); 
+        
+        byte[] fileDownloadBytes = fileDownloadResponse.body().asByteArray(); 
+        MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+        messageDigest.update(fileDownloadBytes);
+        byte[] rawDigestBytes = messageDigest.digest();
+        String tabularFileMD5calculated = FileUtil.checksumDigestToString(rawDigestBytes);
+        
+        msgt("md5 of the downloaded file (saved without the variable name header): "+tabularFileMD5calculated);
+        
+        assertEquals(tabularFileMD5, tabularFileMD5calculated);
+
+        // Repeat the whole thing, in another dataset (because we will be uploading 
+        // an identical file), but with the "store with the header setting enabled): 
+        
+        UtilIT.enableSetting(SettingsServiceBean.Key.StoreIngestedTabularFilesWithVarHeaders);
+        
+        Integer datasetIdB = createDatasetGetId(dataverseAlias, apiToken);
+        
+        addResponse = UtilIT.uploadFileViaNative(datasetIdB.toString(), pathToFile, apiToken);
+        addResponse.prettyPrint();
+
+        addResponse.then().assertThat()
+                .body("data.files[0].dataFile.contentType", equalTo("application/x-stata-13"))
+                .body("data.files[0].label", equalTo("stata13-auto.dta"))
+                .statusCode(OK.getStatusCode());
+
+        Long fileIdB = JsonPath.from(addResponse.body().asString()).getLong("data.files[0].dataFile.id");
+        assertNotNull(fileIdB);
+
+        // Give file time to ingest
+        assertTrue(UtilIT.sleepForLock(datasetIdB.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile + "(B)");
+        
+        // Check the metadata to confirm that the file has ingested: 
+
+        fileDataResponse = UtilIT.getFileData(fileIdB.toString(), apiToken);
+        fileDataResponse.prettyPrint();
+        fileDataResponse.then().assertThat()
+                .body("data.dataFile.filename", equalTo("stata13-auto.tab"))
+                .body("data.dataFile.contentType", equalTo("text/tab-separated-values"))
+                .body("data.dataFile.filesize", equalTo(tabularFileSizeWithHeader))
+                .statusCode(OK.getStatusCode());
+        
+
+        // Download the file, verify the checksum, again
+
+        fileDownloadResponse = UtilIT.downloadFile(fileIdB.intValue(), apiToken);
+        fileDownloadResponse.then().assertThat()
+                .statusCode(OK.getStatusCode()); 
+        
+        fileDownloadBytes = fileDownloadResponse.body().asByteArray(); 
+        messageDigest.reset();
+        messageDigest.update(fileDownloadBytes);
+        rawDigestBytes = messageDigest.digest();
+        tabularFileMD5calculated = FileUtil.checksumDigestToString(rawDigestBytes);
+        
+        msgt("md5 of the downloaded file (saved with the variable name header): "+tabularFileMD5calculated);
+        
+        assertEquals(tabularFileMD5, tabularFileMD5calculated);
+
+        // In other words, whether the file was saved with, or without the header, 
+        // as downloaded by the user, the end result must be the same in both cases!
+        // In other words, whether that first line with the variable names is already
+        // in the physical file, or added by Dataverse on the fly, the downloaded
+        // content must be identical. 
+        
+        UtilIT.deleteSetting(SettingsServiceBean.Key.StoreIngestedTabularFilesWithVarHeaders);
+        
+        // @todo: cleanup? 
+    }
     
+
+    @Test
+    public void testFileCitationByVersion() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        String datasetPid = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+
+        String pathToTestFile = "src/test/resources/images/coffeeshop.png";
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToTestFile, Json.createObjectBuilder().build(), apiToken);
+        uploadFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        Integer fileId = JsonPath.from(uploadFile.body().asString()).getInt("data.files[0].dataFile.id");
+
+        String pidAsUrl = "https://doi.org/" + datasetPid.split("doi:")[1];
+        int currentYear = Year.now().getValue();
+
+        Response draftUnauthNoApitoken = UtilIT.getFileCitation(fileId, DS_VERSION_DRAFT, null);
+        draftUnauthNoApitoken.prettyPrint();
+        draftUnauthNoApitoken.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        Response createNoPermsUser = UtilIT.createRandomUser();
+        createNoPermsUser.then().assertThat().statusCode(OK.getStatusCode());
+        String noPermsApiToken = UtilIT.getApiTokenFromResponse(createNoPermsUser);
+
+        Response draftUnauthNoPermsApiToken = UtilIT.getFileCitation(fileId, DS_VERSION_DRAFT, noPermsApiToken);
+        draftUnauthNoPermsApiToken.prettyPrint();
+        draftUnauthNoPermsApiToken.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        Response getFileCitationDraft = UtilIT.getFileCitation(fileId, DS_VERSION_DRAFT, apiToken);
+        getFileCitationDraft.prettyPrint();
+        getFileCitationDraft.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Finch, Fiona, " + currentYear + ", \"Darwin's Finches\", <a href=\"" + pidAsUrl + "\" target=\"_blank\">" + pidAsUrl + "</a>, Root, DRAFT VERSION; coffeeshop.png [fileName]"));
+
+        Response publishDataverseResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverseResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDatasetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response publishedNoApiTokenNeeded = UtilIT.getFileCitation(fileId, "1.0", null);
+        publishedNoApiTokenNeeded.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response publishedNoPermsApiTokenAllowed = UtilIT.getFileCitation(fileId, "1.0", noPermsApiToken);
+        publishedNoPermsApiTokenAllowed.then().assertThat().statusCode(OK.getStatusCode());
+
+        String updateJsonString = """
+{
+    "label": "foo.png"
+}
+""";
+
+        Response updateMetadataResponse = UtilIT.updateFileMetadata(fileId.toString(), updateJsonString, apiToken);
+        updateMetadataResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), updateMetadataResponse.getStatusCode());
+
+        Response getFileCitationPostV1Draft = UtilIT.getFileCitation(fileId, DS_VERSION_DRAFT, apiToken);
+        getFileCitationPostV1Draft.prettyPrint();
+        getFileCitationPostV1Draft.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Finch, Fiona, " + currentYear + ", \"Darwin's Finches\", <a href=\"" + pidAsUrl + "\" target=\"_blank\">" + pidAsUrl + "</a>, Root, DRAFT VERSION; foo.png [fileName]"));
+
+        Response getFileCitationV1OldFilename = UtilIT.getFileCitation(fileId, "1.0", apiToken);
+        getFileCitationV1OldFilename.prettyPrint();
+        getFileCitationV1OldFilename.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Finch, Fiona, " + currentYear + ", \"Darwin's Finches\", <a href=\"" + pidAsUrl + "\" target=\"_blank\">" + pidAsUrl + "</a>, Root, V1; coffeeshop.png [fileName]"));
+
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken)
+                .then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deaccessionDataset = UtilIT.deaccessionDataset(datasetId, "1.0", "just because", "http://example.com", apiToken);
+        deaccessionDataset.prettyPrint();
+        deaccessionDataset.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getFileCitationV1PostDeaccessionAuthorDefault = UtilIT.getFileCitation(fileId, "1.0", apiToken);
+        getFileCitationV1PostDeaccessionAuthorDefault.prettyPrint();
+        getFileCitationV1PostDeaccessionAuthorDefault.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode());
+        
+        Response getFileCitationV1PostDeaccessionAuthorIncludeDeaccessioned = UtilIT.getFileCitation(fileId, "1.0", true, apiToken);
+        getFileCitationV1PostDeaccessionAuthorIncludeDeaccessioned.prettyPrint();
+        getFileCitationV1PostDeaccessionAuthorIncludeDeaccessioned.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Finch, Fiona, " + currentYear + ", \"Darwin's Finches\", <a href=\"" + pidAsUrl + "\" target=\"_blank\">" + pidAsUrl + "</a>, Root, V1, DEACCESSIONED VERSION; coffeeshop.png [fileName]"));
+
+        Response getFileCitationV1PostDeaccessionNoApiToken = UtilIT.getFileCitation(fileId, "1.0", null);
+        getFileCitationV1PostDeaccessionNoApiToken.prettyPrint();
+        getFileCitationV1PostDeaccessionNoApiToken.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
+                .body("message", equalTo("Dataset version cannot be found or unauthorized."));
+
+        Response getFileCitationV1PostDeaccessionNoPermsUser = UtilIT.getFileCitation(fileId, "1.0", noPermsApiToken);
+        getFileCitationV1PostDeaccessionNoPermsUser.prettyPrint();
+        getFileCitationV1PostDeaccessionNoPermsUser.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
+                .body("message", equalTo("Dataset version cannot be found or unauthorized."));
+
+    }
+
+    @Test
+    public void testUploadFilesWithLimits() throws JsonParseException {
+        Response createUser = UtilIT.createRandomUser();
+        assertEquals(200, createUser.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String adminApiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+
+        createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        // Update the dataverse with a datasetFileCountLimit of 1
+        JsonObject data = JsonUtil.getJsonObject(createDataverseResponse.getBody().asString());
+        JsonParser parser = new JsonParser();
+        Dataverse dv = parser.parseDataverse(data.getJsonObject("data"));
+        dv.setDatasetFileCountLimit(1);
+        Response updateDataverseResponse = UtilIT.updateDataverse(dataverseAlias, dv, adminApiToken);
+        updateDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(1))
+                .body("data.datasetFileCountLimit", equalTo(1));
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        String datasetPersistenceId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+        createDatasetResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        // -------------------------
+        // Add initial file
+        // -------------------------
+        String pathToFile = "scripts/search/data/tabular/50by1000.dta";
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFileResponse.prettyPrint();
+        uploadFileResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String fileId = String.valueOf(JsonPath.from(uploadFileResponse.body().asString()).getInt("data.files[0].dataFile.id"));
+
+        assertTrue(UtilIT.sleepForLock(datasetId, "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        // upload a second file should fail since the limit is 1 file per dataset
+        pathToFile = "scripts/search/data/tabular/open-source-at-harvard118.dta";
+        uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFileResponse.prettyPrint();
+        uploadFileResponse.then().assertThat()
+                .body("message", containsString(BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", Collections.singletonList("1"))))
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // Add 1 to file limit and upload a second file
+        dv.setDatasetFileCountLimit(2);
+        updateDataverseResponse = UtilIT.updateDataverse(dataverseAlias, dv, adminApiToken);
+        updateDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(2))
+                .body("data.datasetFileCountLimit", equalTo(2));
+        uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFileResponse.prettyPrint();
+        uploadFileResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertTrue(UtilIT.sleepForLock(datasetId, "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        // Set limit back to 1 even though the number of files is 2
+        dv.setDatasetFileCountLimit(1);
+        updateDataverseResponse = UtilIT.updateDataverse(dataverseAlias, dv, adminApiToken);
+        updateDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(1))
+                .body("data.datasetFileCountLimit", equalTo(1));
+
+        Response getDatasetResponse = UtilIT.getDatasetVersion(datasetPersistenceId, DS_VERSION_DRAFT, apiToken);
+        getDatasetResponse.prettyPrint();
+        getDatasetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(1))
+                .body("data.datasetFileUploadsAvailable", equalTo(0));
+
+        // Replace a file should be allowed
+        pathToFile = "scripts/search/data/tabular/120745.dta";
+        Response replaceFileResponse = UtilIT.replaceFile(fileId, pathToFile, apiToken);
+        replaceFileResponse.prettyPrint();
+        replaceFileResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertTrue(UtilIT.sleepForLock(datasetId, "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        // Superuser file uploads can exceed the limit!
+        pathToFile = "scripts/search/data/tabular/stata13-auto.dta";
+        uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, adminApiToken);
+        uploadFileResponse.prettyPrint();
+        uploadFileResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertTrue(UtilIT.sleepForLock(datasetId, "Ingest", adminApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+        // Test changing the limit by a non-superuser
+        dv.setDatasetFileCountLimit(100);
+        updateDataverseResponse = UtilIT.updateDataverse(dataverseAlias, dv, apiToken);
+        updateDataverseResponse.prettyPrint();
+        updateDataverseResponse.then().assertThat()
+                .body("message", containsString(BundleUtil.getStringFromBundle("file.dataset.error.set.file.count.limit")))
+                .statusCode(FORBIDDEN.getStatusCode());
+    }
+
+    @Test
+    public void testUpdateWithEmptyFieldsAndVersionCheck() throws InterruptedException {
+        // Create User, Dataverse, and Dataset
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        // Upload a tab file
+        JsonObjectBuilder json = Json.createObjectBuilder()
+                .add(OptionalFileParams.DESCRIPTION_ATTR_NAME, "my description")
+                .add(OptionalFileParams.DIRECTORY_LABEL_ATTR_NAME, "data/subdir1")
+                .add(OptionalFileParams.PROVENANCE_FREEFORM_ATTR_NAME, "prov Free Form")
+                .add(OptionalFileParams.CATEGORIES_ATTR_NAME, Json.createArrayBuilder().add("Data"));
+        String pathToTestFile = "src/test/resources/tab/test.tab";
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToTestFile, json.build(), apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat().statusCode(OK.getStatusCode());
+        Long fileId = JsonPath.from(uploadFile.body().asString()).getLong("data.files[0].dataFile.id");
+        assertTrue(UtilIT.sleepForLock(datasetId, "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToTestFile);
+
+        // Can't add tags until after the file is ingested and determined to be a tabular file
+        JsonObjectBuilder updateFileJson = Json.createObjectBuilder()
+                .add(OptionalFileParams.FILE_DATA_TAGS_ATTR_NAME, Json.createArrayBuilder().add("Survey"));
+        Response updateFileResponse = UtilIT.updateFileMetadata(String.valueOf(fileId), updateFileJson.build().toString(), apiToken);
+        updateFileResponse.prettyPrint();
+
+        // Get and verify the FileData
+        Response getFile = UtilIT.getFileData(String.valueOf(fileId), apiToken);
+        getFile.prettyPrint();
+        getFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.description", equalTo("my description"))
+                .body("data.dataFile.description", equalTo("my description"))
+                .body("data.directoryLabel", equalTo("data/subdir1"))
+                .body("data.categories", hasItem("Data"))
+                .body("data.dataFile.tabularTags", hasItem("Survey"));
+
+        // Publish the Dataverse and Dataset
+        Response publishResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishResponse.then().assertThat().statusCode(OK.getStatusCode());
+        publishResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Get the base version
+        getFile = UtilIT.getFileData(String.valueOf(fileId), apiToken);
+        getFile.prettyPrint();
+        String lastUpdateTime = String.valueOf(JsonPath.from(getFile.body().asString()).getString("data.dataFile.lastUpdateTime"));
+
+        // first user updates which creates a new DRAFT version
+        json = Json.createObjectBuilder()
+                .add(OptionalFileParams.DESCRIPTION_ATTR_NAME, "")
+                .add(OptionalFileParams.LABEL_ATTR_NAME, "test.tab")
+                .add(OptionalFileParams.DIRECTORY_LABEL_ATTR_NAME, "")
+                .add(OptionalFileParams.PROVENANCE_FREEFORM_ATTR_NAME, "")
+                .add(OptionalFileParams.CATEGORIES_ATTR_NAME, Json.createArrayBuilder())
+                .add(OptionalFileParams.FILE_DATA_TAGS_ATTR_NAME, Json.createArrayBuilder());
+        Response updateResponse = UtilIT.updateFileMetadata(String.valueOf(fileId), json.build().toString(), apiToken, lastUpdateTime);
+        updateResponse.prettyPrint();
+        updateResponse.then().assertThat().statusCode(OK.getStatusCode());
+        Thread.sleep(1500);
+
+        // Get the latest version
+        getFile = UtilIT.getFileData(String.valueOf(fileId), apiToken);
+        getFile.prettyPrint();
+        getFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.description", equalTo(""))
+                .body("data.dataFile.description", equalTo(""))
+                .body("data.directoryLabel", nullValue())
+                .body("data.provFreeForm",  nullValue())
+                .body("data.categories",  nullValue())
+                .body("data.dataFile.tabularTags", nullValue());
+        String latestUpdateTime = String.valueOf(JsonPath.from(getFile.body().asString()).getString("data.dataFile.lastUpdateTime"));
+        assertTrue(!latestUpdateTime.equalsIgnoreCase(lastUpdateTime));
+
+        // Second user updates the base version which should fail since it's already been updated
+        json = Json.createObjectBuilder()
+                .add(OptionalFileParams.DESCRIPTION_ATTR_NAME, "my new description");
+        updateResponse = UtilIT.updateFileMetadata(String.valueOf(fileId), json.build().toString(), apiToken, lastUpdateTime);
+        updateResponse.prettyPrint();
+        updateResponse.then().assertThat()
+                .body("status", equalTo(ApiConstants.STATUS_ERROR))
+                .body("message", equalTo(BundleUtil.getStringFromBundle("abstractApiBean.error.internalVersionTimestampIsOutdated",Collections.singletonList(lastUpdateTime))))
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // Second user refreshes and updates. Should pass now
+        getFile = UtilIT.getFileData(String.valueOf(fileId), apiToken);
+        getFile.prettyPrint();
+        getFile.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        lastUpdateTime = String.valueOf(JsonPath.from(getFile.body().asString()).getString("data.dataFile.lastUpdateTime"));
+        updateResponse = UtilIT.updateFileMetadata(String.valueOf(fileId), json.build().toString(), apiToken, lastUpdateTime);
+        updateResponse.prettyPrint();
+        updateResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Test invalid date
+        updateResponse = UtilIT.updateFileMetadata(String.valueOf(fileId), json.build().toString(), apiToken, "bad-date");
+        updateResponse.prettyPrint();
+        updateResponse.then().assertThat()
+                .body("status", equalTo(ApiConstants.STATUS_ERROR))
+                .body("message", equalTo(BundleUtil.getStringFromBundle("jsonparser.error.parsing.date",Collections.singletonList("bad-date"))))
+                .statusCode(BAD_REQUEST.getStatusCode());
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/FitsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/FitsIT.java
new file mode 100644
index 00000000000..e788efc9c87
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/FitsIT.java
@@ -0,0 +1,79 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import static io.restassured.path.json.JsonPath.with;
+import io.restassured.response.Response;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class FitsIT {
+
+    @BeforeAll
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testAstroFieldsFromFits() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response setMetadataBlocks = UtilIT.setMetadataBlocks(dataverseAlias, Json.createArrayBuilder().add("citation").add("astrophysics"), apiToken);
+        setMetadataBlocks.prettyPrint();
+        setMetadataBlocks.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        // "FOS 2 x 2064 primary array spectrum containing the flux and wavelength arrays, plus a small table extension"
+        // from https://fits.gsfc.nasa.gov/fits_samples.html
+        String pathToFile = "src/test/resources/fits/FOSy19g0309t_c2f.fits";
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getJson = UtilIT.nativeGet(datasetId, apiToken);
+        getJson.prettyPrint();
+        getJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.files[0].description", equalTo("FITS file, 2 HDUs total:\nThe primary HDU; 1 Table HDU(s) 1 Image HDU(s); \nThe following recognized metadata keys have been found in the FITS file:\nCRVAL2; NAXIS; INSTRUME; NAXIS1; NAXIS0; EXPTIME; CD1_1; CRVAL1; TARGNAME; DATE-OBS; \n"))
+                .body("data.latestVersion.metadataBlocks.astrophysics.fields[0].value[0]", equalTo("Image"));
+
+        // a bit more precise than the check for "Image" above (but annoyingly fiddly)
+        List<JsonObject> astroTypeFromNativeGet = with(getJson.body().asString()).param("astroType", "astroType")
+                .getJsonObject("data.latestVersion.metadataBlocks.astrophysics.fields.findAll { fields -> fields.typeName == astroType }");
+        Map firstAstroTypeFromNativeGet = astroTypeFromNativeGet.get(0);
+        assertTrue(firstAstroTypeFromNativeGet.toString().contains("Image"));
+
+        List<JsonObject> coverageTemportalFromNativeGet = with(getJson.body().asString()).param("coverageTemporal", "coverage.Temporal")
+                .getJsonObject("data.latestVersion.metadataBlocks.astrophysics.fields.findAll { fields -> fields.typeName == coverageTemporal }");
+        Map firstcoverageTemporalFromNativeGet = coverageTemportalFromNativeGet.get(0);
+        assertTrue(firstcoverageTemporalFromNativeGet.toString().contains("1993"));
+
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/GeoconnectIT.java b/src/test/java/edu/harvard/iq/dataverse/api/GeoconnectIT.java
deleted file mode 100644
index 2b18e3283d7..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/api/GeoconnectIT.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package edu.harvard.iq.dataverse.api;
-
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Response;
-import static javax.ws.rs.core.Response.Status.OK;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class GeoconnectIT {
-
-    @BeforeClass
-    public static void setUp() {
-        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
-    }
-
-//    @Ignore
-    @Test
-    public void checkMapLayerMetadatas() {
-        Response createUser = UtilIT.createRandomUser();
-        String username = UtilIT.getUsernameFromResponse(createUser);
-        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
-
-        Response checkMapLayerMetadatas = UtilIT.checkMapLayerMetadatas(apiToken);
-        checkMapLayerMetadatas.prettyPrint();
-        checkMapLayerMetadatas.then().assertThat()
-                .statusCode(OK.getStatusCode());
-    }
-
-//    @Ignore
-    @Test
-    public void checkSingleMapLayerMetadata() {
-        Response createUser = UtilIT.createRandomUser();
-        String username = UtilIT.getUsernameFromResponse(createUser);
-        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
-
-        Response checkMapLayerMetadatas = UtilIT.checkMapLayerMetadatas(1l, apiToken);
-        checkMapLayerMetadatas.prettyPrint();
-        checkMapLayerMetadatas.then().assertThat()
-                .statusCode(OK.getStatusCode());
-    }
-
-//    @Ignore
-    @Test
-    public void deleteMapFromFile() {
-        String apiToken = "b5a144d8-b3a3-452b-9543-131360884281";
-        long fileId = 2661;
-        Response deleteMapFromFile = UtilIT.deleteMapFromFile(fileId, apiToken);
-        deleteMapFromFile.prettyPrint();
-        deleteMapFromFile.then().assertThat()
-                .statusCode(OK.getStatusCode());
-    }
-
-}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/HarvestingClientsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/HarvestingClientsIT.java
new file mode 100644
index 00000000000..fe2a7f6c5ed
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/HarvestingClientsIT.java
@@ -0,0 +1,447 @@
+package edu.harvard.iq.dataverse.api;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+import io.restassured.RestAssured;
+import static io.restassured.RestAssured.given;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static jakarta.ws.rs.core.Response.Status.ACCEPTED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * This class tests Harvesting Client functionality. 
+ * Note that these methods test BOTH the proprietary Dataverse rest API for 
+ * creating and managing harvesting clients, AND the underlining OAI-PMH 
+ * harvesting functionality itself. I.e., we will use the Dataverse 
+ * /api/harvest/clients/ api to run an actual harvest of a control set and
+ * then validate the resulting harvested content. 
+ */
+public class HarvestingClientsIT {
+
+    private static final Logger logger = Logger.getLogger(HarvestingClientsIT.class.getCanonicalName());
+
+    private static final String HARVEST_CLIENTS_API = "/api/harvest/clients/";
+    private static final String ROOT_COLLECTION = "root";
+    private static final String HARVEST_URL = "https://demo.dataverse.org/oai";
+    private static final String ARCHIVE_URL = "https://demo.dataverse.org";
+    private static final String HARVEST_METADATA_FORMAT = "oai_dc";
+    private static final String ARCHIVE_DESCRIPTION = "RestAssured harvesting client test";
+    private static final String CONTROL_OAI_SET = "controlTestSet2";
+    private static final int DATASETS_IN_CONTROL_SET = 8;
+    private static final String DATACITE_ARCHIVE_URL = "https://oai.datacite.org";
+    private static final String DATACITE_OAI_URL = DATACITE_ARCHIVE_URL + "/oai";
+    private static String normalUserAPIKey;
+    private static String adminUserAPIKey;
+    private static String harvestCollectionAlias;
+    String clientApiPath = null;
+    List<String> globalIdList = new ArrayList();
+    
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+        
+        // Create the users, an admin and a non-admin:
+        setupUsers(); 
+        
+        // Create a collection that we will use to harvest remote content into: 
+        setupCollection();
+        
+    }
+    @AfterEach
+    public void cleanup() throws InterruptedException {
+        if (clientApiPath != null) {
+            Response deleteResponse = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                    .delete(clientApiPath);
+            clientApiPath = null;
+            System.out.println("deleteResponse.getStatusCode(): " + deleteResponse.getStatusCode());
+
+            int i = 0;
+            int maxWait = 20;
+            String query = "dsPersistentId:" + globalIdList.stream().map(s -> "\""+s+"\"").collect(Collectors.joining(","));
+            do {
+                if (UtilIT.search(query, normalUserAPIKey).prettyPrint().contains("count_in_response\": 0")) {
+                    break;
+                }
+                Thread.sleep(1000L);
+            } while (i++ < maxWait);
+        }
+        globalIdList.clear();
+    }
+
+    private static void setupUsers() {
+        Response cu0 = UtilIT.createRandomUser();
+        normalUserAPIKey = UtilIT.getApiTokenFromResponse(cu0);
+        Response cu1 = UtilIT.createRandomUser();
+        String un1 = UtilIT.getUsernameFromResponse(cu1);
+        Response u1a = UtilIT.makeSuperUser(un1);
+        adminUserAPIKey = UtilIT.getApiTokenFromResponse(cu1);
+    }
+    
+    private static void setupCollection() {
+        Response createDataverseResponse = UtilIT.createRandomDataverse(adminUserAPIKey);
+        createDataverseResponse.prettyPrint();
+        assertEquals(CREATED.getStatusCode(), createDataverseResponse.getStatusCode());
+        
+        harvestCollectionAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // publish dataverse:
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(harvestCollectionAlias, adminUserAPIKey);
+        assertEquals(OK.getStatusCode(), publishDataverse.getStatusCode());
+    }
+
+    @Test
+    public void testCreateEditDeleteClient() throws InterruptedException {
+        // This method focuses on testing the native Dataverse harvesting client
+        // API. 
+        
+        String nickName = "h" + UtilIT.getRandomString(6);
+        
+
+        String clientApiPath = String.format(HARVEST_CLIENTS_API+"%s", nickName);
+        String clientJson = String.format("{\"dataverseAlias\":\"%s\","
+                + "\"type\":\"oai\","
+                + "\"harvestUrl\":\"%s\","
+                + "\"archiveUrl\":\"%s\","
+                + "\"metadataFormat\":\"%s\"}", 
+                ROOT_COLLECTION, HARVEST_URL, ARCHIVE_URL, HARVEST_METADATA_FORMAT);
+
+        
+        // Try to create a client as normal user, should fail:
+        
+        Response rCreate = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, normalUserAPIKey)
+                .body(clientJson)
+                .post(clientApiPath);
+        assertEquals(UNAUTHORIZED.getStatusCode(), rCreate.getStatusCode());
+
+        
+        // Try to create the same as admin user, should succeed:
+        
+        rCreate = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .body(clientJson)
+                .post(clientApiPath);
+        assertEquals(CREATED.getStatusCode(), rCreate.getStatusCode());
+        
+        // Try to update the client we have just created:
+        
+        String updateJson = String.format("{\"archiveDescription\":\"%s\"}", ARCHIVE_DESCRIPTION);
+        
+        Response rUpdate = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .body(updateJson)
+                .put(clientApiPath);
+        assertEquals(OK.getStatusCode(), rUpdate.getStatusCode());
+        
+        // Now let's retrieve the client we've just created and edited: 
+                
+        Response getClientResponse = given()
+                .get(clientApiPath);
+        
+        logger.info("getClient.getStatusCode(): " + getClientResponse.getStatusCode());
+        logger.info("getClient printresponse:  " + getClientResponse.prettyPrint());
+        assertEquals(OK.getStatusCode(), getClientResponse.getStatusCode());
+        
+        // ... and validate the values:
+        
+        getClientResponse.then().assertThat()
+                .body("status", equalTo(ApiConstants.STATUS_OK))
+                .body("data.type", equalTo("oai"))
+                .body("data.nickName", equalTo(nickName))
+                .body("data.archiveDescription", equalTo(ARCHIVE_DESCRIPTION))
+                .body("data.dataverseAlias", equalTo(ROOT_COLLECTION))
+                .body("data.harvestUrl", equalTo(HARVEST_URL))
+                .body("data.archiveUrl", equalTo(ARCHIVE_URL))
+                .body("data.metadataFormat", equalTo(HARVEST_METADATA_FORMAT));        
+        
+        // Try to delete the client as normal user  should fail: 
+        
+        Response rDelete = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, normalUserAPIKey)
+                .delete(clientApiPath);
+        logger.info("rDelete.getStatusCode(): " + rDelete.getStatusCode());
+        assertEquals(UNAUTHORIZED.getStatusCode(), rDelete.getStatusCode());
+        
+        // Try to delete as admin user  should work:
+        
+        rDelete = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .delete(clientApiPath);
+        logger.info("rDelete.getStatusCode(): " + rDelete.getStatusCode());
+        assertEquals(OK.getStatusCode(), rDelete.getStatusCode());
+    }
+
+    @Test
+    public void testHarvestingClientRun_AllowHarvestingMissingCVV_False()  throws InterruptedException {
+        harvestingClientRun(false, false);
+    }
+    @Test
+    public void testHarvestingClientRun_AllowHarvestingMissingCVV_True()  throws InterruptedException {
+        harvestingClientRun(true, false);
+    }
+
+    @Test
+    public void testHarvestingClientRun_AllowHarvestingMissingCVV_True_WithSourceName()  throws InterruptedException {
+        harvestingClientRun(true, true);
+    }
+
+    private void harvestingClientRun(boolean allowHarvestingMissingCVV, boolean testingSourceName)  throws InterruptedException {
+        int expectedNumberOfSetsHarvested = allowHarvestingMissingCVV ? DATASETS_IN_CONTROL_SET : DATASETS_IN_CONTROL_SET - 1;
+
+        // This test will create a client and attempt to perform an actual 
+        // harvest and validate the resulting harvested content. 
+        
+        // Setup: create the client via native API
+        // since this API is tested somewhat extensively in the previous 
+        // method, we don't need to pay too much attention to this method, aside 
+        // from confirming the expected HTTP status code.
+        
+        String nickName = "h" + UtilIT.getRandomString(6);
+        String sourceName = testingSourceName ? "AnotherSourceName" : "";
+
+        clientApiPath = String.format(HARVEST_CLIENTS_API+"%s", nickName);
+        String clientJson = String.format("{\"dataverseAlias\":\"%s\","
+                + "\"type\":\"oai\","
+                + "\"sourceName\":\"%s\","
+                + "\"harvestUrl\":\"%s\","
+                + "\"archiveUrl\":\"%s\","
+                + "\"set\":\"%s\","
+                + "\"allowHarvestingMissingCVV\":%s,"
+                + "\"metadataFormat\":\"%s\"}", 
+                harvestCollectionAlias, sourceName, HARVEST_URL, ARCHIVE_URL, CONTROL_OAI_SET, allowHarvestingMissingCVV, HARVEST_METADATA_FORMAT);
+        
+        Response createResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .body(clientJson)
+                .post(clientApiPath);
+        assertEquals(CREATED.getStatusCode(), createResponse.getStatusCode());
+        
+        // API TEST 1. Run the harvest using the configuration (client) we have 
+        // just created
+        
+        String runHarvestApiPath = String.format(HARVEST_CLIENTS_API+"%s/run", nickName);
+        
+        // TODO? - verify that a non-admin user cannot perform this operation (401)
+        
+        Response runResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .post(runHarvestApiPath);
+        assertEquals(ACCEPTED.getStatusCode(), runResponse.getStatusCode());
+        
+        // API TEST 2. As indicated by the ACCEPTED status code above, harvesting
+        // is an asynchronous operation that will be performed in the background.
+        // Verify that this "in progress" status is properly reported while it's 
+        // running, and that it completes in some reasonable amount of time. 
+        
+        int i = 0;
+        int maxWait=20; // a very conservative interval; this harvest has no business taking this long
+        do {
+            // Give it an initial 2 sec. delay, to make sure the client state
+            // has been updated in the database, which can take some appreciable 
+            // amount of time on a heavily-loaded server running a full suite of
+            // tests:
+            Thread.sleep(2000L);
+            // keep checking the status of the client with the GET api:
+            Response getClientResponse = given()
+                .get(clientApiPath);
+        
+            assertEquals(OK.getStatusCode(), getClientResponse.getStatusCode());
+            JsonPath responseJsonPath = getClientResponse.body().jsonPath();
+            assertNotNull(responseJsonPath, "Invalid JSON in GET client response");
+            assertEquals(ApiConstants.STATUS_OK, responseJsonPath.getString("status"));
+            
+            String clientStatus = responseJsonPath.getString("data.status");
+            assertNotNull(clientStatus);
+            
+            if ("inProgress".equals(clientStatus) || "IN PROGRESS".equals(responseJsonPath.getString("data.lastResult"))) {
+                // we'll sleep for 2 more seconds
+                i++;
+            } else {
+                logger.info("getClientResponse.prettyPrint: " 
+                        + getClientResponse.prettyPrint());
+                // Check the values in the response:
+                // a) Confirm that the harvest has completed: 
+                assertEquals("inActive", clientStatus, "Unexpected client status: "+clientStatus);
+                
+                // b) Confirm that it has actually succeeded:
+                assertTrue(responseJsonPath.getString("data.lastResult").contains("Completed"), "Last harvest not reported a success (took "+i+" seconds)");
+                String harvestTimeStamp = responseJsonPath.getString("data.lastHarvest");
+                assertNotNull(harvestTimeStamp); 
+                
+                // c) Confirm that the other timestamps match: 
+                assertEquals(harvestTimeStamp, responseJsonPath.getString("data.lastSuccessful"));
+                assertEquals(harvestTimeStamp, responseJsonPath.getString("data.lastNonEmpty"));
+                
+                // d) Confirm that the correct number of datasets have been harvested:
+                assertEquals(expectedNumberOfSetsHarvested, responseJsonPath.getInt("data.lastDatasetsHarvested"));
+                
+                // ok, it looks like the harvest has completed successfully.
+                break;
+            }
+        } while (i<maxWait); 
+        
+        System.out.println("Waited " + i + " seconds for the harvest to complete.");
+
+        // Let's give the asynchronous indexing an extra sec. to finish:
+        Thread.sleep(1000L); 
+        // Requires the index-harvested-metadata-source Flag feature to be enabled to search on the nickName
+        // Otherwise, the search must be performed with metadataSource:Harvested
+        Response searchHarvestedDatasets = UtilIT.search("metadataSource:" + (testingSourceName ? sourceName : nickName), normalUserAPIKey);
+        searchHarvestedDatasets.then().assertThat().statusCode(OK.getStatusCode());
+        searchHarvestedDatasets.prettyPrint();
+        // Get all global ids for cleanup
+        JsonPath jsonPath = searchHarvestedDatasets.getBody().jsonPath();
+        int sz = jsonPath.getInt("data.items.size()");
+        for(int idx = 0; idx < sz; idx++) {
+            globalIdList.add(jsonPath.getString("data.items["+idx+"].global_id"));
+        }
+        // verify count after collecting global ids
+        assertEquals(expectedNumberOfSetsHarvested, jsonPath.getInt("data.total_count"));
+
+        // ensure the publisher name is present in the harvested dataset citation
+        Response harvestedDataverse = given().get(ARCHIVE_URL + "/api/dataverses/1");  
+        String harvestedDataverseName = harvestedDataverse.getBody().jsonPath().getString("data.name");        
+        assertTrue(jsonPath.getString("data.items[0].citation").contains(harvestedDataverseName));
+        
+        // Fail if it hasn't completed in maxWait seconds
+        assertTrue(i < maxWait);
+    }
+    
+    /*
+     * Being able to harvest from DataCite (issue #10909, pr #11011) is an 
+     * important enough feature to warrant a dedicated test. 
+     * Just like the other tests above, this will rely on an external OAI 
+     * server, which is somewhat problematic inherently. However, of all the 
+     * external servers and services, DataCite can be safely considered to be 
+     * more reliable than most. 
+     * The test is super straightforward, with the goal of harvesting one 
+     * specific IQSS dataset (doi:10.7910/DVN/TJCLKP) from 
+     * https://oai.datacite.org/oai. As part of testing the overal functionality
+     * of being able to work with the quirks of the DataCite OAI service, it 
+     * tests 2 new features:
+     *    "useOaiIdentifiersAsPids": true,
+     *    "useListRecords": true,
+     * (both have useful applications in other scenarios, i.e. when harvesting
+     * from other sources, not just from DataCite!)
+     * 
+    */
+    @Test
+    public void testHarvestingFromDatacite()  throws InterruptedException {
+        String nickName = "philTJCLKP" + UtilIT.getRandomString(6);
+
+        // The magical string used as the name of our "pseudo set" is the
+        // native DataCite search API query that finds our dataset, base64-encoded. 
+        // i.e., 
+        //    native API: https://api.datacite.org/dois?query=doi:10.7910/DVN/TJCLKP
+        // encoded: 
+        //   echo "doi:10.7910/DVN/TJCLKP" | base64
+        //   ZG9pOjEwLjc5MTAvRFZOL1RKQ0xLUAo=
+        String pseudoSetName = "~ZG9pOjEwLjc5MTAvRFZOL1RKQ0xLUAo=";
+        
+        clientApiPath = String.format(HARVEST_CLIENTS_API+"%s", nickName);
+        String clientJson = String.format("{\"dataverseAlias\":\"root\","
+                + "\"type\":\"oai\","
+                + "\"harvestUrl\":\"%s\","
+                + "\"archiveUrl\":\"%s\","
+                + "\"set\":\"%s\","
+                + "\"useOaiIdentifiersAsPids\": true,"
+                + "\"useListRecords\": true,"
+                + "\"metadataFormat\":\"%s\"}", 
+                DATACITE_OAI_URL, DATACITE_ARCHIVE_URL, pseudoSetName, HARVEST_METADATA_FORMAT);
+        
+        Response createResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .body(clientJson)
+                .post(clientApiPath);
+        assertEquals(CREATED.getStatusCode(), createResponse.getStatusCode());
+        
+        // API TEST 1. Run the harvest using the configuration (client) we have 
+        // just created
+        
+        String runHarvestApiPath = String.format(HARVEST_CLIENTS_API+"%s/run", nickName);
+                
+        Response runResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .post(runHarvestApiPath);
+        assertEquals(ACCEPTED.getStatusCode(), runResponse.getStatusCode());
+        
+        // API TEST 2. As indicated by the ACCEPTED status code above, harvesting
+        // is an asynchronous operation that will be performed in the background.
+        // Verify that this "in progress" status is properly reported while it's 
+        // running, and that it completes in some reasonable amount of time. 
+        
+        int i = 0;
+        int maxWait=20; // a very conservative interval; this harvest has no business taking this long
+        
+        do {
+            // Give it an initial 2 sec. delay, to make sure the client state
+            // has been updated in the database, which can take some appreciable 
+            // amount of time on a heavily-loaded server running a full suite of
+            // tests:
+            Thread.sleep(2000L);
+            // keep checking the status of the client with the GET api:
+            Response getClientResponse = given()
+                .get(clientApiPath);
+        
+            assertEquals(OK.getStatusCode(), getClientResponse.getStatusCode());
+            JsonPath responseJsonPath = getClientResponse.body().jsonPath();
+            assertNotNull(responseJsonPath, "Invalid JSON in GET client response");
+            assertEquals(ApiConstants.STATUS_OK, responseJsonPath.getString("status"));
+            
+            String clientStatus = responseJsonPath.getString("data.status");
+            assertNotNull(clientStatus);
+            
+            if ("inProgress".equals(clientStatus) || "IN PROGRESS".equals(responseJsonPath.getString("data.lastResult"))) {
+                // we'll sleep for 2 more seconds
+                i++;
+            } else {
+                logger.info("getClientResponse.prettyPrint: " 
+                        + getClientResponse.prettyPrint());
+                // Check the values in the response:
+                // a) Confirm that the harvest has completed: 
+                assertEquals("inActive", clientStatus, "Unexpected client status: "+clientStatus);
+                
+                // b) Confirm that it has actually succeeded:
+                assertEquals("Completed", responseJsonPath.getString("data.lastResult"), "Last harvest not reported a success (took "+i+" seconds)");
+                String harvestTimeStamp = responseJsonPath.getString("data.lastHarvest");
+                assertNotNull(harvestTimeStamp); 
+                
+                // c) Confirm that the other timestamps match: 
+                assertEquals(harvestTimeStamp, responseJsonPath.getString("data.lastSuccessful"));
+                assertEquals(harvestTimeStamp, responseJsonPath.getString("data.lastNonEmpty"));
+                
+                // d) Confirm that the expected 1 dataset has been harvested, with no failures:
+                assertEquals(1, responseJsonPath.getInt("data.lastDatasetsHarvested"));
+                assertEquals(0, responseJsonPath.getInt("data.lastDatasetsFailed"));
+                assertEquals(0, responseJsonPath.getInt("data.lastDatasetsDeleted"));
+                
+                // ok, it looks like the harvest has completed successfully.
+                break;
+            }
+        } while (i<maxWait); 
+        
+        System.out.println("Waited " + i + " seconds for the harvest to complete.");
+        // Fail if it hasn't completed in maxWait seconds
+        assertTrue(i < maxWait);
+        
+        // @todo: maybe call native API and check specifically on 
+        // /api/datasets/:persistentId?persistentId=doi:10.7910/DVN/TJCLKP
+        // to verify that it has been properly imporated. 
+        
+        // No need to delete the client (and the harvested dataset with it) here, 
+        // it will be deleted by the @AfterEach cleanup() method
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/HarvestingServerIT.java b/src/test/java/edu/harvard/iq/dataverse/api/HarvestingServerIT.java
index 4b3f35379c5..57a12224c89 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/HarvestingServerIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/HarvestingServerIT.java
@@ -1,47 +1,70 @@
 package edu.harvard.iq.dataverse.api;
 
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import com.jayway.restassured.RestAssured;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
-import org.junit.Test;
+import io.restassured.RestAssured;
+import static io.restassured.RestAssured.given;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import com.jayway.restassured.response.Response;
-import static com.jayway.restassured.RestAssured.given;
-import com.jayway.restassured.path.json.JsonPath;
-import javax.json.Json;
-import javax.json.JsonArray;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.OK;
+import io.restassured.response.Response;
+import io.restassured.path.xml.XmlPath;
+import io.restassured.path.xml.element.Node;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.equalTo;
-import org.junit.Ignore;
-import static com.jayway.restassured.RestAssured.given;
 import java.util.List;
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import java.util.Set;
+import java.util.HashSet;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
- * extremely minimal API tests for creating OAI sets.
+ * Tests for the Harvesting Server functionality
+ * Note that these test BOTH the proprietary Dataverse rest APIs for creating 
+ * and managing sets, AND the OAI-PMH functionality itself.
  */
 public class HarvestingServerIT {
 
     private static final Logger logger = Logger.getLogger(HarvestingServerIT.class.getCanonicalName());
 
-    @BeforeClass
+    private static String normalUserAPIKey;
+    private static String adminUserAPIKey;
+    private static String singleSetDatasetIdentifier;
+    private static String singleSetDatasetPersistentId;
+    private static Integer singleSetDatasetDatabaseId;
+    private static List<String> extraDatasetsIdentifiers = new ArrayList<>();
+
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
 	// enable harvesting server
 	//  Gave some thought to storing the original response, and resetting afterwards - but that appears to be more complexity than it's worth
 	Response enableHarvestingServerResponse = UtilIT.setSetting(SettingsServiceBean.Key.OAIServerEnabled,"true");
+        
+        // Create users:
+        setupUsers();
+        
+        // Create and publish some datasets: 
+        setupDatasets();
+        
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
 	// disable harvesting server (default value)
 	Response enableHarvestingServerResponse = UtilIT.setSetting(SettingsServiceBean.Key.OAIServerEnabled,"false");
     }
 
-    private void setupUsers() {
+    private static void setupUsers() {
         Response cu0 = UtilIT.createRandomUser();
         normalUserAPIKey = UtilIT.getApiTokenFromResponse(cu0);
         Response cu1 = UtilIT.createRandomUser();
@@ -49,126 +72,927 @@ private void setupUsers() {
         Response u1a = UtilIT.makeSuperUser(un1);
         adminUserAPIKey = UtilIT.getApiTokenFromResponse(cu1);
     }
+    
+    private static void setupDatasets() {
+        // create dataverse:
+        Response createDataverseResponse = UtilIT.createRandomDataverse(adminUserAPIKey);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // publish dataverse:
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, adminUserAPIKey);
+        assertEquals(OK.getStatusCode(), publishDataverse.getStatusCode());
+
+        // create dataset: 
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, adminUserAPIKey);
+        createDatasetResponse.prettyPrint();
+        singleSetDatasetDatabaseId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        // retrieve the global id: 
+        singleSetDatasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+
+        // publish dataset:
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(singleSetDatasetPersistentId, "major", adminUserAPIKey);
+        assertEquals(200, publishDataset.getStatusCode());
+
+        singleSetDatasetIdentifier = singleSetDatasetPersistentId.substring(singleSetDatasetPersistentId.lastIndexOf('/') + 1);
+
+        logger.info("identifier: " + singleSetDatasetIdentifier);
+        
+        // Publish command is executed asynchronously, i.e. it may 
+        // still be running after we received the OK from the publish API. 
+        // The oaiExport step also requires the metadata exports to be done and this
+        // takes longer than just publish/reindex.
+        // So wait for all of this to finish.
+        UtilIT.sleepForReexport(singleSetDatasetPersistentId, adminUserAPIKey, 10);
+        
+        // ... And let's create 5 more datasets for a multi-dataset experiment:
+        
+        for (int i = 0; i < 5; i++) {
+            // create dataset: 
+            createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, adminUserAPIKey);
+            createDatasetResponse.prettyPrint();
+            Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+            // retrieve the global id: 
+            String thisDatasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+
+            // publish dataset:
+            publishDataset = UtilIT.publishDatasetViaNativeApi(thisDatasetPersistentId, "major", adminUserAPIKey);
+            assertEquals(200, publishDataset.getStatusCode());
+
+            UtilIT.sleepForReexport(thisDatasetPersistentId, adminUserAPIKey, 10);
+            
+            extraDatasetsIdentifiers.add(thisDatasetPersistentId.substring(thisDatasetPersistentId.lastIndexOf('/') + 1));
+        }
+        
+        
+    }
 
     private String jsonForTestSpec(String name, String def) {
         String r = String.format("{\"name\":\"%s\",\"definition\":\"%s\"}", name, def);//description is optional
         return r;
     }
+    
+    private String jsonForEditSpec(String name, String def, String desc) {
+        String r = String.format("{\"name\":\"%s\",\"definition\":\"%s\",\"description\":\"%s\"}", name, def, desc);
+        return r;
+    }
 
-    private String normalUserAPIKey;
-    private String adminUserAPIKey;
+    private XmlPath validateOaiVerbResponse(Response oaiResponse, String verb) {
+        logger.info(verb+" response: "+oaiResponse.prettyPrint());
+        // confirm that the response is in fact XML:
+        XmlPath responseXmlPath = oaiResponse.getBody().xmlPath();
+        assertNotNull(responseXmlPath);
+        
+        String dateString = responseXmlPath.getString("OAI-PMH.responseDate");
+        assertNotNull(dateString); 
+        // TODO: validate the formatting of the date string in the record
+        // header, above. (could be slightly tricky - since this formatting
+        // is likely locale-specific)
+        logger.fine("date string from the OAI output:"+dateString);
+        //assertEquals("http://localhost:8080/oai", responseXmlPath.getString("OAI-PMH.request"));
+        assertEquals(verb, responseXmlPath.getString("OAI-PMH.request.@verb"));
+        return responseXmlPath;
+    }
+    
+    @Test 
+    public void testOaiIdentify() {
+        // Run Identify:
+        Response identifyResponse = UtilIT.getOaiIdentify();
+        assertEquals(OK.getStatusCode(), identifyResponse.getStatusCode());
+
+        // Validate the response: 
+        
+        XmlPath responseXmlPath = validateOaiVerbResponse(identifyResponse, "Identify");
+        //assertEquals("http://localhost:8080/oai", responseXmlPath.getString("OAI-PMH.Identify.baseURL"));
+        // Confirm that the server is reporting the correct parameters that 
+        // our server implementation should be using:
+        assertEquals("2.0", responseXmlPath.getString("OAI-PMH.Identify.protocolVersion"));
+        assertEquals("transient", responseXmlPath.getString("OAI-PMH.Identify.deletedRecord"));
+        assertEquals("YYYY-MM-DDThh:mm:ssZ", responseXmlPath.getString("OAI-PMH.Identify.granularity"));
+    }
+    
+    @Test
+    public void testOaiListMetadataFormats() {
+        // Run ListMeatadataFormats:
+        Response listFormatsResponse = UtilIT.getOaiListMetadataFormats();
+        assertEquals(OK.getStatusCode(), listFormatsResponse.getStatusCode());
+
+        // Validate the response: 
+        
+        XmlPath responseXmlPath = validateOaiVerbResponse(listFormatsResponse, "ListMetadataFormats");
+        
+        // Check the payload of the response atgainst the list of metadata formats
+        // we are currently offering under OAI; will need to be explicitly 
+        // modified if/when we add more harvestable formats.
+        
+        List listFormats = responseXmlPath.getList("OAI-PMH.ListMetadataFormats.metadataFormat");
+
+        assertNotNull(listFormats);
+        assertEquals(5, listFormats.size());
+        
+        // The metadata formats are reported in an unpredictable ordder. We
+        // want to sort the prefix names for comparison purposes, and for that 
+        // they need to be saved in a modifiable list: 
+        List<String> metadataPrefixes = new ArrayList<>(); 
+        
+        for (int i = 0; i < listFormats.size(); i++) {
+            metadataPrefixes.add(responseXmlPath.getString("OAI-PMH.ListMetadataFormats.metadataFormat["+i+"].metadataPrefix"));
+        }
+        Collections.sort(metadataPrefixes);
+        
+        assertEquals("[Datacite, dataverse_json, oai_datacite, oai_dc, oai_ddi]", metadataPrefixes.toString());
+        
 
+    }
+    
+    
     @Test
-    public void testSetCreation() {
-        setupUsers();
+    public void testNativeSetAPI() {
         String setName = UtilIT.getRandomString(6);
         String def = "*";
-
-        // make sure the set does not exist
-        String u0 = String.format("/api/harvest/server/oaisets/%s", setName);
-        Response r0 = given()
-                .get(u0);
-        assertEquals(404, r0.getStatusCode());
-
-        // try to create set as normal user, should fail
-        Response r1 = given()
+        
+        // This test focuses on the Create/List/Edit functionality of the 
+        // Dataverse OAI Sets API (/api/harvest/server):
+ 
+        // API Test 1. Make sure the set does not exist yet
+        String setPath = String.format("/api/harvest/server/oaisets/%s", setName);
+        String createPath ="/api/harvest/server/oaisets/add";
+        Response getSetResponse = given()
+                .get(setPath);
+        assertEquals(404, getSetResponse.getStatusCode());
+
+        // API Test 2. Try to create set as normal user, should fail
+        Response createSetResponse = given()
                 .header(UtilIT.API_TOKEN_HTTP_HEADER, normalUserAPIKey)
                 .body(jsonForTestSpec(setName, def))
-                .post(u0);
-        assertEquals(400, r1.getStatusCode());
+                .post(createPath);
+        assertEquals(400, createSetResponse.getStatusCode());
 
-        // try to create set as admin user, should succeed
-        Response r2 = given()
+        // API Test 3. Try to create set as admin user, should succeed
+        createSetResponse = given()
                 .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
                 .body(jsonForTestSpec(setName, def))
-                .post(u0);
-        assertEquals(201, r2.getStatusCode());
-
-        // try to create set with same name as admin user, should fail
-        Response r3 = given()
+                .post(createPath);
+        assertEquals(201, createSetResponse.getStatusCode());
+        
+        // API Test 4. Retrieve the set we've just created, validate the response
+        getSetResponse = given().get(setPath);
+        
+        System.out.println("getSetResponse.getStatusCode(): " + getSetResponse.getStatusCode());
+        System.out.println("getSetResponse, full:  " + getSetResponse.prettyPrint());
+        assertEquals(200, getSetResponse.getStatusCode());
+        
+        getSetResponse.then().assertThat()
+                .body("status", equalTo(ApiConstants.STATUS_OK))
+                .body("data.definition", equalTo("*"))
+                .body("data.description", equalTo(""))
+                .body("data.name", equalTo(setName));
+        
+        
+        // API Test 5. Retrieve all sets, check that our new set is listed 
+        Response responseAll = given()
+                .get("/api/harvest/server/oaisets");
+        
+        System.out.println("responseAll.getStatusCode(): " + responseAll.getStatusCode());
+        System.out.println("responseAll full:  " + responseAll.prettyPrint());
+        assertEquals(200, responseAll.getStatusCode());
+        assertTrue(responseAll.body().jsonPath().getList("data.oaisets").size() > 0);
+        assertTrue(responseAll.body().jsonPath().getList("data.oaisets.name", String.class).contains(setName));
+        
+        // API Test 6. Try to create a set with the same name, should fail
+        createSetResponse = given()
                 .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
                 .body(jsonForTestSpec(setName, def))
-                .post(u0);
-        assertEquals(400, r3.getStatusCode());
+                .post(createPath);
+        assertEquals(400, createSetResponse.getStatusCode());
 
-        // try to export set as admin user, should succeed (under admin API, not checking that normal user will fail)
+        // API Test 7. Try to export set as admin user, should succeed. Set export
+        // is under /api/admin, no need to try to access it as a non-admin user
         Response r4 = UtilIT.exportOaiSet(setName);
         assertEquals(200, r4.getStatusCode());
+                
+        // API TEST 8. Try to delete the set as normal user, should fail
+        Response deleteResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, normalUserAPIKey)
+                .delete(setPath);
+        logger.info("deleteResponse.getStatusCode(): " + deleteResponse.getStatusCode());
+        assertEquals(400, deleteResponse.getStatusCode());
+        
+        // API TEST 9. Delete as admin user, should work
+        deleteResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .delete(setPath);
+        logger.info("deleteResponse.getStatusCode(): " + deleteResponse.getStatusCode());
+        assertEquals(200, deleteResponse.getStatusCode());
 
-        // TODO - get an answer to the question of if it's worth cleaning up (users, sets) or not
     }
-
-    // A more elaborate test - we'll create and publish a dataset, then create an
-    // OAI set with that one dataset, and attempt to retrieve the OAI record
-    // with GetRecord. 
+    
     @Test
-    public void testOaiFunctionality() throws InterruptedException {
+    public void testSetEditAPIandOAIlistSets() throws InterruptedException {
+        // This test focuses on testing the Edit functionality of the Dataverse
+        // OAI Set API and the ListSets method of the Dataverse OAI server.
+        
+        // Initial setup: crete a test set. 
+        // Since the Create and List (POST and GET) functionality of the API 
+        // is tested extensively in the previous test, we will not be paying 
+        // as much attention to these methods, aside from confirming the 
+        // expected HTTP result codes. 
+        
+        String setName = UtilIT.getRandomString(6);
+        String setDefinition = "title:Sample";
 
-        setupUsers();
+        // Make sure the set does not exist
+        String setPath = String.format("/api/harvest/server/oaisets/%s", setName);
+        String createPath ="/api/harvest/server/oaisets/add";
+        Response getSetResponse = given()
+                .get(setPath);
+        assertEquals(404, getSetResponse.getStatusCode());
 
-        // create dataverse:
-        Response createDataverseResponse = UtilIT.createRandomDataverse(adminUserAPIKey);
-        createDataverseResponse.prettyPrint();
-        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
 
-        // publish dataverse:
-        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, adminUserAPIKey);
-        assertEquals(OK.getStatusCode(), publishDataverse.getStatusCode());
+        // Create the set as admin user
+        Response createSetResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .body(jsonForTestSpec(setName, setDefinition))
+                .post(createPath);
+        assertEquals(201, createSetResponse.getStatusCode());
 
-        // create dataset: 
-        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, adminUserAPIKey);
-        createDatasetResponse.prettyPrint();
-        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        // I. Test the Modify/Edit (POST method) functionality of the 
+        // Dataverse OAI Sets API
+        
+        String persistentId = extraDatasetsIdentifiers.get(0); 
+        String newDefinition = "dsPersistentId:"+persistentId;
+        String newDescription = "updated";
+        
+        // API Test 1. Try to modify the set as normal user, should fail
+        Response editSetResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, normalUserAPIKey)
+                .body(jsonForEditSpec(setName, newDefinition, ""))
+                .put(setPath);
+        logger.info("non-admin user editSetResponse.getStatusCode(): " + editSetResponse.getStatusCode());
+        assertEquals(400, editSetResponse.getStatusCode());
+        
+        // API Test 2. Try to modify as admin, but with invalid (empty) values, 
+        // should fail
+        editSetResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .body(jsonForEditSpec(setName, "",""))
+                .put(setPath);
+        logger.info("invalid values editSetResponse.getStatusCode(): " + editSetResponse.getStatusCode());
+        assertEquals(400, editSetResponse.getStatusCode());
+        
+        // API Test 3. Try to modify as admin, with sensible values
+        editSetResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .body(jsonForEditSpec(setName, newDefinition, newDescription))
+                .put(setPath);
+        logger.info("admin user editSetResponse status code: " + editSetResponse.getStatusCode());
+        logger.info("admin user editSetResponse.prettyPrint(): " + editSetResponse.prettyPrint());
+        assertEquals(OK.getStatusCode(), editSetResponse.getStatusCode());
+        
+        // API Test 4. List the set, confirm that the new values are shown
+        getSetResponse = given().get(setPath);
+        
+        System.out.println("getSetResponse.getStatusCode(): " + getSetResponse.getStatusCode());
+        System.out.println("getSetResponse, full:  " + getSetResponse.prettyPrint());
+        assertEquals(200, getSetResponse.getStatusCode());
+        
+        getSetResponse.then().assertThat()
+                .body("status", equalTo(ApiConstants.STATUS_OK))
+                .body("data.definition", equalTo(newDefinition))
+                .body("data.description", equalTo(newDescription))
+                .body("data.name", equalTo(setName));
+
+        // II. Test the ListSets functionality of the OAI server 
+        
+        Response listSetsResponse = UtilIT.getOaiListSets();
+        
+        // 1. Validate the service section of the OAI response: 
+        
+        XmlPath responseXmlPath = validateOaiVerbResponse(listSetsResponse, "ListSets");
+        
+        // 2. The set hasn't been exported yet, so it shouldn't be listed in 
+        // ListSets (#3322). Let's confirm that: 
+        
+        List<Node> listSets = responseXmlPath.getList("OAI-PMH.ListSets.set.list().findAll{it.setName=='"+setName+"'}", Node.class);
+        // 2a. Confirm that our set is listed:
+        assertNotNull(listSets, "Unexpected response from ListSets");
+        assertEquals(0, listSets.size(), "An unexported OAI set is listed in ListSets");
+        
+        // export the set: 
+        
+        Response exportSetResponse = UtilIT.exportOaiSet(setName);
+        assertEquals(200, exportSetResponse.getStatusCode());
+        Thread.sleep(1000L); // sleep for a sec to be sure
+        
+        // ... try again: 
+        
+        listSetsResponse = UtilIT.getOaiListSets();
+        responseXmlPath = validateOaiVerbResponse(listSetsResponse, "ListSets");
+        
+        // 3. Validate the payload of the response, by confirming that the set 
+        // we created and modified, above, is being listed by the OAI server 
+        // and its xml record is properly formatted
+        
+        listSets = responseXmlPath.getList("OAI-PMH.ListSets.set.list().findAll{it.setName=='"+setName+"'}", Node.class);
+        
+        // 3a. Confirm that our set is listed:
+        assertNotNull(listSets, "Unexpected response from ListSets");
+        assertEquals(1, listSets.size(), "Newly-created set isn't properly listed by the OAI server");
+        // 3b. Confirm that the set entry contains the updated description: 
+        assertEquals(newDescription, listSets.get(0).getPath("setDescription.metadata.element.field", String.class), "Incorrect description in the ListSets entry");
+        
+        // ok, the xml record looks good! 
+
+        // Cleanup. Delete the set with the DELETE API
+        Response deleteSetResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .delete(setPath);
+        assertEquals(200, deleteSetResponse.getStatusCode());
 
-        // retrieve the global id: 
-        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+    }
 
-        // publish dataset:
-        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", adminUserAPIKey);
-        assertEquals(200, publishDataset.getStatusCode());
+    // A more elaborate test - we will create and export an 
+    // OAI set with a single dataset, and attempt to retrieve 
+    // it and validate the OAI server responses of the corresponding 
+    // ListIdentifiers, ListRecords and GetRecord methods. 
+    // Finally, we will make sure that the test reexport survives 
+    // a reexport when the control dataset is dropped from the search
+    // index temporarily (if, for example, the site admin cleared their 
+    // solr index in order to reindex everything from scratch - which 
+    // can take a while on a large database). This is per #3437
+    @Test
+    public void testSingleRecordOaiSet() throws InterruptedException {
+        // Let's try and create an OAI set with the "single set dataset" that 
+        // was created as part of the initial setup:
+        
+        String setName = singleSetDatasetIdentifier;
+        String setQuery = "dsPersistentId:" + singleSetDatasetIdentifier;
+        String apiPath = String.format("/api/harvest/server/oaisets/%s", setName);
+        String createPath ="/api/harvest/server/oaisets/add";
+        Response createSetResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .body(jsonForTestSpec(setName, setQuery))
+                .post(createPath);
+        assertEquals(201, createSetResponse.getStatusCode());
 
-        String identifier = datasetPersistentId.substring(datasetPersistentId.lastIndexOf('/') + 1);
+        // The GET method of the oai set API, as well as the OAI ListSets
+        // method are tested extensively in another method in this class, so 
+        // we'll skip looking too closely into those here. 
+        
+        // A quick test that the new set is listed under native API
+        Response getSet = given()
+                .get(apiPath);
+        assertEquals(200, getSet.getStatusCode());
+        
+        // Export the set. 
+        
+        Response exportSetResponse = UtilIT.exportOaiSet(setName);
+        assertEquals(200, exportSetResponse.getStatusCode());
+                
+        // Strictly speaking, exporting an OAI set is an asynchronous operation. 
+        // So the code below was written to expect to have to wait for up to 10 
+        // additional seconds for it to complete. In retrospect, this is 
+        // most likely unnecessary (because the only potentially expensive part 
+        // of the process is the metadata export, and in this case that must have
+        // already happened - when the dataset was published (that operation
+        // now has its own wait mechanism). But I'll keep this extra code in 
+        // place since it's not going to hurt. - L.A. 
+        
+        Thread.sleep(1000L); // initial sleep interval
+        int i = 0;
+        int maxWait=10;
+        do {
+
+            // OAI Test 1. Run ListIdentifiers on this newly-created set:
+            Response listIdentifiersResponse = UtilIT.getOaiListIdentifiers(setName, "oai_dc");
+            assertEquals(OK.getStatusCode(), listIdentifiersResponse.getStatusCode());
+            
+            // Validate the service section of the OAI response: 
+            XmlPath responseXmlPath = validateOaiVerbResponse(listIdentifiersResponse, "ListIdentifiers");
+            
+            List ret = responseXmlPath.getList("OAI-PMH.ListIdentifiers.header");
+                        
+            if (ret == null || ret.isEmpty()) {
+                // OK, we'll sleep for another second
+                i++;
+            } else {
+                if (logger.isLoggable(Level.FINE)) {
+                    logger.info("listIdentifiersResponse.prettyPrint: " + listIdentifiersResponse.prettyPrint());
+                }
+                // Validate the payload of the ListIdentifiers response:
+                // a) There should be 1 and only 1 item listed:
+                assertEquals(1, ret.size());
+                // b) The one record in it should be the dataset we have just created:
+                assertEquals(singleSetDatasetPersistentId, responseXmlPath
+                        .getString("OAI-PMH.ListIdentifiers.header.identifier"));
+                assertEquals(setName, responseXmlPath
+                        .getString("OAI-PMH.ListIdentifiers.header.setSpec"));
+                assertNotNull(responseXmlPath.getString("OAI-PMH.ListIdentifiers.header.dateStamp"));
+                // TODO: validate the formatting of the date string here as well.
+                
+                // ok, ListIdentifiers response looks valid.
+                break;
+            }
+            Thread.sleep(1000L);
+        } while (i<maxWait); 
+        
+        System.out.println("Waited " + i + " seconds for OIA export.");
+        //Fail if we didn't find the exported record before the timeout
+        assertTrue(i < maxWait);
+        
+        
+        // OAI Test 2. Run ListRecords, request oai_dc:
+        Response listRecordsResponse = UtilIT.getOaiListRecords(setName, "oai_dc");
+        assertEquals(OK.getStatusCode(), listRecordsResponse.getStatusCode());
+        
+        // Validate the service section of the OAI response: 
+        
+        XmlPath responseXmlPath = validateOaiVerbResponse(listRecordsResponse, "ListRecords");
+        
+        // Validate the payload of the response: 
+        // (the header portion must be identical to that of ListIdentifiers above, 
+        // plus the response must contain a metadata section with a valid oai_dc 
+        // record)
+        
+        List listRecords = responseXmlPath.getList("OAI-PMH.ListRecords.record");
+
+        // Same deal, there must be 1 record only in the set:
+        assertNotNull(listRecords);
+        assertEquals(1, listRecords.size());
+        // a) header section:
+        assertEquals(singleSetDatasetPersistentId, responseXmlPath.getString("OAI-PMH.ListRecords.record.header.identifier"));
+        assertEquals(setName, responseXmlPath
+                .getString("OAI-PMH.ListRecords.record.header.setSpec"));
+        assertNotNull(responseXmlPath.getString("OAI-PMH.ListRecords.record.header.dateStamp"));
+        // b) metadata section: 
+        // in the metadata section we are showing the resolver url form of the doi:
+        String persistentIdUrl = singleSetDatasetPersistentId.replace("doi:", "https://doi.org/");
+        assertEquals(persistentIdUrl, responseXmlPath.getString("OAI-PMH.ListRecords.record.metadata.dc.identifier"));
+        assertEquals("Darwin's Finches", responseXmlPath.getString("OAI-PMH.ListRecords.record.metadata.dc.title"));
+        assertEquals("Finch, Fiona", responseXmlPath.getString("OAI-PMH.ListRecords.record.metadata.dc.creator"));        
+        assertEquals("Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.", 
+                responseXmlPath.getString("OAI-PMH.ListRecords.record.metadata.dc.description"));
+        assertEquals("Medicine, Health and Life Sciences", 
+                responseXmlPath.getString("OAI-PMH.ListRecords.record.metadata.dc.subject"));
+        // ok, looks legit!
+        
+        // OAI Test 3.
+        // Assert that Datacite format does not contain the XML prolog
+        // (this is a reference to a resolved issue; generally, harvestable XML
+        // exports must NOT contain the "<?xml ..." headers - but there is now
+        // efficient code in the XOAI library that checks for, and strips it, 
+        // if necessary. - L.A.)
+        Response listRecordsResponseDatacite = UtilIT.getOaiListRecords(setName, "Datacite");
+        assertEquals(OK.getStatusCode(), listRecordsResponseDatacite.getStatusCode());
+        String body = listRecordsResponseDatacite.getBody().asString();
+        assertFalse(body.contains("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
+
+        // OAI Test 4. run and validate GetRecord response
+        
+        Response getRecordResponse = UtilIT.getOaiRecord(singleSetDatasetPersistentId, "oai_dc");
+        System.out.println("GetRecord response in its entirety: "+getRecordResponse.getBody().prettyPrint());
+         
+        // Validate the service section of the OAI response: 
+        responseXmlPath = validateOaiVerbResponse(getRecordResponse, "GetRecord");
+        
+        // Validate the payload of the response:
+        
+        // Note that for a set with a single record the output of ListRecrods is
+        // essentially identical to that of GetRecord!
+        // (we'll test a multi-record set in a different method)
+        // a) header section:
+        assertEquals(singleSetDatasetPersistentId, responseXmlPath.getString("OAI-PMH.GetRecord.record.header.identifier"));
+        assertEquals(setName, responseXmlPath
+                .getString("OAI-PMH.GetRecord.record.header.setSpec"));
+        assertNotNull(responseXmlPath.getString("OAI-PMH.GetRecord.record.header.dateStamp"));
+        // b) metadata section: 
+        assertEquals(persistentIdUrl, responseXmlPath.getString("OAI-PMH.GetRecord.record.metadata.dc.identifier"));
+        assertEquals("Darwin's Finches", responseXmlPath.getString("OAI-PMH.GetRecord.record.metadata.dc.title"));
+        assertEquals("Finch, Fiona", responseXmlPath.getString("OAI-PMH.GetRecord.record.metadata.dc.creator"));        
+        assertEquals("Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.", 
+                responseXmlPath.getString("OAI-PMH.GetRecord.record.metadata.dc.description"));
+        assertEquals("Medicine, Health and Life Sciences", responseXmlPath.getString("OAI-PMH.GetRecord.record.metadata.dc.subject"));
+        
+        // ok, looks legit!
+        
+        // Now, let's clear this dataset from Solr: 
+        Response solrClearResponse = UtilIT.indexClearDataset(singleSetDatasetDatabaseId);
+        assertEquals(200, solrClearResponse.getStatusCode());
+        solrClearResponse.prettyPrint();
+        
+        // Now, let's re-export the set. The search query that defines the set 
+        // will no longer find it (todo: confirm this first?). However, since 
+        // the dataset still exists in the database; and would in real life 
+        // be reindexed again, we don't want to mark the OAI record for the 
+        // dataset as "deleted" just yet. (this is a new feature, as of 6.2)
+        // So, let's re-export the set...
+        
+        exportSetResponse = UtilIT.exportOaiSet(setName);
+        assertEquals(200, exportSetResponse.getStatusCode());
+        Thread.sleep(1000L); // wait for just a second, to be safe 
+        
+        // OAI Test 5. Check ListIdentifiers again:
+        
+        Response listIdentifiersResponse = UtilIT.getOaiListIdentifiers(setName, "oai_dc");
+        assertEquals(OK.getStatusCode(), listIdentifiersResponse.getStatusCode());
 
-        logger.info("identifier: " + identifier);
+        // Validate the service section of the OAI response: 
+        responseXmlPath = validateOaiVerbResponse(listIdentifiersResponse, "ListIdentifiers");
 
-        // Let's try and create an OAI set with the dataset we have just 
-        // created and published: 
-        String setName = identifier;
-        String setQuery = "dsPersistentId:" + identifier;
-        String apiPath = String.format("/api/harvest/server/oaisets/%s", setName);
+        // ... and confirm that the record for our dataset is still listed
+        // as active: 
+        List ret = responseXmlPath.getList("OAI-PMH.ListIdentifiers.header");
+
+        assertEquals(1, ret.size());
+        assertEquals(singleSetDatasetPersistentId, responseXmlPath
+                .getString("OAI-PMH.ListIdentifiers.header.identifier"));
+        assertEquals(setName, responseXmlPath
+                .getString("OAI-PMH.ListIdentifiers.header.setSpec"));
+        // ... and, most importantly, make sure the record does not have a 
+        // `status="deleted"` attribute:
+        assertNull(responseXmlPath.getString("OAI-PMH.ListIdentifiers.header.@status"));
+        
+        // TODO: (?) we could also destroy the dataset for real now, and make 
+        // sure the "deleted" attribute has been added to the OAI record. 
+        
+        // While we are at it, let's now destroy this dataset for real, and 
+        // make sure the "deleted" attribute is actually added once the set 
+        // is re-exported:
+        
+        Response destroyDatasetResponse = UtilIT.destroyDataset(singleSetDatasetPersistentId, adminUserAPIKey);
+        assertEquals(200, destroyDatasetResponse.getStatusCode());
+        destroyDatasetResponse.prettyPrint();
+        
+        // Confirm that it no longer exists: 
+        Response datasetNotFoundResponse = UtilIT.nativeGet(singleSetDatasetDatabaseId, adminUserAPIKey);
+        assertEquals(404, datasetNotFoundResponse.getStatusCode());
+        
+        // Repeat the whole production with re-exporting set and checking 
+        // ListIdentifiers:
+        
+        exportSetResponse = UtilIT.exportOaiSet(setName);
+        assertEquals(200, exportSetResponse.getStatusCode());
+        Thread.sleep(1000L); // wait for just a second, to be safe 
+        System.out.println("re-exported the dataset again, with the control dataset destroyed");
+        
+        // OAI Test 6. Check ListIdentifiers again:
+        
+        listIdentifiersResponse = UtilIT.getOaiListIdentifiers(setName, "oai_dc");
+        assertEquals(OK.getStatusCode(), listIdentifiersResponse.getStatusCode());
+
+        // Validate the service section of the OAI response: 
+        responseXmlPath = validateOaiVerbResponse(listIdentifiersResponse, "ListIdentifiers");
+
+        // ... and confirm that the record for our dataset is still listed...
+        ret = responseXmlPath.getList("OAI-PMH.ListIdentifiers.header");
+        assertEquals(1, ret.size());
+        assertEquals(singleSetDatasetPersistentId, responseXmlPath
+                .getString("OAI-PMH.ListIdentifiers.header.identifier"));
+  
+        // ... BUT, it should be marked as "deleted" now:
+        assertEquals(responseXmlPath.getString("OAI-PMH.ListIdentifiers.header.@status"), "deleted");
+
+    }
+    
+    // This test will attempt to create a set with multiple records (enough 
+    // to trigger a paged respons) and test the resumption token functionality). 
+    // Note that this test requires the OAI service to be configured with some
+    // non-default settings (the paging limits for ListIdentifiers and ListRecords
+    // must be set to 2, in order to be able to trigger this paging behavior without
+    // having to create and export too many datasets).
+    // So you will need to do this:
+    //    asadmin create-jvm-options "-Ddataverse.oai.server.maxidentifiers=2"
+    //    asadmin create-jvm-options "-Ddataverse.oai.server.maxrecords=2"
+    
+    
+    @Test
+    public void testMultiRecordOaiSet() throws InterruptedException {
+        // Setup: Let's create a control OAI set with the 5 datasets created 
+        // in the class init: 
+
+        String setName = UtilIT.getRandomString(6);
+        String setQuery = "";
+        for (String persistentId : extraDatasetsIdentifiers) {
+            if (setQuery.equals("")) {
+                setQuery = "(dsPersistentId:" + persistentId;
+            } else {
+                setQuery = setQuery.concat(" OR dsPersistentId:" + persistentId);
+            }
+        }
+        setQuery = setQuery.concat(")");
+
+        String createPath = "/api/harvest/server/oaisets/add";
 
         Response createSetResponse = given()
                 .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
                 .body(jsonForTestSpec(setName, setQuery))
-                .post(apiPath);
+                .post(createPath);
         assertEquals(201, createSetResponse.getStatusCode());
 
-        // TODO: a) look up the set via native harvest/server api; 
-        //       b) look up the set via the OAI ListSets;
-        // export set: 
-        // (this is asynchronous - so we should probably wait a little)
+        // Dataverse OAI Sets API is tested extensively in other methods here, 
+        // so no need to test in any more details than confirming the OK result
+        // above 
         Response exportSetResponse = UtilIT.exportOaiSet(setName);
         assertEquals(200, exportSetResponse.getStatusCode());
-        //SEK 09/04/2019 resonable wait time for export OAI? #6128
-        Thread.sleep(5000L);
+        Thread.sleep(1000L);
 
-        // Run ListIdentifiers on this newly-created set:
+        // OAI Test 1. Run ListIdentifiers on the set we've just created:
         Response listIdentifiersResponse = UtilIT.getOaiListIdentifiers(setName, "oai_dc");
-        List ret = listIdentifiersResponse.getBody().xmlPath().getList("OAI-PMH.ListIdentifiers.header");
+        assertEquals(OK.getStatusCode(), listIdentifiersResponse.getStatusCode());
+
+        // Validate the service section of the OAI response: 
+        XmlPath responseXmlPath = validateOaiVerbResponse(listIdentifiersResponse, "ListIdentifiers");
 
+        List<String> ret = responseXmlPath.getList("OAI-PMH.ListIdentifiers.header.identifier");
+        assertNotNull(ret);
+
+        if (logger.isLoggable(Level.FINE)) {
+            logger.info("listIdentifiersResponse.prettyPrint: "+listIdentifiersResponse.prettyPrint());
+        }
+
+        // Validate the payload of the ListIdentifiers response:
+        // 1a) There should be 2 items listed:
+        assertEquals(2, ret.size(), "Wrong number of items on the first ListIdentifiers page");
+        
+        // 1b) The response contains a resumptionToken for the next page of items:
+        String resumptionToken = responseXmlPath.getString("OAI-PMH.ListIdentifiers.resumptionToken");
+        assertNotNull(resumptionToken, "No resumption token in the ListIdentifiers response (has the jvm option dataverse.oai.server.maxidentifiers been configured?)");
+        
+        // 1c) The total number of items in the set (5) is listed correctly:
+        assertEquals(5, responseXmlPath.getInt("OAI-PMH.ListIdentifiers.resumptionToken.@completeListSize"));
+        
+        // 1d) ... and the offset (cursor) is at the right position (0): 
+        assertEquals(0, responseXmlPath.getInt("OAI-PMH.ListIdentifiers.resumptionToken.@cursor"));
+
+        // The formatting of individual item records in the ListIdentifiers response
+        // is tested extensively in the previous test method, so we are not 
+        // looking at them in such detail here; but we should record the 
+        // identifiers listed, so that we can confirm that all the set is 
+        // served as expected. 
+        
+        Set<String> persistentIdsInListIdentifiers = new HashSet<>();
+        
+        for (String persistentId : ret) {
+            persistentIdsInListIdentifiers.add(persistentId.substring(persistentId.lastIndexOf('/') + 1));
+        }
+
+        // ok, let's move on to the next ListIdentifiers page: 
+        // (we repeat the exact same checks as the above; minus the different
+        // expected offset)
+        
+        // OAI Test 2. Run ListIdentifiers with the resumptionToken obtained 
+        // in the previous step:
+        
+        listIdentifiersResponse = UtilIT.getOaiListIdentifiersWithResumptionToken(resumptionToken);
         assertEquals(OK.getStatusCode(), listIdentifiersResponse.getStatusCode());
+
+        // Validate the service section of the OAI response: 
+        responseXmlPath = validateOaiVerbResponse(listIdentifiersResponse, "ListIdentifiers");
+
+        ret = responseXmlPath.getList("OAI-PMH.ListIdentifiers.header.identifier");
         assertNotNull(ret);
-        // There should be 1 and only 1 record in the response:
-        assertEquals(1, ret.size());
-        // And the record should be the dataset we have just created:
-        assertEquals(datasetPersistentId, listIdentifiersResponse.getBody().xmlPath().getString("OAI-PMH.ListIdentifiers.header.identifier"));
 
-        // And now run GetRecord on the OAI record for the dataset:
-        Response getRecordResponse = UtilIT.getOaiRecord(datasetPersistentId, "oai_dc");
+        if (logger.isLoggable(Level.FINE)) {
+            logger.info("listIdentifiersResponse.prettyPrint: "+listIdentifiersResponse.prettyPrint());
+        }
+        
+        // Validate the payload of the ListIdentifiers response:
+        // 2a) There should still be 2 items listed:
+        assertEquals(2, ret.size(), "Wrong number of items on the second ListIdentifiers page");
+        
+        // 2b) The response should contain a resumptionToken for the next page of items:
+        resumptionToken = responseXmlPath.getString("OAI-PMH.ListIdentifiers.resumptionToken");
+        assertNotNull(resumptionToken, "No resumption token in the ListIdentifiers response");
+        
+        // 2c) The total number of items in the set (5) is listed correctly:
+        assertEquals(5, responseXmlPath.getInt("OAI-PMH.ListIdentifiers.resumptionToken.@completeListSize"));
+        
+        // 2d) ... and the offset (cursor) is at the right position (2): 
+        assertEquals(2, responseXmlPath.getInt("OAI-PMH.ListIdentifiers.resumptionToken.@cursor"));
+        
+        // Record the identifiers listed on this results page:
+        
+        for (String persistentId : ret) {
+            persistentIdsInListIdentifiers.add(persistentId.substring(persistentId.lastIndexOf('/') + 1));
+        }
+        
+        // And now the next and the final ListIdentifiers page.
+        // This time around we should get an *empty* resumptionToken (indicating
+        // that there are no more results):
+        
+        // OAI Test 3. Run ListIdentifiers with the final resumptionToken
+        
+        listIdentifiersResponse = UtilIT.getOaiListIdentifiersWithResumptionToken(resumptionToken);
+        assertEquals(OK.getStatusCode(), listIdentifiersResponse.getStatusCode());
 
-        assertEquals(datasetPersistentId, getRecordResponse.getBody().xmlPath().getString("OAI-PMH.GetRecord.record.header.identifier"));
+        // Validate the service section of the OAI response: 
+        responseXmlPath = validateOaiVerbResponse(listIdentifiersResponse, "ListIdentifiers");
+
+        ret = responseXmlPath.getList("OAI-PMH.ListIdentifiers.header.identifier");
+        assertNotNull(ret);
+
+        if (logger.isLoggable(Level.FINE)) {
+            logger.info("listIdentifiersResponse.prettyPrint: "+listIdentifiersResponse.prettyPrint());
+        }
+        
+        // Validate the payload of the ListIdentifiers response:
+        // 3a) There should be only 1 item listed:
+        assertEquals(1, ret.size(), "Wrong number of items on the final ListIdentifiers page");
+        
+        // 3b) The response contains a resumptionToken for the next page of items:
+        resumptionToken = responseXmlPath.getString("OAI-PMH.ListIdentifiers.resumptionToken");
+        assertNotNull(resumptionToken, "No resumption token in the final ListIdentifiers response");
+        assertEquals("", resumptionToken, "Non-empty resumption token in the final ListIdentifiers response");
+        
+        // 3c) The total number of items in the set (5) is still listed correctly:
+        assertEquals(5, responseXmlPath.getInt("OAI-PMH.ListIdentifiers.resumptionToken.@completeListSize"));
+        
+        // 3d) ... and the offset (cursor) is at the right position (4): 
+        assertEquals(4, responseXmlPath.getInt("OAI-PMH.ListIdentifiers.resumptionToken.@cursor"));
+        
+        // Record the last identifier listed on this final page:
+        persistentIdsInListIdentifiers.add(ret.get(0).substring(ret.get(0).lastIndexOf('/') + 1));
+        
+        // Finally, let's confirm that the expected 5 datasets have been listed
+        // as part of this Set: 
+        
+        boolean allDatasetsListed = true; 
+        
+        for (String persistentId : extraDatasetsIdentifiers) {
+            allDatasetsListed = allDatasetsListed && persistentIdsInListIdentifiers.contains(persistentId); 
+        }
+        
+        assertTrue(allDatasetsListed, "Control datasets not properly listed in the paged ListIdentifiers response");
+        
+        // OK, it is safe to assume ListIdentifiers works as it should in page mode.
+        
+        // We will now repeat the exact same tests for ListRecords (again, no 
+        // need to pay close attention to the formatting of the individual records, 
+        // since that's tested in the previous test method, since our focus is
+        // testing the paging/resumptionToken functionality)
+        
+        // OAI Test 4. Run ListRecords on the set we've just created:
+        Response listRecordsResponse = UtilIT.getOaiListRecords(setName, "oai_dc");
+        assertEquals(OK.getStatusCode(), listRecordsResponse.getStatusCode());
+
+        // Validate the service section of the OAI response: 
+        responseXmlPath = validateOaiVerbResponse(listRecordsResponse, "ListRecords");
+
+        ret = responseXmlPath.getList("OAI-PMH.ListRecords.record.header.identifier");
+        assertNotNull(ret);
+
+        if (logger.isLoggable(Level.FINE)) {
+            logger.info("listRecordsResponse.prettyPrint: "+listRecordsResponse.prettyPrint());
+        }
+        
+        // Validate the payload of the ListRecords response:
+        // 4a) There should be 2 items listed:
+        assertEquals(2, ret.size(), "Wrong number of items on the first ListRecords page");
+        
+        // 4b) The response contains a resumptionToken for the next page of items:
+        resumptionToken = responseXmlPath.getString("OAI-PMH.ListRecords.resumptionToken");
+        assertNotNull(resumptionToken, "No resumption token in the ListRecords response (has the jvm option dataverse.oai.server.maxrecords been configured?)");
+        
+        // 4c) The total number of items in the set (5) is listed correctly:
+        assertEquals(5, responseXmlPath.getInt("OAI-PMH.ListRecords.resumptionToken.@completeListSize"));
+        
+        // 4d) ... and the offset (cursor) is at the right position (0): 
+        assertEquals(0, responseXmlPath.getInt("OAI-PMH.ListRecords.resumptionToken.@cursor"));
+        
+        Set<String> persistentIdsInListRecords = new HashSet<>();
+        
+        for (String persistentId : ret) {
+            persistentIdsInListRecords.add(persistentId.substring(persistentId.lastIndexOf('/') + 1));
+        }
+
+        // ok, let's move on to the next ListRecords page: 
+        // (we repeat the exact same checks as the above; minus the different
+        // expected offset)
+        
+        // OAI Test 5. Run ListRecords with the resumptionToken obtained 
+        // in the previous step:
+        
+        listRecordsResponse = UtilIT.getOaiListRecordsWithResumptionToken(resumptionToken);
+        assertEquals(OK.getStatusCode(), listRecordsResponse.getStatusCode());
+
+        // Validate the service section of the OAI response: 
+        responseXmlPath = validateOaiVerbResponse(listRecordsResponse, "ListRecords");
+
+        ret = responseXmlPath.getList("OAI-PMH.ListRecords.record.header.identifier");
+        assertNotNull(ret);
+
+        if (logger.isLoggable(Level.FINE)) {
+            logger.info("listRecordsResponse.prettyPrint: "+listRecordsResponse.prettyPrint());
+        }
+        
+        // Validate the payload of the ListRecords response:
+        // 4a) There should still be 2 items listed:
+        assertEquals(2, ret.size(), "Wrong number of items on the second ListRecords page");
+        
+        // 4b) The response should contain a resumptionToken for the next page of items:
+        resumptionToken = responseXmlPath.getString("OAI-PMH.ListRecords.resumptionToken");
+        assertNotNull(resumptionToken, "No resumption token in the ListRecords response");
+        
+        // 4c) The total number of items in the set (5) is listed correctly:
+        assertEquals(5, responseXmlPath.getInt("OAI-PMH.ListRecords.resumptionToken.@completeListSize"));
+        
+        // 4d) ... and the offset (cursor) is at the right position (2): 
+        assertEquals(2, responseXmlPath.getInt("OAI-PMH.ListRecords.resumptionToken.@cursor"));
+        
+        // Record the identifiers listed on this results page:
+        
+        for (String persistentId : ret) {
+            persistentIdsInListRecords.add(persistentId.substring(persistentId.lastIndexOf('/') + 1));
+        }
+        
+        // And now the next and the final ListRecords page.
+        // This time around we should get an *empty* resumptionToken (indicating
+        // that there are no more results):
+        
+        // OAI Test 6. Run ListRecords with the final resumptionToken
+        
+        listRecordsResponse = UtilIT.getOaiListRecordsWithResumptionToken(resumptionToken);
+        assertEquals(OK.getStatusCode(), listRecordsResponse.getStatusCode());
+
+        // Validate the service section of the OAI response: 
+        responseXmlPath = validateOaiVerbResponse(listRecordsResponse, "ListRecords");
+
+        ret = responseXmlPath.getList("OAI-PMH.ListRecords.record.header.identifier");
+        assertNotNull(ret);
+
+        if (logger.isLoggable(Level.FINE)) {
+            logger.info("listRecordsResponse.prettyPrint: "+listRecordsResponse.prettyPrint());
+        }
+        
+        // Validate the payload of the ListRecords response:
+        // 6a) There should be only 1 item listed:
+        assertEquals(1, ret.size(), "Wrong number of items on the final ListRecords page");
+        
+        // 6b) The response contains a resumptionToken for the next page of items:
+        resumptionToken = responseXmlPath.getString("OAI-PMH.ListRecords.resumptionToken");
+        assertNotNull(resumptionToken, "No resumption token in the final ListRecords response");
+        assertEquals("", resumptionToken, "Non-empty resumption token in the final ListRecords response");
+        
+        // 6c) The total number of items in the set (5) is still listed correctly:
+        assertEquals(5, responseXmlPath.getInt("OAI-PMH.ListRecords.resumptionToken.@completeListSize"));
+        
+        // 6d) ... and the offset (cursor) is at the right position (4): 
+        assertEquals(4, responseXmlPath.getInt("OAI-PMH.ListRecords.resumptionToken.@cursor"));
+        
+        // Record the last identifier listed on this final page:
+        persistentIdsInListRecords.add(ret.get(0).substring(ret.get(0).lastIndexOf('/') + 1));
+        
+        // Finally, let's confirm again that the expected 5 datasets have been listed
+        // as part of this Set: 
+        
+        allDatasetsListed = true; 
+        
+        for (String persistentId : extraDatasetsIdentifiers) {
+            allDatasetsListed = allDatasetsListed && persistentIdsInListRecords.contains(persistentId); 
+        }
+        
+        assertTrue(allDatasetsListed, "Control datasets not properly listed in the paged ListRecords response");
+        
+        // OK, it is safe to assume ListRecords works as it should in page mode
+        // as well. 
+        
+        // And finally, let's delete the set
+        String setPath = String.format("/api/harvest/server/oaisets/%s", setName);
+        Response deleteResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, adminUserAPIKey)
+                .delete(setPath);
+        logger.info("deleteResponse.getStatusCode(): " + deleteResponse.getStatusCode());
+        assertEquals(200, deleteResponse.getStatusCode(), "Failed to delete the control multi-record set");
+    }
+
+    @Test
+    public void testInvalidQueryParams() {
+
+        // The query parameter "verb" must appear.
+        Response noVerbArg = given().get("/oai?foo=bar");
+        noVerbArg.prettyPrint();
+        noVerbArg.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("oai.error.@code", equalTo("badVerb"))
+                .body("oai.error", equalTo("No argument 'verb' found"));
+
+        // The query parameter "verb" cannot appear more than once.
+        Response repeated = given().get( "/oai?verb=foo&verb=bar");
+        repeated.prettyPrint();
+        repeated.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("oai.error.@code", equalTo("badVerb"))
+                .body("oai.error", equalTo("Verb must be singular, given: '[foo, bar]'"));
 
-        // TODO: 
-        // check the actual metadata payload of the OAI record more carefully?
     }
+
+    // TODO: 
+    // What else can we test? 
+    // Some ideas: 
+    // - Test handling of deleted dataset records - DONE! 
+    // - Test "from" and "until" time parameters
+    // - Validate full verb response records against XML schema
+    //   (for each supported metadata format, possibly?)
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java b/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java
index 0de3ac5b1d9..b327ed41349 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java
@@ -1,38 +1,35 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.path.xml.XmlPath;
-import com.jayway.restassured.response.Response;
-import static edu.harvard.iq.dataverse.api.AccessIT.apiToken;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.path.xml.XmlPath;
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
-import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
-import static javax.ws.rs.core.Response.Status.NO_CONTENT;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+
+import static edu.harvard.iq.dataverse.UserNotification.Type.*;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static jakarta.ws.rs.core.Response.Status.NO_CONTENT;
 import static org.hamcrest.CoreMatchers.equalTo;
-import org.junit.Assert;
-import static org.junit.Assert.assertTrue;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class InReviewWorkflowIT {
 
-    private static final Logger logger = Logger.getLogger(DatasetsIT.class.getCanonicalName());
-
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
 
     }
 
     @Test
-    public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
+    public void testCuratorSendsCommentsToAuthor() {
         Response createCurator = UtilIT.createRandomUser();
         createCurator.prettyPrint();
         createCurator.then().assertThat()
@@ -57,9 +54,7 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
         // Whoops, the curator forgot to give the author permission to create a dataset.
         Response noPermToCreateDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
         noPermToCreateDataset.prettyPrint();
-        noPermToCreateDataset.then().assertThat()
-                .body("message", equalTo("User @" + authorUsername + " is not permitted to perform requested action."))
-                .statusCode(UNAUTHORIZED.getStatusCode());
+        noPermToCreateDataset.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
 
         Response grantAuthorAddDataset = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR.toString(), "@" + authorUsername, curatorApiToken);
         grantAuthorAddDataset.prettyPrint();
@@ -128,7 +123,7 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
         Response authorsChecksForCommentsPrematurely = UtilIT.getNotifications(authorApiToken);
         authorsChecksForCommentsPrematurely.prettyPrint();
         authorsChecksForCommentsPrematurely.then().assertThat()
-                .body("data.notifications[0].type", equalTo("CREATEACC"))
+                .body("data.notifications[0].type", equalTo(CREATEACC.toString()))
                 // The author thinks, "What's taking the curator so long to review my data?!?"
                 .body("data.notifications[1]", equalTo(null))
                 .statusCode(OK.getStatusCode());
@@ -140,10 +135,12 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
         Response curatorChecksNotificationsAndFindsWorkToDo = UtilIT.getNotifications(curatorApiToken);
         curatorChecksNotificationsAndFindsWorkToDo.prettyPrint();
         curatorChecksNotificationsAndFindsWorkToDo.then().assertThat()
-                .body("data.notifications[0].type", equalTo("SUBMITTEDDS"))
+                .body("data.notifications[0].type", equalTo(SUBMITTEDDS.toString()))
                 .body("data.notifications[0].reasonForReturn", equalTo(null))
-                .body("data.notifications[1].type", equalTo("CREATEACC"))
+                .body("data.notifications[1].type", equalTo(CREATEDV.toString()))
                 .body("data.notifications[1].reasonForReturn", equalTo(null))
+                .body("data.notifications[2].type", equalTo(CREATEACC.toString()))
+                .body("data.notifications[2].reasonForReturn", equalTo(null))
                 .statusCode(OK.getStatusCode());
 
         // Joe Random, a user with no perms on dataset, tries returning the dataset as if he's a curator and fails.
@@ -172,7 +169,7 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
                 .statusCode(OK.getStatusCode());
         String citation = XmlPath.from(atomEntry.body().asString()).getString("bibliographicCitation");
         System.out.println("citation: " + citation);
-        Assert.assertTrue(citation.contains("A Better Title"));
+        assertTrue(citation.contains("A Better Title"));
 
         // The author tries to update the title while the dataset is in review via native.
         String pathToJsonFile = "doc/sphinx-guides/source/_static/api/dataset-update-metadata.json";
@@ -188,7 +185,7 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
         String citationAuthorNative = XmlPath.from(atomEntryAuthorNative.body().asString()).getString("bibliographicCitation");
         System.out.println("citation: " + citationAuthorNative);
         // The author was unable to change the title.
-        Assert.assertTrue(citationAuthorNative.contains("A Better Title"));
+        assertTrue(citationAuthorNative.contains("A Better Title"));
 
         // The author remembers she forgot to add a file and tries to upload it while
         // the dataset is in review via native API but this fails.
@@ -234,14 +231,14 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
                 Response returnToAuthor = UtilIT.returnDatasetToAuthor(datasetPersistentId, jsonObjectBuilder.build(), curatorApiToken);
                 returnToAuthor.prettyPrint();
             } else {
-                // Increasing the sleep delay here, from 2 to 10 sec.; 
+                // Increasing the sleep delay here, from 2 to 10 sec.;
                 // With the 2 sec. delay, it appears to have been working consistently
-                // on the phoenix server (because it's fast, I'm guessing?) - but 
-                // I kept seeing an error on my own build at this point once in a while, 
-                // because the dataset is still locked when we try to edit it, 
-                // a few lines down. -- L.A. Oct. 2018  
+                // on Jenkins (because it's fast, I'm guessing?) - but
+                // I kept seeing an error on my own build at this point once in a while,
+                // because the dataset is still locked when we try to edit it,
+                // a few lines down. -- L.A. Oct. 2018
                 // Changes to test for ingest lock and 3 seconds duration SEK 09/2019 #6128
-                assertTrue("Failed test if Ingest Lock exceeds max duration " + pathToFileThatGoesThroughIngest , UtilIT.sleepForLock(datasetId, "Ingest", curatorApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+                assertTrue(UtilIT.sleepForLock(datasetId, "Ingest", curatorApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFileThatGoesThroughIngest);
                // Thread.sleep(10000);
             }
         }
@@ -275,7 +272,7 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
                 .statusCode(OK.getStatusCode());
         String citationCuratorNative = XmlPath.from(atomEntryCuratorNative.body().asString()).getString("bibliographicCitation");
         System.out.println("citation: " + citationCuratorNative);
-        Assert.assertTrue(citationCuratorNative.contains("newTitle"));
+        assertTrue(citationCuratorNative.contains("newTitle"));
         // END https://github.com/IQSS/dataverse/issues/4139
 
         // TODO: test where curator neglecting to leave a comment. Should fail with "reason for return" required.
@@ -303,15 +300,15 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
         returnToAuthorAlreadyReturned.then().assertThat()
                 .body("message", equalTo("This dataset cannot be return to the author(s) because the latest version is not In Review. The author(s) needs to click Submit for Review first."))
                 .statusCode(FORBIDDEN.getStatusCode());
-        //FIXME when/if reasons for return are returned to notifications page and the API is 
+        //FIXME when/if reasons for return are returned to notifications page and the API is
         // updated appropriately, these tests will have to be updated.
         Response authorChecksForCommentsAgain = UtilIT.getNotifications(authorApiToken);
         authorChecksForCommentsAgain.prettyPrint();
         authorChecksForCommentsAgain.then().assertThat()
-                .body("data.notifications[0].type", equalTo("RETURNEDDS"))
+                .body("data.notifications[0].type", equalTo(RETURNEDDS.toString()))
                 // The author thinks, "This why we have curators!"
                 //.body("data.notifications[0].reasonsForReturn[0].message", equalTo("You forgot to upload any files."))
-                .body("data.notifications[1].type", equalTo("CREATEACC"))
+                .body("data.notifications[1].type", equalTo(CREATEACC.toString()))
                 //.body("data.notifications[1].reasonsForReturn", equalTo(null))
                 .statusCode(OK.getStatusCode());
 
@@ -336,12 +333,14 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
         curatorChecksNotifications.prettyPrint();
         curatorChecksNotifications.then().assertThat()
                 // TODO: Test this issue from the UI as well: https://github.com/IQSS/dataverse/issues/2526
-                .body("data.notifications[0].type", equalTo("SUBMITTEDDS"))
+                .body("data.notifications[0].type", equalTo(SUBMITTEDDS.toString()))
                 //.body("data.notifications[0].reasonsForReturn[0].message", equalTo("You forgot to upload any files."))
-                .body("data.notifications[1].type", equalTo("SUBMITTEDDS"))
+                .body("data.notifications[1].type", equalTo(INGESTCOMPLETED.toString()))
+                .body("data.notifications[2].type", equalTo(SUBMITTEDDS.toString()))
                 // Yes, it's a little weird that the first "SUBMITTEDDS" notification now shows the return reason when it showed nothing before. For now we are simply always showing all the reasons for return. They start to stack up. That way you can see the history.
                 //.body("data.notifications[1].reasonsForReturn[0].message", equalTo("You forgot to upload any files."))
-                .body("data.notifications[2].type", equalTo("CREATEACC"))
+                .body("data.notifications[3].type", equalTo(CREATEDV.toString()))
+                .body("data.notifications[4].type", equalTo(CREATEACC.toString()))
                 //.body("data.notifications[2].reasonsForReturn", equalTo(null))
                 .statusCode(OK.getStatusCode());
 
@@ -356,14 +355,14 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
         Response authorChecksForComments3 = UtilIT.getNotifications(authorApiToken);
         authorChecksForComments3.prettyPrint();
         authorChecksForComments3.then().assertThat()
-                .body("data.notifications[0].type", equalTo("RETURNEDDS"))
+                .body("data.notifications[0].type", equalTo(RETURNEDDS.toString()))
                 // .body("data.notifications[0].reasonsForReturn[0].message", equalTo("You forgot to upload any files."))
                 //.body("data.notifications[0].reasonsForReturn[1].message", equalTo("A README is required."))
-                .body("data.notifications[1].type", equalTo("RETURNEDDS"))
+                .body("data.notifications[1].type", equalTo(RETURNEDDS.toString()))
                 // Yes, it's a little weird that the reason for return on the first "RETURNEDDS" changed. We're showing the history.
                 // .body("data.notifications[1].reasonsForReturn[0].message", equalTo("You forgot to upload any files."))
                 // .body("data.notifications[1].reasonsForReturn[1].message", equalTo("A README is required."))
-                .body("data.notifications[2].type", equalTo("CREATEACC"))
+                .body("data.notifications[2].type", equalTo(CREATEACC.toString()))
                 // .body("data.notifications[2].reasonsForReturn", equalTo(null))
                 .statusCode(OK.getStatusCode());
 
@@ -387,17 +386,19 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
         curatorHopesTheReadmeIsThereNow.prettyPrint();
         curatorHopesTheReadmeIsThereNow.then().assertThat()
                 // TODO: Test this issue from the UI as well: https://github.com/IQSS/dataverse/issues/2526
-                .body("data.notifications[0].type", equalTo("SUBMITTEDDS"))
+                .body("data.notifications[0].type", equalTo(SUBMITTEDDS.toString()))
                 // .body("data.notifications[0].reasonsForReturn[0].message", equalTo("You forgot to upload any files."))
                 // .body("data.notifications[0].reasonsForReturn[1].message", equalTo("A README is required."))
-                .body("data.notifications[1].type", equalTo("SUBMITTEDDS"))
+                .body("data.notifications[1].type", equalTo(SUBMITTEDDS.toString()))
                 //  .body("data.notifications[1].reasonsForReturn[0].message", equalTo("You forgot to upload any files."))
                 //   .body("data.notifications[1].reasonsForReturn[1].message", equalTo("A README is required."))
-                .body("data.notifications[2].type", equalTo("SUBMITTEDDS"))
+                .body("data.notifications[2].type", equalTo(INGESTCOMPLETED.toString()))
+                .body("data.notifications[3].type", equalTo(SUBMITTEDDS.toString()))
                 // Yes, it's a little weird that the first "SUBMITTEDDS" notification now shows the return reason when it showed nothing before. We're showing the history.
                 //   .body("data.notifications[2].reasonsForReturn[0].message", equalTo("You forgot to upload any files."))
                 //   .body("data.notifications[2].reasonsForReturn[1].message", equalTo("A README is required."))
-                .body("data.notifications[3].type", equalTo("CREATEACC"))
+                .body("data.notifications[4].type", equalTo(CREATEDV.toString()))
+                .body("data.notifications[5].type", equalTo(CREATEACC.toString()))
                 //   .body("data.notifications[3].reasonsForReturn", equalTo(null))
                 .statusCode(OK.getStatusCode());
 
@@ -416,15 +417,15 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
         Response authorsChecksForCommentsPostPublication = UtilIT.getNotifications(authorApiToken);
         authorsChecksForCommentsPostPublication.prettyPrint();
         authorsChecksForCommentsPostPublication.then().assertThat()
-                .body("data.notifications[0].type", equalTo("PUBLISHEDDS"))
-                .body("data.notifications[1].type", equalTo("RETURNEDDS"))
+                .body("data.notifications[0].type", equalTo(PUBLISHEDDS.toString()))
+                .body("data.notifications[1].type", equalTo(RETURNEDDS.toString()))
                 // .body("data.notifications[1].reasonsForReturn[0].message", equalTo("You forgot to upload any files."))
                 //  .body("data.notifications[1].reasonsForReturn[1].message", equalTo("A README is required."))
-                .body("data.notifications[2].type", equalTo("RETURNEDDS"))
+                .body("data.notifications[2].type", equalTo(RETURNEDDS.toString()))
                 // Yes, it's a little weird that the reason for return on the first "RETURNEDDS" changed. For now we are always showing the most recent reason for return.
                 //  .body("data.notifications[2].reasonsForReturn[0].message", equalTo("You forgot to upload any files."))
                 //.body("data.notifications[2].reasonsForReturn[1].message", equalTo("A README is required."))
-                .body("data.notifications[3].type", equalTo("CREATEACC"))
+                .body("data.notifications[3].type", equalTo(CREATEACC.toString()))
                 //   .body("data.notifications[3].reasonsForReturn", equalTo(null))
                 .statusCode(OK.getStatusCode());
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/IndexIT.java b/src/test/java/edu/harvard/iq/dataverse/api/IndexIT.java
new file mode 100644
index 00000000000..2d946b4012b
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/IndexIT.java
@@ -0,0 +1,111 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import static io.restassured.RestAssured.given;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import static edu.harvard.iq.dataverse.api.UtilIT.API_TOKEN_HTTP_HEADER;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import java.util.ArrayList;
+import java.util.logging.Logger;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.NO_CONTENT;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.hamcrest.CoreMatchers;
+import static org.hamcrest.CoreMatchers.equalTo;
+import org.junit.jupiter.api.AfterEach;
+
+public class IndexIT {
+
+    private static final Logger logger = Logger.getLogger(IndexIT.class.getCanonicalName());
+
+    @BeforeAll
+    public static void setUpClass() {
+
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+
+        Response makeSureTokenlessSearchIsEnabled = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiRequiresToken);
+        makeSureTokenlessSearchIsEnabled.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+    }
+
+  
+    @Test
+    public void testIndexStatus() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        Response getDatasetJsonNoFiles = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJsonNoFiles.prettyPrint();
+        String protocol1 = JsonPath.from(getDatasetJsonNoFiles.getBody().asString()).getString("data.protocol");
+        String authority1 = JsonPath.from(getDatasetJsonNoFiles.getBody().asString()).getString("data.authority");
+        String identifier1 = JsonPath.from(getDatasetJsonNoFiles.getBody().asString()).getString("data.identifier");
+        String dataset1PersistentId = protocol1 + ":" + authority1 + "/" + identifier1;
+
+        Response uploadMd5File = UtilIT.uploadRandomFile(dataset1PersistentId, apiToken);
+        uploadMd5File.prettyPrint();
+        assertEquals(CREATED.getStatusCode(), uploadMd5File.getStatusCode());
+   
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .queryParam("sync","true")
+                .get("/api/admin/index/status");
+        response.prettyPrint();
+        ArrayList emptyList = new ArrayList<>();
+        response.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.contentInDatabaseButStaleInOrMissingFromIndex.dataverses", CoreMatchers.equalTo(emptyList))
+                .body("data.contentInDatabaseButStaleInOrMissingFromIndex.datasets", CoreMatchers.equalTo(emptyList))
+                .body("data.contentInIndexButNotDatabase.dataverses", CoreMatchers.equalTo(emptyList))
+                .body("data.contentInIndexButNotDatabase.datasets", CoreMatchers.equalTo(emptyList))
+                .body("data.contentInIndexButNotDatabase.files", CoreMatchers.equalTo(emptyList))
+                .body("data.permissionsInDatabaseButStaleInOrMissingFromIndex.dvobjects", CoreMatchers.equalTo(emptyList))
+                .body("data.permissionsInIndexButNotDatabase.permissions", CoreMatchers.equalTo(emptyList));
+        
+        Response getDatasetJsonAfterMd5File = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJsonAfterMd5File.prettyPrint();
+        getDatasetJsonAfterMd5File.then().assertThat()
+                .body("data.latestVersion.files[0].dataFile.md5", equalTo("0386269a5acb2c57b4eade587ff4db64"))
+                .body("data.latestVersion.files[0].dataFile.checksum.type", equalTo("MD5"))
+                .body("data.latestVersion.files[0].dataFile.checksum.value", equalTo("0386269a5acb2c57b4eade587ff4db64"));
+
+        int fileId = JsonPath.from(getDatasetJsonAfterMd5File.getBody().asString()).getInt("data.latestVersion.files[0].dataFile.id");
+        Response deleteFile = UtilIT.deleteFile(fileId, apiToken);
+        deleteFile.prettyPrint();
+        deleteFile.then().assertThat()
+                .statusCode(NO_CONTENT.getStatusCode());
+
+        Response deleteDatasetResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
+        deleteDatasetResponse.prettyPrint();
+     
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteDataverseResponse.prettyPrint();
+      
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        deleteUserResponse.prettyPrint();
+      
+    }
+   
+    @AfterEach
+    public void tearDownDataverse() {
+        }
+
+    @AfterAll
+    public static void cleanup() {
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/InfoIT.java b/src/test/java/edu/harvard/iq/dataverse/api/InfoIT.java
index 73a1171bf1b..4dcbab4093f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/InfoIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/InfoIT.java
@@ -1,39 +1,46 @@
 package edu.harvard.iq.dataverse.api;
 
-import static com.jayway.restassured.RestAssured.given;
-import com.jayway.restassured.response.Response;
+import static io.restassured.RestAssured.given;
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import org.junit.Test;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import org.junit.jupiter.api.Disabled;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 public class InfoIT {
 
-    @Test
-    public void testGetDatasetPublishPopupCustomText() {
-
-        given().urlEncodingEnabled(false)
-                .body("Hello world!")
-                .put("/api/admin/settings/"
-                        + SettingsServiceBean.Key.DatasetPublishPopupCustomText);
+    @BeforeAll
+    public static void setUpClass() {
+        UtilIT.deleteSetting(SettingsServiceBean.Key.MaxEmbargoDurationInMonths);
+        UtilIT.deleteSetting(SettingsServiceBean.Key.DatasetPublishPopupCustomText);
+        UtilIT.deleteSetting(SettingsServiceBean.Key.ApplicationTermsOfUse);
+        UtilIT.deleteSetting(SettingsServiceBean.Key.ApplicationTermsOfUse, "fr");
+    }
 
-        Response response = given().urlEncodingEnabled(false)
-                .get("/api/info/settings/" + SettingsServiceBean.Key.DatasetPublishPopupCustomText);
-        response.prettyPrint();
-        response.then().assertThat().statusCode(200)
-                .body("data.message", equalTo("Hello world!"));
+    @AfterAll
+    public static void afterClass() {
+        UtilIT.deleteSetting(SettingsServiceBean.Key.MaxEmbargoDurationInMonths);
+        UtilIT.deleteSetting(SettingsServiceBean.Key.DatasetPublishPopupCustomText);
+    }
 
-        given().urlEncodingEnabled(false)
-                .delete("/api/admin/settings/"
-                        + SettingsServiceBean.Key.DatasetPublishPopupCustomText);
+    @Test
+    public void testGetDatasetPublishPopupCustomText() {
+        testSettingEndpoint(SettingsServiceBean.Key.DatasetPublishPopupCustomText, "Hello world!");
+    }
 
-        response = given().urlEncodingEnabled(false)
-                .get("/api/info/settings/" + SettingsServiceBean.Key.DatasetPublishPopupCustomText);
-        response.prettyPrint();
-        response.then().assertThat().statusCode(404)
-                .body("message", equalTo("Setting "
-                        + SettingsServiceBean.Key.DatasetPublishPopupCustomText
-                        + " not found"));
+    @Test
+    public void testGetMaxEmbargoDurationInMonths() {
+        testSettingEndpoint(SettingsServiceBean.Key.MaxEmbargoDurationInMonths, "12");
     }
 
     @Test
@@ -41,7 +48,7 @@ public void testGetVersion() {
         Response response = given().urlEncodingEnabled(false)
                 .get("/api/info/version");
         response.prettyPrint();
-        response.then().assertThat().statusCode(200)
+        response.then().assertThat().statusCode(OK.getStatusCode())
                 .body("data.version", notNullValue());
     }
 
@@ -50,16 +57,111 @@ public void testGetServer() {
         Response response = given().urlEncodingEnabled(false)
                 .get("/api/info/server");
         response.prettyPrint();
-        response.then().assertThat().statusCode(200)
+        response.then().assertThat().statusCode(OK.getStatusCode())
                 .body("data.message", notNullValue());
     }
-    
+
+    @Test
+    public void testGetAppTermsOfUse() {
+        Response getTermsUnset = UtilIT.getAppTermsOfUse();
+        getTermsUnset.prettyPrint();
+        getTermsUnset.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.message", equalTo(BundleUtil.getStringFromBundle("system.app.terms")));
+
+        String terms = "Be excellent to each other.";
+
+        Response setTerms = UtilIT.setSetting(SettingsServiceBean.Key.ApplicationTermsOfUse, terms);
+        setTerms.prettyPrint();
+        setTerms.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getTermsSet = UtilIT.getAppTermsOfUse();
+        getTermsSet.prettyPrint();
+        getTermsSet.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.message", equalTo(terms));
+
+        Response getTermsEn = UtilIT.getAppTermsOfUse("en");
+        getTermsEn.prettyPrint();
+        getTermsEn.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.message", equalTo(terms));
+    }
+
+    /**
+     * Disabled because internationalization isn't set up.
+     */
+    @Disabled
+    @Test
+    public void testGetAppTermsOfUseFrench() {
+        Response getTermsUnsetFr = UtilIT.getAppTermsOfUse("fr");
+        getTermsUnsetFr.prettyPrint();
+        getTermsUnsetFr.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.message", equalTo(BundleUtil.getStringFromBundle("system.app.terms")));
+
+        Response setTermsFr = UtilIT.setSetting(SettingsServiceBean.Key.ApplicationTermsOfUse, "Appelez-moi.", "fr");
+        setTermsFr.prettyPrint();
+        setTermsFr.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getTermsFr = UtilIT.getAppTermsOfUse("fr");
+        getTermsFr.prettyPrint();
+        getTermsFr.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Appelez-moi."));
+    }
+
     @Test
-    public void getTermsOfUse() {
+    public void testGetApiTermsOfUse() {
         Response response = given().urlEncodingEnabled(false)
                 .get("/api/info/apiTermsOfUse");
         response.prettyPrint();
-        response.then().assertThat().statusCode(200)
+        response.then().assertThat().statusCode(OK.getStatusCode())
                 .body("data.message", notNullValue());
     }
+
+    @Test
+    public void testGetAllowsIncompleteMetadata() {
+        Response response = given().urlEncodingEnabled(false)
+                .get("/api/info/settings/incompleteMetadataViaApi");
+        response.prettyPrint();
+        response.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data", notNullValue());
+    }
+
+    @Test
+    public void testGetZipDownloadLimit() {
+        Response response = given().urlEncodingEnabled(false)
+                .get("/api/info/zipDownloadLimit");
+        response.prettyPrint();
+        response.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data", notNullValue());
+    }
+
+    @Test
+    public void testGetExportFormats() throws IOException {
+        Response response = given().urlEncodingEnabled(false)
+                .get("/api/info/exportFormats");
+        response.prettyPrint();
+        response.then().assertThat().statusCode(OK.getStatusCode());
+
+        String actual = response.getBody().asString();
+        String expected =
+                java.nio.file.Files.readString(
+                        Paths.get("src/test/resources/json/export-formats.json"),
+                        StandardCharsets.UTF_8);
+        JSONAssert.assertEquals(expected, actual, true);
+        
+    }
+
+
+    private void testSettingEndpoint(SettingsServiceBean.Key settingKey, String testSettingValue) {
+        String endpoint =  "/api/info/settings/" + settingKey;
+        // Setting not found
+        Response response = given().urlEncodingEnabled(false).get(endpoint);
+        response.prettyPrint();
+        response.then().assertThat().statusCode(NOT_FOUND.getStatusCode())
+                .body("message", equalTo("Setting " + settingKey + " not found"));
+        // Setting exists
+        UtilIT.setSetting(settingKey, testSettingValue);
+        response = given().urlEncodingEnabled(false).get(endpoint);
+        response.prettyPrint();
+        response.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.message", equalTo(testSettingValue));
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/InvalidCharactersIT.java b/src/test/java/edu/harvard/iq/dataverse/api/InvalidCharactersIT.java
new file mode 100644
index 00000000000..2cd7942cb5f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/InvalidCharactersIT.java
@@ -0,0 +1,73 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class InvalidCharactersIT {
+
+    @BeforeAll
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testInvalidCharacters() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+
+        UtilIT.makeSuperUser(username).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createUserNoPrivs = UtilIT.createRandomUser();
+        createUserNoPrivs.then().assertThat().statusCode(OK.getStatusCode());
+        String apiTokenNoPrivs = UtilIT.getApiTokenFromResponse(createUserNoPrivs);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+        String badCharacter = "(\f)"; // form feed (also \u000C)
+//        badCharacter = "{\u0002}"; // start of text, reported problem with exports.
+
+        JsonObjectBuilder jsonUpdateObject = Json.createObjectBuilder().add("fields",
+                Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("typeName", "title")
+                                .add("value", "MyTitle " + badCharacter)
+                        ));
+        String jsonUpdateString = jsonUpdateObject.build().toString();
+        Path jsonUpdatePath = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "update.json");
+        java.nio.file.Files.write(jsonUpdatePath, jsonUpdateString.getBytes());
+        Response addDataToBadData = UtilIT.updateFieldLevelDatasetMetadataViaNative(datasetPid, jsonUpdatePath.toString(), apiToken);
+        addDataToBadData.prettyPrint();
+        addDataToBadData.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // The \f has been removed.
+                .body("data.metadataBlocks.citation.fields[0].value", Matchers.equalTo("MyTitle ()"));
+
+
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/IpGroupsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/IpGroupsIT.java
index 88b8a9fc458..67ab63bead6 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/IpGroupsIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/IpGroupsIT.java
@@ -1,27 +1,31 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.OK;
-import static junit.framework.Assert.assertEquals;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.hamcrest.CoreMatchers.equalTo;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class IpGroupsIT {
-
+/*
+  WARNING: Running this test will creat IP Groups that give access based on any IP address.
+  This will cause other tests that count the number of Collections a user can access to be higher than expected.
+  Since this Test Class is not being run in an automated test suite it isn't an issue.
+ */
     private static final Logger logger = Logger.getLogger(IpGroupsIT.class.getCanonicalName());
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
@@ -48,12 +52,12 @@ public void testDownloadFile() {
 
         Response userWithNoRoles = UtilIT.createRandomUser();
         String userWithNoRolesApiToken = UtilIT.getApiTokenFromResponse(userWithNoRoles);
-        String pathToFile = "src/main/webapp/resources/images/favicondataverse.png";
+        String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
         Response addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
 
         addResponse.then().assertThat()
                 .body("data.files[0].dataFile.contentType", equalTo("image/png"))
-                .body("data.files[0].label", equalTo("favicondataverse.png"))
+                .body("data.files[0].label", equalTo("dataverseproject.png"))
                 .statusCode(OK.getStatusCode());
 
         Long fileId = JsonPath.from(addResponse.body().asString()).getLong("data.files[0].dataFile.id");
@@ -62,7 +66,7 @@ public void testDownloadFile() {
         Response restrictResponse = UtilIT.restrictFile(fileId.toString(), restrict, apiToken);
         restrictResponse.prettyPrint();
         restrictResponse.then().assertThat()
-                .body("data.message", equalTo("File favicondataverse.png restricted."))
+                .body("data.message", equalTo("File dataverseproject.png restricted."))
                 .statusCode(OK.getStatusCode());
 
         Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
@@ -146,6 +150,17 @@ public void testDownloadFile() {
         // Should get an OK response (able to download file) based on IP Group membership. No API token.
         assertEquals(OK.getStatusCode(), anonDownload.getStatusCode());
 
+        grantIpAll = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.CURATOR.toString(), ipGroupIdentifierString, apiToken);
+        grantIpAll.prettyPrint();
+        grantIpAll.then().assertThat()
+                .body("data.assignee", equalTo(ipGroupIdentifierString))
+                .body("data._roleAlias", equalTo("curator"))
+                .statusCode(OK.getStatusCode());
+
+        Response collectionsResp = UtilIT.getUserPermittedCollections(username, apiToken, "PublishDataset");
+        collectionsResp.prettyPrint();
+        collectionsResp.then().assertThat()
+                .statusCode(OK.getStatusCode());
     }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/JsonLDExportIT.java b/src/test/java/edu/harvard/iq/dataverse/api/JsonLDExportIT.java
new file mode 100644
index 00000000000..b07198e9f0d
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/JsonLDExportIT.java
@@ -0,0 +1,136 @@
+package edu.harvard.iq.dataverse.api;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests JSON-LD export with incomplete HTML tags in file descriptions.
+ *
+ * Incomplete HTML tags like "<CSP" or "<img" cause JsonParsingException
+ * due to MarkupChecker.stripAllTags() processing JSON-LD as HTML.
+ */
+public class JsonLDExportIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    /**
+     * Tests JSON-LD export with incomplete HTML tags in file descriptions.
+     */
+    @Test
+    public void testJsonLDExportWithIncompleteHtmlTagsInFileDescription() {
+        // Create admin user
+        Response createUserResponse = UtilIT.createRandomUser();
+        createUserResponse.then().assertThat().statusCode(200);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        String username = UtilIT.getUsernameFromResponse(createUserResponse);
+        UtilIT.makeSuperUser(username);
+
+        Integer datasetId = null;
+        String dataverseAlias = null;
+
+        try {
+            // Create test dataverse
+            Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+            createDataverseResponse.then().assertThat().statusCode(201);
+            dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+            // Publish dataverse (required before publishing datasets)
+            Response publishDataverse = UtilIT.publishDataverseViaNativeApi(
+                dataverseAlias,
+                apiToken
+            );
+            publishDataverse.then().assertThat().statusCode(200);
+
+            // Create test dataset
+            Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(
+                dataverseAlias,
+                apiToken
+            );
+            createDatasetResponse.then().assertThat().statusCode(201);
+            datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+            String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(
+                createDatasetResponse
+            );
+
+            // Upload file with incomplete HTML tags in description
+            String problematicDescription =
+                "File contains <CSP data, <img tag, <script and text ending with <";
+
+            JsonObjectBuilder fileMetadata = Json.createObjectBuilder()
+                .add("description", problematicDescription)
+                .add("label", "test-file-with-csp-tag.tab");
+
+            String pathToFile = "src/test/resources/tab/test.tab";
+
+            Response uploadResponse = UtilIT.uploadFileViaNative(
+                datasetId.toString(),
+                pathToFile,
+                fileMetadata.build(),
+                apiToken
+            );
+            uploadResponse.then().assertThat().statusCode(200);
+
+            assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFile);
+
+            // Publish dataset
+            Response publishResponse = UtilIT.publishDatasetViaNativeApi(
+                datasetPersistentId,
+                "major",
+                apiToken
+            );
+            publishResponse.then().assertThat().statusCode(200);
+
+            // Test JSON-LD export
+            Response jsonLdExportResponse = UtilIT.exportDataset(datasetPersistentId, "schema.org");
+
+            // Verify export does not fail
+            jsonLdExportResponse
+                .then()
+                .assertThat()
+                .statusCode(not(equalTo(500)))
+                .body(not(containsString("JsonParsingException")))
+                .body(not(containsString("Unexpected char -1")));
+
+            // Verify JSON structure if export succeeds
+            if (jsonLdExportResponse.getStatusCode() == 200) {
+                String responseBody = jsonLdExportResponse.getBody().asString();
+
+                // Verify valid JSON
+                assertDoesNotThrow(
+                    () -> {
+                        jakarta.json.Json.createReader(
+                            new java.io.StringReader(responseBody)
+                        ).readObject();
+                    },
+                    "JSON-LD export should produce valid JSON"
+                );
+
+                // Verify JSON-LD structure
+                assertTrue(
+                    responseBody.contains("@context") || responseBody.contains("@type"),
+                    "Response should contain JSON-LD structure"
+                );
+            }
+        } finally {
+            // Cleanup - delete in reverse order of creation
+            if (datasetId != null) {
+                UtilIT.destroyDataset(datasetId, apiToken);
+            }
+            if (dataverseAlias != null) {
+                UtilIT.deleteDataverse(dataverseAlias, apiToken);
+            }
+            UtilIT.deleteUser(username);
+        }
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/LazyRefTest.java b/src/test/java/edu/harvard/iq/dataverse/api/LazyRefTest.java
index 72cf6fae875..382a80a3493 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/LazyRefTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/LazyRefTest.java
@@ -3,8 +3,7 @@
  */
 package edu.harvard.iq.dataverse.api;
 
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/LicensesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/LicensesIT.java
new file mode 100644
index 00000000000..d5582311ee1
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/LicensesIT.java
@@ -0,0 +1,193 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.logging.Logger;
+
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class LicensesIT {
+
+    private static final Logger logger = Logger.getLogger(LicensesIT.class.getCanonicalName());
+
+    @BeforeAll
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testLicenses(){
+
+        //Setup two users - one a superuser
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createUser2 = UtilIT.createRandomUser();
+        createUser2.prettyPrint();
+        createUser2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String adminName = UtilIT.getUsernameFromResponse(createUser2);
+        String adminApiToken = UtilIT.getApiTokenFromResponse(createUser2);
+        
+        UtilIT.makeSuperUser(adminName).then().assertThat().statusCode(OK.getStatusCode());
+
+        //Try adding a license as a normal user
+        String pathToJsonFile = "src/test/resources/json/license.json";
+        Response addLicenseResponse = UtilIT.addLicense(pathToJsonFile, apiToken);
+        addLicenseResponse.prettyPrint();
+        String body = addLicenseResponse.getBody().asString();
+        String status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+
+      //Succeed in adding it as a superuser
+        Response adminAddLicenseResponse = UtilIT.addLicense(pathToJsonFile, adminApiToken);
+        adminAddLicenseResponse.prettyPrint();
+        body = adminAddLicenseResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+
+        // Extract the license ID from the location header
+        String locationHeader = adminAddLicenseResponse.getHeader("Location");
+        long addedLicenseId = Long.parseLong(locationHeader.substring(locationHeader.lastIndexOf("/") + 1));
+
+        // New test section to verify the added license
+        Response getLicenseResponse = UtilIT.getLicenseById(addedLicenseId);
+        getLicenseResponse.prettyPrint();
+        getLicenseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data", notNullValue());
+
+        // Read the content of the license.json file
+        String expectedLicenseJson;
+        try {
+            expectedLicenseJson = new String(Files.readAllBytes(Paths.get(pathToJsonFile)));
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to read license file", e);
+        }
+        JsonPath expectedJson = new JsonPath(expectedLicenseJson);
+
+        // Compare the returned license data with the expected JSON
+        JsonPath actualJson = getLicenseResponse.jsonPath();
+        assertEquals(expectedJson.getString("name"), actualJson.getString("data.name"));
+        assertEquals(expectedJson.getString("uri"), actualJson.getString("data.uri"));
+        assertEquals(expectedJson.getString("shortDescription"), actualJson.getString("data.shortDescription"));
+        assertEquals(expectedJson.getString("iconUrl"), actualJson.getString("data.iconUrl"));
+        assertEquals(expectedJson.getBoolean("active"), actualJson.getBoolean("data.active"));
+        assertEquals(expectedJson.getInt("sortOrder"), actualJson.getInt("data.sortOrder"));
+        assertEquals(expectedJson.getString("rightsIdentifier"), actualJson.getString("data.rightsIdentifier"));
+        assertEquals(expectedJson.getString("rightsIdentifierScheme"), actualJson.getString("data.rightsIdentifierScheme"));
+        assertEquals(expectedJson.getString("schemeUri"), actualJson.getString("data.schemeUri"));
+        assertEquals(expectedJson.getString("languageCode"), actualJson.getString("data.languageCode"));
+
+        //Fail to add a license with incorrect json (tries to define it's id which is assigned by the server)
+        pathToJsonFile = "src/test/resources/json/licenseError.json";
+        Response addLicenseErrorResponse = UtilIT.addLicense(pathToJsonFile, adminApiToken);
+        addLicenseErrorResponse.prettyPrint();
+        body = addLicenseErrorResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+        
+        //Get the license list
+        Response getLicensesResponse = UtilIT.getLicenses();
+        getLicensesResponse.prettyPrint();
+        body = getLicensesResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        //Last added license; with the highest id
+        long licenseId = (long) JsonPath.from(body).<Integer>getList("data.id").stream().max((x, y) -> Integer.compare(x, y)).get();
+        //Assumes the first license is active, which should be true on a test server 
+        long activeLicenseId = JsonPath.from(body).getLong("data[0].id");
+        assertEquals("OK", status);
+        
+        //Get the last license by it's id
+        Response getLicenseByIdResponse = UtilIT.getLicenseById(licenseId);
+        getLicenseByIdResponse.prettyPrint();
+        body = getLicenseByIdResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+        
+        //Fail trying to get the next license (which doesn't exist)
+        Response getLicenseErrorResponse = UtilIT.getLicenseById(licenseId + 1L);
+        getLicenseErrorResponse.prettyPrint();
+        body = getLicenseErrorResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+        
+        //Fail setting the license we added, which is inactive, license as the default
+        Response setDefaultLicenseByIdResponse = UtilIT.setDefaultLicenseById(licenseId, adminApiToken);
+        setDefaultLicenseByIdResponse.prettyPrint();
+        body = setDefaultLicenseByIdResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+        
+        //Set active and try again
+        Response setActivceLicenseByIdResponse = UtilIT.setLicenseActiveById(licenseId, true, adminApiToken);
+        setActivceLicenseByIdResponse.prettyPrint();
+        body = setActivceLicenseByIdResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+        
+        Response setDefaultLicenseByIdAgainResponse = UtilIT.setDefaultLicenseById(licenseId, adminApiToken);
+        setDefaultLicenseByIdAgainResponse.prettyPrint();
+        body = setDefaultLicenseByIdAgainResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+
+        //Fail deleting our test license as it is the default
+        Response deleteDefaultLicenseByIdResponse = UtilIT.deleteLicenseById(licenseId, adminApiToken);
+        deleteDefaultLicenseByIdResponse.prettyPrint();
+        body = deleteDefaultLicenseByIdResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+
+        //Set some other active license as the default
+        Response resetDefaultLicenseByIdResponse = UtilIT.setDefaultLicenseById(activeLicenseId, adminApiToken);
+        resetDefaultLicenseByIdResponse.prettyPrint();
+        body = resetDefaultLicenseByIdResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+        
+        //Fail trying to set null sort order
+        Response setSortOrderErrorResponse = UtilIT.setLicenseSortOrderById(activeLicenseId, null, adminApiToken);
+        setSortOrderErrorResponse.prettyPrint();
+        body = setSortOrderErrorResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+        
+        //Succeed in setting sort order
+        Response setSortOrderResponse = UtilIT.setLicenseSortOrderById(activeLicenseId, 2l, adminApiToken);
+        setSortOrderResponse.prettyPrint();
+        body = setSortOrderResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+
+        //Succeed in deleting our test license
+        Response deleteLicenseByIdResponse = UtilIT.deleteLicenseById(licenseId, adminApiToken);
+        deleteLicenseByIdResponse.prettyPrint();
+        body = deleteLicenseByIdResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+        
+        //Try to delete a non-existent license
+        Response deleteLicenseErrorResponse = UtilIT.deleteLicenseById(licenseId + 1L, adminApiToken);
+        deleteLicenseErrorResponse.prettyPrint();
+        body = deleteLicenseErrorResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+        
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/LinkIT.java b/src/test/java/edu/harvard/iq/dataverse/api/LinkIT.java
new file mode 100644
index 00000000000..dfc132c3b3f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/LinkIT.java
@@ -0,0 +1,374 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.*;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class LinkIT {
+
+    private static final Logger logger = Logger.getLogger(LinkIT.class.getCanonicalName());
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testLinkedDataset() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createSuperUser = UtilIT.createRandomUser();
+        createSuperUser.prettyPrint();
+        createSuperUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperUser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperUser);
+        Response makeSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        makeSuperuser.prettyPrint();
+        makeSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createDataverse1 = UtilIT.createRandomDataverse(apiToken);
+        createDataverse1.prettyPrint();
+        createDataverse1.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverse1Alias = UtilIT.getAliasFromResponse(createDataverse1);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverse1Alias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        Response createDataverse2 = UtilIT.createRandomDataverse(apiToken);
+        createDataverse2.prettyPrint();
+        createDataverse2.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverse2Alias = UtilIT.getAliasFromResponse(createDataverse2);
+        Integer dataverse2Id = UtilIT.getDatasetIdFromResponse(createDataverse2);
+        String dataverse2Name = JsonPath.from(createDataverse2.asString()).getString("data.name");
+
+        UtilIT.publishDataverseViaNativeApi(dataverse1Alias, apiToken).then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // You can link an unpublished dataset
+        Response tryToLinkUnpublishedDataset = UtilIT.linkDataset(datasetPid, dataverse2Alias, superuserApiToken);
+        tryToLinkUnpublishedDataset.prettyPrint();
+        tryToLinkUnpublishedDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response getLinksResponse = UtilIT.getDataverseLinks(dataverse2Alias, superuserApiToken);
+        getLinksResponse.prettyPrint();
+        getLinksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        assertEquals("Darwin's Finches", JsonPath.from(getLinksResponse.asString()).getString("data.linkedDatasets[0].title"));
+        assertEquals(datasetPid, JsonPath.from(getLinksResponse.asString()).getString("data.linkedDatasets[0].identifier"));
+
+        // A dataset cannot be linked to its parent dataverse.
+        Response tryToLinkToParentDataverse = UtilIT.linkDataset(datasetPid, dataverse1Alias, superuserApiToken);
+        tryToLinkToParentDataverse.prettyPrint();
+        tryToLinkToParentDataverse.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", equalTo("Can't link a dataset to its dataverse"));
+
+        // A dataset cannot be linked to the same dataverse again.
+        Response tryToLinkAgain = UtilIT.linkDataset(datasetPid, dataverse2Alias, superuserApiToken);
+        tryToLinkAgain.prettyPrint();
+        tryToLinkAgain.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", equalTo("Can't link a dataset that has already been linked to this dataverse"));
+    }
+
+    @Test
+    public void testCreateDeleteDataverseLink() {
+        Response createUser = UtilIT.createRandomUser();
+
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response superuserResponse = UtilIT.makeSuperUser(username);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverseResponse);
+
+        Response createDataverseResponse2 = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse2.prettyPrint();
+        String dataverseAlias2 = UtilIT.getAliasFromResponse(createDataverseResponse2);
+        Integer dataverseId2 = UtilIT.getDataverseIdFromResponse(createDataverseResponse2);
+
+        Response createLinkingDataverseResponse = UtilIT.createDataverseLink(dataverseAlias, dataverseAlias2, apiToken);
+        createLinkingDataverseResponse.prettyPrint();
+        createLinkingDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Dataverse " + dataverseAlias + " linked successfully to " + dataverseAlias2));
+
+        Response tryLinkingAgain = UtilIT.createDataverseLink(dataverseAlias, dataverseAlias2, apiToken);
+        tryLinkingAgain.prettyPrint();
+        tryLinkingAgain.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", equalTo(dataverseAlias + " has already been linked to " + dataverseAlias2 + "."));
+
+        Response getLinksResponse = UtilIT.getDataverseLinks(dataverseAlias, apiToken);
+        getLinksResponse.prettyPrint();
+        getLinksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.dataversesLinkingToThis[0].id", equalTo(dataverseId2))
+                .body("data.dataversesLinkingToThis[0].alias", equalTo(dataverseAlias2))
+                .body("data.dataversesLinkingToThis[0].displayName", equalTo(dataverseAlias2));
+        getLinksResponse = UtilIT.getDataverseLinks(dataverseAlias2, apiToken);
+        getLinksResponse.prettyPrint();
+        getLinksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.linkedDataverses[0].id", equalTo(dataverseId))
+                .body("data.linkedDataverses[0].alias", equalTo(dataverseAlias))
+                .body("data.linkedDataverses[0].displayName", equalTo(dataverseAlias));
+
+        Response deleteLinkingDataverseResponse = UtilIT.deleteDataverseLink(dataverseAlias, dataverseAlias2, apiToken);
+        deleteLinkingDataverseResponse.prettyPrint();
+        deleteLinkingDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Link from Dataverse " + dataverseAlias + " to linked Dataverse " + dataverseAlias2 + " deleted"));
+    }
+
+    @Test
+    public void testDeepLinks() {
+        Response createUser = UtilIT.createRandomUser();
+
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response superuserResponse = UtilIT.makeSuperUser(username);
+
+        Response createLevel1a = UtilIT.createSubDataverse(UtilIT.getRandomDvAlias() + "-level1a", null, apiToken, ":root");
+        createLevel1a.prettyPrint();
+        String level1a = UtilIT.getAliasFromResponse(createLevel1a);
+
+        Response createLevel1b = UtilIT.createSubDataverse(UtilIT.getRandomDvAlias() + "-level1b", null, apiToken, ":root");
+        createLevel1b.prettyPrint();
+        String level1b = UtilIT.getAliasFromResponse(createLevel1b);
+
+        Response linkLevel1toLevel1 = UtilIT.createDataverseLink(level1a, level1b, apiToken);
+        linkLevel1toLevel1.prettyPrint();
+        linkLevel1toLevel1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Dataverse " + level1a + " linked successfully to " + level1b));
+
+        assertTrue(UtilIT.sleepForSearch("*", apiToken, "&subtree="+level1b, 1, UtilIT.GENERAL_LONG_DURATION), "Zero counts in level1b");
+        
+        Response searchLevel1toLevel1 = UtilIT.search("*", apiToken, "&subtree=" + level1b);
+        searchLevel1toLevel1.prettyPrint();
+        searchLevel1toLevel1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", equalTo(1))
+                .body("data.items[0].name", equalTo(level1a));
+
+        Response createLevel2a = UtilIT.createSubDataverse(UtilIT.getRandomDvAlias() + "-level2a", null, apiToken, level1a);
+        createLevel2a.prettyPrint();
+        String level2a = UtilIT.getAliasFromResponse(createLevel2a);
+
+        Response createLevel2b = UtilIT.createSubDataverse(UtilIT.getRandomDvAlias() + "-level2b", null, apiToken, level1b);
+        createLevel2b.prettyPrint();
+        String level2b = UtilIT.getAliasFromResponse(createLevel2b);
+
+        Response linkLevel2toLevel2 = UtilIT.createDataverseLink(level2a, level2b, apiToken);
+        linkLevel2toLevel2.prettyPrint();
+        linkLevel2toLevel2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Dataverse " + level2a + " linked successfully to " + level2b));
+
+        assertTrue(UtilIT.sleepForSearch("*", apiToken, "&subtree=" + level2b, 1, UtilIT.GENERAL_LONG_DURATION), "Never found linked dataverse: " + level2b);
+        
+        Response searchLevel2toLevel2 = UtilIT.search("*", apiToken, "&subtree=" + level2b);
+        searchLevel2toLevel2.prettyPrint();
+        searchLevel2toLevel2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", equalTo(1))
+                .body("data.items[0].name", equalTo(level2a));
+
+    }
+
+    @Test
+    public void testListLinks() {
+
+        Response createUser1 = UtilIT.createRandomUser();
+        createUser1.prettyPrint();
+        createUser1.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String apiToken1 = UtilIT.getApiTokenFromResponse(createUser1);
+
+        Response createUser2 = UtilIT.createRandomUser();
+        createUser2.prettyPrint();
+        createUser2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username2 = UtilIT.getUsernameFromResponse(createUser2);
+        String apiToken2 = UtilIT.getApiTokenFromResponse(createUser2);
+
+        // Create and publish dataverse1 which both user1 and user2 have admin access to
+        Response createDataverse1 = UtilIT.createRandomDataverse(apiToken1);
+        createDataverse1.prettyPrint();
+        createDataverse1.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverse1Alias = UtilIT.getAliasFromResponse(createDataverse1);
+
+        UtilIT.publishDataverseViaNativeApi(dataverse1Alias, apiToken1).then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response grantUser2AccessOnDataverse = UtilIT.grantRoleOnDataverse(dataverse1Alias, "admin", "@" + username2, apiToken1);
+        grantUser2AccessOnDataverse.prettyPrint();
+        grantUser2AccessOnDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Create and publish dataset in dataverse1
+        // Which means that both user1 and user2 have permission to view it
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverse1Alias, apiToken1);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String datasetPid = JsonPath.from(createDataset.asString()).getString("data.persistentId");
+
+        Response publishDatasetResponse = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken1);
+        publishDatasetResponse.prettyPrint();
+        publishDatasetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Create another unpublished dataverse2 as user2, and don't grant user1 any permissions on it
+        // Which means that user1 doesn't have permission to view this dataverse before it is published
+        Response createDataverse2 = UtilIT.createRandomDataverse(apiToken2);
+        createDataverse2.prettyPrint();
+        createDataverse2.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverse2Alias = UtilIT.getAliasFromResponse(createDataverse2);
+        Integer dataverse2Id = UtilIT.getDatasetIdFromResponse(createDataverse2);
+
+        // User1 doesn't have permission to link the dataset to the unpublished dataverse2
+        Response tryToLinkToUnpublishedDataverseResponse = UtilIT.linkDataset(datasetPid, dataverse2Alias, apiToken1);
+        tryToLinkToUnpublishedDataverseResponse.prettyPrint();
+        tryToLinkToUnpublishedDataverseResponse.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode());
+
+        // But user2 does have permission to link the dataset to his own unpublished dataverse2
+        Response linkDatasetToUnpublishedDataverseResponse = UtilIT.linkDataset(datasetPid, dataverse2Alias, apiToken2);
+        linkDatasetToUnpublishedDataverseResponse.prettyPrint();
+        linkDatasetToUnpublishedDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // User1 has permission to list the links of the dataset, but cannot see the link to the unpublished dataverse2
+        Response linkDatasetsResponse = UtilIT.getDatasetLinks(datasetPid, apiToken1);
+        linkDatasetsResponse.prettyPrint();
+        linkDatasetsResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        JsonObject linkDatasets = Json.createReader(new StringReader(linkDatasetsResponse.asString())).readObject();
+        JsonArray linksList = linkDatasets.getJsonObject("data").getJsonArray("linked-dataverses");
+        assertEquals(0, linksList.size());
+
+        // User2 has permission to list the links of the dataset and can see the link to the unpublished dataverse2
+        Response linkDatasetsResponse2 = UtilIT.getDatasetLinks(datasetPid, apiToken2);
+        linkDatasetsResponse2.prettyPrint();
+        linkDatasetsResponse2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        JsonObject linkDatasets2 = Json.createReader(new StringReader(linkDatasetsResponse2.asString())).readObject();
+        JsonArray linksList2 = linkDatasets2.getJsonObject("data").getJsonArray("linked-dataverses");
+        assertEquals(1, linksList2.size());
+        assertEquals(dataverse2Id, linksList2.getJsonObject(0).getInt("id"));
+
+        UtilIT.publishDataverseViaNativeApi(dataverse2Alias, apiToken2).then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // After publishing dataverse2, user1 can now also see the link
+        Response linkDatasetsResponse3 = UtilIT.getDatasetLinks(datasetPid, apiToken1);
+        linkDatasetsResponse3.prettyPrint();
+        linkDatasetsResponse3.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        JsonObject linkDatasets3 = Json.createReader(new StringReader(linkDatasetsResponse3.asString())).readObject();
+        JsonArray linksList3 = linkDatasets3.getJsonObject("data").getJsonArray("linked-dataverses");
+        assertEquals(1, linksList3.size());
+        assertEquals(dataverse2Id, linksList3.getJsonObject(0).getInt("id"));
+
+        // Create another dataset, but don't publish it
+        Response createDataset2 = UtilIT.createRandomDatasetViaNativeApi(dataverse1Alias, apiToken1);
+        createDataset2.prettyPrint();
+        createDataset2.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataset2Pid = JsonPath.from(createDataset2.asString()).getString("data.persistentId");
+
+        // Create user3 without permissions on the unpublished dataset
+        Response createUser3 = UtilIT.createRandomUser();
+        createUser3.prettyPrint();
+        createUser3.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username3 = UtilIT.getUsernameFromResponse(createUser3);
+        String apiToken3 = UtilIT.getApiTokenFromResponse(createUser3);
+
+        // User3 cannot list the links of the unpublished dataset
+        Response linkDatasetsResponse4 = UtilIT.getDatasetLinks(dataset2Pid, apiToken3);
+        linkDatasetsResponse4.prettyPrint();
+        linkDatasetsResponse4.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode());
+
+        // Grant user3 "member" role on dataverse1, which allows viewing unpublished datasets
+        Response grantUser3AccessOnDataverse = UtilIT.grantRoleOnDataverse(dataverse1Alias, "member", "@" + username3, apiToken1);
+        grantUser3AccessOnDataverse.prettyPrint();
+        grantUser3AccessOnDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // User 3 can now also list the links
+        Response linkDatasetsResponse5 = UtilIT.getDatasetLinks(dataset2Pid, apiToken3);
+        linkDatasetsResponse5.prettyPrint();
+        linkDatasetsResponse5.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        JsonObject linkDatasets5 = Json.createReader(new StringReader(linkDatasetsResponse5.asString())).readObject();
+        JsonArray linksList5 = linkDatasets5.getJsonObject("data").getJsonArray("linked-dataverses");
+        assertEquals(0, linksList5.size());
+
+        // Non-authenticated user cannot list the links of the unpublished dataset
+        Response linkDatasetsResponse6 = UtilIT.getDatasetLinks(dataset2Pid, null);
+        linkDatasetsResponse6.prettyPrint();
+        linkDatasetsResponse6.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode());
+
+        // Publish dataset2
+        Response publishDataset2Response = UtilIT.publishDatasetViaNativeApi(dataset2Pid, "major", apiToken1);
+        publishDataset2Response.prettyPrint();
+        publishDataset2Response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // After publishing the dataset, non-authenticated user can now also list the links
+        Response linkDatasetsResponse7 = UtilIT.getDatasetLinks(dataset2Pid, null);
+        linkDatasetsResponse7.prettyPrint();
+        linkDatasetsResponse7.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        JsonObject linkDatasets7 = Json.createReader(new StringReader(linkDatasetsResponse7.asString())).readObject();
+        JsonArray linksList7 = linkDatasets7.getJsonObject("data").getJsonArray("linked-dataverses");
+        assertEquals(0, linksList7.size());
+
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/LocalContextsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/LocalContextsIT.java
new file mode 100644
index 00000000000..4d75815e88c
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/LocalContextsIT.java
@@ -0,0 +1,113 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.response.Response;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+
+import static org.hamcrest.Matchers.*;
+
+import java.util.stream.Stream;
+
+/**
+ * Since testing for valid responses requires seting up a project at
+ * localcontexts that has the PID of the test dataset and an api key, these
+ * tests are just checking for various error conditions - if the LocalContexts
+ * settings aren't set, if the LC server doesn't respond with a 200, if the user
+ * can't edit the dataset.
+ * 
+ */
+@LocalJvmSettings
+public class LocalContextsIT {
+
+    private static final String RANDOM_API_KEY = "random_api_key_12345";
+
+    @ParameterizedTest
+    @MethodSource("localContextsTestCases")
+    @JvmSetting(key = JvmSettings.LOCALCONTEXTS_URL, value = "https://localcontexts.org/")
+    @JvmSetting(key = JvmSettings.LOCALCONTEXTS_API_KEY, value = RANDOM_API_KEY)
+    public void testGetDatasetLocalContexts(String testCase) {
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+
+        Response localContextsResponse;
+        if (testCase.equals("searchLocalContexts")) {
+            localContextsResponse = UtilIT.searchLocalContexts(datasetId.toString(), apiToken);
+        } else {
+            String projectId = "sample_project_id";
+            localContextsResponse = UtilIT.getLocalContextsProject(datasetId.toString(), projectId, apiToken);
+        }
+        localContextsResponse.then().assertThat()
+                .statusCode(SERVICE_UNAVAILABLE.getStatusCode());
+
+        // Test with a second user
+        Response createSecondUser = UtilIT.createRandomUser();
+        String secondUsername = UtilIT.getUsernameFromResponse(createSecondUser);
+        String secondApiToken = UtilIT.getApiTokenFromResponse(createSecondUser);
+
+        Response secondUserResponse;
+        if (testCase.equals("searchLocalContexts")) {
+            secondUserResponse = UtilIT.searchLocalContexts(datasetId.toString(), secondApiToken);
+            secondUserResponse.then().assertThat()
+                    .statusCode(FORBIDDEN.getStatusCode());
+        } else {
+            String projectId = "sample_project_id";
+            secondUserResponse = UtilIT.getLocalContextsProject(datasetId.toString(), projectId, secondApiToken);
+            secondUserResponse.then().assertThat()
+                    .statusCode(SERVICE_UNAVAILABLE.getStatusCode());
+        }
+
+        // Clean up
+        UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
+        UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        UtilIT.deleteUser(username);
+        UtilIT.deleteUser(secondUsername);
+    }
+
+    @ParameterizedTest
+    @MethodSource("localContextsTestCases")
+    public void testLocalContextsWithoutConfiguration(String testCase) {
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        Response localContextsResponse;
+        if (testCase.equals("searchLocalContexts")) {
+            localContextsResponse = UtilIT.searchLocalContexts(datasetId.toString(), apiToken);
+        } else {
+            String projectId = "sample_project_id";
+            localContextsResponse = UtilIT.getLocalContextsProject(datasetId.toString(), projectId, apiToken);
+        }
+
+        localContextsResponse.then().assertThat()
+                .statusCode(NOT_FOUND.getStatusCode())
+                .body("message", equalTo("LocalContexts API configuration is missing."));
+
+        // Clean up
+        UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
+        UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        UtilIT.deleteUser(username);
+    }
+
+    private static Stream<String> localContextsTestCases() {
+        return Stream.of("searchLocalContexts", "getLocalContextsProject");
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/LogoutIT.java b/src/test/java/edu/harvard/iq/dataverse/api/LogoutIT.java
new file mode 100644
index 00000000000..53fa500a328
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/LogoutIT.java
@@ -0,0 +1,24 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class LogoutIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testLogout() {
+        // Test failure because feature flag is turned off
+        Response logoutResponse = UtilIT.logout();
+        assertEquals(INTERNAL_SERVER_ERROR.getStatusCode(), logoutResponse.getStatusCode());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/MakeDataCountApiIT.java b/src/test/java/edu/harvard/iq/dataverse/api/MakeDataCountApiIT.java
index c210d471ce2..0c02c5a88a1 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/MakeDataCountApiIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/MakeDataCountApiIT.java
@@ -1,21 +1,28 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Response;
+import edu.harvard.iq.dataverse.makedatacount.MakeDataCountProcessState;
+import io.restassured.path.json.JsonPath;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
 import java.io.File;
 import java.io.IOException;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import org.apache.commons.io.FileUtils;
+import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.equalTo;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class MakeDataCountApiIT {
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
@@ -51,7 +58,7 @@ public void testMakeDataCountGetMetric() throws IOException {
         Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
 
         String testFile1Src = "src/test/java/edu/harvard/iq/dataverse/makedatacount/sushi_sample_logs.json";
-        // TODO: Revisit how /tmp/sushi_sample_logs.json is copied to the phoenix server from the Jenkins server in the "build" job.
+        // TODO: Revisit how /tmp/sushi_sample_logs.json is copied to the AWS instance from the Jenkins server in the "build" job.
         String testFile1Tmp = "/tmp/sushi_sample_logs.json";
         FileUtils.copyFile(new File(testFile1Src), new File(testFile1Tmp));
         String reportOnDisk = testFile1Tmp;
@@ -171,6 +178,64 @@ public void testMakeDataCountGetMetric() throws IOException {
 
     }
 
+    @Test
+    public void testGetUpdateDeleteProcessingState() {
+        String yearMonth = "2000-01";
+        String server = "server1";
+        // make sure it isn't in the DB
+        Response deleteState = UtilIT.makeDataCountDeleteProcessingState(yearMonth);
+        deleteState.then().assertThat().statusCode(anyOf(equalTo(200), equalTo(404)));
+
+        Response getState = UtilIT.makeDataCountGetProcessingState(yearMonth);
+        getState.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+        Response updateState = UtilIT.makeDataCountUpdateProcessingState(yearMonth, MakeDataCountProcessState.MDCProcessState.PROCESSING.toString(), server);
+        updateState.then().assertThat().statusCode(OK.getStatusCode());
+        getState = UtilIT.makeDataCountGetProcessingState(yearMonth);
+        getState.then().assertThat().statusCode(OK.getStatusCode());
+        JsonPath stateJson = JsonPath.from(getState.body().asString());
+        stateJson.prettyPrint();
+        String state1 = stateJson.getString("data.state");
+        assertThat(state1, Matchers.equalTo(MakeDataCountProcessState.MDCProcessState.PROCESSING.name()));
+        String updateTimestamp1 = stateJson.getString("data.stateChangeTimestamp");
+        String updateServer1 = stateJson.getString("data.server");
+
+        updateState = UtilIT.makeDataCountUpdateProcessingState(yearMonth, MakeDataCountProcessState.MDCProcessState.DONE.toString());
+        updateState.then().assertThat().statusCode(OK.getStatusCode());
+        stateJson = JsonPath.from(updateState.body().asString());
+        stateJson.prettyPrint();
+        String state2 = stateJson.getString("data.state");
+        String updateTimestamp2 = stateJson.getString("data.stateChangeTimestamp");
+        String updateServer2 = stateJson.getString("data.server");
+        assertThat(state2, Matchers.equalTo(MakeDataCountProcessState.MDCProcessState.DONE.name()));
+        assertThat(updateServer2, Matchers.equalTo(updateServer1)); // once set the only way to remove the initial server name is to delete the state
+
+        assertThat(updateTimestamp2, Matchers.is(Matchers.greaterThan(updateTimestamp1)));
+
+        deleteState = UtilIT.makeDataCountDeleteProcessingState(yearMonth);
+        deleteState.then().assertThat().statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testUpdateProcessingStateWithInvalidState() {
+        String yearMonth = "2000-02";
+        // make sure it isn't in the DB
+        Response deleteState = UtilIT.makeDataCountDeleteProcessingState(yearMonth);
+        deleteState.then().assertThat().statusCode(anyOf(equalTo(200), equalTo(404)));
+
+        Response stateResponse = UtilIT.makeDataCountUpdateProcessingState(yearMonth, "InvalidState");
+        stateResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+
+        stateResponse = UtilIT.makeDataCountUpdateProcessingState(yearMonth, "new");
+        stateResponse.then().assertThat().statusCode(OK.getStatusCode());
+        stateResponse = UtilIT.makeDataCountUpdateProcessingState(yearMonth, "InvalidState");
+        stateResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode());
+        stateResponse = UtilIT.makeDataCountGetProcessingState(yearMonth);
+        stateResponse.then().assertThat().statusCode(OK.getStatusCode());
+        JsonPath stateJson = JsonPath.from(stateResponse.body().asString());
+        String state = stateJson.getString("data.state");
+        assertThat(state, Matchers.equalTo(MakeDataCountProcessState.MDCProcessState.NEW.name()));
+    }
+
     /**
      * Ignore is set on this test because it requires database edits to pass.
      * There are currently two citions for doi:10.7910/DVN/HQZOOB but you have
@@ -181,7 +246,7 @@ public void testMakeDataCountGetMetric() throws IOException {
      *
      * update dvobject set authority = '10.7910' where id = 10;
      */
-    @Ignore
+    @Disabled
     @Test
     public void testMakeDataCountDownloadCitation() {
         String idOrPersistentIdOfDataset = "doi:10.7910/DVN/HQZOOB";
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java b/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java
new file mode 100644
index 00000000000..909a706b911
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java
@@ -0,0 +1,140 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+
+import io.restassured.response.Response;
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+public class MetadataBlocksIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    void testListMetadataBlocks() {
+        // No optional params enabled
+        Response listMetadataBlocksResponse = UtilIT.listMetadataBlocks(false, false);
+        int expectedDefaultNumberOfMetadataBlocks = 7;
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fields", equalTo(null))
+                .body("data.size()", equalTo(expectedDefaultNumberOfMetadataBlocks));
+
+        // onlyDisplayedOnCreate=true
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(true, false);
+        int expectedOnlyDisplayedOnCreateNumberOfMetadataBlocks = 1;
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fields", equalTo(null))
+                .body("data[0].displayName", equalTo("Citation Metadata"))
+                .body("data.size()", equalTo(expectedOnlyDisplayedOnCreateNumberOfMetadataBlocks));
+
+        // returnDatasetFieldTypes=true
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(false, true);
+        int expectedNumberOfMetadataFields = 35; // 80 - 45 child duplicates;
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fields", not(equalTo(null)))
+                .body("data[0].fields.size()", equalTo(expectedNumberOfMetadataFields))
+                .body("data.size()", equalTo(expectedDefaultNumberOfMetadataBlocks))
+                .body("data[1].fields.geographicCoverage.childFields.size()", is(4))
+                .body("data[0].fields.publication.childFields.size()", is(5));
+
+        // onlyDisplayedOnCreate=true and returnDatasetFieldTypes=true
+        listMetadataBlocksResponse = UtilIT.listMetadataBlocks(true, true);
+        listMetadataBlocksResponse.prettyPrint();
+        expectedNumberOfMetadataFields = 10; // 28 - 18 child duplicates
+        listMetadataBlocksResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fields", not(equalTo(null)))
+                .body("data[0].fields.size()", equalTo(expectedNumberOfMetadataFields))
+                .body("data[0].displayName", equalTo("Citation Metadata"))
+                .body("data.size()", equalTo(expectedOnlyDisplayedOnCreateNumberOfMetadataBlocks))
+                .body("data[0].fields.author.childFields.size()", is(4));
+    }
+
+    @Test
+    void testGetMetadataBlock() {
+        Response getCitationBlock = UtilIT.getMetadataBlock("citation");
+        getCitationBlock.prettyPrint();
+        getCitationBlock.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.fields.subject.controlledVocabularyValues[0]", CoreMatchers.is("Agricultural Sciences"))
+                .body("data.fields.title.displayOrder", CoreMatchers.is(0))
+                .body("data.fields.title.typeClass", CoreMatchers.is("primitive"))
+                .body("data.fields.title.isRequired", CoreMatchers.is(true))
+                .body("data.fields.title.isAdvancedSearchFieldType", CoreMatchers.is(true));
+    }
+
+    @Test
+    void testDatasetWithAllDefaultMetadata() {
+        // given
+        Response createUser = UtilIT.createRandomUser();
+        assumeTrue(createUser.statusCode() < 300,
+            "code=" + createUser.statusCode() +
+            ", response=" + createUser.prettyPrint());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        assumeFalse(apiToken == null || apiToken.isBlank());
+
+        Response createCollection = UtilIT.createRandomDataverse(apiToken);
+        assumeTrue(createCollection.statusCode() < 300,
+            "code=" + createCollection.statusCode() +
+            ", response=" + createCollection.prettyPrint());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createCollection);
+        assumeFalse(dataverseAlias == null || dataverseAlias.isBlank());
+
+        // when
+        String pathToJsonFile = "scripts/api/data/dataset-create-new-all-default-fields.json";
+        Response createDataset = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+
+        // then
+        assertEquals(CREATED.getStatusCode(), createDataset.statusCode(),
+           "code=" + createDataset.statusCode() +
+            ", response=" + createDataset.prettyPrint());
+        createDataset.then().assertThat()
+            .body("status", CoreMatchers.equalTo("OK"));
+    }
+    
+    @Test
+    void testDatasetWithAdditionalDefaultMetadata() {
+        // given
+        Response createUser = UtilIT.createRandomUser();
+        assumeTrue(createUser.statusCode() < 300,
+            "code=" + createUser.statusCode() +
+            ", response=" + createUser.prettyPrint());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        assumeFalse(apiToken == null || apiToken.isBlank());
+
+        Response createCollection = UtilIT.createRandomDataverse(apiToken);
+        assumeTrue(createCollection.statusCode() < 300,
+            "code=" + createCollection.statusCode() +
+            ", response=" + createCollection.prettyPrint());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createCollection);
+        assumeFalse(dataverseAlias == null || dataverseAlias.isBlank());
+
+        // when
+        String pathToJsonFile = "scripts/api/data/dataset-create-new-additional-default-fields.json";
+        Response createDataset = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+
+        // then
+        assertEquals(CREATED.getStatusCode(), createDataset.statusCode(),
+           "code=" + createDataset.statusCode() +
+            ", response=" + createDataset.prettyPrint());
+        createDataset.then().assertThat()
+            .body("status", CoreMatchers.equalTo("OK"));
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/MetricsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/MetricsIT.java
index f6478bf379e..9595b9589f7 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/MetricsIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/MetricsIT.java
@@ -1,28 +1,33 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Response;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 import edu.harvard.iq.dataverse.metrics.MetricsUtil;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.OK;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import edu.harvard.iq.dataverse.util.FileUtil;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.response.Response;
+import jakarta.ws.rs.core.MediaType;
 
 //TODO: These tests are fairly flawed as they don't actually add data to compare on.
 //To improve these tests we should try adding data and see if the number DOESN'T
 //go up to show that the caching worked
 public class MetricsIT {
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
         UtilIT.clearMetricCache();
     }
 
-    @AfterClass
+    @AfterAll
     public static void cleanUpClass() {
         UtilIT.clearMetricCache();
     }
@@ -119,6 +124,54 @@ public void testGetDownloadsToMonth() {
         response.then().assertThat()
                 .statusCode(BAD_REQUEST.getStatusCode());
     }
+
+    @Test
+    public void testGetAccountsToMonth() {
+        String thismonth = MetricsUtil.getCurrentMonth();
+
+        Response response = UtilIT.metricsAccountsToMonth(thismonth, null);
+        String precache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //Run each query twice and compare results to tests caching
+        response = UtilIT.metricsAccountsToMonth(thismonth, null);
+        String postcache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertEquals(precache, postcache);
+        
+        //Test error when passing extra query params
+        response = UtilIT.metricsAccountsToMonth(thismonth, "dataLocation=local");
+        response.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+    }
+
+    @Test
+    public void testGetAccountsTimeSeries() {
+        Response response = UtilIT.metricsAccountsTimeSeries(MediaType.APPLICATION_JSON, null);
+        String precache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //Run each query twice and compare results to tests caching
+        response = UtilIT.metricsAccountsTimeSeries(MediaType.APPLICATION_JSON, null);
+        String postcache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertEquals(precache, postcache);
+
+        response = UtilIT.metricsAccountsTimeSeries(FileUtil.MIME_TYPE_CSV, null);
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        //Test error when passing extra query params
+        response = UtilIT.metricsAccountsTimeSeries(MediaType.APPLICATION_JSON, "dataLocation=local");
+        response.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+    }
     
         
     @Test
@@ -213,6 +266,29 @@ public void testGetDownloadsPastDays() {
         response.then().assertThat()
                 .statusCode(BAD_REQUEST.getStatusCode());
     }    
+
+    @Test
+    public void testGetAccountsPastDays() {
+        String days = "30";
+
+        Response response = UtilIT.metricsAccountsPastDays(days, null);
+        String precache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //Run each query twice and compare results to tests caching
+        response = UtilIT.metricsAccountsPastDays(days, null);
+        String postcache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertEquals(precache, postcache);
+
+        //Test error when passing extra query params
+        response = UtilIT.metricsAccountsPastDays(days, "dataLocation=local");
+        response.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+    }
     
 
     @Test
@@ -255,6 +331,12 @@ public void testGetDataverseBySubject() {
         response = UtilIT.metricsDataversesBySubject("dataLocation=local");
         response.then().assertThat()
                 .statusCode(BAD_REQUEST.getStatusCode());
+        
+        // Test cache delete for single metric - just tests that the call succeeds since
+        // the client can't really tell whether it gets a new/cached value
+
+        response = UtilIT.clearMetricCache("dataversesBySubject");
+        response.then().assertThat().statusCode(OK.getStatusCode());
     }
 
     @Test
@@ -301,4 +383,41 @@ public void testGetDatasetsBySubjectToMonth() {
         response.then().assertThat()
                 .statusCode(OK.getStatusCode());
     }
-}
+
+        @Test
+        public void testUnsupportedQueryParam() {
+            Response response = UtilIT.makeDataCountMetricTimeSeries("viewCount", "unsupportedParam=value");
+
+            response.then().assertThat()
+                    .statusCode(BAD_REQUEST.getStatusCode())
+                    .body("message", Matchers.containsString("queryParameter unsupportedParam not supported for this endpoint"));
+        }
+
+        @Test
+        public void testInvalidMetric() {
+            Response response = UtilIT.makeDataCountMetricTimeSeries("invalidMetric", null);
+
+            response.then().assertThat()
+                    .statusCode(BAD_REQUEST.getStatusCode())
+                    .body("message", Matchers.containsString("MetricType must be one of these values"));
+        }
+
+        @Test
+        public void testInvalidCountryCode() {
+            Response response = UtilIT.makeDataCountMetricTimeSeries("viewCount", "country=INVALID");
+
+            response.then().assertThat()
+                    .statusCode(BAD_REQUEST.getStatusCode())
+                    .body("message", Matchers.containsString("Country must be one of the ISO 1366 Country Codes"));
+        }
+
+        @Test
+        public void testValidRequest() {
+            Response response = UtilIT.makeDataCountMetricTimeSeries("viewCount", "country=us");
+
+            response.then().assertThat()
+                    .statusCode(OK.getStatusCode())
+                    .contentType(ContentType.JSON);
+        }
+
+    }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java b/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java
index d9621ff55bd..8951b0bd42e 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java
@@ -1,29 +1,31 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import static io.restassured.path.json.JsonPath.with;
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import java.io.StringReader;
+import java.util.List;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObject;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
 import org.hamcrest.CoreMatchers;
 import static org.hamcrest.CoreMatchers.equalTo;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class MoveIT {
 
     private static final Logger logger = Logger.getLogger(MoveIT.class.getCanonicalName());
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
@@ -54,10 +56,8 @@ public void testMoveDataset() {
         // Whoops, the curator forgot to give the author permission to create a dataset.
         Response noPermToCreateDataset = UtilIT.createRandomDatasetViaNativeApi(curatorDataverseAlias1, authorApiToken);
         noPermToCreateDataset.prettyPrint();
-        noPermToCreateDataset.then().assertThat()
-                .statusCode(UNAUTHORIZED.getStatusCode())
-                .body("message", equalTo("User @" + authorUsername + " is not permitted to perform requested action."));
-
+        noPermToCreateDataset.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+        
         Response grantAuthorAddDataset = UtilIT.grantRoleOnDataverse(curatorDataverseAlias1, DataverseRole.DS_CONTRIBUTOR.toString(), "@" + authorUsername, curatorApiToken);
         grantAuthorAddDataset.prettyPrint();
         grantAuthorAddDataset.then().assertThat()
@@ -278,8 +278,8 @@ public void testMoveLinkedDataset() {
                 .body("message", equalTo("Use the query parameter forceMove=true to complete the move. This dataset is linked to the new host dataverse or one of its parents. This move would remove the link to this dataset. "));
 
         JsonObject linksBeforeData = Json.createReader(new StringReader(getLinksBefore.asString())).readObject();
-        Assert.assertEquals("OK", linksBeforeData.getString("status"));
-        Assert.assertEquals(dataverse2Alias + " (id " + dataverse2Id + ")", linksBeforeData.getJsonObject("data").getJsonArray("dataverses that link to dataset id " + datasetId).getString(0));
+        assertEquals(datasetId, linksBeforeData.getJsonObject("data").getInt("id"));
+        assertEquals(dataverse2Id, linksBeforeData.getJsonObject("data").getJsonArray("linked-dataverses").get(0).asJsonObject().getInt("id"));
 
         boolean forceMove = true;
         Response forceMoveLinkedDataset = UtilIT.moveDataset(datasetId.toString(), dataverse2Alias, forceMove, superuserApiToken);
@@ -300,14 +300,111 @@ public void testMoveLinkedDataset() {
                 .statusCode(OK.getStatusCode())
                 .body("feed.entry[0].id", CoreMatchers.endsWith(datasetPid));
 
+        UtilIT.sleepForReindex(datasetPid, superuserApiToken, 20);
         Response getLinksAfter = UtilIT.getDatasetLinks(datasetPid, superuserApiToken);
         getLinksAfter.prettyPrint();
         getLinksAfter.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
         JsonObject linksAfterData = Json.createReader(new StringReader(getLinksAfter.asString())).readObject();
-        Assert.assertEquals("OK", linksAfterData.getString("status"));
-        Assert.assertEquals(0, linksAfterData.getJsonObject("data").getJsonArray("dataverses that link to dataset id " + datasetId).size());
+        assertEquals("OK", linksAfterData.getString("status"));
+        assertEquals(0, linksAfterData.getJsonObject("data").getJsonArray("linked-dataverses").size());
+    }
+    
+    @Test
+    public void testMoveDatasetsPerms() {
+
+        /*
+        Verify that permissions set on a dataset remain 
+        after that dataaset is moved
+         */
+        Response createCurator = UtilIT.createRandomUser();
+        createCurator.prettyPrint();
+        createCurator.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String curatorUsername = UtilIT.getUsernameFromResponse(createCurator);
+        String curatorApiToken = UtilIT.getApiTokenFromResponse(createCurator);
+
+        Response createRando = UtilIT.createRandomUser();
+        createCurator.prettyPrint();
+        createCurator.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String randoUsername = UtilIT.getUsernameFromResponse(createRando);
+        String randoApiToken = UtilIT.getApiTokenFromResponse(createRando);
+
+        Response createCuratorDataverse1 = UtilIT.createRandomDataverse(curatorApiToken);
+        createCuratorDataverse1.prettyPrint();
+        createCuratorDataverse1.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String curatorDataverseAlias1 = UtilIT.getAliasFromResponse(createCuratorDataverse1);
+
+        Response createAuthor = UtilIT.createRandomUser();
+        createAuthor.prettyPrint();
+        createAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String authorUsername = UtilIT.getUsernameFromResponse(createAuthor);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createAuthor);
+
+        Response grantAuthorAddDataset = UtilIT.grantRoleOnDataverse(curatorDataverseAlias1, DataverseRole.DS_CONTRIBUTOR.toString(), "@" + authorUsername, curatorApiToken);
+        grantAuthorAddDataset.prettyPrint();
+        grantAuthorAddDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.assignee", equalTo("@" + authorUsername))
+                .body("data._roleAlias", equalTo("dsContributor"));
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(curatorDataverseAlias1, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        Response datasetAsJson = UtilIT.nativeGet(datasetId, authorApiToken);
+        datasetAsJson.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        String identifier = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
+        assertEquals(10, identifier.length());
+
+        String protocol1 = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.protocol");
+        String authority1 = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.authority");
+        String identifier1 = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
+        String datasetPersistentId = protocol1 + ":" + authority1 + "/" + identifier1;
+
+        Response giveRandoPermission = UtilIT.grantRoleOnDataset(datasetPersistentId, DataverseRole.CURATOR, "@" + randoUsername, curatorApiToken);
+        giveRandoPermission.prettyPrint();
+        assertEquals(200, giveRandoPermission.getStatusCode());
+
+        Response createAuthorDataverse1 = UtilIT.createRandomDataverse(curatorApiToken);
+        createAuthorDataverse1.prettyPrint();
+        createAuthorDataverse1.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String authorDataverseAlias1 = UtilIT.getAliasFromResponse(createAuthorDataverse1);
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        createSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String superusername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response makeSuperuser = UtilIT.makeSuperUser(superusername);
+        makeSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response moveDataset1 = UtilIT.moveDataset(datasetId.toString(), authorDataverseAlias1, superuserApiToken);
+        moveDataset1.prettyPrint();
+        moveDataset1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Dataset moved successfully."));
+
+        Response roleAssignments = UtilIT.getRoleAssignmentsOnDataset(datasetId.toString(), null, superuserApiToken);
+        roleAssignments.prettyPrint();
+
+        /*
+        make sure the rando assigned role continues on the moved dataset
+        */
+        assertEquals(OK.getStatusCode(), roleAssignments.getStatusCode());
+        List<JsonObject> assignments = with(roleAssignments.body().asString()).param("curator", "curator").getJsonObject("data.findAll { data -> data._roleAlias == curator }");
+        assertEquals(1, assignments.size());
 
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/NetcdfIT.java b/src/test/java/edu/harvard/iq/dataverse/api/NetcdfIT.java
new file mode 100644
index 00000000000..0455f5e35a4
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/NetcdfIT.java
@@ -0,0 +1,227 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import jakarta.json.Json;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import org.hamcrest.CoreMatchers;
+import static org.hamcrest.CoreMatchers.equalTo;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class NetcdfIT {
+
+    @BeforeAll
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testNmclFromNetcdf() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        String pathToFile = "src/test/resources/netcdf/madis-raob";
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        long fileId = JsonPath.from(uploadFile.body().asString()).getLong("data.files[0].dataFile.id");
+        String tag = "NcML";
+        String version = "0.1";
+
+        Response downloadNcml = UtilIT.downloadAuxFile(fileId, tag, version, apiToken);
+        //downloadNcml.prettyPrint(); // long output
+        downloadNcml.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .contentType("text/xml; name=\"madis-raob.ncml_0.1.xml\";charset=UTF-8");
+
+        Response deleteNcml = UtilIT.deleteAuxFile(fileId, tag, version, apiToken);
+        deleteNcml.prettyPrint();
+        deleteNcml.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response downloadNcmlShouldFail = UtilIT.downloadAuxFile(fileId, tag, version, apiToken);
+        downloadNcmlShouldFail.then().assertThat()
+                .statusCode(NOT_FOUND.getStatusCode());
+
+        UtilIT.makeSuperUser(username).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response extractNcml = UtilIT.extractNcml(fileId, apiToken);
+        extractNcml.prettyPrint();
+        extractNcml.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response downloadNcmlShouldWork = UtilIT.downloadAuxFile(fileId, tag, version, apiToken);
+        downloadNcmlShouldWork.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+    }
+
+    @Test
+    public void testNmclFromNetcdfErrorChecking() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+
+        Response createUserRandom = UtilIT.createRandomUser();
+        createUserRandom.then().assertThat().statusCode(OK.getStatusCode());
+        String apiTokenRandom = UtilIT.getApiTokenFromResponse(createUserRandom);
+
+        String apiTokenNull = null;
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        String pathToFile = "src/test/resources/netcdf/madis-raob";
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        long fileId = JsonPath.from(uploadFile.body().asString()).getLong("data.files[0].dataFile.id");
+        String tag = "NcML";
+        String version = "0.1";
+
+        Response downloadNcmlFail = UtilIT.downloadAuxFile(fileId, tag, version, apiTokenNull);
+        downloadNcmlFail.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode());
+
+        Response downloadNcml = UtilIT.downloadAuxFile(fileId, tag, version, apiToken);
+        downloadNcml.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .contentType("text/xml; name=\"madis-raob.ncml_0.1.xml\";charset=UTF-8");
+
+        Response deleteNcml = UtilIT.deleteAuxFile(fileId, tag, version, apiToken);
+        deleteNcml.prettyPrint();
+        deleteNcml.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response downloadNcmlShouldFail = UtilIT.downloadAuxFile(fileId, tag, version, apiToken);
+        downloadNcmlShouldFail.then().assertThat()
+                .statusCode(NOT_FOUND.getStatusCode());
+
+        Response extractNcmlFailRandomUser = UtilIT.extractNcml(fileId, apiTokenRandom);
+        extractNcmlFailRandomUser.prettyPrint();
+        extractNcmlFailRandomUser.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode());
+
+        UtilIT.makeSuperUser(username).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response extractNcml = UtilIT.extractNcml(fileId, apiToken);
+        extractNcml.prettyPrint();
+        extractNcml.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.result", CoreMatchers.equalTo(true));
+
+        Response downloadNcmlShouldWork = UtilIT.downloadAuxFile(fileId, tag, version, apiToken);
+        downloadNcmlShouldWork.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response extractNcmlFailExistsAlready = UtilIT.extractNcml(fileId, apiToken);
+        extractNcmlFailExistsAlready.prettyPrint();
+        extractNcmlFailExistsAlready.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.result", CoreMatchers.equalTo(false));
+
+        Path pathToTxt = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "file.txt");
+        String contentOfTxt = "Just a text file. Don't expect NcML out!";
+        java.nio.file.Files.write(pathToTxt, contentOfTxt.getBytes());
+
+        Response uploadFileTxt = UtilIT.uploadFileViaNative(datasetId.toString(), pathToTxt.toString(), apiToken);
+        uploadFileTxt.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("file.txt"));
+
+        long fileIdTxt = JsonPath.from(uploadFileTxt.body().asString()).getLong("data.files[0].dataFile.id");
+
+        Response extractNcmlFailText = UtilIT.extractNcml(fileIdTxt, apiToken);
+        extractNcmlFailText.prettyPrint();
+        extractNcmlFailText.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.result", CoreMatchers.equalTo(false));
+
+    }
+
+    @Test
+    public void testExtraBoundingBoxFromNetcdf() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response setMetadataBlocks = UtilIT.setMetadataBlocks(dataverseAlias, Json.createArrayBuilder().add("citation").add("geospatial"), apiToken);
+        setMetadataBlocks.prettyPrint();
+        setMetadataBlocks.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        // From https://www.ncei.noaa.gov/data/international-comprehensive-ocean-atmosphere/v3/archive/nrt/ICOADS_R3.0.0_1662-10.nc
+        // via https://data.noaa.gov/onestop/collections/details/9bd5c743-0684-4e70-817a-ed977117f80c?f=temporalResolution:1%20Minute%20-%20%3C%201%20Hour;dataFormats:NETCDF
+        String pathToFile = "src/test/resources/netcdf/ICOADS_R3.0.0_1662-10.nc";
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getJson = UtilIT.nativeGet(datasetId, apiToken);
+        getJson.prettyPrint();
+        getJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.metadataBlocks.geospatial.fields[0].value[0].westLongitude.value", equalTo("-16.320007"))
+                .body("data.latestVersion.metadataBlocks.geospatial.fields[0].value[0].eastLongitude.value", equalTo("-6.220001"))
+                .body("data.latestVersion.metadataBlocks.geospatial.fields[0].value[0].northLatitude.value", equalTo("49.62"))
+                .body("data.latestVersion.metadataBlocks.geospatial.fields[0].value[0].southLatitude.value", equalTo("41.8"));
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/NotificationsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/NotificationsIT.java
new file mode 100644
index 00000000000..2ccb1365d71
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/NotificationsIT.java
@@ -0,0 +1,207 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import static edu.harvard.iq.dataverse.UserNotification.Type.*;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class NotificationsIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+        disableSendNotificationOnDatasetCreationSetting();
+    }
+
+    @AfterAll
+    public static void afterClass() {
+        disableSendNotificationOnDatasetCreationSetting();
+    }
+
+    @Test
+    public void testNotifications() {
+        // SendNotificationOnDatasetCreation setting is false
+
+        Response createAuthor = UtilIT.createRandomUser();
+        createAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createAuthor);
+
+        Response noPermsUser = UtilIT.createRandomUser();
+        noPermsUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String noPermsApiToken = UtilIT.getApiTokenFromResponse(noPermsUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(authorApiToken);
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Response getNotifications = UtilIT.getNotifications(authorApiToken);
+        getNotifications.then().assertThat()
+                .body("data.notifications[0].displayAsRead", equalTo(false))
+                .body("data.notifications[1].displayAsRead", equalTo(false))
+                .body("data.notifications.size()", equalTo(2))
+                .statusCode(OK.getStatusCode());
+
+        String firstNotificationType = JsonPath.from(getNotifications.body().asString()).getString("data.notifications[0].type");
+        String secondNotificationType = JsonPath.from(getNotifications.body().asString()).getString("data.notifications[1].type");
+        long createAccountId = 0L;
+        if (firstNotificationType.equals(CREATEDV.toString())) {
+            assertEquals(CREATEACC.toString(), secondNotificationType);
+            createAccountId = JsonPath.from(getNotifications.getBody().asString()).getLong("data.notifications[1].id");
+        } else if (firstNotificationType.equals(CREATEACC.toString())) {
+            assertEquals(CREATEDV.toString(), secondNotificationType);
+            createAccountId = JsonPath.from(getNotifications.getBody().asString()).getLong("data.notifications[0].id");
+        } else {
+            fail("Unexpected notification type: " + firstNotificationType);
+        }
+
+        Response unreadCount = UtilIT.getUnreadNotificationsCount(authorApiToken);
+        unreadCount.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.unreadCount", equalTo(2));
+
+        Response markReadNoPerms = UtilIT.markNotificationAsRead(createAccountId, noPermsApiToken);
+        markReadNoPerms.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        Response markRead = UtilIT.markNotificationAsRead(createAccountId, authorApiToken);
+        markRead.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getNotifications2 = UtilIT.getNotifications(authorApiToken);
+        getNotifications2.then().assertThat()
+                .body("data.notifications.size()", equalTo(2))
+                .statusCode(OK.getStatusCode());
+
+        firstNotificationType = JsonPath.from(getNotifications2.body().asString()).getString("data.notifications[0].type");
+        secondNotificationType = JsonPath.from(getNotifications2.body().asString()).getString("data.notifications[1].type");
+        if (firstNotificationType.equals(CREATEDV.toString())) {
+            assertEquals(CREATEACC.toString(), secondNotificationType);
+            assertTrue(JsonPath.from(getNotifications2.body().asString()).getBoolean("data.notifications[1].displayAsRead"));
+            assertFalse(JsonPath.from(getNotifications2.body().asString()).getBoolean("data.notifications[0].displayAsRead"));
+        } else if (firstNotificationType.equals(CREATEACC.toString())) {
+            assertEquals(CREATEDV.toString(), secondNotificationType);
+            assertTrue(JsonPath.from(getNotifications2.body().asString()).getBoolean("data.notifications[0].displayAsRead"));
+            assertFalse(JsonPath.from(getNotifications2.body().asString()).getBoolean("data.notifications[1].displayAsRead"));
+        } else {
+            fail("Unexpected notification type: " + firstNotificationType);
+        }
+
+        Response deleteNotificationNoPerms = UtilIT.deleteNotification(createAccountId, noPermsApiToken);
+        deleteNotificationNoPerms.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+
+        Response deleteNotification = UtilIT.deleteNotification(createAccountId, authorApiToken);
+        deleteNotification.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getNotifications3 = UtilIT.getNotifications(authorApiToken);
+        getNotifications3.then().assertThat()
+                .body("data.notifications[0].type", equalTo(CREATEDV.toString()))
+                .body("data.notifications.size()", equalTo(1))
+                .statusCode(OK.getStatusCode());
+
+        // SendNotificationOnDatasetCreation setting is true
+
+        createAuthor = UtilIT.createRandomUser();
+        createAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        authorApiToken = UtilIT.getApiTokenFromResponse(createAuthor);
+
+        Response enableSendNotificationOnDatasetCreationSettingResponse = UtilIT.enableSetting(SettingsServiceBean.Key.SendNotificationOnDatasetCreation);
+        enableSendNotificationOnDatasetCreationSettingResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        createDataverseResponse = UtilIT.createRandomDataverse(authorApiToken);
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, authorApiToken);
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        getNotifications = UtilIT.getNotifications(authorApiToken);
+        getNotifications.then().assertThat()
+                .body("data.notifications[0].displayAsRead", equalTo(false))
+                .body("data.notifications[1].displayAsRead", equalTo(false))
+                .body("data.notifications[2].displayAsRead", equalTo(false))
+                .body("data.notifications.size()", equalTo(3))
+                .statusCode(OK.getStatusCode());
+
+        List<String> notificationTypes = JsonPath.from(getNotifications.body().asString()).getList("data.notifications.type");
+
+        List<String> expectedTypes = Arrays.asList(CREATEACC.toString(), CREATEDV.toString(), DATASETCREATED.toString());
+
+        assertTrue(notificationTypes.containsAll(expectedTypes) && expectedTypes.containsAll(notificationTypes));
+
+        disableSendNotificationOnDatasetCreationSetting();
+
+        // inAppNotificationFormat optional query parameter test cases
+
+        // inAppNotificationFormat = false (default)
+
+        createAuthor = UtilIT.createRandomUser();
+        createAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        authorApiToken = UtilIT.getApiTokenFromResponse(createAuthor);
+
+        getNotifications = UtilIT.getNotifications(authorApiToken);
+        getNotifications.then().assertThat()
+                .body("data.notifications[0].displayAsRead", equalTo(false))
+                .body("data.notifications.size()", equalTo(1))
+                // In-App fields should be null
+                .body("data.notifications[0].installationBrandName", equalTo(null))
+                .body("data.notifications[0].userGuidesBaseUrl", equalTo(null))
+                .body("data.notifications[0].userGuidesVersion", equalTo(null))
+                .body("data.notifications[0].userGuidesSectionPath", equalTo(null))
+                // Email-related fields should be present
+                .body("data.notifications[0].subjectText", equalTo("Root: Your account has been created"))
+                .body("data.notifications[0].messageText", containsString("Hello,"))
+                .statusCode(OK.getStatusCode());
+
+        // inAppNotificationFormat = true
+
+        createAuthor = UtilIT.createRandomUser();
+        createAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        authorApiToken = UtilIT.getApiTokenFromResponse(createAuthor);
+
+        getNotifications = UtilIT.getNotifications(authorApiToken, true);
+        getNotifications.then().assertThat()
+                .body("data.notifications[0].displayAsRead", equalTo(false))
+                .body("data.notifications.size()", equalTo(1))
+                // In-App fields should be present
+                .body("data.notifications[0].installationBrandName", equalTo("Root"))
+                .body("data.notifications[0].userGuidesBaseUrl", equalTo("https://guides.dataverse.org"))
+                .body("data.notifications[0].userGuidesSectionPath", equalTo("user/index.html"))
+                .body("data.notifications[0].userGuidesVersion", not(equalTo(null)))
+                // Email-related fields should be null
+                .body("data.notifications[0].subjectText", equalTo(null))
+                .body("data.notifications[0].messageText", equalTo(null))
+                .statusCode(OK.getStatusCode());
+    }
+
+    private static void disableSendNotificationOnDatasetCreationSetting() {
+        Response disableSendNotificationOnDatasetCreationSettingResponse = UtilIT.deleteSetting(SettingsServiceBean.Key.SendNotificationOnDatasetCreation);
+        disableSendNotificationOnDatasetCreationSettingResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/OpenApiIT.java b/src/test/java/edu/harvard/iq/dataverse/api/OpenApiIT.java
new file mode 100644
index 00000000000..eb98bdcda8e
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/OpenApiIT.java
@@ -0,0 +1,40 @@
+package edu.harvard.iq.dataverse.api;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+
+public class OpenApiIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testOpenApi(){
+
+        Response openApi = UtilIT.getOpenAPI("application/json", "json");
+        openApi.prettyPrint();
+        openApi.then().assertThat()
+            .statusCode(200);
+
+        openApi = UtilIT.getOpenAPI("", "json");
+        openApi.prettyPrint();
+        openApi.then().assertThat()
+            .statusCode(200);
+
+        openApi = UtilIT.getOpenAPI("", "yaml");
+        openApi.prettyPrint();
+        openApi.then().assertThat()
+            .statusCode(200);
+
+        openApi = UtilIT.getOpenAPI("application/json", "yaml");
+        openApi.prettyPrint();
+        openApi.then().assertThat()
+            .statusCode(400);
+        
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/PidsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/PidsIT.java
new file mode 100644
index 00000000000..808346f021c
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/PidsIT.java
@@ -0,0 +1,197 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+/**
+ * In order to execute this test code you must be configured with DataCite
+ * credentials.
+ */
+public class PidsIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Disabled
+    @Test
+    public void testGetPid() {
+        String pid = "";
+        pid = "doi:10.70122/FK2/9BXT5O"; // findable
+        pid = "doi:10.70122/FK2/DNEUDP"; // draft
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        UtilIT.makeSuperUser(username).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response getPid = UtilIT.getPid(pid, apiToken);
+        getPid.prettyPrint();
+    }
+
+    @Test
+    public void testGetUnreservedPids() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        UtilIT.makeSuperUser(username).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response unreserved = UtilIT.getUnreservedPids(apiToken);
+        unreserved.prettyPrint();
+    }
+
+//    @Ignore
+    @Test
+    public void testReservePid() {
+        String pid = "";
+        pid = "doi:10.70122/FK2/OQ7LN4"; // 2086
+        pid = "2086";
+        pid = "4"; // doi:10.5072/FK2/HSS61L (id 4) changed to doi:10.70122/FK2/HSS61L
+        pid = "6"; // doi:10.5072/FK2/ASDBZL (id 6) changed to doi:10.70122/FK2/ASDBZL
+        pid = "19"; // doi:10.5072/FK2/0UQQS1 (id 19) changed to doi:10.70122/FK2/0UQQS1
+        pid = "doi:10.70122/FK2/BPJ78V"; // 34
+        pid = "doi:10.70122/FK2/EXMBWD"; // 39
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        UtilIT.makeSuperUser(username).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response reservePid = UtilIT.reservePid(pid, apiToken);
+        reservePid.prettyPrint();
+        // These are some errors seen along the way:
+        /**
+         * "message": "javax.ejb.EJBTransactionRolledbackException: Exception
+         * thrown from bean: javax.ejb.EJBTransactionRolledbackException:
+         * Exception thrown from bean: java.lang.RuntimeException: Response
+         * code: 400, can't write unknown attribute `repository_id`"
+         */
+        /**
+         * "message": "result: Problem calling createIdentifier:
+         * javax.ejb.EJBTransactionRolledbackException: Exception thrown from
+         * bean: javax.ejb.EJBTransactionRolledbackException: Exception thrown
+         * from bean: java.lang.RuntimeException: Response code: 403, Access is
+         * denied"
+         */
+    }
+
+    @Disabled
+    @Test
+    public void testDeletePid() {
+        String pid = "";
+        pid = "doi:10.70122/FK2/UA98UD";
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        UtilIT.makeSuperUser(username).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response deletePid = UtilIT.deletePid(pid, apiToken);
+        deletePid.prettyPrint();
+    }
+
+    @Disabled
+    @Test
+    public void testCannotPublishUntilReserved() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        UtilIT.makeSuperUser(username).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        JsonPath createdDataset = JsonPath.from(createDataset.body().asString());
+        String pid = createdDataset.getString("data.persistentId");
+
+        Response deletePid = UtilIT.deletePid(pid, apiToken);
+        deletePid.prettyPrint();
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverse.prettyPrint();
+        publishDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Publishing fails because the PID is not reserved (see deletePid above).
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(pid, "major", apiToken);
+        publishDataset.prettyPrint();
+        publishDataset.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode());
+    }
+
+    @Disabled
+    @Test
+    public void testDeleteDraftPidOnDelete() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        UtilIT.makeSuperUser(username).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        JsonPath createdDataset = JsonPath.from(createDataset.body().asString());
+        String pid = createdDataset.getString("data.persistentId");
+        int datasetId = createdDataset.getInt("data.id");
+
+        Response getPidBeforeDelete = UtilIT.getPid(pid, apiToken);
+        getPidBeforeDelete.prettyPrint(); // draft
+
+        Response deleteDataset = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
+        deleteDataset.prettyPrint();
+        deleteDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response getPidAfterDelete = UtilIT.getPid(pid, apiToken);
+        getPidAfterDelete.prettyPrint(); // 404
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/ProvIT.java b/src/test/java/edu/harvard/iq/dataverse/api/ProvIT.java
index 52143eb9981..33323ff4239 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/ProvIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/ProvIT.java
@@ -1,33 +1,42 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
-import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static junit.framework.Assert.assertEquals;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class ProvIT {
+
+    private static boolean provEnabled = false;
     
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+        Response provCollectionStatus = UtilIT.getSetting(SettingsServiceBean.Key.ProvCollectionEnabled);
+
+        provEnabled = provCollectionStatus.getStatusCode() == 200;
+        if (!provEnabled) {
+            UtilIT.enableSetting(SettingsServiceBean.Key.ProvCollectionEnabled);
+        }
     }
 
     
-    @Test 
+    @Test
     public void testFreeformDraftActions() {
+
         Response createDepositor = UtilIT.createRandomUser();
         createDepositor.prettyPrint();
         createDepositor.then().assertThat()
@@ -72,6 +81,7 @@ public void testFreeformDraftActions() {
         JsonObject provFreeFormGood = Json.createObjectBuilder()
                 .add("text", "I inherited this file from my grandfather.")
                 .build();
+        
         Response uploadProvFreeForm = UtilIT.uploadProvFreeForm(dataFileId.toString(), provFreeFormGood, apiTokenForDepositor);
         uploadProvFreeForm.prettyPrint();
         uploadProvFreeForm.then().assertThat()
@@ -81,8 +91,7 @@ public void testFreeformDraftActions() {
         datasetVersions.prettyPrint();
         datasetVersions.then().assertThat()
                 .body("data[0].versionState", equalTo("DRAFT"));
-        
-        
+     
     }
     
     @Test
@@ -197,6 +206,7 @@ public void testAddProvFile() {
                 .body("data.json", notNullValue(String.class));
         assertEquals(200, getProvJson.getStatusCode());
         
+        
         // TODO: Test that if provenance already exists in CPL (e.g. cplId in fileMetadata is not 0) upload returns error.
         //       There are currently no api endpoints to set up up this test.
         
@@ -205,11 +215,13 @@ public void testAddProvFile() {
         deleteProvJson.then().assertThat()
                 .statusCode(FORBIDDEN.getStatusCode()); //cannot delete json of a published dataset
 
-// Command removed, redundant        
-//        Response deleteProvFreeForm = UtilIT.deleteProvFreeForm(dataFileId.toString(), apiTokenForDepositor);
-//        deleteProvFreeForm.prettyPrint();
-//        deleteProvFreeForm.then().assertThat()
-//                .statusCode(OK.getStatusCode());
         
     }
+
+    @AfterAll
+    public static void tearDownClass() {
+        if(!provEnabled){
+            UtilIT.deleteSetting(SettingsServiceBean.Key.ProvCollectionEnabled);
+        }
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/RemoteStoreIT.java b/src/test/java/edu/harvard/iq/dataverse/api/RemoteStoreIT.java
new file mode 100644
index 00000000000..f653b358b33
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/RemoteStoreIT.java
@@ -0,0 +1,72 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class RemoteStoreIT {
+
+    @BeforeAll
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testRemoteStore() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+
+        UtilIT.makeSuperUser(username).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        /**
+         * Note that you must configure various JVM options for this to work:
+         *
+         * <jvm-options>-Ddataverse.files.trsa.type=remote</jvm-options>
+         * <jvm-options>-Ddataverse.files.trsa.label=trsa</jvm-options>
+         * <jvm-options>-Ddataverse.files.trsa.base-url=https://qdr.syr.edu</jvm-options>
+         * <jvm-options>-Ddataverse.files.trsa.base-store=file</jvm-options>
+         *
+         * In practice, most installation will also enable download-redirect
+         * (below) to prevent the files from being streamed through Dataverse!
+         *
+         * <jvm-options>-Ddataverse.files.trsa.download-redirect=true</jvm-options>
+         */
+        JsonObjectBuilder remoteFileJson = Json.createObjectBuilder()
+                .add("description", "A remote image.")
+                .add("storageIdentifier", "trsa://themes/custom/qdr/images/CoreTrustSeal-logo-transparent.png")
+                .add("checksumType", "MD5")
+                .add("md5Hash", "509ef88afa907eaf2c17c1c8d8fde77e")
+                .add("label", "testlogo.png")
+                .add("fileName", "testlogo.png")
+                .add("mimeType", "image/png");
+
+        Response addRemoteFile = UtilIT.addRemoteFile(datasetId.toString(), remoteFileJson.build().toString(), apiToken);
+        addRemoteFile.prettyPrint();
+        addRemoteFile.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        System.out.println("done!");
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/RolesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/RolesIT.java
new file mode 100644
index 00000000000..3173b8918b4
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/RolesIT.java
@@ -0,0 +1,164 @@
+
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.util.logging.Logger;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ *
+ * @author skraffmi
+ */
+public class RolesIT {
+    
+    private static final Logger logger = Logger.getLogger(RolesIT.class.getCanonicalName());
+
+    @BeforeAll
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+    
+    @Test
+    public void testCreateDeleteRoles() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.makeSuperUser(username);
+        
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        String pathToJsonFile = "scripts/api/data/role-test-addRole.json";
+        Response addBuiltinRoleResponse = UtilIT.addBuiltInRole(pathToJsonFile);
+        addBuiltinRoleResponse.prettyPrint();
+        String body = addBuiltinRoleResponse.getBody().asString();
+        String status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+        
+        //Try to delete from non-admin api - should fail.
+        
+        Response deleteBuiltinRoleResponseError = UtilIT.deleteDataverseRole("testRole", apiToken);
+        deleteBuiltinRoleResponseError.prettyPrint();
+        body = deleteBuiltinRoleResponseError.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+        
+        deleteBuiltinRoleResponseError.then().assertThat().body("message", equalTo("May not delete Built In Role Test Role."));
+
+        
+        Response deleteBuiltinRoleResponseSucceed = UtilIT.deleteBuiltInRole("testRole");
+        deleteBuiltinRoleResponseSucceed.prettyPrint();
+        body = deleteBuiltinRoleResponseSucceed.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+        
+        //add as dataverse role
+        Response addDataverseRoleResponse = UtilIT.addDataverseRole(pathToJsonFile, dataverseAlias, apiToken);
+        addDataverseRoleResponse.prettyPrint();
+        body = addBuiltinRoleResponse.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+
+        Response createNoPermsUser = UtilIT.createRandomUser();
+        createNoPermsUser.prettyPrint();
+        String noPermsapiToken = UtilIT.getApiTokenFromResponse(createNoPermsUser);
+
+        Response noPermsResponse = UtilIT.viewDataverseRole("testRole", noPermsapiToken);
+        noPermsResponse.prettyPrint();
+        noPermsResponse.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+
+        Response viewDataverseRoleResponse = UtilIT.viewDataverseRole("testRole", apiToken);
+        viewDataverseRoleResponse.prettyPrint();
+        body = viewDataverseRoleResponse.getBody().asString();
+        String idString = JsonPath.from(body).getString("data.id");
+        
+        System.out.print("idString: " + idString);
+        
+        Response deleteDataverseRoleResponseBadAlias = UtilIT.deleteDataverseRole("badAlias", apiToken);
+        deleteDataverseRoleResponseBadAlias.prettyPrint();
+        body = deleteDataverseRoleResponseBadAlias.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);        
+        deleteDataverseRoleResponseBadAlias.then().assertThat().body("message", equalTo("Dataverse Role with alias badAlias not found."));
+        
+        Long idBad = Long.parseLong(idString) + 10;
+        Response deleteDataverseRoleResponseBadId = UtilIT.deleteDataverseRoleById(idBad.toString(), apiToken);
+        deleteDataverseRoleResponseBadId.prettyPrint();
+        body = deleteDataverseRoleResponseBadId.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("ERROR", status);
+        deleteDataverseRoleResponseBadId.then().assertThat().body("message", equalTo("Dataverse Role with ID " + idBad.toString() + " not found."));
+        
+        Response deleteDataverseRoleResponseSucceed = UtilIT.deleteDataverseRoleById(idString, apiToken);
+        deleteDataverseRoleResponseSucceed.prettyPrint();
+        body = deleteDataverseRoleResponseSucceed.getBody().asString();
+        status = JsonPath.from(body).getString("status");
+        assertEquals("OK", status);
+
+    }
+
+    @Test
+    public void testGetUserSelectableRoles() {
+        Response createAdminUser = UtilIT.createRandomUser();
+
+        String adminUsername = UtilIT.getUsernameFromResponse(createAdminUser);
+        String adminApiToken = UtilIT.getApiTokenFromResponse(createAdminUser);
+        UtilIT.makeSuperUser(adminUsername);
+
+        Response createUser = UtilIT.createRandomUser();
+
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        // Non-superuser with no assigned roles: return all roles as fallback.
+
+        Response getUserSelectableRolesResponse = UtilIT.getUserSelectableRoles(apiToken);
+
+        getUserSelectableRolesResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(8));
+
+        // Non-superuser with assigned role: return assigned role.
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(adminApiToken);
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response grantUserAddDataset = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR, "@" + username, adminApiToken);
+
+        grantUserAddDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.assignee", equalTo("@" + username))
+                .body("data._roleAlias", equalTo("dsContributor"));
+
+        getUserSelectableRolesResponse = UtilIT.getUserSelectableRoles(apiToken);
+        getUserSelectableRolesResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(1))
+                .body("data[0].alias", equalTo(DataverseRole.DS_CONTRIBUTOR));
+
+        // Superuser: return all roles.
+
+        getUserSelectableRolesResponse = UtilIT.getUserSelectableRoles(adminApiToken);
+
+        getUserSelectableRolesResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(8));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/S3AccessDirectIT.java b/src/test/java/edu/harvard/iq/dataverse/api/S3AccessDirectIT.java
new file mode 100644
index 00000000000..1e44d952af7
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/S3AccessDirectIT.java
@@ -0,0 +1,97 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import static io.restassured.RestAssured.given;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.junit.jupiter.api.Test;
+
+public class S3AccessDirectIT {
+
+    @Test
+    public void testS3DirectUpload() {
+        // TODO: remove all these constants
+        RestAssured.baseURI = "https://demo.dataverse.org";
+        String apiToken = "";
+        String datasetPid = "doi:10.70122/FK2/UBWSJU";
+        String datasetId = "2106131";
+        long size = 1000000000l;
+
+        Response getUploadUrls = getUploadUrls(datasetPid, size, apiToken);
+        getUploadUrls.prettyPrint();
+        getUploadUrls.then().assertThat().statusCode(200);
+
+        String url = JsonPath.from(getUploadUrls.asString()).getString("data.url");
+        String partSize = JsonPath.from(getUploadUrls.asString()).getString("data.partSize");
+        String storageIdentifier = JsonPath.from(getUploadUrls.asString()).getString("data.storageIdentifier");
+        System.out.println("url: " + url);
+        System.out.println("partSize: " + partSize);
+        System.out.println("storageIdentifier: " + storageIdentifier);
+
+        System.out.println("uploading file via direct upload");
+        String decodedUrl = null;
+        try {
+            decodedUrl = URLDecoder.decode(url, StandardCharsets.UTF_8.name());
+        } catch (UnsupportedEncodingException ex) {
+        }
+
+        InputStream inputStream = new ByteArrayInputStream("bumble".getBytes(StandardCharsets.UTF_8));
+        Response uploadFileDirect = uploadFileDirect(decodedUrl, inputStream);
+        uploadFileDirect.prettyPrint();
+        uploadFileDirect.then().assertThat().statusCode(200);
+
+        // TODO: Use MD5 or whatever Dataverse is configured for and
+        // actually calculate it.
+        String jsonData = """
+{
+    "description": "My description.",
+    "directoryLabel": "data/subdir1",
+    "categories": [
+      "Data"
+    ],
+    "restrict": "false",
+    "storageIdentifier": "%s",
+    "fileName": "file1.txt",
+    "mimeType": "text/plain",
+    "checksum": {
+      "@type": "SHA-1",
+      "@value": "123456"
+    }
+}
+""".formatted(storageIdentifier);
+        Response addRemoteFile = UtilIT.addRemoteFile(datasetId, jsonData, apiToken);
+        addRemoteFile.prettyPrint();
+        addRemoteFile.then().assertThat()
+                .statusCode(200);
+    }
+
+    static Response getUploadUrls(String idOrPersistentIdOfDataset, long sizeInBytes, String apiToken) {
+        String idInPath = idOrPersistentIdOfDataset; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDataset)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "&persistentId=" + idOrPersistentIdOfDataset;
+        }
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.get("/api/datasets/" + idInPath + "/uploadurls?size=" + sizeInBytes + optionalQueryParam);
+    }
+
+    static Response uploadFileDirect(String url, InputStream inputStream) {
+        return given()
+                .header("x-amz-tagging", "dv-state=temp")
+                .body(inputStream)
+                .put(url);
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/S3AccessIT.java b/src/test/java/edu/harvard/iq/dataverse/api/S3AccessIT.java
index 29cb6895bba..137c2ef4c7b 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/S3AccessIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/S3AccessIT.java
@@ -1,71 +1,738 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import static com.jayway.restassured.RestAssured.given;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.*;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
+import edu.harvard.iq.dataverse.util.json.JsonParser;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import io.restassured.RestAssured;
+import io.restassured.http.Header;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import static javax.ws.rs.core.Response.Status.OK;
-import static junit.framework.Assert.assertEquals;
+
+import jakarta.json.JsonObject;
+
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.Matchers.startsWith;
-import org.junit.After;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
- *  NOTE: This test WILL NOT pass if your installation is not configured for Amazon S3 storage.
- *  For S3 storage, you must set two jvm options: storage-driver-id and s3-bucket-name
- *  Refer to the guides or to https://github.com/IQSS/dataverse/issues/3921#issuecomment-319973245
- * @author bsilverstein
+ * This test requires LocalStack and Minio to be running. Developers can use our
+ * docker-compose file, which has all the necessary configuration.
  */
 public class S3AccessIT {
-    
+
     private static final Logger logger = Logger.getLogger(S3AccessIT.class.getCanonicalName());
 
-    @BeforeClass
+    static final String BUCKET_NAME = "mybucket";
+    static S3Client s3localstack = null;
+    static S3Client s3minio = null;
+
+    @BeforeAll
     public static void setUp() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
-        
+
+        // At least in when spun up by our docker-compose file, the creds don't matter for LocalStack.
+        String accessKeyLocalStack = "whatever";
+        String secretKeyLocalStack = "not used";
+
+        s3localstack = S3Client.builder()
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKeyLocalStack, secretKeyLocalStack)))
+                .endpointOverride(URI.create("http://s3.localhost.localstack.cloud:4566"))
+                .region(Region.US_EAST_2)
+                .build();
+
+        String accessKeyMinio = "4cc355_k3y";
+        String secretKeyMinio = "s3cr3t_4cc355_k3y";
+        s3minio = S3Client.builder()
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKeyMinio, secretKeyMinio)))
+                .endpointOverride(URI.create("http://localhost:9000"))
+                .region(Region.US_EAST_1)
+                .forcePathStyle(true)
+                .build();
+
+        // create bucket if it doesn't exist
+        try {
+            s3localstack.headBucket(HeadBucketRequest.builder().bucket(BUCKET_NAME).build());
+        } catch (NoSuchBucketException ex) {
+            s3localstack.createBucket(CreateBucketRequest.builder().bucket(BUCKET_NAME).build());
+        }
+
+        try {
+            s3minio.headBucket(HeadBucketRequest.builder().bucket(BUCKET_NAME).build());
+        } catch (NoSuchBucketException ex) {
+            try {
+                CreateBucketResponse createBucketResponse = s3minio.createBucket(CreateBucketRequest.builder().bucket(BUCKET_NAME).build());
+                if (createBucketResponse.sdkHttpResponse().isSuccessful()) {
+                    System.out.println("Bucket created successfully");
+                } else {
+                    System.err.println("Failed to create bucket: " + createBucketResponse.sdkHttpResponse().statusCode());
+                }
+            } catch (S3Exception e) {
+                System.err.println("Error creating bucket: " + e.getMessage());
+            }
+        }
     }
-    
+
+    /**
+     * We're using MinIO for testing non-direct upload.
+     */
     @Test
-    public void testAddDataFileS3Prefix() {
+    public void testNonDirectUpload() {
+        String driverId = "minio1";
+        String driverLabel = "MinIO";
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        createSuperuser.then().assertThat().statusCode(200);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        String superusername = UtilIT.getUsernameFromResponse(createSuperuser);
+        UtilIT.makeSuperUser(superusername).then().assertThat().statusCode(200);
+        Response storageDrivers = UtilIT.listStorageDrivers(superuserApiToken);
+        storageDrivers.prettyPrint();
+        // TODO where is "Local/local" coming from?
+        String drivers = """
+{
+    "status": "OK",
+    "data": {
+        "LocalStack": "localstack1",
+        "MinIO": "minio1",
+        "Local": "local",
+        "Filesystem": "file1"
+    }
+}""";
+
         //create user who will make a dataverse/dataset
         Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(200);
         String username = UtilIT.getUsernameFromResponse(createUser);
         String apiToken = UtilIT.getApiTokenFromResponse(createUser);
-        
+
         Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
         String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
-        
+
+        Response originalStorageDriver = UtilIT.getStorageDriver(dataverseAlias, superuserApiToken);
+        originalStorageDriver.prettyPrint();
+        originalStorageDriver.then().assertThat()
+                .body("data.message", equalTo("undefined"))
+                .statusCode(200);
+
+        Response setStorageDriverToS3 = UtilIT.setStorageDriver(dataverseAlias, driverLabel, superuserApiToken);
+        setStorageDriverToS3.prettyPrint();
+        setStorageDriverToS3.then().assertThat()
+                .statusCode(200);
+
+        Response updatedStorageDriver = UtilIT.getStorageDriver(dataverseAlias, superuserApiToken);
+        updatedStorageDriver.prettyPrint();
+        updatedStorageDriver.then().assertThat()
+                .statusCode(200);
+
         Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
-        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
         createDatasetResponse.prettyPrint();
-        
-        //upload a tabular file via native, check storage id prefix for s3
+        createDatasetResponse.then().assertThat().statusCode(201);
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        String datasetPid = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+        String datasetStorageIdentifier = datasetPid.substring(4);
+
+        Response getDatasetMetadata = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetMetadata.prettyPrint();
+        getDatasetMetadata.then().assertThat().statusCode(200);
+
+        //upload a tabular file via native, check storage id prefix for driverId
         String pathToFile = "scripts/search/data/tabular/1char";
         Response addFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
         addFileResponse.prettyPrint();
         addFileResponse.then().assertThat()
-                .body("data.files[0].dataFile.storageIdentifier", startsWith("s3://"));
-        
-        //clean up test dvobjects and user
-        Response deleteDataset = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
-        deleteDataset.prettyPrint();
-        deleteDataset.then().assertThat()
+                .statusCode(200)
+                .body("data.files[0].dataFile.storageIdentifier", startsWith(driverId + "://"));
+
+        String fileId = JsonPath.from(addFileResponse.body().asString()).getString("data.files[0].dataFile.id");
+
+        Response getfileMetadata = UtilIT.getFileData(fileId, apiToken);
+        getfileMetadata.prettyPrint();
+        getfileMetadata.then().assertThat().statusCode(200);
+
+        String storageIdentifier = JsonPath.from(addFileResponse.body().asString()).getString("data.files[0].dataFile.storageIdentifier");
+        String keyInDataverse = storageIdentifier.split(":")[2];
+        Assertions.assertEquals(driverId + "://" + BUCKET_NAME + ":" + keyInDataverse, storageIdentifier);
+
+        String keyInS3 = datasetStorageIdentifier + "/" + keyInDataverse;
+        String s3Object = null;
+        try {
+            ResponseInputStream<GetObjectResponse> s3ObjectResponse = s3minio.getObject(GetObjectRequest.builder()
+                    .bucket(BUCKET_NAME)
+                    .key(keyInS3)
+                    .build());
+            // Read the content of the object into a string
+            s3Object = new String(s3ObjectResponse.readAllBytes(), StandardCharsets.UTF_8);
+            System.out.println("s3Object: " + s3Object);
+
+            // The file uploaded above only contains the character "a".
+            assertEquals("a".trim(), s3Object.trim());
+        } catch (S3Exception ex) {
+            fail("Failed to get object from S3: " + ex.getMessage());
+        } catch (IOException ex) {
+            fail("Failed to read S3 object content: " + ex.getMessage());
+        }
+
+        System.out.println("non-direct download...");
+        Response downloadFile = UtilIT.downloadFile(Integer.valueOf(fileId), apiToken);
+        downloadFile.then().assertThat().statusCode(200);
+
+        String contentsOfDownloadedFile = downloadFile.getBody().asString();
+        assertEquals("a\n", contentsOfDownloadedFile);
+
+        Response deleteFile = UtilIT.deleteFileApi(Integer.parseInt(fileId), apiToken);
+        deleteFile.prettyPrint();
+        deleteFile.then().assertThat().statusCode(200);
+
+        S3Exception expectedException = null;
+        try {
+            ResponseInputStream<GetObjectResponse> s3ObjectResponse = s3minio.getObject(GetObjectRequest.builder()
+                    .bucket(BUCKET_NAME)
+                    .key(keyInS3)
+                    .build());
+            // Read the content of the object into a string
+            String s3ObjectString = new String(s3ObjectResponse.readAllBytes(), StandardCharsets.UTF_8);
+        } catch (S3Exception ex) {
+            expectedException = ex;
+        } catch (IOException ex) {
+            // Handle IO exception
+            logger.log(Level.SEVERE, "Error reading S3 object", ex);
+        }
+        assertNotNull(expectedException);
+        // 404 because the file has been successfully deleted
+        assertEquals(404, expectedException.statusCode());
+
+    }
+
+    /**
+     * We use LocalStack to test direct upload.
+     */
+    @Test
+    public void testDirectUpload() {
+        String driverId = "localstack1";
+        String driverLabel = "LocalStack";
+        Response createSuperuser = UtilIT.createRandomUser();
+        createSuperuser.then().assertThat().statusCode(200);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        String superusername = UtilIT.getUsernameFromResponse(createSuperuser);
+        UtilIT.makeSuperUser(superusername).then().assertThat().statusCode(200);
+        Response storageDrivers = UtilIT.listStorageDrivers(superuserApiToken);
+        storageDrivers.prettyPrint();
+        // TODO where is "Local/local" coming from?
+        String drivers = """
+{
+    "status": "OK",
+    "data": {
+        "LocalStack": "localstack1",
+        "MinIO": "minio1",
+        "Local": "local",
+        "Filesystem": "file1"
+    }
+}""";
+
+        //create user who will make a dataverse/dataset
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(200);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response originalStorageDriver = UtilIT.getStorageDriver(dataverseAlias, superuserApiToken);
+        originalStorageDriver.prettyPrint();
+        originalStorageDriver.then().assertThat()
+                .body("data.message", equalTo("undefined"))
+                .statusCode(200);
+
+        Response setStorageDriverToS3 = UtilIT.setStorageDriver(dataverseAlias, driverLabel, superuserApiToken);
+        setStorageDriverToS3.prettyPrint();
+        setStorageDriverToS3.then().assertThat()
+                .statusCode(200);
+
+        Response updatedStorageDriver = UtilIT.getStorageDriver(dataverseAlias, superuserApiToken);
+        updatedStorageDriver.prettyPrint();
+        updatedStorageDriver.then().assertThat()
+                .statusCode(200);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat().statusCode(201);
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        String datasetPid = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+        String datasetStorageIdentifier = datasetPid.substring(4);
+
+        Response getDatasetMetadata = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetMetadata.prettyPrint();
+        getDatasetMetadata.then().assertThat().statusCode(200);
+
+//        //upload a tabular file via native, check storage id prefix for driverId
+//        String pathToFile = "scripts/search/data/tabular/1char";
+//        Response addFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+//        addFileResponse.prettyPrint();
+//        addFileResponse.then().assertThat()
+//                .statusCode(200)
+//                .body("data.files[0].dataFile.storageIdentifier", startsWith(driverId + "://"));
+//
+//        String fileId = JsonPath.from(addFileResponse.body().asString()).getString("data.files[0].dataFile.id");
+        long size = 1000000000l;
+        Response getUploadUrls = UtilIT.getUploadUrls(datasetPid, size, apiToken);
+        getUploadUrls.prettyPrint();
+        getUploadUrls.then().assertThat().statusCode(200);
+
+        String url = JsonPath.from(getUploadUrls.asString()).getString("data.url");
+        String partSize = JsonPath.from(getUploadUrls.asString()).getString("data.partSize");
+        String storageIdentifier = JsonPath.from(getUploadUrls.asString()).getString("data.storageIdentifier");
+        System.out.println("url: " + url);
+        System.out.println("partSize: " + partSize);
+        System.out.println("storageIdentifier: " + storageIdentifier);
+
+        System.out.println("uploading file via direct upload");
+        String decodedUrl = null;
+        try {
+            decodedUrl = URLDecoder.decode(url, StandardCharsets.UTF_8.name());
+        } catch (UnsupportedEncodingException ex) {
+        }
+
+        // change to localhost because LocalStack is running in a container locally
+        String localhostUrl = decodedUrl.replace("http://localstack", "http://localhost");
+        String contentsOfFile = "foobar";
+
+        InputStream inputStream = new ByteArrayInputStream(contentsOfFile.getBytes(StandardCharsets.UTF_8));
+        Response uploadFileDirect = UtilIT.uploadFileDirect(localhostUrl, inputStream);
+        uploadFileDirect.prettyPrint();
+        /*
+        Direct upload to MinIO is failing with errors like this:
+        <Error>
+          <Code>SignatureDoesNotMatch</Code>
+          <Message>The request signature we calculated does not match the signature you provided. Check your key and signing method.</Message>
+          <Key>10.5072/FK2/KGFCEJ/18b8c06688c-21b8320a3ee5</Key>
+          <BucketName>mybucket</BucketName>
+          <Resource>/mybucket/10.5072/FK2/KGFCEJ/18b8c06688c-21b8320a3ee5</Resource>
+          <RequestId>1793915CCC5BC95C</RequestId>
+          <HostId>dd9025bab4ad464b049177c95eb6ebf374d3b3fd1af9251148b658df7ac2e3e8</HostId>
+        </Error>
+         */
+        uploadFileDirect.then().assertThat().statusCode(200);
+
+        // TODO: Use MD5 or whatever Dataverse is configured for and
+        // actually calculate it.
+        String jsonData = """
+{
+    "description": "My description.",
+    "directoryLabel": "data/subdir1",
+    "categories": [
+      "Data"
+    ],
+    "restrict": "false",
+    "storageIdentifier": "%s",
+    "fileName": "file1.txt",
+    "mimeType": "text/plain",
+    "checksum": {
+      "@type": "SHA-1",
+      "@value": "123456"
+    }
+}
+""".formatted(storageIdentifier);
+
+        // "There was an error when trying to add the new file. File size must be explicitly specified when creating DataFiles with Direct Upload"
+        Response addRemoteFile = UtilIT.addRemoteFile(datasetId.toString(), jsonData, apiToken);
+        addRemoteFile.prettyPrint();
+        addRemoteFile.then().assertThat()
+                .statusCode(200);
+
+        String fileId = JsonPath.from(addRemoteFile.asString()).getString("data.files[0].dataFile.id");
+        Response getfileMetadata = UtilIT.getFileData(fileId, apiToken);
+        getfileMetadata.prettyPrint();
+        getfileMetadata.then().assertThat().statusCode(200);
+
+//        String storageIdentifier = JsonPath.from(addFileResponse.body().asString()).getString("data.files[0].dataFile.storageIdentifier");
+        String keyInDataverse = storageIdentifier.split(":")[2];
+        Assertions.assertEquals(driverId + "://" + BUCKET_NAME + ":" + keyInDataverse, storageIdentifier);
+
+        String keyInS3 = datasetStorageIdentifier + "/" + keyInDataverse;
+        String s3Object = null;
+        try {
+            ResponseInputStream<GetObjectResponse> s3ObjectResponse = s3localstack.getObject(GetObjectRequest.builder()
+                    .bucket(BUCKET_NAME)
+                    .key(keyInS3)
+                    .build());
+            // Read the content of the object into a string
+            s3Object = new String(s3ObjectResponse.readAllBytes(), StandardCharsets.UTF_8);
+            System.out.println("s3Object: " + s3Object);
+        } catch (S3Exception ex) {
+            fail("Failed to get object from S3: " + ex.getMessage());
+        } catch (IOException ex) {
+            fail("Failed to read S3 object content: " + ex.getMessage());
+        }
+
+//        assertEquals(contentsOfFile.trim(), s3Object.trim());
+        assertEquals(contentsOfFile, s3Object);
+
+        System.out.println("direct download...");
+        Response getHeaders = UtilIT.downloadFileNoRedirect(Integer.valueOf(fileId), apiToken);
+        for (Header header : getHeaders.getHeaders()) {
+            System.out.println("direct download header: " + header);
+        }
+        getHeaders.then().assertThat().statusCode(303);
+
+        String urlFromResponse = getHeaders.getHeader("Location");
+        String localhostDownloadUrl = urlFromResponse.replace("localstack", "localhost");
+        String decodedDownloadUrl = null;
+        try {
+            decodedDownloadUrl = URLDecoder.decode(localhostDownloadUrl, StandardCharsets.UTF_8.name());
+        } catch (UnsupportedEncodingException ex) {
+        }
+
+        Response downloadFile = UtilIT.downloadFromUrl(decodedDownloadUrl);
+        downloadFile.prettyPrint();
+        downloadFile.then().assertThat().statusCode(200);
+
+        String contentsOfDownloadedFile = downloadFile.getBody().asString();
+        assertEquals(contentsOfFile, contentsOfDownloadedFile);
+
+        Response getFileData = UtilIT.getFileData(fileId, apiToken);
+        getFileData.prettyPrint();
+        getFileData.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.label", equalTo("file1.txt"))
+                .body("data.dataFile.filename", equalTo("file1.txt"))
+                .body("data.dataFile.contentType", equalTo("text/plain"))
+                .body("data.dataFile.filesize", equalTo(6));
+
+        Response deleteFile = UtilIT.deleteFileApi(Integer.parseInt(fileId), apiToken);
+        deleteFile.prettyPrint();
+        deleteFile.then().assertThat().statusCode(200);
+
+        S3Exception expectedException = null;
+        try {
+            ResponseInputStream<GetObjectResponse> s3ObjectResponse = s3minio.getObject(GetObjectRequest.builder()
+                    .bucket(BUCKET_NAME)
+                    .key(keyInS3)
+                    .build());
+            // Read the content of the object into a string
+            String s3ObjectString = new String(s3ObjectResponse.readAllBytes(), StandardCharsets.UTF_8);
+        } catch (S3Exception ex) {
+            expectedException = ex;
+        } catch (IOException ex) {
+            // Handle IO exception
+            logger.log(Level.SEVERE, "Error reading S3 object", ex);
+        }
+        assertNotNull(expectedException);
+        // 404 because the file has been successfully deleted
+        assertEquals(404, expectedException.statusCode());
+
+    }
+
+    @Test
+    public void testDirectUploadDetectStataFile() {
+        String driverId = "localstack1";
+        String driverLabel = "LocalStack";
+        Response createSuperuser = UtilIT.createRandomUser();
+        createSuperuser.then().assertThat().statusCode(200);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        String superusername = UtilIT.getUsernameFromResponse(createSuperuser);
+        UtilIT.makeSuperUser(superusername).then().assertThat().statusCode(200);
+        Response storageDrivers = UtilIT.listStorageDrivers(superuserApiToken);
+        storageDrivers.prettyPrint();
+        // TODO where is "Local/local" coming from?
+        String drivers = """
+{
+    "status": "OK",
+    "data": {
+        "LocalStack": "localstack1",
+        "MinIO": "minio1",
+        "Local": "local",
+        "Filesystem": "file1"
+    }
+}""";
+
+        //create user who will make a dataverse/dataset
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(200);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response originalStorageDriver = UtilIT.getStorageDriver(dataverseAlias, superuserApiToken);
+        originalStorageDriver.prettyPrint();
+        originalStorageDriver.then().assertThat()
+                .body("data.message", equalTo("undefined"))
+                .statusCode(200);
+
+        Response setStorageDriverToS3 = UtilIT.setStorageDriver(dataverseAlias, driverLabel, superuserApiToken);
+        setStorageDriverToS3.prettyPrint();
+        setStorageDriverToS3.then().assertThat()
+                .statusCode(200);
+
+        Response updatedStorageDriver = UtilIT.getStorageDriver(dataverseAlias, superuserApiToken);
+        updatedStorageDriver.prettyPrint();
+        updatedStorageDriver.then().assertThat()
+                .statusCode(200);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat().statusCode(201);
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        String datasetPid = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+        String datasetStorageIdentifier = datasetPid.substring(4);
+
+        Response getDatasetMetadata = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetMetadata.prettyPrint();
+        getDatasetMetadata.then().assertThat().statusCode(200);
+
+        long size = 1000000000l;
+        Response getUploadUrls = UtilIT.getUploadUrls(datasetPid, size, apiToken);
+        getUploadUrls.prettyPrint();
+        getUploadUrls.then().assertThat().statusCode(200);
+
+        String url = JsonPath.from(getUploadUrls.asString()).getString("data.url");
+        String partSize = JsonPath.from(getUploadUrls.asString()).getString("data.partSize");
+        String storageIdentifier = JsonPath.from(getUploadUrls.asString()).getString("data.storageIdentifier");
+        System.out.println("url: " + url);
+        System.out.println("partSize: " + partSize);
+        System.out.println("storageIdentifier: " + storageIdentifier);
+
+        System.out.println("uploading file via direct upload");
+        String decodedUrl = null;
+        try {
+            decodedUrl = URLDecoder.decode(url, StandardCharsets.UTF_8.name());
+        } catch (UnsupportedEncodingException ex) {
+        }
+
+        // change to localhost because LocalStack is running in a container locally
+        String localhostUrl = decodedUrl.replace("http://localstack", "http://localhost");
+
+        Path stataFilePath = Paths.get("scripts/search/data/tabular/stata14-auto-withstrls.dta");
+        InputStream inputStream = null;
+        try {
+            inputStream = java.nio.file.Files.newInputStream(stataFilePath);
+        } catch (IOException ex) {
+            Logger.getLogger(S3AccessIT.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        Response uploadFileDirect = UtilIT.uploadFileDirect(localhostUrl, inputStream);
+        uploadFileDirect.prettyPrint();
+        /*
+        Direct upload to MinIO is failing with errors like this:
+        <Error>
+          <Code>SignatureDoesNotMatch</Code>
+          <Message>The request signature we calculated does not match the signature you provided. Check your key and signing method.</Message>
+          <Key>10.5072/FK2/KGFCEJ/18b8c06688c-21b8320a3ee5</Key>
+          <BucketName>mybucket</BucketName>
+          <Resource>/mybucket/10.5072/FK2/KGFCEJ/18b8c06688c-21b8320a3ee5</Resource>
+          <RequestId>1793915CCC5BC95C</RequestId>
+          <HostId>dd9025bab4ad464b049177c95eb6ebf374d3b3fd1af9251148b658df7ac2e3e8</HostId>
+        </Error>
+         */
+        uploadFileDirect.then().assertThat().statusCode(200);
+
+        // TODO: Use MD5 or whatever Dataverse is configured for and
+        // actually calculate it.
+        //
+        // Note that we falsely set mimeType=application/octet-stream so that
+        // later we can test file detection. The ".dta" file extension is
+        // necessary for file detection to work.
+        String jsonData = """
+{
+    "description": "My description.",
+    "directoryLabel": "data/subdir1",
+    "categories": [
+      "Data"
+    ],
+    "restrict": "false",
+    "storageIdentifier": "%s",
+    "fileName": "stata14-auto-withstrls.dta",
+    "mimeType": "application/octet-stream",
+    "checksum": {
+      "@type": "SHA-1",
+      "@value": "123456"
+    }
+}
+""".formatted(storageIdentifier);
+
+        // "There was an error when trying to add the new file. File size must be explicitly specified when creating DataFiles with Direct Upload"
+        Response addRemoteFile = UtilIT.addRemoteFile(datasetId.toString(), jsonData, apiToken);
+        addRemoteFile.prettyPrint();
+        addRemoteFile.then().assertThat()
+                .statusCode(200);
+
+        String fileId = JsonPath.from(addRemoteFile.asString()).getString("data.files[0].dataFile.id");
+        Response getfileMetadata = UtilIT.getFileData(fileId, apiToken);
+        getfileMetadata.prettyPrint();
+        getfileMetadata.then().assertThat().statusCode(200);
+
+        String keyInDataverse = storageIdentifier.split(":")[2];
+        Assertions.assertEquals(driverId + "://" + BUCKET_NAME + ":" + keyInDataverse, storageIdentifier);
+
+        String keyInS3 = datasetStorageIdentifier + "/" + keyInDataverse;
+        // UtilIT.MAXIMUM_INGEST_LOCK_DURATION is 3 but not long enough.
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION + 3), "Failed test if Ingest Lock exceeds max duration " + keyInS3);
+
+        Response getFileData1 = UtilIT.getFileData(fileId, apiToken);
+        getFileData1.prettyPrint();
+        getFileData1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.dataFile.originalFileName", equalTo("stata14-auto-withstrls.dta"))
+                .body("data.dataFile.originalFileFormat", equalTo("application/x-stata-14"))
+                .body("data.dataFile.filename", equalTo("stata14-auto-withstrls.tab"))
+                .body("data.dataFile.contentType", equalTo("text/tab-separated-values"));
+
+        Response redetectDryRun = UtilIT.redetectFileType(fileId, false, apiToken);
+        redetectDryRun.prettyPrint();
+        redetectDryRun.then().assertThat()
+                // Tabular files can't be redetected. See discussion in
+                // https://github.com/IQSS/dataverse/issues/9429
+                // and the change in https://github.com/IQSS/dataverse/pull/9768
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        Response deleteFile = UtilIT.deleteFileApi(Integer.parseInt(fileId), apiToken);
+        deleteFile.prettyPrint();
+        deleteFile.then().assertThat().statusCode(200);
+
+        S3Exception expectedException = null;
+        try {
+            ResponseInputStream<GetObjectResponse> s3ObjectResponse = s3localstack.getObject(GetObjectRequest.builder()
+                    .bucket(BUCKET_NAME)
+                    .key(keyInS3)
+                    .build());
+            // If we reach this point, it means the object still exists
+            fail("Expected S3Exception was not thrown");
+        } catch (S3Exception ex) {
+            expectedException = ex;
+        } catch (Exception e) {
+            fail("Unexpected exception: " + e.getMessage());
+        }
+        assertNotNull(expectedException);
+        // 404 because the file has been successfully deleted
+        assertEquals(404, expectedException.statusCode());
+
+    }
+
+    @Test
+    public void testDirectUploadWithFileCountLimit() throws JsonParseException {
+        String driverId = "localstack1";
+        String driverLabel = "LocalStack";
+        Response createSuperuser = UtilIT.createRandomUser();
+        createSuperuser.then().assertThat().statusCode(200);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        String superusername = UtilIT.getUsernameFromResponse(createSuperuser);
+        UtilIT.makeSuperUser(superusername).then().assertThat().statusCode(200);
+        Response storageDrivers = UtilIT.listStorageDrivers(superuserApiToken);
+        storageDrivers.prettyPrint();
+        // TODO where is "Local/local" coming from?
+        String drivers = """
+{
+    "status": "OK",
+    "data": {
+        "LocalStack": "localstack1",
+        "MinIO": "minio1",
+        "Local": "local",
+        "Filesystem": "file1"
+    }
+}""";
+
+        //create user who will make a dataverse/dataset
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(200);
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        // Update the dataverse with a datasetFileCountLimit of 1
+        JsonObject data = JsonUtil.getJsonObject(createDataverseResponse.getBody().asString());
+        JsonParser parser = new JsonParser();
+        Dataverse dv = parser.parseDataverse(data.getJsonObject("data"));
+        dv.setDatasetFileCountLimit(1);
+        Response updateDataverseResponse = UtilIT.updateDataverse(dataverseAlias, dv, superuserApiToken); // only superuser can update the datasetFileCountLimit
+        updateDataverseResponse.prettyPrint();
+        updateDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.effectiveDatasetFileCountLimit", equalTo(1))
+                .body("data.datasetFileCountLimit", equalTo(1));
+
+        Response originalStorageDriver = UtilIT.getStorageDriver(dataverseAlias, superuserApiToken);
+        originalStorageDriver.prettyPrint();
+        originalStorageDriver.then().assertThat()
+                .body("data.message", equalTo("undefined"))
                 .statusCode(200);
 
-        Response deleteDataverse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
-        deleteDataverse.prettyPrint();
-        deleteDataverse.then().assertThat()
+        Response setStorageDriverToS3 = UtilIT.setStorageDriver(dataverseAlias, driverLabel, superuserApiToken);
+        setStorageDriverToS3.prettyPrint();
+        setStorageDriverToS3.then().assertThat()
                 .statusCode(200);
-        
-        Response deleteUser = UtilIT.deleteUser(username);
-        deleteUser.prettyPrint();
-        deleteUser.then().assertThat()
+
+        Response updatedStorageDriver = UtilIT.getStorageDriver(dataverseAlias, superuserApiToken);
+        updatedStorageDriver.prettyPrint();
+        updatedStorageDriver.then().assertThat()
                 .statusCode(200);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat().statusCode(201);
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        String datasetPid = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+
+        Response getDatasetMetadata = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetMetadata.prettyPrint();
+        getDatasetMetadata.then().assertThat().statusCode(200);
+
+        // -------------------------
+        // Add initial file
+        // -------------------------
+        String pathToFile = "scripts/search/data/tabular/50by1000.dta";
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFileResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        UtilIT.sleepForLock(datasetId, null, apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION);
+
+        // Get upload Urls when limit has been reached
+        long size = 1000000000l;
+        Response getUploadUrls = UtilIT.getUploadUrls(datasetPid, size, apiToken);
+        getUploadUrls.prettyPrint();
+        getUploadUrls.then().assertThat()
+                .body("message", containsString(BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", Collections.singletonList("1"))))
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // Get upload Urls as superuser when limit has been reached (superuser ignores limit)
+        getUploadUrls = UtilIT.getUploadUrls(datasetPid, size, superuserApiToken);
+        getUploadUrls.prettyPrint();
+        getUploadUrls.then().assertThat()
+                .statusCode(OK.getStatusCode());
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SavedSearchIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SavedSearchIT.java
new file mode 100644
index 00000000000..08ebec31cd6
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SavedSearchIT.java
@@ -0,0 +1,170 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SavedSearchIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @AfterAll
+    public static void afterClass() {
+
+    }
+
+    @Test
+    public void testSavedSearches() {
+
+        Response createAdminUser = UtilIT.createRandomUser();
+        String adminUsername = UtilIT.getUsernameFromResponse(createAdminUser);
+        String adminApiToken = UtilIT.getApiTokenFromResponse(createAdminUser);
+        UtilIT.makeSuperUser(adminUsername);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(adminApiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverseResponse);
+
+        //dataset-finch1-nolicense.json
+        Response createDatasetResponse1 = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, adminApiToken);
+        createDatasetResponse1.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse1);
+
+        Response createDatasetResponse2 = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, adminApiToken);
+        createDatasetResponse2.prettyPrint();
+        Integer datasetId2 = UtilIT.getDatasetIdFromResponse(createDatasetResponse2);
+
+        // missing body
+        Response resp = UtilIT.setSavedSearch();
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(INTERNAL_SERVER_ERROR.getStatusCode());
+
+        // creatorId null
+        resp = UtilIT.setSavedSearch(createSavedSearchJson("*", null, dataverseId, "subject_ss:Medicine, Health and Life Sciences"));
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // creatorId string
+        resp = UtilIT.setSavedSearch(createSavedSearchJson("*", "1", dataverseId.toString(), "subject_ss:Medicine, Health and Life Sciences"));
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // creatorId not found
+        resp = UtilIT.setSavedSearch(createSavedSearchJson("*", 9999, dataverseId, "subject_ss:Medicine, Health and Life Sciences"));
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(NOT_FOUND.getStatusCode());
+
+        // definitionPointId null
+        resp = UtilIT.setSavedSearch(createSavedSearchJson("*", 1, null, "subject_ss:Medicine, Health and Life Sciences"));
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // definitionPointId string
+        resp = UtilIT.setSavedSearch(createSavedSearchJson("*", "1", "9999", "subject_ss:Medicine, Health and Life Sciences"));
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // definitionPointId not found
+        resp = UtilIT.setSavedSearch(createSavedSearchJson("*", 1, 9999, "subject_ss:Medicine, Health and Life Sciences"));
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(NOT_FOUND.getStatusCode());
+
+        // missing filter
+        resp = UtilIT.setSavedSearch(createSavedSearchJson("*", 1, dataverseId));
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // create a saved search as superuser : OK
+        resp = UtilIT.setSavedSearch(createSavedSearchJson("*", 1, dataverseId, "subject_ss:Medicine, Health and Life Sciences"));
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        JsonPath path = JsonPath.from(resp.body().asString());
+        Integer createdSavedSearchId = path.getInt("data.id");
+
+        // get list as non superuser : OK
+        Response getListReponse = UtilIT.getSavedSearchList();
+        getListReponse.prettyPrint();
+        getListReponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        JsonPath path2 = JsonPath.from(getListReponse.body().asString());
+        List<Object> listBeforeDelete = path2.getList("data.savedSearches");
+
+        // makelinks/all as non superuser : OK
+        Response makelinksAll = UtilIT.setSavedSearchMakelinksAll();
+        makelinksAll.prettyPrint();
+        makelinksAll.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //delete a saved search as non superuser : OK
+        Response deleteReponse = UtilIT.deleteSavedSearchById(createdSavedSearchId);
+        deleteReponse.prettyPrint();
+        deleteReponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // check list count minus 1
+        getListReponse = UtilIT.getSavedSearchList();
+        getListReponse.prettyPrint();
+        JsonPath path3 = JsonPath.from(getListReponse.body().asString());
+        List<Object> listAfterDelete = path3.getList("data.savedSearches");
+        assertEquals(listBeforeDelete.size() - 1, listAfterDelete.size());
+    }
+
+    public String createSavedSearchJson(String query, Integer creatorId, Integer definitionPointId, String... filterQueries) {
+
+        JsonArrayBuilder arr = Json.createArrayBuilder();
+        for (String filterQuery : filterQueries) {
+            arr.add(filterQuery);
+        }
+
+        JsonObjectBuilder json = Json.createObjectBuilder();
+        if(query != null) json.add("query", query);
+        if(creatorId != null) json.add("creatorId", creatorId);
+        if(definitionPointId != null) json.add("definitionPointId", definitionPointId);
+        if(filterQueries.length > 0) json.add("filterQueries", arr);
+        return json.build().toString();
+    }
+
+    public String createSavedSearchJson(String query, String creatorId, String definitionPointId, String... filterQueries) {
+
+        JsonArrayBuilder arr = Json.createArrayBuilder();
+        for (String filterQuery : filterQueries) {
+            arr.add(filterQuery);
+        }
+
+        JsonObjectBuilder json = Json.createObjectBuilder();
+        if(query != null) json.add("query", query);
+        if(creatorId != null) json.add("creatorId", creatorId);
+        if(definitionPointId != null) json.add("definitionPointId", definitionPointId);
+        if(filterQueries.length > 0) json.add("filterQueries", arr);
+        return json.build().toString();
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
index dba0a3608c6..ca9e19e1bbf 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
@@ -1,42 +1,55 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObject;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import java.io.File;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.Base64;
-import javax.json.JsonArray;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
+import jakarta.json.JsonArray;
 import org.hamcrest.CoreMatchers;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
-import static junit.framework.Assert.assertEquals;
-import static java.lang.Thread.sleep;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+
 import org.hamcrest.Matchers;
-import org.junit.After;
-import static org.junit.Assert.assertNotEquals;
+
+import jakarta.json.JsonObjectBuilder;
+
+import static io.restassured.RestAssured.given;
+import static jakarta.ws.rs.core.Response.Status.*;
+import static java.lang.Thread.sleep;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class SearchIT {
 
     private static final Logger logger = Logger.getLogger(SearchIT.class.getCanonicalName());
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
 
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
@@ -45,24 +58,15 @@ public static void setUpClass() {
         makeSureTokenlessSearchIsEnabled.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response removeSearchApiNonPublicAllowed = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        removeSearchApiNonPublicAllowed.prettyPrint();
-        removeSearchApiNonPublicAllowed.then().assertThat()
-                .statusCode(200);
-
-        Response remove = UtilIT.deleteSetting(SettingsServiceBean.Key.ThumbnailSizeLimitImage);
-        remove.then().assertThat()
-                .statusCode(200);
-
     }
 
     @Test
-    public void testSearchPermisions() throws InterruptedException {
+    public void testSearchPermisions() {
         Response createUser1 = UtilIT.createRandomUser();
-        String username1 = UtilIT.getUsernameFromResponse(createUser1);
         String apiToken1 = UtilIT.getApiTokenFromResponse(createUser1);
+        String affiliation = "testAffiliation";
 
-        Response createDataverse1Response = UtilIT.createRandomDataverse(apiToken1);
+        Response createDataverse1Response = UtilIT.createRandomDataverse(apiToken1, affiliation);
         createDataverse1Response.prettyPrint();
         assertEquals(201, createDataverse1Response.getStatusCode());
         String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse1Response);
@@ -72,13 +76,9 @@ public void testSearchPermisions() throws InterruptedException {
         createDataset1Response.then().assertThat()
                 .statusCode(CREATED.getStatusCode());
 
-        Integer datasetId1 = UtilIT.getDatasetIdFromResponse(createDataset1Response);
-
-        Response enableNonPublicSearch = UtilIT.enableSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        enableNonPublicSearch.then().assertThat()
-                .statusCode(OK.getStatusCode());
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset1Response);
 
-        Response shouldBeVisibleToUser1 = UtilIT.search("id:dataset_" + datasetId1 + "_draft", apiToken1);
+        Response shouldBeVisibleToUser1 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken1);
         shouldBeVisibleToUser1.prettyPrint();
         shouldBeVisibleToUser1.then().assertThat()
                 .body("data.total_count", CoreMatchers.is(1))
@@ -90,7 +90,7 @@ public void testSearchPermisions() throws InterruptedException {
         String username2 = UtilIT.getUsernameFromResponse(createUser2);
         String apiToken2 = UtilIT.getApiTokenFromResponse(createUser2);
 
-        Response shouldNotBeVisibleToUser2 = UtilIT.search("id:dataset_" + datasetId1 + "_draft", apiToken2);
+        Response shouldNotBeVisibleToUser2 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken2);
         shouldNotBeVisibleToUser2.prettyPrint();
         shouldNotBeVisibleToUser2.then().assertThat()
                 .body("data.total_count", CoreMatchers.is(0))
@@ -98,7 +98,7 @@ public void testSearchPermisions() throws InterruptedException {
 
         String nullToken = null;
 
-        Response shouldNotBeVisibleToTokenLess = UtilIT.search("id:dataset_" + datasetId1 + "_draft", nullToken);
+        Response shouldNotBeVisibleToTokenLess = UtilIT.search("id:dataset_" + datasetId + "_draft", nullToken);
         shouldNotBeVisibleToTokenLess.prettyPrint();
         shouldNotBeVisibleToTokenLess.then().assertThat()
                 .body("data.total_count", CoreMatchers.is(0))
@@ -110,15 +110,16 @@ public void testSearchPermisions() throws InterruptedException {
         grantUser2AccessOnDataset.prettyPrint();
         assertEquals(200, grantUser2AccessOnDataset.getStatusCode());
 
-        String searchPart = "id:dataset_" + datasetId1 + "_draft";        
-        assertTrue("Failed test if search exceeds max duration " + searchPart , UtilIT.sleepForSearch(searchPart, apiToken2, "", UtilIT.MAXIMUM_INGEST_LOCK_DURATION)); 
+        String searchPart = "id:dataset_" + datasetId + "_draft";
+        assertTrue(UtilIT.sleepForSearch(searchPart, apiToken2, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if search exceeds max duration " + searchPart);
         
-        Response shouldBeVisibleToUser2 = UtilIT.search("id:dataset_" + datasetId1 + "_draft", apiToken2);
+        Response shouldBeVisibleToUser2 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken2);
         shouldBeVisibleToUser2.prettyPrint();
         shouldBeVisibleToUser2.then().assertThat()
                 .body("data.total_count", CoreMatchers.is(1))
                 .body("data.count_in_response", CoreMatchers.is(1))
                 .body("data.items[0].name", CoreMatchers.is("Darwin's Finches"))
+                .body("data.items[0].publicationStatuses", CoreMatchers.hasItems("Unpublished", "Draft"))
                 .statusCode(OK.getStatusCode());
 
         Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken1);
@@ -126,20 +127,16 @@ public void testSearchPermisions() throws InterruptedException {
         publishDataverse.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId1, "major", apiToken1);
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken1);
         publishDataset.prettyPrint();
         publishDataset.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response disableNonPublicSearch = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        disableNonPublicSearch.then().assertThat()
-                .statusCode(OK.getStatusCode());
-
         Response makeSureTokenlessSearchIsEnabled = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiRequiresToken);
         makeSureTokenlessSearchIsEnabled.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response publishedPublicDataShouldBeVisibleToTokenless = UtilIT.search("id:dataset_" + datasetId1, nullToken);
+        Response publishedPublicDataShouldBeVisibleToTokenless = UtilIT.search("id:dataset_" + datasetId, nullToken);
         publishedPublicDataShouldBeVisibleToTokenless.prettyPrint();
         publishedPublicDataShouldBeVisibleToTokenless.then().assertThat()
                 .body("data.total_count", CoreMatchers.is(1))
@@ -155,16 +152,18 @@ public void testSearchPermisions() throws InterruptedException {
                 .body("data.count_in_response", CoreMatchers.is(1))
                 .body("data.items[0].name", CoreMatchers.is(dataverseAlias))
                 .body("data.items[0].type", CoreMatchers.is("dataverse"))
-                .body("data.items[0].identifier", CoreMatchers.is(dataverseAlias));
+                .body("data.items[0].affiliation", CoreMatchers.is(affiliation))
+                .body("data.items[0].parentDataverseName", CoreMatchers.is("Root"))
+                .body("data.items[0].parentDataverseIdentifier", CoreMatchers.is("root"));
 
         Response disableTokenlessSearch = UtilIT.setSetting(SettingsServiceBean.Key.SearchApiRequiresToken, "true");
         disableTokenlessSearch.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response dataverse47behaviorOfTokensBeingRequired = UtilIT.search("id:dataset_" + datasetId1, nullToken);
+        Response dataverse47behaviorOfTokensBeingRequired = UtilIT.search("id:dataset_" + datasetId, nullToken);
         dataverse47behaviorOfTokensBeingRequired.prettyPrint();
         dataverse47behaviorOfTokensBeingRequired.then().assertThat()
-                .body("message", CoreMatchers.equalTo("Please provide a key query parameter (?key=XXX) or via the HTTP header X-Dataverse-key"))
+                .body("message", CoreMatchers.equalTo(AbstractApiBean.RESPONSE_MESSAGE_AUTHENTICATED_USER_REQUIRED))
                 .statusCode(UNAUTHORIZED.getStatusCode());
 
         Response reEnableTokenlessSearch = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiRequiresToken);
@@ -187,10 +186,7 @@ public void testSearchCitation() {
         Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
         createDatasetResponse.prettyPrint();
         Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
-
-        Response enableNonPublicSearch = UtilIT.enableSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        enableNonPublicSearch.then().assertThat()
-                .statusCode(OK.getStatusCode());
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
 
         Response searchResponse = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken);
         searchResponse.prettyPrint();
@@ -201,26 +197,164 @@ public void testSearchCitation() {
                 .body("data.items[0].citationHtml", Matchers.containsString("href"))
                 .statusCode(200);
 
-        Response deleteDatasetResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
-        deleteDatasetResponse.prettyPrint();
-        deleteDatasetResponse.then().assertThat()
+        String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
+        Response uploadImage = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadImage.prettyPrint();
+        uploadImage.then().assertThat()
+                .statusCode(200);
+
+        Response publishResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishResponse.prettyPrint();
+        publishResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        publishResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishResponse.prettyPrint();
+        publishResponse.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
-        deleteDataverseResponse.prettyPrint();
-        deleteDataverseResponse.then().assertThat()
+        Response updateTitleResponseAuthor = UtilIT.updateDatasetTitleViaSword(datasetPersistentId, "New Title", apiToken);
+        updateTitleResponseAuthor.prettyPrint();
+        updateTitleResponseAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // search descending will get the latest 100.
+        // This could fail if more than 100 get created between our update and the search. Highly unlikely
+        searchResponse = UtilIT.search("*&type=file&sort=date&order=desc&per_page=100&start=0&subtree=root" , apiToken);
+        searchResponse.prettyPrint();
+
+        int i=0;
+        String parentCitation = "";
+        String datasetName = "";
+        // most likely ours is in index 0, but it's not a guaranty.
+        while (i < 100) {
+            String dataset_persistent_id = searchResponse.body().jsonPath().getString("data.items[" + i + "].dataset_persistent_id");
+            if (datasetPersistentId.equalsIgnoreCase(dataset_persistent_id)) {
+                parentCitation = searchResponse.body().jsonPath().getString("data.items[" + i + "].dataset_citation");
+                datasetName = searchResponse.body().jsonPath().getString("data.items[" + i + "].dataset_name");
+                break;
+            }
+            i++;
+        }
+        // see https://github.com/IQSS/dataverse/issues/10735
+        // was showing the citation of the draft version and not the released parent
+        assertFalse(parentCitation.contains("New Title"));
+        assertTrue(parentCitation.contains(datasetName));
+        assertFalse(parentCitation.contains("DRAFT"));
+    }
+    
+    @Test
+    public void testAdditionalDatasetContent6300() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        Response datasetAsJson = UtilIT.nativeGet(datasetId, apiToken);
+        datasetAsJson.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response disableNonPublicSearch = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        disableNonPublicSearch.then().assertThat()
+        String identifier = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
+
+        Response getDatasetJsonBeforePublishing = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJsonBeforePublishing.prettyPrint();
+        String protocol = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.protocol");
+        String authority = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.authority");
+
+        String datasetPersistentId = protocol + ":" + authority + "/" + identifier;
+        String pathToJsonFile = "doc/sphinx-guides/source/_static/api/dataset-add-metadata.json";
+        Response addSubjectViaNative = UtilIT.addDatasetMetadataViaNative(datasetPersistentId, pathToJsonFile, apiToken);
+        addSubjectViaNative.prettyPrint();
+        addSubjectViaNative.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response deleteUserResponse = UtilIT.deleteUser(username);
-        deleteUserResponse.prettyPrint();
-        assertEquals(200, deleteUserResponse.getStatusCode());
+        Response searchResponse = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken);
+        searchResponse.prettyPrint();
+        /*["Astronomy and Astrophysics"]*/
+        assertTrue(searchResponse.body().jsonPath().getString("data.items[0].subjects").contains("Astronomy and Astrophysics"));
+        assertTrue(searchResponse.body().jsonPath().getString("data.items[0].versionState").equals("DRAFT"));
+        /*                "versionState": "DRAFT",*/
+
+        //We now need to publish to see version number
+        Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        publishDataverse.prettyPrint();
+        publishDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDataset.prettyPrint();
+        publishDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        searchResponse = UtilIT.search("id:dataset_" + datasetId, apiToken);
+        searchResponse.prettyPrint();
+        /*["Astronomy and Astrophysics"]*/
+        assertTrue(searchResponse.body().jsonPath().getString("data.items[0].subjects").contains("Astronomy and Astrophysics"));
+        assertTrue(searchResponse.body().jsonPath().getString("data.items[0].versionState").equals("RELEASED"));
+
+        assertTrue(searchResponse.body().jsonPath().getString("data.items[0].majorVersion").equals("1"));
+        assertTrue(searchResponse.body().jsonPath().getString("data.items[0].minorVersion").equals("0"));
+
+        assertTrue(searchResponse.body().jsonPath().getString("data.items[0].authors").contains("Spruce, Sabrina"));
+
+        assertTrue(searchResponse.body().jsonPath().getString("data.items[0].contacts[0].name").contains("Finch, Fiona"));
+        assertTrue(searchResponse.body().jsonPath().getString("data.items[0].storageIdentifier").contains(identifier));
 
     }
 
+    @Test
+    public void testSearchDynamicMetadataFields() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        Response searchResponseAuthor = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken, "&metadata_fields=citation:author");
+        searchResponseAuthor.prettyPrint();
+        searchResponseAuthor.then().assertThat()
+                .body("data.items[0].metadataBlocks.citation.displayName", CoreMatchers.equalTo("Citation Metadata"))
+                .body("data.items[0].metadataBlocks.citation.fields[0].typeName", CoreMatchers.equalTo("author"))
+                .body("data.items[0].metadataBlocks.citation.fields[0].value[0].authorName.value", CoreMatchers.equalTo("Finch, Fiona"))
+                .body("data.items[0].metadataBlocks.citation.fields[0].value[0].authorAffiliation.value", CoreMatchers.equalTo("Birds Inc."))
+                .statusCode(OK.getStatusCode());
+
+        // "{field_name} could not be a sub field of a compound field
+        Response subFieldsNotSupported = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken, "&metadata_fields=citation:authorAffiliation");
+        subFieldsNotSupported.prettyPrint();
+        subFieldsNotSupported.then().assertThat()
+                .body("data.items[0].metadataBlocks.citation.displayName", CoreMatchers.equalTo("Citation Metadata"))
+                // No fields returned. authorAffiliation is a subfield of author and not supported.
+                .body("data.items[0].metadataBlocks.citation.fields", Matchers.empty())
+                .statusCode(OK.getStatusCode());
+
+        Response allFieldsFromCitation = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken, "&metadata_fields=citation:*");
+        // Many more fields printed
+        allFieldsFromCitation.prettyPrint();
+        allFieldsFromCitation.then().assertThat()
+                .body("data.items[0].metadataBlocks.citation.displayName", CoreMatchers.equalTo("Citation Metadata"))
+                // Many fields returned, all of the citation block that has been filled in.
+                .body("data.items[0].metadataBlocks.citation.fields", Matchers.hasSize(5))
+                .statusCode(OK.getStatusCode());
+
+    }
+    
+    
     /*
      * Note: this test does a lot of checking for permissions with / without privlidged api key.
      * Thumbnails access is the same with/without that access as of 4.9.4 --MAD
@@ -232,14 +366,6 @@ public void testSearchCitation() {
     public void testDatasetThumbnail() {
         logger.info("BEGIN testDatasetThumbnail");
 
-//        Response setSearchApiNonPublicAllowed = UtilIT.setSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed, "true");
-//        setSearchApiNonPublicAllowed.prettyPrint();
-//
-//        assertEquals("foo", "foo");
-//        if (true) {
-//            return;
-//        }
-//
         Response createUser = UtilIT.createRandomUser();
         createUser.prettyPrint();
         String username = UtilIT.getUsernameFromResponse(createUser);
@@ -253,11 +379,6 @@ public void testDatasetThumbnail() {
         createDatasetResponse.prettyPrint();
         Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
 
-        Response setSearchApiNonPublicAllowed = UtilIT.setSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed, "true");
-        setSearchApiNonPublicAllowed.prettyPrint();
-        setSearchApiNonPublicAllowed.then().assertThat()
-                .statusCode(200);
-
         Response search1 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken);
         search1.prettyPrint();
         search1.then().assertThat()
@@ -347,6 +468,7 @@ public void testDatasetThumbnail() {
         search2.prettyPrint();
         search2.then().assertThat()
                 .body("data.items[0].name", CoreMatchers.equalTo("Darwin's Finches"))
+                .body("data.items[0].fileCount", CoreMatchers.equalTo(1))
                 .statusCode(200);
 
         //Unpublished datafiles no longer populate the dataset thumbnail
@@ -391,6 +513,24 @@ public void testDatasetThumbnail() {
                 .contentType("image/png")
                 .statusCode(OK.getStatusCode());
 
+        String trueOrWidthInPixels = "true";
+        Response getFileThumbnailImageA = UtilIT.getFileThumbnail(dataFileId1.toString(), trueOrWidthInPixels, apiToken);
+        getFileThumbnailImageA.then().assertThat()
+                .contentType("image/png")
+                .statusCode(OK.getStatusCode());
+
+        try {
+            BufferedImage bufferedImage = ImageIO.read(getFileThumbnailImageA.body().asInputStream());
+            int width = bufferedImage.getWidth();
+            int height = bufferedImage.getHeight();
+            System.out.println("width: " + width);
+            System.out.println("height: " + height);
+            int expectedWidth = 64;
+            assertEquals(expectedWidth, width);
+        } catch (IOException ex) {
+            Logger.getLogger(SearchIT.class.getName()).log(Level.SEVERE, null, ex);
+        }
+
         InputStream inputStream2creator = UtilIT.getInputStreamFromUnirest(thumbnailUrl, apiToken);
         assertEquals(treesAsBase64, UtilIT.inputStreamToDataUrlSchemeBase64Png(inputStream2creator));
 
@@ -487,7 +627,7 @@ public void testDatasetThumbnail() {
 
         overrideThumbnailFail.prettyPrint();
         overrideThumbnailFail.then().assertThat()
-                .body("message", CoreMatchers.equalTo("File is larger than maximum size: 500000."))
+                .body("message", CoreMatchers.containsString("File is larger than maximum size:"))
                 /**
                  * @todo We want this to expect 400 (BAD_REQUEST), not 403
                  * (FORBIDDEN).
@@ -497,7 +637,7 @@ public void testDatasetThumbnail() {
 
         String datasetLogo = "src/main/webapp/resources/images/cc0.png";
         File datasetLogoFile = new File(datasetLogo);
-        String datasetLogoAsBase64 = datasetLogoAsBase64 = ImageThumbConverter.generateImageThumbnailFromFileAsBase64(datasetLogoFile, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+        String datasetLogoAsBase64 = ImageThumbConverter.generateImageThumbnailFromFileAsBase64(datasetLogoFile, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
 
         if (datasetLogoAsBase64 == null) {
             Logger.getLogger(SearchIT.class.getName()).log(Level.SEVERE, "Failed to generate a base64 thumbnail from the file dataverseproject.png");
@@ -612,10 +752,6 @@ public void testDatasetThumbnail() {
         searchResponse.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response removeSearchApiNonPublicAllowed = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        removeSearchApiNonPublicAllowed.then().assertThat()
-                .statusCode(200);
-
         /**
          * @todo What happens when you delete a dataset? Does the thumbnail
          * created based on the logo get deleted too? Should it?
@@ -649,12 +785,12 @@ public void testIdentifier() {
         System.out.println("identifier: " + identifier);
 
         String searchPart = identifier.replace("FK2/", "");
+        UtilIT.sleepForReindex(String.valueOf(datasetId), apiToken, 5);
         Response searchUnpublished = UtilIT.search(searchPart, apiToken);
         searchUnpublished.prettyPrint();
         searchUnpublished.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                // It's expected that you can't find it because it hasn't been published.
-                .body("data.total_count", CoreMatchers.equalTo(0));
+                .body("data.total_count", CoreMatchers.equalTo(1));
 
         Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
         publishDataverse.then().assertThat()
@@ -665,6 +801,7 @@ public void testIdentifier() {
                 .statusCode(OK.getStatusCode());
 
         searchPart = identifier.replace("FK2/", "");
+        UtilIT.sleepForReindex(String.valueOf(datasetId), apiToken, 5);
         Response searchTargeted = UtilIT.search("dsPersistentId:" + searchPart, apiToken);
         searchTargeted.prettyPrint();
         searchTargeted.then().assertThat()
@@ -694,29 +831,23 @@ public void testNestedSubtree() {
         Response createDataverseResponse2 = UtilIT.createSubDataverse("subDV" + UtilIT.getRandomIdentifier(), null, apiToken, dataverseAlias);
         createDataverseResponse2.prettyPrint();
         String dataverseAlias2 = UtilIT.getAliasFromResponse(createDataverseResponse2);
-
+         
         String searchPart = "*"; 
-
-        Response searchUnpublishedSubtree = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias);
-        searchUnpublishedSubtree.prettyPrint();
-        searchUnpublishedSubtree.then().assertThat()
-                .statusCode(OK.getStatusCode())
-                // It's expected that you can't find it because it hasn't been published.
-                .body("data.total_count", CoreMatchers.equalTo(0));
+        assertTrue(UtilIT.sleepForSearch(searchPart, apiToken, "&subtree=" + dataverseAlias, 1, UtilIT.GENERAL_LONG_DURATION), "Missing subDV");
         
         Response searchUnpublishedSubtree2 = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias2);
         searchUnpublishedSubtree2.prettyPrint();
         searchUnpublishedSubtree2.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                // It's expected that you can't find it because it hasn't been published.
+                // TODO: investigate if this is a bug that nothing was found.
                 .body("data.total_count", CoreMatchers.equalTo(0));
-        
+
         Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
         publishDataverse.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
         try {
-            Thread.sleep(2000);
+            Thread.sleep(4000);
         } catch (InterruptedException ex) {
             /**
              * This sleep is here because dataverseAlias2 is showing with
@@ -751,6 +882,7 @@ public void testNestedSubtree() {
         searchPublishedSubtree2.prettyPrint();
         searchPublishedSubtree2.then().assertThat()
                 .statusCode(OK.getStatusCode())
+                // TODO: investigate if this is a bug that nothing was found.
                 .body("data.total_count", CoreMatchers.equalTo(0));
         
         Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias2, apiToken);
@@ -763,30 +895,16 @@ public void testNestedSubtree() {
         Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken);
         publishDataset.then().assertThat()
                 .statusCode(OK.getStatusCode());
-        
-        Response searchPublishedSubtreeWDS = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias);
-        searchPublishedSubtreeWDS.prettyPrint();
-        searchPublishedSubtreeWDS.then().assertThat()
-                .statusCode(OK.getStatusCode())
-                .body("data.total_count", CoreMatchers.equalTo(2));
-        
-        Response searchPublishedSubtreeWDS2 = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias2);
-        searchPublishedSubtreeWDS2.prettyPrint();
-        searchPublishedSubtreeWDS2.then().assertThat()
-                .statusCode(OK.getStatusCode())
-                .body("data.total_count", CoreMatchers.equalTo(1));
-                
+        UtilIT.sleepForReindex(datasetPid, apiToken, 5);
+        assertTrue(UtilIT.sleepForSearch(searchPart, apiToken, "&subtree=" + dataverseAlias, 2, UtilIT.GENERAL_LONG_DURATION), "Did not find 2 children");
+        assertTrue(UtilIT.sleepForSearch(searchPart, apiToken, "&subtree=" + dataverseAlias2, 1, UtilIT.GENERAL_LONG_DURATION), "Did not find 1 child");
     }
     
     //If this test fails it'll fail inconsistently as it tests underlying async role code
     //Hopefully it will not fail as we fixed the issue in https://github.com/IQSS/dataverse/issues/3471
     @Test
     public void testCuratorCardDataversePopulation() throws InterruptedException {
-        Response setSearchApiNonPublicAllowed = UtilIT.setSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed, "true");
-        setSearchApiNonPublicAllowed.prettyPrint();
-        setSearchApiNonPublicAllowed.then().assertThat()
-                .statusCode(200);
-        
+
         Response createSuperUser = UtilIT.createRandomUser();
         createSuperUser.prettyPrint();
         assertEquals(200, createSuperUser.getStatusCode());
@@ -811,16 +929,16 @@ public void testCuratorCardDataversePopulation() throws InterruptedException {
         String subDataverseAlias = "dv" + UtilIT.getRandomIdentifier();
         Response createSubDataverseResponse = UtilIT.createSubDataverse(subDataverseAlias, null, apiTokenSuper, parentDataverseAlias);
         createSubDataverseResponse.prettyPrint();
-        //UtilIT.getAliasFromResponse(createSubDataverseResponse);
-        
+
         Response grantRoleOnDataverseResponse = UtilIT.grantRoleOnDataverse(subDataverseAlias, "curator", "@" + username, apiTokenSuper); 
         grantRoleOnDataverseResponse.then().assertThat()
                 .statusCode(OK.getStatusCode());
-                
+        
         String searchPart = "*"; 
         
+        assertTrue(UtilIT.sleepForSearch(searchPart, apiToken, "&subtree="+parentDataverseAlias, 1, UtilIT.GENERAL_LONG_DURATION), "Failed test if search exceeds max duration " + searchPart);
+        
         Response searchPublishedSubtreeSuper = UtilIT.search(searchPart, apiTokenSuper, "&subtree="+parentDataverseAlias);
-        assertTrue("Failed test if search exceeds max duration " + searchPart , UtilIT.sleepForSearch(searchPart, apiToken, "&subtree="+parentDataverseAlias, UtilIT.MAXIMUM_INGEST_LOCK_DURATION)); 
         searchPublishedSubtreeSuper.prettyPrint();
         searchPublishedSubtreeSuper.then().assertThat()
                 .statusCode(OK.getStatusCode())
@@ -871,6 +989,9 @@ public void testSubtreePermissions() {
         Response datasetAsJson2 = UtilIT.nativeGet(datasetId2, apiToken);
         datasetAsJson2.then().assertThat()
                 .statusCode(OK.getStatusCode());
+        
+        // Wait a little while for the index to pick up the datasets, otherwise timing issue with searching for it.
+        UtilIT.sleepForReindex(datasetId2.toString(), apiToken, 3);
 
         String identifier = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
         String identifier2 = JsonPath.from(datasetAsJson2.getBody().asString()).getString("data.identifier"); 
@@ -880,69 +1001,69 @@ public void testSubtreePermissions() {
         Response searchFakeSubtree = UtilIT.search(searchPart, apiToken, "&subtree=fake");
         searchFakeSubtree.prettyPrint();
         searchFakeSubtree.then().assertThat()
-                .statusCode(400);
+                .statusCode(BAD_REQUEST.getStatusCode());
         
         Response searchFakeSubtreeNoAPI = UtilIT.search(searchPart, null, "&subtree=fake");
         searchFakeSubtreeNoAPI.prettyPrint();
         searchFakeSubtreeNoAPI.then().assertThat()
-                .statusCode(400);
-        
+                .statusCode(BAD_REQUEST.getStatusCode());
+
         Response searchUnpublishedSubtree = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias);
         searchUnpublishedSubtree.prettyPrint();
         searchUnpublishedSubtree.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                // It's expected that you can't find it because it hasn't been published.
-                .body("data.total_count", CoreMatchers.equalTo(0));
+                .body("data.total_count", CoreMatchers.equalTo(1));
         
         Response searchUnpublishedSubtreeNoAPI = UtilIT.search(searchPart, null, "&subtree="+dataverseAlias);
         searchUnpublishedSubtreeNoAPI.prettyPrint();
         searchUnpublishedSubtreeNoAPI.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                // It's expected that you can't find it because it hasn't been published.
+                // TODO: investigate if this is a bug that nothing was found.
                 .body("data.total_count", CoreMatchers.equalTo(0));
         
         Response searchUnpublishedSubtrees = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias +"&subtree="+dataverseAlias2);
         searchUnpublishedSubtrees.prettyPrint();
         searchUnpublishedSubtrees.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                // It's expected that you can't find them because they haven't been published.
-                .body("data.total_count", CoreMatchers.equalTo(0));
+                .body("data.total_count", CoreMatchers.equalTo(2));
         
         Response searchUnpublishedSubtreesNoAPI = UtilIT.search(searchPart, null, "&subtree="+dataverseAlias +"&subtree="+dataverseAlias2);
         searchUnpublishedSubtreesNoAPI.prettyPrint();
         searchUnpublishedSubtreesNoAPI.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                // It's expected that you can't find them because they haven't been published.
+                // TODO: investigate if this is a bug that nothing was found.
                 .body("data.total_count", CoreMatchers.equalTo(0));
 
+        UtilIT.sleepForReindex(String.valueOf(datasetId), apiToken, 5);
         Response searchUnpublishedRootSubtreeForDataset = UtilIT.search(identifier.replace("FK2/", ""), apiToken, "&subtree=root");
         searchUnpublishedRootSubtreeForDataset.prettyPrint();
         searchUnpublishedRootSubtreeForDataset.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                // It's expected that you can't find it because it hasn't been published.
-                .body("data.total_count", CoreMatchers.equalTo(0));
+                .body("data.total_count", CoreMatchers.equalTo(1));
 
+        UtilIT.sleepForReindex(String.valueOf(datasetId), apiToken, 5);
         Response searchUnpublishedRootSubtreeForDatasetNoAPI = UtilIT.search(identifier.replace("FK2/", ""), null, "&subtree=root");
         searchUnpublishedRootSubtreeForDatasetNoAPI.prettyPrint();
         searchUnpublishedRootSubtreeForDatasetNoAPI.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                // It's expected that you can't find it because it hasn't been published.
+                // TODO: investigate if this is a bug that nothing was found.
                 .body("data.total_count", CoreMatchers.equalTo(0));
-        
+
+        UtilIT.sleepForReindex(String.valueOf(datasetId), apiToken, 5);
         Response searchUnpublishedNoSubtreeForDataset = UtilIT.search(identifier.replace("FK2/", ""), apiToken, "");
         searchUnpublishedNoSubtreeForDataset.prettyPrint();
         searchUnpublishedNoSubtreeForDataset.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                // It's expected that you can't find it because it hasn't been published.
-                .body("data.total_count", CoreMatchers.equalTo(0));
+                .body("data.total_count", CoreMatchers.equalTo(1));
         
+        UtilIT.sleepForReindex(String.valueOf(datasetId), apiToken, 5);
         Response searchUnpublishedNoSubtreeForDatasetNoAPI = UtilIT.search(identifier.replace("FK2/", ""), null, "");
         searchUnpublishedNoSubtreeForDatasetNoAPI.prettyPrint();
         searchUnpublishedNoSubtreeForDatasetNoAPI.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                // It's expected that you can't find it because it hasn't been published.
+                // TODO: investigate if this is a bug that nothing was found.
                 .body("data.total_count", CoreMatchers.equalTo(0));
-        
+
         //PUBLISH
         
         Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
@@ -979,50 +1100,1325 @@ public void testSubtreePermissions() {
                 .statusCode(OK.getStatusCode())
                 .body("data.total_count", CoreMatchers.equalTo(2));
         
+        assertTrue(UtilIT.sleepForSearch(searchPart, null, "&subtree=" + dataverseAlias2, 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Missing dataset w/no apiKey");
+        
         Response searchPublishedSubtreesNoAPI = UtilIT.search(searchPart, null, "&subtree="+dataverseAlias+"&subtree="+dataverseAlias2);
         searchPublishedSubtreesNoAPI.prettyPrint();
         searchPublishedSubtreesNoAPI.then().assertThat()
                 .statusCode(OK.getStatusCode())
                 .body("data.total_count", CoreMatchers.equalTo(2));
         
+        UtilIT.sleepForReindex(String.valueOf(datasetId), apiToken, 5);
         Response searchPublishedRootSubtreeForDataset = UtilIT.search(identifier.replace("FK2/", ""), apiToken, "&subtree=root");
         searchPublishedRootSubtreeForDataset.prettyPrint();
         searchPublishedRootSubtreeForDataset.then().assertThat()
                 .statusCode(OK.getStatusCode())
                 .body("data.total_count", CoreMatchers.equalTo(1));
-        
+
+        UtilIT.sleepForReindex(String.valueOf(datasetId), apiToken, 5);
         Response searchPublishedRootSubtreeForDatasetNoAPI = UtilIT.search(identifier.replace("FK2/", ""), null, "&subtree=root");
         searchPublishedRootSubtreeForDatasetNoAPI.prettyPrint();
         searchPublishedRootSubtreeForDatasetNoAPI.then().assertThat()
                 .statusCode(OK.getStatusCode())
                 .body("data.total_count", CoreMatchers.equalTo(1));
     }
-    
-    @After
-    public void tearDownDataverse() {
-        File treesThumb = new File("scripts/search/data/binary/trees.png.thumb48");
-        treesThumb.delete();
-        File cc0Thumb = new File("src/main/webapp/resources/images/cc0.png.thumb48");
-        cc0Thumb.delete();
-        File dataverseprojectThumb = new File("src/main/webapp/resources/images/dataverseproject.png.thumb48");
-        dataverseprojectThumb.delete();
+
+    @Test
+    public void testGeospatialSearch() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response setMetadataBlocks = UtilIT.setMetadataBlocks(dataverseAlias, Json.createArrayBuilder().add("citation").add("geospatial"), apiToken);
+        setMetadataBlocks.prettyPrint();
+        setMetadataBlocks.then().assertThat().statusCode(OK.getStatusCode());
+
+        JsonObjectBuilder datasetJson = Json.createObjectBuilder()
+                .add("datasetVersion", Json.createObjectBuilder()
+                        .add("metadataBlocks", Json.createObjectBuilder()
+                                .add("citation", Json.createObjectBuilder()
+                                        .add("fields", Json.createArrayBuilder()
+                                                .add(Json.createObjectBuilder()
+                                                        .add("typeName", "title")
+                                                        .add("value", "Dataverse HQ")
+                                                        .add("typeClass", "primitive")
+                                                        .add("multiple", false)
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("authorName",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "Simpson, Homer")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "authorName"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "author")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("datasetContactEmail",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "hsimpson@mailinator.com")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "datasetContactEmail"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "datasetContact")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("dsDescriptionValue",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "Headquarters for Dataverse.")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "dsDescriptionValue"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "dsDescription")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add("Other")
+                                                        )
+                                                        .add("typeClass", "controlledVocabulary")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "subject")
+                                                )
+                                        )
+                                )
+                                .add("geospatial", Json.createObjectBuilder()
+                                        .add("fields", Json.createArrayBuilder()
+                                                .add(Json.createObjectBuilder()
+                                                        .add("typeName", "geographicBoundingBox")
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        // The box is roughly on Cambridge, MA
+                                                                        // See https://linestrings.com/bbox/#-71.187346,42.33661,-71.043056,42.409599
+                                                                        .add("westLongitude",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "-71.187346")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "westLongitude")
+                                                                        )
+                                                                        .add("southLatitude",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "42.33661")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "southLatitude")
+                                                                        )
+                                                                        .add("eastLongitude",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "-71.043056")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "eastLongitude")
+                                                                        )
+                                                                        .add("northLatitude",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "42.409599")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "northLatitude")
+                                                                        )
+                                                                )
+                                                        )
+                                                )
+                                        )
+                                )
+                        ));
+
+        Response createDatasetResponse = UtilIT.createDataset(dataverseAlias, datasetJson, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPid = JsonPath.from(createDatasetResponse.getBody().asString()).getString("data.persistentId");
+
+        // Plymouth rock (41.9580775,-70.6621063) is within 50 km of Cambridge. Hit.
+        Response search1 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken, "&show_entity_ids=true&geo_point=41.9580775,-70.6621063&geo_radius=50");
+        search1.prettyPrint();
+        search1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].entity_id", CoreMatchers.is(datasetId));
+
+        // Plymouth rock (41.9580775,-70.6621063) is not within 1 km of Cambridge. Miss.
+        Response search2 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken, "&geo_point=41.9580775,-70.6621063&geo_radius=1");
+        search2.prettyPrint();
+        search2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(0))
+                .body("data.count_in_response", CoreMatchers.is(0));
+
     }
 
-    @AfterClass
-    public static void cleanup() {
+    @Test
+    public void testGeospatialSearchInvalid() {
+
+        Response noRadius = UtilIT.search("*", null, "&geo_point=40,60");
+        noRadius.prettyPrint();
+        noRadius.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.equalTo("If you supply geo_point you must also supply geo_radius."));
+
+        Response noPoint = UtilIT.search("*", null, "&geo_radius=5");
+        noPoint.prettyPrint();
+        noPoint.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.equalTo("If you supply geo_radius you must also supply geo_point."));
+
+        Response junkPoint = UtilIT.search("*", null, "&geo_point=junk&geo_radius=5");
+        junkPoint.prettyPrint();
+        junkPoint.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.equalTo("Must contain a single comma to separate latitude and longitude."));
+
+        Response pointLatLongTooLarge = UtilIT.search("*", null, "&geo_point=999,999&geo_radius=5");
+        pointLatLongTooLarge.prettyPrint();
+        pointLatLongTooLarge.then().assertThat()
+                // "Search Syntax Error: Error from server at http://localhost:8983/solr/collection1:
+                // Can't parse point '999.0,999.0' because: Bad X value 999.0 is not in boundary Rect(minX=-180.0,maxX=180.0,minY=-90.0,maxY=90.0)"
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        Response junkRadius = UtilIT.search("*", null, "&geo_point=40,60&geo_radius=junk");
+        junkRadius.prettyPrint();
+        junkRadius.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.equalTo("Non-number radius supplied."));
 
-        Response enableNonPublicSearch = UtilIT.enableSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        assertEquals(200, enableNonPublicSearch.getStatusCode());
+    }
 
-        Response deleteSearchApiNonPublicAllowed = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-        deleteSearchApiNonPublicAllowed.then().assertThat()
-                .statusCode(200);
+    @Test
+    public void testRangeQueries() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
 
-        Response getSearchApiNonPublicAllowed = UtilIT.getSetting(SettingsServiceBean.Key.SearchApiNonPublicAllowed);
-//        getSearchApiNonPublicAllowed.prettyPrint();
-        getSearchApiNonPublicAllowed.then().assertThat()
-                .body("message", CoreMatchers.equalTo("Setting " + SettingsServiceBean.Key.SearchApiNonPublicAllowed + " not found"))
-                .statusCode(404);
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Using the "astrophysics" block because it contains all field types relevant for range queries
+        // (int, float and date)
+        Response setMetadataBlocks = UtilIT.setMetadataBlocks(dataverseAlias, Json.createArrayBuilder().add("citation").add("astrophysics"), apiToken);
+        setMetadataBlocks.prettyPrint();
+        setMetadataBlocks.then().assertThat().statusCode(OK.getStatusCode());
+
+        JsonObjectBuilder datasetJson = Json.createObjectBuilder()
+                .add("datasetVersion", Json.createObjectBuilder()
+                        .add("metadataBlocks", Json.createObjectBuilder()
+                                .add("citation", Json.createObjectBuilder()
+                                        .add("fields", Json.createArrayBuilder()
+                                                .add(Json.createObjectBuilder()
+                                                        .add("typeName", "title")
+                                                        .add("value", "Test Astrophysics Dataset")
+                                                        .add("typeClass", "primitive")
+                                                        .add("multiple", false)
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("authorName",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "Simpson, Homer")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "authorName"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "author")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("datasetContactEmail",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "hsimpson@mailinator.com")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "datasetContactEmail"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "datasetContact")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("dsDescriptionValue",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "This is a test dataset.")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "dsDescriptionValue"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "dsDescription")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add("Other")
+                                                        )
+                                                        .add("typeClass", "controlledVocabulary")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "subject")
+                                                )
+                                        )
+                                )
+                                .add("astrophysics", Json.createObjectBuilder()
+                                        .add("fields", Json.createArrayBuilder()
+                                                .add(Json.createObjectBuilder()
+                                                        .add("typeName", "coverage.Temporal")
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("coverage.Temporal.StartTime",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "2015-01-01")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "coverage.Temporal.StartTime")
+                                                                        )
+                                                                )
+                                                        )
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("typeName", "coverage.ObjectCount")
+                                                        .add("typeClass", "primitive")
+                                                        .add("multiple", false)
+                                                        .add("value", "9000")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("typeName", "coverage.SkyFraction")
+                                                        .add("typeClass", "primitive")
+                                                        .add("multiple", false)
+                                                        .add("value", "0.002")
+                                                )
+                                        )
+                                )
+                        ));
+
+        Response createDatasetResponse = UtilIT.createDataset(dataverseAlias, datasetJson, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPid = JsonPath.from(createDatasetResponse.getBody().asString()).getString("data.persistentId");
+
+        // Integer range query: Hit
+        Response search1 = UtilIT.search("id:dataset_" + datasetId + "_draft AND coverage.ObjectCount:[1000 TO 10000]", apiToken, "&show_entity_ids=true");
+        search1.prettyPrint();
+        search1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].entity_id", CoreMatchers.is(datasetId));
+
+        // Integer range query: Miss
+        Response search2 = UtilIT.search("id:dataset_" + datasetId + "_draft AND coverage.ObjectCount:[* TO 1000]", apiToken);
+        search2.prettyPrint();
+        search2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(0))
+                .body("data.count_in_response", CoreMatchers.is(0));
+
+        // Float range query: Hit
+        Response search3 = UtilIT.search("id:dataset_" + datasetId + "_draft AND coverage.SkyFraction:[0 TO 0.5]", apiToken, "&show_entity_ids=true");
+        search3.prettyPrint();
+        search3.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].entity_id", CoreMatchers.is(datasetId));
+
+        // Float range query: Miss
+        Response search4 = UtilIT.search("id:dataset_" + datasetId + "_draft AND coverage.SkyFraction:[0.5 TO 1]", apiToken);
+        search4.prettyPrint();
+        search4.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(0))
+                .body("data.count_in_response", CoreMatchers.is(0));
+
+        // Date range query: Hit
+        Response search5 = UtilIT.search("id:dataset_" + datasetId + "_draft AND coverage.Temporal.StartTime:2015", apiToken, "&show_entity_ids=true");
+        search5.prettyPrint();
+        search5.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].entity_id", CoreMatchers.is(datasetId));
+
+        // Date range query: Miss
+        Response search6 = UtilIT.search("id:dataset_" + datasetId + "_draft AND coverage.Temporal.StartTime:[2020 TO *]", apiToken);
+        search6.prettyPrint();
+        search6.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(0))
+                .body("data.count_in_response", CoreMatchers.is(0));
+
+        // Combining all three range queries: Hit
+        Response search7 = UtilIT.search("id:dataset_" + datasetId + "_draft AND coverage.ObjectCount:[1000 TO 10000] AND coverage.SkyFraction:[0 TO 0.5] AND coverage.Temporal.StartTime:2015", apiToken, "&show_entity_ids=true");
+        search7.prettyPrint();
+        search7.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].entity_id", CoreMatchers.is(datasetId));
+
+        // Combining all three range queries: Miss
+        Response search8 = UtilIT.search("id:dataset_" + datasetId + "_draft AND coverage.ObjectCount:[* TO 1000] AND coverage.SkyFraction:[0.5 TO 1] AND coverage.Temporal.StartTime:[2020 TO *]", apiToken);
+        search8.prettyPrint();
+        search8.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(0))
+                .body("data.count_in_response", CoreMatchers.is(0));
+
+    }
+
+    @Test
+    public void testSearchWithInvalidDateField() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response setMetadataBlocks = UtilIT.setMetadataBlocks(dataverseAlias, Json.createArrayBuilder().add("citation"), apiToken);
+        setMetadataBlocks.prettyPrint();
+        setMetadataBlocks.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Adding a dataset with a date in the "timePeriodCoveredStart" field that doesn't match Solr's date format
+        // (ISO-8601 format, e.g. YYYY-MM-DDThh:mm:ssZ, YYYYY-MM-DD, YYYY-MM, YYYY)
+        // (See: https://solr.apache.org/guide/solr/latest/indexing-guide/date-formatting-math.html)
+        // So the date currently cannot be indexed
+        JsonObjectBuilder datasetJson = Json.createObjectBuilder()
+                .add("datasetVersion", Json.createObjectBuilder()
+                        .add("metadataBlocks", Json.createObjectBuilder()
+                                .add("citation", Json.createObjectBuilder()
+                                        .add("fields", Json.createArrayBuilder()
+                                                .add(Json.createObjectBuilder()
+                                                        .add("typeName", "title")
+                                                        .add("value", "Test Dataset")
+                                                        .add("typeClass", "primitive")
+                                                        .add("multiple", false)
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("authorName",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "Simpson, Homer")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "authorName"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "author")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("datasetContactEmail",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "hsimpson@mailinator.com")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "datasetContactEmail"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "datasetContact")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("dsDescriptionValue",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "This is a test dataset.")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "dsDescriptionValue"))
+                                                                )
+                                                        )
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "dsDescription")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add("Other")
+                                                        )
+                                                        .add("typeClass", "controlledVocabulary")
+                                                        .add("multiple", true)
+                                                        .add("typeName", "subject")
+                                                )
+                                                .add(Json.createObjectBuilder()
+                                                        .add("typeName", "timePeriodCovered")
+                                                        .add("typeClass", "compound")
+                                                        .add("multiple", true)
+                                                        .add("value", Json.createArrayBuilder()
+                                                                .add(Json.createObjectBuilder()
+                                                                        .add("timePeriodCoveredStart",
+                                                                                Json.createObjectBuilder()
+                                                                                        .add("value", "15-01-01")
+                                                                                        .add("typeClass", "primitive")
+                                                                                        .add("multiple", false)
+                                                                                        .add("typeName", "timePeriodCoveredStart")
+                                                                        )
+                                                                )
+                                                        )
+                                                )
+                                        )
+                                )
+                        ));
+
+        Response createDatasetResponse = UtilIT.createDataset(dataverseAlias, datasetJson, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPid = JsonPath.from(createDatasetResponse.getBody().asString()).getString("data.persistentId");
+
+        // When querying on the date field: miss (because the date field was skipped during indexing)
+        Response search1 = UtilIT.search("id:dataset_" + datasetId + "_draft AND timePeriodCoveredStart:[2000 TO 2020]", apiToken);
+        search1.prettyPrint();
+        search1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(0))
+                .body("data.count_in_response", CoreMatchers.is(0));
+
+        // When querying not on the date field: the dataset can be found (only the date field was skipped during indexing, not the entire dataset)
+        Response search2 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken, "&show_entity_ids=true");
+        search2.prettyPrint();
+        search2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].entity_id", CoreMatchers.is(datasetId));
+
+    }
+
+    @Test
+    public void testDataverseDatasetCounts() throws InterruptedException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response makeSuperuser = UtilIT.makeSuperUser(username);
+        makeSuperuser.prettyPrint();
+        makeSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Wait for reindex of dataverse after publishing
+        String searchEmptyDataverseQuery = "identifier:" + dataverseAlias + " AND publicationStatus:Published AND datasetCount:0";
+        assertTrue(UtilIT.sleepForSearch(searchEmptyDataverseQuery, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        Response searchEmptyDataverse = UtilIT.search(searchEmptyDataverseQuery, apiToken, "&type=dataverse");
+        searchEmptyDataverse.prettyPrint();
+        searchEmptyDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1))
+                .body("data.items[0].identifier", CoreMatchers.equalTo(dataverseAlias))
+                .body("data.items[0].datasetCount", CoreMatchers.equalTo(0));
+
+        // Check that published datasets are counted
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPid = JsonPath.from(createDatasetResponse.getBody().asString()).getString("data.persistentId");
+
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken);
+        publishDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        UtilIT.sleepForReindex(datasetPid, apiToken, 5);
+
+        // Wait for reindex of dataverse after publishing
+        String searchDataverseWithDatasetQuery = "identifier:" + dataverseAlias + " AND datasetCount:1";
+        assertTrue(UtilIT.sleepForSearch(searchDataverseWithDatasetQuery, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        Response searchDataverseWithDataset = UtilIT.search(searchDataverseWithDatasetQuery, apiToken, "&type=dataverse");
+        searchDataverseWithDataset.prettyPrint();
+        searchDataverseWithDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1))
+                .body("data.items[0].identifier", CoreMatchers.equalTo(dataverseAlias))
+                .body("data.items[0].datasetCount", CoreMatchers.equalTo(1));
+
+        Response createDataverseResponse2 = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse2.prettyPrint();
+        String dataverseAlias2 = UtilIT.getAliasFromResponse(createDataverseResponse2);
+
+        Response publishDataverse2 = UtilIT.publishDataverseViaNativeApi(dataverseAlias2, apiToken);
+        publishDataverse2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Wait for reindex of dataverse after publishing
+        String searchEmptyDataverse2Query = "identifier:" + dataverseAlias2 + " AND publicationStatus:Published AND datasetCount:0";
+        assertTrue(UtilIT.sleepForSearch(searchEmptyDataverse2Query, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        Response searchEmptyDataverse2 = UtilIT.search(searchEmptyDataverse2Query, apiToken, "&type=dataverse");
+        searchEmptyDataverse2.prettyPrint();
+        searchEmptyDataverse2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1))
+                .body("data.items[0].identifier", CoreMatchers.equalTo(dataverseAlias2))
+                .body("data.items[0].datasetCount", CoreMatchers.equalTo(0));
+
+        // Check that linked datasets are counted
+        Response linkDataset = UtilIT.linkDataset(datasetPid, dataverseAlias2, apiToken);
+        linkDataset.prettyPrint();
+        linkDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Wait for reindex of dataverse after linking
+        String searchDataverseWithLinkedDatasetQuery = "identifier:" + dataverseAlias2 + " AND datasetCount:1";
+        assertTrue(UtilIT.sleepForSearch(searchDataverseWithLinkedDatasetQuery, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        Response searchDataverseWithLinkedDataset = UtilIT.search(searchDataverseWithLinkedDatasetQuery, apiToken, "&type=dataverse");
+        searchDataverseWithLinkedDataset.prettyPrint();
+        searchDataverseWithLinkedDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1))
+                .body("data.items[0].identifier", CoreMatchers.equalTo(dataverseAlias2))
+                .body("data.items[0].datasetCount", CoreMatchers.equalTo(1));
+
+        // Check that unlinked datasets are no longer counted
+        Response unlinkDataset = UtilIT.deleteDatasetLink(Long.valueOf(datasetId), dataverseAlias2, apiToken);
+        unlinkDataset.prettyPrint();
+        unlinkDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Wait for reindex of dataverse after unlinking
+        String searchDataverseWithUnlinkedDatasetQuery = "identifier:" + dataverseAlias2 + " AND datasetCount:0";
+        assertTrue(UtilIT.sleepForSearch(searchDataverseWithUnlinkedDatasetQuery, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        Response searchDataverseWithUnlinkedDataset = UtilIT.search(searchDataverseWithUnlinkedDatasetQuery, apiToken, "&type=dataverse");
+        searchDataverseWithUnlinkedDataset.prettyPrint();
+        searchDataverseWithUnlinkedDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1))
+                .body("data.items[0].identifier", CoreMatchers.equalTo(dataverseAlias2))
+                .body("data.items[0].datasetCount", CoreMatchers.equalTo(0));
+
+        // Re-link dataset
+        Response linkDatasetAgain = UtilIT.linkDataset(datasetPid, dataverseAlias2, apiToken);
+        linkDatasetAgain.prettyPrint();
+        linkDatasetAgain.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Wait for reindex of dataverse after linking
+        assertTrue(UtilIT.sleepForSearch(searchDataverseWithLinkedDatasetQuery, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        // Check that destroyed datasets are no longer counted
+        Response destroyDataset = UtilIT.destroyDataset(datasetPid, apiToken);
+        destroyDataset.prettyPrint();
+        destroyDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Wait for reindex of dataverses after destroying dataset
+        String searchDataverseWithDestroyedDatasetQuery = "identifier:" + dataverseAlias + " AND datasetCount:0";
+        assertTrue(UtilIT.sleepForSearch(searchDataverseWithDestroyedDatasetQuery, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        String searchDataverseWithDestroyedLinkedDatasetQuery = "identifier:" + dataverseAlias2 + " AND datasetCount:0";
+        assertTrue(UtilIT.sleepForSearch(searchDataverseWithDestroyedLinkedDatasetQuery, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        Response searchDataverseWithDestroyedDataset = UtilIT.search(searchDataverseWithDestroyedDatasetQuery, apiToken, "&type=dataverse");
+        searchDataverseWithDestroyedDataset.prettyPrint();
+        searchDataverseWithDestroyedDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1))
+                .body("data.items[0].identifier", CoreMatchers.equalTo(dataverseAlias))
+                .body("data.items[0].datasetCount", CoreMatchers.equalTo(0));
+
+        Response searchDataverseWithDestroyedLinkedDataset = UtilIT.search(searchDataverseWithDestroyedLinkedDatasetQuery, apiToken, "&type=dataverse");
+        searchDataverseWithDestroyedLinkedDataset.prettyPrint();
+        searchDataverseWithDestroyedLinkedDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1))
+                .body("data.items[0].identifier", CoreMatchers.equalTo(dataverseAlias2))
+                .body("data.items[0].datasetCount", CoreMatchers.equalTo(0));
+
+        // Check that harvested datasets are counted
+        Response createDataverseResponse3 = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse3.prettyPrint();
+        String dataverseAlias3 = UtilIT.getAliasFromResponse(createDataverseResponse3);
+
+        Response publishDataverse3 = UtilIT.publishDataverseViaNativeApi(dataverseAlias3, apiToken);
+        publishDataverse3.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        String nickName = "h" + UtilIT.getRandomString(6);
+        String sourceName = "";
+
+        String clientApiPath = String.format("/api/harvest/clients/%s", nickName);
+        String clientJson = String.format("{\"dataverseAlias\":\"%s\","
+                        + "\"type\":\"oai\","
+                        + "\"sourceName\":\"%s\","
+                        + "\"harvestUrl\":\"%s\","
+                        + "\"archiveUrl\":\"%s\","
+                        + "\"set\":\"%s\","
+                        + "\"allowHarvestingMissingCVV\":%s,"
+                        + "\"metadataFormat\":\"%s\"}",
+                dataverseAlias3, sourceName, "https://demo.dataverse.org/oai", "https://demo.dataverse.org",
+                "controlTestSet2", true, "oai_dc");
+
+        Response createResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken)
+                .body(clientJson)
+                .post(clientApiPath);
+        createResponse.prettyPrint();
+        assertEquals(CREATED.getStatusCode(), createResponse.getStatusCode());
+
+        String runHarvestApiPath = String.format("/api/harvest/clients/%s/run", nickName);
+
+        Response runResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken)
+                .post(runHarvestApiPath);
+        runResponse.prettyPrint();
+        assertEquals(ACCEPTED.getStatusCode(), runResponse.getStatusCode());
+
+        int i = 0;
+        int maxWait=20; // a very conservative interval; this harvest has no business taking this long
+        int numberOfDatasetsHarvested = 0;
+        do {
+            // Give it an initial 2 sec. delay, to make sure the client state
+            // has been updated in the database, which can take some appreciable
+            // amount of time on a heavily-loaded server running a full suite of
+            // tests:
+            Thread.sleep(2000L);
+            // keep checking the status of the client with the GET api:
+            Response getClientResponse = given()
+                    .get(clientApiPath);
+
+            assertEquals(OK.getStatusCode(), getClientResponse.getStatusCode());
+            JsonPath responseJsonPath = getClientResponse.body().jsonPath();
+            assertNotNull(responseJsonPath, "Invalid JSON in GET client response");
+            assertEquals(ApiConstants.STATUS_OK, responseJsonPath.getString("status"));
+
+            String clientStatus = responseJsonPath.getString("data.status");
+            assertNotNull(clientStatus);
+
+            if ("inProgress".equals(clientStatus) || "IN PROGRESS".equals(responseJsonPath.getString("data.lastResult"))) {
+                // we'll sleep for 2 more seconds
+                i++;
+            } else {
+                logger.info("getClientResponse.prettyPrint: "
+                        + getClientResponse.prettyPrint());
+                // Check the values in the response:
+                // a) Confirm that the harvest has completed:
+                assertEquals("inActive", clientStatus, "Unexpected client status: "+clientStatus);
+
+                // b) Confirm that it has actually succeeded:
+                assertTrue(responseJsonPath.getString("data.lastResult").contains("Completed"), "Last harvest not reported a success (took "+i+" seconds)");
+                String harvestTimeStamp = responseJsonPath.getString("data.lastHarvest");
+                assertNotNull(harvestTimeStamp);
+
+                // c) Confirm that at least one dataset has been harvested:
+                numberOfDatasetsHarvested = responseJsonPath.getInt("data.lastDatasetsHarvested");
+                assertTrue(numberOfDatasetsHarvested > 0);
+
+                // ok, it looks like the harvest has completed successfully.
+                break;
+            }
+        } while (i<maxWait);
+
+        System.out.println("Waited " + i + " seconds for the harvest to complete.");
+
+        // Wait for reindex of dataverse after harvesting
+        String searchDataverseWithHarvestedDatasetQuery = "identifier:" + dataverseAlias3 + " AND datasetCount:" + numberOfDatasetsHarvested;
+        assertTrue(UtilIT.sleepForSearch(searchDataverseWithHarvestedDatasetQuery, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        Response searchDataverseWithHarvestedDataset = UtilIT.search(searchDataverseWithHarvestedDatasetQuery, apiToken, "&type=dataverse");
+        searchDataverseWithHarvestedDataset.prettyPrint();
+        searchDataverseWithHarvestedDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1))
+                .body("data.items[0].identifier", CoreMatchers.equalTo(dataverseAlias3))
+                .body("data.items[0].datasetCount", CoreMatchers.equalTo(numberOfDatasetsHarvested));
+
+        // Clean up harvesting client and harvested datasets
+        Response deleteResponse = given()
+                .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken)
+                .delete(clientApiPath);
+        deleteResponse.prettyPrint();
+
+        String searchDataverseWithNoMoreHarvestedDatasetsQuery = "identifier:" + dataverseAlias3 + " AND datasetCount:0";
+        assertTrue(UtilIT.sleepForSearch(searchDataverseWithNoMoreHarvestedDatasetsQuery, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        Response searchDataverseWithNoMoreHarvestedDatasets = UtilIT.search(searchDataverseWithNoMoreHarvestedDatasetsQuery, apiToken, "&type=dataverse");
+        searchDataverseWithNoMoreHarvestedDatasets.prettyPrint();
+        searchDataverseWithNoMoreHarvestedDatasets.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1))
+                .body("data.items[0].identifier", CoreMatchers.equalTo(dataverseAlias3))
+                .body("data.items[0].datasetCount", CoreMatchers.equalTo(0));
+
+        // Check that datasets in child collections are counted
+        Response createDataverseResponse4 = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse4.prettyPrint();
+        String dataverseAlias4 = UtilIT.getAliasFromResponse(createDataverseResponse4);
+
+        Response publishDataverse4 = UtilIT.publishDataverseViaNativeApi(dataverseAlias4, apiToken);
+        publishDataverse4.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        String childDataverseAlias = dataverseAlias4 + "-child";
+        Response createChildDataverseResponse = UtilIT.createSubDataverse(childDataverseAlias, null, apiToken, dataverseAlias4);
+        createChildDataverseResponse.prettyPrint();
+
+        Response publishChildDataverse = UtilIT.publishDataverseViaNativeApi(childDataverseAlias, apiToken);
+        publishChildDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createGrandchildDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(childDataverseAlias, apiToken);
+        createGrandchildDatasetResponse.prettyPrint();
+        String grandchildDatasetPid = JsonPath.from(createGrandchildDatasetResponse.getBody().asString()).getString("data.persistentId");
+
+        Response publishGrandchildDataset = UtilIT.publishDatasetViaNativeApi(grandchildDatasetPid, "major", apiToken);
+        publishGrandchildDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        UtilIT.sleepForReindex(grandchildDatasetPid, apiToken, 5);
+
+        // Wait for reindex of dataverse after publishing
+        String searchDataverseWithGrandchildDatasetQuery = "identifier:" + dataverseAlias4 + " AND datasetCount:1";
+        assertTrue(UtilIT.sleepForSearch(searchDataverseWithGrandchildDatasetQuery, null, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+
+        Response searchDataverseWithGrandchildDataset = UtilIT.search(searchDataverseWithGrandchildDatasetQuery, apiToken, "&type=dataverse");
+        searchDataverseWithGrandchildDataset.prettyPrint();
+        searchDataverseWithGrandchildDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1))
+                .body("data.items[0].identifier", CoreMatchers.equalTo(dataverseAlias4))
+                .body("data.items[0].datasetCount", CoreMatchers.equalTo(1));
+    }
+
+    @AfterEach
+    public void tearDownDataverse() {
+        File treesThumb = new File("scripts/search/data/binary/trees.png.thumb48");
+        treesThumb.delete();
+        File cc0Thumb = new File("src/main/webapp/resources/images/cc0.png.thumb48");
+        cc0Thumb.delete();
+        File dataverseprojectThumb = new File("src/main/webapp/resources/images/dataverseproject.png.thumb48");
+        dataverseprojectThumb.delete();
+    }
+
+    @AfterAll
+    public static void cleanup() {
+    }
+
+    @Test
+    public void testSearchFilesAndUrlImages() throws InterruptedException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        System.out.println("id: " + datasetId);
+        String datasetPid = JsonPath.from(createDatasetResponse.getBody().asString()).getString("data.persistentId");
+        System.out.println("datasetPid: " + datasetPid);
+        String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
+        Response logoResponse = UtilIT.uploadDatasetLogo(datasetPid, pathToFile, apiToken);
+        logoResponse.prettyPrint();
+        logoResponse.then().assertThat()
+                .statusCode(200);
+
+        Response uploadImage = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadImage.prettyPrint();
+        uploadImage.then().assertThat()
+                .statusCode(200);
+        pathToFile = "src/main/webapp/resources/js/mydata.js";
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(200);
+        pathToFile = "src/test/resources/tab/test.tab";
+        String searchableUniqueId = "testtab"+ UUID.randomUUID().toString().substring(0, 8); // so the search only returns 1 file
+        JsonObjectBuilder json = Json.createObjectBuilder()
+                .add("description", searchableUniqueId)
+                .add("restrict", "true")
+                .add("categories", Json.createArrayBuilder().add("Data"));
+        Response uploadTabFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, json.build(), apiToken);
+        uploadTabFile.prettyPrint();
+        uploadTabFile.then().assertThat()
+                .statusCode(200);
+        // Ensure tabular file is ingested
+        sleep(2000);
+        // Set tabular tags
+        String tabularFileId = uploadTabFile.getBody().jsonPath().getString("data.files[0].dataFile.id");
+        List<String> testTabularTags = List.of("Survey", "Genomics");
+        Response setFileTabularTagsResponse = UtilIT.setFileTabularTags(tabularFileId, apiToken, testTabularTags);
+        setFileTabularTagsResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        publishDataverse.prettyPrint();
+        publishDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDataset.prettyPrint();
+        publishDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response searchResp = UtilIT.search("dataverseproject", apiToken);
+        searchResp.prettyPrint();
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.items[0].type", CoreMatchers.is("file"))
+                .body("data.items[0].file_content_type", CoreMatchers.is("image/png"))
+                .body("data.items[0].url", CoreMatchers.containsString("/api/access/datafile/"))
+                .body("data.items[0].image_url", CoreMatchers.containsString("/api/access/datafile/"))
+                .body("data.items[0].image_url", CoreMatchers.containsString("imageThumb=true"));
+
+        searchResp = UtilIT.search(dataverseAlias, apiToken);
+        searchResp.prettyPrint();
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.items[0].type", CoreMatchers.is("dataverse"))
+                .body("data.items[0].url", CoreMatchers.containsString("/dataverse/"))
+                .body("data.items[0]", CoreMatchers.not(CoreMatchers.hasItem("image_url")));
+
+        searchResp = UtilIT.search(datasetPid, apiToken);
+        searchResp.prettyPrint();
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.items[0].type", CoreMatchers.is("dataset"))
+                .body("data.items[0].image_url", CoreMatchers.containsString("/logo"));
+
+        searchResp = UtilIT.search("mydata", apiToken);
+        searchResp.prettyPrint();
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.items[0].type", CoreMatchers.is("file"))
+                .body("data.items[0].url", CoreMatchers.containsString("/datafile/"))
+                .body("data.items[0]", CoreMatchers.not(CoreMatchers.hasItem("image_url")));
+        searchResp = UtilIT.search(searchableUniqueId, apiToken);
+        searchResp.prettyPrint();
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.items[0].type", CoreMatchers.is("file"))
+                .body("data.items[0].url", CoreMatchers.containsString("/datafile/"))
+                .body("data.items[0].variables", CoreMatchers.is(3))
+                .body("data.items[0].observations", CoreMatchers.is(10))
+                .body("data.items[0].restricted", CoreMatchers.is(true))
+                .body("data.items[0].canDownloadFile", CoreMatchers.is(true))
+                .body("data.items[0].tabularTags", CoreMatchers.hasItem("Genomics"))
+                .body("data.items[0]", CoreMatchers.not(CoreMatchers.hasItem("image_url")));
+    }
+
+    @Test
+    public void testShowTypeCounts() throws InterruptedException  {
+        //Create 1 user and 1 Dataverse/Collection
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String affiliation = "testAffiliation";
+
+        // test total_count_per_object_type is included with zero counts for each type
+        Response searchResp = UtilIT.search(username, apiToken, "&show_type_counts=true");
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count_per_object_type.Dataverses", CoreMatchers.is(0))
+                .body("data.total_count_per_object_type.Datasets", CoreMatchers.is(0))
+                .body("data.total_count_per_object_type.Files", CoreMatchers.is(0));
+        
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken, affiliation);
+        assertEquals(201, createDataverseResponse.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        String dataverseWithDatasetsFilesAlias = dataverseAlias;
+
+        // create 3 Datasets, each with 2 Datafiles
+        for (int i = 0; i < 3; i++) {
+            Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+            createDatasetResponse.then().assertThat()
+                    .statusCode(CREATED.getStatusCode());
+            String datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse).toString();
+
+            // putting the dataverseAlias in the description of each file so the search q={dataverseAlias} will return dataverse, dataset, and files for this test only
+            String jsonAsString = "{\"description\":\"" + dataverseAlias + "\",\"directoryLabel\":\"data/subdir1\",\"categories\":[\"Data\"], \"restrict\":\"false\"  }";
+
+            String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
+            Response uploadImage = UtilIT.uploadFileViaNative(datasetId, pathToFile, jsonAsString, apiToken);
+            uploadImage.then().assertThat()
+                    .statusCode(200);
+            pathToFile = "src/main/webapp/resources/js/mydata.js";
+            Response uploadFile = UtilIT.uploadFileViaNative(datasetId, pathToFile, jsonAsString, apiToken);
+            uploadFile.then().assertThat()
+                    .statusCode(200);
+
+            // This call forces a wait for dataset indexing to finish and gives time for file uploads to complete
+            UtilIT.search("id:dataset_" + datasetId, apiToken);
+            UtilIT.sleepForReindex(datasetId, apiToken, 3);
+        }
+
+        // Test Search without show_type_counts
+        searchResp = UtilIT.search(dataverseAlias, apiToken);
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count_per_object_type", CoreMatchers.equalTo(null));
+        // Test Search with show_type_counts = FALSE
+        searchResp = UtilIT.search(dataverseAlias, apiToken, "&show_type_counts=false");
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count_per_object_type", CoreMatchers.equalTo(null));
+        // Test Search with show_type_counts = TRUE
+        searchResp = UtilIT.search(dataverseAlias, apiToken, "&show_type_counts=true");
+        searchResp.prettyPrint();
+        
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count_per_object_type.Dataverses", CoreMatchers.is(1))
+                .body("data.total_count_per_object_type.Datasets", CoreMatchers.is(3))
+                .body("data.total_count_per_object_type.Files", CoreMatchers.is(6));
+        
+        
+        
+        // go through the same exercise with only a collection to verify that Dataasets and Files
+        // are there with a count of 0
+        
+        createDataverseResponse = UtilIT.createRandomDataverse(apiToken, affiliation);
+        assertEquals(201, createDataverseResponse.getStatusCode());
+        dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        sleep(4000); //make sure new dataverse gets indexed
+
+        // Test Search without show_type_counts
+        searchResp = UtilIT.search(dataverseAlias, apiToken);
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count_per_object_type", CoreMatchers.equalTo(null));
+        // Test Search with show_type_counts = FALSE
+        searchResp = UtilIT.search(dataverseAlias, apiToken, "&show_type_counts=false");
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count_per_object_type", CoreMatchers.equalTo(null));
+        // Test Search with show_type_counts = TRUE
+        searchResp = UtilIT.search(dataverseAlias, apiToken, "&show_type_counts=true");
+        searchResp.prettyPrint();
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count_per_object_type.Dataverses", CoreMatchers.is(1))
+                .body("data.total_count_per_object_type.Datasets", CoreMatchers.is(0))
+                .body("data.total_count_per_object_type.Files", CoreMatchers.is(0));
+
+        // Test Search with show_type_counts = TRUE getting only Dataverses
+        searchResp = UtilIT.search(dataverseWithDatasetsFilesAlias, apiToken, "&show_facets=true&type=dataverse&show_type_counts=true");
+        searchResp.prettyPrint();
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.count_in_response", CoreMatchers.is(1)) // 1 dataverse
+                .body("data.total_count_per_object_type.Dataverses", CoreMatchers.is(1))
+                .body("data.total_count_per_object_type.Datasets", CoreMatchers.is(3))
+                .body("data.total_count_per_object_type.Files", CoreMatchers.is(6));
+        // Test Search with show_type_counts = TRUE getting only Dataverses and Datasets
+        searchResp = UtilIT.search(dataverseWithDatasetsFilesAlias, apiToken, "&type=dataverse&type=dataset&show_type_counts=true");
+        searchResp.prettyPrint();
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.count_in_response", CoreMatchers.is(4)) // 1 dataverse + 3 datasets
+                .body("data.total_count_per_object_type.Dataverses", CoreMatchers.is(1))
+                .body("data.total_count_per_object_type.Datasets", CoreMatchers.is(3))
+                .body("data.total_count_per_object_type.Files", CoreMatchers.is(6));
+        // Test Search with show_type_counts = TRUE getting Dataverses, Datasets and Files
+        searchResp = UtilIT.search(dataverseWithDatasetsFilesAlias, apiToken, "&type=dataverse&type=dataset&type=file&show_type_counts=true");
+        searchResp.prettyPrint();
+        searchResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.count_in_response", CoreMatchers.is(10)) // 1 dataverse + 3 datasets + 6 files
+                .body("data.total_count_per_object_type.Dataverses", CoreMatchers.is(1))
+                .body("data.total_count_per_object_type.Datasets", CoreMatchers.is(3))
+                .body("data.total_count_per_object_type.Files", CoreMatchers.is(6));
+    }
+
+    @Test
+    public void testTabularFiles() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        Path pathToDataFile = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.csv");
+        String contentOfCsv = ""
+                + "name,pounds,species,treats\n"
+                + "Midnight,15,dog,milkbones\n"
+                + "Tiger,17,cat,cat grass\n"
+                + "Panther,21,cat,cat nip\n";
+        java.nio.file.Files.write(pathToDataFile, contentOfCsv.getBytes());
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToDataFile.toString(), apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("data.csv"));
+
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToDataFile);
+
+        Long fileId = JsonPath.from(uploadFile.body().asString()).getLong("data.files[0].dataFile.id");
+
+        Response search = UtilIT.search("entityId:" + fileId, apiToken);
+        search.prettyPrint();
+        search.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.items[0].name", is("data.tab"))
+                .body("data.items[0].variables", is(4))
+                .body("data.items[0].observations", is(3));
+    }
+
+    @Test
+    public void testTotalCount() throws IOException {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        Path pathToDataFile = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "data.csv");
+        String contentOfCsv = ""
+                + "name,pounds,species,treats\n"
+                + "Midnight,15,dog,milkbones\n"
+                + "Tiger,17,cat,cat grass\n"
+                + "Panther,21,cat,cat nip\n";
+        java.nio.file.Files.write(pathToDataFile, contentOfCsv.getBytes());
+
+        Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToDataFile.toString(), apiToken);
+        uploadFile.prettyPrint();
+        uploadFile.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.files[0].label", equalTo("data.csv"));
+
+        Response searchResponse = UtilIT.search("&show_facets=true&sort=date&order=desc&show_type_counts=true&subtree=root&per_page=10&type=dataverse&type=dataset", apiToken);
+        searchResponse.prettyPrint();
+        searchResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testShowCollections() {
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        JsonPath createdDataverse = JsonPath.from(createDataverseResponse.body().asString());
+        String dataverseName = createdDataverse.getString("data.name");
+        String dataverseAlias = createdDataverse.getString("data.alias");
+        Integer dataverseId = createdDataverse.getInt("data.id");
+
+        UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        JsonPath createdDataset = JsonPath.from(createDatasetResponse.body().asString());
+        int datasetId = createdDataset.getInt("data.id");
+        String datasetPid = createdDataset.getString("data.persistentId");
+
+        UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        // Test that the Dataverse collection that the dataset was created in is returned
+        Response searchResponse = UtilIT.search("*", apiToken, "&subtree=" + dataverseAlias + "&type=dataset&show_collections=true");
+        searchResponse.prettyPrint();
+        searchResponse.then().assertThat()
+                      .statusCode(OK.getStatusCode())
+                      .body("data.count_in_response", CoreMatchers.is(1))
+                      .body("data.items[0].collections[0].id", CoreMatchers.is(dataverseId))
+                      .body("data.items[0].collections[0].name", CoreMatchers.is(dataverseName))
+                      .body("data.items[0].collections[0].alias", CoreMatchers.is(dataverseAlias));
+
+        Response createDataverse2Response = UtilIT.createRandomDataverse(apiToken);
+        createDataverse2Response.prettyPrint();
+        createDataverse2Response.then().assertThat().statusCode(CREATED.getStatusCode());
+        JsonPath createDataverse2 = JsonPath.from(createDataverse2Response.body().asString());
+        String dataverse2Name = createDataverse2.getString("data.name");
+        String dataverse2Alias = createDataverse2.getString("data.alias");
+        Integer dataverse2Id = createDataverse2.getInt("data.id");
+
+        UtilIT.publishDataverseViaNativeApi(dataverse2Alias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        UtilIT.linkDataset(datasetPid, dataverse2Alias, apiToken).then().assertThat().statusCode(OK.getStatusCode());
+
+        UtilIT.sleepForReindex(String.valueOf(datasetId), apiToken, 5);
+
+        // Test that the Dataverse collection that the dataset was linked to is also returned
+        searchResponse = UtilIT.search("*", apiToken, "&subtree=" + dataverseAlias + "&type=dataset&show_collections=true");
+        searchResponse.prettyPrint();
+        searchResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].collections.size()", CoreMatchers.is(2))
+                .body("data.items[0].collections", CoreMatchers.hasItems(
+                        Map.of("id", dataverseId, "name", dataverseName, "alias", dataverseAlias),
+                        Map.of("id", dataverse2Id, "name", dataverse2Name, "alias", dataverse2Alias)
+                ));
+
+    }
+    
+    @Test
+    public void testFileAddedAfterPublicationIsIndexed() {
+        // Create user
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        // Create dataverse
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Create dataset
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+
+        // Publish dataverse and dataset
+        Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        publishDataverse.prettyPrint();
+        publishDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDataset.prettyPrint();
+        publishDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Verify no files in search results initially
+        Response searchBeforeFileUpload = UtilIT.search("parentId:" + datasetId, apiToken);
+        searchBeforeFileUpload.prettyPrint();
+        searchBeforeFileUpload.then().assertThat()
+                .body("data.total_count", CoreMatchers.is(0))
+                .statusCode(OK.getStatusCode());
+
+        // Upload a file after publication
+        String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
+        Response uploadFileResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadFileResponse.prettyPrint();
+        uploadFileResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Get file ID from the upload response
+        Integer fileId = JsonPath.from(uploadFileResponse.getBody().asString()).getInt("data.files[0].dataFile.id");
+
+        // Wait for indexing to complete
+        String searchQuery = "entityId:" + fileId;
+        assertTrue(UtilIT.sleepForSearch(searchQuery, apiToken, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), 
+                   "Failed test if search exceeds max duration " + searchQuery);
+
+        // Search for the file and verify it's indexed
+        Response searchAfterFileUpload = UtilIT.search(searchQuery, apiToken);
+        searchAfterFileUpload.prettyPrint();
+        searchAfterFileUpload.then().assertThat()
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.items[0].name", is("dataverseproject.png"))
+                .body("data.items[0].file_content_type", CoreMatchers.is("image/png"))
+                .statusCode(OK.getStatusCode());
+
+        // Clean up - delete dataset, dataverse, and user
+        
+        //Superuser to delete published dataset
+        Response makeSuperUser = UtilIT.setSuperuserStatus(username, true);
+        assertEquals(200, makeSuperUser.getStatusCode());
+        
+        // Delete the dataset
+        Response deleteDatasetResponse = UtilIT.destroyDataset(datasetId, apiToken);
+        deleteDatasetResponse.prettyPrint();
+        deleteDatasetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        try {
+            // give the bag time to generate
+            Thread.sleep(3000);
+        } catch (InterruptedException ex) {
+        }
+
+        // Delete the dataverse
+        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteDataverseResponse.prettyPrint();
+        deleteDataverseResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // Delete the user
+        Response deleteUserResponse = UtilIT.deleteUser(username);
+        deleteUserResponse.prettyPrint();
+        deleteUserResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
     }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SendFeedbackApiIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SendFeedbackApiIT.java
new file mode 100644
index 00000000000..f2fd80bbf51
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SendFeedbackApiIT.java
@@ -0,0 +1,263 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.text.MessageFormat;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SendFeedbackApiIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @AfterEach
+    public void reset() {
+        UtilIT.deleteSetting(SettingsServiceBean.Key.RateLimitingCapacityByTierAndAction);
+    }
+
+    @Test
+    public void testBadJson() {
+        Response response = UtilIT.sendFeedback("{'notValidJson'", null);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.startsWith("Invalid JSON; error message:"));
+    }
+
+    @Test
+    public void testSupportRequest() {
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("fromEmail", "from@mailinator.com");
+        job.add("subject", "Help!");
+        job.add("body", "I need help.");
+
+        Response response = UtilIT.sendFeedback(job, null);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fromEmail", CoreMatchers.equalTo("from@mailinator.com"));
+    }
+
+    @Test
+    public void testSendFeedbackOnRootDataverse() {
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        long rootDataverseId = 1;
+        job.add("targetId", rootDataverseId);
+        job.add("fromEmail", "from@mailinator.com");
+        job.add("toEmail", "to@mailinator.com");
+        job.add("subject", "collaboration");
+        job.add("body", "Are you interested writing a grant based on this research?");
+
+        Response response = UtilIT.sendFeedback(job, null);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        job = Json.createObjectBuilder();
+        job.add("identifier", "root");
+        job.add("fromEmail", "from@mailinator.com");
+        job.add("toEmail", "to@mailinator.com");
+        job.add("subject", "collaboration");
+        job.add("body", "Are you interested writing a grant based on this research?");
+
+        response = UtilIT.sendFeedback(job, null);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+    }
+
+    @Test
+    public void testSendFeedbackOnDataset() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String fromEmail = UtilIT.getEmailFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        String pathToJsonFile = "scripts/api/data/dataset-create-new-all-default-fields.json";
+        Response createDataset = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        long datasetId = JsonPath.from(createDataset.body().asString()).getLong("data.id");
+        String persistentId = JsonPath.from(createDataset.body().asString()).getString("data.persistentId");
+        Response response;
+        String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
+        Response uploadResponse = UtilIT.uploadFileViaNative(String.valueOf(datasetId), pathToFile, apiToken);
+        uploadResponse.prettyPrint();
+        long fileId = JsonPath.from(uploadResponse.body().asString()).getLong("data.files[0].dataFile.id");
+
+        // Test with body text length to long (length of body after sanitizing/removing html = 67)
+        UtilIT.setSetting(SettingsServiceBean.Key.ContactFeedbackMessageSizeLimit, "60");
+        response = UtilIT.sendFeedback(buildJsonEmail(0, persistentId, null), apiToken);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.equalTo(MessageFormat.format(BundleUtil.getStringFromBundle("sendfeedback.body.error.exceedsLength"), 67, 60)));
+        // reset to unlimited
+        UtilIT.setSetting(SettingsServiceBean.Key.ContactFeedbackMessageSizeLimit, "0");
+
+        // Test with no body/body length =0
+        response = UtilIT.sendFeedback(Json.createObjectBuilder().add("targetId", datasetId).add("subject", "collaboration").add("body", ""), apiToken);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.equalTo(BundleUtil.getStringFromBundle("sendfeedback.body.error.isEmpty")));
+
+        // Test with missing subject
+        response = UtilIT.sendFeedback(Json.createObjectBuilder().add("targetId", datasetId).add("body", ""), apiToken);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.equalTo(BundleUtil.getStringFromBundle("sendfeedback.body.error.missingRequiredFields")));
+
+        // Test send feedback on DataFile
+        // Test don't send fromEmail. Let it get it from the requesting user
+        response = UtilIT.sendFeedback(buildJsonEmail(fileId, null, null), apiToken);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fromEmail", CoreMatchers.equalTo(fromEmail));
+
+        // Test guest calling with no token
+        fromEmail = "testEmail@example.com";
+        response = UtilIT.sendFeedback(buildJsonEmail(datasetId, null, fromEmail), null);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fromEmail", CoreMatchers.equalTo(fromEmail));
+        validateEmail(response.body().asString());
+
+        // Test guest calling with no token and missing email
+        response = UtilIT.sendFeedback(buildJsonEmail(datasetId, null, null), null);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.equalTo(BundleUtil.getStringFromBundle("sendfeedback.fromEmail.error.missing")));
+
+        // Test with invalid email - also tests that fromEmail trumps the users email if it is included in the Json
+        response = UtilIT.sendFeedback(buildJsonEmail(datasetId, null, "BADEmail"), apiToken);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.equalTo(MessageFormat.format(BundleUtil.getStringFromBundle("sendfeedback.fromEmail.error.invalid"), "BADEmail")));
+
+        // Test with bad identifier
+        response = UtilIT.sendFeedback(buildJsonEmail(0, "BadIdentifier", null), apiToken);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", CoreMatchers.equalTo(BundleUtil.getStringFromBundle("sendfeedback.request.error.targetNotFound")));
+    }
+
+    private JsonObjectBuilder buildJsonEmail(long targetId, String identifier, String fromEmail) {
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        if (targetId > 0) {
+            job.add("targetId", targetId);
+        }
+        if (identifier != null) {
+            job.add("identifier", identifier);
+        }
+        job.add("subject", "collaboration");
+        job.add("body", "Are you interested writing a grant based on this research? {\"<script src=\\\"http://malicious.url.com\\\"/>\", \"\"}");
+        if (fromEmail != null) {
+            job.add("fromEmail", fromEmail);
+        }
+        return job;
+    }
+    private void validateEmail(String body) {
+        assertTrue(!body.contains("malicious.url.com"));
+    }
+
+    @Test
+    public void testSendRateLimited() {
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        createUser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        String fromEmail = UtilIT.getEmailFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        String pathToJsonFile = "scripts/api/data/dataset-create-new-all-default-fields.json";
+        Response createDataset = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        long datasetId = JsonPath.from(createDataset.body().asString()).getLong("data.id");
+        Response response;
+
+        // Test with rate limiting on
+        UtilIT.setSetting(SettingsServiceBean.Key.RateLimitingCapacityByTierAndAction, "[{\"tier\": 0, \"limitPerHour\": 1, \"actions\": [\"CheckRateLimitForDatasetFeedbackCommand\"]}]");
+        // This call gets allowed because the setting change OKs it when resetting rate limiting
+        response = UtilIT.sendFeedback(buildJsonEmail(datasetId, null, "testEmail@example.com"), null);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fromEmail", CoreMatchers.equalTo("testEmail@example.com"));
+
+        // Call 1 of the 1 per hour limit
+        response = UtilIT.sendFeedback(buildJsonEmail(datasetId, null, "testEmail2@example.com"), null);
+        response.prettyPrint();
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        // Call 2 - over the limit
+        response = UtilIT.sendFeedback(buildJsonEmail(datasetId, null, "testEmail2@example.com"), null);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(TOO_MANY_REQUESTS.getStatusCode());
+
+        response = UtilIT.rateLimitStats(apiToken, null);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode());
+        response = UtilIT.rateLimitStats(superuserApiToken, null);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        response = UtilIT.rateLimitStats(superuserApiToken, "1");
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        response = UtilIT.sendFeedback(buildJsonEmail(datasetId, null, null), apiToken);
+        response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data[0].fromEmail", CoreMatchers.equalTo(fromEmail));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SignedUrlAuthMechanismIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SignedUrlAuthMechanismIT.java
new file mode 100644
index 00000000000..dd5ddbfa7d8
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SignedUrlAuthMechanismIT.java
@@ -0,0 +1,46 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.get;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SignedUrlAuthMechanismIT {
+
+    @BeforeAll
+    public static void setUp() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testSignedUrlAuthMechanism() {
+        // Test user setup
+        Response createUserResponse = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUserResponse);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        UtilIT.makeSuperUser(username);
+
+        // Test dataset setup
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
+
+        // Valid Signed URL behavior
+        String apiPath = String.format("/api/v1/datasets/:persistentId/?persistentId=%s", datasetPersistentId);
+        Response createSignedUrlResponse = UtilIT.createSignedUrl(apiToken, apiPath, username);
+        String signedUrl = UtilIT.getSignedUrlFromResponse(createSignedUrlResponse);
+        Response signedUrlResponse = get(signedUrl);
+        assertEquals(OK.getStatusCode(), signedUrlResponse.getStatusCode());
+
+        // Invalid Signed URL behavior
+        String invalidSignedUrlPath = String.format("/api/v1/datasets/:persistentId/?persistentId=%s&until=2999-01-01T23:59:29.855&user=dataverseAdmin&method=GET&token=invalidToken", datasetPersistentId);
+        Response invalidSignedUrlResponse = get(invalidSignedUrlPath);
+        assertEquals(UNAUTHORIZED.getStatusCode(), invalidSignedUrlResponse.getStatusCode());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SignpostingIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SignpostingIT.java
new file mode 100644
index 00000000000..679d1e79aa1
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SignpostingIT.java
@@ -0,0 +1,149 @@
+package edu.harvard.iq.dataverse.api;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+
+import static io.restassured.RestAssured.given;
+import io.restassured.response.Response;
+
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import jakarta.json.JsonObject;
+import static org.hamcrest.CoreMatchers.endsWith;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class SignpostingIT {
+
+    @BeforeAll
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testSignposting() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(username);
+        toggleSuperuser.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        String datasetPid = UtilIT.getDatasetPersistentIdFromResponse(createDataset);
+
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverse.then().assertThat().statusCode(OK.getStatusCode());
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken);
+        publishDataset.then().assertThat().statusCode(OK.getStatusCode());
+
+        String datasetLandingPage = RestAssured.baseURI + "/dataset.xhtml?persistentId=" + datasetPid;
+        System.out.println("Checking dataset landing page for Signposting: " + datasetLandingPage);
+        Response getHtml = given().get(datasetLandingPage);
+        getHtml.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .header("Link", endsWith("linkset?persistentId=" + datasetPid + "> ; rel=\"linkset\";type=\"application/linkset+json\""));
+
+        System.out.println("Link header: " + getHtml.getHeader("Link"));
+        if (false) {
+            // Split on commas to make the output more readable.
+            System.out.println("---");
+            String header = getHtml.getHeader("Link");
+            for (String string : header.split(",")) {
+                System.out.println(string + ",");
+            }
+            System.out.println("returning early...");
+            return;
+        }
+
+        getHtml.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Make sure there's Signposting stuff in the "Link" header such as
+        // the dataset PID, cite-as, etc.
+        String linkHeader = getHtml.getHeader("Link");
+        assertTrue(linkHeader.contains(datasetPid));
+        assertTrue(linkHeader.contains("cite-as"));
+        assertTrue(linkHeader.contains("describedby"));
+        // Make sure we get more exporters besides just "schema.org".
+        assertTrue(linkHeader.contains("oai_datacite"));
+
+        Response headHtml = given().head(datasetLandingPage);
+
+        System.out.println("Link header: " + headHtml.getHeader("Link"));
+
+        headHtml.then().assertThat().statusCode(OK.getStatusCode());
+
+        // Make sure there's Signposting stuff in the "Link" header such as
+        // the dataset PID, cite-as, etc.
+        // TODO: The comment above is a repeat and so are some of the assertions below. Consolidate?
+        linkHeader = getHtml.getHeader("Link");
+        assertTrue(linkHeader.contains(datasetPid));
+        assertTrue(linkHeader.contains("cite-as"));
+        assertTrue(linkHeader.contains("describedby"));
+        assertTrue(linkHeader.contains("<http://creativecommons.org/publicdomain/zero/1.0>;rel=\"license\""));
+
+        Pattern pattern = Pattern.compile("<([^<]*)> ; rel=\"linkset\";type=\"application\\/linkset\\+json\"");
+        Matcher matcher = pattern.matcher(linkHeader);
+        matcher.find();
+        String linksetUrl = matcher.group(1);
+
+        System.out.println("Linkset URL: " + linksetUrl);
+
+        Response linksetResponse = given().accept(ContentType.JSON).get(linksetUrl);
+        linksetResponse.prettyPrint();
+        linksetResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("linkset[0].anchor", endsWith("/dataset.xhtml?persistentId=" + datasetPid))
+                .body("linkset[0].license.href", is("http://creativecommons.org/publicdomain/zero/1.0"))
+                .body("linkset[0].describedby[1].href", endsWith("persistentId=" + datasetPid));
+
+        String responseString = linksetResponse.getBody().asString();
+        System.out.println("response string: " + responseString);
+
+        JsonObject data = JsonUtil.getJsonObject(responseString);
+        JsonObject lso = data.getJsonArray("linkset").getJsonObject(0);
+        System.out.println("Linkset: " + lso.toString());
+
+        linksetResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        assertTrue(lso.getString("anchor").indexOf("/dataset.xhtml?persistentId=" + datasetPid) > 0);
+        assertTrue(lso.containsKey("describedby"));
+
+        // Test export URL from link header
+        // regex inspired by https://stackoverflow.com/questions/68860255/how-to-match-the-closest-opening-and-closing-brackets
+        Pattern exporterPattern = Pattern.compile("[<\\[][^()\\[\\]]*?exporter=schema.org[^()\\[\\]]*[>\\]]");
+        Matcher exporterMatcher = exporterPattern.matcher(linkHeader);
+        exporterMatcher.find();
+        // TODO: make an assertion
+        //assertTrue(exporterMatcher.find());
+
+        // Test another
+        Pattern exporterPattern2 = Pattern.compile("exporter=oai_datacite");
+        Matcher exporterMatcher2 = exporterPattern2.matcher(linkHeader);
+        assertTrue(exporterMatcher2.find());
+
+        Response exportDataset = UtilIT.exportDataset(datasetPid, "schema.org");
+        exportDataset.prettyPrint();
+        exportDataset.then().assertThat().statusCode(OK.getStatusCode());
+
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SiteMapIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SiteMapIT.java
index 723f05d3802..1b9025cab82 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/SiteMapIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SiteMapIT.java
@@ -1,13 +1,13 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import io.restassured.response.Response;
 
 public class SiteMapIT {
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/StorageSitesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/StorageSitesIT.java
index a33d7d60263..89208997ee3 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/StorageSitesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/StorageSitesIT.java
@@ -1,17 +1,17 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.locality.StorageSite;
 import edu.harvard.iq.dataverse.util.SystemConfig;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class StorageSitesIT {
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java
index 9615eead8fd..709908ac6eb 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java
@@ -1,32 +1,39 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
-import edu.harvard.iq.dataverse.GlobalId;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.api.datadeposit.SwordConfigurationImpl;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
-import static javax.ws.rs.core.Response.Status.METHOD_NOT_ALLOWED;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.NO_CONTENT;
-import static javax.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static jakarta.ws.rs.core.Response.Status.METHOD_NOT_ALLOWED;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.NO_CONTENT;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.startsWith;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * In all these tests you should never see something like "[long string exposing
@@ -44,8 +51,11 @@ public class SwordIT {
     private static String superuser;
     private static final String rootDataverseAlias = "root";
     private static String apiTokenSuperuser;
+    
+    private static final String rootDvNotPublished = "Many of these SWORD tests require that the root dataverse collection has been published. Publish the root dataverse and then re-run these tests.";
+    private static final String rootDvLackPermissions = "Many of these SWORD tests require you set permissions for the root dataverse collection: \"Anyone with a Dataverse account can add sub dataverses and datasets\" + curator role for new datasets. Please set and re-run these tests.";
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
         boolean testAgainstDev1 = false;
@@ -53,20 +63,32 @@ public static void setUpClass() {
             RestAssured.baseURI = "https://dev1.dataverse.org";
         }
         Response createUser = UtilIT.createRandomUser();
-        createUser.prettyPrint();
+        //createUser.prettyPrint();
         superuser = UtilIT.getUsernameFromResponse(createUser);
         apiTokenSuperuser = UtilIT.getApiTokenFromResponse(createUser);
         String apitoken = UtilIT.getApiTokenFromResponse(createUser);
         UtilIT.makeSuperUser(superuser).then().assertThat().statusCode(OK.getStatusCode());
+        
+        // check that root dataverse has been released
         Response checkRootDataverse = UtilIT.listDatasetsViaSword(rootDataverseAlias, apitoken);
-        checkRootDataverse.prettyPrint();
-        checkRootDataverse.then().assertThat()
-                .statusCode(OK.getStatusCode());
-        boolean rootDataverseHasBeenReleased = checkRootDataverse.getBody().xmlPath().getBoolean("feed.dataverseHasBeenReleased");
-        if (!rootDataverseHasBeenReleased) {
-            logger.info("Many of these SWORD tests require that the root dataverse has been published. Publish the root dataverse and then re-run these tests.");
-            System.exit(666);
+        //checkRootDataverse.prettyPrint();
+        checkRootDataverse.then().assertThat().statusCode(OK.getStatusCode());
+        assumeTrue(checkRootDataverse.getBody().xmlPath().getBoolean("feed.dataverseHasBeenReleased"), rootDvNotPublished);
+        
+        // check that root dataverse has permissions for any user set to dataverse + dataset creator (not admin, not curator!)
+        checkRootDataverse = UtilIT.getRoleAssignmentsOnDataverse(rootDataverseAlias, apiTokenSuperuser);
+        //checkRootDataverse.prettyPrint();
+        checkRootDataverse.then().assertThat().statusCode(OK.getStatusCode());
+        List<Map<String, String>> rootDatavereRoles = checkRootDataverse.getBody().jsonPath().getList("data");
+        boolean properPermissionsSet = false;
+        for (Map assignment : rootDatavereRoles) {
+            if (assignment.get("assignee").equals(":authenticated-users") &&
+                assignment.get("_roleAlias").equals("fullContributor")) {
+                properPermissionsSet = true;
+                break;
+            }
         }
+        assumeTrue(properPermissionsSet, rootDvLackPermissions);
 
     }
 
@@ -177,6 +199,13 @@ public void testCreateDataverseCreateDatasetUploadFileDownloadFileEditTitle() {
         String persistentId = UtilIT.getDatasetPersistentIdFromSwordResponse(createDatasetResponse);
         logger.info("persistent id: " + persistentId);
 
+        Response getJson = UtilIT.nativeGetUsingPersistentId(persistentId, apiToken);
+        getJson.prettyPrint();
+        getJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.license.name", equalTo("CC0 1.0"))
+                .body("data.latestVersion.license.uri", equalTo("http://creativecommons.org/publicdomain/zero/1.0"));
+
         Response atomEntryUnAuth = UtilIT.getSwordAtomEntry(persistentId, apiTokenNoPrivs);
         atomEntryUnAuth.prettyPrint();
         atomEntryUnAuth.then().assertThat()
@@ -360,21 +389,19 @@ public void testCreateAndDeleteDatasetInRoot() {
 
         String persistentId = null;
         Integer datasetId = null;
-        String protocol;
-        String authority;
-        String identifier = null;
 
         Response createDataset = UtilIT.createDatasetViaSwordApi(rootDataverseAlias, datasetTitle, apiTokenContributor);
-        createDataset.prettyPrint();
+        String createResponse = createDataset.prettyPrint();
         createDataset.then().assertThat()
                 .statusCode(CREATED.getStatusCode())
                 .body("entry.treatment", equalTo("no treatment information available"));
 
         persistentId = UtilIT.getDatasetPersistentIdFromSwordResponse(createDataset);
-        GlobalId globalId = new GlobalId(persistentId);
-        protocol = globalId.getProtocol();
-        authority = globalId.getAuthority();
-        identifier = globalId.getIdentifier();
+        //previsouly the test parsed the persistentID but this is now done via PIDProviderBeans
+        //Instead, verify it starts with the protocol and the rest was what was returned in the createDataset call
+        assertTrue(persistentId.startsWith("doi:"));
+        String identifier = persistentId.substring(4);
+        assertTrue(createResponse.contains(identifier));
 
         Response listDatasetsAtRoot = UtilIT.listDatasetsViaSword(rootDataverseAlias, apiTokenContributor);
         listDatasetsAtRoot.prettyPrint();
@@ -435,7 +462,7 @@ public void testCreateAndDeleteDatasetInRoot() {
             assertNull(attemptToGetFileId);
         } catch (Exception ex) {
             System.out.println("We expect an exception here because we can no longer find the file because deleted it: " + ex);
-            assertTrue(ex.getClass().getName().equals(ArrayIndexOutOfBoundsException.class.getName()));
+            assertTrue(ex instanceof ArrayIndexOutOfBoundsException);
         }
 
         String newTitle = "A New Hope";
@@ -620,6 +647,120 @@ public void testCreateDatasetPublishDestroy() {
 
     }
 
+
+    @Test
+    public void testLicenses() {
+
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        String title = "License to Kill";
+        String description = "Spies in 1989";
+        String license = "NONE";
+        Response failToCreateDataset1 = UtilIT.createDatasetViaSwordApi(dataverseAlias, title, description, license, apiToken);
+        failToCreateDataset1.prettyPrint();
+        // As of 5.10 and PR #7920, you cannot pass NONE as a license.
+        failToCreateDataset1.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        String rights = "Call me";
+        Response failToCreateDataset2 = UtilIT.createDatasetViaSwordApi(dataverseAlias, title, description, license, rights, apiToken);
+        failToCreateDataset2.prettyPrint();
+        // You can't pass both license and rights
+        failToCreateDataset2.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        license = "CC0 1.0";
+        Response createDataset = UtilIT.createDatasetViaSwordApi(dataverseAlias, title, description, license, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String persistentId = UtilIT.getDatasetPersistentIdFromSwordResponse(createDataset);
+
+        Response getJson = UtilIT.nativeGetUsingPersistentId(persistentId, apiToken);
+        getJson.prettyPrint();
+        getJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.license.name", equalTo("CC0 1.0"))
+                .body("data.latestVersion.license.uri", equalTo("http://creativecommons.org/publicdomain/zero/1.0"))
+                .body("data.latestVersion.termsOfUse", equalTo(null));
+    }
+
+    @Test
+    public void testCustomTerms() {
+
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        String title = "Terms of Endearment";
+        String description = "Aurora, etc.";
+        String license = null;
+        String rights = "Call me";
+        Response createDataset = UtilIT.createDatasetViaSwordApi(dataverseAlias, title, description, license, rights, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        String persistentId = UtilIT.getDatasetPersistentIdFromSwordResponse(createDataset);
+
+        Response getJson = UtilIT.nativeGetUsingPersistentId(persistentId, apiToken);
+        getJson.prettyPrint();
+        getJson.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.latestVersion.termsOfUse", equalTo("Call me"))
+                .body("data.latestVersion.license", equalTo(null));
+
+        UtilIT.setSetting(SettingsServiceBean.Key.AllowCustomTermsOfUse, "false")
+                .then().assertThat().statusCode(OK.getStatusCode());
+
+        Response createDatasetCustomTermsDisabled = UtilIT.createDatasetViaSwordApi(dataverseAlias, title, description, license, rights, apiToken);
+        createDatasetCustomTermsDisabled.prettyPrint();
+        createDatasetCustomTermsDisabled.then().assertThat()
+                //  <summary>Custom Terms (dcterms:rights) are not allowed.</summary>
+                .statusCode(BAD_REQUEST.getStatusCode());
+
+        // cleanup, allow custom terms again (delete because it defaults to true)
+        UtilIT.deleteSetting(SettingsServiceBean.Key.AllowCustomTermsOfUse);
+
+    }
+
+    @Test
+    public void testXmlExampleInGuides() throws IOException {
+
+        Response createUser = UtilIT.createRandomUser();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(apiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        File exampleFile = new File("doc/sphinx-guides/source/api/sword-atom-entry.xml");
+        String xmlIn = new String(java.nio.file.Files.readAllBytes(Paths.get(exampleFile.getAbsolutePath())));
+        Response createDataset = UtilIT.createDatasetViaSwordApiFromXML(dataverseAlias, xmlIn, apiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+    }
+
     /**
      * This test requires the root dataverse to have been published already.
      *
@@ -709,12 +850,12 @@ public void testDeleteFiles() {
         String citation = atomEntryDraftV2.body().xmlPath().getString("entry.bibliographicCitation");
         logger.info("citation (should contain 'DRAFT'): " + citation);
         boolean draftStringFoundInCitation = citation.matches(".*DRAFT.*");
-        assertEquals(true, draftStringFoundInCitation);
+        assertTrue(draftStringFoundInCitation);
 
         List<String> oneFileLeftInV2Draft = statement3.getBody().xmlPath().getList("feed.entry.id");
         logger.info("Number of files remaining in this post version 1 draft:" + oneFileLeftInV2Draft.size());
         assertEquals(1, oneFileLeftInV2Draft.size());
-
+        UtilIT.sleepForLock(datasetPersistentId, "EditInProgress", apiToken, UtilIT.MAXIMUM_PUBLISH_LOCK_DURATION);
         Response deleteIndex1b = UtilIT.deleteFile(Integer.parseInt(index1b), apiToken);
         deleteIndex1b.then().assertThat()
                 .statusCode(NO_CONTENT.getStatusCode());
@@ -827,8 +968,10 @@ public void testDeleteFiles() {
 
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
+        // cleanup, allow custom terms again (delete because it defaults to true)
+        UtilIT.deleteSetting(SettingsServiceBean.Key.AllowCustomTermsOfUse);
         UtilIT.deleteUser(superuser);
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/TabularIT.java b/src/test/java/edu/harvard/iq/dataverse/api/TabularIT.java
index 512080ae569..25eec16e17b 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/TabularIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/TabularIT.java
@@ -1,33 +1,31 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
-import static edu.harvard.iq.dataverse.api.AccessIT.apiToken;
-import static edu.harvard.iq.dataverse.api.AccessIT.datasetId;
-import static edu.harvard.iq.dataverse.api.AccessIT.tabFile3NameRestricted;
+import io.restassured.RestAssured;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
 import java.io.File;
 import java.util.Arrays;
 import java.util.logging.Logger;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class TabularIT {
 
     private static final Logger logger = Logger.getLogger(TabularIT.class.getCanonicalName());
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void testTabularFile() throws InterruptedException {
         Response createUser = UtilIT.createRandomUser();
@@ -63,7 +61,7 @@ public void testTabularFile() throws InterruptedException {
 
         // Give file time to ingest
         
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + pathToFileThatGoesThroughIngest , UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        assertTrue(UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + pathToFileThatGoesThroughIngest);
       //  Thread.sleep(10000);
 
         Response fileMetadataNoFormat = UtilIT.getFileMetadata(fileIdAsString, null, apiToken);
@@ -102,7 +100,7 @@ public void testTabularFile() throws InterruptedException {
 
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void test50by1000() {
         // cp scripts/search/data/tabular/50by1000.dta /tmp
@@ -113,7 +111,7 @@ public void test50by1000() {
         assertEquals("NVARS: 50", response.body().asString().split("\n")[0]);
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void testStata13TinyFile() {
         // cp scripts/search/data/tabular/120745.dta /tmp
@@ -124,7 +122,7 @@ public void testStata13TinyFile() {
         assertEquals("NVARS: 1", response.body().asString().split("\n")[0]);
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void testStata13Auto() {
         // curl https://www.stata-press.com/data/r13/auto.dta > /tmp/stata13-auto.dta
@@ -135,7 +133,7 @@ public void testStata13Auto() {
         assertEquals("NVARS: 12", response.body().asString().split("\n")[0]);
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void testStata14OpenSourceAtHarvard() {
         // https://dataverse.harvard.edu/file.xhtml?fileId=3040230 converted to Stata 14: 2017-07-31.tab
@@ -148,7 +146,7 @@ public void testStata14OpenSourceAtHarvard() {
         assertEquals("NVARS: 10", response.body().asString().split("\n")[0]);
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void testStata14Aggregated() {
         // https://dataverse.harvard.edu/file.xhtml?fileId=3140457 Stata 14: 2018_04_06_Aggregated_dataset_v2.dta
@@ -160,7 +158,7 @@ public void testStata14Aggregated() {
         assertEquals("NVARS: 227", response.body().asString().split("\n")[0]);
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void testStata14MmPublic() {
         // TODO: This file was downloaded at random. We could keep trying to get it to ingest.
@@ -175,7 +173,7 @@ public void testStata14MmPublic() {
         assertEquals("NVARS: 12", response.body().asString().split("\n")[0]);
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void testStata15() {
         // for i in `echo {0..33000}`; do echo -n "var$i,"; done > 33k.csv
@@ -187,7 +185,7 @@ public void testStata15() {
         assertEquals("NVARS: 33001", response.body().asString().split("\n")[0]);
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void testStata13Multiple() {
         String fileType = "application/x-stata-13";
@@ -207,7 +205,7 @@ public void testStata13Multiple() {
         }
     }
     
-    @Ignore
+    @Disabled
     @Test
     public void testStata14Multiple() {
         String fileType = "application/x-stata-14";
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/ThumbnailsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/ThumbnailsIT.java
index ffa432de63b..834d5dddc8b 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/ThumbnailsIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/ThumbnailsIT.java
@@ -1,8 +1,17 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.response.Response;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
 import org.hamcrest.CoreMatchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ThumbnailsIT {
 
@@ -35,4 +44,67 @@ public void testDatasetThumbnail() {
                 .statusCode(403);
 
     }
+
+    @Test
+    public void testBadTiffThumbnailFailure() {
+        String goodTiff = "src/test/resources/images/good.tiff";
+        String badTiff = "src/test/resources/images/bad.tiff";
+        // setup dataverse and dataset
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        UtilIT.makeSuperUser(username);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        String pathToJsonFile = "src/test/resources/json/complete-dataset-with-files.json";
+        Response createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        Response datasetAsJson = UtilIT.nativeGet(datasetId, apiToken);
+        datasetAsJson.prettyPrint();
+        String protocol = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.protocol");
+        String authority = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.authority");
+        String identifier = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
+        String datasetPersistentId = protocol + ":" + authority + "/" + identifier;
+
+        // check thumbnails are empty
+
+        Response thumbnailCandidatesResponse = UtilIT.showDatasetThumbnailCandidates(datasetPersistentId, apiToken);
+        thumbnailCandidatesResponse.prettyPrint();
+        thumbnailCandidatesResponse.then().assertThat().statusCode(OK.getStatusCode());
+        List<Object> images = JsonPath.from(thumbnailCandidatesResponse.getBody().asString()).getList("data");
+        assertTrue(images.size() == 0);
+
+        // upload image files ( 1 good and 1 bad )
+
+        Response uploadResponse = UtilIT.uploadFileViaNative(datasetId.toString(), goodTiff, apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+        uploadResponse = UtilIT.uploadFileViaNative(datasetId.toString(), badTiff, apiToken);
+        uploadResponse.then().assertThat().statusCode(OK.getStatusCode());
+
+        // check thumbnails only contains 1 good image
+        thumbnailCandidatesResponse = UtilIT.showDatasetThumbnailCandidates(datasetPersistentId, apiToken);
+        thumbnailCandidatesResponse.prettyPrint();
+        thumbnailCandidatesResponse.then().assertThat().statusCode(OK.getStatusCode());
+        images = JsonPath.from(thumbnailCandidatesResponse.getBody().asString()).getList("data");
+        assertTrue(images.size() == 1);
+
+        // test set logo with badTiff and tiff to large (goodTiff)
+        Response uploadLogoResponse = UtilIT.uploadDatasetLogo(datasetPersistentId, badTiff, apiToken);
+        uploadLogoResponse.prettyPrint();
+        uploadLogoResponse.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+        uploadLogoResponse.then().assertThat().body("message", equalTo(
+            BundleUtil.getStringFromBundle("datasets.api.thumbnail.nonDatasetFailed")));
+
+        uploadLogoResponse = UtilIT.uploadDatasetLogo(datasetPersistentId, goodTiff, apiToken);
+        uploadLogoResponse.prettyPrint();
+        uploadLogoResponse.then().assertThat().statusCode(FORBIDDEN.getStatusCode());
+        uploadLogoResponse.then().assertThat().body("message", containsString(
+            BundleUtil.getStringFromBundle("datasets.api.thumbnail.fileToLarge", List.of(""))));
+
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UsersIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UsersIT.java
index 35799add309..dce4871dc16 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UsersIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UsersIT.java
@@ -1,38 +1,45 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.RestAssured;
-import static com.jayway.restassured.RestAssured.given;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import io.restassured.RestAssured;
+
+import static io.restassured.RestAssured.given;
+
+import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import java.util.ArrayList;
+
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.CREATED;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.OK;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
-import static junit.framework.Assert.assertEquals;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+
+import static jakarta.ws.rs.core.Response.Status.*;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertTrue;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class UsersIT {
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
-        
+       /* 
         Response removeAllowApiTokenLookupViaApi = UtilIT.deleteSetting(SettingsServiceBean.Key.AllowApiTokenLookupViaApi);
         removeAllowApiTokenLookupViaApi.then().assertThat()
                 .statusCode(200);
-
+*/
     }
     
     @Test
@@ -160,7 +167,7 @@ public void testMergeAccounts(){
         Integer tabFile3IdRestrictedNew = JsonPath.from(tab3AddResponse.body().asString()).getInt("data.files[0].dataFile.id");
         
         //Sleep while dataset locked for ingest
-        assertTrue("Failed test if Ingest Lock exceeds max duration " + tabFile3NameRestrictedNew , UtilIT.sleepForLock(datasetIdNew.longValue(), "Ingest", superuserApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION));
+        assertTrue(UtilIT.sleepForLock(datasetIdNew.longValue(), "Ingest", superuserApiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if Ingest Lock exceeds max duration " + tabFile3NameRestrictedNew);
 
         Response restrictResponse = UtilIT.restrictFile(tabFile3IdRestrictedNew.toString(), true, superuserApiToken);
         restrictResponse.prettyPrint();
@@ -204,15 +211,13 @@ public void testMergeAccounts(){
         String aliasInOwner = "groupFor" + dataverseAlias;
         String displayName = "Group for " + dataverseAlias;
         String user2identifier = "@" + usernameConsumed;
+        String target2identifier = "@" + targetname;
         Response createGroup = UtilIT.createGroup(dataverseAlias, aliasInOwner, displayName, superuserApiToken);
         createGroup.prettyPrint();
         createGroup.then().assertThat()
                 .statusCode(CREATED.getStatusCode());
 
-        String groupIdentifier = JsonPath.from(createGroup.asString()).getString("data.identifier");
-
-        List<String> roleAssigneesToAdd = new ArrayList<>();
-        roleAssigneesToAdd.add(user2identifier);
+        List<String> roleAssigneesToAdd = Arrays.asList(user2identifier, target2identifier);
         Response addToGroup = UtilIT.addToGroup(dataverseAlias, aliasInOwner, roleAssigneesToAdd, superuserApiToken);
         addToGroup.prettyPrint();
         addToGroup.then().assertThat()
@@ -370,29 +375,38 @@ public void testAPITokenEndpoints() {
                 .body("data.message", containsString(userApiToken))
                 .body("data.message", containsString("expires on"));
 
+        // Recreate given a bad API token
         Response recreateToken = UtilIT.recreateToken("BAD-Token-blah-89234");
         recreateToken.prettyPrint();
         recreateToken.then().assertThat()
                 .statusCode(UNAUTHORIZED.getStatusCode());
 
+        // Recreate given a valid API token
         recreateToken = UtilIT.recreateToken(userApiToken);
         recreateToken.prettyPrint();
         recreateToken.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                .body("data.message", containsString("New token for"));
+                .body("data.message", containsString("New token for"))
+                .body("data.message", CoreMatchers.not(containsString("and expires on")));
 
+        // Recreate given a valid API token and returning expiration
         createUser = UtilIT.createRandomUser();
-        createUser.prettyPrint();
-        assertEquals(200, createUser.getStatusCode());
+        assertEquals(OK.getStatusCode(), createUser.getStatusCode());
+
+        userApiToken =  UtilIT.getApiTokenFromResponse(createUser);
+
+        recreateToken = UtilIT.recreateToken(userApiToken, true);
+        recreateToken.prettyPrint();
+        recreateToken.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", containsString("New token for"))
+                .body("data.message", containsString("and expires on"));
 
-        String userApiTokenForDelete = UtilIT.getApiTokenFromResponse(createUser);
-        
         /*
         Add tests for Private URL
         */
         
         createUser = UtilIT.createRandomUser();
-        String username = UtilIT.getUsernameFromResponse(createUser);
         String apiToken = UtilIT.getApiTokenFromResponse(createUser);
         Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
         createDataverseResponse.prettyPrint();
@@ -402,7 +416,7 @@ public void testAPITokenEndpoints() {
         createDatasetResponse.prettyPrint();
         Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
         
-        Response createPrivateUrl = UtilIT.privateUrlCreate(datasetId, apiToken);
+        Response createPrivateUrl = UtilIT.privateUrlCreate(datasetId, apiToken, false);
         createPrivateUrl.prettyPrint();
         assertEquals(OK.getStatusCode(), createPrivateUrl.getStatusCode());
 
@@ -415,8 +429,12 @@ public void testAPITokenEndpoints() {
         getExpiration = UtilIT.getTokenExpiration(tokenForPrivateUrlUser);
         getExpiration.prettyPrint();
         getExpiration.then().assertThat()
-                .statusCode(NOT_FOUND.getStatusCode());
+                .statusCode(UNAUTHORIZED.getStatusCode());
 
+        createUser = UtilIT.createRandomUser();
+        assertEquals(OK.getStatusCode(), createUser.getStatusCode());
+
+        String userApiTokenForDelete = UtilIT.getApiTokenFromResponse(createUser);
 
         Response deleteToken = UtilIT.deleteToken(userApiTokenForDelete);
         deleteToken.prettyPrint();
@@ -431,6 +449,323 @@ public void testAPITokenEndpoints() {
                 .statusCode(UNAUTHORIZED.getStatusCode());
         
     }
+    
+    @Test
+    public void testDeleteAuthenticatedUser() {
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String usernameForCreateDV = UtilIT.getUsernameFromResponse(createUser);
+        String normalApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse = UtilIT.createRandomDataverse(normalApiToken);
+        createDataverse.prettyPrint();
+        createDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
+
+        createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String usernameForAssignedRole = UtilIT.getUsernameFromResponse(createUser);
+        String roleApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response assignRole = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.EDITOR.toString(),
+                "@" + usernameForAssignedRole, superuserApiToken);
+
+        //Shouldn't be able to delete user with a role
+        Response deleteUserRole = UtilIT.deleteUser(usernameForAssignedRole);
+
+        deleteUserRole.prettyPrint();
+        deleteUserRole.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Could not delete Authenticated User @" + usernameForAssignedRole + " because the user is associated with role assignment record(s)."));
+
+        //Shouldn't be able to delete a user who has created a DV
+        Response deleteUserCreateDV = UtilIT.deleteUser(usernameForCreateDV);
+
+        deleteUserCreateDV.prettyPrint();
+        deleteUserCreateDV.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Could not delete Authenticated User @" + usernameForCreateDV + " because the user has created Dataverse object(s); the user is associated with role assignment record(s)."));
+
+        Response deleteDataverse = UtilIT.deleteDataverse(dataverseAlias, normalApiToken);
+        deleteDataverse.prettyPrint();
+        deleteDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response deleteUserAfterDeleteDV = UtilIT.deleteUser(usernameForCreateDV);
+        //Should be able to delete user after dv is deleted
+        deleteUserAfterDeleteDV.prettyPrint();
+        deleteUserAfterDeleteDV.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        deleteUserAfterDeleteDV = UtilIT.deleteUser(usernameForAssignedRole);
+        //Should be able to delete user after dv is deleted role should be gone as well
+        deleteUserAfterDeleteDV.prettyPrint();
+        deleteUserAfterDeleteDV.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response deleteSuperuser = UtilIT.deleteUser(superuserUsername);
+        assertEquals(200, deleteSuperuser.getStatusCode());
+
+    }
+
+    @Test
+    public void testUserPermittedDataverses() {
+        Response createSuperuser = UtilIT.createRandomUser();
+        String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername);
+        toggleSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        assertEquals(200, createUser.getStatusCode());
+        String usernameOfUser = UtilIT.getUsernameFromResponse(createUser);
+        String userApiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverse1 = UtilIT.createRandomDataverse(superuserApiToken);
+        createDataverse1.prettyPrint();
+        createDataverse1.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias1 = UtilIT.getAliasFromResponse(createDataverse1);
+
+        // create a second Dataverse and add a Group with permissions
+        Response createDataverse2 = UtilIT.createRandomDataverse(superuserApiToken);
+        createDataverse2.prettyPrint();
+        createDataverse2.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String dataverseAlias2 = UtilIT.getAliasFromResponse(createDataverse2);
+        String aliasInOwner = "groupFor" + dataverseAlias2;
+        String displayName = "Group for " + dataverseAlias2;
+        Response createGroup = UtilIT.createGroup(dataverseAlias2, aliasInOwner, displayName, superuserApiToken);
+        String groupIdentifier = JsonPath.from(createGroup.asString()).getString("data.identifier");
+        Response grantRoleResponse = UtilIT.grantRoleOnDataverse(dataverseAlias2, DataverseRole.EDITOR.toString(), groupIdentifier, superuserApiToken);
+        grantRoleResponse.prettyPrint();
+        grantRoleResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response collectionsResp = UtilIT.getUserPermittedCollections(superuserUsername, userApiToken, "ViewUnpublishedDataset");
+        collectionsResp.prettyPrint();
+        assertEquals(403, collectionsResp.getStatusCode());
+        collectionsResp = UtilIT.getUserPermittedCollections(usernameOfUser, userApiToken, "ViewUnpublishedDataset");
+        collectionsResp.prettyPrint();
+        assertEquals(200, collectionsResp.getStatusCode());
+        collectionsResp = UtilIT.getUserPermittedCollections(usernameOfUser, "", "ViewUnpublishedDataset");
+        assertEquals(401, collectionsResp.getStatusCode());
+        collectionsResp = UtilIT.getUserPermittedCollections("fakeUser", superuserApiToken, "ViewUnpublishedDataset");
+        assertEquals(500, collectionsResp.getStatusCode());
+        collectionsResp = UtilIT.getUserPermittedCollections(usernameOfUser, superuserApiToken, "bad");
+        assertEquals(500, collectionsResp.getStatusCode());
+
+        // Testing adding an explicit permission/role to one dataverse
+        collectionsResp = UtilIT.getUserPermittedCollections(usernameOfUser, userApiToken, "DownloadFile");
+        collectionsResp.prettyPrint();
+        collectionsResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.count", equalTo(0));
+
+        Response assignRole = UtilIT.grantRoleOnDataverse(dataverseAlias1, DataverseRole.EDITOR.toString(),
+                "@" + usernameOfUser, superuserApiToken);
+        assignRole.prettyPrint();
+        assertEquals(200, assignRole.getStatusCode());
+
+        collectionsResp = UtilIT.getUserPermittedCollections(usernameOfUser, userApiToken, "DownloadFile");
+        collectionsResp.prettyPrint();
+        collectionsResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.count", equalTo(1));
+
+        // Add user to group and test with both explicit and group permissions
+        Response addToGroup = UtilIT.addToGroup(dataverseAlias2, aliasInOwner, List.of("@" + usernameOfUser), superuserApiToken);
+        addToGroup.prettyPrint();
+        addToGroup.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        collectionsResp = UtilIT.getUserPermittedCollections(usernameOfUser, userApiToken, "DownloadFile");
+        collectionsResp.prettyPrint();
+        collectionsResp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.count", equalTo(2));
+    }
+
+    // This test is disabled because it is only compatible with the containerized development environment and would cause the Jenkins job to fail.
+    @Disabled
+    public void testRegisterOIDCUser() {
+        // Set Up - Get the admin access token from the OIDC provider
+        Response adminOidcLoginResponse = UtilIT.performKeycloakROPCLogin("admin", "admin");
+        adminOidcLoginResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("access_token", notNullValue());
+        String adminOidcAccessToken = adminOidcLoginResponse.jsonPath().getString("access_token");
+
+        // Set Up - Create random user in the OIDC provider without some necessary claims (email, firstName and lastName)
+        String randomUsername = UUID.randomUUID().toString().substring(0, 8);
+
+        String newKeycloakUserWithoutClaimsJson = "{"
+                + "\"username\":\"" + randomUsername + "\","
+                + "\"enabled\":true,"
+                + "\"credentials\":["
+                + "  {"
+                + "    \"type\":\"password\","
+                + "    \"value\":\"password\","
+                + "    \"temporary\":false"
+                + "  }"
+                + "]"
+                + "}";
+
+        Response createKeycloakOidcUserResponse = UtilIT.createKeycloakUser(adminOidcAccessToken, newKeycloakUserWithoutClaimsJson);
+        createKeycloakOidcUserResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        Response newUserOidcLoginResponse = UtilIT.performKeycloakROPCLogin(randomUsername, "password");
+        String userWithoutClaimsAccessToken = newUserOidcLoginResponse.jsonPath().getString("access_token");
+
+        // Set Up - Create a second random user in the OIDC provider with all necessary claims (including email, firstName and lastName)
+        randomUsername = UUID.randomUUID().toString().substring(0, 8);
+        String email = randomUsername + "@dataverse.org";
+        String firstName = "John";
+        String lastName = "Doe";
+
+        String newKeycloakUserWithClaimsJson = "{"
+                + "\"username\":\"" + randomUsername + "\","
+                + "\"enabled\":true,"
+                + "\"email\":\"" + email + "\","
+                + "\"firstName\":\"" + firstName + "\","
+                + "\"lastName\":\"" + lastName + "\","
+                + "\"credentials\":["
+                + "  {"
+                + "    \"type\":\"password\","
+                + "    \"value\":\"password\","
+                + "    \"temporary\":false"
+                + "  }"
+                + "]"
+                + "}";
+
+        Response createKeycloakOidcUserWithClaimsResponse = UtilIT.createKeycloakUser(adminOidcAccessToken, newKeycloakUserWithClaimsJson);
+        createKeycloakOidcUserWithClaimsResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        Response newUserWithClaimsOidcLoginResponse = UtilIT.performKeycloakROPCLogin(randomUsername, "password");
+        String userWithClaimsAccessToken = newUserWithClaimsOidcLoginResponse.jsonPath().getString("access_token");
+
+        // Should return error when empty token is passed
+        Response registerOidcUserResponse = UtilIT.registerOidcUser(
+                "{}",
+                ""
+        );
+        registerOidcUserResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("users.api.errors.bearerTokenRequired")));
+
+        // Should return error when a malformed User JSON is sent
+        registerOidcUserResponse = UtilIT.registerOidcUser(
+                "{{{user:abcde}",
+                "Bearer testBearerToken"
+        );
+        registerOidcUserResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Error parsing the POSTed User json: Invalid token=CURLYOPEN at (line no=1, column no=2, offset=1). Expected tokens are: [STRING]"));
+
+        // Should return error when the provided User JSON is valid but the provided Bearer token is invalid
+        registerOidcUserResponse = UtilIT.registerOidcUser(
+                "{"
+                        + "\"termsAccepted\":true"
+                        + "}",
+                "Bearer testBearerToken"
+        );
+        registerOidcUserResponse.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
+                .body("message", equalTo("Unauthorized bearer token."));
+
+        // Should return an error when the termsAccepted field is missing in the User JSON
+        registerOidcUserResponse = UtilIT.registerOidcUser(
+                "{"
+                        + "\"affiliation\":\"YourAffiliation\","
+                        + "\"position\":\"YourPosition\""
+                        + "}",
+                "Bearer testBearerToken"
+        );
+        registerOidcUserResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo("Error parsing the POSTed User json: Field 'termsAccepted' is mandatory"));
+
+        // Should return an error when the Bearer token is valid but required claims are missing in the IdP, needing completion from the request JSON
+        registerOidcUserResponse = UtilIT.registerOidcUser(
+                "{"
+                        + "\"termsAccepted\":true"
+                        + "}",
+                "Bearer " + userWithoutClaimsAccessToken
+        );
+        registerOidcUserResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("message", equalTo(BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.invalidFields")))
+                .body("fieldErrors.firstName", equalTo(BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldRequired", List.of("firstName"))))
+                .body("fieldErrors.lastName", equalTo(BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldRequired", List.of("lastName"))))
+                .body("fieldErrors.emailAddress", equalTo(BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldRequired", List.of("emailAddress"))));
+
+        // Should register user when the Bearer token is valid and the provided User JSON contains the missing claims in the IdP
+        registerOidcUserResponse = UtilIT.registerOidcUser(
+                "{"
+                        + "\"firstName\":\"testFirstName\","
+                        + "\"lastName\":\"testLastName\","
+                        + "\"emailAddress\":\"" + UUID.randomUUID().toString().substring(0, 8) + "@dataverse.org\","
+                        + "\"termsAccepted\":true"
+                        + "}",
+                "Bearer " + userWithoutClaimsAccessToken
+        );
+        registerOidcUserResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("User registered."));
+
+        // Should return error when attempting to re-register with the same Bearer token but different User data
+        String newUserJson = "{"
+                + "\"firstName\":\"newFirstName\","
+                + "\"lastName\":\"newLastName\","
+                + "\"emailAddress\":\"newEmail@dataverse.com\","
+                + "\"termsAccepted\":true"
+                + "}";
+        registerOidcUserResponse = UtilIT.registerOidcUser(
+                newUserJson,
+                "Bearer " + userWithoutClaimsAccessToken
+        );
+        registerOidcUserResponse.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", equalTo("User is already registered with this token."));
+
+        // Should return an error when the Bearer token is valid and attempting to set JSON properties that conflict with existing claims in the IdP
+        registerOidcUserResponse = UtilIT.registerOidcUser(
+                "{"
+                        + "\"firstName\":\"testFirstName\","
+                        + "\"lastName\":\"testLastName\","
+                        + "\"emailAddress\":\"" + UUID.randomUUID().toString().substring(0, 8) + "@dataverse.org\","
+                        + "\"termsAccepted\":true"
+                        + "}",
+                "Bearer " + userWithClaimsAccessToken
+        );
+        registerOidcUserResponse.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("fieldErrors.firstName", equalTo(BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldAlreadyPresentInProvider", List.of("firstName"))))
+                .body("fieldErrors.lastName", equalTo(BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldAlreadyPresentInProvider", List.of("lastName"))))
+                .body("fieldErrors.emailAddress", equalTo(BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldAlreadyPresentInProvider", List.of("emailAddress"))));
+
+        // Should register user when the Bearer token is valid and all required claims are present in the IdP, requiring only minimal data in the User JSON
+        registerOidcUserResponse = UtilIT.registerOidcUser(
+                "{"
+                        + "\"termsAccepted\":true"
+                        + "}",
+                "Bearer " + userWithClaimsAccessToken
+        );
+        registerOidcUserResponse.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("User registered."));
+    }
 
     private Response convertUserFromBcryptToSha1(long idOfBcryptUserToConvert, String password) {
         JsonObjectBuilder data = Json.createObjectBuilder();
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index 553be5373e0..2f7b3d94990 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -1,43 +1,59 @@
 package edu.harvard.iq.dataverse.api;
 
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
-import java.util.UUID;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.io.*;
+import java.util.*;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import java.io.File;
-import java.io.IOException;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+
+import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.time.LocalDateTime;
 import java.util.logging.Level;
 import edu.harvard.iq.dataverse.api.datadeposit.SwordConfigurationImpl;
-import com.jayway.restassured.path.xml.XmlPath;
-import org.junit.Test;
+import io.restassured.path.xml.XmlPath;
+import edu.harvard.iq.dataverse.mydata.MyDataFilterParams;
+import jakarta.ws.rs.core.HttpHeaders;
+import org.apache.commons.lang3.StringUtils;
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.Test;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import com.jayway.restassured.specification.RequestSpecification;
-import java.util.List;
+import io.restassured.specification.RequestSpecification;
 import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
 import com.mashape.unirest.request.GetRequest;
-import java.io.InputStream;
 import edu.harvard.iq.dataverse.util.FileUtil;
-import java.util.Base64;
 import org.apache.commons.io.IOUtils;
 import java.nio.file.Path;
-import java.util.ArrayList;
+
 import org.apache.commons.lang3.math.NumberUtils;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
-import static com.jayway.restassured.path.xml.XmlPath.from;
-import static com.jayway.restassured.RestAssured.given;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+
+import static edu.harvard.iq.dataverse.api.ApiConstants.*;
+import static io.restassured.path.xml.XmlPath.from;
+import static io.restassured.RestAssured.given;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.DatasetFieldValue;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
+import edu.harvard.iq.dataverse.util.StringUtil;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class UtilIT {
 
@@ -49,7 +65,10 @@ public class UtilIT {
     private static final String API_TOKEN_KEY = "apiToken";
     private static final String BUILTIN_USER_KEY = "burrito";
     private static final String EMPTY_STRING = "";
-    public static final int MAXIMUM_INGEST_LOCK_DURATION = 3;
+    public static final int MAXIMUM_INGEST_LOCK_DURATION = 15;
+    public static final int MAXIMUM_PUBLISH_LOCK_DURATION = 20;
+    public static final int GENERAL_LONG_DURATION = 45; //Useful when multiple adds/publishes, etc/ all get done in sequence
+    public static final int MAXIMUM_IMPORT_DURATION = 1;
 
     private static SwordConfigurationImpl swordConfiguration = new SwordConfigurationImpl();
     
@@ -104,6 +123,16 @@ public static Response createRandomUser() {
         return createRandomUser("user");
     }
 
+    /**
+     * A convenience method for creating a random test user, when all you need
+     * is the api token.
+     * @return apiToken
+     */
+    public static String createRandomUserGetToken(){
+        Response createUser = createRandomUser();
+        return getApiTokenFromResponse(createUser);
+    }
+
     public static Response createUser(String username, String email) {
         logger.info("Creating user " + username);
         String userAsJson = getUserAsJsonString(username, username, username, email);
@@ -155,7 +184,34 @@ public static Response migrateDatasetIdentifierFromHDLToPId(String datasetIdenti
                 .post("/api/admin/" + datasetIdentifier + "/reregisterHDLToPID?key=" + apiToken);
         return response;
     }
-    
+
+    public static Response getPid(String persistentId, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/pids?persistentId=" + persistentId);
+        return response;
+    }
+
+    public static Response getUnreservedPids(String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/pids/unreserved");
+        return response;
+    }
+
+    public static Response reservePid(String persistentId, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .post("/api/pids/:persistentId/reserve?persistentId=" + persistentId);
+        return response;
+    }
+
+    public static Response deletePid(String persistentId, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/pids/:persistentId/delete?persistentId=" + persistentId);
+        return response;
+    }
 
     public static Response computeDataFileHashValue(String fileId, String alg, String apiToken) {
         Response response = given()
@@ -172,7 +228,35 @@ public static Response validateDataFileHashValue(String fileId,  String apiToken
                 .post("/api/admin/validateDataFileHashValue/" + fileId + "?key=" + apiToken);
         return response;
     }
-    
+
+    public static Response clearThumbnailFailureFlags() {
+        Response response = given()
+                .delete("/api/admin/clearThumbnailFailureFlag");
+        return response;
+    }
+
+    public static Response clearThumbnailFailureFlag(long fileId) {
+        Response response = given()
+                .delete("/api/admin/clearThumbnailFailureFlag/" + fileId);
+        return response;
+    }
+
+    public static Response auditFiles(String apiToken, Long firstId, Long lastId, String csvList) {
+        String params = "";
+        if (firstId != null) {
+            params = "?firstId="+ firstId;
+        }
+        if (lastId != null) {
+            params = params + (params.isEmpty() ? "?" : "&") + "lastId="+ lastId;
+        }
+        if (csvList != null) {
+            params = params + (params.isEmpty() ? "?" : "&") + "datasetIdentifierList="+ csvList;
+        }
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/admin/datafiles/auditFiles" + params);
+    }
+
     private static String getAuthenticatedUserAsJsonString(String persistentUserId, String firstName, String lastName, String authenticationProviderId, String identifier) {
         JsonObjectBuilder builder = Json.createObjectBuilder();
         builder.add("authenticationProviderId", authenticationProviderId);
@@ -186,7 +270,7 @@ private static String getAuthenticatedUserAsJsonString(String persistentUserId,
         return userAsJson;
     }
 
-    private static String getEmailFromUserName(String username) {
+    protected static String getEmailFromUserName(String username) {
         return username + "@mailinator.com";
     }
 
@@ -236,7 +320,12 @@ static String getApiTokenFromResponse(Response createUserResponse) {
         logger.info("API token found in create user response: " + apiToken);
         return apiToken;
     }
-
+    static String getEmailFromResponse(Response createUserResponse) {
+        JsonPath createdUser = JsonPath.from(createUserResponse.body().asString());
+        String email = createdUser.getString("data.authenticatedUser.email");
+        logger.info("Email found in create user response: " + email);
+        return email;
+    }
     static String getAliasFromResponse(Response createDataverseResponse) {
         JsonPath createdDataverse = JsonPath.from(createDataverseResponse.body().asString());
         String alias = createdDataverse.getString("data.alias");
@@ -247,7 +336,7 @@ static String getAliasFromResponse(Response createDataverseResponse) {
     static Integer getDataverseIdFromResponse(Response createDataverseResponse) {
         JsonPath createdDataverse = JsonPath.from(createDataverseResponse.body().asString());
         int dataverseId = createdDataverse.getInt("data.id");
-        logger.info("Id found in create dataverse response: " + createdDataverse);
+        logger.info("Id found in create dataverse response: " + dataverseId);
         return dataverseId;
     }
 
@@ -257,7 +346,14 @@ static Integer getDatasetIdFromResponse(Response createDatasetResponse) {
         logger.info("Id found in create dataset response: " + datasetId);
         return datasetId;
     }
-    
+
+    static Integer getDataFileIdFromResponse(Response uploadDataFileResponse) {
+        JsonPath dataFile = JsonPath.from(uploadDataFileResponse.body().asString());
+        int dataFileId = dataFile.getInt("data.files[0].dataFile.id");
+        logger.info("Id found in upload DataFile response: " + dataFileId);
+        return dataFileId;
+    }
+
     static Integer getSearchCountFromResponse(Response searchResponse) {
         JsonPath createdDataset = JsonPath.from(searchResponse.body().asString());
         int searchCount = createdDataset.getInt("data.total_count");
@@ -278,7 +374,8 @@ static String getDatasetPersistentIdFromSwordResponse(Response createDatasetResp
         /**
          * @todo stop assuming the last 22 characters are the doi/globalId
          */
-        return datasetSwordIdUrl.substring(datasetSwordIdUrl.length() - 22);
+        int doiPos = datasetSwordIdUrl.indexOf("doi");
+        return datasetSwordIdUrl.substring(doiPos, datasetSwordIdUrl.length());
     }
 
     public static Response getServiceDocument(String apiToken) {
@@ -292,24 +389,156 @@ public static Response getServiceDocument(String apiToken) {
     static Response createDataverse(String alias, String category, String apiToken) {
         return createSubDataverse(alias, category, apiToken, ":root");
     }
-    
+
+    static Response createDataverse(String alias, String category, String affiliation, String apiToken) {
+        return createSubDataverse(alias, category, apiToken, ":root", null, null, null, affiliation);
+    }
+
     static Response createSubDataverse(String alias, String category, String apiToken, String parentDV) {
+        return createSubDataverse(alias, category, apiToken, parentDV, null, null, null, null);
+    }
+
+    static Response createSubDataverse(String alias, String category, String apiToken, String parentDV, String[] inputLevelNames, String[] facetIds, String[] metadataBlockNames) {
+        return createSubDataverse(alias, category, apiToken, parentDV, inputLevelNames, facetIds, metadataBlockNames, null);
+    }
+
+    static Response createSubDataverse(String alias, String category, String apiToken, String parentDV, String[] inputLevelNames, String[] facetIds, String[] metadataBlockNames, String affiliation) {
         JsonArrayBuilder contactArrayBuilder = Json.createArrayBuilder();
         contactArrayBuilder.add(Json.createObjectBuilder().add("contactEmail", getEmailFromUserName(getRandomIdentifier())));
         JsonArrayBuilder subjectArrayBuilder = Json.createArrayBuilder();
         subjectArrayBuilder.add("Other");
-        JsonObject dvData = Json.createObjectBuilder()
+        JsonObjectBuilder objectBuilder = Json.createObjectBuilder()
                 .add("alias", alias)
                 .add("name", alias)
                 .add("dataverseContacts", contactArrayBuilder)
                 .add("dataverseSubjects", subjectArrayBuilder)
                 // don't send "dataverseType" if category is null, must be a better way
-                .add(category != null ? "dataverseType" : "notTheKeyDataverseType", category != null ? category : "whatever")
-                .build();
-        Response createDataverseResponse = given()
+                .add(category != null ? "dataverseType" : "notTheKeyDataverseType", category != null ? category : "whatever");
+
+        if (affiliation != null) {
+            objectBuilder.add("affiliation", affiliation);
+        }
+
+        updateDataverseRequestJsonWithMetadataBlocksConfiguration(inputLevelNames, facetIds, metadataBlockNames, null, null, objectBuilder);
+
+        JsonObject dvData = objectBuilder.build();
+        return given()
                 .body(dvData.toString()).contentType(ContentType.JSON)
                 .when().post("/api/dataverses/" + parentDV + "?key=" + apiToken);
-        return createDataverseResponse;
+    }
+    static Response updateDataverse(String alias,
+                                    String newAlias,
+                                    String newName,
+                                    String newAffiliation,
+                                    String newDataverseType,
+                                    String[] newContactEmails,
+                                    String[] newInputLevelNames,
+                                    String[] newFacetIds,
+                                    String[] newMetadataBlockNames,
+                                    String apiToken) {
+
+        return updateDataverse(alias, newAlias, newName, newAffiliation, newDataverseType, newContactEmails,
+                newInputLevelNames, newFacetIds, newMetadataBlockNames, apiToken, null, null, null);
+    }
+
+    static Response updateDataverse(String alias,
+                                    String newAlias,
+                                    String newName,
+                                    String newAffiliation,
+                                    String newDataverseType,
+                                    String[] newContactEmails,
+                                    String[] newInputLevelNames,
+                                    String[] newFacetIds,
+                                    String[] newMetadataBlockNames,
+                                    String apiToken,
+                                    Boolean inheritMetadataBlocksFromParent,
+                                    Boolean inheritFacetsFromParent,
+                                    Integer datasetFileCountLimit) {
+        JsonArrayBuilder contactArrayBuilder = Json.createArrayBuilder();
+        for(String contactEmail : newContactEmails) {
+            contactArrayBuilder.add(Json.createObjectBuilder().add("contactEmail", contactEmail));
+        }
+        NullSafeJsonBuilder jsonBuilder = jsonObjectBuilder()
+                .add("alias", newAlias)
+                .add("name", newName)
+                .add("affiliation", newAffiliation)
+                .add("dataverseContacts", contactArrayBuilder)
+                .add("dataverseType", newDataverseType)
+                .add("affiliation", newAffiliation)
+                ;
+        if (datasetFileCountLimit != null) {
+            jsonBuilder.add("datasetFileCountLimit", datasetFileCountLimit);
+        }
+
+        updateDataverseRequestJsonWithMetadataBlocksConfiguration(newInputLevelNames, newFacetIds, newMetadataBlockNames,
+                inheritMetadataBlocksFromParent, inheritFacetsFromParent, jsonBuilder);
+
+        JsonObject dvData = jsonBuilder.build();
+        String jsonBody = dvData.toString();
+        return given()
+                .body(jsonBody).contentType(ContentType.JSON)
+                .when().put("/api/dataverses/" + alias + "?key=" + apiToken);
+    }
+
+    static Response updateDataverse(String alias, Dataverse dv, String apiToken) {
+        return updateDataverse(alias,
+                dv.getAlias(),
+                dv.getName(),
+                dv.getAffiliation(),
+                null,
+                dv.getContactEmails().split(","),
+                null,
+                null,
+                null,
+                apiToken,
+                null,
+                null,
+                dv.isDatasetFileCountLimitSet(dv.getDatasetFileCountLimit()) ? dv.getDatasetFileCountLimit() : -1);
+    }
+
+    private static void updateDataverseRequestJsonWithMetadataBlocksConfiguration(String[] inputLevelNames,
+                                                                                  String[] facetIds,
+                                                                                  String[] metadataBlockNames,
+                                                                                  Boolean inheritFacetsFromParent,
+                                                                                  Boolean inheritMetadataBlocksFromParent,
+                                                                                  JsonObjectBuilder objectBuilder) {
+        JsonObjectBuilder metadataBlocksObjectBuilder = Json.createObjectBuilder();
+
+        if (inputLevelNames != null) {
+            JsonArrayBuilder inputLevelsArrayBuilder = Json.createArrayBuilder();
+            for(String inputLevelName : inputLevelNames) {
+                inputLevelsArrayBuilder.add(Json.createObjectBuilder()
+                        .add("datasetFieldTypeName", inputLevelName)
+                        .add("required", true)
+                        .add("include", true)
+                );
+            }
+            metadataBlocksObjectBuilder.add("inputLevels", inputLevelsArrayBuilder);
+        }
+
+        if (metadataBlockNames != null) {
+            JsonArrayBuilder metadataBlockNamesArrayBuilder = Json.createArrayBuilder();
+            for(String metadataBlockName : metadataBlockNames) {
+                metadataBlockNamesArrayBuilder.add(metadataBlockName);
+            }
+            metadataBlocksObjectBuilder.add("metadataBlockNames", metadataBlockNamesArrayBuilder);
+        }
+        if (inheritMetadataBlocksFromParent != null) {
+            metadataBlocksObjectBuilder.add("inheritMetadataBlocksFromParent", inheritMetadataBlocksFromParent);
+        }
+
+        if (facetIds != null) {
+            JsonArrayBuilder facetIdsArrayBuilder = Json.createArrayBuilder();
+            for(String facetId : facetIds) {
+                facetIdsArrayBuilder.add(facetId);
+            }
+            metadataBlocksObjectBuilder.add("facetIds", facetIdsArrayBuilder);
+        }
+        if (inheritFacetsFromParent != null) {
+            metadataBlocksObjectBuilder.add("inheritFacetsFromParent", inheritFacetsFromParent);
+        }
+
+        objectBuilder.add("metadataBlocks", metadataBlocksObjectBuilder);
     }
 
     static Response createDataverse(JsonObject dvData, String apiToken) {
@@ -326,14 +555,64 @@ static Response createRandomDataverse(String apiToken) {
         return createDataverse(alias, category, apiToken);
     }
 
+    static Response createRandomDataverse(String apiToken, String affiliation) {
+        String alias = "dv" + getRandomIdentifier();
+        String category = null;
+        return createDataverse(alias, category, affiliation, apiToken);
+    }
+
+    /**
+     * A convenience method for creating a random collection and getting its
+     * alias in one step.
+     * @param apiToken
+     * @return alias
+     */
+    static String createRandomCollectionGetAlias(String apiToken){
+
+        Response createCollectionResponse = createRandomDataverse(apiToken);
+        //createDataverseResponse.prettyPrint();
+        createCollectionResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        return UtilIT.getAliasFromResponse(createCollectionResponse);
+    }
+
     static Response showDataverseContents(String alias, String apiToken) {
         return given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .when().get("/api/dataverses/" + alias + "/contents");
     }
 
+    static Response getGuestbookResponses(String dataverseAlias, Long guestbookId, String apiToken) {
+        RequestSpecification requestSpec = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken);
+        if (guestbookId != null) {
+            requestSpec.queryParam("guestbookId", guestbookId);
+        }
+        return requestSpec.get("/api/dataverses/" + dataverseAlias + "/guestbookResponses/");
+    }
+
+    static Response getCollectionSchema(String dataverseAlias, String apiToken) {
+        Response getCollectionSchemaResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/json")
+                .get("/api/dataverses/" + dataverseAlias + "/datasetSchema");
+        return getCollectionSchemaResponse;
+    }
+
+    static Response validateDatasetJson(String dataverseAlias, String datasetJson, String apiToken) {
+        Response getValidateDatasetJsonResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(datasetJson)
+                .contentType("application/json")
+                .post("/api/dataverses/" + dataverseAlias + "/validateDatasetJson");
+        return getValidateDatasetJsonResponse;
+    }
+
     static Response createRandomDatasetViaNativeApi(String dataverseAlias, String apiToken) {
-        String jsonIn = getDatasetJson();
+        return createRandomDatasetViaNativeApi(dataverseAlias, apiToken, false);
+    }
+
+    static Response createRandomDatasetViaNativeApi(String dataverseAlias, String apiToken, boolean withNoLicense) {
+        String jsonIn = getDatasetJson(withNoLicense);
         Response createDatasetResponse = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .body(jsonIn)
@@ -343,7 +622,16 @@ static Response createRandomDatasetViaNativeApi(String dataverseAlias, String ap
     }
 
     private static String getDatasetJson() {
-        File datasetVersionJson = new File("scripts/search/tests/data/dataset-finch1.json");
+        return getDatasetJson(false); 
+    }
+
+    private static String getDatasetJson(boolean nolicense) {
+        File datasetVersionJson; 
+        if (nolicense) {
+            datasetVersionJson = new File("scripts/search/tests/data/dataset-finch1-nolicense.json");
+        } else {
+            datasetVersionJson = new File("scripts/search/tests/data/dataset-finch1.json");
+        }
         try {
             String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
             return datasetVersionAsJson;
@@ -355,7 +643,8 @@ private static String getDatasetJson() {
 
     static Response createDatasetViaNativeApi(String dataverseAlias, String pathToJsonFile, String apiToken) {
         String jsonIn = getDatasetJson(pathToJsonFile);
-        Response createDatasetResponse = given()
+        
+        Response createDatasetResponse = given()               
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .body(jsonIn)
                 .contentType("application/json")
@@ -363,7 +652,30 @@ static Response createDatasetViaNativeApi(String dataverseAlias, String pathToJs
         return createDatasetResponse;
     }
 
-    private static String getDatasetJson(String pathToJsonFile) {
+    static Response createDataset(String dataverseAlias, JsonObjectBuilder datasetJson, String apiToken) {
+        return createDataset(dataverseAlias, datasetJson.build().toString(), apiToken);
+    }
+
+    static Response createDataset(String dataverseAlias, String datasetJson, String apiToken) {
+        System.out.println("creating with " + datasetJson);
+        Response createDatasetResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(datasetJson)
+                .contentType("application/json")
+                .post("/api/dataverses/" + dataverseAlias + "/datasets");
+        return createDatasetResponse;
+    }
+
+    static Response createDatasetSemantic(String dataverseAlias, String datasetJson, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(datasetJson)
+                .contentType("application/ld+json")
+                .post("/api/dataverses/" + dataverseAlias + "/datasets");
+        return response;
+    }
+
+    static String getDatasetJson(String pathToJsonFile) {
         File datasetVersionJson = new File(pathToJsonFile);
         try {
             String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
@@ -371,6 +683,9 @@ private static String getDatasetJson(String pathToJsonFile) {
         } catch (IOException ex) {
             Logger.getLogger(UtilIT.class.getName()).log(Level.SEVERE, null, ex);
             return null;
+        } catch (Exception e){
+            Logger.getLogger(UtilIT.class.getName()).log(Level.SEVERE, null, e);
+            return null;
         }
     }
 
@@ -389,7 +704,18 @@ static Response createDatasetViaSwordApi(String dataverseToCreateDatasetIn, Stri
         return createDatasetViaSwordApiFromXML(dataverseToCreateDatasetIn, xmlIn, apiToken);
     }
 
-    private static Response createDatasetViaSwordApiFromXML(String dataverseToCreateDatasetIn, String xmlIn, String apiToken) {
+    static Response createDatasetViaSwordApi(String dataverseToCreateDatasetIn, String title, String description, String license, String apiToken) {
+        String nullRights = null;
+        String xmlIn = getDatasetXml(title, "Lastname, Firstname", description, license, nullRights);
+        return createDatasetViaSwordApiFromXML(dataverseToCreateDatasetIn, xmlIn, apiToken);
+    }
+
+    static Response createDatasetViaSwordApi(String dataverseToCreateDatasetIn, String title, String description, String license, String rights, String apiToken) {
+        String xmlIn = getDatasetXml(title, "Lastname, Firstname", description, license, rights);
+        return createDatasetViaSwordApiFromXML(dataverseToCreateDatasetIn, xmlIn, apiToken);
+    }
+
+    public static Response createDatasetViaSwordApiFromXML(String dataverseToCreateDatasetIn, String xmlIn, String apiToken) {
         Response createDatasetResponse = given()
                 .auth().basic(apiToken, EMPTY_STRING)
                 .body(xmlIn)
@@ -433,7 +759,7 @@ static Response updateDatasetMetadataViaNative(String persistentId, String pathT
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .body(jsonIn)
                 .contentType("application/json")
-                .put("/api/datasets/:persistentId/versions/:draft?persistentId=" + persistentId);
+                .put("/api/datasets/:persistentId/versions/" + DS_VERSION_DRAFT + "?persistentId=" + persistentId);
         return response;
     }
     
@@ -447,8 +773,20 @@ static Response addDatasetMetadataViaNative(String persistentId, String pathToJs
                 .put("/api/datasets/:persistentId/editMetadata/?persistentId=" + persistentId);
         return response;
     }
-    
-    
+
+    static Response updateDatasetFilesLimits(String persistentId, int limit, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .post("/api/datasets/:persistentId/files/uploadlimit/" + limit + "?persistentId=" + persistentId);
+        return response;
+    }
+    static Response deleteDatasetFilesLimits(String persistentId, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/datasets/:persistentId/files/uploadlimit?persistentId=" + persistentId);
+        return response;
+    }
+
     static Response deleteDatasetMetadataViaNative(String persistentId, String pathToJsonFile, String apiToken) {
         String jsonIn = getDatasetJson(pathToJsonFile);
 
@@ -462,14 +800,24 @@ static Response deleteDatasetMetadataViaNative(String persistentId, String pathT
     
     static Response updateFieldLevelDatasetMetadataViaNative(String persistentId, String pathToJsonFile, String apiToken) {
         String jsonIn = getDatasetJson(pathToJsonFile);
-        Response response = given()
+        return editVersionMetadataFromJsonStr(persistentId, jsonIn, apiToken, null);
+    }
+
+    static Response editVersionMetadataFromJsonStr(String persistentId, String jsonString, String apiToken) {
+        return editVersionMetadataFromJsonStr(persistentId, jsonString, apiToken, null);
+    }
+
+    static Response editVersionMetadataFromJsonStr(String persistentId, String jsonString, String apiToken, String sourceLastUpdateTime) {
+        return given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .body(jsonIn)
+                .body(jsonString)
                 .contentType("application/json")
-                .put("/api/datasets/:persistentId/editMetadata/?persistentId=" + persistentId + "&replace=true");
-        return response;
+                .put("/api/datasets/:persistentId/editMetadata/?persistentId="
+                        + persistentId
+                        + "&replace=true"
+                        + (sourceLastUpdateTime != null ? "&sourceLastUpdateTime=" + sourceLastUpdateTime : ""));
     }
-    
+
     static Response updateDatasetPIDMetadata(String persistentId,  String apiToken) {
         Response response = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
@@ -478,12 +826,85 @@ static Response updateDatasetPIDMetadata(String persistentId,  String apiToken)
         return response;
     }
 
+    /**
+     * Deprecated because once there are new fields in the database that Solr
+     * doesn't know about, dataset creation could be prevented, or at least
+     * subsequent search operations could fail because the dataset can't be
+     * indexed.
+     */
+    @Deprecated    
+    static Response loadMetadataBlock(String apiToken, byte[] body) {
+        return given()
+          .header(API_TOKEN_HTTP_HEADER, apiToken)
+          .contentType("text/tab-separated-values; charset=utf-8")
+          .body(body)
+          .post("/api/admin/datasetfield/load");
+    }
+
+    static Response setMetadataBlocks(String dataverseAlias, JsonArrayBuilder blocks, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/json")
+                .body(blocks.build().toString())
+                .post("/api/dataverses/" + dataverseAlias + "/metadatablocks");
+    }
+
+    static Response listMetadataBlocks(String dataverseAlias, boolean onlyDisplayedOnCreate, boolean returnDatasetFieldTypes, String apiToken) {
+        return listMetadataBlocks(dataverseAlias, onlyDisplayedOnCreate, returnDatasetFieldTypes, null, apiToken);
+    }
+
+    static Response listMetadataBlocks(String dataverseAlias, boolean onlyDisplayedOnCreate, boolean returnDatasetFieldTypes, String datasetType, String apiToken) {
+        RequestSpecification requestSpecification = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .queryParam("onlyDisplayedOnCreate", onlyDisplayedOnCreate)
+                .queryParam("returnDatasetFieldTypes", returnDatasetFieldTypes);
+        if (datasetType != null) {
+            requestSpecification.queryParam("datasetType", datasetType);
+        }
+        return requestSpecification.get("/api/dataverses/" + dataverseAlias + "/metadatablocks");
+    }
+
+    static Response listMetadataBlocks(boolean onlyDisplayedOnCreate, boolean returnDatasetFieldTypes) {
+        return given()
+                .queryParam("onlyDisplayedOnCreate", onlyDisplayedOnCreate)
+                .queryParam("returnDatasetFieldTypes", returnDatasetFieldTypes)
+                .get("/api/metadatablocks");
+    }
+
+    static Response getMetadataBlock(String block) {
+        return given()
+                .get("/api/metadatablocks/" + block);
+    }
+
+    static Response setDisplayOnCreate(String datasetFieldType, boolean setDisplayOnCreate) {
+        return given()
+                .queryParam("datasetFieldType", datasetFieldType)
+                .queryParam("setDisplayOnCreate", setDisplayOnCreate)
+                .post("/api/admin/datasetfield/setDisplayOnCreate");
+    }
+
     static private String getDatasetXml(String title, String author, String description) {
+        String nullLicense = null;
+        String nullRights = null;
+        return getDatasetXml(title, author, description, nullLicense, nullRights);
+    }
+
+    static private String getDatasetXml(String title, String author, String description, String license, String rights) {
+        String optionalLicense = "";
+        if (license != null) {
+            optionalLicense = "   <dcterms:license>" + license + "</dcterms:license>\n";
+        }
+        String optionalRights = "";
+        if (rights != null) {
+            optionalRights = "   <dcterms:rights>" + rights + "</dcterms:rights>\n";
+        }
         String xmlIn = "<?xml version=\"1.0\"?>\n"
                 + "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:dcterms=\"http://purl.org/dc/terms/\">\n"
                 + "   <dcterms:title>" + title + "</dcterms:title>\n"
                 + "   <dcterms:creator>" + author + "</dcterms:creator>\n"
                 + "   <dcterms:description>" + description + "</dcterms:description>\n"
+                + optionalLicense
+                + optionalRights
                 + "</entry>\n"
                 + "";
         return xmlIn;
@@ -598,6 +1019,80 @@ static Response uploadFileViaNative(String datasetId, String pathToFile, String
         return requestSpecification.post("/api/datasets/" + datasetId + "/add");
     }
 
+    static Response addRemoteFile(String datasetId, String jsonAsString, String apiToken) {
+        RequestSpecification requestSpecification = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .multiPart("datasetId", datasetId);
+        if (jsonAsString != null) {
+            requestSpecification.multiPart("jsonData", jsonAsString);
+        }
+        return requestSpecification.post("/api/datasets/" + datasetId + "/add");
+    }
+
+    static Response uploadAuxFile(Long fileId, String pathToFile, String formatTag, String formatVersion, String mimeType, boolean isPublic, String type, String apiToken) {
+        String nullOrigin = null;
+        return uploadAuxFile(fileId, pathToFile, formatTag, formatVersion, mimeType, isPublic, type, nullOrigin, apiToken);
+    }
+
+    static Response uploadAuxFile(Long fileId, String pathToFile, String formatTag, String formatVersion, String mimeType, boolean isPublic, String type, String origin, String apiToken) {
+        RequestSpecification requestSpecification = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .multiPart("file", new File(pathToFile), mimeType)
+                .multiPart("isPublic", isPublic);
+        if (mimeType != null) {
+            requestSpecification.multiPart("file", new File(pathToFile), mimeType);
+        } else {
+            requestSpecification.multiPart("file", new File(pathToFile));
+        }
+        if (type != null) {
+            requestSpecification.multiPart("type", type);
+        }
+        if (origin != null) {
+            requestSpecification.multiPart("origin", origin);
+        }
+        return requestSpecification.post("/api/access/datafile/" + fileId + "/auxiliary/" + formatTag + "/" + formatVersion);
+    }
+
+    static Response downloadAuxFile(Long fileId, String formatTag, String formatVersion, String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification.header(API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.get("/api/access/datafile/" + fileId + "/auxiliary/" + formatTag + "/" + formatVersion);
+    }
+
+    static Response listAuxFilesByOrigin(Long fileId, String origin, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/access/datafile/" + fileId + "/auxiliary/" + origin);
+        return response;
+    }
+
+    static Response listAllAuxFiles(Long fileId, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/access/datafile/" + fileId + "/auxiliary");
+        return response;
+    }
+
+    
+    static Response deleteAuxFile(Long fileId, String formatTag, String formatVersion, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/access/datafile/" + fileId + "/auxiliary/" + formatTag + "/" + formatVersion);
+        return response;
+    }
+
+    static Response getCrawlableFileAccess(String datasetId, String folderName, String apiToken) {
+        RequestSpecification requestSpecification = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken);
+        String apiPath = "/api/datasets/" + datasetId + "/dirindex?version=" + DS_VERSION_DRAFT;
+        if (StringUtil.nonEmpty(folderName)) {
+            apiPath = apiPath.concat("&folder="+folderName);
+        }
+        return requestSpecification.get(apiPath);
+    }
+
     static Response replaceFile(String fileIdOrPersistentId, String pathToFile, String apiToken) {
         String jsonAsString = null;
         return replaceFile(fileIdOrPersistentId, pathToFile, jsonAsString, apiToken);
@@ -610,7 +1105,7 @@ static Response replaceFile(String fileIdOrPersistentId, String pathToFile, Json
     static Response replaceFile(String fileIdOrPersistentId, String pathToFile, String jsonAsString, String apiToken) {
         String idInPath = fileIdOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+        if (!NumberUtils.isCreatable(fileIdOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
         }
@@ -623,14 +1118,26 @@ static Response replaceFile(String fileIdOrPersistentId, String pathToFile, Stri
         return requestSpecification
                 .post("/api/files/" + idInPath + "/replace" + optionalQueryParam);
     }
-    
+
+    static Response deleteFileApi(Integer fileId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/files/" + fileId);
+    }
+
     static Response updateFileMetadata(String fileIdOrPersistentId, String jsonAsString, String apiToken) {
+        return updateFileMetadata(fileIdOrPersistentId, jsonAsString,apiToken, null);
+    }
+    static Response updateFileMetadata(String fileIdOrPersistentId, String jsonAsString, String apiToken, String sourceLastUpdateTime) {
         String idInPath = fileIdOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+        if (!NumberUtils.isCreatable(fileIdOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
         }
+        if (sourceLastUpdateTime != null) {
+            optionalQueryParam = optionalQueryParam + (optionalQueryParam.isEmpty() ? "?" : "&") + "sourceLastUpdateTime=" + sourceLastUpdateTime;
+        }
         RequestSpecification requestSpecification = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken);
         if (jsonAsString != null) {
@@ -647,13 +1154,33 @@ static Response downloadFile(Integer fileId) {
     }
 
     static Response downloadFile(Integer fileId, String apiToken) {
-        return given()
-                /**
-                 * Data Access API does not support X-Dataverse-key header -
-                 * https://github.com/IQSS/dataverse/issues/2662
-                 */
-                //.header(API_TOKEN_HTTP_HEADER, apiToken)
-                .get("/api/access/datafile/" + fileId + "?key=" + apiToken);
+        String nullByteRange = null;
+        String nullFormat = null;
+        String nullImageThumb = null;
+        return downloadFile(fileId, nullByteRange, nullFormat, nullImageThumb, apiToken);
+    }
+
+    static Response downloadFile(Integer fileId, String byteRange, String format, String imageThumb, String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (byteRange != null) {
+            requestSpecification.header("Range", "bytes=" + byteRange);
+        }
+        String optionalFormat = "";
+        if (format != null) {
+            optionalFormat = "&format=" + format;
+        }
+        String optionalImageThumb = "";
+        if (format != null) {
+            optionalImageThumb = "&imageThumb=" + imageThumb;
+        }
+        /**
+         * Data Access API does not support X-Dataverse-key header -
+         * https://github.com/IQSS/dataverse/issues/2662
+         *
+         * Actually, these days it does. We could switch.
+         */
+        //.header(API_TOKEN_HTTP_HEADER, apiToken)
+        return requestSpecification.get("/api/access/datafile/" + fileId + "?key=" + apiToken + optionalFormat + optionalImageThumb);
     }
     
     static Response downloadTabularFile(Integer fileId) {
@@ -709,6 +1236,53 @@ static Response downloadFilesOriginal(Integer[] fileIds, String apiToken) {
         return given().get(getString + "?format=original&key=" + apiToken);
     }
 
+    public enum DownloadFormat {
+        original
+    }
+
+    static Response downloadFiles(String datasetIdOrPersistentId, String apiToken) {
+        String datasetVersion = null;
+        DownloadFormat format = null;
+        return downloadFiles(datasetIdOrPersistentId, datasetVersion, format, apiToken);
+    }
+
+    static Response downloadFiles(String datasetIdOrPersistentId, DownloadFormat format, String apiToken) {
+        String datasetVersion = null;
+        return downloadFiles(datasetIdOrPersistentId, datasetVersion, format, apiToken);
+    }
+
+    static Response downloadFiles(String datasetIdOrPersistentId, String datasetVersion, String apiToken) {
+        DownloadFormat format = null;
+        return downloadFiles(datasetIdOrPersistentId, datasetVersion, format, apiToken);
+    }
+
+    static Response downloadFiles(String datasetIdOrPersistentId, String datasetVersion, DownloadFormat format, String apiToken) {
+        String idInPath = datasetIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(datasetIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId;
+        }
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        String optionalVersion = "";
+        if (datasetVersion != null) {
+            optionalVersion = "/versions/" + datasetVersion;
+        }
+        String optionalFormat = "";
+        if (format != null) {
+            if (!"".equals(optionalQueryParam)) {
+                optionalFormat = "&format=" + format;
+            } else {
+                optionalFormat = "?format=" + format;
+            }
+        }
+        return requestSpecification.get("/api/access/dataset/" + idInPath + optionalVersion + optionalQueryParam + optionalFormat);
+    }
+
     static Response subset(String fileId, String variables, String apiToken) {
         return given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
@@ -718,7 +1292,7 @@ static Response subset(String fileId, String variables, String apiToken) {
     static Response getFileMetadata(String fileIdOrPersistentId, String optionalFormat, String apiToken) {
         String idInPath = fileIdOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+        if (!NumberUtils.isCreatable(fileIdOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "&persistentId=" + fileIdOrPersistentId;
         }
@@ -732,6 +1306,46 @@ static Response getFileMetadata(String fileIdOrPersistentId, String optionalForm
                 .get("/api/access/datafile/" + idInPath + "/metadata" + optionalFormatInPath + "?key=" + apiToken + optionalQueryParam);
     }
 
+    static Response getFileMetadata(String fileIdOrPersistentId, String optionalFormat) {
+        String idInPath = fileIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(fileIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
+        }
+        String optionalFormatInPath = "";
+        if (optionalFormat != null) {
+            optionalFormatInPath = "/" + optionalFormat;
+        }
+        return given()
+                .urlEncodingEnabled(false)
+                .get("/api/access/datafile/" + idInPath + "/metadata" + optionalFormatInPath + optionalQueryParam);
+    }
+
+    static Response getFileData(String fileId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/files/" + fileId);
+    }
+
+    static Response getFileData(String fileId, String apiToken, String datasetVersionId) {
+        return getFileData(fileId, apiToken, datasetVersionId, false, false);
+    }
+
+    static Response getFileData(String fileId, String apiToken, String datasetVersionId, boolean includeDeaccessioned, boolean returnDatasetVersion) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .queryParam("includeDeaccessioned", includeDeaccessioned)
+                .queryParam("returnDatasetVersion", returnDatasetVersion)
+                .get("/api/files/" + fileId + "/versions/" + datasetVersionId);
+    }
+
+    static Response getFileVersionDifferences(String fileId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/files/" + fileId + "/versionDifferences");
+    }
+
     static Response testIngest(String fileName, String fileType) {
         return given()
                 .get("/api/ingest/test/file?fileName=" + fileName + "&fileType=" + fileType);
@@ -859,12 +1473,47 @@ static public Response grantRoleOnDataverse(String definitionPoint, String role,
                 .post("api/dataverses/" + definitionPoint + "/assignments?key=" + apiToken);
     }
 
+    public static Response deactivateUser(String username) {
+        Response deactivateUserResponse = given()
+                .post("/api/admin/authenticatedUsers/" + username + "/deactivate");
+        return deactivateUserResponse;
+    }
+
+    public static Response deactivateUser(Long userId) {
+        Response deactivateUserResponse = given()
+                .post("/api/admin/authenticatedUsers/id/" + userId + "/deactivate");
+        return deactivateUserResponse;
+    }
+
     public static Response deleteUser(String username) {
         Response deleteUserResponse = given()
                 .delete("/api/admin/authenticatedUsers/" + username + "/");
         return deleteUserResponse;
     }
 
+    public static Response deleteUserRoles(String username, String apiToken) {
+        Response deleteUserResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .post("/api/users/" + username + "/removeRoles");
+        return deleteUserResponse;
+    }
+
+    public static Response getUserTraces(String username, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/users/" + username + "/traces");
+        return response;
+    }
+
+    public static Response getUserPermittedCollections(String username, String apiToken, String permission) {
+        RequestSpecification requestSpecification = given();
+        if (!StringUtil.isEmpty(apiToken)) {
+            requestSpecification.header(API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        Response response = requestSpecification.get("/api/users/" + username + "/allowedCollections/" + permission);
+        return response;
+    }
+
     public static Response reingestFile(Long fileId, String apiToken) {
         Response response = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
@@ -878,7 +1527,14 @@ public static Response uningestFile(Long fileId, String apiToken) {
                 .post("/api/files/" + fileId + "/uningest/?key=" + apiToken);
         return uningestFileResponse;
     }
-    
+
+    public static Response extractNcml(Long fileId, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .post("/api/files/" + fileId + "/extractNcml");
+        return response;
+    }
+
     //I don't understand why this blows up when I remove the key
     public static Response getDataFileMetadata(Long fileId, String apiToken) {
         Response fileResponse = given()
@@ -921,6 +1577,12 @@ static Response destroyDataset(Integer datasetId, String apiToken) {
                 .delete("/api/datasets/" + datasetId + "/destroy");
     }
 
+    static Response destroyDataset(String pid, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/datasets/:persistentId/destroy?persistentId=" + pid);
+    }
+
     static Response deleteFile(Integer fileId, String apiToken) {
         return given()
                 .auth().basic(apiToken, EMPTY_STRING)
@@ -929,26 +1591,43 @@ static Response deleteFile(Integer fileId, String apiToken) {
     }
 
     static Response publishDatasetViaSword(String persistentId, String apiToken) {
-        return given()
+        Response publishResponse =  given()
                 .auth().basic(apiToken, EMPTY_STRING)
                 .header("In-Progress", "false")
                 .post(swordConfiguration.getBaseUrlPathCurrent() + "/edit/study/" + persistentId);
+        
+        // Wait for the dataset to get unlocked, if/as needed:
+        sleepForLock(persistentId, "finalizePublication", apiToken, UtilIT.MAXIMUM_PUBLISH_LOCK_DURATION);
+        return publishResponse;
     }
 
     static Response publishDatasetViaNativeApi(String idOrPersistentId, String majorOrMinor, String apiToken) {
+        return publishDatasetViaNativeApi(idOrPersistentId, majorOrMinor, apiToken, false);
+    }
+    
+    static Response publishDatasetViaNativeApi(String idOrPersistentId, String majorOrMinor, String apiToken, boolean mustBeIndexed) {
+
         String idInPath = idOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentId)) {
+        if (!NumberUtils.isCreatable(idOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "&persistentId=" + idOrPersistentId;
         }
+        if(mustBeIndexed) {
+            optionalQueryParam = optionalQueryParam+"&assureIsIndexed=true";
+        }
         RequestSpecification requestSpecification = given();
         if (apiToken != null) {
             requestSpecification = given()
                     .urlEncodingEnabled(false)
                     .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
         }
-        return requestSpecification.post("/api/datasets/" + idInPath + "/actions/:publish?type=" + majorOrMinor + optionalQueryParam);
+        Response publishResponse = requestSpecification.post("/api/datasets/" + idInPath + "/actions/:publish?type=" + majorOrMinor + optionalQueryParam);
+        
+        // Wait for the dataset to get unlocked, if/as needed:
+        sleepForLock(idOrPersistentId, "finalizePublication", apiToken, UtilIT.MAXIMUM_PUBLISH_LOCK_DURATION);
+        
+        return publishResponse;
     }
 
     static Response publishDatasetViaNativeApiDeprecated(String persistentId, String majorOrMinor, String apiToken) {
@@ -956,10 +1635,23 @@ static Response publishDatasetViaNativeApiDeprecated(String persistentId, String
          * @todo This should be a POST rather than a GET:
          * https://github.com/IQSS/dataverse/issues/2431
          */
-        return given()
+        Response publishResponse = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .urlEncodingEnabled(false)
                 .get("/api/datasets/:persistentId/actions/:publish?type=" + majorOrMinor + "&persistentId=" + persistentId);
+        
+        // Wait for the dataset to get unlocked, if/as needed:
+        sleepForLock(persistentId, "finalizePublication", apiToken, UtilIT.MAXIMUM_PUBLISH_LOCK_DURATION);
+        
+        return publishResponse;
+    }
+   
+    // Compatibility method wrapper (takes Integer for the dataset id) 
+    // It used to use the GET version of the publish API; I'm switching it to 
+    // use the new POST variant. The explicitly marked @deprecated method above
+    // should be sufficient for testing the deprecated API call. 
+    static Response publishDatasetViaNativeApi(Integer datasetId, String majorOrMinor, String apiToken) {
+        return publishDatasetViaNativeApi(datasetId.toString(), majorOrMinor, apiToken);
     }
     
     static Response modifyDatasetPIDMetadataViaApi(String persistentId,  String apiToken) {
@@ -973,17 +1665,6 @@ static Response modifyDatasetPIDMetadataViaApi(String persistentId,  String apiT
                 .get("/api/datasets/:persistentId/&persistentId=" + persistentId);
     }
 
-    static Response publishDatasetViaNativeApi(Integer datasetId, String majorOrMinor, String apiToken) {
-        /**
-         * @todo This should be a POST rather than a GET:
-         * https://github.com/IQSS/dataverse/issues/2431
-         */
-        return given()
-                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .urlEncodingEnabled(false)
-                .get("/api/datasets/" + datasetId + "/actions/:publish?type=" + majorOrMinor);
-    }
-
     static Response publishDataverseViaSword(String alias, String apiToken) {
         return given()
                 .auth().basic(apiToken, EMPTY_STRING)
@@ -1021,12 +1702,43 @@ static Response returnDatasetToAuthor(String datasetPersistentId, JsonObject jso
     }
 
     static Response getNotifications(String apiToken) {
+        return getNotifications(apiToken, false);
+    }
+
+    static Response getNotifications(String apiToken, boolean inAppNotificationFormat) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.get("/api/notifications/all?inAppNotificationFormat=" + inAppNotificationFormat);
+    }
+
+    static Response getUnreadNotificationsCount(String apiToken) {
         RequestSpecification requestSpecification = given();
         if (apiToken != null) {
             requestSpecification = given()
                     .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
         }
-        return requestSpecification.get("/api/notifications/all");
+        return requestSpecification.get("/api/notifications/unreadCount");
+    }
+
+    static Response markNotificationAsRead(long id, String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.put("/api/notifications/" + id + "/markAsRead");
+    }
+
+    static Response deleteNotification(long id, String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.delete("/api/notifications/" + id);
     }
 
     static Response nativeGetUsingPersistentId(String persistentId, String apiToken) {
@@ -1036,22 +1748,129 @@ static Response nativeGetUsingPersistentId(String persistentId, String apiToken)
         return response;
     }
 
+    static Response getDatasetVersion(String persistentId, String versionNumber, String apiToken) {
+        return getDatasetVersion(persistentId, versionNumber, apiToken, false, false);
+    }
+
+    static Response getDatasetVersion(String persistentId, String versionNumber, String apiToken, boolean excludeFiles, boolean includeDeaccessioned) {
+        return getDatasetVersion(persistentId,versionNumber,apiToken,excludeFiles,false,includeDeaccessioned);
+    }
+    static Response getDatasetVersion(String persistentId, String versionNumber, String apiToken, boolean excludeFiles,boolean excludeMetadataBlocks, boolean includeDeaccessioned) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .queryParam("includeDeaccessioned", includeDeaccessioned)
+                .get("/api/datasets/:persistentId/versions/"
+                        + versionNumber
+                        + "?persistentId="
+                        + persistentId
+                        + (excludeFiles ? "&excludeFiles=true" : "")
+                        + (excludeMetadataBlocks ? "&excludeMetadataBlocks=true" : ""));
+    }
+    static Response compareDatasetVersions(String persistentId, String versionNumber1, String versionNumber2, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/:persistentId/versions/"
+                        + versionNumber1
+                        + "/compare/"
+                        + versionNumber2
+                        + "?persistentId="
+                        + persistentId);
+    }
+    
+    static Response compareDatasetVersions(String persistentId, String versionNumber1, String versionNumber2, String apiToken, boolean includeDeaccessioned) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/:persistentId/versions/"
+                        + versionNumber1
+                        + "/compare/"
+                        + versionNumber2
+                        + "?persistentId="
+                        + persistentId
+                        + "&includeDeaccessioned="
+                        + includeDeaccessioned);
+    }
+    
+    static Response summaryDatasetVersionDifferences(String persistentId,  String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/:persistentId/versions/compareSummary"
+                        + "?persistentId="
+                        + persistentId);
+    }
+    static Response getDatasetWithOwners(String persistentId,  String apiToken, boolean returnOwners) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/:persistentId/"
+                        + "?persistentId="
+                        + persistentId
+                        + (returnOwners ? "&returnOwners=true" : ""));
+    }
+    
+    public static Response getDatasetAvailableCategories(String persistentId) {
+        Response response = given()
+                .get("/api/datasets/:persistentId/availableFileCategories"
+                        + "?persistentId="
+                        + persistentId);
+        return response;
+    }
+    
+    static Response getFileWithOwners(String datafileId,  String apiToken, boolean returnOwners) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/files/"
+                        + datafileId
+                        + (returnOwners ? "/?returnOwners=true" : ""));
+    }
+    
+    static Response getDataverseWithOwners(String alias,  String apiToken, boolean returnOwners) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/dataverses/"
+                        + alias
+                        + (returnOwners ? "/?returnOwners=true" : ""));
+    }
+
+    static Response getDataverseWithChildCount(String alias,  String apiToken, boolean returnChildCount) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/dataverses/"
+                        + alias
+                        + (returnChildCount ? "/?returnChildCount=true" : ""));
+    }
+
     static Response getMetadataBlockFromDatasetVersion(String persistentId, String versionNumber, String metadataBlock, String apiToken) {
         return given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .get("/api/datasets/:persistentId/versions/:latest-published/metadata/citation?persistentId=" + persistentId);
+                .get("/api/datasets/:persistentId/versions/" + DS_VERSION_LATEST_PUBLISHED + "/metadata/citation?persistentId=" + persistentId);
     }
 
+    @Deprecated
     static Response makeSuperUser(String username) {
         Response response = given().post("/api/admin/superuser/" + username);
         return response;
     }
 
+    static Response setSuperuserStatus(String username, Boolean isSuperUser) {
+        Response response = given().body(isSuperUser).put("/api/admin/superuser/" + username);
+        return response;
+    }
+
     static Response reindexDataset(String persistentId) {
         Response response = given()
                 .get("/api/admin/index/dataset?persistentId=" + persistentId);
         return response;
     }
+    
+    static Response indexClearDataset(Integer datasetId) {
+        return given()
+                .delete("/api/admin/index/datasets/"+datasetId);
+    }
+    
+    static Response reindexDataverse(String dvId) {
+        Response response = given()
+                .get("/api/admin/index/dataverses/" + dvId);
+        return response;
+    }
 
     static Response listAuthenticatedUsers(String apiToken) {
         Response response = given()
@@ -1060,12 +1879,21 @@ static Response listAuthenticatedUsers(String apiToken) {
         return response;
     }
 
+    // TODO: Consider removing apiToken since it isn't used by the API itself.
     static Response getAuthenticatedUser(String userIdentifier, String apiToken) {
         Response response = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .get("/api/admin/authenticatedUsers/" + userIdentifier);
         return response;
     }
+    
+    static Response getAuthenticatedUserByToken(String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .urlEncodingEnabled(false)
+                .get("/api/users/:me");
+        return response;
+    }
 
     /**
      * Used to the test the filter Authenticated Users API endpoint
@@ -1080,8 +1908,8 @@ static Response getAuthenticatedUser(String userIdentifier, String apiToken) {
     static Response filterAuthenticatedUsers(String superUserApiToken,
             String searchTerm,
             Integer selectedPage,
-            Integer itemsPerPage
-    //                                         String sortKey
+            Integer itemsPerPage,
+            String sortKey
     ) {
 
         List<String> queryParams = new ArrayList<String>();
@@ -1094,6 +1922,9 @@ static Response filterAuthenticatedUsers(String superUserApiToken,
         if (itemsPerPage != null) {
             queryParams.add("itemsPerPage=" + itemsPerPage.toString());
         }
+        if (StringUtils.isNotBlank(sortKey)) {
+            queryParams.add("sortKey=" + sortKey);
+        }
 
         String queryString = "";
         if (queryParams.size() > 0) {
@@ -1146,10 +1977,23 @@ static Response migrateBuiltinToOAuth(String data, String apiToken) {
         return response;
     }
 
+    static Response restrictFile(String fileIdOrPersistentId, String restrict, String apiToken) {
+        String idInPath = fileIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(fileIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
+        }
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(restrict)
+                .put("/api/files/" + idInPath + "/restrict" + optionalQueryParam);
+        return response;
+    }
     static Response restrictFile(String fileIdOrPersistentId, boolean restrict, String apiToken) {
         String idInPath = fileIdOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+        if (!NumberUtils.isCreatable(fileIdOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
         }
@@ -1163,7 +2007,7 @@ static Response restrictFile(String fileIdOrPersistentId, boolean restrict, Stri
     static Response allowAccessRequests(String datasetIdOrPersistentId, boolean allowRequests, String apiToken) {
         String idInPath = datasetIdOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(datasetIdOrPersistentId)) {
+        if (!NumberUtils.isCreatable(datasetIdOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId;
         }
@@ -1179,7 +2023,7 @@ static Response requestFileAccess(String fileIdOrPersistentId, String apiToken)
         System.out.print ("Reuest file acceess + apiToken: " + apiToken);
         String idInPath = fileIdOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+        if (!NumberUtils.isCreatable(fileIdOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
         }
@@ -1197,7 +2041,7 @@ static Response requestFileAccess(String fileIdOrPersistentId, String apiToken)
     static Response grantFileAccess(String fileIdOrPersistentId, String identifier, String apiToken) {
         String idInPath = fileIdOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+        if (!NumberUtils.isCreatable(fileIdOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
         }
@@ -1213,7 +2057,7 @@ static Response grantFileAccess(String fileIdOrPersistentId, String identifier,
     static Response getAccessRequestList(String fileIdOrPersistentId, String apiToken) {
         String idInPath = fileIdOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+        if (!NumberUtils.isCreatable(fileIdOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
         }
@@ -1229,7 +2073,7 @@ static Response getAccessRequestList(String fileIdOrPersistentId, String apiToke
     static Response rejectFileAccessRequest(String fileIdOrPersistentId, String identifier, String apiToken) {
         String idInPath = fileIdOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+        if (!NumberUtils.isCreatable(fileIdOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
         }
@@ -1261,7 +2105,7 @@ static Response moveDataset(String idOrPersistentIdOfDatasetToMove, String desti
         }
         String idInPath = idOrPersistentIdOfDatasetToMove; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentIdOfDatasetToMove)) {
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDatasetToMove)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + idOrPersistentIdOfDatasetToMove;
         }
@@ -1281,10 +2125,12 @@ static Response linkDataset(String datasetToLinkPid, String dataverseAlias, Stri
     }
 
     static Response getDatasetLinks(String datasetToLinkPid, String apiToken) {
-        Response response = given()
-                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .get("api/datasets/:persistentId/links" + "?persistentId=" + datasetToLinkPid);
-        return response;
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.get("api/datasets/:persistentId/links" + "?persistentId=" + datasetToLinkPid);
     }
 
     static Response createDataverseLink(String linkedDataverseAlias, String linkingDataverseAlias, String apiToken) {
@@ -1293,6 +2139,13 @@ static Response createDataverseLink(String linkedDataverseAlias, String linkingD
             .put("api/dataverses/" + linkedDataverseAlias + "/link/" + linkingDataverseAlias);
         return response;
     }
+
+    static Response getDataverseLinks(String dataverseAlias, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("api/dataverses/"+ dataverseAlias + "/links");
+        return response;
+    }
     
     static Response deleteDataverseLink(String linkedDataverseAlias, String linkingDataverseAlias, String apiToken) {
         Response response = given()
@@ -1315,9 +2168,10 @@ static Response privateUrlGet(Integer datasetId, String apiToken) {
         return response;
     }
 
-    static Response privateUrlCreate(Integer datasetId, String apiToken) {
+    static Response privateUrlCreate(Integer datasetId, String apiToken, boolean anonymizedAccess) {
         Response response = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .queryParam("anonymizedAccess", anonymizedAccess)
                 .post("/api/datasets/" + datasetId + "/privateUrl");
         return response;
     }
@@ -1347,6 +2201,15 @@ static Response getDatasetThumbnailMetadata(Integer datasetId, String apiToken)
                 .get("/api/admin/datasets/thumbnailMetadata/" + datasetId);
     }
 
+    /**
+     * @param trueOrWidthInPixels Passing "true" will result in the default width in pixels (64).
+     */
+    static Response getFileThumbnail(String fileDatabaseId, String trueOrWidthInPixels, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/access/datafile/" + fileDatabaseId + "?imageThumb=" + trueOrWidthInPixels);
+    }
+
     static Response useThumbnailFromDataFile(String datasetPersistentId, long dataFileId1, String apiToken) {
         return given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
@@ -1367,18 +2230,52 @@ static Response removeDatasetThumbnail(String datasetPersistentId, String apiTok
     }
     
     static Response getDatasetVersions(String idOrPersistentId, String apiToken) {
+        return getDatasetVersions(idOrPersistentId, apiToken, false);
+    }
+
+    static Response getDatasetVersions(String idOrPersistentId, String apiToken, boolean excludeFiles) {
+        return getDatasetVersions(idOrPersistentId, apiToken, null, null, excludeFiles);
+    }
+
+    static Response getDatasetVersions(String idOrPersistentId, String apiToken, Integer offset, Integer limit) {
+        return getDatasetVersions(idOrPersistentId, apiToken, offset, limit, false);
+    }
+
+    static Response getDatasetVersions(String idOrPersistentId, String apiToken, Integer offset, Integer limit, boolean excludeFiles) {
         logger.info("Getting Dataset Versions");
         String idInPath = idOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentId)) {
+        if (!NumberUtils.isCreatable(idOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + idOrPersistentId;
         }
+        if (excludeFiles) {
+            if ("".equals(optionalQueryParam)) {
+                optionalQueryParam = "?excludeFiles=true";
+            } else {
+                optionalQueryParam = optionalQueryParam.concat("&excludeFiles=true");
+            }
+        }
+        if (offset != null) {
+            if ("".equals(optionalQueryParam)) {
+                optionalQueryParam = "?offset="+offset;
+            } else {
+                optionalQueryParam = optionalQueryParam.concat("&offset="+offset);
+            }
+        }
+        if (limit != null) {
+            if ("".equals(optionalQueryParam)) {
+                optionalQueryParam = "?limit="+limit;
+            } else {
+                optionalQueryParam = optionalQueryParam.concat("&limit="+limit);
+            }
+        }
         RequestSpecification requestSpecification = given();
         if (apiToken != null) {
             requestSpecification = given()
                     .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
         }
+        
         return requestSpecification.get("/api/datasets/" + idInPath + "/versions" + optionalQueryParam);
     }
 
@@ -1387,7 +2284,7 @@ static Response getProvJson(String idOrPersistentId, String apiToken) {
         logger.info("Getting Provenance JSON");
         String idInPath = idOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentId)) {
+        if (!NumberUtils.isCreatable(idOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + idOrPersistentId;
         }
@@ -1403,7 +2300,7 @@ static Response getProvFreeForm(String idOrPersistentId, String apiToken) {
          logger.info("Getting Provenance Free Form");
         String idInPath = idOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentId)) {
+        if (!NumberUtils.isCreatable(idOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + idOrPersistentId;
         }
@@ -1419,7 +2316,7 @@ static Response uploadProvJson(String idOrPersistentId, JsonObject jsonObject, S
         logger.info("Uploading Provenance JSON");
         String idInPath = idOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentId)) {
+        if (!NumberUtils.isCreatable(idOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + idOrPersistentId;
         }
@@ -1441,7 +2338,7 @@ static Response deleteProvJson(String idOrPersistentId, String apiToken) {
         //TODO: Repeated code, refactor
         String idInPath = idOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentId)) {
+        if (!NumberUtils.isCreatable(idOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + idOrPersistentId;
         }
@@ -1457,7 +2354,7 @@ static Response uploadProvFreeForm(String idOrPersistentId, JsonObject jsonObjec
         logger.info("Uploading Provenance Free Form");
         String idInPath = idOrPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentId)) {
+        if (!NumberUtils.isCreatable(idOrPersistentId)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + idOrPersistentId;
         }
@@ -1478,7 +2375,7 @@ static Response uploadProvFreeForm(String idOrPersistentId, JsonObject jsonObjec
 //        //TODO: Repeated code, refactor
 //        String idInPath = idOrPersistentId; // Assume it's a number.
 //        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-//        if (!NumberUtils.isNumber(idOrPersistentId)) {
+//        if (!NumberUtils.isCreatable(idOrPersistentId)) {
 //            idInPath = ":persistentId";
 //            optionalQueryParam = "?persistentId=" + idOrPersistentId;
 //        }
@@ -1490,14 +2387,53 @@ static Response uploadProvFreeForm(String idOrPersistentId, JsonObject jsonObjec
 //        return requestSpecification.delete("/api/files/" + idInPath + "/prov-freeform" + optionalQueryParam);
 //    }
 
+    static Response exportDataset(String datasetPersistentId, String exporter) {
+        return exportDataset(datasetPersistentId, exporter, null, false);
+    }
+
     static Response exportDataset(String datasetPersistentId, String exporter, String apiToken) {
-//        http://localhost:8080/api/datasets/export?exporter=dataverse_json&persistentId=doi%3A10.5072/FK2/W6WIMQ
+        return exportDataset(datasetPersistentId, exporter, apiToken, false);
+    }
+
+    // TODO: make apiToken the last argument
+    static Response exportDataset(String datasetPersistentId, String exporter, String apiToken, boolean wait) {
+        return exportDataset(datasetPersistentId, exporter, wait, null, apiToken);
+    }
+
+    static Response exportDataset(String datasetPersistentId, String exporter, boolean wait, String version, String apiToken) {
+        // Wait for the Async call to finish to get the updated data
+        if (wait) {
+            sleepForReexport(datasetPersistentId, apiToken, 10);
+        }
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        String optionalVersion = "";
+        if (version != null) {
+            optionalVersion = "&version=" + version;
+        }
+        return requestSpecification
+                .get("/api/datasets/export" + "?persistentId=" + datasetPersistentId + "&exporter=" + exporter + optionalVersion);
+    }
+
+    static Response reexportDatasetAllFormats(String idOrPersistentId) {
+        String idInPath = idOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isDigits(idOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + idOrPersistentId;
+        }
         return given()
-                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                //                .get("/api/datasets/:persistentId/export" + "?persistentId=" + datasetPersistentId + "&exporter=" + exporter);
-                .get("/api/datasets/export" + "?persistentId=" + datasetPersistentId + "&exporter=" + exporter);
+                .get("/api/admin/metadata/" + idInPath + "/reExportDataset" + optionalQueryParam);
     }
-    
+
+    static Response getExportFormats() {
+        return given()
+                .get("/api/info/exportFormats/");
+    }
+
     static Response exportDataverse(String identifier, String apiToken) {
         return given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
@@ -1505,6 +2441,7 @@ static Response exportDataverse(String identifier, String apiToken) {
     }
     
     static Response search(String query, String apiToken, String parameterString) {
+        sleepForDatasetIndex(query, apiToken);
         RequestSpecification requestSpecification = given();
         if (apiToken != null) {
             requestSpecification = given()
@@ -1513,11 +2450,24 @@ static Response search(String query, String apiToken, String parameterString) {
         return requestSpecification.get("/api/search?q=" + query + parameterString);
     }
 
+    private static void sleepForDatasetIndex(String query, String apiToken) {
+        if (query.contains("id:dataset") || query.contains("id:datafile")) {
+            String[] splitted = query.split("_");
+            if (splitted.length >= 2) {
+                boolean ok = UtilIT.sleepForReindex(String.valueOf(splitted[1]), apiToken, 5);
+                if (!ok) {
+                    logger.info("Still indexing after 5 seconds");
+                }
+            }
+        }
+    }
+
     static Response search(String query, String apiToken) {
         return search(query, apiToken, "");
     }
 
     static Response searchAndShowFacets(String query, String apiToken) {
+        sleepForDatasetIndex(query, apiToken);
         RequestSpecification requestSpecification = given();
         if (apiToken != null) {
             requestSpecification = given()
@@ -1530,7 +2480,7 @@ static Response indexClear() {
         return given()
                 .get("/api/admin/index/clear");
     }
-
+    
     static Response index() {
         return given()
                 .get("/api/admin/index");
@@ -1546,6 +2496,19 @@ static Response deleteSetting(SettingsServiceBean.Key settingKey) {
         return response;
     }
 
+    static Response deleteSetting(SettingsServiceBean.Key settingKey, String language) {
+        Response response = given().when().delete("/api/admin/settings/" + settingKey + "/lang/" + language);
+        return response;
+    }
+
+    /**
+     * @param settingKey Include the colon like :BagItLocalPath
+     */
+    static Response deleteSetting(String settingKey) {
+        Response response = given().when().delete("/api/admin/settings/" + settingKey);
+        return response;
+    }
+
     static Response getSetting(SettingsServiceBean.Key settingKey) {
         Response response = given().when().get("/api/admin/settings/" + settingKey);
         return response;
@@ -1556,6 +2519,29 @@ static Response setSetting(SettingsServiceBean.Key settingKey, String value) {
         return response;
     }
 
+    static Response setSetting(SettingsServiceBean.Key settingKey, String value, String language) {
+        Response response = given().body(value).when().put("/api/admin/settings/" + settingKey + "/lang/" + language);
+        return response;
+    }
+
+    /**
+     * @param settingKey Include the colon like :BagItLocalPath
+     */
+    public static Response setSetting(String settingKey, String value) {
+        Response response = given().body(value).when().put("/api/admin/settings/" + settingKey);
+        return response;
+    }
+
+    static Response getFeatureFlags() {
+        Response response = given().when().get("/api/admin/featureFlags");
+        return response;
+    }
+
+    static Response getFeatureFlag(FeatureFlags featureFlag) {
+        Response response = given().when().get("/api/admin/featureFlags/" + featureFlag);
+        return response;
+    }
+
     static Response getRoleAssignmentsOnDataverse(String dataverseAliasOrId, String apiToken) {
         String url = "/api/dataverses/" + dataverseAliasOrId + "/assignments";
         return given()
@@ -1580,10 +2566,17 @@ static Response getRoleAssignmentsOnDataset(String datasetId, String persistentI
     }
 
     static Response grantRoleOnDataset(String definitionPoint, String role, String roleAssignee, String apiToken) {
+
+        JsonObjectBuilder roleBuilder = Json.createObjectBuilder();
+        roleBuilder.add("assignee", roleAssignee);
+        roleBuilder.add("role", role);
+        
+        JsonObject roleObject = roleBuilder.build();
         logger.info("Granting role on dataset \"" + definitionPoint + "\": " + role);
         return given()
-                .body("@" + roleAssignee)
-                .post("api/datasets/" + definitionPoint + "/assignments?key=" + apiToken);
+                .body(roleObject.toString())
+                .contentType(ContentType.JSON)
+                .post("api/datasets/:persistentId/assignments?key=" + apiToken + "&persistentId=" + definitionPoint);
     }
 
     static Response revokeRole(String definitionPoint, long doomed, String apiToken) {
@@ -1592,6 +2585,13 @@ static Response revokeRole(String definitionPoint, long doomed, String apiToken)
                 .delete("api/dataverses/" + definitionPoint + "/assignments/" + doomed);
     }
     
+    static Response revokeRoleOnDataset(String definitionPoint, long doomed, String apiToken) {
+        
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("api/datasets/:persistentId/assignments/" + doomed + "?persistentId=" + definitionPoint);
+    }
+    
     static Response revokeFileAccess(String definitionPoint, String doomed, String apiToken) {
         return given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
@@ -1655,6 +2655,12 @@ static Response setDataverseLogo(String dataverseAlias, String pathToImageFile,
                 .multiPart("file", new File(pathToImageFile))
                 .put("/api/dataverses/" + dataverseAlias + "/logo");
     }
+    
+    static Response setCollectionAttribute(String dataverseAlias, String attribute, String value, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .put("/api/dataverses/" + dataverseAlias + "/attribute/" + attribute + "?value=" + value);
+    }
 
     /**
      * Deprecated as the apiToken is not used by the call.
@@ -1697,40 +2703,6 @@ private static byte[] inputStreamToBytes(InputStream inputStream) {
         }
     }
 
-    static Response listMapLayerMetadatas() {
-        return given().get("/api/admin/geoconnect/mapLayerMetadatas");
-    }
-
-    static Response checkMapLayerMetadatas(String apiToken) {
-        return given()
-                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .post("/api/admin/geoconnect/mapLayerMetadatas/check");
-    }
-
-    static Response checkMapLayerMetadatas(Long mapLayerMetadataId, String apiToken) {
-        return given()
-                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .post("/api/admin/geoconnect/mapLayerMetadatas/check/" + mapLayerMetadataId);
-    }
-
-    static Response getMapFromFile(long fileId, String apiToken) {
-        return given()
-                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .get("/api/files/" + fileId + "/map");
-    }
-
-    static Response checkMapFromFile(long fileId, String apiToken) {
-        return given()
-                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .get("/api/files/" + fileId + "/map/check");
-    }
-
-    static Response deleteMapFromFile(long fileId, String apiToken) {
-        return given()
-                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .delete("/api/files/" + fileId + "/map?key=" + apiToken);
-    }
-
     static Response getRsyncScript(String datasetPersistentId, String apiToken) {
         RequestSpecification requestSpecification = given();
         if (apiToken != null) {
@@ -1743,7 +2715,7 @@ static Response getRsyncScript(String datasetPersistentId, String apiToken) {
     static Response dataCaptureModuleChecksumValidation(String datasetPersistentId, JsonObject jsonObject, String apiToken) {
         String persistentIdInPath = datasetPersistentId; // Assume it's a number.
         String optionalQueryParam = ""; // If datasetPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(datasetPersistentId)) {
+        if (!NumberUtils.isCreatable(datasetPersistentId)) {
             persistentIdInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + datasetPersistentId;
         }
@@ -1787,10 +2759,46 @@ static Response deleteExternalTool(long externalToolid) {
                 .delete("/api/admin/externalTools/" + externalToolid);
     }
 
+// ExternalTools with token
+    static Response getExternalTools(String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification.header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.get("/api/externalTools");
+    }
+
+    static Response getExternalTool(long id, String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification.header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.get("/api/externalTools/" + id);
+    }
+
+    static Response addExternalTool(JsonObject jsonObject, String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification.header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification
+                .body(jsonObject.toString())
+                .contentType(ContentType.JSON)
+                .post("/api/externalTools");
+    }
+
+    static Response deleteExternalTool(long externalToolid, String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification.header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.delete("/api/externalTools/" + externalToolid);
+    }
+
     static Response getExternalToolsForDataset(String idOrPersistentIdOfDataset, String type, String apiToken) {
         String idInPath = idOrPersistentIdOfDataset; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentIdOfDataset)) {
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDataset)) {
             idInPath = ":persistentId";
             optionalQueryParam = "&persistentId=" + idOrPersistentIdOfDataset;
         }
@@ -1801,11 +2809,26 @@ static Response getExternalToolsForDataset(String idOrPersistentIdOfDataset, Str
         }
         return requestSpecification.get("/api/admin/test/datasets/" + idInPath + "/externalTools?type=" + type + optionalQueryParam);
     }
+    
+    static Response getExternalToolForDatasetById(String idOrPersistentIdOfDataset, String type, String apiToken, String toolId) {
+        String idInPath = idOrPersistentIdOfDataset; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDataset)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "&persistentId=" + idOrPersistentIdOfDataset;
+        }
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.get("/api/admin/test/datasets/" + idInPath + "/externalTool/" + toolId + "?type=" + type + optionalQueryParam);
+    }
 
     static Response getExternalToolsForFile(String idOrPersistentIdOfFile, String type, String apiToken) {
         String idInPath = idOrPersistentIdOfFile; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentIdOfFile)) {
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfFile)) {
             idInPath = ":persistentId";
             optionalQueryParam = "&persistentId=" + idOrPersistentIdOfFile;
         }
@@ -1816,6 +2839,21 @@ static Response getExternalToolsForFile(String idOrPersistentIdOfFile, String ty
         }
         return requestSpecification.get("/api/admin/test/files/" + idInPath + "/externalTools?type=" + type + optionalQueryParam);
     }
+    
+    static Response getExternalToolForFileById(String idOrPersistentIdOfFile, String type, String apiToken, String toolId) {
+        String idInPath = idOrPersistentIdOfFile; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfFile)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "&persistentId=" + idOrPersistentIdOfFile;
+        }
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.get("/api/admin/test/files/" + idInPath + "/externalTool/" + toolId + "?type=" + type + optionalQueryParam);
+    }
 
     static Response submitFeedback(JsonObjectBuilder job) {
         return given()
@@ -1823,6 +2861,19 @@ static Response submitFeedback(JsonObjectBuilder job) {
                 .contentType("application/json")
                 .post("/api/admin/feedback");
     }
+    static Response sendFeedback(String json, String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification
+                .body(json)
+                .post("/api/sendfeedback");
+    }
+    static Response sendFeedback(JsonObjectBuilder job, String apiToken) {
+        return sendFeedback(job.build().toString(), apiToken);
+    }
 
     static Response listStorageSites() {
         return given()
@@ -1853,6 +2904,91 @@ static Response deleteStorageSite(long storageSiteId) {
                 .delete("/api/admin/storageSites/" + storageSiteId);
     }
 
+    static Response listStorageDrivers(String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/admin/dataverse/storageDrivers");
+    }
+
+    static Response getStorageDriver(String dvAlias, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/admin/dataverse/" + dvAlias + "/storageDriver");
+    }
+
+    static Response setStorageDriver(String dvAlias, String label, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(label)
+                .put("/api/admin/dataverse/" + dvAlias + "/storageDriver");
+    }
+
+    static Response getUploadUrls(String idOrPersistentIdOfDataset, long sizeInBytes, String apiToken) {
+        String idInPath = idOrPersistentIdOfDataset; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDataset)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "&persistentId=" + idOrPersistentIdOfDataset;
+        }
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.get("/api/datasets/" + idInPath + "/uploadurls?size=" + sizeInBytes + optionalQueryParam);
+    }
+
+    static Response addFiles(String idInPath, String jsonData, String apiToken) {
+        RequestSpecification requestSpecification = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType(ContentType.MULTIPART)
+                .multiPart("jsonData", jsonData);
+        return requestSpecification.post("/api/datasets/" + idInPath + "/addFiles");
+    }
+
+    /**
+     * If you set dataverse.files.localstack1.disable-tagging=true you will see
+     * an error like below.
+     *
+     * To avoid it, don't send the x-amz-tagging header.
+     */
+    /*
+    <Error>
+      <Code>AccessDenied</Code>
+      <Message>There were headers present in the request which were not signed</Message>
+      <RequestId>25ff2bb0-13c7-420e-8ae6-3d92677e4bd9</RequestId>
+      <HostId>9Gjjt1m+cjU4OPvX9O9/8RuvnG41MRb/18Oux2o5H5MY7ISNTlXN+Dz9IG62/ILVxhAGI0qyPfg=</HostId>
+      <HeadersNotSigned>x-amz-tagging</HeadersNotSigned>
+    </Error>
+     */
+    static Response uploadFileDirect(String url, InputStream inputStream) {
+        return given()
+                .header("x-amz-tagging", "dv-state=temp")
+                .body(inputStream)
+                .put(url);
+    }
+
+    static Response downloadFileNoRedirect(Integer fileId, String apiToken) {
+        return given().when().redirects().follow(false)
+                .get("/api/access/datafile/" + fileId + "?key=" + apiToken);
+    }
+
+    static Response downloadFromUrl(String url) {
+        return given().get(url);
+    }
+
+    static Response getAppTermsOfUse() {
+        return getAppTermsOfUse(null);
+    }
+
+    static Response getAppTermsOfUse(String lang) {
+        String optionalLang = "";
+        if (lang != null) {
+            optionalLang = "?lang=" + lang;
+        }
+        return given().get("/api/info/applicationTermsOfUse" + optionalLang);
+    }
+
     static Response metricsDataversesToMonth(String yyyymm, String queryParams) {
         String optionalYyyyMm = "";
         if (yyyymm != null) {
@@ -1904,6 +3040,25 @@ static Response metricsDownloadsToMonth(String yyyymm, String queryParams) {
         RequestSpecification requestSpecification = given();
         return requestSpecification.get("/api/info/metrics/downloads/toMonth" + optionalYyyyMm + optionalQueryParams);
     }
+
+    static Response metricsAccountsToMonth(String yyyymm, String queryParams) {
+        String optionalQueryParams = "";
+        if (queryParams != null) {
+            optionalQueryParams = "?" + queryParams;
+        }
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.get("/api/info/metrics/accounts/toMonth/" + yyyymm + optionalQueryParams);
+    }
+
+    static Response metricsAccountsTimeSeries(String mediaType, String queryParams) {
+        String optionalQueryParams = "";
+        if (queryParams != null) {
+            optionalQueryParams = "?" + queryParams;
+        }
+        RequestSpecification requestSpecification = given();
+        requestSpecification.contentType(mediaType);
+        return requestSpecification.get("/api/info/metrics/accounts/monthly" + optionalQueryParams);
+    }
     
     static Response metricsDataversesPastDays(String days, String queryParams) {
         String optionalQueryParams = "";
@@ -1941,6 +3096,15 @@ static Response metricsDownloadsPastDays(String days, String queryParams) {
         return requestSpecification.get("/api/info/metrics/downloads/pastDays/" + days + optionalQueryParams);
     }
 
+    static Response metricsAccountsPastDays(String days, String queryParams) {
+        String optionalQueryParams = "";
+        if (queryParams != null) {
+            optionalQueryParams = "?" + queryParams;
+        }
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.get("/api/info/metrics/accounts/pastDays/" + days + optionalQueryParams);
+    }
+
     static Response metricsDataversesByCategory(String queryParams) {
         String optionalQueryParams = "";
         if (queryParams != null) {
@@ -1977,10 +3141,31 @@ static Response metricsDatasetsBySubjectToMonth(String month, String queryParams
         return requestSpecification.get("/api/info/metrics/datasets/bySubject/toMonth/" + month + optionalQueryParams);
     }
     
+    public static Response makeDataCountMetricTimeSeries(String metricType, String queryParams) {
+        String apiPath = "/api/v1/metrics/makeDataCount/" + metricType + "/monthly";
+        
+        Response response = given()
+                .get(apiPath + (queryParams != null && !queryParams.isEmpty() ? "?" + queryParams : ""));
+        
+        return response;
+    }
+    
     static Response clearMetricCache() {
         RequestSpecification requestSpecification = given();
         return requestSpecification.delete("/api/admin/clearMetricsCache");
     }
+    
+    static Response clearMetricCache(String name) {
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.delete("/api/admin/clearMetricsCache/" + name);
+    }
+
+    static Response rateLimitStats(String apiToken, String deltaMinutesFilter) {
+        String queryParams = deltaMinutesFilter != null ? "?deltaMinutesFilter=" + deltaMinutesFilter : "";
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/admin/rateLimitStats" + queryParams);
+    }
 
     static Response sitemapUpdate() {
         return given()
@@ -2006,10 +3191,15 @@ static Response getTokenExpiration( String apiToken) {
         return response;
     }
     
-    static Response recreateToken( String apiToken) {
+    static Response recreateToken(String apiToken) {
+        return recreateToken(apiToken, false);
+    }
+
+    static Response recreateToken(String apiToken, boolean returnExpiration) {
         Response response = given()
-            .header(API_TOKEN_HTTP_HEADER, apiToken)
-            .post("api/users/token/recreate");
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .queryParam("returnExpiration", returnExpiration)
+                .post("api/users/token/recreate");
         return response;
     }
 
@@ -2061,13 +3251,20 @@ public void testSwordStatementWithFiles() {
     
     //Helper function that returns true if a given dataset locked for a  given reason is unlocked within
     // a given duration returns false if still locked after given duration
+    // (the version of the method that takes a long for the dataset id is 
+    // for backward compatibility with how the method is called for the 
+    // Ingest lock throughout the test code)
     static Boolean sleepForLock(long datasetId, String lockType, String apiToken, int duration) {
+        String datasetIdAsString = String.valueOf(datasetId);
+        return sleepForLock(datasetIdAsString, lockType, apiToken, duration);
+    }
 
-        Response lockedForIngest = UtilIT.checkDatasetLocks(datasetId, lockType, apiToken);
+    static Boolean sleepForLock(String idOrPersistentId, String lockType, String apiToken, int duration) {
+        Response lockedForIngest = UtilIT.checkDatasetLocks(idOrPersistentId, lockType, apiToken);
         int i = 0;
         do {
             try {
-                lockedForIngest = UtilIT.checkDatasetLocks(datasetId, lockType, apiToken);
+                lockedForIngest = UtilIT.checkDatasetLocks(idOrPersistentId, lockType, apiToken);
                 Thread.sleep(1000);
                 i++;
                 if (i > duration) {
@@ -2076,18 +3273,108 @@ static Boolean sleepForLock(long datasetId, String lockType, String apiToken, in
             } catch (InterruptedException ex) {
                 Logger.getLogger(UtilIT.class.getName()).log(Level.SEVERE, null, ex);
             }
-        } while (lockedForIngest.body().prettyPrint().contains(lockType));
+        } while (lockedForIngest.body().jsonPath().getList("data").size() >0 && (lockType==null || lockedForIngest.body().prettyPrint().contains(lockType)));
 
         return i <= duration;
 
     }
     
+    static boolean sleepForReindex(String idOrPersistentId, String apiToken, int durationInSeconds) {
+        int i = 0;
+        Response timestampResponse;
+        int sleepStep = 500;
+        int repeats = durationInSeconds * (1000 / sleepStep);
+        boolean stale=true;
+        do {
+            timestampResponse = UtilIT.getDatasetTimestamps(idOrPersistentId, apiToken);
+            System.out.println(timestampResponse.body().asString());
+            try {
+                String hasStaleIndex = timestampResponse.body().jsonPath().getString("data.hasStaleIndex");
+                System.out.println(hasStaleIndex);
+                stale = Boolean.parseBoolean(hasStaleIndex);
+            } catch (IllegalArgumentException ex) {
+                Logger.getLogger(UtilIT.class.getName()).log(Level.INFO, "no stale index property found", ex);
+                stale = false;
+            }
+            try {
+                Thread.sleep(sleepStep);
+                i++;
+            } catch (InterruptedException ex) {
+                Logger.getLogger(UtilIT.class.getName()).log(Level.SEVERE, null, ex);
+                i = repeats + 1;
+            }
+        } while ((i <= repeats) && stale);
+        try {
+            Thread.sleep(1000);  //Current autoSoftIndexTime - which adds a delay to when the new docs are visible 
+            i++;
+        } catch (InterruptedException ex) {
+            Logger.getLogger(UtilIT.class.getName()).log(Level.SEVERE, null, ex);
+            i = repeats + 1;
+        }
+        System.out.println("Waited " + (i * (sleepStep / 1000.0)) + " seconds");
+        return i <= repeats;
+
+    }
+    static boolean sleepForReexport(String idOrPersistentId, String apiToken, int durationInSeconds) {
+        int i = 0;
+        Response timestampResponse;
+        int sleepStep = 500;
+        int repeats = durationInSeconds * (1000 / sleepStep);
+        boolean staleExport=true;
+        do {
+            timestampResponse = UtilIT.getDatasetTimestamps(idOrPersistentId, apiToken);
+            //logger.fine(timestampResponse.body().asString());
+            String updateTimeString = timestampResponse.body().jsonPath().getString("data.lastUpdateTime");
+            String exportTimeString = timestampResponse.body().jsonPath().getString("data.lastMetadataExportTime");
+            if (updateTimeString != null && exportTimeString != null) {
+                LocalDateTime updateTime = LocalDateTime.parse(updateTimeString);
+                LocalDateTime exportTime = LocalDateTime.parse(exportTimeString);
+                if (exportTime.isAfter(updateTime)) {
+                    staleExport = false;
+                }
+            }
+            try {
+                Thread.sleep(sleepStep);
+                i++;
+            } catch (InterruptedException ex) {
+                Logger.getLogger(UtilIT.class.getName()).log(Level.SEVERE, null, ex);
+                i = repeats + 1;
+            }
+        } while ((i <= repeats) && staleExport);
+        System.out.println("Waited " + (i * (sleepStep / 1000.0)) + " seconds for export");
+        return i <= repeats;
+
+    }
+
+    // Modeled after sleepForLock but the dataset isn't locked.
+    // We have to sleep or we can't perform the next operation.
+    static Boolean sleepForDeadlock(int duration) {
+        int i = 0;
+        do {
+            try {
+                Thread.sleep(1000);
+                i++;
+                if (i > duration) {
+                    break;
+                }
+            } catch (InterruptedException ex) {
+                Logger.getLogger(UtilIT.class.getName()).log(Level.SEVERE, null, ex);
+            }
+        } while (true);
+        return i <= duration;
+    }
+
     //Helper function that returns true if a given search returns a non-zero response within a fixed time limit
     // a given duration returns false if still zero results after given duration
-    static Boolean sleepForSearch(String searchPart, String apiToken,  String subTree, int duration) {
+    static Boolean sleepForSearch(String searchPart, String apiToken,  String subTree, int count, int duration) {
         
 
         Response searchResponse = UtilIT.search(searchPart, apiToken, subTree);
+        //Leave early if search isn't working
+        if(searchResponse.statusCode()!=200) {
+            logger.warning("Non-200 status in sleepForSearch: " + searchResponse.statusCode());
+            return false;
+        }
         int i = 0;
         do {
             try {
@@ -2100,25 +3387,68 @@ static Boolean sleepForSearch(String searchPart, String apiToken,  String subTre
             } catch (InterruptedException ex) {
                 Logger.getLogger(UtilIT.class.getName()).log(Level.SEVERE, null, ex);
             }
-        } while (UtilIT.getSearchCountFromResponse(searchResponse) == 0);
-
+        } while (UtilIT.getSearchCountFromResponse(searchResponse) != count);
+        logger.info("Waited " + i + " seconds in sleepForSearch");
         return i <= duration;
 
     }
     
-    
-    
+    // backward compatibility version of the method that takes long for the id:
     static Response checkDatasetLocks(long datasetId, String lockType, String apiToken) {
+        String datasetIdAsString = String.valueOf(datasetId);
+        return checkDatasetLocks(datasetIdAsString, lockType, apiToken);
+    }
+    
+    static Response checkDatasetLocks(String idOrPersistentId, String lockType, String apiToken) {
+        String idInPath = idOrPersistentId; // Assume it's a number.
+        String queryParams = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(idOrPersistentId)) {
+            idInPath = ":persistentId";
+            queryParams = "?persistentId=" + idOrPersistentId;
+        }
+        
+        if (lockType != null) {
+            queryParams = "".equals(queryParams) ? "?type="+lockType : queryParams+"&type="+lockType;
+        }
+        
         Response response = given()
             .header(API_TOKEN_HTTP_HEADER, apiToken)
-            .get("api/datasets/" + datasetId + "/locks" + (lockType == null ? "" : "?type="+lockType));
+            .get("api/datasets/" + idInPath + "/locks" + queryParams);
         return response;       
     }
     
-    static Response lockDataset(long datasetId, String lockType, String apiToken) {
+    static Response listAllLocks(String apiToken) {        
         Response response = given()
             .header(API_TOKEN_HTTP_HEADER, apiToken)
-            .post("api/datasets/" + datasetId + "/lock/" + lockType);
+            .get("api/datasets/locks");
+        return response;       
+    }
+    
+    static Response listLocksByType(String lockType, String apiToken) {        
+        Response response = given()
+            .header(API_TOKEN_HTTP_HEADER, apiToken)
+            .get("api/datasets/locks?type="+lockType);
+        return response;       
+    }
+    
+    static Response listLocksByUser(String userIdentifier, String apiToken) {        
+        Response response = given()
+            .header(API_TOKEN_HTTP_HEADER, apiToken)
+            .get("api/datasets/locks?userIdentifier="+userIdentifier);
+        return response;       
+    }
+    
+    static Response listLocksByTypeAndUser(String lockType, String userIdentifier, String apiToken) {        
+        Response response = given()
+            .header(API_TOKEN_HTTP_HEADER, apiToken)
+            .get("api/datasets/locks?type="+lockType+"&userIdentifier="+userIdentifier);
+        return response;       
+    }
+    
+    static Response lockDataset(long datasetId, String lockType, String apiToken) {
+        Response response = given()
+            .header(API_TOKEN_HTTP_HEADER, apiToken)
+            .post("api/datasets/" + datasetId + "/lock/" + lockType);
         return response;       
     }
     
@@ -2129,21 +3459,73 @@ static Response unlockDataset(long datasetId, String lockType, String apiToken)
         return response;       
     }
     
+    static Response getDatasetTimestamps(String idOrPersistentId, String apiToken) {
+        String idInPath = idOrPersistentId; // Assume it's a number.
+        String queryParams = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(idOrPersistentId)) {
+            idInPath = ":persistentId";
+            queryParams = "?persistentId=" + idOrPersistentId;
+        }
+        
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.get("api/datasets/" + idInPath + "/timestamps" + queryParams);
+    }
+    
     static Response exportOaiSet(String setName) {
         String apiPath = String.format("/api/admin/metadata/exportOAI/%s", setName);
         return given().put(apiPath);
     }
     
+    static Response getOaiIdentify() {
+        String oaiVerbPath = "/oai?verb=Identify";
+        return given().get(oaiVerbPath);
+    }
+    
+    static Response getOaiListMetadataFormats() {
+        String oaiVerbPath = "/oai?verb=ListMetadataFormats";
+        return given().get(oaiVerbPath);
+    }
+    
+    static Response getOaiListSets() {
+        String oaiVerbPath = "/oai?verb=ListSets";
+        return given().get(oaiVerbPath);
+    }
+    
     static Response getOaiRecord(String datasetPersistentId, String metadataFormat) {
         String apiPath = String.format("/oai?verb=GetRecord&identifier=%s&metadataPrefix=%s", datasetPersistentId, metadataFormat);
         return given().get(apiPath);
     }
     
     static Response getOaiListIdentifiers(String setName, String metadataFormat) {
-        String apiPath = String.format("/oai?verb=ListIdentifiers&set=%s&metadataPrefix=%s", setName, metadataFormat);
+        
+        String apiPath;
+        if (StringUtil.nonEmpty(setName)) {
+            apiPath = String.format("/oai?verb=ListIdentifiers&set=%s&metadataPrefix=%s", setName, metadataFormat);
+        } else {
+            apiPath = String.format("/oai?verb=ListIdentifiers&metadataPrefix=%s", metadataFormat);
+        }
+        return given().get(apiPath);
+    }
+    
+    static Response getOaiListIdentifiersWithResumptionToken(String resumptionToken) {
+        String apiPath = String.format("/oai?verb=ListIdentifiers&resumptionToken=%s", resumptionToken);
+        return given().get(apiPath);
+    }
+
+    static Response getOaiListRecords(String setName, String metadataFormat) {
+        String apiPath = String.format("/oai?verb=ListRecords&set=%s&metadataPrefix=%s", setName, metadataFormat);
         return given().get(apiPath);
     }
     
+    static Response getOaiListRecordsWithResumptionToken(String resumptionToken) {
+        String apiPath = String.format("/oai?verb=ListRecords&resumptionToken=%s", resumptionToken);
+        return given().get(apiPath);
+    }
+
     static Response changeAuthenticatedUserIdentifier(String oldIdentifier, String newIdentifier, String apiToken) {
         Response response;
         String path = String.format("/api/users/%s/changeIdentifier/%s", oldIdentifier, newIdentifier );
@@ -2191,7 +3573,7 @@ static Response makeDataCountGetMetricForDataset(String idOrPersistentIdOfDatase
         System.out.println("metric: " + metric);
         String idInPath = idOrPersistentIdOfDataset; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentIdOfDataset)) {
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDataset)) {
             idInPath = ":persistentId";
             optionalQueryParam = "&persistentId=" + idOrPersistentIdOfDataset;
         }
@@ -2207,7 +3589,7 @@ static Response makeDataCountGetMetricForDataset(String idOrPersistentIdOfDatase
         System.out.println("metric: " + metric);
         String idInPath = idOrPersistentIdOfDataset; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentIdOfDataset)) {
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDataset)) {
             idInPath = ":persistentId";
             optionalQueryParam = "&persistentId=" + idOrPersistentIdOfDataset;
         }
@@ -2223,7 +3605,7 @@ static Response makeDataCountGetMetricForDataset(String idOrPersistentIdOfDatase
         System.out.println("metric: " + metric);
         String idInPath = idOrPersistentIdOfDataset; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentIdOfDataset)) {
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDataset)) {
             idInPath = ":persistentId";
             optionalQueryParam = "&persistentId=" + idOrPersistentIdOfDataset;
         }
@@ -2239,7 +3621,7 @@ static Response makeDataCountAddUsageMetricsFromSushiReport(String idOrPersisten
 
         String idInPath = idOrPersistentIdOfDataset; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentIdOfDataset)) {
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDataset)) {
             idInPath = ":persistentId";
             optionalQueryParam = "&persistentId=" + idOrPersistentIdOfDataset;
         }
@@ -2252,7 +3634,7 @@ static Response makeDataCountUpdateCitationsForDataset(String idOrPersistentIdOf
 
         String idInPath = idOrPersistentIdOfDataset; // Assume it's a number.
         String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
-        if (!NumberUtils.isNumber(idOrPersistentIdOfDataset)) {
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDataset)) {
             idInPath = ":persistentId";
             optionalQueryParam = "?persistentId=" + idOrPersistentIdOfDataset;
         }
@@ -2261,6 +3643,22 @@ static Response makeDataCountUpdateCitationsForDataset(String idOrPersistentIdOf
         return requestSpecification.post("/api/admin/makeDataCount/" + idInPath + "/updateCitationsForDataset"+ optionalQueryParam);
     }
 
+    static Response makeDataCountGetProcessingState(String yearMonth) {
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.get("/api/admin/makeDataCount/" + yearMonth + "/processingState");
+    }
+    static Response makeDataCountUpdateProcessingState(String yearMonth, String state) {
+        return makeDataCountUpdateProcessingState(yearMonth, state, null);
+    }
+    static Response makeDataCountUpdateProcessingState(String yearMonth, String state, String server) {
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.post("/api/admin/makeDataCount/" + yearMonth + "/processingState?state=" + state + (server != null ? "&server=" + server : ""));
+    }
+    static Response makeDataCountDeleteProcessingState(String yearMonth) {
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.delete("/api/admin/makeDataCount/" + yearMonth + "/processingState");
+    }
+
     static Response editDDI(String body, String fileId, String apiToken) {
         if (apiToken == null) {
             apiToken = "";
@@ -2288,4 +3686,1290 @@ static Response findDataverseStorageSize(String dataverseId, String apiToken) {
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .get("/api/dataverses/" + dataverseId + "/storagesize");
     }
+    
+    static Response checkCollectionQuota(String collectionId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/dataverses/" + collectionId + "/storage/quota");
+    }
+    
+    static Response setCollectionQuota(String collectionId, long allocatedSize, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .post("/api/dataverses/" + collectionId + "/storage/quota/" + allocatedSize);
+        return response;
+    }
+    
+    static Response disableCollectionQuota(String collectionId, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/dataverses/" + collectionId + "/storage/quota");
+        return response;
+    }
+    
+    static Response checkCollectionStorageUse(String collectionId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/dataverses/" + collectionId + "/storage/use");
+    }
+    
+    /**
+     * Determine the "payload" storage size of a dataverse
+     *
+     * @param dataverseId
+     * @param apiToken
+     * @return response
+     */
+    static Response findDatasetStorageSize(String datasetId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/" + datasetId + "/storagesize");
+    }
+    
+    static Response findDatasetDownloadSize(String datasetId) {
+        return given()
+                .get("/api/datasets/" + datasetId + "/versions/" + DS_VERSION_LATEST + "/downloadsize");
+    }
+    
+    static Response findDatasetDownloadSize(String datasetId, String version,  String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/" + datasetId + "/versions/" + version + "/downloadsize");
+    }
+    
+    static Response addBannerMessage(String pathToJsonFile) {
+        String jsonIn = getDatasetJson(pathToJsonFile);
+        
+        Response addBannerMessageResponse = given()               
+                .body(jsonIn)
+                .contentType("application/json")
+                .post("/api/admin/bannerMessage");
+        return addBannerMessageResponse;
+    }
+    
+    static Response addBuiltInRole(String pathToJsonFile) {
+        String jsonIn = getDatasetJson(pathToJsonFile);
+
+        Response addBannerMessageResponse = given()
+                .body(jsonIn)
+                .contentType("application/json")
+                .post("/api/admin/roles");
+        return addBannerMessageResponse;
+    }
+
+    static Response deleteBuiltInRole(String roleAlias) {
+
+        Response addBannerMessageResponse = given()
+                .delete("/api/admin/roles/:alias?alias=" +roleAlias);
+        return addBannerMessageResponse;
+    }
+
+    static Response addDataverseRole(String pathToJsonFile, String dvAlias, String apiToken) {
+        String jsonIn = getDatasetJson(pathToJsonFile);
+
+        Response addBannerMessageResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonIn)
+                .contentType("application/json")
+                .post("/api/roles?dvo="+dvAlias);
+        return addBannerMessageResponse;
+    }
+    
+    static Response addFeaturedDataverse (String dvAlias, String featuredDvAlias, String apiToken) {
+        
+        String jsonString = "[\"" + featuredDvAlias + "\"]";
+
+        Response addFeaturedDataverseResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonString)
+                .post("/api/dataverses/"+dvAlias+"/featured/");
+        return addFeaturedDataverseResponse;
+    }
+    
+    static Response deleteFeaturedDataverses (String dvAlias, String apiToken) {
+
+        Response deleteFeaturedDataversesResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/dataverses/"+dvAlias+"/featured/");
+        return deleteFeaturedDataversesResponse;
+    }
+    
+    static Response getFeaturedDataverses (String dvAlias, String apiToken) {
+
+        Response deleteFeaturedDataversesResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/dataverses/"+dvAlias+"/featured/");
+        return deleteFeaturedDataversesResponse;
+    }
+
+    static Response deleteDataverseRole( String roleAlias, String apiToken) {
+
+        Response addBannerMessageResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/roles/:alias?alias="+roleAlias);
+        return addBannerMessageResponse;
+    }
+    
+    static Response deleteDataverseRoleById( String id, String apiToken) {
+
+        Response addBannerMessageResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/roles/"+id);
+        return addBannerMessageResponse;
+    }
+    
+    static Response viewDataverseRole( String roleAlias, String apiToken) {
+
+        Response addBannerMessageResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/roles/:alias?alias="+roleAlias);
+        return addBannerMessageResponse;
+    }
+    
+    static Response viewDataverseRoleById( String id, String apiToken) {
+
+        Response addBannerMessageResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/roles/"+id);
+        return addBannerMessageResponse;
+    }
+    
+    static Response getBannerMessages() {
+        
+        Response getBannerMessagesResponse = given()               
+                .get("/api/admin/bannerMessage");
+        return getBannerMessagesResponse;
+    }
+    
+    static Response deleteBannerMessage(Long id) {
+        
+        Response deleteBannerMessageResponse = given()               
+                .delete("/api/admin/bannerMessage/"+id.toString());
+        return deleteBannerMessageResponse;
+    }
+    
+    static Response getDatasetJsonLDMetadata(Integer datasetId, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .accept("application/ld+json")
+                .get("/api/datasets/" + datasetId + "/metadata");
+        return response;
+    }
+    
+    static Response addLicense(String pathToJsonFile, String apiToken) {
+        String jsonIn = getDatasetJson(pathToJsonFile);
+
+        Response addLicenseResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonIn)
+                .contentType("application/json")
+                .post("/api/licenses");
+        return addLicenseResponse;
+    }
+
+    static Response getLicenses() {
+
+        Response getLicensesResponse = given()
+                .get("/api/licenses");
+        return getLicensesResponse;
+    }
+
+    static Response getLicenseById(Long id) {
+
+        Response getLicenseResponse = given()
+                .get("/api/licenses/"+id.toString());
+        return getLicenseResponse;
+    }
+
+    static Response deleteLicenseById(Long id, String apiToken) {
+
+        Response deleteLicenseResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/licenses/"+id.toString());
+        return deleteLicenseResponse;
+    }
+
+    static Response setDefaultLicenseById(Long id, String apiToken) {
+        Response defaultLicenseResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .put("/api/licenses/default/"+id.toString());
+        return defaultLicenseResponse;
+    }
+    
+    static Response setLicenseActiveById(Long id, boolean state, String apiToken) {
+        Response activateLicenseResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .urlEncodingEnabled(false)
+                .put("/api/licenses/"+id.toString() + "/:active/" + state);
+        return activateLicenseResponse;
+    }
+    
+    static Response setLicenseSortOrderById(Long id, Long sortOrder, String apiToken) {
+        Response setSortOrderLicenseResponse = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .urlEncodingEnabled(false)
+                .put("/api/licenses/"+id.toString() + "/:sortOrder/" + sortOrder);
+        return setSortOrderLicenseResponse;
+    }
+
+    static Response updateDatasetJsonLDMetadata(Integer datasetId, String apiToken, String jsonLDBody, boolean replace) {
+        Response response = given()
+            .header(API_TOKEN_HTTP_HEADER, apiToken)
+            .contentType("application/ld+json")
+            .body(jsonLDBody.getBytes(StandardCharsets.UTF_8))
+            .put("/api/datasets/" + datasetId + "/metadata?replace=" + replace);
+        return response;
+    }
+
+    static Response deleteDatasetJsonLDMetadata(Integer datasetId, String apiToken, String jsonLDBody) {
+        Response response = given()
+            .header(API_TOKEN_HTTP_HEADER, apiToken)
+            .contentType("application/ld+json")
+            .body(jsonLDBody.getBytes(StandardCharsets.UTF_8))
+            .put("/api/datasets/" + datasetId + "/metadata/delete");
+        return response;
+    }
+
+    public static Response recreateDatasetJsonLD(String apiToken, String dataverseAlias, String jsonLDBody) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/ld+json; charset=utf-8")
+                .body(jsonLDBody.getBytes(StandardCharsets.UTF_8))
+                .post("/api/dataverses/" + dataverseAlias +"/datasets");
+        return response;
+    }
+    
+    static Response setDataverseCurationLabelSet(String alias, String apiToken, String labelSetName) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .put("/api/admin/dataverse/" + alias + "/curationLabelSet?name=" + labelSetName);
+        return response;
+    }
+    
+    static Response getDatasetCurationLabelSet(Integer datasetId, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/" + datasetId + "/curationLabelSet");
+        return response;
+    }
+    
+    static Response setDatasetCurationLabel(Integer datasetId, String apiToken, String label) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .put("/api/datasets/" + datasetId + "/curationStatus?label=" + label);
+        return response;
+    }
+    
+    static Response deleteDatasetCurationLabel(Integer datasetId, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/datasets/" + datasetId + "/curationStatus");
+        return response;
+    }
+
+    static Response getDatasetCurationStatus(Integer datasetId, String apiToken, boolean includeHistory) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/" + datasetId + "/curationStatus?includeHistory=" + includeHistory);
+        return response;
+    }
+
+    static Response getDatasetVersionArchivalStatus(Integer datasetId, String version, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/" + datasetId + "/" + version + "/archivalStatus");
+        return response;
+    }
+
+    static Response archiveDataset(String idOrPersistentIdOfDataset, String version, String apiToken) {
+        String idInPath = idOrPersistentIdOfDataset;
+        String optionalQueryParam = "";
+        if (!NumberUtils.isCreatable(idOrPersistentIdOfDataset)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + idOrPersistentIdOfDataset;
+        }
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .post("/api/admin/submitDatasetVersionToArchive/" + idInPath + "/" + version + optionalQueryParam);
+        return response;
+    }
+
+    static Response setDatasetVersionArchivalStatus(Integer datasetId, String version, String apiToken, String status, String message) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken).contentType("application/json; charset=utf-8").body("{\"status\":\"" + status + "\", \"message\":\"" + message + "\"}")
+                .put("/api/datasets/" + datasetId + "/" + version + "/archivalStatus");
+        return response;
+    }
+    static Response deleteDatasetVersionArchivalStatus(Integer datasetId, String version, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/datasets/" + datasetId + "/" + version + "/archivalStatus");
+        return response;
+    }
+
+    private static DatasetField constructPrimitive(String fieldName, String value) {
+        DatasetField field = new DatasetField();
+        field.setDatasetFieldType(
+                new DatasetFieldType(fieldName, DatasetFieldType.FieldType.TEXT, false));
+        field.setDatasetFieldValues(
+                Collections.singletonList(
+                        new DatasetFieldValue(field, value)));
+        return field;
+    }
+
+    static Response importDatasetNativeJson(String apiToken, String dataverseAlias, String jsonString, String pid, String release) {
+
+        String postString = "/api/dataverses/" + dataverseAlias + "/datasets/:import";
+        if (pid != null || release != null) {
+            //postString = postString + "?";
+            if (pid != null) {
+                postString = postString + "?pid=" + pid;
+                if (release != null && release.compareTo("yes") == 0) {
+                    postString = postString + "&release=" + release.toString();
+                }
+            } else {
+                if (release != null && release.compareTo("yes") == 0) {
+                    postString = postString + "?release=" + release.toString();
+                }
+            }
+        }
+
+        RequestSpecification importJson = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .urlEncodingEnabled(false)
+                .body(jsonString)
+                .contentType("application/json");
+
+        return importJson.post(postString);
+    }
+
+    static Response importDatasetDDIViaNativeApi(String apiToken, String dataverseAlias, String xml, String pid, String release) {
+
+        String postString = "/api/dataverses/" + dataverseAlias + "/datasets/:importddi";
+        if (pid != null || release != null  ) {
+            //postString = postString + "?";
+            if (pid != null) {
+                postString = postString + "?pid=" + pid;
+                if (release != null && release.compareTo("yes") == 0) {
+                    postString = postString + "&release=" + release.toString();
+                }
+            } else {
+                if (release != null && release.compareTo("yes") == 0) {
+                    postString = postString + "?release=" + release.toString();
+                }
+            }
+        }
+        logger.info("Here importDatasetDDIViaNativeApi");
+        logger.info(postString);
+
+        RequestSpecification importDDI = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .urlEncodingEnabled(false)
+                .body(xml)
+                .contentType("application/xml");
+
+
+        return importDDI.post(postString);
+    }
+
+
+    static Response importDatasetViaNativeApi(String apiToken, String dataverseAlias, String json, String pid, String release) {
+        String postString = "/api/dataverses/" + dataverseAlias + "/datasets/:import";
+        if (pid != null || release != null  ) {
+            //postString = postString + "?";
+            if (pid != null) {
+                postString = postString + "?pid=" + pid;
+                if (release != null && release.compareTo("yes") == 0) {
+                    postString = postString + "&release=" + release;
+                }
+            } else {
+                if (release != null && release.compareTo("yes") == 0) {
+                    postString = postString + "?release=" + release;
+                }
+            }
+        }
+        logger.info("Here importDatasetViaNativeApi");
+        logger.info(postString);
+
+        RequestSpecification importJSON = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .urlEncodingEnabled(false)
+                .body(json)
+                .contentType("application/json");
+
+        return importJSON.post(postString);
+    }
+
+
+    static Response retrieveMyDataAsJsonString(String apiToken, String userIdentifier, ArrayList<Long> roleIds) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/json; charset=utf-8")
+                .queryParam("role_ids", roleIds)
+                .queryParam("dvobject_types", MyDataFilterParams.defaultDvObjectTypes)
+                .queryParam("published_states", MyDataFilterParams.defaultPublishedStates)
+                .get("/api/mydata/retrieve?userIdentifier=" + userIdentifier);
+        return response;
+    }
+
+    static Response createSignedUrl(String apiToken, String apiPath, String username) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(String.format("{\"url\":\"%s\",\"timeOut\":35,\"user\":\"%s\"}", getRestAssuredBaseUri() + apiPath, username))
+                .contentType("application/json")
+                .post("/api/admin/requestSignedUrl");
+        return response;
+    }
+
+    static String getSignedUrlFromResponse(Response createSignedUrlResponse) {
+        JsonPath jsonPath = JsonPath.from(createSignedUrlResponse.body().asString());
+        String signedUrl = jsonPath.getString("data.signedUrl");
+        return signedUrl;
+    }
+
+    static Response logout() {
+        Response response = given()
+                .contentType("application/json")
+                .post("/api/logout");
+        return response;
+    }
+
+    static Response getDatasetSummaryFieldNames() {
+        Response response = given()
+                .contentType("application/json")
+                .get("/api/datasets/summaryFieldNames");
+        return response;
+    }
+
+    static Response getPrivateUrlDatasetVersion(String privateUrlToken) {
+        Response response = given()
+                .contentType("application/json")
+                .get("/api/datasets/privateUrlDatasetVersion/" + privateUrlToken);
+        return response;
+    }
+
+    static Response getPrivateUrlDatasetVersionCitation(String privateUrlToken) {
+        Response response = given()
+                .contentType("application/json")
+                .get("/api/datasets/privateUrlDatasetVersion/" + privateUrlToken + "/citation");
+        return response;
+    }
+
+    static Response getDatasetVersionCitation(Integer datasetId, String version, boolean includeDeaccessioned, String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/json")
+                .queryParam("includeDeaccessioned", includeDeaccessioned)
+                .get("/api/datasets/" + datasetId + "/versions/" + version + "/citation");
+        return response;
+    }
+
+    static Response setDatasetCitationDateField(String datasetIdOrPersistentId, String dateField, String apiToken) {
+        String idInPath = datasetIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(datasetIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId;
+        }
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(dateField)
+                .put("/api/datasets/" + idInPath + "/citationdate" + optionalQueryParam);
+        return response;
+    }
+
+    static Response clearDatasetCitationDateField(String datasetIdOrPersistentId, String apiToken) {
+        String idInPath = datasetIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(datasetIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId;
+        }
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/datasets/" + idInPath + "/citationdate" + optionalQueryParam);
+        return response;
+    }
+
+    static Response getFileCitation(Integer fileId, String datasetVersion, String apiToken) {
+        Boolean includeDeaccessioned = null;
+        return getFileCitation(fileId, datasetVersion, includeDeaccessioned, apiToken);
+    }
+
+    static Response getFileCitation(Integer fileId, String datasetVersion, Boolean includeDeaccessioned, String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification.header(API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        if (includeDeaccessioned != null) {
+            requestSpecification.queryParam("includeDeaccessioned", includeDeaccessioned);
+        }
+        return requestSpecification.get("/api/files/" + fileId + "/versions/" + datasetVersion + "/citation");
+    }
+
+    static Response getVersionFiles(Integer datasetId,
+                                    String version,
+                                    Integer limit,
+                                    Integer offset,
+                                    String contentType,
+                                    String accessStatus,
+                                    String categoryName,
+                                    String tabularTagName,
+                                    String searchText,
+                                    String orderCriteria,
+                                    boolean includeDeaccessioned,
+                                    String apiToken) {
+        RequestSpecification requestSpecification = given()
+                .contentType("application/json")
+                .queryParam("includeDeaccessioned", includeDeaccessioned);
+        if (apiToken != null) {
+            requestSpecification.header(API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        if (limit != null) {
+            requestSpecification = requestSpecification.queryParam("limit", limit);
+        }
+        if (offset != null) {
+            requestSpecification = requestSpecification.queryParam("offset", offset);
+        }
+        if (contentType != null) {
+            requestSpecification = requestSpecification.queryParam("contentType", contentType);
+        }
+        if (accessStatus != null) {
+            requestSpecification = requestSpecification.queryParam("accessStatus", accessStatus);
+        }
+        if (categoryName != null) {
+            requestSpecification = requestSpecification.queryParam("categoryName", categoryName);
+        }
+        if (tabularTagName != null) {
+            requestSpecification = requestSpecification.queryParam("tabularTagName", tabularTagName);
+        }
+        if (searchText != null) {
+            requestSpecification = requestSpecification.queryParam("searchText", searchText);
+        }
+        if (orderCriteria != null) {
+            requestSpecification = requestSpecification.queryParam("orderCriteria", orderCriteria);
+        }
+        return requestSpecification.get("/api/datasets/" + datasetId + "/versions/" + version + "/files");
+    }
+
+    static Response createAndUploadTestFile(String persistentId, String testFileName, byte[] testFileContentInBytes, String apiToken) throws IOException {
+        Path pathToTempDir = Paths.get(Files.createTempDirectory(null).toString());
+        String pathToTestFile = pathToTempDir + File.separator + testFileName;
+        File testFile = new File(pathToTestFile);
+        FileOutputStream fileOutputStream = new FileOutputStream(testFile);
+
+        fileOutputStream.write(testFileContentInBytes);
+        fileOutputStream.flush();
+        fileOutputStream.close();
+
+        return uploadZipFileViaSword(persistentId, pathToTestFile, apiToken);
+    }
+
+    static Response getFileDownloadCount(String dataFileId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/files/" + dataFileId + "/downloadCount");
+    }
+
+    static Response getFileDataTables(String dataFileId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/files/" + dataFileId + "/dataTables");
+    }
+
+    static Response getUserFileAccessRequested(String dataFileId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/access/datafile/" + dataFileId + "/userFileAccessRequested");
+    }
+
+    static Response getUserPermissionsOnFile(String dataFileId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/access/datafile/" + dataFileId + "/userPermissions");
+    }
+
+    static Response getUserPermissionsOnDataset(String datasetId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/" + datasetId + "/userPermissions");
+    }
+
+    static Response getUserPermissionsOnDataverse(String dataverseAlias, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/dataverses/" + dataverseAlias + "/userPermissions");
+    }
+
+    static Response getCanDownloadAtLeastOneFile(String datasetId, String versionId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/datasets/" + datasetId + "/versions/" + versionId + "/canDownloadAtLeastOneFile");
+    }
+
+    static Response createFileEmbargo(Integer datasetId, Integer fileId, String dateAvailable, String apiToken) {
+        JsonObjectBuilder jsonBuilder = Json.createObjectBuilder();
+        jsonBuilder.add("dateAvailable", dateAvailable);
+        jsonBuilder.add("reason", "This is a test embargo");
+        jsonBuilder.add("fileIds", Json.createArrayBuilder().add(fileId));
+        String jsonString = jsonBuilder.build().toString();
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonString)
+                .contentType("application/json")
+                .urlEncodingEnabled(false)
+                .post("/api/datasets/" + datasetId + "/files/actions/:set-embargo");
+    }
+
+    static Response createFileRetention(Integer datasetId, Integer fileId, String dateUnavailable, String apiToken) {
+        JsonObjectBuilder jsonBuilder = Json.createObjectBuilder();
+        jsonBuilder.add("dateUnavailable", dateUnavailable);
+        jsonBuilder.add("reason", "This is a test retention");
+        jsonBuilder.add("fileIds", Json.createArrayBuilder().add(fileId));
+        String jsonString = jsonBuilder.build().toString();
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonString)
+                .contentType("application/json")
+                .urlEncodingEnabled(false)
+                .post("/api/datasets/" + datasetId + "/files/actions/:set-retention");
+    }
+
+    static Response getVersionFileCounts(Integer datasetId,
+                                         String version,
+                                         String contentType,
+                                         String accessStatus,
+                                         String categoryName,
+                                         String tabularTagName,
+                                         String searchText,
+                                         boolean includeDeaccessioned,
+                                         String apiToken) {
+        RequestSpecification requestSpecification = given()
+                .queryParam("includeDeaccessioned", includeDeaccessioned);
+        if (apiToken != null) {
+            requestSpecification.header(API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        if (contentType != null) {
+            requestSpecification = requestSpecification.queryParam("contentType", contentType);
+        }
+        if (accessStatus != null) {
+            requestSpecification = requestSpecification.queryParam("accessStatus", accessStatus);
+        }
+        if (categoryName != null) {
+            requestSpecification = requestSpecification.queryParam("categoryName", categoryName);
+        }
+        if (tabularTagName != null) {
+            requestSpecification = requestSpecification.queryParam("tabularTagName", tabularTagName);
+        }
+        if (searchText != null) {
+            requestSpecification = requestSpecification.queryParam("searchText", searchText);
+        }
+        return requestSpecification.get("/api/datasets/" + datasetId + "/versions/" + version + "/files/counts");
+    }
+
+    static Response setFileCategories(String dataFileId, String apiToken, List<String> categories) {
+        return setFileCategories(dataFileId, apiToken, categories, null);
+    }
+    static Response setFileCategories(String dataFileId, String apiToken, List<String> categories, Boolean replaceData) {
+        JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder();
+        for (String category : categories) {
+            jsonArrayBuilder.add(category);
+        }
+        String replace = replaceData != null ? "?replace=" + replaceData : "";
+        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+        jsonObjectBuilder.add("categories", jsonArrayBuilder);
+        String jsonString = jsonObjectBuilder.build().toString();
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonString)
+                .post("/api/files/" + dataFileId + "/metadata/categories" + replace);
+    }
+
+    static Response setFileTabularTags(String dataFileId, String apiToken, List<String> tabularTags) {
+        return setFileTabularTags(dataFileId, apiToken, tabularTags, null);
+    }
+    static Response setFileTabularTags(String dataFileId, String apiToken, List<String> tabularTags, Boolean replaceData) {
+        JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder();
+        for (String tabularTag : tabularTags) {
+            jsonArrayBuilder.add(tabularTag);
+        }
+        String replace = replaceData != null ? "?replace=" + replaceData : "";
+        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+        jsonObjectBuilder.add("tabularTags", jsonArrayBuilder);
+        String jsonString = jsonObjectBuilder.build().toString();
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonString)
+                .post("/api/files/" + dataFileId + "/metadata/tabularTags" + replace);
+    }
+
+    static Response deleteFileInDataset(Integer fileId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/files/" + fileId);
+    }
+
+    static Response getHasBeenDeleted(String dataFileId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/files/" + dataFileId + "/hasBeenDeleted");
+    }
+
+    static Response deaccessionDataset(int datasetId, String version, String deaccessionReason, String deaccessionForwardURL, String apiToken) {
+        return deaccessionDataset(String.valueOf(datasetId), version, deaccessionReason, deaccessionForwardURL, apiToken);
+    }
+
+    static Response deaccessionDataset(String datasetIdOrPersistentId, String versionId, String deaccessionReason, String deaccessionForwardURL, String apiToken) {
+        
+        String idInPath = datasetIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(datasetIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId;
+        }
+    
+        JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
+        jsonObjectBuilder.add("deaccessionReason", deaccessionReason);
+        if (deaccessionForwardURL != null) {
+            jsonObjectBuilder.add("deaccessionForwardURL", deaccessionForwardURL);
+        }
+
+        String jsonString = jsonObjectBuilder.build().toString();
+        StringBuilder query = new StringBuilder()
+            .append("/api/datasets/")
+            .append(idInPath)
+            .append("/versions/")
+            .append(versionId)
+            .append("/deaccession")
+            .append(optionalQueryParam);   
+                 
+        return given()
+            .header(API_TOKEN_HTTP_HEADER, apiToken)
+            .body(jsonString)
+            .post(query.toString());
+    }
+
+    static Response getDownloadSize(Integer datasetId,
+                                    String version,
+                                    String contentType,
+                                    String accessStatus,
+                                    String categoryName,
+                                    String tabularTagName,
+                                    String searchText,
+                                    String mode,
+                                    boolean includeDeaccessioned,
+                                    String apiToken) {
+        RequestSpecification requestSpecification = given()
+                .queryParam("includeDeaccessioned", includeDeaccessioned)
+                .queryParam("mode", mode);
+        if (apiToken != null) {
+            requestSpecification.header(API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        if (contentType != null) {
+            requestSpecification = requestSpecification.queryParam("contentType", contentType);
+        }
+        if (accessStatus != null) {
+            requestSpecification = requestSpecification.queryParam("accessStatus", accessStatus);
+        }
+        if (categoryName != null) {
+            requestSpecification = requestSpecification.queryParam("categoryName", categoryName);
+        }
+        if (tabularTagName != null) {
+            requestSpecification = requestSpecification.queryParam("tabularTagName", tabularTagName);
+        }
+        if (searchText != null) {
+            requestSpecification = requestSpecification.queryParam("searchText", searchText);
+        }
+        return requestSpecification
+                .get("/api/datasets/" + datasetId + "/versions/" + version + "/downloadsize");
+    }
+
+    static Response getDownloadCountByDatasetId(Integer datasetId, String apiToken, Boolean includeMDC) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification.header(API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        if (includeMDC != null) {
+            requestSpecification = requestSpecification.queryParam("includeMDC", includeMDC);
+        }
+        return requestSpecification
+                .get("/api/datasets/" + datasetId + "/download/count");
+    }
+
+    static Response downloadTmpFile(String fullyQualifiedPathToFile, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/admin/downloadTmpFile?fullyQualifiedPathToFile=" + fullyQualifiedPathToFile);
+    }
+
+    static Response setDatasetStorageDriver(Integer datasetId, String driverLabel, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(driverLabel)
+                .put("/api/datasets/" + datasetId + "/storageDriver");
+    }
+
+    /** GET on /api/admin/savedsearches/list */
+    static Response getSavedSearchList() {
+        return given().get("/api/admin/savedsearches/list");
+    }
+
+    /** POST on /api/admin/savedsearches without body */
+    static Response setSavedSearch() {
+        return given()
+                .contentType("application/json")
+                .post("/api/admin/savedsearches");
+    }
+
+    /** POST on /api/admin/savedsearches with body */
+    static Response setSavedSearch(String body) {
+        return given()
+                .body(body)
+                .contentType("application/json")
+                .post("/api/admin/savedsearches");
+    }
+
+    /** PUT on /api/admin/savedsearches/makelinks/all */
+    static Response setSavedSearchMakelinksAll() {
+        return given().put("/api/admin/savedsearches/makelinks/all");
+    }
+
+    /** DELETE on /api/admin/savedsearches/{id} with identifier */
+    static Response deleteSavedSearchById(Integer id) {
+        return given().delete("/api/admin/savedsearches/" + id);
+    }
+
+    //Globus Store related - not currently used
+    
+    static Response getDatasetGlobusUploadParameters(Integer datasetId, String locale, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/json")
+                .get("/api/datasets/" + datasetId + "/globusUploadParameters?locale=" + locale);
+    }
+    
+    static Response getDatasetGlobusDownloadParameters(Integer datasetId, String locale, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/json")
+                .get("/api/datasets/" + datasetId + "/globusDownloadParameters?locale=" + locale);
+    }
+    
+    static Response requestGlobusDownload(Integer datasetId, JsonObject body, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(body)
+                .contentType("application/json")
+                .post("/api/datasets/" + datasetId + "/requestGlobusDownload");
+    }
+
+    static Response requestGlobusUploadPaths(Integer datasetId, JsonObject body, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(body.toString())
+                .contentType("application/json")
+                .post("/api/datasets/" + datasetId + "/requestGlobusUploadPaths");
+    }
+
+    public static Response updateDataverseInputLevels(String dataverseAlias, String[] inputLevelNames, boolean[] requiredInputLevels, boolean[] includedInputLevels, String apiToken) {
+        JsonArrayBuilder inputLevelsArrayBuilder = Json.createArrayBuilder();
+        for (int i = 0; i < inputLevelNames.length; i++) {
+            inputLevelsArrayBuilder.add(createInputLevelObject(inputLevelNames[i], requiredInputLevels[i], includedInputLevels[i]));
+        }
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(inputLevelsArrayBuilder.build().toString())
+                .contentType(ContentType.JSON)
+                .put("/api/dataverses/" + dataverseAlias + "/inputLevels");
+    }
+
+    private static JsonObjectBuilder createInputLevelObject(String name, boolean required, boolean include) {
+        return Json.createObjectBuilder()
+                .add("datasetFieldTypeName", name)
+                .add("required", required)
+                .add("include", include);
+    }
+
+    public static Response getOpenAPI(String accept, String format) {
+        Response response = given()
+                .header("Accept", accept)
+                .queryParam("format", format)
+                .get("/openapi");
+        return response;
+    }
+
+    static Response listDataverseFacets(String dataverseAlias, String apiToken) {
+        return listDataverseFacets(dataverseAlias, false, apiToken);
+    }
+
+    static Response listDataverseFacets(String dataverseAlias, boolean returnDetails, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .queryParam("returnDetails", returnDetails)
+                .get("/api/dataverses/" + dataverseAlias + "/facets");
+    }
+
+    static Response listAllFacetableDatasetFields() {
+        return given()
+                .get("/api/datasetfields/facetables");
+    }
+
+    static Response listDataverseInputLevels(String dataverseAlias, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/json")
+                .get("/api/dataverses/" + dataverseAlias + "/inputLevels");
+    }
+
+    public static Response getDatasetTypes() {
+        Response response = given()
+                .get("/api/datasets/datasetTypes");
+        return response;
+    }
+
+    static Response getDatasetType(String idOrName) {
+        return given()
+                .get("/api/datasets/datasetTypes/" + idOrName);
+    }
+
+    static Response addDatasetType(String jsonIn, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonIn)
+                .contentType(ContentType.JSON)
+                .post("/api/datasets/datasetTypes");
+    }
+    
+    static Response addDatasetType(JsonObject jsonObject, String apiToken) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification.header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification
+                .body(jsonObject.toString())
+                .contentType(ContentType.JSON)
+                .post("/api/datasets/datasetTypes");
+    }
+
+    static Response deleteDatasetTypes(long doomed, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/datasets/datasetTypes/" + doomed);
+    }
+
+    static Response updateDatasetTypeLinksWithMetadataBlocks(String idOrName, String jsonArrayOfMetadataBlocks, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonArrayOfMetadataBlocks)
+                .put("/api/datasets/datasetTypes/" + idOrName);
+    }
+    
+    static Response updateDatasetTypeAvailableLicense(String idOrName, String jsonArrayOfLicenses, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonArrayOfLicenses)
+                .put("/api/datasets/datasetTypes/" + idOrName + "/licenses");
+    }
+
+    static Response registerOidcUser(String jsonIn, String bearerToken) {
+        return given()
+                .header(HttpHeaders.AUTHORIZATION, bearerToken)
+                .body(jsonIn)
+                .contentType(ContentType.JSON)
+                .post("/api/users/register");
+    }
+
+    /**
+     * Creates a new user in the development Keycloak instance.
+     * <p>This method is specifically designed for use in the containerized Keycloak development
+     * environment. The configured Keycloak instance must be accessible at the specified URL.
+     * The method sends a request to the Keycloak Admin API to create a new user in the given realm.
+     *
+     * <p>Refer to the {@code testRegisterOidc()} method in the {@code UsersIT} class for an example
+     * of this method in action.
+     *
+     * @param bearerToken The Bearer token used for authenticating the request to the Keycloak Admin API.
+     * @param userJson    The JSON representation of the user to be created.
+     * @return A {@link Response} containing the result of the user creation request.
+     */
+    static Response createKeycloakUser(String bearerToken, String userJson) {
+        return given()
+                .contentType(ContentType.JSON)
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + bearerToken)
+                .body(userJson)
+                .post("http://keycloak.mydomain.com:8090/admin/realms/test/users");
+    }
+
+    /**
+     * Performs an OIDC login in the development Keycloak instance using the Resource Owner Password Credentials (ROPC)
+     * grant type to retrieve authentication tokens from a Keycloak instance.
+     *
+     * <p>This method is specifically designed for use in the containerized Keycloak development
+     * environment. The configured Keycloak instance must be accessible at the specified URL.
+     *
+     * <p>Refer to the {@code testRegisterOidc()} method in the {@code UsersIT} class for an example
+     * of this method in action.
+     *
+     * @return A {@link Response} containing authentication tokens, including access and refresh tokens,
+     *         if the login is successful.
+     */
+    static Response performKeycloakROPCLogin(String username, String password) {
+        return given()
+                .contentType(ContentType.URLENC)
+                .formParam("client_id", "test")
+                .formParam("client_secret", "94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8")
+                .formParam("username", username)
+                .formParam("password", password)
+                .formParam("grant_type", "password")
+                .formParam("scope", "openid")
+                .post("http://keycloak.mydomain.com:8090/realms/test/protocol/openid-connect/token");
+    }
+
+    static Response createDataverseFeaturedItem(String dataverseAlias,
+                                                String apiToken,
+                                                String content,
+                                                int displayOrder,
+                                                String pathToFile) {
+        return createDataverseFeaturedItem(dataverseAlias, apiToken, content, displayOrder, pathToFile, null, null);
+    }
+
+    static Response createDataverseFeaturedItem(String dataverseAlias,
+                                                String apiToken,
+                                                String content,
+                                                int displayOrder,
+                                                String pathToFile,
+                                                String type,
+                                                String dvObjectId) {
+        RequestSpecification requestSpecification = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType(ContentType.MULTIPART)
+                .multiPart("displayOrder", displayOrder);
+
+        if (content != null) {
+            requestSpecification.multiPart("content", content);
+        }
+        if (pathToFile != null) {
+            requestSpecification.multiPart("file", new File(pathToFile));
+        }
+        if (type != null) {
+            requestSpecification.multiPart("type", type);
+        }
+        if (dvObjectId != null) {
+            requestSpecification.multiPart("dvObjectIdentifier", dvObjectId);
+        }
+
+        return requestSpecification
+                .when()
+                .post("/api/dataverses/" + dataverseAlias + "/featuredItems");
+    }
+
+    static Response deleteDataverseFeaturedItem(long id, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/dataverseFeaturedItems/" + id);
+    }
+
+    static Response updateDataverseFeaturedItem(long featuredItemId,
+                                                String content,
+                                                int displayOrder,
+                                                boolean keepFile,
+                                                String pathToFile,
+                                                String apiToken) {
+        return updateDataverseFeaturedItem(featuredItemId, content, displayOrder, keepFile, pathToFile, null, null, apiToken);
+    }
+    static Response updateDataverseFeaturedItem(long featuredItemId,
+                                                String content,
+                                                int displayOrder,
+                                                boolean keepFile,
+                                                String pathToFile,
+                                                String type,
+                                                String dvObjectId,
+                                                String apiToken) {
+        RequestSpecification requestSpecification = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType(ContentType.MULTIPART)
+                .multiPart("displayOrder", displayOrder)
+                .multiPart("keepFile", keepFile);
+        if (content != null) {
+            requestSpecification.multiPart("content", content);
+        }
+        if (type != null) {
+            requestSpecification.multiPart("type", type);
+        }
+        if (dvObjectId != null) {
+            requestSpecification.multiPart("dvObjectIdentifier", dvObjectId);
+        }
+
+        if (pathToFile != null) {
+            requestSpecification.multiPart("file", new File(pathToFile));
+        }
+
+        return requestSpecification
+                .when()
+                .put("/api/dataverseFeaturedItems/" + featuredItemId);
+    }
+
+    static Response listDataverseFeaturedItems(String dataverseAlias, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/json")
+                .get("/api/dataverses/" + dataverseAlias + "/featuredItems");
+    }
+
+    static Response updateDataverseFeaturedItems(
+            String dataverseAlias,
+            List<Long> ids,
+            List<String> contents,
+            List<Integer> orders,
+            List<Boolean> keepFiles,
+            List<String> pathsToFiles,
+            String apiToken) {
+        return updateDataverseFeaturedItems(dataverseAlias, ids, contents, orders, keepFiles, pathsToFiles, Lists.emptyList(), Lists.emptyList(), apiToken);
+    }
+    static Response updateDataverseFeaturedItems(
+            String dataverseAlias,
+            List<Long> ids,
+            List<String> contents,
+            List<Integer> orders,
+            List<Boolean> keepFiles,
+            List<String> pathsToFiles,
+            List<String> dvTypes,
+            List<String> dvObjectIdentifiers,
+            String apiToken) {
+
+        RequestSpecification requestSpec = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType(ContentType.MULTIPART);
+
+        for (int i = 0; i < contents.size(); i++) {
+            requestSpec.multiPart("content", contents.get(i))
+                    .multiPart("displayOrder", orders.get(i))
+                    .multiPart("keepFile", keepFiles.get(i))
+                    .multiPart("id", ids.get(i));
+            if (dvTypes != null && !dvTypes.isEmpty()) {
+                requestSpec.multiPart("type", dvTypes.get(i));
+            }
+            if (dvObjectIdentifiers != null && !dvObjectIdentifiers.isEmpty()) {
+                requestSpec.multiPart("dvObjectIdentifier", dvObjectIdentifiers.get(i));
+            }
+
+            String pathToFile = pathsToFiles != null ? pathsToFiles.get(i) : null;
+            if (pathToFile != null && !pathToFile.isEmpty()) {
+                requestSpec.multiPart("fileName", Paths.get(pathToFile).getFileName().toString())
+                        .multiPart("file", new File(pathToFile));
+            } else {
+                requestSpec.multiPart("fileName", "");
+            }
+        }
+
+        return requestSpec.when().put("/api/dataverses/" + dataverseAlias + "/featuredItems");
+    }
+
+    static Response deleteDataverseFeaturedItems(String dataverseAlias, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/dataverses/" + dataverseAlias + "/featuredItems");
+    }
+
+    static Response getDataverseFeaturedItemImage(long featuredItemId, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/access/dataverseFeaturedItemImage/" + featuredItemId);
+    }
+
+    public static Response deleteDatasetFiles(String datasetId, JsonArray fileIds, String apiToken) {
+        String path = String.format("/api/datasets/%s/deleteFiles", datasetId);
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType(ContentType.JSON)
+                .body(fileIds.toString())
+                .put(path);
+    }
+  
+    public static Response updateDataverseInputLevelDisplayOnCreate(String dataverseAlias, String fieldTypeName, Boolean displayOnCreate, String apiToken) {
+        JsonArrayBuilder inputLevelsArrayBuilder = Json.createArrayBuilder();
+        JsonObjectBuilder inputLevel = Json.createObjectBuilder()
+                .add("datasetFieldTypeName", fieldTypeName)
+                .add("required", false)
+                .add("include", true);
+        if(displayOnCreate != null) {
+            inputLevel.add("displayOnCreate", displayOnCreate);
+        }
+        
+        inputLevelsArrayBuilder.add(inputLevel);
+        
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(inputLevelsArrayBuilder.build().toString())
+                .contentType(ContentType.JSON)
+                .put("/api/dataverses/" + dataverseAlias + "/inputLevels");
+     }
+    
+    public static Response updateDatasetFilesMetadata(String datasetIdOrPersistentId, JsonArray jsonArray,
+            String apiToken) {
+        String idInPath = datasetIdOrPersistentId; // Assume it's a number to start.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(datasetIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId;
+        }
+
+        return given().header(API_TOKEN_HTTP_HEADER, apiToken).contentType(ContentType.JSON).body(jsonArray.toString())
+                .post("/api/datasets/" + idInPath + "/files/metadata" + optionalQueryParam);
+    }
+
+    public static Response getCustomizationFile(String fileType) {
+        RequestSpecification requestSpec = given();
+
+        Response resp = requestSpec.contentType("text/html; charset=UTF-8")
+                .get("/api/info/settings/customization/" + fileType);
+
+        return resp;
+    }
+
+    static Response getUserSelectableRoles(String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/json")
+                .get("/api/roles/userSelectable");
+    }
+
+    public static Response searchLocalContexts(String datasetIdOrPersistentId, String apiToken) {
+        String idInPath = datasetIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(datasetIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId;
+        }
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/localcontexts/datasets/" + idInPath + optionalQueryParam);
+    }
+
+    public static Response getLocalContextsProject(String datasetIdOrPersistentId, String projectId, String apiToken) {
+        String idInPath = datasetIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isCreatable(datasetIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId;
+        }
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/localcontexts/datasets/" + idInPath + "/" +projectId + optionalQueryParam);
+    }
+
+    public static Response createTemplate(String dataverseAlias, String jsonString, String apiToken) {
+        return given()
+                .contentType(ContentType.JSON)
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonString)
+                .post("/api/dataverses/" + dataverseAlias + "/templates");
+    }
+
+    public static Response getTemplates(String dataverseAlias, String apiToken) {
+        return given()
+                .contentType(ContentType.JSON)
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/dataverses/" + dataverseAlias + "/templates");
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/ApiKeyAuthMechanismTest.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/ApiKeyAuthMechanismTest.java
new file mode 100644
index 00000000000..12216819cf8
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/ApiKeyAuthMechanismTest.java
@@ -0,0 +1,130 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.UserServiceBean;
+import edu.harvard.iq.dataverse.api.auth.doubles.ApiKeyContainerRequestTestFake;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+import static edu.harvard.iq.dataverse.api.auth.ApiKeyAuthMechanism.ACCESS_DATAFILE_PATH_PREFIX;
+import static edu.harvard.iq.dataverse.api.auth.ApiKeyAuthMechanism.RESPONSE_MESSAGE_BAD_API_KEY;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class ApiKeyAuthMechanismTest {
+
+    private static final String TEST_API_KEY = "test-api-key";
+    private static final String TEST_PATH = "/test/path/";
+
+    private ApiKeyAuthMechanism sut;
+
+    private final PrivateUrlUser testAnonymizedPrivateUrlUser = new PrivateUrlUser(1L, true);
+
+    @BeforeEach
+    public void setUp() {
+        sut = new ApiKeyAuthMechanism();
+    }
+
+    @Test
+    public void testFindUserFromRequest_ApiKeyNotProvided() throws WrappedAuthErrorResponse {
+        sut.privateUrlSvc = Mockito.mock(PrivateUrlServiceBean.class);
+        sut.authSvc = Mockito.mock(AuthenticationServiceBean.class);
+        sut.userSvc = Mockito.mock(UserServiceBean.class);
+
+        ContainerRequestContext testContainerRequest = new ApiKeyContainerRequestTestFake(null, TEST_PATH);
+        User actual = sut.findUserFromRequest(testContainerRequest);
+
+        assertNull(actual);
+    }
+
+    @Test
+    public void testFindUserFromRequest_ApiKeyProvided_NotAnonymizedPrivateUrlUserAuthenticated() throws WrappedAuthErrorResponse {
+        PrivateUrlServiceBean privateUrlServiceStub = Mockito.mock(PrivateUrlServiceBean.class);
+        PrivateUrlUser testPrivateUrlUser = new PrivateUrlUser(1L);
+        Mockito.when(privateUrlServiceStub.getPrivateUrlUserFromToken(TEST_API_KEY)).thenReturn(testPrivateUrlUser);
+        sut.privateUrlSvc = privateUrlServiceStub;
+
+        sut.authSvc = Mockito.mock(AuthenticationServiceBean.class);
+        sut.userSvc = Mockito.mock(UserServiceBean.class);
+
+        ContainerRequestContext testContainerRequest = new ApiKeyContainerRequestTestFake(TEST_API_KEY, TEST_PATH);
+        User actual = sut.findUserFromRequest(testContainerRequest);
+
+        assertEquals(testPrivateUrlUser, actual);
+    }
+
+    @Test
+    public void testFindUserFromRequest_ApiKeyProvided_AnonymizedPrivateUrlUserAuthenticated_AccessingAccessDatafilePath() throws WrappedAuthErrorResponse {
+        PrivateUrlServiceBean privateUrlServiceStub = Mockito.mock(PrivateUrlServiceBean.class);
+        Mockito.when(privateUrlServiceStub.getPrivateUrlUserFromToken(TEST_API_KEY)).thenReturn(testAnonymizedPrivateUrlUser);
+        sut.privateUrlSvc = privateUrlServiceStub;
+
+        sut.authSvc = Mockito.mock(AuthenticationServiceBean.class);
+        sut.userSvc = Mockito.mock(UserServiceBean.class);
+
+        ContainerRequestContext testContainerRequest = new ApiKeyContainerRequestTestFake(TEST_API_KEY, ACCESS_DATAFILE_PATH_PREFIX);
+        User actual = sut.findUserFromRequest(testContainerRequest);
+
+        assertEquals(testAnonymizedPrivateUrlUser, actual);
+    }
+
+    @Test
+    public void testFindUserFromRequest_ApiKeyProvided_AnonymizedPrivateUrlUserAuthenticated_NotAccessingAccessDatafilePath() {
+        PrivateUrlServiceBean privateUrlServiceStub = Mockito.mock(PrivateUrlServiceBean.class);
+        Mockito.when(privateUrlServiceStub.getPrivateUrlUserFromToken(TEST_API_KEY)).thenReturn(testAnonymizedPrivateUrlUser);
+        sut.privateUrlSvc = privateUrlServiceStub;
+
+        sut.authSvc = Mockito.mock(AuthenticationServiceBean.class);
+        sut.userSvc = Mockito.mock(UserServiceBean.class);
+
+        ContainerRequestContext testContainerRequest = new ApiKeyContainerRequestTestFake(TEST_API_KEY, TEST_PATH);
+        WrappedUnauthorizedAuthErrorResponse wrappedUnauthorizedAuthErrorResponse = assertThrows(WrappedUnauthorizedAuthErrorResponse.class, () -> sut.findUserFromRequest(testContainerRequest));
+
+        assertEquals(RESPONSE_MESSAGE_BAD_API_KEY, wrappedUnauthorizedAuthErrorResponse.getMessage());
+    }
+
+    @Test
+    public void testFindUserFromRequest_ApiKeyProvided_AuthenticatedUser() throws WrappedAuthErrorResponse {
+        PrivateUrlServiceBean privateUrlServiceStub = Mockito.mock(PrivateUrlServiceBean.class);
+        Mockito.when(privateUrlServiceStub.getPrivateUrlUserFromToken(TEST_API_KEY)).thenReturn(null);
+        sut.privateUrlSvc = privateUrlServiceStub;
+
+        AuthenticationServiceBean authenticationServiceBeanStub = Mockito.mock(AuthenticationServiceBean.class);
+        AuthenticatedUser testAuthenticatedUser = new AuthenticatedUser();
+        Mockito.when(authenticationServiceBeanStub.lookupUser(TEST_API_KEY)).thenReturn(testAuthenticatedUser);
+        sut.authSvc = authenticationServiceBeanStub;
+
+        UserServiceBean userServiceBeanStub = Mockito.mock(UserServiceBean.class);
+        Mockito.when(userServiceBeanStub.updateLastApiUseTime(testAuthenticatedUser)).thenReturn(testAuthenticatedUser);
+        sut.userSvc = userServiceBeanStub;
+
+        ContainerRequestContext testContainerRequest = new ApiKeyContainerRequestTestFake(TEST_API_KEY, TEST_PATH);
+        User actual = sut.findUserFromRequest(testContainerRequest);
+
+        assertEquals(testAuthenticatedUser, actual);
+    }
+
+    @Test
+    public void testFindUserFromRequest_ApiKeyProvided_CanNotAuthenticateUserWithAnyMethod() {
+        PrivateUrlServiceBean privateUrlServiceStub = Mockito.mock(PrivateUrlServiceBean.class);
+        Mockito.when(privateUrlServiceStub.getPrivateUrlUserFromToken(TEST_API_KEY)).thenReturn(null);
+        sut.privateUrlSvc = privateUrlServiceStub;
+
+        AuthenticationServiceBean authenticationServiceBeanStub = Mockito.mock(AuthenticationServiceBean.class);
+        Mockito.when(authenticationServiceBeanStub.lookupUser(TEST_API_KEY)).thenReturn(null);
+        sut.authSvc = authenticationServiceBeanStub;
+
+        sut.userSvc = Mockito.mock(UserServiceBean.class);
+
+        ContainerRequestContext testContainerRequest = new ApiKeyContainerRequestTestFake(TEST_API_KEY, TEST_PATH);
+        WrappedUnauthorizedAuthErrorResponse wrappedUnauthorizedAuthErrorResponse = assertThrows(WrappedUnauthorizedAuthErrorResponse.class, () -> sut.findUserFromRequest(testContainerRequest));
+
+        assertEquals(RESPONSE_MESSAGE_BAD_API_KEY, wrappedUnauthorizedAuthErrorResponse.getMessage());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/BearerTokenAuthMechanismTest.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/BearerTokenAuthMechanismTest.java
new file mode 100644
index 00000000000..ab4090eb0a0
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/BearerTokenAuthMechanismTest.java
@@ -0,0 +1,83 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.UserServiceBean;
+import edu.harvard.iq.dataverse.api.auth.doubles.BearerTokenKeyContainerRequestTestFake;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationException;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@LocalJvmSettings
+@JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth")
+class BearerTokenAuthMechanismTest {
+
+    private static final String TEST_BEARER_TOKEN = "Bearer test";
+
+    private BearerTokenAuthMechanism sut;
+
+    @BeforeEach
+    public void setUp() {
+        sut = new BearerTokenAuthMechanism();
+        sut.authSvc = Mockito.mock(AuthenticationServiceBean.class);
+        sut.userSvc = Mockito.mock(UserServiceBean.class);
+    }
+
+    @Test
+    void testFindUserFromRequest_no_token() throws WrappedAuthErrorResponse {
+        ContainerRequestContext testContainerRequest = new BearerTokenKeyContainerRequestTestFake(null);
+        User actual = sut.findUserFromRequest(testContainerRequest);
+
+        assertNull(actual);
+    }
+
+    @Test
+    void testFindUserFromRequest_invalid_token() throws AuthorizationException {
+        String testErrorMessage = "test error";
+        Mockito.when(sut.authSvc.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN)).thenThrow(new AuthorizationException(testErrorMessage));
+
+        // when
+        ContainerRequestContext testContainerRequest = new BearerTokenKeyContainerRequestTestFake(TEST_BEARER_TOKEN);
+        WrappedUnauthorizedAuthErrorResponse wrappedUnauthorizedAuthErrorResponse = assertThrows(WrappedUnauthorizedAuthErrorResponse.class, () -> sut.findUserFromRequest(testContainerRequest));
+
+        //then
+        assertEquals(testErrorMessage, wrappedUnauthorizedAuthErrorResponse.getMessage());
+    }
+
+    @Test
+    void testFindUserFromRequest_validToken_accountExists() throws WrappedAuthErrorResponse, AuthorizationException {
+        AuthenticatedUser testAuthenticatedUser = new AuthenticatedUser();
+        Mockito.when(sut.authSvc.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN)).thenReturn(testAuthenticatedUser);
+        Mockito.when(sut.userSvc.updateLastApiUseTime(testAuthenticatedUser)).thenReturn(testAuthenticatedUser);
+
+        // when
+        ContainerRequestContext testContainerRequest = new BearerTokenKeyContainerRequestTestFake(TEST_BEARER_TOKEN);
+        User actual = sut.findUserFromRequest(testContainerRequest);
+
+        //then
+        assertEquals(testAuthenticatedUser, actual);
+        Mockito.verify(sut.userSvc, Mockito.atLeastOnce()).updateLastApiUseTime(testAuthenticatedUser);
+    }
+
+    @Test
+    void testFindUserFromRequest_validToken_noAccount() throws AuthorizationException {
+        Mockito.when(sut.authSvc.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN)).thenReturn(null);
+
+        // when
+        ContainerRequestContext testContainerRequest = new BearerTokenKeyContainerRequestTestFake(TEST_BEARER_TOKEN);
+        WrappedForbiddenAuthErrorResponse wrappedForbiddenAuthErrorResponse = assertThrows(WrappedForbiddenAuthErrorResponse.class, () -> sut.findUserFromRequest(testContainerRequest));
+
+        //then
+        assertEquals(BundleUtil.getStringFromBundle("bearerTokenAuthMechanism.errors.tokenValidatedButNoRegisteredUser"), wrappedForbiddenAuthErrorResponse.getMessage());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/CompoundAuthMechanismTest.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/CompoundAuthMechanismTest.java
new file mode 100644
index 00000000000..b3435d53ca2
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/CompoundAuthMechanismTest.java
@@ -0,0 +1,49 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.api.auth.doubles.ContainerRequestTestFake;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+
+public class CompoundAuthMechanismTest {
+
+    @Test
+    public void testFindUserFromRequest_CanNotAuthenticateUserWithAnyMechanism() throws WrappedAuthErrorResponse {
+        AuthMechanism authMechanismStub1 = Mockito.mock(AuthMechanism.class);
+        Mockito.when(authMechanismStub1.findUserFromRequest(any(ContainerRequestContext.class))).thenReturn(null);
+
+        AuthMechanism authMechanismStub2 = Mockito.mock(AuthMechanism.class);
+        Mockito.when(authMechanismStub2.findUserFromRequest(any(ContainerRequestContext.class))).thenReturn(null);
+
+        CompoundAuthMechanism sut = new CompoundAuthMechanism(authMechanismStub1, authMechanismStub2);
+
+        User actual = sut.findUserFromRequest(new ContainerRequestTestFake());
+
+        assertThat(actual, equalTo(GuestUser.get()));
+    }
+
+    @Test
+    public void testFindUserFromRequest_UserAuthenticated() throws WrappedAuthErrorResponse {
+        AuthMechanism authMechanismStub1 = Mockito.mock(AuthMechanism.class);
+        AuthenticatedUser testAuthenticatedUser = new AuthenticatedUser();
+        Mockito.when(authMechanismStub1.findUserFromRequest(any(ContainerRequestContext.class))).thenReturn(testAuthenticatedUser);
+
+        AuthMechanism authMechanismStub2 = Mockito.mock(AuthMechanism.class);
+        Mockito.when(authMechanismStub2.findUserFromRequest(any(ContainerRequestContext.class))).thenReturn(null);
+
+        CompoundAuthMechanism sut = new CompoundAuthMechanism(authMechanismStub1, authMechanismStub2);
+
+        User actual = sut.findUserFromRequest(new ContainerRequestTestFake());
+
+        assertEquals(actual, testAuthenticatedUser);
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/SessionCookieAuthMechanismTest.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/SessionCookieAuthMechanismTest.java
new file mode 100644
index 00000000000..74a7d239c05
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/SessionCookieAuthMechanismTest.java
@@ -0,0 +1,49 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.DataverseSession;
+import edu.harvard.iq.dataverse.api.auth.doubles.ContainerRequestTestFake;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@LocalJvmSettings
+class SessionCookieAuthMechanismTest {
+
+    private SessionCookieAuthMechanism sut;
+
+    @BeforeEach
+    public void setUp() {
+        sut = new SessionCookieAuthMechanism();
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "false", varArgs = "api-session-auth")
+    void testFindUserFromRequest_FeatureFlagDisabled() throws WrappedAuthErrorResponse {
+        sut.session = Mockito.mock(DataverseSession.class);
+
+        User actual = sut.findUserFromRequest(new ContainerRequestTestFake());
+
+        assertNull(actual);
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-session-auth")
+    void testFindUserFromRequest_FeatureFlagEnabled_UserAuthenticated() throws WrappedAuthErrorResponse {
+        DataverseSession dataverseSessionStub = Mockito.mock(DataverseSession.class);
+        User testAuthenticatedUser = new AuthenticatedUser();
+        Mockito.when(dataverseSessionStub.getUser()).thenReturn(testAuthenticatedUser);
+        sut.session = dataverseSessionStub;
+
+        User actual = sut.findUserFromRequest(new ContainerRequestTestFake());
+
+        assertEquals(testAuthenticatedUser, actual);
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/SignedUrlAuthMechanismTest.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/SignedUrlAuthMechanismTest.java
new file mode 100644
index 00000000000..6fd7d2e1d8e
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/SignedUrlAuthMechanismTest.java
@@ -0,0 +1,99 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.api.auth.doubles.SignedUrlContainerRequestTestFake;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+import static edu.harvard.iq.dataverse.api.auth.SignedUrlAuthMechanism.RESPONSE_MESSAGE_BAD_SIGNED_URL;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class SignedUrlAuthMechanismTest {
+
+    private static final String TEST_SIGNED_URL_TOKEN = "test-signed-url-token";
+    private static final String TEST_SIGNED_URL_USER_ID = "test-user";
+
+    private SignedUrlAuthMechanism sut;
+
+    private final AuthenticatedUser testAuthenticatedUser = new AuthenticatedUser();
+
+    @BeforeEach
+    public void setUp() {
+        sut = new SignedUrlAuthMechanism();
+    }
+
+    @Test
+    public void testFindUserFromRequest_SignedUrlTokenNotProvided() throws WrappedAuthErrorResponse {
+        sut.authSvc = Mockito.mock(AuthenticationServiceBean.class);
+
+        ContainerRequestContext testContainerRequest = new SignedUrlContainerRequestTestFake(null, null);
+        User actual = sut.findUserFromRequest(testContainerRequest);
+
+        assertNull(actual);
+    }
+
+    @Test
+    public void testFindUserFromRequest_SignedUrlTokenProvided_UserExists_ValidSignedUrl_UserAuthenticated() throws WrappedAuthErrorResponse {
+        AuthenticationServiceBean authenticationServiceBeanStub = Mockito.mock(AuthenticationServiceBean.class);
+        Mockito.when(authenticationServiceBeanStub.getAuthenticatedUser(TEST_SIGNED_URL_USER_ID)).thenReturn(testAuthenticatedUser);
+        ApiToken apiTokenStub = Mockito.mock(ApiToken.class);
+        Mockito.when(apiTokenStub.getTokenString()).thenReturn(TEST_SIGNED_URL_TOKEN);
+        Mockito.when(authenticationServiceBeanStub.findApiTokenByUser(testAuthenticatedUser)).thenReturn(apiTokenStub);
+
+        sut.authSvc = authenticationServiceBeanStub;
+
+        ContainerRequestContext testContainerRequest = new SignedUrlContainerRequestTestFake(TEST_SIGNED_URL_TOKEN, TEST_SIGNED_URL_USER_ID);
+        User actual = sut.findUserFromRequest(testContainerRequest);
+
+        assertEquals(testAuthenticatedUser, actual);
+    }
+
+    @Test
+    public void testFindUserFromRequest_SignedUrlTokenProvided_UserExists_InvalidSignedUrl_UserNotAuthenticated() {
+        AuthenticationServiceBean authenticationServiceBeanStub = Mockito.mock(AuthenticationServiceBean.class);
+        Mockito.when(authenticationServiceBeanStub.getAuthenticatedUser(TEST_SIGNED_URL_USER_ID)).thenReturn(testAuthenticatedUser);
+        ApiToken apiTokenStub = Mockito.mock(ApiToken.class);
+        Mockito.when(apiTokenStub.getTokenString()).thenReturn("different-token-from-the-signed-url");
+        Mockito.when(authenticationServiceBeanStub.findApiTokenByUser(testAuthenticatedUser)).thenReturn(apiTokenStub);
+
+        sut.authSvc = authenticationServiceBeanStub;
+
+        ContainerRequestContext testContainerRequest = new SignedUrlContainerRequestTestFake(TEST_SIGNED_URL_TOKEN, TEST_SIGNED_URL_USER_ID);
+        WrappedUnauthorizedAuthErrorResponse wrappedUnauthorizedAuthErrorResponse = assertThrows(WrappedUnauthorizedAuthErrorResponse.class, () -> sut.findUserFromRequest(testContainerRequest));
+
+        assertEquals(RESPONSE_MESSAGE_BAD_SIGNED_URL, wrappedUnauthorizedAuthErrorResponse.getMessage());
+    }
+
+    @Test
+    public void testFindUserFromRequest_SignedUrlTokenProvided_UserExists_UserApiTokenDoesNotExist_UserNotAuthenticated() {
+        AuthenticationServiceBean authenticationServiceBeanStub = Mockito.mock(AuthenticationServiceBean.class);
+        Mockito.when(authenticationServiceBeanStub.getAuthenticatedUser(TEST_SIGNED_URL_USER_ID)).thenReturn(testAuthenticatedUser);
+        Mockito.when(authenticationServiceBeanStub.findApiTokenByUser(testAuthenticatedUser)).thenReturn(null);
+
+        sut.authSvc = authenticationServiceBeanStub;
+
+        ContainerRequestContext testContainerRequest = new SignedUrlContainerRequestTestFake(TEST_SIGNED_URL_TOKEN, TEST_SIGNED_URL_USER_ID);
+        WrappedUnauthorizedAuthErrorResponse wrappedUnauthorizedAuthErrorResponse = assertThrows(WrappedUnauthorizedAuthErrorResponse.class, () -> sut.findUserFromRequest(testContainerRequest));
+
+        assertEquals(RESPONSE_MESSAGE_BAD_SIGNED_URL, wrappedUnauthorizedAuthErrorResponse.getMessage());
+    }
+
+    @Test
+    public void testFindUserFromRequest_SignedUrlTokenProvided_UserDoesNotExistForTheGivenId_UserNotAuthenticated() {
+        AuthenticationServiceBean authenticationServiceBeanStub = Mockito.mock(AuthenticationServiceBean.class);
+        Mockito.when(authenticationServiceBeanStub.getAuthenticatedUser(TEST_SIGNED_URL_USER_ID)).thenReturn(null);
+
+        sut.authSvc = authenticationServiceBeanStub;
+
+        ContainerRequestContext testContainerRequest = new SignedUrlContainerRequestTestFake(TEST_SIGNED_URL_TOKEN, TEST_SIGNED_URL_USER_ID);
+        WrappedUnauthorizedAuthErrorResponse wrappedUnauthorizedAuthErrorResponse = assertThrows(WrappedUnauthorizedAuthErrorResponse.class, () -> sut.findUserFromRequest(testContainerRequest));
+
+        assertEquals(RESPONSE_MESSAGE_BAD_SIGNED_URL, wrappedUnauthorizedAuthErrorResponse.getMessage());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/WorkflowKeyAuthMechanismTest.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/WorkflowKeyAuthMechanismTest.java
new file mode 100644
index 00000000000..22c3abffe2b
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/WorkflowKeyAuthMechanismTest.java
@@ -0,0 +1,61 @@
+package edu.harvard.iq.dataverse.api.auth;
+
+import edu.harvard.iq.dataverse.api.auth.doubles.WorkflowKeyContainerRequestTestFake;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+
+import static edu.harvard.iq.dataverse.api.auth.WorkflowKeyAuthMechanism.RESPONSE_MESSAGE_BAD_WORKFLOW_KEY;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class WorkflowKeyAuthMechanismTest {
+
+    private static final String TEST_WORKFLOW_KEY = "test-workflow-key";
+
+    private WorkflowKeyAuthMechanism sut;
+
+    @BeforeEach
+    public void setUp() {
+        sut = new WorkflowKeyAuthMechanism();
+    }
+
+    @Test
+    public void testFindUserFromRequest_WorkflowKeyNotProvided() throws WrappedAuthErrorResponse {
+        sut.authSvc = Mockito.mock(AuthenticationServiceBean.class);
+
+        ContainerRequestContext testContainerRequest = new WorkflowKeyContainerRequestTestFake(null);
+        User actual = sut.findUserFromRequest(testContainerRequest);
+
+        assertNull(actual);
+    }
+
+    @Test
+    public void testFindUserFromRequest_WorkflowKeyProvided_UserAuthenticated() throws WrappedAuthErrorResponse {
+        AuthenticationServiceBean authenticationServiceBeanStub = Mockito.mock(AuthenticationServiceBean.class);
+        AuthenticatedUser testAuthenticatedUser = new AuthenticatedUser();
+        Mockito.when(authenticationServiceBeanStub.lookupUserForWorkflowInvocationID(TEST_WORKFLOW_KEY)).thenReturn(testAuthenticatedUser);
+        sut.authSvc = authenticationServiceBeanStub;
+
+        ContainerRequestContext testContainerRequest = new WorkflowKeyContainerRequestTestFake(TEST_WORKFLOW_KEY);
+        User actual = sut.findUserFromRequest(testContainerRequest);
+
+        assertEquals(testAuthenticatedUser, actual);
+    }
+
+    @Test
+    public void testFindUserFromRequest_WorkflowKeyProvided_UserNotAuthenticated() {
+        AuthenticationServiceBean authenticationServiceBeanStub = Mockito.mock(AuthenticationServiceBean.class);
+        Mockito.when(authenticationServiceBeanStub.lookupUserForWorkflowInvocationID(TEST_WORKFLOW_KEY)).thenReturn(null);
+        sut.authSvc = authenticationServiceBeanStub;
+
+        ContainerRequestContext testContainerRequest = new WorkflowKeyContainerRequestTestFake(TEST_WORKFLOW_KEY);
+        WrappedUnauthorizedAuthErrorResponse wrappedUnauthorizedAuthErrorResponse = assertThrows(WrappedUnauthorizedAuthErrorResponse.class, () -> sut.findUserFromRequest(testContainerRequest));
+
+        assertEquals(RESPONSE_MESSAGE_BAD_WORKFLOW_KEY, wrappedUnauthorizedAuthErrorResponse.getMessage());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/ApiKeyContainerRequestTestFake.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/ApiKeyContainerRequestTestFake.java
new file mode 100644
index 00000000000..3afa1a06be3
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/ApiKeyContainerRequestTestFake.java
@@ -0,0 +1,29 @@
+package edu.harvard.iq.dataverse.api.auth.doubles;
+
+import jakarta.ws.rs.core.UriInfo;
+
+import static edu.harvard.iq.dataverse.api.auth.ApiKeyAuthMechanism.DATAVERSE_API_KEY_REQUEST_HEADER_NAME;
+
+public class ApiKeyContainerRequestTestFake extends ContainerRequestTestFake {
+
+    private final String apiKey;
+    private final UriInfo uriInfo;
+
+    public ApiKeyContainerRequestTestFake(String apiKey, String path) {
+        this.apiKey = apiKey;
+        this.uriInfo = new ApiKeyUriInfoTestFake(apiKey, path);
+    }
+
+    @Override
+    public UriInfo getUriInfo() {
+        return uriInfo;
+    }
+
+    @Override
+    public String getHeaderString(String s) {
+        if (s.equals(DATAVERSE_API_KEY_REQUEST_HEADER_NAME)) {
+            return this.apiKey;
+        }
+        return null;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/ApiKeyUriInfoTestFake.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/ApiKeyUriInfoTestFake.java
new file mode 100644
index 00000000000..495d3810adb
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/ApiKeyUriInfoTestFake.java
@@ -0,0 +1,29 @@
+package edu.harvard.iq.dataverse.api.auth.doubles;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+
+import static edu.harvard.iq.dataverse.api.auth.ApiKeyAuthMechanism.DATAVERSE_API_KEY_REQUEST_PARAM_NAME;
+
+public class ApiKeyUriInfoTestFake extends UriInfoTestFake {
+
+    private final String apiKey;
+    private final String path;
+
+    public ApiKeyUriInfoTestFake(String apiKey, String path) {
+        this.apiKey = apiKey;
+        this.path = path;
+    }
+
+    @Override
+    public String getPath() {
+        return path;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getQueryParameters() {
+        MultivaluedMap<String, String> queryParameters = new MultivaluedHashMap<>();
+        queryParameters.add(DATAVERSE_API_KEY_REQUEST_PARAM_NAME, apiKey);
+        return queryParameters;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/BearerTokenKeyContainerRequestTestFake.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/BearerTokenKeyContainerRequestTestFake.java
new file mode 100644
index 00000000000..04a66e851c5
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/BearerTokenKeyContainerRequestTestFake.java
@@ -0,0 +1,20 @@
+package edu.harvard.iq.dataverse.api.auth.doubles;
+
+import jakarta.ws.rs.core.HttpHeaders;
+
+public class BearerTokenKeyContainerRequestTestFake extends ContainerRequestTestFake {
+
+    private final String apiKey;
+
+    public BearerTokenKeyContainerRequestTestFake(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    @Override
+    public String getHeaderString(String s) {
+        if (s.equals(HttpHeaders.AUTHORIZATION)) {
+            return this.apiKey;
+        }
+        return null;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/ContainerRequestTestFake.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/ContainerRequestTestFake.java
new file mode 100644
index 00000000000..74f2e9dbb41
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/ContainerRequestTestFake.java
@@ -0,0 +1,135 @@
+package edu.harvard.iq.dataverse.api.auth.doubles;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.*;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.*;
+
+public class ContainerRequestTestFake implements ContainerRequestContext {
+
+    @Override
+    public Object getProperty(String s) {
+        return null;
+    }
+
+    @Override
+    public Collection<String> getPropertyNames() {
+        return null;
+    }
+
+    @Override
+    public void setProperty(String s, Object o) {
+
+    }
+
+    @Override
+    public void removeProperty(String s) {
+
+    }
+
+    @Override
+    public UriInfo getUriInfo() {
+        return null;
+    }
+
+    @Override
+    public void setRequestUri(URI uri) {
+
+    }
+
+    @Override
+    public void setRequestUri(URI uri, URI uri1) {
+
+    }
+
+    @Override
+    public Request getRequest() {
+        return null;
+    }
+
+    @Override
+    public String getMethod() {
+        return null;
+    }
+
+    @Override
+    public void setMethod(String s) {
+
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getHeaders() {
+        return null;
+    }
+
+    @Override
+    public String getHeaderString(String s) {
+        return null;
+    }
+
+    @Override
+    public Date getDate() {
+        return null;
+    }
+
+    @Override
+    public Locale getLanguage() {
+        return null;
+    }
+
+    @Override
+    public int getLength() {
+        return 0;
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        return null;
+    }
+
+    @Override
+    public List<MediaType> getAcceptableMediaTypes() {
+        return null;
+    }
+
+    @Override
+    public List<Locale> getAcceptableLanguages() {
+        return null;
+    }
+
+    @Override
+    public Map<String, Cookie> getCookies() {
+        return null;
+    }
+
+    @Override
+    public boolean hasEntity() {
+        return false;
+    }
+
+    @Override
+    public InputStream getEntityStream() {
+        return null;
+    }
+
+    @Override
+    public void setEntityStream(InputStream inputStream) {
+
+    }
+
+    @Override
+    public SecurityContext getSecurityContext() {
+        return null;
+    }
+
+    @Override
+    public void setSecurityContext(SecurityContext securityContext) {
+
+    }
+
+    @Override
+    public void abortWith(Response response) {
+
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/SignedUrlContainerRequestTestFake.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/SignedUrlContainerRequestTestFake.java
new file mode 100644
index 00000000000..df37f6723d3
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/SignedUrlContainerRequestTestFake.java
@@ -0,0 +1,16 @@
+package edu.harvard.iq.dataverse.api.auth.doubles;
+
+import jakarta.ws.rs.core.UriInfo;
+
+public class SignedUrlContainerRequestTestFake extends ContainerRequestTestFake {
+    private final UriInfo uriInfo;
+
+    public SignedUrlContainerRequestTestFake(String signedUrlToken, String signedUrlUserId) {
+        this.uriInfo = new SignedUrlUriInfoTestFake(signedUrlToken, signedUrlUserId);
+    }
+
+    @Override
+    public UriInfo getUriInfo() {
+        return uriInfo;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/SignedUrlUriInfoTestFake.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/SignedUrlUriInfoTestFake.java
new file mode 100644
index 00000000000..fa9da7fc8de
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/SignedUrlUriInfoTestFake.java
@@ -0,0 +1,40 @@
+package edu.harvard.iq.dataverse.api.auth.doubles;
+
+import edu.harvard.iq.dataverse.util.UrlSignerUtil;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+
+import java.net.URI;
+
+import static edu.harvard.iq.dataverse.util.UrlSignerUtil.SIGNED_URL_TOKEN;
+import static edu.harvard.iq.dataverse.util.UrlSignerUtil.SIGNED_URL_USER;
+import static jakarta.ws.rs.HttpMethod.GET;
+
+public class SignedUrlUriInfoTestFake extends UriInfoTestFake {
+
+    private final String signedUrlToken;
+    private final String signedUrlUserId;
+
+    private static final String SIGNED_URL_BASE_URL = "http://localhost:8080/api/test1";
+    private static final Integer SIGNED_URL_TIMEOUT = 1000;
+
+
+    public SignedUrlUriInfoTestFake(String signedUrlToken, String signedUrlUserId) {
+        this.signedUrlToken = signedUrlToken;
+        this.signedUrlUserId = signedUrlUserId;
+    }
+
+    @Override
+    public URI getRequestUri() {
+        return URI.create(UrlSignerUtil.signUrl(SIGNED_URL_BASE_URL, SIGNED_URL_TIMEOUT, signedUrlUserId, GET, signedUrlToken));
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getQueryParameters() {
+        MultivaluedMap<String, String> queryParameters = new MultivaluedHashMap<>();
+        queryParameters.add(SIGNED_URL_TOKEN, signedUrlToken);
+        queryParameters.add(SIGNED_URL_USER, signedUrlUserId);
+        return queryParameters;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/UriInfoTestFake.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/UriInfoTestFake.java
new file mode 100644
index 00000000000..51d20083ec8
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/UriInfoTestFake.java
@@ -0,0 +1,106 @@
+package edu.harvard.iq.dataverse.api.auth.doubles;
+
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+import java.net.URI;
+import java.util.List;
+
+public class UriInfoTestFake implements UriInfo {
+
+    @Override
+    public String getPath() {
+        return null;
+    }
+
+    @Override
+    public String getPath(boolean b) {
+        return null;
+    }
+
+    @Override
+    public List<PathSegment> getPathSegments() {
+        return null;
+    }
+
+    @Override
+    public List<PathSegment> getPathSegments(boolean b) {
+        return null;
+    }
+
+    @Override
+    public URI getRequestUri() {
+        return null;
+    }
+
+    @Override
+    public UriBuilder getRequestUriBuilder() {
+        return null;
+    }
+
+    @Override
+    public URI getAbsolutePath() {
+        return null;
+    }
+
+    @Override
+    public UriBuilder getAbsolutePathBuilder() {
+        return null;
+    }
+
+    @Override
+    public URI getBaseUri() {
+        return null;
+    }
+
+    @Override
+    public UriBuilder getBaseUriBuilder() {
+        return null;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getPathParameters() {
+        return null;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getPathParameters(boolean b) {
+        return null;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getQueryParameters() {
+        return null;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getQueryParameters(boolean b) {
+        return null;
+    }
+
+    @Override
+    public List<String> getMatchedURIs() {
+        return null;
+    }
+
+    @Override
+    public List<String> getMatchedURIs(boolean b) {
+        return null;
+    }
+
+    @Override
+    public List<Object> getMatchedResources() {
+        return null;
+    }
+
+    @Override
+    public URI resolve(URI uri) {
+        return null;
+    }
+
+    @Override
+    public URI relativize(URI uri) {
+        return null;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/WorkflowKeyContainerRequestTestFake.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/WorkflowKeyContainerRequestTestFake.java
new file mode 100644
index 00000000000..2679ab1cc1d
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/WorkflowKeyContainerRequestTestFake.java
@@ -0,0 +1,29 @@
+package edu.harvard.iq.dataverse.api.auth.doubles;
+
+import jakarta.ws.rs.core.UriInfo;
+
+import static edu.harvard.iq.dataverse.api.auth.WorkflowKeyAuthMechanism.DATAVERSE_WORKFLOW_KEY_REQUEST_HEADER_NAME;
+
+public class WorkflowKeyContainerRequestTestFake extends ContainerRequestTestFake {
+
+    private final String workflowKey;
+    private final UriInfo uriInfo;
+
+    public WorkflowKeyContainerRequestTestFake(String workflowKey) {
+        this.workflowKey = workflowKey;
+        this.uriInfo = new WorkflowKeyUriInfoTestFake(workflowKey);
+    }
+
+    @Override
+    public UriInfo getUriInfo() {
+        return uriInfo;
+    }
+
+    @Override
+    public String getHeaderString(String s) {
+        if (s.equals(DATAVERSE_WORKFLOW_KEY_REQUEST_HEADER_NAME)) {
+            return this.workflowKey;
+        }
+        return null;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/WorkflowKeyUriInfoTestFake.java b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/WorkflowKeyUriInfoTestFake.java
new file mode 100644
index 00000000000..7bfd4326417
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/auth/doubles/WorkflowKeyUriInfoTestFake.java
@@ -0,0 +1,22 @@
+package edu.harvard.iq.dataverse.api.auth.doubles;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+
+import static edu.harvard.iq.dataverse.api.auth.WorkflowKeyAuthMechanism.DATAVERSE_WORKFLOW_KEY_REQUEST_PARAM_NAME;
+
+public class WorkflowKeyUriInfoTestFake extends UriInfoTestFake {
+
+    private final String workflowKey;
+
+    public WorkflowKeyUriInfoTestFake(String workflowKey) {
+        this.workflowKey = workflowKey;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getQueryParameters() {
+        MultivaluedMap<String, String> queryParameters = new MultivaluedHashMap<>();
+        queryParameters.add(DATAVERSE_WORKFLOW_KEY_REQUEST_PARAM_NAME, workflowKey);
+        return queryParameters;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/dto/FieldDTOTest.java b/src/test/java/edu/harvard/iq/dataverse/api/dto/FieldDTOTest.java
index 45f0ef52b33..0202f11d469 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/dto/FieldDTOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/dto/FieldDTOTest.java
@@ -11,12 +11,12 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import junit.framework.Assert;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
@@ -27,15 +27,15 @@ public class FieldDTOTest {
     public FieldDTOTest() {
     }
     
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
     
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
     
-    @Before
+    @BeforeEach
     public void setUp() {
        
         Set<FieldDTO> authorFields = new HashSet<>();
@@ -49,7 +49,7 @@ public void setUp() {
         
     }
     
-    @After
+    @AfterEach
     public void tearDown() {
     }
 
@@ -60,7 +60,7 @@ public void tearDown() {
     public void testSinglePrimitive() {
         FieldDTO affil = FieldDTO.createPrimitiveFieldDTO("authorAffiliation", "Top");
         System.out.println(affil.getSinglePrimitive());
-        Assert.assertEquals("Top", affil.getSinglePrimitive());
+        assertEquals("Top", affil.getSinglePrimitive());
         
     }
 
@@ -78,10 +78,10 @@ public void testMultipleVocab() {
         value.add("EventList");
         astroType.setMultipleVocab(value);
         
-        Assert.assertEquals(value, astroType.getMultipleVocab());
+        assertEquals(value, astroType.getMultipleVocab());
         String jsonStr = gson.toJson(astroType);
         FieldDTO astroType2 = gson.fromJson(jsonStr, FieldDTO.class);
-        Assert.assertEquals(astroType, astroType2);
+        assertEquals(astroType, astroType2);
         
     }
 
@@ -116,7 +116,7 @@ public void testSetMultipleCompound() {
         compoundField.setTypeName("author");
         compoundField.setMultipleCompound(authorList);
         
-        Assert.assertEquals(compoundField.getMultipleCompound(), authorList);
+        assertEquals(compoundField.getMultipleCompound(), authorList);
     }
 
     /**
@@ -132,8 +132,8 @@ public void testSetSingleCompound() {
         
         FieldDTO compoundField = new FieldDTO();
         compoundField.setSingleCompound(authorFields.toArray(new FieldDTO[]{}));
-        Set<FieldDTO>  returned = compoundField.getSingleCompound();   
-        Assert.assertTrue(returned.equals(authorFields));
+        Set<FieldDTO>  returned = compoundField.getSingleCompound();
+        assertEquals(returned, authorFields);
        
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/filesystem/FileRecordJobIT.java b/src/test/java/edu/harvard/iq/dataverse/api/filesystem/FileRecordJobIT.java
index 7b9f7d5c155..3257204f460 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/filesystem/FileRecordJobIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/filesystem/FileRecordJobIT.java
@@ -20,24 +20,25 @@
 */
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
 import edu.harvard.iq.dataverse.api.UtilIT;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.batch.entities.JobExecutionEntity;
 import edu.harvard.iq.dataverse.batch.entities.StepExecutionEntity;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.Ignore;
-
-import javax.batch.runtime.BatchStatus;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import jakarta.batch.runtime.BatchStatus;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
@@ -55,11 +56,11 @@
 import java.util.Random;
 import java.util.UUID;
 
-import static com.jayway.restassured.RestAssured.given;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Batch File System Import Job Integration Tests
@@ -92,7 +93,7 @@ public class FileRecordJobIT {
     private static final String API_TOKEN_HTTP_HEADER = "X-Dataverse-key";
     private static final String BUILTIN_USER_KEY = "burrito";
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws Exception {
 
         // this allows for testing on dataverse staging servers via jvm setting
@@ -122,7 +123,7 @@ public static void setUpClass() throws Exception {
         }
     }
 
-    @Before
+    @BeforeEach
     public void setUpDataverse() {
 
         try {
@@ -189,12 +190,12 @@ public void setUpDataverse() {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
         RestAssured.reset();
     }
 
-    @After
+    @AfterEach
     public void tearDownDataverse() {
         try {
 
@@ -231,7 +232,7 @@ public void tearDownDataverse() {
      * Ignores failed checksum manifest import.
      */
     @Test
-    @Ignore
+    @Disabled
     public void testSameFileInDifferentDirectories() {
 
         try {
@@ -310,7 +311,7 @@ public void testSameFileInDifferentDirectories() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testNewEditor() {
 
         try {
@@ -414,7 +415,7 @@ public void testNewEditor() {
      * Ignores failed checksum manifest import.
      */
     @Test
-    @Ignore
+    @Disabled
     public void testSameFileInDifferentDirectoriesUnauthorizedUser() {
 
         try {
@@ -613,7 +614,7 @@ public void testSameFileInDifferentDirectoriesUnauthorizedUser() {
 //    }
 
     @Test
-    @Ignore
+    @Disabled
     /**
      * Add a file in MERGE mode (default), should only need to commit the new file
      */
@@ -758,7 +759,7 @@ public void testAddingFilesInMergeMode() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     /**
      * The success case: all files uploaded and present in checksum manifest
      */
@@ -827,7 +828,7 @@ public void testFilesWithChecksumManifest() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     /**
      * No checksum manifest found
      */
@@ -881,7 +882,7 @@ public void testFilesWithoutChecksumManifest() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     /**
      * Checksum manifest is missing an uploaded file
      */
@@ -948,7 +949,7 @@ public void testFileMissingInChecksumManifest() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     /**
      * Checksum manifest references a file that isn't present, it should return failed status and detailed 
      * message in persistentUserData
@@ -1020,7 +1021,7 @@ public void testFileInChecksumManifestDoesntExist() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     /**
      * Published datasets should not allow import jobs for now since it isn't in DRAFT mode
      */
@@ -1102,7 +1103,7 @@ public void testPublishedDataset() {
 //    }
 
     @Test
-    @Ignore
+    @Disabled
     /**
      * No dataset found responses (bad dataset id, etc.)
      */
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBeanTest.java
new file mode 100644
index 00000000000..acf5d970358
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBeanTest.java
@@ -0,0 +1,85 @@
+package edu.harvard.iq.dataverse.api.imports;
+
+import edu.harvard.iq.dataverse.api.dto.DatasetDTO;
+import edu.harvard.iq.dataverse.api.dto.DatasetVersionDTO;
+
+import org.apache.commons.io.FileUtils;
+import com.google.gson.Gson;
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.junit.jupiter.MockitoExtension;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.nio.charset.StandardCharsets;
+
+@ExtendWith(MockitoExtension.class)
+public class ImportGenericServiceBeanTest {
+
+    @InjectMocks
+    private ImportGenericServiceBean importGenericService;
+
+    @Test
+    void testIdentifierHarvestableWithOtherID() throws IOException {
+        // "otherIdValue" containing the value : doi:10.7910/DVN/TJCLKP
+        File file = new File("src/test/resources/json/importGenericWithOtherId.json");
+        String text = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
+        DatasetVersionDTO dto = new Gson().fromJson(text, DatasetVersionDTO.class);
+            
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "https://doi.org/10.7910/DVN/TJCLKP"));
+        // junk or null
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "junk"));
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, null));
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "http://www.example.com"));
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "https://dataverse.org"));
+    }
+
+    @Test
+    void testIdentifierHarvestableWithoutOtherID() throws IOException {
+        // Does not contain data of type "otherIdValue"
+        File file = new File("src/test/resources/json/importGenericWithoutOtherId.json");
+        String text = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
+        DatasetVersionDTO dto = new Gson().fromJson(text, DatasetVersionDTO.class);
+                
+        // non-URL
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "doi:10.7910/DVN/TJCLKP"));
+        assertEquals("hdl:10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "hdl:10.7910/DVN/TJCLKP"));
+        // HTTPS
+        assertEquals("https://doi.org/10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "https://doi.org/10.7910/DVN/TJCLKP"));
+        assertEquals("https://dx.doi.org/10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "https://dx.doi.org/10.7910/DVN/TJCLKP"));
+        assertEquals("https://hdl.handle.net/10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "https://hdl.handle.net/10.7910/DVN/TJCLKP"));
+        // HTTP (no S)
+        assertEquals("http://doi.org/10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "http://doi.org/10.7910/DVN/TJCLKP"));
+        assertEquals("http://dx.doi.org/10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "http://dx.doi.org/10.7910/DVN/TJCLKP"));
+        assertEquals("http://hdl.handle.net/10.7910/DVN/TJCLKP", importGenericService.selectIdentifier(dto, "http://hdl.handle.net/10.7910/DVN/TJCLKP"));
+        // junk or null
+        assertNull(importGenericService.selectIdentifier(dto, "junk"));
+        assertNull(importGenericService.selectIdentifier(dto, null));
+        assertNull(importGenericService.selectIdentifier(dto, "http://www.example.com"));
+        assertNull(importGenericService.selectIdentifier(dto, "https://dataverse.org"));
+    }
+
+    @Test
+    void testReassignIdentifierAsGlobalId() {
+        // non-URL
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.reassignIdentifierAsGlobalId("doi:10.7910/DVN/TJCLKP", new DatasetDTO()));
+        assertEquals("hdl:10.7910/DVN/TJCLKP", importGenericService.reassignIdentifierAsGlobalId("hdl:10.7910/DVN/TJCLKP", new DatasetDTO()));
+        // HTTPS
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.reassignIdentifierAsGlobalId("https://doi.org/10.7910/DVN/TJCLKP", new DatasetDTO()));
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.reassignIdentifierAsGlobalId("https://dx.doi.org/10.7910/DVN/TJCLKP", new DatasetDTO()));
+        assertEquals("hdl:10.7910/DVN/TJCLKP", importGenericService.reassignIdentifierAsGlobalId("https://hdl.handle.net/10.7910/DVN/TJCLKP", new DatasetDTO()));
+        // HTTP (no S)
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.reassignIdentifierAsGlobalId("http://doi.org/10.7910/DVN/TJCLKP", new DatasetDTO()));
+        assertEquals("doi:10.7910/DVN/TJCLKP", importGenericService.reassignIdentifierAsGlobalId("http://dx.doi.org/10.7910/DVN/TJCLKP", new DatasetDTO()));
+        assertEquals("hdl:10.7910/DVN/TJCLKP", importGenericService.reassignIdentifierAsGlobalId("http://hdl.handle.net/10.7910/DVN/TJCLKP", new DatasetDTO()));
+        // junk
+        assertNull(importGenericService.reassignIdentifierAsGlobalId("junk", new DatasetDTO()));
+        assertNull(importGenericService.reassignIdentifierAsGlobalId("http://www.example.com", new DatasetDTO()));
+        assertNull(importGenericService.reassignIdentifierAsGlobalId("https://dataverse.org", new DatasetDTO()));
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/util/JsonResponseBuilderTest.java b/src/test/java/edu/harvard/iq/dataverse/api/util/JsonResponseBuilderTest.java
new file mode 100644
index 00000000000..748b4587a94
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/util/JsonResponseBuilderTest.java
@@ -0,0 +1,31 @@
+package edu.harvard.iq.dataverse.api.util;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EmptySource;
+import org.junit.jupiter.params.provider.NullSource;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.Mockito;
+
+import edu.harvard.iq.dataverse.api.filter.ApiBlockingFilter;
+import jakarta.servlet.http.HttpServletRequest;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+class JsonResponseBuilderTest {
+    
+    @ParameterizedTest
+    @NullSource
+    @EmptySource
+    @ValueSource(strings = {
+        "test",
+        ApiBlockingFilter.UNBLOCK_KEY_QUERYPARAM+"=supersecret",
+        ApiBlockingFilter.UNBLOCK_KEY_QUERYPARAM+"=supersecret&hello=1234",
+        "hello=1234&"+ApiBlockingFilter.UNBLOCK_KEY_QUERYPARAM+"=supersecret",
+        "hello=1234&"+ApiBlockingFilter.UNBLOCK_KEY_QUERYPARAM+"=supersecret&test=1234"})
+    void testMaskingOriginalURL(String query) {
+        HttpServletRequest test = Mockito.mock(HttpServletRequest.class);
+        when(test.getQueryString()).thenReturn(query);
+        assertFalse(JsonResponseBuilder.getOriginalURL(test).contains("supersecret"));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/AuthUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/AuthUtilTest.java
index a7a33d0c1bd..ff8c4beb6a5 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/AuthUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/AuthUtilTest.java
@@ -5,83 +5,83 @@
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GoogleOAuth2AP;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProvider;
-import java.util.Arrays;
+import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.Collection;
 import java.util.HashSet;
 
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.*;
 
-@RunWith(Enclosed.class)
 public class AuthUtilTest {
 
-    @RunWith(Parameterized.class)
-    public static class AuthUtilParamTests {
+    @Mock
+    private SystemConfig systemConfig;
 
-        @Parameters
-        public static Collection<String[]> data() {
-            return Arrays.asList(
-                    new String[][] {
-                        { null, null, null },
-                        { "Homer", "Homer", null },
-                        { "Simpson", null, "Simpson" },
-                        { "Homer Simpson", "Homer", "Simpson" },
-                        { "Homer Simpson", " Homer", "Simpson" }
-                    }
-                );
-        }
+    @BeforeEach
+    public void setUp() {
+        MockitoAnnotations.openMocks(this);
 
-        @Parameter
-        public String expectedDisplayName;
-
-        @Parameter(1)
-        public String displayFirst;
-
-        @Parameter(2)
-        public String displayLast;
-
-        @Test
-        public void testGetDisplayName() {
-            assertEquals(expectedDisplayName, AuthUtil.getDisplayName(displayFirst, displayLast));
-        }
+        // Configure the mock SystemConfig
+        when(systemConfig.isSignupDisabledForRemoteAuthProvider(anyString())).thenReturn(false);
+        when(systemConfig.isSignupDisabledForRemoteAuthProvider("orcid")).thenReturn(true);
     }
-
-    public static class AuthUtilNoParamTests {
-
-        /**
-         * Test of isNonLocalLoginEnabled method, of class AuthUtil.
-         */
-        @Test
-        public void testIsNonLocalLoginEnabled() {
-            System.out.println("isNonLocalLoginEnabled");
-
-            AuthUtil authUtil = new AuthUtil();
-
-            assertEquals(false, AuthUtil.isNonLocalLoginEnabled(null));
-
-            Collection<AuthenticationProvider> shibOnly = new HashSet<>();
-            shibOnly.add(new ShibAuthenticationProvider());
-            assertEquals(true, AuthUtil.isNonLocalLoginEnabled(shibOnly));
-
-            Collection<AuthenticationProvider> manyNonLocal = new HashSet<>();
-            manyNonLocal.add(new ShibAuthenticationProvider());
-            manyNonLocal.add(new GitHubOAuth2AP(null, null));
-            manyNonLocal.add(new GoogleOAuth2AP(null, null));
-            manyNonLocal.add(new OrcidOAuth2AP(null, null, null));
-            assertEquals(true, AuthUtil.isNonLocalLoginEnabled(manyNonLocal));
-
-            Collection<AuthenticationProvider> onlyBuiltin = new HashSet<>();
-            onlyBuiltin.add(new BuiltinAuthenticationProvider(null, null, null));
-            // only builtin provider
-            assertEquals(false, AuthUtil.isNonLocalLoginEnabled(onlyBuiltin));
-
-        }
+    
+    @ParameterizedTest
+    @CsvSource(value = {
+        "NULL,NULL,NULL",
+        "Homer,Homer,NULL",
+        "Simpson,NULL,Simpson",
+        "Homer Simpson,Homer,Simpson",
+        "Homer Simpson,Homer,Simpson"
+    }, nullValues = "NULL")
+    void testGetDisplayName(String expectedDisplayName, String displayFirst, String displayLast) {
+        assertEquals(expectedDisplayName, AuthUtil.getDisplayName(displayFirst, displayLast));
+    }
+    
+    /**
+     * Test of isNonLocalLoginEnabled method, of class AuthUtil.
+     */
+    @Test
+    public void testIsNonLocalSignupEnabled() {
+        System.out.println("isNonLocalSignupEnabled");
+        
+        assertFalse(AuthUtil.isNonLocalSignupEnabled(null, systemConfig));
+        
+        Collection<AuthenticationProvider> shibOnly = new HashSet<>();
+        shibOnly.add(new ShibAuthenticationProvider());
+        assertTrue(AuthUtil.isNonLocalSignupEnabled(shibOnly, systemConfig));
+        
+
+        Collection<AuthenticationProvider> orcidOnly = new HashSet<>();
+        orcidOnly.add(new OrcidOAuth2AP(null, null, null));
+        assertFalse(AuthUtil.isNonLocalSignupEnabled(orcidOnly, systemConfig));
+
+        Collection<AuthenticationProvider> manyNonLocal = new HashSet<>();
+        manyNonLocal.add(new ShibAuthenticationProvider());
+        manyNonLocal.add(new GitHubOAuth2AP(null, null));
+        manyNonLocal.add(new GoogleOAuth2AP(null, null));
+        manyNonLocal.add(new OrcidOAuth2AP(null, null, null));
+        assertTrue(AuthUtil.isNonLocalSignupEnabled(manyNonLocal, systemConfig));
+        
+        Collection<AuthenticationProvider> onlyBuiltin = new HashSet<>();
+        onlyBuiltin.add(new BuiltinAuthenticationProvider(null, null, null));
+        // only builtin provider
+        assertFalse(AuthUtil.isNonLocalSignupEnabled(onlyBuiltin, systemConfig));
     }
 
-}
+    @Test
+    public void testIsSignupDisabledForRemoteAuthProvider() {
+        assertTrue(systemConfig.isSignupDisabledForRemoteAuthProvider("orcid"));
+        assertFalse(systemConfig.isSignupDisabledForRemoteAuthProvider("github"));
+        assertFalse(systemConfig.isSignupDisabledForRemoteAuthProvider("google"));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfoTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfoTest.java
index c22536e7616..4f04228df71 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfoTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfoTest.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse.authorization;
 
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticationProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticationProviderTest.java
index eac9a605c9e..d4d7b6fa69d 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticationProviderTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticationProviderTest.java
@@ -15,7 +15,7 @@
 
 public class AuthenticationProviderTest {
 
-    private final static String[] authProviders = {"null", "builtin", "github", "google", "orcid", "orcid-sandbox", "shib"};
+    private static final String[] authProviders = {"null", "builtin", "github", "google", "orcid", "orcid-sandbox", "shib"};
     private static Map<String, String> bundleTestMap;
 
     @BeforeAll
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBeanTest.java
new file mode 100644
index 00000000000..56a46b4f772
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBeanTest.java
@@ -0,0 +1,348 @@
+package edu.harvard.iq.dataverse.authorization;
+
+import com.nimbusds.oauth2.sdk.ParseException;
+import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
+import com.nimbusds.openid.connect.sdk.claims.UserInfo;
+import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationException;
+import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProvider;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2Exception;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2UserRecord;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GitHubOAuth2AP;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GoogleOAuth2AP;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.oidc.OIDCAuthProvider;
+import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProvider;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@LocalJvmSettings
+public class AuthenticationServiceBeanTest {
+
+    private AuthenticationServiceBean sut;
+    private static final String TEST_BEARER_TOKEN = "Bearer test";
+    private static final String TEST_ORCID_USER_ID = "0000-0000-0000-0000";
+    private static final String TEST_GOOGLE_USER_ID = "111111111111111111111";
+    private static final String TEST_GITHUB_USER_ID = "11111111";
+
+    @BeforeEach
+    public void setUp() {
+        sut = new AuthenticationServiceBean();
+        sut.authProvidersRegistrationService = Mockito.mock(AuthenticationProvidersRegistrationServiceBean.class);
+        sut.em = Mockito.mock(EntityManager.class);
+    }
+
+    @Test
+    void testLookupUserByOIDCBearerToken_no_OIDCProvider() {
+        // Given no OIDC providers are configured
+        Mockito.when(sut.authProvidersRegistrationService.getAuthenticationProvidersMap()).thenReturn(Map.of());
+
+        // When invoking lookupUserByOIDCBearerToken
+        AuthorizationException exception = assertThrows(AuthorizationException.class,
+                () -> sut.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN));
+
+        // Then the exception message should indicate no OIDC provider is configured
+        assertEquals(BundleUtil.getStringFromBundle("authenticationServiceBean.errors.bearerTokenDetectedNoOIDCProviderConfigured"), exception.getMessage());
+    }
+
+    @Test
+    void testLookupUserByOIDCBearerToken_oneProvider_invalidToken_1() throws ParseException, OAuth2Exception, IOException {
+        // Given a single OIDC provider that cannot find a user
+        OIDCAuthProvider oidcAuthProviderStub = stubOIDCAuthProvider("OIEDC");
+        BearerAccessToken token = BearerAccessToken.parse(TEST_BEARER_TOKEN);
+        Mockito.when(oidcAuthProviderStub.getUserInfo(token)).thenReturn(Optional.empty());
+
+        // When invoking lookupUserByOIDCBearerToken
+        AuthorizationException exception = assertThrows(AuthorizationException.class,
+                () -> sut.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN));
+
+        // Then the exception message should indicate an unauthorized token
+        assertEquals(BundleUtil.getStringFromBundle("authenticationServiceBean.errors.unauthorizedBearerToken"), exception.getMessage());
+    }
+
+    @Test
+    void testLookupUserByOIDCBearerToken_oneProvider_invalidToken_2() throws ParseException, IOException, OAuth2Exception {
+        // Given a single OIDC provider that throws an IOException
+        OIDCAuthProvider oidcAuthProviderStub = stubOIDCAuthProvider("OIEDC");
+        BearerAccessToken token = BearerAccessToken.parse(TEST_BEARER_TOKEN);
+        Mockito.when(oidcAuthProviderStub.getUserInfo(token)).thenThrow(IOException.class);
+
+        // When invoking lookupUserByOIDCBearerToken
+        AuthorizationException exception = assertThrows(AuthorizationException.class,
+                () -> sut.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN));
+
+        // Then the exception message should indicate an unauthorized token
+        assertEquals(BundleUtil.getStringFromBundle("authenticationServiceBean.errors.unauthorizedBearerToken"), exception.getMessage());
+    }
+
+    @Test
+    void testLookupUserByOIDCBearerToken_oneProvider_validToken() throws ParseException, IOException, AuthorizationException, OAuth2Exception {
+        // Given a single OIDC provider that returns a valid user identifier
+        setUpOIDCProviderWithGenericUser();
+
+        // Setting up an authenticated user is found
+        AuthenticatedUser authenticatedUser = setupAuthenticatedUserByAuthPrvIDQueryWithResult(new AuthenticatedUser());
+
+        // When invoking lookupUserByOIDCBearerToken
+        User actualUser = sut.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN);
+
+        // Then the actual user should match the expected authenticated user
+        assertEquals(authenticatedUser, actualUser);
+    }
+
+    @Test
+    void testLookupUserByOIDCBearerToken_oneProvider_validToken_noAccount() throws ParseException, IOException, AuthorizationException, OAuth2Exception {
+        // Given a single OIDC provider that returns a valid user identifier
+        setUpOIDCProviderWithGenericUser();
+
+        // Setting up an authenticated user is not found
+        setupAuthenticatedUserQueryWithNoResult();
+
+        // When invoking lookupUserByOIDCBearerToken
+        User actualUser = sut.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN);
+
+        // Then no user should be found, and result should be null
+        assertNull(actualUser);
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-use-builtin-user-on-id-match")
+    void testLookupUserByOIDCBearerToken_oneProvider_validToken_userNotPresentAsBuiltin_useBuiltinUserOnIdMatchFeatureFlagEnabled()
+            throws ParseException, IOException, AuthorizationException, OAuth2Exception {
+
+        // Given a single OIDC provider that returns a valid user identifier
+        setUpOIDCProviderWithBuiltinUserAttributes();
+
+        // Spy on the SUT to verify method calls
+        AuthenticationServiceBean spySut = Mockito.spy(sut);
+
+        // Setting up an authenticated user is found (but only after the second call to lookupUser, that is, not coming from the builtin user provider)
+        AuthenticatedUser authenticatedUser = setupAuthenticatedUserByAuthPrvIDQueryWithResult(new AuthenticatedUser(), true);
+
+        // When invoking lookupUserByOIDCBearerToken
+        User actualUser = spySut.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN);
+
+        // Then the actual user should match the expected authenticated user
+        assertEquals(authenticatedUser, actualUser);
+
+        // Capture calls to lookupUser
+        ArgumentCaptor<String> providerIdCaptor = ArgumentCaptor.forClass(String.class);
+        ArgumentCaptor<String> userIdCaptor = ArgumentCaptor.forClass(String.class);
+
+        // Ensure lookupUser is called twice
+        Mockito.verify(spySut, Mockito.times(2)).lookupUser(providerIdCaptor.capture(), userIdCaptor.capture());
+
+        // Assert that the first call was with expected parameters
+        assertEquals(BuiltinAuthenticationProvider.PROVIDER_ID, providerIdCaptor.getAllValues().get(0));
+        assertEquals("testUsername", userIdCaptor.getAllValues().get(0));
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-use-builtin-user-on-id-match")
+    void testLookupUserByOIDCBearerToken_oneProvider_validToken_userIsPresentAsBuiltin_useBuiltinUserOnIdMatchFeatureFlagEnabled() throws ParseException, IOException, AuthorizationException, OAuth2Exception {
+        // Given a single OIDC provider that returns a valid user identifier
+        setUpOIDCProviderWithBuiltinUserAttributes();
+
+        // Spy on the SUT to verify method calls
+        AuthenticationServiceBean spySut = Mockito.spy(sut);
+
+        // Setting up an authenticated user is found
+        AuthenticatedUser authenticatedUser = setupAuthenticatedUserByAuthPrvIDQueryWithResult(new AuthenticatedUser());
+
+        // When invoking lookupUserByOIDCBearerToken
+        User actualUser = spySut.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN);
+
+        // Then the actual user should match the expected authenticated user
+        assertEquals(authenticatedUser, actualUser);
+
+        // Capture calls to lookupUser
+        ArgumentCaptor<String> providerIdCaptor = ArgumentCaptor.forClass(String.class);
+        ArgumentCaptor<String> userIdCaptor = ArgumentCaptor.forClass(String.class);
+
+        // Ensure lookupUser is called once
+        Mockito.verify(spySut, Mockito.times(1)).lookupUser(providerIdCaptor.capture(), userIdCaptor.capture());
+
+        // Assert that lookupUser is called with expected parameters
+        assertEquals(BuiltinAuthenticationProvider.PROVIDER_ID, providerIdCaptor.getAllValues().get(0));
+        assertEquals("testUsername", userIdCaptor.getAllValues().get(0));
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-use-shib-user-on-id-match")
+    void testLookupUserByOIDCBearerToken_oneProvider_validToken_userIsPresentAsShibboleth_useShibUserOnIdMatchFeatureFlagEnabled() throws ParseException, IOException, AuthorizationException, OAuth2Exception {
+        // Given a single OIDC provider that returns a valid user identifier
+        setUpOIDCProviderWithShibAttributes();
+
+        // Spy on the SUT to verify method calls
+        AuthenticationServiceBean spySut = Mockito.spy(sut);
+
+        // Setting up an authenticated user is found
+        AuthenticatedUser authenticatedUser = setupAuthenticatedUserByAuthPrvIDQueryWithResult(new AuthenticatedUser());
+
+        // When invoking lookupUserByOIDCBearerToken
+        User actualUser = spySut.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN);
+
+        // Then the actual user should match the expected authenticated user
+        assertEquals(authenticatedUser, actualUser);
+
+        // Capture calls to lookupUser
+        ArgumentCaptor<String> providerIdCaptor = ArgumentCaptor.forClass(String.class);
+        ArgumentCaptor<String> userIdCaptor = ArgumentCaptor.forClass(String.class);
+
+        // Ensure lookupUser is called once
+        Mockito.verify(spySut, Mockito.times(1)).lookupUser(providerIdCaptor.capture(), userIdCaptor.capture());
+
+        // Assert that lookupUser is called with expected parameters
+        assertEquals(ShibAuthenticationProvider.PROVIDER_ID, providerIdCaptor.getAllValues().get(0));
+        assertEquals("testIdp|testPersistentId", userIdCaptor.getAllValues().get(0));
+    }
+
+    private static Stream<Arguments> oAuthProvider() {
+        return Stream.of(
+                Arguments.of(OrcidOAuth2AP.PROVIDER_ID, TEST_ORCID_USER_ID),
+                Arguments.of(GoogleOAuth2AP.PROVIDER_ID, TEST_GOOGLE_USER_ID),
+                Arguments.of(GitHubOAuth2AP.PROVIDER_ID, TEST_GITHUB_USER_ID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("oAuthProvider")
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-use-oauth-user-on-id-match")
+    void testLookupUserByOIDCBearerToken_oneProvider_validToken_userIsPresentAsOAuth_useOAuthUserOnIdMatchFeatureFlagEnabled(String providerId, String expectedUserId) throws ParseException, IOException, AuthorizationException, OAuth2Exception {
+        // Given a single OIDC provider that returns a valid user identifier with OAuth attributes
+        setUpOIDCProviderWithOAuthAttributes(providerId);
+
+        // Spy on the SUT to verify method calls
+        AuthenticationServiceBean spySut = Mockito.spy(sut);
+
+        // Setting up an authenticated user is found
+        AuthenticatedUser authenticatedUser = setupAuthenticatedUserByAuthPrvIDQueryWithResult(new AuthenticatedUser());
+
+        // When invoking lookupUserByOIDCBearerToken
+        User actualUser = spySut.lookupUserByOIDCBearerToken(TEST_BEARER_TOKEN);
+
+        // Then the actual user should match the expected authenticated user
+        assertEquals(authenticatedUser, actualUser);
+
+        // Capture calls to lookupUser
+        ArgumentCaptor<String> providerIdCaptor = ArgumentCaptor.forClass(String.class);
+        ArgumentCaptor<String> userIdCaptor = ArgumentCaptor.forClass(String.class);
+
+        // Ensure lookupUser is called once
+        Mockito.verify(spySut, Mockito.times(1)).lookupUser(providerIdCaptor.capture(), userIdCaptor.capture());
+
+        // Assert that lookupUser is called with expected parameters
+        assertEquals(providerId, providerIdCaptor.getAllValues().get(0));
+        assertEquals(expectedUserId, userIdCaptor.getAllValues().get(0));
+    }
+
+    private void setupAuthenticatedUserQueryWithNoResult() {
+        TypedQuery<AuthenticatedUserLookup> queryStub = Mockito.mock(TypedQuery.class);
+        Mockito.when(queryStub.getSingleResult()).thenThrow(new NoResultException());
+        Mockito.when(sut.em.createNamedQuery("AuthenticatedUserLookup.findByAuthPrvID_PersUserId", AuthenticatedUserLookup.class)).thenReturn(queryStub);
+    }
+
+    private AuthenticatedUser setupAuthenticatedUserByAuthPrvIDQueryWithResult(AuthenticatedUser authenticatedUser) {
+        return setupAuthenticatedUserByAuthPrvIDQueryWithResult(authenticatedUser, false);
+    }
+
+    private AuthenticatedUser setupAuthenticatedUserByAuthPrvIDQueryWithResult(AuthenticatedUser authenticatedUser, boolean returnNullOnFirstCall) {
+        TypedQuery<AuthenticatedUserLookup> queryStub = Mockito.mock(TypedQuery.class);
+        AuthenticatedUserLookup lookupStub = Mockito.mock(AuthenticatedUserLookup.class);
+        Mockito.when(lookupStub.getAuthenticatedUser()).thenReturn(authenticatedUser);
+        if (returnNullOnFirstCall) {
+            Mockito.when(queryStub.getSingleResult())
+                    .thenThrow(new NoResultException())
+                    .thenReturn(lookupStub);
+        } else {
+            Mockito.when(queryStub.getSingleResult()).thenReturn(lookupStub);
+        }
+        Mockito.when(sut.em.createNamedQuery("AuthenticatedUserLookup.findByAuthPrvID_PersUserId", AuthenticatedUserLookup.class)).thenReturn(queryStub);
+        return authenticatedUser;
+    }
+
+    private OIDCAuthProvider stubOIDCAuthProvider(String providerID) {
+        OIDCAuthProvider oidcAuthProviderStub = Mockito.mock(OIDCAuthProvider.class);
+        Mockito.when(oidcAuthProviderStub.getId()).thenReturn(providerID);
+        Mockito.when(sut.authProvidersRegistrationService.getAuthenticationProvidersMap()).thenReturn(Map.of(providerID, oidcAuthProviderStub));
+        return oidcAuthProviderStub;
+    }
+
+    private OAuth2UserRecord setupOidcUserRecordBasics() throws ParseException, IOException, OAuth2Exception {
+        OIDCAuthProvider oidcAuthProviderStub = stubOIDCAuthProvider("OIDC");
+        BearerAccessToken token = BearerAccessToken.parse(TEST_BEARER_TOKEN);
+
+        // Stub the UserInfo returned by the provider
+        UserInfo userInfoStub = Mockito.mock(UserInfo.class);
+        Mockito.when(oidcAuthProviderStub.getUserInfo(token)).thenReturn(Optional.of(userInfoStub));
+
+        // Stub the OIDCAuthProvider to return a mock OAuth2UserRecord
+        OAuth2UserRecord oAuth2UserRecordStub = Mockito.mock(OAuth2UserRecord.class);
+        Mockito.when(oidcAuthProviderStub.getUserRecord(userInfoStub)).thenReturn(oAuth2UserRecordStub);
+
+        // Stub the common, basic user identifiers
+        UserRecordIdentifier userRecordIdentifierStub = Mockito.mock(UserRecordIdentifier.class);
+        Mockito.when(userRecordIdentifierStub.getUserIdInRepo()).thenReturn("testUserId");
+        Mockito.when(userRecordIdentifierStub.getUserRepoId()).thenReturn("testRepoId");
+        Mockito.when(oAuth2UserRecordStub.getUserRecordIdentifier()).thenReturn(userRecordIdentifierStub);
+        Mockito.when(oAuth2UserRecordStub.getUsername()).thenReturn("testUsername");
+
+        return oAuth2UserRecordStub;
+    }
+
+    private void setUpOIDCProviderWithGenericUser() throws ParseException, IOException, OAuth2Exception {
+        setupOidcUserRecordBasics();
+    }
+
+    private void setUpOIDCProviderWithBuiltinUserAttributes() throws ParseException, IOException, OAuth2Exception {
+        OAuth2UserRecord oAuth2UserRecordStub = setupOidcUserRecordBasics();
+        Mockito.when(oAuth2UserRecordStub.hasBuiltinAttributes()).thenReturn(true);
+    }
+
+    private void setUpOIDCProviderWithShibAttributes() throws ParseException, IOException, OAuth2Exception {
+        OAuth2UserRecord oAuth2UserRecordStub = setupOidcUserRecordBasics();
+        Mockito.when(oAuth2UserRecordStub.hasShibAttributes()).thenReturn(true);
+        Mockito.when(oAuth2UserRecordStub.getIdp()).thenReturn("testIdp");
+        Mockito.when(oAuth2UserRecordStub.getShibUniquePersistentIdentifier()).thenReturn("testPersistentId");
+    }
+
+    private void setUpOIDCProviderWithOAuthAttributes(String providerId) throws ParseException, IOException, OAuth2Exception {
+        OAuth2UserRecord oAuth2UserRecordStub = setupOidcUserRecordBasics();
+        Mockito.when(oAuth2UserRecordStub.hasOAuthAttributes()).thenReturn(true);
+
+        switch (providerId) {
+            case OrcidOAuth2AP.PROVIDER_ID -> {
+                Mockito.when(oAuth2UserRecordStub.getIdp()).thenReturn("http://orcid.org/oauth/authorize");
+                Mockito.when(oAuth2UserRecordStub.getOidcUserId()).thenReturn("http://orcid.org/" + TEST_ORCID_USER_ID);
+            }
+            case GoogleOAuth2AP.PROVIDER_ID -> {
+                Mockito.when(oAuth2UserRecordStub.getIdp()).thenReturn("http://google.com/accounts/o8/id");
+                Mockito.when(oAuth2UserRecordStub.getOidcUserId()).thenReturn(TEST_GOOGLE_USER_ID);
+            }
+            case GitHubOAuth2AP.PROVIDER_ID -> {
+                Mockito.when(oAuth2UserRecordStub.getIdp()).thenReturn("http://github.com/login/oauth/authorize");
+                Mockito.when(oAuth2UserRecordStub.getOidcUserId()).thenReturn(TEST_GITHUB_USER_ID);
+            }
+        }
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBeanTest.java
index ea9f851f9ed..27927c33420 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBeanTest.java
@@ -13,8 +13,9 @@
 import java.util.Set;
 import static java.util.stream.Collectors.toList;
 import java.util.stream.Stream;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
 import static edu.harvard.iq.dataverse.util.CollectionLiterals.*;
 
 /**
@@ -63,10 +64,10 @@ public void testFlattenGroupsCollection() throws GroupException {
                 
         List<Group> result = sut.flattenGroupsCollection(grps).collect(toList());
         
-        assertEquals( "Groups should appear only once", result.size(), new HashSet<>(result).size() );
+        assertEquals(result.size(), new HashSet<>(result).size(), "Groups should appear only once");
         
         grps.addAll( listOf(gAa, gAb, gAstar, AuthenticatedUsers.get()) );
-        assertEquals( "All groups should appear", grps, new HashSet<>(result) );
+        assertEquals(grps, new HashSet<>(result), "All groups should appear");
         
     }
     
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/GroupUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/GroupUtilTest.java
index fdfd8d4370c..41a494d5e55 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/GroupUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/GroupUtilTest.java
@@ -5,8 +5,8 @@
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 public class GroupUtilTest {
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupTest.java
index 543d3ab1eeb..afa07be2e38 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupTest.java
@@ -16,10 +16,10 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.mocks.MockRoleAssigneeServiceBean;
 import static edu.harvard.iq.dataverse.mocks.MocksFactory.*;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -34,15 +34,14 @@ public class ExplicitGroupTest {
     public ExplicitGroupTest() {
     }
     
-    @Test( expected=GroupException.class )
+    @Test
     public void addGroupToSelf() throws Exception {
         ExplicitGroup sut = new ExplicitGroup();
         sut.setDisplayName("a group");
-        sut.add( sut );
-        fail("A group cannot be added to itself.");
+        assertThrows(GroupException.class, () -> sut.add( sut ), "A group cannot be added to itself.");
     }
     
-    @Test( expected=GroupException.class )
+    @Test
     public void addGroupToDescendant() throws GroupException{
         Dataverse dv = makeDataverse();
         ExplicitGroup root = new ExplicitGroup(prv);
@@ -60,11 +59,10 @@ public void addGroupToDescendant() throws GroupException{
         
         sub.add( subSub );
         root.add( sub );
-        subSub.add(root);
-        fail("A group cannot contain its parent");
+        assertThrows(GroupException.class, () -> subSub.add(root), "A group cannot contain its parent");
     }
     
-    @Test( expected=GroupException.class )
+    @Test
     public void addGroupToUnrealtedGroup() throws GroupException {
         Dataverse dv1 = makeDataverse();
         Dataverse dv2 = makeDataverse();
@@ -73,9 +71,8 @@ public void addGroupToUnrealtedGroup() throws GroupException {
         g1.setOwner(dv1);
         g2.setOwner(dv2);
         
-        g1.add(g2);
-        fail("An explicit group cannot contain an explicit group defined in "
-                + "a dataverse that's not an ancestor of that group's owner dataverse.");
+        assertThrows(GroupException.class, () -> g1.add(g2), "An explicit group cannot contain an" +
+            "explicit group defined in a dataverse that's not an ancestor of that group's owner dataverse.");
         
     }
     
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupTest.java
index b6a3b862435..aeea93ad29e 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupTest.java
@@ -5,8 +5,9 @@
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv4AddressTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv4AddressTest.java
index d03846a97b4..4683d66decd 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv4AddressTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv4AddressTest.java
@@ -1,10 +1,10 @@
 package edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip;
 
-import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -22,9 +22,9 @@ public void testValueOf() {
         assertEquals( new IPv4Address(127,0,0,1), IPv4Address.valueOf("127.0.0.1") );
     }
     
-    @Test( expected=IllegalArgumentException.class )
-    public void testValueOf_bad() {
-        IPv4Address.valueOf("1.2.3");
+    @Test
+    void testValueOf_bad() {
+        assertThrows(IllegalArgumentException.class, () -> IPv4Address.valueOf("1.2.3"));
     }
     
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv6AddressTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv6AddressTest.java
index 2070dc347e7..77618e558ec 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv6AddressTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IPv6AddressTest.java
@@ -1,10 +1,11 @@
 package edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip;
 
 import java.util.Arrays;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -15,11 +16,11 @@ public class IPv6AddressTest {
     public IPv6AddressTest() {
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
     }
 
@@ -37,15 +38,15 @@ public void testValueOfWithExpansion() {
         int[] expected = new int[]{0x2001, 0xdb8, 0x85a3, 0x0, 0, 0x8a2e, 0x370, 0x7334};
         IPv6Address adr = IPv6Address.valueOf("2001:db8:85a3::8a2e:370:7334");
         for (int i = 0; i < 8; i++) {
-            assertEquals("At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i),
-                    expected[i], adr.get(i));
+            assertEquals(expected[i], adr.get(i),
+                "At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i));
         }
 
         expected = new int[]{0x2001, 0xdb8, 0x0, 0x0, 0x0, 0x0, 0x370, 0x7334};
         adr = IPv6Address.valueOf("2001:db8::370:7334");
         for (int i = 0; i < 8; i++) {
-            assertEquals("At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i),
-                    expected[i], adr.get(i));
+            assertEquals(expected[i], adr.get(i),
+                "At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i));
         }
     }
 
@@ -54,16 +55,16 @@ public void testValueOfWithExpansionZerosAtStart() {
         int[] expected = new int[]{0, 0, 0, 0, 0, 0x8a2e, 0x370, 0x7334};
         IPv6Address adr = IPv6Address.valueOf("::8a2e:370:7334");
         for (int i = 0; i < 8; i++) {
-            assertEquals("At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i),
-                    expected[i], adr.get(i));
+            assertEquals(expected[i], adr.get(i),
+                "At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i));
         }
 
         expected = new int[]{0, 0, 0, 0, 0, 0, 0, 0x7334};
         adr = IPv6Address.valueOf("::7334");
         System.out.println("adr = " + adr);
         for (int i = 0; i < 8; i++) {
-            assertEquals("At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i),
-                    expected[i], adr.get(i));
+            assertEquals(expected[i], adr.get(i),
+                "At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i));
         }
     }
 
@@ -72,15 +73,15 @@ public void testValueOfWithExpansionZerosAtEnd() {
         int[] expected = new int[]{0x2001, 0x8a2e, 0, 0, 0, 0, 0, 0};
         IPv6Address adr = IPv6Address.valueOf("2001:8a2e::");
         for (int i = 0; i < 8; i++) {
-            assertEquals("At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i),
-                    expected[i], adr.get(i));
+            assertEquals(expected[i], adr.get(i),
+                "At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i));
         }
 
         expected = new int[]{0x1337, 0, 0, 0, 0, 0, 0, 0};
         adr = IPv6Address.valueOf("1337::");
         for (int i = 0; i < 8; i++) {
-            assertEquals("At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i),
-                    expected[i], adr.get(i));
+            assertEquals(expected[i], adr.get(i),
+                "At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i));
         }
     }
 
@@ -90,15 +91,15 @@ public void testValueOfWithExpansionSpecialCases() {
         IPv6Address adr = IPv6Address.valueOf("::");
         System.out.println("adr = " + adr);
         for (int i = 0; i < 8; i++) {
-            assertEquals("At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i),
-                    expected[i], adr.get(i));
+            assertEquals(expected[i], adr.get(i),
+                "At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i));
         }
 
         expected = new int[]{0, 0, 0, 0, 0, 0, 0, 1};
         adr = IPv6Address.valueOf("::1");
         for (int i = 0; i < 8; i++) {
-            assertEquals("At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i),
-                    expected[i], adr.get(i));
+            assertEquals(expected[i], adr.get(i),
+                "At index " + i + ": expecting " + expected[i] + ", got " + adr.get(i));
         }
     }
 
@@ -108,24 +109,24 @@ public void testLocalhostness() {
         assertFalse(IPv6Address.valueOf("fff::1").isLocalhost());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testIllegalLength() {
-        IPv6Address.valueOf("0:1:2:3");
+    @Test
+    void testIllegalLength() {
+        assertThrows(IllegalArgumentException.class, () -> IPv6Address.valueOf("0:1:2:3"));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testIllegalLengthPrefix() {
-        IPv6Address.valueOf(":1:2:3");
+    @Test
+    void testIllegalLengthPrefix() {
+        assertThrows(IllegalArgumentException.class, () -> IPv6Address.valueOf(":1:2:3"));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testIllegalLengthSuffix() {
-        IPv6Address.valueOf("1:2:3:");
+    @Test
+    void testIllegalLengthSuffix() {
+        assertThrows(IllegalArgumentException.class, () -> IPv6Address.valueOf("1:2:3:"));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testIllegalNumber() {
-        IPv6Address.valueOf("::xxx");
+    @Test
+    void testIllegalNumber() {
+        assertThrows(IllegalArgumentException.class, () -> IPv6Address.valueOf("::xxx"));
     }
 
     @Test
@@ -150,8 +151,7 @@ public void testLongRoundTrips() {
                 "fe80::8358:c945:7094:2e6c",
                 "fe80::60d0:6eff:fece:7713", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")) {
             IPv6Address addr = IPv6Address.valueOf(s);
-            assertEquals("Bad roundtrip on address: " + s,
-                    addr, new IPv6Address(addr.toLongArray()));
+            assertEquals(addr, new IPv6Address(addr.toLongArray()), "Bad roundtrip on address: " + s);
         }
     }
 
@@ -165,11 +165,9 @@ public void testInclusionAbove() {
                 "dd:a:a:a:a:a:b:a", "dd:a:a:a:a:a:a:b")) {
             IPv6Address ipv6 = IPv6Address.valueOf(addr);
             assertFalse(r.contains(ipv6));
-            assertTrue("for address " + ipv6, above(ipv6.toLongArray(),
-                    r.getTop().toLongArray()));
-            assertFalse("for address " + ipv6, between(r.getBottom().toLongArray(),
-                    r.getTop().toLongArray(),
-                    ipv6.toLongArray()));
+            assertTrue(above(ipv6.toLongArray(), r.getTop().toLongArray()), "for address " + ipv6);
+            assertFalse(between(r.getBottom().toLongArray(), r.getTop().toLongArray(), ipv6.toLongArray()),
+                "for address " + ipv6);
 
         }
     }
@@ -188,9 +186,8 @@ public void testInclusionBelow() {
             long[] bottomArr = r.getBottom().toLongArray();
             long[] addrArr = ipv6.toLongArray();
 
-            assertTrue("for address " + ipv6, above(bottomArr, addrArr));
-            assertFalse("for address " + ipv6, between(bottomArr,
-                    r.getTop().toLongArray(), addrArr));
+            assertTrue(above(bottomArr, addrArr), "for address " + ipv6);
+            assertFalse(between(bottomArr, r.getTop().toLongArray(), addrArr), "for address " + ipv6);
 
         }
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressRangeTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressRangeTest.java
index f232b713640..e3134dedaef 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressRangeTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressRangeTest.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip;
 
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -83,7 +83,7 @@ public void testSingleAddress() {
     
     public void testRange( Boolean expected, IpAddressRange range, IpAddress... addresses ) {
         for ( IpAddress ipa : addresses ) {
-            assertEquals( "Testing " + ipa + " in " + range, expected, range.contains(ipa));
+            assertEquals(expected, range.contains(ipa), "Testing " + ipa + " in " + range);
         }
     }
     
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressTest.java
index ce6ff29f1c1..e757472e316 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/ip/IpAddressTest.java
@@ -1,8 +1,9 @@
 package edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip;
 
 import java.util.Arrays;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupProviderTest.java
new file mode 100644
index 00000000000..60d6ae13b01
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupProviderTest.java
@@ -0,0 +1,100 @@
+package edu.harvard.iq.dataverse.authorization.groups.impl.maildomain;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IPv4Address;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+class MailDomainGroupProviderTest {
+    
+    MailDomainGroupServiceBean svc = Mockito.mock(MailDomainGroupServiceBean.class);
+    
+    @Test
+    void testUserMatched() {
+        // given
+        MailDomainGroupProvider pvd = new MailDomainGroupProvider(svc);
+        
+        MailDomainGroup t = new MailDomainGroup();
+        t.setEmailDomains("foobar.com");
+        Set<MailDomainGroup> set = new HashSet<>();
+        set.add(t);
+        
+        AuthenticatedUser u = new AuthenticatedUser();
+        when(svc.findAllWithDomain(u)).thenReturn(set);
+        
+        DataverseRequest req = new DataverseRequest(u, new IPv4Address(192,168,0,1));
+        
+        // when
+        Set<MailDomainGroup> result = pvd.groupsFor(req);
+        
+        // then
+        assertTrue(result.contains(t));
+        assertEquals(pvd, t.getGroupProvider());
+    }
+    
+    @Test
+    void testUserNotPresent() {
+        // given
+        MailDomainGroupProvider pvd = new MailDomainGroupProvider(svc);
+        AuthenticatedUser u = null;
+        DataverseRequest req = new DataverseRequest(u, new IPv4Address(192,168,0,1));
+        
+        // when & then
+        assertEquals(Collections.emptySet(), pvd.groupsFor(req));
+    }
+    
+    @Test
+    void testContextIgnored() {
+        // given
+        MailDomainGroupProvider pvd = Mockito.spy(new MailDomainGroupProvider(svc));
+        AuthenticatedUser u = null;
+        DataverseRequest req = new DataverseRequest(u, new IPv4Address(192,168,0,1));
+        Dataset a = new Dataset();
+        
+        // when
+        pvd.groupsFor(req, a);
+        // then
+        verify(pvd, times(1)).groupsFor(req);
+    }
+    
+    @Test
+    void testUnsupportedAsEmpty() {
+        // given
+        MailDomainGroupProvider pvd = new MailDomainGroupProvider(svc);
+        
+        // when & then
+        assertEquals(Collections.emptySet(), pvd.groupsFor(new AuthenticatedUser(), new Dataset()));
+        assertEquals(Collections.emptySet(), pvd.groupsFor(new AuthenticatedUser()));
+    }
+    
+    @Test
+    void testUpdateProvider() {
+        // given
+        MailDomainGroupProvider pvd = new MailDomainGroupProvider(svc);
+        // include a null value to ensure null safety of the functions
+        List<MailDomainGroup> test = Arrays.asList(new MailDomainGroup(), new MailDomainGroup(), null);
+        for (MailDomainGroup mdg : test) {
+            if ( mdg != null ) {
+                assertNull(mdg.getGroupProvider());
+            }
+        }
+        
+        // when
+        pvd.updateProvider(test);
+        
+        // then
+        for (MailDomainGroup mdg : test) {
+            if ( mdg != null ) {
+                assertEquals(pvd, mdg.getGroupProvider());
+            }
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupServiceBeanTest.java
new file mode 100644
index 00000000000..875cd02cc4c
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupServiceBeanTest.java
@@ -0,0 +1,182 @@
+package edu.harvard.iq.dataverse.authorization.groups.impl.maildomain;
+
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import java.util.*;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MailDomainGroupServiceBeanTest {
+    
+    @Mock
+    ConfirmEmailServiceBean confirmEmailSvc;
+    @Mock
+    EntityManager em;
+    
+    MailDomainGroupServiceBean svc;
+    
+    @BeforeEach
+    void setup() {
+        svc = new MailDomainGroupServiceBean();
+        svc.em = em;
+        svc.confirmEmailSvc = confirmEmailSvc;
+    }
+    
+    @Test
+    void testUpdateGroup() {
+        // given
+        List<MailDomainGroup> db = new ArrayList<>(Arrays.asList(MailDomainGroupTest.genGroup(), MailDomainGroupTest.genGroup(), MailDomainGroupTest.genRegexGroup()));
+        mockQuery("MailDomainGroup.findAll", db);
+        
+        // when
+        svc.updateGroups();
+        
+        // then
+        assertEquals(2, svc.simpleGroups.size());
+        assertEquals(1, svc.regexGroups.size());
+    }
+    
+    @Test
+    void testUpdateGroupMultiRegex() {
+        // given
+        List<MailDomainGroup> db = new ArrayList<>(Arrays.asList(MailDomainGroupTest.genGroup(), MailDomainGroupTest.genRegexGroup()));
+        MailDomainGroup longRegex = MailDomainGroupTest.genRegexGroup();
+        longRegex.setEmailDomains(Arrays.asList("example\\.org", ".+\\.example\\.org"));
+        db.add(longRegex);
+        mockQuery("MailDomainGroup.findAll", db);
+        
+        // when
+        svc.updateGroups();
+        
+        // then
+        assertEquals(1, svc.simpleGroups.size());
+        assertEquals(2, svc.regexGroups.size());
+        assertEquals("example\\.org|.+\\.example\\.org", svc.regexGroups.get(longRegex).pattern());
+    }
+    
+    private static Stream<Arguments> mailTestExamples() {
+        return Stream.of(
+            Arguments.of("simpleGroupOnly@foobar.com", Arrays.asList("foobar.com"), false, false),
+            Arguments.of("regexButNotActive@example.org", Arrays.asList("^example\\.org$"), false, true),
+            Arguments.of("singleRegexMatch@example.org", Arrays.asList("^example\\.org$"), true, false),
+            Arguments.of("singleRegexFail-1@hello.example.org", Arrays.asList("^example\\.org$"), true, true),
+            Arguments.of("singleRegexFail-2@foobar.com", Arrays.asList("^example\\.org$"), true, true),
+            Arguments.of("multiRegexMatch-1@example.org", Arrays.asList("^example\\.org$", "^.+\\.example\\.org$"), true, false),
+            Arguments.of("multiRegexMatch-2@hello.example.org", Arrays.asList("^example\\.org$", "^.+\\.example\\.org$"), true, false),
+            Arguments.of("multiRegexFail@hfoobar.com", Arrays.asList("^example\\.org$", "^.+\\.example\\.org$"), true, true),
+            Arguments.of("invalidRegex@hfoobar.com", Arrays.asList("$foobar.com$"), true, true),
+            Arguments.of("noOvermatchingRegex@hfoobar.com.eu", Arrays.asList("bar\\.com"), true, true)
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("mailTestExamples")
+    void testFindWithVerifiedEmail(String email, List<String> domains, boolean isRegex, boolean shouldBeEmpty) {
+        // given
+        List<MailDomainGroup> db = new ArrayList<>(Arrays.asList(MailDomainGroupTest.genGroup()));
+        MailDomainGroup test = MailDomainGroupTest.genGroup();
+        test.setEmailDomains(domains);
+        test.setIsRegEx(isRegex);
+        db.add(test);
+        mockQuery("MailDomainGroup.findAll", db);
+        svc.updateGroups();
+        
+        AuthenticatedUser u = new AuthenticatedUser();
+        u.setEmail(email);
+        when(confirmEmailSvc.hasVerifiedEmail(u)).thenReturn(true);
+        
+        // when
+        Set<MailDomainGroup> result = svc.findAllWithDomain(u);
+        
+        // then
+        if (shouldBeEmpty) {
+            assertTrue(result.isEmpty());
+        } else {
+            Set<MailDomainGroup> expected = new HashSet<>(Arrays.asList(test));
+            assertTrue(result.containsAll(expected));
+        }
+    }
+    
+    @Test
+    void testFindWithUnverifiedEmail() {
+        // given
+        AuthenticatedUser u = new AuthenticatedUser();
+        u.setEmail("test@foobar.com");
+        when(confirmEmailSvc.hasVerifiedEmail(u)).thenReturn(false);
+        
+        // when & then
+        assertEquals(Collections.emptySet(), svc.findAllWithDomain(u));
+    }
+    
+    // however this case might ever happen... its a branch in the function, we should test it.
+    @Test
+    void testFindWithInvalidEmail() {
+        // given
+        AuthenticatedUser u = new AuthenticatedUser();
+        u.setEmail("testfoobar.com");
+        when(confirmEmailSvc.hasVerifiedEmail(u)).thenReturn(true);
+        
+        // when & then
+        assertEquals(Collections.emptySet(), svc.findAllWithDomain(u));
+    }
+    
+    @Test
+    void findAll() {
+        // given
+        List<MailDomainGroup> db = Arrays.asList(MailDomainGroupTest.genGroup(),MailDomainGroupTest.genGroup(),MailDomainGroupTest.genGroup());
+        mockQuery("MailDomainGroup.findAll", db);
+        
+        // when & then
+        assertEquals(db, svc.findAll());
+    }
+    
+    @Test
+    void findByAlias() {
+        // given
+        MailDomainGroup mg = MailDomainGroupTest.genGroup();
+        mockQuery("MailDomainGroup.findByPersistedGroupAlias", mg, "persistedGroupAlias", mg.getPersistedGroupAlias());
+        
+        // when & then
+        assertEquals(Optional.of(mg), svc.findByAlias(mg.getPersistedGroupAlias()));
+    }
+    
+    private static Stream<Arguments> mailExamples() {
+        return Stream.of(
+            Arguments.of("foo@bar.com", Optional.of("bar.com")),
+            Arguments.of("foo@foo@bar.com", Optional.of("bar.com")),
+            Arguments.of("foobar.com", Optional.empty()));
+    }
+    
+    @ParameterizedTest
+    @MethodSource("mailExamples")
+    void getDomainFromMail(String mail, Optional<String> expected) {
+        assertEquals(expected, MailDomainGroupServiceBean.getDomainFromMail(mail));
+    }
+    
+    void mockQuery(String name, List<MailDomainGroup> results) {
+        TypedQuery mockedQuery = mock(TypedQuery.class);
+        when(mockedQuery.getResultList()).thenReturn(results);
+        when(this.svc.em.createNamedQuery(name, MailDomainGroup.class)).thenReturn(mockedQuery);
+    }
+    
+    void mockQuery(String name, MailDomainGroup result, String parameter, String value) {
+        TypedQuery mockedQuery = mock(TypedQuery.class);
+        when(mockedQuery.getSingleResult()).thenReturn(result);
+        when(mockedQuery.setParameter(parameter, value)).thenReturn(mockedQuery);
+        when(this.svc.em.createNamedQuery(name, MailDomainGroup.class)).thenReturn(mockedQuery);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupTest.java
new file mode 100644
index 00000000000..40c4ec8a904
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/maildomain/MailDomainGroupTest.java
@@ -0,0 +1,96 @@
+package edu.harvard.iq.dataverse.authorization.groups.impl.maildomain;
+
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class MailDomainGroupTest {
+    
+    DataverseRequest dvr = Mockito.mock(DataverseRequest.class);
+    
+    @Test
+    void testEmailDomains() {
+        // given
+        MailDomainGroup mdg = new MailDomainGroup();
+        List<String> domains = Arrays.asList("test.de", "foo.com", "bar.com");
+        String domainsStr = "test.de;foo.com;bar.com";
+        
+        // when
+        mdg.setEmailDomains(domainsStr);
+        // then
+        assertEquals(domains, mdg.getEmailDomainsAsList());
+        assertEquals(domainsStr, mdg.getEmailDomains());
+        
+        // when 2
+        mdg.setEmailDomains(domains);
+        // then 2
+        assertEquals(domains, mdg.getEmailDomainsAsList());
+        assertEquals(domainsStr, mdg.getEmailDomains());
+    }
+    
+    @Test
+    void testUnsupported() {
+        // given
+        MailDomainGroup a = new MailDomainGroup();
+        // when, then
+        assertThrows(UnsupportedOperationException.class, () -> { a.isEditable(); } );
+        assertThrows(UnsupportedOperationException.class, () -> { a.contains(dvr); } );
+    }
+    
+    @Test
+    void testHashCode() {
+        // given
+        MailDomainGroup a = new MailDomainGroup();
+        a.setEmailDomains("test.de;test2.de");
+        MailDomainGroup b = new MailDomainGroup();
+        a.setEmailDomains("test3.de;test4.de");
+        MailDomainGroup c = new MailDomainGroup();
+        c.setEmailDomains("test.de;test2.de");
+        
+        // when & then
+        assertNotEquals(a, b);
+        assertNotEquals(a, c);
+        assertNotEquals(a.hashCode(), b.hashCode());
+        assertNotEquals(a.hashCode(), c.hashCode());
+    }
+    
+    @Test
+    void testEquals() {
+        // given
+        MailDomainGroup a = new MailDomainGroup();
+        a.setEmailDomains("test.de;test2.de");
+        MailDomainGroup b = new MailDomainGroup();
+        b.setEmailDomains("foo.de;bar.de");
+        MailDomainGroup c = new MailDomainGroup();
+        c.setEmailDomains("test.de;test2.de");
+        
+        // when & then
+        assertEquals(a, c);
+        assertNotEquals(a, b);
+    }
+    
+    static Random rnd = new Random();
+    public static MailDomainGroup genGroup() {
+        MailDomainGroup t = new MailDomainGroup();
+        t.setId(rnd.nextLong());
+        t.setPersistedGroupAlias(RandomStringUtils.randomAlphanumeric(4));
+        t.setDisplayName(RandomStringUtils.randomAlphanumeric(8));
+        t.setDescription(RandomStringUtils.randomAlphanumeric(8));
+        t.setEmailDomains(RandomStringUtils.randomAlphanumeric(5)+".com;"+RandomStringUtils.randomAlphanumeric(5)+".co.uk");
+        return t;
+    }
+    
+    public static MailDomainGroup genRegexGroup() {
+        MailDomainGroup t = genGroup();
+        t.setEmailDomains(".+\\.com$");
+        t.setIsRegEx(true);
+        return t;
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProviderTest.java
index ebf22f9dcb4..ff51260d43e 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProviderTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProviderTest.java
@@ -7,9 +7,9 @@
 import edu.harvard.iq.dataverse.mocks.MockBuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.mocks.MockPasswordValidatorServiceBean;
 import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Before;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  *
@@ -22,7 +22,7 @@ public class BuiltinAuthenticationProviderTest {
     MockBuiltinUserServiceBean bean = null;
     AuthenticationServiceBean authBean = null;
     
-    @Before
+    @BeforeEach
     public void setup() {
         bean = new MockBuiltinUserServiceBean();
         passwordValidatorService = new MockPasswordValidatorServiceBean();
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPageTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPageTest.java
index e468ab55201..c81edd6d102 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPageTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPageTest.java
@@ -1,6 +1,6 @@
 package edu.harvard.iq.dataverse.authorization.providers.builtin;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
 import java.sql.Timestamp;
@@ -48,21 +48,22 @@ public void tearDown() {
   // provides inputs to testShowVerifyEmailButton()
   private static Stream<Arguments> provider_testShowVerifyEmailButton() {
     return Stream.of(
-        Arguments.of(true, null, false, false),
-        Arguments.of(false, null, false, true),
-        Arguments.of(false, null, true, false),
-        Arguments.of(false, null, true, true),
-        Arguments.of(false, new Timestamp(0), false, false), 
-        Arguments.of(false, new Timestamp(0), false, true),
-        Arguments.of(false, new Timestamp(0), true, false),
-        Arguments.of(false, new Timestamp(0), true, true)
+        Arguments.of(true, null, false, false, 1),
+        Arguments.of(true, null, false, true, 2),
+        Arguments.of(true, null, true, false, 3),
+        Arguments.of(true, null, true, true, 4),
+        Arguments.of(false, new Timestamp(0), false, false, 5), 
+        Arguments.of(false, new Timestamp(0), false, true, 6),
+        Arguments.of(false, new Timestamp(0), true, false, 7),
+        Arguments.of(false, new Timestamp(0), true, true, 8)
     );
   }
 
   @ParameterizedTest
   @MethodSource("provider_testShowVerifyEmailButton")
-  public void testShowVerifyEmailButton(boolean expected, Timestamp emailConfirmed, boolean confirmEmailData, boolean emailVerified) {
+  public void testShowVerifyEmailButton(boolean expected, Timestamp emailConfirmed, boolean confirmEmailData, boolean emailVerified, int counter) {
     user.setEmailConfirmed(emailConfirmed);
+    
     dataverseUserPage.setCurrentUser(user);
 
     if (confirmEmailData) {
@@ -71,6 +72,14 @@ public void testShowVerifyEmailButton(boolean expected, Timestamp emailConfirmed
     } else {
       Mockito.when(mockConfirmEmailService.findSingleConfirmEmailDataByUser(user)).thenReturn(null);
     }
+    
+    if(emailConfirmed != null){
+        
+    Mockito.when(mockConfirmEmailService.hasVerifiedEmail(user))
+          .thenReturn(true);
+    } else {
+      Mockito.when(mockConfirmEmailService.hasVerifiedEmail(user)).thenReturn(false);
+    }
 
     Mockito.when(mockAuthProvider.isEmailVerified()).thenReturn(emailVerified);
     Mockito.when(mockAuthService.lookupProvider(user)).thenReturn(mockAuthProvider);
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/AbstractOAuth2AuthenticationProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/AbstractOAuth2AuthenticationProviderTest.java
new file mode 100644
index 00000000000..a75cc2568b1
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/AbstractOAuth2AuthenticationProviderTest.java
@@ -0,0 +1,26 @@
+package edu.harvard.iq.dataverse.authorization.providers.oauth2;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class AbstractOAuth2AuthenticationProviderTest {
+    
+    AbstractOAuth2AuthenticationProvider idp;
+    
+    @BeforeEach
+    void setUp() {
+        this.idp = Mockito.mock(AbstractOAuth2AuthenticationProvider.class, Mockito.CALLS_REAL_METHODS);
+    }
+    
+    /**
+     * Ensure this is working as expected.
+     */
+    @Test
+    void getOrderDefaultValue() {
+        assertEquals(100, this.idp.getOrder());
+    }
+    
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2AuthenticationProviderFactoryTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2AuthenticationProviderFactoryTest.java
index 5838fdee42c..ae73c505a4b 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2AuthenticationProviderFactoryTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2AuthenticationProviderFactoryTest.java
@@ -2,8 +2,8 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBeanTest.java
new file mode 100644
index 00000000000..3a63371d7a8
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBeanTest.java
@@ -0,0 +1,267 @@
+package edu.harvard.iq.dataverse.authorization.providers.oauth2;
+
+import edu.harvard.iq.dataverse.DataverseSession;
+import edu.harvard.iq.dataverse.UserServiceBean;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.UserRecordIdentifier;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.GitHubOAuth2APTest;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import org.hamcrest.Matchers;
+import org.hamcrest.core.StringContains;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.*;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.omnifaces.util.Faces;
+
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.Flash;
+import jakarta.servlet.http.HttpServletRequest;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.Optional;
+import java.util.stream.Stream;
+import java.io.BufferedReader;
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class OAuth2LoginBackingBeanTest {
+    
+    OAuth2LoginBackingBean loginBackingBean = new OAuth2LoginBackingBean();
+    @Spy static AbstractOAuth2AuthenticationProvider testIdp = new GitHubOAuth2APTest();
+    
+    @Mock AuthenticationServiceBean authenticationServiceBean;
+    @Mock SystemConfig systemConfig;
+    @Mock UserServiceBean userService;
+    
+    Clock constantClock = Clock.fixed(Instant.now(), ZoneId.systemDefault());
+    
+    /**
+     * Save the current JSF context to reset after all test cases done.
+     * Without doing this, many tests will fail with NPEs while fetching the bundle,
+     * when the locale is received from the context.
+     */
+    static FacesContext save = Faces.getContext();
+    @AfterAll
+    static void cleanupFaces() {
+        Faces.setContext(save);
+    }
+    
+    @BeforeEach
+    void setUp() {
+        
+        // create a fixed (not running) clock for testing.
+        // --> reset the clock for every test to the fixed time, to avoid sideeffects of a DeLorean time travel
+        this.loginBackingBean.clock = constantClock;
+        this.loginBackingBean.authenticationSvc = this.authenticationServiceBean;
+        this.loginBackingBean.systemConfig = this.systemConfig;
+        this.loginBackingBean.userService = this.userService;
+        lenient().when(this.authenticationServiceBean.getOAuth2Provider(testIdp.getId())).thenReturn(testIdp);
+    }
+    
+    /**
+     * TODO: this should be a parameterized test case testing all providers available
+     */
+    @Test
+    void linkFor() {
+        // given
+        String redirectPage = "dataverse.xhtml"; // @see LoginPage.redirectPage
+        String callbackURL = "oauth2/callback.xhtml";
+        
+        // when
+        when(this.systemConfig.getOAuth2CallbackUrl()).thenReturn(callbackURL);
+        
+        String link = loginBackingBean.linkFor(testIdp.getId(), redirectPage);
+        
+        // then
+        assertThat(link, notNullValue());
+        assertThat(link, not(isEmptyString()));
+        assertThat(link, StringContains.containsString(testIdp.getService(callbackURL).getAuthorizationUrl()));
+    }
+    
+    @Nested
+    @DisplayName("Tests for exchangeCodeForToken()")
+    class ecft {
+        @Mock FacesContext facesContextMock;
+        @Mock ExternalContext externalContextMock;
+        @Mock Flash flashMock;
+        @Mock HttpServletRequest requestMock;
+        @Mock BufferedReader reader;
+        @Mock OAuth2FirstLoginPage newAccountPage;
+        @Mock DataverseSession session;
+        @Mock OAuth2TokenDataServiceBean oauth2Tokens;
+        Optional<String> redirect = Optional.of("/hellotest");
+        String state;
+        
+        @BeforeEach
+        void setUp() throws IOException {
+            loginBackingBean.newAccountPage = this.newAccountPage;
+            loginBackingBean.session = this.session;
+            loginBackingBean.oauth2Tokens = this.oauth2Tokens;
+            
+            // mock FacesContext to make the method testable
+            Faces.setContext(facesContextMock);
+            when(facesContextMock.getExternalContext()).thenReturn(externalContextMock);
+            when(externalContextMock.getRequest()).thenReturn(requestMock);
+            lenient().when(externalContextMock.getFlash()).thenReturn(flashMock);
+            lenient().when(requestMock.getReader()).thenReturn(reader);
+            
+            // Save the state as we need it for injection (necessary because of PKCE support)
+            state = loginBackingBean.createState(testIdp, this.redirect);
+            doReturn(state).when(requestMock).getParameter("state");
+            
+            // travel in time at least 10 milliseconds (remote calls & redirects are much likely longer)
+            // (if not doing this tests become flaky on fast machinas)
+            loginBackingBean.clock = Clock.offset(constantClock, Duration.ofMillis(10));
+        }
+        
+        @Test
+        void noCode() {
+            assertDoesNotThrow(() -> loginBackingBean.exchangeCodeForToken());
+            assertThat(loginBackingBean.getError(), Matchers.isA(OAuth2Exception.class));
+        }
+        
+        @Test
+        void newUser() throws Exception {
+            // GIVEN
+            String code = "randomstring";
+            OAuth2UserRecord userRecord = mock(OAuth2UserRecord.class);
+            String newUserRedirect = "/oauth2/firstLogin.xhtml";
+            
+            // fake the code received from the provider
+            when(requestMock.getParameter("code")).thenReturn(code);
+            // let's deep-fake the result of getUserRecord()
+            doReturn(userRecord).when(testIdp).getUserRecord(code, state, null);
+    
+            // WHEN (& then)
+            // capture the redirect target from the faces context
+            ArgumentCaptor<String> redirectUrlCaptor = ArgumentCaptor.forClass(String.class);
+            doNothing().when(externalContextMock).redirect(redirectUrlCaptor.capture());
+            
+            assertDoesNotThrow(() -> loginBackingBean.exchangeCodeForToken());
+            
+            // THEN
+            // verify that the user object is passed on to the first login page
+            verify(newAccountPage, times(1)).setNewUser(userRecord);
+            // verify that the user is redirected to the first login page
+            assertThat(redirectUrlCaptor.getValue(), equalTo(newUserRedirect));
+        }
+    
+        @Test
+        void existingUser() throws Exception {
+            // GIVEN
+            String code = "randomstring";
+            OAuth2UserRecord userRecord = mock(OAuth2UserRecord.class);
+            UserRecordIdentifier userIdentifier = mock(UserRecordIdentifier.class);
+            AuthenticatedUser user = mock(AuthenticatedUser.class);
+            OAuth2TokenData tokenData = mock(OAuth2TokenData.class);
+        
+            // fake the code received from the provider
+            when(requestMock.getParameter("code")).thenReturn(code);
+            // let's deep-fake the result of getUserRecord()
+            doReturn(userRecord).when(testIdp).getUserRecord(code, state, null);
+            doReturn(tokenData).when(userRecord).getTokenData();
+            // also fake the result of the lookup in the auth service
+            doReturn(userIdentifier).when(userRecord).getUserRecordIdentifier();
+            doReturn(user).when(authenticationServiceBean).lookupUser(userIdentifier);
+            doReturn(user).when(userService).updateLastLogin(user);
+        
+            // WHEN (& then)
+            // capture the redirect target from the faces context
+            ArgumentCaptor<String> redirectUrlCaptor = ArgumentCaptor.forClass(String.class);
+            doNothing().when(externalContextMock).redirect(redirectUrlCaptor.capture());
+    
+            assertDoesNotThrow(() -> loginBackingBean.exchangeCodeForToken());
+        
+            // THEN
+            // verify session handling: set the looked up user
+            verify(session, times(1)).setUser(user);
+            // verify that the user is redirected to the first login page
+            assertThat(redirectUrlCaptor.getValue(), equalTo(redirect.get()));
+        }
+    }
+    
+    @Test
+    void createStateFailNullIdp() {
+        // given
+        AbstractOAuth2AuthenticationProvider idp = null;
+        Optional<String> page = Optional.empty();
+        // when & then
+        assertThrows(IllegalArgumentException.class, () -> {
+            loginBackingBean.createState(idp, page);
+        });
+    }
+    
+    @ParameterizedTest(name = "\"{0}\" should be Optional.empty")
+    @NullSource
+    @EmptySource
+    @ValueSource(strings = {"    ", "\t"})
+    void parseStateFromRequestStateNullOrEmpty(String state) {
+        assertThat(loginBackingBean.parseStateFromRequest(state), is(Optional.empty()));
+    }
+    
+    @ParameterizedTest(name = "\"{0}\" should be Optional.empty")
+    @ValueSource(strings = {"test", "test~", "test~test"})
+    void parseStateFromRequestStateInvalidString(String state) {
+        assertThat(loginBackingBean.parseStateFromRequest(state), is(Optional.empty()));
+    }
+    
+    static Stream<Arguments> tamperedStates() {
+        return Stream.of(
+            // encrypted nonsense
+            Arguments.of(testIdp.getId() + "~" + StringUtil.encrypt("test", testIdp.getClientSecret())),
+            // expired timestamp < 0
+            Arguments.of(testIdp.getId() + "~" + StringUtil.encrypt(testIdp.getId()+"~-1", testIdp.getClientSecret())),
+            // expired timestamp (10 milliseconds to old...)
+            Arguments.of(testIdp.getId() + "~" + StringUtil.encrypt(testIdp.getId()+"~"+(System.currentTimeMillis()-OAuth2LoginBackingBean.STATE_TIMEOUT-10), testIdp.getClientSecret()))
+        );
+    }
+    @ParameterizedTest
+    @MethodSource("tamperedStates")
+    void parseStateFromRequestStateTampered(String state) {
+        assertThat(loginBackingBean.parseStateFromRequest(state), is(Optional.empty()));
+    }
+    
+    /**
+     * Testing for side effect with proper parameters.
+     */
+    static Stream<Arguments> provideStates() {
+        return Stream.of(
+            Arguments.of(Optional.of("dataverse.xhtml"), true),
+            Arguments.of(Optional.empty(), false)
+        );
+    }
+    @ParameterizedTest
+    @MethodSource("provideStates")
+    void parseStateFromRequestStateValid(Optional<String> redirectPage, boolean present) {
+        // given
+        String stateWithRedirect = loginBackingBean.createState(testIdp, redirectPage);
+        // travel in time at least 10 milliseconds (remote calls & redirects are much likely longer)
+        // (if not doing this tests become flaky on fast machinas)
+        loginBackingBean.clock = Clock.offset(constantClock, Duration.ofMillis(10));
+    
+        // when & then
+        assertThat(loginBackingBean.parseStateFromRequest(stateWithRedirect), is(Optional.of(testIdp)));
+        assertThat(loginBackingBean.redirectPage.isPresent(), is(present));
+        if (present) {
+            assertThat(loginBackingBean.redirectPage.get(), equalTo(redirectPage.get()));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2APTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2APTest.java
index 8b43b65f324..ed6b9789848 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2APTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2APTest.java
@@ -2,8 +2,10 @@
 
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2UserRecord;
+import org.junit.jupiter.api.Test;
 
 public class GitHubOAuth2APTest extends GitHubOAuth2AP {
 
@@ -57,5 +59,10 @@ public void testParseUserResponse() {
         assertEquals("21006", result.userIdInProvider);
 
     }
+    
+    public OAuth2UserRecord getExampleUserRecord() {
+        ParsedUserResponse res = parseUserResponse(GITHUB_RESPONSE);
+        return new OAuth2UserRecord(this.getId(), res.userIdInProvider, res.username, null, res.displayInfo, res.emails);
+    }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GoogleOAuth2APTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GoogleOAuth2APTest.java
index 5cb2788c3ee..cfba755d2a1 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GoogleOAuth2APTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GoogleOAuth2APTest.java
@@ -2,9 +2,9 @@
 
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
-import javax.json.Json;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import jakarta.json.Json;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 public class GoogleOAuth2APTest extends GoogleOAuth2AP {
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2APTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2APTest.java
index 0009820ee41..71bfc307f1c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2APTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2APTest.java
@@ -4,9 +4,13 @@
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2Exception;
 import java.util.Arrays;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -41,6 +45,15 @@ private static String loadResponseXML(String fname) {
 	    }
 	    return txt;
     }
+    
+    @ParameterizedTest
+    @CsvSource({"https://pub.orcid.org/v2.1/{ORCID}/person,/authenticate", "https://api.orcid.org/v2.0/{ORCID}/person,/read-limited"})
+    public void testPublicApiScope(String endpoint, String scope) {
+        // when
+        OrcidOAuth2AP provider = new OrcidOAuth2AP("clientId", "clientSecret", endpoint);
+        // then
+        assertEquals(scope, provider.getSpacedScope());
+    }
 
     @Test
     public void testParseUserResponse() {
@@ -82,14 +95,14 @@ public void testExtractOrcid() throws OAuth2Exception {
         assertEquals("0000-0001-2345-6789", sut.extractOrcidNumber(response));
     }
     
-    @Test( expected=OAuth2Exception.class )
+    @Test
     public void testExtractOrcidBad() throws OAuth2Exception {
         // sample response from https://members.orcid.org/api/tutorial/read-orcid-records
         String response = "{\"access_token\":\"f5af9f51-07e6-4332-8f1a-c0c11c1e3728\",\"token_type\":\"bearer\",\n" +
                             "\"refresh_token\":\"f725f747-3a65-49f6-a231-3e8944ce464d\",\"expires_in\":631138518,\n" +
                             "\"scope\":\"/read-limited\",\"name\":\"Sofia Garcia\"}";
         OrcidOAuth2AP sut = new OrcidOAuth2AP("clientId", "clientSecret", "userEndpoint");
-        sut.extractOrcidNumber(response);
+        assertThrows(OAuth2Exception.class, () -> sut.extractOrcidNumber(response));
     }
     
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactoryIT.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactoryIT.java
new file mode 100644
index 00000000000..0ca74ab2f2b
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactoryIT.java
@@ -0,0 +1,235 @@
+package edu.harvard.iq.dataverse.authorization.providers.oauth2.oidc;
+
+import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
+import com.nimbusds.openid.connect.sdk.claims.UserInfo;
+import dasniko.testcontainers.keycloak.KeycloakContainer;
+import edu.harvard.iq.dataverse.UserServiceBean;
+import edu.harvard.iq.dataverse.api.auth.BearerTokenAuthMechanism;
+import edu.harvard.iq.dataverse.api.auth.doubles.BearerTokenKeyContainerRequestTestFake;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2Exception;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2UserRecord;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.mocks.MockAuthenticatedUser;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import edu.harvard.iq.dataverse.util.testing.Tags;
+import org.htmlunit.FailingHttpStatusCodeException;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebResponse;
+import org.htmlunit.html.*;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.keycloak.OAuth2Constants;
+import org.keycloak.admin.client.Keycloak;
+import org.keycloak.admin.client.KeycloakBuilder;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static edu.harvard.iq.dataverse.authorization.providers.oauth2.oidc.OIDCAuthenticationProviderFactoryIT.clientId;
+import static edu.harvard.iq.dataverse.authorization.providers.oauth2.oidc.OIDCAuthenticationProviderFactoryIT.clientSecret;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.mockito.Mockito.when;
+
+@Tag(Tags.INTEGRATION_TEST)
+@Tag(Tags.USES_TESTCONTAINERS)
+@Testcontainers(disabledWithoutDocker = true)
+@ExtendWith(MockitoExtension.class)
+// NOTE: order is important here - Testcontainers must be first, otherwise it's not ready when we call getAuthUrl()
+@LocalJvmSettings
+@JvmSetting(key = JvmSettings.OIDC_CLIENT_ID, value = clientId)
+@JvmSetting(key = JvmSettings.OIDC_CLIENT_SECRET, value = clientSecret)
+@JvmSetting(key = JvmSettings.OIDC_AUTH_SERVER_URL, method = "getAuthUrl")
+class OIDCAuthenticationProviderFactoryIT {
+    
+    static final String clientId = "test";
+    static final String clientSecret = "94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8";
+    static final String realm = "test";
+    static final String realmAdminUser = "admin";
+    static final String realmAdminPassword = "admin";
+    
+    static final String adminUser = "kcadmin";
+    static final String adminPassword = "kcpassword";
+    
+    // The realm JSON resides in conf/keycloak/test-realm.json and gets avail here using <testResources> in pom.xml
+    @Container
+    static KeycloakContainer keycloakContainer = new KeycloakContainer("quay.io/keycloak/keycloak:26.3.2")
+        .withRealmImportFile("keycloak/test-realm.json")
+        .withAdminUsername(adminUser)
+        .withAdminPassword(adminPassword);
+    
+    // simple method to retrieve the issuer URL, referenced to by @JvmSetting annotations (do no delete)
+    private static String getAuthUrl() {
+        return keycloakContainer.getAuthServerUrl() + "/realms/" + realm;
+    }
+    
+    OIDCAuthProvider getProvider() throws Exception {
+        OIDCAuthProvider oidcAuthProvider = (OIDCAuthProvider) OIDCAuthenticationProviderFactory.buildFromSettings();
+        
+        assumeTrue(oidcAuthProvider.getMetadata().getTokenEndpointURI().toString()
+            .startsWith(keycloakContainer.getAuthServerUrl()));
+        
+        return oidcAuthProvider;
+    }
+    
+    // NOTE: This requires the "direct access grants" for the client to be enabled!
+    String getBearerTokenViaKeycloakAdminClient() throws Exception {
+        try (Keycloak keycloak = KeycloakBuilder.builder()
+            .serverUrl(keycloakContainer.getAuthServerUrl())
+            .grantType(OAuth2Constants.PASSWORD)
+            .realm(realm)
+            .clientId(clientId)
+            .clientSecret(clientSecret)
+            .username(realmAdminUser)
+            .password(realmAdminPassword)
+            .scope("openid")
+            .build()) {
+            return keycloak.tokenManager().getAccessTokenString();
+        }
+    }
+    
+    /**
+     * This basic test covers configuring an OIDC provider via MPCONFIG and being able to use it.
+     */
+    @Test
+    void testCreateProvider() throws Exception {
+        // given
+        OIDCAuthProvider oidcAuthProvider = getProvider();
+        String token = getBearerTokenViaKeycloakAdminClient();
+        assumeFalse(token == null);
+        
+        Optional<UserInfo> info = Optional.empty();
+        
+        // when
+        try {
+            info = oidcAuthProvider.getUserInfo(new BearerAccessToken(token));
+        } catch (OAuth2Exception e) {
+            System.out.println(e.getMessageBody());
+        }
+        
+        //then
+        assertTrue(info.isPresent());
+        assertEquals(realmAdminUser, info.get().getPreferredUsername());
+    }
+    
+    @Mock
+    UserServiceBean userService;
+    @Mock
+    AuthenticationServiceBean authService;
+    
+    @InjectMocks
+    BearerTokenAuthMechanism bearerTokenAuthMechanism;
+    
+    /**
+     * This test covers using an OIDC provider as authorization party when accessing the Dataverse API with a
+     * Bearer Token. See {@link BearerTokenAuthMechanism}. It needs to mock the auth service to avoid adding
+     * more dependencies.
+     */
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, varArgs = "api-bearer-auth", value = "true")
+    void testApiBearerAuth() throws Exception {
+        assumeFalse(userService == null);
+        assumeFalse(authService == null);
+        assumeFalse(bearerTokenAuthMechanism == null);
+        
+        // given
+        // Get the access token from the remote Keycloak in the container
+        String accessToken = getBearerTokenViaKeycloakAdminClient();
+        assumeFalse(accessToken == null);
+        
+        // This will also receive the details from the remote Keycloak in the container
+        String token = "Bearer " + accessToken;
+        BearerTokenKeyContainerRequestTestFake request = new BearerTokenKeyContainerRequestTestFake(token);
+        AuthenticatedUser user = new MockAuthenticatedUser();
+        
+        // setup mocks (we don't want or need a database here)
+        when(authService.lookupUserByOIDCBearerToken(token)).thenReturn(user);
+        when(userService.updateLastApiUseTime(user)).thenReturn(user);
+
+        // when (let's do this again, but now with the actual subject under test!)
+        User lookedUpUser = bearerTokenAuthMechanism.findUserFromRequest(request);
+        
+        // then
+        assertNotNull(lookedUpUser);
+        assertEquals(user, lookedUpUser);
+    }
+    
+    /**
+     * This test covers the {@link OIDCAuthProvider#buildAuthzUrl(String, String)} and
+     * {@link OIDCAuthProvider#getUserRecord(String, String, String)} methods that are used when
+     * a user authenticates via the JSF UI. It covers enabling PKCE, which is no hard requirement
+     * by the protocol, but might be required by some provider (as seen with Microsoft Azure AD).
+     * As we don't have a real browser, we use {@link WebClient} from HtmlUnit as a replacement.
+     */
+    @Test
+    @JvmSetting(key = JvmSettings.OIDC_PKCE_ENABLED, value = "true")
+    void testAuthorizationCodeFlowWithPKCE() throws Exception {
+        // given
+        String state = "foobar";
+        String callbackUrl = "http://localhost:8080/oauth2callback.xhtml";
+        
+        OIDCAuthProvider oidcAuthProvider = getProvider();
+        String authzUrl = oidcAuthProvider.buildAuthzUrl(state, callbackUrl);
+
+        try (WebClient webClient = new WebClient()) {
+            webClient.getOptions().setCssEnabled(false);
+            webClient.getOptions().setJavaScriptEnabled(false);
+            // We *want* to know about the redirect, as it contains the data we need!
+            webClient.getOptions().setRedirectEnabled(false);
+            
+            HtmlPage loginPage = webClient.getPage(authzUrl);
+            assumeTrue(loginPage.getTitleText().contains("Sign in to " + realm));
+            
+            HtmlForm form = loginPage.getForms().get(0);
+            HtmlInput username = form.getInputByName("username");
+            HtmlInput password = form.getInputByName("password");
+            HtmlButton submitButton = (HtmlButton) loginPage.getElementById("kc-login");
+
+            username.type(realmAdminUser);
+            password.type(realmAdminPassword);
+
+            FailingHttpStatusCodeException exception = assertThrows(FailingHttpStatusCodeException.class, submitButton::click);
+            assertEquals(302, exception.getStatusCode());
+            
+            WebResponse response = exception.getResponse();
+            assertNotNull(response);
+            
+            String callbackLocation = response.getResponseHeaderValue("Location");
+            assertTrue(callbackLocation.startsWith(callbackUrl));
+
+            String queryPart = callbackLocation.trim().split("\\?")[1];
+            Map<String,String> parameters = Pattern.compile("\\s*&\\s*")
+                .splitAsStream(queryPart)
+                .map(s -> s.split("=", 2))
+                .collect(Collectors.toMap(a -> a[0], a -> a.length > 1 ? a[1]: ""));
+
+            assertTrue(parameters.containsKey("code"));
+            assertTrue(parameters.containsKey("state"));
+            
+            OAuth2UserRecord userRecord = oidcAuthProvider.getUserRecord(
+                parameters.get("code"),
+                parameters.get("state"),
+                callbackUrl
+            );
+            
+            assertNotNull(userRecord);
+            assertEquals(realmAdminUser, userRecord.getUsername());
+        } catch (OAuth2Exception e) {
+            System.out.println(e.getMessageBody());
+            throw e;
+        }
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibUtilTest.java
index 58d32b7d2a1..9ace90ac496 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibUtilTest.java
@@ -3,74 +3,46 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
-import static org.junit.Assert.*;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import jakarta.servlet.http.HttpServletRequest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
-@RunWith(Enclosed.class)
 public class ShibUtilTest {
-
-    @RunWith(Parameterized.class)
-    public static class ShibUtilParamTest {
-
-        @Parameters
-        public static Collection<String[]> data() {
-            return Arrays.asList(new String[][] {
-                { "John", "Harvard", "John", "Harvard", null },
-                { "Guido", "van Rossum", "Guido", "van Rossum", null },
-                { "Philip Seymour", "Hoffman", "Philip Seymour", "Hoffman", "Philip Seymour Hoffman" },
-                { "Edward", "Cummings", "Edward;e e", "Cummings", null },
-                { "Edward", "Cummings", "Edward;e e", "Cummings", "e e cummings" },
-                { "Anthony", "Stark", "Tony;Anthony", "Stark", null },
-                { "Anthony", "Stark", "Anthony;Tony", "Stark", null },
-                { "Antoni", "Gaudí", "Antoni", "Gaudí i Cornet;Gaudí", null },
-                { "Jane", "Doe", null, null, "Jane Doe" },
-                /**
-                * @todo Make findBestFirstAndLastName smart enough to know that the last name
-                *       should be "Hoffman" rather than "Seymour".
-                */
-                { "Philip", "Seymour", null, null, "Philip Seymour Hoffman" },
-                { null, null, null, null, "" }
-            });
-        }
-
-        @Parameter
-        public String expectedFirstName;
-
-        @Parameter(1)
-        public String expectedLastName;
-
-        @Parameter(2)
-        public String actualFirstName;
-
-        @Parameter(3)
-        public String actualLastName;
-
-        @Parameter(4)
-        public String actualDisplayName;
-
-        @Test
-        public void testFindBestFirstAndLastName() {
-
-            // ShibUserNameFields expected1 = new ShibUserNameFields("John", "Harvard");
-            ShibUserNameFields actualValues = ShibUtil.findBestFirstAndLastName(actualFirstName, actualLastName, actualDisplayName);
-            assertEquals(expectedFirstName, actualValues.getFirstName());
-            assertEquals(expectedLastName, actualValues.getLastName());
-        }
+    
+    @ParameterizedTest
+    @CsvSource(value = {
+        "John,Harvard,John,Harvard,NULL",
+        "Guido,van Rossum,Guido,van Rossum,NULL",
+        "Philip Seymour,Hoffman,Philip Seymour,Hoffman,Philip Seymour Hoffman",
+        "Edward,Cummings,Edward;e e,Cummings,NULL",
+        "Edward,Cummings,Edward;e e,Cummings,e e cummings",
+        "Anthony,Stark,Tony;Anthony,Stark,NULL",
+        "Anthony,Stark,Anthony;Tony,Stark,NULL",
+        "Antoni,Gaudí,Antoni,Gaudí i Cornet;Gaudí,NULL",
+        "Jane,Doe,NULL,NULL,Jane Doe",
+        /**
+         * @todo Make findBestFirstAndLastName smart enough to know that the last name
+         *       should be "Hoffman" rather than "Seymour".
+         */
+        "Philip,Seymour,NULL,NULL,Philip Seymour Hoffman",
+        "NULL,NULL,NULL,NULL,EMPTY"
+    }, nullValues = "NULL", emptyValue = "EMPTY")
+    void testFindBestFirstAndLastName(String expectedFirstName, String expectedLastName, String actualFirstName,
+                                      String actualLastName, String actualDisplayName) {
+        // ShibUserNameFields expected1 = new ShibUserNameFields("John", "Harvard");
+        ShibUserNameFields actualValues = ShibUtil.findBestFirstAndLastName(actualFirstName, actualLastName, actualDisplayName);
+        assertEquals(expectedFirstName, actualValues.getFirstName());
+        assertEquals(expectedLastName, actualValues.getLastName());
     }
+    
 
     public static class ShibUtilNoParamTest {
 
@@ -130,16 +102,16 @@ public void testFindSingleValue() {
         }
 
         @Test
-        public void testGenerateFriendlyLookingUserIdentifer() {
+        public void testGenerateFriendlyLookingUserIdentifier() {
             int lengthOfUuid = UUID.randomUUID().toString().length();
-            assertEquals("uid1", ShibUtil.generateFriendlyLookingUserIdentifer("uid1", null));
-            assertEquals(" leadingWhiteSpace", ShibUtil.generateFriendlyLookingUserIdentifer(" leadingWhiteSpace", null));
-            assertEquals("uid1", ShibUtil.generateFriendlyLookingUserIdentifer("uid1", "email1@example.com"));
-            assertEquals("email1", ShibUtil.generateFriendlyLookingUserIdentifer(null, "email1@example.com"));
-            assertEquals(lengthOfUuid, ShibUtil.generateFriendlyLookingUserIdentifer(null, null).length());
-            assertEquals(lengthOfUuid, ShibUtil.generateFriendlyLookingUserIdentifer(null, "").length());
-            assertEquals(lengthOfUuid, ShibUtil.generateFriendlyLookingUserIdentifer("", null).length());
-            assertEquals(lengthOfUuid, ShibUtil.generateFriendlyLookingUserIdentifer(null, "junkEmailAddress").length());
+            assertEquals("uid1", ShibUtil.generateFriendlyLookingUserIdentifier("uid1", null));
+            assertEquals(" leadingWhiteSpace", ShibUtil.generateFriendlyLookingUserIdentifier(" leadingWhiteSpace", null));
+            assertEquals("uid1", ShibUtil.generateFriendlyLookingUserIdentifier("uid1", "email1@example.com"));
+            assertEquals("email1", ShibUtil.generateFriendlyLookingUserIdentifier(null, "email1@example.com"));
+            assertEquals(lengthOfUuid, ShibUtil.generateFriendlyLookingUserIdentifier(null, null).length());
+            assertEquals(lengthOfUuid, ShibUtil.generateFriendlyLookingUserIdentifier(null, "").length());
+            assertEquals(lengthOfUuid, ShibUtil.generateFriendlyLookingUserIdentifier("", null).length());
+            assertEquals(lengthOfUuid, ShibUtil.generateFriendlyLookingUserIdentifier(null, "junkEmailAddress").length());
         }
 
         @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUserTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUserTest.java
index a756d7cd69e..bd3bfcc1a60 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUserTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUserTest.java
@@ -5,24 +5,44 @@
  */
 package edu.harvard.iq.dataverse.authorization.users;
 
-import edu.harvard.iq.dataverse.DatasetLock;
+import edu.harvard.iq.dataverse.UserNotification;
+import edu.harvard.iq.dataverse.UserNotification.Type;
+import edu.harvard.iq.dataverse.UserNotificationServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserLookup;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import java.sql.Timestamp;
 import java.util.Date;
-import java.util.List;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Before;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 /**
  * Tested class: AuthenticatedUser.java
  *
  * @author bsilverstein
  */
+@ExtendWith(MockitoExtension.class)
 public class AuthenticatedUserTest {
 
+    @Mock
+    private SettingsServiceBean settingsServiceBean;
+    @InjectMocks
+    private UserNotificationServiceBean userNotificationService;
+
     public AuthenticatedUserTest() {
     }
 
@@ -30,8 +50,9 @@ public AuthenticatedUserTest() {
     public static Timestamp expResult;
     public static Timestamp loginTime = Timestamp.valueOf("2000-01-01 00:00:00.0");
     public static final String IDENTIFIER_PREFIX = "@";
+    public static final Set<Type> mutedTypes = EnumSet.of(Type.ASSIGNROLE, Type.REVOKEROLE);
 
-    @Before
+    @BeforeEach
     public void setUp() {
         testUser = MocksFactory.makeAuthenticatedUser("Homer", "Simpson");
         expResult = testUser.getCreatedTime();
@@ -320,6 +341,100 @@ public void testHashCode() {
         int result = instance.hashCode();
         assertEquals(expResult, result);
     }
+
+    @Test
+    public void testMutingEmails() {
+        System.out.println("setMutedEmails");
+        testUser.setMutedEmails(mutedTypes);
+        assertEquals(mutedTypes, testUser.getMutedEmails());
+    }
+
+    @Test
+    public void testMutingNotifications() {
+        System.out.println("setMutedNotifications");
+        testUser.setMutedNotifications(mutedTypes);
+        assertEquals(mutedTypes, testUser.getMutedNotifications());
+    }
+
+    @Test
+    public void testMutingInJson() {
+        testUser.setMutedEmails(mutedTypes);
+        testUser.setMutedNotifications(mutedTypes);
+        System.out.println("toJson");
+        JsonObject jObject = testUser.toJson().build();
+
+        Set<String> mutedEmails = new HashSet<>(jObject.getJsonArray("mutedEmails").getValuesAs(JsonString::getString));
+        assertTrue(mutedEmails.size() == 2, "Set contains two elements");
+        assertTrue(mutedEmails.contains("REVOKEROLE"), "Set contains REVOKEROLE");
+        assertTrue(mutedEmails.contains("ASSIGNROLE"), "Set contains ASSIGNROLE");
+
+        Set<String> mutedNotifications = new HashSet<>(jObject.getJsonArray("mutedNotifications").getValuesAs(JsonString::getString));
+        assertTrue(mutedNotifications.size() == 2, "Set contains two elements");
+        assertTrue(mutedNotifications.contains("REVOKEROLE"), "Set contains REVOKEROLE");
+        assertTrue(mutedNotifications.contains("ASSIGNROLE"), "Set contains ASSIGNROLE");
+    }
+
+    @Test
+    public void testHasEmailMuted() {
+        testUser.setMutedEmails(mutedTypes);
+        System.out.println("hasEmailMuted");
+        assertTrue(testUser.hasEmailMuted(Type.ASSIGNROLE));
+        assertTrue(testUser.hasEmailMuted(Type.REVOKEROLE));
+        assertFalse(testUser.hasEmailMuted(Type.CREATEDV));
+        assertFalse(testUser.hasEmailMuted(null));
+    }
+
+    @Test
+    public void testHasNotificationsMutedMuted() {
+        testUser.setMutedNotifications(mutedTypes);
+        System.out.println("hasNotificationMuted");
+        assertTrue(testUser.hasNotificationMuted(Type.ASSIGNROLE));
+        assertTrue(testUser.hasNotificationMuted(Type.REVOKEROLE));
+        assertFalse(testUser.hasNotificationMuted(Type.CREATEDV));
+        assertFalse(testUser.hasNotificationMuted(null));
+    }
+
+    @Test
+    public void testTypeTokenizer() {
+        final Set<Type> typeSet = Type.tokenizeToSet(
+            Type.toStringValue(
+                Type.tokenizeToSet(" ASSIGNROLE , CREATEDV,REVOKEROLE  ")
+            )
+        );
+        assertTrue(typeSet.size() == 3, "typeSet contains 3 elements");
+        assertTrue(typeSet.contains(Type.ASSIGNROLE), "typeSet contains ASSIGNROLE");
+        assertTrue(typeSet.contains(Type.CREATEDV), "typeSet contains CREATEDV");
+        assertTrue(typeSet.contains(Type.REVOKEROLE), "typeSet contains REVOKEROLE");
+    }
+
+    @Test
+    public void testIsEmailMuted() {
+        testUser.setMutedEmails(mutedTypes);
+        UserNotification userNotification = new UserNotification();
+        userNotification.setUser(testUser);
+        userNotification.setSendDate(null);
+        userNotification.setObjectId(null);
+        userNotification.setRequestor(null);
+        userNotification.setType(Type.ASSIGNROLE); // muted
+        assertTrue(userNotificationService.isEmailMuted(userNotification));
+        userNotification.setType(Type.APIGENERATED); // not muted
+        assertFalse(userNotificationService.isEmailMuted(userNotification));
+    }
+
+    @Test
+    public void isNotificationMuted() {
+        testUser.setMutedNotifications(mutedTypes);
+        UserNotification userNotification = new UserNotification();
+        userNotification.setUser(testUser);
+        userNotification.setSendDate(null);
+        userNotification.setObjectId(null);
+        userNotification.setRequestor(null);
+        userNotification.setType(Type.ASSIGNROLE); // muted
+        assertTrue(userNotificationService.isNotificationMuted(userNotification));
+        userNotification.setType(Type.APIGENERATED); // not muted
+        assertFalse(userNotificationService.isNotificationMuted(userNotification));
+    }
+
     /**
      * All commented tests below have only been generated / are not complete for
      * AuthenticatedUser.java The tests above should all run fine, due to time
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/users/PrivateUrlUserTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/users/PrivateUrlUserTest.java
index a8dda2f6a7e..d3c5cdca470 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/users/PrivateUrlUserTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/users/PrivateUrlUserTest.java
@@ -38,7 +38,7 @@ void getIdentifier() {
     @Test
     void testGetDisplayInfo() {
         RoleAssigneeDisplayInfo displayInfo = privateUrlUser.getDisplayInfo();
-        assertEquals("Private URL Enabled", displayInfo.getTitle());
+        assertEquals("Preview URL Enabled", displayInfo.getTitle());
         assertNull(displayInfo.getEmailAddress());
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/branding/BrandingUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/branding/BrandingUtilTest.java
index a57f73bd7a7..0a6d89ed490 100644
--- a/src/test/java/edu/harvard/iq/dataverse/branding/BrandingUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/branding/BrandingUtilTest.java
@@ -1,55 +1,149 @@
 package edu.harvard.iq.dataverse.branding;
 
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class BrandingUtilTest {
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mockito;
 
-    @Test
-    public void testGetInstallationBrandName() {
-        System.out.println("testGetInstallationBrandName");
-        assertEquals("LibraScholar", BrandingUtil.getInstallationBrandName("LibraScholar"));
-        assertEquals(null, BrandingUtil.getInstallationBrandName(null));// misconfiguration to set to null
-        assertEquals("", BrandingUtil.getInstallationBrandName(""));// misconfiguration to set to empty string
+public class BrandingUtilTest {
+    
+    static DataverseServiceBean dataverseSvc;
+    static SettingsServiceBean settingsSvc;
+    static final String DEFAULT_NAME = "LibraScholar";
+    
+    final Logger log = Logger.getLogger(this.getClass().getCanonicalName());
+    
+    /**
+     * Create default mocks, reusable for other tests.
+     * Each call will create new, fresh mocks. (So this should ensure atomic tests to some degree...)
+     */
+    @BeforeAll
+    public static void setupMocks() {
+        dataverseSvc = Mockito.mock(DataverseServiceBean.class);
+        settingsSvc = Mockito.mock(SettingsServiceBean.class);
+        BrandingUtil.injectServices(dataverseSvc, settingsSvc);
+        
+        // initial values (needed here for other tests where this method is reused!)
+        Mockito.lenient().when(settingsSvc.getValueForKey(SettingsServiceBean.Key.InstallationName)).thenReturn(DEFAULT_NAME);
+        Mockito.lenient().when(dataverseSvc.getRootDataverseName()).thenReturn(DEFAULT_NAME);
     }
-
-    @Test
-    public void testGetSupportTeamName() throws AddressException, UnsupportedEncodingException {
-        System.out.println("testGetSupportTeamName");
-        assertEquals("Support", BrandingUtil.getSupportTeamName(null, null));
-        assertEquals("Support", BrandingUtil.getSupportTeamName(null, ""));
-        assertEquals("LibraScholar Support", BrandingUtil.getSupportTeamName(null, "LibraScholar"));
-        assertEquals("LibraScholar Support", BrandingUtil.getSupportTeamName(new InternetAddress("support@librascholar.edu"), "LibraScholar"));
-        assertEquals("LibraScholar Support Team", BrandingUtil.getSupportTeamName(new InternetAddress("support@librascholar.edu", "LibraScholar Support Team"), "LibraScholar"));
-        assertEquals("", BrandingUtil.getSupportTeamName(new InternetAddress("support@librascholar.edu", ""), "LibraScholar")); // misconfiguration to set to empty string
+    
+    /**
+     * Override default mocked value
+     * @param installationName
+     */
+    public static void setInstallationName(String installationName) {
+        Mockito.lenient().when(settingsSvc.getValueForKey(SettingsServiceBean.Key.InstallationName)).thenReturn(installationName);
+    }
+    
+    /**
+     * Override default mocked name
+     * @param rootDataverseName
+     */
+    public static void setRootDataverseName(String rootDataverseName) {
+        Mockito.lenient().when(dataverseSvc.getRootDataverseName()).thenReturn(rootDataverseName);
+    }
+    
+    /**
+     * After using, please free the mocks. Tests need atomicity.
+     */
+    @AfterAll
+    public static void tearDownMocks() {
+        BrandingUtil.injectServices(null, null);
+    }
+    
+    /**
+     * Reset to default values before each test, trying to provide atomicity.
+     */
+    @BeforeEach
+    void setDefaultMockValues() {
+        Mockito.when(settingsSvc.getValueForKey(SettingsServiceBean.Key.InstallationName)).thenReturn(DEFAULT_NAME);
+        Mockito.when(dataverseSvc.getRootDataverseName()).thenReturn(DEFAULT_NAME);
+    }
+    
+    @ParameterizedTest
+    @CsvSource(value ={
+        "NULL, " + DEFAULT_NAME, // (Defaults to root collection name)
+        "NotLibraScholar, NotLibraScholar"
+    }, nullValues = {"NULL"})
+    public void testGetInstallationBrandName(String mockedInstallationName, String expected) {
+        // given
+        Mockito.when(settingsSvc.getValueForKey(SettingsServiceBean.Key.InstallationName)).thenReturn(mockedInstallationName);
+        // when & then
+        assertEquals(expected, BrandingUtil.getInstallationBrandName());
+    }
+    
+    static Stream<Arguments> supportTeamName() throws UnsupportedEncodingException, AddressException {
+        // expected string, InternetAddress
+        return Stream.of(
+            Arguments.of(null, "Support", null),
+            Arguments.of("", "Support", null),
+            Arguments.of(DEFAULT_NAME, DEFAULT_NAME + " Support", null),
+            Arguments.of(DEFAULT_NAME, DEFAULT_NAME + " Support", new InternetAddress("support@librascholar.edu")),
+            Arguments.of(DEFAULT_NAME, "LibraScholar Support Team", new InternetAddress("support@librascholar.edu", "LibraScholar Support Team")),
+            // misconfiguration to set to empty string
+            Arguments.of(DEFAULT_NAME, "", new InternetAddress("support@librascholar.edu", ""))
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("supportTeamName")
+    public void testGetSupportTeamName(String mockedRootName, String expected, InternetAddress email) throws AddressException, UnsupportedEncodingException {
+        // given
+        Mockito.when(dataverseSvc.getRootDataverseName()).thenReturn(mockedRootName);
+        // when & then
+        assertEquals(expected, BrandingUtil.getSupportTeamName(email));
     }
 
-    @Test
-    public void testGetSupportEmailAddress() throws AddressException, UnsupportedEncodingException {
-        System.out.println("testGetSupportEmailAddress");
-        assertEquals(null, BrandingUtil.getSupportTeamEmailAddress(null));
-        assertEquals("support@librascholar.edu", BrandingUtil.getSupportTeamEmailAddress(new InternetAddress("support@librascholar.edu")));
-        assertEquals("support@librascholar.edu", BrandingUtil.getSupportTeamEmailAddress(new InternetAddress("support@librascholar.edu", "LibraScholar Support Team")));
-        assertEquals("support@librascholar.edu", BrandingUtil.getSupportTeamEmailAddress(new InternetAddress("support@librascholar.edu", ""))); // misconfiguration to set to empty string but doesn't matter
-        assertEquals(null, BrandingUtil.getSupportTeamEmailAddress(new InternetAddress(null, "LibraScholar Support Team"))); // misconfiguration to set to null
-        assertEquals("", BrandingUtil.getSupportTeamEmailAddress(new InternetAddress("", "LibraScholar Support Team"))); // misconfiguration to set to empty string
+    static Stream<Arguments> supportEmailAddress() throws UnsupportedEncodingException, AddressException {
+        // expected string, InternetAddress
+        return Stream.of(
+            Arguments.of(null, null),
+            Arguments.of("support@librascholar.edu", new InternetAddress("support@librascholar.edu")),
+            Arguments.of("support@librascholar.edu", new InternetAddress("support@librascholar.edu", "LibraScholar")),
+            // misconfiguration to set to empty string but doesn't matter
+            Arguments.of("support@librascholar.edu", new InternetAddress("support@librascholar.edu", "")),
+            // misconfiguration to set to null
+            Arguments.of(null, new InternetAddress(null, "LibraScholar Support Team")),
+            // misconfiguration to set to empty string
+            Arguments.of("", new InternetAddress("", "LibraScholar Support Team"))
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("supportEmailAddress")
+    public void testGetSupportEmailAddress(String expected, InternetAddress email) {
+        assertEquals(expected, BrandingUtil.getSupportTeamEmailAddress(email));
     }
 
     @Test
-    public void testWelcomeInAppNotification() {
-        System.out.println("testWelcomeInAppNotification");
+    public void testWelcomeInAppNotification(TestInfo testInfo) {
+        log.fine(testInfo.getDisplayName());
         String message = BundleUtil.getStringFromBundle("notification.welcome",
                 Arrays.asList(
                         "LibraScholar",
                         "<a href=\"http://guides.dataverse.org/en/4.3/user/index.html\">User Guide</a>",
                         "<a href=\"https://demo.dataverse.org\">Demo Site</a>"
-                ));
-        System.out.println("message: " + message);
+                ))
+                + " " + BundleUtil.getStringFromBundle("notification.welcomeConfirmEmail");
+        log.fine("message: " + message);
         assertEquals("Welcome to LibraScholar! Get started by adding or finding data. "
                 + "Have questions? Check out the <a href=\"http://guides.dataverse.org/en/4.3/user/index.html\">User Guide</a>."
                 + " Want to test out Dataverse features? Use our <a href=\"https://demo.dataverse.org\">Demo Site</a>."
@@ -58,8 +152,8 @@ public void testWelcomeInAppNotification() {
     }
 
     @Test
-    public void testWelcomeEmail() {
-        System.out.println("testWelcomeEmail");
+    public void testWelcomeEmail(TestInfo testInfo) {
+        log.fine(testInfo.getDisplayName());
         String message = BundleUtil.getStringFromBundle("notification.email.welcome",
                 Arrays.asList(
                         "LibraScholar",
@@ -68,7 +162,7 @@ public void testWelcomeEmail() {
                         "LibraScholar Support",
                         "support@librascholar.edu"
                 ));
-        System.out.println("message: " + message);
+        log.fine("message: " + message);
         assertEquals("Welcome to LibraScholar! Get started by adding or finding data. "
                 + "Have questions? Check out the User Guide at http://guides.librascholar.edu/en/4.3/user or"
                 + " contact LibraScholar Support at support@librascholar.edu for assistance.",
@@ -76,34 +170,34 @@ public void testWelcomeEmail() {
     }
 
     @Test
-    public void testEmailClosing() {
-        System.out.println("testEmailClosing");
+    public void testEmailClosing(TestInfo testInfo) {
+        log.fine(testInfo.getDisplayName());
         String message = BundleUtil.getStringFromBundle("notification.email.closing",
                 Arrays.asList(
                         "support@librascholar.edu",
                         "LibraScholar Support Team"
                 ));
-        System.out.println("message: " + message);
+        log.fine("message: " + message);
         assertEquals("\n\nYou may contact us for support at support@librascholar.edu.\n\nThank you,\nLibraScholar Support Team",
                 message);
     }
 
     @Test
-    public void testEmailSubject() {
-        System.out.println("testEmailSubject");
+    public void testEmailSubject(TestInfo testInfo) {
+        log.fine(testInfo.getDisplayName());
         String message = BundleUtil.getStringFromBundle("notification.email.create.account.subject",
                 Arrays.asList(
                         "LibraScholar"
                 ));
-        System.out.println("message: " + message);
+        log.fine("message: " + message);
         assertEquals("LibraScholar: Your account has been created",
                 message);
     }
 
     @Test
     public void testGetContactHeader() {
-        System.out.println("testGetContactHeader");
-        assertEquals("Contact Support", BrandingUtil.getContactHeader(null, null));
+        Mockito.when(dataverseSvc.getRootDataverseName()).thenReturn(null);
+        assertEquals("Contact Support", BrandingUtil.getContactHeader(null));
     }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailDataTest.java b/src/test/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailDataTest.java
index 45c4162188a..10de20239e5 100644
--- a/src/test/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailDataTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailDataTest.java
@@ -1,11 +1,11 @@
 package edu.harvard.iq.dataverse.confirmemail;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 
@@ -14,13 +14,13 @@ public class ConfirmEmailDataTest {
     private ConfirmEmailData instance;
     private AuthenticatedUser user;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         this.user = new AuthenticatedUser();
         this.instance = new ConfirmEmailData(user, 60);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         this.instance = null;
         this.user = null;
diff --git a/src/test/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailUtilTest.java
index 8fdc7dc38d5..43795f0114f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailUtilTest.java
@@ -1,61 +1,41 @@
 package edu.harvard.iq.dataverse.confirmemail;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.Arrays;
+import java.util.stream.Stream;
 
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@RunWith(Enclosed.class)
 public class ConfirmEmailUtilTest {
-
-    @RunWith(Parameterized.class)
-    public static class ConfirmEmailUtilParamTest {
-
-        public String timeAsFriendlyString;
-        public int timeInMinutes;
-
-        public ConfirmEmailUtilParamTest(String timeAsFriendlyString, int timeInSeconds) {
-            this.timeAsFriendlyString = timeAsFriendlyString;
-            this.timeInMinutes = timeInSeconds;
-        }
-
-        @Parameters
-        public static Collection<Object[]> parameters() {
-            return Arrays.asList(
-                    new Object[][] { 
-                        { "48 hours", 2880 }, 
-                        { "24 hours", 1440 },
-                        { "2.75 hours", 165 },
-                        { "2.5 hours", 150 },
-                        { "1.5 hours", 90 }, 
-                        { "1 hour", 60 }, 
-                        { "30 minutes", 30 }, 
-                        { "1 minute", 1 } 
-                    }
-            );
-        }
-
-        @Test
-        public void friendlyExpirationTimeTest() {
-            assertEquals(timeAsFriendlyString, ConfirmEmailUtil.friendlyExpirationTime(timeInMinutes));
-        }
+    
+    static Stream<Arguments> dataPoints() {
+        return Stream.of(
+            Arguments.of("48 hours", 2880),
+            Arguments.of("24 hours", 1440),
+            Arguments.of("2.75 hours", 165),
+            Arguments.of("2.5 hours", 150),
+            Arguments.of("1.5 hours", 90),
+            Arguments.of("1 hour", 60),
+            Arguments.of("30 minutes", 30),
+            Arguments.of("1 minute", 1)
+        );
     }
-
-    public static class ConfirmEmailUtilNoParamTest {
-
-        @Test
-        public void testGrandfatheredTime() {
-            System.out.println();
-            System.out.println("Grandfathered account timestamp test");
-            System.out.println("Grandfathered Time (y2k): " + ConfirmEmailUtil.getGrandfatheredTime());
-            assertEquals(Timestamp.valueOf("2000-01-01 00:00:00.0"), ConfirmEmailUtil.getGrandfatheredTime());
-            System.out.println();
-        }
+    
+    @ParameterizedTest
+    @MethodSource("dataPoints")
+    void friendlyExpirationTimeTest(String timeAsFriendlyString, int timeInMinutes) {
+        assertEquals(timeAsFriendlyString, ConfirmEmailUtil.friendlyExpirationTime(timeInMinutes));
+    }
+    
+    @Test
+    void testGrandfatheredTime() {
+        //System.out.println("Grandfathered account timestamp test");
+        //System.out.println("Grandfathered Time (y2k): " + ConfirmEmailUtil.getGrandfatheredTime());
+        assertEquals(Timestamp.valueOf("2000-01-01 00:00:00.0"), ConfirmEmailUtil.getGrandfatheredTime());
+        //System.out.println();
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java
index a1a96a363ed..f7ce061fb24 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/DataAccessTest.java
@@ -2,6 +2,7 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -12,12 +13,15 @@
 public class DataAccessTest {
   DataFile datafile;
   Dataset dataset;
+  Dataverse dataverse;
 
   @BeforeEach
   void setUp() {
     datafile = MocksFactory.makeDataFile();
     dataset = MocksFactory.makeDataset();
+    dataverse = MocksFactory.makeDataverse();
     datafile.setOwner(dataset);
+    dataset.setOwner(dataverse);
   }
 
   @Test
@@ -50,7 +54,29 @@ void testCreateNewStorageIO_throwsOnUnsupported() {
 
   @Test
   void testCreateNewStorageIO_createsFileAccessIObyDefault() throws IOException {
+	System.setProperty("dataverse.files.file.type", "file");
+	System.setProperty("dataverse.files.storage-driver-id", "file");
     StorageIO<Dataset> storageIo = DataAccess.createNewStorageIO(dataset, "valid-tag");
     assertTrue(storageIo.getClass().equals(FileAccessIO.class));
   }
+  
+  @Test
+  void testGetLocationFromStorageId() {
+      Dataset d = new Dataset();
+      d.setAuthority("10.5072");
+      d.setIdentifier("FK2/ABCDEF");
+      assertEquals("s3://10.5072/FK2/ABCDEF/18b39722140-50eb7d3c5ece",
+              DataAccess.getLocationFromStorageId("s3://18b39722140-50eb7d3c5ece", d));
+      assertEquals("10.5072/FK2/ABCDEF/18b39722140-50eb7d3c5ece",
+              DataAccess.getLocationFromStorageId("18b39722140-50eb7d3c5ece", d));
+
+  }
+  
+  @Test
+  void testGetStorageIdFromLocation() {
+      assertEquals("file://18b39722140-50eb7d3c5ece",
+              DataAccess.getStorageIdFromLocation("file://10.5072/FK2/ABCDEF/18b39722140-50eb7d3c5ece"));
+      assertEquals("s3://18b39722140-50eb7d3c5ece",
+              DataAccess.getStorageIdFromLocation("s3://bucketname:10.5072/FK2/ABCDEF/18b39722140-50eb7d3c5ece"));
+  }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java
index 96c74515c76..ea5cc4b66a8 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIOTest.java
@@ -9,6 +9,8 @@
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.util.FileUtil;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -21,10 +23,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  *
@@ -39,12 +44,14 @@ public class FileAccessIOTest {
     private Dataset dataset;
     private DataFile dataFile;
 
+    private String dummyDriverId = "dummmy";
+    
     private Path fileSystemPath = new File("/tmp/files/tmp/dataset/Dataset").toPath();
 
     public FileAccessIOTest() {
     }
 
-    @Before
+    @BeforeEach
     public void setUpClass() throws IOException {
         dataverse = MocksFactory.makeDataverse();
         dataset = MocksFactory.makeDataset();
@@ -56,10 +63,10 @@ public void setUpClass() throws IOException {
         dataFile = MocksFactory.makeDataFile();
         dataFile.setOwner(dataset);
         dataFile.setStorageIdentifier("DataFile");
-
-        datasetAccess = new FileAccessIO<>(dataset);
-        dataFileAccess = new FileAccessIO<>(dataFile);
-        dataverseAccess = new FileAccessIO<>(dataverse);
+        
+        datasetAccess = new FileAccessIO<>(dataset,null, dummyDriverId);
+        dataFileAccess = new FileAccessIO<>(dataFile, null, dummyDriverId);
+        dataverseAccess = new FileAccessIO<>(dataverse, null, dummyDriverId);
 
         File file = new File("/tmp/files/tmp/dataset/Dataset");
         file.getParentFile().mkdirs();
@@ -70,7 +77,7 @@ public void setUpClass() throws IOException {
         }
     }
 
-    @After
+    @AfterEach
     public void tearDownClass() throws IOException {
         FileUtils.deleteDirectory(new File("/tmp/files/"));
     }
@@ -82,20 +89,20 @@ public void tearDownClass() throws IOException {
      */
     @Test
     public void testOpen() throws IOException {
-        assertEquals(false, datasetAccess.canRead());
-        assertEquals(false, datasetAccess.canWrite());
+        assertFalse(datasetAccess.canRead());
+        assertFalse(datasetAccess.canWrite());
 
         datasetAccess.open(DataAccessOption.READ_ACCESS);
-        assertEquals(true, datasetAccess.canRead());
-        assertEquals(false, datasetAccess.canWrite());
+        assertTrue(datasetAccess.canRead());
+        assertFalse(datasetAccess.canWrite());
 
         datasetAccess.open(DataAccessOption.WRITE_ACCESS);
-        assertEquals(false, datasetAccess.canRead());
-        assertEquals(true, datasetAccess.canWrite());
+        assertFalse(datasetAccess.canRead());
+        assertTrue(datasetAccess.canWrite());
 
         dataFileAccess.open(DataAccessOption.READ_ACCESS);
-        assertEquals(true, dataFileAccess.canRead());
-        assertEquals(false, dataFileAccess.canWrite());
+        assertTrue(dataFileAccess.canRead());
+        assertFalse(dataFileAccess.canWrite());
     }
 
     /**
@@ -126,7 +133,7 @@ public void testOpenAuxChannel() throws IOException {
      */
     @Test
     public void testIsAuxObjectCached() throws IOException {
-        assertEquals(true, datasetAccess.isAuxObjectCached("Dataset"));
+        assertTrue(datasetAccess.isAuxObjectCached("Dataset"));
     }
 
     /**
@@ -209,7 +216,7 @@ public void testDeleteAuxObject() throws IOException {
      */
     @Test
     public void testGetStorageLocation() {
-        String expResult = "file:///tmp/files/tmp/dataset/Dataset";
+        String expResult = dummyDriverId + ":///tmp/files/tmp/dataset/Dataset";
         String result = datasetAccess.getStorageLocation();
         assertEquals(expResult, result);
     }
@@ -283,4 +290,31 @@ public void testGetAuxFileAsInputStream() throws IOException {
         }
         assertEquals("This is a test string\n", sb.toString());
     }
+    
+    @Test
+    public void testFileIdentifierFormats() throws IOException {
+        System.setProperty("dataverse.files.filetest.type", "file");
+        System.setProperty("dataverse.files.filetest.label", "Ftest");
+        System.setProperty("dataverse.files.filetest.directory", "/tmp/mydata");
+
+        FileUtil.generateStorageIdentifier();
+        assertTrue(DataAccess.isValidDirectStorageIdentifier("filetest://" + FileUtil.generateStorageIdentifier()));
+        //The tests here don't use a valid identifier string
+        assertFalse(DataAccess.isValidDirectStorageIdentifier(dataFile.getStorageIdentifier()));
+        //bad store id
+        String defaultType = System.getProperty("dataverse.files.file.type");
+        //Assure file isn't a defined store before test and reset afterwards if it was
+        System.clearProperty("dataverse.files.file.type");
+        assertFalse(DataAccess.isValidDirectStorageIdentifier("file://" + FileUtil.generateStorageIdentifier()));
+        if(defaultType!=null) {
+            System.out.println("dataverse.files.file.type reset to " + defaultType);
+            System.setProperty("dataverse.files.file.type", defaultType);
+        }
+        //breakout
+        assertFalse(DataAccess.isValidDirectStorageIdentifier("filetest://../" + FileUtil.generateStorageIdentifier()));
+        
+        System.clearProperty("dataverse.files.filetest.type");
+        System.clearProperty("dataverse.files.filetest.label");
+        System.clearProperty("dataverse.files.filetest.directory");
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/GlobusOverlayAccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/GlobusOverlayAccessIOTest.java
new file mode 100644
index 00000000000..d173f65757f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/GlobusOverlayAccessIOTest.java
@@ -0,0 +1,151 @@
+/*
+ * SPDX-License-Identifier: Apache 2.0
+ */
+package edu.harvard.iq.dataverse.dataaccess;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import static org.junit.jupiter.api.Assertions.*;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import java.io.IOException;
+import java.nio.file.Paths;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.STRICT_STUBS)
+public class GlobusOverlayAccessIOTest {
+
+    @Mock
+
+    private Dataset dataset;
+    private DataFile mDatafile;
+    private DataFile rDatafile;
+    private String baseStoreId1 = "182ad2bda2f-c3508e719076";
+    private String baseStoreId2 = "182ad2bda2f-c3508e719077";
+    private String logoPath = "d7c42580-6538-4605-9ad8-116a61982644/hdc1/image002.mrc";
+    private String authority = "10.5072";
+    private String identifier = "F2ABCDEF";
+
+    @BeforeAll
+    public static void setUp() {
+        // Base Store
+        System.setProperty("dataverse.files.base.type", DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER);
+        System.setProperty("dataverse.files.base.label", "default");
+        System.setProperty("dataverse.files.base.directory", "/tmp/files");
+
+        // Managed Globus Store
+
+        // Nonsense endpoint/paths
+        System.setProperty("dataverse.files.globusm." + GlobusAccessibleStore.TRANSFER_ENDPOINT_WITH_BASEPATH,
+                "d7c42580-6538-4605-9ad8-116a61982644/hdc1");
+        // Nonsense value of the right form
+        System.setProperty("dataverse.files.globusm.globus-token",
+                "NzM2NTQxMDMtOTg1Yy00NDgzLWE1MTYtYTJlNDk0ZmI3MDhkOkpJZGZaZGxMZStQNUo3MTRIMDY2cDh6YzIrOXI2RmMrbFR6UG0zcSsycjA9");
+        System.setProperty("dataverse.files.globusm.remote-store-name", "GlobusEndpoint1");
+        System.setProperty("dataverse.files.globusm.type", "globus");
+        System.setProperty("dataverse.files.globusm.managed", "true");
+        System.setProperty("dataverse.files.globusm.base-store", "base");
+        System.setProperty("dataverse.files.globusm.label", "globusManaged");
+
+        // Remote Store
+        System.setProperty("dataverse.files.globusr.type", "globus");
+        System.setProperty("dataverse.files.globusr.base-store", "base");
+        System.setProperty("dataverse.files.globusr.managed", "false");
+        System.setProperty("dataverse.files.globusr.label", "globusRemote");
+        System.setProperty(
+                "dataverse.files.globusr." + AbstractRemoteOverlayAccessIO.REFERENCE_ENDPOINTS_WITH_BASEPATHS,
+                "d7c42580-6538-4605-9ad8-116a61982644/hdc1");
+        System.setProperty("dataverse.files.globusr.remote-store-name", "DemoDataCorp");
+
+    }
+
+    @AfterAll
+    public static void tearDown() {
+        System.clearProperty("dataverse.files.base.type");
+        System.clearProperty("dataverse.files.base.label");
+        System.clearProperty("dataverse.files.base.directory");
+        System.clearProperty("dataverse.files.globusm." + GlobusAccessibleStore.TRANSFER_ENDPOINT_WITH_BASEPATH);
+        System.clearProperty("dataverse.files.globusm.globus-token");
+        System.clearProperty("dataverse.files.globusm.remote-store-name");
+        System.clearProperty("dataverse.files.globusm.type");
+        System.clearProperty("dataverse.files.globusm.managed");
+        System.clearProperty("dataverse.files.globusm.base-store");
+        System.clearProperty("dataverse.files.globusm.label");
+        System.clearProperty("dataverse.files.globusr.type");
+        System.clearProperty("dataverse.files.globusr.base-store");
+        System.clearProperty("dataverse.files.globusr.managed");
+        System.clearProperty("dataverse.files.globusm.label");
+        System.clearProperty(
+                "dataverse.files.globusr." + AbstractRemoteOverlayAccessIO.REFERENCE_ENDPOINTS_WITH_BASEPATHS);
+        System.clearProperty("dataverse.files.globusr.remote-store-name");
+    }
+
+    @Test
+    void testGlobusOverlayIdentifiers() throws IOException {
+
+        dataset = MocksFactory.makeDataset();
+        dataset.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, authority, identifier, "/",
+                AbstractDOIProvider.DOI_RESOLVER_URL, null));
+        mDatafile = MocksFactory.makeDataFile();
+        mDatafile.setOwner(dataset);
+        mDatafile.setStorageIdentifier("globusm://" + baseStoreId1);
+
+        rDatafile = MocksFactory.makeDataFile();
+        rDatafile.setOwner(dataset);
+        rDatafile.setStorageIdentifier("globusr://" + baseStoreId2 + "//" + logoPath);
+
+        assertTrue(GlobusOverlayAccessIO.isValidIdentifier("globusm", mDatafile.getStorageIdentifier()));
+        assertTrue(GlobusOverlayAccessIO.isValidIdentifier("globusr", rDatafile.getStorageIdentifier()));
+        assertFalse(GlobusOverlayAccessIO.isValidIdentifier("globusm", "globusr://localid//../of/the/hill"));
+        assertFalse(GlobusOverlayAccessIO.isValidIdentifier("globusr",
+                rDatafile.getStorageIdentifier().replace("hdc1", "")));
+
+        // We can read the storageIdentifier and get the driver
+        assertTrue(mDatafile.getStorageIdentifier()
+                .startsWith(DataAccess.getStorageDriverFromIdentifier(mDatafile.getStorageIdentifier())));
+        assertTrue(rDatafile.getStorageIdentifier()
+                .startsWith(DataAccess.getStorageDriverFromIdentifier(rDatafile.getStorageIdentifier())));
+
+        // We can get the driver type from it's ID
+        assertTrue(DataAccess.getDriverType("globusm").equals(System.getProperty("dataverse.files.globusm.type")));
+        assertTrue(DataAccess.getDriverType("globusr").equals(System.getProperty("dataverse.files.globusr.type")));
+
+        // When we get a StorageIO for the file, it is the right type
+        StorageIO<DataFile> mStorageIO = DataAccess.getStorageIO(mDatafile);
+        assertTrue(mStorageIO instanceof GlobusOverlayAccessIO);
+        StorageIO<DataFile> rStorageIO = DataAccess.getStorageIO(rDatafile);
+        assertTrue(rStorageIO instanceof GlobusOverlayAccessIO);
+
+        // When we use it, we can get properties like the remote store name
+        assertTrue(mStorageIO.getRemoteStoreName()
+                .equals(System.getProperty("dataverse.files.globusm.remote-store-name")));
+        assertTrue(rStorageIO.getRemoteStoreName()
+                .equals(System.getProperty("dataverse.files.globusr.remote-store-name")));
+
+        // Storage Locations are correct
+        String mLocation = mStorageIO.getStorageLocation();
+        assertEquals("globusm:///" + dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage()
+                + "/" + baseStoreId1, mLocation);
+        String rLocation = rStorageIO.getStorageLocation();
+        assertEquals("globusr://" + baseStoreId2 + "//" + logoPath, rLocation);
+
+        // If we ask for the path for an aux file, it is correct
+        System.out.println(Paths.get(System.getProperty("dataverse.files.file.directory", "/tmp/files"), authority,
+                identifier, baseStoreId1 + ".auxobject").toString());
+        System.out.println(mStorageIO.getAuxObjectAsPath("auxobject").toString());
+        assertTrue(Paths.get(System.getProperty("dataverse.files.base.directory", "/tmp/files"), authority, identifier,
+                baseStoreId1 + ".auxobject").equals(mStorageIO.getAuxObjectAsPath("auxobject")));
+        assertTrue(Paths.get(System.getProperty("dataverse.files.base.directory", "/tmp/files"), authority, identifier,
+                baseStoreId2 + ".auxobject").equals(rStorageIO.getAuxObjectAsPath("auxobject")));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/RemoteOverlayAccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/RemoteOverlayAccessIOTest.java
new file mode 100644
index 00000000000..8a362c090b7
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/RemoteOverlayAccessIOTest.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2018 Forschungszentrum JÃŧlich GmbH
+ * SPDX-License-Identifier: Apache 2.0
+ */
+package edu.harvard.iq.dataverse.dataaccess;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.util.UrlSignerUtil;
+
+import org.apache.http.ProtocolVersion;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.message.BasicStatusLine;
+import org.apache.http.protocol.HTTP;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import static org.junit.jupiter.api.Assertions.*;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import java.io.IOException;
+import java.nio.file.Paths;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.STRICT_STUBS)
+public class RemoteOverlayAccessIOTest {
+
+    @Mock
+
+    private Dataset dataset;
+    private DataFile datafile;
+    private DataFile badDatafile;
+    private String baseStoreId="182ad2bda2f-c3508e719076";
+    private String filePath = "raw/refs/heads/develop/src/test/java/edu/harvard/iq/dataverse/dataaccess/RemoteOverlayAccessIOTest.java";
+    private String authority = "10.5072";
+    private String identifier = "F2/ABCDEF";
+
+    @BeforeEach
+    public void setUp() {
+        System.setProperty("dataverse.files.test.type", "remote");
+        System.setProperty("dataverse.files.test.label", "testOverlay");
+        System.setProperty("dataverse.files.test.base-url", "https://github.com/IQSS/dataverseXX");
+        System.setProperty("dataverse.files.test.base-store", "file");
+        System.setProperty("dataverse.files.test.download-redirect", "true");
+        System.setProperty("dataverse.files.test.remote-store-name", "DemoDataCorp");
+        System.setProperty("dataverse.files.test.secret-key", "12345"); // Real keys should be much longer, more random
+        System.setProperty("dataverse.files.file.type", "file");
+        System.setProperty("dataverse.files.file.label", "default");
+        datafile = MocksFactory.makeDataFile();
+        dataset = MocksFactory.makeDataset();
+        dataset.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, authority, identifier, "/", AbstractDOIProvider.DOI_RESOLVER_URL, null));
+        datafile.setOwner(dataset);
+        datafile.setStorageIdentifier("test://" + baseStoreId + "//" + filePath);
+
+        badDatafile = MocksFactory.makeDataFile();
+        badDatafile.setOwner(dataset);
+        badDatafile.setStorageIdentifier("test://" + baseStoreId + "//../.." + filePath);
+    }
+
+    @AfterEach
+    public void tearDown() {
+        System.clearProperty("dataverse.files.test.type");
+        System.clearProperty("dataverse.files.test.label");
+        System.clearProperty("dataverse.files.test.base-url");
+        System.clearProperty("dataverse.files.test.base-store");
+        System.clearProperty("dataverse.files.test.download-redirect");
+        System.clearProperty("dataverse.files.test.label");
+        System.clearProperty("dataverse.files.test.remote-store-name");
+        System.clearProperty("dataverse.files.test.secret-key");
+        System.clearProperty("dataverse.files.file.type");
+        System.clearProperty("dataverse.files.file.label");
+    }
+
+    @Test
+    void testRemoteOverlayFiles() throws IOException, NoSuchFieldException, IllegalAccessException {
+        // We can read the storageIdentifier and get the driver
+        assertTrue(datafile.getStorageIdentifier()
+                .startsWith(DataAccess.getStorageDriverFromIdentifier(datafile.getStorageIdentifier())));
+        // We can get the driver type from it's ID
+        assertTrue(DataAccess.getDriverType("test").equals(System.getProperty("dataverse.files.test.type")));
+        // When we get a StorageIO for the file, it is the right type
+        StorageIO<DataFile> storageIO = DataAccess.getStorageIO(datafile);
+        assertTrue(storageIO instanceof RemoteOverlayAccessIO);
+        // When we use it, we can get properties like the remote store name
+        RemoteOverlayAccessIO<DataFile> remoteIO = (RemoteOverlayAccessIO<DataFile>) storageIO;
+        assertTrue(remoteIO.getRemoteStoreName().equals(System.getProperty("dataverse.files.test.remote-store-name")));
+        // And can get a temporary download URL for the main file
+        String signedURL = remoteIO.generateTemporaryDownloadUrl(null, null, null);
+        // And the URL starts with the right stuff
+        assertTrue(signedURL.startsWith(System.getProperty("dataverse.files.test.base-url") + "/" + filePath));
+        // And the signature is valid
+        assertTrue(
+                UrlSignerUtil.isValidUrl(signedURL, null, null, System.getProperty("dataverse.files.test.secret-key")));
+        // And we get an unsigned URL with the right stuff with no key
+        System.clearProperty("dataverse.files.test.secret-key");
+        String unsignedURL = remoteIO.generateTemporaryDownloadUrl(null, null, null);
+        assertTrue(unsignedURL.equals(System.getProperty("dataverse.files.test.base-url") + "/" + filePath));
+        // Once we've opened, we can get the file size (only works if the HEAD call to
+        // the file URL works
+        var mockResponse = mockResponseWithContentLength();
+        var mockClient = Mockito.mock(CloseableHttpClient.class);
+        Mockito.when(mockClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(HttpClientContext.class))).thenReturn(mockResponse);
+        var httpClientField = remoteIO.getClass().getSuperclass().getDeclaredField("httpclient");
+        httpClientField.setAccessible(true);
+        httpClientField.set(remoteIO, mockClient);
+
+        remoteIO.open(DataAccessOption.READ_ACCESS);
+        assertTrue(remoteIO.getSize() > 0);
+        // If we ask for the path for an aux file, it is correct
+        System.out.println(Paths
+                .get(System.getProperty("dataverse.files.file.directory", "/tmp/files"), authority, identifier, baseStoreId + ".auxobject").toString());
+        System.out.println(remoteIO.getAuxObjectAsPath("auxobject").toString());
+        assertTrue(Paths
+                .get(System.getProperty("dataverse.files.file.directory", "/tmp/files"), authority, identifier, baseStoreId + ".auxobject")
+                .equals(remoteIO.getAuxObjectAsPath("auxobject")));
+        IOException thrown = assertThrows(IOException.class, () -> DataAccess.getStorageIO(badDatafile),
+                "Expected getStorageIO() to throw, but it didn't");
+        // 'test' is the driverId in the IOException messages
+        assertTrue(thrown.getMessage().contains("test"));
+
+    }
+
+    private @NotNull CloseableHttpResponse mockResponseWithContentLength() {
+        var headers = new BasicHeader[] { new BasicHeader(HTTP.CONTENT_LEN, "123") };
+        var version = new ProtocolVersion("HTTP", 1, 1);
+        var statusLine = new BasicStatusLine(version, 200, "OK");
+        var mockResponse = Mockito.mock(CloseableHttpResponse.class);
+        Mockito.when(mockResponse.getStatusLine()).thenReturn(statusLine);
+        Mockito.when(mockResponse.getHeaders(HTTP.CONTENT_LEN)).thenReturn(headers);
+        return mockResponse;
+    }
+
+    @Test
+    void testRemoteOverlayIdentifierFormats() throws IOException {
+        
+        assertTrue(DataAccess.isValidDirectStorageIdentifier(datafile.getStorageIdentifier()));
+        assertFalse(DataAccess.isValidDirectStorageIdentifier(badDatafile.getStorageIdentifier()));
+        assertFalse(DataAccess.isValidDirectStorageIdentifier(datafile.getStorageIdentifier().replace("test", "bad")));
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOLocalstackIT.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOLocalstackIT.java
new file mode 100644
index 00000000000..0bab9edcd5e
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOLocalstackIT.java
@@ -0,0 +1,142 @@
+package edu.harvard.iq.dataverse.dataaccess;
+
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.testing.Tags;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Scanner;
+import java.util.UUID;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.testcontainers.containers.localstack.LocalStackContainer;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+@Tag(Tags.INTEGRATION_TEST)
+@Tag(Tags.USES_TESTCONTAINERS)
+@Testcontainers(disabledWithoutDocker = true)
+@ExtendWith(MockitoExtension.class)
+class S3AccessIOLocalstackIT {
+
+    @BeforeAll
+    static void setUp() {
+        System.setProperty(staticFiles + "access-key", localstack.getAccessKey());
+        System.setProperty(staticFiles + "secret-key", localstack.getSecretKey());
+        System.setProperty(staticFiles + "custom-endpoint-url", localstack.getEndpoint().toString());
+        System.setProperty(staticFiles + "custom-endpoint-region", localstack.getRegion());
+        System.setProperty(staticFiles + "bucket-name", bucketName);
+
+        s3 = S3AsyncClient.builder()
+                .endpointOverride(URI.create(localstack.getEndpoint().toString()))
+                .region(Region.of(localstack.getRegion()))
+                .credentialsProvider(StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                ))
+                .build();
+        s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build()).join();
+    }
+
+    static final String storageDriverId = "si1";
+    static final String staticFiles = "dataverse.files." + storageDriverId + ".";
+    static final String bucketName = "bucket-" + UUID.randomUUID().toString();
+    static S3AsyncClient s3 = null;
+
+    static DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:4.2.0");
+    @Container
+    static LocalStackContainer localstack = new LocalStackContainer(localstackImage)
+            .withServices(S3);
+
+    @Test
+    void test1() {
+        DvObject dvObject = new Dataset();
+        dvObject.setProtocol("doi");
+        dvObject.setAuthority("10.5072/FK2");
+        dvObject.setIdentifier("ABC123");
+        DataAccessRequest req = null;
+        S3AccessIO s3AccessIO = new S3AccessIO<>(dvObject, req, storageDriverId);
+        String textIn = "Hello";
+        InputStream inputStream = new ByteArrayInputStream(textIn.getBytes());
+        String tempDirPath = FileUtil.getFilesTempDirectory();
+        try {
+            Files.createDirectories(Paths.get(tempDirPath));
+        } catch (IOException ex) {
+            System.out.println("failed to create " + tempDirPath + ": " + ex);
+        }
+        try {
+            s3AccessIO.saveInputStream(inputStream);
+            System.out.println("save complete!");
+        } catch (IOException ex) {
+            System.out.println("saveInputStream exception: " + ex);
+        }
+
+        String textOut = null;
+        try {
+            textOut = new Scanner(s3AccessIO.getInputStream()).useDelimiter("\\A").next();
+        } catch (IOException ex) {
+        }
+        assertEquals(textIn, textOut);
+    }
+
+    @Test
+    void test2() {
+        Dataset dataset = new Dataset();
+        dataset.setProtocol("doi");
+        dataset.setAuthority("10.5072/FK2");
+        dataset.setIdentifier("ABC123");
+        String sid = bucketName + dataset.getAuthorityForFileStorage() + "/" + dataset.getIdentifierForFileStorage() + "/" + FileUtil.generateStorageIdentifier();
+        S3AccessIO<DataFile> s3io = new S3AccessIO<DataFile>(sid, storageDriverId);
+    }
+
+    @Test
+    void test3() {
+        DvObject dvObject = new Dataset();
+        dvObject.setProtocol("doi");
+        dvObject.setAuthority("10.5072/FK2");
+        dvObject.setIdentifier("ABC123");
+        DataAccessRequest req = null;
+        S3AsyncClient nullS3AsyncClient = null;
+        S3AccessIO s3AccessIO = new S3AccessIO<>(dvObject, req, nullS3AsyncClient, storageDriverId);
+        InputStream inputStream = null;
+        try {
+            s3AccessIO.saveInputStream(inputStream);
+            System.out.println("save complete!");
+        } catch (IOException ex) {
+            System.out.println("saveInputStream exception: " + ex);
+        }
+    }
+
+    @Test
+    void test4() {
+        DvObject dvObject = new DataFile();
+        dvObject.setProtocol("doi");
+        dvObject.setAuthority("10.5072/FK2");
+        dvObject.setIdentifier("ABC123");
+        DataAccessRequest req = null;
+        S3AccessIO s3AccessIO = new S3AccessIO<>(dvObject, req, storageDriverId);
+        InputStream inputStream = null;
+        try {
+            s3AccessIO.saveInputStream(inputStream);
+            System.out.println("save complete!");
+        } catch (IOException ex) {
+            System.out.println("saveInputStream exception: " + ex);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
index 4ce821a5fee..5095c12024c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
@@ -4,11 +4,14 @@
  */
 package edu.harvard.iq.dataverse.dataaccess;
 
-import com.amazonaws.services.s3.AmazonS3;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.api.UtilIT;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.util.FileUtil;
+
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -28,9 +31,9 @@
 public class S3AccessIOTest {
     
     @Mock
-    private AmazonS3 s3client;
+    private S3AsyncClient s3client;
     
-    private S3AccessIO<Dataset> dataSetAccess;
+    private StorageIO<Dataset> dataSetAccess;
     private S3AccessIO<DataFile> dataFileAccess;
     private Dataset dataSet;
     private DataFile dataFile;
@@ -42,25 +45,21 @@ public void setup() throws IOException {
         dataSet = MocksFactory.makeDataset();
         dataFile.setOwner(dataSet);
         dataFileId = UtilIT.getRandomIdentifier();
-        dataFile.setStorageIdentifier("s3://bucket:"+dataFileId);
-        dataSetAccess = new S3AccessIO<>(dataSet, null, s3client);
-        dataFileAccess = new S3AccessIO<>(dataFile, null, s3client);
+        System.setProperty("dataverse.files.s3test.type", "s3");
+        System.setProperty("dataverse.files.s3test.label", "S3test");
+        System.setProperty("dataverse.files.s3test.bucket-name", "thebucket");
+
+        dataFile.setStorageIdentifier("s3test://thebucket:"+dataFileId);
+        dataSetAccess = new S3AccessIO<>(dataSet, null, s3client, "s3test");
+        dataFileAccess = new S3AccessIO<>(dataFile, null, s3client, "s3test");
     }
     
-    /*
-    createTempFile
-    getStorageLocation
-    getFileSystemPath
-    exists?
-    getWriteChannel
-    getOutputStream
-    getDestinationKey
-    
-    DONE
-    ---------------------
-    getMainFileKey
-    getUrlExpirationMinutes
-     */
+    @AfterEach
+    public void tearDown() {
+        System.clearProperty("dataverse.files.s3test.type");
+        System.clearProperty("dataverse.files.s3test.label");
+        System.clearProperty("dataverse.files.s3test.bucket-name");
+    }
     
     @Test
     void keyNull_getMainFileKey() throws IOException {
@@ -89,7 +88,7 @@ void keyNullstorageIdNullOrEmpty_getMainFileKey() throws IOException {
     }
     
     @Test
-    void keyNullstorageIdNull_getMainFileKey() throws IOException {
+    void keyNullstorageIdInvalid_getMainFileKey() throws IOException {
         // given
         dataFile.setStorageIdentifier("invalid://abcd");
         // when & then
@@ -99,7 +98,7 @@ void keyNullstorageIdNull_getMainFileKey() throws IOException {
     @Test
     void default_getUrlExpirationMinutes() {
         // given
-        System.clearProperty("dataverse.files.s3-url-expiration-minutes");
+        System.clearProperty("dataverse.files.s3test.url-expiration-minutes");
         // when & then
         assertEquals(60, dataFileAccess.getUrlExpirationMinutes());
     }
@@ -107,7 +106,7 @@ void default_getUrlExpirationMinutes() {
     @Test
     void validSetting_getUrlExpirationMinutes() {
         // given
-        System.setProperty("dataverse.files.s3-url-expiration-minutes", "120");
+        System.setProperty("dataverse.files.s3test.url-expiration-minutes", "120");
         // when & then
         assertEquals(120, dataFileAccess.getUrlExpirationMinutes());
     }
@@ -115,9 +114,19 @@ void validSetting_getUrlExpirationMinutes() {
     @Test
     void invalidSetting_getUrlExpirationMinutes() {
         // given
-        System.setProperty("dataverse.files.s3-url-expiration-minutes", "NaN");
+        System.setProperty("dataverse.files.s3test.url-expiration-minutes", "NaN");
         // when & then
         assertEquals(60, dataFileAccess.getUrlExpirationMinutes());
     }
     
-}
+    @Test
+    void testS3IdentifierFormats() throws IOException {
+        assertTrue(DataAccess.isValidDirectStorageIdentifier("s3test://thebucket:" + FileUtil.generateStorageIdentifier()));
+        //The tests here don't use a valid identifier string
+        assertFalse(DataAccess.isValidDirectStorageIdentifier(dataFile.getStorageIdentifier()));
+        //bad store id
+        assertFalse(DataAccess.isValidDirectStorageIdentifier("s3://thebucket:" + FileUtil.generateStorageIdentifier()));
+        //bad bucket
+        assertFalse(DataAccess.isValidDirectStorageIdentifier("s3test://bucket:" + FileUtil.generateStorageIdentifier()));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
index 2700bf3448c..3aab66dc63b 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
@@ -21,8 +21,9 @@
 import java.util.List;
 //import org.apache.commons.httpclient.Header;
 //import org.apache.commons.httpclient.methods.GetMethod;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -62,23 +63,28 @@ public void testGetReadChannel() throws Exception {
     @Test
     public void testGetDvObject() {
         assertEquals(null, instance.getDvObject());
-        instance.setDvObject(new Dataset());
-        assertEquals(new Dataset(), instance.getDataset());
+        Dataset d= new Dataset();
+        instance.setDvObject(d);
+        //assertSame uses == rather than the .equals() method which would (currently) be true for any two Datasets 
+        assertSame(d, instance.getDataset());
 
         try {
             instance.getDataFile();
             fail("This should have thrown");
         } catch (ClassCastException ex) {
-            assertEquals(ex.getMessage(), "edu.harvard.iq.dataverse.Dataset cannot be cast to edu.harvard.iq.dataverse.DataFile");
+            //Test succeeds
         }
         try {
             instance.getDataverse();
             fail("This should have thrown");
         } catch (ClassCastException ex) {
-            assertEquals(ex.getMessage(), "edu.harvard.iq.dataverse.Dataset cannot be cast to edu.harvard.iq.dataverse.Dataverse");
+            //Test succeeds
         }
-        assertEquals(new DataFile(), new FileAccessIO<>(new DataFile()).getDataFile());
-        assertEquals(new Dataverse(), new FileAccessIO<>(new Dataverse()).getDataverse());
+        // null driver defaults to 'file'
+        DataFile f= new DataFile();
+        Dataverse dv = new Dataverse();
+        assertSame(f, new FileAccessIO<>(f, null, null).getDataFile());
+        assertSame(dv, new FileAccessIO<>(dv, null, null).getDataverse());
     }
 
     @Test
@@ -183,48 +189,48 @@ public void testResponseHeaders() {
 
     @Test
     public void testFileLocation() {
-        assertEquals(true, instance.isLocalFile());
+        assertTrue(instance.isLocalFile());
         instance.setIsLocalFile(false);
-        assertEquals(false, instance.isLocalFile());
+        assertFalse(instance.isLocalFile());
 
-        assertEquals(false, instance.isRemoteAccess());
+        assertFalse(instance.isRemoteAccess());
         instance.setIsRemoteAccess(true);
-        assertEquals(true, instance.isRemoteAccess());
+        assertTrue(instance.isRemoteAccess());
     }
 
     @Test
     public void testHttpAccess() {
-        assertEquals(false, instance.isHttpAccess());
+        assertFalse(instance.isHttpAccess());
         instance.setIsHttpAccess(true);
-        assertEquals(true, instance.isHttpAccess());
+        assertTrue(instance.isHttpAccess());
     }*/
 
     @Test
     public void testDownloadSupported() {
-        assertEquals(true, instance.isDownloadSupported());
+        assertTrue(instance.isDownloadSupported());
         instance.setIsDownloadSupported(false);
-        assertEquals(false, instance.isDownloadSupported());
+        assertFalse(instance.isDownloadSupported());
     }
 
     @Test
     public void testSubsetSupported() {
-        assertEquals(false, instance.isSubsetSupported());
+        assertFalse(instance.isSubsetSupported());
         instance.setIsSubsetSupported(true);
-        assertEquals(true, instance.isSubsetSupported());
+        assertTrue(instance.isSubsetSupported());
     }
 
     @Test
     public void testZippedStream() {
-        assertEquals(false, instance.isZippedStream());
+        assertFalse(instance.isZippedStream());
         instance.setIsZippedStream(true);
-        assertEquals(true, instance.isZippedStream());
+        assertTrue(instance.isZippedStream());
     }
 
     @Test
     public void testNoVarHeader() {
-        assertEquals(false, instance.noVarHeader());
+        assertFalse(instance.noVarHeader());
         instance.setNoVarHeader(true);
-        assertEquals(true, instance.noVarHeader());
+        assertTrue(instance.noVarHeader());
     }
 
     @Test
@@ -237,4 +243,16 @@ public void testGenerateVariableHeader() {
         assertEquals("Random	Random\n", instance.generateVariableHeader(dvs));
         assertEquals(null, instance.generateVariableHeader(null));
     }
+    
+    @Test
+    public void testGetConfigParam() {
+        System.setProperty("dataverse.files.globus.type", "globus");
+    assertEquals("globus", StorageIO.getConfigParamForDriver("globus", StorageIO.TYPE));
+    System.clearProperty("dataverse.files.globus.type");
+    }
+    
+    @Test
+    public void testGetConfigParamWithDefault() {
+    assertEquals(DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER, StorageIO.getConfigParamForDriver("globus", AbstractRemoteOverlayAccessIO.BASE_STORE, DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER));
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java
index 554242c9311..27e0ac758e0 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIOTest.java
@@ -12,11 +12,10 @@
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SignatureException;
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Before;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  *
@@ -34,13 +33,14 @@ public class SwiftAccessIOTest {
     public SwiftAccessIOTest() {
     }
 
-    @Before
+    @BeforeEach
     public void setUpClass() throws IOException {
         datafile = MocksFactory.makeDataFile();
         dataset = MocksFactory.makeDataset();
         datafile.setOwner(dataset);
-        datasetAccess = new SwiftAccessIO<>(dataset);
-        datafileAccess = new SwiftAccessIO<>(datafile);
+        String dummyDriverId="dummy";
+        datasetAccess = new SwiftAccessIO<>(dataset, null, dummyDriverId);
+        datafileAccess = new SwiftAccessIO<>(datafile, null, dummyDriverId);
         swiftAccess = new SwiftAccessIO();
     }
 
@@ -51,14 +51,14 @@ public void setUpClass() throws IOException {
      */
     @Test
     public void testPerms() throws IOException {
-        assertEquals(false, datasetAccess.canRead());
-        assertEquals(false, datasetAccess.canWrite());
+        assertFalse(datasetAccess.canRead());
+        assertFalse(datasetAccess.canWrite());
     }
     
     @Test
     public void testIsExpiryExpired() {
         long currentTime = 1502221467;
-        assertEquals(false, swiftAccess.isExpiryExpired(60, 1502281, currentTime));
+        assertFalse(swiftAccess.isExpiryExpired(60, 1502281, currentTime));
     }
     
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleServiceBeanIT.java b/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleServiceBeanIT.java
index 7f7e734f13e..a37f8b724fe 100644
--- a/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleServiceBeanIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleServiceBeanIT.java
@@ -11,15 +11,15 @@
 import java.util.Calendar;
 import java.util.TimeZone;
 import java.util.logging.Logger;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import javax.json.JsonObject;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import jakarta.json.JsonObject;
 import static java.lang.Thread.sleep;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
 
 /**
  * These tests are not expected to pass unless you have a Data Capture Module
@@ -80,7 +80,7 @@ public void testStartFileSystemImportJob() throws InterruptedException, DataCapt
         dataset.setAuthority("10.5072/FK2");
         dataset.setIdentifier("OSQSB9");
         dataset.setId(728l);
-        String url = "http://localhost:8080/api/batch/jobs/import/datasets/files/:persistentId?persistentId=" + dataset.getGlobalIdString();
+        String url = "http://localhost:8080/api/batch/jobs/import/datasets/files/:persistentId?persistentId=" + dataset.getGlobalId().asString();
         System.out.print("url: " + url);
         String uploadFolder = "OSQSB9";
         String apiToken = "b440cc45-0ce9-4ae6-aabf-72f50fb8b8f2";
diff --git a/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtilTest.java
index a00daef63c2..148d34dc5f7 100644
--- a/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtilTest.java
@@ -7,31 +7,32 @@
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import static edu.harvard.iq.dataverse.mocks.MocksFactory.makeAuthenticatedUser;
 import java.io.UnsupportedEncodingException;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 import org.apache.http.HttpResponseFactory;
 import org.apache.http.HttpStatus;
 import org.apache.http.HttpVersion;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.DefaultHttpResponseFactory;
 import org.apache.http.message.BasicStatusLine;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.api.Test;
 
 public class DataCaptureModuleUtilTest {
 
     @Test
     public void testRsyncSupportEnabled() {
         System.out.println("rsyncSupportEnabled");
-        assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled(null));
-        assertEquals(true, DataCaptureModuleUtil.rsyncSupportEnabled("dcm/rsync+ssh"));
+        assertFalse(DataCaptureModuleUtil.rsyncSupportEnabled(null));
+        assertTrue(DataCaptureModuleUtil.rsyncSupportEnabled("dcm/rsync+ssh"));
         // Comma sepratated lists of upload methods are supported.
-        assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled("native/http:dcm/rsync+ssh"));
-        assertEquals(true, DataCaptureModuleUtil.rsyncSupportEnabled("native/http,dcm/rsync+ssh"));
-        assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled("native/http"));
-        assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled("junk"));
+        assertFalse(DataCaptureModuleUtil.rsyncSupportEnabled("native/http:dcm/rsync+ssh"));
+        assertTrue(DataCaptureModuleUtil.rsyncSupportEnabled("native/http,dcm/rsync+ssh"));
+        assertFalse(DataCaptureModuleUtil.rsyncSupportEnabled("native/http"));
+        assertFalse(DataCaptureModuleUtil.rsyncSupportEnabled("junk"));
     }
 
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetFieldsValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetFieldsValidatorTest.java
new file mode 100644
index 00000000000..d2f27082e7f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetFieldsValidatorTest.java
@@ -0,0 +1,112 @@
+package edu.harvard.iq.dataverse.dataset;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@ExtendWith(MockitoExtension.class)
+public class DatasetFieldsValidatorTest {
+
+    @Mock
+    private DatasetFieldServiceBean datasetFieldServiceMock;
+
+    private DatasetFieldsValidator sut;
+
+    @Mock
+    private DatasetVersion datasetVersionMock;
+
+    @Mock
+    private Dataverse dataverseStub;
+
+    @BeforeEach
+    public void setup() {
+        sut = new DatasetFieldsValidator();
+        sut.datasetFieldService = datasetFieldServiceMock;
+        setupDatasetVersionMock();
+    }
+
+    private void setupDatasetVersionMock() {
+        Dataset datasetMock = Mockito.mock(Dataset.class);
+        dataverseStub = Mockito.mock(Dataverse.class);
+        Mockito.when(datasetMock.getOwner()).thenReturn(dataverseStub);
+        Mockito.when(datasetVersionMock.getDataset()).thenReturn(datasetMock);
+    }
+
+    @Test
+    void testValidateFields_emptyRequiredValuesOfAllTypes() {
+        List<DatasetField> datasetFields = List.of(
+                createEmptyRequiredMultipleDatasetField("testMultiple"),
+                createEmptyControlledVocabularyDatasetField("testControlledVocabulary"),
+                createEmptyCompoundDatasetField("testCompoundField"),
+                createEmptySingleField("testSingleField")
+        );
+
+        String actualErrors = sut.validateFields(datasetFields, datasetVersionMock);
+
+        assertTrue(actualErrors.contains(BundleUtil.getStringFromBundle("datasetFieldValidator.error.emptyRequiredMultipleValueForField", List.of("testMultiple"))));
+        assertTrue(actualErrors.contains(BundleUtil.getStringFromBundle("datasetFieldValidator.error.emptyRequiredControlledVocabularyValueForField", List.of("testControlledVocabulary"))));
+        assertTrue(actualErrors.contains(BundleUtil.getStringFromBundle("datasetFieldValidator.error.emptyRequiredCompoundValueForField", List.of("testCompoundField"))));
+        assertTrue(actualErrors.contains(BundleUtil.getStringFromBundle("datasetFieldValidator.error.emptyRequiredSingleValueForField", List.of("testSingleField"))));
+    }
+
+    private DatasetField createEmptyControlledVocabularyDatasetField(String fieldName) {
+        DatasetFieldType datasetFieldType = new DatasetFieldType(fieldName, DatasetFieldType.FieldType.TEXT, false);
+        datasetFieldType.setControlledVocabularyValues(List.of(
+                new ControlledVocabularyValue(1L, "mgmt", datasetFieldType),
+                new ControlledVocabularyValue(2L, "law", datasetFieldType),
+                new ControlledVocabularyValue(3L, "cs", datasetFieldType)
+        ));
+        datasetFieldType.setAllowControlledVocabulary(true);
+
+        DatasetField emptyField = new DatasetField();
+        emptyField.setDatasetFieldType(datasetFieldType);
+        emptyField.setSingleControlledVocabularyValue(new ControlledVocabularyValue(1L, "", datasetFieldType));
+
+        Mockito.when(sut.datasetFieldService.isFieldRequiredInDataverse(datasetFieldType, dataverseStub)).thenReturn(true);
+        return emptyField;
+    }
+
+    private DatasetField createEmptyRequiredMultipleDatasetField(String fieldName) {
+        DatasetFieldType datasetFieldType = new DatasetFieldType(fieldName, DatasetFieldType.FieldType.TEXT, true);
+
+        DatasetField emptyField = new DatasetField();
+        emptyField.setDatasetFieldType(datasetFieldType);
+        emptyField.setDatasetFieldValues(Collections.emptyList());
+
+        Mockito.when(sut.datasetFieldService.isFieldRequiredInDataverse(datasetFieldType, dataverseStub)).thenReturn(true);
+        return emptyField;
+    }
+
+    private DatasetField createEmptyCompoundDatasetField(String fieldName) {
+        DatasetFieldType compoundType = new DatasetFieldType(fieldName, DatasetFieldType.FieldType.TEXT, false);
+
+        Set<DatasetFieldType> childTypes = new HashSet<>();
+        childTypes.add(new DatasetFieldType("lat", DatasetFieldType.FieldType.TEXT, false));
+        childTypes.add(new DatasetFieldType("lon", DatasetFieldType.FieldType.TEXT, false));
+
+        childTypes.forEach(type -> type.setParentDatasetFieldType(compoundType));
+        compoundType.setChildDatasetFieldTypes(childTypes);
+
+        DatasetField emptyField = new DatasetField();
+        emptyField.setDatasetFieldType(compoundType);
+        return emptyField;
+    }
+
+    private DatasetField createEmptySingleField(String fieldName) {
+        DatasetFieldType datasetFieldType = new DatasetFieldType(fieldName, DatasetFieldType.FieldType.TEXT, false);
+
+        DatasetField emptyField = new DatasetField();
+        emptyField.setDatasetFieldType(datasetFieldType);
+        emptyField.setSingleValue("");
+        return emptyField;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
index c72bc5d6faa..2db8851c48a 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
@@ -1,7 +1,6 @@
 package edu.harvard.iq.dataverse.dataset;
 
 import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.DataFileCategory;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetField;
 import edu.harvard.iq.dataverse.DatasetFieldType;
@@ -10,11 +9,11 @@
 import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DatasetUtilTest {
 
@@ -23,33 +22,35 @@ public class DatasetUtilTest {
      */
     @Test
     public void testGetThumbnailCandidates() {
-        assertEquals(new ArrayList<>(), DatasetUtil.getThumbnailCandidates(null, false));
+        assertEquals(new ArrayList<>(), DatasetUtil.getThumbnailCandidates(null, false, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
 
         Dataset dataset = MocksFactory.makeDataset();
         DataFile dataFile = MocksFactory.makeDataFile();
         dataFile.setContentType("image/");
         dataFile.setOwner(dataset);
-        dataFile.setStorageIdentifier("file://src/test/resources/images/coffeeshop.png");
+        System.setProperty("dataverse.files.testfile.type", "file");
+        dataFile.setStorageIdentifier("testfile://src/test/resources/images/coffeeshop.png");
 
         System.out.println(ImageThumbConverter.isThumbnailAvailable(dataFile));
-        DatasetVersion version = dataset.getCreateVersion();
+        DatasetVersion version = dataset.getCreateVersion(null);
         List<FileMetadata> fmds = new ArrayList<>();
         fmds.add(MocksFactory.addFileMetadata(dataFile));
         version.setFileMetadatas(fmds);
-        assertEquals(new ArrayList<>(), DatasetUtil.getThumbnailCandidates(dataset, false));
+        assertEquals(new ArrayList<>(), DatasetUtil.getThumbnailCandidates(dataset, false, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
     }
 
     @Test
     public void testGetThumbnailNullDataset() {
-        assertNull(DatasetUtil.getThumbnail(null));
-        assertNull(DatasetUtil.getThumbnail(null, null));
+        assertNull(DatasetUtil.getThumbnail(null, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
+        assertNull(DatasetUtil.getThumbnail(null, null, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
 
         Dataset dataset = MocksFactory.makeDataset();
-        dataset.setStorageIdentifier("file://");
+        System.setProperty("dataverse.files.testfile.type", "file");
+        dataset.setStorageIdentifier("testfile://");
         dataset.setUseGenericThumbnail(true);
 
-        assertNull(DatasetUtil.getThumbnail(dataset));
-        assertNull(DatasetUtil.getThumbnail(dataset, new DatasetVersion()));
+        assertNull(DatasetUtil.getThumbnail(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
+        assertNull(DatasetUtil.getThumbnail(dataset, new DatasetVersion(), ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
     }
 
     @Test
@@ -60,16 +61,17 @@ public void testGetThumbnailRestricted() {
         thumbnailFile.setId(42l);
         thumbnailFile.setRestricted(true);
         dataset.setThumbnailFile(thumbnailFile);
-        DatasetThumbnail result = DatasetUtil.getThumbnail(dataset);
+        DatasetThumbnail result = DatasetUtil.getThumbnail(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
         assertNull(result);
     }
+
     /**
      * Test of deleteDatasetLogo method, of class DatasetUtil.
      */
     @Test
     public void testDeleteDatasetLogo() {
-        assertEquals(false, DatasetUtil.deleteDatasetLogo(null));
-        assertEquals(false, DatasetUtil.deleteDatasetLogo(new Dataset()));
+        assertFalse(DatasetUtil.deleteDatasetLogo(null));
+        assertFalse(DatasetUtil.deleteDatasetLogo(new Dataset()));
     }
 
     /**
@@ -86,7 +88,7 @@ public void testGetDefaultThumbnailFile() {
      */
     @Test
     public void testPersistDatasetLogoToStorageAndCreateThumbnail() {
-        assertNull(DatasetUtil.persistDatasetLogoToStorageAndCreateThumbnail(null, null));
+        assertNull(DatasetUtil.persistDatasetLogoToStorageAndCreateThumbnails(null, null));
         //Todo: a test for this that test main logic
     }
 
@@ -95,7 +97,7 @@ public void testPersistDatasetLogoToStorageAndCreateThumbnail() {
      */
     @Test
     public void testGetThumbnailAsInputStream() {
-        assertNull(DatasetUtil.getThumbnailAsInputStream(null));
+        assertNull(DatasetUtil.getThumbnailAsInputStream(null, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
     }
 
     /**
@@ -104,7 +106,7 @@ public void testGetThumbnailAsInputStream() {
     @Test
     public void testIsDatasetLogoPresent() {
         Dataset dataset = MocksFactory.makeDataset();
-        assertEquals(false, DatasetUtil.isDatasetLogoPresent(dataset));
+        assertFalse(DatasetUtil.isDatasetLogoPresent(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
     }
 
     @Test
@@ -158,4 +160,21 @@ public void testGetDatasetSummaryField_withSelectionWithoutMatches() {
 
         assertEquals(0, DatasetUtil.getDatasetSummaryFields(version, "object").size());
     }
+
+    @Test
+    public void testGetDatasetSummaryFieldNames_emptyCustomFields() {
+        String[] actual = DatasetUtil.getDatasetSummaryFieldNames(null);
+        String[] expected = DatasetUtil.datasetDefaultSummaryFieldNames.split(",");
+
+        assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void testGetDatasetSummaryFieldNames_notEmptyCustomFields() {
+        String testCustomFields = "test1,test2";
+        String[] actual = DatasetUtil.getDatasetSummaryFieldNames(testCustomFields);
+        String[] expected = testCustomFields.split(",");
+
+        assertArrayEquals(expected, actual);
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/datasetutility/DuplicateFileCheckerTest.java b/src/test/java/edu/harvard/iq/dataverse/datasetutility/DuplicateFileCheckerTest.java
index f7fe81b16e3..ced15594f85 100644
--- a/src/test/java/edu/harvard/iq/dataverse/datasetutility/DuplicateFileCheckerTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/datasetutility/DuplicateFileCheckerTest.java
@@ -1,12 +1,12 @@
 package edu.harvard.iq.dataverse.datasetutility;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import edu.harvard.iq.dataverse.DataFile;
@@ -19,13 +19,13 @@ public class DuplicateFileCheckerTest {
     private DuplicateFileChecker duplicateFileChecker;
     private DatasetVersionServiceBean datasetVersionServiceBean;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         this.datasetVersionServiceBean = mock(DatasetVersionServiceBean.class);
         this.duplicateFileChecker = new DuplicateFileChecker(datasetVersionServiceBean);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         duplicateFileChecker = null;
     }
@@ -34,9 +34,9 @@ public void tearDown() {
     // test constructor
     // ----------------------------------------------------------------------------------------------------------
 
-    @Test(expected = NullPointerException.class)
-    public void testConstructorWithUndefinedDatasetVersionService() {
-        DuplicateFileChecker duplicateFileChecker = new DuplicateFileChecker(null);
+    @Test
+    void testConstructorWithUndefinedDatasetVersionService() {
+        assertThrows(NullPointerException.class, () -> new DuplicateFileChecker(null));
     }
 
     @Test
@@ -49,20 +49,20 @@ public void testConstructorWithDefinedDatasetVersionService() {
     // test public boolean isFileInSavedDatasetVersion(DatasetVersion datasetVersion, String checkSum)
     // ----------------------------------------------------------------------------------------------------------
 
-    @Test(expected = NullPointerException.class)
-    public void testIsFileInSavedDatasetVersionWithCheckSumParamWithUndefinedDatasetVersion() {
+    @Test
+    void testIsFileInSavedDatasetVersionWithCheckSumParamWithUndefinedDatasetVersion() {
         DatasetVersion datasetVersion = null;
         String checkSum = "checkSum";
-
-        this.duplicateFileChecker.isFileInSavedDatasetVersion(datasetVersion, checkSum);
+        
+        assertThrows(NullPointerException.class, () -> this.duplicateFileChecker.isFileInSavedDatasetVersion(datasetVersion, checkSum));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void testIsFileInSavedDatasetVersionWithChecksumParamWithUndefinedChecksum() {
+    @Test
+    void testIsFileInSavedDatasetVersionWithChecksumParamWithUndefinedChecksum() {
         DatasetVersion datasetVersion = new DatasetVersion();
         String checkSum = null;
-
-        this.duplicateFileChecker.isFileInSavedDatasetVersion(datasetVersion, checkSum);
+        
+        assertThrows(NullPointerException.class, () -> this.duplicateFileChecker.isFileInSavedDatasetVersion(datasetVersion, checkSum));
     }
 
     @Test
@@ -81,20 +81,20 @@ public void testIsFileInSavedDatasetVersionWithChecksumParamWithUnsavedFile() {
     // test public boolean isFileInSavedDatasetVersion(DatasetVersion datasetVersion, FileMetadata fileMetadata)
     // ----------------------------------------------------------------------------------------------------------
 
-    @Test(expected = NullPointerException.class)
-    public void testIsFileInSavedDatasetVersionWithFileMetadataParamWithUndefinedDatasetVersion() {
+    @Test
+    void testIsFileInSavedDatasetVersionWithFileMetadataParamWithUndefinedDatasetVersion() {
         DatasetVersion datasetVersion = null;
         FileMetadata fileMetadata = new FileMetadata();
-
-        this.duplicateFileChecker.isFileInSavedDatasetVersion(datasetVersion, fileMetadata);
+        
+        assertThrows(NullPointerException.class, () -> this.duplicateFileChecker.isFileInSavedDatasetVersion(datasetVersion, fileMetadata));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void testIsFileInSavedDatasetVersionWithFileMetadataParamWithUndefinedFileMetadata() {
+    @Test
+    void testIsFileInSavedDatasetVersionWithFileMetadataParamWithUndefinedFileMetadata() {
         DatasetVersion datasetVersion = new DatasetVersion();
         FileMetadata fileMetadata = null;
-
-        this.duplicateFileChecker.isFileInSavedDatasetVersion(datasetVersion, fileMetadata);
+        
+        assertThrows(NullPointerException.class, () -> this.duplicateFileChecker.isFileInSavedDatasetVersion(datasetVersion, fileMetadata));
     }
 
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/datasetutility/FileSizeCheckerTest.java b/src/test/java/edu/harvard/iq/dataverse/datasetutility/FileSizeCheckerTest.java
index e562e3f9e0c..824dc6794fe 100644
--- a/src/test/java/edu/harvard/iq/dataverse/datasetutility/FileSizeCheckerTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/datasetutility/FileSizeCheckerTest.java
@@ -7,22 +7,13 @@
 
 import static edu.harvard.iq.dataverse.datasetutility.FileSizeChecker.bytesToHumanReadable;
 
-import edu.harvard.iq.dataverse.datasetutility.FileSizeChecker.FileSizeResponse;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.SystemConfig;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
@@ -44,62 +35,4 @@ public void testBytesToHumanReadable() {
         assertEquals(expAns, ans);
         assertEquals(expLongAns, longAns);
     }
-
-    @Test
-    public void testIsAllowedFileSize_throwsOnNull() {
-        FileSizeChecker fileSizeChecker = new FileSizeChecker(new SystemConfig() {
-            @Override
-            public Long getMaxFileUploadSize() {
-                return 1000L;
-            }
-        });
-        assertThrows(NullPointerException.class, () -> {
-            fileSizeChecker.isAllowedFileSize(null);
-        });
-    }
-
-    @ParameterizedTest
-    @ValueSource(longs = { 0L, 999L, 1000L })
-    public void testIsAllowedFileSize_allowsSmallerOrEqualFileSize(Long fileSize) {
-        // initialize a system config and instantiate a file size checker
-        // override the max file upload side to allow for testing
-        FileSizeChecker fileSizeChecker = new FileSizeChecker(new SystemConfig() {
-            @Override
-            public Long getMaxFileUploadSize() {
-                return 1000L;
-            }
-        });
-        FileSizeResponse response = fileSizeChecker.isAllowedFileSize(fileSize);
-        assertTrue(response.fileSizeOK);
-    }
-
-    @ParameterizedTest
-    @ValueSource(longs = { 1001L, Long.MAX_VALUE })
-    public void testIsAllowedFileSize_rejectsBiggerFileSize(Long fileSize) {
-        // initialize a system config and instantiate a file size checker
-        // override the max file upload side to allow for testing
-        FileSizeChecker fileSizeChecker = new FileSizeChecker(new SystemConfig() {
-            @Override
-            public Long getMaxFileUploadSize() {
-                return 1000L;
-            }
-        });
-        FileSizeResponse response = fileSizeChecker.isAllowedFileSize(fileSize);
-        assertFalse(response.fileSizeOK);
-    }
-
-    @ParameterizedTest
-    @ValueSource(longs = { 0L, 1000L, Long.MAX_VALUE })
-    public void testIsAllowedFileSize_allowsOnUnboundedFileSize(Long fileSize) {
-        // initialize a system config and instantiate a file size checker
-        // ensure that a max filesize is not set
-        FileSizeChecker unboundedFileSizeChecker = new FileSizeChecker(new SystemConfig() {
-            @Override
-            public Long getMaxFileUploadSize() {
-                return null;
-            }
-        });
-        FileSizeResponse response = unboundedFileSizeChecker.isAllowedFileSize(fileSize);
-        assertTrue(response.fileSizeOK);
-    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParamsTest.java b/src/test/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParamsTest.java
index f8c790a566b..cbca33f409d 100644
--- a/src/test/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParamsTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParamsTest.java
@@ -10,19 +10,14 @@
 import edu.harvard.iq.dataverse.DataFileCategory;
 import edu.harvard.iq.dataverse.DataFileTag;
 import edu.harvard.iq.dataverse.FileMetadata;
-import java.util.ArrayList;
+
 import java.util.Arrays;
 import java.util.List;
-import java.util.ResourceBundle;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import org.hamcrest.Matchers;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * 
@@ -200,8 +195,9 @@ public void test_09_unusedParamsGood() throws DataFileTagException {
         assertNull(instance.getDescription());
         assertFalse(instance.hasDescription());
 
-        assertNull(instance.getCategories());
-        assertFalse(instance.hasCategories());
+        assertNotNull(instance.getCategories());
+        assertTrue(instance.hasCategories());
+        assertTrue(instance.getCategories().isEmpty());
 
         assertNull(instance.getDataFileTags());
         assertFalse(instance.hasFileDataTags());
@@ -297,4 +293,4 @@ private void msgt(String s){
 print json.dumps(json.dumps(d))
 
 
-*/
\ No newline at end of file
+*/
diff --git a/src/test/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataDDIParserTest.java b/src/test/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataDDIParserTest.java
index 470338d0462..0d054f36c6a 100644
--- a/src/test/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataDDIParserTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/datavariable/VariableMetadataDDIParserTest.java
@@ -1,6 +1,8 @@
 package edu.harvard.iq.dataverse.datavariable;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
@@ -12,7 +14,7 @@
 import java.util.HashSet;
 import java.util.Collection;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class VariableMetadataDDIParserTest {
 
@@ -25,7 +27,7 @@ public void testDDIReader()  {
         String fileName = "src/test/resources/xml/dct.xml";
         XMLStreamReader xmlr = null;
 
-        XMLInputFactory factory=XMLInputFactory.newInstance();
+        XMLInputFactory factory = XmlUtil.getSecureXMLInputFactory();
         try {
             xmlr = factory.createXMLStreamReader(new FileInputStream(fileName));
         } catch (Exception e) {
@@ -66,16 +68,16 @@ void variableTest(Map<Long,VariableMetadata> vmMap) {
         assertEquals(vm.getLiteralquestion(), "This is a literal question.");
         assertEquals(vm.getNotes(), "These are notes.\nA lot of them.");
         assertEquals(vm.getUniverse(),"Our universe");
-        assertEquals(false, vm.isIsweightvar());
-        assertEquals(false, vm.isWeighted());
+        assertFalse(vm.isIsweightvar());
+        assertFalse(vm.isWeighted());
 
         testCategoriesVar1(vm);
 
 
         vm =  vmMap.get(1169L);
         assertNotNull(vm);
-        assertEquals(false, vm.isIsweightvar());
-        assertEquals(true, vm.isWeighted());
+        assertFalse(vm.isIsweightvar());
+        assertTrue(vm.isWeighted());
         assertEquals(vm.getLabel(), "age_rollup"  );
 
         assertEquals(vm.getInterviewinstruction(), null);
@@ -90,8 +92,8 @@ void variableTest(Map<Long,VariableMetadata> vmMap) {
 
         vm =  vmMap.get(1168L);
         assertNotNull(vm);
-        assertEquals(true, vm.isIsweightvar());
-        assertEquals(false, vm.isWeighted());
+        assertTrue(vm.isIsweightvar());
+        assertFalse(vm.isWeighted());
         assertEquals(vm.getLabel(), "weight"  );
         assertEquals(vm.getInterviewinstruction(), null);
         assertEquals(vm.getLiteralquestion(), "Literal question for weight");
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataverse/DataverseUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/dataverse/DataverseUtilTest.java
index 3a0e14f607a..b950d641bf4 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataverse/DataverseUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataverse/DataverseUtilTest.java
@@ -1,8 +1,20 @@
 package edu.harvard.iq.dataverse.dataverse;
 
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObjectContainer;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import jakarta.ws.rs.BadRequestException;
+
+import org.junit.jupiter.api.Test;
 
 public class DataverseUtilTest {
 
@@ -10,7 +22,52 @@ public class DataverseUtilTest {
     public void testGetSuggestedDataverseNameOnCreate() {
         System.out.println("getSuggestedDataverseNameOnCreate");
         assertEquals(null, DataverseUtil.getSuggestedDataverseNameOnCreate(null));
-        assertEquals("Homer Simpson Dataverse", DataverseUtil.getSuggestedDataverseNameOnCreate(MocksFactory.makeAuthenticatedUser("Homer", "Simpson")));
+        assertEquals("Homer Simpson Dataverse", DataverseUtil
+                .getSuggestedDataverseNameOnCreate(MocksFactory.makeAuthenticatedUser("Homer", "Simpson")));
+    }
+
+    @Test
+    public void testCheckMetadataLanguageCases() {
+        Map<String, String> emptyMLangSettingMap = new HashMap<String, String>();
+        Map<String, String> mLangSettingMap = new HashMap<String, String>();
+        mLangSettingMap.put("en", "English");
+        mLangSettingMap.put("fr", "French");
+        Dataverse undefinedParent = new Dataverse();
+        undefinedParent.setMetadataLanguage(DvObjectContainer.UNDEFINED_CODE);
+        Dataset undefinedD = new Dataset();
+        undefinedD.setMetadataLanguage(DvObjectContainer.UNDEFINED_CODE);
+        Dataverse definedParent = new Dataverse();
+        definedParent.setMetadataLanguage("en");
+        Dataset definedEnglishD = new Dataset();
+        definedEnglishD.setMetadataLanguage("en");
+        Dataset definedFrenchD = new Dataset();
+        definedFrenchD.setMetadataLanguage("fr");
+        Dataset definedSpanishD = new Dataset();
+        definedSpanishD.setMetadataLanguage("es");
+        
+        // Not set tests:
+        //Good - no mLang sent, parent doesn't have one
+        assertDoesNotThrow(() -> DataverseUtil.checkMetadataLangauge(undefinedD, undefinedParent, emptyMLangSettingMap));
+        //Bad - one sent, parent doesn't have one
+        assertThrows(BadRequestException.class, () -> DataverseUtil.checkMetadataLangauge(definedEnglishD, undefinedParent, emptyMLangSettingMap));
+        //Good - one sent, matches parent
+        assertDoesNotThrow(() -> DataverseUtil.checkMetadataLangauge(definedEnglishD, definedParent, emptyMLangSettingMap));
+        //Bad - one sent, doesn't match parent
+        assertThrows(BadRequestException.class, () -> DataverseUtil.checkMetadataLangauge(definedFrenchD, definedParent, emptyMLangSettingMap));
+        
+        //With setting tests
+        //Bad - one sent, parent doesn't have one
+        assertThrows(BadRequestException.class, () -> DataverseUtil.checkMetadataLangauge(undefinedD, undefinedParent, mLangSettingMap));
+        //Good - sent, parent undefined, is allowed by setting
+        assertDoesNotThrow(() -> DataverseUtil.checkMetadataLangauge(definedEnglishD, undefinedParent, mLangSettingMap));
+        //Bad  one sent, parent undefined, not allowed by setting
+        assertThrows(BadRequestException.class, () -> DataverseUtil.checkMetadataLangauge(definedSpanishD, undefinedParent, mLangSettingMap));
+        //Bad - one sent, doesn't match parent
+        assertThrows(BadRequestException.class, () -> DataverseUtil.checkMetadataLangauge(definedFrenchD, definedParent, mLangSettingMap));
+        //Bad - undefined sent, parent is defined
+        assertThrows(BadRequestException.class, () -> DataverseUtil.checkMetadataLangauge(undefinedD, definedParent, mLangSettingMap));
+        //Good - sent, parent defined, they match
+        assertDoesNotThrow(() -> DataverseUtil.checkMetadataLangauge(definedEnglishD, definedParent, mLangSettingMap));
     }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/PermissionTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/PermissionTest.java
index ec300a25db7..4b98d3d9850 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/PermissionTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/PermissionTest.java
@@ -5,8 +5,9 @@
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DvObject;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java b/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java
index 329f8509ec6..573c0f48a53 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java
@@ -8,22 +8,26 @@
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
 import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
 import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleServiceBean;
+import edu.harvard.iq.dataverse.dataset.DatasetFieldsValidator;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
-import edu.harvard.iq.dataverse.pidproviders.FakePidProviderServiceBean;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
 import edu.harvard.iq.dataverse.search.IndexBatchServiceBean;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
-import edu.harvard.iq.dataverse.search.SearchServiceBean;
+import edu.harvard.iq.dataverse.search.SearchServiceFactory;
 import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearchServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.storageuse.StorageUseServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.workflow.WorkflowServiceBean;
-import java.util.List;
 import java.util.Stack;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * A base CommandContext for tests. Provides no-op implementations. Should
@@ -71,7 +75,7 @@ public SolrIndexServiceBean solrIndex() {
     }
 
     @Override
-    public SearchServiceBean search() {
+    public SearchServiceFactory search() {
         return null;
     }
 
@@ -121,25 +125,10 @@ public DataverseFieldTypeInputLevelServiceBean fieldTypeInputLevels() {
     }
 
     @Override
-    public DOIEZIdServiceBean doiEZId() {
+    public PidProviderFactoryBean pidProviderFactory() {
         return null;
     }
-
-    @Override
-    public DOIDataCiteServiceBean doiDataCite() {
-        return null;
-    }
-
-    @Override
-    public FakePidProviderServiceBean fakePidProvider() {
-        return null;
-    }
-
-    @Override
-    public HandlenetServiceBean handleNet() {
-        return null;
-    }
-
+    
     @Override
     public SettingsServiceBean settings() {
         return settings;
@@ -165,6 +154,11 @@ public DatasetLinkingServiceBean dsLinking() {
         return null;
     }
 
+    @Override
+    public DatasetFieldServiceBean dsField() {
+        return null;
+    }
+
     @Override
     public AuthenticationServiceBean authentication() {
         return null;
@@ -220,11 +214,6 @@ public WorkflowServiceBean workflows() {
         return null;
     }
 
-    @Override
-    public MapLayerMetadataServiceBean mapLayerMetadata() {
-        return null;
-    }
-
     @Override
     public DataCaptureModuleServiceBean dataCaptureModule() {
         return null;
@@ -245,6 +234,36 @@ public ActionLogServiceBean actionLog() {
         return null;
     }
 
+    @Override
+    public MetadataBlockServiceBean metadataBlocks() {
+        return null;
+    }
+
+    @Override
+    public DatasetTypeServiceBean datasetTypes() {
+        return null;
+    }
+
+    @Override
+    public StorageUseServiceBean storageUse() {
+        return null;
+    }
+
+    @Override
+    public DataverseFeaturedItemServiceBean dataverseFeaturedItems() {
+        return null;
+    }
+
+    @Override
+    public DatasetFieldsValidator datasetFieldsValidator() {
+        return null;
+    }
+
+    @Override
+    public LicenseServiceBean licenses() {
+        return null;
+    }
+
     @Override
     public void beginCommandSequence() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/TestEntityManager.java b/src/test/java/edu/harvard/iq/dataverse/engine/TestEntityManager.java
index b1ad74ac2dc..af8b75d5d80 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/TestEntityManager.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/TestEntityManager.java
@@ -14,21 +14,21 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.Id;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.StoredProcedureQuery;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.Id;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Query;
+import jakarta.persistence.StoredProcedureQuery;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.metamodel.Metamodel;
 
 /**
  *
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommandTest.java
index a87de12cfe0..efadd14438a 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommandTest.java
@@ -5,10 +5,12 @@
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
 import static edu.harvard.iq.dataverse.mocks.MocksFactory.*;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -17,16 +19,18 @@
 public class AbstractDatasetCommandTest {
     
    
-    @Test(expected=IllegalArgumentException.class)
-    @SuppressWarnings("ResultOfObjectAllocationIgnored")
-    public void testNullDataset() {
-        new AbstractDatasetCommandImpl(makeRequest(), null);
+    @Test
+    void testNullDataset() {
+        DataverseRequest request = makeRequest();
+        assertThrows(IllegalArgumentException.class, () -> new AbstractDatasetCommandImpl(request, null));
     }
     
-    @Test(expected=IllegalArgumentException.class)
-    @SuppressWarnings("ResultOfObjectAllocationIgnored")
-    public void testNullDatasetNonNullParent() {
-        new AbstractDatasetCommandImpl(makeRequest(), null, makeDataverse());
+    @Test
+    void testNullDatasetNonNullParent() {
+        DataverseRequest request = makeRequest();
+        Dataverse dataverse = makeDataverse();
+        assertThrows(IllegalArgumentException.class,
+            () -> new AbstractDatasetCommandImpl(request, null, dataverse));
     }
     
     /**
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDatasetVersionCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDatasetVersionCommandTest.java
index 30c5048fa8f..a2d9cdfb917 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDatasetVersionCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDatasetVersionCommandTest.java
@@ -16,9 +16,11 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
@@ -33,7 +35,7 @@ public void testSimpleVersionAddition() throws Exception {
         Dataset ds = makeDataset();
         
         // Populate the Initial version
-        DatasetVersion dsvInitial = ds.getEditVersion();
+        DatasetVersion dsvInitial = ds.getOrCreateEditVersion();
         dsvInitial.setCreateTime( dateFmt.parse("20001012") );
         dsvInitial.setLastUpdateTime( dsvInitial.getLastUpdateTime() );
         dsvInitial.setId( MocksFactory.nextId() );
@@ -62,14 +64,14 @@ public void testSimpleVersionAddition() throws Exception {
         assertEquals( dsvCreationDate, dsvNew.getLastUpdateTime() );
         assertEquals( dsvCreationDate.getTime(), ds.getModificationTime().getTime() );
         assertEquals( ds, dsvNew.getDataset() );
-        assertEquals( dsvNew, ds.getEditVersion() );
+        assertEquals( dsvNew, ds.getOrCreateEditVersion() );
         Map<DvObject, Set<Permission>> expected = new HashMap<>();
         expected.put(ds, Collections.singleton(Permission.AddDataset));
         assertEquals(expected, testEngine.getReqiredPermissionsForObjects() );
     }
     
-    @Test(expected=IllegalCommandException.class)
-    public void testCantCreateTwoDraftVersions() throws Exception {
+    @Test
+    void testCantCreateTwoDraftVersions() {
         DatasetVersion dsvNew = new DatasetVersion();
         dsvNew.setVersionState(DatasetVersion.VersionState.DRAFT);
         Dataset sampleDataset = makeDataset();
@@ -87,7 +89,7 @@ public DatasetServiceBean datasets() {
             
         });
         
-        testEngine.submit(sut);
+        assertThrows(IllegalCommandException.class, () -> testEngine.submit(sut));
     }
     
     
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommandTest.java
index 9db03cb7a99..73880b78e7b 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommandTest.java
@@ -15,14 +15,15 @@
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import static edu.harvard.iq.dataverse.mocks.MocksFactory.*;
 import edu.harvard.iq.dataverse.engine.TestCommandContext;
 import edu.harvard.iq.dataverse.engine.TestDataverseEngine;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,9 +32,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Future;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
@@ -73,6 +74,12 @@ public Dataverse save(Dataverse dataverse) {
             return dataverse;
         }
         
+        @Override
+        public boolean index(Dataverse dataverse) {
+            indexCalled=true;
+            return true;
+        }        
+        
     };
     
     DataverseRoleServiceBean roles = new DataverseRoleServiceBean(){
@@ -99,6 +106,11 @@ public RoleAssignment save(RoleAssignment assignment) {
             assignments.add(assignment);
             return assignment;
         }
+        
+        @Override
+        public RoleAssignment save(RoleAssignment assignment, boolean index) {
+            return save (assignment);
+        }        
 
         @Override
         public List<RoleAssignment> directRoleAssignments(DvObject dvo) {
@@ -124,11 +136,25 @@ public Future<String> indexDataverse(Dataverse dataverse) {
         public void create(DataverseFieldTypeInputLevel dataverseFieldTypeInputLevel) {
             createdDftils.add( dataverseFieldTypeInputLevel );
         }
+        
+        @Override
+        public DataverseFieldTypeInputLevel save(DataverseFieldTypeInputLevel dataverseFieldTypeInputLevel) {
+            createdDftils.add( dataverseFieldTypeInputLevel );
+            return dataverseFieldTypeInputLevel;
+        }
+        
+        @Override 
+        public DataverseFieldTypeInputLevel findByDataverseIdDatasetFieldTypeId(Long dataverseId, Long datasetFieldTypeId) {
+            DataverseFieldTypeInputLevel dfil = new DataverseFieldTypeInputLevel();
+            return dfil;
+        }
+        
 
         @Override
-        public void deleteFacetsFor(Dataverse d) {
+        public void deleteDataverseFieldTypeInputLevelFor(Dataverse d) {
             dftilsDeleted = true;
         }
+        
     };
     
     DataverseFacetServiceBean facets = new DataverseFacetServiceBean() {
@@ -153,7 +179,7 @@ public void deleteFacetsFor(Dataverse d) {
     TestDataverseEngine engine;
     
     
-    @Before
+    @BeforeEach
     public void setUp() {
         indexCalled = false;
         dvStore.clear();
@@ -221,8 +247,8 @@ public void testDefaultOptions() throws CommandException {
         
         // The following is a pretty wierd way to test that the create date defaults to 
         // now, but it works across date changes.
-        assertTrue( "When the supplied creation date is null, date shuld default to command execution time",
-                        Math.abs(System.currentTimeMillis() - result.getCreateDate().toInstant().toEpochMilli()) < 1000 );
+        assertTrue(Math.abs(System.currentTimeMillis() - result.getCreateDate().toInstant().toEpochMilli()) < 1000,
+            "When the supplied creation date is null, date should default to command execution time");
         
         assertTrue( result.isPermissionRoot() );
         assertTrue( result.isThemeRoot() );
@@ -287,31 +313,38 @@ public void testCustomOptions() throws CommandException {
         }
     }
     
-    @Test( expected=IllegalCommandException.class )
-    public void testCantCreateAdditionalRoot() throws Exception {
-        engine.submit( new CreateDataverseCommand(makeDataverse(), makeRequest(), null, null) );
+    @Test
+    void testCantCreateAdditionalRoot() {
+        assertThrows(IllegalCommandException.class,
+            () -> engine.submit( new CreateDataverseCommand(makeDataverse(), makeRequest(), null, null) )
+        );
     }
     
-    @Test( expected=IllegalCommandException.class )
-    public void testGuestCantCreateDataverse() throws Exception {
+    @Test
+    void testGuestCantCreateDataverse() {
         final DataverseRequest request = new DataverseRequest( GuestUser.get(), IpAddress.valueOf("::") );
         isRootDvExists = false;
-        engine.submit(new CreateDataverseCommand(makeDataverse(), request, null, null) );
+        assertThrows(IllegalCommandException.class,
+            () -> engine.submit(new CreateDataverseCommand(makeDataverse(), request, null, null) )
+        );
     }
 
-    @Test( expected=IllegalCommandException.class )
-    public void testCantCreateAnotherWithSameAlias() throws Exception {
+    @Test
+    void testCantCreateAnotherWithSameAlias() {
         
         String alias = "alias";
         final Dataverse dvFirst = makeDataverse();
         dvFirst.setAlias(alias);
         dvFirst.setOwner( makeDataverse() );
-        engine.submit(new CreateDataverseCommand(dvFirst, makeRequest(), null, null) );
+        assertThrows(IllegalCommandException.class,
+            () -> engine.submit(new CreateDataverseCommand(dvFirst, makeRequest(), null, null) ));
         
         final Dataverse dv = makeDataverse();
         dv.setOwner( makeDataverse() );
         dv.setAlias(alias);
-        engine.submit(new CreateDataverseCommand(dv, makeRequest(), null, null) );
+        assertThrows(IllegalCommandException.class,
+            () -> engine.submit(new CreateDataverseCommand(dv, makeRequest(), null, null) )
+        );
     }
     
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseFeaturedItemCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseFeaturedItemCommandTest.java
new file mode 100644
index 00000000000..0171997e69f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseFeaturedItemCommandTest.java
@@ -0,0 +1,233 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.api.AbstractApiBean;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
+import edu.harvard.iq.dataverse.api.dto.NewDataverseFeaturedItemDTO;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.InvalidCommandArgumentsException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Timestamp;
+import java.text.MessageFormat;
+import java.time.Instant;
+import java.util.List;
+
+import static edu.harvard.iq.dataverse.mocks.MocksFactory.makeRequest;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+class CreateDataverseFeaturedItemCommandTest {
+    @Mock
+    private CommandContext contextStub;
+
+    @Mock
+    private DataverseFeaturedItemServiceBean dataverseFeaturedItemServiceStub;
+
+    @InjectMocks
+    private CreateDataverseFeaturedItemCommand sut;
+
+    private Dataverse testDataverse;
+    private NewDataverseFeaturedItemDTO testNewDataverseFeaturedItemDTO;
+
+    @BeforeEach
+    void setUp() throws AbstractApiBean.WrappedResponse {
+        MockitoAnnotations.openMocks(this);
+
+        testDataverse = new Dataverse();
+        testDataverse.setId(123L);
+        testDataverse.setPublicationDate(Timestamp.from(Instant.now()));
+
+        testNewDataverseFeaturedItemDTO = new NewDataverseFeaturedItemDTO();
+        testNewDataverseFeaturedItemDTO.setImageFileName("test.png");
+        testNewDataverseFeaturedItemDTO.setContent("test content");
+        testNewDataverseFeaturedItemDTO.setDisplayOrder(0);
+        testNewDataverseFeaturedItemDTO.setType("custom");
+        testNewDataverseFeaturedItemDTO.setDvObject(null);
+        testNewDataverseFeaturedItemDTO.setImageFileInputStream(mock(InputStream.class));
+
+        when(contextStub.dataverseFeaturedItems()).thenReturn(dataverseFeaturedItemServiceStub);
+        sut = new CreateDataverseFeaturedItemCommand(makeRequest(), testDataverse, testNewDataverseFeaturedItemDTO);
+    }
+
+    @Test
+    void execute_imageFileProvidedAndValid_savesFeaturedItem() throws Exception {
+        DataverseFeaturedItem expectedFeaturedItem = new DataverseFeaturedItem();
+        expectedFeaturedItem.setDataverse(testDataverse);
+        expectedFeaturedItem.setType(testNewDataverseFeaturedItemDTO.getType());
+        expectedFeaturedItem.setDvObject(testNewDataverseFeaturedItemDTO.getDvObject());
+        expectedFeaturedItem.setImageFileName(testNewDataverseFeaturedItemDTO.getImageFileName());
+        expectedFeaturedItem.setDisplayOrder(testNewDataverseFeaturedItemDTO.getDisplayOrder());
+        expectedFeaturedItem.setContent(testNewDataverseFeaturedItemDTO.getContent());
+
+        when(dataverseFeaturedItemServiceStub.save(any(DataverseFeaturedItem.class))).thenReturn(expectedFeaturedItem);
+
+        DataverseFeaturedItem result = sut.execute(contextStub);
+
+        assertNotNull(result);
+
+        assertEquals(testNewDataverseFeaturedItemDTO.getImageFileName(), result.getImageFileName());
+        assertEquals(testNewDataverseFeaturedItemDTO.getDisplayOrder(), result.getDisplayOrder());
+        assertEquals(testNewDataverseFeaturedItemDTO.getContent(), result.getContent());
+        assertEquals(testDataverse, result.getDataverse());
+        assertEquals(testNewDataverseFeaturedItemDTO.getDvObject(), result.getDvObject());
+        assertEquals(testNewDataverseFeaturedItemDTO.getType(), result.getType());
+
+        verify(dataverseFeaturedItemServiceStub).save(any(DataverseFeaturedItem.class));
+        verify(dataverseFeaturedItemServiceStub).saveDataverseFeaturedItemImageFile(
+                testNewDataverseFeaturedItemDTO.getImageFileInputStream(),
+                testNewDataverseFeaturedItemDTO.getImageFileName(),
+                testDataverse.getId()
+        );
+    }
+
+    @Test
+    void execute_noImageFileProvided_featuredItemSavedWithoutImage() throws Exception {
+        testNewDataverseFeaturedItemDTO.setImageFileName(null);
+
+        DataverseFeaturedItem expectedFeaturedItem = new DataverseFeaturedItem();
+        when(dataverseFeaturedItemServiceStub.save(any(DataverseFeaturedItem.class))).thenReturn(expectedFeaturedItem);
+
+        DataverseFeaturedItem result = sut.execute(contextStub);
+
+        assertNotNull(result);
+        verify(dataverseFeaturedItemServiceStub).save(any(DataverseFeaturedItem.class));
+        verify(dataverseFeaturedItemServiceStub, never()).saveDataverseFeaturedItemImageFile(any(), any(), any());
+    }
+
+    @Test
+    void execute_imageFileProcessingFails_throwsCommandException() throws IOException, DataverseFeaturedItemServiceBean.InvalidImageFileException {
+        testNewDataverseFeaturedItemDTO.setImageFileName("invalid.png");
+        InputStream inputStreamMock = mock(InputStream.class);
+        testNewDataverseFeaturedItemDTO.setImageFileInputStream(inputStreamMock);
+
+        doThrow(new IOException("File processing failed"))
+                .when(dataverseFeaturedItemServiceStub)
+                .saveDataverseFeaturedItemImageFile(any(InputStream.class), any(String.class), any(Long.class));
+
+        CommandException exception = assertThrows(CommandException.class, () -> sut.execute(contextStub));
+        assertTrue(exception.getMessage().contains("File processing failed"));
+    }
+
+    @Test
+    void execute_invalidFileTypeProvided_throwsInvalidCommandArgumentsException() throws IOException, DataverseFeaturedItemServiceBean.InvalidImageFileException {
+        testNewDataverseFeaturedItemDTO.setImageFileName("invalid.type");
+        InputStream inputStreamMock = mock(InputStream.class);
+        testNewDataverseFeaturedItemDTO.setImageFileInputStream(inputStreamMock);
+
+        doThrow(new DataverseFeaturedItemServiceBean.InvalidImageFileException("Invalid file type"))
+                .when(dataverseFeaturedItemServiceStub).saveDataverseFeaturedItemImageFile(any(InputStream.class), any(String.class), any(Long.class));
+
+        InvalidCommandArgumentsException exception = assertThrows(InvalidCommandArgumentsException.class, () -> sut.execute(contextStub));
+        assertTrue(exception.getMessage().contains("Invalid file type"));
+    }
+
+    @Test
+    void execute_contentIsNull_throwsInvalidCommandArgumentsException() {
+        assertContentShouldBeProvidedInvalidCommandArgumentsException(null);
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {" ", ""})
+    void execute_contentIsEmpty_throwsInvalidCommandArgumentsException(String content) {
+        assertContentShouldBeProvidedInvalidCommandArgumentsException(content);
+    }
+
+    @Test
+    void execute_contentExceedsLimit_throwsInvalidCommandArgumentsException() {
+        testNewDataverseFeaturedItemDTO.setContent(createContentExceedingMaxLength());
+        InputStream inputStreamMock = mock(InputStream.class);
+        testNewDataverseFeaturedItemDTO.setImageFileInputStream(inputStreamMock);
+
+        InvalidCommandArgumentsException exception = assertThrows(InvalidCommandArgumentsException.class, () -> sut.execute(contextStub));
+        assertEquals(
+                MessageFormat.format(
+                        BundleUtil.getStringFromBundle("dataverse.create.featuredItem.error.contentExceedsLengthLimit"),
+                        List.of(DataverseFeaturedItem.MAX_FEATURED_ITEM_CONTENT_SIZE)
+                ),
+                exception.getMessage()
+        );
+    }
+
+    @Test
+    void execute_invalidTypeAndDvObject_throwsInvalidCommandArgumentsException() {
+        testNewDataverseFeaturedItemDTO.setType("dataset");
+        testNewDataverseFeaturedItemDTO.setDvObject(null);
+        CommandException exception = assertThrows(CommandException.class, () -> sut.execute(contextStub));
+        assertEquals(
+                BundleUtil.getStringFromBundle("dataverse.update.featuredItems.error.invalidTypeAndDvObject"),
+                exception.getMessage()
+        );
+        testNewDataverseFeaturedItemDTO.setType("foo");
+        testNewDataverseFeaturedItemDTO.setDvObject(null);
+        exception = assertThrows(CommandException.class, () -> sut.execute(contextStub));
+        assertEquals(
+                BundleUtil.getStringFromBundle("dataverse.update.featuredItems.error.invalidTypeAndDvObject"),
+                exception.getMessage()
+        );
+    }
+
+    @Test
+    void execute_validTypeAndDvObject() throws Exception {
+        testNewDataverseFeaturedItemDTO.setDvObject(testDataverse);
+        testNewDataverseFeaturedItemDTO.setType(DataverseFeaturedItem.TYPES.DATAVERSE.name());
+        testNewDataverseFeaturedItemDTO.setContent(null);
+
+        DataverseFeaturedItem expectedFeaturedItem = new DataverseFeaturedItem();
+        expectedFeaturedItem.setDataverse(testDataverse);
+        expectedFeaturedItem.setType(testNewDataverseFeaturedItemDTO.getType());
+        expectedFeaturedItem.setDvObject(testNewDataverseFeaturedItemDTO.getDvObject());
+        expectedFeaturedItem.setImageFileName(testNewDataverseFeaturedItemDTO.getImageFileName());
+        expectedFeaturedItem.setDisplayOrder(testNewDataverseFeaturedItemDTO.getDisplayOrder());
+        expectedFeaturedItem.setContent(testNewDataverseFeaturedItemDTO.getContent());
+
+        when(dataverseFeaturedItemServiceStub.save(any(DataverseFeaturedItem.class))).thenReturn(expectedFeaturedItem);
+
+        DataverseFeaturedItem result = sut.execute(contextStub);
+        assertNotNull(result);
+
+        // test type dataverse
+        assertEquals(testDataverse, result.getDvObject());
+        assertEquals(DataverseFeaturedItem.TYPES.DATAVERSE.name(), result.getType());
+
+        // test type custom
+        testNewDataverseFeaturedItemDTO.setDvObject(null);
+        testNewDataverseFeaturedItemDTO.setType(null);
+        testNewDataverseFeaturedItemDTO.setContent("test content");
+        expectedFeaturedItem.setType(DataverseFeaturedItem.TYPES.CUSTOM.name());
+        expectedFeaturedItem.setDvObject(null);
+
+        result = sut.execute(contextStub);
+        assertNotNull(result);
+
+        assertEquals(null, result.getDvObject());
+        assertEquals(DataverseFeaturedItem.TYPES.CUSTOM.name(), result.getType());
+    }
+
+    private void assertContentShouldBeProvidedInvalidCommandArgumentsException(String content) {
+        testNewDataverseFeaturedItemDTO.setContent(content);
+        InputStream inputStreamMock = mock(InputStream.class);
+        testNewDataverseFeaturedItemDTO.setImageFileInputStream(inputStreamMock);
+
+        InvalidCommandArgumentsException exception = assertThrows(InvalidCommandArgumentsException.class, () -> sut.execute(contextStub));
+        assertEquals(
+                BundleUtil.getStringFromBundle("dataverse.create.featuredItem.error.contentShouldBeProvided"),
+                exception.getMessage()
+        );
+    }
+
+    private String createContentExceedingMaxLength() {
+        return "a".repeat(Math.max(0, DataverseFeaturedItem.MAX_FEATURED_ITEM_CONTENT_SIZE + 1));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDataFilesTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDataFilesTest.java
new file mode 100644
index 00000000000..f4220b44183
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDataFilesTest.java
@@ -0,0 +1,280 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.storageuse.UploadSessionQuotaLimit;
+import edu.harvard.iq.dataverse.util.JhoveFileType;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.jetbrains.annotations.NotNull;
+import org.joda.time.DateTime;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.security.SecureRandom;
+import java.text.MessageFormat;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import static edu.harvard.iq.dataverse.DataFile.ChecksumType.MD5;
+import static org.apache.commons.io.file.FilesUncheck.createDirectories;
+import static org.apache.commons.io.file.PathUtils.deleteDirectory;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+
+
+@LocalJvmSettings
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class CreateNewDataFilesTest {
+    // TODO keep constants for annotations in sync with class name
+    Path testDir = Path.of("target/test/").resolve(getClass().getSimpleName());
+    PrintStream original_stderr;
+
+    @Mock
+    Dataset mockDataset;
+    @Mock
+    DatasetVersion mockDatasetVersion;
+
+    @BeforeEach
+    public void setupMock() {
+        Mockito.when(mockDataset.getId()).thenReturn(2L);
+        Mockito.when(mockDataset.getEffectiveDatasetFileCountLimit()).thenReturn(1000);
+        Mockito.when(mockDatasetVersion.getDataset()).thenReturn(mockDataset);
+    }
+    @BeforeEach
+    public void cleanTmpDir() throws IOException {
+        original_stderr = System.err;
+        if(testDir.toFile().exists())
+            deleteDirectory(testDir);
+    }
+
+    @AfterEach void restoreStderr() {
+        System.setErr(original_stderr);
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FILES_DIRECTORY, value = "target/test/CreateNewDataFilesTest/tmp")
+    public void execute_fails_to_upload_when_tmp_does_not_exist() throws FileNotFoundException {
+
+        var cmd = createCmd("scripts/search/data/shape/shapefile.zip", mockDatasetVersion, 1000L, 500L);
+        cmd.setDatasetService(mockDatasetServiceBean());
+        var ctxt = mockCommandContext(mockSysConfig(true, 0L, MD5, 10));
+
+        assertThatThrownBy(() -> cmd.execute(ctxt))
+            .isInstanceOf(CommandException.class)
+            .hasMessageContaining("Failed to save the upload as a temp file (temp disk space?)")
+            .hasRootCauseInstanceOf(NoSuchFileException.class)
+            .getRootCause()
+            .hasMessageStartingWith("target/test/CreateNewDataFilesTest/tmp/temp/tmp");
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FILES_DIRECTORY, value = "target/test/CreateNewDataFilesTest/tmp")
+    public void execute_fails_on_size_limit() throws Exception {
+        createDirectories(Path.of("target/test/CreateNewDataFilesTest/tmp/temp"));
+
+        var cmd = createCmd("scripts/search/data/binary/3files.zip", mockDatasetVersion, 1000L, 500L);
+        cmd.setDatasetService(mockDatasetServiceBean());
+        var ctxt = mockCommandContext(mockSysConfig(true, 50L, MD5, 0));
+        try (var mockedStatic = Mockito.mockStatic(JhoveFileType.class)) {
+            mockedStatic.when(JhoveFileType::getJhoveConfigFile).thenReturn("conf/jhove/jhove.conf");
+
+            assertThatThrownBy(() -> cmd.execute(ctxt))
+                .isInstanceOf(CommandException.class)
+                .hasMessage("This file size (462 B) exceeds the size limit of 50 B.");
+        }
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FILES_DIRECTORY, value = "target/test/CreateNewDataFilesTest/tmp")
+    public void execute_loads_individual_files_from_uploaded_zip() throws Exception {
+        var tempDir = testDir.resolve("tmp/temp");
+        createDirectories(tempDir);
+
+        var cmd = createCmd("src/test/resources/own-cloud-downloads/greetings.zip", mockDatasetVersion, 1000L, 500L);
+        cmd.setDatasetService(mockDatasetServiceBean());
+        var ctxt = mockCommandContext(mockSysConfig(false, 1000000L, MD5, 10));
+        try (MockedStatic<JhoveFileType> mockedStatic = Mockito.mockStatic(JhoveFileType.class)) {
+            mockedStatic.when(JhoveFileType::getJhoveConfigFile).thenReturn("conf/jhove/jhove.conf");
+
+            // the test
+            var result = cmd.execute(ctxt);
+
+            assertThat(result.getErrors()).hasSize(0);
+            assertThat(result.getDataFiles().stream().map(dataFile ->
+                dataFile.getFileMetadata().getDirectoryLabel() + "/" + dataFile.getDisplayName()
+            )).containsExactlyInAnyOrder(
+                "DD-1576/goodbye.txt", "DD-1576/hello.txt"
+            );
+            var storageIds = result.getDataFiles().stream().map(DataFile::getStorageIdentifier).toList();
+            assertThat(tempDir.toFile().list())
+                .containsExactlyInAnyOrderElementsOf(storageIds);
+        }
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FILES_DIRECTORY, value = "target/test/CreateNewDataFilesTest/tmp")
+    public void execute_rezips_sets_of_shape_files_from_uploaded_zip() throws Exception {
+        var tempDir = testDir.resolve("tmp/temp");
+        createDirectories(tempDir);
+
+        var cmd = createCmd("src/test/resources/own-cloud-downloads/shapes.zip", mockDatasetVersion, 1000L, 500L);
+        cmd.setDatasetService(mockDatasetServiceBean());
+        var ctxt = mockCommandContext(mockSysConfig(false, 100000000L, MD5, 10));
+        try (var mockedJHoveFileType = Mockito.mockStatic(JhoveFileType.class)) {
+            mockedJHoveFileType.when(JhoveFileType::getJhoveConfigFile).thenReturn("conf/jhove/jhove.conf");
+
+            // the test
+            var result = cmd.execute(ctxt);
+
+            assertThat(result.getErrors()).hasSize(0);
+            assertThat(result.getDataFiles().stream().map(dataFile ->
+                (dataFile.getFileMetadata().getDirectoryLabel() + "/" + dataFile.getDisplayName())
+                    .replaceAll(".*/dataDir/", "")
+            )).containsExactlyInAnyOrder(
+                "shape1.zip",
+                "shape2/shape2",
+                "shape2/shape2.pdf",
+                "shape2/shape2.txt",
+                "shape2/shape2.zip",
+                "extra/shp_dictionary.xls",
+                "extra/notes",
+                "extra/README.MD"
+            );
+            var storageIds = result.getDataFiles().stream().map(DataFile::getStorageIdentifier).toList();
+            assertThat(tempDir.toFile().list())
+                .containsExactlyInAnyOrderElementsOf(storageIds);
+        }
+    }
+
+    @Disabled("Too slow. Intended for manual execution.")
+    @Test
+    @JvmSetting(key = JvmSettings.FILES_DIRECTORY, value = "/tmp/test/CreateNewDataFilesTest/tmp")
+    public void extract_zip_performance() throws Exception {
+        /*
+         Developed to test performance difference between the old implementation with ZipInputStream and the new ZipFile implementation.
+         Play with numbers depending on:
+         - the time you want to spend on this test
+         - how much system stress you want to examine
+        */
+        var nrOfZipFiles = 20;
+        var avgNrOfFilesPerZip = 300;
+        var avgFileLength = 5000;
+
+        var tmpUploadStorage = Path.of("/tmp/test/CreateNewDataFilesTest/tmp/temp");
+        if(tmpUploadStorage.toFile().exists()) {
+            deleteDirectory(tmpUploadStorage);
+        }
+        createDirectories(tmpUploadStorage); // temp in target would choke intellij
+
+        var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        var random = new SecureRandom();
+        var totalNrOfFiles = 0;
+        var totalFileSize = 0;
+        var totalTime = 0L;
+        var tmp = Path.of(Files.createTempDirectory(null).toString());
+        var ctxt = mockCommandContext(mockSysConfig(false, 100000000L, MD5, 10000));
+        try (var mockedJHoveFileType = Mockito.mockStatic(JhoveFileType.class)) {
+            mockedJHoveFileType.when(JhoveFileType::getJhoveConfigFile).thenReturn("conf/jhove/jhove.conf");
+            for (var zipNr = 1; zipNr <= nrOfZipFiles; zipNr++) {
+                // build the zip
+                var zip = tmp.resolve(zipNr + "-data.zip");
+                var nrOfFilesInZip = random.nextInt(avgNrOfFilesPerZip * 2);
+                try (var zipStream = new ZipOutputStream(new FileOutputStream(zip.toFile()))) {
+                    for (var fileInZipNr = 1; fileInZipNr <= nrOfFilesInZip; fileInZipNr++) {
+                        // build content for a file
+                        var stringLength = random.nextInt(avgFileLength * 2 -5);
+                        StringBuilder sb = new StringBuilder(stringLength);
+                        for (int i = 1; i <= stringLength; i++) {// zero length causes buffer underflow
+                            sb.append(chars.charAt(random.nextInt(chars.length())));
+                        }
+                        // add the file to the zip
+                        zipStream.putNextEntry(new ZipEntry(fileInZipNr + ".txt"));
+                        zipStream.write((sb.toString()).getBytes());
+                        zipStream.closeEntry();
+                        totalFileSize += stringLength;
+                    }
+                }
+
+                // upload the zip
+                var before = DateTime.now();
+                @NotNull CreateNewDataFilesCommand cmd = createCmd(zip.toString(), mockDatasetVersion, 1000L, 500L);
+                cmd.setDatasetService(mockDatasetServiceBean());
+                var result = cmd
+                    .execute(ctxt);
+                totalTime += DateTime.now().getMillis() - before.getMillis();
+
+                assertThat(result.getErrors()).hasSize(0);
+                assertThat(result.getDataFiles()).hasSize(nrOfFilesInZip);
+                totalNrOfFiles += nrOfFilesInZip;
+
+                // report after each zip to have some data even when aborting a test that takes too long
+                System.out.println(MessageFormat.format(
+                    "Total time: {0}ms; nr of zips {1} total nr of files {2}; total file size {3}",
+                    totalTime, zipNr, totalNrOfFiles, totalFileSize
+                ));
+            }
+            assertThat(tmpUploadStorage.toFile().list()).hasSize(totalNrOfFiles);
+        }
+    }
+
+    private static @NotNull CreateNewDataFilesCommand createCmd(String name, DatasetVersion dsVersion, long allocatedQuotaLimit, long usedQuotaLimit) throws FileNotFoundException {
+        return new CreateNewDataFilesCommand(
+            Mockito.mock(DataverseRequest.class),
+            dsVersion,
+            new FileInputStream(name),
+            "example.zip",
+            "application/zip",
+            null,
+            new UploadSessionQuotaLimit(allocatedQuotaLimit, usedQuotaLimit),
+            "sha");
+    }
+
+    private static @NotNull CommandContext mockCommandContext(SystemConfig sysCfg) {
+        var ctxt = Mockito.mock(CommandContext.class);
+        Mockito.when(ctxt.systemConfig()).thenReturn(sysCfg);
+        return ctxt;
+    }
+
+    private static @NotNull SystemConfig mockSysConfig(boolean isStorageQuataEnforced, long maxFileUploadSizeForStore, DataFile.ChecksumType checksumType, int zipUploadFilesLimit) {
+        var sysCfg = Mockito.mock(SystemConfig.class);
+        Mockito.when(sysCfg.isStorageQuotasEnforced()).thenReturn(isStorageQuataEnforced);
+        Mockito.when(sysCfg.getMaxFileUploadSizeForStore(any())).thenReturn(maxFileUploadSizeForStore);
+        Mockito.when(sysCfg.getFileFixityChecksumAlgorithm()).thenReturn(checksumType);
+        Mockito.when(sysCfg.getZipUploadFilesLimit()).thenReturn(zipUploadFilesLimit);
+        return sysCfg;
+    }
+
+    private static @NotNull DatasetServiceBean mockDatasetServiceBean() {
+        var datasetService = Mockito.mock(DatasetServiceBean.class);
+        Mockito.when(datasetService.getDataFileCountByOwner(2L)).thenReturn(0);
+        return datasetService;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreatePrivateUrlCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreatePrivateUrlCommandTest.java
index 348f3e7b2dd..0ba29f74774 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreatePrivateUrlCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreatePrivateUrlCommandTest.java
@@ -2,23 +2,35 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
+import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
 import edu.harvard.iq.dataverse.engine.TestCommandContext;
 import edu.harvard.iq.dataverse.engine.TestDataverseEngine;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
+import edu.harvard.iq.dataverse.search.IndexResponse;
+import edu.harvard.iq.dataverse.search.IndexServiceBean;
+import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import java.util.concurrent.Future;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CreatePrivateUrlCommandTest {
 
@@ -27,8 +39,10 @@ public class CreatePrivateUrlCommandTest {
     private final Long privateUrlAlreadyExists = 1l;
     private final Long latestVersionIsNotDraft = 2l;
     private final Long createDatasetLong = 3l;
-
-    @Before
+    private final Long versionIsReleased = 4l;
+    
+    
+    @BeforeEach
     public void setUp() {
         dataset = new Dataset();
         testEngine = new TestDataverseEngine(new TestCommandContext() {
@@ -69,6 +83,10 @@ public RoleAssignment save(RoleAssignment assignment) {
                         // no-op
                         return assignment;
                     }
+                    @Override
+                    public List<RoleAssignment> directRoleAssignments(RoleAssignee roas, DvObject dvo) {
+                        return List.of();
+                    }
 
                 };
             }
@@ -85,6 +103,16 @@ public String getDataverseSiteUrl() {
                 };
 
             }
+            
+            @Override
+            public SolrIndexServiceBean solrIndex() {
+                return new SolrIndexServiceBean(){
+                    @Override
+                    public IndexResponse indexPermissionsOnSelfAndChildren(DvObject definitionPoint) {
+                        return null;
+                    }
+                };
+            }
 
         }
         );
@@ -93,30 +121,25 @@ public String getDataverseSiteUrl() {
     @Test
     public void testDatasetNull() {
         dataset = null;
-        String expected = "Can't create Private URL. Dataset is null.";
-        String actual = null;
         PrivateUrl privateUrl = null;
         try {
-            privateUrl = testEngine.submit(new CreatePrivateUrlCommand(null, dataset));
+            privateUrl = testEngine.submit(new CreatePrivateUrlCommand(null, dataset, false));
+            //Should not get here - exception expected
+            assertTrue(false);
         } catch (CommandException ex) {
-            actual = ex.getMessage();
         }
-        assertEquals(expected, actual);
         assertNull(privateUrl);
     }
 
     @Test
     public void testAlreadyExists() {
         dataset.setId(privateUrlAlreadyExists);
-        String expected = "Private URL already exists for dataset id " + privateUrlAlreadyExists + ".";
-        String actual = null;
         PrivateUrl privateUrl = null;
         try {
-            privateUrl = testEngine.submit(new CreatePrivateUrlCommand(null, dataset));
+            privateUrl = testEngine.submit(new CreatePrivateUrlCommand(null, dataset, false));
+            assertTrue(false);
         } catch (CommandException ex) {
-            actual = ex.getMessage();
         }
-        assertEquals(expected, actual);
         assertNull(privateUrl);
     }
 
@@ -129,15 +152,12 @@ public void testAttemptCreatePrivateUrlOnNonDraft() {
         versions.add(datasetVersion);
         dataset.setVersions(versions);
         dataset.setId(latestVersionIsNotDraft);
-        String expected = "Can't create Private URL because the latest version of dataset id " + latestVersionIsNotDraft + " is not a draft.";
-        String actual = null;
         PrivateUrl privateUrl = null;
         try {
-            privateUrl = testEngine.submit(new CreatePrivateUrlCommand(null, dataset));
+            privateUrl = testEngine.submit(new CreatePrivateUrlCommand(null, dataset, false));
+            assertTrue(false);
         } catch (CommandException ex) {
-            actual = ex.getMessage();
         }
-        assertEquals(expected, actual);
         assertNull(privateUrl);
     }
 
@@ -145,7 +165,24 @@ public void testAttemptCreatePrivateUrlOnNonDraft() {
     public void testCreatePrivateUrlSuccessfully() throws CommandException {
         dataset = new Dataset();
         dataset.setId(createDatasetLong);
-        PrivateUrl privateUrl = testEngine.submit(new CreatePrivateUrlCommand(null, dataset));
+        PrivateUrl privateUrl = testEngine.submit(new CreatePrivateUrlCommand(null, dataset, false));
+        assertNotNull(privateUrl);
+        assertNotNull(privateUrl.getDataset());
+        assertNotNull(privateUrl.getRoleAssignment());
+        PrivateUrlUser expectedUser = new PrivateUrlUser(dataset.getId());
+        assertEquals(expectedUser.getIdentifier(), privateUrl.getRoleAssignment().getAssigneeIdentifier());
+        assertEquals(expectedUser.isSuperuser(), false);
+        assertEquals(expectedUser.isAuthenticated(), false);
+        assertEquals(expectedUser.getDisplayInfo().getTitle(), "Preview URL Enabled");
+        assertNotNull(privateUrl.getToken());
+        assertEquals("https://dataverse.example.edu/previewurl.xhtml?token=" + privateUrl.getToken(), privateUrl.getLink());
+    }
+    
+    @Test
+    public void testCreateAnonymizedAccessPrivateUrlSuccessfully() throws CommandException {
+        dataset = new Dataset();
+        dataset.setId(createDatasetLong);
+        PrivateUrl privateUrl = testEngine.submit(new CreatePrivateUrlCommand(null, dataset, true));
         assertNotNull(privateUrl);
         assertNotNull(privateUrl.getDataset());
         assertNotNull(privateUrl.getRoleAssignment());
@@ -153,9 +190,34 @@ public void testCreatePrivateUrlSuccessfully() throws CommandException {
         assertEquals(expectedUser.getIdentifier(), privateUrl.getRoleAssignment().getAssigneeIdentifier());
         assertEquals(expectedUser.isSuperuser(), false);
         assertEquals(expectedUser.isAuthenticated(), false);
-        assertEquals(expectedUser.getDisplayInfo().getTitle(), "Private URL Enabled");
+        assertEquals(expectedUser.getDisplayInfo().getTitle(), "Preview URL Enabled");
         assertNotNull(privateUrl.getToken());
-        assertEquals("https://dataverse.example.edu/privateurl.xhtml?token=" + privateUrl.getToken(), privateUrl.getLink());
+        assertTrue(privateUrl.isAnonymizedAccess());
+        assertEquals("https://dataverse.example.edu/previewurl.xhtml?token=" + privateUrl.getToken(), privateUrl.getLink());
+    }
+    
+    @Test
+    public void testAttemptCreateAnonymizedAccessPrivateUrlOnReleased() throws CommandException {
+        dataset = new Dataset();
+        List<DatasetVersion> versions = new ArrayList<>();
+        dataset.setPublicationDate(new Timestamp(new Date().getTime()));
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+        DatasetVersion datasetVersion2 = new DatasetVersion();
+        datasetVersion2.setVersionState(DatasetVersion.VersionState.DRAFT);
+
+        versions.add(datasetVersion2);
+        versions.add(datasetVersion);
+        dataset.setVersions(versions);
+        dataset.setId(versionIsReleased);
+        PrivateUrl privateUrl = null;
+        try {
+            privateUrl = testEngine.submit(new CreatePrivateUrlCommand(null, dataset, true));
+            assertTrue(false);
+        } catch (CommandException ex) {
+           
+        }
+        assertNull(privateUrl);
     }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateRoleCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateRoleCommandTest.java
index ea39bb1bc77..3d947879e56 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateRoleCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateRoleCommandTest.java
@@ -9,13 +9,22 @@
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.engine.TestCommandContext;
 import edu.harvard.iq.dataverse.engine.TestDataverseEngine;
+import edu.harvard.iq.dataverse.engine.TestEntityManager;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
-import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatchers;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  *
@@ -36,15 +45,21 @@ public DataverseRole save(DataverseRole aRole) {
                 }
             };
         }
+        
+        @Override 
+        public EntityManager em() {
+            return new LocalTestEntityManager();
+            
+        }
     });
     
-    @Before
+    @BeforeEach
     public void before() {
         saveCalled = false;
     }
     
-    @Test( expected = IllegalCommandException.class )
-    public void testNonSuperUsersCantAddRoles() throws CommandException {
+    @Test
+    void testNonSuperUsersCantAddRoles() {
         DataverseRole dvr = new DataverseRole();
         dvr.setAlias("roleTest");
         dvr.setName("Tester Role");
@@ -57,8 +72,7 @@ public void testNonSuperUsersCantAddRoles() throws CommandException {
         normalUser.setSuperuser(false);
         
         CreateRoleCommand sut = new CreateRoleCommand(dvr, new DataverseRequest(normalUser,IpAddress.valueOf("89.17.33.33")), dv);
-        engine.submit(sut);
-    
+        assertThrows(IllegalCommandException.class, () -> engine.submit(sut));
     }
    
     @Test
@@ -76,12 +90,12 @@ public void testSuperUsersAddRoles() throws CommandException {
         
         CreateRoleCommand sut = new CreateRoleCommand(dvr, new DataverseRequest(normalUser,IpAddress.valueOf("89.17.33.33")), dv);
         engine.submit(sut);
-        assertTrue( "CreateRoleCommand did not call save on the created role.", saveCalled );
+        assertTrue(saveCalled, "CreateRoleCommand did not call save on the created role.");
     
     }
     
-    @Test( expected = IllegalCommandException.class )
-    public void testGuestUsersCantAddRoles() throws CommandException {
+    @Test
+    void testGuestUsersCantAddRoles() {
         DataverseRole dvr = new DataverseRole();
         dvr.setAlias("roleTest");
         dvr.setName("Tester Role");
@@ -91,7 +105,36 @@ public void testGuestUsersCantAddRoles() throws CommandException {
         dvr.setOwner(dv);
         
         CreateRoleCommand sut = new CreateRoleCommand(dvr, new DataverseRequest(GuestUser.get(),IpAddress.valueOf("89.17.33.33")), dv);
-        engine.submit(sut);    
+        assertThrows(IllegalCommandException.class, () -> engine.submit(sut));
+    }
+    
+    private class LocalTestEntityManager extends TestEntityManager {
+
+        @Override
+        public <T> T merge(T entity) {
+            return entity;
+        }
+
+        @Override
+        public void persist(Object entity) {
+            //
+        }
+
+        @Override
+        public void flush() {
+            //nothing to do here
+        }
+
+        @Override
+        public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
+            //Mocking a query to return no results when 
+            //checking for existing role in DB
+            TypedQuery mockedQuery = mock(TypedQuery.class);
+            when(mockedQuery.setParameter(ArgumentMatchers.anyString(), ArgumentMatchers.any())).thenReturn(mockedQuery);
+            when(mockedQuery.getSingleResult()).thenReturn(null);
+            return mockedQuery;
+        }
+
     }
     
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java
new file mode 100644
index 00000000000..bf3daa6c593
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java
@@ -0,0 +1,142 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+@LocalJvmSettings
+public class CreateTemplateCommandTest {
+
+    private DataverseRequest dataverseRequestStub;
+
+    @Mock
+    private CommandContext contextMock;
+    @Mock
+    private TemplateServiceBean templateServiceBeanStub;
+    @Mock
+    private MetadataBlockServiceBean metadataBlockServiceBeanMock;
+    @Mock
+    private LicenseServiceBean licenseServiceBeanMock;
+    @Mock
+    private DataverseFieldTypeInputLevelServiceBean fieldTypeInputLevelServiceBeanMock;
+
+    @Spy
+    private Template templateSpy;
+
+    @Mock
+    private Dataverse dataverseMock;
+
+    @BeforeEach
+    public void setUp() {
+        dataverseRequestStub = Mockito.mock(DataverseRequest.class);
+        when(contextMock.templates()).thenReturn(templateServiceBeanStub);
+    }
+
+    @Test
+    public void execute_shouldSaveTemplate_noInitialization() throws CommandException {
+        // Create the command with initialization set to false
+
+        CreateTemplateCommand sut = new CreateTemplateCommand(templateSpy, dataverseRequestStub, dataverseMock, false);
+
+        // Act
+
+        sut.execute(contextMock);
+
+        // Assert
+
+        // Verify that only save was called, and no initialization methods were touched.
+        verify(templateServiceBeanStub).save(templateSpy);
+        verify(templateSpy, never()).setDataverse(any(Dataverse.class));
+        verify(templateSpy, never()).setMetadataValueBlocks(any());
+        verify(templateSpy, never()).setTermsOfUseAndAccess(any());
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.MDB_SYSTEM_KEY_FOR, value = "something", varArgs = "citation")
+    public void execute_shouldInitializeAndSaveTemplate_withInitialization() throws CommandException {
+        when(contextMock.metadataBlocks()).thenReturn(metadataBlockServiceBeanMock);
+        when(contextMock.licenses()).thenReturn(licenseServiceBeanMock);
+        when(contextMock.fieldTypeInputLevels()).thenReturn(fieldTypeInputLevelServiceBeanMock);
+
+        when(dataverseMock.getId()).thenReturn(42L);
+        when(dataverseMock.isMetadataBlockRoot()).thenReturn(true);
+
+        // Mock system metadata blocks
+
+        MetadataBlock citationBlock = new MetadataBlock();
+        citationBlock.setName("citation");
+        when(metadataBlockServiceBeanMock.listMetadataBlocks()).thenReturn(List.of(citationBlock));
+
+        // Mock license
+
+        License defaultLicense = new License();
+        defaultLicense.setName("CC0");
+        when(licenseServiceBeanMock.getDefault()).thenReturn(defaultLicense);
+
+        // Mock DatasetFields for input level testing
+
+        DatasetFieldType fieldTypeMock = Mockito.mock(DatasetFieldType.class);
+        Mockito.when(fieldTypeMock.getId()).thenReturn(101L);
+        DatasetField dsf = Mockito.mock(DatasetField.class);
+        Mockito.when(dsf.getDatasetFieldType()).thenReturn(fieldTypeMock);
+        when(templateSpy.getFlatDatasetFields()).thenReturn(Collections.singletonList(dsf));
+
+        // Create the command with initialization set to true
+
+        CreateTemplateCommand sut = new CreateTemplateCommand(templateSpy, dataverseRequestStub, dataverseMock, true);
+
+        // Act
+
+        sut.execute(contextMock);
+
+        // Assert
+
+        // 1. Verify dataverse was set on the template
+        verify(templateSpy).setDataverse(dataverseMock);
+
+        // 2. Verify system metadata blocks were set
+        ArgumentCaptor<List<MetadataBlock>> mdbCaptor = ArgumentCaptor.forClass(List.class);
+        verify(templateSpy).setMetadataValueBlocks(mdbCaptor.capture());
+        assertEquals(1, mdbCaptor.getValue().size());
+        assertEquals("citation", mdbCaptor.getValue().get(0).getName());
+
+        // 3. Verify TermsOfUseAndAccess were created and set correctly
+        ArgumentCaptor<TermsOfUseAndAccess> termsCaptor = ArgumentCaptor.forClass(TermsOfUseAndAccess.class);
+        verify(templateSpy).setTermsOfUseAndAccess(termsCaptor.capture());
+        TermsOfUseAndAccess capturedTerms = termsCaptor.getValue();
+        assertTrue(capturedTerms.isFileAccessRequest());
+        assertEquals("CC0", capturedTerms.getLicense().getName());
+
+        // 4. Verify DatasetFieldInputLevels were checked
+        verify(fieldTypeInputLevelServiceBeanMock).findByDataverseIdDatasetFieldTypeId(42L, 101L);
+
+        // 5. Verify fields were tidied up
+        DatasetFieldUtil.tidyUpFields(templateSpy.getDatasetFields(), false);
+
+        // 6. Finally, verify the fully initialized template was saved
+        verify(templateServiceBeanStub).save(templateSpy);
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DRSSubmitToArchiveCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DRSSubmitToArchiveCommandTest.java
new file mode 100644
index 00000000000..70e65bfe34c
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DRSSubmitToArchiveCommandTest.java
@@ -0,0 +1,121 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import org.erdtman.jcs.JsonCanonicalizer;
+import org.junit.jupiter.api.Test;
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.interfaces.DecodedJWT;
+
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+
+import java.security.KeyFactory;
+import java.security.interfaces.RSAPrivateKey;
+//import java.security.interfaces.RSAPublicKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Base64;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class DRSSubmitToArchiveCommandTest {
+
+    /* Simple test of JWT encode/decode functionality
+     * 
+     */
+    @Test
+    public void createJWT() throws CommandException {
+
+        String privKeyString = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCzSwj+c/uiRz5A"
+                + "OiDWsV5pxJrdzlDRV2PKKwRGCzhv1MEPwQCvFp6wZRDgCE4EfpVUuByNInV1eOfr"
+                + "BjwIlxp8hv9RPYCAsPCFV46VLeZsr8FOfvqI6IswYqB3qwdi5NW+CuJRLgTFJP87"
+                + "X5GgoItVnE0/DxIuZobuaEEzPa8TV8kUvdehzxTlkMTay5J/USeyKsUjPozqgKtN"
+                + "4ScCWrQx2FXEuKoCg85wNgFRJHgSGBH07lNAYV2tOz+w0ToSNzKswNqhTpRl7W61"
+                + "gzDCFJu6IYreH9bH5eh/Z9BzjNOs16k0Ok2PmQhOhHYCT3fdkKogriSREVN5dlHi"
+                + "FV7eB577AgMBAAECggEAPGfLX+8zmDjogDsVVT/szzWt94zLLbyDollb1z1whjzn"
+                + "zqb31AWK8WMbjF8/6cO8DA77j5FMgYd6m3Q+RaajBdF1s6lE4ha68jHNl/Ue7P9J"
+                + "4WhmgDnYqzSPW8IDew4d9Sk1lqQqd0E/vIE2TyfHydAfNl+dgISKcUgur1TY52rb"
+                + "taldnMP44BoXSeKM1qMAE7tWXDQlRjDdcx2Vn6nKJ4iCC6490JSGaFpsoock9wkF"
+                + "Fi1euzVnvX3ksyioXHMZwzZ9ErCHsI+Px25xiroyloxeoj0zfcA8kZcC9vyoa9HF"
+                + "2p62iK6RM7JCQc7yMcSN2Fp8PzyHlOLgdI+8CKV4AQKBgQDYmVFenIbapLgN3uyW"
+                + "gPTgUQGdnLf2S1g1HHHw7+74aZuMKq20w8Ikv6qWMx07R05gm8yxQ1Z4ciLcEw2z"
+                + "KBurLte/t6ZAJXQ7wnbPyX1JPFQNxKJrPKq+FynnANrdPVgwUunmO9JJbsudU/cG"
+                + "WKaQiG0w5ltvXg1NY5i1doifawKBgQDT6HFxh31nGUySNRQloE9mpvbzT35ornvl"
+                + "0oMlCYX2M52C3/nH/rq30woP4hDMBlvq3V6blOzPHzQwlu4+4OKBqvxlAluYIoXP"
+                + "QD1vJhb7eti+mYnIWyQ6hnAhrg/WDxn69mixEson2EL68+WRawz61h3WbfKoivbe"
+                + "YP02G2uysQKBgBOPFLf0boED6tLl1HtqvbIb3od7BWmqOBbjsK5PHEc2UiOAHxt5"
+                + "qehjnmXdy7/0mnFC4GMJb5+Evv0cg1owPv9gRX88eDjGqQ5UayIsUbHxTq3HmdsR"
+                + "KWHs+Y2wmBLuXS5P7msp771N0fktAduC2denWiTWSF9wIMdiPQH16DRtAoGBAKs4"
+                + "ABmEKT4ZgfYMryervRwrQhPcIj5A5VkP2+kcJcKFd/pcMH15A7Mt8M5ekcXYSYKe"
+                + "tSeukBzWkJvGB+CEYl/1IRQYcJufIVERDdJ2C1HMs75lXp+ljMNBBu8frin+b7aI"
+                + "TJTuoqrJIW2VjeMOhSFTyi4NDmlCRy/tXArQ4xcxAoGAUppOsJZeF/1kPQIFwBkS"
+                + "bVuGxMscWKswHy6dXEq2VabVGBL8H33PkpJRBnw7S/f+8wvk9dX63NuTF6VYM546"
+                + "J73YadnpU82C+7OnaTTCDVPfXYgPFLpE9xKFKkRFacgUbEnvZ2i0zSUquH0RAyaK"
+                + "tJ0d/dnd5TQUccAZwT8Nrw0=";
+
+        String pubKeyString = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0sI/nP7okc+QDog1rFe"
+                + "acSa3c5Q0VdjyisERgs4b9TBD8EArxaesGUQ4AhOBH6VVLgcjSJ1dXjn6wY8CJca"
+                + "fIb/UT2AgLDwhVeOlS3mbK/BTn76iOiLMGKgd6sHYuTVvgriUS4ExST/O1+RoKCL"
+                + "VZxNPw8SLmaG7mhBMz2vE1fJFL3Xoc8U5ZDE2suSf1EnsirFIz6M6oCrTeEnAlq0"
+                + "MdhVxLiqAoPOcDYBUSR4EhgR9O5TQGFdrTs/sNE6EjcyrMDaoU6UZe1utYMwwhSb"
+                + "uiGK3h/Wx+Xof2fQc4zTrNepNDpNj5kIToR2Ak933ZCqIK4kkRFTeXZR4hVe3gee"
+                + "+wIDAQAB";
+
+        String fakeBody = "{\n"
+                + "    \"s3_bucket_name\": \"dataverse-export-dev\",\n"
+                + "    \"package_id\": \"doi-10-5072-fk2-e6cmkr.v1.18\",\n"
+                + "    \"s3_path\": \"doi-10-5072-fk2-e6cmkr\",\n"
+                + "    \"admin_metadata\": {\n"
+                + "        \"accessFlag\": \"N\",\n"
+                + "        \"contentModel\": \"opaque\",\n"
+                + "        \"depositingSystem\": \"Harvard Dataverse\",\n"
+                + "        \"firstGenerationInDrs\": \"unspecified\",\n"
+                + "        \"objectRole\": \"CG:DATASET\",\n"
+                + "        \"usageClass\": \"LOWUSE\",\n"
+                + "        \"storageClass\": \"AR\",\n"
+                + "        \"s3_bucket_name\": \"dataverse-export-dev\",\n"
+                + "        \"ownerCode\": \"123\",\n"
+                + "        \"billingCode\": \"456\",\n"
+                + "        \"resourceNamePattern\": \"pattern\",\n"
+                + "        \"urnAuthorityPath\": \"path\",\n"
+                + "        \"depositAgent\": \"789\",\n"
+                + "        \"depositAgentEmail\": \"someone@mailinator.com\",\n"
+                + "        \"successEmail\": \"winner@mailinator.com\",\n"
+                + "        \"failureEmail\": \"loser@mailinator.com\",\n"
+                + "        \"successMethod\": \"method\",\n"
+                + "        \"adminCategory\": \"root\"\n"
+                + "    }\n"
+                + "}";
+        
+        byte[] encoded = Base64.getDecoder().decode(privKeyString);
+        try {
+            KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+            PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(encoded);
+            RSAPrivateKey privKey = (RSAPrivateKey) keyFactory.generatePrivate(keySpec);
+            //RSAPublicKey publicKey;
+            /*
+             * If public key is needed: encoded = Base64.decodeBase64(publicKeyPEM);
+             * 
+             * KeyFactory keyFactory = KeyFactory.getInstance("RSA"); X509EncodedKeySpec
+             * keySpec = new X509EncodedKeySpec(encoded); return (RSAPublicKey)
+             * keyFactory.generatePublic(keySpec); RSAPublicKey publicKey = new
+             * RSAPublicKey(System.getProperty(RS256_KEY));
+             * 
+             * 
+             */
+            String canonicalBody = new JsonCanonicalizer(fakeBody).getEncodedString();
+            System.out.println("Canonical form:"+ canonicalBody);
+            
+            Algorithm algorithmRSA = Algorithm.RSA256(null, privKey);
+            String token1 = DRSSubmitToArchiveCommand.createJWTString(algorithmRSA, "InstallationBrandName", fakeBody, 5);
+            
+            System.out.println("JWT: " + token1);
+            DecodedJWT jwt = JWT.decode(token1);
+            System.out.println(jwt.getPayload());
+        } catch (Exception e) {
+            System.out.println(e.getClass() + e.getLocalizedMessage());
+            e.printStackTrace();
+            //Any exception is a failure, otherwise decoding worked.
+            fail(e.getLocalizedMessage());
+        }
+
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DeletePrivateUrlCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DeletePrivateUrlCommandTest.java
index 74c8c269b4b..0a4e5ed2d7e 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DeletePrivateUrlCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DeletePrivateUrlCommandTest.java
@@ -13,10 +13,11 @@
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DeletePrivateUrlCommandTest {
 
@@ -25,7 +26,7 @@ public class DeletePrivateUrlCommandTest {
     private final Long noPrivateUrlToDelete = 1l;
     private final Long hasPrivateUrlToDelete = 2l;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         testEngine = new TestDataverseEngine(new TestCommandContext() {
             @Override
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedDatasetVersionCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedDatasetVersionCommandTest.java
index 24c48fd257b..2c9f050b92f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedDatasetVersionCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/GetLatestPublishedDatasetVersionCommandTest.java
@@ -9,8 +9,9 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 import static edu.harvard.iq.dataverse.mocks.MocksFactory.makeRequest;
 
 /**
@@ -28,9 +29,9 @@ public void testLatestPublishedNoDraft() throws CommandException {
         List<DatasetVersion> versions = make10Versions(ds);
         ds.setVersions(versions);
         
-        assertEquals( 10l, engine.submit(new GetLatestPublishedDatasetVersionCommand(makeRequest(), ds)).getVersionNumber().longValue() );
-        assertTrue( "Published datasets should require no permissions to view",
-                        engine.getReqiredPermissionsForObjects().get(ds).isEmpty() );
+        assertEquals(10L, engine.submit(new GetLatestPublishedDatasetVersionCommand(makeRequest(), ds)).getVersionNumber().longValue());
+        assertTrue(engine.getReqiredPermissionsForObjects().get(ds).isEmpty(),
+            "Published datasets should require no permissions to view");
     }
     
     @Test
@@ -41,9 +42,9 @@ public void testLatestPublishedWithDraft() throws CommandException {
         versions.add( MocksFactory.makeDatasetVersion(ds.getCategories()) );
         ds.setVersions(versions);
         
-        assertEquals( 10l, engine.submit(new GetLatestPublishedDatasetVersionCommand(makeRequest(), ds)).getVersionNumber().longValue() );
-        assertTrue( "Published datasets should require no permissions to view",
-                        engine.getReqiredPermissionsForObjects().get(ds).isEmpty() );
+        assertEquals(10L, engine.submit(new GetLatestPublishedDatasetVersionCommand(makeRequest(), ds)).getVersionNumber().longValue());
+        assertTrue(engine.getReqiredPermissionsForObjects().get(ds).isEmpty(),
+            "Published datasets should require no permissions to view");
     }
     
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/GetPrivateUrlCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/GetPrivateUrlCommandTest.java
index b5019807ac1..47174643a1c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/GetPrivateUrlCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/GetPrivateUrlCommandTest.java
@@ -5,13 +5,12 @@
 import edu.harvard.iq.dataverse.engine.TestDataverseEngine;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import static org.junit.Assert.assertNull;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class GetPrivateUrlCommandTest {
 
@@ -21,15 +20,15 @@ public class GetPrivateUrlCommandTest {
     public GetPrivateUrlCommandTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         testEngine = new TestDataverseEngine(new TestCommandContext() {
 
@@ -48,7 +47,7 @@ public PrivateUrl getPrivateUrlFromDatasetId(long datasetId) {
         });
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommandTest.java
new file mode 100644
index 00000000000..94be775cf4f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommandTest.java
@@ -0,0 +1,79 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.Template;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ListDataverseTemplatesCommandTest {
+
+    private DataverseRequest dataverseRequestStub;
+    private Template testTemplate;
+
+    @BeforeEach
+    public void setUp() {
+        dataverseRequestStub = Mockito.mock(DataverseRequest.class);
+        testTemplate = new Template();
+    }
+
+    @Test
+    public void execute_shouldReturnTemplates_noParent() throws CommandException {
+        Dataverse dataverseMock = Mockito.mock(Dataverse.class);
+
+        Mockito.when(dataverseMock.getTemplates()).thenReturn(Collections.singletonList(testTemplate));
+
+        ListDataverseTemplatesCommand sut = new ListDataverseTemplatesCommand(dataverseRequestStub, dataverseMock);
+
+        List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
+
+        assertEquals(1, result.size());
+        assertEquals(testTemplate, result.get(0));
+    }
+
+    @Test
+    public void execute_shouldReturnTemplates_parentHasTemplates() throws CommandException {
+        Template parentTemplate = new Template();
+
+        Dataverse dataverseMock = Mockito.mock(Dataverse.class);
+        Dataverse parentDataverseMock = Mockito.mock(Dataverse.class);
+
+        Mockito.when(dataverseMock.getTemplates()).thenReturn(Collections.singletonList(testTemplate));
+        Mockito.when(dataverseMock.getParentTemplates()).thenReturn(Collections.singletonList(parentTemplate));
+        Mockito.when(dataverseMock.getOwner()).thenReturn(parentDataverseMock);
+
+        ListDataverseTemplatesCommand sut = new ListDataverseTemplatesCommand(dataverseRequestStub, dataverseMock);
+
+        List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
+
+        assertEquals(2, result.size());
+        assertTrue(result.contains(testTemplate));
+        assertTrue(result.contains(parentTemplate));
+    }
+
+    @Test
+    public void execute_shouldReturnTemplates_parentHasNoTemplates() throws CommandException {
+        Dataverse dataverseMock = Mockito.mock(Dataverse.class);
+        Dataverse parentDataverseStub = Mockito.mock(Dataverse.class);
+
+        Mockito.when(dataverseMock.getTemplates()).thenReturn(Collections.singletonList(testTemplate));
+        Mockito.when(dataverseMock.getOwner()).thenReturn(parentDataverseStub);
+        Mockito.when(dataverseMock.getParentTemplates()).thenReturn(Collections.emptyList());
+
+        ListDataverseTemplatesCommand sut = new ListDataverseTemplatesCommand(dataverseRequestStub, dataverseMock);
+
+        List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
+
+        assertEquals(1, result.size());
+        assertTrue(result.contains(testTemplate));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ListMetadataBlocksCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ListMetadataBlocksCommandTest.java
new file mode 100644
index 00000000000..0701454113b
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ListMetadataBlocksCommandTest.java
@@ -0,0 +1,66 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseMetadataBlockFacet;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class ListMetadataBlocksCommandTest {
+
+    private DataverseRequest dataverseRequest;
+    private Dataverse dataverse;
+    private DataverseMetadataBlockFacet metadataBlockFacet;
+
+    @BeforeEach
+    public void beforeEachTest() {
+        dataverseRequest = Mockito.mock(DataverseRequest.class);
+        dataverse = Mockito.mock(Dataverse.class);
+        metadataBlockFacet = new DataverseMetadataBlockFacet();
+        metadataBlockFacet.setId(MocksFactory.nextId());
+        Mockito.when(dataverse.getMetadataBlockFacets()).thenReturn(Arrays.asList(metadataBlockFacet));
+    }
+
+    @Test
+    public void execute_should_return_dataverse_metadata_block_facets() throws CommandException {
+        ListMetadataBlockFacetsCommand target = new ListMetadataBlockFacetsCommand(dataverseRequest, dataverse);
+
+        List<DataverseMetadataBlockFacet> result = target.execute(Mockito.mock(CommandContext.class));
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(1));
+        MatcherAssert.assertThat(result.get(0), Matchers.is(metadataBlockFacet));
+    }
+
+
+    @Test
+    public void getRequiredPermissions_should_return_empty_for_all_when_dataverse_is_released() {
+        Mockito.when(dataverse.isReleased()).thenReturn(true);
+        ListMetadataBlockFacetsCommand target = new ListMetadataBlockFacetsCommand(dataverseRequest, dataverse);
+
+        MatcherAssert.assertThat(target.getRequiredPermissions().get(""), Matchers.emptyCollectionOf(Permission.class));
+    }
+
+    @Test
+    public void getRequiredPermissions_should_return_ViewUnpublishedDataverse_for_all_when_dataverse_is_not_released() {
+        Mockito.when(dataverse.isReleased()).thenReturn(false);
+        ListMetadataBlockFacetsCommand target = new ListMetadataBlockFacetsCommand(dataverseRequest, dataverse);
+
+        MatcherAssert.assertThat(target.getRequiredPermissions().get("").size(), Matchers.is(1));
+        MatcherAssert.assertThat(target.getRequiredPermissions().get(""), Matchers.hasItems(Permission.ViewUnpublishedDataverse));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommandTest.java
index 34f03702243..380a4bbcf18 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommandTest.java
@@ -6,7 +6,10 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetLock;
+import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.Guestbook;
@@ -14,6 +17,8 @@
 import edu.harvard.iq.dataverse.GuestbookServiceBean;
 import edu.harvard.iq.dataverse.MetadataBlock;
 import edu.harvard.iq.dataverse.PermissionServiceBean;
+import edu.harvard.iq.dataverse.RoleAssignment;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
@@ -25,53 +30,59 @@
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
 import static edu.harvard.iq.dataverse.mocks.MocksFactory.makeAuthenticatedUser;
+import static edu.harvard.iq.dataverse.mocks.MocksFactory.makeRole;
+import static edu.harvard.iq.dataverse.mocks.MocksFactory.nextId;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Future;
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.StoredProcedureQuery;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.metamodel.Metamodel;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Query;
+import jakarta.persistence.StoredProcedureQuery;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.metamodel.Metamodel;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.Context;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  *
  * @author skraffmi
  */
 public class MoveDatasetCommandTest {
-        Dataset moved, movedResponses;
-    	Dataverse root, childA, childB, grandchildAA, childDraft, grandchildBB;
-	DataverseEngine testEngine;
-        MetadataBlock blockA, blockB, blockC, blockD;
-        AuthenticatedUser auth, nobody;
-        Guestbook gbA, gbB, gbC;
-        GuestbookResponse gbResp;
-        @Context
-        protected HttpServletRequest httpRequest;
-	
-    @Before
+
+    Dataset moved, movedResponses, movedPerms, movedSamePerms;
+    Dataverse root, childA, childB, grandchildAA, childDraft, grandchildBB, childEditor, sibEditor;
+    DataverseEngine testEngine;
+    MetadataBlock blockA, blockB, blockC, blockD;
+    AuthenticatedUser auth, nobody;
+    Guestbook gbA, gbB, gbC;
+    GuestbookResponse gbResp;
+    @Context
+    protected HttpServletRequest httpRequest;
+
+    @BeforeEach
     public void setUp() {
 
         auth = makeAuthenticatedUser("Super", "User");
@@ -79,43 +90,60 @@ public void setUp() {
         nobody = makeAuthenticatedUser("Nick", "Nobody");
         nobody.setSuperuser(false);
 
-        
-        
         root = new Dataverse();
         root.setName("root");
         root.setId(1l);
         root.setPublicationDate(new Timestamp(new Date().getTime()));
-        
+        root.setDefaultContributorRole(roles.findBuiltinRoleByAlias(DataverseRole.CURATOR));
+
         childA = new Dataverse();
         childA.setName("childA");
         childA.setId(2l);
         childA.setPublicationDate(new Timestamp(new Date().getTime()));
-        
+
         childB = new Dataverse();
         childB.setName("childB");
         childB.setId(3l);
-        childB.setPublicationDate(new Timestamp(new Date().getTime())); 
-        
+        childB.setPublicationDate(new Timestamp(new Date().getTime()));
+
         grandchildAA = new Dataverse();
         grandchildAA.setName("grandchildAA");
         grandchildAA.setId(4l);
         grandchildAA.setPublicationDate(new Timestamp(new Date().getTime()));
-        
+
         childDraft = new Dataverse();
         childDraft.setName("childDraft");
         childDraft.setId(5l);
-        
+
         grandchildBB = new Dataverse();
         grandchildBB.setName("grandchildBB");
         grandchildBB.setId(6l);
         grandchildBB.setPublicationDate(new Timestamp(new Date().getTime()));
 
-        
+        childEditor = new Dataverse();
+        childEditor.setName("childEditor");
+        childEditor.setId(7l);
+        childEditor.setDefaultContributorRole(roles.findBuiltinRoleByAlias(DataverseRole.EDITOR));
+
+        sibEditor = new Dataverse();
+        sibEditor.setName("sibEditor");
+        sibEditor.setId(8l);
+        sibEditor.setDefaultContributorRole(roles.findBuiltinRoleByAlias(DataverseRole.EDITOR));
+
+        movedPerms = new Dataset();
+        movedPerms.setOwner(childEditor);
+        DatasetLock lock = new DatasetLock(DatasetLock.Reason.InReview, nobody, null);
+        movedPerms.addLock(lock);
+
+        movedSamePerms = new Dataset();
+        movedSamePerms.setOwner(childEditor);
+        movedSamePerms.addLock(lock);
+
         moved = new Dataset();
         moved.setOwner(root);
         moved.setPublicationDate(new Timestamp(new Date().getTime()));
         moved.setId(1l);
-        
+
         movedResponses = new Dataset();
         movedResponses.setOwner(root);
         movedResponses.setPublicationDate(new Timestamp(new Date().getTime()));
@@ -126,39 +154,39 @@ public void setUp() {
         grandchildAA.setOwner(childA);
         grandchildBB.setOwner(childA);
         childDraft.setOwner(childA);
-        
-        gbA= new Guestbook();
+
+        gbA = new Guestbook();
         gbA.setId(1l);
-        gbB= new Guestbook();
+        gbB = new Guestbook();
         gbB.setId(2l);
-        gbC= new Guestbook();
+        gbC = new Guestbook();
         gbC.setId(3l);
-        
+
         moved.setGuestbook(gbA);
         movedResponses.setGuestbook(gbA);
-        
-        GuestbookResponse gbResp = new GuestbookResponse(); 
+
+        GuestbookResponse gbResp = new GuestbookResponse();
         gbResp.setGuestbook(gbA);
         gbResp.setDataset(movedResponses);
-        
+
         List<Guestbook> includeA = new ArrayList();
         includeA.add(gbA);
         includeA.add(gbB);
-        
+
         grandchildAA.setGuestbooks(includeA);
-        
+
         List<Guestbook> notIncludeA = new ArrayList();
         notIncludeA.add(gbC);
         notIncludeA.add(gbB);
-        
+
         childB.setGuestbooks(notIncludeA);
-        
-        List<Guestbook> none = new ArrayList();       
+
+        List<Guestbook> none = new ArrayList();
         root.setGuestbooks(none);
         grandchildBB.setGuestbooks(none);
         grandchildBB.setGuestbookRoot(false);
         childA.setGuestbooks(includeA);
-        
+
         testEngine = new TestDataverseEngine(new TestCommandContext() {
             @Override
             public DataverseServiceBean dataverses() {
@@ -170,32 +198,46 @@ public Dataverse save(Dataverse dataverse) {
                     }
                 };
             }
-            
+
+            @Override
+            public DatasetServiceBean datasets() {
+                return new DatasetServiceBean() {
+                    @Override
+                    public void removeDatasetLocks(Dataset dataset, DatasetLock.Reason aReason) {
+                        new HashSet<>(dataset.getLocks()).stream()
+                                .filter(l -> l.getReason() == aReason)
+                                .forEach(lock -> {
+                                    dataset.removeLock(lock);
+                                });
+
+                    }
+                };
+            }
+
             @Override
             public GuestbookServiceBean guestbooks() {
                 return new GuestbookServiceBean() {
                     @Override
                     public Long findCountResponsesForGivenDataset(Long guestbookId, Long datasetId) {
                         //We're going to fake a response for a dataset with responses
-                        if(datasetId == 1){
+                        if (datasetId == 1) {
                             return new Long(0);
-                        } else{
+                        } else {
                             return new Long(1);
                         }
                     }
                 };
             }
-            
+
             @Override
-            public IndexServiceBean index(){
-                return new IndexServiceBean(){
+            public IndexServiceBean index() {
+                return new IndexServiceBean() {
                     @Override
-                    public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp){
-                        return null;
+                    public void asyncIndexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) {
                     }
                 };
             }
-            
+
             @Override
             public EntityManager em() {
                 return new MockEntityManager() {
@@ -218,14 +260,55 @@ public boolean isUserAllowedOn(RoleAssignee roleAssignee, Command<?> command, Dv
                     }
                 };
             }
-            
+
         });
     }
-	
-	/**
-	 * Moving ChildB to ChildA
-	 * @throws Exception - should not throw an exception
-	 */
+
+    DataverseRoleServiceBean roles = new DataverseRoleServiceBean() {
+
+        List<RoleAssignment> assignments = new LinkedList<>();
+
+        Map<String, DataverseRole> builtInRoles;
+
+        {
+            builtInRoles = new HashMap<>();
+            builtInRoles.put(DataverseRole.EDITOR, makeRole("default-editor", false));
+            builtInRoles.put(DataverseRole.ADMIN, makeRole("default-admin"));
+            builtInRoles.put(DataverseRole.MANAGER, makeRole("default-manager"));
+            builtInRoles.put(DataverseRole.CURATOR, makeRole("curator"));
+        }
+
+        @Override
+        public DataverseRole findBuiltinRoleByAlias(String alias) {
+            return builtInRoles.get(alias);
+        }
+
+        @Override
+        public RoleAssignment save(RoleAssignment assignment) {
+            assignment.setId(nextId());
+            assignments.add(assignment);
+            return assignment;
+        }
+
+        @Override
+        public RoleAssignment save(RoleAssignment assignment, boolean index) {
+            return save(assignment);
+        }
+
+        @Override
+        public List<RoleAssignment> directRoleAssignments(DvObject dvo) {
+            // works since there's only one dataverse involved in the context 
+            // of this unit test.
+            return assignments;
+        }
+
+    };
+
+    /**
+     * Moving ChildB to ChildA
+     *
+     * @throws Exception - should not throw an exception
+     */
     @Test
     public void testValidMove() throws Exception {
 
@@ -235,11 +318,10 @@ public void testValidMove() throws Exception {
         assertEquals(childA, moved.getOwner());
 
     }
-    
+
     /**
-	 * Moving  grandchildAA
-	 * Guestbook is not null because target includes it.
-	 */
+     * Moving grandchildAA Guestbook is not null because target includes it.
+     */
     @Test
     public void testKeepGuestbook() throws Exception {
 
@@ -249,12 +331,10 @@ public void testKeepGuestbook() throws Exception {
         assertNotNull(moved.getGuestbook());
 
     }
-    
-        /**
-	 * Moving to grandchildBB
-	 * Guestbook is not null because target inherits it.
-	 */
-    
+
+    /**
+     * Moving to grandchildBB Guestbook is not null because target inherits it.
+     */
     @Test
     public void testKeepGuestbookInherit() throws Exception {
 
@@ -264,52 +344,63 @@ public void testKeepGuestbookInherit() throws Exception {
         assertNotNull(moved.getGuestbook());
 
     }
-    
-    
+
     /**
-	 * Moving to ChildB
-	 * Guestbook is null because target does not include it
-	 */
+     * Moving to ChildB Guestbook is null because target does not include it
+     */
     @Test
     public void testRemoveGuestbook() throws Exception {
 
         DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
         testEngine.submit(new MoveDatasetCommand(aRequest, moved, childB, true));
-        assertNull( moved.getGuestbook());
+        assertNull(moved.getGuestbook());
 
     }
-    	
-	
-	/**
-	 * Moving DS to its owning DV 
-        * @throws IllegalCommandException
-	 */
-    @Test(expected = IllegalCommandException.class)
-    public void testInvalidMove() throws Exception {
 
+    @Test
+    public void testMoveToDifferentPerms() throws Exception {
         DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
-        testEngine.submit(
-                new MoveDatasetCommand(aRequest, moved, root, false));
-        fail();
+        testEngine.submit(new MoveDatasetCommand(aRequest, movedPerms, root, true));
+        assertTrue(movedPerms.getLocks().isEmpty());
+        assertTrue(movedPerms.getOwner().equals(root));
     }
-        
+
+    @Test
+    public void testMoveToSamePerms() throws Exception {
+        DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
+        testEngine.submit(new MoveDatasetCommand(aRequest, movedSamePerms, sibEditor, true));
+        assertTrue(movedSamePerms.getLocks().size() == 1);
+        assertTrue(movedSamePerms.getOwner().equals(sibEditor));
+    }
+
+    /**
+     * Moving DS to its owning DV
+     *
+     * @throws IllegalCommandException
+     */
+    @Test
+    void testInvalidMove() {
+        DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
+        assertThrows(IllegalCommandException.class,
+                () -> testEngine.submit(new MoveDatasetCommand(aRequest, moved, root, false)));
+    }
+
     /**
      * Moving a dataset without having enough permission fails with
      * PermissionException.
      *
      * @throws java.lang.Exception
-     * 
+     *
      * Ignoring after permissions change in 47fb045. Did that change make this
      * case untestable? Unclear.
      */
-    @Ignore
-    @Test(expected = PermissionException.class)
-    public void testAuthenticatedUserWithNoRole() throws Exception {
+    @Disabled("Unstable test. Disabled since #5115 by @pdurbin. See commit 7a917177")
+    @Test
+    void testAuthenticatedUserWithNoRole() {
 
         DataverseRequest aRequest = new DataverseRequest(nobody, httpRequest);
-        testEngine.submit(
-                new MoveDatasetCommand(aRequest, moved, childA, null));
-        fail();
+        assertThrows(IllegalCommandException.class,
+                () -> testEngine.submit(new MoveDatasetCommand(aRequest, moved, childA, null)));
     }
 
     /**
@@ -318,29 +409,27 @@ public void testAuthenticatedUserWithNoRole() throws Exception {
      *
      * @throws java.lang.Exception
      */
-    @Test(expected = PermissionException.class)
-    public void testNotAuthenticatedUser() throws Exception {
+    @Test
+    void testNotAuthenticatedUser() {
 
         DataverseRequest aRequest = new DataverseRequest(GuestUser.get(), httpRequest);
-        testEngine.submit(
-                new MoveDatasetCommand(aRequest, moved, root, null));
-        fail();
+        assertThrows(PermissionException.class,
+                () -> testEngine.submit(new MoveDatasetCommand(aRequest, moved, root, null)));
     }
-    
-    	/**
-	 * Moving published  DS to unpublished DV
-        * @throws IllegalCommandException
-	 */
-    @Test(expected = IllegalCommandException.class)
-    public void testInvalidMovePublishedToUnpublished() throws Exception {
+
+    /**
+     * Moving published DS to unpublished DV
+     *
+     * @throws IllegalCommandException
+     */
+    @Test
+    void testInvalidMovePublishedToUnpublished() {
         DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
-        testEngine.submit(
-                new MoveDatasetCommand(aRequest, moved, childDraft, null));
-        fail();
+        assertThrows(IllegalCommandException.class,
+                () -> testEngine.submit(new MoveDatasetCommand(aRequest, moved, childDraft, null)));
     }
-         
-        
-        private static class EntityManagerImpl implements EntityManager {
+
+    private static class EntityManagerImpl implements EntityManager {
 
         @Override
         public void persist(Object entity) {
@@ -597,8 +686,8 @@ public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
             throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
         }
 
-    }    
-        
+    }
+
     private static class MockEntityManager extends EntityManagerImpl {
 
         @Override
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommandTest.java
index e6f7a5ea34f..3c3188da830 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommandTest.java
@@ -25,14 +25,14 @@
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.Future;
-import javax.persistence.EntityManager;
-import javax.servlet.http.HttpServletRequest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.Test;
+import jakarta.persistence.EntityManager;
+import jakarta.servlet.http.HttpServletRequest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -49,7 +49,7 @@ public class MoveDataverseCommandTest {
     AuthenticatedUser auth, nobody;
     protected HttpServletRequest httpRequest;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         // authentication 
         auth = makeAuthenticatedUser("Super", "User");
@@ -156,9 +156,11 @@ public void setUp() {
         mbA = new MetadataBlock();
         mbA.setOwner(root);
         mbA.setId(1l);
+        mbA.setName("mbA");
         mbB = new MetadataBlock();
         mbB.setOwner(childE);
         mbB.setId(2l);
+        mbB.setName("mbB");
         mbsE.add(mbB);
         mbsEE.add(mbA);
         mbsEE.add(mbB);
@@ -219,8 +221,7 @@ public Future<String> indexDataverse(Dataverse dataverse){
                     }
 
                     @Override
-                    public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp){
-                        return null;
+                    public void asyncIndexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp){
                     }
                     @Override
                     public Future<String> indexDataverseInNewTransaction(Dataverse dataverse){
@@ -228,8 +229,7 @@ public Future<String> indexDataverseInNewTransaction(Dataverse dataverse){
                     }
 
                     @Override
-                    public Future<String> indexDatasetInNewTransaction(Long id){
-                        return null;
+                    public void indexDatasetInNewTransaction(Long id){
                     }                    
                 };
 
@@ -302,43 +302,39 @@ public void testValidMove() throws Exception {
     /**
      * Moving ChildA to its child (illegal).
      */
-    @Test( expected=IllegalCommandException.class )
-    public void testInvalidMove() throws Exception {
+    @Test
+    void testInvalidMove() {
         System.out.println("testInvalidMove");
         DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
-        testEngine.submit(
-                        new MoveDataverseCommand(aRequest, childA, grandchildAA, null));
-        fail();
+        assertThrows(IllegalCommandException.class,
+            () -> testEngine.submit(new MoveDataverseCommand(aRequest, childA, grandchildAA, null)));
     }
     
     /**
      * Calling API as a non super user (illegal).
      */
-    @Test(expected = PermissionException.class)
-    public void testNotSuperUser() throws Exception {
+    @Test
+    void testNotSuperUser() {
         System.out.println("testNotSuperUser");
         DataverseRequest aRequest = new DataverseRequest(nobody, httpRequest);
-        testEngine.submit(
-                        new MoveDataverseCommand(aRequest, childB, childA, null));
-        fail();
+        assertThrows(PermissionException.class,
+            () -> testEngine.submit(new MoveDataverseCommand(aRequest, childB, childA, null)));
     }
     
-    @Test( expected=IllegalCommandException.class )
-    public void testMoveIntoSelf() throws Exception {
+    @Test
+    void testMoveIntoSelf() {
         System.out.println("testMoveIntoSelf");
         DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
-        testEngine.submit(
-                        new MoveDataverseCommand(aRequest, childB, childB, null));
-        fail();
+        assertThrows(IllegalCommandException.class,
+            () -> testEngine.submit(new MoveDataverseCommand(aRequest, childB, childB, null)));
     }
     
-    @Test( expected=IllegalCommandException.class )
-    public void testMoveIntoParent() throws Exception {
+    @Test
+    void testMoveIntoParent() {
         System.out.println("testMoveIntoParent");
         DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
-        testEngine.submit(
-                        new MoveDataverseCommand(aRequest, grandchildAA, childA, null));
-        fail();
+        assertThrows(IllegalCommandException.class,
+            () -> testEngine.submit(new MoveDataverseCommand(aRequest, grandchildAA, childA, null)));
     }
     
     @Test
@@ -355,13 +351,12 @@ public void testKeepGuestbook() throws Exception {
         assertEquals( root, childC.getOwner() );
     }
     
-    @Test(expected = IllegalCommandException.class)
-    public void testRemoveGuestbookWithoutForce() throws Exception {
+    @Test
+    void testRemoveGuestbookWithoutForce() {
         System.out.println("testRemoveGuestbookWithoutForce");
         DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
-        testEngine.submit(
-                        new MoveDataverseCommand(aRequest, grandchildCC, root, null));
-        fail();
+        assertThrows(IllegalCommandException.class,
+            () -> testEngine.submit(new MoveDataverseCommand(aRequest, grandchildCC, root, null)));
     }
     
     @Test
@@ -393,13 +388,12 @@ public void testKeepTemplate() throws Exception {
         
     }
     
-    @Test(expected = IllegalCommandException.class)
-    public void testRemoveTemplateWithoutForce() throws Exception {
+    @Test
+    void testRemoveTemplateWithoutForce() {
         System.out.println("testRemoveTemplateWithoutForce");
         DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
-        testEngine.submit(
-                        new MoveDataverseCommand(aRequest, grandchildDD, root, null));
-        fail();
+        assertThrows(IllegalCommandException.class,
+            () -> testEngine.submit(new MoveDataverseCommand(aRequest, grandchildDD, root, null)));
     }
     
     @Test
@@ -430,13 +424,12 @@ public void testKeepMetadataBlock() throws Exception {
         assertEquals( root, childE.getOwner() );
     }
     
-    @Test(expected = IllegalCommandException.class)
-    public void testRemoveMetadataBlockWithoutForce() throws Exception {
+    @Test
+    void testRemoveMetadataBlockWithoutForce() {
         System.out.println("testRemoveMetadataBlockWithoutForce");
         DataverseRequest aRequest = new DataverseRequest(auth, httpRequest);
-        testEngine.submit(
-                        new MoveDataverseCommand(aRequest, grandchildEE, root, null));
-        fail();
+        assertThrows(IllegalCommandException.class,
+            () -> testEngine.submit(new MoveDataverseCommand(aRequest, grandchildEE, root, null)));
     }
     
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ReconcilePIDCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ReconcilePIDCommandTest.java
new file mode 100644
index 00000000000..4020aba7288
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ReconcilePIDCommandTest.java
@@ -0,0 +1,758 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.NoOpTestEntityManager;
+import edu.harvard.iq.dataverse.engine.TestCommandContext;
+import edu.harvard.iq.dataverse.engine.TestDataverseEngine;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.pidproviders.PidProvider;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.search.IndexServiceBean;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.persistence.EntityManager;
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.HashSet;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+/**
+ *
+ * @author jdarms
+ */
+public class ReconcilePIDCommandTest {
+    TestDataverseEngine engine;
+    DataverseRoleServiceBean drsb;
+    SystemConfig systemConfig;
+    IndexServiceBean indexServiceBean;
+    RoleAssigneeServiceBean roleAssigneeServiceBean;
+    UserNotificationServiceBean notificationService;
+
+    @BeforeEach
+    public void setUp() {
+        drsb= mock(DataverseRoleServiceBean.class);
+        systemConfig =mock(SystemConfig.class);
+        indexServiceBean=mock(IndexServiceBean.class);
+        roleAssigneeServiceBean=mock(RoleAssigneeServiceBean.class);
+        notificationService =mock(UserNotificationServiceBean.class);
+
+        engine = new TestDataverseEngine(new TestCommandContext() {
+            @Override
+            public DataverseRoleServiceBean roles() {
+                return drsb;
+            }
+
+            @Override
+            public RoleAssigneeServiceBean roleAssignees() {
+                return roleAssigneeServiceBean;
+            }
+
+            @Override
+            public EntityManager em() {
+                return new NoOpTestEntityManager();
+            }
+
+            @Override
+            public IndexServiceBean index() {
+                return indexServiceBean;
+            }
+
+            @Override
+            public SystemConfig systemConfig() {
+                return  systemConfig;
+            }
+
+            @Override
+            public UserNotificationServiceBean notifications() {
+                return notificationService;
+            }
+        });
+    }
+
+    @Test
+    public void testSuccessfulChangeWithoutFilePIDs() throws Exception {
+        // given a user that invokes a command request
+        AuthenticatedUser superUser = new AuthenticatedUser();
+        superUser.setSuperuser(true);
+        DataverseRequest request = MocksFactory.makeRequest(superUser);
+
+        // given a simple PID Provider
+        PidProvider pidProvider = mock(PidProvider.class);
+        when(pidProvider.getProtocol()).thenReturn("PROTO");
+        when(pidProvider.getAuthority()).thenReturn("PROTO");
+        when(pidProvider.getShoulder()).thenReturn("PROTO");
+        when(pidProvider.getSeparator()).thenReturn("PROTO");
+        when(pidProvider.getLabel()).thenReturn("PROTO");
+        when(pidProvider.getId()).thenReturn("PROTO");
+        when(pidProvider.registerWhenPublished()).thenReturn(false);
+        PidUtil.addToProviderList(pidProvider);
+
+        GlobalId pid = new GlobalId(pidProvider.getProtocol(),pidProvider.getAuthority(),"OLD-ID", pidProvider.getSeparator(),pidProvider.getUrlPrefix(), pidProvider.getLabel());
+        when(pidProvider.parsePersistentId(eq("PROTO"),eq("PROTO"),eq("OLD-ID"))).thenReturn(pid);
+
+        // given a dataset linked with the PID provider
+        Dataset ds = MocksFactory.makeDataset();
+        ds.setGlobalId(pid);
+        ds.setGlobalIdCreateTime(Timestamp.from(Instant.now()));
+        ds.setIdentifierRegistered(true);
+        when(pidProvider.alreadyRegistered(ds)).thenReturn(true);
+
+        // given a linked dataset with a given dataverse
+        Dataverse dv = MocksFactory.makeDataverse();
+        ds.setOwner(dv);
+
+        // given a new PID Provider
+        PidProvider newPIDProviderMock = mock(PidProvider.class);
+        when(newPIDProviderMock.getProtocol()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getAuthority()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getShoulder()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getSeparator()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getLabel()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getId()).thenReturn("PROTO1");
+        when(newPIDProviderMock.registerWhenPublished()).thenReturn(false);
+        when(newPIDProviderMock.canManagePID()).thenReturn(true);
+        PidUtil.addToProviderList(newPIDProviderMock);
+
+        // create new global ID
+        GlobalId pid2 = new GlobalId(newPIDProviderMock.getProtocol(), newPIDProviderMock.getAuthority(),"MYIDENT", newPIDProviderMock.getSeparator(), newPIDProviderMock.getUrlPrefix(), newPIDProviderMock.getLabel());
+        when(newPIDProviderMock.parsePersistentId(eq("PROTO1"),eq("PROTO1"),eq("MYIDENT"))).thenReturn(pid2);
+        when(newPIDProviderMock.generatePid(ds)).thenAnswer(new Answer<DvObject>() {
+            public DvObject answer(InvocationOnMock invocation) {
+                Dataset callback = (Dataset) invocation.getArguments()[0];
+                callback.setAuthority(pid2.getAuthority());
+                callback.setProtocol(pid2.getProtocol());
+                callback.setIdentifier(pid2.getIdentifier());
+                return callback;
+            }
+        });
+
+        // mocks and stubs for notification
+        RoleAssignment roleAssignment = new RoleAssignment();
+        roleAssignment.setAssigneeIdentifier("MY_ID");
+        when(drsb.directRoleAssignments(ds)).thenReturn(Lists.list(roleAssignment));
+        when(roleAssigneeServiceBean.getRoleAssignee("MY_ID")).thenReturn(superUser);
+        when(roleAssigneeServiceBean.getExplicitUsers(any())).thenReturn(List.of(superUser));
+
+        // disable file PIDs for collection
+        when(systemConfig.isFilePIDsEnabledForCollection(dv)).thenReturn(false);
+
+        // run reconcile PID command
+        ReconcileDatasetPidCommand sut = new ReconcileDatasetPidCommand(request, ds, newPIDProviderMock);
+        engine.submit(sut);
+
+        // then the global identifier should no longer be the previous one
+        assertNotEquals(pid, ds.getGlobalId());
+        // but it should be the newly generated one
+        assertEquals(pid2, ds.getGlobalId());
+        // which should also be registered and should have a create timestamp
+        assertEquals(true,ds.isIdentifierRegistered());
+        assertNotEquals(null,ds.getGlobalIdCreateTime());
+        // further, the old one should be available as alternative id
+        assertEquals(ds.getAlternativePersistentIndentifiers().size(),1);
+        assertEquals(ds.getAlternativePersistentIndentifiers().stream().findFirst().get().getIdentifier(),"OLD-ID");
+
+        // further, we should be sure that the user is notified about the change
+        verify(notificationService, times(1)).sendNotification(eq(superUser),any(),eq(UserNotification.Type.PIDRECONCILED),any(),any());
+        // and that the changes are reflected into the search index
+        verify(indexServiceBean, times(1)).asyncIndexDataset(ds,true);
+        // and that the old identifier is deleted
+        verify(pidProvider, times(1)).deleteIdentifier(ds);
+
+        // clean up PID provider list
+        PidUtil.clearPidProviders();
+    }
+
+    @Test
+    public void testSuccessfulChangeWithoutFilePIDs_existing_altID() throws Exception {
+        // given a user that invokes a command request
+        AuthenticatedUser superUser = new AuthenticatedUser();
+        superUser.setSuperuser(true);
+        DataverseRequest request = MocksFactory.makeRequest(superUser);
+
+        // given a simple PID Provider
+        PidProvider pidProvider = mock(PidProvider.class);
+        when(pidProvider.getProtocol()).thenReturn("PROTO");
+        when(pidProvider.getAuthority()).thenReturn("PROTO");
+        when(pidProvider.getShoulder()).thenReturn("PROTO");
+        when(pidProvider.getSeparator()).thenReturn("PROTO");
+        when(pidProvider.getLabel()).thenReturn("PROTO");
+        when(pidProvider.getId()).thenReturn("PROTO");
+        when(pidProvider.registerWhenPublished()).thenReturn(false);
+        PidUtil.addToProviderList(pidProvider);
+
+        GlobalId pid = new GlobalId(pidProvider.getProtocol(),pidProvider.getAuthority(),"OLD-ID", pidProvider.getSeparator(),pidProvider.getUrlPrefix(), pidProvider.getLabel());
+        when(pidProvider.parsePersistentId(eq("PROTO"),eq("PROTO"),eq("OLD-ID"))).thenReturn(pid);
+
+        // given a dataset linked with the PID provider
+        Dataset ds = MocksFactory.makeDataset();
+        AlternativePersistentIdentifier aip = new AlternativePersistentIdentifier();
+        aip.setStorageLocationDesignator(true);
+        HashSet<AlternativePersistentIdentifier> aip_set = new HashSet<>();
+        aip_set.add(aip);
+        ds.setAlternativePersistentIndentifiers(aip_set);
+
+        ds.setGlobalId(pid);
+        ds.setGlobalIdCreateTime(Timestamp.from(Instant.now()));
+        ds.setIdentifierRegistered(true);
+
+        when(pidProvider.alreadyRegistered(ds)).thenReturn(true);
+        // given a linked dataset with a given dataverse
+        Dataverse dv = MocksFactory.makeDataverse();
+        ds.setOwner(dv);
+
+        // given a new PID Provider
+        PidProvider newPIDProviderMock = mock(PidProvider.class);
+        when(newPIDProviderMock.getProtocol()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getAuthority()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getShoulder()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getSeparator()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getLabel()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getId()).thenReturn("PROTO1");
+        when(newPIDProviderMock.registerWhenPublished()).thenReturn(false);
+        when(newPIDProviderMock.canManagePID()).thenReturn(true);
+        PidUtil.addToProviderList(newPIDProviderMock);
+
+        // create new global ID
+        GlobalId pid2 = new GlobalId(newPIDProviderMock.getProtocol(), newPIDProviderMock.getAuthority(),"MYIDENT", newPIDProviderMock.getSeparator(), newPIDProviderMock.getUrlPrefix(), newPIDProviderMock.getLabel());
+        when(newPIDProviderMock.parsePersistentId(eq("PROTO1"),eq("PROTO1"),eq("MYIDENT"))).thenReturn(pid2);
+        when(newPIDProviderMock.generatePid(ds)).thenAnswer(new Answer<DvObject>() {
+            public DvObject answer(InvocationOnMock invocation) {
+                Dataset callback = (Dataset) invocation.getArguments()[0];
+                callback.setAuthority(pid2.getAuthority());
+                callback.setProtocol(pid2.getProtocol());
+                callback.setIdentifier(pid2.getIdentifier());
+                return callback;
+            }
+        });
+
+        // mocks and stubs for notification
+        RoleAssignment roleAssignment=new RoleAssignment();
+        roleAssignment.setAssigneeIdentifier("MY_ID");
+        when(drsb.directRoleAssignments(ds)).thenReturn(Lists.list(roleAssignment));
+        when(roleAssigneeServiceBean.getRoleAssignee("MY_ID")).thenReturn(superUser);
+        when(roleAssigneeServiceBean.getExplicitUsers(any())).thenReturn(List.of(superUser));
+
+        // disable file PIDs for collection
+        when(systemConfig.isFilePIDsEnabledForCollection(dv)).thenReturn(false);
+
+        // run reconcile PID command
+        ReconcileDatasetPidCommand sut = new ReconcileDatasetPidCommand(request, ds, newPIDProviderMock);
+        engine.submit(sut);
+
+        // then the global identifier should no longer be the previous one
+        assertNotEquals(pid,ds.getGlobalId());
+        // but it should be the newly generated one
+        assertEquals(pid2, ds.getGlobalId());
+        // which should also be registered and should have a create timestamp
+        assertEquals(true, ds.isIdentifierRegistered());
+        assertNotEquals(null, ds.getGlobalIdCreateTime());
+        // further, the old one should be available as alternative id
+        assertEquals(ds.getAlternativePersistentIndentifiers().size(),2);
+        assertEquals(ds.getAlternativePersistentIndentifiers().stream().filter(s->s.isStorageLocationDesignator()).count(),1);
+        assertEquals(ds.getAlternativePersistentIndentifiers().stream().filter(s->s.getIdentifier()=="OLD-ID").count(),1);
+
+        // further, we should be sure that the user is notified about the change
+        verify(notificationService, times(1)).sendNotification(eq(superUser),any(),eq(UserNotification.Type.PIDRECONCILED),any(),any());
+        // and that the changes are reflected into the search index
+        verify(indexServiceBean, times(1)).asyncIndexDataset(ds,true);
+        // and that the old identifier is deleted
+        verify(pidProvider, times(1)).deleteIdentifier(ds);
+
+        // clean up PID provider list
+        PidUtil.clearPidProviders();
+    }
+
+    @Test
+    public void testSuccessfulChangeWithFilePIDs() throws Exception {
+        // given a user that invokes a command request
+        AuthenticatedUser superUser = new AuthenticatedUser();
+        superUser.setSuperuser(true);
+        DataverseRequest request = MocksFactory.makeRequest(superUser);
+        // given a simple PID Provider
+        PidProvider pidProvider = mock(PidProvider.class);
+        when(pidProvider.getProtocol()).thenReturn("PROTO");
+        when(pidProvider.getAuthority()).thenReturn("PROTO");
+        when(pidProvider.getShoulder()).thenReturn("PROTO");
+        when(pidProvider.getSeparator()).thenReturn("PROTO");
+        when(pidProvider.getLabel()).thenReturn("PROTO");
+        when(pidProvider.getId()).thenReturn("PROTO");
+        when(pidProvider.registerWhenPublished()).thenReturn(false);
+        // register the provider
+        PidUtil.addToProviderList(pidProvider);
+
+        GlobalId pid = new GlobalId(pidProvider.getProtocol(),pidProvider.getAuthority(),"OLD-ID", pidProvider.getSeparator(),pidProvider.getUrlPrefix(), pidProvider.getLabel());
+        when(pidProvider.parsePersistentId(eq("PROTO"),eq("PROTO"),eq("OLD-ID"))).thenReturn(pid);
+
+        // given a dataset linked with the PID provider
+        Dataset ds = MocksFactory.makeDataset();
+        ds.setGlobalId(pid);
+        ds.setGlobalIdCreateTime(Timestamp.from(Instant.now()));
+        ds.setIdentifierRegistered(true);
+
+        // add file with PID to dataset
+        ds.setFiles(ds.getFiles().subList(0,1));
+        DataFile df = ds.getFiles().get(0);
+        GlobalId piddf = new GlobalId(pidProvider.getProtocol(),pidProvider.getAuthority(),"OLD-DF-ID", pidProvider.getSeparator(),pidProvider.getUrlPrefix(), pidProvider.getLabel());
+        when(pidProvider.parsePersistentId(eq("PROTO"),eq("PROTO"),eq("OLD-DF-ID"))).thenReturn(piddf);
+        df.setGlobalId(piddf);
+        when(pidProvider.alreadyRegistered(df)).thenReturn(true).thenReturn(false);
+        when(pidProvider.alreadyRegistered(ds)).thenReturn(true);
+
+        // given a linked dataset with a given dataverse
+        Dataverse dv = MocksFactory.makeDataverse();
+        ds.setOwner(dv);
+
+        // given a new PID Provider
+        PidProvider newPIDProviderMock = mock(PidProvider.class);
+        when(newPIDProviderMock.getId()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getLabel()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getProtocol()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getAuthority()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getShoulder()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getSeparator()).thenReturn("PROTO1");
+        when(newPIDProviderMock.registerWhenPublished()).thenReturn(false);
+        when(newPIDProviderMock.canManagePID()).thenReturn(true);
+        PidUtil.addToProviderList(newPIDProviderMock);
+
+        // create new global IDs
+        GlobalId pid2 = new GlobalId(newPIDProviderMock.getProtocol(), newPIDProviderMock.getAuthority(),"MYIDENT", newPIDProviderMock.getSeparator(), newPIDProviderMock.getUrlPrefix(), newPIDProviderMock.getLabel());
+        when(newPIDProviderMock.parsePersistentId(eq("PROTO1"),eq("PROTO1"),eq("MYIDENT"))).thenReturn(pid2);
+        when(newPIDProviderMock.generatePid(ds)).thenAnswer(new Answer<DvObject>() {
+            public DvObject answer(InvocationOnMock invocation) {
+                Dataset callback = (Dataset) invocation.getArguments()[0];
+                callback.setAuthority(pid2.getAuthority());
+                callback.setProtocol(pid2.getProtocol());
+                callback.setIdentifier(pid2.getIdentifier());
+                return callback;
+            }
+        });
+
+        GlobalId piddf2 = new GlobalId(newPIDProviderMock.getProtocol(),newPIDProviderMock.getAuthority(),"NEW-DF-ID", newPIDProviderMock.getSeparator(),newPIDProviderMock.getUrlPrefix(), newPIDProviderMock.getLabel());
+        when(newPIDProviderMock.parsePersistentId(eq("PROTO1"),eq("PROTO1"),eq("NEW-DF-ID"))).thenReturn(piddf2);
+        when(newPIDProviderMock.generatePid(df)).thenAnswer(new Answer<DvObject>() {
+            public DvObject answer(InvocationOnMock invocation) {
+                DataFile callback = (DataFile) invocation.getArguments()[0];
+                callback.setAuthority(piddf2.getAuthority());
+                callback.setProtocol(piddf2.getProtocol());
+                callback.setIdentifier(piddf2.getIdentifier());
+                return callback;
+            }
+        });
+
+        // mocks and stubs for notification
+        RoleAssignment roleAssignment=new RoleAssignment();
+        roleAssignment.setAssigneeIdentifier("MY_ID");
+        when(drsb.directRoleAssignments(ds)).thenReturn(Lists.list(roleAssignment));
+        when(roleAssigneeServiceBean.getRoleAssignee("MY_ID")).thenReturn(superUser);
+        when(roleAssigneeServiceBean.getExplicitUsers(any())).thenReturn(List.of(superUser));
+
+        // enable file PIDs for collection
+        when(systemConfig.isFilePIDsEnabledForCollection(dv)).thenReturn(true);
+
+        // run reconcile PID command
+        ReconcileDatasetPidCommand sut = new ReconcileDatasetPidCommand(request, ds, newPIDProviderMock);
+        engine.submit(sut);
+
+        // then the global identifier should no longer be the previous one
+        assertNotEquals(pid,ds.getGlobalId());
+        // but it should be the newly generated one
+        assertEquals(pid2,ds.getGlobalId());
+        // which should also be registered and should have a create timestamp
+        assertEquals(true,ds.isIdentifierRegistered());
+        assertNotEquals(null,ds.getGlobalIdCreateTime());
+
+        // further, the old one should be available as alternative id
+        assertEquals(ds.getAlternativePersistentIndentifiers().size(),1);
+        assertEquals(ds.getAlternativePersistentIndentifiers().stream().findFirst().get().getIdentifier(),"OLD-ID");
+        // same for the file PID
+        assertNotEquals(piddf, df.getGlobalId());
+        assertEquals(piddf2, df.getGlobalId());
+        assertEquals(true, df.isIdentifierRegistered());
+        assertNotEquals(null, ds.getGlobalIdCreateTime());
+        assertEquals(df.getAlternativePersistentIndentifiers().size(),1);
+        assertEquals(df.getAlternativePersistentIndentifiers().stream().findFirst().get().getIdentifier(),"OLD-DF-ID");
+
+        // further, we should be sure that the user is notified about the change
+        verify(notificationService, times(1)).sendNotification(eq(superUser),any(),eq(UserNotification.Type.PIDRECONCILED),any(),any());
+        // and that the changes are reflected into the search index
+        verify(indexServiceBean, times(1)).asyncIndexDataset(ds,true);
+        // and that the old identifier is deleted
+        verify(pidProvider, times(1)).deleteIdentifier(ds);
+        verify(pidProvider, times(1)).deleteIdentifier(df);
+
+        // clean up PID provider list
+        PidUtil.clearPidProviders();
+    }
+
+    @Test
+    public void testSuccessfulChangeWithFilePIDs_existing_altID_for_file() throws Exception {
+        // given a user that invokes a command request
+        AuthenticatedUser superUser = new AuthenticatedUser();
+        superUser.setSuperuser(true);
+        DataverseRequest request = MocksFactory.makeRequest(superUser);
+
+        // given a simple PID Provider
+        PidProvider pidProvider = mock(PidProvider.class);
+        when(pidProvider.getProtocol()).thenReturn("PROTO");
+        when(pidProvider.getAuthority()).thenReturn("PROTO");
+        when(pidProvider.getShoulder()).thenReturn("PROTO");
+        when(pidProvider.getSeparator()).thenReturn("PROTO");
+        when(pidProvider.getLabel()).thenReturn("PROTO");
+        when(pidProvider.getId()).thenReturn("PROTO");
+        when(pidProvider.registerWhenPublished()).thenReturn(false);
+        PidUtil.addToProviderList(pidProvider);
+
+        GlobalId pid = new GlobalId(pidProvider.getProtocol(),pidProvider.getAuthority(),"OLD-ID", pidProvider.getSeparator(),pidProvider.getUrlPrefix(), pidProvider.getLabel());
+        when(pidProvider.parsePersistentId(eq("PROTO"),eq("PROTO"),eq("OLD-ID"))).thenReturn(pid);
+
+        // given a dataset linked with the PID provider
+        Dataset ds = MocksFactory.makeDataset();
+        ds.setGlobalId(pid);
+        ds.setGlobalIdCreateTime(Timestamp.from(Instant.now()));
+        ds.setIdentifierRegistered(true);
+
+        // add file with a PID and an alternative ID to dataset
+        ds.setFiles(ds.getFiles().subList(0,1));
+        DataFile df = ds.getFiles().get(0);
+        GlobalId piddf = new GlobalId(pidProvider.getProtocol(),pidProvider.getAuthority(),"OLD-DF-ID", pidProvider.getSeparator(),pidProvider.getUrlPrefix(), pidProvider.getLabel());
+        when(pidProvider.parsePersistentId(eq("PROTO"),eq("PROTO"),eq("OLD-DF-ID"))).thenReturn(piddf);
+        df.setGlobalId(piddf);
+
+        AlternativePersistentIdentifier aip = new AlternativePersistentIdentifier();
+        aip.setStorageLocationDesignator(true);
+        HashSet<AlternativePersistentIdentifier> aip_set = new HashSet<>();
+        aip_set.add(aip);
+        df.setAlternativePersistentIndentifiers(aip_set);
+
+        when(pidProvider.alreadyRegistered(df)).thenReturn(true).thenReturn(false);
+        when(pidProvider.alreadyRegistered(ds)).thenReturn(true);
+
+        // given a linked dataset with a given dataverse
+        Dataverse dv = MocksFactory.makeDataverse();
+        ds.setOwner(dv);
+
+        // given a new PID Provider
+        PidProvider newPIDProviderMock = mock(PidProvider.class);
+        when(newPIDProviderMock.getId()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getLabel()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getProtocol()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getAuthority()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getShoulder()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getSeparator()).thenReturn("PROTO1");
+        when(newPIDProviderMock.registerWhenPublished()).thenReturn(false);
+        when(newPIDProviderMock.canManagePID()).thenReturn(true);
+        PidUtil.addToProviderList(newPIDProviderMock);
+
+        // create new global IDs
+        GlobalId pid2 = new GlobalId(newPIDProviderMock.getProtocol(), newPIDProviderMock.getAuthority(),"MYIDENT", newPIDProviderMock.getSeparator(), newPIDProviderMock.getUrlPrefix(), newPIDProviderMock.getLabel());
+        when(newPIDProviderMock.parsePersistentId(eq("PROTO1"),eq("PROTO1"),eq("MYIDENT"))).thenReturn(pid2);
+        when(newPIDProviderMock.generatePid(ds)).thenAnswer(new Answer<DvObject>() {
+            public DvObject answer(InvocationOnMock invocation) {
+                Dataset callback = (Dataset) invocation.getArguments()[0];
+                callback.setAuthority(pid2.getAuthority());
+                callback.setProtocol(pid2.getProtocol());
+                callback.setIdentifier(pid2.getIdentifier());
+                return callback;
+            }
+        });
+
+        GlobalId piddf2 = new GlobalId(newPIDProviderMock.getProtocol(),newPIDProviderMock.getAuthority(),"NEW-DF-ID", newPIDProviderMock.getSeparator(),newPIDProviderMock.getUrlPrefix(), newPIDProviderMock.getLabel());
+        when(newPIDProviderMock.parsePersistentId(eq("PROTO1"),eq("PROTO1"),eq("NEW-DF-ID"))).thenReturn(piddf2);
+        when(newPIDProviderMock.generatePid(df)).thenAnswer(new Answer<DvObject>() {
+            public DvObject answer(InvocationOnMock invocation) {
+                DataFile callback = (DataFile) invocation.getArguments()[0];
+                callback.setAuthority(piddf2.getAuthority());
+                callback.setProtocol(piddf2.getProtocol());
+                callback.setIdentifier(piddf2.getIdentifier());
+                return callback;
+            }
+        });
+
+        // mocks and stubs for notification
+        RoleAssignment roleAssignment=new RoleAssignment();
+        roleAssignment.setAssigneeIdentifier("MY_ID");
+        when(drsb.directRoleAssignments(ds)).thenReturn(Lists.list(roleAssignment));
+        when(roleAssigneeServiceBean.getRoleAssignee("MY_ID")).thenReturn(superUser);
+        when(roleAssigneeServiceBean.getExplicitUsers(any())).thenReturn(List.of(superUser));
+
+        // enable file PIDs for collection
+        when(systemConfig.isFilePIDsEnabledForCollection(dv)).thenReturn(true);
+
+        // run reconcile PID command
+        ReconcileDatasetPidCommand sut = new ReconcileDatasetPidCommand(request, ds, newPIDProviderMock);
+        engine.submit(sut);
+
+        // then the global identifier should no longer be the previous one
+        assertNotEquals(pid, ds.getGlobalId());
+        // but it should be the newly generated one
+        assertEquals(pid2, ds.getGlobalId());
+        // which should also be registered and should have a create timestamp
+        assertEquals(true, ds.isIdentifierRegistered());
+        assertNotEquals(null, ds.getGlobalIdCreateTime());
+
+        // further, the old one should be available as alternative id
+        assertEquals(ds.getAlternativePersistentIndentifiers().size(),1);
+        assertEquals(ds.getAlternativePersistentIndentifiers().stream().findFirst().get().getIdentifier(),"OLD-ID");
+        // same for the file PID
+        assertNotEquals(piddf, df.getGlobalId());
+        assertEquals(piddf2, df.getGlobalId());
+        assertEquals(true, df.isIdentifierRegistered());
+        assertNotEquals(null, ds.getGlobalIdCreateTime());
+        assertEquals(df.getAlternativePersistentIndentifiers().size(),2);
+        assertEquals(ds.getAlternativePersistentIndentifiers().stream().filter(s->s.isStorageLocationDesignator()).count(),1);
+        assertEquals(df.getAlternativePersistentIndentifiers().stream().filter(s->s.getIdentifier()=="OLD-DF-ID").count(),1);
+
+        // further, we should be sure that the user is notified about the change
+        verify(notificationService, times(1)).sendNotification(eq(superUser),any(),eq(UserNotification.Type.PIDRECONCILED),any(),any());
+        // and that the changes are reflected into the search index
+        verify(indexServiceBean, times(1)).asyncIndexDataset(ds,true);
+        // and that the old identifier is deleted
+        verify(pidProvider, times(1)).deleteIdentifier(ds);
+        verify(pidProvider, times(1)).deleteIdentifier(df);
+
+        // clean up PID provider list
+        PidUtil.clearPidProviders();
+    }
+
+    @Test
+    public void testWithFileWithoutGlobalID() throws Exception {
+        // given a user that invokes a command request
+        AuthenticatedUser superUser = new AuthenticatedUser();
+        superUser.setSuperuser(true);
+        DataverseRequest request = MocksFactory.makeRequest(superUser);
+
+        // given a simple PID Provider
+        PidProvider pidProvider = mock(PidProvider.class);
+        when(pidProvider.getProtocol()).thenReturn("PROTO");
+        when(pidProvider.getAuthority()).thenReturn("PROTO");
+        when(pidProvider.getShoulder()).thenReturn("PROTO");
+        when(pidProvider.getSeparator()).thenReturn("PROTO");
+        when(pidProvider.getLabel()).thenReturn("PROTO");
+        when(pidProvider.getId()).thenReturn("PROTO");
+        when(pidProvider.registerWhenPublished()).thenReturn(false);
+        PidUtil.addToProviderList(pidProvider);
+
+        GlobalId pid = new GlobalId(pidProvider.getProtocol(),pidProvider.getAuthority(),"OLD-ID", pidProvider.getSeparator(),pidProvider.getUrlPrefix(), pidProvider.getLabel());
+        when(pidProvider.parsePersistentId(eq("PROTO"),eq("PROTO"),eq("OLD-ID"))).thenReturn(pid);
+
+        // given a dataset linked with the PID provider
+        Dataset ds = MocksFactory.makeDataset();
+        ds.setGlobalId(pid);
+        ds.setGlobalIdCreateTime(Timestamp.from(Instant.now()));
+        ds.setIdentifierRegistered(true);
+
+        // add file without global ID to dataset
+        ds.setFiles(ds.getFiles().subList(0,1));
+        DataFile df = ds.getFiles().get(0);
+        when(pidProvider.alreadyRegistered(df)).thenReturn(true).thenReturn(false);
+        when(pidProvider.alreadyRegistered(ds)).thenReturn(true);
+
+        // given a linked dataset with a given dataverse
+        Dataverse dv = MocksFactory.makeDataverse();
+        ds.setOwner(dv);
+
+        // given a new PID Provider
+        PidProvider newPIDProviderMock = mock(PidProvider.class);
+        when(newPIDProviderMock.getId()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getLabel()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getProtocol()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getAuthority()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getShoulder()).thenReturn("PROTO1");
+        when(newPIDProviderMock.getSeparator()).thenReturn("PROTO1");
+        when(newPIDProviderMock.registerWhenPublished()).thenReturn(false);
+        when(newPIDProviderMock.canManagePID()).thenReturn(true);
+        PidUtil.addToProviderList(newPIDProviderMock);
+
+        // create new global IDs
+        GlobalId pid2 = new GlobalId(newPIDProviderMock.getProtocol(), newPIDProviderMock.getAuthority(),"MYIDENT", newPIDProviderMock.getSeparator(), newPIDProviderMock.getUrlPrefix(), newPIDProviderMock.getLabel());
+        when(newPIDProviderMock.parsePersistentId(eq("PROTO1"),eq("PROTO1"),eq("MYIDENT"))).thenReturn(pid2);
+        when(newPIDProviderMock.generatePid(ds)).thenAnswer(new Answer<DvObject>() {
+            public DvObject answer(InvocationOnMock invocation) {
+                Dataset callback = (Dataset) invocation.getArguments()[0];
+                callback.setAuthority(pid2.getAuthority());
+                callback.setProtocol(pid2.getProtocol());
+                callback.setIdentifier(pid2.getIdentifier());
+                return callback;
+            }
+        });
+
+        GlobalId piddf2 = new GlobalId(newPIDProviderMock.getProtocol(),newPIDProviderMock.getAuthority(),"NEW-DF-ID", newPIDProviderMock.getSeparator(),newPIDProviderMock.getUrlPrefix(), newPIDProviderMock.getLabel());
+        when(newPIDProviderMock.parsePersistentId(eq("PROTO1"),eq("PROTO1"),eq("NEW-DF-ID"))).thenReturn(piddf2);
+        when(newPIDProviderMock.generatePid(df)).thenAnswer(new Answer<DvObject>() {
+            public DvObject answer(InvocationOnMock invocation) {
+                DataFile callback = (DataFile) invocation.getArguments()[0];
+                callback.setAuthority(piddf2.getAuthority());
+                callback.setProtocol(piddf2.getProtocol());
+                callback.setIdentifier(piddf2.getIdentifier());
+                return callback;
+            }
+        });
+
+        // mocks and stubs for notification
+        RoleAssignment roleAssignment=new RoleAssignment();
+        roleAssignment.setAssigneeIdentifier("MY_ID");
+        when(drsb.directRoleAssignments(ds)).thenReturn(Lists.list(roleAssignment));
+        when(roleAssigneeServiceBean.getRoleAssignee("MY_ID")).thenReturn(superUser);
+        when(roleAssigneeServiceBean.getExplicitUsers(any())).thenReturn(List.of(superUser));
+
+        // enable file PIDs for collection
+        when(systemConfig.isFilePIDsEnabledForCollection(dv)).thenReturn(true);
+
+        // run reconcile PID command
+        ReconcileDatasetPidCommand sut = new ReconcileDatasetPidCommand(request, ds, newPIDProviderMock);
+        engine.submit(sut);
+
+        // then the global identifier should no longer be the previous one
+        assertNotEquals(pid, ds.getGlobalId());
+        // but it should be the newly generated one
+        assertEquals(pid2, ds.getGlobalId());
+        // which should also be registered and should have a create timestamp
+        assertTrue(ds.isIdentifierRegistered());
+        assertNotEquals(null, ds.getGlobalIdCreateTime());
+
+        // further, the old one should be available as alternative id
+        assertEquals(ds.getAlternativePersistentIndentifiers().size(),1);
+        assertEquals(ds.getAlternativePersistentIndentifiers().stream().findFirst().get().getIdentifier(),"OLD-ID");
+
+        // file should still not have a PID
+        assertNull(df.getGlobalId());
+        assertNull(df.getAlternativePersistentIndentifiers());
+
+        // further, we should be sure that the user is notified about the change
+        verify(notificationService, times(1)).sendNotification(eq(superUser),any(),eq(UserNotification.Type.PIDRECONCILED),any(),any());
+        // and that the changes are reflected into the search index
+        verify(indexServiceBean, times(1)).asyncIndexDataset(ds,true);
+        // and that the old identifier is deleted
+        verify(pidProvider, times(1)).deleteIdentifier(ds);
+        verify(pidProvider, times(0)).deleteIdentifier(df);
+
+        // clean up PID provider list
+        PidUtil.clearPidProviders();
+    }
+
+    @Test
+    public void testGuardNoOp() throws CommandException {
+        // given a user
+        AuthenticatedUser superUser = new AuthenticatedUser();
+        superUser.setSuperuser(true);
+        DataverseRequest request = MocksFactory.makeRequest(superUser);
+
+        // given a PID Provider
+        PidProvider pidProvider = mock(PidProvider.class);
+        when(pidProvider.getProtocol()).thenReturn("PROTO");
+        when(pidProvider.getAuthority()).thenReturn("PROTO");
+        when(pidProvider.getShoulder()).thenReturn("PROTO");
+        when(pidProvider.getSeparator()).thenReturn("PROTO");
+        when(pidProvider.getLabel()).thenReturn("PROTO");
+        when(pidProvider.getId()).thenReturn("PROTO");
+        when(pidProvider.registerWhenPublished()).thenReturn(true);
+        PidUtil.addToProviderList(pidProvider);
+
+        // given a dataset linked with a PidProvider and corresponding globalId
+        Dataset ds = MocksFactory.makeDataset();
+
+        // given a linked dataset with a given dataverse
+        Dataverse dv = MocksFactory.makeDataverse();
+        ds.setOwner(dv);
+        GlobalId pid = new GlobalId(pidProvider.getProtocol(),pidProvider.getAuthority(),"OLD-ID", pidProvider.getSeparator(),pidProvider.getUrlPrefix(), pidProvider.getLabel());
+        when(pidProvider.parsePersistentId(eq("PROTO"),eq("PROTO"),eq("OLD-ID"))).thenReturn(pid);
+        ds.setGlobalId(pid);
+
+        // run reconcile PID command
+        ReconcileDatasetPidCommand sut = new ReconcileDatasetPidCommand(request, ds, pidProvider);
+
+        // expect an error to be thrown
+        assertThrows(IllegalCommandException.class, () -> engine.submit(sut),"Should throw ICE when no change");
+
+        // clean up PID provider list
+        PidUtil.clearPidProviders();
+    }
+
+    @Test
+    public void testGuardAlreadyPublished() throws CommandException {
+        // given a user
+        AuthenticatedUser superUser = new AuthenticatedUser();
+        superUser.setSuperuser(true);
+        DataverseRequest request = MocksFactory.makeRequest(superUser);
+
+        // given a PID Provider
+        PidProvider pidProvider = mock(PidProvider.class);
+        when(pidProvider.getProtocol()).thenReturn("PROTO");
+        when(pidProvider.getAuthority()).thenReturn("PROTO");
+        when(pidProvider.getShoulder()).thenReturn("PROTO");
+        when(pidProvider.getSeparator()).thenReturn("PROTO");
+        when(pidProvider.getLabel()).thenReturn("PROTO");
+        when(pidProvider.registerWhenPublished()).thenReturn(true);
+        PidUtil.addToProviderList(pidProvider);
+
+        // given a dataset linked with the PID provider
+        Dataset ds = MocksFactory.makeDataset();
+
+        // make dataset published
+        ds.setPublicationDate(Timestamp.from(Instant.now()));
+
+        // given a linked dataset with a given dataverse
+        Dataverse dv = MocksFactory.makeDataverse();
+        ds.setOwner(dv);
+
+        // run reconcile PID command
+        ReconcileDatasetPidCommand sut = new ReconcileDatasetPidCommand(request, ds, pidProvider);
+
+        // expect an error to be thrown
+        assertThrows(IllegalCommandException.class, () -> engine.submit(sut),"Should throw ICE when already published");
+
+        // clean up PID provider list
+        PidUtil.clearPidProviders();
+    }
+
+    @Test
+    public void testGuardHarvested() throws CommandException {
+        // given a user
+        AuthenticatedUser superUser = new AuthenticatedUser();
+        superUser.setSuperuser(true);
+        DataverseRequest request = MocksFactory.makeRequest(superUser);
+
+        // given a PID Provider
+        PidProvider pidProvider = mock(PidProvider.class);
+        when(pidProvider.getProtocol()).thenReturn("PROTO");
+        when(pidProvider.getAuthority()).thenReturn("PROTO");
+        when(pidProvider.getShoulder()).thenReturn("PROTO");
+        when(pidProvider.getSeparator()).thenReturn("PROTO");
+        when(pidProvider.registerWhenPublished()).thenReturn(true);
+        PidUtil.addToProviderList(pidProvider);
+
+        // given a dataset linked with the PID provider
+        Dataset ds = MocksFactory.makeDataset();
+
+        // make dataset harvested
+        ds.setHarvestedFrom(mock(HarvestingClient.class));
+
+        // given a linked dataset with a given dataverse
+        Dataverse dv = MocksFactory.makeDataverse();
+        ds.setOwner(dv);
+
+        // run reconcile PID command
+        ReconcileDatasetPidCommand sut = new ReconcileDatasetPidCommand(request, ds, pidProvider);
+
+        // expect an error to be thrown
+        assertThrows(IllegalCommandException.class, () -> engine.submit(sut),"Should throw ICE when harvested");
+
+        // clean up PID provider list
+        PidUtil.clearPidProviders();
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterOIDCUserCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterOIDCUserCommandTest.java
new file mode 100644
index 00000000000..3f6b3b0f393
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterOIDCUserCommandTest.java
@@ -0,0 +1,371 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.api.dto.UserDTO;
+import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.UserRecordIdentifier;
+import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationException;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.OAuth2UserRecord;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.InvalidFieldsCommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.List;
+
+import static edu.harvard.iq.dataverse.mocks.MocksFactory.makeRequest;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.Mockito.*;
+
+@LocalJvmSettings
+class RegisterOIDCUserCommandTest {
+
+    private static final String TEST_BEARER_TOKEN = "Bearer test";
+    private static final String TEST_USERNAME = "username";
+    private static final AuthenticatedUserDisplayInfo TEST_MISSING_CLAIMS_DISPLAY_INFO = new AuthenticatedUserDisplayInfo(
+            null,
+            null,
+            null,
+            "",
+            ""
+    );
+    private static final AuthenticatedUserDisplayInfo TEST_VALID_DISPLAY_INFO = new AuthenticatedUserDisplayInfo(
+            "FirstName",
+            "LastName",
+            "user@example.com",
+            "",
+            ""
+    );
+
+    private UserDTO testUserDTO;
+
+    @Mock
+    private CommandContext contextStub;
+
+    @Mock
+    private AuthenticationServiceBean authServiceStub;
+
+    @InjectMocks
+    private RegisterOIDCUserCommand sut;
+
+    private OAuth2UserRecord oAuth2UserRecordStub;
+    private UserRecordIdentifier userRecordIdentifierMock;
+    private AuthenticatedUser existingTestUser;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+        setUpDefaultUserDTO();
+
+        userRecordIdentifierMock = mock(UserRecordIdentifier.class);
+        oAuth2UserRecordStub = mock(OAuth2UserRecord.class);
+        existingTestUser = new AuthenticatedUser();
+
+        when(oAuth2UserRecordStub.getUserRecordIdentifier()).thenReturn(userRecordIdentifierMock);
+        when(contextStub.authentication()).thenReturn(authServiceStub);
+
+        sut = new RegisterOIDCUserCommand(makeRequest(), TEST_BEARER_TOKEN, testUserDTO);
+    }
+
+    private void setUpDefaultUserDTO() {
+        testUserDTO = new UserDTO();
+        testUserDTO.setTermsAccepted(true);
+        testUserDTO.setFirstName("FirstName");
+        testUserDTO.setLastName("LastName");
+        testUserDTO.setUsername("username");
+        testUserDTO.setEmailAddress("user@example.com");
+    }
+
+    @Test
+    public void execute_completedUserDTOWithUnacceptedTerms_missingClaimsInProvider_provideMissingClaimsFeatureFlagDisabled() throws AuthorizationException {
+        testUserDTO.setTermsAccepted(false);
+        testUserDTO.setEmailAddress(null);
+        testUserDTO.setUsername(null);
+        testUserDTO.setFirstName(null);
+        testUserDTO.setLastName(null);
+
+        when(authServiceStub.getAuthenticatedUserByEmail(testUserDTO.getEmailAddress())).thenReturn(null);
+        when(authServiceStub.getAuthenticatedUser(testUserDTO.getUsername())).thenReturn(null);
+        when(authServiceStub.verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN)).thenReturn(oAuth2UserRecordStub);
+
+        when(oAuth2UserRecordStub.getUsername()).thenReturn(null);
+        when(oAuth2UserRecordStub.getDisplayInfo()).thenReturn(TEST_MISSING_CLAIMS_DISPLAY_INFO);
+
+        assertThatThrownBy(() -> sut.execute(contextStub))
+                .isInstanceOf(InvalidFieldsCommandException.class)
+                .satisfies(exception -> {
+                    InvalidFieldsCommandException ex = (InvalidFieldsCommandException) exception;
+                    assertThat(ex.getFieldErrors())
+                            .containsEntry("termsAccepted", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.userShouldAcceptTerms"))
+                            .containsEntry("emailAddress", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsDisabled.fieldRequired", List.of("emailAddress")))
+                            .containsEntry("username", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsDisabled.fieldRequired", List.of("username")))
+                            .containsEntry("firstName", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsDisabled.fieldRequired", List.of("firstName")))
+                            .containsEntry("lastName", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsDisabled.fieldRequired", List.of("lastName")));
+                });
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-provide-missing-claims")
+    public void execute_uncompletedUserDTOWithUnacceptedTerms_missingClaimsInProvider_provideMissingClaimsFeatureFlagEnabled() throws AuthorizationException {
+        testUserDTO.setTermsAccepted(false);
+        testUserDTO.setEmailAddress(null);
+        testUserDTO.setUsername(null);
+        testUserDTO.setFirstName(null);
+        testUserDTO.setLastName(null);
+
+        when(oAuth2UserRecordStub.getUsername()).thenReturn(null);
+        when(oAuth2UserRecordStub.getDisplayInfo()).thenReturn(TEST_MISSING_CLAIMS_DISPLAY_INFO);
+
+        when(authServiceStub.getAuthenticatedUserByEmail(testUserDTO.getEmailAddress())).thenReturn(null);
+        when(authServiceStub.getAuthenticatedUser(testUserDTO.getUsername())).thenReturn(null);
+        when(authServiceStub.verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN)).thenReturn(oAuth2UserRecordStub);
+
+        assertThatThrownBy(() -> sut.execute(contextStub))
+                .isInstanceOf(InvalidFieldsCommandException.class)
+                .satisfies(exception -> {
+                    InvalidFieldsCommandException ex = (InvalidFieldsCommandException) exception;
+                    assertThat(ex.getFieldErrors())
+                            .containsEntry("termsAccepted", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.userShouldAcceptTerms"))
+                            .containsEntry("emailAddress", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldRequired", List.of("emailAddress")))
+                            .containsEntry("username", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldRequired", List.of("username")))
+                            .containsEntry("firstName", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldRequired", List.of("firstName")))
+                            .containsEntry("lastName", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldRequired", List.of("lastName")));
+                });
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-provide-missing-claims")
+    public void execute_acceptedTerms_unavailableEmailAndUsername_missingClaimsInProvider_provideMissingClaimsFeatureFlagEnabled() throws AuthorizationException {
+        when(authServiceStub.getAuthenticatedUserByEmail(testUserDTO.getEmailAddress())).thenReturn(existingTestUser);
+        when(authServiceStub.getAuthenticatedUser(testUserDTO.getUsername())).thenReturn(existingTestUser);
+        when(authServiceStub.verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN)).thenReturn(oAuth2UserRecordStub);
+
+        when(oAuth2UserRecordStub.getUsername()).thenReturn(null);
+        when(oAuth2UserRecordStub.getDisplayInfo()).thenReturn(TEST_MISSING_CLAIMS_DISPLAY_INFO);
+
+        assertThatThrownBy(() -> sut.execute(contextStub))
+                .isInstanceOf(InvalidFieldsCommandException.class)
+                .satisfies(exception -> {
+                    InvalidFieldsCommandException ex = (InvalidFieldsCommandException) exception;
+                    assertThat(ex.getFieldErrors())
+                            .containsEntry("emailAddress", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.emailAddressInUse"))
+                            .containsEntry("username", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.usernameInUse"))
+                            .doesNotContainKey("termsAccepted");
+                });
+    }
+
+    @Test
+    void execute_throwsPermissionException_onAuthorizationException() throws AuthorizationException {
+        String testAuthorizationExceptionMessage = "Authorization failed";
+        when(contextStub.authentication().verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN))
+                .thenThrow(new AuthorizationException(testAuthorizationExceptionMessage));
+
+        assertThatThrownBy(() -> sut.execute(contextStub))
+                .isInstanceOf(PermissionException.class)
+                .hasMessageContaining(testAuthorizationExceptionMessage);
+
+        verify(contextStub.authentication(), times(1)).verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN);
+    }
+
+    @Test
+    void execute_throwsIllegalCommandException_ifUserAlreadyRegisteredWithToken() throws AuthorizationException {
+        when(contextStub.authentication().verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN))
+                .thenReturn(oAuth2UserRecordStub);
+        when(contextStub.authentication().lookupUser(userRecordIdentifierMock)).thenReturn(new AuthenticatedUser());
+
+        assertThatThrownBy(() -> sut.execute(contextStub))
+                .isInstanceOf(IllegalCommandException.class)
+                .hasMessageContaining(BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.userAlreadyRegisteredWithToken"));
+
+        verify(contextStub.authentication(), times(1)).lookupUser(userRecordIdentifierMock);
+    }
+
+    @Test
+    void execute_throwsInvalidFieldsCommandException_ifUserDTOHasClaimsAndProvideMissingClaimsFeatureFlagIsDisabled() throws AuthorizationException {
+        when(contextStub.authentication().verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN))
+                .thenReturn(oAuth2UserRecordStub);
+
+        assertThatThrownBy(() -> sut.execute(contextStub))
+                .isInstanceOf(InvalidFieldsCommandException.class)
+                .satisfies(exception -> {
+                    InvalidFieldsCommandException ex = (InvalidFieldsCommandException) exception;
+                    assertThat(ex.getFieldErrors())
+                            .containsEntry("username", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsDisabled.unableToSetFieldViaJSON", List.of("username")))
+                            .containsEntry("emailAddress", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsDisabled.unableToSetFieldViaJSON", List.of("emailAddress")))
+                            .containsEntry("firstName", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsDisabled.unableToSetFieldViaJSON", List.of("firstName")))
+                            .containsEntry("lastName", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsDisabled.unableToSetFieldViaJSON", List.of("lastName")))
+                            .containsEntry("emailAddress", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsDisabled.unableToSetFieldViaJSON", List.of("emailAddress")));
+                });
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-provide-missing-claims")
+    void execute_happyPath_withoutAffiliationAndPosition_missingClaimsInProvider_provideMissingClaimsFeatureFlagEnabled() throws AuthorizationException, CommandException {
+        when(authServiceStub.verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN)).thenReturn(oAuth2UserRecordStub);
+
+        when(oAuth2UserRecordStub.getUsername()).thenReturn(null);
+        when(oAuth2UserRecordStub.getDisplayInfo()).thenReturn(TEST_MISSING_CLAIMS_DISPLAY_INFO);
+
+        sut.execute(contextStub);
+
+        verify(authServiceStub, times(1)).createAuthenticatedUser(
+                eq(userRecordIdentifierMock),
+                eq(testUserDTO.getUsername()),
+                eq(new AuthenticatedUserDisplayInfo(
+                        testUserDTO.getFirstName(),
+                        testUserDTO.getLastName(),
+                        testUserDTO.getEmailAddress(),
+                        "",
+                        "")
+                ),
+                eq(true)
+        );
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-provide-missing-claims")
+    void execute_happyPath_withAffiliationAndPosition_missingClaimsInProvider_provideMissingClaimsFeatureFlagEnabled() throws AuthorizationException, CommandException {
+        testUserDTO.setPosition("test position");
+        testUserDTO.setAffiliation("test affiliation");
+
+        when(authServiceStub.verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN)).thenReturn(oAuth2UserRecordStub);
+
+        when(oAuth2UserRecordStub.getUsername()).thenReturn(null);
+        when(oAuth2UserRecordStub.getDisplayInfo()).thenReturn(TEST_MISSING_CLAIMS_DISPLAY_INFO);
+
+        sut.execute(contextStub);
+
+        verify(authServiceStub, times(1)).createAuthenticatedUser(
+                eq(userRecordIdentifierMock),
+                eq(testUserDTO.getUsername()),
+                eq(new AuthenticatedUserDisplayInfo(
+                        testUserDTO.getFirstName(),
+                        testUserDTO.getLastName(),
+                        testUserDTO.getEmailAddress(),
+                        testUserDTO.getAffiliation(),
+                        testUserDTO.getPosition())
+                ),
+                eq(true)
+        );
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-provide-missing-claims")
+    void execute_conflictingClaimsInProvider_provideMissingClaimsFeatureFlagEnabled() throws AuthorizationException {
+        when(authServiceStub.verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN)).thenReturn(oAuth2UserRecordStub);
+
+        when(oAuth2UserRecordStub.getUsername()).thenReturn(TEST_USERNAME);
+        when(oAuth2UserRecordStub.getDisplayInfo()).thenReturn(TEST_VALID_DISPLAY_INFO);
+
+        testUserDTO.setUsername("conflictingUsername");
+        testUserDTO.setFirstName("conflictingFirstName");
+        testUserDTO.setLastName("conflictingLastName");
+        testUserDTO.setEmailAddress("conflictingemail@example.com");
+
+        assertThatThrownBy(() -> sut.execute(contextStub))
+                .isInstanceOf(InvalidFieldsCommandException.class)
+                .satisfies(exception -> {
+                    InvalidFieldsCommandException ex = (InvalidFieldsCommandException) exception;
+                    assertThat(ex.getFieldErrors())
+                            .containsEntry("username", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldAlreadyPresentInProvider", List.of("username")))
+                            .containsEntry("emailAddress", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldAlreadyPresentInProvider", List.of("emailAddress")))
+                            .containsEntry("firstName", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldAlreadyPresentInProvider", List.of("firstName")))
+                            .containsEntry("lastName", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldAlreadyPresentInProvider", List.of("lastName")))
+                            .containsEntry("emailAddress", BundleUtil.getStringFromBundle("registerOidcUserCommand.errors.provideMissingClaimsEnabled.fieldAlreadyPresentInProvider", List.of("emailAddress")));
+                });
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-provide-missing-claims")
+    void execute_happyPath_withoutAffiliationAndPosition_claimsInProvider_provideMissingClaimsFeatureFlagEnabled() throws AuthorizationException, CommandException {
+        testUserDTO.setTermsAccepted(true);
+        testUserDTO.setEmailAddress(null);
+        testUserDTO.setUsername(null);
+        testUserDTO.setFirstName(null);
+        testUserDTO.setLastName(null);
+
+        when(authServiceStub.verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN)).thenReturn(oAuth2UserRecordStub);
+
+        when(oAuth2UserRecordStub.getUsername()).thenReturn(TEST_USERNAME);
+        when(oAuth2UserRecordStub.getDisplayInfo()).thenReturn(TEST_VALID_DISPLAY_INFO);
+
+        sut.execute(contextStub);
+
+        verify(authServiceStub, times(1)).createAuthenticatedUser(
+                eq(userRecordIdentifierMock),
+                eq(TEST_USERNAME),
+                eq(new AuthenticatedUserDisplayInfo(
+                        TEST_VALID_DISPLAY_INFO.getFirstName(),
+                        TEST_VALID_DISPLAY_INFO.getLastName(),
+                        TEST_VALID_DISPLAY_INFO.getEmailAddress(),
+                        "",
+                        "")
+                ),
+                eq(true)
+        );
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {" ", ""})
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-provide-missing-claims")
+    void execute_happyPath_withoutAffiliationAndPosition_blankClaimInProviderProvidedInJson_provideMissingClaimsFeatureFlagEnabled(String testBlankUsername) throws AuthorizationException, CommandException {
+        String testUsernameNotBlank = "usernameNotBlank";
+        testUserDTO.setUsername(testUsernameNotBlank);
+        testUserDTO.setTermsAccepted(true);
+        testUserDTO.setEmailAddress(null);
+        testUserDTO.setFirstName(null);
+        testUserDTO.setLastName(null);
+
+        when(authServiceStub.verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN)).thenReturn(oAuth2UserRecordStub);
+
+        when(oAuth2UserRecordStub.getUsername()).thenReturn(testBlankUsername);
+        when(oAuth2UserRecordStub.getDisplayInfo()).thenReturn(TEST_VALID_DISPLAY_INFO);
+
+        sut.execute(contextStub);
+
+        verify(authServiceStub, times(1)).createAuthenticatedUser(
+                eq(userRecordIdentifierMock),
+                eq(testUsernameNotBlank),
+                eq(new AuthenticatedUserDisplayInfo(
+                        TEST_VALID_DISPLAY_INFO.getFirstName(),
+                        TEST_VALID_DISPLAY_INFO.getLastName(),
+                        TEST_VALID_DISPLAY_INFO.getEmailAddress(),
+                        "",
+                        "")
+                ),
+                eq(true)
+        );
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-handle-tos-acceptance-in-idp")
+    void execute_doNotThrowUnacceptedTermsError_unacceptedTermsInUserDTOAndAllClaimsInProvider_handleTosAcceptanceInIdpFeatureFlagEnabled() throws AuthorizationException {
+        testUserDTO.setTermsAccepted(false);
+        testUserDTO.setEmailAddress(null);
+        testUserDTO.setUsername(null);
+        testUserDTO.setFirstName(null);
+        testUserDTO.setLastName(null);
+
+        when(authServiceStub.verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN)).thenReturn(oAuth2UserRecordStub);
+
+        when(oAuth2UserRecordStub.getUsername()).thenReturn(TEST_USERNAME);
+        when(oAuth2UserRecordStub.getDisplayInfo()).thenReturn(TEST_VALID_DISPLAY_INFO);
+
+        assertDoesNotThrow(() -> sut.execute(contextStub));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommandTest.java
index 5fdef3ed74c..7609ef17d3e 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommandTest.java
@@ -9,14 +9,14 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.DataCaptureModuleUrl;
-import javax.servlet.http.HttpServletRequest;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import jakarta.servlet.http.HttpServletRequest;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class RequestRsyncScriptCommandTest {
 
@@ -26,15 +26,15 @@ public class RequestRsyncScriptCommandTest {
     public RequestRsyncScriptCommandTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         testEngine = new TestDataverseEngine(new TestCommandContext() {
 
@@ -66,7 +66,7 @@ public SettingsServiceBean settings() {
         });
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommandTest.java
index 1e8b8fb3106..2dc970a9b15 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommandTest.java
@@ -9,6 +9,7 @@
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
 import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
 import edu.harvard.iq.dataverse.engine.TestCommandContext;
 import edu.harvard.iq.dataverse.engine.TestDataverseEngine;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
@@ -18,19 +19,25 @@
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import java.sql.Timestamp;
 import java.util.Date;
-import org.junit.After;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 /**
  *
  * @author sarahferry
  */
+@ExtendWith(MockitoExtension.class)
 public class RestrictFileCommandTest {
     
     TestDataverseEngine engine;
@@ -39,26 +46,32 @@ public class RestrictFileCommandTest {
     boolean restrict = true;
     boolean unrestrict = false;
     static boolean publicInstall = false;
+    @Mock
+    DataverseFeaturedItemServiceBean dataverseFeaturedItems;
     
     
     public RestrictFileCommandTest() {
     }
     
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
     
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
     
-    @Before
+    @BeforeEach
     public void setUp() {
         dataset = makeDataset();
         file = makeDataFile();
 
         engine = new TestDataverseEngine(new TestCommandContext(){
 
+            @Override
+            public DataverseFeaturedItemServiceBean dataverseFeaturedItems() {
+                return dataverseFeaturedItems;
+            }
             @Override
             public SettingsServiceBean settings(){
                 return new SettingsServiceBean(){
@@ -74,7 +87,7 @@ public boolean isTrueForKey(SettingsServiceBean.Key key, boolean defaultValue) {
             
     }
     
-    @After
+    @AfterEach
     public void tearDown() {
     }
         
@@ -108,7 +121,7 @@ public void testRestrictPublishedFile() throws Exception{
         //asserts
         assertTrue(!file.isRestricted());
         boolean fileFound = false;
-        for (FileMetadata fmw : dataset.getEditVersion().getFileMetadatas()) {
+        for (FileMetadata fmw : dataset.getOrCreateEditVersion().getFileMetadatas()) {
             if (file.equals(fmw.getDataFile())) {
                 fileFound=true;
                 //If it worked fmw is for the draft version and file.getFileMetadata() is for the published version
@@ -193,7 +206,7 @@ public void testUnrestrictPublishedFile() throws Exception{
         //asserts
         assertTrue(file.isRestricted());
         boolean fileFound = false;
-        for (FileMetadata fmw : dataset.getEditVersion().getFileMetadatas()) {
+        for (FileMetadata fmw : dataset.getOrCreateEditVersion().getFileMetadatas()) {
             if (file.equals(fmw.getDataFile())) {
                 fileFound = true;
                 assertTrue(!fmw.isRestricted());
@@ -247,7 +260,7 @@ public void testUnrestrictUnrestrictedNewFile() throws Exception {
         
     }
 
-    @Test 
+    @Test
     public void testPublicInstall() throws CommandException {
         file.setOwner(dataset);
         String expected = "Restricting files is not permitted on a public installation.";
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ReturnDatasetToAuthorCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ReturnDatasetToAuthorCommandTest.java
index 8b5556b70c9..68c44764dff 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ReturnDatasetToAuthorCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ReturnDatasetToAuthorCommandTest.java
@@ -21,25 +21,28 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
 import edu.harvard.iq.dataverse.workflows.WorkflowComment;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Future;
-import javax.persistence.EntityManager;
-import javax.servlet.http.HttpServletRequest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import org.junit.Before;
-import org.junit.Test;
 
+import jakarta.persistence.EntityManager;
+import jakarta.servlet.http.HttpServletRequest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+@LocalJvmSettings
 public class ReturnDatasetToAuthorCommandTest {
 
     private Dataset dataset;
     private DataverseRequest dataverseRequest;
     private TestDataverseEngine testEngine;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         dataset = new Dataset();
 
@@ -61,8 +64,7 @@ public AuthenticatedUser getAuthenticatedUser(String id) {
             public IndexServiceBean index() {
                 return new IndexServiceBean() {
                     @Override
-                    public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) {
-                        return null;
+                    public void asyncIndexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) {
                     }
                 };
             }
@@ -142,9 +144,11 @@ public List<AuthenticatedUser> getUsersWithPermissionOn(Permission permission, D
             throw new IllegalCommandException("You must enter a reason for returning a dataset to its author.", this);
         }
      */
-    @Test(expected=IllegalArgumentException.class)
-    public void testDatasetNull() throws CommandException {
-        new ReturnDatasetToAuthorCommand(dataverseRequest, null, "");
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "false", varArgs = "disable-return-to-author-reason")
+    void testDatasetNull() {
+        assertThrows(IllegalArgumentException.class,
+            () -> new ReturnDatasetToAuthorCommand(dataverseRequest, null, ""));
     }
 
     @Test
@@ -155,7 +159,7 @@ public void testReleasedDataset() {
         String actual = null;
         Dataset updatedDataset = null;
         try {
-            updatedDataset = testEngine.submit(new ReturnDatasetToAuthorCommand(dataverseRequest, dataset, ""));
+            updatedDataset = testEngine.submit(new ReturnDatasetToAuthorCommand(dataverseRequest, dataset, "Update Your Files, Dummy"));
         } catch (CommandException ex) {
             actual = ex.getMessage();
         }
@@ -171,36 +175,55 @@ public void testNotInReviewDataset() {
         String actual = null;
         Dataset updatedDataset = null;
         try {
-            updatedDataset = testEngine.submit(new ReturnDatasetToAuthorCommand(dataverseRequest, dataset, ""));
+            updatedDataset = testEngine.submit(new ReturnDatasetToAuthorCommand(dataverseRequest, dataset, "Update Your Files, Dummy"));
         } catch (CommandException ex) {
             actual = ex.getMessage();
         }
         assertEquals(expected, actual);
     }
 
-    /*
-    FIXME - Empty Comments won't be allowed in future
     @Test
-    public void testEmptyComments(){
-               
-        dataset.setIdentifier("DUMMY");
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "false", varArgs = "disable-return-to-author-reason")
+    public void testEmptyOrNullComment(){
         dataset.getLatestVersion().setVersionState(DatasetVersion.VersionState.DRAFT);
-        dataset.getLatestVersion().setInReview(true);
-        dataset.getLatestVersion().setReturnReason(null);
+        Dataset updatedDataset = null;
         String expected = "You must enter a reason for returning a dataset to the author(s).";
         String actual = null;
-        Dataset updatedDataset = null;
         try {
-            
-             updatedDataset = testEngine.submit(new ReturnDatasetToAuthorCommand(dataverseRequest, dataset));
-        } catch (CommandException ex) {
+            testEngine.submit( new AddLockCommand(dataverseRequest, dataset,
+                    new DatasetLock(DatasetLock.Reason.InReview, dataverseRequest.getAuthenticatedUser())));
+
+            assertThrowsExactly(IllegalArgumentException.class,
+                    () -> new ReturnDatasetToAuthorCommand(dataverseRequest, dataset, null), expected);
+            assertThrowsExactly(IllegalArgumentException.class,
+                    () -> new ReturnDatasetToAuthorCommand(dataverseRequest, dataset, ""), expected);
+            updatedDataset = testEngine.submit(new ReturnDatasetToAuthorCommand(dataverseRequest, dataset, ""));
+        } catch (IllegalArgumentException | CommandException ex) {
             actual = ex.getMessage();
         }
-        assertEquals(expected, actual);      
-        
-        
+        assertEquals(expected, actual);
     }
+
+    /** Test the disable reason flag
+     * @throws Exception when the test is in error.
      */
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "disable-return-to-author-reason")
+    public void testEmptyOrNullCommentWhenDisabled() throws Exception {
+        dataset.getLatestVersion().setVersionState(DatasetVersion.VersionState.DRAFT);
+        Dataset updatedDataset = null;
+
+        testEngine.submit(new AddLockCommand(dataverseRequest, dataset,
+                new DatasetLock(DatasetLock.Reason.InReview, dataverseRequest.getAuthenticatedUser())));
+
+        updatedDataset = testEngine.submit(new ReturnDatasetToAuthorCommand(dataverseRequest, dataset, null));
+        assertNotNull(updatedDataset);
+        testEngine.submit(new AddLockCommand(dataverseRequest, dataset,
+                new DatasetLock(DatasetLock.Reason.InReview, dataverseRequest.getAuthenticatedUser())));
+        updatedDataset = testEngine.submit(new ReturnDatasetToAuthorCommand(dataverseRequest, dataset, ""));
+        assertNotNull(updatedDataset);
+    }
+    
     
    @Test
     public void testAllGood() {
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommandTest.java
index 1098b10a041..700ba332247 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommandTest.java
@@ -24,13 +24,13 @@
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Future;
-import javax.persistence.EntityManager;
-import javax.servlet.http.HttpServletRequest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Before;
-import org.junit.Test;
+
+import jakarta.persistence.EntityManager;
+import jakarta.servlet.http.HttpServletRequest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class SubmitDatasetForReviewCommandTest {
 
@@ -38,7 +38,7 @@ public class SubmitDatasetForReviewCommandTest {
     private DataverseRequest dataverseRequest;
     private TestDataverseEngine testEngine;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         dataset = new Dataset();
 
@@ -60,8 +60,7 @@ public AuthenticatedUser getAuthenticatedUser(String id) {
             public IndexServiceBean index() {
                 return new IndexServiceBean() {
                     @Override
-                    public Future<String> indexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) {
-                        return null;
+                    public void asyncIndexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) {
                     }
                 };
             }
@@ -137,9 +136,10 @@ public List<AuthenticatedUser> getUsersWithPermissionOn(Permission permission, D
         );
     }
 
-    @Test( expected=IllegalArgumentException.class )
-    public void testDatasetNull() {
-        new SubmitDatasetForReviewCommand(dataverseRequest, null);
+    @Test
+    void testDatasetNull() {
+        assertThrows(IllegalArgumentException.class,
+            () -> new SubmitDatasetForReviewCommand(dataverseRequest, null));
     }
     
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetFieldsCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetFieldsCommandTest.java
new file mode 100644
index 00000000000..a71dd4c0c64
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetFieldsCommandTest.java
@@ -0,0 +1,416 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.dataset.DatasetFieldsValidator;
+import edu.harvard.iq.dataverse.engine.DataverseEngine;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.InvalidCommandArgumentsException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.*;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+public class UpdateDatasetFieldsCommandTest {
+
+    @Mock
+    private UpdateDatasetVersionCommand updateDatasetVersionCommandStub;
+    @Mock
+    private DataverseEngine dataverseEngineMock;
+    @Mock
+    private Dataset datasetMock;
+    @Mock
+    private DataverseRequest dataverseRequestStub;
+    @Mock
+    private TermsOfUseAndAccess termsOfUseAndAccessStub;
+    @Mock
+    private CommandContext commandContextMock;
+    @Mock
+    private DatasetVersion datasetVersionMock;
+    @Mock
+    private DatasetFieldsValidator datasetFieldsValidatorMock;
+
+    private UpdateDatasetFieldsCommand sut;
+
+    @BeforeEach
+    public void setUp() throws CommandException {
+        MockitoAnnotations.openMocks(this);
+
+        when(dataverseEngineMock.submit(updateDatasetVersionCommandStub)).thenReturn(datasetMock);
+        when(commandContextMock.engine()).thenReturn(dataverseEngineMock);
+        when(commandContextMock.datasetFieldsValidator()).thenReturn(datasetFieldsValidatorMock);
+        when(datasetMock.getOrCreateEditVersion()).thenReturn(datasetVersionMock);
+        when(datasetVersionMock.getTermsOfUseAndAccess()).thenReturn(termsOfUseAndAccessStub);
+    }
+
+    @Test
+    public void execute_invalidFields_shouldThrowException() {
+        List<DatasetField> testUpdatedFields = new ArrayList<>();
+        sut = new UpdateDatasetFieldsCommand(datasetMock, testUpdatedFields, true, dataverseRequestStub);
+
+        when(datasetFieldsValidatorMock.validateFields(testUpdatedFields, datasetVersionMock)).thenReturn("validation error");
+
+        CommandException exception = assertThrows(InvalidCommandArgumentsException.class, () -> sut.execute(commandContextMock));
+
+        assertEquals(BundleUtil.getStringFromBundle("updateDatasetFieldsCommand.api.processDatasetUpdate.parseError", List.of("validation error")),
+                exception.getMessage());
+    }
+
+    @Test
+    public void execute_withSingleDatasetField_replaceDataTrue_updatesField() throws CommandException {
+        DatasetFieldType fieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, false);
+        DatasetVersion datasetVersion = prepareDatasetVersionWithSingleValueField(fieldType, "original");
+        List<DatasetField> updatedFields = createUpdatedSingleValueFieldList(fieldType, "updated");
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, true, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertEquals("updated", result.getLatestVersion().getDatasetField(fieldType).getValue());
+    }
+
+    @Test
+    public void execute_withSingleEmptyDatasetField_replaceDataTrue_updatesFieldToEmpty() throws CommandException {
+        DatasetFieldType fieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, false);
+        DatasetVersion datasetVersion = prepareDatasetVersionWithSingleValueField(fieldType, "original");
+        List<DatasetField> updatedFields = createUpdatedSingleValueFieldList(fieldType, "");
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, true, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertTrue(result.getLatestVersion().getDatasetField(fieldType).isEmpty());
+    }
+
+    @Test
+    public void execute_withSingleDatasetField_replaceDataFalse_doesNotUpdateField() throws CommandException {
+        DatasetFieldType fieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, false);
+        DatasetVersion datasetVersion = prepareDatasetVersionWithSingleValueField(fieldType, "original");
+        List<DatasetField> updatedFields = createUpdatedSingleValueFieldList(fieldType, "updated");
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, false, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertEquals("original", result.getLatestVersion().getDatasetField(fieldType).getValue());
+    }
+
+    @Test
+    public void execute_withMultipleDatasetField_replaceDataFalse_updatesField() throws CommandException {
+        DatasetFieldType fieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, true);
+        DatasetVersion datasetVersion = prepareDatasetVersionWithSingleValueField(fieldType, "original");
+        List<DatasetField> updatedFields = createUpdatedSingleValueFieldList(fieldType, "updated");
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, false, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertEquals("original", result.getLatestVersion().getDatasetField(fieldType).getDatasetFieldValues().get(0).getValue());
+        assertEquals("updated", result.getLatestVersion().getDatasetField(fieldType).getDatasetFieldValues().get(1).getValue());
+        assertEquals(2, result.getLatestVersion().getDatasetField(fieldType).getDatasetFieldValues().size());
+    }
+
+    @Test
+    public void execute_withMultipleDatasetField_replaceDataTrue_updatesField() throws CommandException {
+        DatasetFieldType fieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, true);
+        DatasetVersion datasetVersion = prepareDatasetVersionWithSingleValueField(fieldType, "original");
+        List<DatasetField> updatedFields = createUpdatedSingleValueFieldList(fieldType, "updated");
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, true, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertEquals("updated", result.getLatestVersion().getDatasetField(fieldType).getValue());
+        assertEquals(1, result.getLatestVersion().getDatasetField(fieldType).getDatasetFieldValues().size());
+    }
+
+    @Test
+    public void execute_withMultipleEmptyDatasetField_replaceDataTrue_updatesFieldToEmpty() throws CommandException {
+        DatasetFieldType fieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, true);
+        DatasetVersion datasetVersion = prepareDatasetVersionWithSingleValueField(fieldType, "original");
+        List<DatasetField> updatedFields = createUpdatedSingleValueFieldList(fieldType, "");
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, true, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertTrue(result.getLatestVersion().getDatasetField(fieldType).isEmpty());
+    }
+
+    @Test
+    public void execute_withSingleControlledVocabularyDatasetField_replaceDataTrue_updatesField() throws CommandException {
+        DatasetFieldType fieldType = createControlledVocabularyDatasetFieldType(false);
+        List<ControlledVocabularyValue> controlledVocabularyValueList = setupControlledVocabularyValueList(fieldType);
+        DatasetVersion datasetVersion = prepareDatasetVersionWithSingleControlledVocabularyValueField(fieldType, controlledVocabularyValueList.get(0));
+        List<DatasetField> updatedFields = createUpdatedSingleControlledVocabularyValueFieldList(fieldType, controlledVocabularyValueList.get(1));
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, true, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertEquals("law", result.getLatestVersion().getDatasetField(fieldType).getSingleControlledVocabularyValue().getStrValue());
+    }
+
+    @Test
+    public void execute_withSingleControlledVocabularyDatasetField_replaceDataFalse_doesNotUpdateField() throws CommandException {
+        DatasetFieldType fieldType = createControlledVocabularyDatasetFieldType(false);
+        List<ControlledVocabularyValue> controlledVocabularyValueList = setupControlledVocabularyValueList(fieldType);
+        DatasetVersion datasetVersion = prepareDatasetVersionWithSingleControlledVocabularyValueField(fieldType, controlledVocabularyValueList.get(0));
+        List<DatasetField> updatedFields = createUpdatedSingleControlledVocabularyValueFieldList(fieldType, controlledVocabularyValueList.get(1));
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, false, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertEquals("mgmt", result.getLatestVersion().getDatasetField(fieldType).getSingleControlledVocabularyValue().getStrValue());
+    }
+
+    @Test
+    public void execute_withMultipleControlledVocabularyDatasetField_replaceDataTrue_updatesField() throws CommandException {
+        DatasetFieldType fieldType = createControlledVocabularyDatasetFieldType(true);
+        List<ControlledVocabularyValue> controlledVocabularyValueList = setupControlledVocabularyValueList(fieldType);
+        DatasetVersion datasetVersion = prepareDatasetVersionWithSingleControlledVocabularyValueField(fieldType, controlledVocabularyValueList.get(0));
+        List<DatasetField> updatedFields = createUpdatedSingleControlledVocabularyValueFieldList(fieldType, controlledVocabularyValueList.get(1));
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, true, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertEquals(1, result.getLatestVersion().getDatasetField(fieldType).getControlledVocabularyValues().size());
+        assertEquals("law", result.getLatestVersion().getDatasetField(fieldType).getSingleControlledVocabularyValue().getStrValue());
+    }
+
+    @Test
+    public void execute_withMultipleControlledVocabularyDatasetField_replaceDataFalse_updatesField() throws CommandException {
+        DatasetFieldType fieldType = createControlledVocabularyDatasetFieldType(true);
+        List<ControlledVocabularyValue> controlledVocabularyValueList = setupControlledVocabularyValueList(fieldType);
+        DatasetVersion datasetVersion = prepareDatasetVersionWithSingleControlledVocabularyValueField(fieldType, controlledVocabularyValueList.get(0));
+        List<DatasetField> updatedFields = createUpdatedSingleControlledVocabularyValueFieldList(fieldType, controlledVocabularyValueList.get(1));
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, false, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertEquals(2, result.getLatestVersion().getDatasetField(fieldType).getControlledVocabularyValues().size());
+        assertEquals("mgmt", result.getLatestVersion().getDatasetField(fieldType).getControlledVocabularyValues().get(0).getStrValue());
+        assertEquals("law", result.getLatestVersion().getDatasetField(fieldType).getControlledVocabularyValues().get(1).getStrValue());
+    }
+
+    @Test
+    public void execute_withCompoundField_replaceDataFalse_doesNotUpdateField() throws CommandException {
+        DatasetFieldType fieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, true);
+        Set<DatasetFieldType> childTypes = new HashSet<>();
+        DatasetFieldType childFieldType1 = new DatasetFieldType("authorName", DatasetFieldType.FieldType.TEXT, false);
+        DatasetFieldType childFieldType2 = new DatasetFieldType("authorAffiliation", DatasetFieldType.FieldType.TEXT, false);
+        childTypes.add(childFieldType1);
+        childTypes.add(childFieldType2);
+        fieldType.setChildDatasetFieldTypes(childTypes);
+
+        List<DatasetField> originalFields = createChildCompoundFields(childFieldType1, "originalAuthor", childFieldType2, "originalAffiliation");
+        DatasetVersion datasetVersion = prepareDatasetVersionWithCompoundField(fieldType, originalFields);
+        List<DatasetField> updatedFields = createUpdatedCompoundFieldList(fieldType, childFieldType1, childFieldType2, "updatedAuthor", "updatedAffiliation");
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, false, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertEquals("originalAuthor; originalAffiliation; updatedAuthor; updatedAffiliation", result.getLatestVersion().getDatasetField(fieldType).getCompoundRawValue());
+    }
+
+    @Test
+    public void execute_withCompoundField_replaceDataTrue_updatesField() throws CommandException {
+        DatasetFieldType fieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, true);
+        Set<DatasetFieldType> childTypes = new HashSet<>();
+        DatasetFieldType childFieldType1 = new DatasetFieldType("authorName", DatasetFieldType.FieldType.TEXT, false);
+        DatasetFieldType childFieldType2 = new DatasetFieldType("authorAffiliation", DatasetFieldType.FieldType.TEXT, false);
+        childTypes.add(childFieldType1);
+        childTypes.add(childFieldType2);
+        fieldType.setChildDatasetFieldTypes(childTypes);
+
+        List<DatasetField> originalFields = createChildCompoundFields(childFieldType1, "originalAuthor", childFieldType2, "originalAffiliation");
+        DatasetVersion datasetVersion = prepareDatasetVersionWithCompoundField(fieldType, originalFields);
+        List<DatasetField> updatedFields = createUpdatedCompoundFieldList(fieldType, childFieldType1, childFieldType2, "updatedAuthor", "updatedAffiliation");
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, true, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertEquals("updatedAuthor; updatedAffiliation", result.getLatestVersion().getDatasetField(fieldType).getCompoundRawValue());
+    }
+
+    @Test
+    public void execute_withEmptyCompoundField_replaceDataTrue_updatesFieldToEmpty() throws CommandException {
+        DatasetFieldType fieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, true);
+        Set<DatasetFieldType> childTypes = new HashSet<>();
+        DatasetFieldType childFieldType1 = new DatasetFieldType("authorName", DatasetFieldType.FieldType.TEXT, false);
+        DatasetFieldType childFieldType2 = new DatasetFieldType("authorAffiliation", DatasetFieldType.FieldType.TEXT, false);
+        childTypes.add(childFieldType1);
+        childTypes.add(childFieldType2);
+        fieldType.setChildDatasetFieldTypes(childTypes);
+
+        List<DatasetField> originalFields = createChildCompoundFields(childFieldType1, "originalAuthor", childFieldType2, "originalAffiliation");
+        DatasetVersion datasetVersion = prepareDatasetVersionWithCompoundField(fieldType, originalFields);
+        List<DatasetField> updatedFields = createUpdatedCompoundFieldList(fieldType, childFieldType1, childFieldType2, "", "");
+
+        sut = new UpdateDatasetFieldsCommand(datasetMock, updatedFields, true, dataverseRequestStub, updateDatasetVersionCommandStub);
+        when(datasetFieldsValidatorMock.validateFields(updatedFields, datasetVersion)).thenReturn("");
+
+        Dataset result = sut.execute(commandContextMock);
+        verify(commandContextMock).engine();
+
+        assertTrue(result.getLatestVersion().getDatasetField(fieldType).isEmpty());
+    }
+
+    private List<DatasetField> createChildCompoundFields(DatasetFieldType childFieldType1, String originalAuthor, DatasetFieldType childFieldType2, String originalAffiliation) {
+        DatasetField childOriginalField1 = new DatasetField();
+        childOriginalField1.setDatasetFieldType(childFieldType1);
+        childOriginalField1.setSingleValue(originalAuthor);
+
+        DatasetField childOriginalField2 = new DatasetField();
+        childOriginalField2.setDatasetFieldType(childFieldType2);
+        childOriginalField2.setSingleValue(originalAffiliation);
+
+        List<DatasetField> originalFields = new ArrayList<>();
+        originalFields.add(childOriginalField1);
+        originalFields.add(childOriginalField2);
+        return originalFields;
+    }
+
+    private DatasetVersion prepareDatasetVersionWithCompoundField(DatasetFieldType fieldType, List<DatasetField> datasetFields) {
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+
+        List<DatasetField> fields = new ArrayList<>();
+        DatasetField field = new DatasetField();
+        field.setDatasetFieldType(fieldType);
+        List<DatasetFieldCompoundValue> compoundValues = new ArrayList<>();
+        DatasetFieldCompoundValue compoundValue = new DatasetFieldCompoundValue();
+        compoundValue.setChildDatasetFields(datasetFields);
+        compoundValues.add(compoundValue);
+        field.setDatasetFieldCompoundValues(compoundValues);
+        fields.add(field);
+        datasetVersion.setDatasetFields(fields);
+
+        when(datasetMock.getOrCreateEditVersion()).thenReturn(datasetVersion);
+        when(datasetMock.getLatestVersion()).thenReturn(datasetVersion);
+
+        return datasetVersion;
+    }
+
+    private List<DatasetField> createUpdatedCompoundFieldList(DatasetFieldType fieldType, DatasetFieldType childFieldType1, DatasetFieldType childFieldType2, String updatedValue1, String updatedValue2) {
+        DatasetField field = new DatasetField();
+        field.setDatasetFieldType(fieldType);
+        List<DatasetFieldCompoundValue> compoundValues = new ArrayList<>();
+
+        List<DatasetField> childFields = createChildCompoundFields(childFieldType1, updatedValue1, childFieldType2, updatedValue2);
+
+        DatasetFieldCompoundValue compoundValue = new DatasetFieldCompoundValue();
+        compoundValue.setChildDatasetFields(childFields);
+        compoundValues.add(compoundValue);
+        field.setDatasetFieldCompoundValues(compoundValues);
+
+        List<DatasetField> updatedFields = new ArrayList<>();
+        updatedFields.add(field);
+        return updatedFields;
+    }
+
+    private DatasetVersion prepareDatasetVersionWithSingleValueField(DatasetFieldType fieldType, String originalValue) {
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+
+        List<DatasetField> fields = new ArrayList<>();
+        DatasetField field = new DatasetField();
+        field.setDatasetFieldType(fieldType);
+        field.setSingleValue(originalValue);
+        fields.add(field);
+        datasetVersion.setDatasetFields(fields);
+
+        when(datasetMock.getOrCreateEditVersion()).thenReturn(datasetVersion);
+        when(datasetMock.getLatestVersion()).thenReturn(datasetVersion);
+
+        return datasetVersion;
+    }
+
+    private List<DatasetField> createUpdatedSingleValueFieldList(DatasetFieldType fieldType, String updatedValue) {
+        List<DatasetField> updatedFields = new ArrayList<>();
+        DatasetField updatedField = new DatasetField();
+        updatedField.setDatasetFieldType(fieldType);
+        updatedField.setSingleValue(updatedValue);
+        updatedFields.add(updatedField);
+        return updatedFields;
+    }
+
+    private DatasetVersion prepareDatasetVersionWithSingleControlledVocabularyValueField(DatasetFieldType fieldType, ControlledVocabularyValue controlledVocabularyValue) {
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+
+        List<DatasetField> fields = new ArrayList<>();
+        DatasetField field = new DatasetField();
+        field.setDatasetFieldType(fieldType);
+        field.setSingleControlledVocabularyValue(controlledVocabularyValue);
+        fields.add(field);
+        datasetVersion.setDatasetFields(fields);
+
+        when(datasetMock.getOrCreateEditVersion()).thenReturn(datasetVersion);
+        when(datasetMock.getLatestVersion()).thenReturn(datasetVersion);
+
+        return datasetVersion;
+    }
+
+    private List<DatasetField> createUpdatedSingleControlledVocabularyValueFieldList(DatasetFieldType fieldType, ControlledVocabularyValue controlledVocabularyValue) {
+        List<DatasetField> updatedFields = new ArrayList<>();
+        DatasetField updatedField = new DatasetField();
+        updatedField.setDatasetFieldType(fieldType);
+        updatedField.setSingleControlledVocabularyValue(controlledVocabularyValue);
+        updatedFields.add(updatedField);
+        return updatedFields;
+    }
+
+    private List<ControlledVocabularyValue> setupControlledVocabularyValueList(DatasetFieldType fieldType) {
+        ControlledVocabularyValue controlledVocabularyValue1 = new ControlledVocabularyValue(1L, "mgmt", fieldType);
+        ControlledVocabularyValue controlledVocabularyValue2 = new ControlledVocabularyValue(2L, "law", fieldType);
+        List<ControlledVocabularyValue> controlledVocabularyValueList = Arrays.asList(
+                controlledVocabularyValue1,
+                controlledVocabularyValue2
+        );
+        fieldType.setControlledVocabularyValues(controlledVocabularyValueList);
+        return controlledVocabularyValueList;
+    }
+
+    private DatasetFieldType createControlledVocabularyDatasetFieldType(boolean allowMultiples) {
+        DatasetFieldType fieldType = new DatasetFieldType("test", DatasetFieldType.FieldType.TEXT, allowMultiples);
+        fieldType.setAllowControlledVocabulary(true);
+        fieldType.setMetadataBlock(new MetadataBlock());
+        return fieldType;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommandTest.java
index f55e9a2d085..ead652ad774 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommandTest.java
@@ -8,13 +8,17 @@
 import edu.harvard.iq.dataverse.engine.TestCommandContext;
 import edu.harvard.iq.dataverse.engine.TestDataverseEngine;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class UpdateDatasetThumbnailCommandTest {
 
@@ -26,15 +30,15 @@ public class UpdateDatasetThumbnailCommandTest {
     public UpdateDatasetThumbnailCommandTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         dataset = new Dataset();
         testEngine = new TestDataverseEngine(new TestCommandContext() {
@@ -86,7 +90,7 @@ public String getDataverseSiteUrl() {
         );
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
     }
 
@@ -135,7 +139,7 @@ public void testSetDatasetFileAsThumbnailFileNull() {
 
     @Test
     public void testSetDatasetFileAsThumbnailFileNotFound() {
-        String expected = "Could not find file based on id supplied: 1.";
+        String expected = BundleUtil.getStringFromBundle("datasets.api.thumbnail.fileNotFound", List.of("1"));
         String actual = null;
         DatasetThumbnail datasetThumbnail = null;
         try {
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetRootCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetRootCommandTest.java
new file mode 100644
index 00000000000..4f6a1a1f678
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetRootCommandTest.java
@@ -0,0 +1,111 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseMetadataBlockFacet;
+import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class UpdateMetadataBlockFacetRootCommandTest {
+
+    private DataverseRequest dataverseRequest;
+    private Dataverse dataverse;
+
+    @BeforeEach
+    public void beforeEachTest() {
+        dataverseRequest = Mockito.mock(DataverseRequest.class);
+        dataverse = Mockito.mock(Dataverse.class);
+    }
+
+    @Test
+    public void should_not_update_dataverse_when_root_value_does_not_change() throws CommandException {
+        boolean metadataBlockFacetRoot = true;
+        Mockito.when(dataverse.isMetadataBlockFacetRoot()).thenReturn(metadataBlockFacetRoot);
+        UpdateMetadataBlockFacetRootCommand target = new UpdateMetadataBlockFacetRootCommand(dataverseRequest, dataverse, metadataBlockFacetRoot);
+
+        CommandContext context = Mockito.mock(CommandContext.class, Mockito.RETURNS_DEEP_STUBS);
+        target.execute(context);
+
+        Mockito.verify(dataverse).isMetadataBlockFacetRoot();
+        Mockito.verifyNoMoreInteractions(dataverse);
+        Mockito.verifyNoInteractions(context.dataverses());
+    }
+
+    @Test
+    public void should_set_metadataBlockFacetRoot_and_update_metadata_block_facets_to_empty_list_when_root_value_changes_to_false() throws CommandException {
+        Mockito.when(dataverse.isMetadataBlockFacetRoot()).thenReturn(true);
+        UpdateMetadataBlockFacetRootCommand target = new UpdateMetadataBlockFacetRootCommand(dataverseRequest, dataverse, false);
+
+        CommandContext context = Mockito.mock(CommandContext.class, Mockito.RETURNS_DEEP_STUBS);
+        target.execute(context);
+
+        Mockito.verify(dataverse).isMetadataBlockFacetRoot();
+        Mockito.verify(dataverse).setMetadataBlockFacetRoot(false);
+        Mockito.verify(dataverse).setMetadataBlockFacets(Collections.emptyList());
+        Mockito.verifyNoMoreInteractions(dataverse);
+        Mockito.verify(context.dataverses()).save(dataverse);
+    }
+
+    @Test
+    public void should_set_metadataBlockFacetRoot_and_update_metadata_block_facets_to_parent_list_when_root_value_changes_to_true() throws CommandException {
+        Dataverse parentDataverse = Mockito.mock(Dataverse.class);
+        DataverseMetadataBlockFacet blockFacet1 = new DataverseMetadataBlockFacet();
+        MetadataBlock block1 = Mockito.mock(MetadataBlock.class);
+        blockFacet1.setDataverse(parentDataverse);
+        blockFacet1.setMetadataBlock(block1);
+        DataverseMetadataBlockFacet blockFacet2 = new DataverseMetadataBlockFacet();
+        MetadataBlock block2 = Mockito.mock(MetadataBlock.class);
+        blockFacet2.setDataverse(parentDataverse);
+        blockFacet2.setMetadataBlock(block2);
+        Mockito.when(dataverse.isMetadataBlockFacetRoot()).thenReturn(false);
+        Mockito.when(dataverse.getMetadataBlockFacets()).thenReturn(Arrays.asList(blockFacet1, blockFacet2));
+        UpdateMetadataBlockFacetRootCommand target = new UpdateMetadataBlockFacetRootCommand(dataverseRequest, dataverse, true);
+
+        CommandContext context = Mockito.mock(CommandContext.class, Mockito.RETURNS_DEEP_STUBS);
+        target.execute(context);
+
+        Mockito.verify(dataverse).isMetadataBlockFacetRoot();
+        Mockito.verify(dataverse).getMetadataBlockFacets();
+        Mockito.verify(dataverse).setMetadataBlockFacetRoot(true);
+
+        ArgumentCaptor<List<DataverseMetadataBlockFacet>> createdBlockFacets = ArgumentCaptor.forClass(List.class);
+        Mockito.verify(dataverse).setMetadataBlockFacets(createdBlockFacets.capture());
+        MatcherAssert.assertThat(createdBlockFacets.getValue().size(), Matchers.is(2));
+        MatcherAssert.assertThat(createdBlockFacets.getValue().get(0).getDataverse(), Matchers.is(dataverse));
+        MatcherAssert.assertThat(createdBlockFacets.getValue().get(0).getMetadataBlock(), Matchers.is(block1));
+        MatcherAssert.assertThat(createdBlockFacets.getValue().get(1).getDataverse(), Matchers.is(dataverse));
+        MatcherAssert.assertThat(createdBlockFacets.getValue().get(1).getMetadataBlock(), Matchers.is(block2));
+        Mockito.verifyNoMoreInteractions(dataverse);
+        Mockito.verify(context.dataverses()).save(dataverse);
+    }
+
+    @Test
+    public void getEditedDataverse_should_return_set_dataverse() {
+        UpdateMetadataBlockFacetRootCommand target = new UpdateMetadataBlockFacetRootCommand(dataverseRequest, dataverse, true);
+
+        MatcherAssert.assertThat(target.getEditedDataverse(), Matchers.is(dataverse));
+    }
+
+    @Test
+    public void getMetadataBlockFacetRoot_should_return_set_metadata_block_facet_root() {
+        UpdateMetadataBlockFacetRootCommand target = new UpdateMetadataBlockFacetRootCommand(dataverseRequest, dataverse, true);
+
+        MatcherAssert.assertThat(target.getMetadataBlockFacetRoot(), Matchers.is(true));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetsCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetsCommandTest.java
new file mode 100644
index 00000000000..51892f20df3
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateMetadataBlockFacetsCommandTest.java
@@ -0,0 +1,79 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseMetadataBlockFacet;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class UpdateMetadataBlockFacetsCommandTest {
+
+    private DataverseRequest dataverseRequest;
+    private Dataverse dataverse;
+
+    @BeforeEach
+    public void beforeEachTest() {
+        dataverseRequest = Mockito.mock(DataverseRequest.class);
+        dataverse = Mockito.mock(Dataverse.class);
+    }
+
+    @Test
+    void should_throw_IllegalCommandException_when_dataverse_is_not_metadata_facet_root() {
+        Mockito.when(dataverse.isMetadataBlockFacetRoot()).thenReturn(false);
+
+        UpdateMetadataBlockFacetsCommand target = new UpdateMetadataBlockFacetsCommand(dataverseRequest, dataverse, Collections.emptyList());
+
+        CommandContext context = Mockito.mock(CommandContext.class, Mockito.RETURNS_DEEP_STUBS);
+        Assertions.assertThrows(IllegalCommandException.class, () -> target.execute(context));
+    }
+
+    @Test
+    public void should_update_facets() throws CommandException {
+        Mockito.when(dataverse.isMetadataBlockFacetRoot()).thenReturn(true);
+        DataverseMetadataBlockFacet metadataBlockFacet = new DataverseMetadataBlockFacet();
+        metadataBlockFacet.setId(MocksFactory.nextId());
+        List<DataverseMetadataBlockFacet> metadataBlockFacets = Arrays.asList(metadataBlockFacet);
+
+        UpdateMetadataBlockFacetsCommand target = new UpdateMetadataBlockFacetsCommand(dataverseRequest, dataverse, metadataBlockFacets);
+
+        CommandContext context = Mockito.mock(CommandContext.class, Mockito.RETURNS_DEEP_STUBS);
+        target.execute(context);
+
+        Mockito.verify(dataverse).setMetadataBlockFacets(metadataBlockFacets);
+        Mockito.verify(context.dataverses()).save(dataverse);
+    }
+
+    @Test
+    public void getEditedDataverse_should_return_set_dataverse() {
+        UpdateMetadataBlockFacetsCommand target = new UpdateMetadataBlockFacetsCommand(dataverseRequest, dataverse, Collections.emptyList());
+
+        MatcherAssert.assertThat(target.getEditedDataverse(), Matchers.is(dataverse));
+    }
+
+    @Test
+    public void getMetadataBlockFacets_should_return_set_metadata_block_facets() {
+        DataverseMetadataBlockFacet metadataBlockFacet = new DataverseMetadataBlockFacet();
+        metadataBlockFacet.setId(MocksFactory.nextId());
+        List<DataverseMetadataBlockFacet> metadataBlockFacets = Arrays.asList(metadataBlockFacet);
+        UpdateMetadataBlockFacetsCommand target = new UpdateMetadataBlockFacetsCommand(dataverseRequest, dataverse, metadataBlockFacets);
+
+        MatcherAssert.assertThat(target.getMetadataBlockFacets(), Matchers.is(metadataBlockFacets));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePermissionRootCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePermissionRootCommandTest.java
index c60bac05ee8..1a46a8803a6 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePermissionRootCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/UpdatePermissionRootCommandTest.java
@@ -7,10 +7,11 @@
 import edu.harvard.iq.dataverse.engine.TestCommandContext;
 import edu.harvard.iq.dataverse.engine.TestDataverseEngine;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
@@ -22,7 +23,7 @@ public class UpdatePermissionRootCommandTest {
     TestCommandContext testCommandContext;
     boolean serviceBeanCalled;
     
-    @Before
+    @BeforeEach
     public void setUp() {
         mockBean = new DataverseServiceBean() {
             @Override
@@ -30,6 +31,11 @@ public Dataverse save( Dataverse dv ) {
                 serviceBeanCalled = true;
                 return dv;
             }
+            @Override
+            public boolean index(Dataverse dataverse, boolean indexPermisions) {
+                    // no-op. The superclass accesses databases which we don't have.
+                    return true;
+            }            
         };
         testCommandContext = new TestCommandContext() {
             @Override
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/CleanupTest.java b/src/test/java/edu/harvard/iq/dataverse/export/CleanupTest.java
deleted file mode 100644
index 88dd3d12ffb..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/export/CleanupTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package edu.harvard.iq.dataverse.export;
-
-import edu.harvard.iq.dataverse.export.openaire.Cleanup;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author francesco.cadili@4science.it
- */
-public class CleanupTest {
-    
-    /**
-     * full name or organization name cleanup.
-     *
-     * Name is composed of:
-     * <First Names> <Family Name>
-     */
-    @Test
-    public void testNormalize() {
-        assertEquals(Cleanup.normalize("    Francesco    "), "Francesco");
-        assertEquals(Cleanup.normalize("Francesco  Cadili "), "Francesco Cadili");
-        assertEquals(Cleanup.normalize("  Cadili,Francesco"), "Cadili, Francesco");
-        assertEquals(Cleanup.normalize("Cadili,     Francesco  "), "Cadili, Francesco");
-        assertEquals(Cleanup.normalize(null), "");
-        
-        // TODO: organization examples...
-    }
-}
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/DDIExporterTest.java b/src/test/java/edu/harvard/iq/dataverse/export/DDIExporterTest.java
index e70e375ace9..0eb231dd866 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/DDIExporterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/export/DDIExporterTest.java
@@ -1,43 +1,143 @@
 package edu.harvard.iq.dataverse.export;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
 import edu.harvard.iq.dataverse.ControlledVocabularyValue;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
 import edu.harvard.iq.dataverse.DatasetFieldType;
 import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
+import edu.harvard.iq.dataverse.branding.BrandingUtilTest;
+import edu.harvard.iq.dataverse.export.ddi.DdiExportUtil;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.ExportException;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.mocks.MockDatasetFieldSvc;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.util.json.JsonParser;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import edu.harvard.iq.dataverse.util.xml.XmlPrinter;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.io.StringReader;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.time.Year;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import java.util.logging.Logger;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.xmlunit.assertj3.XmlAssert;
+import org.xmlunit.builder.Input;
 
 public class DDIExporterTest {
 
-    MockDatasetFieldSvc datasetFieldTypeSvc = null;
+    private static final Logger logger = Logger.getLogger(DDIExporterTest.class.getCanonicalName());
+    private static final SettingsServiceBean settingsService = Mockito.mock(SettingsServiceBean.class);
+    private static final LicenseServiceBean licenseService = Mockito.mock(LicenseServiceBean.class);
+    private static final MockDatasetFieldSvc datasetFieldTypeSvc = new MockDatasetFieldSvc();
+    private static final Gson gson = new GsonBuilder().registerTypeAdapter(LocalDate.class, (JsonDeserializer<LocalDateTime>) (JsonElement json, Type type, JsonDeserializationContext jsonDeserializationContext) -> {
+        Instant instant = Instant.ofEpochMilli(json.getAsJsonPrimitive().getAsLong());
+        return LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+    }).create();
+    
+    /*
+     * Setup and teardown mocks for BrandingUtil for atomicity.
+     * Setup the mocked DatasetFieldSvc
+     * Setup and teardown the mocked SettingsServiceBean
+     */
+    @BeforeAll
+    private static void setUpAll() {
+        BrandingUtilTest.setupMocks();
+        mockDatasetFieldSvc();
+        DdiExportUtil.injectSettingsService(settingsService);
+    }
+    @AfterAll
+    private static void tearDownAll() {
+        BrandingUtilTest.tearDownMocks();
+        DdiExportUtil.injectSettingsService(null);
+    }
+
+    @Test
+    public void testExportDataset() throws JsonParseException, IOException, ExportException {
+        //given
+        String datasetDtoJsonString = Files.readString(Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json"), StandardCharsets.UTF_8);
+        
+        JsonObject datasetDtoJson = Json.createReader(new StringReader(datasetDtoJsonString)).readObject();
+        
+        ExportDataProvider exportDataProviderStub = Mockito.mock(ExportDataProvider.class);
+        Mockito.when(exportDataProviderStub.getDatasetJson()).thenReturn(datasetDtoJson);
+        Mockito.when(exportDataProviderStub.getDatasetFileDetails()).thenReturn(Json.createArrayBuilder().build());
+        
+        
+        //when
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        new DDIExporter().exportDataset(exportDataProviderStub, byteArrayOutputStream);
+
+        // then
+        String xml = XmlPrinter.prettyPrintXml(byteArrayOutputStream.toString(StandardCharsets.UTF_8));
+        logger.fine(xml);
+        XmlAssert.assertThat(xml).isValidAgainst(Input.fromPath(Path.of("src/test/resources/xml/xsd/ddi-codebook-2.5/ddi_codebook_2_5.xsd")).build());
+        logger.severe("DDIExporterTest.testExportDataset() creates XML that should now be valid, since DDIExportUtil has been fixed.");
+    }
+
+    @Test
+    public void testExportDatasetContactEmailPresent() throws Exception {
+        File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/datasetContactEmailPresent.json");
+        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
+
+        JsonObject json = JsonUtil.getJsonObject(datasetVersionAsJson);
+        
+        ExportDataProvider exportDataProviderStub = Mockito.mock(ExportDataProvider.class);
+        Mockito.when(exportDataProviderStub.getDatasetJson()).thenReturn(json);
+        Mockito.when(exportDataProviderStub.getDatasetFileDetails()).thenReturn(Json.createArrayBuilder().build());
+        
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        DDIExporter instance = new DDIExporter();
+        instance.exportDataset(exportDataProviderStub, byteArrayOutputStream);
+
+        logger.fine(XmlPrinter.prettyPrintXml(byteArrayOutputStream.toString()));
+        assertTrue(byteArrayOutputStream.toString().contains("finch@mailinator.com"));
+
+    }
+
+    @Test
+    public void testExportDatasetContactEmailAbsent() throws Exception {
+        File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/datasetContactEmailAbsent.json");
+        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
+
+        JsonObject json = JsonUtil.getJsonObject(datasetVersionAsJson);
+        
+        ExportDataProvider exportDataProviderStub = Mockito.mock(ExportDataProvider.class);
+        Mockito.when(exportDataProviderStub.getDatasetJson()).thenReturn(json);
+        Mockito.when(exportDataProviderStub.getDatasetFileDetails()).thenReturn(Json.createArrayBuilder().build());
+        
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        DDIExporter instance = new DDIExporter();
+        instance.exportDataset(exportDataProviderStub, byteArrayOutputStream);
 
-    @Before
-    public void setUp() {
-        datasetFieldTypeSvc = new MockDatasetFieldSvc();
+        logger.fine(XmlPrinter.prettyPrintXml(byteArrayOutputStream.toString()));
+        assertFalse(byteArrayOutputStream.toString().contains("finch@mailinator.com"));
 
+    }
+    
+    private static void mockDatasetFieldSvc() {
         DatasetFieldType titleType = datasetFieldTypeSvc.add(new DatasetFieldType("title", FieldType.TEXTBOX, false));
         DatasetFieldType authorType = datasetFieldTypeSvc.add(new DatasetFieldType("author", FieldType.TEXT, true));
         Set<DatasetFieldType> authorChildTypes = new HashSet<>();
@@ -47,17 +147,17 @@ public void setUp() {
         DatasetFieldType authorIdentifierSchemeType = datasetFieldTypeSvc.add(new DatasetFieldType("authorIdentifierScheme", FieldType.TEXT, false));
         authorIdentifierSchemeType.setAllowControlledVocabulary(true);
         authorIdentifierSchemeType.setControlledVocabularyValues(Arrays.asList(
-                // Why aren't these enforced? Should be ORCID, etc.
-                new ControlledVocabularyValue(1l, "ark", authorIdentifierSchemeType),
-                new ControlledVocabularyValue(2l, "doi", authorIdentifierSchemeType),
-                new ControlledVocabularyValue(3l, "url", authorIdentifierSchemeType)
+            // Why aren't these enforced? Should be ORCID, etc.
+            new ControlledVocabularyValue(1l, "ark", authorIdentifierSchemeType),
+            new ControlledVocabularyValue(2l, "doi", authorIdentifierSchemeType),
+            new ControlledVocabularyValue(3l, "url", authorIdentifierSchemeType)
         ));
         authorChildTypes.add(datasetFieldTypeSvc.add(authorIdentifierSchemeType));
         for (DatasetFieldType t : authorChildTypes) {
             t.setParentDatasetFieldType(authorType);
         }
         authorType.setChildDatasetFieldTypes(authorChildTypes);
-
+    
         DatasetFieldType datasetContactType = datasetFieldTypeSvc.add(new DatasetFieldType("datasetContact", FieldType.TEXT, true));
         Set<DatasetFieldType> datasetContactTypes = new HashSet<>();
         datasetContactTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("datasetContactEmail", FieldType.TEXT, false)));
@@ -67,7 +167,7 @@ public void setUp() {
             t.setParentDatasetFieldType(datasetContactType);
         }
         datasetContactType.setChildDatasetFieldTypes(datasetContactTypes);
-
+    
         DatasetFieldType dsDescriptionType = datasetFieldTypeSvc.add(new DatasetFieldType("dsDescription", FieldType.TEXT, true));
         Set<DatasetFieldType> dsDescriptionTypes = new HashSet<>();
         dsDescriptionTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("dsDescriptionValue", FieldType.TEXT, false)));
@@ -75,119 +175,36 @@ public void setUp() {
             t.setParentDatasetFieldType(dsDescriptionType);
         }
         dsDescriptionType.setChildDatasetFieldTypes(dsDescriptionTypes);
-
+    
         DatasetFieldType keywordType = datasetFieldTypeSvc.add(new DatasetFieldType("keyword", DatasetFieldType.FieldType.TEXT, true));
         DatasetFieldType descriptionType = datasetFieldTypeSvc.add(new DatasetFieldType("description", DatasetFieldType.FieldType.TEXTBOX, false));
-
+    
         DatasetFieldType subjectType = datasetFieldTypeSvc.add(new DatasetFieldType("subject", DatasetFieldType.FieldType.TEXT, true));
         subjectType.setAllowControlledVocabulary(true);
         subjectType.setControlledVocabularyValues(Arrays.asList(
-                new ControlledVocabularyValue(1l, "mgmt", subjectType),
-                new ControlledVocabularyValue(2l, "law", subjectType),
-                new ControlledVocabularyValue(3l, "cs", subjectType)
+            new ControlledVocabularyValue(1l, "mgmt", subjectType),
+            new ControlledVocabularyValue(2l, "law", subjectType),
+            new ControlledVocabularyValue(3l, "cs", subjectType)
         ));
-
+    
         DatasetFieldType pubIdType = datasetFieldTypeSvc.add(new DatasetFieldType("publicationIdType", DatasetFieldType.FieldType.TEXT, false));
         pubIdType.setAllowControlledVocabulary(true);
         pubIdType.setControlledVocabularyValues(Arrays.asList(
-                new ControlledVocabularyValue(1l, "ark", pubIdType),
-                new ControlledVocabularyValue(2l, "doi", pubIdType),
-                new ControlledVocabularyValue(3l, "url", pubIdType)
+            new ControlledVocabularyValue(1l, "ark", pubIdType),
+            new ControlledVocabularyValue(2l, "doi", pubIdType),
+            new ControlledVocabularyValue(3l, "url", pubIdType)
         ));
-
+    
         DatasetFieldType compoundSingleType = datasetFieldTypeSvc.add(new DatasetFieldType("coordinate", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> childTypes = new HashSet<>();
         childTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("lat", DatasetFieldType.FieldType.TEXT, false)));
         childTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("lon", DatasetFieldType.FieldType.TEXT, false)));
-
+    
         for (DatasetFieldType t : childTypes) {
             t.setParentDatasetFieldType(compoundSingleType);
         }
         compoundSingleType.setChildDatasetFieldTypes(childTypes);
+        
+        datasetFieldTypeSvc.setMetadataBlock("citation");
     }
-
-    @Test
-    public void testExportDataset() throws Exception {
-        System.out.println("exportDataset");
-
-        // FIXME: switch ddi/dataset-finch1.json
-        //File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json");
-        File datasetVersionJson = new File("src/test/resources/json/dataset-finch1.json");
-        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
-
-        JsonReader jsonReader = Json.createReader(new StringReader(datasetVersionAsJson));
-        JsonObject json = jsonReader.readObject();
-        JsonParser jsonParser = new JsonParser(datasetFieldTypeSvc, null, null);
-        DatasetVersion version = jsonParser.parseDatasetVersion(json.getJsonObject("datasetVersion"));
-
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        DDIExporter instance = new DDIExporter();
-        boolean nullPointerFixed = false;
-        if (nullPointerFixed) {
-            instance.exportDataset(version, json, byteArrayOutputStream);
-        }
-
-        System.out.println("out: " + XmlPrinter.prettyPrintXml(byteArrayOutputStream.toString()));
-
-    }
-
-    @Test
-    public void testCitation() throws Exception {
-        System.out.println("testCitation");
-
-        File datasetVersionJson = new File("src/test/resources/json/dataset-finch1.json");
-        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
-
-        JsonReader jsonReader = Json.createReader(new StringReader(datasetVersionAsJson));
-        JsonObject json = jsonReader.readObject();
-        JsonParser jsonParser = new JsonParser(datasetFieldTypeSvc, null, null);
-        DatasetVersion version = jsonParser.parseDatasetVersion(json.getJsonObject("datasetVersion"));
-        version.setVersionState(DatasetVersion.VersionState.DRAFT);
-        Dataset dataset = new Dataset();
-        version.setDataset(dataset);
-        Dataverse dataverse = new Dataverse();
-        dataset.setOwner(dataverse);
-        String citation = version.getCitation();
-        System.out.println("citation: " + citation);
-        int currentYear = Year.now().getValue();
-        assertEquals("Finch, Fiona, " + currentYear + ", \"Darwin's Finches\", DRAFT VERSION", citation);
-    }
-
-    @Test
-    public void testExportDatasetContactEmailPresent() throws Exception {
-        File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/datasetContactEmailPresent.json");
-        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
-
-        JsonReader jsonReader = Json.createReader(new StringReader(datasetVersionAsJson));
-        JsonObject json = jsonReader.readObject();
-        JsonParser jsonParser = new JsonParser(datasetFieldTypeSvc, null, null);
-        DatasetVersion version = jsonParser.parseDatasetVersion(json.getJsonObject("datasetVersion"));
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        DDIExporter instance = new DDIExporter();
-        instance.exportDataset(version, json, byteArrayOutputStream);
-
-        System.out.println(XmlPrinter.prettyPrintXml(byteArrayOutputStream.toString()));
-        assertTrue(byteArrayOutputStream.toString().contains("finch@mailinator.com"));
-
-    }
-
-    @Test
-    public void testExportDatasetContactEmailAbsent() throws Exception {
-        File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/datasetContactEmailAbsent.json");
-        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
-
-        JsonReader jsonReader = Json.createReader(new StringReader(datasetVersionAsJson));
-        JsonObject json = jsonReader.readObject();
-//        JsonParser jsonParser = new JsonParser(datasetFieldTypeSvc, null, settingsSvc);
-        JsonParser jsonParser = new JsonParser(datasetFieldTypeSvc, null, null);
-        DatasetVersion version = jsonParser.parseDatasetVersion(json.getJsonObject("datasetVersion"));
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        DDIExporter instance = new DDIExporter();
-        instance.exportDataset(version, json, byteArrayOutputStream);
-
-        System.out.println(XmlPrinter.prettyPrintXml(byteArrayOutputStream.toString()));
-        assertFalse(byteArrayOutputStream.toString().contains("finch@mailinator.com"));
-
-    }
-
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/InternalExportProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/export/InternalExportProviderTest.java
new file mode 100644
index 00000000000..c072788735e
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/export/InternalExportProviderTest.java
@@ -0,0 +1,54 @@
+package edu.harvard.iq.dataverse.export;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DataTable;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.FileMetadata;
+import jakarta.json.JsonArray;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+
+public class InternalExportProviderTest {
+
+    /**
+     * this is a unit-test for seeing why the directory-labels are
+     * not showing in the exported data and how best to remedy the case
+     */
+    @Test
+    public void getDatasetFileDetailsVanilla() throws Exception {
+
+        DatasetVersion mockDV = Mockito.mock(DatasetVersion.class);
+        List<FileMetadata> metadataList = new ArrayList<>();
+        FileMetadata metadata = new FileMetadata();
+        metadata.setId(1L);
+        metadata.setDirectoryLabel("some/directory/label");
+        metadata.setLabel("some-silly-label");
+
+        DataFile datafile = new DataFile();
+        datafile.setId(1L);
+        metadata.setDataFile(datafile);
+        metadata.setDatasetVersion(mockDV);
+
+        List<DataTable> dataTables = new ArrayList<>();
+        DataTable dataTable = new DataTable();
+        dataTable.setOriginalFileName("some_silly_original_file_name");
+        dataTables.add(dataTable);
+
+        datafile.setDataTables(dataTables);
+
+        metadataList.add(metadata);
+        when(mockDV.getFileMetadatas()).thenReturn(metadataList);
+
+        InternalExportDataProvider provider = new InternalExportDataProvider(mockDV);
+
+        JsonArray json = provider.getDatasetFileDetails();
+        assertTrue(json.toString().contains("some/directory/label"));
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExportUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExportUtilTest.java
index 9e9797486e1..8957dd70f53 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExportUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExportUtilTest.java
@@ -6,86 +6,86 @@
 package edu.harvard.iq.dataverse.export;
 
 import com.google.gson.Gson;
+
 import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.api.dto.DatasetDTO;
 import edu.harvard.iq.dataverse.api.dto.DatasetVersionDTO;
-import edu.harvard.iq.dataverse.api.dto.FileDTO;
 import edu.harvard.iq.dataverse.export.openaire.OpenAireExportUtil;
-import java.io.File;
-import java.io.FileNotFoundException;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
+
+import java.io.IOException;
 import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Scanner;
+import java.util.logging.Logger;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- *
- * @author francesco.cadili@4science.it
- */
-public class OpenAireExportUtilTest {
 
-    public OpenAireExportUtilTest() {
-    }
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-    @BeforeClass
-    public static void setUpClass() {
-    }
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-    @AfterClass
-    public static void tearDownClass() {
-    }
+public class OpenAireExportUtilTest {
 
-    @Before
-    public void setUp() {
-    }
+    private static final Logger logger = Logger.getLogger(OpenAireExportUtilTest.class.getCanonicalName());
+    private static final XMLOutputFactory xmlOutputFactory = XMLOutputFactory.newInstance();
+    private final StringWriter stringWriter = new StringWriter();
+    private XMLStreamWriter xmlWriter;
 
-    @After
-    public void tearDown() {
+    @BeforeEach
+    private void setup() throws XMLStreamException {
+        xmlWriter = xmlOutputFactory.createXMLStreamWriter(stringWriter);
+    }
+    @AfterEach
+    private void teardown() throws XMLStreamException {
+        stringWriter.flush();
+        xmlWriter.close();
     }
 
     /**
-     * Test: 1, Identifier (with mandatory type sub-property) (M)
-     *
-     * identifier
+     * Test: 1a, Identifier (with mandatory type sub-property) (M) - DOI version
      */
     @Test
-    public void testWriteIdentifierElement() throws XMLStreamException {
-        System.out.println("writeIdentifierElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        // doi
+    public void testWriteIdentifierElementDoi() throws XMLStreamException {
+        // given
         String persistentAgency = "doi";
         String persistentAuthority = "10.123";
         String persistentId = "123";
-        GlobalId globalId = new GlobalId(persistentAgency, persistentAuthority, persistentId);
-        OpenAireExportUtil.writeIdentifierElement(xmlw, globalId.toURL().toString(), null);
-        xmlw.close();
-        Assert.assertEquals("<identifier identifierType=\"DOI\">"
-                + persistentAuthority + "/" + persistentId + "</identifier>",
-                sw.toString());
-
-        // handle
-        sw = new StringWriter();
-        xmlw = f.createXMLStreamWriter(sw);
-        persistentAgency = "hdl";
-        persistentAuthority = "1902.1";
-        persistentId = "111012";
-        globalId = new GlobalId(persistentAgency, persistentAuthority, persistentId);
-        OpenAireExportUtil.writeIdentifierElement(xmlw, globalId.toURL().toString(), null);
-        xmlw.close();
-        Assert.assertEquals("<identifier identifierType=\"Handle\">"
-                + persistentAuthority + "/" + persistentId + "</identifier>",
-                sw.toString());
+        GlobalId globalId = new GlobalId(persistentAgency, persistentAuthority, persistentId, null, AbstractDOIProvider.DOI_RESOLVER_URL, null);
+
+        // when
+        OpenAireExportUtil.writeIdentifierElement(xmlWriter, globalId.asURL(), null);
+        xmlWriter.flush();
+
+        // then
+        assertEquals(String.format("<identifier identifierType=\"DOI\">%s/%s</identifier>", persistentAuthority, persistentId),
+                stringWriter.toString());
+    }
+
+    /**
+     * Test: 1b, Identifier (with mandatory type sub-property) (M) - Handle version
+     */
+    @Test
+    public void testWriteIdentifierElementHandle() throws XMLStreamException {
+        // given
+        String persistentAgency = "hdl";
+        String persistentAuthority = "1902.1";
+        String persistentId = "111012";
+        GlobalId globalId = new GlobalId(persistentAgency, persistentAuthority, persistentId, null, HandlePidProvider.HDL_RESOLVER_URL, null);
+
+        // when
+        OpenAireExportUtil.writeIdentifierElement(xmlWriter, globalId.asURL(), null);
+        xmlWriter.flush();
+
+        // then
+        assertEquals(String.format("<identifier identifierType=\"Handle\">%s/%s</identifier>", persistentAuthority, persistentId),
+                stringWriter.toString());
     }
 
     /**
@@ -95,21 +95,17 @@ public void testWriteIdentifierElement() throws XMLStreamException {
      * creators
      */
     @Test
-    public void testWriteCreatorsElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeCreatorsElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-simplified.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteCreatorsElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-simplified.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeCreatorsElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<creators>"
+        // when
+        OpenAireExportUtil.writeCreatorsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        // then
+        assertEquals("<creators>"
                 + "<creator>"
                 + "<creatorName nameType=\"Personal\">Privileged, Pete</creatorName>"
                 + "<givenName>Pete</givenName>"
@@ -140,7 +136,7 @@ public void testWriteCreatorsElement() throws XMLStreamException, FileNotFoundEx
                 + "<affiliation>Bottom</affiliation>"
                 + "</creator>"
                 + "</creators>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -152,21 +148,17 @@ public void testWriteCreatorsElement() throws XMLStreamException, FileNotFoundEx
      * creators
      */
     @Test
-    public void testWriteCreatorsElementWithOrganizations() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeCreatorsElementWithOrganizations");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteCreatorsElementWithOrganizations() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-organizations.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeCreatorsElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<creators>"
+        // when
+        OpenAireExportUtil.writeCreatorsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        // then
+        assertEquals("<creators>"
                 + "<creator>"
                 + "<creatorName nameType=\"Organizational\">IBM</creatorName>"
                 + "</creator>"
@@ -186,7 +178,7 @@ public void testWriteCreatorsElementWithOrganizations() throws XMLStreamExceptio
                 + "<creatorName nameType=\"Organizational\">Michael J. Fox Foundation for Parkinson's Research</creatorName>"
                 + "</creator>"
                 + "</creators>",
-                sw.toString());
+                stringWriter.toString());
     }
     
     /**
@@ -198,20 +190,17 @@ public void testWriteCreatorsElementWithOrganizations() throws XMLStreamExceptio
      * creators
      */
     @Test
-    public void testWriteCreatorsElementWithOrganizationsAndComma() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeCreatorsElementWithOrganizationsAndComma");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations-comma.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteCreatorsElementWithOrganizationsAndComma() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-organizations-comma.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeCreatorsElement(xmlw, dto, null);
-        xmlw.close();
-        Assert.assertEquals("<creators>"
+
+        // when
+        OpenAireExportUtil.writeCreatorsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        // then
+        assertEquals("<creators>"
                 + "<creator>"
                 + "<creatorName nameType=\"Organizational\">Digital Archive of Massachusetts Anti-Slavery and Anti-Segregation Petitions, Massachusetts Archives, Boston MA</creatorName>"
                 + "</creator>"
@@ -225,7 +214,7 @@ public void testWriteCreatorsElementWithOrganizationsAndComma() throws XMLStream
                 + "<creatorName nameType=\"Organizational\">Geographic Data Technology, Inc. (GDT)</creatorName>"
                 + "</creator>"
                 + "</creators>",
-                sw.toString());
+                stringWriter.toString());
     }
     
     /**
@@ -234,22 +223,17 @@ public void testWriteCreatorsElementWithOrganizationsAndComma() throws XMLStream
      * titles
      */
     @Test
-    public void testWriteTitleElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeTotlesElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-simplified.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteTitleElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-simplified.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeTitlesElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<titles><title>My Dataset</title></titles>",
-                sw.toString());
+        // when
+        OpenAireExportUtil.writeTitlesElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<titles><title>My Dataset</title></titles>", stringWriter.toString());
     }
 
     /**
@@ -258,23 +242,20 @@ public void testWriteTitleElement() throws XMLStreamException, FileNotFoundExcep
      * publisher
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
      */
     @Test
-    public void testWritePublisherElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writePublisherElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
+    public void testWritePublisherElement() throws XMLStreamException {
+        // given
         DatasetDTO datasetDto = new DatasetDTO();
         datasetDto.setPublisher("Publisher01");
         String publisher = datasetDto.getPublisher();
-        OpenAireExportUtil.writeFullElement(xmlw, null, "publisher", null, publisher, null);
 
-        xmlw.close();
-        Assert.assertEquals("<publisher>Publisher01</publisher>",
-                sw.toString());
+        // when
+        OpenAireExportUtil.writeFullElement(xmlWriter, null, "publisher", null, publisher, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<publisher>Publisher01</publisher>", stringWriter.toString());
     }
 
     /**
@@ -283,25 +264,20 @@ public void testWritePublisherElement() throws XMLStreamException, FileNotFoundE
      * publicationYear
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWritePublicationYearElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writePublicationYearElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-simplified.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWritePublicationYearElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-simplified.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writePublicationYearElement(xmlw, dto, null, null);
 
-        xmlw.close();
-        Assert.assertEquals("<publicationYear>2014</publicationYear>",
-                sw.toString());
+        // when
+        OpenAireExportUtil.writePublicationYearElement(xmlWriter, dto, null, null);
+        xmlWriter.flush();
+
+        // then
+        assertEquals("<publicationYear>2014</publicationYear>", stringWriter.toString());
     }
 
     /**
@@ -310,33 +286,32 @@ public void testWritePublicationYearElement() throws XMLStreamException, FileNot
      * subjects
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testSubjectsElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeSubjectsElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testSubjectsElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeSubjectsElement(xmlw, dto, null);
-        xmlw.close();
-        Assert.assertEquals("<subjects>"
+
+        // when
+        OpenAireExportUtil.writeSubjectsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        // then
+        assertEquals("<subjects>"
                 + "<subject>Agricultural Sciences</subject>"
                 + "<subject>Business and Management</subject>"
                 + "<subject>Engineering</subject>"
                 + "<subject>Law</subject>"
                 + "<subject schemeURI=\"http://KeywordVocabularyURL1.org\" "
+                + "valueURI=\"http://keywordTermURI1.org\" "
                 + "subjectScheme=\"KeywordVocabulary1\">KeywordTerm1</subject>"
                 + "<subject schemeURI=\"http://KeywordVocabularyURL2.org\" "
+                + "valueURI=\"http://keywordTermURI2.org\" "
                 + "subjectScheme=\"KeywordVocabulary2\">KeywordTerm2</subject>"
                 + "</subjects>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -346,21 +321,17 @@ public void testSubjectsElement() throws XMLStreamException, FileNotFoundExcepti
      * contributors
      */
     @Test
-    public void testWriteContributorsElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeContributorsElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-simplified.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteContributorsElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-simplified.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeContributorsElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<contributors>"
+        // when
+        OpenAireExportUtil.writeContributorsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        // then
+        assertEquals("<contributors>"
                 + "<contributor contributorType=\"ContactPerson\">"
                 + "<contributorName nameType=\"Personal\">Smith, John</contributorName>"
                 + "<givenName>John</givenName><familyName>Smith</familyName>"
@@ -372,7 +343,7 @@ public void testWriteContributorsElement() throws XMLStreamException, FileNotFou
                 + "<contributorName>pete@malinator.com</contributorName>"
                 + "</contributor>"
                 + "</contributors>",
-                sw.toString());
+                stringWriter.toString());
     }
     
     /**
@@ -384,21 +355,17 @@ public void testWriteContributorsElement() throws XMLStreamException, FileNotFou
      * contributors
      */
     @Test
-    public void testWriteContributorsElementWithOrganizations() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeContributorsElementWithOrganizations");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteContributorsElementWithOrganizations() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-organizations.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeContributorsElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<contributors>"
+        // when
+        OpenAireExportUtil.writeContributorsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<contributors>"
                 + "<contributor contributorType=\"ContactPerson\">"
                 + "<contributorName nameType=\"Organizational\">IBM</contributorName>"
                 + "</contributor>"
@@ -421,7 +388,7 @@ public void testWriteContributorsElementWithOrganizations() throws XMLStreamExce
                 + "<contributorName>pete@malinator.com</contributorName>"
                 + "</contributor>"
                 + "</contributors>",
-                sw.toString());
+                stringWriter.toString());
     }
     
     /**
@@ -433,21 +400,17 @@ public void testWriteContributorsElementWithOrganizations() throws XMLStreamExce
      * contributors
      */
     @Test
-    public void testWriteContributorsElementWithOrganizationsAndComma() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeContributorsElementWithOrganizationsAndComma");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations-comma.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteContributorsElementWithOrganizationsAndComma() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-organizations-comma.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeContributorsElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<contributors>"
+        // when
+        OpenAireExportUtil.writeContributorsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        // then
+        assertEquals("<contributors>"
                 + "<contributor contributorType=\"ContactPerson\">"
                 + "<contributorName nameType=\"Organizational\">Digital Archive of Massachusetts Anti-Slavery and Anti-Segregation Petitions, Massachusetts Archives, Boston MA</contributorName>"
                 + "</contributor>"
@@ -464,7 +427,7 @@ public void testWriteContributorsElementWithOrganizationsAndComma() throws XMLSt
                 + "<contributorName>pete@malinator.com</contributorName>"
                 + "</contributor>"
                 + "</contributors>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -474,21 +437,17 @@ public void testWriteContributorsElementWithOrganizationsAndComma() throws XMLSt
      * contributors
      */
     @Test
-    public void testWriteContributorsElementComplete() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeContributorsElementComplete");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteContributorsElementComplete() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeContributorsElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<contributors>"
+        // when
+        OpenAireExportUtil.writeContributorsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        // then
+        assertEquals("<contributors>"
                 + "<contributor contributorType=\"ContactPerson\">"
                 + "<contributorName nameType=\"Organizational\">LastContact1, FirstContact1</contributorName>"
                 + "<affiliation>ContactAffiliation1</affiliation>"
@@ -504,27 +463,33 @@ public void testWriteContributorsElementComplete() throws XMLStreamException, Fi
                 + "<affiliation>ContactAffiliation3</affiliation>"
                 + "</contributor>"
                 + "<contributor contributorType=\"Producer\">"
-                + "<contributorName>LastProducer1, FirstProducer1</contributorName>"
+                + "<contributorName nameType=\"Personal\">LastProducer1, FirstProducer1</contributorName>"
+                + "<givenName>FirstProducer1</givenName><familyName>LastProducer1</familyName>"
                 + "<affiliation>ProducerAffiliation1</affiliation>"
                 + "</contributor><contributor contributorType=\"Producer\">"
-                + "<contributorName>LastProducer2, FirstProducer2</contributorName>"
+                + "<contributorName nameType=\"Personal\">LastProducer2, FirstProducer2</contributorName>"
+                + "<givenName>FirstProducer2</givenName><familyName>LastProducer2</familyName>"
                 + "<affiliation>ProducerAffiliation2</affiliation>"
                 + "</contributor>"
                 + "<contributor contributorType=\"DataCollector\">"
-                + "<contributorName>LastContributor1, FirstContributor1</contributorName>"
+                + "<contributorName nameType=\"Personal\">LastContributor1, FirstContributor1</contributorName>"
+                + "<givenName>FirstContributor1</givenName><familyName>LastContributor1</familyName>"
                 + "</contributor>"
                 + "<contributor contributorType=\"DataCurator\">"
-                + "<contributorName>LastContributor2, FirstContributor2</contributorName>"
+                + "<contributorName nameType=\"Personal\">LastContributor2, FirstContributor2</contributorName>"
+                + "<givenName>FirstContributor2</givenName><familyName>LastContributor2</familyName>"
                 + "</contributor><contributor contributorType=\"Distributor\">"
-                + "<contributorName>LastDistributor1, FirstDistributor1</contributorName>"
+                + "<contributorName nameType=\"Personal\">LastDistributor1, FirstDistributor1</contributorName>"
+                + "<givenName>FirstDistributor1</givenName><familyName>LastDistributor1</familyName>"
                 + "<affiliation>DistributorAffiliation1</affiliation>"
                 + "</contributor>"
                 + "<contributor contributorType=\"Distributor\">"
-                + "<contributorName>LastDistributor2, FirstDistributor2</contributorName>"
+                + "<contributorName nameType=\"Personal\">LastDistributor2, FirstDistributor2</contributorName>"
+                + "<givenName>FirstDistributor2</givenName><familyName>LastDistributor2</familyName>"
                 + "<affiliation>DistributorAffiliation2</affiliation>"
                 + "</contributor>"
                 + "</contributors>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -533,24 +498,20 @@ public void testWriteContributorsElementComplete() throws XMLStreamException, Fi
      * dates
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteDatesElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeDatesElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteDatesElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeDatesElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<dates>"
+        // when
+        OpenAireExportUtil.writeDatesElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<dates>"
                 + "<date dateType=\"Issued\">1004-01-01</date>"
                 + "<date dateType=\"Created\">1003-01-01</date>"
                 + "<date dateType=\"Submitted\">1002-01-01</date>"
@@ -558,7 +519,7 @@ public void testWriteDatesElement() throws XMLStreamException, FileNotFoundExcep
                 + "<date dateType=\"Collected\">1006-01-01/1006-01-01</date>"
                 + "<date dateType=\"Collected\">1006-02-01/1006-02-02</date>"
                 + "</dates>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -567,26 +528,21 @@ public void testWriteDatesElement() throws XMLStreamException, FileNotFoundExcep
      * language
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteLanguageElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeLanguageElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteLanguageElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        String language = OpenAireExportUtil.getLanguage(xmlw, dto);
-        OpenAireExportUtil.writeFullElement(xmlw, null, "language", null, language, null);
+        String language = OpenAireExportUtil.getLanguage(xmlWriter, dto);
+
+        // when
+        OpenAireExportUtil.writeFullElement(xmlWriter, null, "language", null, language, null);
+        xmlWriter.flush();
 
-        xmlw.close();
-        Assert.assertEquals("<language>it</language>",
-                sw.toString());
+        // then
+        assertEquals("<language>it</language>", stringWriter.toString());
     }
 
     /**
@@ -596,26 +552,20 @@ public void testWriteLanguageElement() throws XMLStreamException, FileNotFoundEx
      * resourceType
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteResourceTypeElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeResourceTypeElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteResourceTypeElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeResourceTypeElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<resourceType resourceTypeGeneral=\"Dataset\">"
-                + "KindOfData1</resourceType>",
-                sw.toString());
+        // when
+        OpenAireExportUtil.writeResourceTypeElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<resourceType resourceTypeGeneral=\"Dataset\">KindOfData1</resourceType>", stringWriter.toString());
     }
 
     /**
@@ -624,31 +574,26 @@ public void testWriteResourceTypeElement() throws XMLStreamException, FileNotFou
      * alternateIdentifier
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteAlternateIdentifierElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeAlternateIdentifierElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteAlternateIdentifierElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
 
-        OpenAireExportUtil.writeAlternateIdentifierElement(xmlw, dto, null);
+        // when
+        OpenAireExportUtil.writeAlternateIdentifierElement(xmlWriter, dto, null);
+        xmlWriter.flush();
 
-        xmlw.close();
-        Assert.assertEquals("<alternateIdentifiers>"
+        //then
+        assertEquals("<alternateIdentifiers>"
                 + "<alternateIdentifier alternateIdentifierType=\"OtherIDAgency1\">"
                 + "OtherIDIdentifier1</alternateIdentifier>"
                 + "<alternateIdentifier alternateIdentifierType=\"OtherIDAgency2\">"
                 + "OtherIDIdentifier2</alternateIdentifier>"
                 + "</alternateIdentifiers>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -658,30 +603,26 @@ public void testWriteAlternateIdentifierElement() throws XMLStreamException, Fil
      * relatedIdentifier
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteRelatedIdentifierElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeRelatedIdentifierElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteRelatedIdentifierElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeRelatedIdentifierElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<relatedIdentifiers>"
-                + "<relatedIdentifier relationType=\"IsCitedBy\" relatedIdentifierType=\"ARK\">"
+        // when
+        OpenAireExportUtil.writeRelatedIdentifierElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<relatedIdentifiers>"
+                + "<relatedIdentifier relationType=\"IsSupplementTo\" relatedIdentifierType=\"ARK\">"
                 + "RelatedPublicationIDNumber1</relatedIdentifier>"
                 + "<relatedIdentifier relationType=\"IsCitedBy\" relatedIdentifierType=\"arXiv\">"
                 + "RelatedPublicationIDNumber2</relatedIdentifier>"
                 + "</relatedIdentifiers>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -690,33 +631,25 @@ public void testWriteRelatedIdentifierElement() throws XMLStreamException, FileN
      * size
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteEmptySizeElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeEmptySizeElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteEmptySizeElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        {
-            // set an empty file list
-            dto.setFiles(new ArrayList<FileDTO>());
-
-            // Fragment must be enclosed in a fake root element.
-            xmlw.writeStartElement("root");
-            OpenAireExportUtil.writeSizeElement(xmlw, dto, null);
-
-            xmlw.writeEndElement();
-        }
-        xmlw.close();
-        Assert.assertEquals("<root />",
-                sw.toString());
+        // set an empty file list
+        dto.setFiles(new ArrayList<>());
+
+        // when
+        // note: fragment must be enclosed in a fake root element.
+        xmlWriter.writeStartElement("root");
+        OpenAireExportUtil.writeSizeElement(xmlWriter, dto, null);
+        xmlWriter.writeEndElement();
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<root></root>", stringWriter.toString());
     }
 
     /**
@@ -725,28 +658,25 @@ public void testWriteEmptySizeElement() throws XMLStreamException, FileNotFoundE
      * relatedIdentifier
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteSizeElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeSizeElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteSizeElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeSizeElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<sizes>"
+        // when
+        // note: fragment must be enclosed in a fake root element.
+        OpenAireExportUtil.writeSizeElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<sizes>"
                 + "<size>1000</size>"
                 + "<size>20</size>"
                 + "</sizes>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -755,34 +685,25 @@ public void testWriteSizeElement() throws XMLStreamException, FileNotFoundExcept
      * size
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteEmptyFormatElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeEmptyFormatElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteEmptyFormatElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        {
-            // set an empty file list
-            dto.setFiles(new ArrayList<FileDTO>());
-
-            // Fragment must be enclosed in a fake root element.
-            xmlw.writeStartElement("root");
-            OpenAireExportUtil.writeFormatElement(xmlw, dto, null);
-
-            xmlw.writeEndElement();
-        }
-
-        xmlw.close();
-        Assert.assertEquals("<root />",
-                sw.toString());
+        // set an empty file list
+        dto.setFiles(new ArrayList<>());
+
+        // when
+        // note: fragment must be enclosed in a fake root element.
+        xmlWriter.writeStartElement("root");
+        OpenAireExportUtil.writeFormatElement(xmlWriter, dto, null);
+        xmlWriter.writeEndElement();
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<root></root>", stringWriter.toString());
     }
 
     /**
@@ -791,28 +712,24 @@ public void testWriteEmptyFormatElement() throws XMLStreamException, FileNotFoun
      * size
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteFormatElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeFormatElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteFormatElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeFormatElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<formats>"
+        // when
+        OpenAireExportUtil.writeFormatElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<formats>"
                 + "<format>application/pdf</format>"
                 + "<format>application/xml</format>"
                 + "</formats>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -821,31 +738,23 @@ public void testWriteFormatElement() throws XMLStreamException, FileNotFoundExce
      * version
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteEmptyVersionElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeEmptyVersionElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteEmptyVersionElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        {
-            // Fragment must be enclosed in a fake root element.
-            xmlw.writeStartElement("root");
-            OpenAireExportUtil.writeVersionElement(xmlw, dto, null);
 
-            xmlw.writeEndElement();
-        }
+        // when
+        // note: fragment must be enclosed in a fake root element.
+        xmlWriter.writeStartElement("root");
+        OpenAireExportUtil.writeVersionElement(xmlWriter, dto, null);
+        xmlWriter.writeEndElement();
+        xmlWriter.flush();
 
-        xmlw.close();
-        Assert.assertEquals("<root><version>1.0</version></root>",
-                sw.toString());
+        //then
+        assertEquals("<root><version>1.0</version></root>", stringWriter.toString());
     }
 
     /**
@@ -854,29 +763,22 @@ public void testWriteEmptyVersionElement() throws XMLStreamException, FileNotFou
      * version
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteVersionElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeVersionElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteVersionElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        {
-            dto.setVersionNumber(2L);
-            dto.setMinorVersionNumber(1L);
-        }
-        OpenAireExportUtil.writeVersionElement(xmlw, dto, null);
-
-        xmlw.close();
-        Assert.assertEquals("<version>2.1</version>",
-                sw.toString());
+        dto.setVersionNumber(2L);
+        dto.setMinorVersionNumber(1L);
+
+        // when
+        OpenAireExportUtil.writeVersionElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<version>2.1</version>", stringWriter.toString());
     }
 
     /**
@@ -885,27 +787,24 @@ public void testWriteVersionElement() throws XMLStreamException, FileNotFoundExc
      * rights
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteAccessRightElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeAccessRightElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteAccessRightElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeAccessRightsElement(xmlw, dto, null);
-        xmlw.close();
-        Assert.assertEquals("<rightsList>"
-                + "<rights rightsURI=\"info:eu-repo/semantics/closedAccess\" />"
-                + "<rights rightsURI=\"https://creativecommons.org/publicdomain/zero/1.0/\">"
-                + "CC0 Waiver</rights></rightsList>",
-                sw.toString());
+
+        // when
+        OpenAireExportUtil.writeAccessRightsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<rightsList>"
+                + "<rights rightsURI=\"info:eu-repo/semantics/closedAccess\"></rights>"
+                + "<rights rightsURI=\"http://creativecommons.org/publicdomain/zero/1.0/\">"
+                + "CC0 1.0</rights></rightsList>",
+                stringWriter.toString());
     }
 
     /**
@@ -914,32 +813,26 @@ public void testWriteAccessRightElement() throws XMLStreamException, FileNotFoun
      * rights
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteRestrictedAccessRightElementWithRequestAccessEnabled() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeRestrictedAccessRightElementWithRequestAccessEnabled");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteRestrictedAccessRightElementWithRequestAccessEnabled() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        {
-            dto.setLicense(null);
-            dto.setTermsOfUse(null);
-            dto.setFileAccessRequest(true);
-        }
-
-        OpenAireExportUtil.writeAccessRightsElement(xmlw, dto, null);
-        xmlw.close();
-        Assert.assertEquals("<rightsList>"
-                + "<rights rightsURI=\"info:eu-repo/semantics/restrictedAccess\" />"
-                + "<rights /></rightsList>",
-                sw.toString());
+        dto.setLicense(null);
+        dto.setTermsOfUse(null);
+        dto.setFileAccessRequest(true);
+
+        // when
+        OpenAireExportUtil.writeAccessRightsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<rightsList>"
+                + "<rights rightsURI=\"info:eu-repo/semantics/restrictedAccess\"></rights>"
+                + "<rights></rights></rightsList>",
+                stringWriter.toString());
     }
 
     /**
@@ -948,32 +841,26 @@ public void testWriteRestrictedAccessRightElementWithRequestAccessEnabled() thro
      * rights
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteRestrictedAccessRightElementWithRequestAccessDisabled() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeWriteRestrictedAccessRightElementWithRequestAccessDisabled");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteRestrictedAccessRightElementWithRequestAccessDisabled() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        {
-            dto.setLicense(null);
-            dto.setTermsOfUse(null);
-            dto.setFileAccessRequest(false);
-        }
-
-        OpenAireExportUtil.writeAccessRightsElement(xmlw, dto, null);
-        xmlw.close();
-        Assert.assertEquals("<rightsList>"
-                + "<rights rightsURI=\"info:eu-repo/semantics/closedAccess\" />"
-                + "<rights /></rightsList>",
-                sw.toString());
+        dto.setLicense(null);
+        dto.setTermsOfUse(null);
+        dto.setFileAccessRequest(false);
+
+        // when
+        OpenAireExportUtil.writeAccessRightsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<rightsList>"
+                + "<rights rightsURI=\"info:eu-repo/semantics/closedAccess\"></rights>"
+                + "<rights></rights></rightsList>",
+                stringWriter.toString());
     }
 
     /**
@@ -982,24 +869,20 @@ public void testWriteRestrictedAccessRightElementWithRequestAccessDisabled() thr
      * description
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteDescriptionsElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeDescriptionsElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteDescriptionsElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeDescriptionsElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<descriptions>"
+        // when
+        OpenAireExportUtil.writeDescriptionsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<descriptions>"
                 + "<description descriptionType=\"Abstract\">DescriptionText 1"
                 + "</description>"
                 + "<description descriptionType=\"Abstract\">DescriptionText2"
@@ -1018,7 +901,7 @@ public void testWriteDescriptionsElement() throws XMLStreamException, FileNotFou
                 + "</description>"
                 + "<description descriptionType=\"Other\">Notes1"
                 + "</description></descriptions>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -1027,43 +910,90 @@ public void testWriteDescriptionsElement() throws XMLStreamException, FileNotFou
      * description
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteGeoLocationElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeGeoLocationElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteGeoLocationsElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults-multiple-geo.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeGeoLocationsElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<geoLocations>"
+        // when
+        OpenAireExportUtil.writeGeoLocationsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+        
+        //then
+        assertEquals("<geoLocations>"
                 + "<geoLocation>"
-                + "<geoLocationPlace>ProductionPlace</geoLocationPlace></geoLocation>"
+                + "<geoLocationPlace>University of Stuttgart"
+                + "</geoLocationPlace>"
+                + "</geoLocation>"
+                + "<geoLocation>"
+                + "<geoLocationPlace>University of Vienna"
+                + "</geoLocationPlace>"
+                + "</geoLocation>"
                 + "<geoLocation>"
                 + "<geoLocationBox>"
                 + "<westBoundLongitude>10</westBoundLongitude>"
                 + "<eastBoundLongitude>20</eastBoundLongitude>"
-                + "<northBoundLatitude>30</northBoundLatitude>"
                 + "<southBoundLatitude>40</southBoundLatitude>"
+                + "<northBoundLatitude>30</northBoundLatitude>"
                 + "</geoLocationBox>"
                 + "</geoLocation>"
                 + "<geoLocation>"
                 + "<geoLocationBox>"
+                + "<eastBoundLongitude>60</eastBoundLongitude>"
                 + "<southBoundLatitude>80</southBoundLatitude>"
                 + "<northBoundLatitude>70</northBoundLatitude>"
+                + "<westBoundLongitude>50</westBoundLongitude>"
+                + "</geoLocationBox>"
+                + "</geoLocation>"
+                + "</geoLocations>",
+                stringWriter.toString());
+    }
+    
+    /**
+     * Test: 18, GeoLocation (with point, box and polygon sub-properties) (R)
+     *
+     * description
+     *
+     * @throws javax.xml.stream.XMLStreamException
+     * @throws java.io.IOException
+     */
+    @Test
+    public void testWriteGeoLocationElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
+        DatasetVersionDTO dto = datasetDto.getDatasetVersion();
+
+        // when
+        OpenAireExportUtil.writeGeoLocationsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+        
+        //then
+        assertEquals("<geoLocations>"
+                + "<geoLocation>"
+                + "<geoLocationPlace>University of Stuttgart"
+                + "</geoLocationPlace>"
+                + "</geoLocation>"
+                + "<geoLocation>"
+                + "<geoLocationBox>"
+                + "<westBoundLongitude>10</westBoundLongitude>"
+                + "<eastBoundLongitude>20</eastBoundLongitude>"
+                + "<southBoundLatitude>40</southBoundLatitude>"
+                + "<northBoundLatitude>30</northBoundLatitude>"
+                + "</geoLocationBox>"
+                + "</geoLocation>"
+                + "<geoLocation>"
+                + "<geoLocationBox>"
                 + "<eastBoundLongitude>60</eastBoundLongitude>"
+                + "<southBoundLatitude>80</southBoundLatitude>"
+                + "<northBoundLatitude>70</northBoundLatitude>"
                 + "<westBoundLongitude>50</westBoundLongitude>"
                 + "</geoLocationBox>"
-                + "</geoLocation></geoLocations>",
-                sw.toString());
+                + "</geoLocation>"
+                + "</geoLocations>",
+                stringWriter.toString());
     }
 
     /**
@@ -1072,33 +1002,29 @@ public void testWriteGeoLocationElement() throws XMLStreamException, FileNotFoun
      * description
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteGeoLocationElement2() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeGeoLocationElement2");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-simplified.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteGeoLocationElement2() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-simplified.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeGeoLocationsElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<geoLocations>"
+        // when
+        OpenAireExportUtil.writeGeoLocationsElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<geoLocations>"
                 + "<geoLocation>"
                 + "<geoLocationBox>"
                 + "<eastBoundLongitude>23</eastBoundLongitude>"
                 + "<northBoundLatitude>786</northBoundLatitude>"
-                + "<westBoundLongitude>45</westBoundLongitude>"
                 + "<southBoundLatitude>34</southBoundLatitude>"
+                + "<westBoundLongitude>45</westBoundLongitude>"
                 + "</geoLocationBox>"
                 + "</geoLocation></geoLocations>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -1108,24 +1034,20 @@ public void testWriteGeoLocationElement2() throws XMLStreamException, FileNotFou
      * fundingReference
      *
      * @throws javax.xml.stream.XMLStreamException
-     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
      */
     @Test
-    public void testWriteFundingReferencesElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeFundingReferencesElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteFundingReferencesElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-all-defaults.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeFundingReferencesElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<fundingReferences><fundingReference>"
+        // when
+        OpenAireExportUtil.writeFundingReferencesElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<fundingReferences><fundingReference>"
                 + "<funderName>GrantInformationGrantAgency1</funderName>"
                 + "<awardNumber>GrantInformationGrantNumber1</awardNumber>"
                 + "</fundingReference>"
@@ -1133,7 +1055,7 @@ public void testWriteFundingReferencesElement() throws XMLStreamException, FileN
                 + "<funderName>GrantInformationGrantAgency2</funderName>"
                 + "<awardNumber>GrantInformationGrantNumber2</awardNumber>"
                 + "</fundingReference></fundingReferences>",
-                sw.toString());
+                stringWriter.toString());
     }
 
     /**
@@ -1142,27 +1064,20 @@ public void testWriteFundingReferencesElement() throws XMLStreamException, FileN
      * funderName
      */
     @Test
-    public void testWriteFunderNamePropertyNotInContributor() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeFunderNamePropertyNotInContributor");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/datase-updated.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteFunderNamePropertyNotInContributor() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-updated.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        {
-            // Fragment must be enclosed in a fake root element.
-            xmlw.writeStartElement("root");
-            OpenAireExportUtil.writeContributorsElement(xmlw, dto, null);
-
-            xmlw.writeEndElement();
-        }
-        xmlw.close();
-        Assert.assertEquals("<root />",
-                sw.toString());
+
+        // when
+        // note: fragment must be enclosed in a fake root element.
+        xmlWriter.writeStartElement("root");
+        OpenAireExportUtil.writeContributorsElement(xmlWriter, dto, null);
+        xmlWriter.writeEndElement();
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<root></root>", stringWriter.toString());
     }
 
     /**
@@ -1171,25 +1086,32 @@ public void testWriteFunderNamePropertyNotInContributor() throws XMLStreamExcept
      * funderName
      */
     @Test
-    public void testWriteFunderNamePropertyInFundingReferencesElement() throws XMLStreamException, FileNotFoundException {
-        System.out.println("writeFunderNamePropertyInFundingReferencesElement");
-        XMLOutputFactory f = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter xmlw = f.createXMLStreamWriter(sw);
-
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/export/datase-updated.txt");
-        String text = new Scanner(file).useDelimiter("\\Z").next();
-        Gson gson = new Gson();
-        DatasetDTO datasetDto = gson.fromJson(text, DatasetDTO.class);
+    public void testWriteFunderNamePropertyInFundingReferencesElement() throws XMLStreamException, IOException {
+        // given
+        DatasetDTO datasetDto = mapObjectFromJsonTestFile("export/dataset-updated.txt", DatasetDTO.class);
         DatasetVersionDTO dto = datasetDto.getDatasetVersion();
-        OpenAireExportUtil.writeFundingReferencesElement(xmlw, dto, null);
 
-        xmlw.close();
-        Assert.assertEquals("<fundingReferences>"
+        // when
+        OpenAireExportUtil.writeFundingReferencesElement(xmlWriter, dto, null);
+        xmlWriter.flush();
+
+        //then
+        assertEquals("<fundingReferences>"
                 + "<fundingReference><funderName>Dennis</funderName></fundingReference>"
                 + "<fundingReference><funderName>NIH</funderName><awardNumber>NIH1231245154</awardNumber></fundingReference>"
                 + "<fundingReference><funderName>NIH</funderName><awardNumber>NIH99999999</awardNumber></fundingReference>"
                 + "</fundingReferences>",
-                sw.toString());
+                stringWriter.toString());
+    }
+
+    // private static final Jsonb jsonb = JsonbBuilder.create();
+    private static final Gson gson = new Gson();
+
+    public static <T> T mapObjectFromJsonTestFile(String subPath, Class<T> klass) throws IOException {
+        Path file = Path.of("src/test/java/edu/harvard/iq/dataverse", subPath);
+        String json = Files.readString(file, StandardCharsets.UTF_8);
+        // Jakarta JSON-B is no capable to map many of the DTO fields... :-( Needs Gson for now.
+        // return jsonb.fromJson(json, klass);
+        return gson.fromJson(json, klass);
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExporterTest.java b/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExporterTest.java
index 62f6d3037a1..efc18f5a1df 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExporterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExporterTest.java
@@ -1,8 +1,13 @@
 package edu.harvard.iq.dataverse.export;
 
-import com.jayway.restassured.path.xml.XmlPath;
-import edu.harvard.iq.dataverse.DatasetVersion;
+import io.restassured.path.xml.XmlPath;
 import edu.harvard.iq.dataverse.util.xml.XmlPrinter;
+import edu.harvard.iq.dataverse.util.xml.XmlUtil;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.XMLExporter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -10,13 +15,13 @@
 import java.io.StringReader;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import static junit.framework.Assert.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -29,6 +34,7 @@ public class OpenAireExporterTest {
     public OpenAireExporterTest() {
         openAireExporter = new OpenAireExporter();
     }
+    
 
     /**
      * Test of getProviderName method, of class OpenAireExporter.
@@ -38,7 +44,7 @@ public void testGetProviderName() {
         System.out.println("getProviderName");
         OpenAireExporter instance = new OpenAireExporter();
         String expResult = "oai_datacite";
-        String result = instance.getProviderName();
+        String result = instance.getFormatName();
         assertEquals(expResult, result);
     }
 
@@ -50,7 +56,7 @@ public void testGetDisplayName() {
         System.out.println("getDisplayName");
         OpenAireExporter instance = new OpenAireExporter();
         String expResult = "OpenAIRE";
-        String result = instance.getDisplayName();
+        String result = instance.getDisplayName(null);
         assertEquals(expResult, result);
     }
 
@@ -64,9 +70,12 @@ public void testExportDataset() throws Exception {
         String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
         JsonReader jsonReader = Json.createReader(new StringReader(datasetVersionAsJson));
         JsonObject jsonObject = jsonReader.readObject();
-        DatasetVersion nullVersion = null;
+        
+        ExportDataProvider exportDataProviderStub = Mockito.mock(ExportDataProvider.class);
+        Mockito.when(exportDataProviderStub.getDatasetJson()).thenReturn(jsonObject);
+        
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        openAireExporter.exportDataset(nullVersion, jsonObject, byteArrayOutputStream);
+        openAireExporter.exportDataset(exportDataProviderStub, byteArrayOutputStream);
         String xmlOnOneLine = new String(byteArrayOutputStream.toByteArray());
         String xmlAsString = XmlPrinter.prettyPrintXml(xmlOnOneLine);
         System.out.println("XML: " + xmlAsString);
@@ -86,9 +95,12 @@ public void testValidateExportDataset() throws Exception {
         String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
         JsonReader jsonReader = Json.createReader(new StringReader(datasetVersionAsJson));
         JsonObject jsonObject = jsonReader.readObject();
-        DatasetVersion nullVersion = null;
+        
+        ExportDataProvider exportDataProviderStub = Mockito.mock(ExportDataProvider.class);
+        Mockito.when(exportDataProviderStub.getDatasetJson()).thenReturn(jsonObject);
+        
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        openAireExporter.exportDataset(nullVersion, jsonObject, byteArrayOutputStream);
+        openAireExporter.exportDataset(exportDataProviderStub, byteArrayOutputStream);
 
         {
             String xmlOnOneLine = new String(byteArrayOutputStream.toByteArray());
@@ -96,8 +108,8 @@ public void testValidateExportDataset() throws Exception {
             System.out.println("XML: " + xmlAsString);
         }
         InputStream xmlStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setValidating(true);
+        DocumentBuilderFactory factory = XmlUtil.getSecureDocumentBuilderFactory();
+        //factory.setValidating(true);
         factory.setNamespaceAware(true);
         factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage",
                 "http://www.w3.org/2001/XMLSchema");
@@ -120,14 +132,14 @@ public void fatalError(SAXParseException e) throws SAXException {
     }
 
     /**
-     * Test of isXMLFormat method, of class OpenAireExporter.
+     * Test that OpenAireExporter is an XMLExporter
      */
     @Test
     public void testIsXMLFormat() {
         System.out.println("isXMLFormat");
         OpenAireExporter instance = new OpenAireExporter();
         Boolean expResult = true;
-        Boolean result = instance.isXMLFormat();
+        Boolean result = instance instanceof XMLExporter;
         assertEquals(expResult, result);
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java b/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java
index 1ae0b9b12ca..8c8daf75df5 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java
@@ -1,26 +1,28 @@
 package edu.harvard.iq.dataverse.export;
 
-import edu.harvard.iq.dataverse.ControlledVocabularyValue;
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.branding.BrandingUtilTest;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
+import io.gdcc.spi.export.ExportDataProvider;
+import io.gdcc.spi.export.XMLExporter;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.mocks.MockDatasetFieldSvc;
 
-import static edu.harvard.iq.dataverse.util.SystemConfig.SITE_URL;
-import static edu.harvard.iq.dataverse.util.SystemConfig.FILES_HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
 import edu.harvard.iq.dataverse.util.json.JsonParser;
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.StringReader;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.sql.Timestamp;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,40 +30,270 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import java.util.logging.Logger;
+import jakarta.json.JsonObject;
+
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * For docs see {@link SchemaDotOrgExporter}.
  */
+@LocalJvmSettings
 public class SchemaDotOrgExporterTest {
 
-    private final SchemaDotOrgExporter schemaDotOrgExporter;
-    MockDatasetFieldSvc datasetFieldTypeSvc = null;
-
-    public SchemaDotOrgExporterTest() {
-        schemaDotOrgExporter = new SchemaDotOrgExporter();
-    }
+    private static final Logger logger = Logger.getLogger(SchemaDotOrgExporterTest.class.getCanonicalName());
+    private static final MockDatasetFieldSvc datasetFieldTypeSvc = new MockDatasetFieldSvc();
+    private static final SettingsServiceBean settingsService = Mockito.mock(SettingsServiceBean.class);
+    private static final LicenseServiceBean licenseService = Mockito.mock(LicenseServiceBean.class);
+    private static final DatasetTypeServiceBean datasetTypeService = Mockito.mock(DatasetTypeServiceBean.class);
+    private static final SchemaDotOrgExporter schemaDotOrgExporter = new SchemaDotOrgExporter();
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
+        BrandingUtilTest.setupMocks();
+        mockDatasetFieldSvc();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
+        BrandingUtilTest.tearDownMocks();
+    }
+
+    /**
+     * Test of exportDataset method, of class SchemaDotOrgExporter.
+     * @throws IOException
+     * @throws JsonParseException
+     * @throws ParseException
+     * 
+     */
+    @Test
+    @JvmSetting(key = JvmSettings.SITE_URL, value = "https://librascholar.org")
+    public void testExportDataset() throws JsonParseException, ParseException, IOException {
+        File datasetVersionJson = new File("src/test/resources/json/dataset-finch2.json");
+        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
+
+        JsonObject json = JsonUtil.getJsonObject(datasetVersionAsJson);
+        ExportDataProvider exportDataProviderStub = Mockito.mock(ExportDataProvider.class);
+        Mockito.when(exportDataProviderStub.getDatasetJson()).thenReturn(json);
+        
+        JsonObject json2 = createExportFromJson(exportDataProviderStub);
+        
+        assertEquals("http://schema.org", json2.getString("@context"));
+        assertEquals("Dataset", json2.getString("@type"));
+        assertEquals("https://doi.org/10.5072/FK2/IMK5A4", json2.getString("@id"));
+        assertEquals("https://doi.org/10.5072/FK2/IMK5A4", json2.getString("identifier"));
+        assertEquals("Darwin's Finches", json2.getString("name"));
+        assertEquals("Finch, Fiona", json2.getJsonArray("creator").getJsonObject(0).getString("name"));
+        assertEquals("Birds Inc.", json2.getJsonArray("creator").getJsonObject(0).getJsonObject("affiliation").getString("name"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("creator").getJsonObject(0).getString("@id"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("creator").getJsonObject(0).getString("identifier"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("creator").getJsonObject(0).getString("sameAs"));
+        assertEquals("Finch, Fiona", json2.getJsonArray("author").getJsonObject(0).getString("name"));
+        assertEquals("Birds Inc.", json2.getJsonArray("author").getJsonObject(0).getJsonObject("affiliation").getString("name"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("author").getJsonObject(0).getString("@id"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("author").getJsonObject(0).getString("identifier"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("author").getJsonObject(0).getString("sameAs"));
+        assertEquals("1955-11-05", json2.getString("datePublished"));
+        assertEquals("1955-11-05", json2.getString("dateModified"));
+        assertEquals("1", json2.getString("version"));
+        assertEquals("Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.\nBird is the word.", json2.getString("description"));
+        assertEquals("Medicine, Health and Life Sciences", json2.getJsonArray("keywords").getString(0));
+        assertEquals("tcTerm1", json2.getJsonArray("keywords").getString(1));
+        assertEquals("KeywordTerm1", json2.getJsonArray("keywords").getString(2));
+        assertEquals("KeywordTerm2", json2.getJsonArray("keywords").getString(3));
+        // This dataset, for example, has multiple keywords separated by commas: https://dataverse.harvard.edu/dataset.xhtml?persistentId=doi:10.7910/DVN/24034&version=2.0
+        assertEquals("keywords, with, commas", json2.getJsonArray("keywords").getString(4));
+        assertEquals("CreativeWork", json2.getJsonArray("citation").getJsonObject(0).getString("@type"));
+        assertEquals("Finch, Fiona 2018. \"The Finches.\" American Ornithological Journal 60 (4): 990-1005.", json2.getJsonArray("citation").getJsonObject(0).getString("name"));
+        assertEquals("https://doi.org/10.5072/FK2/RV16HK", json2.getJsonArray("citation").getJsonObject(0).getString("@id"));
+        assertEquals("https://doi.org/10.5072/FK2/RV16HK", json2.getJsonArray("citation").getJsonObject(0).getString("identifier"));
+        assertEquals("https://doi.org/10.5072/FK2/RV16HK", json2.getJsonArray("citation").getJsonObject(0).getString("url"));
+        assertEquals("2002/2005", json2.getJsonArray("temporalCoverage").getString(0));
+        assertEquals("2001-10-01/2015-11-15", json2.getJsonArray("temporalCoverage").getString(1));
+        assertEquals(null, json2.getString("schemaVersion", null));
+        assertEquals("http://creativecommons.org/publicdomain/zero/1.0/", json2.getString("license"));
+        assertEquals("DataCatalog", json2.getJsonObject("includedInDataCatalog").getString("@type"));
+        assertEquals("LibraScholar", json2.getJsonObject("includedInDataCatalog").getString("name"));
+        assertEquals("https://librascholar.org", json2.getJsonObject("includedInDataCatalog").getString("url"));
+        assertEquals("Organization", json2.getJsonObject("publisher").getString("@type"));
+        assertEquals("LibraScholar", json2.getJsonObject("publisher").getString("name"));
+        assertEquals("Organization", json2.getJsonObject("provider").getString("@type"));
+        assertEquals("LibraScholar", json2.getJsonObject("provider").getString("name"));
+        assertEquals("Organization", json2.getJsonArray("funder").getJsonObject(0).getString("@type"));
+        assertEquals("National Science Foundation", json2.getJsonArray("funder").getJsonObject(0).getString("name"));
+        // The NIH grant number is not shown because don't have anywhere in schema.org to put it. :(
+        assertEquals("National Institutes of Health", json2.getJsonArray("funder").getJsonObject(1).getString("name"));
+        assertEquals(2, json2.getJsonArray("funder").size());
+        assertEquals("Columbus, Ohio, United States, North America", json2.getJsonArray("spatialCoverage").getString(0));
+        assertEquals("Wisconsin, United States", json2.getJsonArray("spatialCoverage").getString(1));
+        assertEquals(2, json2.getJsonArray("spatialCoverage").size());
+        assertEquals("DataDownload", json2.getJsonArray("distribution").getJsonObject(0).getString("@type"));
+        assertEquals("README.md", json2.getJsonArray("distribution").getJsonObject(0).getString("name"));
+        assertEquals("text/plain", json2.getJsonArray("distribution").getJsonObject(0).getString("encodingFormat"));
+        assertEquals(1234, json2.getJsonArray("distribution").getJsonObject(0).getInt("contentSize"));
+        assertEquals("README file.", json2.getJsonArray("distribution").getJsonObject(0).getString("description"));
+        assertEquals("https://doi.org/10.5072/FK2/7V5MPI", json2.getJsonArray("distribution").getJsonObject(0).getString("@id"));
+        assertEquals("https://doi.org/10.5072/FK2/7V5MPI", json2.getJsonArray("distribution").getJsonObject(0).getString("identifier"));
+        assertEquals("https://librascholar.org/api/access/datafile/42", json2.getJsonArray("distribution").getJsonObject(0).getString("contentUrl"));
+        assertEquals(1, json2.getJsonArray("distribution").size());
+        try (PrintWriter printWriter = new PrintWriter("/tmp/dvjsonld.json")) {
+            printWriter.println(JsonUtil.prettyPrint(json2));
+        }
+        
     }
 
-    @Before
-    public void setUp() {
-        datasetFieldTypeSvc = new MockDatasetFieldSvc();
+    /**
+     * Test description truncation in exportDataset method, of class SchemaDotOrgExporter.
+     * @throws IOException
+     * @throws JsonParseException
+     * @throws ParseException
+     * 
+     */
+    @Test
+    public void testExportDescriptionTruncation() throws JsonParseException, ParseException, IOException {
+    File datasetVersionJson = new File("src/test/resources/json/dataset-long-description.json");
+    String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
+
+    JsonObject json = JsonUtil.getJsonObject(datasetVersionAsJson);
+    ExportDataProvider exportDataProviderStub = Mockito.mock(ExportDataProvider.class);
+    Mockito.when(exportDataProviderStub.getDatasetJson()).thenReturn(json);
+    
+    JsonObject json2 = createExportFromJson(exportDataProviderStub);
+
+    assertTrue(json2.getString("description").endsWith("at..."));
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS, value = "true")
+    public void testExportWithoutDownloadUrl() throws IOException, JsonParseException, ParseException {
+        File datasetVersionJson = new File("src/test/resources/json/dataset-finch2.json");
+        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
+
+        JsonObject json = JsonUtil.getJsonObject(datasetVersionAsJson);
+        ExportDataProvider exportDataProviderStub = Mockito.mock(ExportDataProvider.class);
+        Mockito.when(exportDataProviderStub.getDatasetJson()).thenReturn(json);
 
+        JsonObject json2 = createExportFromJson(exportDataProviderStub);
+
+        assertEquals("DataDownload", json2.getJsonArray("distribution").getJsonObject(0).getString("@type"));
+        assertEquals("README.md", json2.getJsonArray("distribution").getJsonObject(0).getString("name"));
+        assertFalse(json2.getJsonArray("distribution").getJsonObject(0).containsKey("contentUrl"));
+    }
+    
+    private JsonObject createExportFromJson(ExportDataProvider provider) throws JsonParseException, ParseException {
+        License license = new License("CC0 1.0", "You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.", URI.create("http://creativecommons.org/publicdomain/zero/1.0/"), URI.create("/resources/images/cc0.png"), true, 1l);
+        license.setDefault(true);
+        JsonParser jsonParser = new JsonParser(datasetFieldTypeSvc, null, settingsService, licenseService, datasetTypeService);
+        DatasetVersion version = jsonParser.parseDatasetVersion(provider.getDatasetJson().getJsonObject("datasetVersion"));
+        version.setVersionState(DatasetVersion.VersionState.RELEASED);
+        SimpleDateFormat dateFmt = new SimpleDateFormat("yyyyMMdd");
+        Date publicationDate = dateFmt.parse("19551105");
+        version.setReleaseTime(publicationDate);
+        version.setVersionNumber(1l);
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+        terms.setLicense(license);
+        version.setTermsOfUseAndAccess(terms);
+
+        Dataset dataset = new Dataset();
+        dataset.setProtocol("doi");
+        dataset.setAuthority("10.5072/FK2");
+        dataset.setIdentifier("IMK5A4");
+        dataset.setPublicationDate(new Timestamp(publicationDate.getTime()));
+        version.setDataset(dataset);
+        Dataverse dataverse = new Dataverse();
+        dataverse.setName("LibraScholar");
+        dataset.setOwner(dataverse);
+
+        FileMetadata fmd = new FileMetadata();
+        DataFile dataFile = new DataFile();
+        dataFile.setId(42l);
+        dataFile.setFilesize(1234);
+        dataFile.setContentType("text/plain");
+        dataFile.setProtocol("doi");
+        dataFile.setAuthority("10.5072/FK2");
+        dataFile.setIdentifier("7V5MPI");
+        fmd.setDatasetVersion(version);
+        fmd.setDataFile(dataFile);
+        fmd.setLabel("README.md");
+        fmd.setDescription("README file.");
+        List<FileMetadata> fileMetadatas = new ArrayList<>();
+        fileMetadatas.add(fmd);
+        dataFile.setFileMetadatas(fileMetadatas);
+        ;
+        dataFile.setOwner(dataset);
+        version.setFileMetadatas(fileMetadatas);
+
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        if(schemaDotOrgExporter == null) logger.fine("sdoe" + " null");
+        try {
+            ExportDataProvider provider2 = new InternalExportDataProvider(version);
+            schemaDotOrgExporter.exportDataset(provider2, byteArrayOutputStream);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String jsonLdStr = byteArrayOutputStream.toString();
+        return JsonUtil.getJsonObject(jsonLdStr);
+    }
+
+    /**
+     * Test of getProviderName method, of class SchemaDotOrgExporter.
+     */
+    @Test
+    public void testGetProviderName() {
+        assertEquals("schema.org", schemaDotOrgExporter.getFormatName());
+    }
+
+    /**
+     * Test of getDisplayName method, of class SchemaDotOrgExporter.
+     */
+    @Test
+    public void testGetDisplayName() {
+        // We capitalize "Schema.org" because it looks better in the dropdown list and it's what DataCite does in their UI.
+        assertEquals("Schema.org JSON-LD", schemaDotOrgExporter.getDisplayName(null));
+    }
+
+    /**
+     * Test that SchemaDotOrgExporter is not an XMLExporter
+     */
+    @Test
+    public void testIsXMLFormat() {
+        assertFalse(schemaDotOrgExporter instanceof XMLExporter);
+    }
+
+    /**
+     * Test of isHarvestable method, of class SchemaDotOrgExporter.
+     */
+    @Test
+    public void testIsHarvestable() {
+        assertFalse(schemaDotOrgExporter.isHarvestable());
+    }
+
+    /**
+     * Test of isAvailableToUsers method, of class SchemaDotOrgExporter.
+     */
+    @Test
+    public void testIsAvailableToUsers() {
+        assertTrue(schemaDotOrgExporter.isAvailableToUsers());
+    }
+
+    /**
+     * Test of XMLExporter interface, of class SchemaDotOrgExporter.
+     */
+    @Test
+    public void testNotAnXMLExporter() {
+        assertFalse(schemaDotOrgExporter instanceof XMLExporter);
+    }
+
+    private static void mockDatasetFieldSvc() {
+        datasetFieldTypeSvc.setMetadataBlock("citation");
+    
         DatasetFieldType titleType = datasetFieldTypeSvc.add(new DatasetFieldType("title", DatasetFieldType.FieldType.TEXTBOX, false));
         DatasetFieldType authorType = datasetFieldTypeSvc.add(new DatasetFieldType("author", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> authorChildTypes = new HashSet<>();
@@ -71,17 +303,17 @@ public void setUp() {
         DatasetFieldType authorIdentifierSchemeType = datasetFieldTypeSvc.add(new DatasetFieldType("authorIdentifierScheme", DatasetFieldType.FieldType.TEXT, false));
         authorIdentifierSchemeType.setAllowControlledVocabulary(true);
         authorIdentifierSchemeType.setControlledVocabularyValues(Arrays.asList(
-                // Why aren't these enforced? Should be ORCID, etc.
-                new ControlledVocabularyValue(1l, "ark", authorIdentifierSchemeType),
-                new ControlledVocabularyValue(2l, "doi", authorIdentifierSchemeType),
-                new ControlledVocabularyValue(3l, "url", authorIdentifierSchemeType)
+            // Why aren't these enforced? Should be ORCID, etc.
+            new ControlledVocabularyValue(1l, "ark", authorIdentifierSchemeType),
+            new ControlledVocabularyValue(2l, "doi", authorIdentifierSchemeType),
+            new ControlledVocabularyValue(3l, "url", authorIdentifierSchemeType)
         ));
         authorChildTypes.add(datasetFieldTypeSvc.add(authorIdentifierSchemeType));
         for (DatasetFieldType t : authorChildTypes) {
             t.setParentDatasetFieldType(authorType);
         }
         authorType.setChildDatasetFieldTypes(authorChildTypes);
-
+    
         DatasetFieldType datasetContactType = datasetFieldTypeSvc.add(new DatasetFieldType("datasetContact", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> datasetContactTypes = new HashSet<>();
         datasetContactTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("datasetContactEmail", DatasetFieldType.FieldType.TEXT, false)));
@@ -91,7 +323,7 @@ public void setUp() {
             t.setParentDatasetFieldType(datasetContactType);
         }
         datasetContactType.setChildDatasetFieldTypes(datasetContactTypes);
-
+    
         DatasetFieldType dsDescriptionType = datasetFieldTypeSvc.add(new DatasetFieldType("dsDescription", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> dsDescriptionTypes = new HashSet<>();
         dsDescriptionTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("dsDescriptionValue", DatasetFieldType.FieldType.TEXT, false)));
@@ -99,90 +331,92 @@ public void setUp() {
             t.setParentDatasetFieldType(dsDescriptionType);
         }
         dsDescriptionType.setChildDatasetFieldTypes(dsDescriptionTypes);
-
+    
         DatasetFieldType keywordType = datasetFieldTypeSvc.add(new DatasetFieldType("keyword", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> keywordChildTypes = new HashSet<>();
         keywordChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("keywordValue", DatasetFieldType.FieldType.TEXT, false)));
+        keywordChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("keywordTermURI", DatasetFieldType.FieldType.TEXT, false)));
         keywordChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("keywordVocabulary", DatasetFieldType.FieldType.TEXT, false)));
         keywordChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("keywordVocabularyURI", DatasetFieldType.FieldType.TEXT, false)));
         keywordType.setChildDatasetFieldTypes(keywordChildTypes);
-
+    
         DatasetFieldType topicClassificationType = datasetFieldTypeSvc.add(new DatasetFieldType("topicClassification", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> topicClassificationTypes = new HashSet<>();
         topicClassificationTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("topicClassValue", DatasetFieldType.FieldType.TEXT, false)));
         topicClassificationTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("topicClassVocab", DatasetFieldType.FieldType.TEXT, false)));
         topicClassificationTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("topicClassVocabURI", DatasetFieldType.FieldType.TEXT, false)));
         topicClassificationType.setChildDatasetFieldTypes(topicClassificationTypes);
-
+    
         DatasetFieldType descriptionType = datasetFieldTypeSvc.add(new DatasetFieldType("description", DatasetFieldType.FieldType.TEXTBOX, false));
-
+    
         DatasetFieldType subjectType = datasetFieldTypeSvc.add(new DatasetFieldType("subject", DatasetFieldType.FieldType.TEXT, true));
         subjectType.setAllowControlledVocabulary(true);
         subjectType.setControlledVocabularyValues(Arrays.asList(
-                new ControlledVocabularyValue(1l, "mgmt", subjectType),
-                new ControlledVocabularyValue(2l, "law", subjectType),
-                new ControlledVocabularyValue(3l, "cs", subjectType)
+            new ControlledVocabularyValue(1l, "mgmt", subjectType),
+            new ControlledVocabularyValue(2l, "law", subjectType),
+            new ControlledVocabularyValue(3l, "cs", subjectType)
         ));
-
+    
         DatasetFieldType pubIdType = datasetFieldTypeSvc.add(new DatasetFieldType("publicationIdType", DatasetFieldType.FieldType.TEXT, false));
         pubIdType.setAllowControlledVocabulary(true);
         pubIdType.setControlledVocabularyValues(Arrays.asList(
-                new ControlledVocabularyValue(1l, "ark", pubIdType),
-                new ControlledVocabularyValue(2l, "doi", pubIdType),
-                new ControlledVocabularyValue(3l, "url", pubIdType)
+            new ControlledVocabularyValue(1l, "ark", pubIdType),
+            new ControlledVocabularyValue(2l, "doi", pubIdType),
+            new ControlledVocabularyValue(3l, "url", pubIdType)
         ));
-
+    
         DatasetFieldType compoundSingleType = datasetFieldTypeSvc.add(new DatasetFieldType("coordinate", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> childTypes = new HashSet<>();
         childTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("lat", DatasetFieldType.FieldType.TEXT, false)));
         childTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("lon", DatasetFieldType.FieldType.TEXT, false)));
-
+    
         for (DatasetFieldType t : childTypes) {
             t.setParentDatasetFieldType(compoundSingleType);
         }
         compoundSingleType.setChildDatasetFieldTypes(childTypes);
-
+    
         DatasetFieldType contributorType = datasetFieldTypeSvc.add(new DatasetFieldType("contributor", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> contributorChildTypes = new HashSet<>();
         contributorChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("contributorName", DatasetFieldType.FieldType.TEXT, false)));
         DatasetFieldType contributorTypes = datasetFieldTypeSvc.add(new DatasetFieldType("contributorType", DatasetFieldType.FieldType.TEXT, false));
         contributorTypes.setAllowControlledVocabulary(true);
         contributorTypes.setControlledVocabularyValues(Arrays.asList(
-                // Why aren't these enforced?
-                new ControlledVocabularyValue(1l, "Data Collector", contributorTypes),
-                new ControlledVocabularyValue(2l, "Data Curator", contributorTypes),
-                new ControlledVocabularyValue(3l, "Data Manager", contributorTypes),
-                new ControlledVocabularyValue(3l, "Editor", contributorTypes),
-                new ControlledVocabularyValue(3l, "Funder", contributorTypes),
-                new ControlledVocabularyValue(3l, "Hosting Institution", contributorTypes)
-        // Etc. There are more.
+            // Why aren't these enforced?
+            new ControlledVocabularyValue(1l, "Data Collector", contributorTypes),
+            new ControlledVocabularyValue(2l, "Data Curator", contributorTypes),
+            new ControlledVocabularyValue(3l, "Data Manager", contributorTypes),
+            new ControlledVocabularyValue(3l, "Editor", contributorTypes),
+            new ControlledVocabularyValue(3l, "Funder", contributorTypes),
+            new ControlledVocabularyValue(3l, "Hosting Institution", contributorTypes)
+            // Etc. There are more.
         ));
         contributorChildTypes.add(datasetFieldTypeSvc.add(contributorTypes));
         for (DatasetFieldType t : contributorChildTypes) {
             t.setParentDatasetFieldType(contributorType);
         }
         contributorType.setChildDatasetFieldTypes(contributorChildTypes);
-
+    
         DatasetFieldType grantNumberType = datasetFieldTypeSvc.add(new DatasetFieldType("grantNumber", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> grantNumberChildTypes = new HashSet<>();
         grantNumberChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("grantNumberAgency", DatasetFieldType.FieldType.TEXT, false)));
         grantNumberChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("grantNumberValue", DatasetFieldType.FieldType.TEXT, false)));
         grantNumberType.setChildDatasetFieldTypes(grantNumberChildTypes);
-
+    
         DatasetFieldType publicationType = datasetFieldTypeSvc.add(new DatasetFieldType("publication", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> publicationChildTypes = new HashSet<>();
         publicationChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("publicationCitation", DatasetFieldType.FieldType.TEXT, false)));
         DatasetFieldType publicationIdTypes = datasetFieldTypeSvc.add(new DatasetFieldType("publicationIDType", DatasetFieldType.FieldType.TEXT, false));
         publicationIdTypes.setAllowControlledVocabulary(true);
         publicationIdTypes.setControlledVocabularyValues(Arrays.asList(
-                // Why aren't these enforced?
-                new ControlledVocabularyValue(1l, "ark", publicationIdTypes),
-                new ControlledVocabularyValue(2l, "arXiv", publicationIdTypes),
-                new ControlledVocabularyValue(3l, "bibcode", publicationIdTypes),
-                new ControlledVocabularyValue(4l, "doi", publicationIdTypes),
-                new ControlledVocabularyValue(5l, "ean13", publicationIdTypes),
-                new ControlledVocabularyValue(6l, "handle", publicationIdTypes)
-        // Etc. There are more.
+            // Why aren't these enforced?
+            new ControlledVocabularyValue(1l, "ark", publicationIdTypes),
+            new ControlledVocabularyValue(2l, "arXiv", publicationIdTypes),
+            new ControlledVocabularyValue(3l, "bibcode", publicationIdTypes),
+            new ControlledVocabularyValue(4l, "cstr", publicationIdTypes),
+            new ControlledVocabularyValue(5l, "doi", publicationIdTypes),
+            new ControlledVocabularyValue(6l, "ean13", publicationIdTypes),
+            new ControlledVocabularyValue(7l, "handle", publicationIdTypes)
+            // Etc. There are more.
         ));
         publicationChildTypes.add(datasetFieldTypeSvc.add(publicationIdTypes));
         publicationChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("publicationIDNumber", DatasetFieldType.FieldType.TEXT, false)));
@@ -190,22 +424,22 @@ public void setUp() {
         publicationURLType.setDisplayFormat("<a href=\"#VALUE\" target=\"_blank\">#VALUE</a>");
         publicationChildTypes.add(datasetFieldTypeSvc.add(publicationURLType));
         publicationType.setChildDatasetFieldTypes(publicationChildTypes);
-
+    
         DatasetFieldType timePeriodCoveredType = datasetFieldTypeSvc.add(new DatasetFieldType("timePeriodCovered", DatasetFieldType.FieldType.NONE, true));
         Set<DatasetFieldType> timePeriodCoveredChildTypes = new HashSet<>();
         timePeriodCoveredChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("timePeriodCoveredStart", DatasetFieldType.FieldType.DATE, false)));
         timePeriodCoveredChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("timePeriodCoveredEnd", DatasetFieldType.FieldType.DATE, false)));
         timePeriodCoveredType.setChildDatasetFieldTypes(timePeriodCoveredChildTypes);
-
+    
         DatasetFieldType geographicCoverageType = datasetFieldTypeSvc.add(new DatasetFieldType("geographicCoverage", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> geographicCoverageChildTypes = new HashSet<>();
         DatasetFieldType countries = datasetFieldTypeSvc.add(new DatasetFieldType("country", DatasetFieldType.FieldType.TEXT, false));
         countries.setAllowControlledVocabulary(true);
         countries.setControlledVocabularyValues(Arrays.asList(
-                // Why aren't these enforced?
-                new ControlledVocabularyValue(1l, "Afghanistan", countries),
-                new ControlledVocabularyValue(2l, "Albania", countries)
-        // And many more countries.
+            // Why aren't these enforced?
+            new ControlledVocabularyValue(1l, "Afghanistan", countries),
+            new ControlledVocabularyValue(2l, "Albania", countries)
+            // And many more countries.
         ));
         geographicCoverageChildTypes.add(datasetFieldTypeSvc.add(countries));
         geographicCoverageChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("state", DatasetFieldType.FieldType.TEXT, false)));
@@ -216,239 +450,6 @@ public void setUp() {
             t.setParentDatasetFieldType(geographicCoverageType);
         }
         geographicCoverageType.setChildDatasetFieldTypes(geographicCoverageChildTypes);
-
-    }
-
-    @After
-    public void tearDown() {
-    }
-
-    /**
-     * Test of exportDataset method, of class SchemaDotOrgExporter.
-     */
-    @Test
-    public void testExportDataset() throws Exception {
-        System.out.println("exportDataset");
-        File datasetVersionJson = new File("src/test/resources/json/dataset-finch2.json");
-        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
-
-        JsonReader jsonReader1 = Json.createReader(new StringReader(datasetVersionAsJson));
-        JsonObject json1 = jsonReader1.readObject();
-        JsonParser jsonParser = new JsonParser(datasetFieldTypeSvc, null, null);
-        DatasetVersion version = jsonParser.parseDatasetVersion(json1.getJsonObject("datasetVersion"));
-        version.setVersionState(DatasetVersion.VersionState.RELEASED);
-        SimpleDateFormat dateFmt = new SimpleDateFormat("yyyyMMdd");
-        Date publicationDate = dateFmt.parse("19551105");
-        version.setReleaseTime(publicationDate);
-        version.setVersionNumber(1l);
-        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
-        terms.setLicense(TermsOfUseAndAccess.License.CC0);
-        version.setTermsOfUseAndAccess(terms);
-
-        Dataset dataset = new Dataset();
-        dataset.setProtocol("doi");
-        dataset.setAuthority("10.5072/FK2");
-        dataset.setIdentifier("IMK5A4");
-        dataset.setPublicationDate(new Timestamp(publicationDate.getTime()));
-        version.setDataset(dataset);
-        Dataverse dataverse = new Dataverse();
-        dataverse.setName("LibraScholar");
-        dataset.setOwner(dataverse);
-        System.setProperty(SITE_URL, "https://librascholar.org");
-        boolean hideFileUrls = false;
-        if (hideFileUrls) {
-            System.setProperty(FILES_HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS, "true");
-        }
-
-        FileMetadata fmd = new FileMetadata();
-        DataFile dataFile = new DataFile();
-        dataFile.setId(42l);
-        dataFile.setFilesize(1234);
-        dataFile.setContentType("text/plain");
-        dataFile.setProtocol("doi");
-        dataFile.setAuthority("10.5072/FK2");
-        dataFile.setIdentifier("7V5MPI");
-        fmd.setDatasetVersion(version);
-        fmd.setDataFile(dataFile);
-        fmd.setLabel("README.md");
-        fmd.setDescription("README file.");
-        List<FileMetadata> fileMetadatas = new ArrayList<>();
-        fileMetadatas.add(fmd);
-        dataFile.setFileMetadatas(fileMetadatas);;
-        dataFile.setOwner(dataset);
-        version.setFileMetadatas(fileMetadatas);
-
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        schemaDotOrgExporter.exportDataset(version, json1, byteArrayOutputStream);
-        String jsonLd = byteArrayOutputStream.toString();
-        String prettyJson = JsonUtil.prettyPrint(jsonLd);
-        System.out.println("schema.org JSON-LD: " + prettyJson);
-        JsonReader jsonReader2 = Json.createReader(new StringReader(jsonLd));
-        JsonObject json2 = jsonReader2.readObject();
-        assertEquals("http://schema.org", json2.getString("@context"));
-        assertEquals("Dataset", json2.getString("@type"));
-        assertEquals("https://doi.org/10.5072/FK2/IMK5A4", json2.getString("@id"));
-        assertEquals("https://doi.org/10.5072/FK2/IMK5A4", json2.getString("identifier"));
-        assertEquals("Darwin's Finches", json2.getString("name"));
-        assertEquals("Finch, Fiona", json2.getJsonArray("creator").getJsonObject(0).getString("name"));
-        assertEquals("Birds Inc.", json2.getJsonArray("creator").getJsonObject(0).getString("affiliation"));
-        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("creator").getJsonObject(0).getString("@id"));
-        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("creator").getJsonObject(0).getString("identifier"));
-        assertEquals("Finch, Fiona", json2.getJsonArray("author").getJsonObject(0).getString("name"));
-        assertEquals("Birds Inc.", json2.getJsonArray("author").getJsonObject(0).getString("affiliation"));
-        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("author").getJsonObject(0).getString("@id"));
-        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("author").getJsonObject(0).getString("identifier"));
-        assertEquals("1955-11-05", json2.getString("datePublished"));
-        assertEquals("1955-11-05", json2.getString("dateModified"));
-        assertEquals("1", json2.getString("version"));
-        assertEquals("Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.", json2.getJsonArray("description").getString(0));
-        assertEquals("Bird is the word.", json2.getJsonArray("description").getString(1));
-        assertEquals(2, json2.getJsonArray("description").size());
-        assertEquals("Medicine, Health and Life Sciences", json2.getJsonArray("keywords").getString(0));
-        assertEquals("tcTerm1", json2.getJsonArray("keywords").getString(1));
-        assertEquals("KeywordTerm1", json2.getJsonArray("keywords").getString(2));
-        assertEquals("KeywordTerm2", json2.getJsonArray("keywords").getString(3));
-        // This dataset, for example, has multiple keywords separated by commas: https://dataverse.harvard.edu/dataset.xhtml?persistentId=doi:10.7910/DVN/24034&version=2.0
-        assertEquals("keywords, with, commas", json2.getJsonArray("keywords").getString(4));
-        assertEquals("CreativeWork", json2.getJsonArray("citation").getJsonObject(0).getString("@type"));
-        assertEquals("Finch, Fiona 2018. \"The Finches.\" American Ornithological Journal 60 (4): 990-1005.", json2.getJsonArray("citation").getJsonObject(0).getString("text"));
-        assertEquals("https://doi.org/10.5072/FK2/RV16HK", json2.getJsonArray("citation").getJsonObject(0).getString("@id"));
-        assertEquals("https://doi.org/10.5072/FK2/RV16HK", json2.getJsonArray("citation").getJsonObject(0).getString("identifier"));
-        assertEquals("2002/2005", json2.getJsonArray("temporalCoverage").getString(0));
-        assertEquals("2001-10-01/2015-11-15", json2.getJsonArray("temporalCoverage").getString(1));
-        assertEquals(null, json2.getString("schemaVersion", null));
-        assertEquals("Dataset", json2.getJsonObject("license").getString("@type"));
-        assertEquals("CC0", json2.getJsonObject("license").getString("text"));
-        assertEquals("https://creativecommons.org/publicdomain/zero/1.0/", json2.getJsonObject("license").getString("url"));
-        assertEquals("DataCatalog", json2.getJsonObject("includedInDataCatalog").getString("@type"));
-        assertEquals("LibraScholar", json2.getJsonObject("includedInDataCatalog").getString("name"));
-        assertEquals("https://librascholar.org", json2.getJsonObject("includedInDataCatalog").getString("url"));
-        assertEquals("Organization", json2.getJsonObject("publisher").getString("@type"));
-        assertEquals("LibraScholar", json2.getJsonObject("provider").getString("name"));
-        assertEquals("Organization", json2.getJsonObject("provider").getString("@type"));
-        assertEquals("LibraScholar", json2.getJsonObject("provider").getString("name"));
-        assertEquals("Organization", json2.getJsonArray("funder").getJsonObject(0).getString("@type"));
-        assertEquals("National Science Foundation", json2.getJsonArray("funder").getJsonObject(0).getString("name"));
-        // The NIH grant number is not shown because don't have anywhere in schema.org to put it. :(
-        assertEquals("National Institutes of Health", json2.getJsonArray("funder").getJsonObject(1).getString("name"));
-        assertEquals(2, json2.getJsonArray("funder").size());
-        assertEquals("Columbus, Ohio, United States, North America", json2.getJsonArray("spatialCoverage").getString(0));
-        assertEquals("Wisconsin, United States", json2.getJsonArray("spatialCoverage").getString(1));
-        assertEquals(2, json2.getJsonArray("spatialCoverage").size());
-        assertEquals("DataDownload", json2.getJsonArray("distribution").getJsonObject(0).getString("@type"));
-        assertEquals("README.md", json2.getJsonArray("distribution").getJsonObject(0).getString("name"));
-        assertEquals("text/plain", json2.getJsonArray("distribution").getJsonObject(0).getString("fileFormat"));
-        assertEquals(1234, json2.getJsonArray("distribution").getJsonObject(0).getInt("contentSize"));
-        assertEquals("README file.", json2.getJsonArray("distribution").getJsonObject(0).getString("description"));
-        assertEquals("https://doi.org/10.5072/FK2/7V5MPI", json2.getJsonArray("distribution").getJsonObject(0).getString("@id"));
-        assertEquals("https://doi.org/10.5072/FK2/7V5MPI", json2.getJsonArray("distribution").getJsonObject(0).getString("identifier"));
-        assertEquals("https://librascholar.org/api/access/datafile/42", json2.getJsonArray("distribution").getJsonObject(0).getString("contentUrl"));
-        assertEquals(1, json2.getJsonArray("distribution").size());
-        try (PrintWriter printWriter = new PrintWriter("/tmp/dvjsonld.json")) {
-            printWriter.println(prettyJson);
-        }
-    }
-
-    /**
-     * Test of getProviderName method, of class SchemaDotOrgExporter.
-     */
-    @Test
-    public void testGetProviderName() {
-        System.out.println("getProviderName");
-        assertEquals("schema.org", schemaDotOrgExporter.getProviderName());
-    }
-
-    /**
-     * Test of getDisplayName method, of class SchemaDotOrgExporter.
-     */
-    @Test
-    public void testGetDisplayName() {
-        System.out.println("getDisplayName");
-        // We capitalize "Schema.org" because it looks better in the dropdown list and it's what DataCite does in their UI.
-        assertEquals("Schema.org JSON-LD", schemaDotOrgExporter.getDisplayName());
-    }
-
-    /**
-     * Test of isXMLFormat method, of class SchemaDotOrgExporter.
-     */
-    @Test
-    public void testIsXMLFormat() {
-        System.out.println("isXMLFormat");
-        assertEquals(false, schemaDotOrgExporter.isXMLFormat());
-    }
-
-    /**
-     * Test of isHarvestable method, of class SchemaDotOrgExporter.
-     */
-    @Test
-    public void testIsHarvestable() {
-        System.out.println("isHarvestable");
-        assertEquals(false, schemaDotOrgExporter.isHarvestable());
-    }
-
-    /**
-     * Test of isAvailableToUsers method, of class SchemaDotOrgExporter.
-     */
-    @Test
-    public void testIsAvailableToUsers() {
-        System.out.println("isAvailableToUsers");
-        assertEquals(true, schemaDotOrgExporter.isAvailableToUsers());
-    }
-
-    /**
-     * Test of getXMLNameSpace method, of class SchemaDotOrgExporter.
-     */
-    @Test
-    public void testGetXMLNameSpace() throws Exception {
-        System.out.println("getXMLNameSpace");
-        ExportException expectedException = null;
-        try {
-            String result = schemaDotOrgExporter.getXMLNameSpace();
-        } catch (ExportException ex) {
-            expectedException = ex;
-        }
-        assertEquals(SchemaDotOrgExporter.class.getSimpleName() + ": not an XML format.", expectedException.getMessage());
-    }
-
-    /**
-     * Test of getXMLSchemaLocation method, of class SchemaDotOrgExporter.
-     */
-    @Test
-    public void testGetXMLSchemaLocation() throws Exception {
-        System.out.println("getXMLSchemaLocation");
-        ExportException expectedException = null;
-        try {
-            String result = schemaDotOrgExporter.getXMLSchemaLocation();
-        } catch (ExportException ex) {
-            expectedException = ex;
-        }
-        assertEquals(SchemaDotOrgExporter.class.getSimpleName() + ": not an XML format.", expectedException.getMessage());
-    }
-
-    /**
-     * Test of getXMLSchemaVersion method, of class SchemaDotOrgExporter.
-     */
-    @Test
-    public void testGetXMLSchemaVersion() throws Exception {
-        System.out.println("getXMLSchemaVersion");
-        ExportException expectedException = null;
-        try {
-            String result = schemaDotOrgExporter.getXMLSchemaVersion();
-        } catch (ExportException ex) {
-            expectedException = ex;
-        }
-        assertEquals(SchemaDotOrgExporter.class.getSimpleName() + ": not an XML format.", expectedException.getMessage());
-    }
-
-    /**
-     * Test of setParam method, of class SchemaDotOrgExporter.
-     */
-    @Test
-    public void testSetParam() {
-        System.out.println("setParam");
-        String name = "";
-        Object value = null;
-        schemaDotOrgExporter.setParam(name, value);
     }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults-multiple-geo.txt b/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults-multiple-geo.txt
new file mode 100644
index 00000000000..3ea20dcff42
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults-multiple-geo.txt
@@ -0,0 +1,1564 @@
+{
+  "id": 12,
+  "identifier": "OZDVXX",
+  "persistentUrl": "https://doi.org/10.5072/FK2/OZDVXX",
+  "protocol": "doi",
+  "authority": "10.5072/FK2",
+  "publisher": "Open Source Publisher",
+  "datasetVersion": {
+    "id": 1,
+    "versionNumber": 1,
+    "versionMinorNumber": 0,
+    "versionState": "RELEASED",
+    "productionDate": "Production Date",
+    "lastUpdateTime": "2015-09-29T17:47:35Z",
+    "releaseTime": "2015-09-29T17:47:35Z",
+    "createTime": "2015-09-24T16:47:50Z",
+    "license": {
+          "name": "CC0 1.0",
+          "uri": "http://creativecommons.org/publicdomain/zero/1.0/"
+        },
+    "metadataBlocks": {
+      "citation": {
+        "displayName": "Citation Metadata",
+        "fields": [
+          {
+            "multiple": true,
+            "typeClass": "primitive",
+            "typeName": "language",
+            "value": [ "it" ]
+          },
+          {
+            "typeName": "title",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Replication Data for: Title"
+          },
+          {
+            "typeName": "subtitle",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Subtitle"
+          },
+          {
+            "typeName": "alternativeTitle",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": ["Alternative Title"]
+          },
+          {
+            "typeName": "alternativeURL",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "http://AlternativeURL.org"
+          },
+          {
+            "typeName": "otherId",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "otherIdAgency": {
+                  "typeName": "otherIdAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDAgency1"
+                },
+                "otherIdValue": {
+                  "typeName": "otherIdValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDIdentifier1"
+                }
+              },
+              {
+                "otherIdAgency": {
+                  "typeName": "otherIdAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDAgency2"
+                },
+                "otherIdValue": {
+                  "typeName": "otherIdValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDIdentifier2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "author",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "authorName": {
+                  "typeName": "authorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastAuthor1, FirstAuthor1"
+                },
+                "authorAffiliation": {
+                  "typeName": "authorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "AuthorAffiliation1"
+                },
+                "authorIdentifierScheme": {
+                  "typeName": "authorIdentifierScheme",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "ORCID"
+                },
+                "authorIdentifier": {
+                  "typeName": "authorIdentifier",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "AuthorIdentifier1"
+                }
+              },
+              {
+                "authorName": {
+                  "typeName": "authorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastAuthor2, FirstAuthor2"
+                },
+                "authorAffiliation": {
+                  "typeName": "authorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "AuthorAffiliation2"
+                },
+                "authorIdentifierScheme": {
+                  "typeName": "authorIdentifierScheme",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "ISNI"
+                },
+                "authorIdentifier": {
+                  "typeName": "authorIdentifier",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "AuthorIdentifier2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "datasetContact",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "datasetContactName": {
+                  "typeName": "datasetContactName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContact1, FirstContact1"
+                },
+                "datasetContactAffiliation": {
+                  "typeName": "datasetContactAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactAffiliation1"
+                },
+                "datasetContactEmail": {
+                  "typeName": "datasetContactEmail",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactEmail1@mailinator.com"
+                }
+              },
+              {
+                "datasetContactName": {
+                  "typeName": "datasetContactName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Condon, Kevin"
+                },
+                "datasetContactAffiliation": {
+                  "typeName": "datasetContactAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactAffiliation2"
+                },
+                "datasetContactEmail": {
+                  "typeName": "datasetContactEmail",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactEmail2@mailinator.com"
+                }
+              },
+              {
+                "datasetContactName": {
+                  "typeName": "datasetContactName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Philip Durbin"
+                },
+                "datasetContactAffiliation": {
+                  "typeName": "datasetContactAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactAffiliation3"
+                },
+                "datasetContactEmail": {
+                  "typeName": "datasetContactEmail",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactEmail2@mailinator.com"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "dsDescription",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "dsDescriptionValue": {
+                  "typeName": "dsDescriptionValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DescriptionText 1"
+                },
+                "dsDescriptionDate": {
+                  "typeName": "dsDescriptionDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1000-01-01"
+                }
+              },
+              {
+                "dsDescriptionValue": {
+                  "typeName": "dsDescriptionValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DescriptionText2"
+                },
+                "dsDescriptionDate": {
+                  "typeName": "dsDescriptionDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1000-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "subject",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Agricultural Sciences",
+              "Business and Management",
+              "Engineering",
+              "Law"
+            ]
+          },
+          {
+            "typeName": "keyword",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordTerm1"
+                },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordVocabulary1"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://KeywordVocabularyURL1.org"
+                }
+              },
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordTerm2"
+                },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI2.org"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordVocabulary2"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://KeywordVocabularyURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "publication",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "publicationRelationType": {
+                  "typeName": "publicationRelationType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "IsSupplementTo"
+                },
+                "publicationCitation": {
+                  "typeName": "publicationCitation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationCitation1"
+                },
+                "publicationIDType": {
+                  "typeName": "publicationIDType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "ark"
+                },
+                "publicationIDNumber": {
+                  "typeName": "publicationIDNumber",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationIDNumber1"
+                },
+                "publicationURL": {
+                  "typeName": "publicationURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://RelatedPublicationURL1.org"
+                }
+              },
+              {
+                "publicationCitation": {
+                  "typeName": "publicationCitation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationCitation2"
+                },
+                "publicationIDType": {
+                  "typeName": "publicationIDType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "arXiv"
+                },
+                "publicationIDNumber": {
+                  "typeName": "publicationIDNumber",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationIDNumber2"
+                },
+                "publicationURL": {
+                  "typeName": "publicationURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://RelatedPublicationURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "notesText",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Notes1"
+          },
+          {
+            "typeName": "producer",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "producerName": {
+                  "typeName": "producerName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastProducer1, FirstProducer1"
+                },
+                "producerAffiliation": {
+                  "typeName": "producerAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAffiliation1"
+                },
+                "producerAbbreviation": {
+                  "typeName": "producerAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAbbreviation1"
+                },
+                "producerURL": {
+                  "typeName": "producerURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerURL1.org"
+                },
+                "producerLogoURL": {
+                  "typeName": "producerLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerLogoURL1.org"
+                }
+              },
+              {
+                "producerName": {
+                  "typeName": "producerName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastProducer2, FirstProducer2"
+                },
+                "producerAffiliation": {
+                  "typeName": "producerAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAffiliation2"
+                },
+                "producerAbbreviation": {
+                  "typeName": "producerAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAbbreviation2"
+                },
+                "producerURL": {
+                  "typeName": "producerURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerURL2.org"
+                },
+                "producerLogoURL": {
+                  "typeName": "producerLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerLogoURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "productionDate",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "1003-01-01"
+          },
+          {
+            "typeName": "productionPlace",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+                "University of Stuttgart",
+                "University of Vienna"
+            ]
+          },
+          {
+            "typeName": "contributor",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Data Collector"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContributor1, FirstContributor1"
+                }
+              },
+              {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Data Curator"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContributor2, FirstContributor2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "grantNumber",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "grantNumberAgency": {
+                  "typeName": "grantNumberAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantAgency1"
+                },
+                "grantNumberValue": {
+                  "typeName": "grantNumberValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantNumber1"
+                }
+              },
+              {
+                "grantNumberAgency": {
+                  "typeName": "grantNumberAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantAgency2"
+                },
+                "grantNumberValue": {
+                  "typeName": "grantNumberValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantNumber2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "distributor",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "distributorName": {
+                  "typeName": "distributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastDistributor1, FirstDistributor1"
+                },
+                "distributorAffiliation": {
+                  "typeName": "distributorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAffiliation1"
+                },
+                "distributorAbbreviation": {
+                  "typeName": "distributorAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAbbreviation1"
+                },
+                "distributorURL": {
+                  "typeName": "distributorURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorURL1.org"
+                },
+                "distributorLogoURL": {
+                  "typeName": "distributorLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorLogoURL1.org"
+                }
+              },
+              {
+                "distributorName": {
+                  "typeName": "distributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastDistributor2, FirstDistributor2"
+                },
+                "distributorAffiliation": {
+                  "typeName": "distributorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAffiliation2"
+                },
+                "distributorAbbreviation": {
+                  "typeName": "distributorAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAbbreviation2"
+                },
+                "distributorURL": {
+                  "typeName": "distributorURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorURL2.org"
+                },
+                "distributorLogoURL": {
+                  "typeName": "distributorLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorLogoURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "distributionDate",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "1004-01-01"
+          },
+          {
+            "typeName": "depositor",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "LastDepositor, FirstDepositor"
+          },
+          {
+            "typeName": "dateOfDeposit",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "1002-01-01"
+          },
+          {
+            "typeName": "timePeriodCovered",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "timePeriodCoveredStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-01-01"
+                },
+                "timePeriodCoveredEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-01-02"
+                }
+              },
+              {
+                "timePeriodCoveredStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-02-01"
+                },
+                "timePeriodCoveredEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "dateOfCollection",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "dateOfCollectionStart": {
+                  "typeName": "dateOfCollectionStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-01-01"
+                },
+                "dateOfCollectionEnd": {
+                  "typeName": "dateOfCollectionEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-01-01"
+                }
+              },
+              {
+                "dateOfCollectionStart": {
+                  "typeName": "dateOfCollectionStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-02-01"
+                },
+                "dateOfCollectionEnd": {
+                  "typeName": "dateOfCollectionEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "kindOfData",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "KindOfData1",
+              "KindOfData2"
+            ]
+          },
+          {
+            "typeName": "series",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+              "seriesName": {
+                "typeName": "seriesName",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "SeriesName"
+              },
+              "seriesInformation": {
+                "typeName": "seriesInformation",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "SeriesInformation"
+              }
+            }
+            ]
+          },
+          {
+            "typeName": "software",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "softwareName": {
+                  "typeName": "softwareName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareName1"
+                },
+                "softwareVersion": {
+                  "typeName": "softwareVersion",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareVersion1"
+                }
+              },
+              {
+                "softwareName": {
+                  "typeName": "softwareName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareName2"
+                },
+                "softwareVersion": {
+                  "typeName": "softwareVersion",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareVersion2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "relatedMaterial",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "RelatedMaterial1",
+              "RelatedMaterial2"
+            ]
+          },
+          {
+            "typeName": "relatedDatasets",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "RelatedDatasets1",
+              "RelatedDatasets2"
+            ]
+          },
+          {
+            "typeName": "otherReferences",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "OtherReferences1",
+              "OtherReferences2"
+            ]
+          },
+          {
+            "typeName": "dataSources",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "DataSources1",
+              "DataSources2"
+            ]
+          },
+          {
+            "typeName": "originOfSources",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "OriginOfSources"
+          },
+          {
+            "typeName": "characteristicOfSources",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CharacteristicOfSourcesNoted"
+          },
+          {
+            "typeName": "accessToSources",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "DocumentationAndAccessToSources"
+          }
+        ]
+      },
+      "geospatial": {
+        "displayName": "Geospatial Metadata",
+        "fields": [
+          {
+            "typeName": "geographicCoverage",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Afghanistan"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageStateProvince1"
+                },
+                "city": {
+                  "typeName": "city",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageCity1"
+                },
+                "otherGeographicCoverage": {
+                  "typeName": "otherGeographicCoverage",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageOther1"
+                }
+              },
+              {
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Albania"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageStateProvince2"
+                },
+                "city": {
+                  "typeName": "city",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageCity2"
+                },
+                "otherGeographicCoverage": {
+                  "typeName": "otherGeographicCoverage",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageOther2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "geographicUnit",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "GeographicUnit1",
+              "GeographicUnit2"
+            ]
+          },
+          {
+            "typeName": "geographicBoundingBox",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "westLongitude": {
+                  "typeName": "westLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "10"
+                },
+                "eastLongitude": {
+                  "typeName": "eastLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "20"
+                },
+                "northLatitude": {
+                  "typeName": "northLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "30"
+                },
+                "southLatitude": {
+                  "typeName": "southLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "40"
+                }
+              },
+              {
+                "westLongitude": {
+                  "typeName": "westLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "50"
+                },
+                "eastLongitude": {
+                  "typeName": "eastLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "60"
+                },
+                "northLatitude": {
+                  "typeName": "northLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "70"
+                },
+                "southLatitude": {
+                  "typeName": "southLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "80"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "socialscience": {
+        "displayName": "Social Science and Humanities Metadata",
+        "fields": [
+          {
+            "typeName": "unitOfAnalysis",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "UnitOfAnalysis1",
+              "UnitOfAnalysis2"
+            ]
+          },
+          {
+            "typeName": "universe",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Universe1",
+              "Universe2"
+            ]
+          },
+          {
+            "typeName": "timeMethod",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "TimeMethod"
+          },
+          {
+            "typeName": "dataCollector",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "LastDataCollector1, FirstDataCollector1"
+          },
+          {
+            "typeName": "collectorTraining",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CollectorTraining"
+          },
+          {
+            "typeName": "frequencyOfDataCollection",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Frequency"
+          },
+          {
+            "typeName": "samplingProcedure",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "SamplingProcedure"
+          },
+          {
+            "typeName": "targetSampleSize",
+            "multiple": false,
+            "typeClass": "compound",
+            "value": {
+              "targetSampleActualSize": {
+                "typeName": "targetSampleActualSize",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "100"
+              },
+              "targetSampleSizeFormula": {
+                "typeName": "targetSampleSizeFormula",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "TargetSampleSizeFormula"
+              }
+            }
+          },
+          {
+            "typeName": "deviationsFromSampleDesign",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "MajorDeviationsForSampleDesign"
+          },
+          {
+            "typeName": "collectionMode",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CollectionMode"
+          },
+          {
+            "typeName": "researchInstrument",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "TypeOfResearchInstrument"
+          },
+          {
+            "typeName": "dataCollectionSituation",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CharacteristicsOfDataCollectionSituation"
+          },
+          {
+            "typeName": "actionsToMinimizeLoss",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "ActionsToMinimizeLosses"
+          },
+          {
+            "typeName": "controlOperations",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "ControlOperations"
+          },
+          {
+            "typeName": "weighting",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Weighting"
+          },
+          {
+            "typeName": "cleaningOperations",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CleaningOperations"
+          },
+          {
+            "typeName": "datasetLevelErrorNotes",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "StudyLevelErrorNotes"
+          },
+          {
+            "typeName": "responseRate",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "ResponseRate"
+          },
+          {
+            "typeName": "samplingErrorEstimates",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "EstimatesOfSamplingError"
+          },
+          {
+            "typeName": "otherDataAppraisal",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "OtherFormsOfDataAppraisal"
+          },
+          {
+            "typeName": "socialScienceNotes",
+            "multiple": false,
+            "typeClass": "compound",
+            "value": {
+              "socialScienceNotesType": {
+                "typeName": "socialScienceNotesType",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "NotesType"
+              },
+              "socialScienceNotesSubject": {
+                "typeName": "socialScienceNotesSubject",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "NotesSubject"
+              },
+              "socialScienceNotesText": {
+                "typeName": "socialScienceNotesText",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "NotesText"
+              }
+            }
+          }
+        ]
+      },
+      "astrophysics": {
+        "displayName": "Astronomy and Astrophysics Metadata",
+        "fields": [
+          {
+            "typeName": "astroType",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Image",
+              "Mosaic",
+              "EventList",
+              "Cube"
+            ]
+          },
+          {
+            "typeName": "astroFacility",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Facility1",
+              "Facility2"
+            ]
+          },
+          {
+            "typeName": "astroInstrument",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Instrument1",
+              "Instrument2"
+            ]
+          },
+          {
+            "typeName": "astroObject",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Object1",
+              "Object2"
+            ]
+          },
+          {
+            "typeName": "resolution.Spatial",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "SpatialResolution"
+          },
+          {
+            "typeName": "resolution.Spectral",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "SpectralResolution"
+          },
+          {
+            "typeName": "resolution.Temporal",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "TimeResolution"
+          },
+          {
+            "typeName": "coverage.Spectral.Bandpass",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Bandpass1",
+              "Bandpass2"
+            ]
+          },
+          {
+            "typeName": "coverage.Spectral.CentralWavelength",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "3001",
+              "3002"
+            ]
+          },
+          {
+            "typeName": "coverage.Spectral.Wavelength",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "coverage.Spectral.MinimumWavelength": {
+                  "typeName": "coverage.Spectral.MinimumWavelength",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "4001"
+                },
+                "coverage.Spectral.MaximumWavelength": {
+                  "typeName": "coverage.Spectral.MaximumWavelength",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "4002"
+                }
+              },
+              {
+                "coverage.Spectral.MinimumWavelength": {
+                  "typeName": "coverage.Spectral.MinimumWavelength",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "4003"
+                },
+                "coverage.Spectral.MaximumWavelength": {
+                  "typeName": "coverage.Spectral.MaximumWavelength",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "4004"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "coverage.Temporal",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "coverage.Temporal.StartTime": {
+                  "typeName": "coverage.Temporal.StartTime",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1007-01-01"
+                },
+                "coverage.Temporal.StopTime": {
+                  "typeName": "coverage.Temporal.StopTime",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1007-01-02"
+                }
+              },
+              {
+                "coverage.Temporal.StartTime": {
+                  "typeName": "coverage.Temporal.StartTime",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1007-02-01"
+                },
+                "coverage.Temporal.StopTime": {
+                  "typeName": "coverage.Temporal.StopTime",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1007-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "coverage.Spatial",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "SkyCoverage1",
+              "SkyCoverage2"
+            ]
+          },
+          {
+            "typeName": "coverage.Depth",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "200"
+          },
+          {
+            "typeName": "coverage.ObjectDensity",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "300"
+          },
+          {
+            "typeName": "coverage.ObjectCount",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "400"
+          },
+          {
+            "typeName": "coverage.SkyFraction",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "500"
+          },
+          {
+            "typeName": "coverage.Polarization",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Polarization"
+          },
+          {
+            "typeName": "redshiftType",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "RedshiftType"
+          },
+          {
+            "typeName": "resolution.Redshift",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "600"
+          },
+          {
+            "typeName": "coverage.RedshiftValue",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "coverage.Redshift.MinimumValue": {
+                  "typeName": "coverage.Redshift.MinimumValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "701"
+                },
+                "coverage.Redshift.MaximumValue": {
+                  "typeName": "coverage.Redshift.MaximumValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "702"
+                }
+              },
+              {
+                "coverage.Redshift.MinimumValue": {
+                  "typeName": "coverage.Redshift.MinimumValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "703"
+                },
+                "coverage.Redshift.MaximumValue": {
+                  "typeName": "coverage.Redshift.MaximumValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "704"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "biomedical": {
+        "displayName": "Life Sciences Metadata",
+        "fields": [
+          {
+            "typeName": "studyDesignType",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Case Control",
+              "Cross Sectional",
+              "Cohort Study",
+              "Not Specified"
+            ]
+          },
+          {
+            "typeName": "studyFactorType",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Age",
+              "Biomarkers",
+              "Cell Surface Markers",
+              "Developmental Stage"
+            ]
+          },
+          {
+            "typeName": "studyAssayOrganism",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Arabidopsis thaliana",
+              "Bos taurus",
+              "Caenorhabditis elegans",
+              "Danio rerio (zebrafish)"
+            ]
+          },
+          {
+            "typeName": "studyAssayOtherOrganism",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "OtherOrganism1",
+              "OtherOrganism2"
+            ]
+          },
+          {
+            "typeName": "studyAssayMeasurementType",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "cell counting",
+              "cell sorting",
+              "clinical chemistry analysis",
+              "DNA methylation profiling"
+            ]
+          },
+          {
+            "typeName": "studyAssayOtherMeasurmentType",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "OtherMeasurementType1",
+              "OtherMeasurementType2"
+            ]
+          },
+          {
+            "typeName": "studyAssayTechnologyType",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "culture based drug susceptibility testing, single concentration",
+              "culture based drug susceptibility testing, two concentrations",
+              "culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)",
+              "flow cytometry"
+            ]
+          },
+          {
+            "typeName": "studyAssayPlatform",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "210-MS GC Ion Trap (Varian)",
+              "220-MS GC Ion Trap (Varian)",
+              "225-MS GC Ion Trap (Varian)",
+              "300-MS quadrupole GC/MS (Varian)"
+            ]
+          },
+          {
+            "typeName": "studyAssayCellType",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "CellType1",
+              "CellType2"
+            ]
+          }
+        ]
+      },
+      "journal": {
+        "displayName": "Journal Metadata",
+        "fields": [
+          {
+            "typeName": "journalVolumeIssue",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "journalVolume": {
+                  "typeName": "journalVolume",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "JournalVolume1"
+                },
+                "journalIssue": {
+                  "typeName": "journalIssue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "JournalIssue1"
+                },
+                "journalPubDate": {
+                  "typeName": "journalPubDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1008-01-01"
+                }
+              },
+              {
+                "journalVolume": {
+                  "typeName": "journalVolume",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "JournalVolume2"
+                },
+                "journalIssue": {
+                  "typeName": "journalIssue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "JournalIssue2"
+                },
+                "journalPubDate": {
+                  "typeName": "journalPubDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1008-02-01"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "journalArticleType",
+            "multiple": false,
+            "typeClass": "controlledVocabulary",
+            "value": "abstract"
+          }
+        ]
+      }
+    },
+    "files": [
+    {
+        "label": "File1",
+        "restricted": false,
+        "dataFile": 
+        { 
+            "id": 1,
+            "contentType": "application/pdf",
+            "description": "Test PDF",
+            "filename": "test.pdf",
+            "filesize": "1000"
+        }
+    },
+    {
+        "label": "File2",
+        "restricted": true,
+        "dataFile": 
+        {
+            "id": 2,
+            "contentType": "application/xml",
+            "description": "Test XML",
+            "filename": "test.xml",
+            "filesize": "20"
+        }
+    }
+   ]
+  },
+  "dataFiles": [
+    {
+        "id": 1,
+        "contentType": "application/pdf",
+        "description": "Test PDF",
+        "filename": "test.pdf",
+        "filesize": "1000"
+    },
+    {
+        "id": 2,
+        "contentType": "application/xml",
+        "description": "Test XML",
+        "filename": "test.xml",
+        "filesize": "20"
+    }
+   ]
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt b/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt
index 4777e9a4097..3ba75434504 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt
+++ b/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt
@@ -14,8 +14,10 @@
     "lastUpdateTime": "2015-09-29T17:47:35Z",
     "releaseTime": "2015-09-29T17:47:35Z",
     "createTime": "2015-09-24T16:47:50Z",
-    "license": "CC0",
-    "termsOfUse": "CC0 Waiver",
+    "license": {
+          "name": "CC0 1.0",
+          "uri": "http://creativecommons.org/publicdomain/zero/1.0/"
+        },
     "metadataBlocks": {
       "citation": {
         "displayName": "Citation Metadata",
@@ -40,9 +42,9 @@
           },
           {
             "typeName": "alternativeTitle",
-            "multiple": false,
+            "multiple": true,
             "typeClass": "primitive",
-            "value": "Alternative Title"
+            "value": ["Alternative Title"]
           },
           {
             "typeName": "alternativeURL",
@@ -269,6 +271,12 @@
                   "typeClass": "primitive",
                   "value": "KeywordTerm1"
                 },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
                 "keywordVocabulary": {
                   "typeName": "keywordVocabulary",
                   "multiple": false,
@@ -289,6 +297,12 @@
                   "typeClass": "primitive",
                   "value": "KeywordTerm2"
                 },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI2.org"
+                },
                 "keywordVocabulary": {
                   "typeName": "keywordVocabulary",
                   "multiple": false,
@@ -310,6 +324,12 @@
             "typeClass": "compound",
             "value": [
               {
+                "publicationRelationType": {
+                  "typeName": "publicationRelationType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "IsSupplementTo"
+                },
                 "publicationCitation": {
                   "typeName": "publicationCitation",
                   "multiple": false,
@@ -448,9 +468,9 @@
           },
           {
             "typeName": "productionPlace",
-            "multiple": false,
+            "multiple": true,
             "typeClass": "primitive",
-            "value": "ProductionPlace"
+            "value": ["University of Stuttgart"]
           },
           {
             "typeName": "contributor",
@@ -692,9 +712,10 @@
           },
           {
             "typeName": "series",
-            "multiple": false,
+            "multiple": true,
             "typeClass": "compound",
-            "value": {
+            "value": [
+              {
               "seriesName": {
                 "typeName": "seriesName",
                 "multiple": false,
@@ -708,6 +729,7 @@
                 "value": "SeriesInformation"
               }
             }
+            ]
           },
           {
             "typeName": "software",
@@ -889,14 +911,14 @@
                   "typeClass": "primitive",
                   "value": "20"
                 },
-                "northLongitude": {
-                  "typeName": "northLongitude",
+                "northLatitude": {
+                  "typeName": "northLatitude",
                   "multiple": false,
                   "typeClass": "primitive",
                   "value": "30"
                 },
-                "southLongitude": {
-                  "typeName": "southLongitude",
+                "southLatitude": {
+                  "typeName": "southLatitude",
                   "multiple": false,
                   "typeClass": "primitive",
                   "value": "40"
@@ -915,14 +937,14 @@
                   "typeClass": "primitive",
                   "value": "60"
                 },
-                "northLongitude": {
-                  "typeName": "northLongitude",
+                "northLatitude": {
+                  "typeName": "northLatitude",
                   "multiple": false,
                   "typeClass": "primitive",
                   "value": "70"
                 },
-                "southLongitude": {
-                  "typeName": "southLongitude",
+                "southLatitude": {
+                  "typeName": "southLatitude",
                   "multiple": false,
                   "typeClass": "primitive",
                   "value": "80"
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations-comma.txt b/src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations-comma.txt
index a8b209d379c..dc9ea198f62 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations-comma.txt
+++ b/src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations-comma.txt
@@ -260,16 +260,16 @@
                                         "typeName": "eastLongitude",
                                         "value": "23"
                                     },
-                                    "northLongitude": {
+                                    "northLatitude": {
                                         "multiple": false,
                                         "typeClass": "primitive",
-                                        "typeName": "northLongitude",
+                                        "typeName": "northLatitude",
                                         "value": "786"
                                     },
-                                    "southLongitude": {
+                                    "southLatitude": {
                                         "multiple": false,
                                         "typeClass": "primitive",
-                                        "typeName": "southLongitude",
+                                        "typeName": "southLatitude",
                                         "value": "34"
                                     },
                                     "westLongitude": {
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations.txt b/src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations.txt
index b852e79c26a..5601cd64161 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations.txt
+++ b/src/test/java/edu/harvard/iq/dataverse/export/dataset-organizations.txt
@@ -292,16 +292,16 @@
                                         "typeName": "eastLongitude",
                                         "value": "23"
                                     },
-                                    "northLongitude": {
+                                    "northLatitude": {
                                         "multiple": false,
                                         "typeClass": "primitive",
-                                        "typeName": "northLongitude",
+                                        "typeName": "northLatitude",
                                         "value": "786"
                                     },
-                                    "southLongitude": {
+                                    "southLatitude": {
                                         "multiple": false,
                                         "typeClass": "primitive",
-                                        "typeName": "southLongitude",
+                                        "typeName": "southLatitude",
                                         "value": "34"
                                     },
                                     "westLongitude": {
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/dataset-simplified.txt b/src/test/java/edu/harvard/iq/dataverse/export/dataset-simplified.txt
index a91099197b9..9bada051c61 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/dataset-simplified.txt
+++ b/src/test/java/edu/harvard/iq/dataverse/export/dataset-simplified.txt
@@ -306,16 +306,16 @@
                                         "typeName": "eastLongitude",
                                         "value": "23"
                                     },
-                                    "northLongitude": {
+                                    "northLatitude": {
                                         "multiple": false,
                                         "typeClass": "primitive",
-                                        "typeName": "northLongitude",
+                                        "typeName": "northLatitude",
                                         "value": "786"
                                     },
-                                    "southLongitude": {
+                                    "southLatitude": {
                                         "multiple": false,
                                         "typeClass": "primitive",
-                                        "typeName": "southLongitude",
+                                        "typeName": "southLatitude",
                                         "value": "34"
                                     },
                                     "westLongitude": {
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/datase-updated.txt b/src/test/java/edu/harvard/iq/dataverse/export/dataset-updated.txt
similarity index 100%
rename from src/test/java/edu/harvard/iq/dataverse/export/datase-updated.txt
rename to src/test/java/edu/harvard/iq/dataverse/export/dataset-updated.txt
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtilTest.java
index b3155e6d7ae..360e9dfbafe 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtilTest.java
@@ -1,38 +1,194 @@
 package edu.harvard.iq.dataverse.export.ddi;
 
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactory;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteProviderFactory;
+import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider;
+import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkProviderFactory;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
 import edu.harvard.iq.dataverse.util.xml.XmlPrinter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.OutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 
 import edu.harvard.iq.dataverse.util.xml.html.HtmlPrinter;
-import org.junit.Test;
 
-import javax.json.JsonObject;
+import org.jsoup.Jsoup;
+import org.jsoup.helper.W3CDom;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.w3c.dom.Document;
+import org.xmlunit.assertj3.XmlAssert;
+import org.xmlunit.builder.DiffBuilder;
+import org.xmlunit.diff.Diff;
 
-import static org.junit.Assert.*;
+import javax.xml.stream.XMLStreamException;
 
+import static org.junit.jupiter.api.Assertions.*;
+
+@ExtendWith(MockitoExtension.class)
+@LocalJvmSettings
+//Perma 1
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "perma 1", varArgs = "perma1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = PermaLinkPidProvider.TYPE, varArgs = "perma1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "PERM", varArgs = "perma1")
+@JvmSetting(key = JvmSettings.PERMALINK_BASE_URL, value = "https://example.org/citation?persistentId=perma:", varArgs = "perma1")
+//Perma 2
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "perma 2", varArgs = "perma2")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = PermaLinkPidProvider.TYPE, varArgs = "perma2")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "PERM2", varArgs = "perma2")
+@JvmSetting(key = JvmSettings.PERMALINK_SEPARATOR, value = "-", varArgs = "perma2")
+@JvmSetting(key = JvmSettings.PERMALINK_BASE_URL, value = "https://example.org/citation?persistentId=perma:", varArgs = "perma2")
+// Datacite 1
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "dataCite 1", varArgs = "dc1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = DataCiteDOIProvider.TYPE, varArgs = "dc1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "10.5072", varArgs = "dc1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "FK2", varArgs = "dc1")
+@JvmSetting(key = JvmSettings.DATACITE_MDS_API_URL, value = "https://mds.test.datacite.org/", varArgs = "dc1")
+@JvmSetting(key = JvmSettings.DATACITE_REST_API_URL, value = "https://api.test.datacite.org", varArgs ="dc1")
+@JvmSetting(key = JvmSettings.DATACITE_USERNAME, value = "test", varArgs ="dc1")
+@JvmSetting(key = JvmSettings.DATACITE_PASSWORD, value = "changeme", varArgs ="dc1")
+
+//List to instantiate
+@JvmSetting(key = JvmSettings.PID_PROVIDERS, value = "perma1, perma2, dc1")
 public class DdiExportUtilTest {
 
     private static final Logger logger = Logger.getLogger(DdiExportUtilTest.class.getCanonicalName());
 
+    @Mock
+    SettingsServiceBean settingsSvc;
+    
+    @BeforeEach
+    void setup() {
+        Mockito.lenient().when(settingsSvc.isTrueForKey(SettingsServiceBean.Key.ExportInstallationAsDistributorOnlyWhenNotSet, false)).thenReturn(false);
+        DdiExportUtil.injectSettingsService(settingsSvc);
+    }
+
+    @BeforeAll
+    public static void setUpClass() throws Exception {
+        Map<String, PidProviderFactory> pidProviderFactoryMap = new HashMap<>();
+        pidProviderFactoryMap.put(PermaLinkPidProvider.TYPE, new PermaLinkProviderFactory());
+        pidProviderFactoryMap.put(DataCiteDOIProvider.TYPE, new DataCiteProviderFactory());
+
+        PidUtil.clearPidProviders();
+
+        //Read list of providers to add
+        List<String> providers = Arrays.asList(JvmSettings.PID_PROVIDERS.lookup().split(",\\s"));
+        //Iterate through the list of providers and add them using the PidProviderFactory of the appropriate type
+        for (String providerId : providers) {
+            System.out.println("Loading provider: " + providerId);
+            String type = JvmSettings.PID_PROVIDER_TYPE.lookup(providerId);
+            PidProviderFactory factory = pidProviderFactoryMap.get(type);
+            PidUtil.addToProviderList(factory.createPidProvider(providerId));
+        }
+    }
+    
+    
     @Test
     public void testJson2DdiNoFiles() throws Exception {
-        File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json");
-        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
-        File ddiFile = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.xml");
-        String datasetAsDdi = XmlPrinter.prettyPrintXml(new String(Files.readAllBytes(Paths.get(ddiFile.getAbsolutePath()))));
-        logger.info(datasetAsDdi);
+        // given
+        Path datasetVersionJson = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json");
+        String datasetVersionAsJson = Files.readString(datasetVersionJson, StandardCharsets.UTF_8);
+        Path ddiFile = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.xml");
+        String datasetAsDdi = XmlPrinter.prettyPrintXml(Files.readString(ddiFile, StandardCharsets.UTF_8));
+        logger.fine(datasetAsDdi);
+        
+        // when
+        String result = DdiExportUtil.datasetDtoAsJson2ddi(datasetVersionAsJson);
+        logger.fine(result);
+        
+        // then
+        XmlAssert.assertThat(result).and(datasetAsDdi).ignoreWhitespace().areSimilar();
+    }
+
+
+    @Test
+    public void testJson2DdiPermaLink() throws Exception {
+        // given
+        Path datasetVersionJson = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma.json");
+        String datasetVersionAsJson = Files.readString(datasetVersionJson, StandardCharsets.UTF_8);
+        Path ddiFile = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma.xml");
+        String datasetAsDdi = XmlPrinter.prettyPrintXml(Files.readString(ddiFile, StandardCharsets.UTF_8));
+        logger.fine(datasetAsDdi);
+
+        // when
+        String result = DdiExportUtil.datasetDtoAsJson2ddi(datasetVersionAsJson);
+        logger.fine(result);
+
+        // then
+        XmlAssert.assertThat(result).and(datasetAsDdi).ignoreWhitespace().areSimilar();
+    }
+
+
+    @Test
+    public void testJson2DdiPermaLinkWithSeparator() throws Exception {
+        // given
+        Path datasetVersionJson = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma-w-separator.json");
+        String datasetVersionAsJson = Files.readString(datasetVersionJson, StandardCharsets.UTF_8);
+        Path ddiFile = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma-w-separator.xml");
+        String datasetAsDdi = XmlPrinter.prettyPrintXml(Files.readString(ddiFile, StandardCharsets.UTF_8));
+        logger.fine(datasetAsDdi);
+
+        // when
+        String result = DdiExportUtil.datasetDtoAsJson2ddi(datasetVersionAsJson);
+        logger.fine(result);
+
+        // then
+        XmlAssert.assertThat(result).and(datasetAsDdi).ignoreWhitespace().areSimilar();
+    }
+
+    @Test
+    public void testJson2DdiNoFilesTermsOfUse() throws Exception {
+        // given
+        Path datasetVersionJson = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch-terms-of-use.json");
+        String datasetVersionAsJson = Files.readString(datasetVersionJson, StandardCharsets.UTF_8);
+        Path ddiFile = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch-terms-of-use.xml");
+        String datasetAsDdi = XmlPrinter.prettyPrintXml(Files.readString(ddiFile, StandardCharsets.UTF_8));
+        logger.fine(datasetAsDdi);
+
+        // when
         String result = DdiExportUtil.datasetDtoAsJson2ddi(datasetVersionAsJson);
-        logger.info(result);
-        assertEquals(datasetAsDdi, result);
+        logger.fine(result);
+
+        // then
+        XmlAssert.assertThat(result).and(datasetAsDdi).ignoreWhitespace().areSimilar();
+    }
+
+    @Test
+    public void testExportDDI() throws Exception {
+        // given
+        Path datasetVersionJson = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-create-new-all-ddi-fields.json");
+        String datasetVersionAsJson = Files.readString(datasetVersionJson, StandardCharsets.UTF_8);
+        Path ddiFile = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/exportfull.xml");
+        String datasetAsDdi = XmlPrinter.prettyPrintXml(Files.readString(ddiFile, StandardCharsets.UTF_8));
+        logger.fine(datasetAsDdi);
+        
+        // when
+        String result = DdiExportUtil.datasetDtoAsJson2ddi(datasetVersionAsJson);
+        logger.fine(XmlPrinter.prettyPrintXml(result));
+        
+        // then
+        XmlAssert.assertThat(result).and(datasetAsDdi).ignoreWhitespace().areSimilar();
     }
 
     @Test
@@ -43,13 +199,13 @@ public void testJson2ddiHasFiles() throws Exception {
          * but datasets created in the GUI sometimes don't have a description
          * field at all.
          */
-        File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-spruce1.json");
-        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
-        File ddiFile = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-spruce1.xml");
-        String datasetAsDdi = XmlPrinter.prettyPrintXml(new String(Files.readAllBytes(Paths.get(ddiFile.getAbsolutePath()))));
-        logger.info(datasetAsDdi);
+        Path datasetVersionJson = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-spruce1.json");
+        String datasetVersionAsJson = Files.readString(datasetVersionJson, StandardCharsets.UTF_8);
+        Path ddiFile = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-spruce1.xml");
+        String datasetAsDdi = XmlPrinter.prettyPrintXml(Files.readString(ddiFile, StandardCharsets.UTF_8));
+        logger.fine(datasetAsDdi);
         String result = DdiExportUtil.datasetDtoAsJson2ddi(datasetVersionAsJson);
-        logger.info(result);
+        logger.fine(XmlPrinter.prettyPrintXml(result));
         boolean filesMinimallySupported = false;
         // TODO: 
         // setting "filesMinimallySupported" to false here, thus disabling the test;
@@ -65,19 +221,40 @@ public void testJson2ddiHasFiles() throws Exception {
     }
 
     @Test
-    public void testDatasetHtmlDDI() throws Exception {
+    public void testDatasetHtmlDDI() throws IOException, XMLStreamException {
+        // given
         File fileXML = new File("src/test/resources/xml/dct_codebook.xml");
-
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        DdiExportUtil.datasetHtmlDDI( new FileInputStream(fileXML), byteArrayOutputStream);
-        assertNotNull(byteArrayOutputStream);
-        assertNotEquals("",byteArrayOutputStream.toString());
-        String datasetAsDdiHtml = HtmlPrinter.prettyPrint(byteArrayOutputStream.toString());
-
-        File htmlFile = new File("src/test/resources/html/dct_codebook.html");
-        String sampleHtml = HtmlPrinter.prettyPrint(new String(Files.readAllBytes(Paths.get(htmlFile.getAbsolutePath()))));
-        assertEquals(sampleHtml,datasetAsDdiHtml);
 
+        // when
+        DdiExportUtil.datasetHtmlDDI( new FileInputStream(fileXML), byteArrayOutputStream);
+        String generatedDdiHTML = byteArrayOutputStream.toString(StandardCharsets.UTF_8);
+        
+        // then
+        assertNotNull(generatedDdiHTML);
+        assertFalse(generatedDdiHTML.isEmpty());
+        assertFalse(generatedDdiHTML.isBlank());
+    
+        // pipe through pretty printer before parsing as DOM
+        generatedDdiHTML = HtmlPrinter.prettyPrint(generatedDdiHTML);
+        Document generatedDdiHtmlDom = W3CDom.convert(Jsoup.parse(generatedDdiHTML));
+        
+        // read comparison file to build diff
+        Path htmlFile = Path.of("src/test/resources/html/dct_codebook.html");
+        String subjectHtml = HtmlPrinter.prettyPrint(new String(Files.readAllBytes(htmlFile)));
+        Document subjectHtmlDom = W3CDom.convert(Jsoup.parse(subjectHtml));
+    
+        // compare generated and sample
+        Diff diff = DiffBuilder.compare(subjectHtmlDom)
+                        .withTest(generatedDdiHtmlDom)
+                        .ignoreComments()
+                        .ignoreWhitespace()
+                        .checkForSimilar()
+                        .build();
+    
+        // assert matching and print differences if any.
+        diff.getDifferences().forEach(d -> logger.info(d.toString()));
+        assertFalse(diff.hasDifferences());
     }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-create-new-all-ddi-fields.json b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-create-new-all-ddi-fields.json
new file mode 100644
index 00000000000..b0dace0fb86
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-create-new-all-ddi-fields.json
@@ -0,0 +1,1101 @@
+{
+  "id": 11,
+  "identifier": "WKUKGV",
+  "persistentUrl": "https://doi.org/10.5072/FK2/WKUKGV",
+  "protocol": "doi",
+  "authority": "10.5072/FK2",
+  "separator": "/",
+  "publisher": "Root",
+  "publicationDate": "2020-02-19",
+  "datasetVersion": {
+    "id": 2,
+    "versionNumber": 1,
+    "versionMinorNumber": 0,
+    "versionState": "RELEASED",
+    "productionDate": "Production Date",
+    "lastUpdateTime": "2015-09-24T17:07:57Z",
+    "releaseTime": "2020-02-19",
+    "createTime": "2015-09-24T16:47:51Z",
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
+    "termsOfAccess": "Terms of Access",
+    "dataAccessPlace": "Data Access Place",
+    "originalArchive": "Original Archive",
+    "availabilityStatus": "Availability Status",
+    "sizeOfCollection": "Size of Collection",
+    "studyCompletion": "Study Completion",
+    "confidentialityDeclaration": "Confidentiality Declaration",
+    "specialPermissions": "Special Permissions",
+    "restrictions": "Restrictions",
+    "contactForAccess": "Contact for Access",
+    "citationRequirements": "Citation Requirements",
+    "depositorRequirements": "Depositor Requirements",
+    "conditions": "Conditions ",
+    "disclaimer": "Disclaimer",
+    "metadataBlocks": {
+      "citation": {
+        "displayName": "Citation Metadata",
+        "fields": [
+          {
+            "typeName": "title",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Replication Data for: Title"
+          },
+          {
+            "typeName": "subtitle",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Subtitle"
+          },
+          {
+            "typeName": "alternativeTitle",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": ["Alternative Title1", "Alternative Title2"]
+          },
+          {
+            "typeName": "otherId",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "otherIdAgency": {
+                  "typeName": "otherIdAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDAgency1"
+                },
+                "otherIdValue": {
+                  "typeName": "otherIdValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDIdentifier1"
+                }
+              },
+              {
+                "otherIdAgency": {
+                  "typeName": "otherIdAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDAgency2"
+                },
+                "otherIdValue": {
+                  "typeName": "otherIdValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "OtherIDIdentifier2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "author",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "authorName": {
+                  "typeName": "authorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastAuthor1, FirstAuthor1"
+                },
+                "authorAffiliation": {
+                  "typeName": "authorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "AuthorAffiliation1"
+                }
+              },
+              {
+                "authorName": {
+                  "typeName": "authorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastAuthor2, FirstAuthor2"
+                },
+                "authorAffiliation": {
+                  "typeName": "authorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "AuthorAffiliation2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "datasetContact",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "datasetContactName": {
+                  "typeName": "datasetContactName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContact1, FirstContact1"
+                },
+                "datasetContactAffiliation": {
+                  "typeName": "datasetContactAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactAffiliation1"
+                },
+                "datasetContactEmail": {
+                  "typeName": "datasetContactEmail",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactEmail1@mailinator.com"
+                }
+              },
+              {
+                "datasetContactName": {
+                  "typeName": "datasetContactName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContact2, FirstContact2"
+                },
+                "datasetContactAffiliation": {
+                  "typeName": "datasetContactAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactAffiliation2"
+                },
+                "datasetContactEmail": {
+                  "typeName": "datasetContactEmail",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ContactEmail2@mailinator.com"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "dsDescription",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "dsDescriptionValue": {
+                  "typeName": "dsDescriptionValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DescriptionText 1"
+                },
+                "dsDescriptionDate": {
+                  "typeName": "dsDescriptionDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1000-01-01"
+                }
+              },
+              {
+                "dsDescriptionValue": {
+                  "typeName": "dsDescriptionValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DescriptionText2"
+                },
+                "dsDescriptionDate": {
+                  "typeName": "dsDescriptionDate",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1000-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "subject",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Agricultural Sciences",
+              "Business and Management",
+              "Engineering",
+              "Law"
+            ]
+          },
+          {
+            "typeName": "keyword",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordTerm1"
+                },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordVocabulary1"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://KeywordVocabularyURL1.org"
+                }
+              },
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordTerm2"
+                },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI2.org"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordVocabulary2"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://KeywordVocabularyURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "publication",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "publicationCitation": {
+                  "typeName": "publicationCitation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationCitation1"
+                },
+                "publicationIDType": {
+                  "typeName": "publicationIDType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "ark"
+                },
+                "publicationIDNumber": {
+                  "typeName": "publicationIDNumber",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationIDNumber1"
+                },
+                "publicationURL": {
+                  "typeName": "publicationURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://RelatedPublicationURL1.org"
+                }
+              },
+              {
+                "publicationCitation": {
+                  "typeName": "publicationCitation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationCitation2"
+                },
+                "publicationIDType": {
+                  "typeName": "publicationIDType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "arXiv"
+                },
+                "publicationIDNumber": {
+                  "typeName": "publicationIDNumber",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "RelatedPublicationIDNumber2"
+                },
+                "publicationURL": {
+                  "typeName": "publicationURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://RelatedPublicationURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "notesText",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Notes1"
+          },
+          {
+            "typeName": "producer",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "producerName": {
+                  "typeName": "producerName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastProducer1, FirstProducer1"
+                },
+                "producerAffiliation": {
+                  "typeName": "producerAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAffiliation1"
+                },
+                "producerAbbreviation": {
+                  "typeName": "producerAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAbbreviation1"
+                },
+                "producerURL": {
+                  "typeName": "producerURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerURL1.org"
+                },
+                "producerLogoURL": {
+                  "typeName": "producerLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerLogoURL1.org"
+                }
+              },
+              {
+                "producerName": {
+                  "typeName": "producerName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastProducer2, FirstProducer2"
+                },
+                "producerAffiliation": {
+                  "typeName": "producerAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAffiliation2"
+                },
+                "producerAbbreviation": {
+                  "typeName": "producerAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProducerAbbreviation2"
+                },
+                "producerURL": {
+                  "typeName": "producerURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerURL2.org"
+                },
+                "producerLogoURL": {
+                  "typeName": "producerLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://ProducerLogoURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "productionDate",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "1003-01-01"
+          },
+          {
+            "typeName": "productionPlace",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": ["ProductionPlace"]
+          },
+          {
+            "typeName": "contributor",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Data Collector"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContributor1, FirstContributor1"
+                }
+              },
+              {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Data Curator"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastContributor2, FirstContributor2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "grantNumber",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "grantNumberAgency": {
+                  "typeName": "grantNumberAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantAgency1"
+                },
+                "grantNumberValue": {
+                  "typeName": "grantNumberValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantNumber1"
+                }
+              },
+              {
+                "grantNumberAgency": {
+                  "typeName": "grantNumberAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantAgency2"
+                },
+                "grantNumberValue": {
+                  "typeName": "grantNumberValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationGrantNumber2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "distributor",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "distributorName": {
+                  "typeName": "distributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastDistributor1, FirstDistributor1"
+                },
+                "distributorAffiliation": {
+                  "typeName": "distributorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAffiliation1"
+                },
+                "distributorAbbreviation": {
+                  "typeName": "distributorAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAbbreviation1"
+                },
+                "distributorURL": {
+                  "typeName": "distributorURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorURL1.org"
+                },
+                "distributorLogoURL": {
+                  "typeName": "distributorLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorLogoURL1.org"
+                }
+              },
+              {
+                "distributorName": {
+                  "typeName": "distributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "LastDistributor2, FirstDistributor2"
+                },
+                "distributorAffiliation": {
+                  "typeName": "distributorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAffiliation2"
+                },
+                "distributorAbbreviation": {
+                  "typeName": "distributorAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "DistributorAbbreviation2"
+                },
+                "distributorURL": {
+                  "typeName": "distributorURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorURL2.org"
+                },
+                "distributorLogoURL": {
+                  "typeName": "distributorLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://DistributorLogoURL2.org"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "distributionDate",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "1004-01-01"
+          },
+          {
+            "typeName": "depositor",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "LastDepositor, FirstDepositor"
+          },
+          {
+            "typeName": "dateOfDeposit",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "1002-01-01"
+          },
+          {
+            "typeName": "timePeriodCovered",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "timePeriodCoveredStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-01-01"
+                },
+                "timePeriodCoveredEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-01-02"
+                }
+              },
+              {
+                "timePeriodCoveredStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-02-01"
+                },
+                "timePeriodCoveredEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1005-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "dateOfCollection",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "dateOfCollectionStart": {
+                  "typeName": "dateOfCollectionStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-01-01"
+                },
+                "dateOfCollectionEnd": {
+                  "typeName": "dateOfCollectionEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-01-01"
+                }
+              },
+              {
+                "dateOfCollectionStart": {
+                  "typeName": "dateOfCollectionStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-02-01"
+                },
+                "dateOfCollectionEnd": {
+                  "typeName": "dateOfCollectionEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1006-02-02"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "kindOfData",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "KindOfData1",
+              "KindOfData2"
+            ]
+          },
+          {
+            "typeName": "series",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [ 
+              {
+		"seriesName": {
+                  "typeName": "seriesName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SeriesName1"
+                },
+                "seriesInformation": {
+                  "typeName": "seriesInformation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SeriesInformation1"
+                }
+              },
+              {
+                "seriesName": {
+                  "typeName": "seriesName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SeriesName2"
+                },
+                "seriesInformation": {
+                  "typeName": "seriesInformation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SeriesInformation2"
+		}
+	      }
+            ]
+          },
+          {
+            "typeName": "software",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "softwareName": {
+                  "typeName": "softwareName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareName1"
+                },
+                "softwareVersion": {
+                  "typeName": "softwareVersion",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareVersion1"
+                }
+              },
+              {
+                "softwareName": {
+                  "typeName": "softwareName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareName2"
+                },
+                "softwareVersion": {
+                  "typeName": "softwareVersion",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "SoftwareVersion2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "relatedMaterial",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "RelatedMaterial1",
+              "RelatedMaterial2"
+            ]
+          },
+          {
+            "typeName": "relatedDatasets",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "RelatedDatasets1",
+              "RelatedDatasets2"
+            ]
+          },
+          {
+            "typeName": "otherReferences",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "OtherReferences1",
+              "OtherReferences2"
+            ]
+          },
+          {
+            "typeName": "dataSources",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "DataSources1",
+              "DataSources2"
+            ]
+          },
+          {
+            "typeName": "originOfSources",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "OriginOfSources"
+          },
+          {
+            "typeName": "characteristicOfSources",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CharacteristicOfSourcesNoted"
+          },
+          {
+            "typeName": "accessToSources",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "DocumentationAndAccessToSources"
+          }
+        ]
+      },
+      "geospatial": {
+        "displayName": "Geospatial Metadata",
+        "fields": [
+          {
+            "typeName": "geographicCoverage",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Afghanistan"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageStateProvince1"
+                },
+                "city": {
+                  "typeName": "city",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageCity1"
+                },
+                "otherGeographicCoverage": {
+                  "typeName": "otherGeographicCoverage",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageOther1"
+                }
+              },
+              {
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Albania"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageStateProvince2"
+                },
+                "city": {
+                  "typeName": "city",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageCity2"
+                },
+                "otherGeographicCoverage": {
+                  "typeName": "otherGeographicCoverage",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GeographicCoverageOther2"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "geographicUnit",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "GeographicUnit1",
+              "GeographicUnit2"
+            ]
+          },
+          {
+            "typeName": "geographicBoundingBox",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "westLongitude": {
+                  "typeName": "westLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "-72"
+                },
+                "eastLongitude": {
+                  "typeName": "eastLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "-70"
+                },
+                "northLatitude": {
+                  "typeName": "northLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "43"
+                },
+                "southLatitude": {
+                  "typeName": "southLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "42"
+                }
+              },
+              {
+                "westLongitude": {
+                  "typeName": "westLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "-18"
+                },
+                "eastLongitude": {
+                  "typeName": "eastLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "-13"
+                },
+                "northLatitude": {
+                  "typeName": "northLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "29"
+                },
+                "southLatitude": {
+                  "typeName": "southLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "28"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "socialscience": {
+        "displayName": "Social Science and Humanities Metadata",
+        "fields": [
+          {
+            "typeName": "unitOfAnalysis",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "UnitOfAnalysis1",
+              "UnitOfAnalysis2"
+            ]
+          },
+          {
+            "typeName": "universe",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Universe1",
+              "Universe2"
+            ]
+          },
+          {
+            "typeName": "timeMethod",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "TimeMethod"
+          },
+          {
+            "typeName": "dataCollector",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "LastDataCollector1, FirstDataCollector1"
+          },
+          {
+            "typeName": "collectorTraining",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CollectorTraining"
+          },
+          {
+            "typeName": "frequencyOfDataCollection",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Frequency"
+          },
+          {
+            "typeName": "samplingProcedure",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "SamplingProcedure"
+          },
+          {
+            "typeName": "targetSampleSize",
+            "multiple": false,
+            "typeClass": "compound",
+            "value": {
+              "targetSampleActualSize": {
+                "typeName": "targetSampleActualSize",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "100"
+              },
+              "targetSampleSizeFormula": {
+                "typeName": "targetSampleSizeFormula",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "TargetSampleSizeFormula"
+              }
+            }
+          },
+          {
+            "typeName": "deviationsFromSampleDesign",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "MajorDeviationsForSampleDesign"
+          },
+          {
+            "typeName": "collectionMode",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "CollectionMode"
+            ]
+
+          },
+          {
+            "typeName": "researchInstrument",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "TypeOfResearchInstrument"
+          },
+          {
+            "typeName": "dataCollectionSituation",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CharacteristicsOfDataCollectionSituation"
+          },
+          {
+            "typeName": "actionsToMinimizeLoss",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "ActionsToMinimizeLosses"
+          },
+          {
+            "typeName": "controlOperations",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "ControlOperations"
+          },
+          {
+            "typeName": "weighting",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Weighting"
+          },
+          {
+            "typeName": "cleaningOperations",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "CleaningOperations"
+          },
+          {
+            "typeName": "datasetLevelErrorNotes",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "StudyLevelErrorNotes"
+          },
+          {
+            "typeName": "responseRate",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "ResponseRate"
+          },
+          {
+            "typeName": "samplingErrorEstimates",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "EstimatesOfSamplingError"
+          },
+          {
+            "typeName": "otherDataAppraisal",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "OtherFormsOfDataAppraisal"
+          },
+          {
+            "typeName": "socialScienceNotes",
+            "multiple": false,
+            "typeClass": "compound",
+            "value": {
+              "socialScienceNotesType": {
+                "typeName": "socialScienceNotesType",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "NotesType"
+              },
+              "socialScienceNotesSubject": {
+                "typeName": "socialScienceNotesSubject",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "NotesSubject"
+              },
+              "socialScienceNotesText": {
+                "typeName": "socialScienceNotesText",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "NotesText"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "files": [],
+    "citation": "LastAuthor1, FirstAuthor1; LastAuthor2, FirstAuthor2, 2020, \"Replication Data for: Title\", https://doi.org/10.5072/FK2/WKUKGV, Root, V1"
+  }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch-terms-of-use.json b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch-terms-of-use.json
new file mode 100644
index 00000000000..b3d6caff2e9
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch-terms-of-use.json
@@ -0,0 +1,404 @@
+{
+  "id": 11,
+  "identifier": "PCA2E3",
+  "persistentUrl": "https://doi.org/10.5072/FK2/PCA2E3",
+  "protocol": "doi",
+  "authority": "10.5072/FK2",
+  "metadataLanguage": "en",
+  "datasetVersion": {
+    "id": 2,
+    "versionNumber": 1,
+    "versionMinorNumber": 0,
+    "versionState": "RELEASED",
+    "productionDate": "Production Date",
+    "lastUpdateTime": "2015-09-24T17:07:57Z",
+    "releaseTime": "2015-09-24T17:07:57Z",
+    "createTime": "2015-09-24T16:47:51Z",
+    "termsOfUse":"This dataset is made available without information on how it can be used. You should communicate with the Contact(s) specified before use.",
+    "metadataBlocks": {
+      "citation": {
+        "displayName": "Citation Metadata",
+        "name":"citation",
+        "fields": [
+          {
+            "typeName": "title",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Darwin's Finches"
+          },
+          {
+            "typeName": "alternativeTitle",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": ["Darwin's Finches Alternative Title1", "Darwin's Finches Alternative Title2"]
+          },
+          {
+            "typeName": "author",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "authorName": {
+                  "typeName": "authorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Finch, Fiona"
+                },
+                "authorAffiliation": {
+                  "typeName": "authorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Birds Inc."
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "timePeriodCovered",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "timePeriodStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "20020816"
+                },
+                "timePeriodEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "20160630"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "dateOfCollection",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "timePeriodStart": {
+                  "typeName": "dateOfCollectionStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "20070831"
+                },
+                "timePeriodEnd": {
+                  "typeName": "dateOfCollectionEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "20130630"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "datasetContact",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "datasetContactEmail": {
+                  "typeName": "datasetContactEmail",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "finch@mailinator.com"
+                },
+                "datasetContactName": {
+                  "typeName": "datasetContactName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Jimmy Finch"
+                },
+                "datasetContactAffiliation": {
+                  "typeName": "datasetContactAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Finch Academy"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "producer",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "producerAbbreviation": {
+                  "typeName": "producerAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "ProdAbb"
+                },
+                "producerName": {
+                  "typeName": "producerName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Johnny Hawk"
+                },
+                "producerAffiliation": {
+                  "typeName": "producerAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Hawk Institute"
+                },
+                "producerURL": {
+                  "typeName": "producerURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://www.hawk.edu/url"
+                },
+                "producerLogoURL": {
+                  "typeName": "producerLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://www.hawk.edu/logo"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "distributor",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "distributorAbbreviation": {
+                  "typeName": "distributorAbbreviation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Dist-Abb"
+                },
+                "producerName": {
+                  "typeName": "distributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Odin Raven"
+                },
+                "distributorAffiliation": {
+                  "typeName": "distributorAffiliation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Valhalla Polytechnic"
+                },
+                "distributorURL": {
+                  "typeName": "distributorURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://www.valhalla.edu/url"
+                },
+                "distributorLogoURL": {
+                  "typeName": "distributorLogoURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://www.valhalla.edu/logo"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "dsDescription",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "dsDescriptionValue": {
+                  "typeName": "dsDescriptionValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds."
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "subject",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Medicine, Health and Life Sciences"
+            ]
+          },
+          {
+            "typeName": "keyword",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Keyword Value 1"
+                },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Keyword Vocabulary"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://www.keyword.com/one"
+                }
+              },
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Keyword Value Two"
+                },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Keyword Vocabulary"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://www.keyword.com/one"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "topicClassification",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "topicClassValue": {
+                  "typeName": "topicClassValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "TC Value 1"
+                },
+                "topicClassVocab": {
+                  "typeName": "topicClassVocab",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "TC Vocabulary"
+                },
+                "topicClassVocabURI": {
+                  "typeName": "topicClassVocabURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://www.topicClass.com/one"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "kindOfData",
+            "multiple": true,
+            "typeClass": "primitive",
+            "value": [
+              "Kind of Data"
+            ]
+          },
+          {
+            "typeName": "depositor",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Added, Depositor"
+          }
+        ]
+      },
+      "geospatial": {
+        "displayName": "Geospatial",
+        "name":"geospatial",
+        "fields": [
+          {
+            "typeName": "geographicCoverage",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "USA"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "MA"
+                },
+                "city": {
+                  "typeName": "city",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Cambridge"
+                },
+                "otherGeographicCoverage": {
+                  "typeName": "otherGeographicCoverage",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Other Geographic Coverage"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "geographicBoundingBox",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "westLongitude": {
+                  "typeName": "westLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "60.3"
+                },
+                "eastLongitude": {
+                  "typeName": "eastLongitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "59.8"
+                },
+                "southLatitude": {
+                  "typeName": "southLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "41.6"
+                },
+                "northLatitude": {
+                  "typeName": "northLatitude",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "43.8"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "files": [],
+    "citation": "Finch, Fiona, 2015, \"Darwin's Finches\", https://doi.org/10.5072/FK2/PCA2E3,  Root Dataverse,  V1"
+  }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch-terms-of-use.xml b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch-terms-of-use.xml
new file mode 100644
index 00000000000..d813d155a90
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch-terms-of-use.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<codeBook xmlns="ddi:codebook:2_5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddi:codebook:2_5 https://ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd" version="2.5" xml:lang="en">
+    <docDscr>
+        <citation>
+            <titlStmt>
+                <titl xml:lang="en">Darwin's Finches</titl>
+                <IDNo agency="DOI">doi:10.5072/FK2/PCA2E3</IDNo>
+            </titlStmt>
+            <distStmt/>
+            <verStmt source="archive">
+                <version date="2015-09-24" type="RELEASED">1</version>
+            </verStmt>
+            <biblCit>Finch, Fiona, 2015, "Darwin's Finches", https://doi.org/10.5072/FK2/PCA2E3,  Root Dataverse,  V1</biblCit>
+        </citation>
+    </docDscr>
+    <stdyDscr>
+        <citation>
+            <titlStmt>
+                <titl xml:lang="en">Darwin's Finches</titl>
+                <altTitl>Darwin's Finches Alternative Title1</altTitl>
+                <altTitl>Darwin's Finches Alternative Title2</altTitl>
+                <IDNo agency="DOI">doi:10.5072/FK2/PCA2E3</IDNo>
+            </titlStmt>
+            <rspStmt>
+                <AuthEnty affiliation="Birds Inc.">Finch, Fiona</AuthEnty>
+            </rspStmt>
+            <prodStmt>
+                <producer affiliation="Hawk Institute" abbr="ProdAbb">Johnny Hawk</producer>
+            </prodStmt>
+            <distStmt>
+                <distrbtr xml:lang="en" affiliation="Valhalla Polytechnic" abbr="Dist-Abb" URI="http://www.valhalla.edu/url">Odin Raven</distrbtr>
+                <contact affiliation="Finch Academy" email="finch@mailinator.com">Jimmy Finch</contact>
+                <depositr>Added, Depositor</depositr>
+            </distStmt>
+            <holdings URI="https://doi.org/10.5072/FK2/PCA2E3"/>
+        </citation>
+        <stdyInfo>
+            <subject>
+                <keyword xml:lang="en">Medicine, Health and Life Sciences</keyword>
+                <keyword vocab="Keyword Vocabulary" vocabURI="http://www.keyword.com/one">Keyword Value 1</keyword>
+                <keyword vocab="Keyword Vocabulary" vocabURI="http://www.keyword.com/one">Keyword Value Two</keyword>
+                <topcClas vocab="TC Vocabulary" vocabURI="http://www.topicClass.com/one">TC Value 1</topcClas>
+            </subject>
+            <abstract xml:lang="en">Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.</abstract>
+            <sumDscr>
+                <timePrd cycle="P1" event="start" date="20020816">20020816</timePrd>
+                <timePrd cycle="P1" event="end" date="20160630">20160630</timePrd>
+                <collDate cycle="P1" event="start" date="20070831">20070831</collDate>
+                <collDate cycle="P1" event="end" date="20130630">20130630</collDate>
+                <nation>USA</nation>
+                <geogCover>Cambridge</geogCover>
+                <geogCover>MA</geogCover>
+                <geogCover>Other Geographic Coverage</geogCover>
+                <geoBndBox>
+                    <westBL>60.3</westBL>
+                    <eastBL>59.8</eastBL>
+                    <southBL>41.6</southBL>
+                    <northBL>43.8</northBL>
+                </geoBndBox>
+                <dataKind>Kind of Data</dataKind>
+            </sumDscr>
+        </stdyInfo>
+        <method>
+            <dataColl>
+                <sources/>
+            </dataColl>
+            <anlyInfo/>
+        </method>
+        <dataAccs>
+            <setAvail/>
+            <useStmt/>
+            <notes type="DVN:TOU" level="dv">
+                This dataset is made available without information on how it can be used. You should communicate with the Contact(s) specified before use.
+            </notes>
+        </dataAccs>
+        <othrStdyMat/>
+    </stdyDscr>
+</codeBook>
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json
index da4fe5555af..49565d925ab 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json
@@ -4,6 +4,8 @@
   "persistentUrl": "https://doi.org/10.5072/FK2/PCA2E3",
   "protocol": "doi",
   "authority": "10.5072/FK2",
+  "separator": "/",
+  "metadataLanguage": "en",
   "datasetVersion": {
     "id": 2,
     "versionNumber": 1,
@@ -13,9 +15,14 @@
     "lastUpdateTime": "2015-09-24T17:07:57Z",
     "releaseTime": "2015-09-24T17:07:57Z",
     "createTime": "2015-09-24T16:47:51Z",
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
     "metadataBlocks": {
       "citation": {
         "displayName": "Citation Metadata",
+        "name":"citation",
         "fields": [
           {
             "typeName": "title",
@@ -23,6 +30,12 @@
             "typeClass": "primitive",
             "value": "Darwin's Finches"
           },
+          {
+              "typeName": "alternativeTitle",
+              "multiple": true,
+              "typeClass": "primitive",
+              "value": ["Darwin's Finches Alternative Title1", "Darwin's Finches Alternative Title2"]
+          },
           {
             "typeName": "author",
             "multiple": true,
@@ -226,6 +239,12 @@
                   "typeClass": "primitive",
                   "value": "Keyword Value 1"
                 },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
                 "keywordVocabulary": {
                   "typeName": "keywordVocabulary",
                   "multiple": false,
@@ -246,6 +265,12 @@
                   "typeClass": "primitive",
                   "value": "Keyword Value Two"
                 },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
                 "keywordVocabulary": {
                   "typeName": "keywordVocabulary",
                   "multiple": false,
@@ -306,6 +331,7 @@
             },
             "geospatial": {
                 "displayName": "Geospatial",
+                "name":"geospatial",
                 "fields": [
                     {
                         "typeName": "geographicCoverage",
@@ -358,14 +384,14 @@
                                     "typeClass": "primitive",
                                     "value": "59.8"
                                 },
-                                "southLongitude": {
-                                    "typeName": "southLongitude",
+                                "southLatitude": {
+                                    "typeName": "southLatitude",
                                     "multiple": false,
                                     "typeClass": "primitive",
                                     "value": "41.6"
                                 },
-                                "northLongitude": {
-                                    "typeName": "northLongitude",
+                                "northLatitude": {
+                                    "typeName": "northLatitude",
                                     "multiple": false,
                                     "typeClass": "primitive",
                                     "value": "43.8"
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.xml b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.xml
index 3023d9eebe1..010a5db4f2b 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.xml
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<codeBook xmlns="ddi:codebook:2_5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddi:codebook:2_5 http://www.ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd" version="2.5">
+<codeBook xmlns="ddi:codebook:2_5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddi:codebook:2_5 https://ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd" version="2.5" xml:lang="en">
   <docDscr>
     <citation>
       <titlStmt>
-        <titl>Darwin's Finches</titl>
+        <titl xml:lang="en">Darwin's Finches</titl>
         <IDNo agency="DOI">doi:10.5072/FK2/PCA2E3</IDNo>
       </titlStmt>
       <distStmt/>
-      <verStmt source="DVN">
+      <verStmt source="archive">
         <version date="2015-09-24" type="RELEASED">1</version>
       </verStmt>
       <biblCit>Finch, Fiona, 2015, "Darwin's Finches", https://doi.org/10.5072/FK2/PCA2E3,  Root Dataverse,  V1</biblCit>
@@ -16,49 +16,61 @@
   <stdyDscr>
     <citation>
       <titlStmt>
-        <titl>Darwin's Finches</titl>
+        <titl xml:lang="en">Darwin's Finches</titl>
+        <altTitl>Darwin's Finches Alternative Title1</altTitl>
+        <altTitl>Darwin's Finches Alternative Title2</altTitl>
         <IDNo agency="DOI">doi:10.5072/FK2/PCA2E3</IDNo>
       </titlStmt>
       <rspStmt>
         <AuthEnty affiliation="Birds Inc.">Finch, Fiona</AuthEnty>
       </rspStmt>
       <prodStmt>
-        <producer affiliation="Hawk Institute" abbr="ProdAbb" role="http://www.hawk.edu/logo" URI="http://www.hawk.edu/url">Johnny Hawk</producer>
+        <producer affiliation="Hawk Institute" abbr="ProdAbb">Johnny Hawk</producer>
       </prodStmt>
-      <distStmt/>
+      <distStmt>
+        <distrbtr xml:lang="en" affiliation="Valhalla Polytechnic" abbr="Dist-Abb" URI="http://www.valhalla.edu/url">Odin Raven</distrbtr>
+        <contact affiliation="Finch Academy" email="finch@mailinator.com">Jimmy Finch</contact>
+        <depositr>Added, Depositor</depositr>
+      </distStmt>
+      <holdings URI="https://doi.org/10.5072/FK2/PCA2E3"/>
     </citation>
     <stdyInfo>
       <subject>
-        <keyword>Medicine, Health and Life Sciences</keyword>
-        <keyword vocab="Keyword Vocabulary" URI="http://www.keyword.com/one">Keyword Value 1</keyword>
-        <keyword vocab="Keyword Vocabulary" URI="http://www.keyword.com/one">Keyword Value Two</keyword>
-        <topcClas vocab="TC Vocabulary" URI="http://www.topicClass.com/one">TC Value 1</topcClas>
+        <keyword xml:lang="en">Medicine, Health and Life Sciences</keyword>
+        <keyword vocab="Keyword Vocabulary" vocabURI="http://www.keyword.com/one">Keyword Value 1</keyword>
+        <keyword vocab="Keyword Vocabulary" vocabURI="http://www.keyword.com/one">Keyword Value Two</keyword>
+        <topcClas vocab="TC Vocabulary" vocabURI="http://www.topicClass.com/one">TC Value 1</topcClas>
       </subject>
-      <abstract>Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.</abstract>
+      <abstract xml:lang="en">Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.</abstract>
       <sumDscr>
         <timePrd cycle="P1" event="start" date="20020816">20020816</timePrd>
         <timePrd cycle="P1" event="end" date="20160630">20160630</timePrd>
         <collDate cycle="P1" event="start" date="20070831">20070831</collDate>
         <collDate cycle="P1" event="end" date="20130630">20130630</collDate>
-        <dataKind>Kind of Data</dataKind>
-        <geogCover>Cambridge</geogCover>
         <nation>USA</nation>
+        <geogCover>Cambridge</geogCover>
         <geogCover>MA</geogCover>
         <geogCover>Other Geographic Coverage</geogCover>
-        <southBL>41.6</southBL>
-        <westBL>60.3</westBL>
-        <eastBL>59.8</eastBL>
-        <northBL>43.8</northBL>
+        <geoBndBox>
+          <westBL>60.3</westBL>
+          <eastBL>59.8</eastBL>
+          <southBL>41.6</southBL>
+          <northBL>43.8</northBL>
+        </geoBndBox>
+        <dataKind>Kind of Data</dataKind>
       </sumDscr>
-      <distrbtr>
-        <distrbtr affiliation="Valhalla Polytechnic" abbr="Dist-Abb" URI="http://www.valhalla.edu/url" role="http://www.valhalla.edu/logo">Odin Raven</distrbtr>
-      </distrbtr>
-      <contact affiliation="Finch Academy" email="finch@mailinator.com">Jimmy Finch</contact>
-      <depositr>Added, Depositor</depositr>
     </stdyInfo>
     <method>
-      <dataColl/>
+      <dataColl>
+        <sources/>
+      </dataColl>
       <anlyInfo/>
     </method>
+    <dataAccs>
+      <setAvail/>
+      <useStmt/>
+      <notes type="DVN:TOU" level="dv">&lt;a href="http://creativecommons.org/publicdomain/zero/1.0"&gt;CC0 1.0&lt;/a&gt;</notes>
+    </dataAccs>
+    <othrStdyMat/>
   </stdyDscr>
 </codeBook>
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finchDC.xml b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finchDC.xml
index 5d9ff7639a3..0045d603f04 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finchDC.xml
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finchDC.xml
@@ -18,4 +18,5 @@
   <dcterms:spatial>USA</dcterms:spatial>
   <dcterms:spatial>MA</dcterms:spatial>
   <dcterms:spatial>Other Geographic Coverage</dcterms:spatial>
+  <dcterms:license>CC0 1.0</dcterms:license>
 </metadata>
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-hdl.json b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-hdl.json
index 01cc4f2a13b..3f1597599b4 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-hdl.json
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-hdl.json
@@ -13,6 +13,10 @@
     "lastUpdateTime": "2015-09-29T17:47:35Z",
     "releaseTime": "2015-09-29T17:47:35Z",
     "createTime": "2015-09-24T16:47:50Z",
+    "license": {
+      "name": "CC0 1.0",
+      "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+    },
     "metadataBlocks": {
       "citation": {
         "displayName": "Citation Metadata",
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma-w-separator.json b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma-w-separator.json
new file mode 100644
index 00000000000..9b51dc2ff91
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma-w-separator.json
@@ -0,0 +1,92 @@
+{
+  "id": 10,
+  "identifier": "123456789",
+  "persistentUrl": "https://example.org/citation?persistentId=PERM2-123456789",
+  "protocol": "perma",
+  "authority": "PERM2",
+  "separator": "-",
+  "datasetVersion": {
+    "id": 1,
+    "versionNumber": 1,
+    "versionMinorNumber": 0,
+    "versionState": "RELEASED",
+    "productionDate": "Production Date",
+    "lastUpdateTime": "2015-09-29T17:47:35Z",
+    "releaseTime": "2015-09-29T17:47:35Z",
+    "createTime": "2015-09-24T16:47:50Z",
+    "metadataBlocks": {
+      "citation": {
+        "displayName": "Citation Metadata",
+        "fields": [
+          {
+            "typeName": "title",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Spruce Goose"
+          },
+          {
+            "typeName": "author",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "authorName": {
+                  "typeName": "authorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Spruce, Sabrina"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "datasetContact",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "datasetContactEmail": {
+                  "typeName": "datasetContactEmail",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "spruce@mailinator.com"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "dsDescription",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "dsDescriptionValue": {
+                  "typeName": "dsDescriptionValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "What the Spruce Goose was really made of."
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "subject",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Other"
+            ]
+          },
+          {
+            "typeName": "depositor",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Spruce, Sabrina"
+          }
+        ]
+      }
+    },
+    "files": [],
+    "citation": "Spruce, Sabrina, 2015, \"Spruce Goose\", https://example.org/citation?persistentId=PERM2-123456789,  Root Dataverse,  V1"
+  }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma-w-separator.xml b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma-w-separator.xml
new file mode 100644
index 00000000000..2a7d4d09846
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma-w-separator.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<codeBook xmlns="ddi:codebook:2_5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddi:codebook:2_5 http://www.ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd" version="2.5">
+  <docDscr>
+    <citation>
+      <titlStmt>
+        <titl>Spruce Goose</titl>
+        <IDNo agency="perma">perma:PERM2-123456789</IDNo>
+      </titlStmt>
+      <distStmt/>
+      <verStmt source="archive">
+        <version date="2015-09-29" type="RELEASED">1</version>
+      </verStmt>
+      <biblCit>Spruce, Sabrina, 2015, "Spruce Goose", https://example.org/citation?persistentId=PERM2-123456789,  Root Dataverse,  V1</biblCit>
+    </citation>
+  </docDscr>
+  <stdyDscr>
+    <citation>
+      <titlStmt>
+        <titl>Spruce Goose</titl>
+        <IDNo agency="perma">perma:PERM2-123456789</IDNo>
+      </titlStmt>
+      <rspStmt>
+        <AuthEnty>Spruce, Sabrina</AuthEnty>
+      </rspStmt>
+      <prodStmt/>
+      <distStmt>
+        <depositr>Spruce, Sabrina</depositr>
+      </distStmt>
+      <holdings URI="https://example.org/citation?persistentId=perma:PERM2-123456789"/>
+    </citation>
+    <stdyInfo>
+      <subject>
+        <keyword xml:lang="en">Other</keyword>
+      </subject>
+      <abstract>What the Spruce Goose was really made of.</abstract>
+      <sumDscr/>
+    </stdyInfo>
+    <method>
+      <dataColl>
+        <sources/>
+      </dataColl>
+      <anlyInfo/>
+    </method>
+    <dataAccs>
+      <setAvail/>
+      <useStmt/>
+    </dataAccs>
+    <othrStdyMat/>
+  </stdyDscr>
+</codeBook>
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma.json b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma.json
new file mode 100644
index 00000000000..eb8fc6d1d88
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma.json
@@ -0,0 +1,92 @@
+{
+  "id": 10,
+  "identifier": "123456789",
+  "persistentUrl": "https://example.org/citation?persistentId=PERM123456789",
+  "protocol": "perma",
+  "authority": "PERM",
+  "separator": "",
+  "datasetVersion": {
+    "id": 1,
+    "versionNumber": 1,
+    "versionMinorNumber": 0,
+    "versionState": "RELEASED",
+    "productionDate": "Production Date",
+    "lastUpdateTime": "2015-09-29T17:47:35Z",
+    "releaseTime": "2015-09-29T17:47:35Z",
+    "createTime": "2015-09-24T16:47:50Z",
+    "metadataBlocks": {
+      "citation": {
+        "displayName": "Citation Metadata",
+        "fields": [
+          {
+            "typeName": "title",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Spruce Goose"
+          },
+          {
+            "typeName": "author",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "authorName": {
+                  "typeName": "authorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Spruce, Sabrina"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "datasetContact",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "datasetContactEmail": {
+                  "typeName": "datasetContactEmail",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "spruce@mailinator.com"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "dsDescription",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "dsDescriptionValue": {
+                  "typeName": "dsDescriptionValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "What the Spruce Goose was really made of."
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "subject",
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "value": [
+              "Other"
+            ]
+          },
+          {
+            "typeName": "depositor",
+            "multiple": false,
+            "typeClass": "primitive",
+            "value": "Spruce, Sabrina"
+          }
+        ]
+      }
+    },
+    "files": [],
+    "citation": "Spruce, Sabrina, 2015, \"Spruce Goose\", https://example.org/citation?persistentId=PERM123456789,  Root Dataverse,  V1"
+  }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma.xml b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma.xml
new file mode 100644
index 00000000000..341cb7435bd
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-perma.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<codeBook xmlns="ddi:codebook:2_5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddi:codebook:2_5 http://www.ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd" version="2.5">
+  <docDscr>
+    <citation>
+      <titlStmt>
+        <titl>Spruce Goose</titl>
+        <IDNo agency="perma">perma:PERM123456789</IDNo>
+      </titlStmt>
+      <distStmt/>
+      <verStmt source="archive">
+        <version date="2015-09-29" type="RELEASED">1</version>
+      </verStmt>
+      <biblCit>Spruce, Sabrina, 2015, "Spruce Goose", https://example.org/citation?persistentId=PERM123456789,  Root Dataverse,  V1</biblCit>
+    </citation>
+  </docDscr>
+  <stdyDscr>
+    <citation>
+      <titlStmt>
+        <titl>Spruce Goose</titl>
+        <IDNo agency="perma">perma:PERM123456789</IDNo>
+      </titlStmt>
+      <rspStmt>
+        <AuthEnty>Spruce, Sabrina</AuthEnty>
+      </rspStmt>
+      <prodStmt/>
+      <distStmt>
+        <depositr>Spruce, Sabrina</depositr>
+      </distStmt>
+      <holdings URI="https://example.org/citation?persistentId=perma:PERM123456789"/>
+    </citation>
+    <stdyInfo>
+      <subject>
+        <keyword xml:lang="en">Other</keyword>
+      </subject>
+      <abstract>What the Spruce Goose was really made of.</abstract>
+      <sumDscr/>
+    </stdyInfo>
+    <method>
+      <dataColl>
+        <sources/>
+      </dataColl>
+      <anlyInfo/>
+    </method>
+    <dataAccs>
+      <setAvail/>
+      <useStmt/>
+    </dataAccs>
+    <othrStdyMat/>
+  </stdyDscr>
+</codeBook>
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/exportfull.xml b/src/test/java/edu/harvard/iq/dataverse/export/ddi/exportfull.xml
new file mode 100644
index 00000000000..e865dc0ffe4
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/export/ddi/exportfull.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<codeBook xmlns="ddi:codebook:2_5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddi:codebook:2_5 https://ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd" version="2.5">
+  <docDscr>
+    <citation>
+      <titlStmt>
+        <titl>Replication Data for: Title</titl>
+        <IDNo agency="DOI">doi:10.5072/FK2/WKUKGV</IDNo>
+      </titlStmt>
+      <distStmt>
+        <distrbtr source="archive">Root</distrbtr>
+        <distDate>2020-02-19</distDate>
+      </distStmt>
+      <verStmt source="archive">
+        <version date="2020-02-19" type="RELEASED">1</version>
+      </verStmt>
+      <biblCit>LastAuthor1, FirstAuthor1; LastAuthor2, FirstAuthor2, 2020, "Replication Data for: Title", https://doi.org/10.5072/FK2/WKUKGV, Root, V1</biblCit>
+    </citation>
+  </docDscr>
+  <stdyDscr>
+    <citation>
+      <titlStmt>
+        <titl>Replication Data for: Title</titl>
+        <subTitl>Subtitle</subTitl>
+        <altTitl>Alternative Title1</altTitl>
+        <altTitl>Alternative Title2</altTitl>
+        <IDNo agency="DOI">doi:10.5072/FK2/WKUKGV</IDNo>
+        <IDNo agency="OtherIDAgency1">OtherIDIdentifier1</IDNo>
+        <IDNo agency="OtherIDAgency2">OtherIDIdentifier2</IDNo>
+      </titlStmt>
+      <rspStmt>
+        <AuthEnty affiliation="AuthorAffiliation1">LastAuthor1, FirstAuthor1</AuthEnty>
+        <AuthEnty affiliation="AuthorAffiliation2">LastAuthor2, FirstAuthor2</AuthEnty>
+        <othId role="Data Collector">LastContributor1, FirstContributor1</othId>
+        <othId role="Data Curator">LastContributor2, FirstContributor2</othId>
+      </rspStmt>
+      <prodStmt>
+        <producer affiliation="ProducerAffiliation1" abbr="ProducerAbbreviation1">LastProducer1, FirstProducer1</producer>
+        <producer affiliation="ProducerAffiliation2" abbr="ProducerAbbreviation2">LastProducer2, FirstProducer2</producer>
+        <prodDate>1003-01-01</prodDate>
+        <prodPlac>ProductionPlace</prodPlac>
+        <software version="SoftwareVersion1">SoftwareName1</software>
+        <software version="SoftwareVersion2">SoftwareName2</software>
+        <grantNo agency="GrantInformationGrantAgency1">GrantInformationGrantNumber1</grantNo>
+        <grantNo agency="GrantInformationGrantAgency2">GrantInformationGrantNumber2</grantNo>
+      </prodStmt>
+      <distStmt>
+        <distrbtr source="archive">Root</distrbtr>
+        <distrbtr affiliation="DistributorAffiliation1" abbr="DistributorAbbreviation1" URI="http://DistributorURL1.org">LastDistributor1, FirstDistributor1</distrbtr>
+        <distrbtr affiliation="DistributorAffiliation2" abbr="DistributorAbbreviation2" URI="http://DistributorURL2.org">LastDistributor2, FirstDistributor2</distrbtr>
+        <contact affiliation="ContactAffiliation1" email="ContactEmail1@mailinator.com">LastContact1, FirstContact1</contact>
+        <contact affiliation="ContactAffiliation2" email="ContactEmail2@mailinator.com">LastContact2, FirstContact2</contact>
+        <depositr>LastDepositor, FirstDepositor</depositr>
+        <depDate>1002-01-01</depDate>
+        <distDate>1004-01-01</distDate>
+      </distStmt>
+      <serStmt>
+        <serName>SeriesName1</serName>
+        <serInfo>SeriesInformation1</serInfo>
+      </serStmt>
+      <serStmt>
+        <serName>SeriesName2</serName>
+        <serInfo>SeriesInformation2</serInfo>
+      </serStmt>
+      <holdings URI="https://doi.org/10.5072/FK2/WKUKGV"/>
+    </citation>
+    <stdyInfo>
+      <subject>
+        <keyword xml:lang="en">Agricultural Sciences</keyword>
+        <keyword xml:lang="en">Business and Management</keyword>
+        <keyword xml:lang="en">Engineering</keyword>
+        <keyword xml:lang="en">Law</keyword>
+        <keyword vocab="KeywordVocabulary1" vocabURI="http://KeywordVocabularyURL1.org">KeywordTerm1</keyword>
+        <keyword vocab="KeywordVocabulary2" vocabURI="http://KeywordVocabularyURL2.org">KeywordTerm2</keyword>
+      </subject>
+      <abstract date="1000-01-01">DescriptionText 1</abstract>
+      <abstract date="1000-02-02">DescriptionText2</abstract>
+      <sumDscr>
+        <timePrd cycle="P1" event="start" date="1005-01-01">1005-01-01</timePrd>
+        <timePrd cycle="P1" event="end" date="1005-01-02">1005-01-02</timePrd>
+        <timePrd cycle="P2" event="start" date="1005-02-01">1005-02-01</timePrd>
+        <timePrd cycle="P2" event="end" date="1005-02-02">1005-02-02</timePrd>
+        <collDate cycle="P1" event="start" date="1006-01-01">1006-01-01</collDate>
+        <collDate cycle="P1" event="end" date="1006-01-01">1006-01-01</collDate>
+        <collDate cycle="P2" event="start" date="1006-02-01">1006-02-01</collDate>
+        <collDate cycle="P2" event="end" date="1006-02-02">1006-02-02</collDate>
+        <nation>Afghanistan</nation>
+        <nation>Albania</nation>
+        <geogCover>GeographicCoverageCity1</geogCover>
+        <geogCover>GeographicCoverageStateProvince1</geogCover>
+        <geogCover>GeographicCoverageOther1</geogCover>
+        <geogCover>GeographicCoverageCity2</geogCover>
+        <geogCover>GeographicCoverageStateProvince2</geogCover>
+        <geogCover>GeographicCoverageOther2</geogCover>
+        <geogUnit>GeographicUnit1</geogUnit>
+        <geogUnit>GeographicUnit2</geogUnit>
+        <geoBndBox>
+          <westBL>-72</westBL>
+          <eastBL>-70</eastBL>
+          <southBL>42</southBL>
+          <northBL>43</northBL>
+        </geoBndBox>
+        <anlyUnit>UnitOfAnalysis1</anlyUnit>
+        <anlyUnit>UnitOfAnalysis2</anlyUnit>
+        <universe>Universe1</universe>
+        <universe>Universe2</universe>
+        <dataKind>KindOfData1</dataKind>
+        <dataKind>KindOfData2</dataKind>
+      </sumDscr>
+      <notes>Notes1</notes>
+    </stdyInfo>
+    <method>
+      <dataColl>
+        <timeMeth>TimeMethod</timeMeth>
+        <dataCollector>LastDataCollector1, FirstDataCollector1</dataCollector>
+        <collectorTraining>CollectorTraining</collectorTraining>
+        <frequenc>Frequency</frequenc>
+        <sampProc>SamplingProcedure</sampProc>
+        <targetSampleSize>
+          <sampleSize>100</sampleSize>
+          <sampleSizeFormula>TargetSampleSizeFormula</sampleSizeFormula>
+        </targetSampleSize>
+        <deviat>MajorDeviationsForSampleDesign</deviat>
+        <collMode>CollectionMode</collMode>
+        <resInstru>TypeOfResearchInstrument</resInstru>
+        <sources>
+          <dataSrc>DataSources1</dataSrc>
+          <dataSrc>DataSources2</dataSrc>
+          <srcOrig>OriginOfSources</srcOrig>
+          <srcChar>CharacteristicOfSourcesNoted</srcChar>
+          <srcDocu>DocumentationAndAccessToSources</srcDocu>
+        </sources>
+        <collSitu>CharacteristicsOfDataCollectionSituation</collSitu>
+        <actMin>ActionsToMinimizeLosses</actMin>
+        <ConOps>ControlOperations</ConOps>
+        <weight>Weighting</weight>
+        <cleanOps>CleaningOperations</cleanOps>
+      </dataColl>
+      <notes type="NotesType" subject="NotesSubject">NotesText</notes>
+      <anlyInfo>
+        <respRate>ResponseRate</respRate>
+        <EstSmpErr>EstimatesOfSamplingError</EstSmpErr>
+        <dataAppr>OtherFormsOfDataAppraisal</dataAppr>
+      </anlyInfo>
+    </method>
+    <dataAccs>
+      <setAvail>
+        <accsPlac>Data Access Place</accsPlac>
+        <origArch>Original Archive</origArch>
+        <avlStatus>Availability Status</avlStatus>
+        <collSize>Size of Collection</collSize>
+        <complete>Study Completion</complete>
+      </setAvail>
+      <useStmt>
+        <confDec>Confidentiality Declaration</confDec>
+        <specPerm>Special Permissions</specPerm>
+        <restrctn>Restrictions</restrctn>
+        <contact>Contact for Access</contact>
+        <citReq>Citation Requirements</citReq>
+        <deposReq>Depositor Requirements</deposReq>
+        <conditions>Conditions </conditions>
+        <disclaimer>Disclaimer</disclaimer>
+      </useStmt>
+      <notes type="DVN:TOA" level="dv">Terms of Access</notes>
+      <notes type="DVN:TOU" level="dv">&lt;a href="http://creativecommons.org/publicdomain/zero/1.0"&gt;CC0 1.0&lt;/a&gt;</notes>
+    </dataAccs>
+    <othrStdyMat>
+      <relMat>RelatedMaterial1</relMat>
+      <relMat>RelatedMaterial2</relMat>
+      <relStdy>RelatedDatasets1</relStdy>
+      <relStdy>RelatedDatasets2</relStdy>
+      <relPubl>
+        <citation>
+          <titlStmt>
+            <titl>RelatedPublicationCitation1</titl>
+            <IDNo agency="ark">RelatedPublicationIDNumber1</IDNo>
+          </titlStmt>
+          <biblCit>RelatedPublicationCitation1</biblCit>
+        </citation>
+        <ExtLink URI="http://RelatedPublicationURL1.org"/>
+      </relPubl>
+      <relPubl>
+        <citation>
+          <titlStmt>
+            <titl>RelatedPublicationCitation2</titl>
+            <IDNo agency="arXiv">RelatedPublicationIDNumber2</IDNo>
+          </titlStmt>
+          <biblCit>RelatedPublicationCitation2</biblCit>
+        </citation>
+        <ExtLink URI="http://RelatedPublicationURL2.org"/>
+      </relPubl>
+      <othRefs>OtherReferences1</othRefs>
+      <othRefs>OtherReferences2</othRefs>
+    </othrStdyMat>
+    <notes>StudyLevelErrorNotes</notes>
+  </stdyDscr>
+</codeBook>
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtilTest.java
index 662fc26751f..4032f4649a4 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtilTest.java
@@ -5,27 +5,20 @@
  */
 package edu.harvard.iq.dataverse.export.dublincore;
 
-import edu.harvard.iq.dataverse.export.ddi.DdiExportUtil;
 import edu.harvard.iq.dataverse.util.xml.XmlPrinter;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileReader;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.primefaces.json.JSONObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import org.junit.jupiter.api.Test;
+import org.xmlunit.assertj3.XmlAssert;
+
 
 /**
  *
@@ -34,58 +27,31 @@
 public class DublinCoreExportUtilTest {
 
     private static final Logger logger = Logger.getLogger(DublinCoreExportUtilTest.class.getCanonicalName());
-    
-    public DublinCoreExportUtilTest() {
-    }
-    
-    @BeforeClass
-    public static void setUpClass() {
-    }
-    
-    @AfterClass
-    public static void tearDownClass() {
-    }
-    
-    @Before
-    public void setUp() {
-    }
-    
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test of datasetJson2dublincore method, of class DublinCoreExportUtil.
      */
     @Test
     public void testDatasetJson2dublincore() throws Exception {
-
-        File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json");
-        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
-       
+        // given
+        Path datasetVersionJson = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.json");
+        String datasetVersionAsJson = Files.readString(datasetVersionJson, StandardCharsets.UTF_8);
         JsonReader jsonReader = Json.createReader(new StringReader(datasetVersionAsJson));
         JsonObject obj = jsonReader.readObject();
         
-        File dubCoreFile = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finchDC.xml");
-        String datasetAsDdi = XmlPrinter.prettyPrintXml(new String(Files.readAllBytes(Paths.get(dubCoreFile.getAbsolutePath()))));
-        logger.info(datasetAsDdi);
+        Path dubCoreFile = Path.of("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finchDC.xml");
+        String datasetAsDdi = XmlPrinter.prettyPrintXml(Files.readString(dubCoreFile, StandardCharsets.UTF_8));
+        logger.fine(datasetAsDdi);
         
         OutputStream output = new ByteArrayOutputStream();
+        
+        // when
         DublinCoreExportUtil.datasetJson2dublincore(obj, output, DublinCoreExportUtil.DC_FLAVOR_DCTERMS);
         String result = XmlPrinter.prettyPrintXml(output.toString());
         
-        logger.info(result);
-        assertEquals(datasetAsDdi, result);
-        
-        /*
-        System.out.println("datasetJson2dublincore");
-        JsonObject datasetDtoAsJson = null;
-        OutputStream expResult = null;
-        OutputStream result = DublinCoreExportUtil.datasetJson2dublincore(datasetDtoAsJson);
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
-*/
+        // then
+        logger.fine(result);
+        XmlAssert.assertThat(result).and(datasetAsDdi).ignoreWhitespace().areSimilar();
     }
     
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolHandlerTest.java b/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolHandlerTest.java
index 50ebf32cd48..639a7c542c4 100644
--- a/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolHandlerTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolHandlerTest.java
@@ -5,25 +5,40 @@
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
-import javax.json.Json;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.URLTokenUtil;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.api.Test;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
-
+@LocalJvmSettings
 public class ExternalToolHandlerTest {
 
     // TODO: It would probably be better to split these into individual tests.
     @Test
     public void testGetToolUrlWithOptionalQueryParameters() {
-        ExternalTool.Type type = ExternalTool.Type.EXPLORE;
+        List<ExternalToolType> externalToolTypes = new ArrayList<>();
+        ExternalToolType externalToolType = new ExternalToolType();
+        externalToolType.setType(ExternalTool.Type.EXPLORE);
+        externalToolTypes.add(externalToolType);
         ExternalTool.Scope scope = ExternalTool.Scope.FILE;
         String toolUrl = "http://example.com";
-        ExternalTool externalTool = new ExternalTool("displayName", "description", type, scope, toolUrl, "{}", DataFileServiceBean.MIME_TYPE_TSV_ALT);
+        ExternalTool externalTool = new ExternalTool("displayName", "toolName", "description", externalToolTypes, scope, toolUrl, "{}", DataFileServiceBean.MIME_TYPE_TSV_ALT);
 
         // One query parameter, not a reserved word, no {fileId} (required) used.
         externalTool.setToolParameters(Json.createObjectBuilder()
@@ -39,7 +54,7 @@ public void testGetToolUrlWithOptionalQueryParameters() {
         Exception expectedException1 = null;
         String nullLocaleCode = null;
         try {
-            ExternalToolHandler externalToolHandler1 = new ExternalToolHandler(externalTool, nullDataFile, nullApiToken, nullFileMetadata, nullLocaleCode);
+            URLTokenUtil externalToolHandler1 = new ExternalToolHandler(externalTool, nullDataFile, nullApiToken, nullFileMetadata, nullLocaleCode);
         } catch (Exception ex) {
             expectedException1 = ex;
         }
@@ -57,7 +72,7 @@ public void testGetToolUrlWithOptionalQueryParameters() {
         DataFile dataFile = new DataFile();
         dataFile.setId(42l);
         try {
-            ExternalToolHandler externalToolHandler1 = new ExternalToolHandler(externalTool, dataFile, nullApiToken, nullFileMetadata, nullLocaleCode);
+            URLTokenUtil externalToolHandler1 = new ExternalToolHandler(externalTool, dataFile, nullApiToken, nullFileMetadata, nullLocaleCode);
         } catch (Exception ex) {
             expectedException1 = ex;
         }
@@ -78,7 +93,7 @@ public void testGetToolUrlWithOptionalQueryParameters() {
                 .build().toString());
         Exception expectedException2 = null;
         try {
-            ExternalToolHandler externalToolHandler2 = new ExternalToolHandler(externalTool, nullDataFile, nullApiToken, nullFileMetadata, nullLocaleCode);
+            URLTokenUtil externalToolHandler2 = new ExternalToolHandler(externalTool, nullDataFile, nullApiToken, nullFileMetadata, nullLocaleCode);
         } catch (Exception ex) {
             expectedException2 = ex;
         }
@@ -108,7 +123,7 @@ public void testGetToolUrlWithOptionalQueryParameters() {
         ApiToken apiToken = new ApiToken();
         apiToken.setTokenString("7196b5ce-f200-4286-8809-03ffdbc255d7");
         ExternalToolHandler externalToolHandler3 = new ExternalToolHandler(externalTool, dataFile, apiToken, fmd, nullLocaleCode);
-        String result3 = externalToolHandler3.getQueryParametersForUrl();
+        String result3 = externalToolHandler3.handleRequest();
         System.out.println("result3: " + result3);
         assertEquals("?key1=42&key2=7196b5ce-f200-4286-8809-03ffdbc255d7", result3);
 
@@ -128,7 +143,7 @@ public void testGetToolUrlWithOptionalQueryParameters() {
                 )
                 .build().toString());
         ExternalToolHandler externalToolHandler6 = new ExternalToolHandler(externalTool, dataFile, apiToken, fmd, nullLocaleCode);
-        String result6 = externalToolHandler6.getQueryParametersForUrl();
+        String result6 = externalToolHandler6.handleRequest();
         System.out.println("result6: " + result6);
         assertEquals("?key1=42&key2=7196b5ce-f200-4286-8809-03ffdbc255d7&key3=2", result6);
 
@@ -144,7 +159,7 @@ public void testGetToolUrlWithOptionalQueryParameters() {
                 )
                 .build().toString());
         ExternalToolHandler externalToolHandler4 = new ExternalToolHandler(externalTool, dataFile, nullApiToken, fmd, nullLocaleCode);
-        String result4 = externalToolHandler4.getQueryParametersForUrl();
+        String result4 = externalToolHandler4.handleRequest();
         System.out.println("result4: " + result4);
         assertEquals("?key1=42", result4);
 
@@ -166,7 +181,7 @@ public void testGetToolUrlWithOptionalQueryParameters() {
                 )
                 .build().toString());
         ExternalToolHandler externalToolHandler7 = new ExternalToolHandler(externalTool, dataFile, apiToken, fmd, "en");
-        String result7 = externalToolHandler7.getQueryParametersForUrl();
+        String result7 = externalToolHandler7.handleRequest();
         System.out.println("result7: " + result7);
         assertEquals("?key1=42&key2=7196b5ce-f200-4286-8809-03ffdbc255d7&key3=2&key4=en", result7);
 
@@ -184,7 +199,7 @@ public void testGetToolUrlWithOptionalQueryParameters() {
         Exception expectedException = null;
         try {
             ExternalToolHandler externalToolHandler5 = new ExternalToolHandler(externalTool, dataFile, nullApiToken, fmd, nullLocaleCode);
-            String result5 = externalToolHandler5.getQueryParametersForUrl();
+            String result5 = externalToolHandler5.handleRequest();
             System.out.println("result5: " + result5);
         } catch (Exception ex) {
             System.out.println("Exception caught: " + ex);
@@ -194,5 +209,74 @@ public void testGetToolUrlWithOptionalQueryParameters() {
         assertEquals("Unknown reserved word: {junk}", expectedException.getMessage());
 
     }
+    
+    
+    @Test
+    @JvmSetting(key = JvmSettings.SITE_URL, value = "https://librascholar.org")
+    public void testGetToolUrlWithAllowedApiCalls() {
+        System.out.println("allowedApiCalls test");
+        Dataset ds = new Dataset();
+        ds.setId(1L);
+        ApiToken at = new ApiToken();
+        AuthenticatedUser au = new AuthenticatedUser();
+        au.setUserIdentifier("dataverseAdmin");
+        at.setAuthenticatedUser(au);
+        at.setTokenString("1234");
+        ExternalTool et = ExternalToolServiceBeanTest.getAllowedApiCallsTool();
+        assertTrue(et != null);
+        System.out.println("allowedApiCalls et created");
+        System.out.println(et.getAllowedApiCalls());
+        URLTokenUtil externalToolHandler = new ExternalToolHandler(et, ds, at, null);
+        System.out.println("allowedApiCalls eth created");
+        JsonObject jo = externalToolHandler
+                .createPostBody(externalToolHandler.getParams(JsonUtil.getJsonObject(et.getToolParameters())), JsonUtil.getJsonArray(et.getAllowedApiCalls())).build();
+        assertEquals(1, jo.getJsonObject("queryParameters").getInt("datasetId"));
+        String signedUrl = jo.getJsonArray("signedUrls").getJsonObject(0).getString("signedUrl");
+        // The date and token will change each time but check for the constant parts of
+        // the response
+        assertTrue(signedUrl.contains("https://librascholar.org/api/v1/datasets/1"));
+        assertTrue(signedUrl.contains("&user=dataverseAdmin"));
+        assertTrue(signedUrl.contains("&method=GET"));
+        assertTrue(signedUrl.contains("&token="));
+        System.out.println(JsonUtil.prettyPrint(jo));
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.SITE_URL, value = "https://librascholar.org")
+    public void testDatasetConfigureTool() {
+        List<ExternalToolType> externalToolTypes = new ArrayList<>();
+        var externalToolType = new ExternalToolType();
+        externalToolType.setType(ExternalTool.Type.CONFIGURE);
+        externalToolTypes.add(externalToolType);
+        var scope = ExternalTool.Scope.DATASET;
+        String toolUrl = "http://example.com";
+        var externalTool = new ExternalTool("displayName", "toolName", "description", externalToolTypes, scope, toolUrl, "{}", DataFileServiceBean.MIME_TYPE_TSV_ALT);
+
+        externalTool.setToolParameters(Json.createObjectBuilder()
+                .add("queryParameters", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("siteUrl", "{siteUrl}")
+                        )
+                        .add(Json.createObjectBuilder()
+                                .add("datasetPid", "{datasetPid}")
+                        )
+                        .add(Json.createObjectBuilder()
+                                .add("localeCode", "{localeCode}")
+                        )
+                )
+                .build().toString());
+
+        var dataset = new Dataset();
+        dataset.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, "10.5072", "ABC123", null, AbstractDOIProvider.DOI_RESOLVER_URL, null));
+        ApiToken nullApiToken = null;
+        String nullLocaleCode = "en";
+        var externalToolHandler = new ExternalToolHandler(externalTool, dataset, nullApiToken, nullLocaleCode);
+        System.out.println("tool: " + externalToolHandler.getToolUrlWithQueryParams());
+        assertEquals("http://example.com?siteUrl=https://librascholar.org&datasetPid=doi:10.5072/ABC123&localeCode=en", externalToolHandler.getToolUrlWithQueryParams());
+        assertFalse(externalToolHandler.getExternalTool().isExploreTool());
+        assertEquals("configure", externalToolHandler.getExternalTool().getExternalToolTypes().get(0).getType().toString());
+        assertEquals("dataset", externalToolHandler.getExternalTool().getScope().toString());
+
+    }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolServiceBeanTest.java
index 34ba97584da..d2a68ea8da6 100644
--- a/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolServiceBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolServiceBeanTest.java
@@ -8,24 +8,31 @@
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.dataaccess.AbstractRemoteOverlayAccessIO;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.util.URLTokenUtil;
+
 import java.util.ArrayList;
 import java.util.List;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import org.junit.Test;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ExternalToolServiceBeanTest {
 
+    private final ExternalToolServiceBean externalToolService;
+
     public ExternalToolServiceBeanTest() {
+        this.externalToolService = new ExternalToolServiceBean();
     }
 
     @Test
     public void testfindAll() {
         DataFile dataFile = new DataFile();
         dataFile.setId(42l);
+        dataFile.setStorageIdentifier("test://18debaa2d7c-db98ef7d9a77");
         FileMetadata fmd = new FileMetadata();
         fmd.setId(2L);
         DatasetVersion dv = new DatasetVersion();
@@ -40,13 +47,16 @@ public void testfindAll() {
         dataFile.setDataTables(dataTables);
         ApiToken apiToken = new ApiToken();
         apiToken.setTokenString("7196b5ce-f200-4286-8809-03ffdbc255d7");
-        ExternalTool.Type type = ExternalTool.Type.EXPLORE;
+        List<ExternalToolType> externalToolTypes = new ArrayList<>();
+        ExternalToolType externalToolType = new ExternalToolType();
+        externalToolType.setType(ExternalTool.Type.EXPLORE);
+        externalToolTypes.add(externalToolType);
         ExternalTool.Scope scope = ExternalTool.Scope.FILE;
-        ExternalTool externalTool = new ExternalTool("displayName", "description", type, scope, "http://foo.com", "{}", DataFileServiceBean.MIME_TYPE_TSV_ALT);
-        ExternalToolHandler externalToolHandler4 = new ExternalToolHandler(externalTool, dataFile, apiToken, fmd, null);
+        ExternalTool externalTool = new ExternalTool("displayName", "toolName", "description", externalToolTypes, scope, "http://foo.com", "{}", DataFileServiceBean.MIME_TYPE_TSV_ALT);
+        URLTokenUtil externalToolHandler4 = new ExternalToolHandler(externalTool, dataFile, apiToken, fmd, null);
         List<ExternalTool> externalTools = new ArrayList<>();
         externalTools.add(externalTool);
-        List<ExternalTool> availableExternalTools = ExternalToolServiceBean.findExternalToolsByFile(externalTools, dataFile);
+        List<ExternalTool> availableExternalTools = externalToolService.findExternalToolsByFile(externalTools, dataFile);
         assertEquals(availableExternalTools.size(), 1);
     }
 
@@ -54,10 +64,13 @@ public void testfindAll() {
     public void testParseAddExternalToolInput() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
         job.add("description", "This tool is awesome.");
         job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "file");
         job.add("toolUrl", "http://awesometool.com");
+        job.add("hasPreviewMode", "false");
         job.add("toolParameters", Json.createObjectBuilder()
                 .add("queryParameters", Json.createArrayBuilder()
                         .add(Json.createObjectBuilder()
@@ -79,6 +92,7 @@ public void testParseAddExternalToolInput() {
         System.out.println("tool: " + tool);
         ExternalTool externalTool = ExternalToolServiceBean.parseAddExternalToolManifest(tool);
         assertEquals("AwesomeTool", externalTool.getDisplayName());
+        assertEquals("explorer", externalTool.getToolName());
         DataFile dataFile = new DataFile();
         dataFile.setId(42l);
         FileMetadata fmd = new FileMetadata();
@@ -102,9 +116,11 @@ public void testParseAddExternalToolInput() {
     public void testParseAddFileToolFilePid() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
         job.add("description", "This tool is awesome.");
-        job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "file");
+        job.add("hasPreviewMode", "false");
         job.add("toolUrl", "http://awesometool.com");
         job.add("toolParameters", Json.createObjectBuilder()
                 .add("queryParameters", Json.createArrayBuilder()
@@ -127,9 +143,10 @@ public void testParseAddFileToolFilePid() {
         System.out.println("tool: " + tool);
         ExternalTool externalTool = ExternalToolServiceBean.parseAddExternalToolManifest(tool);
         assertEquals("AwesomeTool", externalTool.getDisplayName());
+        assertEquals("explorer", externalTool.getToolName());
         DataFile dataFile = new DataFile();
         dataFile.setId(42l);
-        dataFile.setGlobalId(new GlobalId("doi:10.5072/FK2/RMQT6J/G9F1A1"));
+        dataFile.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL,"10.5072","FK2/RMQT6J/G9F1A1", "/", AbstractDOIProvider.DOI_RESOLVER_URL, null));
         FileMetadata fmd = new FileMetadata();
         fmd.setId(2L);
         DatasetVersion dv = new DatasetVersion();
@@ -151,9 +168,11 @@ public void testParseAddFileToolFilePid() {
     public void testParseAddExternalToolInputNoFileId() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
         job.add("description", "This tool is awesome.");
-        job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "file");
+        job.add("hasPreviewMode", "false");
         job.add("toolUrl", "http://awesometool.com");
         job.add("toolParameters", Json.createObjectBuilder()
                 .add("queryParameters", Json.createArrayBuilder()
@@ -203,9 +222,11 @@ public void testParseAddExternalToolInputEmptyString() {
     public void testParseAddExternalToolInputUnknownReservedWord() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
         job.add("description", "This tool is awesome.");
-        job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "file");
+        job.add("hasPreviewMode", "false");
         job.add("toolUrl", "http://awesometool.com");
         job.add("toolParameters", Json.createObjectBuilder()
                 .add("queryParameters", Json.createArrayBuilder()
@@ -236,8 +257,10 @@ public void testParseAddExternalToolInputUnknownReservedWord() {
     @Test
     public void testParseAddExternalToolInputNoDisplayName() {
         JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("toolName", "dct");
         job.add("description", "This tool is awesome.");
         job.add("toolUrl", "http://awesometool.com");
+        job.add("hasPreviewMode", "false");
         job.add("toolParameters", Json.createObjectBuilder().build());
         job.add(ExternalTool.CONTENT_TYPE, DataFileServiceBean.MIME_TYPE_TSV_ALT);
         String tool = job.build().toString();
@@ -256,6 +279,8 @@ public void testParseAddExternalToolInputNoDisplayName() {
     public void testParseAddExternalToolInputNoDescription() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "dct");
+        job.add("hasPreviewMode", "false");
         job.add("toolUrl", "http://awesometool.com");
         job.add("toolParameters", Json.createObjectBuilder().build());
         job.add(ExternalTool.CONTENT_TYPE, DataFileServiceBean.MIME_TYPE_TSV_ALT);
@@ -275,9 +300,11 @@ public void testParseAddExternalToolInputNoDescription() {
     public void testParseAddExternalToolInputNoToolUrl() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
         job.add("description", "This tool is awesome.");
-        job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "file");
+        job.add("hasPreviewMode", "false");
         job.add("toolParameters", Json.createObjectBuilder().build());
         job.add(ExternalTool.CONTENT_TYPE, DataFileServiceBean.MIME_TYPE_TSV_ALT);
         String tool = job.build().toString();
@@ -296,9 +323,11 @@ public void testParseAddExternalToolInputNoToolUrl() {
     public void testParseAddExternalToolInputWrongType() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "dct");
         job.add("description", "This tool is awesome.");
-        job.add("type", "noSuchType");
+        job.add("types", Json.createArrayBuilder().add("noSuchType"));
         job.add("scope", "file");
+        job.add("hasPreviewMode", "false");
         job.add("toolUrl", "http://awesometool.com");
         job.add("toolParameters", Json.createObjectBuilder().build());
         job.add(ExternalTool.CONTENT_TYPE, DataFileServiceBean.MIME_TYPE_TSV_ALT);
@@ -312,16 +341,18 @@ public void testParseAddExternalToolInputWrongType() {
         }
         assertNotNull(expectedException);
         System.out.println("exception: " + expectedException);
-        assertEquals("Type must be one of these values: [explore, configure].", expectedException.getMessage());
+        assertEquals("Type must be one of these values: [explore, configure, preview, query].", expectedException.getMessage());
     }
 
     @Test
     public void testParseAddExternalToolInputNoContentType() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
         job.add("description", "This tool is awesome.");
-        job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "file");
+        job.add("hasPreviewMode", "false");
         job.add("toolUrl", "http://awesometool.com");
 
         job.add("toolParameters", Json.createObjectBuilder().add("queryParameters", Json.createArrayBuilder()
@@ -349,9 +380,11 @@ public void testParseAddExternalToolInputNoContentType() {
     public void testParseAddDatasetToolNoRequiredFields() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
         job.add("description", "This tool is awesome.");
-        job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "dataset");
+        job.add("hasPreviewMode", "false");
         job.add("toolUrl", "http://awesometool.com");
 
         job.add("toolParameters", Json.createObjectBuilder().add("queryParameters", Json.createArrayBuilder()
@@ -376,10 +409,12 @@ public void testParseAddDatasetToolNoRequiredFields() {
     public void testParseAddDatasetToolDatasetId() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
         job.add("description", "This tool is awesome.");
-        job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "dataset");
         job.add("toolUrl", "http://awesometool.com");
+        job.add("hasPreviewMode", "true");
 
         job.add("toolParameters", Json.createObjectBuilder().add("queryParameters", Json.createArrayBuilder()
                 .add(Json.createObjectBuilder()
@@ -407,9 +442,11 @@ public void testParseAddDatasetToolDatasetId() {
     public void testParseAddDatasetToolDatasetPid() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
         job.add("description", "This tool is awesome.");
-        job.add("type", "explore");
+        job.add("types", Json.createArrayBuilder().add("explore"));
         job.add("scope", "dataset");
+        job.add("hasPreviewMode", "false");
         job.add("toolUrl", "http://awesometool.com");
 
         job.add("toolParameters", Json.createObjectBuilder().add("queryParameters", Json.createArrayBuilder()
@@ -434,4 +471,127 @@ public void testParseAddDatasetToolDatasetPid() {
         assertNull(externalTool.getContentType());
     }
 
+    /**
+     * Originally, "type" accepted a single value. These days "types" accepts an
+     * array of multiple values.
+     */
+    @Test
+    public void testParseAddToolWithLegacyType() {
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
+        job.add("description", "This tool is awesome.");
+        job.add("type", "explore");
+        job.add("scope", "dataset");
+        job.add("toolUrl", "http://awesometool.com");
+        job.add("hasPreviewMode", "true");
+
+        job.add("toolParameters", Json.createObjectBuilder().add("queryParameters", Json.createArrayBuilder()
+                .add(Json.createObjectBuilder()
+                        .add("datasetId", "{datasetId}")
+                        .build())
+                .add(Json.createObjectBuilder()
+                        .add("key", "{apiToken}")
+                        .build())
+                .build())
+                .build());
+        String tool = job.build().toString();
+        System.out.println("tool: " + tool);
+
+        ExternalTool externalTool = null;
+        try {
+            externalTool = ExternalToolServiceBean.parseAddExternalToolManifest(tool);
+        } catch (Exception ex) {
+            System.out.println(ex.getMessage());
+        }
+        assertNotNull(externalTool);
+        assertNull(externalTool.getContentType());
+    }
+
+    @Test
+    public void testParseAddDatasetToolAllowedApiCalls() {
+ 
+        ExternalTool externalTool = null;
+        try {
+            externalTool = getAllowedApiCallsTool();
+        } catch (Exception ex) {
+            System.out.println(ex.getMessage());
+        }
+        assertNotNull(externalTool);
+        assertNull(externalTool.getContentType());
+    }
+
+    protected static ExternalTool getAllowedApiCallsTool() {
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
+        job.add("description", "This tool is awesome.");
+        job.add("types", Json.createArrayBuilder().add("explore"));
+        job.add("scope", "dataset");
+        job.add("toolUrl", "http://awesometool.com");
+        job.add("hasPreviewMode", "true");
+
+        job.add("toolParameters", Json.createObjectBuilder()
+                .add("httpMethod", "GET")
+                .add("queryParameters",
+                        Json.createArrayBuilder()
+                    .add(Json.createObjectBuilder()
+                        .add("datasetId", "{datasetId}")
+                    )
+                )
+            ).add("allowedApiCalls", Json.createArrayBuilder()
+                .add(Json.createObjectBuilder()
+                .add("name", "getDataset")
+                .add("httpMethod", "GET")
+                .add("urlTemplate", "/api/v1/datasets/{datasetId}")
+                .add("timeOut", 10))
+            );
+        String tool = job.build().toString();
+        System.out.println("tool: " + tool);
+
+        return ExternalToolServiceBean.parseAddExternalToolManifest(tool);
+    }
+
+    @Test
+    public void testParseAddFileToolRequireAuxFile() {
+        JsonObjectBuilder job = Json.createObjectBuilder();
+        job.add("displayName", "AwesomeTool");
+        job.add("toolName", "explorer");
+        job.add("description", "This tool is awesome.");
+        job.add("types", Json.createArrayBuilder().add("explore"));
+        job.add("scope", "file");
+        job.add("hasPreviewMode", "false");
+        job.add("toolUrl", "http://awesometool.com");
+        job.add("toolParameters", Json.createObjectBuilder()
+                .add("queryParameters", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("filePid", "{filePid}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("key", "{apiToken}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("fileMetadataId", "{fileMetadataId}")
+                                .build())
+                        .add(Json.createObjectBuilder()
+                                .add("dvLocale", "{localeCode}")
+                                .build())
+                        .build())
+                .build());
+        job.add("requirements", Json.createObjectBuilder()
+                .add("auxFilesExist", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add("formatTag", "NcML")
+                                .add("formatVersion", "0.1")
+                        )
+                )
+        );
+        job.add(ExternalTool.CONTENT_TYPE, DataFileServiceBean.MIME_TYPE_TSV_ALT);
+        String tool = job.build().toString();
+        ExternalTool externalTool = ExternalToolServiceBean.parseAddExternalToolManifest(tool);
+        assertEquals("AwesomeTool", externalTool.getDisplayName());
+        assertEquals("explorer", externalTool.getToolName());
+        assertEquals("{\"auxFilesExist\":[{\"formatTag\":\"NcML\",\"formatVersion\":\"0.1\"}]}", externalTool.getRequirements());
+    }
+
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolTest.java b/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolTest.java
index 6dc4cfed44e..ea8613b70bf 100644
--- a/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolTest.java
@@ -1,32 +1,41 @@
 package edu.harvard.iq.dataverse.externaltools;
 
-import javax.json.JsonObject;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import jakarta.json.JsonObject;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 import edu.harvard.iq.dataverse.DataFileServiceBean;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ExternalToolTest {
 
     @Test
     public void testToJson() {
         System.out.println("toJson");
         String displayName = "myDisplayName";
+        String toolName = "explorer";
         String description = "myDescription";
         ExternalTool.Type type = ExternalTool.Type.EXPLORE;
+        List<ExternalToolType> externalToolTypes = new ArrayList<>();
+        ExternalToolType externalToolType = new ExternalToolType();
+        externalToolType.setType(ExternalTool.Type.EXPLORE);
+        externalToolTypes.add(externalToolType);
         ExternalTool.Scope scope = ExternalTool.Scope.FILE;
         String toolUrl = "http://example.com";
         String toolParameters = "{}";
-        ExternalTool externalTool = new ExternalTool(displayName, description, type, scope, toolUrl, toolParameters, DataFileServiceBean.MIME_TYPE_TSV_ALT);
+        ExternalTool externalTool = new ExternalTool(displayName, toolName, description, externalToolTypes, scope, toolUrl, toolParameters, DataFileServiceBean.MIME_TYPE_TSV_ALT);
         externalTool.setId(42l);
         JsonObject jsonObject = externalTool.toJson().build();
         System.out.println("result: " + jsonObject);
-        assertEquals("testToJson() with ExternalTool.DISPLAY_NAME", "myDisplayName", jsonObject.getString(ExternalTool.DISPLAY_NAME));
-        assertEquals("testToJson() with ExternalTool.DESCRIPTION", "myDescription", jsonObject.getString(ExternalTool.DESCRIPTION));
-        assertEquals("testToJson() with ExternalTool.TYPE", "explore", jsonObject.getString(ExternalTool.TYPE));
-        assertEquals("testToJson() with ExternalTool.TOOL_URL", "http://example.com", jsonObject.getString(ExternalTool.TOOL_URL));
-        assertEquals("testToJson() with ExternalTool.TOOL_PARAMETERS", "{}", jsonObject.getString(ExternalTool.TOOL_PARAMETERS));
-        assertEquals("testToJson() with ExternalTool.CONTENT_TYPE", DataFileServiceBean.MIME_TYPE_TSV_ALT, jsonObject.getString(ExternalTool.CONTENT_TYPE));
+        assertEquals("myDisplayName", jsonObject.getString(ExternalTool.DISPLAY_NAME), "testToJson() with ExternalTool.DISPLAY_NAME");
+        assertEquals("explorer", jsonObject.getString(ExternalTool.TOOL_NAME), "testToJson() with ExternalTool.TOOL_NAME");
+        assertEquals("myDescription", jsonObject.getString(ExternalTool.DESCRIPTION), "testToJson() with ExternalTool.DESCRIPTION");
+        assertEquals("explore", jsonObject.getJsonArray(ExternalTool.TYPES).getString(0), "testToJson() with ExternalTool.TYPES");
+        assertEquals("http://example.com", jsonObject.getString(ExternalTool.TOOL_URL), "testToJson() with ExternalTool.TOOL_URL");
+        assertEquals("{}", jsonObject.getString(ExternalTool.TOOL_PARAMETERS), "testToJson() with ExternalTool.TOOL_PARAMETERS");
+        assertEquals(DataFileServiceBean.MIME_TYPE_TSV_ALT, jsonObject.getString(ExternalTool.CONTENT_TYPE), "testToJson() with ExternalTool.CONTENT_TYPE");
     }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/featured/DataverseFeaturedItemTest.java b/src/test/java/edu/harvard/iq/dataverse/featured/DataverseFeaturedItemTest.java
new file mode 100644
index 00000000000..f20a80eadbf
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/featured/DataverseFeaturedItemTest.java
@@ -0,0 +1,71 @@
+package edu.harvard.iq.dataverse.featured;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class DataverseFeaturedItemTest {
+
+    DataverseFeaturedItem dfi = new DataverseFeaturedItem();
+    Dataset ds = new Dataset();
+    DataFile df = new DataFile();
+    String validTypes = Arrays.stream(DataverseFeaturedItem.TYPES.values()).map(t -> t.name()).collect(Collectors.joining(", "));
+
+    @BeforeEach
+    public void setUp() {
+        dfi.setType("custom");
+        dfi.setDvObject(null);
+    }
+    @Test
+    public void test_validTypeAndDvObject() {
+        // set a Dataset
+        ds.setPublicationDate(Timestamp.from(Instant.now()));
+        dfi.setDvObject("Dataset", ds);
+        assertEquals("dataset", dfi.getType());
+        assertEquals(ds, dfi.getDvObject());
+
+        // update with Datafile
+        df.setPublicationDate(Timestamp.from(Instant.now()));
+        dfi.setDvObject("Datafile", df);
+        assertEquals("datafile", dfi.getType());
+        assertEquals(df, dfi.getDvObject());
+    }
+
+    @Test
+    public void test_typeDvObjectMismatch() {
+        Throwable exception = assertThrows(IllegalArgumentException.class, () -> dfi.setDvObject("Dataverse", new Dataset()));
+        String msg = BundleUtil.getStringFromBundle("dataverse.update.featuredItems.error.typeAndDvObjectMismatch");
+        assertEquals(msg, exception.getMessage());
+        assertEquals("custom", dfi.getType());
+        assertNull(dfi.getDvObject());
+    }
+
+    @Test
+    public void test_typeWithNullDvObject() {
+        Throwable exception = assertThrows(IllegalArgumentException.class, () -> dfi.setDvObject("Dataverse", null));
+        String msg = BundleUtil.getStringFromBundle("find.dvo.error.dvObjectNotFound", List.of("unknown"));
+        assertEquals(msg, exception.getMessage());
+        assertEquals("custom", dfi.getType());
+        assertNull(dfi.getDvObject());
+    }
+
+    @Test
+    public void test_typeWithInvalidType() {
+        Throwable exception = assertThrows(IllegalArgumentException.class, () -> dfi.setDvObject("xdataset", new Dataset()));
+        String msg = BundleUtil.getStringFromBundle("dataverse.update.featuredItems.error.invalidType", List.of(validTypes));
+        assertEquals(msg, exception.getMessage());
+        assertEquals("custom", dfi.getType());
+        assertNull(dfi.getDvObject());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/feedback/FeedbackUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/feedback/FeedbackUtilTest.java
index 07aff9d5836..072be13dcec 100644
--- a/src/test/java/edu/harvard/iq/dataverse/feedback/FeedbackUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/feedback/FeedbackUtilTest.java
@@ -5,7 +5,6 @@
 import edu.harvard.iq.dataverse.DataFileCategory;
 import edu.harvard.iq.dataverse.DataFileTag;
 import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
 import edu.harvard.iq.dataverse.DatasetFieldType;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.Dataverse;
@@ -14,8 +13,11 @@
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.mocks.MockDatasetFieldSvc;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
 import edu.harvard.iq.dataverse.util.json.JsonParser;
 import java.io.File;
@@ -25,21 +27,19 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.BeforeClass;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockito.Mockito;
 
 public class FeedbackUtilTest {
 
@@ -54,10 +54,13 @@ public class FeedbackUtilTest {
     private static DatasetVersion dsVersionNoContacts;
     private static MockDatasetFieldSvc datasetFieldTypeSvc;
     private static InternetAddress systemAddress;
+    private static final SettingsServiceBean settingsService = Mockito.mock(SettingsServiceBean.class);
+    private static final LicenseServiceBean licenseService = Mockito.mock(LicenseServiceBean.class);
+    private static final DatasetTypeServiceBean datasetTypeService = Mockito.mock(DatasetTypeServiceBean.class);
     private static final String systemEmail = "support@librascholar.edu";
     private static final boolean weKnowHowToCreateMockAuthenticatedUsers = false;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws IOException, JsonParseException, AddressException {
 
         if (weKnowHowToCreateMockAuthenticatedUsers) {
@@ -69,6 +72,7 @@ public static void setUpClass() throws IOException, JsonParseException, AddressE
         systemAddress = new InternetAddress(systemEmail, supportTeamName);
 
         datasetFieldTypeSvc = new MockDatasetFieldSvc();
+        datasetFieldTypeSvc.setMetadataBlock("citation");
         DatasetFieldType titleType = datasetFieldTypeSvc.add(new DatasetFieldType("title", DatasetFieldType.FieldType.TEXTBOX, false));
         DatasetFieldType authorType = datasetFieldTypeSvc.add(new DatasetFieldType("author", DatasetFieldType.FieldType.TEXT, true));
         Set<DatasetFieldType> authorChildTypes = new HashSet<>();
@@ -142,7 +146,7 @@ public static void setUpClass() throws IOException, JsonParseException, AddressE
         JsonReader jsonReader1 = Json.createReader(new StringReader(datasetVersionAsJson));
         JsonObject json1 = jsonReader1.readObject();
 
-        JsonParser jsonParser = new JsonParser(datasetFieldTypeSvc, null, null);
+        JsonParser jsonParser = new JsonParser(datasetFieldTypeSvc, null, settingsService, licenseService, datasetTypeService);
         dsVersion = jsonParser.parseDatasetVersion(json1.getJsonObject("datasetVersion"));
 
         File datasetVersionJson2 = new File("tests/data/datasetContacts1.json");
@@ -151,14 +155,14 @@ public static void setUpClass() throws IOException, JsonParseException, AddressE
         JsonReader jsonReader12 = Json.createReader(new StringReader(datasetVersionAsJson2));
         JsonObject json12 = jsonReader12.readObject();
 
-        JsonParser jsonParser2 = new JsonParser(datasetFieldTypeSvc, null, null);
+        JsonParser jsonParser2 = new JsonParser(datasetFieldTypeSvc, null, settingsService, licenseService, datasetTypeService);
         dsVersion2 = jsonParser2.parseDatasetVersion(json12.getJsonObject("datasetVersion"));
 
         File datasetVersionJsonNoContacts = new File("tests/data/datasetNoContacts.json");
         String datasetVersionAsJsonNoContacts = new String(Files.readAllBytes(Paths.get(datasetVersionJsonNoContacts.getAbsolutePath())));
         JsonReader jsonReaderNoContacts = Json.createReader(new StringReader(datasetVersionAsJsonNoContacts));
         JsonObject jsonNoContacts = jsonReaderNoContacts.readObject();
-        JsonParser jsonParserNoContacts = new JsonParser(datasetFieldTypeSvc, null, null);
+        JsonParser jsonParserNoContacts = new JsonParser(datasetFieldTypeSvc, null, settingsService, licenseService, datasetTypeService);
         dsVersionNoContacts = jsonParserNoContacts.parseDatasetVersion(jsonNoContacts.getJsonObject("datasetVersion"));
 
         FeedbackUtil justForCodeCoverage = new FeedbackUtil();
@@ -175,9 +179,8 @@ public void testGatherFeedbackOnDataverse() {
         String messageSubject = "nice dataverse";
         String userMessage = "Let's talk!";
         System.out.println("first gather feedback");
-        List<Feedback> feedbacks1 = FeedbackUtil.gatherFeedback(dataverse, dataverseSessionNull, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        Feedback feedback = feedbacks1.get(0);
-        assertEquals(installationBrandName + " contact: " + messageSubject, feedback.getSubject());
+        Feedback feedback1 = FeedbackUtil.gatherFeedback(dataverse, dataverseSessionNull, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, true);
+        assertEquals(installationBrandName + " contact: " + messageSubject, feedback1.getSubject());
         String expectedBody
                 = "You have just been sent the following message from " + userEmail + " "
                 + "via the " + installationBrandName + " hosted dataverse named \"dvAlias1\":\n\n"
@@ -191,23 +194,26 @@ public void testGatherFeedbackOnDataverse() {
                 + "If you believe this was an error, please contact "
                 + supportTeamName + " at " + systemEmail + ". "
                 + "To respond directly to the individual who sent the message, simply reply to this email.";
-        System.out.println("body:\n\n" + feedback.getBody());
-        assertEquals(expectedBody, feedback.getBody());
-        assertEquals("dvContact1@librascholar.edu", feedback.getToEmail());
-        assertEquals("personClickingContactOrSupportButton@example.com", feedback.getFromEmail());
-        JsonObject jsonObject = feedback.toJsonObjectBuilder().build();
+        System.out.println("body:\n\n" + feedback1.getBody());
+        assertEquals(expectedBody, feedback1.getBody());
+        assertEquals("dvContact1@librascholar.edu,dvContact2@librascholar.edu", feedback1.getToEmail());
+        assertEquals(systemEmail, feedback1.getCcEmail());
+        
+        assertEquals("personClickingContactOrSupportButton@example.com", feedback1.getFromEmail());
+        JsonObject jsonObject = feedback1.toJsonObjectBuilder().build();
         System.out.println("json: " + jsonObject);
         assertEquals("personClickingContactOrSupportButton@example.com", jsonObject.getString("fromEmail"));
-        assertEquals("dvContact1@librascholar.edu", jsonObject.getString("toEmail"));
+        assertEquals("dvContact1@librascholar.edu,dvContact2@librascholar.edu", jsonObject.getString("toEmail"));
+        assertEquals(systemEmail, jsonObject.getString("ccEmail"));
         assertEquals(installationBrandName + " contact: " + "nice dataverse", jsonObject.getString("subject"));
         dataverse.setDataverseContacts(new ArrayList<>());
         System.out.println("second gather feedback");
-        List<Feedback> feedbacks2 = FeedbackUtil.gatherFeedback(dataverse, dataverseSessionNull, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        System.out.println("feedbacks2: " + feedbacks2);
-        feedback = feedbacks2.get(0);
-        assertEquals("support@librascholar.edu", feedback.getToEmail());
-        System.out.println("body:\n\n" + feedback.getBody());
-        assertTrue(feedback.getBody().startsWith("There is no contact address on file for this dataverse so this message is being sent to the system address."));
+        Feedback feedback2 = FeedbackUtil.gatherFeedback(dataverse, dataverseSessionNull, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, false);
+        System.out.println("feedbacks2: " + feedback2);
+        assertEquals(systemEmail, feedback2.getToEmail());
+        assertEquals(null, feedback2.getCcEmail());
+        System.out.println("body:\n\n" + feedback2.getBody());
+        assertTrue(feedback2.getBody().startsWith("There is no contact address on file for this dataverse so this message is being sent to the system address."));
     }
 
     @Test
@@ -230,17 +236,18 @@ public void testGatherFeedbackOnDataset() {
         DataverseSession dataverseSession = null;
         String messageSubject = "nice dataset";
         String userMessage = "Let's talk!";
-        List<Feedback> feedbacks = FeedbackUtil.gatherFeedback(dataset, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        System.out.println("feedbacks: " + feedbacks);
-        assertEquals(2, feedbacks.size());
-        Feedback feedback = feedbacks.get(0);
+        Feedback feedback = FeedbackUtil.gatherFeedback(dataset, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, true);
+        System.out.println("feedbacks: " + feedback);
         System.out.println("Subject: " + feedback.getSubject());
         System.out.println("Body: " + feedback.getBody());
         System.out.println("From: " + feedback.getFromEmail());
         System.out.println("To: " + feedback.getToEmail());
-        assertEquals("ContactEmail1@mailinator.com", feedback.getToEmail());
+        System.out.println("CC: " + feedback.getCcEmail());
+
+        assertEquals("ContactEmail1@mailinator.com,ContactEmail2@mailinator.com", feedback.getToEmail());
+        assertEquals(systemEmail, feedback.getCcEmail());
         assertEquals(installationBrandName + " contact: " + messageSubject, feedback.getSubject());
-        String expected = "Hello Tom Brady,\n\n"
+        String expected = "Hello Tom Brady and Homer Simpson,\n\n"
                 // FIXME: change from "personClickingContactOrSupportButton@example.com" to "Homer Simpson" or whatever (add to contact form).
                 + "You have just been sent the following message from " + userEmail + " "
                 + "via the " + installationBrandName + " hosted dataset "
@@ -278,15 +285,15 @@ public void testGatherFeedbackOnDatasetNoContacts() {
         DataverseSession dataverseSession = null;
         String messageSubject = "nice dataset";
         String userMessage = "Let's talk!";
-        List<Feedback> feedbacks = FeedbackUtil.gatherFeedback(dataset, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        System.out.println("feedbacks: " + feedbacks);
-        assertEquals(1, feedbacks.size());
-        Feedback feedback = feedbacks.get(0);
+        Feedback feedback = FeedbackUtil.gatherFeedback(dataset, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, false);
         System.out.println("Subject: " + feedback.getSubject());
         System.out.println("Body: " + feedback.getBody());
         System.out.println("From: " + feedback.getFromEmail());
         System.out.println("To: " + feedback.getToEmail());
+        System.out.println("CC: " + feedback.getCcEmail());
+
         assertEquals(systemEmail, feedback.getToEmail());
+        assertEquals(null, feedback.getCcEmail());
         assertEquals(installationBrandName + " contact: " + messageSubject, feedback.getSubject());
         String expected = "There is no contact address on file for this dataset so this message is being sent to the system address.\n\n"
                 // FIXME: Add more context for person who receives systemEmail messages.
@@ -351,8 +358,7 @@ public void testGatherFeedbackOnFile() {
 
         String messageSubject = "nice file";
         String userMessage = "Let's talk!";
-        List<Feedback> feedbacks = FeedbackUtil.gatherFeedback(dataFile, dataverseSessionNull, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        Feedback feedback = feedbacks.get(0);
+        Feedback feedback = FeedbackUtil.gatherFeedback(dataFile, dataverseSessionNull, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, false);
         System.out.println("feedback: " + feedback);
         System.out.println("Subject: " + feedback.getSubject());
         System.out.println("Body: " + feedback.getBody());
@@ -419,8 +425,7 @@ public void testGatherFeedbackOnFileNoContacts() {
 
         String messageSubject = "nice file";
         String userMessage = "Let's talk!";
-        List<Feedback> feedbacks = FeedbackUtil.gatherFeedback(dataFile, dataverseSessionNull, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        Feedback feedback = feedbacks.get(0);
+        Feedback feedback = FeedbackUtil.gatherFeedback(dataFile, dataverseSessionNull, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, false);
         System.out.println("feedback: " + feedback);
         System.out.println("Subject: " + feedback.getSubject());
         System.out.println("Body: " + feedback.getBody());
@@ -437,9 +442,7 @@ public void testGatherFeedbackFromSupportButtonNullSession() {
         String messageSubject = "I'm clicking the support button.";
         String userMessage = "Help!";
         DvObject nullDvObject = null;
-        List<Feedback> feedbacks1 = FeedbackUtil.gatherFeedback(nullDvObject, dataverseSessionNull, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        System.out.println("feedbacks1: " + feedbacks1);
-        Feedback feedback = feedbacks1.get(0);
+        Feedback feedback = FeedbackUtil.gatherFeedback(nullDvObject, dataverseSessionNull, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, false);
         assertEquals(installationBrandName + " support request: " + messageSubject, feedback.getSubject());
         String expectedBody
                 = "LibraScholar SWAT Team,\n\n"
@@ -454,15 +457,11 @@ public void testGatherFeedbackFromSupportButtonNullSession() {
         assertEquals("support@librascholar.edu", feedback.getToEmail());
         assertEquals("personClickingContactOrSupportButton@example.com", feedback.getFromEmail());
         InternetAddress nullSystemAddress = null;
-        List<Feedback> feedbacks2 = FeedbackUtil.gatherFeedback(nullDvObject, dataverseSessionNull, messageSubject, userMessage, nullSystemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        assertEquals(1, feedbacks2.size());
-        feedback = feedbacks2.get(0);
-        assertEquals(null, feedback.getToEmail());
+        Feedback feedback2 = FeedbackUtil.gatherFeedback(nullDvObject, dataverseSessionNull, messageSubject, userMessage, nullSystemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, false);
+        assertEquals(null, feedback2.getToEmail());
         String nullUserMessage = null;
-        List<Feedback> feedbacks3 = FeedbackUtil.gatherFeedback(nullDvObject, dataverseSessionNull, messageSubject, nullUserMessage, nullSystemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        assertEquals(1, feedbacks3.size());
-        feedback = feedbacks3.get(0);
-        assertEquals(null, feedback.getToEmail());
+        Feedback feedback3 = FeedbackUtil.gatherFeedback(nullDvObject, dataverseSessionNull, messageSubject, nullUserMessage, nullSystemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, false);
+        assertEquals(null, feedback3.getToEmail());
     }
 
     @Test
@@ -473,8 +472,7 @@ public void testGatherFeedbackFromSupportButtonLoggedIn() {
         String messageSubject = "I'm clicking the support button.";
         String userMessage = "Help!";
         DvObject dvObject = null;
-        List<Feedback> feedbacks = FeedbackUtil.gatherFeedback(dvObject, dataverseSessionAuthenticated, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName);
-        Feedback feedback = feedbacks.get(0);
+        Feedback feedback = FeedbackUtil.gatherFeedback(dvObject, dataverseSessionAuthenticated, messageSubject, userMessage, systemAddress, userEmail, baseUrl, installationBrandName, supportTeamName, false);
         assertEquals(messageSubject, feedback.getSubject());
         assertEquals("Help!", feedback.getBody());
         assertEquals("support@librascholar.edu", feedback.getToEmail());
diff --git a/src/test/java/edu/harvard/iq/dataverse/globus/GlobusUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/globus/GlobusUtilTest.java
new file mode 100644
index 00000000000..095e798f229
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/globus/GlobusUtilTest.java
@@ -0,0 +1,88 @@
+package edu.harvard.iq.dataverse.globus;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.dataaccess.AbstractRemoteOverlayAccessIO;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.GlobusAccessibleStore;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.json.JsonObject;
+
+public class GlobusUtilTest {
+
+    private Dataset dataset;
+    private DataFile mDatafile;
+    private DataFile rDatafile;
+    private String baseStoreId1 = "182ad2bda2f-c3508e719076";
+    private String baseStoreId2 = "182ad2bda2f-c3508e719077";
+    private String logoPath = "d7c42580-6538-4605-9ad8-116a61982644/hdc1/image002.mrc";
+    private String authority = "10.5072";
+    private String identifier = "F2ABCDEF";
+
+    @BeforeEach
+    public void setUp() {
+
+        // Managed Globus Store
+
+        // Nonsense endpoint/paths
+        System.setProperty("dataverse.files.globusm." + GlobusAccessibleStore.TRANSFER_ENDPOINT_WITH_BASEPATH,
+                "d7c42580-6538-4605-9ad8-116a61982644/hdc1");
+        System.setProperty("dataverse.files.globusm.managed", "true");
+
+        // Remote Store
+        System.setProperty("dataverse.files.globusr.managed", "false");
+        System.setProperty(
+                "dataverse.files.globusr." + AbstractRemoteOverlayAccessIO.REFERENCE_ENDPOINTS_WITH_BASEPATHS,
+                "d7c42580-6538-4605-9ad8-116a61982644/hdc1");
+
+        dataset = MocksFactory.makeDataset();
+        dataset.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, authority, identifier, "/",
+                AbstractDOIProvider.DOI_RESOLVER_URL, null));
+        mDatafile = MocksFactory.makeDataFile();
+        mDatafile.setOwner(dataset);
+        mDatafile.setStorageIdentifier("globusm://" + baseStoreId1);
+
+        rDatafile = MocksFactory.makeDataFile();
+        rDatafile.setOwner(dataset);
+        rDatafile.setStorageIdentifier("globusr://" + baseStoreId2 + "//" + logoPath);
+        List<DataFile> files = new ArrayList<DataFile>();
+        files.add(mDatafile);
+        files.add(rDatafile);
+        dataset.setFiles(files);
+    }
+
+    @AfterEach
+    public void tearDown() {
+        System.clearProperty("dataverse.files.globusm." + GlobusAccessibleStore.TRANSFER_ENDPOINT_WITH_BASEPATH);
+        System.clearProperty("dataverse.files.globusm.managed");
+        System.clearProperty("dataverse.files.globusr.managed");
+        System.clearProperty(
+                "dataverse.files.globusr." + AbstractRemoteOverlayAccessIO.REFERENCE_ENDPOINTS_WITH_BASEPATHS);
+    }
+
+    
+    @Test
+    public void testgetFilesMap() {
+        
+        JsonObject jo = GlobusUtil.getFilesMap(dataset.getFiles(), dataset);
+        System.out.println(JsonUtil.prettyPrint(jo));
+        assertEquals(jo.getString(Long.toString(mDatafile.getId())), "d7c42580-6538-4605-9ad8-116a61982644/hdc1/10.5072/F2ABCDEF/182ad2bda2f-c3508e719076");
+        assertEquals(jo.getString(Long.toString(rDatafile.getId())), logoPath);
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/ingest/IngestFrequencyTest.java b/src/test/java/edu/harvard/iq/dataverse/ingest/IngestFrequencyTest.java
index cb0655c068f..ca64bcc794f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/ingest/IngestFrequencyTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/ingest/IngestFrequencyTest.java
@@ -6,9 +6,9 @@
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataFileReader;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataIngest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -16,8 +16,8 @@
 import java.io.BufferedInputStream;
 import java.util.Collection;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class IngestFrequencyTest {
 
@@ -99,7 +99,7 @@ private DataFile readFileCalcFreq(String fileName, String type ) {
         TabularDataIngest tabDataIngest = null;
 
         try {
-            tabDataIngest = ingestPlugin.read(fileInputStream, null);
+            tabDataIngest = ingestPlugin.read(fileInputStream, false, null);
         } catch (IOException ingestEx) {
             tabDataIngest = null;
             System.out.println("Caught an exception trying to ingest file " + fileName + ": " + ingestEx.getLocalizedMessage());
diff --git a/src/test/java/edu/harvard/iq/dataverse/ingest/IngestUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/ingest/IngestUtilTest.java
index 9fc5be4481f..955070a662a 100644
--- a/src/test/java/edu/harvard/iq/dataverse/ingest/IngestUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/ingest/IngestUtilTest.java
@@ -11,18 +11,19 @@
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.validation.ConstraintViolation;
+
+import jakarta.validation.ConstraintViolation;
 import org.dataverse.unf.UNFUtil;
 import org.dataverse.unf.UnfException;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class IngestUtilTest {
 
@@ -41,7 +42,7 @@ public void testCheckForDuplicateFileNamesNoDirectories() throws Exception {
         Dataset dataset = makeDataset();
 
         // create dataset version
-        DatasetVersion datasetVersion = dataset.getEditVersion();
+        DatasetVersion datasetVersion = dataset.getOrCreateEditVersion();
         datasetVersion.setCreateTime(dateFmt.parse("20001012"));
         datasetVersion.setLastUpdateTime(datasetVersion.getLastUpdateTime());
         datasetVersion.setId(MocksFactory.nextId());
@@ -97,7 +98,7 @@ public void testCheckForDuplicateFileNamesNoDirectories() throws Exception {
 
         dataFileList.add(datafile2);
 
-        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList);
+        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList, null);
 
         boolean file1NameAltered = false;
         boolean file2NameAltered = false;
@@ -110,12 +111,12 @@ public void testCheckForDuplicateFileNamesNoDirectories() throws Exception {
             }
         }
 
-        // check filenames are unique and unaltered
-        assertEquals(file1NameAltered, true);
-        assertEquals(file2NameAltered, true);
+        // check filenames are unique and altered
+        assertTrue(file1NameAltered);
+        assertTrue(file2NameAltered);
 
         // try to add data files with "-1" duplicates and see if it gets incremented to "-2"
-        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList);
+        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList, null);
 
         for (DataFile df : dataFileList) {
             if (df.getFileMetadata().getLabel().equals("datafile1-2.txt")) {
@@ -126,9 +127,9 @@ public void testCheckForDuplicateFileNamesNoDirectories() throws Exception {
             }
         }
 
-        // check filenames are unique and unaltered
-        assertEquals(file1NameAltered, true);
-        assertEquals(file2NameAltered, true);
+        // check filenames are unique and altered
+        assertTrue(file1NameAltered);
+        assertTrue(file2NameAltered);
     }
 
     @Test
@@ -145,7 +146,7 @@ public void testCheckForDuplicateFileNamesWithEmptyDirectoryLabels() throws Exce
         Dataset dataset = makeDataset();
 
         // create dataset version
-        DatasetVersion datasetVersion = dataset.getEditVersion();
+        DatasetVersion datasetVersion = dataset.getOrCreateEditVersion();
         datasetVersion.setCreateTime(dateFmt.parse("20001012"));
         datasetVersion.setLastUpdateTime(datasetVersion.getLastUpdateTime());
         datasetVersion.setId(MocksFactory.nextId());
@@ -203,7 +204,7 @@ public void testCheckForDuplicateFileNamesWithEmptyDirectoryLabels() throws Exce
 
         dataFileList.add(datafile2);
 
-        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList);
+        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList, null);
 
         boolean file1NameAltered = false;
         boolean file2NameAltered = false;
@@ -216,12 +217,12 @@ public void testCheckForDuplicateFileNamesWithEmptyDirectoryLabels() throws Exce
             }
         }
 
-        // check filenames are unique and unaltered
-        assertEquals(file1NameAltered, true);
-        assertEquals(file2NameAltered, true);
+        // check filenames are unique and altered
+        assertTrue(file1NameAltered);
+        assertTrue(file2NameAltered);
 
         // try to add data files with "-1" duplicates and see if it gets incremented to "-2"
-        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList);
+        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList, null);
 
         for (DataFile df : dataFileList) {
             if (df.getFileMetadata().getLabel().equals("datafile1-2.txt")) {
@@ -232,9 +233,9 @@ public void testCheckForDuplicateFileNamesWithEmptyDirectoryLabels() throws Exce
             }
         }
 
-        // check filenames are unique and unaltered
-        assertEquals(file1NameAltered, true);
-        assertEquals(file2NameAltered, true);
+        // check filenames are unique and altered
+        assertTrue(file1NameAltered);
+        assertTrue(file2NameAltered);
     }
 
     @Test
@@ -250,7 +251,7 @@ public void testCheckForDuplicateFileNamesWithDirectories() throws Exception {
         Dataset dataset = makeDataset();
 
         // create dataset version
-        DatasetVersion datasetVersion = dataset.getEditVersion();
+        DatasetVersion datasetVersion = dataset.getOrCreateEditVersion();
         datasetVersion.setCreateTime(dateFmt.parse("20001012"));
         datasetVersion.setLastUpdateTime(datasetVersion.getLastUpdateTime());
         datasetVersion.setId(MocksFactory.nextId());
@@ -328,7 +329,7 @@ public void testCheckForDuplicateFileNamesWithDirectories() throws Exception {
 
         dataFileList.add(datafile3);
 
-        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList);
+        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList, null);
 
         boolean file1NameAltered = false;
         boolean file2NameAltered = false;
@@ -346,16 +347,16 @@ public void testCheckForDuplicateFileNamesWithDirectories() throws Exception {
         }
 
         // check filenames are unique
-        assertEquals(file1NameAltered, true);
-        assertEquals(file2NameAltered, true);
-        assertEquals(file3NameAltered, false);
+        assertTrue(file1NameAltered);
+        assertTrue(file2NameAltered);
+        assertFalse(file3NameAltered);
 
         // add duplicate file in root
         datasetVersion.getFileMetadatas().add(fmd3);
         fmd3.setDatasetVersion(datasetVersion);
 
         // try to add data files with "-1" duplicates and see if it gets incremented to "-2"
-        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList);
+        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList, null);
 
         for (DataFile df : dataFileList) {
             if (df.getFileMetadata().getLabel().equals("datafile1-2.txt")) {
@@ -370,9 +371,9 @@ public void testCheckForDuplicateFileNamesWithDirectories() throws Exception {
         }
 
         // check filenames are unique
-        assertEquals(file1NameAltered, true);
-        assertEquals(file2NameAltered, true);
-        assertEquals(file3NameAltered, true);
+        assertTrue(file1NameAltered);
+        assertTrue(file2NameAltered);
+        assertTrue(file3NameAltered);
     }
 
     @Test
@@ -388,7 +389,7 @@ public void testCheckForDuplicateFileNamesTabular() throws Exception {
         Dataset dataset = makeDataset();
 
         // create dataset version
-        DatasetVersion datasetVersion = dataset.getEditVersion();
+        DatasetVersion datasetVersion = dataset.getOrCreateEditVersion();
         datasetVersion.setCreateTime(dateFmt.parse("20001012"));
         datasetVersion.setLastUpdateTime(datasetVersion.getLastUpdateTime());
         datasetVersion.setId(MocksFactory.nextId());
@@ -446,7 +447,7 @@ public void testCheckForDuplicateFileNamesTabular() throws Exception {
 
         dataFileList.add(datafile2);
 
-        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList);
+        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList, null);
 
         boolean file2NameAltered = false;
         for (DataFile df : dataFileList) {
@@ -456,9 +457,106 @@ public void testCheckForDuplicateFileNamesTabular() throws Exception {
         }
 
         // check filename is altered since tabular and will change to .tab after ingest
-        assertEquals(file2NameAltered, true);
+        assertTrue(file2NameAltered);
     }
 
+    
+    @Test
+    /**
+     * Test adding duplicate file name labels to a dataset version with empty
+     * directory labels when replacing a file. This should simulate what happens when replacing a file
+     * via the file upload UI.
+     */
+    public void testCheckForDuplicateFileNamesWhenReplacing() throws Exception {
+
+        SimpleDateFormat dateFmt = new SimpleDateFormat("yyyyMMdd");
+
+        // create dataset
+        Dataset dataset = makeDataset();
+
+        // create dataset version
+        DatasetVersion datasetVersion = dataset.getOrCreateEditVersion();
+        datasetVersion.setCreateTime(dateFmt.parse("20001012"));
+        datasetVersion.setLastUpdateTime(datasetVersion.getLastUpdateTime());
+        datasetVersion.setId(MocksFactory.nextId());
+        datasetVersion.setReleaseTime(dateFmt.parse("20010101"));
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+        datasetVersion.setMinorVersionNumber(0L);
+        datasetVersion.setVersionNumber(1L);
+        datasetVersion.setFileMetadatas(new ArrayList<>());
+
+        // create datafiles
+        List<DataFile> dataFileList = new ArrayList<>();
+        DataFile datafile1 = new DataFile("application/octet-stream");
+        datafile1.setStorageIdentifier("datafile1.txt");
+        datafile1.setFilesize(200);
+        datafile1.setModificationTime(new Timestamp(new Date().getTime()));
+        datafile1.setCreateDate(new Timestamp(new Date().getTime()));
+        datafile1.setPermissionModificationTime(new Timestamp(new Date().getTime()));
+        datafile1.setOwner(dataset);
+        datafile1.setIngestDone();
+        datafile1.setChecksumType(DataFile.ChecksumType.SHA1);
+        datafile1.setChecksumValue("Unknown");
+        datafile1.setId(1L);
+
+        // set metadata and add verson
+        FileMetadata fmd1 = new FileMetadata();
+        fmd1.setId(1L);
+        fmd1.setLabel("datafile1.txt");
+        fmd1.setDirectoryLabel("");
+        fmd1.setDataFile(datafile1);
+        datafile1.getFileMetadatas().add(fmd1);
+        datasetVersion.getFileMetadatas().add(fmd1);
+        fmd1.setDatasetVersion(datasetVersion);
+
+        dataFileList.add(datafile1);
+
+        DataFile datafile2 = new DataFile("application/octet-stream");
+        datafile2.setStorageIdentifier("datafile2.txt");
+        datafile2.setFilesize(200);
+        datafile2.setModificationTime(new Timestamp(new Date().getTime()));
+        datafile2.setCreateDate(new Timestamp(new Date().getTime()));
+        datafile2.setPermissionModificationTime(new Timestamp(new Date().getTime()));
+        datafile2.setOwner(dataset);
+        datafile2.setIngestDone();
+        datafile2.setChecksumType(DataFile.ChecksumType.SHA1);
+        datafile2.setChecksumValue("Unknown");
+        datafile2.setId(2L);
+
+        // set metadata and add version
+        FileMetadata fmd2 = new FileMetadata();
+        fmd2.setId(2L);
+        fmd2.setLabel("datafile2.txt");
+        fmd2.setDirectoryLabel("");
+        fmd2.setDataFile(datafile2);
+        datafile2.getFileMetadatas().add(fmd2);
+        datasetVersion.getFileMetadatas().add(fmd2);
+        fmd2.setDatasetVersion(datasetVersion);
+
+        dataFileList.add(datafile2);
+
+        /*In a real replace, there should only be one file in dataFileList. Having both files in dataFileList, we're essentially testing two cases at once:
+         *  - the replacing file name conflicts with some other file's name
+         *  - the replacing file's name only conflicts with the file being replaced (datafile2) and shouldn't be changed
+         */
+        IngestUtil.checkForDuplicateFileNamesFinal(datasetVersion, dataFileList, datafile2);
+
+        boolean file1NameAltered = false;
+        boolean file2NameAltered = false;
+        for (DataFile df : dataFileList) {
+            if (df.getFileMetadata().getLabel().equals("datafile1-1.txt")) {
+                file1NameAltered = true;
+            }
+            if (df.getFileMetadata().getLabel().equals("datafile2-1.txt")) {
+                file2NameAltered = true;
+            }
+        }
+
+        // check filenames are unique and unaltered
+        assertTrue(file1NameAltered);
+        assertFalse(file2NameAltered);
+    }
+    
     @Test
     public void testDirectoryLabels() {
 
@@ -559,7 +657,7 @@ public void testRecalculateDatasetVersionUNF() {
         DataTable dataTable = new DataTable();
         dataTable.setUnf("unfOnDataTable");
         datafile1.setDataTable(dataTable);
-        assertEquals(true, datafile1.isTabularData());
+        assertTrue(datafile1.isTabularData());
 
         FileMetadata fmd1 = new FileMetadata();
         fmd1.setId(1L);
@@ -594,7 +692,7 @@ public void testGetUnfValuesOfFiles() {
 
     @Test
     public void testshouldHaveUnf() {
-        assertEquals(false, IngestUtil.shouldHaveUnf(null));
+        assertFalse(IngestUtil.shouldHaveUnf(null));
     }
 
     @Test
@@ -611,4 +709,25 @@ public void testUnfUtil() {
         assertEquals("UNF:6:FWBO/a1GcxDnM3fNLdzrHw==", datasetUnfValue);
     }
 
+    @Test
+    public void testPathPlusFilename() {
+        String incomingLabel = "incomingLabel";
+        String incomingDirectoryLabel = "incomingDirectoryLabel";
+        String existingLabel = "existingLabel";
+        String existingDirectoryLabel = "existingDirectoryLabel";
+        String pathPlusFilename = IngestUtil.getPathAndFileNameToCheck(incomingLabel, incomingDirectoryLabel, existingLabel, existingDirectoryLabel);
+        assertEquals("incomingDirectoryLabel/incomingLabel", pathPlusFilename);
+    }
+
+    @Test
+    public void renameFileToSameName() {
+        String pathPlusFilename = "README.md";
+        FileMetadata file1 = new FileMetadata();
+        file1.setLabel("README.md");
+        FileMetadata file2 = new FileMetadata();
+        file2.setLabel("README2.md");
+        List<FileMetadata> fileMetadatas = Arrays.asList(file1, file2);
+        assertTrue(IngestUtil.conflictsWithExistingFilenames(pathPlusFilename, fileMetadatas));
+    }
+
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/ingest/IngestableDataCheckerTest.java b/src/test/java/edu/harvard/iq/dataverse/ingest/IngestableDataCheckerTest.java
index ea9e378739b..11257f188fe 100644
--- a/src/test/java/edu/harvard/iq/dataverse/ingest/IngestableDataCheckerTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/ingest/IngestableDataCheckerTest.java
@@ -10,15 +10,18 @@
 import java.io.IOException;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
-import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -26,26 +29,23 @@
  */
 public class IngestableDataCheckerTest {
    
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
-   
     public IngestableDataCheckerTest() {
     }
     
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
     
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
 
     }
     
-    @Before
+    @BeforeEach
     public void setUp() {     
     }
     
-    @After
+    @AfterEach
     public void tearDown() {
         
      
@@ -57,14 +57,14 @@ private File createTempFile(String filename, String fileContents) throws IOExcep
         if (filename == null){
             return null;
         }
-        File fh = this.tempFolder.newFile(filename);
-        fh.createNewFile();
+        
+        Path tmpFile = Files.createTempFile("ingestdatachecker", "");
         
         if (fileContents != null){
-            FileUtils.writeStringToFile(fh, fileContents);
+            Files.writeString(tmpFile, fileContents, StandardCharsets.UTF_8);
         }
         
-        return fh;
+        return tmpFile.toFile();
     }
     
     private MappedByteBuffer createTempFileAndGetBuffer(String filename, String fileContents) throws IOException {
diff --git a/src/test/java/edu/harvard/iq/dataverse/ingest/metadataextraction/impl/plugins/netcdf/NetcdfFileMetadataExtractorTest.java b/src/test/java/edu/harvard/iq/dataverse/ingest/metadataextraction/impl/plugins/netcdf/NetcdfFileMetadataExtractorTest.java
new file mode 100644
index 00000000000..343d7f39cf5
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/ingest/metadataextraction/impl/plugins/netcdf/NetcdfFileMetadataExtractorTest.java
@@ -0,0 +1,81 @@
+package edu.harvard.iq.dataverse.ingest.metadataextraction.impl.plugins.netcdf;
+
+import edu.harvard.iq.dataverse.DatasetFieldConstant;
+import edu.harvard.iq.dataverse.ingest.metadataextraction.FileMetadataIngest;
+import java.io.File;
+import java.util.Map;
+import java.util.Set;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
+public class NetcdfFileMetadataExtractorTest {
+
+    /**
+     * Expect some lat/long values (geospatial bounding box) with longtude
+     * values that have been transformed from a domain of 0 to 360 to a domain
+     * of -180 to 180.
+     */
+    @Test
+    public void testExtractLatLong() throws Exception {
+        String pathAndFile = "src/test/resources/netcdf/ICOADS_R3.0.0_1662-10.nc";
+        File file = new File(pathAndFile);
+        NetcdfFileMetadataExtractor instance = new NetcdfFileMetadataExtractor();
+        FileMetadataIngest netcdfMetadata = instance.ingestFile(file);
+        Map<String, Set<String>> map = netcdfMetadata.getMetadataMap();
+        assertEquals("-16.320007", map.get(DatasetFieldConstant.westLongitude).toArray()[0]);
+        assertEquals("-6.220001", map.get(DatasetFieldConstant.eastLongitude).toArray()[0]);
+        assertEquals("41.8", map.get(DatasetFieldConstant.southLatitude).toArray()[0]);
+        assertEquals("49.62", map.get(DatasetFieldConstant.northLatitude).toArray()[0]);
+    }
+
+    /**
+     * The NetCDF file under test doesn't have values for latitude/longitude
+     * (geospatial bounding box).
+     */
+    @Test
+    public void testExtractNoLatLong() throws Exception {
+        String pathAndFile = "src/test/resources/netcdf/madis-raob";
+        File file = new File(pathAndFile);
+        NetcdfFileMetadataExtractor instance = new NetcdfFileMetadataExtractor();
+        FileMetadataIngest netcdfMetadata = null;
+        netcdfMetadata = instance.ingestFile(file);
+        Map<String, Set<String>> map = netcdfMetadata.getMetadataMap();
+        assertNull(map.get(DatasetFieldConstant.westLongitude).toArray()[0]);
+        assertNull(map.get(DatasetFieldConstant.eastLongitude).toArray()[0]);
+        assertNull(map.get(DatasetFieldConstant.southLatitude).toArray()[0]);
+        assertNull(map.get(DatasetFieldConstant.northLatitude).toArray()[0]);
+    }
+
+    @Test
+    public void testStandardLongitude() {
+        NetcdfFileMetadataExtractor extractor = new NetcdfFileMetadataExtractor();
+
+        // Both are over 180. Subtract 360 from both.
+        // before: https://linestrings.com/bbox/#343.68,41.8,353.78,49.62
+        // after: https://linestrings.com/bbox/#-16.320007,41.8,-6.220001,49.62
+        assertEquals(new WestAndEastLongitude("-16.320007", "-6.220001"), extractor.getStandardLongitude(new WestAndEastLongitude("343.68", "353.78")));
+
+        // "If one of them is <0, the domain is -180:180." No change. https://linestrings.com/bbox/#-10,20,100,40
+        assertEquals(new WestAndEastLongitude("-10", "100"), extractor.getStandardLongitude(new WestAndEastLongitude("-10", "100")));
+
+        // Both are negative. No change. https://linestrings.com/bbox/#-124.7666666333333,25.066666666666666,-67.058333300000015,49.40000000000000
+        assertEquals(new WestAndEastLongitude("-124.7666666333333", "-67.058333300000015"), extractor.getStandardLongitude(new WestAndEastLongitude("-124.7666666333333", "-67.058333300000015")));
+
+        // Both between 0 and 180. Leave it alone. No change. https://linestrings.com/bbox/#25,20,35,40
+        assertEquals(new WestAndEastLongitude("25", "35"), extractor.getStandardLongitude(new WestAndEastLongitude("25", "35")));
+
+        // When only one value is over 180 we can't know if we should subtract 360 from both.
+        // Expect null. Don't insert potentially incorrect data into the database. https://linestrings.com/bbox/#100,20,181,40
+        assertEquals(null, extractor.getStandardLongitude(new WestAndEastLongitude("100", "181")));
+
+        // "If one of them is <0, the domain is -180:180." No change. https://linestrings.com/bbox/#-10,20,181,40
+        assertEquals(null, extractor.getStandardLongitude(new WestAndEastLongitude("-10", "181")));
+
+        // Both values are less than -180 and out of range. Expect null. No database insert https://linestrings.com/bbox/#999,20,-888,40
+        assertEquals(null, extractor.getStandardLongitude(new WestAndEastLongitude("-999", "-888")));
+
+        // Garbage in, garbage out. You can't bass "foo" and "bar" as longitudes
+        assertEquals(null, extractor.getStandardLongitude(new WestAndEastLongitude("foo", "bar")));
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/csv/CSVFileReaderTest.java b/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/csv/CSVFileReaderTest.java
index cdc4249ba94..9afb35918a4 100644
--- a/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/csv/CSVFileReaderTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/csv/CSVFileReaderTest.java
@@ -22,8 +22,9 @@
 import java.util.logging.Logger;
 import org.dataverse.unf.UNFUtil;
 import org.dataverse.unf.UnfException;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -51,7 +52,7 @@ public void testRead() {
         try (BufferedInputStream stream = new BufferedInputStream(
                 new FileInputStream(testFile))) {
             CSVFileReader instance = new CSVFileReader(new CSVFileReaderSpi(), ',');
-            File outFile = instance.read(stream, null).getTabDelimitedFile();
+            File outFile = instance.read(stream, false, null).getTabDelimitedFile();
             result = new BufferedReader(new FileReader(outFile));
             logger.fine("Final pass: " + outFile.getPath());
         } catch (IOException ex) {
@@ -67,7 +68,7 @@ public void testRead() {
             } catch (IOException ex) {
                 fail();
             }
-            assertEquals("Error on line " + line, expLine, foundLine);
+            assertEquals(expLine, foundLine, "Error on line " + line);
             line++;
         }
 
@@ -103,7 +104,7 @@ public void testVariables() {
         try (BufferedInputStream stream = new BufferedInputStream(
                 new FileInputStream(testFile))) {
             CSVFileReader instance = new CSVFileReader(new CSVFileReaderSpi(), ',');
-            result = instance.read(stream, null).getDataTable();
+            result = instance.read(stream, false, null).getDataTable();
         } catch (IOException ex) {
             fail("" + ex);
         }
@@ -121,15 +122,15 @@ public void testVariables() {
         // OK, let's go through the individual variables:
         for (int i = 0; i < result.getVarQuantity(); i++) {
 
-            assertEquals("variable " + i + ":", expectedVariableNames[i], result.getDataVariables().get(i).getName());
+            assertEquals(expectedVariableNames[i], result.getDataVariables().get(i).getName(), "variable " + i + ":");
 
-            assertEquals("variable " + i + ":", expectedVariableTypes[i], result.getDataVariables().get(i).getType());
+            assertEquals(expectedVariableTypes[i], result.getDataVariables().get(i).getType(), "variable " + i + ":");
 
-            assertEquals("variable " + i + ":", expectedVariableIntervals[i], result.getDataVariables().get(i).getInterval());
+            assertEquals(expectedVariableIntervals[i], result.getDataVariables().get(i).getInterval(), "variable " + i + ":");
 
-            assertEquals("variable " + i + ":", expectedVariableFormatCategories[i], result.getDataVariables().get(i).getFormatCategory());
+            assertEquals(expectedVariableFormatCategories[i], result.getDataVariables().get(i).getFormatCategory(), "variable " + i + ":");
 
-            assertEquals("variable " + i + ":", expectedVariableFormats[i], result.getDataVariables().get(i).getFormat());
+            assertEquals(expectedVariableFormats[i], result.getDataVariables().get(i).getFormat(), "variable " + i + ":");
         }
     }
 
@@ -153,7 +154,7 @@ public void testSubset() {
                 new FileInputStream(testFile))) {
             CSVFileReader instance = new CSVFileReader(new CSVFileReaderSpi(), ',');
 
-            ingestResult = instance.read(stream, null);
+            ingestResult = instance.read(stream, false, null);
 
             generatedTabFile = ingestResult.getTabDelimitedFile();
             generatedDataTable = ingestResult.getDataTable();
@@ -194,9 +195,9 @@ public void testSubset() {
                 fail("Failed to open generated tab-delimited file for reading" + ioex);
             }
 
-            Double[] columnVector = TabularSubsetGenerator.subsetDoubleVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue());
+            Double[] columnVector = TabularSubsetGenerator.subsetDoubleVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue(), false);
 
-            assertArrayEquals("column " + i + ":", floatVectors[vectorCount++], columnVector);
+            assertArrayEquals(floatVectors[vectorCount++], columnVector, "column " + i + ":");
         }
 
         // Discrete Numerics (aka, integers):
@@ -228,9 +229,9 @@ public void testSubset() {
                 fail("Failed to open generated tab-delimited file for reading" + ioex);
             }
 
-            Long[] columnVector = TabularSubsetGenerator.subsetLongVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue());
+            Long[] columnVector = TabularSubsetGenerator.subsetLongVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue(), false);
 
-            assertArrayEquals("column " + i + ":", longVectors[vectorCount++], columnVector);
+            assertArrayEquals(longVectors[vectorCount++], columnVector, "column " + i + ":");
         }
 
         // And finally, Strings:
@@ -255,9 +256,9 @@ public void testSubset() {
                 fail("Failed to open generated tab-delimited file for reading" + ioex);
             }
 
-            String[] columnVector = TabularSubsetGenerator.subsetStringVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue());
+            String[] columnVector = TabularSubsetGenerator.subsetStringVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue(), false);
 
-            assertArrayEquals("column " + i + ":", stringVectors[vectorCount++], columnVector);
+            assertArrayEquals(stringVectors[vectorCount++], columnVector, "column " + i + ":");
         }
     }
 
@@ -297,7 +298,7 @@ public void testVariableUNFs() {
                 new FileInputStream(testFile))) {
             CSVFileReader instance = new CSVFileReader(new CSVFileReaderSpi(), ',');
 
-            ingestResult = instance.read(stream, null);
+            ingestResult = instance.read(stream, false, null);
 
             generatedTabFile = ingestResult.getTabDelimitedFile();
             generatedDataTable = ingestResult.getDataTable();
@@ -326,7 +327,7 @@ public void testVariableUNFs() {
                     fail("Failed to open generated tab-delimited file for reading" + ioex);
                 }
 
-                Double[] columnVector = TabularSubsetGenerator.subsetDoubleVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue());
+                Double[] columnVector = TabularSubsetGenerator.subsetDoubleVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue(), false);
                 try {
                     unf = UNFUtil.calculateUNF(columnVector);
                 } catch (IOException | UnfException ioex) {
@@ -344,7 +345,7 @@ public void testVariableUNFs() {
                     fail("Failed to open generated tab-delimited file for reading" + ioex);
                 }
 
-                Long[] columnVector = TabularSubsetGenerator.subsetLongVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue());
+                Long[] columnVector = TabularSubsetGenerator.subsetLongVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue(), false);
 
                 try {
                     unf = UNFUtil.calculateUNF(columnVector);
@@ -362,7 +363,7 @@ public void testVariableUNFs() {
                     fail("Failed to open generated tab-delimited file for reading" + ioex);
                 }
 
-                String[] columnVector = TabularSubsetGenerator.subsetStringVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue());
+                String[] columnVector = TabularSubsetGenerator.subsetStringVector(generatedTabInputStream, i, generatedDataTable.getCaseQuantity().intValue(), false);
 
                 String[] dateFormats = null;
 
@@ -387,7 +388,7 @@ public void testVariableUNFs() {
                 }
             }
 
-            assertEquals("Variable number " + i + ":", expectedUNFs[i], unf);
+            assertEquals(expectedUNFs[i], unf, "Variable number " + i + ":");
         }
 
     }
@@ -400,7 +401,7 @@ public void testVariableUNFs() {
     public void testBrokenCSV() {
         String brokenFile = "src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/csv/BrokenCSV.csv";
         try {
-            new CSVFileReader(new CSVFileReaderSpi(), ',').read(null, null);
+            new CSVFileReader(new CSVFileReaderSpi(), ',').read(null, false, null);
             fail("IOException not thrown on null csv");
         } catch (NullPointerException ex) {
             String expMessage = null;
@@ -411,7 +412,7 @@ public void testBrokenCSV() {
         }
         try (BufferedInputStream stream = new BufferedInputStream(
                 new FileInputStream(brokenFile))) {
-            new CSVFileReader(new CSVFileReaderSpi(), ',').read(stream, null);
+            new CSVFileReader(new CSVFileReaderSpi(), ',').read(stream, false, null);
             fail("IOException was not thrown when collumns do not align.");
         } catch (IOException ex) {
             String expMessage = BundleUtil.getStringFromBundle("ingest.csv.recordMismatch",
diff --git a/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReaderTest.java b/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReaderTest.java
index 2f8908c5920..8af36d6466d 100644
--- a/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReaderTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DTAFileReaderTest.java
@@ -5,8 +5,9 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DTAFileReaderTest {
 
@@ -15,7 +16,7 @@ public class DTAFileReaderTest {
 
     @Test
     public void testOs() throws IOException {
-        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File("scripts/search/data/tabular/50by1000.dta"))), nullDataFile);
+        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File("scripts/search/data/tabular/50by1000.dta"))), false, nullDataFile);
         assertEquals("application/x-stata", result.getDataTable().getOriginalFileFormat());
         assertEquals("rel_8_or_9", result.getDataTable().getOriginalFormatVersion());
         assertEquals(50, result.getDataTable().getDataVariables().size());
diff --git a/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DataReaderTest.java b/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DataReaderTest.java
index 8ac84d9693a..a181f73c058 100644
--- a/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DataReaderTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/DataReaderTest.java
@@ -4,8 +4,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author oscardssmith
@@ -39,12 +39,12 @@ public void testReadUShort() throws IOException {
     }
     
     // This should throw until we figure out what to do with uLongs that are large
-    @Test(expected = IOException.class)
-    public void testReadULong() throws IOException {
+    @Test
+    void testReadULong() throws IOException {
         byte[] bytes = {-1,-1,-1,-1,-1,-1,-1,-1,};
         BufferedInputStream stream = new BufferedInputStream(new ByteArrayInputStream(bytes));
         DataReader reader = new DataReader(stream);
         reader.setLSF(true);
-        assertEquals(-1, reader.readULong());
+        assertThrows(IOException.class, () -> reader.readULong());
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/NewDTAFileReaderTest.java b/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/NewDTAFileReaderTest.java
index 3c8c0a0d224..0f14054f472 100644
--- a/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/NewDTAFileReaderTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/dta/NewDTAFileReaderTest.java
@@ -4,19 +4,16 @@
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.datavariable.VariableCategory;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataIngest;
-import edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.dta.DataReader;
+
 import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.List;
 import org.apache.commons.io.FileUtils;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class NewDTAFileReaderTest {
     NewDTAFileReader instance;
@@ -28,7 +25,7 @@ public void testAuto() throws IOException {
         instance = new NewDTAFileReader(null, 117);
         // From https://www.stata-press.com/data/r13/auto.dta
         // `strings` shows "<stata_dta><header><release>117</release>"
-        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File("scripts/search/data/tabular/stata13-auto.dta"))), nullDataFile);
+        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File("scripts/search/data/tabular/stata13-auto.dta"))), false, nullDataFile);
         assertEquals("application/x-stata", result.getDataTable().getOriginalFileFormat());
         assertEquals("STATA 13", result.getDataTable().getOriginalFormatVersion());
         assertEquals(12, result.getDataTable().getDataVariables().size());
@@ -42,7 +39,7 @@ public void testAuto() throws IOException {
     @Test
     public void testStrl() throws IOException {
         instance = new NewDTAFileReader(null, 118);
-        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File(base + "strl.dta"))), nullDataFile);
+        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File(base + "strl.dta"))), false, nullDataFile);
         DataTable table = result.getDataTable();
         assertEquals("application/x-stata", table.getOriginalFileFormat());
         assertEquals("STATA 14", table.getOriginalFormatVersion());
@@ -51,7 +48,7 @@ public void testStrl() throws IOException {
         
         String[] vars = {"make","price","mpg","rep78","trunk","gear_ratio","strls"};
         String[] actualVars = table.getDataVariables().stream().map((var) -> var.getName()).toArray(String[]::new);
-        Assert.assertArrayEquals(vars, actualVars);
+        assertArrayEquals(vars, actualVars);
         String expected = "\"Buick LeSabre\"	5788	1.1111111111111111E21	100	32767	2.73	\"a\"\n" +
                           "\"Buick Opel\"	4453	26.0		10	2.87	\"bb\"\n" +
                           "\"Buick Regal\"	5189	20.0	3	16	2.93	\"ccc\"\n";
@@ -61,7 +58,7 @@ public void testStrl() throws IOException {
     @Test
     public void testDates() throws IOException {
         instance = new NewDTAFileReader(null, 118);
-        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File(base + "dates.dta"))), nullDataFile);
+        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File(base + "dates.dta"))), false, nullDataFile);
         DataTable table = result.getDataTable();
         assertEquals("application/x-stata", table.getOriginalFileFormat());
         assertEquals("STATA 14", table.getOriginalFormatVersion());
@@ -69,7 +66,7 @@ public void testDates() throws IOException {
         assertEquals(4, (long)table.getCaseQuantity());
         String[] vars = {"Clock","Daily","Weekly","Monthly","Quarterly","BiAnnually","Annually"};
         String[] actualVars = table.getDataVariables().stream().map((var) -> var.getName()).toArray(String[]::new);
-        Assert.assertArrayEquals(vars, actualVars);
+        assertArrayEquals(vars, actualVars);
         String expected = "2595-09-27 06:58:52.032	2018-06-20	2018-11-05	2018-06-01	2018-01-01	2018-01-01	2018\n" +
                           "2595-09-27 06:58:52.032	2018-06-20	2018-11-05	2018-06-01	2018-04-01	2018-01-01	2018\n" +
                           "2595-09-27 06:58:52.032	2018-06-20	2018-11-05	2018-06-01	2018-07-01	2018-07-01	2018\n" +
@@ -77,20 +74,20 @@ public void testDates() throws IOException {
         assertEquals(expected, FileUtils.readFileToString(result.getTabDelimitedFile()));
     }
     
-    @Test(expected = IOException.class)
-    public void testNull() throws IOException {
+    @Test
+    void testNull() {
         instance = new NewDTAFileReader(null, 117);
-        TabularDataIngest result = instance.read(null, new File(""));
+        assertThrows(IOException.class, () -> instance.read(null, false, new File("")));
     }
 
     // TODO: Can we create a small file to check into the code base that exercises the value-label names non-zero offset issue?
-    @Ignore
+    @Disabled
     @Test
     public void testFirstCategoryNonZeroOffset() throws IOException {
         instance = new NewDTAFileReader(null, 117);
 
         // https://dataverse.harvard.edu/file.xhtml?fileId=2865667 Stata 13 HouseImputingCivilRightsInfo.dta md5=7dd144f27cdb9f8d1c3f4eb9c4744c42
-        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File("/tmp/HouseImputingCivilRightsInfo.dta"))), nullDataFile);
+        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File("/tmp/HouseImputingCivilRightsInfo.dta"))), false, nullDataFile);
         assertEquals("application/x-stata", result.getDataTable().getOriginalFileFormat());
         assertEquals("STATA 13", result.getDataTable().getOriginalFormatVersion());
         assertEquals(5, result.getDataTable().getDataVariables().size());
@@ -105,12 +102,12 @@ public void testFirstCategoryNonZeroOffset() throws IOException {
     }
 
     // TODO: Can we create a small file to check into the code base that exercises the value-label names non-zero offset issue?
-    @Ignore
+    @Disabled
     @Test
     public void testFirstCategoryNonZeroOffset1() throws IOException {
         instance = new NewDTAFileReader(null, 118);
         // https://dataverse.harvard.edu/file.xhtml?fileId=3140457 Stata 14: 2018_04_06_Aggregated_dataset_v2.dta
-        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File("/tmp/2018_04_06_Aggregated_dataset_v2.dta"))), nullDataFile);
+        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File("/tmp/2018_04_06_Aggregated_dataset_v2.dta"))), false, nullDataFile);
         assertEquals("application/x-stata", result.getDataTable().getOriginalFileFormat());
         assertEquals("STATA 14", result.getDataTable().getOriginalFormatVersion());
         assertEquals(227, result.getDataTable().getDataVariables().size());
@@ -125,7 +122,7 @@ public void testFirstCategoryNonZeroOffset1() throws IOException {
     }
     
     // TODO: Is there a way to exersise this code with a smaller file? 33k.dta is 21MB.
-    @Ignore
+    @Disabled
     @Test
     public void test33k() throws IOException {
         instance = new NewDTAFileReader(null, 119);
@@ -135,11 +132,11 @@ public void test33k() throws IOException {
     
     // TODO: Can we create a small file to check into the code base that exercises the characteristics issue?
     // FIXME: testCharacteristics is passing in DTA117FileReaderTest but not here.
-    @Ignore
+    @Disabled
     @Test
     public void testCharacteristics() throws IOException {
         instance = new NewDTAFileReader(null, 117);
-        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File("/tmp/15aa6802ee5-5d2ed1bf55a5.dta"))), nullDataFile);
+        TabularDataIngest result = instance.read(new BufferedInputStream(new FileInputStream(new File("/tmp/15aa6802ee5-5d2ed1bf55a5.dta"))), false, nullDataFile);
         assertEquals("application/x-stata", result.getDataTable().getOriginalFileFormat());
         assertEquals("STATA 13", result.getDataTable().getOriginalFormatVersion());
         assertEquals(441, result.getDataTable().getDataVariables().size());
diff --git a/src/test/java/edu/harvard/iq/dataverse/locality/StorageSiteUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/locality/StorageSiteUtilTest.java
index eb9562a2a69..b2f70ba2675 100644
--- a/src/test/java/edu/harvard/iq/dataverse/locality/StorageSiteUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/locality/StorageSiteUtilTest.java
@@ -3,9 +3,12 @@
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import java.util.ArrayList;
 import java.util.List;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import org.junit.Test;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class StorageSiteUtilTest {
 
@@ -22,44 +25,47 @@ public void testParse() throws Exception {
         System.out.println("output: " + output);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testMissingHostname() throws Exception {
+    @Test
+    void testMissingHostname() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add(StorageSite.NAME, "myName");
         job.add(StorageSite.PRIMARY_STORAGE, true);
         job.add(StorageSite.TRANSFER_PROTOCOLS, "rsync");
-        StorageSiteUtil.parse(job.build());
+        JsonObject sut = job.build();
+        assertThrows(IllegalArgumentException.class, () -> StorageSiteUtil.parse(sut));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testBadProtocol() throws Exception {
+    @Test
+    void testBadProtocol() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add(StorageSite.HOSTNAME, "myHostname");
         job.add(StorageSite.NAME, "myName");
         job.add(StorageSite.PRIMARY_STORAGE, true);
         job.add(StorageSite.TRANSFER_PROTOCOLS, "junk");
-        StorageSiteUtil.parse(job.build());
+        JsonObject sut = job.build();
+        assertThrows(IllegalArgumentException.class, () -> StorageSiteUtil.parse(sut));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testNonBoolean() throws Exception {
+    @Test
+    void testNonBoolean() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add(StorageSite.HOSTNAME, "myHostname");
         job.add(StorageSite.NAME, "myName");
         job.add(StorageSite.PRIMARY_STORAGE, "not a boolean");
         job.add(StorageSite.TRANSFER_PROTOCOLS, "rsync");
-        StorageSiteUtil.parse(job.build());
+        JsonObject sut = job.build();
+        assertThrows(IllegalArgumentException.class, () -> StorageSiteUtil.parse(sut));
     }
 
-    @Test(expected = Exception.class)
-    public void testSecondPrimaryNotAllowed() throws Exception {
+    @Test
+    void testSecondPrimaryNotAllowed() {
         StorageSite newStorageSite = new StorageSite();
         newStorageSite.setPrimaryStorage(true);
         List<StorageSite> exitingSites = new ArrayList<>();
         StorageSite existingSite1 = new StorageSite();
         existingSite1.setPrimaryStorage(true);
         exitingSites.add(existingSite1);
-        StorageSiteUtil.ensureOnlyOnePrimary(newStorageSite, exitingSites);
+        assertThrows(Exception.class, () -> StorageSiteUtil.ensureOnlyOnePrimary(newStorageSite, exitingSites));
     }
 
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetricsServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetricsServiceBeanTest.java
index 6fa9ff1a8e9..61be14f41aa 100644
--- a/src/test/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetricsServiceBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/makedatacount/DatasetMetricsServiceBeanTest.java
@@ -3,11 +3,11 @@
 import edu.harvard.iq.dataverse.Dataset;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
 
-import javax.ejb.EJBException;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.ejb.EJBException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import org.mockito.ArgumentMatchers;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,7 +36,7 @@ void setup() {
     @Test
     void testGetDatasetMetricsByDatasetMonthCountry_withoutResults() {
         when(query.getResultList()).thenReturn(new ArrayList());
-        when(this.serviceBean.em.createQuery(Matchers.anyString())).thenReturn(query);
+        when(this.serviceBean.em.createQuery(ArgumentMatchers.anyString())).thenReturn(query);
 
         assertNull(serviceBean.getDatasetMetricsByDatasetMonthCountry(dataset, "01-01", "CH"));
     }
@@ -44,7 +44,7 @@ void testGetDatasetMetricsByDatasetMonthCountry_withoutResults() {
     @Test
     void testGetDatasetMetricsByDatasetMonthCountry_throwsForMultipleResults() {
         when(query.getResultList()).thenReturn(Arrays.asList(1, 2));
-        when(this.serviceBean.em.createQuery(Matchers.anyString())).thenReturn(query);
+        when(this.serviceBean.em.createQuery(ArgumentMatchers.anyString())).thenReturn(query);
 
         assertThrows(EJBException.class, () -> {
             serviceBean.getDatasetMetricsByDatasetMonthCountry(dataset, "01-01", "CH");
@@ -65,7 +65,7 @@ void testGetDatasetMetricsByDatasetMonthCountry_aggregatesForSingleResult() {
         datasetMetrics.setDownloadsUniqueMachine(8L);
 
         when(query.getResultList()).thenReturn(Arrays.asList(datasetMetrics));
-        when(this.serviceBean.em.createQuery(Matchers.anyString())).thenReturn(query);
+        when(this.serviceBean.em.createQuery(ArgumentMatchers.anyString())).thenReturn(query);
 
         DatasetMetrics result = serviceBean.getDatasetMetricsByDatasetMonthCountry(dataset, "04.2019", "CH");
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountLoggingServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountLoggingServiceBeanTest.java
index eb15db883c7..2a673ee4e79 100644
--- a/src/test/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountLoggingServiceBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountLoggingServiceBeanTest.java
@@ -16,11 +16,12 @@
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean.MakeDataCountEntry;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
 import java.util.Date;
-import javax.faces.context.FacesContext;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
-import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -40,11 +41,11 @@ public void testMainAndFileConstructor() {
         dataset.setAuthority("Authority");
         dataset.setProtocol("Protocol");
         dataset.setIdentifier("Identifier"); 
-        GlobalId id = new GlobalId(dataset);
+        GlobalId id = dataset.getGlobalId();
         dataset.setGlobalId(id);
         dvVersion.setDataset(dataset);
-        dvVersion.setAuthorsStr("OneAuthor;TwoAuthor");
-        dvVersion.setTitle("Title");
+        dvVersion.setAuthorsStr("OneAuthor;\tTwoAuthor");
+        dvVersion.setTitle("Title\tWith Tab");
         dvVersion.setVersionNumber(1L);
         dvVersion.setReleaseTime(new Date());
         
@@ -62,7 +63,13 @@ public void testMainAndFileConstructor() {
         
         //lastly setting attributes we don't actually use currently in our logging/constructors, just in case
         entry.setUserCookieId("UserCookId");
-        entry.setOtherId("OtherId");
+        entry.setOtherId(null); // null pointer check for sanitize method
+        assertThat(entry.getOtherId(), is("-"));
+        entry.setOtherId("OtherId\t\r\nX");
+        // escape sequences get replaced with a space in sanitize method
+        assertThat(entry.getOtherId(), is("OtherId X"));
+        // check other replacements for author list ";" becomes "|"
+        assertThat(entry.getAuthors(), is("OneAuthor| TwoAuthor"));
         
         //And test. "-" is the default
         assertThat(entry.getEventTime(), is(not("-")));
diff --git a/src/test/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountUtilTest.java
index 4e034f0d314..56e786714b6 100644
--- a/src/test/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/makedatacount/MakeDataCountUtilTest.java
@@ -4,10 +4,11 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.List;
-import javax.json.Json;
-import javax.json.JsonObject;
-import org.junit.Assert;
-import org.junit.Test;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class MakeDataCountUtilTest {
 
@@ -30,7 +31,7 @@ public void testParseCitations() {
         try (FileReader reader = new FileReader("src/test/java/edu/harvard/iq/dataverse/makedatacount/citations-for-doi-10.7910-DVN-HQZOOB.json")) {
             report = Json.createReader(reader).readObject();
             List<DatasetExternalCitations> datasetExternalCitations = MakeDataCountUtil.parseCitations(report);
-            Assert.assertEquals(2, datasetExternalCitations.size());
+            assertEquals(2, datasetExternalCitations.size());
         } catch (FileNotFoundException ex) {
             System.out.print("File not found: " + ex.getMessage());
         } catch (IOException ex) {
diff --git a/src/test/java/edu/harvard/iq/dataverse/metrics/MetricsUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/metrics/MetricsUtilTest.java
index c5162fa5d7e..ca662409a98 100644
--- a/src/test/java/edu/harvard/iq/dataverse/metrics/MetricsUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/metrics/MetricsUtilTest.java
@@ -6,40 +6,36 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Arrays;
-import java.util.Collection;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Enclosed.class)
-public class MetricsUtilTest {
-
-    public static class MetricsUtilNoParamTest {
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class MetricsUtilTest {
+
+    @Nested
+    class MetricsUtilNoParamTest {
 
         private static final long COUNT = 42l;
 
         @Test
-        public void testCountToJson() {
-            // This constructor is just here for code coverage. :)
-            MetricsUtil metricsUtil = new MetricsUtil();
+        void testCountToJson() {
             JsonObject jsonObject = MetricsUtil.countToJson(COUNT).build();
             System.out.println(JsonUtil.prettyPrint(jsonObject));
             assertEquals(COUNT, jsonObject.getJsonNumber("count").longValue());
         }
 
         @Test
-        public void testDataversesByCategoryToJson() {
+        void testDataversesByCategoryToJson() {
             List<Object[]> list = new ArrayList<>();
             Object[] obj00 = { "RESEARCH_PROJECTS", 791l };
             Object[] obj01 = { "RESEARCHERS", 745l };
@@ -68,7 +64,7 @@ public void testDataversesByCategoryToJson() {
         }
 
         @Test
-        public void testDatasetsBySubjectToJson() {
+        void testDatasetsBySubjectToJson() {
             List<Object[]> list = new ArrayList<>();
             Object[] obj00 = { "Social Sciences", 24955l };
             Object[] obj01 = { "Medicine, Health and Life Sciences", 2262l };
@@ -107,7 +103,7 @@ public void testDatasetsBySubjectToJson() {
         }
 
         @Test
-        public void testDataversesBySubjectToJson() {
+        void testDataversesBySubjectToJson() {
             List<Object[]> list = new ArrayList<>();
             Object[] obj00 = { "Social Sciences", 24955l };
             Object[] obj01 = { "Medicine, Health and Life Sciences", 2262l };
@@ -146,27 +142,27 @@ public void testDataversesBySubjectToJson() {
         }
 
         @Test
-        public void testSanitizeHappyPath() throws Exception {
+        void testSanitizeHappyPath() {
             assertEquals("2018-04", MetricsUtil.sanitizeYearMonthUserInput("2018-04"));
         }
 
-        @Test(expected = Exception.class)
-        public void testSanitizeJunk() throws Exception {
-            MetricsUtil.sanitizeYearMonthUserInput("junk");
+        @Test
+        void testSanitizeJunk() {
+            assertThrows(Exception.class, () -> MetricsUtil.sanitizeYearMonthUserInput("junk"));
         }
 
-        @Test(expected = Exception.class)
-        public void testSanitizeFullIso() throws Exception {
-            MetricsUtil.sanitizeYearMonthUserInput("2018-01-01");
+        @Test
+        void testSanitizeFullIso() {
+            assertThrows(Exception.class, () -> MetricsUtil.sanitizeYearMonthUserInput("2018-01-01"));
         }
 
-        @Test(expected = Exception.class)
-        public void testSanitizeYearMonthUserInputIsAfterCurrentDate() throws Exception {
-            MetricsUtil.sanitizeYearMonthUserInput("2099-01");
+        @Test
+        void testSanitizeYearMonthUserInputIsAfterCurrentDate() {
+            assertThrows(Exception.class, () -> MetricsUtil.sanitizeYearMonthUserInput("2099-01"));
         }
 
         @Test
-        public void testGetCurrentMonth() {
+        void testGetCurrentMonth() {
             String expectedMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
             String currentMonth = MetricsUtil.getCurrentMonth();
             assertEquals(expectedMonth, currentMonth);
@@ -175,7 +171,7 @@ public void testGetCurrentMonth() {
         // Create JsonArray, turn into string and back into array to confirm data
         // integrity
         @Test
-        public void testStringToJsonArrayBuilder() {
+        void testStringToJsonArrayBuilder() {
             System.out.println("testStringToJsonArrayBuilder");
             List<Object[]> list = new ArrayList<>();
             Object[] obj00 = { "Social Sciences", 24955l };
@@ -184,7 +180,7 @@ public void testStringToJsonArrayBuilder() {
             JsonArray jsonArrayBefore = MetricsUtil.datasetsBySubjectToJson(list).build();
             System.out.println(JsonUtil.prettyPrint(jsonArrayBefore));
 
-            JsonArray jsonArrayAfter = MetricsUtil.stringToJsonArrayBuilder(jsonArrayBefore.toString()).build();
+            JsonArray jsonArrayAfter = MetricsUtil.stringToJsonArray(jsonArrayBefore.toString());
             System.out.println(JsonUtil.prettyPrint(jsonArrayAfter));
 
             assertEquals(jsonArrayBefore.getJsonObject(0).getString("subject"),
@@ -194,55 +190,39 @@ public void testStringToJsonArrayBuilder() {
         // Create JsonObject, turn into string and back into array to confirm data
         // integrity
         @Test
-        public void testStringToJsonObjectBuilder() {
+        void testStringToJsonObjectBuilder() {
             System.out.println("testStringToJsonObjectBuilder");
 
             JsonObject jsonObjBefore = Json.createObjectBuilder().add("Test", "result").build();
             System.out.println(JsonUtil.prettyPrint(jsonObjBefore));
 
-            JsonObject jsonObjAfter = MetricsUtil.stringToJsonObjectBuilder(jsonObjBefore.toString()).build();
+            JsonObject jsonObjAfter = MetricsUtil.stringToJsonObject(jsonObjBefore.toString());
             System.out.println(JsonUtil.prettyPrint(jsonObjAfter));
 
             assertEquals(jsonObjBefore.getString("Test"), jsonObjAfter.getString("Test"));
         }
 
-    }
-
-    @RunWith(Parameterized.class)
-    public static class ValidateDataLocationStringTypeTest {
-        @Parameter
-        public String dataLocation;
-
-        @Parameter(1)
-        public boolean isExceptionExpected;
-
-        @Parameter(2)
-        public String expectedOutput;
-
-        @Parameters
-        public static Collection<Object[]> parameters() {
-            return Arrays.asList(new Object[][] { 
-                { "local", false, "local" }, 
-                { "remote", false, "remote" },
-                { "all", false, "all" }, 
-                { null, false, "local" }, 
-                { "", false, "local" },
-                { "abcd", true, null } 
-            });
-        }
-
         @Test
-        public void testValidateDataLocationStringType() {
-            try {
-                assertEquals(expectedOutput, MetricsUtil.validateDataLocationStringType(dataLocation));
-            } catch (Exception e) {
-                if (isExceptionExpected) {
-                    return;
-                } else {
-                    fail("should not throw an exception!");
-                }
-            }
+        void testStringToJsonWithNull() {
+            assertNull(MetricsUtil.stringToJsonArray(null));
+            assertNull(MetricsUtil.stringToJsonObject(null));
         }
 
     }
+    
+    @ParameterizedTest
+    @CsvSource(value = {
+        "local,false,local",
+        "remote,false,remote",
+        "all,false,all",
+        "NULL,false,local",
+        "'',false,local",
+        "abcd,true,NULL"
+    }, nullValues = "NULL")
+    void testValidateDataLocationStringType(String dataLocation, boolean isExceptionExpected, String expectedOutput) {
+        if (isExceptionExpected)
+            assertThrows(Exception.class, () -> MetricsUtil.validateDataLocationStringType(dataLocation));
+        else
+            assertEquals(expectedOutput, MetricsUtil.validateDataLocationStringType(dataLocation));
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/mocks/MockDatasetFieldSvc.java b/src/test/java/edu/harvard/iq/dataverse/mocks/MockDatasetFieldSvc.java
index 8ba99cfd747..22936def497 100644
--- a/src/test/java/edu/harvard/iq/dataverse/mocks/MockDatasetFieldSvc.java
+++ b/src/test/java/edu/harvard/iq/dataverse/mocks/MockDatasetFieldSvc.java
@@ -3,19 +3,31 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import jakarta.json.JsonObject;
+
 import edu.harvard.iq.dataverse.ControlledVocabularyValue;
 import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
 import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.MetadataBlock;
 
 public class MockDatasetFieldSvc extends DatasetFieldServiceBean {
 
     Map<String, DatasetFieldType> fieldTypes = new HashMap<>();
     long nextId = 1;
+    
+    static MetadataBlock test = null; 
 
+    public void setMetadataBlock(String name) {
+        test = new MetadataBlock();
+        test.setName(name);
+    }
+    
     public DatasetFieldType add(DatasetFieldType t) {
         if (t.getId() == null) {
             t.setId(nextId++);
         }
+        //Assure it has a metadatablock (used in ControlledVocabularValue for i18n)
+        t.setMetadataBlock(test);
         fieldTypes.put(t.getName(), t);
         return t;
     }
@@ -38,5 +50,9 @@ public ControlledVocabularyValue findControlledVocabularyValueByDatasetFieldType
         cvv.setStrValue(strValue);
         return cvv;
     }
+    
+    public Map<Long, JsonObject> getCVocConf(boolean byTermUriField){
+        return new HashMap<Long, JsonObject>();
+    }
 
 }
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/mocks/MocksFactory.java b/src/test/java/edu/harvard/iq/dataverse/mocks/MocksFactory.java
index cc4740e564c..c913a994138 100644
--- a/src/test/java/edu/harvard/iq/dataverse/mocks/MocksFactory.java
+++ b/src/test/java/edu/harvard/iq/dataverse/mocks/MocksFactory.java
@@ -143,12 +143,14 @@ public static Dataset makeDataset() {
         Dataset ds = new Dataset();
         ds.setId( nextId() );
         ds.setIdentifier("sample-ds-" + ds.getId() );
+        ds.setAuthority("10.5072");
         ds.setCategoriesByName( Arrays.asList("CatOne", "CatTwo", "CatThree") );
         final List<DataFile> files = makeFiles(10);
         final List<FileMetadata> metadatas = new ArrayList<>(10);
         final List<DataFileCategory> categories = ds.getCategories();
         Random rand = new Random();
         files.forEach( df ->{
+            df.setOwner(ds);
             df.getFileMetadata().addCategory(categories.get(rand.nextInt(categories.size())));
             metadatas.add( df.getFileMetadata() );
         });
@@ -194,10 +196,18 @@ public static DatasetFieldType makeDatasetFieldType() {
         final Long id = nextId();
         DatasetFieldType retVal = new DatasetFieldType("SampleType-"+id, FieldType.TEXT, false);
         retVal.setId(id);
+        MetadataBlock mdb = new MetadataBlock();
+        mdb.setId(new Random().nextLong());
+        mdb.setName("Test");
+        retVal.setMetadataBlock(mdb);
         return retVal;
     }
     
-    public static DataverseRole makeRole( String name ) {
+    public static DataverseRole makeRole( String name ) {       
+        return makeRole(name, true);
+    }
+    
+    public static DataverseRole makeRole( String name, Boolean includePublishDataset ) {
         DataverseRole dvr = new DataverseRole();
         
         dvr.setId( nextId() );
@@ -207,7 +217,10 @@ public static DataverseRole makeRole( String name ) {
         
         dvr.addPermission(Permission.ManageDatasetPermissions);
         dvr.addPermission(Permission.EditDataset);
-        dvr.addPermission(Permission.PublishDataset);
+        if  (includePublishDataset){
+           dvr.addPermission(Permission.PublishDataset);
+        }
+
         dvr.addPermission(Permission.ViewUnpublishedDataset);
         
         return dvr;
diff --git a/src/test/java/edu/harvard/iq/dataverse/mydata/MyDataUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/mydata/MyDataUtilTest.java
index 69996ce71fe..8cf5b0a3f44 100644
--- a/src/test/java/edu/harvard/iq/dataverse/mydata/MyDataUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/mydata/MyDataUtilTest.java
@@ -1,88 +1,82 @@
 package edu.harvard.iq.dataverse.mydata;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EmptySource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.NullSource;
 
-import org.junit.experimental.theories.DataPoints;
-import org.junit.experimental.theories.Theories;
-import org.junit.experimental.theories.Theory;
-import org.junit.runner.RunWith;
+import java.util.List;
 
-/**
- * Theories allows to add more formal tests to our code. In a way JUnit Theories behave 
- * much like mathematical theories that hold for every element of a large (infinite) set. 
- * JUnit will combine every possible combination (cartesian product) of datapoints and 
- * pass these to the tests annotated with @Theory. The assume statements make sure, only 
- * valid datapoints are tested in each Theory.
- * 
- * @Datapoints - defines an array of values to test on
- * @Datapoint - stores one single value
- * 
- * JUnit will no longer maintain a JUnit 4 Theories equivalent in the JUnit 5 codebase, as 
- * mentioned in a discussion here: https://github.com/junit-team/junit5/pull/1422#issuecomment-389644868
- */
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
-@RunWith(Theories.class)
-public class MyDataUtilTest {
+class MyDataUtilTest {
 
-    @DataPoints
-    public static String[] userIdentifier = { 
-        "@nzaugg", "nzaugg@", "nzaugg", "123nzaugg", "", " ", null, "@",  "n" };
+    static List<String> userIdentifier() {
+        return List.of("@nzaugg", "nzaugg@", "nzaugg", "123nzaugg", " ", "@", "n");
+    }
 
-    @Theory
-    public void testFormatUserIdentifierAsAssigneeIdentifierNull(String userIdentifier) {
-        assumeTrue(userIdentifier == null);
+    @ParameterizedTest
+    @NullSource
+    void testFormatUserIdentifierAsAssigneeIdentifierNull(String userIdentifier) {
         String formattedUserIdentifier = MyDataUtil.formatUserIdentifierAsAssigneeIdentifier(userIdentifier);
-        assertTrue(formattedUserIdentifier ==  null);
+        assertNull(formattedUserIdentifier);
     }
-
-    @Theory
-    public void testFormatUserIdentifierAsAssigneeIdentifierOneCharString(String userIdentifier) {
-        assumeTrue(userIdentifier != null);
+    
+    @ParameterizedTest
+    @MethodSource("userIdentifier")
+    void testFormatUserIdentifierAsAssigneeIdentifierOneCharString(String userIdentifier) {
         assumeTrue(userIdentifier.startsWith("@"));
+        
         String formattedUserIdentifier = MyDataUtil.formatUserIdentifierAsAssigneeIdentifier(userIdentifier);
-        assertTrue(formattedUserIdentifier.equals(userIdentifier));
+        assertEquals(formattedUserIdentifier, userIdentifier);
     }
-
-    @Theory
-    public void testFormatUserIdentifierAsAssigneeIdentifier(String userIdentifier) {
-        assumeTrue(userIdentifier != null);
+    
+    @ParameterizedTest
+    @MethodSource("userIdentifier")
+    void testFormatUserIdentifierAsAssigneeIdentifier(String userIdentifier) {
         assumeTrue(!userIdentifier.startsWith("@"));
+        
         String formattedUserIdentifier = MyDataUtil.formatUserIdentifierAsAssigneeIdentifier(userIdentifier);
-        assertTrue(formattedUserIdentifier.equals("@" + userIdentifier));
+        assertEquals(formattedUserIdentifier, "@" + userIdentifier);
     }
-
-    @Theory
-    public void testFormatUserIdentifierForMyDataFormNull(String userIdentifier) {
-        assumeTrue(userIdentifier == null);
+    
+    @ParameterizedTest
+    @NullSource
+    void testFormatUserIdentifierForMyDataFormNull(String userIdentifier) {
         String formattedUserIdentifier = MyDataUtil.formatUserIdentifierForMyDataForm(userIdentifier);
-        assertTrue(formattedUserIdentifier ==  null);
+        assertNull(formattedUserIdentifier);
     }
-
-    @Theory
-    public void testFormatUserIdentifierForMyDataFormOneCharString(String userIdentifier) {
-        assumeTrue(userIdentifier != null);
+    
+    @ParameterizedTest
+    @MethodSource("userIdentifier")
+    void testFormatUserIdentifierForMyDataFormOneCharString(String userIdentifier) {
         assumeTrue(userIdentifier.startsWith("@"));
         assumeTrue(userIdentifier.length() == 1);
+        
         String formattedUserIdentifier = MyDataUtil.formatUserIdentifierForMyDataForm(userIdentifier);
-        assertTrue(formattedUserIdentifier ==  null);
+        assertNull(formattedUserIdentifier);
     }
-
-    @Theory
-    public void testFormatUserIdentifierForMyDataFormLongerString(String userIdentifier) {
-        assumeTrue(userIdentifier != null);
+    
+    @ParameterizedTest
+    @MethodSource("userIdentifier")
+    void testFormatUserIdentifierForMyDataFormLongerString(String userIdentifier) {
         assumeTrue(userIdentifier.startsWith("@"));
         assumeTrue(userIdentifier.length() > 1);
+        
         String formattedUserIdentifier = MyDataUtil.formatUserIdentifierForMyDataForm(userIdentifier);
-        assertTrue(formattedUserIdentifier.equals(userIdentifier.substring(1)));
+        assertEquals(formattedUserIdentifier, userIdentifier.substring(1));
     }
-
-    @Theory
-    public void testFormatUserIdentifierForMyDataForm(String userIdentifier) {
-        assumeTrue(userIdentifier != null);
+    
+    @ParameterizedTest
+    @MethodSource("userIdentifier")
+    @EmptySource
+    void testFormatUserIdentifierForMyDataForm(String userIdentifier) {
         assumeTrue(!userIdentifier.startsWith("@"));
+        
         String formattedUserIdentifier = MyDataUtil.formatUserIdentifierForMyDataForm(userIdentifier);
-        assertTrue(formattedUserIdentifier.equals(userIdentifier));
+        assertEquals(formattedUserIdentifier, userIdentifier);
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/mydata/PagerTest.java b/src/test/java/edu/harvard/iq/dataverse/mydata/PagerTest.java
index a0ac22f99f3..a2729ce7514 100644
--- a/src/test/java/edu/harvard/iq/dataverse/mydata/PagerTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/mydata/PagerTest.java
@@ -2,6 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Arrays;
@@ -171,13 +173,13 @@ public void testBasics() {
         pager1 = new Pager(102, 10, 1);
 
         msgt("Test: 102 results, 10 per page, page 1");
-        assertEquals(true, pager1.isPagerNecessary());
+        assertTrue(pager1.isPagerNecessary());
 
         assertEquals(102, pager1.getNumResults());
         assertEquals(1, pager1.getPreviousPageNumber());
         assertEquals(2, pager1.getNextPageNumber());
-        assertEquals(false, pager1.hasPreviousPageNumber());
-        assertEquals(true, pager1.hasNextPageNumber());
+        assertFalse(pager1.hasPreviousPageNumber());
+        assertTrue(pager1.hasNextPageNumber());
         
         msg("page list: " + Arrays.toString(pager1.getPageNumberList()));
         //assertEquals(new int[]{1, 2, 3, 4, 5}, pager1.getPageNumberList());
@@ -232,13 +234,13 @@ public void testNoResults() {
         System.out.println("getNumResults");
         Pager pager1 = new Pager(0, 10, 1);
 
-        assertEquals(false, pager1.isPagerNecessary());
+        assertFalse(pager1.isPagerNecessary());
         
         assertEquals(0, pager1.getNumResults());
         assertEquals(0, pager1.getPreviousPageNumber());
         assertEquals(0, pager1.getNextPageNumber());
-        assertEquals(false, pager1.hasPreviousPageNumber());
-        assertEquals(false, pager1.hasNextPageNumber());
+        assertFalse(pager1.hasPreviousPageNumber());
+        assertFalse(pager1.hasNextPageNumber());
         
         msgt("page list: " + Arrays.toString(pager1.getPageNumberList()));
         //assertEquals(null, pager1.getPageNumberList());
diff --git a/src/test/java/edu/harvard/iq/dataverse/mydata/SolrQueryFormatterTest.java b/src/test/java/edu/harvard/iq/dataverse/mydata/SolrQueryFormatterTest.java
index 22faa57831d..789204c1db4 100644
--- a/src/test/java/edu/harvard/iq/dataverse/mydata/SolrQueryFormatterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/mydata/SolrQueryFormatterTest.java
@@ -5,8 +5,9 @@
  */
 package edu.harvard.iq.dataverse.mydata;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.lang.NullPointerException;
 import java.util.ArrayList;
@@ -16,20 +17,15 @@
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 
-import org.apache.commons.lang.StringUtils;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- *
- * @author rmp553
- */
-@RunWith(Enclosed.class)
 public class SolrQueryFormatterTest {
 
     public static class SolrQueryFormatterNoParamTest {
@@ -130,28 +126,7 @@ private void msgt(String s){
         }
     }
 
-    @RunWith(Parameterized.class)
-    public static class SolrQueryFormatterParamTest {
-
-        @Parameter(0)
-        public List<Long> sliceOfIds;
-
-        @Parameter(1)
-        public String paramName;
-
-        @Parameter(2)
-        public String dvObjectType;
-
-        // may be either
-        //  (i) the expected query part or
-        // (ii) the expected exception message
-        @Parameter(3)
-        public String expectedResult;
-
-        @Parameter(4)
-        public Class expectedException;
-
-        @Parameters
+    /*
         public static Collection data() {
             // The following list of test cases was compiled using the interface-based approach for input-space partition.
             // Therefor, for every input parameter, the domain of possible values was partitioned into different sets:
@@ -212,24 +187,90 @@ public static Collection data() {
                 { new ArrayList<Long>(Arrays.asList(1L, null)), "paramName", "dvObjectType", "(paramName:(1) AND dvObjectType:(dvObjectType))", null },
             });
         }
-
-        @Test
-        public void testFormatIdsForSolrClause() {
-            SolrQueryFormatter sqf = new SolrQueryFormatter();
-
-            if (expectedException == null) {
-                assertEquals(expectedResult, sqf.formatIdsForSolrClause(sliceOfIds, paramName, dvObjectType));
-                return;
-            }
-
-            try {
-                sqf.formatIdsForSolrClause(sliceOfIds, paramName, dvObjectType);
-                fail("Expected exception (" + expectedException.toString() + ") was not thrown");
-            } catch (Exception ex) {
-                assertEquals("verify the exception class", expectedException, ex.getClass());
-                assertEquals("verify the exception message", expectedResult, ex.getMessage());
-            }
+     */
+    
+    /*
+     * The following list of test cases was compiled using the interface-based approach for input-space partition.
+     * Therefor, for every input parameter, the domain of possible values was partitioned into different sets:
+     *    - sliceOfIds   (5 sets): null, empty, non-empty with null values only, non-empty with Long values only, non-empty with both null and Long values
+     *    - paramName    (3 sets): null, empty, non-empty
+     *    - dvObjectType (3 sets): null, empty, non-empty
+     * Then, for every set, a representative value was chosen and combined with every other set (3*3*5 = 45 test cases).
+     */
+    static Stream<Arguments> data() {
+        return Stream.of(
+            // sliceOfIds                   paramName    dvObjectType    expectedResult                                     expectedException
+            Arguments.of(null,              null,        null,           "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(null,              null,        "",             "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(null,              null,        "dvObjectType", "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(null,              "",          null,           "sliceOfIds cannot be null",                       NullPointerException.class),
+            Arguments.of(null,              "",          "",             "sliceOfIds cannot be null",                       NullPointerException.class),
+            Arguments.of(null,              "",          "dvObjectType", "sliceOfIds cannot be null",                       NullPointerException.class),
+            Arguments.of(null,              "paramName", null,           "sliceOfIds cannot be null",                       NullPointerException.class),
+            Arguments.of(null,              "paramName", "",             "sliceOfIds cannot be null",                       NullPointerException.class),
+            Arguments.of(null,              "paramName", "dvObjectType", "sliceOfIds cannot be null",                       NullPointerException.class),
+            
+            Arguments.of(list(),            null,        null,           "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list(),            null,        "",             "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list(),            null,        "dvObjectType", "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list(),            "",          null,           "sliceOfIds must have at least 1 value",           IllegalStateException.class),
+            Arguments.of(list(),            "",          "",             "sliceOfIds must have at least 1 value",           IllegalStateException.class),
+            Arguments.of(list(),            "",          "dvObjectType", "sliceOfIds must have at least 1 value",           IllegalStateException.class),
+            Arguments.of(list(),            "paramName", null,           "sliceOfIds must have at least 1 value",           IllegalStateException.class),
+            Arguments.of(list(),            "paramName", "",             "sliceOfIds must have at least 1 value",           IllegalStateException.class),
+            Arguments.of(list(),            "paramName", "dvObjectType", "sliceOfIds must have at least 1 value",           IllegalStateException.class),
+            
+            Arguments.of(list((Long) null), null,        null,           "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list((Long) null), null,        "",             "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list((Long) null), null,        "dvObjectType", "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list((Long) null), "",          null,           "(:())",                                           null),
+            Arguments.of(list((Long) null), "",          "",             "(:() AND dvObjectType:())",                       null),
+            Arguments.of(list((Long) null), "",          "dvObjectType", "(:() AND dvObjectType:(dvObjectType))",           null),
+            Arguments.of(list((Long) null), "paramName", null,           "(paramName:())",                                  null),
+            Arguments.of(list((Long) null), "paramName", "",             "(paramName:() AND dvObjectType:())",              null),
+            Arguments.of(list((Long) null), "paramName", "dvObjectType", "(paramName:() AND dvObjectType:(dvObjectType))",  null),
+            
+            Arguments.of(list(1L),          null,        null,           "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list(1L),          null,        "",             "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list(1L),          null,        "dvObjectType", "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list(1L),          "",          null,           "(:(1))",                                          null),
+            Arguments.of(list(1L),          "",          "",             "(:(1) AND dvObjectType:())",                      null),
+            Arguments.of(list(1L),          "",          "dvObjectType", "(:(1) AND dvObjectType:(dvObjectType))",          null),
+            Arguments.of(list(1L),          "paramName", null,           "(paramName:(1))",                                 null),
+            Arguments.of(list(1L),          "paramName", "",             "(paramName:(1) AND dvObjectType:())",             null),
+            Arguments.of(list(1L),          "paramName", "dvObjectType", "(paramName:(1) AND dvObjectType:(dvObjectType))", null),
+            
+            Arguments.of(list(1L, null),    null,        null,           "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list(1L, null),    null,        "",             "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list(1L, null),    null,        "dvObjectType", "paramName cannot be null",                        NullPointerException.class),
+            Arguments.of(list(1L, null),    "",          null,           "(:(1))",                                          null),
+            Arguments.of(list(1L, null),    "",          "",             "(:(1) AND dvObjectType:())",                      null),
+            Arguments.of(list(1L, null),    "",          "dvObjectType", "(:(1) AND dvObjectType:(dvObjectType))",          null),
+            Arguments.of(list(1L, null),    "paramName", null,           "(paramName:(1))",                                 null),
+            Arguments.of(list(1L, null),    "paramName", "",             "(paramName:(1) AND dvObjectType:())",             null),
+            Arguments.of(list(1L, null),    "paramName", "dvObjectType", "(paramName:(1) AND dvObjectType:(dvObjectType))", null)
+        );
+    }
+    
+    /**
+     * @param expectedResult May either be (i) the expected query part or (ii) the expected exception message
+     */
+    @ParameterizedTest
+    @MethodSource("data")
+    void testFormatIdsForSolrClause(List<Long> sliceOfIds, String paramName, String dvObjectType,
+                                    String expectedResult, Class<Throwable> expectedException) {
+        SolrQueryFormatter sqf = new SolrQueryFormatter();
+        
+        if (expectedException == null) {
+            assertEquals(expectedResult, sqf.formatIdsForSolrClause(sliceOfIds, paramName, dvObjectType));
+            return;
         }
-
+        
+        Throwable e = assertThrows(expectedException, () -> sqf.formatIdsForSolrClause(sliceOfIds, paramName, dvObjectType));
+        assertEquals(expectedResult, e.getMessage());
+    }
+    
+    static List<Long> list(Long... args) {
+        return Arrays.asList(args);
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetDataTest.java b/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetDataTest.java
index 9d5b5e0e70e..d7831003142 100644
--- a/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetDataTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetDataTest.java
@@ -5,31 +5,32 @@
  */
 package edu.harvard.iq.dataverse.passwordreset;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class PasswordResetDataTest {
 
     public PasswordResetDataTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBeanTest.java
index d7da02e4459..4fbd2352d09 100644
--- a/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBeanTest.java
@@ -10,10 +10,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
-import org.mockito.Matchers;
 
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
 import java.util.Arrays;
 import java.util.List;
 
@@ -97,7 +96,7 @@ void testAttemptPasswordReset_withNullNewPassword() {
 
     @Test
     void testAttemptPasswordReset_withValidationErrors() {
-        when(mockedPasswordValidatorServiceBean.validate(Matchers.anyString())).thenReturn(Arrays.asList("error"));
+        when(mockedPasswordValidatorServiceBean.validate(ArgumentMatchers.anyString())).thenReturn(Arrays.asList("error"));
 
         PasswordChangeAttemptResponse passwordChangeAttemptResponse = passwordResetServiceBean.attemptPasswordReset(new BuiltinUser(), "newpass", "token");
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordValidatorTest.java
index f6d02e35ddf..c15f7fa95e9 100644
--- a/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordValidatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/passwordreset/PasswordValidatorTest.java
@@ -1,72 +1,50 @@
 package edu.harvard.iq.dataverse.passwordreset;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
 public class PasswordValidatorTest {
-
-    public String password;
-    public boolean expected;
-    public boolean mustContainSpecialCharacters;
-    public boolean mustContainCapitalLetters;
-    public boolean mustContainNumbers;
-    public int minLength;
-    public int maxLength;
-
-    public PasswordValidatorTest(String password, boolean expected, boolean mustContainSpecialCharacters,
-            boolean mustContainCapitalLetters, boolean mustContainNumbers, int minLength, int maxLength) {
-        this.password = password;
-        this.expected = expected;
-        this.mustContainSpecialCharacters = mustContainSpecialCharacters;
-        this.mustContainCapitalLetters = mustContainCapitalLetters;
-        this.mustContainNumbers = mustContainNumbers;
-        this.minLength = minLength;
-        this.maxLength = maxLength;
-    }
-
-    @Parameters
-    public static Collection<Object[]> parameters() {
-        return Arrays.asList(
-             new Object[][] {
-                // Check if PasswordValidator correctly validates correct passwords
-                // with all combinations of Special Characters,
-                // Capital Letters and Numbers
-                {"abcdefghabcdefgh", true, false, false, false, 8, 30},    
-                {"@bcdefgh@bcdefgh", true, true, false, false, 8, 30},      
-                {"@bAdefgh@bAdefgh", true, true, true, false, 8, 30},      
-                {"abAdefghabAdefgh", true, false, true, false, 8, 30},     
-                {"a1Adefgha1Adefgh", true, false, true, true, 8, 30},      
-                {"ab1defghab1defgh", true, false, false, true, 8, 30},     
-                {"@1cdefgh@1cdefgh", true, true, false, true, 8, 30},      
-                {"@1Adefgh@1Adefgh", true, true, true, true, 8, 30},      
-                // Check if PasswordValidator correctly rejects wrong passwords
-                // with all combinations of Special Characters,
-                // Capital Letters and Numbers
-                {"abcabc", false, false, false, false, 8, 30},
-                {"abcdabcd", false, true, false, false, 8, 30},       
-                {"@bcd@bcd", false, true, true, false, 8, 30},       
-                {"@bc1@bc1", false, false, true, false, 8, 30},      
-                {"a1cda1cd", false, false, true, true, 8, 30},       
-                {"AbcdAbcd", false, false, false, true, 8, 30},      
-                {"@Bcd@Bcd", false, true, false, true, 8, 30},       
-                {"a1Ada1Ad", false, true, true, true, 8, 30},
-                {"", false, false, false, false, 1, 30},
-                {" ", false, false, false, false, 1, 30},
-                {"?!abcdef", false, true, false, false, 8, 30}
-             }
+    
+    static Stream<Arguments> testCases() {
+        return Stream.of(
+            // Check if PasswordValidator correctly validates correct passwords
+            // with all combinations of Special Characters,
+            // Capital Letters and Numbers
+            Arguments.of("abcdefghabcdefgh", true, false, false, false, 8, 30),
+            Arguments.of("@bcdefgh@bcdefgh", true, true, false, false, 8, 30),
+            Arguments.of("@bAdefgh@bAdefgh", true, true, true, false, 8, 30),
+            Arguments.of("abAdefghabAdefgh", true, false, true, false, 8, 30),
+            Arguments.of("a1Adefgha1Adefgh", true, false, true, true, 8, 30),
+            Arguments.of("ab1defghab1defgh", true, false, false, true, 8, 30),
+            Arguments.of("@1cdefgh@1cdefgh", true, true, false, true, 8, 30),
+            Arguments.of("@1Adefgh@1Adefgh", true, true, true, true, 8, 30),
+            // Check if PasswordValidator correctly rejects wrong passwords
+            // with all combinations of Special Characters,
+            // Capital Letters and Numbers
+            Arguments.of("abcabc", false, false, false, false, 8, 30),
+            Arguments.of("abcdabcd", false, true, false, false, 8, 30),
+            Arguments.of("@bcd@bcd", false, true, true, false, 8, 30),
+            Arguments.of("@bc1@bc1", false, false, true, false, 8, 30),
+            Arguments.of("a1cda1cd", false, false, true, true, 8, 30),
+            Arguments.of("AbcdAbcd", false, false, false, true, 8, 30),
+            Arguments.of("@Bcd@Bcd", false, true, false, true, 8, 30),
+            Arguments.of("a1Ada1Ad", false, true, true, true, 8, 30),
+            Arguments.of("", false, false, false, false, 1, 30),
+            Arguments.of(" ", false, false, false, false, 1, 30),
+            Arguments.of("?!abcdef", false, true, false, false, 8, 30)
         );
     }
     
-    @Test
-    public void testValidatePassword() {
+    @ParameterizedTest
+    @MethodSource("testCases")
+    void testValidatePassword(String password, boolean expected, boolean mustContainSpecialCharacters,
+                              boolean mustContainCapitalLetters, boolean mustContainNumbers, int minLength,
+                              int maxLength) {
         PasswordValidator validator = PasswordValidator.buildValidator(mustContainSpecialCharacters,
                 mustContainCapitalLetters, mustContainNumbers, minLength, maxLength);
         boolean isValidPassword = validator.validatePassword(password);
diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java
new file mode 100644
index 00000000000..3f8c198b0fe
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java
@@ -0,0 +1,571 @@
+package edu.harvard.iq.dataverse.pidproviders;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.UnmanagedDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.crossref.CrossRefDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.crossref.CrossRefDOIProviderFactory;
+import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteProviderFactory;
+import edu.harvard.iq.dataverse.pidproviders.doi.ezid.EZIdDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.ezid.EZIdProviderFactory;
+import edu.harvard.iq.dataverse.pidproviders.doi.fake.FakeDOIProvider;
+import edu.harvard.iq.dataverse.pidproviders.doi.fake.FakeProviderFactory;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider;
+import edu.harvard.iq.dataverse.pidproviders.handle.HandleProviderFactory;
+import edu.harvard.iq.dataverse.pidproviders.handle.UnmanagedHandlePidProvider;
+import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider;
+import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkProviderFactory;
+import edu.harvard.iq.dataverse.pidproviders.perma.UnmanagedPermaLinkPidProvider;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.NotFoundException;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+
+
+@ExtendWith(MockitoExtension.class)
+@LocalJvmSettings
+//Perma 1
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "perma 1", varArgs = "perma1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = PermaLinkPidProvider.TYPE, varArgs = "perma1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "DANSLINK", varArgs = "perma1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "QE", varArgs = "perma1")
+@JvmSetting(key = JvmSettings.PERMALINK_SEPARATOR, value = "-", varArgs = "perma1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_EXCLUDED_LIST, value = "perma:DANSLINKQE123456, perma:bad, perma:LINKIT123456", varArgs ="perma1")
+
+//Perma 2
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "perma 2", varArgs = "perma2")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = PermaLinkPidProvider.TYPE, varArgs = "perma2")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "DANSLINK", varArgs = "perma2")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "QQ", varArgs = "perma2")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_MANAGED_LIST, value = "perma:LINKIT/FK2ABCDEF", varArgs ="perma2")
+@JvmSetting(key = JvmSettings.PERMALINK_SEPARATOR, value = "/", varArgs = "perma2")
+@JvmSetting(key = JvmSettings.PERMALINK_BASE_URL, value = "https://example.org/123/citation?persistentId=perma:", varArgs = "perma2")
+// Datacite 1
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "dataCite 1", varArgs = "dc1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = DataCiteDOIProvider.TYPE, varArgs = "dc1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "10.5073", varArgs = "dc1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "FK2", varArgs = "dc1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_EXCLUDED_LIST, value = "doi:10.5073/FK2123456", varArgs ="dc1")
+@JvmSetting(key = JvmSettings.DATACITE_MDS_API_URL, value = "https://mds.test.datacite.org/", varArgs = "dc1")
+@JvmSetting(key = JvmSettings.DATACITE_REST_API_URL, value = "https://api.test.datacite.org", varArgs ="dc1")
+@JvmSetting(key = JvmSettings.DATACITE_USERNAME, value = "test", varArgs ="dc1")
+@JvmSetting(key = JvmSettings.DATACITE_PASSWORD, value = "changeme", varArgs ="dc1")
+//Datacite 2
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "dataCite 2", varArgs = "dc2")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = DataCiteDOIProvider.TYPE, varArgs = "dc2")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "10.5072", varArgs = "dc2")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "FK3", varArgs = "dc2")
+@JvmSetting(key = JvmSettings.DATACITE_MDS_API_URL, value = "https://mds.test.datacite.org/", varArgs = "dc2")
+@JvmSetting(key = JvmSettings.DATACITE_REST_API_URL, value = "https://api.test.datacite.org", varArgs ="dc2")
+@JvmSetting(key = JvmSettings.DATACITE_USERNAME, value = "test2", varArgs ="dc2")
+@JvmSetting(key = JvmSettings.DATACITE_PASSWORD, value = "changeme2", varArgs ="dc2")
+//EZID 1
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "EZId 1", varArgs = "ez1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = EZIdDOIProvider.TYPE, varArgs = "ez1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "10.5072", varArgs = "ez1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "FK2", varArgs = "ez1")
+@JvmSetting(key = JvmSettings.EZID_API_URL, value = "https://ezid.cdlib.org/", varArgs = "ez1")
+@JvmSetting(key = JvmSettings.EZID_USERNAME, value = "apitest", varArgs ="ez1")
+@JvmSetting(key = JvmSettings.EZID_PASSWORD, value = "apitest", varArgs ="ez1")
+//FAKE 1
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "FAKE 1", varArgs = "fake1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = FakeDOIProvider.TYPE, varArgs = "fake1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "10.5074", varArgs = "fake1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "fk", varArgs = "fake1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_MANAGED_LIST, value = "doi:10.5073/FK3ABCDEF", varArgs ="fake1")
+
+//HANDLE 1
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "HDL 1", varArgs = "hdl1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = HandlePidProvider.TYPE, varArgs = "hdl1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "20.500.1234", varArgs = "hdl1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "test", varArgs = "hdl1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_MANAGED_LIST, value = "hdl:20.20.20/FK2ABCDEF", varArgs ="hdl1")
+@JvmSetting(key = JvmSettings.HANDLENET_AUTH_HANDLE, value = "20.500.1234/ADMIN", varArgs ="hdl1")
+@JvmSetting(key = JvmSettings.HANDLENET_INDEPENDENT_SERVICE, value = "true", varArgs ="hdl1")
+@JvmSetting(key = JvmSettings.HANDLENET_INDEX, value = "1", varArgs ="hdl1")
+@JvmSetting(key = JvmSettings.HANDLENET_KEY_PASSPHRASE, value = "passphrase", varArgs ="hdl1")
+@JvmSetting(key = JvmSettings.HANDLENET_KEY_PATH, value = "/tmp/cred", varArgs ="hdl1")
+
+// CrossRef 1
+@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "CrossRef 1", varArgs = "crossref1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = CrossRefDOIProvider.TYPE, varArgs = "crossref1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "10.11111", varArgs = "crossref1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "DVN/", varArgs = "crossref1")
+@JvmSetting(key = JvmSettings.PID_PROVIDER_MANAGED_LIST, value = "", varArgs ="crossref1")
+@JvmSetting(key = JvmSettings.CROSSREF_URL, value = "https://doi.crossref.org", varArgs ="crossref1")
+@JvmSetting(key = JvmSettings.CROSSREF_REST_API_URL, value = "https://test.crossref.org", varArgs ="crossref1")
+@JvmSetting(key = JvmSettings.CROSSREF_USERNAME, value = "crusername", varArgs ="crossref1")
+@JvmSetting(key = JvmSettings.CROSSREF_PASSWORD, value = "secret", varArgs ="crossref1")
+@JvmSetting(key = JvmSettings.CROSSREF_DEPOSITOR, value = "xyz", varArgs ="crossref1")
+@JvmSetting(key = JvmSettings.CROSSREF_DEPOSITOR_EMAIL, value = "xyz@example.com", varArgs ="crossref1")
+//List to instantiate
+@JvmSetting(key = JvmSettings.PID_PROVIDERS, value = "perma1, perma2, dc1, dc2, ez1, fake1, hdl1, crossref1")
+
+public class PidUtilTest {
+
+    @Mock
+    private SettingsServiceBean settingsServiceBean;
+    
+    static PidProviderFactoryBean pidService;
+
+    @BeforeAll
+    //FWIW @JvmSetting doesn't appear to work with @BeforeAll
+    public static void setUpClass() throws Exception {
+
+        //This mimics the initial config in the PidProviderFactoryBean.loadProviderFactories method - could potentially be used to mock that bean at some point
+        Map<String, PidProviderFactory> pidProviderFactoryMap = new HashMap<>();
+        pidProviderFactoryMap.put(PermaLinkPidProvider.TYPE, new PermaLinkProviderFactory());
+        pidProviderFactoryMap.put(DataCiteDOIProvider.TYPE, new DataCiteProviderFactory());
+        pidProviderFactoryMap.put(HandlePidProvider.TYPE, new HandleProviderFactory());
+        pidProviderFactoryMap.put(FakeDOIProvider.TYPE, new FakeProviderFactory());
+        pidProviderFactoryMap.put(EZIdDOIProvider.TYPE, new EZIdProviderFactory());
+        pidProviderFactoryMap.put(CrossRefDOIProvider.TYPE, new CrossRefDOIProviderFactory());
+        
+        PidUtil.clearPidProviders();
+        
+        //Read list of providers to add
+        List<String> providers = Arrays.asList(JvmSettings.PID_PROVIDERS.lookup().split(",\\s"));
+        //Iterate through the list of providers and add them using the PidProviderFactory of the appropriate type
+        for (String providerId : providers) {
+            System.out.println("Loading provider: " + providerId);
+            String type = JvmSettings.PID_PROVIDER_TYPE.lookup(providerId);
+            PidProviderFactory factory = pidProviderFactoryMap.get(type);
+            PidUtil.addToProviderList(factory.createPidProvider(providerId));
+        }
+        PidUtil.addAllToUnmanagedProviderList(Arrays.asList(new UnmanagedDOIProvider(),
+                new UnmanagedHandlePidProvider(), new UnmanagedPermaLinkPidProvider()));
+    }
+    
+    @AfterAll
+    public static void tearDownClass() throws Exception {
+        PidUtil.clearPidProviders();
+    }
+    
+    @BeforeEach
+    public void initMocks() {
+        MockitoAnnotations.initMocks(this);
+//        Mockito.when(settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Protocol)).thenReturn("perma");
+//        Mockito.when(settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Authority)).thenReturn("DANSLINK");
+    }
+    
+    /**
+     * Useful for testing but requires DataCite credentials, etc.
+     */
+    @Disabled
+    @Test
+    public void testGetDoi() throws IOException {
+        String username = System.getenv("DataCiteUsername");
+        String password = System.getenv("DataCitePassword");
+        String baseUrl = "https://api.test.datacite.org";
+        GlobalId pid = new GlobalId(AbstractDOIProvider.DOI_PROTOCOL,"10.70122","QE5A-XN55", "/", AbstractDOIProvider.DOI_RESOLVER_URL, null);
+        try {
+            JsonObjectBuilder result = PidUtil.queryDoi(pid, baseUrl, username, password);
+            String out = JsonUtil.prettyPrint(result.build());
+            System.out.println("out: " + out);
+        } catch (NotFoundException ex) {
+            System.out.println("ex: " + ex);
+        }
+    }
+
+    
+    @Test
+    public void testFactories() throws IOException {
+        PidProvider p = PidUtil.getPidProvider("perma1");
+        assertEquals("perma 1", p.getLabel());
+        assertEquals(PermaLinkPidProvider.PERMA_PROTOCOL, p.getProtocol());
+        assertEquals("DANSLINK", p.getAuthority());
+        assertEquals("QE", p.getShoulder());
+        assertEquals("-", p.getSeparator());
+        assertTrue(p.getUrlPrefix().startsWith(SystemConfig.getDataverseSiteUrlStatic()));
+        p = PidUtil.getPidProvider("perma2");
+        assertTrue(p.getUrlPrefix().startsWith("https://example.org/123/citation?persistentId="));
+        p = PidUtil.getPidProvider("dc2");
+        assertEquals("FK3", p.getShoulder());
+        
+    }
+    
+    @Test
+    public void testPermaLinkParsing() throws IOException {
+        //Verify that we can parse a valid perma link associated with perma1
+        String pid1String = "perma:DANSLINK-QE-5A-XN55";
+        GlobalId pid2 = PidUtil.parseAsGlobalID(pid1String);
+        assertEquals(pid1String, pid2.asString());
+        //Check that it was parsed by perma1 and that the URL is correct, etc
+        assertEquals("perma1", pid2.getProviderId());
+        assertEquals(SystemConfig.getDataverseSiteUrlStatic() + "/citation?persistentId=" + pid1String, pid2.asURL());
+        assertEquals("DANSLINK", pid2.getAuthority());
+        assertEquals(PermaLinkPidProvider.PERMA_PROTOCOL, pid2.getProtocol());
+        
+        //Verify that parsing the URL form works
+        GlobalId pid3 = PidUtil.parseAsGlobalID(pid2.asURL());
+        assertEquals(pid1String, pid3.asString());
+        assertEquals("perma1", pid3.getProviderId());
+
+        //Repeat the basics with a permalink associated with perma2
+        String  pid4String = "perma:DANSLINK/QQ-5A-XN55";
+        GlobalId pid5 = PidUtil.parseAsGlobalID(pid4String);
+        assertEquals("perma2", pid5.getProviderId());
+        assertEquals(pid4String, pid5.asString());
+        assertEquals("https://example.org/123/citation?persistentId=" + pid4String, pid5.asURL());
+
+    }
+    
+    @Test
+    public void testPermaLinkGenerationiWithSeparator() throws IOException {
+        Dataset ds = new Dataset();
+        pidService = Mockito.mock(PidProviderFactoryBean.class);
+        Mockito.when(pidService.isGlobalIdLocallyUnique(any(GlobalId.class))).thenReturn(true);
+        PidProvider p = PidUtil.getPidProvider("perma1");
+        p.setPidProviderServiceBean(pidService);
+        p.generatePid(ds);
+        System.out.println("DS sep " + ds.getSeparator());
+        System.out.println("Generated perma identifier" + ds.getGlobalId().asString());
+        System.out.println("Provider prefix for perma identifier" + p.getAuthority() + p.getSeparator() + p.getShoulder());
+        assertTrue(ds.getGlobalId().asRawIdentifier().startsWith(p.getAuthority() + p.getSeparator() + p.getShoulder()));
+    }
+    
+    @Test
+    public void testDOIParsing() throws IOException {
+        
+        String pid1String = "doi:10.5073/FK2ABCDEF";
+        GlobalId pid2 = PidUtil.parseAsGlobalID(pid1String);
+        assertEquals(pid1String, pid2.asString());
+        assertEquals("dc1", pid2.getProviderId());
+        assertEquals("https://doi.org/" + pid2.getAuthority() + PidUtil.getPidProvider(pid2.getProviderId()).getSeparator() + pid2.getIdentifier(),pid2.asURL());
+        assertEquals("10.5073", pid2.getAuthority());
+        assertEquals(AbstractDOIProvider.DOI_PROTOCOL, pid2.getProtocol());
+        GlobalId pid3 = PidUtil.parseAsGlobalID(pid2.asURL());
+        assertEquals(pid1String, pid3.asString());
+        assertEquals("dc1", pid3.getProviderId());
+        
+        //Also test case insensitive
+        String pid4String = "doi:10.5072/fk3ABCDEF";
+        GlobalId pid4 = PidUtil.parseAsGlobalID(pid4String);
+        // Lower case is recognized by converting to upper case internally, so we need to test vs. the upper case identifier
+        // I.e. we are verifying that the lower case string is parsed the same as the upper case string, both give an internal upper case PID representation
+        assertEquals("doi:10.5072/FK3ABCDEF", pid4.asString());
+        assertEquals("dc2", pid4.getProviderId());
+
+        String pid5String = "doi:10.5072/FK2ABCDEF";
+        GlobalId pid5 = PidUtil.parseAsGlobalID(pid5String);
+        assertEquals(pid5String, pid5.asString());
+        assertEquals("ez1", pid5.getProviderId());
+        
+        String pid6String = "doi:10.5074/FKABCDEF";
+        GlobalId pid6 = PidUtil.parseAsGlobalID(pid6String);
+        assertEquals(pid6String, pid6.asString());
+        assertEquals("fake1", pid6.getProviderId());
+
+        String pid7String = "doi:10.11111/DVN/ABCDEF";
+        GlobalId pid7 = PidUtil.parseAsGlobalID(pid7String);
+        assertEquals(pid7String, pid7.asString());
+        assertEquals("crossref1", pid7.getProviderId());
+    }
+    
+    @Test
+    public void testHandleParsing() throws IOException {
+        
+        String pid1String = "hdl:20.500.1234/test10052";
+        GlobalId pid2 = PidUtil.parseAsGlobalID(pid1String);
+        assertEquals(pid1String, pid2.asString());
+        assertEquals("hdl1", pid2.getProviderId());
+        assertEquals("https://hdl.handle.net/" + pid2.getAuthority() + PidUtil.getPidProvider(pid2.getProviderId()).getSeparator() + pid2.getIdentifier(), pid2.asURL());
+        assertEquals("20.500.1234", pid2.getAuthority());
+        assertEquals(HandlePidProvider.HDL_PROTOCOL, pid2.getProtocol());
+        GlobalId pid3 = PidUtil.parseAsGlobalID(pid2.asURL());
+        assertEquals(pid1String, pid3.asString());
+        assertEquals("hdl1", pid3.getProviderId());
+        
+        // Test case sensitivity - a handle with uppercase "TEST" should not match the hdl1 provider
+        String pid4String = "hdl:20.500.1234/TEST10052";
+        GlobalId pid4 = PidUtil.parseAsGlobalID(pid4String);
+        assertEquals(pid4String, pid4.asString());
+        assertEquals(UnmanagedHandlePidProvider.ID, pid4.getProviderId());
+    }
+
+    @Test
+    public void testUnmanagedParsing() throws IOException {
+        // A handle managed not managed in the hdl1 provider
+        String pid1String = "hdl:20.500.3456/10052";
+        GlobalId pid2 = PidUtil.parseAsGlobalID(pid1String);
+        assertEquals(pid1String, pid2.asString());
+        //Only parsed by the unmanaged provider
+        assertEquals(UnmanagedHandlePidProvider.ID, pid2.getProviderId());
+        assertEquals(HandlePidProvider.HDL_RESOLVER_URL + pid2.getAuthority() + PidUtil.getPidProvider(pid2.getProviderId()).getSeparator() + pid2.getIdentifier(),pid2.asURL());
+        assertEquals("20.500.3456", pid2.getAuthority());
+        assertEquals(HandlePidProvider.HDL_PROTOCOL, pid2.getProtocol());
+        GlobalId pid3 = PidUtil.parseAsGlobalID(pid2.asURL());
+        assertEquals(pid1String, pid3.asString());
+        assertEquals(UnmanagedHandlePidProvider.ID, pid3.getProviderId());
+        
+        //Same for DOIs
+        String pid5String = "doi:10.6083/FK2ABCDEF";
+        GlobalId pid5 = PidUtil.parseAsGlobalID(pid5String);
+        assertEquals(pid5String, pid5.asString());
+        assertEquals(UnmanagedDOIProvider.ID, pid5.getProviderId());
+
+        //And Permalinks
+        String pid6String = "perma:NOTDANSQEABCDEF";
+        GlobalId pid6 = PidUtil.parseAsGlobalID(pid6String);
+        assertEquals(pid6String, pid6.asString());
+        assertEquals(UnmanagedPermaLinkPidProvider.ID, pid6.getProviderId());
+        
+        //Lowercase test for unmanaged DOIs
+        String pid7String = "doi:10.5281/zenodo.6381129";
+        GlobalId pid7 = PidUtil.parseAsGlobalID(pid7String);
+        assertEquals(UnmanagedDOIProvider.ID, pid5.getProviderId());
+        assertEquals(pid7String.toUpperCase().replace("DOI", "doi"), pid7.asString());
+        
+
+    }
+    
+    @Test
+    public void testExcludedSetParsing() throws IOException {
+        
+        String pid1String = "doi:10.5073/FK2123456";
+        GlobalId pid2 = PidUtil.parseAsGlobalID(pid1String);
+        assertEquals(pid1String, pid2.asString());
+        assertEquals(UnmanagedDOIProvider.ID, pid2.getProviderId());
+        assertEquals("https://doi.org/" + pid2.getAuthority() + PidUtil.getPidProvider(pid2.getProviderId()).getSeparator() + pid2.getIdentifier(),pid2.asURL());
+        assertEquals("10.5073", pid2.getAuthority());
+        assertEquals(AbstractDOIProvider.DOI_PROTOCOL, pid2.getProtocol());
+        GlobalId pid3 = PidUtil.parseAsGlobalID(pid2.asURL());
+        assertEquals(pid1String, pid3.asString());
+        assertEquals(UnmanagedDOIProvider.ID, pid3.getProviderId());
+        
+        String pid4String = "perma:bad";
+        GlobalId pid4 = PidUtil.parseAsGlobalID(pid4String);
+        assertEquals(pid4String, pid4.asString());
+        assertEquals(UnmanagedPermaLinkPidProvider.ID, pid4.getProviderId());
+
+        String pid5String = "perma:DANSLINKQE123456";
+        GlobalId pid5 = PidUtil.parseAsGlobalID(pid5String);
+        assertEquals(pid5String, pid5.asString());
+        assertEquals(UnmanagedPermaLinkPidProvider.ID, pid5.getProviderId());
+        
+        String pid6String = "perma:LINKIT123456";
+        GlobalId pid6 = PidUtil.parseAsGlobalID(pid6String);
+        assertEquals(pid6String, pid6.asString());
+        assertEquals(UnmanagedPermaLinkPidProvider.ID, pid6.getProviderId());
+
+
+    }
+    
+    @Test
+    public void testManagedSetParsing() throws IOException {
+        
+        String pid1String = "doi:10.5073/fk3ABCDEF";
+        GlobalId pid2 = PidUtil.parseAsGlobalID(pid1String);
+        assertEquals(pid1String.toUpperCase().replace("DOI", "doi"), pid2.asString());
+        assertEquals("fake1", pid2.getProviderId());
+        assertEquals("https://doi.org/" + pid2.getAuthority() + PidUtil.getPidProvider(pid2.getProviderId()).getSeparator() + pid2.getIdentifier(),pid2.asURL());
+        assertEquals("10.5073", pid2.getAuthority());
+        assertEquals(AbstractDOIProvider.DOI_PROTOCOL, pid2.getProtocol());
+        GlobalId pid3 = PidUtil.parseAsGlobalID(pid2.asURL());
+        assertEquals(pid1String.toUpperCase().replace("DOI", "doi"), pid3.asString());
+        assertEquals("fake1", pid3.getProviderId());
+        assertFalse(PidUtil.getPidProvider(pid3.getProviderId()).canCreatePidsLike(pid3));
+        
+        String pid4String = "hdl:20.20.20/FK2ABCDEF";
+        GlobalId pid4 = PidUtil.parseAsGlobalID(pid4String);
+        assertEquals(pid4String, pid4.asString());
+        assertEquals("hdl1", pid4.getProviderId());
+        assertFalse(PidUtil.getPidProvider(pid4.getProviderId()).canCreatePidsLike(pid4));
+
+        String pid5String = "perma:LINKIT/FK2ABCDEF";
+        GlobalId pid5 = PidUtil.parseAsGlobalID(pid5String);
+        assertEquals(pid5String, pid5.asString());
+        assertEquals("perma2", pid5.getProviderId());
+        assertFalse(PidUtil.getPidProvider(pid5.getProviderId()).canCreatePidsLike(pid5));
+    }
+    
+    @Test
+    public void testFindingPidGenerators() throws IOException {
+        
+        Dataset dataset1 = new Dataset();
+        Dataverse dataverse1 = new Dataverse();
+        dataset1.setOwner(dataverse1);
+        String pidGeneratorSpecs = Json.createObjectBuilder().add("protocol", AbstractDOIProvider.DOI_PROTOCOL).add("authority","10.5072").add("shoulder", "FK2").build().toString();
+        //Set a PID generator on the parent
+        dataverse1.setPidGeneratorSpecs(pidGeneratorSpecs);
+        assertEquals(pidGeneratorSpecs, dataverse1.getPidGeneratorSpecs());
+        //Verify that the parent's PID generator is the effective one
+        assertEquals("ez1", dataverse1.getEffectivePidGenerator().getId());
+        assertEquals("ez1", dataset1.getEffectivePidGenerator().getId());
+        //Change dataset to have a provider and verify that it is used instead of any effective one
+        dataset1.setAuthority("10.5073");
+        dataset1.setProtocol(AbstractDOIProvider.DOI_PROTOCOL);
+        dataset1.setIdentifier("FK2ABCDEF");
+        //Reset to get rid of cached @transient value
+        dataset1.setPidGenerator(null);
+        assertEquals("dc1", dataset1.getGlobalId().getProviderId());
+        assertEquals("dc1", dataset1.getEffectivePidGenerator().getId());
+        assertTrue(PidUtil.getPidProvider(dataset1.getEffectivePidGenerator().getId()).canCreatePidsLike(dataset1.getGlobalId()));
+        
+        dataset1.setPidGenerator(null);
+        //Now set identifier so that the provider has this one in it's managed list (and therefore we can't mint new PIDs in the same auth/shoulder) and therefore we get the effective pid generator
+        dataset1.setIdentifier("FK3ABCDEF");
+        assertEquals("fake1", dataset1.getGlobalId().getProviderId());
+        assertEquals("ez1", dataset1.getEffectivePidGenerator().getId());
+        
+        //Now test failure case
+        dataverse1.setPidGenerator(null);
+        dataset1.setPidGenerator(null);
+        pidGeneratorSpecs = Json.createObjectBuilder().add("protocol", AbstractDOIProvider.DOI_PROTOCOL).add("authority","10.9999").add("shoulder", "FK2").build().toString();
+        //Set a PID generator on the parent
+        dataverse1.setPidGeneratorSpecs(pidGeneratorSpecs);
+        assertEquals(pidGeneratorSpecs, dataverse1.getPidGeneratorSpecs());
+        //Verify that the parent's PID generator is the effective one
+        assertNull(dataverse1.getEffectivePidGenerator());
+        assertNull(dataset1.getEffectivePidGenerator());
+    }
+    
+    @Test
+    @JvmSetting(key = JvmSettings.LEGACY_DATACITE_MDS_API_URL, value = "https://mds.test.datacite.org/")
+    @JvmSetting(key = JvmSettings.LEGACY_DATACITE_REST_API_URL, value = "https://api.test.datacite.org")
+    @JvmSetting(key = JvmSettings.LEGACY_DATACITE_USERNAME, value = "test2")
+    @JvmSetting(key = JvmSettings.LEGACY_DATACITE_PASSWORD, value = "changeme2")
+    public void testLegacyConfig() throws IOException {
+      MockitoAnnotations.openMocks(this);
+      Mockito.when(settingsServiceBean.getValueForKey(SettingsServiceBean.Key.DoiProvider)).thenReturn("DataCite");
+      Mockito.when(settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Shoulder)).thenReturn("FK2");
+
+      Mockito.when(settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Protocol)).thenReturn("doi");
+      Mockito.when(settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Authority)).thenReturn("10.5075");
+
+
+      
+      String protocol = settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Protocol);
+      String authority = settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Authority);
+      String shoulder = settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Shoulder);
+      String provider = settingsServiceBean.getValueForKey(SettingsServiceBean.Key.DoiProvider);
+
+      if (protocol != null && authority != null && shoulder != null && provider != null) {
+          // This line is different than in PidProviderFactoryBean because here we've
+          // already added the unmanaged providers, so we can't look for null
+          if (!PidUtil.getPidProvider(protocol, authority, shoulder).canManagePID()) {
+              PidProvider legacy = null;
+              // Try to add a legacy provider
+              String identifierGenerationStyle = settingsServiceBean
+                      .getValueForKey(SettingsServiceBean.Key.IdentifierGenerationStyle, "random");
+              String dataFilePidFormat = settingsServiceBean.getValueForKey(SettingsServiceBean.Key.DataFilePIDFormat,
+                      "DEPENDENT");
+              switch (provider) {
+              case "EZID":
+                  /*
+                   * String baseUrl = JvmSettings.PID_EZID_BASE_URL.lookup(String.class); String
+                   * username = JvmSettings.PID_EZID_USERNAME.lookup(String.class); String
+                   * password = JvmSettings.PID_EZID_PASSWORD.lookup(String.class);
+                   * legacy = new EZIdDOIProvider("legacy", "legacy", authority,
+                   * shoulder, identifierGenerationStyle, dataFilePidFormat, "", "", baseUrl,
+                   * username, password);
+                   */
+                  break;
+              case "DataCite":
+                  String mdsUrl = JvmSettings.LEGACY_DATACITE_MDS_API_URL.lookup(String.class);
+                  String restUrl = JvmSettings.LEGACY_DATACITE_REST_API_URL.lookup(String.class);
+                  String dcUsername = JvmSettings.LEGACY_DATACITE_USERNAME.lookup(String.class);
+                  String dcPassword = JvmSettings.LEGACY_DATACITE_PASSWORD.lookup(String.class);
+                  if (mdsUrl != null && restUrl != null && dcUsername != null && dcPassword != null) {
+                      legacy = new DataCiteDOIProvider("legacy", "legacy", authority, shoulder,
+                              identifierGenerationStyle, dataFilePidFormat, "", "", mdsUrl, restUrl, dcUsername,
+                              dcPassword);
+                  }
+                  break;
+              case "FAKE":
+                  System.out.println("Legacy FAKE found");
+                  legacy = new FakeDOIProvider("legacy", "legacy", authority, shoulder,
+                              identifierGenerationStyle, dataFilePidFormat, "", "");
+                  break;
+              }
+              if (legacy != null) {
+                  // Not testing parts that require this bean
+                  legacy.setPidProviderServiceBean(null);
+                  PidUtil.addToProviderList(legacy);
+              }
+          } else {
+              System.out.println("Legacy PID provider settings found - ignored since a provider for the same protocol, authority, shoulder has been registered");
+          }
+
+      }
+      
+        String pid1String = "doi:10.5075/FK2ABCDEF";
+        GlobalId pid2 = PidUtil.parseAsGlobalID(pid1String);    
+        assertEquals(pid1String, pid2.asString());
+        assertEquals("legacy", pid2.getProviderId());
+    }
+
+    //Tests support for legacy Perma provider - see #10516
+    @Test
+    @JvmSetting(key = JvmSettings.LEGACY_PERMALINK_BASEURL, value = "http://localhost:8080/")
+    public void testLegacyPermaConfig() throws IOException {
+      MockitoAnnotations.openMocks(this);
+      Mockito.when(settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Shoulder)).thenReturn("FK2");
+      Mockito.when(settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Protocol)).thenReturn(PermaLinkPidProvider.PERMA_PROTOCOL);
+      Mockito.when(settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Authority)).thenReturn("PermaTest");
+      
+      String protocol = settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Protocol);
+      String authority = settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Authority);
+      String shoulder = settingsServiceBean.getValueForKey(SettingsServiceBean.Key.Shoulder);
+
+      //Code mirrors the relevant part of PidProviderFactoryBean
+      if (protocol != null && authority != null && shoulder != null) {
+          // This line is different than in PidProviderFactoryBean because here we've
+          // already added the unmanaged providers, so we can't look for null
+          if (!PidUtil.getPidProvider(protocol, authority, shoulder).canManagePID()) {
+              PidProvider legacy = null;
+              // Try to add a legacy provider
+              String identifierGenerationStyle = settingsServiceBean
+                      .getValueForKey(SettingsServiceBean.Key.IdentifierGenerationStyle, "random");
+              String dataFilePidFormat = settingsServiceBean.getValueForKey(SettingsServiceBean.Key.DataFilePIDFormat,
+                      "DEPENDENT");
+              String baseUrl = JvmSettings.LEGACY_PERMALINK_BASEURL.lookupOptional().orElse(SystemConfig.getDataverseSiteUrlStatic());
+              legacy = new PermaLinkPidProvider("legacy", "legacy", authority, shoulder,
+                      identifierGenerationStyle, dataFilePidFormat, "", "", baseUrl,
+                      PermaLinkPidProvider.SEPARATOR);
+              if (legacy != null) {
+                  // Not testing parts that require this bean
+                  legacy.setPidProviderServiceBean(null);
+                  PidUtil.addToProviderList(legacy);
+              }
+          } else {
+              System.out.println("Legacy PID provider settings found - ignored since a provider for the same protocol, authority, shoulder has been registered");
+          }
+
+      }
+        //Is a perma PID with the default "" separator recognized?
+        String pid1String = "perma:PermaTestFK2ABCDEF";
+        GlobalId pid2 = PidUtil.parseAsGlobalID(pid1String);
+        assertEquals(pid1String, pid2.asString());
+        assertEquals("legacy", pid2.getProviderId());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteProviderTest.java
new file mode 100644
index 00000000000..572fc722272
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteProviderTest.java
@@ -0,0 +1,187 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.datacite;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldConstant;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+
+@ExtendWith(MockitoExtension.class)
+@LocalJvmSettings
+@JvmSetting(key = JvmSettings.SITE_URL, value = "https://example.com")
+
+public class DataCiteProviderTest {
+
+    static DataverseServiceBean dataverseSvc;
+    static SettingsServiceBean settingsSvc;
+    static PidProviderFactoryBean pidService;
+    static final String DEFAULT_NAME = "LibraScholar";
+
+    @BeforeAll
+    public static void setupMocks() {
+        dataverseSvc = Mockito.mock(DataverseServiceBean.class);
+        settingsSvc = Mockito.mock(SettingsServiceBean.class);
+        BrandingUtil.injectServices(dataverseSvc, settingsSvc);
+
+        // initial values (needed here for other tests where this method is reused!)
+        Mockito.when(settingsSvc.getValueForKey(SettingsServiceBean.Key.InstallationName)).thenReturn(DEFAULT_NAME);
+        Mockito.when(dataverseSvc.getRootDataverseName()).thenReturn(DEFAULT_NAME);
+
+        pidService = Mockito.mock(PidProviderFactoryBean.class);
+        Mockito.when(pidService.isGlobalIdLocallyUnique(any(GlobalId.class))).thenReturn(true);
+        Mockito.when(pidService.getProducer()).thenReturn("RootDataverse");
+
+    }
+
+    /**
+     * Useful for testing but requires DataCite credentials, etc.
+     * 
+     * To run the test:
+     * export DataCiteUsername=test2
+     * export DataCitePassword=changeme2
+     * export DataCiteAuthority=10.5072
+     * export DataCiteShoulder=FK2
+     * 
+     * then run mvn test -Dtest=DataCiteProviderTest
+     * 
+     * For each run of the test, one test DOI will be created and will remain in the registered state, as visible on Fabrica at doi.test.datacite.org
+     * (two DOIs are created, but one is deleted after being created in the draft state and never made findable.)
+     */
+    @Test
+    @Disabled
+    public void testDoiLifecycle() throws IOException {
+        String username = System.getenv("DataCiteUsername");
+        String password = System.getenv("DataCitePassword");
+        String authority = System.getenv("DataCiteAuthority");
+        String shoulder = System.getenv("DataCiteShoulder");
+        DataCiteDOIProvider provider = new DataCiteDOIProvider("test", "test", authority, shoulder, "randomString",
+                SystemConfig.DataFilePIDFormat.DEPENDENT.toString(), "", "", "https://mds.test.datacite.org",
+                "https://api.test.datacite.org", username, password);
+
+        provider.setPidProviderServiceBean(pidService);
+
+        PidUtil.addToProviderList(provider);
+
+        Dataset d = new Dataset();
+        DatasetVersion dv = new DatasetVersion();
+        DatasetFieldType primitiveDSFType = new DatasetFieldType(DatasetFieldConstant.title,
+                DatasetFieldType.FieldType.TEXT, false);
+        DatasetField testDatasetField = new DatasetField();
+
+        dv.setVersionState(VersionState.DRAFT);
+
+        testDatasetField.setDatasetVersion(dv);
+        testDatasetField.setDatasetFieldType(primitiveDSFType);
+        testDatasetField.setSingleValue("First Title");
+        List<DatasetField> fields = new ArrayList<>();
+        fields.add(testDatasetField);
+        dv.setDatasetFields(fields);
+        ArrayList<DatasetVersion> dsvs = new ArrayList<>();
+        dsvs.add(0, dv);
+        d.setVersions(dsvs);
+
+        assertEquals(d.getCurrentName(), "First Title");
+
+        provider.generatePid(d);
+        assertEquals(d.getProtocol(), "doi");
+        assertEquals(d.getAuthority(), authority);
+        assertTrue(d.getIdentifier().startsWith(shoulder));
+        d.getGlobalId();
+
+        try {
+            provider.createIdentifier(d);
+            d.setIdentifierRegistered(true);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        assertEquals(DataCiteDOIProvider.DRAFT, provider.getPidStatus(d));
+        Map<String, String> mdMap = provider.getIdentifierMetadata(d);
+        assertEquals("First Title", mdMap.get("datacite.title"));
+
+        testDatasetField.setSingleValue("Second Title");
+
+        //Modify called for a draft dataset shouldn't update DataCite (given current code)
+        try {
+            provider.modifyIdentifierTargetURL(d);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        //Verify the title hasn't changed
+        mdMap = provider.getIdentifierMetadata(d);
+        assertEquals("First Title", mdMap.get("datacite.title"));
+      //Check our local status
+        assertEquals(DataCiteDOIProvider.DRAFT, provider.getPidStatus(d));
+        //Now delete the identifier
+        provider.deleteIdentifier(d);
+        //Causes a 404 and a caught exception that prints a stack trace.
+        mdMap = provider.getIdentifierMetadata(d);
+        // And verify the record is gone (no title, should be no entries at all)
+        assertEquals(null, mdMap.get("datacite.title"));
+        
+        //Now recreate and publicize in one step
+        assertTrue(provider.publicizeIdentifier(d));
+        d.getLatestVersion().setVersionState(VersionState.RELEASED);
+
+        //Verify the title hasn't changed
+        mdMap = provider.getIdentifierMetadata(d);
+        assertEquals("Second Title", mdMap.get("datacite.title"));
+      //Check our local status
+        assertEquals(DataCiteDOIProvider.FINDABLE, provider.getPidStatus(d));
+        
+        //Verify that modify does update a published/findable record
+        testDatasetField.setSingleValue("Third Title");
+
+        try {
+            provider.modifyIdentifierTargetURL(d);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        mdMap = provider.getIdentifierMetadata(d);
+        assertEquals("Third Title", mdMap.get("datacite.title"));
+        
+        //Now delete the identifier . Once it's been findable, this should just flip the record to registered
+        //Not sure that can be easily verified in the test, but it will be visible in Fabrica
+        provider.deleteIdentifier(d);
+        d.getLatestVersion().setVersionState(VersionState.DEACCESSIONED);
+        
+        mdMap = provider.getIdentifierMetadata(d);
+        assertEquals("This item has been removed from publication", mdMap.get("datacite.title"));
+        
+        //Check our local status - just uses the version state
+        assertEquals(DataCiteDOIProvider.REGISTERED, provider.getPidStatus(d));
+
+        // provider.registerWhenPublished()
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java
new file mode 100644
index 00000000000..14d8dfb13a8
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java
@@ -0,0 +1,559 @@
+package edu.harvard.iq.dataverse.pidproviders.doi.datacite;
+
+import edu.harvard.iq.dataverse.ControlledVocabularyValue;
+import edu.harvard.iq.dataverse.DataCitation;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetAuthor;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
+import edu.harvard.iq.dataverse.DatasetFieldConstant;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.DatasetFieldValue;
+import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean;
+import edu.harvard.iq.dataverse.pidproviders.doi.DoiMetadata;
+import edu.harvard.iq.dataverse.pidproviders.doi.XmlMetadataTemplate;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.json.CompoundVocabularyException;
+import edu.harvard.iq.dataverse.util.json.ControlledVocabularyException;
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import edu.harvard.iq.dataverse.util.xml.XmlValidator;
+import io.restassured.path.xml.XmlPath;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.transform.stream.StreamSource;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.xml.sax.SAXException;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+
+@ExtendWith(MockitoExtension.class)
+@LocalJvmSettings
+@JvmSetting(key = JvmSettings.SITE_URL, value = "https://example.com")
+
+public class XmlMetadataTemplateTest {
+
+    static DataverseServiceBean dataverseSvc;
+    static SettingsServiceBean settingsSvc;
+    static PidProviderFactoryBean pidService;
+    static final String DEFAULT_NAME = "LibraScholar";
+
+    @BeforeAll
+    public static void setupMocks() {
+        dataverseSvc = Mockito.mock(DataverseServiceBean.class);
+        settingsSvc = Mockito.mock(SettingsServiceBean.class);
+        BrandingUtil.injectServices(dataverseSvc, settingsSvc);
+
+        // initial values (needed here for other tests where this method is reused!)
+        Mockito.when(settingsSvc.getValueForKey(SettingsServiceBean.Key.InstallationName)).thenReturn(DEFAULT_NAME);
+        Mockito.when(dataverseSvc.getRootDataverseName()).thenReturn(DEFAULT_NAME);
+
+        pidService = Mockito.mock(PidProviderFactoryBean.class);
+        Mockito.when(pidService.isGlobalIdLocallyUnique(any(GlobalId.class))).thenReturn(true);
+        Mockito.when(pidService.getProducer()).thenReturn("RootDataverse");
+
+    }
+
+    /**
+     * A minimal example to assure that the XMLMetadataTemplate generates output
+     * consistent with the DataCite XML v4.5 schema.
+     */
+    @Test
+    public void testDataCiteXMLCreation() throws IOException {
+        DoiMetadata doiMetadata = new DoiMetadata();
+        doiMetadata.setTitle("A Title");
+        DatasetFieldType dft = new DatasetFieldType(DatasetFieldConstant.authorName, FieldType.TEXT, false);
+        dft.setDisplayFormat("#VALUE");
+        DatasetFieldType dft2 = new DatasetFieldType(DatasetFieldConstant.authorAffiliation, FieldType.TEXT, false);
+        dft2.setDisplayFormat("#VALUE");
+        DatasetAuthor alice = new DatasetAuthor();
+        DatasetField df1 = new DatasetField();
+        df1.setDatasetFieldType(dft);
+        df1.setSingleValue("Alice");
+        alice.setName(df1);
+        DatasetField df2 = new DatasetField();
+        df2.setDatasetFieldType(dft2);
+        df2.setSingleValue("Harvard University");
+        alice.setAffiliation(df2);
+        alice.setIdType("ORCID");
+        alice.setIdValue("0000-0002-1825-0097");
+        DatasetAuthor bob = new DatasetAuthor();
+        DatasetField df3 = new DatasetField();
+        df3.setDatasetFieldType(dft);
+        df3.setSingleValue("Bob");
+        bob.setName(df3);
+        DatasetField df4 = new DatasetField();
+        df4.setDatasetFieldType(dft2);
+        df4.setSingleValue("QDR");
+        bob.setAffiliation(df4);
+        DatasetAuthor harvard = new DatasetAuthor();
+        DatasetField df5 = new DatasetField();
+        df5.setDatasetFieldType(dft);
+        df5.setSingleValue("Harvard University");
+        harvard.setName(df5);
+        harvard.setIdType("ROR");
+        harvard.setIdValue("03vek6s52");
+        DatasetAuthor qdr = new DatasetAuthor();
+        DatasetField df6 = new DatasetField();
+        df6.setDatasetFieldType(dft);
+        df6.setSingleValue("Qualitative Data Repository");
+        qdr.setName(df6);
+        qdr.setIdType("ROR");
+        // This value is set improperly as a URL. It should be just
+        // the identifier (014trz974) as in the ORCID example above.
+        qdr.setIdValue("https://ror.org/014trz974");
+        List<DatasetAuthor> authors = new ArrayList<>();
+        authors.add(alice);
+        authors.add(bob);
+        authors.add(harvard);
+        authors.add(qdr);
+        doiMetadata.setAuthors(authors);
+        doiMetadata.setPublisher("Dataverse");
+        XmlMetadataTemplate template = new XmlMetadataTemplate(doiMetadata);
+
+        Dataset d = new Dataset();
+        GlobalId doi = new GlobalId("doi", "10.5072", "FK2/ABCDEF", null, null, null);
+        d.setGlobalId(doi);
+        DatasetVersion dv = new DatasetVersion();
+        TermsOfUseAndAccess toa = new TermsOfUseAndAccess();
+        toa.setTermsOfUse("Some terms");
+        dv.setTermsOfUseAndAccess(toa);
+        dv.setDataset(d);
+        DatasetFieldType primitiveDSFType = new DatasetFieldType(DatasetFieldConstant.title,
+                DatasetFieldType.FieldType.TEXT, false);
+        DatasetField testDatasetField = new DatasetField();
+
+        dv.setVersionState(VersionState.DRAFT);
+
+        testDatasetField.setDatasetVersion(dv);
+        testDatasetField.setDatasetFieldType(primitiveDSFType);
+        testDatasetField.setSingleValue("First Title");
+        List<DatasetField> fields = new ArrayList<>();
+        fields.add(testDatasetField);
+        dv.setDatasetFields(fields);
+        ArrayList<DatasetVersion> dsvs = new ArrayList<>();
+        dsvs.add(0, dv);
+        d.setVersions(dsvs);
+        DatasetType dType = new DatasetType();
+        dType.setName(DatasetType.DATASET_TYPE_DATASET);
+        d.setDatasetType(dType);
+
+        String xml = template.generateXML(d);
+        System.out.println("Output from minimal example is " + xml);
+        try {
+            StreamSource source = new StreamSource(new StringReader(xml));
+            source.setSystemId("DataCite XML for test dataset");
+            assertTrue(XmlValidator.validateXmlSchema(source,
+                    new URL("https://schema.datacite.org/meta/kernel-4/metadata.xsd")));
+        } catch (SAXException e) {
+            System.out.println("Invalid schema: " + e.getMessage());
+        }
+
+        assertEquals("Alice", XmlPath.from(xml).getString("resource.creators.creator[0].creatorName"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", XmlPath.from(xml).getString("resource.creators.creator[0].nameIdentifier"));
+        assertEquals("ORCID", XmlPath.from(xml).getString("resource.creators.creator[0].nameIdentifier.@nameIdentifierScheme"));
+        assertEquals("https://orcid.org", XmlPath.from(xml).getString("resource.creators.creator[0].nameIdentifier.@schemeURI"));
+        assertEquals("Bob", XmlPath.from(xml).getString("resource.creators.creator[1].creatorName"));
+        assertEquals("Harvard University", XmlPath.from(xml).getString("resource.creators.creator[2].creatorName"));
+        assertEquals("https://ror.org/03vek6s52", XmlPath.from(xml).getString("resource.creators.creator[2].nameIdentifier"));
+        assertEquals("ROR", XmlPath.from(xml).getString("resource.creators.creator[2].nameIdentifier.@nameIdentifierScheme"));
+        assertEquals("https://ror.org", XmlPath.from(xml).getString("resource.creators.creator[2].nameIdentifier.@schemeURI"));
+        assertEquals("Qualitative Data Repository", XmlPath.from(xml).getString("resource.creators.creator[3].creatorName"));
+        //Test when URL form was used
+        assertEquals("https://ror.org/014trz974", XmlPath.from(xml).getString("resource.creators.creator[3].nameIdentifier"));
+        assertEquals("ROR", XmlPath.from(xml).getString("resource.creators.creator[3].nameIdentifier.@nameIdentifierScheme"));
+        assertEquals("https://ror.org", XmlPath.from(xml).getString("resource.creators.creator[3].nameIdentifier.@schemeURI"));
+        assertEquals("Dataverse", XmlPath.from(xml).getString("resource.publisher"));
+
+        dv.setVersionNumber(1L);
+        dv.setMinorVersionNumber(0l);
+        String xml2 = template.generateXML(d);
+        System.out.println("Output from example with v1.0 is " + xml2);
+        try {
+            StreamSource source = new StreamSource(new StringReader(xml2));
+            source.setSystemId("DataCite XML for test dataset");
+            assertTrue(XmlValidator.validateXmlSchema(source,
+                    new URL("https://schema.datacite.org/meta/kernel-4/metadata.xsd")));
+        } catch (SAXException e) {
+            System.out.println("Invalid schema: " + e.getMessage());
+            fail("Schema validation failed: " + e.getMessage());
+        }
+    }
+
+    /**
+     * This tests a more complete example based off of the dataset-all-defaults
+     * file, again checking for conformance of the result with the DataCite XML v4.5
+     * schema.
+     */
+    @Test
+    public void testDataCiteXMLCreationAllFields() throws IOException {
+        Dataverse collection = new Dataverse();
+        collection.setCitationDatasetFieldTypes(new ArrayList<>());
+        Dataset d = new Dataset();
+        d.setOwner(collection);
+        DatasetVersion dv = new DatasetVersion();
+        TermsOfUseAndAccess toa = new TermsOfUseAndAccess();
+        toa.setTermsOfUse("Some terms");
+        dv.setTermsOfUseAndAccess(toa);
+        dv.setDataset(d);
+        DatasetFieldType primitiveDSFType = new DatasetFieldType(DatasetFieldConstant.title,
+                DatasetFieldType.FieldType.TEXT, false);
+        DatasetField testDatasetField = new DatasetField();
+
+        dv.setVersionState(VersionState.DRAFT);
+
+        testDatasetField.setDatasetVersion(dv);
+
+        File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt");
+        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
+        JsonObject datasetJson = JsonUtil.getJsonObject(datasetVersionAsJson);
+
+        GlobalId doi = new GlobalId("doi", datasetJson.getString("authority"), datasetJson.getString("identifier"),
+                null, null, null);
+        d.setGlobalId(doi);
+
+        List<DatasetField> fields = assertDoesNotThrow(() -> XmlMetadataTemplateTest
+                .parseMetadataBlocks(datasetJson.getJsonObject("datasetVersion").getJsonObject("metadataBlocks")));
+        dv.setDatasetFields(fields);
+
+        ArrayList<DatasetVersion> dsvs = new ArrayList<>();
+        dsvs.add(0, dv);
+        d.setVersions(dsvs);
+        DatasetType dType = new DatasetType();
+        dType.setName(DatasetType.DATASET_TYPE_DATASET);
+        d.setDatasetType(dType);
+        String xml = DOIDataCiteRegisterService.getMetadataFromDvObject(dv.getDataset().getGlobalId().asString(),
+                new DataCitation(dv).getDataCiteMetadata(), dv.getDataset());
+        System.out.println("Output from dataset-all-defaults is " + xml);
+        try {
+            StreamSource source = new StreamSource(new StringReader(xml));
+            source.setSystemId("DataCite XML for test dataset");
+            assertTrue(XmlValidator.validateXmlSchema(source,
+                    new URL("https://schema.datacite.org/meta/kernel-4/metadata.xsd")));
+        } catch (SAXException e) {
+            System.out.println("Invalid schema: " + e.getMessage());
+        }
+
+    }
+    
+    /**
+     * This tests a more complete example based off of the dataset-all-defaults
+     * file, again checking for conformance of the result with the DataCite XML v4.5
+     * schema.
+     */
+    @Test
+    public void testDataCiteXMLCreationAllFieldsMultipleGeoLocations() throws IOException {
+        Dataverse collection = new Dataverse();
+        collection.setCitationDatasetFieldTypes(new ArrayList<>());
+        Dataset d = new Dataset();
+        d.setOwner(collection);
+        DatasetVersion dv = new DatasetVersion();
+        TermsOfUseAndAccess toa = new TermsOfUseAndAccess();
+        toa.setTermsOfUse("Some terms");
+        dv.setTermsOfUseAndAccess(toa);
+        dv.setDataset(d);
+        DatasetFieldType primitiveDSFType = new DatasetFieldType(DatasetFieldConstant.title,
+                DatasetFieldType.FieldType.TEXT, false);
+        DatasetField testDatasetField = new DatasetField();
+
+        dv.setVersionState(VersionState.DRAFT);
+
+        testDatasetField.setDatasetVersion(dv);
+
+        File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults-multiple-geo.txt");
+        String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
+        JsonObject datasetJson = JsonUtil.getJsonObject(datasetVersionAsJson);
+
+        GlobalId doi = new GlobalId("doi", datasetJson.getString("authority"), datasetJson.getString("identifier"),
+                null, null, null);
+        d.setGlobalId(doi);
+
+        List<DatasetField> fields = assertDoesNotThrow(() -> XmlMetadataTemplateTest
+                .parseMetadataBlocks(datasetJson.getJsonObject("datasetVersion").getJsonObject("metadataBlocks")));
+        dv.setDatasetFields(fields);
+        
+        JsonValue jsonValueFields = datasetJson.getJsonObject("datasetVersion").getJsonObject("metadataBlocks").getJsonObject("citation").get("fields");
+        
+        for(JsonValue jsonValue : jsonValueFields.asJsonArray()) {
+            JsonObject jsonObject = jsonValue.asJsonObject();
+            if (jsonObject.getString("typeName").equals("productionPlace")) {
+                assertEquals(jsonObject.get("value").asJsonArray().size(),2);
+            }
+        }
+        
+        ArrayList<DatasetVersion> dsvs = new ArrayList<>();
+        dsvs.add(0, dv);
+        d.setVersions(dsvs);
+        DatasetType dType = new DatasetType();
+        dType.setName(DatasetType.DATASET_TYPE_DATASET);
+        d.setDatasetType(dType);
+        String xml = DOIDataCiteRegisterService.getMetadataFromDvObject(dv.getDataset().getGlobalId().asString(),
+                new DataCitation(dv).getDataCiteMetadata(), dv.getDataset());
+        System.out.println("Output from dataset-all-defaults-multiple-geo is " + xml);
+        try {
+            StreamSource source = new StreamSource(new StringReader(xml));
+            source.setSystemId("DataCite XML for test dataset");
+            assertTrue(XmlValidator.validateXmlSchema(source,
+                    new URL("https://schema.datacite.org/meta/kernel-4/metadata.xsd")));
+        } catch (SAXException e) {
+            System.out.println("Invalid schema: " + e.getMessage());
+        }
+
+    }
+
+    /**
+     * Mock Utility Methods - These methods support importing DatasetFields from the
+     * Dataverse JSON export format. They assume that any DatasetFieldType
+     * referenced exists, that any Controlled Vocabulary value exists, etc. which
+     * avoids having to do database lookups or read metadatablock tsv files. They
+     * are derived from the JsonParser methods of the same names with any db
+     * references and DatasetFieldType-related error checking removed.
+     */
+    public static List<DatasetField> parseMetadataBlocks(JsonObject json) throws JsonParseException {
+
+        Map<String, DatasetFieldType> existingTypes = new HashMap<>();
+
+        Set<String> keys = json.keySet();
+        List<DatasetField> fields = new LinkedList<>();
+
+        for (String blockName : keys) {
+            MetadataBlock block = new MetadataBlock();
+            block.setName(blockName);
+            JsonObject blockJson = json.getJsonObject(blockName);
+            JsonArray fieldsJson = blockJson.getJsonArray("fields");
+            fields.addAll(parseFieldsFromArray(fieldsJson, true, block, existingTypes));
+        }
+        return fields;
+    }
+
+    private static List<DatasetField> parseFieldsFromArray(JsonArray fieldsArray, Boolean testType, MetadataBlock block,
+            Map<String, DatasetFieldType> existingTypes) throws JsonParseException {
+        List<DatasetField> fields = new LinkedList<>();
+        for (JsonObject fieldJson : fieldsArray.getValuesAs(JsonObject.class)) {
+
+            DatasetField field = parseField(fieldJson, testType, block, existingTypes);
+            if (field != null) {
+                fields.add(field);
+            }
+
+        }
+        return fields;
+
+    }
+
+    public static DatasetField parseField(JsonObject json, Boolean testType, MetadataBlock block,
+            Map<String, DatasetFieldType> existingTypes) throws JsonParseException {
+        if (json == null) {
+            return null;
+        }
+
+        DatasetField ret = new DatasetField();
+        String fieldName = json.getString("typeName", "");
+        String typeClass = json.getString("typeClass", "");
+        if (!existingTypes.containsKey(fieldName)) {
+            boolean multiple = json.getBoolean("multiple");
+            DatasetFieldType fieldType = new DatasetFieldType();
+            fieldType.setName(fieldName);
+            fieldType.setAllowMultiples(multiple);
+            fieldType.setAllowControlledVocabulary(typeClass.equals("controlledVocabulary"));
+            fieldType.setFieldType(FieldType.TEXT);
+            fieldType.setMetadataBlock(block);
+            fieldType.setChildDatasetFieldTypes(new ArrayList<>());
+            existingTypes.put(fieldName, fieldType);
+        }
+        DatasetFieldType type = existingTypes.get(fieldName);
+        ret.setDatasetFieldType(type);
+
+        if (typeClass.equals("compound")) {
+            parseCompoundValue(ret, type, json, testType, block, existingTypes);
+        } else if (type.isControlledVocabulary()) {
+            parseControlledVocabularyValue(ret, type, json);
+        } else {
+            parsePrimitiveValue(ret, type, json);
+        }
+
+        return ret;
+    }
+
+    public static void parseCompoundValue(DatasetField dsf, DatasetFieldType compoundType, JsonObject json,
+            Boolean testType, MetadataBlock block, Map<String, DatasetFieldType> existingTypes)
+            throws JsonParseException {
+        List<ControlledVocabularyException> vocabExceptions = new ArrayList<>();
+        List<DatasetFieldCompoundValue> vals = new LinkedList<>();
+        if (compoundType.isAllowMultiples()) {
+            int order = 0;
+            try {
+                json.getJsonArray("value").getValuesAs(JsonObject.class);
+            } catch (ClassCastException cce) {
+                throw new JsonParseException("Invalid values submitted for " + compoundType.getName()
+                        + ". It should be an array of values.");
+            }
+            for (JsonObject obj : json.getJsonArray("value").getValuesAs(JsonObject.class)) {
+                DatasetFieldCompoundValue cv = new DatasetFieldCompoundValue();
+                List<DatasetField> fields = new LinkedList<>();
+                for (String fieldName : obj.keySet()) {
+                    JsonObject childFieldJson = obj.getJsonObject(fieldName);
+                    DatasetField f = null;
+                    try {
+                        f = parseField(childFieldJson, testType, block, existingTypes);
+                    } catch (ControlledVocabularyException ex) {
+                        vocabExceptions.add(ex);
+                    }
+
+                    if (f != null) {
+                        f.setParentDatasetFieldCompoundValue(cv);
+                        fields.add(f);
+                    }
+                }
+                if (!fields.isEmpty()) {
+                    cv.setChildDatasetFields(fields);
+                    cv.setDisplayOrder(order);
+                    vals.add(cv);
+                }
+                order++;
+            }
+
+        } else {
+
+            DatasetFieldCompoundValue cv = new DatasetFieldCompoundValue();
+            List<DatasetField> fields = new LinkedList<>();
+            JsonObject value = json.getJsonObject("value");
+            for (String key : value.keySet()) {
+                JsonObject childFieldJson = value.getJsonObject(key);
+                DatasetField f = null;
+                try {
+                    f = parseField(childFieldJson, testType, block, existingTypes);
+                } catch (ControlledVocabularyException ex) {
+                    vocabExceptions.add(ex);
+                }
+                if (f != null) {
+                    f.setParentDatasetFieldCompoundValue(cv);
+                    fields.add(f);
+                }
+            }
+            if (!fields.isEmpty()) {
+                cv.setChildDatasetFields(fields);
+                vals.add(cv);
+            }
+
+        }
+        if (!vocabExceptions.isEmpty()) {
+            throw new CompoundVocabularyException("Invalid controlled vocabulary in compound field ", vocabExceptions,
+                    vals);
+        }
+
+        for (DatasetFieldCompoundValue dsfcv : vals) {
+            dsfcv.setParentDatasetField(dsf);
+        }
+        dsf.setDatasetFieldCompoundValues(vals);
+    }
+
+    public static void parsePrimitiveValue(DatasetField dsf, DatasetFieldType dft, JsonObject json)
+            throws JsonParseException {
+        List<DatasetFieldValue> vals = new LinkedList<>();
+        if (dft.isAllowMultiples()) {
+            try {
+                json.getJsonArray("value").getValuesAs(JsonObject.class);
+            } catch (ClassCastException cce) {
+                throw new JsonParseException(
+                        "Invalid values submitted for " + dft.getName() + ". It should be an array of values.");
+            }
+            for (JsonString val : json.getJsonArray("value").getValuesAs(JsonString.class)) {
+                DatasetFieldValue datasetFieldValue = new DatasetFieldValue(dsf);
+                datasetFieldValue.setDisplayOrder(vals.size() - 1);
+                datasetFieldValue.setValue(val.getString().trim());
+                vals.add(datasetFieldValue);
+            }
+
+        } else {
+            try {
+                json.getString("value");
+            } catch (ClassCastException cce) {
+                throw new JsonParseException(
+                        "Invalid value submitted for " + dft.getName() + ". It should be a single value.");
+            }
+            DatasetFieldValue datasetFieldValue = new DatasetFieldValue();
+            datasetFieldValue.setValue(json.getString("value", "").trim());
+            datasetFieldValue.setDatasetField(dsf);
+            vals.add(datasetFieldValue);
+        }
+
+        dsf.setDatasetFieldValues(vals);
+    }
+
+    public static void parseControlledVocabularyValue(DatasetField dsf, DatasetFieldType cvvType, JsonObject json)
+            throws JsonParseException {
+        List<ControlledVocabularyValue> vals = new LinkedList<>();
+        try {
+            if (cvvType.isAllowMultiples()) {
+                try {
+                    json.getJsonArray("value").getValuesAs(JsonObject.class);
+                } catch (ClassCastException cce) {
+                    throw new JsonParseException(
+                            "Invalid values submitted for " + cvvType.getName() + ". It should be an array of values.");
+                }
+                for (JsonString strVal : json.getJsonArray("value").getValuesAs(JsonString.class)) {
+                    String strValue = strVal.getString();
+                    ControlledVocabularyValue cvv = new ControlledVocabularyValue();
+                    cvv.setDatasetFieldType(cvvType);
+                    cvv.setStrValue(strVal.getString());
+                    vals.add(cvv);
+                }
+
+            } else {
+                try {
+                    json.getString("value");
+                } catch (ClassCastException cce) {
+                    throw new JsonParseException(
+                            "Invalid value submitted for " + cvvType.getName() + ". It should be a single value.");
+                }
+                String strValue = json.getString("value", "");
+                ControlledVocabularyValue cvv = new ControlledVocabularyValue();
+                cvv.setDatasetFieldType(cvvType);
+                cvv.setStrValue(strValue);
+                vals.add(cvv);
+            }
+        } catch (ClassCastException cce) {
+            throw new JsonParseException("Invalid values submitted for " + cvvType.getName());
+        }
+
+        dsf.setControlledVocabularyValues(vals);
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtilTest.java
index 3cb719b5c95..f06be37578d 100644
--- a/src/test/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtilTest.java
@@ -14,7 +14,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -102,7 +102,7 @@ public void testGetDatasetFromRoleAssignmentSuccess() {
         RoleAssignment ra = this.createTestRoleAssignment(dataset);
 
         assertNotNull(PrivateUrlUtil.getDatasetFromRoleAssignment(ra));
-        assertEquals("#42", ra.getAssigneeIdentifier());
+        assertEquals(PrivateUrlUser.PREFIX + "42", ra.getAssigneeIdentifier());
     }
 
     @Test
@@ -137,7 +137,7 @@ public void testGetDraftDatasetVersionFromRoleAssignmentSuccess() {
 
         DatasetVersion datasetVersionOut = PrivateUrlUtil.getDraftDatasetVersionFromRoleAssignment(ra);
         assertNotNull(datasetVersionOut);
-        assertEquals("#42", ra.getAssigneeIdentifier());
+        assertEquals(PrivateUrlUser.PREFIX + "42", ra.getAssigneeIdentifier());
     }
 
     @Test
@@ -277,7 +277,7 @@ public void testGetPrivateUrlFromRoleAssignmentSuccess() {
         PrivateUrl privateUrl = PrivateUrlUtil.getPrivateUrlFromRoleAssignment(ra, dataverseSiteUrl);
         assertNotNull(privateUrl);
         assertEquals(new Long(42), privateUrl.getDataset().getId());
-        assertEquals("https://dataverse.example.edu/privateurl.xhtml?token=cd71e9d7-73a7-4ec8-b890-3d00499e8693", privateUrl.getLink());
+        assertEquals("https://dataverse.example.edu/previewurl.xhtml?token=cd71e9d7-73a7-4ec8-b890-3d00499e8693", privateUrl.getLink());
     }
 
     @Test
@@ -312,7 +312,7 @@ public void testGetPrivateUrlUserFromRoleAssignmentAndAssigneeSuccess() {
 
     @Test
     public void testGetRequiredPermissions() {
-        CreatePrivateUrlCommand createPrivateUrlCommand = new CreatePrivateUrlCommand(null, null);
+        CreatePrivateUrlCommand createPrivateUrlCommand = new CreatePrivateUrlCommand(null, null, false);
         CommandException ex = new CommandException(null, createPrivateUrlCommand);
         List<String> strings = PrivateUrlUtil.getRequiredPermissions(ex);
         assertEquals(Arrays.asList("ManageDatasetPermissions"), strings);
diff --git a/src/test/java/edu/harvard/iq/dataverse/provenance/ProvInvestigatorTest.java b/src/test/java/edu/harvard/iq/dataverse/provenance/ProvInvestigatorTest.java
index efa83fbb950..f59f686a94c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/provenance/ProvInvestigatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/provenance/ProvInvestigatorTest.java
@@ -6,14 +6,15 @@
 package edu.harvard.iq.dataverse.provenance;
 
 import com.google.gson.JsonParser;
-import edu.harvard.iq.dataverse.NonEssentialTests;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.logging.Logger;
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.jupiter.api.Assertions.*;
+
+import edu.harvard.iq.dataverse.util.testing.Tags;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -27,13 +28,13 @@ public class ProvInvestigatorTest {
     JsonParser jsonParser;
     private static final Logger logger = Logger.getLogger(ProvInvestigatorTest.class.getCanonicalName());
     
-    @Before
+    @BeforeEach
     public void setUp() {
         provUtilBean = ProvInvestigator.getInstance();
         jsonParser = new JsonParser();
     }
     
-    @Category(NonEssentialTests.class)
+    @Tag(Tags.NOT_ESSENTIAL_UNITTESTS)
     @Test
     public void testProvValidator() {   
         String validJsonString = "{\n" +
@@ -105,7 +106,7 @@ public void testProvValidator() {
 
     }
     
-    @Category(NonEssentialTests.class)
+    @Tag(Tags.NOT_ESSENTIAL_UNITTESTS)
     @Test
     public void testProvNamesNotInsideEntity() throws IOException {
         //name and type on their own
@@ -120,7 +121,7 @@ public void testProvNamesNotInsideEntity() throws IOException {
         assertFalse(entities.size() > 0); 
     }
     
-    @Category(NonEssentialTests.class)
+    @Tag(Tags.NOT_ESSENTIAL_UNITTESTS)
     @Test
     public void testProvNameJsonParserEmptyEntities() throws IOException {
         String jsonString = "{\n" +
@@ -159,8 +160,8 @@ public void testProvNameJsonParserEmptyEntities() throws IOException {
     
     //Note: this test has entity tags in multiple places, all with unique names
     //Only one entity is added to our list per unique name.
-
-    @Category(NonEssentialTests.class)
+    
+    @Tag(Tags.NOT_ESSENTIAL_UNITTESTS)
     @Test
     public void testProvJsonWithEntitiesInMultiplePlaces() throws IOException {
         String jsonString = "{\n" +
@@ -233,7 +234,7 @@ public void testProvJsonWithEntitiesInMultiplePlaces() throws IOException {
         assertTrue(entities.size() == 7);
     }
     
-    @Category(NonEssentialTests.class)
+    @Tag(Tags.NOT_ESSENTIAL_UNITTESTS)
     @Test
     public void testProvJsonWithEntitiesInMultiplePlacesWithSameNames() throws IOException {
         String jsonString = "{\n" +
@@ -271,8 +272,8 @@ public void testProvJsonWithEntitiesInMultiplePlacesWithSameNames() throws IOExc
         assertTrue(entities.get("ex:report2").fileType.equals("not report"));
         assertTrue(entities.size() == 3); //ex:report2 & ex:report1 are repeated
     }
-   
-    @Category(NonEssentialTests.class)
+    
+    @Tag(Tags.NOT_ESSENTIAL_UNITTESTS)
     @Test
     public void testProvLongJsonWithEntities() throws IOException {
         String jsonString = "{\n" +
diff --git a/src/test/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerUtilTest.java
index d09c6eee8dc..99fd3b2766f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/repositorystorageabstractionlayer/RepositoryStorageAbstractionLayerUtilTest.java
@@ -4,10 +4,10 @@
 import edu.harvard.iq.dataverse.locality.StorageSite;
 import java.util.ArrayList;
 import java.util.List;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 public class RepositoryStorageAbstractionLayerUtilTest {
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/search/IndexServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/search/IndexServiceBeanTest.java
new file mode 100644
index 00000000000..eda9b995db5
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/search/IndexServiceBeanTest.java
@@ -0,0 +1,152 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.ControlledVocabularyValue;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
+import edu.harvard.iq.dataverse.DatasetFieldConstant;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.DatasetFieldValue;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.DatasetVersionFilesServiceBean;
+import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.Dataverse.DataverseType;
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.common.SolrInputDocument;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@LocalJvmSettings
+@ExtendWith(MockitoExtension.class)
+public class IndexServiceBeanTest {
+    private static final Logger logger = Logger.getLogger(IndexServiceBeanTest.class.getCanonicalName());
+
+    private IndexServiceBean indexService;
+    private Dataverse dataverse;
+
+    @Mock
+    private SettingsServiceBean settingsService;
+    @InjectMocks
+    private SystemConfig systemConfig = new SystemConfig();
+
+    @BeforeEach
+    public void setUp() {
+        dataverse = MocksFactory.makeDataverse();
+        dataverse.setDataverseType(DataverseType.UNCATEGORIZED);
+        indexService = new IndexServiceBean();
+        indexService.systemConfig = systemConfig;
+        indexService.settingsService = Mockito.mock(SettingsServiceBean.class);
+        indexService.dataverseService = Mockito.mock(DataverseServiceBean.class);
+        indexService.datasetFieldService = Mockito.mock(DatasetFieldServiceBean.class);
+        indexService.datasetVersionService = Mockito.mock(DatasetVersionServiceBean.class);
+        indexService.datasetVersionFilesServiceBean = Mockito.mock(DatasetVersionFilesServiceBean.class);
+        BrandingUtil.injectServices(indexService.dataverseService, indexService.settingsService);
+
+        Mockito.when(indexService.dataverseService.findRootDataverse()).thenReturn(dataverse);
+    }
+
+    @Test
+    public void TestIndexing() throws SolrServerException, IOException {
+        final IndexableDataset indexableDataset = createIndexableDataset();
+        final SolrInputDocuments docs = indexService.toSolrDocs(indexableDataset, null);
+        Set<String> indexedFields = docs.getDocuments().stream().flatMap(x -> x.getFieldNames().stream()).collect(Collectors.toSet());
+
+        logger.info(docs.getMessage());
+        logger.info(String.join(", ", indexedFields));
+
+        assertTrue(!docs.getDocuments().isEmpty());
+        assertTrue(indexedFields.contains("language"));
+    }
+
+    @Test
+    public void testValidateBoundingBox() throws SolrServerException, IOException {
+        final IndexableDataset indexableDataset = createIndexableDataset();
+        final DatasetVersion datasetVersion = indexableDataset.getDatasetVersion();
+        DatasetField dsf = new DatasetField();
+        DatasetFieldType dsft = new DatasetFieldType(DatasetFieldConstant.geographicBoundingBox, DatasetFieldType.FieldType.TEXT, true);
+        dsf.setDatasetFieldType(dsft);
+
+        List<DatasetFieldCompoundValue> vals = new LinkedList<>();
+        DatasetFieldCompoundValue val = new DatasetFieldCompoundValue();
+        val.setParentDatasetField(dsf);
+        val.setChildDatasetFields(Arrays.asList(
+                constructBoundingBoxValue(DatasetFieldConstant.westLongitude, "34.9"), // bad value. must be less than east
+                constructBoundingBoxValue(DatasetFieldConstant.eastLongitude, "34.8"),
+                constructBoundingBoxValue(DatasetFieldConstant.northLatitude, "34.2"),
+                constructBoundingBoxValue(DatasetFieldConstant.southLatitude, "34.1")
+        ));
+        vals.add(val);
+        dsf.setDatasetFieldCompoundValues(vals);
+        datasetVersion.getDatasetFields().add(dsf);
+
+        final SolrInputDocuments docs = indexService.toSolrDocs(indexableDataset, null);
+        Optional<SolrInputDocument> doc = docs.getDocuments().stream().findFirst();
+        assertTrue(doc.isPresent());
+        assertTrue(!doc.get().containsKey("geolocation"));
+        assertTrue(!doc.get().containsKey("boundingBox"));
+    }
+
+    private DatasetField constructBoundingBoxValue(String datasetFieldTypeName, String value) {
+        DatasetField retVal = new DatasetField();
+        retVal.setDatasetFieldType(new DatasetFieldType(datasetFieldTypeName, DatasetFieldType.FieldType.TEXT, false));
+        retVal.setDatasetFieldValues(Collections.singletonList(new DatasetFieldValue(retVal, value)));
+        return retVal;
+    }
+
+    private IndexableDataset createIndexableDataset() {
+        final Dataset dataset = MocksFactory.makeDataset();
+        dataset.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL,"10.666", "FAKE/fake", "/", AbstractDOIProvider.DOI_RESOLVER_URL, null));
+        final DatasetVersion datasetVersion = dataset.getCreateVersion(null);
+        datasetVersion.setId(1L);
+        DatasetField field = createCVVField("language", "English", false);
+        datasetVersion.getDatasetFields().add(field);
+        final IndexableDataset indexableDataset = new IndexableDataset(datasetVersion);
+        indexableDataset.getDatasetVersion().getDataset().setOwner(dataverse);
+        DatasetType datasetType = new DatasetType();
+        datasetType.setName(DatasetType.DEFAULT_DATASET_TYPE);
+        indexableDataset.getDatasetVersion().getDataset().setDatasetType(datasetType);
+        return indexableDataset;
+    }
+
+    public static DatasetField createCVVField(String name, String strValue, boolean isAllowMultiples) {
+        DatasetFieldType datasetFieldType = new DatasetFieldType(name, DatasetFieldType.FieldType.TEXT, isAllowMultiples);
+        ControlledVocabularyValue value = new ControlledVocabularyValue(MocksFactory.nextId(), strValue, datasetFieldType);
+        datasetFieldType.setControlledVocabularyValues(Arrays.asList(value));
+        datasetFieldType.setId(MocksFactory.nextId());
+        datasetFieldType.setMetadataBlock(new MetadataBlock());
+        DatasetField field = new DatasetField();
+        field.setId(MocksFactory.nextId());
+        field.setSingleControlledVocabularyValue(value);
+        field.setDatasetFieldType(datasetFieldType);
+        return field;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/search/IndexUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/search/IndexUtilTest.java
index 6599f829673..9be53b8b8b1 100644
--- a/src/test/java/edu/harvard/iq/dataverse/search/IndexUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/search/IndexUtilTest.java
@@ -1,32 +1,32 @@
 package edu.harvard.iq.dataverse.search;
 
 import java.util.Arrays;
-import java.util.List;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class IndexUtilTest {
 
     public IndexUtilTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBeanTest.java
index 0ea5597b905..c9f9eb67130 100644
--- a/src/test/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBeanTest.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse.search;
 
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 public class SearchFilesServiceBeanTest {
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/search/SearchIncludeFragmentTest.java b/src/test/java/edu/harvard/iq/dataverse/search/SearchIncludeFragmentTest.java
new file mode 100644
index 00000000000..234d72c0d19
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/search/SearchIncludeFragmentTest.java
@@ -0,0 +1,126 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseMetadataBlockFacet;
+import edu.harvard.iq.dataverse.MetadataBlock;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+public class SearchIncludeFragmentTest {
+
+
+    @Test
+    public void getFriendlyNamesFromFilterQuery_should_return_null_when_null_or_empty_filter_query() {
+        SearchIncludeFragment target = new SearchIncludeFragment();
+
+        MatcherAssert.assertThat(target.getFriendlyNamesFromFilterQuery(null), Matchers.nullValue());
+        MatcherAssert.assertThat(target.getFriendlyNamesFromFilterQuery(""), Matchers.nullValue());
+    }
+
+    @Test
+    public void getFriendlyNamesFromFilterQuery_should_return_null_when_filter_query_does_not_have_key_value_pair_separated_by_colon() {
+        SearchIncludeFragment target = new SearchIncludeFragment();
+
+        MatcherAssert.assertThat(target.getFriendlyNamesFromFilterQuery("key_value_no_colon"), Matchers.nullValue());
+    }
+
+    @Test
+    public void getFriendlyNamesFromFilterQuery_key_should_return_key_when_filter_query_key_does_not_match_any_friendly_names() {
+        SearchIncludeFragment target = new SearchIncludeFragment();
+
+        List<String> result = target.getFriendlyNamesFromFilterQuery("key:value");
+        MatcherAssert.assertThat(result.get(0), Matchers.is("key"));
+    }
+
+    @Test
+    public void getFriendlyNamesFromFilterQuery_key_should_return_friendly_name_when_filter_query_key_does_match_friendly_name() {
+        SearchIncludeFragment target = new SearchIncludeFragment();
+        target.datasetfieldFriendlyNamesBySolrField = Map.of("key", "KeyFriendlyName");
+
+        List<String> result = target.getFriendlyNamesFromFilterQuery("key:value");
+        MatcherAssert.assertThat(result.get(0), Matchers.is("KeyFriendlyName"));
+    }
+
+    @Test
+    public void getFriendlyNamesFromFilterQuery_key_should_return_static_friendly_name_when_filter_query_key_does_not_match_friendly_name_but_matches_static_names() {
+        SearchIncludeFragment target = new SearchIncludeFragment();
+        target.staticSolrFieldFriendlyNamesBySolrField = Map.of("key", "staticKeyFriendlyName");
+
+        List<String> result = target.getFriendlyNamesFromFilterQuery("key:value");
+        MatcherAssert.assertThat(result.get(0), Matchers.is("staticKeyFriendlyName"));
+    }
+
+    @Test
+    public void getFriendlyNamesFromFilterQuery_value_should_return_metadata_block_facet_label_when_key_is_metadata_types_and_value_matches_metadata_block_name() {
+        SearchIncludeFragment target = new SearchIncludeFragment();
+        Dataverse dataverse = Mockito.mock(Dataverse.class);
+        MetadataBlock block = Mockito.mock(MetadataBlock.class);
+        Mockito.when(block.getName()).thenReturn("metadata_block_name");
+        Mockito.when(block.getLocaleDisplayFacet()).thenReturn("display_facet");
+        DataverseMetadataBlockFacet blockFacet = new DataverseMetadataBlockFacet();
+        blockFacet.setMetadataBlock(block);
+        Mockito.when(dataverse.getMetadataBlockFacets()).thenReturn(Arrays.asList(blockFacet));
+        target.setDataverse(dataverse);
+
+        List<String> result = target.getFriendlyNamesFromFilterQuery(String.format("%s:\"metadata_block_name\"", SearchFields.METADATA_TYPES));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("display_facet"));
+
+        Mockito.verify(dataverse, Mockito.times(2)).getMetadataBlockFacets();
+        Mockito.verify(block).getName();
+        Mockito.verify(block).getLocaleDisplayFacet();
+    }
+
+    @Test
+    public void getFriendlyNamesFromFilterQuery_value_should_return_value_when_key_is_metadata_types_and_value_does_not_matches_metadata_block_name() {
+        SearchIncludeFragment target = new SearchIncludeFragment();
+        Dataverse dataverse = Mockito.mock(Dataverse.class);
+        MetadataBlock block = Mockito.mock(MetadataBlock.class);
+        Mockito.when(block.getName()).thenReturn("metadata_block_name");
+        Mockito.when(block.getLocaleDisplayFacet()).thenReturn("display_facet");
+        DataverseMetadataBlockFacet blockFacet = new DataverseMetadataBlockFacet();
+        blockFacet.setMetadataBlock(block);
+        Mockito.when(dataverse.getMetadataBlockFacets()).thenReturn(Arrays.asList(blockFacet));
+        target.setDataverse(dataverse);
+
+        List<String> result = target.getFriendlyNamesFromFilterQuery(String.format("%s:\"no_match_block_name\"", SearchFields.METADATA_TYPES));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("no_match_block_name"));
+
+        Mockito.verify(dataverse, Mockito.times(2)).getMetadataBlockFacets();
+        Mockito.verify(block).getName();
+    }
+
+    @Test
+    public void getFriendlyNamesFromFilterQuery_value_should_return_value_when_key_is_metadata_types_and_dataverse_is_null() {
+        SearchIncludeFragment target = new SearchIncludeFragment();
+
+        List<String> result = target.getFriendlyNamesFromFilterQuery(String.format("%s:\"no_dataverse\"", SearchFields.METADATA_TYPES));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("no_dataverse"));
+    }
+
+    @Test
+    public void getFriendlyNamesFromFilterQuery_value_should_return_value_when_key_is_metadata_types_and_metadata_blocks_are_null() {
+        SearchIncludeFragment target = new SearchIncludeFragment();
+        Dataverse dataverse = Mockito.mock(Dataverse.class);
+        Mockito.when(dataverse.getMetadataBlockFacets()).thenReturn(null);
+        target.setDataverse(dataverse);
+
+        List<String> result = target.getFriendlyNamesFromFilterQuery(String.format("%s:\"no_metadata_blocks\"", SearchFields.METADATA_TYPES));
+        MatcherAssert.assertThat(result.get(1), Matchers.is("no_metadata_blocks"));
+
+        Mockito.verify(dataverse).getMetadataBlockFacets();
+    }
+
+    @Test
+    public void getFriendlyNamesFromFilterQuery_value_should_remove_quotes_from_beginning_and_end() {
+        SearchIncludeFragment target = new SearchIncludeFragment();
+
+        List<String> result = target.getFriendlyNamesFromFilterQuery("key:\"value_\"_with_quotes\"");
+        MatcherAssert.assertThat(result.get(1), Matchers.is("value_\"_with_quotes"));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/search/SearchUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/search/SearchUtilTest.java
index 525e03f8302..6e2fb762c3b 100644
--- a/src/test/java/edu/harvard/iq/dataverse/search/SearchUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/search/SearchUtilTest.java
@@ -91,4 +91,44 @@ public void testdetermineFinalQuery() {
         assertEquals("*", SearchUtil.determineFinalQuery(""));
         assertEquals("foo", SearchUtil.determineFinalQuery("foo"));
     }
+
+    @Test
+    public void testGetGeoPoint() {
+        // valid
+        assertEquals("42.3,-71.1", SearchUtil.getGeoPoint("42.3,-71.1"));
+        // user doesn't want geospatial search
+        assertEquals(null, SearchUtil.getGeoPoint(null));
+        // invalid
+        assertThrows(IllegalArgumentException.class, () -> {
+            SearchUtil.getGeoRadius("42.3;-71.1");
+        }, "Must have a comma.");
+        assertThrows(IllegalArgumentException.class, () -> {
+            SearchUtil.getGeoRadius("-71.187346,42.33661,-71.043056,42.409599");
+        }, "Must have only one comma.");
+        assertThrows(IllegalArgumentException.class, () -> {
+            SearchUtil.getGeoRadius("junk");
+        }, "Must have a comma.");
+        assertThrows(NumberFormatException.class, () -> {
+            SearchUtil.getGeoRadius("somejunk,morejunk");
+        }, "Must be numbers.");
+        // invalid but let it go, it's handled by Solr, which throws an informative exception
+        assertEquals("999.0,-999.0", SearchUtil.getGeoPoint("999,-999"));
+    }
+
+    @Test
+    public void testGetGeoRadius() {
+        // valid
+        assertEquals("5", SearchUtil.getGeoRadius("5"));
+        assertEquals("1.5", SearchUtil.getGeoRadius("1.5"));
+        // user doesn't want geospatial search
+        assertEquals(null, SearchUtil.getGeoRadius(null));
+        assertEquals(null, SearchUtil.getGeoRadius(""));
+        // invalid
+        assertThrows(NumberFormatException.class, () -> {
+            SearchUtil.getGeoRadius("nonNumber");
+        }, "Must be a number.");
+        assertThrows(NumberFormatException.class, () -> {
+            SearchUtil.getGeoRadius("-1");
+        }, "Must be greater than zero.");
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/search/SolrClientIndexServiceTest.java b/src/test/java/edu/harvard/iq/dataverse/search/SolrClientIndexServiceTest.java
new file mode 100644
index 00000000000..d3d68fa5f6a
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/search/SolrClientIndexServiceTest.java
@@ -0,0 +1,72 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.impl.ConcurrentUpdateHttp2SolrClient;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+
+@LocalJvmSettings
+@ExtendWith(MockitoExtension.class)
+class SolrClientIndexServiceTest {
+
+    @Mock
+    SettingsServiceBean settingsServiceBean;
+
+    @InjectMocks
+    SystemConfig systemConfig;
+
+    SolrClientIndexService clientService = new SolrClientIndexService();
+
+    @BeforeEach
+    void setUp() {
+        clientService.systemConfig = systemConfig;
+    }
+
+    @Test
+    void testInitWithDefaults() {
+        // given
+        String url = "http://localhost:8983/solr/collection1";
+
+        // when
+        clientService.init();
+
+        // then
+        SolrClient client = clientService.getSolrClient();
+        assertNotNull(client);
+        assertInstanceOf(ConcurrentUpdateHttp2SolrClient.class, client);
+        assertEquals(url, clientService.getSolrUrl());
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.SOLR_HOST, value = "foobar")
+    @JvmSetting(key = JvmSettings.SOLR_PORT, value = "1234")
+    @JvmSetting(key = JvmSettings.SOLR_CORE, value = "test")
+    void testInitWithConfig() {
+        // given
+        String url = "http://foobar:1234/solr/test";
+
+        // when
+        clientService.init();
+
+        // then
+        SolrClient client = clientService.getSolrClient();
+        assertNotNull(client);
+        assertInstanceOf(ConcurrentUpdateHttp2SolrClient.class, client);
+        assertEquals(url, clientService.getSolrUrl());
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/search/SolrClientServiceTest.java b/src/test/java/edu/harvard/iq/dataverse/search/SolrClientServiceTest.java
new file mode 100644
index 00000000000..13cea4151ff
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/search/SolrClientServiceTest.java
@@ -0,0 +1,70 @@
+package edu.harvard.iq.dataverse.search;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+
+@LocalJvmSettings
+@ExtendWith(MockitoExtension.class)
+class SolrClientServiceTest {
+
+    @Mock
+    SettingsServiceBean settingsServiceBean;
+    @InjectMocks
+    SystemConfig systemConfig;
+    SolrClientService clientService = new SolrClientService();
+
+    @BeforeEach
+    void setUp() {
+        clientService.systemConfig = systemConfig;
+    }
+
+    @Test
+    void testInitWithDefaults() {
+        // given
+        String url = "http://localhost:8983/solr/collection1";
+
+        // when
+        clientService.init();
+
+        // then
+        SolrClient client = clientService.getSolrClient();
+        assertNotNull(client);
+        assertInstanceOf(Http2SolrClient.class, client);
+        assertEquals(url, clientService.getSolrUrl());
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.SOLR_HOST, value = "foobar")
+    @JvmSetting(key = JvmSettings.SOLR_PORT, value = "1234")
+    @JvmSetting(key = JvmSettings.SOLR_CORE, value = "test")
+    void testInitWithConfig() {
+        // given
+        String url = "http://foobar:1234/solr/test";
+
+        // when
+        clientService.init();
+
+        // then
+        SolrClient client = clientService.getSolrClient();
+        assertNotNull(client);
+        assertInstanceOf(Http2SolrClient.class, client);
+        assertEquals(url, clientService.getSolrUrl());
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/search/SolrSearchResultTest.java b/src/test/java/edu/harvard/iq/dataverse/search/SolrSearchResultTest.java
index 8def87cee5a..d7deaa2dbc1 100644
--- a/src/test/java/edu/harvard/iq/dataverse/search/SolrSearchResultTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/search/SolrSearchResultTest.java
@@ -1,18 +1,18 @@
 package edu.harvard.iq.dataverse.search;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 // ****************************************************************************************
 // The following tests test the setPublicationStatuses method aiming for 100% prime 
@@ -35,7 +35,7 @@ public class SolrSearchResultTest {
 
     SolrSearchResult solrSearchResult;
 
-    @Before
+    @BeforeEach
     public void before() {
         this.unpublishedFlag = IndexServiceBean.getUNPUBLISHED_STRING();
         this.publishedFlag = IndexServiceBean.getPUBLISHED_STRING();
@@ -47,7 +47,7 @@ public void before() {
         this.solrSearchResult = new SolrSearchResult("myQuery", "myName");
     }
 
-    @After
+    @AfterEach
     public void after() {
         this.unpublishedFlag = null;
         this.publishedFlag = null;
@@ -225,6 +225,29 @@ public void testSetPublicationStatuses14() {
         assertTrue(this.solrSearchResult.isDeaccessionedState());
     }
 
+    @Test
+    public void testSetPublicationStatusesJson() {
+
+        boolean showRelevance = false;
+        boolean showEntityIds = false;
+        boolean showApiUrls = false;
+
+        SolrSearchResult result01 = new SolrSearchResult("myQuery", "myName");
+        result01.setType(SearchConstants.DATAVERSES);
+        result01.setPublicationStatuses(List.of("Unpublished", "Draft"));
+        JsonObjectBuilder actual01 = result01.json(showRelevance, showEntityIds, showApiUrls);
+        JsonObject actual = actual01.build();
+        System.out.println("actual: " + actual);
+
+        JsonObjectBuilder expResult = Json.createObjectBuilder();
+        expResult.add("type", SearchConstants.DATAVERSE);
+        expResult.add("publicationStatuses", Json.createArrayBuilder().add("Unpublished").add("Draft").build());
+        JsonObject expected = expResult.build();
+        System.out.println("expect: " + expected);
+
+        assertEquals(expected, actual);
+    }
+
     @Test
     public void testJson() {
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/search/SortByTest.java b/src/test/java/edu/harvard/iq/dataverse/search/SortByTest.java
index 956063d4e1f..c8425198b83 100644
--- a/src/test/java/edu/harvard/iq/dataverse/search/SortByTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/search/SortByTest.java
@@ -1,12 +1,12 @@
 package edu.harvard.iq.dataverse.search;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class SortByTest {
 
@@ -14,14 +14,14 @@ public class SortByTest {
     private String order;
     private SortBy instance;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         this.field = "field";
         this.order = SortBy.ASCENDING;
         this.instance = new SortBy(field, order);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         this.field = null;
         this.order = null;
diff --git a/src/test/java/edu/harvard/iq/dataverse/settings/ConfigCheckServiceTest.java b/src/test/java/edu/harvard/iq/dataverse/settings/ConfigCheckServiceTest.java
new file mode 100644
index 00000000000..dad86e73d19
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/settings/ConfigCheckServiceTest.java
@@ -0,0 +1,110 @@
+package edu.harvard.iq.dataverse.settings;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+
+import static java.nio.file.attribute.PosixFilePermission.GROUP_READ;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
+import org.junit.jupiter.api.Disabled;
+
+@Disabled
+class ConfigCheckServiceTest {
+    
+    @TempDir
+    static Path testDir;
+    
+    private static final String testDirProp = "test.filesDir";
+    
+    @AfterAll
+    static void tearDown() {
+        System.clearProperty(testDirProp);
+    }
+    
+    @Nested
+    class TestDirNotAbsolute {
+        @Test
+        void nonAbsolutePathForTestDir() {
+            System.setProperty(testDirProp, "foobar");
+            ConfigCheckService sut = new ConfigCheckService();
+            Assertions.assertFalse(sut.checkSystemDirectories());
+        }
+    }
+
+    @Nested
+    class TestDirNotWritable {
+        
+        Path notWriteableSubfolder = testDir.resolve("readonly");
+        
+        @BeforeEach
+        void setUp() throws IOException {
+            Files.createDirectory(notWriteableSubfolder);
+            Files.setPosixFilePermissions(notWriteableSubfolder, Set.of(OWNER_READ, GROUP_READ));
+            System.setProperty(testDirProp, notWriteableSubfolder.toString());
+        }
+        
+        @Test
+        void writeCheckFails() {
+            Assumptions.assumeTrue(Files.exists(notWriteableSubfolder));
+            
+            ConfigCheckService sut = new ConfigCheckService();
+            Assertions.assertFalse(sut.checkSystemDirectories());
+        }
+    }
+    
+    @Nested
+    class TestDirNotExistent {
+        
+        Path notExistTestfolder = testDir.resolve("parent-readonly");
+        Path notExistConfigSubfolder = notExistTestfolder.resolve("foobar");
+        
+        @BeforeEach
+        void setUp() throws IOException {
+            Files.createDirectory(notExistTestfolder);
+            // Make test dir not writeable, so the subfolder cannot be created
+            Files.setPosixFilePermissions(notExistTestfolder, Set.of(OWNER_READ, GROUP_READ));
+            System.setProperty(testDirProp, notExistConfigSubfolder.toString());
+        }
+        
+        @Test
+        void mkdirFails() {
+            Assumptions.assumeTrue(Files.exists(notExistTestfolder));
+            Assumptions.assumeFalse(Files.exists(notExistConfigSubfolder));
+            
+            ConfigCheckService sut = new ConfigCheckService();
+            Assertions.assertFalse(sut.checkSystemDirectories());
+        }
+    }
+    
+    @Nested
+    class TestDirCreated {
+
+        Path missingToBeCreatedTestfolder = testDir.resolve("create-me");
+        Path missingToBeCreatedSubfolder = missingToBeCreatedTestfolder.resolve("foobar");
+        
+        @BeforeEach
+        void setUp() throws IOException {
+            Files.createDirectory(missingToBeCreatedTestfolder);
+            System.setProperty(testDirProp, missingToBeCreatedSubfolder.toString());
+        }
+        
+        @Test
+        void mkdirSucceeds() {
+            Assumptions.assumeTrue(Files.exists(missingToBeCreatedTestfolder));
+            Assumptions.assumeFalse(Files.exists(missingToBeCreatedSubfolder));
+            
+            ConfigCheckService sut = new ConfigCheckService();
+            Assertions.assertTrue(sut.checkSystemDirectories());
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/settings/FeatureFlagsTest.java b/src/test/java/edu/harvard/iq/dataverse/settings/FeatureFlagsTest.java
new file mode 100644
index 00000000000..26f2186695d
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/settings/FeatureFlagsTest.java
@@ -0,0 +1,23 @@
+package edu.harvard.iq.dataverse.settings;
+
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@LocalJvmSettings
+class FeatureFlagsTest {
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "false", varArgs = "api-session-auth")
+    void testFlagDisabled() {
+        assertFalse(FeatureFlags.API_SESSION_AUTH.enabled());
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-session-auth")
+    void testFlagEnabled() {
+        assertTrue(FeatureFlags.API_SESSION_AUTH.enabled());
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java b/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java
new file mode 100644
index 00000000000..f4494b7116e
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java
@@ -0,0 +1,31 @@
+package edu.harvard.iq.dataverse.settings;
+
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import edu.harvard.iq.dataverse.util.testing.SystemProperty;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@LocalJvmSettings
+class JvmSettingsTest {
+    @Test
+    @JvmSetting(key = JvmSettings.VERSION, value = "foobar")
+    void lookupSetting() {
+        assertEquals("foobar", JvmSettings.VERSION.lookup());
+        assertEquals("foobar", JvmSettings.VERSION.lookupOptional().orElse(""));
+    }
+    
+    @Test
+    @SystemProperty(key = "dataverse.pid.datacite.datacite.username", value = "test")
+    void lookupPidProviderSetting() {
+        assertEquals("test", JvmSettings.DATACITE_USERNAME.lookup("datacite"));
+    }
+    
+    @Test
+    @SystemProperty(key = "dataverse.ingest.rserve.port", value = "1234")
+    void lookupSettingViaAliasWithDefaultInMPCFile() {
+        assertEquals("1234", JvmSettings.RSERVE_PORT.lookup());
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/settings/source/AliasConfigSourceTest.java b/src/test/java/edu/harvard/iq/dataverse/settings/source/AliasConfigSourceTest.java
new file mode 100644
index 00000000000..621423b3121
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/settings/source/AliasConfigSourceTest.java
@@ -0,0 +1,95 @@
+package edu.harvard.iq.dataverse.settings.source;
+
+import edu.harvard.iq.dataverse.util.testing.SystemProperty;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+class AliasConfigSourceTest {
+    
+    static AliasConfigSource source = new AliasConfigSource();
+    
+    static final String VALUE = "test1234";
+    
+    static final String SIMPLE_NEW = "dataverse.test.foobar";
+    static final String SIMPLE_OLD = "dataverse.former.hello";
+    static final String SIMPLE_MULTI_NEW = "dataverse.test.multi";
+    static final String SIMPLE_MULTI_OLD = "former.2";
+    
+    static final Pattern PATTERNED_NEW_PATTERN = Pattern.compile("dataverse\\.(.+?)\\.next\\.test");
+    static final String PATTERNED_NEW_NAME = "dataverse.single.next.test";
+    static final String PATTERNED_OLD_PATTERN = "dataverse.%s.test.foobar";
+    static final String PATTERNED_OLD_NAME = "dataverse.single.test.foobar";
+    
+    static final Pattern DUAL_PATTERNED_NEW_PATTERN = Pattern.compile("dataverse\\.(.+?)\\.two\\.(.+?)\\.foobar");
+    static final String DUAL_PATTERNED_NEW_NAME = "dataverse.single.two.test.foobar";
+    static final String DUAL_PATTERNED_OLD_PATTERN = "dataverse.%s.test.%s.foobar";
+    static final String DUAL_PATTERNED_OLD_NAME = "dataverse.single.test.test.foobar";
+    
+    static final Pattern PATTERNED_MULTI_NEW_PATTERN = Pattern.compile("dataverse\\.(.+?)\\.next\\.test2");
+    static final String PATTERNED_MULTI_NEW_NAME = "dataverse.multi.next.test2";
+    static final String PATTERNED_MULTI_OLD_PATTERN = "dataverse.%s.test.foobar2";
+    static final String PATTERNED_MULTI_OLD_NAME = "dataverse.multi.test.foobar2";
+    
+    static final Pattern DUALSINGLE_PATTERNED_NEW_PATTERN = Pattern.compile("dataverse\\.(.+?)\\.(.+?)\\.test2");
+    static final String DUALSINGLE_PATTERNED_NEW_NAME = "dataverse.multi.next.test2";
+    static final String DUALSINGLE_PATTERNED_OLD_PATTERN = "dataverse.%s.test.foobar2";
+    static final String DUALSINGLE_PATTERNED_OLD_NAME = "dataverse.multi.test.foobar2";
+    
+    @BeforeAll
+    static void setUp() {
+        source.addAlias(SIMPLE_NEW, List.of(SIMPLE_OLD));
+        source.addAlias(SIMPLE_MULTI_NEW, List.of("former.1", SIMPLE_MULTI_OLD, "former.3"));
+        source.addAlias(PATTERNED_NEW_PATTERN, List.of(PATTERNED_OLD_PATTERN));
+        source.addAlias(DUAL_PATTERNED_NEW_PATTERN, List.of(DUAL_PATTERNED_OLD_PATTERN));
+        source.addAlias(PATTERNED_MULTI_NEW_PATTERN, List.of("dataverse.%s.test1.foobar1", PATTERNED_MULTI_OLD_PATTERN, "dataverse.test.%s.test"));
+        source.addAlias(DUALSINGLE_PATTERNED_NEW_PATTERN, List.of(DUALSINGLE_PATTERNED_OLD_PATTERN));
+    }
+    
+    @Test
+    void testNullIfNotInScope() {
+        assertNull(source.getValue(null));
+        assertNull(source.getValue("test.out.of.scope"));
+    }
+    
+    @Test
+    @SystemProperty(key = SIMPLE_OLD, value = VALUE)
+    void testSimpleAlias() {
+        assertEquals(VALUE, source.getValue(SIMPLE_NEW));
+    }
+    
+    @Test
+    @SystemProperty(key = SIMPLE_MULTI_OLD, value = VALUE)
+    void testSimpleMultipleAlias() {
+        assertEquals(VALUE, source.getValue(SIMPLE_MULTI_NEW));
+    }
+    
+    @Test
+    @SystemProperty(key = PATTERNED_OLD_NAME, value = VALUE)
+    void testPatternedAlias() {
+        assertEquals(VALUE, source.getValue(PATTERNED_NEW_NAME));
+    }
+    
+    @Test
+    @SystemProperty(key = DUAL_PATTERNED_OLD_NAME, value = VALUE)
+    void testDualPatternedAlias() {
+        assertEquals(VALUE, source.getValue(DUAL_PATTERNED_NEW_NAME));
+    }
+    
+    @Test
+    @SystemProperty(key = PATTERNED_MULTI_OLD_NAME, value = VALUE)
+    void testPatternedMultipleAlias() {
+        assertEquals(VALUE, source.getValue(PATTERNED_MULTI_NEW_NAME));
+    }
+    
+    @Test
+    @SystemProperty(key = DUALSINGLE_PATTERNED_OLD_NAME, value = VALUE)
+    void testDualSinglePatternedAlias() {
+        assertEquals(VALUE, source.getValue(DUALSINGLE_PATTERNED_NEW_NAME));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtilTest.java
index f5f1bf056f6..f17cb825986 100644
--- a/src/test/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtilTest.java
@@ -5,32 +5,61 @@
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
 import edu.harvard.iq.dataverse.util.xml.XmlPrinter;
 import edu.harvard.iq.dataverse.util.xml.XmlValidator;
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-import org.xml.sax.SAXException;
 
-public class SiteMapUtilTest {
+import static org.junit.jupiter.api.Assertions.*;
 
-    @Test
-    public void testUpdateSiteMap() throws IOException, ParseException {
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.xml.sax.SAXException;
 
+class SiteMapUtilTest {
+
+    // see https://www.sitemaps.org/protocol.html#validating
+    final String xsdSitemap = "https://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd";
+    final String xsdSitemapIndex = "https://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd";
+
+    @TempDir
+    Path tempDir;
+    Path tempDocroot;
+    
+    @BeforeEach
+    void setup() throws IOException {
+        // NOTE: This might be unsafe for parallel tests, but our @SystemProperty helper does not yet support
+        //       lookups from vars or methods.
+        System.setProperty("test.filesDir", tempDir.toString());
+        this.tempDocroot = tempDir.resolve("docroot");
+        Files.createDirectory(tempDocroot);
+    }
+    
+    @AfterEach
+    void teardown() {
+        System.clearProperty("test.filesDir");
+    }
+    
+    @Test
+    void testUpdateSiteMap() throws IOException, ParseException, SAXException {
+        // given
         List<Dataverse> dataverses = new ArrayList<>();
         String publishedDvString = "publishedDv1";
         Dataverse publishedDataverse = new Dataverse();
@@ -44,29 +73,31 @@ public void testUpdateSiteMap() throws IOException, ParseException {
         List<Dataset> datasets = new ArrayList<>();
 
         Dataset published = new Dataset();
-        String publishedPid = "doi:10.666/FAKE/published1";
-        published.setGlobalId(new GlobalId(publishedPid));
+        published.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, "10.666", "FAKE/published1", null, AbstractDOIProvider.DOI_RESOLVER_URL, null));
+        String publishedPid = published.getGlobalId().asString();
         published.setPublicationDate(new Timestamp(new Date().getTime()));
         published.setModificationTime(new Timestamp(new Date().getTime()));
         datasets.add(published);
 
         Dataset unpublished = new Dataset();
-        String unpublishedPid = "doi:10.666/FAKE/unpublished1";
-        unpublished.setGlobalId(new GlobalId(unpublishedPid));
+        unpublished.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, "10.666", "FAKE/unpublished1", null, AbstractDOIProvider.DOI_RESOLVER_URL, null));
+        String unpublishedPid = unpublished.getGlobalId().asString();
+
         Timestamp nullPublicationDateToIndicateNotPublished = null;
         unpublished.setPublicationDate(nullPublicationDateToIndicateNotPublished);
         datasets.add(unpublished);
 
         Dataset harvested = new Dataset();
-        String harvestedPid = "doi:10.666/FAKE/harvested1";
-        harvested.setGlobalId(new GlobalId(harvestedPid));
+        harvested.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, "10.666", "FAKE/harvested1", null, AbstractDOIProvider.DOI_RESOLVER_URL, null));
+        String harvestedPid = harvested.getGlobalId().asString();
         harvested.setPublicationDate(new Timestamp(new Date().getTime()));
         harvested.setHarvestedFrom(new HarvestingClient());
         datasets.add(harvested);
 
         Dataset deaccessioned = new Dataset();
-        String deaccessionedPid = "doi:10.666/FAKE/harvested1";
-        deaccessioned.setGlobalId(new GlobalId(deaccessionedPid));
+        deaccessioned.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, "10.666", "FAKE/deaccessioned1", null, AbstractDOIProvider.DOI_RESOLVER_URL, null));
+        String deaccessionedPid = deaccessioned.getGlobalId().asString();
+
         deaccessioned.setPublicationDate(new Timestamp(new Date().getTime()));
         List<DatasetVersion> datasetVersions = new ArrayList<>();
         DatasetVersion datasetVersion = new DatasetVersion();
@@ -74,41 +105,126 @@ public void testUpdateSiteMap() throws IOException, ParseException {
         datasetVersions.add(datasetVersion);
         deaccessioned.setVersions(datasetVersions);
         datasets.add(deaccessioned);
-
-        File oldSitemapFile = new File("/tmp/sitemap.xml");
-        if (oldSitemapFile.exists()) {
-            oldSitemapFile.delete();
-        }
+        
+        // when
         SiteMapUtil.updateSiteMap(dataverses, datasets);
+        
+        // then
+        String pathToSiteMap = tempDocroot.resolve("sitemap").resolve("sitemap.xml").toString();
+        assertDoesNotThrow(() -> XmlValidator.validateXmlWellFormed(pathToSiteMap));
+        assertTrue(XmlValidator.validateXmlSchema(pathToSiteMap, new URL(xsdSitemap)));
 
-        Exception wellFormedXmlException = null;
-        try {
-            assertTrue(XmlValidator.validateXmlWellFormed("/tmp/sitemap.xml"));
-        } catch (Exception ex) {
-            System.out.println("Exception caught checking that XML is well formed: " + ex);
-            wellFormedXmlException = ex;
-        }
-        assertNull(wellFormedXmlException);
-
-        Exception notValidAgainstSchemaException = null;
-        try {
-            assertTrue(XmlValidator.validateXmlSchema("/tmp/sitemap.xml", new URL("https://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd")));
-        } catch (MalformedURLException | SAXException ex) {
-            System.out.println("Exception caught validating XML against the sitemap schema: " + ex);
-            notValidAgainstSchemaException = ex;
-        }
-        assertNull(notValidAgainstSchemaException);
-
-        File sitemapFile = new File("/tmp/sitemap.xml");
+        File sitemapFile = new File(pathToSiteMap);
         String sitemapString = XmlPrinter.prettyPrintXml(new String(Files.readAllBytes(Paths.get(sitemapFile.getAbsolutePath()))));
-        System.out.println("sitemap: " + sitemapString);
+        //System.out.println("sitemap: " + sitemapString);
 
         assertTrue(sitemapString.contains("1955-11-12"));
         assertTrue(sitemapString.contains(publishedPid));
         assertFalse(sitemapString.contains(unpublishedPid));
         assertFalse(sitemapString.contains(harvestedPid));
         assertFalse(sitemapString.contains(deaccessionedPid));
+    }
+
+    @Test
+    void testHugeSiteMap() throws IOException, ParseException, SAXException {
+        // given
+        final int nbDataverse = 50;
+        final int nbDataset = SiteMapUtil.SITEMAP_LIMIT;
+        final Timestamp now = new Timestamp(new Date().getTime());
+        // Regex validate dataset URL
+        final String sitemapUrlRegex = ".*/dataset\\.xhtml\\?persistentId=doi:10\\.666/FAKE/published[0-9]{1,5}</loc>$";
+        // Regex validate sitemap URL: must include "/sitemap/" to be accessible because there is no pretty-faces rewrite
+        final String sitemapIndexUrlRegex = ".*/sitemap/sitemap[1-2]\\.xml</loc>$";
+        final String today = LocalDateTime.now().format(DateTimeFormatter.ofPattern(SiteMapUtil.DATE_PATTERN));
+
+        final List<Dataverse> dataverses = new ArrayList<>(nbDataverse);
+        for (int i = 1; i <= nbDataverse; i++) {
+            final Dataverse publishedDataverse = new Dataverse();
+            publishedDataverse.setAlias(String.format("publishedDv%s", i));
+            publishedDataverse.setModificationTime(now);
+            publishedDataverse.setPublicationDate(now);
+            dataverses.add(publishedDataverse);
+        }
+
+        final List<Dataset> datasets = new ArrayList<>(nbDataset);
+        for (int i = 1; i <= nbDataset; i++) {
+            final Dataset published = new Dataset();
+            published.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, "10.666", String.format("FAKE/published%s", i), null, AbstractDOIProvider.DOI_RESOLVER_URL, null));
+            published.setPublicationDate(now);
+            published.setModificationTime(now);
+            datasets.add(published);
+        }
+
+        // when
+        SiteMapUtil.updateSiteMap(dataverses, datasets);
 
+        // then
+        final Path siteMapDir = tempDocroot.resolve("sitemap");
+        final String pathToSiteMapIndexFile = siteMapDir.resolve("sitemap_index.xml").toString();
+        final String pathToSiteMap1File = siteMapDir.resolve("sitemap1.xml").toString();
+        final String pathToSiteMap2File = siteMapDir.resolve("sitemap2.xml").toString();
+
+        // validate sitemap_index.xml file with XSD
+        assertDoesNotThrow(() -> XmlValidator.validateXmlWellFormed(pathToSiteMapIndexFile));
+        assertTrue(XmlValidator.validateXmlSchema(pathToSiteMapIndexFile, new URL(xsdSitemapIndex)));
+
+        // verify sitemap_index.xml content
+        File sitemapFile = new File(pathToSiteMapIndexFile);
+        String sitemapString = XmlPrinter.prettyPrintXml(new String(Files.readAllBytes(Paths.get(sitemapFile.getAbsolutePath())), StandardCharsets.UTF_8));
+        // System.out.println("sitemap: " + sitemapString);
+
+        String[] lines = sitemapString.split("\n");
+        for (int i = 0; i < lines.length; i++) {
+            String line = lines[i].strip();
+            if (StringUtils.isNotBlank(line)) {
+                if (i == 0) {
+                    assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", line);
+                } else if (i == 1) {
+                    assertEquals("<sitemapindex xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">", line);
+                } else if (i == 2) {
+                    assertEquals("<sitemap>", line);
+                } else if (line.startsWith("<loc>")) {
+                    final String errorWithSitemapIndexUrl = String.format("Sitemap URL must match with \"%s\" but was \"%s\"", sitemapIndexUrlRegex, line);
+                    assertTrue(line.matches(sitemapIndexUrlRegex), errorWithSitemapIndexUrl);
+                } else if (line.startsWith("<lastmod>")) {
+                    assertEquals(String.format("<lastmod>%s</lastmod>", today), line);
+                }
+            }
+        }
+
+        // validate sitemap1.xml file with XSD
+        assertDoesNotThrow(() -> XmlValidator.validateXmlWellFormed(pathToSiteMap1File));
+        assertTrue(XmlValidator.validateXmlSchema(pathToSiteMap1File, new URL(xsdSitemap)));
+
+        // validate sitemap2.xml file with XSD
+        assertDoesNotThrow(() -> XmlValidator.validateXmlWellFormed(pathToSiteMap2File));
+        assertTrue(XmlValidator.validateXmlSchema(pathToSiteMap2File, new URL(xsdSitemap)));
+
+        // verify sitemap2.xml content
+        sitemapFile = new File(pathToSiteMap2File);
+        sitemapString = XmlPrinter.prettyPrintXml(new String(Files.readAllBytes(Paths.get(sitemapFile.getAbsolutePath())), StandardCharsets.UTF_8));
+
+        lines = sitemapString.split("\n");
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", lines[0].strip());
+        assertEquals("<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">", lines[1].strip());
+        boolean isContainsLocTag = false;
+        boolean isContainsLastmodTag = false;
+        // loop over 10 lines only, just need to validate the <loc> and <lastmod> tags
+        for (int i = 5; i < 15; i++) {
+            String line = lines[i].strip();
+            if (StringUtils.isNotBlank(line)) {
+                if (line.startsWith("<loc>")) {
+                    isContainsLocTag = true;
+                    final String errorWithSitemapIndexUrl = String.format("Sitemap URL must match with \"%s\" but was \"%s\"", sitemapUrlRegex, line);
+                    assertTrue(line.matches(sitemapUrlRegex), errorWithSitemapIndexUrl);
+                } else if (line.startsWith("<lastmod>")) {
+                    isContainsLastmodTag = true;
+                    assertEquals(String.format("<lastmod>%s</lastmod>", today), line);
+                }
+            }
+        }
+        assertTrue(isContainsLocTag, "Sitemap file must contains <loc> tag");
+        assertTrue(isContainsLastmodTag, "Sitemap file must contains <lastmod> tag");
     }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/userdata/UserListMakerTest.java b/src/test/java/edu/harvard/iq/dataverse/userdata/UserListMakerTest.java
index b744db5be20..10c07cf0ef5 100644
--- a/src/test/java/edu/harvard/iq/dataverse/userdata/UserListMakerTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/userdata/UserListMakerTest.java
@@ -1,6 +1,6 @@
 package edu.harvard.iq.dataverse.userdata;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
 import org.junit.jupiter.api.AfterEach;
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/BitSetTest.java b/src/test/java/edu/harvard/iq/dataverse/util/BitSetTest.java
index 5aa37e8b05c..475d986b63c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/BitSetTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/BitSetTest.java
@@ -7,12 +7,13 @@
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -27,21 +28,21 @@ enum TestEnum {
 	public BitSetTest() {
 	}
 	
-	@BeforeClass
+	@BeforeAll
 	public static void setUpClass() {
 	}
 	
-	@AfterClass
+	@AfterAll
 	public static void tearDownClass() {
 	}
 	
 	BitSet sut;
-	@Before
+	@BeforeEach
 	public void setUp() {
 		sut = new BitSet();
 	}
 	
-	@After
+	@AfterEach
 	public void tearDown() {
 	}
 
@@ -116,9 +117,9 @@ public void testIntersect() {
 		sut = sut1.copy().intersect(sut2);
 		for ( short i : BitSet.allIndices() ) {
 			if ( sut.isSet(i) ) {
-				assertTrue( "expected true at idx " + i, sut1.isSet(i) && sut2.isSet(i) );
+				assertTrue(sut1.isSet(i) && sut2.isSet(i), "expected true at idx " + i);
 			} else {
-				assertFalse( "expected false at idx " + i, sut1.isSet(i) && sut2.isSet(i) );
+				assertFalse(sut1.isSet(i) && sut2.isSet(i), "expected false at idx " + i);
 			}
 		}
 	}
@@ -133,9 +134,9 @@ public void testXor() {
 		sut = sut1.copy().xor(sut2);
 		for ( short i : BitSet.allIndices() ) {
 			if ( sut.isSet(i) ) {
-				assertTrue( "expected true at idx " + i, sut1.isSet(i) ^ sut2.isSet(i) );
+				assertTrue(sut1.isSet(i) ^ sut2.isSet(i), "expected true at idx " + i);
 			} else {
-				assertFalse( "expected false at idx " + i, sut1.isSet(i) ^ sut2.isSet(i) );
+				assertFalse(sut1.isSet(i) ^ sut2.isSet(i), "expected false at idx " + i);
 			}
 		}
 	}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java
index 8889d492829..8f788154a93 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java
@@ -1,11 +1,14 @@
 package edu.harvard.iq.dataverse.util;
 
 import java.util.Arrays;
-import java.util.Locale;
+import java.util.List;
 import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class BundleUtilTest {
 
@@ -20,7 +23,7 @@ public void testGetStringFromBundle() {
 
     @Test
     public void testGetStringFromBundleWithArguments() {
-        assertEquals(null, BundleUtil.getStringFromBundle(null, null));
+        assertEquals(null, BundleUtil.getStringFromBundle(null, (List<String>) null));
         String actual = BundleUtil.getStringFromBundle("dataverse.create.success", Arrays.asList("http://guides.dataverse.org/en", "4.0"));
         String expected = "You have successfully created your dataverse! To learn more about what you can do with your dataverse, check out the <a href=\"http://guides.dataverse.org/en/4.0/user/dataverse-management.html\" title=\"Dataverse Management - Dataverse User Guide\" target=\"_blank\">User Guide</a>.";
         assertEquals(expected, actual);
@@ -78,14 +81,14 @@ public void testStringFromPropertyFile() {
     }
 
     //To assure that the MissingResourceException bubble up from this call
-    @Test(expected = MissingResourceException.class)
-    public void testStringFromPropertyFileException() {
-        BundleUtil.getStringFromPropertyFile("FAKE","MimeTypeFacets");
+    @Test
+    void testStringFromPropertyFileException() {
+        assertThrows(MissingResourceException.class, () -> BundleUtil.getStringFromPropertyFile("FAKE","MimeTypeFacets"));
     }
     
     //To assure MissingResourceException is caught when calling normal bundle calls
     @Test
-    public void testNoErrorNonExistentStringBundle() {
-        BundleUtil.getStringFromBundle("FAKE", null, BundleUtil.getResourceBundle("MimeTypeFacets")); 
+    void testNoErrorNonExistentStringBundle() {
+        assertDoesNotThrow(() -> BundleUtil.getStringFromBundle("FAKE", null, BundleUtil.getResourceBundle("MimeTypeFacets")));
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/FileSortFieldAndOrderTest.java b/src/test/java/edu/harvard/iq/dataverse/util/FileSortFieldAndOrderTest.java
index 0ad76832952..84a200542fe 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/FileSortFieldAndOrderTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/FileSortFieldAndOrderTest.java
@@ -1,8 +1,8 @@
 package edu.harvard.iq.dataverse.util;
 
 import edu.harvard.iq.dataverse.search.SortBy;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileSortFieldAndOrderTest {
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/FileTypeDetectionTest.java b/src/test/java/edu/harvard/iq/dataverse/util/FileTypeDetectionTest.java
deleted file mode 100644
index 5d2b9b4d56a..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/util/FileTypeDetectionTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package edu.harvard.iq.dataverse.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apache.commons.io.FileUtils;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class FileTypeDetectionTest {
-
-    static String baseDirForConfigFiles = "/tmp";
-
-    @BeforeClass
-    public static void setUpClass() {
-        System.setProperty("com.sun.aas.instanceRoot", baseDirForConfigFiles);
-        String testFile1Src = "conf/jhove/jhove.conf";
-        String testFile1Tmp = baseDirForConfigFiles + "/config/jhove.conf";
-        try {
-            FileUtils.copyFile(new File(testFile1Src), new File(testFile1Tmp));
-        } catch (IOException ex) {
-            Logger.getLogger(JhoveFileTypeTest.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-        // SiteMapUtilTest relies on com.sun.aas.instanceRoot being null.
-        System.clearProperty("com.sun.aas.instanceRoot");
-    }
-
-    @Test
-    public void testDetermineFileTypeJupyterNoteboook() throws Exception {
-        File file = new File("src/test/java/edu/harvard/iq/dataverse/util/irc-metrics.ipynb");
-        // https://jupyter.readthedocs.io/en/latest/reference/mimetype.html
-        assertEquals("application/x-ipynb+json", FileTypeDetection.determineFileType(file));
-    }
-
-}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/FileUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/FileUtilTest.java
index ced06f74d6e..46359d7b02c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/FileUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/FileUtilTest.java
@@ -1,124 +1,91 @@
 package edu.harvard.iq.dataverse.util;
 
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.Guestbook;
-import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.license.License;
 import edu.harvard.iq.dataverse.util.FileUtil.FileCitationExtension;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
+import java.time.LocalDate;
+import java.net.URI;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Enclosed.class)
-public class FileUtilTest {
-
-    @RunWith(Parameterized.class)
-    public static class FileUtilParamTest {
-
-        @Parameters
-        public static Collection data() {
-            return Arrays.asList(new Object[][] {
-                { null, null, null },
-
-                { "trees.png-endnote.xml", "trees.png", FileUtil.FileCitationExtension.ENDNOTE },
-                { "trees.png.ris", "trees.png", FileUtil.FileCitationExtension.RIS },
-                { "trees.png.bib", "trees.png", FileUtil.FileCitationExtension.BIBTEX },
-                { null, "trees.png", null },
-
-                { "50by1000-endnote.xml", "50by1000.tab", FileUtil.FileCitationExtension.ENDNOTE },
-                { "50by1000.ris", "50by1000.tab", FileUtil.FileCitationExtension.RIS },
-                { "50by1000.bib", "50by1000.tab", FileUtil.FileCitationExtension.BIBTEX }
-            });
-        }
-
-        @Parameter
-        public String expectedFileName;
+import java.util.stream.Stream;
 
-        @Parameter(1)
-        public String actualFileName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-        @Parameter(2)
-        public FileCitationExtension citationExtension;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
-        @Test
-        public void testGetCiteDataFileFilename() {
-            assertEquals(expectedFileName, FileUtil.getCiteDataFileFilename(actualFileName, citationExtension));
-        }
+public class FileUtilTest {
+    
+    static Stream<Arguments> dataFilenames() {
+        return Stream.of(
+            Arguments.of(null, null, null),
+            Arguments.of("trees.png-endnote.xml", "trees.png", FileUtil.FileCitationExtension.ENDNOTE),
+            Arguments.of("trees.png.ris", "trees.png", FileUtil.FileCitationExtension.RIS),
+            Arguments.of("trees.png.bib", "trees.png", FileUtil.FileCitationExtension.BIBTEX),
+            Arguments.of(null, "trees.png", null),
+            Arguments.of("50by1000-endnote.xml", "50by1000.tab", FileUtil.FileCitationExtension.ENDNOTE),
+            Arguments.of("50by1000.ris", "50by1000.tab", FileUtil.FileCitationExtension.RIS),
+            Arguments.of("50by1000.bib", "50by1000.tab", FileUtil.FileCitationExtension.BIBTEX)
+        );
     }
-
-    @RunWith(Parameterized.class)
-    public static class FileUtilParamTest2 {
-
-        @Parameter
-        public String expectedString;
-
-        @Parameter(1)
-        public String originalName;
-
-        @Parameter(2)
-        public String newExtension;
-
-        @Parameters
-        public static Collection data() {
-            return Arrays.asList(new Object[][] {
-                // functional approach: what should the method do
-                // replace no extension with an empty extension
-                { "no-extension.", "no-extension", ""},
-
-                // replace extension x with same extension
-                { "extension.x", "extension.x", "x" },
-
-                // replace extension x with another extension y
-                { "extension.y", "extension.x", "y" },
-
-                // interface approach: what are possible inputs
-                // will not pass as null is not handled
-                //{ null, null, null },
-                //{ null, null, "" },
-                //{ null, null, "y" },
-
-                { ".null", "", null },
-                { ".", "", "" },
-                { ".y", "", "y" },
-            });
-        }
-
-        @Test
-        public void testReplaceExtension() {
-            assertEquals(expectedString, FileUtil.replaceExtension(originalName, newExtension));
-        }
-
+    
+    @ParameterizedTest
+    @MethodSource("dataFilenames")
+    void testGetCiteDataFileFilename(String expectedFileName, String actualFileName, FileCitationExtension citationExtension) {
+        assertEquals(expectedFileName, FileUtil.getCiteDataFileFilename(actualFileName, citationExtension));
+    }
+    
+    static Stream<Arguments> dataReplaceNames() {
+        return Stream.of(
+            // functional approach: what should the method do
+            // replace no extension with an empty extension
+            Arguments.of("no-extension.", "no-extension", ""),
+        
+            // replace extension x with same extension
+            Arguments.of("extension.x", "extension.x", "x"),
+        
+            // replace extension x with another extension y
+            Arguments.of("extension.y", "extension.x", "y"),
+        
+            // interface approach: what are possible inputs
+            // will not pass as null is not handled
+            //Arguments.of(null, null, null),
+            //Arguments.of(null, null, ""),
+            //Arguments.of(null, null, "y"),
+            
+            Arguments.of(".null", "", null),
+            Arguments.of(".", "", ""),
+            Arguments.of(".y", "", "y")
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("dataReplaceNames")
+    void testReplaceExtension(String expectedString, String originalName, String newExtension) {
+        assertEquals(expectedString, FileUtil.replaceExtension(originalName, newExtension));
     }
 
-    public static class FileUtilNoParamTest {
+    static class FileUtilNoParamTest {
         @Test
         public void testIsDownloadPopupRequiredNull() {
-            assertEquals(false, FileUtil.isDownloadPopupRequired(null));
+            assertFalse(FileUtil.isDownloadPopupRequired(null));
         }
 
         @Test
         public void testIsDownloadPopupRequiredDraft() {
             Dataset dataset = new Dataset();
-            DatasetVersion dsv1 = dataset.getEditVersion();
+            DatasetVersion dsv1 = dataset.getOrCreateEditVersion();
             assertEquals(DatasetVersion.VersionState.DRAFT, dsv1.getVersionState());
-            assertEquals(false, FileUtil.isDownloadPopupRequired(dsv1));
+            assertFalse(FileUtil.isDownloadPopupRequired(dsv1));
         }
 
         @Test
@@ -126,9 +93,11 @@ public void testIsDownloadPopupRequiredLicenseCC0() {
             DatasetVersion dsv1 = new DatasetVersion();
             dsv1.setVersionState(DatasetVersion.VersionState.RELEASED);
             TermsOfUseAndAccess termsOfUseAndAccess = new TermsOfUseAndAccess();
-            termsOfUseAndAccess.setLicense(TermsOfUseAndAccess.License.CC0);
+            License license = new License("CC0", "You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.", URI.create("http://creativecommons.org/publicdomain/zero/1.0"), URI.create("/resources/images/cc0.png"), true, 1l);
+            license.setDefault(true);
+            termsOfUseAndAccess.setLicense(license);
             dsv1.setTermsOfUseAndAccess(termsOfUseAndAccess);
-            assertEquals(false, FileUtil.isDownloadPopupRequired(dsv1));
+            assertFalse(FileUtil.isDownloadPopupRequired(dsv1));
         }
 
         @Test
@@ -141,10 +110,12 @@ public void testIsDownloadPopupRequiredHasTermsOfUseAndCc0License() {
              * the popup when the are Terms of Use. This feels like a bug since the
              * Terms of Use should probably be shown.
              */
-            termsOfUseAndAccess.setLicense(TermsOfUseAndAccess.License.CC0);
+            License license = new License("CC0", "You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.", URI.create("http://creativecommons.org/publicdomain/zero/1.0"), URI.create("/resources/images/cc0.png"), true, 2l);
+            license.setDefault(true);
+            termsOfUseAndAccess.setLicense(license);
             termsOfUseAndAccess.setTermsOfUse("be excellent to each other");
             dsv1.setTermsOfUseAndAccess(termsOfUseAndAccess);
-            assertEquals(false, FileUtil.isDownloadPopupRequired(dsv1));
+            assertFalse(FileUtil.isDownloadPopupRequired(dsv1));
         }
 
         @Test
@@ -152,10 +123,10 @@ public void testIsDownloadPopupRequiredHasTermsOfUseAndNoneLicense() {
             DatasetVersion dsv1 = new DatasetVersion();
             dsv1.setVersionState(DatasetVersion.VersionState.RELEASED);
             TermsOfUseAndAccess termsOfUseAndAccess = new TermsOfUseAndAccess();
-            termsOfUseAndAccess.setLicense(TermsOfUseAndAccess.License.NONE);
+            termsOfUseAndAccess.setLicense(null);
             termsOfUseAndAccess.setTermsOfUse("be excellent to each other");
             dsv1.setTermsOfUseAndAccess(termsOfUseAndAccess);
-            assertEquals(true, FileUtil.isDownloadPopupRequired(dsv1));
+            assertTrue(FileUtil.isDownloadPopupRequired(dsv1));
         }
 
         @Test
@@ -165,7 +136,7 @@ public void testIsDownloadPopupRequiredHasTermsOfAccess() {
             TermsOfUseAndAccess termsOfUseAndAccess = new TermsOfUseAndAccess();
             termsOfUseAndAccess.setTermsOfAccess("Terms of *Access* is different than Terms of Use");
             dsv1.setTermsOfUseAndAccess(termsOfUseAndAccess);
-            assertEquals(true, FileUtil.isDownloadPopupRequired(dsv1));
+            assertTrue(FileUtil.isDownloadPopupRequired(dsv1));
         }
 
         @Test
@@ -179,31 +150,34 @@ public void testIsDownloadPopupRequiredHasGuestBook() {
             dataset.setGuestbook(guestbook);
             Dataverse dataverse = new Dataverse();
             guestbook.setDataverse(dataverse);
-            assertEquals(true, FileUtil.isDownloadPopupRequired(datasetVersion));
+            assertTrue(FileUtil.isDownloadPopupRequired(datasetVersion));
         }
 
         @Test
         public void testIsPubliclyDownloadable() {
-            assertEquals(false, FileUtil.isPubliclyDownloadable(null));
+            assertFalse(FileUtil.isPubliclyDownloadable(null));
 
             FileMetadata restrictedFileMetadata = new FileMetadata();
             restrictedFileMetadata.setRestricted(true);
-            assertEquals(false, FileUtil.isPubliclyDownloadable(restrictedFileMetadata));
+            restrictedFileMetadata.setDataFile(new DataFile());
+            assertFalse(FileUtil.isPubliclyDownloadable(restrictedFileMetadata));
 
             FileMetadata nonRestrictedFileMetadata = new FileMetadata();
+            nonRestrictedFileMetadata.setDataFile(new DataFile());
             DatasetVersion dsv = new DatasetVersion();
             dsv.setVersionState(DatasetVersion.VersionState.RELEASED);
             nonRestrictedFileMetadata.setDatasetVersion(dsv);
             Dataset dataset = new Dataset();
             dsv.setDataset(dataset);
             nonRestrictedFileMetadata.setRestricted(false);
-            assertEquals(true, FileUtil.isPubliclyDownloadable(nonRestrictedFileMetadata));
+            assertTrue(FileUtil.isPubliclyDownloadable(nonRestrictedFileMetadata));
         }
 
         @Test
         public void testIsPubliclyDownloadable2() {
 
             FileMetadata nonRestrictedFileMetadata = new FileMetadata();
+            nonRestrictedFileMetadata.setDataFile(new DataFile());
             DatasetVersion dsv = new DatasetVersion();
             TermsOfUseAndAccess termsOfUseAndAccess = new TermsOfUseAndAccess();
             termsOfUseAndAccess.setTermsOfUse("be excellent to each other");
@@ -213,7 +187,61 @@ public void testIsPubliclyDownloadable2() {
             Dataset dataset = new Dataset();
             dsv.setDataset(dataset);
             nonRestrictedFileMetadata.setRestricted(false);
-            assertEquals(false, FileUtil.isPubliclyDownloadable(nonRestrictedFileMetadata));
+            assertFalse(FileUtil.isPubliclyDownloadable(nonRestrictedFileMetadata));
+        }
+
+        @Test
+        public void testIsPubliclyDownloadable3() {
+
+            FileMetadata embargoedFileMetadata = new FileMetadata();
+            DataFile df = new DataFile();
+            Embargo e = new Embargo();
+            e.setDateAvailable(LocalDate.now().plusDays(4) );
+            df.setEmbargo(e);
+            embargoedFileMetadata.setDataFile(df);
+            DatasetVersion dsv = new DatasetVersion();
+            dsv.setVersionState(DatasetVersion.VersionState.RELEASED);
+            embargoedFileMetadata.setDatasetVersion(dsv);
+            Dataset dataset = new Dataset();
+            dsv.setDataset(dataset);
+            embargoedFileMetadata.setRestricted(false);
+            assertFalse(FileUtil.isPubliclyDownloadable(embargoedFileMetadata));
+        }
+
+        @Test
+        public void testIsPubliclyDownloadable4() {
+
+            FileMetadata retentionFileMetadata = new FileMetadata();
+            DataFile df = new DataFile();
+            Retention r = new Retention();
+            r.setDateUnavailable(LocalDate.now().minusDays(1) );
+            df.setRetention(r);
+            retentionFileMetadata.setDataFile(df);
+            DatasetVersion dsv = new DatasetVersion();
+            dsv.setVersionState(DatasetVersion.VersionState.RELEASED);
+            retentionFileMetadata.setDatasetVersion(dsv);
+            Dataset dataset = new Dataset();
+            dsv.setDataset(dataset);
+            retentionFileMetadata.setRestricted(false);
+            assertFalse(FileUtil.isPubliclyDownloadable(retentionFileMetadata));
+        }
+
+        @Test
+        public void testIsPubliclyDownloadable5() {
+
+            FileMetadata retentionFileMetadata = new FileMetadata();
+            DataFile df = new DataFile();
+            Retention r = new Retention();
+            r.setDateUnavailable(LocalDate.now());
+            df.setRetention(r);
+            retentionFileMetadata.setDataFile(df);
+            DatasetVersion dsv = new DatasetVersion();
+            dsv.setVersionState(DatasetVersion.VersionState.RELEASED);
+            retentionFileMetadata.setDatasetVersion(dsv);
+            Dataset dataset = new Dataset();
+            dsv.setDataset(dataset);
+            retentionFileMetadata.setRestricted(false);
+            assertTrue(FileUtil.isPubliclyDownloadable(retentionFileMetadata));
         }
 
         @Test
@@ -235,7 +263,7 @@ public void testgetFileDownloadUrl() {
 
         @Test
         public void testGetPublicDownloadUrl() {
-            assertEquals(null, FileUtil.getPublicDownloadUrl(null, null, null));
+            assertNull(FileUtil.getPublicDownloadUrl(null, null, null));
             assertEquals("https://demo.dataverse.org/api/access/datafile/:persistentId?persistentId=doi:10.5072/FK2/TLU3EP", FileUtil.getPublicDownloadUrl("https://demo.dataverse.org", "doi:10.5072/FK2/TLU3EP", 33L)); //pid before fileId
             assertEquals("https://demo.dataverse.org/api/access/datafile/:persistentId?persistentId=doi:10.5072/FK2/TLU3EP", FileUtil.getPublicDownloadUrl("https://demo.dataverse.org", "doi:10.5072/FK2/TLU3EP", null));
             assertEquals("https://demo.dataverse.org/api/access/datafile/33", FileUtil.getPublicDownloadUrl("https://demo.dataverse.org", null, 33L)); //pid before fileId
@@ -266,7 +294,7 @@ public void testRescaleImage() throws IOException {
         }*/
 
         @Test
-        public void testDetermineFileType() {
+        public void testDetermineFileTypeByExtension() {
             File file = new File("src/main/webapp/resources/images/cc0.png");
             if (file.exists()) {
                 try {
@@ -278,6 +306,44 @@ public void testDetermineFileType() {
                 fail("File does not exist: " + file.toPath().toString());
             }
         }
+        
+        @Test
+        public void testDetermineFileTypeFromName() {
+            //Verify that name of the local file isn't used in determining the type (as we often use *.tmp when the real name has a different extension)
+            try {
+                File file = File.createTempFile("empty", "png");
+                assertEquals("text/plain", FileUtil.determineFileType(file, "something.txt"));
+            } catch (IOException ex) {
+                Logger.getLogger(FileUtilTest.class.getName()).log(Level.SEVERE, null, ex);
+            }
+
+        }
+
+        @Test
+        public void testDetermineFileTypeByName() {
+            File file = new File("src/test/resources/fileutil/Makefile");
+            if (file.exists()) {
+                try {
+                    assertEquals("text/x-makefile", FileUtil.determineFileType(file, "Makefile"));
+                } catch (IOException ex) {
+                    Logger.getLogger(FileUtilTest.class.getName()).log(Level.SEVERE, null, ex);
+                }
+            } else {
+                fail("File does not exist: " + file.toPath().toString());
+            }
+        }
+        
+        @Test
+        public void testDetermineFileTypeFromNameLocalFile() {
+            //Verify that name of the local file isn't used in determining the type (as we often use *.tmp when the real name has a different extension)
+            try {
+                File file = File.createTempFile("empty", "png");
+                assertEquals("text/plain", FileUtil.determineFileType(file, "something.txt"));
+            } catch (IOException ex) {
+                Logger.getLogger(FileUtilTest.class.getName()).log(Level.SEVERE, null, ex);
+            }
+
+        }
 
         // isThumbnailSuppported() has been moved from DataFileService to FileUtil:
         /**
@@ -298,4 +364,81 @@ public void testIsThumbnailSupported() throws Exception {
             assertFalse(FileUtil.isThumbnailSupported(filewBogusContentType));
         }
     }
+
+    @Test
+    public void testNetcdfFile() throws IOException {
+        // We got madis-raob.nc from https://www.unidata.ucar.edu/software/netcdf/examples/files.html
+        // and named it "madis-raob" with no file extension for this test.
+        String path = "src/test/resources/netcdf/";
+        String pathAndFile = path + "madis-raob";
+        File file = new File(pathAndFile);
+        String contentType = FileUtil.determineFileType(file, pathAndFile);
+        assertEquals("application/netcdf", contentType);
+    }
+
+    @Test
+    public void testHdf5File() throws IOException {
+        // We got vlen_string_dset.h5 from https://github.com/h5py/h5py/blob/3.7.0/h5py/tests/data_files/vlen_string_dset.h5
+        // and named in "vlen_string_dset" with no file extension for this test.
+        String path = "src/test/resources/hdf/hdf5/";
+        String pathAndFile = path + "vlen_string_dset";
+        File file = new File(pathAndFile);
+        String contentType = FileUtil.determineFileType(file, pathAndFile);
+        assertEquals("application/x-hdf5", contentType);
+    }
+
+    @Test
+    public void testHdf4File() throws IOException {
+        // We got test.hdf from https://people.sc.fsu.edu/~jburkardt/data/hdf/hdf.html
+        // and named in "hdf4test" with no file extension for this test.
+        // HDF4 is the old format, the previous generation before HDF5.
+        // We can't detect it based on its content.
+        String path = "src/test/resources/hdf/hdf4/";
+        String pathAndFile = path + "hdf4test";
+        File file = new File(pathAndFile);
+        String contentType = FileUtil.determineFileType(file, pathAndFile);
+        assertEquals("application/octet-stream", contentType);
+    }
+
+    @Test
+    public void testGZipFile() throws IOException {
+        String path = "src/test/resources/fits/";
+        String pathAndFile = path + "FOSy19g0309t_c2f.fits.gz";
+        File file = new File(pathAndFile);
+        String contentType = FileUtil.determineFileType(file, pathAndFile);
+        assertEquals("application/fits-gzipped", contentType);
+    }
+
+    @Test
+    public void testDetermineFileTypeROCrate() {
+        final String roCrateContentType = "application/ld+json; profile=\"http://www.w3.org/ns/json-ld#flattened http://www.w3.org/ns/json-ld#compacted https://w3id.org/ro/crate\"";
+        final DataFile rocrate = new DataFile(roCrateContentType);
+        
+        assertEquals(roCrateContentType, rocrate.getContentType());
+        assertEquals("RO-Crate metadata", FileUtil.getUserFriendlyFileType(rocrate));
+        assertEquals("Metadata", FileUtil.getIndexableFacetFileType(rocrate));
+
+        final File roCrateFile = new File("src/test/resources/fileutil/ro-crate-metadata.json");
+        try {
+            assertEquals(roCrateContentType, FileUtil.determineFileType(roCrateFile, "ro-crate-metadata.json"));
+        } catch (IOException ex) {
+            fail(ex);
+        }
+
+        // test ";" removal
+        final String dockerFileWithProfile = "application/x-docker-file; profile=\"http://www.w3.org/ns/json-ld#flattened http://www.w3.org/ns/json-ld#compacted https://w3id.org/ro/crate\"";
+        final DataFile dockerDataFile = new DataFile(dockerFileWithProfile);
+        
+        assertEquals(dockerFileWithProfile, dockerDataFile.getContentType());
+        assertEquals("Docker Image File", FileUtil.getUserFriendlyFileType(dockerDataFile));
+        assertEquals("Code", FileUtil.getIndexableFacetFileType(dockerDataFile));
+    }
+
+    @Test
+    public void testSanitizeFileName() {
+        assertEquals(null, FileUtil.sanitizeFileName(null));
+        assertEquals("with_space", FileUtil.sanitizeFileName("with space"));
+        assertEquals("withcomma", FileUtil.sanitizeFileName("with,comma"));
+        assertEquals("with.txt", FileUtil.sanitizeFileName("with,\\?:;,.txt"));
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/FirstNameTest.java b/src/test/java/edu/harvard/iq/dataverse/util/FirstNameTest.java
similarity index 92%
rename from src/test/java/edu/harvard/iq/dataverse/export/FirstNameTest.java
rename to src/test/java/edu/harvard/iq/dataverse/util/FirstNameTest.java
index 1b935b0406e..1925094a2d8 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/FirstNameTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/FirstNameTest.java
@@ -1,8 +1,8 @@
-package edu.harvard.iq.dataverse.export;
+package edu.harvard.iq.dataverse.util;
 
-import edu.harvard.iq.dataverse.export.openaire.FirstNames;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/JhoveFileTypeTest.java b/src/test/java/edu/harvard/iq/dataverse/util/JhoveFileTypeTest.java
index 88a8d24c772..879c4bc1c4e 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/JhoveFileTypeTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/JhoveFileTypeTest.java
@@ -5,10 +5,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.commons.io.FileUtils;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class JhoveFileTypeTest {
 
@@ -24,7 +24,7 @@ public class JhoveFileTypeTest {
     static File ico;
     static File ipynb;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
         System.setProperty("com.sun.aas.instanceRoot", baseDirForConfigFiles);
         jhoveFileType = new JhoveFileType();
@@ -41,7 +41,7 @@ public static void setUpClass() {
         ipynb = new File("src/test/java/edu/harvard/iq/dataverse/util/irc-metrics.ipynb");
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
         // SiteMapUtilTest relies on com.sun.aas.instanceRoot being null.
         System.clearProperty("com.sun.aas.instanceRoot");
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/JsfHelperTest.java b/src/test/java/edu/harvard/iq/dataverse/util/JsfHelperTest.java
index 545d3b1a31f..316b9c3a2aa 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/JsfHelperTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/JsfHelperTest.java
@@ -4,72 +4,53 @@
 
 package edu.harvard.iq.dataverse.util;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-/**
- *
- * @author michael
- */
-@RunWith(Parameterized.class)
 public class JsfHelperTest {
 	
 	enum TestEnum { Lorem, Ipsum, Dolor, Sit, Amet }
 	
-	@BeforeClass
+	@BeforeAll
 	public static void setUpClass() {
 	}
 	
-	@AfterClass
+	@AfterAll
 	public static void tearDownClass() {
 	}
 	
-	@Before
+	@BeforeEach
 	public void setUp() {
 	}
 	
-	@After
+	@AfterEach
 	public void tearDown() {
 	}
-
-	public TestEnum inputEnum;
-	public String inputString;
-	public TestEnum defaultEnumValue;
 	
-	public JsfHelperTest(TestEnum inputEnum, String inputString, TestEnum defaultEnumValue) {
-		this.inputEnum = inputEnum;
-		this.inputString = inputString;
-		this.defaultEnumValue = defaultEnumValue;
-	}
-
-	@Parameters
-	public static Collection<Object[]> parameters() {
-		return Arrays.asList (
-			new Object[][] {
-				{ TestEnum.Lorem, "Lorem", TestEnum.Dolor },
-				{ TestEnum.Lorem, "Lorem   ", TestEnum.Dolor },
-				{ TestEnum.Dolor, null, TestEnum.Dolor },
-				{ TestEnum.Dolor, "THIS IS A BAD VALUE", TestEnum.Dolor },
-			}
+	static Stream<Arguments> parameters() {
+		return Stream.of(
+			Arguments.of(TestEnum.Lorem, "Lorem", TestEnum.Dolor),
+			Arguments.of(TestEnum.Lorem, "Lorem   ", TestEnum.Dolor),
+			Arguments.of(TestEnum.Dolor, null, TestEnum.Dolor),
+			Arguments.of(TestEnum.Dolor, "THIS IS A BAD VALUE", TestEnum.Dolor )
 		);
 	}
 
 	/**
 	 * Test of enumValue method, of class JsfHelper.
 	 */
-	@Test
-	public void testEnumValue() {
+	@ParameterizedTest
+	@MethodSource("parameters")
+	public void testEnumValue(TestEnum inputEnum, String inputString, TestEnum defaultEnumValue) {
 		System.out.println("enumValue");
 		JsfHelper instance = new JsfHelper();
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/LruCacheTest.java b/src/test/java/edu/harvard/iq/dataverse/util/LruCacheTest.java
index b7ecff4ed8b..697e4853c3f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/LruCacheTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/LruCacheTest.java
@@ -1,9 +1,10 @@
 package edu.harvard.iq.dataverse.util;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -13,12 +14,12 @@ public class LruCacheTest {
     
     LruCache<Long, String> sut;
     
-    @Before
+    @BeforeEach
     public void setUp() {
         sut = new LruCache<>();
     }
     
-    @After
+    @AfterEach
     public void tearDown() {
         sut = null;
     }
@@ -65,9 +66,9 @@ public void testLRU() {
         
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetMaxSizeWithException() {
-        sut.setMaxSize(0l);
+    @Test
+    void testSetMaxSizeWithException() {
+        assertThrows(IllegalArgumentException.class, () -> sut.setMaxSize(0l));
     }
 
     @Test
@@ -75,14 +76,14 @@ public void testInvalidateWholeCache() {
         // prepare cache
         Long key = 0l;
         String value = "x";
-        assertEquals("put value", value, sut.put(key, value));
-        assertEquals("get value", value, sut.get(key));
+        assertEquals(value, sut.put(key, value), "put value");
+        assertEquals(value, sut.get(key), "get value");
 
         // invalidate cache
         sut.invalidate();
 
         // verify invalidation
-        assertEquals("verify that value is no longer here", null, sut.get(key));
+        assertNull(sut.get(key), "verify that value is no longer here");
     }
 
     @Test
@@ -90,19 +91,19 @@ public void testInvalidateOneKeyOfCache() {
         // prepare cache
         Long key1 = 0l;
         String value1 = "x";
-        assertEquals("put value 1", value1, sut.put(key1, value1));
-        assertEquals("get value 1", value1, sut.get(key1));
+        assertEquals(value1, sut.put(key1, value1), "put value 1");
+        assertEquals(value1, sut.get(key1), "get value 1");
 
         Long key2 = 1l;
         String value2 = "y";
-        assertEquals("put value 2", value2, sut.put(key2, value2));
-        assertEquals("get value 2", value2, sut.get(key2));
+        assertEquals(value2, sut.put(key2, value2), "put value 2");
+        assertEquals(value2, sut.get(key2), "get value 2");
 
         // invalidate cache
         sut.invalidate(key1);
 
         // verify invalidation
-        assertEquals("verify that value 1 is no longer here", null, sut.get(key1));
-        assertEquals("verify that value 2 still exists", value2, sut.get(key2));
+        assertNull(sut.get(key1), "verify that value 1 is no longer here");
+        assertEquals(value2, sut.get(key2), "verify that value 2 still exists");
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/MailSessionProducerIT.java b/src/test/java/edu/harvard/iq/dataverse/util/MailSessionProducerIT.java
new file mode 100644
index 00000000000..6cfc55eb143
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/MailSessionProducerIT.java
@@ -0,0 +1,277 @@
+package edu.harvard.iq.dataverse.util;
+
+import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.MailServiceBean;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.branding.BrandingUtilTest;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import edu.harvard.iq.dataverse.util.testing.Tags;
+import io.restassured.RestAssured;
+import jakarta.mail.Session;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.Map;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * An integration test using a fake SMTP MTA to check for outgoing mails.
+ * LIMITATION: This test cannot possibly check if the production and injection of the session via CDI
+ *             works, as it is not running within a servlet container. This would require usage of Arquillian
+ *             or and end-to-end API test with a deployed application.
+ */
+
+@Tag(Tags.INTEGRATION_TEST)
+@Tag(Tags.USES_TESTCONTAINERS)
+@Testcontainers(disabledWithoutDocker = true)
+@ExtendWith(MockitoExtension.class)
+@LocalJvmSettings
+@JvmSetting(key = JvmSettings.SYSTEM_EMAIL, value = "test@test.com")
+class MailSessionProducerIT {
+    
+    private static final Integer PORT_SMTP = 1025;
+    private static final Integer PORT_HTTP = 1080;
+    
+    static SettingsServiceBean settingsServiceBean = Mockito.mock(SettingsServiceBean.class);;
+    static DataverseServiceBean dataverseServiceBean = Mockito.mock(DataverseServiceBean.class);;
+    
+    /**
+     * We need to reset the BrandingUtil mocks for every test, as we rely on them being set to default.
+     */
+    @BeforeAll
+    static void setUp() {
+        // Setup mocks behavior, inject as deps
+        BrandingUtil.injectServices(dataverseServiceBean, settingsServiceBean);
+    }
+    @AfterAll
+    static void tearDown() {
+        BrandingUtilTest.tearDownMocks();
+    }
+    
+    @Nested
+    @LocalJvmSettings
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, method = "tcSmtpHost", varArgs = "host")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, method = "tcSmtpPort", varArgs = "port")
+    class WithoutAuthentication {
+        @Container
+        static GenericContainer<?> maildev = new GenericContainer<>("maildev/maildev:2.1.0")
+            .withExposedPorts(PORT_HTTP, PORT_SMTP)
+            .waitingFor(Wait.forHttp("/").forPort(PORT_HTTP));
+        
+        static String tcSmtpHost() {
+            return maildev.getHost();
+        }
+        
+        static String tcSmtpPort() {
+            return maildev.getMappedPort(PORT_SMTP).toString();
+        }
+        
+        @BeforeAll
+        static void setup() {
+            RestAssured.baseURI = "http://" + tcSmtpHost();
+            RestAssured.port = maildev.getMappedPort(PORT_HTTP);
+        }
+        
+        @Test
+        void createSession() {
+            given().when().get("/email")
+                .then()
+                .statusCode(200)
+                .body("size()", is(0));
+            
+            // given
+            Session session = new MailSessionProducer().getSession();
+            MailServiceBean mailer = new MailServiceBean(session, settingsServiceBean);
+            
+            // when
+            boolean sent = mailer.sendSystemEmail("test@example.org", "Test", "Test", false);
+            
+            // then
+            assertTrue(sent);
+            //RestAssured.get("/email").body().prettyPrint();
+            given().when().get("/email")
+                .then()
+                .statusCode(200)
+                .body("size()", is(1))
+                .body("[0].subject", equalTo("Test"));
+        }
+        
+    }
+    
+    /*
+     * Self-signed certificate and key can be created using OpenSSL on the terminal:
+     * $ cd src/test/resources/mail
+     * $ openssl req -batch -x509 -new -days 3650 -config openssl.cnf -keyout key.pem -out cert.pem
+     *
+     * Note that you can edit the openssl.cnf file to adjust details of the certificate and key (or use CLI args).
+     */
+    @Nested
+    @LocalJvmSettings
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, method = "tcSmtpHost", varArgs = "host")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, method = "tcSmtpPort", varArgs = "port")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, varArgs = "ssl.enable", value = "true")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, varArgs = "ssl.trust", value = "*")
+    class WithSSLWithoutAuthentication {
+        @Container
+        static GenericContainer<?> maildev = new GenericContainer<>("maildev/maildev:2.1.0")
+            .withCopyFileToContainer(MountableFile.forClasspathResource("mail/cert.pem"), "/cert.pem")
+            .withCopyFileToContainer(MountableFile.forClasspathResource("mail/key.pem"), "/key.pem")
+            .withExposedPorts(PORT_HTTP, PORT_SMTP)
+            .withEnv(Map.of(
+                "MAILDEV_INCOMING_SECURE", "true",
+                "MAILDEV_INCOMING_CERT", "/cert.pem",
+                "MAILDEV_INCOMING_KEY", "/key.pem"
+            ))
+            .waitingFor(Wait.forHttp("/").forPort(PORT_HTTP));
+        
+        static String tcSmtpHost() {
+            return maildev.getHost();
+        }
+        
+        static String tcSmtpPort() {
+            return maildev.getMappedPort(PORT_SMTP).toString();
+        }
+        
+        @BeforeAll
+        static void setup() {
+            RestAssured.baseURI = "http://" + tcSmtpHost();
+            RestAssured.port = maildev.getMappedPort(PORT_HTTP);
+        }
+        
+        @Test
+        void createSession() {
+            given().when().get("/email")
+                .then()
+                .statusCode(200)
+                .body("size()", is(0));
+            
+            // given
+            Session session = new MailSessionProducer().getSession();
+            MailServiceBean mailer = new MailServiceBean(session, settingsServiceBean);
+            
+            // when
+            boolean sent = mailer.sendSystemEmail("test@example.org", "Test", "Test", false);
+            
+            // then
+            assertTrue(sent);
+            //RestAssured.get("/email").body().prettyPrint();
+            given().when().get("/email")
+                .then()
+                .statusCode(200)
+                .body("size()", is(1))
+                .body("[0].subject", equalTo("Test"));
+        }
+        
+    }
+    
+    static final String username = "testuser";
+    static final String password = "supersecret";
+    
+    @Nested
+    @LocalJvmSettings
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, method = "tcSmtpHost", varArgs = "host")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, method = "tcSmtpPort", varArgs = "port")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_AUTH, value = "yes")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_USER, value = username)
+    @JvmSetting(key = JvmSettings.MAIL_MTA_PASSWORD, value = password)
+    class WithAuthentication {
+        @Container
+        static GenericContainer<?> maildev = new GenericContainer<>("maildev/maildev:2.1.0")
+            .withExposedPorts(PORT_HTTP, PORT_SMTP)
+            .withEnv(Map.of(
+                "MAILDEV_INCOMING_USER", username,
+                "MAILDEV_INCOMING_PASS", password
+            ))
+            .waitingFor(Wait.forHttp("/").forPort(PORT_HTTP));
+        
+        static String tcSmtpHost() {
+            return maildev.getHost();
+        }
+        
+        static String tcSmtpPort() {
+            return maildev.getMappedPort(PORT_SMTP).toString();
+        }
+        
+        @BeforeAll
+        static void setup() {
+            RestAssured.baseURI = "http://" + tcSmtpHost();
+            RestAssured.port = maildev.getMappedPort(PORT_HTTP);
+        }
+        
+        @Test
+        void createSession() {
+            given().when().get("/email")
+                .then()
+                .statusCode(200)
+                .body("size()", is(0));
+            
+            // given
+            Session session = new MailSessionProducer().getSession();
+            MailServiceBean mailer = new MailServiceBean(session, settingsServiceBean);
+            
+            // when
+            boolean sent = mailer.sendSystemEmail("test@example.org", "Test", "Test", false);
+            
+            // then
+            assertTrue(sent);
+            //RestAssured.get("/email").body().prettyPrint();
+            given().when().get("/email")
+                .then()
+                .statusCode(200)
+                .body("size()", is(1))
+                .body("[0].subject", equalTo("Test"));
+        }
+        
+    }
+    
+    @Nested
+    @LocalJvmSettings
+    class InvalidConfiguration {
+        @Test
+        @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, value = "1234", varArgs = "invalid")
+        void invalidConfigItemsAreIgnoredOnSessionBuild() {
+            assertDoesNotThrow(() -> new MailSessionProducer().getSession());
+            
+            Session mailSession = new MailSessionProducer().getSession();
+            MailServiceBean mailer = new MailServiceBean(mailSession, settingsServiceBean);
+            assertFalse(mailer.sendSystemEmail("test@example.org", "Test", "Test", false));
+        }
+        
+        @Test
+        @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, value = "foobar", varArgs = "host")
+        void invalidHostnameIsFailingWhenSending() {
+            assertDoesNotThrow(() -> new MailSessionProducer().getSession());
+            
+            Session mailSession = new MailSessionProducer().getSession();
+            MailServiceBean mailer = new MailServiceBean(mailSession, settingsServiceBean);
+            assertFalse(mailer.sendSystemEmail("test@example.org", "Test", "Test", false));
+        }
+        
+        @Test
+        @JvmSetting(key = JvmSettings.MAIL_MTA_SETTING, varArgs = "port" , value = "foobar")
+        void invalidPortWithLetters() {
+            assertThrows(IllegalArgumentException.class, () -> new MailSessionProducer().getSession());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/MailUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/MailUtilTest.java
index 03a9f1f3a20..f9236ab8338 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/MailUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/MailUtilTest.java
@@ -1,21 +1,40 @@
 package edu.harvard.iq.dataverse.util;
 
+import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.UserNotification;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import org.junit.Before;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.junit.jupiter.api.BeforeEach;
+
+@ExtendWith(MockitoExtension.class)
+@TestMethodOrder(OrderAnnotation.class)
 public class MailUtilTest {
 
-    private String rootDataverseName;
     UserNotification userNotification = new UserNotification();
 
-    @Before
+    @Mock
+    DataverseServiceBean dataverseSvc;
+    @Mock
+    SettingsServiceBean settingsSvc;
+    
+    @BeforeEach
     public void setUp() {
-        rootDataverseName = "LibraScholar";
         userNotification = new UserNotification();
+
     }
 
+    /*
     @Test
     public void testParseSystemAddress() {
         assertEquals("support@librascholar.edu", MailUtil.parseSystemAddress("support@librascholar.edu").getAddress());
@@ -29,107 +48,107 @@ public void testParseSystemAddress() {
         assertEquals(null, MailUtil.parseSystemAddress("\"LibraScholar Support Team <support@librascholar.edu>"));
         assertEquals(null, MailUtil.parseSystemAddress("support1@dataverse.org, support@librascholar.edu"));
     }
+    */
 
     @Test
+    @Order(1)
     public void testSubjectCreateAccount() {
+        Mockito.when(settingsSvc.getValueForKey(SettingsServiceBean.Key.InstallationName)).thenReturn(null);
+        //And configure the mock DataverseService to pretend the root collection name is as shown
+        Mockito.when(dataverseSvc.getRootDataverseName()).thenReturn("LibraScholar");
+        BrandingUtil.injectServices(dataverseSvc, settingsSvc);
+
         userNotification.setType(UserNotification.Type.CREATEACC);
-        assertEquals("LibraScholar: Your account has been created", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Your account has been created", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
 
     @Test
     public void testSubjectAssignRole() {
         userNotification.setType(UserNotification.Type.ASSIGNROLE);
-        assertEquals("LibraScholar: You have been assigned a role", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: You have been assigned a role", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
 
     @Test
     public void testSubjectCreateDataverse() {
         userNotification.setType(UserNotification.Type.CREATEDV);
-        assertEquals("LibraScholar: Your dataverse has been created", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Your dataverse has been created", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
     
     @Test
     public void testSubjectRevokeRole() {
         userNotification.setType(UserNotification.Type.REVOKEROLE);
-        assertEquals("LibraScholar: Your role has been revoked", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Your role has been revoked", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
     
     @Test
     public void testSubjectRequestFileAccess() {
         userNotification.setType(UserNotification.Type.REQUESTFILEACCESS);
-        assertEquals("LibraScholar: Access has been requested for a restricted file", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        AuthenticatedUser requestor = new AuthenticatedUser();
+        requestor.setFirstName("Tom");
+        requestor.setLastName("Jones");
+        requestor.setUserIdentifier("TJ-1234");
+        userNotification.setRequestor(requestor);
+        assertEquals("LibraScholar: Tom Jones (@TJ-1234) requested access to dataset \"\"", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
     
     @Test
     public void testSubjectGrantFileAccess() {
         userNotification.setType(UserNotification.Type.GRANTFILEACCESS);
-        assertEquals("LibraScholar: You have been granted access to a restricted file", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: You have been granted access to a restricted file", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
     
     @Test
     public void testSubjectRejectFileAccess() {
         userNotification.setType(UserNotification.Type.REJECTFILEACCESS);
-        assertEquals("LibraScholar: Your request for access to a restricted file has been rejected", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
-    }
-    
-    @Test
-    public void testSubjectMapLayerUpdated() {
-        userNotification.setType(UserNotification.Type.MAPLAYERUPDATED);
-        assertEquals("LibraScholar: WorldMap layer added to dataset", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
-    }
-    
-    @Test
-    public void testSubjectMapLayerDeleteFailed() {
-        userNotification.setType(UserNotification.Type.MAPLAYERDELETEFAILED);
-        assertEquals("LibraScholar: Failed to delete WorldMap layer", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Your request for access to a restricted file has been rejected", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
-    
+
     @Test
     public void testSubjectCreateDataset() {
         userNotification.setType(UserNotification.Type.CREATEDS);
-        assertEquals("LibraScholar: Your dataset has been created", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Dataset \"\" has been created", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
     
     @Test
     public void testSubjectSubmittedDS() {
         userNotification.setType(UserNotification.Type.SUBMITTEDDS);
-        assertEquals("LibraScholar: Your dataset has been submitted for review", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Dataset \"\" has been submitted for review", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
     
     @Test
     public void testSubjectPublishedDS() {
         userNotification.setType(UserNotification.Type.PUBLISHEDDS);
-        assertEquals("LibraScholar: Your dataset has been published", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Dataset \"\" has been published", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
     
     @Test
     public void testSubjectReturnedDS() {
         userNotification.setType(UserNotification.Type.RETURNEDDS);
-        assertEquals("LibraScholar: Your dataset has been returned", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Dataset \"\" has been returned", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
     
     @Test
     public void testSubjectChecksumFail() {
         userNotification.setType(UserNotification.Type.CHECKSUMFAIL);
-        assertEquals("LibraScholar: Your upload failed checksum validation", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Your upload failed checksum validation", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
     
     @Test
     public void testSubjectFileSystemImport() {
         userNotification.setType(UserNotification.Type.FILESYSTEMIMPORT);
         //TODO SEK add a dataset version to get the Dataset Title which is actually used in the subject now
-        assertEquals("Dataset LibraScholar has been successfully uploaded and verified", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName , null));
+        assertEquals("Dataset LibraScholar has been successfully uploaded and verified", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
     
     @Test
     public void testSubjectChecksumImport() {
         userNotification.setType(UserNotification.Type.CHECKSUMIMPORT);
-        assertEquals("LibraScholar: Your file checksum job has completed", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Your file checksum job has completed", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
 
     @Test
     public void testSubjectConfirmEmail() {
         userNotification.setType(UserNotification.Type.CONFIRMEMAIL);
-        assertEquals("LibraScholar: Verify your email address", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName, null));
+        assertEquals("LibraScholar: Verify your email address", MailUtil.getSubjectTextBasedOnNotification(userNotification, null));
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/MarkupCheckerTest.java b/src/test/java/edu/harvard/iq/dataverse/util/MarkupCheckerTest.java
index 8d3f8115dc5..02219059db3 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/MarkupCheckerTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/MarkupCheckerTest.java
@@ -1,140 +1,86 @@
 package edu.harvard.iq.dataverse.util;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
-/**
- *
- * @author rmp553
- */
-public class MarkupCheckerTest {
-
-    public MarkupCheckerTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
-    private void msg(String s) {
-        System.out.println(s);
-    }
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-    private void msgu(String s) {
-        msg("--------------------------------------");
-        msg(s);
-    }
+public class MarkupCheckerTest {
 
     /**
      * Test of sanitizeBasicHTML method, of class MarkupChecker.
      */
-    @Test
-    public void testSanitizeBasicHTML() {
-        System.out.println("sanitizeBasicHTML");
-
-        /*String safeStr = "<img src=\"some/png.png\" alt=\"bee\" class=\"some-class\">";
-        String sanitized = MarkupChecker.sanitizeBasicHTML(safeStr);
-        this.msgu("safeStr: " + safeStr + "\nsanitized: " + sanitized);
-        assertTrue(safeStr.equals(sanitized));
-         */
-        String safeStr = "<script>alert('hi')</script>";
-        String sanitized = MarkupChecker.sanitizeBasicHTML(safeStr);
-        this.msgu("safeStr: " + safeStr + "\nsanitized: " + sanitized);
-        assertTrue(sanitized.equals(""));
-
-        String unsafeStr = "<map name=\"rtdcCO\">";
-        safeStr = "<map name=\"rtdcCO\"></map>";
-        sanitized = MarkupChecker.sanitizeBasicHTML(unsafeStr);
-        this.msgu("safeStr: " + safeStr + "\nsanitized: " + sanitized);
-        assertTrue(safeStr.equals(sanitized));
-
-        unsafeStr = "<area shape=\"rect\" coords=\"42,437,105,450\" href=\"/dvn/dv/rtdc/faces/study/StudyPage.xhtml?globalId=hdl:10904/10006\" title=\"Galactic Center (DHT02)\" alt=\"Galactic Center (DHT02)\">";
-        safeStr = unsafeStr;//"<map name=\"rtdcCO\"></map>";
-        sanitized = MarkupChecker.sanitizeBasicHTML(unsafeStr);
-        this.msgu("safeStr: " + safeStr + "\nsanitized: " + sanitized);
-        assertTrue(safeStr.equals(sanitized));
-
-        unsafeStr = "<map name=\"rtdcCO\"><area shape=\"rect\" coords=\"42,437,105,450\" href=\"/dvn/dv/rtdc/faces/study/StudyPage.xhtml?globalId=hdl:10904/10006\" title=\"Galactic Center (DHT02)\" alt=\"Galactic Center (DHT02)\"></map>";
-        safeStr = unsafeStr;//"<map name=\"rtdcCO\"></map>";
-        sanitized = MarkupChecker.sanitizeBasicHTML(unsafeStr);
-        this.msgu("safeStr: " + safeStr + "\nsanitized: " + sanitized);
-        assertTrue(safeStr.equals(sanitized));
-
-        unsafeStr = "<p>hello</";
-        safeStr = "<p>hello&lt;/</p>";
-        sanitized = MarkupChecker.sanitizeBasicHTML(unsafeStr);
-        this.msgu("safeStr: " + safeStr + "\nsanitized: " + sanitized);
-        assertTrue(safeStr.equals(sanitized));
-
-        unsafeStr = "<h1>hello</h2>";
-        safeStr = "<h1>hello</h1>";
-        sanitized = MarkupChecker.sanitizeBasicHTML(unsafeStr);
-        this.msgu("safeStr: " + safeStr + "\nsanitized: " + sanitized);
-        assertTrue(safeStr.equals(sanitized));
-
-        unsafeStr = "the <a href=\"http://dataverse.org\" target=\"_blank\">Dataverse project</a> in a new window";
-        safeStr = "the \n<a href=\"http://dataverse.org\" target=\"_blank\" rel=\"nofollow\">Dataverse project</a> in a new window";
-        sanitized = MarkupChecker.sanitizeBasicHTML(unsafeStr);
-        this.msgu("safeStr: " + safeStr + "\nsanitized: " + sanitized);
-        assertTrue(safeStr.equals(sanitized));
-        
-        unsafeStr = "the <a href=\"http://dataverse.org\">Dataverse project</a> in a new window";
-        safeStr = "the \n<a href=\"http://dataverse.org\" rel=\"nofollow\" target=\"_blank\">Dataverse project</a> in a new window";
-        sanitized = MarkupChecker.sanitizeBasicHTML(unsafeStr);
-        this.msgu("safeStr: " + safeStr + "\nsanitized: " + sanitized);
-        assertTrue(safeStr.equals(sanitized));      
-        
-        //test null
-        unsafeStr = null;
-        sanitized = MarkupChecker.sanitizeBasicHTML(unsafeStr);
-        assertNull(sanitized);
+    @ParameterizedTest
+    @CsvSource(value = {
+        "<script>alert('hi')</script>, ''",
+        "'<map name=\"rtdcCO\">', '<map name=\"rtdcCO\"></map>'",
+        // make sure we do not destroy the <area> tags
+        "'<area shape=\"rect\" coords=\"42,437,105,450\" href=\"/dvn/dv/rtdc/faces/study/StudyPage.xhtml?globalId=hdl:10904/10006\" title=\"Galactic Center (DHT02)\" alt=\"Galactic Center (DHT02)\">', '<area shape=\"rect\" coords=\"42,437,105,450\" href=\"/dvn/dv/rtdc/faces/study/StudyPage.xhtml?globalId=hdl:10904/10006\" title=\"Galactic Center (DHT02)\" alt=\"Galactic Center (DHT02)\">'",
+        // make sure we do not destroy the <map> tags
+        "'<map name=\"rtdcCO\"><area shape=\"rect\" coords=\"42,437,105,450\" href=\"/dvn/dv/rtdc/faces/study/StudyPage.xhtml?globalId=hdl:10904/10006\" title=\"Galactic Center (DHT02)\" alt=\"Galactic Center (DHT02)\"></map>', '<map name=\"rtdcCO\"><area shape=\"rect\" coords=\"42,437,105,450\" href=\"/dvn/dv/rtdc/faces/study/StudyPage.xhtml?globalId=hdl:10904/10006\" title=\"Galactic Center (DHT02)\" alt=\"Galactic Center (DHT02)\"></map>'",
+        "'<p>hello</', '<p>hello&lt;/</p>'",
+        "'<h1>hello</h2>', '<h1>hello</h1>'",
+        "'the <a href=\"http://dataverse.org\" target=\"_blank\">Dataverse project</a> in a new window', 'the <a href=\"http://dataverse.org\" target=\"_blank\" rel=\"nofollow\">Dataverse project</a> in a new window'",
+        "'the <a href=\"http://dataverse.org\">Dataverse project</a> in a new window', 'the <a href=\"http://dataverse.org\" rel=\"nofollow\" target=\"_blank\">Dataverse project</a> in a new window'",
+        // make sure we keep text as it is when it is not html
+        "'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.'",
+        "NULL, NULL"
+    }, nullValues = {"NULL"})
+    public void testSanitizeBasicHTML(String unsafe, String safe) {
+        assertEquals(safe, MarkupChecker.sanitizeBasicHTML(unsafe));
+    }
 
+    /**
+     * Test of sanitizeAdvancedHTML method, of class MarkupChecker.
+     */
+    @ParameterizedTest
+    @CsvSource(value = {
+        "<script>alert('hi')</script>, ''",
+        "'<map name=\"rtdcCO\">', '<map name=\"rtdcCO\"></map>'",
+        // make sure we do not destroy the <area> tags
+        "'<area shape=\"rect\" coords=\"42,437,105,450\" href=\"/dvn/dv/rtdc/faces/study/StudyPage.xhtml?globalId=hdl:10904/10006\" title=\"Galactic Center (DHT02)\" alt=\"Galactic Center (DHT02)\">', '<area shape=\"rect\" coords=\"42,437,105,450\" href=\"/dvn/dv/rtdc/faces/study/StudyPage.xhtml?globalId=hdl:10904/10006\" title=\"Galactic Center (DHT02)\" alt=\"Galactic Center (DHT02)\">'",
+        // make sure we do not destroy the <map> tags
+        "'<map name=\"rtdcCO\"><area shape=\"rect\" coords=\"42,437,105,450\" href=\"/dvn/dv/rtdc/faces/study/StudyPage.xhtml?globalId=hdl:10904/10006\" title=\"Galactic Center (DHT02)\" alt=\"Galactic Center (DHT02)\"></map>', '<map name=\"rtdcCO\"><area shape=\"rect\" coords=\"42,437,105,450\" href=\"/dvn/dv/rtdc/faces/study/StudyPage.xhtml?globalId=hdl:10904/10006\" title=\"Galactic Center (DHT02)\" alt=\"Galactic Center (DHT02)\"></map>'",
+        "'<p>hello</', '<p>hello&lt;/</p>'",
+        "'<h1>hello</h2>', '<h1>hello</h1>'",
+        // make sure we keep text as it is when it is not html
+        "'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.'",
+        // Should add noopener noreferrer attributes to <a> tags and keep classes
+        "'<h1 class=\"rte-heading\">A title</h1><p class=\"rte-paragraph\">Lorem ipsum<strong class=\"rte-bold\">test</strong><a target=\"_blank\" class=\"rte-link\" href=\"https://test.com\">link</a></p>', '<h1 class=\"rte-heading\">A title</h1><p class=\"rte-paragraph\">Lorem ipsum<strong class=\"rte-bold\">test</strong><a target=\"_blank\" class=\"rte-link\" href=\"https://test.com\" rel=\"noopener noreferrer nofollow\">link</a></p>'",
+        "NULL, NULL"
+    }, nullValues = {"NULL"})
+    public void testSanitizeAdvancedHTML(String unsafe, String safe) {
+        String sanitizedOutput = MarkupChecker.sanitizeAdvancedHTML(unsafe);
+
+        // Normalize both the expected and actual content by removing whitespaces
+
+        String normalizedSafe = null;
+        if (safe != null) {
+            normalizedSafe = safe.replaceAll("\\s+", "").trim();
+        }
+
+        String normalizedOutput = null;
+        if (sanitizedOutput != null) {
+            normalizedOutput = sanitizedOutput.replaceAll("\\s+", "").trim();
+        }
+
+        assertEquals(normalizedSafe, normalizedOutput);
     }
 
     /**
      * Test of stripAllTags method, of class MarkupChecker.
      */
-    @Test
-    public void testStripAllTags() {
-
-        System.out.println("stripAllTags");
-        String unsafe = "";
-        String expResult = "";
-        String result = MarkupChecker.stripAllTags(unsafe);
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-
-        //test null
-        unsafe = null;
-        result = MarkupChecker.stripAllTags(unsafe);
-        assertNull(result);
-
-        unsafe = "Johnson & Johnson <>";
-        expResult = "Johnson & Johnson <>";
-        result = MarkupChecker.stripAllTags(unsafe);
-        assertEquals(expResult, result);
-
-        unsafe = "Johnson && Johnson <&>&";
-        expResult = "Johnson && Johnson <&>&";
-        result = MarkupChecker.stripAllTags(unsafe);
-        assertEquals(expResult, result);
-
+    @ParameterizedTest
+    @CsvSource(value = {
+        "'', ''",
+        "NULL, NULL",
+        "Johnson & Johnson <>, Johnson & Johnson <>",
+        "<p>Johnson & Johnson</p>, Johnson & Johnson",
+        "Johnson && Johnson <&>&, Johnson && Johnson <&>&"
+    }, nullValues = {"NULL"})
+    public void testStripAllTags(String unsafe, String safe) {
+        assertEquals(safe, MarkupChecker.stripAllTags(unsafe));
     }
     
     /**
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/MockResponse.java b/src/test/java/edu/harvard/iq/dataverse/util/MockResponse.java
index 0584c6161f1..8d5b4940c14 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/MockResponse.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/MockResponse.java
@@ -7,14 +7,14 @@
 import java.util.Map;
 import java.util.Set;
 import static java.util.stream.Collectors.toList;
-import javax.ws.rs.core.EntityTag;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Link;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.EntityTag;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Link;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Simple mock class for HTTP response. This is needed as the normal response builders
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/OrganizationsTest.java b/src/test/java/edu/harvard/iq/dataverse/util/OrganizationsTest.java
similarity index 94%
rename from src/test/java/edu/harvard/iq/dataverse/export/OrganizationsTest.java
rename to src/test/java/edu/harvard/iq/dataverse/util/OrganizationsTest.java
index 2552e217cef..fb6a8e14fcd 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/OrganizationsTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/OrganizationsTest.java
@@ -1,8 +1,8 @@
-package edu.harvard.iq.dataverse.export;
+package edu.harvard.iq.dataverse.util;
 
-import edu.harvard.iq.dataverse.export.openaire.Organizations;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/PersonOrOrgUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/PersonOrOrgUtilTest.java
new file mode 100644
index 00000000000..ea0c9756418
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/PersonOrOrgUtilTest.java
@@ -0,0 +1,141 @@
+package edu.harvard.iq.dataverse.util;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+import jakarta.json.JsonObject;
+
+@LocalJvmSettings
+public class PersonOrOrgUtilTest {
+
+        public PersonOrOrgUtilTest() {
+        }
+        
+        @Test
+        public void testOrganizationSimpleName() {
+            verifyIsOrganization("IBM");
+            verifyIsOrganization("Harvard University");
+        }
+
+        @Test
+        public void testOrganizationCOMPLEXName() {
+            verifyIsOrganization("The Institute for Quantitative Social Science");
+            verifyIsOrganization("Council on Aging");
+            verifyIsOrganization("The Ford Foundation");
+            verifyIsOrganization("United Nations Economic and Social Commission for Asia and the Pacific (UNESCAP)");
+            verifyIsOrganization("Michael J. Fox Foundation for Parkinson's Research");
+            // The next examples are known to be asserted to be a Person without an entry in the OrgWordArray
+            // So we test when no array is set via JvmSetting to verify the problem still exists in
+            // the underlying algorithm
+            JsonObject obj = PersonOrOrgUtil.getPersonOrOrganization("Portable Antiquities of the Netherlands", false, false);
+            assertTrue(obj.getBoolean("isPerson"));
+            JsonObject obj2 = PersonOrOrgUtil.getPersonOrOrganization("Max Mustermann GmbH", false, false);
+            assertTrue(obj2.getBoolean("isPerson"));
+        }
+
+        @Test
+        public void testOrganizationWithOrgPhraseArray() {
+            PersonOrOrgUtil.setOrgPhraseArray(new String[]{"Portable", "GmbH"});
+            // The next examples are known to be asserted to be a Person without an entry in the OrgWordArray
+            // So we test with the array set via JvmSetting to verify the array works
+            verifyIsOrganization("Portable Antiquities of the Netherlands");
+            verifyIsOrganization("Max Mustermann GmbH");
+            PersonOrOrgUtil.setOrgPhraseArray(null);
+        }
+
+        @Test
+        public void testOrganizationAcademicName() {
+            verifyIsOrganization("John Smith Center");
+            verifyIsOrganization("John Smith Group");
+            // An example the base algorithm doesn't handle:
+            JsonObject obj = PersonOrOrgUtil.getPersonOrOrganization("John Smith Project", false, false);
+            assertTrue(obj.getBoolean("isPerson"));
+        }
+
+        @Test
+        public void testOrganizationAcademicNameWithAssumeComma() {
+            PersonOrOrgUtil.setAssumeCommaInPersonName(true);
+            verifyIsOrganization("John Smith Center");
+            verifyIsOrganization("John Smith Group");
+            verifyIsOrganization("John Smith Project");
+            PersonOrOrgUtil.setAssumeCommaInPersonName(false);
+        }
+
+        
+        @Test
+        public void testOrganizationCommaOrDash() {
+            verifyIsOrganization("Digital Archive of Massachusetts Anti-Slavery and Anti-Segregation Petitions, Massachusetts Archives, Boston MA");
+            verifyIsOrganization("U.S. Department of Commerce, Bureau of the Census, Geography Division");
+            verifyIsOrganization("Harvard Map Collection, Harvard College Library");
+            verifyIsOrganization("Geographic Data Technology, Inc. (GDT)");
+        }
+
+        @Disabled
+        @Test
+        public void testOrganizationES() {
+            //Spanish recognition is not enabled - see export/Organization.java
+            verifyIsOrganization("CompaÃąÃ­a de San Fernando");
+        }
+        
+        /**
+         * Name is composed of:
+         * <First Names> <Family Name>
+         */
+        @Test
+        public void testName() {
+            verifyIsPerson("Jorge Mario Bergoglio", "Jorge Mario", "Bergoglio");
+            verifyIsPerson("Bergoglio", null, null);
+            verifyIsPerson("Francesco Cadili", "Francesco", "Cadili");
+            // This Philip Seymour Hoffman example is from ShibUtilTest.
+            verifyIsPerson("Philip Seymour Hoffman", "Philip Seymour", "Hoffman");
+
+            // test Smith (is also a name)
+            verifyIsPerson("John Smith", "John", "Smith");
+            // resolved using hint file
+            verifyIsPerson("Guido van Rossum", "Guido", "van Rossum");
+            // test only name
+            verifyIsPerson("Francesco", "Francesco", null);
+            // test only family name
+            verifyIsPerson("Cadili", null, null);
+            
+            verifyIsPerson("kcjim11, kcjim11", "kcjim11", "kcjim11");
+            
+            verifyIsPerson("Bartholomew 3, James", "James", "Bartholomew 3");
+            verifyIsPerson("Smith, ", null, "Smith");
+            verifyIsPerson("Smith,", null, "Smith");
+        }
+        
+        private void verifyIsOrganization(String fullName) {
+            JsonObject obj = PersonOrOrgUtil.getPersonOrOrganization(fullName, false, false);
+            System.out.println(JsonUtil.prettyPrint(obj));
+            assertEquals(obj.getString("fullName"),fullName);
+            assertFalse(obj.getBoolean("isPerson"));
+
+        }
+        
+        private void verifyIsPerson(String fullName, String givenName, String familyName) {
+            verifyIsPerson(fullName, givenName, familyName, false);
+        }
+        
+        private void verifyIsPerson(String fullName, String givenName, String familyName, boolean isPerson) {
+            JsonObject obj = PersonOrOrgUtil.getPersonOrOrganization(fullName, false, isPerson);
+            System.out.println(JsonUtil.prettyPrint(obj));
+            assertEquals(obj.getString("fullName"), StringUtil.normalize(fullName));
+            assertTrue(obj.getBoolean("isPerson"));
+            assertEquals(obj.containsKey("givenName"), givenName != null);
+            if(obj.containsKey("givenName") && givenName != null) {
+                assertEquals(obj.getString("givenName"),givenName);
+            }
+            assertEquals(obj.containsKey("familyName"), familyName != null);
+            if(obj.containsKey("familyName") && familyName != null) {
+                assertEquals(obj.getString("familyName"),familyName);
+            }
+        }
+
+    }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/StringUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/StringUtilTest.java
index ff505d2ff09..b00b4afca7d 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/StringUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/StringUtilTest.java
@@ -1,8 +1,8 @@
 package edu.harvard.iq.dataverse.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -10,267 +10,134 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
-
-/**
- *
- * @author michael
- */
-@RunWith(Enclosed.class)
-public class StringUtilTest {
-
-    public StringUtilTest() {
-    }
+class StringUtilTest {
     
-    @BeforeClass
-    public static void setUpClass() {
+    /**
+     * Test of isEmpty method, of class StringUtil.
+     */
+    @ParameterizedTest
+    @CsvSource(value = {
+        "false, a",
+        "true, NULL",
+        "true, ''",
+        "true, ' '",
+        "true, \t",
+        "true, \t \t \n"
+    }, nullValues = "NULL")
+    void testIsEmpty(boolean isValid, String inputString) {
+        assertEquals( isValid, StringUtil.isEmpty(inputString) );
     }
     
-    @AfterClass
-    public static void tearDownClass() {
+    /**
+     * Test of isAlphaNumeric method, of class StringUtil.
+     */
+    @ParameterizedTest
+    @CsvSource({
+        "true,abc",
+        "true,1230",
+        "true,1230abc",
+        "true,1230abcABC",
+        "false,1230abcABC#"
+    })
+    void testIsAlphaNumeric(boolean isValid, String inputString) {
+        assertEquals(isValid, StringUtil.isAlphaNumeric(inputString) );
     }
     
-    @Before
-    public void setUp() {
+    /**
+     * Test of isAlphaNumericChar method, of class StringUtil.
+     */
+    @ParameterizedTest
+    @CsvSource({
+        "true,'a'",
+        "true,'f'",
+        "true,'z'",
+        "true,'0'",
+        "true,'1'",
+        "true,'9'",
+        "true,'A'",
+        "true,'G'",
+        "true,'Z'",
+        "false,'@'"
+    })
+    void testIsAlphaNumericChar(boolean isValid, char inputChar) {
+        assertEquals(isValid, StringUtil.isAlphaNumericChar(inputChar) );
     }
     
-    @After
-    public void tearDown() {
-    }
-
-    @RunWith(Parameterized.class)
-    public static class TestIsEmpty {
-
-        public boolean isValid;
-        public String inputString;
+    @ParameterizedTest
+    @CsvSource(value = {
+        // interface-based partitioning
+        "NULL, NULL, NULL",
+        "NULL, '', NULL",
+        "NULL, d, NULL",
         
-        public TestIsEmpty(boolean isValid, String inputString) {
-            this.isValid = isValid;
-            this.inputString = inputString;
-        }
-
-        @Parameters
-        public static Collection<Object[]> parameters() {
-            return Arrays.asList(
-                    new Object[][] { 
-                        { true, null },
-                        { true, "" },
-                        { true, " " },
-                        { true, "\t" },
-                        { true, "\t \t \n" },
-                        { false, "a" },
-                    }
-            );
-        }
-
-        /**
-         * Test of isEmpty method, of class StringUtil.
-         */
-        @Test
-        public void testIsEmpty() {
-            assertEquals( isValid, StringUtil.isEmpty(inputString) );
-        }
-    }
-
-    @RunWith(Parameterized.class)
-    public static class TestIsAlphaNumeric {
-
-        public boolean isValid;
-        public String inputString;
+        "'', NULL, ''",
+        "'', '', ''",
+        "'', abcdfg, ''",
         
-        public TestIsAlphaNumeric(boolean isValid, String inputString) {
-            this.isValid = isValid;
-            this.inputString = inputString;
-        }
-
-        @Parameters
-        public static Collection<Object[]> parameters() {
-            return Arrays.asList(
-                    new Object[][] { 
-                        { true, "abc" },
-                        { true, "1230" },
-                        { true, "1230abc" },
-                        { true, "1230abcABC" },
-                        { false, "1230abcABC#" },
-                    }
-            );
-        }
-
-        /**
-         * Test of isAlphaNumeric method, of class StringUtil.
-         */
-        @Test
-        public void testIsAlphaNumeric() {
-            assertEquals( isValid, StringUtil.isAlphaNumeric(inputString) );
-        }
-    }
-
-    @RunWith(Parameterized.class)
-    public static class TestIsAlphaNumericChar {
-
-        public boolean isValid;
-        public char inputChar;
+        "abcdfg, NULL, ''",
+        "abcdfg, '', ''",
+        "abcdfg, d, dfg",
         
-        public TestIsAlphaNumericChar(boolean isValid, char inputChar) {
-            this.isValid = isValid;
-            this.inputChar = inputChar;
-        }
-
-        @Parameters
-        public static Collection<Object[]> parameters() {
-            return Arrays.asList(
-                    new Object[][] { 
-                        { true, 'a' },
-                        { true, 'f' },
-                        { true, 'z' },
-                        { true, '0' },
-                        { true, '1' },
-                        { true, '9' },
-                        { true, 'A' },
-                        { true, 'G' },
-                        { true, 'Z' },
-                        { false, '@' },
-                    }
-            );
-        }
-
-        /**
-         * Test of isAlphaNumericChar method, of class StringUtil.
-         */
-        @Test
-        public void testIsAlphaNumericChar() {
-            assertEquals( isValid, StringUtil.isAlphaNumericChar(inputChar) );
-        }
+        // functionality-based partitioning
+        "abcdfg, NULL, ''",
+        "abcdfg, h, ''",
+        "abcdfg, b, bcdfg"
+    }, nullValues = "NULL")
+    void testSubstringIncludingLast(String str, String separator, String expectedString) {
+        assertEquals( expectedString, StringUtil.substringIncludingLast(str, separator) );
     }
 
-    @RunWith(Parameterized.class)
-    public static class TestSubstringIncludingLast {
-
-        public String str;
-        public String separator;
-        public String expectedString;
-        
-        public TestSubstringIncludingLast(String str, String separator, String expectedString) {
-            this.str = str;
-            this.separator = separator;
-            this.expectedString = expectedString;
-        }
-
-        @Parameters
-        public static Collection<Object[]> parameters() {
-            return Arrays.asList(
-                    new Object[][] { 
-                        // interface-based partitioning
-                        {null, null, null},
-                        {null, "", null},
-                        {null, "d", null},
-
-                        {"", null, ""},
-                        {"", "", ""},
-                        {"", "abcdfg", ""},
-
-                        {"abcdfg", null, ""},
-                        {"abcdfg", "", ""},
-                        {"abcdfg", "d", "dfg"},
-
-                        // functionality-based partitioning
-                        {"abcdfg" , null, ""},
-                        {"abcdfg", "h", ""},
-                        {"abcdfg", "b", "bcdfg"},
-                    }
-            );
-        }
-
-        @Test
-        public void testSubstringIncludingLast() {
-            assertEquals( expectedString, StringUtil.substringIncludingLast(str, separator) );
-        }
+    static Stream<Arguments> toOptionData() {
+        return Stream.of(
+            Arguments.of(Optional.empty(), null),
+            Arguments.of(Optional.empty(), ""),
+            Arguments.of(Optional.of("leadingWhitespace"), "    leadingWhitespace"),
+            Arguments.of(Optional.of("trailingWhiteSpace"), "trailingWhiteSpace    "),
+            Arguments.of(Optional.of("someString"), "someString"),
+            Arguments.of(Optional.of("some string with spaces"), "some string with spaces")
+        );
     }
-
-    @RunWith(Parameterized.class)
-    public static class TestToOption {
-
-        public String inputString;
-        public Optional<String> expected;
-
-        public TestToOption(String inputString, Optional<String> expected) {
-            this.inputString = inputString;
-            this.expected = expected;
-        }
-
-        @Parameters
-        public static Collection<Object[]> parameters() {
-            return Arrays.asList(
-                    new Object[][] { 
-                        {null, Optional.empty()},
-                        {"", Optional.empty()},
-                        {"    leadingWhitespace", Optional.of("leadingWhitespace")},
-                        {"trailingWhiteSpace    ", Optional.of("trailingWhiteSpace")},
-                        {"someString", Optional.of("someString")},
-                        {"some string with spaces", Optional.of("some string with spaces")}
-                    }
-            );
-        }
-
-        @Test
-        public void testToOption() {
-            assertEquals(expected, StringUtil.toOption(inputString));
-        }
+    
+    @ParameterizedTest
+    @MethodSource("toOptionData")
+    void testToOption(Optional<String> expected, String inputString) {
+        assertEquals(expected, StringUtil.toOption(inputString));
     }
-
-    @RunWith(Parameterized.class)
-    public static class TestSanitizeFileDirectory {
-
-        public String inputString;
-        public String expected;
-        public boolean aggressively;
-
-        public TestSanitizeFileDirectory(String inputString, String expected, boolean aggressively) {
-            this.inputString = inputString;
-            this.expected = expected;
-            this.aggressively = aggressively;
-        }
-
-        @Parameters
-        public static Collection<Object[]> parameters() {
-            return Arrays.asList(
-                    new Object[][] { 
-                        {"some\\path\\to\\a\\directory", "some/path/to/a/directory", false},
-                        {"some\\//path\\//to\\//a\\//directory", "some/path/to/a/directory", false},
-                        // starts with / or - or . or whitepsace
-                        {"/some/path/to/a/directory", "some/path/to/a/directory", false},
-                        {"-some/path/to/a/directory", "some/path/to/a/directory", false},
-                        {".some/path/to/a/directory", "some/path/to/a/directory", false},
-                        {" some/path/to/a/directory", "some/path/to/a/directory", false},
-                        // ends with / or - or . or whitepsace
-                        {"some/path/to/a/directory/", "some/path/to/a/directory", false},
-                        {"some/path/to/a/directory-", "some/path/to/a/directory", false},
-                        {"some/path/to/a/directory.", "some/path/to/a/directory", false},
-                        {"some/path/to/a/directory ", "some/path/to/a/directory", false},
-
-                        {"", null, false},
-                        {"/", null, false},
-
-                        // aggressively
-                        {"some/path/to/a/dire{`~}ctory", "some/path/to/a/dire.ctory", true},
-                        {"some/path/to/a/directory\\.\\.", "some/path/to/a/directory", true},
-                    }
-            );
-        }
-
-        @Test
-        public void testSanitizeFileDirectory() {
-            assertEquals(expected, StringUtil.sanitizeFileDirectory(inputString, aggressively));
-        }
+    
+    static Stream<Arguments> sanitizeData() {
+        return Stream.of(
+            Arguments.of("some\\path\\to\\a\\directory", "some/path/to/a/directory", false),
+            Arguments.of("some\\//path\\//to\\//a\\//directory", "some/path/to/a/directory", false),
+            // starts with / or - or . or whitepsace
+            Arguments.of("/some/path/to/a/directory", "some/path/to/a/directory", false),
+            Arguments.of("-some/path/to/a/directory", "some/path/to/a/directory", false),
+            Arguments.of(".some/path/to/a/directory", "some/path/to/a/directory", false),
+            Arguments.of(" some/path/to/a/directory", "some/path/to/a/directory", false),
+            // ends with / or - or . or whitepsace
+            Arguments.of("some/path/to/a/directory/", "some/path/to/a/directory", false),
+            Arguments.of("some/path/to/a/directory-", "some/path/to/a/directory", false),
+            Arguments.of("some/path/to/a/directory.", "some/path/to/a/directory", false),
+            Arguments.of("some/path/to/a/directory ", "some/path/to/a/directory", false),
+            
+            Arguments.of("", null, false),
+            Arguments.of("/", null, false),
+            
+            // aggressively
+            Arguments.of("some/path/to/a/dire{`~}ctory", "some/path/to/a/dire.ctory", true),
+            Arguments.of("some/path/to/a/directory\\.\\.", "some/path/to/a/directory", true)
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("sanitizeData")
+    void testSanitizeFileDirectory(String inputString, String expected, boolean aggressively) {
+        assertEquals(expected, StringUtil.sanitizeFileDirectory(inputString, aggressively));
     }
 
     public static class StringUtilNoParamTest{
@@ -354,5 +221,23 @@ public void testNonEmpty_emptyString() {
             String expected = "";
             assertFalse(StringUtil.nonEmpty(expected));
         }
+        
+        /**
+         * full name or organization name cleanup.
+         * 
+         * @author francesco.cadili@4science.it
+         * 
+         *         Name is composed of: <First Names> <Family Name>
+         */
+        @Test
+        public void testNormalize() {
+            assertEquals(StringUtil.normalize("    Francesco    "), "Francesco");
+            assertEquals(StringUtil.normalize("Francesco  Cadili "), "Francesco Cadili");
+            assertEquals(StringUtil.normalize("  Cadili,Francesco"), "Cadili, Francesco");
+            assertEquals(StringUtil.normalize("Cadili,     Francesco  "), "Cadili, Francesco");
+            assertEquals(StringUtil.normalize(null), "");
+
+            // TODO: organization examples...
+        }
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/SystemConfigTest.java b/src/test/java/edu/harvard/iq/dataverse/util/SystemConfigTest.java
index 1ef31e30159..82b89bca678 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/SystemConfigTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/SystemConfigTest.java
@@ -1,13 +1,101 @@
 package edu.harvard.iq.dataverse.util;
 
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.doReturn;
 
+@LocalJvmSettings
+@ExtendWith(MockitoExtension.class)
 class SystemConfigTest {
-
+    
+    @InjectMocks
+    SystemConfig systemConfig = new SystemConfig();
+    @Mock
+    SettingsServiceBean settingsService;
+    
+    @Test
+    @JvmSetting(key = JvmSettings.SOLR_HOST, value = "foobar")
+    @JvmSetting(key = JvmSettings.SOLR_PORT, value = "1234")
+    void testGetSolrHostColonPortNoDBEntry() {
+        // given
+        String hostPort = "foobar:1234";
+        
+        // when
+        doReturn(null).when(settingsService).getValueForKey(SettingsServiceBean.Key.SolrHostColonPort);
+        String result = systemConfig.getSolrHostColonPort();
+        
+        // then
+        assertEquals(hostPort, result);
+    }
+    
+    @Test
+    @JvmSetting(key = JvmSettings.SOLR_HOST, value = "foobar")
+    @JvmSetting(key = JvmSettings.SOLR_PORT, value = "1234")
+    void testGetSolrHostColonPortWithDBEntry() {
+        // given
+        String dbEntry = "hello:4321";
+        
+        // when
+        doReturn(dbEntry).when(settingsService).getValueForKey(SettingsServiceBean.Key.SolrHostColonPort);
+        String result = systemConfig.getSolrHostColonPort();
+        
+        // then
+        assertEquals(dbEntry, result);
+    }
+    
+    @Test
+    void testGetSolrHostColonPortDefault() {
+        // given
+        String hostPort = "localhost:8983";
+    
+        // when
+        doReturn(null).when(settingsService).getValueForKey(SettingsServiceBean.Key.SolrHostColonPort);
+        String result = systemConfig.getSolrHostColonPort();
+    
+        // then
+        assertEquals(hostPort, result);
+    }
+    
+    @Test
+    void testGetVersion() {
+        // given
+        String version = "100.100";
+        System.setProperty(JvmSettings.VERSION.getScopedKey(), version);
+        
+        // when
+        String result = systemConfig.getVersion(false);
+        
+        // then
+        assertEquals(version, result);
+    }
+    
+    @Test
+    @JvmSetting(key = JvmSettings.VERSION, value = "100.100")
+    @JvmSetting(key = JvmSettings.BUILD, value = "FOOBAR")
+    void testGetVersionWithBuild() {
+        // when
+        String result = systemConfig.getVersion(true);
+    
+        // then
+        assertTrue(result.startsWith("100.100"), "'" + result + "' not starting with 100.100");
+        assertTrue(result.contains("build"));
+        
+        // Cannot test this here - there might be the bundle file present which is not under test control
+        //assertTrue(result.endsWith("FOOBAR"), "'" + result + "' not ending with FOOBAR");
+    }
+    
     @Test
     void testGetLongLimitFromStringOrDefault_withNullInput() {
         long defaultValue = 5L;
@@ -47,4 +135,12 @@ void testGetIntLimitFromStringOrDefault_withStringInputs(String inputString, int
         int actualResult = SystemConfig.getIntLimitFromStringOrDefault(inputString, 5);
         assertEquals(expectedResult, actualResult);
     }
+
+    @Test
+    void testGetThumbnailSizeLimit() {
+        assertEquals(3000000l, SystemConfig.getThumbnailSizeLimit("Image"));
+        assertEquals(1000000l, SystemConfig.getThumbnailSizeLimit("PDF"));
+        assertEquals(0l, SystemConfig.getThumbnailSizeLimit("NoSuchType"));
+    }
+
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/UrlSignerUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/UrlSignerUtilTest.java
new file mode 100644
index 00000000000..09739b67023
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/UrlSignerUtilTest.java
@@ -0,0 +1,50 @@
+package edu.harvard.iq.dataverse.util;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.junit.jupiter.api.Test;
+
+public class UrlSignerUtilTest {
+
+    @Test
+    public void testSignAndValidate() {
+
+        final String url = "http://localhost:8080/api/test1";
+        final String get = "GET";
+        final String post = "POST";
+
+        final String user1 = "Alice";
+        final String user2 = "Bob";
+        final int tooQuickTimeout = -1;
+        final int longTimeout = 1000;
+        final String key = "abracadabara open sesame";
+        final String badkey = "abracadabara open says me";
+
+        Logger.getLogger(UrlSignerUtil.class.getName()).setLevel(Level.FINE);
+        
+        String signedUrl1 = UrlSignerUtil.signUrl(url, longTimeout, user1, get, key);
+        assertTrue(UrlSignerUtil.isValidUrl(signedUrl1, user1, get,  key));
+        assertTrue(UrlSignerUtil.isValidUrl(signedUrl1, user1, null, key));
+        assertTrue(UrlSignerUtil.isValidUrl(signedUrl1, null, get, key));
+
+        assertFalse(UrlSignerUtil.isValidUrl(signedUrl1, null, get, badkey));
+        assertFalse(UrlSignerUtil.isValidUrl(signedUrl1, user2, get, key));
+        assertFalse(UrlSignerUtil.isValidUrl(signedUrl1, user1, post, key));
+        assertFalse(UrlSignerUtil.isValidUrl(signedUrl1.replace(user1, user2), user1, get, key));
+        assertFalse(UrlSignerUtil.isValidUrl(signedUrl1.replace(user1, user2), user2, get, key));
+        assertFalse(UrlSignerUtil.isValidUrl(signedUrl1.replace(user1, user2), null, get, key));
+
+        String signedUrl2 = UrlSignerUtil.signUrl(url, null, null, null, key);
+        assertTrue(UrlSignerUtil.isValidUrl(signedUrl2, null, null, key));
+        assertFalse(UrlSignerUtil.isValidUrl(signedUrl2, null, post, key));
+        assertFalse(UrlSignerUtil.isValidUrl(signedUrl2, user1, null, key));
+
+        String signedUrl3 = UrlSignerUtil.signUrl(url, tooQuickTimeout, user1, get, key);
+
+        assertFalse(UrlSignerUtil.isValidUrl(signedUrl3, user1, get, key));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/UrlTokenUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/UrlTokenUtilTest.java
new file mode 100644
index 00000000000..15905c2971b
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/UrlTokenUtilTest.java
@@ -0,0 +1,60 @@
+package edu.harvard.iq.dataverse.util;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@LocalJvmSettings
+class UrlTokenUtilTest {
+
+    @Test
+    @JvmSetting(key = JvmSettings.SITE_URL, value = "https://librascholar.org")
+    void testGetToolUrlWithOptionalQueryParameters() {
+        // given
+        String siteUrl = "https://librascholar.org";
+        
+        DataFile dataFile = new DataFile();
+        dataFile.setId(42L);
+        FileMetadata fmd = new FileMetadata();
+        DatasetVersion dv = new DatasetVersion();
+        Dataset ds = new Dataset();
+        ds.setId(50L);
+        ds.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL,"10.5072","FK2ABCDEF",null, AbstractDOIProvider.DOI_RESOLVER_URL, null));
+        dv.setDataset(ds);
+        fmd.setDatasetVersion(dv);
+        List<FileMetadata> fmdl = new ArrayList<>();
+        fmdl.add(fmd);
+        dataFile.setFileMetadatas(fmdl);
+        
+        ApiToken apiToken = new ApiToken();
+        apiToken.setTokenString("7196b5ce-f200-4286-8809-03ffdbc255d7");
+    
+        // when & then 1/2
+        URLTokenUtil urlTokenUtil = new URLTokenUtil(dataFile, apiToken, fmd, "en");
+        assertEquals("en", urlTokenUtil.replaceTokensWithValues("{localeCode}"));
+        assertEquals("42 test en", urlTokenUtil.replaceTokensWithValues("{fileId} test {localeCode}"));
+        assertEquals("42 test en", urlTokenUtil.replaceTokensWithValues("{fileId} test {localeCode}"));
+        assertEquals( siteUrl + "/api/files/42/metadata?key=" + apiToken.getTokenString(),
+            urlTokenUtil.replaceTokensWithValues("{siteUrl}/api/files/{fileId}/metadata?key={apiToken}"));
+    
+        // when & then 2/2
+        URLTokenUtil urlTokenUtil2 = new URLTokenUtil(ds, apiToken, "en");
+        assertEquals(siteUrl + "/api/datasets/50?key=" + apiToken.getTokenString(),
+            urlTokenUtil2.replaceTokensWithValues("{siteUrl}/api/datasets/{datasetId}?key={apiToken}"));
+        assertEquals(siteUrl + "/api/datasets/:persistentId/?persistentId=doi:10.5072/FK2ABCDEF&key=" + apiToken.getTokenString(),
+            urlTokenUtil2.replaceTokensWithValues("{siteUrl}/api/datasets/:persistentId/?persistentId={datasetPid}&key={apiToken}"));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/bagit/BagChecksumTypeTest.java b/src/test/java/edu/harvard/iq/dataverse/util/bagit/BagChecksumTypeTest.java
new file mode 100644
index 00000000000..905f8609276
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/bagit/BagChecksumTypeTest.java
@@ -0,0 +1,50 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import org.apache.commons.io.IOUtils;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class BagChecksumTypeTest {
+
+    @Test
+    public void should_validate_all_digesters() throws Exception {
+        Map<BagChecksumType, String> expectedResults = Map.of(
+                BagChecksumType.MD5, "098f6bcd4621d373cade4e832627b4f6",
+                BagChecksumType.SHA1, "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3",
+                BagChecksumType.SHA256, "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08",
+                BagChecksumType.SHA512, "ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff"
+        );
+
+        for(BagChecksumType type: BagChecksumType.values()) {
+            String expectedDigestForTestString = expectedResults.get(type);
+            // Ensure that any new types get added here
+            MatcherAssert.assertThat(expectedDigestForTestString, Matchers.notNullValue());
+            String calculatedDigest = type.getInputStreamDigester().digest(IOUtils.toInputStream("test", "UTF-8"));
+            MatcherAssert.assertThat(calculatedDigest, Matchers.is(expectedDigestForTestString));
+        }
+    }
+
+    @Test
+    public void should_validate_all_manifest_filenames() throws Exception {
+        Map<BagChecksumType, String> expectedResults = Map.of(
+                BagChecksumType.MD5, "manifest-md5.txt",
+                BagChecksumType.SHA1, "manifest-sha1.txt",
+                BagChecksumType.SHA256, "manifest-sha256.txt",
+                BagChecksumType.SHA512, "manifest-sha512.txt"
+        );
+
+        for(BagChecksumType type: BagChecksumType.values()) {
+            String expectedFilename = expectedResults.get(type);
+            // Ensure that any new types get added here
+            MatcherAssert.assertThat(expectedFilename, Matchers.notNullValue());
+            MatcherAssert.assertThat(type.getFileName(), Matchers.is(expectedFilename));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/bagit/BagValidationTest.java b/src/test/java/edu/harvard/iq/dataverse/util/bagit/BagValidationTest.java
new file mode 100644
index 00000000000..87b3382120d
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/bagit/BagValidationTest.java
@@ -0,0 +1,122 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import edu.harvard.iq.dataverse.util.bagit.BagValidation.FileValidationResult;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class BagValidationTest {
+
+    private static final Path FILE_PATH = Path.of(UUID.randomUUID().toString());
+
+    @Test
+    public void BagValidation_should_handle_null_messages() {
+        BagValidation target = new BagValidation(null);
+
+        MatcherAssert.assertThat(target.success(), Matchers.is(true));
+        MatcherAssert.assertThat(target.getErrorMessage().isPresent(), Matchers.is(false));
+        MatcherAssert.assertThat(target.getFileResults().isEmpty(), Matchers.is(true));
+    }
+
+    @Test
+    public void success_should_be_true_when_no_error_message() {
+        BagValidation target = new BagValidation(Optional.empty());
+
+        MatcherAssert.assertThat(target.success(), Matchers.is(true));
+        MatcherAssert.assertThat(target.getErrorMessage().isPresent(), Matchers.is(false));
+        MatcherAssert.assertThat(target.getFileResults().isEmpty(), Matchers.is(true));
+    }
+
+    @Test
+    public void success_should_be_true_when_no_error_message_has_file_validations_without_errors() {
+        BagValidation target = new BagValidation(Optional.empty());
+        FileValidationResult result = target.addFileResult(FILE_PATH);
+        result.setSuccess();
+
+        MatcherAssert.assertThat(target.success(), Matchers.is(true));
+        MatcherAssert.assertThat(target.getErrorMessage().isPresent(), Matchers.is(false));
+        MatcherAssert.assertThat(target.getFileResults().size(), Matchers.is(1));
+    }
+
+    @Test
+    public void success_should_be_false_when_error_message() {
+        BagValidation target = new BagValidation(Optional.of("Error message"));
+
+        MatcherAssert.assertThat(target.success(), Matchers.is(false));
+        MatcherAssert.assertThat(target.getErrorMessage().isPresent(), Matchers.is(true));
+        MatcherAssert.assertThat(target.getFileResults().isEmpty(), Matchers.is(true));
+    }
+
+    @Test
+    public void success_should_be_false_when_no_error_message_but_has_file_validation_errors() {
+        BagValidation target = new BagValidation(Optional.empty());
+        FileValidationResult result = target.addFileResult(FILE_PATH);
+        result.setError("Error Message");
+
+        MatcherAssert.assertThat(target.success(), Matchers.is(false));
+        MatcherAssert.assertThat(target.getErrorMessage().isPresent(), Matchers.is(false));
+        MatcherAssert.assertThat(target.getFileResults().size(), Matchers.is(1));
+    }
+
+    @Test
+    public void report_should_return_total_file_validation_and_total_success_validations() {
+        BagValidation target = new BagValidation(Optional.empty());
+        target.addFileResult(Path.of(UUID.randomUUID().toString())).setSuccess();
+        target.addFileResult(Path.of(UUID.randomUUID().toString())).setError("Error Message");
+
+        MatcherAssert.assertThat(target.report(), Matchers.containsString("success=false"));
+        MatcherAssert.assertThat(target.report(), Matchers.containsString("fileResultsItems=2"));
+        MatcherAssert.assertThat(target.report(), Matchers.containsString("fileResultsSuccess=1"));
+    }
+
+    @Test
+    public void errors_should_only_count_file_errors() {
+        BagValidation target = new BagValidation(Optional.of("main error"));
+        target.addFileResult(Path.of(UUID.randomUUID().toString())).setSuccess();
+        target.addFileResult(Path.of(UUID.randomUUID().toString())).setError("Error Message");
+
+        MatcherAssert.assertThat(target.errors(), Matchers.is(1l));
+    }
+
+    @Test
+    public void errors_should_not_count_main_errors() {
+        BagValidation target = new BagValidation(Optional.of("main error"));
+
+        MatcherAssert.assertThat(target.errors(), Matchers.is(0l));
+    }
+
+    @Test
+    public void getAllErrors_should_return_main_validation_error_and_file_errors() {
+        BagValidation target = new BagValidation(Optional.of("main error"));
+        target.addFileResult(Path.of(UUID.randomUUID().toString())).setError("Error Message");
+
+        MatcherAssert.assertThat(target.getAllErrors().size(), Matchers.is(2));
+        MatcherAssert.assertThat(target.getAllErrors().get(0), Matchers.is("main error"));
+        MatcherAssert.assertThat(target.getAllErrors().get(1), Matchers.is("Error Message"));
+    }
+
+    @Test
+    public void getAllErrors_should_return_main_validation_error_when_no_file_errors() {
+        BagValidation target = new BagValidation(Optional.of("main error"));
+
+        MatcherAssert.assertThat(target.getAllErrors().size(), Matchers.is(1));
+        MatcherAssert.assertThat(target.getAllErrors().get(0), Matchers.is("main error"));
+    }
+
+    @Test
+    public void getAllErrors_should_return_empty_when_success() {
+        BagValidation target = new BagValidation(Optional.empty());
+        target.addFileResult(Path.of(UUID.randomUUID().toString())).setSuccess();
+
+        MatcherAssert.assertThat(target.getAllErrors().size(), Matchers.is(0));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/bagit/BagValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/util/bagit/BagValidatorTest.java
new file mode 100644
index 00000000000..cbdb4b66e83
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/bagit/BagValidatorTest.java
@@ -0,0 +1,255 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import com.google.common.collect.Lists;
+import edu.harvard.iq.dataverse.util.bagit.ManifestReader.ManifestChecksum;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider;
+import edu.harvard.iq.dataverse.util.bagit.data.StringDataProvider;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class BagValidatorTest {
+
+    private static final Path SUPPORTED_MANIFEST = Path.of("manifest-md5.txt");
+
+    private ManifestReader manifestReader;
+    private BagValidator target;
+
+    @BeforeEach
+    public void beforeEachTest() {
+        manifestReader = Mockito.mock(ManifestReader.class);
+        target = Mockito.spy(new BagValidator(manifestReader));
+    }
+
+    @Test
+    public void hasBagItPackage_should_return_false_when_bagit_file_not_found() {
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles("file.txt", "other_file.txt");
+
+        boolean result = target.hasBagItPackage(fileDataProvider);
+
+        MatcherAssert.assertThat(result, Matchers.is(false));
+        Mockito.verifyNoInteractions(manifestReader);
+    }
+
+    @Test
+    public void hasBagItPackage_should_return_false_when_manifest_not_found() {
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles("file.txt", "bagit.txt", "other_file.txt");
+        Path expectedBagRoot = Path.of("");
+        Mockito.when(manifestReader.getSupportedManifest(fileDataProvider, expectedBagRoot)).thenReturn(Optional.empty());
+
+        boolean result = target.hasBagItPackage(fileDataProvider);
+
+        MatcherAssert.assertThat(result, Matchers.is(false));
+        Mockito.verify(manifestReader).getSupportedManifest(fileDataProvider, expectedBagRoot);
+    }
+
+    @Test
+    public void hasBagItPackage_should_return_true_when_bagit_file_and_manifest_in_data_provider() {
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles("file.txt", "bagit.txt", "other_file.txt");
+        Path expectedBagRoot = Path.of("");
+        Mockito.when(manifestReader.getSupportedManifest(fileDataProvider, expectedBagRoot)).thenReturn(Optional.of(SUPPORTED_MANIFEST));
+
+        boolean result = target.hasBagItPackage(fileDataProvider);
+
+        MatcherAssert.assertThat(result, Matchers.is(true));
+        Mockito.verify(manifestReader).getSupportedManifest(fileDataProvider, expectedBagRoot);
+    }
+
+    @Test
+    public void hasBagItPackage_should_return_true_when_bagit_file_and_manifest_in_directory_in_data_provider() {
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles("some_dir/other_dir/bagit.txt");
+        Path expectedBagRoot = Path.of("some_dir/other_dir");
+        Mockito.when(manifestReader.getSupportedManifest(fileDataProvider, expectedBagRoot)).thenReturn(Optional.of(SUPPORTED_MANIFEST));
+
+        boolean result = target.hasBagItPackage(fileDataProvider);
+
+        MatcherAssert.assertThat(result, Matchers.is(true));
+        Mockito.verify(manifestReader).getSupportedManifest(fileDataProvider, expectedBagRoot);
+    }
+
+    @Test
+    public void validateChecksums_should_return_error_when_no_bagit_file_in_data_provider() throws Exception {
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles("file.txt", "other_file.txt");
+
+        BagValidation result = target.validateChecksums(fileDataProvider);
+
+        MatcherAssert.assertThat(result.success(), Matchers.is(false));
+        MatcherAssert.assertThat(result.getErrorMessage().isEmpty(), Matchers.is(false));
+        Mockito.verify(target).getMessage(Mockito.eq("bagit.validation.bag.file.not.found"), Mockito.any());
+
+        Mockito.verifyNoInteractions(manifestReader);
+    }
+
+    @Test
+    public void validateChecksums_should_call_manifest_reader_with_expected_bagroot() throws Exception {
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles("dir/dir2/bagit.txt");
+        Path expectedBagRoot = Path.of("dir/dir2");
+        Mockito.when(manifestReader.getManifestChecksums(fileDataProvider, expectedBagRoot)).thenReturn(Optional.empty());
+
+        target.validateChecksums(fileDataProvider);
+
+        Mockito.verify(manifestReader).getManifestChecksums(fileDataProvider, expectedBagRoot);
+    }
+
+    @Test
+    public void validateChecksums_should_return_error_when_manifest_reader_returns_empty() throws Exception {
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles("bagit.txt");
+        Path expectedBagRoot = Path.of("");
+        Mockito.when(manifestReader.getManifestChecksums(fileDataProvider, expectedBagRoot)).thenReturn(Optional.empty());
+
+        BagValidation result = target.validateChecksums(fileDataProvider);
+
+        MatcherAssert.assertThat(result.success(), Matchers.is(false));
+        MatcherAssert.assertThat(result.getErrorMessage().isEmpty(), Matchers.is(false));
+        Mockito.verify(target).getMessage(Mockito.eq("bagit.validation.manifest.not.supported"), Mockito.any(Object[].class));
+
+        Mockito.verify(manifestReader).getManifestChecksums(fileDataProvider, expectedBagRoot);
+    }
+
+    @Test
+    public void validateChecksums_should_return_error_when_data_provider_do_not_have_file_in_checksum() throws Exception {
+        FileDataProvider fileDataProvider = Mockito.spy(createDataProviderWithRandomFiles("bagit.txt"));
+        ManifestChecksum checksums =  new ManifestChecksum(Path.of("test"), BagChecksumType.MD5, Map.of(Path.of("not-found.txt"), "checksum"));
+        Path expectedBagRoot = Path.of("");
+
+        Mockito.when(manifestReader.getManifestChecksums(fileDataProvider, expectedBagRoot)).thenReturn(Optional.of(checksums));
+
+        BagValidation result = target.validateChecksums(fileDataProvider);
+
+        MatcherAssert.assertThat(result.success(), Matchers.is(false));
+        MatcherAssert.assertThat(result.getErrorMessage().isEmpty(), Matchers.is(true));
+        MatcherAssert.assertThat(result.getFileResults().size(), Matchers.is(checksums.getFileChecksums().size()));
+        for(Path filePath: checksums.getFileChecksums().keySet()) {
+            MatcherAssert.assertThat(result.getFileResults().get(filePath).isError(), Matchers.is(true));
+        }
+        Mockito.verify(target, Mockito.times(checksums.getFileChecksums().size())).getMessage(Mockito.eq("bagit.validation.file.not.found"), Mockito.any(Object[].class));
+
+        Mockito.verify(manifestReader).getManifestChecksums(fileDataProvider, expectedBagRoot);
+        Mockito.verify(fileDataProvider).getFilePaths();
+        Mockito.verify(fileDataProvider).getInputStreamProvider(Path.of("not-found.txt"));
+    }
+
+    @Test
+    public void validateChecksums_should_return_success_when_checksums_match() throws Exception {
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles("bagit.txt");
+        ManifestChecksum checksums = createChecksums(fileDataProvider.getFilePaths(), true);
+        Path expectedBagRoot = Path.of("");
+
+        Mockito.when(manifestReader.getManifestChecksums(fileDataProvider, expectedBagRoot)).thenReturn(Optional.of(checksums));
+
+        BagValidation result = target.validateChecksums(fileDataProvider);
+
+        MatcherAssert.assertThat(result.success(), Matchers.is(true));
+        MatcherAssert.assertThat(result.getErrorMessage().isEmpty(), Matchers.is(true));
+        MatcherAssert.assertThat(result.getFileResults().size(), Matchers.is(checksums.getFileChecksums().size()));
+        for(Path filePath: checksums.getFileChecksums().keySet()) {
+            MatcherAssert.assertThat(result.getFileResults().get(filePath).isSuccess(), Matchers.is(true));
+            MatcherAssert.assertThat(result.getFileResults().get(filePath).getMessage(), Matchers.nullValue());
+        }
+
+        Mockito.verify(manifestReader).getManifestChecksums(fileDataProvider, expectedBagRoot);
+    }
+
+    @Test
+    public void validateChecksums_should_return_error_when_checksums_do_not_match() throws Exception {
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles("bagit.txt");
+        ManifestChecksum checksums = createChecksums(fileDataProvider.getFilePaths(), false);
+        Path expectedBagRoot = Path.of("");
+
+        Mockito.when(manifestReader.getManifestChecksums(fileDataProvider, expectedBagRoot)).thenReturn(Optional.of(checksums));
+
+        BagValidation result = target.validateChecksums(fileDataProvider);
+
+        MatcherAssert.assertThat(result.success(), Matchers.is(false));
+        MatcherAssert.assertThat(result.getErrorMessage().isEmpty(), Matchers.is(true));
+        MatcherAssert.assertThat(result.getFileResults().size(), Matchers.is(checksums.getFileChecksums().size()));
+        for(Path filePath: checksums.getFileChecksums().keySet()) {
+            MatcherAssert.assertThat(result.getFileResults().get(filePath).isError(), Matchers.is(true));
+            MatcherAssert.assertThat(result.getFileResults().get(filePath).getMessage(), Matchers.containsString("Invalid checksum"));
+        }
+
+        Mockito.verify(manifestReader).getManifestChecksums(fileDataProvider, expectedBagRoot);
+    }
+
+    @Test
+    public void validateChecksums_should_return_error_when_max_errors_reached_and_stop_processing() throws Exception {
+        BagValidator target = new BagValidator(1, 1, 0, manifestReader);
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles(true, "bagit.txt");
+        ManifestChecksum checksums = createChecksums(fileDataProvider.getFilePaths(), false);
+        Path expectedBagRoot = Path.of("");
+
+        Mockito.when(manifestReader.getManifestChecksums(fileDataProvider, expectedBagRoot)).thenReturn(Optional.of(checksums));
+
+        BagValidation result = target.validateChecksums(fileDataProvider);
+
+        MatcherAssert.assertThat(result.success(), Matchers.is(false));
+        MatcherAssert.assertThat(result.getErrorMessage().isEmpty(), Matchers.is(true));
+        MatcherAssert.assertThat(result.getFileResults().size(), Matchers.is(checksums.getFileChecksums().size()));
+        MatcherAssert.assertThat(result.errors(), Matchers.greaterThan(1l));
+        MatcherAssert.assertThat( result.getFileResults().values().stream().filter(item -> item.isPending()).count(), Matchers.greaterThan(1l));
+        MatcherAssert.assertThat( result.getFileResults().values().stream().filter(item -> item.isSuccess()).count(), Matchers.is(0l));
+
+        Mockito.verify(manifestReader).getManifestChecksums(fileDataProvider, expectedBagRoot);
+    }
+
+    @Test
+    public void validateChecksums_should_return_error_when_executor_service_throws_interrupted_exception() throws Exception {
+        ExecutorService executorServiceMock = Mockito.mock(ExecutorService.class);
+        Mockito.when(executorServiceMock.awaitTermination(Mockito.anyLong(), Mockito.any())).thenThrow(new InterruptedException("Interrupted"));
+
+        BagValidator target = Mockito.spy(new BagValidator(1, 1, 0, manifestReader));
+        Mockito.when(target.getExecutorService()).thenReturn(executorServiceMock);
+
+        FileDataProvider fileDataProvider = createDataProviderWithRandomFiles(true, "bagit.txt");
+        ManifestChecksum checksums = createChecksums(fileDataProvider.getFilePaths(), false);
+        Mockito.when(manifestReader.getManifestChecksums(fileDataProvider, Path.of(""))).thenReturn(Optional.of(checksums));
+
+        BagValidation result = target.validateChecksums(fileDataProvider);
+
+        MatcherAssert.assertThat(result.success(), Matchers.is(false));
+        MatcherAssert.assertThat(result.getErrorMessage().isEmpty(), Matchers.is(false));
+        Mockito.verify(target).getMessage(Mockito.eq("bagit.validation.exception"), Mockito.any());
+    }
+
+    private FileDataProvider createDataProviderWithRandomFiles(String... filePathItems) {
+        return createDataProviderWithRandomFiles(false, filePathItems);
+    }
+
+    private FileDataProvider createDataProviderWithRandomFiles(boolean withDelay, String... filePathItems) {
+        List<String> randomItems = Stream.generate(() -> RandomStringUtils.randomAlphabetic(100)).limit(10).collect(Collectors.toList());
+        List<String> allFileItems = Lists.newArrayList(filePathItems);
+        allFileItems.addAll(randomItems);
+        List<Path> filePaths = allFileItems.stream().map(filePathItem -> Path.of(filePathItem)).collect(Collectors.toList());
+        return new StringDataProvider(withDelay, filePaths);
+    }
+
+    private ManifestChecksum createChecksums(List<Path> filePaths, boolean validChecksum) throws Exception {
+        List<BagChecksumType> types = BagChecksumType.asList();
+        BagChecksumType bagChecksumType = types.get(new Random().nextInt(types.size()));
+        Map<Path, String> checksums = new HashMap<>();
+        for (Path path : filePaths) {
+            String checksum = validChecksum ?  bagChecksumType.getInputStreamDigester().digest(IOUtils.toInputStream(path.toString(), "UTF-8")) : "invalid";
+            checksums.put(path, checksum);
+        }
+        return new ManifestChecksum(Path.of(bagChecksumType.getFileName()), bagChecksumType, checksums);
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/bagit/FileChecksumValidationJobTest.java b/src/test/java/edu/harvard/iq/dataverse/util/bagit/FileChecksumValidationJobTest.java
new file mode 100644
index 00000000000..08e853a58df
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/bagit/FileChecksumValidationJobTest.java
@@ -0,0 +1,68 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import edu.harvard.iq.dataverse.util.bagit.BagValidation.FileValidationResult;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider.InputStreamProvider;
+import org.apache.commons.io.IOUtils;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.Random;
+import java.util.UUID;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class FileChecksumValidationJobTest {
+
+    @Test
+    public void should_set_error_when_checksum_do_not_match() throws Exception {
+        FileValidationResult result = new FileValidationResult(Path.of(UUID.randomUUID().toString()));
+        FileChecksumValidationJob target = createTarget(result, false, false);
+        target.run();
+
+        MatcherAssert.assertThat(result.isError(), Matchers.is(true));
+        MatcherAssert.assertThat(result.getMessage(), Matchers.containsString("Invalid checksum"));
+    }
+
+    @Test
+    public void should_set_error_when_inputstream_provider_throws_error() throws Exception {
+        FileValidationResult result = new FileValidationResult(Path.of(UUID.randomUUID().toString()));
+        FileChecksumValidationJob target = createTarget(result, false, true);
+        target.run();
+
+        MatcherAssert.assertThat(result.isError(), Matchers.is(true));
+        MatcherAssert.assertThat(result.getMessage(), Matchers.containsString("Error while calculating checksum"));
+    }
+
+    @Test
+    public void should_set_success_when_checksum_do_match() throws Exception {
+        FileValidationResult result = new FileValidationResult(Path.of(UUID.randomUUID().toString()));
+        FileChecksumValidationJob target = createTarget(result, true, false);
+        target.run();
+
+        MatcherAssert.assertThat(result.isSuccess(), Matchers.is(true));
+        MatcherAssert.assertThat(result.getMessage(), Matchers.nullValue());
+
+    }
+
+    private FileChecksumValidationJob createTarget(FileValidationResult result, boolean validChecksum, boolean throwError) throws Exception {
+        Path filePath = result.getFilePath();
+        BagChecksumType bagChecksumType = BagChecksumType.asList().get(new Random().nextInt(BagChecksumType.asList().size()));
+        String checksum = validChecksum ? bagChecksumType.getInputStreamDigester().digest(IOUtils.toInputStream(filePath.toString(), "UTF-8")) : "invalid";
+        InputStreamProvider provider = throwError ? new ExceptionStreamProvider() : () -> IOUtils.toInputStream(filePath.toString(), "UTF-8");
+        return new FileChecksumValidationJob(provider, filePath, checksum, bagChecksumType, result);
+    }
+
+    private static class ExceptionStreamProvider implements InputStreamProvider {
+        @Override
+        public InputStream getInputStream() throws IOException {
+            throw new IOException("Error");
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/bagit/ManifestReaderTest.java b/src/test/java/edu/harvard/iq/dataverse/util/bagit/ManifestReaderTest.java
new file mode 100644
index 00000000000..3e84fda92b5
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/bagit/ManifestReaderTest.java
@@ -0,0 +1,90 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import edu.harvard.iq.dataverse.util.bagit.ManifestReader.ManifestChecksum;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProviderFactory;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class ManifestReaderTest {
+
+    private static final Path FIXTURE_LOCATION = Path.of("src/test/resources/bagit/manifest");
+
+    private FileDataProviderFactory dataProviderFactory = new FileDataProviderFactory();
+    private ManifestReader target = new ManifestReader();
+
+
+    @Test
+    public void getManifestChecksums_should_try_all_checksum_types_to_find_manifest_and_return_empty_when_none_found() {
+        FileDataProvider fileDataProvider = Mockito.mock(FileDataProvider.class);
+        Optional<ManifestChecksum> manifestChecksums = target.getManifestChecksums(fileDataProvider, Path.of(""));
+
+        MatcherAssert.assertThat(manifestChecksums.isEmpty(), Matchers.is(true));
+
+        for (BagChecksumType type: BagChecksumType.values()) {
+            Mockito.verify(fileDataProvider).getInputStreamProvider(Path.of(type.getFileName()));
+        }
+    }
+
+    @Test
+    public void getManifestChecksums_should_return_valid_ManifestChecksum_object_when_valid_manifest_found() throws Exception {
+        FileDataProvider fixtureDataProvider = dataProviderFactory.getFileDataProvider(FIXTURE_LOCATION);
+        Optional<ManifestChecksum> manifestChecksums = target.getManifestChecksums(fixtureDataProvider, Path.of("valid"));
+
+        MatcherAssert.assertThat(manifestChecksums.isEmpty(), Matchers.is(false));
+        MatcherAssert.assertThat(manifestChecksums.get().getManifestFile(), Matchers.is(Path.of("valid/manifest-sha256.txt")));
+        MatcherAssert.assertThat(manifestChecksums.get().getType(), Matchers.is(BagChecksumType.SHA256));
+        MatcherAssert.assertThat(manifestChecksums.get().getFileChecksums().size(), Matchers.is(2));
+        MatcherAssert.assertThat(manifestChecksums.get().getFileChecksums().get(Path.of("valid/data/file-line-1.txt")), Matchers.is("hash-line-1"));
+        MatcherAssert.assertThat(manifestChecksums.get().getFileChecksums().get(Path.of("valid/data/file-line-2.txt")), Matchers.is("hash-line-2"));
+    }
+
+    @Test
+    public void getManifestChecksums_should_return_empty_when_manifest_has_invalid_format() throws Exception {
+        FileDataProvider fixtureDataProvider = dataProviderFactory.getFileDataProvider(FIXTURE_LOCATION);
+        Optional<ManifestChecksum> manifestChecksums = target.getManifestChecksums(fixtureDataProvider, Path.of("invalid_format"));
+
+        MatcherAssert.assertThat(manifestChecksums.isEmpty(), Matchers.is(true));
+    }
+
+    @Test
+    public void getManifestChecksums_should_return_empty_when_dataprovider_throws_exception() throws Exception {
+        FileDataProvider fileDataProvider = Mockito.mock(FileDataProvider.class);
+        Mockito.when(fileDataProvider.getInputStreamProvider(Mockito.any())).thenThrow(new NullPointerException("Test Exception"));
+        Optional<ManifestChecksum> manifestChecksums = target.getManifestChecksums(fileDataProvider, Path.of(""));
+
+        MatcherAssert.assertThat(manifestChecksums.isEmpty(), Matchers.is(true));
+    }
+
+    @Test
+    public void getSupportedManifest_should_return_empty_when_no_supported_manifest_found() throws Exception {
+        FileDataProvider fileDataProvider = Mockito.mock(FileDataProvider.class);
+        Optional<Path> manifest = target.getSupportedManifest(fileDataProvider, Path.of(""));
+
+        MatcherAssert.assertThat(manifest.isEmpty(), Matchers.is(true));
+
+        for (BagChecksumType type: BagChecksumType.values()) {
+            Mockito.verify(fileDataProvider).getInputStreamProvider(Path.of(type.getFileName()));
+        }
+    }
+
+    @Test
+    public void getSupportedManifest_should_return_manifest_path_when_found() throws Exception {
+        FileDataProvider fixtureDataProvider = dataProviderFactory.getFileDataProvider(FIXTURE_LOCATION);
+
+        Optional<Path> manifest = target.getSupportedManifest(fixtureDataProvider, Path.of("valid"));
+
+        MatcherAssert.assertThat(manifest.isPresent(), Matchers.is(true));
+        MatcherAssert.assertThat(manifest.get(), Matchers.is(Path.of("valid/manifest-sha256.txt")));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/DataFileDataProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/DataFileDataProviderTest.java
new file mode 100644
index 00000000000..1d5e20a985e
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/DataFileDataProviderTest.java
@@ -0,0 +1,121 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import edu.harvard.iq.dataverse.DataFile;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider.InputStreamProvider;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class DataFileDataProviderTest {
+
+    private static final String EMPTY_DRIVER = "";
+    private static final String EMPTY_DIRECTORY = "";
+    private static final String FIXTURE_DIRECTORY = "src/test/resources/bagit/data";
+    private static final String NAME = UUID.randomUUID().toString();
+
+    @Test
+    public void getName_should_return_configured_name() {
+        DataFileDataProvider target = new DataFileDataProvider(NAME, Collections.emptyList());
+        MatcherAssert.assertThat(target.getName(), Matchers.is(NAME));
+    }
+
+    @Test
+    public void getFilePaths_should_iterate_through_all_datafiles() {
+        List<DataFile> dataFiles = createDataFiles(EMPTY_DRIVER, "dir", "file1.txt", "file2.csv", "file3.py");
+
+        DataFileDataProvider target = new DataFileDataProvider(NAME, dataFiles);
+        List<Path> result = target.getFilePaths();
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(3));
+        MatcherAssert.assertThat(result, Matchers.hasItem(Path.of("dir","file1.txt")));
+        MatcherAssert.assertThat(result, Matchers.hasItem(Path.of("dir","file2.csv")));
+        MatcherAssert.assertThat(result, Matchers.hasItem(Path.of("dir","file3.py")));
+    }
+
+    @Test
+    public void getInputStreamProvider_should_return_empty_when_filePath_is_not_found() {
+        Path filePath = Path.of(UUID.randomUUID().toString());
+
+        DataFileDataProvider target = new DataFileDataProvider(NAME, Collections.emptyList());
+        Optional<InputStreamProvider> result = target.getInputStreamProvider(filePath);
+
+        MatcherAssert.assertThat(result.isEmpty(), Matchers.is(true));
+    }
+
+    @Test
+    public void getInputStreamProvider_should_return_empty_when_datafile_do_not_use_tmp_driver() throws Exception {
+        Path filePath = Path.of(UUID.randomUUID().toString());
+        List<DataFile> dataFiles = createDataFiles("file://", EMPTY_DIRECTORY, filePath.toString());
+
+        DataFileDataProvider target = new DataFileDataProvider(NAME, dataFiles);
+        Optional<InputStreamProvider> result = target.getInputStreamProvider(filePath);
+
+        MatcherAssert.assertThat(result.isEmpty(), Matchers.is(true));
+    }
+
+    @Test
+    public void getInputStreamProvider_should_return_empty_when_filePath_is_found_but_file_do_no_exits() throws Exception {
+        Path missingFile = Path.of(UUID.randomUUID().toString());
+        List<DataFile> dataFiles = createDataFiles(EMPTY_DRIVER, EMPTY_DIRECTORY, missingFile.toString());
+
+        DataFileDataProvider target = new DataFileDataProvider(NAME, dataFiles);
+        Optional<InputStreamProvider> result = target.getInputStreamProvider(missingFile);
+
+        MatcherAssert.assertThat(result.isEmpty(), Matchers.is(true));
+    }
+
+    @Test
+    public void getInputStreamProvider_should_return_inputStream_when_filePath_is_found_and_file_exits() throws Exception {
+        FileUtilWrapper fileUtilMock = Mockito.mock(FileUtilWrapper.class);
+        Mockito.when(fileUtilMock.getFilesTempDirectory()).thenReturn(FIXTURE_DIRECTORY);
+
+        String existingFileName = "DataFileDataProviderTest.txt";
+        List<DataFile> dataFiles = createDataFiles(EMPTY_DRIVER, EMPTY_DIRECTORY, existingFileName);
+
+        DataFileDataProvider target = new DataFileDataProvider(fileUtilMock, NAME, dataFiles);
+        Optional<InputStreamProvider> result = target.getInputStreamProvider(Path.of(existingFileName));
+
+        MatcherAssert.assertThat(result.isPresent(), Matchers.is(true));
+    }
+
+    @Test
+    public void getInputStreamProvider_should_return_inputStream_when_filePath_is_found_and_datafile_uses_tmp_driver() throws Exception {
+        FileUtilWrapper fileUtilMock = Mockito.mock(FileUtilWrapper.class);
+        Mockito.when(fileUtilMock.getFilesTempDirectory()).thenReturn(FIXTURE_DIRECTORY);
+
+        String existingFileName = "DataFileDataProviderTest.txt";
+        List<DataFile> dataFiles = createDataFiles("tmp://", EMPTY_DIRECTORY, existingFileName);
+
+        DataFileDataProvider target = new DataFileDataProvider(fileUtilMock, NAME, dataFiles);
+        Optional<InputStreamProvider> result = target.getInputStreamProvider(Path.of(existingFileName));
+
+        MatcherAssert.assertThat(result.isPresent(), Matchers.is(true));
+    }
+
+    private List<DataFile> createDataFiles(String driver, String dir, String... dataFileNames) {
+        List<DataFile> dataFiles = Arrays.stream(dataFileNames).map(fileName -> {
+            DataFile dataFile = Mockito.mock(DataFile.class);
+            Mockito.when(dataFile.getDirectoryLabel()).thenReturn(dir);
+            Mockito.when(dataFile.getCurrentName()).thenReturn(fileName);
+            Mockito.when(dataFile.getStorageIdentifier()).thenReturn(driver + fileName);
+            return dataFile;
+        }).collect(Collectors.toList());
+
+        return dataFiles;
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/FileDataProviderFactoryTest.java b/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/FileDataProviderFactoryTest.java
new file mode 100644
index 00000000000..9fac4d42bcd
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/FileDataProviderFactoryTest.java
@@ -0,0 +1,43 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.UUID;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class FileDataProviderFactoryTest {
+
+    private static final String FIXTURE_DIRECTORY = "src/test/resources/bagit/data";
+
+    private final FileDataProviderFactory target = new FileDataProviderFactory();
+
+    @Test
+    public void should_return_FolderDataProvider_when_parameter_is_path() {
+        FileDataProvider result = target.getFileDataProvider(Path.of(UUID.randomUUID().toString()));
+
+        MatcherAssert.assertThat("should return FolderDataProvider when parameter is path", result instanceof FolderDataProvider);
+    }
+
+    @Test
+    public void should_return_ZipFileDataProvider_when_parameter_is_file() throws IOException {
+        FileDataProvider result = target.getFileDataProvider(Path.of(FIXTURE_DIRECTORY, "FileDataProviderFactoryTest.zip").toFile());
+
+        MatcherAssert.assertThat("should return ZipFileDataProvider when parameter is file", result instanceof ZipFileDataProvider);
+    }
+
+    @Test
+    public void should_return_DataFileDataProvider_when_parameter_is_datafiles() {
+        FileDataProvider result = target.getFileDataProvider("test-name", Collections.emptyList());
+
+        MatcherAssert.assertThat("should return DataFileDataProvider when parameter is datafiles", result instanceof DataFileDataProvider);
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/FolderDataProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/FolderDataProviderTest.java
new file mode 100644
index 00000000000..e403b32b1b3
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/FolderDataProviderTest.java
@@ -0,0 +1,92 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class FolderDataProviderTest {
+
+    private static final String FIXTURE_DIRECTORY = "src/test/resources/bagit/data";
+
+    @Test
+    public void getName_should_return_configured_name() {
+        Path folderLocation = Path.of(UUID.randomUUID().toString());
+
+        FolderDataProvider target = new FolderDataProvider(folderLocation);
+
+        MatcherAssert.assertThat(target.getName(), Matchers.is(folderLocation.toString()));
+    }
+
+    @Test
+    public void getFilePaths_should_return_empty_when_folder_do_not_exits() {
+        Path folderLocation = Path.of(UUID.randomUUID().toString());
+
+        FolderDataProvider target = new FolderDataProvider(folderLocation);
+        List<Path> result = target.getFilePaths();
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(0));
+    }
+
+    @Test
+    public void getFilePaths_should_return_empty_when_listing_files_throws_exception() throws IOException {
+        Path folderLocation = Mockito.mock(Path.class, Mockito.RETURNS_DEEP_STUBS);
+        Mockito.when(folderLocation.toFile().exists()).thenReturn(true);
+
+        FileUtilWrapper fileUtilMock = Mockito.mock(FileUtilWrapper.class);
+        Mockito.when(fileUtilMock.list(folderLocation)).thenThrow(new IOException("ERROR"));
+
+        FolderDataProvider target = new FolderDataProvider(fileUtilMock, folderLocation);
+        List<Path> result = target.getFilePaths();
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(0));
+
+        Mockito.verify(folderLocation.toFile()).exists();
+        Mockito.verify(fileUtilMock).list(folderLocation);
+    }
+
+    @Test
+    public void getFilePaths_should_iterate_through_all_files_within_folderLocation() {
+        Path folderLocation = Path.of(FIXTURE_DIRECTORY, "FolderDataProviderTest");
+
+        FolderDataProvider target = new FolderDataProvider(folderLocation);
+        List<Path> result = target.getFilePaths();
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(2));
+        MatcherAssert.assertThat(result, Matchers.hasItem(Path.of("file1.txt")));
+        MatcherAssert.assertThat(result, Matchers.hasItem(Path.of("file2.csv")));
+    }
+
+    @Test
+    public void getInputStreamProvider_should_return_empty_when_file_do_no_exits() throws Exception {
+        Path missingFile = Path.of(UUID.randomUUID().toString());
+        Path folderLocation = Path.of(UUID.randomUUID().toString());
+
+        FolderDataProvider target = new FolderDataProvider(folderLocation);
+        Optional<FileDataProvider.InputStreamProvider> result = target.getInputStreamProvider(missingFile);
+
+        MatcherAssert.assertThat(result.isEmpty(), Matchers.is(true));
+    }
+
+    @Test
+    public void getInputStreamProvider_should_return_inputstream_when_file_exits() throws Exception {
+        Path folderLocation = Path.of(FIXTURE_DIRECTORY, "FolderDataProviderTest");
+        Path existingFile = Path.of("file1.txt");
+
+        FolderDataProvider target = new FolderDataProvider(folderLocation);
+        Optional<FileDataProvider.InputStreamProvider> result = target.getInputStreamProvider(existingFile);
+
+        MatcherAssert.assertThat(result.isEmpty(), Matchers.is(false));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/StringDataProvider.java b/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/StringDataProvider.java
new file mode 100644
index 00000000000..3a6c79cec68
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/StringDataProvider.java
@@ -0,0 +1,50 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class StringDataProvider implements FileDataProvider {
+    private final Boolean withDelay;
+    private final List<Path> items;
+
+    public StringDataProvider(Boolean withDelay, List<Path> items) {
+        this.withDelay = withDelay;
+        this.items = items;
+    }
+
+    @Override
+    public String getName() {
+        return "StringDataProvider";
+    }
+
+    @Override
+    public List<Path> getFilePaths() {
+        return List.copyOf(items);
+    }
+
+    @Override
+    public Optional<InputStreamProvider> getInputStreamProvider(Path filePath) {
+        return items.stream().filter(item -> item.equals(filePath)).findFirst().map(item -> () -> {
+            if (withDelay) {
+                try {
+                    TimeUnit.MILLISECONDS.sleep(200);
+                } catch (Exception e) {
+                }
+            }
+            return IOUtils.toInputStream(item.toString(), "UTF-8");
+        });
+    }
+
+    @Override
+    public void close() throws IOException {
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/ZipFileDataProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/ZipFileDataProviderTest.java
new file mode 100644
index 00000000000..67bd13d61e4
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/bagit/data/ZipFileDataProviderTest.java
@@ -0,0 +1,119 @@
+package edu.harvard.iq.dataverse.util.bagit.data;
+
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider.InputStreamProvider;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class ZipFileDataProviderTest {
+
+    private static final String NAME = UUID.randomUUID().toString();
+
+    @Test
+    public void getName_should_return_configured_name() {
+        ZipFileDataProvider target = new ZipFileDataProvider(NAME, Mockito.mock(ZipFile.class));
+        MatcherAssert.assertThat(target.getName(), Matchers.is(NAME));
+    }
+
+    @Test
+    public void getFilePaths_should_iterate_through_all_zip_entries() {
+        ZipFile zipFileMock = Mockito.mock(ZipFile.class);
+        mockZipEnumeration(zipFileMock, "zip1", "zip2", "zip3");
+
+        ZipFileDataProvider target = new ZipFileDataProvider(NAME, zipFileMock);
+        List<Path> result = target.getFilePaths();
+
+        Mockito.verify(zipFileMock).getEntries();
+        MatcherAssert.assertThat(result.size(), Matchers.is(3));
+        MatcherAssert.assertThat(result, Matchers.hasItem(Path.of("zip1")));
+        MatcherAssert.assertThat(result, Matchers.hasItem(Path.of("zip2")));
+        MatcherAssert.assertThat(result, Matchers.hasItem(Path.of("zip3")));
+    }
+
+    @Test
+    public void getFilePaths_should_ignore_directories() {
+        ZipFile zipFileMock = Mockito.mock(ZipFile.class);
+        mockZipEnumeration(zipFileMock, "zip1", "dir1/", "zip2", "dir2/");
+
+        ZipFileDataProvider target = new ZipFileDataProvider(NAME, zipFileMock);
+        List<Path> result = target.getFilePaths();
+
+        MatcherAssert.assertThat(result.size(), Matchers.is(2));
+        MatcherAssert.assertThat(result, Matchers.hasItem(Path.of("zip1")));
+        MatcherAssert.assertThat(result, Matchers.hasItem(Path.of("zip2")));
+
+        Mockito.verify(zipFileMock).getEntries();
+    }
+
+    @Test
+    public void getInputStreamProvider_should_return_empty_when_file_path_is_not_found() {
+        Path fileNotFound = Path.of(UUID.randomUUID().toString());
+        ZipFile zipFileMock = Mockito.mock(ZipFile.class);
+        Mockito.when(zipFileMock.getEntry(fileNotFound.toString())).thenReturn(null);
+
+        ZipFileDataProvider target = new ZipFileDataProvider(NAME, zipFileMock);
+        Optional<InputStreamProvider> result = target.getInputStreamProvider(fileNotFound);
+
+        MatcherAssert.assertThat(result.isEmpty(), Matchers.is(true));
+
+        Mockito.verify(zipFileMock).getEntry(fileNotFound.toString());
+    }
+
+    @Test
+    public void getInputStreamProvider_should_return_inputStream_for_file_from_zip() throws Exception {
+        ZipFile zipFileMock = Mockito.mock(ZipFile.class);
+        ZipArchiveEntry zipEntryMock = Mockito.mock(ZipArchiveEntry.class);
+        InputStream inputStreamMock = Mockito.mock(InputStream.class);
+        Path filePath = Path.of(UUID.randomUUID().toString());
+
+        Mockito.when(zipFileMock.getInputStream(zipEntryMock)).thenReturn(inputStreamMock);
+        Mockito.when(zipFileMock.getEntry(filePath.toString())).thenReturn(zipEntryMock);
+
+        ZipFileDataProvider target = new ZipFileDataProvider(NAME, zipFileMock);
+        Optional<InputStreamProvider> result = target.getInputStreamProvider(filePath);
+
+        MatcherAssert.assertThat(result.isEmpty(), Matchers.is(false));
+        MatcherAssert.assertThat(result.get().getInputStream(), Matchers.is(inputStreamMock));
+
+        Mockito.verify(zipFileMock).getEntry(filePath.toString());
+        Mockito.verify(zipFileMock).getInputStream(zipEntryMock);
+    }
+
+    @Test
+    public void close_should_call_zipfile_close_method() throws Exception {
+        ZipFile zipFileMock = Mockito.mock(ZipFile.class);
+
+        ZipFileDataProvider target = new ZipFileDataProvider(NAME, zipFileMock);
+        target.close();
+
+        Mockito.verify(zipFileMock).close();
+    }
+
+    private void mockZipEnumeration(ZipFile zipFileMock, String... zipEntryNames) {
+        List<ZipArchiveEntry> zipArchiveEntries = Arrays.stream(zipEntryNames).map(name -> {
+            ZipArchiveEntry zipEntry = Mockito.mock(ZipArchiveEntry.class);
+            Mockito.when(zipEntry.getName()).thenReturn(name);
+            Mockito.when(zipEntry.isDirectory()).thenReturn(name.endsWith("/"));
+            return zipEntry;
+        }).collect(Collectors.toList());
+
+        Mockito.when(zipFileMock.getEntries()).thenReturn(Collections.enumeration(zipArchiveEntries));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/cache/CacheFactoryBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/util/cache/CacheFactoryBeanTest.java
new file mode 100644
index 00000000000..9debb4aa5ca
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/cache/CacheFactoryBeanTest.java
@@ -0,0 +1,336 @@
+package edu.harvard.iq.dataverse.util.cache;
+
+import com.hazelcast.cluster.Address;
+import com.hazelcast.config.Config;
+import com.hazelcast.core.Hazelcast;
+import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.map.IMap;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
+import edu.harvard.iq.dataverse.engine.command.Command;
+import edu.harvard.iq.dataverse.engine.command.impl.ListDataverseContentCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.ListExplicitGroupsCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.ListFacetsCommand;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.testing.Tags;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.configuration.CacheEntryListenerConfiguration;
+import javax.cache.configuration.Configuration;
+import javax.cache.integration.CompletionListener;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.EntryProcessorResult;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class CacheFactoryBeanTest {
+    private SystemConfig mockedSystemConfig;
+    static CacheFactoryBean cache = null;
+
+    AuthenticatedUser authUser = new AuthenticatedUser();
+    GuestUser guestUser = GuestUser.get();
+    static final String settingDefaultCapacity = "30,60,120";
+    public String getJsonSetting() {
+        return """
+             [
+               {
+                 "tier": 0,
+                 "limitPerHour": 10,
+                 "actions": [
+                   "GetLatestPublishedDatasetVersionCommand",
+                   "GetPrivateUrlCommand",
+                   "GetDatasetCommand",
+                   "GetLatestAccessibleDatasetVersionCommand"
+                 ]
+               },
+               {
+                 "tier": 0,
+                 "limitPerHour": 1,
+                 "actions": [
+                   "CreateGuestbookResponseCommand",
+                   "UpdateDatasetVersionCommand",
+                   "DestroyDatasetCommand",
+                   "DeleteDataFileCommand",
+                   "FinalizeDatasetPublicationCommand",
+                   "PublishDatasetCommand"
+                 ]
+               },
+               {
+                 "tier": 1,
+                 "limitPerHour": 30,
+                 "actions": [
+                   "CreateGuestbookResponseCommand",
+                   "GetLatestPublishedDatasetVersionCommand",
+                   "GetPrivateUrlCommand",
+                   "GetDatasetCommand",
+                   "GetLatestAccessibleDatasetVersionCommand",
+                   "UpdateDatasetVersionCommand",
+                   "DestroyDatasetCommand",
+                   "DeleteDataFileCommand",
+                   "FinalizeDatasetPublicationCommand",
+                   "PublishDatasetCommand"
+                 ]
+               }
+             ]""";
+    }
+    @BeforeEach
+    public void init() throws IOException {
+        // Reuse cache and config for all tests
+        if (cache == null) {
+            mockedSystemConfig = mock(SystemConfig.class);
+            doReturn(settingDefaultCapacity).when(mockedSystemConfig).getRateLimitingDefaultCapacityTiers();
+            doReturn(getJsonSetting()).when(mockedSystemConfig).getRateLimitsJson();
+            cache = new CacheFactoryBean();
+            cache.systemConfig = mockedSystemConfig;
+            if (cache.rateLimitCache == null) {
+                cache.rateLimitCache = new TestCache(getConfig());
+            }
+
+            // Clear the static data, so it can be reloaded with the new mocked data
+            RateLimitUtil.rateLimitMap.clear();
+            RateLimitUtil.rateLimits.clear();
+        }
+
+        // Reset to default auth user
+        authUser.setRateLimitTier(1);
+        authUser.setSuperuser(false);
+        authUser.setUserIdentifier("authUser");
+    }
+
+    @AfterAll
+    public static void cleanup() {
+        Hazelcast.shutdownAll();
+    }
+    @Test
+    @ResourceLock(value = "cache")
+    public void testGuestUserGettingRateLimited() {
+        Command action = new ListDataverseContentCommand(null,null);
+        boolean rateLimited = false;
+        int cnt = 0;
+        for (; cnt <100; cnt++) {
+            rateLimited = !cache.checkRate(guestUser, action);
+            if (rateLimited) {
+                break;
+            }
+        }
+        String key = RateLimitUtil.generateCacheKey(guestUser, action.getClass().getSimpleName());
+        assertTrue(cache.rateLimitCache.containsKey(key));
+        assertTrue(rateLimited && cnt > 1 && cnt <= 31, "rateLimited:"+rateLimited + " cnt:"+cnt);
+    }
+
+    @Test
+    @ResourceLock(value = "cache")
+    public void testAdminUserExemptFromGettingRateLimited() {
+        Command action = new ListExplicitGroupsCommand(null,null);
+        authUser.setSuperuser(true);
+        authUser.setUserIdentifier("admin");
+        boolean rateLimited = false;
+        int cnt = 0;
+        for (; cnt <100; cnt++) {
+            rateLimited = !cache.checkRate(authUser, action);
+            if (rateLimited) {
+                break;
+            }
+        }
+        assertFalse(rateLimited);
+        assertTrue(cnt >= 99, "cnt:"+cnt);
+    }
+
+    @Test
+    @Tag(Tags.NOT_ESSENTIAL_UNITTESTS)
+    @ResourceLock(value = "cache")
+    public void testAuthenticatedUserGettingRateLimited() throws InterruptedException {
+        Command action = new ListFacetsCommand(null,null);
+        authUser.setRateLimitTier(2); // 120 cals per hour - 1 added token every 30 seconds
+        boolean rateLimited = false;
+        int cnt;
+        for (cnt = 0; cnt <200; cnt++) {
+            rateLimited = !cache.checkRate(authUser, action);
+            if (rateLimited) {
+                break;
+            }
+        }
+        assertTrue(rateLimited);
+        assertEquals(120, cnt);
+
+        for (cnt = 0; cnt <60; cnt++) {
+            Thread.sleep(1000);// Wait for bucket to be replenished (check each second for 1 minute max)
+            rateLimited = !cache.checkRate(authUser, action);
+            if (!rateLimited) {
+                break;
+            }
+        }
+        assertFalse(rateLimited, "rateLimited:"+rateLimited + " cnt:"+cnt);
+
+        // Now change the user's tier, so it is no longer limited
+        authUser.setRateLimitTier(3); // tier 3 = no limit
+        for (cnt = 0; cnt <200; cnt++) {
+            rateLimited = !cache.checkRate(authUser, action);
+            if (rateLimited) {
+                break;
+            }
+        }
+        assertFalse(rateLimited);
+        assertEquals(200, cnt);
+    }
+
+    private Config getConfig() {
+        return getConfig(null);
+    }
+    private Config getConfig(String members) {
+        Config config = new Config();
+        config.getNetworkConfig().getJoin().getAutoDetectionConfig().setEnabled(false);
+        config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false);
+        config.getNetworkConfig().getJoin().getAwsConfig().setEnabled(false);
+        config.getNetworkConfig().getJoin().getAzureConfig().setEnabled(false);
+        config.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(true);
+        if (members != null) {
+            config.getNetworkConfig().getJoin().getAutoDetectionConfig().setEnabled(true);
+            config.getNetworkConfig().getJoin().getTcpIpConfig().addMember(members);
+        }
+        return config;
+    }
+
+    // convert Hazelcast IMap<String,String> to JCache Cache<Object, Object>
+    private class TestCache implements Cache<String, String>{
+        HazelcastInstance hzInstance;
+        IMap<String, String> cache;
+        TestCache(Config config) {
+            hzInstance = Hazelcast.newHazelcastInstance(config);
+            cache = hzInstance.getMap("test");
+            Address address = hzInstance.getCluster().getLocalMember().getAddress();
+            cache.put("memberAddress", String.format("%s:%d", address.getHost(), address.getPort()));
+        }
+        @Override
+        public String get(String s) {
+            return cache.get(s);
+        }
+        @Override
+        public Map<String, String> getAll(Set<? extends String> set) {
+            return null;
+        }
+        @Override
+        public boolean containsKey(String s) {
+            return get(s) != null;
+        }
+        @Override
+        public void loadAll(Set<? extends String> set, boolean b, CompletionListener completionListener) {
+
+        }
+        @Override
+        public void put(String s, String s2) {
+            cache.put(s,s2);
+        }
+        @Override
+        public String getAndPut(String s, String s2) {
+            return null;
+        }
+        @Override
+        public void putAll(Map<? extends String, ? extends String> map) {
+
+        }
+        @Override
+        public boolean putIfAbsent(String s, String s2) {
+            return false;
+        }
+        @Override
+        public boolean remove(String s) {
+            return false;
+        }
+        @Override
+        public boolean remove(String s, String s2) {
+            return false;
+        }
+        @Override
+        public String getAndRemove(String s) {
+            return null;
+        }
+        @Override
+        public boolean replace(String s, String s2, String v1) {
+            return false;
+        }
+        @Override
+        public boolean replace(String s, String s2) {
+            return false;
+        }
+        @Override
+        public String getAndReplace(String s, String s2) {
+            return null;
+        }
+        @Override
+        public void removeAll(Set<? extends String> set) {
+
+        }
+        @Override
+        public void removeAll() {
+
+        }
+        @Override
+        public void clear() {
+            cache.clear();
+        }
+        @Override
+        public <C extends Configuration<String, String>> C getConfiguration(Class<C> aClass) {
+            return null;
+        }
+        @Override
+        public <T> T invoke(String s, EntryProcessor<String, String, T> entryProcessor, Object... objects) throws EntryProcessorException {
+            return null;
+        }
+        @Override
+        public <T> Map<String, EntryProcessorResult<T>> invokeAll(Set<? extends String> set, EntryProcessor<String, String, T> entryProcessor, Object... objects) {
+            return null;
+        }
+        @Override
+        public String getName() {
+            return null;
+        }
+        @Override
+        public CacheManager getCacheManager() {
+            return null;
+        }
+        @Override
+        public void close() {
+            hzInstance.shutdown();
+        }
+        @Override
+        public boolean isClosed() {
+            return false;
+        }
+        @Override
+        public <T> T unwrap(Class<T> aClass) {
+            return null;
+        }
+        @Override
+        public void registerCacheEntryListener(CacheEntryListenerConfiguration<String, String> cacheEntryListenerConfiguration) {
+
+        }
+        @Override
+        public void deregisterCacheEntryListener(CacheEntryListenerConfiguration<String, String> cacheEntryListenerConfiguration) {
+
+        }
+        @Override
+        public Iterator<Cache.Entry<String, String>> iterator() {
+            return null;
+        }
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/cache/RateLimitUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/cache/RateLimitUtilTest.java
new file mode 100644
index 00000000000..0049dd0d8f1
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/cache/RateLimitUtilTest.java
@@ -0,0 +1,154 @@
+package edu.harvard.iq.dataverse.util.cache;
+
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class RateLimitUtilTest {
+
+    static SystemConfig mockedSystemConfig = mock(SystemConfig.class);
+    static SystemConfig mockedSystemConfigBad = mock(SystemConfig.class);
+
+    static String getJsonSetting() {
+        return """
+             [
+               {
+                 "tier": 0,
+                 "limitPerHour": 10,
+                 "actions": [
+                   "GetLatestPublishedDatasetVersionCommand",
+                   "GetPrivateUrlCommand",
+                   "GetDatasetCommand",
+                   "GetLatestAccessibleDatasetVersionCommand"
+                 ]
+               },
+               {
+                 "tier": 0,
+                 "limitPerHour": 1,
+                 "actions": [
+                   "CreateGuestbookResponseCommand",
+                   "UpdateDatasetVersionCommand",
+                   "DestroyDatasetCommand",
+                   "DeleteDataFileCommand",
+                   "FinalizeDatasetPublicationCommand",
+                   "PublishDatasetCommand"
+                 ]
+               },
+               {
+                 "tier": 1,
+                 "limitPerHour": 30,
+                 "actions": [
+                   "CreateGuestbookResponseCommand",
+                   "GetLatestPublishedDatasetVersionCommand",
+                   "GetPrivateUrlCommand",
+                   "GetDatasetCommand",
+                   "GetLatestAccessibleDatasetVersionCommand",
+                   "UpdateDatasetVersionCommand",
+                   "DestroyDatasetCommand",
+                   "DeleteDataFileCommand",
+                   "FinalizeDatasetPublicationCommand",
+                   "PublishDatasetCommand"
+                 ]
+               }
+             ]""";
+    }
+    static final String settingJsonBad = "{\n";
+
+    @BeforeAll
+    public static void setUp() {
+        doReturn(getJsonSetting()).when(mockedSystemConfig).getRateLimitsJson();
+        doReturn("100,200").when(mockedSystemConfig).getRateLimitingDefaultCapacityTiers();
+        doReturn(settingJsonBad).when(mockedSystemConfigBad).getRateLimitsJson();
+        doReturn("100,200").when(mockedSystemConfigBad).getRateLimitingDefaultCapacityTiers();
+    }
+    @BeforeEach
+    public void resetRateLimitUtilSettings() {
+        RateLimitUtil.rateLimitMap.clear();
+        RateLimitUtil.rateLimits.clear();
+    }
+    @ParameterizedTest
+    @CsvSource(value = {
+            "100,0,",
+            "200,1,",
+            "1,0,DestroyDatasetCommand",
+            "100,0,Default Limit",
+            "30,1,DestroyDatasetCommand",
+            "200,1,Default Limit",
+            "-1,2,Default No Limit"
+    })
+    void testConfig(int exp, int tier, String action) {
+        if (action == null) {
+            assertEquals(exp, RateLimitUtil.getCapacityByTier(mockedSystemConfig, tier));
+        } else {
+            assertEquals(exp, RateLimitUtil.getCapacityByTierAndAction(mockedSystemConfig, tier, action));
+        }
+    }
+    @ParameterizedTest
+    @CsvSource(value = {
+            "100,0,",
+            "200,1,",
+            "100,0,GetLatestAccessibleDatasetVersionCommand",
+            "200,1,GetLatestAccessibleDatasetVersionCommand",
+            "-1,2,GetLatestAccessibleDatasetVersionCommand"
+    })
+    void testBadJson(int exp, int tier, String action) {
+        if (action == null) {
+            assertEquals(exp, RateLimitUtil.getCapacityByTier(mockedSystemConfigBad, tier));
+        } else {
+            assertEquals(exp, RateLimitUtil.getCapacityByTierAndAction(mockedSystemConfigBad, tier, action));
+        }
+    }
+
+    @Test
+    public void testGenerateCacheKey() {
+        User user = GuestUser.get();
+        assertEquals(RateLimitUtil.generateCacheKey(user,"action1"), ":guest:action1");
+    }
+    @Test
+    public void testGetCapacity() {
+        SystemConfig config = mock(SystemConfig.class);
+        resetRateLimitUtil(config, true);
+
+        GuestUser guestUser = GuestUser.get();
+        assertEquals(10, RateLimitUtil.getCapacity(config, guestUser, "GetPrivateUrlCommand"));
+
+        AuthenticatedUser authUser = new AuthenticatedUser();
+        authUser.setRateLimitTier(1);
+        assertEquals(30, RateLimitUtil.getCapacity(config, authUser, "GetPrivateUrlCommand"));
+        authUser.setSuperuser(true);
+        assertEquals(RateLimitUtil.NO_LIMIT, RateLimitUtil.getCapacity(config, authUser, "GetPrivateUrlCommand"));
+
+        // no setting means rate limiting is not on
+        resetRateLimitUtil(config, false);
+
+        assertEquals(RateLimitUtil.NO_LIMIT, RateLimitUtil.getCapacity(config, guestUser, "GetPrivateUrlCommand"));
+        assertEquals(RateLimitUtil.NO_LIMIT, RateLimitUtil.getCapacity(config, guestUser, "xyz"));
+        assertEquals(RateLimitUtil.NO_LIMIT, RateLimitUtil.getCapacity(config, authUser, "GetPrivateUrlCommand"));
+        assertEquals(RateLimitUtil.NO_LIMIT, RateLimitUtil.getCapacity(config, authUser, "abc"));
+        authUser.setRateLimitTier(99);
+        assertEquals(RateLimitUtil.NO_LIMIT, RateLimitUtil.getCapacity(config, authUser, "def"));
+    }
+    private void resetRateLimitUtil(SystemConfig config, boolean enable) {
+        doReturn(enable ? getJsonSetting() : "").when(config).getRateLimitsJson();
+        doReturn(enable ? "100,200" : "").when(config).getRateLimitingDefaultCapacityTiers();
+        RateLimitUtil.rateLimitMap.clear();
+        RateLimitUtil.rateLimits.clear();
+        // first call after setting changes returns RESET_CACHE so ignore it
+        RateLimitUtil.getCapacity(config, GuestUser.get(), "GetPrivateUrlCommand");
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerFactoryTest.java b/src/test/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerFactoryTest.java
new file mode 100644
index 00000000000..8b047443745
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerFactoryTest.java
@@ -0,0 +1,50 @@
+package edu.harvard.iq.dataverse.util.file;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.bagit.BagValidator;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+/**
+ *
+ * @author adaybujeda
+ */
+@ExtendWith(MockitoExtension.class)
+public class BagItFileHandlerFactoryTest {
+
+    @Mock
+    private SettingsServiceBean settingsService;
+
+    @InjectMocks
+    private BagItFileHandlerFactory target;
+
+    @Test
+    public void initialize_should_set_BagItFileHandler_to_empty_if_BagItHandler_is_not_enabled() {
+        Mockito.when(settingsService.isTrue(BagItFileHandlerFactory.BAGIT_HANDLER_ENABLED_SETTING, false)).thenReturn(false);
+
+        target.initialize();
+
+        MatcherAssert.assertThat(target.getBagItFileHandler().isEmpty(), Matchers.is(true));
+        Mockito.verify(settingsService).isTrue(BagItFileHandlerFactory.BAGIT_HANDLER_ENABLED_SETTING, false);
+        Mockito.verifyNoMoreInteractions(settingsService);
+    }
+
+    @Test
+    public void initialize_should_set_BagItFileHandler_if_BagItHandler_is_enabled() {
+        Mockito.when(settingsService.isTrue(BagItFileHandlerFactory.BAGIT_HANDLER_ENABLED_SETTING, false)).thenReturn(true);
+
+        target.initialize();
+
+        MatcherAssert.assertThat(target.getBagItFileHandler().isEmpty(), Matchers.is(false));
+        Mockito.verify(settingsService).get(BagValidator.BagValidatorSettings.JOB_POOL_SIZE.getSettingsKey());
+        Mockito.verify(settingsService).get(BagValidator.BagValidatorSettings.MAX_ERRORS.getSettingsKey());
+        Mockito.verify(settingsService).get(BagValidator.BagValidatorSettings.JOB_WAIT_INTERVAL.getSettingsKey());
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerPostProcessorTest.java b/src/test/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerPostProcessorTest.java
new file mode 100644
index 00000000000..064fa8b440f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerPostProcessorTest.java
@@ -0,0 +1,90 @@
+package edu.harvard.iq.dataverse.util.file;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class BagItFileHandlerPostProcessorTest {
+
+    private BagItFileHandlerPostProcessor target = new BagItFileHandlerPostProcessor();
+
+    @Test
+    public void should_return_null_when_datafiles_are_null() throws Exception {
+        List<DataFile> result = target.process(null);
+        MatcherAssert.assertThat(result, Matchers.nullValue());
+    }
+
+    @Test
+    public void should_ignore_mac_control_files() throws Exception {
+        String bagEntry = UUID.randomUUID().toString();
+        String macFile03 = ".DS_Store";
+        String macFile04 = "._.DS_Store";
+        List<DataFile> dataFiles = createDataFiles(bagEntry, macFile03, macFile04);
+
+        List<DataFile> result = target.process(dataFiles);
+        MatcherAssert.assertThat(result.size(), Matchers.is(1));
+        MatcherAssert.assertThat(result.get(0).getCurrentName(), Matchers.is(bagEntry));
+    }
+
+    @Test
+    public void should_ignore_empty_files() throws Exception {
+        String bagEntry = UUID.randomUUID().toString();
+        String fileToIgnore = "";
+        List<DataFile> dataFiles = createDataFiles(bagEntry, fileToIgnore);
+
+        List<DataFile> result = target.process(dataFiles);
+        MatcherAssert.assertThat(result.size(), Matchers.is(1));
+        MatcherAssert.assertThat(result.get(0).getCurrentName(), Matchers.is(bagEntry));
+    }
+
+    @Test
+    public void should_ignore_files_that_start_with_dot_underscore() throws Exception {
+        String bagEntry = UUID.randomUUID().toString();
+        String fileToIgnore = "._FileNameToIgnore";
+        List<DataFile> dataFiles = createDataFiles(bagEntry, fileToIgnore);
+
+        List<DataFile> result = target.process(dataFiles);
+        MatcherAssert.assertThat(result.size(), Matchers.is(1));
+        MatcherAssert.assertThat(result.get(0).getCurrentName(), Matchers.is(bagEntry));
+    }
+
+    @Test
+    public void should_ignore_files_that_start_with_double_underscore() throws Exception {
+        String bagEntry = UUID.randomUUID().toString();
+        String fileToIgnore = "__FileNameToIgnore";
+        String validFile = "validName";
+        List<DataFile> dataFiles = createDataFiles(bagEntry, fileToIgnore);
+
+        List<DataFile> result = target.process(dataFiles);
+        MatcherAssert.assertThat(result.size(), Matchers.is(1));
+        MatcherAssert.assertThat(result.get(0).getCurrentName(), Matchers.is(bagEntry));
+    }
+
+    private List<DataFile> createDataFiles(String... filePathItems) throws Exception {
+        List<DataFile> dataFiles = new ArrayList<>(filePathItems.length);
+
+        for(String filePath:  filePathItems) {
+            String fileName = Path.of(filePath).getFileName().toString();
+            DataFile dataFile = new DataFile();
+            dataFile.setId(MocksFactory.nextId());
+            dataFile.getFileMetadatas().add(new FileMetadata());
+            dataFile.getLatestFileMetadata().setLabel(fileName);
+            dataFiles.add(dataFile);
+        }
+
+        return dataFiles;
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerTest.java b/src/test/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerTest.java
new file mode 100644
index 00000000000..e8dff33db80
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerTest.java
@@ -0,0 +1,338 @@
+package edu.harvard.iq.dataverse.util.file;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.datasetutility.FileExceedsMaxSizeException;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.bagit.BagValidation;
+import edu.harvard.iq.dataverse.util.bagit.BagValidator;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProvider;
+import edu.harvard.iq.dataverse.util.bagit.data.FileDataProviderFactory;
+import edu.harvard.iq.dataverse.util.bagit.data.FileUtilWrapper;
+import edu.harvard.iq.dataverse.util.bagit.data.StringDataProvider;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class BagItFileHandlerTest {
+
+    private static final File FILE = new File("BagItFileHandlerTest");
+    private static final BagValidation BAG_VALIDATION_SUCCESS = new BagValidation(Optional.empty());
+
+    private static FileUtilWrapper FILE_UTIL;
+    private static SystemConfig SYSTEM_CONFIG;
+    private static DatasetVersion DATASET_VERSION;
+
+    private FileDataProviderFactory fileDataProviderFactory;
+    private BagValidator bagValidator;
+    private BagItFileHandlerPostProcessor postProcessor;
+
+    private BagItFileHandler target;
+
+    @BeforeEach
+    public void beforeEachTest() {
+        FILE_UTIL = Mockito.mock(FileUtilWrapper.class, Mockito.RETURNS_DEEP_STUBS);
+        SYSTEM_CONFIG = Mockito.mock(SystemConfig.class, Mockito.RETURNS_DEEP_STUBS);
+        DATASET_VERSION = Mockito.mock(DatasetVersion.class, Mockito.RETURNS_DEEP_STUBS);
+
+        Mockito.when(SYSTEM_CONFIG.getZipUploadFilesLimit()).thenReturn(20000);
+        Mockito.when(SYSTEM_CONFIG.getMaxFileUploadSizeForStore(Mockito.any())).thenReturn(20000l);
+        Mockito.when(SYSTEM_CONFIG.getFileFixityChecksumAlgorithm()).thenReturn(DataFile.ChecksumType.MD5);
+        Mockito.when(DATASET_VERSION.getDataset().getEffectiveStorageDriverId()).thenReturn("temp");
+
+        fileDataProviderFactory = Mockito.mock(FileDataProviderFactory.class);
+        bagValidator = Mockito.mock(BagValidator.class);
+        postProcessor = Mockito.spy(new BagItFileHandlerPostProcessor());
+        target = new BagItFileHandler(FILE_UTIL, fileDataProviderFactory, bagValidator, postProcessor);
+    }
+
+    @Test
+    public void isBagItPackage_should_return_false_when_no_bagIt_file_detected() throws IOException {
+        FileDataProvider fileDataProvider = Mockito.mock(FileDataProvider.class);
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(fileDataProvider);
+        Mockito.when(bagValidator.hasBagItPackage(fileDataProvider)).thenReturn(false);
+
+        boolean result = target.isBagItPackage(FILE.getName(), FILE);
+        MatcherAssert.assertThat(result, Matchers.is(false));
+        Mockito.verify(bagValidator).hasBagItPackage(fileDataProvider);
+        Mockito.verify(fileDataProvider).close();
+    }
+
+    @Test
+    public void isBagItPackage_should_return_true_when_bagIt_file_detected() throws IOException {
+        FileDataProvider fileDataProvider = Mockito.mock(FileDataProvider.class);
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(fileDataProvider);
+        Mockito.when(bagValidator.hasBagItPackage(fileDataProvider)).thenReturn(true);
+
+        boolean result = target.isBagItPackage(FILE.getName(), FILE);
+        MatcherAssert.assertThat(result, Matchers.is(true));
+        Mockito.verify(bagValidator).hasBagItPackage(fileDataProvider);
+        Mockito.verify(fileDataProvider).close();
+    }
+
+    @Test
+    public void handleBagItPackage_should_return_error_when_no_files_in_data_provider() throws IOException {
+        FileDataProvider fileDataProvider = Mockito.mock(FileDataProvider.class);
+        Mockito.when(fileDataProvider.getFilePaths()).thenReturn(Collections.emptyList());
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(fileDataProvider);
+
+        CreateDataFileResult result = target.handleBagItPackage(SYSTEM_CONFIG, DATASET_VERSION, FILE.getName(), FILE);
+        MatcherAssert.assertThat(result.success(), Matchers.is(false));
+        createDataFileResultAsserts(result);
+
+        handleBagItPackageAsserts(fileDataProvider);
+        Mockito.verifyNoInteractions(postProcessor);
+    }
+
+    @Test
+    public void handleBagItPackage_should_return_success_with_datafiles_when_bagIt_package_is_valid() throws Exception {
+        String bagEntry1 = "dir/path/" + UUID.randomUUID();
+        String bagEntry2 = "dir/test/" + UUID.randomUUID();
+        DataProviderWithDataFiles dataProviderWithDataFiles = createDataProviderWithDataFiles(bagEntry1, bagEntry2);
+        FileDataProvider dataProviderSpy = Mockito.spy(dataProviderWithDataFiles.dataProvider);
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(dataProviderSpy);
+        Mockito.when(bagValidator.validateChecksums(Mockito.any())).thenReturn(BAG_VALIDATION_SUCCESS);
+
+
+        CreateDataFileResult result = target.handleBagItPackage(SYSTEM_CONFIG, DATASET_VERSION, FILE.getName(), FILE);
+        MatcherAssert.assertThat(result.success(), Matchers.is(true));
+        createDataFileResultAsserts(result);
+        for(DataFile expectedDataFile: dataProviderWithDataFiles.dataFiles) {
+            MatcherAssert.assertThat(result.getDataFiles(), Matchers.hasItems(expectedDataFile));
+        }
+
+        handleBagItPackageAsserts(dataProviderSpy);
+        createDataFileAsserts(dataProviderWithDataFiles.dataProvider.getFilePaths());
+        Mockito.verify(postProcessor).process(Mockito.any());
+    }
+
+    @Test
+    public void handleBagItPackage_should_call_postprocessor_when_successful() throws Exception {
+        String bagEntry = "dir/path/" + UUID.randomUUID();
+        DataProviderWithDataFiles dataProviderWithDataFiles = createDataProviderWithDataFiles(bagEntry);
+        FileDataProvider dataProviderSpy = Mockito.spy(dataProviderWithDataFiles.dataProvider);
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(dataProviderSpy);
+        Mockito.when(bagValidator.validateChecksums(Mockito.any())).thenReturn(BAG_VALIDATION_SUCCESS);
+
+
+        CreateDataFileResult result = target.handleBagItPackage(SYSTEM_CONFIG, DATASET_VERSION, FILE.getName(), FILE);
+        MatcherAssert.assertThat(result.success(), Matchers.is(true));
+        createDataFileResultAsserts(result);
+        Mockito.verify(postProcessor).process(Mockito.any());
+        handleBagItPackageAsserts(dataProviderSpy);
+        createDataFileAsserts(dataProviderWithDataFiles.dataProvider.getFilePaths());
+        Mockito.verify(postProcessor).process(Mockito.any());
+    }
+
+    @Test
+    public void handleBagItPackage_should_set_file_data_metadata() throws Exception {
+        String bagEntry = "dir/path/" + UUID.randomUUID();
+        DataProviderWithDataFiles dataProviderWithDataFiles = createDataProviderWithDataFiles(bagEntry);
+        FileDataProvider dataProviderSpy = Mockito.spy(dataProviderWithDataFiles.dataProvider);
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(dataProviderSpy);
+        Mockito.when(bagValidator.validateChecksums(Mockito.any())).thenReturn(BAG_VALIDATION_SUCCESS);
+        Mockito.when(FILE_UTIL.determineFileType(Mockito.any(), Mockito.any())).thenReturn("TEST_TYPE");
+
+
+        CreateDataFileResult result = target.handleBagItPackage(SYSTEM_CONFIG, DATASET_VERSION, FILE.getName(), FILE);
+        MatcherAssert.assertThat(result.success(), Matchers.is(true));
+        createDataFileResultAsserts(result);
+        MatcherAssert.assertThat(result.getDataFiles().size(), Matchers.is(1));
+        MatcherAssert.assertThat(result.getDataFiles().get(0), Matchers.is(dataProviderWithDataFiles.dataFiles.get(0)));
+        MatcherAssert.assertThat(result.getDataFiles().get(0).getDirectoryLabel(), Matchers.is("dir/path"));
+        MatcherAssert.assertThat(result.getDataFiles().get(0).getContentType(), Matchers.is("TEST_TYPE"));
+
+        handleBagItPackageAsserts(dataProviderSpy);
+        createDataFileAsserts(dataProviderWithDataFiles.dataProvider.getFilePaths());
+        Mockito.verify(postProcessor).process(Mockito.any());
+    }
+
+    @Test
+    public void handleBagItPackage_should_ignore_exceptions_when_calculating_content_type() throws Exception {
+        String bagEntry = UUID.randomUUID().toString();
+        DataProviderWithDataFiles dataProviderWithDataFiles = createDataProviderWithDataFiles(bagEntry);
+        FileDataProvider dataProviderSpy = Mockito.spy(dataProviderWithDataFiles.dataProvider);
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(dataProviderSpy);
+        Mockito.when(bagValidator.validateChecksums(Mockito.any())).thenReturn(BAG_VALIDATION_SUCCESS);
+        Mockito.when(FILE_UTIL.determineFileType(Mockito.any(), Mockito.any())).thenThrow(new IOException("Error"));
+
+
+        CreateDataFileResult result = target.handleBagItPackage(SYSTEM_CONFIG, DATASET_VERSION, FILE.getName(), FILE);
+        MatcherAssert.assertThat(result.success(), Matchers.is(true));
+        createDataFileResultAsserts(result);
+        MatcherAssert.assertThat(result.getDataFiles().size(), Matchers.is(1));
+        MatcherAssert.assertThat(result.getDataFiles().get(0), Matchers.is(dataProviderWithDataFiles.dataFiles.get(0)));
+        MatcherAssert.assertThat(result.getDataFiles().get(0).getContentType(), Matchers.nullValue());
+
+        handleBagItPackageAsserts(dataProviderSpy);
+        createDataFileAsserts(dataProviderWithDataFiles.dataProvider.getFilePaths());
+        Mockito.verify(postProcessor).process(Mockito.any());
+    }
+
+    @Test
+    public void handleBagItPackage_should_ignore_nulls_datafiles_created_by_FileUtil() throws Exception {
+        String bagEntry = UUID.randomUUID().toString();
+        String returnNullDataFile = "return_null" + UUID.randomUUID().toString();
+        DataProviderWithDataFiles dataProviderWithDataFiles = createDataProviderWithDataFiles(bagEntry, returnNullDataFile);
+        FileDataProvider dataProviderSpy = Mockito.spy(dataProviderWithDataFiles.dataProvider);
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(dataProviderSpy);
+        Mockito.when(bagValidator.validateChecksums(Mockito.any())).thenReturn(BAG_VALIDATION_SUCCESS);
+
+
+        CreateDataFileResult result = target.handleBagItPackage(SYSTEM_CONFIG, DATASET_VERSION, FILE.getName(), FILE);
+        MatcherAssert.assertThat(result.success(), Matchers.is(true));
+        createDataFileResultAsserts(result);
+
+        DataFile expectedDataFile = dataProviderWithDataFiles.dataFiles.stream().filter(dataFile -> dataFile.getCurrentName().equals(bagEntry)).findFirst().get();
+        MatcherAssert.assertThat(result.getDataFiles().size(), Matchers.is(1));
+        MatcherAssert.assertThat(result.getDataFiles(), Matchers.hasItems(expectedDataFile));
+
+        handleBagItPackageAsserts(dataProviderSpy);
+        createDataFileAsserts(dataProviderWithDataFiles.dataProvider.getFilePaths());
+        Mockito.verify(postProcessor).process(Mockito.any());
+    }
+
+    @Test
+    public void handleBagItPackage_should_return_error_when_FileExceedsMaxSizeException_is_thrown() throws Exception {
+        String bagEntry = UUID.randomUUID().toString();
+        String exceptionDataFile = "FileExceedsMaxSizeException" + UUID.randomUUID();
+        DataProviderWithDataFiles dataProviderWithDataFiles = createDataProviderWithDataFiles(bagEntry, exceptionDataFile);
+        FileDataProvider dataProviderSpy = Mockito.spy(dataProviderWithDataFiles.dataProvider);
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(dataProviderSpy);
+        Mockito.when(bagValidator.validateChecksums(Mockito.any())).thenReturn(BAG_VALIDATION_SUCCESS);
+
+        Mockito.when(FILE_UTIL.saveInputStreamInTempFile(Mockito.any(), Mockito.any()))
+                .thenReturn(new File("test"))
+                .thenThrow(new FileExceedsMaxSizeException("file too big"));
+
+
+        CreateDataFileResult result = target.handleBagItPackage(SYSTEM_CONFIG, DATASET_VERSION, FILE.getName(), FILE);
+        MatcherAssert.assertThat(result.success(), Matchers.is(false));
+        createDataFileResultAsserts(result);
+        MatcherAssert.assertThat(result.getErrors().size(), Matchers.is(1));
+
+        handleBagItPackageAsserts(dataProviderSpy);
+        createDataFileAsserts(Arrays.asList(Path.of(bagEntry)), 2);
+        Mockito.verifyNoInteractions(postProcessor);
+    }
+
+    @Test
+    public void handleBagItPackage_should_return_error_when_the_maximum_number_of_files_is_exceeded() throws Exception {
+        Mockito.when(SYSTEM_CONFIG.getZipUploadFilesLimit()).thenReturn(1);
+        DataProviderWithDataFiles dataProviderWithDataFiles = createDataProviderWithDataFiles(UUID.randomUUID().toString(), UUID.randomUUID().toString());
+        FileDataProvider dataProviderSpy = Mockito.spy(dataProviderWithDataFiles.dataProvider);
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(dataProviderSpy);
+        Mockito.when(bagValidator.validateChecksums(Mockito.any())).thenReturn(BAG_VALIDATION_SUCCESS);
+
+
+        CreateDataFileResult result = target.handleBagItPackage(SYSTEM_CONFIG, DATASET_VERSION, FILE.getName(), FILE);
+        MatcherAssert.assertThat(result.success(), Matchers.is(false));
+        createDataFileResultAsserts(result);
+        MatcherAssert.assertThat(result.getErrors().size(), Matchers.is(1));
+
+        handleBagItPackageAsserts(dataProviderSpy);
+        Mockito.verifyNoInteractions(postProcessor);
+    }
+
+    @Test
+    public void handleBagItPackage_should_return_error_when_bag_validation_fails() throws Exception {
+        DataProviderWithDataFiles dataProviderWithDataFiles = createDataProviderWithDataFiles(UUID.randomUUID().toString());
+        FileDataProvider dataProviderSpy = Mockito.spy(dataProviderWithDataFiles.dataProvider);
+        Mockito.when(fileDataProviderFactory.getFileDataProvider(FILE)).thenReturn(dataProviderSpy);
+        Mockito.when(bagValidator.validateChecksums(Mockito.any())).thenReturn(new BagValidation(Optional.of("ERROR")));
+
+
+        CreateDataFileResult result = target.handleBagItPackage(SYSTEM_CONFIG, DATASET_VERSION, FILE.getName(), FILE);
+        MatcherAssert.assertThat(result.success(), Matchers.is(false));
+        createDataFileResultAsserts(result);
+
+        handleBagItPackageAsserts(dataProviderSpy);
+        createDataFileAsserts(dataProviderWithDataFiles.dataProvider.getFilePaths());
+        Mockito.verifyNoInteractions(postProcessor);
+    }
+
+    private void createDataFileResultAsserts(CreateDataFileResult result) {
+        MatcherAssert.assertThat(result.getFilename(), Matchers.is(FILE.getName()));
+        MatcherAssert.assertThat(result.getType(), Matchers.is(BagItFileHandler.FILE_TYPE));
+    }
+
+    private void handleBagItPackageAsserts(FileDataProvider dataProviderMock) throws IOException{
+        Mockito.verify(dataProviderMock).getFilePaths();
+        Mockito.verify(dataProviderMock).close();
+
+        Mockito.verify(fileDataProviderFactory).getFileDataProvider(Mockito.any(File.class));
+
+        Mockito.verify(SYSTEM_CONFIG).getZipUploadFilesLimit();
+        Mockito.verify(SYSTEM_CONFIG).getMaxFileUploadSizeForStore(Mockito.any());
+        Mockito.verify(SYSTEM_CONFIG).getFileFixityChecksumAlgorithm();
+
+        Mockito.verify(FILE_UTIL).deleteFile(FILE.toPath());
+    }
+
+    private void createDataFileAsserts(List<Path> filePaths) throws Exception {
+        createDataFileAsserts(filePaths, filePaths.size());
+    }
+
+    private void createDataFileAsserts(List<Path> filePaths, int saveInputStreamCalls) throws Exception {
+        Mockito.verify(FILE_UTIL, Mockito.times(saveInputStreamCalls)).saveInputStreamInTempFile(Mockito.any(), Mockito.any());
+
+        for(Path filePath: filePaths) {
+            Mockito.verify(FILE_UTIL).createSingleDataFile(Mockito.any(), Mockito.any(), Mockito.any(),
+                    Mockito.eq(filePath.getFileName().toString()), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
+        }
+    }
+
+    private DataProviderWithDataFiles createDataProviderWithDataFiles(String... filePathItems) throws Exception {
+        List<Path> filePaths = new ArrayList<>();
+        List<DataFile> dataFiles = new ArrayList<>();
+
+        for(String filePath:  filePathItems) {
+            String fileName = Path.of(filePath).getFileName().toString();
+            DataFile dataFile = new DataFile();
+            dataFile.setId(MocksFactory.nextId());
+            dataFile.getFileMetadatas().add(new FileMetadata());
+            dataFile.getLatestFileMetadata().setLabel(fileName);
+
+            if(filePath.startsWith("return_null")) {
+                dataFile = null;
+            }
+
+            Mockito.when(FILE_UTIL.createSingleDataFile(Mockito.any(), Mockito.any(), Mockito.any(),
+                    Mockito.eq(fileName), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(dataFile);
+
+            filePaths.add(Path.of(filePath));
+            dataFiles.add(dataFile);
+        }
+
+        return new DataProviderWithDataFiles(new StringDataProvider(false, filePaths), dataFiles);
+    }
+
+    private static class DataProviderWithDataFiles {
+        final FileDataProvider dataProvider;
+        final List<DataFile> dataFiles;
+
+        public DataProviderWithDataFiles(FileDataProvider dataProvider, List<DataFile> dataFiles) {
+            this.dataProvider = dataProvider;
+            this.dataFiles = dataFiles;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/file/CreateDataFileResultTest.java b/src/test/java/edu/harvard/iq/dataverse/util/file/CreateDataFileResultTest.java
new file mode 100644
index 00000000000..59d3ac15f11
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/file/CreateDataFileResultTest.java
@@ -0,0 +1,58 @@
+package edu.harvard.iq.dataverse.util.file;
+
+import edu.harvard.iq.dataverse.DataFile;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ * @author adaybujeda
+ */
+public class CreateDataFileResultTest {
+
+    @Test
+    public void error_static_initializer_should_return_error_result() {
+        CreateDataFileResult target = CreateDataFileResult.error("filename", "test_type");
+
+        MatcherAssert.assertThat(target.success(), Matchers.is(false));
+        MatcherAssert.assertThat(target.getFilename(), Matchers.is("filename"));
+        MatcherAssert.assertThat(target.getType(), Matchers.is("test_type"));
+        MatcherAssert.assertThat(target.getErrors(), Matchers.is(Collections.emptyList()));
+        MatcherAssert.assertThat(target.getDataFiles(), Matchers.nullValue());
+    }
+
+    @Test
+    public void error_static_initializer_with_messages_should_return_error_result() {
+        CreateDataFileResult target = CreateDataFileResult.error("filename", "test_type", Arrays.asList("error1", "error2"));
+
+        MatcherAssert.assertThat(target.success(), Matchers.is(false));
+        MatcherAssert.assertThat(target.getFilename(), Matchers.is("filename"));
+        MatcherAssert.assertThat(target.getType(), Matchers.is("test_type"));
+        MatcherAssert.assertThat(target.getErrors(), Matchers.is(Arrays.asList("error1", "error2")));
+        MatcherAssert.assertThat(target.getDataFiles(), Matchers.nullValue());
+    }
+
+    @Test
+    public void success_static_initializer_should_return_success_result() {
+        List<DataFile> dataFiles = Arrays.asList(new DataFile(), new DataFile());
+        CreateDataFileResult target = CreateDataFileResult.success("filename", "test_type", dataFiles);
+
+        MatcherAssert.assertThat(target.success(), Matchers.is(true));
+        MatcherAssert.assertThat(target.getFilename(), Matchers.is("filename"));
+        MatcherAssert.assertThat(target.getType(), Matchers.is("test_type"));
+        MatcherAssert.assertThat(target.getErrors(), Matchers.is(Collections.emptyList()));
+        MatcherAssert.assertThat(target.getDataFiles(), Matchers.is(dataFiles));
+    }
+
+    @Test
+    public void getBundleKey_should_return_string_based_on_type() {
+        CreateDataFileResult target = new CreateDataFileResult("filename", "test_type", Collections.emptyList(), Collections.emptyList());
+
+        MatcherAssert.assertThat(target.getBundleKey(), Matchers.is("dataset.file.error.test_type"));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinterTest.java
index dc36b197c55..fc458d88acd 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinterTest.java
@@ -1,20 +1,16 @@
 package edu.harvard.iq.dataverse.util.json;
 
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetField;
-import edu.harvard.iq.dataverse.DatasetFieldConstant;
-import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.MetadataBlock;
-import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUser;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
 import edu.harvard.iq.dataverse.workflow.Workflow;
-import javax.json.JsonObject;
-import org.junit.Test;
+import jakarta.json.JsonObject;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
+import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  *
@@ -59,14 +55,16 @@ public void testJson_MetadataBlock() {
         mtb.setId(1L);
         mtb.setName("metadata_block_name");
         mtb.setDisplayName("Metadata Block Name");
+        mtb.setDatasetFieldTypes(List.of(new DatasetFieldType("JustAString", DatasetFieldType.FieldType.TEXT, false)));
         
         BriefJsonPrinter sut = new BriefJsonPrinter();
         JsonObject res = sut.json(mtb).build();
         
         assertEquals("Metadata Block Name", res.getString("displayName"));        
-        assertEquals("metadata_block_name", res.getString("name"));        
-        assertEquals(1, res.getInt("id"));        
-        assertEquals(3, res.keySet().size());
+        assertEquals("metadata_block_name", res.getString("name"));
+        assertFalse(res.getBoolean("displayOnCreate"));
+        assertEquals(1, res.getInt("id"));
+        assertEquals(4, res.keySet().size());
     }
 
     /**
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/DatasetVersionDTOTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/DatasetVersionDTOTest.java
index c7077f936a0..7dd5ad9da8d 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/DatasetVersionDTOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/DatasetVersionDTOTest.java
@@ -17,12 +17,12 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Scanner;
-import junit.framework.Assert;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -34,19 +34,19 @@ public class DatasetVersionDTOTest {
     public DatasetVersionDTOTest() {
     }
     
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
     
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
     
-    @Before
+    @BeforeEach
     public void setUp() {
        
     }
-    @After
+    @AfterEach
     public void tearDown() {
     }
     
@@ -89,7 +89,7 @@ public void testReadDataSet() {
             JsonElement expected = gson.toJsonTree(expectedDTO, FieldDTO.class);
             JsonElement result = gson.toJsonTree(authorDTO);
             
-            Assert.assertEquals(expected, result);
+            assertEquals(expected, result);
             
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinterTest.java
new file mode 100644
index 00000000000..f0b2b9dc3f9
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinterTest.java
@@ -0,0 +1,503 @@
+package edu.harvard.iq.dataverse.util.json;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import jakarta.json.JsonArrayBuilder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collections;
+
+import static edu.harvard.iq.dataverse.util.json.InAppNotificationsJsonPrinter.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+public class InAppNotificationsJsonPrinterTest {
+
+    @Mock
+    private DataverseServiceBean dataverseService;
+    @Mock
+    private DatasetServiceBean datasetService;
+    @Mock
+    private DatasetVersionServiceBean datasetVersionService;
+    @Mock
+    private DataFileServiceBean dataFileService;
+    @Mock
+    private PermissionServiceBean permissionService;
+    @Mock
+    private SystemConfig systemConfig;
+
+    @InjectMocks
+    private InAppNotificationsJsonPrinter sut;
+
+    @Mock
+    private NullSafeJsonBuilder notificationJson;
+    @Mock
+    private AuthenticatedUser authenticatedUser;
+    @Mock
+    private AuthenticatedUser requestor;
+
+    private UserNotification userNotification;
+
+    private final GlobalId testGlobalId = new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, "10.5072", "FK2/BYM3IW", "/", AbstractDOIProvider.DOI_RESOLVER_URL, null);
+
+    @BeforeEach
+    public void setUp() {
+        userNotification = new UserNotification();
+    }
+
+    @Test
+    public void testAddFieldsByType_assignRole_dataverse() {
+        userNotification.setType(UserNotification.Type.ASSIGNROLE);
+        userNotification.setObjectId(1L);
+
+        Dataverse dataverse = mock(Dataverse.class);
+        when(dataverse.getAlias()).thenReturn("testdv");
+        when(dataverse.getDisplayName()).thenReturn("Test Dataverse");
+        when(dataverseService.find(1L)).thenReturn(dataverse);
+        when(permissionService.getEffectiveRoleAssignments(authenticatedUser, dataverse)).thenReturn(Collections.emptyList());
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(eq(KEY_ROLE_ASSIGNMENTS), any(JsonArrayBuilder.class));
+        verify(notificationJson).add(KEY_DATAVERSE_ALIAS, "testdv");
+        verify(notificationJson).add(KEY_DATAVERSE_DISPLAY_NAME, "Test Dataverse");
+        verifyNoInteractions(datasetService, dataFileService);
+    }
+
+    @Test
+    public void testAddFieldsByType_assignRole_dataset() {
+        userNotification.setType(UserNotification.Type.ASSIGNROLE);
+        userNotification.setObjectId(1L);
+
+        Dataset dataset = mock(Dataset.class);
+        when(dataset.getGlobalId()).thenReturn(testGlobalId);
+        when(dataset.getDisplayName()).thenReturn("Test Dataset");
+
+        when(dataverseService.find(1L)).thenReturn(null);
+        when(datasetService.find(1L)).thenReturn(dataset);
+        when(permissionService.getEffectiveRoleAssignments(authenticatedUser, dataset)).thenReturn(Collections.emptyList());
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(eq(KEY_ROLE_ASSIGNMENTS), any(JsonArrayBuilder.class));
+        verify(notificationJson).add(KEY_DATASET_PERSISTENT_ID, testGlobalId.toString());
+        verify(notificationJson).add(KEY_DATASET_DISPLAY_NAME, "Test Dataset");
+        verifyNoInteractions(dataFileService);
+    }
+
+    @Test
+    public void testAddFieldsByType_revokeRole_dataFile() {
+        userNotification.setType(UserNotification.Type.REVOKEROLE);
+        userNotification.setObjectId(1L);
+
+        DataFile dataFile = mock(DataFile.class);
+        Dataset owner = mock(Dataset.class);
+
+        when(dataFile.getOwner()).thenReturn(owner);
+        when(owner.getGlobalId()).thenReturn(testGlobalId);
+        when(owner.getDisplayName()).thenReturn("Owner Dataset");
+
+        when(dataverseService.find(1L)).thenReturn(null);
+        when(datasetService.find(1L)).thenReturn(null);
+        when(dataFileService.find(1L)).thenReturn(dataFile);
+        when(permissionService.getEffectiveRoleAssignments(authenticatedUser, dataFile)).thenReturn(Collections.emptyList());
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(eq(KEY_ROLE_ASSIGNMENTS), any(JsonArrayBuilder.class));
+        verify(notificationJson).add(KEY_OWNER_PERSISTENT_ID, testGlobalId.toString());
+        verify(notificationJson).add(KEY_OWNER_DISPLAY_NAME, "Owner Dataset");
+    }
+
+    @Test
+    public void testAddFieldsByType_revokeRole_objectDeleted() {
+        userNotification.setType(UserNotification.Type.REVOKEROLE);
+        userNotification.setObjectId(1L);
+
+        when(dataverseService.find(1L)).thenReturn(null);
+        when(datasetService.find(1L)).thenReturn(null);
+        when(dataFileService.find(1L)).thenReturn(null);
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_OBJECT_DELETED, true);
+    }
+
+    @Test
+    public void testAddFieldsByType_createDv_dvHasOwner() {
+        userNotification.setType(UserNotification.Type.CREATEDV);
+        userNotification.setObjectId(1L);
+
+        Dataverse dataverse = mock(Dataverse.class);
+        Dataverse owner = mock(Dataverse.class);
+
+        when(dataverse.getAlias()).thenReturn("childDv");
+        when(dataverse.getDisplayName()).thenReturn("Child Dataverse");
+        when(dataverse.getOwner()).thenReturn(owner);
+
+        when(owner.getAlias()).thenReturn("parentDv");
+        when(owner.getDisplayName()).thenReturn("Parent Dataverse");
+
+        when(dataverseService.find(1L)).thenReturn(dataverse);
+        when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_DATAVERSE_ALIAS, "childDv");
+        verify(notificationJson).add(KEY_DATAVERSE_DISPLAY_NAME, "Child Dataverse");
+        verify(notificationJson).add(KEY_OWNER_ALIAS, "parentDv");
+        verify(notificationJson).add(KEY_OWNER_DISPLAY_NAME, "Parent Dataverse");
+        verify(notificationJson).add(KEY_GUIDES_BASE_URL, "http://guides.dataverse.org");
+        verify(notificationJson).add(KEY_GUIDES_VERSION, "1.0");
+        verify(notificationJson).add(KEY_GUIDES_SECTION_PATH, GUIDES_SECTION_PATH_DATAVERSE_MANAGEMENT_HTML);
+    }
+
+    @Test
+    public void testAddFieldsByType_createDv_dvHasNoOwner() {
+        userNotification.setType(UserNotification.Type.CREATEDV);
+        userNotification.setObjectId(1L);
+
+        Dataverse dataverse = mock(Dataverse.class);
+
+        when(dataverse.getAlias()).thenReturn("dv");
+        when(dataverse.getDisplayName()).thenReturn("Dataverse");
+        when(dataverse.getOwner()).thenReturn(null);
+
+        when(dataverseService.find(1L)).thenReturn(dataverse);
+        when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_DATAVERSE_ALIAS, "dv");
+        verify(notificationJson).add(KEY_DATAVERSE_DISPLAY_NAME, "Dataverse");
+        verify(notificationJson).add(KEY_GUIDES_BASE_URL, "http://guides.dataverse.org");
+        verify(notificationJson).add(KEY_GUIDES_VERSION, "1.0");
+        verify(notificationJson).add(KEY_GUIDES_SECTION_PATH, GUIDES_SECTION_PATH_DATAVERSE_MANAGEMENT_HTML);
+    }
+
+    @Test
+    public void testAddFieldsByType_createDv_objectDeleted() {
+        userNotification.setType(UserNotification.Type.CREATEDV);
+        userNotification.setObjectId(1L);
+
+        when(dataverseService.find(1L)).thenReturn(null);
+        when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_GUIDES_BASE_URL, "http://guides.dataverse.org");
+        verify(notificationJson).add(KEY_GUIDES_VERSION, "1.0");
+        verify(notificationJson).add(KEY_GUIDES_SECTION_PATH, GUIDES_SECTION_PATH_DATAVERSE_MANAGEMENT_HTML);
+        verify(notificationJson).add(KEY_OBJECT_DELETED, true);
+    }
+
+    @Test
+    public void testAddFieldsByType_requestFileAccess() {
+        userNotification.setType(UserNotification.Type.REQUESTFILEACCESS);
+        userNotification.setObjectId(1L);
+        userNotification.setRequestor(requestor);
+
+        when(requestor.getFirstName()).thenReturn("John");
+        when(requestor.getLastName()).thenReturn("Doe");
+        when(requestor.getEmail()).thenReturn("johndoe@example.com");
+
+        DataFile dataFile = mock(DataFile.class);
+        when(dataFile.getId()).thenReturn(1L);
+        when(dataFile.getDisplayName()).thenReturn("Test File");
+        when(dataFileService.find(1L)).thenReturn(dataFile);
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_REQUESTOR_FIRST_NAME, "John");
+        verify(notificationJson).add(KEY_REQUESTOR_LAST_NAME, "Doe");
+        verify(notificationJson).add(KEY_REQUESTOR_EMAIL, "johndoe@example.com");
+        verify(notificationJson).add(KEY_DATAFILE_ID, Long.valueOf("1"));
+        verify(notificationJson).add(KEY_DATAFILE_DISPLAY_NAME, "Test File");
+    }
+
+    @Test
+    public void testAddFieldsByType_grantFileAccess() {
+        userNotification.setType(UserNotification.Type.GRANTFILEACCESS);
+        userNotification.setObjectId(1L);
+
+        DataFile dataFile = mock(DataFile.class);
+        when(dataFile.getId()).thenReturn(1L);
+        when(dataFile.getDisplayName()).thenReturn("Granted File");
+        when(dataFileService.find(1L)).thenReturn(dataFile);
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_DATAFILE_ID, Long.valueOf("1"));
+        verify(notificationJson).add(KEY_DATAFILE_DISPLAY_NAME, "Granted File");
+        verify(notificationJson, never()).add(eq(KEY_REQUESTOR_FIRST_NAME), anyString());
+    }
+
+    @Test
+    public void testAddFieldsByType_grantFileAccess_objectDeleted() {
+        userNotification.setType(UserNotification.Type.GRANTFILEACCESS);
+        userNotification.setObjectId(1L);
+
+        when(dataFileService.find(1L)).thenReturn(null);
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_OBJECT_DELETED, true);
+    }
+
+    @Test
+    public void testAddFieldsByType_createDs() {
+        userNotification.setType(UserNotification.Type.CREATEDS);
+        userNotification.setObjectId(1L);
+
+        DatasetVersion datasetVersion = mock(DatasetVersion.class);
+        Dataset dataset = mock(Dataset.class);
+        Dataverse owner = mock(Dataverse.class);
+
+        when(owner.getAlias()).thenReturn("ownerDv");
+        when(owner.getDisplayName()).thenReturn("Owner Dataverse");
+
+        when(datasetVersion.getDataset()).thenReturn(dataset);
+
+        when(dataset.getGlobalId()).thenReturn(testGlobalId);
+        when(dataset.getDisplayName()).thenReturn("My Dataset");
+        when(dataset.getOwner()).thenReturn(owner);
+
+        when(datasetVersionService.find(1L)).thenReturn(datasetVersion);
+
+        when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_GUIDES_BASE_URL, "http://guides.dataverse.org");
+        verify(notificationJson).add(KEY_GUIDES_VERSION, "1.0");
+        verify(notificationJson).add(KEY_GUIDES_SECTION_PATH, GUIDES_SECTION_PATH_DATASET_MANAGEMENT_HTML);
+        verify(notificationJson).add(KEY_DATASET_PERSISTENT_ID, testGlobalId.toString());
+        verify(notificationJson).add(KEY_DATASET_DISPLAY_NAME, "My Dataset");
+        verify(notificationJson).add(KEY_OWNER_ALIAS, "ownerDv");
+        verify(notificationJson).add(KEY_OWNER_DISPLAY_NAME, "Owner Dataverse");
+    }
+
+    @Test
+    public void testAddFieldsByType_submittedDs() {
+        userNotification.setType(UserNotification.Type.SUBMITTEDDS);
+        userNotification.setObjectId(1L);
+        userNotification.setRequestor(requestor);
+
+        Dataset dataset = mock(Dataset.class);
+        Dataverse owner = mock(Dataverse.class);
+
+        when(dataset.getGlobalId()).thenReturn(testGlobalId);
+        when(dataset.getDisplayName()).thenReturn("Submitted Dataset");
+        when(dataset.getOwner()).thenReturn(owner);
+        when(datasetService.find(1L)).thenReturn(dataset);
+
+        when(owner.getAlias()).thenReturn("reviewDv");
+        when(owner.getDisplayName()).thenReturn("Review Dataverse");
+
+        when(requestor.getFirstName()).thenReturn("Jane");
+        when(requestor.getLastName()).thenReturn("Submitter");
+        when(requestor.getEmail()).thenReturn("j.submitter@example.com");
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_DATASET_PERSISTENT_ID, testGlobalId.toString());
+        verify(notificationJson).add(KEY_DATASET_DISPLAY_NAME, "Submitted Dataset");
+        verify(notificationJson).add(KEY_OWNER_ALIAS, "reviewDv");
+        verify(notificationJson).add(KEY_OWNER_DISPLAY_NAME, "Review Dataverse");
+        verify(notificationJson).add(KEY_REQUESTOR_FIRST_NAME, "Jane");
+        verify(notificationJson).add(KEY_REQUESTOR_LAST_NAME, "Submitter");
+        verify(notificationJson).add(KEY_REQUESTOR_EMAIL, "j.submitter@example.com");
+    }
+
+    @Test
+    public void testAddFieldsByType_publishedDs() {
+        userNotification.setType(UserNotification.Type.PUBLISHEDDS);
+        userNotification.setObjectId(1L);
+
+        DatasetVersion datasetVersion = mock(DatasetVersion.class);
+        Dataset dataset = mock(Dataset.class);
+        Dataverse owner = mock(Dataverse.class);
+
+        when(owner.getAlias()).thenReturn("ownerDv");
+        when(owner.getDisplayName()).thenReturn("Owner Dataverse");
+
+        when(datasetVersion.getDataset()).thenReturn(dataset);
+
+        when(dataset.getOwner()).thenReturn(owner);
+        when(dataset.getGlobalId()).thenReturn(testGlobalId);
+        when(dataset.getDisplayName()).thenReturn("Published Dataset");
+
+        when(datasetVersionService.find(1L)).thenReturn(datasetVersion);
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_DATASET_PERSISTENT_ID, testGlobalId.toString());
+        verify(notificationJson).add(KEY_DATASET_DISPLAY_NAME, "Published Dataset");
+        verify(notificationJson, never()).add(eq(KEY_CURATION_STATUS), anyString());
+        verify(notificationJson).add(KEY_OWNER_ALIAS, "ownerDv");
+        verify(notificationJson).add(KEY_OWNER_DISPLAY_NAME, "Owner Dataverse");
+    }
+
+    @Test
+    public void testAddFieldsByType_statusUpdated() {
+        userNotification.setType(UserNotification.Type.STATUSUPDATED);
+        userNotification.setObjectId(1L);
+
+        DatasetVersion datasetVersion = mock(DatasetVersion.class);
+        Dataset dataset = mock(Dataset.class);
+        Dataverse owner = mock(Dataverse.class);
+
+        when(owner.getAlias()).thenReturn("ownerDv");
+        when(owner.getDisplayName()).thenReturn("Owner Dataverse");
+
+        CurationStatus curationStatusMock = mock(CurationStatus.class);
+        when(curationStatusMock.getLabel()).thenReturn("testStatus");
+
+        when(datasetVersion.getDataset()).thenReturn(dataset);
+        when(datasetVersion.getCurrentCurationStatus()).thenReturn(curationStatusMock);
+        when(datasetVersionService.find(1L)).thenReturn(datasetVersion);
+
+        when(dataset.getOwner()).thenReturn(owner);
+        when(dataset.getGlobalId()).thenReturn(testGlobalId);
+        when(dataset.getDisplayName()).thenReturn("Status Update Dataset");
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_DATASET_PERSISTENT_ID, testGlobalId.toString());
+        verify(notificationJson).add(KEY_DATASET_DISPLAY_NAME, "Status Update Dataset");
+        verify(notificationJson).add(eq(KEY_CURATION_STATUS), any(String.class));
+        verify(notificationJson).add(KEY_OWNER_ALIAS, "ownerDv");
+        verify(notificationJson).add(KEY_OWNER_DISPLAY_NAME, "Owner Dataverse");
+    }
+
+    @Test
+    public void testAddFieldsByType_statusUpdated_objectDeleted() {
+        userNotification.setType(UserNotification.Type.STATUSUPDATED);
+        userNotification.setObjectId(1L);
+
+        when(datasetVersionService.find(1L)).thenReturn(null);
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_OBJECT_DELETED, true);
+    }
+
+    @Test
+    public void testAddFieldsByType_createAcc() {
+        userNotification.setType(UserNotification.Type.CREATEACC);
+        try (MockedStatic<BrandingUtil> mockedBrandingUtil = mockStatic(BrandingUtil.class)) {
+            mockedBrandingUtil.when(BrandingUtil::getInstallationBrandName).thenReturn("My Test Brand Name");
+
+            when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
+            when(systemConfig.getGuidesVersion()).thenReturn("1.0");
+
+            sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+            verify(notificationJson).add(KEY_INSTALLATION_BRAND_NAME, "My Test Brand Name");
+            verify(notificationJson).add(KEY_GUIDES_BASE_URL, "http://guides.dataverse.org");
+            verify(notificationJson).add(KEY_GUIDES_VERSION, "1.0");
+            verify(notificationJson).add(KEY_GUIDES_SECTION_PATH, GUIDES_SECTION_PATH_USER_HTML);
+        }
+    }
+
+    @Test
+    public void testAddFieldsByType_ingestCompleted() {
+        userNotification.setType(UserNotification.Type.INGESTCOMPLETED);
+        userNotification.setObjectId(1L);
+
+        Dataset dataset = mock(Dataset.class);
+        Dataverse owner = mock(Dataverse.class);
+
+        when(dataset.getGlobalId()).thenReturn(testGlobalId);
+        when(dataset.getDisplayName()).thenReturn("Ingested Dataset");
+        when(dataset.getOwner()).thenReturn(owner);
+
+        when(owner.getAlias()).thenReturn("ownerDv");
+        when(owner.getDisplayName()).thenReturn("Owner Dataverse");
+
+        when(datasetService.find(1L)).thenReturn(dataset);
+
+        when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_DATASET_PERSISTENT_ID, testGlobalId.toString());
+        verify(notificationJson).add(KEY_DATASET_DISPLAY_NAME, "Ingested Dataset");
+        verify(notificationJson).add(KEY_OWNER_ALIAS, "ownerDv");
+        verify(notificationJson).add(KEY_OWNER_DISPLAY_NAME, "Owner Dataverse");
+        verify(notificationJson).add(KEY_GUIDES_BASE_URL, "http://guides.dataverse.org");
+        verify(notificationJson).add(KEY_GUIDES_VERSION, "1.0");
+        verify(notificationJson).add(KEY_GUIDES_SECTION_PATH, GUIDES_SECTION_PATH_DATASET_MANAGEMENT_TABULAR_FILES_HTML);
+    }
+
+    @Test
+    public void testAddFieldsByType_ingestCompleted_objectDeleted() {
+        userNotification.setType(UserNotification.Type.INGESTCOMPLETED);
+        userNotification.setObjectId(1L);
+
+        when(datasetService.find(1L)).thenReturn(null);
+
+        when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_OBJECT_DELETED, true);
+        verify(notificationJson).add(KEY_GUIDES_BASE_URL, "http://guides.dataverse.org");
+        verify(notificationJson).add(KEY_GUIDES_VERSION, "1.0");
+        verify(notificationJson).add(KEY_GUIDES_SECTION_PATH, GUIDES_SECTION_PATH_DATASET_MANAGEMENT_TABULAR_FILES_HTML);
+    }
+
+    @Test
+    public void testAddFieldsByType_datasetMentioned() {
+        userNotification.setType(UserNotification.Type.DATASETMENTIONED);
+        userNotification.setObjectId(1L);
+        userNotification.setAdditionalInfo("Mentioned in another dataset.");
+
+        Dataset dataset = mock(Dataset.class);
+        Dataverse owner = mock(Dataverse.class);
+
+        when(dataset.getGlobalId()).thenReturn(testGlobalId);
+        when(dataset.getDisplayName()).thenReturn("Mentioned Dataset");
+        when(dataset.getOwner()).thenReturn(owner);
+        when(datasetService.find(1L)).thenReturn(dataset);
+
+        when(owner.getAlias()).thenReturn("ownerDv");
+        when(owner.getDisplayName()).thenReturn("Owner Dataverse");
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson).add(KEY_DATASET_PERSISTENT_ID, testGlobalId.toString());
+        verify(notificationJson).add(KEY_DATASET_DISPLAY_NAME, "Mentioned Dataset");
+        verify(notificationJson).add(KEY_OWNER_ALIAS, "ownerDv");
+        verify(notificationJson).add(KEY_OWNER_DISPLAY_NAME, "Owner Dataverse");
+        verify(notificationJson).add(KEY_ADDITIONAL_INFO, "Mentioned in another dataset.");
+    }
+
+    @Test
+    public void testAddFieldsByType_noOpType() {
+        // APIGENERATED is a valid type but is not handled by the switch statement,
+        // so no fields should be added.
+        userNotification.setType(UserNotification.Type.APIGENERATED);
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verifyNoInteractions(notificationJson);
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonDatasetVersion.txt b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonDatasetVersion.txt
index 22eb9af39f1..a144ca9c9b6 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonDatasetVersion.txt
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonDatasetVersion.txt
@@ -232,16 +232,16 @@
                                         "typeName": "eastLongitude",
                                         "value": "23"
                                     },
-                                    "northLongitude": {
+                                    "northLatitude": {
                                         "multiple": false,
                                         "typeClass": "primitive",
-                                        "typeName": "northLongitude",
+                                        "typeName": "northLatitude",
                                         "value": "786"
                                     },
-                                    "southLongitude": {
+                                    "southLatitude": {
                                         "multiple": false,
                                         "typeClass": "primitive",
-                                        "typeName": "southLongitude",
+                                        "typeName": "southLatitude",
                                         "value": "34"
                                     },
                                     "westLongitude": {
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonParserTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonParserTest.java
index 412daf58058..d1cb30e2bc3 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonParserTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonParserTest.java
@@ -4,26 +4,38 @@
 
 package edu.harvard.iq.dataverse.util.json;
 
-import edu.harvard.iq.dataverse.ControlledVocabularyValue;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetField;
-import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
-import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
-import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
-import edu.harvard.iq.dataverse.DatasetFieldValue;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseTheme.Alignment;
+import edu.harvard.iq.dataverse.UserNotification.Type;
+import edu.harvard.iq.dataverse.api.dto.DataverseDTO;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroup;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroupProvider;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddressRange;
-import edu.harvard.iq.dataverse.DataverseTheme.Alignment;
-import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroup;
+import edu.harvard.iq.dataverse.authorization.groups.impl.maildomain.MailDomainGroupTest;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.dataset.DatasetTypeServiceBean;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.mocks.MockDatasetFieldSvc;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,32 +43,11 @@
 import java.io.StringReader;
 import java.math.BigDecimal;
 import java.text.ParseException;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
@@ -66,6 +57,8 @@ public class JsonParserTest {
     
     MockDatasetFieldSvc datasetFieldTypeSvc = null;
     MockSettingsSvc settingsSvc = null;
+    LicenseServiceBean licenseService = Mockito.mock(LicenseServiceBean.class);
+    DatasetTypeServiceBean datasetTypeService = Mockito.mock(DatasetTypeServiceBean.class);
     DatasetFieldType keywordType;
     DatasetFieldType descriptionType;
     DatasetFieldType subjectType;
@@ -76,17 +69,18 @@ public class JsonParserTest {
     public JsonParserTest() {
     }
     
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
     
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
     
-    @Before
+    @BeforeEach
     public void setUp() {
         datasetFieldTypeSvc = new MockDatasetFieldSvc();
+        datasetFieldTypeSvc.setMetadataBlock("citation");
 
         keywordType = datasetFieldTypeSvc.add(new DatasetFieldType("keyword", FieldType.TEXT, true));
         descriptionType = datasetFieldTypeSvc.add( new DatasetFieldType("description", FieldType.TEXTBOX, false) );
@@ -117,7 +111,11 @@ public void setUp() {
         }
         compoundSingleType.setChildDatasetFieldTypes(childTypes);
         settingsSvc = new MockSettingsSvc();
-        sut = new JsonParser(datasetFieldTypeSvc, null, settingsSvc);
+        DatasetType datasetType = new DatasetType();
+        datasetType.setName(DatasetType.DEFAULT_DATASET_TYPE);
+        datasetType.setId(1l);
+        Mockito.when(datasetTypeService.getByName(DatasetType.DEFAULT_DATASET_TYPE)).thenReturn(datasetType);
+        sut = new JsonParser(datasetFieldTypeSvc, null, settingsSvc, licenseService, datasetTypeService);
     }
     
     @Test 
@@ -178,8 +176,8 @@ public void testControlledVocalRepeatsRoundTrip() throws JsonParseException {
     }
     
     
-    @Test(expected=JsonParseException.class)
-     public void testChildValidation() throws JsonParseException {
+    @Test
+    void testChildValidation() {
         // This Json String is a compound field that contains the wrong
         // fieldType as a child ("description" is not a child of "coordinate").
         // It should throw a JsonParseException when it encounters the invalid child.
@@ -204,8 +202,8 @@ public void testChildValidation() throws JsonParseException {
         JsonReader jsonReader = Json.createReader(new StringReader(text));
         JsonObject obj = jsonReader.readObject();
 
-        sut.parseField(obj);
-       }
+        assertThrows(JsonParseException.class, () -> sut.parseField(obj));
+    }
     
     
     @Test
@@ -267,6 +265,33 @@ public void testParseCompleteDataverse() throws JsonParseException {
             throw new JsonParseException("Couldn't read test file", ioe);
         }
     }
+
+    /**
+     * Test that a JSON object passed for a DataverseDTO is correctly parsed.
+     * This checks that all properties are parsed into the correct DataverseDTO properties.
+     * @throws JsonParseException when this test is broken.
+     */
+    @Test
+    public void parseDataverseDTO() throws JsonParseException {
+        JsonObject dvJson;
+        try (FileReader reader = new FileReader("doc/sphinx-guides/source/_static/api/dataverse-complete.json")) {
+            dvJson = Json.createReader(reader).readObject();
+            DataverseDTO actual = sut.parseDataverseDTO(dvJson);
+            List<DataverseContact> actualDataverseContacts = actual.getDataverseContacts();
+            assertEquals("Scientific Research", actual.getName());
+            assertEquals("science", actual.getAlias());
+            assertEquals("Scientific Research University", actual.getAffiliation());
+            assertEquals("We do all the science.", actual.getDescription());
+            assertEquals("LABORATORY", actual.getDataverseType().toString());
+            assertEquals(2, actualDataverseContacts.size());
+            assertEquals("pi@example.edu", actualDataverseContacts.get(0).getContactEmail());
+            assertEquals("student@example.edu", actualDataverseContacts.get(1).getContactEmail());
+            assertEquals(0, actualDataverseContacts.get(0).getDisplayOrder());
+            assertEquals(1, actualDataverseContacts.get(1).getDisplayOrder());
+        } catch (IOException ioe) {
+            throw new JsonParseException("Couldn't read test file", ioe);
+        }
+    }
     
     @Test
     public void testParseThemeDataverse() throws JsonParseException {
@@ -327,12 +352,12 @@ public void testParseMinimalDataverse() throws JsonParseException {
      * @throws JsonParseException if all goes well - this is expected.
      * @throws IOException when test file IO goes wrong - this is bad.
      */
-    @Test(expected = JsonParseException.class)
-    public void testParseNoAliasDataverse() throws JsonParseException, IOException {
+    @Test
+    void testParseNoAliasDataverse() throws IOException {
         JsonObject dvJson;
         try (InputStream jsonFile = ClassLoader.getSystemResourceAsStream("json/no-alias-dataverse.json")) {
             dvJson = Json.createReader(jsonFile).readObject();
-            Dataverse actual = sut.parseDataverse(dvJson);
+            assertThrows(JsonParseException.class, () -> sut.parseDataverse(dvJson));
         }
     }
     
@@ -341,12 +366,12 @@ public void testParseNoAliasDataverse() throws JsonParseException, IOException {
      * @throws JsonParseException if all goes well - this is expected.
      * @throws IOException when test file IO goes wrong - this is bad.
      */
-    @Test(expected = JsonParseException.class)
-    public void testParseNoNameDataverse() throws JsonParseException, IOException {
+    @Test
+    void testParseNoNameDataverse() throws IOException {
         JsonObject dvJson;
         try (InputStream jsonFile = ClassLoader.getSystemResourceAsStream("json/no-name-dataverse.json")) {
             dvJson = Json.createReader(jsonFile).readObject();
-            Dataverse actual = sut.parseDataverse(dvJson);
+            assertThrows(JsonParseException.class, () -> sut.parseDataverse(dvJson));
         }
     }
     
@@ -356,12 +381,12 @@ public void testParseNoNameDataverse() throws JsonParseException, IOException {
      * @throws JsonParseException if all goes well - this is expected.
      * @throws IOException when test file IO goes wrong - this is bad.
      */
-    @Test(expected = JsonParseException.class)
-    public void testParseNoContactEmailsDataverse() throws JsonParseException, IOException {
+    @Test
+    void testParseNoContactEmailsDataverse() throws IOException {
         JsonObject dvJson;
         try (InputStream jsonFile = ClassLoader.getSystemResourceAsStream("json/no-contacts-dataverse.json")) {
             dvJson = Json.createReader(jsonFile).readObject();
-            Dataverse actual = sut.parseDataverse(dvJson);
+            assertThrows(JsonParseException.class, () -> sut.parseDataverse(dvJson));
         }
     }
 
@@ -414,16 +439,14 @@ public void testDateTimeRoundtrip() throws ParseException {
      * Expect an exception when the dataset JSON is empty.
      * @throws JsonParseException when the test is broken
      */
-    @Test(expected = NullPointerException.class)
-    public void testParseEmptyDataset() throws JsonParseException {
+    @Test
+    void testParseEmptyDataset() throws JsonParseException {
         JsonObject dsJson;
         try (InputStream jsonFile = ClassLoader.getSystemResourceAsStream("json/empty-dataset.json")) {
             InputStreamReader reader = new InputStreamReader(jsonFile, "UTF-8");
             dsJson = Json.createReader(reader).readObject();
             System.out.println(dsJson != null);
-            Dataset actual = sut.parseDataset(dsJson);
-            assertEquals("10.5072", actual.getAuthority());
-            assertEquals("doi", actual.getProtocol());
+            assertThrows(NullPointerException.class, () -> sut.parseDataset(dsJson));
         } catch (IOException ioe) {
             throw new JsonParseException("Couldn't read test file", ioe);
         }
@@ -431,19 +454,19 @@ public void testParseEmptyDataset() throws JsonParseException {
 
     /**
      * 
-     * Expect an exception when the dataset version JSON contains fields
+     * Expect no exception when the dataset version JSON contains fields
      * that the {@link DatasetFieldService} doesn't know about.
-     * @throws JsonParseException as expected
+     * @throws JsonParseException should not happen here
      * @throws IOException when test file IO goes wrong - this is bad.
      */
-    @Test(expected = JsonParseException.class)
-    public void testParseOvercompleteDatasetVersion() throws JsonParseException, IOException {
+    @Test
+    void testParseOvercompleteDatasetVersion() throws IOException {
         JsonObject dsJson;
         try (InputStream jsonFile = ClassLoader.getSystemResourceAsStream("json/complete-dataset-version.json")) {
             InputStreamReader reader = new InputStreamReader(jsonFile, "UTF-8");
             dsJson = Json.createReader(reader).readObject();
-            System.out.println(dsJson != null);
-            DatasetVersion actual = sut.parseDatasetVersion(dsJson);
+            Assumptions.assumeTrue(dsJson != null);
+            assertDoesNotThrow(() -> sut.parseDatasetVersion(dsJson));
         }
     }
     
@@ -531,6 +554,61 @@ public void testIpGroupRoundTrip_singleIpv6Address() {
         assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("2.1.1.1")) ));
         
     }
+    
+    @Test
+    public void testValidMailDomainGroup() throws JsonParseException {
+        // given
+        MailDomainGroup test = MailDomainGroupTest.genGroup();
+        
+        // when
+        JsonObject serialized = JsonPrinter.json(test).build();
+        MailDomainGroup parsed = new JsonParser().parseMailDomainGroup(serialized);
+        
+        // then
+        assertEquals(test, parsed);
+        assertEquals(test.hashCode(), parsed.hashCode());
+    }
+    
+    @Test
+    public void testValidRegexMailDomainGroup() throws JsonParseException {
+        // given
+        MailDomainGroup test = MailDomainGroupTest.genRegexGroup();
+        
+        // when
+        JsonObject serialized = JsonPrinter.json(test).build();
+        MailDomainGroup parsed = new JsonParser().parseMailDomainGroup(serialized);
+        
+        // then
+        assertEquals(test, parsed);
+        assertEquals(test.hashCode(), parsed.hashCode());
+    }
+    
+    @Test
+    void testMailDomainGroupMissingName() {
+        // given
+        String noname = "{ \"id\": 1, \"alias\": \"test\", \"domains\": [] }";
+        JsonObject obj = Json.createReader(new StringReader(noname)).readObject();
+        // when && then
+        assertThrows(JsonParseException.class, () -> new JsonParser().parseMailDomainGroup(obj));
+    }
+    
+    @Test
+    void testMailDomainGroupMissingDomains() {
+        // given
+        String noname = "{ \"name\": \"test\", \"alias\": \"test\" }";
+        JsonObject obj = Json.createReader(new StringReader(noname)).readObject();
+        // when && then
+        assertThrows(JsonParseException.class, () -> new JsonParser().parseMailDomainGroup(obj));
+    }
+    
+    @Test
+    void testMailDomainGroupNotEnabledRegexDomains() {
+        // given
+        String regexNotEnabled = "{ \"id\": 1, \"alias\": \"test\", \"domains\": [\"^foobar\\\\.com\"] }";
+        JsonObject obj = Json.createReader(new StringReader(regexNotEnabled)).readObject();
+        // when && then
+        assertThrows(JsonParseException.class, () -> new JsonParser().parseMailDomainGroup(obj));
+    }
 
     @Test
     public void testparseFiles() throws JsonParseException {
@@ -634,6 +712,25 @@ public String getValueForKey( Key key /*, String defaultValue */) {
             }
              return null;
         }
+
+        @Override
+        public boolean isTrueForKey(Key key, boolean safeDefaultIfKeyNotFound) {
+            if (key == Key.AllowCustomTermsOfUse) {
+                return false;
+            }
+            return safeDefaultIfKeyNotFound;
+        }
     }
 
+    @Test
+    public void testEnum() throws JsonParseException {
+        JsonArrayBuilder arr = Json.createArrayBuilder();
+        for (Type entry : Arrays.asList(Type.REVOKEROLE, Type.ASSIGNROLE)) {
+            arr.add(entry.name());
+        }
+        Set<Type> typesSet = new HashSet<>(JsonParser.parseEnumsFromArray(arr.build(), Type.class));
+        assertEquals(2, typesSet.size(), "Set contains two elements");
+        assertTrue(typesSet.contains(Type.REVOKEROLE), "Set contains REVOKEROLE");
+        assertTrue(typesSet.contains(Type.ASSIGNROLE), "Set contains ASSIGNROLE");
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
index 783a72f7c0b..36ff11fe4bb 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
@@ -1,28 +1,21 @@
 package edu.harvard.iq.dataverse.util.json;
 
-import edu.harvard.iq.dataverse.ControlledVocabularyValue;
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.DataFileCategory;
-import edu.harvard.iq.dataverse.DataFileTag;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetField;
-import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
-import edu.harvard.iq.dataverse.DatasetFieldConstant;
-import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
-import edu.harvard.iq.dataverse.DatasetFieldValue;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseContact;
-import edu.harvard.iq.dataverse.FileMetadata;
-import edu.harvard.iq.dataverse.MetadataBlock;
-import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
+import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
 import edu.harvard.iq.dataverse.mocks.MockDatasetFieldSvc;
+import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.UserNotification.Type;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -30,20 +23,30 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonString;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class JsonPrinterTest {
 
     MockDatasetFieldSvc datasetFieldTypeSvc = null;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         datasetFieldTypeSvc = new MockDatasetFieldSvc();
+        datasetFieldTypeSvc.setMetadataBlock("citation");
 
         DatasetFieldType titleType = datasetFieldTypeSvc.add(new DatasetFieldType("title", FieldType.TEXTBOX, false));
         DatasetFieldType authorType = datasetFieldTypeSvc.add(new DatasetFieldType("author", FieldType.TEXT, true));
@@ -117,7 +120,7 @@ public void testJson_RoleAssignment() {
         JsonObjectBuilder job = JsonPrinter.json(ra);
         assertNotNull(job);
         JsonObject jsonObject = job.build();
-        assertEquals("#42", jsonObject.getString("assignee"));
+        assertEquals(PrivateUrlUser.PREFIX + "42", jsonObject.getString("assignee"));
         assertEquals(123, jsonObject.getInt("definitionPointId"));
         assertEquals("e1d53cf6-794a-457a-9709-7c07629a8267", jsonObject.getString("privateUrlToken"));
     }
@@ -136,9 +139,9 @@ public void testJson_PrivateUrl() {
         assertNotNull(job);
         JsonObject jsonObject = job.build();
         assertEquals("e1d53cf6-794a-457a-9709-7c07629a8267", jsonObject.getString("token"));
-        assertEquals("https://dataverse.example.edu/privateurl.xhtml?token=e1d53cf6-794a-457a-9709-7c07629a8267", jsonObject.getString("link"));
+        assertEquals("https://dataverse.example.edu/previewurl.xhtml?token=e1d53cf6-794a-457a-9709-7c07629a8267", jsonObject.getString("link"));
         assertEquals("e1d53cf6-794a-457a-9709-7c07629a8267", jsonObject.getJsonObject("roleAssignment").getString("privateUrlToken"));
-        assertEquals("#42", jsonObject.getJsonObject("roleAssignment").getString("assignee"));
+        assertEquals(PrivateUrlUser.PREFIX + "42", jsonObject.getJsonObject("roleAssignment").getString("assignee"));
     }
 
     @Test
@@ -154,8 +157,17 @@ public void testGetFileCategories() {
         tag.setTypeByLabel("Survey");
         dataFileTags.add(tag);
         dataFile.setTags(dataFileTags);
+        DataTable dt = new DataTable();
+        dataFile.setDataTable(dt);
+        dataFile.getDataTable().setOriginalFileName("50by1000.dta");
+        Embargo emb = new Embargo();
+        emb.setDateAvailable(LocalDate.parse("2021-12-03"));
+        emb.setReason("Some reason");
+        dataFile.setEmbargo(emb);
+        dsVersion.setId(Long.MIN_VALUE);
         fmd.setDatasetVersion(dsVersion);
         fmd.setDataFile(dataFile);
+        fmd.setVersion(Long.MIN_VALUE);
         List<DataFileCategory> fileCategories = new ArrayList<>();
         DataFileCategory dataFileCategory = new DataFileCategory();
         dataFileCategory.setName("Data");
@@ -171,7 +183,10 @@ public void testGetFileCategories() {
         assertEquals("", jsonObject.getJsonObject("dataFile").getString("filename"));
         assertEquals(-1, jsonObject.getJsonObject("dataFile").getInt("filesize"));
         assertEquals(-1, jsonObject.getJsonObject("dataFile").getInt("rootDataFileId"));
+        assertEquals("50by1000.dta", jsonObject.getJsonObject("dataFile").getString("originalFileName"));
         assertEquals("Survey", jsonObject.getJsonObject("dataFile").getJsonArray("tabularTags").getString(0));
+        assertEquals("2021-12-03", jsonObject.getJsonObject("dataFile").getJsonObject("embargo").getString("dateAvailable"));
+        assertEquals("Some reason", jsonObject.getJsonObject("dataFile").getJsonObject("embargo").getString("reason"));
     }
 
     @Test
@@ -195,9 +210,8 @@ public void testDatasetContactOutOfBoxNoPrivacy() {
         datasetContactField.setDatasetFieldCompoundValues(vals);
         fields.add(datasetContactField);
 
-        SettingsServiceBean nullServiceBean = null;
-        JsonPrinter.setSettingsService(nullServiceBean);
-        
+        JsonPrinter.injectSettingsService(null, null, null, null, null, null);
+
         JsonObject jsonObject = JsonPrinter.json(block, fields).build();
         assertNotNull(jsonObject);
 
@@ -237,7 +251,7 @@ public void testDatasetContactWithPrivacy() {
         datasetContactField.setDatasetFieldCompoundValues(vals);
         fields.add(datasetContactField);
 
-        JsonPrinter.setSettingsService(new MockSettingsSvc());
+        JsonPrinter.injectSettingsService(new MockSettingsSvc(), null, null, null, null, null);
 
         JsonObject jsonObject = JsonPrinter.json(block, fields).build();
         assertNotNull(jsonObject);
@@ -257,6 +271,53 @@ public void testDatasetContactWithPrivacy() {
 
     }
 
+    @Test
+    public void testDatasetFieldTypesWithChildren() {
+        MetadataBlock block = new MetadataBlock();
+        block.setId(0L);
+        block.setName("citation");
+        long id = 0L;
+        // create datasetFieldTypes
+        List<DatasetFieldType> datasetFieldTypes = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            DatasetFieldType dft = new DatasetFieldType();
+            dft.setId(id++);
+            dft.setDisplayOrder(i);
+            dft.setMetadataBlock(block);
+            dft.setFieldType(FieldType.TEXT);
+            dft.setName("subType" + dft.getId());
+            dft.setTitle(dft.getName());
+            dft.setChildDatasetFieldTypes(Lists.emptyList());
+            datasetFieldTypes.add(dft);
+        }
+        // add DatasetFieldType as children to another DatasetFieldType to test the suppression of duplicate data
+        // adding 3 and 4 as children of 2
+        datasetFieldTypes.get(3).setParentDatasetFieldType(datasetFieldTypes.get(2));
+        datasetFieldTypes.get(4).setParentDatasetFieldType(datasetFieldTypes.get(2));
+        datasetFieldTypes.get(2).setChildDatasetFieldTypes(List.of(datasetFieldTypes.get(3), datasetFieldTypes.get(4)));
+        // adding 6 as child of 9
+        datasetFieldTypes.get(6).setParentDatasetFieldType(datasetFieldTypes.get(9));
+        datasetFieldTypes.get(9).setChildDatasetFieldTypes(List.of(datasetFieldTypes.get(6)));
+
+        block.setDatasetFieldTypes(datasetFieldTypes);
+
+        JsonPrinter.injectSettingsService(new MockSettingsSvc(), null, null ,null, null, null);
+
+        JsonObject jsonObject = JsonPrinter.json(block).build();
+        assertNotNull(jsonObject);
+
+        System.out.println("json: " + JsonUtil.prettyPrint(jsonObject.toString()));
+        assertEquals("subType2 subType3", jsonObject.getJsonObject("fields").getJsonObject("subType2")
+                .getJsonObject("childFields").getJsonObject("subType3").getString("displayName"));
+        assertEquals("subType2 subType4", jsonObject.getJsonObject("fields").getJsonObject("subType2")
+                .getJsonObject("childFields").getJsonObject("subType4").getString("displayName"));
+        assertEquals("subType9 subType6", jsonObject.getJsonObject("fields").getJsonObject("subType9")
+                .getJsonObject("childFields").getJsonObject("subType6").getString("displayName"));
+        assertNull(jsonObject.getJsonObject("fields").getJsonObject("subType3"));
+        assertNull(jsonObject.getJsonObject("fields").getJsonObject("subType4"));
+        assertNull(jsonObject.getJsonObject("fields").getJsonObject("subType6"));
+    }
+
     @Test
     public void testDataversePrinter() {
         Dataverse dataverse = new Dataverse();
@@ -279,7 +340,7 @@ public void testDataversePrinter() {
         assertEquals("42 Inc.", jsonObject.getString("affiliation"));
         assertEquals(0, jsonObject.getJsonArray("dataverseContacts").getJsonObject(0).getInt("displayOrder"));
         assertEquals("dv42@mailinator.com", jsonObject.getJsonArray("dataverseContacts").getJsonObject(0).getString("contactEmail"));
-        assertEquals(false, jsonObject.getBoolean("permissionRoot"));
+        assertFalse(jsonObject.getBoolean("permissionRoot"));
         assertEquals("Description for Dataverse 42.", jsonObject.getString("description"));
         assertEquals("UNCATEGORIZED", jsonObject.getString("dataverseType"));
     }
@@ -305,4 +366,173 @@ public boolean isTrueForKey(SettingsServiceBean.Key key, boolean defaultValue) {
 
     }
 
+    @Test
+    public void testEnum() throws JsonParseException {
+        JsonArrayBuilder arr = JsonPrinter.enumsToJson(Arrays.asList(Type.REVOKEROLE, Type.ASSIGNROLE));
+        Set<String> typesSet = new HashSet<>(arr.build().getValuesAs(JsonString::getString));
+        assertTrue(typesSet.size() == 2);
+        assertTrue(typesSet.contains("REVOKEROLE"));
+        assertTrue(typesSet.contains("ASSIGNROLE"));
+    }
+
+    @Test
+    public void testMetadataBlockAnonymized() {
+        MetadataBlock block = new MetadataBlock();
+        block.setName("citation");
+        List<DatasetField> fields = new ArrayList<>();
+        DatasetField datasetAuthorField = new DatasetField();
+        DatasetFieldType datasetAuthorFieldType = datasetFieldTypeSvc.findByName("author");
+        datasetAuthorFieldType.setMetadataBlock(block);
+        datasetAuthorField.setDatasetFieldType(datasetAuthorFieldType);
+        List<DatasetFieldCompoundValue> compoundValues = new LinkedList<>();
+        DatasetFieldCompoundValue compoundValue = new DatasetFieldCompoundValue();
+        compoundValue.setParentDatasetField(datasetAuthorField);
+        compoundValue.setChildDatasetFields(Arrays.asList(
+                constructPrimitive("authorName", "Test Author"),
+                constructPrimitive("authorAffiliation", "Test Affiliation")
+        ));
+        compoundValues.add(compoundValue);
+        datasetAuthorField.setDatasetFieldCompoundValues(compoundValues);
+        fields.add(datasetAuthorField);
+
+        JsonObject actualJsonObject = JsonPrinter.json(block, fields, List.of("author")).build();
+
+        assertNotNull(actualJsonObject);
+        JsonObject actualAuthorJsonObject = actualJsonObject.getJsonArray("fields").getJsonObject(0);
+        assertEquals(BundleUtil.getStringFromBundle("dataset.anonymized.withheld"), actualAuthorJsonObject.getString("value"));
+        assertEquals("primitive", actualAuthorJsonObject.getString("typeClass"));
+        assertFalse(actualAuthorJsonObject.getBoolean("multiple"));
+    }
+
+    @Test
+    public void testDataverseFeaturedItemDataverseTest() {
+        Dataverse dataverse = createDataverse(42);
+        Dataverse dvObject = createDataverse(1);
+
+        DataverseFeaturedItem fi = new DataverseFeaturedItem();
+        fi.setDataverse(dataverse);
+        fi.setContent(null);
+        fi.setDisplayOrder(0);
+        fi.setImageFileName("testfile");
+
+        fi.setDvObject("dataverse", dvObject);
+        JsonObject jsonObject = JsonPrinter.json(fi).build();
+        assertNotNull(jsonObject);
+
+        System.out.println("json: " + JsonUtil.prettyPrint(jsonObject.toString()));
+        assertEquals(fi.getType(), jsonObject.getString("type"));
+        assertEquals(dvObject.getAlias(), jsonObject.getString("dvObjectIdentifier"));
+        assertEquals(dvObject.getName(), jsonObject.getString("dvObjectDisplayName"));
+    }
+    @Test
+    public void testDataverseFeaturedItemDatasetTest() {
+        Dataverse dataverse = createDataverse(42);
+        Dataset dvObject = createDataset(1);
+
+        DataverseFeaturedItem fi = new DataverseFeaturedItem();
+        fi.setDataverse(dataverse);
+        fi.setContent(null);
+        fi.setDisplayOrder(0);
+        fi.setImageFileName("testfile");
+
+        fi.setDvObject("dataset", dvObject);
+        JsonObject jsonObject = JsonPrinter.json(fi).build();
+        assertNotNull(jsonObject);
+
+        System.out.println("json: " + JsonUtil.prettyPrint(jsonObject.toString()));
+        assertEquals(fi.getType(), jsonObject.getString("type"));
+        assertEquals(dvObject.getGlobalId().asString(), jsonObject.getString("dvObjectIdentifier"));
+        assertEquals(dvObject.getDisplayName(), jsonObject.getString("dvObjectDisplayName"));
+    }
+
+    @Test
+    public void testDataverseFeaturedItemDatafileTest() {
+        Dataverse dataverse = createDataverse(42);
+        DataFile dvObject = createDatafile(1L);
+        dvObject.setPublicationDate(Timestamp.from(Instant.now()));
+
+        DataverseFeaturedItem fi = new DataverseFeaturedItem();
+        fi.setDataverse(dataverse);
+        fi.setContent(null);
+        fi.setDisplayOrder(0);
+        fi.setImageFileName("testfile");
+
+        fi.setDvObject("datafile", dvObject);
+        JsonObject jsonObject = JsonPrinter.json(fi).build();
+        assertNotNull(jsonObject);
+
+        System.out.println("json: " + JsonUtil.prettyPrint(jsonObject.toString()));
+        assertEquals(fi.getType(), jsonObject.getString("type"));
+        assertEquals(dvObject.getId().toString(), jsonObject.getString("dvObjectIdentifier"));
+        assertEquals(dvObject.getDisplayName(), jsonObject.getString("dvObjectDisplayName"));
+
+        assertNotNull(jsonObject);
+    }
+    
+    @Test
+    public void testDatasetWithNondefaultType() {
+        String sut = "foobar";
+        DatasetType foobar = new DatasetType();
+        foobar.setName(sut);
+        
+        Dataset dataset = createDataset(42);
+        dataset.setDatasetType(foobar);
+        
+        var jsob = JsonPrinter.json(dataset.getLatestVersion(), false, false).build();
+        String result = jsob.getString("datasetType");
+        
+        assertNotNull(result);
+        assertEquals(sut, result);
+    }
+
+    private Dataverse createDataverse(long id) {
+        Dataverse dataverse = new Dataverse();
+        dataverse.setId(id);
+        dataverse.setAlias("dv" + id);
+        dataverse.setName("Dataverse " + id);
+        dataverse.setAffiliation(id + " Inc.");
+        dataverse.setDescription("Description for Dataverse " + id + ".");
+        dataverse.setPublicationDate(Timestamp.from(Instant.now()));
+        return dataverse;
+    }
+    private Dataset createDataset(long id) {
+        Dataset dataset = new Dataset();
+        DatasetVersion dsVersion = new DatasetVersion();
+        dsVersion.setDataset(dataset);
+        dsVersion.setVersion(1L);
+        List<DatasetField> dsFields = new ArrayList<>();
+        DatasetField titleField = new DatasetField();
+        DatasetFieldType dsft = new DatasetFieldType();
+        DatasetFieldValue dsfv = new DatasetFieldValue();
+        dsfv.setValue("Dataset Title " + id);
+        dsfv.setDatasetField(titleField);
+        dsft.setName(DatasetFieldConstant.title);
+        dsft.setFieldType(FieldType.TEXT);
+        titleField.setDatasetFieldType(dsft);
+        titleField.setDatasetFieldValues(List.of(dsfv));
+        dsFields.add(titleField);
+        dsVersion.setDatasetFields(dsFields);
+        dsVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+        dsVersion.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+        dataset.setId(id);
+
+        dataset.setVersions(List.of(dsVersion));
+        dataset.setPublicationDate(Timestamp.from(Instant.now()));
+        dataset.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL,"10.5072","FK2/BYM3IW", "/", AbstractDOIProvider.DOI_RESOLVER_URL, null));
+
+        return dataset;
+    }
+    private DataFile createDatafile(long id) {
+        DataFile datafile = new DataFile();
+        datafile.setId(1L);
+        datafile.setRestricted(false);
+
+        FileMetadata fm = new FileMetadata();
+        fm.setLabel("xyz.txt");
+        fm.setDataFile(datafile);
+
+        datafile.setFileMetadatas(List.of(fm));
+
+        return datafile;
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonUtilTest.java
index 847fbfc9cba..3e4f9a690d2 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonUtilTest.java
@@ -1,19 +1,19 @@
 package edu.harvard.iq.dataverse.util.json;
 
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
-public class JsonUtilTest {
+class JsonUtilTest {
 
     @Test
-    public void testPrettyPrint() {
-        JsonUtil jsonUtil = new JsonUtil();
+    void testPrettyPrint() {
         String nullString = null;
         assertEquals(null, JsonUtil.prettyPrint(nullString));
         assertEquals("", JsonUtil.prettyPrint(""));
         assertEquals("junk", JsonUtil.prettyPrint("junk"));
-        assertEquals("{}", JsonUtil.prettyPrint("{}"));
-        assertEquals("{\n" + "  \"foo\": \"bar\"\n" + "}", JsonUtil.prettyPrint("{\"foo\": \"bar\"}"));
+        assertEquals("{\n}", JsonUtil.prettyPrint("{}"));
+        assertEquals("[\n    \"junk\"\n]", JsonUtil.prettyPrint("[\"junk\"]"));
+        assertEquals("{\n" + "    \"foo\": \"bar\"\n" + "}", JsonUtil.prettyPrint("{\"foo\": \"bar\"}"));
     }
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/jsondata.txt b/src/test/java/edu/harvard/iq/dataverse/util/json/jsondata.txt
index 1edf864e6e4..590a8663c86 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/jsondata.txt
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/jsondata.txt
@@ -210,16 +210,16 @@
                                         "typeName": "eastLongitude",
                                         "value": "23"
                                     },
-                                    "northLongitude": {
+                                    "northLatitude": {
                                         "multiple": false,
                                         "typeClass": "primitive",
-                                        "typeName": "northLongitude",
+                                        "typeName": "northLatitude",
                                         "value": "786"
                                     },
-                                    "southLongitude": {
+                                    "southLatitude": {
                                         "multiple": false,
                                         "typeClass": "primitive",
-                                        "typeName": "southLongitude",
+                                        "typeName": "southLatitude",
                                         "value": "34"
                                     },
                                     "westLongitude": {
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/shapefile/ShapefileHandlerTest.java b/src/test/java/edu/harvard/iq/dataverse/util/shapefile/ShapefileHandlerTest.java
index 8aa10c9667f..e69793c4d33 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/shapefile/ShapefileHandlerTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/shapefile/ShapefileHandlerTest.java
@@ -11,16 +11,18 @@
 import edu.harvard.iq.dataverse.util.ShapefileHandler;
 import static edu.harvard.iq.dataverse.util.ShapefileHandler.SHP_XML_EXTENSION;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
 import java.io.File;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
-
-import org.junit.rules.TemporaryFolder;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -40,10 +42,8 @@
  */
 public class ShapefileHandlerTest {
     
-        
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
-   
+    @TempDir
+    Path tempFolder;
     
     public void msg(String s){
             System.out.println(s);
@@ -61,43 +61,24 @@ private File createBlankFile(String filename) throws IOException {
         if (filename == null){
             return null;
         }
-        File aFile = this.tempFolder.newFile(filename);
-        //  FileUtils.writeStringToFile(tempFile, "hello world");
-
-        aFile.createNewFile();
-        return aFile;
+        return Files.createFile(tempFolder.resolve(filename)).toFile();
     }
-    
 
-     
-     
-    private void showFilesInFolder(String m, String folder_name) throws IOException{
-        msgt(m);
-        File folder = new File(folder_name);
-        for (File f : folder.listFiles() ){
-            this.msg("fname: " + f.getCanonicalPath());
-        }
-    } 
-         
-    private void showFilesInTempFolder(String m) throws IOException{
-        this.showFilesInFolder(m, this.tempFolder.getRoot().getAbsolutePath());
-    } 
-    
     private FileInputStream createZipReturnFilestream(List<String> file_names, String zipfile_name) throws IOException{
-        
+
         File zip_file_obj = this.createAndZipFiles(file_names, zipfile_name);
         if (zip_file_obj == null){
             return null;
         }
-        
+
         FileInputStream file_input_stream = new FileInputStream(zip_file_obj);
 
         return file_input_stream;
-        
+
     }
-    
+
     /*
-        Convenience class to create .zip file and return a FileInputStream
+        Convenience method to create .zip file and return a File
     
         @param List<String> file_names - List of filenames to add to .zip.  These names will be used to create 0 length files
         @param String zipfile_name - Name of .zip file to create
@@ -116,14 +97,14 @@ private File createAndZipFiles(List<String> file_names, String zipfile_name) thr
            //msg("File created: " + file_obj.getName());           
         }
         
-        File zip_file_obj = this.tempFolder.newFile(zipfile_name);
-        ZipOutputStream zip_stream = new ZipOutputStream(new FileOutputStream(zip_file_obj));
+        Path zip_file_obj = this.tempFolder.resolve(zipfile_name);
+        try (ZipOutputStream zip_stream = new ZipOutputStream(new FileOutputStream(zip_file_obj.toFile()))) {
 
-        // Iterate through File objects and add them to the ZipOutputStream
-        for (File file_obj : fileCollection) {
-             this.addToZipFile(file_obj.getName(), file_obj, zip_stream);
+            // Iterate through File objects and add them to the ZipOutputStream
+            for (File file_obj : fileCollection) {
+                this.addToZipFile(file_obj.getName(), file_obj, zip_stream);
+            }
         }
-
         /* -----------------------------------
         Cleanup: Delete single files that were added to .zip
         ----------------------------------- */
@@ -131,7 +112,7 @@ private File createAndZipFiles(List<String> file_names, String zipfile_name) thr
              file_obj.delete();
         }
         
-        return zip_file_obj;
+        return zip_file_obj.toFile();
         
     } // end createAndZipFiles
     
@@ -145,36 +126,64 @@ public void testCreateZippedNonShapefile() throws IOException{
         File zipfile_obj = createAndZipFiles(file_names, "not-quite-a-shape.zip");
         
         // Pass the .zip to the ShapefileHandler
-        ShapefileHandler shp_handler = new ShapefileHandler(new FileInputStream(zipfile_obj));
+        ShapefileHandler shp_handler = new ShapefileHandler(zipfile_obj);
         shp_handler.DEBUG= true;
 
         // Contains shapefile?
-        assertEquals(shp_handler.containsShapefile(), false);
+        assertFalse(shp_handler.containsShapefile());
 
         // get file_groups Map
         Map<String, List<String>> file_groups = shp_handler.getFileGroups();
         
-        assertEquals("verify that the dict is not empty", file_groups.isEmpty(), false);
-        assertEquals("verify key existance", file_groups.containsKey("not-quite-a-shape"), true);
-        assertEquals("verify value of key", file_groups.get("not-quite-a-shape"), Arrays.asList("shp", "shx", "dbf", "pdf"));
-        
-        this.showFilesInTempFolder(this.tempFolder.getRoot().getAbsolutePath());
-
+        assertFalse(file_groups.isEmpty(), "verify that the dict is not empty");
+        assertTrue(file_groups.containsKey("not-quite-a-shape"), "verify key existance");
+        assertEquals(List.of("shp", "shx", "dbf", "pdf"), file_groups.get("not-quite-a-shape"), "verify value of key");
         
         // Delete .zip
         zipfile_obj.delete();
         
         msg("Passed!");
     }
-    
-    
-        
+
+
+    @Test
+    public void testShapefileWithQpjAndQmd() throws IOException {
+        msgt("(4) testShapefileWithQpjAndQmd");
+
+        // Create mock files for the new extensions
+        List<String> fileNames = Arrays.asList("testShape.shp", "testShape.shx", "testShape.dbf", "testShape.prj", "testShape.qpj", "testShape.qmd");
+
+        // Create a zip file with these files
+        File zipFile = createAndZipFiles(fileNames, "testShapeWithNewExtensions.zip");
+
+        // Pass the zip to the ShapefileHandler
+        ShapefileHandler shpHandler = new ShapefileHandler(zipFile);
+        shpHandler.DEBUG = true;
+
+        // Check if it is recognized as a shapefile
+        assertTrue(shpHandler.containsShapefile(), "The zip should contain a shapefile with the new extensions");
+
+        // Get file groups map and verify presence
+        Map<String, List<String>> fileGroups = shpHandler.getFileGroups();
+        assertFalse(fileGroups.isEmpty(), "The file groups map should not be empty");
+
+        // Ensure the specific extensions are present
+        assertTrue(fileGroups.containsKey("testShape"), "The file group should contain the key 'testShape'");
+        assertTrue(fileGroups.get("testShape").containsAll(Arrays.asList("shp", "shx", "dbf", "prj", "qpj", "qmd")), "The file group should include the new extensions .qpj and .qmd");
+
+        // Delete the test zip file
+        zipFile.delete();
+
+        msg("Test passed successfully!");
+    }
+
+
     @Test
     public void testZippedTwoShapefiles() throws IOException{
         msgt("(2) testZippedTwoShapefiles");
                 
         // Create files and put them in a .zip
-        List<String> file_names = Arrays.asList("shape1.shp", "shape1.shx", "shape1.dbf", "shape1.prj", "shape1.fbn", "shape1.fbx", // 1st shapefile
+        List<String> file_names = Arrays.asList("shape1.shp", "shape1.shx", "shape1.DBF", "shape1.prj", "shape1.fbn", "shape1.fbx", // 1st shapefile
                                             "shape2.shp", "shape2.shx", "shape2.dbf", "shape2.prj",     // 2nd shapefile
                                             "shape2.txt", "shape2.pdf", "shape2",                  // single files, same basename as 2nd shapefile
                                             "README.MD", "shp_dictionary.xls", "notes"  ); //, "prj");                  // single files
@@ -182,11 +191,11 @@ public void testZippedTwoShapefiles() throws IOException{
         File zipfile_obj = createAndZipFiles(file_names, "two-shapes.zip");
         
         // Pass the .zip to the ShapefileHandler
-        ShapefileHandler shp_handler = new ShapefileHandler(new FileInputStream(zipfile_obj));
+        ShapefileHandler shp_handler = new ShapefileHandler(zipfile_obj);
         shp_handler.DEBUG= true;
         
-        assertEquals("verify shapefile existance", shp_handler.containsShapefile(), true);
-        assertEquals("verify that no error was found", shp_handler.errorFound, false);
+        assertTrue(shp_handler.containsShapefile(), "verify shapefile existance");
+        assertFalse(shp_handler.errorFound, "verify that no error was found");
         
         shp_handler.showFileGroups();
        // if (true){
@@ -195,32 +204,29 @@ public void testZippedTwoShapefiles() throws IOException{
         // get file_groups Map
         Map<String, List<String>> file_groups = shp_handler.getFileGroups();
         
-        assertEquals("verify that the dict is not empty", file_groups.isEmpty(), false);
+        assertFalse(file_groups.isEmpty(), "verify that the dict is not empty");
 
         // Verify the keys
-        assertEquals("verify key existance of 'shape1'", file_groups.containsKey("shape1"), true);
-        assertEquals("verify key existance of 'shape2'", file_groups.containsKey("shape2"), true);
+        assertTrue(file_groups.containsKey("shape1"), "verify key existance of 'shape1'");
+        assertTrue(file_groups.containsKey("shape2"), "verify key existance of 'shape2'");
 
         // Verify the values
-        assertEquals("verify value of key 'shape1'", file_groups.get("shape1"), Arrays.asList("shp", "shx", "dbf", "prj", "fbn", "fbx"));
-        assertEquals("verify value of key 'shape2'", file_groups.get("shape2"), Arrays.asList("shp", "shx", "dbf", "prj", "txt", "pdf", ShapefileHandler.BLANK_EXTENSION));
-        
-        this.showFilesInTempFolder(this.tempFolder.getRoot().getAbsolutePath());
-
+        assertEquals(file_groups.get("shape1"), Arrays.asList("shp", "shx", "DBF", "prj", "fbn", "fbx"), "verify value of key 'shape1'");
+        assertEquals(file_groups.get("shape2"), Arrays.asList("shp", "shx", "dbf", "prj", "txt", "pdf", ShapefileHandler.BLANK_EXTENSION), "verify value of key 'shape2'");
         
         // Rezip/Reorder the files
-        File test_unzip_folder = this.tempFolder.newFolder("test_unzip").getAbsoluteFile();
+        File test_unzip_folder = Files.createDirectory(this.tempFolder.resolve("test_unzip")).toFile();
         //File test_unzip_folder = new File("/Users/rmp553/Desktop/blah");
-        shp_handler.rezipShapefileSets(new FileInputStream(zipfile_obj), test_unzip_folder );
+        shp_handler.rezipShapefileSets(test_unzip_folder );
         
    
         // Does the re-ordering do what we wanted?
         List<String> rezipped_filenames = new ArrayList<>();
         rezipped_filenames.addAll(Arrays.asList(test_unzip_folder.list()));
         msg("rezipped_filenames: " + rezipped_filenames);
-        List<String> expected_filenames = Arrays.asList("shape1.zip", "shape2.zip", "shape2.txt", "shape2.pdf", "shape2", "README.MD", "shp_dictionary.xls", "notes");  
-
-        assertEquals("verify that all files exist", rezipped_filenames.containsAll(rezipped_filenames), true);
+        List<String> expected_filenames = Arrays.asList("shape1.zip", "shape2.zip", "shape2.txt", "shape2.pdf", "shape2", "README.MD", "shp_dictionary.xls", "notes");
+        
+        assertTrue(rezipped_filenames.containsAll(expected_filenames), "verify that all files exist");
         
         // Delete .zip
         zipfile_obj.delete();
@@ -234,31 +240,31 @@ public void testZippedShapefileWithExtraFiles() throws IOException{
         msgt("(3) testZippedShapefileWithExtraFiles");
                 
         // Create files and put them in a .zip
-        List<String> file_names = Arrays.asList("shape1.shp", "shape1.shx", "shape1.dbf", "shape1.prj", "shape1.pdf", "shape1.cpg", "shape1." + SHP_XML_EXTENSION, "README.md", "shape_notes.txt"); 
+        List<String> file_names = Arrays.asList("shape1.shp", "shape1.shx", "shape1.dbf", "shape1.prj", "shape1.pdf", "shape1.cpg", "shape1." + SHP_XML_EXTENSION, "README.md", "shape_notes.txt");
         File zipfile_obj = createAndZipFiles(file_names, "shape-plus.zip");
 
         // Pass the .zip to the ShapefileHandler
-        ShapefileHandler shp_handler = new ShapefileHandler(new FileInputStream(zipfile_obj));
+        ShapefileHandler shp_handler = new ShapefileHandler(zipfile_obj);
         shp_handler.DEBUG= true;
-
-        assertEquals("verify shapefile existance", shp_handler.containsShapefile(), true);
+        
+        assertTrue(shp_handler.containsShapefile(), "verify shapefile existance");
 
         // get file_groups Map
         Map<String, List<String>> file_groups = shp_handler.getFileGroups();
-
-        assertEquals("verify that the dict is not empty", file_groups.isEmpty(), false);
+        
+        assertFalse(file_groups.isEmpty(), "verify that the dict is not empty");
 
         // Verify the keys
-        assertEquals("verify key existance of 'shape1'", file_groups.containsKey("shape1"), true);
+        assertTrue(file_groups.containsKey("shape1"), "verify key existance of 'shape1'");
 
         // Verify the values
-        assertEquals("verify value of key 'shape1'", file_groups.get("shape1"), Arrays.asList("shp", "shx", "dbf", "prj", "pdf", "cpg", SHP_XML_EXTENSION));
-        assertEquals("verify value of key 'README'", file_groups.get("README"), Arrays.asList("md"));
-        assertEquals("verify value of key 'shape_notes'", file_groups.get("shape_notes"), Arrays.asList("txt"));
+        assertEquals(List.of("shp", "shx", "dbf", "prj", "pdf", "cpg", SHP_XML_EXTENSION), file_groups.get("shape1"), "verify value of key 'shape1'");
+        assertEquals(List.of("md"), file_groups.get("README"), "verify value of key 'README'");
+        assertEquals(List.of("txt"), file_groups.get("shape_notes"), "verify value of key 'shape_notes'");
         
-        File unzip2Folder = this.tempFolder.newFolder("test_unzip2").getAbsoluteFile();
+        File unzip2Folder = Files.createDirectory(this.tempFolder.resolve("test_unzip2")).toFile();
         // Rezip/Reorder the files
-        shp_handler.rezipShapefileSets(new FileInputStream(zipfile_obj), unzip2Folder);
+        shp_handler.rezipShapefileSets(unzip2Folder);
         //shp_handler.rezipShapefileSets(new FileInputStream(zipfile_obj), new File("/Users/rmp553/Desktop/blah"));
         
    
@@ -267,17 +273,23 @@ public void testZippedShapefileWithExtraFiles() throws IOException{
         rezipped_filenames.addAll(Arrays.asList(unzip2Folder.list()));
         
         msg("rezipped_filenames: " + rezipped_filenames);
-        List<String> expected_filenames = Arrays.asList("shape1.zip", "scratch-for-unzip-12345", "shape1.pdf", "README.md", "shape_notes.txt");  
-
-        assertEquals("verify that all files exist", expected_filenames.containsAll(rezipped_filenames), true);
+        List<String> expected_filenames = Arrays.asList("shape1.zip", "scratch-for-unzip-12345", "shape1.pdf", "README.md", "shape_notes.txt");
+        
+        assertTrue(expected_filenames.containsAll(rezipped_filenames), "verify that all files exist");
         
         // Delete .zip
         zipfile_obj.delete();
         
         msg("Passed!");
     }
-    
 
+    @Test
+    public void testHiddenFiles() throws IOException {
+        // test with shapefiles in hidden directory
+        ShapefileHandler shp_handler = new ShapefileHandler(new File("src/test/resources/hiddenShapefiles.zip"));
+        shp_handler.DEBUG= true;
+        assertFalse(shp_handler.containsShapefile());
+    }
     
     
     
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/testing/JvmSetting.java b/src/test/java/edu/harvard/iq/dataverse/util/testing/JvmSetting.java
new file mode 100644
index 00000000000..85b10489f15
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/testing/JvmSetting.java
@@ -0,0 +1,68 @@
+package edu.harvard.iq.dataverse.util.testing;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceAccessMode;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * {@code @SetJvmSetting} is a JUnit Jupiter extension to set the value of a
+ * JVM setting (internally a system property) for a test execution.
+ *
+ * <p>The key and value of the JVM setting to be set must be specified via
+ * {@link #key()} and {@link #value()}. After the annotated method has been
+ * executed, the initial default value is restored.</p>
+ *
+ * <p>{@code SetJvmSetting} can be used on the method and on the class level.
+ * It is repeatable and inherited from higher-level containers. If a class is
+ * annotated, the configured property will be set before every test inside that
+ * class. Any method level configurations will override the class level
+ * configurations.</p>
+ *
+ * Parallel execution of tests using this extension is prohibited by using
+ * resource locking provided by JUnit5 - system properties are a global state,
+ * these tests NEED to be done serial.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Inherited
+@Repeatable(JvmSetting.JvmSettings.class)
+@ExtendWith(JvmSettingExtension.class)
+@ResourceLock(value = Resources.SYSTEM_PROPERTIES, mode = ResourceAccessMode.READ_WRITE)
+public @interface JvmSetting {
+    
+    static final String PLACEHOLDER = "NULL";
+    
+    /**
+     * The key of the system property to be set.
+     */
+    edu.harvard.iq.dataverse.settings.JvmSettings key();
+    
+    /**
+     * The value of the system property to be set.
+     */
+    String value() default PLACEHOLDER;
+    
+    String[] varArgs() default {};
+    
+    String method() default PLACEHOLDER;
+    
+    /**
+     * Containing annotation of repeatable {@code @SetSystemProperty}.
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ ElementType.METHOD, ElementType.TYPE })
+    @Inherited
+    @ExtendWith(JvmSettingExtension.class)
+    @interface JvmSettings {
+        JvmSetting[] value();
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/testing/JvmSettingBroker.java b/src/test/java/edu/harvard/iq/dataverse/util/testing/JvmSettingBroker.java
new file mode 100644
index 00000000000..1235df89b3e
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/testing/JvmSettingBroker.java
@@ -0,0 +1,43 @@
+package edu.harvard.iq.dataverse.util.testing;
+
+import java.io.IOException;
+
+/**
+ * Provide an interface to access and manipulate {@link edu.harvard.iq.dataverse.settings.JvmSettings}
+ * at some place (local, remote, different ways to access, etc.).
+ * Part of the {@link JvmSettingExtension} extension to allow JUnit5 tests to manipulate these
+ * settings, enabling to test different code paths and so on.
+ * @implNote Keep in mind to use methods that do not require restarts or similar to set or delete a setting.
+ *           This must be changeable on the fly, otherwise it will be useless for testing.
+ *           Yes, non-hot-reloadable settings may be a problem. The code should be refactored in these cases.
+ */
+public interface JvmSettingBroker {
+    
+    /**
+     * Receive the value of a {@link edu.harvard.iq.dataverse.settings.JvmSettings} given as its {@link String}
+     * representation. The reason for this is that we may have inserted variable names already.
+     * @param key The JVM setting to receive as key, e.g. "dataverse.fqdn".
+     * @return The value of the setting if present or null.
+     * @throws IOException When communication goes sideways.
+     */
+    String getJvmSetting(String key) throws IOException;
+    
+    /**
+     * Set the value of a {@link edu.harvard.iq.dataverse.settings.JvmSettings} (given as its {@link String}
+     * representation). The reason for this is that we may have inserted variable names already.
+     * @param key The JVM setting to receive as key, e.g. "dataverse.fqdn".
+     * @param value The JVM setting's value we want to have it set to.
+     * @throws IOException When communication goes sideways.
+     */
+    void setJvmSetting(String key, String value) throws IOException;
+    
+    /**
+     * Remove the value of a {@link edu.harvard.iq.dataverse.settings.JvmSettings} (given as its {@link String}
+     * representation). For some tests, one might want to clear a certain setting again and potentially have it set
+     * back afterward. The reason for this is that we may have inserted variable names already.
+     * @param key The JVM setting to receive as key, e.g. "dataverse.fqdn".
+     * @throws IOException When communication goes sideways.
+     */
+    String deleteJvmSetting(String key) throws IOException;
+    
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/testing/JvmSettingExtension.java b/src/test/java/edu/harvard/iq/dataverse/util/testing/JvmSettingExtension.java
new file mode 100644
index 00000000000..2065d7b3ae6
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/testing/JvmSettingExtension.java
@@ -0,0 +1,152 @@
+package edu.harvard.iq.dataverse.util.testing;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.support.AnnotationSupport;
+import org.junit.platform.commons.support.ReflectionSupport;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.List;
+import java.util.Optional;
+
+import static edu.harvard.iq.dataverse.util.testing.JvmSetting.PLACEHOLDER;
+
+public class JvmSettingExtension implements BeforeTestExecutionCallback, AfterTestExecutionCallback, BeforeAllCallback, AfterAllCallback {
+    
+    @Override
+    public void beforeAll(ExtensionContext extensionContext) throws Exception {
+        List<JvmSetting> settings = AnnotationSupport.findRepeatableAnnotations(extensionContext.getTestClass(), JvmSetting.class);
+        ExtensionContext.Store store = extensionContext.getStore(
+            ExtensionContext.Namespace.create(getClass(), extensionContext.getRequiredTestClass()));
+        
+        setSetting(extensionContext.getRequiredTestClass(), settings, getBroker(extensionContext), store);
+    }
+    
+    @Override
+    public void afterAll(ExtensionContext extensionContext) throws Exception {
+        List<JvmSetting> settings = AnnotationSupport.findRepeatableAnnotations(extensionContext.getTestClass(), JvmSetting.class);
+        ExtensionContext.Store store = extensionContext.getStore(
+            ExtensionContext.Namespace.create(getClass(), extensionContext.getRequiredTestClass()));
+        
+        resetSetting(settings, getBroker(extensionContext), store);
+    }
+    
+    @Override
+    public void beforeTestExecution(ExtensionContext extensionContext) throws Exception {
+        List<JvmSetting> settings = AnnotationSupport.findRepeatableAnnotations(extensionContext.getTestMethod(), JvmSetting.class);
+        ExtensionContext.Store store = extensionContext.getStore(
+            ExtensionContext.Namespace.create(
+                getClass(),
+                extensionContext.getRequiredTestClass(),
+                extensionContext.getRequiredTestMethod()
+            ));
+        
+        setSetting(extensionContext.getRequiredTestClass(), settings, getBroker(extensionContext), store);
+    }
+    
+    @Override
+    public void afterTestExecution(ExtensionContext extensionContext) throws Exception {
+        List<JvmSetting> settings = AnnotationSupport.findRepeatableAnnotations(extensionContext.getTestMethod(), JvmSetting.class);
+        ExtensionContext.Store store = extensionContext.getStore(
+            ExtensionContext.Namespace.create(
+                getClass(),
+                extensionContext.getRequiredTestClass(),
+                extensionContext.getRequiredTestMethod()
+            ));
+        
+        resetSetting(settings, getBroker(extensionContext), store);
+    }
+    
+    private void setSetting(Class<?> testClass, List<JvmSetting> settings, JvmSettingBroker broker, ExtensionContext.Store store) throws Exception {
+        for (JvmSetting setting : settings) {
+            // get the setting name (might need var args substitution)
+            String settingName = getSettingName(setting);
+            
+            // get the setting value ...
+            String oldSetting = broker.getJvmSetting(settingName);
+            
+            // if present - store in context to restore later
+            if (oldSetting != null) {
+                store.put(settingName, oldSetting);
+            }
+            
+            // set to new value
+            if (setting.value().equals(PLACEHOLDER) && setting.method().equals(PLACEHOLDER)) {
+                throw new IllegalArgumentException("You must either provide a value or a method reference " +
+                    "for key JvmSettings" + setting.key());
+            }
+            
+            String value;
+            // Retrieve value from static (!) test class method if no direct setting given
+            if (setting.value().equals(PLACEHOLDER)) {
+                Optional<Method> valueMethod = ReflectionSupport.findMethod(testClass, setting.method());
+                if (valueMethod.isEmpty() || ! Modifier.isStatic(valueMethod.get().getModifiers())) {
+                    throw new IllegalStateException("Could not find a static method '" + setting.method() + "' in test class");
+                }
+                value = (String) ReflectionSupport.invokeMethod(valueMethod.get(), null);
+            // Set to new value by using the directly given value
+            } else {
+                value = setting.value();
+            }
+            
+            // If the retrieved value is null, delete the setting (will be reset after the test), otherwise set.
+            if (value != null) {
+                broker.setJvmSetting(settingName, value);
+            } else if (oldSetting != null) {
+                broker.deleteJvmSetting(settingName);
+            }
+        }
+    }
+    
+    private void resetSetting(List<JvmSetting> settings, JvmSettingBroker broker, ExtensionContext.Store store) throws Exception {
+        for (JvmSetting setting : settings) {
+            // get the setting name (might need var args substitution)
+            String settingName = getSettingName(setting);
+            
+            // get a stored setting from context
+            String oldSetting = store.remove(settingName, String.class);
+            
+            // if present before, restore
+            if (oldSetting != null) {
+                broker.setJvmSetting(settingName, oldSetting);
+                // if NOT present before, delete
+            } else {
+                broker.deleteJvmSetting(settingName);
+            }
+        }
+    }
+    
+    private String getSettingName(JvmSetting setting) {
+        JvmSettings target = setting.key();
+        
+        if (target.needsVarArgs()) {
+            String[] variableArguments = setting.varArgs();
+            
+            if (variableArguments == null || variableArguments.length != target.numberOfVarArgs()) {
+                throw new IllegalArgumentException("You must provide " + target.numberOfVarArgs() +
+                    " variable arguments via varArgs = {...} for setting " + target +
+                    " (\"" + target.getScopedKey() + "\")");
+            }
+            
+            return target.insert(variableArguments);
+        }
+        
+        return target.getScopedKey();
+    }
+    
+    private JvmSettingBroker getBroker(ExtensionContext extensionContext) throws Exception {
+        // Is this test class using local system properties, then get a broker for these
+        if (AnnotationSupport.isAnnotated(extensionContext.getTestClass(), LocalJvmSettings.class)) {
+            return LocalJvmSettings.localBroker;
+        // NOTE: this might be extended later with other annotations to support other means of handling the settings
+        } else {
+            throw new IllegalStateException("You must provide the @LocalJvmSettings annotation to the test class");
+        }
+    }
+    
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/testing/LocalJvmSettings.java b/src/test/java/edu/harvard/iq/dataverse/util/testing/LocalJvmSettings.java
new file mode 100644
index 00000000000..372fa91f6f6
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/testing/LocalJvmSettings.java
@@ -0,0 +1,39 @@
+package edu.harvard.iq.dataverse.util.testing;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation expresses that a test class wants to manipulate local
+ * settings (because the tests run within the same JVM as the code itself).
+ * This is mostly true for unit tests.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE })
+@ExtendWith(JvmSettingExtension.class)
+@Inherited
+public @interface LocalJvmSettings {
+    
+    JvmSettingBroker localBroker = new JvmSettingBroker() {
+        @Override
+        public String getJvmSetting(String key) {
+            return System.getProperty(key);
+        }
+        
+        @Override
+        public void setJvmSetting(String key, String value) {
+            System.setProperty(key, value);
+        }
+        
+        @Override
+        public String deleteJvmSetting(String key) {
+            return System.clearProperty(key);
+        }
+    };
+    
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/testing/SystemProperty.java b/src/test/java/edu/harvard/iq/dataverse/util/testing/SystemProperty.java
new file mode 100644
index 00000000000..2770831296f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/testing/SystemProperty.java
@@ -0,0 +1,60 @@
+package edu.harvard.iq.dataverse.util.testing;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceAccessMode;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * {@code @SystemProperty} is a JUnit Jupiter extension to set the value of an
+ * arbitrary system property for a test execution.
+ *
+ * <p>The key and value of the property to be set must be specified via
+ * {@link #key()} and {@link #value()}. After the annotated method has been
+ * executed, the initial default value is restored.</p>
+ *
+ * <p>{@code SetJvmSetting} can be used on the method and on the class level.
+ * It is repeatable and inherited from higher-level containers. If a class is
+ * annotated, the configured property will be set before every test inside that
+ * class. Any method level configurations will override the class level
+ * configurations.</p>
+ *
+ * Parallel execution of tests using this extension is prohibited by using
+ * resource locking provided by JUnit5 - system properties are a global state,
+ * these tests NEED to be done serial.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Inherited
+@Repeatable(SystemProperty.SystemProperties.class)
+@ExtendWith(SystemPropertyExtension.class)
+@ResourceLock(value = Resources.SYSTEM_PROPERTIES, mode = ResourceAccessMode.READ_WRITE)
+public @interface SystemProperty {
+    /**
+     * The key of the system property to be set.
+     */
+    String key();
+    
+    /**
+     * The value of the system property to be set.
+     */
+    String value();
+    
+    /**
+     * Containing annotation of repeatable {@code @SystemProperty}.
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ ElementType.METHOD, ElementType.TYPE })
+    @Inherited
+    @ExtendWith(SystemPropertyExtension.class)
+    @interface SystemProperties {
+        SystemProperty[] value();
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/testing/SystemPropertyExtension.java b/src/test/java/edu/harvard/iq/dataverse/util/testing/SystemPropertyExtension.java
new file mode 100644
index 00000000000..146b7c63713
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/testing/SystemPropertyExtension.java
@@ -0,0 +1,56 @@
+package edu.harvard.iq.dataverse.util.testing;
+
+import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
+import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+public class SystemPropertyExtension implements BeforeTestExecutionCallback, AfterTestExecutionCallback {
+    
+    private ExtensionContext.Store getStore(ExtensionContext context) {
+        return context.getStore(ExtensionContext.Namespace.create(getClass(), context.getRequiredTestClass(), context.getRequiredTestMethod()));
+    }
+    
+    @Override
+    public void beforeTestExecution(ExtensionContext extensionContext) throws Exception {
+        extensionContext.getTestMethod().ifPresent(method -> {
+            SystemProperty[] settings = method.getAnnotationsByType(SystemProperty.class);
+            for (SystemProperty setting : settings) {
+                // get the property name
+                String settingName = setting.key();
+                
+                // get the setting ...
+                String oldSetting = System.getProperty(settingName);
+                
+                // if present - store in context to restore later
+                if (oldSetting != null) {
+                    getStore(extensionContext).put(settingName, oldSetting);
+                }
+                
+                // set to new value
+                System.setProperty(settingName, setting.value());
+            }
+        });
+    }
+    
+    @Override
+    public void afterTestExecution(ExtensionContext extensionContext) throws Exception {
+        extensionContext.getTestMethod().ifPresent(method -> {
+            SystemProperty[] settings = method.getAnnotationsByType(SystemProperty.class);
+            for (SystemProperty setting : settings) {
+                /// get the property name
+                String settingName = setting.key();
+                
+                // get a stored setting from context
+                String oldSetting = getStore(extensionContext).remove(settingName, String.class);
+                
+                // if present before, restore
+                if (oldSetting != null) {
+                    System.setProperty(settingName, oldSetting);
+                    // if NOT present before, delete
+                } else {
+                    System.clearProperty(settingName);
+                }
+            }
+        });
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/testing/Tags.java b/src/test/java/edu/harvard/iq/dataverse/util/testing/Tags.java
new file mode 100644
index 00000000000..1544d393896
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/testing/Tags.java
@@ -0,0 +1,7 @@
+package edu.harvard.iq.dataverse.util.testing;
+
+public class Tags {
+    public static final String NOT_ESSENTIAL_UNITTESTS = "not-essential-unittests";
+    public static final String INTEGRATION_TEST = "integration";
+    public static final String USES_TESTCONTAINERS = "testcontainers";
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlPrinterTest.java
index 8b027b797c5..1a190389ed5 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlPrinterTest.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse.util.xml;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class XmlPrinterTest {
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlUtilTest.java
new file mode 100644
index 00000000000..883c5f78132
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlUtilTest.java
@@ -0,0 +1,564 @@
+package edu.harvard.iq.dataverse.util.xml;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class XmlUtilTest {
+    String xml = """
+                <test>
+                <one>
+                    <two>Hello</two>
+                </one>
+            </test>""";
+
+    @Test
+    void testRetrieveCurrentAsString() throws Exception {
+        // Create a secure XMLReader using XmlUtil
+        XMLReader xmlReader = XmlUtil.getSecureXMLReader();
+
+        // Create a handler to capture the parsed content
+        final StringBuilder parsedContent = new StringBuilder();
+        final boolean[] foundElement = new boolean[1];
+
+        xmlReader.setContentHandler(new DefaultHandler() {
+            private boolean insideTwo = false;
+
+            @Override
+            public void startElement(String uri, String localName, String qName, Attributes attributes) {
+                if ("two".equals(localName) || "two".equals(qName)) {
+                    insideTwo = true;
+                    foundElement[0] = true;
+                }
+            }
+
+            @Override
+            public void characters(char[] ch, int start, int length) {
+                if (insideTwo) {
+                    parsedContent.append(ch, start, length);
+                }
+            }
+
+            @Override
+            public void endElement(String uri, String localName, String qName) {
+                if ("two".equals(localName) || "two".equals(qName)) {
+                    insideTwo = false;
+                }
+            }
+        });
+
+        // Reset the input stream since we're reusing it
+        InputStream freshInputStream = new ByteArrayInputStream(xml.getBytes());
+
+        // Parse the XML
+        xmlReader.parse(new InputSource(freshInputStream));
+
+        // Verify the content was parsed correctly
+        assertTrue(foundElement[0], "The 'two' element should be found");
+        assertEquals("Hello", parsedContent.toString().trim(), "The content of the 'two' element should be 'Hello'");
+
+        // If you want to use XPath to verify the structure, you can use DocumentBuilder instead
+        DocumentBuilder db = XmlUtil.getSecureDocumentBuilder();
+        org.w3c.dom.Document doc = db.parse(new InputSource(new ByteArrayInputStream(xml.getBytes())));
+
+        // Use XPath to verify the structure
+        XPathFactory xpf = XPathFactory.newInstance();
+        XPath xpath = xpf.newXPath();
+        String result = xpath.evaluate("/test/one/two", doc);
+
+        assertEquals("Hello", result, "XPath should find the content of the 'two' element");
+    }
+
+    @Test
+    void testSecurityConfiguration_EntityReferencesHandledSecurely() throws Exception {
+        // Test that XML with entity references is handled securely
+        
+        // First, test with predefined entities which should work fine
+        String xmlWithPredefinedEntities = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+                + "<root>"
+                + "  <predefined>This text has &lt;brackets&gt; and an &amp;ampersand;</predefined>"
+                + "</root>";
+
+        InputStream xmlStream = new ByteArrayInputStream(xmlWithPredefinedEntities.getBytes(StandardCharsets.UTF_8));
+        
+        // Create a secure XMLReader using XmlUtil
+        XMLReader xmlReader = XmlUtil.getSecureXMLReader();
+        
+        // Create a handler to capture the parsed content
+        final StringBuilder predefinedContent = new StringBuilder();
+        final boolean[] inPredefined = new boolean[1];
+
+        xmlReader.setContentHandler(new DefaultHandler() {
+            @Override
+            public void startElement(String uri, String localName, String qName, Attributes attributes) {
+                String name = localName.isEmpty() ? qName : localName;
+                if ("predefined".equals(name)) {
+                    inPredefined[0] = true;
+                }
+            }
+
+            @Override
+            public void characters(char[] ch, int start, int length) {
+                String content = new String(ch, start, length);
+                if (inPredefined[0]) {
+                    predefinedContent.append(content);
+                }
+            }
+
+            @Override
+            public void endElement(String uri, String localName, String qName) {
+                String name = localName.isEmpty() ? qName : localName;
+                if ("predefined".equals(name)) {
+                    inPredefined[0] = false;
+                }
+            }
+        });
+
+        // Parse the XML with predefined entities - should not throw an exception
+        assertDoesNotThrow(() -> xmlReader.parse(new InputSource(xmlStream)));
+        
+        // Verify predefined entities were properly decoded
+        assertEquals("This text has <brackets> and an &ampersand;", 
+                predefinedContent.toString().trim(), 
+                "Predefined XML entities should be properly decoded");
+        
+        // Now test with custom entity which should cause an exception
+        String xmlWithCustomEntity = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+                + "<root>"
+                + "  <custom>&customEntity;</custom>"
+                + "</root>";
+                
+        InputStream dbStream = new ByteArrayInputStream(xmlWithCustomEntity.getBytes(StandardCharsets.UTF_8));
+        
+        // The parser should throw an exception for undeclared entities
+        // This is the expected secure behavior
+        Exception exception = assertThrows(org.xml.sax.SAXParseException.class, 
+                () -> xmlReader.parse(new InputSource(dbStream)));
+        
+        // Verify the exception message mentions the undeclared entity
+        assertTrue(exception.getMessage().contains("customEntity"), 
+                "Exception should mention the undeclared entity");
+        
+        // Also test with DocumentBuilder for completeness
+        DocumentBuilder db = XmlUtil.getSecureDocumentBuilder();
+        
+        // Test with predefined entities
+        org.w3c.dom.Document doc = db.parse(new InputSource(new ByteArrayInputStream(
+                xmlWithPredefinedEntities.getBytes(StandardCharsets.UTF_8))));
+        
+        // Check that the elements exist with properly handled entities
+        org.w3c.dom.NodeList predefinedNodes = doc.getElementsByTagName("predefined");
+        assertEquals(1, predefinedNodes.getLength(), "Predefined element should exist");
+        
+        String predefinedText = predefinedNodes.item(0).getTextContent();
+        assertEquals("This text has <brackets> and an &ampersand;", 
+                predefinedText, 
+                "Predefined XML entities should be properly decoded");
+        
+        // Test with custom entity - should throw exception
+        Exception dbException = assertThrows(org.xml.sax.SAXParseException.class, 
+                () -> db.parse(new InputSource(new ByteArrayInputStream(
+                        xmlWithCustomEntity.getBytes(StandardCharsets.UTF_8)))));
+        
+        assertTrue(dbException.getMessage().contains("customEntity"), 
+                "Exception should mention the undeclared entity");
+    }
+
+    @Test
+    void testSecurityConfiguration_DTDProcessingDisabled() throws Exception {
+        // Test that DTD features are properly disabled
+        // Instead of using DOCTYPE declarations (which might be rejected entirely),
+        // we'll verify the security features are properly configured
+        
+        // Create a secure XMLReader using XmlUtil
+        XMLReader xmlReader = XmlUtil.getSecureXMLReader();
+        
+        // Verify that DTD-related features are properly disabled
+        assertTrue(xmlReader.getFeature("http://apache.org/xml/features/disallow-doctype-decl"), 
+                "DOCTYPE declarations should be disallowed");
+        assertFalse(xmlReader.getFeature("http://xml.org/sax/features/external-general-entities"), 
+                "External general entities should be disabled");
+        assertFalse(xmlReader.getFeature("http://xml.org/sax/features/external-parameter-entities"), 
+                "External parameter entities should be disabled");
+        
+        // Test with a simple XML without DOCTYPE to ensure basic parsing still works
+        String simpleXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root>Simple content</root>";
+        InputStream stream = new ByteArrayInputStream(simpleXml.getBytes(StandardCharsets.UTF_8));
+        
+        // Create a handler to capture the parsed content
+        final StringBuilder parsedContent = new StringBuilder();
+        final boolean[] rootElementFound = new boolean[1];
+        
+        xmlReader.setContentHandler(new DefaultHandler() {
+            private boolean insideRoot = false;
+            
+            @Override
+            public void startElement(String uri, String localName, String qName, Attributes attributes) {
+                if ("root".equals(localName) || "root".equals(qName)) {
+                    insideRoot = true;
+                    rootElementFound[0] = true;
+                }
+            }
+            
+            @Override
+            public void characters(char[] ch, int start, int length) {
+                if (insideRoot) {
+                    parsedContent.append(ch, start, length);
+                }
+            }
+            
+            @Override
+            public void endElement(String uri, String localName, String qName) {
+                if ("root".equals(localName) || "root".equals(qName)) {
+                    insideRoot = false;
+                }
+            }
+        });
+        
+        // Parse the XML - should not throw an exception
+        assertDoesNotThrow(() -> xmlReader.parse(new InputSource(stream)));
+        
+        // Verify the root element was found and content was parsed correctly
+        assertTrue(rootElementFound[0], "Root element should be found");
+        assertEquals("Simple content", parsedContent.toString().trim(), 
+                "Content should be parsed correctly");
+        
+        // Also test with DocumentBuilder for completeness
+        DocumentBuilder db = XmlUtil.getSecureDocumentBuilder();
+        
+        // Verify that DTD-related features are properly disabled in DocumentBuilderFactory
+        DocumentBuilderFactory dbf = XmlUtil.getSecureDocumentBuilderFactory();
+        
+        assertTrue(dbf.getFeature("http://apache.org/xml/features/disallow-doctype-decl"), 
+                "DOCTYPE declarations should be disallowed in DocumentBuilderFactory");
+        assertFalse(dbf.getFeature("http://xml.org/sax/features/external-general-entities"), 
+                "External general entities should be disabled in DocumentBuilderFactory");
+        assertFalse(dbf.getFeature("http://xml.org/sax/features/external-parameter-entities"), 
+                "External parameter entities should be disabled in DocumentBuilderFactory");
+        
+        // Parse a simple XML to ensure basic functionality works
+        org.w3c.dom.Document doc = db.parse(new InputSource(new ByteArrayInputStream(
+                simpleXml.getBytes(StandardCharsets.UTF_8))));
+        
+        // Check that the root element exists with correct content
+        org.w3c.dom.NodeList rootNodes = doc.getElementsByTagName("root");
+        assertEquals(1, rootNodes.getLength(), "Root element should exist");
+        assertEquals("Simple content", rootNodes.item(0).getTextContent(), 
+                "Root element should have correct content");
+    }
+
+    @Test
+    void testSecurityConfiguration_EntityReferencesNotReplaced() throws Exception {
+        // Test that predefined entity references are handled safely
+        // Using predefined XML entities that don't require DOCTYPE declarations
+        String xmlWithPredefinedEntities = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+                + "<root>This text has &lt;brackets&gt; and an &amp;ampersand;</root>";
+
+        InputStream stream = new ByteArrayInputStream(xmlWithPredefinedEntities.getBytes(StandardCharsets.UTF_8));
+
+        // Create a secure XMLReader using XmlUtil
+        XMLReader xmlReader = XmlUtil.getSecureXMLReader();
+
+        // Create a handler to capture the parsed content
+        final StringBuilder parsedContent = new StringBuilder();
+        final boolean[] rootElementFound = new boolean[1];
+
+        xmlReader.setContentHandler(new DefaultHandler() {
+            private boolean insideRoot = false;
+
+            @Override
+            public void startElement(String uri, String localName, String qName, Attributes attributes) {
+                if ("root".equals(localName) || "root".equals(qName)) {
+                    insideRoot = true;
+                    rootElementFound[0] = true;
+                }
+            }
+
+            @Override
+            public void characters(char[] ch, int start, int length) {
+                if (insideRoot) {
+                    parsedContent.append(ch, start, length);
+                }
+            }
+
+            @Override
+            public void endElement(String uri, String localName, String qName) {
+                if ("root".equals(localName) || "root".equals(qName)) {
+                    insideRoot = false;
+                }
+            }
+        });
+
+        // Parse the XML - should not throw an exception
+        assertDoesNotThrow(() -> xmlReader.parse(new InputSource(stream)));
+
+        // Verify the root element was found
+        assertTrue(rootElementFound[0], "Root element should be found");
+        
+        // Verify the predefined entities were properly handled
+        // The parser should convert &lt; to < and &amp; to & as these are built-in XML entities
+        assertEquals("This text has <brackets> and an &ampersand;", parsedContent.toString().trim(), 
+                "Predefined XML entities should be properly decoded");
+
+        // Also test with DocumentBuilder for completeness
+        assertDoesNotThrow(() -> {
+            DocumentBuilder db = XmlUtil.getSecureDocumentBuilder();
+            org.w3c.dom.Document doc = db.parse(new InputSource(new ByteArrayInputStream(
+                    xmlWithPredefinedEntities.getBytes(StandardCharsets.UTF_8))));
+
+            // Check that the root element exists with properly decoded entities
+            org.w3c.dom.NodeList rootNodes = doc.getElementsByTagName("root");
+            assertEquals(1, rootNodes.getLength(), "Root element should exist");
+
+            String rootContent = rootNodes.item(0).getTextContent();
+            assertEquals("This text has <brackets> and an &ampersand;", rootContent, 
+                    "Predefined XML entities should be properly decoded");
+        });
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {
+            // XML Bomb (Billion laughs attack)
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE lolz [<!ENTITY lol"
+                    + " \"lol\"><!ENTITY lol2"
+                    + " \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\"><!ENTITY lol3"
+                    + " \"&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;\">"
+                    + "]><lolz>&lol3;</lolz>",
+            // External entity attack
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+                    + "<!DOCTYPE foo [<!ENTITY xxe SYSTEM \"file:///etc/passwd\">]>"
+                    + "<root>&xxe;</root>",
+            // Parameter entity attack
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE foo [<!ENTITY % xxe SYSTEM"
+                    + " \"http://evil.com/evil.dtd\">%xxe;]><root>test</root>"
+    })
+    void testSecurityConfiguration_MaliciousXMLHandledSafely(String maliciousXml) throws Exception {
+        // Create a secure XMLReader using XmlUtil
+        XMLReader xmlReader = XmlUtil.getSecureXMLReader();
+
+        // Since DOCTYPE declarations are disallowed, parsing should throw an exception
+        InputStream xmlStream = new ByteArrayInputStream(maliciousXml.getBytes(StandardCharsets.UTF_8));
+        Exception exception = assertThrows(org.xml.sax.SAXParseException.class, 
+                () -> xmlReader.parse(new InputSource(xmlStream)));
+        
+        // Verify the exception message mentions DOCTYPE
+        assertTrue(exception.getMessage().contains("DOCTYPE") || 
+                   exception.getMessage().contains("doctype"),
+                   "Exception should mention DOCTYPE being disallowed");
+
+        // Also test with DocumentBuilder for completeness
+        DocumentBuilder db = XmlUtil.getSecureDocumentBuilder();
+        
+        // Create a new stream for the DocumentBuilder test
+        InputStream dbStream = new ByteArrayInputStream(maliciousXml.getBytes(StandardCharsets.UTF_8));
+        
+        // DocumentBuilder should also throw an exception
+        Exception dbException = assertThrows(org.xml.sax.SAXParseException.class, 
+                () -> db.parse(new InputSource(dbStream)));
+        
+        // Verify the exception message mentions DOCTYPE
+        assertTrue(dbException.getMessage().contains("DOCTYPE") || 
+                   dbException.getMessage().contains("doctype"),
+                   "Exception should mention DOCTYPE being disallowed");
+    }
+
+    @Test
+    void testSecurityConfiguration_NormalXMLStillWorks() throws Exception {
+        // Test that normal XML processing still works correctly
+        String normalXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><books><book id=\"1\"><title>Test"
+                + " Book</title><author>Test Author</author></book></books>";
+
+        InputStream stream = new ByteArrayInputStream(normalXml.getBytes(StandardCharsets.UTF_8));
+
+        // Create a secure XMLReader using XmlUtil
+        XMLReader xmlReader = XmlUtil.getSecureXMLReader();
+
+        // Create a handler to capture the parsed content and structure
+        final List<String> elementNames = new ArrayList<>();
+        final String[] bookIdValue = new String[1];
+        final StringBuilder titleContent = new StringBuilder();
+        final StringBuilder authorContent = new StringBuilder();
+        final boolean[] insideTitle = new boolean[1];
+        final boolean[] insideAuthor = new boolean[1];
+
+        xmlReader.setContentHandler(new DefaultHandler() {
+            @Override
+            public void startElement(String uri, String localName, String qName, Attributes attributes) {
+                String elementName = localName.isEmpty() ? qName : localName;
+                elementNames.add(elementName);
+                
+                if ("book".equals(elementName)) {
+                    bookIdValue[0] = attributes.getValue("id");
+                } else if ("title".equals(elementName)) {
+                    insideTitle[0] = true;
+                } else if ("author".equals(elementName)) {
+                    insideAuthor[0] = true;
+                }
+            }
+
+            @Override
+            public void characters(char[] ch, int start, int length) {
+                String content = new String(ch, start, length);
+                if (insideTitle[0]) {
+                    titleContent.append(content);
+                } else if (insideAuthor[0]) {
+                    authorContent.append(content);
+                }
+            }
+
+            @Override
+            public void endElement(String uri, String localName, String qName) {
+                String elementName = localName.isEmpty() ? qName : localName;
+                if ("title".equals(elementName)) {
+                    insideTitle[0] = false;
+                } else if ("author".equals(elementName)) {
+                    insideAuthor[0] = false;
+                }
+            }
+        });
+
+        // Parse the XML
+        xmlReader.parse(new InputSource(stream));
+
+        // Verify the structure was parsed correctly
+        assertEquals(4, elementNames.size(), "Should have found 4 elements");
+        assertEquals("books", elementNames.get(0), "First element should be 'books'");
+        assertEquals("book", elementNames.get(1), "Second element should be 'book'");
+        assertEquals("title", elementNames.get(2), "Third element should be 'title'");
+        assertEquals("author", elementNames.get(3), "Fourth element should be 'author'");
+        
+        // Verify attribute was parsed correctly
+        assertEquals("1", bookIdValue[0], "Book ID should be '1'");
+        
+        // Verify content was parsed correctly
+        assertEquals("Test Book", titleContent.toString().trim(), "Title content should be 'Test Book'");
+        assertEquals("Test Author", authorContent.toString().trim(), "Author content should be 'Test Author'");
+
+        // Also test with DocumentBuilder for completeness
+        DocumentBuilder db = XmlUtil.getSecureDocumentBuilder();
+        org.w3c.dom.Document doc = db.parse(new InputSource(new ByteArrayInputStream(
+                normalXml.getBytes(StandardCharsets.UTF_8))));
+
+        // Use XPath to verify the structure
+        XPathFactory xpf = XPathFactory.newInstance();
+        XPath xpath = xpf.newXPath();
+        
+        // Verify element structure
+        assertEquals("books", doc.getDocumentElement().getNodeName(), "Root element should be 'books'");
+        assertEquals("1", xpath.evaluate("/books/book/@id", doc), "Book ID should be '1'");
+        assertEquals("Test Book", xpath.evaluate("/books/book/title", doc), "Title should be 'Test Book'");
+        assertEquals("Test Author", xpath.evaluate("/books/book/author", doc), "Author should be 'Test Author'");
+    }
+    
+    @Test
+    void testSecureXMLInputFactory() throws Exception {
+        // Test that XMLInputFactory is properly secured and works correctly
+        
+        // Get the secure XMLInputFactory
+        XMLInputFactory xmlInputFactory = XmlUtil.getSecureXMLInputFactory();
+        
+        // Verify security settings
+        assertFalse((Boolean) xmlInputFactory.getProperty(XMLInputFactory.SUPPORT_DTD), 
+                "DTD support should be disabled");
+        assertFalse((Boolean) xmlInputFactory.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES), 
+                "External entity support should be disabled");
+        assertTrue((Boolean) xmlInputFactory.getProperty(XMLInputFactory.IS_COALESCING), 
+                "Coalescing should be enabled");
+        
+        // Test with normal XML
+        String normalXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root><element>Test content</element></root>";
+        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(new StringReader(normalXml));
+        
+        // Parse and verify content
+        StringBuilder content = new StringBuilder();
+        String elementName = null;
+        
+        while (reader.hasNext()) {
+            int event = reader.next();
+            
+            switch (event) {
+                case XMLStreamConstants.START_ELEMENT:
+                    elementName = reader.getLocalName();
+                    break;
+                case XMLStreamConstants.CHARACTERS:
+                    if ("element".equals(elementName)) {
+                        content.append(reader.getText());
+                    }
+                    break;
+            }
+        }
+        
+        assertEquals("Test content", content.toString(), "Content should be parsed correctly");
+        
+        // Test with XML containing entity references
+        String xmlWithEntities = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root><element>Test &lt;content&gt;</element></root>";
+        reader = xmlInputFactory.createXMLStreamReader(new StringReader(xmlWithEntities));
+        
+        // Parse and verify content
+        content = new StringBuilder();
+        elementName = null;
+        
+        while (reader.hasNext()) {
+            int event = reader.next();
+            
+            switch (event) {
+                case XMLStreamConstants.START_ELEMENT:
+                    elementName = reader.getLocalName();
+                    break;
+                case XMLStreamConstants.CHARACTERS:
+                    if ("element".equals(elementName)) {
+                        content.append(reader.getText());
+                    }
+                    break;
+            }
+        }
+        
+        assertEquals("Test <content>", content.toString(), "Entities should be properly decoded");
+        
+        // Test with malicious XML (should throw exception)
+        String maliciousXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE root [<!ENTITY xxe SYSTEM \"file:///etc/passwd\">]><root>&xxe;</root>";
+
+        XMLStreamException exception = assertThrows(XMLStreamException.class, () -> {
+            XMLStreamReader maliciousReader = xmlInputFactory.createXMLStreamReader(new StringReader(maliciousXml));
+            // Read through the document
+            while (maliciousReader.hasNext()) {
+                maliciousReader.next();
+            }
+        });
+        
+     // The exception message might vary by implementation, but should indicate a problem with DOCTYPE or entities
+        assertTrue(exception.getMessage().contains("DOCTYPE") || 
+                   exception.getMessage().contains("doctype") ||
+                   exception.getMessage().contains("entity") ||
+                   exception.getMessage().contains("DTD"),
+                   "Exception should indicate a security-related issue");
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlValidatorTest.java
index dbb87e9e560..f339691fde3 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlValidatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlValidatorTest.java
@@ -1,28 +1,27 @@
 package edu.harvard.iq.dataverse.util.xml;
 
-import edu.harvard.iq.dataverse.NonEssentialTests;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import edu.harvard.iq.dataverse.util.testing.Tags;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.xml.sax.SAXException;
 
 public class XmlValidatorTest {
 
     //Ignored as this relies on an external resource that has been down occasionally. 
     //May be a good test for our full vs. everytime test classifications (#4896) -MAD 4.9.1
-    @Ignore
-    @Category(NonEssentialTests.class)
+    @Disabled
+    @Tag(Tags.NOT_ESSENTIAL_UNITTESTS)
     @Test
     public void testValidateXml() throws IOException, SAXException, ParserConfigurationException {
         assertTrue(XmlValidator.validateXmlSchema("src/test/java/edu/harvard/iq/dataverse/util/xml/sendToDataCite.xml", new URL("https://schema.datacite.org/meta/kernel-3/metadata.xsd")));
diff --git a/src/test/java/edu/harvard/iq/dataverse/validation/EMailValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/validation/EMailValidatorTest.java
new file mode 100644
index 00000000000..614cdae2310
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/validation/EMailValidatorTest.java
@@ -0,0 +1,112 @@
+package edu.harvard.iq.dataverse.validation;
+
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@LocalJvmSettings
+class EMailValidatorTest {
+
+    private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
+    
+    public static Stream<Arguments> emailExamples() {
+        return Stream.of(
+            Arguments.of("true", "pete@mailinator.com"),
+            Arguments.of("false", " leadingWhitespace@mailinator.com"),
+            Arguments.of("false", "trailingWhitespace@mailinator.com "),
+            Arguments.of("false", "elisah.da mota@example.com"),
+            Arguments.of("false", "pete1@mailinator.com;pete2@mailinator.com"),
+
+            /*
+             * These examples are all from https://randomuser.me and seem to be
+             * valid according to
+             * http://sphinx.mythic-beasts.com/~pdw/cgi-bin/emailvalidate (except ØąŲˆŲ†ÛŒÚŠØ§.Ų…Ø­Ų…د؎اŲ†@example.com)
+             */
+            Arguments.of("true", "michÊlle.pereboom@example.com"),
+            Arguments.of("true", "begÃŧm.vriezen@example.com"),
+            Arguments.of("true", "lÃŗtus.gonçalves@example.com"),
+            Arguments.of("true", "lÃŗtus.gonçalves@Êxample.com"),
+            Arguments.of("true", "begÃŧm.vriezen@example.cologne"),
+            Arguments.of("true", "ØąŲˆŲ†ÛŒÚŠØ§.Ų…Ø­Ų…د؎اŲ†@example.com"),
+            Arguments.of("false", "lÃŗtus.gonçalves@example.cÃŗm"),
+            Arguments.of("false", "dora@.com"),
+            Arguments.of("false", ""),
+            // Null means "no value given" - that's valid, you'll need to use @NotNull or similar to enforce a value!
+            Arguments.of("true", null),
+    
+            // add tests for 4601
+            Arguments.of("true", "blah@wiso.uni-unc.de"),
+            Arguments.of("true", "foo@essex.co.uk"),
+            Arguments.of("true", "jack@bu.cloud")
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("emailExamples")
+    public void testIsEmailValid(boolean expected, String mail) {
+        assertEquals(expected, EMailValidator.isEmailValid(mail));
+    }
+    
+    /**
+     * This is a simple test class, as we defined the annotation for fields only.
+     */
+    private final class SubjectClass {
+        @ValidateEmail
+        String mail;
+    
+        SubjectClass(String mail) {
+            this.mail = mail;
+        }
+    }
+    
+    @ParameterizedTest
+    @MethodSource("emailExamples")
+    public void testConstraint(boolean expected, String mail) {
+        // given
+        SubjectClass sut = new SubjectClass(mail);
+        
+        //when
+        Set<ConstraintViolation<SubjectClass>> violations = validator.validate(sut);
+        
+        // then
+        assertEquals(expected ? 0 : 1, violations.size());
+        violations.stream().findFirst().ifPresent( c -> {
+            assertTrue(c.getMessage().contains(mail)); });
+    }
+    
+    public static Stream<Arguments> emailAsciiUtf8Examples() {
+        return Stream.of(
+            Arguments.of("false", "pete@mailinator.com"),
+            Arguments.of("false", "foobar@mail.science"),
+            Arguments.of("true", "lÃŗtus.gonçalves@Êxample.com"),
+            Arguments.of("true", "begÃŧm.vriezen@example.cologne")
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("emailAsciiUtf8Examples")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SUPPORT_UTF8, value = "false")
+    void validateWhenMTADoesNotSupportUTF8(boolean needsUTF8Support, String mail) {
+        assertEquals(!needsUTF8Support, EMailValidator.isEmailValid(mail));
+    }
+    
+    @ParameterizedTest
+    @MethodSource("emailAsciiUtf8Examples")
+    @JvmSetting(key = JvmSettings.MAIL_MTA_SUPPORT_UTF8, value = "true")
+    void validateWhenMTASupportsUTF8(boolean needsUTF8Support, String mail) {
+        assertTrue(EMailValidator.isEmailValid(mail));
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/validation/JSONDataValidationTest.java b/src/test/java/edu/harvard/iq/dataverse/validation/JSONDataValidationTest.java
new file mode 100644
index 00000000000..107dcecba35
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/validation/JSONDataValidationTest.java
@@ -0,0 +1,237 @@
+package edu.harvard.iq.dataverse.validation;
+
+import edu.harvard.iq.dataverse.ControlledVocabularyValue;
+import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import org.everit.json.schema.Schema;
+import org.everit.json.schema.ValidationException;
+import org.everit.json.schema.loader.SchemaLoader;
+import org.json.JSONObject;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+
+public class JSONDataValidationTest {
+
+    @Mock
+    static DatasetFieldServiceBean datasetFieldServiceMock;
+    @Mock
+    static DatasetFieldType datasetFieldTypeMock;
+    static ControlledVocabularyValue cvv = new ControlledVocabularyValue();
+    static Map<String, Map<String, List<String>>> schemaChildMap = new HashMap<>();
+
+    static JSONObject rawSchema = null;
+    static JSONObject rawSchema() throws IOException {
+        if (rawSchema == null) {
+                Path file = Path.of("doc/sphinx-guides/source/_static/api/dataset-schema.json");
+                String schema = Files.readString(file, StandardCharsets.UTF_8);
+                rawSchema = new JSONObject(schema);
+        }
+        return rawSchema;
+    }
+
+    static String jsonInput() {
+        return """
+                   {
+                   "datasetVersion": {
+                       "license": {
+                         "name": "CC0 1.0",
+                         "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+                       },
+                       "metadataBlocks": {
+                         "citation": {
+                           "fields": [
+                             {
+                               "value": "Darwin's Finches",
+                               "typeClass": "primitive",
+                               "multiple": false,
+                               "typeName": "title"
+                             },
+                             {
+                               "value": [
+                                 {
+                                   "authorName": {
+                                     "value": "Finch, Fiona",
+                                     "typeClass": "primitive",
+                                     "multiple": false,
+                                     "typeName": "authorName"
+                                   },
+                                   "authorAffiliation": {
+                                     "value": "Birds Inc.",
+                                     "typeClass": "primitive",
+                                     "multiple": false,
+                                     "typeName": "authorAffiliation"
+                                   }
+                                 }
+                               ],
+                               "typeClass": "compound",
+                               "multiple": true,
+                               "typeName": "author"
+                             },
+                             {
+                               "value": [
+                                   { "datasetContactEmail" : {
+                                       "typeClass": "primitive",
+                                       "multiple": false,
+                                       "typeName": "datasetContactEmail",
+                                       "value" : "finch@mailinator.com"
+                                   },
+                                   "datasetContactName" : {
+                                       "typeClass": "primitive",
+                                       "multiple": false,
+                                       "typeName": "datasetContactName",
+                                       "value": "Finch, Fiona"
+                                   }
+                               }],
+                               "typeClass": "compound",
+                               "multiple": true,
+                               "typeName": "datasetContact"
+                             },
+                             {
+                               "value": [{
+                                  "dsDescriptionValue":{
+                                    "value":   "Darwin's finches (also known as the GalÃĄpagos finches) are a group of about fifteen species of passerine birds.",
+                                    "multiple": false,
+                                    "typeClass": "primitive",
+                                    "typeName": "dsDescriptionValue"
+                                  },
+                                  "dsDescriptionDate": {
+                                     "typeName": "dsDescriptionDate",
+                                     "multiple": false,
+                                     "typeClass": "primitive",
+                                     "value": "2021-07-13"
+                                   }
+                                }],
+                               "typeClass": "compound",
+                               "multiple": true,
+                               "typeName": "dsDescription"
+                              },
+                             {
+                               "value": [
+                                 "Medicine, Health and Life Sciences",
+                                 "Social Sciences"
+                               ],
+                               "typeClass": "controlledVocabulary",
+                               "multiple": true,
+                               "typeName": "subject"
+                             }
+                           ],
+                           "displayName": "Citation Metadata"
+                         }
+                       }
+                     }
+                   }
+                """;
+    }
+
+    @BeforeAll
+    static void setup() throws NoSuchFieldException, IllegalAccessException {
+        datasetFieldServiceMock = Mockito.mock(DatasetFieldServiceBean.class);
+        datasetFieldTypeMock = Mockito.mock(DatasetFieldType.class);
+        Field datasetFieldServiceField = JSONDataValidation.class.getDeclaredField("datasetFieldService");
+        datasetFieldServiceField.setAccessible(true);
+        datasetFieldServiceField.set(JSONDataValidation.class, datasetFieldServiceMock);
+
+        Mockito.when(datasetFieldServiceMock.findByName(any(String.class))).thenReturn(datasetFieldTypeMock);
+        List<String> cvvList = List.of("Medicine, Health and Life Sciences", "Social Sciences");
+        cvvList.forEach(i -> {
+            Mockito.when(datasetFieldServiceMock.findControlledVocabularyValueByDatasetFieldTypeAndStrValue(datasetFieldTypeMock, i,true)).thenReturn(cvv);
+        });
+        Mockito.when(datasetFieldServiceMock.findControlledVocabularyValueByDatasetFieldTypeAndStrValue(datasetFieldTypeMock, "Bad",true)).thenReturn(null);
+
+        Map<String, List<String>> datasetContact = new HashMap<>();
+        datasetContact.put("required", List.of("datasetContactName"));
+        datasetContact.put("allowed", List.of("datasetContactName", "datasetContactEmail","datasetContactAffiliation"));
+        schemaChildMap.put("datasetContact",datasetContact);
+        Map<String, List<String>> dsDescription = new HashMap<>();
+        dsDescription.put("required", List.of("dsDescriptionValue"));
+        dsDescription.put("allowed", List.of("dsDescriptionValue", "dsDescriptionDate"));
+        schemaChildMap.put("dsDescription",dsDescription);
+
+    }
+    @Test
+    public void testSchema() throws IOException {
+        Schema schema = SchemaLoader.load(rawSchema());
+        schema.validate(new JSONObject(jsonInput()));
+    }
+    @Test
+    public void testValid() throws IOException {
+        Schema schema = SchemaLoader.load(rawSchema());
+        JSONDataValidation.validate(schema, schemaChildMap, jsonInput());
+    }
+    @Test
+    public void testInvalid() throws IOException {
+        Schema schema = SchemaLoader.load(rawSchema());
+        try {
+            JSONDataValidation.validate(schema, schemaChildMap, jsonInput().replace("\"Social Sciences\"", "\"Social Sciences\",\"Bad\""));
+            fail();
+        } catch (ValidationException e) {
+            System.out.println(e.getMessage());
+            System.out.println(e.getStackTrace());
+        }
+
+        try {
+            // test multiple = false but value is list
+            JSONDataValidation.validate(schema, schemaChildMap, jsonInput().replaceAll("true", "false"));
+            fail();
+        } catch (ValidationException e) {
+            System.out.println(e.getMessage());
+        }
+
+        // verify that child objects are also validated
+        String childTest = "\"multiple\": false, \"typeName\": \"authorAffiliation\"";
+        try {
+            String trimmedStr = jsonInput().replaceAll("\\s{2,}", " ");
+            // test child object with multiple set to true
+            JSONDataValidation.validate(schema, schemaChildMap, trimmedStr.replace(childTest, childTest.replace("false", "true")));
+            fail();
+        } catch (ValidationException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            // test dsDescription but dsDescriptionValue missing
+            JSONDataValidation.validate(schema, schemaChildMap, jsonInput().replace("typeName\": \"dsDescriptionValue", "typeName\": \"notdsDescriptionValue"));
+            fail();
+        } catch (ValidationException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            // test dsDescription but child dsDescriptionValue missing
+            JSONDataValidation.validate(schema, schemaChildMap, jsonInput().replace("dsDescriptionValue\":{", "notdsDescriptionValue\":{"));
+            fail();
+        } catch (ValidationException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            // test required dataType missing
+            JSONDataValidation.validate(schema, schemaChildMap, jsonInput().replaceAll("\"datasetContactName\"", "\"datasetContactAffiliation\""));
+            fail();
+        } catch (ValidationException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            // test dataType not allowed
+            JSONDataValidation.validate(schema, schemaChildMap, jsonInput().replaceAll("\"datasetContactEmail\"", "\"datasetContactNotAllowed\""));
+            fail();
+        } catch (ValidationException e) {
+            System.out.println(e.getMessage());
+        }
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorTest.java
index 27a88260870..9d38a527199 100644
--- a/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorTest.java
@@ -1,21 +1,26 @@
 package edu.harvard.iq.dataverse.validation;
 
-import org.apache.commons.lang.StringUtils;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.passay.CharacterRule;
 import org.passay.EnglishCharacterData;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * PasswordValidatorTest
  * <p>
@@ -28,203 +33,102 @@ public class PasswordValidatorTest {
     private static final Logger logger = Logger.getLogger(PasswordValidatorTest.class.getCanonicalName());
     private static PasswordValidatorServiceBean passwordValidatorService;
 
-    /**
-     * Helper class so we can pass on a list of passwords and validation settings to falsify the outcome.
-     */
-    private class Params {
-
-        int numberOfExpectedErrors;
-        String password;
-        Date passwordModificationTime;
-        int expirationDays;
-        int expirationMaxLength;
-        int goodStrength;
-        int maxLength;
-        int minLength;
-        String dictionaries;
-        List<CharacterRule> characterRules;
-        int numberOfCharacteristics;
-        int numberOfConsecutiveDigitsAllowed;
-
-        Params(int numberOfExpectedErrors, String password, Date passwordModificationTime, int expirationDays,
-               int expirationMinLength, int goodStrength, int maxLength, int minLength, String dictionaries,
-               int numberOfCharacteristics, List<CharacterRule> characterRules, int numConsecutiveDigitsAllowed) {
-
-            this.numberOfExpectedErrors = numberOfExpectedErrors;
-            this.password = password;
-            this.passwordModificationTime = passwordModificationTime;
-            this.expirationDays = expirationDays;
-            this.expirationMaxLength = expirationMinLength;
-            this.goodStrength = goodStrength;
-            this.maxLength = maxLength;
-            this.minLength = minLength;
-            this.dictionaries = dictionaries;
-            this.characterRules = characterRules;
-            this.numberOfCharacteristics = numberOfCharacteristics;
-            this.numberOfConsecutiveDigitsAllowed = numConsecutiveDigitsAllowed;
-        }
-
-        int getExpectedErrors() {
-            return numberOfExpectedErrors;
-        }
-
-        String getPassword() {
-            return password;
-        }
-
-        Date getPasswordModificationTime() {
-            return passwordModificationTime;
-        }
-
-        int getExpirationDays() {
-            return expirationDays;
-        }
-
-        int getExpirationMaxLength() {
-            return expirationMaxLength;
-        }
-
-        int getGoodStrength() {
-            return goodStrength;
-        }
-
-        int getMaxLength() {
-            return maxLength;
-        }
-
-        int getMinLength() {
-            return minLength;
-        }
-
-        String getDictionaries() {
-            return dictionaries;
-        }
-
-        List<CharacterRule> getCharacterRules() {
-            return characterRules;
-        }
-
-        int getNumberOfCharacteristics() {
-            return numberOfCharacteristics;
-        }
-        
-        int getNumberOfConsecutiveDigitsAllowed() {
-            return numberOfConsecutiveDigitsAllowed;
-        }
-
-        @Override
-        public String toString() {
-            StringBuilder sb = new StringBuilder();
-            for (CharacterRule rule : characterRules) {
-                sb.append(rule.getNumberOfCharacters() + " of " + rule.getValidCharacters() + " ");
-            }
-            String characterRulesReadable = sb.toString();
-            return
-                    String.format("numberOfExpectedErrors=%s\npassword='%s'\npasswordModificationTime=%s\nexpirationDays=%s\n" +
-                                    "expirationMaxLength=%s\ngoodStrength=%s\nmaxLength=%s\nminLength=%s\ndictionaries=%s\n" +
-                                    "characterRules=%s\n" +
-                                    "numberOfCharacteristics=%s\nnumberOfRepeatingCharactersAllowed=%s\n%s",
-                            numberOfExpectedErrors,
-                            password,
-                            passwordModificationTime,
-                            expirationDays,
-                            expirationMaxLength,
-                            goodStrength,
-                            maxLength,
-                            minLength,
-                            dictionaries,
-                            characterRulesReadable,
-                            numberOfCharacteristics,
-                            numberOfConsecutiveDigitsAllowed,
-                            StringUtils.repeat("-", 80)
-                    );
-        }
-    }
-
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         passwordValidatorService = new PasswordValidatorServiceBean();
     }
 
-    @SuppressWarnings("unchecked")
-    @Test
-    public void testDifferentPasswordsAndSettings() {
-
+    static Stream<Arguments> passwordParams() {
         long DAY = 86400000L;
-        final Date expired = new Date(new Date().getTime() - DAY * 400);
-        final Date notExpired = new Date(new Date().getTime() - DAY * 300);
         List<CharacterRule> characterRulesDefault = PasswordValidatorUtil.getCharacterRulesDefault();
         List<CharacterRule> characterRulesHarvardLevel3 = getCharacterRulesHarvardLevel3();
         final int numberOfCharactersDefault = 2;
         final int numberOfCharacters = 3;
         final int numConsecutiveDigitsAllowed = 4;
-        final int expirationDays = 365;
-        final int expirationMinLength = 10;
         final int goodStrength20 = 20;
         final int maxLength = 0;
         final int minLength = 8;
         final String dictionary = createDictionary("56pOtAtO", false);
-
-        final List<Params> paramsList = Arrays.asList(new Params[]{
-            new Params(6, "p otato", notExpired, expirationDays, expirationMinLength, goodStrength20, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // everything wrong here for both validators.
-            new Params(5, "p otato", notExpired, expirationDays, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // no GoodStrength validator
-            new Params(0, "p", expired, expirationDays, 0, 0, 0, 0, dictionary, 0, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // no validation... everything if off
-            new Params(1, "po", expired, expirationDays, 0, 0, 1, 0, dictionary, 0, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // this password is too long
-            new Params(0, "potato", notExpired, expirationDays, 7, 0, 0, 0, dictionary, 0, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // set expiration again
-            new Params(5, "p otato", expired, 401, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // 401 days before expiration
-            new Params(5, "p otato", notExpired, expirationDays, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(4, "one potato", notExpired, expirationDays, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(3, "Two potato", notExpired, expirationDays, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(0, "Three.potato", notExpired, expirationDays, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(0, "F0ur.potato", notExpired, expirationDays, 15, 0, maxLength, 10, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(0, "F0ur.potatos", notExpired, expirationDays, 15, 0, maxLength, 10, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(0, "F0ur.potato", notExpired, expirationDays, 15, 0, maxLength, 10, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(0, "4.potato", notExpired, expirationDays, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(0, "55Potato", notExpired, expirationDays, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(1, "56pOtAtO", notExpired, expirationDays, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // password in dictionary
-            new Params(1, "56Potato", notExpired, expirationDays, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // password in dictionary case insensitive
-            new Params(1, "56pOtAtOs", notExpired, expirationDays, expirationMinLength, 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // substring of password in dictionary
-            new Params(0, "6 Potato", notExpired, expirationDays, expirationMinLength, goodStrength20, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(3, "7 Potato", notExpired, expirationDays, expirationMinLength, goodStrength20, maxLength, minLength, dictionary, 4, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // add a fourth characteristic
-            new Params(0, "7 Potato901234567890", notExpired, expirationMinLength, minLength, goodStrength20, maxLength, minLength, dictionary, 4, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // Now it does not matter: 20 characters
-            new Params(0, "8.Potato", notExpired, expirationDays, expirationMinLength, goodStrength20, maxLength, minLength, dictionary, 4, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // Now we use all four
-            new Params(2, "Potato.Too.12345.Short", notExpired, expirationDays, expirationMinLength, 0, maxLength, 23, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(0, "Potatoes on my plate with beef", expired, expirationDays, expirationMinLength, 30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(0, "Potatoes on my plate with pie.", expired, expirationDays, expirationMinLength, 30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(0, "Potatoes on a plate  .", expired, expirationDays, expirationMinLength, 30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
-            new Params(0, "Repeated Potatoes:0000", expired, expirationDays, expirationMinLength, 30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, 5), // Pass when repeating character maximum is 5
-            new Params(0, "Repeated Potatoes:000", expired, expirationDays, expirationMinLength, 30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), // Allow no more than 3 repeating characters (default)
-            new Params(6, "          ", expired, expirationDays, expirationMinLength, 30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed), //For some reason, whitespace doesn't count in the repeating rule?
-            new Params(0, "potat1", notExpired, expirationDays, expirationMinLength, goodStrength20, maxLength, 6, dictionary, numberOfCharactersDefault, characterRulesDefault, numConsecutiveDigitsAllowed), // Good enough for Dataverse 4.0.
-            new Params(0, "potat000000000000000", notExpired, expirationDays, expirationMinLength, goodStrength20, maxLength, 6, dictionary, numberOfCharactersDefault, characterRulesDefault, numConsecutiveDigitsAllowed), // Has repeating chars exceeding limit, but goodstrength waives it
-            new Params(2, "ma02138", notExpired, expirationDays, expirationMinLength, goodStrength20, maxLength, 6, dictionary, numberOfCharactersDefault, characterRulesDefault, numConsecutiveDigitsAllowed), // 5 or more numbers in a row
-            new Params(2, "ma8312002138", notExpired, expirationDays, expirationMinLength, goodStrength20, maxLength, 6, dictionary, numberOfCharactersDefault, characterRulesDefault, numConsecutiveDigitsAllowed), // 5 or more numbers in a row
-        }
-        );
-
-        paramsList.forEach(
-                params -> {
-                    int expectedErrors = params.getExpectedErrors();
-//                    List<String> errors = passwordValidatorService.validate(params.getPassword(), params.getPasswordModificationTime());
-//                    passwordValidatorService.setExpirationDays(params.getExpirationDays());
-//                    passwordValidatorService.setExpirationMaxLength(params.getExpirationMaxLength());
-                    passwordValidatorService.setGoodStrength(params.getGoodStrength());
-                    passwordValidatorService.setMaxLength(params.getMaxLength());
-                    passwordValidatorService.setMinLength(params.getMinLength());
-                    passwordValidatorService.setDictionaries(params.getDictionaries());
-                    passwordValidatorService.setNumberOfCharacteristics(params.getNumberOfCharacteristics());
-                    passwordValidatorService.setCharacterRules(params.getCharacterRules());
-                    passwordValidatorService.setNumberOfConsecutiveDigitsAllowed(params.getNumberOfConsecutiveDigitsAllowed());
-
-                    List<String> errors = passwordValidatorService.validate(params.getPassword());
-                    int actualErrors = errors.size();
-
-                    String message = message(params, errors, expectedErrors, actualErrors);
-                    logger.info(message);
-                    Assert.assertTrue(message, actualErrors == expectedErrors);
-                }
+        
+        // Format: int numberOfExpectedErrors, String password, int goodStrength, int maxLength, int minLength,
+        //         String dictionaries, int numberOfCharacteristics, List<CharacterRule> characterRules,
+        //         int numConsecutiveDigitsAllowed
+        return Stream.of(
+            // everything wrong here for both validators.
+            Arguments.of(6, "p otato", goodStrength20, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // no GoodStrength validator
+            Arguments.of(5, "p otato", 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // no validation... everything if off
+            Arguments.of(0, "p", 0, 0, 0, dictionary, 0, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // this password is too long
+            Arguments.of(1, "po", 0, 1, 0, dictionary, 0, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // set expiration again
+            Arguments.of(0, "potato", 0, 0, 0, dictionary, 0, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(4, "one potato", 0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(3, "Two potato",  0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(0, "Three.potato",  0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(0, "F0ur.potato",  0, maxLength, 10, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(0, "F0ur.potatos",  0, maxLength, 10, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(0, "F0ur.potato",  0, maxLength, 10, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(0, "4.potato",  0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(0, "55Potato",  0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // password in dictionary
+            Arguments.of(1, "56pOtAtO",  0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // password in dictionary case insensitive
+            Arguments.of(1, "56Potato",  0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // substring of password in dictionary
+            Arguments.of(1, "56pOtAtOs",  0, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(0, "6 Potato",  goodStrength20, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // add a fourth characteristic
+            Arguments.of(3, "7 Potato",  goodStrength20, maxLength, minLength, dictionary, 4, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // Now it does not matter: 20 characters
+            Arguments.of(0, "7 Potato901234567890", goodStrength20, maxLength, minLength, dictionary, 4, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // Now we use all four
+            Arguments.of(0, "8.Potato",  goodStrength20, maxLength, minLength, dictionary, 4, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(2, "Potato.Too.12345.Short", 0, maxLength, 23, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(0, "Potatoes on my plate with beef", 30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(0, "Potatoes on my plate with pie.", 30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            Arguments.of(0, "Potatoes on a plate  .",  30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // Pass when repeating character maximum is 5
+            Arguments.of(0, "Repeated Potatoes:0000",  30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, 5),
+            // Allow no more than 3 repeating characters (default)
+            Arguments.of(0, "Repeated Potatoes:000",  30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            //For some reason, whitespace doesn't count in the repeating rule?
+            Arguments.of(6, "          ", 30, maxLength, minLength, dictionary, numberOfCharacters, characterRulesHarvardLevel3, numConsecutiveDigitsAllowed),
+            // Good enough for Dataverse 4.0.
+            Arguments.of(0, "potat1", goodStrength20, maxLength, 6, dictionary, numberOfCharactersDefault, characterRulesDefault, numConsecutiveDigitsAllowed),
+            // Has repeating chars exceeding limit, but goodstrength waives it
+            Arguments.of(0, "potat000000000000000", goodStrength20, maxLength, 6, dictionary, numberOfCharactersDefault, characterRulesDefault, numConsecutiveDigitsAllowed),
+            // 5 or more numbers in a row
+            Arguments.of(2, "ma02138", goodStrength20, maxLength, 6, dictionary, numberOfCharactersDefault, characterRulesDefault, numConsecutiveDigitsAllowed),
+            // 5 or more numbers in a row, but multiple times
+            Arguments.of(3, "ma8312002138", goodStrength20, maxLength, 6, dictionary, numberOfCharactersDefault, characterRulesDefault, numConsecutiveDigitsAllowed)
         );
-
+    }
+    
+    @SuppressWarnings("unchecked")
+    @ParameterizedTest
+    @MethodSource("passwordParams")
+    public void testDifferentPasswordsAndSettings(int numberOfExpectedErrors, String password, int goodStrength, int maxLength, int minLength, String dictionaries,
+                                                  int numberOfCharacteristics, List<CharacterRule> characterRules, int numberOfConsecutiveDigitsAllowed) {
+        // given
+        passwordValidatorService.setGoodStrength(goodStrength);
+        passwordValidatorService.setMaxLength(maxLength);
+        passwordValidatorService.setMinLength(minLength);
+        passwordValidatorService.setDictionaries(dictionaries);
+        passwordValidatorService.setNumberOfCharacteristics(numberOfCharacteristics);
+        passwordValidatorService.setCharacterRules(characterRules);
+        passwordValidatorService.setNumberOfConsecutiveDigitsAllowed(numberOfConsecutiveDigitsAllowed);
+
+        // when
+        List<String> errors = passwordValidatorService.validate(password);
+        
+        // then
+        String message = "";
+        if (numberOfExpectedErrors != errors.size()) {
+            message = StringUtils.join(errors, "\n");
+        }
+        assertEquals(numberOfExpectedErrors, errors.size(), message);
     }
 
     /**
@@ -235,7 +139,7 @@ public void testDifferentPasswordsAndSettings() {
      * @param password The string to add
      * @return The absolute file path of the dictionary file.
      */
-    private String createDictionary(String password, boolean append) {
+    static String createDictionary(String password, boolean append) {
         File file = null;
         try {
             file = File.createTempFile("weak_passwords", ".txt");
@@ -248,11 +152,6 @@ private String createDictionary(String password, boolean append) {
         assert file != null;
         return file.getAbsolutePath();
     }
-
-    private String message(Params params, List<String> errors, int expected, int actual) {
-        String details = (actual == 0) ? params.toString() : PasswordValidatorServiceBean.parseMessages(errors) + "\n" + params;
-        return String.format("Expected errors: %s\nActual errors: %s\nDetails: %s", expected, actual, details);
-    }
     
     public static List<CharacterRule> getCharacterRulesHarvardLevel3() {
         List<CharacterRule> characterRules = new ArrayList<>();
diff --git a/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtilTest.java
index b574ac4a082..c5a38c473fb 100644
--- a/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtilTest.java
@@ -5,24 +5,18 @@
  */
 package edu.harvard.iq.dataverse.validation;
 
-import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.xml.html.HtmlPrinter;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.passay.CharacterRule;
 import org.passay.EnglishCharacterData;
 
@@ -30,10 +24,9 @@
  *
  * @author pdurbin
  */
-@RunWith(Enclosed.class)
 public class PasswordValidatorUtilTest {
 
-    public static class PasswordValidatorUtilNoParamTest {
+    static class PasswordValidatorUtilNoParamTest {
         /**
          * Test of getPasswordRequirements method, of class PasswordValidatorUtil.
          */
@@ -83,79 +76,38 @@ public void testParseConfigString() {
 
     }
 
-    @RunWith(Parameterized.class)
-    public static class PasswordValidatorUtilParamTest {
-
-        // influences use of # or "each" in text generation
-        @Parameter(0)
-        public int numberOfCharacteristics;
-
-        @Parameter(1)
-        public String characterRulesConfigString;
-
-        @Parameter(2)
-        public String expectedValue;
-
-        @Parameters
-        public static Collection data() {
-            return Arrays.asList(new Object[][] {
-                {
-                    2,
-                    null,
-                    "At least 1 character from each of the following types: letter, numeral"
-                },
-                {
-                    2,
-                    "UpperCase:1,LowerCase:1,Digit:1,Special:1",
-                    "At least 1 character from 2 of the following types: uppercase, lowercase, numeral, special"
-                },
-                {
-                    4,
-                    "UpperCase:1,LowerCase:1,Digit:1,Special:1",
-                    "At least 1 character from each of the following types: uppercase, lowercase, numeral, special"
-                },
-
-                // Should say each, even if more characteristics set than possible
-                {
-                    2,
-                    "Digit:1",
-                    "At least 1 character from each of the following types: numeral"
-                },
-
-                {
-                    2,
-                    "Digit:2",
-                    "Fufill 2: At least 2 numeral characters"
-                },
-                {
-                    2,
-                    "LowerCase:1,Digit:2,Special:3",
-                    "Fufill 2: At least 1 lowercase characters, 2 numeral characters, 3 special characters"
-                },
-
-                // letter is mentioned even though that configuration is discouraged
-                {
-                    2,
-                    "UpperCase:1,LowerCase:1,Digit:1,Special:1,Alphabetical:1",
-                    "At least 1 character from 2 of the following types: uppercase, lowercase, letter, numeral, special"
-                }
-            });
-        }
-
-        @Test
-        public void testGetRequiredCharacters() {
-            List<CharacterRule> characterRules;
-            String message = "Character rules string for ";
-            if (characterRulesConfigString != null) {
-                characterRules = PasswordValidatorUtil.getCharacterRules(characterRulesConfigString);
-                message += characterRulesConfigString;
-            } else {
-                characterRules = PasswordValidatorUtil.getCharacterRulesDefault();
-                message += "default";
-            }
-
-            String reqString = PasswordValidatorUtil.getRequiredCharacters(characterRules, numberOfCharacteristics);
-            assertEquals(message + ": " + reqString, expectedValue, reqString);
+    static Stream<Arguments> configurations() {
+        return Stream.of(
+            Arguments.of(2, null,
+                "At least 1 character from each of the following types: letter, numeral"),
+            Arguments.of(2, "UpperCase:1,LowerCase:1,Digit:1,Special:1",
+                "At least 1 character from 2 of the following types: uppercase, lowercase, numeral, special"),
+            Arguments.of(4, "UpperCase:1,LowerCase:1,Digit:1,Special:1",
+                "At least 1 character from each of the following types: uppercase, lowercase, numeral, special"),
+            // Should say each, even if more characteristics set than possible
+            Arguments.of(2, "Digit:1", "At least 1 character from each of the following types: numeral"),
+            Arguments.of(2, "Digit:2", "Fufill 2: At least 2 numeral characters"),
+            Arguments.of(2, "LowerCase:1,Digit:2,Special:3",
+                "Fufill 2: At least 1 lowercase characters, 2 numeral characters, 3 special characters"),
+            // letter is mentioned even though that configuration is discouraged
+            Arguments.of(2, "UpperCase:1,LowerCase:1,Digit:1,Special:1,Alphabetical:1",
+                "At least 1 character from 2 of the following types: uppercase, lowercase, letter, numeral, special")
+        );
+    }
+    @ParameterizedTest
+    @MethodSource("configurations")
+    void testGetRequiredCharacters(int numberOfCharacteristics, String characterRulesConfigString, String expectedValue) {
+        List<CharacterRule> characterRules;
+        String message = "Character rules string for ";
+        if (characterRulesConfigString != null) {
+            characterRules = PasswordValidatorUtil.getCharacterRules(characterRulesConfigString);
+            message += characterRulesConfigString;
+        } else {
+            characterRules = PasswordValidatorUtil.getCharacterRulesDefault();
+            message += "default";
         }
+        
+        String reqString = PasswordValidatorUtil.getRequiredCharacters(characterRules, numberOfCharacteristics);
+        assertEquals(expectedValue, reqString, message + ": " + reqString);
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/validation/URLValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/validation/URLValidatorTest.java
new file mode 100644
index 00000000000..a344d6a600d
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/validation/URLValidatorTest.java
@@ -0,0 +1,109 @@
+package edu.harvard.iq.dataverse.validation;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ *
+ * @author skraffmi
+ */
+public class URLValidatorTest {
+    
+    final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
+    
+    public static Stream<Arguments> stdUrlExamples() {
+        return Stream.of(
+            Arguments.of(true, null),
+            Arguments.of(false, ""),
+            Arguments.of(true, "https://twitter.com"),
+            Arguments.of(true, "http://foobar.com:9101"),
+            Arguments.of(true, "ftp://user@foobar.com"),
+            Arguments.of(false, "cnn.com"),
+            Arguments.of(false, "smb://user@foobar.com"),
+            // case of a real permalink that requires UrlValidator.ALLOW_2_SLASHES
+            Arguments.of(true, "https://archive.softwareheritage.org/swh:1:dir:561bfe6698ca9e58b552b4eb4e56132cac41c6f9;origin=https://github.com/gem-pasteur/macsyfinder;visit=swh:1:snp:1bde3cb370766b10132c4e004c7cb377979928d1;anchor=swh:1:rev:868637fce184865d8e0436338af66a2648e8f6e1")
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("stdUrlExamples")
+    public void testIsURLValid(boolean expected, String url) {
+        assertEquals(expected, URLValidator.isURLValid(url));
+    }
+    
+    /**
+     * This is a simple test class, as we defined the annotation for fields only.
+     */
+    private final class SubjectClass {
+        @ValidateURL
+        String url;
+        
+        SubjectClass(String url) {
+            this.url = url;
+        }
+    }
+    
+    @ParameterizedTest
+    @MethodSource("stdUrlExamples")
+    public void testConstraint(boolean expected, String url) {
+        // given
+        URLValidatorTest.SubjectClass sut = new URLValidatorTest.SubjectClass(url);
+        
+        //when
+        Set<ConstraintViolation<URLValidatorTest.SubjectClass>> violations = validator.validate(sut);
+        
+        // then
+        assertEquals(expected ? 0 : 1, violations.size());
+        violations.stream().findFirst().ifPresent( c -> {
+            assertTrue(c.getMessage().contains(url)); });
+    }
+    
+    public static Stream<Arguments> fancyUrlExamples() {
+        return Stream.of(
+            Arguments.of(true, null),
+            Arguments.of(false, ""),
+            Arguments.of(false, "https://twitter.com"),
+            Arguments.of(true, "http://foobar.com:9101"),
+            Arguments.of(false, "ftp://user@foobar.com"),
+            Arguments.of(false, "cnn.com"),
+            Arguments.of(true, "smb://user@foobar.com")
+        );
+    }
+    
+    /**
+     * This is a simple test class like above, but with a scheme given
+     */
+    private final class SubjectSchemeClass {
+        @ValidateURL(schemes = {"http", "smb"})
+        String url;
+    
+        SubjectSchemeClass(String url) {
+            this.url = url;
+        }
+    }
+    
+    @ParameterizedTest
+    @MethodSource("fancyUrlExamples")
+    public void testConstraintWithSchemes(boolean expected, String url) {
+        // given
+        URLValidatorTest.SubjectSchemeClass sut = new URLValidatorTest.SubjectSchemeClass(url);
+        
+        //when
+        Set<ConstraintViolation<URLValidatorTest.SubjectSchemeClass>> violations = validator.validate(sut);
+        
+        // then
+        assertEquals(expected ? 0 : 1, violations.size());
+        violations.stream().findFirst().ifPresent( c -> {
+            assertTrue(c.getMessage().contains(url)); });
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/validation/UserNameValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/validation/UserNameValidatorTest.java
new file mode 100644
index 00000000000..1e5f0ca0371
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/validation/UserNameValidatorTest.java
@@ -0,0 +1,82 @@
+package edu.harvard.iq.dataverse.validation;
+
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class UserNameValidatorTest {
+    
+    public static Stream<Arguments> usernameExamples() {
+        return Stream.of(
+            // good usernames
+            Arguments.of(true, "sarah"),
+            Arguments.of(true, ".-_5Arah_-."),
+            // dont allow accents
+            Arguments.of(false, "àèÃŦÃ˛ÃšÃ€ÃˆÃŒÃ’Ã™ÃĄÃŠÃ­ÃŗÃēÃŊÁÉÍÓÚÝÃĸÃĒÎôÃģÂÊÎÔÛÃŖÃąÃĩÃÑÕäÃĢïÃļÃŧÃŋÄËÏÖÜŸçÇßØøÅÃĨÆÃĻœ"),
+            // dont allow chinese characters
+            Arguments.of(false, "谁æ—Ĩ吧įˆ¸åĨŊ"),
+            // dont allow middle white space
+            Arguments.of(false, "sarah f"),
+            // dont allow leading white space
+            Arguments.of(false, " sarah"),
+            // dont allow trailing white space
+            Arguments.of(false, "sarah "),
+            // dont allow symbols
+            Arguments.of(false, "sarah!"),
+            Arguments.of(false, "sarah?"),
+            Arguments.of(false, "sarah:("),
+            Arguments.of(false, "💲🅰ī¸ÂŽī¸đŸ…°ī¸đŸš§"),
+            // only allow between 2 and 60 characters
+            Arguments.of(false, "q"),
+            Arguments.of(true, "q2"),
+            Arguments.of(false, "q2jsalfhjopiwurtiosfhkdhasjkdhfgkfhkfrhnefcn4cqonroclmooi4oiqwhrfq4jrlqhaskdalwehrlwhflhklasdjfglq0kkajfelirhilwhakjgv"),
+            Arguments.of(false, "q2jsalfhjopiwurtiosfhkdhasj!1! !#fhkfrhnefcn4cqonroclmooi4oiqwhrfq4jrlqhaskdalwehrlwhflhklasdjfglq0kkajfelirhilwhakjgv"),
+            Arguments.of(false, ""),
+            Arguments.of(false, null)
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("usernameExamples")
+    public void testUsernames(boolean expected, String username) {
+        assertEquals(expected, UserNameValidator.isUserNameValid(username));
+    }
+    
+    /**
+     * This is a simple test class, as we defined the annotation for fields only.
+     */
+    private final class SubjectClass {
+        @ValidateUserName
+        String username;
+        
+        SubjectClass(String username) {
+            this.username = username;
+        }
+    }
+    
+    private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
+    
+    @ParameterizedTest
+    @MethodSource("usernameExamples")
+    public void testConstraint(boolean expected, String username) {
+        // given
+        UserNameValidatorTest.SubjectClass sut = new UserNameValidatorTest.SubjectClass(username);
+        
+        //when
+        Set<ConstraintViolation<UserNameValidatorTest.SubjectClass>> violations = validator.validate(sut);
+        
+        // then
+        assertEquals(expected, violations.size() < 1);
+        // TODO: one might add tests for the two violations (size and illegal chars) here...
+    }
+    
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapTokenServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapTokenServiceBeanTest.java
deleted file mode 100644
index e2d392249d7..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapTokenServiceBeanTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package edu.harvard.iq.dataverse.worldmapauth;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.PermissionServiceBean;
-import edu.harvard.iq.dataverse.PermissionServiceBean.StaticPermissionQuery;
-import edu.harvard.iq.dataverse.authorization.Permission;
-import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-
-public class WorldMapTokenServiceBeanTest {
-
-    private WorldMapTokenServiceBean worldMapTokenServiceBean;
-
-    @Before
-    public void setUp() {
-        this.worldMapTokenServiceBean = new WorldMapTokenServiceBean();
-        this.worldMapTokenServiceBean.permissionService = mock(PermissionServiceBean.class);
-    }
-
-    @After
-    public void tearDown() {
-        this.worldMapTokenServiceBean = null;
-    }
-
-    private WorldMapToken createWorldMapToken(AuthenticatedUser user, DataFile file) {
-        WorldMapToken worldMapToken = new WorldMapToken();
-        worldMapToken.setDataverseUser(user);
-        worldMapToken.setDatafile(file);
-
-        return worldMapToken;
-    }
-
-    private void mockPermissionServiceCallForEditDataset(AuthenticatedUser user, DataFile file,
-            boolean isUserPermitted) {
-        StaticPermissionQuery query = mock(StaticPermissionQuery.class);
-        Mockito.when(this.worldMapTokenServiceBean.permissionService.userOn(user, file)).thenReturn(query);
-        Mockito.when(query.has(Permission.EditDataset)).thenReturn(isUserPermitted);
-    }
-
-    @Test
-    public void testCanTokenUserEditFileWithUndefinedWorldMapToken() {
-        WorldMapToken worldMapToken = null;
-
-        assertFalse(this.worldMapTokenServiceBean.canTokenUserEditFile(worldMapToken));
-    }
-
-    @Test
-    public void testCanTokenUserEditFileWithPermission() {
-        AuthenticatedUser user = new AuthenticatedUser();
-        DataFile file = new DataFile();
-        WorldMapToken worldMapToken = this.createWorldMapToken(user, file);
-
-        this.mockPermissionServiceCallForEditDataset(user, file, true);
-
-        assertTrue(this.worldMapTokenServiceBean.canTokenUserEditFile(worldMapToken));
-    }
-
-    @Test
-    public void testCanTokenUserEditFileWithoutPermission() {
-        AuthenticatedUser user = new AuthenticatedUser();
-        DataFile file = new DataFile();
-        WorldMapToken worldMapToken = this.createWorldMapToken(user, file);
-
-        this.mockPermissionServiceCallForEditDataset(user, file, false);
-
-        assertFalse(this.worldMapTokenServiceBean.canTokenUserEditFile(worldMapToken));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapTokenTest.java b/src/test/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapTokenTest.java
deleted file mode 100644
index 94380d95651..00000000000
--- a/src/test/java/edu/harvard/iq/dataverse/worldmapauth/WorldMapTokenTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package edu.harvard.iq.dataverse.worldmapauth;
-
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.NonEssentialTests;
-import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
-import java.sql.Timestamp;
-import java.util.Date;
-import javax.ejb.embeddable.EJBContainer;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-/**
- *
- * @author raprasad
- */
-public class WorldMapTokenTest {
- 
-    private static EJBContainer c;
-
-   
-    public void msg(String s){
-       System.out.println(s);
-    }
- 
-    public void msgt(String s){
-        msg("------------------------------------------------------------");
-        msg(s);
-        msg("------------------------------------------------------------");
-    }
-
-     
-    private TokenApplicationType makeTokenApplicationType(int timeLimitMinutes){
-        TokenApplicationType tat = new TokenApplicationType();
-        tat.setName("GeoConnect");
-        tat.setContactEmail("info@iq.harvard.edu");
-        tat.setHostname("geoconnect.datascience.iq.harvard.edu");
-        tat.setIpAddress("127.0.0.1");
-        tat.setTimeLimitMinutes(timeLimitMinutes);
-        return tat;
-    }
-    private WorldMapToken makeNewToken(TokenApplicationType tat){
-        WorldMapToken token;
-        token = new WorldMapToken();
-        token.setApplication(tat);
-        token.setDatafile(new DataFile());
-        token.setDataverseUser(new AuthenticatedUser());
-        token.refreshToken();
-        token.setToken();        
-        return token;
-    }
-    
-    @Category(NonEssentialTests.class)
-    @Test
-    public void testTokenValues(){
-        msgt("WorldMapTokenTest!");
-        TokenApplicationType tat = this.makeTokenApplicationType(30);
-
-        WorldMapToken token = this.makeNewToken(tat);
-        String token_str1 = token.getToken();
- 
-        // Should only be able to set token value once--it doesn't "reset"
-        token.setToken();        
-        assertEquals(token.getToken().equalsIgnoreCase(token_str1), true);
-   
-        
-        WorldMapToken token2  = this.makeNewToken(tat);
-        WorldMapToken token3  = this.makeNewToken(tat);
-        assertEquals(token2.getToken().equalsIgnoreCase(token.getToken()), false);
-        assertEquals(token2.getToken().equalsIgnoreCase(token3.getToken()), false);
-    }
-    
-    @Category(NonEssentialTests.class)
-    @Test
-    public void testTokenTimes(){
-        msgt("testTokenTimes");
-       
-        TokenApplicationType tat = this.makeTokenApplicationType(30);
-
-        assertEquals(30*60, tat.getTimeLimitSeconds());
-        msg("time limit seconds: " + tat.getTimeLimitSeconds());
-        tat.setTimeLimitMinutes(1);
-        msg("time limit seconds (2): " + tat.getTimeLimitSeconds());
-        assertEquals(1*60, tat.getTimeLimitSeconds());
-        
-        tat.setTimeLimitMinutes(30);
-        WorldMapToken token = this.makeNewToken(tat);
-        assertEquals(token.hasTokenExpired(), false);
-
-        //msg("Future token time (31 min): " + getFutureTimeStamp(31));
-        msg("token time limit (minutes): " + token.getApplication().getTimeLimitMinutes());
-        msg("Did token expire in 10 minutes? (should be no)");
-        //msg("expired? " +  token.hasTokenExpired(getFutureTimeStamp(10)));
-
-        assertEquals(token.hasTokenExpired(getFutureTimeStamp(10)), false);
-
-        msg("Did token expire? (automatically check current time)");
-        assertEquals(token.hasTokenExpired(), false);
-
-        msg("Did token expire at 30 minutes? (should be no)");
-        assertEquals(token.hasTokenExpired(getFutureTimeStamp(30)), false);
-
-        msg("Did token expire in 31 minutes? (should be yes)");
-        assertEquals(token.hasTokenExpired(getFutureTimeStamp(31)), true);
-
-        msg("Did token expire in 45 minutes? (should be yes)");
-        assertEquals(token.hasTokenExpired(getFutureTimeStamp(45)), true);
-
-        msg("token time limit (minutes): 10 minutes");
-        token.getApplication().setTimeLimitMinutes(10);
-        assertEquals(token.getApplication().getTimeLimitMinutes(), 10);
-
-        msg("Did token expire if null sent? (should be yes)");
-        assertEquals(token.hasTokenExpired(null), true);
-
-        msg("Refresh token (but fails b/c sending null automatically expires it");
-        token.refreshToken();
-        msg("Did token expire in 5 minutes? (should be no)");
-        assertEquals(token.hasTokenExpired(getFutureTimeStamp(5)), true);
-        msg("Did token expire? (auto-check current time)");
-        assertEquals(token.hasTokenExpired(), true);
-        
-        msgt("Get a new Token");
-        WorldMapToken token2 = this.makeNewToken(tat);
-
-
-        msg("Did token expire? (automatically check current time)");
-        assertEquals(token2.hasTokenExpired(), false);
-
-        msg("Manually expire token: setHasExpired(true)");
-        token2.setHasExpired(true);
-        msg("Did token expire in 1 minute? (should be yes--b/c manually expired)");
-        assertEquals(token2.hasTokenExpired(getFutureTimeStamp(1)), true);
-        
-        
-    }
-    
-    private Timestamp getFutureTimeStamp(int futuremMinutes){
-
-        long ONE_MINUTE_IN_MILLIS=60000;//millisecs
-        long currentTimeMillisec = new Date().getTime();
-        long inFutureMinutesMillisec = currentTimeMillisec + (futuremMinutes * ONE_MINUTE_IN_MILLIS);
-        return new Timestamp(new Date(inFutureMinutesMillisec).getTime());
-        
-    }
-}
diff --git a/src/test/resources/META-INF/microprofile-config.properties b/src/test/resources/META-INF/microprofile-config.properties
new file mode 100644
index 00000000000..113a098a1fe
--- /dev/null
+++ b/src/test/resources/META-INF/microprofile-config.properties
@@ -0,0 +1,18 @@
+# DEFAULTS FOR TESTS
+# Unlike src/main/resources/META-INF/microprofile-config.properties, this file will not be included in
+# a packaged WAR. It can be used to provide sane defaults for things like unit tests on classes requiring
+# some sort of configuration.
+
+# PersistentIdentifierServiceBeanTest loads all the providers, which makes the EZID provider reach out
+# to the service - switching to example.org to not trigger a DDoS via test executions at their place.
+dataverse.pid.ezid.api-url=http://example.org
+# Also requires the username and the password to be present when used in production, use a default for unit testing.
+dataverse.pid.ezid.username=Dataverse Unit Test
+dataverse.pid.ezid.password=supersecret
+
+# To test ConfigCheckService, point our files directories to a common test dir by overriding the
+# property test.filesDir via system properties
+test.filesDir=/tmp/dataverse
+dataverse.files.directory=${test.filesDir}
+dataverse.files.uploads=${test.filesDir}/uploads
+dataverse.files.docroot=${test.filesDir}/docroot
diff --git a/src/test/resources/bagit/data/DataFileDataProviderTest.txt b/src/test/resources/bagit/data/DataFileDataProviderTest.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/test/resources/bagit/data/FileDataProviderFactoryTest.zip b/src/test/resources/bagit/data/FileDataProviderFactoryTest.zip
new file mode 100644
index 00000000000..50592b4e292
Binary files /dev/null and b/src/test/resources/bagit/data/FileDataProviderFactoryTest.zip differ
diff --git a/src/test/resources/bagit/data/FolderDataProviderTest/file1.txt b/src/test/resources/bagit/data/FolderDataProviderTest/file1.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/test/resources/bagit/data/FolderDataProviderTest/file2.csv b/src/test/resources/bagit/data/FolderDataProviderTest/file2.csv
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/test/resources/bagit/manifest/invalid_format/manifest-sha256.txt b/src/test/resources/bagit/manifest/invalid_format/manifest-sha256.txt
new file mode 100644
index 00000000000..18db6fbe96f
--- /dev/null
+++ b/src/test/resources/bagit/manifest/invalid_format/manifest-sha256.txt
@@ -0,0 +1,2 @@
+valid-hash  data/valid-file.txt
+invalid
\ No newline at end of file
diff --git a/src/test/resources/bagit/manifest/valid/manifest-sha256.txt b/src/test/resources/bagit/manifest/valid/manifest-sha256.txt
new file mode 100644
index 00000000000..f366a5c71cd
--- /dev/null
+++ b/src/test/resources/bagit/manifest/valid/manifest-sha256.txt
@@ -0,0 +1,2 @@
+hash-line-1  data/file-line-1.txt
+hash-line-2  data/file-line-2.txt
\ No newline at end of file
diff --git a/src/test/resources/fileutil/Makefile b/src/test/resources/fileutil/Makefile
new file mode 100644
index 00000000000..8ab4f33d6e5
--- /dev/null
+++ b/src/test/resources/fileutil/Makefile
@@ -0,0 +1 @@
+To test file type recognition from file name
\ No newline at end of file
diff --git a/src/test/resources/fits/FOSy19g0309t_c2f.fits b/src/test/resources/fits/FOSy19g0309t_c2f.fits
new file mode 100644
index 00000000000..bc76e4066ef
--- /dev/null
+++ b/src/test/resources/fits/FOSy19g0309t_c2f.fits
@@ -0,0 +1,42 @@
+SIMPLE  =                    T / Standard FITS format                           BITPIX  =                  -32 / 32 bit IEEE floating point numbers             NAXIS   =                    2 / Number of axes                                 NAXIS1  =                 2064 /                                                NAXIS2  =                    2 /                                                EXTEND  =                    T / There may be standard extensions               OPSIZE  =                  832 / PSIZE of original image                        ORIGIN  = 'ST-DADS '           / Institution that originated the FITS file      FITSDATE= '12/07/94'           / Date FITS file was created                     FILENAME= 'y19g0309t_cvt.c2h'  / Original GEIS header file name with _cvt       ODATTYPE= 'FLOATING'           / Original datatype                              SDASMGNU=                    2 / GCOUNT of original image                       DADSFILE= 'Y19G0309T.C2F'      /                                                DADSCLAS= 'CAL     '           /                                                DADSDATE= '12-JUL-1994 02:44:39' /                                              CRVAL1  =      1.0000000000000 /                                                CRPIX1  =      1.0000000000000 /                                                CD1_1   =      1.0000000000000 /                                                DATAMIN =     0.00000000000000 /                                                DATAMAX =  2.7387550387959E-15 /                                                RA_APER =      182.63573015260 /                                                DEC_APER=      39.405888372580 /                                                FILLCNT =                    0 /                                                ERRCNT  =                    0 /                                                FPKTTIME=      49099.133531036 /                                                LPKTTIME=      49099.133541164 /                                                CTYPE1  = 'PIXEL   '           /                                                APER_POS= 'SINGLE  '           /                                                PASS_DIR=                    0 /                                                YPOS    =     -1516.0000000000 /                                                YTYPE   = 'OBJ     '           /                                                EXPOSURE=      31.249689102173 /                                                X_OFFSET=     0.00000000000000 /                                                Y_OFFSET=     0.00000000000000 /                                                                                                                                                 / GROUP PARAMETERS: OSS                                                                                                                                         / GROUP PARAMETERS: PODPS                                                                                                                                       / FOS DATA DESCRIPTOR KEYWORDS                                 INSTRUME= 'FOS               ' / instrument in use                              ROOTNAME= 'Y19G0309T         ' / rootname of the observation set                FILETYPE= 'ERR     '           / file type                                      BUNIT   = 'ERGS/CM**2/S/A'     / brightness units                                                                                                                                / GENERIC CONVERSION KEYWORDS                                  HEADER  =                    T / science header line exists                     TRAILER =                    F / reject array exists                            YWRDSLIN=                  516 / science words per packet                       YLINSFRM=                    5 / packets per frame                                                                                                                               / CALIBRATION FLAGS AND INDICATORS                             GRNDMODE= 'SPECTROSCOPY      ' / ground software mode                           DETECTOR= 'AMBER             ' / detector in use: amber, blue                   APER_ID = 'B-2               ' / aperture id                                    POLAR_ID= 'C                 ' / polarizer id                                   POLANG  =        0.0000000E+00 / initial angular position of polarizer          FGWA_ID = 'H57               ' / FGWA id                                        FCHNL   =                    0 / first channel                                  NCHNLS  =                  512 / number of channels                             OVERSCAN=                    5 / overscan number                                NXSTEPS =                    4 / number of x steps                              YFGIMPEN=                    T / onboard GIMP correction enabled (T/F)          YFGIMPER= 'NO                ' / error in onboard GIMP correction (YES/NO)                                                                                                       / CALIBRATION REFERENCE FILES AND TABLES                       DEFDDTBL=                    F / UDL disabled diode table used                  BACHFILE= 'yref$b3m1128fy.r0h' / background header file                         FL1HFILE= 'yref$baf13103y.r1h' / first flat-field header file                   FL2HFILE= 'yref$n/a          ' / second flat-field header file                  IV1HFILE= 'yref$c3u13412y.r2h' / first inverse sensitivity header file          IV2HFILE= 'yref$n/a          ' / second inverse sensitivity header file         RETHFILE= 'yref$n/a          ' / waveplate retardation header file              DDTHFILE= 'yref$c861559ay.r4h' / disabled diode table header file               DQ1HFILE= 'yref$b2f1301qy.r5h' / first data quality initialization header file  DQ2HFILE= 'yref$n/a          ' / second data quality initialization header file CCG2    = 'mtab$a3d1145ly.cmg' / paired pulse correction parameters             CCS0    = 'ytab$a3d1145dy.cy0' / aperture parameters                            CCS1    = 'ytab$aaj0732ay.cy1' / aperture position parameters                   CCS2    = 'ytab$a3d1145fy.cy2' / sky emission line regions                      CCS3    = 'ytab$a3d1145gy.cy3' / big and sky filter widths and prism X0         CCS4    = 'ytab$b9d1019my.cy4' / polarimetry parameters                         CCS5    = 'ytab$a3d1145jy.cy5' / sky shifts                                     CCS6    = 'ytab$bck10546y.cy6' / wavelength coefficients                        CCS7    = 'ytab$ba910502y.cy7' / GIMP correction scale factores                 CCS8    = 'ytab$ba31407ly.cy8' / predicted background count rates                                                                                                                / CALIBRATION SWITCHES                                         CNT_CORR= 'COMPLETE'           / count to count rate conversion                 OFF_CORR= 'OMIT              ' / GIMP correction                                PPC_CORR= 'COMPLETE'           / paired pulse correction                        BAC_CORR= 'COMPLETE'           / background subtraction                         GMF_CORR= 'COMPLETE'           / scale reference background                     FLT_CORR= 'COMPLETE'           / flat-fielding                                  SKY_CORR= 'COMPLETE'           / sky subtraction                                WAV_CORR= 'COMPLETE'           / wavelength scale generation                    FLX_CORR= 'COMPLETE'           / flux scale generation                          ERR_CORR= 'COMPLETE'           / propagated error computation                   MOD_CORR= 'OMIT              ' / ground software mode dependent reductions                                                                                                       / PATTERN KEYWORDS                                             INTS    =                    2 / number of integrations                         YBASE   =                -1516 / y base                                         YRANGE  =                    0 / y range                                        YSTEPS  =                    1 / number of y steps                              YSPACE  =        0.0000000E+00 / yrange * 32 / ysteps                           SLICES  =                    1 / number of time slices                          NPAT    =                   12 / number of patterns per readout                 NREAD   =                    2 / number of readouts per memory clear            NMCLEARS=                    1 / number of memory clears per acquisition        YSTEP1  = 'OBJ               ' / first ystep data type: OBJ, SKY, BCK, NUL      YSTEP2  = 'NUL               ' / second ystep data type: OBJ, SKY, BCK, NUL     YSTEP3  = 'NUL               ' / third ystep data type: OBJ, SKY, BCK, NUL      XBASE   =                    0 / X-deflection base                              XPITCH  =                 1521 / X-deflection pitch between diode               YPITCH  =                 1834 / Y-deflection pitch                                                                                                                              / CALIBRATION KEYWORDS                                         LIVETIME=                33333 / accumulator open time  (unit=7.8125 microsec)  DEADTIME=                 1280 / accumulator close time (unit=7.8125 microsec)  MAXCLK  =                    0 / maximum clock count                            PA_APER =        0.2462417E+03 / position ang of aperture used with target (deg)NOISELM =                65535 / burst noise rejection limit                    OFFS_TAB= 'n/a               ' / GIMP offsets (post-pipeline processing only)   MINWAVE =             4569.102 / minimum wavelength (angstroms)                 MAXWAVE =             6817.517 / maximum wavelength (angstroms)                                                                                                                  / STATISTICAL KEYWORDS                                         DATE    = '22/04/93          ' / date this file was written (dd/mm/yy)          PKTFMT  =                   96 / packet format code                             PODPSFF = '0                 ' / 0=(no podps fill), 1=(podps fill present)      STDCFFF = '0                 ' / 0=(no st dcf fill), 1=(st dcf fill present)    STDCFFP = '0000              ' / st dcf fill pattern (hex)                                                                                                                       / APERTURE POSITION                                            RA_APER1=  0.1826357301526E+03 / right ascension of the aperture (deg)          DECAPER1=  0.3940588837258E+02 / declination of the aperture (deg)                                                                                                               / EXPOSURE INFORMATION                                         EQUINOX = 'J2000             ' / equinox of the celestial coordinate system     SUNANGLE=        0.1225114E+03 / angle between sun and V1 axis (deg)            MOONANGL=        0.1191039E+03 / angle between moon and V1 axis (deg)           SUN_ALT =        0.4515910E+02 / altitude of the sun above Earth's limb (deg)   FGSLOCK = 'COARSE            ' / commanded FGS lock (FINE,COARSE,GYROS,UNKNOWN)                                                                                 DATE-OBS= '22/04/93          ' / UT date of start of observation (dd/mm/yy)     TIME-OBS= '03:12:17          ' / UT time of start of observation (hh:mm:ss)     EXPSTART=  0.4909913202874E+05 / exposure start time (Modified Julian Date)     EXPEND  =  0.4909913505303E+05 / exposure end time (Modified Julian Date)       EXPTIME =        0.2499975E+03 / exposure duration (seconds)--calculated        EXPFLAG = 'NORMAL            ' / Exposure interruption indicator                                                                                                                 / TARGET & PROPOSAL ID                                         TARGNAME= 'NGC4151-CLOUD2    ' / proposer's target name                         RA_TARG =  0.1826357301526E+03 / right ascension of the target (deg) (J2000)    DEC_TARG=  0.3940588837258E+02 / declination of the target (deg) (J2000)                                                                                        PROPOSID=                 4220 / PEP proposal identifier                        PEP_EXPO= '174.0000000       ' / PEP exposure identifier including sequence     LINENUM = '174.000           ' / PEP proposal line number                       SEQLINE = '                  ' / PEP line number of defined sequence            SEQNAME = '                  ' / PEP define/use sequence name                                                                                                   END                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             '3C&â1f&ĄŸU&"Ŗ1&aƒ9&ˆ$…&+#&žž÷& šŸ&cm&ŦÕ&3ûĨ&šP&ˆC<&Zqœ&LwŪ&<’&Įb&„%&öÚ&N6†&.5Z&2Ē&eŲx&¯ĩ&xū&|‹~&;ė&}iŌ&:SÎ&„Û&Wô&?í&+M!&Iš_&cĩI&;ĩ&^Ô&Uņ&Sd&^ĸj&E2&<KÁ&<†—&!Ö&mƒ&1āä&1Å.&V&~&lq¤&e’&^Vž&F&ŒeÎ&Ŋģŗ&§¯Ė&ŽĀ&{oŗ&]kŽ&nę&e‰C&6ØÜ&I.Â&jæ&iœ"&†Ę[&pŸm&•‰—&Ŧ^é&›˛&†‰&Œā&d<€&cÍ
+&J7,&63ø&4z˛&To
& +&ū&a“&Iĩ0&W28&9\}&J+/&(ĩm&BLž&(kC&(ų&Jöŧ&|z&3å&ķ×&â€& Ņc%â/M&•â&AS|&G˛&'Ė~%ųEŦ&@™2&72ž&?Öh&&­ī&9õ˛&R@€&z3&?%Ž&M0&EÁ×&7"&Gq&O[Ņ&’Wx&oHĸ&[(–&’1&&h5&r}Á&rxy&‚"K&nOs&@֜&—ļ/&uā&#^&Ķ&_Dí&‘;û&ˆLą&w•ô&iuč&Qëą&a6ä&mdÂ&Rž &^÷ë&\ĩ&@gą&sÍį&Ž°;&„ĄŨ&f‡œ&Ž:Ą&0ú&b9&ce&ssE&Dé—&zL&\Š4&V`2&sņÔ&tôÜ&dît&„É&x)&fA0&eFd&{_?&…¯Š&dŲ&Yā&uĩÃ&t~ &ƒęņ&ÛŠ&3ĸƒ&„‘M&–ōF&–æ
&”Õj&‹Īž&‰H}&–˜š&¤ķU&ąĢB&p O&ĨvÚ&¤­&§Ë…&Ĩ$0&žW°&§Ž&šË€&ĒĘŋ&ÄŸ'Ūe'	Z&ø`‰&ķŦ4&âÔ}&Ęŋ<&ÁÚ&ŗēI&˛`Ÿ&¤ķ&ŊKl&˛´´&°ĀW&Ƥ&ŋõ	&Õ¯&Æj&Ø?Ė&ß=I'
+–Ļ'æ'Īĩ'	'
V÷&ęcĢ&ÉEW&ͯú&™Ą9&Ĩ,‹&Ļæ9&¯Į{& ø&Ģđ…&šą&ĮĀV&ēæœ&ÅáÂ&šXE&–6V&ēJ&Ũ×&¤Č&†Ō2&Ÿd˙&‹&Ē Č&™:Í&œü@&ŽōĘ&Œž4&`,W&ˆ×&ze&”o&’M&$ä&ŸĨø&xį&…%i&Ŗ/&“¤v&‰3‡&€>c&r-.&mK&—™&‚ &Šĩ&RWų&zė&†$ƒ&†u&~š-&yÕR&y§&zŗ¤&Mvņ&iŸ7&{yë&\š&&‹p/&t9&Ep$&dƒ*&TS&Xi:&zI˛&7ŧ&qU@&qĶ.&U˜ö&€Æi&[3W&Oq.&n1y&Z`&&_‹&OMŖ&hūy&š!&NŲĸ&Svˇ&SĩH&*vy&M׏&#_v&<H&AŨÅ&ũ%÷N´&TžV&Nđ§&C\4&a—‚&M!&-÷Ŋ&J›€&J&áN&ô&k„&D3Ŋ&	ōŲ&2…&-Ž&>—ž&2ŗË&,5 &	‚Ų%ļē¤%ßíŠ&%ģ¸&2Ô
&34Ž&&Ї&
+Čą&?2ž%äÂz%ŧ†&™˜&áč& €â&%ší&	8&AĀO&í\%ßj[&AŖĸ&V:&*‘I&)įí&K.m&€É&ŋā&AŠé&îü&F"&8ėY&~o%ûk%ëb’&ÄŲ&öI%éĶ%&ŧĩ%üé&¸Ž&%2–&7ŸÔ&šŊ&=8%āŖâ&%zÖ&ÉŦ&#Ō&âļ&˛Ķ%ũNL%ۓK&.´;&Qo&æ&et&:¨&`
&#!&	Ņ%ōâ­&71&jL&4ļ$&=&†Ō&q&@dÁ&}Á&/Ã&=O&ŲF&+Üä&%ŗ1&G/&+ö&6„æ&;Ø&NŲÛ&%Ģä&ŧ@&+“}&6FÃ%úa@&2jō&2ņ„%ėĘĢ%™n-&eķ&lÍ&7§&	~Ë&‰&b&<ę%äå”%æĸ9%÷Œz&
+ę%ԘT&Ä%äîv%õ#I%õ§&ú
&
˜\&Ü&Re%ž]¸&<ß%âŊØ&
”5&
9ė%ōî•%âë&ļ&&‡¤&*ķ&	p“%Âf&\&ôũ&Ø&*ŧ´&+k6&ež&Ķ &/Â#&=×
+&O &F™&0Ŧ&
rĢ&A?Ö&Ÿ+‘&•g&Ģ‘&f;S&=aÁ&4č!&\3%ø-Ķ&fē&0ÂÛ&jē%īQ%ž!k&c&4Ī&´%žkũ%īÔ5&˜í&4×%î	|&üž%Ũé%&N×&-=3%ėÜ}%ģå&+âQ%Ė¸š&"&öų%ĖÃ&1fļ&
+&°ø&7%ė؋%Üģé&ŌÆ%éē„%Ļ&¸™%ŧ
=%Ėļ&&×q%öšÃ&nÃ%ڗ&/đļ&ŽÕ%ú1†&
+Cj&Ąī&Šƒ&R%ę‘&4%&hV%ķ‡%Äup&ž‚&‰>&šø%åEü%Ö:&Ų&Ĩ%Æ5%ä:Ę&™}&`4&íã%ü5&
+Č&š&&
+&n%Ōôt&Ã.&	*%íņ`&(ūo&É&š"%˙Œa&+%ä=s&đ%ü{/%īŨJ&Z{%đ%ũeč%Ԛ:%ū°Ŋ&^8&L	&äŸ%ĶF%íå‚%ú0Ú%íē§%ú÷’%úĻJ&	(.&ŽY&$|Š%üÕ<&@%Ņî&ÜŽ&
Âs&
'_%ęš&%Į&–%éĄÖ%õāđ%čŸā%ö>/%÷gÃ%ėq& Ü%ų[Ī%Ī{<&™q&rå&
+/%™<%å:ę%ņĶá%ūKĘ&
+û#&„æ%Í‘&§Ļ%įīÕ%ŊHÕ%ÛD‡&ę¯&
’„&Õ&Aƒ&‡&
+tÍ&€i&8§&—&]I%ûî%ãø&	P&o<&
+^&ë&!%Ū&Âŋ%ÎRų%Ûq%ŦUá%ōbD%ũQÅ&Đ/%Čfd&ų^%öbî&)>ü%ŪŽō%ÅŠY%ų!ę%íE‰%ÅŧJ%ė
´%Ķ{b%ėßĢ&
W&‡‡%PãT%Đ¯c%Ū-%%ĩU%čß%ōĀĖ%ÎŖ
+%ō
&9Ų]&Ã@&žũ&ŗû&
ŨÜ%ū>Đ&Īų&Œt&Ā&%ëg‡&,2%ô—|&û	&"5e%ŲĮŪ%ņ×G&
cz%Ι%ąíK%đ›o%ûiĮ%åÉî&™õ&ĘL%O4Ŗ%Ûa%ņÚ%ÚnĐ%ü˜
+%æVÍ%ŋŖ!%ųÃ%ááŅ%ÖŖí&Tû%úđū&-&x%ûد%ú]ā%Ëo*&

%í Q%Ęh%\ņ%ãb&ķ&
+č&'ŋ6%ÉZ&ˆ%æsí%ÎÂÔ&G,%æ%N&ÜĄ%Ú5%Ąhr&;ļ%Ŋ„ž&
&ĀÛ&8l%ë}@%ë?ž&‹%ë˙&Ŗd%ķ^
&L[%é@_%ĶnÍ%ßŌĘ%ģdE%ęI%üđ%įŧļ&~_%ôú&ˇØ%û5G%åŪ&
˛ž&dŠ%Ņ\ü%úÆ)&šH&:%ĩ|ô&V_%š%å¯%&ŗo&žå%č)ī&-%ÅI&†~%đÛ%Ė†&iC%åüĐ%ÚÚm%ųÂ%ÛĮc%ō:&ȍ%Ü`%īÃ-&ũ2&
#R%øÜĖ&
~q%Íl%˜!î%ë5Ā&ĢŠ%îūR%ÎĻ“%ŧô”%˙-F&
@Ë&šä%ĪžË&ū&Ā&
Ķ&՞%āî%’Zš&ôm&A%ī_H&%áĮ%&We%ŲŠŖ%´čˆ%ā~F&Äŗ%æ3Ō%īf8%øv:&ÁĶ%÷čÅ%îĐ{%¯%ģīE&oN%íõ%Î3Ú&ø&÷Ô&ãQ%û-h&Б&™%ēī&I˜&+”&*1Ŋ%÷č%Ę:%ę]ķ&Z'%ų¤Õ&5pi%Ė-%đjm%æs!&
œ%øŪž%ĮÆ&âG%ėԝ&¤¤%Ø+û%ŸŲo%Ŧ“ķ%ŦŊ%âĨc%õüU%Å5B%Đ.˜%šÔŽ%Ī¸F&gã%ö;?&æö&=j&
Ō&1&ˇ‹%čÔš%ûÖ%Ėđ\%éĘJ%ĢC&
>Ž&œ%žļ%ÕŒ&le%đī“&ä_&_%ųõ%&FÖ%ū %&y5&É&
+×Ä%Ä:a%Ę%ÄÁV&+mÔ&íK&íF&y3%ũ„æ&1ĒË&9]U%ÁŠ%߅į&t	&	a&ˇD%ī‹Ä%įjg%įeQ%ÉĒ€&Jy%äU#%ŗÅP&Zŗ&Ų%˙Ō@&ŧy&áÂ%œ|b%ö<D%äĐJ&¸c&V;%čŪe&Ņ˛%æ0%ôˆˆ%úģĐ%ú„
+%Đ1q%Į;%ôˆđ&	AĢ&
~Š%Ų´%âH˜&
žp%ÚL%ķ_%ō;â%ų\!%čÜÂ&Ģ1%đš;%Ŗļį&1$%ËvĘ%ÜÚ!%ícŪ%ŨU}%ū%įĀ%%Ätá&
+˟%čFÕ&ë%éoŲ&ôB%úe[%áw%øû‚&Á%˙ä.%đ–& ą%åĪJ%Ŧwn%ãĀ%ÉÄH%ÛÜË%Ę P%ķrd%ĀsĘ%ĢäB%ĀÂ%ņ™ŗ&8Ë%éÖ&m5%ĐÍą&=”%đÃĒ%ņeâ%ę\į%âØŲ%Û`0&
f+%Ŧœ5%ļČ%ëā§%ĘC•&åÃ&Įķ&'+%ĪŲî%ß{%įé8%ŅEu&Ŗ	&
z%ˇ	!%Ō|%ât&1%öņÆ%į°i%ĪĪ¯%´Š%´m7&‚_%ŧE?%ąž8%Ä8%ģO‘%ŧ–}%čaM%đŧÕ%öĘŋ%åáˆ%úĄ
&ã–%æĐf%Į­|%ãk˛%ļ‡(%é^]&
žë%ú@V&ø%äzĪ&ĢY%Ėú%ųk˙%øTb%â8Â&qŋ%éHđ%đ’D%øā%ė&
ũ%ķzW%ĶäŊ%ņtĩ%éŪ[&
;%Ôŧ%äB?%ú4&¯î%šßj%ëŠ%ä7%ëÛŅ%ëß%ëˆ	%ōO%ņ€T%Ë
%ãÁ%Ô1Ņ%Úųļ%ī?R%æŖ'%æc2%Đ&Î%īĮ%ŽĄœ%ÉÖˇ%Éi`%Ā#$%õ>%™–%Ņú&IĒ%Ķõr&2Ą%ī(%Æ4%ÄJ%Ķ!Ą%Ō {%õĒĻ%áķ›%۟č%Í9š&Œæ%d­á%ĩļw%îā& i%IJx%­Ä%˜ĶĖ%ĮäA&Ô×&H{%ÕŠ%Í^“%ãYā%Ē8˛%Äß%ö\ë%ÚZą%ü72%ËŅ%¨ŠI%×ķÕ%֔ %Ža­%ÕÛ­%÷Še%ŪŖę%ßyœ%Ę$ö%Ō=Ķ%õ5y%Ë=å%ÚȤ&ķK%Ô;w%éWm%ēî°&Ģ2&Ē&Ļ%āŊ“%æŲ!%×1 %ŋv%Ívõ%Ô
ŋ%î2Ą%î0H%›Bķ%ÕS¯%ęw%ũô%×9Ū%ČÁ%%׈T%ėKš%§5H%§S}%Đhą%¸S5%Đ+ų%°‡h%ĘdĖ%Ō+%æXo%Öŧ™%ŋL%Õöŧ%Žūa%ĨÎĨ%Ƙ7%ĩŨ%îĪD%­ŋC%ã¸I%ø%䀮%üôĢ%ÅŲ=%šJ%ģË%ęŒ÷%×Jo%öO%Öų%Á[¯&Md%˛­b%ĸú„%áiI%Žd%žq%ļŊ%Ėü0%×ö;%Ø!$%§§ŋ&ųÃ%˙Sü%â"ų%ĻŖ&Fą%ÕŖĢ%ŋS…&đ&Ë&&ö%ŋ,%žpŲ%Ūŗ%°­0&38%æ}Ū%ô4%â™j%Āøh%ę?į%Ū‡r%ū&%ßlT%ëų˙%ØRĒ%ëé&
Iī%ä:Đ%ĐxĪ%ĒŸy%ņ™Ë%Đŧ%ûâ,%Át%ą•!%Á˜Ū%ׂa%×r%Á‘Ę%ČÖ%¨Í‹%ÎĮŽ%š
%ÎŨß%ų÷Æ%ŸËš%î­×%ī°$%ÁÁû%ę(N%ˆG%áĪ3%žĖž%ļž	%Ōj%û¨%”>œ%×áĘ%äĸ{%ŌÂ%ĖIŖ%ß M%ß=˜%õ:,%С5%ô›ą&ô%îļÖ%áü%Η%Į‡ŋ%āVˆ%Ēeâ%ë+u%ß6&%Ė‹‚%Ō\%ŌŨV%đq_%ÔĢŨ%Ģâ%čÃ=%âõ%ĪĻš%Õ%ņ%%Ūēj&
‡<%âyē%ʄļ%Ë"%ŅÕf%Ōd%äQĨ%å(Ē%Įã%Į¨ô%æ|%Ē›U%Ģ Ę%ĪŽ‡%ģ—ķ%Ģ|Ú%Ōū¸%ũ›]%¨[%žƒ'%¸Ķ§%Ķĸ%û8‰%¸Ux%˙‘%%ętĀ%ÍŠ%Ķ–r%äōj%ôß*%žĀß%ųÜ­%Ëŧ%%Å‚%˖:%ī%™ß,%ĒũŲ%Îü)%ÁÛy%íF×%íŗ|%´“e%×íœ%ŅŽA%ŧë%ŖĪ<&˙#%Ū“H%ÄŌė%čāĐ%ÅL™%Øũä%ęŠđ%Ėī%ŊąÚ%ĐM%ĩī•%Ä)Ē%Äļ5%Äû!%Ë[% ž%Ŋ˙=&Éų%âCW%įhN%á	Ę%Œå%āZË%ģĀE%Áō§%ÍĶ‚%ãÅ+%š‘%ƒo%šøĨ%ŦŪh%ēũ%Ŧ3ą%ŋ!^%ÛÄË%á|%¸œM%ŅoQ%Ë*4%á>ū%Ę7;%āuu%Éx%Ŋ)W%ÎŅŠ%É[á&Šp%ˇĪF%ö?%áTJ%ĘU3%ęŊĄ%Éũ˛%Õm%ÛŲä%įWũ%ã.Š&ž%šeÔ%Ņ:
%ĘiÃ%Õ$H%ļ|ų%靇%ÎUĄ%ĩë%Ū¸u%ß&%ČķÆ%ôÍ%ßÆ\%Ŋ”ž%ô­%ô)G%ŲnĶ%Ų™Z%ÔxS%ԟ–%ž%íÖņ%čĖ%÷Åf%¨uŨ%ŧšÕ%ßSž%ÎâĄ%ķw‡%ãõ%ã5[%öė
%ãZŠ%Ų˙€%ڈÔ%ũŅ%ÂW‘%Ũs1%ģī%Ōī5%Ųgž%Ū‡q%č%‚%ŗš%ę,%éQ%ŪĄ%Ôm%Ŋģį%Ú)%ķwŖ%ĨÅV%Ѓ\%՘Ä%Ģœ*%Âįķ%Įē%Í.ˆ%ČŲ%é,0%éü%ÅŦ¯%Ņu%į3Ģ%×UZ%ū5%Ŧ°b%ôŖ%Ā#%ĀĄi%ēęĨ%ĖGv%īĮĘ%ÄŧÕ%¤”%č{•%Ųf%ß
‰%Ô˙%ŋS%Õá%ÛG”%ńŒ%´„%Á;%ĮRb%ĖŒ^%ĀČ%ú"%똛%Ÿ5	%Ø˜%ŅSķ%Æķœ%Ũԅ%Ūf]%Čå%ŧ´%ãp&%Ōu%ĐĘ%Ų2m%ęI¯%ãĖ%­Û>%ÕÃÚ%Ö\”%ßģÆ%ņyā%ŗ…k%Ę?˙%ÄĖ%ëôl%ÃÃŲ%Î%ŪŊ%ÔŊŽ%čŗ%Ī5[%âŌ%øĢ%ÄN]%ß;ž%ƔŅ%›žŽ%ƗA%Ā‡¤&Ņ‡%Å`Ũ%ŋ­°%´\Î%ÖM–%üu%éđ\%ņÂã&
+Ŧx&Ú%íâ‡%ļķ~%Öĩ%Ōē¯%˜Įy%ø@%ÃO€%ÃaÉ%Č´{%æ•,%ÎEą%¸ˇí%üšŸ%Ø	‘%×s­%ÛÛ%ŧÜ/%Į&%ßĪh%čT%ų#á%°1Í%ãh¸%ŠŲĻ%Ų%%ĘcÆ%æ§Ų%ØÅÍ%ÜįŦ%Îqk%áÄC%Ųwã%ņí%õŋë%ä/%Ņ%õsE%ÁbA%Æp%ŲX_%ĞU%öž&%ÜIŅ%ÉXÄ%á`Ī%ÅB%ĩm%÷4ƒ%Š‚%ŲĻõ%íą`%Ņ™Á%át/%ņ	¤%Î0ũ%å/P%ųbM%ÆĀ%ĢG’%ÕĢj%ęã§%ÍHÚ&&
ÂĶ&J’%ē$%í1j%ÚĻ|%”vä%åvÛ%Ā!ú%Ú?†%Õ˙C%Ĩ
Ü%ˇÃP%¸c-%ĻV{%Ŧ0Ę%ˇ”D%ŅŒ%ÁV]%ģXë%Īíę%ë\ö%ÎĪ%ÛŌ#%Ņí.%ÂĪß%ė{%đ@%Â:B%ãŠ%ˤĨ%ŧë%ģÍ%%ęS¨%ęC$%ūx%ļhœ%ÔŅ}%ŪC%Úø%ŧ{%Æ°Ö%ˇš%ŲØė%“Åā%ãņd%șę%š)Û%äéš%Ō/%ųe%õ^Å%¸’%Úņ%Õõũ%ãĄã%Č+=%ÍÛt%åĒį%Κf%îąÎ%Éö$%ŨŊ%æ§Õ%˙Čß%ŋĢ%ĶØ<%ōŗŸ%É%%ŗ*‘%­Ø%į’Ķ%ŒĨa%˙-æ%ŨîV%ļ}ĸ%ÄîW%ŌhŽ%įžį%ČKT%Õoš%œŅR%ŪA×%đ4q%Ī%Õæ&&&%î@ˆ& Ų‘&Ũ;%į{’&5%ũwZ&Ô&‘‘%ôI&Sī&
$&&īĸ&3!Đ&NMŠ&T‹x&v~h&‘.°&…ž&•Ä?&Žā &ŲāĻ'
+žģ'/	Ÿ'<ŋD'EY',á‡'ķ.&ÚĻí&ąâą&ĀS&o U&d`„&9Ņ&4¤‰&-Ãn&)=Ô&Øŗ&9~&/Q%ė$õ%͈&×Ü&<%æž%úiJ&âA%î˛H%ōŪ
%Ņmˇ%ëN\%ūÄ%÷;˜%ãIÖ%ķĮ÷&
’&#Ö%÷ĻÅ&֒&ī&…´&2˛Ĩ&2ģY&5
+s&Lk1&p”U&“œ&ŋw´&Éî„&ŅžÛ&ŋŊH&™Ā^&~Á&NëĢ&?÷&0M›&%ų2š&	LÔ%éĐ}%åö&ƒī%õiA%Ũ7%ŨZ}%îxę&ā~&
ŧ%ĮzĀ&2%ÆH&­y%˙ô%Ķ—-&q‡%čŋ¸%ø%Ķŧ'%čĪ	%üW%­&@ī&ā*&ŅY& r&Ķß%Ü!‡%ūŲœ&
9ƒ&ēU&ƒō%÷¨Ũ%ø¯%ô]ž%ė;Ø%īØ8&
W‘%ė‚%˙ĩ&p%ä§ō%Øš%ėŸŪ&øß%øR%ûĐŨ%ôDĩ%ô=V&
ƒ.%ėmē&ō‘&xl&<ä%ā1'%÷Ķ<&ô(%ė<ö&
eų%āx&Ąx&X&Ž}%īû'%īôP%ûDæ&đ&$
ė&
=Ē&Ĩâ&
4ļ&šK&f%ūļé&*Ųf&Æ&%M
+&Fbķ&N_*&Sâ&Or5&P‰I&1Y&,Ú&ũ¯&ûË&ÍĒ&|%öī§%īO¯&čé&†(&įŠ&æL&[{&¤U&Ww&6%úcË%ë-&#%Ö¤+&>Ä&š%&ņ&	a’&>ú%îŪ%É5%ú’%âō%%ŪÕk&Ōį&&É&’%ō}Ų&p%ÖJj%ųāŌ%Íš&Ũ…&G›&uĪ&~ä%ũ^ų%ųŗ%ŅÄŦ%ę%ųŸ|%ŋnĩ%ŪfĪ&)S%ŅŖŸ%ŋZ%õÅæ%Õå\&
+›(%Ū=Ā%ų]ą%Ū1ų&É;&e‡%ÕŊ§%ŪS%Čw%â! %ŋŽ%ē<á&
î%ņ¤ē%Ņ?Z%ē(æ%ČL%áņ%éØô%åäŒ%Č6x%øŪņ%üzA%ŸŠ÷%åÅw%üeģ%Ã|G%Čƒ%ŨœÔ%á§Ŋ%íÔ`%öy%Ļ}Æ%÷]%ĢõL%ëPā%Íáˆ%ÉÔ%ÕČÁ%Ņ{’%ÄĄ%ŋŠŗ%ų­¯%Ņh2%ôâ%č͝%ė
X%ŊL%Æ'ö%Ęē%Ô+%ĮS÷%÷ņ%ķ•Ų%ä&	’%ū@Ō&Ō&|š%ęŗö%ÚĀY%Úr‹%¨Į%ß÷i%øE%šÂ>%Õ@z%šŲn%í	ę%ÜųS%ĪÄq%īP0%ßXu%ßSs%Ŗ¤‰%ÆN™%ú!„&é!%Ûŧ!&˙Ë%č„%ķx‚%ûIĀ%ķļž%Īõ%Ë{å%ˈ´%Į%Ø1Đ%īáË%įßT%öĶæ%ĶVō%ũxŠ%Îh‘%æ9%Ņķ\&q…%ŪŽq%æ;8%˙wK%ņôŽ&â6&n&Xė&ŋĪ&FC&•1&
!'%ßĀ¯%íÄ%úmV%ãˇ"%đzė%ē\Ī&Ī&=s%ÛÖp%įsZ%ėģ%æwr%øN%æy'%Í%ø€Ļ%Ú¸r%ķ-…%䨔%ÔD`%Ü '%Ë_%īph&hW%įFs%îú˛%Ķy%Ūû°%΂%Ūē%×%Øŋ%ô%A%ÜčW%ÂBo%ʀI%Āâ	%ŦčJ%í%ûŠ%Ōv1%ę†%Û%ÚÔē%ę­ŗ& æ%ß-4%ůW%˛ģW%üö%ÕĖY%á!=&~÷%Ôb%䖜%ÄXĀ%Õŧƒ%Ŧsy%Ė˜e%ŋ?|%Ņ*%Ųáø%ÉĨf%Î5ƒ%Ōr†%˛?8%Ú'‹%øÍ%ÍGĄ%ÄÁ%ĖŠ-%čĘË%ċ%˛%ģeĻ%ŲFß%ĖŅø%ÍĖ%ļ“~%āöR%Ü_%ߋŽ%Ķo%æ‡C%íēw%ŪiÆ%åÎ6%ÁŸ’%Ē°V%æš%ÎËÍ%ŌRO%Ę4!%׉e%ĢķĐ%đ\ī%É*Ā%ŪÅ%ÉC:%ŅWž%ŋĩ%ĖđŦ%éī&%äiž%åMl%ėo‘%R§%ę™&z[&í&ō&6žK&-Õŧ&Píļ&iO&ŒV&PĄ„&P›&Ä)¯&ŸņN&‹ø&5Ր%å0J&
+&@ˆč&kĀ˛&QÕ÷&cLą&DĒÂ&SÂ3&	vÛ&1õę&2há&Žę&R&Vß&

+z&
ÆĀ&öÚ&Љ%ö^+&2Ē%åŲx& Ĩo&yä&%ô\%åī&ö'%üIØ&@%ũk,&•Œ&
+†%üßã&ü(&=ņ&ˆ3&s&d&Éa&<M%õ‚
&NÎ%ŪÅŌ&Å%í+Û%ûgą&AØ&5	&)ȉ&&& &ų&WŲ_&sˇ{&WØ&Hî×&S?°&(.Z&ˇƒ&5vÛ&ID&to&(C+&Įæ&*x&;Ö	&YēÖ&hÄ'&hĸ&NĖÃ&9Įč&$ &ôú%÷Š’%íJ%äJM&
đ5%÷ZĒ%÷<&/&3&<ƒ%íl&-Ä&É~&3%Ō.&žĄ&9%ˡ&%ÜSŪ%䊞%änL%ņ:%ÛĄ&}ũ%˙ŋ%ė,i%ķÎV%ėzõ%ōY%÷@&āÎ%ë¸d&–E&	¤h&7#&Ž &™`&Í%üîš%÷`Œ&"‡&F%Č&)2û&ËŖ&&˙&!&tT&/Â&90ĸ&4¸Ž&/dC&äĄ&?æŲ&3×ō&"îž&BŊU&(K¨&6~ņ&5;&85­&ne&ãÕ&~î&„&ƒĨ&Š™&H‰&h­&&į&7’Ų&+é<&74Ú&5	&v1&"+–&‹&..Á& &2Åŋ&"P&;wW&2GJ&+;&,3-&37u&3kw&-1÷&$=Ā&-×&Boķ&2
+i&  9&7Yt&&ây&'Ē&7#O&1Āø&Gŗ	&E&u&Oî&<ž&Rë&B%Đ&Sg;&iFy&e^Ŗ&HVį&\É&S‡Ë&xš§&k&m()&eøŌ&O˙Û&€ŊB&ŠŪ&ŗ$2&ŧ,ˇ&ļ’Ü&Ē`œ&Õļ&&Ļ&ƒųô&iđ—&aŪ&ƒp‡&z0/&…œˆ&†­Č&‚\Ã&•ƒÕ&üü&—ßä&ĸIĨ&ģ^Ŧ&Į˜&É/ũ&žĻ&°c&›‰Y&ˆŧ”&ŒŒS&]ƒ&l;&„Ō|&tÕ&xa„&ƒįė&ˆaļ&ŽŨ¯&ŠđČ&ŠĶ~&a)ô&M!B&<ƒ&_AÍ&Rz–&=ų&Z›(&P‡&bdŲ&MI@&Uģõ&[&&Ueî&5e!&L{S&C^Ŋ&\ų	&Uöö&NŊ˙&cî&2Å3&<L&FĶÉ&H'{&F‡&:(—&0NĄ&'¨â&XIm&9šÖ&4°â&-ũq&4lč&7|&0ę_&5Ąœ&$Īģ&+Ž˛&(ŨŌ&$đ&&ûK&$ö&*JĒ&/ē0&'Ža&
&%Ô&&+“&u’&71&&ˇô&,G˙&)X&I&6‹&˙Š&]'&„ĸ&ĖA&ú—&¤Ų&Cî& õi&ŗ&‡&čæ&
yÍ&0J&ũ¸&-&ũž%éũ•%ēōd&n°&čß&
+#ø&û%ų$a%íü&x&Š%Ī¸F%ËĻ%Ú¨Ā&Ķˇ%ͤE&
+Gé%ũBė&¯¤%īÁ%÷Ú
%ą†Ž%¤ĩ˛%Öe"%åÔ¨&™%ëīI%Ų
Æ%Ũ܊%õa+%ŽˇÔ%ŌƤ%ŨŒî%ÜD%âüt%ę_R%ÖKs&+‘%ÚŖę%Õįl&Ų%Ö%õ}%ŲÆw%üõo%Ë|›%ížė%ņŠ…%Æ]“%Îģ$%ā@œ%ąũë%Áģ%ˇi%Â\›%ŨĶÔ%Ā=%Üu%˛:%Ķ°§%éŸė%å‡É%āxÉ%ņļÛ%Įā%ę%ÖŠ%ė?%Øģõ%ÍÁb%ŗC%¸ĖØ%Üü-%Ū›D%ãĪŽ%Āäŧ&iÚ%ŋ1%ĪUs%ÁÆ%Ģž÷%Įf%Đt%÷s%ØMp%Ōc%Ɲ>%ņÁ!%Ø[v%Ë^%ø!W%ë¯\%âD™%Ũm%ęēį%ƅK&
~%õđ&	´c%Øę4%û}%ö§ū%îø%ģČđ%ڄ&%ŅÔl%ėĘĢ%zŒü%ÖÄv%Ë­)%Ëe3%Âr%¨…2%Īãô%ˇ;%Æ:ū%Įŧ%¯%Čå%ˋS%Æ[%Á{%ĪĶc%Ô>"%ÁļŌ%›Á%Ļe=%ēĸ^%¤ÜĨ%ĒûÔ%”oí%˛Ö%ĻԔ%ģ1%Ģ‰%ģ<%§ōČ%Į!Ü%ŗēl%­Ų\%¨ZĨ%ßhë%ë¸ü%×ÖÆ%Ņ%ėH×&Î4%éúE&
Î`%ņHM%öøÚ&
Šô&|T%úŠ&+˜ą&aÂ&DĘ7&P&æ&)D&
m—%īQ1%ĩF%¸ûQ%ĘĖĪ%Ãj´%Íŧ,%Æ7Í%¤¨k%ČDh%°I“%áī%´Ļf%Ŋ™÷%ŧīi%œŠ%­q%ŅČL%§ŋŽ%Í%ÚS-%ģAZ%Ŧp%ēo8%œ[ē%ÔÆ%§d%ąT=%Õ5˛%ēÃĘ%ēč×%Āė%ŦĄ.%Ģūœ%š%Ē[†%Ļ%ģ˛+%‹mš%ĄÖ˛%âÔ%ŗ'o%ˇ÷=%¯C%Ë(Š%ĩƒ-%°éŲ%ĩļ°%š˜Ē%Â[%¸Ō°%ĨŨi%Îč†%Š“Ŧ%ĸ°% hk%ŸņÜ%É)%Õö°%ž|%ĄĮA%ĘA6%Áė%´đ%Ģ,%Á/E%ĀÜn%ČYõ%Š %žC‰%Ō(W%ÃG2%˛šb%šg7%ąĢ%ą%Ę6j%îūS%ŧ%ÁE6%°ã%žĻ%œCę%É6Ã%ģ>ŧ%˛ČÍ%ŸŸĪ%ˇcĮ%ŗ-ô%ŗŽ%ÅHG%ŧœc%Í
+&%ģđl%˛%¨7Ũ%§ÕE%š×f%ąuå%Ę…%Ŋâœ%|%å,^%¤Ķ°%Ëy%šG{%ˇé˙%ŋĒį%ĮŸ"%ÚE%ģt%ģz%›Á9%›ā%Áڐ%Ƈ%ŗC%Ģ‚%ČÔc%ĸÚ%ŗ¯&%Ņ>E%ŦH%ˇÍ*%™<%Ļˆ&%}Ą‰%Îrâ%Ŧb}%ĩ¨%›´%І;%¨‹%ŸN%›˛%ÂÕ(%Žˇ%ģí%ŽĪ*%ÍΟ%ĢģŨ%ŊÉ=%š›%´î_%šHa%šfÍ%œ¨s%ЗŅ%ÆŦ%¯ib%ĩ&Æ%Õõĸ%ĻƒĀ%ĻEŗ% Ä5%‘%˜%Šđø%¯Ÿą%ĒÉ´%ļ|ļ%—|÷%ˇa%š¸„%ō.Ã%Ŋ>—%f\%ŸX}%šŽĸ%žŠ†%¯ø%ĸõ3%§~¸%žb:%Ąē˛%](% Í|%”%ŠM;%´a¤%–ä%Ÿ9s%ĮÔ%āŽ:%Į˜%ļ†Š%Õ U%ÁĶŖ%¯ūO%¤ģÆ%Í˙´%šÕá%Ž”Ą%å
Ä%¤įY%á.%Ų *%ŧšˆ%ŽŲĮ%ËBF%ĀļP%ŒŠā%Ļ9*%ĩq%•ÍĐ%¯Õ%˟Ņ%„t%Ÿ$ē%ĢŨ%ž°%žë‘%Ļå‚%•R%¤Į
+%ŖĒČ%›îž%ē%Ąûb%Āƒ•%Ŗ%ĸņ%¸CŅ%¨­Ä%ʅV%›Ō%…Ŧl%b­H%‹>8%Ĩ„%ĢĐn%ĮĖ%¨šĘ%ŠÎ”%ĸôk%ŸQķ%žĩ%Ž„C%Ž#š%ŧÍė%ĨdÜ%ēÍ%—ķī%ĢģU%Ãy%ĸ÷%ĸ°%´Ö[%ŧø%­ Ô%ĮĐc%¨vĨ%É|ņ%ŗME%•m%Š¸õ%´“<%Š2W%œŨŨ%œ<ļ%Ŧ*d%ēq	%ļëÃ%¸V%Ļ1 %ēĒš%ĩģ%”
+Ę%¸’%ÃĄĩ%ĢūĘ%j%ĩ%Øâ%Ļļ%ŽCR%˜Pi% cã%ŋļ%ŸĢ%ĘÁ%›xÁ%z™ü%´TŪ%´)%­Č%­-%ĸū%Å Ã%¸ę‚%ģ¤”%’Ōę%Ĩęn%Ŧ‘_%Ã9J%¨Ž% U`%~‘%­%ëÁÆ%ŗ>Ŋ%˛öø%’]<%ž2–%Ē[%Õ.%˜åz%،ķ%ŊÉą%Įƒ~%´'đ%¸˜E%Ŗ ī%Ętû%ŊR%¸rÜ%Ë ˙%ĒŦ
%ļm%˛Ķ˙%Œön%ĸNđ%Đē3%ŠlĻ%¸×ŗ%¯°e%šš%ĩsv%Ĩ–…%¯%ŸTQ%ŋģ%ąÅø%Ūšf%ÅŲF%Ę"í%âLĪ%ÄZš%ą\p%ĖŸ[%Ąã´%ĮæŠ%×Ŗ‹%â%Ł•%¸s^%šHŒ% ßx%ĩ\ą%ā(J%ĄjÃ%ŖT%ŗĶ%Ŧļ	%Š“y%îČ%Ņ‡¤%¤6a%ÉX %Ŧr%™J%˜ųW%tJē%ĻΗ%­đ*%ĒɄ%šdT%š%Ē¨Ä%ÂIÕ%Ēųx%ˇ…%ļēļ%ȑ7%ļŧÖ%Ä”%—qƒ%Ģz%ą{x%¨vš%‰*T%Ģvú%ĮYË%“Ö˜%Šķ‚%žRŖ% ûf%ŗty%ļ+„%Οų%Á‘I%ÍI$%߁×%Ø?‰%ÄZz% 83%ŽuÜ%‹ €%Åōū%ŊÕĄ%Ú2Ģ%´7%Ä`%Ō7÷%Ü	Š%§8%ž
˙%Ŋú‘%Ōđ%ʀj%ĮŸ%%¸Z!%˛Š¸%Ĩ¯%ĄeÉ%Ŋûô%Ĩ!G%ąŅ%ŊWą%•ũ%ē5%ˇˆü%Ÿļt%Ž_%§į>%Éņ%Ā”%¤Šž%Ē¤ˇ%ĨĀ%˛”ö%–O=%Ģ„5%h´%  n% øû%Ŗžá%ˇ!ņ%’õ‹% 
ŗ%Ŧ0L%^F%–Ž=%ĢI%Å"ä%°%ēĖ%­ë%Š]-%ģC+%“°%œ*~%ĩOG%ĨJ%Ļ2˛%šØH%›P%ē6Ģ%¯•­%ē†:%›øē%ĢN;%š+—%œ˜%¤¯¸%¯Ŧ%ŦƂ%ž”%ąlĮ%Ĩ`W%˜p¸%Ŗ_•% ôD%ĄUŋ%’Ÿ%ŠnŒ%×%ŖĸÎ%ĻKß%œėŽ%¨E%ĨXØ%—Z)%™ŦÚ%˛ 	%Ÿ@)%ĩj%7%%Ŗ>Ž%•	U%¤>æ%ˆuØ%•=˜%‹Œ%‹ģã%š˛%ĻØü%Ä&8%āč%Ŗ’8%ēøũ%ˇģķ%ŽÍ%ŦĸŽ%ˆm>%‘ŗå%—N0%ģÃ*%Šg%˜„5%~„	%“h×%†{i%Ŗū3%šŽ%Ž*%ŸLõ%”%…Z%ĄŽB%ĸ
-%ŠLC%š5w%§
+%ŠÜ§%šÕŗ%§š–%Ž‹ %‘åC%œŒe%¯í>%°ôU%ŗRø%ŗkŧ%ąÔ%Š=á%ščy%­#ģ%—Á%Ĩ%ĸ\%š_;%¨}A%Ļđ"%ļ[%Š9%•ÔĶ%Ŗ]%mw%ĨÄĘ%Ą
+%%ŗ?R%ŠB`%ˇŒ9%˜ĩÄ%ĩ+í%V%œ
~%–VĘ%“5%Ģ,U%¯ˇĐ%Œ…ņ%ĻT%ĩe%Zc%ĻĒÂ%č%•¤%ž<%œē%—<1%‹ˇo%§o%Šę>%˛*!%ŧ\%œŠ%†å% ū‡% e¤%ŖūG%ƒi%˜’É%—īZ%—’j%Ļļé%Aq%ĨSŅ% ũú%Ēéã%‚ū%ŒÁ
%–…Č%§&%Q‚%už
%˜ĶĖ%Š^c%ąSČ%ÂMk%Ąƒ%ˆ•]%“Ģ9%…x%‡ˇĀ%ĢåÁ%Ÿv %Ąũ%ŒÆ%Œs=%˜ŗ“%‡ļ %Dá%‡Ay%œĸ%•ŪŒ%‹Ŧ
%Ŗt™%—Kk%‰ËĨ%¤WÃ%§N%ˇļŠ%“]ß%˜b
%Š%ŧZ%Ŧķe%Ŗ˛†%žę`%”!ú%[>%„Jm%Œ%%‹Z%š(%˜%†uß%™Vž%Ą&%úd%ŸĢ%‹2ŧ%‚‚í%›%Ĩ4%Ž3,%ŠØ%˜3%Ø\%“ą×%ŒUˇ%‰}‘%ĸāû%šZ
+%y%ŒŲ$%Å %j|ž%”NŨ%Žvz%Ÿēą%†•}%Ē;%¨¸.%•9%ŖH@%†ib%fÃ%4r%¨<%“fF%§ÔĪ%Ŗt-%†Ú%Į3Ø%Ž‰%‡ĐÃ%¤Ų%”,q%Œ)@%hڕ%l˛I%„?Å%œ™Æ%™1%ģFs%”š^%œ9đ%Ŗ Ō%žûš%žpn%~Ŗ%Âä‹%Ļaˆ%ŦĢ}%ĸS%¤í5%ēíŠ%œ›d%­.%ŗ(,%Ēœ%%›ˇ)%ƒø%ŠņK%›D%ĢXŪ%Ģ[–%ĻÜQ%›UÆ%Ļä%Ÿ}6%˜'5%š›]%„)ú%ŗ-	%‘7%´%•N%…Ûž%†<H%˜cX%š´…%“Ī%ž,%‚Á%Â	%ˆ(Õ%™jœ%™Ė%n5t%Ŧđ}% Éĸ%vC%Ŗa–%i-%Ąßŗ%†ęs%†~Ļ%Ī–%˜üÜ%uÕų%ĄaĢ%›(%ˆnn%•0Ę%’ŧv%ĸ.8%Ą%W%ŽåŲ%¤ę0%˛î%—ßC%™[–%šņQ%…ŲU% ´b%‘PŨ%—Í+%›žg%™h %–ë%—G×%ž}%–a %íā%¤–Š%—ÍA%—Yž%†I.%•ä#%‹ī”%ĸ§į%Œú×%œ
%Ŗ%žé%§MØ%fÍ%ŒT %‡ü;%ƒŋ% Ŧ%3Ú%Më%—_n%Ž|Ī%™đ%•2-%ē\Ŋ%}ož%žüĨ%‚ą8% F
%•%Œú%Š†"%—W:%Š<%™ķá%•AP%—	%†â%Š(J%”~ū%íL%‰'%™/đ%€9û%†‹%2%”Ё%–õ$%›œĻ%‰ęÂ%šéŌ%–yČ%ŒhV%xmī%Ž=į%’ĒL%”)å%šŽļ%‹‚ų%—JQ%Ŗņņ%Žļ%“Ī%—g%—a:%ˆ`j%šy[%†I%‡œ%]‘~%˜V'%žc˙%Ŗņr%›¤™%ŖB%’sÂ%˜“â%”n%%†Ö7%•Âĩ%›2˙%ŒFx%hq'%…ÔE%ˆĒ/%ˆÜ˜%XŽÄ%”†%“lä%ĨŖ%‡%š#Ī%•Üü%—ĩ%‘_%ĸs%ŒYq%”‹ƒ%š'G%’‚™%Ŧáh%õ%—°á%—Ž%ŠĖ•%˜Ö%ę%ŽĀ\%›uO%›øÍ%¤l%´)%uõ%ŸĖŠ%—P%žrĻ%ŒC%Žį%›´%ĀD%•ĖÛ%ŖFã%ĨGd%œ<ũ%˜z%˜ØX%¤"=%ĄõO%•Úô%Ûq%‰Ūf%œ+c%ƒ
y%Ą§%¤œŅ%¨SĘ%Ų¸%}
+6%(3%˜Cp%Ĩ –%“Đ"%žĶ%¤7ņ%‘jw%˜5x%š†ø%œc%‰kĢ%ĸ´%„F˜% =%†j%— Ä%žĩ—%…ˇ×%ŖÆH%Œ˛‚%ŦÀ%ŒC%†)…%ŠËĻ%“+9%}8%ƒ
;%“6%múķ%™-~%ƒ
Û%…#ļ%‘éĨ%­@Ŧ%Ŧ5D%Ÿe%—ôŌ%Ĩ@y%Ą€%ƒM%}p+%›Ā%‰ęæ%Œg%zÆ_%ŽmE%™ˆÍ%‹Q%ˆv%ĸĢ0%W{%”}”%ŒâD%˜ô*%“gņ%›
Ų%‡~˙%uiÆ%†{•%†”‰%Ŗ%ˆ)a%Ÿ§ī%Ļ—s%~
ē%…{Į%ŸFQ%Žģß%šú %••ĸ%•o%€yÆ%žü'%’Ø2%€ų8%’Ę%¤a%§§m%Zs%ž0[%“ėp%ž4%˜^s%’”%‡F°%×%™yŦ%††Ķ%œ•p%ŒÜŋ%›ĩĮ%–i %‡W%Ŗv6%ŦĮ0%”"¸%Ų%†pą%€›%EŪ%ˆ# %Š¤ī%œ
+”%ƒ}ˆ%ĸ¤%ŒKW%Ŧ?ū%ĢčĮ%Žˆ%ĩü€%Ēs%ž—%™hŋ%’Ž%¤2ę%‘ĢT%Še%“be%w˙Z%œ%T%ŸĀ›%ŒGÁ%•Ŗ™%—Hœ%“v6%n.%–Nx%ƒĶ%sV%Ŗ ×%Ē{…%–Üĸ%y-<%ĸg
%gw€%—ŨÔ%› ų%œŗ%”2į%˜ę %“´s%‹,%˜ē%švE%ˇõw%Ž€8%™
l%ĸŋŪ%†Ô—%ęŊ%‚Ģ%’*#%¨xÕ%ĸ ē%‡H%—01%™vÛ%–n5%§Â1%Šg„%Ēë%¨%ŖQČ%œčÃ% ą%—M—%¤’ %”¤ˆ%°;Å%”U%”]\%–šŌ%ž€”% ‹Ē%ĩOā%°#=%™ŗj%Ĩ_ü%š›ī%lŪ%y%…õI%˜ŖY%—Qž%vsl%”Ũo%ˆ[8%t˙%wĶ%‰¯2%’eÁ%ŽJŪ%áĸ%ˆ)%ĻmG%™
+‘%”ŅÆ%’žr%†-%Ÿ˜/%ģg%ƒÎ%’J%™đ”%–[I%o‡%šū%—Á7%Ą%ˆ[Ō%–|<%
+Ī%˜Ũ%˜HS%›€%“Fŗ%š
+•%x­%Ą.%Ø´%“>A%“1g%—ö{%Ą€‰%–B%}:€%šĐ¨%•ŖÁ%‹eR%‰ô÷%ŒDŸ%˜žC%‰€%Ÿ|%%‰•g%ŸîM%§Ģ%a%n%œA%ŒX˛%™‰Ŧ%=%˜Ä	%Šāv%Š&s%Ží%”tJ%‹@R%Œvu%–'%‹îį%“ž%‰‰Į% 'B%›
2%Ÿ#%™ŋæ%žø%ŽūS%ÖK%Į­Ä%ˇĪ%ÄmĖ%Įm%Į;9%¤Īî%ĒrB%Ëd#%Đw‡%՛q%ŅÎJ%ãŒļ&ö&#§P&1’&UÔ?&Eéõ&YSˆ&zšē&š§{&Æl-&õŲė'Û'kF&îū?&Åįb&˜Â&&s÷R&KH˜&-æ°&âr&
L%įv<%ķŋĢ%é-ä%ÉŠ°%ž<%ŧģF%ŗwą%Ŗ ę%ĒQ×%ģRv%¯¯ā%ž@%˛R%Ŧķ´% E`%”Ÿ%¤ō(%° Ŋ%´3I%ŖĒ˜%ĒûÆ%ŊŦ%šĩá%ģ%%Ęđ%ÄRü%ĮF%ķķ%ûÎB&V&ĨÃ&)i3&T×´&†Gđ&’&&Ā9&Q›ú&/Įä&Ė%í 9%÷o)%ĘN•%¸…%Č%Č%´TZ%´•%ÃLf%Ĩ2‹%Ļu%ĸmÕ%´ÔŸ%˛‹­%Žu§%Žļ%ŋƒY%—IÚ%Æo%Ļķ°%7v%­-Ú%¤”%¯aÄ%šSš%¯›o%Ŗ]% cÔ%ŗ:%¸ž_%ēHÚ%Äųâ%Ã
%žŸ
+%ļÃ.%ž4Ē%Ā”đ%ĩ-%ēŽ4%ĩōā%°ËĖ%š‚‹%­Ļ‚%ŌĮ%˛	^%ŦãČ%ŊV%Ē "%˜ÂB%´š”%ŋø
%ˇ>Ĩ%ˇ9%¯fã%°´q%žŖ%ŦŠŊ%Č Ę%ĩŅ}%Ã_‘%›u%ÃT%ĩŧ%ļũ>%Į÷Ē%ŠÄą%ģđ—%Ŋ&Ļ%Ŋ#%¯¤%­ēØ%ĻåQ%ÃN%ÛŽ%ģÅŪ%ĖP–%ŧö%Ô¸%Ė?%ā%ëËZ%åĖ“%ėšL&
m&Į`&Ŗ&žĶ&áZ&#í%ŪqA%Ī[ŧ%°\%ŧŖŪ%ÂĨį%¯í”%­CĻ%Čnˆ%Či3%ēŊ%Ėė}%ðL%Ā†%ŅPm%ŅJå%ˇr8%¯ēB%ÑM%Ž`%ÎøŠ%Áä%Ŋû%Č:%°č5%ŽD­%Ÿs%˛&% y—%ĩņb%Â%ŧ%Ž)[%ŗWā%šžw%Žš%§]Ë%ˇD%•ų
%Čõ˙%žcT%ē¸%ļúY%Ŧ¤Ē%¤w$%Šî„%Ąžį%ąÍ %˜Ø¸%Ģ4p%ģÅ1%¤Xí%’Ģ~%ĩƒņ%¤Kí%ēsm%ž˜ŋ%­ˇJ%¨Z%%Ŧ[ō%ÃęÄ%ŦRČ%šX%Š}´%Ĩ‚Ū%¸u%N•%¨1ŋ%ĒŪ%%œīƒ%–ūŲ%žYK%–öš%Ÿŋ‹%Ą&š%•f7%Ÿ˛›%ž?Ē%aĖ…%Ĩ@%­L7%“Åë%Ÿ˜¤%–ÉĖ%–Åą%ŸĶœ%švž%/‰%ĸ`ã%—ũą%­0%Ÿ/€%ĄÎã%Œ0%•Šc%īq%”v %T3%Ĩ%“ĢÔ%Ÿę%¨A8%É8%ĐÄ%’nĖ%ĸé­%‹UÖ%Ŧš=%ž¨%Ą8q%˛%ø%ĩB%ĻÁn%ĸ—Ž%—üņ% NĄ%“$%Ŗ
%Ą+ß%”āš%W[%ĻŽ%%Ŗ%šĖr%—oh%Ÿ˛Š%íŨ%œž%Šˆ%…˛Ö%§Ęū%ŗB%­2%ˇË%ĩĖ%˛Ū%€Í%ĨŦę%—’Ī%žÁŒ%“%Ž_Ø%Ž6%ąe'%Ŗõb%˛W%›Mb% Ũ^%œ;¯%˛Tr%ž‚^%ŧ‡%¤?%¨#%˛/%Žī%ĀmL%ŲÎĐ%Î÷h%É^?%Áœ[%ĮK)%˛ÅŽ%¨Øä%Ŗb'%ēŪ‹%¯ú’%§įø%ĨŅ:%Ž%Á;ķ%¤VĒ%Š˙r%œ•+%­ZÆ%¯bŦ%ĢTû%Ģ’&%ŗĒÂ%ŠÕŧ%œøz%žßŗ%™f%q˜%Œ¤ķ%ŸČ(%§ŽX%Ē6Ã%˜Që%Ÿ^č%”ü¤%‹%‹šG%šö§%ŠäY%¤šW%§`c%€íI%ŧę%ŠÂ%‚ō%ĸFr%Ē_ī%Ą¨ %Ÿ
%Ŗ>˛%\%¤™^%§1 %™†B%ˆ’%…8%Š]t%”>
%Ÿ0Û%ĄvŽ%†÷ã%’ô%’ƒ¯%ŦÔ/%„C‘%•‡%‘ä%ęo%Œ¤†%æ%Ą¨ˆ%Žģ{%ŒęĨ%šB.%Ļo%‘'œ%Ņ€%“%% “ģ%œÉų%E%’ŠR%Ųę%Œ;%ŠÍ
%Œ}H%˜Ŧ%“>1%Ė %Ąî%Ÿú%š×|%’ą%‘í8%“fž%tę#%˜AĀ%—ö§%]ĩ%–=ņ%•Žø%……%Ģ>ŧ%ŦōŨ%ĸŽ*%ÚM%•€%’k;%•_ß%¸đņ%ĨĩO%ĸ$+%š#$%R§%ĸg%ĸ@o%ˇ¯%ū?”&Ë&?4&”’&‚&4ŗ*&y#&$ë5XTENSION= 'TABLE   '           / Table extension                                BITPIX  =                    8 / Printable ASCII characters                     NAXIS   =                    2 / Simple 2-D matrix                              NAXIS1  =                  336 / Number of characters per row                   NAXIS2  =                    2 / GCOUNT of original file                        PCOUNT  =                    0 / No random parameter                            GCOUNT  =                    1 / Only one group                                 TFIELDS =                   19 / PCOUNT of original file                        EXTNAME = 'y19g0309t.c2h.tab'  / GEIS header file name with .tab                TTYPE1  = 'CRVAL1  '           /                                                CRVAL1  = 'pixel number'       /                                                TFORM1  = 'D25.16  '           /                                                TBCOL1  =                    1 /                                                TTYPE2  = 'CRPIX1  '           /                                                CRPIX1  = 'pixel number of reference pixel' /                                   TFORM2  = 'E15.7   '           /                                                TBCOL2  =                   29 /                                                TTYPE3  = 'CD1_1   '           /                                                CD1_1   = 'pixel increment'    /                                                TFORM3  = 'E15.7   '           /                                                TBCOL3  =                   45 /                                                TTYPE4  = 'DATAMIN '           /                                                DATAMIN = 'the minimum value of the data' /                                     TFORM4  = 'E15.7   '           /                                                TBCOL4  =                   61 /                                                TTYPE5  = 'DATAMAX '           /                                                DATAMAX = 'the maximum value of the data' /                                     TFORM5  = 'E15.7   '           /                                                TBCOL5  =                   77 /                                                TTYPE6  = 'RA_APER '           /                                                RA_APER = 'right ascension of aperture (deg)' /                                 TFORM6  = 'D25.16  '           /                                                TBCOL6  =                   93 /                                                TTYPE7  = 'DEC_APER'           /                                                DEC_APER= 'declination of aperture (deg)' /                                     TFORM7  = 'D25.16  '           /                                                TBCOL7  =                  121 /                                                TTYPE8  = 'FILLCNT '           /                                                FILLCNT = 'number of segments containing fill' /                                TFORM8  = 'I11     '           /                                                TBCOL8  =                  149 /                                                TTYPE9  = 'ERRCNT  '           /                                                ERRCNT  = 'the error count of the data' /                                       TFORM9  = 'I11     '           /                                                TBCOL9  =                  161 /                                                TTYPE10 = 'FPKTTIME'           /                                                FPKTTIME= 'the time of the first packet' /                                      TFORM10 = 'D25.16  '           /                                                TBCOL10 =                  173 /                                                TTYPE11 = 'LPKTTIME'           /                                                LPKTTIME= 'the time of the last packet' /                                       TFORM11 = 'D25.16  '           /                                                TBCOL11 =                  201 /                                                TTYPE12 = 'CTYPE1  '           /                                                CTYPE1  = 'the first coordinate type' /                                         TFORM12 = 'A8      '           /                                                TBCOL12 =                  229 /                                                TTYPE13 = 'APER_POS'           /                                                APER_POS= 'aperture used'      /                                                TFORM13 = 'A8      '           /                                                TBCOL13 =                  241 /                                                TTYPE14 = 'PASS_DIR'           /                                                PASS_DIR= 'polarization pass direction' /                                       TFORM14 = 'I11     '           /                                                TBCOL14 =                  253 /                                                TTYPE15 = 'YPOS    '           /                                                YPOS    = 'y-position on photocathode' /                                        TFORM15 = 'E15.7   '           /                                                TBCOL15 =                  265 /                                                TTYPE16 = 'YTYPE   '           /                                                YTYPE   = 'observation type: OBJ, SKY, BCK' /                                   TFORM16 = 'A4      '           /                                                TBCOL16 =                  281 /                                                TTYPE17 = 'EXPOSURE'           /                                                EXPOSURE= 'exposure time per pixel (seconds)' /                                 TFORM17 = 'E15.7   '           /                                                TBCOL17 =                  289 /                                                TTYPE18 = 'X_OFFSET'           /                                                X_OFFSET= 'x_offset for GIMP correction (diodes)' /                             TFORM18 = 'E15.7   '           /                                                TBCOL18 =                  305 /                                                TTYPE19 = 'Y_OFFSET'           /                                                Y_OFFSET= 'y_offset for GIMP correction (defl.units)' /                         TFORM19 = 'E15.7   '           /                                                TBCOL19 =                  321 /                                                END                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                1.0000000000000000E+00     1.0000000E+00   1.0000000E+00   0.0000000E+00   2.7387550E-15    1.8263573015259999E+02      3.9405888372579994E+01             0           0    4.9099133531036357E+04      4.9099133541163668E+04   PIXEL       SINGLE                0  -1.5160000E+03 OBJ       3.1249689E+01   0.0000000E+00   0.0000000E+00    1.0000000000000000E+00     1.0000000E+00   1.0000000E+00   0.0000000E+00   1.9348280E-15    1.8263573015259999E+02      3.9405888372579994E+01             0           0    4.9099135042899798E+04      4.9099135053027116E+04   PIXEL       SINGLE                0  -1.5160000E+03 OBJ       6.2499371E+01   0.0000000E+00   0.0000000E+00                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
\ No newline at end of file
diff --git a/src/test/resources/fits/FOSy19g0309t_c2f.fits.gz b/src/test/resources/fits/FOSy19g0309t_c2f.fits.gz
new file mode 100644
index 00000000000..15ee3d5d323
Binary files /dev/null and b/src/test/resources/fits/FOSy19g0309t_c2f.fits.gz differ
diff --git a/src/test/resources/hdf/hdf4/hdf4test b/src/test/resources/hdf/hdf4/hdf4test
new file mode 100644
index 00000000000..4674fdde194
Binary files /dev/null and b/src/test/resources/hdf/hdf4/hdf4test differ
diff --git a/src/test/resources/hdf/hdf5/vlen_string_dset b/src/test/resources/hdf/hdf5/vlen_string_dset
new file mode 100644
index 00000000000..dd20547f8e9
Binary files /dev/null and b/src/test/resources/hdf/hdf5/vlen_string_dset differ
diff --git a/src/test/resources/hiddenShapefiles.zip b/src/test/resources/hiddenShapefiles.zip
new file mode 100644
index 00000000000..c733a2083ae
Binary files /dev/null and b/src/test/resources/hiddenShapefiles.zip differ
diff --git a/src/test/resources/html/dct_codebook.html b/src/test/resources/html/dct_codebook.html
index 525e5eef49d..1ef5b853536 100644
--- a/src/test/resources/html/dct_codebook.html
+++ b/src/test/resources/html/dct_codebook.html
@@ -155,7 +155,7 @@
 				</style>
 </head>
 <body lang="en-US" bgcolor="#ffffff">
-<h1>dct html&nbsp;(ICPSR doi:10.5072/FK2/SOLYMR)</h1>
+<h1>dct html&nbsp;(doi:10.5072/FK2/SOLYMR)</h1>
 <table cellspacing="0" cellpadding="5" border="0">
 <tr>
 <td valign="top">
diff --git a/src/test/resources/images/bad.tiff b/src/test/resources/images/bad.tiff
new file mode 100644
index 00000000000..c8b403f1728
Binary files /dev/null and b/src/test/resources/images/bad.tiff differ
diff --git a/src/test/resources/images/good.tiff b/src/test/resources/images/good.tiff
new file mode 100644
index 00000000000..417e39558f5
Binary files /dev/null and b/src/test/resources/images/good.tiff differ
diff --git a/src/test/resources/json/complete-dataset-with-files.json b/src/test/resources/json/complete-dataset-with-files.json
index 2476c8e3356..4fd4e243aba 100644
--- a/src/test/resources/json/complete-dataset-with-files.json
+++ b/src/test/resources/json/complete-dataset-with-files.json
@@ -1,5 +1,9 @@
 {
     "datasetVersion": {
+      "license": {
+        "name": "CC0 1.0",
+        "uri": "http://creativecommons.org/publicdomain/zero/1.0"
+      },
       "metadataBlocks": {
         "citation": {
           "displayName": "Citation Metadata",
diff --git a/src/test/resources/json/cvoc-agroportal.json b/src/test/resources/json/cvoc-agroportal.json
new file mode 100644
index 00000000000..03c9e2f4d07
--- /dev/null
+++ b/src/test/resources/json/cvoc-agroportal.json
@@ -0,0 +1,76 @@
+[
+    {
+        "field-name": "keyword",
+        "term-uri-field": "keywordTermURL",
+        "cvoc-url": "https://data.agroportal.lirmm.fr/",
+        "js-url": "https://domain.tld/assets/cvoc/ontoportal.js",
+        "headers": {
+            "Authorization": "apikey token=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
+        },
+        "protocol": "ontoportal",
+        "retrieval-uri": "https://data.agroportal.lirmm.fr/ontologies/{keywordVocabulary}/classes/{encodeUrl:keywordTermURL}?language=en,fr",
+        "term-parent-uri": "",
+        "allow-free-text": true,
+        "languages": "en, fr",
+        "vocabs": {
+            "AGROVOC": {
+                "vocabularyUri": "https://data.agroportal.lirmm.fr/ontologies/AGROVOC",
+                "uriSpace": "http"
+            },
+            "ONTOBIOTOPE": {
+                "vocabularyUri": "https://data.agroportal.lirmm.fr/ontologies/ONTOBIOTOPE",
+                "uriSpace": "http"
+            },
+            "CROPUSAGE": {
+                "vocabularyUri": "https://data.agroportal.lirmm.fr/ontologies/CROPUSAGE",
+                "uriSpace": "http"
+            }
+        },
+        "managed-fields": {
+            "vocabularyName": "keywordVocabulary",
+            "termName": "keywordValue",
+            "vocabularyUri": "keywordVocabularyURI"
+        },
+        "retrieval-filtering": {
+            "@context": {
+                "termName": "https://schema.org/name",
+                "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+                "vocabularyUri": "https://dataverse.org/schema/vocabularyUri",
+                "lang": "@language",
+                "value": "@value"
+            },
+            "@id": {
+                "pattern": "{0}",
+                "params": [
+                    "@id"
+                ]
+            },
+            "termName": {
+                "pattern": "{0}",
+                "params": [
+                    "/prefLabel"
+                ],
+                "indexIn": "keywordValue"
+            },
+            "vocabularyName": {
+                "pattern": "{0}",
+                "params": [
+                    "/links/ontology"
+                ]
+            },
+            "vocabularyUri": {
+                "pattern": "{0}",
+                "params": [
+                    "/links/ontology"
+                ]
+            },
+            "synonyms": {
+                "pattern": "{0}",
+                "params": [
+                    "/synonym"
+                ],
+                "indexIn": "keywordValue"
+            }
+        }
+    }
+]
diff --git a/src/test/resources/json/cvoc-dans-config/AATClassification.json b/src/test/resources/json/cvoc-dans-config/AATClassification.json
new file mode 100644
index 00000000000..f03e24c379d
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/AATClassification.json
@@ -0,0 +1,51 @@
+{
+    "field-name": "dansAATClassification",
+    "term-uri-field": "dansAATClassification",
+    "cvoc-url": "https://dev.vocabs.datastations.nl/",
+    "js-url": "https://github.com/gdcc/dataverse-external-vocab-support/blob/main/scripts/skosmos.js",
+    "protocol": "skosmos",
+    "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+    "term-parent-uri": "",
+    "languages": "en, nl",
+    "allow-free-text": false,
+    "vocabs": {
+      "AATC": {
+        "vocabularyUri": "http://vocab.getty.edu/aat/",
+        "uriSpace": "http://vocab.getty.edu/aat/"
+      }
+    },
+    "managed-fields": {},
+    "retrieval-filtering": {
+      "@context": {
+        "termName": "https://schema.org/name",
+        "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+        "vocabularyUri": "https://dataverse.org/schema/vocabularyUri",
+        "lang": "@language",
+        "value": "@value"
+      },
+      "@id": {
+        "pattern": "{0}",
+        "params": [
+          "@id"
+        ]
+      },
+      "termName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/uri=@id/prefLabel"
+        ]
+      },
+      "vocabularyName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/type=skos:ConceptScheme/label"
+        ]
+      },
+      "vocabularyUri": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/type=skos:ConceptScheme/uri"
+        ]
+      }
+    }
+  }
diff --git a/src/test/resources/json/cvoc-dans-config/abrArtifact.json b/src/test/resources/json/cvoc-dans-config/abrArtifact.json
new file mode 100644
index 00000000000..e097d84b9ab
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/abrArtifact.json
@@ -0,0 +1,48 @@
+{
+    "field-name": "dansAbrArtifact",
+    "term-uri-field": "dansAbrArtifact",
+    "cvoc-url": "https://dev.vocabs.datastations.nl/",
+    "js-url": "/custom/skosmos.js",
+    "protocol": "skosmos",
+    "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+    "term-parent-uri": "https://data.cultureelerfgoed.nl/term/id/abr/22cbb070-6542-48f0-8afe-7d98d398cc0b",
+    "languages": "nl",
+    "allow-free-text": false,
+    "vocabs": {
+      "ABR": {
+        "vocabularyUri": "https://data.cultureelerfgoed.nl/term/id/abr/b6df7840-67bf-48bd-aa56-7ee39435d2ed",
+        "uriSpace": "https://data.cultureelerfgoed.nl/term/id/abr/"
+      }
+    },
+    "managed-fields": {},
+    "retrieval-filtering": {
+      "@context": {
+        "termName": "https://schema.org/name",
+        "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+        "vocabularyUri": "https://dataverse.org/schema/vocabularyUri",
+        "lang": "@language",
+        "value": "@value"
+      },
+      "@id": {
+        "pattern": "{0}",
+        "params": [
+          "@id"
+        ]
+      },
+      "termName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/uri=@id/prefLabel"
+        ]
+      },
+      "vocabularyName": {
+        "pattern": "ABR artifact",
+        "params": []
+      },
+      "vocabularyUri": {
+        "pattern": "https://data.cultureelerfgoed.nl/term/id/abr/22cbb070-6542-48f0-8afe-7d98d398cc0b",
+        "params": []
+      }
+    }
+  }
+
diff --git a/src/test/resources/json/cvoc-dans-config/abrComplex.json b/src/test/resources/json/cvoc-dans-config/abrComplex.json
new file mode 100644
index 00000000000..f0b492ea271
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/abrComplex.json
@@ -0,0 +1,47 @@
+{
+    "field-name": "dansAbrComplex",
+    "term-uri-field": "dansAbrComplex",
+    "cvoc-url": "https://dev.vocabs.datastations.nl/",
+    "js-url": "/custom/skosmos.js",
+    "protocol": "skosmos",
+    "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+    "term-parent-uri": "https://data.cultureelerfgoed.nl/term/id/abr/e9546020-4b28-4819-b0c2-29e7c864c5c0",
+    "languages": "nl",
+    "allow-free-text": false,
+    "vocabs": {
+      "ABR": {
+        "vocabularyUri": "https://data.cultureelerfgoed.nl/term/id/abr/b6df7840-67bf-48bd-aa56-7ee39435d2ed",
+        "uriSpace": "https://data.cultureelerfgoed.nl/term/id/abr/"
+      }
+    },
+    "managed-fields": {},
+    "retrieval-filtering": {
+      "@context": {
+        "termName": "https://schema.org/name",
+        "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+        "vocabularyUri": "https://dataverse.org/schema/vocabularyUri",
+        "lang": "@language",
+        "value": "@value"
+      },
+      "@id": {
+        "pattern": "{0}",
+        "params": [
+          "@id"
+        ]
+      },
+      "termName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/uri=@id/prefLabel"
+        ]
+      },
+      "vocabularyName": {
+        "pattern": "ABR complextypen",
+        "params": []
+      },
+      "vocabularyUri": {
+        "pattern": "https://data.cultureelerfgoed.nl/term/id/abr/e9546020-4b28-4819-b0c2-29e7c864c5c0",
+        "params": []
+      }
+    }
+  }
diff --git a/src/test/resources/json/cvoc-dans-config/abrPeriod.json b/src/test/resources/json/cvoc-dans-config/abrPeriod.json
new file mode 100644
index 00000000000..e1e6056e04a
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/abrPeriod.json
@@ -0,0 +1,48 @@
+{
+    "field-name": "dansAbrPeriod",
+    "term-uri-field": "dansAbrPeriod",
+    "cvoc-url": "https://dev.vocabs.datastations.nl/",
+    "js-url": "https://github.com/gdcc/dataverse-external-vocab-support/blob/main/scripts/skosmos.js",
+    "protocol": "skosmos",
+    "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+    "term-parent-uri": "https://data.cultureelerfgoed.nl/term/id/abr/9b688754-1315-484b-9c89-8817e87c1e84",
+    "languages": "nl",
+    "allow-free-text": false,
+    "vocabs": {
+      "ABR": {
+        "vocabularyUri": "https://data.cultureelerfgoed.nl/term/id/abr/b6df7840-67bf-48bd-aa56-7ee39435d2ed",
+        "uriSpace": "https://data.cultureelerfgoed.nl/term/id/abr/"
+      }
+    },
+    "managed-fields": {},
+    "retrieval-filtering": {
+      "@context": {
+        "termName": "https://schema.org/name",
+        "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+        "vocabularyUri": "https://dataverse.org/schema/vocabularyUri",
+        "lang": "@language",
+        "value": "@value"
+      },
+      "@id": {
+        "pattern": "{0}",
+        "params": [
+          "@id"
+        ]
+      },
+      "termName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/uri=@id/prefLabel"
+        ]
+      },
+      "vocabularyName": {
+        "pattern": "ABR perioden",
+        "params": []
+      },
+      "vocabularyUri": {
+        "pattern": "https://data.cultureelerfgoed.nl/term/id/abr/9b688754-1315-484b-9c89-8817e87c1e84",
+        "params": []
+      }
+    }
+  }
+
diff --git a/src/test/resources/json/cvoc-dans-config/abrRapportType.json b/src/test/resources/json/cvoc-dans-config/abrRapportType.json
new file mode 100644
index 00000000000..2c278710d58
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/abrRapportType.json
@@ -0,0 +1,47 @@
+{
+    "field-name": "dansAbrRapportType",
+    "term-uri-field": "dansAbrRapportType",
+    "cvoc-url": "https://dev.vocabs.datastations.nl/",
+    "js-url": "/custom/skosmos.js",
+    "protocol": "skosmos",
+    "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+    "term-parent-uri": "https://data.cultureelerfgoed.nl/term/id/abr/7a99aaba-c1e7-49a4-9dd8-d295dbcc870e",
+    "languages": "nl",
+    "allow-free-text": false,
+    "vocabs": {
+      "ABR": {
+        "vocabularyUri": "https://data.cultureelerfgoed.nl/term/id/abr/b6df7840-67bf-48bd-aa56-7ee39435d2ed",
+        "uriSpace": "https://data.cultureelerfgoed.nl/term/id/abr/"
+      }
+    },
+    "managed-fields": {},
+    "retrieval-filtering": {
+      "@context": {
+        "termName": "https://schema.org/name",
+        "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+        "vocabularyUri": "https://dataverse.org/schema/vocabularyUri",
+        "lang": "@language",
+        "value": "@value"
+      },
+      "@id": {
+        "pattern": "{0}",
+        "params": [
+          "@id"
+        ]
+      },
+      "termName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/uri=@id/prefLabel"
+        ]
+      },
+      "vocabularyName": {
+        "pattern": "ABR rapporten",
+        "params": []
+      },
+      "vocabularyUri": {
+        "pattern": "https://data.cultureelerfgoed.nl/term/id/abr/7a99aaba-c1e7-49a4-9dd8-d295dbcc870e",
+        "params": []
+      }
+    }
+  }
diff --git a/src/test/resources/json/cvoc-dans-config/abrVerwervingswijze.json b/src/test/resources/json/cvoc-dans-config/abrVerwervingswijze.json
new file mode 100644
index 00000000000..47ac732b04c
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/abrVerwervingswijze.json
@@ -0,0 +1,47 @@
+{
+    "field-name": "dansAbrVerwervingswijze",
+    "term-uri-field": "dansAbrVerwervingswijze",
+    "cvoc-url": "https://dev.vocabs.datastations.nl/",
+    "js-url": "/custom/skosmos.js",
+    "protocol": "skosmos",
+    "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+    "term-parent-uri": "https://data.cultureelerfgoed.nl/term/id/abr/554ca1ec-3ed8-42d3-ae4b-47bcb848b238",
+    "languages": "nl",
+    "allow-free-text": false,
+    "vocabs": {
+      "ABR": {
+        "vocabularyUri": "https://data.cultureelerfgoed.nl/term/id/abr/b6df7840-67bf-48bd-aa56-7ee39435d2ed",
+        "uriSpace": "https://data.cultureelerfgoed.nl/term/id/abr/"
+      }
+    },
+    "managed-fields": {},
+    "retrieval-filtering": {
+      "@context": {
+        "termName": "https://schema.org/name",
+        "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+        "vocabularyUri": "https://dataverse.org/schema/vocabularyUri",
+        "lang": "@language",
+        "value": "@value"
+      },
+      "@id": {
+        "pattern": "{0}",
+        "params": [
+          "@id"
+        ]
+      },
+      "termName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/uri=@id/prefLabel"
+        ]
+      },
+      "vocabularyName": {
+        "pattern": "ABR verwervingswijzen",
+        "params": []
+      },
+      "vocabularyUri": {
+        "pattern": "https://data.cultureelerfgoed.nl/term/id/abr/554ca1ec-3ed8-42d3-ae4b-47bcb848b238",
+        "params": []
+      }
+    }
+  }
diff --git a/src/test/resources/json/cvoc-dans-config/audience.json b/src/test/resources/json/cvoc-dans-config/audience.json
new file mode 100644
index 00000000000..64ea6a2525b
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/audience.json
@@ -0,0 +1,51 @@
+{
+    "field-name": "dansAudience",
+    "term-uri-field": "dansAudience",
+    "cvoc-url": "https://dev.vocabs.datastations.nl/",
+    "js-url": "https://github.com/gdcc/dataverse-external-vocab-support/blob/main/scripts/skosmos.js",
+    "protocol": "skosmos",
+    "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+    "term-parent-uri": "",
+    "languages": "en, nl",
+    "allow-free-text": false,
+    "vocabs": {
+      "NARCIS": {
+        "vocabularyUri": "https://www.narcis.nl/classification/",
+        "uriSpace": "https://www.narcis.nl/classification/"
+      }
+    },
+    "managed-fields": {},
+    "retrieval-filtering": {
+      "@context": {
+        "termName": "https://schema.org/name",
+        "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+        "vocabularyUri": "https://dataverse.org/schema/vocabularyUri",
+        "lang": "@language",
+        "value": "@value"
+      },
+      "@id": {
+        "pattern": "{0}",
+        "params": [
+          "@id"
+        ]
+      },
+      "termName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/uri=@id/prefLabel"
+        ]
+      },
+      "vocabularyName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/type=skos:ConceptScheme/label"
+        ]
+      },
+      "vocabularyUri": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/type=skos:ConceptScheme/uri"
+        ]
+      }
+    }
+  }
diff --git a/src/test/resources/json/cvoc-dans-config/cessdaClassification.json b/src/test/resources/json/cvoc-dans-config/cessdaClassification.json
new file mode 100644
index 00000000000..305f2759199
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/cessdaClassification.json
@@ -0,0 +1,47 @@
+{
+  "allow-free-text": false,
+  "cvoc-url": "https://dev.vocabs.datastations.nl/",
+  "field-name": "dansCessdaClassification",
+  "js-url": "/custom/skosmos.js",
+  "languages": "en",
+  "managed-fields": {},
+  "protocol": "skosmos",
+  "retrieval-filtering": {
+    "@context": {
+      "lang": "@language",
+      "termName": "https://schema.org/name",
+      "value": "@value",
+      "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+      "vocabularyUri": "https://dataverse.org/schema/vocabularyUri"
+    },
+    "@id": {
+      "params": [
+        "@id"
+      ],
+      "pattern": "{0}"
+    },
+    "termName": {
+      "params": [
+        "/graph/uri=@id/prefLabel"
+      ],
+      "pattern": "{0}"
+    },
+    "vocabularyName": {
+      "params": [],
+      "pattern": "CESSDA Topis classification 4.2"
+    },
+    "vocabularyUri": {
+      "params": [],
+      "pattern": "https://vocabularies.cessda.eu/vocabulary/TopicClassification?v=4.2"
+    }
+  },
+  "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+  "term-parent-uri": "",
+  "term-uri-field": "dansCessdaClassification",
+  "vocabs": {
+    "TopicClassification_4_2": {
+      "uriSpace": "https://vocabularies.cessda.eu/vocabulary/TopicClassification?v=4.2",
+      "vocabularyUri": "https://vocabularies.cessda.eu/vocabulary/TopicClassification?v=4.2"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-config/collection.json b/src/test/resources/json/cvoc-dans-config/collection.json
new file mode 100644
index 00000000000..d1059bf0a10
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/collection.json
@@ -0,0 +1,51 @@
+{
+    "field-name": "dansCollection",
+    "term-uri-field": "dansCollection",
+    "cvoc-url": "https://dev.vocabs.datastations.nl/",
+    "js-url": "/custom/skosmos.js",
+    "protocol": "skosmos",
+    "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+    "term-parent-uri": "https://vocabularies.dans.knaw.nl/collections/archaeology",
+    "languages": "nl",
+    "allow-free-text": false,
+    "vocabs": {
+      "DansCollections": {
+        "vocabularyUri": "https://vocabularies.dans.knaw.nl/collections",
+        "uriSpace": "https://vocabularies.dans.knaw.nl/collections"
+      }
+    },
+    "managed-fields": {},
+    "retrieval-filtering": {
+      "@context": {
+        "termName": "https://schema.org/name",
+        "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+        "vocabularyUri": "https://dataverse.org/schema/vocabularyUri",
+        "lang": "@language",
+        "value": "@value"
+      },
+      "@id": {
+        "pattern": "{0}",
+        "params": [
+          "@id"
+        ]
+      },
+      "termName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/uri=@id/prefLabel"
+        ]
+      },
+      "vocabularyName": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/type=skos:ConceptScheme/prefLabel"
+        ]
+      },
+      "vocabularyUri": {
+        "pattern": "{0}",
+        "params": [
+          "/graph/type=skos:ConceptScheme/uri"
+        ]
+      }
+    }
+  }
diff --git a/src/test/resources/json/cvoc-dans-config/collectionMode.json b/src/test/resources/json/cvoc-dans-config/collectionMode.json
new file mode 100644
index 00000000000..2bf5ec47784
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/collectionMode.json
@@ -0,0 +1,49 @@
+{
+  "allow-free-text": false,
+  "cvoc-url": "https://dev.vocabs.datastations.nl/",
+  "field-name": "dansCollectionMode",
+  "js-url": "/custom/skosmos.js",
+  "languages": "en",
+  "managed-fields": {},
+  "protocol": "skosmos",
+  "retrieval-filtering": {
+    "@context": {
+      "lang": "@language",
+      "termName": "https://schema.org/name",
+      "value": "@value",
+      "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+      "vocabularyUri": "https://dataverse.org/schema/vocabularyUri"
+    },
+    "@id": {
+      "params": [
+        "@id"
+      ],
+      "pattern": "{0}"
+    },
+    "termName": {
+      "params": [
+        "/graph/uri=@id/prefLabel"
+      ],
+      "pattern": "{0}"
+    },
+    "vocabularyName": {
+      "pattern": "DDI Alliance Controlled Vocabulary for Analysis Unit 2.1",
+      "params": []
+    },
+    "vocabularyUri": {
+      "params": [
+        "/graph/type=skos:ConceptScheme/uri"
+      ],
+      "pattern": "{0}"
+    }
+  },
+  "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+  "term-parent-uri": "",
+  "term-uri-field": "dansCollectionMode",
+  "vocabs": {
+    "ModeOfCollection_4_0": {
+      "uriSpace": "http://rdf-vocabulary.ddialliance.org/cv/ModeOfCollection/4.0/",
+      "vocabularyUri": "http://rdf-vocabulary.ddialliance.org/cv/ModeOfCollection/4.0/"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-config/elsstClassification.json b/src/test/resources/json/cvoc-dans-config/elsstClassification.json
new file mode 100644
index 00000000000..b5dc1ec84e2
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/elsstClassification.json
@@ -0,0 +1,48 @@
+{
+  "allow-free-text": false,
+  "cvoc-url": "https://dev.vocabs.datastations.nl/",
+  "field-name": "dansElsstClassification",
+  "js-url": "/custom/skosmos.js",
+  "languages": "en",
+  "managed-fields": {
+  },
+  "protocol": "skosmos",
+  "retrieval-filtering": {
+    "@context": {
+      "lang": "@language",
+      "termName": "https://schema.org/name",
+      "value": "@value",
+      "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+      "vocabularyUri": "https://dataverse.org/schema/vocabularyUri"
+    },
+    "@id": {
+      "params": [
+        "@id"
+      ],
+      "pattern": "{0}"
+    },
+    "termName": {
+      "params": [
+        "/graph/uri=@id/prefLabel"
+      ],
+      "pattern": "{0}"
+    },
+    "vocabularyName": {
+      "pattern": "ELSST Thesaurus Version 4",
+      "params": []
+    },
+    "vocabularyUri": {
+      "pattern": "https://elsst.cessda.eu/id/",
+      "params": []
+    }
+  },
+  "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+  "term-parent-uri": "",
+  "term-uri-field": "dansElsstClassification",
+  "vocabs": {
+    "ELSST_R4": {
+      "uriSpace": "https://elsst.cessda.eu/id/",
+      "vocabularyUri": "https://elsst.cessda.eu/id/"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-config/researchInstrument.json b/src/test/resources/json/cvoc-dans-config/researchInstrument.json
new file mode 100644
index 00000000000..4315b71f487
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/researchInstrument.json
@@ -0,0 +1,47 @@
+{
+  "allow-free-text": false,
+  "cvoc-url": "https://dev.vocabs.datastations.nl/",
+  "field-name": "dansResearchInstrument",
+  "js-url": "/custom/skosmos.js",
+  "languages": "en",
+  "managed-fields": {},
+  "protocol": "skosmos",
+  "retrieval-filtering": {
+    "@context": {
+      "lang": "@language",
+      "termName": "https://schema.org/name",
+      "value": "@value",
+      "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+      "vocabularyUri": "https://dataverse.org/schema/vocabularyUri"
+    },
+    "@id": {
+      "params": [
+        "@id"
+      ],
+      "pattern": "{0}"
+    },
+    "termName": {
+      "params": [
+        "/graph/uri=@id/prefLabel"
+      ],
+      "pattern": "{0}"
+    },
+    "vocabularyName": {
+      "pattern": "DDI Alliance Controlled Vocabulary for Type of Instrument 1.1",
+      "params": []
+    },
+    "vocabularyUri": {
+      "pattern": "http://rdf-vocabulary.ddialliance.org/cv/TypeOfInstrument/1.1/",
+      "params": []
+    }
+  },
+  "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+  "term-parent-uri": "",
+  "term-uri-field": "dansResearchInstrument",
+  "vocabs": {
+    "TypeOfInstrument_1_1": {
+      "uriSpace": "http://rdf-vocabulary.ddialliance.org/cv/TypeOfInstrument/1.1/",
+      "vocabularyUri": "http://rdf-vocabulary.ddialliance.org/cv/TypeOfInstrument/1.1/"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-config/samplingProcedureCV.json b/src/test/resources/json/cvoc-dans-config/samplingProcedureCV.json
new file mode 100644
index 00000000000..b82862fc068
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/samplingProcedureCV.json
@@ -0,0 +1,49 @@
+{
+  "allow-free-text": false,
+  "cvoc-url": "https://dev.vocabs.datastations.nl/",
+  "field-name": "dansSamplingProcedureCV",
+  "js-url": "/custom/skosmos.js",
+  "languages": "en",
+  "managed-fields": {},
+  "protocol": "skosmos",
+  "retrieval-filtering": {
+    "@context": {
+      "lang": "@language",
+      "termName": "https://schema.org/name",
+      "value": "@value",
+      "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+      "vocabularyUri": "https://dataverse.org/schema/vocabularyUri"
+    },
+    "@id": {
+      "params": [
+        "@id"
+      ],
+      "pattern": "{0}"
+    },
+    "termName": {
+      "params": [
+        "/graph/uri=@id/prefLabel"
+      ],
+      "pattern": "{0}"
+    },
+    "vocabularyName": {
+      "pattern": "DDI Alliance Controlled Vocabulary for Sampling Procedure 1.1",
+      "params": []
+    },
+    "vocabularyUri": {
+      "params": [
+        "/graph/type=skos:ConceptScheme/uri"
+      ],
+      "pattern": "{0}"
+    }
+  },
+  "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+  "term-parent-uri": "",
+  "term-uri-field": "dansSamplingProcedureCV",
+  "vocabs": {
+    "SamplingProcedure_1_1": {
+      "uriSpace": "http://rdf-vocabulary.ddialliance.org/cv/SamplingProcedure/1.1/",
+      "vocabularyUri": "http://rdf-vocabulary.ddialliance.org/cv/SamplingProcedure/1.1/"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-config/timeMethod.json b/src/test/resources/json/cvoc-dans-config/timeMethod.json
new file mode 100644
index 00000000000..b3e537fc64c
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/timeMethod.json
@@ -0,0 +1,47 @@
+{
+  "allow-free-text": false,
+  "cvoc-url": "https://dev.vocabs.datastations.nl/",
+  "field-name": "dansTimeMethod",
+  "js-url": "/custom/skosmos.js",
+  "languages": "en",
+  "managed-fields": {},
+  "protocol": "skosmos",
+  "retrieval-filtering": {
+    "@context": {
+      "lang": "@language",
+      "termName": "https://schema.org/name",
+      "value": "@value",
+      "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+      "vocabularyUri": "https://dataverse.org/schema/vocabularyUri"
+    },
+    "@id": {
+      "params": [
+        "@id"
+      ],
+      "pattern": "{0}"
+    },
+    "termName": {
+      "params": [
+        "/graph/uri=@id/prefLabel"
+      ],
+      "pattern": "{0}"
+    },
+    "vocabularyName": {
+      "pattern": "DDI Alliance Controlled Vocabulary for Time Method 1.2",
+      "params": []
+    },
+    "vocabularyUri": {
+      "pattern": "http://rdf-vocabulary.ddialliance.org/cv/TimeMethod/1.2/",
+      "params": []
+    }
+  },
+  "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+  "term-parent-uri": "",
+  "term-uri-field": "dansTimeMethod",
+  "vocabs": {
+    "TimeMethod_1_2": {
+      "uriSpace": "http://rdf-vocabulary.ddialliance.org/cv/TimeMethod/1.2/",
+      "vocabularyUri": "http://rdf-vocabulary.ddialliance.org/cv/TimeMethod/1.2/"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-config/unitOfAnalysys.json b/src/test/resources/json/cvoc-dans-config/unitOfAnalysys.json
new file mode 100644
index 00000000000..e6861f428c6
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-config/unitOfAnalysys.json
@@ -0,0 +1,49 @@
+{
+  "allow-free-text": false,
+  "cvoc-url": "https://dev.vocabs.datastations.nl/",
+  "field-name": "dansUnitOfAnalysis",
+  "js-url": "/custom/skosmos.js",
+  "languages": "en",
+  "managed-fields": {},
+  "protocol": "skosmos",
+  "retrieval-filtering": {
+    "@context": {
+      "lang": "@language",
+      "termName": "https://schema.org/name",
+      "value": "@value",
+      "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+      "vocabularyUri": "https://dataverse.org/schema/vocabularyUri"
+    },
+    "@id": {
+      "params": [
+        "@id"
+      ],
+      "pattern": "{0}"
+    },
+    "termName": {
+      "params": [
+        "/graph/uri=@id/prefLabel"
+      ],
+      "pattern": "{0}"
+    },
+    "vocabularyName": {
+      "pattern": "DDI Alliance Controlled Vocabulary for Analysis Unit 2.1",
+      "params": []
+    },
+    "vocabularyUri": {
+      "params": [
+        "/graph/type=skos:ConceptScheme/uri"
+      ],
+      "pattern": "{0}"
+    }
+  },
+  "retrieval-uri": "https://dev.vocabs.datastations.nl/rest/v1/data?uri={0}",
+  "term-parent-uri": "",
+  "term-uri-field": "dansUnitOfAnalysis",
+  "vocabs": {
+    "AnalysisUnit_2_1": {
+      "uriSpace": "http://rdf-vocabulary.ddialliance.org/cv/AnalysisUnit/2.1/",
+      "vocabularyUri": "http://rdf-vocabulary.ddialliance.org/cv/AnalysisUnit/2.1/"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/AATClassification.json b/src/test/resources/json/cvoc-dans-value/AATClassification.json
new file mode 100644
index 00000000000..787bb0f3663
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/AATClassification.json
@@ -0,0 +1,55 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "http://vocab.getty.edu/aat/300187008",
+      "type": "skos:Concept",
+      "inScheme": {
+        "uri": "http://vocabularies.dans.knaw.nl/aatconcepts"
+      },
+      "prefLabel": [
+        {
+          "lang": "nl",
+          "value": "Abnakee kleden"
+        },
+        {
+          "lang": "en",
+          "value": "Abnakee rugs"
+        }
+      ]
+    },
+    {
+      "uri": "http://vocabularies.dans.knaw.nl/aatconcepts",
+      "type": "skos:ConceptScheme",
+      "label": {
+        "lang": "en",
+        "value": "The Art and Architecture Thesaurus Concepts"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/abrArtifact.json b/src/test/resources/json/cvoc-dans-value/abrArtifact.json
new file mode 100644
index 00000000000..44cbd629537
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/abrArtifact.json
@@ -0,0 +1,167 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/4d2b6f51-c9bc-42c7-ad1f-8b7022fa3953",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#MaterialAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": [
+        {
+          "lang": "en",
+          "value": "flint"
+        },
+        {
+          "lang": "nl",
+          "value": "vuursteen"
+        }
+      ],
+      "https://data.cultureelerfgoed.nl/id/rnce#isMaterialAbrOf": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/d252345b-3dd8-4afe-85fc-d8bef7c5cb0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/50916375-b4c8-4afb-949f-244755e2afa4",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "narrower": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/d252345b-3dd8-4afe-85fc-d8bef7c5cb0f"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "steker"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/8d762bf7-bda3-4c07-b77f-5df51301ad3f",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#PeriodAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Paleolithicum"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#isBeginPeriodAbrOf": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/d252345b-3dd8-4afe-85fc-d8bef7c5cb0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/8d85b35a-7497-4b14-af54-a35648bce535",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#MaterialAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "zandsteen/kwartsiet"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#isMaterialAbrOf": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/d252345b-3dd8-4afe-85fc-d8bef7c5cb0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/c6134150-77f2-481b-bba6-c482e59046e8",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#PeriodAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Neolithicum"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#isEndPeriodAbrOf": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/d252345b-3dd8-4afe-85fc-d8bef7c5cb0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/d252345b-3dd8-4afe-85fc-d8bef7c5cb0f",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "broader": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/50916375-b4c8-4afb-949f-244755e2afa4"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "A-steker"
+      },
+      "skos:scopeNote": {
+        "lang": "nl",
+        "value": "Steker waarvan de werkkant het negatief van ÊÊn stekerafslag (A is afslag) heeft."
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#beginningOfValidity": {
+        "type": "http://www.w3.org/2001/XMLSchema#date",
+        "value": "2012-09-12"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#codeAbr": "STEKER.ASTEKER",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/8d762bf7-bda3-4c07-b77f-5df51301ad3f"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/c6134150-77f2-481b-bba6-c482e59046e8"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasMaterialAbr": [
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/4d2b6f51-c9bc-42c7-ad1f-8b7022fa3953"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/8d85b35a-7497-4b14-af54-a35648bce535"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/db8feb21-8ddc-432f-8062-a3a15f7f7cf4"
+        }
+      ]
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/db8feb21-8ddc-432f-8062-a3a15f7f7cf4",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#MaterialAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "steen"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#isMaterialAbrOf": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/d252345b-3dd8-4afe-85fc-d8bef7c5cb0f"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/abrComplex.json b/src/test/resources/json/cvoc-dans-value/abrComplex.json
new file mode 100644
index 00000000000..78a3ea41551
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/abrComplex.json
@@ -0,0 +1,64 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1b5b4dd1-f4f8-4e4c-9108-a6fb2c606cde",
+      "type": "skos:Concept",
+      "altLabel": {
+        "lang": "nl",
+        "value": "ringwalburcht"
+      },
+      "broader": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/2179d872-888f-4807-a6d5-5e5afaa616c4"
+      },
+      "hiddenLabel": {
+        "lang": "nl",
+        "value": "BEWV.WB"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "(ring)walburg"
+      },
+      "skos:scopeNote": {
+        "lang": "nl",
+        "value": "Een door een stelsel van wallen en grachten omsloten ronde, ovale of hoefijzervormig ruimte met een binnenterrein met een diameter van ca. 100-300 m. De wallen hebben een gemiddelde hoogte van twee tot vier m. In de meeste gevallen zijn er geen aanwijzingen voor vaste bewoning en zijn er dientengevolge nauwelijks vondsten."
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/2179d872-888f-4807-a6d5-5e5afaa616c4",
+      "type": "skos:Concept",
+      "narrower": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1b5b4dd1-f4f8-4e4c-9108-a6fb2c606cde"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "bewoning (inclusief verdediging)"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/abrPeriod.json b/src/test/resources/json/cvoc-dans-value/abrPeriod.json
new file mode 100644
index 00000000000..045b4515b24
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/abrPeriod.json
@@ -0,0 +1,1535 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/02aea074-a4a9-4335-9698-bec9a188964e",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/05a1149d-6410-4fc7-9b11-318235dc2878",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/08d13f7f-7ba9-4037-a45d-b0cb33e7b0c3",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "bolpot"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/09991368-af46-4512-93b4-d56bdd94837a",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "amulet - alsengemme"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/0b585fbe-caf8-49e6-bd2c-ed8f034ef036",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Cruciformfibula"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/0fd16779-7c72-46e6-a27b-7c1aec917be5",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "heiligenfibula geemailleerd"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/108f7a1d-c8ce-4c55-ab4f-663998dd6bb8",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "pseudomuntfibula"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/137bcf48-93d8-486a-9eba-6d872e30ad63",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "mayenaardewerk"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1444787e-5d77-48e9-a931-3b7bf4008ad1",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "pingsdorfaardewerk:kom"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/17eeedcd-2e80-414b-9059-4fceccc13706",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "haarnaald - bolle kop"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1a663a6d-dced-4509-9657-13ac276e425d",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "karolingisch grijsbakkend aardewerk"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1c1399bf-e2d4-4481-9aca-ce507c537dbc",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpot:type Dorestad (ongeprofileerd) - Dorestad HIB:schelpgruismagering"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1cd83c1e-ba0d-4924-af28-e654ee904e0a",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Walberberg aardewerk"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1e359798-2abf-4f91-b89e-ed434056cd09",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1f218dac-6129-49e2-938d-efcecdff3c0b",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "haarnaald - polyederkop"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1f784bad-306c-4ce1-95e4-06b6023b05d2",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "geelwitbakkend gedraaid:beker"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/21196e10-6491-4a71-b21c-ca9c3fb50485",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "bommeloorring"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/2922d4d2-e335-4a47-88bb-28cbfd91d9b9",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "geelwitbakkend handgevormd:kom"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/29c3c134-1020-4239-b257-f2fab3e04e49",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "zalfdoos"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/29c66ad6-242c-4add-87aa-3124abd6b59c",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Andenne:pot, bolvormig"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/2a0729f1-99cd-466b-94a3-eda91ffb8a8e",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/2e364fe9-3e01-4085-a442-7282e4659dc9",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "dirhan"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/2f85a3d3-650e-45e7-8e53-b11aae1441de",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Zuid-Limburg handgevormd aardewerk"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/35a3199d-c5c6-495b-9cde-c10bf1fc0d63",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "solidus"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/3acdd8c3-dd4b-4225-b531-c6d500a6f7dd",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpot:type Dorestad (ongeprofileerd)"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/3b9e2c46-9497-461a-90a3-16c944c76963",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kom - Dorestad HIV:inbuigende rand"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/3ca651bd-1e93-42cf-96bb-e3edc5c488da",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpot:verticale,hoog opgetrokken rand"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/44bad953-f272-4ec3-b000-ea5338d5fbc8",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Vikingzwaard:typen Wheeler V-VII"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/4567e775-3216-438b-aa59-39b0e100ec5a",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/46be796a-1f10-4f4c-9eb6-520d7cfc375e",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "duisburg aardewerk"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/49cefc62-894c-4939-8bc9-a6c36c01a560",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Noordfrans geelwitbakkend:tuitpot"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/4ae1dd58-d9f6-46f0-9882-b3c5f22dc6bc",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpot:type Dorestad (ongeprofileerd) - Dorestad HIA:kleine variant"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/4c74f143-c15f-418d-8451-dbec8c80899d",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "badorfaardewerk"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f",
+      "type": [
+        "skos:Concept",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "https://data.cultureelerfgoed.nl/id/rnce#PeriodAbr"
+      ],
+      "altLabel": {
+        "lang": "nl",
+        "value": "Ottoons"
+      },
+      "broader": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ae70e517-2662-49ea-a1be-eca52b2d218e"
+      },
+      "skos:hiddelLabel": {
+        "lang": "nl",
+        "value": "MEVD"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Vroege Middeleeuwen D"
+      },
+      "skos:scopeNote": {
+        "lang": "nl",
+        "value": "De periode tussen 900 en 1050, ruwweg gebaseerd op de datering van de overheersing door de dynastie van Ottoonse koningen en de keizers van het Oost-Frankische Rijk, waartoe Nederland ook behoorde."
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#beginYearAbr": 900,
+      "https://data.cultureelerfgoed.nl/id/rnce#codeAbr": {
+        "lang": "nl",
+        "value": "MEVD"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#endYearAbr": 1049,
+      "https://data.cultureelerfgoed.nl/id/rnce#isBeginPeriodAbrOf": [
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/bc6d9959-73b0-4430-a86b-e326fe87e336"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/5e771043-c208-47f4-99b7-1641af0b4d76"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/2922d4d2-e335-4a47-88bb-28cbfd91d9b9"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/add9f8ad-2284-4511-8275-0c5bc795c0cd"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1f784bad-306c-4ce1-95e4-06b6023b05d2"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/6284d339-beb9-463a-84ff-4d451ced4e24"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/59b28798-377f-4010-acb0-c6a804ec3097"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/d57765d0-22bf-4cc4-8c97-232d042b7df3"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/88e76597-965f-432f-b25c-b4fa108eca84"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/bae2fb38-a77d-408a-b1bb-69ddd3594a63"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/49cefc62-894c-4939-8bc9-a6c36c01a560"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/925c2604-b8fa-4a45-be0a-7d146f675ae7"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/60385fad-ddc7-4af1-b2f8-f14b41cd0456"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/c82986f1-cef5-44b0-9465-7e6a8ff06409"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/75bc1be1-a218-4f4a-9fa8-c6c2aa864c9d"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/60c3498d-7527-4684-97e2-8aeb9ec2e173"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/29c66ad6-242c-4add-87aa-3124abd6b59c"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/2f85a3d3-650e-45e7-8e53-b11aae1441de"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/7573b80c-562c-42f1-acee-dbe9d2011ab7"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1444787e-5d77-48e9-a931-3b7bf4008ad1"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/88d09cbd-0743-4fbe-bb5d-af7b62be4651"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/a482c1b9-12bc-40ef-9a15-20040b340cd1"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/782c60cd-a98e-4c4b-b51f-e8150486af72"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/9a99163b-c22d-48d6-9ded-ef0112de8524"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ec2c5349-a70b-4334-80c5-fc41de29d979"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/eeecb436-c8c7-445c-a89b-4e66ee74fe8e"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/46be796a-1f10-4f4c-9eb6-520d7cfc375e"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/5eca7ed8-bfca-450a-bfa7-e2b5e654e9c4"
+        }
+      ],
+      "https://data.cultureelerfgoed.nl/id/rnce#isEndPeriodAbrOf": [
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/2e364fe9-3e01-4085-a442-7282e4659dc9"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/108f7a1d-c8ce-4c55-ab4f-663998dd6bb8"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/dbb05ee3-b8dc-4e86-ba79-c320b364147d"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/3b9e2c46-9497-461a-90a3-16c944c76963"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/09991368-af46-4512-93b4-d56bdd94837a"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/c74a1b87-4013-4516-91df-209009d28d9e"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/bc6d9959-73b0-4430-a86b-e326fe87e336"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/be3776d9-72da-4283-9b31-e7c10c1950b3"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/b555ce1c-fb08-44d4-9f81-87a262b16329"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/0fd16779-7c72-46e6-a27b-7c1aec917be5"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/21196e10-6491-4a71-b21c-ca9c3fb50485"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/44bad953-f272-4ec3-b000-ea5338d5fbc8"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/e7eb705b-5992-4fcb-9f1a-d68073f906ad"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/c9f89fa4-debb-4461-a8cf-5d3a4788ff7e"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/aea78d62-4d84-45ae-9d16-3b75452d4abe"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/82bb0d14-3cd0-4be9-a80f-97e7f18b97c3"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/3ca651bd-1e93-42cf-96bb-e3edc5c488da"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/642113ae-8045-4183-bda9-e11dbdbc0182"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/af72712e-c721-4d7c-884f-4f7ff0e838e2"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1c1399bf-e2d4-4481-9aca-ce507c537dbc"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/4ae1dd58-d9f6-46f0-9882-b3c5f22dc6bc"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ef22ff5e-4667-4e6f-be61-eda1a50006f5"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/3acdd8c3-dd4b-4225-b531-c6d500a6f7dd"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/77883f24-528e-4891-8513-2ccccaa22dcb"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/0b585fbe-caf8-49e6-bd2c-ed8f034ef036"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/942c5c6f-f1f2-4443-a1d8-b22376c276c4"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ad921750-046f-4e9c-8cc4-d79f5c6c201e"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/6e6b2f8e-8841-453f-a374-76e9ed458b5e"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/35a3199d-c5c6-495b-9cde-c10bf1fc0d63"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/dae339a1-7021-4c1d-bc1a-66625f6a96f3"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/76d45cf1-4391-404c-8c8f-e9152fd70203"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ba62ecc3-2dc8-4f2c-99a5-6cbd448d7bfe"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/17eeedcd-2e80-414b-9059-4fceccc13706"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/fc399356-62df-4a0b-9ac7-eeca9ab4dcf0"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1f218dac-6129-49e2-938d-efcecdff3c0b"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/57f8e38c-58ff-4d02-817d-a668466057ec"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ab81b9b2-53f5-496b-995a-fd81b851aba2"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/9a119be1-0225-4795-a1fb-fa782548bfb2"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/fab8ad7a-588b-4370-9a80-b73735732847"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/f8d93a84-153a-4079-97e2-6f85d234441e"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/29c3c134-1020-4239-b257-f2fab3e04e49"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/08d13f7f-7ba9-4037-a45d-b0cb33e7b0c3"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/56ecd5d7-2591-416f-99f1-c227ed8650d9"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/c18ecbf9-f787-4e38-854d-32df989d9eb7"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/53611175-c12c-4520-adca-437899332c24"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1cd83c1e-ba0d-4924-af28-e654ee904e0a"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/1a663a6d-dced-4509-9657-13ac276e425d"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/137bcf48-93d8-486a-9eba-6d872e30ad63"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/4c74f143-c15f-418d-8451-dbec8c80899d"
+        },
+        {
+          "uri": "https://data.cultureelerfgoed.nl/term/id/abr/46be796a-1f10-4f4c-9eb6-520d7cfc375e"
+        }
+      ],
+      "https://data.cultureelerfgoed.nl/id/rnce#sortPeriod": "caad"
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/53611175-c12c-4520-adca-437899332c24",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "badorfaardewerk (Hunneschans-type)"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/56ecd5d7-2591-416f-99f1-c227ed8650d9",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpotaardewerk schelgruismagering"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/57f8e38c-58ff-4d02-817d-a668466057ec",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "penslot"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/59b28798-377f-4010-acb0-c6a804ec3097",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "geelwitbakkend gedraaid:pot, bolvormig"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/5e771043-c208-47f4-99b7-1641af0b4d76",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "pothelm"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/5eca7ed8-bfca-450a-bfa7-e2b5e654e9c4",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "pingsdorfaardewerk"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/60385fad-ddc7-4af1-b2f8-f14b41cd0456",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Noordfrans geelwitbakkend:kan"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/60c3498d-7527-4684-97e2-8aeb9ec2e173",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Andenne:tuitpot"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/6284d339-beb9-463a-84ff-4d451ced4e24",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "geelwitbakkend handgevormd:pot, bolvorm. - Zuidlimburgs"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/642113ae-8045-4183-bda9-e11dbdbc0182",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpot:type Dorestad (ongeprofileerd) - Dorestad HIC"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/6e6b2f8e-8841-453f-a374-76e9ed458b5e",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "weefgewicht - ringvormig"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/70df9b2f-b8ac-43c0-8d27-f3c998b61a29",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/7573b80c-562c-42f1-acee-dbe9d2011ab7",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Zuid-Limburg gedraaid aardewerk"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/75bc1be1-a218-4f4a-9fa8-c6c2aa864c9d",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "geelwitbakkend gedraaid:tuitpot"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/76d45cf1-4391-404c-8c8f-e9152fd70203",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "fibula - geemailleerd"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/77883f24-528e-4891-8513-2ccccaa22dcb",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpot:horizontale rand,ongeprofileerd"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/782c60cd-a98e-4c4b-b51f-e8150486af72",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "pingsdorfaardewerk:tuitpot"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/7e9f750d-2331-4342-9577-4ba1b1d98ea3",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/82bb0d14-3cd0-4be9-a80f-97e7f18b97c3",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "slijpsteen - doorboord"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/88d09cbd-0743-4fbe-bb5d-af7b62be4651",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "pingsdorfaardewerk:beker"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/88e76597-965f-432f-b25c-b4fa108eca84",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpot - Kempische variant"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/925c2604-b8fa-4a45-be0a-7d146f675ae7",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "geelwitbakkend gedraaid:kan"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/942c5c6f-f1f2-4443-a1d8-b22376c276c4",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "gelijkarmige fibula"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/9a119be1-0225-4795-a1fb-fa782548bfb2",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "umbo"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/9a99163b-c22d-48d6-9ded-ef0112de8524",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "pingsdorfaardewerk:kan"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/a482c1b9-12bc-40ef-9a15-20040b340cd1",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "pingsdorfaardewerk:pot"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/a627267f-67f1-454a-a9f8-daf4e281993c",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/a9003966-105f-477a-8840-04f61b962b11",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ab81b9b2-53f5-496b-995a-fd81b851aba2",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "handgreep"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ad921750-046f-4e9c-8cc4-d79f5c6c201e",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "schijffibula"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/add9f8ad-2284-4511-8275-0c5bc795c0cd",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "geelwitbakkend handgevormd:kom - Zuidlimburgs"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ae70e517-2662-49ea-a1be-eca52b2d218e",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#PeriodAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "narrower": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Vroege Middeleeuwen"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/aea78d62-4d84-45ae-9d16-3b75452d4abe",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "steelpan - Dorestad HII"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/af72712e-c721-4d7c-884f-4f7ff0e838e2",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpot:type Dorestad (ongeprofileerd) - Dorestad HIA"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/b555ce1c-fb08-44d4-9f81-87a262b16329",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "schijffibula - Maltezer kruis"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ba62ecc3-2dc8-4f2c-99a5-6cbd448d7bfe",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "schijffibula - geemailleerd"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/bae2fb38-a77d-408a-b1bb-69ddd3594a63",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpot - tuitvormige oren"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/bc6d9959-73b0-4430-a86b-e326fe87e336",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "oorring - Byzantijns"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/be3776d9-72da-4283-9b31-e7c10c1950b3",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "pseudokameefibula"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/c18ecbf9-f787-4e38-854d-32df989d9eb7",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Badorf aardewerk - Dorestad WII A-E:eivormig/radstempel"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/c74a1b87-4013-4516-91df-209009d28d9e",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "runenstaaf"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/c82986f1-cef5-44b0-9465-7e6a8ff06409",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "geelwitbakkend gedraaid:kom"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/c9f89fa4-debb-4461-a8cf-5d3a4788ff7e",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Badorf aardewerk - Dorestad WI/II:Badorfhybride"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/d57765d0-22bf-4cc4-8c97-232d042b7df3",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "geelwitbakkend handgevormd:pot, bolvorm."
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/dae339a1-7021-4c1d-bc1a-66625f6a96f3",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "munthanger"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/dbb05ee3-b8dc-4e86-ba79-c320b364147d",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kruisvormige fibula"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/e7eb705b-5992-4fcb-9f1a-d68073f906ad",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Badorf aardewerk - reliefbandamfoor:Dorestad WI A-C"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ec2c5349-a70b-4334-80c5-fc41de29d979",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "pingsdorfaardewerk (Zuid-Limburg type)"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/eeecb436-c8c7-445c-a89b-4e66ee74fe8e",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategory",
+        "https://data.cultureelerfgoed.nl/id/rnce#CeramicCategoryAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "witbakkend Maaslands aardewerk"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/ef22ff5e-4667-4e6f-be61-eda1a50006f5",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "kogelpot - versierd en eenvoudig randprofiel"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/f8d93a84-153a-4079-97e2-6f85d234441e",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "weefgewicht - kegelvormig"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/f9c4e8e1-4f8f-46c0-aed4-a75dda88ee60",
+      "https://data.cultureelerfgoed.nl/id/rnce#hasBeginPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/fab8ad7a-588b-4370-9a80-b73735732847",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "beslag (schildonderdeel)"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/fc399356-62df-4a0b-9ac7-eeca9ab4dcf0",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#ArtefactAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "prefLabel": {
+        "lang": "nl",
+        "value": "haarnaald - biconische kop"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#hasEndPeriodAbr": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/533f6881-7c2d-49fc-bce6-71a839558c0f"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/abrRapportType.json b/src/test/resources/json/cvoc-dans-value/abrRapportType.json
new file mode 100644
index 00000000000..034c4f5db60
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/abrRapportType.json
@@ -0,0 +1,53 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/5701cb3d-0ffd-4663-98e0-fab808448109",
+      "type": "skos:Concept",
+      "broader": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/7a99aaba-c1e7-49a4-9dd8-d295dbcc870e"
+      },
+      "skos:notation": "AAP",
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Achterhoekse Archeologische Publicaties"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/7a99aaba-c1e7-49a4-9dd8-d295dbcc870e",
+      "type": "skos:Concept",
+      "narrower": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/5701cb3d-0ffd-4663-98e0-fab808448109"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "rapporten"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/abrVerwervingswijze.json b/src/test/resources/json/cvoc-dans-value/abrVerwervingswijze.json
new file mode 100644
index 00000000000..97bbf047c66
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/abrVerwervingswijze.json
@@ -0,0 +1,65 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/7a2a5dd7-4c94-4c79-b90e-e9eb13c905c9",
+      "type": [
+        "https://data.cultureelerfgoed.nl/id/rnce#AquisitionMethodAbr",
+        "https://data.cultureelerfgoed.nl/id/rnce#AbrConcept",
+        "skos:Concept"
+      ],
+      "narrower": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/b7f4fe13-d7b4-4fb9-a7a8-c25ef74b612d"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "non-destructief"
+      }
+    },
+    {
+      "uri": "https://data.cultureelerfgoed.nl/term/id/abr/b7f4fe13-d7b4-4fb9-a7a8-c25ef74b612d",
+      "type": "skos:Concept",
+      "altLabel": {
+        "lang": "nl",
+        "value": "boring"
+      },
+      "broader": {
+        "uri": "https://data.cultureelerfgoed.nl/term/id/abr/7a2a5dd7-4c94-4c79-b90e-e9eb13c905c9"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "archeologisch: booronderzoek"
+      },
+      "skos:scopeNote": {
+        "lang": "nl",
+        "value": "Door archeologisch booronderzoek verkregen archeologische informatie volgens Protocol 4003 Inventariserend veldonderzoek (IVO-O: VS03) KNA 4.1"
+      },
+      "https://data.cultureelerfgoed.nl/id/rnce#codeAbr": "ABO"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/audience.json b/src/test/resources/json/cvoc-dans-value/audience.json
new file mode 100644
index 00000000000..ee0dbdb00f6
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/audience.json
@@ -0,0 +1,88 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "https://www.narcis.nl/classification/",
+      "type": "skos:ConceptScheme",
+      "label": [
+        {
+          "lang": "nl",
+          "value": "Classificatiecodes van de wetenschapsportal Narcis (www.narcis.nl). De Narcis Classificatie is een schema van codes\n            waarmee experts en onderzoeksorganisaties kunnen worden ingedeeld en teruggevonden. De D-code rubriceert de wetenschappelijke disciplines.\n            Daarnaast bevat de classificatie een E-code. Deze code omvat een aantal interdisciplinaire onderzoeksgebieden. De Narcis Classificatie is\n            in 2015 herzien."
+        },
+        {
+          "lang": "en",
+          "value": "Classification codes of the scientific portal Narcis (www.narcis.nl). The Narcis Classification is a framework of codes with which\n            institutes and experts are classified and can be retrieved. The D code classifies on scientific disciplines. The classification also\n            contains an E code. This code includes some interdisciplinary research fields. The Narcis Classification has been revised in the year\n            2015."
+        }
+      ]
+    },
+    {
+      "uri": "https://www.narcis.nl/classification/D13000",
+      "type": "skos:Concept",
+      "prefLabel": [
+        {
+          "lang": "nl",
+          "value": "Scheikunde"
+        },
+        {
+          "lang": "en",
+          "value": "Chemistry"
+        }
+      ]
+    },
+    {
+      "uri": "https://www.narcis.nl/classification/D13700",
+      "type": "skos:Concept",
+      "broader": {
+        "uri": "https://www.narcis.nl/classification/D13000"
+      },
+      "hiddenLabel": [
+        {
+          "lang": "nl",
+          "value": "D13700"
+        },
+        {
+          "lang": "en",
+          "value": "D13700"
+        }
+      ],
+      "inScheme": {
+        "uri": "https://www.narcis.nl/classification/"
+      },
+      "prefLabel": [
+        {
+          "lang": "en",
+          "value": "Theoretical chemistry, quantum chemistry"
+        },
+        {
+          "lang": "nl",
+          "value": "Theoretische chemie, kwantumchemie"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/cessdaClassification.json b/src/test/resources/json/cvoc-dans-value/cessdaClassification.json
new file mode 100644
index 00000000000..46ae1c4be20
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/cessdaClassification.json
@@ -0,0 +1,57 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "https://vocabularies.cessda.eu/vocabulary/TopicClassification?v=4.2",
+      "type": "skos:ConceptScheme",
+      "skos:notation": "TopicClassification"
+    },
+    {
+      "uri": "https://vocabularies.cessda.eu/vocabulary/TopicClassification?v=4.2#TradeIndustryAndMarkets",
+      "narrower": {
+        "uri": "https://vocabularies.cessda.eu/vocabulary/TopicClassification?v=4.2#TradeIndustryAndMarkets.AgricultureAndRuralIndustry"
+      }
+    },
+    {
+      "uri": "https://vocabularies.cessda.eu/vocabulary/TopicClassification?v=4.2#TradeIndustryAndMarkets.AgricultureAndRuralIndustry",
+      "type": "skos:Concept",
+      "skos:definition": {
+        "lang": "en",
+        "value": "Data on agricultural production and all rural industries which include, for example, fisheries and forestry."
+      },
+      "inScheme": {
+        "uri": "https://vocabularies.cessda.eu/vocabulary/TopicClassification?v=4.2"
+      },
+      "skos:notation": "TradeIndustryAndMarkets.AgricultureAndRuralIndustry",
+      "prefLabel": {
+        "lang": "en",
+        "value": "Agriculture and rural industry"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/collection.json b/src/test/resources/json/cvoc-dans-value/collection.json
new file mode 100644
index 00000000000..7df76cad9b7
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/collection.json
@@ -0,0 +1,67 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "https://vocabularies.dans.knaw.nl/collections",
+      "type": "skos:ConceptScheme",
+      "prefLabel": {
+        "lang": "nl",
+        "value": "DansCollections"
+      }
+    },
+    {
+      "uri": "https://vocabularies.dans.knaw.nl/collections/archaeology",
+      "type": "skos:Concept",
+      "narrower": {
+        "uri": "https://vocabularies.dans.knaw.nl/collections/archaeology/ArcheoDepot"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "Archaeology"
+      }
+    },
+    {
+      "uri": "https://vocabularies.dans.knaw.nl/collections/archaeology/ArcheoDepot",
+      "type": "skos:Concept",
+      "broader": {
+        "uri": "https://vocabularies.dans.knaw.nl/collections/archaeology"
+      },
+      "skos:definition": {
+        "lang": "nl",
+        "value": "ArcheoDepot"
+      },
+      "inScheme": {
+        "uri": "https://vocabularies.dans.knaw.nl/collections"
+      },
+      "prefLabel": {
+        "lang": "nl",
+        "value": "ArcheoDepot"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/collectionMode.json b/src/test/resources/json/cvoc-dans-value/collectionMode.json
new file mode 100644
index 00000000000..61d96c23226
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/collectionMode.json
@@ -0,0 +1,57 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/ModeOfCollection/4.0/",
+      "type": "skos:ConceptScheme",
+      "skos:notation": "ModeOfCollection"
+    },
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/ModeOfCollection/4.0/#AutomatedDataExtraction",
+      "narrower": {
+        "uri": "http://rdf-vocabulary.ddialliance.org/cv/ModeOfCollection/4.0/#AutomatedDataExtraction.WebScraping"
+      }
+    },
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/ModeOfCollection/4.0/#AutomatedDataExtraction.WebScraping",
+      "type": "skos:Concept",
+      "skos:definition": {
+        "lang": "en",
+        "value": "A technique employed to extract large amounts of data from websites and save it to a local file or database for further processing or storage. Also called screen scraping, web data extraction, web harvesting, etc."
+      },
+      "inScheme": {
+        "uri": "http://rdf-vocabulary.ddialliance.org/cv/ModeOfCollection/4.0/"
+      },
+      "skos:notation": "AutomatedDataExtraction.WebScraping",
+      "prefLabel": {
+        "lang": "en",
+        "value": "Automated data extraction: Web scraping"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/elsstClassification.json b/src/test/resources/json/cvoc-dans-value/elsstClassification.json
new file mode 100644
index 00000000000..2b614b46670
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/elsstClassification.json
@@ -0,0 +1,862 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "dct:identifier",
+      "label": {
+        "lang": "en",
+        "value": "URN"
+      }
+    },
+    {
+      "uri": "dct:isVersionOf",
+      "label": {
+        "lang": "en",
+        "value": "Is a version of"
+      }
+    },
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/xkos#additionalContentNote",
+      "label": {
+        "lang": "en",
+        "value": "DEFINITION SOURCE"
+      }
+    },
+    {
+      "uri": "owl:priorVersion",
+      "label": {
+        "lang": "en",
+        "value": "Has previous version"
+      }
+    },
+    {
+      "uri": "https://elsst.cessda.eu/id/4/",
+      "type": [
+        "skos:ConceptScheme",
+        "owl:Ontology"
+      ],
+      "prefLabel": [
+        {
+          "lang": "hu",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "is",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "en",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "cs",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "da",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "de",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "el",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "es",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "fi",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "fr",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "lt",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "nl",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "no",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "ro",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "sl",
+          "value": "ELSST Thesaurus"
+        },
+        {
+          "lang": "sv",
+          "value": "ELSST Thesaurus"
+        }
+      ]
+    },
+    {
+      "uri": "https://elsst.cessda.eu/id/4/269a8d84-0b08-4034-a79c-129072cc1992",
+      "type": "skos:Concept",
+      "prefLabel": [
+        {
+          "lang": "el",
+          "value": "ΕΚΠΑΙΔΕÎĨΤΙΚΗ ΑΞΙΟΛΟΓΗÎŖΗ"
+        },
+        {
+          "lang": "no",
+          "value": "VURDERING AV UTDANNING"
+        },
+        {
+          "lang": "de",
+          "value": "BEURTEILUNG (BILDUNG)"
+        },
+        {
+          "lang": "nl",
+          "value": "EDUCATIEVE BEOORDELING"
+        },
+        {
+          "lang": "en",
+          "value": "EDUCATIONAL ASSESSMENT"
+        },
+        {
+          "lang": "es",
+          "value": "EVALUACIÓN EDUCATIVA"
+        },
+        {
+          "lang": "ro",
+          "value": "EVALUARE EDUCAȚIONALĂ"
+        },
+        {
+          "lang": "fr",
+          "value": "ÉVALUATION DES COMPÉTENCES SCOLAIRES"
+        },
+        {
+          "lang": "cs",
+          "value": "HODNOCENÍ ÅŊÁKÅŽ A STUDENTÅŽ"
+        },
+        {
+          "lang": "hu",
+          "value": "ISKOLAI ÉRTÉKELÉS"
+        },
+        {
+          "lang": "sv",
+          "value": "KUNSKAPSBEDÖMNING"
+        },
+        {
+          "lang": "lt",
+          "value": "MOKYMO VERTINIMAS"
+        },
+        {
+          "lang": "is",
+          "value": "NÁMSMAT"
+        },
+        {
+          "lang": "fi",
+          "value": "OPPILASARVIOINTI"
+        },
+        {
+          "lang": "sl",
+          "value": "Å OLSKA OCENA"
+        },
+        {
+          "lang": "da",
+          "value": "VURDERING AF UDDANNELSER"
+        }
+      ],
+      "related": {
+        "uri": "https://elsst.cessda.eu/id/4/bf0d664a-e89a-4ec3-80d2-04f664b359ab"
+      }
+    },
+    {
+      "uri": "https://elsst.cessda.eu/id/4/32caebf0-7bb4-4cfc-b67b-4bbd1041057f",
+      "type": "skos:Concept",
+      "narrower": {
+        "uri": "https://elsst.cessda.eu/id/4/bf0d664a-e89a-4ec3-80d2-04f664b359ab"
+      },
+      "prefLabel": [
+        {
+          "lang": "el",
+          "value": "ΙΚΑΝΟΤΗΤΑ"
+        },
+        {
+          "lang": "nl",
+          "value": "VERMOGEN"
+        },
+        {
+          "lang": "en",
+          "value": "ABILITY"
+        },
+        {
+          "lang": "es",
+          "value": "CAPACIDAD"
+        },
+        {
+          "lang": "fr",
+          "value": "CAPACITÉ"
+        },
+        {
+          "lang": "ro",
+          "value": "COMPETENȚĂ"
+        },
+        {
+          "lang": "da",
+          "value": "EVNE"
+        },
+        {
+          "lang": "no",
+          "value": "EVNER"
+        },
+        {
+          "lang": "is",
+          "value": "FÆRNI"
+        },
+        {
+          "lang": "de",
+          "value": "FÄHIGKEIT"
+        },
+        {
+          "lang": "sv",
+          "value": "FÖRMÅGA"
+        },
+        {
+          "lang": "lt",
+          "value": "GEBĖJIMAS"
+        },
+        {
+          "lang": "hu",
+          "value": "KÉPESSÉG"
+        },
+        {
+          "lang": "fi",
+          "value": "KYVYKKYYS, LAHJAKKUUS JA TAIDOT"
+        },
+        {
+          "lang": "cs",
+          "value": "SCHOPNOST"
+        },
+        {
+          "lang": "sl",
+          "value": "SPOSOBNOST"
+        }
+      ]
+    },
+    {
+      "uri": "https://elsst.cessda.eu/id/4/4e33f431-f8be-4e8c-b94b-67dcf5f834e1",
+      "type": "skos:Concept",
+      "prefLabel": [
+        {
+          "lang": "el",
+          "value": "ΟΜΑΔΟΠΟΙΗÎŖΗ ΒΑÎŖΕΙ ΙΚΑΝΟΤΗΤΩΝ"
+        },
+        {
+          "lang": "fi",
+          "value": "TASORYHMITTELY"
+        },
+        {
+          "lang": "en",
+          "value": "ABILITY GROUPING"
+        },
+        {
+          "lang": "es",
+          "value": "AGRUPAMIENTO POR CAPACIDAD"
+        },
+        {
+          "lang": "nl",
+          "value": "COMPETENTIE-INDELING"
+        },
+        {
+          "lang": "da",
+          "value": "EVNEGRUPPERING"
+        },
+        {
+          "lang": "is",
+          "value": "FÆRNIFLOKKUN"
+        },
+        {
+          "lang": "ro",
+          "value": "GRUPARE DUPĂ COMPETENȚE"
+        },
+        {
+          "lang": "lt",
+          "value": "GRUPAVIMAS PAGAL GABUMUS"
+        },
+        {
+          "lang": "de",
+          "value": "GRUPPIERUNG NACH BEGABUNG"
+        },
+        {
+          "lang": "hu",
+          "value": "KÉPESSÉG SZERINTI CSOPORTOSÍTÁS"
+        },
+        {
+          "lang": "no",
+          "value": "NIVÅGRUPPERING"
+        },
+        {
+          "lang": "sv",
+          "value": "NIVÅGRUPPERING"
+        },
+        {
+          "lang": "sl",
+          "value": "RAZVRŠČANJE PO SPOSOBNOSTIH"
+        },
+        {
+          "lang": "fr",
+          "value": "REGROUPEMENT PAR COMPÉTENCE"
+        },
+        {
+          "lang": "cs",
+          "value": "ROZDĚLENÍ PODLE SCHOPNOSTÍ"
+        }
+      ],
+      "related": {
+        "uri": "https://elsst.cessda.eu/id/4/bf0d664a-e89a-4ec3-80d2-04f664b359ab"
+      }
+    },
+    {
+      "uri": "https://elsst.cessda.eu/id/4/77ae3d1f-2134-429e-bc81-bfd0c20ddce2",
+      "type": "skos:Concept",
+      "prefLabel": [
+        {
+          "lang": "el",
+          "value": "ΕΚΠΑΙΔΕÎĨΤΙΚΑ ΕΠΙΠΕΔΑ"
+        },
+        {
+          "lang": "no",
+          "value": "UTDANNINGSNIVÅ"
+        },
+        {
+          "lang": "de",
+          "value": "BILDUNGSNIVEAUS"
+        },
+        {
+          "lang": "en",
+          "value": "EDUCATIONAL LEVELS"
+        },
+        {
+          "lang": "sl",
+          "value": "IZOBRAZBENA RAVEN"
+        },
+        {
+          "lang": "fi",
+          "value": "KOULUTUSASTEET"
+        },
+        {
+          "lang": "is",
+          "value": "MENNTUNARSTIG"
+        },
+        {
+          "lang": "fr",
+          "value": "NIVEAUX D'ENSEIGNEMENT"
+        },
+        {
+          "lang": "es",
+          "value": "NIVELES EDUCATIVOS"
+        },
+        {
+          "lang": "ro",
+          "value": "NIVELURI EDUCAȚIONALE"
+        },
+        {
+          "lang": "hu",
+          "value": "OKTATÁSI SZINT"
+        },
+        {
+          "lang": "nl",
+          "value": "ONDERWIJSNIVEAUS"
+        },
+        {
+          "lang": "lt",
+          "value": "Å VIETIMO LYGIAI"
+        },
+        {
+          "lang": "da",
+          "value": "UDDANNELSESNIVEAU"
+        },
+        {
+          "lang": "cs",
+          "value": "ÚROVNĚ VZDĚLÁVÁNÍ"
+        },
+        {
+          "lang": "sv",
+          "value": "UTBILDNINGSNIVÅ"
+        }
+      ],
+      "related": {
+        "uri": "https://elsst.cessda.eu/id/4/bf0d664a-e89a-4ec3-80d2-04f664b359ab"
+      }
+    },
+    {
+      "uri": "https://elsst.cessda.eu/id/4/b1ab6f66-f3ed-42ec-9af5-2a896bdf119f",
+      "type": "skos:Concept",
+      "prefLabel": [
+        {
+          "lang": "el",
+          "value": "ΟΜΑΔΟΠΟΙΗÎŖΗ ÎŖΤΗΝ ΕΚΠΑΙΔΕÎĨÎŖΗ"
+        },
+        {
+          "lang": "no",
+          "value": "UTDANNINGSGRUPPER"
+        },
+        {
+          "lang": "es",
+          "value": "AGRUPAMIENTO EDUCATIVO"
+        },
+        {
+          "lang": "en",
+          "value": "EDUCATIONAL GROUPING"
+        },
+        {
+          "lang": "ro",
+          "value": "GRUPARE EDUCAȚIONALĂ"
+        },
+        {
+          "lang": "lt",
+          "value": "GRUPAVIMAS MOKYMO TIKSLAIS"
+        },
+        {
+          "lang": "is",
+          "value": "HÓPASKIPTING Í NÁMI"
+        },
+        {
+          "lang": "hu",
+          "value": "ISKOLAI CSOPORTBONTÁS"
+        },
+        {
+          "lang": "nl",
+          "value": "ONDERWIJSGROEPERING"
+        },
+        {
+          "lang": "fr",
+          "value": "REGROUPEMENT SCOLAIRE"
+        },
+        {
+          "lang": "fi",
+          "value": "RYHMITTELY (KOULUTUS)"
+        },
+        {
+          "lang": "cs",
+          "value": "UČEBNÍ SKUPINY"
+        },
+        {
+          "lang": "sl",
+          "value": "UČNA SKUPINA"
+        },
+        {
+          "lang": "da",
+          "value": "UDDANNELSESGRUPPERING"
+        },
+        {
+          "lang": "de",
+          "value": "UNTERRICHTSGRUPPEN"
+        },
+        {
+          "lang": "sv",
+          "value": "UTBILDNINGSGRUPPERING"
+        }
+      ],
+      "related": {
+        "uri": "https://elsst.cessda.eu/id/4/bf0d664a-e89a-4ec3-80d2-04f664b359ab"
+      }
+    },
+    {
+      "uri": "https://elsst.cessda.eu/id/4/bf0d664a-e89a-4ec3-80d2-04f664b359ab",
+      "type": "skos:Concept",
+      "dct:identifier": [
+        {
+          "lang": "sv",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "sl",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "ro",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "no",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "nl",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "lt",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "is",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "hu",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "fr",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "fi",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "es",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "en",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "el",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "de",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "da",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        },
+        {
+          "lang": "cs",
+          "value": "urn:ddi:int.cessda.elsst:bf0d664a-e89a-4ec3-80d2-04f664b359ab:4"
+        }
+      ],
+      "dct:isVersionOf": {
+        "uri": "https://elsst.cessda.eu/id/bf0d664a-e89a-4ec3-80d2-04f664b359ab"
+      },
+      "dct:issued": {
+        "lang": "en",
+        "value": "2023-09-13"
+      },
+      "dct:modified": {
+        "type": "http://www.w3.org/2001/XMLSchema#dateTime",
+        "value": "2022-03-01T10:28:48"
+      },
+      "http://rdf-vocabulary.ddialliance.org/xkos#additionalContentNote": {
+        "lang": "en",
+        "value": "ERIC"
+      },
+      "owl:priorVersion": {
+        "uri": "https://elsst.cessda.eu/id/3/bf0d664a-e89a-4ec3-80d2-04f664b359ab"
+      },
+      "altLabel": [
+        {
+          "lang": "fi",
+          "value": "SUORIUTUMISKYKY (KOULUTUS)"
+        },
+        {
+          "lang": "en",
+          "value": "ACADEMIC APTITUDE"
+        },
+        {
+          "lang": "lt",
+          "value": "AKADEMINIAI GABUMAI"
+        },
+        {
+          "lang": "de",
+          "value": "AKADEMISCHE BEGABUNG"
+        },
+        {
+          "lang": "de",
+          "value": "AKADEMISCHE EIGNUNG"
+        },
+        {
+          "lang": "de",
+          "value": "AKADEMISCHE FAEHIGKEITEN"
+        },
+        {
+          "lang": "de",
+          "value": "AKADEMISCHE FERTIGKEITEN"
+        },
+        {
+          "lang": "sv",
+          "value": "AKADEMISK FÄRDIGHET"
+        },
+        {
+          "lang": "sv",
+          "value": "AKADEMISK SKICKLIGHET"
+        },
+        {
+          "lang": "sv",
+          "value": "AKADEMISKA ANLAG"
+        },
+        {
+          "lang": "no",
+          "value": "AKADEMISKE ANLEGG"
+        },
+        {
+          "lang": "ro",
+          "value": "APTITUDINE ACADEMICĂ"
+        },
+        {
+          "lang": "es",
+          "value": "CAPACIDAD ACADÉMICA"
+        },
+        {
+          "lang": "lt",
+          "value": "MOKSLUMAS"
+        },
+        {
+          "lang": "cs",
+          "value": "OBECNÉ STUDIJNÍ PŘEDPOKLADY"
+        },
+        {
+          "lang": "fi",
+          "value": "OPPIMISKYKY (KOULUTUS)"
+        }
+      ],
+      "broader": {
+        "uri": "https://elsst.cessda.eu/id/4/32caebf0-7bb4-4cfc-b67b-4bbd1041057f"
+      },
+      "skos:definition": [
+        {
+          "lang": "el",
+          "value": "Η ΙΚΑΝΟΤΗΤΑ ΠΡΑΓΜΑΤΩÎŖΗÎŖ ΑΚΑΔΗΜΑÎĒΚΩΝ Ή ΕΚΠΑΙΔΕÎĨΤΙΚΩΝ ΔΡΑÎŖΤΗΡΙΟΤΗΤΩΝ˙ Η ΔÎĨΝΑΤΟΤΗΤΑ ΕΠΙΤΕÎĨΞΗÎŖ ÎĨΨΗΛΩΝ ΑΚΑΔΗΜΑÎĒΚΩΝ ÎŖΤΟΧΩΝ"
+        },
+        {
+          "lang": "en",
+          "value": "THE DEGREE OF ACTUAL COMPETENCE TO PERFORM IN SCHOLASTIC OR EDUCATIONAL ACTIVITIES"
+        },
+        {
+          "lang": "fi",
+          "value": "KOULUTUKSELLINEN LAHJAKKUUS ELI KUINKA HYVIN YKSILÖ KYKENEE SUORIUTUMAAN KOULUSSA JA MUISSA OPINNOISSA."
+        },
+        {
+          "lang": "ro",
+          "value": "GRADUL COMPETENȚELOR DE A PARTICIPA LA DIVERSE ACTIVITĂȚI SCOLASTICE SAU EDUCAȚIONALE; POTENȚIAL DE A OBȚINE STANDARDE ACADEMICE ÎNALTE "
+        },
+        {
+          "lang": "no",
+          "value": "GRADEN AV FAKTISK KOMPETANSE TIL Å UTFØRE SKOLE- ELLER UTDANNINGSRELATERTE AKTIVITETER. POTENSIALET TIL Å OPPNÅ HØYE AKADEMISKE STANDARDER"
+        },
+        {
+          "lang": "da",
+          "value": "GRADEN AF KOMPETENCE VED SKOLE- ELLER UNDEVISNINGSAKTIVITETER (ERIC) POTENTIALET FOR AT OPNÅ EN HØJ AKADEMISK STANDARD"
+        },
+        {
+          "lang": "sv",
+          "value": "GRAD AV FAKTISK PRESTATIONSFÖRMÅGA INOM SKOL- OCH UTBILDNINGSAKTIVITETER. POTENTIAL ATT UPPNÅ HÖG AKADEMISK STANDARD."
+        },
+        {
+          "lang": "es",
+          "value": "EL GRADO DE COMPETENCIA REAL PARA REALIZAR ACTIVIDADES ESCOLARES O EDUCATIVAS"
+        },
+        {
+          "lang": "fr",
+          "value": "DEGRÉ DE COMPÉTENCE PERMETTANT DE PRENDRE PART À DES ACTIVITÉS SCOLAIRES OU UNIVERSITAIRES; POTENTIEL D’ATTEINDRE UN NIVEAU ACADÉMIQUE ÉLEVÉ."
+        },
+        {
+          "lang": "nl",
+          "value": "DE MATE WAARIN DE BETROKKENE DAADWERKELIJK BEKWAAM IS OM ONDERWIJS- OF SCHOLINGSACTIVITEITEN UIT TE VOEREN; DE MOGELIJKHEID OM HOGE ACADEMISCHE NORMEN TE BEREIKEN OF VAARDIGHEDEN DIE AANGELEERD WORDEN OP EEN UNIVERSITEIT, OF EEN ANDERSOORTIGE WETENSCHAPPELIJKE INSTELLING."
+        },
+        {
+          "lang": "de",
+          "value": "AUSMASS TATSÄCHLICHER KOMPETENZ AUF DEM GEBIET DER LEHRE; FÄHIGKEIT, EIN HOHES AKADEMISCHES NIVEAU ZU ERREICHEN."
+        },
+        {
+          "lang": "lt",
+          "value": "AUKÅ TÅ˛ AKADEMINIÅ˛ REZULTATÅ˛ PASIEKIMO POTENCIALAS"
+        }
+      ],
+      "inScheme": {
+        "uri": "https://elsst.cessda.eu/id/4/"
+      },
+      "prefLabel": [
+        {
+          "lang": "el",
+          "value": "ΑΚΑΔΗΜΑÎĒΚΗ ΙΚΑΝΟΤΗΤΑ"
+        },
+        {
+          "lang": "hu",
+          "value": "TUDOMÁNYOS KÉSZSÉG"
+        },
+        {
+          "lang": "cs",
+          "value": "STUDIJNÍ PŘEDPOKLADY"
+        },
+        {
+          "lang": "sl",
+          "value": "SPOSOBNOST ZA Å TUDIJ"
+        },
+        {
+          "lang": "is",
+          "value": "NÁMSFÆRNI"
+        },
+        {
+          "lang": "fi",
+          "value": "KOULUTUKSELLINEN KYVYKKYYS"
+        },
+        {
+          "lang": "fr",
+          "value": "COMPÉTENCE ACADÉMIQUE"
+        },
+        {
+          "lang": "es",
+          "value": "APTITUD ACADÉMICA"
+        },
+        {
+          "lang": "no",
+          "value": "AKADEMISKE EVNER"
+        },
+        {
+          "lang": "sv",
+          "value": "AKADEMISK FÖRMÅGA"
+        },
+        {
+          "lang": "da",
+          "value": "AKADEMISK EVNE"
+        },
+        {
+          "lang": "de",
+          "value": "AKADEMISCHE FÄHIGKEITEN"
+        },
+        {
+          "lang": "lt",
+          "value": "AKADEMINIAI GEBĖJIMAI"
+        },
+        {
+          "lang": "nl",
+          "value": "ACADEMISCHE VAARDIGHEDEN"
+        },
+        {
+          "lang": "en",
+          "value": "ACADEMIC ABILITY"
+        },
+        {
+          "lang": "ro",
+          "value": "ABILITATE ACADEMICĂ"
+        }
+      ],
+      "related": [
+        {
+          "uri": "https://elsst.cessda.eu/id/4/b1ab6f66-f3ed-42ec-9af5-2a896bdf119f"
+        },
+        {
+          "uri": "https://elsst.cessda.eu/id/4/ffdd3a7e-f82e-4600-98b1-20402e74b0a6"
+        },
+        {
+          "uri": "https://elsst.cessda.eu/id/4/269a8d84-0b08-4034-a79c-129072cc1992"
+        },
+        {
+          "uri": "https://elsst.cessda.eu/id/4/77ae3d1f-2134-429e-bc81-bfd0c20ddce2"
+        },
+        {
+          "uri": "https://elsst.cessda.eu/id/4/4e33f431-f8be-4e8c-b94b-67dcf5f834e1"
+        }
+      ]
+    },
+    {
+      "uri": "https://elsst.cessda.eu/id/4/ffdd3a7e-f82e-4600-98b1-20402e74b0a6",
+      "type": "skos:Concept",
+      "prefLabel": [
+        {
+          "lang": "el",
+          "value": "ΑΚΑΔΗΜΑÎĒΚΗ ΕΠΙΔΟÎŖΗ"
+        },
+        {
+          "lang": "cs",
+          "value": "VZDĚLÁVACÍ VÝSLEDKY"
+        },
+        {
+          "lang": "en",
+          "value": "ACADEMIC ACHIEVEMENT"
+        },
+        {
+          "lang": "nl",
+          "value": "ACADEMISCHE PRESTATIE"
+        },
+        {
+          "lang": "lt",
+          "value": "AKADEMINIAI PASIEKIMAI"
+        },
+        {
+          "lang": "da",
+          "value": "AKADEMISK PRÆSTATION"
+        },
+        {
+          "lang": "no",
+          "value": "AKADEMISKE PRESTASJON"
+        },
+        {
+          "lang": "sl",
+          "value": "AKADEMSKI DOSEÅŊEK"
+        },
+        {
+          "lang": "de",
+          "value": "BILDUNGSLEISTUNG"
+        },
+        {
+          "lang": "es",
+          "value": "LOGROS ACADÉMICOS"
+        },
+        {
+          "lang": "is",
+          "value": "NÁMSAFREK"
+        },
+        {
+          "lang": "fi",
+          "value": "OPINTOMENESTYS"
+        },
+        {
+          "lang": "ro",
+          "value": "REUȘITĂ ACADEMICĂ"
+        },
+        {
+          "lang": "fr",
+          "value": "RÉUSSITE SCOLAIRE"
+        },
+        {
+          "lang": "sv",
+          "value": "STUDIEPRESTATION"
+        },
+        {
+          "lang": "hu",
+          "value": "TUDOMÁNYOS TELJESÍTMÉNY"
+        }
+      ],
+      "related": {
+        "uri": "https://elsst.cessda.eu/id/4/bf0d664a-e89a-4ec3-80d2-04f664b359ab"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/researchInstrument.json b/src/test/resources/json/cvoc-dans-value/researchInstrument.json
new file mode 100644
index 00000000000..ecf48a97f18
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/researchInstrument.json
@@ -0,0 +1,57 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/TypeOfInstrument/1.1/",
+      "type": "skos:ConceptScheme",
+      "skos:notation": "TypeOfInstrument"
+    },
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/TypeOfInstrument/1.1/#Questionnaire",
+      "narrower": {
+        "uri": "http://rdf-vocabulary.ddialliance.org/cv/TypeOfInstrument/1.1/#Questionnaire.Semistructured"
+      }
+    },
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/TypeOfInstrument/1.1/#Questionnaire.Semistructured",
+      "type": "skos:Concept",
+      "skos:definition": {
+        "lang": "en",
+        "value": "Set of pre-determined questions, a significant proportion of which are open-ended (roughly one third to two thirds), and the rest are closed-ended."
+      },
+      "inScheme": {
+        "uri": "http://rdf-vocabulary.ddialliance.org/cv/TypeOfInstrument/1.1/"
+      },
+      "skos:notation": "Questionnaire.Semistructured",
+      "prefLabel": {
+        "lang": "en",
+        "value": "Semi-structured questionnaire"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/samplingProcedureCV.json b/src/test/resources/json/cvoc-dans-value/samplingProcedureCV.json
new file mode 100644
index 00000000000..dfb894a332c
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/samplingProcedureCV.json
@@ -0,0 +1,54 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/SamplingProcedure/1.1/",
+      "type": "skos:ConceptScheme",
+      "skos:hasTopConcept": {
+        "uri": "http://rdf-vocabulary.ddialliance.org/cv/SamplingProcedure/1.1/#MixedProbabilityNonprobability"
+      },
+      "skos:notation": "SamplingProcedure"
+    },
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/SamplingProcedure/1.1/#MixedProbabilityNonprobability",
+      "type": "skos:Concept",
+      "skos:definition": {
+        "lang": "en",
+        "value": "Sample design that combines probability and non-probability sampling within the same sampling process. Different types of sampling may be used at different stages of creating the sample. For example, for a sample of minority students in a city, schools are randomly selected in the first stage. Then, a quota sample of students is selected within each school in the second stage. If separate samples are drawn from the same target population using different sampling methods, the type of sampling procedure used for each sample should be classified separately."
+      },
+      "inScheme": {
+        "uri": "http://rdf-vocabulary.ddialliance.org/cv/SamplingProcedure/1.1/"
+      },
+      "skos:notation": "MixedProbabilityNonprobability",
+      "prefLabel": {
+        "lang": "en",
+        "value": "Mixed probability and non-probability"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/timeMethod.json b/src/test/resources/json/cvoc-dans-value/timeMethod.json
new file mode 100644
index 00000000000..785e5691ebb
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/timeMethod.json
@@ -0,0 +1,57 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/TimeMethod/1.2/",
+      "type": "skos:ConceptScheme",
+      "skos:notation": "TimeMethod"
+    },
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/TimeMethod/1.2/#TimeSeries",
+      "narrower": {
+        "uri": "http://rdf-vocabulary.ddialliance.org/cv/TimeMethod/1.2/#TimeSeries.Discrete"
+      }
+    },
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/TimeMethod/1.2/#TimeSeries.Discrete",
+      "type": "skos:Concept",
+      "skos:definition": {
+        "lang": "en",
+        "value": "Measurements are taken at (usually regularly) spaced intervals. Examples: macroeconomics (weekly share prices, monthly profits, sales); meteorology (hourly temperature); measurements of individuals (blood pressure, weight, height); sociology (crime figures, employment figures), etc."
+      },
+      "inScheme": {
+        "uri": "http://rdf-vocabulary.ddialliance.org/cv/TimeMethod/1.2/"
+      },
+      "skos:notation": "TimeSeries.Discrete",
+      "prefLabel": {
+        "lang": "en",
+        "value": "Time series: Discrete"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-dans-value/unitOfAnalysis.json b/src/test/resources/json/cvoc-dans-value/unitOfAnalysis.json
new file mode 100644
index 00000000000..cffb5d38c73
--- /dev/null
+++ b/src/test/resources/json/cvoc-dans-value/unitOfAnalysis.json
@@ -0,0 +1,54 @@
+{
+  "@context": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "isothes": "http://purl.org/iso25964/skos-thes#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "dct": "http://purl.org/dc/terms/",
+    "dc11": "http://purl.org/dc/elements/1.1/",
+    "uri": "@id",
+    "type": "@type",
+    "lang": "@language",
+    "value": "@value",
+    "graph": "@graph",
+    "label": "rdfs:label",
+    "prefLabel": "skos:prefLabel",
+    "altLabel": "skos:altLabel",
+    "hiddenLabel": "skos:hiddenLabel",
+    "broader": "skos:broader",
+    "narrower": "skos:narrower",
+    "related": "skos:related",
+    "inScheme": "skos:inScheme",
+    "exactMatch": "skos:exactMatch",
+    "closeMatch": "skos:closeMatch",
+    "broadMatch": "skos:broadMatch",
+    "narrowMatch": "skos:narrowMatch",
+    "relatedMatch": "skos:relatedMatch"
+  },
+  "graph": [
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/AnalysisUnit/2.1/",
+      "type": "skos:ConceptScheme",
+      "skos:hasTopConcept": {
+        "uri": "http://rdf-vocabulary.ddialliance.org/cv/AnalysisUnit/2.1/#EventOrProcessOrActivity"
+      },
+      "skos:notation": "AnalysisUnit"
+    },
+    {
+      "uri": "http://rdf-vocabulary.ddialliance.org/cv/AnalysisUnit/2.1/#EventOrProcessOrActivity",
+      "type": "skos:Concept",
+      "skos:definition": {
+        "lang": "en",
+        "value": "Any type of incident, occurrence, or activity. Events are usually one-time, individual occurrences, with a limited or short duration. Examples: criminal offenses, riots, meetings, elections, sports competitions, terrorist attacks, natural disasters like floods, etc. Processes typically take place over time, and may include multiple 'events' or gradual changes that ultimately lead, or are projected to lead, to a particular result. Examples: court trials, criminal investigations, political campaigns, medical treatments, education, athletes' training, etc. Use when the main focus is more on the event, process or activity itself. For example, a field observation study on slot machine gambling; or data collected on child abuse cases, such as the type and duration of abuse, the role of the persons involved, etc."
+      },
+      "inScheme": {
+        "uri": "http://rdf-vocabulary.ddialliance.org/cv/AnalysisUnit/2.1/"
+      },
+      "skos:notation": "EventOrProcessOrActivity",
+      "prefLabel": {
+        "lang": "en",
+        "value": "Event/Process/Activity"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/json/cvoc-orcid.json b/src/test/resources/json/cvoc-orcid.json
new file mode 100644
index 00000000000..6b904aefc3f
--- /dev/null
+++ b/src/test/resources/json/cvoc-orcid.json
@@ -0,0 +1,43 @@
+[
+    {
+        "field-name": "creator",
+        "term-uri-field": "creator",
+        "js-url": "https://gdcc.github.io/dataverse-external-vocab-support/scripts/people.js",
+        "protocol": "orcid",
+        "retrieval-uri": "https://pub.orcid.org/v3.0/{0}/person",
+        "allow-free-text": true,
+        "prefix": "https://orcid.org/",
+        "managed-fields": {},
+        "languages": "",
+        "vocabs": {
+            "orcid": {
+                "uriSpace": "https://orcid.org/"
+            }
+        },
+        "retrieval-filtering": {
+            "@context": {
+                "personName": "https://schema.org/name",
+                "scheme": "http://www.w3.org/2004/02/skos/core#inScheme"
+            },
+            "personName": {
+                "pattern": "{0}, {1}",
+                "params": [
+                    "/name/family-name/value",
+                    "/name/given-names/value"
+                ]
+            },
+            "@id": {
+                "pattern": "{0}",
+                "params": [
+                    "@id"
+                ]
+            },
+            "scheme": {
+                "pattern": "ORCID"
+            },
+            "@type": {
+                "pattern": "https://schema.org/Person"
+            }
+        }
+    }
+]
diff --git a/src/test/resources/json/cvoc-skosmos.json b/src/test/resources/json/cvoc-skosmos.json
new file mode 100644
index 00000000000..6d32b29f054
--- /dev/null
+++ b/src/test/resources/json/cvoc-skosmos.json
@@ -0,0 +1,69 @@
+[
+    {
+        "field-name": "keyword",
+        "term-uri-field": "keywordTermURL",
+        "cvoc-url": "https://demo.skosmos.org/",
+        "js-url": "https://github.com/gdcc/dataverse-external-vocab-support/blob/main/scripts/skosmos.js",
+        "protocol": "skosmos",
+        "retrieval-uri": "https://demo.skosmos.org/rest/v1/data?uri={0}",
+        "term-parent-uri": "",
+        "allow-free-text": true,
+        "languages": "en, fr",
+        "vocabs": {
+            "agrovoc": {
+                "vocabularyUri": "http://aims.fao.org/vest-registry/kos/agrovoc",
+                "uriSpace": "http://aims.fao.org/aos/agrovoc/"
+            }
+        },
+        "managed-fields": {
+            "vocabularyName": "keywordVocabulary",
+            "termName": "keywordValue",
+            "vocabularyUri": "keywordVocabularyURI"
+        },
+        "retrieval-filtering": {
+            "@context": {
+                "termName": "https://schema.org/name",
+                "vocabularyName": "https://dataverse.org/schema/vocabularyName",
+                "vocabularyUri": "https://dataverse.org/schema/vocabularyUri",
+                "lang": "@language",
+                "value": "@value"
+            },
+            "@id": {
+                "pattern": "{0}",
+                "params": [
+                    "@id"
+                ]
+            },
+            "termName": {
+                "pattern": "{0}",
+                "params": [
+                    "/graph/uri=@id/prefLabel"
+                ]
+            },
+            "vocabularyName": {
+                "pattern": "{0}",
+                "params": [
+                    "/graph/type=skos:ConceptScheme/prefLabel"
+                ]
+            },
+            "vocabularyUri": {
+                "pattern": "{0}",
+                "params": [
+                    "/graph/type=skos:ConceptScheme/uri"
+                ]
+            },
+            "synonyms": {
+                "pattern": "{0}",
+                "params": [
+                    "/graph/uri=@id/altLabel"
+                ]
+            },
+            "genericTerm": {
+                "pattern": "{0}",
+                "params": [
+                    "/graph/type=skos:Concept/prefLabel"
+                ]
+            }
+        }
+    }
+]
diff --git a/src/test/resources/json/dataset-finch1.json b/src/test/resources/json/dataset-finch1.json
index c8a7f429e6e..54ec8a3e383 100644
--- a/src/test/resources/json/dataset-finch1.json
+++ b/src/test/resources/json/dataset-finch1.json
@@ -64,8 +64,9 @@
             "typeName": "subject"
           }
         ],
-        "displayName": "Citation Metadata"
+        "displayName": "Citation Metadata",
+        "name":"citation"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/json/dataset-finch2.json b/src/test/resources/json/dataset-finch2.json
index d37438cc881..b214eacfa3c 100644
--- a/src/test/resources/json/dataset-finch2.json
+++ b/src/test/resources/json/dataset-finch2.json
@@ -100,6 +100,12 @@
                   "typeClass": "primitive",
                   "value": "KeywordTerm1"
                 },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
                 "keywordVocabulary": {
                   "typeName": "keywordVocabulary",
                   "multiple": false,
@@ -120,6 +126,12 @@
                   "typeClass": "primitive",
                   "value": "KeywordTerm2"
                 },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI2.org"
+                },
                 "keywordVocabulary": {
                   "typeName": "keywordVocabulary",
                   "multiple": false,
@@ -309,10 +321,12 @@
             ]
           }
         ],
-        "displayName": "Citation Metadata"
+        "displayName": "Citation Metadata",
+        "name": "citation"
       },
       "geospatial": {
         "displayName": "Geospatial Metadata",
+        "name": "geospatial",
         "fields": [
           {
             "typeName": "geographicCoverage",
diff --git a/src/test/resources/json/dataset-long-description.json b/src/test/resources/json/dataset-long-description.json
new file mode 100644
index 00000000000..4d5478b0f63
--- /dev/null
+++ b/src/test/resources/json/dataset-long-description.json
@@ -0,0 +1,374 @@
+{
+  "datasetVersion": {
+    "metadataBlocks": {
+      "citation": {
+        "fields": [
+          {
+            "value": "Darwin's Finches",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "title"
+          },
+          {
+            "value": [
+              {
+                "authorName": {
+                  "value": "Finch, Fiona",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorName"
+                },
+                "authorIdentifierScheme": {
+                  "typeName": "authorIdentifierScheme",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "ORCID"
+                },
+                "authorIdentifier": {
+                  "typeName": "authorIdentifier",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "0000-0002-1825-0097"
+                },
+                "authorAffiliation": {
+                  "value": "Birds Inc.",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorAffiliation"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "author"
+          },
+          {
+            "value": [
+              {
+                "datasetContactEmail": {
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "datasetContactEmail",
+                  "value": "finch@mailinator.com"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "datasetContact"
+          },
+          {
+            "value": [
+              {
+                "dsDescriptionValue": {
+                  "value": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In dui magna, posuere eget, vestibulum et, tempor auctor, justo. In ac felis quis tortor malesuada pretium. Pellentesque auctor neque nec urna. Proin sapien ipsum, porta a, auctor quis, euismod ut, mi. Aenean viverra rhoncus pede. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut non enim eleifend felis pretium feugiat. Vivamus quis mi. Phasellus a est. Phasellus magna. In hac habitasse platea dictumst. Curabitur at lacus ac velit ornare lobortis. Curabitur a felis in nunc fringilla tristique. Morbi mattis ullamcorper velit. Phasellus gravida semper nisi. Nullam vel sem. Pellentesque libero tortor, tincidunt et, tincidunt eget, semper nec, quam. Sed hendrerit. Morbi ac felis. Nunc egestas, augue at pellentesque laoreet, felis eros vehicula leo, at malesuada velit leo quis pede. Donec interdum, metus et hendrerit aliquet, dolor diam sagittis ligula, eget egestas libero turpis vel mi. Nunc nulla. Fusce risus nisl, viverra et, tempor et, pretium in, sapien. Donec venenatis vulputate lorem. Morbi nec metus. Phasellus blandit leo ut odio. Maecenas ullamcorper, dui et placerat feugiat, eros pede varius nisi, condimentum viverra felis nunc et lorem. Sed magna purus, fermentum eu, tincidunt eu, varius ut, felis. In auctor lobortis lacus. Quisque libero metus, condimentum nec, tempor a, commodo mollis, magna. Vestibulum ullamcorper mauris at ligul beyond 5000 chars",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "typeName": "dsDescriptionValue"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "dsDescription"
+          },
+          {
+            "value": [
+              "Medicine, Health and Life Sciences"
+            ],
+            "typeClass": "controlledVocabulary",
+            "multiple": true,
+            "typeName": "subject"
+          },
+          {
+            "typeName": "keyword",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordTerm1"
+                },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI1.org"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordVocabulary1"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://KeywordVocabularyURL1.org"
+                }
+              },
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordTerm2"
+                },
+                "keywordTermURI": {
+                  "typeName": "keywordTermURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://keywordTermURI2.org"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordVocabulary2"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://KeywordVocabularyURL2.org"
+                }
+              },
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "keywords, with, commas"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "topicClassification",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "topicClassValue": {
+                  "typeName": "topicClassValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "tcTerm1"
+                },
+                "topicClassVocab": {
+                  "typeName": "topicClassVocab",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "tcVocab1"
+                },
+                "topicClassVocabURI": {
+                  "typeName": "topicClassVocabURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://example.com/tcTerm1"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "contributor",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Data Collector"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Holmes, Sherlock"
+                }
+              },
+              {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Funder"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "National Science Foundation"
+                }
+                },
+                {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Data Collector"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Watson, John"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "grantNumber",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "grantNumberAgency": {
+                  "typeName": "grantNumberAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "National Institutes of Health"
+                },
+                "grantNumberValue": {
+                  "typeName": "grantNumberValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1245"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "publication",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "publicationCitation": {
+                  "typeName": "publicationCitation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Finch, Fiona 2018. \"The Finches.\" American Ornithological Journal 60 (4): 990-1005."
+                },
+                "publicationIDType": {
+                  "typeName": "publicationIDType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "doi"
+                },
+                "publicationIDNumber": {
+                  "typeName": "publicationIDNumber",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "10.5072/FK2/RV16HK"
+                },
+                "publicationURL": {
+                  "typeName": "publicationURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "https://doi.org/10.5072/FK2/RV16HK"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "timePeriodCovered",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "timePeriodCoveredStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "2002"
+                },
+                "timePeriodCoveredEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "2005"
+                }
+              },
+              {
+                "timePeriodCoveredStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "2001-10-01"
+                },
+                "timePeriodCoveredEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "2015-11-15"
+                }
+              }
+            ]
+          }
+        ],
+        "displayName": "Citation Metadata",
+        "name": "citation"
+      },
+      "geospatial": {
+        "displayName": "Geospatial Metadata",
+        "name": "geospatial",
+        "fields": [
+          {
+            "typeName": "geographicCoverage",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "city": {
+                  "typeName": "city",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Columbus"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Ohio"
+                },
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "United States"
+                },
+                "otherGeographicCoverage": {
+                  "typeName": "otherGeographicCoverage",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "North America"
+                }
+              },
+              {
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "United States"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Wisconsin"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/src/test/resources/json/export-formats.json b/src/test/resources/json/export-formats.json
new file mode 100644
index 00000000000..65fc746ee23
--- /dev/null
+++ b/src/test/resources/json/export-formats.json
@@ -0,0 +1,83 @@
+{
+  "status": "OK",
+  "data": {
+    "OAI_ORE": {
+      "displayName": "OAI_ORE",
+      "mediaType": "application/json",
+      "isHarvestable": false,
+      "isVisibleInUserInterface": true
+    },
+    "Datacite": {
+      "displayName": "DataCite",
+      "mediaType": "application/xml",
+      "isHarvestable": true,
+      "isVisibleInUserInterface": true,
+      "XMLNameSpace": "http://datacite.org/schema/kernel-4",
+      "XMLSchemaLocation": "http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.5/metadata.xsd",
+      "XMLSchemaVersion": "4.5"
+    },
+    "oai_dc": {
+      "displayName": "Dublin Core",
+      "mediaType": "application/xml",
+      "isHarvestable": true,
+      "isVisibleInUserInterface": false,
+      "XMLNameSpace": "http://www.openarchives.org/OAI/2.0/oai_dc/",
+      "XMLSchemaLocation": "http://www.openarchives.org/OAI/2.0/oai_dc.xsd",
+      "XMLSchemaVersion": "2.0"
+    },
+    "oai_datacite": {
+      "displayName": "OpenAIRE",
+      "mediaType": "application/xml",
+      "isHarvestable": true,
+      "isVisibleInUserInterface": true,
+      "XMLNameSpace": "http://datacite.org/schema/kernel-4",
+      "XMLSchemaLocation": "http://schema.datacite.org/meta/kernel-4.1/metadata.xsd",
+      "XMLSchemaVersion": "4.1"
+    },
+    "schema.org": {
+      "displayName": "Schema.org JSON-LD",
+      "mediaType": "application/ld+json",
+      "isHarvestable": false,
+      "isVisibleInUserInterface": true
+    },
+    "ddi": {
+      "displayName": "DDI Codebook v2",
+      "mediaType": "application/xml",
+      "isHarvestable": false,
+      "isVisibleInUserInterface": true,
+      "XMLNameSpace": "ddi:codebook:2_5",
+      "XMLSchemaLocation": "https://ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd",
+      "XMLSchemaVersion": "2.5"
+    },
+    "dcterms": {
+      "displayName": "Dublin Core",
+      "mediaType": "application/xml",
+      "isHarvestable": false,
+      "isVisibleInUserInterface": true,
+      "XMLNameSpace": "http://purl.org/dc/terms/",
+      "XMLSchemaLocation": "http://dublincore.org/schemas/xmls/qdc/dcterms.xsd",
+      "XMLSchemaVersion": "2.0"
+    },
+    "html": {
+      "displayName": "DDI HTML Codebook",
+      "mediaType": "text/html",
+      "isHarvestable": false,
+      "isVisibleInUserInterface": true
+    },
+    "dataverse_json": {
+      "displayName": "JSON",
+      "mediaType": "application/json",
+      "isHarvestable": true,
+      "isVisibleInUserInterface": true
+    },
+    "oai_ddi": {
+      "displayName": "DDI Codebook v2",
+      "mediaType": "application/xml",
+      "isHarvestable": true,
+      "isVisibleInUserInterface": false,
+      "XMLNameSpace": "ddi:codebook:2_5",
+      "XMLSchemaLocation": "https://ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd",
+      "XMLSchemaVersion": "2.5"
+    }
+  }
+}
diff --git a/src/test/resources/json/importGenericWithOtherId.json b/src/test/resources/json/importGenericWithOtherId.json
new file mode 100644
index 00000000000..af9241393e9
--- /dev/null
+++ b/src/test/resources/json/importGenericWithOtherId.json
@@ -0,0 +1,307 @@
+{
+            "UNF": "UNF",
+            "createTime": "2014-11-12 12:17:55 -05",
+            "distributionDate": "Distribution Date",
+            "id": 2,
+            "lastUpdateTime": "2014-11-12 12:20:32 -05",
+            "metadataBlocks": {
+                "astrophysics": {
+                    "displayName": "Astronomy and Astrophysics Metadata",
+                    "fields": [
+                        {
+                            "multiple": true,
+                            "typeClass": "controlledVocabulary",
+                            "typeName": "astroType",
+                            "value": [
+                                "Image",
+                                "Mosaic",
+                                "EventList"
+                            ]
+                        }
+                    ]
+                },
+                "citation": {
+                    "displayName": "Citation Metadata",
+                    "fields": [
+                        {
+                            "multiple": false,
+                            "typeClass": "primitive",
+                            "typeName": "title",
+                            "value": "My Dataset"
+                        },
+                        {
+                            "multiple": true,
+                            "typeClass": "compound",
+                            "typeName": "author",
+                            "value": [
+                                {
+                                    "authorAffiliation": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorAffiliation",
+                                        "value": "Top"
+                                    },
+                                    "authorIdentifier": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorIdentifier",
+                                        "value": "ellenid"
+                                    },
+                                    "authorIdentifierScheme": {
+                                        "multiple": false,
+                                        "typeClass": "controlledVocabulary",
+                                        "typeName": "authorIdentifierScheme",
+                                        "value": "ORCID"
+                                    },
+                                    "authorName": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorName",
+                                        "value": "Privileged, Pete"
+                                    }
+                                },
+  				{
+                                    "authorAffiliation": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorAffiliation",
+                                        "value": "Bottom"
+                                    },
+                                    "authorIdentifier": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorIdentifier",
+                                        "value": "audreyId"
+                                    },
+                                    "authorIdentifierScheme": {
+                                        "multiple": false,
+                                        "typeClass": "controlledVocabulary",
+                                        "typeName": "authorIdentifierScheme",
+                                        "value": "DAISY"
+                                    },
+                                    "authorName": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorName",
+                                        "value": "Awesome, Audrey"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "multiple": true,
+                            "typeClass": "primitive",
+                            "typeName": "datasetContact",
+                            "value": [
+                                "pete@malinator.com"
+                            ]
+                        },
+                        {
+                            "multiple": false,
+                            "typeClass": "primitive",
+                            "typeName": "dsDescription",
+                            "value": "Here is my description"
+                        },
+                        {
+                            "multiple": true,
+                            "typeClass": "controlledVocabulary",
+                            "typeName": "subject",
+                            "value": [
+                                "Arts and Humanities",
+                                "Astronomy and Astrophysics",
+                                "Business and Management"
+                            ]
+                        },
+                        {
+                            "multiple": true,
+                            "typeClass": "primitive",
+                            "typeName": "keyword",
+                            "value": [
+                                "keyword1",
+                                "keyword2"
+                            ]
+                        },
+                        {
+                            "multiple": true,
+                            "typeClass": "compound",
+                            "typeName": "otherId",
+                            "value": [
+                                {
+                                    "otherIdAgency": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "otherIdAgency",
+                                        "value": "my agency"
+                                    },
+                                    "otherIdValue": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "otherIdValue",
+                                        "value": "otherId"
+                                    }
+                                },
+                                {
+                                    "otherIdAgency": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "otherIdAgency",
+                                        "value": "another agency"
+                                    },
+                                    "otherIdValue": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "otherIdValue",
+                                        "value": "otherId2"
+                                    }
+                                },
+                                {
+                                    "otherIdAgency": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "otherIdAgency",
+                                        "value": "another agency"
+                                    },
+                                    "otherIdValue": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "otherIdValue",
+                                        "value": "doi:10.7910/DVN/TJCLKP"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "multiple": false,
+                            "typeClass": "primitive",
+                            "typeName": "depositor",
+                            "value": "Ellen K"
+                        },
+                        {
+                            "multiple": false,
+                            "typeClass": "primitive",
+                            "typeName": "dateOfDeposit",
+                            "value": "2014-11-12"
+                        }
+                    ]
+                },
+                "geospatial": {
+                    "displayName": "Geospatial Metadata",
+                    "fields": [
+                        {
+                            "multiple": true,
+                            "typeClass": "compound",
+                            "typeName": "geographicCoverage",
+                            "value": [
+                                {
+                                    "city": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "city",
+                                        "value": "Arlington"
+                                    },
+                                    "country": {
+                                        "multiple": false,
+                                        "typeClass": "controlledVocabulary",
+                                        "typeName": "country",
+                                        "value": "United States"
+                                    },
+                                    "state": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "state",
+                                        "value": "MA"
+                                    }
+                                },
+                                {
+                                    "city": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "city",
+                                        "value": "beachcity"
+                                    },
+                                    "country": {
+                                        "multiple": false,
+                                        "typeClass": "controlledVocabulary",
+                                        "typeName": "country",
+                                        "value": "Aruba"
+                                    },
+                                    "state": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "state",
+                                        "value": "beach"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "multiple": false,
+                            "typeClass": "compound",
+                            "typeName": "geographicBoundingBox",
+                            "value": 
+                                {
+                                    "eastLongitude": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "eastLongitude",
+                                        "value": "23"
+                                    },
+                                    "northLatitude": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "northLatitude",
+                                        "value": "786"
+                                    },
+                                    "southLatitude": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "southLatitude",
+                                        "value": "34"
+                                    },
+                                    "westLongitude": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "westLongitude",
+                                        "value": "45"
+                                    }
+                                }
+                            
+                        }
+                    ]
+                },
+                "socialscience": {
+                    "displayName": "Social Science and Humanities Metadata",
+                    "fields": [
+                        {
+                            "multiple": true,
+                            "typeClass": "compound",
+                            "typeName": "software",
+                            "value": [
+                                {
+                                    "softwareName": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "softwareName",
+                                        "value": "softwareName"
+                                    },
+                                    "softwareVersion": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "softwareVersion",
+                                        "value": "software version"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "multiple": false,
+                            "typeClass": "primitive",
+                            "typeName": "unitOfAnalysis",
+                            "value": "unit of analysis"
+                        }
+                    ]
+                }
+            },
+            "productionDate": "Production Date",
+            "versionState": "DRAFT"
+        }
diff --git a/src/test/resources/json/importGenericWithoutOtherId.json b/src/test/resources/json/importGenericWithoutOtherId.json
new file mode 100644
index 00000000000..ceb2263c2cf
--- /dev/null
+++ b/src/test/resources/json/importGenericWithoutOtherId.json
@@ -0,0 +1,258 @@
+{
+            "UNF": "UNF",
+            "createTime": "2014-11-12 12:17:55 -05",
+            "distributionDate": "Distribution Date",
+            "id": 2,
+            "lastUpdateTime": "2014-11-12 12:20:32 -05",
+            "metadataBlocks": {
+                "astrophysics": {
+                    "displayName": "Astronomy and Astrophysics Metadata",
+                    "fields": [
+                        {
+                            "multiple": true,
+                            "typeClass": "controlledVocabulary",
+                            "typeName": "astroType",
+                            "value": [
+                                "Image",
+                                "Mosaic",
+                                "EventList"
+                            ]
+                        }
+                    ]
+                },
+                "citation": {
+                    "displayName": "Citation Metadata",
+                    "fields": [
+                        {
+                            "multiple": false,
+                            "typeClass": "primitive",
+                            "typeName": "title",
+                            "value": "My Dataset"
+                        },
+                        {
+                            "multiple": true,
+                            "typeClass": "compound",
+                            "typeName": "author",
+                            "value": [
+                                {
+                                    "authorAffiliation": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorAffiliation",
+                                        "value": "Top"
+                                    },
+                                    "authorIdentifier": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorIdentifier",
+                                        "value": "ellenid"
+                                    },
+                                    "authorIdentifierScheme": {
+                                        "multiple": false,
+                                        "typeClass": "controlledVocabulary",
+                                        "typeName": "authorIdentifierScheme",
+                                        "value": "ORCID"
+                                    },
+                                    "authorName": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorName",
+                                        "value": "Privileged, Pete"
+                                    }
+                                },
+  				{
+                                    "authorAffiliation": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorAffiliation",
+                                        "value": "Bottom"
+                                    },
+                                    "authorIdentifier": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorIdentifier",
+                                        "value": "audreyId"
+                                    },
+                                    "authorIdentifierScheme": {
+                                        "multiple": false,
+                                        "typeClass": "controlledVocabulary",
+                                        "typeName": "authorIdentifierScheme",
+                                        "value": "DAISY"
+                                    },
+                                    "authorName": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "authorName",
+                                        "value": "Awesome, Audrey"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "multiple": true,
+                            "typeClass": "primitive",
+                            "typeName": "datasetContact",
+                            "value": [
+                                "pete@malinator.com"
+                            ]
+                        },
+                        {
+                            "multiple": false,
+                            "typeClass": "primitive",
+                            "typeName": "dsDescription",
+                            "value": "Here is my description"
+                        },
+                        {
+                            "multiple": true,
+                            "typeClass": "controlledVocabulary",
+                            "typeName": "subject",
+                            "value": [
+                                "Arts and Humanities",
+                                "Astronomy and Astrophysics",
+                                "Business and Management"
+                            ]
+                        },
+                        {
+                            "multiple": true,
+                            "typeClass": "primitive",
+                            "typeName": "keyword",
+                            "value": [
+                                "keyword1",
+                                "keyword2"
+                            ]
+                        },
+                        {
+                            "multiple": false,
+                            "typeClass": "primitive",
+                            "typeName": "depositor",
+                            "value": "Ellen K"
+                        },
+                        {
+                            "multiple": false,
+                            "typeClass": "primitive",
+                            "typeName": "dateOfDeposit",
+                            "value": "2014-11-12"
+                        }
+                    ]
+                },
+                "geospatial": {
+                    "displayName": "Geospatial Metadata",
+                    "fields": [
+                        {
+                            "multiple": true,
+                            "typeClass": "compound",
+                            "typeName": "geographicCoverage",
+                            "value": [
+                                {
+                                    "city": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "city",
+                                        "value": "Arlington"
+                                    },
+                                    "country": {
+                                        "multiple": false,
+                                        "typeClass": "controlledVocabulary",
+                                        "typeName": "country",
+                                        "value": "United States"
+                                    },
+                                    "state": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "state",
+                                        "value": "MA"
+                                    }
+                                },
+                                {
+                                    "city": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "city",
+                                        "value": "beachcity"
+                                    },
+                                    "country": {
+                                        "multiple": false,
+                                        "typeClass": "controlledVocabulary",
+                                        "typeName": "country",
+                                        "value": "Aruba"
+                                    },
+                                    "state": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "state",
+                                        "value": "beach"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "multiple": false,
+                            "typeClass": "compound",
+                            "typeName": "geographicBoundingBox",
+                            "value": 
+                                {
+                                    "eastLongitude": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "eastLongitude",
+                                        "value": "23"
+                                    },
+                                    "northLatitude": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "northLatitude",
+                                        "value": "786"
+                                    },
+                                    "southLatitude": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "southLatitude",
+                                        "value": "34"
+                                    },
+                                    "westLongitude": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "westLongitude",
+                                        "value": "45"
+                                    }
+                                }
+                            
+                        }
+                    ]
+                },
+                "socialscience": {
+                    "displayName": "Social Science and Humanities Metadata",
+                    "fields": [
+                        {
+                            "multiple": true,
+                            "typeClass": "compound",
+                            "typeName": "software",
+                            "value": [
+                                {
+                                    "softwareName": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "softwareName",
+                                        "value": "softwareName"
+                                    },
+                                    "softwareVersion": {
+                                        "multiple": false,
+                                        "typeClass": "primitive",
+                                        "typeName": "softwareVersion",
+                                        "value": "software version"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "multiple": false,
+                            "typeClass": "primitive",
+                            "typeName": "unitOfAnalysis",
+                            "value": "unit of analysis"
+                        }
+                    ]
+                }
+            },
+            "productionDate": "Production Date",
+            "versionState": "DRAFT"
+        }
diff --git a/src/test/resources/json/license.json b/src/test/resources/json/license.json
new file mode 100644
index 00000000000..9267510edfc
--- /dev/null
+++ b/src/test/resources/json/license.json
@@ -0,0 +1,12 @@
+{
+  "name": "Test License",
+  "uri": "http://dataverse..org/licenses/test/1.0",
+  "iconUrl": "http://dataverse.org/licenses/test/1.0/icon.png",
+  "shortDescription": "Dataverse Test License v1.0.",
+  "active": false,
+  "sortOrder": 1000,
+  "rightsIdentifier": "DV-Test",
+  "rightsIdentifierScheme": "SPDX",
+  "schemeUri": "https://spdx.org/licenses/",
+  "languageCode": "en"
+}
diff --git a/src/test/resources/json/licenseError.json b/src/test/resources/json/licenseError.json
new file mode 100644
index 00000000000..533aa7ce7dc
--- /dev/null
+++ b/src/test/resources/json/licenseError.json
@@ -0,0 +1,9 @@
+{
+  "id": 6,
+  "name": "License Number 6",
+  "uri": "http://dataverse..org/licenses/test/ln6",
+  "iconUrl": "http://dataverse.org/licenses/test/ln6/icon.png",
+  "shortDescription": "A License that must have id 6.",
+  "active": true,
+  "sortOrder": 1
+}
diff --git a/src/test/resources/json/update-dataset-version-with-files.json b/src/test/resources/json/update-dataset-version-with-files.json
new file mode 100644
index 00000000000..5701008a14d
--- /dev/null
+++ b/src/test/resources/json/update-dataset-version-with-files.json
@@ -0,0 +1,129 @@
+{
+  "metadataBlocks": {
+    "citation": {
+      "displayName": "Citation Metadata",
+      "fields": [
+        {
+          "typeName": "title",
+          "multiple": false,
+          "typeClass": "primitive",
+          "value": "Update Version with Files"
+        },
+        {
+          "typeName": "author",
+          "multiple": true,
+          "typeClass": "compound",
+          "value": [
+            {
+              "authorName": {
+                "typeName": "authorName",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "Spruce, Sabrina"
+              }
+            }
+          ]
+        },
+        {
+          "typeName": "datasetContact",
+          "multiple": true,
+          "typeClass": "compound",
+          "value": [
+            {
+              "datasetContactName": {
+                "typeName": "datasetContactName",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "Spruce, Sabrina"
+              },
+              "datasetContactEmail": {
+                "typeName": "datasetContactEmail",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "spruce@mailinator.com"
+              }
+            }
+          ]
+        },
+        {
+          "typeName": "dsDescription",
+          "multiple": true,
+          "typeClass": "compound",
+          "value": [
+            {
+              "dsDescriptionValue": {
+                "typeName": "dsDescriptionValue",
+                "multiple": false,
+                "typeClass": "primitive",
+                "value": "test"
+              }
+            }
+          ]
+        },
+        {
+          "typeName": "subject",
+          "multiple": true,
+          "typeClass": "controlledVocabulary",
+          "value": [
+            "Other"
+          ]
+        },
+        {
+          "typeName": "depositor",
+          "multiple": false,
+          "typeClass": "primitive",
+          "value": "Spruce, Sabrina"
+        },
+        {
+          "typeName": "dateOfDeposit",
+          "multiple": false,
+          "typeClass": "primitive",
+          "value": "2017-04-19"
+        }
+      ]
+    }
+  },
+        "files": [
+        {
+          "description": "",
+          "label": "yn152_4_001.img",
+          "directoryLabel": "data/subdir1",
+          "version": 1,
+          "datasetVersionId": 2,
+          "dataFile": {
+            "id": 424,
+            "filename": "yn152_4_001.img",
+            "contentType": "application/octet-stream",
+            "storageIdentifier": "data/subdir/yn152_4_001.img",
+            "originalFormatLabel": "UNKNOWN",
+            "checksum": {
+              "type": "MD5",
+              "value": "fc4ac06da6fd84785ed1b79cab9b714a73621ac7"
+            },
+            "description": ""
+          }
+        },
+        {
+          "description": "",
+          "label": "yn152_4_002.img",
+          "directoryLabel": "data/subdir2",
+          "version": 1,
+          "datasetVersionId": 2,
+          "categories": ["Data"],
+          "dataFile": {
+            "id": 425,
+            "filename": "yn152_4_002.img",
+            "contentType": "application/octet-stream",
+            "storageIdentifier": "data/subdir/yn152_4_002.img",
+            "originalFormatLabel": "UNKNOWN",
+            "checksum": {
+              "type": "MD5",
+              "value": "756c1963e34eb6dd8bb5b48333c4f20ce64a0307"
+            },
+            "description": ""
+          }
+        }
+      ]
+}
+
+
diff --git a/src/test/resources/mail/cert.pem b/src/test/resources/mail/cert.pem
new file mode 100644
index 00000000000..ec0c90dd00d
--- /dev/null
+++ b/src/test/resources/mail/cert.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID/TCCAuWgAwIBAgIUC7cfckUO6xQIPkK7nahzmjfOvhIwDQYJKoZIhvcNAQEN
+BQAwgaYxCzAJBgNVBAYTAkRWMRowGAYDVQQIExFEYXRhdmVyc2UgQ291bnRyeTEX
+MBUGA1UEBxMORGF0YXZlcnNlIENpdHkxDTALBgNVBAoTBEdEQ0MxGzAZBgNVBAsT
+ElRlc3RpbmcgRGVwYXJ0bWVudDESMBAGA1UEAxMJbG9jYWxob3N0MSIwIAYJKoZI
+hvcNAQkBFhN0ZXN0aW5nQGV4YW1wbGUub3JnMB4XDTI1MDMwNzIzMDE0NFoXDTM1
+MDMwNTIzMDE0NFowgaYxCzAJBgNVBAYTAkRWMRowGAYDVQQIExFEYXRhdmVyc2Ug
+Q291bnRyeTEXMBUGA1UEBxMORGF0YXZlcnNlIENpdHkxDTALBgNVBAoTBEdEQ0Mx
+GzAZBgNVBAsTElRlc3RpbmcgRGVwYXJ0bWVudDESMBAGA1UEAxMJbG9jYWxob3N0
+MSIwIAYJKoZIhvcNAQkBFhN0ZXN0aW5nQGV4YW1wbGUub3JnMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw46TVGACGtJYbj9r8v4hpLc+mqWM70uKqi7F
+Stzj1lUFFw5efFM4Vam4doN8dWzaocAyL3tfHZKnOxFRKd5hGf23y26sRdylYeLq
+gMa6yj+M8luHQb7Jp9KoPQJZQJnRy+X0TCECya9YiWrlAMhL3pGkbzOmPCb9/FuX
+C2Iq6UCt9vAoAqyUEyreXhwkE2Kf9vZXp9OX1dZlLoWoIg0VUYP8Lnk5Td6QMThE
+wTPIrx5d1Q/BxtaJZA5qVXfmPFD/Agdx/GeXXR3wv4zhwQuK5/ChGroCUY/A7jEG
+ht8QaF2TG7SESGy3GDTxLSJRTBwdWvcQu+VlyqUDvFg9X5i9DwIDAQABoyEwHzAd
+BgNVHQ4EFgQUlv9ozFLc+NCrK4bgh2tyx2+cu9MwDQYJKoZIhvcNAQENBQADggEB
+AJUmJ1yQjISnqwqGfHWAQMsfZZ1KWKvR7wVe3Qlr2s8EY/G7CqmvljEPw6j0CjhN
+JfG0l27qqvfNnVjRNNIc4h68DcfM+qP2WbYmFF5RUT+qSoKTCbUEUzWBd/2DhwBD
+SrKPTmA5MpSvJLsOE4aw7hy5HkJZNNWYUph2ifs+yT7LicPqM1i0Y+nEVVccD+76
+l4D3z74X1C6mzr9u/c1HjlvOTBQYPz/edKQ+BcUfhU2GlSbr0kH8qqmMrXtA5ohO
+RN0TaFIYcqxPJdvwYyDa/p9Gf5VNAE3WCgkrAH5/QbL3qQ3E2+v9N0Ljdte1gkv7
+XrneaADE2d10oFFdozRO3fY=
+-----END CERTIFICATE-----
diff --git a/src/test/resources/mail/key.pem b/src/test/resources/mail/key.pem
new file mode 100644
index 00000000000..2f3791a188e
--- /dev/null
+++ b/src/test/resources/mail/key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEugIBADANBgkqhkiG9w0BAQEFAASCBKQwggSgAgEAAoIBAQDDjpNUYAIa0lhu
+P2vy/iGktz6apYzvS4qqLsVK3OPWVQUXDl58UzhVqbh2g3x1bNqhwDIve18dkqc7
+EVEp3mEZ/bfLbqxF3KVh4uqAxrrKP4zyW4dBvsmn0qg9AllAmdHL5fRMIQLJr1iJ
+auUAyEvekaRvM6Y8Jv38W5cLYirpQK328CgCrJQTKt5eHCQTYp/29len05fV1mUu
+hagiDRVRg/wueTlN3pAxOETBM8ivHl3VD8HG1olkDmpVd+Y8UP8CB3H8Z5ddHfC/
+jOHBC4rn8KEaugJRj8DuMQaG3xBoXZMbtIRIbLcYNPEtIlFMHB1a9xC75WXKpQO8
+WD1fmL0PAgMBAAECgf97qOIaOZ81s9r4Z+n5KNUGMm+coOSpSJn5K6DcgPnAklKB
+Gf9mdtW3wA+Boq26pA2wsrdZQd+1LWfsMUz2fKj3vJODUzzpTaQ2WTbm5LAiMR4y
+RKSm5Gwh3seA1tN4YBWM6sIzxYeQDx+aXuoaX1xbcmp4HGmRLwmvdtRZL+W22AMv
+9XKg2/xbzd2qa2orTSCE5Fi6Md0yo00om+g7nmyMS2bugGD2GhKsN257H+B8KW/F
+1zHSEQTztvYf7gYUoTXYOzymZiRgyk/sHtWfyYxZTsv6eeRSlrAr3JZ773Bh1vHT
+ir6GtaONAUI5YoiDnk5BXT7e/ZfTkkGI9lKT5WkCgYEA8kpC6EFHPn9NJfU96kpz
+Ic1+mCbyvAMfaGYfkok56b3+SR7sY7sBTAhRJ6KQc0gqqfRW7sg108maWY1woo1I
+dfwtJD4dfOQt0BFSAws2TXSsibSVaPpcczq+e/TXjdJghOX7cNtJEcUK/Of4UQAY
+OUsBJ3FDVkwapWfFoeUQwyUCgYEAzp9aMoZmG9nnDx2EL3KdGbBjwGSay1OoDDMc
+C5lJdE17jPnEwor6UE4HViNIgV/TZdtAfB9xzvVcumM3rtUAKxLPyGAgL8CuA6np
+IAM9ynNpV46vBYBWSEn6+62a/QAy+81xxWDw8dN9swep0esqvsf28m2lSlDE+bFY
+PTMgIyMCgYAF7hNdI9veh7cXqrztMw1GUoU6rBlcyKbII1e6emlUczX6DCu09Sq+
+9aUm1y+54pZIupY2GehXWqPQdUnAcLzJRnbEYFDQcbU9Vm8va+LUWnqulCDkBNym
+ZVWsKv3rlq6OEiLpTDSpnqz6K6NEOEBfhppsoLUJM6ujSLrpj3WtkQKBgCc/q+GH
+GCRYOwTrBW4B5oe3susb8S+IX5aZqs0lPAfEpCB+XXra7XuNpuUc5Kv2qPBjOpeZ
+XYQDpa6eJDioq1SDSUb1w4duoV9+yhLTqswnKi6Aowx3eWxX6T4flx5SCF0+hEsL
+BBnbo7f7T63ZbxA4addZLpm0SAZqQqm1aXhjAoGAGv0HkRqxznz4RVnNbOJO1jMl
+zYsKbXJVLsz9z4AdBcr0gagibFXHBRNL80M9JXZl+DUiz9s8weOysVqkl7Xs6qgc
+EPJCwZqWMe2pV6Z60e3wGJWbc5TEZaE/T7ARjmjjVWQDfwoxpqhOKMkXuMWKkBw/
+dHpyiIU4c3eal6b11mo=
+-----END PRIVATE KEY-----
diff --git a/src/test/resources/mail/openssl.cnf b/src/test/resources/mail/openssl.cnf
new file mode 100644
index 00000000000..8b94ed486c0
--- /dev/null
+++ b/src/test/resources/mail/openssl.cnf
@@ -0,0 +1,25 @@
+[ req ]
+default_bits       = 2048
+default_md         = sha512
+prompt             = no
+encrypt_key        = no
+
+distinguished_name = req_distinguished_name
+string_mask = nombstr
+
+# The extensions to add to a certificate request
+req_extensions = v3_req
+
+# FZJ (+IEK-4) default options for certificate request
+[ req_distinguished_name ]
+countryName            = DV
+stateOrProvinceName    = Dataverse Country
+localityName           = Dataverse City
+organizationName       = GDCC
+organizationalUnitName = Testing Department
+commonName             = localhost
+emailAddress           = testing@example.org
+
+[ v3_req ]
+# You can add more names by adding (repetitive) ", DNS:<name>" entries to this config key
+subjectAltName = DNS:localhost
diff --git a/src/test/resources/netcdf/ICOADS_R3.0.0_1662-10.nc b/src/test/resources/netcdf/ICOADS_R3.0.0_1662-10.nc
new file mode 100644
index 00000000000..30117b7b455
Binary files /dev/null and b/src/test/resources/netcdf/ICOADS_R3.0.0_1662-10.nc differ
diff --git a/src/test/resources/netcdf/madis-raob b/src/test/resources/netcdf/madis-raob
new file mode 100644
index 00000000000..d0cae0d077d
Binary files /dev/null and b/src/test/resources/netcdf/madis-raob differ
diff --git a/src/test/resources/oai-ore.jsonld b/src/test/resources/oai-ore.jsonld
deleted file mode 100644
index 063241a1054..00000000000
--- a/src/test/resources/oai-ore.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-{"dcterms:modified":"2018-09-26","dcterms:creator":"Qualitative Data Repository","@type":"ore:ResourceMap","@id":"https://dv.dev-aws.qdr.org/api/datasets/export?exporter=OAI_ORE&persistentId=doi:10.5072/FK2HYIXMY","ore:describes":{"citation:Contact":{"datasetContact:Name":"Myers, Jim","datasetContact:Affiliation":"QDR","datasetContact:E-mail":"qqmyers@hotmail.com"},"citation:Description":{"dsDescription:Text":"This is a sample dataset with a few files and lots of metadata designed to show how QDR's OAI-ORE and BagIT capabilities work.\r\nThe metadata is solely for demonstration purposes and does not accurately describe the content!","dsDescription:NoLongerUsedDate":"2018-05-22"},"citation:Keywords":[{"keyword:Term":"preservation"},{"keyword:Term":"documentation"}],"Creator":{"author:Name":"Myers, Jim","Identifier Scheme":"ORCID","ORCID":"https://orcid.org/0000-0001-8462-650X"},"Related Publication":{"Citation":" J. Myers, M. Hedstrom, D. Akmon, S. Payette, B. A. Plale, I. Kouper, S. McCaulay, R. McDonald, I. Suriarachchi, A. Varadharaju et al., \"Towards sustainable curation and preservation: The sead project's data services approach\", e-Science (e-Science) 2015 IEEE 11th International Conference on. IEEE, pp. 485-494, 2015.","Identifier Type":"doi","Identifier":"doi:10.1109/eScience.2015.56","URL":"https://doi.org/10.1109/eScience.2015.56"},"Time Period Covered":{"timePeriodCovered:Start":"2018-05-01","timePeriodCovered:End":"2018-05-22"},"citation:Notes":"QDR has adapted some of the OAI-ORE and BagIT conventions from SEAD and DataOne.","Subject":"Computer and Information Science","Title":"OAI-ORE and BagIt demonstration","citation:Depositor":"Myers, Jim","Deposit Date":"2018-05-22","citation:Series":{"series:Name":"Use of Standards in the Social Sciences"},"Grant Information":{"grantNumber:Grant Agency":"NSF","grantNumber:Grant Number":"1424191 "},"Software":{"software:Name":"Chrome","software:Version":"current"},"citation:Distributor":{"distributor:Name":"Qualitative Data Repository","distributor:Affiliation":"Syracuse University","distributor:Abbreviation":"QDR","distributor:URL":"https://qdr.syr.edu"},"citation:Producer":{"producer:Name":"Bagore, Locoai"},"Geographic Bounding Box":{"geographicBoundingBox:West Longitude":"0","geographicBoundingBox:East Longitude":"100","geographicBoundingBox:North Latitude":"50","geographicBoundingBox:South Latitude":"150"},"citation:QDRID":{"otherId:QDRID":"-00000001"},"Geographic Coverage":{"geographicCoverage:Country / Nation":"Åland Islands"},"Contributor":{"contributor:Type":"Data Curator","contributor:Name":"Myers, Jim"},"citation:Production Place":"Albany, NY","citation:Related Material":"This data publication is archived as a single Zip file, formatted according to the BagIT specification (https://tools.ietf.org/html/draft-kunze-bagit-11), with metadata documented according to the Open Archives Initiative Object Reuse and Exchange (ORE, https://www.openarchives.org/ore/) specification (serialized as JSON-LD (http://www.openarchives.org/ore/0.9/jsonld), integrated with BagIT according to the convention (http://jenkins-1.dataone.org/documentation/unstable/API-Documentation-development/design/DataPackage.html#package-serialization-using-bagit) developed within the DataOne project.)","Language":"Nuosu","citation:NoLongerUsedSubtitle":"Preservation of DV content","Type of Data Project":"example","Data Sources":"QDR Website","citation:Characteristic of Sources Noted":"teaching materials","Related Data Projects":"Dataverse","Alternative Title":"How to pack your Bags","Alternative URL":"https://unavailable.org/1234","citation:Production Date":"2018-05-23","@id":"doi:10.5072/FK2HYIXMY","@type":["ore:Aggregation","schema:Dataset"],"schema:version":"1.0","schema:datePublished":"2018-05-22","schema:name":"OAI-ORE and BagIt demonstration","schema:dateModified":"Tue May 22 13:51:34 UTC 2018","schema:license":"https://creativecommons.org/publicdomain/zero/1.0/","dvcore:confidentialityDeclaration":"These materials are not confidential.","dvcore:citationRequirements":"Please cite https://github.com/QualitativeDataRepository/dataverse/wiki/Data-and-Metadata-Packaging-for-Archiving .","dvcore:conditions":"Only on Tuesdays.","dvcore:disclaimer":"Caveat browser.","dvcore:fileTermsOfAccess":{"dvcore:termsOfAccess":"Broadly available.","dvcore:fileRequestAccess":false,"dvcore:originalArchive":"qdr.syr.edu","dvcore:availabilityStatus":"posted on 05-22-2018","dvcore:sizeOfCollection":"small"},"schema:includedInDataCatalog":"QDR Main Collection","ore:aggregates":[{"schema:description":"Available at qdr.syr.edu","schema:name":"Handout 1 (Management Intervention).pdf","dvcore:restricted":false,"dvcore:directoryLabel":"Handouts","schema:version":2,"dvcore:datasetVersionId":55,"dvcore:categories":["Documentation"],"@id":"doi:10.5072/FK2HYIXMY/ABZMQI","schema:sameAs":"https://dv.dev-aws.qdr.org/api/access/datafile/:persistentId?persistentId=doi:10.5072/FK2HYIXMY/ABZMQI","@type":"ore:AggregatedResource","schema:fileFormat":"application/pdf","dvcore:filesize":99014,"dvcore:storageIdentifier":"163880ce3e3-e73e49dca91e","dvcore:originalFormatLabel":"UNKNOWN","dvcore:rootDataFileId":-1,"dvcore:checksum":{"@type":"SHA-512","@value":"ae249017710fa0b0e62440ee62f43c3f0e44fa4936a42320db3c5b2ede29b31c81bdb793531fb970a7e22ae1c37f81c947ab2bd178dfe121604626e6aae97514"}},{"schema:description":"This is a file from the QDR website qdr.syr.edu.","schema:name":"Handout 2 (Data Management Checklist).pdf","dvcore:restricted":false,"dvcore:directoryLabel":"Handouts","schema:version":1,"dvcore:datasetVersionId":55,"@id":"doi:10.5072/FK2HYIXMY/GNCTTN","schema:sameAs":"https://dv.dev-aws.qdr.org/api/access/datafile/:persistentId?persistentId=doi:10.5072/FK2HYIXMY/GNCTTN","@type":"ore:AggregatedResource","schema:fileFormat":"application/pdf","dvcore:filesize":78408,"dvcore:storageIdentifier":"163880ce3d5-a1941ddb87e6","dvcore:originalFormatLabel":"UNKNOWN","dvcore:rootDataFileId":-1,"dvcore:checksum":{"@type":"SHA-512","@value":"8b3db45486713b1b3a4603e03a0f64c2596afd39bab0ebc429340a85589fb2a0b992a3b833cd02a49b0dc2ec41509fc0a5a1b9f3eaa3d2f76817af2b96244ae7"}},{"schema:name":"QDR - Data Management and Sharing - presentation.pptx","dvcore:restricted":false,"schema:version":1,"dvcore:datasetVersionId":55,"@id":"doi:10.5072/FK2HYIXMY/2LRK1L","schema:sameAs":"https://dv.dev-aws.qdr.org/api/access/datafile/:persistentId?persistentId=doi:10.5072/FK2HYIXMY/2LRK1L","@type":"ore:AggregatedResource","schema:fileFormat":"application/vnd.openxmlformats-officedocument.presentationml.presentation","dvcore:filesize":1032481,"dvcore:storageIdentifier":"163880ce687-51cae10bf0c6","dvcore:originalFormatLabel":"UNKNOWN","dvcore:rootDataFileId":-1,"dvcore:checksum":{"@type":"SHA-512","@value":"b057b65cff5cd893ed4b18d0e1414db169b69b03941fcc2f2b5d96efca5932db04968a52ef68c5781415447b141dde2866319f429b10db8533741161fbb5c098"}},{"schema:name":"QDR - Data Management and Sharing - Syllabus insert.docx","dvcore:restricted":false,"schema:version":2,"dvcore:datasetVersionId":55,"dvcore:categories":["Code","Data"],"@id":"doi:10.5072/FK2HYIXMY/RHMACI","schema:sameAs":"https://dv.dev-aws.qdr.org/api/access/datafile/:persistentId?persistentId=doi:10.5072/FK2HYIXMY/RHMACI","@type":"ore:AggregatedResource","schema:fileFormat":"application/vnd.openxmlformats-officedocument.wordprocessingml.document","dvcore:filesize":17889,"dvcore:storageIdentifier":"163880ce80e-f7f8cfdbb10c","dvcore:originalFormatLabel":"UNKNOWN","dvcore:rootDataFileId":-1,"dvcore:checksum":{"@type":"SHA-512","@value":"bde6f69b1db246b51f1c8aa257684007c2067c66aaf8669c4e169d0971cc49ce0517f2a9e3af2128f09ef5696e6fedd7ac6b29e865509fdbd4bd5ea5784d7aa5"}}],"schema:hasPart":["doi:10.5072/FK2HYIXMY/ABZMQI","doi:10.5072/FK2HYIXMY/GNCTTN","doi:10.5072/FK2HYIXMY/2LRK1L","doi:10.5072/FK2HYIXMY/RHMACI"]},"@context":{"Alternative Title":"http://purl.org/dc/terms/alternative","Alternative URL":"https://schema.org/distribution","Citation":"http://purl.org/dc/terms/bibliographicCitation","Contributor":"http://purl.org/dc/terms/contributor","Creator":"http://purl.org/dc/terms/creator","Data Sources":"https://www.w3.org/TR/prov-o/#wasDerivedFrom","Deposit Date":"http://purl.org/dc/terms/dateSubmitted","Geographic Bounding Box":"https://schema.org/spatialCoverage","Geographic Coverage":"https://schema.org/contentLocation","Grant Information":"https://schema.org/sponsor","Identifier":"http://purl.org/spar/datacite/ResourceIdentifier","Identifier Scheme":"http://purl.org/spar/datacite/AgentIdentifierScheme","Identifier Type":"http://purl.org/spar/datacite/ResourceIdentifierScheme","Language":"http://purl.org/dc/terms/language","ORCID":"http://purl.org/spar/datacite/AgentIdentifier","Related Data Projects":"http://purl.org/dc/terms/relation","Related Publication":"http://purl.org/dc/terms/isReferencedBy","Software":"https://www.w3.org/TR/prov-o/#wasGeneratedBy","Subject":"http://purl.org/dc/terms/subject","Time Period Covered":"https://schema.org/temporalCoverage","Title":"http://purl.org/dc/terms/title","Type of Data Project":"http://rdf-vocabulary.ddialliance.org/discovery#kindOfData","URL":"https://schema.org/distribution","author":"https://dataverse.org/schema/citation/author#","citation":"https://dataverse.org/schema/citation/","contributor":"https://dataverse.org/schema/citation/contributor#","datasetContact":"https://dataverse.org/schema/citation/datasetContact#","dcterms":"http://purl.org/dc/terms/","distributor":"https://dataverse.org/schema/citation/distributor#","dsDescription":"https://dataverse.org/schema/citation/dsDescription#","dvcore":"https://dv.dev-aws.qdr.org/schema/core#","geographicBoundingBox":"https://dataverse.org/schema/citation/geographicBoundingBox#","geographicCoverage":"https://dataverse.org/schema/citation/geographicCoverage#","grantNumber":"https://dataverse.org/schema/citation/grantNumber#","keyword":"https://dataverse.org/schema/citation/keyword#","ore":"http://www.openarchives.org/ore/terms/","otherId":"https://dataverse.org/schema/citation/otherId#","producer":"https://dataverse.org/schema/citation/producer#","schema":"http://schema.org/","series":"https://dataverse.org/schema/citation/series#","software":"https://dataverse.org/schema/citation/software#","timePeriodCovered":"https://dataverse.org/schema/citation/timePeriodCovered#"}}
\ No newline at end of file
diff --git a/src/test/resources/own-cloud-downloads/greetings.zip b/src/test/resources/own-cloud-downloads/greetings.zip
new file mode 100644
index 00000000000..6e166d385d1
Binary files /dev/null and b/src/test/resources/own-cloud-downloads/greetings.zip differ
diff --git a/src/test/resources/own-cloud-downloads/shapes.zip b/src/test/resources/own-cloud-downloads/shapes.zip
new file mode 100644
index 00000000000..99d5f36c895
Binary files /dev/null and b/src/test/resources/own-cloud-downloads/shapes.zip differ
diff --git a/src/test/resources/propertyFiles/metadataBlockTest.properties b/src/test/resources/propertyFiles/metadataBlockTest.properties
new file mode 100644
index 00000000000..25ec317c14f
--- /dev/null
+++ b/src/test/resources/propertyFiles/metadataBlockTest.properties
@@ -0,0 +1,2 @@
+metadatablock.displayName=property_value_for_displayName
+metadatablock.displayFacet=property_value_for_displayFacet
\ No newline at end of file
diff --git a/src/test/resources/sql/dbsetting-config-source-testdata.sql b/src/test/resources/sql/dbsetting-config-source-testdata.sql
new file mode 100644
index 00000000000..c55162d8707
--- /dev/null
+++ b/src/test/resources/sql/dbsetting-config-source-testdata.sql
@@ -0,0 +1,11 @@
+CREATE TABLE Setting (
+    id            char(5) CONSTRAINT firstkey PRIMARY KEY,
+    name          varchar(40) NOT NULL,
+    content       varchar(40) NOT NULL,
+    lang          varchar(40) DEFAULT NULL
+);
+
+INSERT INTO Setting (id, name, content)
+    VALUES
+        (1, 'SystemEmail', 'foobar@example.org')
+    ON CONFLICT DO NOTHING;
\ No newline at end of file
diff --git a/src/test/resources/tab/test.tab b/src/test/resources/tab/test.tab
new file mode 100644
index 00000000000..d750d42d995
--- /dev/null
+++ b/src/test/resources/tab/test.tab
@@ -0,0 +1,11 @@
+position	 name	 age
+1	"Belle"	36
+2	"Lola"	37
+3	"Jayden"	45
+4	"Margaret"	37
+5	"Russell"	40
+6	"Bertie"	60
+7	"Maud"	34
+8	"Mabel"	31
+9	"Trevor"	51
+10	"Duane"	26
diff --git a/src/test/resources/test-microprofile-aliases.properties b/src/test/resources/test-microprofile-aliases.properties
new file mode 100644
index 00000000000..4ee67025920
--- /dev/null
+++ b/src/test/resources/test-microprofile-aliases.properties
@@ -0,0 +1 @@
+dataverse.new.example=dataverse.old.example
\ No newline at end of file
diff --git a/src/test/resources/tsv/test.tsv b/src/test/resources/tsv/test.tsv
new file mode 100644
index 00000000000..0530f38f9cf
--- /dev/null
+++ b/src/test/resources/tsv/test.tsv
@@ -0,0 +1,9 @@
+#metadataBlock	name	dataverseAlias	displayName												
+	crc990time	crc990	CRC 990 Time Metadata												
+#datasetField	name	title	description	watermark	fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id
+	crc990time_when	when			none	1		FALSE	FALSE	FALSE	FALSE		TRUE		crc990time
+	crc990time_standardFormat	standardFormat	"The format of the dates used in the dataset:
+Year: YY or YYYY (e.g. 09 or 2009);\nMonth: M or MM (e.g. 3 or 03); Day: D or DD (e.g. 9 or 09); Hour (24h clock): h or hh (e.g. 8 or 08); Minute: m or mm (e.g. 5 or 05); Second: s or ss (e.g. 7 or 07); Separators: [Space] [:] [.] [-] [\] [/]"		text	2		FALSE	FALSE	FALSE	FALSE		TRUE	crc990time_when	crc990time
+	crc990time_startDate	startDate	Start date of the measurements formatted according to above.		date	3		FALSE	FALSE	FALSE	FALSE		TRUE	crc990time_when	crc990time
+	crc990time_endDate	endDate	End date of the measurements formatted according to above.		date	4		FALSE	FALSE	FALSE	FALSE		TRUE	crc990time_when	crc990time
+#controlledVocabulary	DatasetField	Value	identifier	displayOrder											
diff --git a/src/test/resources/tsv/whitespace-test.tsv b/src/test/resources/tsv/whitespace-test.tsv
new file mode 100644
index 00000000000..5485c948825
--- /dev/null
+++ b/src/test/resources/tsv/whitespace-test.tsv
@@ -0,0 +1,10 @@
+#metadataBlock 	name	dataverseAlias	displayName
+	 whitespaceDemo		Whitespace Demo
+#datasetField	name	title	description	watermark	fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id
+	whitespaceDemoOne 	One	Trailing Space		text	0		TRUE	TRUE	TRUE	FALSE	TRUE	FALSE		whitespaceDemo
+	 whitespaceDemoTwo	Two	Leading Space		text	1		TRUE	TRUE	TRUE	FALSE	TRUE	FALSE		whitespaceDemo
+	whitespaceDemoThree	Three	CV with errors		text	2		TRUE	TRUE	TRUE	FALSE	TRUE	FALSE		whitespaceDemo
+#controlledVocabulary	DatasetField	Value	identifier	displayOrder
+	whitespaceDemoThree	CV1 		0
+	whitespaceDemoThree	 CV2		1
+	whitespaceDemoThree	CV3		2
diff --git a/src/test/resources/xml/dct.xml b/src/test/resources/xml/dct.xml
index 5e8ba4865c6..c07486a2cdf 100644
--- a/src/test/resources/xml/dct.xml
+++ b/src/test/resources/xml/dct.xml
@@ -9,6 +9,11 @@
   <var ID="v1170" name="Var1" intrvl="discrete">
     <location fileid="f446"/>
     <labl level="variable">gender</labl>
+    <qstn>
+      <qstnLit>This is a literal question.</qstnLit>
+      <ivuInstr>These are interview instructions.</ivuInstr>
+    </qstn>
+    <universe>Our universe</universe>
     <sumStat type="mean">1.4952380952380968</sumStat>
     <sumStat type="max">2.0</sumStat>
     <sumStat type="min">1.0</sumStat>
@@ -27,19 +32,15 @@
       <labl level="category">Female</labl>
       <catStat type="freq">1508</catStat>
     </catgry>
-    <qstn>
-      <qstnLit>This is a literal question.</qstnLit>
-      <ivuInstr>These are interview instructions.</ivuInstr>
-    </qstn>
     <varFormat type="numeric"/>
     <notes><![CDATA[These are notes.
 A lot of them.]]></notes>
     <notes subject="Universal Numeric Fingerprint" level="variable" type="VDC:UNF">UNF:6:HbM1tFHAsgACfUYee9JhTQ==</notes>
-    <universe>Our universe</universe>
   </var>
   <var ID="v1169" name="Var2" intrvl="discrete" wgt-var="v1168">
     <location fileid="f446"/>
     <labl level="variable">age_rollup</labl>
+    <qstn/>
     <sumStat type="max">4.0</sumStat>
     <sumStat type="medn">3.0</sumStat>
     <sumStat type="invd">0.0</sumStat>
@@ -72,7 +73,6 @@ A lot of them.]]></notes>
       <catStat type="freq">1262</catStat>
       <catStat wgtd="wgtd" type="freq">1226.3455293050008</catStat>
     </catgry>
-    <qstn/>
     <varFormat type="numeric"/>
     <notes><![CDATA[This variable is weighted.]]></notes>
     <notes subject="Universal Numeric Fingerprint" level="variable" type="VDC:UNF">UNF:6:VGyH5f6KGRmMBFDAy6l6NQ==</notes>
@@ -80,6 +80,9 @@ A lot of them.]]></notes>
   <var ID="v1168" name="Var3" intrvl="contin" wgt="wgt">
     <location fileid="f446"/>
     <labl level="variable">weight</labl>
+    <qstn>
+      <qstnLit>Literal question for weight</qstnLit>
+    </qstn>
     <sumStat type="mean">1.0000000020183908</sumStat>
     <sumStat type="mode">.</sumStat>
     <sumStat type="min">0.0</sumStat>
@@ -88,9 +91,6 @@ A lot of them.]]></notes>
     <sumStat type="medn">0.894478155</sumStat>
     <sumStat type="max">6.206337719</sumStat>
     <sumStat type="invd">0.0</sumStat>
-    <qstn>
-      <qstnLit>Literal question for weight</qstnLit>
-    </qstn>
     <varFormat type="numeric"/>
     <notes><![CDATA[Notes]]></notes>
     <notes subject="Universal Numeric Fingerprint" level="variable" type="VDC:UNF">UNF:6:j+BtC84BNZ44dNOkCwg/0Q==</notes>
diff --git a/src/test/resources/xml/dct_codebook.xml b/src/test/resources/xml/dct_codebook.xml
index 33c2ad3921d..8d65585794b 100644
--- a/src/test/resources/xml/dct_codebook.xml
+++ b/src/test/resources/xml/dct_codebook.xml
@@ -1 +1 @@
-<?xml version='1.0' encoding='UTF-8'?><codeBook xmlns="ddi:codebook:2_5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddi:codebook:2_5 http://www.ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd" version="2.5"><docDscr><citation><titlStmt><titl>dct html</titl><IDNo agency="DOI">doi:10.5072/FK2/SOLYMR</IDNo></titlStmt><distStmt><distrbtr>Root</distrbtr><distDate>2019-08-12</distDate></distStmt><verStmt source="DVN"><version date="2019-08-12" type="RELEASED">1</version></verStmt><biblCit>Admin, Dataverse, 2019, "dct html", https://doi.org/10.5072/FK2/SOLYMR, Root, V1, UNF:6:fbFW653KFlDctLBrYqUA8A== [fileUNF]</biblCit></citation></docDscr><stdyDscr><citation><titlStmt><titl>dct html</titl><IDNo agency="DOI">doi:10.5072/FK2/SOLYMR</IDNo></titlStmt><rspStmt><AuthEnty affiliation="Dataverse.org">Admin, Dataverse</AuthEnty></rspStmt><prodStmt/><distStmt><distrbtr>Root</distrbtr><distDate>2019-08-12</distDate></distStmt></citation><stdyInfo><subject><keyword>Social Sciences</keyword></subject><abstract>dct html codebook test</abstract><notes>Notes for dct</notes><sumDscr/><relPubl>Citations</relPubl><contact affiliation="Dataverse.org" email="dataverse@mailinator.com">Admin, Dataverse</contact><depositr>Admin, Dataverse</depositr><depDate>2019-08-12</depDate></stdyInfo><method><dataColl/><anlyInfo/></method><useStmt>CC0 Waiver</useStmt></stdyDscr><fileDscr ID="f768" URI="https://utl-192-123.library.utoronto.ca/api/access/datafile/768"><fileTxt><fileName>dct.tab</fileName><dimensns><caseQnty>3045</caseQnty><varQnty>3</varQnty></dimensns><fileType>text/tab-separated-values</fileType></fileTxt><notes level="file" type="VDC:UNF" subject="Universal Numeric Fingerprint">UNF:6:fbFW653KFlDctLBrYqUA8A==</notes></fileDscr><dataDscr><varGrp ID="VG264" var="v3070"><labl>group2</labl></varGrp><varGrp ID="VG265" var="v3068 v3069"><labl>group1</labl></varGrp><var ID="v3068" name="Var1" intrvl="discrete" wgt-var="v3070"><location fileid="f768"/><labl level="variable">gender</labl><universe>Universe for gender</universe><sumStat type="mean">1.4952380952380968</sumStat><sumStat type="min">1.0</sumStat><sumStat type="vald">3045.0</sumStat><sumStat type="invd">0.0</sumStat><sumStat type="max">2.0</sumStat><sumStat type="medn">1.0</sumStat><sumStat type="stdev">0.5000594420582792</sumStat><sumStat type="mode">.</sumStat><catgry><catValu>2</catValu><labl level="category">Female</labl><catStat type="freq">1508</catStat><catStat wgtd="wgtd" type="freq">1566.3592933639995</catStat></catgry><catgry><catValu>1</catValu><labl level="category">Male</labl><catStat type="freq">1537</catStat><catStat wgtd="wgtd" type="freq">1478.6407127819975</catStat></catgry><varFormat type="numeric"/><notes subject="Universal Numeric Fingerprint" level="variable" type="Dataverse:UNF">UNF:6:HbM1tFHAsgACfUYee9JhTQ==</notes><notes><![CDATA[Gender notes]]></notes><qstn><qstnLit>Literal question for gender</qstnLit><ivuInstr>Interview instruction for gender</ivuInstr><postQTxt>Post question for gender</postQTxt></qstn></var><var ID="v3069" name="Var2" intrvl="discrete" wgt-var="v3070"><location fileid="f768"/><labl level="variable">age_rollup</labl><universe>Universe for age</universe><sumStat type="mean">3.1316912972085413</sumStat><sumStat type="max">4.0</sumStat><sumStat type="vald">3045.0</sumStat><sumStat type="invd">0.0</sumStat><sumStat type="medn">3.0</sumStat><sumStat type="stdev">0.7539191926768495</sumStat><sumStat type="mode">.</sumStat><sumStat type="min">2.0</sumStat><catgry><catValu>3</catValu><labl level="category">35-54</labl><catStat type="freq">1262</catStat><catStat wgtd="wgtd" type="freq">1226.3455293050008</catStat></catgry><catgry><catValu>1</catValu><labl level="category">Under 18</labl><catStat type="freq">0</catStat><catStat wgtd="wgtd" type="freq">0.0</catStat></catgry><catgry><catValu>4</catValu><labl level="category">55+</labl><catStat type="freq">1092</catStat><catStat wgtd="wgtd" type="freq">952.2153135640008</catStat></catgry><catgry><catValu>2</catValu><labl level="category">18-34</labl><catStat type="freq">691</catStat><catStat wgtd="wgtd" type="freq">866.4391632769999</catStat></catgry><varFormat type="numeric"/><notes subject="Universal Numeric Fingerprint" level="variable" type="Dataverse:UNF">UNF:6:VGyH5f6KGRmMBFDAy6l6NQ==</notes><notes><![CDATA[Notes for age]]></notes><qstn><qstnLit>Literal question for age</qstnLit><ivuInstr>Interview instructions for age</ivuInstr><postQTxt>Post Question for age</postQTxt></qstn></var><var ID="v3070" name="Var3" intrvl="contin" wgt="wgt"><location fileid="f768"/><labl level="variable">weight</labl><sumStat type="stdev">0.5168101054682486</sumStat><sumStat type="vald">3045.0</sumStat><sumStat type="max">6.206337719</sumStat><sumStat type="mode">.</sumStat><sumStat type="mean">1.0000000020183908</sumStat><sumStat type="min">0.0</sumStat><sumStat type="invd">0.0</sumStat><sumStat type="medn">0.894478155</sumStat><varFormat type="numeric"/><notes subject="Universal Numeric Fingerprint" level="variable" type="Dataverse:UNF">UNF:6:j+BtC84BNZ44dNOkCwg/0Q==</notes><notes><![CDATA[This is weight variable]]></notes></var></dataDscr></codeBook>
\ No newline at end of file
+<?xml version='1.0' encoding='UTF-8'?><codeBook xmlns="ddi:codebook:2_5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddi:codebook:2_5 http://www.ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd" version="2.5"><docDscr><citation><titlStmt><titl>dct html</titl><IDNo agency="DOI">doi:10.5072/FK2/SOLYMR</IDNo></titlStmt><distStmt><distrbtr>Root</distrbtr><distDate>2019-08-12</distDate></distStmt><verStmt source="DVN"><version date="2019-08-12" type="RELEASED">1</version></verStmt><biblCit>Admin, Dataverse, 2019, "dct html", https://doi.org/10.5072/FK2/SOLYMR, Root, V1, UNF:6:fbFW653KFlDctLBrYqUA8A== [fileUNF]</biblCit></citation></docDscr><stdyDscr><citation><titlStmt><titl>dct html</titl><IDNo agency="DOI">doi:10.5072/FK2/SOLYMR</IDNo></titlStmt><rspStmt><AuthEnty affiliation="Dataverse.org">Admin, Dataverse</AuthEnty></rspStmt><prodStmt/><distStmt><distrbtr>Root</distrbtr><distDate>2019-08-12</distDate></distStmt></citation><stdyInfo><subject><keyword>Social Sciences</keyword></subject><abstract>dct html codebook test</abstract><notes>Notes for dct</notes><sumDscr/><relPubl>Citations</relPubl><contact affiliation="Dataverse.org" email="dataverse@mailinator.com">Admin, Dataverse</contact><depositr>Admin, Dataverse</depositr><depDate>2019-08-12</depDate></stdyInfo><method><dataColl/><anlyInfo/></method><useStmt>CC0 Waiver</useStmt></stdyDscr><fileDscr ID="f768" URI="https://utl-192-123.library.utoronto.ca/api/access/datafile/768"><fileTxt><fileName>dct.tab</fileName><dimensns><caseQnty>3045</caseQnty><varQnty>3</varQnty></dimensns><fileType>text/tab-separated-values</fileType></fileTxt><notes level="file" type="VDC:UNF" subject="Universal Numeric Fingerprint">UNF:6:fbFW653KFlDctLBrYqUA8A==</notes></fileDscr><dataDscr><varGrp ID="VG264" var="v3070"><labl>group2</labl></varGrp><varGrp ID="VG265" var="v3068 v3069"><labl>group1</labl></varGrp><var ID="v3068" name="Var1" intrvl="discrete" wgt-var="v3070"><location fileid="f768"/><labl level="variable">gender</labl><qstn><qstnLit>Literal question for gender</qstnLit><ivuInstr>Interview instruction for gender</ivuInstr><postQTxt>Post question for gender</postQTxt></qstn><universe>Universe for gender</universe><sumStat type="mean">1.4952380952380968</sumStat><sumStat type="min">1.0</sumStat><sumStat type="vald">3045.0</sumStat><sumStat type="invd">0.0</sumStat><sumStat type="max">2.0</sumStat><sumStat type="medn">1.0</sumStat><sumStat type="stdev">0.5000594420582792</sumStat><sumStat type="mode">.</sumStat><catgry><catValu>2</catValu><labl level="category">Female</labl><catStat type="freq">1508</catStat><catStat wgtd="wgtd" type="freq">1566.3592933639995</catStat></catgry><catgry><catValu>1</catValu><labl level="category">Male</labl><catStat type="freq">1537</catStat><catStat wgtd="wgtd" type="freq">1478.6407127819975</catStat></catgry><varFormat type="numeric"/><notes subject="Universal Numeric Fingerprint" level="variable" type="Dataverse:UNF">UNF:6:HbM1tFHAsgACfUYee9JhTQ==</notes><notes><![CDATA[Gender notes]]></notes></var><var ID="v3069" name="Var2" intrvl="discrete" wgt-var="v3070"><location fileid="f768"/><labl level="variable">age_rollup</labl><qstn><qstnLit>Literal question for age</qstnLit><ivuInstr>Interview instructions for age</ivuInstr><postQTxt>Post Question for age</postQTxt></qstn><universe>Universe for age</universe><sumStat type="mean">3.1316912972085413</sumStat><sumStat type="max">4.0</sumStat><sumStat type="vald">3045.0</sumStat><sumStat type="invd">0.0</sumStat><sumStat type="medn">3.0</sumStat><sumStat type="stdev">0.7539191926768495</sumStat><sumStat type="mode">.</sumStat><sumStat type="min">2.0</sumStat><catgry><catValu>3</catValu><labl level="category">35-54</labl><catStat type="freq">1262</catStat><catStat wgtd="wgtd" type="freq">1226.3455293050008</catStat></catgry><catgry><catValu>1</catValu><labl level="category">Under 18</labl><catStat type="freq">0</catStat><catStat wgtd="wgtd" type="freq">0.0</catStat></catgry><catgry><catValu>4</catValu><labl level="category">55+</labl><catStat type="freq">1092</catStat><catStat wgtd="wgtd" type="freq">952.2153135640008</catStat></catgry><catgry><catValu>2</catValu><labl level="category">18-34</labl><catStat type="freq">691</catStat><catStat wgtd="wgtd" type="freq">866.4391632769999</catStat></catgry><varFormat type="numeric"/><notes subject="Universal Numeric Fingerprint" level="variable" type="Dataverse:UNF">UNF:6:VGyH5f6KGRmMBFDAy6l6NQ==</notes><notes><![CDATA[Notes for age]]></notes></var><var ID="v3070" name="Var3" intrvl="contin" wgt="wgt"><location fileid="f768"/><labl level="variable">weight</labl><sumStat type="stdev">0.5168101054682486</sumStat><sumStat type="vald">3045.0</sumStat><sumStat type="max">6.206337719</sumStat><sumStat type="mode">.</sumStat><sumStat type="mean">1.0000000020183908</sumStat><sumStat type="min">0.0</sumStat><sumStat type="invd">0.0</sumStat><sumStat type="medn">0.894478155</sumStat><varFormat type="numeric"/><notes subject="Universal Numeric Fingerprint" level="variable" type="Dataverse:UNF">UNF:6:j+BtC84BNZ44dNOkCwg/0Q==</notes><notes><![CDATA[This is weight variable]]></notes></var></dataDscr></codeBook>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-attribs-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-attribs-1.xsd
new file mode 100644
index 00000000000..9c015c04a57
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-attribs-1.xsd
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      This is the XML Schema common attributes module for XHTML
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+    <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_commonatts"/>
+  </xs:annotation>
+
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../xml.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        This import brings in the XML namespace attributes
+        The module itself does not provide the schemaLocation
+        and expects the driver schema to provide the
+        actual SchemaLocation.
+      </xs:documentation>
+    </xs:annotation>
+  </xs:import>
+
+  <xs:attributeGroup name="id">
+    <xs:attribute name="id" type="xs:ID"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="class">
+    <xs:attribute name="class" type="xs:NMTOKENS"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="title">
+    <xs:attribute name="title" type="xs:string"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="Core.attrib">
+    <xs:attributeGroup ref="id"/>
+    <xs:attributeGroup ref="class"/>
+    <xs:attributeGroup ref="title"/>
+    <xs:attributeGroup ref="Core.extra.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="I18n.attrib">
+    <xs:attribute ref="xml:lang"/>
+    <xs:attributeGroup ref="I18n.extra.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="Common.attrib">
+    <xs:attributeGroup ref="Core.attrib"/>
+    <xs:attributeGroup ref="I18n.attrib"/>
+    <xs:attributeGroup ref="Common.extra"/>
+  </xs:attributeGroup>
+
+
+  <!-- Global attributes -->
+  <xs:attribute name="id" type="xs:ID"/>
+  <xs:attribute name="class" type="xs:NMTOKENS"/>
+  <xs:attribute name="title" type="xs:string"/>
+
+  <xs:attributeGroup name="Global.core.attrib">
+    <xs:attribute ref="id"/>
+    <xs:attribute ref="class"/>
+    <xs:attribute ref="title"/>
+    <xs:attributeGroup ref="Global.core.extra.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="Global.i18n.attrib">
+    <xs:attribute ref="xml:lang"/>
+    <xs:attributeGroup ref="Global.I18n.extra.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="Global.common.attrib">
+    <xs:attributeGroup ref="Global.core.attrib"/>
+    <xs:attributeGroup ref="Global.i18n.attrib"/>
+    <xs:attributeGroup ref="Global.Common.extra"/>
+  </xs:attributeGroup>
+
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-bdo-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-bdo-1.xsd
new file mode 100644
index 00000000000..94290ffcc44
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-bdo-1.xsd
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
+            xmlns="http://www.w3.org/1999/xhtml"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:annotation>
+       <xs:documentation>
+          Bidirectional Override (bdo) Element
+          This is the XML Schema BDO Element module for XHTML
+
+          This modules declares the element 'bdo' and 'dir' attributes,
+          Used to override the  Unicode bidirectional algorithm for selected
+          fragments of text.
+          Bidirectional text support includes both the bdo element and
+          the 'dir' attribute.
+
+          $Id$
+      </xs:documentation>
+      <xs:documentation source="xhtml-copyright-1.xsd"/>
+      <xs:documentation
+         source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_bdomodule"/>
+    </xs:annotation>
+
+    <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../xml.xsd">
+      <xs:annotation>
+         <xs:documentation>
+           This import brings in the XML namespace attributes
+           The module itself does not provide the schemaLocation
+           and expects the driver schema to provide the
+           actual SchemaLocation.
+         </xs:documentation>
+      </xs:annotation>
+    </xs:import>
+
+    <xs:attributeGroup name="bdo.attlist">
+      <xs:attribute ref="xml:lang"/>
+      <xs:attributeGroup ref="Core.attrib"/>
+      <xs:attribute name="dir" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="ltr"/>
+            <xs:enumeration value="rtl"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:attributeGroup>
+
+    <xs:group name="bdo.content">
+       <xs:sequence>
+          <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+       </xs:sequence>
+    </xs:group>
+
+    <xs:complexType name="bdo.type" mixed="true">
+      <xs:group ref="bdo.content"/>
+      <xs:attributeGroup ref="bdo.attlist"/>
+    </xs:complexType>
+
+    <xs:element name="bdo" type="bdo.type"/>
+
+    <xs:attributeGroup name="dir.attrib">
+      <xs:attribute name="dir">
+        <xs:simpleType>
+          <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="ltr"/>
+            <xs:enumeration value="rtl"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:attributeGroup>
+
+    <!-- Global dir attribute -->
+    <xs:attribute name="dir">
+      <xs:simpleType>
+        <xs:restriction base="xs:NMTOKEN">
+          <xs:enumeration value="ltr"/>
+          <xs:enumeration value="rtl"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+
+    <xs:attributeGroup name="Global.bdo.attrib">
+       <xs:attribute ref="dir"/>
+    </xs:attributeGroup>
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-blkphras-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-blkphras-1.xsd
new file mode 100644
index 00000000000..feaaaa83922
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-blkphras-1.xsd
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/1999/xhtml" 
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="http://www.w3.org/1999/xhtml">
+      
+      
+    <xs:annotation>
+       <xs:documentation>
+          This is the XML Schema Block Phrasal support module for XHTML
+          $Id$
+       </xs:documentation>
+       <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    
+    <xs:annotation>
+        <xs:documentation>
+           Block Phrasal
+           This module declares the elements and their attributes used to
+           support block-level phrasal markup.
+           This is the XML Schema block phrasal elements module for XHTML
+
+            * address, blockquote, pre, h1, h2, h3, h4, h5, h6
+      </xs:documentation>
+      <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_textmodule"/>
+    </xs:annotation>
+    
+    <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../xml.xsd"> 
+      <xs:annotation>
+        <xs:documentation>
+          This import brings in the XML namespace attributes 
+          The module itself does not provide the schemaLocation
+          and expects the driver schema to provide the 
+          actual SchemaLocation.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:import>    
+    
+    <!-- address -->
+    <xs:attributeGroup name="address.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+    </xs:attributeGroup>
+   
+    <xs:group name="address.content">
+       <xs:sequence>
+          <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>       
+       </xs:sequence>
+    </xs:group>
+        
+    <xs:complexType name="address.type" mixed="true">
+        <xs:group ref="address.content"/>      
+        <xs:attributeGroup ref="address.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="address" type="address.type"/>
+    
+    <!-- blockquote -->
+    <xs:attributeGroup name="blockquote.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+        <xs:attribute name="cite" type="URI"/>
+    </xs:attributeGroup>
+
+    <xs:group name="blockquote.content">
+       <xs:sequence>
+          <xs:group ref="Block.mix" maxOccurs="unbounded"/>       
+       </xs:sequence>
+    </xs:group>        
+    
+    <xs:complexType name="blockquote.type">
+        <xs:group ref="blockquote.content"/> 
+        <xs:attributeGroup ref="blockquote.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="blockquote" type="blockquote.type"/>
+    
+    <!-- pre -->
+    <xs:attributeGroup name="pre.attlist">
+        <xs:attribute ref="xml:space"/>
+        <xs:attributeGroup ref="Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="pre.content">
+       <xs:sequence>    
+          <xs:group ref="InlinePre.mix" minOccurs="0" maxOccurs="unbounded"/>       
+       </xs:sequence>
+    </xs:group>        
+        
+    <xs:complexType name="pre.type" mixed="true">
+        <xs:group ref="pre.content"/>     
+        <xs:attributeGroup ref="pre.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="pre" type="pre.type"/>
+    
+    <!-- Heading Elements  -->
+    <xs:attributeGroup name="heading.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:complexType name="heading.type" mixed="true">
+        <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:attributeGroup ref="heading.attlist"/>
+    </xs:complexType>
+    
+    <xs:attributeGroup name="h1.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="h1.content">
+       <xs:sequence>    
+          <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>    
+       </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="h1.type" mixed="true">
+        <xs:group ref="h1.content"/>
+        <xs:attributeGroup ref="h1.attlist"/>
+    </xs:complexType>
+       
+    <xs:element name="h1" type="h1.type"/>
+    
+    <xs:attributeGroup name="h2.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="h2.content">
+       <xs:sequence>    
+          <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>    
+       </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="h2.type" mixed="true">
+        <xs:group ref="h2.content"/>
+        <xs:attributeGroup ref="h2.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="h2" type="h2.type"/>
+    
+    <xs:attributeGroup name="h3.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="h3.content">
+       <xs:sequence>    
+          <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>    
+       </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="h3.type" mixed="true">
+        <xs:group ref="h3.content"/>
+        <xs:attributeGroup ref="h3.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="h3" type="h3.type"/>
+    
+    <xs:attributeGroup name="h4.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="h4.content">
+       <xs:sequence>    
+          <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>    
+       </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="h4.type" mixed="true">
+        <xs:group ref="h4.content"/>
+        <xs:attributeGroup ref="h4.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="h4" type="h4.type"/>
+    
+    <xs:attributeGroup name="h5.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="h5.content">
+       <xs:sequence>    
+          <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>    
+       </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="h5.type" mixed="true">
+        <xs:group ref="h5.content"/>
+        <xs:attributeGroup ref="h5.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="h5" type="h5.type"/>
+
+    <xs:attributeGroup name="h6.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="h6.content">
+       <xs:sequence>    
+          <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>    
+       </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="h6.type" mixed="true">
+        <xs:group ref="h6.content"/>
+        <xs:attributeGroup ref="h6.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="h6" type="h6.type"/>
+    
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-blkpres-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-blkpres-1.xsd
new file mode 100644
index 00000000000..632b7a85792
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-blkpres-1.xsd
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      This is the XML SchemaBlock presentation element module for XHTML
+      $Id$
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+      Block Presentational Elements
+  
+        * hr
+  
+      This module declares the elements and their attributes used to
+      support block-level presentational markup.
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+    <xs:documentation 
+         source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_presentationmodule"/>    
+  </xs:annotation>
+
+  <xs:attributeGroup name="hr.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+  
+  <xs:group name="hr.content">
+    <xs:sequence/>
+  </xs:group>  
+  
+  <xs:complexType name="hr.type">
+    <xs:group ref="hr.content"/>
+    <xs:attributeGroup ref="hr.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="hr" type="hr.type"/>
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-blkstruct-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-blkstruct-1.xsd
new file mode 100644
index 00000000000..d4e4afb72d5
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-blkstruct-1.xsd
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      Block Structural
+
+        * div, p
+  
+      This module declares the elements and their attributes used to
+      support block-level structural markup.            
+          
+      This is the XML Schema Block Structural module for XHTML
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+
+  <!-- div -->
+  <xs:attributeGroup name="div.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="div.content">
+     <xs:sequence>
+        <xs:group ref="Flow.mix" minOccurs="0" maxOccurs="unbounded"/>     
+     </xs:sequence>
+  </xs:group>    
+
+  <xs:complexType name="div.type" mixed="true">
+    <xs:group ref="div.content"/>     
+    <xs:attributeGroup ref="div.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="div" type="div.type"/>
+
+  <!-- p -->
+  <xs:attributeGroup name="p.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+  
+  <xs:group name="p.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>     
+     </xs:sequence>
+  </xs:group>      
+
+  <xs:complexType name="p.type" mixed="true">
+    <xs:group ref="p.content"/>       
+    <xs:attributeGroup ref="p.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="p" type="p.type"/>
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-charent-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-charent-1.xsd
new file mode 100644
index 00000000000..438f77fc7b1
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-charent-1.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  This schema module includes three named character entity files.
+-->
+<!DOCTYPE xs:schema [
+<!-- These are the entity sets for ISO Latin 1 characters for the XHTML -->
+<!ENTITY % HTMLlat1 PUBLIC
+   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+   "xhtml-lat1.ent">
+%HTMLlat1;
+<!-- These are the entity sets for special characters for the XHTML -->
+<!ENTITY % HTMLsymbol PUBLIC
+   "-//W3C//ENTITIES Symbols for XHTML//EN"
+   "xhtml-symbol.ent">
+%HTMLsymbol;
+<!-- These are the entity sets for symbol characters for the XHTML -->
+<!ENTITY % HTMLspecial PUBLIC
+   "-//W3C//ENTITIES Special for XHTML//EN"
+   "xhtml-special.ent">
+%HTMLspecial;
+]>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      Character Entities for XHTML    
+      This is the XML Schema Character Entities module for XHTML
+
+      This module declares the set of character entities for XHTML,
+      including the Latin 1, Symbol and Special character collections.
+      XML Schema does not support Entities, hence Entities are enable
+      through an Internal DTD Subset.
+      
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-datatypes-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-datatypes-1.xsd
new file mode 100644
index 00000000000..8509d396809
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-datatypes-1.xsd
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="http://www.w3.org/1999/xhtml"
+            xmlns="http://www.w3.org/1999/xhtml">
+
+    <xs:annotation>
+        <xs:documentation>
+          XHTML Datatypes
+          This is the XML Schema datatypes module for XHTML
+          
+          Defines containers for the XHTML datatypes, many of
+          these imported from other specifications and standards.
+          
+          $Id$
+        </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+        <xs:documentation 
+            source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstraction.html#s_common_attrtypes"/>        
+    </xs:annotation>
+    
+    <!-- nn for pixels or nn% for percentage length -->
+    <xs:simpleType name="Length">
+        <xs:union memberTypes="xs:nonNegativeInteger">
+           <xs:simpleType>
+             <xs:restriction base="xs:token">
+               <xs:pattern value="\d+[%]|\d*\.\d+[%]"/>
+              </xs:restriction>
+           </xs:simpleType>         
+        </xs:union>
+    </xs:simpleType>
+    
+    <!-- space-separated list of link types -->
+    <xs:simpleType name="LinkTypes">
+        <xs:list itemType="xs:NMTOKEN"/>
+    </xs:simpleType>
+    
+    <!-- single or comma-separated list of media descriptors -->
+    <xs:simpleType name="MediaDesc">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    
+    <!-- pixel, percentage, or relative -->
+    <xs:simpleType name="MultiLength">
+        <xs:union memberTypes="Length">
+           <xs:simpleType>
+             <xs:restriction base="xs:token">
+               <xs:pattern value="\d*\*"/>
+             </xs:restriction>
+           </xs:simpleType>         
+        </xs:union>
+    </xs:simpleType>
+    
+    <!-- one or more digits (NUMBER) -->
+    <xs:simpleType name="Number">
+        <xs:restriction base="xs:nonNegativeInteger"/>
+    </xs:simpleType>
+    
+    <!-- integer representing length in pixels -->
+    <xs:simpleType name="Pixels">
+        <xs:restriction base="xs:nonNegativeInteger"/>
+    </xs:simpleType>
+    
+    <!-- script expression -->
+    <xs:simpleType name="Script">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    
+    <!-- sixteen color names or RGB color expression-->
+    <xs:simpleType name="Color">
+        <xs:union memberTypes="xs:NMTOKEN">    
+           <xs:simpleType>                      
+              <xs:restriction base="xs:token">
+                 <xs:pattern value="#[0-9a-fA-F]{6}"/>
+              </xs:restriction>
+           </xs:simpleType>         
+        </xs:union>
+    </xs:simpleType>
+    
+    <!-- textual content -->
+    <xs:simpleType name="Text">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    
+    <!-- Imported Datatypes  -->
+    <!-- a single character, as per section 2.2 of [XML] -->
+    <xs:simpleType name="Character">
+        <xs:restriction base="xs:string">
+           <xs:length value="1" fixed="true"/>
+        </xs:restriction>
+    </xs:simpleType>
+    
+    <!-- a character encoding, as per [RFC2045] -->
+    <xs:simpleType name="Charset">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    
+    <!-- a space separated list of character encodings, as per [RFC2045] -->
+    <xs:simpleType name="Charsets">
+        <xs:list itemType="Charset"/>
+    </xs:simpleType>
+    
+    <!-- media type, as per [RFC2045] -->
+    <xs:simpleType name="ContentType">
+        <xs:list itemType="xs:string"/>
+    </xs:simpleType>
+    
+    <!-- comma-separated list of media types, as per [RFC2045] -->
+    <xs:simpleType name="ContentTypes">
+        <xs:list itemType="xs:string"/>
+    </xs:simpleType>
+    
+    <!-- date and time information. ISO date format -->
+    <xs:simpleType name="Datetime">
+        <xs:restriction base="xs:dateTime"/>
+    </xs:simpleType>
+    
+    <!-- formal public identifier, as per [ISO8879] -->
+    <xs:simpleType name="FPI">
+        <xs:restriction base="xs:normalizedString"/>
+    </xs:simpleType>
+    
+    <!-- a language code, as per [RFC3066] -->
+    <xs:simpleType name="LanguageCode">
+        <xs:restriction base="xs:language"/>
+    </xs:simpleType>
+    
+    <!-- a Uniform Resource Identifier, see [URI] -->
+    <xs:simpleType name="URI">
+        <xs:restriction base="xs:anyURI"/>
+    </xs:simpleType>
+    
+    <!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
+    <xs:simpleType name="URIs">
+        <xs:list itemType="xs:anyURI"/>
+    </xs:simpleType>
+    
+    <!-- comma-separated list of MultiLength -->
+    <xs:simpleType name="MultiLengths">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    
+    <!-- character Data -->
+    <xs:simpleType name="CDATA">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+        
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-framework-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-framework-1.xsd
new file mode 100644
index 00000000000..89573569329
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-framework-1.xsd
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      This is the XML Schema Modular Framework support module for XHTML
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+      XHTML Modular Framework
+      This required module instantiates the necessary modules
+      needed to support the XHTML modularization framework.
+
+      The Schema modules instantiated are:
+        +  notations
+        +  datatypes
+        +  common attributes
+        +  character entities
+    </xs:documentation>
+    <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_commonatts"/>
+  </xs:annotation>
+
+  <xs:include schemaLocation="xhtml-notations-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+         Notations module
+         Declares XHTML notations for Attribute data types
+      </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-datatypes-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        This module defines XHTML Attribute DataTypes
+      </xs:documentation>
+      <xs:documentation
+          source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstraction.html#s_common_attrtypes"/>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-attribs-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        This module defines Common attributes for XHTML
+      </xs:documentation>
+      <xs:documentation
+          source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_commonatts"/>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-charent-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Character entities module
+        Note: Entities are not supported in XML Schema
+        The Schema Module uses DTDs to define Entities
+
+        This module defines
+          + XHTML Latin 1 Character Entities
+          + XHTML Special Characters
+          + XHTML Mathematical, Greek, and Symbolic Characters
+    </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-hypertext-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-hypertext-1.xsd
new file mode 100644
index 00000000000..8d88125ace1
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-hypertext-1.xsd
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      Hypertext Module
+      This is the XML Schema Hypertext module for XHTML
+            
+        * a
+            
+      This module declares the anchor ('a') element type, which
+      defines the source of a hypertext link. The destination
+      (or link 'target') is identified via its 'id' attribute 
+      rather than the 'name' attribute as was used in HTML.
+
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+    <xs:documentation
+        source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_hypertextmodule"/>    
+  </xs:annotation>
+
+
+  <xs:attributeGroup name="a.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+    <xs:attribute name="href" type="URI"/>
+    <xs:attribute name="charset" type="Charset"/>
+    <xs:attribute name="type" type="ContentType"/>
+    <xs:attribute name="hreflang" type="LanguageCode"/>
+    <xs:attribute name="rel" type="LinkTypes"/>
+    <xs:attribute name="rev" type="LinkTypes"/>
+    <xs:attribute name="accesskey" type="Character"/>
+    <xs:attribute name="tabindex" type="Number"/>
+  </xs:attributeGroup>
+   
+  <xs:group name="a.content">
+     <xs:sequence>
+        <xs:group ref="InlNoAnchor.mix" minOccurs="0" maxOccurs="unbounded"/>     
+     </xs:sequence>
+  </xs:group>  
+
+  <xs:complexType name="a.type" mixed="true">
+     <xs:group ref="a.content"/>
+     <xs:attributeGroup ref="a.attlist"/>
+  </xs:complexType>
+ 
+  <xs:element name="a" type="a.type"/>
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlphras-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlphras-1.xsd
new file mode 100644
index 00000000000..19a93cf9f71
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlphras-1.xsd
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+         This is the XML Schema Inline Phrasal support module for XHTML
+         $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+      Inline Phrasal.
+      This module declares the elements and their attributes used to
+      support inline-level phrasal markup.
+      This is the XML Schema Inline Phrasal module for XHTML
+
+        * abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
+
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_textmodule"/>
+  </xs:annotation>
+
+
+  <xs:attributeGroup name="abbr.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="abbr.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="abbr.type" mixed="true">
+    <xs:group ref="abbr.content"/>
+    <xs:attributeGroup ref="abbr.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="abbr" type="abbr.type"/>
+
+  <xs:attributeGroup name="acronym.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="acronym.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="acronym.type" mixed="true">
+    <xs:group ref="acronym.content"/>
+    <xs:attributeGroup ref="acronym.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="acronym" type="acronym.type"/>
+
+  <xs:attributeGroup name="cite.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="cite.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="cite.type" mixed="true">
+    <xs:group ref="cite.content"/>
+    <xs:attributeGroup ref="cite.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="cite" type="cite.type"/>
+
+  <xs:attributeGroup name="code.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="code.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="code.type" mixed="true">
+    <xs:group ref="code.content"/>
+    <xs:attributeGroup ref="code.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="code" type="code.type"/>
+
+  <xs:attributeGroup name="dfn.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="dfn.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="dfn.type" mixed="true">
+    <xs:group ref="dfn.content"/>
+    <xs:attributeGroup ref="dfn.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="dfn" type="dfn.type"/>
+
+  <xs:attributeGroup name="em.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="em.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="em.type" mixed="true">
+    <xs:group ref="em.content"/>
+    <xs:attributeGroup ref="em.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="em" type="em.type"/>
+
+
+  <xs:attributeGroup name="kbd.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="kbd.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="kbd.type" mixed="true">
+    <xs:group ref="kbd.content"/>
+    <xs:attributeGroup ref="kbd.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="kbd" type="kbd.type"/>
+
+
+  <xs:attributeGroup name="samp.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="samp.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="samp.type" mixed="true">
+    <xs:group ref="samp.content"/>
+    <xs:attributeGroup ref="samp.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="samp" type="samp.type"/>
+
+
+  <xs:attributeGroup name="strong.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="strong.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="strong.type" mixed="true">
+    <xs:group ref="strong.content"/>
+    <xs:attributeGroup ref="strong.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="strong" type="strong.type"/>
+
+  <xs:attributeGroup name="var.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="var.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="var.type" mixed="true">
+    <xs:group ref="var.content"/>
+    <xs:attributeGroup ref="var.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="var" type="var.type"/>
+
+  <xs:attributeGroup name="q.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+    <xs:attribute name="cite" type="URI"/>
+  </xs:attributeGroup>
+
+  <xs:group name="q.content">
+     <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+     </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="q.type" mixed="true">
+    <xs:group ref="q.content"/>
+    <xs:attributeGroup ref="q.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="q" type="q.type"/>
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlpres-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlpres-1.xsd
new file mode 100644
index 00000000000..400a034dcef
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlpres-1.xsd
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      This is the XML Schema Inline Presentation element module for XHTML
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+      Inline Presentational Elements
+    
+        * b, big, i, small, sub, sup, tt
+    
+      This module declares the elements and their attributes used to
+      support inline-level presentational markup.
+    </xs:documentation>
+    <xs:documentation 
+         source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_presentationmodule"/>
+  </xs:annotation>
+
+  <xs:attributeGroup name="InlPres.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="InlPres.content">
+    <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:group>  
+    
+  <xs:complexType name="InlPres.type" mixed="true">
+    <xs:group ref="InlPres.content"/>
+    <xs:attributeGroup ref="InlPres.attlist"/>
+  </xs:complexType>
+    
+  <xs:element name="b" type="InlPres.type"/>
+
+  <xs:element name="big" type="InlPres.type"/>
+
+  <xs:element name="i" type="InlPres.type"/>
+
+  <xs:element name="small" type="InlPres.type"/>
+
+  <xs:element name="sub" type="InlPres.type"/>
+
+  <xs:element name="sup" type="InlPres.type"/>
+
+  <xs:element name="tt" type="InlPres.type"/>
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlstruct-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlstruct-1.xsd
new file mode 100644
index 00000000000..f53715da6b4
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlstruct-1.xsd
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+
+  <xs:annotation>
+    <xs:documentation>
+         This is the XML Schema Inline Structural support module for XHTML
+         $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+      Inline Structural.
+      This module declares the elements and their attributes 
+      used to support inline-level structural markup.      
+      This is the XML Schema Inline Structural element module for XHTML
+
+        * br, span
+      
+    </xs:documentation>
+    <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_textmodule"/>
+  </xs:annotation>
+
+  <xs:attributeGroup name="br.attlist">
+    <xs:attributeGroup ref="Core.attrib"/>
+  </xs:attributeGroup>
+  
+  <xs:group name="br.content">
+     <xs:sequence/>
+  </xs:group>  
+
+  <xs:complexType name="br.type">
+    <xs:group ref="br.content"/>    
+    <xs:attributeGroup ref="br.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="br" type="br.type"/>
+
+  <xs:attributeGroup name="span.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+  
+  <xs:group name="span.content">
+    <xs:sequence>
+       <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>     
+    </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="span.type" mixed="true">
+    <xs:group ref="span.content"/>   
+    <xs:attributeGroup ref="span.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="span" type="span.type"/>
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlstyle-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlstyle-1.xsd
new file mode 100644
index 00000000000..b946c3978e7
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-inlstyle-1.xsd
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      Inline Style module    
+      This is the XML Schema Inline Style module for XHTML
+      
+         * styloe attribute
+
+      This module declares the 'style' attribute, used to support inline 
+      style markup. 
+
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+    <xs:documentation 
+       source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_styleattributemodule"/>    
+  </xs:annotation>
+
+  <xs:attributeGroup name="style.attrib">
+    <xs:attribute name="style" type="CDATA"/>
+  </xs:attributeGroup>
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-list-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-list-1.xsd
new file mode 100644
index 00000000000..7503a1fce62
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-list-1.xsd
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      List Module
+      This is the XML Schema Lists module for XHTML
+      List Module Elements
+    
+        * dl, dt, dd, ol, ul, li
+    
+      This module declares the list-oriented element types
+      and their attributes.
+      $Id$      
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+    <xs:documentation
+      source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_listmodule"/>      
+  </xs:annotation>
+
+  <xs:attributeGroup name="dt.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+  
+  <xs:group name="dt.content">
+    <xs:sequence>
+      <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="dt.type" mixed="true">
+    <xs:group ref="dt.content"/>
+    <xs:attributeGroup ref="dt.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="dt" type="dt.type"/>
+
+  <xs:attributeGroup name="dd.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+  
+  <xs:group name="dd.content">
+    <xs:sequence>
+      <xs:group ref="Flow.mix" minOccurs="0" maxOccurs="unbounded"/>  
+    </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="dd.type" mixed="true">
+    <xs:group ref="dd.content"/>
+    <xs:attributeGroup ref="dd.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="dd" type="dd.type"/>
+
+  <xs:attributeGroup name="dl.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="dl.content">
+    <xs:sequence>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="dt"/>
+        <xs:element ref="dd"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="dl.type">
+    <xs:group ref="dl.content"/>
+    <xs:attributeGroup ref="dl.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="dl" type="dl.type"/>
+
+  <xs:attributeGroup name="li.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+  
+  <xs:group name="li.content">
+    <xs:sequence>
+      <xs:group ref="Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>      
+  </xs:group>
+
+  <xs:complexType name="li.type" mixed="true">
+    <xs:group ref="li.content"/>  
+    <xs:attributeGroup ref="li.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="li" type="li.type"/>
+
+  <xs:attributeGroup name="ol.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:group name="ol.content">
+    <xs:sequence>
+      <xs:element ref="li" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="ol.type">
+    <xs:group ref="ol.content"/>  
+    <xs:attributeGroup ref="ol.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="ol" type="ol.type"/>
+
+  <xs:attributeGroup name="ul.attlist">
+    <xs:attributeGroup ref="Common.attrib"/>
+  </xs:attributeGroup>
+  
+  <xs:group name="ul.content">
+    <xs:sequence>
+      <xs:element ref="li" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="ul.type">
+    <xs:group ref="ul.content"/>    
+    <xs:attributeGroup ref="ul.attlist"/>
+  </xs:complexType>
+
+  <xs:element name="ul" type="ul.type"/>
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-notations-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-notations-1.xsd
new file mode 100644
index 00000000000..948a93e28bd
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-notations-1.xsd
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      Notations module
+      This is the XML Schema module for data type notations for XHTML
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+  
+  <xs:annotation>
+    <xs:documentation>
+      Notations module
+      Defines the XHTML notations, many of these imported from 
+      other specifications and standards. When an existing FPI is
+      known, it is incorporated here.            
+    </xs:documentation>
+    <xs:documentation
+         source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstraction.html#s_common_attrtypes"/>        
+  </xs:annotation>
+
+  <!-- W3C XML 1.0 Recommendation -->
+  <xs:notation name="w3c-xml"
+    public="ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN"/>
+
+  <!-- XML 1.0 CDATA -->
+  <xs:notation name="cdata" public="-//W3C//NOTATION XML 1.0: CDATA//EN"/>
+  
+  <!-- SGML Formal Public Identifiers -->
+  <xs:notation name="fpi"
+    public="ISO 8879:1986//NOTATION Formal Public Identifier//EN"/>
+
+  <!-- XHTML Notations ... -->
+  <!-- Length defined for cellpadding/cellspacing -->
+  <!-- nn for pixels or nn% for percentage length -->
+  <!-- a single character, as per section 2.2 of [XML] -->
+  <xs:notation name="character"
+    public="-//W3C//NOTATION XHTML Datatype: Character//EN"/>
+
+  <!-- a character encoding, as per [RFC2045] -->
+  <xs:notation name="charset"
+    public="-//W3C//NOTATION XHTML Datatype: Charset//EN"/>
+
+  <!-- a space separated list of character encodings, as per [RFC2045] -->
+  <xs:notation name="charsets"
+    public="-//W3C//NOTATION XHTML Datatype: Charsets//EN"/>
+
+  <!-- media type, as per [RFC2045] -->
+  <xs:notation name="contentType"
+    public="-//W3C//NOTATION XHTML Datatype: ContentType//EN"/>
+
+  <!-- comma-separated list of media types, as per [RFC2045] -->
+  <xs:notation name="contentTypes"
+    public="-//W3C//NOTATION XHTML Datatype: ContentTypes//EN"/>
+
+  <!-- date and time information. ISO date format -->
+  <xs:notation name="datetime"
+    public="-//W3C//NOTATION XHTML Datatype: Datetime//EN"/>
+
+  <!-- a language code, as per [RFC3066] -->
+  <xs:notation name="languageCode"
+    public="-//W3C//NOTATION XHTML Datatype: LanguageCode//EN"/>
+
+  <!-- nn for pixels or nn% for percentage length -->
+  <xs:notation name="length"
+    public="-//W3C//NOTATION XHTML Datatype: Length//EN"/>
+
+  <!-- space-separated list of link types -->
+  <xs:notation name="linkTypes"
+    public="-//W3C//NOTATION XHTML Datatype: LinkTypes//EN"/>
+
+  <!-- single or comma-separated list of media descriptors -->
+  <xs:notation name="mediaDesc"
+    public="-//W3C//NOTATION XHTML Datatype: MediaDesc//EN"/>
+
+  <!-- pixel, percentage, or relative -->
+  <xs:notation name="multiLength"
+    public="-//W3C//NOTATION XHTML Datatype: MultiLength//EN"/>
+
+  <!-- one or more digits (NUMBER) -->
+  <xs:notation name="number"
+    public="-//W3C//NOTATION XHTML Datatype: Number//EN"/>
+
+  <!-- one or more digits (NUMBER) -->
+  <xs:notation name="pixels"
+    public="-//W3C//NOTATION XHTML Datatype: Pixels//EN"/>
+
+  <!-- script expression -->
+  <xs:notation name="script"
+    public="-//W3C//NOTATION XHTML Datatype: Script//EN"/>
+
+  <!-- textual content -->
+  <xs:notation name="text" public="-//W3C//NOTATION XHTML Datatype: Text//EN"/>
+
+  <!-- a Uniform Resource Identifier, see [URI] -->
+  <xs:notation name="uri" public="-//W3C//NOTATION XHTML Datatype: URI//EN"/>
+
+  <!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
+  <xs:notation name="uris" public="-//W3C//NOTATION XHTML Datatype: URIs//EN"/>
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-pres-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-pres-1.xsd
new file mode 100644
index 00000000000..2ce4cf208dc
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-pres-1.xsd
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      This is the XML Schema Presentation module for XHTML
+      This is a REQUIRED module.
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+      Presentational Elements
+
+      This module defines elements and their attributes for
+      simple presentation-related markup.
+ 
+      Elements defined here:
+
+        * hr
+        * b, big, i, small, sub, sup, tt
+    </xs:documentation>
+    <xs:documentation 
+        source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_presentationmodule"/>
+  </xs:annotation>
+
+ <xs:include schemaLocation="xhtml-blkpres-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Block Presentational module
+        Elements defined here:
+ 
+         * hr
+      </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-inlpres-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Inline Presentational module
+        Elements defined here:
+
+          * b, big, i, small, sub, sup, tt
+    </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-table-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-table-1.xsd
new file mode 100644
index 00000000000..ba015e40e70
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-table-1.xsd
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/1999/xhtml" 
+           xmlns="http://www.w3.org/1999/xhtml" 
+           xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:annotation>
+        <xs:documentation>
+          This is the XML Schema Tables module for XHTML
+          $Id$
+        </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>
+          Tables
+      
+           * table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td
+      
+          This module declares element types and attributes used to provide
+          table markup similar to HTML 4.0, including features that enable
+          better accessibility for non-visual user agents.
+        </xs:documentation>
+        <xs:documentation 
+           source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_tablemodule"/>
+    </xs:annotation>
+
+    <xs:attributeGroup name="frame.attrib">
+        <xs:attribute name="frame">
+            <xs:simpleType>
+                <xs:restriction base="xs:NMTOKEN">
+                    <xs:enumeration value="void"/>
+                    <xs:enumeration value="above"/>
+                    <xs:enumeration value="below"/>
+                    <xs:enumeration value="hsides"/>
+                    <xs:enumeration value="lhs"/>
+                    <xs:enumeration value="rhs"/>
+                    <xs:enumeration value="vsides"/>
+                    <xs:enumeration value="box"/>
+                    <xs:enumeration value="border"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="rules.attrib">
+        <xs:attribute name="rules">
+            <xs:simpleType>
+                <xs:restriction base="xs:NMTOKEN">
+                    <xs:enumeration value="none"/>
+                    <xs:enumeration value="groups"/>
+                    <xs:enumeration value="rows"/>
+                    <xs:enumeration value="cols"/>
+                    <xs:enumeration value="all"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="CellVAlign.attrib">
+        <xs:attribute name="valign">
+            <xs:simpleType>
+                <xs:restriction base="xs:NMTOKEN">
+                    <xs:enumeration value="top"/>
+                    <xs:enumeration value="middle"/>
+                    <xs:enumeration value="bottom"/>
+                    <xs:enumeration value="baseline"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="CellHAlign.attrib">
+        <xs:attribute name="align">
+            <xs:simpleType>
+                <xs:restriction base="xs:NMTOKEN">
+                    <xs:enumeration value="left"/>
+                    <xs:enumeration value="center"/>
+                    <xs:enumeration value="right"/>
+                    <xs:enumeration value="justify"/>
+                    <xs:enumeration value="char"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="char" type="Character"/>
+        <xs:attribute name="charoff" type="Length"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="scope.attrib">
+        <xs:attribute name="scope">
+            <xs:simpleType>
+                <xs:restriction base="xs:NMTOKEN">
+                    <xs:enumeration value="row"/>
+                    <xs:enumeration value="col"/>
+                    <xs:enumeration value="rowgroup"/>
+                    <xs:enumeration value="colgroup"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="td.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+        <xs:attribute name="abbr" type="Text"/>
+        <xs:attribute name="axis" type="CDATA"/>
+        <xs:attribute name="headers" type="xs:IDREFS"/>
+        <xs:attributeGroup ref="scope.attrib"/>
+        <xs:attribute name="rowspan" type="Number" default="1"/>
+        <xs:attribute name="colspan" type="Number" default="1"/>
+        <xs:attributeGroup ref="CellHAlign.attrib"/>
+        <xs:attributeGroup ref="CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="td.content">
+       <xs:sequence>
+          <xs:group ref="Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
+       </xs:sequence>
+    </xs:group>    
+    
+    <xs:complexType name="td.type" mixed="true">
+        <xs:group ref="td.content"/>
+        <xs:attributeGroup ref="td.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="td" type="td.type"/>
+    
+    <xs:attributeGroup name="th.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+        <xs:attribute name="abbr" type="Text"/>
+        <xs:attribute name="axis" type="CDATA"/>
+        <xs:attribute name="headers" type="xs:IDREFS"/>
+        <xs:attributeGroup ref="scope.attrib"/>
+        <xs:attribute name="rowspan" type="Number" default="1"/>
+        <xs:attribute name="colspan" type="Number" default="1"/>
+        <xs:attributeGroup ref="CellHAlign.attrib"/>
+        <xs:attributeGroup ref="CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="th.content">
+       <xs:sequence>
+          <xs:group ref="Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
+       </xs:sequence>
+    </xs:group>     
+    
+    <xs:complexType name="th.type" mixed="true">
+        <xs:group ref="th.content"/>
+        <xs:attributeGroup ref="th.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="th" type="th.type"/>
+    
+    <xs:attributeGroup name="tr.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+        <xs:attributeGroup ref="CellHAlign.attrib"/>
+        <xs:attributeGroup ref="CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="tr.content">
+      <xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+            <xs:element ref="th"/>
+            <xs:element ref="td"/>
+        </xs:choice>
+      </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="tr.type">
+        <xs:group ref="tr.content"/>
+        <xs:attributeGroup ref="tr.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="tr" type="tr.type"/>
+    
+    <xs:attributeGroup name="col.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+        <xs:attribute name="span" type="Number" default="1"/>
+        <xs:attribute name="width" type="MultiLength"/>
+        <xs:attributeGroup ref="CellHAlign.attrib"/>
+        <xs:attributeGroup ref="CellVAlign.attrib"/>
+    </xs:attributeGroup>
+
+    <xs:group name="col.content">
+       <xs:sequence/>
+    </xs:group>             
+    
+    <xs:complexType name="col.type">
+        <xs:group ref="col.content"/>    
+        <xs:attributeGroup ref="col.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="col" type="col.type"/>
+    
+    <xs:attributeGroup name="colgroup.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+        <xs:attribute name="span" type="Number" default="1"/>
+        <xs:attribute name="width" type="MultiLength"/>
+        <xs:attributeGroup ref="CellHAlign.attrib"/>
+        <xs:attributeGroup ref="CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="colgroup.content">
+        <xs:sequence>
+            <xs:element ref="col" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="colgroup.type">
+        <xs:group ref="colgroup.content"/>
+        <xs:attributeGroup ref="colgroup.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="colgroup" type="colgroup.type"/>
+    
+    <xs:attributeGroup name="tbody.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+        <xs:attributeGroup ref="CellHAlign.attrib"/>
+        <xs:attributeGroup ref="CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="tbody.content">
+        <xs:sequence>
+            <xs:element ref="tr" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="tbody.type">
+        <xs:group ref="tbody.content"/>
+        <xs:attributeGroup ref="tbody.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="tbody" type="tbody.type"/>
+    
+    <xs:attributeGroup name="tfoot.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+        <xs:attributeGroup ref="CellHAlign.attrib"/>
+        <xs:attributeGroup ref="CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="tfoot.content">
+        <xs:sequence>
+            <xs:element ref="tr" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="tfoot.type">
+        <xs:group ref="tfoot.content"/>
+        <xs:attributeGroup ref="tfoot.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="tfoot" type="tfoot.type"/>
+    
+    <xs:attributeGroup name="thead.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+        <xs:attributeGroup ref="CellHAlign.attrib"/>
+        <xs:attributeGroup ref="CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="thead.content">
+        <xs:sequence>
+            <xs:element ref="tr" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="thead.type">
+        <xs:group ref="thead.content"/>
+        <xs:attributeGroup ref="thead.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="thead" type="thead.type"/>
+    
+    <xs:attributeGroup name="caption.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="caption.content">
+       <xs:sequence>
+         <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+       </xs:sequence>       
+    </xs:group>    
+
+    <xs:complexType name="caption.type" mixed="true">
+        <xs:group ref="caption.content"/>
+        <xs:attributeGroup ref="caption.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="caption" type="caption.type"/>
+    
+    <xs:attributeGroup name="table.attlist">
+        <xs:attributeGroup ref="Common.attrib"/>
+        <xs:attribute name="summary" type="Text"/>
+        <xs:attribute name="width" type="Length"/>
+        <xs:attribute name="border" type="Pixels"/>
+        <xs:attributeGroup ref="frame.attrib"/>
+        <xs:attributeGroup ref="rules.attrib"/>
+        <xs:attribute name="cellspacing" type="Length"/>
+        <xs:attribute name="cellpadding" type="Length"/>
+    </xs:attributeGroup>
+    
+    <xs:group name="table.content">
+        <xs:sequence>
+            <xs:element ref="caption" minOccurs="0"/>
+            <xs:choice>
+                <xs:element ref="col" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="colgroup" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:choice>
+            <xs:choice>
+                <xs:sequence>
+                    <xs:element ref="thead" minOccurs="0"/>
+                    <xs:element ref="tfoot" minOccurs="0"/>
+                    <xs:element ref="tbody" maxOccurs="unbounded"/>
+                </xs:sequence>
+                <xs:choice>
+                    <xs:element ref="tr" maxOccurs="unbounded"/>
+                </xs:choice>
+            </xs:choice>
+        </xs:sequence>
+    </xs:group>
+    
+    <xs:complexType name="table.type">
+        <xs:group ref="table.content"/>
+        <xs:attributeGroup ref="table.attlist"/>
+    </xs:complexType>
+    
+    <xs:element name="table" type="table.type"/>
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-text-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-text-1.xsd
new file mode 100644
index 00000000000..c0201aad05b
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/XHTML/xhtml-text-1.xsd
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      Textual Content
+      This is the XML Schema Text module for XHTML
+
+      The Text module includes declarations for all core
+      text container elements and their attributes.
+    
+        +  block phrasal
+        +  block structural
+        +  inline phrasal
+        +  inline structural
+      
+      $Id$
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+    <xs:documentation 
+        source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_textmodule"/>          
+  </xs:annotation>
+
+  <xs:include schemaLocation="xhtml-blkphras-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Block Phrasal module
+        Elements defined here:
+
+          * address, blockquote, pre, h1, h2, h3, h4, h5, h6
+    </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-blkstruct-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Block Structural module 
+        Elements defined here:
+
+          * div, p
+    </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-inlphras-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Inline Phrasal module
+        Elements defined here:
+
+          * abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
+    </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-inlstruct-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Inline Structural module 
+        Elements defined here:
+
+          * br,span
+    </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+
+</xs:schema>
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/dc.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/dc.xsd
new file mode 100644
index 00000000000..974c75ccc1d
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/dc.xsd
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://purl.org/dc/elements/1.1/" targetNamespace="http://purl.org/dc/elements/1.1/" elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+  <xs:annotation>
+    <xs:documentation xml:lang="en">
+      DCMES 1.1 XML Schema
+      XML Schema for http://purl.org/dc/elements/1.1/ namespace
+
+      Created 2003-04-02
+
+      Created by 
+
+      Tim Cole (t-cole3@uiuc.edu)
+      Tom Habing (thabing@uiuc.edu)
+      Jane Hunter (jane@dstc.edu.au)
+      Pete Johnston (p.johnston@ukoln.ac.uk),
+      Carl Lagoze (lagoze@cs.cornell.edu)
+
+      This schema declares XML elements for the 15 DC elements from the
+      http://purl.org/dc/elements/1.1/ namespace.
+
+      It defines a complexType SimpleLiteral which permits mixed content 
+      and makes the xml:lang attribute available. It disallows child elements by
+      use of minOcccurs/maxOccurs.
+
+      However, this complexType does permit the derivation of other complexTypes
+      which would permit child elements.
+
+      All elements are declared as substitutable for the abstract element any, 
+      which means that the default type for all elements is dc:SimpleLiteral.
+
+    </xs:documentation>
+
+  </xs:annotation>
+
+
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd">
+  </xs:import>
+
+  <xs:complexType name="SimpleLiteral" mixed="true">
+        <xs:annotation>
+        <xs:documentation xml:lang="en">
+            This is the default type for all of the DC elements.
+            It permits text content only with optional
+            xml:lang attribute.
+            Text is allowed because mixed="true", but sub-elements
+            are disallowed because minOccurs="0" and maxOccurs="0" 
+            are on the xs:any tag.
+
+    	    This complexType allows for restriction or extension permitting
+            child elements.
+    	</xs:documentation>
+		<xs:documentation xml:lang="en">This structure has been altered from 
+			its original declaration of:
+			<xs:complexType name="SimpleLiteral">
+				<xs:complexContent mixed="true">
+					<xs:restriction base="xs:anyType">
+						<xs:sequence>
+							<xs:any processContents="lax" minOccurs="0" maxOccurs="0"/>
+						</xs:sequence>
+						<xs:attribute ref="xml:lang" use="optional"/>
+					</xs:restriction>
+				</xs:complexContent>
+			</xs:complexType>		
+			Such a restriction from the xs:anyType is unnecessary, as this is 
+			implicit in all types. Further, the xs:any element with a minOccurs="0" 
+			causes issues with Apache Xml Beans. This declaration allows for an 
+			equivalent content model while still allowing extensions from this type
+			to declare elements to allow for true mixed content.
+		</xs:documentation>
+  	</xs:annotation>
+     <xs:attribute ref="xml:lang" use="optional"/>
+  </xs:complexType>
+
+  <xs:element name="any" type="SimpleLiteral" abstract="true"/>
+
+  <xs:element name="title" substitutionGroup="any"/>
+  <xs:element name="creator" substitutionGroup="any"/>
+  <xs:element name="subject" substitutionGroup="any"/>
+  <xs:element name="description" substitutionGroup="any"/>
+  <xs:element name="publisher" substitutionGroup="any"/>
+  <xs:element name="contributor" substitutionGroup="any"/>
+  <xs:element name="date" substitutionGroup="any"/>
+  <xs:element name="type" substitutionGroup="any"/>
+  <xs:element name="format" substitutionGroup="any"/>
+  <xs:element name="identifier" substitutionGroup="any"/>
+  <xs:element name="source" substitutionGroup="any"/>
+  <xs:element name="language" substitutionGroup="any"/>
+  <xs:element name="relation" substitutionGroup="any"/>
+  <xs:element name="coverage" substitutionGroup="any"/>
+  <xs:element name="rights" substitutionGroup="any"/>
+
+  <xs:group name="elementsGroup">
+  	<xs:annotation>
+    	<xs:documentation xml:lang="en">
+    	    This group is included as a convenience for schema authors
+            who need to refer to all the elements in the 
+            http://purl.org/dc/elements/1.1/ namespace.
+    	</xs:documentation>
+  	</xs:annotation>
+
+  <xs:sequence>
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="any"/>
+    </xs:choice>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="elementContainer">
+  	<xs:annotation>
+    	<xs:documentation xml:lang="en">
+    		This complexType is included as a convenience for schema authors who need to define a root
+    		or container element for all of the DC elements.
+    	</xs:documentation>
+  	</xs:annotation>
+
+    <xs:choice>
+      <xs:group ref="elementsGroup"/>
+    </xs:choice>
+  </xs:complexType>
+
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/dcmitype.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/dcmitype.xsd
new file mode 100644
index 00000000000..2433cf0bded
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/dcmitype.xsd
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://purl.org/dc/dcmitype/" targetNamespace="http://purl.org/dc/dcmitype/" elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+  <xs:annotation>
+    <xs:documentation xml:lang="en">
+      DCMI Type Vocabulary XML Schema
+      XML Schema for http://purl.org/dc/dcmitype/ namespace
+
+      Created 2003-04-02
+
+      Created by 
+
+      Tim Cole (t-cole3@uiuc.edu)
+      Tom Habing (thabing@uiuc.edu)
+      Jane Hunter (jane@dstc.edu.au)
+      Pete Johnston (p.johnston@ukoln.ac.uk),
+      Carl Lagoze (lagoze@cs.cornell.edu)
+
+      This schema defines a simpleType which enumerates
+      the allowable values for the DCMI Type Vocabulary.
+    </xs:documentation>
+
+ 
+  </xs:annotation>
+
+
+  <xs:simpleType name="DCMIType">
+     <xs:union>
+        <xs:simpleType>
+           <xs:restriction base="xs:Name">
+		<xs:enumeration value="Collection"/>
+		<xs:enumeration value="Dataset"/>
+		<xs:enumeration value="Event"/>
+		<xs:enumeration value="Image"/>
+		<xs:enumeration value="InteractiveResource"/>
+		<xs:enumeration value="Service"/>
+		<xs:enumeration value="Software"/>
+		<xs:enumeration value="Sound"/>
+		<xs:enumeration value="Text"/>
+		<xs:enumeration value="PhysicalObject"/>
+            </xs:restriction>
+        </xs:simpleType> 
+     </xs:union>
+  </xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/dcterms.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/dcterms.xsd
new file mode 100644
index 00000000000..d306002b5a7
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/dcterms.xsd
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" targetNamespace="http://purl.org/dc/terms/" xmlns="http://purl.org/dc/terms/" elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+  <xs:annotation>
+    <xs:documentation xml:lang="en">
+      DCterms XML Schema
+      XML Schema for http://purl.org/dc/terms/ namespace
+
+      Created 2003-04-02
+
+      Created by 
+
+      Tim Cole (t-cole3@uiuc.edu)
+      Tom Habing (thabing@uiuc.edu)
+      Jane Hunter (jane@dstc.edu.au)
+      Pete Johnston (p.johnston@ukoln.ac.uk),
+      Carl Lagoze (lagoze@cs.cornell.edu)
+
+      This schema declares XML elements for the DC elements and
+      DC element refinements from the http://purl.org/dc/terms/ namespace.
+      
+      It reuses the complexType dc:SimpleLiteral, imported from the dc.xsd
+      schema, which permits simple element content, and makes the xml:lang
+      attribute available.
+
+      This complexType permits the derivation of other complexTypes
+      which would permit child elements.
+
+      DC elements are declared as substitutable for the abstract element dc:any, and 
+      DC element refinements are defined as substitutable for the base elements 
+      which they refine.
+
+      This means that the default type for all XML elements (i.e. all DC elements and 
+      element refinements) is dc:SimpleLiteral.
+
+      Encoding schemes are defined as complexTypes which are restrictions
+      of the dc:SimpleLiteral complexType. These complexTypes restrict 
+      values to an appropriates syntax or format using data typing,
+      regular expressions, or enumerated lists.
+  
+      In order to specify one of these encodings an xsi:type attribute must 
+      be used in the instance document.
+
+      Also, note that one shortcoming of this approach is that any type can be 
+      applied to any of the elements or refinements.  There is no convenient way
+      to restrict types to specific elements using this approach.
+
+    </xs:documentation>
+
+  </xs:annotation>
+
+
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd">
+  </xs:import>
+
+   <xs:import namespace="http://purl.org/dc/elements/1.1/" schemaLocation="dc.xsd"/>
+
+   <xs:import namespace="http://purl.org/dc/dcmitype/" schemaLocation="dcmitype.xsd"/>
+
+   <xs:element name="alternative" substitutionGroup="dc:title"/>
+
+   <xs:element name="tableOfContents" substitutionGroup="dc:description"/>
+   <xs:element name="abstract" substitutionGroup="dc:description"/>
+
+   <xs:element name="created" substitutionGroup="dc:date"/>
+   <xs:element name="valid" substitutionGroup="dc:date"/>
+   <xs:element name="available" substitutionGroup="dc:date"/>
+   <xs:element name="issued" substitutionGroup="dc:date"/>
+   <xs:element name="modified" substitutionGroup="dc:date"/>
+   <xs:element name="dateAccepted" substitutionGroup="dc:date"/>
+   <xs:element name="dateCopyrighted" substitutionGroup="dc:date"/>
+   <xs:element name="dateSubmitted" substitutionGroup="dc:date"/>
+
+   <xs:element name="extent" substitutionGroup="dc:format"/>
+   <xs:element name="medium" substitutionGroup="dc:format"/>
+
+   <xs:element name="isVersionOf" substitutionGroup="dc:relation"/>
+   <xs:element name="hasVersion" substitutionGroup="dc:relation"/>
+   <xs:element name="isReplacedBy" substitutionGroup="dc:relation"/>
+   <xs:element name="replaces" substitutionGroup="dc:relation"/>
+   <xs:element name="isRequiredBy" substitutionGroup="dc:relation"/>
+   <xs:element name="requires" substitutionGroup="dc:relation"/>
+   <xs:element name="isPartOf" substitutionGroup="dc:relation"/>
+   <xs:element name="hasPart" substitutionGroup="dc:relation"/>
+   <xs:element name="isReferencedBy" substitutionGroup="dc:relation"/>
+   <xs:element name="references" substitutionGroup="dc:relation"/>
+   <xs:element name="isFormatOf" substitutionGroup="dc:relation"/>
+   <xs:element name="hasFormat" substitutionGroup="dc:relation"/>
+   <xs:element name="conformsTo" substitutionGroup="dc:relation"/>
+
+   <xs:element name="spatial" substitutionGroup="dc:coverage"/>
+   <xs:element name="temporal" substitutionGroup="dc:coverage"/>
+
+   <xs:element name="audience" substitutionGroup="dc:any"/>
+
+   <xs:element name="mediator" substitutionGroup="audience"/>
+   <xs:element name="educationLevel" substitutionGroup="audience"/>
+
+   <xs:element name="accessRights" substitutionGroup="dc:rights"/>
+
+   <xs:element name="bibliographicCitation" substitutionGroup="dc:identifier"/>
+
+  <xs:complexType name="LCSH">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="MESH">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="DDC">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="LCC">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="UDC">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="Period">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="W3CDTF">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+           <xs:union memberTypes="xs:gYear xs:gYearMonth xs:date xs:dateTime"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType> 
+
+  <xs:complexType name="DCMIType">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="dcmitype:DCMIType"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="IMT">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="URI">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:anyURI"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType> 
+
+  <xs:complexType name="ISO639-2">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="RFC1766">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:language"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="RFC3066">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:language"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="Point">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="ISO3166">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="Box">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="TGN">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:group name="elementsAndRefinementsGroup">
+  	<xs:annotation>
+    	<xs:documentation xml:lang="en">
+    		This group is included as a convenience for schema authors
+            who need to refer to all the DC elements and element refinements 
+            in the http://purl.org/dc/elements/1.1/ and 
+            http://purl.org/dc/terms namespaces. 
+            N.B. Refinements available via substitution groups.
+    	</xs:documentation>
+  	</xs:annotation>
+
+  <xs:sequence>
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+	<xs:element ref="dc:any"/>
+    </xs:choice>
+  </xs:sequence>
+  </xs:group>	
+
+  <xs:complexType name="elementOrRefinementContainer">
+  	<xs:annotation>
+    	<xs:documentation xml:lang="en">
+    		This is included as a convenience for schema authors who need to define a root
+    		or container element for all of the DC elements and element refinements.
+    	</xs:documentation>
+  	</xs:annotation>
+
+    <xs:choice>
+      <xs:group ref="elementsAndRefinementsGroup"/>
+    </xs:choice>
+  </xs:complexType>
+
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi-xhtml11-model-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi-xhtml11-model-1.xsd
new file mode 100644
index 00000000000..528ce98c7c3
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi-xhtml11-model-1.xsd
@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Copyright (c) 2009 DDI Alliance, DDI 3.1, 2009-10-18
+
+This file is part of DDI 3.1 XML Schema.
+
+DDI 3.1 XML Schema is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+DDI 3.1 XML Schema is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with DDI 3.1 XML Schema. If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      This is the XML Schema module of common content models for XHTML11
+      $Id: ddi-xhtml11-model-1.xsd,v 1.1 2007/02/08 16:03:11 jgager Exp $
+    </xs:documentation>
+    <xs:documentation source="XHTML/xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+      XHTML Document Model
+
+      This module describes the groupings of elements/attributes that make up
+      common content models for XHTML elements.
+
+      XHTML has following basic content models:
+
+          Inline.mix;          character-level elements
+          Block.mix;           block-like elements, eg., paragraphs and lists
+          Flow.mix;            any block or inline elements
+          HeadOpts.mix;        Head Elements
+          InlinePre.mix;     Special class for pre content model
+          InlineNoAnchor.mix;  Content model for Anchor
+
+      Any groups declared in this module may be used
+      to create element content models, but the above are
+      considered 'global' (insofar as that term applies here).
+
+      XHTML has the following Attribute Groups
+           Core.extra.attrib
+           I18n.extra.attrib
+           Common.extra
+
+      The above attribute Groups are considered Global
+
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:attributeGroup name="I18n.extra.attrib">
+    <xs:annotation>
+        <xs:documentation>
+           Extended I18n attribute
+        </xs:documentation>
+    </xs:annotation>
+    <xs:attributeGroup ref="dir.attrib">
+        <xs:annotation>
+          <xs:documentation>
+            "dir" Attribute from Bi Directional Text (bdo) Module
+          </xs:documentation>
+        </xs:annotation>
+    </xs:attributeGroup>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="Common.extra">
+    <xs:annotation>
+       <xs:documentation>
+           Extended Common Attributes
+       </xs:documentation>
+    </xs:annotation>
+    <xs:attributeGroup ref="style.attrib">
+       <xs:annotation>
+         <xs:documentation>
+           "style" attribute from Inline Style Module
+         </xs:documentation>
+       </xs:annotation>
+     </xs:attributeGroup>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="Core.extra.attrib">
+      <xs:annotation>
+        <xs:documentation>
+           Extend Core Attributes
+        </xs:documentation>
+      </xs:annotation>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="Global.core.extra.attrib">
+      <xs:annotation>
+        <xs:documentation>
+           Extended Global Core Attributes
+        </xs:documentation>
+      </xs:annotation>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="Global.I18n.extra.attrib">
+      <xs:annotation>
+        <xs:documentation>
+           Extended Global I18n attributes
+        </xs:documentation>
+      </xs:annotation>
+  </xs:attributeGroup>
+
+   <xs:attributeGroup name="Global.Common.extra">
+      <xs:annotation>
+        <xs:documentation>
+           Extended Global Common Attributes
+        </xs:documentation>
+      </xs:annotation>
+   </xs:attributeGroup>
+<!--
+  <xs:group name="HeadOpts.mix">
+    <xs:choice>
+      <xs:element ref="script"/>
+      <xs:element ref="style"/>
+      <xs:element ref="meta"/>
+      <xs:element ref="link"/>
+      <xs:element ref="object"/>
+    </xs:choice>
+  </xs:group>
+-->
+  <!--
+   ins and del are used to denote editing changes
+  -->
+<!--
+  <xs:group name="Edit.class">
+    <xs:choice>
+      <xs:element ref="ins"/>
+      <xs:element ref="del"/>
+    </xs:choice>
+  </xs:group>
+-->
+  <!--
+   script and noscript are used to contain scripts
+   and alternative content
+  -->
+<!--
+  <xs:group name="Script.class">
+    <xs:choice>
+      <xs:element ref="script"/>
+      <xs:element ref="noscript"/>
+    </xs:choice>
+  </xs:group>
+-->
+  <xs:group name="Misc.extra">
+    <xs:choice/>
+  </xs:group>
+
+  <!--
+   These elements are neither block nor inline, and can
+   essentially be used anywhere in the document body.
+  -->
+  <xs:group name="Misc.class">
+    <xs:choice/>
+<!--      <xs:group ref="Edit.class"/>
+      <xs:group ref="Script.class"/>
+      <xs:group ref="Misc.extra"/>
+    </xs:choice>
+ -->
+  </xs:group>
+
+  <!-- Inline Elements -->
+  <xs:group name="InlStruct.class">
+    <xs:choice>
+      <xs:element ref="br"/>
+      <xs:element ref="span"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="InlPhras.class">
+    <xs:choice>
+      <xs:element ref="em"/>
+      <xs:element ref="strong"/>
+      <xs:element ref="dfn"/>
+      <xs:element ref="code"/>
+      <xs:element ref="samp"/>
+      <xs:element ref="kbd"/>
+      <xs:element ref="var"/>
+      <xs:element ref="cite"/>
+      <xs:element ref="abbr"/>
+      <xs:element ref="acronym"/>
+      <xs:element ref="q"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="InlPres.class">
+    <xs:choice>
+      <xs:element ref="tt"/>
+      <xs:element ref="i"/>
+      <xs:element ref="b"/>
+      <xs:element ref="big"/>
+      <xs:element ref="small"/>
+      <xs:element ref="sub"/>
+      <xs:element ref="sup"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="I18n.class">
+    <xs:sequence>
+      <xs:element ref="bdo"/>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:group name="Anchor.class">
+    <xs:sequence>
+      <xs:element ref="a"/>
+    </xs:sequence>
+  </xs:group>
+<!--
+  <xs:group name="InlSpecial.class">
+    <xs:choice>
+      <xs:element ref="img"/>
+      <xs:element ref="map"/>
+      <xs:element ref="object"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="InlForm.class">
+    <xs:choice>
+      <xs:element ref="input"/>
+      <xs:element ref="select"/>
+      <xs:element ref="textarea"/>
+      <xs:element ref="label"/>
+      <xs:element ref="button"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="Inline.extra">
+    <xs:choice/>
+  </xs:group>
+
+  <xs:group name="Ruby.class">
+    <xs:sequence>
+      <xs:element ref="ruby"/>
+    </xs:sequence>
+  </xs:group>
+-->
+  <!--
+   Inline.class includes all inline elements,
+   used as a component in mixes
+  -->
+
+  <xs:group name="Inline.class">
+    <xs:choice>
+      <xs:group ref="InlStruct.class"/>
+      <xs:group ref="InlPhras.class"/>
+      <xs:group ref="InlPres.class"/>
+      <xs:group ref="I18n.class"/>
+      <xs:group ref="Anchor.class"/>
+<!--      <xs:group ref="InlSpecial.class"/>
+      <xs:group ref="InlForm.class"/>
+      <xs:group ref="Ruby.class"/>
+      <xs:group ref="Inline.extra"/> -->
+    </xs:choice>
+  </xs:group>
+
+  <!--
+     InlNoRuby.class includes all inline elements
+     except ruby
+  -->
+  <xs:group name="InlNoRuby.class">
+    <xs:choice>
+      <xs:group ref="InlStruct.class"/>
+      <xs:group ref="InlPhras.class"/>
+      <xs:group ref="InlPres.class"/>
+      <xs:group ref="I18n.class"/>
+      <xs:group ref="Anchor.class"/>
+<!--      <xs:group ref="InlSpecial.class"/> -->
+<!--      <xs:group ref="InlForm.class"/> -->
+<!--      <xs:group ref="Inline.extra"/> -->
+    </xs:choice>
+  </xs:group>
+
+
+  <!--
+    InlinePre.mix
+    Used as a component in pre model
+  -->
+  <xs:group name="InlinePre.mix">
+    <xs:choice>
+      <xs:group ref="InlStruct.class"/>
+      <xs:group ref="InlPhras.class"/>
+      <xs:element ref="tt"/>
+      <xs:element ref="i"/>
+      <xs:element ref="b"/>
+      <xs:group ref="I18n.class"/>
+      <xs:group ref="Anchor.class"/>
+<!--      <xs:element ref="script"/>
+      <xs:element ref="map"/>
+      <xs:group ref="Inline.extra"/> -->
+    </xs:choice>
+  </xs:group>
+
+  <!--
+    InlNoAnchor.class includes all non-anchor inlines,
+    used as a component in mixes
+  -->
+  <xs:group name="InlNoAnchor.class">
+    <xs:choice>
+      <xs:group ref="InlStruct.class"/>
+      <xs:group ref="InlPhras.class"/>
+      <xs:group ref="InlPres.class"/>
+      <xs:group ref="I18n.class"/>
+<!--      <xs:group ref="InlSpecial.class"/>
+      <xs:group ref="InlForm.class"/>
+      <xs:group ref="Ruby.class"/>
+      <xs:group ref="Inline.extra"/> -->
+    </xs:choice>
+  </xs:group>
+
+  <!--
+    InlNoAnchor.mix includes all non-anchor inlines
+  -->
+  <xs:group name="InlNoAnchor.mix">
+    <xs:choice>
+      <xs:group ref="InlNoAnchor.class"/>
+    </xs:choice>
+  </xs:group>
+
+  <!--
+    Inline.mix includes all inline elements, including Misc.class
+  -->
+  <xs:group name="Inline.mix">
+    <xs:choice>
+      <xs:group ref="Inline.class"/>
+    </xs:choice>
+  </xs:group>
+
+  <!--
+   InlNoRuby.mix includes all of inline.mix elements
+   except ruby
+  -->
+<!--
+  <xs:group name="InlNoRuby.mix">
+    <xs:choice>
+      <xs:group ref="InlNoRuby.class"/>
+      <xs:group ref="Misc.class"/>
+    </xs:choice>
+  </xs:group>
+-->
+
+  <!--
+    In the HTML 4 DTD, heading and list elements were included
+    in the block group. The Heading.class and
+    List.class groups must now be included explicitly
+    on element declarations where desired.
+  -->
+  <xs:group name="Heading.class">
+    <xs:choice>
+      <xs:element ref="h1"/>
+      <xs:element ref="h2"/>
+      <xs:element ref="h3"/>
+      <xs:element ref="h4"/>
+      <xs:element ref="h5"/>
+      <xs:element ref="h6"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="List.class">
+    <xs:choice>
+      <xs:element ref="ul"/>
+      <xs:element ref="ol"/>
+      <xs:element ref="dl"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="Table.class">
+    <xs:choice>
+      <xs:element ref="table"/>
+    </xs:choice>
+  </xs:group>
+<!--
+  <xs:group name="Form.class">
+    <xs:choice>
+      <xs:element ref="form"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="Fieldset.class">
+    <xs:choice>
+      <xs:element ref="fieldset"/>
+    </xs:choice>
+  </xs:group>
+-->
+  <xs:group name="BlkStruct.class">
+    <xs:choice>
+      <xs:element ref="p"/>
+      <xs:element ref="div"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="BlkPhras.class">
+    <xs:choice>
+      <xs:element ref="pre"/>
+      <xs:element ref="blockquote"/>
+      <xs:element ref="address"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="BlkPres.class">
+    <xs:sequence>
+      <xs:element ref="hr"/>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:group name="BlkSpecial.class">
+    <xs:choice>
+      <xs:group ref="Table.class"/>
+<!--      <xs:group ref="Form.class"/>
+      <xs:group ref="Fieldset.class"/> -->
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="Block.extra">
+    <xs:choice/>
+  </xs:group>
+
+  <!--
+    Block.class includes all block elements,
+    used as an component in mixes
+  -->
+  <xs:group name="Block.class">
+    <xs:choice>
+      <xs:group ref="BlkStruct.class"/>
+      <xs:group ref="BlkPhras.class"/>
+      <xs:group ref="BlkPres.class"/>
+      <xs:group ref="BlkSpecial.class"/>
+    </xs:choice>
+  </xs:group>
+
+  <!--
+   Block.mix includes all block elements plus %Misc.class;
+  -->
+  <xs:group name="Block.mix">
+    <xs:choice>
+      <xs:group ref="Heading.class"/>
+      <xs:group ref="List.class"/>
+      <xs:group ref="Block.class"/>
+    </xs:choice>
+  </xs:group>
+
+  <!--
+    All Content Elements
+    Flow.mix includes all text content, block and inline
+    Note that the "any" element included here allows us
+    to add data from any other namespace, a necessity
+    for compound document creation.
+    Note however that it is not possible to add
+    to any head level element without further
+    modification. To add RDF metadata to the head
+    of a document, modify the structure module.
+  -->
+  <xs:group name="Flow.mix">
+    <xs:choice>
+      <xs:group ref="Heading.class"/>
+      <xs:group ref="List.class"/>
+      <xs:group ref="Block.class"/>
+      <xs:group ref="Inline.class"/>
+    </xs:choice>
+  </xs:group>
+
+
+  <!--
+    BlkNoForm.mix includes all non-form block elements,
+       plus Misc.class
+  -->
+  <xs:group name="BlkNoForm.mix">
+    <xs:choice>
+      <xs:group ref="Heading.class"/>
+      <xs:group ref="List.class"/>
+      <xs:group ref="BlkStruct.class"/>
+      <xs:group ref="BlkPhras.class"/>
+      <xs:group ref="BlkPres.class"/>
+      <xs:group ref="Table.class"/>
+    </xs:choice>
+  </xs:group>
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi-xhtml11-modules-1.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi-xhtml11-modules-1.xsd
new file mode 100644
index 00000000000..fcf2a1ae709
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi-xhtml11-modules-1.xsd
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Copyright (c) 2009 DDI Alliance, DDI 3.1, 2009-10-18
+
+This file is part of DDI 3.1 XML Schema.
+
+DDI 3.1 XML Schema is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+DDI 3.1 XML Schema is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with DDI 3.1 XML Schema. If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<xs:schema targetNamespace="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xhtml" blockDefault="#all">
+
+  <xs:annotation>
+    <xs:documentation>
+      This schema includes all modules for XHTML1.1 Document Type.
+      $Id: ddi-xhtml11-modules-1.xsd,v 1.1 2007/02/08 16:03:11 jgager Exp $
+    </xs:documentation>
+    <xs:documentation source="XHTML/xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+     This schema includes all modules (and redefinitions)
+     for XHTML1.1 Document Type.
+     XHTML1.1 Document Type includes the following Modules
+
+       XHTML Core modules (Required for XHTML Family Conformance)
+            +  text
+            +  hypertext
+            +  lists
+            +  structure
+
+       Other XHTML modules
+            +  Edit
+            +  Bdo
+            +  Presentational
+            +  Link
+            +  Meta
+            +  Base
+            +  Scripting
+            +  Style
+            +  Image
+            +  Applet
+            +  Object
+            +  Param (Applet/Object modules require Param Module)
+            +  Tables
+            +  Forms
+            +  Client side image maps
+            +  Server side image maps
+
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:include schemaLocation="XHTML/xhtml-framework-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Schema Framework Component Modules:
+            +  notations
+            +  datatypes
+            +  common attributes
+            +  character entities
+      </xs:documentation>
+      <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_commonatts"/>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="XHTML/xhtml-text-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Text module
+
+        The Text module includes declarations for all core
+        text container elements and their attributes.
+
+            +  block phrasal
+            +  block structural
+            +  inline phrasal
+            +  inline structural
+
+        Elements defined here:
+          * address, blockquote, pre, h1, h2, h3, h4, h5, h6
+          * div, p
+          * abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
+          * br, span
+      </xs:documentation>
+      <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_textmodule"/>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="XHTML/xhtml-hypertext-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+         Hypertext module
+
+         Elements defined here:
+          * a
+      </xs:documentation>
+      <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_hypertextmodule"/>
+    </xs:annotation>
+  </xs:include>
+
+<!--
+  <xs:redefine schemaLocation="XHTML/xhtml-hypertext-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+         Hypertext module
+
+         Elements defined here:
+          * a
+      </xs:documentation>
+      <xs:documentation
+        source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_hypertextmodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="a.attlist">
+       <xs:attributeGroup ref="a.attlist" />
+       <xs:attributeGroup ref="a.csim.attlist">
+          <xs:annotation>
+            <xs:documentation>
+              Redefinition by Client Side Image Map Module
+            </xs:documentation>
+          </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="a.events.attlist">
+          <xs:annotation>
+            <xs:documentation>
+              Redefinition by XHTML Event Attribute Module
+            </xs:documentation>
+          </xs:annotation>
+       </xs:attributeGroup>
+    </xs:attributeGroup>
+  </xs:redefine>
+-->
+
+  <xs:include schemaLocation="XHTML/xhtml-list-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Lists module
+
+        Elements defined here:
+          * dt, dd, dl, ol, ul, li
+      </xs:documentation>
+      <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_listmodule"/>
+    </xs:annotation>
+  </xs:include>
+<!--
+ <xs:include schemaLocation="xhtml-edit-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Edit module
+
+        Elements defined here:
+          * ins, del
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_editmodule"/>
+    </xs:annotation>
+  </xs:include>
+-->
+  <xs:include schemaLocation="XHTML/xhtml-bdo-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Bidirectional element module
+
+        Elements defined here:
+          * bdo
+      </xs:documentation>
+      <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_bdomodule"/>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="XHTML/xhtml-pres-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Presentational module
+
+         Elements defined here:
+           * hr, b, big, i, small,sub, sup, tt
+      </xs:documentation>
+      <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_presentationmodule"/>
+    </xs:annotation>
+  </xs:include>
+<!--
+  <xs:include schemaLocation="XHTML/xhtml-link-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Link module
+
+        Elements defined here:
+          * link
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_linkmodule"/>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-meta-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Meta module
+
+        Elements defined here:
+        * meta
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_metamodule"/>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-base-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Base module
+
+        Elements defined here:
+          * base
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_basemodule"/>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-script-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Scripting module
+
+        Elements defined here:
+          * script, noscript
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_scriptmodule"/>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-style-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Style module
+
+        Elements defined here:
+          * style
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_stylemodule"/>
+    </xs:annotation>
+  </xs:include>
+-->
+  <xs:include schemaLocation="XHTML/xhtml-inlstyle-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Style attribute module
+
+        Attribute defined here:
+          * style
+      </xs:documentation>
+      <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_styleattributemodule"/>
+    </xs:annotation>
+  </xs:include>
+<!--
+  <xs:redefine schemaLocation="xhtml-image-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Image module
+
+        Elements defined here:
+          * img
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_imagemodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="img.attlist">
+       <xs:attributeGroup ref="img.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Original Image Attributes (in Image Module)
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="img.csim.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Redefinition by Client Side Image Map Module
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="img.ssimap.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Redefinition by Server Side Image Module
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+    </xs:attributeGroup>
+  </xs:redefine>
+
+  <xs:redefine schemaLocation="XHTML/xhtml-csismap-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Client-side mage maps module
+
+        Elements defined here:
+          * area, map
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_imapmodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="area.attlist">
+       <xs:attributeGroup ref="area.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Original Area Attributes (in CSI Module)
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="area.events.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Redefinition by Events Attribute Module
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+    </xs:attributeGroup>
+  </xs:redefine>
+
+  <xs:include schemaLocation="xhtml-ssismap-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+       Server-side image maps module
+
+        Attributes defined here:
+          * ismap on img
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_servermapmodule"/>
+    </xs:annotation>
+ </xs:include>
+
+  <xs:redefine schemaLocation="xhtml-object-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Object module
+
+        Elements defined here:
+          * object
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_objectmodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="object.attlist">
+       <xs:attributeGroup ref="object.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Original Object Attlist
+              </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="object.csim.attlist">
+           <xs:annotation>
+              <xs:documentation>
+                Redefinition by Client Image Map Module
+              </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+    </xs:attributeGroup>
+  </xs:redefine>
+
+  <xs:include schemaLocation="xhtml-param-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Param module
+
+        Elements defined here:
+          * param
+      </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+-->
+  <xs:include schemaLocation="XHTML/xhtml-table-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Tables module
+
+        Elements defined here:
+          * table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td
+      </xs:documentation>
+      <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_tablemodule"/>
+    </xs:annotation>
+  </xs:include>
+<!--
+  <xs:redefine schemaLocation="xhtml-form-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Forms module
+
+        Elements defined here:
+          * form, label, input, select, optgroup, option,
+          * textarea, fieldset, legend, button
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_extformsmodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="form.attlist">
+       <xs:annotation>
+          <xs:documentation>
+            Changes to XHTML Form Attlist
+          </xs:documentation>
+       </xs:annotation>
+       <xs:attributeGroup ref="form.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Original Form Attributes (declared in Forms Module)
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="form.events.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                XHTML Events Module - Attribute additions
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+    </xs:attributeGroup>
+
+    <xs:attributeGroup name="input.attlist">
+       <xs:annotation>
+          <xs:documentation>
+            Changes to XHTML Form Input Element
+          </xs:documentation>
+       </xs:annotation>
+       <xs:attributeGroup ref="input.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Original Input Attributes (in Forms Module)
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="input.csim.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Redefinition by Client Side Image Map Module
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="input.ssimap.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Redefinition by Server Side Image Map Module
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="input.events.attlist">
+           <xs:annotation>
+             <xs:documentation>
+               Redefinition by Event Attribute Module
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+    </xs:attributeGroup>
+
+
+    <xs:attributeGroup name="label.attlist">
+       <xs:attributeGroup ref="label.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Original Label Attributes (in Forms Module)
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="label.events.attlist">
+           <xs:annotation>
+             <xs:documentation>
+               Redefinition by Event Attribute Module
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+    </xs:attributeGroup>
+
+    <xs:attributeGroup name="select.attlist">
+       <xs:attributeGroup ref="select.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Original Select Attributes (in Forms Module)
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="select.events.attlist">
+           <xs:annotation>
+             <xs:documentation>
+               Redefinition by Event Attribute Module
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+    </xs:attributeGroup>
+
+    <xs:attributeGroup name="textarea.attlist">
+       <xs:attributeGroup ref="textarea.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Original TextArea Attributes (in Forms Module)
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+       <xs:attributeGroup ref="textarea.events.attlist">
+           <xs:annotation>
+             <xs:documentation>
+               Redefinition by Event Attribute Module
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+    </xs:attributeGroup>
+
+    <xs:attributeGroup name="button.attlist">
+       <xs:attributeGroup ref="button.attlist">
+           <xs:annotation>
+             <xs:documentation>
+                Original Button Attributes (in Forms Module)
+             </xs:documentation>
+           </xs:annotation>
+        </xs:attributeGroup>
+        <xs:attributeGroup ref="button.events.attlist">
+           <xs:annotation>
+             <xs:documentation>
+               Redefinition by Event Attribute Module
+             </xs:documentation>
+           </xs:annotation>
+       </xs:attributeGroup>
+    </xs:attributeGroup>
+  </xs:redefine>
+
+  <xs:include schemaLocation="xhtml-ruby-basic-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Ruby module
+
+        Elements defined here:
+          * ruby, rbc, rtc, rb, rt, rp
+
+        Note that either Ruby or Basic Ruby should be used but not both
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/2001/REC-ruby-20010531/#simple-ruby1"/>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="xhtml-events-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        XHTML Events Modules
+
+        Attributes defined here:
+          XHTML Event Types
+      </xs:documentation>
+      <xs:documentation
+         source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_intrinsiceventsmodule"/>
+    </xs:annotation>
+  </xs:include>
+-->
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi-xhtml11.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi-xhtml11.xsd
new file mode 100644
index 00000000000..bc4e5b010e9
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi-xhtml11.xsd
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Copyright (c) 2009 DDI Alliance, DDI 3.1, 2009-10-18
+
+This file is part of DDI 3.1 XML Schema.
+
+DDI 3.1 XML Schema is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+DDI 3.1 XML Schema is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with DDI 3.1 XML Schema. If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xhtml" targetNamespace="http://www.w3.org/1999/xhtml" blockDefault="#all">
+   <xs:annotation>
+      <xs:documentation>
+      This is the XML Schema driver for XHTML 1.1.
+      Please use this namespace for XHTML elements:
+
+         "http://www.w3.org/1999/xhtml"
+
+      $Id: ddi-xhtml11.xsd,v 1.1 2007/02/08 16:03:11 jgager Exp $
+    </xs:documentation>
+      <xs:documentation source="XHTML/xhtml-copyright-1.xsd"/>
+   </xs:annotation>
+   <xs:annotation>
+      <xs:documentation>
+      This is XHTML, a reformulation of HTML as a modular XML application
+      The Extensible HyperText Markup Language (XHTML)
+      Copyright Š1998-2003 World Wide Web Consortium
+      (Massachusetts Institute of Technology, Institut National de
+      Recherche en Informatique et en Automatique, Keio University).
+      All Rights Reserved.
+
+      Permission to use, copy, modify and distribute the XHTML Schema
+      modules and their accompanying xs:documentation for any purpose
+      and without fee is hereby granted in perpetuity, provided that the above
+      copyright notice and this paragraph appear in all copies.
+      The copyright holders make no representation about the suitability of
+      these XML Schema modules for any purpose.
+
+      They are provided "as is" without expressed or implied warranty.
+    </xs:documentation>
+   </xs:annotation>
+   <xs:annotation>
+      <xs:documentation>
+      This is the Schema Driver file for XHTML1.1
+      Document Type
+
+     This schema
+        + imports external schemas (xml.xsd)
+        + refedines (and include)s schema modules for XHTML1.1 Document Type.
+        + includes Schema for Named content model for the
+          XHTML1.1 Document Type
+
+        XHTML1.1 Document Type includes the following Modules
+           XHTML Core modules (Required for XHTML Family Conformance)
+            +  text
+            +  hypertext
+            +  lists
+            +  structure
+           Other XHTML modules
+            +  Edit
+            +  Bdo
+            +  Presentational
+            +  Link
+            +  Meta
+            +  Base
+            +  Scripting
+            +  Style
+            +  Image
+            +  Applet
+            +  Object
+            +  Param (Applet/Object modules require Param Module)
+            +  Tables
+            +  Forms
+            +  Client side image maps
+            +  Server side image maps
+            +  Ruby
+    </xs:documentation>
+   </xs:annotation>
+   <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd">
+      <xs:annotation>
+         <xs:documentation>
+         This import brings in the XML namespace attributes
+         The XML attributes are used by various modules.
+       </xs:documentation>
+      </xs:annotation>
+   </xs:import>
+   <xs:include schemaLocation="ddi-xhtml11-model-1.xsd">
+      <xs:annotation>
+         <xs:documentation>
+        Document Model module for the XHTML1.1 Document Type.
+        This schema file defines all named models used by XHTML
+        Modularization Framework for XHTML1.1 Document Type
+      </xs:documentation>
+      </xs:annotation>
+   </xs:include>
+   <xs:include schemaLocation="ddi-xhtml11-modules-1.xsd">
+      <xs:annotation>
+         <xs:documentation>
+        Schema that includes all modules (and redefinitions)
+        for XHTML1.1 Document Type.
+      </xs:documentation>
+      </xs:annotation>
+   </xs:include>
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi_codebook_2_5.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi_codebook_2_5.xsd
new file mode 100644
index 00000000000..7f81a1bb327
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/ddi_codebook_2_5.xsd
@@ -0,0 +1,8482 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Copyright (c) 2014 DDI Alliance, DDI 2.5, 2014-01-28
+
+This file is part of DDI 2.5 XML Schema.
+
+DDI 2.5 XML Schema is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+DDI 2.5 XML Schema is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with DDI 2.5 XML Schema. If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<!--
+DDI 2.5.1 XML Schema modifies DDI 2.5 by easing cardinality on many text 
+entries to better support multi-language content. It provides the element 
+dataFingerprint within fileTxt as a sub-minor, backward compatible bug correction. 
+This element was intended to be included in DDI 2.5. Documentation of new objects
+was expanded.
+
+These changes do not effect the namespace. 2013-11-14.
+
+-->
+<xs:schema xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:saxon="http://xml.apache.org/xslt" xmlns="ddi:codebook:2_5" xmlns:dc="http://purl.org/dc/terms/" targetNamespace="ddi:codebook:2_5" elementFormDefault="qualified" attributeFormDefault="unqualified">
+   <xs:annotation>
+      <xs:documentation>
+         This is a w3c Schema "Technical Implementation" of the DDI Conceptual Specification. 
+         This schema is intended for use in producing electronic versions of codebooks for quantitative social science data.
+         Please note that the attribute xml-lang in the a.globals group is an error that was persisted to retain backward compatibility. DO NOT USE THIS ATTRIBUTE. If this attribute has been used, transfer the content to xml:lang.
+   	  </xs:documentation>
+   </xs:annotation>
+
+   <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
+   <xs:import namespace="http://www.w3.org/1999/xhtml" schemaLocation="ddi-xhtml11.xsd"/>
+   <xs:import namespace="http://purl.org/dc/terms/" schemaLocation="dcterms.xsd"/>
+   
+   <!-- Base Structures -->
+   
+   <xs:attributeGroup name="GLOBALS">
+      <xs:attribute name="ID" type="xs:ID" use="optional"/>
+      <xs:attribute name="xml-lang" type="xs:NMTOKEN" use="optional">
+         <xs:annotation>
+            <xs:documentation>DO NOT USE THIS ATTRIBUTE. Its inclusion is an error that was persisted to retain backward compatibility. If this attribute has been used, transfer the content to xml:lang.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute ref="xml:lang" use="optional"/>
+      <xs:attribute name="source" default="producer">
+         <xs:simpleType>
+            <xs:restriction base="xs:NMTOKEN">
+               <xs:enumeration value="archive"/>
+               <xs:enumeration value="producer"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="elementVersion" type="xs:string" use="optional">
+	  	<xs:annotation>
+			<xs:documentation>Captures version of the element</xs:documentation>
+		</xs:annotation>
+	  </xs:attribute>
+      <xs:attribute name="elementVersionDate" type="dateSimpleType" use="optional">
+	  	<xs:annotation>
+			<xs:documentation>Indicates version date for the element. Use YYYY-MM-DD, YYYY-MM, or YYYY formats.</xs:documentation>
+		</xs:annotation>
+	  </xs:attribute>
+      <xs:attribute name="ddiLifecycleUrn" type="xs:anyURI" use="optional">
+         <xs:annotation>
+            <xs:documentation>Used to capture the DDI-Lifecycle type URN for the element. This may be captured during translation from DDI-Lifecycle to DDI-Codebook structure or in preparation for transferring to a DDI-Lifecycle structure.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="ddiCodebookUrn" type="xs:anyURI" use="optional">
+         <xs:annotation>
+            <xs:documentation>Used to capture the DDI-Codebook type URN for the element. This is used to assign a DDI-Codebook specific URN to the element, according the format prescribed by the DDI-Codebook standard.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:attributeGroup>
+   
+   <xs:complexType name="baseElementType" abstract="true">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Base Element Type</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This type forms the basis for all elements. Every element may contain the attributes defined the GLOBALS attribute group.</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+      <xs:attributeGroup ref="GLOBALS"/>
+   </xs:complexType>
+   
+   <xs:complexType name="abstractTextType" mixed="true" abstract="true">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Abstract Text Type</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This type forms the basis for all textual elements. Textual elements may contain text or a mix of select elements. This type is abstract and is refined by more specific types which will limit the allowable elements and attributes. Any textual element will be a subset of this type and can be processed as such.</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>         
+         </xs:documentation>
+      </xs:annotation>
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:any namespace="##targetNamespace http://www.w3.org/1999/xhtml" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:anyAttribute namespace="##local"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:complexType name="simpleTextType" mixed="true">
+         <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Simple Text Type</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This type forms the basis of most textual elements. Elements using this type may have mixed content (text and child elements). The child elements are from the PHRASE, FORM, and xhtml:BlkNoForm.mix (a specific subset of XHTML) content groups. Note that if elements from the PHRASE and FORM groups must not be used with elements from the xhtml:BlkNoForm.mix group; one can use either elements from xhtml:BlkNoForm.mix or elements from the PHRASE and FORM groups. This type is extended in some cases to include additional attributes.</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>  
+         </xs:documentation>
+      </xs:annotation>
+      <xs:complexContent>
+         <xs:restriction base="abstractTextType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:group ref="FORM"/>         
+                  <xs:group ref="xhtml:BlkNoForm.mix"/>
+               </xs:choice>            
+            </xs:sequence>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:complexType name="conceptualTextType" mixed="true">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Conceptual Text Type</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This type forms this basis for a textual element which may also provide for a conceptual (see concept) description of the element a longer description (see txt). If the concept and/or txt elements are used, then the element should contain no other child elements or text. Note that if elements from the PHRASE and FORM groups must not be used with elements from the xhtml:BlkNoForm.mix group; one can use either elements from xhtml:BlkNoForm.mix or elements from the PHRASE and FORM groups.</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>          
+         </xs:documentation>
+      </xs:annotation>
+      <xs:complexContent>
+         <xs:restriction base="abstractTextType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:group ref="FORM"/>         
+                  <xs:group ref="xhtml:BlkNoForm.mix"/>
+                  <xs:element ref="concept"/>
+                  <xs:element ref="txt"/>
+               </xs:choice>               
+            </xs:sequence>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:complexType name="tableAndTextType" mixed="true">
+      <xs:complexContent>
+         <xs:restriction base="abstractTextType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:group ref="FORM"/>         
+                  <xs:group ref="xhtml:BlkNoForm.mix"/>
+                  <xs:element ref="table"/>               
+               </xs:choice>               
+            </xs:sequence>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:complexType name="materialReferenceType" mixed="true">
+      <xs:complexContent>
+         <xs:restriction base="abstractTextType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:group ref="FORM"/>
+                  <xs:group ref="xhtml:BlkNoForm.mix"/>
+                  <xs:element ref="citation"/>               
+               </xs:choice>               
+            </xs:sequence>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:complexType name="simpleTextAndDateType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="date" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:complexType name="phraseType" mixed="true">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Phrase Type</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This type restricts the simpleTextType to allow for only child elements from the PHRASE content group. It still allows for mixed content (text and child elements).</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+      <xs:complexContent>
+         <xs:restriction base="simpleTextType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+               </xs:choice>               
+            </xs:sequence>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:complexType name="stringType">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">String Type</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This type restricts the base abstractTextType to only allow for text (i.e. no child elements).</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+      <xs:simpleContent>
+         <xs:restriction base="abstractTextType">
+            <xs:simpleType>
+               <xs:restriction base="xs:string"/>
+            </xs:simpleType>
+         </xs:restriction>
+      </xs:simpleContent>
+   </xs:complexType>
+   
+   <xs:complexType name="integerType">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Integer Type</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This type restricts the base abstractTextType to only allow for an integer as text content. No child elements are allowed.</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+      <xs:simpleContent>
+         <xs:restriction base="abstractTextType">
+            <xs:simpleType>
+               <xs:restriction base="xs:integer"/>
+            </xs:simpleType>
+         </xs:restriction>
+      </xs:simpleContent>
+   </xs:complexType>
+   
+   <xs:simpleType name="dateSimpleType">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Date Simple Type</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This simple type is a union of the various XML Schema date formats. Using this type, a date can be expressed as a year (YYYY), a year and month (YYYY-MM), a date (YYYY-MM-DD) or a complete date and time (YYYY-MM-DDThh:mm:ss). All of these formats allow for an optional timezone offset to be specified.</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+      <xs:union memberTypes="xs:dateTime xs:date xs:gYearMonth xs:gYear"/>
+   </xs:simpleType>
+   
+   <xs:complexType name="dateType">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Date Type</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This type restricts the base abstractTextType to allow for only the union of types defined in dateSimpleType as text content. No child elements are allowed.</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+      <xs:simpleContent>
+         <xs:restriction base="abstractTextType">
+            <xs:simpleType>
+               <xs:restriction base="dateSimpleType"/>
+            </xs:simpleType>
+         </xs:restriction>
+      </xs:simpleContent>
+   </xs:complexType>
+   
+   <!-- PRHASE Elements -->
+   
+   <xs:group name="PHRASE">
+      <xs:choice>
+         <xs:element ref="ExtLink" minOccurs="0" maxOccurs="unbounded"/>
+         <xs:element ref="Link" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+   </xs:group>
+
+   <xs:complexType name="ExtLinkType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="URI" type="xs:string" use="required"/>
+            <xs:attribute name="role" type="xs:string"/>
+            <xs:attribute name="title" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="ExtLink" type="ExtLinkType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">External Link</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This element permits encoders to provide links from any arbitrary element containing ExtLink as a subelement to electronic resources outside the codebook.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="LinkType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="refs" type="xs:IDREFS" use="required"/>
+            <xs:attribute name="role" type="xs:string"/>
+            <xs:attribute name="title" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="Link" type="LinkType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Link</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This element permits encoders to provide links from any arbitrary element containing Link as a subelement to other elements in the codebook.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <!-- FORM Elements -->
+   
+   <xs:group name="FORM">
+      <xs:choice>
+         <xs:element ref="div"/>
+         <xs:element ref="emph"/>
+         <xs:element ref="head"/>
+         <xs:element ref="hi"/>
+         <xs:element ref="list"/>
+         <xs:element ref="p"/>
+      </xs:choice>
+   </xs:group>
+   
+   <xs:complexType name="formType" mixed="true" abstract="true">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Form Type</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This type defines the basis for all elements in the FORM content group. This is derived from the abstractTextType. The content may still be mixed (text and child elements), but the child elements are restricted to be those from the PHRASE and FORM content groups, or the itm and label elements. Further, the possible attributes are restricted. This type is abstract, so specific form elements will further refine this type, but all elements in the FORM content group will conform to this structure and may be processed as such.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+      <xs:complexContent>
+         <xs:restriction base="abstractTextType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:group ref="FORM"/>
+                  <xs:element ref="itm"/>
+                  <xs:element ref="label"/>
+               </xs:choice>               
+            </xs:sequence>
+            <xs:attribute name="n" type="xs:string"/>
+            <xs:attribute name="rend" type="xs:string"/>
+            <xs:attribute name="type" type="xs:string"/>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:complexType name="divType">
+      <xs:complexContent>
+         <xs:restriction base="formType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="FORM"/>
+               </xs:choice>               
+            </xs:sequence>
+            <xs:attribute name="type" type="xs:string" use="prohibited"/>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="div" type="divType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Division</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Formatting element: marks a subdivision in a text.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="emphType" mixed="true">
+      <xs:complexContent>
+         <xs:restriction base="formType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:element ref="hi"/>
+                  <xs:element ref="list"/>
+               </xs:choice>               
+            </xs:sequence>
+            <xs:attribute name="type" type="xs:string" use="prohibited"/>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="emph" type="emphType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Emphasis</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Formatting element: marks words or phrases that are emphasized for rhetorical effect.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="headType" mixed="true">
+      <xs:complexContent>
+         <xs:restriction base="formType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:element ref="emph"/>
+                  <xs:element ref="hi"/>
+                  <xs:element ref="list"/>
+               </xs:choice>               
+            </xs:sequence>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="head" type="headType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Head</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Formatting element: marks off a heading to a division, list, etc. </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="hiType" mixed="true">
+      <xs:complexContent>
+         <xs:restriction base="formType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:element ref="emph"/>
+                  <xs:element ref="list"/>
+               </xs:choice>               
+            </xs:sequence>
+            <xs:attribute name="type" type="xs:string" use="prohibited"/>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="hi" type="hiType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Highlight</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Formatting element: marks a word or phrase as graphically distinct from the surrounding text, while making no claim for the reasons.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="listType">
+      <xs:complexContent>
+         <xs:restriction base="formType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:element ref="itm"/>
+                  <xs:element ref="label"/>
+               </xs:choice>               
+            </xs:sequence>
+            <xs:attribute name="type" default="simple">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="ordered"/>
+                     <xs:enumeration value="bulleted"/>
+                     <xs:enumeration value="simple"/>
+                     <xs:enumeration value="gloss"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="list" type="listType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">List</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Formatting element: contains any sequence of items (entries) organized as a list.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="itmType" mixed="true">
+      <xs:complexContent>
+         <xs:restriction base="formType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:element ref="emph"/>
+                  <xs:element ref="hi"/>
+                  <xs:element ref="list"/>
+                  <xs:element ref="p"/>
+                  <xs:element ref="label"/>
+               </xs:choice>               
+            </xs:sequence>
+            <xs:attribute name="type" type="xs:string" use="prohibited"/>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="itm" type="itmType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Item</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Formatting element: marks entries (items) in a list.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="labelType" mixed="true">
+      <xs:complexContent>
+         <xs:restriction base="formType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:element ref="emph"/>
+                  <xs:element ref="hi"/>               
+               </xs:choice>               
+            </xs:sequence>
+            <xs:attribute name="type" type="xs:string" use="prohibited"/>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="label" type="labelType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Label</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Formatting element: contains the label associated with an item in a list; in glossaries, marks the term being defined. </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Label</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">A short description of the parent element. Attribute "level" indicates the level to which the element applies (variable group, nCube group, variable, etc.). The "vendor" attribute allows for specification of different labels for use with different vendors' software. Attribute "country" allows specification of a different label by country for the same element to which it applies. Attribute "sdatrefs" allows pointing to specific dates, universes, or other information encoded in the study description. The attributes "country" and "sdatrefs" are intended to cover instances of comparative data, by retaining consistency in some elements over time and geography, but altering, as appropriate, information pertaining to date, language, and/or location.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <recGrp rectype="A" keyvar="H-SEQ" recidvar="PRECORD"> 
+                           <labl>Person (A) Record</labl> 
+                        </recGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <varGrp>
+                           <labl>Study Procedure Information</labl>
+                        </varGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <varGrp>
+                           <labl>Political Involvement and National Goals</labl>
+                        </varGrp>
+                     ]]></xhtml:samp> 
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <varGrp>
+                           <labl>Household Variable Section</labl>
+                        </varGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCubeGrp>
+                           <labl>Sex by Work Experience in 1999 by Income in 1999</labl>
+                        </nCubeGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCubeGrp>
+                           <labl>Tenure by Age of Householder</labl>
+                        </nCubeGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <labl>Why No Holiday-No Money</labl>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catgryGrp>
+                           <labl>Other Agricultural and Related Occupations</labl>
+                        </catgryGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catgry>
+                           <labl>Better</labl>
+                        </catgry>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catgry>
+                           <labl>About the same</labl> 
+                        </catgry>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catgry>
+                           <labl>Inap.</labl> 
+                        </catgry>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCube>
+                           <labl>Age by Sex by Poverty Status</labl>
+                        </nCube>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <otherMat type="SAS data definition statements" level="study" URI="http:// www.icpsr.umich.edu">
+                           <labl>SAS Data Definition Statements for  ICPSR 6837</labl>
+                        </otherMat>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="pType" mixed="true">
+      <xs:complexContent>
+         <xs:restriction base="formType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:element ref="emph"/>
+                  <xs:element ref="hi"/>
+                  <xs:element ref="list"/>
+               </xs:choice>               
+            </xs:sequence>
+               <xs:attribute name="type" type="xs:string" use="prohibited"/>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="p" type="pType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Paragraph</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Marks a paragraph.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <!-- Codebook Elements -->
+   
+   <xs:complexType name="abstractType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextAndDateType">
+            <xs:attribute name="contentType" use="optional">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="abstract"/>
+                     <xs:enumeration value="purpose"/>
+                     <xs:enumeration value="mixed"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="abstract" type="abstractType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Abstract</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">An unformatted summary describing the purpose, nature, and scope of the data collection, special characteristics of its contents, major subject areas covered, and what questions the PIs attempted to answer when they conducted the study. A listing of major variables in the study is important here. In cases where a codebook contains more than one abstract (for example, one might be supplied by the data producer and another prepared by the data archive where the data are deposited), the "source" and "date" attributes may be used to distinguish the abstract versions. Maps to Dublin Core Description element. Inclusion of this element in the codebook is recommended. The "date" attribute should follow ISO convention of YYYY-MM-DD. The contentType attribute provides forward-compatibility with DDI 3 by describing where the content fits in that structure, or if is mixed in terms of what is contained.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <abstract date="1999-01-28" source="ICPSR"> Data on labor force activity for the week prior to the survey are supplied in this collection. Information is available on the employment status, occupation, and industry of persons 15 years old and over. Demographic variables such as age, sex, race, marital status, veteran status, household relationship, educational background, and Hispanic origin are included. In addition to providing these core data, the May survey also contains a supplement on work schedules for all applicable persons aged 15 years and older who were employed at the time of the survey. This supplement focuses on shift work, flexible hours, and work at home for both main and second jobs.</abstract>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="accsPlacType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="URI" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="accsPlac" type="accsPlacType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Location of Data Collection</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Location where the data collection is currently stored. Use the URI attribute to provide a URN or URL for the storage site or the actual address from which the data may be downloaded.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="actMin" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Actions to Minimize Losses</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Summary of actions taken to minimize data loss. Includes information on actions such as follow-up visits, supervisory checks, historical matching, estimation, etc.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <actMin>To minimize the number of unresolved cases and reduce the potential nonresponse bias, four follow-up contacts were made with agencies that had not responded by various stages of the data collection process.</actMin>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="altTitl" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Alternative Title</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">A title by which the work is commonly referred, or an abbreviation of the title.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="anlyInfoType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="respRate" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="EstSmpErr" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="dataAppr" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="anlyInfo" type="anlyInfoType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Data Appraisal</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information on data appraisal.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="anlyUnitType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="conceptualTextType">
+            <xs:attribute name="unit" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="anlyUnit" type="anlyUnitType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Unit of Analysis</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Basic unit of analysis or observation that the file describes: individuals, families/households, groups, institutions/organizations, administrative units, etc. The "unit" attribute is included to permit the development of a controlled vocabulary for this element.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <anlyUnit>individuals</anlyUnit>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+     
+   <xs:element name="anlysUnit" type="conceptualTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Analysis Unit</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Provides information regarding whom or what the variable/nCube describes. The element may be repeated only to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <anlysUnit>This variable reports election returns at the constituency level.</anlysUnit>
+                        </var>
+                     ]]></xhtml:samp> 
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCube>
+                           <anlysUnit>Household</anlysUnit>
+                        </nCube>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="AuthEntyType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="affiliation" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="AuthEnty" type="AuthEntyType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Authoring Entity/Primary Investigator</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use "affiliation" attribute if available. Invert first and last name and use commas. Author of data collection (codeBook/stdyDscr/citation/rspStmt/AuthEnty) maps to Dublin Core Creator element. Inclusion of this element in codebook is recommended. </xhtml:p>
+                     <xhtml:p>The "author" in the Document Description should be the individual(s) or organization(s) directly responsible for the intellectual content of the DDI version, as distinct from the person(s) or organization(s) responsible for the intellectual content of the earlier paper or electronic edition from which the DDI edition may have been derived.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <AuthEnty>United States Department of Commerce. Bureau of the Census</AuthEnty>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <AuthEnty affiliation="European Commission">Rabier, Jacques-Rene</AuthEnty>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+ 
+   <xs:element name="avlStatus" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Availability Status</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Statement of collection availability. An archive may need to indicate that a collection is unavailable because it is embargoed for a period of time, because it has been superseded, because a new edition is imminent, etc. It is anticipated that a controlled vocabulary will be developed for this element.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <avlStatus>This collection is superseded by CENSUS OF POPULATION, 1880 [UNITED STATES]: PUBLIC USE SAMPLE (ICPSR 6460).</avlStatus>
+                     ]]></xhtml:samp>
+                 </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="backwardType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="qstn" type="xs:IDREFS" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="backward" type="backwardType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Backflow</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Contains a reference to IDs of possible preceding questions. The "qstn" IDREFS may be used to specify the question IDs.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <qstn>
+                              <backward qstn="Q12 Q13 Q14 Q15">For responses on a similar topic, see questions 12-15.</backward>
+                           </qstn> 
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <qstn>
+                              <backward qstn="Q143"/>
+                           </qstn> 
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="biblCitType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="format" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="biblCit" type="biblCitType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Bibliographic Citation</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Complete bibliographic reference containing all of the standard elements of a citation that can be used to cite the work. The "format" attribute is provided to enable specification of the particular citation style used, e.g., APA, MLA, Chicago, etc.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <biblCit format="MRDF">Rabier, Jacques-Rene, and Ronald Inglehart. EURO-BAROMETER 11: YEAR OF  THE CHILD IN EUROPE, APRIL 1979 [Codebook file]. Conducted by Institut Francais D'Opinion Publique (IFOP), Paris, et al. ICPSR ed. Ann Arbor, MI: Inter-university Consortium for Political and Social Resarch [producer and distributor], 1981.</biblCit>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="boundPolyType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="polygon" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="boundPoly" type="boundPolyType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Geographic Bounding Polygon</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>This field allows the creation of multiple polygons to describe in a more detailed manner the geographic area covered by the dataset. It should only be used to define the outer boundaries of a covered area. For example, in the United States, such polygons can be created to define boundaries for Hawaii, Alaska, and the continental United States, but not interior boundaries for the contiguous states. This field is used to refine a coordinate-based search, not to actually map an area. </xhtml:p>
+                     <xhtml:p>If the boundPoly element is used, then geoBndBox MUST be present, and all points enclosed by the boundPoly MUST be contained within the geoBndBox. Elements westBL, eastBL, southBL, and northBL of the geoBndBox should each be represented in at least one point of the boundPoly description. </xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <geogCover>Nevada State</geogCover>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <boundPoly>
+                           <polygon>
+                              <point>
+                                 <gringLat>42.002207</gringLat>
+                                 <gringLon>-120.005729004</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>42.002207</gringLat>
+                                 <gringLon>-114.039663</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>35.9</gringLat>
+                                 <gringLon>-114.039663</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>36.080</gringLat>
+                                 <gringLon>-114.544</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>35.133</gringLat>
+                                 <gringLon>-114.542</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>35.00208499998</gringLat>
+                                 <gringLon>-114.63288</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>35.00208499998</gringLat>
+                                 <gringLon>-114.63323</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>38.999</gringLat>
+                                 <gringLon>-120.005729004</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>42.002207</gringLat>
+                                 <gringLon>-120.005729004</gringLon>
+                              </point>
+                           </polygon>
+                        </boundPoly>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <geogCover>Norway</geogCover>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <boundPoly>
+                           <polygon>
+                              <point>
+                                 <gringLat>80.76416</gringLat>
+                                 <gringLon>33.637497</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>80.76416</gringLat>
+                                 <gringLon>10.2</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>62.48395</gringLat>
+                                 <gringLon>4.789583</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>57.987915</gringLat>
+                                 <gringLon>4.789583</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>57.987915</gringLat>
+                                 <gringLon>11.8</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>61.27794</gringLat>
+                                 <gringLon>13.2336</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>63.19012</gringLat>
+                                 <gringLon>13.2336</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>67.28615</gringLat>
+                                 <gringLon>17.24580</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>68.14297</gringLat>
+                                 <gringLon>21.38362</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>68.14297</gringLat>
+                                 <gringLon>25.50054</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>69.39685</gringLat>
+                                 <gringLon>27.38137</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>68.76991</gringLat>
+                                 <gringLon>28.84424</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>68.76991</gringLat>
+                                 <gringLon>31.31021</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>71.42</gringLat>
+                                 <gringLon>31.31021</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>71.42</gringLat>
+                                 <gringLon>33.637497</gringLon>
+                              </point>
+                              <point>
+                                 <gringLat>80.76416</gringLat>
+                                 <gringLon>33.637497</gringLon>
+                              </point>
+                           </polygon>
+                        </boundPoly>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="caseQnty" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Number of cases / Record Quantity</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Number of cases or observations.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <caseQnty>1011</caseQnty>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="catStatType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="type" default="freq">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="freq"/>
+                     <xs:enumeration value="percent"/>
+                     <xs:enumeration value="crosstab"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherType" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="URI" type="xs:string" use="optional"/>
+            <xs:attribute name="methrefs" type="xs:IDREFS" use="optional"/>
+            <xs:attribute name="wgtd" default="not-wgtd">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="wgtd"/>
+                     <xs:enumeration value="not-wgtd"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="wgt-var" type="xs:IDREFS" use="optional"/>
+            <xs:attribute name="weight" type="xs:IDREFS" use="optional"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="catStat" type="catStatType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Category Level Statistic</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">May include frequencies, percentages, or crosstabulation results. This field can contain one of the following: 1. textual information (e.g., PCDATA), or 2. non-parseable character data (e.g., the statistics), or 3. some other form of external information (table, image, etc.) In case 1, the tag can be used to mark up character data; tables can also be included in the actual markup. In cases 2 or 3, the element can be left empty and the "URI" attribute used to refer to the external object containing the information. The attribute "type" indicates the type of statistics presented - frequency, percent, or crosstabulation. If a value of "other" is used for this attribute, the "otherType" attribute should take a value from a controlled vocabulary. This option should only be used when applying a controlled vocabulary to this attribute. Use the complex element controlledVocabUsed to identify the controlled vocabulary to which the selected term belongs.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <catgryGrp>
+                              <catStat type="freq">256</catStat>
+                           </catgryGrp>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="catValu" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Category Value</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The explicit response.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <catgry missing="Y" missType="inap">
+                              <catValu>9</catValu> 
+                           </catgry>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="catLevelType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="levelnm" type="xs:string"/>
+            <xs:attribute name="geoMap" type="xs:IDREFS"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="catLevel" type="catLevelType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Category Level</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Used to describe the levels of the category hierarchy. Note that we do not indicate nesting levels or roll-up structures here. This is done to be able to support ragged hierarchies. A category level may be linked to one or more maps of the variable content. This id done by referencing the IDs of the appropriate geoMap elements in the attribute <xhtml:code>geoMap</xhtml:code>.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catlevel ID="Level1" levelnm="Broader sectors"/>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catlevel ID="Level2" levelnm="Narrower sectors"/>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catlevel ID="Level3" levelnm="Occupations" geoMap="GEO_1 GEO_2"/>
+                     ]]></xhtml:samp>                  
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="catgryType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="catValu" minOccurs="0"/>
+               <xs:element ref="labl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="txt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="catStat" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="mrow" minOccurs="0"/>
+            </xs:sequence>
+            <xs:attribute name="missing" default="N">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="Y"/>
+                     <xs:enumeration value="N"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="missType" type="xs:string" use="optional"/>
+            <xs:attribute name="country" type="xs:string" use="optional"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS" use="optional"/>
+            <xs:attribute name="excls" default="true">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="true"/>
+                     <xs:enumeration value="false"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="catgry" type="xs:IDREFS" use="optional"/>
+            <xs:attribute name="level" type="xs:IDREF" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="catgry" type="catgryType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Category</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>A description of a particular response.</xhtml:p>
+                     <xhtml:p>The attribute "missing" indicates whether this category group contains missing data or not. </xhtml:p>
+                     <xhtml:p>The attribute "missType" is used to specify the type of missing data, e.g., inap., don't know, no answer, etc. </xhtml:p>
+                     <xhtml:p>The attribute "country" allows for the denotation of country-specific category values.</xhtml:p>
+                     <xhtml:p>The "sdatrefs" attribute records the ID values of all elements within the  summary data description that apply to this category. </xhtml:p>
+                     <xhtml:p>The exclusiveness attribute ("excls") should be set to "false" if the category can appear in more than one place in the classification hierarchy.</xhtml:p>
+                     <xhtml:p>The attribute "catgry" is an IDREF referencing any child categories of this category element. Used to capture nested hierarchies of categories.</xhtml:p>
+                     <xhtml:p>The attribute "level" is an IDREF referencing the catLevel ID in which this category exists.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catlevel ID="Level1" levelnm="Broader sectors"/>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catlevel ID="Level2" levelnm="Narrower sectors"/>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catlevel ID="Level3" levelnm="Occupations"/>
+                     ]]></xhtml:samp>
+                     <!-- ... -->
+                  <xhtml:samp class="xml_sample"><![CDATA[
+                        <catgry ID="C1" catgry="C2" Level="Level1">
+                           <catValu>0</catValu>
+                           <labl>Management, professional and related occupations</labl>
+                        </catgry>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catgry ID="C2" catgry="C3, C4" Level="Level2">
+                           <catValu>01</catValu>
+                           <labl>Management occupations</labl>
+                        </catgry>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catgry ID="C3" Level="Level3">
+                           <catValu>011</catValu>
+                           <labl>Top executives</labl>
+                        </catgry>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catgry ID="C4" Level="Level3">
+                           <catValu>012</catValu>
+                           <labl>Financial managers</labl>
+                        </catgry>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="catgryGrpType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="labl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="catStat" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="txt" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="missing" default="N">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="Y"/>
+                     <xs:enumeration value="N"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="missType" type="xs:string" use="optional"/>
+            <xs:attribute name="catgry" type="xs:IDREFS" use="optional"/>
+            <xs:attribute name="catGrp" type="xs:IDREFS" use="optional"/>
+            <xs:attribute name="levelno" type="xs:string" use="optional"/>
+            <xs:attribute name="levelnm" type="xs:string" use="optional"/>
+            <xs:attribute name="compl" default="true">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="true"/>
+                     <xs:enumeration value="false"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="excls" default="true">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="true"/>
+                     <xs:enumeration value="false"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="catgryGrp" type="catgryGrpType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Category Group</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">A description of response categories that might be grouped together. The attribute "missing" indicates whether this category group contains missing data or not. The attribute "missType" is used to specify the type of missing data, e.g., inap., don't know, no answer, etc. The attribute catGrp is used to indicate all the subsidiary category groups which nest underneath the current category group. This allows for the encoding of a hierarchical structure of category groups. The "levelno" attribute allows the addition of a level number, and "levelnm" allows the addition of a level name to the category group. The completeness attribute ("compl") should be set to "false" if the category group is incomplete (not a complete aggregate of all sub-nodes or children). The exclusiveness attribute ("excls") should be set to "false" if the category group can appear in more than one place in the classification hierarchy.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="citReq" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Citation Requirement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Text of requirement that a data collection should be cited properly in articles or other publications that are based on analysis of the data.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <citReq>Publications based on ICPSR data collections should acknowledge those sources by  means of bibliographic citations. To ensure that such source attributions are captured for social science bibliographic utilities, citations must appear in footnotes or in the reference section of publications.</citReq>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="citationType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="titlStmt"/>
+               <xs:element ref="rspStmt" minOccurs="0"/>
+               <xs:element ref="prodStmt" minOccurs="0"/>
+               <xs:element ref="distStmt" minOccurs="0"/>
+               <xs:element ref="serStmt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="verStmt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="biblCit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="holdings" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:group ref="dc:elementsAndRefinementsGroup"/>
+            </xs:sequence>
+            <xs:attribute name="MARCURI" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="citation" type="citationType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Bibliographic Citation</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>This element encodes the bibliographic information for the work at the level specified: (1) Document Description, Citation (of Marked-up Document), (2) Document Description, Citation (of Marked-up Document Source), (3) Study Description, Citation (of Study), (4) Study Description, Other Material, and (5) Other Material for the study itself. Bibliographic information includes title information, statement of responsibility, production and distribution information, series and version information, text of a preferred bibliographic citation, and notes (if any). </xhtml:p>
+                     <xhtml:p>A MARCURI attribute is provided to link to the MARC record for the citation.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="cleanOpsType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="agency" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="cleanOps" type="cleanOpsType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Cleaning Operations</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Methods used to "clean" the data collection, e.g., consistency checking, wild code checking, etc. The "agency" attribute permits specification of the agency doing the data cleaning.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <cleanOps>Checks for undocumented codes were performed, and data were subsequently revised in consultation with the principal investigator.</cleanOps>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="codInstr" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Coder Instructions</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Any special instructions to those who converted information from one form to another for a particular variable. This might include the reordering of numeric information into another form or the conversion of textual information into numeric information.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <codInstr>Use the standard classification tables to present responses to the question: What is your occupation? into numeric codes.</codInstr>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="codeBookType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="docDscr" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="stdyDscr" maxOccurs="unbounded"/>
+               <xs:element ref="fileDscr" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="dataDscr" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="otherMat" minOccurs="0" maxOccurs="unbounded">
+               	<xs:annotation>
+               		<xs:documentation>This should be used for materials that are primarily descriptions of the content and use of the study, such as appendices, sampling information, weighting details, methodological and technical details, publications based upon the study content, related studies or collection of studies, etc. This section is intended to include or to link to materials used in the production of the study or useful in the analysis of the study.</xs:documentation>
+               	</xs:annotation>
+               </xs:element>
+            </xs:sequence>
+            <xs:attribute name="version" type="xs:string" fixed="2.5"/>
+            <xs:attribute name="codeBookAgency" type="xs:NCName" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="codeBook" type="codeBookType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Codebook</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>Every element in the DDI DTD/Schema has the following attributes:</xhtml:p>
+                     <xhtml:p>ID - This uniquely identifies each element.</xhtml:p>
+                     <xhtml:p>xml-lang - Use of this attribute is deprecated, and it will no longer be supported in the next major version of the DDI specification. For newly created XML documents, please use xml:lang.</xhtml:p>
+                     <xhtml:p>xml:lang - This attribute specifies the language used in the contents and attribute values of any element in the XML document. Use of ISO (<xhtml:a href="http://www.iso.org/">www.iso.org</xhtml:a>) language codes is recommended.</xhtml:p>
+                     <xhtml:p>source - This attribute identifies the source that provided information in the element. If the documentation contains two differing sets of information on Sampling Procedure -- one provided by the data producer and one by the archive where the data is deposited -- this information can be distinguished through the use of the source attribute.</xhtml:p>
+                     <xhtml:p>Note also that the DDI contains a linking mechanism permitting arbitrary links between internal elements (See Link) and from internal elements to external sources (See ExtLink).</xhtml:p>
+                     <xhtml:p>The top-level element, codeBook, also includes a version attribute to specify the version number of the DDI specification.</xhtml:p>
+                     <xhtml:p>codeBookAgency - This attribute holds the agency name of the creator or maintainer of the codeBook instance as a whole, and is designed to support forward compatibility with DDI-Lifecycle. Recommend the agency name as filed with the DDI Agency ID Registry with optional additional sub-agency extensions.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="cohortType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="range" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="catRef" type="xs:IDREF" use="optional"/>
+            <xs:attribute name="value" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="cohort" type="cohortType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Cohort</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The element cohort is used when the nCube contains a limited number of categories from a particular variable, as opposed to the full range of categories. The attribute "catRef" is an IDREF to the actual category being used. The attribute "value" indicates the actual value attached to the category that is being used.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dmns>
+                           <cohort catRef="CV24_1" value="1"/>
+                        </dmns>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="collDateType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextAndDateType">
+            <xs:attribute name="event" default="single">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="start"/>
+                     <xs:enumeration value="end"/>
+                     <xs:enumeration value="single"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="cycle" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="collDate" type="collDateType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Date of Collection</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Contains the date(s) when the data were collected. Use the event attribute to specify "start", "end", or "single" for each date entered. The ISO standard for dates (YYYY-MM-DD) is recommended for use with the "date" attribute. The "cycle" attribute permits specification of the relevant cycle, wave, or round of data. Maps to Dublin Core Coverage element. Inclusion of this element in the codebook is recommended.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <collDate event="single" date="1998-11-10">10 November 1998</collDate>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="collMode" type="conceptualTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Mode of Data Collection</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The method used to collect the data; instrumentation characteristics. XHTML formatting may be used in the txt element for forward-compatibility with DDI 3.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <collMode>telephone interviews</collMode>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <collMode>face-to-face interviews</collMode>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <collMode>mail questionnaires</collMode>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <collMode>computer-aided telephone interviews (CATI)</collMode>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="collSitu" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Characteristics of Data Collection Situation</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Description of noteworthy aspects of the data collection situation. Includes information on factors such as cooperativeness of respondents, duration of interviews, number of call-backs, etc.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <collSitu>There were 1,194 respondents who answered questions in face-to-face interviews lasting approximately 75 minutes each.</collSitu>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="collSize" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Extent of Collection</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Summarizes the number of physical files that exist in a collection, recording the number of files that contain data and noting whether the collection contains machine-readable documentation and/or other supplementary files and information such as data dictionaries, data definition statements, or data collection instruments. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <collSize>1 data file + machine-readable documentation (PDF) + SAS data definition statements</collSize>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="colspecType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="colnum" type="xs:string" use="optional"/>
+            <xs:attribute name="colname" type="xs:NMTOKEN"/>
+            <xs:attribute name="colwidth" type="xs:string"/>
+            <xs:attribute name="colsep" type="xs:string"/>
+            <xs:attribute name="rowsep" type="xs:string"/>
+            <xs:attribute name="align">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="left"/>
+                     <xs:enumeration value="right"/>
+                     <xs:enumeration value="center"/>
+                     <xs:enumeration value="justify"/>
+                     <xs:enumeration value="char"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="char" type="xs:string"/>
+            <xs:attribute name="charoff" type="xs:NMTOKEN"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="colspec" type="colspecType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Column Specification</xhtml:h1>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="complete" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Completeness of Study Stored</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This item indicates the relationship of the data collected to the amount of data coded and stored in the data collection. Information as to why certain items of collected information were not included in the data file stored by the archive should be provided. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <complete>Because of embargo provisions, data values for some variables have been masked. Users should consult the data definition statements to see which variables are under embargo. A new version of the collection will be released by ICPSR after embargoes are lifted.</complete>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="conceptType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="vocab" type="xs:string"/>
+            <xs:attribute name="vocabURI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="concept" type="conceptType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Concept</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The general subject to which the parent element may be seen as pertaining. This element serves the same purpose as the keywords and topic classification elements, but at the data description level. The "vocab" attribute is provided to indicate the controlled vocabulary, if any, used in the element, e.g., LCSH (Library of Congress Subject Headings), MeSH (Medical Subject Headings), etc. The "vocabURI" attribute specifies the location for the full controlled vocabulary.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCubeGrp>
+                           <concept>Income</concept>
+                        </nCubeGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCubeGrp>
+                           <concept vocab="LCSH" vocabURI="http://lcweb.loc.gov/catdir/cpso/lcco/lcco.html" source="archive">more experience</concept>
+                        </nCubeGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <concept>Income</concept>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <concept vocab="LCSH" vocabURI="http://lcweb.loc.gov/catdir/cpso/lcco/lcco.html" source="archive">SF: 311-312 draft horses</concept>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="conditions" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Conditions</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Indicates any additional information that will assist the user in understanding the access and use conditions of the data collection.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <conditions>The data are available without restriction. Potential users of these datasets are advised, however, to contact the original principal investigator Dr. J. Smith (Institute for Social Research, The University of Michigan, Box 1248, Ann Arbor, MI 48106), about their intended uses of the data. Dr. Smith would also appreciate receiving copies of reports based on the datasets.</conditions>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="confDecType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="required" default="yes">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="yes"/>
+                     <xs:enumeration value="no"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="formNo" type="xs:string"/>
+            <xs:attribute name="URI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="confDec" type="confDecType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Confidentiality Declaration</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This element is used to determine if signing of a confidentiality declaration is needed to access a resource. The "required" attribute is used to aid machine processing of this element, and the default specification is "yes". The "formNo" attribute indicates the number or ID of the form that the user must fill out. The "URI" attribute may be used to provide a URN or URL for online access to a confidentiality declaration form.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <confDec formNo="1">To download this dataset, the user must sign a declaration of confidentiality.</confDec>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <confDec URI="http://www.icpsr.umich.edu/HMCA/CTSform/contents.html"> To obtain this dataset, the user must complete a Restricted Data Use Agreement.</confDec>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="contactType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="affiliation" type="xs:string"/>
+            <xs:attribute name="URI" type="xs:string"/>
+            <xs:attribute name="email" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="contact" type="contactType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Contact Persons</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Names and addresses of individuals responsible for the work. Individuals listed as contact persons will be used as resource persons regarding problems or questions raised by the user community. The URI attribute should be used to indicate a URN or URL for the homepage of  the contact individual. The email attribute is used to indicate an email address for the contact individual. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <contact affiliation="University of Wisconsin" email="jsmith@...">Jane Smith</contact>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="ConOpsType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="agency" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="ConOps" type="ConOpsType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Control Operations</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Methods to facilitate data control performed by the primary investigator or by the data archive. Specify any special programs used for such operations. The "agency" attribute maybe used to refer to the agency that performed the control operation.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <ConOps source="ICPSR">Ten percent of data entry forms were reentered to check for accuracy.</ConOps>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="controlledVocabUsedType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="codeListID" minOccurs="0"/>
+               <xs:element ref="codeListName" minOccurs="0"/>
+               <xs:element ref="codeListAgencyName" minOccurs="0"/>
+               <xs:element ref="codeListVersionID" minOccurs="0"/>
+               <xs:element ref="codeListURN" minOccurs="0"/>
+               <xs:element name="codeListSchemeURN" minOccurs="0"/>
+               <xs:element ref="usage" minOccurs="1" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="controlledVocabUsed" type="controlledVocabUsedType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Controlled Vocabulary Used</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Provides a code value, as well as a reference to the code list from which the value is taken. Note that the CodeValue can be restricted to reference an enumeration.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="codeListID" type="stringType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Code List ID</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Identifies the code list that the value is taken from.</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<codeListID>TimeMethod</codeListID>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="codeListName" type="stringType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Code List Name</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Identifies the code list that the value is taken from with a human-readable name.</xhtml:div>
+               </xhtml:div>
+			   <xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<codeListName>Time Method</codeListName>]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="codeListAgencyName" type="stringType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Code List Agency Name</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Agency maintaining the code list.</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<codeListAgencyName>DDI Alliance</codeListAgencyName>]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="codeListVersionID" type="stringType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Code List Version ID</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Version of the code list. (Default value is 1.0)</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<codeListVersionID>1.1</codeListVersionID>]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="codeListURN" type="stringType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Code List URN</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Identifies the code list that the value is taken from with a URN.</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<codeListURN>urn:ddi-cv:TimeMethod:1.1</codeListURN>]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="codeListSchemeURN" type="stringType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Code List Scheme URN</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Identifies the code list scheme using a URN.</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[<codeListSchemeURN>http://www.ddialliance.org/Specification/DDI-CV/TimeMethod_1.1_Genericode1.0_DDI-CVProfile1.0.xml</codeListSchemeURN>]]></xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="usage" type="usageType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Usage</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Defines where in the instance the controlled vocabulary which is identified is utilized. A controlled vocabulary may occur either in the content of an element or in an attribute on an element. The usage can either point to a collection of elements using an XPath via the selector element or point to a more specific collection of elements via their identifier using the specificElements element. If the controlled vocabulary occurs in an attribute within the element, the attribute element identifies the specific attribute. When specific elements are specified, an authorized code value may also be provided. If the current value of the element or attribute identified is not in the controlled vocabulary or is not identical to a code value, the authorized code value identifies a valid code value corresponding to the meaning of the content in the element or attribute.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="usageType">
+      <xs:sequence>
+         <xs:choice>
+            <xs:element ref="selector"/>
+            <xs:element ref="specificElements"/>
+         </xs:choice>
+         <xs:element ref="attribute" minOccurs="0"/>
+      </xs:sequence>
+   </xs:complexType>
+   
+   <xs:simpleType name="selectorType">
+      <xs:restriction base="xs:string">
+         <xs:pattern value="((//|/)(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*|\*|[\i-[:]][\c-[:]]*:\*))+"/>
+      </xs:restriction>
+   </xs:simpleType>
+   
+   <xs:element name="selector" type="selectorType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Selector</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Identifies a collection of elements in which a controlled vocabulary is used. This is a simplified XPath which must correspond to the actual instance in which it occurs, which is to say that the fully qualified element names here must correspond to those in the instance. This XPath can only identify elements and does not allow for any predicates. The XPath must either be rooted or deep.</xhtml:div>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Example</xhtml:h2>
+							<xhtml:div class="example">
+								<xhtml:samp class="xml_sample"><![CDATA[<selector>/codeBook/stdyDscr/method/dataColl/timeMeth</selector>]]></xhtml:samp>
+							</xhtml:div>
+						</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="specificElementsType">
+      <xs:attribute name="refs" type="xs:IDREFS" use="required"/>
+      <xs:attribute name="authorizedCodeValue" type="xs:NMTOKEN" use="optional"/>
+   </xs:complexType>
+   
+   <xs:element name="specificElements" type="specificElementsType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Specific Elements</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Identifies a collection of specific elements via their identifiers in the refs attribute, which allows for a tokenized list of identifier values which must correspond to identifiers which exist in the instance. The authorizedCodeValue attribute can be used to provide a valid code value corresponding to the meaning of the content in the element or attribute when the identified element or attribute does not use an actual valid value from the controlled vocabulary.</xhtml:div>
+				  </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[<specificElements refs="ICPSR4328timeMeth" authorizedCodeValue="CrossSection"/>]]></xhtml:samp>
+</xhtml:div>
+</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:simpleType name="attributeType">
+      <xs:restriction base="xs:string">
+         <xs:pattern value="@(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*|\*|[\i-[:]][\c-[:]]*:\*)"/>
+      </xs:restriction>
+   </xs:simpleType>
+   
+   <xs:element name="attribute" type="attributeType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Attribute</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Identifies an attribute within the element(s) identified by the selector or specificElements in which the controlled vocabulary is used. The fully qualified name used here must correspond to that in the instance, which is to say that if the attribute is namespace qualified, the prefix used here must match that which is defined in the instance.</xhtml:div>
+               </xhtml:div>
+<xhtml:div>
+<xhtml:h2 class="section_header">Example</xhtml:h2>
+<xhtml:div class="example">
+<xhtml:samp class="xml_sample">
+<![CDATA[<attribute>type</attribute>]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+	            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="copyright" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Copyright</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Copyright statement for the work at the appropriate level. Copyright for data collection (codeBook/stdyDscr/citation/prodStmt/copyright) maps to Dublin Core Rights. Inclusion of this element is recommended.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <copyright>Copyright(c) ICPSR, 2000</copyright>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="CubeCoordType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="coordNo" type="xs:string"/>
+            <xs:attribute name="coordVal" type="xs:string"/>
+            <xs:attribute name="coordValRef" type="xs:IDREF"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="CubeCoord" type="CubeCoordType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1></xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This is an empty element containing only the attributes listed below. It is used to identify the coordinates of the data item within a logical nCube describing aggregate data. CubeCoord is repeated for each dimension of the nCube giving the coordinate number ("coordNo") and coordinate value ("coordVal"). Coordinate value reference ("cordValRef") is an ID reference to the variable that carries the coordinate value. The attributes provide a complete coordinate location of a cell within the nCube.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <CubeCoord coordNo="1" coordVal="3"/>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <CubeCoord coordNo="2" coordVal="7"/>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <CubeCoord coordNo="3" coordVal="2"/>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="dataAccsType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="setAvail" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="useStmt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="dataAccs" type="dataAccsType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Data Access</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This section describes access conditions and terms of use for the data collection. In cases where access conditions differ across individual files or variables, multiple access conditions can be specified. The access conditions applying to a study, file, variable group, or variable can be indicated by an IDREF attribute on the study, file, variable group, or variable elements called "access".</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="dataApprType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="dataAppr" type="dataApprType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Other Forms of Data Appraisal</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Other issues pertaining to data appraisal. Describe here issues such as response variance, nonresponse rate and testing for bias, interviewer and response bias, confidence levels, question bias, etc. Attribute type allows for optional typing of data appraisal processes and option for controlled vocabulary.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataAppr>These data files were obtained from the United States House of Representatives, who received them from the Census Bureau accompanied by the following caveats: "The numbers contained herein are not official 1990 decennial Census counts. The numbers represent estimates of the population based on a statistical adjustment method applied to the official 1990 Census figures using a sample survey intended to measure overcount or undercount in the Census results. On July 15, 1991, the Secretary of Commerce decided not to adjust the official 1990 decennial Census counts (see 56 Fed. Reg. 33582, July 22, 1991). In reaching his decision, the Secretary determined that there was not sufficient evidence that the adjustment method accurately distributed the population across and within states. The numbers contained in these tapes, which had to be produced prior to the Secretary's decision, are now known to be biased. Moreover, the tapes do not satisfy standards for the publication of Federal statistics, as established in Statistical Policy Directive No. 2, 1978, Office of Federal Statistical Policy and Standards. Accordingly, the Department of Commerce deems that these numbers cannot be used for any purpose that legally requires use of data from the decennial Census and assumes no responsibility for the accuracy of the data for any purpose whatsoever. The Department will provide no assistance in interpretation or use of these numbers."</dataAppr>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="dataChck" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Extent of Processing Checks</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Indicate here, at the file level, the types of checks and operations performed on the data file. A controlled vocabulary may be developed for this element in the future. The following examples are based on ICPSR's Extent of Processing scheme:</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>The archive produced a codebook for this collection.</dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>Consistency checks were performed by Data Producer/ Principal  Investigator.</dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>Consistency checks performed by the archive.</dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>The archive generated SAS and/or SPSS data definition  statements for this collection.</dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>Frequencies were provided by Data Producer/Principal Investigator.</dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>Frequencies provided by the archive.</dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>Missing data codes were standardized by Data  Producer/ Principal Investigator.</dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>Missing data codes were standardized by the archive.</dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>The archive performed recodes and/or calculated derived variables. </dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>Data were reformatted by the archive.</dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>Checks for undocumented codes were performed by  Data Producer/Principal Investigator.</dataChck>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataChck>Checks for undocumented codes were performed by the archive.</dataChck>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="dataCollType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="timeMeth" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="dataCollector" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="collectorTraining" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="frequenc" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="sampProc" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="sampleFrame" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="targetSampleSize" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="deviat" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="collMode" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="resInstru" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="instrumentDevelopment" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="sources" minOccurs="0"/>
+               <xs:element ref="collSitu" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="actMin" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="ConOps" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="weight" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="cleanOps" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="dataColl" type="dataCollType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Data Collection Methdology</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information about the methodology employed in a data collection.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="sampleFrameType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="sampleFrameName" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="labl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="txt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="validPeriod" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="custodian" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="useStmt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="universe" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="frameUnit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="referencePeriod" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="updateProcedure" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="sampleFrame" type="sampleFrameType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Sample Frame</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Sample frame describes the sampling frame used for identifying the population from which the sample was taken. For example, a telephone book may be a sample frame for a phone survey. In addition to the name, label and text describing the sample frame, this structure lists who maintains the sample frame, the period for which it is valid, a use statement, the universe covered, the type of unit contained in the frame as well as the number of units available, the reference period of the frame and procedures used to update the frame. Use multiple use statements to provide different uses under different conditions. Repeat elements within the use statement to support multiple languages.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="sampleFrameName" type="stringType">
+		<xs:annotation>
+			<xs:documentation>
+				<xhtml:div>
+
+					<xhtml:h1 class="element_title">Sample Frame Name</xhtml:h1>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">Name of the sample frame.</xhtml:div>
+					</xhtml:div>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<sampleFrameName>City of St. Paul Directory</sampleFrameName>]]></xhtml:samp>
+</xhtml:div>
+</xhtml:div>
+
+</xhtml:div>
+</xs:documentation>
+</xs:annotation>
+</xs:element>
+   
+   <xs:complexType name="eventDateType">
+      <xs:simpleContent>
+         <xs:extension base="dateType">
+            <xs:attribute name="event">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="start"/>
+                     <xs:enumeration value="end"/>
+                     <xs:enumeration value="single"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+   
+   <xs:element name="validPeriod" type="eventDateType">
+<xs:annotation>
+<xs:documentation>
+<xhtml:div>
+
+<xhtml:h1 class="element_title">Valid Period</xhtml:h1>
+
+<xhtml:div>
+<xhtml:h2 class="section_header">Description</xhtml:h2>
+<xhtml:div class="description">Defines a time period for the validity of the sampling frame. Enter dates in YYYY-MM-DD format.</xhtml:div>
+</xhtml:div>
+
+<xhtml:div>
+<xhtml:h2 class="section_header">Example</xhtml:h2>
+<xhtml:div class="example">
+<xhtml:samp class="xml_sample"><![CDATA[
+<validPeriod event=start">2009-07-01</validPeriod>
+<validPeriod event="end">2011-06-30</validPeriod>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+   <xs:element name="referencePeriod" type="eventDateType">
+		<xs:annotation>
+			<xs:documentation>
+				<xhtml:div>
+
+					<xhtml:h1 class="element_title">Reference Period</xhtml:h1>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">Indicates the period of time in which the sampling frame was actually used for the study in question. Use ISO 8601 date/time formats to enter the relevant date(s).</xhtml:div>
+					</xhtml:div>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<referencePeriod event="single">2009-06-01</referencePeriod>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+   
+   <xs:complexType name="frameUnitType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="unitType"/>
+               <xs:element ref="txt" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="isPrimary" type="xs:boolean" default="true"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="frameUnit" type="frameUnitType">
+		<xs:annotation>
+			<xs:documentation>
+				<xhtml:div>
+
+					<xhtml:h1 class="element_title">Frame Unit</xhtml:h1>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">Provides information about the sampling frame unit. The attribute "isPrimary" is boolean, indicating whether the unit is primary or not.</xhtml:div>
+					</xhtml:div>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<frameUnit isPrimary="true"><unitType numberOfUnits="150000">Primary listed owners of published phone numbers in the City of St. Paul</unitType></frameUnit>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+   <xs:complexType name="unitTypeType">
+      <xs:simpleContent>
+         <xs:extension base="stringType">
+            <xs:attribute name="numberOfUnits" type="xs:integer" use="optional"/>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+
+   <xs:element name="unitType" type="unitTypeType">
+		<xs:annotation>
+			<xs:documentation>
+				<xhtml:div>
+
+					<xhtml:h1 class="element_title">Unit Type</xhtml:h1>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">Describes the type of sampling frame unit. The attribute "numberOfUnits" provides the number of units in the sampling frame.</xhtml:div>
+					</xhtml:div>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<unitType numberOfUnits=150000">Primary listed owners of published phone numbers in the City of St. Paul</unitType>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+   <xs:complexType name="targetSampleSizeType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="sampleSize" minOccurs="0"/>
+               <xs:element ref="sampleSizeFormula" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="targetSampleSize" type="targetSampleSizeType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Target Sample Size</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Provides both the target size of the sample (this is the number in the original sample, not the number of respondents) as well as the formula used for determining the sample size.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="sampleSize" type="integerType">
+		<xs:annotation>
+			<xs:documentation>
+				<xhtml:div>
+
+					<xhtml:h1 class="element_title">Sample Size</xhtml:h1>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This element provides the targeted sample size in integer format.</xhtml:div>
+					</xhtml:div>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<sampleSize>385</sampleSize>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+   
+   <xs:element name="sampleSizeFormula" type="stringType">
+		<xs:annotation>
+			<xs:documentation>
+				<xhtml:div>
+
+					<xhtml:h1 class="element_title">Sample Size Formula</xhtml:h1>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">This element includes the formula that was used to determine the sample size.</xhtml:div>
+					</xhtml:div>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<sampleSizeFormula>n0=Z2pq/e2=(1.96)2(.5)(.5)/(.05)2=385 individuals</sampleSizeFormula>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+   <xs:complexType name="instrumentDevelopmentType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="instrumentDevelopment" type="instrumentDevelopmentType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Instrument Development</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Describe any development work on the data collection instrument. Type attribute allows for the optional use of a defined development type with or without use of a controlled vocabulary.</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<instrumentDevelopment type="pretesting">The questionnaire was pre-tested with split-panel tests, as well as an analysis of non-response rates for individual items, and response distributions.</instrumentDevelopment>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="updateProcedure" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Instrument Development</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Description of how and with what frequency the sample frame is updated.</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<updateProcedure>Changes are collected as they occur through registration and loss of phone number from the specified geographic area. Data are compiled for the date June 1st of odd numbered years, and published on July 1st for the following two-year period.</updateProcedure>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="custodianType">
+      <xs:simpleContent>
+         <xs:extension base="stringType">
+            <xs:attribute name="affiliation" type="xs:string" use="optional"/>
+            <xs:attribute name="abbr" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+
+   <xs:element name="custodian" type="custodianType">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Custodian</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">Custodian identifies the agency or individual who is responsible for creating or maintaining the sample frame. Attribute affiliation provides the affiliation of the custodian with an agency or organization. Attribute abbr provides an abbreviation for the custodian.</xhtml:div>
+					</xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<custodian>DEX Publications</custodian>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="collectorTrainingType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="collectorTraining" type="collectorTrainingType">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Collector Training</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">Describes the training provided to data collectors including internviewer training, process testing, compliance with standards etc. This is repeatable for language and to capture different aspects of the training process. The type attribute allows specification of the type of training being described.</xhtml:div>
+					</xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<collectorTraining type="interviewer training">Describe research project, describe population and sample, suggest methods and language for approaching subjects, explain questions and key terms of survey instrument.</collectorTraining>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="dataCollectorType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="abbr" type="xs:string"/>
+            <xs:attribute name="affiliation" type="xs:string"/>
+            <xs:attribute name="role" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="dataCollector" type="dataCollectorType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Data Collector</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The entity (individual, agency, or institution) responsible for administering the questionnaire or interview or compiling the data. This refers to the entity collecting the data, not to the entity producing the documentation. Attribute "abbr" may be used to list common abbreviations given to agencies, etc. Attribute "affiliation" may be used to record affiliation of the data collector. The role attribute specifies the role of person in the data collection process.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataCollector abbr="SRC" affiliation="University of Michigan" role="questionnaire administration">Survey Research Center</dataCollector>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="dataDscrType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="varGrp" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="nCubeGrp" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="var" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="nCube" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="dataDscr" type="dataDscrType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Variable Description</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Description of variables.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="dataItemType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="CubeCoord" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="physLoc" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="varRef" type="xs:IDREF"/>
+            <xs:attribute name="nCubeRef" type="xs:IDREF"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="dataItem" type="dataItemType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1></xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Identifies a physical storage location for an individual data entry, serving as a link between the physical location and the logical content description of each data item. The attribute "varRef" is an IDREF that points to a discrete variable description. If the data item is located within an nCube (aggregate data), use the attribute "nCubeRef" (IDREF) to point to the appropriate nCube and the element CubeCoord to identify the coordinates of the data item within the nCube.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="dataKindType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="conceptualTextType">
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="dataKind" type="dataKindType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Kind of Data</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The type of data included in the file: survey data, census/enumeration data, aggregate data, clinical data, event/transaction data, program source code, machine-readable text, administrative records data, experimental data, psychological test, textual data, coded textual, coded documents, time budget diaries, observation data/ratings, process-produced data, etc. This element maps to Dublin Core Type element. The type attribute can be used for forward-compatibility with DDI 3, by providing a type for use of controlled vocabulary, as this is descriptive in DDI 2 and CodeValue in DDI 3.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataKind type="numeric">survey data</dataKind>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="dataMsng" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Missing Data</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This element can be used to give general information about missing data, e.g., that missing data have been standardized across the collection, missing data are present because of merging, etc.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataMsng>Missing data are represented by blanks.</dataMsng>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataMsng>The codes "-1" and "-2" are used to represent missing data.</dataMsng>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="dataSrc" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Data Sources</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Used to list the book(s), article(s), serial(s), and/or machine-readable data file(s)--if any--that served as the source(s) of the data collection. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataSrc> "Voting Scores." CONGRESSIONAL QUARTERLY ALMANAC 33 (1977), 487-498.</dataSrc>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataSrc>United States Internal Revenue Service Quarterly Payroll File</dataSrc>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="defntn" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Definition</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Rationale for why the group was constituted in this way.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <varGrp>
+                           <defntn>The following eight variables were only asked in Ghana.</defntn>
+                        </varGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCubeGrp>
+                           <defntn>The following four nCubes form a single presentation table.</defntn>
+                        </nCubeGrp>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="depDate" type="simpleTextAndDateType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Date of Deposit</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The date that the work was deposited with the archive that originally received it. The ISO standard for dates (YYYY-MM-DD) is recommended for use with the "date" attribute.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <depDate date="1999-01-25">January 25, 1999</depDate>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="deposReq" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Deposit Requirement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information regarding user responsibility for informing archives of their use of data through providing citations to the published work or providing copies of the manuscripts. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <deposReq> To provide funding agencies with essential information about use of archival resources and to facilitate the exchange of information about ICPSR participants' research activities, users of ICPSR data are requested to send to ICPSR bibliographic citations for, or copies of, each completed manuscript or thesis abstract. Please indicate in a cover letter which data were used.</deposReq>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="depositrType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="abbr" type="xs:string"/>
+            <xs:attribute name="affiliation" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="depositr" type="depositrType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Depositor</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The name of the person (or institution) who provided this work to the archive storing it. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <depositr abbr="BJS" affiliation="U.S. Department of Justice">Bureau of Justice Statistics</depositr>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="derivationType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="drvdesc" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="drvcmd" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="var" type="xs:IDREFS"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="derivation" type="derivationType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Derivation</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Used only in the case of a derived variable, this element provides both a description of how the derivation was performed and the command used to generate the derived variable, as well as a specification of the other variables in the study used to generate the derivation. The "var" attribute provides the ID values of the other variables in the study used to generate this derived variable.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="deviat" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Major Deviations from the Sample Design</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information indicating correspondence as well as discrepancies between the sampled units (obtained) and available statistics for the population (age, sex-ratio, marital status, etc.) as a whole. XHTML formatting may be used in this element for forward-compatibility with DDI 3. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <deviat>The suitability of Ohio as a research site reflected its similarity to the United States as a whole. The evidence extended by Tuchfarber (1988) shows that Ohio is representative of the United States in several ways: percent urban and rural, percent of the population that is African American, median age, per capita income, percent living below the poverty level, and unemployment rate. Although results generated from an Ohio sample are not empirically generalizable to the United States, they may be suggestive of what might be expected nationally.</deviat>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="dataFingerprintType">
+      <xs:sequence>
+	     <xs:element name="digitalFingerprintValue" type="xs:string"/>
+		 <xs:element name="algorithmSpecification" type="xs:string" minOccurs="0"/>
+		 <xs:element name="algorithmVersion" type="xs:string" minOccurs="0"/>
+	  </xs:sequence>
+	  <xs:attribute name="type" use="required">
+         <xs:simpleType>
+            <xs:restriction base="xs:NMTOKEN">
+               <xs:enumeration value="data"/>
+               <xs:enumeration value="dataFile"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:complexType>
+
+   <xs:element name="dataFingerprint" type="dataFingerprintType">
+      <xs:annotation>
+	     <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Data Fingerprint</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Allows for assigning a hash value (digital fingerprint) to the data or data file. Set the attribute flag to "data" when the hash value provides a digital fingerprint to the data contained in the file regardless of the storage format (ASCII, SAS, binary, etc.). One approach to compute a data fingerprint is the Universal Numerical Fingerprint (UNF). Set the attribute flag to "dataFile" if the digital fingerprint is only for the data file in its current storage format. Provide the digital fingerprint in digitalFingerprintValue and identify the algorithm specification used (add version as a separate entry if it is not part of the specification entry).</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<dataFingerprint type="data"><digitalFingerprintValue>UNF:3:DaYlT6QSX9r0D50ye+tXpA== </digitalFingerprintValue>
+<algorithmSpecification>UNF v5.0 Calculation Producture [http://thedata.org/book/unf-version-5-0]</algorithmSpecification><algorithmVersion>UNF V5</algorithmVersion></dataFingerprint>
+
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+		 </xs:documentation>
+	  </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="dimensnsType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="caseQnty" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="varQnty" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="logRecL" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="recPrCas" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="recNumTot" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="dimensns" type="dimensnsType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">File Dimensions</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Dimensions of the overall file.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="disclaimer" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Disclaimer</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information regarding responsibility for uses of the data collection. This element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <disclaimer>The original collector of the data, ICPSR, and the relevant funding agency bear no responsibility for uses of this collection or for interpretations or inferences based upon such uses.</disclaimer>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="distDate" type="simpleTextAndDateType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Date of Distribution</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Date that the work was made available for distribution/presentation. The ISO standard for dates (YYYY-MM-DD) is recommended for use with the "date" attribute.  If using a text entry in the element content, the element may be repeated to support multiple language expressions.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <distDate date="1999-01-25">January 25, 1999</distDate>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="distStmtType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="distrbtr" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="contact" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="depositr" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="depDate" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="distDate" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="distStmt" type="distStmtType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Distributor Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Distribution statement for the work at the appropriate level: marked-up document; marked-up document source; study; study description, other material; other material for study.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="distrbtrType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="abbr" type="xs:string"/>
+            <xs:attribute name="affiliation" type="xs:string"/>
+            <xs:attribute name="URI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="distrbtr" type="distrbtrType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Distributor</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The organization designated by the author or producer to generate copies of the particular work including any necessary editions or revisions. Names and addresses may be specified and other archives may be co-distributors. A URI attribute is included to provide an URN or URL to the ordering service or download facility on a Web site. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <distrbtr abbr="ICPSR" affiliation="Institute for Social Research" URI="http://www.icpsr.umich.edu">Ann Arbor, MI: Inter-university Consortium for Political and Social Research</distrbtr>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="dmnsType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="cohort" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="rank" type="xs:string"/>
+            <xs:attribute name="varRef" type="xs:IDREF"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="dmns" type="dmnsType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Dimension</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This element defines a variable as a dimension of the nCube, and should be repeated to describe each of the cube's dimensions. The attribute "rank" is used to define the coordinate order (rank="1", rank="2", etc.) The attribute "varRef" is an IDREF that points to the variable that makes up this dimension of the nCube.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="docDscrType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="citation" minOccurs="0"/>
+               <xs:element ref="guide" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="docStatus" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="docSrc" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="controlledVocabUsed" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="docDscr" type="docDscrType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Document Description</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The Document Description consists of bibliographic information describing the DDI-compliant document itself as a whole. This Document Description can be considered the wrapper or header whose elements uniquely describe the full contents of the compliant DDI file. Since the Document Description section is used to identify the DDI-compliant file within an electronic resource discovery environment, this section should be as complete as possible. The author in the Document Description should be the individual(s) or organization(s) directly responsible for the intellectual content of the DDI version, as distinct from the person(s) or organization(s) responsible for the intellectual content of the earlier paper or electronic edition from which the DDI edition may have been derived. The producer in the Document Description should be the agency or person that prepared the marked-up document. Note that the Document Description section contains a Documentation Source subsection consisting of information about the source of the DDI-compliant file-- that is, the hardcopy or electronic codebook that served as the source for the marked-up codebook. These sections allow the creator of the DDI file to produce version, responsibility, and other descriptions relating to both the creation of that DDI file as a separate and reformatted version of source materials (either print or electronic) and the original source materials themselves. </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="docSrcType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="titlStmt"/>
+               <xs:element ref="rspStmt" minOccurs="0"/>
+               <xs:element ref="prodStmt" minOccurs="0"/>
+               <xs:element ref="distStmt" minOccurs="0"/>
+               <xs:element ref="serStmt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="verStmt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="biblCit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="holdings" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="MARCURI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="docSrc" type="docSrcType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Documentation Source</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Citation for the source document. This element encodes the bibliographic information describing the source codebook, including title information, statement of responsibility, production and distribution information, series and version information, text of a preferred bibliographic citation, and notes (if any). Information for this section should be taken directly from the source document whenever possible. If additional information is obtained and entered in the elements within this section, the source of this information should be noted in the source attribute of the particular element tag. A MARCURI attribute is provided to link to the MARC record for this citation.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="docStatus" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Documentation Status</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Use this field to indicate if the documentation is being presented/distributed before it has been finalized. Some data producers and social science data archives employ data processing strategies that provide for release of data and documentation at various stages of processing. The element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <docStatus>This marked-up document includes a provisional data dictionary and brief citation only for the purpose of providing basic access to the data file. A complete codebook will be published at a later date.</docStatus>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="drvcmdType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="syntax" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="drvcmd" type="drvcmdType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Derivation Command</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The actual command used to generate the derived variable. The "syntax" attribute is used to indicate the command language employed (e.g., SPSS, SAS, Fortran, etc.). The element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <derivation>
+                              <drvcmd syntax="SPSS">RECODE V1 TO V3 (0=1) (1=0) (2=-1) INTO DEFENSE WELFAREHEALTH. </drvcmd>
+                           </derivation>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="drvdesc" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Derivation Description</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">A textual description of the way in which this variable was derived. The element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <derivation>
+                              <drvdesc> VAR215.01 "Outcome of first pregnancy" (1988 NSFG=VAR611 PREGOUT1) If R has never been pregnant (VAR203 PREGNUM EQ 0) then OUTCOM01 is blank/inapplicable. Else, OUTCOM01 is transferred from VAR225 OUTCOME for R's 1st pregnancy. </drvdesc>
+                           </derivation>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="eastBL" type="phraseType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">East Bounding Longitude</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The easternmost coordinate delimiting the geographic extent of the dataset. A valid range of values, expressed in decimal degrees (positive east and positive north), is: -180,0 &lt;= East Bounding Longitude Value &lt;= 180,0</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="embargoType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextAndDateType">
+            <xs:attribute name="event" default="notBefore">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="notBefore"/>
+                     <xs:enumeration value="notAfter"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="format" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="embargo" type="embargoType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Embargo</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>Provides information on variables/nCubes which are not currently available because of policies established by the principal investigators and/or data producers. The ISO standard for dates (YYYY-MM-DD) is recommended for use with the "date" attribute. An "event" attribute is provided to specify "notBefore" or "notAfter" ("notBefore" is the default). A "format" attribute is provided to ensure that this information will be machine-processable, and specifies a format for the embargo element.</xhtml:p>
+                     <xhtml:p>The "format" attribute could be used to specify other conventions for the way that information within the embargo element is set out, if conventions for encoding embargo information were established in the future.</xhtml:p>
+							<xhtml:p>This element may be repeated to support multiple language expressions of the content.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <embargo event="notBefore" date="2001-09-30"> The data associated with this variable/nCube will not become available until September 30, 2001, because of embargo provisions established by the data producers.</embargo>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="entryType">
+      <xs:simpleContent>
+         <xs:extension base="stringType">
+            <xs:attribute name="colname" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="namest" type="xs:NMTOKEN"/>
+            <xs:attribute name="nameend" type="xs:NMTOKEN"/>
+            <xs:attribute name="morerows" type="xs:string"/>
+            <xs:attribute name="colsep" type="xs:string"/>
+            <xs:attribute name="rowsep" type="xs:string"/>
+            <xs:attribute name="align">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="left"/>
+                     <xs:enumeration value="right"/>
+                     <xs:enumeration value="center"/>
+                     <xs:enumeration value="justify"/>
+                     <xs:enumeration value="char"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="char" type="xs:string"/>
+            <xs:attribute name="charoff" type="xs:NMTOKEN"/>
+            <xs:attribute name="valign">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="top"/>
+                     <xs:enumeration value="middle"/>
+                     <xs:enumeration value="bottom"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+   
+   <xs:element name="entry" type="entryType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Table Entry</xhtml:h1>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="EstSmpErr" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Estimates of Sampling Error</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Measure of how precisely one can estimate a population value from a given sample.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <EstSmpErr> To assist NES analysts, the PC SUDAAN program was used to compute sampling errors for a wide-ranging example set of proportions estimated from the 1996 NES Pre-election Survey dataset. For each estimate, sampling errors were computed for the total sample and for twenty demographic and political affiliation subclasses of the 1996 NES Pre-election Survey sample. The results of these sampling error computations were then summarized and translated into the general usage sampling error table provided in Table 11. The mean value of deft, the square root of the design effect, was found to be 1.346. The design effect was primarily due to weighting effects (Kish, 1965) and did not vary significantly by subclass size. Therefore the generalized variance table is produced by multiplying the simple random sampling standard error for each proportion and sample size by the average deft for the set of sampling error computations.</EstSmpErr>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="fileCont" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Contents of Files</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Abstract or description of the file. A summary describing the purpose, nature, and scope of the data file, special characteristics of its contents, major subject areas covered, and what questions the PIs attempted to answer when they created the file. A listing of major variables in the file is important here. In the case of multi-file collections, this uniquely describes the contents of each file.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileCont>Part 1 contains both edited and constructed variables describing demographic and family relationships, income, disability, employment, health insurance status, and utilization data for all of 1987.</fileCont>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="fileDscrType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="fileTxt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="locMap" minOccurs="0"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="URI" type="xs:string"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+            <xs:attribute name="methrefs" type="xs:IDREFS"/>
+            <xs:attribute name="pubrefs" type="xs:IDREFS"/>
+            <xs:attribute name="access" type="xs:IDREFS"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="fileDscr" type="fileDscrType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Data Files Description</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>Information about the data file(s) that comprises a collection. This section can be repeated for collections with multiple files. </xhtml:p>
+                     <xhtml:p>The "URI" attribute may be a URN or a URL that can be used to retrieve the file. The "sdatrefs" are summary data description references that record the ID values of all elements within the summary data description section of the Study Description that might apply to the file. These elements include: time period covered, date of collection, nation or country, geographic coverage, geographic unit, unit of analysis, universe, and kind of data. The "methrefs" are methodology and processing references that record the ID values of all elements within the study methodology and processing section of the Study Description that might apply to the file. These elements include information on data collection and data appraisal (e.g., sampling, sources, weighting, data cleaning, response rates, and sampling error estimates). The "pubrefs" attribute provides a link to publication/citation references and records the ID values of all citations elements within Other Study Description Materials or Other Study-Related Materials that pertain to this file. "Access" records the ID values of all elements in the Data Access section that describe access conditions for this file.</xhtml:p>
+                     <xhtml:p>Remarks: When a codebook documents two different physical instantiations of a data file, e.g., logical record length (or OSIRIS) and card-image version, the Data File Description should be repeated to describe the two separate files. An ID should be assigned to each file so that in the Variable section the location of each variable on the two files can be distinguished using the unique file IDs.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileDscr ID="CARD-IMAGE" URI="www.icpsr.umich.edu/cgi-bin/archive.prl?path=ICPSR&amp;num=7728"/>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileDscr ID="LRECL" URI="www.icpsr.umich.edu/cgi-bin/archive.prl?path=ICPSR&amp;num=7728"/>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="fileName" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">File Name</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Contains a short title that will be used to distinguish a particular file/part from other files/parts in the data collection. The element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileName ID="File1">Second-Generation Children Data</fileName>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="filePlac" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Place of File Production</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Indicates whether the file was produced at an archive or produced elsewhere.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <filePlac>Washington, DC: United States Department of Commerce, Bureau of the Census</filePlac>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="fileQnty" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Number of Files</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Total number of physical files associated with a collection.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileQnty>5 files</fileQnty>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="fileStrcType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="recGrp" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="type" default="rectangular">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="rectangular"/>
+                     <xs:enumeration value="hierarchical"/>
+                     <xs:enumeration value="relational"/>
+                     <xs:enumeration value="nested"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherType" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="fileStrcRef" type="xs:IDREF" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="fileStrc" type="fileStrcType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">File Structure</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Type of file structure. The attribute "type" is used to indicate hierarchical, rectangular, relational, or nested (the default is rectangular). If the file is rectangular, the next relevant element is File Dimensions. If the "other" value is used for the type attribute, then the otherType attribute should have a value specifying the other type.The otherType attribute should only be used when applying a controlled vocabulary to this attribute. Use the complex element controlledVocabUsed to identify the controlled vocabulary to which the selected term belongs. The fileStrcRef attribute allows for multiple data files with different coverage but the same file structure to share a single fileStrc. The file structure is fully described in the first fileTxt within the fileDscr and then the fileStrc in subsequent fileTxt descriptions would reference the first fileStrcRef rather than repeat the details.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="fileTxtType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="fileName" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="fileCitation" minOccurs="0"/>
+               <xs:element ref="dataFingerprint" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="fileCont" minOccurs="0"/>
+               <xs:element ref="fileStrc" minOccurs="0"/>
+               <xs:element ref="dimensns" minOccurs="0"/>
+               <xs:element ref="fileType" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="format" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="filePlac" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="dataChck" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="ProcStat" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="dataMsng" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="software" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="verStmt" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="fileTxt" type="fileTxtType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">File-by-File Description</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Provides descriptive information about the data file. A file name and a full bibliographic citation for the file may be entered, as well as a data fingerprint, if available. Information about the physical properties of the data file is also supported. Make sure to fill out topcClass for the study as these can be used by the data file. Note coverage constraints in fileCont.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="fileCitation" type="citationType">
+		<xs:annotation>
+			<xs:documentation>
+				<xhtml:div>
+
+					<xhtml:h1 class="element_title">File Citation</xhtml:h1>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">The complex element fileCitation provides for a full bibliographic citation option for each data file described in fileDscr. To support accurate citation of a data file the minimum element set includes: titl, IDNo, authEnty, producer, and prodDate. If a DOI is available for the data file enter this in the IDNo (this element is repeatable). If a hash value (digital fingerprint) has been created for the data file enter the information regarding its value and algorithm specification in digitalFingerprint.</xhtml:div>
+					</xhtml:div>
+
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<fileCitation>
+<titlStmt>
+<titl>ABC News/Washington Post Monthly Poll, December 2010</titl>
+<IDNo>http://dx.doi.org/10.3886/ICPSR32547.v1</IDNo>
+</titlStmt>
+<rspStmt>
+<AuthEnty>ABC News</AuthEnty>
+<AuthEnty>The Washington Post</AuthEnty>
+</rspStmt>
+<prodStmt>
+<producer>ABC News</producer>
+<prodDate>2011</prodDate>
+</prodStmt>
+</fileCitation>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+			</xs:documentation>
+		</xs:annotation>
+</xs:element>
+   
+   <xs:complexType name="fileTypeType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="charset" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="fileType" type="fileTypeType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Type of File</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Types of data files include raw data (ASCII, EBCDIC, etc.) and software-dependent files such as SAS datasets, SPSS export files, etc. If the data are of mixed types (e.g., ASCII and packed decimal), state that here. Note that the element varFormat permits specification of the data format at the variable level. The "charset" attribute allows one to specify the character set used in the file, e.g., US-ASCII, EBCDIC, UNICODE UTF-8, etc. The element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileType charset="US-ASCII">ASCII data file</fileType>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="format" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Data Format</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Physical format of the data file: Logical record length format, card-image format (i.e., data with multiple records per case), delimited format, free format, etc. The element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <format>comma-delimited</format>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="forwardType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="qstn" type="xs:IDREFS"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="forward" type="forwardType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Forward Progression</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Contains a reference to IDs of possible following questions. The "qstn" IDREFS may be used to specify the question IDs.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <qstn>
+                              <forward qstn="Q120 Q121 Q122 Q123 Q124">If yes, please ask questions 120-124.</forward>
+                           </qstn>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="frequencType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="freq" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="frequenc" type="frequencType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Frequency of Data Collection</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">For data collected at more than one point in time, the frequency with which the data were collected. The "freq" attribute is included to permit the development of a controlled vocabulary for this element.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <freq>monthly</freq>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <freq>quarterly</freq>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="fundAgType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="abbr" type="xs:string"/>
+            <xs:attribute name="role" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="fundAg" type="fundAgType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Funding Agency/Sponsor</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The source(s) of funds for production of the work. If different funding agencies sponsored different stages of the production process, use the "role" attribute to distinguish them.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fundAg abbr="NSF" role="infrastructure">National Science Foundation</fundAg>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fundAg abbr="SUN" role="equipment">Sun Microsystems</fundAg>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="geoBndBoxType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="westBL"/>
+               <xs:element ref="eastBL"/>
+               <xs:element ref="southBL"/>
+               <xs:element ref="northBL"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="geoBndBox" type="geoBndBoxType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Geographic Bounding Box</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The fundamental geometric description for any dataset that models geography. GeoBndBox is the minimum box, defined by west and east longitudes and north and south latitudes, that includes the largest geographic extent of the dataset's geographic coverage. This element is used in the first pass of a coordinate-based search. If the boundPoly element is included, then the geoBndBox element MUST be included.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <geogCover>Nevada State</geogCover>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <geoBndBox>
+                           <westBL>-120.005729004</westBL>
+                           <eastBL>-114.039663</eastBL>
+                           <southBL>35.00208499998</southBL>
+                           <northBL>42.002207</northBL>
+                        </geoBndBox>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <geogCover>Norway</geogCover>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <geoBndBox>
+                           <westBL>4.789583</westBL>
+                           <eastBL>33.637497</eastBL>
+                           <southBL>57.987915</southBL>
+                           <northBL>80.76416</northBL>
+                        </geoBndBox>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="geoMapType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="URI" type="xs:string"/>
+            <xs:attribute name="mapformat" type="xs:string"/>
+            <xs:attribute name="levelno" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="geoMap" type="geoMapType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Geographic Map</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This element is used to point, using a "URI" attribute, to an external map that displays the geography in question. The "levelno" attribute indicates the level of the geographic hierarchy relayed in the map. The "mapformat" attribute indicates the format of the map.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="geogCover" type="conceptualTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Geographic Coverage</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information on the geographic coverage of the data. Includes the total geographic scope of the data, and any additional levels of geographic coding provided in the variables. Maps to Dublin Core Coverage element. Inclusion of this element in the codebook is recommended. Fpor forward-compatibility, DDI 3 XHTML tags may be used in this element.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <geogCover>State of California</geogCover>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="geogUnit" type="conceptualTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Geographic Unit</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Lowest level of geographic aggregation covered by the data.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <geogUnit>state</geogUnit>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="grantNoType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="agency" type="xs:string"/>
+            <xs:attribute name="role" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="grantNo" type="grantNoType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Grant Number</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The grant/contract number of the project that sponsored the effort. If more than one, indicate the appropriate agency using the "agency" attribute. If different funding agencies sponsored different stages of the production process, use the "role" attribute to distinguish the grant numbers. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <grantNo agency="Bureau of Justice Statistics">J-LEAA-018-77</grantNo>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="gringLat" type="phraseType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">G-Ring Latitude</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Latitude (y coordinate) of a point. Valid range   expressed in decimal degrees is as follows: -90,0 to 90,0 degrees (latitude)</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="gringLon" type="phraseType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">G-Ring Longitude</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Longitude (x coordinate) of a point. Valid range expressed in decimal degrees is as follows: -180,0 to 180,0 degrees (longitude)</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="guide" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Guide to Codebook</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">List of terms and definitions used in the documentation. Provided to assist users in using the document correctly. This element was intended to reflect the section in OSIRIS codebooks that assisted users in reading and interpreting a codebook. Each OSIRIS codebook contained a sample codebook page that defined the codebook conventions.  The element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="holdingsType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="location" type="xs:string"/>
+            <xs:attribute name="callno" type="xs:string"/>
+            <xs:attribute name="URI" type="xs:string"/>
+            <xs:attribute name="media" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="holdings" type="holdingsType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Holdings Information</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information concerning either the physical or electronic holdings of the cited work. Attributes include: location--The physical location where a copy is held; callno--The call number for a work at the location specified; and URI--A URN or URL for accessing the electronic copy of the cited work. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <holdings location="ICPSR DDI Repository" callno="inap." URI="http://www.icpsr.umich.edu/DDIrepository/">Marked-up Codebook for Current Population Survey, 1999: Annual Demographic File</holdings>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <holdings location="University of Michigan Graduate Library" callno="inap." URI="http://www.umich.edu/library/">Codebook for Current Population Survey, 1999: Annual Demographic File </holdings>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="IDNoType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="agency" type="xs:string"/>
+            <xs:attribute name="level">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="study"/>
+                     <xs:enumeration value="file"/>
+                     <xs:enumeration value="project"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="IDNo" type="IDNoType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Identification Number</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Unique string or number (producer's or archive's number). An "agency" attribute is supplied. Identification Number of data collection maps to Dublin Core Identifier element. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <IDNo agency="ICPSR">6678</IDNo>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <IDNo agency="ZA">2010</IDNo>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="imputation" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Imputation</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">According to the Statistical Terminology glossary maintained by the National Science Foundation, this is "the process by which one estimates missing values for items that a survey respondent failed to provide," and if applicable in this context, it refers to the type of procedure used. When applied to an nCube, imputation takes into consideration all of the dimensions that are part of that nCube. This element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <imputation>This variable contains values that were derived by substitution.</imputation>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="invalrngType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:choice minOccurs="1" maxOccurs="unbounded">
+                  <xs:element ref="item"/>
+                  <xs:element ref="range"/>
+               </xs:choice>
+               <xs:element ref="key" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="invalrng" type="invalrngType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Range of Invalid Data Values</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Values for a particular variable that represent   missing data, not applicable responses, etc.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <invalrng>
+                           <range UNITS="INT" min="98" max="99"/> 
+                           <key> 
+                     			98 DK 
+                     			99 Inappropriate
+                     		</key> 
+                        </invalrng>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="itemType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="UNITS" default="INT">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="INT"/>
+                     <xs:enumeration value="REAL"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="VALUE" type="xs:string" use="required"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="item" type="itemType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Value Item</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The counterpart to Range; used to encode individual values. This is an empty element consisting only of its attributes. The "UNITS" attribute permits the specification of integer/real numbers. The "VALUE" attribute specifies the actual value.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <valrng>
+                           <item VALUE="1"/>
+                           <item VALUE="2"/>
+                           <item VALUE="3"/> 
+                        </valrng>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="ivuInstr" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Interviewer Instructions</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Specific instructions to the individual conducting an interview.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <qstn>
+                              <ivuInstr>Please prompt the respondent if they are reticent to answer this question.</ivuInstr>
+                           </qstn>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="key" type="tableAndTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Range Key</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This element permits a listing of the category values and labels. While this information is coded separately in the Category element, there may be some value in having this information in proximity to the range of valid and invalid values. A table is permissible in this element.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <valrng>
+                           <range UNITS="INT" maxExclusive="95" min="05" max="80"> </range> 
+                           <key>
+                        		05 (PSU) Parti Socialiste Unifie et extreme gauche (Lutte Ouvriere) [United Socialists and extreme left (Workers Struggle)] 
+                        		50 Les Verts [Green Party] 
+                        		80 (FN) Front National et extreme droite [National Front and extreme right] 
+                     		</key>
+                        </valrng>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="keywordType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="vocab" type="xs:string"/>
+            <xs:attribute name="vocabURI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="keyword" type="keywordType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Keywords</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Words or phrases that describe salient aspects of a data collection's content. Can be used for building keyword indexes and for classification and retrieval purposes. A controlled vocabulary can be employed. Maps to Dublin Core Subject element. The "vocab" attribute is provided for specification of the controlled vocabulary in use, e.g., LCSH, MeSH, etc. The "vocabURI" attribute specifies the location for the full controlled vocabulary. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <keyword vocab="ICPSR Subject Thesaurus" vocabURI="http://www.icpsr.umich.edu/thesaurus/subject.html">quality of life</keyword>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <keyword vocab="ICPSR Subject Thesaurus" vocabURI="http://www.icpsr.umich.edu/thesaurus/subject.html">family</keyword>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <keyword vocab="ICPSR Subject Thesaurus" vocabURI="http://www.icpsr.umich.edu/thesaurus/subject.html">career goals</keyword>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="lablType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="level" type="xs:string"/>
+            <xs:attribute name="vendor" type="xs:string"/>
+            <xs:attribute name="country" type="xs:string"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="labl" type="lablType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Label</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">A short description of the parent element. In the variable label, the length of this phrase may depend on the statistical analysis system used (e.g., some versions of SAS permit 40-character labels, while some versions of SPSS permit 120 characters), although the DDI itself imposes no restrictions on the number of characters allowed. A "level" attribute is included to permit coding of the level to which the label applies, i.e. record group, variable group, variable, category group, category, nCube group, nCube, or other study-related materials. The "vendor" attribute was provided to allow for specification of different labels for use with different vendors' software. The attribute "country" allows for the denotation of country-specific labels. The "sdatrefs" attribute records the ID values of all elements within the Summary Data Description section of the Study Description that might apply to the label. These elements include: time period covered, date of collection, nation or country, geographic coverage, geographic unit, unit of analysis, universe, and kind of data.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="locMapType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="dataItem" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="locMap" type="locMapType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Location Map</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This element maps individual data entries to one or more physical storage locations. It is used to describe the physical location of aggregate/tabular data in cases where the nCube model is employed.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="locationType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="StartPos" type="xs:string"/>
+            <xs:attribute name="EndPos" type="xs:string"/>
+            <xs:attribute name="width" type="xs:string"/>
+            <xs:attribute name="RecSegNo" type="xs:string"/>
+            <xs:attribute name="fileid" type="xs:IDREF"/>
+            <xs:attribute name="locMap" type="xs:IDREF"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="location" type="locationType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Location</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This is an empty element containing only the attributes listed below. Attributes include "StartPos" (starting position of variable), "EndPos" (ending position of variable), "width" (number of columns the variable occupies), "RecSegNo" (the record segment number, deck or card number the variable is located on), and "fileid", an IDREF link to the fileDscr element for the file that this location is within (this is necessary in cases where the same variable may be coded in two different files, e.g., a logical record length type file and a card image type file). Note that if there is no width or ending position, then the starting position should be the ordinal position in the file, and the file would be described as free-format. The attribute "locMap" is an IDREF to the element locMap and serves as a pointer to indicate that the location information for the nCube's cells (aggregate data) is located in that section.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <location StartPos="55" EndPos="57" width="3" RecSegNo="2" fileid="CARD-IMAGE"/>
+                           <location StartPos="167" EndPos="169" fileid="LRECL"/>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCube>
+                           <location locMap="LM"/>
+                        </nCube>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="logRecL" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Logical Record Length</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Logical record length, i.e., number of characters of data in the record.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example"> 
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <logRecL>27</logRecL>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="measureType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="varRef" type="xs:IDREF"/>
+            <xs:attribute name="aggrMeth">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="sum"/>
+                     <xs:enumeration value="average"/>
+                     <xs:enumeration value="count"/>
+                     <xs:enumeration value="mode"/>
+                     <xs:enumeration value="median"/>
+                     <xs:enumeration value="maximum"/>
+                     <xs:enumeration value="minimum"/>
+                     <xs:enumeration value="percent"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherAggrMeth" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="measUnit" type="xs:string"/>
+            <xs:attribute name="scale" type="xs:string"/>
+            <xs:attribute name="origin" type="xs:string"/>
+            <xs:attribute name="additivity">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="stock"/>
+                     <xs:enumeration value="flow"/>
+                     <xs:enumeration value="non-additive"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="measure" type="measureType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Measure</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The element measure indicates the measurement features of the cell content: type of aggregation used, measurement unit, and measurement scale. An origin point is recorded for anchored scales, to be used in determining relative movement along the scale. Additivity indicates whether an aggregate is a stock (like the population at a given point in time) or a flow (like the number of births or deaths over a certain period of time). The non-additive flag is to be used for measures that for logical reasons cannot be aggregated to a higher level - for instance, data that only make sense at a certain level of aggregation, like a classification. Two nCubes may be identical except for their measure - for example, a count of persons by age and percent of persons by age. Measure is an empty element that includes the following attributes: "varRef" is an IDREF; "aggrMeth" indicates the type of aggregation method used, for example 'sum', 'average', 'count'; "measUnit" records the measurement unit, for example 'km', 'miles', etc.; "scale" records unit of scale, for example 'x1', 'x1000'; "origin" records the point of origin for anchored scales;"additivity" records type of additivity such as 'stock', 'flow', 'non-additive'. If a value of "other" is used for the aggrMeth attribute, a term from a controlled vocabulary should be placed in the "otherAggrMeth" attribute, and a the complex element controlledVocabUsed should be used to specify the controlled vocabulary.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="methodType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="dataColl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="anlyInfo" minOccurs="0"/>
+               <xs:element ref="stdyClas" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="dataProcessing" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="codingInstructions" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="method" type="methodType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Methodology and Processing</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This section describes the methodology and processing involved in a data collection.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="codingInstructionsType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="txt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="command" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="relatedProcesses" type="xs:IDREFS" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="codingInstructions" type="codingInstructionsType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Coding Instructions</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Describe specific coding instructions used in data processing, cleaning, assession, or tabulation. Element relatedProcesses allows linking a coding instruction to one or more processes such as dataProcessing, dataAppr, cleanOps, etc. Use the txt element to describe instructions in a human readable form.</xhtml:div>
+               </xhtml:div>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Example</xhtml:h2>
+							<xhtml:div class="example">
+								<xhtml:samp class="xml_sample"><![CDATA[
+<codingInstructions relatedProcesses="cleanOps_7334" type="recode">
+<txt>recode undocumented/wild codes to missing, i.e., 0.</txt>
+<command formalLanguage="SPSS">RECODE V1 TO V100 (10 THROUGH HIGH = 0)</command>
+</codingInstructions>
+]]>
+								</xhtml:samp>
+							</xhtml:div>
+						</xhtml:div>
+            </xhtml:div>
+         .</xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="commandType">
+      <xs:simpleContent>
+         <xs:extension base="stringType">
+            <xs:attribute name="formalLanguage" type="xs:string"/>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+
+   <xs:element name="command" type="commandType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Command</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Provide command code for the coding instruction. The formalLanguage attribute identifies the language of the command code.</xhtml:div>
+               </xhtml:div>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Example</xhtml:h2>
+							<xhtml:div class="example">
+								<xhtml:samp class="xml_sample"><![CDATA[
+<command formalLanguage="SPSS">RECODE V1 TO V100 (10 THROUGH HIGH = 0)</command>
+]]>
+								</xhtml:samp>
+							</xhtml:div>
+						</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="dataProcessingType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="dataProcessing" type="dataProcessingType">
+      <xs:annotation>
+				<xs:documentation>
+					<xhtml:div>
+						<xhtml:h1 class="element_title">Data Processing</xhtml:h1>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Description</xhtml:h2>
+							<xhtml:div class="description">Describes various data processing procedures not captured elsewhere in the documentation, such as topcoding, recoding, suppression, tabulation, etc. The "type" attribute supports better classification of this activity, including the optional use of a controlled vocabulary.</xhtml:div>
+						</xhtml:div>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Example</xhtml:h2>
+							<xhtml:div class="example">
+								<xhtml:samp class="xml_sample"><![CDATA[
+<dataProcessing type="topcoding">The income variables in this study (RESP_INC, HHD_INC, and SS_INC) were topcoded to protect confidentiality.</dataProcessing>
+]]>
+								</xhtml:samp>
+							</xhtml:div>
+						</xhtml:div>
+					</xhtml:div>
+				</xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="miType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="phraseType">
+            <xs:attribute name="varRef" type="xs:IDREF" use="required"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="mi" type="miType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Mathematical Identifier</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Token element containing the smallest unit in the mrow that carries meaning.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="mrowType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="mi" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="mrow" type="mrowType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Mathematical Row</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This element is a wrapper containing the presentation expression mi. It creates a single string without spaces consisting of the individual elements described within it. It can be used to create a single variable by concatenating other variables into a single string. It is used to create linking variables composed of multiple non-contiguous parts, or to define unique strings for various category values of a single variable.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="nCubeType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="location" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="labl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="txt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="universe" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="imputation" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="security" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="embargo" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="respUnit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="anlysUnit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="verStmt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="purpose" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="dmns" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="measure" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+            <xs:attribute name="methrefs" type="xs:IDREFS"/>
+            <xs:attribute name="pubrefs" type="xs:IDREFS"/>
+            <xs:attribute name="access" type="xs:IDREFS"/>
+            <xs:attribute name="dmnsQnty" type="xs:string"/>
+            <xs:attribute name="cellQnty" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="nCube" type="nCubeType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">nCube</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>Describes the logical structure of an n-dimensional array, in which each coordinate intersects with every other dimension at a single point. The nCube has been designed for use in the markup of aggregate data. Repetition of the following elements is provided to support multi-language content: anlysUnit, embargo, imputation, purpose, respUnit, and security. This element includes the following attributes:</xhtml:p>
+                     <xhtml:p>The attribute "name" includes a short label for the nCube. Following the rules of many statistical analysis systems such as SAS and SPSS, names are usually up to eight characters long.</xhtml:p>
+                     <xhtml:p>The "sdatrefs" are summary data description references which record the ID values of all elements within the summary data description section of the Study Description which might apply to the nCube. These elements include: time period covered, date of collection, nation or country, geographic coverage, geographic unit, unit of analysis, universe, and kind of data.</xhtml:p>
+                     <xhtml:p>The "methrefs" are methodology and processing references which record the ID values of all elements within the study methodology and processing section of the Study Description which might apply to the nCube. These elements include information on data collection and data appraisal (e.g., sampling, sources, weighting, data cleaning, response rates, and sampling error estimates).</xhtml:p>
+                     <xhtml:p>The "pubrefs" attribute provides a link to publication/citation references and records the ID values of all citations elements in Other Study Description Materials or Other Study-Related Materials that pertain to this nCube.</xhtml:p>
+                     <xhtml:p>The "access" attribute records the ID values of all elements in the Data Access section that describe access conditions for this nCube. The "dmnsQnty" attribute notes the number of dimensions in the nCube. The "cellQnty" attribute indicates the total number of cells in the nCube.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="nCubeGrpType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="labl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="txt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="concept" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="defntn" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="universe" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="type" default="other">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="section"/>
+                     <xs:enumeration value="multipleResp"/>
+                     <xs:enumeration value="grid"/>
+                     <xs:enumeration value="display"/>
+                     <xs:enumeration value="repetition"/>
+                     <xs:enumeration value="subject"/>
+                     <xs:enumeration value="version"/>
+                     <xs:enumeration value="iteration"/>
+                     <xs:enumeration value="analysis"/>
+                     <xs:enumeration value="pragmatic"/>
+                     <xs:enumeration value="record"/>
+                     <xs:enumeration value="file"/>
+                     <xs:enumeration value="randomized"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherType" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="nCube" type="xs:IDREFS"/>
+            <xs:attribute name="nCubeGrp" type="xs:IDREFS"/>
+            <xs:attribute name="name" type="xs:string"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+            <xs:attribute name="methrefs" type="xs:IDREFS"/>
+            <xs:attribute name="pubrefs" type="xs:IDREFS"/>
+            <xs:attribute name="access" type="xs:IDREFS"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="nCubeGrp" type="nCubeGrpType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">nCube Group</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>A group of nCubes that may share a common subject, arise from the interpretation of a single question, or are linked by some other factor. This element makes it possible to identify all nCubes derived from a simple presentation table, and to provide the original table title and universe, as well as reference the source. Specific nesting patterns can be described using the attribute nCubeGrp.</xhtml:p>
+                     <xhtml:p>nCube groups are also created this way in order to permit nCubes to belong to multiple groups, including multiple subject groups, without causing overlapping groups. nCubes that are linked by the same use of the same variable need not be identified by an nCubeGrp element because they are already linked by a common variable element. Note that as a result of the strict sequencing required by XML, all nCube Groups must be marked up before the Variable element is opened. That is, the mark-up author cannot mark up a nCube Group, then mark up its constituent nCubes, then mark up another nCube Group.</xhtml:p>
+                     <xhtml:p>The "type" attribute refers to the general type of grouping of the nCubes. Specific nCube Groups, included within the 'type' attribute, are: </xhtml:p>
+                     <xhtml:p>Display: nCubes that are part of the same presentation table.</xhtml:p>
+                     <xhtml:p>Subject: nCubes that address a common topic or subject, e.g., income, poverty, children. </xhtml:p>
+                     <xhtml:p>Iteration: nCubes that appear in different sections of the data file measuring a common subject in different ways, e.g., using different universes, units of measurement, etc. </xhtml:p>
+                     <xhtml:p>Pragmatic: An nCube group without shared properties.</xhtml:p>
+                     <xhtml:p>Record: nCubes from a single record in a hierarchical file.</xhtml:p>
+                     <xhtml:p>File: nCube from a single file in a multifile study.</xhtml:p>
+                     <xhtml:p>Other: nCubes that do not fit easily into any of the categories listed above, e.g., a group of nCubes whose documentation is in another language. A term from a controlled vocabulary may be placed into the otherType attribute if this value is used.</xhtml:p>
+                     <xhtml:p>The otherType attribute should only be used when applying a controlled vocabulary, and when the type attribute has been given a value of "other". Use the complex element controlledVocabUsed to identify the controlled vocabulary to which the selected term belongs.</xhtml:p>
+                     <xhtml:p>The "nCube" attribute is used to reference all the IDs of the nCubes belonging to the group.</xhtml:p>
+                     <xhtml:p>The "nCubeGrp" attribute is used to reference all the subsidiary nCube groups which nest underneath the current nCubeGrp. This allows for encoding of a hierarchical structure of nCube groups.</xhtml:p>
+                     <xhtml:p>The attribute "name" provides a name, or short label, for the group.</xhtml:p>
+                     <xhtml:p>The "sdatrefs" are summary data description references that record the ID values of all elements within the summary data description section of the Study Description that might apply to the group. These elements include: time period covered, date of collection, nation or country, geographic coverage, geographic unit, unit of analysis, universe, and kind of data.</xhtml:p>
+                     <xhtml:p>The "methrefs" are methodology and processing references which record the ID values of all elements within the study methodology and processing section of the Study Description which might apply to the group. These elements include information on data collection and data appraisal (e.g., sampling, sources, weighting, data cleaning, response rates, and sampling error estimates).</xhtml:p>
+                     <xhtml:p>The "pubrefs" attribute provides a link to publication/citation references and records the ID values of all citations elements within Section codeBook/stdyDscr/othrStdyMat or codeBook/otherMat that pertain to this nCube group.</xhtml:p>
+                     <xhtml:p>The "access" attribute records the ID values of all elements in codeBook/stdyDscr/dataAccs of the document that describe access conditions for this nCube group.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="nationType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="conceptualTextType">
+            <xs:attribute name="abbr" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="nation" type="nationType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Country</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Indicates the country or countries covered in the file. Attribute "abbr" may be used to list common abbreviations; use of ISO country codes is recommended. Maps to Dublin Core Coverage element. Inclusion of this element is recommended. For forward-compatibility, DDI 3 XHTML tags may be used in this element.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nation abbr="GB">United Kingdom</nation>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="northBL" type="phraseType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">North Bounding Latitude</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The northernmost coordinate delimiting the geographic extent of the dataset. A valid range of values, expressed in decimal degrees (positive east and positive north), is: -90,0 &lt;= North Bounding Latitude Value &lt;= 90,0 ; North Bounding Latitude Value = South Bounding Latitude Value</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="notesType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="tableAndTextType">
+            <xs:attribute name="type" type="xs:string"/>
+            <xs:attribute name="subject" type="xs:string"/>
+            <xs:attribute name="level" type="xs:string"/>
+            <xs:attribute name="resp" type="xs:string"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+            <xs:attribute name="parent" type="xs:IDREFS" use="optional"/>
+            <xs:attribute name="sameNote" type="xs:IDREF" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="notes" type="notesType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Notes and comments</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>For clarifying information/annotation regarding the parent element.</xhtml:p>
+                     <xhtml:p>The attributes for notes permit a controlled vocabulary to be developed ("type" and "subject"), indicate the "level" of the DDI to which the note applies (study, file, variable, etc.), and identify the author of the note ("resp").</xhtml:p>
+                     <xhtml:p>The parent attribute is used to support capturing information obtained while preparing files for translation to DDI 3. It provides the ID(s) of the element this note is related to.</xhtml:p>
+                     <xhtml:p>The sameNote attribute is used to support capturing information obtained while preparing files for translation to DDI 3. If the same note is used multiple times all the parent IDs can be captured in a single note and all duplicate notes can reference the note containing the related to references in the attribute sameNote.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <docDscr>
+                           <verStmt>
+                              <notes resp="Jane Smith">Additional information on derived variables  has been added to this marked-up version of the documentation.</notes>
+                           </verStmt>
+                        </docDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <docDscr>
+                           <citation>
+                              <notes resp="Jane Smith">This citation was prepared by the archive based on information received from the markup authors.</notes>
+                           </citation>
+                        </docDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <docSrc>
+                           <verStmt>
+                              <notes resp="Jane Smith">The source codebook was produced from original hardcopy materials using  Optical Character Recognition (OCR).</notes>
+                           </verStmt>
+                        </docSrc>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <docSrc>
+                           <notes>A machine-readable version of the source codebook was supplied by the Zentralarchiv</notes>
+                        </docSrc>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <docDscr>
+                           <notes>This Document Description, or header information, can be used  within an electronic resource discovery environment.</notes>
+                        </docDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <stdyDscr>
+                           <verStmt>
+                              <notes resp="Jane Smith">Data for 1998 have been added to this version of the data collection.</notes>
+                           </verStmt>
+                        </stdyDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <stdyDscr>
+                           <citation>
+                              <notes resp="Jane Smith">This citation was sent to ICPSR by the  agency depositing the data.</notes>
+                           </citation>
+                        </stdyDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <stdyInfo>
+                           <notes>Data on employment and income refer to the preceding year, although demographic data refer to the time of the survey.</notes>
+                        </stdyInfo>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <method>
+                           <notes>Undocumented codes were found in this data collection. Missing data are represented by blanks.</notes>
+                        </method>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <method>
+                           <notes>For this collection, which focuses on employment, unemployment, and gender equality, data from EUROBAROMETER 44.3: HEALTH CARE ISSUES AND PUBLIC SECURITY, FEBRUARY-APRIL 1996 (ICPSR 6752) were merged with an oversample.</notes>
+                        </method>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <setAvail>
+                           <notes> Data from the Bureau of Labor Statistics used in the analyses for the final report are not provided as part of this collection.</notes>
+                        </setAvail>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataAccs>
+                           <notes>Users should note that this is a beta version of the data. The investigators therefore request that users who encounter any problems with the dataset contact them at the above address.</notes>
+                        </dataAccs>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileStrc>
+                           <notes>The number of arrest records for an individual is dependent on the number of arrests an offender had.</notes>
+                        </fileStrc>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileTxt>
+                           <verStmt>
+                              <notes>Data for all previously-embargoed variables are now available in  this version of the file.</notes>
+                           </verStmt>
+                        </fileTxt>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileDscr>
+                           <notes>There is a restricted version of this file containing confidential information,  access to which is controlled by the principal investigator.</notes>
+                        </fileDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <varGrp>
+                           <notes>This variable group was created for the purpose of combining all derived variables.</notes>
+                        </varGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <varGrp>
+                           <notes source="archive" resp="John Data">This variable group and all other variable groups in this data file were organized according to a schema developed by the adhoc advisory committee. </notes>
+                        </varGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCubeGrp>
+                           <notes>This nCube Group was created for the purpose of presenting a cross-tabulation between variables "Tenure" and "Age of householder."</notes>
+                        </nCubeGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <valrng>
+                           <notes subject="political party">Starting with Euro-Barometer 2 the coding of this variable has been standardized following an approximate ordering of each country's political parties along a "left" to "right" continuum in the first digit of the codes. Parties coded 01-39 are generally considered on the "left", those coded 40-49 in the "center", and those coded 60-89 on the "right" of the political spectrum. Parties coded 50-59 cannot be readily located in the traditional meaning of "left" and "right". The second digit of the codes is not significant to the "left-right" ordering. Codes 90-99 contain the response "other party" and various missing data responses. Users may modify these codings or part of these codings in order to suit their specific needs. </notes>
+                        </valrng>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <invalrng>
+                           <notes>Codes 90-99 contain the response "other party" and various missing data responses. </notes>
+                        </invalrng>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <verStmt>
+                              <notes>The labels for categories 01 and 02 for this variable, were inadvertently switched in the first version of this variable and have now been corrected.</notes>
+                           </verStmt>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <notes>This variable was created by recoding location of residence to Census regions.</notes>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCube>
+                           <verStmt>
+                              <notes>The labels for categories 01 and 02 in dimension 1 were inadvertently switched in the first version of the cube, and have now been corrected.</notes>
+                           </verStmt>
+                        </nCube>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCube>
+                           <notes>This nCube was created to meet the needs of local low income programs in determining eligibility for federal funds.</notes>
+                        </nCube>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dataDscr>
+                           <notes>The variables in this study are identical to earlier waves. </notes>
+                        </dataDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <otherMat>
+                           <notes>Users should be aware that this questionnaire was modified  during the CAI process.</notes>
+                        </otherMat>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="origArch" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Archive Where Study Originally Stored</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Archive from which the data collection was obtained; the originating archive. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <origArch>Zentralarchiv fuer empirische Sozialforschung</origArch>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="othIdType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="type" type="xs:string"/>
+            <xs:attribute name="role" type="xs:string"/>
+            <xs:attribute name="affiliation" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="othId" type="othIdType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Other Identifications /Acknowledgments</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Statements of responsibility not recorded in the title and statement of responsibility areas. Indicate here the persons or bodies connected with the work, or significant persons or bodies connected with previous editions and not already named in the description. For example, the name of the person who edited the marked-up documentation might be cited in codeBook/docDscr/rspStmt/othId, using the "role" and "affiliation" attributes. Other identifications/acknowledgments for data collection (codeBook/stdyDscr/citation/rspStmt/othId) maps to Dublin Core Contributor element.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <othId role="editor" affiliation="INRA">Jane Smith</othId>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="othRefsType" mixed="true">
+      <xs:complexContent>
+         <xs:restriction base="abstractTextType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:group ref="FORM"/>
+                  <xs:group ref="xhtml:BlkNoForm.mix"/>
+                  <xs:element ref="citation"/>
+               </xs:choice>
+            </xs:sequence>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="othRefs" type="othRefsType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Other References Notes</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Indicates other pertinent references. Can take the form of bibliographic citations. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <othRefs>Part II of the documentation, the Field Representative's Manual, is provided in hardcopy form only.</othRefs>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="otherMatType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:choice>
+               <xs:sequence>
+                  <xs:element ref="labl" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element ref="txt" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element ref="table" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element ref="citation" minOccurs="0"/>
+                  <xs:element ref="otherMat" minOccurs="0" maxOccurs="unbounded"/>
+               </xs:sequence>
+            </xs:choice>
+            <xs:attribute name="type" type="xs:string"/>
+            <xs:attribute name="level" type="xs:NMTOKEN" use="required"/>
+            <xs:attribute name="URI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="otherMat" type="otherMatType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Other Study-Related Materials</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>This section allows for the inclusion of other materials that are related to the study as identified and labeled by the DTD/Schema users (encoders). The' materials may be entered as PCDATA (ASCII text) directly into the document (through use of the "txt" element). This ection may also serve as a "container" for other electronic materials such as setup files by providing a brief description of the study-related materials accompanied by the attributes "type" and "level" defining the material further. The "URI" attribute may be used to indicate the location of the other study-related materials.</xhtml:p>
+                     <xhtml:p>Other Study-Related Materials may include: questionnaires, coding notes, SPSS/SAS/Stata setup files (and others), user manuals, continuity guides, sample computer software programs, glossaries of terms, interviewer/project instructions, maps, database schema, data dictionaries, show cards, coding information, interview schedules, missing values information, frequency files, variable maps, etc.</xhtml:p>
+                     <xhtml:p>The "level" attribute is used to clarify the relationship of the other materials to components of the study. Suggested values for level include specifications of the item level to which the element applies: e.g., level= data; level=datafile; level=studydsc; level=study. The URI attribute need not be used in every case; it is intended for capturing references to other materials separate from the codebook itself. In Section 5, Other Material is recursively defined.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="othrStdyMatType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="relMat" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="relStdy" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="relPubl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="othRefs" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="othrStdyMat" type="othrStdyMatType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Other Study Description Materials</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Other materials relating to the study description. This section describes other materials that are related to the study description that are primarily descriptions of the content and use of the study, such as appendices, sampling information, weighting details, methodological and technical details, publications based upon the study content, related studies or collections of studies, etc. This section may point to other materials related to the description of the study through use of the generic citation element, which is available for each element in this section. This maps to Dublin Core Relation element. Note that codeBook/otherMat (Other Study-Related Materials), should be used for materials used in the production of the study or useful in the analysis of the study. The materials in codeBook/otherMat may be entered as PCDATA (ASCII text) directly into the document (through use of the txt element). That section may also serve as a "container" for other electronic materials by providing a brief description of the study-related materials accompanied by the "type" and "level" attributes further defining the materials. Other Study-Related Materials in codeBook/otherMat may include: questionnaires, coding notes, SPSS/SAS/Stata setup files (and others), user manuals, continuity guides, sample computer software programs, glossaries of terms, interviewer/project instructions, maps, database schema, data dictionaries, show cards, coding information, interview schedules, missing values information, frequency files, variable maps, etc.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="parTitl" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Parallel Title</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Title translated into another language.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <titl>Politbarometer West [Germany], Partial Accumulation, 1977-1995</titl>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <parTitl>Politbarometer, 1977-1995: Partielle Kumulation</parTitl>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="physLocType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="type" type="xs:string"/>
+            <xs:attribute name="recRef" type="xs:IDREF"/>
+            <xs:attribute name="startPos" type="xs:string"/>
+            <xs:attribute name="width" type="xs:string"/>
+            <xs:attribute name="endPos" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="physLoc" type="physLocType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1></xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>This is an empty element containing only the attributes listed below. Attributes include "type" (type of file structure: rectangular, hierarchical, two-dimensional, relational), "recRef" (IDREF link to the appropriate file or recGrp element within a file), "startPos" (starting position of variable or data item), "endPos" (ending position of variable or data item), "width" (number of columns the variable/data item occupies), "RecSegNo" (the record segment number, deck or card number the variable or data item is located on), and "fileid" (an IDREF link to the fileDscr element for the file that includes this physical location).</xhtml:p>
+                     <xhtml:p>Remarks: Where the same variable is coded in two different files, e.g., a fixed format file and a relational database file, simply repeat the physLoc element with the alternative location information. Note that if there is no width or ending position, then the starting position should be the ordinal position in the file, and the file would be described as free-format. New attributes will be added as other storage formats are described within the DDI.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <physLoc type="rectangular" recRef="R1" startPos="55" endPos="57" width="3"/>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <physLoc type="hierarchical" recRef="R6" startPos="25" endPos="25" width="1"/>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="pointType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="gringLat"/>
+               <xs:element ref="gringLon"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="point" type="pointType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Point</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">0-dimensional geometric primitive, representing a position, but not having extent. In this declaration, point is limited to a longitude/latitude coordinate system.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="polygonType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="point" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="polygon" type="polygonType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Polygon</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The minimum polygon that covers a geographical area, and is delimited by at least 4 points (3 sides), in which the last point coincides with the first point.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="postQTxt" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">PostQuestion Text</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Text describing what occurs after the literal question has been asked.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <qstn>
+                              <postQTxt>The next set of questions will ask about your financial situation.</postQTxt> 
+                           </qstn>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="preQTxt" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">PreQuestion Text</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Text describing a set of conditions under which a question might be asked.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <qstn>
+                              <preQTxt>For those who did not go away on a holiday of four days or more in 1985...</preQTxt>
+                           </qstn>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="ProcStat" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Processing Status</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Processing status of the file. Some data producers and social science data archives employ data processing strategies that provide for release of data and documentation at various stages of processing.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <ProcStat>Available from the DDA. Being processed.</ProcStat>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <ProcStat>The principal investigator notes that the data in Public Use Tape 5 are released prior to final cleaning and editing, in order to provide prompt access to the NMES data by the research and policy community.</ProcStat>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="prodDate" type="simpleTextAndDateType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Date of Production</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Date when the marked-up document/marked-up document source/data collection/other material(s) were produced (not distributed or archived). The ISO standard for dates (YYYY-MM-DD) is recommended for use with the date attribute. Production date for data collection (codeBook/stdyDscr/citation/prodStmt/prodDate) maps to Dublin Core Date element.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <prodDate date="1999-01-25">January 25, 1999</prodDate>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="prodPlac" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Place of Production</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Address of the archive or organization that produced the work.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <prodPlac>Ann Arbor, MI: Inter-university Consortium for Political and Social Research</prodPlac>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="prodStmtType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="producer" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="copyright" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="prodDate" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="prodPlac" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="software" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="fundAg" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="grantNo" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="prodStmt" type="prodStmtType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Production Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Production statement for the work at the appropriate level: marked-up document; marked-up document source; study; study description, other material; other material for study.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="producerType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="abbr" type="xs:string"/>
+            <xs:attribute name="affiliation" type="xs:string"/>
+            <xs:attribute name="role" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="producer" type="producerType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Producer</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The producer is the person or organization with the financial or administrative responsibility for the physical processes whereby the document was brought into existence. Use the "role" attribute to distinguish different stages of involvement in the production process, such as original producer. Producer of data collection (codeBook/stdyDscr/citation/prodStmt/producer) maps to Dublin Core Publisher element. The "producer" in the Document Description should be the agency or person that prepared the marked-up document.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <producer abbr="ICPSR" affiliation="Institute for Social Research">Inter-university Consortium for Political and Social Research</producer>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <producer abbr="MNPoll" affiliation="Minneapolis Star Tibune Newspaper"
+                                  role="original producer">Star Tribune Minnesota Poll</producer>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <producer abbr="MRDC" affiliation="University of Minnesota" role="final production">Machine Readable Data Center</producer>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="purposeType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+            <xs:attribute name="methrefs" type="xs:IDREFS"/>
+            <xs:attribute name="pubrefs" type="xs:IDREFS"/>
+            <xs:attribute name="URI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="purpose" type="purposeType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1></xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Explains the purpose for which a particular nCube was created.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCube>
+                           <purpose>Meets reporting requirements for the Federal Reserve Board</purpose>
+                        </nCube>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="qstnType" mixed="true">
+      <xs:complexContent>
+         <xs:restriction base="abstractTextType">
+            <xs:sequence>
+               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                  <xs:group ref="PHRASE"/>
+                  <xs:group ref="FORM"/>
+                  <xs:group ref="xhtml:BlkNoForm.mix"/>
+                  <xs:element ref="preQTxt"/>
+                  <xs:element ref="qstnLit"/>
+                  <xs:element ref="postQTxt"/>
+                  <xs:element ref="forward"/>
+                  <xs:element ref="backward"/>
+                  <xs:element ref="ivuInstr"/>
+               </xs:choice>               
+            </xs:sequence>
+            <xs:attribute name="qstn" type="xs:IDREF"/>
+            <xs:attribute name="var" type="xs:IDREFS"/>
+            <xs:attribute name="seqNo" type="xs:string"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+            <xs:attribute name="responseDomainType" use="optional">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="text"/>
+                     <xs:enumeration value="numeric"/>
+                     <xs:enumeration value="code"/>
+                     <xs:enumeration value="category"/>
+                     <xs:enumeration value="datetime"/>
+                     <xs:enumeration value="geographic"/>
+                     <xs:enumeration value="multiple"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherResponseDomainType" type="xs:NMTOKEN" use="optional"/>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="qstn" type="qstnType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Question</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The question element may have mixed content. The element itself may contain text for the question, with the subelements being used to provide further information about the question. Alternatively, the question element may be empty and only the subelements used. The element has a unique question ID attribute which can be used to link a variable with other variables where the same question has been asked. This would allow searching for all variables that share the same question ID, perhaps because the questions was asked several times in a panel design. The "ID" attribute contains a unique identifier for the question. "Var" references the ID(s) of the variable(s) relating to the question. The attribute "seqNo" refers to the sequence number of the question. The attribute "sdatrefs" may be used to reference elements in the summary data description section of the Study Description which might apply to this question. These elements include: time period covered, date of collection, nation or country, geographic coverage, geographic unit, unit of analysis, universe, and kind of data. The responseDomainType attribute was added to capture the specific DDI 3 response domain type to facilitate translation between DDI 2 and DDI 3. If this is given a value of "other" then a term from a controlled vocabulary should be put into the "otherResponseDomainType" attribute.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <qstn ID="Q125">When you get together with your friends, would you say you discuss political matters frequently, occasionally, or never?</qstn>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="qstnLitType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="qstnLit" type="qstnLitType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Literal Question</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Text of the actual, literal question asked.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <qstn>
+                              <qstnLit>Why didn't you go away in 1985?</qstnLit>
+                           </qstn>
+                        </var>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="rangeType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:attribute name="UNITS" default="INT">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="INT"/>
+                     <xs:enumeration value="REAL"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="min" type="xs:string"/>
+            <xs:attribute name="minExclusive" type="xs:string"/>
+            <xs:attribute name="max" type="xs:string"/>
+            <xs:attribute name="maxExclusive" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="range" type="rangeType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Value Range</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This is the actual range of values. The "UNITS" attribute permits the specification of integer/real numbers. The "min" and "max" attributes specify the lowest and highest values that are part of the range. The "minExclusive" and "maxExclusive" attributes specify values that are immediately outside the range. This is an empty element consisting only of its attributes.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">For example, x &lt; 1 or 10 &lt;= x &lt; 20 would be expressed as:
+               	<xhtml:samp class="xml_sample"><![CDATA[
+                        <range maxExclusive="1"/>
+                     ]]></xhtml:samp>
+               	     <xhtml:samp class="xml_sample"><![CDATA[
+                        <range min="10" maxExclusive="20"/>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="recDimnsnType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="varQnty" minOccurs="0"/>
+               <xs:element ref="caseQnty" minOccurs="0"/>
+               <xs:element ref="logRecL" minOccurs="0"/>
+            </xs:sequence>
+            <xs:attribute name="level" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="recDimnsn" type="recDimnsnType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Dimensions (of record)</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information about the physical characteristics of the record. The "level" attribute on this element should be set to "record".</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="recGrpType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="labl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="recDimnsn" minOccurs="0"/>
+            </xs:sequence>
+            <xs:attribute name="recGrp" type="xs:IDREFS"/>
+            <xs:attribute name="rectype" type="xs:string"/>
+            <xs:attribute name="keyvar" type="xs:IDREFS"/>
+            <xs:attribute name="rtypeloc" type="xs:string"/>
+            <xs:attribute name="rtypewidth" type="xs:string" default="1"/>
+            <xs:attribute name="rtypevtype" default="numeric">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="numeric"/>
+                     <xs:enumeration value="character"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="recidvar" type="xs:string"/>
+
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="recGrp" type="recGrpType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Record or Record Group</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Used to describe record groupings if the file is hierarchical or relational. The attribute "recGrp" allows a record group to indicate subsidiary record groups which nest underneath; this allows for the encoding of a hierarchical structure of record groups. The attribute "rectype" indicates the type of record, e.g., "A records" or "Household records." The attribute "keyvar" is an IDREF that provides the link to other record types. In a hierarchical study consisting of individual and household records, the "keyvar" on the person record will indicate the household to which it belongs. The attribute "rtypeloc" indicates the starting column location of the record type indicator variable on each record of the data file. The attribute "rtypewidth" specifies the width, for files with many different record types. The attribute "rtypevtype" specifies the type of the indicator variable. The "recidvar" indicates the variable that identifies the record group.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileStrc type="hierarchical"> 
+                           <recGrp rectype="Person" keyvar="HHDID">
+                              <labl>CPS 1999 Person-Level Record</labl>
+                              <recDimnsn>
+                                 <varQnty>133</varQnty>
+                                 <caseQnty>1500</caseQnty>
+                                 <logRecL>852</logRecL>
+                              </recDimnsn>
+                           </recGrp> 
+                        </fileStrc>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="recNumTot" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Overall Number of Records</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Overall record count in file. Particularly helpful in instances such as files with multiple cards/decks or records per case.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dimensns>
+                           <recNumTot>2400</recNumTot>
+                        </dimensns>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="recPrCas" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Records per Case</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Records per case in the file. This element should be used for card-image data or other files in which there are multiple records per case.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dimensns>
+                           <recPrCas>5</recPrCas>
+                        </dimensns>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Records per Case</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Records per case in the file. This element   should be used for card-image data or other files in which there are multiple records per case.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <dimensns>
+                           <recPrCas>5</recPrCas>
+                        </dimensns>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="relMatType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="materialReferenceType">
+            <xs:attribute name="callno" type="xs:string"/>
+            <xs:attribute name="label" type="xs:string"/>
+            <xs:attribute name="media" type="xs:string"/>
+            <xs:attribute name="type" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="relMat" type="relMatType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Related Materials</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Describes materials related to the study description, such as appendices, additional information on sampling found in other documents, etc. Can take the form of bibliographic citations. This element can contain either PCDATA or a citation or both, and there can be multiple occurrences of both the citation and PCDATA within a single element. May consist of a single URI or a series of URIs comprising a series of citations/references to external materials which can be objects as a whole (journal articles) or parts of objects (chapters or appendices in articles or documents).</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <relMat> Full details on the research design and procedures, sampling methodology, content areas, and questionnaire design, as well as percentage distributions by respondent's sex, race, region, college plans, and drug use, appear in the annual ISR volumes MONITORING THE FUTURE: QUESTIONNAIRE RESPONSES FROM THE NATION'S HIGH SCHOOL SENIORS.</relMat>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <relMat>Current Population Survey, March 1999: Technical Documentation  includes an abstract, pertinent information about the file, a glossary, code lists, and a data dictionary. One copy accompanies each file order. When ordered separately, it is available from Marketing Services Office, Customer Service Center, Bureau of the Census, Washington, D.C. 20233. </relMat>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <relMat>A more precise explanation regarding the CPS sample design is provided in Technical Paper 40, The Current Population Survey: Design and Methodology. Chapter 5 of this paper provides documentation on the weighting procedures for the CPS both with and without supplement questions.</relMat>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="relPubl" type="materialReferenceType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Related Publications</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Bibliographic and access information aboutvarticles and reports based on the data in this collection. Can take the formbof bibliographic citations. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <relPubl>Economic Behavior Program Staff. SURVEYS OF CONSUMER FINANCES. Annual volumes 1960 through 1970. Ann Arbor, MI: Institute for Social Research.</relPubl>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <relPubl>Data from the March Current Population Survey are published most  frequently in the Current Population Reports P- 20 and P- 60 series. These  reports are available from the Superintendent of Documents, U. S. Government  Printing Office, Washington, DC 20402. They also are available on the INTERNET  at http://www. census. gov. Forthcoming reports will be cited in Census and  You, the Monthly Product Announcement (MPA), and the Bureau of the Census  Catalog and Guide. </relPubl>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+      
+   <xs:element name="relStdy" type="materialReferenceType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Related Studies</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information on the relationship of the current data collection to others (e.g., predecessors, successors, other waves or rounds) or to other editions of the same file. This would include the names of additional data collections generated from the same data collection vehicle plus other collections directed at the same general topic. Can take the form of bibliographic citations. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <relStdy>ICPSR distributes a companion study to this collection titled FEMALE LABOR FORCE PARTICIPATION AND MARITAL INSTABILITY, 1980: [UNITED STATES] (ICPSR 9199).</relStdy>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="resInstruType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="conceptualTextType">
+            <xs:attribute name="type" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="resInstru" type="resInstruType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Type of Research Instrument</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The type of data collection instrument used. "Structured" indicates an instrument in which all respondents are asked the same questions/tests, possibly with precoded answers. If a small portion of such a questionnaire includes open-ended questions, provide appropriate comments. "Semi-structured" indicates that the research instrument contains mainly open-ended questions. "Unstructured" indicates that in-depth interviews were conducted. The "type" attribute is included to permit the development of a controlled vocabulary for this element.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <resInstru>structured</resInstru>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="respRate" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Response Rate</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The percentage of sample members who provided information. This may include a broader description of stratified response rates, information affecting resonse rates etc.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <respRate>For 1993, the estimated inclusion rate for TEDS-eligible providers was 91 percent, with the inclusion rate for all treatment providers estimated at 76 percent (including privately and publicly funded providers).</respRate>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <respRate>The overall response rate was 82%, although retail firms with an annual sales volume of more than $5,000,000 were somewhat less likely to respond.</respRate>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="respUnit" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Response Unit</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Provides information regarding who provided the information contained within the variable/nCube, e.g., respondent, proxy, interviewer. This element may be repeated only to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <respUnit>Head of household</respUnit>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCube>
+                           <respUnit>Head of household</respUnit>
+                        </nCube>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="restrctn" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Restrictions</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Any restrictions on access to or use of the collection such as privacy certification or distribution restrictions should be indicated here. These can be restrictions applied by the author, producer, or disseminator of the data collection. If the data are restricted to only a certain class of user, specify which type. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <restrctn> In preparing the data file(s) for this collection, the National Center for Health Statistics (NCHS) has removed direct identifiers and characteristics that might lead to identification of data subjects. As an additional precaution NCHS requires, under Section 308(d) of the Public Health Service Act (42 U.S.C. 242m), that data collected by NCHS not be used for any purpose other than statistical analysis and reporting. NCHS further requires that analysts not use the data to learn the identity of any persons or establishments and that the director of NCHS be notified if any identities are inadvertently discovered. ICPSR member institutions and other users ordering data from ICPSR are expected to adhere to these restrictions.</restrctn>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <restrctn> ICPSR obtained these data from the World Bank under the terms of a contract which states that the data are for the sole use of ICPSR and may not be sold or provided to third parties outside of ICPSR membership. Individuals at institutions that are not members of the ICPSR may obtain these data directly from the World Bank.</restrctn>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="rowType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="entry" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="rowsep" type="xs:string"/>
+            <xs:attribute name="valign">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="top"/>
+                     <xs:enumeration value="middle"/>
+                     <xs:enumeration value="bottom"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="row" type="rowType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Table Row</xhtml:h1>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="rspStmtType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="AuthEnty" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="othId" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="rspStmt" type="rspStmtType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Responsibility Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Responsibility for the creation of the work at the appropriate level: marked-up document; marked-up document source; study; study description, other material; other material for study.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="sampProc" type="conceptualTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Sampling Procedure</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The type of sample and sample design used to select the survey respondents to represent the population. May include reference to the target sample size and the sampling fraction.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <sampProc>National multistage area probability sample</sampProc>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <sampProc>Simple random sample</sampProc>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <sampProc>Stratified random sample</sampProc>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <sampProc>Quota sample</sampProc>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <sampProc>The 8,450 women interviewed for the NSFG, Cycle IV, were drawn from households in which  someone had been interviewed for the National Health Interview Survey (NHIS), between October 1985 and March 1987.</sampProc>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <sampProc>Samples sufficient to produce approximately 2,000 families with completed interviews were drawn in each state. Families containing one or more Medicaid or uninsured persons were oversampled. XHTML content may be used for formatting.</sampProc>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="security" type="simpleTextAndDateType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Security</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Provides information regarding levels of access, e.g., public, subscriber, need to know. The ISO standard for dates (YYYY-MM-DD) is recommended for use with the date attribute.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <security date="1998-05-10"> This variable has been recoded for reasons of confidentiality. Users should contact the archive for information on obtaining access.</security>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <security date="1998-05-10">Variable(s) within this nCube have been recoded for reasons of confidentiality.  Users should contact the archive for information on obtaining access.</security>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="serInfo" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Series Information</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Contains a history of the series and a summary of those features that apply to the series as a whole.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <serInfo>The Current Population Survey (CPS) is a household sample survey conducted monthly by the Census Bureau to provide estimates of employment, unemployment, and other characteristics of the general labor force, estimates of the population as a whole, and estimates of various subgroups in the population. The entire non-institutionalized population of the United States is sampled to obtain the respondents for this survey series.</serInfo>
+                     ]]></xhtml:samp>
+                 </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="serNameType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="abbr" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="serName" type="serNameType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Series Name</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The name of the series to which the work belongs.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <serName abbr="CPS">Current Population Survey Series</serName>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="serStmtType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="serName" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="serInfo" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="URI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="serStmt" type="serStmtType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Series Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Series statement for the work at the appropriate level: marked-up document; marked-up document source; study; study description, other material; other material for study. The URI attribute is provided to point to a central Internet repository of series information. Repeat this field if the study is part of more than one series. Repetition of the internal content should be used to support multiple languages only.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="setAvailType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="accsPlac" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="origArch" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="avlStatus" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="collSize" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="complete" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="fileQnty" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="media" type="xs:string"/>
+            <xs:attribute name="callno" type="xs:string"/>
+            <xs:attribute name="label" type="xs:string"/>
+            <xs:attribute name="type" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="setAvail" type="setAvailType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Data Set Availability</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information on availability and storage of the collection. The "media" attribute may be used in combination with any of the subelements. See Location of Data Collection.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="softwareType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextAndDateType">
+            <xs:attribute name="version" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="software" type="softwareType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Software used in Production</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Software used to produce the work. A "version" attribute permits specification of the software version number. The "date" attribute is provided to enable specification of the date (if any) for the software release. The ISO standard for dates (YYYY-MM-DD) is recommended for use with the date attribute.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <docDscr>
+                           <citation>
+                              <prodStmt>
+                                 <software version="1.0">MRDC Codebook Authoring Tool</software>
+                              </prodStmt>
+                           </citation>
+                        </docDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <docDscr>
+                           <citation>
+                              <prodStmt>
+                                 <software version="8.0">Arbortext Adept Editor</software>
+                              </prodStmt>
+                           </citation>
+                        </docDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <docDscr>
+                           <docSrc>
+                              <prodStmt>
+                                 <software version="4.0">PageMaker</software>
+                              </prodStmt>
+                           </docSrc>
+                        </docDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <stdyDscr>
+                           <citation>
+                              <prodStmt>
+                                 <software version="6.12">SAS</software>
+                              </prodStmt>
+                           </citation>
+                        </stdyDscr>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <fileTxt>
+                           <software version="6.12">The SAS transport file was generated by the SAS CPORT procedure.</software>
+                        </fileTxt>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="sourcesType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:choice>
+               <xs:sequence>
+                  <xs:element ref="dataSrc" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element ref="sourceCitation" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element ref="srcOrig" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element ref="srcChar" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element ref="srcDocu" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element ref="sources" minOccurs="0" maxOccurs="unbounded"/>
+               </xs:sequence>
+            </xs:choice>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="sources" type="sourcesType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Sources Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Description of sources used for the data collection. The element is nestable so that the sources statement might encompass a series of discrete source statements, each of which could contain the facts about an individual source. This element maps to Dublin Core Source element.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="sourceCitation" type="citationType">
+			<xs:annotation>
+				<xs:documentation>
+					<xhtml:div>
+
+						<xhtml:h1 class="element_title">Source Citation</xhtml:h1>
+
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Description</xhtml:h2>
+							<xhtml:div class="description">This complex element allows the inclusion of a standard citation for the sources used in collecting and creating the dataset.</xhtml:div>
+						</xhtml:div>
+
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Example</xhtml:h2>
+							<xhtml:div class="example">
+								<xhtml:samp class="xml_sample"><![CDATA[
+<sourceCitation>
+<titlStmt>
+<titl>Tenth Decennial Census of the United States, 1880. Volume I. Statistics of the Population of the United States at the Tenth Census.</titl>
+</titlStmt>
+<rspStmt>
+<AuthEnty affiliation="U.S. Department of Commerce">United States Census Bureau</AuthEnty>
+</rspStmt>
+<prodStmt>
+<producer>Government Printing Office</producer>
+<prodDate>1883</prodDate>
+</prodStmt>
+</sourceCitation>
+]]>
+								</xhtml:samp>
+							</xhtml:div>
+						</xhtml:div>
+					</xhtml:div>
+				</xs:documentation>
+			</xs:annotation>
+		</xs:element>
+   
+   <xs:element name="southBL" type="phraseType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">South Bounding Latitude</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The southernmost coordinate delimiting the geographic extent of the dataset. A valid range of values, expressed in decimal degrees (positive east and positive north), is: -90,0 &lt;=South Bounding Latitude Value &lt;= 90,0 ; South Bounding Latitude Value &lt;= North Bounding Latitude Value</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="specPermType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="required" default="yes">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="yes"/>
+                     <xs:enumeration value="no"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="formNo" type="xs:string"/>
+            <xs:attribute name="URI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="specPerm" type="specPermType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Special Permissions</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This element is used to determine if any special permissions are required to access a resource. The "required" attribute is used to aid machine processing of this element, and the default specification is "yes". The "formNo" attribute indicates the number or ID of the form that the user must fill out. The "URI" attribute may be used to provide a URN or URL for online access to a special permissions form.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <specPerm formNo="4">The user must apply for special permission to use this dataset locally and must complete a confidentiality form.</specPerm>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="srcChar" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Characteristics of Source Noted</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Assessment of characteristics and quality of source material. May not be relevant to survey data. This element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="srcDocu" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Documentation and Access to Sources</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Level of documentation of the original sources. May not be relevant to survey data. This element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="srcOrig" type="conceptualTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Origins of Sources</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. This element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="stdCatgryType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextAndDateType">
+            <xs:attribute name="URI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="stdCatgry" type="stdCatgryType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Standard Categories</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Standard category codes used in the variable, like industry codes, employment codes, or social class codes. The attribute "date" is provided to indicate the version of the code in place at the time of the study. The attribute "URI" is provided to indicate a URN or URL that can be used to obtain an electronic list of the category codes.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <stdCatgry date="1981" source="producer">U. S. Census of Population and Housing, Classified Index of Industries and Occupations </stdCatgry>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="stdyClasType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="stdyClas" type="stdyClasType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Class of the Study</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Generally used to give the data archive's class or study status number, which indicates the processing status of the study. May also be used as a text field to describe processing status. This element may be repeated to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <stdyClas>ICPSR Class II</stdyClas>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <stdyClas>DDA Class C</stdyClas>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <stdyClas>Available from the DDA. Being processed. </stdyClas>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="stdyDscrType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="citation" maxOccurs="unbounded"/>
+               <xs:element ref="studyAuthorization" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="stdyInfo" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="studyDevelopment" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="method" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="dataAccs" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="othrStdyMat" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="access" type="xs:IDREFS"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="stdyDscr" type="stdyDscrType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Study Description</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The Study Description consists of information about the data collection, study, or compilation that the DDI-compliant documentation file describes. This section includes information about how the study should be cited, who collected or compiled the data, who distributes the data, keywords about the content of the data, summary (abstract) of the content of the data, data collection methods and processing, etc. Note that some content of the Study Description's Citation -- e.g., Responsibility Statement -- may be identical to that of the Documentation Citation. This is usually the case when the producer of a data collection also produced the print or electronic codebook for that data collection.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="studyDevelopmentType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="developmentActivity" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="studyDevelopment" type="studyDevelopmentType">
+      <xs:annotation>
+         <xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Study Development</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">Describe the process of study development as a series of development activities. These activities can be typed using a controlled vocabulary. Describe the activity, listing participants with their role and affiliation, resources used (sources of information), and the outcome of the development activity.</xhtml:div>
+					</xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:p>This would allow you to provide inputs for a number of development activities you wanted to capture using separate entry screens and tagged storage of developmentActivity using the type attribute. For example if there was an activity related to data availability the developmentActivity might be as follows:</xhtml:p>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+								<developmentActivity type="checkDataAvailability">
+									<description>A number of potential sources were evaluated for content, consistency and quality</description>
+									<participant affiliation="NSO" role="statistician">John Doe</participant>
+									</resource>
+										<dataSrc>Study S</dataSrc>
+										<srcOrig>Collected in 1970 using unknown sampling method</srcOrig>
+										<srcChar>Information incomplete missing X province</srcChar>
+									</resource>
+									<outcome>Due to quality issues this was determined not to be a viable source of data for the study</outcome>
+								</developmentActivity>
+                     ]]></xhtml:samp>
+                     <xhtml:p>This generic structure would allow you to designate additional design activities etc.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+				</xhtml:div>
+			</xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="developmentActivityType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element name="description" type="simpleTextType" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="participant" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="resource" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element name="outcome" type="simpleTextType" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="developmentActivity" type="developmentActivityType"/>
+
+   <xs:complexType name="participantType">
+      <xs:simpleContent>
+         <xs:extension base="stringType">
+            <xs:attribute name="affiliation" type="xs:string" use="optional"/>
+            <xs:attribute name="abbr" type="xs:string" use="optional"/>
+            <xs:attribute name="role" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+
+   <xs:element name="participant" type="participantType"/>
+
+   <xs:complexType name="resourceType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element name="dataSrc" type="simpleTextType" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="srcOrig" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="srcChar" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="srcDocu" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="resource" type="resourceType"/>
+
+   <xs:complexType name="studyAuthorizationType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="authorizingAgency" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="authorizationStatement" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="date" type="dateSimpleType" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="studyAuthorization" type="studyAuthorizationType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Study Authorization</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Provides structured information on the agency that authorized the study, the date of authorization, and an authorization statement.</xhtml:div>
+               </xhtml:div>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Example</xhtml:h2>
+							<xhtml:div class="example">
+								<xhtml:samp class="xml_sample"><![CDATA[
+<studyAuthorization date="2010-11-04">
+<authorizingAgency affiliation="University of Georgia" abbr="HSO">Human Subjects Office</authorizingAgency>
+<authorizationStatement>Statement of authorization issued bu OUHS on 2010-11-04</authorizationStatement></studyAuthorization>
+]]>
+								</xhtml:samp>
+							</xhtml:div>
+						</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="authorizingAgencyType">
+      <xs:simpleContent>
+         <xs:extension base="stringType">
+            <xs:attribute name="affiliation" type="xs:string" use="optional"/>
+            <xs:attribute name="abbr" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+   
+   <xs:element name="authorizingAgency" type="authorizingAgencyType">
+      <xs:annotation>
+				<xs:documentation>
+					<xhtml:div>
+						<xhtml:h1 class="element_title">Authorizing Agency</xhtml:h1>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Description</xhtml:h2>
+							<xhtml:div class="description">Name of the agent or agency that authorized the study. The "affiliation" attribute indicates the institutional affiliation of the authorizing agent or agency. The "abbr" attribute holds the abbreviation of the authorizing agent's or agency's name.</xhtml:div>
+						</xhtml:div>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Example</xhtml:h2>
+							<xhtml:div class="example">
+								<xhtml:samp class="xml_sample"><![CDATA[
+<authorizingAgency affiliation="Purdue University" abbr="OUHS">Office for Use of Human Subjects</authorizingAgency>
+]]>
+								</xhtml:samp>
+							</xhtml:div>
+						</xhtml:div>
+					</xhtml:div>
+				</xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="authorizationStatement" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Authorization Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The text of the authorization. Use XHTML to capture significant structure in the document.</xhtml:div>
+               </xhtml:div>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Example</xhtml:h2>
+							<xhtml:div class="example">
+								<xhtml:samp class="xml_sample"><![CDATA[
+<authorizationStatement>Required documentation covering the study purpose, disclosure information, questionnaire content, and consent statements was delivered to the OUHS on 2010-10-01 and was reviewed by the compliance officer. Statement of authorization for the described study was issued on 2010-11-04</authorizationStatement>
+]]>
+								</xhtml:samp>
+							</xhtml:div>
+						</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="stdyInfoType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="studyBudget" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="subject" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="abstract" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="sumDscr" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="qualityStatement" minOccurs="0"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="exPostEvaluation" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="stdyInfo" type="stdyInfoType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Study Scope</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This section contains information about the data collection's scope across several dimensions, including substantive content, geography, and time.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="qualityStatementType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="standardsCompliance" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element name="otherQualityStatement" type="simpleTextType" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="qualityStatement" type="qualityStatementType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Quality Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">This structure consists of two parts, standardsCompliance and otherQualityStatements. In standardsCompliance list all specific standards complied with during the execution of this study. Note the standard name and producer and how the study complied with the standard. Enter any additional quality statements in otherQualityStatements.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="standardsComplianceType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="standard"/>
+               <xs:element name="complianceDescription" type="simpleTextType" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="standardsCompliance" type="standardsComplianceType">
+			<xs:annotation>
+				<xs:documentation>
+					<xhtml:div>
+						<xhtml:h1 class="element_title">Standards Compliance</xhtml:h1>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Description</xhtml:h2>
+							<xhtml:div class="description">This section lists all specific standards complied with during the execution of this study. Specify the standard(s)' name(s) and producer(s) and describe how the study complied with each standard in complianceDescription. Enter any additional quality statements in otherQualityStatement.</xhtml:div>
+						</xhtml:div>
+						<xhtml:div>
+							<xhtml:h2 class="section_header">Example</xhtml:h2>
+							<xhtml:div class="example">
+								<xhtml:samp class="xml_sample"><![CDATA[
+<standardsCompliance><standard>
+<standardName>Data Documentation Initiative</standardName>
+<producer>DDI Alliance</producer></standard>
+<complianceDescription>Study metadata was created in compliance with the Data Documentation Initiative (DDI) standard</complianceDescription>
+</standardsCompliance>
+]]>
+								</xhtml:samp>
+							</xhtml:div>
+						</xhtml:div>
+					</xhtml:div>
+				</xs:documentation>
+			</xs:annotation>
+		</xs:element>
+
+
+   <xs:complexType name="standardType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="standardName" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="producer" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="standard" type="standardType">
+		<xs:annotation>
+			<xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Standard</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">Describes a standard with which the study complies.</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+   <xs:complexType name="standardNameType">
+      <xs:simpleContent>
+         <xs:extension base="stringType">
+            <xs:attribute name="date" type="dateSimpleType" use="optional"/>
+            <xs:attribute name="version" type="xs:string" use="optional"/>
+            <xs:attribute name="URI" type="xs:anyURI" use="optional"/>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+
+   <xs:element name="standardName" type="standardNameType">
+		<xs:annotation>
+			<xs:documentation>
+				<xhtml:div>
+					<xhtml:h1 class="element_title">Standard Name</xhtml:h1>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Description</xhtml:h2>
+						<xhtml:div class="description">Contains the name of the standard with which the study complies. The "date" attribute specifies the date when the standard was published, the "version" attribute includes the specific version of the standard with which the study is compliant, and the "URI" attribute includes the URI for the actual standard.</xhtml:div>
+					</xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<standardName date="2009-10-18" version="3.1" URI="http://www.ddialliance.org/Specification/DDI-Lifecycle/3.1/">Data Documentation Initiative</standardName>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+				</xhtml:div>
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+   <xs:complexType name="exPostEvaluationType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="evaluator" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="evaluationProcess" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="outcomes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="completionDate" type="dateSimpleType" use="optional"/>
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="exPostEvaluation" type="exPostEvaluationType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Post Evaluation Procedures</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Use this section to describe evaluation procedures not address in data evaluation processes. These may include issues such as timing of the study, sequencing issues, cost/budget issues, relevance, instituional or legal arrangments etc. of the study. The completionDate attribute holds the date the evaluation was completed. The type attribute is an optional type to identify the type of evaluation with or without the use of a controlled vocabulary.</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<exPostEvaluation date="2003" type="comprehensive">
+<evaluator affiliation="United Nations" abbr="UNSD" role="consultant">United Nations Statistical Division</evaluator>
+<evaluationProcess>In-depth review of pre-collection and collection procedures</evaluationProcess>
+<outcomes>The following steps were highly effective in increasing response rates, and should be repeated in the next collection cycle...</outcomes>
+</exPostEvaluation>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="evaluatorType">
+      <xs:simpleContent>
+         <xs:extension base="stringType">
+            <xs:attribute name="affiliation" type="xs:string" use="optional"/>
+            <xs:attribute name="abbr" type="xs:string" use="optional"/>
+            <xs:attribute name="role" type="xs:string" use="optional"/>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+   
+   <xs:element name="evaluator" type="evaluatorType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Evaluator Type</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The evaluator element identifies persons or organizations involved in the evaluation. The affiliation attribute contains the affiliation of the individual or organization. The abbr attribute holds an abbreviation for the individual or organization. The role attribute indicates the role played by the individual or organization in the evaluation process.</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<evaluator affiliation="United Nations" abbr="UNSD" role="consultant">United Nations Statistical Division</evaluator>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="evaluationProcess" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Evaluation Process</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Describes the evaluation process followed.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="outcomes" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Evaluation Outcomes</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Describe the outcomes of the evaluation.</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<outcomes>The following steps were highly effective in increasing response rates, and should be repeated in the next collection cycle...</outcomes>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+             </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="studyBudget" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Study Budget</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Describe the budget of the project in as much detail as needed. Use XHTML structure elements to identify discrete pieces of information in a way that facilitates direct transfer of information on the study budget between DDI 2 and DDI 3 structures.</xhtml:div>
+               </xhtml:div>
+					<xhtml:div>
+						<xhtml:h2 class="section_header">Example</xhtml:h2>
+						<xhtml:div class="example">
+							<xhtml:samp class="xml_sample"><![CDATA[
+<studyBudget>The budget for the study covers a 5 year award period distributed between direct and indirect costs including: Staff, ...</studyBudget>
+]]>
+							</xhtml:samp>
+						</xhtml:div>
+					</xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:element name="subTitl" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Subtitle</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">A secondary title used to amplify or state certain limitations on the main title. It may repeat information already in the main title. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <titl>Monitoring the Future: A Continuing Study of American Youth, 1995</titl>
+                     ]]></xhtml:samp> 
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <subTitl>A Continuing Study of American Youth, 1995</subTitl>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <titl>Census of Population, 1950 [United States]: Public Use Microdata Sample</titl>
+                     ]]></xhtml:samp> 
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <subTitl>Public Use Microdata Sample</subTitl>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="subjectType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="keyword" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="topcClas" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="subject" type="subjectType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Subject Information</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Subject information describing the data collection's intellectual content.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="sumDscrType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="timePrd" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="collDate" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="nation" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="geogCover" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="geogUnit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="geoBndBox" minOccurs="0"/>
+               <xs:element ref="boundPoly" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="anlyUnit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="universe" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="dataKind" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="sumDscr" type="sumDscrType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Summary Data Description</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information about the and geographic coverage of the study and unit of analysis.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="sumStatType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="wgtd" default="not-wgtd">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="wgtd"/>
+                     <xs:enumeration value="not-wgtd"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="wgt-var" type="xs:IDREFS"/>
+            <xs:attribute name="weight" type="xs:IDREFS"/>
+            <xs:attribute name="type" use="required">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="mean"/>
+                     <xs:enumeration value="medn"/>
+                     <xs:enumeration value="mode"/>
+                     <xs:enumeration value="vald"/>
+                     <xs:enumeration value="invd"/>
+                     <xs:enumeration value="min"/>
+                     <xs:enumeration value="max"/>
+                     <xs:enumeration value="stdev"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherType" type="xs:NMTOKEN" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="sumStat" type="sumStatType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Summary Statistics</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>One or more statistical measures that describe the responses to a particular variable and may include one or more standard summaries, e.g., minimum and maximum values, median, mode, etc. The attribute "wgtd" indicates whether the statistics are weighted or not. The "weight" attribute is an IDREF(S) to the weight element(s) in the study description.</xhtml:p>
+                     <xhtml:p>The attribute "type" denotes the type of statistics being shown: mean, median, mode, valid cases, invalid cases, minimum, maximum, or standard deviation. If a value of "other" is used here, a value taken from a controlled vocabulary should be put in the "otherType" attribute. This option should only be used when applying a controlled vocabulary to this attribute. Use the complex element controlledVocabUsed to identify the controlled vocabulary to which the selected term belongs.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <sumStat type="min">0</sumStat>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <sumStat type="max">9</sumStat>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <sumStat type="median">4</sumStat>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="tableType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="titl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="tgroup" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="frame">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="top"/>
+                     <xs:enumeration value="bottom"/>
+                     <xs:enumeration value="topbot"/>
+                     <xs:enumeration value="all"/>
+                     <xs:enumeration value="sides"/>
+                     <xs:enumeration value="none"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="colsep" type="xs:string"/>
+            <xs:attribute name="rowsep" type="xs:string"/>
+            <xs:attribute name="pgwide" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="table" type="tableType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Table</xhtml:h1>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="tbodyType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="row" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="valign">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="top"/>
+                     <xs:enumeration value="middle"/>
+                     <xs:enumeration value="bottom"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="tbody" type="tbodyType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Table Body</xhtml:h1>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="tgroupType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="colspec" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="thead" minOccurs="0"/>
+               <xs:element ref="tbody"/>
+            </xs:sequence>
+            <xs:attribute name="cols" type="xs:string" use="required"/>
+            <xs:attribute name="colsep" type="xs:string"/>
+            <xs:attribute name="rowsep" type="xs:string"/>
+            <xs:attribute name="align">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="left"/>
+                     <xs:enumeration value="right"/>
+                     <xs:enumeration value="center"/>
+                     <xs:enumeration value="justify"/>
+                     <xs:enumeration value="char"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="tgroup" type="tgroupType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Table Group</xhtml:h1>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="theadType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="row" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="valign">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="top"/>
+                     <xs:enumeration value="middle"/>
+                     <xs:enumeration value="bottom"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="thead" type="theadType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Table Head</xhtml:h1>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="timeMethType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="conceptualTextType">
+            <xs:attribute name="method" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="timeMeth" type="timeMethType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Time Method</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The time method or time dimension of the data collection. The "method" attribute is included to permit the development of a controlled vocabulary for this element. For forward-compatibility, DDI 3 XHTML tags may be used in this element.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <timeMeth>panel survey</timeMeth>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <timeMeth>cross-section</timeMeth>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <timeMeth>trend study</timeMeth>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <timeMeth>time-series</timeMeth>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="timePrdType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextAndDateType">
+            <xs:attribute name="event" default="single">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="start"/>
+                     <xs:enumeration value="end"/>
+                     <xs:enumeration value="single"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="cycle" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="timePrd" type="timePrdType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Time Period Covered</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The time period to which the data refer. This item reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected. Also known as span. Use the event attribute to specify "start", "end", or "single" for each date entered. The ISO standard for dates (YYYY-MM-DD) is recommended for use with the "date" attribute. The "cycle" attribute permits specification of the relevant cycle, wave, or round of data. Maps to Dublin Core Coverage element. Inclusion of this element is recommended. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <timePrd event="start" date="1998-05-01">May 1, 1998</timePrd>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <timePrd event="end" date="1998-05-31">May 31, 1998</timePrd>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="titl" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Title</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Full authoritative title for the work at the appropriate level: marked-up document; marked-up document source; study; other material(s) related to study description; other material(s) related to study. The study title will in most cases be identical to the title for the marked-up document. A full title should indicate the geographic scope of the data collection as well as the time period covered. Title of data collection (codeBook/stdyDscr/citation/titlStmt/titl) maps to Dublin Core Title element. This element is required in the Study Description citation. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <titl>Domestic Violence Experience in Omaha, Nebraska, 1986-1987</titl>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <titl>Census of Population, 1950 [United States]: Public Use Microdata Sample</titl>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <titl>Monitoring the Future: A Continuing Study of American Youth, 1995</titl>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="titlStmtType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="titl"/>
+               <xs:element ref="subTitl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="altTitl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="parTitl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="IDNo" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="titlStmt" type="titlStmtType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Title Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Title statement for the work at the appropriate level: marked-up document; marked-up document source; study; study description, other materials; other materials for study.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="topcClasType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="vocab" type="xs:string"/>
+            <xs:attribute name="vocabURI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="topcClas" type="topcClasType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Topic Classification</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The classification field indicates the broad substantive topic(s) that the data cover. Library of Congress subject terms may be used here. The "vocab" attribute is provided for specification of the controlled vocabulary in use, e.g., LCSH, MeSH, etc. The "vocabURI" attribute specifies the location for the full controlled vocabulary. Maps to Dublin Core Subject element. Inclusion of this element in the codebook is recommended.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <topcClas vocab="LOC Subject Headings" vocabURI="http://www.loc.gov/catdir/cpso/lcco/lcco.html">Public opinion -- California -- Statistics</topcClas>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <topcClas vocab="LOC Subject Headings" vocabURI="http://www.loc.gov/catdir/cpso/lcco/lcco.html">Elections -- California</topcClas>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="TotlResp" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Total Responses</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The number of responses to this variable. This element might be used if the number of responses does not match added case counts. It may also be used to sum the frequencies for variable categories.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <TotlResp>1,056</TotlResp>
+                        </var>
+                     ]]></xhtml:samp>
+                  <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <TotlResp>There are only 725 responses to this question since it was not asked in Tanzania.</TotlResp>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="txtType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="tableAndTextType">
+            <xs:attribute name="level" type="xs:string"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="txt" type="txtType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Descriptive Text</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Lengthier description of the parent element. The attribute "level" indicates the level to which the element applies. The attribute "sdatrefs" allows pointing to specific dates, universes, or other information encoded in the study description.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <varGrp type="subject">
+                           <txt>The following five variables refer to respondent attitudes toward national environmental policies: air pollution, urban sprawl, noise abatement, carbon dioxide emissions, and nuclear waste.</txt>
+                        </varGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCubeGrp type="subject">
+                           <txt>The following four nCubes are grouped to present a cross tabulation of the variables Sex, Work experience in 1999, and Income in 1999.</txt>
+                        </nCubeGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <txt>Total population for the agency for the year reported.</txt>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catgryGrp>
+                           <txt>When the respondent indicated his political party reference, his response was coded on a scale of 1-99 with parties with a left-wing orientation coded on the low end of the scale and parties with a right-wing orientation coded on the high end of the scale.  Categories 90-99 were reserved miscellaneous responses.</txt>
+                        </catgryGrp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <catgry>
+                           <txt>Inap., question not asked in Ireland, Northern Ireland, and Luxembourg.</txt>
+                        </catgry>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCube>
+                           <txt>Detailed poverty status for age cohorts over a period of five years, to be used in determining program eligibility</txt>
+                        </nCube>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <otherMat URI="http://www.icpsr.umich.edu/..">
+                           <txt>This is a PDF version of the original questionnaire provided by the principal investigator.</txt>
+                        </otherMat>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <otherMat>
+                           <txt>Glossary of Terms. Below are terms that may  prove useful in working with the technical documentation for this study.. </txt>
+                        </otherMat>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <otherMat>
+                           <txt>This is a PDF version of the original questionnaire provided by the principal investigator.</txt>
+                        </otherMat>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="undocCod" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">List of Undocumented Codes</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Values whose meaning is unknown.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <undocCod>Responses for categories 9 and 10 are unavailable.</undocCod>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="universeType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="conceptualTextType">
+            <xs:attribute name="level" type="xs:string"/>
+            <xs:attribute name="clusion" default="I">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="I"/>
+                     <xs:enumeration value="E"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="universe" type="universeType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Universe</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The group of persons or other elements that are the object of research and to which any analytic results refer. Age,nationality, and residence commonly help to delineate a given universe, but any of a number of factors may be involved, such as sex, race, income, veteran status, criminal convictions, etc. The universe may consist of elements other than persons, such as housing units, court cases, deaths, countries, etc. In general, it should be possible to tell from the description of the universe whether a given individual or element (hypothetical or real) is a member of the population under study. A "level" attribute is included to permit coding of the level to which universe applies, i.e., the study level, the file level (if different from study), the record group, the variable group, the nCube group, the variable, or the nCube level. The "clusion" attribute provides for specification of groups included (I) in or excluded (E) from the universe. If all the variables/nCubes described in the data documentation relate to the same population, e.g., the same set of survey respondents, this element would be unnecessary at data description level. In this case, universe can be fully described at the study level. For forward-compatibility, DDI 3 XHTML tags may be used in this element. This element may be repeated only to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <universe clusion="I">Individuals 15-19 years of age. </universe>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <universe clusion="E">Individuals younger than 15 and older than 19 years of age.</universe>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="useStmtType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="confDec" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="specPerm" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="restrctn" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="contact" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="citReq" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="deposReq" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="conditions" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="disclaimer" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="useStmt" type="useStmtType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Use Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Information on terms of use for the data collection. This element may be repeated only to support multiple language expressions of the content.</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="valrngType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:choice minOccurs="1" maxOccurs="unbounded">
+                  <xs:element ref="item"/>
+                  <xs:element ref="range"/>
+               </xs:choice>
+               <xs:element ref="key" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="valrng" type="valrngType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Range of Valid Data Values</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Values for a particular variable that represent legitimate responses.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <valrng>
+                           <range min="1" max="3"/>
+                        </valrng>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <valrng>
+                           <item VALUE="1"/>
+                           <item VALUE="2"/>
+                           <item VALUE="3"/>
+                        </valrng>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="varType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="location" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="labl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="imputation" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="security" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="embargo" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="respUnit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="anlysUnit" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="qstn" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="valrng" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="invalrng" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="undocCod" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="universe" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="TotlResp" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="sumStat" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="txt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="stdCatgry" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="catgryGrp" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="catgry" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="codInstr" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="verStmt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="concept" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="derivation" minOccurs="0"/>
+               <xs:element ref="varFormat" minOccurs="0"/>
+               <xs:element ref="geoMap" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="catLevel" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string" use="required"/>
+            <xs:attribute name="wgt" default="not-wgt">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="wgt"/>
+                     <xs:enumeration value="not-wgt"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="wgt-var" type="xs:IDREFS"/>
+            <xs:attribute name="weight" type="xs:IDREFS"/>
+            <xs:attribute name="qstn" type="xs:IDREFS"/>
+            <xs:attribute name="files" type="xs:IDREFS"/>
+            <xs:attribute name="vendor" type="xs:string"/>
+            <xs:attribute name="dcml" type="xs:string"/>
+            <xs:attribute name="intrvl" default="discrete">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="contin"/>
+                     <xs:enumeration value="discrete"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="rectype" type="xs:string"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+            <xs:attribute name="methrefs" type="xs:IDREFS"/>
+            <xs:attribute name="pubrefs" type="xs:IDREFS"/>
+            <xs:attribute name="access" type="xs:IDREFS"/>
+            <xs:attribute name="aggrMeth">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="sum"/>
+                     <xs:enumeration value="average"/>
+                     <xs:enumeration value="count"/>
+                     <xs:enumeration value="mode"/>
+                     <xs:enumeration value="median"/>
+                     <xs:enumeration value="maximum"/>
+                     <xs:enumeration value="minimum"/>
+                     <xs:enumeration value="percent"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherAggrMeth" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="measUnit" type="xs:string"/>
+            <xs:attribute name="scale" type="xs:string"/>
+            <xs:attribute name="origin" type="xs:string"/>
+            <xs:attribute name="nature">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="nominal"/>
+                     <xs:enumeration value="ordinal"/>
+                     <xs:enumeration value="interval"/>
+                     <xs:enumeration value="ratio"/>
+                     <xs:enumeration value="percent"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="additivity">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="stock"/>
+                     <xs:enumeration value="flow"/>
+                     <xs:enumeration value="non-additive"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherAdditivity" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="temporal" default="N">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="Y"/>
+                     <xs:enumeration value="N"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="geog" default="N">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="Y"/>
+                     <xs:enumeration value="N"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="geoVocab" type="xs:string"/>
+            <xs:attribute name="catQnty" type="xs:string"/>
+            <xs:attribute name="representationType">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="text"/>
+                     <xs:enumeration value="numeric"/>
+                     <xs:enumeration value="code"/>
+                     <xs:enumeration value="datetime"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherRepresentationType" type="xs:NMTOKEN" use="optional"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="var" type="varType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Variable</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>This element describes all of the features of a single variable in a social science data file. The following elements are repeatable to support multi-language content: anlysUnit, embargo, imputation, respUnit, security, TotlResp. It includes the following attributes: </xhtml:p>
+                     <xhtml:p>The attribute "name" usually contains the so-called "short label" for the variable, limited to eight characters in many statistical analysis systems such as SAS or SPSS. </xhtml:p>
+                     <xhtml:p>The attribute "wgt" indicates whether the variable is a weight. </xhtml:p>
+                     <xhtml:p>The attribute "wgt-var" references the weight variable(s) for this variable. </xhtml:p>
+                     <xhtml:p>The attribute "qstn" is a reference to the question ID for the variable. </xhtml:p>
+                     <xhtml:p>The attribute "files" is the IDREF identifying the file(s) to which the variable belongs. </xhtml:p>
+                     <xhtml:p>The attribute "vendor" is the origin of the proprietary format and includes SAS, SPSS, ANSI, and ISO. </xhtml:p>
+                     <xhtml:p>The attribute "dcml" refers to the number of decimal points in the variable. </xhtml:p>
+                     <xhtml:p>The attribute "intrvl" indicates the interval type; options are discrete or continuous.</xhtml:p>
+                     <xhtml:p>The "rectype" attribute refers to the record type to which the variable belongs. </xhtml:p>
+                     <xhtml:p>The "sdatrefs" are summary data description references which record the ID values of all elements within the summary data description section of the Study Description which might apply to the variable. These elements include: time period covered, date of collection, nation or country, geographic coverage, geographic unit, unit of analysis, universe, and kind of data. </xhtml:p>
+                     <xhtml:p>The "methrefs" are methodology and processing references which record the ID values of all elements within the study methodology and processing section of the Study Description which might apply to the variable. These elements include information on data collection and data appraisal (e.g., sampling, sources, weighting, data cleaning, response rates, and sampling error estimates). </xhtml:p>
+                     <xhtml:p>The "pubrefs" attribute provides a link to publication/citation references and records the ID values of all citations elements within Other Study Description Materials or Other Study-Related Materials that pertain to this variable. </xhtml:p>
+                     <xhtml:p>The attribute "access" records the ID values of all elements in the Data Access section that describe access conditions for this variable. </xhtml:p>
+                     <xhtml:p>The "aggrMeth" attribute indicates the type of aggregation method used, for example 'sum', 'average', 'count'. If a value of "other" is given a term from a controlled vocabulary should be used in the "otherAggrMeth" attribute.</xhtml:p>
+                     <xhtml:p>The "otherAggrMeth" attribute holds a value from a controlled vocabulary when the aggrMeth attribute has a value of "other".This option should only be used when applying a controlled vocabulary to this attribute. Use the complex element controlledVocabUsed to identify the controlled vocabulary to which the selected term belongs.</xhtml:p>
+                     <xhtml:p>The attribute "measUnit" records the measurement unit, for example 'km', 'miles', etc. </xhtml:p>
+                     <xhtml:p>The "scale" attribute records unit of scale, for example 'x1', 'x1000', etc.</xhtml:p>
+                     <xhtml:p>The attribute "origin" records the point of origin for anchored scales.</xhtml:p>
+                     <xhtml:p>The "nature" attribute records the nature of the variable, whether it is 'nominal', 'ordinal', 'interval', 'ratio', or 'percent'. If the 'other' value is used, a value from a controlled vocabulary should be put into the otherNature attribute.</xhtml:p>
+                     <xhtml:p>The "otherNature" attribute should be used when the nature attribute has a value of "other". This option should only be used when applying a controlled vocabulary to this attribute. Use the complex element controlledVocabUsed to identify the controlled vocabulary to which the selected term belongs.</xhtml:p>
+                     <xhtml:p>The attribute "additivity" records type of additivity, such as 'stock', 'flow', 'non-additive'. When the "other" value is used, a value from a controlled vocabulary should be put into the "otherAdditivity" attribute.</xhtml:p>
+                     <xhtml:p>The "otherAdditivity" attribute is used only when the "additivity" attribute has a value of "other". This option should only be used when applying a controlled vocabulary to this attribute. Use the complex element controlledVocabUsed to identify the controlled vocabulary to which the selected term belongs.</xhtml:p>
+                     <xhtml:p>The attribute "temporal" indicates whether the variable relays time-related information. </xhtml:p>
+                     <xhtml:p>The "geog" attribute indicates whether the variable relays geographic information.</xhtml:p>
+                     <xhtml:p>The attribute "geoVocab" records the coding scheme used in the variable.</xhtml:p>
+                     <xhtml:p>The attribute "catQnty" records the number of categories found in the variable, and is used primarily for aggregate data files for verifying cell counts in nCubes.</xhtml:p>
+                     <xhtml:p>The "representationType" attribute was added to capture the specific DDI 3 representation type to facilitate translation between DDI 2 and DDI 3. If the "other" value is used, a term from a controlled vocabulary may be supplied in the otherRepresentationType attribute.</xhtml:p>
+                     <xhtml:p>The "otherRepresentationType" attribute should be used when the representationType attribute has a value of "other". This option should only be used when applying a controlled vocabulary to this attribute. Use the complex element controlledVocabUsed to identify the controlled vocabulary to which the selected term belongs.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   
+   <xs:complexType name="varFormatType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="type" default="numeric">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="character"/>
+                     <xs:enumeration value="numeric"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="formatname" type="xs:string"/>
+            <xs:attribute name="schema" default="ISO">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="SAS"/>
+                     <xs:enumeration value="SPSS"/>
+                     <xs:enumeration value="IBM"/>
+                     <xs:enumeration value="ANSI"/>
+                     <xs:enumeration value="ISO"/>
+                     <xs:enumeration value="XML-Data"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherSchema" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="category" default="other">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="date"/>
+                     <xs:enumeration value="time"/>
+                     <xs:enumeration value="currency"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherCategory" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="URI" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="varFormat" type="varFormatType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Variable Format</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The technical format of the variable in question. Attributes for this element include: "type," which indicates if the variable is character or numeric; "formatname," which in some cases may provide the name of the particular, proprietary format actually used; "schema," which identifies the vendor or standards body that defined the format (acceptable choices are SAS, SPSS, IBM, ANSI, ISO, XML-data or other); "category," which describes what kind of data the format represents, and includes date, time, currency, or "other" conceptual possibilities; and "URI," which supplies a network identifier for the format definition. If the "other" value is used for the schema attribute, a value from a controlled vocabulary must be used with the "otherSchema" attribute, and the complex element controlledVocabUsed should be used to identify the controlled vocabulary to which the selected term belongs. For the category attribute, a value from a controlled vocabulary may be provided if the "other" value is chosen. In this case, the term from the controlled vocabulary should be placed in the "othercategory" attribute, and the controlledVocabUsed element should also be filled in.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <varFormat type="numeric" schema="SAS" formatname="DATE" category="date">The number in this  variable is stored in the form 'ddmmmyy' in SAS format.</varFormat>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <varFormat type="numeric" formatname="date.iso8601" schema="XML-Data" category="date" URI="http://www.w3.org/TR/1998/NOTE-XML-data/">19541022</varFormat>
+                        </var>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="varGrpType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="labl" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="txt" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="concept" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="defntn" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="universe" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="type" default="other">
+               <xs:simpleType>
+                  <xs:restriction base="xs:NMTOKEN">
+                     <xs:enumeration value="section"/>
+                     <xs:enumeration value="multipleResp"/>
+                     <xs:enumeration value="grid"/>
+                     <xs:enumeration value="display"/>
+                     <xs:enumeration value="repetition"/>
+                     <xs:enumeration value="subject"/>
+                     <xs:enumeration value="version"/>
+                     <xs:enumeration value="iteration"/>
+                     <xs:enumeration value="analysis"/>
+                     <xs:enumeration value="pragmatic"/>
+                     <xs:enumeration value="record"/>
+                     <xs:enumeration value="file"/>
+                     <xs:enumeration value="randomized"/>
+                     <xs:enumeration value="other"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="otherType" type="xs:NMTOKEN" use="optional"/>
+            <xs:attribute name="var" type="xs:IDREFS"/>
+            <xs:attribute name="varGrp" type="xs:IDREFS"/>
+            <xs:attribute name="name" type="xs:string"/>
+            <xs:attribute name="sdatrefs" type="xs:IDREFS"/>
+            <xs:attribute name="methrefs" type="xs:IDREFS"/>
+            <xs:attribute name="pubrefs" type="xs:IDREFS"/>
+            <xs:attribute name="access" type="xs:IDREFS"/>
+            <xs:attribute name="nCube" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   
+   <xs:element name="varGrp" type="varGrpType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Variable Group</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">
+                     <xhtml:p>A group of variables that may share a common subject, arise from the interpretation of a single question, or are linked by some other factor.</xhtml:p>
+                     <xhtml:p>Variable groups are created this way in order to permit variables to belong to multiple groups, including multiple subject groups such as a group of variables on sex and income, or to a subject and a multiple response group, without causing overlapping groups. Variables that are linked by use of the same question need not be identified by a Variable Group element because they are linked by a common unique question identifier in the Variable element. Note that as a result of the strict sequencing required by XML, all Variable Groups must be marked up before the Variable element is opened. That is, the mark-up author cannot mark up a Variable Group, then mark up its constituent variables, then mark up another Variable Group.</xhtml:p>
+                     <xhtml:p>The "type" attribute refers to the general type of grouping of the variables, e.g., subject, multiple response. Use the value of "other" if the value is to come from an external controlled vocabulary, and place the term into the otherType attribute.</xhtml:p>
+                     <xhtml:p>The "otherType" attribute is used when the "type" attribute has a value of "other". This option should only be used when applying a controlled vocabulary to this attribute. Use the complex element controlledVocabUsed to identify the controlled vocabulary to which the selected term belongs.</xhtml:p>
+                     <xhtml:p>Specific variable groups, included within the "type" attribute, are:</xhtml:p>
+                     <xhtml:p>Section: Questions which derive from the same section of the questionnaire, e.g., all variables located in Section C.</xhtml:p>
+                     <xhtml:p>Multiple response: Questions where the respondent has the opportunity to select more than one answer from a variety of choices, e.g., what newspapers have you read in the past month (with the respondent able to select up to five choices).</xhtml:p>
+                     <xhtml:p>Grid: Sub-questions of an introductory or main question but which do not constitute a multiple response group, e.g., I am going to read you some events in the news lately and you tell me for each one whether you are very interested in the event, fairly interested in the fact, or not interested in the event.</xhtml:p>
+                     <xhtml:p>Display: Questions which appear on the same interview screen (CAI) together or are presented to the interviewer or respondent as a group.</xhtml:p>
+                     <xhtml:p>Repetition: The same variable (or group of variables) which are repeated for different groups of respondents or for the same respondent at a different time.</xhtml:p>
+                     <xhtml:p>Subject: Questions which address a common topic or subject, e.g., income, poverty, children.</xhtml:p>
+                     <xhtml:p>Version: Variables, often appearing in pairs, which represent different aspects of the same question, e.g., pairs of variables (or groups) which are adjusted/unadjusted for inflation or season or whatever, pairs of variables with/without missing data imputed, and versions of the same basic question.</xhtml:p>
+                     <xhtml:p>Iteration: Questions that appear in different sections of the data file measuring a common subject in different ways, e.g., a set of variables which report the progression of respondent income over the life course.</xhtml:p>
+                     <xhtml:p>Analysis: Variables combined into the same index, e.g., the components of a calculation, such as the numerator and the denominator of an economic statistic.</xhtml:p>
+                     <xhtml:p>Pragmatic: A variable group without shared properties.</xhtml:p>
+                     <xhtml:p>Record: Variable from a single record in a hierarchical file.</xhtml:p>
+                     <xhtml:p>File: Variable from a single file in a multifile study.</xhtml:p>
+                     <xhtml:p>Randomized: Variables generated by CAI surveys produced by one or more random number variables together with a response variable, e.g, random variable X which could equal 1 or 2 (at random) which in turn would control whether Q.23 is worded "men" or "women", e.g., would you favor helping [men/women] laid off from a factory obtain training for a new job?</xhtml:p>
+                     <xhtml:p>Other: Variables which do not fit easily into any of the categories listed above, e.g., a group of variables whose documentation is in another language.</xhtml:p>
+                     <xhtml:p>The "var" attribute is used to reference all the constituent variable IDs in the group.</xhtml:p>
+                     <xhtml:p>The "varGrp" attribute is used to reference all the subsidiary variable groups which nest underneath the current varGrp. This allows for encoding of a hierarchical structure of variable groups. </xhtml:p>
+                     <xhtml:p>The attribute "name" provides a name, or short label, for the group.</xhtml:p>
+                     <xhtml:p>The "sdatrefs" are summary data description references that record the ID values of all elements within the summary data description section of the Study Description that might apply to the group. These elements include: time period covered, date of collection, nation or country, geographic coverage, geographic unit, unit of analysis, universe, and kind of data.</xhtml:p>
+                     <xhtml:p>The "methrefs" are methodology and processing references which record the ID values of all elements within the study methodology and processing section of the Study Description which might apply to the group. These elements include information on data collection and data appraisal (e.g., sampling, sources, weighting, data cleaning, response rates, and sampling error estimates).</xhtml:p>
+                     <xhtml:p>The "pubrefs" attribute provides a link to publication/citation references and records the ID values of all citations elements within codeBook/stdyDscr/othrStdyMat or codeBook/otherMat that pertain to this variable group. </xhtml:p>
+                     <xhtml:p>The "access" attribute records the ID values of all elements in codeBook/stdyDscr/dataAccs of the document that describe access conditions for this variable group.</xhtml:p>
+                     <xhtml:p>The attribute "nCube" was included in 2.0 and subsequent versions in ERROR. DO NOT USE THIS ATTRIBUTE. It is retained only for purposes of backward-compatibility.</xhtml:p>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="varQnty" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Overall Variable Count</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Number of variables.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <varQnty>27</varQnty>
+                     ]]></xhtml:samp> 
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="verRespType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextType">
+            <xs:attribute name="affiliation" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="verResp" type="verRespType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Version Responsibility Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The organization or person responsible for the version of the work.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <verResp>Zentralarchiv fuer Empirische Sozialforschung</verResp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <verResp>Inter-university Consortium for Political and Social  Research</verResp>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <verStmt>
+                              <verResp>Zentralarchiv fuer Empirische Sozialforschung</verResp>
+                           </verStmt>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCube>
+                           <verStmt>
+                              <verResp>Zentralarchiv fuer Empirische Sozialforschung</verResp>
+                           </verStmt>
+                        </nCube>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="verStmtType">
+      <xs:complexContent>
+         <xs:extension base="baseElementType">
+            <xs:sequence>
+               <xs:element ref="version" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="verResp" minOccurs="0" maxOccurs="unbounded"/>
+               <xs:element ref="notes" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="verStmt" type="verStmtType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Version Statement</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Version statement for the work at the appropriate level: marked-up document; marked-up document source; study; study description, other material; other material for study. A version statement may also be included for a data file, a variable, or an nCube.</xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <verStmt>
+                           <version type="version" date="1999-01-25">Second version</version>
+                        </verStmt>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:complexType name="versionType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="simpleTextAndDateType">
+            <xs:attribute name="type" type="xs:string"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+
+   <xs:element name="version" type="versionType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Version</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">Also known as release or edition. If there have been substantive changes in the data/documentation since their creation, this statement should be used at the appropriate level. The ISO standard for dates (YYYY-MM-DD) is recommended for use with the "date" attribute. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <version type="edition" date="1999-01-25">Second ICPSR Edition</version>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <var>
+                           <verStmt>
+                              <version type="version" date="1999-01-25">Second version of V25</version>
+                           </verStmt>
+                        </var>
+                     ]]></xhtml:samp>
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <nCube>
+                           <verStmt>
+                              <version type="version" date="1999-01-25">Second version of N25</version>
+                           </verStmt>
+                        </nCube>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="weight" type="simpleTextType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">Weighting</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The use of sampling procedures may make it necessary to apply weights to produce accurate statistical results. Describe here the criteria for using weights in analysis of a collection. If a weighting formula or coefficient was developed, provide this formula, define its elements, and indicate how the formula is applied to data. </xhtml:div>
+               </xhtml:div>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Example</xhtml:h2>
+                  <xhtml:div class="example">
+                     <xhtml:samp class="xml_sample"><![CDATA[
+                        <weight>The 1996 NES dataset includes two final person-level analysis weights which incorporate sampling, nonresponse, and post-stratification factors. One weight (variable #4) is for longitudinal micro-level analysis using the 1996 NES Panel. The other weight (variable #3) is for analysis of the 1996 NES combined sample (Panel component cases plus Cross-section supplement cases). In addition, a Time Series Weight (variable #5) which corrects for Panel attrition was constructed. This weight should be used in analyses which compare the 1996 NES to earlier unweighted National Election Study data collections.</weight>
+                     ]]></xhtml:samp>
+                  </xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+   <xs:element name="westBL" type="phraseType">
+      <xs:annotation>
+         <xs:documentation>
+            <xhtml:div>
+               <xhtml:h1 class="element_title">West Bounding Longitude</xhtml:h1>
+               <xhtml:div>
+                  <xhtml:h2 class="section_header">Description</xhtml:h2>
+                  <xhtml:div class="description">The westernmost coordinate delimiting the geographic extent of the dataset. A valid range of values, expressed in decimal degrees (positive east and positive north), is: -180,0 &lt;=West Bounding Longitude Value &lt;= 180,0</xhtml:div>
+               </xhtml:div>
+            </xhtml:div>
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/xml/xsd/ddi-codebook-2.5/xml.xsd b/src/test/resources/xml/xsd/ddi-codebook-2.5/xml.xsd
new file mode 100644
index 00000000000..48ec4d89c75
--- /dev/null
+++ b/src/test/resources/xml/xsd/ddi-codebook-2.5/xml.xsd
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+ <xs:annotation>
+  <xs:documentation>
+   See http://www.w3.org/XML/1998/namespace.html and
+   http://www.w3.org/TR/REC-xml for information about this namespace.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>This schema defines attributes and an attribute group
+	suitable for use by
+	schemas wishing to allow xml:base, xml:lang or xml:space attributes
+	on elements they define.
+
+	To enable this, such a schema must import this schema
+	for the XML namespace, e.g. as follows:
+	&lt;schema . . .&gt;
+	 . . .
+	 &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+		    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/&gt;
+
+	Subsequently, qualified reference to any of the attributes
+	or the group defined below will have the desired effect, e.g.
+
+	&lt;type . . .&gt;
+	 . . .
+	 &lt;attributeGroup ref="xml:specialAttrs"/&gt;
+
+	 will define a type which will schema-validate an instance
+	 element with any of those attributes</xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>In keeping with the XML Schema WG's standard versioning
+   policy, this schema document will persist at
+   http://www.w3.org/2001/03/xml.xsd.
+   At the date of issue it can also be found at
+   http://www.w3.org/2001/xml.xsd.
+   The schema document at that URI may however change in the future,
+   in order to remain compatible with the latest version of XML Schema
+   itself.  In other words, if the XML Schema namespace changes, the version
+   of this document at
+   http://www.w3.org/2001/xml.xsd will change
+   accordingly; the version at
+   http://www.w3.org/2001/03/xml.xsd will not change.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang" type="xs:language">
+  <xs:annotation>
+   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
+	 codes as the enumerated possible values . . .</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="space" default="preserve">
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+		     information about this attribute.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+ </xs:attributeGroup>
+
+</xs:schema>
\ No newline at end of file
diff --git a/tests/check_duplicate_properties.sh b/tests/check_duplicate_properties.sh
new file mode 100755
index 00000000000..7d053bdba4b
--- /dev/null
+++ b/tests/check_duplicate_properties.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# This script will check Java *.properties files within the src dir for duplicates
+# and print logs with file annotations about it.
+
+set -euo pipefail
+
+FAIL=0
+
+while IFS= read -r -d '' FILE; do
+
+    # Scan the whole file for duplicates
+    FILTER=$(grep -a -v -E "^(#.*|\s*$)" "$FILE" | cut -d"=" -f1 | sort | uniq -c | tr -s " " | { grep -vs "^ 1 " || true; })
+
+    # If there are any duplicates present, analyse further to point people to the source
+    if [ -n "$FILTER" ]; then
+        FAIL=1
+
+        echo "::group::$FILE"
+        for KEY in $(echo "$FILTER" | cut -d" " -f3); do
+            # Find duplicate lines' numbers by grepping for the KEY and cutting the number from the output
+            DUPLICATE_LINES=$(grep -n -E -e "^$KEY=" "$FILE" | cut -d":" -f1)
+            # Join the found line numbers for better error log
+            DUPLICATE_NUMBERS=$(echo "$DUPLICATE_LINES" | paste -sd ',')
+
+            # This form will make Github annotate the lines in the PR that changes the properties file
+            for LINE_NUMBER in $DUPLICATE_LINES; do
+                echo "::error file=$FILE,line=$LINE_NUMBER::Found duplicate for key '$KEY' in lines $DUPLICATE_NUMBERS"
+            done
+        done
+        echo "::endgroup::"
+    fi
+done < <( find "$(git rev-parse --show-toplevel)" -wholename "*/src/*.properties" -print0 )
+
+if [ "$FAIL" -eq 1 ]; then
+    exit 1
+fi
diff --git a/tests/data/datasetContacts1.json b/tests/data/datasetContacts1.json
index 3953fc6daef..8c4a7cb2b11 100644
--- a/tests/data/datasetContacts1.json
+++ b/tests/data/datasetContacts1.json
@@ -60,7 +60,7 @@
                   "typeName": "datasetContactName",
                   "multiple": false,
                   "typeClass": "primitive",
-                  "value": "LastContact2, FirstContact2"
+                  "value": "Simpson, Homer"
                 },
                 "datasetContactAffiliation": {
                   "typeName": "datasetContactAffiliation",
diff --git a/tests/integration-tests.txt b/tests/integration-tests.txt
new file mode 100644
index 00000000000..2a15ac3ce74
--- /dev/null
+++ b/tests/integration-tests.txt
@@ -0,0 +1 @@
+DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,HarvestingClientsIT,MoveIT,MakeDataCountApiIT,FileTypeDetectionIT,EditDDIIT,ExternalToolsIT,AccessIT,DuplicateFilesIT,DownloadFilesIT,LinkIT,DeleteUsersIT,DeactivateUsersIT,AuxiliaryFilesIT,InvalidCharactersIT,LicensesIT,NotificationsIT,BagIT,MetadataBlocksIT,NetcdfIT,SignpostingIT,FitsIT,LogoutIT,DataRetrieverApiIT,ProvIT,S3AccessIT,OpenApiIT,InfoIT,DatasetFieldsIT,SavedSearchIT,DatasetTypesIT,DataverseFeaturedItemsIT,SendFeedbackApiIT,CustomizationIT,JsonLDExportIT
diff --git a/tests/jenkins/ec2/Jenkinsfile b/tests/jenkins/ec2/Jenkinsfile
new file mode 100644
index 00000000000..7c35da867c7
--- /dev/null
+++ b/tests/jenkins/ec2/Jenkinsfile
@@ -0,0 +1,54 @@
+pipeline {
+  agent any
+
+  stages {
+
+    stage('Build') {
+      steps {
+	// clean plate
+        sh 'rm -rf target/'
+	// package warfile
+	sh 'mvn -DcompilerArgument=-Xlint:unchecked test -P all-unit-tests package'
+	// generate HTML SureFire report
+	sh 'mvn surefire-report:report'
+      }
+    }
+
+    stage('Test') {
+      steps {
+        script {
+          // if pull request isn't from IQSS, CHANGE_FORK only provides org/user
+          if (env.CHANGE_FORK) {
+            env.EC2_REPO = "https://github.com/" + env.CHANGE_FORK + "/dataverse"
+          } else {
+            env.EC2_REPO = env.GIT_URL
+          }
+        }
+	sh '/usr/bin/curl -O https://raw.githubusercontent.com/GlobalDataverseCommunityConsortium/dataverse-ansible/develop/ec2/ec2-create-instance.sh'
+	sh '/bin/rm -f groupvars.yml'
+	sh '/usr/bin/curl -o groupvars.yml https://raw.githubusercontent.com/GlobalDataverseCommunityConsortium/dataverse-ansible/develop/tests/group_vars/jenkins.yml'
+	sh '/usr/bin/bash ec2-create-instance.sh -b ${CHANGE_BRANCH} -r ${EC2_REPO} -t jenkins_delete_me -l target -g groupvars.yml -s t3a.large -d'
+      }
+    }
+
+    stage('Post') {
+      steps {
+	junit 'target/surefire-reports/*.xml'
+	step(
+	  [$class: 'JacocoPublisher', 
+	  execPattern: 'target/*.exec',
+	  classPattern: 'target/classes',
+	  sourcePattern: 'src/main/java',
+	  exclusionPattern: 'src/test*']
+	)
+        script {
+          if (fileExists('./ansible_complete')) {
+            sh '/bin/rm ./ansible_complete'
+          } else {
+            error('Ansible run terminated abnormally, failing build.')
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/tests/run_docker_dataverse.sh b/tests/run_docker_dataverse.sh
deleted file mode 100644
index 56d55f8b057..00000000000
--- a/tests/run_docker_dataverse.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd ..
-. ./conf/docker-aio/prep_it.bash
diff --git a/tests/shell/.shellspec b/tests/shell/.shellspec
new file mode 100644
index 00000000000..c99d2e7396e
--- /dev/null
+++ b/tests/shell/.shellspec
@@ -0,0 +1 @@
+--require spec_helper
diff --git a/tests/shell/data/solr/chain-output.xml b/tests/shell/data/solr/chain-output.xml
new file mode 100644
index 00000000000..a54414ad244
--- /dev/null
+++ b/tests/shell/data/solr/chain-output.xml
@@ -0,0 +1,6 @@
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <field name="test" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::END -->
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <copyField source="test" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::END -->
diff --git a/tests/shell/data/solr/empty-source.xml b/tests/shell/data/solr/empty-source.xml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/shell/data/solr/invalid-source.xml b/tests/shell/data/solr/invalid-source.xml
new file mode 100644
index 00000000000..49b7a7c7798
--- /dev/null
+++ b/tests/shell/data/solr/invalid-source.xml
@@ -0,0 +1,4 @@
+Bla bla bla
+Anything
+Foobar
+But no field or copyField
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-missing-copyfield-end.xml b/tests/shell/data/solr/mark-missing-copyfield-end.xml
new file mode 100644
index 00000000000..3ac2791f10d
--- /dev/null
+++ b/tests/shell/data/solr/mark-missing-copyfield-end.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-missing-copyfield-start.xml b/tests/shell/data/solr/mark-missing-copyfield-start.xml
new file mode 100644
index 00000000000..547b9c5bbcb
--- /dev/null
+++ b/tests/shell/data/solr/mark-missing-copyfield-start.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::END -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-missing-field-end.xml b/tests/shell/data/solr/mark-missing-field-end.xml
new file mode 100644
index 00000000000..eea4918440d
--- /dev/null
+++ b/tests/shell/data/solr/mark-missing-field-end.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <!-- SCHEMA-COPY-FIELDS::END -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-missing-field-start.xml b/tests/shell/data/solr/mark-missing-field-start.xml
new file mode 100644
index 00000000000..082a11fbddc
--- /dev/null
+++ b/tests/shell/data/solr/mark-missing-field-start.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <!-- SCHEMA-COPY-FIELDS::END -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-nolinebreak.xml b/tests/shell/data/solr/mark-nolinebreak.xml
new file mode 100644
index 00000000000..a9aa476008c
--- /dev/null
+++ b/tests/shell/data/solr/mark-nolinebreak.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN --><copyField source="test" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::END -->
+    
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-nonunique-copyfield-end.xml b/tests/shell/data/solr/mark-nonunique-copyfield-end.xml
new file mode 100644
index 00000000000..d8ea99842c3
--- /dev/null
+++ b/tests/shell/data/solr/mark-nonunique-copyfield-end.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <!-- SCHEMA-COPY-FIELDS::END -->
+    <!-- SCHEMA-COPY-FIELDS::END -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-nonunique-copyfield-start.xml b/tests/shell/data/solr/mark-nonunique-copyfield-start.xml
new file mode 100644
index 00000000000..fd7636ec80f
--- /dev/null
+++ b/tests/shell/data/solr/mark-nonunique-copyfield-start.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <!-- SCHEMA-COPY-FIELDS::END -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-nonunique-field-end.xml b/tests/shell/data/solr/mark-nonunique-field-end.xml
new file mode 100644
index 00000000000..da03ef65e21
--- /dev/null
+++ b/tests/shell/data/solr/mark-nonunique-field-end.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::END -->
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <!-- SCHEMA-COPY-FIELDS::END -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-nonunique-field-start.xml b/tests/shell/data/solr/mark-nonunique-field-start.xml
new file mode 100644
index 00000000000..1a441cdf521
--- /dev/null
+++ b/tests/shell/data/solr/mark-nonunique-field-start.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <!-- SCHEMA-COPY-FIELDS::END -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-order-1.xml b/tests/shell/data/solr/mark-order-1.xml
new file mode 100644
index 00000000000..635143fe2f0
--- /dev/null
+++ b/tests/shell/data/solr/mark-order-1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::END -->
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <!-- SCHEMA-COPY-FIELDS::END -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-order-2.xml b/tests/shell/data/solr/mark-order-2.xml
new file mode 100644
index 00000000000..7b085ca1fea
--- /dev/null
+++ b/tests/shell/data/solr/mark-order-2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::END -->
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/mark-order-3.xml b/tests/shell/data/solr/mark-order-3.xml
new file mode 100644
index 00000000000..a8b13b144e5
--- /dev/null
+++ b/tests/shell/data/solr/mark-order-3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::END -->
+    <!-- SCHEMA-FIELDS::BEGIN -->
+</schema>
\ No newline at end of file
diff --git a/tests/shell/data/solr/minimal-schema.xml b/tests/shell/data/solr/minimal-schema.xml
new file mode 100644
index 00000000000..004e96ff604
--- /dev/null
+++ b/tests/shell/data/solr/minimal-schema.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<schema name="default-config" version="1.7">
+    <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <!-- SCHEMA-FIELDS::BEGIN -->
+    <!-- SCHEMA-FIELDS::END -->
+    
+    <copyField source="name" dest="_text_"/>
+    <!-- SCHEMA-COPY-FIELDS::BEGIN -->
+    <!-- SCHEMA-COPY-FIELDS::END -->
+</schema>
diff --git a/tests/shell/data/solr/minimal-source.xml b/tests/shell/data/solr/minimal-source.xml
new file mode 100644
index 00000000000..a6f95caa294
--- /dev/null
+++ b/tests/shell/data/solr/minimal-source.xml
@@ -0,0 +1,2 @@
+<field name="test" type="text_en" multiValued="false" stored="true" indexed="true"/>
+<copyField source="test" dest="_text_"/>
\ No newline at end of file
diff --git a/tests/shell/spec/spec_helper.sh b/tests/shell/spec/spec_helper.sh
new file mode 100644
index 00000000000..0cf2106f5e0
--- /dev/null
+++ b/tests/shell/spec/spec_helper.sh
@@ -0,0 +1,25 @@
+# shellcheck shell=sh
+
+# Defining variables and functions here will affect all specfiles.
+# Change shell options inside a function may cause different behavior,
+# so it is better to set them here.
+# set -eu
+
+# This callback function will be invoked only once before loading specfiles.
+spec_helper_precheck() {
+  # Available functions: info, warn, error, abort, setenv, unsetenv
+  # Available variables: VERSION, SHELL_TYPE, SHELL_VERSION
+  : minimum_version "0.28.1"
+}
+
+# This callback function will be invoked after a specfile has been loaded.
+spec_helper_loaded() {
+  :
+}
+
+# This callback function will be invoked after core modules has been loaded.
+spec_helper_configure() {
+  # Available functions: import, before_each, after_each, before_all, after_all
+  : import 'support/custom_matcher'
+}
+
diff --git a/tests/shell/spec/update_fields_spec.sh b/tests/shell/spec/update_fields_spec.sh
new file mode 100644
index 00000000000..fa61743bf6f
--- /dev/null
+++ b/tests/shell/spec/update_fields_spec.sh
@@ -0,0 +1,170 @@
+#shellcheck shell=sh
+#shellcheck disable=SC2154
+
+update_fields() {
+  ../../conf/solr/update-fields.sh "$@"
+}
+
+Describe "Update fields command"
+
+  Describe "can operate on upstream data"
+    copyUpstreamSchema() { cp ../../conf/solr/schema.xml data/solr/upstream-schema.xml; }
+    AfterAll 'copyUpstreamSchema'
+
+    Path schema-xml="../../conf/solr/schema.xml"
+    It "needs upstream schema.xml"
+      The path schema-xml should be exist
+    End
+  End
+
+  Describe "schema.xml validation"
+    It "throws error when no schema.xml target given"
+      When run update_fields
+      The status should equal 2
+      The error should include "Cannot find or write"
+    End
+
+    Describe "throws error when missing mark"
+      Parameters
+        "#1" "SCHEMA-FIELDS::BEGIN" data/solr/mark-missing-field-start.xml
+        "#2" "SCHEMA-FIELDS::END" data/solr/mark-missing-field-end.xml
+        "#3" "SCHEMA-COPY-FIELDS::BEGIN" data/solr/mark-missing-copyfield-start.xml
+        "#4" "SCHEMA-COPY-FIELDS::END" data/solr/mark-missing-copyfield-end.xml
+      End
+
+      It "$2"
+        When run update_fields "$3"
+        The status should equal 2
+        The error should include "$2"
+      End
+    End
+
+    Describe "throws error when non-unique mark"
+      Parameters
+        "#1" "SCHEMA-FIELDS::BEGIN" data/solr/mark-nonunique-field-start.xml
+        "#2" "SCHEMA-FIELDS::END" data/solr/mark-nonunique-field-end.xml
+        "#3" "SCHEMA-COPY-FIELDS::BEGIN" data/solr/mark-nonunique-copyfield-start.xml
+        "#4" "SCHEMA-COPY-FIELDS::END" data/solr/mark-nonunique-copyfield-end.xml
+      End
+
+      It "$2"
+        When run update_fields "$3"
+        The status should equal 2
+        The error should include "guards are not unique"
+      End
+    End
+
+    Describe "throws error when marks not in correct order"
+      Parameters
+        "#1" data/solr/mark-order-1.xml
+        "#2" data/solr/mark-order-2.xml
+        "#3" data/solr/mark-order-3.xml
+      End
+
+      It "$1"
+        When run update_fields "$2"
+        The status should equal 2
+        The error should include "guards are not in correct order"
+      End
+    End
+
+    It "throws error when marks not in exclusive line"
+      When run update_fields data/solr/mark-nolinebreak.xml
+      The status should equal 2
+      The error should include "is not on an exclusive line"
+    End
+  End
+
+  Describe "reading input"
+    Describe "fails because"
+      # Test if $CI is set (always true inside Github Workflow)
+      detect_github_action() { ! test -z ${CI:+x}; }
+
+      It "throws error when no source given"
+        Skip if "running on Github Action" detect_github_action
+        When run update_fields data/solr/minimal-schema.xml
+        The status should equal 2
+        The error should include "provide source file or piped input"
+      End
+
+      It "throws error when given file not found"
+        When run update_fields data/solr/minimal-schema.xml foobar
+        The status should equal 2
+        The error should include "Cannot read"
+        The error should include "foobar"
+      End
+
+      It "throws error when given file is empty"
+        When run update_fields data/solr/minimal-schema.xml data/solr/empty-source.xml
+        The status should equal 2
+        The error should include "Cannot read"
+        The error should include "empty-source.xml"
+      End
+
+      It "throws error when given invalid source file"
+        When run update_fields data/solr/minimal-schema.xml data/solr/invalid-source.xml
+        The status should equal 2
+        The error should include "No <field> or <copyField>"
+      End
+
+      It "throws error when given invalid stdin source"
+        Data < data/solr/invalid-source.xml
+        When run update_fields data/solr/minimal-schema.xml
+        The status should equal 2
+        The error should include "No <field> or <copyField>"
+      End
+    End
+
+    Describe "succeeds because"
+      setup1() { cp data/solr/minimal-schema.xml data/solr/minimal-schema-work.xml; }
+      cleanup1() { rm data/solr/minimal-schema-work.xml; }
+      BeforeEach 'setup1'
+      AfterEach 'cleanup1'
+
+      deleteUpstreamSchema() { rm data/solr/upstream-schema.xml; }
+      AfterAll 'deleteUpstreamSchema'
+
+      match_content1() {
+        grep -q "$@" "${match_content1}"
+      }
+
+      It "prints nothing when editing minimal schema"
+        Data < data/solr/minimal-source.xml
+        When run update_fields data/solr/minimal-schema-work.xml
+        The status should equal 0
+        The output should equal ""
+        The path data/solr/minimal-schema-work.xml should be file
+        The path data/solr/minimal-schema-work.xml should satisfy match_content1 "<field name=\"test\""
+        The path data/solr/minimal-schema-work.xml should satisfy match_content1 "<copyField source=\"test\""
+      End
+
+      It "prints nothing when editing upstream schema"
+        Data < data/solr/minimal-source.xml
+        When run update_fields data/solr/upstream-schema.xml
+        The status should equal 0
+        The output should equal ""
+        The path data/solr/upstream-schema.xml should be file
+        The path data/solr/upstream-schema.xml should satisfy match_content1 "<field name=\"test\""
+        The path data/solr/upstream-schema.xml should satisfy match_content1 "<copyField source=\"test\""
+      End
+    End
+  End
+
+  Describe "chaining data"
+    setup() { cp data/solr/minimal-schema.xml data/solr/minimal-schema-work.xml; }
+    cleanup() { rm data/solr/minimal-schema-work.xml; }
+    BeforeEach 'setup'
+    AfterEach 'cleanup'
+
+    match_content() {
+      echo "${match_content}" | diff "$1" -
+    }
+
+    It "prints after editing"
+      Data < data/solr/minimal-source.xml
+      When run update_fields -p data/solr/minimal-schema-work.xml
+      The status should equal 0
+      The output should satisfy match_content data/solr/chain-output.xml
+    End
+  End
+End
diff --git a/tests/verify_mdb_properties.sh b/tests/verify_mdb_properties.sh
new file mode 100755
index 00000000000..bc62c0f503a
--- /dev/null
+++ b/tests/verify_mdb_properties.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# This script will check our metadata block files and scan if the properties files contain all the matching keys.
+
+set -euo pipefail
+
+if ! which jbang > /dev/null 2>&1; then
+  echo "Cannot find jbang on path. Did you install it?" >&2
+  exit 1
+fi
+if ! which native-image > /dev/null 2>&1; then
+  echo "Cannot find GraalVM native-image on path. Did you install it?" >&2
+  exit 1
+fi
+
+FAIL=0
+
+# We need a small Java app here, replacing spaces, converting to lower case but especially to replace UTF-8 chars with nearest ascii / strip accents because of
+# https://github.com/IQSS/dataverse/blob/dddcf29188a5c35174f3c94ffc1c4cb1d7fc0552/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java#L139-L140
+# This cannot be replaced by another tool, as it behaves rather individually.
+DIR=$(mktemp -d)
+SOURCE="$DIR/stripaccents.java"
+STRIP_BIN="$(dirname "$0")/stripaccents"
+cat > "$SOURCE" << EOF
+///usr/bin/env jbang "\$0" "\$@" ; exit \$?
+//JAVA 11+
+//DEPS org.apache.commons:commons-lang3:3.12.0
+import org.apache.commons.lang3.StringUtils;
+import java.nio.charset.StandardCharsets;
+import java.io.IOException;
+class stripaccents {
+    public static void main(String[] args) throws IOException {
+        String input = new String(System.in.readAllBytes(), StandardCharsets.UTF_8).toLowerCase().replace(" ", "_");
+        System.out.println(StringUtils.stripAccents(input));
+    }
+}
+EOF
+jbang export native --force --fresh -O "$STRIP_BIN" "$SOURCE"
+
+while IFS= read -r -d '' MDB; do
+
+    echo "::group::$MDB"
+    BLOCK_NAME=$(sed -n "2p" "$MDB" | cut -f2)
+    BLOCK_DISPLAY_NAME=$(sed -n "2p" "$MDB" | cut -f4)
+    PROPERTIES_FILE="$(git rev-parse --show-toplevel)/src/main/java/propertyFiles/$BLOCK_NAME.properties"
+
+    # Check correct file exists
+    if [ ! -r "$PROPERTIES_FILE" ]; then
+        echo "::error::Missing properties file for metadata block '$BLOCK_NAME', expected at '$PROPERTIES_FILE'"
+        FAIL=1
+        continue
+    fi
+
+    # Check metadata block properties exist and are equal to TSV source
+    if ! grep -a -q -e "^metadatablock.name=$BLOCK_NAME$" "$PROPERTIES_FILE"; then
+        echo "::error::Missing 'metadatablock.name=$BLOCK_NAME' or different from TSV source in $PROPERTIES_FILE"
+        FAIL=1
+    fi
+    if ! grep -a -q -e "^metadatablock.displayName=$BLOCK_DISPLAY_NAME$" "$PROPERTIES_FILE"; then
+        echo "::error::Missing 'metadatablock.displayName=$BLOCK_DISPLAY_NAME' or different from TSV source in $PROPERTIES_FILE"
+        FAIL=1
+    fi
+    if ! grep -a -q -e "^metadatablock.displayFacet=" "$PROPERTIES_FILE"; then
+        echo "::error::Missing 'metadatablock.displayFacet=...' in $PROPERTIES_FILE"
+        FAIL=1
+    fi
+
+    # Check dataset fields
+    for FIELD in $(grep -a -A1000 "^#datasetField" "$MDB" | tail -n+2 | grep -a -B1000 "^#controlledVocabulary" | head -n-1 | cut -f2); do
+        for ENTRY in title description watermark; do
+            if ! grep -a -q -e "^datasetfieldtype.$FIELD.$ENTRY=" "$PROPERTIES_FILE"; then
+                echo "::error::Missing key 'datasetfieldtype.$FIELD.$ENTRY=...' in $PROPERTIES_FILE"
+                FAIL=1
+            fi
+        done
+    done
+
+    # Check CV entries
+    while read -r LINE; do
+        FIELD_NAME=$(echo "$LINE" | cut -f1)
+        # See https://github.com/IQSS/dataverse/blob/dddcf29188a5c35174f3c94ffc1c4cb1d7fc0552/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java#L139-L140
+        # Square brackets are special in grep with expressions activated, so escape them if present!
+        FIELD_VALUE=$(echo "$LINE" | cut -f2 | "$STRIP_BIN" | sed -e 's/\([][]\)/\\\1/g' )
+
+        if ! grep -q -a -e "^controlledvocabulary.$FIELD_NAME.$FIELD_VALUE=" "$PROPERTIES_FILE"; then
+            echo "::error::Missing key 'controlledvocabulary.$FIELD_NAME.$FIELD_VALUE=...' in $PROPERTIES_FILE"
+            FAIL=1
+        fi
+    done < <(grep -a -A1000 "^#controlledVocabulary" "$MDB" | tail -n+2)
+
+    echo "::endgroup::"
+
+done < <( find "$(git rev-parse --show-toplevel)/scripts/api/data/metadatablocks" -name '*.tsv' -print0 )
+
+rm "$SOURCE" "$STRIP_BIN"
+
+if [ "$FAIL" -eq 1 ]; then
+    exit 1
+fi